diff --git a/.bazelrc b/.bazelrc
index 54a510f05dc..679eeec77a3 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -33,10 +33,6 @@ common --@rules_dotnet//dotnet/settings:strict_deps=false
 # we only configure a nightly toolchain
 common --@rules_rust//rust/toolchain/channel=nightly
 
-# rust does not like the gold linker, while bazel does by default, so let's avoid using it
-common:linux --linkopt=-fuse-ld=lld
-common:macos --linkopt=-fuse-ld=lld
-
 # Reduce this eventually to empty, once we've fixed all our usages of java, and https://github.com/bazel-contrib/rules_go/issues/4193 is fixed
 common --incompatible_autoload_externally="+@rules_java,+@rules_shell"
 
diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
deleted file mode 100644
index 6621d59b7c2..00000000000
--- a/.github/copilot-instructions.md
+++ /dev/null
@@ -1,4 +0,0 @@
-When reviewing code:
-* do not review changes in files with `.expected` extension (they are automatically ensured to be correct).
-* in `.ql` and `.qll` files, do not try to review the code itself as you don't understand the programming language
-  well enough to make comments in these languages. You can still check for typos or comment improvements.
diff --git a/.github/instructions/expected-files.instructions.md b/.github/instructions/expected-files.instructions.md
new file mode 100644
index 00000000000..b76119d7028
--- /dev/null
+++ b/.github/instructions/expected-files.instructions.md
@@ -0,0 +1,4 @@
+---
+applyTo: "**/*.expected"
+---
+Ignore these files. These are generated to be correct by running the tests, and should not be edited manually.
diff --git a/.github/instructions/ql-files.instructions.md b/.github/instructions/ql-files.instructions.md
new file mode 100644
index 00000000000..4d331807e06
--- /dev/null
+++ b/.github/instructions/ql-files.instructions.md
@@ -0,0 +1,6 @@
+---
+applyTo: "**/*.ql,**/*.qll"
+---
+When reviewing these QL files, do not make any comment on the code itself. You don't understand the QL programming language well enough yet. You can only make comments about the following aspects:
+* comments (lines starting with `//` or block comments enclosed in `/* ... */`): you can suggest improvements to the clarity of comments, or point out spelling mistakes
+* typos in identifiers
diff --git a/.github/workflows/build-ripunzip.yml b/.github/workflows/build-ripunzip.yml
index 3e32b868985..08547268e3b 100644
--- a/.github/workflows/build-ripunzip.yml
+++ b/.github/workflows/build-ripunzip.yml
@@ -1,38 +1,67 @@
-name: Build runzip
+name: Build ripunzip
 
 on:
   workflow_dispatch:
     inputs:
       ripunzip-version:
-        description: "what reference to checktout from google/runzip"
+        description: What reference to checkout from google/ripunzip. Latest by default
         required: false
-        default: v2.0.2
       openssl-version:
-        description: "what reference to checkout from openssl/openssl for Linux"
+        description: What reference to checkout from openssl/openssl for Linux. Latest by default
         required: false
-        default: openssl-3.5.0
+      open-pr:
+        description: Open a pull request updating the ripunzip versions committed to lfs
+        required: false
+        default: true  # will be false on PRs
+  pull_request:
+    paths:
+      - .github/workflows/build-ripunzip.yml
 
+permissions: {}
+  
 jobs:
+  versions:
+    runs-on: ubuntu-slim
+    outputs:
+      ripunzip-version: ${{ inputs.ripunzip-version || steps.fetch-ripunzip-version.outputs.version }}
+      openssl-version: ${{ inputs.openssl-version || steps.fetch-openssl-version.outputs.version }}
+    steps:
+      - name: Fetch latest ripunzip version
+        id: fetch-ripunzip-version
+        if: "!inputs.ripunzip-version"
+        run: &fetch-version
+          echo "version=$(gh release view --repo $REPO --json tagName --jq .tagName)" | tee -a $GITHUB_OUTPUT
+        env:
+          REPO: "google/ripunzip"
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Fetch latest openssl version
+        id: fetch-openssl-version
+        if: "!inputs.openssl-version"
+        run: *fetch-version
+        env:
+          REPO: "openssl/openssl"
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   build:
+    needs: versions
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04, macos-13, windows-2022]
+        os: [ubuntu-24.04, macos-15, windows-2025]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           repository: google/ripunzip
-          ref: ${{ inputs.ripunzip-version }}
+          ref: ${{ needs.versions.outputs.ripunzip-version }}
       # we need to avoid ripunzip dynamically linking into libssl
       # see https://github.com/sfackler/rust-openssl/issues/183
       - if: runner.os == 'Linux'
         name: checkout openssl
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           repository: openssl/openssl
           path: openssl
-          ref: ${{ inputs.openssl-version }}
+          ref: ${{ needs.versions.outputs.openssl-version }}
       - if: runner.os == 'Linux'
         name: build and install openssl with fPIC
         shell: bash
@@ -64,11 +93,74 @@ jobs:
           lipo -create -output ripunzip-macos \
             -arch x86_64 target/x86_64-apple-darwin/release/ripunzip \
             -arch arm64 target/aarch64-apple-darwin/release/ripunzip
-      - uses: actions/upload-artifact@v4
+      - name: Archive
+        shell: bash
+        run: |
+          tar acf ripunzip-$RUNNER_OS.tar.zst ripunzip-$(echo $RUNNER_OS | tr '[:upper:]' '[:lower:]')
+      - name: Upload built binary
+        uses: actions/upload-artifact@v4
         with:
           name: ripunzip-${{ runner.os }}
-          path: ripunzip-*
+          path: ripunzip-${{ runner.os }}.tar.zst
+          retention-days: 5
+          compression: 0
       - name: Check built binary
         shell: bash
         run: |
+          rm -f ripunzip-*.tar.zst
           ./ripunzip-* --version
+  publish:
+    needs: [versions, build]
+    if: inputs.open-pr == 'true'
+    permissions:
+      contents: write
+      pull-requests: write
+    runs-on: ubuntu-slim
+    steps:
+      # workaround for git-lfs not being installed yet on ubuntu-slim runners
+      - name: Ensure git-lfs is installed
+        shell: bash
+        run: |
+          if which git-lfs &>/dev/null; then
+            echo "git-lfs is already installed"
+            exit 0
+          fi
+          cd $TMP
+          gh release download --repo git-lfs/git-lfs --pattern "git-lfs-linux-amd64-*.tar.gz" --clobber
+          tar xzf git-lfs-linux-amd64-*.tar.gz
+          rm git-lfs-linux-amd64-*.tar.gz
+          cd git-lfs-*
+          pwd | tee -a $GITHUB_PATH
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - uses: actions/checkout@v5
+        with:
+          sparse-checkout: |
+            .github
+            misc/ripunzip
+          lfs: true
+      - name: Download built binaries
+        uses: actions/download-artifact@v4
+        with:
+          merge-multiple: true
+          path: misc/ripunzip
+      - name: Open PR
+        shell: bash
+        run: |
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+          git switch -c update-ripunzip
+          git add misc/ripunzip
+          git commit -m "Update ripunzip binaries to version $VERSION"
+          git push --set-upstream origin update-ripunzip --force
+          TITLE="Update ripunzip binaries to version $VERSION"
+          gh pr create \
+            --draft \
+            --title "$TITLE" \
+            --body "Automated update of ripunzip binaries." \
+            --assignee "$ACTOR" ||
+              (gh pr edit --title "$TITLE" --add-assignee "$ACTOR" && gh pr ready --undo)
+        env:
+          ACTOR: ${{ github.actor }}
+          VERSION: ${{ needs.versions.outputs.ripunzip-version }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/buildifier.yml b/.github/workflows/buildifier.yml
index f3fbf97854c..ac344df588e 100644
--- a/.github/workflows/buildifier.yml
+++ b/.github/workflows/buildifier.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Check bazel formatting
         uses: pre-commit/action@646c83fcd040023954eafda54b4db0192ce70507
         with:
diff --git a/.github/workflows/check-implicit-this.yml b/.github/workflows/check-implicit-this.yml
index f58db399ccb..a109f4bfe55 100644
--- a/.github/workflows/check-implicit-this.yml
+++ b/.github/workflows/check-implicit-this.yml
@@ -16,7 +16,7 @@ jobs:
   check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Check that implicit this warnings is enabled for all packs
         shell: bash
         run: |
diff --git a/.github/workflows/check-overlay-annotations.yml b/.github/workflows/check-overlay-annotations.yml
index 5369dfd49d0..849cad113c4 100644
--- a/.github/workflows/check-overlay-annotations.yml
+++ b/.github/workflows/check-overlay-annotations.yml
@@ -17,7 +17,7 @@ jobs:
   sync:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Check overlay annotations
         run: python config/add-overlay-annotations.py --check java
 
diff --git a/.github/workflows/check-qldoc.yml b/.github/workflows/check-qldoc.yml
index f10e0dc90b9..8fe47bf50f7 100644
--- a/.github/workflows/check-qldoc.yml
+++ b/.github/workflows/check-qldoc.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 2
 
diff --git a/.github/workflows/check-query-ids.yml b/.github/workflows/check-query-ids.yml
index 8ae19cc3e5f..14d597d44cb 100644
--- a/.github/workflows/check-query-ids.yml
+++ b/.github/workflows/check-query-ids.yml
@@ -19,6 +19,6 @@ jobs:
     name: Check query IDs
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Check for duplicate query IDs
         run: python3 misc/scripts/check-query-ids.py
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index ba384245e0e..72bf2052627 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -34,10 +34,10 @@ jobs:
     - name: Setup dotnet
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 9.0.100
+        dotnet-version: 9.0.300
 
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
diff --git a/.github/workflows/compile-queries.yml b/.github/workflows/compile-queries.yml
index 945515c0c53..36171543cac 100644
--- a/.github/workflows/compile-queries.yml
+++ b/.github/workflows/compile-queries.yml
@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest-xl
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Setup CodeQL
         uses: ./.github/actions/fetch-codeql
         with:
diff --git a/.github/workflows/cpp-swift-analysis.yml b/.github/workflows/cpp-swift-analysis.yml
index 18c2708d7b4..f72c13cdd70 100644
--- a/.github/workflows/cpp-swift-analysis.yml
+++ b/.github/workflows/cpp-swift-analysis.yml
@@ -28,7 +28,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
diff --git a/.github/workflows/csharp-qltest.yml b/.github/workflows/csharp-qltest.yml
index ef0b93c50c8..3c73eaec3b6 100644
--- a/.github/workflows/csharp-qltest.yml
+++ b/.github/workflows/csharp-qltest.yml
@@ -39,23 +39,23 @@ jobs:
         os: [ubuntu-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Setup dotnet
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 9.0.100
+          dotnet-version: 9.0.300
       - name: Extractor unit tests
         run: |
           dotnet tool restore
-          dotnet test -p:RuntimeFrameworkVersion=9.0.0 extractor/Semmle.Util.Tests
-          dotnet test -p:RuntimeFrameworkVersion=9.0.0 extractor/Semmle.Extraction.Tests
-          dotnet test -p:RuntimeFrameworkVersion=9.0.0 autobuilder/Semmle.Autobuild.CSharp.Tests
-          dotnet test -p:RuntimeFrameworkVersion=9.0.0 autobuilder/Semmle.Autobuild.Cpp.Tests
+          dotnet test -p:RuntimeFrameworkVersion=9.0.5 extractor/Semmle.Util.Tests
+          dotnet test -p:RuntimeFrameworkVersion=9.0.5 extractor/Semmle.Extraction.Tests
+          dotnet test -p:RuntimeFrameworkVersion=9.0.5 autobuilder/Semmle.Autobuild.CSharp.Tests
+          dotnet test -p:RuntimeFrameworkVersion=9.0.5 autobuilder/Semmle.Autobuild.Cpp.Tests
         shell: bash
   stubgentest:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: ./csharp/actions/create-extractor-pack
       - name: Run stub generator tests
         run: |
diff --git a/.github/workflows/csv-coverage-metrics.yml b/.github/workflows/csv-coverage-metrics.yml
index 08f0e9883ef..c9ec9e602d2 100644
--- a/.github/workflows/csv-coverage-metrics.yml
+++ b/.github/workflows/csv-coverage-metrics.yml
@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Setup CodeQL
         uses: ./.github/actions/fetch-codeql
       - name: Create empty database
@@ -51,7 +51,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Setup CodeQL
         uses: ./.github/actions/fetch-codeql
       - name: Create empty database
diff --git a/.github/workflows/csv-coverage-pr-artifacts.yml b/.github/workflows/csv-coverage-pr-artifacts.yml
index cbd92dd47d7..c62de00535e 100644
--- a/.github/workflows/csv-coverage-pr-artifacts.yml
+++ b/.github/workflows/csv-coverage-pr-artifacts.yml
@@ -35,11 +35,11 @@ jobs:
           GITHUB_CONTEXT: ${{ toJSON(github.event) }}
         run: echo "$GITHUB_CONTEXT"
       - name: Clone self (github/codeql) - MERGE
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           path: merge
       - name: Clone self (github/codeql) - BASE
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 2
           path: base
diff --git a/.github/workflows/csv-coverage-pr-comment.yml b/.github/workflows/csv-coverage-pr-comment.yml
index cf01ef063ac..534725815b4 100644
--- a/.github/workflows/csv-coverage-pr-comment.yml
+++ b/.github/workflows/csv-coverage-pr-comment.yml
@@ -24,7 +24,7 @@ jobs:
         GITHUB_CONTEXT: ${{ toJSON(github.event) }}
       run: echo "$GITHUB_CONTEXT"
     - name: Clone self (github/codeql)
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
     - name: Set up Python 3.8
       uses: actions/setup-python@v4
       with:
diff --git a/.github/workflows/csv-coverage-timeseries.yml b/.github/workflows/csv-coverage-timeseries.yml
index 13dc99b162c..11bc06bee60 100644
--- a/.github/workflows/csv-coverage-timeseries.yml
+++ b/.github/workflows/csv-coverage-timeseries.yml
@@ -12,11 +12,11 @@ jobs:
 
     steps:
       - name: Clone self (github/codeql)
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           path: script
       - name: Clone self (github/codeql) for analysis
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           path: codeqlModels
           fetch-depth: 0
diff --git a/.github/workflows/csv-coverage-update.yml b/.github/workflows/csv-coverage-update.yml
index 6b73bff820d..9f7a0b778da 100644
--- a/.github/workflows/csv-coverage-update.yml
+++ b/.github/workflows/csv-coverage-update.yml
@@ -21,7 +21,7 @@ jobs:
           GITHUB_CONTEXT: ${{ toJSON(github.event) }}
         run: echo "$GITHUB_CONTEXT"
       - name: Clone self (github/codeql)
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           path: ql
           fetch-depth: 0
diff --git a/.github/workflows/csv-coverage.yml b/.github/workflows/csv-coverage.yml
index 525f4bfb64c..a1224456410 100644
--- a/.github/workflows/csv-coverage.yml
+++ b/.github/workflows/csv-coverage.yml
@@ -16,11 +16,11 @@ jobs:
 
     steps:
       - name: Clone self (github/codeql)
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           path: script
       - name: Clone self (github/codeql) for analysis
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           path: codeqlModels
           ref: ${{ github.event.inputs.qlModelShaOverride || github.ref }}
diff --git a/.github/workflows/fast-forward.yml b/.github/workflows/fast-forward.yml
index dd8fefbc529..d71f8be20f9 100644
--- a/.github/workflows/fast-forward.yml
+++ b/.github/workflows/fast-forward.yml
@@ -26,7 +26,7 @@ jobs:
           exit 1
 
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Git config
         shell: bash
diff --git a/.github/workflows/go-tests.yml b/.github/workflows/go-tests.yml
index c30abdd9e5d..6578f09b8df 100644
--- a/.github/workflows/go-tests.yml
+++ b/.github/workflows/go-tests.yml
@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest-xl
     steps:
       - name: Check out code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Run tests
         uses: ./go/actions/test
         with:
diff --git a/.github/workflows/kotlin-build.yml b/.github/workflows/kotlin-build.yml
index 565c3d3a8ba..71a9f8b525c 100644
--- a/.github/workflows/kotlin-build.yml
+++ b/.github/workflows/kotlin-build.yml
@@ -20,7 +20,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - run: |
           bazel query //java/kotlin-extractor/...
           # only build the default version as a quick check that we can build from `codeql`
diff --git a/.github/workflows/mad_modelDiff.yml b/.github/workflows/mad_modelDiff.yml
index b0e4a20f2b8..3b96d903e23 100644
--- a/.github/workflows/mad_modelDiff.yml
+++ b/.github/workflows/mad_modelDiff.yml
@@ -28,12 +28,12 @@ jobs:
         slug: ${{fromJson(github.event.inputs.projects || '["apache/commons-codec", "apache/commons-io", "apache/commons-beanutils", "apache/commons-logging", "apache/commons-fileupload", "apache/commons-lang", "apache/commons-validator", "apache/commons-csv", "apache/dubbo"]' )}}
     steps:
       - name: Clone github/codeql from PR
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         if: github.event.pull_request
         with:
           path: codeql-pr
       - name: Clone github/codeql from main
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           path: codeql-main
           ref: main
diff --git a/.github/workflows/mad_regenerate-models.yml b/.github/workflows/mad_regenerate-models.yml
index 61e4f986243..402dd957331 100644
--- a/.github/workflows/mad_regenerate-models.yml
+++ b/.github/workflows/mad_regenerate-models.yml
@@ -30,11 +30,11 @@ jobs:
             ref: "placeholder"
     steps:
       - name: Clone self (github/codeql)
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Setup CodeQL binaries
         uses: ./.github/actions/fetch-codeql
       - name: Clone repositories
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           path: repos/${{ matrix.ref }}
           ref: ${{ matrix.ref }}
diff --git a/.github/workflows/python-tooling.yml b/.github/workflows/python-tooling.yml
index 19059070878..bab1277dd03 100644
--- a/.github/workflows/python-tooling.yml
+++ b/.github/workflows/python-tooling.yml
@@ -21,7 +21,7 @@ jobs:
   check-python-tooling:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions/setup-python@v5
         with:
           python-version: '3.12'
diff --git a/.github/workflows/qhelp-pr-preview.yml b/.github/workflows/qhelp-pr-preview.yml
index be5a42096bb..a152eb7cc09 100644
--- a/.github/workflows/qhelp-pr-preview.yml
+++ b/.github/workflows/qhelp-pr-preview.yml
@@ -43,7 +43,7 @@ jobs:
           if-no-files-found: error
           retention-days: 1
 
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 2
           persist-credentials: false
diff --git a/.github/workflows/ql-for-ql-build.yml b/.github/workflows/ql-for-ql-build.yml
index 73833da0549..9c568a9b572 100644
--- a/.github/workflows/ql-for-ql-build.yml
+++ b/.github/workflows/ql-for-ql-build.yml
@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest-xl
     steps:
       ### Build the queries ###
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0
       - name: Find codeql
diff --git a/.github/workflows/ql-for-ql-dataset_measure.yml b/.github/workflows/ql-for-ql-dataset_measure.yml
index c3441ffa407..b4561c04a96 100644
--- a/.github/workflows/ql-for-ql-dataset_measure.yml
+++ b/.github/workflows/ql-for-ql-dataset_measure.yml
@@ -25,7 +25,7 @@ jobs:
           - github/codeql
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Find codeql
         id: find-codeql
@@ -46,7 +46,7 @@ jobs:
         env:
           CODEQL: ${{ steps.find-codeql.outputs.codeql-path }}
       - name: Checkout ${{ matrix.repo }}
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           repository: ${{ matrix.repo }}
           path: ${{ github.workspace }}/repo
@@ -75,7 +75,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: measure
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions/download-artifact@v4
         with:
           name: measurements
diff --git a/.github/workflows/ql-for-ql-tests.yml b/.github/workflows/ql-for-ql-tests.yml
index 4502dded53f..fdb9da284ce 100644
--- a/.github/workflows/ql-for-ql-tests.yml
+++ b/.github/workflows/ql-for-ql-tests.yml
@@ -24,7 +24,7 @@ jobs:
   qltest:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Find codeql
         id: find-codeql
         uses: github/codeql-action/init@main
@@ -64,7 +64,7 @@ jobs:
     needs: [qltest]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Install GNU tar
         if: runner.os == 'macOS'
         run: |
diff --git a/.github/workflows/query-list.yml b/.github/workflows/query-list.yml
index a286b9b846b..8c736379f8a 100644
--- a/.github/workflows/query-list.yml
+++ b/.github/workflows/query-list.yml
@@ -23,7 +23,7 @@ jobs:
 
     steps:
     - name: Clone self (github/codeql)
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:
         path: codeql 
     - name: Set up Python 3.8
@@ -31,7 +31,7 @@ jobs:
       with:
         python-version: 3.8
     - name: Download CodeQL CLI
-      # Look under the `codeql` directory, as this is where we checked out the `github/codeql` repo
+      # Look under the `codeql` directory, as this is where we checked out the `github/codeql` repo
       uses: ./codeql/.github/actions/fetch-codeql
     - name: Build code scanning query list
       run: |
diff --git a/.github/workflows/ruby-build.yml b/.github/workflows/ruby-build.yml
index 343e896151c..39aadef0913 100644
--- a/.github/workflows/ruby-build.yml
+++ b/.github/workflows/ruby-build.yml
@@ -47,7 +47,7 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Install GNU tar
         if: runner.os == 'macOS'
         run: |
@@ -113,7 +113,7 @@ jobs:
     if: github.repository_owner == 'github'
     runs-on: ubuntu-latest-xl
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Fetch CodeQL
         uses: ./.github/actions/fetch-codeql
       - name: Cache compilation cache
@@ -146,7 +146,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [build, compile-queries]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions/download-artifact@v4
         with:
           name: ruby.dbscheme
@@ -209,7 +209,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     needs: [package]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Fetch CodeQL
         uses: ./.github/actions/fetch-codeql
 
diff --git a/.github/workflows/ruby-dataset-measure.yml b/.github/workflows/ruby-dataset-measure.yml
index e3229b15806..a88b23bf3a1 100644
--- a/.github/workflows/ruby-dataset-measure.yml
+++ b/.github/workflows/ruby-dataset-measure.yml
@@ -30,14 +30,14 @@ jobs:
         repo: [rails/rails, discourse/discourse, spree/spree, ruby/ruby]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - uses: ./.github/actions/fetch-codeql
 
       - uses: ./ruby/actions/create-extractor-pack
 
       - name: Checkout ${{ matrix.repo }}
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           repository: ${{ matrix.repo }}
           path: ${{ github.workspace }}/repo
@@ -62,7 +62,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: measure
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions/download-artifact@v4
         with:
           path: stats
diff --git a/.github/workflows/ruby-qltest-rtjo.yml b/.github/workflows/ruby-qltest-rtjo.yml
index c2ae9c0cef1..1d57c465538 100644
--- a/.github/workflows/ruby-qltest-rtjo.yml
+++ b/.github/workflows/ruby-qltest-rtjo.yml
@@ -25,7 +25,7 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: ./.github/actions/fetch-codeql
       - uses: ./ruby/actions/create-extractor-pack
       - name: Cache compilation cache
diff --git a/.github/workflows/ruby-qltest.yml b/.github/workflows/ruby-qltest.yml
index d1518205dab..e178a5dfb6e 100644
--- a/.github/workflows/ruby-qltest.yml
+++ b/.github/workflows/ruby-qltest.yml
@@ -36,7 +36,7 @@ jobs:
   qlupgrade:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: ./.github/actions/fetch-codeql
       - name: Check DB upgrade scripts
         run: |
@@ -58,7 +58,7 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: ./.github/actions/fetch-codeql
       - uses: ./ruby/actions/create-extractor-pack
       - name: Cache compilation cache
diff --git a/.github/workflows/rust-analysis.yml b/.github/workflows/rust-analysis.yml
index 04028ad594b..397aa2fba51 100644
--- a/.github/workflows/rust-analysis.yml
+++ b/.github/workflows/rust-analysis.yml
@@ -35,7 +35,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
     - name: Query latest nightly CodeQL bundle
       shell: bash
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index cc880072555..34f5efb74ba 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -30,7 +30,7 @@ jobs:
         working-directory: rust/ast-generator
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Inject sources
         shell: bash
         run: |
@@ -53,7 +53,7 @@ jobs:
         working-directory: rust/extractor
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Format
         shell: bash
         run: |
@@ -69,7 +69,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Install CodeQL
         uses: ./.github/actions/fetch-codeql
       - name: Code generation
diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml
index df610a96702..4a5613f988e 100644
--- a/.github/workflows/swift.yml
+++ b/.github/workflows/swift.yml
@@ -36,7 +36,7 @@ jobs:
       fail-fast: false
     runs-on: ${{ matrix.runner }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Setup (Linux)
         if: runner.os == 'Linux'
         run: |
@@ -53,7 +53,7 @@ jobs:
   clang-format:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: pre-commit/action@646c83fcd040023954eafda54b4db0192ce70507
         name: Check that python code is properly formatted
         with:
@@ -61,7 +61,7 @@ jobs:
   codegen:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: ./.github/actions/fetch-codeql
       - uses: pre-commit/action@646c83fcd040023954eafda54b4db0192ce70507
         name: Check that QL generated code was checked in
@@ -77,6 +77,6 @@ jobs:
   check-no-override:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Check that no override is present in load.bzl
         run: bazel test ... --test_tag_filters=override --test_output=errors
diff --git a/.github/workflows/sync-files.yml b/.github/workflows/sync-files.yml
index 1ed49ac3ecf..f7f42f2e5af 100644
--- a/.github/workflows/sync-files.yml
+++ b/.github/workflows/sync-files.yml
@@ -17,7 +17,7 @@ jobs:
   sync:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Check synchronized files
         run: python config/sync-files.py
       - name: Check dbscheme fragments
diff --git a/.github/workflows/tree-sitter-extractor-test.yml b/.github/workflows/tree-sitter-extractor-test.yml
index 9a71e1fc7c5..da5834a7f9f 100644
--- a/.github/workflows/tree-sitter-extractor-test.yml
+++ b/.github/workflows/tree-sitter-extractor-test.yml
@@ -30,7 +30,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Check formatting
         run: cargo fmt -- --check
       - name: Run tests
@@ -38,12 +38,12 @@ jobs:
   fmt:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Check formatting
         run: cargo fmt --check
   clippy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Run clippy
         run: cargo clippy -- --no-deps -D warnings -A clippy::new_without_default -A clippy::too_many_arguments
diff --git a/.github/workflows/validate-change-notes.yml b/.github/workflows/validate-change-notes.yml
index 42784b661fc..6812d8ff0f6 100644
--- a/.github/workflows/validate-change-notes.yml
+++ b/.github/workflows/validate-change-notes.yml
@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup CodeQL
         uses: ./.github/actions/fetch-codeql
diff --git a/.github/workflows/zipmerge-test.yml b/.github/workflows/zipmerge-test.yml
index edae93a90a0..1e7ac195b5a 100644
--- a/.github/workflows/zipmerge-test.yml
+++ b/.github/workflows/zipmerge-test.yml
@@ -18,6 +18,6 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - run: |
           bazel test //misc/bazel/internal/zipmerge:test --test_output=all
diff --git a/.gitignore b/.gitignore
index fe4a5de9672..4dbe45b8d28 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,3 +76,6 @@ node_modules/
 # some upgrade/downgrade checks create these files
 **/upgrades/*/*.dbscheme.stats
 **/downgrades/*/*.dbscheme.stats
+
+# Mergetool files
+*.orig
diff --git a/CODEOWNERS b/CODEOWNERS
index 7233623d452..131fb1e767d 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,17 +1,33 @@
+# Catch-all for anything which isn't matched by a line lower down
+* @github/code-scanning-alert-coverage
+
+# CodeQL language libraries
 /actions/ @github/codeql-dynamic
 /cpp/ @github/codeql-c-analysis
 /csharp/ @github/codeql-csharp
-/csharp/autobuilder/Semmle.Autobuild.Cpp @github/codeql-c-extractor
-/csharp/autobuilder/Semmle.Autobuild.Cpp.Tests @github/codeql-c-extractor
+/csharp/autobuilder/Semmle.Autobuild.Cpp @github/codeql-c-extractor @github/code-scanning-language-coverage
+/csharp/autobuilder/Semmle.Autobuild.Cpp.Tests @github/codeql-c-extractor @github/code-scanning-language-coverage
 /go/ @github/codeql-go
+/go/codeql-tools/ @github/codeql-go @github/code-scanning-language-coverage
+/go/downgrades/ @github/codeql-go @github/code-scanning-language-coverage
+/go/extractor/ @github/codeql-go @github/code-scanning-language-coverage
+/go/extractor-smoke-test/ @github/codeql-go @github/code-scanning-language-coverage
+/go/ql/test/extractor-tests/ @github/codeql-go @github/code-scanning-language-coverage
 /java/ @github/codeql-java
 /javascript/ @github/codeql-javascript
+/javascript/extractor/ @github/codeql-javascript @github/code-scanning-language-coverage
 /python/ @github/codeql-python
+/python/extractor/ @github/codeql-python @github/code-scanning-language-coverage
+/ql/ @github/codeql-ql-for-ql-reviewers
 /ruby/ @github/codeql-ruby
+/ruby/extractor/ @github/codeql-ruby @github/code-scanning-language-coverage
 /rust/ @github/codeql-rust
+/rust/extractor/ @github/codeql-rust @github/code-scanning-language-coverage
+/shared/ @github/codeql-shared-libraries-reviewers
 /swift/ @github/codeql-swift
+/swift/extractor/ @github/codeql-swift @github/code-scanning-language-coverage
 /misc/codegen/ @github/codeql-swift
-/java/kotlin-extractor/ @github/codeql-kotlin
+/java/kotlin-extractor/ @github/codeql-kotlin @github/code-scanning-language-coverage
 /java/ql/test-kotlin1/ @github/codeql-kotlin
 /java/ql/test-kotlin2/ @github/codeql-kotlin
 
@@ -25,9 +41,6 @@
 /docs/codeql/ql-language-reference/ @github/codeql-frontend-reviewers
 /docs/query-*-style-guide.md @github/codeql-analysis-reviewers
 
-# QL for QL reviewers
-/ql/ @github/codeql-ql-for-ql-reviewers
-
 # Bazel (excluding BUILD.bazel files)
 MODULE.bazel @github/codeql-ci-reviewers
 .bazelversion @github/codeql-ci-reviewers
diff --git a/Cargo.lock b/Cargo.lock
index 263b16482a9..b6456c84106 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,9 +4,9 @@ version = 4
 
 [[package]]
 name = "adler2"
-version = "2.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
+checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
 
 [[package]]
 name = "aho-corasick"
@@ -23,12 +23,6 @@ version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
 
-[[package]]
-name = "android-tzdata"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
-
 [[package]]
 name = "android_system_properties"
 version = "0.1.5"
@@ -40,9 +34,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.18"
+version = "0.6.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
+checksum = "3ae563653d1938f79b1ab1b5e668c87c76a9930414574a6583a7b7e11a8e6192"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -55,44 +49,44 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.10"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
+checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.6"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
+checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.1.2"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
+checksum = "9e231f6134f61b71076a3eab506c379d4f36122f2af15a9ff04415ea4c3339e2"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.7"
+version = "3.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
+checksum = "3e0633414522a32ffaac8ac6cc8f748e090c5717661fddeea04219e2344f5f2a"
 dependencies = [
  "anstyle",
- "once_cell",
- "windows-sys 0.59.0",
+ "once_cell_polyfill",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
 name = "anyhow"
-version = "1.0.98"
+version = "1.0.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
+checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61"
 
 [[package]]
 name = "argfile"
@@ -127,18 +121,18 @@ dependencies = [
 
 [[package]]
 name = "atomic"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d818003e740b63afc82337e3160717f4f63078720a810b7b903e70a5d1d2994"
+checksum = "a89cbf775b137e9b968e67227ef7f775587cde3fd31b0d8599dbd0f598a48340"
 dependencies = [
  "bytemuck",
 ]
 
 [[package]]
 name = "autocfg"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
 [[package]]
 name = "base64"
@@ -154,30 +148,30 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.9.1"
+version = "2.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
+checksum = "2261d10cca569e4643e526d8dc2e62e433cc8aba21ab764233731f8d369bf394"
 
 [[package]]
 name = "borsh"
-version = "1.5.5"
+version = "1.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5430e3be710b68d984d1391c854eb431a9d548640711faa54eecb1df93db91cc"
+checksum = "ad8646f98db542e39fc66e68a20b2144f6a732636df7c2354e74645faaa433ce"
 dependencies = [
  "cfg_aliases",
 ]
 
 [[package]]
 name = "boxcar"
-version = "0.2.13"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26c4925bc979b677330a8c7fe7a8c94af2dbb4a2d37b4a20a80d884400f46baa"
+checksum = "36f64beae40a84da1b4b26ff2761a5b895c12adc41dc25aaee1c4f2bbfe97a6e"
 
 [[package]]
 name = "bstr"
-version = "1.11.3"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "531a9155a481e2ee699d4f98f43c0ca4ff8ee1bfd55c31e9e98fb29d2b176fe0"
+checksum = "234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4"
 dependencies = [
  "memchr",
  "serde",
@@ -185,27 +179,21 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.16.0"
+version = "3.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
 
 [[package]]
 name = "bytemuck"
-version = "1.21.0"
+version = "1.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef657dfab802224e671f5818e9a4935f9b1957ed18e58292690cc39e7a4092a3"
-
-[[package]]
-name = "byteorder"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+checksum = "3995eaeebcdf32f91f980d360f78732ddc061097ab4e39991ae7a6ace9194677"
 
 [[package]]
 name = "camino"
-version = "1.1.10"
+version = "1.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0da45bc31171d8d6960122e222a67740df867c1dd53b4d51caa297084c185cab"
+checksum = "dd0b03af37dad7a14518b7691d81acb0f8222604ad3d1b02f6b4bed5188c0cd5"
 dependencies = [
  "serde",
 ]
@@ -221,25 +209,25 @@ dependencies = [
 
 [[package]]
 name = "cargo-util-schemas"
-version = "0.2.0"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e63d2780ac94487eb9f1fea7b0d56300abc9eb488800854ca217f102f5caccca"
+checksum = "7dc1a6f7b5651af85774ae5a34b4e8be397d9cf4bc063b7e6dbd99a841837830"
 dependencies = [
  "semver",
  "serde",
  "serde-untagged",
  "serde-value",
- "thiserror 1.0.69",
- "toml",
+ "thiserror",
+ "toml 0.8.23",
  "unicode-xid",
  "url",
 ]
 
 [[package]]
 name = "cargo_metadata"
-version = "0.20.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f7835cfc6135093070e95eb2b53e5d9b5c403dc3a6be6040ee026270aa82502"
+checksum = "5cfca2aaa699835ba88faf58a06342a314a950d2b9686165e038286c30316868"
 dependencies = [
  "camino",
  "cargo-platform",
@@ -247,15 +235,16 @@ dependencies = [
  "semver",
  "serde",
  "serde_json",
- "thiserror 2.0.12",
+ "thiserror",
 ]
 
 [[package]]
 name = "cc"
-version = "1.2.7"
+version = "1.2.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a012a0df96dd6d06ba9a1b29d6402d1a5d77c6befd2566afdc26e10603dc93d7"
+checksum = "65193589c6404eb80b450d618eaf9a2cafaaafd57ecce47370519ef674a7bd44"
 dependencies = [
+ "find-msvc-tools",
  "jobserver",
  "libc",
  "shlex",
@@ -263,9 +252,9 @@ dependencies = [
 
 [[package]]
 name = "cfg-if"
-version = "1.0.1"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
+checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9"
 
 [[package]]
 name = "cfg_aliases"
@@ -285,14 +274,36 @@ dependencies = [
  "synstructure",
 ]
 
+[[package]]
+name = "chalk-derive"
+version = "0.104.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ea9b1e80910f66ae87c772247591432032ef3f6a67367ff17f8343db05beafa"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
 [[package]]
 name = "chalk-ir"
 version = "0.103.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "90a37d2ab99352b4caca135061e7b4ac67024b648c28ed0b787feec4bea4caed"
 dependencies = [
- "bitflags 2.9.1",
- "chalk-derive",
+ "bitflags 2.9.4",
+ "chalk-derive 0.103.0",
+]
+
+[[package]]
+name = "chalk-ir"
+version = "0.104.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7047a516de16226cd17344d41a319d0ea1064bf9e60bd612ab341ab4a34bbfa8"
+dependencies = [
+ "bitflags 2.9.4",
+ "chalk-derive 0.104.0",
 ]
 
 [[package]]
@@ -301,8 +312,8 @@ version = "0.103.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c855be60e646664bc37c2496d3dc81ca5ef60520930e5e0f0057a0575aff6c19"
 dependencies = [
- "chalk-derive",
- "chalk-ir",
+ "chalk-derive 0.103.0",
+ "chalk-ir 0.103.0",
  "chalk-solve",
  "rustc-hash 1.1.0",
  "tracing",
@@ -314,10 +325,10 @@ version = "0.103.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "477ac6cdfd2013e9f93b09b036c2b607a67b2e728f4777b8422d55a79e9e3a34"
 dependencies = [
- "chalk-derive",
- "chalk-ir",
+ "chalk-derive 0.103.0",
+ "chalk-ir 0.103.0",
  "ena",
- "indexmap 2.9.0",
+ "indexmap 2.11.4",
  "itertools 0.12.1",
  "petgraph",
  "rustc-hash 1.1.0",
@@ -326,24 +337,23 @@ dependencies = [
 
 [[package]]
 name = "chrono"
-version = "0.4.41"
+version = "0.4.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d"
+checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2"
 dependencies = [
- "android-tzdata",
  "iana-time-zone",
  "js-sys",
  "num-traits",
  "serde",
  "wasm-bindgen",
- "windows-link",
+ "windows-link 0.2.0",
 ]
 
 [[package]]
 name = "clap"
-version = "4.5.40"
+version = "4.5.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40b6887a1d8685cebccf115538db5c0efe625ccac9696ad45c409d96566e910f"
+checksum = "e2134bb3ea021b78629caa971416385309e0131b351b25e01dc16fb54e1b5fae"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -351,9 +361,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.40"
+version = "4.5.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0c66c08ce9f0c698cbce5c0279d0bb6ac936d8674174fe48f736533b964f59e"
+checksum = "c2ba64afa3c0a6df7fa517765e31314e983f51dda798ffba27b988194fb65dc9"
 dependencies = [
  "anstream",
  "anstyle",
@@ -363,9 +373,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.40"
+version = "4.5.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2c7947ae4cc3d851207c1adb5b5e260ff0cca11446b1d6d1423788e442257ce"
+checksum = "bbfd7eae0b0f1a6e63d4b13c9c478de77c2eb546fba158ad50b4203dc24b9f9c"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -375,9 +385,9 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.7.4"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
+checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675"
 
 [[package]]
 name = "codeql-autobuilder-rust"
@@ -433,7 +443,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "argfile",
- "chalk-ir",
+ "chalk-ir 0.104.0",
  "chrono",
  "clap",
  "codeql-extractor",
@@ -462,7 +472,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_with",
- "toml",
+ "toml 0.9.7",
  "tracing",
  "tracing-flame",
  "tracing-subscriber",
@@ -471,9 +481,9 @@ dependencies = [
 
 [[package]]
 name = "colorchoice"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
+checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
 
 [[package]]
 name = "core-foundation-sys"
@@ -489,15 +499,15 @@ checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636"
 
 [[package]]
 name = "cov-mark"
-version = "2.0.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0570650661aa447e7335f1d5e4f499d8e58796e617bedc9267d971e51c8b49d4"
+checksum = "3f1d92727879fb4f24cec33a35e3bff74035541326cbc12ad44ba8886d1927b0"
 
 [[package]]
 name = "crc32fast"
-version = "1.4.2"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
+checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511"
 dependencies = [
  "cfg-if",
 ]
@@ -547,9 +557,9 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
 [[package]]
 name = "darling"
-version = "0.20.10"
+version = "0.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
+checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0"
 dependencies = [
  "darling_core",
  "darling_macro",
@@ -557,9 +567,9 @@ dependencies = [
 
 [[package]]
 name = "darling_core"
-version = "0.20.10"
+version = "0.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5"
+checksum = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4"
 dependencies = [
  "fnv",
  "ident_case",
@@ -571,9 +581,9 @@ dependencies = [
 
 [[package]]
 name = "darling_macro"
-version = "0.20.10"
+version = "0.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
+checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81"
 dependencies = [
  "darling_core",
  "quote",
@@ -596,9 +606,9 @@ dependencies = [
 
 [[package]]
 name = "deranged"
-version = "0.3.11"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+checksum = "d630bccd429a5bb5a64b5e94f693bfc48c9f8566418fda4c494cc94f911f87cc"
 dependencies = [
  "powerfmt",
  "serde",
@@ -629,9 +639,9 @@ checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
 
 [[package]]
 name = "dyn-clone"
-version = "1.0.19"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c7a8fb8a9fbf66c1f703fe16184d10ca0ee9d23be5b4436400408ba54a95005"
+checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555"
 
 [[package]]
 name = "either"
@@ -645,7 +655,7 @@ version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d248bdd43ce613d87415282f69b9bb99d947d290b10962dd6c56233312c2ad5"
 dependencies = [
- "log 0.4.27",
+ "log 0.4.28",
 ]
 
 [[package]]
@@ -743,16 +753,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "filetime"
-version = "0.2.25"
+name = "find-msvc-tools"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586"
-dependencies = [
- "cfg-if",
- "libc",
- "libredox",
- "windows-sys 0.59.0",
-]
+checksum = "7fd99930f64d146689264c637b5af2f0233a933bef0d8570e2526bf9e083192d"
 
 [[package]]
 name = "fixedbitset"
@@ -762,9 +766,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flate2"
-version = "1.1.0"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11faaf5a5236997af9848be0bef4db95824b1d534ebc64d0f0c6cf3e67bd38dc"
+checksum = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -784,9 +788,9 @@ checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
 
 [[package]]
 name = "form_urlencoded"
-version = "1.2.1"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
+checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf"
 dependencies = [
  "percent-encoding",
 ]
@@ -817,33 +821,33 @@ checksum = "7ab85b9b05e3978cc9a9cf8fea7f01b494e1a09ed3037e16ba39edc7a29eb61a"
 
 [[package]]
 name = "getrandom"
-version = "0.3.1"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8"
+checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
 dependencies = [
  "cfg-if",
  "libc",
- "wasi 0.13.3+wasi-0.2.2",
- "windows-targets 0.52.6",
+ "r-efi",
+ "wasi 0.14.5+wasi-0.2.4",
 ]
 
 [[package]]
 name = "glob"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
+checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"
 
 [[package]]
 name = "globset"
-version = "0.4.15"
+version = "0.4.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19"
+checksum = "54a1028dfc5f5df5da8a56a73e6c153c9a9708ec57232470703592a3f18e49f5"
 dependencies = [
  "aho-corasick",
  "bstr",
- "log 0.4.27",
- "regex-automata 0.4.9",
- "regex-syntax 0.8.5",
+ "log 0.4.28",
+ "regex-automata",
+ "regex-syntax",
 ]
 
 [[package]]
@@ -860,9 +864,9 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 
 [[package]]
 name = "hashbrown"
-version = "0.15.2"
+version = "0.15.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
+checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
 dependencies = [
  "allocator-api2",
  "equivalent",
@@ -875,7 +879,7 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1"
 dependencies = [
- "hashbrown 0.15.2",
+ "hashbrown 0.15.5",
 ]
 
 [[package]]
@@ -907,14 +911,15 @@ dependencies = [
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.61"
+version = "0.1.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
+checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
  "iana-time-zone-haiku",
  "js-sys",
+ "log 0.4.28",
  "wasm-bindgen",
  "windows-core",
 ]
@@ -1022,9 +1027,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
 [[package]]
 name = "idna"
-version = "1.0.3"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de"
 dependencies = [
  "idna_adapter",
  "smallvec",
@@ -1054,13 +1059,14 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.9.0"
+version = "2.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
+checksum = "4b0f83760fb341a774ed326568e19f5a863af4a952def8c39f9ab92fd95b88e5"
 dependencies = [
  "equivalent",
- "hashbrown 0.15.2",
+ "hashbrown 0.15.5",
  "serde",
+ "serde_core",
 ]
 
 [[package]]
@@ -1075,7 +1081,7 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3"
 dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.9.4",
  "inotify-sys",
  "libc",
 ]
@@ -1089,6 +1095,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "intrusive-collections"
+version = "0.9.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "189d0897e4cbe8c75efedf3502c18c887b05046e59d28404d4d8e46cbc4d1e86"
+dependencies = [
+ "memoffset",
+]
+
 [[package]]
 name = "is_terminal_polyfill"
 version = "1.70.1"
@@ -1121,10 +1136,11 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "jobserver"
-version = "0.1.32"
+version = "0.1.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
+checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"
 dependencies = [
+ "getrandom",
  "libc",
 ]
 
@@ -1136,9 +1152,9 @@ checksum = "a037eddb7d28de1d0fc42411f501b53b75838d313908078d6698d064f3029b24"
 
 [[package]]
 name = "js-sys"
-version = "0.3.76"
+version = "0.3.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7"
+checksum = "0c0b063578492ceec17683ef2f8c5e89121fbd0b172cbc280635ab7567db2738"
 dependencies = [
  "once_cell",
  "wasm-bindgen",
@@ -1146,9 +1162,9 @@ dependencies = [
 
 [[package]]
 name = "kqueue"
-version = "1.0.8"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c"
+checksum = "eac30106d7dce88daf4a3fcb4879ea939476d5074a9b7ddd0fb97fa4bed5596a"
 dependencies = [
  "kqueue-sys",
  "libc",
@@ -1178,20 +1194,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.174"
+version = "0.2.175"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"
-
-[[package]]
-name = "libredox"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
-dependencies = [
- "bitflags 2.9.1",
- "libc",
- "redox_syscall",
-]
+checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543"
 
 [[package]]
 name = "line-index"
@@ -1211,9 +1216,9 @@ checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
 
 [[package]]
 name = "lock_api"
-version = "0.4.12"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -1225,22 +1230,22 @@ version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
 dependencies = [
- "log 0.4.27",
+ "log 0.4.28",
 ]
 
 [[package]]
 name = "log"
-version = "0.4.27"
+version = "0.4.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
+checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
 
 [[package]]
 name = "matchers"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
+checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9"
 dependencies = [
- "regex-automata 0.1.10",
+ "regex-automata",
 ]
 
 [[package]]
@@ -1260,32 +1265,32 @@ dependencies = [
 
 [[package]]
 name = "miniz_oxide"
-version = "0.8.5"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e3e04debbb59698c15bacbb6d93584a8c0ca9cc3213cb423d31f760d8843ce5"
+checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
 dependencies = [
  "adler2",
 ]
 
 [[package]]
 name = "mio"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
+checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c"
 dependencies = [
  "libc",
- "log 0.4.27",
- "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.52.0",
+ "log 0.4.28",
+ "wasi 0.11.1+wasi-snapshot-preview1",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "miow"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "359f76430b20a79f9e20e115b3428614e654f04fab314482fc0fda0ebd3c6044"
+checksum = "536bfad37a309d62069485248eeaba1e8d9853aaf951caaeaed0585a95346f08"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys 0.61.0",
 ]
 
 [[package]]
@@ -1306,21 +1311,20 @@ checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451"
 
 [[package]]
 name = "notify"
-version = "8.0.0"
+version = "8.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fee8403b3d66ac7b26aee6e40a897d85dc5ce26f44da36b8b73e987cc52e943"
+checksum = "4d3d07927151ff8575b7087f245456e549fea62edf0ec4e565a5ee50c8402bc3"
 dependencies = [
- "bitflags 2.9.1",
- "filetime",
+ "bitflags 2.9.4",
  "fsevent-sys",
  "inotify",
  "kqueue",
  "libc",
- "log 0.4.27",
+ "log 0.4.28",
  "mio",
  "notify-types",
  "walkdir",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -1331,12 +1335,11 @@ checksum = "5e0826a989adedc2a244799e823aece04662b66609d96af8dff7ac6df9a8925d"
 
 [[package]]
 name = "nu-ansi-term"
-version = "0.46.0"
+version = "0.50.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
+checksum = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399"
 dependencies = [
- "overload",
- "winapi",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1366,9 +1369,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.20.3"
+version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+
+[[package]]
+name = "once_cell_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad"
 
 [[package]]
 name = "oorandom"
@@ -1387,24 +1396,28 @@ dependencies = [
 
 [[package]]
 name = "os_str_bytes"
-version = "7.0.0"
+version = "7.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ac44c994af577c799b1b4bd80dc214701e349873ad894d6cdf96f4f7526e0b9"
+checksum = "63eceb7b5d757011a87d08eb2123db15d87fb0c281f65d101ce30a1e96c3ad5c"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
-name = "overload"
-version = "0.1.1"
+name = "papaya"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
+checksum = "f92dd0b07c53a0a0c764db2ace8c541dc47320dad97c2200c2a637ab9dd2328f"
+dependencies = [
+ "equivalent",
+ "seize",
+]
 
 [[package]]
 name = "parking_lot"
-version = "0.12.3"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
+checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13"
 dependencies = [
  "lock_api",
  "parking_lot_core",
@@ -1412,9 +1425,9 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.10"
+version = "0.9.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
+checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5"
 dependencies = [
  "cfg-if",
  "libc",
@@ -1448,9 +1461,9 @@ dependencies = [
 
 [[package]]
 name = "percent-encoding"
-version = "2.3.1"
+version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
+checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
 
 [[package]]
 name = "perf-event"
@@ -1478,7 +1491,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
 dependencies = [
  "fixedbitset",
- "indexmap 2.9.0",
+ "indexmap 2.11.4",
 ]
 
 [[package]]
@@ -1495,15 +1508,15 @@ checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
 
 [[package]]
 name = "portable-atomic"
-version = "1.11.0"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e"
+checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
 
 [[package]]
 name = "potential_utf"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585"
+checksum = "84df19adbe5b5a0782edcab45899906947ab039ccf4573713735ee7de1e6b08a"
 dependencies = [
  "zerovec",
 ]
@@ -1516,18 +1529,18 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.20"
+version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
 dependencies = [
- "zerocopy 0.7.35",
+ "zerocopy",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.95"
+version = "1.0.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
+checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de"
 dependencies = [
  "unicode-ident",
 ]
@@ -1547,20 +1560,26 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.40"
+version = "1.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
+checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
-name = "ra-ap-rustc_abi"
-version = "0.116.0"
+name = "r-efi"
+version = "5.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a967e3a9cd3e38b543f503978e0eccee461e3aea3f7b10e944959bff41dbe612"
+checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
+
+[[package]]
+name = "ra-ap-rustc_abi"
+version = "0.123.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f18c877575c259d127072e9bfc41d985202262fb4d6bfdae3d1252147c2562c2"
 dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.9.4",
  "ra-ap-rustc_hashes",
  "ra-ap-rustc_index",
  "tracing",
@@ -1568,18 +1587,18 @@ dependencies = [
 
 [[package]]
 name = "ra-ap-rustc_hashes"
-version = "0.116.0"
+version = "0.123.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ea4c755ecbbffa5743c251344f484ebe571ec7bc5b36d80b2a8ae775d1a7a40"
+checksum = "2439ed1df3472443133b66949f81080dff88089b42f825761455463709ee1cad"
 dependencies = [
  "rustc-stable-hash",
 ]
 
 [[package]]
 name = "ra-ap-rustc_index"
-version = "0.116.0"
+version = "0.123.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aca7ad7cf911538c619caa2162339fe98637e9e46f11bb0484ef96735df4d64a"
+checksum = "57a24fe0be21be1f8ebc21dcb40129214fb4cefb0f2753f3d46b6dbe656a1a45"
 dependencies = [
  "ra-ap-rustc_index_macros",
  "smallvec",
@@ -1587,9 +1606,9 @@ dependencies = [
 
 [[package]]
 name = "ra-ap-rustc_index_macros"
-version = "0.116.0"
+version = "0.123.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8767ba551c9355bc3031be072cc4bb0381106e5e7cd275e72b7a8c76051c4070"
+checksum = "844a27ddcad0116facae2df8e741fd788662cf93dc13029cd864f2b8013b81f9"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1598,9 +1617,20 @@ dependencies = [
 
 [[package]]
 name = "ra-ap-rustc_lexer"
-version = "0.116.0"
+version = "0.121.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6101374afb267e6c27e4e2eb0b1352e9f3504c1a8f716f619cd39244e2ed92ab"
+checksum = "22944e31fb91e9b3e75bcbc91e37d958b8c0825a6160927f2856831d2ce83b36"
+dependencies = [
+ "memchr",
+ "unicode-properties",
+ "unicode-xid",
+]
+
+[[package]]
+name = "ra-ap-rustc_lexer"
+version = "0.123.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b734cfcb577d09877799a22742f1bd398be6c00bc428d9de56d48d11ece5771"
 dependencies = [
  "memchr",
  "unicode-properties",
@@ -1609,19 +1639,19 @@ dependencies = [
 
 [[package]]
 name = "ra-ap-rustc_parse_format"
-version = "0.116.0"
+version = "0.121.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecd88a19f00da4f43e6727d5013444cbc399804b5046dfa2bbcd28ebed3970ce"
+checksum = "81057891bc2063ad9e353f29462fbc47a0f5072560af34428ae9313aaa5e9d97"
 dependencies = [
- "ra-ap-rustc_lexer",
- "rustc-literal-escaper 0.0.2",
+ "ra-ap-rustc_lexer 0.121.0",
+ "rustc-literal-escaper",
 ]
 
 [[package]]
 name = "ra-ap-rustc_pattern_analysis"
-version = "0.116.0"
+version = "0.123.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb332dd32d7850a799862533b1c021e6062558861a4ad57817bf522499fbb892"
+checksum = "75b0ee1f059b9dea0818c6c7267478926eee95ba4c7dcf89c8db32fa165d3904"
 dependencies = [
  "ra-ap-rustc_index",
  "rustc-hash 2.1.1",
@@ -1632,12 +1662,12 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_base_db"
-version = "0.0.288"
+version = "0.0.301"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edf27fccb119fe85faf51f51847df9695d3cca30c2427fed9b4d71e6adebb54f"
+checksum = "e876bb2c3e52a8d4e6684526a2d4e81f9d028b939ee4dc5dc775fe10deb44d59"
 dependencies = [
  "dashmap",
- "indexmap 2.9.0",
+ "indexmap 2.11.4",
  "la-arena",
  "ra_ap_cfg",
  "ra_ap_intern",
@@ -1655,9 +1685,9 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_cfg"
-version = "0.0.288"
+version = "0.0.301"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cea86a5d6e84fd73824c26f52442807af911db038db821124b2ac65fac24209"
+checksum = "3a0b56eb4536ce6d2431932c4d337aeeaf7bb22c9249b38cbe80677b5881228f"
 dependencies = [
  "ra_ap_intern",
  "ra_ap_tt",
@@ -1667,19 +1697,19 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_edition"
-version = "0.0.288"
+version = "0.0.301"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5538d534eeb8526071610664dc64b71ca336b78f6933ff7241d10c1f37e91b"
+checksum = "1bdc6cbe42c63ca78611bae82bfc8db24864f33dccc813697c5fde43a0907285"
 
 [[package]]
 name = "ra_ap_hir"
-version = "0.0.288"
+version = "0.0.301"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44796828650900565917ddcc944fecdf6c7d5c3a8a31141f17268ea8c1d2e6f0"
+checksum = "ebffdc134eccabc17209d7760cfff7fd12ed18ab6e21188c5e084b97aa38504c"
 dependencies = [
  "arrayvec",
  "either",
- "indexmap 2.9.0",
+ "indexmap 2.11.4",
  "itertools 0.14.0",
  "ra_ap_base_db",
  "ra_ap_cfg",
@@ -1699,17 +1729,17 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_hir_def"
-version = "0.0.288"
+version = "0.0.301"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8949b2fb362a1e4eab4d90c7299f0fad3f2c887d9f7d9c286ac6530da4141f85"
+checksum = "81d2337ef59550392d42aa997aa1105a3d6d1c2b3a583c777786bc4a0a074fd5"
 dependencies = [
  "arrayvec",
- "bitflags 2.9.1",
+ "bitflags 2.9.4",
  "cov-mark",
  "drop_bomb",
  "either",
  "fst",
- "indexmap 2.9.0",
+ "indexmap 2.11.4",
  "itertools 0.14.0",
  "la-arena",
  "ra-ap-rustc_abi",
@@ -1737,9 +1767,9 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_hir_expand"
-version = "0.0.288"
+version = "0.0.301"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22457a431b5eeb67517e03266fddefe48839b060a674a6b18bd84269012ede1e"
+checksum = "97cf8ececb2743a819d8299a408e17f164dd1a1004d65936b3d5493b55330326"
 dependencies = [
  "cov-mark",
  "either",
@@ -1765,20 +1795,20 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_hir_ty"
-version = "0.0.288"
+version = "0.0.301"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a4b7a7531414203e11ae447627e2909250eff392c06278ab53ae2a022ecc9fc"
+checksum = "bc004e1099ba766a61500c27d34eb5cd336430d0a89a9620315a90d7a202a73a"
 dependencies = [
  "arrayvec",
- "bitflags 2.9.1",
- "chalk-derive",
- "chalk-ir",
+ "bitflags 2.9.4",
+ "chalk-derive 0.103.0",
+ "chalk-ir 0.103.0",
  "chalk-recursive",
  "chalk-solve",
  "cov-mark",
  "either",
  "ena",
- "indexmap 2.9.0",
+ "indexmap 2.11.4",
  "itertools 0.14.0",
  "la-arena",
  "oorandom",
@@ -1806,17 +1836,17 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_ide_db"
-version = "0.0.288"
+version = "0.0.301"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77741ceb096d4f5ecf5384210ea5a2b46878125047c6b0df2bdcfac08a20ea0c"
+checksum = "d2acb572d6dbeb1c96d0339890ba91298b8f5f0ab22648da4ee2b4ab77dbc3fe"
 dependencies = [
  "arrayvec",
- "bitflags 2.9.1",
+ "bitflags 2.9.4",
  "cov-mark",
  "crossbeam-channel",
  "either",
  "fst",
- "indexmap 2.9.0",
+ "indexmap 2.11.4",
  "itertools 0.14.0",
  "line-index",
  "memchr",
@@ -1840,9 +1870,9 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_intern"
-version = "0.0.288"
+version = "0.0.301"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a1872cd5a425db6d5247a7deca11526e3104757f6732447ac6ee93c3e795725"
+checksum = "14586c2c4781b69fdd0c505972d9bff8c162a8740537a3ee506faff686d9a20d"
 dependencies = [
  "dashmap",
  "hashbrown 0.14.5",
@@ -1852,9 +1882,9 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_load-cargo"
-version = "0.0.288"
+version = "0.0.301"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f30f5433f056594b02f1879c5c2ce76ea9fd395f21e2a55df6ce3229db993caa"
+checksum = "50ce5546b3e3414507ab4d12348d0a28748062e33a1448895c68466d0b015503"
 dependencies = [
  "anyhow",
  "crossbeam-channel",
@@ -1873,13 +1903,13 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_mbe"
-version = "0.0.288"
+version = "0.0.301"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "222a993acaec35e90c08357aecd530b7170cc3a7f13b3ddfd15a200029ccd555"
+checksum = "67333c6405797cb64aafb994b9a179157b30beeda2352e203e800be2b184a22d"
 dependencies = [
  "arrayvec",
  "cov-mark",
- "ra-ap-rustc_lexer",
+ "ra-ap-rustc_lexer 0.123.0",
  "ra_ap_intern",
  "ra_ap_parser",
  "ra_ap_span",
@@ -1892,33 +1922,33 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_parser"
-version = "0.0.288"
+version = "0.0.301"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c5693f5efd27832e1ac572ea756a1a4a3f7eba07f1287268ca111710971c2e5"
+checksum = "3a3b92b8b147c0826b83e70ad44e3c98e94201fc93e1f09396c43b4d7958c22a"
 dependencies = [
  "drop_bomb",
- "ra-ap-rustc_lexer",
+ "ra-ap-rustc_lexer 0.123.0",
  "ra_ap_edition",
- "rustc-literal-escaper 0.0.3",
+ "rustc-literal-escaper",
  "tracing",
 ]
 
 [[package]]
 name = "ra_ap_paths"
-version = "0.0.288"
+version = "0.0.301"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39418eff64e59d4bf90dd825ac7d242576e9554669824ebc55a6628bde0aaf10"
+checksum = "d4991f3d57fac0def7822bebfeb159c8d7b58c824bf82044b765c54f2c0971e2"
 dependencies = [
  "camino",
 ]
 
 [[package]]
 name = "ra_ap_proc_macro_api"
-version = "0.0.288"
+version = "0.0.301"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14a315af8c4a9379c26abe7baa143d62e3975ff26f27c65332f9a5edccc56d38"
+checksum = "45db9e2df587d56f0738afa89fb2c100ff7c1e9cbe49e07f6a8b62342832211b"
 dependencies = [
- "indexmap 2.9.0",
+ "indexmap 2.11.4",
  "ra_ap_intern",
  "ra_ap_paths",
  "ra_ap_span",
@@ -1933,9 +1963,9 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_profile"
-version = "0.0.288"
+version = "0.0.301"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08274a0adbf8255f8b2672302452e31bbb2ed4d38324da9c72a7bf9cf1428483"
+checksum = "19981637b8ee4160e228c815a7fef3944b5c0555d6af41a931be92d68978bc6c"
 dependencies = [
  "cfg-if",
  "libc",
@@ -1945,9 +1975,9 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_project_model"
-version = "0.0.288"
+version = "0.0.301"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33deecb3724faf91f13b0f1b5115af7c4f5c9dc1dfbbf45f55261aa28f874838"
+checksum = "5bda0769fd6ca949fdd5917acb68ddc2c143745614ddd94ef38b376838611cf8"
 dependencies = [
  "anyhow",
  "cargo_metadata",
@@ -1965,15 +1995,16 @@ dependencies = [
  "serde",
  "serde_derive",
  "serde_json",
+ "temp-dir",
  "tracing",
  "triomphe",
 ]
 
 [[package]]
 name = "ra_ap_query-group-macro"
-version = "0.0.288"
+version = "0.0.301"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fdefdc9c8d6fd7d85ac572649378e83266262e09400bfdb7c8a7407d3cc2a3e"
+checksum = "5f182a4b05f004eabaa83250a5de7ea3a13a92c88f3cbe98bfa1880cd9fbce0a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1982,9 +2013,9 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_span"
-version = "0.0.288"
+version = "0.0.301"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c20071c89e1f7dd63c803130634f4bb6ce7783dc0e7ff90839d1d0f4e625b7a8"
+checksum = "ca6f9fa2de07f5cccf431674b90e82c1fe1ea2339db3b3869eec44d135de09a4"
 dependencies = [
  "hashbrown 0.14.5",
  "la-arena",
@@ -1998,9 +2029,9 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_stdx"
-version = "0.0.288"
+version = "0.0.301"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "552df390b26624eca7936aea1dbbb3786d7a12477e26ef917ffabba19f75ad44"
+checksum = "aa770adb32896fcba934b464ac3bd179163ba2b0766e275eed5b4e262e08492b"
 dependencies = [
  "crossbeam-channel",
  "crossbeam-utils",
@@ -2014,9 +2045,9 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_syntax"
-version = "0.0.288"
+version = "0.0.301"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a78db1a9966c0fa05446b8185da35a325680741119366c6246e4a9800f29143a"
+checksum = "6e9e1393281ad5c635239d353ed3cfbf28c8d0af03d0c61a3b24b31d1143b17f"
 dependencies = [
  "either",
  "itertools 0.14.0",
@@ -2024,7 +2055,7 @@ dependencies = [
  "ra_ap_stdx",
  "rowan",
  "rustc-hash 2.1.1",
- "rustc-literal-escaper 0.0.3",
+ "rustc-literal-escaper",
  "smol_str",
  "tracing",
  "triomphe",
@@ -2032,9 +2063,9 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_syntax-bridge"
-version = "0.0.288"
+version = "0.0.301"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e69ef7fad8598d5c9f14a375d56ec12200fa927bc805b600af419611f4642fdb"
+checksum = "684e6ff1008ee5340335888f0453d94bb38950f110059a51f1818c7f6a56a807"
 dependencies = [
  "ra_ap_intern",
  "ra_ap_parser",
@@ -2047,9 +2078,9 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_toolchain"
-version = "0.0.288"
+version = "0.0.301"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "628f3f190def67b1116d8bdd6ec4f6f206fada2c93b84ba71086d60c63429282"
+checksum = "61969c5f72af03a9837e077c2d939d87a5c863623725c461777c352664a3bb03"
 dependencies = [
  "camino",
  "home",
@@ -2057,12 +2088,12 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_tt"
-version = "0.0.288"
+version = "0.0.301"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e050f4ad13df59e90e38332860304a3e85ff2fa8d4585b8cc44fc982923c82b1"
+checksum = "fb87c7b35572c18a580ea811e970b94875fad5ac7cfa8644266a59081044f959"
 dependencies = [
  "arrayvec",
- "ra-ap-rustc_lexer",
+ "ra-ap-rustc_lexer 0.123.0",
  "ra_ap_intern",
  "ra_ap_stdx",
  "text-size",
@@ -2070,13 +2101,13 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_vfs"
-version = "0.0.288"
+version = "0.0.301"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62082190f0b3551e4d941bcaaac51a7c39c85b2e193bcc50d0807e1701da4083"
+checksum = "6c174d6b9b7a7f54687df7e00c3e75ed6f082a7943a9afb1d54f33c0c12773de"
 dependencies = [
  "crossbeam-channel",
  "fst",
- "indexmap 2.9.0",
+ "indexmap 2.11.4",
  "nohash-hasher",
  "ra_ap_paths",
  "ra_ap_stdx",
@@ -2086,9 +2117,9 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_vfs-notify"
-version = "0.0.288"
+version = "0.0.301"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efd7cfa1095b81bd1994ab70e5543c97a8733987eb0ddf390cf3ad58d4e2dc57"
+checksum = "04f6fce8d47c7ce9b8f2cd0e5a55f8fc4878d6043e61f46cde4391d3a5c6086f"
 dependencies = [
  "crossbeam-channel",
  "notify",
@@ -2103,9 +2134,9 @@ dependencies = [
 
 [[package]]
 name = "rand"
-version = "0.9.1"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97"
+checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
 dependencies = [
  "rand_chacha",
  "rand_core",
@@ -2123,19 +2154,18 @@ dependencies = [
 
 [[package]]
 name = "rand_core"
-version = "0.9.2"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a509b1a2ffbe92afab0e55c8fd99dea1c280e8171bd2d88682bb20bc41cbc2c"
+checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
 dependencies = [
  "getrandom",
- "zerocopy 0.8.20",
 ]
 
 [[package]]
 name = "rayon"
-version = "1.10.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
+checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f"
 dependencies = [
  "either",
  "rayon-core",
@@ -2143,9 +2173,9 @@ dependencies = [
 
 [[package]]
 name = "rayon-core"
-version = "1.12.1"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
+checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91"
 dependencies = [
  "crossbeam-deque",
  "crossbeam-utils",
@@ -2153,11 +2183,11 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.8"
+version = "0.5.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
+checksum = "5407465600fb0548f1442edf71dd20683c6ed326200ace4b1ef0763521bb3b77"
 dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.9.4",
 ]
 
 [[package]]
@@ -2182,47 +2212,32 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.11.1"
+version = "1.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+checksum = "8b5288124840bee7b386bc413c487869b360b2b4ec421ea56425128692f2a82c"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.9",
- "regex-syntax 0.8.5",
+ "regex-automata",
+ "regex-syntax",
 ]
 
 [[package]]
 name = "regex-automata"
-version = "0.1.10"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
-dependencies = [
- "regex-syntax 0.6.29",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
+checksum = "833eb9ce86d40ef33cb1306d8accf7bc8ec2bfea4355cbdebb3df68b40925cad"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.5",
+ "regex-syntax",
 ]
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.29"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
-
-[[package]]
-name = "regex-syntax"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+checksum = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001"
 
 [[package]]
 name = "rowan"
@@ -2259,21 +2274,15 @@ checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
 
 [[package]]
 name = "rustc-literal-escaper"
-version = "0.0.2"
+version = "0.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0041b6238913c41fe704213a4a9329e2f685a156d1781998128b4149c230ad04"
-
-[[package]]
-name = "rustc-literal-escaper"
-version = "0.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78744cd17f5d01c75b709e49807d1363e02a940ccee2e9e72435843fdb0d076e"
+checksum = "ab03008eb631b703dd16978282ae36c73282e7922fe101a4bd072a40ecea7b8b"
 
 [[package]]
 name = "rustc-stable-hash"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2febf9acc5ee5e99d1ad0afcdbccc02d87aa3f857a1f01f825b80eacf8edfcd1"
+checksum = "781442f29170c5c93b7185ad559492601acdc71d5bb0706f5868094f45cfcd08"
 
 [[package]]
 name = "rustc_apfloat"
@@ -2281,28 +2290,36 @@ version = "0.2.3+llvm-462a31f5a5ab"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "486c2179b4796f65bfe2ee33679acf0927ac83ecf583ad6c91c3b4570911b9ad"
 dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.9.4",
  "smallvec",
 ]
 
 [[package]]
-name = "ryu"
-version = "1.0.19"
+name = "rustversion"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
+
+[[package]]
+name = "ryu"
+version = "1.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
 
 [[package]]
 name = "salsa"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8fff508e3d6ef42a32607f7538e17171a877a12015e32036f46e99d00c95781"
+checksum = "2e235afdb8e510f38a07138fbe5a0b64691894358a9c0cbd813b1aade110efc9"
 dependencies = [
  "boxcar",
  "crossbeam-queue",
- "dashmap",
- "hashbrown 0.15.2",
+ "crossbeam-utils",
+ "hashbrown 0.15.5",
  "hashlink",
- "indexmap 2.9.0",
+ "indexmap 2.11.4",
+ "intrusive-collections",
+ "papaya",
  "parking_lot",
  "portable-atomic",
  "rayon",
@@ -2316,17 +2333,16 @@ dependencies = [
 
 [[package]]
 name = "salsa-macro-rules"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ea72b3c06f2ce6350fe3a0eeb7aaaf842d1d8352b706973c19c4f02e298a87c"
+checksum = "2edb86a7e9c91f6d30c9ce054312721dbe773a162db27bbfae834d16177b30ce"
 
 [[package]]
 name = "salsa-macros"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ce92025bc160b27814a207cb78d680973af17f863c7f4fc56cf3a535e22f378"
+checksum = "d0778d6e209051bc4e75acfe83bcd7848601ec3dbe9c3dbb982829020e9128af"
 dependencies = [
- "heck",
  "proc-macro2",
  "quote",
  "syn",
@@ -2354,6 +2370,18 @@ dependencies = [
  "serde_json",
 ]
 
+[[package]]
+name = "schemars"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "82d20c4491bc164fa2f6c5d44565947a52ad80b9505d8e36f8d54c27c739fcd0"
+dependencies = [
+ "dyn-clone",
+ "ref-cast",
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "scoped-tls"
 version = "1.0.1"
@@ -2366,6 +2394,16 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
+[[package]]
+name = "seize"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4b8d813387d566f627f3ea1b914c068aac94c40ae27ec43f5f33bde65abefe7"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "semver"
 version = "1.0.26"
@@ -2377,18 +2415,19 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.219"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
 dependencies = [
+ "serde_core",
  "serde_derive",
 ]
 
 [[package]]
 name = "serde-untagged"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "299d9c19d7d466db4ab10addd5703e4c615dec2a5a16dbbafe191045e87ee66e"
+checksum = "34836a629bcbc6f1afdf0907a744870039b1e14c0561cb26094fa683b158eff3"
 dependencies = [
  "erased-serde",
  "serde",
@@ -2406,10 +2445,19 @@ dependencies = [
 ]
 
 [[package]]
-name = "serde_derive"
-version = "1.0.219"
+name = "serde_core"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2418,14 +2466,16 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.140"
+version = "1.0.145"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
+checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
 dependencies = [
+ "indexmap 2.11.4",
  "itoa",
  "memchr",
  "ryu",
  "serde",
+ "serde_core",
 ]
 
 [[package]]
@@ -2438,17 +2488,27 @@ dependencies = [
 ]
 
 [[package]]
-name = "serde_with"
-version = "3.13.0"
+name = "serde_spanned"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf65a400f8f66fb7b0552869ad70157166676db75ed8181f8104ea91cf9d0b42"
+checksum = "5417783452c2be558477e104686f7de5dae53dba813c28435e0e70f82d9b04ee"
+dependencies = [
+ "serde_core",
+]
+
+[[package]]
+name = "serde_with"
+version = "3.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c522100790450cf78eeac1507263d0a350d4d5b30df0c8e1fe051a10c22b376e"
 dependencies = [
  "base64",
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.9.0",
- "schemars",
+ "indexmap 2.11.4",
+ "schemars 0.9.0",
+ "schemars 1.0.4",
  "serde",
  "serde_derive",
  "serde_json",
@@ -2458,9 +2518,9 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.13.0"
+version = "3.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81679d9ed988d5e9a5e6531dc3f2c28efbd639cbd1dfb628df08edea6004da77"
+checksum = "327ada00f7d64abaac1e55a6911e90cf665aa051b9a561c7006c157f4633135e"
 dependencies = [
  "darling",
  "proc-macro2",
@@ -2474,7 +2534,7 @@ version = "0.9.34+deprecated"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
 dependencies = [
- "indexmap 2.9.0",
+ "indexmap 2.11.4",
  "itoa",
  "ryu",
  "serde",
@@ -2532,9 +2592,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
 [[package]]
 name = "syn"
-version = "2.0.103"
+version = "2.0.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4307e30089d6fd6aff212f2da3a1f9e32f3223b1f010fb09b7c95f90f3ca1e8"
+checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2543,15 +2603,21 @@ dependencies = [
 
 [[package]]
 name = "synstructure"
-version = "0.13.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
 dependencies = [
  "proc-macro2",
  "quote",
  "syn",
 ]
 
+[[package]]
+name = "temp-dir"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83176759e9416cf81ee66cb6508dbfe9c96f20b8b56265a39917551c23c70964"
+
 [[package]]
 name = "text-size"
 version = "1.1.1"
@@ -2566,38 +2632,18 @@ checksum = "144f754d318415ac792f9d69fc87abbbfc043ce2ef041c60f16ad828f638717d"
 
 [[package]]
 name = "thiserror"
-version = "1.0.69"
+version = "2.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+checksum = "3467d614147380f2e4e374161426ff399c91084acd2363eaf549172b3d5e60c0"
 dependencies = [
- "thiserror-impl 1.0.69",
-]
-
-[[package]]
-name = "thiserror"
-version = "2.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
-dependencies = [
- "thiserror-impl 2.0.12",
+ "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.69"
+version = "2.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "2.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
+checksum = "6c5e1be1c48b9172ee610da68fd9cd2770e7a4056cb3fc98710ee6906f0c7960"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2606,22 +2652,20 @@ dependencies = [
 
 [[package]]
 name = "thread_local"
-version = "1.1.8"
+version = "1.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
+checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185"
 dependencies = [
  "cfg-if",
- "once_cell",
 ]
 
 [[package]]
 name = "time"
-version = "0.3.37"
+version = "0.3.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21"
+checksum = "83bde6f1ec10e72d583d91623c939f623002284ef622b87de38cfd546cbf2031"
 dependencies = [
  "deranged",
- "itoa",
  "num-conv",
  "powerfmt",
  "serde",
@@ -2631,15 +2675,15 @@ dependencies = [
 
 [[package]]
 name = "time-core"
-version = "0.1.2"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b"
 
 [[package]]
 name = "time-macros"
-version = "0.2.19"
+version = "0.2.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de"
+checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3"
 dependencies = [
  "num-conv",
  "time-core",
@@ -2662,11 +2706,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362"
 dependencies = [
  "serde",
- "serde_spanned",
- "toml_datetime",
+ "serde_spanned 0.6.9",
+ "toml_datetime 0.6.11",
  "toml_edit",
 ]
 
+[[package]]
+name = "toml"
+version = "0.9.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00e5e5d9bf2475ac9d4f0d9edab68cc573dc2fd644b0dba36b0c30a92dd9eaa0"
+dependencies = [
+ "indexmap 2.11.4",
+ "serde_core",
+ "serde_spanned 1.0.2",
+ "toml_datetime 0.7.2",
+ "toml_parser",
+ "toml_writer",
+ "winnow",
+]
+
 [[package]]
 name = "toml_datetime"
 version = "0.6.11"
@@ -2676,26 +2735,50 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "toml_datetime"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32f1085dec27c2b6632b04c80b3bb1b4300d6495d1e129693bdda7d91e72eec1"
+dependencies = [
+ "serde_core",
+]
+
 [[package]]
 name = "toml_edit"
 version = "0.22.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
 dependencies = [
- "indexmap 2.9.0",
+ "indexmap 2.11.4",
  "serde",
- "serde_spanned",
- "toml_datetime",
+ "serde_spanned 0.6.9",
+ "toml_datetime 0.6.11",
  "toml_write",
  "winnow",
 ]
 
+[[package]]
+name = "toml_parser"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cf893c33be71572e0e9aa6dd15e6677937abd686b066eac3f8cd3531688a627"
+dependencies = [
+ "winnow",
+]
+
 [[package]]
 name = "toml_write"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"
 
+[[package]]
+name = "toml_writer"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d163a63c116ce562a22cda521fcc4d79152e7aba014456fb5eb442f6d6a10109"
+
 [[package]]
 name = "tracing"
 version = "0.1.41"
@@ -2709,9 +2792,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.28"
+version = "0.1.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
+checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2720,9 +2803,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.33"
+version = "0.1.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
+checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678"
 dependencies = [
  "once_cell",
  "valuable",
@@ -2745,21 +2828,21 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
 dependencies = [
- "log 0.4.27",
+ "log 0.4.28",
  "once_cell",
  "tracing-core",
 ]
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.19"
+version = "0.3.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
+checksum = "2054a14f5307d601f88daf0553e1cbf472acc4f2c51afab632431cdcd72124d5"
 dependencies = [
  "matchers",
  "nu-ansi-term",
  "once_cell",
- "regex",
+ "regex-automata",
  "sharded-slab",
  "smallvec",
  "thread_local",
@@ -2770,22 +2853,23 @@ dependencies = [
 
 [[package]]
 name = "tree-sitter"
-version = "0.24.6"
+version = "0.25.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f2434c86ba59ed15af56039cc5bf1acf8ba76ce301e32ef08827388ef285ec5"
+checksum = "ccd2a058a86cfece0bf96f7cce1021efef9c8ed0e892ab74639173e5ed7a34fa"
 dependencies = [
  "cc",
  "regex",
- "regex-syntax 0.8.5",
+ "regex-syntax",
+ "serde_json",
  "streaming-iterator",
  "tree-sitter-language",
 ]
 
 [[package]]
 name = "tree-sitter-embedded-template"
-version = "0.23.2"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "790063ef14e5b67556abc0b3be0ed863fb41d65ee791cf8c0b20eb42a1fa46af"
+checksum = "833d528e8fcb4e49ddb04d4d6450ddb8ac08f282a58fec94ce981c9c5dbf7e3a"
 dependencies = [
  "cc",
  "tree-sitter-language",
@@ -2803,9 +2887,9 @@ dependencies = [
 
 [[package]]
 name = "tree-sitter-language"
-version = "0.1.3"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c199356c799a8945965bb5f2c55b2ad9d9aa7c4b4f6e587fe9dea0bc715e5f9c"
+checksum = "c4013970217383f67b18aef68f6fb2e8d409bc5755227092d32efb0422ba24b8"
 
 [[package]]
 name = "tree-sitter-ql"
@@ -2866,9 +2950,9 @@ checksum = "a3e5df347f0bf3ec1d670aad6ca5c6a1859cd9ea61d2113125794654ccced68f"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.17"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00e2473a93778eb0bad35909dff6a10d28e63f792f16ed15e404fca9d5eeedbe"
+checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d"
 
 [[package]]
 name = "unicode-properties"
@@ -2890,13 +2974,14 @@ checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
 
 [[package]]
 name = "url"
-version = "2.5.4"
+version = "2.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
+checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b"
 dependencies = [
  "form_urlencoded",
  "idna",
  "percent-encoding",
+ "serde",
 ]
 
 [[package]]
@@ -2913,9 +2998,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "valuable"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
 
 [[package]]
 name = "version_check"
@@ -2935,38 +3020,49 @@ dependencies = [
 
 [[package]]
 name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
+version = "0.11.1+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
 [[package]]
 name = "wasi"
-version = "0.13.3+wasi-0.2.2"
+version = "0.14.5+wasi-0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2"
+checksum = "a4494f6290a82f5fe584817a676a34b9d6763e8d9d18204009fb31dceca98fd4"
 dependencies = [
- "wit-bindgen-rt",
+ "wasip2",
+]
+
+[[package]]
+name = "wasip2"
+version = "1.0.0+wasi-0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03fa2761397e5bd52002cd7e73110c71af2109aca4e521a9f40473fe685b0a24"
+dependencies = [
+ "wit-bindgen",
 ]
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.99"
+version = "0.2.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396"
+checksum = "7e14915cadd45b529bb8d1f343c4ed0ac1de926144b746e2710f9cd05df6603b"
 dependencies = [
  "cfg-if",
  "once_cell",
+ "rustversion",
  "wasm-bindgen-macro",
+ "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.99"
+version = "0.2.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79"
+checksum = "e28d1ba982ca7923fd01448d5c30c6864d0a14109560296a162f80f305fb93bb"
 dependencies = [
  "bumpalo",
- "log 0.4.27",
+ "log 0.4.28",
  "proc-macro2",
  "quote",
  "syn",
@@ -2975,9 +3071,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.99"
+version = "0.2.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe"
+checksum = "7c3d463ae3eff775b0c45df9da45d68837702ac35af998361e2c84e7c5ec1b0d"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -2985,9 +3081,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.99"
+version = "0.2.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2"
+checksum = "7bb4ce89b08211f923caf51d527662b75bdc9c9c7aab40f86dcb9fb85ac552aa"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2998,63 +3094,85 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.99"
+version = "0.2.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6"
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+checksum = "f143854a3b13752c6950862c906306adb27c7e839f7414cec8fea35beab624c1"
 dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
+ "unicode-ident",
 ]
 
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
 [[package]]
 name = "winapi-util"
-version = "0.1.9"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
+checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.61.0",
 ]
 
 [[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
+name = "windows-core"
+version = "0.61.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
+dependencies = [
+ "windows-implement",
+ "windows-interface",
+ "windows-link 0.1.3",
+ "windows-result",
+ "windows-strings",
+]
 
 [[package]]
-name = "windows-core"
-version = "0.52.0"
+name = "windows-implement"
+version = "0.60.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836"
 dependencies = [
- "windows-targets 0.52.6",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.59.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
 ]
 
 [[package]]
 name = "windows-link"
-version = "0.1.1"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38"
+checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
 
 [[package]]
-name = "windows-sys"
-version = "0.48.0"
+name = "windows-link"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65"
+
+[[package]]
+name = "windows-result"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
 dependencies = [
- "windows-targets 0.48.5",
+ "windows-link 0.1.3",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
+dependencies = [
+ "windows-link 0.1.3",
 ]
 
 [[package]]
@@ -3081,22 +3199,16 @@ version = "0.60.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
 dependencies = [
- "windows-targets 0.53.2",
+ "windows-targets 0.53.3",
 ]
 
 [[package]]
-name = "windows-targets"
-version = "0.48.5"
+name = "windows-sys"
+version = "0.61.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+checksum = "e201184e40b2ede64bc2ea34968b28e33622acdbbf37104f0e4a33f7abe657aa"
 dependencies = [
- "windows_aarch64_gnullvm 0.48.5",
- "windows_aarch64_msvc 0.48.5",
- "windows_i686_gnu 0.48.5",
- "windows_i686_msvc 0.48.5",
- "windows_x86_64_gnu 0.48.5",
- "windows_x86_64_gnullvm 0.48.5",
- "windows_x86_64_msvc 0.48.5",
+ "windows-link 0.2.0",
 ]
 
 [[package]]
@@ -3117,10 +3229,11 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.53.2"
+version = "0.53.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef"
+checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91"
 dependencies = [
+ "windows-link 0.1.3",
  "windows_aarch64_gnullvm 0.53.0",
  "windows_aarch64_msvc 0.53.0",
  "windows_i686_gnu 0.53.0",
@@ -3131,12 +3244,6 @@ dependencies = [
  "windows_x86_64_msvc 0.53.0",
 ]
 
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
-
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.52.6"
@@ -3149,12 +3256,6 @@ version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
 
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.52.6"
@@ -3167,12 +3268,6 @@ version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
 
-[[package]]
-name = "windows_i686_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.52.6"
@@ -3197,12 +3292,6 @@ version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
 
-[[package]]
-name = "windows_i686_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.52.6"
@@ -3215,12 +3304,6 @@ version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
 
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.52.6"
@@ -3233,12 +3316,6 @@ version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
 
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
-
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.52.6"
@@ -3251,12 +3328,6 @@ version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
 
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.52.6"
@@ -3271,21 +3342,18 @@ checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
 
 [[package]]
 name = "winnow"
-version = "0.7.11"
+version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74c7b26e3480b707944fc872477815d29a8e429d2f93a1ce000f5fa84a15cbcd"
+checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
-name = "wit-bindgen-rt"
-version = "0.33.0"
+name = "wit-bindgen"
+version = "0.45.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
-dependencies = [
- "bitflags 2.9.1",
-]
+checksum = "5c573471f125075647d03df72e026074b7203790d41351cd6edc96f46bcccd36"
 
 [[package]]
 name = "writeable"
@@ -3325,39 +3393,18 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.7.35"
+version = "0.8.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c"
 dependencies = [
- "byteorder",
- "zerocopy-derive 0.7.35",
-]
-
-[[package]]
-name = "zerocopy"
-version = "0.8.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dde3bb8c68a8f3f1ed4ac9221aad6b10cece3e60a8e2ea54a6a2dec806d0084c"
-dependencies = [
- "zerocopy-derive 0.8.20",
+ "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.35"
+version = "0.8.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "zerocopy-derive"
-version = "0.8.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eea57037071898bf96a6da35fd626f4f27e9cee3ead2a6c703cf09d472b2e700"
+checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3398,9 +3445,9 @@ dependencies = [
 
 [[package]]
 name = "zerovec"
-version = "0.11.2"
+version = "0.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428"
+checksum = "e7aa2bd55086f1ab526693ecbe444205da57e25f4489879da80635a46d90e73b"
 dependencies = [
  "yoke",
  "zerofrom",
@@ -3438,9 +3485,9 @@ dependencies = [
 
 [[package]]
 name = "zstd-sys"
-version = "2.0.15+zstd.1.5.7"
+version = "2.0.16+zstd.1.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb81183ddd97d0c74cedf1d50d85c8d08c1b8b68ee863bdee9e706eedba1a237"
+checksum = "91e19ebc2adc8f83e43039e79776e3fda8ca919132d68a1fed6a5faca2683748"
 dependencies = [
  "cc",
  "pkg-config",
diff --git a/Cargo.toml b/Cargo.toml
index 7866a65d209..58a755340b9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,4 +10,3 @@ members = [
     "rust/ast-generator",
     "rust/autobuild",
 ]
-exclude = ["mad-generation-build"]
diff --git a/MODULE.bazel b/MODULE.bazel
index 52c07a395b5..dfd2c469a5e 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -14,21 +14,21 @@ local_path_override(
 
 # see https://registry.bazel.build/ for a list of available packages
 
-bazel_dep(name = "platforms", version = "0.0.11")
+bazel_dep(name = "platforms", version = "1.0.0")
 bazel_dep(name = "rules_go", version = "0.56.1")
 bazel_dep(name = "rules_pkg", version = "1.0.1")
 bazel_dep(name = "rules_nodejs", version = "6.2.0-codeql.1")
 bazel_dep(name = "rules_python", version = "0.40.0")
-bazel_dep(name = "rules_shell", version = "0.3.0")
-bazel_dep(name = "bazel_skylib", version = "1.7.1")
+bazel_dep(name = "rules_shell", version = "0.5.0")
+bazel_dep(name = "bazel_skylib", version = "1.8.1")
 bazel_dep(name = "abseil-cpp", version = "20240116.1", repo_name = "absl")
 bazel_dep(name = "nlohmann_json", version = "3.11.3", repo_name = "json")
 bazel_dep(name = "fmt", version = "10.0.0")
 bazel_dep(name = "rules_kotlin", version = "2.1.3-codeql.1")
 bazel_dep(name = "gazelle", version = "0.40.0")
-bazel_dep(name = "rules_dotnet", version = "0.17.4")
+bazel_dep(name = "rules_dotnet", version = "0.19.2-codeql.1")
 bazel_dep(name = "googletest", version = "1.14.0.bcr.1")
-bazel_dep(name = "rules_rust", version = "0.63.0")
+bazel_dep(name = "rules_rust", version = "0.66.0")
 bazel_dep(name = "zstd", version = "1.5.5.bcr.1")
 
 bazel_dep(name = "buildifier_prebuilt", version = "6.4.0", dev_dependency = True)
@@ -89,8 +89,8 @@ use_repo(
     "vendor_py__cc-1.2.14",
     "vendor_py__clap-4.5.30",
     "vendor_py__regex-1.11.1",
-    "vendor_py__tree-sitter-0.20.4",
-    "vendor_py__tree-sitter-graph-0.7.0",
+    "vendor_py__tree-sitter-0.24.7",
+    "vendor_py__tree-sitter-graph-0.12.0",
 )
 
 # deps for ruby+rust
@@ -98,54 +98,54 @@ use_repo(
 tree_sitter_extractors_deps = use_extension("//misc/bazel/3rdparty:tree_sitter_extractors_extension.bzl", "r")
 use_repo(
     tree_sitter_extractors_deps,
-    "vendor_ts__anyhow-1.0.98",
+    "vendor_ts__anyhow-1.0.100",
     "vendor_ts__argfile-0.2.1",
-    "vendor_ts__chalk-ir-0.103.0",
-    "vendor_ts__chrono-0.4.41",
-    "vendor_ts__clap-4.5.40",
+    "vendor_ts__chalk-ir-0.104.0",
+    "vendor_ts__chrono-0.4.42",
+    "vendor_ts__clap-4.5.48",
     "vendor_ts__dunce-1.0.5",
     "vendor_ts__either-1.15.0",
     "vendor_ts__encoding-0.2.33",
     "vendor_ts__figment-0.10.19",
-    "vendor_ts__flate2-1.1.0",
-    "vendor_ts__glob-0.3.2",
-    "vendor_ts__globset-0.4.15",
+    "vendor_ts__flate2-1.1.2",
+    "vendor_ts__glob-0.3.3",
+    "vendor_ts__globset-0.4.16",
     "vendor_ts__itertools-0.14.0",
     "vendor_ts__lazy_static-1.5.0",
     "vendor_ts__mustache-0.9.0",
     "vendor_ts__num-traits-0.2.19",
     "vendor_ts__num_cpus-1.17.0",
-    "vendor_ts__proc-macro2-1.0.95",
-    "vendor_ts__quote-1.0.40",
-    "vendor_ts__ra_ap_base_db-0.0.288",
-    "vendor_ts__ra_ap_cfg-0.0.288",
-    "vendor_ts__ra_ap_hir-0.0.288",
-    "vendor_ts__ra_ap_hir_def-0.0.288",
-    "vendor_ts__ra_ap_hir_expand-0.0.288",
-    "vendor_ts__ra_ap_hir_ty-0.0.288",
-    "vendor_ts__ra_ap_ide_db-0.0.288",
-    "vendor_ts__ra_ap_intern-0.0.288",
-    "vendor_ts__ra_ap_load-cargo-0.0.288",
-    "vendor_ts__ra_ap_parser-0.0.288",
-    "vendor_ts__ra_ap_paths-0.0.288",
-    "vendor_ts__ra_ap_project_model-0.0.288",
-    "vendor_ts__ra_ap_span-0.0.288",
-    "vendor_ts__ra_ap_stdx-0.0.288",
-    "vendor_ts__ra_ap_syntax-0.0.288",
-    "vendor_ts__ra_ap_vfs-0.0.288",
-    "vendor_ts__rand-0.9.1",
-    "vendor_ts__rayon-1.10.0",
-    "vendor_ts__regex-1.11.1",
-    "vendor_ts__serde-1.0.219",
-    "vendor_ts__serde_json-1.0.140",
-    "vendor_ts__serde_with-3.13.0",
-    "vendor_ts__syn-2.0.103",
-    "vendor_ts__toml-0.8.23",
+    "vendor_ts__proc-macro2-1.0.101",
+    "vendor_ts__quote-1.0.41",
+    "vendor_ts__ra_ap_base_db-0.0.301",
+    "vendor_ts__ra_ap_cfg-0.0.301",
+    "vendor_ts__ra_ap_hir-0.0.301",
+    "vendor_ts__ra_ap_hir_def-0.0.301",
+    "vendor_ts__ra_ap_hir_expand-0.0.301",
+    "vendor_ts__ra_ap_hir_ty-0.0.301",
+    "vendor_ts__ra_ap_ide_db-0.0.301",
+    "vendor_ts__ra_ap_intern-0.0.301",
+    "vendor_ts__ra_ap_load-cargo-0.0.301",
+    "vendor_ts__ra_ap_parser-0.0.301",
+    "vendor_ts__ra_ap_paths-0.0.301",
+    "vendor_ts__ra_ap_project_model-0.0.301",
+    "vendor_ts__ra_ap_span-0.0.301",
+    "vendor_ts__ra_ap_stdx-0.0.301",
+    "vendor_ts__ra_ap_syntax-0.0.301",
+    "vendor_ts__ra_ap_vfs-0.0.301",
+    "vendor_ts__rand-0.9.2",
+    "vendor_ts__rayon-1.11.0",
+    "vendor_ts__regex-1.11.3",
+    "vendor_ts__serde-1.0.228",
+    "vendor_ts__serde_json-1.0.145",
+    "vendor_ts__serde_with-3.14.1",
+    "vendor_ts__syn-2.0.106",
+    "vendor_ts__toml-0.9.7",
     "vendor_ts__tracing-0.1.41",
     "vendor_ts__tracing-flame-0.2.0",
-    "vendor_ts__tracing-subscriber-0.3.19",
-    "vendor_ts__tree-sitter-0.24.6",
-    "vendor_ts__tree-sitter-embedded-template-0.23.2",
+    "vendor_ts__tracing-subscriber-0.3.20",
+    "vendor_ts__tree-sitter-0.25.9",
+    "vendor_ts__tree-sitter-embedded-template-0.25.0",
     "vendor_ts__tree-sitter-json-0.24.8",
     "vendor_ts__tree-sitter-ql-0.23.1",
     "vendor_ts__tree-sitter-ruby-0.23.1",
@@ -172,7 +172,7 @@ http_archive(
 )
 
 dotnet = use_extension("@rules_dotnet//dotnet:extensions.bzl", "dotnet")
-dotnet.toolchain(dotnet_version = "9.0.100")
+dotnet.toolchain(dotnet_version = "9.0.300")
 use_repo(dotnet, "dotnet_toolchains")
 
 register_toolchains("@dotnet_toolchains//:all")
@@ -273,19 +273,19 @@ lfs_archive = use_repo_rule("//misc/bazel:lfs.bzl", "lfs_archive")
 
 lfs_archive(
     name = "ripunzip-linux",
-    src = "//misc/ripunzip:ripunzip-Linux.zip",
+    src = "//misc/ripunzip:ripunzip-Linux.tar.zst",
     build_file = "//misc/ripunzip:BUILD.ripunzip.bazel",
 )
 
 lfs_archive(
     name = "ripunzip-windows",
-    src = "//misc/ripunzip:ripunzip-Windows.zip",
+    src = "//misc/ripunzip:ripunzip-Windows.tar.zst",
     build_file = "//misc/ripunzip:BUILD.ripunzip.bazel",
 )
 
 lfs_archive(
     name = "ripunzip-macos",
-    src = "//misc/ripunzip:ripunzip-macOS.zip",
+    src = "//misc/ripunzip:ripunzip-macOS.tar.zst",
     build_file = "//misc/ripunzip:BUILD.ripunzip.bazel",
 )
 
diff --git a/actions/extractor/codeql-extractor.yml b/actions/extractor/codeql-extractor.yml
index ab737491005..376abe32597 100644
--- a/actions/extractor/codeql-extractor.yml
+++ b/actions/extractor/codeql-extractor.yml
@@ -1,14 +1,17 @@
 name: "actions"
-aliases: []
 display_name: "GitHub Actions"
 version: 0.0.1
 column_kind: "utf16"
 unicode_newlines: true
 build_modes:
   - none
-file_coverage_languages: []
+default_queries:
+  - codeql/actions-queries
+# Actions workflows are not reported separately by the GitHub API, so we can't
+# associate them with a specific language.
 github_api_languages: []
-scc_languages: []
+scc_languages:
+  - YAML
 file_types:
   - name: workflow
     display_name: GitHub Actions workflow files
diff --git a/actions/extractor/tools/baseline-config.json b/actions/extractor/tools/baseline-config.json
new file mode 100644
index 00000000000..fde0bd1ecdf
--- /dev/null
+++ b/actions/extractor/tools/baseline-config.json
@@ -0,0 +1,10 @@
+{
+    "paths": [
+        ".github/workflows/*.yml",
+        ".github/workflows/*.yaml",
+        ".github/reusable_workflows/**/*.yml",
+        ".github/reusable_workflows/**/*.yaml",
+        "**/action.yml",
+        "**/action.yaml"
+    ]
+}
diff --git a/actions/extractor/tools/configure-baseline.cmd b/actions/extractor/tools/configure-baseline.cmd
new file mode 100755
index 00000000000..b9c1b3f7a02
--- /dev/null
+++ b/actions/extractor/tools/configure-baseline.cmd
@@ -0,0 +1,2 @@
+@echo off
+type "%CODEQL_EXTRACTOR_ACTIONS_ROOT%\tools\baseline-config.json"
diff --git a/actions/extractor/tools/configure-baseline.sh b/actions/extractor/tools/configure-baseline.sh
new file mode 100755
index 00000000000..6fd7605ef3f
--- /dev/null
+++ b/actions/extractor/tools/configure-baseline.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+cat "$CODEQL_EXTRACTOR_ACTIONS_ROOT/tools/baseline-config.json"
diff --git a/actions/ql/integration-tests/query-suite/actions-code-scanning.qls.expected b/actions/ql/integration-tests/query-suite/actions-code-scanning.qls.expected
index 4a12174ffbd..90ee8a79483 100644
--- a/actions/ql/integration-tests/query-suite/actions-code-scanning.qls.expected
+++ b/actions/ql/integration-tests/query-suite/actions-code-scanning.qls.expected
@@ -1,3 +1,4 @@
+ql/actions/ql/src/Diagnostics/SuccessfullyExtractedFiles.ql
 ql/actions/ql/src/Security/CWE-077/EnvPathInjectionCritical.ql
 ql/actions/ql/src/Security/CWE-077/EnvVarInjectionCritical.ql
 ql/actions/ql/src/Security/CWE-094/CodeInjectionCritical.ql
diff --git a/actions/ql/integration-tests/query-suite/actions-security-and-quality.qls.expected b/actions/ql/integration-tests/query-suite/actions-security-and-quality.qls.expected
index d071a33c186..111fc3e4524 100644
--- a/actions/ql/integration-tests/query-suite/actions-security-and-quality.qls.expected
+++ b/actions/ql/integration-tests/query-suite/actions-security-and-quality.qls.expected
@@ -1,4 +1,5 @@
 ql/actions/ql/src/Debug/SyntaxError.ql
+ql/actions/ql/src/Diagnostics/SuccessfullyExtractedFiles.ql
 ql/actions/ql/src/Security/CWE-077/EnvPathInjectionCritical.ql
 ql/actions/ql/src/Security/CWE-077/EnvPathInjectionMedium.ql
 ql/actions/ql/src/Security/CWE-077/EnvVarInjectionCritical.ql
diff --git a/actions/ql/integration-tests/query-suite/actions-security-extended.qls.expected b/actions/ql/integration-tests/query-suite/actions-security-extended.qls.expected
index 06a9c6745e4..6ee3140d070 100644
--- a/actions/ql/integration-tests/query-suite/actions-security-extended.qls.expected
+++ b/actions/ql/integration-tests/query-suite/actions-security-extended.qls.expected
@@ -1,3 +1,4 @@
+ql/actions/ql/src/Diagnostics/SuccessfullyExtractedFiles.ql
 ql/actions/ql/src/Security/CWE-077/EnvPathInjectionCritical.ql
 ql/actions/ql/src/Security/CWE-077/EnvPathInjectionMedium.ql
 ql/actions/ql/src/Security/CWE-077/EnvVarInjectionCritical.ql
diff --git a/actions/ql/lib/CHANGELOG.md b/actions/ql/lib/CHANGELOG.md
index dffad0539b0..ffe1cba8281 100644
--- a/actions/ql/lib/CHANGELOG.md
+++ b/actions/ql/lib/CHANGELOG.md
@@ -1,3 +1,27 @@
+## 0.4.20
+
+No user-facing changes.
+
+## 0.4.19
+
+No user-facing changes.
+
+## 0.4.18
+
+No user-facing changes.
+
+## 0.4.17
+
+No user-facing changes.
+
+## 0.4.16
+
+No user-facing changes.
+
+## 0.4.15
+
+No user-facing changes.
+
 ## 0.4.14
 
 No user-facing changes.
diff --git a/actions/ql/lib/change-notes/released/0.4.15.md b/actions/ql/lib/change-notes/released/0.4.15.md
new file mode 100644
index 00000000000..364e11a8706
--- /dev/null
+++ b/actions/ql/lib/change-notes/released/0.4.15.md
@@ -0,0 +1,3 @@
+## 0.4.15
+
+No user-facing changes.
diff --git a/actions/ql/lib/change-notes/released/0.4.16.md b/actions/ql/lib/change-notes/released/0.4.16.md
new file mode 100644
index 00000000000..d2472bd981f
--- /dev/null
+++ b/actions/ql/lib/change-notes/released/0.4.16.md
@@ -0,0 +1,3 @@
+## 0.4.16
+
+No user-facing changes.
diff --git a/actions/ql/lib/change-notes/released/0.4.17.md b/actions/ql/lib/change-notes/released/0.4.17.md
new file mode 100644
index 00000000000..30a27b84b73
--- /dev/null
+++ b/actions/ql/lib/change-notes/released/0.4.17.md
@@ -0,0 +1,3 @@
+## 0.4.17
+
+No user-facing changes.
diff --git a/actions/ql/lib/change-notes/released/0.4.18.md b/actions/ql/lib/change-notes/released/0.4.18.md
new file mode 100644
index 00000000000..a6a7b2e276b
--- /dev/null
+++ b/actions/ql/lib/change-notes/released/0.4.18.md
@@ -0,0 +1,3 @@
+## 0.4.18
+
+No user-facing changes.
diff --git a/actions/ql/lib/change-notes/released/0.4.19.md b/actions/ql/lib/change-notes/released/0.4.19.md
new file mode 100644
index 00000000000..fb592c5a34f
--- /dev/null
+++ b/actions/ql/lib/change-notes/released/0.4.19.md
@@ -0,0 +1,3 @@
+## 0.4.19
+
+No user-facing changes.
diff --git a/actions/ql/lib/change-notes/released/0.4.20.md b/actions/ql/lib/change-notes/released/0.4.20.md
new file mode 100644
index 00000000000..874725a8c2d
--- /dev/null
+++ b/actions/ql/lib/change-notes/released/0.4.20.md
@@ -0,0 +1,3 @@
+## 0.4.20
+
+No user-facing changes.
diff --git a/actions/ql/lib/codeql-pack.release.yml b/actions/ql/lib/codeql-pack.release.yml
index 3841668fe04..380b2d09423 100644
--- 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.20
diff --git a/actions/ql/lib/codeql/Locations.qll b/actions/ql/lib/codeql/Locations.qll
index 96b5d45f18e..24c6ae9cda1 100644
--- a/actions/ql/lib/codeql/Locations.qll
+++ b/actions/ql/lib/codeql/Locations.qll
@@ -70,8 +70,8 @@ class Location extends TLocation, TBaseLocation {
 
   /**
    * Holds if this element is at the specified location.
-   * The location spans column `startcolumn` of line `startline` to
-   * column `endcolumn` of line `endline` in file `filepath`.
+   * The location spans column `sc` of line `sl` to
+   * column `ec` of line `el` in file `p`.
    * For more information, see
    * [Providing locations in CodeQL queries](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
    */
diff --git a/actions/ql/lib/codeql/actions/Ast.qll b/actions/ql/lib/codeql/actions/Ast.qll
index ae19a7a7e8c..6e76e4cd665 100644
--- a/actions/ql/lib/codeql/actions/Ast.qll
+++ b/actions/ql/lib/codeql/actions/Ast.qll
@@ -261,7 +261,7 @@ class If extends AstNode instanceof IfImpl {
 }
 
 /**
- * An Environemnt node representing a deployment environment.
+ * An Environment node representing a deployment environment.
  */
 class Environment extends AstNode instanceof EnvironmentImpl {
   string getName() { result = super.getName() }
diff --git a/actions/ql/lib/codeql/actions/ast/internal/Ast.qll b/actions/ql/lib/codeql/actions/ast/internal/Ast.qll
index b0cbb8a1d79..b922214e21c 100644
--- a/actions/ql/lib/codeql/actions/ast/internal/Ast.qll
+++ b/actions/ql/lib/codeql/actions/ast/internal/Ast.qll
@@ -125,12 +125,11 @@ abstract class AstNodeImpl extends TAstNode {
    * Gets the enclosing Step.
    */
   StepImpl getEnclosingStep() {
-    if this instanceof StepImpl
-    then result = this
-    else
-      if this instanceof ScalarValueImpl
-      then result.getAChildNode*() = this.getParentNode()
-      else none()
+    this instanceof StepImpl and
+    result = this
+    or
+    this instanceof ScalarValueImpl and
+    result.getAChildNode*() = this.getParentNode()
   }
 
   /**
@@ -1416,9 +1415,8 @@ class ExternalJobImpl extends JobImpl, UsesImpl {
   override string getVersion() {
     exists(YamlString name |
       n.lookup("uses") = name and
-      if not name.getValue().matches("\\.%")
-      then result = name.getValue().regexpCapture(repoUsesParser(), 4)
-      else none()
+      not name.getValue().matches("\\.%") and
+      result = name.getValue().regexpCapture(repoUsesParser(), 4)
     )
   }
 }
diff --git a/actions/ql/lib/codeql/actions/controlflow/BasicBlocks.qll b/actions/ql/lib/codeql/actions/controlflow/BasicBlocks.qll
index af5e0f62552..2dcfd81a47d 100644
--- a/actions/ql/lib/codeql/actions/controlflow/BasicBlocks.qll
+++ b/actions/ql/lib/codeql/actions/controlflow/BasicBlocks.qll
@@ -286,7 +286,7 @@ private module Cached {
   /**
    * Holds if `cfn` is the `i`th node in basic block `bb`.
    *
-   * In other words, `i` is the shortest distance from a node `bb`
+   * In other words, `i` is the shortest distance from a node `bbStart`
    * that starts a basic block to `cfn` along the `intraBBSucc` relation.
    */
   cached
diff --git a/actions/ql/lib/codeql/actions/controlflow/internal/Cfg.qll b/actions/ql/lib/codeql/actions/controlflow/internal/Cfg.qll
index 06295e3d88d..38ce9e7e03d 100644
--- a/actions/ql/lib/codeql/actions/controlflow/internal/Cfg.qll
+++ b/actions/ql/lib/codeql/actions/controlflow/internal/Cfg.qll
@@ -3,6 +3,8 @@ private import codeql.controlflow.Cfg as CfgShared
 private import codeql.Locations
 
 module Completion {
+  import codeql.controlflow.SuccessorType
+
   private newtype TCompletion =
     TSimpleCompletion() or
     TBooleanCompletion(boolean b) { b in [false, true] } or
@@ -25,7 +27,7 @@ module Completion {
 
     override predicate isValidFor(AstNode e) { not any(Completion c).isValidForSpecific(e) }
 
-    override NormalSuccessor getAMatchingSuccessorType() { any() }
+    override DirectSuccessor getAMatchingSuccessorType() { any() }
   }
 
   class BooleanCompletion extends NormalCompletion, TBooleanCompletion {
@@ -49,34 +51,6 @@ module Completion {
 
     override ReturnSuccessor getAMatchingSuccessorType() { any() }
   }
-
-  cached
-  private newtype TSuccessorType =
-    TNormalSuccessor() or
-    TBooleanSuccessor(boolean b) { b in [false, true] } or
-    TReturnSuccessor()
-
-  class SuccessorType extends TSuccessorType {
-    string toString() { none() }
-  }
-
-  class NormalSuccessor extends SuccessorType, TNormalSuccessor {
-    override string toString() { result = "successor" }
-  }
-
-  class BooleanSuccessor extends SuccessorType, TBooleanSuccessor {
-    boolean value;
-
-    BooleanSuccessor() { this = TBooleanSuccessor(value) }
-
-    override string toString() { result = value.toString() }
-
-    boolean getValue() { result = value }
-  }
-
-  class ReturnSuccessor extends SuccessorType, TReturnSuccessor {
-    override string toString() { result = "return" }
-  }
 }
 
 module CfgScope {
@@ -127,14 +101,8 @@ private module Implementation implements CfgShared::InputSig<Location> {
     last(scope.(CompositeAction), e, c)
   }
 
-  predicate successorTypeIsSimple(SuccessorType t) { t instanceof NormalSuccessor }
-
-  predicate successorTypeIsCondition(SuccessorType t) { t instanceof BooleanSuccessor }
-
   SuccessorType getAMatchingSuccessorType(Completion c) { result = c.getAMatchingSuccessorType() }
 
-  predicate isAbnormalExitType(SuccessorType t) { none() }
-
   int idOfAstNode(AstNode node) { none() }
 
   int idOfCfgScope(CfgScope scope) { none() }
diff --git a/actions/ql/lib/codeql/actions/dataflow/ExternalFlow.qll b/actions/ql/lib/codeql/actions/dataflow/ExternalFlow.qll
index 2914dac5f0a..9667c6e525e 100644
--- a/actions/ql/lib/codeql/actions/dataflow/ExternalFlow.qll
+++ b/actions/ql/lib/codeql/actions/dataflow/ExternalFlow.qll
@@ -63,10 +63,10 @@ predicate madSource(DataFlow::Node source, string kind, string fieldName) {
     (
       if fieldName.trim().matches("env.%")
       then source.asExpr() = uses.getInScopeEnvVarExpr(fieldName.trim().replaceAll("env.", ""))
-      else
-        if fieldName.trim().matches("output.%")
-        then source.asExpr() = uses
-        else none()
+      else (
+        fieldName.trim().matches("output.%") and
+        source.asExpr() = uses
+      )
     )
   )
 }
diff --git a/actions/ql/lib/codeql/actions/dataflow/FlowSources.qll b/actions/ql/lib/codeql/actions/dataflow/FlowSources.qll
index df3d513d005..18cc4322c81 100644
--- a/actions/ql/lib/codeql/actions/dataflow/FlowSources.qll
+++ b/actions/ql/lib/codeql/actions/dataflow/FlowSources.qll
@@ -31,14 +31,14 @@ abstract class RemoteFlowSource extends SourceNode {
 class GitHubCtxSource extends RemoteFlowSource {
   string flag;
   string event;
-  GitHubExpression e;
 
   GitHubCtxSource() {
-    this.asExpr() = e and
-    // github.head_ref
-    e.getFieldName() = "head_ref" and
-    flag = "branch" and
-    (
+    exists(GitHubExpression e |
+      this.asExpr() = e and
+      // github.head_ref
+      e.getFieldName() = "head_ref" and
+      flag = "branch"
+    |
       event = e.getATriggerEvent().getName() and
       event = "pull_request_target"
       or
@@ -148,7 +148,6 @@ class GhCLICommandSource extends RemoteFlowSource, CommandSource {
 class GitHubEventPathSource extends RemoteFlowSource, CommandSource {
   string cmd;
   string flag;
-  string access_path;
   Run run;
 
   // Examples
@@ -163,7 +162,7 @@ class GitHubEventPathSource extends RemoteFlowSource, CommandSource {
     run.getScript().getACommand() = cmd and
     cmd.matches("jq%") and
     cmd.matches("%GITHUB_EVENT_PATH%") and
-    exists(string regexp |
+    exists(string regexp, string access_path |
       untrustedEventPropertiesDataModel(regexp, flag) and
       not flag = "json" and
       access_path = "github.event" + cmd.regexpCapture(".*\\s+([^\\s]+)\\s+.*", 1) and
diff --git a/actions/ql/lib/codeql/actions/security/ArgumentInjectionQuery.qll b/actions/ql/lib/codeql/actions/security/ArgumentInjectionQuery.qll
index 1d461cca3df..7d3334adcf3 100644
--- a/actions/ql/lib/codeql/actions/security/ArgumentInjectionQuery.qll
+++ b/actions/ql/lib/codeql/actions/security/ArgumentInjectionQuery.qll
@@ -1,6 +1,7 @@
 private import actions
 private import codeql.actions.TaintTracking
 private import codeql.actions.dataflow.ExternalFlow
+private import codeql.actions.security.ControlChecks
 import codeql.actions.dataflow.FlowSources
 import codeql.actions.DataFlow
 
@@ -18,7 +19,6 @@ abstract class ArgumentInjectionSink extends DataFlow::Node {
  */
 class ArgumentInjectionFromEnvVarSink extends ArgumentInjectionSink {
   string command;
-  string argument;
 
   ArgumentInjectionFromEnvVarSink() {
     exists(Run run, string var |
@@ -27,7 +27,7 @@ class ArgumentInjectionFromEnvVarSink extends ArgumentInjectionSink {
         exists(run.getInScopeEnvVarExpr(var)) or
         var = "GITHUB_HEAD_REF"
       ) and
-      run.getScript().getAnEnvReachingArgumentInjectionSink(var, command, argument)
+      run.getScript().getAnEnvReachingArgumentInjectionSink(var, command, _)
     )
   }
 
@@ -43,13 +43,12 @@ class ArgumentInjectionFromEnvVarSink extends ArgumentInjectionSink {
  */
 class ArgumentInjectionFromCommandSink extends ArgumentInjectionSink {
   string command;
-  string argument;
 
   ArgumentInjectionFromCommandSink() {
     exists(CommandSource source, Run run |
       run = source.getEnclosingRun() and
       this.asExpr() = run.getScript() and
-      run.getScript().getACmdReachingArgumentInjectionSink(source.getCommand(), command, argument)
+      run.getScript().getACmdReachingArgumentInjectionSink(source.getCommand(), command, _)
     )
   }
 
@@ -65,6 +64,16 @@ class ArgumentInjectionFromMaDSink extends ArgumentInjectionSink {
   override string getCommand() { result = "unknown" }
 }
 
+/**
+ * Gets the event that is relevant for the given node in the context of argument injection.
+ *
+ * This is used to highlight the event in the query results when an alert is raised.
+ */
+Event getRelevantEventInPrivilegedContext(DataFlow::Node node) {
+  inPrivilegedContext(node.asExpr(), result) and
+  not exists(ControlCheck check | check.protects(node.asExpr(), result, "argument-injection"))
+}
+
 /**
  * A taint-tracking configuration for unsafe user input
  * that is used to construct and evaluate a code script.
@@ -88,6 +97,14 @@ private module ArgumentInjectionConfig implements DataFlow::ConfigSig {
       run.getScript().getAnEnvReachingArgumentInjectionSink(var, _, _)
     )
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
+
+  Location getASelectedSinkLocation(DataFlow::Node sink) {
+    result = sink.getLocation()
+    or
+    result = getRelevantEventInPrivilegedContext(sink).getLocation()
+  }
 }
 
 /** Tracks flow of unsafe user input that is used to construct and evaluate a code script. */
diff --git a/actions/ql/lib/codeql/actions/security/ArtifactPoisoningQuery.qll b/actions/ql/lib/codeql/actions/security/ArtifactPoisoningQuery.qll
index f0649bb8174..af3b9d62367 100644
--- a/actions/ql/lib/codeql/actions/security/ArtifactPoisoningQuery.qll
+++ b/actions/ql/lib/codeql/actions/security/ArtifactPoisoningQuery.qll
@@ -4,6 +4,7 @@ import codeql.actions.DataFlow
 import codeql.actions.dataflow.FlowSources
 import codeql.actions.security.PoisonableSteps
 import codeql.actions.security.UntrustedCheckoutQuery
+import codeql.actions.security.ControlChecks
 
 string unzipRegexp() { result = "(unzip|tar)\\s+.*" }
 
@@ -124,8 +125,6 @@ class LegitLabsDownloadArtifactActionStep extends UntrustedArtifactDownloadStep,
 }
 
 class ActionsGitHubScriptDownloadStep extends UntrustedArtifactDownloadStep, UsesStep {
-  string script;
-
   ActionsGitHubScriptDownloadStep() {
     // eg:
     // - uses: actions/github-script@v6
@@ -148,12 +147,14 @@ class ActionsGitHubScriptDownloadStep extends UntrustedArtifactDownloadStep, Use
     //      var fs = require('fs');
     //      fs.writeFileSync('${{github.workspace}}/test-results.zip', Buffer.from(download.data));
     this.getCallee() = "actions/github-script" and
-    this.getArgument("script") = script and
-    script.matches("%listWorkflowRunArtifacts(%") and
-    script.matches("%downloadArtifact(%") and
-    script.matches("%writeFileSync(%") and
-    // Filter out artifacts that were created by pull-request.
-    not script.matches("%exclude_pull_requests: true%")
+    exists(string script |
+      this.getArgument("script") = script and
+      script.matches("%listWorkflowRunArtifacts(%") and
+      script.matches("%downloadArtifact(%") and
+      script.matches("%writeFileSync(%") and
+      // Filter out artifacts that were created by pull-request.
+      not script.matches("%exclude_pull_requests: true%")
+    )
   }
 
   override string getPath() {
@@ -170,10 +171,10 @@ class ActionsGitHubScriptDownloadStep extends UntrustedArtifactDownloadStep, Use
                 .getScript()
                 .getACommand()
                 .regexpCapture(unzipRegexp() + unzipDirArgRegexp(), 3)))
-    else
-      if this.getAFollowingStep().(Run).getScript().getACommand().regexpMatch(unzipRegexp())
-      then result = "GITHUB_WORKSPACE/"
-      else none()
+    else (
+      this.getAFollowingStep().(Run).getScript().getACommand().regexpMatch(unzipRegexp()) and
+      result = "GITHUB_WORKSPACE/"
+    )
   }
 }
 
@@ -206,12 +207,13 @@ class GHRunArtifactDownloadStep extends UntrustedArtifactDownloadStep, Run {
                 .getScript()
                 .getACommand()
                 .regexpCapture(unzipRegexp() + unzipDirArgRegexp(), 3)))
-    else
-      if
+    else (
+      (
         this.getAFollowingStep().(Run).getScript().getACommand().regexpMatch(unzipRegexp()) or
         this.getScript().getACommand().regexpMatch(unzipRegexp())
-      then result = "GITHUB_WORKSPACE/"
-      else none()
+      ) and
+      result = "GITHUB_WORKSPACE/"
+    )
   }
 }
 
@@ -258,15 +260,15 @@ class DirectArtifactDownloadStep extends UntrustedArtifactDownloadStep, Run {
 
 class ArtifactPoisoningSink extends DataFlow::Node {
   UntrustedArtifactDownloadStep download;
-  PoisonableStep poisonable;
 
   ArtifactPoisoningSink() {
-    download.getAFollowingStep() = poisonable and
-    // excluding artifacts downloaded to the temporary directory
-    not download.getPath().regexpMatch("^/tmp.*") and
-    not download.getPath().regexpMatch("^\\$\\{\\{\\s*runner\\.temp\\s*}}.*") and
-    not download.getPath().regexpMatch("^\\$RUNNER_TEMP.*") and
-    (
+    exists(PoisonableStep poisonable |
+      download.getAFollowingStep() = poisonable and
+      // excluding artifacts downloaded to the temporary directory
+      not download.getPath().regexpMatch("^/tmp.*") and
+      not download.getPath().regexpMatch("^\\$\\{\\{\\s*runner\\.temp\\s*}}.*") and
+      not download.getPath().regexpMatch("^\\$RUNNER_TEMP.*")
+    |
       poisonable.(Run).getScript() = this.asExpr() and
       (
         // Check if the poisonable step is a local script execution step
@@ -292,6 +294,16 @@ class ArtifactPoisoningSink extends DataFlow::Node {
   string getPath() { result = download.getPath() }
 }
 
+/**
+ * Gets the event that is relevant for the given node in the context of artifact poisoning.
+ *
+ * This is used to highlight the event in the query results when an alert is raised.
+ */
+Event getRelevantEventInPrivilegedContext(DataFlow::Node node) {
+  inPrivilegedContext(node.asExpr(), result) and
+  not exists(ControlCheck check | check.protects(node.asExpr(), result, "artifact-poisoning"))
+}
+
 /**
  * A taint-tracking configuration for unsafe artifacts
  * that is used may lead to artifact poisoning
@@ -318,6 +330,14 @@ private module ArtifactPoisoningConfig implements DataFlow::ConfigSig {
       exists(run.getScript().getAFileReadCommand())
     )
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
+
+  Location getASelectedSinkLocation(DataFlow::Node sink) {
+    result = sink.getLocation()
+    or
+    result = getRelevantEventInPrivilegedContext(sink).getLocation()
+  }
 }
 
 /** Tracks flow of unsafe artifacts that is used in an insecure way. */
diff --git a/actions/ql/lib/codeql/actions/security/CodeInjectionQuery.qll b/actions/ql/lib/codeql/actions/security/CodeInjectionQuery.qll
index fac498f72da..0f77acc2444 100644
--- a/actions/ql/lib/codeql/actions/security/CodeInjectionQuery.qll
+++ b/actions/ql/lib/codeql/actions/security/CodeInjectionQuery.qll
@@ -3,6 +3,8 @@ private import codeql.actions.TaintTracking
 private import codeql.actions.dataflow.ExternalFlow
 import codeql.actions.dataflow.FlowSources
 import codeql.actions.DataFlow
+import codeql.actions.security.ControlChecks
+import codeql.actions.security.CachePoisoningQuery
 
 class CodeInjectionSink extends DataFlow::Node {
   CodeInjectionSink() {
@@ -11,6 +13,46 @@ class CodeInjectionSink extends DataFlow::Node {
   }
 }
 
+/**
+ * Get the relevant event for the sink in CodeInjectionCritical.ql.
+ */
+Event getRelevantCriticalEventForSink(DataFlow::Node sink) {
+  inPrivilegedContext(sink.asExpr(), result) and
+  not exists(ControlCheck check | check.protects(sink.asExpr(), result, "code-injection")) and
+  // exclude cases where the sink is a JS script and the expression uses toJson
+  not exists(UsesStep script |
+    script.getCallee() = "actions/github-script" and
+    script.getArgumentExpr("script") = sink.asExpr() and
+    exists(getAToJsonReferenceExpression(sink.asExpr().(Expression).getExpression(), _))
+  )
+}
+
+/**
+ * Get the relevant event for the sink in CachePoisoningViaCodeInjection.ql.
+ */
+Event getRelevantCachePoisoningEventForSink(DataFlow::Node sink) {
+  exists(LocalJob job |
+    job = sink.asExpr().getEnclosingJob() and
+    job.getATriggerEvent() = result and
+    // job can be triggered by an external user
+    result.isExternallyTriggerable() and
+    // excluding privileged workflows since they can be exploited in easier circumstances
+    // which is covered by `actions/code-injection/critical`
+    not job.isPrivilegedExternallyTriggerable(result) and
+    (
+      // the workflow runs in the context of the default branch
+      runsOnDefaultBranch(result)
+      or
+      // the workflow caller runs in the context of the default branch
+      result.getName() = "workflow_call" and
+      exists(ExternalJob caller |
+        caller.getCallee() = job.getLocation().getFile().getRelativePath() and
+        runsOnDefaultBranch(caller.getATriggerEvent())
+      )
+    )
+  )
+}
+
 /**
  * A taint-tracking configuration for unsafe user input
  * that is used to construct and evaluate a code script.
@@ -35,6 +77,16 @@ private module CodeInjectionConfig implements DataFlow::ConfigSig {
       exists(run.getScript().getAFileReadCommand())
     )
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
+
+  Location getASelectedSinkLocation(DataFlow::Node sink) {
+    result = sink.getLocation()
+    or
+    result = getRelevantCriticalEventForSink(sink).getLocation()
+    or
+    result = getRelevantCachePoisoningEventForSink(sink).getLocation()
+  }
 }
 
 /** Tracks flow of unsafe user input that is used to construct and evaluate a code script. */
diff --git a/actions/ql/lib/codeql/actions/security/CommandInjectionQuery.qll b/actions/ql/lib/codeql/actions/security/CommandInjectionQuery.qll
index 59d523cd582..ffa16b0f940 100644
--- a/actions/ql/lib/codeql/actions/security/CommandInjectionQuery.qll
+++ b/actions/ql/lib/codeql/actions/security/CommandInjectionQuery.qll
@@ -3,11 +3,20 @@ private import codeql.actions.TaintTracking
 private import codeql.actions.dataflow.ExternalFlow
 import codeql.actions.dataflow.FlowSources
 import codeql.actions.DataFlow
+import codeql.actions.security.ControlChecks
 
 private class CommandInjectionSink extends DataFlow::Node {
   CommandInjectionSink() { madSink(this, "command-injection") }
 }
 
+/** Get the relevant event for the sink in CommandInjectionCritical.ql. */
+Event getRelevantEventInPrivilegedContext(DataFlow::Node sink) {
+  inPrivilegedContext(sink.asExpr(), result) and
+  not exists(ControlCheck check |
+    check.protects(sink.asExpr(), result, ["command-injection", "code-injection"])
+  )
+}
+
 /**
  * A taint-tracking configuration for unsafe user input
  * that is used to construct and evaluate a system command.
@@ -16,6 +25,16 @@ private module CommandInjectionConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof CommandInjectionSink }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
+
+  Location getASelectedSourceLocation(DataFlow::Node source) { none() }
+
+  Location getASelectedSinkLocation(DataFlow::Node sink) {
+    result = sink.getLocation()
+    or
+    result = getRelevantEventInPrivilegedContext(sink).getLocation()
+  }
 }
 
 /** Tracks flow of unsafe user input that is used to construct and evaluate a system command. */
diff --git a/actions/ql/lib/codeql/actions/security/ControlChecks.qll b/actions/ql/lib/codeql/actions/security/ControlChecks.qll
index 244c04310d6..41f512abbc3 100644
--- a/actions/ql/lib/codeql/actions/security/ControlChecks.qll
+++ b/actions/ql/lib/codeql/actions/security/ControlChecks.qll
@@ -159,11 +159,8 @@ abstract class CommentVsHeadDateCheck extends ControlCheck {
 
 /* Specific implementations of control checks */
 class LabelIfCheck extends LabelCheck instanceof If {
-  string condition;
-
   LabelIfCheck() {
-    condition = normalizeExpr(this.getCondition()) and
-    (
+    exists(string condition | condition = normalizeExpr(this.getCondition()) |
       // eg: contains(github.event.pull_request.labels.*.name, 'safe to test')
       condition.regexpMatch(".*(^|[^!])contains\\(\\s*github\\.event\\.pull_request\\.labels\\b.*")
       or
diff --git a/actions/ql/lib/codeql/actions/security/EnvPathInjectionQuery.qll b/actions/ql/lib/codeql/actions/security/EnvPathInjectionQuery.qll
index 33efc9b1bc8..e97bbbb2b80 100644
--- a/actions/ql/lib/codeql/actions/security/EnvPathInjectionQuery.qll
+++ b/actions/ql/lib/codeql/actions/security/EnvPathInjectionQuery.qll
@@ -72,6 +72,25 @@ class EnvPathInjectionFromMaDSink extends EnvPathInjectionSink {
   EnvPathInjectionFromMaDSink() { madSink(this, "envpath-injection") }
 }
 
+/**
+ * Get the relevant event for a sink in EnvPathInjectionCritical.ql where the source type is "artifact".
+ */
+Event getRelevantArtifactEventInPrivilegedContext(DataFlow::Node sink) {
+  inPrivilegedContext(sink.asExpr(), result) and
+  not exists(ControlCheck check |
+    check.protects(sink.asExpr(), result, ["untrusted-checkout", "artifact-poisoning"])
+  ) and
+  sink instanceof EnvPathInjectionFromFileReadSink
+}
+
+/**
+ * Get the relevant event for a sink in EnvPathInjectionCritical.ql where the source type is not "artifact".
+ */
+Event getRelevantNonArtifactEventInPrivilegedContext(DataFlow::Node sink) {
+  inPrivilegedContext(sink.asExpr(), result) and
+  not exists(ControlCheck check | check.protects(sink.asExpr(), result, "code-injection"))
+}
+
 /**
  * A taint-tracking configuration for unsafe user input
  * that is used to construct and evaluate an environment variable.
@@ -108,6 +127,16 @@ private module EnvPathInjectionConfig implements DataFlow::ConfigSig {
       exists(run.getScript().getAFileReadCommand())
     )
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
+
+  Location getASelectedSinkLocation(DataFlow::Node sink) {
+    result = sink.getLocation()
+    or
+    result = getRelevantArtifactEventInPrivilegedContext(sink).getLocation()
+    or
+    result = getRelevantNonArtifactEventInPrivilegedContext(sink).getLocation()
+  }
 }
 
 /** Tracks flow of unsafe user input that is used to construct and evaluate the PATH environment variable. */
diff --git a/actions/ql/lib/codeql/actions/security/EnvVarInjectionQuery.qll b/actions/ql/lib/codeql/actions/security/EnvVarInjectionQuery.qll
index 656ea1207b5..40810477d92 100644
--- a/actions/ql/lib/codeql/actions/security/EnvVarInjectionQuery.qll
+++ b/actions/ql/lib/codeql/actions/security/EnvVarInjectionQuery.qll
@@ -55,12 +55,8 @@ class EnvVarInjectionFromFileReadSink extends EnvVarInjectionSink {
  *          echo "COMMIT_MESSAGE=${COMMIT_MESSAGE}" >> $GITHUB_ENV
  */
 class EnvVarInjectionFromCommandSink extends EnvVarInjectionSink {
-  CommandSource inCommand;
-  string injectedVar;
-  string command;
-
   EnvVarInjectionFromCommandSink() {
-    exists(Run run |
+    exists(Run run, CommandSource inCommand, string injectedVar, string command |
       this.asExpr() = inCommand.getEnclosingRun().getScript() and
       run = inCommand.getEnclosingRun() and
       run.getScript().getACmdReachingGitHubEnvWrite(inCommand.getCommand(), injectedVar) and
@@ -86,12 +82,8 @@ class EnvVarInjectionFromCommandSink extends EnvVarInjectionSink {
  *      echo "FOO=$BODY" >> $GITHUB_ENV
  */
 class EnvVarInjectionFromEnvVarSink extends EnvVarInjectionSink {
-  string inVar;
-  string injectedVar;
-  string command;
-
   EnvVarInjectionFromEnvVarSink() {
-    exists(Run run |
+    exists(Run run, string inVar, string injectedVar, string command |
       run.getScript() = this.asExpr() and
       exists(run.getInScopeEnvVarExpr(inVar)) and
       run.getScript().getAnEnvReachingGitHubEnvWrite(inVar, injectedVar) and
@@ -126,6 +118,32 @@ class EnvVarInjectionFromMaDSink extends EnvVarInjectionSink {
   EnvVarInjectionFromMaDSink() { madSink(this, "envvar-injection") }
 }
 
+/**
+ * Get the relevant event for a sink in EnvVarInjectionCritical.ql where the source type is "artifact".
+ */
+Event getRelevantArtifactEventInPrivilegedContext(DataFlow::Node sink) {
+  inPrivilegedContext(sink.asExpr(), result) and
+  not exists(ControlCheck check |
+    check
+        .protects(sink.asExpr(), result,
+          ["envvar-injection", "untrusted-checkout", "artifact-poisoning"])
+  ) and
+  (
+    sink instanceof EnvVarInjectionFromFileReadSink or
+    madSink(sink, "envvar-injection")
+  )
+}
+
+/**
+ * Get the relevant event for a sink in EnvVarInjectionCritical.ql where the source type is not "artifact".
+ */
+Event getRelevantNonArtifactEventInPrivilegedContext(DataFlow::Node sink) {
+  inPrivilegedContext(sink.asExpr(), result) and
+  not exists(ControlCheck check |
+    check.protects(sink.asExpr(), result, ["envvar-injection", "code-injection"])
+  )
+}
+
 /**
  * A taint-tracking configuration for unsafe user input
  * that is used to construct and evaluate an environment variable.
@@ -163,6 +181,16 @@ private module EnvVarInjectionConfig implements DataFlow::ConfigSig {
       exists(run.getScript().getAFileReadCommand())
     )
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
+
+  Location getASelectedSinkLocation(DataFlow::Node sink) {
+    result = sink.getLocation()
+    or
+    result = getRelevantArtifactEventInPrivilegedContext(sink).getLocation()
+    or
+    result = getRelevantNonArtifactEventInPrivilegedContext(sink).getLocation()
+  }
 }
 
 /** Tracks flow of unsafe user input that is used to construct and evaluate an environment variable. */
diff --git a/actions/ql/lib/codeql/actions/security/OutputClobberingQuery.qll b/actions/ql/lib/codeql/actions/security/OutputClobberingQuery.qll
index c67d2876b09..22b4879df12 100644
--- a/actions/ql/lib/codeql/actions/security/OutputClobberingQuery.qll
+++ b/actions/ql/lib/codeql/actions/security/OutputClobberingQuery.qll
@@ -99,18 +99,14 @@ class OutputClobberingFromEnvVarSink extends OutputClobberingSink {
  *          echo $BODY
  */
 class WorkflowCommandClobberingFromEnvVarSink extends OutputClobberingSink {
-  string clobbering_var;
-  string clobbered_value;
-
   WorkflowCommandClobberingFromEnvVarSink() {
-    exists(Run run, string workflow_cmd_stmt, string clobbering_stmt |
+    exists(Run run, string workflow_cmd_stmt, string clobbering_stmt, string clobbering_var |
       run.getScript() = this.asExpr() and
       run.getScript().getAStmt() = clobbering_stmt and
       clobbering_stmt.regexpMatch("echo\\s+(-e\\s+)?(\"|')?\\$(\\{)?" + clobbering_var + ".*") and
       exists(run.getInScopeEnvVarExpr(clobbering_var)) and
       run.getScript().getAStmt() = workflow_cmd_stmt and
-      clobbered_value =
-        trimQuotes(workflow_cmd_stmt.regexpCapture(".*::set-output\\s+name=.*::(.*)", 1))
+      exists(trimQuotes(workflow_cmd_stmt.regexpCapture(".*::set-output\\s+name=.*::(.*)", 1)))
     )
   }
 }
@@ -216,8 +212,6 @@ private module OutputClobberingConfig implements DataFlow::ConfigSig {
   }
 
   predicate observeDiffInformedIncrementalMode() { any() }
-
-  Location getASelectedSourceLocation(DataFlow::Node sink) { none() }
 }
 
 /** Tracks flow of unsafe user input that is used to construct and evaluate an environment variable. */
diff --git a/actions/ql/lib/codeql/actions/security/RequestForgeryQuery.qll b/actions/ql/lib/codeql/actions/security/RequestForgeryQuery.qll
index d96a12e2608..fb89ebdc8ba 100644
--- a/actions/ql/lib/codeql/actions/security/RequestForgeryQuery.qll
+++ b/actions/ql/lib/codeql/actions/security/RequestForgeryQuery.qll
@@ -18,8 +18,6 @@ private module RequestForgeryConfig implements DataFlow::ConfigSig {
   predicate isSink(DataFlow::Node sink) { sink instanceof RequestForgerySink }
 
   predicate observeDiffInformedIncrementalMode() { any() }
-
-  Location getASelectedSourceLocation(DataFlow::Node sink) { none() }
 }
 
 /** Tracks flow of unsafe user input that is used to construct and evaluate a system command. */
diff --git a/actions/ql/lib/codeql/actions/security/SecretExfiltrationQuery.qll b/actions/ql/lib/codeql/actions/security/SecretExfiltrationQuery.qll
index 15cd726c4bb..b3d59210053 100644
--- a/actions/ql/lib/codeql/actions/security/SecretExfiltrationQuery.qll
+++ b/actions/ql/lib/codeql/actions/security/SecretExfiltrationQuery.qll
@@ -17,8 +17,6 @@ private module SecretExfiltrationConfig implements DataFlow::ConfigSig {
   predicate isSink(DataFlow::Node sink) { sink instanceof SecretExfiltrationSink }
 
   predicate observeDiffInformedIncrementalMode() { any() }
-
-  Location getASelectedSourceLocation(DataFlow::Node sink) { none() }
 }
 
 /** Tracks flow of unsafe user input that is used in a context where it may lead to a secret exfiltration. */
diff --git a/actions/ql/lib/codeql/actions/security/UseOfUnversionedImmutableAction.qll b/actions/ql/lib/codeql/actions/security/UseOfUnversionedImmutableAction.qll
index ef258fce2e5..8595cd1086d 100644
--- a/actions/ql/lib/codeql/actions/security/UseOfUnversionedImmutableAction.qll
+++ b/actions/ql/lib/codeql/actions/security/UseOfUnversionedImmutableAction.qll
@@ -1,10 +1,8 @@
 import actions
 
 class UnversionedImmutableAction extends UsesStep {
-  string immutable_action;
-
   UnversionedImmutableAction() {
-    isImmutableAction(this, immutable_action) and
+    isImmutableAction(this, _) and
     not isSemVer(this.getVersion())
   }
 }
diff --git a/actions/ql/lib/qlpack.yml b/actions/ql/lib/qlpack.yml
index dd2723b0315..295d925c318 100644
--- a/actions/ql/lib/qlpack.yml
+++ b/actions/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/actions-all
-version: 0.4.15-dev
+version: 0.4.21-dev
 library: true
 warnOnImplicitThis: true
 dependencies:
diff --git a/actions/ql/src/CHANGELOG.md b/actions/ql/src/CHANGELOG.md
index 09fb20778fc..c7253227b7c 100644
--- a/actions/ql/src/CHANGELOG.md
+++ b/actions/ql/src/CHANGELOG.md
@@ -1,3 +1,29 @@
+## 0.6.12
+
+No user-facing changes.
+
+## 0.6.11
+
+No user-facing changes.
+
+## 0.6.10
+
+No user-facing changes.
+
+## 0.6.9
+
+### Minor Analysis Improvements
+
+* Actions analysis now reports file coverage information on the CodeQL status page.
+
+## 0.6.8
+
+No user-facing changes.
+
+## 0.6.7
+
+No user-facing changes.
+
 ## 0.6.6
 
 No user-facing changes.
diff --git a/actions/ql/src/Diagnostics/SuccessfullyExtractedFiles.ql b/actions/ql/src/Diagnostics/SuccessfullyExtractedFiles.ql
new file mode 100644
index 00000000000..eebf889a388
--- /dev/null
+++ b/actions/ql/src/Diagnostics/SuccessfullyExtractedFiles.ql
@@ -0,0 +1,13 @@
+/**
+ * @id actions/diagnostics/successfully-extracted-files
+ * @name Extracted files
+ * @description List all files that were extracted.
+ * @kind diagnostic
+ * @tags successfully-extracted-files
+ */
+
+private import codeql.Locations
+
+from File f
+where exists(f.getRelativePath())
+select f, ""
diff --git a/actions/ql/src/Models/CompositeActionsSinks.ql b/actions/ql/src/Models/CompositeActionsSinks.ql
index 65d3fdce9dc..82f0754f03e 100644
--- a/actions/ql/src/Models/CompositeActionsSinks.ql
+++ b/actions/ql/src/Models/CompositeActionsSinks.ql
@@ -26,8 +26,6 @@ private module MyConfig implements DataFlow::ConfigSig {
   }
 
   predicate observeDiffInformedIncrementalMode() { any() }
-
-  Location getASelectedSourceLocation(DataFlow::Node sink) { none() }
 }
 
 module MyFlow = TaintTracking::Global<MyConfig>;
diff --git a/actions/ql/src/Models/CompositeActionsSources.ql b/actions/ql/src/Models/CompositeActionsSources.ql
index 2f3e98b3401..c9974cd7361 100644
--- a/actions/ql/src/Models/CompositeActionsSources.ql
+++ b/actions/ql/src/Models/CompositeActionsSources.ql
@@ -36,8 +36,6 @@ private module MyConfig implements DataFlow::ConfigSig {
   }
 
   predicate observeDiffInformedIncrementalMode() { any() }
-
-  Location getASelectedSourceLocation(DataFlow::Node sink) { none() }
 }
 
 module MyFlow = TaintTracking::Global<MyConfig>;
diff --git a/actions/ql/src/Models/CompositeActionsSummaries.ql b/actions/ql/src/Models/CompositeActionsSummaries.ql
index 1979c381f5d..814498f639e 100644
--- a/actions/ql/src/Models/CompositeActionsSummaries.ql
+++ b/actions/ql/src/Models/CompositeActionsSummaries.ql
@@ -27,8 +27,6 @@ private module MyConfig implements DataFlow::ConfigSig {
   }
 
   predicate observeDiffInformedIncrementalMode() { any() }
-
-  Location getASelectedSourceLocation(DataFlow::Node sink) { none() }
 }
 
 module MyFlow = TaintTracking::Global<MyConfig>;
diff --git a/actions/ql/src/Models/ReusableWorkflowsSinks.ql b/actions/ql/src/Models/ReusableWorkflowsSinks.ql
index 2b08f2445d9..8d02debbdb4 100644
--- a/actions/ql/src/Models/ReusableWorkflowsSinks.ql
+++ b/actions/ql/src/Models/ReusableWorkflowsSinks.ql
@@ -26,8 +26,6 @@ private module MyConfig implements DataFlow::ConfigSig {
   }
 
   predicate observeDiffInformedIncrementalMode() { any() }
-
-  Location getASelectedSourceLocation(DataFlow::Node sink) { none() }
 }
 
 module MyFlow = TaintTracking::Global<MyConfig>;
diff --git a/actions/ql/src/Models/ReusableWorkflowsSources.ql b/actions/ql/src/Models/ReusableWorkflowsSources.ql
index 831191e4bfb..a7112bf3758 100644
--- a/actions/ql/src/Models/ReusableWorkflowsSources.ql
+++ b/actions/ql/src/Models/ReusableWorkflowsSources.ql
@@ -36,8 +36,6 @@ private module MyConfig implements DataFlow::ConfigSig {
   }
 
   predicate observeDiffInformedIncrementalMode() { any() }
-
-  Location getASelectedSourceLocation(DataFlow::Node sink) { none() }
 }
 
 module MyFlow = TaintTracking::Global<MyConfig>;
diff --git a/actions/ql/src/Models/ReusableWorkflowsSummaries.ql b/actions/ql/src/Models/ReusableWorkflowsSummaries.ql
index fd2d4b396a0..a05bec744f8 100644
--- a/actions/ql/src/Models/ReusableWorkflowsSummaries.ql
+++ b/actions/ql/src/Models/ReusableWorkflowsSummaries.ql
@@ -27,8 +27,6 @@ private module MyConfig implements DataFlow::ConfigSig {
   }
 
   predicate observeDiffInformedIncrementalMode() { any() }
-
-  Location getASelectedSourceLocation(DataFlow::Node sink) { none() }
 }
 
 module MyFlow = TaintTracking::Global<MyConfig>;
diff --git a/actions/ql/src/Security/CWE-077/EnvPathInjectionCritical.ql b/actions/ql/src/Security/CWE-077/EnvPathInjectionCritical.ql
index 3e6d63a4604..30bb0fd366f 100644
--- a/actions/ql/src/Security/CWE-077/EnvPathInjectionCritical.ql
+++ b/actions/ql/src/Security/CWE-077/EnvPathInjectionCritical.ql
@@ -21,18 +21,12 @@ import codeql.actions.security.ControlChecks
 from EnvPathInjectionFlow::PathNode source, EnvPathInjectionFlow::PathNode sink, Event event
 where
   EnvPathInjectionFlow::flowPath(source, sink) and
-  inPrivilegedContext(sink.getNode().asExpr(), event) and
   (
     not source.getNode().(RemoteFlowSource).getSourceType() = "artifact" and
-    not exists(ControlCheck check |
-      check.protects(sink.getNode().asExpr(), event, "code-injection")
-    )
+    event = getRelevantNonArtifactEventInPrivilegedContext(sink.getNode())
     or
     source.getNode().(RemoteFlowSource).getSourceType() = "artifact" and
-    not exists(ControlCheck check |
-      check.protects(sink.getNode().asExpr(), event, ["untrusted-checkout", "artifact-poisoning"])
-    ) and
-    sink.getNode() instanceof EnvPathInjectionFromFileReadSink
+    event = getRelevantArtifactEventInPrivilegedContext(sink.getNode())
   )
 select sink.getNode(), source, sink,
   "Potential PATH environment variable injection in $@, which may be controlled by an external user ($@).",
diff --git a/actions/ql/src/Security/CWE-077/EnvVarInjectionCritical.ql b/actions/ql/src/Security/CWE-077/EnvVarInjectionCritical.ql
index 28ad3b5b5d2..6f0d9729d6d 100644
--- a/actions/ql/src/Security/CWE-077/EnvVarInjectionCritical.ql
+++ b/actions/ql/src/Security/CWE-077/EnvVarInjectionCritical.ql
@@ -22,26 +22,15 @@ import codeql.actions.security.ControlChecks
 from EnvVarInjectionFlow::PathNode source, EnvVarInjectionFlow::PathNode sink, Event event
 where
   EnvVarInjectionFlow::flowPath(source, sink) and
-  inPrivilegedContext(sink.getNode().asExpr(), event) and
   // exclude paths to file read sinks from non-artifact sources
   (
     // source is text
     not source.getNode().(RemoteFlowSource).getSourceType() = "artifact" and
-    not exists(ControlCheck check |
-      check.protects(sink.getNode().asExpr(), event, ["envvar-injection", "code-injection"])
-    )
+    event = getRelevantNonArtifactEventInPrivilegedContext(sink.getNode())
     or
     // source is an artifact or a file from an untrusted checkout
     source.getNode().(RemoteFlowSource).getSourceType() = "artifact" and
-    not exists(ControlCheck check |
-      check
-          .protects(sink.getNode().asExpr(), event,
-            ["envvar-injection", "untrusted-checkout", "artifact-poisoning"])
-    ) and
-    (
-      sink.getNode() instanceof EnvVarInjectionFromFileReadSink or
-      madSink(sink.getNode(), "envvar-injection")
-    )
+    event = getRelevantArtifactEventInPrivilegedContext(sink.getNode())
   )
 select sink.getNode(), source, sink,
   "Potential environment variable injection in $@, which may be controlled by an external user ($@).",
diff --git a/actions/ql/src/Security/CWE-094/CodeInjectionCritical.ql b/actions/ql/src/Security/CWE-094/CodeInjectionCritical.ql
index c4ab00837ca..ed30e4da71c 100644
--- a/actions/ql/src/Security/CWE-094/CodeInjectionCritical.ql
+++ b/actions/ql/src/Security/CWE-094/CodeInjectionCritical.ql
@@ -22,15 +22,8 @@ import codeql.actions.security.ControlChecks
 from CodeInjectionFlow::PathNode source, CodeInjectionFlow::PathNode sink, Event event
 where
   CodeInjectionFlow::flowPath(source, sink) and
-  inPrivilegedContext(sink.getNode().asExpr(), event) and
-  source.getNode().(RemoteFlowSource).getEventName() = event.getName() and
-  not exists(ControlCheck check | check.protects(sink.getNode().asExpr(), event, "code-injection")) and
-  // exclude cases where the sink is a JS script and the expression uses toJson
-  not exists(UsesStep script |
-    script.getCallee() = "actions/github-script" and
-    script.getArgumentExpr("script") = sink.getNode().asExpr() and
-    exists(getAToJsonReferenceExpression(sink.getNode().asExpr().(Expression).getExpression(), _))
-  )
+  event = getRelevantCriticalEventForSink(sink.getNode()) and
+  source.getNode().(RemoteFlowSource).getEventName() = event.getName()
 select sink.getNode(), source, sink,
   "Potential code injection in $@, which may be controlled by an external user ($@).", sink,
   sink.getNode().asExpr().(Expression).getRawExpression(), event, event.getName()
diff --git a/actions/ql/src/Security/CWE-349/CachePoisoningViaCodeInjection.ql b/actions/ql/src/Security/CWE-349/CachePoisoningViaCodeInjection.ql
index 23e1f223073..2fe792aba1e 100644
--- a/actions/ql/src/Security/CWE-349/CachePoisoningViaCodeInjection.ql
+++ b/actions/ql/src/Security/CWE-349/CachePoisoningViaCodeInjection.ql
@@ -18,30 +18,13 @@ import codeql.actions.security.CachePoisoningQuery
 import CodeInjectionFlow::PathGraph
 import codeql.actions.security.ControlChecks
 
-from CodeInjectionFlow::PathNode source, CodeInjectionFlow::PathNode sink, LocalJob job, Event event
+from CodeInjectionFlow::PathNode source, CodeInjectionFlow::PathNode sink, Event event
 where
   CodeInjectionFlow::flowPath(source, sink) and
-  job = sink.getNode().asExpr().getEnclosingJob() and
-  job.getATriggerEvent() = event and
-  // job can be triggered by an external user
-  event.isExternallyTriggerable() and
+  event = getRelevantCachePoisoningEventForSink(sink.getNode()) and
   // the checkout is not controlled by an access check
   not exists(ControlCheck check |
     check.protects(source.getNode().asExpr(), event, "code-injection")
-  ) and
-  // excluding privileged workflows since they can be exploited in easier circumstances
-  // which is covered by `actions/code-injection/critical`
-  not job.isPrivilegedExternallyTriggerable(event) and
-  (
-    // the workflow runs in the context of the default branch
-    runsOnDefaultBranch(event)
-    or
-    // the workflow caller runs in the context of the default branch
-    event.getName() = "workflow_call" and
-    exists(ExternalJob caller |
-      caller.getCallee() = job.getLocation().getFile().getRelativePath() and
-      runsOnDefaultBranch(caller.getATriggerEvent())
-    )
   )
 select sink.getNode(), source, sink,
   "Unprivileged code injection in $@, which may lead to cache poisoning ($@).", sink,
diff --git a/actions/ql/src/Security/CWE-829/ArtifactPoisoningCritical.ql b/actions/ql/src/Security/CWE-829/ArtifactPoisoningCritical.ql
index afef7bdd82b..24ecb4b0339 100644
--- a/actions/ql/src/Security/CWE-829/ArtifactPoisoningCritical.ql
+++ b/actions/ql/src/Security/CWE-829/ArtifactPoisoningCritical.ql
@@ -19,10 +19,7 @@ import codeql.actions.security.ControlChecks
 from ArtifactPoisoningFlow::PathNode source, ArtifactPoisoningFlow::PathNode sink, Event event
 where
   ArtifactPoisoningFlow::flowPath(source, sink) and
-  inPrivilegedContext(sink.getNode().asExpr(), event) and
-  not exists(ControlCheck check |
-    check.protects(sink.getNode().asExpr(), event, "artifact-poisoning")
-  )
+  event = getRelevantEventInPrivilegedContext(sink.getNode())
 select sink.getNode(), source, sink,
   "Potential artifact poisoning in $@, which may be controlled by an external user ($@).", sink,
   sink.getNode().toString(), event, event.getName()
diff --git a/actions/ql/src/Security/CWE-829/UntrustedCheckoutCritical.md b/actions/ql/src/Security/CWE-829/UntrustedCheckoutCritical.md
index de3307550ad..6060354b134 100644
--- a/actions/ql/src/Security/CWE-829/UntrustedCheckoutCritical.md
+++ b/actions/ql/src/Security/CWE-829/UntrustedCheckoutCritical.md
@@ -32,7 +32,7 @@ jobs:
 
       - uses: actions/setup-node@v1
       - run: |
-          npm install # scripts in package.json from PR would be executed here
+          npm install # scripts in package.json from PR would be executed here
           npm build
 
       - uses: completely/fakeaction@v2
diff --git a/actions/ql/src/Security/CWE-829/UntrustedCheckoutHigh.md b/actions/ql/src/Security/CWE-829/UntrustedCheckoutHigh.md
index de3307550ad..6060354b134 100644
--- a/actions/ql/src/Security/CWE-829/UntrustedCheckoutHigh.md
+++ b/actions/ql/src/Security/CWE-829/UntrustedCheckoutHigh.md
@@ -32,7 +32,7 @@ jobs:
 
       - uses: actions/setup-node@v1
       - run: |
-          npm install # scripts in package.json from PR would be executed here
+          npm install # scripts in package.json from PR would be executed here
           npm build
 
       - uses: completely/fakeaction@v2
diff --git a/actions/ql/src/Security/CWE-829/UntrustedCheckoutMedium.md b/actions/ql/src/Security/CWE-829/UntrustedCheckoutMedium.md
index de3307550ad..6060354b134 100644
--- a/actions/ql/src/Security/CWE-829/UntrustedCheckoutMedium.md
+++ b/actions/ql/src/Security/CWE-829/UntrustedCheckoutMedium.md
@@ -32,7 +32,7 @@ jobs:
 
       - uses: actions/setup-node@v1
       - run: |
-          npm install # scripts in package.json from PR would be executed here
+          npm install # scripts in package.json from PR would be executed here
           npm build
 
       - uses: completely/fakeaction@v2
diff --git a/actions/ql/src/change-notes/released/0.6.10.md b/actions/ql/src/change-notes/released/0.6.10.md
new file mode 100644
index 00000000000..048cd0c98ba
--- /dev/null
+++ b/actions/ql/src/change-notes/released/0.6.10.md
@@ -0,0 +1,3 @@
+## 0.6.10
+
+No user-facing changes.
diff --git a/actions/ql/src/change-notes/released/0.6.11.md b/actions/ql/src/change-notes/released/0.6.11.md
new file mode 100644
index 00000000000..3c83e3ac112
--- /dev/null
+++ b/actions/ql/src/change-notes/released/0.6.11.md
@@ -0,0 +1,3 @@
+## 0.6.11
+
+No user-facing changes.
diff --git a/actions/ql/src/change-notes/released/0.6.12.md b/actions/ql/src/change-notes/released/0.6.12.md
new file mode 100644
index 00000000000..da7e7709ef7
--- /dev/null
+++ b/actions/ql/src/change-notes/released/0.6.12.md
@@ -0,0 +1,3 @@
+## 0.6.12
+
+No user-facing changes.
diff --git a/actions/ql/src/change-notes/released/0.6.7.md b/actions/ql/src/change-notes/released/0.6.7.md
new file mode 100644
index 00000000000..c185761a60f
--- /dev/null
+++ b/actions/ql/src/change-notes/released/0.6.7.md
@@ -0,0 +1,3 @@
+## 0.6.7
+
+No user-facing changes.
diff --git a/actions/ql/src/change-notes/released/0.6.8.md b/actions/ql/src/change-notes/released/0.6.8.md
new file mode 100644
index 00000000000..9984c422a37
--- /dev/null
+++ b/actions/ql/src/change-notes/released/0.6.8.md
@@ -0,0 +1,3 @@
+## 0.6.8
+
+No user-facing changes.
diff --git a/actions/ql/src/change-notes/released/0.6.9.md b/actions/ql/src/change-notes/released/0.6.9.md
new file mode 100644
index 00000000000..fd1d956946b
--- /dev/null
+++ b/actions/ql/src/change-notes/released/0.6.9.md
@@ -0,0 +1,5 @@
+## 0.6.9
+
+### Minor Analysis Improvements
+
+* Actions analysis now reports file coverage information on the CodeQL status page.
diff --git a/actions/ql/src/codeql-pack.release.yml b/actions/ql/src/codeql-pack.release.yml
index f4cae0a77ad..28c22ccab7c 100644
--- 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.12
diff --git a/actions/ql/src/experimental/Security/CWE-078/CommandInjectionCritical.ql b/actions/ql/src/experimental/Security/CWE-078/CommandInjectionCritical.ql
index 7d45b25b1a2..2ed98d714da 100644
--- a/actions/ql/src/experimental/Security/CWE-078/CommandInjectionCritical.ql
+++ b/actions/ql/src/experimental/Security/CWE-078/CommandInjectionCritical.ql
@@ -21,10 +21,7 @@ import codeql.actions.security.ControlChecks
 from CommandInjectionFlow::PathNode source, CommandInjectionFlow::PathNode sink, Event event
 where
   CommandInjectionFlow::flowPath(source, sink) and
-  inPrivilegedContext(sink.getNode().asExpr(), event) and
-  not exists(ControlCheck check |
-    check.protects(sink.getNode().asExpr(), event, ["command-injection", "code-injection"])
-  )
+  event = getRelevantEventInPrivilegedContext(sink.getNode())
 select sink.getNode(), source, sink,
   "Potential command injection in $@, which may be controlled by an external user ($@).", sink,
   sink.getNode().asExpr().(Expression).getRawExpression(), event, event.getName()
diff --git a/actions/ql/src/experimental/Security/CWE-088/ArgumentInjectionCritical.ql b/actions/ql/src/experimental/Security/CWE-088/ArgumentInjectionCritical.ql
index 6930e2f684a..ecab01dd114 100644
--- a/actions/ql/src/experimental/Security/CWE-088/ArgumentInjectionCritical.ql
+++ b/actions/ql/src/experimental/Security/CWE-088/ArgumentInjectionCritical.ql
@@ -20,10 +20,7 @@ import codeql.actions.security.ControlChecks
 from ArgumentInjectionFlow::PathNode source, ArgumentInjectionFlow::PathNode sink, Event event
 where
   ArgumentInjectionFlow::flowPath(source, sink) and
-  inPrivilegedContext(sink.getNode().asExpr(), event) and
-  not exists(ControlCheck check |
-    check.protects(sink.getNode().asExpr(), event, "argument-injection")
-  )
+  event = getRelevantEventInPrivilegedContext(sink.getNode())
 select sink.getNode(), source, sink,
   "Potential argument injection in $@ command, which may be controlled by an external user ($@).",
   sink, sink.getNode().(ArgumentInjectionSink).getCommand(), event, event.getName()
diff --git a/actions/ql/src/experimental/Security/CWE-200/SecretExfiltration.ql b/actions/ql/src/experimental/Security/CWE-200/SecretExfiltration.ql
index 2e583a98989..2b4ed1a30b4 100644
--- a/actions/ql/src/experimental/Security/CWE-200/SecretExfiltration.ql
+++ b/actions/ql/src/experimental/Security/CWE-200/SecretExfiltration.ql
@@ -19,5 +19,5 @@ import SecretExfiltrationFlow::PathGraph
 from SecretExfiltrationFlow::PathNode source, SecretExfiltrationFlow::PathNode sink
 where SecretExfiltrationFlow::flowPath(source, sink)
 select sink.getNode(), source, sink,
-  "Potential secret exfiltration in $@, which may be be leaked to an attacker-controlled resource.",
+  "Potential secret exfiltration in $@, which may be leaked to an attacker-controlled resource.",
   sink, sink.getNode().asExpr().(Expression).getRawExpression()
diff --git a/actions/ql/src/experimental/Security/CWE-829/ArtifactPoisoningPathTraversal.ql b/actions/ql/src/experimental/Security/CWE-829/ArtifactPoisoningPathTraversal.ql
index 519437ddb22..517a9d1eaad 100644
--- a/actions/ql/src/experimental/Security/CWE-829/ArtifactPoisoningPathTraversal.ql
+++ b/actions/ql/src/experimental/Security/CWE-829/ArtifactPoisoningPathTraversal.ql
@@ -37,8 +37,6 @@ where
     )
     or
     // upload artifact is not used in the same workflow
-    not exists(UsesStep upload |
-      download.getEnclosingWorkflow().getAJob().(LocalJob).getAStep() = upload
-    )
+    not download.getEnclosingWorkflow().getAJob().(LocalJob).getAStep() instanceof UsesStep
   )
 select download, "Potential artifact poisoning"
diff --git a/actions/ql/src/qlpack.yml b/actions/ql/src/qlpack.yml
index 911d1e19168..b612696b816 100644
--- a/actions/ql/src/qlpack.yml
+++ b/actions/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/actions-queries
-version: 0.6.7-dev
+version: 0.6.13-dev
 library: false
 warnOnImplicitThis: true
 groups: [actions, queries]
diff --git a/actions/ql/test/query-tests/Security/CWE-200/SecretExfiltration.expected b/actions/ql/test/query-tests/Security/CWE-200/SecretExfiltration.expected
index 259746eaec9..59b58e03be7 100644
--- a/actions/ql/test/query-tests/Security/CWE-200/SecretExfiltration.expected
+++ b/actions/ql/test/query-tests/Security/CWE-200/SecretExfiltration.expected
@@ -3,4 +3,4 @@ nodes
 | .github/workflows/test1.yml:15:11:16:75 | github.event.pull_request.title | semmle.label | github.event.pull_request.title |
 subpaths
 #select
-| .github/workflows/test1.yml:15:11:16:75 | github.event.pull_request.title | .github/workflows/test1.yml:15:11:16:75 | github.event.pull_request.title | .github/workflows/test1.yml:15:11:16:75 | github.event.pull_request.title | Potential secret exfiltration in $@, which may be be leaked to an attacker-controlled resource. | .github/workflows/test1.yml:15:11:16:75 | github.event.pull_request.title | ${{ github.event.pull_request.title }} |
+| .github/workflows/test1.yml:15:11:16:75 | github.event.pull_request.title | .github/workflows/test1.yml:15:11:16:75 | github.event.pull_request.title | .github/workflows/test1.yml:15:11:16:75 | github.event.pull_request.title | Potential secret exfiltration in $@, which may be leaked to an attacker-controlled resource. | .github/workflows/test1.yml:15:11:16:75 | github.event.pull_request.title | ${{ github.event.pull_request.title }} |
diff --git a/config/add-overlay-annotations.py b/config/add-overlay-annotations.py
index 85b42026d8d..0a30eee5799 100644
--- a/config/add-overlay-annotations.py
+++ b/config/add-overlay-annotations.py
@@ -177,6 +177,12 @@ def insert_overlay_caller_annotations(lines):
         out_lines.append(line)
     return out_lines
 
+explicitly_global = set([
+    "java/ql/lib/semmle/code/java/dispatch/VirtualDispatch.qll",
+    "java/ql/lib/semmle/code/java/dispatch/DispatchFlow.qll",
+    "java/ql/lib/semmle/code/java/dispatch/ObjFlow.qll",
+    "java/ql/lib/semmle/code/java/dispatch/internal/Unification.qll",
+])
 
 def annotate_as_appropriate(filename, lines):
     '''
@@ -196,6 +202,9 @@ def annotate_as_appropriate(filename, lines):
         ((filename.endswith("Query.qll") or filename.endswith("Config.qll")) and
          any("implements DataFlow::ConfigSig" in line for line in lines))):
         return None
+    elif filename in explicitly_global:
+        # These files are explicitly global and should not be annotated.
+        return None
     elif not any(line for line in lines if line.strip()):
         return None
 
diff --git a/config/dbscheme-fragments.json b/config/dbscheme-fragments.json
index c2a9a5e734b..a626025de0b 100644
--- a/config/dbscheme-fragments.json
+++ b/config/dbscheme-fragments.json
@@ -9,6 +9,7 @@
   "fragments": [
     "/*- Compilations -*/",
     "/*- External data -*/",
+    "/*- Overlay support -*/",
     "/*- Files and folders -*/",
     "/*- Diagnostic messages -*/",
     "/*- Diagnostic messages: severity -*/",
diff --git a/cpp/downgrades/2121ffec11fac265524955fee1775217364d4ca4/old.dbscheme b/cpp/downgrades/2121ffec11fac265524955fee1775217364d4ca4/old.dbscheme
new file mode 100644
index 00000000000..2121ffec11f
--- /dev/null
+++ b/cpp/downgrades/2121ffec11fac265524955fee1775217364d4ca4/old.dbscheme
@@ -0,0 +1,2437 @@
+/*- Compilations -*/
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- C++ dbscheme -*/
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+pch_uses(
+    int pch: @pch ref,
+    int compilation: @compilation ref,
+    int id: @file ref
+)
+
+#keyset[pch, compilation]
+pch_creations(
+    int pch: @pch,
+    int compilation: @compilation ref,
+    int from: @file ref
+)
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location_default ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+case @function.kind of
+  0 = @unknown_function
+| 1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+// ... 6 = @builtin_function deprecated    // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+builtin_functions(
+    int id: @function ref
+)
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+| 40 = @decimal32             // _Decimal32
+| 41 = @decimal64             // _Decimal64
+| 42 = @decimal128            // _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+| 62 = @mfp8                  // __mfp8
+| 63 = @scalable_vector_count // __SVCount_t
+| 64 = @complex_fp16          // _Complex __fp16
+| 65 = @complex_std_bfloat16  // _Complex __bf16
+| 66 = @complex_std_float16   // _Complex std::float16_t
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+| 11 = @scalable_vector // Arm SVE
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+tupleelements(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+case @type_operator.kind of
+   0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+case @usertype.kind of
+   0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location_default ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+namespaceattributes(
+    int namespace_id: @namespace ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype
+                       | @decltype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_default ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+|  40 = @stmt_leave
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue | @stmt_leave;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
diff --git a/cpp/downgrades/2121ffec11fac265524955fee1775217364d4ca4/semmlecode.cpp.dbscheme b/cpp/downgrades/2121ffec11fac265524955fee1775217364d4ca4/semmlecode.cpp.dbscheme
new file mode 100644
index 00000000000..c16b29b27f7
--- /dev/null
+++ b/cpp/downgrades/2121ffec11fac265524955fee1775217364d4ca4/semmlecode.cpp.dbscheme
@@ -0,0 +1,2436 @@
+/*- Compilations -*/
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- C++ dbscheme -*/
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+pch_uses(
+    int pch: @pch ref,
+    int compilation: @compilation ref,
+    int id: @file ref
+)
+
+#keyset[pch, compilation]
+pch_creations(
+    int pch: @pch,
+    int compilation: @compilation ref,
+    int from: @file ref
+)
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location_default ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+case @function.kind of
+  0 = @unknown_function
+| 1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+// ... 6 = @builtin_function deprecated    // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+builtin_functions(
+    int id: @function ref
+)
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+| 40 = @decimal32             // _Decimal32
+| 41 = @decimal64             // _Decimal64
+| 42 = @decimal128            // _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+| 62 = @mfp8                  // __mfp8
+| 63 = @scalable_vector_count // __SVCount_t
+| 64 = @complex_fp16          // _Complex __fp16
+| 65 = @complex_std_bfloat16  // _Complex __bf16
+| 66 = @complex_std_float16   // _Complex std::float16_t
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+| 11 = @scalable_vector // Arm SVE
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+tupleelements(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+case @type_operator.kind of
+   0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+case @usertype.kind of
+   0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location_default ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+namespaceattributes(
+    int namespace_id: @namespace ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_default ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+|  40 = @stmt_leave
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue | @stmt_leave;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
diff --git a/cpp/downgrades/2121ffec11fac265524955fee1775217364d4ca4/upgrade.properties b/cpp/downgrades/2121ffec11fac265524955fee1775217364d4ca4/upgrade.properties
new file mode 100644
index 00000000000..a951593a337
--- /dev/null
+++ b/cpp/downgrades/2121ffec11fac265524955fee1775217364d4ca4/upgrade.properties
@@ -0,0 +1,2 @@
+description: Fix decltype qualifier issue
+compatibility: full
diff --git a/cpp/downgrades/c16b29b27f71247023321cc0d0360998b318837c/old.dbscheme b/cpp/downgrades/c16b29b27f71247023321cc0d0360998b318837c/old.dbscheme
new file mode 100644
index 00000000000..c16b29b27f7
--- /dev/null
+++ b/cpp/downgrades/c16b29b27f71247023321cc0d0360998b318837c/old.dbscheme
@@ -0,0 +1,2436 @@
+/*- Compilations -*/
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- C++ dbscheme -*/
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+pch_uses(
+    int pch: @pch ref,
+    int compilation: @compilation ref,
+    int id: @file ref
+)
+
+#keyset[pch, compilation]
+pch_creations(
+    int pch: @pch,
+    int compilation: @compilation ref,
+    int from: @file ref
+)
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location_default ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+case @function.kind of
+  0 = @unknown_function
+| 1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+// ... 6 = @builtin_function deprecated    // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+builtin_functions(
+    int id: @function ref
+)
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+| 40 = @decimal32             // _Decimal32
+| 41 = @decimal64             // _Decimal64
+| 42 = @decimal128            // _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+| 62 = @mfp8                  // __mfp8
+| 63 = @scalable_vector_count // __SVCount_t
+| 64 = @complex_fp16          // _Complex __fp16
+| 65 = @complex_std_bfloat16  // _Complex __bf16
+| 66 = @complex_std_float16   // _Complex std::float16_t
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+| 11 = @scalable_vector // Arm SVE
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+tupleelements(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+case @type_operator.kind of
+   0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+case @usertype.kind of
+   0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location_default ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+namespaceattributes(
+    int namespace_id: @namespace ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_default ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+|  40 = @stmt_leave
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue | @stmt_leave;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
diff --git a/cpp/downgrades/c16b29b27f71247023321cc0d0360998b318837c/semmlecode.cpp.dbscheme b/cpp/downgrades/c16b29b27f71247023321cc0d0360998b318837c/semmlecode.cpp.dbscheme
new file mode 100644
index 00000000000..5340d6d5f42
--- /dev/null
+++ b/cpp/downgrades/c16b29b27f71247023321cc0d0360998b318837c/semmlecode.cpp.dbscheme
@@ -0,0 +1,2423 @@
+/*- Compilations -*/
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- C++ dbscheme -*/
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location_default ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+case @function.kind of
+  0 = @unknown_function
+| 1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+// ... 6 = @builtin_function deprecated    // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+builtin_functions(
+    int id: @function ref
+)
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+| 40 = @decimal32             // _Decimal32
+| 41 = @decimal64             // _Decimal64
+| 42 = @decimal128            // _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+| 62 = @mfp8                  // __mfp8
+| 63 = @scalable_vector_count // __SVCount_t
+| 64 = @complex_fp16          // _Complex __fp16
+| 65 = @complex_std_bfloat16  // _Complex __bf16
+| 66 = @complex_std_float16   // _Complex std::float16_t
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+| 11 = @scalable_vector // Arm SVE
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+tupleelements(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+case @type_operator.kind of
+   0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+case @usertype.kind of
+   0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location_default ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+namespaceattributes(
+    int namespace_id: @namespace ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_default ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+|  40 = @stmt_leave
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue | @stmt_leave;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
diff --git a/cpp/downgrades/c16b29b27f71247023321cc0d0360998b318837c/upgrade.properties b/cpp/downgrades/c16b29b27f71247023321cc0d0360998b318837c/upgrade.properties
new file mode 100644
index 00000000000..c0351e51e29
--- /dev/null
+++ b/cpp/downgrades/c16b29b27f71247023321cc0d0360998b318837c/upgrade.properties
@@ -0,0 +1,4 @@
+description: Link PCH creations and uses
+compatibility: full
+pch_uses.rel: delete
+pch_creations.rel: delete
diff --git a/cpp/ql/integration-tests/query-suite/cpp-code-scanning.qls.expected b/cpp/ql/integration-tests/query-suite/cpp-code-scanning.qls.expected
index c307f26d3db..33c02079fff 100644
--- a/cpp/ql/integration-tests/query-suite/cpp-code-scanning.qls.expected
+++ b/cpp/ql/integration-tests/query-suite/cpp-code-scanning.qls.expected
@@ -7,12 +7,10 @@ ql/cpp/ql/src/Diagnostics/ExtractedFiles.ql
 ql/cpp/ql/src/Diagnostics/ExtractionWarnings.ql
 ql/cpp/ql/src/Diagnostics/FailedExtractorInvocations.ql
 ql/cpp/ql/src/Likely Bugs/Arithmetic/BadAdditionOverflowCheck.ql
-ql/cpp/ql/src/Likely Bugs/Arithmetic/IntMultToLong.ql
 ql/cpp/ql/src/Likely Bugs/Arithmetic/SignedOverflowCheck.ql
 ql/cpp/ql/src/Likely Bugs/Conversion/CastArrayPointerArithmetic.ql
 ql/cpp/ql/src/Likely Bugs/Format/SnprintfOverflow.ql
 ql/cpp/ql/src/Likely Bugs/Format/WrongNumberOfFormatArguments.ql
-ql/cpp/ql/src/Likely Bugs/Format/WrongTypeFormatArguments.ql
 ql/cpp/ql/src/Likely Bugs/Memory Management/AllocaInLoop.ql
 ql/cpp/ql/src/Likely Bugs/Memory Management/PointerOverflow.ql
 ql/cpp/ql/src/Likely Bugs/Memory Management/ReturnStackAllocatedMemory.ql
@@ -30,7 +28,6 @@ ql/cpp/ql/src/Security/CWE/CWE-120/VeryLikelyOverrunWrite.ql
 ql/cpp/ql/src/Security/CWE/CWE-131/NoSpaceForZeroTerminator.ql
 ql/cpp/ql/src/Security/CWE/CWE-134/UncontrolledFormatString.ql
 ql/cpp/ql/src/Security/CWE/CWE-190/ArithmeticUncontrolled.ql
-ql/cpp/ql/src/Security/CWE/CWE-190/ComparisonWithWiderType.ql
 ql/cpp/ql/src/Security/CWE/CWE-191/UnsignedDifferenceExpressionComparedZero.ql
 ql/cpp/ql/src/Security/CWE/CWE-253/HResultBooleanConversion.ql
 ql/cpp/ql/src/Security/CWE/CWE-311/CleartextFileWrite.ql
@@ -43,7 +40,6 @@ ql/cpp/ql/src/Security/CWE/CWE-367/TOCTOUFilesystemRace.ql
 ql/cpp/ql/src/Security/CWE/CWE-416/IteratorToExpiredContainer.ql
 ql/cpp/ql/src/Security/CWE/CWE-416/UseOfStringAfterLifetimeEnds.ql
 ql/cpp/ql/src/Security/CWE/CWE-416/UseOfUniquePointerAfterLifetimeEnds.ql
-ql/cpp/ql/src/Security/CWE/CWE-468/SuspiciousAddWithSizeof.ql
 ql/cpp/ql/src/Security/CWE/CWE-497/ExposedSystemData.ql
 ql/cpp/ql/src/Security/CWE/CWE-611/XXE.ql
 ql/cpp/ql/src/Security/CWE/CWE-676/DangerousFunctionOverflow.ql
diff --git a/cpp/ql/lib/CHANGELOG.md b/cpp/ql/lib/CHANGELOG.md
index def048bdd3c..0f158cd3fb5 100644
--- a/cpp/ql/lib/CHANGELOG.md
+++ b/cpp/ql/lib/CHANGELOG.md
@@ -1,3 +1,50 @@
+## 6.0.1
+
+No user-facing changes.
+
+## 6.0.0
+
+### Breaking Changes
+
+* The "Guards" libraries (`semmle.code.cpp.controlflow.Guards` and `semmle.code.cpp.controlflow.IRGuards`) have been totally rewritten to recognize many more guards. The API remains unchanged, but the `GuardCondition` class now extends `Element` instead of `Expr`.
+
+### New Features
+
+* C/C++ `build-mode: none` support is now generally available.
+
+## 5.6.1
+
+No user-facing changes.
+
+## 5.6.0
+
+### Deprecated APIs
+
+* The predicate `getAContructorCall` in the class `SslContextClass` has been deprecated. Use `getAConstructorCall` instead.
+
+### New Features
+
+* Added predicates `getTransitiveNumberOfVlaDimensionStmts`, `getTransitiveVlaDimensionStmt`, and `getParentVlaDecl` to `VlaDeclStmt` for handling `VlaDeclStmt`s whose base type is defined in terms of another `VlaDeclStmt` via a `typedef`.
+
+## 5.5.0
+
+### New Features
+
+* Added a new class `PchFile` representing precompiled header (PCH) files used during project compilation.
+
+### Minor Analysis Improvements
+
+* Added flow summaries for the `Microsoft::WRL::ComPtr` member functions.
+* The new dataflow/taint-tracking library (`semmle.code.cpp.dataflow.new.DataFlow` and `semmle.code.cpp.dataflow.new.TaintTracking`) now resolves virtual function calls more precisely. This results in fewer false positives when running dataflow/taint-tracking queries on C++ projects.
+
+## 5.4.1
+
+### Minor Analysis Improvements
+
+* The guards libraries (`semmle.code.cpp.controlflow.Guards` and `semmle.code.cpp.controlflow.IRGuards`) have been improved to recognize more guards.
+* Improved dataflow through global variables in the new dataflow library (`semmle.code.cpp.dataflow.new.DataFlow` and `semmle.code.cpp.dataflow.new.TaintTracking`). Queries based on these libraries will produce more results on codebases with many global variables.
+* The global value numbering library (`semmle.code.cpp.valuenumbering.GlobalValueNumbering` and `semmle.code.cpp.ir.ValueNumbering`) has been improved so more expressions are assigned the same value number.
+
 ## 5.4.0
 
 ### New Features
@@ -212,8 +259,8 @@ No user-facing changes.
 
 ### Breaking Changes
 
-* Deleted many deprecated taint-tracking configurations based on `TaintTracking::Configuration`. 
-* Deleted many deprecated dataflow configurations based on `DataFlow::Configuration`. 
+* Deleted many deprecated taint-tracking configurations based on `TaintTracking::Configuration`.
+* Deleted many deprecated dataflow configurations based on `DataFlow::Configuration`.
 * Deleted the deprecated `hasQualifiedName` and `isDefined` predicates from the `Declaration` class, use `hasGlobalName` and `hasDefinition` respectively instead.
 * Deleted the `getFullSignature` predicate from the `Function` class, use `getIdentityString(Declaration)` from `semmle.code.cpp.Print` instead.
 * Deleted the deprecated `freeCall` predicate from `Alloc.qll`. Use `DeallocationExpr` instead.
@@ -247,7 +294,7 @@ No user-facing changes.
 * A `getTemplateClass` predicate was added to the `DeductionGuide` class to get the class template for which the deduction guide is a guide.
 * An `isExplicit` predicate was added to the `Function` class that determines whether the function was declared as explicit.
 * A `getExplicitExpr` predicate was added to the `Function` class that yields the constant boolean expression (if any) that conditionally determines whether the function is explicit.
-* A `isDestroyingDeleteDeallocation` predicate was added to the `NewOrNewArrayExpr` and `DeleteOrDeleteArrayExpr` classes to indicate whether the deallocation function is a destroying delete. 
+* A `isDestroyingDeleteDeallocation` predicate was added to the `NewOrNewArrayExpr` and `DeleteOrDeleteArrayExpr` classes to indicate whether the deallocation function is a destroying delete.
 
 ### Minor Analysis Improvements
 
@@ -325,9 +372,9 @@ No user-facing changes.
 ### New Features
 
 * Added a `TaintInheritingContent` class that can be extended to model taint flowing from a qualifier to a field.
-* Added a predicate `GuardCondition.comparesEq/4` to query whether an expression is compared to a constant. 
+* Added a predicate `GuardCondition.comparesEq/4` to query whether an expression is compared to a constant.
 * Added a predicate `GuardCondition.ensuresEq/4` to query whether a basic block is guarded by an expression being equal to a constant.
-* Added a predicate `GuardCondition.comparesLt/4` to query whether an expression is compared to a constant. 
+* Added a predicate `GuardCondition.comparesLt/4` to query whether an expression is compared to a constant.
 * Added a predicate `GuardCondition.ensuresLt/4` to query whether a basic block is guarded by an expression being less than a constant.
 * Added a predicate `GuardCondition.valueControls` to query whether a basic block is guarded by a particular `case` of a `switch` statement.
 
@@ -443,7 +490,7 @@ No user-facing changes.
 * Functions that do not return due to calling functions that don't return (e.g. `exit`) are now detected as
  non-returning in the IR and dataflow.
 * Treat functions that reach the end of the function as returning in the IR.
-  They used to be treated as unreachable but it is allowed in C. 
+  They used to be treated as unreachable but it is allowed in C.
 * The `DataFlow::asDefiningArgument` predicate now takes its argument from the range starting at `1` instead of `2`. Queries that depend on the single-parameter version of `DataFlow::asDefiningArgument` should have their arguments updated accordingly.
 
 ## 0.9.3
@@ -492,7 +539,7 @@ No user-facing changes.
 
 ### New Features
 
-* The `DataFlow::StateConfigSig` signature module has gained default implementations for `isBarrier/2` and `isAdditionalFlowStep/4`. 
+* The `DataFlow::StateConfigSig` signature module has gained default implementations for `isBarrier/2` and `isAdditionalFlowStep/4`.
   Hence it is no longer needed to provide `none()` implementations of these predicates if they are not needed.
 
 ### Minor Analysis Improvements
@@ -686,7 +733,7 @@ No user-facing changes.
 
 ### Deprecated APIs
 
-* Some classes/modules with upper-case acronyms in their name have been renamed to follow our style-guide. 
+* Some classes/modules with upper-case acronyms in their name have been renamed to follow our style-guide.
   The old name still exists as a deprecated alias.
 
 ### New Features
@@ -703,7 +750,7 @@ No user-facing changes.
 
 ### Deprecated APIs
 
-* Many classes/predicates/modules with upper-case acronyms in their name have been renamed to follow our style-guide. 
+* Many classes/predicates/modules with upper-case acronyms in their name have been renamed to follow our style-guide.
   The old name still exists as a deprecated alias.
 
 ### New Features
@@ -802,7 +849,7 @@ No user-facing changes.
 
 ### Deprecated APIs
 
-* Many classes/predicates/modules that had upper-case acronyms have been renamed to follow our style-guide. 
+* Many classes/predicates/modules that had upper-case acronyms have been renamed to follow our style-guide.
   The old name still exists as a deprecated alias.
 
 ### New Features
diff --git a/cpp/ql/lib/Customizations.qll b/cpp/ql/lib/Customizations.qll
new file mode 100644
index 00000000000..c9d899e07e0
--- /dev/null
+++ b/cpp/ql/lib/Customizations.qll
@@ -0,0 +1,11 @@
+/**
+ * Contains customizations to the standard library.
+ *
+ * This module is imported by `cpp.qll`, so any customizations defined here automatically
+ * apply to all queries.
+ *
+ * Typical examples of customizations include adding new subclasses of abstract classes such as
+ * the `RemoteFlowSource` class to model frameworks that are not covered by the standard library.
+ */
+
+import cpp
diff --git a/cpp/ql/lib/Options.qll b/cpp/ql/lib/Options.qll
index a0a13881a94..c4652e3f6ca 100644
--- a/cpp/ql/lib/Options.qll
+++ b/cpp/ql/lib/Options.qll
@@ -35,7 +35,7 @@ class CustomOptions extends Options {
   override predicate returnsNull(Call call) { Options.super.returnsNull(call) }
 
   /**
-   * Holds if a call to this function will never return.
+   * Holds if a call to the function `f` will never return.
    *
    * By default, this holds for `exit`, `_exit`, `abort`, `__assert_fail`,
    * `longjmp`, `error`, `__builtin_unreachable` and any function with a
diff --git a/cpp/ql/lib/change-notes/2025-08-02-gvn.md b/cpp/ql/lib/change-notes/2025-08-02-gvn.md
deleted file mode 100644
index 70c9f7dbb15..00000000000
--- a/cpp/ql/lib/change-notes/2025-08-02-gvn.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* The global value numbering library (`semmle.code.cpp.valuenumbering.GlobalValueNumbering` and `semmle.code.cpp.ir.ValueNumbering`) has been improved so more expressions are assigned the same value number.
\ No newline at end of file
diff --git a/cpp/ql/lib/change-notes/2025-08-11-global-variable-flow.md b/cpp/ql/lib/change-notes/2025-08-11-global-variable-flow.md
deleted file mode 100644
index c140570df31..00000000000
--- a/cpp/ql/lib/change-notes/2025-08-11-global-variable-flow.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* Improved dataflow through global variables in the new dataflow library (`semmle.code.cpp.dataflow.new.DataFlow` and `semmle.code.cpp.dataflow.new.TaintTracking`). Queries based on these libraries will produce more results on codebases with many global variables.
\ No newline at end of file
diff --git a/cpp/ql/lib/change-notes/2025-08-13-guards.md b/cpp/ql/lib/change-notes/2025-08-13-guards.md
deleted file mode 100644
index 4181a6cbeb2..00000000000
--- a/cpp/ql/lib/change-notes/2025-08-13-guards.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* The guards libraries (`semmle.code.cpp.controlflow.Guards` and `semmle.code.cpp.controlflow.IRGuards`) have been improved to recognize more guards.
\ No newline at end of file
diff --git a/cpp/ql/lib/change-notes/released/5.4.1.md b/cpp/ql/lib/change-notes/released/5.4.1.md
new file mode 100644
index 00000000000..ae345bbf8d8
--- /dev/null
+++ b/cpp/ql/lib/change-notes/released/5.4.1.md
@@ -0,0 +1,7 @@
+## 5.4.1
+
+### Minor Analysis Improvements
+
+* The guards libraries (`semmle.code.cpp.controlflow.Guards` and `semmle.code.cpp.controlflow.IRGuards`) have been improved to recognize more guards.
+* Improved dataflow through global variables in the new dataflow library (`semmle.code.cpp.dataflow.new.DataFlow` and `semmle.code.cpp.dataflow.new.TaintTracking`). Queries based on these libraries will produce more results on codebases with many global variables.
+* The global value numbering library (`semmle.code.cpp.valuenumbering.GlobalValueNumbering` and `semmle.code.cpp.ir.ValueNumbering`) has been improved so more expressions are assigned the same value number.
diff --git a/cpp/ql/lib/change-notes/released/5.5.0.md b/cpp/ql/lib/change-notes/released/5.5.0.md
new file mode 100644
index 00000000000..aad060fdd59
--- /dev/null
+++ b/cpp/ql/lib/change-notes/released/5.5.0.md
@@ -0,0 +1,10 @@
+## 5.5.0
+
+### New Features
+
+* Added a new class `PchFile` representing precompiled header (PCH) files used during project compilation.
+
+### Minor Analysis Improvements
+
+* Added flow summaries for the `Microsoft::WRL::ComPtr` member functions.
+* The new dataflow/taint-tracking library (`semmle.code.cpp.dataflow.new.DataFlow` and `semmle.code.cpp.dataflow.new.TaintTracking`) now resolves virtual function calls more precisely. This results in fewer false positives when running dataflow/taint-tracking queries on C++ projects.
diff --git a/cpp/ql/lib/change-notes/released/5.6.0.md b/cpp/ql/lib/change-notes/released/5.6.0.md
new file mode 100644
index 00000000000..a21fadb3bf3
--- /dev/null
+++ b/cpp/ql/lib/change-notes/released/5.6.0.md
@@ -0,0 +1,9 @@
+## 5.6.0
+
+### Deprecated APIs
+
+* The predicate `getAContructorCall` in the class `SslContextClass` has been deprecated. Use `getAConstructorCall` instead.
+
+### New Features
+
+* Added predicates `getTransitiveNumberOfVlaDimensionStmts`, `getTransitiveVlaDimensionStmt`, and `getParentVlaDecl` to `VlaDeclStmt` for handling `VlaDeclStmt`s whose base type is defined in terms of another `VlaDeclStmt` via a `typedef`.
diff --git a/cpp/ql/lib/change-notes/released/5.6.1.md b/cpp/ql/lib/change-notes/released/5.6.1.md
new file mode 100644
index 00000000000..368d902c7fe
--- /dev/null
+++ b/cpp/ql/lib/change-notes/released/5.6.1.md
@@ -0,0 +1,3 @@
+## 5.6.1
+
+No user-facing changes.
diff --git a/cpp/ql/lib/change-notes/released/6.0.0.md b/cpp/ql/lib/change-notes/released/6.0.0.md
new file mode 100644
index 00000000000..574e05442ec
--- /dev/null
+++ b/cpp/ql/lib/change-notes/released/6.0.0.md
@@ -0,0 +1,9 @@
+## 6.0.0
+
+### Breaking Changes
+
+* The "Guards" libraries (`semmle.code.cpp.controlflow.Guards` and `semmle.code.cpp.controlflow.IRGuards`) have been totally rewritten to recognize many more guards. The API remains unchanged, but the `GuardCondition` class now extends `Element` instead of `Expr`.
+
+### New Features
+
+* C/C++ `build-mode: none` support is now generally available.
diff --git a/cpp/ql/lib/change-notes/released/6.0.1.md b/cpp/ql/lib/change-notes/released/6.0.1.md
new file mode 100644
index 00000000000..35b17912c81
--- /dev/null
+++ b/cpp/ql/lib/change-notes/released/6.0.1.md
@@ -0,0 +1,3 @@
+## 6.0.1
+
+No user-facing changes.
diff --git a/cpp/ql/lib/codeql-pack.release.yml b/cpp/ql/lib/codeql-pack.release.yml
index afb2156eaa2..d1f3c68c812 100644
--- 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: 6.0.1
diff --git a/cpp/ql/lib/cpp.qll b/cpp/ql/lib/cpp.qll
index ccd32c368e4..46c651daf57 100644
--- a/cpp/ql/lib/cpp.qll
+++ b/cpp/ql/lib/cpp.qll
@@ -13,7 +13,9 @@
  *     https://github.com/cplusplus/draft/raw/master/papers/n4140.pdf
  */
 
+import Customizations
 import semmle.code.cpp.File
+import semmle.code.cpp.PchFile
 import semmle.code.cpp.Linkage
 import semmle.code.cpp.Location
 import semmle.code.cpp.Compilation
diff --git a/cpp/ql/lib/experimental/cryptography/CryptoArtifact.qll b/cpp/ql/lib/experimental/cryptography/CryptoArtifact.qll
index 0bb22d688ed..296b97f66f2 100644
--- a/cpp/ql/lib/experimental/cryptography/CryptoArtifact.qll
+++ b/cpp/ql/lib/experimental/cryptography/CryptoArtifact.qll
@@ -127,7 +127,7 @@ abstract class CryptographicAlgorithm extends CryptographicArtifact {
   /**
    * Normalizes a raw name into a normalized name as found in `CryptoAlgorithmNames.qll`.
    * Subclassess should override for more api-specific normalization.
-   * By deafult, converts a raw name to upper-case with no hyphen, underscore, hash, or space.
+   * By default, converts a raw name to upper-case with no hyphen, underscore, hash, or space.
    */
   bindingset[s]
   string normalizeName(string s) {
diff --git a/cpp/ql/lib/experimental/cryptography/modules/OpenSSL.qll b/cpp/ql/lib/experimental/cryptography/modules/OpenSSL.qll
index 0a52fa5bb81..6b6338a4926 100644
--- a/cpp/ql/lib/experimental/cryptography/modules/OpenSSL.qll
+++ b/cpp/ql/lib/experimental/cryptography/modules/OpenSSL.qll
@@ -652,14 +652,14 @@ module KeyGeneration {
    * Trace from EVP_PKEY_CTX* at algorithm sink to keygen,
    * users can then extrapolatae the matching algorithm from the alg sink to the keygen
    */
-  module EVP_PKEY_CTX_Ptr_Source_to_KeyGenOperationWithNoSize implements DataFlow::ConfigSig {
+  module EVP_PKEY_CTX_Ptr_Source_to_KeyGenOperationWithNoSizeConfig implements DataFlow::ConfigSig {
     predicate isSource(DataFlow::Node source) { isEVP_PKEY_CTX_Source(source, _) }
 
     predicate isSink(DataFlow::Node sink) { isKeyGen_EVP_PKEY_CTX_Sink(sink, _) }
   }
 
   module EVP_PKEY_CTX_Ptr_Source_to_KeyGenOperationWithNoSize_Flow =
-    DataFlow::Global<EVP_PKEY_CTX_Ptr_Source_to_KeyGenOperationWithNoSize>;
+    DataFlow::Global<EVP_PKEY_CTX_Ptr_Source_to_KeyGenOperationWithNoSizeConfig>;
 
   /**
    * UNKNOWN key sizes to general purpose key generation functions (i.e., that take in no key size and assume
diff --git a/cpp/ql/lib/experimental/cryptography/utils/OpenSSL/CryptoFunction.qll b/cpp/ql/lib/experimental/cryptography/utils/OpenSSL/CryptoFunction.qll
index 2c46a7c0674..1e0f3b6dfbf 100644
--- a/cpp/ql/lib/experimental/cryptography/utils/OpenSSL/CryptoFunction.qll
+++ b/cpp/ql/lib/experimental/cryptography/utils/OpenSSL/CryptoFunction.qll
@@ -59,7 +59,7 @@ private string privateNormalizeFunctionName(Function f, string algType) {
  *
  * The predicate attempts to restrict normalization to what looks like an openssl
  * library by looking for functions only in an openssl path (see `isPossibleOpenSSLFunction`).
- * This may give false postive functions if a directory erronously appears to be openssl;
+ * This may give false positive functions if a directory erronously appears to be openssl;
  * however, we take the stance that if a function
  * exists strongly mapping to a known function name in a directory such as these,
  * regardless of whether its actually a part of openSSL or not, we will analyze it as though it were.
diff --git a/cpp/ql/lib/experimental/cryptography/utils/OpenSSL/DataBuilders.qll b/cpp/ql/lib/experimental/cryptography/utils/OpenSSL/DataBuilders.qll
index ba83de34597..54121c36766 100644
--- a/cpp/ql/lib/experimental/cryptography/utils/OpenSSL/DataBuilders.qll
+++ b/cpp/ql/lib/experimental/cryptography/utils/OpenSSL/DataBuilders.qll
@@ -49,7 +49,7 @@ private string privateNormalizeFunctionName(Function f, string algType) {
  *
  * The predicate attempts to restrict normalization to what looks like an openssl
  * library by looking for functions only in an openssl path (see `isPossibleOpenSSLFunction`).
- * This may give false postive functions if a directory erronously appears to be openssl;
+ * This may give false positive functions if a directory erronously appears to be openssl;
  * however, we take the stance that if a function
  * exists strongly mapping to a known function name in a directory such as these,
  * regardless of whether its actually a part of openSSL or not, we will analyze it as though it were.
diff --git a/cpp/ql/lib/experimental/cryptography/utils/OpenSSL/PassthroughFunction.qll b/cpp/ql/lib/experimental/cryptography/utils/OpenSSL/PassthroughFunction.qll
index f772f85afb1..e1e64f78e3e 100644
--- a/cpp/ql/lib/experimental/cryptography/utils/OpenSSL/PassthroughFunction.qll
+++ b/cpp/ql/lib/experimental/cryptography/utils/OpenSSL/PassthroughFunction.qll
@@ -31,7 +31,7 @@ predicate knownPassthroughFunction(Function f, int inInd, int outInd) {
 
 /**
  * `c` is a call to a function that preserves the algorithm but changes its form.
- * `onExpr` is the input argument passing through to, `outExpr` is the next expression in a dataflow step associated with `c`
+ * `inExpr` is the input argument passing through to, `outExpr` is the next expression in a dataflow step associated with `c`
  */
 predicate knownPassthoughCall(Call c, Expr inExpr, Expr outExpr) {
   exists(int inInd, int outInd |
diff --git a/cpp/ql/lib/experimental/quantum/Language.qll b/cpp/ql/lib/experimental/quantum/Language.qll
index 53cf7292b12..d3feb3fe0d9 100644
--- a/cpp/ql/lib/experimental/quantum/Language.qll
+++ b/cpp/ql/lib/experimental/quantum/Language.qll
@@ -14,8 +14,8 @@ module CryptoInput implements InputSig<Language::Location> {
     result = node.asExpr() or
     result = node.asParameter() or
     result = node.asVariable() or
-    result = node.asDefiningArgument()
-    // TODO: do we need asIndirectExpr()?
+    result = node.asDefiningArgument() or
+    result = node.asIndirectExpr()
   }
 
   string locationToFileBaseNameAndLineNumberString(Location location) {
@@ -53,7 +53,7 @@ module ArtifactFlowConfig implements DataFlow::ConfigSig {
   }
 }
 
-module ArtifactFlow = DataFlow::Global<ArtifactFlowConfig>;
+module ArtifactFlow = TaintTracking::Global<ArtifactFlowConfig>;
 
 /**
  * An artifact output to node input configuration
@@ -93,7 +93,13 @@ module GenericDataSourceFlow = TaintTracking::Global<GenericDataSourceFlowConfig
 
 private class ConstantDataSource extends Crypto::GenericConstantSourceInstance instanceof OpenSslGenericSourceCandidateLiteral
 {
-  override DataFlow::Node getOutputNode() { result.asExpr() = this }
+  override DataFlow::Node getOutputNode() {
+    // OpenSSL algorithms may be referenced either by string name or by numeric ID:
+    // String names (e.g. "AES-256-CBC") appear in the AST as character pointer
+    // literals. For these we must use `asIndirectExpr`. Numeric IDs (e.g. NID_aes_256_cbc)
+    // appear as integer literals. For these, we must use `asExpr` to get the "value" node.
+    [result.asIndirectExpr(), result.asExpr()] = this
+  }
 
   override predicate flowsTo(Crypto::FlowAwareElement other) {
     // TODO: separate config to avoid blowing up data-flow analysis
@@ -103,28 +109,4 @@ private class ConstantDataSource extends Crypto::GenericConstantSourceInstance i
   override string getAdditionalDescription() { result = this.toString() }
 }
 
-module ArtifactUniversalFlowConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) {
-    source = any(Crypto::ArtifactInstance artifact).getOutputNode()
-  }
-
-  predicate isSink(DataFlow::Node sink) {
-    sink = any(Crypto::FlowAwareElement other).getInputNode()
-  }
-
-  predicate isBarrierOut(DataFlow::Node node) {
-    node = any(Crypto::FlowAwareElement element).getInputNode()
-  }
-
-  predicate isBarrierIn(DataFlow::Node node) {
-    node = any(Crypto::FlowAwareElement element).getOutputNode()
-  }
-
-  predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
-    node1.(AdditionalFlowInputStep).getOutput() = node2
-  }
-}
-
-module ArtifactUniversalFlow = DataFlow::Global<ArtifactUniversalFlowConfig>;
-
 import OpenSSL.OpenSSL
diff --git a/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmInstances/AlgToAVCFlow.qll b/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmInstances/AlgToAVCFlow.qll
index f802e58d0a7..eafc839fbb8 100644
--- a/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmInstances/AlgToAVCFlow.qll
+++ b/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmInstances/AlgToAVCFlow.qll
@@ -14,9 +14,13 @@ private import PaddingAlgorithmInstance
  */
 module KnownOpenSslAlgorithmToAlgorithmValueConsumerConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) {
-    source.asExpr() instanceof KnownOpenSslAlgorithmExpr and
+    (
+      source.asExpr() instanceof KnownOpenSslAlgorithmExpr or
+      source.asIndirectExpr() instanceof KnownOpenSslAlgorithmExpr
+    ) and
     // No need to flow direct operations to AVCs
-    not source.asExpr() instanceof OpenSslDirectAlgorithmOperationCall
+    not source.asExpr() instanceof OpenSslDirectAlgorithmOperationCall and
+    not source.asIndirectExpr() instanceof OpenSslDirectAlgorithmOperationCall
   }
 
   predicate isSink(DataFlow::Node sink) {
@@ -46,10 +50,12 @@ module KnownOpenSslAlgorithmToAlgorithmValueConsumerConfig implements DataFlow::
 }
 
 module KnownOpenSslAlgorithmToAlgorithmValueConsumerFlow =
-  DataFlow::Global<KnownOpenSslAlgorithmToAlgorithmValueConsumerConfig>;
+  TaintTracking::Global<KnownOpenSslAlgorithmToAlgorithmValueConsumerConfig>;
 
 module RsaPaddingAlgorithmToPaddingAlgorithmValueConsumerConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { source.asExpr() instanceof OpenSslPaddingLiteral }
+  predicate isSource(DataFlow::Node source) {
+    source.asExpr() instanceof OpenSslSpecialPaddingLiteral
+  }
 
   predicate isSink(DataFlow::Node sink) {
     exists(PaddingAlgorithmValueConsumer c | c.getInputNode() = sink)
@@ -61,7 +67,7 @@ module RsaPaddingAlgorithmToPaddingAlgorithmValueConsumerConfig implements DataF
 }
 
 module RsaPaddingAlgorithmToPaddingAlgorithmValueConsumerFlow =
-  DataFlow::Global<RsaPaddingAlgorithmToPaddingAlgorithmValueConsumerConfig>;
+  TaintTracking::Global<RsaPaddingAlgorithmToPaddingAlgorithmValueConsumerConfig>;
 
 class OpenSslAlgorithmAdditionalFlowStep extends AdditionalFlowInputStep {
   OpenSslAlgorithmAdditionalFlowStep() { exists(AlgorithmPassthroughCall c | c.getInNode() = this) }
diff --git a/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmInstances/BlockAlgorithmInstance.qll b/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmInstances/BlockAlgorithmInstance.qll
index 4bd4b449766..a0cbad2c57d 100644
--- a/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmInstances/BlockAlgorithmInstance.qll
+++ b/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmInstances/BlockAlgorithmInstance.qll
@@ -53,7 +53,8 @@ class KnownOpenSslBlockModeConstantAlgorithmInstance extends OpenSslAlgorithmIns
       // Sink is an argument to a CipherGetterCall
       sink = getterCall.getInputNode() and
       // Source is `this`
-      src.asExpr() = this and
+      // NOTE: src literals can be ints or strings, so need to consider asExpr and asIndirectExpr
+      this = [src.asExpr(), src.asIndirectExpr()] and
       // This traces to a getter
       KnownOpenSslAlgorithmToAlgorithmValueConsumerFlow::flow(src, sink)
     )
diff --git a/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmInstances/CipherAlgorithmInstance.qll b/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmInstances/CipherAlgorithmInstance.qll
index 47ffd67924a..23efacae69b 100644
--- a/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmInstances/CipherAlgorithmInstance.qll
+++ b/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmInstances/CipherAlgorithmInstance.qll
@@ -2,12 +2,10 @@ import cpp
 private import experimental.quantum.Language
 private import KnownAlgorithmConstants
 private import Crypto::KeyOpAlg as KeyOpAlg
-private import OpenSSLAlgorithmInstanceBase
-private import PaddingAlgorithmInstance
-private import experimental.quantum.OpenSSL.AlgorithmValueConsumers.OpenSSLAlgorithmValueConsumerBase
-private import experimental.quantum.OpenSSL.AlgorithmValueConsumers.DirectAlgorithmValueConsumer
+private import experimental.quantum.OpenSSL.Operations.OpenSSLOperationBase
+private import experimental.quantum.OpenSSL.AlgorithmValueConsumers.OpenSSLAlgorithmValueConsumers
+private import OpenSSLAlgorithmInstances
 private import AlgToAVCFlow
-private import BlockAlgorithmInstance
 
 /**
  * Given a `KnownOpenSslCipherAlgorithmExpr`, converts this to a cipher family type.
@@ -79,7 +77,8 @@ class KnownOpenSslCipherConstantAlgorithmInstance extends OpenSslAlgorithmInstan
       // Sink is an argument to a CipherGetterCall
       sink = getterCall.getInputNode() and
       // Source is `this`
-      src.asExpr() = this and
+      // NOTE: src literals can be ints or strings, so need to consider asExpr and asIndirectExpr
+      this = [src.asExpr(), src.asIndirectExpr()] and
       // This traces to a getter
       KnownOpenSslAlgorithmToAlgorithmValueConsumerFlow::flow(src, sink)
     )
@@ -97,10 +96,13 @@ class KnownOpenSslCipherConstantAlgorithmInstance extends OpenSslAlgorithmInstan
   }
 
   override Crypto::PaddingAlgorithmInstance getPaddingAlgorithm() {
-    //TODO: the padding is either self, or it flows through getter ctx to a set padding call
-    // like EVP_PKEY_CTX_set_rsa_padding
     result = this
-    // TODO or trace through getter ctx to set padding
+    or
+    exists(OperationStep s |
+      this.getAvc().(AvcContextCreationStep).flowsToOperationStep(s) and
+      s.getAlgorithmValueConsumerForInput(PaddingAlgorithmIO()) =
+        result.(OpenSslAlgorithmInstance).getAvc()
+    )
   }
 
   override string getRawAlgorithmName() {
@@ -117,7 +119,7 @@ class KnownOpenSslCipherConstantAlgorithmInstance extends OpenSslAlgorithmInstan
     knownOpenSslConstantToCipherFamilyType(this, result)
     or
     not knownOpenSslConstantToCipherFamilyType(this, _) and
-    result = Crypto::KeyOpAlg::TUnknownKeyOperationAlgorithmType()
+    result = Crypto::KeyOpAlg::TOtherKeyOperationAlgorithmType()
   }
 
   override OpenSslAlgorithmValueConsumer getAvc() { result = getterCall }
diff --git a/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmInstances/EllipticCurveAlgorithmInstance.qll b/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmInstances/EllipticCurveAlgorithmInstance.qll
index 82a2b1357f2..76746eceba4 100644
--- a/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmInstances/EllipticCurveAlgorithmInstance.qll
+++ b/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmInstances/EllipticCurveAlgorithmInstance.qll
@@ -21,7 +21,8 @@ class KnownOpenSslEllipticCurveConstantAlgorithmInstance extends OpenSslAlgorith
       // Sink is an argument to a CipherGetterCall
       sink = getterCall.getInputNode() and
       // Source is `this`
-      src.asExpr() = this and
+      // NOTE: src literals can be ints or strings, so need to consider asExpr and asIndirectExpr
+      this = [src.asExpr(), src.asIndirectExpr()] and
       // This traces to a getter
       KnownOpenSslAlgorithmToAlgorithmValueConsumerFlow::flow(src, sink)
     )
@@ -39,7 +40,7 @@ class KnownOpenSslEllipticCurveConstantAlgorithmInstance extends OpenSslAlgorith
     result = this.(Call).getTarget().getName()
   }
 
-  override Crypto::EllipticCurveFamilyType getEllipticCurveFamilyType() {
+  override Crypto::EllipticCurveType getEllipticCurveType() {
     if
       Crypto::ellipticCurveNameToKnownKeySizeAndFamilyMapping(this.getParsedEllipticCurveName(), _,
         _)
diff --git a/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmInstances/HashAlgorithmInstance.qll b/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmInstances/HashAlgorithmInstance.qll
index 2be84b68f61..0facc99519d 100644
--- a/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmInstances/HashAlgorithmInstance.qll
+++ b/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmInstances/HashAlgorithmInstance.qll
@@ -59,7 +59,8 @@ class KnownOpenSslHashConstantAlgorithmInstance extends OpenSslAlgorithmInstance
       // Sink is an argument to a CipherGetterCall
       sink = getterCall.getInputNode() and
       // Source is `this`
-      src.asExpr() = this and
+      // NOTE: src literals can be ints or strings, so need to consider asExpr and asIndirectExpr
+      this = [src.asExpr(), src.asIndirectExpr()] and
       // This traces to a getter
       KnownOpenSslAlgorithmToAlgorithmValueConsumerFlow::flow(src, sink)
     )
@@ -71,7 +72,7 @@ class KnownOpenSslHashConstantAlgorithmInstance extends OpenSslAlgorithmInstance
 
   override OpenSslAlgorithmValueConsumer getAvc() { result = getterCall }
 
-  override Crypto::THashType getHashFamily() {
+  override Crypto::THashType getHashType() {
     knownOpenSslConstantToHashFamilyType(this, result)
     or
     not knownOpenSslConstantToHashFamilyType(this, _) and result = Crypto::OtherHashType()
diff --git a/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmInstances/KeyAgreementAlgorithmInstance.qll b/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmInstances/KeyAgreementAlgorithmInstance.qll
index 1addda3a9ef..542c56666d9 100644
--- a/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmInstances/KeyAgreementAlgorithmInstance.qll
+++ b/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmInstances/KeyAgreementAlgorithmInstance.qll
@@ -37,7 +37,8 @@ class KnownOpenSslKeyAgreementConstantAlgorithmInstance extends OpenSslAlgorithm
       // Sink is an argument to a CipherGetterCall
       sink = getterCall.getInputNode() and
       // Source is `this`
-      src.asExpr() = this and
+      // NOTE: src literals can be ints or strings, so need to consider asExpr and asIndirectExpr
+      this = [src.asExpr(), src.asIndirectExpr()] and
       // This traces to a getter
       KnownOpenSslAlgorithmToAlgorithmValueConsumerFlow::flow(src, sink)
     )
diff --git a/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmInstances/KnownAlgorithmConstants.qll b/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmInstances/KnownAlgorithmConstants.qll
index 4328253f1a4..dcc7ad08ae5 100644
--- a/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmInstances/KnownAlgorithmConstants.qll
+++ b/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmInstances/KnownAlgorithmConstants.qll
@@ -171,9 +171,15 @@ class KnownOpenSslKeyAgreementAlgorithmExpr extends Expr instanceof KnownOpenSsl
 }
 
 predicate knownOpenSslAlgorithmOperationCall(Call c, string normalized, string algType) {
-  c.getTarget().getName() in ["EVP_RSA_gen", "RSA_generate_key_ex", "RSA_generate_key", "RSA_new"] and
+  c.getTarget().getName() in [
+      "EVP_RSA_gen", "RSA_generate_key_ex", "RSA_generate_key", "RSA_new", "RSA_sign", "RSA_verify"
+    ] and
   normalized = "RSA" and
   algType = "ASYMMETRIC_ENCRYPTION"
+  or
+  c.getTarget().getName() in ["DSA_do_sign", "DSA_do_verify"] and
+  normalized = "DSA" and
+  algType = "SIGNATURE"
 }
 
 /**
diff --git a/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmInstances/MACAlgorithmInstance.qll b/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmInstances/MACAlgorithmInstance.qll
index 97b183b7e7d..5590f74082c 100644
--- a/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmInstances/MACAlgorithmInstance.qll
+++ b/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmInstances/MACAlgorithmInstance.qll
@@ -2,12 +2,13 @@ import cpp
 private import experimental.quantum.Language
 private import KnownAlgorithmConstants
 private import experimental.quantum.OpenSSL.AlgorithmValueConsumers.OpenSSLAlgorithmValueConsumers
-private import experimental.quantum.OpenSSL.AlgorithmInstances.OpenSSLAlgorithmInstanceBase
+private import experimental.quantum.OpenSSL.AlgorithmInstances.OpenSSLAlgorithmInstances
 private import experimental.quantum.OpenSSL.Operations.OpenSSLOperations
+private import Crypto::KeyOpAlg as KeyOpAlg
 private import AlgToAVCFlow
 
 class KnownOpenSslMacConstantAlgorithmInstance extends OpenSslAlgorithmInstance,
-  Crypto::MacAlgorithmInstance instanceof KnownOpenSslMacAlgorithmExpr
+  Crypto::KeyOperationAlgorithmInstance instanceof KnownOpenSslMacAlgorithmExpr
 {
   OpenSslAlgorithmValueConsumer getterCall;
 
@@ -21,7 +22,8 @@ class KnownOpenSslMacConstantAlgorithmInstance extends OpenSslAlgorithmInstance,
       // Sink is an argument to a CipherGetterCall
       sink = getterCall.getInputNode() and
       // Source is `this`
-      src.asExpr() = this and
+      // NOTE: src literals can be ints or strings, so need to consider asExpr and asIndirectExpr
+      this = [src.asExpr(), src.asIndirectExpr()] and
       // This traces to a getter
       KnownOpenSslAlgorithmToAlgorithmValueConsumerFlow::flow(src, sink)
     )
@@ -33,17 +35,34 @@ class KnownOpenSslMacConstantAlgorithmInstance extends OpenSslAlgorithmInstance,
 
   override OpenSslAlgorithmValueConsumer getAvc() { result = getterCall }
 
-  override string getRawMacAlgorithmName() {
+  override string getRawAlgorithmName() {
     result = this.(Literal).getValue().toString()
     or
     result = this.(Call).getTarget().getName()
   }
 
-  override Crypto::MacType getMacType() {
-    this instanceof KnownOpenSslHMacAlgorithmExpr and result = Crypto::HMAC()
-    or
-    this instanceof KnownOpenSslCMacAlgorithmExpr and result = Crypto::CMAC()
+  override Crypto::KeyOpAlg::AlgorithmType getAlgorithmType() {
+    if this instanceof KnownOpenSslHMacAlgorithmExpr
+    then result = KeyOpAlg::TMac(KeyOpAlg::HMAC())
+    else
+      if this instanceof KnownOpenSslCMacAlgorithmExpr
+      then result = KeyOpAlg::TMac(KeyOpAlg::CMAC())
+      else result = KeyOpAlg::TMac(KeyOpAlg::OtherMacAlgorithmType())
   }
+
+  override Crypto::ConsumerInputDataFlowNode getKeySizeConsumer() {
+    // TODO: trace to any key size initializer?
+    none()
+  }
+
+  override int getKeySizeFixed() {
+    // TODO: are there known fixed key sizes to consider?
+    none()
+  }
+
+  override Crypto::ModeOfOperationAlgorithmInstance getModeOfOperationAlgorithm() { none() }
+
+  override Crypto::PaddingAlgorithmInstance getPaddingAlgorithm() { none() }
 }
 
 class KnownOpenSslHMacConstantAlgorithmInstance extends Crypto::HmacAlgorithmInstance,
@@ -60,9 +79,13 @@ class KnownOpenSslHMacConstantAlgorithmInstance extends Crypto::HmacAlgorithmIns
       // where the current AVC traces to a HashAlgorithmIO consuming operation step.
       // TODO: need to consider getting reset values, tracing down to the first set for now
       exists(OperationStep s, AvcContextCreationStep avc |
-        avc = this.getAvc() and
+        avc = super.getAvc() and
         avc.flowsToOperationStep(s) and
         s.getAlgorithmValueConsumerForInput(HashAlgorithmIO()) = result
       )
   }
+
+  override Crypto::ModeOfOperationAlgorithmInstance getModeOfOperationAlgorithm() { none() }
+
+  override Crypto::PaddingAlgorithmInstance getPaddingAlgorithm() { none() }
 }
diff --git a/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmInstances/PaddingAlgorithmInstance.qll b/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmInstances/PaddingAlgorithmInstance.qll
index d487e05d066..3a3b2d66c28 100644
--- a/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmInstances/PaddingAlgorithmInstance.qll
+++ b/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmInstances/PaddingAlgorithmInstance.qll
@@ -1,10 +1,10 @@
 import cpp
 private import experimental.quantum.Language
 private import OpenSSLAlgorithmInstanceBase
+private import experimental.quantum.OpenSSL.Operations.OpenSSLOperationBase
 private import experimental.quantum.OpenSSL.AlgorithmInstances.KnownAlgorithmConstants
 private import AlgToAVCFlow
-private import experimental.quantum.OpenSSL.AlgorithmValueConsumers.DirectAlgorithmValueConsumer
-private import experimental.quantum.OpenSSL.AlgorithmValueConsumers.OpenSSLAlgorithmValueConsumerBase
+private import experimental.quantum.OpenSSL.AlgorithmValueConsumers.OpenSSLAlgorithmValueConsumers
 private import codeql.quantum.experimental.Standardization::Types::KeyOpAlg as KeyOpAlg
 
 /**
@@ -18,13 +18,14 @@ private import codeql.quantum.experimental.Standardization::Types::KeyOpAlg as K
  *     # define RSA_PKCS1_WITH_TLS_PADDING 7
  *     # define RSA_PKCS1_NO_IMPLICIT_REJECT_PADDING 8
  */
-class OpenSslPaddingLiteral extends Literal {
+class OpenSslSpecialPaddingLiteral extends Literal {
   // TODO: we can be more specific about where the literal is in a larger expression
   // to avoid literals that are clealy not representing an algorithm, e.g., array indices.
-  OpenSslPaddingLiteral() { this.getValue().toInt() in [0, 1, 3, 4, 5, 6, 7, 8] }
+  OpenSslSpecialPaddingLiteral() { this.getValue().toInt() in [0, 1, 3, 4, 5, 6, 7, 8] }
 }
 
 /**
+ * Holds if `e` has the given `type`.
  * Given a `KnownOpenSslPaddingAlgorithmExpr`, converts this to a padding family type.
  * Does not bind if there is no mapping (no mapping to 'unknown' or 'other').
  */
@@ -45,9 +46,6 @@ predicate knownOpenSslConstantToPaddingFamilyType(
   )
 }
 
-//abstract class OpenSslPaddingAlgorithmInstance extends OpenSslAlgorithmInstance, Crypto::PaddingAlgorithmInstance{}
-// TODO: need to alter this to include known padding constants which don't have the
-// same mechanics as those with known nids
 class KnownOpenSslPaddingConstantAlgorithmInstance extends OpenSslAlgorithmInstance,
   Crypto::PaddingAlgorithmInstance instanceof Expr
 {
@@ -66,7 +64,8 @@ class KnownOpenSslPaddingConstantAlgorithmInstance extends OpenSslAlgorithmInsta
       // Sink is an argument to a CipherGetterCall
       sink = getterCall.getInputNode() and
       // Source is `this`
-      src.asExpr() = this and
+      // NOTE: src literals can be ints or strings, so need to consider asExpr and asIndirectExpr
+      this = [src.asExpr(), src.asIndirectExpr()] and
       // This traces to a getter
       KnownOpenSslAlgorithmToAlgorithmValueConsumerFlow::flow(src, sink) and
       isPaddingSpecificConsumer = false
@@ -79,12 +78,13 @@ class KnownOpenSslPaddingConstantAlgorithmInstance extends OpenSslAlgorithmInsta
     isPaddingSpecificConsumer = false
     or
     // Possibility 3: padding-specific literal
-    this instanceof OpenSslPaddingLiteral and
+    this instanceof OpenSslSpecialPaddingLiteral and
     exists(DataFlow::Node src, DataFlow::Node sink |
       // Sink is an argument to a CipherGetterCall
       sink = getterCall.getInputNode() and
       // Source is `this`
-      src.asExpr() = this and
+      // NOTE: src literals can be ints or strings, so need to consider asExpr and asIndirectExpr
+      this = [src.asExpr(), src.asIndirectExpr()] and
       // This traces to a padding-specific consumer
       RsaPaddingAlgorithmToPaddingAlgorithmValueConsumerFlow::flow(src, sink)
     ) and
@@ -124,44 +124,6 @@ class KnownOpenSslPaddingConstantAlgorithmInstance extends OpenSslAlgorithmInsta
   }
 }
 
-// // Values used for EVP_PKEY_CTX_set_rsa_padding, these are
-// // not the same as 'typical' constants found in the set of known algorithm constants
-// // they do not have an NID
-// // TODO: what about setting the padding directly?
-// class KnownRSAPaddingConstant extends OpenSslPaddingAlgorithmInstance, Crypto::PaddingAlgorithmInstance instanceof Literal
-// {
-//   KnownRSAPaddingConstant() {
-//     // from rsa.h in openssl:
-//     // # define RSA_PKCS1_PADDING          1
-//     // # define RSA_NO_PADDING             3
-//     // # define RSA_PKCS1_OAEP_PADDING     4
-//     // # define RSA_X931_PADDING           5
-//     // /* EVP_PKEY_ only */
-//     // # define RSA_PKCS1_PSS_PADDING      6
-//     // # define RSA_PKCS1_WITH_TLS_PADDING 7
-//     // /* internal RSA_ only */
-//     // # define RSA_PKCS1_NO_IMPLICIT_REJECT_PADDING 8
-//     this instanceof Literal and
-//     this.getValue().toInt() in [0, 1, 3, 4, 5, 6, 7, 8]
-//     // TODO: trace to padding-specific consumers
-//     RsaPaddingAlgorithmToPaddingAlgorithmValueConsumerFlow
-//   }
-//   override string getRawPaddingAlgorithmName() { result = this.(Literal).getValue().toString() }
-//   override Crypto::TPaddingType getPaddingType() {
-//     if this.(Literal).getValue().toInt() in [1, 6, 7, 8]
-//     then result = Crypto::PKCS1_v1_5()
-//     else
-//       if this.(Literal).getValue().toInt() = 3
-//       then result = Crypto::NoPadding()
-//       else
-//         if this.(Literal).getValue().toInt() = 4
-//         then result = Crypto::OAEP()
-//         else
-//           if this.(Literal).getValue().toInt() = 5
-//           then result = Crypto::ANSI_X9_23()
-//           else result = Crypto::OtherPadding()
-//   }
-// }
 class OaepPaddingAlgorithmInstance extends Crypto::OaepPaddingAlgorithmInstance,
   KnownOpenSslPaddingConstantAlgorithmInstance
 {
@@ -170,10 +132,18 @@ class OaepPaddingAlgorithmInstance extends Crypto::OaepPaddingAlgorithmInstance,
   }
 
   override Crypto::HashAlgorithmInstance getOaepEncodingHashAlgorithm() {
-    none() //TODO
+    exists(OperationStep s |
+      this.getAvc().(AvcContextCreationStep).flowsToOperationStep(s) and
+      s.getAlgorithmValueConsumerForInput(HashAlgorithmOaepIO()) =
+        result.(OpenSslAlgorithmInstance).getAvc()
+    )
   }
 
   override Crypto::HashAlgorithmInstance getMgf1HashAlgorithm() {
-    none() //TODO
+    exists(OperationStep s |
+      this.getAvc().(AvcContextCreationStep).flowsToOperationStep(s) and
+      s.getAlgorithmValueConsumerForInput(HashAlgorithmMgf1IO()) =
+        result.(OpenSslAlgorithmInstance).getAvc()
+    )
   }
 }
diff --git a/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmInstances/SignatureAlgorithmInstance.qll b/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmInstances/SignatureAlgorithmInstance.qll
index cc2e5771ffc..dda7aea22dc 100644
--- a/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmInstances/SignatureAlgorithmInstance.qll
+++ b/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmInstances/SignatureAlgorithmInstance.qll
@@ -47,7 +47,8 @@ class KnownOpenSslSignatureConstantAlgorithmInstance extends OpenSslAlgorithmIns
       // Sink is an argument to a signature getter call
       sink = getterCall.getInputNode() and
       // Source is `this`
-      src.asExpr() = this and
+      // NOTE: src literals can be ints or strings, so need to consider asExpr and asIndirectExpr
+      this = [src.asExpr(), src.asIndirectExpr()] and
       // This traces to a getter
       KnownOpenSslAlgorithmToAlgorithmValueConsumerFlow::flow(src, sink)
     )
diff --git a/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmValueConsumers/CipherAlgorithmValueConsumer.qll b/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmValueConsumers/CipherAlgorithmValueConsumer.qll
index b06e55c0817..a2de555d7f4 100644
--- a/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmValueConsumers/CipherAlgorithmValueConsumer.qll
+++ b/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmValueConsumers/CipherAlgorithmValueConsumer.qll
@@ -12,15 +12,17 @@ class EvpCipherAlgorithmValueConsumer extends CipherAlgorithmValueConsumer {
   DataFlow::Node resultNode;
 
   EvpCipherAlgorithmValueConsumer() {
-    resultNode.asExpr() = this and
+    resultNode.asIndirectExpr() = this and
     (
-      this.(Call).getTarget().getName() in [
-          "EVP_get_cipherbyname", "EVP_get_cipherbyobj", "EVP_get_cipherbynid"
-        ] and
+      this.(Call).getTarget().getName() in ["EVP_get_cipherbyname", "EVP_get_cipherbyobj"] and
+      valueArgNode.asIndirectExpr() = this.(Call).getArgument(0)
+      or
+      this.(Call).getTarget().getName() = "EVP_get_cipherbynid" and
+      // algorithm is an NID (int), use asExpr()
       valueArgNode.asExpr() = this.(Call).getArgument(0)
       or
       this.(Call).getTarget().getName() in ["EVP_CIPHER_fetch", "EVP_ASYM_CIPHER_fetch"] and
-      valueArgNode.asExpr() = this.(Call).getArgument(1)
+      valueArgNode.asIndirectExpr() = this.(Call).getArgument(1)
     )
   }
 
diff --git a/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmValueConsumers/DirectAlgorithmValueConsumer.qll b/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmValueConsumers/DirectAlgorithmValueConsumer.qll
index d200cf2a096..3269c41cad6 100644
--- a/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmValueConsumers/DirectAlgorithmValueConsumer.qll
+++ b/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmValueConsumers/DirectAlgorithmValueConsumer.qll
@@ -23,7 +23,7 @@ class DirectAlgorithmValueConsumer extends OpenSslAlgorithmValueConsumer instanc
    */
   override DataFlow::Node getResultNode() {
     this instanceof OpenSslDirectAlgorithmFetchCall and
-    result.asExpr() = this
+    result.asIndirectExpr() = this
     // NOTE: if instanceof OpenSslDirectAlgorithmOperationCall then there is no algorithm generated
     // the algorithm is directly used
   }
diff --git a/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmValueConsumers/EllipticCurveAlgorithmValueConsumer.qll b/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmValueConsumers/EllipticCurveAlgorithmValueConsumer.qll
index daf6baf2f03..94272f8abcc 100644
--- a/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmValueConsumers/EllipticCurveAlgorithmValueConsumer.qll
+++ b/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmValueConsumers/EllipticCurveAlgorithmValueConsumer.qll
@@ -12,14 +12,19 @@ class EvpEllipticCurveAlgorithmConsumer extends EllipticCurveValueConsumer {
   DataFlow::Node resultNode;
 
   EvpEllipticCurveAlgorithmConsumer() {
-    resultNode.asExpr() = this.(Call) and // in all cases the result is the return
+    resultNode.asIndirectExpr() = this.(Call) and // in all cases the result is the return
     (
-      this.(Call).getTarget().getName() in ["EVP_EC_gen", "EC_KEY_new_by_curve_name"] and
+      this.(Call).getTarget().getName() = "EVP_EC_gen" and
+      valueArgNode.asIndirectExpr() = this.(Call).getArgument(0)
+      or
+      this.(Call).getTarget().getName() = "EC_KEY_new_by_curve_name" and
+      // algorithm is an NID (int), use asExpr()
       valueArgNode.asExpr() = this.(Call).getArgument(0)
       or
       this.(Call).getTarget().getName() in [
           "EC_KEY_new_by_curve_name_ex", "EVP_PKEY_CTX_set_ec_paramgen_curve_nid"
         ] and
+      // algorithm is an NID (int), use asExpr
       valueArgNode.asExpr() = this.(Call).getArgument(2)
     )
   }
diff --git a/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmValueConsumers/HashAlgorithmValueConsumer.qll b/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmValueConsumers/HashAlgorithmValueConsumer.qll
index 114cf78a112..da8a76c27d9 100644
--- a/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmValueConsumers/HashAlgorithmValueConsumer.qll
+++ b/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmValueConsumers/HashAlgorithmValueConsumer.qll
@@ -9,11 +9,11 @@ abstract class HashAlgorithmValueConsumer extends OpenSslAlgorithmValueConsumer
 /**
  * An EVP_Q_Digest directly consumes algorithm constant values
  */
-class Evp_Q_Digest_Algorithm_Consumer extends HashAlgorithmValueConsumer {
-  Evp_Q_Digest_Algorithm_Consumer() { this.(Call).getTarget().getName() = "EVP_Q_digest" }
+class Evp_Q_Digest_Algorithm_Consumer extends HashAlgorithmValueConsumer instanceof Call {
+  Evp_Q_Digest_Algorithm_Consumer() { super.getTarget().getName() = "EVP_Q_digest" }
 
   override Crypto::ConsumerInputDataFlowNode getInputNode() {
-    result.asExpr() = this.(Call).getArgument(1)
+    result.asIndirectExpr() = super.getArgument(1)
   }
 
   override Crypto::AlgorithmInstance getAKnownAlgorithmSource() {
@@ -42,7 +42,7 @@ class EvpPkeySetCtxALgorithmConsumer extends HashAlgorithmValueConsumer {
         "EVP_PKEY_CTX_set_rsa_mgf1_md_name", "EVP_PKEY_CTX_set_rsa_oaep_md_name",
         "EVP_PKEY_CTX_set_dsa_paramgen_md_props"
       ] and
-    valueArgNode.asExpr() = this.(Call).getArgument(1)
+    valueArgNode.asIndirectExpr() = this.(Call).getArgument(1)
   }
 
   override DataFlow::Node getResultNode() { none() }
@@ -64,18 +64,18 @@ class EvpDigestAlgorithmValueConsumer extends HashAlgorithmValueConsumer {
   DataFlow::Node resultNode;
 
   EvpDigestAlgorithmValueConsumer() {
-    resultNode.asExpr() = this and
+    resultNode.asIndirectExpr() = this and
     (
       this.(Call).getTarget().getName() in [
           "EVP_get_digestbyname", "EVP_get_digestbynid", "EVP_get_digestbyobj"
         ] and
-      valueArgNode.asExpr() = this.(Call).getArgument(0)
+      valueArgNode.asIndirectExpr() = this.(Call).getArgument(0)
       or
       this.(Call).getTarget().getName() = "EVP_MD_fetch" and
-      valueArgNode.asExpr() = this.(Call).getArgument(1)
+      valueArgNode.asIndirectExpr() = this.(Call).getArgument(1)
       or
       this.(Call).getTarget().getName() = "EVP_DigestSignInit_ex" and
-      valueArgNode.asExpr() = this.(Call).getArgument(2)
+      valueArgNode.asIndirectExpr() = this.(Call).getArgument(2)
     )
   }
 
@@ -87,3 +87,21 @@ class EvpDigestAlgorithmValueConsumer extends HashAlgorithmValueConsumer {
     exists(OpenSslAlgorithmInstance i | i.getAvc() = this and result = i)
   }
 }
+
+class RsaSignOrVerifyHashAlgorithmValueConsumer extends HashAlgorithmValueConsumer {
+  DataFlow::Node valueArgNode;
+
+  RsaSignOrVerifyHashAlgorithmValueConsumer() {
+    this.(Call).getTarget().getName() in ["RSA_sign", "RSA_verify"] and
+    // arg 0 is an int, use asExpr
+    valueArgNode.asExpr() = this.(Call).getArgument(0)
+  }
+
+  override DataFlow::Node getResultNode() { none() }
+
+  override Crypto::ConsumerInputDataFlowNode getInputNode() { result = valueArgNode }
+
+  override Crypto::AlgorithmInstance getAKnownAlgorithmSource() {
+    exists(OpenSslAlgorithmInstance i | i.getAvc() = this and result = i)
+  }
+}
diff --git a/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmValueConsumers/KEMAlgorithmValueConsumer.qll b/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmValueConsumers/KEMAlgorithmValueConsumer.qll
index 830adece0f3..918dc57ff97 100644
--- a/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmValueConsumers/KEMAlgorithmValueConsumer.qll
+++ b/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmValueConsumers/KEMAlgorithmValueConsumer.qll
@@ -11,10 +11,10 @@ class EvpKemAlgorithmValueConsumer extends KemAlgorithmValueConsumer {
   DataFlow::Node resultNode;
 
   EvpKemAlgorithmValueConsumer() {
-    resultNode.asExpr() = this and
+    resultNode.asIndirectExpr() = this and
     (
       this.(Call).getTarget().getName() = "EVP_KEM_fetch" and
-      valueArgNode.asExpr() = this.(Call).getArgument(1)
+      valueArgNode.asIndirectExpr() = this.(Call).getArgument(1)
     )
   }
 
diff --git a/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmValueConsumers/KeyExchangeAlgorithmValueConsumer.qll b/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmValueConsumers/KeyExchangeAlgorithmValueConsumer.qll
index 88c36a37eb5..b4634b625f9 100644
--- a/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmValueConsumers/KeyExchangeAlgorithmValueConsumer.qll
+++ b/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmValueConsumers/KeyExchangeAlgorithmValueConsumer.qll
@@ -11,10 +11,10 @@ class EvpKeyExchangeAlgorithmValueConsumer extends KeyExchangeAlgorithmValueCons
   DataFlow::Node resultNode;
 
   EvpKeyExchangeAlgorithmValueConsumer() {
-    resultNode.asExpr() = this and
+    resultNode.asIndirectExpr() = this and
     (
       this.(Call).getTarget().getName() = "EVP_KEYEXCH_fetch" and
-      valueArgNode.asExpr() = this.(Call).getArgument(1)
+      valueArgNode.asIndirectExpr() = this.(Call).getArgument(1)
     )
   }
 
diff --git a/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmValueConsumers/PKeyAlgorithmValueConsumer.qll b/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmValueConsumers/PKeyAlgorithmValueConsumer.qll
index f7c8fef3794..ba5cb8146ad 100644
--- a/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmValueConsumers/PKeyAlgorithmValueConsumer.qll
+++ b/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmValueConsumers/PKeyAlgorithmValueConsumer.qll
@@ -11,7 +11,7 @@ class EvpPKeyAlgorithmConsumer extends PKeyValueConsumer {
   DataFlow::Node resultNode;
 
   EvpPKeyAlgorithmConsumer() {
-    resultNode.asExpr() = this.(Call) and // in all cases the result is the return
+    resultNode.asIndirectExpr() = this.(Call) and // in all cases the result is the return
     (
       // NOTE: some of these consumers are themselves key gen operations,
       // in these cases, the operation will be created separately for the same function.
@@ -19,6 +19,7 @@ class EvpPKeyAlgorithmConsumer extends PKeyValueConsumer {
           "EVP_PKEY_CTX_new_id", "EVP_PKEY_new_raw_private_key", "EVP_PKEY_new_raw_public_key",
           "EVP_PKEY_new_mac_key"
         ] and
+      // Algorithm is an int, use asExpr
       valueArgNode.asExpr() = this.(Call).getArgument(0)
       or
       this.(Call).getTarget().getName() in [
@@ -26,7 +27,8 @@ class EvpPKeyAlgorithmConsumer extends PKeyValueConsumer {
           "EVP_PKEY_new_raw_public_key_ex", "EVP_PKEY_CTX_ctrl", "EVP_PKEY_CTX_ctrl_uint64",
           "EVP_PKEY_CTX_ctrl_str", "EVP_PKEY_CTX_set_group_name"
         ] and
-      valueArgNode.asExpr() = this.(Call).getArgument(1)
+      // AAlgorithm is a char*, use asIndirectExpr
+      valueArgNode.asIndirectExpr() = this.(Call).getArgument(1)
       or
       // argInd 2 is 'type' which can be RSA, or EC
       // if RSA argInd 3 is the key size, else if EC argInd 3 is the curve name
@@ -38,10 +40,10 @@ class EvpPKeyAlgorithmConsumer extends PKeyValueConsumer {
         // Elliptic curve case
         // If the argInd 3 is a derived type (pointer or array) then assume it is a curve name
         if this.(Call).getArgument(3).getType().getUnderlyingType() instanceof DerivedType
-        then valueArgNode.asExpr() = this.(Call).getArgument(3)
+        then valueArgNode.asIndirectExpr() = this.(Call).getArgument(3)
         else
           // All other cases
-          valueArgNode.asExpr() = this.(Call).getArgument(2)
+          valueArgNode.asIndirectExpr() = this.(Call).getArgument(2)
       )
     )
   }
diff --git a/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmValueConsumers/PaddingAlgorithmValueConsumer.qll b/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmValueConsumers/PaddingAlgorithmValueConsumer.qll
index f080fc0f12a..e279f7f1e09 100644
--- a/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmValueConsumers/PaddingAlgorithmValueConsumer.qll
+++ b/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmValueConsumers/PaddingAlgorithmValueConsumer.qll
@@ -14,8 +14,9 @@ class Evp_PKey_Ctx_set_rsa_padding_AlgorithmValueConsumer extends PaddingAlgorit
   DataFlow::Node resultNode;
 
   Evp_PKey_Ctx_set_rsa_padding_AlgorithmValueConsumer() {
-    resultNode.asExpr() = this and
+    resultNode.asDefiningArgument() = this.(Call).getArgument(0) and
     this.(Call).getTarget().getName() = "EVP_PKEY_CTX_set_rsa_padding" and
+    // algorithm is an int, use asExpr
     valueArgNode.asExpr() = this.(Call).getArgument(1)
   }
 
diff --git a/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmValueConsumers/SignatureAlgorithmValueConsumer.qll b/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmValueConsumers/SignatureAlgorithmValueConsumer.qll
index c6f3fb8959c..bcc596bb1ee 100644
--- a/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmValueConsumers/SignatureAlgorithmValueConsumer.qll
+++ b/cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmValueConsumers/SignatureAlgorithmValueConsumer.qll
@@ -12,13 +12,13 @@ class EvpSignatureAlgorithmValueConsumer extends SignatureAlgorithmValueConsumer
   DataFlow::Node resultNode;
 
   EvpSignatureAlgorithmValueConsumer() {
-    resultNode.asExpr() = this and
+    resultNode.asIndirectExpr() = this and
     (
       // EVP_SIGNATURE
       this.(Call).getTarget().getName() = "EVP_SIGNATURE_fetch" and
-      valueArgNode.asExpr() = this.(Call).getArgument(1)
+      valueArgNode.asIndirectExpr() = this.(Call).getArgument(1)
       // EVP_PKEY_get1_DSA, EVP_PKEY_get1_RSA
-      // DSA_SIG_new, DSA_SIG_get0, RSA_sign ?
+      // DSA_SIG_new, DSA_SIG_get0 ?
     )
   }
 
diff --git a/cpp/ql/lib/experimental/quantum/OpenSSL/ArtifactPassthrough.qll b/cpp/ql/lib/experimental/quantum/OpenSSL/ArtifactPassthrough.qll
new file mode 100644
index 00000000000..19027137215
--- /dev/null
+++ b/cpp/ql/lib/experimental/quantum/OpenSSL/ArtifactPassthrough.qll
@@ -0,0 +1,107 @@
+private import experimental.quantum.Language
+
+/**
+ * A call to `BN_bn2bin`.
+ * Commonly used to extract partial bytes from a signature,
+ * e.g., a signature from DSA_do_sign, passed to DSA_do_verify
+ * - int BN_bn2bin(const BIGNUM *a, unsigned char *to);
+ */
+class BnBn2BinCalStep extends AdditionalFlowInputStep {
+  Call call;
+
+  BnBn2BinCalStep() {
+    call.getTarget().getName() = "BN_bn2bin" and
+    call.getArgument(0) = this.asIndirectExpr()
+  }
+
+  override DataFlow::Node getOutput() { result.asDefiningArgument() = call.getArgument(1) }
+}
+
+/**
+ * A call to `BN_bin2bn`.
+ * Commonly used to convert to a signature for DSA_do_verify
+ * - BIGNUM *BN_bin2bn(const unsigned char *s, int len, BIGNUM *ret);
+ */
+class BnBin2BnCallStep extends AdditionalFlowInputStep {
+  Call call;
+
+  BnBin2BnCallStep() {
+    call.getTarget().getName() = "BN_bin2bn" and
+    call.getArgument(0) = this.asIndirectExpr()
+  }
+
+  override DataFlow::Node getOutput() { result.asDefiningArgument() = call.getArgument(2) }
+}
+
+/**
+ * A call to `RSA_set0_key` or `DSA_SIG_set0`.
+ * Often used in combination with BN_bin2bn, to construct a signature.
+ */
+class RsaSet0KeyCallStep extends AdditionalFlowInputStep {
+  Call call;
+
+  RsaSet0KeyCallStep() {
+    (call.getTarget().getName() = "RSA_set0_key" or call.getTarget().getName() = "DSA_SIG_set0") and
+    this.asIndirectExpr() in [call.getArgument(1), call.getArgument(2), call.getArgument(3)]
+  }
+
+  override DataFlow::Node getOutput() { result.asDefiningArgument() = call.getArgument(0) }
+}
+
+/**
+ * A call to `d2i_DSA_SIG`. This is a pass through of a signature of one form to another.
+ * - DSA_SIG *d2i_DSA_SIG(DSA_SIG **sig, const unsigned char **pp, long length);
+ */
+class D2iDsaSigCallStep extends AdditionalFlowInputStep {
+  Call call;
+
+  D2iDsaSigCallStep() {
+    call.getTarget().getName() = "d2i_DSA_SIG" and
+    this.asIndirectExpr() = call.getArgument(1)
+  }
+
+  override DataFlow::Node getOutput() {
+    // If arg 0 specified, the same pointer is returned, if not specified
+    // a new allocation is returned.
+    result.asDefiningArgument() = call.getArgument(0) or
+    result.asIndirectExpr() = call
+  }
+}
+
+/**
+ * A call to `DSA_SIG_get0`.
+ * Converts a DSA_Sig into its components, which are commonly used with BN_bn2Bin to
+ * construct a char* signature.
+ * - void DSA_SIG_get0(const DSA_SIG *sig, const BIGNUM **pr, const BIGNUM **ps);
+ */
+class DsaSigGet0CallStep extends AdditionalFlowInputStep {
+  Call call;
+
+  DsaSigGet0CallStep() {
+    call.getTarget().getName() = "DSA_SIG_get0" and
+    this.asIndirectExpr() = call.getArgument(0)
+  }
+
+  override DataFlow::Node getOutput() {
+    result.asDefiningArgument() = call.getArgument(1)
+    or
+    result.asDefiningArgument() = call.getArgument(2)
+  }
+}
+
+/**
+ * A call to `EVP_PKEY_get1_RSA` or `EVP_PKEY_get1_DSA`
+ *  - RSA *EVP_PKEY_get1_RSA(EVP_PKEY *pkey);
+ *  - DSA *EVP_PKEY_get1_DSA(EVP_PKEY *pkey);
+ * A key input is converted into a key output, a key is not generated.
+ */
+class EvpPkeyGet1RsaOrDsa extends AdditionalFlowInputStep {
+  Call c;
+
+  EvpPkeyGet1RsaOrDsa() {
+    c.getTarget().getName() = ["EVP_PKEY_get1_RSA", "EVP_PKEY_get1_DSA"] and
+    this.asIndirectExpr() = c.getArgument(0)
+  }
+
+  override DataFlow::Node getOutput() { result.asIndirectExpr() = c }
+}
diff --git a/cpp/ql/lib/experimental/quantum/OpenSSL/AvcFlow.qll b/cpp/ql/lib/experimental/quantum/OpenSSL/AvcFlow.qll
index 10aa145804b..1ad988d2ea6 100644
--- a/cpp/ql/lib/experimental/quantum/OpenSSL/AvcFlow.qll
+++ b/cpp/ql/lib/experimental/quantum/OpenSSL/AvcFlow.qll
@@ -1,4 +1,4 @@
-import semmle.code.cpp.dataflow.new.DataFlow
+import semmle.code.cpp.dataflow.new.TaintTracking
 private import experimental.quantum.OpenSSL.AlgorithmValueConsumers.OpenSSLAlgorithmValueConsumers
 
 /**
@@ -13,7 +13,9 @@ module AvcToCallArgConfig implements DataFlow::ConfigSig {
    * Trace to any call accepting the algorithm.
    * NOTE: users must restrict this set to the operations they are interested in.
    */
-  predicate isSink(DataFlow::Node sink) { exists(Call c | c.getAnArgument() = sink.asExpr()) }
+  predicate isSink(DataFlow::Node sink) {
+    exists(Call c | c.getAnArgument() = [sink.asIndirectExpr(), sink.asExpr()])
+  }
 }
 
-module AvcToCallArgFlow = DataFlow::Global<AvcToCallArgConfig>;
+module AvcToCallArgFlow = TaintTracking::Global<AvcToCallArgConfig>;
diff --git a/cpp/ql/lib/experimental/quantum/OpenSSL/OpenSSL.qll b/cpp/ql/lib/experimental/quantum/OpenSSL/OpenSSL.qll
index 706cac65f8c..2b326690225 100644
--- a/cpp/ql/lib/experimental/quantum/OpenSSL/OpenSSL.qll
+++ b/cpp/ql/lib/experimental/quantum/OpenSSL/OpenSSL.qll
@@ -4,4 +4,5 @@ module OpenSslModel {
   import Operations.OpenSSLOperations
   import Random
   import GenericSourceCandidateLiteral
+  import ArtifactPassthrough
 }
diff --git a/cpp/ql/lib/experimental/quantum/OpenSSL/Operations/CipherOperation.qll b/cpp/ql/lib/experimental/quantum/OpenSSL/Operations/CipherOperation.qll
index 44e30ddf9fc..13d6a4ae457 100644
--- a/cpp/ql/lib/experimental/quantum/OpenSSL/Operations/CipherOperation.qll
+++ b/cpp/ql/lib/experimental/quantum/OpenSSL/Operations/CipherOperation.qll
@@ -3,24 +3,48 @@ private import OpenSSLOperationBase
 private import experimental.quantum.OpenSSL.AlgorithmValueConsumers.OpenSSLAlgorithmValueConsumers
 import EVPPKeyCtxInitializer
 
+/**
+ * A base class for all final cipher operation steps.
+ */
+abstract class FinalCipherOperationStep extends OperationStep {
+  override OperationStepType getStepType() { result = FinalStep() }
+}
+
+/**
+ * A base configuration for all EVP cipher operations.
+ */
+abstract class EvpCipherOperationFinalStep extends FinalCipherOperationStep {
+  override DataFlow::Node getInput(IOType type) {
+    result.asIndirectExpr() = this.getArgument(0) and type = ContextIO()
+  }
+
+  override DataFlow::Node getOutput(IOType type) {
+    result.asDefiningArgument() = this.getArgument(0) and type = ContextIO()
+  }
+}
+
 /**
  * A base class for all EVP cipher operations.
  */
 abstract class EvpCipherInitializer extends OperationStep {
   override DataFlow::Node getInput(IOType type) {
-    result.asExpr() = this.getArgument(0) and type = ContextIO()
+    result.asIndirectExpr() = this.getArgument(0) and type = ContextIO()
     or
-    result.asExpr() = this.getArgument(1) and
+    result.asIndirectExpr() = this.getArgument(1) and
     type = PrimaryAlgorithmIO() and
     // Constants that are not equal to zero or
     // non-constants (e.g., variable accesses, which require data-flow to determine the value)
     // A zero (null) value typically indicates use of this operation step to initialize
     // other out parameters in a multi-step initialization.
-    (exists(result.asExpr().getValue()) implies result.asExpr().getValue().toInt() != 0)
+    (
+      exists(result.asIndirectExpr().getValue())
+      implies
+      result.asIndirectExpr().getValue().toInt() != 0
+    )
   }
 
   override DataFlow::Node getOutput(IOType type) {
-    result.asExpr() = this.getArgument(0) and type = ContextIO()
+    result.asDefiningArgument() = this.getArgument(0) and type = ContextIO()
   }
 
   override OperationStepType getStepType() { result = InitializerStep() }
@@ -38,11 +62,15 @@ abstract class EvpEXInitializer extends EvpCipherInitializer {
       // non-constants (e.g., variable accesses, which require data-flow to determine the value)
       // A zero (null) value typically indicates use of this operation step to initialize
       // other out parameters in a multi-step initialization.
-      result.asExpr() = this.getArgument(3) and type = KeyIO()
+      result.asIndirectExpr() = this.getArgument(3) and type = KeyIO()
       or
-      result.asExpr() = this.getArgument(4) and type = IVorNonceIO()
+      result.asIndirectExpr() = this.getArgument(4) and type = IVorNonceIO()
     ) and
-    (exists(result.asExpr().getValue()) implies result.asExpr().getValue().toInt() != 0)
+    (
+      exists(result.asIndirectExpr().getValue())
+      implies
+      result.asIndirectExpr().getValue().toInt() != 0
+    )
   }
 }
 
@@ -53,9 +81,9 @@ abstract class EvpEX2Initializer extends EvpCipherInitializer {
   override DataFlow::Node getInput(IOType type) {
     result = super.getInput(type)
     or
-    result.asExpr() = this.getArgument(2) and type = KeyIO()
+    result.asIndirectExpr() = this.getArgument(2) and type = KeyIO()
     or
-    result.asExpr() = this.getArgument(3) and type = IVorNonceIO()
+    result.asIndirectExpr() = this.getArgument(3) and type = IVorNonceIO()
   }
 }
 
@@ -90,6 +118,7 @@ class Evp_Cipher_EX2_or_Simple_Init_Call extends EvpEX2Initializer {
     result = super.getInput(type)
     or
     this.getTarget().getName().toLowerCase().matches("%cipherinit%") and
+    // the key op subtype is an int, use asExpr
     result.asExpr() = this.getArgument(4) and
     type = KeyOperationSubtypeIO()
   }
@@ -107,13 +136,13 @@ class EvpPkeyEncryptDecryptInit extends OperationStep {
   }
 
   override DataFlow::Node getInput(IOType type) {
-    result.asExpr() = this.getArgument(0) and type = ContextIO()
+    result.asIndirectExpr() = this.getArgument(0) and type = ContextIO()
     or
-    result.asExpr() = this.getArgument(1) and type = OsslParamIO()
+    result.asIndirectExpr() = this.getArgument(1) and type = OsslParamIO()
   }
 
   override DataFlow::Node getOutput(IOType type) {
-    result.asExpr() = this.getArgument(0) and type = ContextIO()
+    result.asDefiningArgument() = this.getArgument(0) and type = ContextIO()
   }
 
   override OperationStepType getStepType() { result = InitializerStep() }
@@ -125,6 +154,7 @@ class EvpCipherInitSKeyCall extends EvpEX2Initializer {
   override DataFlow::Node getInput(IOType type) {
     result = super.getInput(type)
     or
+    // the key op subtype is an int, use asExpr
     result.asExpr() = this.getArgument(5) and
     type = KeyOperationSubtypeIO()
   }
@@ -141,35 +171,20 @@ class EvpCipherUpdateCall extends OperationStep {
   }
 
   override DataFlow::Node getInput(IOType type) {
-    result.asExpr() = this.getArgument(0) and type = ContextIO()
+    result.asIndirectExpr() = this.getArgument(0) and type = ContextIO()
     or
-    result.asExpr() = this.getArgument(3) and type = PlaintextIO()
+    result.asIndirectExpr() = this.getArgument(3) and type = PlaintextIO()
   }
 
   override DataFlow::Node getOutput(IOType type) {
-    result.asExpr() = this.getArgument(1) and type = CiphertextIO()
+    result.asDefiningArgument() = this.getArgument(1) and type = CiphertextIO()
     or
-    result.asExpr() = this.getArgument(0) and type = ContextIO()
+    result.asDefiningArgument() = this.getArgument(0) and type = ContextIO()
   }
 
   override OperationStepType getStepType() { result = UpdateStep() }
 }
 
-/**
- * A base configuration for all EVP cipher operations.
- */
-abstract class EvpCipherOperationFinalStep extends OperationStep {
-  override DataFlow::Node getInput(IOType type) {
-    result.asExpr() = this.getArgument(0) and type = ContextIO()
-  }
-
-  override DataFlow::Node getOutput(IOType type) {
-    result.asExpr() = this.getArgument(0) and type = ContextIO()
-  }
-
-  override OperationStepType getStepType() { result = FinalStep() }
-}
-
 /**
  * A Call to EVP_Cipher.
  */
@@ -179,13 +194,13 @@ class EvpCipherCall extends EvpCipherOperationFinalStep {
   override DataFlow::Node getInput(IOType type) {
     super.getInput(type) = result
     or
-    result.asExpr() = this.getArgument(2) and type = PlaintextIO()
+    result.asIndirectExpr() = this.getArgument(2) and type = PlaintextIO()
   }
 
   override DataFlow::Node getOutput(IOType type) {
     super.getOutput(type) = result
     or
-    result.asExpr() = this.getArgument(1) and type = CiphertextIO()
+    result.asDefiningArgument() = this.getArgument(1) and type = CiphertextIO()
   }
 }
 
@@ -216,28 +231,50 @@ class EvpCipherFinalCall extends EvpCipherOperationFinalStep {
  */
 class EvpPKeyCipherOperation extends EvpCipherOperationFinalStep {
   EvpPKeyCipherOperation() {
-    this.getTarget().getName() in ["EVP_PKEY_encrypt", "EVP_PKEY_decrypt"]
+    this.getTarget().getName() in ["EVP_PKEY_encrypt", "EVP_PKEY_decrypt"] and
+    // TODO: for now ignore this operation entirely if it is setting the cipher text to null
+    // this needs to be re-evalauted if this scenario sets other values worth tracking
+    (
+      exists(this.(Call).getArgument(1).getValue())
+      implies
+      this.(Call).getArgument(1).getValue().toInt() != 0
+    )
   }
 
   override DataFlow::Node getInput(IOType type) {
     super.getInput(type) = result
     or
-    result.asExpr() = this.getArgument(3) and type = PlaintextIO()
+    result.asIndirectExpr() = this.getArgument(3) and type = PlaintextIO()
   }
 
   override DataFlow::Node getOutput(IOType type) {
     super.getOutput(type) = result
     or
-    result.asExpr() = this.getArgument(1) and type = CiphertextIO()
+    result.asDefiningArgument() = this.getArgument(1) and
+    type = CiphertextIO() and
+    this.getStepType() = FinalStep()
     // TODO: could indicate text lengths here, as well
   }
+
+  override OperationStepType getStepType() {
+    // When the output buffer is null, the step is not a final step
+    // it is used to get the buffer size, if 0 consider it an initialization step
+    // NOTE/TODO: not tracing 0 to the arg, just looking for 0 directly in param
+    // the assumption is this is the common case, but we may want to make this more
+    // robust and support a dataflow.
+    result = FinalStep() and
+    (exists(super.getArgument(1).getValue()) implies super.getArgument(1).getValue().toInt() != 0)
+    or
+    result = InitializerStep() and
+    super.getArgument(1).getValue().toInt() = 0
+  }
 }
 
 /**
  * An EVP cipher operation instance.
  * Any operation step that is a final operation step for EVP cipher operation steps.
  */
-class EvpCipherOperationInstance extends Crypto::KeyOperationInstance instanceof EvpCipherOperationFinalStep
+class OpenSslCipherOperationInstance extends Crypto::KeyOperationInstance instanceof FinalCipherOperationStep
 {
   override Crypto::AlgorithmValueConsumer getAnAlgorithmValueConsumer() {
     super.getPrimaryAlgorithmValueConsumer() = result
diff --git a/cpp/ql/lib/experimental/quantum/OpenSSL/Operations/EVPPKeyCtxInitializer.qll b/cpp/ql/lib/experimental/quantum/OpenSSL/Operations/EVPPKeyCtxInitializer.qll
index 2208407e53c..32823cada5a 100644
--- a/cpp/ql/lib/experimental/quantum/OpenSSL/Operations/EVPPKeyCtxInitializer.qll
+++ b/cpp/ql/lib/experimental/quantum/OpenSSL/Operations/EVPPKeyCtxInitializer.qll
@@ -1,5 +1,10 @@
 /**
  * Initializers for EVP PKey
+ * These are used to create a Pkey context or set properties on a Pkey context
+ * e.g., key size, hash algorithms, curves, padding schemes, etc.
+ * Meant to capture more general purpose initializers that aren't necessarily
+ * tied to a specific operation. If tied to an operation (i.e., in the docs)
+ * we recommend defining defining all together in the same operation definition qll.
  * including:
  *  https://docs.openssl.org/3.0/man3/EVP_PKEY_CTX_ctrl/
  *  https://docs.openssl.org/3.0/man3/EVP_EncryptInit/#synopsis
@@ -26,14 +31,16 @@ class EvpNewKeyCtx extends OperationStep instanceof Call {
   }
 
   override DataFlow::Node getInput(IOType type) {
-    result.asExpr() = keyArg and type = KeyIO()
+    result.asIndirectExpr() = keyArg and type = KeyIO()
     or
     this.getTarget().getName() = "EVP_PKEY_CTX_new_from_pkey" and
-    result.asExpr() = this.getArgument(0) and
+    result.asIndirectExpr() = this.getArgument(0) and
     type = OsslLibContextIO()
   }
 
-  override DataFlow::Node getOutput(IOType type) { result.asExpr() = this and type = ContextIO() }
+  override DataFlow::Node getOutput(IOType type) {
+    result.asIndirectExpr() = this and type = ContextIO()
+  }
 
   override OperationStepType getStepType() { result = ContextCreationStep() }
 }
@@ -47,13 +54,13 @@ class EvpCtxSetEcParamgenCurveNidInitializer extends OperationStep {
   }
 
   override DataFlow::Node getInput(IOType type) {
-    result.asExpr() = this.getArgument(0) and type = ContextIO()
+    result.asIndirectExpr() = this.getArgument(0) and type = ContextIO()
     or
-    result.asExpr() = this.getArgument(1) and type = PrimaryAlgorithmIO()
+    result.asIndirectExpr() = this.getArgument(1) and type = PrimaryAlgorithmIO()
   }
 
   override DataFlow::Node getOutput(IOType type) {
-    result.asExpr() = this.getArgument(0) and type = ContextIO()
+    result.asDefiningArgument() = this.getArgument(0) and type = ContextIO()
   }
 
   override OperationStepType getStepType() { result = InitializerStep() }
@@ -71,23 +78,46 @@ class EvpCtxSetEcParamgenCurveNidInitializer extends OperationStep {
  * - `EVP_PKEY_CTX_set_ecdh_kdf_md`
  */
 class EvpCtxSetHashInitializer extends OperationStep {
+  boolean isOaep;
+  boolean isMgf1;
+
   EvpCtxSetHashInitializer() {
     this.getTarget().getName() in [
-        "EVP_PKEY_CTX_set_signature_md", "EVP_PKEY_CTX_set_rsa_mgf1_md_name",
-        "EVP_PKEY_CTX_set_rsa_mgf1_md", "EVP_PKEY_CTX_set_rsa_oaep_md_name",
-        "EVP_PKEY_CTX_set_rsa_oaep_md", "EVP_PKEY_CTX_set_dsa_paramgen_md",
+        "EVP_PKEY_CTX_set_signature_md", "EVP_PKEY_CTX_set_dsa_paramgen_md",
         "EVP_PKEY_CTX_set_dh_kdf_md", "EVP_PKEY_CTX_set_ecdh_kdf_md"
-      ]
+      ] and
+    isOaep = false and
+    isMgf1 = false
+    or
+    this.getTarget().getName() in [
+        "EVP_PKEY_CTX_set_rsa_mgf1_md_name", "EVP_PKEY_CTX_set_rsa_mgf1_md"
+      ] and
+    isOaep = false and
+    isMgf1 = true
+    or
+    this.getTarget().getName() in [
+        "EVP_PKEY_CTX_set_rsa_oaep_md_name",
+        "EVP_PKEY_CTX_set_rsa_oaep_md"
+      ] and
+    isOaep = true and
+    isMgf1 = false
   }
 
   override DataFlow::Node getInput(IOType type) {
-    result.asExpr() = this.getArgument(0) and type = ContextIO()
+    result.asIndirectExpr() = this.getArgument(0) and type = ContextIO()
     or
-    result.asExpr() = this.getArgument(1) and type = HashAlgorithmIO()
+    result.asIndirectExpr() = this.getArgument(1) and
+    type = HashAlgorithmIO() and
+    isOaep = false and
+    isMgf1 = false
+    or
+    result.asIndirectExpr() = this.getArgument(1) and type = HashAlgorithmOaepIO() and isOaep = true
+    or
+    result.asIndirectExpr() = this.getArgument(1) and type = HashAlgorithmMgf1IO() and isMgf1 = true
   }
 
   override DataFlow::Node getOutput(IOType type) {
-    result.asExpr() = this.getArgument(0) and type = ContextIO()
+    result.asDefiningArgument() = this.getArgument(0) and type = ContextIO()
   }
 
   override OperationStepType getStepType() { result = InitializerStep() }
@@ -106,13 +136,13 @@ class EvpCtxSetKeySizeInitializer extends OperationStep {
   }
 
   override DataFlow::Node getInput(IOType type) {
-    result.asExpr() = this.getArgument(0) and type = ContextIO()
+    result.asIndirectExpr() = this.getArgument(0) and type = ContextIO()
     or
     result.asExpr() = this.getArgument(1) and type = KeySizeIO()
   }
 
   override DataFlow::Node getOutput(IOType type) {
-    result.asExpr() = this.getArgument(0) and type = ContextIO()
+    result.asDefiningArgument() = this.getArgument(0) and type = ContextIO()
   }
 
   override OperationStepType getStepType() { result = InitializerStep() }
@@ -122,16 +152,16 @@ class EvpCtxSetMacKeyInitializer extends OperationStep {
   EvpCtxSetMacKeyInitializer() { this.getTarget().getName() = "EVP_PKEY_CTX_set_mac_key" }
 
   override DataFlow::Node getInput(IOType type) {
-    result.asExpr() = this.getArgument(0) and type = ContextIO()
+    result.asIndirectExpr() = this.getArgument(0) and type = ContextIO()
     or
     result.asExpr() = this.getArgument(2) and type = KeySizeIO()
     or
     // the raw key that is configured into the output key
-    result.asExpr() = this.getArgument(1) and type = KeyIO()
+    result.asIndirectExpr() = this.getArgument(1) and type = KeyIO()
   }
 
   override DataFlow::Node getOutput(IOType type) {
-    result.asExpr() = this.getArgument(0) and type = ContextIO()
+    result.asDefiningArgument() = this.getArgument(0) and type = ContextIO()
   }
 
   override OperationStepType getStepType() { result = InitializerStep() }
@@ -143,13 +173,14 @@ class EvpCtxSetPaddingInitializer extends OperationStep {
   }
 
   override DataFlow::Node getInput(IOType type) {
-    result.asExpr() = this.getArgument(0) and type = ContextIO()
+    result.asIndirectExpr() = this.getArgument(0) and type = ContextIO()
     or
+    // The algorithm is an int: use asExpr
     result.asExpr() = this.getArgument(1) and type = PaddingAlgorithmIO()
   }
 
   override DataFlow::Node getOutput(IOType type) {
-    result.asExpr() = this.getArgument(0) and type = ContextIO()
+    result.asDefiningArgument() = this.getArgument(0) and type = ContextIO()
   }
 
   override OperationStepType getStepType() { result = InitializerStep() }
@@ -161,13 +192,13 @@ class EvpCtxSetSaltLengthInitializer extends OperationStep {
   }
 
   override DataFlow::Node getInput(IOType type) {
-    result.asExpr() = this.getArgument(0) and type = ContextIO()
+    result.asIndirectExpr() = this.getArgument(0) and type = ContextIO()
     or
     result.asExpr() = this.getArgument(1) and type = SaltLengthIO()
   }
 
   override DataFlow::Node getOutput(IOType type) {
-    result.asExpr() = this.getArgument(0) and type = ContextIO()
+    result.asDefiningArgument() = this.getArgument(0) and type = ContextIO()
   }
 
   override OperationStepType getStepType() { result = InitializerStep() }
diff --git a/cpp/ql/lib/experimental/quantum/OpenSSL/Operations/HashOperation.qll b/cpp/ql/lib/experimental/quantum/OpenSSL/Operations/HashOperation.qll
index 1878bfbe09f..5b15dc6d76a 100644
--- a/cpp/ql/lib/experimental/quantum/OpenSSL/Operations/HashOperation.qll
+++ b/cpp/ql/lib/experimental/quantum/OpenSSL/Operations/HashOperation.qll
@@ -6,6 +6,13 @@ private import experimental.quantum.Language
 private import OpenSSLOperationBase
 private import experimental.quantum.OpenSSL.AlgorithmValueConsumers.OpenSSLAlgorithmValueConsumers
 
+/**
+ * A base class for final digest operations.
+ */
+abstract class FinalDigestOperation extends OperationStep {
+  override OperationStepType getStepType() { result = FinalStep() }
+}
+
 /**
  * A call to and EVP digest initializer, such as:
  * - `EVP_DigestInit`
@@ -18,13 +25,13 @@ class EvpDigestInitVariantCalls extends OperationStep instanceof Call {
   }
 
   override DataFlow::Node getInput(IOType type) {
-    result.asExpr() = this.getArgument(0) and type = ContextIO()
+    result.asIndirectExpr() = this.getArgument(0) and type = ContextIO()
     or
-    result.asExpr() = this.getArgument(1) and type = PrimaryAlgorithmIO()
+    result.asIndirectExpr() = this.getArgument(1) and type = PrimaryAlgorithmIO()
   }
 
   override DataFlow::Node getOutput(IOType type) {
-    result.asExpr() = this.getArgument(0) and
+    result.asDefiningArgument() = this.getArgument(0) and
     type = ContextIO()
   }
 
@@ -38,56 +45,49 @@ class EvpDigestUpdateCall extends OperationStep instanceof Call {
   EvpDigestUpdateCall() { this.getTarget().getName() = "EVP_DigestUpdate" }
 
   override DataFlow::Node getInput(IOType type) {
-    result.asExpr() = this.getArgument(0) and type = ContextIO()
+    result.asIndirectExpr() = this.getArgument(0) and type = ContextIO()
     or
-    result.asExpr() = this.getArgument(1) and type = PlaintextIO()
+    result.asIndirectExpr() = this.getArgument(1) and type = PlaintextIO()
   }
 
   override DataFlow::Node getOutput(IOType type) {
-    result.asExpr() = this.getArgument(0) and
+    result.asDefiningArgument() = this.getArgument(0) and
     type = ContextIO()
   }
 
   override OperationStepType getStepType() { result = UpdateStep() }
 }
 
-/**
- * A base class for final digest operations.
- */
-abstract class EvpFinalDigestOperationStep extends OperationStep {
-  override OperationStepType getStepType() { result = FinalStep() }
-}
-
 /**
  * A call to `EVP_Q_digest`
  * https://docs.openssl.org/3.0/man3/EVP_DigestInit/#synopsis
  */
-class EvpQDigestOperation extends EvpFinalDigestOperationStep instanceof Call {
+class EvpQDigestOperation extends FinalDigestOperation instanceof Call {
   EvpQDigestOperation() { this.getTarget().getName() = "EVP_Q_digest" }
 
   override DataFlow::Node getInput(IOType type) {
-    result.asExpr() = this.getArgument(1) and type = PrimaryAlgorithmIO()
+    result.asIndirectExpr() = this.getArgument(1) and type = PrimaryAlgorithmIO()
     or
-    result.asExpr() = this.getArgument(0) and type = ContextIO()
+    result.asIndirectExpr() = this.getArgument(0) and type = ContextIO()
     or
-    result.asExpr() = this.getArgument(3) and type = PlaintextIO()
+    result.asIndirectExpr() = this.getArgument(3) and type = PlaintextIO()
   }
 
   override DataFlow::Node getOutput(IOType type) {
-    result.asExpr() = this.getArgument(0) and
+    result.asDefiningArgument() = this.getArgument(0) and
     type = ContextIO()
     or
     result.asDefiningArgument() = this.getArgument(5) and type = DigestIO()
   }
 }
 
-class EvpDigestOperation extends EvpFinalDigestOperationStep instanceof Call {
+class EvpDigestOperation extends FinalDigestOperation instanceof Call {
   EvpDigestOperation() { this.getTarget().getName() = "EVP_Digest" }
 
   override DataFlow::Node getInput(IOType type) {
-    result.asExpr() = this.getArgument(4) and type = PrimaryAlgorithmIO()
+    result.asIndirectExpr() = this.getArgument(4) and type = PrimaryAlgorithmIO()
     or
-    result.asExpr() = this.getArgument(0) and type = PlaintextIO()
+    result.asIndirectExpr() = this.getArgument(0) and type = PlaintextIO()
   }
 
   override DataFlow::Node getOutput(IOType type) {
@@ -98,27 +98,28 @@ class EvpDigestOperation extends EvpFinalDigestOperationStep instanceof Call {
 /**
  * A call to EVP_DigestFinal variants
  */
-class EvpDigestFinalCall extends EvpFinalDigestOperationStep instanceof Call {
+class EvpDigestFinalCall extends FinalDigestOperation instanceof Call {
   EvpDigestFinalCall() {
     this.getTarget().getName() in ["EVP_DigestFinal", "EVP_DigestFinal_ex", "EVP_DigestFinalXOF"]
   }
 
   override DataFlow::Node getInput(IOType type) {
-    result.asExpr() = this.getArgument(0) and type = ContextIO()
+    result.asIndirectExpr() = this.getArgument(0) and type = ContextIO()
   }
 
   override DataFlow::Node getOutput(IOType type) {
-    result.asExpr() = this.getArgument(0) and
+    result.asDefiningArgument() = this.getArgument(0) and
     type = ContextIO()
     or
     result.asDefiningArgument() = this.getArgument(1) and type = DigestIO()
+    //result.(DataFlow::PostUpdateNode).getPreUpdateNode().asExpr() = this.getArgument(1)
   }
 }
 
 /**
  * An openssl digest final hash operation instance
  */
-class EvpDigestFinalOperationInstance extends Crypto::HashOperationInstance instanceof EvpFinalDigestOperationStep
+class OpenSslDigestFinalOperationInstance extends Crypto::HashOperationInstance instanceof FinalDigestOperation
 {
   override Crypto::AlgorithmValueConsumer getAnAlgorithmValueConsumer() {
     super.getPrimaryAlgorithmValueConsumer() = result
diff --git a/cpp/ql/lib/experimental/quantum/OpenSSL/Operations/KeyGenOperation.qll b/cpp/ql/lib/experimental/quantum/OpenSSL/Operations/KeyGenOperation.qll
index 2c146aec97f..e19d65c65ae 100644
--- a/cpp/ql/lib/experimental/quantum/OpenSSL/Operations/KeyGenOperation.qll
+++ b/cpp/ql/lib/experimental/quantum/OpenSSL/Operations/KeyGenOperation.qll
@@ -13,10 +13,12 @@ class ECKeyGen extends OperationStep instanceof Call {
   ECKeyGen() { this.(Call).getTarget().getName() = "EC_KEY_generate_key" }
 
   override DataFlow::Node getInput(IOType type) {
-    result.asExpr() = this.(Call).getArgument(0) and type = ContextIO()
+    result.asIndirectExpr() = this.(Call).getArgument(0) and type = ContextIO()
   }
 
-  override DataFlow::Node getOutput(IOType type) { result.asExpr() = this and type = KeyIO() }
+  override DataFlow::Node getOutput(IOType type) {
+    result.asDefiningArgument() = this and type = KeyIO()
+  }
 
   override OperationStepType getStepType() { result = ContextCreationStep() }
 }
@@ -33,16 +35,19 @@ class EvpKeyGenInitialize extends OperationStep {
   }
 
   override DataFlow::Node getInput(IOType type) {
-    result.asExpr() = this.getArgument(0) and type = ContextIO()
+    result.asIndirectExpr() = this.getArgument(0) and type = ContextIO()
   }
 
   override DataFlow::Node getOutput(IOType type) {
-    result.asExpr() = this.getArgument(0) and type = ContextIO()
+    result.asDefiningArgument() = this.getArgument(0) and type = ContextIO()
   }
 
   override OperationStepType getStepType() { result = InitializerStep() }
 }
 
+/**
+ * A base class for final key generation operation steps.
+ */
 abstract class KeyGenFinalOperationStep extends OperationStep {
   override OperationStepType getStepType() { result = FinalStep() }
 }
@@ -54,26 +59,26 @@ class EvpPKeyQKeyGen extends KeyGenFinalOperationStep instanceof Call {
   EvpPKeyQKeyGen() { this.getTarget().getName() = "EVP_PKEY_Q_keygen" }
 
   override DataFlow::Node getOutput(IOType type) {
-    result.asExpr() = this.getArgument(0) and type = ContextIO()
+    result.asDefiningArgument() = this.getArgument(0) and type = ContextIO()
     or
-    result.asExpr() = this and type = KeyIO()
+    result.asDefiningArgument() = this and type = KeyIO()
   }
 
   override DataFlow::Node getInput(IOType type) {
-    result.asExpr() = this.getArgument(0) and type = ContextIO()
+    result.asIndirectExpr() = this.getArgument(0) and type = ContextIO()
     or
     // When arg 3 is a derived type, it is a curve name, otherwise it is a key size for RSA if provided
     // and arg 2 is the algorithm type
     this.getArgument(3).getType().getUnderlyingType() instanceof DerivedType and
-    result.asExpr() = this.getArgument(3) and
+    result.asIndirectExpr() = this.getArgument(3) and
     type = PrimaryAlgorithmIO()
     or
     not this.getArgument(3).getType().getUnderlyingType() instanceof DerivedType and
-    result.asExpr() = this.getArgument(2) and
+    result.asIndirectExpr() = this.getArgument(2) and
     type = PrimaryAlgorithmIO()
     or
     not this.getArgument(3).getType().getUnderlyingType() instanceof DerivedType and
-    result.asExpr() = this.getArgument(3) and
+    result.asIndirectExpr() = this.getArgument(3) and
     type = KeySizeIO()
   }
 }
@@ -84,7 +89,9 @@ class EvpPKeyQKeyGen extends KeyGenFinalOperationStep instanceof Call {
 class EvpRsaGen extends KeyGenFinalOperationStep instanceof Call {
   EvpRsaGen() { this.getTarget().getName() = "EVP_RSA_gen" }
 
-  override DataFlow::Node getOutput(IOType type) { result.asExpr() = this and type = KeyIO() }
+  override DataFlow::Node getOutput(IOType type) {
+    result.asDefiningArgument() = this and type = KeyIO()
+  }
 
   override DataFlow::Node getInput(IOType type) {
     result.asExpr() = this.getArgument(0) and type = KeySizeIO()
@@ -97,7 +104,9 @@ class EvpRsaGen extends KeyGenFinalOperationStep instanceof Call {
 class RsaGenerateKey extends KeyGenFinalOperationStep instanceof Call {
   RsaGenerateKey() { this.getTarget().getName() = "RSA_generate_key" }
 
-  override DataFlow::Node getOutput(IOType type) { result.asExpr() = this and type = KeyIO() }
+  override DataFlow::Node getOutput(IOType type) {
+    result.asDefiningArgument() = this and type = KeyIO()
+  }
 
   override DataFlow::Node getInput(IOType type) {
     result.asExpr() = this.getArgument(0) and type = KeySizeIO()
@@ -117,7 +126,7 @@ class RsaGenerateKeyEx extends KeyGenFinalOperationStep instanceof Call {
   override DataFlow::Node getInput(IOType type) {
     // arg 0 comes in as a blank RSA key, which we consider a context,
     // on output it is considered a key
-    result.asExpr() = this.getArgument(0) and type = ContextIO()
+    result.asIndirectExpr() = this.getArgument(0) and type = ContextIO()
   }
 }
 
@@ -128,13 +137,13 @@ class EvpPkeyGen extends KeyGenFinalOperationStep instanceof Call {
   EvpPkeyGen() { this.getTarget().getName() in ["EVP_PKEY_generate", "EVP_PKEY_keygen"] }
 
   override DataFlow::Node getInput(IOType type) {
-    result.asExpr() = this.getArgument(0) and type = ContextIO()
+    result.asIndirectExpr() = this.getArgument(0) and type = ContextIO()
   }
 
   override DataFlow::Node getOutput(IOType type) {
     result.asDefiningArgument() = this.getArgument(1) and type = KeyIO()
     or
-    result.asExpr() = this.getArgument(0) and type = ContextIO()
+    result.asDefiningArgument() = this.getArgument(0) and type = ContextIO()
   }
 }
 
@@ -146,18 +155,14 @@ class EvpNewMacKey extends KeyGenFinalOperationStep {
   EvpNewMacKey() { this.getTarget().getName() = "EVP_PKEY_new_mac_key" }
 
   override DataFlow::Node getInput(IOType type) {
-    result.asExpr() = this.getArgument(0) and type = ContextIO()
-    or
     // the raw key that is configured into the output key
-    result.asExpr() = this.getArgument(2) and type = KeyIO()
+    result.asIndirectExpr() = this.getArgument(2) and type = KeyIO()
     or
     result.asExpr() = this.getArgument(3) and type = KeySizeIO()
   }
 
   override DataFlow::Node getOutput(IOType type) {
-    result.asExpr() = this and type = KeyIO()
-    or
-    result.asExpr() = this.getArgument(0) and type = ContextIO()
+    result.asIndirectExpr() = this and type = KeyIO()
   }
 }
 
@@ -165,7 +170,7 @@ class EvpNewMacKey extends KeyGenFinalOperationStep {
 /**
  * An `KeyGenerationOperationInstance` for the for all key gen final operation steps.
  */
-class KeyGenOperationInstance extends Crypto::KeyGenerationOperationInstance instanceof KeyGenFinalOperationStep
+class OpenSslKeyGenOperationInstance extends Crypto::KeyGenerationOperationInstance instanceof KeyGenFinalOperationStep
 {
   override Crypto::AlgorithmValueConsumer getAnAlgorithmValueConsumer() {
     super.getPrimaryAlgorithmValueConsumer() = result
diff --git a/cpp/ql/lib/experimental/quantum/OpenSSL/Operations/OpenSSLOperationBase.qll b/cpp/ql/lib/experimental/quantum/OpenSSL/Operations/OpenSSLOperationBase.qll
index f1ab394ad78..5c0aa98dd0c 100644
--- a/cpp/ql/lib/experimental/quantum/OpenSSL/Operations/OpenSSLOperationBase.qll
+++ b/cpp/ql/lib/experimental/quantum/OpenSSL/Operations/OpenSSLOperationBase.qll
@@ -1,6 +1,6 @@
 private import experimental.quantum.Language
 private import experimental.quantum.OpenSSL.AlgorithmValueConsumers.OpenSSLAlgorithmValueConsumers
-import semmle.code.cpp.dataflow.new.DataFlow
+import semmle.code.cpp.dataflow.new.TaintTracking
 // Importing these intializers here to ensure the are part of any model that is
 // using OpenSslOperationBase. This further ensures that initializers are tied to opeartions
 // even if only importing the operation by itself.
@@ -58,7 +58,11 @@ newtype TIOType =
   // For OSSL_PARAM and OSSL_LIB_CTX use of OsslParamIO and OsslLibContextIO
   ContextIO() or
   DigestIO() or
+  // For OAEP and MGF1 hashes, there is a special IO type for these hashes
+  // it is recommended to set the most explicit type known, not both
   HashAlgorithmIO() or
+  HashAlgorithmOaepIO() or
+  HashAlgorithmMgf1IO() or
   IVorNonceIO() or
   KeyIO() or
   KeyOperationSubtypeIO() or
@@ -71,11 +75,13 @@ newtype TIOType =
   PaddingAlgorithmIO() or
   // Plaintext also includes a message for digest, signature, verification, and mac generation
   PlaintextIO() or
+  PlaintextSizeIO() or
   PrimaryAlgorithmIO() or
   RandomSourceIO() or
   SaltLengthIO() or
   SeedIO() or
-  SignatureIO()
+  SignatureIO() or
+  SignatureSizeIO()
 
 private string ioTypeToString(TIOType t) {
   t = CiphertextIO() and result = "CiphertextIO"
@@ -104,6 +110,8 @@ private string ioTypeToString(TIOType t) {
   or
   t = PlaintextIO() and result = "PlaintextIO"
   or
+  t = PlaintextSizeIO() and result = "PlaintextSizeIO"
+  or
   t = PrimaryAlgorithmIO() and result = "PrimaryAlgorithmIO"
   or
   t = RandomSourceIO() and result = "RandomSourceIO"
@@ -113,6 +121,8 @@ private string ioTypeToString(TIOType t) {
   t = SeedIO() and result = "SeedIO"
   or
   t = SignatureIO() and result = "SignatureIO"
+  or
+  t = SignatureSizeIO() and result = "SignatureSizeIO"
 }
 
 class IOType extends TIOType {
@@ -123,13 +133,13 @@ class IOType extends TIOType {
   }
 }
 
-//TODO: add more initializers as needed
 /**
  * The type of step in an `OperationStep`.
  * - `ContextCreationStep`: the creation of a context from an algorithm or key.
  *                       for example `EVP_MD_CTX_create(EVP_sha256())` or `EVP_PKEY_CTX_new(pkey, NULL)`
- * - `InitializerStep`: the initialization of an operation through some sort of shared/accumulated context
- *                       for example `EVP_DigestInit_ex(ctx, EVP_sha256(), NULL)`
+ * - `InitializerStep`: the initialization of an operation or state through some sort of shared/accumulated context
+ *                       for example `EVP_DigestInit_ex(ctx, EVP_sha256(), NULL)`, may also be used for pass through
+ *                       configuration, for example `EVP_PKEY_get1_RSA(key)` where a pkey is input into an RSA key return.
  * - `UpdateStep`: any operation that has and update/final paradigm, the update represents an intermediate step in an operation,
  *                       such as `EVP_DigestUpdate(ctx, data, len)`
  * - `FinalStep`: an ultimate operation step. This may be an explicit 'final' in an update/final paradigm, but not necessarily.
@@ -189,7 +199,7 @@ abstract class OperationStep extends Call {
    */
   predicate flowsToOperationStep(OperationStep sink) {
     sink = this or
-    OperationStepFlow::flow(this.getAnOutput(), sink.getAnInput())
+    OperationStepCtxFlow::flow(this.getAnOutput(), [sink.getAnInput(), sink.getAnOutput()])
   }
 
   /**
@@ -198,7 +208,7 @@ abstract class OperationStep extends Call {
    */
   predicate flowsFromOperationStep(OperationStep source) {
     source = this or
-    OperationStepFlow::flow(source.getAnOutput(), this.getAnInput())
+    OperationStepCtxFlow::flow(source.getAnOutput(), [this.getAnInput(), this.getAnOutput()])
   }
 
   /**
@@ -220,10 +230,13 @@ abstract class OperationStep extends Call {
     result.setsValue(type) and
     (
       // Do not consider a 'reset' to occur on updates
+      // but only for resets that are part of the same update/finalize
+      // progression (e.g., an update for an unrelated finalize is ignored)
       result.getStepType() = UpdateStep()
       or
       not exists(OperationStep reset |
         result != reset and
+        result != this and
         reset.setsValue(type) and
         reset.flowsToOperationStep(this) and
         result.flowsToOperationStep(reset)
@@ -245,8 +258,11 @@ abstract class OperationStep extends Call {
 
   /**
    * Gets an AVC for the primary algorithm for this operation.
-   * A primary algorithm is an AVC that flows to a ctx input directly or
-   * an AVC that flows to a primary algorithm input directly.
+   * A primary algorithm is an AVC that either:
+   * 0) `this` is an AVC (consider direct algorithm consumers like RSA_sign (algorithm is implicit) or EVP_PKEY_new_mac_key (NID is first arg) )
+   * 1) flows to a ctx input directly or
+   * 2) flows to a primary algorithm input directly or
+   * 3) flows to a key input directly (algorithm held in a key will be considered primary)
    * See `AvcContextCreationStep` for details about resetting scenarios.
    * Gets the first OperationStep an AVC flows to. If a context input,
    * the AVC is considered primary.
@@ -254,19 +270,24 @@ abstract class OperationStep extends Call {
    * operation step (dominating operation step, see `getDominatingInitializersToStep`).
    */
   Crypto::AlgorithmValueConsumer getPrimaryAlgorithmValueConsumer() {
-    exists(DataFlow::Node src, DataFlow::Node sink, IOType t, OperationStep avcSucc |
-      (t = PrimaryAlgorithmIO() or t = ContextIO()) and
-      avcSucc.flowsToOperationStep(this) and
-      src.asExpr() = result and
-      sink = avcSucc.getInput(t) and
+    this instanceof Crypto::AlgorithmValueConsumer and result = this
+    or
+    exists(
+      DataFlow::Node src, DataFlow::Node sink, IOType srcIntype, OperationStep avcConsumingPred
+    |
+      (srcIntype = ContextIO() or srcIntype = PrimaryAlgorithmIO() or srcIntype = KeyIO()) and
+      avcConsumingPred.flowsToOperationStep(this) and
+      src.asIndirectExpr() = result and
+      sink = avcConsumingPred.getInput(srcIntype) and
       AvcToOperationStepFlow::flow(src, sink) and
       (
-        // Case 1: the avcSucc step is a dominating initialization step
-        t = PrimaryAlgorithmIO() and
-        avcSucc = this.getDominatingInitializersToStep(PrimaryAlgorithmIO())
+        // Case 1: the avcConsumingPred step is a dominating primary algorithm initialization step
+        // or dominating key initialization step
+        (srcIntype = PrimaryAlgorithmIO() or srcIntype = KeyIO()) and
+        avcConsumingPred = this.getDominatingInitializersToStep(srcIntype)
         or
-        // Case 2: the succ is a context input (any avcSucc is valid)
-        t = ContextIO()
+        // Case 2: the pred is a context input
+        srcIntype = ContextIO()
       )
     )
   }
@@ -277,9 +298,11 @@ abstract class OperationStep extends Call {
    * TODO: generalize to use this for `getPrimaryAlgorithmValueConsumer`
    */
   Crypto::AlgorithmValueConsumer getAlgorithmValueConsumerForInput(IOType type) {
+    result = this and this.setsValue(type)
+    or
     exists(DataFlow::Node src, DataFlow::Node sink |
       AvcToOperationStepFlow::flow(src, sink) and
-      src.asExpr() = result and
+      src.asIndirectExpr() = result and
       sink = this.getInput(type)
     )
   }
@@ -357,7 +380,7 @@ private class CtxCopyOutArgCall extends CtxPassThroughCall {
 
   CtxCopyOutArgCall() {
     this.getTarget().getName().toLowerCase().matches("%copy%") and
-    n1.asExpr() = this.getAnArgument() and
+    n1.asIndirectExpr() = this.getAnArgument() and
     n1.getType() instanceof CtxType and
     n2.asDefiningArgument() = this.getAnArgument() and
     n2.getType() instanceof CtxType and
@@ -378,16 +401,18 @@ private class CtxCopyReturnCall extends CtxPassThroughCall, CtxPointerExpr {
 
   CtxCopyReturnCall() {
     this.getTarget().getName().toLowerCase().matches("%dup%") and
-    n1.asExpr() = this.getAnArgument() and
+    n1.asIndirectExpr() = this.getAnArgument() and
     n1.getType() instanceof CtxType
   }
 
   override DataFlow::Node getNode1() { result = n1 }
 
-  override DataFlow::Node getNode2() { result.asExpr() = this }
+  override DataFlow::Node getNode2() { result.asIndirectExpr() = this }
 }
 
-// TODO: is this still needed?
+// TODO: is this still needed? It appears to be (tests fail without it) but
+// I don't know why as EVP_PKEY_paramgen is an operation step and we pass through
+// operation steps already.
 /**
  * A call to `EVP_PKEY_paramgen` acts as a kind of pass through.
  * It's output pkey is eventually used in a new operation generating
@@ -401,34 +426,10 @@ private class CtxParamGenCall extends CtxPassThroughCall {
 
   CtxParamGenCall() {
     this.getTarget().getName() = "EVP_PKEY_paramgen" and
-    n1.asExpr() = this.getArgument(0) and
-    (
-      n2.asExpr() = this.getArgument(1)
-      or
-      n2.asDefiningArgument() = this.getArgument(1)
-    )
-  }
-
-  override DataFlow::Node getNode1() { result = n1 }
-
-  override DataFlow::Node getNode2() { result = n2 }
-}
-
-//TODO: I am not sure CallArgToCtxRet is needed anymore
-/**
- * If the current node is an argument to a function
- * that returns a pointer type, immediately flow through.
- * NOTE: this passthrough is required if we allow
- * intermediate steps to go into variables that are not a CTX type.
- * See for example `CtxParamGenCall`.
- */
-private class CallArgToCtxRet extends CtxPassThroughCall, CtxPointerExpr {
-  DataFlow::Node n1;
-  DataFlow::Node n2;
-
-  CallArgToCtxRet() {
-    this.getAnArgument() = n1.asExpr() and
-    n2.asExpr() = this
+    //Arg 0 is *ctx
+    n1.asIndirectExpr() = this.getArgument(0) and
+    //Arg 1 is **pkey
+    n2.asDefiningArgument() = this.getArgument(1)
   }
 
   override DataFlow::Node getNode1() { result = n1 }
@@ -439,7 +440,7 @@ private class CallArgToCtxRet extends CtxPassThroughCall, CtxPointerExpr {
 /**
  * A flow configuration from any non-final `OperationStep` to any other `OperationStep`.
  */
-module OperationStepFlowConfig implements DataFlow::ConfigSig {
+module OperationStepCtxFlowConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) {
     exists(OperationStep s |
       s.getAnOutput() = source or
@@ -455,22 +456,39 @@ module OperationStepFlowConfig implements DataFlow::ConfigSig {
   }
 
   predicate isBarrier(DataFlow::Node node) {
-    exists(CtxClearCall c | c.getAnArgument() = node.asExpr())
+    exists(CtxClearCall c | c.getAnArgument() = [node.asExpr(), node.asIndirectExpr()])
   }
 
   predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
+    node1.(AdditionalFlowInputStep).getOutput() = node2
+    or
     exists(CtxPassThroughCall c | c.getNode1() = node1 and c.getNode2() = node2)
     or
-    // Flow out through all outputs from an operation step if more than one output
-    // is defined.
-    exists(OperationStep s | s.getAnInput() = node1 and s.getAnOutput() = node2)
+    // Flow only through context and key inputs and outputs
+    // keys and context generally hold unifying context that link multiple steps
+    // Flow only out of finalize operations through key outputs, otherwise stop at final operations
+    exists(OperationStep s, IOType inType, IOType outType |
+      (s.getStepType() = FinalStep() implies outType = KeyIO()) and
+      (
+        inType = ContextIO()
+        or
+        inType = KeyIO()
+      ) and
+      (
+        outType = ContextIO()
+        or
+        outType = KeyIO()
+      ) and
+      s.getInput(inType) = node1 and
+      s.getOutput(outType) = node2
+    )
     // TODO: consideration for additional alises defined as follows:
     // if an output from an operation step itself flows from the output of another operation step
     // then the source of that flow's outputs (all of them) are potential aliases
   }
 }
 
-module OperationStepFlow = DataFlow::Global<OperationStepFlowConfig>;
+module OperationStepCtxFlow = TaintTracking::Global<OperationStepCtxFlowConfig>;
 
 /**
  * A flow from AVC to the first `OperationStep` the AVC reaches as an input.
@@ -483,7 +501,7 @@ module AvcToOperationStepFlowConfig implements DataFlow::ConfigSig {
   predicate isSink(DataFlow::Node sink) { exists(OperationStep s | s.getAnInput() = sink) }
 
   predicate isBarrier(DataFlow::Node node) {
-    exists(CtxClearCall c | c.getAnArgument() = node.asExpr())
+    exists(CtxClearCall c | c.getAnArgument() = [node.asExpr(), node.asIndirectExpr()])
   }
 
   /**
@@ -496,7 +514,7 @@ module AvcToOperationStepFlowConfig implements DataFlow::ConfigSig {
   }
 }
 
-module AvcToOperationStepFlow = DataFlow::Global<AvcToOperationStepFlowConfig>;
+module AvcToOperationStepFlow = TaintTracking::Global<AvcToOperationStepFlowConfig>;
 
 module EncValToInitEncArgConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { source.asExpr().getValue().toInt() in [0, 1] }
@@ -506,7 +524,7 @@ module EncValToInitEncArgConfig implements DataFlow::ConfigSig {
   }
 }
 
-module EncValToInitEncArgFlow = DataFlow::Global<EncValToInitEncArgConfig>;
+module EncValToInitEncArgFlow = TaintTracking::Global<EncValToInitEncArgConfig>;
 
 private Crypto::KeyOperationSubtype intToCipherOperationSubtype(int i) {
   i = 0 and
diff --git a/cpp/ql/lib/experimental/quantum/OpenSSL/Operations/SignatureOperation.qll b/cpp/ql/lib/experimental/quantum/OpenSSL/Operations/SignatureOperation.qll
index b9b498ee8df..f5e9ad354ad 100644
--- a/cpp/ql/lib/experimental/quantum/OpenSSL/Operations/SignatureOperation.qll
+++ b/cpp/ql/lib/experimental/quantum/OpenSSL/Operations/SignatureOperation.qll
@@ -6,12 +6,25 @@ private import experimental.quantum.Language
 private import experimental.quantum.OpenSSL.AvcFlow
 private import experimental.quantum.OpenSSL.AlgorithmValueConsumers.OpenSSLAlgorithmValueConsumers
 private import experimental.quantum.OpenSSL.Operations.OpenSSLOperations
+private import experimental.quantum.OpenSSL.AlgorithmInstances.OpenSSLAlgorithmInstances
 
-// TODO: verification functions
 /**
  * A base class for final signature operations.
+ * The operation must be known to always be a signature operation,
+ * and not a MAC operation. Used for both verification and signing.
+ * NOTE: even an operation that may be a mac or signature but is known to take in
+ * only signature configurations should extend `SignatureOrMacFinalOperation`.
  */
-abstract class EvpSignatureFinalOperation extends OperationStep {
+abstract class SignatureFinalOperation extends OperationStep {
+  override OperationStepType getStepType() { result = FinalStep() }
+}
+
+/**
+ * A base class for final signature or MAC operations.
+ * The operation must be known to always be a signature or MAC operation.
+ * Used for both verification or signing.
+ */
+abstract class SignatureOrMacFinalOperation extends OperationStep {
   override OperationStepType getStepType() { result = FinalStep() }
 }
 
@@ -24,36 +37,32 @@ class EvpSignatureDigestInitializer extends OperationStep {
   }
 
   override DataFlow::Node getInput(IOType type) {
-    result.asExpr() = this.getArgument(0) and type = ContextIO()
+    result.asIndirectExpr() = this.getArgument(0) and type = ContextIO()
     or
     this.getTarget().getName() = "EVP_DigestSignInit_ex" and
-    result.asExpr() = this.getArgument(3) and
+    result.asIndirectExpr() = this.getArgument(3) and
     type = OsslLibContextIO()
     or
-    result.asExpr() = this.getArgument(2) and type = HashAlgorithmIO()
+    result.asIndirectExpr() = this.getArgument(2) and type = HashAlgorithmIO()
     or
     this.getTarget().getName() = "EVP_DigestSignInit" and
-    result.asExpr() = this.getArgument(4) and
+    result.asIndirectExpr() = this.getArgument(4) and
     type = KeyIO()
     or
     this.getTarget().getName() = "EVP_DigestSignInit_ex" and
-    result.asExpr() = this.getArgument(5) and
+    result.asIndirectExpr() = this.getArgument(5) and
     type = KeyIO()
     or
     this.getTarget().getName() = "EVP_DigestSignInit_ex" and
-    result.asExpr() = this.getArgument(6) and
+    result.asIndirectExpr() = this.getArgument(6) and
     type = OsslParamIO()
   }
 
   override DataFlow::Node getOutput(IOType type) {
-    result.asExpr() = this.getArgument(0) and type = ContextIO()
+    result.asDefiningArgument() = this.getArgument(0) and type = ContextIO()
     or
     // EVP_PKEY_CTX
-    result.asExpr() = this.getArgument(1) and type = ContextIO()
-    or
-    this.getTarget().getName() = "EVP_DigestSignInit_ex" and
-    result.asExpr() = this.getArgument(6) and
-    type = ContextIO()
+    result.asDefiningArgument() = this.getArgument(1) and type = ContextIO()
   }
 
   override OperationStepType getStepType() { result = InitializerStep() }
@@ -66,13 +75,13 @@ class EvpSignInit extends OperationStep {
   EvpSignInit() { this.getTarget().getName() in ["EVP_SignInit", "EVP_SignInit_ex"] }
 
   override DataFlow::Node getInput(IOType type) {
-    result.asExpr() = this.getArgument(0) and type = ContextIO()
+    result.asIndirectExpr() = this.getArgument(0) and type = ContextIO()
     or
-    result.asExpr() = this.getArgument(1) and type = HashAlgorithmIO()
+    result.asIndirectExpr() = this.getArgument(1) and type = HashAlgorithmIO()
   }
 
   override DataFlow::Node getOutput(IOType type) {
-    result.asExpr() = this.getArgument(0) and type = ContextIO()
+    result.asDefiningArgument() = this.getArgument(0) and type = ContextIO()
   }
 
   override OperationStepType getStepType() { result = InitializerStep() }
@@ -94,22 +103,22 @@ class EvpPkeySignInit extends OperationStep {
   }
 
   override DataFlow::Node getInput(IOType type) {
-    result.asExpr() = this.getArgument(0) and type = ContextIO()
+    result.asIndirectExpr() = this.getArgument(0) and type = ContextIO()
     or
     this.getTarget().getName() in ["EVP_PKEY_sign_init_ex2", "EVP_PKEY_sign_message_init"] and
-    result.asExpr() = this.getArgument(1) and
+    result.asIndirectExpr() = this.getArgument(1) and
     type = PrimaryAlgorithmIO()
     or
     this.getTarget().getName() = "EVP_PKEY_sign_init_ex" and
-    result.asExpr() = this.getArgument(1) and
+    result.asIndirectExpr() = this.getArgument(1) and
     type = OsslParamIO()
     or
     // Argument 2 (0 based) only exists for EVP_PKEY_sign_init_ex2 and EVP_PKEY_sign_message_init
-    result.asExpr() = this.getArgument(2) and type = OsslParamIO()
+    result.asIndirectExpr() = this.getArgument(2) and type = OsslParamIO()
   }
 
   override DataFlow::Node getOutput(IOType type) {
-    result.asExpr() = this.getArgument(0) and type = ContextIO()
+    result.asDefiningArgument() = this.getArgument(0) and type = ContextIO()
   }
 
   override OperationStepType getStepType() { result = InitializerStep() }
@@ -126,13 +135,13 @@ class EvpSignatureUpdateCall extends OperationStep {
   }
 
   override DataFlow::Node getInput(IOType type) {
-    result.asExpr() = this.getArgument(0) and type = ContextIO()
+    result.asIndirectExpr() = this.getArgument(0) and type = ContextIO()
     or
-    result.asExpr() = this.getArgument(1) and type = PlaintextIO()
+    result.asIndirectExpr() = this.getArgument(1) and type = PlaintextIO()
   }
 
   override DataFlow::Node getOutput(IOType type) {
-    result.asExpr() = this.getArgument(0) and type = ContextIO()
+    result.asDefiningArgument() = this.getArgument(0) and type = ContextIO()
   }
 
   override OperationStepType getStepType() { result = UpdateStep() }
@@ -141,73 +150,496 @@ class EvpSignatureUpdateCall extends OperationStep {
 /**
  * A call to EVP_SignFinal or EVP_SignFinal_ex.
  */
-class EvpSignFinal extends EvpSignatureFinalOperation {
+class EvpSignFinal extends SignatureFinalOperation {
   EvpSignFinal() { this.getTarget().getName() in ["EVP_SignFinal_ex", "EVP_SignFinal"] }
 
   override DataFlow::Node getInput(IOType type) {
-    result.asExpr() = this.getArgument(0) and type = ContextIO()
+    result.asIndirectExpr() = this.getArgument(0) and type = ContextIO()
     or
-    result.asExpr() = this.getArgument(3) and type = KeyIO()
+    result.asIndirectExpr() = this.getArgument(3) and type = KeyIO()
     or
     // params above 3 (0-based) only exist for EVP_SignFinal_ex
-    result.asExpr() = this.getArgument(4) and
+    result.asIndirectExpr() = this.getArgument(4) and
     type = OsslLibContextIO()
   }
 
   override DataFlow::Node getOutput(IOType type) {
-    result.asExpr() = this.getArgument(0) and type = ContextIO()
+    result.asDefiningArgument() = this.getArgument(0) and type = ContextIO()
     or
-    result.asExpr() = this.getArgument(1) and type = SignatureIO()
+    result.asDefiningArgument() = this.getArgument(1) and type = SignatureIO()
+    or
+    result.asDefiningArgument() = this.getArgument(2) and type = SignatureSizeIO()
   }
 }
 
 /**
- * A call to EVP_DigestSign or EVP_PKEY_sign.
+ * A call to EVP_PKEY_sign.
  */
-class EvpDigestSign extends EvpSignatureFinalOperation {
-  EvpDigestSign() { this.getTarget().getName() in ["EVP_DigestSign", "EVP_PKEY_sign"] }
+class EvpPkeySign extends SignatureFinalOperation {
+  EvpPkeySign() {
+    this.getTarget().getName() = "EVP_PKEY_sign" and
+    // Setting signature to NULL is not a final sign step but an
+    // intermediary step used to get the required buffer size.
+    // not tracking these calls.
+    (
+      exists(this.(Call).getArgument(1).getValue())
+      implies
+      this.(Call).getArgument(1).getValue().toInt() != 0
+    )
+  }
 
   override DataFlow::Node getInput(IOType type) {
-    result.asExpr() = this.getArgument(0) and type = ContextIO()
+    result.asIndirectExpr() = this.getArgument(0) and type = ContextIO()
     or
-    result.asExpr() = this.getArgument(3) and type = PlaintextIO()
+    result.asIndirectExpr() = this.getArgument(3) and type = PlaintextIO()
   }
 
   override DataFlow::Node getOutput(IOType type) {
-    result.asExpr() = this.getArgument(0) and type = ContextIO()
+    result.asDefiningArgument() = this.getArgument(0) and type = ContextIO()
     or
-    result.asExpr() = this.getArgument(1) and type = SignatureIO()
+    result.asDefiningArgument() = this.getArgument(1) and type = SignatureIO()
   }
 }
 
 /**
- * A call to EVP_DigestSignFinal or EVP_PKEY_sign_message_final.
+ * A call to EVP_DigestSign.
+ * This is a mac or sign operation.
  */
-class EvpDigestAndPkeySignFinal extends EvpSignatureFinalOperation {
-  EvpDigestAndPkeySignFinal() {
-    this.getTarget().getName() in [
-        "EVP_DigestSignFinal",
-        "EVP_PKEY_sign_message_final"
-      ]
-  }
+class EvpDigestSign extends SignatureOrMacFinalOperation {
+  EvpDigestSign() { this.getTarget().getName() = "EVP_DigestSign" }
 
   override DataFlow::Node getInput(IOType type) {
-    result.asExpr() = this.getArgument(0) and type = ContextIO()
+    result.asIndirectExpr() = this.getArgument(0) and type = ContextIO()
+    or
+    result.asIndirectExpr() = this.getArgument(3) and type = PlaintextIO()
   }
 
   override DataFlow::Node getOutput(IOType type) {
-    result.asExpr() = this.getArgument(0) and type = ContextIO()
+    result.asDefiningArgument() = this.getArgument(0) and type = ContextIO()
     or
-    result.asExpr() = this.getArgument(1) and type = SignatureIO()
+    result.asDefiningArgument() = this.getArgument(1) and type = SignatureIO()
+  }
+}
+
+/**
+ * A call to EVP_PKEY_sign_message_final.
+ */
+class EvpPkeySignFinal extends SignatureFinalOperation {
+  EvpPkeySignFinal() {
+    this.getTarget().getName() = "EVP_PKEY_sign_message_final" and
+    // Setting signature to NULL is not a final sign step but an
+    // intermediary step used to get the required buffer size.
+    // not tracking these calls.
+    (
+      exists(this.(Call).getArgument(1).getValue())
+      implies
+      this.(Call).getArgument(1).getValue().toInt() != 0
+    )
+  }
+
+  override DataFlow::Node getInput(IOType type) {
+    result.asIndirectExpr() = this.getArgument(0) and type = ContextIO()
+  }
+
+  override DataFlow::Node getOutput(IOType type) {
+    result.asDefiningArgument() = this.getArgument(0) and type = ContextIO()
+    or
+    result.asDefiningArgument() = this.getArgument(1) and type = SignatureIO()
+    or
+    result.asExpr() = this.getArgument(2) and type = SignatureSizeIO()
+  }
+}
+
+/**
+ * A call to EVP_DigestSignFinal.
+ * This is a mac or sign operation.
+ */
+class EvpDigestSignFinal extends SignatureOrMacFinalOperation {
+  EvpDigestSignFinal() {
+    this.getTarget().getName() = "EVP_DigestSignFinal" and
+    // Setting signature to NULL is not a final sign step but an
+    // intermediary step used to get the required buffer size.
+    // not tracking these calls.
+    (
+      exists(this.(Call).getArgument(1).getValue())
+      implies
+      this.(Call).getArgument(1).getValue().toInt() != 0
+    )
+  }
+
+  override DataFlow::Node getInput(IOType type) {
+    result.asIndirectExpr() = this.getArgument(0) and type = ContextIO()
+  }
+
+  override DataFlow::Node getOutput(IOType type) {
+    result.asDefiningArgument() = this.getArgument(0) and type = ContextIO()
+    or
+    result.asDefiningArgument() = this.getArgument(1) and type = SignatureIO()
   }
 
   override OperationStepType getStepType() { result = FinalStep() }
 }
 
 /**
- * An EVP signature operation instance.
+ * A call to EVP_DigestVerifyInit or EVP_DigestVerifyInit_ex.
  */
-class EvpSignatureOperationInstance extends Crypto::SignatureOperationInstance instanceof EvpSignatureFinalOperation
+class EvpDigestVerifyInit extends OperationStep {
+  EvpDigestVerifyInit() {
+    this.getTarget().getName() in ["EVP_DigestVerifyInit", "EVP_DigestVerifyInit_ex"]
+  }
+
+  override DataFlow::Node getInput(IOType type) {
+    result.asIndirectExpr() = this.getArgument(0) and type = ContextIO()
+    or
+    result.asIndirectExpr() = this.getArgument(2) and type = HashAlgorithmIO()
+    or
+    this.getTarget().getName() = "EVP_DigestVerifyInit_ex" and
+    result.asIndirectExpr() = this.getArgument(3) and
+    type = OsslLibContextIO()
+    or
+    this.getTarget().getName() = "EVP_DigestVerifyInit_ex" and
+    result.asIndirectExpr() = this.getArgument(5) and
+    type = KeyIO()
+    or
+    this.getTarget().getName() = "EVP_DigestVerifyInit" and
+    result.asIndirectExpr() = this.getArgument(4) and
+    type = KeyIO()
+    or
+    this.getTarget().getName() = "EVP_DigestVerifyInit_ex" and
+    result.asIndirectExpr() = this.getArgument(6) and
+    type = OsslParamIO()
+  }
+
+  override DataFlow::Node getOutput(IOType type) {
+    result.asDefiningArgument() = this.getArgument(0) and type = ContextIO()
+    or
+    result.asDefiningArgument() = this.getArgument(1) and type = ContextIO()
+  }
+
+  override OperationStepType getStepType() { result = InitializerStep() }
+}
+
+/**
+ * A call to EVP_DigestVerifyUpdate.
+ */
+class EvpDigestVerifyUpdate extends OperationStep {
+  EvpDigestVerifyUpdate() { this.getTarget().getName() = "EVP_DigestVerifyUpdate" }
+
+  override DataFlow::Node getInput(IOType type) {
+    result.asIndirectExpr() = this.getArgument(0) and type = ContextIO()
+    or
+    result.asIndirectExpr() = this.getArgument(1) and type = PlaintextIO()
+  }
+
+  override DataFlow::Node getOutput(IOType type) {
+    result.asDefiningArgument() = this.getArgument(0) and type = ContextIO()
+  }
+
+  override OperationStepType getStepType() { result = UpdateStep() }
+}
+
+/**
+ * A call to EVP_DigestVerifyFinal
+ */
+class EvpDigestVerifyFinal extends SignatureFinalOperation {
+  EvpDigestVerifyFinal() { this.getTarget().getName() = "EVP_DigestVerifyFinal" }
+
+  override DataFlow::Node getInput(IOType type) {
+    result.asIndirectExpr() = this.getArgument(0) and type = ContextIO()
+    or
+    result.asIndirectExpr() = this.getArgument(1) and type = SignatureIO()
+  }
+
+  override DataFlow::Node getOutput(IOType type) {
+    result.asDefiningArgument() = this.getArgument(0) and type = ContextIO()
+  }
+}
+
+/**
+ * A call to EVP_DigestVerify
+ */
+class EvpDigestVerify extends SignatureFinalOperation {
+  EvpDigestVerify() { this.getTarget().getName() = "EVP_DigestVerify" }
+
+  override DataFlow::Node getInput(IOType type) {
+    result.asIndirectExpr() = this.getArgument(0) and type = ContextIO()
+    or
+    result.asIndirectExpr() = this.getArgument(1) and type = SignatureIO()
+    or
+    result.asIndirectExpr() = this.getArgument(3) and type = PlaintextIO()
+  }
+
+  override DataFlow::Node getOutput(IOType type) {
+    result.asDefiningArgument() = this.getArgument(0) and type = ContextIO()
+  }
+}
+
+/**
+ * A call to `EVP_PKEY_verify_init`, `EVP_PKEY_verify_init_ex`,
+ * `EVP_PKEY_verify_init_ex2`, or `EVP_PKEY_verify_message_init`
+ * https://docs.openssl.org/master/man3/EVP_PKEY_verify/#synopsis
+ */
+class EvpVerifyInit extends OperationStep {
+  EvpVerifyInit() {
+    this.getTarget().getName() in [
+        "EVP_PKEY_verify_init", "EVP_PKEY_verify_init_ex", "EVP_PKEY_verify_init_ex2",
+        "EVP_PKEY_verify_message_init"
+      ]
+  }
+
+  override DataFlow::Node getInput(IOType type) {
+    result.asIndirectExpr() = this.getArgument(0) and type = ContextIO()
+    or
+    this.getTarget().getName() = "EVP_PKEY_verify_init_ex" and
+    result.asIndirectExpr() = this.getArgument(1) and
+    type = OsslParamIO()
+    or
+    this.getTarget().getName() in ["EVP_PKEY_verify_init_ex2", "EVP_PKEY_verify_message_init"] and
+    result.asIndirectExpr() = this.getArgument(1) and
+    type = PrimaryAlgorithmIO()
+    or
+    this.getTarget().getName() in ["EVP_PKEY_verify_init_ex2", "EVP_PKEY_verify_message_init"] and
+    result.asIndirectExpr() = this.getArgument(2) and
+    type = OsslParamIO()
+  }
+
+  override DataFlow::Node getOutput(IOType type) {
+    result.asDefiningArgument() = this.getArgument(0) and type = ContextIO()
+  }
+
+  override OperationStepType getStepType() { result = InitializerStep() }
+}
+
+/**
+ * A call to `EVP_PKEY_CTX_set_signature`
+ * https://docs.openssl.org/master/man3/EVP_PKEY_verify/
+ */
+class EvpCtxSetSignatureInitializer extends OperationStep {
+  EvpCtxSetSignatureInitializer() { this.getTarget().getName() = "EVP_PKEY_CTX_set_signature" }
+
+  override DataFlow::Node getInput(IOType type) {
+    result.asIndirectExpr() = this.getArgument(0) and type = ContextIO()
+    or
+    result.asIndirectExpr() = this.getArgument(1) and type = SignatureIO()
+    or
+    result.asExpr() = this.getArgument(2) and type = SignatureSizeIO()
+  }
+
+  override DataFlow::Node getOutput(IOType type) {
+    result.asDefiningArgument() = this.getArgument(0) and type = ContextIO()
+  }
+
+  override OperationStepType getStepType() { result = InitializerStep() }
+}
+
+/**
+ * A call to `EVP_PKEY_verify_message_update`.
+ */
+class EvpVerifyMessageUpdate extends OperationStep {
+  EvpVerifyMessageUpdate() { this.getTarget().getName() = "EVP_PKEY_verify_message_update" }
+
+  override DataFlow::Node getInput(IOType type) {
+    result.asIndirectExpr() = this.getArgument(0) and type = ContextIO()
+    or
+    result.asIndirectExpr() = this.getArgument(1) and type = PlaintextIO()
+    or
+    result.asExpr() = this.getArgument(2) and type = PlaintextSizeIO()
+  }
+
+  override DataFlow::Node getOutput(IOType type) {
+    result.asDefiningArgument() = this.getArgument(0) and type = ContextIO()
+  }
+
+  override OperationStepType getStepType() { result = UpdateStep() }
+}
+
+/**
+ * A call to `EVP_PKEY_verify_message_final`.
+ */
+class EvpVerifyMessageFinal extends SignatureFinalOperation {
+  EvpVerifyMessageFinal() { this.getTarget().getName() = "EVP_PKEY_verify_message_final" }
+
+  override DataFlow::Node getInput(IOType type) {
+    result.asIndirectExpr() = this.getArgument(0) and type = ContextIO()
+  }
+
+  override DataFlow::Node getOutput(IOType type) {
+    result.asDefiningArgument() = this.getArgument(0) and type = ContextIO()
+  }
+}
+
+/**
+ * A call to `EVP_PKEY_verify`
+ */
+class EvpVerify extends SignatureFinalOperation {
+  EvpVerify() { this.getTarget().getName() = "EVP_PKEY_verify" }
+
+  override DataFlow::Node getInput(IOType type) {
+    result.asIndirectExpr() = this.getArgument(0) and type = ContextIO()
+    or
+    result.asIndirectExpr() = this.getArgument(1) and type = SignatureIO()
+    or
+    result.asExpr() = this.getArgument(2) and type = SignatureSizeIO()
+    or
+    result.asIndirectExpr() = this.getArgument(3) and type = PlaintextIO()
+    or
+    result.asExpr() = this.getArgument(4) and type = PlaintextSizeIO()
+  }
+
+  override DataFlow::Node getOutput(IOType type) {
+    result.asDefiningArgument() = this.getArgument(0) and type = ContextIO()
+  }
+}
+
+/**
+ * A call to `RSA_sign` or `RSA_verify`.
+ * https://docs.openssl.org/3.0/man3/RSA_sign/
+ */
+class RsaSignorVerify extends SignatureFinalOperation {
+  RsaSignorVerify() { this.getTarget().getName() in ["RSA_sign", "RSA_verify"] }
+
+  override DataFlow::Node getInput(IOType type) {
+    // Arg 0 is an NID (so asExpr not asIndirectExpr)
+    result.asExpr() = this.getArgument(0) and type = HashAlgorithmIO()
+    or
+    result.asIndirectExpr() = this.getArgument(1) and type = PlaintextIO()
+    or
+    result.asExpr() = this.getArgument(2) and type = PlaintextSizeIO()
+    or
+    this.getTarget().getName() = "RSA_verify" and
+    result.asIndirectExpr() = this.getArgument(3) and
+    type = SignatureIO()
+    or
+    this.getTarget().getName() = "RSA_verify" and
+    result.asIndirectExpr() = this.getArgument(4) and
+    type = SignatureSizeIO()
+    or
+    result.asIndirectExpr() = this.getArgument(5) and type = KeyIO()
+  }
+
+  override DataFlow::Node getOutput(IOType type) {
+    result.asDefiningArgument() = this.getArgument(0) and type = ContextIO()
+    or
+    this.getTarget().getName() = "RSA_sign" and
+    result.asDefiningArgument() = this.getArgument(3) and
+    type = SignatureIO()
+    or
+    this.getTarget().getName() = "RSA_sign" and
+    type = SignatureSizeIO() and
+    result.asDefiningArgument() = this.getArgument(4)
+  }
+}
+
+/**
+ * A call to `DSA_do_sign` or `DSA_do_verify`
+ */
+class DsaDoSignOrVerify extends SignatureFinalOperation {
+  DsaDoSignOrVerify() { this.getTarget().getName() in ["DSA_do_sign", "DSA_do_verify"] }
+
+  override DataFlow::Node getInput(IOType type) {
+    result.asIndirectExpr() = this.getArgument(0) and type = PlaintextIO()
+    or
+    result.asExpr() = this.getArgument(1) and type = PlaintextSizeIO()
+    or
+    this.getTarget().getName() = "DSA_do_sign" and
+    result.asIndirectExpr() = this.getArgument(2) and
+    type = KeyIO()
+    or
+    this.getTarget().getName() = "DSA_do_verify" and
+    result.asIndirectExpr() = this.getArgument(2) and
+    type = SignatureIO()
+    or
+    this.getTarget().getName() = "DSA_do_verify" and
+    result.asIndirectExpr() = this.getArgument(3) and
+    type = KeyIO()
+  }
+
+  override DataFlow::Node getOutput(IOType type) {
+    this.getTarget().getName() = "DSA_do_sign" and
+    result.asIndirectExpr() = this and
+    type = SignatureIO()
+  }
+}
+
+/**
+ * A Call to `EVP_VerifyInit` or `EVP_VerifyInit_ex`
+ * - int EVP_VerifyInit_ex(EVP_MD_CTX *ctx, const EVP_MD *type, ENGINE *impl);
+ * - int EVP_VerifyInit(EVP_MD_CTX *ctx, const EVP_MD *type);
+ */
+class EVP_VerifyInitCall extends OperationStep {
+  EVP_VerifyInitCall() { this.getTarget().getName() in ["EVP_VerifyInit", "EVP_VerifyInit_ex"] }
+
+  override DataFlow::Node getInput(IOType type) {
+    result.asIndirectExpr() = this.getArgument(0) and type = ContextIO()
+    or
+    result.asIndirectExpr() = this.getArgument(1) and type = HashAlgorithmIO()
+  }
+
+  override DataFlow::Node getOutput(IOType type) {
+    result.asDefiningArgument() = this.getArgument(0) and type = ContextIO()
+  }
+
+  override OperationStepType getStepType() { result = InitializerStep() }
+}
+
+/**
+ * A call to `EVP_VerifyUpdate`
+ * - int EVP_VerifyUpdate(EVP_MD_CTX *ctx, const void *d, unsigned int cnt);
+ */
+class EVP_VerifyUpdateCall extends OperationStep {
+  EVP_VerifyUpdateCall() { this.getTarget().getName() = "EVP_VerifyUpdate" }
+
+  override DataFlow::Node getInput(IOType type) {
+    result.asIndirectExpr() = this.getArgument(0) and type = ContextIO()
+    or
+    result.asIndirectExpr() = this.getArgument(1) and type = PlaintextIO()
+    or
+    result.asIndirectExpr() = this.getArgument(2) and type = PlaintextSizeIO()
+  }
+
+  override DataFlow::Node getOutput(IOType type) {
+    result.asDefiningArgument() = this.getArgument(0) and type = ContextIO()
+  }
+
+  override OperationStepType getStepType() { result = UpdateStep() }
+}
+
+/**
+ * A call to `EVP_VerifyFinal` or `EVP_VerifyFinal_ex`
+ * - int EVP_VerifyFinal_ex(EVP_MD_CTX *ctx, const unsigned char *sigbuf,
+ *                       unsigned int siglen, EVP_PKEY *pkey,
+ *                       OSSL_LIB_CTX *libctx, const char *propq);
+ *- int EVP_VerifyFinal(EVP_MD_CTX *ctx, unsigned char *sigbuf, unsigned int siglen,
+ *                    EVP_PKEY *pkey);                       *
+ */
+class EVP_VerifyFinalCall extends SignatureFinalOperation {
+  EVP_VerifyFinalCall() { this.getTarget().getName() in ["EVP_VerifyFinal", "EVP_VerifyFinal_ex"] }
+
+  override DataFlow::Node getInput(IOType type) {
+    result.asIndirectExpr() = this.getArgument(0) and type = ContextIO()
+    or
+    result.asIndirectExpr() = this.getArgument(1) and type = SignatureIO()
+    or
+    result.asExpr() = this.getArgument(2) and type = SignatureSizeIO()
+    or
+    result.asIndirectExpr() = this.getArgument(3) and type = KeyIO()
+    or
+    result.asIndirectExpr() = this.getArgument(4) and type = OsslLibContextIO()
+    // TODO: arg 5 propq?
+  }
+
+  override DataFlow::Node getOutput(IOType type) {
+    result.asDefiningArgument() = this.getArgument(0) and type = ContextIO()
+  }
+
+  override OperationStepType getStepType() { result = FinalStep() }
+}
+
+/**
+ * An instance of a signature operation.
+ * This is an OpenSSL specific class that extends the base SignatureOperationInstance.
+ */
+class OpenSslSignatureOperationInstance extends Crypto::SignatureOperationInstance instanceof SignatureFinalOperation
 {
   override Crypto::AlgorithmValueConsumer getAnAlgorithmValueConsumer() {
     super.getPrimaryAlgorithmValueConsumer() = result
@@ -217,7 +649,7 @@ class EvpSignatureOperationInstance extends Crypto::SignatureOperationInstance i
    * Signing, verification or unknown.
    */
   override Crypto::KeyOperationSubtype getKeyOperationSubtype() {
-    // TODO: if this KeyOperationSubtype does not match initialization call's KeyOperationSubtype then we found a bug
+    // NOTE: if this KeyOperationSubtype does not match initialization call's KeyOperationSubtype then we found a bug
     if super.getTarget().getName().toLowerCase().matches("%sign%")
     then result instanceof Crypto::TSignMode
     else
@@ -227,14 +659,70 @@ class EvpSignatureOperationInstance extends Crypto::SignatureOperationInstance i
   }
 
   override Crypto::ConsumerInputDataFlowNode getNonceConsumer() {
-    // TODO: some signing operations may have explicit nonce generators
-    none()
+    // some signing operations may have explicit nonce generators
+    super.getDominatingInitializersToStep(IVorNonceIO()).getInput(IVorNonceIO()) = result
+  }
+
+  override Crypto::ConsumerInputDataFlowNode getKeyConsumer() {
+    super.getDominatingInitializersToStep(KeyIO()).getInput(KeyIO()) = result
+  }
+
+  override Crypto::ConsumerInputDataFlowNode getSignatureConsumer() {
+    super.getDominatingInitializersToStep(SignatureIO()).getInput(SignatureIO()) = result
+  }
+
+  override Crypto::ArtifactOutputDataFlowNode getOutputArtifact() {
+    super.getOutputStepFlowingToStep(SignatureIO()).getOutput(SignatureIO()) = result
+  }
+
+  override Crypto::ConsumerInputDataFlowNode getInputConsumer() {
+    super.getDominatingInitializersToStep(PlaintextIO()).getInput(PlaintextIO()) = result
+  }
+
+  override Crypto::AlgorithmValueConsumer getHashAlgorithmValueConsumer() {
+    super
+        .getDominatingInitializersToStep(HashAlgorithmIO())
+        .getAlgorithmValueConsumerForInput(HashAlgorithmIO()) = result
+    or
+    // Handle cases where the hash is set through the primary algorithm
+    // RSA-SHA256 for example
+    // NOTE: assuming the hash would not be overridden, or if it is it is undefined
+    // i.e., if the above dominating initializer exists and the primary algorithm
+    // specifies a hash, consider both valid hash AVCs.
+    // TODO: can this behavior be build into the get dominating initializers?
+    super.getPrimaryAlgorithmValueConsumer() = result and
+    exists(OpenSslAlgorithmInstance i |
+      i.getAvc() = result and i instanceof Crypto::HashAlgorithmInstance
+    )
+  }
+
+  override predicate hasHashAlgorithmConsumer() {
+    exists(super.getDominatingInitializersToStep(HashAlgorithmIO()))
+  }
+}
+
+/**
+ * A class for signature or MAC operation instances.
+ * This is an OpenSSL specific class that extends the base SignatureOrMacOperationInstance.
+ */
+class OpenSslSignatureOrMacOperationInstance extends Crypto::SignatureOrMacOperationInstance instanceof SignatureOrMacFinalOperation
+{
+  override Crypto::AlgorithmValueConsumer getAnAlgorithmValueConsumer() {
+    super.getPrimaryAlgorithmValueConsumer() = result
   }
 
   /**
-   * Keys provided in the initialization call or in a context are found by this method.
-   * Keys in explicit arguments are found by overridden methods in extending classes.
+   * Signing, verification or unknown.
    */
+  override Crypto::KeyOperationSubtype getKeyOperationSubtype() {
+    result instanceof Crypto::TSignMode or result instanceof Crypto::TMacMode
+  }
+
+  override Crypto::ConsumerInputDataFlowNode getNonceConsumer() {
+    // some signing operations may have explicit nonce generators
+    super.getDominatingInitializersToStep(IVorNonceIO()).getInput(IVorNonceIO()) = result
+  }
+
   override Crypto::ConsumerInputDataFlowNode getKeyConsumer() {
     super.getDominatingInitializersToStep(KeyIO()).getInput(KeyIO()) = result
   }
@@ -247,14 +735,24 @@ class EvpSignatureOperationInstance extends Crypto::SignatureOperationInstance i
     super.getDominatingInitializersToStep(PlaintextIO()).getInput(PlaintextIO()) = result
   }
 
-  /**
-   * TODO: only signing operations for now, change when verificaiton is added
-   */
-  override Crypto::ConsumerInputDataFlowNode getSignatureConsumer() { none() }
-
   override Crypto::AlgorithmValueConsumer getHashAlgorithmValueConsumer() {
     super
         .getDominatingInitializersToStep(HashAlgorithmIO())
         .getAlgorithmValueConsumerForInput(HashAlgorithmIO()) = result
+    or
+    // Handle cases where the hash is set through the primary algorithm
+    // RSA-SHA256 for example
+    // NOTE: assuming the hash would not be overridden, or if it is it is undefined
+    // i.e., if the above dominating initializer exists and the primary algorithm
+    // specifies a hash, consider both valid hash AVCs.
+    // TODO: can this behavior be build into the get dominating initializers?
+    super.getPrimaryAlgorithmValueConsumer() = result and
+    exists(OpenSslAlgorithmInstance i |
+      i.getAvc() = result and i instanceof Crypto::HashAlgorithmInstance
+    )
+  }
+
+  override predicate hasHashAlgorithmConsumer() {
+    exists(super.getDominatingInitializersToStep(HashAlgorithmIO()))
   }
 }
diff --git a/cpp/ql/lib/experimental/semmle/code/cpp/rangeanalysis/RangeAnalysis.qll b/cpp/ql/lib/experimental/semmle/code/cpp/rangeanalysis/RangeAnalysis.qll
index e5de44b396d..093d03ee002 100644
--- a/cpp/ql/lib/experimental/semmle/code/cpp/rangeanalysis/RangeAnalysis.qll
+++ b/cpp/ql/lib/experimental/semmle/code/cpp/rangeanalysis/RangeAnalysis.qll
@@ -298,10 +298,11 @@ private predicate boundFlowStep(Instruction i, NonPhiOperand op, int delta, bool
       else
         if strictlyNegative(x)
         then upper = true and delta = -1
-        else
-          if negative(x)
-          then upper = true and delta = 0
-          else none()
+        else (
+          negative(x) and
+          upper = true and
+          delta = 0
+        )
   )
   or
   exists(Operand x |
@@ -321,10 +322,11 @@ private predicate boundFlowStep(Instruction i, NonPhiOperand op, int delta, bool
       else
         if strictlyNegative(x)
         then upper = false and delta = 1
-        else
-          if negative(x)
-          then upper = false and delta = 0
-          else none()
+        else (
+          negative(x) and
+          upper = false and
+          delta = 0
+        )
   )
   or
   i.(RemInstruction).getRightOperand() = op and positive(op) and delta = -1 and upper = true
@@ -410,7 +412,7 @@ private predicate boundFlowStepPhi(
   or
   exists(IRGuardCondition guard, boolean testIsTrue |
     guard = boundFlowCond(valueNumberOfOperand(op2), op1, delta, upper, testIsTrue) and
-    guard.controlsEdge(op2.getPredecessorBlock(), op2.getUse().getBlock(), testIsTrue) and
+    guard.controlsBranchEdge(op2.getPredecessorBlock(), op2.getUse().getBlock(), testIsTrue) and
     reason = TCondReason(guard)
   )
 }
diff --git a/cpp/ql/lib/ext/ComPtr.model.yml b/cpp/ql/lib/ext/ComPtr.model.yml
new file mode 100644
index 00000000000..49be2c49a4b
--- /dev/null
+++ b/cpp/ql/lib/ext/ComPtr.model.yml
@@ -0,0 +1,31 @@
+extensions:
+  - addsTo:
+      pack: codeql/cpp-all
+      extensible: summaryModel
+    data: # namespace, type, subtypes, name, signature, ext, input, output, kind, provenance
+      - ["Microsoft::WRL", "ComPtr", True, "ComPtr<T>", "(T *)", "", "Argument[*@0]", "Argument[-1].Element[@]", "value", "manual"]
+      - ["Microsoft::WRL", "ComPtr", True, "ComPtr", "(const ComPtr &)", "", "Argument[*0].Element[@]", "Argument[-1].Element[@]", "value", "manual"]
+      - ["Microsoft::WRL", "ComPtr", True, "ComPtr", "(ComPtr &&)", "", "Argument[*0].Element[@]", "Argument[-1].Element[@]", "value", "manual"]
+      - ["Microsoft::WRL", "ComPtr", True, "As", "", "", "Argument[-1]", "Argument[*0]", "value", "manual"]
+      - ["Microsoft::WRL", "ComPtr", True, "AsIID", "", "", "Argument[-1]", "Argument[*1]", "value", "manual"]
+      - ["Microsoft::WRL", "ComPtr", True, "AsWeak", "", "", "Argument[-1]", "Argument[*0]", "value", "manual"]
+      - ["Microsoft::WRL", "ComPtr", True, "Attach", "", "", "Argument[*@0]", "Argument[-1].Element[@]", "value", "manual"]
+      - ["Microsoft::WRL", "ComPtr<T>", True, "CopyTo", "(T **)", "", "Argument[-1].Element[@]", "Argument[**@0]", "value", "manual"]
+      - ["Microsoft::WRL", "ComPtr", True, "CopyTo<T>", "(T **)", "", "Argument[-1].Element[@]", "Argument[**@0]", "value", "manual"]
+      - ["Microsoft::WRL", "ComPtr", True, "CopyTo", "(REFIID,void **)", "", "Argument[-1].Element[@]", "Argument[**@1]", "value", "manual"]
+      - ["Microsoft::WRL", "ComPtr", True, "Detach", "", "", "Argument[-1].Element[@]", "ReturnValue[*@]", "value", "manual"]
+      - ["Microsoft::WRL", "ComPtr", True, "Get", "", "", "Argument[-1].Element[@]", "ReturnValue[*@]", "value", "manual"]
+      - ["Microsoft::WRL", "ComPtr", True, "GetAddressOf", "", "", "Argument[-1].Element[@]", "ReturnValue[**@]", "value", "manual"]
+      - ["Microsoft::WRL", "ComPtr", True, "ReleaseAndGetAddressOf", "", "", "Argument[-1].Element[@]", "ReturnValue[**@]", "value", "manual"]
+      - ["Microsoft::WRL", "ComPtr", True, "Swap", "", "", "Argument[-1]", "Argument[*0]", "value", "manual"]
+      - ["Microsoft::WRL", "ComPtr", True, "Swap", "", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
+      - ["Microsoft::WRL", "ComPtr", True, "operator&", "", "", "Argument[-1]", "ReturnValue.Element", "value", "manual"]
+      - ["Microsoft::WRL", "ComPtr", True, "operator->", "", "", "Argument[-1].Element[@]", "ReturnValue[*@]", "value", "manual"]
+      - ["Microsoft::WRL", "ComPtr<T>", True, "operator=", "(T *)", "", "Argument[*@0]", "Argument[-1].Element[@]", "value", "manual"]
+      - ["Microsoft::WRL", "ComPtr<T>", True, "operator=", "(T *)", "", "Argument[*@0]", "ReturnValue[*].Element[@]", "value", "manual"]
+      - ["Microsoft::WRL", "ComPtr", True, "operator=<U>", "(U *)", "", "Argument[*@0]", "Argument[-1].Element[@]", "value", "manual"]
+      - ["Microsoft::WRL", "ComPtr", True, "operator=<U>", "(U *)", "", "Argument[*@0]", "ReturnValue[*].Element[@]", "value", "manual"]
+      - ["Microsoft::WRL", "ComPtr", True, "operator=", "(const ComPtr &)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
+      - ["Microsoft::WRL", "ComPtr", True, "operator=", "(const ComPtr &)", "", "Argument[*0]", "ReturnValue[*]", "value", "manual"]
+      - ["Microsoft::WRL", "ComPtr", True, "operator=", "(ComPtr &&)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
+      - ["Microsoft::WRL", "ComPtr", True, "operator=", "(ComPtr &&)", "", "Argument[*0]", "ReturnValue[*]", "value", "manual"]
diff --git a/cpp/ql/lib/ext/ComPtrRef.model.yml b/cpp/ql/lib/ext/ComPtrRef.model.yml
new file mode 100644
index 00000000000..710d9e6def3
--- /dev/null
+++ b/cpp/ql/lib/ext/ComPtrRef.model.yml
@@ -0,0 +1,12 @@
+extensions:
+  - addsTo:
+      pack: codeql/cpp-all
+      extensible: summaryModel
+    data: # namespace, type, subtypes, name, signature, ext, input, output, kind, provenance
+      - ["Microsoft::WRL::Details", "ComPtrRef", True, "ComPtrRef", "", "", "Argument[*0]", "Argument[-1].Element[@]", "value", "manual"]
+      - ["Microsoft::WRL::Details", "ComPtrRef", True, "GetAddressOf", "", "", "Argument[-1].Element[@]", "ReturnValue[*@]", "value", "manual"]
+      # TODO: We cannot yet model https://learn.microsoft.com/en-us/cpp/cppcx/wrl/comptrref-class?view=msvc-170#operator-interfacetype-star-star
+      - ["Microsoft::WRL::Details", "ComPtrRef", True, "operator*", "", "", "Argument[-1].Element[@]", "ReturnValue[*@]", "value", "manual"]
+      # TODO: We cannot yet model https://learn.microsoft.com/en-us/cpp/cppcx/wrl/comptrref-class?view=msvc-170#operator-t-star
+      - ["Microsoft::WRL::Details", "ComPtrRef", True, "operator void**", "", "", "Argument[-1].Element[@]", "ReturnValue[**@]", "value", "manual"]
+      - ["Microsoft::WRL::Details", "ComPtrRef", True, "ReleaseAndGetAddressOf", "", "", "Argument[-1].Element[@]", "ReturnValue[**@]", "value", "manual"]
\ No newline at end of file
diff --git a/cpp/ql/lib/ext/cctype.model.yml b/cpp/ql/lib/ext/cctype.model.yml
new file mode 100644
index 00000000000..d5fa3861c05
--- /dev/null
+++ b/cpp/ql/lib/ext/cctype.model.yml
@@ -0,0 +1,9 @@
+extensions:
+  - addsTo:
+      pack: codeql/cpp-all
+      extensible: summaryModel
+    data: # namespace, type, subtypes, name, signature, ext, input, output, kind, provenance
+      - ["", "", False, "tolower", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["std", "", False, "tolower", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["", "", False, "toupper", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["std", "", False, "toupper", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
\ No newline at end of file
diff --git a/cpp/ql/lib/ext/iconv.model.yml b/cpp/ql/lib/ext/iconv.model.yml
new file mode 100644
index 00000000000..8db5a65841b
--- /dev/null
+++ b/cpp/ql/lib/ext/iconv.model.yml
@@ -0,0 +1,7 @@
+extensions:
+  - addsTo:
+      pack: codeql/cpp-all
+      extensible: summaryModel
+    data: # namespace, type, subtypes, name, signature, ext, input, output, kind, provenance
+      - ["", "", False, "iconv", "", "", "Argument[**1]", "Argument[**3]", "value", "manual"]
+      
\ No newline at end of file
diff --git a/cpp/ql/lib/qlpack.yml b/cpp/ql/lib/qlpack.yml
index 7c1fb8aad1c..8b211353323 100644
--- a/cpp/ql/lib/qlpack.yml
+++ b/cpp/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cpp-all
-version: 5.4.1-dev
+version: 6.0.2-dev
 groups: cpp
 dbscheme: semmlecode.cpp.dbscheme
 extractor: cpp
diff --git a/cpp/ql/lib/semmle/code/cpp/Concept.qll b/cpp/ql/lib/semmle/code/cpp/Concept.qll
index 1770c1965ed..6e66bca9823 100644
--- a/cpp/ql/lib/semmle/code/cpp/Concept.qll
+++ b/cpp/ql/lib/semmle/code/cpp/Concept.qll
@@ -198,7 +198,7 @@ class ConceptIdExpr extends Expr, @concept_id {
   final Locatable getATemplateArgumentKind() { result = this.getTemplateArgumentKind(_) }
 
   /**
-   * Gets the `i`th template argument passed to the concept.
+   * Gets template argument at index `index` passed to the concept, if any.
    *
    * For example, if:
    * ```cpp
@@ -219,7 +219,7 @@ class ConceptIdExpr extends Expr, @concept_id {
   }
 
   /**
-   * Gets the kind of the `i`th template argument value passed to the concept.
+   * Gets the kind of the template argument value at index `index` passed to the concept, if any.
    *
    * For example, if:
    * ```cpp
diff --git a/cpp/ql/lib/semmle/code/cpp/Declaration.qll b/cpp/ql/lib/semmle/code/cpp/Declaration.qll
index cedacca4dfe..6f791234b63 100644
--- a/cpp/ql/lib/semmle/code/cpp/Declaration.qll
+++ b/cpp/ql/lib/semmle/code/cpp/Declaration.qll
@@ -223,8 +223,8 @@ class Declaration extends Locatable, @declaration {
   final Locatable getATemplateArgumentKind() { result = this.getTemplateArgumentKind(_) }
 
   /**
-   * Gets the `i`th template argument used to instantiate this declaration from a
-   * template.
+   * Gets the template argument at index `index` used to instantiate this declaration from a
+   * template, if any.
    *
    * For example:
    *
@@ -245,9 +245,9 @@ class Declaration extends Locatable, @declaration {
   }
 
   /**
-   * Gets the `i`th template argument value used to instantiate this declaration
-   * from a template. When called on a template, this will return the `i`th template
-   * parameter value if it exists.
+   * Gets the template argument value at index `index` used to instantiate this declaration
+   * from a template. When called on a template, this will return the template
+   * parameter value at index `index` if it exists.
    *
    * For example:
    *
diff --git a/cpp/ql/lib/semmle/code/cpp/Element.qll b/cpp/ql/lib/semmle/code/cpp/Element.qll
index 1cf75aa8a84..b30503d2c94 100644
--- a/cpp/ql/lib/semmle/code/cpp/Element.qll
+++ b/cpp/ql/lib/semmle/code/cpp/Element.qll
@@ -87,6 +87,7 @@ class ElementBase extends @element {
  */
 class Element extends ElementBase {
   /** Gets the primary file where this element occurs. */
+  pragma[nomagic]
   File getFile() { result = this.getLocation().getFile() }
 
   /**
diff --git a/cpp/ql/lib/semmle/code/cpp/NameQualifiers.qll b/cpp/ql/lib/semmle/code/cpp/NameQualifiers.qll
index 12434f17f01..2efca72d098 100644
--- a/cpp/ql/lib/semmle/code/cpp/NameQualifiers.qll
+++ b/cpp/ql/lib/semmle/code/cpp/NameQualifiers.qll
@@ -144,14 +144,14 @@ class NameQualifiableElement extends Element, @namequalifiableelement {
 class NameQualifyingElement extends Element, @namequalifyingelement {
   /**
    * Gets a name qualifier for which this is the qualifying namespace or
-   * user-defined type. For example: class `X` is the
+   * user-defined type, or decltype. For example: class `X` is the
    * `NameQualifyingElement` and `X::` is the `NameQualifier`.
    */
   NameQualifier getANameQualifier() {
     namequalifiers(unresolveElement(result), _, underlyingElement(this), _)
   }
 
-  /** Gets the name of this namespace or user-defined type. */
+  /** Gets the name of this namespace, user-defined type, or decltype. */
   string getName() { none() }
 }
 
diff --git a/cpp/ql/lib/semmle/code/cpp/PchFile.qll b/cpp/ql/lib/semmle/code/cpp/PchFile.qll
new file mode 100644
index 00000000000..6522edf6593
--- /dev/null
+++ b/cpp/ql/lib/semmle/code/cpp/PchFile.qll
@@ -0,0 +1,26 @@
+/**
+ * Provides the `PchFile` class representing precompiled header (PCH) files created and
+ * used during the build process.
+ */
+
+import semmle.code.cpp.File
+
+/**
+ * A precompiled header (PCH) file created during the build process.
+ */
+class PchFile extends @pch {
+  /**
+   *  Gets a textual representation of this element.
+   */
+  string toString() { result = "PCH for " + this.getHeaderFile() }
+
+  /**
+   * Gets the header file from which the PCH file was created.
+   */
+  File getHeaderFile() { pch_creations(this, _, result) }
+
+  /**
+   * Gets a source file that includes the PCH.
+   */
+  File getAUse() { pch_uses(this, _, result) }
+}
diff --git a/cpp/ql/lib/semmle/code/cpp/Type.qll b/cpp/ql/lib/semmle/code/cpp/Type.qll
index 35b56882d7b..d9a61865c96 100644
--- a/cpp/ql/lib/semmle/code/cpp/Type.qll
+++ b/cpp/ql/lib/semmle/code/cpp/Type.qll
@@ -1146,7 +1146,7 @@ class DerivedType extends Type, @derivedtype {
  * decltype(a) b;
  * ```
  */
-class Decltype extends Type {
+class Decltype extends Type, NameQualifyingElement {
   Decltype() { decltypes(underlyingElement(this), _, 0, _, _) }
 
   override string getAPrimaryQlClass() { result = "Decltype" }
@@ -1187,7 +1187,7 @@ class Decltype extends Type {
 
   override string toString() { result = "decltype(...)" }
 
-  override string getName() { none() }
+  override string getName() { result = "decltype(...)" }
 
   override int getSize() { result = this.getBaseType().getSize() }
 
@@ -1247,7 +1247,7 @@ class TypeofType extends Type {
 
   override string toString() { result = "typeof(...)" }
 
-  override string getName() { none() }
+  override string getName() { result = "typeof(...)" }
 
   override int getSize() { result = this.getBaseType().getSize() }
 
@@ -1311,8 +1311,6 @@ class TypeofTypeType extends TypeofType {
   Type getType() { type_operators(underlyingElement(this), unresolveElement(result), _, _) }
 
   override string getAPrimaryQlClass() { result = "TypeofTypeType" }
-
-  override string toString() { result = "typeof(...)" }
 }
 
 /**
@@ -1394,7 +1392,7 @@ class IntrinsicTransformedType extends Type {
 
   override Type resolveTypedefs() { result = this.getBaseType().resolveTypedefs() }
 
-  override string getName() { none() }
+  override string getName() { result = this.getIntrinsicName() + "(...)" }
 
   override int getSize() { result = this.getBaseType().getSize() }
 
diff --git a/cpp/ql/lib/semmle/code/cpp/commons/Printf.qll b/cpp/ql/lib/semmle/code/cpp/commons/Printf.qll
index 51d2e294b36..023ce09c5c1 100644
--- a/cpp/ql/lib/semmle/code/cpp/commons/Printf.qll
+++ b/cpp/ql/lib/semmle/code/cpp/commons/Printf.qll
@@ -877,7 +877,7 @@ class FormatLiteral extends Literal instanceof StringLiteral {
   }
 
   /**
-   * Gets the char type required by the nth conversion specifier.
+   * Gets the char type required by the `n`th conversion specifier.
    *  - in the base case this is the default for the formatting function
    *    (e.g. `char` for `printf`, `char` or `wchar_t` for `wprintf`).
    *  - the `%C` format character reverses wideness.
@@ -922,7 +922,7 @@ class FormatLiteral extends Literal instanceof StringLiteral {
   }
 
   /**
-   * Gets the string type required by the nth conversion specifier.
+   * Gets the string type required by the `n`th conversion specifier.
    *  - in the base case this is the default for the formatting function
    *    (e.g. `char *` for `printf`, `char *` or `wchar_t *` for `wprintf`).
    *  - the `%S` format character reverses wideness on some platforms.
diff --git a/cpp/ql/lib/semmle/code/cpp/controlflow/Dominance.qll b/cpp/ql/lib/semmle/code/cpp/controlflow/Dominance.qll
index 424e615f3ea..a8a4b867ba6 100644
--- a/cpp/ql/lib/semmle/code/cpp/controlflow/Dominance.qll
+++ b/cpp/ql/lib/semmle/code/cpp/controlflow/Dominance.qll
@@ -101,7 +101,7 @@ predicate postDominates(ControlFlowNode postDominator, ControlFlowNode node) {
  */
 
 /**
- * Holds if `dominator` is an immediate dominator of `node` in the control-flow
+ * Holds if `dom` is an immediate dominator of `node` in the control-flow
  * graph of basic blocks.
  */
 predicate bbIDominates(BasicBlock dom, BasicBlock node) =
@@ -117,7 +117,7 @@ private predicate bb_predecessor(BasicBlock succ, BasicBlock pred) { bb_successo
 private predicate bb_exit(ExitBasicBlock exit) { any() }
 
 /**
- * Holds if `postDominator` is an immediate post-dominator of `node` in the control-flow
+ * Holds if `pDom` is an immediate post-dominator of `node` in the control-flow
  * graph of basic blocks.
  */
 predicate bbIPostDominates(BasicBlock pDom, BasicBlock node) =
diff --git a/cpp/ql/lib/semmle/code/cpp/controlflow/IRGuards.qll b/cpp/ql/lib/semmle/code/cpp/controlflow/IRGuards.qll
index 533df517af5..d5287494df9 100644
--- a/cpp/ql/lib/semmle/code/cpp/controlflow/IRGuards.qll
+++ b/cpp/ql/lib/semmle/code/cpp/controlflow/IRGuards.qll
@@ -3,12 +3,438 @@
  * flow elements controlled by those guards.
  */
 
-import cpp
+import cpp as Cpp
 import semmle.code.cpp.ir.IR
+private import codeql.util.Void
+private import codeql.controlflow.Guards as SharedGuards
 private import semmle.code.cpp.ir.ValueNumbering
 private import semmle.code.cpp.ir.implementation.raw.internal.TranslatedExpr
 private import semmle.code.cpp.ir.implementation.raw.internal.InstructionTag
 
+private class BasicBlock = IRCfg::BasicBlock;
+
+/**
+ * INTERNAL: Do not use.
+ */
+module GuardsInput implements SharedGuards::InputSig<Cpp::Location, Instruction, IRCfg::BasicBlock> {
+  private import cpp as Cpp
+
+  class NormalExitNode = ExitFunctionInstruction;
+
+  class AstNode = Instruction;
+
+  /** The `Guards` library uses `Instruction`s as expressions. */
+  class Expr extends Instruction {
+    Instruction getControlFlowNode() { result = this }
+
+    IRCfg::BasicBlock getBasicBlock() { result = this.getBlock() }
+  }
+
+  /**
+   * The constant values that can be inferred.
+   */
+  class ConstantValue = Void;
+
+  private class EqualityExpr extends CompareInstruction {
+    EqualityExpr() {
+      this instanceof CompareEQInstruction
+      or
+      this instanceof CompareNEInstruction
+    }
+
+    boolean getPolarity() {
+      result = true and
+      this instanceof CompareEQInstruction
+      or
+      result = false and
+      this instanceof CompareNEInstruction
+    }
+  }
+
+  /** A constant expression. */
+  abstract class ConstantExpr extends Expr {
+    /** Holds if this expression is the null constant. */
+    predicate isNull() { none() }
+
+    /** Holds if this expression is a boolean constant. */
+    boolean asBooleanValue() { none() }
+
+    /** Holds if this expression is an integer constant. */
+    int asIntegerValue() { none() }
+
+    /**
+     * Holds if this expression is a C/C++ specific constant value.
+     * This currently never holds in C/C++.
+     */
+    ConstantValue asConstantValue() { none() }
+  }
+
+  private class NullConstant extends ConstantExpr instanceof ConstantInstruction {
+    NullConstant() {
+      this.getValue() = "0" and
+      this.getResultIRType() instanceof IRAddressType
+    }
+
+    override predicate isNull() { any() }
+  }
+
+  private class BooleanConstant extends ConstantExpr instanceof ConstantInstruction {
+    BooleanConstant() { this.getResultIRType() instanceof IRBooleanType }
+
+    override boolean asBooleanValue() {
+      super.getValue() = "0" and
+      result = false
+      or
+      super.getValue() = "1" and
+      result = true
+    }
+  }
+
+  private class IntegerConstant extends ConstantExpr {
+    int value;
+
+    IntegerConstant() {
+      this.(ConstantInstruction).getValue().toInt() = value and
+      this.getResultIRType() instanceof IRIntegerType
+      or
+      // In order to have an integer constant for a switch case
+      // we misuse the first instruction (which is always a NoOp instruction)
+      // as a constant with the switch case's value.
+      // Even worse, since we need a case range to generate an `TIntRange`
+      // guard value we must ensure that there exists `ConstantExpr`s whose
+      // integer value is the end-points. So we let this constant expression
+      // have both end-point values. Luckily, these `NoOp` instructions do not
+      // interact with SSA in any way. So this should not break anything.
+      exists(CaseEdge edge | this = any(SwitchInstruction switch).getSuccessor(edge) |
+        value = edge.getMaxValue().toInt()
+        or
+        value = edge.getMinValue().toInt()
+      )
+    }
+
+    override int asIntegerValue() { result = value }
+  }
+
+  private predicate nonNullExpr(Instruction i) {
+    i instanceof VariableAddressInstruction
+    or
+    i.(PointerConstantInstruction).getValue() != "0"
+    or
+    i instanceof TypeidInstruction
+    or
+    nonNullExpr(i.(FieldAddressInstruction).getObjectAddress())
+    or
+    nonNullExpr(i.(PointerAddInstruction).getLeft())
+    or
+    nonNullExpr(i.(CopyInstruction).getSourceValue())
+    or
+    nonNullExpr(i.(ConvertInstruction).getUnary())
+    or
+    nonNullExpr(i.(CheckedConvertOrThrowInstruction).getUnary())
+    or
+    nonNullExpr(i.(CompleteObjectAddressInstruction).getUnary())
+    or
+    nonNullExpr(i.(InheritanceConversionInstruction).getUnary())
+    or
+    nonNullExpr(i.(BitOrInstruction).getAnInput())
+  }
+
+  /**
+   * An expression that is guaranteed to not be `null`.
+   */
+  class NonNullExpr extends Expr {
+    NonNullExpr() { nonNullExpr(this) }
+  }
+
+  /** A `case` in a `switch` instruction. */
+  class Case extends Expr {
+    SwitchInstruction switch;
+    SwitchEdge edge;
+
+    Case() { switch.getSuccessor(edge) = this }
+
+    /**
+     * Gets the edge for which control flows from the `Switch` instruction to
+     * the target case.
+     */
+    SwitchEdge getEdge() { result = edge }
+
+    /**
+     * Holds if this case takes control-flow from `bb1` to `bb2` when
+     * the case matches the scrutinee.
+     */
+    predicate matchEdge(BasicBlock bb1, BasicBlock bb2) {
+      switch.getBlock() = bb1 and
+      this.getBasicBlock() = bb2
+    }
+
+    /**
+     * Holds if case takes control-flow from `bb1` to `bb2` when the
+     * case does not match the scrutinee.
+     *
+     * This predicate never holds for C/C++.
+     */
+    predicate nonMatchEdge(BasicBlock bb1, BasicBlock bb2) { none() }
+
+    /**
+     * Gets the scrutinee expression.
+     */
+    Expr getSwitchExpr() { result = switch.getExpression() }
+
+    /**
+     * Holds if this case is the default case.
+     */
+    predicate isDefaultCase() { edge.isDefault() }
+
+    /**
+     * Gets the constant expression of this case.
+     */
+    ConstantExpr asConstantCase() {
+      // Note: This only has a value if there is a unique value for the case.
+      // So the will not be a result when using the GCC case range extension.
+      // Instead, we model these using the `LogicInput_v1::rangeGuard` predicate.
+      result = this and exists(this.getEdge().getValue())
+    }
+  }
+
+  abstract private class BinExpr extends Expr instanceof BinaryInstruction {
+    Expr getAnOperand() { result = super.getAnInput() }
+  }
+
+  /**
+   * A bitwise "AND" expression.
+   *
+   * This does not include logical AND expressions since these are desugared as
+   * part of IR generation.
+   */
+  class AndExpr extends BinExpr instanceof BitAndInstruction { }
+
+  /**
+   * A bitwise "OR" expression.
+   *
+   * This does not include logical OR expressions since these are desugared as
+   * part of IR generation.
+   */
+  class OrExpr extends BinExpr instanceof BitOrInstruction { }
+
+  /** A (bitwise or logical) "NOT" expression. */
+  class NotExpr extends Expr instanceof UnaryInstruction {
+    NotExpr() {
+      this instanceof LogicalNotInstruction
+      or
+      this instanceof BitComplementInstruction
+    }
+
+    /** Gets the operand of this expression. */
+    Expr getOperand() { result = super.getUnary() }
+  }
+
+  private predicate isBoolToIntConversion(ConvertInstruction convert, Instruction unary) {
+    convert.getUnary() = unary and
+    unary.getResultIRType() instanceof IRBooleanType and
+    convert.getResultIRType() instanceof IRIntegerType
+  }
+
+  /**
+   * A value preserving expression.
+   */
+  class IdExpr extends Expr {
+    IdExpr() {
+      this instanceof CopyInstruction
+      or
+      not isBoolToIntConversion(this, _) and
+      this instanceof ConvertInstruction
+      or
+      this instanceof InheritanceConversionInstruction
+    }
+
+    /** Get the child expression that defines the value of this expression. */
+    Expr getEqualChildExpr() {
+      result = this.(CopyInstruction).getSourceValue()
+      or
+      result = this.(ConvertInstruction).getUnary()
+      or
+      result = this.(InheritanceConversionInstruction).getUnary()
+    }
+  }
+
+  /**
+   * Holds if `eqtest` tests the equality (or inequality) of `left` and
+   * `right.`
+   *
+   * If `polarity` is `true` then `eqtest` is an equality test, and otherwise
+   * `eqtest` is an inequality test.
+   */
+  pragma[nomagic]
+  predicate equalityTest(Expr eqtest, Expr left, Expr right, boolean polarity) {
+    exists(EqualityExpr eq | eqtest = eq |
+      eq.getLeft() = left and
+      eq.getRight() = right and
+      polarity = eq.getPolarity()
+    )
+  }
+
+  /**
+   * A conditional expression (i.e., `b ? e1 : e2`). This expression is desugared
+   * as part of IR generation.
+   */
+  class ConditionalExpr extends Expr {
+    ConditionalExpr() { none() }
+
+    /** Gets the condition of this conditional expression. */
+    Expr getCondition() { none() }
+
+    /** Gets the true branch of this conditional expression. */
+    Expr getThen() { none() }
+
+    /** Gets the false branch of this conditional expression. */
+    Expr getElse() { none() }
+  }
+
+  private import semmle.code.cpp.dataflow.new.DataFlow::DataFlow as DataFlow
+  private import semmle.code.cpp.ir.dataflow.internal.DataFlowPrivate as Private
+
+  class Parameter = Cpp::Parameter;
+
+  /**
+   * A (direct) parameter position. The value `-1` represents the position of
+   * the implicit `this` parameter.
+   */
+  private int parameterPosition() { result in [-1, any(Cpp::Parameter p).getIndex()] }
+
+  /** A parameter position represented by an integer. */
+  class ParameterPosition extends int {
+    ParameterPosition() { this = parameterPosition() }
+  }
+
+  /** An argument position represented by an integer. */
+  class ArgumentPosition extends int {
+    ArgumentPosition() { this = parameterPosition() }
+  }
+
+  /** Holds if arguments at position `apos` match parameters at position `ppos`. */
+  overlay[caller?]
+  pragma[inline]
+  predicate parameterMatch(ParameterPosition ppos, ArgumentPosition apos) { ppos = apos }
+
+  final private class FinalMethod = Cpp::Function;
+
+  /**
+   * A non-overridable function.
+   *
+   * This function is non-overridable either because it is not a member function, or
+   * because it is a final member function.
+   */
+  class NonOverridableMethod extends FinalMethod {
+    NonOverridableMethod() {
+      not this instanceof Cpp::MemberFunction
+      or
+      exists(Cpp::MemberFunction mf | this = mf |
+        not mf.isVirtual()
+        or
+        mf.isFinal()
+      )
+    }
+
+    /** Gets the `Parameter` at `pos` of this function, if any. */
+    Parameter getParameter(ParameterPosition ppos) { super.getParameter(ppos) = result }
+
+    /** Gets an expression returned from this function. */
+    GuardsInput::Expr getAReturnExpr() {
+      exists(StoreInstruction store |
+        // A write to the `IRVariable` which represents the return value.
+        store.getDestinationAddress().(VariableAddressInstruction).getIRVariable() instanceof
+          IRReturnVariable and
+        store.getEnclosingFunction() = this and
+        result = store
+      )
+    }
+  }
+
+  private predicate nonOverridableMethodCall(CallInstruction call, NonOverridableMethod m) {
+    call.getStaticCallTarget() = m
+  }
+
+  /**
+   * A call to a `NonOverridableMethod`.
+   */
+  class NonOverridableMethodCall extends GuardsInput::Expr instanceof CallInstruction {
+    NonOverridableMethodCall() { nonOverridableMethodCall(this, _) }
+
+    /** Gets the function that is called. */
+    NonOverridableMethod getMethod() { nonOverridableMethodCall(this, result) }
+
+    /** Gets the argument at `apos`, if any. */
+    GuardsInput::Expr getArgument(ArgumentPosition apos) { result = super.getArgument(apos) }
+  }
+}
+
+private module GuardsImpl = SharedGuards::Make<Cpp::Location, IRCfg, GuardsInput>;
+
+private module LogicInput_v1 implements GuardsImpl::LogicInputSig {
+  private import semmle.code.cpp.dataflow.new.DataFlow::DataFlow::Ssa
+
+  final private class FinalBaseSsaVariable = Definition;
+
+  class SsaDefinition extends FinalBaseSsaVariable {
+    GuardsInput::Expr getARead() { result = this.getAUse().getDef() }
+  }
+
+  class SsaExplicitWrite extends SsaDefinition instanceof ExplicitDefinition {
+    GuardsInput::Expr getValue() { result = super.getAssignedInstruction() }
+  }
+
+  class SsaPhiDefinition extends SsaDefinition instanceof PhiNode {
+    predicate hasInputFromBlock(SsaDefinition inp, BasicBlock bb) {
+      super.hasInputFromBlock(inp, bb)
+    }
+  }
+
+  class SsaParameterInit extends SsaDefinition {
+    SsaParameterInit() { this.isParameterDefinition(_) }
+
+    GuardsInput::Parameter getParameter() { this.isParameterDefinition(result) }
+  }
+
+  predicate additionalImpliesStep(
+    GuardsImpl::PreGuard g1, GuardValue v1, GuardsImpl::PreGuard g2, GuardValue v2
+  ) {
+    // The `ConditionalBranch` instruction is the instruction for which there are
+    // conditional successors out of. However, the condition that controls
+    // which conditional successor is taken is given by the condition of the
+    // `ConditionalBranch` instruction. So this step either needs to be here,
+    // or we need `ConditionalBranch` instructions to be `IdExpr`s. Modeling
+    // them as `IdExpr`s would be a bit weird since the result type is
+    // `IRVoidType`. Including them here is fine as long as `ConditionalBranch`
+    // instructions cannot be assigned to SSA variables (which they cannot
+    // since they produce no value).
+    g1.(ConditionalBranchInstruction).getCondition() = g2 and
+    v1.asBooleanValue() = v2.asBooleanValue()
+  }
+
+  predicate rangeGuard(
+    GuardsImpl::PreGuard guard, GuardValue val, GuardsInput::Expr e, int k, boolean upper
+  ) {
+    exists(SwitchInstruction switch, string minValue, string maxValue |
+      switch.getSuccessor(EdgeKind::caseEdge(minValue, maxValue)) = guard and
+      e = switch.getExpression() and
+      minValue != maxValue and
+      val.asBooleanValue() = true
+    |
+      upper = false and
+      k = minValue.toInt()
+      or
+      upper = true and
+      k = maxValue.toInt()
+    )
+  }
+}
+
+class GuardValue = GuardsImpl::GuardValue;
+
+/** INTERNAL: Don't use. */
+module Guards_v1 = GuardsImpl::Logic<LogicInput_v1>;
+
 /**
  * Holds if `block` consists of an `UnreachedInstruction`.
  *
@@ -21,56 +447,49 @@ private predicate isUnreachedBlock(IRBlock block) {
   block.getFirstInstruction() instanceof UnreachedInstruction
 }
 
-private newtype TAbstractValue =
-  TBooleanValue(boolean b) { b = true or b = false } or
-  TMatchValue(CaseEdge c)
-
 /**
+ * DEPRECATED: Use `GuardValue` instead.
+ *
  * An abstract value. This is either a boolean value, or a `switch` case.
  */
-abstract class AbstractValue extends TAbstractValue {
-  /** Gets an abstract value that represents the dual of this value, if any. */
-  abstract AbstractValue getDualValue();
+deprecated class AbstractValue extends GuardValue { }
 
-  /** Gets a textual representation of this abstract value. */
-  abstract string toString();
-}
+/**
+ * DEPRECATED: Use `GuardValue` instead.
+ *
+ * A Boolean value.
+ */
+deprecated class BooleanValue extends AbstractValue {
+  BooleanValue() { exists(this.asBooleanValue()) }
 
-/** A Boolean value. */
-class BooleanValue extends AbstractValue, TBooleanValue {
   /** Gets the underlying Boolean value. */
-  boolean getValue() { this = TBooleanValue(result) }
-
-  override BooleanValue getDualValue() { result.getValue() = this.getValue().booleanNot() }
-
-  override string toString() { result = this.getValue().toString() }
+  boolean getValue() { result = this.asBooleanValue() }
 }
 
-/** A value that represents a match against a specific `switch` case. */
-class MatchValue extends AbstractValue, TMatchValue {
+/**
+ * DEPRECATED: Use `GuardValue` instead.
+ *
+ * A value that represents a match against a specific `switch` case.
+ */
+deprecated class MatchValue extends AbstractValue {
+  MatchValue() { exists(this.asIntValue()) }
+
   /** Gets the case. */
-  CaseEdge getCase() { this = TMatchValue(result) }
-
-  override MatchValue getDualValue() {
-    // A `MatchValue` has no dual.
-    none()
-  }
-
-  override string toString() { result = this.getCase().toString() }
+  CaseEdge getCase() { result.getValue().toInt() = this.asIntValue() }
 }
 
 /**
  * A Boolean condition in the AST that guards one or more basic blocks. This includes
  * operands of logical operators but not switch statements.
  */
-abstract private class GuardConditionImpl extends Expr {
+private class GuardConditionImpl extends Cpp::Element {
   /**
    * Holds if this condition controls `controlled`, meaning that `controlled` is only
    * entered if the value of this condition is `v`.
    *
    * For details on what "controls" mean, see the QLDoc for `controls`.
    */
-  abstract predicate valueControls(BasicBlock controlled, AbstractValue v);
+  abstract predicate valueControls(Cpp::BasicBlock controlled, GuardValue v);
 
   /**
    * Holds if this condition controls `controlled`, meaning that `controlled` is only
@@ -98,8 +517,22 @@ abstract private class GuardConditionImpl extends Expr {
    * being short-circuited) then it will only control blocks dominated by the
    * true (for `&&`) or false (for `||`) branch.
    */
-  final predicate controls(BasicBlock controlled, boolean testIsTrue) {
-    this.valueControls(controlled, any(BooleanValue bv | bv.getValue() = testIsTrue))
+  final predicate controls(Cpp::BasicBlock controlled, boolean testIsTrue) {
+    this.valueControls(controlled, any(GuardValue bv | bv.asBooleanValue() = testIsTrue))
+  }
+
+  /**
+   * Holds if the control-flow edge `(pred, succ)` may be taken only if
+   * the value of this condition is `v`.
+   */
+  abstract predicate valueControlsEdge(Cpp::BasicBlock pred, Cpp::BasicBlock succ, GuardValue v);
+
+  /**
+   * Holds if  the control-flow edge `(pred, succ)` may be taken only if
+   * this the value of this condition is `testIsTrue`.
+   */
+  final predicate controlsEdge(Cpp::BasicBlock pred, Cpp::BasicBlock succ, boolean testIsTrue) {
+    this.valueControlsEdge(pred, succ, any(GuardValue bv | bv.asBooleanValue() = testIsTrue))
   }
 
   /**
@@ -108,7 +541,9 @@ abstract private class GuardConditionImpl extends Expr {
    * ("unary") and a 5-argument ("binary") version of this predicate (see `comparesEq`).
    */
   pragma[inline]
-  abstract predicate comparesLt(Expr left, Expr right, int k, boolean isLessThan, boolean testIsTrue);
+  abstract predicate comparesLt(
+    Cpp::Expr left, Cpp::Expr right, int k, boolean isLessThan, boolean testIsTrue
+  );
 
   /**
    * Holds if (determined by this guard) `left < right + k` must be `isLessThan` in `block`.
@@ -116,7 +551,9 @@ abstract private class GuardConditionImpl extends Expr {
    * ("unary") and a 5-argument ("binary") version of this predicate (see `comparesEq`).
    */
   pragma[inline]
-  abstract predicate ensuresLt(Expr left, Expr right, int k, BasicBlock block, boolean isLessThan);
+  abstract predicate ensuresLt(
+    Cpp::Expr left, Cpp::Expr right, int k, Cpp::BasicBlock block, boolean isLessThan
+  );
 
   /**
    * Holds if (determined by this guard) `e < k` evaluates to `isLessThan` if
@@ -124,7 +561,7 @@ abstract private class GuardConditionImpl extends Expr {
    * ("unary") and a 5-argument ("binary") version of this predicate (see `comparesEq`).
    */
   pragma[inline]
-  abstract predicate comparesLt(Expr e, int k, boolean isLessThan, AbstractValue value);
+  abstract predicate comparesLt(Cpp::Expr e, int k, boolean isLessThan, GuardValue value);
 
   /**
    * Holds if (determined by this guard) `e < k` must be `isLessThan` in `block`.
@@ -132,7 +569,7 @@ abstract private class GuardConditionImpl extends Expr {
    * ("unary") and a 5-argument ("binary") version of this predicate (see `comparesEq`).
    */
   pragma[inline]
-  abstract predicate ensuresLt(Expr e, int k, BasicBlock block, boolean isLessThan);
+  abstract predicate ensuresLt(Cpp::Expr e, int k, Cpp::BasicBlock block, boolean isLessThan);
 
   /**
    * Holds if (determined by this guard) `left == right + k` evaluates to `areEqual` if this
@@ -145,7 +582,9 @@ abstract private class GuardConditionImpl extends Expr {
    *    necessarily integer).
    */
   pragma[inline]
-  abstract predicate comparesEq(Expr left, Expr right, int k, boolean areEqual, boolean testIsTrue);
+  abstract predicate comparesEq(
+    Cpp::Expr left, Cpp::Expr right, int k, boolean areEqual, boolean testIsTrue
+  );
 
   /**
    * Holds if (determined by this guard) `left == right + k` must be `areEqual` in `block`.
@@ -153,7 +592,9 @@ abstract private class GuardConditionImpl extends Expr {
    * ("unary") and a 5-argument ("binary") version of this predicate (see `comparesEq`).
    */
   pragma[inline]
-  abstract predicate ensuresEq(Expr left, Expr right, int k, BasicBlock block, boolean areEqual);
+  abstract predicate ensuresEq(
+    Cpp::Expr left, Cpp::Expr right, int k, Cpp::BasicBlock block, boolean areEqual
+  );
 
   /**
    * Holds if (determined by this guard) `e == k` evaluates to `areEqual` if this expression
@@ -166,7 +607,7 @@ abstract private class GuardConditionImpl extends Expr {
    *    necessarily integer).
    */
   pragma[inline]
-  abstract predicate comparesEq(Expr e, int k, boolean areEqual, AbstractValue value);
+  abstract predicate comparesEq(Cpp::Expr e, int k, boolean areEqual, GuardValue value);
 
   /**
    * Holds if (determined by this guard) `e == k` must be `areEqual` in `block`.
@@ -174,7 +615,65 @@ abstract private class GuardConditionImpl extends Expr {
    * ("unary") and a 5-argument ("binary") version of this predicate (see `comparesEq`).
    */
   pragma[inline]
-  abstract predicate ensuresEq(Expr e, int k, BasicBlock block, boolean areEqual);
+  abstract predicate ensuresEq(Cpp::Expr e, int k, Cpp::BasicBlock block, boolean areEqual);
+
+  /**
+   * Holds if (determined by this guard) `left == right + k` must be `areEqual` on the edge from
+   * `pred` to `succ`. If `areEqual = false` then this implies `left != right + k`.
+   */
+  pragma[inline]
+  final predicate ensuresEqEdge(
+    Cpp::Expr left, Cpp::Expr right, int k, Cpp::BasicBlock pred, Cpp::BasicBlock succ,
+    boolean areEqual
+  ) {
+    exists(boolean testIsTrue |
+      this.comparesEq(left, right, k, areEqual, testIsTrue) and
+      this.controlsEdge(pred, succ, testIsTrue)
+    )
+  }
+
+  /**
+   * Holds if (determined by this guard) `e == k` must be `areEqual` on the edge from
+   * `pred` to `succ`. If `areEqual = false` then this implies `e != k`.
+   */
+  pragma[inline]
+  final predicate ensuresEqEdge(
+    Cpp::Expr e, int k, Cpp::BasicBlock pred, Cpp::BasicBlock succ, boolean areEqual
+  ) {
+    exists(GuardValue v |
+      this.comparesEq(e, k, areEqual, v) and
+      this.valueControlsEdge(pred, succ, v)
+    )
+  }
+
+  /**
+   * Holds if (determined by this guard) `left < right + k` must be `isLessThan` on the edge from
+   * `pred` to `succ`. If `isLessThan = false` then this implies `left >= right + k`.
+   */
+  pragma[inline]
+  final predicate ensuresLtEdge(
+    Cpp::Expr left, Cpp::Expr right, int k, Cpp::BasicBlock pred, Cpp::BasicBlock succ,
+    boolean isLessThan
+  ) {
+    exists(boolean testIsTrue |
+      this.comparesLt(left, right, k, isLessThan, testIsTrue) and
+      this.controlsEdge(pred, succ, testIsTrue)
+    )
+  }
+
+  /**
+   * Holds if (determined by this guard) `e < k` must be `isLessThan` on the edge from
+   * `pred` to `succ`. If `isLessThan = false` then this implies `e >= k`.
+   */
+  pragma[inline]
+  final predicate ensuresLtEdge(
+    Cpp::Expr e, int k, Cpp::BasicBlock pred, Cpp::BasicBlock succ, boolean isLessThan
+  ) {
+    exists(GuardValue v |
+      this.comparesLt(e, k, isLessThan, v) and
+      this.valueControlsEdge(pred, succ, v)
+    )
+  }
 }
 
 final class GuardCondition = GuardConditionImpl;
@@ -182,13 +681,10 @@ final class GuardCondition = GuardConditionImpl;
 /**
  * A binary logical operator in the AST that guards one or more basic blocks.
  */
-private class GuardConditionFromBinaryLogicalOperator extends GuardConditionImpl {
-  GuardConditionFromBinaryLogicalOperator() {
-    this.(BinaryLogicalOperation).getAnOperand() instanceof GuardCondition
-  }
-
-  override predicate valueControls(BasicBlock controlled, AbstractValue v) {
-    exists(BinaryLogicalOperation binop, GuardCondition lhs, GuardCondition rhs |
+private class GuardConditionFromBinaryLogicalOperator extends GuardConditionImpl instanceof Cpp::BinaryLogicalOperation
+{
+  override predicate valueControls(Cpp::BasicBlock controlled, GuardValue v) {
+    exists(Cpp::BinaryLogicalOperation binop, GuardCondition lhs, GuardCondition rhs |
       this = binop and
       lhs = binop.getLeftOperand() and
       rhs = binop.getRightOperand() and
@@ -197,64 +693,86 @@ private class GuardConditionFromBinaryLogicalOperator extends GuardConditionImpl
     )
   }
 
-  override predicate comparesLt(Expr left, Expr right, int k, boolean isLessThan, boolean testIsTrue) {
+  override predicate valueControlsEdge(Cpp::BasicBlock pred, Cpp::BasicBlock succ, GuardValue v) {
+    exists(Cpp::BinaryLogicalOperation binop, GuardCondition lhs, GuardCondition rhs |
+      this = binop and
+      lhs = binop.getLeftOperand() and
+      rhs = binop.getRightOperand() and
+      lhs.valueControlsEdge(pred, succ, v) and
+      rhs.valueControlsEdge(pred, succ, v)
+    )
+  }
+
+  pragma[nomagic]
+  override predicate comparesLt(
+    Cpp::Expr left, Cpp::Expr right, int k, boolean isLessThan, boolean testIsTrue
+  ) {
     exists(boolean partIsTrue, GuardCondition part |
-      this.(BinaryLogicalOperation).impliesValue(part, partIsTrue, testIsTrue)
+      this.(Cpp::BinaryLogicalOperation).impliesValue(part, partIsTrue, testIsTrue)
     |
       part.comparesLt(left, right, k, isLessThan, partIsTrue)
     )
   }
 
-  override predicate comparesLt(Expr e, int k, boolean isLessThan, AbstractValue value) {
-    exists(BooleanValue partValue, GuardCondition part |
-      this.(BinaryLogicalOperation)
-          .impliesValue(part, partValue.getValue(), value.(BooleanValue).getValue())
+  pragma[nomagic]
+  override predicate comparesLt(Cpp::Expr e, int k, boolean isLessThan, GuardValue value) {
+    exists(GuardValue partValue, GuardCondition part |
+      this.(Cpp::BinaryLogicalOperation)
+          .impliesValue(part, partValue.asBooleanValue(), value.asBooleanValue())
     |
       part.comparesLt(e, k, isLessThan, partValue)
     )
   }
 
   pragma[inline]
-  override predicate ensuresLt(Expr left, Expr right, int k, BasicBlock block, boolean isLessThan) {
+  override predicate ensuresLt(
+    Cpp::Expr left, Cpp::Expr right, int k, Cpp::BasicBlock block, boolean isLessThan
+  ) {
     exists(boolean testIsTrue |
       this.comparesLt(left, right, k, isLessThan, testIsTrue) and this.controls(block, testIsTrue)
     )
   }
 
   pragma[inline]
-  override predicate ensuresLt(Expr e, int k, BasicBlock block, boolean isLessThan) {
-    exists(AbstractValue value |
+  override predicate ensuresLt(Cpp::Expr e, int k, Cpp::BasicBlock block, boolean isLessThan) {
+    exists(GuardValue value |
       this.comparesLt(e, k, isLessThan, value) and this.valueControls(block, value)
     )
   }
 
-  override predicate comparesEq(Expr left, Expr right, int k, boolean areEqual, boolean testIsTrue) {
+  pragma[nomagic]
+  override predicate comparesEq(
+    Cpp::Expr left, Cpp::Expr right, int k, boolean areEqual, boolean testIsTrue
+  ) {
     exists(boolean partIsTrue, GuardCondition part |
-      this.(BinaryLogicalOperation).impliesValue(part, partIsTrue, testIsTrue)
+      this.(Cpp::BinaryLogicalOperation).impliesValue(part, partIsTrue, testIsTrue)
     |
       part.comparesEq(left, right, k, areEqual, partIsTrue)
     )
   }
 
   pragma[inline]
-  override predicate ensuresEq(Expr left, Expr right, int k, BasicBlock block, boolean areEqual) {
+  override predicate ensuresEq(
+    Cpp::Expr left, Cpp::Expr right, int k, Cpp::BasicBlock block, boolean areEqual
+  ) {
     exists(boolean testIsTrue |
       this.comparesEq(left, right, k, areEqual, testIsTrue) and this.controls(block, testIsTrue)
     )
   }
 
-  override predicate comparesEq(Expr e, int k, boolean areEqual, AbstractValue value) {
-    exists(BooleanValue partValue, GuardCondition part |
-      this.(BinaryLogicalOperation)
-          .impliesValue(part, partValue.getValue(), value.(BooleanValue).getValue())
+  pragma[nomagic]
+  override predicate comparesEq(Cpp::Expr e, int k, boolean areEqual, GuardValue value) {
+    exists(GuardValue partValue, GuardCondition part |
+      this.(Cpp::BinaryLogicalOperation)
+          .impliesValue(part, partValue.asBooleanValue(), value.asBooleanValue())
     |
       part.comparesEq(e, k, areEqual, partValue)
     )
   }
 
   pragma[inline]
-  override predicate ensuresEq(Expr e, int k, BasicBlock block, boolean areEqual) {
-    exists(AbstractValue value |
+  override predicate ensuresEq(Cpp::Expr e, int k, Cpp::BasicBlock block, boolean areEqual) {
+    exists(GuardValue value |
       this.comparesEq(e, k, areEqual, value) and this.valueControls(block, value)
     )
   }
@@ -266,7 +784,7 @@ private class GuardConditionFromBinaryLogicalOperator extends GuardConditionImpl
  * predicate does not necessarily hold for binary logical operations like
  * `&&` and `||`. See the detailed explanation on predicate `controls`.
  */
-private predicate controlsBlock(IRGuardCondition ir, BasicBlock controlled, AbstractValue v) {
+private predicate controlsBlock(IRGuardCondition ir, Cpp::BasicBlock controlled, GuardValue v) {
   exists(IRBlock irb |
     ir.valueControls(irb, v) and
     nonExcludedIRAndBasicBlock(irb, controlled) and
@@ -274,6 +792,25 @@ private predicate controlsBlock(IRGuardCondition ir, BasicBlock controlled, Abst
   )
 }
 
+/**
+ * Holds if `ir` controls the `(pred, succ)` edge, meaning that the edge
+ * `(pred, succ)` is only taken if the value of this condition is `v`. This
+ * helper predicate does not necessarily hold for binary logical operations
+ * like `&&` and `||`.
+ * See the detailed explanation on predicate `controlsEdge`.
+ */
+private predicate controlsEdge(
+  IRGuardCondition ir, Cpp::BasicBlock pred, Cpp::BasicBlock succ, GuardValue v
+) {
+  exists(IRBlock irPred, IRBlock irSucc |
+    ir.valueControlsBranchEdge(irPred, irSucc, v) and
+    nonExcludedIRAndBasicBlock(irPred, pred) and
+    nonExcludedIRAndBasicBlock(irSucc, succ) and
+    not isUnreachedBlock(irPred) and
+    not isUnreachedBlock(irSucc)
+  )
+}
+
 private class GuardConditionFromNotExpr extends GuardConditionImpl {
   IRGuardCondition ir;
 
@@ -283,20 +820,27 @@ private class GuardConditionFromNotExpr extends GuardConditionImpl {
     // comparison against 0 so it's not included as a normal
     // `IRGuardCondition`. So to align with user expectations we make that `x`
     // a `GuardCondition`.
-    exists(NotExpr notExpr |
-      this = notExpr.getOperand() and
+    exists(Cpp::NotExpr notExpr | this = notExpr.getOperand() |
       ir.getUnconvertedResultExpression() = notExpr
+      or
+      ir.(ConditionalBranchInstruction).getCondition().getUnconvertedResultExpression() = notExpr
     )
   }
 
-  override predicate valueControls(BasicBlock controlled, AbstractValue v) {
+  override predicate valueControls(Cpp::BasicBlock controlled, GuardValue v) {
     // This condition must determine the flow of control; that is, this
     // node must be a top-level condition.
     controlsBlock(ir, controlled, v.getDualValue())
   }
 
+  override predicate valueControlsEdge(Cpp::BasicBlock pred, Cpp::BasicBlock succ, GuardValue v) {
+    controlsEdge(ir, pred, succ, v.getDualValue())
+  }
+
   pragma[inline]
-  override predicate comparesLt(Expr left, Expr right, int k, boolean isLessThan, boolean testIsTrue) {
+  override predicate comparesLt(
+    Cpp::Expr left, Cpp::Expr right, int k, boolean isLessThan, boolean testIsTrue
+  ) {
     exists(Instruction li, Instruction ri |
       li.getUnconvertedResultExpression() = left and
       ri.getUnconvertedResultExpression() = right and
@@ -305,7 +849,7 @@ private class GuardConditionFromNotExpr extends GuardConditionImpl {
   }
 
   pragma[inline]
-  override predicate comparesLt(Expr e, int k, boolean isLessThan, AbstractValue value) {
+  override predicate comparesLt(Cpp::Expr e, int k, boolean isLessThan, GuardValue value) {
     exists(Instruction i |
       i.getUnconvertedResultExpression() = e and
       ir.comparesLt(i.getAUse(), k, isLessThan, value.getDualValue())
@@ -313,7 +857,9 @@ private class GuardConditionFromNotExpr extends GuardConditionImpl {
   }
 
   pragma[inline]
-  override predicate ensuresLt(Expr left, Expr right, int k, BasicBlock block, boolean isLessThan) {
+  override predicate ensuresLt(
+    Cpp::Expr left, Cpp::Expr right, int k, Cpp::BasicBlock block, boolean isLessThan
+  ) {
     exists(Instruction li, Instruction ri, boolean testIsTrue |
       li.getUnconvertedResultExpression() = left and
       ri.getUnconvertedResultExpression() = right and
@@ -323,8 +869,8 @@ private class GuardConditionFromNotExpr extends GuardConditionImpl {
   }
 
   pragma[inline]
-  override predicate ensuresLt(Expr e, int k, BasicBlock block, boolean isLessThan) {
-    exists(Instruction i, AbstractValue value |
+  override predicate ensuresLt(Cpp::Expr e, int k, Cpp::BasicBlock block, boolean isLessThan) {
+    exists(Instruction i, GuardValue value |
       i.getUnconvertedResultExpression() = e and
       ir.comparesLt(i.getAUse(), k, isLessThan, value.getDualValue()) and
       this.valueControls(block, value)
@@ -332,7 +878,9 @@ private class GuardConditionFromNotExpr extends GuardConditionImpl {
   }
 
   pragma[inline]
-  override predicate comparesEq(Expr left, Expr right, int k, boolean areEqual, boolean testIsTrue) {
+  override predicate comparesEq(
+    Cpp::Expr left, Cpp::Expr right, int k, boolean areEqual, boolean testIsTrue
+  ) {
     exists(Instruction li, Instruction ri |
       li.getUnconvertedResultExpression() = left and
       ri.getUnconvertedResultExpression() = right and
@@ -341,7 +889,9 @@ private class GuardConditionFromNotExpr extends GuardConditionImpl {
   }
 
   pragma[inline]
-  override predicate ensuresEq(Expr left, Expr right, int k, BasicBlock block, boolean areEqual) {
+  override predicate ensuresEq(
+    Cpp::Expr left, Cpp::Expr right, int k, Cpp::BasicBlock block, boolean areEqual
+  ) {
     exists(Instruction li, Instruction ri, boolean testIsTrue |
       li.getUnconvertedResultExpression() = left and
       ri.getUnconvertedResultExpression() = right and
@@ -351,7 +901,7 @@ private class GuardConditionFromNotExpr extends GuardConditionImpl {
   }
 
   pragma[inline]
-  override predicate comparesEq(Expr e, int k, boolean areEqual, AbstractValue value) {
+  override predicate comparesEq(Cpp::Expr e, int k, boolean areEqual, GuardValue value) {
     exists(Instruction i |
       i.getUnconvertedResultExpression() = e and
       ir.comparesEq(i.getAUse(), k, areEqual, value.getDualValue())
@@ -359,8 +909,8 @@ private class GuardConditionFromNotExpr extends GuardConditionImpl {
   }
 
   pragma[inline]
-  override predicate ensuresEq(Expr e, int k, BasicBlock block, boolean areEqual) {
-    exists(Instruction i, AbstractValue value |
+  override predicate ensuresEq(Cpp::Expr e, int k, Cpp::BasicBlock block, boolean areEqual) {
+    exists(Instruction i, GuardValue value |
       i.getUnconvertedResultExpression() = e and
       ir.comparesEq(i.getAUse(), k, areEqual, value.getDualValue()) and
       this.valueControls(block, value)
@@ -375,16 +925,28 @@ private class GuardConditionFromNotExpr extends GuardConditionImpl {
 private class GuardConditionFromIR extends GuardConditionImpl {
   IRGuardCondition ir;
 
-  GuardConditionFromIR() { this = ir.getUnconvertedResultExpression() }
+  GuardConditionFromIR() {
+    ir.(InitializeParameterInstruction).getParameter() = this
+    or
+    ir.(ConditionalBranchInstruction).getCondition().getUnconvertedResultExpression() = this
+    or
+    ir.getUnconvertedResultExpression() = this
+  }
 
-  override predicate valueControls(BasicBlock controlled, AbstractValue v) {
+  override predicate valueControls(Cpp::BasicBlock controlled, GuardValue v) {
     // This condition must determine the flow of control; that is, this
     // node must be a top-level condition.
     controlsBlock(ir, controlled, v)
   }
 
+  override predicate valueControlsEdge(Cpp::BasicBlock pred, Cpp::BasicBlock succ, GuardValue v) {
+    controlsEdge(ir, pred, succ, v)
+  }
+
   pragma[inline]
-  override predicate comparesLt(Expr left, Expr right, int k, boolean isLessThan, boolean testIsTrue) {
+  override predicate comparesLt(
+    Cpp::Expr left, Cpp::Expr right, int k, boolean isLessThan, boolean testIsTrue
+  ) {
     exists(Instruction li, Instruction ri |
       li.getUnconvertedResultExpression() = left and
       ri.getUnconvertedResultExpression() = right and
@@ -393,7 +955,7 @@ private class GuardConditionFromIR extends GuardConditionImpl {
   }
 
   pragma[inline]
-  override predicate comparesLt(Expr e, int k, boolean isLessThan, AbstractValue value) {
+  override predicate comparesLt(Cpp::Expr e, int k, boolean isLessThan, GuardValue value) {
     exists(Instruction i |
       i.getUnconvertedResultExpression() = e and
       ir.comparesLt(i.getAUse(), k, isLessThan, value)
@@ -401,7 +963,9 @@ private class GuardConditionFromIR extends GuardConditionImpl {
   }
 
   pragma[inline]
-  override predicate ensuresLt(Expr left, Expr right, int k, BasicBlock block, boolean isLessThan) {
+  override predicate ensuresLt(
+    Cpp::Expr left, Cpp::Expr right, int k, Cpp::BasicBlock block, boolean isLessThan
+  ) {
     exists(Instruction li, Instruction ri, boolean testIsTrue |
       li.getUnconvertedResultExpression() = left and
       ri.getUnconvertedResultExpression() = right and
@@ -411,8 +975,8 @@ private class GuardConditionFromIR extends GuardConditionImpl {
   }
 
   pragma[inline]
-  override predicate ensuresLt(Expr e, int k, BasicBlock block, boolean isLessThan) {
-    exists(Instruction i, AbstractValue value |
+  override predicate ensuresLt(Cpp::Expr e, int k, Cpp::BasicBlock block, boolean isLessThan) {
+    exists(Instruction i, GuardValue value |
       i.getUnconvertedResultExpression() = e and
       ir.comparesLt(i.getAUse(), k, isLessThan, value) and
       this.valueControls(block, value)
@@ -420,7 +984,9 @@ private class GuardConditionFromIR extends GuardConditionImpl {
   }
 
   pragma[inline]
-  override predicate comparesEq(Expr left, Expr right, int k, boolean areEqual, boolean testIsTrue) {
+  override predicate comparesEq(
+    Cpp::Expr left, Cpp::Expr right, int k, boolean areEqual, boolean testIsTrue
+  ) {
     exists(Instruction li, Instruction ri |
       li.getUnconvertedResultExpression() = left and
       ri.getUnconvertedResultExpression() = right and
@@ -429,7 +995,9 @@ private class GuardConditionFromIR extends GuardConditionImpl {
   }
 
   pragma[inline]
-  override predicate ensuresEq(Expr left, Expr right, int k, BasicBlock block, boolean areEqual) {
+  override predicate ensuresEq(
+    Cpp::Expr left, Cpp::Expr right, int k, Cpp::BasicBlock block, boolean areEqual
+  ) {
     exists(Instruction li, Instruction ri, boolean testIsTrue |
       li.getUnconvertedResultExpression() = left and
       ri.getUnconvertedResultExpression() = right and
@@ -439,7 +1007,7 @@ private class GuardConditionFromIR extends GuardConditionImpl {
   }
 
   pragma[inline]
-  override predicate comparesEq(Expr e, int k, boolean areEqual, AbstractValue value) {
+  override predicate comparesEq(Cpp::Expr e, int k, boolean areEqual, GuardValue value) {
     exists(Instruction i |
       i.getUnconvertedResultExpression() = e and
       ir.comparesEq(i.getAUse(), k, areEqual, value)
@@ -447,8 +1015,8 @@ private class GuardConditionFromIR extends GuardConditionImpl {
   }
 
   pragma[inline]
-  override predicate ensuresEq(Expr e, int k, BasicBlock block, boolean areEqual) {
-    exists(Instruction i, AbstractValue value |
+  override predicate ensuresEq(Cpp::Expr e, int k, Cpp::BasicBlock block, boolean areEqual) {
+    exists(Instruction i, GuardValue value |
       i.getUnconvertedResultExpression() = e and
       ir.comparesEq(i.getAUse(), k, areEqual, value) and
       this.valueControls(block, value)
@@ -478,23 +1046,20 @@ private predicate excludeAsControlledInstruction(Instruction instr) {
  * the `irb` be ignored.
  */
 pragma[nomagic]
-private predicate nonExcludedIRAndBasicBlock(IRBlock irb, BasicBlock controlled) {
+private predicate nonExcludedIRAndBasicBlock(IRBlock irb, Cpp::BasicBlock controlled) {
   exists(Instruction instr |
     instr = irb.getAnInstruction() and
-    instr.getAst().(ControlFlowNode).getBasicBlock() = controlled and
+    instr.getAst() = controlled.getANode() and
     not excludeAsControlledInstruction(instr)
   )
 }
 
 /**
- * A Boolean condition in the IR that guards one or more basic blocks.
- *
- * Note that `&&` and `||` don't have an explicit representation in the IR,
- * and therefore will not appear as IRGuardConditions.
+ * A guard. This may be any expression whose value determines subsequent
+ * control flow. It may also be a switch case, which as a guard is considered
+ * to evaluate to either true or false depending on whether the case matches.
  */
-class IRGuardCondition extends Instruction {
-  Instruction branch;
-
+final class IRGuardCondition extends Guards_v1::Guard {
   /*
    * An `IRGuardCondition` supports reasoning about four different kinds of
    * relations:
@@ -522,119 +1087,12 @@ class IRGuardCondition extends Instruction {
    * `e1 + k1 == e2 + k2` into canonical the form `e1 == e2 + (k2 - k1)`.
    */
 
-  IRGuardCondition() { branch = getBranchForCondition(this) }
-
-  /**
-   * Holds if this condition controls `controlled`, meaning that `controlled` is only
-   * entered if the value of this condition is `v`.
-   *
-   * For details on what "controls" mean, see the QLDoc for `controls`.
-   */
-  predicate valueControls(IRBlock controlled, AbstractValue v) {
-    // This condition must determine the flow of control; that is, this
-    // node must be a top-level condition.
-    this.controlsBlock(controlled, v)
-    or
-    exists(IRGuardCondition ne |
-      this = ne.(LogicalNotInstruction).getUnary() and
-      ne.valueControls(controlled, v.getDualValue())
-    )
-  }
-
-  /**
-   * Holds if this condition controls `controlled`, meaning that `controlled` is only
-   * entered if the value of this condition is `testIsTrue`.
-   *
-   * Illustration:
-   *
-   * ```
-   * [                    (testIsTrue)                        ]
-   * [             this ----------------succ ---- controlled  ]
-   * [               |                    |                   ]
-   * [ (testIsFalse) |                     ------ ...         ]
-   * [             other                                      ]
-   * ```
-   *
-   * The predicate holds if all paths to `controlled` go via the `testIsTrue`
-   * edge of the control-flow graph. In other words, the `testIsTrue` edge
-   * must dominate `controlled`. This means that `controlled` must be
-   * dominated by both `this` and `succ` (the target of the `testIsTrue`
-   * edge). It also means that any other edge into `succ` must be a back-edge
-   * from a node which is dominated by `succ`.
-   *
-   * The short-circuit boolean operations have slightly surprising behavior
-   * here: because the operation itself only dominates one branch (due to
-   * being short-circuited) then it will only control blocks dominated by the
-   * true (for `&&`) or false (for `||`) branch.
-   */
-  predicate controls(IRBlock controlled, boolean testIsTrue) {
-    this.valueControls(controlled, any(BooleanValue bv | bv.getValue() = testIsTrue))
-  }
-
-  /**
-   * Holds if the control-flow edge `(pred, succ)` may be taken only if
-   * the value of this condition is `v`.
-   */
-  predicate valueControlsEdge(IRBlock pred, IRBlock succ, AbstractValue v) {
-    pred.getASuccessor() = succ and
-    this.valueControls(pred, v)
-    or
-    succ = this.getBranchSuccessor(v) and
-    (
-      branch.(ConditionalBranchInstruction).getCondition() = this and
-      branch.getBlock() = pred
-      or
-      branch.(SwitchInstruction).getExpression() = this and
-      branch.getBlock() = pred
-    )
-  }
-
-  /**
-   * Holds if the control-flow edge `(pred, succ)` may be taken only if
-   * the value of this condition is `testIsTrue`.
-   */
-  final predicate controlsEdge(IRBlock pred, IRBlock succ, boolean testIsTrue) {
-    this.valueControlsEdge(pred, succ, any(BooleanValue bv | bv.getValue() = testIsTrue))
-  }
-
-  /**
-   * Gets the block to which `branch` jumps directly when the value of this condition is `v`.
-   *
-   * This predicate is intended to help with situations in which an inference can only be made
-   * based on an edge between a block with multiple successors and a block with multiple
-   * predecessors. For example, in the following situation, an inference can be made about the
-   * value of `x` at the end of the `if` statement, but there is no block which is controlled by
-   * the `if` statement when `x >= y`.
-   * ```
-   * if (x < y) {
-   *   x = y;
-   * }
-   * return x;
-   * ```
-   */
-  private IRBlock getBranchSuccessor(AbstractValue v) {
-    branch.(ConditionalBranchInstruction).getCondition() = this and
-    exists(BooleanValue bv | bv = v |
-      bv.getValue() = true and
-      result.getFirstInstruction() = branch.(ConditionalBranchInstruction).getTrueSuccessor()
-      or
-      bv.getValue() = false and
-      result.getFirstInstruction() = branch.(ConditionalBranchInstruction).getFalseSuccessor()
-    )
-    or
-    exists(SwitchInstruction switch, CaseEdge kind | switch = branch |
-      switch.getExpression() = this and
-      result.getFirstInstruction() = switch.getSuccessor(kind) and
-      kind = v.(MatchValue).getCase()
-    )
-  }
-
   /** Holds if (determined by this guard) `left < right + k` evaluates to `isLessThan` if this expression evaluates to `testIsTrue`. */
   pragma[inline]
   predicate comparesLt(Operand left, Operand right, int k, boolean isLessThan, boolean testIsTrue) {
-    exists(BooleanValue value |
+    exists(GuardValue value |
       compares_lt(valueNumber(this), left, right, k, isLessThan, value) and
-      value.getValue() = testIsTrue
+      value.asBooleanValue() = testIsTrue
     )
   }
 
@@ -643,8 +1101,8 @@ class IRGuardCondition extends Instruction {
    * this expression evaluates to `value`.
    */
   pragma[inline]
-  predicate comparesLt(Operand op, int k, boolean isLessThan, AbstractValue value) {
-    compares_lt(valueNumber(this), op, k, isLessThan, value)
+  predicate comparesLt(Operand op, int k, boolean isLessThan, GuardValue value) {
+    unary_compares_lt(valueNumber(this), op, k, isLessThan, value)
   }
 
   /**
@@ -653,7 +1111,7 @@ class IRGuardCondition extends Instruction {
    */
   pragma[inline]
   predicate ensuresLt(Operand left, Operand right, int k, IRBlock block, boolean isLessThan) {
-    exists(AbstractValue value |
+    exists(GuardValue value |
       compares_lt(valueNumber(this), left, right, k, isLessThan, value) and
       this.valueControls(block, value)
     )
@@ -665,8 +1123,8 @@ class IRGuardCondition extends Instruction {
    */
   pragma[inline]
   predicate ensuresLt(Operand op, int k, IRBlock block, boolean isLessThan) {
-    exists(AbstractValue value |
-      compares_lt(valueNumber(this), op, k, isLessThan, value) and
+    exists(GuardValue value |
+      unary_compares_lt(valueNumber(this), op, k, isLessThan, value) and
       this.valueControls(block, value)
     )
   }
@@ -679,9 +1137,9 @@ class IRGuardCondition extends Instruction {
   predicate ensuresLtEdge(
     Operand left, Operand right, int k, IRBlock pred, IRBlock succ, boolean isLessThan
   ) {
-    exists(AbstractValue value |
+    exists(GuardValue value |
       compares_lt(valueNumber(this), left, right, k, isLessThan, value) and
-      this.valueControlsEdge(pred, succ, value)
+      this.valueControlsBranchEdge(pred, succ, value)
     )
   }
 
@@ -691,24 +1149,24 @@ class IRGuardCondition extends Instruction {
    */
   pragma[inline]
   predicate ensuresLtEdge(Operand left, int k, IRBlock pred, IRBlock succ, boolean isLessThan) {
-    exists(AbstractValue value |
-      compares_lt(valueNumber(this), left, k, isLessThan, value) and
-      this.valueControlsEdge(pred, succ, value)
+    exists(GuardValue value |
+      unary_compares_lt(valueNumber(this), left, k, isLessThan, value) and
+      this.valueControlsBranchEdge(pred, succ, value)
     )
   }
 
   /** Holds if (determined by this guard) `left == right + k` evaluates to `areEqual` if this expression evaluates to `testIsTrue`. */
   pragma[inline]
   predicate comparesEq(Operand left, Operand right, int k, boolean areEqual, boolean testIsTrue) {
-    exists(BooleanValue value |
+    exists(GuardValue value |
       compares_eq(valueNumber(this), left, right, k, areEqual, value) and
-      value.getValue() = testIsTrue
+      value.asBooleanValue() = testIsTrue
     )
   }
 
   /** Holds if (determined by this guard) `op == k` evaluates to `areEqual` if this expression evaluates to `value`. */
   pragma[inline]
-  predicate comparesEq(Operand op, int k, boolean areEqual, AbstractValue value) {
+  predicate comparesEq(Operand op, int k, boolean areEqual, GuardValue value) {
     unary_compares_eq(valueNumber(this), op, k, areEqual, value)
   }
 
@@ -718,7 +1176,7 @@ class IRGuardCondition extends Instruction {
    */
   pragma[inline]
   predicate ensuresEq(Operand left, Operand right, int k, IRBlock block, boolean areEqual) {
-    exists(AbstractValue value |
+    exists(GuardValue value |
       compares_eq(valueNumber(this), left, right, k, areEqual, value) and
       this.valueControls(block, value)
     )
@@ -730,7 +1188,7 @@ class IRGuardCondition extends Instruction {
    */
   pragma[inline]
   predicate ensuresEq(Operand op, int k, IRBlock block, boolean areEqual) {
-    exists(AbstractValue value |
+    exists(GuardValue value |
       unary_compares_eq(valueNumber(this), op, k, areEqual, value) and
       this.valueControls(block, value)
     )
@@ -744,9 +1202,9 @@ class IRGuardCondition extends Instruction {
   predicate ensuresEqEdge(
     Operand left, Operand right, int k, IRBlock pred, IRBlock succ, boolean areEqual
   ) {
-    exists(AbstractValue value |
+    exists(GuardValue value |
       compares_eq(valueNumber(this), left, right, k, areEqual, value) and
-      this.valueControlsEdge(pred, succ, value)
+      this.valueControlsBranchEdge(pred, succ, value)
     )
   }
 
@@ -756,102 +1214,18 @@ class IRGuardCondition extends Instruction {
    */
   pragma[inline]
   predicate ensuresEqEdge(Operand op, int k, IRBlock pred, IRBlock succ, boolean areEqual) {
-    exists(AbstractValue value |
+    exists(GuardValue value |
       unary_compares_eq(valueNumber(this), op, k, areEqual, value) and
-      this.valueControlsEdge(pred, succ, value)
+      this.valueControlsBranchEdge(pred, succ, value)
     )
   }
 
   /**
-   * Holds if this condition controls `block`, meaning that `block` is only
-   * entered if the value of this condition is `v`. This helper
-   * predicate does not necessarily hold for binary logical operations like
-   * `&&` and `||`. See the detailed explanation on predicate `controls`.
+   * DEPRECATED: Use `controlsBranchEdge` instead.
    */
-  private predicate controlsBlock(IRBlock controlled, AbstractValue v) {
-    not isUnreachedBlock(controlled) and
-    //
-    // For this block to control the block `controlled` with `testIsTrue` the
-    // following must hold: Execution must have passed through the test; that
-    // is, `this` must strictly dominate `controlled`. Execution must have
-    // passed through the `testIsTrue` edge leaving `this`.
-    //
-    // Although "passed through the true edge" implies that
-    // `getBranchSuccessor(true)` dominates `controlled`, the reverse is not
-    // true, as flow may have passed through another edge to get to
-    // `getBranchSuccessor(true)`, so we need to assert that
-    // `getBranchSuccessor(true)` dominates `controlled` *and* that all
-    // predecessors of `getBranchSuccessor(true)` are either `this` or
-    // dominated by `getBranchSuccessor(true)`.
-    //
-    // For example, in the following snippet:
-    //
-    //     if (x)
-    //       controlled;
-    //     false_successor;
-    //     uncontrolled;
-    //
-    // `false_successor` dominates `uncontrolled`, but not all of its
-    // predecessors are `this` (`if (x)`) or dominated by itself. Whereas in
-    // the following code:
-    //
-    //     if (x)
-    //       while (controlled)
-    //         also_controlled;
-    //     false_successor;
-    //     uncontrolled;
-    //
-    // the block `while (controlled)` is controlled because all of its
-    // predecessors are `this` (`if (x)`) or (in the case of `also_controlled`)
-    // dominated by itself.
-    //
-    // The additional constraint on the predecessors of the test successor implies
-    // that `this` strictly dominates `controlled` so that isn't necessary to check
-    // directly.
-    exists(IRBlock succ |
-      succ = this.getBranchSuccessor(v) and
-      this.hasDominatingEdgeTo(succ) and
-      succ.dominates(controlled)
-    )
+  deprecated predicate controlsEdge(IRBlock bb1, IRBlock bb2, boolean branch) {
+    this.controlsBranchEdge(bb1, bb2, branch)
   }
-
-  /**
-   * Holds if `(this, succ)` is an edge that dominates `succ`, that is, all other
-   * predecessors of `succ` are dominated by `succ`. This implies that `this` is the
-   * immediate dominator of `succ`.
-   *
-   * This is a necessary and sufficient condition for an edge to dominate anything,
-   * and in particular `bb1.hasDominatingEdgeTo(bb2) and bb2.dominates(bb3)` means
-   * that the edge `(bb1, bb2)` dominates `bb3`.
-   */
-  private predicate hasDominatingEdgeTo(IRBlock succ) {
-    exists(IRBlock branchBlock | branchBlock = this.getBranchBlock() |
-      branchBlock.immediatelyDominates(succ) and
-      branchBlock.getASuccessor() = succ and
-      forall(IRBlock pred | pred = succ.getAPredecessor() and pred != branchBlock |
-        succ.dominates(pred)
-        or
-        // An unreachable `pred` is vacuously dominated by `succ` since all
-        // paths from the entry to `pred` go through `succ`. Such vacuous
-        // dominance is not included in the `dominates` predicate since that
-        // could cause quadratic blow-up.
-        not pred.isReachableFromFunctionEntry()
-      )
-    )
-  }
-
-  pragma[noinline]
-  private IRBlock getBranchBlock() { result = branch.getBlock() }
-}
-
-private Instruction getBranchForCondition(Instruction guard) {
-  result.(ConditionalBranchInstruction).getCondition() = guard
-  or
-  result.(SwitchInstruction).getExpression() = guard
-  or
-  exists(LogicalNotInstruction cond |
-    result = getBranchForCondition(cond) and cond.getUnary() = guard
-  )
 }
 
 cached
@@ -1014,10 +1388,10 @@ private module Cached {
    */
   cached
   predicate compares_eq(
-    ValueNumber test, Operand left, Operand right, int k, boolean areEqual, AbstractValue value
+    ValueNumber test, Operand left, Operand right, int k, boolean areEqual, GuardValue value
   ) {
     /* The simple case where the test *is* the comparison so areEqual = testIsTrue xor eq. */
-    exists(AbstractValue v | simple_comparison_eq(test, left, right, k, v) |
+    exists(GuardValue v | simple_comparison_eq(test, left, right, k, v) |
       areEqual = true and value = v
       or
       areEqual = false and value = v.getDualValue()
@@ -1032,15 +1406,15 @@ private module Cached {
     complex_eq(test, left, right, k, areEqual, value)
     or
     /* (x is true => (left == right + k)) => (!x is false => (left == right + k)) */
-    exists(AbstractValue dual | value = dual.getDualValue() |
+    exists(GuardValue dual | value = dual.getDualValue() |
       compares_eq(test.(LogicalNotValueNumber).getUnary(), left, right, k, areEqual, dual)
     )
     or
     compares_eq(test.(BuiltinExpectCallValueNumber).getCondition(), left, right, k, areEqual, value)
     or
-    exists(Operand l, BooleanValue bv |
+    exists(Operand l, GuardValue bv |
       // 1. test = value -> int(l) = 0 is !bv
-      unary_compares_eq(test, l, 0, bv.getValue().booleanNot(), value) and
+      unary_compares_eq(test, l, 0, bv.asBooleanValue().booleanNot(), value) and
       // 2. l = bv -> left + right is areEqual
       compares_eq(valueNumber(BooleanInstruction<isUnaryComparesEqLeft/1>::get(l.getDef())), left,
         right, k, areEqual, bv)
@@ -1057,10 +1431,10 @@ private module Cached {
    */
   cached
   predicate unary_compares_eq(
-    ValueNumber test, Operand op, int k, boolean areEqual, AbstractValue value
+    ValueNumber test, Operand op, int k, boolean areEqual, GuardValue value
   ) {
     /* The simple case where the test *is* the comparison so areEqual = testIsTrue xor eq. */
-    exists(AbstractValue v | unary_simple_comparison_eq(test, op, k, v) |
+    exists(GuardValue v | unary_simple_comparison_eq(test, op, k, v) |
       areEqual = true and value = v
       or
       areEqual = false and value = v.getDualValue()
@@ -1069,7 +1443,7 @@ private module Cached {
     unary_complex_eq(test, op, k, areEqual, value)
     or
     /* (x is true => (op == k)) => (!x is false => (op == k)) */
-    exists(AbstractValue dual |
+    exists(GuardValue dual |
       value = dual.getDualValue() and
       unary_compares_eq(test.(LogicalNotValueNumber).getUnary(), op, k, areEqual, dual)
     )
@@ -1083,18 +1457,18 @@ private module Cached {
     )
     or
     // See argument for why this is correct in compares_eq
-    exists(Operand l, BooleanValue bv |
-      unary_compares_eq(test, l, 0, bv.getValue().booleanNot(), value) and
+    exists(Operand l, GuardValue bv |
+      unary_compares_eq(test, l, 0, bv.asBooleanValue().booleanNot(), value) and
       unary_compares_eq(valueNumber(BooleanInstruction<isUnaryComparesEqLeft/1>::get(l.getDef())),
         op, k, areEqual, bv)
     )
     or
     unary_compares_eq(test.(BuiltinExpectCallValueNumber).getCondition(), op, k, areEqual, value)
     or
-    exists(BinaryLogicalOperation logical, Expr operand, boolean b |
+    exists(Cpp::BinaryLogicalOperation logical, Cpp::Expr operand, boolean b |
       test.getAnInstruction().getUnconvertedResultExpression() = logical and
       op.getDef().getUnconvertedResultExpression() = operand and
-      logical.impliesValue(operand, b, value.(BooleanValue).getValue())
+      logical.impliesValue(operand, b, value.asBooleanValue())
     |
       k = 1 and
       areEqual = b
@@ -1106,17 +1480,17 @@ private module Cached {
 
   /** Rearrange various simple comparisons into `left == right + k` form. */
   private predicate simple_comparison_eq(
-    CompareValueNumber cmp, Operand left, Operand right, int k, AbstractValue value
+    CompareValueNumber cmp, Operand left, Operand right, int k, GuardValue value
   ) {
     cmp instanceof CompareEQValueNumber and
     cmp.hasOperands(left, right) and
     k = 0 and
-    value.(BooleanValue).getValue() = true
+    value.asBooleanValue() = true
     or
     cmp instanceof CompareNEValueNumber and
     cmp.hasOperands(left, right) and
     k = 0 and
-    value.(BooleanValue).getValue() = false
+    value.asBooleanValue() = false
   }
 
   /**
@@ -1152,35 +1526,33 @@ private module Cached {
   }
 
   /** Rearrange various simple comparisons into `op == k` form. */
-  private predicate unary_simple_comparison_eq(
-    ValueNumber test, Operand op, int k, AbstractValue value
-  ) {
-    exists(CaseEdge case, SwitchConditionValueNumber condition |
+  private predicate unary_simple_comparison_eq(ValueNumber test, Operand op, int k, GuardValue value) {
+    exists(SwitchConditionValueNumber condition, CaseEdge edge |
       condition = test and
       op = condition.getExpressionOperand() and
-      case = value.(MatchValue).getCase() and
-      exists(condition.getSuccessor(case)) and
-      case.getValue().toInt() = k
+      value.asIntValue() = k and
+      edge.getValue().toInt() = k and
+      exists(condition.getSuccessor(edge))
     )
     or
     exists(Instruction const | int_value(const) = k |
-      value.(BooleanValue).getValue() = true and
+      value.asBooleanValue() = true and
       test.(CompareEQValueNumber).hasOperands(op, const.getAUse())
       or
-      value.(BooleanValue).getValue() = false and
+      value.asBooleanValue() = false and
       test.(CompareNEValueNumber).hasOperands(op, const.getAUse())
     )
     or
-    exists(BooleanValue bv |
+    exists(GuardValue bv |
       bv = value and
       mayBranchOn(op.getDef()) and
       op = test.getAUse()
     |
       k = 0 and
-      bv.getValue() = false
+      bv.asBooleanValue() = false
       or
       k = 1 and
-      bv.getValue() = true
+      bv.asBooleanValue() = true
     )
   }
 
@@ -1199,7 +1571,7 @@ private module Cached {
   }
 
   private predicate complex_eq(
-    ValueNumber cmp, Operand left, Operand right, int k, boolean areEqual, AbstractValue value
+    ValueNumber cmp, Operand left, Operand right, int k, boolean areEqual, GuardValue value
   ) {
     sub_eq(cmp, left, right, k, areEqual, value)
     or
@@ -1207,7 +1579,7 @@ private module Cached {
   }
 
   private predicate unary_complex_eq(
-    ValueNumber test, Operand op, int k, boolean areEqual, AbstractValue value
+    ValueNumber test, Operand op, int k, boolean areEqual, GuardValue value
   ) {
     unary_sub_eq(test, op, k, areEqual, value)
     or
@@ -1222,11 +1594,11 @@ private module Cached {
   /** Holds if `left < right + k` evaluates to `isLt` given that test is `value`. */
   cached
   predicate compares_lt(
-    ValueNumber test, Operand left, Operand right, int k, boolean isLt, AbstractValue value
+    ValueNumber test, Operand left, Operand right, int k, boolean isLt, GuardValue value
   ) {
     /* In the simple case, the test is the comparison, so isLt = testIsTrue */
     simple_comparison_lt(test, left, right, k) and
-    value.(BooleanValue).getValue() = isLt
+    value.asBooleanValue() = isLt
     or
     complex_lt(test, left, right, k, isLt, value)
     or
@@ -1234,15 +1606,15 @@ private module Cached {
     exists(boolean isGe | isLt = isGe.booleanNot() | compares_ge(test, left, right, k, isGe, value))
     or
     /* (x is true => (left < right + k)) => (!x is false => (left < right + k)) */
-    exists(AbstractValue dual | value = dual.getDualValue() |
+    exists(GuardValue dual | value = dual.getDualValue() |
       compares_lt(test.(LogicalNotValueNumber).getUnary(), left, right, k, isLt, dual)
     )
     or
     compares_lt(test.(BuiltinExpectCallValueNumber).getCondition(), left, right, k, isLt, value)
     or
     // See argument for why this is correct in compares_eq
-    exists(Operand l, BooleanValue bv |
-      unary_compares_eq(test, l, 0, bv.getValue().booleanNot(), value) and
+    exists(Operand l, GuardValue bv |
+      unary_compares_eq(test, l, 0, bv.asBooleanValue().booleanNot(), value) and
       compares_lt(valueNumber(BooleanInstruction<isUnaryComparesEqLeft/1>::get(l.getDef())), left,
         right, k, isLt, bv)
     )
@@ -1250,14 +1622,14 @@ private module Cached {
 
   /** Holds if `op < k` evaluates to `isLt` given that `test` evaluates to `value`. */
   cached
-  predicate compares_lt(ValueNumber test, Operand op, int k, boolean isLt, AbstractValue value) {
+  predicate unary_compares_lt(ValueNumber test, Operand op, int k, boolean isLt, GuardValue value) {
     unary_simple_comparison_lt(test, op, k, isLt, value)
     or
     complex_lt(test, op, k, isLt, value)
     or
     /* (x is true => (op < k)) => (!x is false => (op < k)) */
-    exists(AbstractValue dual | value = dual.getDualValue() |
-      compares_lt(test.(LogicalNotValueNumber).getUnary(), op, k, isLt, dual)
+    exists(GuardValue dual | value = dual.getDualValue() |
+      unary_compares_lt(test.(LogicalNotValueNumber).getUnary(), op, k, isLt, dual)
     )
     or
     exists(int k1, int k2, Instruction const |
@@ -1266,19 +1638,19 @@ private module Cached {
       k = k1 + k2
     )
     or
-    compares_lt(test.(BuiltinExpectCallValueNumber).getCondition(), op, k, isLt, value)
+    unary_compares_lt(test.(BuiltinExpectCallValueNumber).getCondition(), op, k, isLt, value)
     or
     // See argument for why this is correct in compares_eq
-    exists(Operand l, BooleanValue bv |
-      unary_compares_eq(test, l, 0, bv.getValue().booleanNot(), value) and
-      compares_lt(valueNumber(BooleanInstruction<isUnaryComparesEqLeft/1>::get(l.getDef())), op, k,
-        isLt, bv)
+    exists(Operand l, GuardValue bv |
+      unary_compares_eq(test, l, 0, bv.asBooleanValue().booleanNot(), value) and
+      unary_compares_lt(valueNumber(BooleanInstruction<isUnaryComparesEqLeft/1>::get(l.getDef())),
+        op, k, isLt, bv)
     )
   }
 
   /** `(a < b + k) => (b > a - k) => (b >= a + (1-k))` */
   private predicate compares_ge(
-    ValueNumber test, Operand left, Operand right, int k, boolean isGe, AbstractValue value
+    ValueNumber test, Operand left, Operand right, int k, boolean isGe, GuardValue value
   ) {
     exists(int onemk | k = 1 - onemk | compares_lt(test, right, left, onemk, isGe, value))
   }
@@ -1304,34 +1676,33 @@ private module Cached {
 
   /** Rearrange various simple comparisons into `op < k` form. */
   private predicate unary_simple_comparison_lt(
-    SwitchConditionValueNumber test, Operand op, int k, boolean isLt, AbstractValue value
+    SwitchConditionValueNumber test, Operand op, int k, boolean isLt, GuardValue value
   ) {
-    exists(CaseEdge case |
+    exists(string minValue, string maxValue |
       test.getExpressionOperand() = op and
-      case = value.(MatchValue).getCase() and
-      exists(test.getSuccessor(case)) and
-      case.getMaxValue() > case.getMinValue()
+      exists(test.getSuccessor(EdgeKind::caseEdge(minValue, maxValue))) and
+      minValue < maxValue
     |
       // op <= k => op < k - 1
       isLt = true and
-      case.getMaxValue().toInt() = k - 1
+      maxValue.toInt() = k - 1 and
+      value.isIntRange(k - 1, true)
       or
       isLt = false and
-      case.getMinValue().toInt() = k
+      minValue.toInt() = k and
+      value.isIntRange(k, false)
     )
   }
 
   private predicate complex_lt(
-    ValueNumber cmp, Operand left, Operand right, int k, boolean isLt, AbstractValue value
+    ValueNumber cmp, Operand left, Operand right, int k, boolean isLt, GuardValue value
   ) {
     sub_lt(cmp, left, right, k, isLt, value)
     or
     add_lt(cmp, left, right, k, isLt, value)
   }
 
-  private predicate complex_lt(
-    ValueNumber test, Operand left, int k, boolean isLt, AbstractValue value
-  ) {
+  private predicate complex_lt(ValueNumber test, Operand left, int k, boolean isLt, GuardValue value) {
     sub_lt(test, left, k, isLt, value)
     or
     add_lt(test, left, k, isLt, value)
@@ -1340,7 +1711,7 @@ private module Cached {
   // left - x < right + c => left < right + (c+x)
   // left < (right - x) + c => left < right + (c-x)
   private predicate sub_lt(
-    ValueNumber cmp, Operand left, Operand right, int k, boolean isLt, AbstractValue value
+    ValueNumber cmp, Operand left, Operand right, int k, boolean isLt, GuardValue value
   ) {
     exists(SubInstruction lhs, int c, int x |
       compares_lt(cmp, lhs.getAUse(), right, c, isLt, value) and
@@ -1371,16 +1742,16 @@ private module Cached {
     )
   }
 
-  private predicate sub_lt(ValueNumber test, Operand left, int k, boolean isLt, AbstractValue value) {
+  private predicate sub_lt(ValueNumber test, Operand left, int k, boolean isLt, GuardValue value) {
     exists(SubInstruction lhs, int c, int x |
-      compares_lt(test, lhs.getAUse(), c, isLt, value) and
+      unary_compares_lt(test, lhs.getAUse(), c, isLt, value) and
       left = lhs.getLeftOperand() and
       x = int_value(lhs.getRight()) and
       k = c + x
     )
     or
     exists(PointerSubInstruction lhs, int c, int x |
-      compares_lt(test, lhs.getAUse(), c, isLt, value) and
+      unary_compares_lt(test, lhs.getAUse(), c, isLt, value) and
       left = lhs.getLeftOperand() and
       x = int_value(lhs.getRight()) and
       k = c + x
@@ -1390,7 +1761,7 @@ private module Cached {
   // left + x < right + c => left < right + (c-x)
   // left < (right + x) + c => left < right + (c+x)
   private predicate add_lt(
-    ValueNumber cmp, Operand left, Operand right, int k, boolean isLt, AbstractValue value
+    ValueNumber cmp, Operand left, Operand right, int k, boolean isLt, GuardValue value
   ) {
     exists(AddInstruction lhs, int c, int x |
       compares_lt(cmp, lhs.getAUse(), right, c, isLt, value) and
@@ -1433,9 +1804,9 @@ private module Cached {
     )
   }
 
-  private predicate add_lt(ValueNumber test, Operand left, int k, boolean isLt, AbstractValue value) {
+  private predicate add_lt(ValueNumber test, Operand left, int k, boolean isLt, GuardValue value) {
     exists(AddInstruction lhs, int c, int x |
-      compares_lt(test, lhs.getAUse(), c, isLt, value) and
+      unary_compares_lt(test, lhs.getAUse(), c, isLt, value) and
       (
         left = lhs.getLeftOperand() and x = int_value(lhs.getRight())
         or
@@ -1445,7 +1816,7 @@ private module Cached {
     )
     or
     exists(PointerAddInstruction lhs, int c, int x |
-      compares_lt(test, lhs.getAUse(), c, isLt, value) and
+      unary_compares_lt(test, lhs.getAUse(), c, isLt, value) and
       (
         left = lhs.getLeftOperand() and x = int_value(lhs.getRight())
         or
@@ -1458,7 +1829,7 @@ private module Cached {
   // left - x == right + c => left == right + (c+x)
   // left == (right - x) + c => left == right + (c-x)
   private predicate sub_eq(
-    ValueNumber cmp, Operand left, Operand right, int k, boolean areEqual, AbstractValue value
+    ValueNumber cmp, Operand left, Operand right, int k, boolean areEqual, GuardValue value
   ) {
     exists(SubInstruction lhs, int c, int x |
       compares_eq(cmp, lhs.getAUse(), right, c, areEqual, value) and
@@ -1491,7 +1862,7 @@ private module Cached {
 
   // op - x == c => op == (c+x)
   private predicate unary_sub_eq(
-    ValueNumber test, Operand op, int k, boolean areEqual, AbstractValue value
+    ValueNumber test, Operand op, int k, boolean areEqual, GuardValue value
   ) {
     exists(SubInstruction sub, int c, int x |
       unary_compares_eq(test, sub.getAUse(), c, areEqual, value) and
@@ -1511,7 +1882,7 @@ private module Cached {
   // left + x == right + c => left == right + (c-x)
   // left == (right + x) + c => left == right + (c+x)
   private predicate add_eq(
-    ValueNumber cmp, Operand left, Operand right, int k, boolean areEqual, AbstractValue value
+    ValueNumber cmp, Operand left, Operand right, int k, boolean areEqual, GuardValue value
   ) {
     exists(AddInstruction lhs, int c, int x |
       compares_eq(cmp, lhs.getAUse(), right, c, areEqual, value) and
@@ -1556,7 +1927,7 @@ private module Cached {
 
   // left + x == right + c => left == right + (c-x)
   private predicate unary_add_eq(
-    ValueNumber test, Operand left, int k, boolean areEqual, AbstractValue value
+    ValueNumber test, Operand left, int k, boolean areEqual, GuardValue value
   ) {
     exists(AddInstruction lhs, int c, int x |
       unary_compares_eq(test, lhs.getAUse(), c, areEqual, value) and
@@ -1599,7 +1970,7 @@ private import Cached
  * To find the specific guard that performs the comparison
  * use `IRGuards.comparesLt`.
  */
-predicate comparesLt(Operand left, Operand right, int k, boolean isLt, AbstractValue value) {
+predicate comparesLt(Operand left, Operand right, int k, boolean isLt, GuardValue value) {
   compares_lt(_, left, right, k, isLt, value)
 }
 
@@ -1610,6 +1981,6 @@ predicate comparesLt(Operand left, Operand right, int k, boolean isLt, AbstractV
  * To find the specific guard that performs the comparison
  * use `IRGuards.comparesEq`.
  */
-predicate comparesEq(Operand left, Operand right, int k, boolean isLt, AbstractValue value) {
+predicate comparesEq(Operand left, Operand right, int k, boolean isLt, GuardValue value) {
   compares_eq(_, left, right, k, isLt, value)
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/controlflow/internal/CFG.qll b/cpp/ql/lib/semmle/code/cpp/controlflow/internal/CFG.qll
index 05eafe28275..23ef5859221 100644
--- a/cpp/ql/lib/semmle/code/cpp/controlflow/internal/CFG.qll
+++ b/cpp/ql/lib/semmle/code/cpp/controlflow/internal/CFG.qll
@@ -1042,8 +1042,8 @@ private predicate subEdgeIncludingDestructors(Pos p1, Node n1, Node n2, Pos p2)
  * - `MicrosoftTryFinallyStmt`: On the edge following the `__finally` block for
  *   the case where an exception was thrown and needs to be propagated.
  */
-DestructorCall getSynthesisedDestructorCallAfterNode(Node n, int i) {
-  synthetic_destructor_call(n, i, result)
+DestructorCall getSynthesisedDestructorCallAfterNode(Node node, int index) {
+  synthetic_destructor_call(node, index, result)
 }
 
 /**
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/ExternalFlow.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/ExternalFlow.qll
index b279c4965f3..b71a46f6961 100644
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/ExternalFlow.qll
+++ b/cpp/ql/lib/semmle/code/cpp/dataflow/ExternalFlow.qll
@@ -656,6 +656,7 @@ private string getTypeNameWithoutFunctionTemplates(Function f, int n, int remain
  * Normalize the `n`'th parameter of `f` by replacing template names
  * with `class:N` (where `N` is the index of the template).
  */
+pragma[nomagic]
 private string getTypeNameWithoutClassTemplates(Function f, int n, int remaining) {
   // If there is a declaring type then we start by expanding the function templates
   exists(Class template |
@@ -727,6 +728,7 @@ private string getSignatureWithoutClassTemplateNames(
  * - The `remaining` number of template arguments in `partiallyNormalizedSignature`
  * with their index in `nameArgs`.
  */
+pragma[nomagic]
 private string getSignatureWithoutFunctionTemplateNames(
   string partiallyNormalizedSignature, string typeArgs, string nameArgs, int remaining
 ) {
@@ -770,6 +772,7 @@ private string getSignatureWithoutFunctionTemplateNames(
  * ```
  * In this case, `normalizedSignature` will be `"(const func:0 &,int,class:1,class:0 *)"`.
  */
+pragma[nomagic]
 private predicate elementSpecWithArguments(
   string signature, string type, string name, string normalizedSignature, string typeArgs,
   string nameArgs
@@ -789,6 +792,35 @@ private string getSignatureParameterName(string signature, string type, string n
   )
 }
 
+/**
+ * Gets a `Function` identified by the `(namespace, type, name)` components.
+ *
+ * If `subtypes` is `true` then the result may be an override of the function
+ * identified by the components.
+ */
+pragma[nomagic]
+private Function getFunction(string namespace, string type, boolean subtypes, string name) {
+  elementSpec(namespace, type, subtypes, name, _, _) and
+  (
+    funcHasQualifiedName(result, namespace, name) and
+    subtypes = false and
+    type = ""
+    or
+    exists(Class namedClass, Class classWithMethod |
+      hasClassAndName(classWithMethod, result, name) and
+      classHasQualifiedName(namedClass, namespace, type)
+    |
+      // member declared in the named type or a subtype of it
+      subtypes = true and
+      classWithMethod = namedClass.getADerivedClass*()
+      or
+      // member declared directly in the named type
+      subtypes = false and
+      classWithMethod = namedClass
+    )
+  )
+}
+
 /**
  * Holds if the suffix containing the entries in `signature` starting at entry
  * `i` matches the suffix containing the parameters of `func` starting at entry `i`.
@@ -812,13 +844,17 @@ private string getSignatureParameterName(string signature, string type, string n
  * is `func:n` then the signature name is compared with the `n`'th name
  * in `name`.
  */
-private predicate signatureMatches(Function func, string signature, string type, string name, int i) {
+pragma[nomagic]
+private predicate signatureMatches(
+  Function func, string namespace, string signature, string type, string name, int i
+) {
+  func = getFunction(namespace, type, _, name) and
   exists(string s |
     s = getSignatureParameterName(signature, type, name, i) and
     s = getParameterTypeName(func, i)
   ) and
   if exists(getParameterTypeName(func, i + 1))
-  then signatureMatches(func, signature, type, name, i + 1)
+  then signatureMatches(func, namespace, signature, type, name, i + 1)
   else i = count(signature.indexOf(","))
 }
 
@@ -833,7 +869,7 @@ module ExternalFlowDebug {
    *
    * Exposed for testing purposes.
    */
-  predicate signatureMatches_debug = signatureMatches/5;
+  predicate signatureMatches_debug = signatureMatches/6;
 
   /**
    * INTERNAL: Do not use.
@@ -883,6 +919,7 @@ private predicate parseParens(string s, string betweenParens) { s = "(" + betwee
  * - `signatureWithoutParens` equals `signature`, but with the surrounding
  *    parentheses removed.
  */
+pragma[nomagic]
 private predicate elementSpecWithArguments0(
   string signature, string type, string name, string signatureWithoutParens, string typeArgs,
   string nameArgs
@@ -909,7 +946,7 @@ private predicate elementSpecMatchesSignature(
 ) {
   elementSpec(namespace, pragma[only_bind_into](type), subtypes, pragma[only_bind_into](name),
     pragma[only_bind_into](signature), _) and
-  signatureMatches(func, signature, type, name, 0)
+  signatureMatches(func, namespace, signature, type, name, 0)
 }
 
 /**
@@ -953,7 +990,7 @@ private predicate funcHasQualifiedName(Function func, string namespace, string n
  * Holds if `namedClass` is in namespace `namespace` and has
  * name `type` (excluding any template parameters).
  */
-bindingset[type, namespace]
+bindingset[type]
 pragma[inline_late]
 private predicate classHasQualifiedName(Class namedClass, string namespace, string type) {
   exists(string typeWithoutArgs |
@@ -969,17 +1006,14 @@ private predicate classHasQualifiedName(Class namedClass, string namespace, stri
  *    are also returned.
  * 3. The element has name `name`
  * 4. If `signature` is non-empty, then the element has a list of parameter types described by `signature`.
- *
- * NOTE: `namespace` is currently not used (since we don't properly extract modules yet).
  */
 pragma[nomagic]
 private Element interpretElement0(
   string namespace, string type, boolean subtypes, string name, string signature
 ) {
+  result = getFunction(namespace, type, subtypes, name) and
   (
     // Non-member functions
-    funcHasQualifiedName(result, namespace, name) and
-    subtypes = false and
     type = "" and
     (
       elementSpecMatchesSignature(result, namespace, type, subtypes, name, signature)
@@ -989,52 +1023,36 @@ private Element interpretElement0(
     )
     or
     // Member functions
-    exists(Class namedClass, Class classWithMethod |
-      hasClassAndName(classWithMethod, result, name) and
-      classHasQualifiedName(namedClass, namespace, type)
-    |
-      (
-        elementSpecMatchesSignature(result, namespace, type, subtypes, name, signature)
-        or
-        signature = "" and
-        elementSpec(namespace, type, subtypes, name, "", _)
-      ) and
-      (
-        // member declared in the named type or a subtype of it
-        subtypes = true and
-        classWithMethod = namedClass.getADerivedClass*()
-        or
-        // member declared directly in the named type
-        subtypes = false and
-        classWithMethod = namedClass
-      )
-    )
+    elementSpecMatchesSignature(result, namespace, type, subtypes, name, signature)
     or
-    elementSpec(namespace, type, subtypes, name, signature, _) and
-    // Member variables
     signature = "" and
-    exists(Class namedClass, Class classWithMember, MemberVariable member |
-      member.getName() = name and
-      member = classWithMember.getAMember() and
-      namedClass.hasQualifiedName(namespace, type) and
-      result = member
-    |
-      // field declared in the named type or a subtype of it (or an extension of any)
-      subtypes = true and
-      classWithMember = namedClass.getADerivedClass*()
-      or
-      // field declared directly in the named type (or an extension of it)
-      subtypes = false and
-      classWithMember = namedClass
-    )
-    or
-    // Global or namespace variables
-    elementSpec(namespace, type, subtypes, name, signature, _) and
-    signature = "" and
-    type = "" and
-    subtypes = false and
-    result = any(GlobalOrNamespaceVariable v | v.hasQualifiedName(namespace, name))
+    elementSpec(namespace, type, subtypes, name, signature, _)
   )
+  or
+  // Member variables
+  elementSpec(namespace, type, subtypes, name, signature, _) and
+  signature = "" and
+  exists(Class namedClass, Class classWithMember, MemberVariable member |
+    member.getName() = name and
+    member = classWithMember.getAMember() and
+    namedClass.hasQualifiedName(namespace, type) and
+    result = member
+  |
+    // field declared in the named type or a subtype of it (or an extension of any)
+    subtypes = true and
+    classWithMember = namedClass.getADerivedClass*()
+    or
+    // field declared directly in the named type (or an extension of it)
+    subtypes = false and
+    classWithMember = namedClass
+  )
+  or
+  // Global or namespace variables
+  elementSpec(namespace, type, subtypes, name, signature, _) and
+  signature = "" and
+  type = "" and
+  subtypes = false and
+  result = any(GlobalOrNamespaceVariable v | v.hasQualifiedName(namespace, name))
 }
 
 cached
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowUtil.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowUtil.qll
index 72e742f13aa..e6d53f8bf64 100644
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowUtil.qll
+++ b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowUtil.qll
@@ -834,8 +834,10 @@ class ContentSet instanceof Content {
    * For more information, see
    * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
    */
-  predicate hasLocationInfo(string path, int sl, int sc, int el, int ec) {
-    super.hasLocationInfo(path, sl, sc, el, ec)
+  predicate hasLocationInfo(
+    string filepath, int startline, int startcolumn, int endline, int endcolumn
+  ) {
+    super.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
   }
 }
 
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/FlowSummaryImpl.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/FlowSummaryImpl.qll
index 58c3dfdea16..d89ab06ed82 100644
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/FlowSummaryImpl.qll
+++ b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/FlowSummaryImpl.qll
@@ -104,7 +104,9 @@ private module StepsInput implements Impl::Private::StepsInputSig {
     result.getStaticCallTarget().getUnderlyingCallable() = sc
   }
 
-  Node getSourceNode(Input::SourceBase source, Impl::Private::SummaryComponent sc) { none() }
+  DataFlowCallable getSourceNodeEnclosingCallable(Input::SourceBase source) { none() }
+
+  Node getSourceNode(Input::SourceBase source, Impl::Private::SummaryComponentStack s) { none() }
 
   Node getSinkNode(Input::SinkBase sink, Impl::Private::SummaryComponent sc) { none() }
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowDispatch.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowDispatch.qll
index b5e899bf0aa..0d63558c956 100644
--- 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,218 +1,21 @@
 private import cpp
 private import semmle.code.cpp.ir.IR
-private import DataFlowPrivate
+private import semmle.code.cpp.ir.dataflow.DataFlow
+private import DataFlowPrivate as DataFlowPrivate
 private import DataFlowUtil
 private import DataFlowImplCommon as DataFlowImplCommon
+private import codeql.typetracking.TypeTracking
+private import SsaImpl as SsaImpl
 
 /**
- * Gets a function that might be called by `call`.
- *
- * This predicate does not take additional call targets
- * from `AdditionalCallTarget` into account.
+ * Holds if `f` has name `qualifiedName` and `nparams` parameter count. This is
+ * an approximation of its signature for the purpose of matching functions that
+ * might be the same across link targets.
  */
-cached
-DataFlowCallable defaultViableCallable(DataFlowCall call) {
-  DataFlowImplCommon::forceCachingInSameStage() and
-  result = call.getStaticCallTarget()
-  or
-  // If the target of the call does not have a body in the snapshot, it might
-  // be because the target is just a header declaration, and the real target
-  // will be determined at run time when the caller and callee are linked
-  // together by the operating system's dynamic linker. In case a _unique_
-  // function with the right signature is present in the database, we return
-  // that as a potential callee.
-  exists(string qualifiedName, int nparams |
-    callSignatureWithoutBody(qualifiedName, nparams, call.asCallInstruction()) and
-    functionSignatureWithBody(qualifiedName, nparams, result.getUnderlyingCallable()) and
-    strictcount(Function other | functionSignatureWithBody(qualifiedName, nparams, other)) = 1
-  )
-  or
-  // Virtual dispatch
-  result.asSourceCallable() = call.(VirtualDispatch::DataSensitiveCall).resolve()
-}
-
-/**
- * Gets a function that might be called by `call`.
- */
-cached
-DataFlowCallable viableCallable(DataFlowCall call) {
-  result = defaultViableCallable(call)
-  or
-  // Additional call targets
-  result.getUnderlyingCallable() =
-    any(AdditionalCallTarget additional)
-        .viableTarget(call.asCallInstruction().getUnconvertedResultExpression())
-}
-
-/**
- * Provides virtual dispatch support compatible with the original
- * implementation of `semmle.code.cpp.security.TaintTracking`.
- */
-private module VirtualDispatch {
-  /** A call that may dispatch differently depending on the qualifier value. */
-  abstract class DataSensitiveCall extends DataFlowCall {
-    /**
-     * Gets the node whose value determines the target of this call. This node
-     * could be the qualifier of a virtual dispatch or the function-pointer
-     * expression in a call to a function pointer. What they have in common is
-     * that we need to find out which data flows there, and then it's up to the
-     * `resolve` predicate to stitch that information together and resolve the
-     * call.
-     */
-    abstract Node getDispatchValue();
-
-    /** Gets a candidate target for this call. */
-    abstract Function resolve();
-
-    /**
-     * Whether `src` can flow to this call.
-     *
-     * Searches backwards from `getDispatchValue()` to `src`. The `allowFromArg`
-     * 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) {
-      src = this.getDispatchValue() and allowFromArg = true
-      or
-      exists(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
-          src.(ArgumentNode).argumentOf(call, pragma[only_bind_into](pragma[only_bind_out](i)))
-        ) and
-        allowOtherFromArg = true and
-        allowFromArg = true
-        or
-        // Call return
-        exists(DataFlowCall call, ReturnKind returnKind |
-          other = getAnOutNode(call, returnKind) and
-          returnNodeWithKindAndEnclosingCallable(src, returnKind, call.getStaticCallTarget())
-        ) and
-        allowFromArg = false
-        or
-        // Local flow
-        localFlowStep(src, other) and
-        allowFromArg = allowOtherFromArg
-        or
-        // Flow from global variable to load.
-        exists(LoadInstruction load, GlobalOrNamespaceVariable var |
-          var = src.asVariable() and
-          other.asInstruction() = load and
-          addressOfGlobal(load.getSourceAddress(), var) and
-          // The `allowFromArg` concept doesn't play a role when `src` is a
-          // global variable, so we just set it to a single arbitrary value for
-          // performance.
-          allowFromArg = true
-        )
-        or
-        // Flow from store to global variable.
-        exists(StoreInstruction store, GlobalOrNamespaceVariable var |
-          var = other.asVariable() and
-          store = src.asInstruction() and
-          storeIntoGlobal(store, var) and
-          // Setting `allowFromArg` to `true` like in the base case means we
-          // treat a store to a global variable like the dispatch itself: flow
-          // may come from anywhere.
-          allowFromArg = true
-        )
-      )
-    }
-  }
-
-  pragma[noinline]
-  private predicate storeIntoGlobal(StoreInstruction store, GlobalOrNamespaceVariable var) {
-    addressOfGlobal(store.getDestinationAddress(), var)
-  }
-
-  /** Holds if `addressInstr` is an instruction that produces the address of `var`. */
-  private predicate addressOfGlobal(Instruction addressInstr, GlobalOrNamespaceVariable var) {
-    // Access directly to the global variable
-    addressInstr.(VariableAddressInstruction).getAstVariable() = var
-    or
-    // Access to a field on a global union
-    exists(FieldAddressInstruction fa |
-      fa = addressInstr and
-      fa.getObjectAddress().(VariableAddressInstruction).getAstVariable() = var and
-      fa.getField().getDeclaringType() instanceof Union
-    )
-  }
-
-  /**
-   * A ReturnNode with its ReturnKind and its enclosing callable.
-   *
-   * Used to fix a join ordering issue in flowsFrom.
-   */
-  pragma[noinline]
-  private predicate returnNodeWithKindAndEnclosingCallable(
-    ReturnNode node, ReturnKind kind, DataFlowCallable callable
-  ) {
-    node.getKind() = kind and
-    node.getFunction() = callable.getUnderlyingCallable()
-  }
-
-  /** Call through a function pointer. */
-  private class DataSensitiveExprCall extends DataSensitiveCall {
-    DataSensitiveExprCall() { not exists(this.getStaticCallTarget()) }
-
-    override Node getDispatchValue() { result.asOperand() = this.getCallTargetOperand() }
-
-    override Function resolve() {
-      exists(FunctionInstruction fi |
-        this.flowsFrom(instructionNode(fi), _) and
-        result = fi.getFunctionSymbol()
-      ) and
-      (
-        this.getNumberOfArguments() <= result.getEffectiveNumberOfParameters() and
-        this.getNumberOfArguments() >= result.getEffectiveNumberOfParameters()
-        or
-        result.isVarargs()
-      )
-    }
-  }
-
-  /** Call to a virtual function. */
-  private class DataSensitiveOverriddenFunctionCall extends DataSensitiveCall {
-    DataSensitiveOverriddenFunctionCall() {
-      exists(
-        this.getStaticCallTarget()
-            .getUnderlyingCallable()
-            .(VirtualFunction)
-            .getAnOverridingFunction()
-      )
-    }
-
-    override Node getDispatchValue() { result.asInstruction() = this.getArgument(-1) }
-
-    override MemberFunction resolve() {
-      exists(Class overridingClass |
-        this.overrideMayAffectCall(overridingClass, result) and
-        this.hasFlowFromCastFrom(overridingClass)
-      )
-    }
-
-    /**
-     * Holds if `this` is a virtual function call whose static target is
-     * overridden by `overridingFunction` in `overridingClass`.
-     */
-    pragma[noinline]
-    private predicate overrideMayAffectCall(Class overridingClass, MemberFunction overridingFunction) {
-      overridingFunction.getAnOverriddenFunction+() =
-        this.getStaticCallTarget().getUnderlyingCallable().(VirtualFunction) and
-      overridingFunction.getDeclaringType() = overridingClass
-    }
-
-    /**
-     * Holds if the qualifier of `this` has flow from an upcast from
-     * `derivedClass`.
-     */
-    pragma[noinline]
-    private predicate hasFlowFromCastFrom(Class derivedClass) {
-      exists(ConvertToBaseInstruction toBase |
-        this.flowsFrom(instructionNode(toBase), _) and
-        derivedClass = toBase.getDerivedClass()
-      )
-    }
-  }
+private predicate functionSignature(Function f, string qualifiedName, int nparams) {
+  qualifiedName = f.getQualifiedName() and
+  nparams = f.getNumberOfParameters() and
+  not f.isStatic()
 }
 
 /**
@@ -238,34 +41,319 @@ private predicate callSignatureWithoutBody(string qualifiedName, int nparams, Ca
 }
 
 /**
- * Holds if `f` has name `qualifiedName` and `nparams` parameter count. This is
- * an approximation of its signature for the purpose of matching functions that
- * might be the same across link targets.
+ * Gets a function that might be called by `call`.
+ *
+ * This predicate does not take additional call targets
+ * from `AdditionalCallTarget` into account.
  */
-private predicate functionSignature(Function f, string qualifiedName, int nparams) {
-  qualifiedName = f.getQualifiedName() and
-  nparams = f.getNumberOfParameters() and
-  not f.isStatic()
+cached
+DataFlowPrivate::DataFlowCallable defaultViableCallable(DataFlowPrivate::DataFlowCall call) {
+  result = defaultViableCallableWithoutLambda(call)
+  or
+  result = DataFlowImplCommon::viableCallableLambda(call, _)
+}
+
+private DataFlowPrivate::DataFlowCallable defaultViableCallableWithoutLambda(
+  DataFlowPrivate::DataFlowCall call
+) {
+  DataFlowImplCommon::forceCachingInSameStage() and
+  result = call.getStaticCallTarget()
+  or
+  // If the target of the call does not have a body in the snapshot, it might
+  // be because the target is just a header declaration, and the real target
+  // will be determined at run time when the caller and callee are linked
+  // together by the operating system's dynamic linker. In case a _unique_
+  // function with the right signature is present in the database, we return
+  // that as a potential callee.
+  exists(string qualifiedName, int nparams |
+    callSignatureWithoutBody(qualifiedName, nparams, call.asCallInstruction()) and
+    functionSignatureWithBody(qualifiedName, nparams, result.getUnderlyingCallable()) and
+    strictcount(Function other | functionSignatureWithBody(qualifiedName, nparams, other)) = 1
+  )
+}
+
+/**
+ * Gets a function that might be called by `call`.
+ */
+private DataFlowPrivate::DataFlowCallable nonVirtualDispatch(DataFlowPrivate::DataFlowCall call) {
+  result = defaultViableCallableWithoutLambda(call)
+  or
+  // Additional call targets
+  result.getUnderlyingCallable() =
+    any(AdditionalCallTarget additional)
+        .viableTarget(call.asCallInstruction().getUnconvertedResultExpression())
+}
+
+private class RelevantNode extends Node {
+  RelevantNode() { this.getType().stripType() instanceof Class }
+}
+
+private signature DataFlowPrivate::DataFlowCallable methodDispatchSig(
+  DataFlowPrivate::DataFlowCall c
+);
+
+private predicate ignoreConstructor(Expr e) {
+  e instanceof ConstructorDirectInit or
+  e instanceof ConstructorVirtualInit or
+  e instanceof ConstructorDelegationInit or
+  exists(ConstructorFieldInit init | init.getExpr() = e)
+}
+
+/**
+ * Holds if `n` is either:
+ * - the post-update node of a qualifier after a call to a constructor which
+ * constructs an object containing at least one virtual function.
+ * - a node which represents a derived-to-base instruction that converts from `c`.
+ */
+private predicate qualifierSourceImpl(RelevantNode n, Class c) {
+  // Object construction
+  exists(CallInstruction call, ThisArgumentOperand qualifier, Call e |
+    qualifier = call.getThisArgumentOperand() and
+    n.(PostUpdateNode).getPreUpdateNode().asOperand() = qualifier and
+    call.getStaticCallTarget() instanceof Constructor and
+    qualifier.getType().stripType() = c and
+    c.getABaseClass*().getAMemberFunction().isVirtual() and
+    e = call.getUnconvertedResultExpression() and
+    not ignoreConstructor(e)
+  |
+    exists(c.getABaseClass())
+    or
+    exists(c.getADerivedClass())
+  )
+  or
+  // Conversion to a base class
+  exists(ConvertToBaseInstruction convert |
+    // Only keep the most specific cast
+    not convert.getUnary() instanceof ConvertToBaseInstruction and
+    n.asInstruction() = convert and
+    convert.getDerivedClass() = c and
+    c.getABaseClass*().getAMemberFunction().isVirtual()
+  )
+}
+
+private module TrackVirtualDispatch<methodDispatchSig/1 virtualDispatch0> {
+  /**
+   * Gets a possible runtime target of `c` using both static call-target
+   * information, and call-target resolution from `virtualDispatch0`.
+   */
+  private DataFlowPrivate::DataFlowCallable dispatch(DataFlowPrivate::DataFlowCall c) {
+    result = nonVirtualDispatch(c) or
+    result = virtualDispatch0(c)
+  }
+
+  private module TtInput implements TypeTrackingInput<Location> {
+    final class Node = RelevantNode;
+
+    class LocalSourceNode extends Node {
+      LocalSourceNode() {
+        this instanceof ParameterNode
+        or
+        this instanceof DataFlowPrivate::OutNode
+        or
+        DataFlowPrivate::readStep(_, _, this)
+        or
+        DataFlowPrivate::storeStep(_, _, this)
+        or
+        DataFlowPrivate::jumpStep(_, this)
+        or
+        qualifierSourceImpl(this, _)
+      }
+    }
+
+    final private class ContentSetFinal = ContentSet;
+
+    class Content extends ContentSetFinal {
+      Content() {
+        exists(DataFlow::Content c |
+          this.isSingleton(c) and
+          c.getIndirectionIndex() = 1
+        )
+      }
+    }
+
+    class ContentFilter extends Content {
+      Content getAMatchingContent() { result = this }
+    }
+
+    predicate compatibleContents(Content storeContents, Content loadContents) {
+      storeContents = loadContents
+    }
+
+    predicate simpleLocalSmallStep(Node nodeFrom, Node nodeTo) {
+      nodeFrom.getFunction() instanceof Function and
+      simpleLocalFlowStep(nodeFrom, nodeTo, _)
+    }
+
+    predicate levelStepNoCall(Node n1, LocalSourceNode n2) { none() }
+
+    predicate levelStepCall(Node n1, LocalSourceNode n2) { none() }
+
+    predicate storeStep(Node n1, Node n2, Content f) { DataFlowPrivate::storeStep(n1, f, n2) }
+
+    predicate callStep(Node n1, LocalSourceNode n2) {
+      exists(DataFlowPrivate::DataFlowCall call, DataFlowPrivate::Position pos |
+        n1.(DataFlowPrivate::ArgumentNode).argumentOf(call, pos) and
+        n2.(ParameterNode).isParameterOf(dispatch(call), pos)
+      )
+    }
+
+    predicate returnStep(Node n1, LocalSourceNode n2) {
+      exists(DataFlowPrivate::DataFlowCallable callable, DataFlowPrivate::DataFlowCall call |
+        n1.(DataFlowPrivate::ReturnNode).getEnclosingCallable() = callable and
+        callable = dispatch(call) and
+        n2 = DataFlowPrivate::getAnOutNode(call, n1.(DataFlowPrivate::ReturnNode).getKind())
+      )
+    }
+
+    predicate loadStep(Node n1, LocalSourceNode n2, Content f) {
+      DataFlowPrivate::readStep(n1, f, n2)
+    }
+
+    predicate loadStoreStep(Node nodeFrom, Node nodeTo, Content f1, Content f2) { none() }
+
+    predicate withContentStep(Node nodeFrom, LocalSourceNode nodeTo, ContentFilter f) { none() }
+
+    predicate withoutContentStep(Node nodeFrom, LocalSourceNode nodeTo, ContentFilter f) { none() }
+
+    predicate jumpStep(Node n1, LocalSourceNode n2) { DataFlowPrivate::jumpStep(n1, n2) }
+
+    predicate hasFeatureBacktrackStoreTarget() { none() }
+  }
+
+  private predicate qualifierSource(RelevantNode n) { qualifierSourceImpl(n, _) }
+
+  /**
+   * Holds if `n` is the qualifier of `call` which targets the virtual member
+   * function `mf`.
+   */
+  private predicate qualifierOfVirtualCallImpl(
+    RelevantNode n, CallInstruction call, MemberFunction mf
+  ) {
+    n.asOperand() = call.getThisArgumentOperand() and
+    call.getStaticCallTarget() = mf and
+    mf.isVirtual()
+  }
+
+  private predicate qualifierOfVirtualCall(RelevantNode n) { qualifierOfVirtualCallImpl(n, _, _) }
+
+  private import TypeTracking<Location, TtInput>::TypeTrack<qualifierSource/1>::Graph<qualifierOfVirtualCall/1>
+
+  private predicate edgePlus(PathNode n1, PathNode n2) = fastTC(edges/2)(n1, n2)
+
+  /**
+   * Gets the most specific implementation of `mf` that may be called when the
+   * qualifier has runtime type `c`.
+   */
+  private MemberFunction mostSpecific(MemberFunction mf, Class c) {
+    qualifierOfVirtualCallImpl(_, _, mf) and
+    mf.getAnOverridingFunction*() = result and
+    (
+      result.getDeclaringType() = c
+      or
+      not c.getAMemberFunction().getAnOverriddenFunction*() = mf and
+      result = mostSpecific(mf, c.getABaseClass())
+    )
+  }
+
+  /**
+   * Gets a possible pair of end-points `(p1, p2)` where:
+   * - `p1` is a derived-to-base conversion that converts from some
+   * class `derived`, and
+   * - `p2` is the qualifier of a call to a virtual function that may
+   * target `callable`, and
+   * - `callable` is the most specific implementation that may be called when
+   * the qualifier has type `derived`.
+   */
+  private predicate pairCand(
+    PathNode p1, PathNode p2, DataFlowPrivate::DataFlowCallable callable,
+    DataFlowPrivate::DataFlowCall call
+  ) {
+    exists(Class derived, MemberFunction mf |
+      qualifierSourceImpl(p1.getNode(), derived) and
+      qualifierOfVirtualCallImpl(p2.getNode(), call.asCallInstruction(), mf) and
+      p1.isSource() and
+      p2.isSink() and
+      callable.asSourceCallable() = mostSpecific(mf, derived)
+    )
+  }
+
+  /** Gets a possible run-time target of `call`. */
+  DataFlowPrivate::DataFlowCallable virtualDispatch(DataFlowPrivate::DataFlowCall call) {
+    exists(PathNode p1, PathNode p2 | p1 = p2 or edgePlus(p1, p2) | pairCand(p1, p2, result, call))
+  }
+}
+
+private DataFlowPrivate::DataFlowCallable noDisp(DataFlowPrivate::DataFlowCall call) { none() }
+
+pragma[nomagic]
+private DataFlowPrivate::DataFlowCallable d1(DataFlowPrivate::DataFlowCall call) {
+  result = TrackVirtualDispatch<noDisp/1>::virtualDispatch(call)
+}
+
+pragma[nomagic]
+private DataFlowPrivate::DataFlowCallable d2(DataFlowPrivate::DataFlowCall call) {
+  result = TrackVirtualDispatch<d1/1>::virtualDispatch(call)
+}
+
+pragma[nomagic]
+private DataFlowPrivate::DataFlowCallable d3(DataFlowPrivate::DataFlowCall call) {
+  result = TrackVirtualDispatch<d2/1>::virtualDispatch(call)
+}
+
+pragma[nomagic]
+private DataFlowPrivate::DataFlowCallable d4(DataFlowPrivate::DataFlowCall call) {
+  result = TrackVirtualDispatch<d3/1>::virtualDispatch(call)
+}
+
+pragma[nomagic]
+private DataFlowPrivate::DataFlowCallable d5(DataFlowPrivate::DataFlowCall call) {
+  result = TrackVirtualDispatch<d4/1>::virtualDispatch(call)
+}
+
+pragma[nomagic]
+private DataFlowPrivate::DataFlowCallable d6(DataFlowPrivate::DataFlowCall call) {
+  result = TrackVirtualDispatch<d5/1>::virtualDispatch(call)
+}
+
+/** Gets a function that might be called by `call`. */
+cached
+DataFlowPrivate::DataFlowCallable viableCallable(DataFlowPrivate::DataFlowCall call) {
+  not exists(d6(call)) and
+  result = nonVirtualDispatch(call)
+  or
+  result = d6(call)
 }
 
 /**
  * Holds if the set of viable implementations that can be called by `call`
  * might be improved by knowing the call context.
  */
-predicate mayBenefitFromCallContext(DataFlowCall call) { mayBenefitFromCallContext(call, _, _) }
+predicate mayBenefitFromCallContext(DataFlowPrivate::DataFlowCall call) {
+  mayBenefitFromCallContext(call, _, _)
+}
+
+private predicate localLambdaFlowStep(Node nodeFrom, Node nodeTo) {
+  localFlowStep(nodeFrom, nodeTo)
+  or
+  DataFlowPrivate::additionalLambdaFlowStep(nodeFrom, nodeTo, _)
+}
 
 /**
  * Holds if `call` is a call through a function pointer, and the pointer
  * value is given as the `arg`'th argument to `f`.
  */
 private predicate mayBenefitFromCallContext(
-  VirtualDispatch::DataSensitiveCall call, DataFlowCallable f, int arg
+  DataFlowPrivate::DataFlowCall call, DataFlowPrivate::DataFlowCallable f, int arg
 ) {
   f = pragma[only_bind_out](call).getEnclosingCallable() and
   exists(InitializeParameterInstruction init |
-    not exists(call.getStaticCallTarget()) and
+    not exists(call.getStaticCallTarget())
+    or
+    exists(call.getStaticCallSourceTarget().(VirtualFunction).getAnOverridingFunction())
+  |
     init.getEnclosingFunction() = f.getUnderlyingCallable() and
-    call.flowsFrom(instructionNode(init), _) and
+    localLambdaFlowStep+(instructionNode(init),
+      operandNode(call.asCallInstruction().getCallTargetOperand())) and
     init.getParameter().getIndex() = arg
   )
 }
@@ -274,9 +362,11 @@ private predicate mayBenefitFromCallContext(
  * Gets a viable dispatch target of `call` in the context `ctx`. This is
  * restricted to those `call`s for which a context might make a difference.
  */
-DataFlowCallable viableImplInCallContext(DataFlowCall call, DataFlowCall ctx) {
+DataFlowPrivate::DataFlowCallable viableImplInCallContext(
+  DataFlowPrivate::DataFlowCall call, DataFlowPrivate::DataFlowCall ctx
+) {
   result = viableCallable(call) and
-  exists(int i, DataFlowCallable f |
+  exists(int i, DataFlowPrivate::DataFlowCallable f |
     mayBenefitFromCallContext(pragma[only_bind_into](call), f, i) and
     f = ctx.getStaticCallTarget() and
     result.asSourceCallable() =
@@ -286,4 +376,8 @@ DataFlowCallable viableImplInCallContext(DataFlowCall call, DataFlowCall ctx) {
 
 /** Holds if arguments at position `apos` match parameters at position `ppos`. */
 pragma[inline]
-predicate parameterMatch(ParameterPosition ppos, ArgumentPosition apos) { ppos = apos }
+predicate parameterMatch(
+  DataFlowPrivate::ParameterPosition ppos, DataFlowPrivate::ArgumentPosition apos
+) {
+  ppos = apos
+}
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowPrivate.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowPrivate.qll
index a03042a77ff..582391e81cc 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowPrivate.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowPrivate.qll
@@ -1492,7 +1492,14 @@ predicate lambdaCall(DataFlowCall call, LambdaCallKind kind, Node receiver) {
 }
 
 /** Extra data-flow steps needed for lambda flow analysis. */
-predicate additionalLambdaFlowStep(Node nodeFrom, Node nodeTo, boolean preservesValue) { none() }
+predicate additionalLambdaFlowStep(Node nodeFrom, Node nodeTo, boolean preservesValue) {
+  preservesValue = false and
+  exists(ContentSet cs | cs.isSingleton(any(UnionContent uc)) |
+    storeStep(nodeFrom, cs, nodeTo)
+    or
+    readStep(nodeFrom, cs, nodeTo)
+  )
+}
 
 predicate knownSourceModel(Node source, string model) { External::sourceNode(source, _, model) }
 
@@ -1873,9 +1880,7 @@ module IteratorFlow {
     }
   }
 
-  private module SsaInput implements SsaImpl::InputSig<Location> {
-    import Ssa::InputSigCommon
-
+  private module SsaInput implements SsaImpl::InputSig<Location, IRCfg::BasicBlock> {
     class SourceVariable = IteratorFlow::SourceVariable;
 
     /** A call to function that dereferences an iterator. */
@@ -1953,7 +1958,7 @@ module IteratorFlow {
      * Holds if `(bb, i)` contains a write to an iterator that may have been obtained
      * by calling `begin` (or related functions) on the variable `v`.
      */
-    predicate variableWrite(BasicBlock bb, int i, SourceVariable v, boolean certain) {
+    predicate variableWrite(IRCfg::BasicBlock bb, int i, SourceVariable v, boolean certain) {
       certain = false and
       exists(GetsIteratorCall beginCall, Instruction writeToDeref, IRBlock bbQual, int iQual |
         isIteratorStoreInstruction(beginCall, writeToDeref) and
@@ -1964,12 +1969,12 @@ module IteratorFlow {
     }
 
     /** Holds if `(bb, i)` reads the container variable `v`. */
-    predicate variableRead(BasicBlock bb, int i, SourceVariable v, boolean certain) {
+    predicate variableRead(IRCfg::BasicBlock bb, int i, SourceVariable v, boolean certain) {
       Ssa::variableRead(bb, i, v, certain)
     }
   }
 
-  private module IteratorSsa = SsaImpl::Make<Location, SsaInput>;
+  private module IteratorSsa = SsaImpl::Make<Location, IRCfg, SsaInput>;
 
   private module DataFlowIntegrationInput implements IteratorSsa::DataFlowIntegrationInputSig {
     private import codeql.util.Void
@@ -1982,7 +1987,7 @@ module IteratorFlow {
         )
       }
 
-      predicate hasCfgNode(SsaInput::BasicBlock bb, int i) { bb.getInstruction(i) = this }
+      predicate hasCfgNode(IRCfg::BasicBlock bb, int i) { bb.getInstruction(i) = this }
     }
 
     predicate ssaDefHasSource(IteratorSsa::WriteDefinition def) { none() }
@@ -1992,20 +1997,16 @@ module IteratorFlow {
     class GuardValue = Void;
 
     class Guard extends Void {
-      predicate hasValueBranchEdge(
-        SsaInput::BasicBlock bb1, SsaInput::BasicBlock bb2, GuardValue val
-      ) {
+      predicate hasValueBranchEdge(IRCfg::BasicBlock bb1, IRCfg::BasicBlock bb2, GuardValue val) {
         none()
       }
 
-      predicate valueControlsBranchEdge(
-        SsaInput::BasicBlock bb1, SsaInput::BasicBlock bb2, GuardValue val
-      ) {
+      predicate valueControlsBranchEdge(IRCfg::BasicBlock bb1, IRCfg::BasicBlock bb2, GuardValue val) {
         none()
       }
     }
 
-    predicate guardDirectlyControlsBlock(Guard guard, SsaInput::BasicBlock bb, GuardValue val) {
+    predicate guardDirectlyControlsBlock(Guard guard, IRCfg::BasicBlock bb, GuardValue val) {
       none()
     }
 
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowUtil.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowUtil.qll
index a0a99711552..82dcd43e136 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowUtil.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowUtil.qll
@@ -795,7 +795,7 @@ class FinalGlobalValue extends Node, TFinalGlobalValue {
   override DataFlowType getType() {
     exists(int indirectionIndex |
       indirectionIndex = globalUse.getIndirectionIndex() and
-      result = getTypeImpl(globalUse.getUnderlyingType(), indirectionIndex - 1)
+      result = getTypeImpl(globalUse.getUnderlyingType(), indirectionIndex)
     )
   }
 
@@ -2273,8 +2273,10 @@ class ContentSet instanceof Content {
    * For more information, see
    * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
    */
-  predicate hasLocationInfo(string path, int sl, int sc, int el, int ec) {
-    super.hasLocationInfo(path, sl, sc, el, ec)
+  predicate hasLocationInfo(
+    string filepath, int startline, int startcolumn, int endline, int endcolumn
+  ) {
+    super.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
   }
 }
 
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaImpl.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaImpl.qll
index b9f320e57b2..285e0dc8419 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaImpl.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaImpl.qll
@@ -498,7 +498,9 @@ class FinalParameterUse extends UseImpl, TFinalParameterUse {
 
   int getArgumentIndex() { result = p.getIndex() }
 
-  override Node getNode() { finalParameterNodeHasParameterAndIndex(result, p, indirectionIndex) }
+  override FinalParameterNode getNode() {
+    finalParameterNodeHasParameterAndIndex(result, p, indirectionIndex)
+  }
 
   override int getIndirection() { result = indirectionIndex + 1 }
 
@@ -756,9 +758,9 @@ private predicate modeledFlowBarrier(Node n) {
     partialFlowFunc = call.getStaticCallTarget() and
     not partialFlowFunc.isPartialWrite(output)
   |
-    call.getStaticCallTarget().(DataFlow::DataFlowFunction).hasDataFlow(_, output)
+    partialFlowFunc.(DataFlow::DataFlowFunction).hasDataFlow(_, output)
     or
-    call.getStaticCallTarget().(Taint::TaintFunction).hasTaintFlow(_, output)
+    partialFlowFunc.(Taint::TaintFunction).hasTaintFlow(_, output)
   )
   or
   exists(Operand operand, Instruction instr, Node n0, int indirectionIndex |
@@ -891,15 +893,14 @@ private predicate baseSourceVariableIsGlobal(
   )
 }
 
-private module SsaInput implements Ssa::InputSig<Location> {
-  import InputSigCommon
+private module SsaInput implements Ssa::InputSig<Location, IRCfg::BasicBlock> {
   import SourceVariables
 
   /**
    * Holds if the `i`'th write in block `bb` writes to the variable `v`.
    * `certain` is `true` if the write is guaranteed to overwrite the entire variable.
    */
-  predicate variableWrite(BasicBlock bb, int i, SourceVariable v, boolean certain) {
+  predicate variableWrite(IRCfg::BasicBlock bb, int i, SourceVariable v, boolean certain) {
     DataFlowImplCommon::forceCachingInSameStage() and
     (
       exists(DefImpl def | def.hasIndexInBlock(v, bb, i) |
@@ -917,7 +918,7 @@ private module SsaInput implements Ssa::InputSig<Location> {
    * Holds if the `i`'th read in block `bb` reads to the variable `v`.
    * `certain` is `true` if the read is guaranteed. For C++, this is always the case.
    */
-  predicate variableRead(BasicBlock bb, int i, SourceVariable v, boolean certain) {
+  predicate variableRead(IRCfg::BasicBlock bb, int i, SourceVariable v, boolean certain) {
     exists(UseImpl use | use.hasIndexInBlock(bb, i, v) |
       if use.isCertain() then certain = true else certain = false
     )
@@ -965,7 +966,7 @@ class GlobalDef extends Definition {
   GlobalLikeVariable getVariable() { result = impl.getVariable() }
 }
 
-private module SsaImpl = Ssa::Make<Location, SsaInput>;
+private module SsaImpl = Ssa::Make<Location, IRCfg, SsaInput>;
 
 private module DataFlowIntegrationInput implements SsaImpl::DataFlowIntegrationInputSig {
   private import codeql.util.Boolean
@@ -978,7 +979,7 @@ private module DataFlowIntegrationInput implements SsaImpl::DataFlowIntegrationI
       )
     }
 
-    predicate hasCfgNode(SsaInput::BasicBlock bb, int i) { bb.getInstruction(i) = this }
+    predicate hasCfgNode(IRCfg::BasicBlock bb, int i) { bb.getInstruction(i) = this }
   }
 
   Expr getARead(SsaImpl::Definition def) {
@@ -1001,30 +1002,28 @@ private module DataFlowIntegrationInput implements SsaImpl::DataFlowIntegrationI
     result instanceof FalseEdge
   }
 
-  class GuardValue = Boolean;
+  class GuardValue = IRGuards::GuardValue;
 
   class Guard instanceof IRGuards::IRGuardCondition {
     string toString() { result = super.toString() }
 
-    predicate hasValueBranchEdge(
-      SsaInput::BasicBlock bb1, SsaInput::BasicBlock bb2, GuardValue branch
-    ) {
+    predicate hasValueBranchEdge(IRCfg::BasicBlock bb1, IRCfg::BasicBlock bb2, GuardValue branch) {
       exists(EdgeKind kind |
         super.getBlock() = bb1 and
-        kind = getConditionalEdge(branch) and
+        kind = getConditionalEdge(branch.asBooleanValue()) and
         bb1.getSuccessor(kind) = bb2
       )
     }
 
     predicate valueControlsBranchEdge(
-      SsaInput::BasicBlock bb1, SsaInput::BasicBlock bb2, GuardValue branch
+      IRCfg::BasicBlock bb1, IRCfg::BasicBlock bb2, GuardValue branch
     ) {
       this.hasValueBranchEdge(bb1, bb2, branch)
     }
   }
 
-  predicate guardDirectlyControlsBlock(Guard guard, SsaInput::BasicBlock bb, GuardValue branch) {
-    guard.(IRGuards::IRGuardCondition).controls(bb, branch)
+  predicate guardDirectlyControlsBlock(Guard guard, IRCfg::BasicBlock bb, GuardValue branch) {
+    guard.(IRGuards::IRGuardCondition).valueControls(bb, branch)
   }
 
   predicate keepAllPhiInputBackEdges() { any() }
@@ -1051,25 +1050,35 @@ module BarrierGuardWithIntParam<guardChecksNodeSig/4 guardChecksNode> {
     )
   }
 
-  private predicate guardChecks(
-    DataFlowIntegrationInput::Guard g, SsaImpl::Definition def,
-    DataFlowIntegrationInput::GuardValue branch, int indirectionIndex
+  private predicate guardChecksInstr(
+    IRGuards::Guards_v1::Guard g, IRGuards::GuardsInput::Expr instr, boolean branch,
+    int indirectionIndex
   ) {
-    exists(UseImpl use |
-      guardChecksNode(g, use.getNode(), branch, indirectionIndex) and
-      ssaDefReachesCertainUse(def, use)
+    exists(Node node |
+      nodeHasInstruction(node, instr, indirectionIndex) and
+      guardChecksNode(g, node, branch, indirectionIndex)
     )
   }
 
+  private predicate guardChecksWithWrappers(
+    DataFlowIntegrationInput::Guard g, SsaImpl::Definition def, IRGuards::GuardValue val,
+    int indirectionIndex
+  ) {
+    IRGuards::Guards_v1::ValidationWrapperWithState<int, guardChecksInstr/4>::guardChecksDef(g, def,
+      val, indirectionIndex)
+  }
+
   Node getABarrierNode(int indirectionIndex) {
     // Only get the SynthNodes from the shared implementation, as the ExprNodes cannot
     // be matched on SourceVariable.
     result.(SsaSynthNode).getSynthNode() =
-      DataFlowIntegrationImpl::BarrierGuardDefWithState<int, guardChecks/4>::getABarrierNode(indirectionIndex)
+      DataFlowIntegrationImpl::BarrierGuardDefWithState<int, guardChecksWithWrappers/4>::getABarrierNode(indirectionIndex)
     or
     // Calculate the guarded UseImpls corresponding to ExprNodes directly.
-    exists(DataFlowIntegrationInput::Guard g, boolean branch, Definition def, IRBlock bb |
-      guardChecks(g, def, branch, indirectionIndex) and
+    exists(
+      DataFlowIntegrationInput::Guard g, IRGuards::GuardValue branch, Definition def, IRBlock bb
+    |
+      guardChecksWithWrappers(g, def, branch, indirectionIndex) and
       exists(UseImpl use |
         ssaDefReachesCertainUse(def, use) and
         use.getBlock() = bb and
@@ -1127,7 +1136,15 @@ predicate ssaFlow(Node nodeFrom, Node nodeTo) {
  */
 class PhiNode extends Definition instanceof SsaImpl::PhiNode {
   /** Gets a definition that is an input to this phi node. */
-  final Definition getAnInput() { phiHasInputFromBlock(this, result, _) }
+  final Definition getAnInput() { this.hasInputFromBlock(result, _) }
+
+  /**
+   * Holds if `input` is an input to this phi node along the edge originating
+   * in `bb`.
+   */
+  final predicate hasInputFromBlock(Definition input, IRBlock bb) {
+    phiHasInputFromBlock(this, input, bb)
+  }
 }
 
 /** An static single assignment (SSA) definition. */
@@ -1152,10 +1169,53 @@ class Definition extends SsaImpl::Definition {
     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()
+      use = TDirectUseImpl(result, 0)
     )
   }
 
+  /**
+   * Holds if this definition defines the parameter `p` upon entry into the
+   * enclosing function.
+   */
+  pragma[nomagic]
+  predicate isParameterDefinition(Parameter p) {
+    this.getIndirectionIndex() = 0 and
+    getDefImpl(this).getValue().asInstruction().(InitializeParameterInstruction).getParameter() = p
+  }
+
+  /**
+   * Holds if this definition defines the `indirectionIndex`'th indirection of
+   * parameter `p` upon entry into the enclosing function.
+   */
+  pragma[nomagic]
+  predicate isIndirectParameterDefinition(Parameter p, int indirectionIndex) {
+    this.getIndirectionIndex() = indirectionIndex and
+    indirectionIndex > 0 and
+    getDefImpl(this).getValue().asInstruction().(InitializeParameterInstruction).getParameter() = p
+  }
+
+  /**
+   * Holds if this definition defines the implicit `this` parameter upon entry into
+   * the enclosing member function.
+   */
+  pragma[nomagic]
+  predicate isThisDefinition() {
+    this.getIndirectionIndex() = 0 and
+    getDefImpl(this).getValue().asInstruction().(InitializeParameterInstruction).hasIndex(-1)
+  }
+
+  /**
+   * Holds if this definition defines the implicit `*this` parameter (i.e., the
+   * indirection of the `this` parameter) upon entry into the enclosing member
+   * function.
+   */
+  pragma[nomagic]
+  predicate isIndirectThisDefinition(int indirectionIndex) {
+    this.getIndirectionIndex() = indirectionIndex and
+    indirectionIndex > 0 and
+    getDefImpl(this).getValue().asInstruction().(InitializeParameterInstruction).hasIndex(-1)
+  }
+
   /**
    * Gets an `Operand` that represents an indirect use of this definition.
    *
@@ -1170,10 +1230,11 @@ class Definition extends SsaImpl::Definition {
    * value that was defined by the definition.
    */
   Operand getAnIndirectUse(int indirectionIndex) {
+    indirectionIndex > 0 and
     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)
+      use = TDirectUseImpl(result, indirectionIndex)
     )
   }
 
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaImplCommon.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaImplCommon.qll
index 617e2be8cc3..552f504b84b 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaImplCommon.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaImplCommon.qll
@@ -768,21 +768,3 @@ private module Cached {
 }
 
 import Cached
-
-/**
- * Inputs to the shared SSA library's parameterized module that is shared
- * between the SSA pruning stage, and the final SSA stage.
- */
-module InputSigCommon {
-  class BasicBlock extends IRBlock {
-    ControlFlowNode getNode(int i) { result = this.getInstruction(i) }
-
-    int length() { result = this.getInstructionCount() }
-  }
-
-  class ControlFlowNode = Instruction;
-
-  BasicBlock getImmediateBasicBlockDominator(BasicBlock bb) { result.immediatelyDominates(bb) }
-
-  BasicBlock getABasicBlockSuccessor(BasicBlock bb) { result = bb.getASuccessor() }
-}
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/EdgeKind.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/EdgeKind.qll
index 0a0703fe16f..b449b21c3e4 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/EdgeKind.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/EdgeKind.qll
@@ -2,6 +2,7 @@
  * Provides classes that specify the conditions under which control flows along a given edge.
  */
 
+private import codeql.controlflow.SuccessorType
 private import internal.EdgeKindInternal
 
 private newtype TEdgeKind =
@@ -28,6 +29,21 @@ abstract private class EdgeKindImpl extends TEdgeKind {
 
 final class EdgeKind = EdgeKindImpl;
 
+private SuccessorType getAMatchingSpecificSuccessorType(EdgeKind k) {
+  result.(BooleanSuccessor).getValue() = true and k instanceof TrueEdge
+  or
+  result.(BooleanSuccessor).getValue() = false and k instanceof FalseEdge
+  or
+  result instanceof ExceptionSuccessor and k instanceof ExceptionEdge
+}
+
+SuccessorType getAMatchingSuccessorType(EdgeKind k) {
+  result = getAMatchingSpecificSuccessorType(k)
+  or
+  not exists(getAMatchingSpecificSuccessorType(k)) and
+  result instanceof DirectSuccessor
+}
+
 /**
  * A "goto" edge, representing the unconditional successor of an `Instruction`
  * or `IRBlock`.
@@ -36,11 +52,18 @@ class GotoEdge extends EdgeKindImpl, TGotoEdge {
   final override string toString() { result = "Goto" }
 }
 
+/**
+ * A "true" or "false" edge representing a successor of a conditional branch.
+ */
+abstract private class BooleanEdgeKindImpl extends EdgeKindImpl { }
+
+final class BooleanEdge = BooleanEdgeKindImpl;
+
 /**
  * A "true" edge, representing the successor of a conditional branch when the
  * condition is non-zero.
  */
-class TrueEdge extends EdgeKindImpl, TTrueEdge {
+class TrueEdge extends BooleanEdgeKindImpl, TTrueEdge {
   final override string toString() { result = "True" }
 }
 
@@ -48,7 +71,7 @@ class TrueEdge extends EdgeKindImpl, TTrueEdge {
  * A "false" edge, representing the successor of a conditional branch when the
  * condition is zero.
  */
-class FalseEdge extends EdgeKindImpl, TFalseEdge {
+class FalseEdge extends BooleanEdgeKindImpl, TFalseEdge {
   final override string toString() { result = "False" }
 }
 
@@ -79,19 +102,48 @@ class SehExceptionEdge extends ExceptionEdgeImpl, TSehExceptionEdge {
   final override string toString() { result = "SEH Exception" }
 }
 
+/**
+ * An edge from a `Switch` instruction to one of the cases, or to the default
+ * branch.
+ */
+abstract private class SwitchEdgeKindImpl extends EdgeKindImpl {
+  /**
+   * Gets the smallest value of the switch expression for which control will flow along this edge.
+   */
+  string getMinValue() { none() }
+
+  /**
+   * Gets the largest value of the switch expression for which control will flow along this edge.
+   */
+  string getMaxValue() { none() }
+
+  /**
+   * Gets the unique value of the switch expression for which control will
+   * flow along this edge, if any.
+   */
+  final string getValue() { result = unique( | | [this.getMinValue(), this.getMaxValue()]) }
+
+  /** Holds if this edge is the default edge. */
+  predicate isDefault() { none() }
+}
+
+final class SwitchEdge = SwitchEdgeKindImpl;
+
 /**
  * A "default" edge, representing the successor of a `Switch` instruction when
  * none of the case values matches the condition value.
  */
-class DefaultEdge extends EdgeKindImpl, TDefaultEdge {
+class DefaultEdge extends SwitchEdgeKindImpl, TDefaultEdge {
   final override string toString() { result = "Default" }
+
+  final override predicate isDefault() { any() }
 }
 
 /**
  * A "case" edge, representing the successor of a `Switch` instruction when the
  * the condition value matches a corresponding `case` label.
  */
-class CaseEdge extends EdgeKindImpl, TCaseEdge {
+class CaseEdge extends SwitchEdgeKindImpl, TCaseEdge {
   string minValue;
   string maxValue;
 
@@ -103,24 +155,9 @@ class CaseEdge extends EdgeKindImpl, TCaseEdge {
     else result = "Case[" + minValue + ".." + maxValue + "]"
   }
 
-  /**
-   * Gets the smallest value of the switch expression for which control will flow along this edge.
-   */
-  final string getMinValue() { result = minValue }
+  final override string getMinValue() { result = minValue }
 
-  /**
-   * Gets the largest value of the switch expression for which control will flow along this edge.
-   */
-  final string getMaxValue() { result = maxValue }
-
-  /**
-   * Gets the unique value of the switch expression for which control will
-   * flow along this edge, if any.
-   */
-  final string getValue() {
-    minValue = maxValue and
-    result = minValue
-  }
+  final override string getMaxValue() { result = maxValue }
 }
 
 /**
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/IRBlock.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/IRBlock.qll
index 50395db47e7..7f7c5cd0a4d 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/IRBlock.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/IRBlock.qll
@@ -7,6 +7,7 @@ import Instruction
 private import internal.IRBlockImports as Imports
 import Imports::EdgeKind
 private import Cached
+private import codeql.controlflow.BasicBlock as BB
 
 /**
  * Holds if `block` is a block in `func` and `sortOverride`, `sortKey1`, and `sortKey2` are the
@@ -263,6 +264,54 @@ private predicate isEntryBlock(TIRBlock block) {
   block = MkIRBlock(any(EnterFunctionInstruction enter))
 }
 
+module IRCfg implements BB::CfgSig<Language::Location> {
+  private import codeql.controlflow.SuccessorType
+
+  class ControlFlowNode = Instruction;
+
+  final private class FinalIRBlock = IRBlock;
+
+  class BasicBlock extends FinalIRBlock {
+    ControlFlowNode getNode(int i) { result = this.getInstruction(i) }
+
+    ControlFlowNode getLastNode() { result = super.getLastInstruction() }
+
+    int length() { result = this.getInstructionCount() }
+
+    BasicBlock getASuccessor() { result = super.getASuccessor() }
+
+    BasicBlock getASuccessor(SuccessorType t) {
+      exists(EdgeKind k |
+        result = super.getSuccessor(k) and
+        t = getAMatchingSuccessorType(k)
+      )
+    }
+
+    predicate strictlyDominates(BasicBlock bb) { super.strictlyDominates(bb) }
+
+    predicate dominates(BasicBlock bb) { super.dominates(bb) }
+
+    BasicBlock getImmediateDominator() { result.immediatelyDominates(this) }
+
+    predicate inDominanceFrontier(BasicBlock df) { super.dominanceFrontier() = df }
+
+    predicate strictlyPostDominates(BasicBlock bb) { super.strictlyPostDominates(bb) }
+
+    predicate postDominates(BasicBlock bb) { super.postDominates(bb) }
+  }
+
+  class EntryBasicBlock extends BasicBlock {
+    EntryBasicBlock() { isEntryBlock(this) }
+  }
+
+  pragma[nomagic]
+  predicate dominatingEdge(BasicBlock bb1, BasicBlock bb2) {
+    bb1.getASuccessor() = bb2 and
+    bb1 = bb2.getImmediateDominator() and
+    forall(BasicBlock pred | pred = bb2.getAPredecessor() and pred != bb1 | bb2.dominates(pred))
+  }
+}
+
 cached
 private module Cached {
   cached
diff --git 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
index a564508e16b..8d3e960c3f8 100644
--- 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
@@ -1084,6 +1084,12 @@ class BinaryInstruction extends Instruction {
     or
     op1 = this.getRightOperand() and op2 = this.getLeftOperand()
   }
+
+  /**
+   * Gets the instruction whose result provides the value of the left or right
+   * operand of this binary instruction.
+   */
+  Instruction getAnInput() { result = this.getLeft() or result = this.getRight() }
 }
 
 /**
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/gvn/internal/ValueNumberingInternal.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/gvn/internal/ValueNumberingInternal.qll
index 66d499112b8..f4b5a850a1f 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/gvn/internal/ValueNumberingInternal.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/gvn/internal/ValueNumberingInternal.qll
@@ -41,7 +41,7 @@ newtype TValueNumber =
   ) {
     loadTotalOverlapValueNumber(_, irFunc, type, memOperand, operand)
   } or
-  TUniqueValueNumber(IRFunction irFunc, Instruction instr) { uniqueValueNumber(instr, irFunc) }
+  TUniqueValueNumber(Instruction instr) { uniqueValueNumber(instr) }
 
 /**
  * A `ConvertInstruction` which converts data of type `T` to data of type `U`
@@ -129,12 +129,14 @@ private predicate filteredNumberableInstruction(Instruction instr) {
     count(instr.(InheritanceConversionInstruction).getBaseClass()) != 1 or
     count(instr.(InheritanceConversionInstruction).getDerivedClass()) != 1
   )
+  or
+  count(instr.getEnclosingIRFunction()) != 1
 }
 
 private predicate variableAddressValueNumber(
   VariableAddressInstruction instr, IRFunction irFunc, Language::AST ast
 ) {
-  instr.getEnclosingIRFunction() = irFunc and
+  unique( | | instr.getEnclosingIRFunction()) = irFunc and
   // The underlying AST element is used as value-numbering key instead of the
   // `IRVariable` to work around a problem where a variable or expression with
   // multiple types gives rise to multiple `IRVariable`s.
@@ -144,7 +146,7 @@ private predicate variableAddressValueNumber(
 private predicate initializeParameterValueNumber(
   InitializeParameterInstruction instr, IRFunction irFunc, Language::AST var
 ) {
-  instr.getEnclosingIRFunction() = irFunc and
+  unique( | | instr.getEnclosingIRFunction()) = irFunc and
   // The underlying AST element is used as value-numbering key instead of the
   // `IRVariable` to work around a problem where a variable or expression with
   // multiple types gives rise to multiple `IRVariable`s.
@@ -154,7 +156,7 @@ private predicate initializeParameterValueNumber(
 private predicate constantValueNumber(
   ConstantInstruction instr, IRFunction irFunc, IRType type, string value
 ) {
-  instr.getEnclosingIRFunction() = irFunc and
+  unique( | | instr.getEnclosingIRFunction()) = irFunc and
   unique( | | instr.getResultIRType()) = type and
   instr.getValue() = value
 }
@@ -162,7 +164,7 @@ private predicate constantValueNumber(
 private predicate stringConstantValueNumber(
   StringConstantInstruction instr, IRFunction irFunc, IRType type, string value
 ) {
-  instr.getEnclosingIRFunction() = irFunc and
+  unique( | | instr.getEnclosingIRFunction()) = irFunc and
   instr.getResultIRType() = type and
   instr.getValue().getValue() = value
 }
@@ -171,7 +173,7 @@ private predicate fieldAddressValueNumber(
   FieldAddressInstruction instr, IRFunction irFunc, Language::Field field,
   TValueNumber objectAddress
 ) {
-  instr.getEnclosingIRFunction() = irFunc and
+  unique( | | instr.getEnclosingIRFunction()) = irFunc and
   unique( | | instr.getField()) = field and
   tvalueNumber(instr.getObjectAddress()) = objectAddress
 }
@@ -182,7 +184,7 @@ private predicate binaryValueNumber0(
   TValueNumber valueNumber
 ) {
   not instr instanceof PointerArithmeticInstruction and
-  instr.getEnclosingIRFunction() = irFunc and
+  unique( | | instr.getEnclosingIRFunction()) = irFunc and
   instr.getOpcode() = opcode and
   (
     isLeft = true and
@@ -206,7 +208,7 @@ private predicate pointerArithmeticValueNumber0(
   PointerArithmeticInstruction instr, IRFunction irFunc, Opcode opcode, int elementSize,
   boolean isLeft, TValueNumber valueNumber
 ) {
-  instr.getEnclosingIRFunction() = irFunc and
+  unique( | | instr.getEnclosingIRFunction()) = irFunc and
   instr.getOpcode() = opcode and
   instr.getElementSize() = elementSize and
   (
@@ -229,7 +231,7 @@ private predicate pointerArithmeticValueNumber(
 private predicate unaryValueNumber(
   UnaryInstruction instr, IRFunction irFunc, Opcode opcode, TValueNumber operand
 ) {
-  instr.getEnclosingIRFunction() = irFunc and
+  unique( | | instr.getEnclosingIRFunction()) = irFunc and
   not instr instanceof InheritanceConversionInstruction and
   not instr instanceof CopyInstruction and
   not instr instanceof FieldAddressInstruction and
@@ -242,7 +244,7 @@ private predicate inheritanceConversionValueNumber(
   InheritanceConversionInstruction instr, IRFunction irFunc, Opcode opcode,
   Language::Class baseClass, Language::Class derivedClass, TValueNumber operand
 ) {
-  instr.getEnclosingIRFunction() = irFunc and
+  unique( | | instr.getEnclosingIRFunction()) = irFunc and
   instr.getOpcode() = opcode and
   tvalueNumber(instr.getUnary()) = operand and
   unique( | | instr.getBaseClass()) = baseClass and
@@ -254,7 +256,7 @@ private predicate loadTotalOverlapValueNumber0(
   LoadTotalOverlapInstruction instr, IRFunction irFunc, IRType type, TValueNumber valueNumber,
   boolean isAddress
 ) {
-  instr.getEnclosingIRFunction() = irFunc and
+  unique( | | instr.getEnclosingIRFunction()) = irFunc and
   instr.getResultIRType() = type and
   (
     isAddress = true and
@@ -277,8 +279,7 @@ private predicate loadTotalOverlapValueNumber(
  * Holds if `instr` should be assigned a unique value number because this library does not know how
  * to determine if two instances of that instruction are equivalent.
  */
-private predicate uniqueValueNumber(Instruction instr, IRFunction irFunc) {
-  instr.getEnclosingIRFunction() = irFunc and
+private predicate uniqueValueNumber(Instruction instr) {
   not instr.getResultIRType() instanceof IRVoidType and
   (
     not numberableInstruction(instr)
@@ -294,10 +295,8 @@ cached
 TValueNumber tvalueNumber(Instruction instr) {
   result = nonUniqueValueNumber(instr)
   or
-  exists(IRFunction irFunc |
-    uniqueValueNumber(instr, irFunc) and
-    result = TUniqueValueNumber(irFunc, instr)
-  )
+  uniqueValueNumber(instr) and
+  result = TUniqueValueNumber(instr)
 }
 
 /**
@@ -311,68 +310,64 @@ TValueNumber tvalueNumberOfOperand(Operand op) { result = tvalueNumber(op.getDef
  * value number.
  */
 private TValueNumber nonUniqueValueNumber(Instruction instr) {
-  exists(IRFunction irFunc |
-    irFunc = instr.getEnclosingIRFunction() and
-    (
-      exists(Language::AST ast |
-        variableAddressValueNumber(instr, irFunc, ast) and
-        result = TVariableAddressValueNumber(irFunc, ast)
-      )
-      or
-      exists(Language::AST var |
-        initializeParameterValueNumber(instr, irFunc, var) and
-        result = TInitializeParameterValueNumber(irFunc, var)
-      )
-      or
-      exists(string value, IRType type |
-        constantValueNumber(instr, irFunc, type, value) and
-        result = TConstantValueNumber(irFunc, type, value)
-      )
-      or
-      exists(IRType type, string value |
-        stringConstantValueNumber(instr, irFunc, type, value) and
-        result = TStringConstantValueNumber(irFunc, type, value)
-      )
-      or
-      exists(Language::Field field, TValueNumber objectAddress |
-        fieldAddressValueNumber(instr, irFunc, field, objectAddress) and
-        result = TFieldAddressValueNumber(irFunc, field, objectAddress)
-      )
-      or
-      exists(Opcode opcode, TValueNumber leftOperand, TValueNumber rightOperand |
-        binaryValueNumber(instr, irFunc, opcode, leftOperand, rightOperand) and
-        result = TBinaryValueNumber(irFunc, opcode, leftOperand, rightOperand)
-      )
-      or
-      exists(Opcode opcode, TValueNumber operand |
-        unaryValueNumber(instr, irFunc, opcode, operand) and
-        result = TUnaryValueNumber(irFunc, opcode, operand)
-      )
-      or
-      exists(
-        Opcode opcode, Language::Class baseClass, Language::Class derivedClass, TValueNumber operand
-      |
-        inheritanceConversionValueNumber(instr, irFunc, opcode, baseClass, derivedClass, operand) and
-        result = TInheritanceConversionValueNumber(irFunc, opcode, baseClass, derivedClass, operand)
-      )
-      or
-      exists(Opcode opcode, int elementSize, TValueNumber leftOperand, TValueNumber rightOperand |
-        pointerArithmeticValueNumber(instr, irFunc, opcode, elementSize, leftOperand, rightOperand) and
-        result =
-          TPointerArithmeticValueNumber(irFunc, opcode, elementSize, leftOperand, rightOperand)
-      )
-      or
-      exists(IRType type, TValueNumber memOperand, TValueNumber operand |
-        loadTotalOverlapValueNumber(instr, irFunc, type, memOperand, operand) and
-        result = TLoadTotalOverlapValueNumber(irFunc, type, memOperand, operand)
-      )
-      or
-      // The value number of a copy is just the value number of its source value.
-      result = tvalueNumber(instr.(CongruentCopyInstruction).getSourceValue())
-      or
-      // The value number of a type-preserving conversion is just the value
-      // number of the unconverted value.
-      result = tvalueNumber(instr.(TypePreservingConvertInstruction).getUnary())
+  exists(IRFunction irFunc | irFunc = instr.getEnclosingIRFunction() |
+    exists(Language::AST ast |
+      variableAddressValueNumber(instr, irFunc, ast) and
+      result = TVariableAddressValueNumber(irFunc, ast)
     )
+    or
+    exists(Language::AST var |
+      initializeParameterValueNumber(instr, irFunc, var) and
+      result = TInitializeParameterValueNumber(irFunc, var)
+    )
+    or
+    exists(string value, IRType type |
+      constantValueNumber(instr, irFunc, type, value) and
+      result = TConstantValueNumber(irFunc, type, value)
+    )
+    or
+    exists(IRType type, string value |
+      stringConstantValueNumber(instr, irFunc, type, value) and
+      result = TStringConstantValueNumber(irFunc, type, value)
+    )
+    or
+    exists(Language::Field field, TValueNumber objectAddress |
+      fieldAddressValueNumber(instr, irFunc, field, objectAddress) and
+      result = TFieldAddressValueNumber(irFunc, field, objectAddress)
+    )
+    or
+    exists(Opcode opcode, TValueNumber leftOperand, TValueNumber rightOperand |
+      binaryValueNumber(instr, irFunc, opcode, leftOperand, rightOperand) and
+      result = TBinaryValueNumber(irFunc, opcode, leftOperand, rightOperand)
+    )
+    or
+    exists(Opcode opcode, TValueNumber operand |
+      unaryValueNumber(instr, irFunc, opcode, operand) and
+      result = TUnaryValueNumber(irFunc, opcode, operand)
+    )
+    or
+    exists(
+      Opcode opcode, Language::Class baseClass, Language::Class derivedClass, TValueNumber operand
+    |
+      inheritanceConversionValueNumber(instr, irFunc, opcode, baseClass, derivedClass, operand) and
+      result = TInheritanceConversionValueNumber(irFunc, opcode, baseClass, derivedClass, operand)
+    )
+    or
+    exists(Opcode opcode, int elementSize, TValueNumber leftOperand, TValueNumber rightOperand |
+      pointerArithmeticValueNumber(instr, irFunc, opcode, elementSize, leftOperand, rightOperand) and
+      result = TPointerArithmeticValueNumber(irFunc, opcode, elementSize, leftOperand, rightOperand)
+    )
+    or
+    exists(IRType type, TValueNumber memOperand, TValueNumber operand |
+      loadTotalOverlapValueNumber(instr, irFunc, type, memOperand, operand) and
+      result = TLoadTotalOverlapValueNumber(irFunc, type, memOperand, operand)
+    )
+    or
+    // The value number of a copy is just the value number of its source value.
+    result = tvalueNumber(instr.(CongruentCopyInstruction).getSourceValue())
+    or
+    // The value number of a type-preserving conversion is just the value
+    // number of the unconverted value.
+    result = tvalueNumber(instr.(TypePreservingConvertInstruction).getUnary())
   )
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/IRBlock.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/IRBlock.qll
index 50395db47e7..7f7c5cd0a4d 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/IRBlock.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/IRBlock.qll
@@ -7,6 +7,7 @@ import Instruction
 private import internal.IRBlockImports as Imports
 import Imports::EdgeKind
 private import Cached
+private import codeql.controlflow.BasicBlock as BB
 
 /**
  * Holds if `block` is a block in `func` and `sortOverride`, `sortKey1`, and `sortKey2` are the
@@ -263,6 +264,54 @@ private predicate isEntryBlock(TIRBlock block) {
   block = MkIRBlock(any(EnterFunctionInstruction enter))
 }
 
+module IRCfg implements BB::CfgSig<Language::Location> {
+  private import codeql.controlflow.SuccessorType
+
+  class ControlFlowNode = Instruction;
+
+  final private class FinalIRBlock = IRBlock;
+
+  class BasicBlock extends FinalIRBlock {
+    ControlFlowNode getNode(int i) { result = this.getInstruction(i) }
+
+    ControlFlowNode getLastNode() { result = super.getLastInstruction() }
+
+    int length() { result = this.getInstructionCount() }
+
+    BasicBlock getASuccessor() { result = super.getASuccessor() }
+
+    BasicBlock getASuccessor(SuccessorType t) {
+      exists(EdgeKind k |
+        result = super.getSuccessor(k) and
+        t = getAMatchingSuccessorType(k)
+      )
+    }
+
+    predicate strictlyDominates(BasicBlock bb) { super.strictlyDominates(bb) }
+
+    predicate dominates(BasicBlock bb) { super.dominates(bb) }
+
+    BasicBlock getImmediateDominator() { result.immediatelyDominates(this) }
+
+    predicate inDominanceFrontier(BasicBlock df) { super.dominanceFrontier() = df }
+
+    predicate strictlyPostDominates(BasicBlock bb) { super.strictlyPostDominates(bb) }
+
+    predicate postDominates(BasicBlock bb) { super.postDominates(bb) }
+  }
+
+  class EntryBasicBlock extends BasicBlock {
+    EntryBasicBlock() { isEntryBlock(this) }
+  }
+
+  pragma[nomagic]
+  predicate dominatingEdge(BasicBlock bb1, BasicBlock bb2) {
+    bb1.getASuccessor() = bb2 and
+    bb1 = bb2.getImmediateDominator() and
+    forall(BasicBlock pred | pred = bb2.getAPredecessor() and pred != bb1 | bb2.dominates(pred))
+  }
+}
+
 cached
 private module Cached {
   cached
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/Instruction.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/Instruction.qll
index a564508e16b..8d3e960c3f8 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/Instruction.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/Instruction.qll
@@ -1084,6 +1084,12 @@ class BinaryInstruction extends Instruction {
     or
     op1 = this.getRightOperand() and op2 = this.getLeftOperand()
   }
+
+  /**
+   * Gets the instruction whose result provides the value of the left or right
+   * operand of this binary instruction.
+   */
+  Instruction getAnInput() { result = this.getLeft() or result = this.getRight() }
 }
 
 /**
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/gvn/internal/ValueNumberingInternal.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/gvn/internal/ValueNumberingInternal.qll
index 66d499112b8..f4b5a850a1f 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/gvn/internal/ValueNumberingInternal.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/gvn/internal/ValueNumberingInternal.qll
@@ -41,7 +41,7 @@ newtype TValueNumber =
   ) {
     loadTotalOverlapValueNumber(_, irFunc, type, memOperand, operand)
   } or
-  TUniqueValueNumber(IRFunction irFunc, Instruction instr) { uniqueValueNumber(instr, irFunc) }
+  TUniqueValueNumber(Instruction instr) { uniqueValueNumber(instr) }
 
 /**
  * A `ConvertInstruction` which converts data of type `T` to data of type `U`
@@ -129,12 +129,14 @@ private predicate filteredNumberableInstruction(Instruction instr) {
     count(instr.(InheritanceConversionInstruction).getBaseClass()) != 1 or
     count(instr.(InheritanceConversionInstruction).getDerivedClass()) != 1
   )
+  or
+  count(instr.getEnclosingIRFunction()) != 1
 }
 
 private predicate variableAddressValueNumber(
   VariableAddressInstruction instr, IRFunction irFunc, Language::AST ast
 ) {
-  instr.getEnclosingIRFunction() = irFunc and
+  unique( | | instr.getEnclosingIRFunction()) = irFunc and
   // The underlying AST element is used as value-numbering key instead of the
   // `IRVariable` to work around a problem where a variable or expression with
   // multiple types gives rise to multiple `IRVariable`s.
@@ -144,7 +146,7 @@ private predicate variableAddressValueNumber(
 private predicate initializeParameterValueNumber(
   InitializeParameterInstruction instr, IRFunction irFunc, Language::AST var
 ) {
-  instr.getEnclosingIRFunction() = irFunc and
+  unique( | | instr.getEnclosingIRFunction()) = irFunc and
   // The underlying AST element is used as value-numbering key instead of the
   // `IRVariable` to work around a problem where a variable or expression with
   // multiple types gives rise to multiple `IRVariable`s.
@@ -154,7 +156,7 @@ private predicate initializeParameterValueNumber(
 private predicate constantValueNumber(
   ConstantInstruction instr, IRFunction irFunc, IRType type, string value
 ) {
-  instr.getEnclosingIRFunction() = irFunc and
+  unique( | | instr.getEnclosingIRFunction()) = irFunc and
   unique( | | instr.getResultIRType()) = type and
   instr.getValue() = value
 }
@@ -162,7 +164,7 @@ private predicate constantValueNumber(
 private predicate stringConstantValueNumber(
   StringConstantInstruction instr, IRFunction irFunc, IRType type, string value
 ) {
-  instr.getEnclosingIRFunction() = irFunc and
+  unique( | | instr.getEnclosingIRFunction()) = irFunc and
   instr.getResultIRType() = type and
   instr.getValue().getValue() = value
 }
@@ -171,7 +173,7 @@ private predicate fieldAddressValueNumber(
   FieldAddressInstruction instr, IRFunction irFunc, Language::Field field,
   TValueNumber objectAddress
 ) {
-  instr.getEnclosingIRFunction() = irFunc and
+  unique( | | instr.getEnclosingIRFunction()) = irFunc and
   unique( | | instr.getField()) = field and
   tvalueNumber(instr.getObjectAddress()) = objectAddress
 }
@@ -182,7 +184,7 @@ private predicate binaryValueNumber0(
   TValueNumber valueNumber
 ) {
   not instr instanceof PointerArithmeticInstruction and
-  instr.getEnclosingIRFunction() = irFunc and
+  unique( | | instr.getEnclosingIRFunction()) = irFunc and
   instr.getOpcode() = opcode and
   (
     isLeft = true and
@@ -206,7 +208,7 @@ private predicate pointerArithmeticValueNumber0(
   PointerArithmeticInstruction instr, IRFunction irFunc, Opcode opcode, int elementSize,
   boolean isLeft, TValueNumber valueNumber
 ) {
-  instr.getEnclosingIRFunction() = irFunc and
+  unique( | | instr.getEnclosingIRFunction()) = irFunc and
   instr.getOpcode() = opcode and
   instr.getElementSize() = elementSize and
   (
@@ -229,7 +231,7 @@ private predicate pointerArithmeticValueNumber(
 private predicate unaryValueNumber(
   UnaryInstruction instr, IRFunction irFunc, Opcode opcode, TValueNumber operand
 ) {
-  instr.getEnclosingIRFunction() = irFunc and
+  unique( | | instr.getEnclosingIRFunction()) = irFunc and
   not instr instanceof InheritanceConversionInstruction and
   not instr instanceof CopyInstruction and
   not instr instanceof FieldAddressInstruction and
@@ -242,7 +244,7 @@ private predicate inheritanceConversionValueNumber(
   InheritanceConversionInstruction instr, IRFunction irFunc, Opcode opcode,
   Language::Class baseClass, Language::Class derivedClass, TValueNumber operand
 ) {
-  instr.getEnclosingIRFunction() = irFunc and
+  unique( | | instr.getEnclosingIRFunction()) = irFunc and
   instr.getOpcode() = opcode and
   tvalueNumber(instr.getUnary()) = operand and
   unique( | | instr.getBaseClass()) = baseClass and
@@ -254,7 +256,7 @@ private predicate loadTotalOverlapValueNumber0(
   LoadTotalOverlapInstruction instr, IRFunction irFunc, IRType type, TValueNumber valueNumber,
   boolean isAddress
 ) {
-  instr.getEnclosingIRFunction() = irFunc and
+  unique( | | instr.getEnclosingIRFunction()) = irFunc and
   instr.getResultIRType() = type and
   (
     isAddress = true and
@@ -277,8 +279,7 @@ private predicate loadTotalOverlapValueNumber(
  * Holds if `instr` should be assigned a unique value number because this library does not know how
  * to determine if two instances of that instruction are equivalent.
  */
-private predicate uniqueValueNumber(Instruction instr, IRFunction irFunc) {
-  instr.getEnclosingIRFunction() = irFunc and
+private predicate uniqueValueNumber(Instruction instr) {
   not instr.getResultIRType() instanceof IRVoidType and
   (
     not numberableInstruction(instr)
@@ -294,10 +295,8 @@ cached
 TValueNumber tvalueNumber(Instruction instr) {
   result = nonUniqueValueNumber(instr)
   or
-  exists(IRFunction irFunc |
-    uniqueValueNumber(instr, irFunc) and
-    result = TUniqueValueNumber(irFunc, instr)
-  )
+  uniqueValueNumber(instr) and
+  result = TUniqueValueNumber(instr)
 }
 
 /**
@@ -311,68 +310,64 @@ TValueNumber tvalueNumberOfOperand(Operand op) { result = tvalueNumber(op.getDef
  * value number.
  */
 private TValueNumber nonUniqueValueNumber(Instruction instr) {
-  exists(IRFunction irFunc |
-    irFunc = instr.getEnclosingIRFunction() and
-    (
-      exists(Language::AST ast |
-        variableAddressValueNumber(instr, irFunc, ast) and
-        result = TVariableAddressValueNumber(irFunc, ast)
-      )
-      or
-      exists(Language::AST var |
-        initializeParameterValueNumber(instr, irFunc, var) and
-        result = TInitializeParameterValueNumber(irFunc, var)
-      )
-      or
-      exists(string value, IRType type |
-        constantValueNumber(instr, irFunc, type, value) and
-        result = TConstantValueNumber(irFunc, type, value)
-      )
-      or
-      exists(IRType type, string value |
-        stringConstantValueNumber(instr, irFunc, type, value) and
-        result = TStringConstantValueNumber(irFunc, type, value)
-      )
-      or
-      exists(Language::Field field, TValueNumber objectAddress |
-        fieldAddressValueNumber(instr, irFunc, field, objectAddress) and
-        result = TFieldAddressValueNumber(irFunc, field, objectAddress)
-      )
-      or
-      exists(Opcode opcode, TValueNumber leftOperand, TValueNumber rightOperand |
-        binaryValueNumber(instr, irFunc, opcode, leftOperand, rightOperand) and
-        result = TBinaryValueNumber(irFunc, opcode, leftOperand, rightOperand)
-      )
-      or
-      exists(Opcode opcode, TValueNumber operand |
-        unaryValueNumber(instr, irFunc, opcode, operand) and
-        result = TUnaryValueNumber(irFunc, opcode, operand)
-      )
-      or
-      exists(
-        Opcode opcode, Language::Class baseClass, Language::Class derivedClass, TValueNumber operand
-      |
-        inheritanceConversionValueNumber(instr, irFunc, opcode, baseClass, derivedClass, operand) and
-        result = TInheritanceConversionValueNumber(irFunc, opcode, baseClass, derivedClass, operand)
-      )
-      or
-      exists(Opcode opcode, int elementSize, TValueNumber leftOperand, TValueNumber rightOperand |
-        pointerArithmeticValueNumber(instr, irFunc, opcode, elementSize, leftOperand, rightOperand) and
-        result =
-          TPointerArithmeticValueNumber(irFunc, opcode, elementSize, leftOperand, rightOperand)
-      )
-      or
-      exists(IRType type, TValueNumber memOperand, TValueNumber operand |
-        loadTotalOverlapValueNumber(instr, irFunc, type, memOperand, operand) and
-        result = TLoadTotalOverlapValueNumber(irFunc, type, memOperand, operand)
-      )
-      or
-      // The value number of a copy is just the value number of its source value.
-      result = tvalueNumber(instr.(CongruentCopyInstruction).getSourceValue())
-      or
-      // The value number of a type-preserving conversion is just the value
-      // number of the unconverted value.
-      result = tvalueNumber(instr.(TypePreservingConvertInstruction).getUnary())
+  exists(IRFunction irFunc | irFunc = instr.getEnclosingIRFunction() |
+    exists(Language::AST ast |
+      variableAddressValueNumber(instr, irFunc, ast) and
+      result = TVariableAddressValueNumber(irFunc, ast)
     )
+    or
+    exists(Language::AST var |
+      initializeParameterValueNumber(instr, irFunc, var) and
+      result = TInitializeParameterValueNumber(irFunc, var)
+    )
+    or
+    exists(string value, IRType type |
+      constantValueNumber(instr, irFunc, type, value) and
+      result = TConstantValueNumber(irFunc, type, value)
+    )
+    or
+    exists(IRType type, string value |
+      stringConstantValueNumber(instr, irFunc, type, value) and
+      result = TStringConstantValueNumber(irFunc, type, value)
+    )
+    or
+    exists(Language::Field field, TValueNumber objectAddress |
+      fieldAddressValueNumber(instr, irFunc, field, objectAddress) and
+      result = TFieldAddressValueNumber(irFunc, field, objectAddress)
+    )
+    or
+    exists(Opcode opcode, TValueNumber leftOperand, TValueNumber rightOperand |
+      binaryValueNumber(instr, irFunc, opcode, leftOperand, rightOperand) and
+      result = TBinaryValueNumber(irFunc, opcode, leftOperand, rightOperand)
+    )
+    or
+    exists(Opcode opcode, TValueNumber operand |
+      unaryValueNumber(instr, irFunc, opcode, operand) and
+      result = TUnaryValueNumber(irFunc, opcode, operand)
+    )
+    or
+    exists(
+      Opcode opcode, Language::Class baseClass, Language::Class derivedClass, TValueNumber operand
+    |
+      inheritanceConversionValueNumber(instr, irFunc, opcode, baseClass, derivedClass, operand) and
+      result = TInheritanceConversionValueNumber(irFunc, opcode, baseClass, derivedClass, operand)
+    )
+    or
+    exists(Opcode opcode, int elementSize, TValueNumber leftOperand, TValueNumber rightOperand |
+      pointerArithmeticValueNumber(instr, irFunc, opcode, elementSize, leftOperand, rightOperand) and
+      result = TPointerArithmeticValueNumber(irFunc, opcode, elementSize, leftOperand, rightOperand)
+    )
+    or
+    exists(IRType type, TValueNumber memOperand, TValueNumber operand |
+      loadTotalOverlapValueNumber(instr, irFunc, type, memOperand, operand) and
+      result = TLoadTotalOverlapValueNumber(irFunc, type, memOperand, operand)
+    )
+    or
+    // The value number of a copy is just the value number of its source value.
+    result = tvalueNumber(instr.(CongruentCopyInstruction).getSourceValue())
+    or
+    // The value number of a type-preserving conversion is just the value
+    // number of the unconverted value.
+    result = tvalueNumber(instr.(TypePreservingConvertInstruction).getUnary())
   )
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/InstructionTag.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/InstructionTag.qll
index d864e86aa04..be3f680aa16 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/InstructionTag.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/InstructionTag.qll
@@ -97,7 +97,14 @@ newtype TInstructionTag =
     exists(Stmt s | exists(s.getImplicitDestructorCall(index)))
   } or
   CoAwaitBranchTag() or
-  BoolToIntConversionTag()
+  BoolToIntConversionTag() or
+  SizeofVlaBaseSizeTag() or
+  SizeofVlaConversionTag(int index) {
+    exists(VlaDeclStmt v | exists(v.getTransitiveVlaDimensionStmt(index)))
+  } or
+  SizeofVlaDimensionTag(int index) {
+    exists(VlaDeclStmt v | exists(v.getTransitiveVlaDimensionStmt(index)))
+  }
 
 class InstructionTag extends TInstructionTag {
   final string toString() { result = getInstructionTagId(this) }
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedElement.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedElement.qll
index e1314035437..330362f5560 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedElement.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedElement.qll
@@ -123,13 +123,16 @@ private predicate ignoreExprAndDescendants(Expr expr) {
   //  or
   ignoreExprAndDescendants(getRealParent(expr)) // recursive case
   or
-  // va_start doesn't evaluate its argument, so we don't need to translate it.
+  // va_start does not evaluate its argument, so we do not need to translate it.
   exists(BuiltInVarArgsStart vaStartExpr |
     vaStartExpr.getLastNamedParameter().getFullyConverted() = expr
   )
   or
+  // sizeof does not evaluate its argument, so we do not need to translate it.
+  exists(SizeofExprOperator sizeofExpr | sizeofExpr.getExprOperand().getFullyConverted() = expr)
+  or
   // The children of C11 _Generic expressions are just surface syntax.
-  exists(C11GenericExpr generic | generic.getAChild() = expr)
+  exists(C11GenericExpr generic | generic.getAChild().getFullyConverted() = expr)
   or
   // Do not translate implicit destructor calls for unnamed temporary variables that are
   // conditionally constructed (until we have a mechanism for calling these only when the
diff --git 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
index f7786fcf290..6024a881c5f 100644
--- 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
@@ -187,7 +187,7 @@ Variable getEnclosingVariable(Expr e) {
 }
 
 /**
- * The IR translation of the "core"  part of an expression. This is the part of
+ * The IR translation of the "core" part of an expression. This is the part of
  * the expression that produces the result value of the expression, before any
  * lvalue-to-rvalue conversion on the result. Every expression has a single
  * `TranslatedCoreExpr`.
@@ -3884,7 +3884,7 @@ class TranslatedNewExpr extends TranslatedNewOrNewArrayExpr {
   final override Type getTargetType() { result = expr.getAllocatedType().getUnspecifiedType() }
 
   final override TranslatedInitialization getInitialization() {
-    result = getTranslatedInitialization(expr.getInitializer())
+    result = getTranslatedInitialization(expr.getInitializer().getFullyConverted())
   }
 }
 
@@ -4094,6 +4094,155 @@ class TranslatedStmtExpr extends TranslatedNonConstantExpr {
   TranslatedStmt getStmt() { result = getTranslatedStmt(expr.getStmt()) }
 }
 
+private VlaDeclStmt getVlaDeclStmt(Expr expr, int pointerDerefCount) {
+  expr.(VariableAccess).getTarget() = result.getVariable() and
+  pointerDerefCount = 0
+  or
+  not expr.(PointerDereferenceExpr).getOperand() instanceof AddressOfExpr and
+  result = getVlaDeclStmt(expr.(PointerDereferenceExpr).getOperand(), pointerDerefCount - 1)
+  or
+  // Skip sequences of the form `*&...`
+  result =
+    getVlaDeclStmt(expr.(PointerDereferenceExpr).getOperand().(AddressOfExpr).getOperand(),
+      pointerDerefCount)
+  or
+  result = getVlaDeclStmt(expr.(ArrayExpr).getArrayBase(), pointerDerefCount - 1)
+}
+
+/**
+ * The IR translation of `SizeofExprOperator` when its result is non-constant, i.e.,
+ * when the operand expression refers to a variable length array.
+ */
+class TranslatedSizeofExpr extends TranslatedNonConstantExpr {
+  override SizeofExprOperator expr;
+  VlaDeclStmt vlaDeclStmt;
+  int vlaDimensions;
+  int pointerDerefCount;
+
+  TranslatedSizeofExpr() {
+    vlaDeclStmt = getVlaDeclStmt(expr.getExprOperand(), pointerDerefCount) and
+    vlaDimensions = vlaDeclStmt.getTransitiveNumberOfVlaDimensionStmts() and
+    pointerDerefCount < vlaDimensions
+  }
+
+  final override Instruction getFirstInstruction(EdgeKind kind) {
+    result = this.getInstruction(SizeofVlaBaseSizeTag()) and
+    kind instanceof GotoEdge
+  }
+
+  override Instruction getALastInstructionInternal() {
+    result = this.getInstruction(SizeofVlaDimensionTag(vlaDimensions - 1))
+  }
+
+  final override TranslatedElement getChildInternal(int id) { none() }
+
+  final override predicate hasInstruction(Opcode opcode, InstructionTag tag, CppType resultType) {
+    opcode instanceof Opcode::Constant and
+    tag = SizeofVlaBaseSizeTag() and
+    resultType = this.getResultType()
+    or
+    exists(int n, Type dimType |
+      pointerDerefCount <= n and
+      n < vlaDimensions and
+      dimType = this.getDimensionExpr(n).getUnderlyingType() and
+      tag = SizeofVlaConversionTag(n)
+    |
+      (
+        expr.getUnderlyingType() = dimType and
+        opcode instanceof Opcode::CopyValue
+        or
+        not expr.getUnderlyingType() = dimType and
+        opcode instanceof Opcode::Convert
+      )
+    ) and
+    resultType = this.getResultType()
+    or
+    opcode instanceof Opcode::Mul and
+    exists(int n | pointerDerefCount <= n and n < vlaDimensions | tag = SizeofVlaDimensionTag(n)) and
+    resultType = this.getResultType()
+  }
+
+  final override Instruction getInstructionSuccessorInternal(InstructionTag tag, EdgeKind kind) {
+    tag = SizeofVlaBaseSizeTag() and
+    result = this.getInstruction(SizeofVlaConversionTag(pointerDerefCount)) and
+    kind instanceof GotoEdge
+    or
+    exists(int n | pointerDerefCount <= n and n < vlaDimensions |
+      tag = SizeofVlaConversionTag(n) and
+      result = this.getInstruction(SizeofVlaDimensionTag(n))
+    ) and
+    kind instanceof GotoEdge
+    or
+    exists(int n | pointerDerefCount <= n and n < vlaDimensions - 1 |
+      tag = SizeofVlaDimensionTag(n) and
+      result = this.getInstruction(SizeofVlaConversionTag(n + 1))
+    ) and
+    kind instanceof GotoEdge
+    or
+    tag = SizeofVlaDimensionTag(vlaDimensions - 1) and
+    result = this.getParent().getChildSuccessor(this, kind)
+  }
+
+  override string getInstructionConstantValue(InstructionTag tag) {
+    tag = SizeofVlaBaseSizeTag() and
+    result = this.getBaseType(vlaDeclStmt).getSize().toString()
+  }
+
+  private Type getBaseType(VlaDeclStmt v) {
+    not exists(v.getParentVlaDecl()) and
+    (
+      result =
+        this.getBaseType(v.getVariable().getUnderlyingType(), v.getNumberOfVlaDimensionStmts())
+      or
+      result = this.getBaseType(v.getType().getUnderlyingType(), v.getNumberOfVlaDimensionStmts())
+    )
+    or
+    result = this.getBaseType(v.getParentVlaDecl())
+  }
+
+  private Type getBaseType(Type type, int n) {
+    n = 0 and
+    result = type
+    or
+    result = this.getBaseType(type.(DerivedType).getBaseType(), n - 1)
+  }
+
+  override Instruction getInstructionRegisterOperand(InstructionTag tag, OperandTag operandTag) {
+    exists(int n | pointerDerefCount <= n and n < vlaDimensions |
+      tag = SizeofVlaConversionTag(n) and
+      (
+        operandTag instanceof UnaryOperandTag and
+        result = getTranslatedExpr(this.getDimensionExpr(n)).getResult()
+      )
+    )
+    or
+    exists(int n | pointerDerefCount <= n and n < vlaDimensions |
+      tag = SizeofVlaDimensionTag(n) and
+      (
+        operandTag instanceof LeftOperandTag and
+        (
+          n - 1 >= pointerDerefCount and
+          result = this.getInstruction(SizeofVlaDimensionTag(n - 1))
+          or
+          n - 1 < pointerDerefCount and
+          result = this.getInstruction(SizeofVlaBaseSizeTag())
+        )
+        or
+        operandTag instanceof RightOperandTag and
+        result = this.getInstruction(SizeofVlaConversionTag(n))
+      )
+    )
+  }
+
+  private Expr getDimensionExpr(int n) {
+    result = vlaDeclStmt.getTransitiveVlaDimensionStmt(n).getDimensionExpr().getFullyConverted()
+  }
+
+  final override Instruction getResult() {
+    result = this.getInstruction(SizeofVlaDimensionTag(vlaDimensions - 1))
+  }
+}
+
 class TranslatedErrorExpr extends TranslatedSingleInstructionExpr {
   override ErrorExpr expr;
 
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedFunction.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedFunction.qll
index 83736ae98d0..26f5393db10 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedFunction.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedFunction.qll
@@ -50,7 +50,7 @@ CppType getEllipsisVariablePRValueType() {
 CppType getEllipsisVariableGLValueType() { result = getTypeForGLValue(any(UnknownType t)) }
 
 /**
- * Holds if the function returns a value, as opposed to returning `void`.
+ * Holds if the function `func` returns a value, as opposed to returning `void`.
  */
 predicate hasReturnValue(Function func) { not func.getUnspecifiedType() instanceof VoidType }
 
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedStmt.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedStmt.qll
index 3914c5e8e59..9dccf7752aa 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedStmt.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedStmt.qll
@@ -601,7 +601,7 @@ class TranslatedReturnVoidStmt extends TranslatedReturnStmt {
  * The IR translation of an implicit `return` statement generated by the extractor to handle control
  * flow that reaches the end of a non-`void`-returning function body. Such control flow
  * produces undefined behavior in C++ but not in C. However even in C using the return value is
- * undefined behaviour. We make it return uninitialized memory to get as much flow as possible.
+ * undefined behavior. We make it return uninitialized memory to get as much flow as possible.
  */
 class TranslatedNoValueReturnStmt extends TranslatedReturnStmt, TranslatedVariableInitialization {
   TranslatedNoValueReturnStmt() {
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/IRBlock.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/IRBlock.qll
index 50395db47e7..7f7c5cd0a4d 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/IRBlock.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/IRBlock.qll
@@ -7,6 +7,7 @@ import Instruction
 private import internal.IRBlockImports as Imports
 import Imports::EdgeKind
 private import Cached
+private import codeql.controlflow.BasicBlock as BB
 
 /**
  * Holds if `block` is a block in `func` and `sortOverride`, `sortKey1`, and `sortKey2` are the
@@ -263,6 +264,54 @@ private predicate isEntryBlock(TIRBlock block) {
   block = MkIRBlock(any(EnterFunctionInstruction enter))
 }
 
+module IRCfg implements BB::CfgSig<Language::Location> {
+  private import codeql.controlflow.SuccessorType
+
+  class ControlFlowNode = Instruction;
+
+  final private class FinalIRBlock = IRBlock;
+
+  class BasicBlock extends FinalIRBlock {
+    ControlFlowNode getNode(int i) { result = this.getInstruction(i) }
+
+    ControlFlowNode getLastNode() { result = super.getLastInstruction() }
+
+    int length() { result = this.getInstructionCount() }
+
+    BasicBlock getASuccessor() { result = super.getASuccessor() }
+
+    BasicBlock getASuccessor(SuccessorType t) {
+      exists(EdgeKind k |
+        result = super.getSuccessor(k) and
+        t = getAMatchingSuccessorType(k)
+      )
+    }
+
+    predicate strictlyDominates(BasicBlock bb) { super.strictlyDominates(bb) }
+
+    predicate dominates(BasicBlock bb) { super.dominates(bb) }
+
+    BasicBlock getImmediateDominator() { result.immediatelyDominates(this) }
+
+    predicate inDominanceFrontier(BasicBlock df) { super.dominanceFrontier() = df }
+
+    predicate strictlyPostDominates(BasicBlock bb) { super.strictlyPostDominates(bb) }
+
+    predicate postDominates(BasicBlock bb) { super.postDominates(bb) }
+  }
+
+  class EntryBasicBlock extends BasicBlock {
+    EntryBasicBlock() { isEntryBlock(this) }
+  }
+
+  pragma[nomagic]
+  predicate dominatingEdge(BasicBlock bb1, BasicBlock bb2) {
+    bb1.getASuccessor() = bb2 and
+    bb1 = bb2.getImmediateDominator() and
+    forall(BasicBlock pred | pred = bb2.getAPredecessor() and pred != bb1 | bb2.dominates(pred))
+  }
+}
+
 cached
 private module Cached {
   cached
diff --git 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
index a564508e16b..8d3e960c3f8 100644
--- 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
@@ -1084,6 +1084,12 @@ class BinaryInstruction extends Instruction {
     or
     op1 = this.getRightOperand() and op2 = this.getLeftOperand()
   }
+
+  /**
+   * Gets the instruction whose result provides the value of the left or right
+   * operand of this binary instruction.
+   */
+  Instruction getAnInput() { result = this.getLeft() or result = this.getRight() }
 }
 
 /**
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/gvn/internal/ValueNumberingInternal.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/gvn/internal/ValueNumberingInternal.qll
index 66d499112b8..f4b5a850a1f 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/gvn/internal/ValueNumberingInternal.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/gvn/internal/ValueNumberingInternal.qll
@@ -41,7 +41,7 @@ newtype TValueNumber =
   ) {
     loadTotalOverlapValueNumber(_, irFunc, type, memOperand, operand)
   } or
-  TUniqueValueNumber(IRFunction irFunc, Instruction instr) { uniqueValueNumber(instr, irFunc) }
+  TUniqueValueNumber(Instruction instr) { uniqueValueNumber(instr) }
 
 /**
  * A `ConvertInstruction` which converts data of type `T` to data of type `U`
@@ -129,12 +129,14 @@ private predicate filteredNumberableInstruction(Instruction instr) {
     count(instr.(InheritanceConversionInstruction).getBaseClass()) != 1 or
     count(instr.(InheritanceConversionInstruction).getDerivedClass()) != 1
   )
+  or
+  count(instr.getEnclosingIRFunction()) != 1
 }
 
 private predicate variableAddressValueNumber(
   VariableAddressInstruction instr, IRFunction irFunc, Language::AST ast
 ) {
-  instr.getEnclosingIRFunction() = irFunc and
+  unique( | | instr.getEnclosingIRFunction()) = irFunc and
   // The underlying AST element is used as value-numbering key instead of the
   // `IRVariable` to work around a problem where a variable or expression with
   // multiple types gives rise to multiple `IRVariable`s.
@@ -144,7 +146,7 @@ private predicate variableAddressValueNumber(
 private predicate initializeParameterValueNumber(
   InitializeParameterInstruction instr, IRFunction irFunc, Language::AST var
 ) {
-  instr.getEnclosingIRFunction() = irFunc and
+  unique( | | instr.getEnclosingIRFunction()) = irFunc and
   // The underlying AST element is used as value-numbering key instead of the
   // `IRVariable` to work around a problem where a variable or expression with
   // multiple types gives rise to multiple `IRVariable`s.
@@ -154,7 +156,7 @@ private predicate initializeParameterValueNumber(
 private predicate constantValueNumber(
   ConstantInstruction instr, IRFunction irFunc, IRType type, string value
 ) {
-  instr.getEnclosingIRFunction() = irFunc and
+  unique( | | instr.getEnclosingIRFunction()) = irFunc and
   unique( | | instr.getResultIRType()) = type and
   instr.getValue() = value
 }
@@ -162,7 +164,7 @@ private predicate constantValueNumber(
 private predicate stringConstantValueNumber(
   StringConstantInstruction instr, IRFunction irFunc, IRType type, string value
 ) {
-  instr.getEnclosingIRFunction() = irFunc and
+  unique( | | instr.getEnclosingIRFunction()) = irFunc and
   instr.getResultIRType() = type and
   instr.getValue().getValue() = value
 }
@@ -171,7 +173,7 @@ private predicate fieldAddressValueNumber(
   FieldAddressInstruction instr, IRFunction irFunc, Language::Field field,
   TValueNumber objectAddress
 ) {
-  instr.getEnclosingIRFunction() = irFunc and
+  unique( | | instr.getEnclosingIRFunction()) = irFunc and
   unique( | | instr.getField()) = field and
   tvalueNumber(instr.getObjectAddress()) = objectAddress
 }
@@ -182,7 +184,7 @@ private predicate binaryValueNumber0(
   TValueNumber valueNumber
 ) {
   not instr instanceof PointerArithmeticInstruction and
-  instr.getEnclosingIRFunction() = irFunc and
+  unique( | | instr.getEnclosingIRFunction()) = irFunc and
   instr.getOpcode() = opcode and
   (
     isLeft = true and
@@ -206,7 +208,7 @@ private predicate pointerArithmeticValueNumber0(
   PointerArithmeticInstruction instr, IRFunction irFunc, Opcode opcode, int elementSize,
   boolean isLeft, TValueNumber valueNumber
 ) {
-  instr.getEnclosingIRFunction() = irFunc and
+  unique( | | instr.getEnclosingIRFunction()) = irFunc and
   instr.getOpcode() = opcode and
   instr.getElementSize() = elementSize and
   (
@@ -229,7 +231,7 @@ private predicate pointerArithmeticValueNumber(
 private predicate unaryValueNumber(
   UnaryInstruction instr, IRFunction irFunc, Opcode opcode, TValueNumber operand
 ) {
-  instr.getEnclosingIRFunction() = irFunc and
+  unique( | | instr.getEnclosingIRFunction()) = irFunc and
   not instr instanceof InheritanceConversionInstruction and
   not instr instanceof CopyInstruction and
   not instr instanceof FieldAddressInstruction and
@@ -242,7 +244,7 @@ private predicate inheritanceConversionValueNumber(
   InheritanceConversionInstruction instr, IRFunction irFunc, Opcode opcode,
   Language::Class baseClass, Language::Class derivedClass, TValueNumber operand
 ) {
-  instr.getEnclosingIRFunction() = irFunc and
+  unique( | | instr.getEnclosingIRFunction()) = irFunc and
   instr.getOpcode() = opcode and
   tvalueNumber(instr.getUnary()) = operand and
   unique( | | instr.getBaseClass()) = baseClass and
@@ -254,7 +256,7 @@ private predicate loadTotalOverlapValueNumber0(
   LoadTotalOverlapInstruction instr, IRFunction irFunc, IRType type, TValueNumber valueNumber,
   boolean isAddress
 ) {
-  instr.getEnclosingIRFunction() = irFunc and
+  unique( | | instr.getEnclosingIRFunction()) = irFunc and
   instr.getResultIRType() = type and
   (
     isAddress = true and
@@ -277,8 +279,7 @@ private predicate loadTotalOverlapValueNumber(
  * Holds if `instr` should be assigned a unique value number because this library does not know how
  * to determine if two instances of that instruction are equivalent.
  */
-private predicate uniqueValueNumber(Instruction instr, IRFunction irFunc) {
-  instr.getEnclosingIRFunction() = irFunc and
+private predicate uniqueValueNumber(Instruction instr) {
   not instr.getResultIRType() instanceof IRVoidType and
   (
     not numberableInstruction(instr)
@@ -294,10 +295,8 @@ cached
 TValueNumber tvalueNumber(Instruction instr) {
   result = nonUniqueValueNumber(instr)
   or
-  exists(IRFunction irFunc |
-    uniqueValueNumber(instr, irFunc) and
-    result = TUniqueValueNumber(irFunc, instr)
-  )
+  uniqueValueNumber(instr) and
+  result = TUniqueValueNumber(instr)
 }
 
 /**
@@ -311,68 +310,64 @@ TValueNumber tvalueNumberOfOperand(Operand op) { result = tvalueNumber(op.getDef
  * value number.
  */
 private TValueNumber nonUniqueValueNumber(Instruction instr) {
-  exists(IRFunction irFunc |
-    irFunc = instr.getEnclosingIRFunction() and
-    (
-      exists(Language::AST ast |
-        variableAddressValueNumber(instr, irFunc, ast) and
-        result = TVariableAddressValueNumber(irFunc, ast)
-      )
-      or
-      exists(Language::AST var |
-        initializeParameterValueNumber(instr, irFunc, var) and
-        result = TInitializeParameterValueNumber(irFunc, var)
-      )
-      or
-      exists(string value, IRType type |
-        constantValueNumber(instr, irFunc, type, value) and
-        result = TConstantValueNumber(irFunc, type, value)
-      )
-      or
-      exists(IRType type, string value |
-        stringConstantValueNumber(instr, irFunc, type, value) and
-        result = TStringConstantValueNumber(irFunc, type, value)
-      )
-      or
-      exists(Language::Field field, TValueNumber objectAddress |
-        fieldAddressValueNumber(instr, irFunc, field, objectAddress) and
-        result = TFieldAddressValueNumber(irFunc, field, objectAddress)
-      )
-      or
-      exists(Opcode opcode, TValueNumber leftOperand, TValueNumber rightOperand |
-        binaryValueNumber(instr, irFunc, opcode, leftOperand, rightOperand) and
-        result = TBinaryValueNumber(irFunc, opcode, leftOperand, rightOperand)
-      )
-      or
-      exists(Opcode opcode, TValueNumber operand |
-        unaryValueNumber(instr, irFunc, opcode, operand) and
-        result = TUnaryValueNumber(irFunc, opcode, operand)
-      )
-      or
-      exists(
-        Opcode opcode, Language::Class baseClass, Language::Class derivedClass, TValueNumber operand
-      |
-        inheritanceConversionValueNumber(instr, irFunc, opcode, baseClass, derivedClass, operand) and
-        result = TInheritanceConversionValueNumber(irFunc, opcode, baseClass, derivedClass, operand)
-      )
-      or
-      exists(Opcode opcode, int elementSize, TValueNumber leftOperand, TValueNumber rightOperand |
-        pointerArithmeticValueNumber(instr, irFunc, opcode, elementSize, leftOperand, rightOperand) and
-        result =
-          TPointerArithmeticValueNumber(irFunc, opcode, elementSize, leftOperand, rightOperand)
-      )
-      or
-      exists(IRType type, TValueNumber memOperand, TValueNumber operand |
-        loadTotalOverlapValueNumber(instr, irFunc, type, memOperand, operand) and
-        result = TLoadTotalOverlapValueNumber(irFunc, type, memOperand, operand)
-      )
-      or
-      // The value number of a copy is just the value number of its source value.
-      result = tvalueNumber(instr.(CongruentCopyInstruction).getSourceValue())
-      or
-      // The value number of a type-preserving conversion is just the value
-      // number of the unconverted value.
-      result = tvalueNumber(instr.(TypePreservingConvertInstruction).getUnary())
+  exists(IRFunction irFunc | irFunc = instr.getEnclosingIRFunction() |
+    exists(Language::AST ast |
+      variableAddressValueNumber(instr, irFunc, ast) and
+      result = TVariableAddressValueNumber(irFunc, ast)
     )
+    or
+    exists(Language::AST var |
+      initializeParameterValueNumber(instr, irFunc, var) and
+      result = TInitializeParameterValueNumber(irFunc, var)
+    )
+    or
+    exists(string value, IRType type |
+      constantValueNumber(instr, irFunc, type, value) and
+      result = TConstantValueNumber(irFunc, type, value)
+    )
+    or
+    exists(IRType type, string value |
+      stringConstantValueNumber(instr, irFunc, type, value) and
+      result = TStringConstantValueNumber(irFunc, type, value)
+    )
+    or
+    exists(Language::Field field, TValueNumber objectAddress |
+      fieldAddressValueNumber(instr, irFunc, field, objectAddress) and
+      result = TFieldAddressValueNumber(irFunc, field, objectAddress)
+    )
+    or
+    exists(Opcode opcode, TValueNumber leftOperand, TValueNumber rightOperand |
+      binaryValueNumber(instr, irFunc, opcode, leftOperand, rightOperand) and
+      result = TBinaryValueNumber(irFunc, opcode, leftOperand, rightOperand)
+    )
+    or
+    exists(Opcode opcode, TValueNumber operand |
+      unaryValueNumber(instr, irFunc, opcode, operand) and
+      result = TUnaryValueNumber(irFunc, opcode, operand)
+    )
+    or
+    exists(
+      Opcode opcode, Language::Class baseClass, Language::Class derivedClass, TValueNumber operand
+    |
+      inheritanceConversionValueNumber(instr, irFunc, opcode, baseClass, derivedClass, operand) and
+      result = TInheritanceConversionValueNumber(irFunc, opcode, baseClass, derivedClass, operand)
+    )
+    or
+    exists(Opcode opcode, int elementSize, TValueNumber leftOperand, TValueNumber rightOperand |
+      pointerArithmeticValueNumber(instr, irFunc, opcode, elementSize, leftOperand, rightOperand) and
+      result = TPointerArithmeticValueNumber(irFunc, opcode, elementSize, leftOperand, rightOperand)
+    )
+    or
+    exists(IRType type, TValueNumber memOperand, TValueNumber operand |
+      loadTotalOverlapValueNumber(instr, irFunc, type, memOperand, operand) and
+      result = TLoadTotalOverlapValueNumber(irFunc, type, memOperand, operand)
+    )
+    or
+    // The value number of a copy is just the value number of its source value.
+    result = tvalueNumber(instr.(CongruentCopyInstruction).getSourceValue())
+    or
+    // The value number of a type-preserving conversion is just the value
+    // number of the unconverted value.
+    result = tvalueNumber(instr.(TypePreservingConvertInstruction).getUnary())
   )
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/internal/IRUtilities.qll b/cpp/ql/lib/semmle/code/cpp/ir/internal/IRUtilities.qll
index bfd850384ac..c42f734a62a 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/internal/IRUtilities.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/internal/IRUtilities.qll
@@ -49,7 +49,8 @@ Type getVariableType(Variable v) {
 }
 
 /**
- * Holds if the database contains a `case` label with the specified minimum and maximum value.
+ * Holds if the database contains a `switchCase` label with the specified minimum `minValue`
+ * and maximum `maxValue` value.
  */
 predicate hasCaseEdge(SwitchCase switchCase, string minValue, string maxValue) {
   minValue = switchCase.getExpr().getFullyConverted().getValue() and
diff --git a/cpp/ql/lib/semmle/code/cpp/models/implementations/Memcpy.qll b/cpp/ql/lib/semmle/code/cpp/models/implementations/Memcpy.qll
index 311847e8aec..dc1302d3b8f 100644
--- a/cpp/ql/lib/semmle/code/cpp/models/implementations/Memcpy.qll
+++ b/cpp/ql/lib/semmle/code/cpp/models/implementations/Memcpy.qll
@@ -12,8 +12,8 @@ import semmle.code.cpp.models.interfaces.Taint
 import semmle.code.cpp.models.interfaces.NonThrowing
 
 /**
- * The standard functions `memcpy`, `memmove` and `bcopy`; and the gcc variant
- * `__builtin___memcpy_chk`.
+ * The standard functions `memcpy`, `memmove` and `bcopy`; and variants such as
+ * `__builtin___memcpy_chk` and `__builtin___memmove_chk`.
  */
 private class MemcpyFunction extends ArrayFunction, DataFlowFunction, SideEffectFunction,
   AliasFunction, NonCppThrowingFunction
@@ -27,7 +27,9 @@ private class MemcpyFunction extends ArrayFunction, DataFlowFunction, SideEffect
     // bcopy(src, dest, num)
     // mempcpy(dest, src, num)
     // memccpy(dest, src, c, n)
-    this.hasGlobalName(["bcopy", mempcpy(), "memccpy", "__builtin___memcpy_chk"])
+    this.hasGlobalName([
+        "bcopy", mempcpy(), "memccpy", "__builtin___memcpy_chk", "__builtin___memmove_chk"
+      ])
   }
 
   /**
diff --git a/cpp/ql/lib/semmle/code/cpp/models/implementations/Memset.qll b/cpp/ql/lib/semmle/code/cpp/models/implementations/Memset.qll
index 51234e50f94..f7d3f50234c 100644
--- a/cpp/ql/lib/semmle/code/cpp/models/implementations/Memset.qll
+++ b/cpp/ql/lib/semmle/code/cpp/models/implementations/Memset.qll
@@ -19,7 +19,8 @@ private class MemsetFunctionModel extends ArrayFunction, DataFlowFunction, Alias
     this.hasGlobalOrStdName("wmemset")
     or
     this.hasGlobalName([
-        bzero(), "__builtin_memset", "__builtin_memset_chk", "RtlZeroMemory", "RtlSecureZeroMemory"
+        bzero(), "__builtin_memset", "__builtin_memset_chk", "__builtin___memset_chk",
+        "RtlZeroMemory", "RtlSecureZeroMemory"
       ])
   }
 
@@ -32,7 +33,7 @@ private class MemsetFunctionModel extends ArrayFunction, DataFlowFunction, Alias
       or
       this.hasGlobalOrStdName("wmemset")
       or
-      this.hasGlobalName(["__builtin_memset", "__builtin_memset_chk"])
+      this.hasGlobalName(["__builtin_memset", "__builtin_memset_chk", "__builtin___memset_chk"])
     ) and
     result = 1
   }
diff --git a/cpp/ql/lib/semmle/code/cpp/models/implementations/Strcat.qll b/cpp/ql/lib/semmle/code/cpp/models/implementations/Strcat.qll
index 966c7425dc4..df16d220e02 100644
--- a/cpp/ql/lib/semmle/code/cpp/models/implementations/Strcat.qll
+++ b/cpp/ql/lib/semmle/code/cpp/models/implementations/Strcat.qll
@@ -30,7 +30,9 @@ class StrcatFunction extends TaintFunction, DataFlowFunction, ArrayFunction, Sid
         "_mbsncat", // _mbsncat(dst, src, max_amount)
         "_mbsncat_l", // _mbsncat_l(dst, src, max_amount, locale)
         "_mbsnbcat", // _mbsnbcat(dest, src, count)
-        "_mbsnbcat_l" // _mbsnbcat_l(dest, src, count, locale)
+        "_mbsnbcat_l", // _mbsnbcat_l(dest, src, count, locale)
+        "__builtin___strcat_chk", // __builtin___strcat_chk (dest, src, magic)
+        "__builtin___strncat_chk" // __builtin___strncat_chk (dest, src, max_amount, magic)
       ])
   }
 
@@ -56,7 +58,7 @@ class StrcatFunction extends TaintFunction, DataFlowFunction, ArrayFunction, Sid
 
   override predicate hasTaintFlow(FunctionInput input, FunctionOutput output) {
     (
-      this.getName() = ["strncat", "wcsncat", "_mbsncat", "_mbsncat_l"] and
+      this.getName() = ["strncat", "wcsncat", "_mbsncat", "_mbsncat_l", "__builtin___strncat_chk"] and
       input.isParameter(2)
       or
       this.getName() = ["_mbsncat_l", "_mbsnbcat_l"] and
diff --git a/cpp/ql/lib/semmle/code/cpp/models/implementations/Strcpy.qll b/cpp/ql/lib/semmle/code/cpp/models/implementations/Strcpy.qll
index b7ed20f1bab..b3230a5a1c8 100644
--- a/cpp/ql/lib/semmle/code/cpp/models/implementations/Strcpy.qll
+++ b/cpp/ql/lib/semmle/code/cpp/models/implementations/Strcpy.qll
@@ -36,7 +36,11 @@ class StrcpyFunction extends ArrayFunction, DataFlowFunction, TaintFunction, Sid
         "_mbsnbcpy", // _mbsnbcpy(dest, src, max_amount)
         "stpcpy", // stpcpy(dest, src)
         "stpncpy", // stpncpy(dest, src, max_amount)
-        "strlcpy" // strlcpy(dst, src, dst_size)
+        "strlcpy", // strlcpy(dst, src, dst_size)
+        "__builtin___strcpy_chk", // __builtin___strcpy_chk (dest, src, magic)
+        "__builtin___stpcpy_chk", // __builtin___stpcpy_chk (dest, src, magic)
+        "__builtin___stpncpy_chk", // __builtin___stpncpy_chk(dest, src, max_amount, magic)
+        "__builtin___strncpy_chk" // __builtin___strncpy_chk (dest, src, max_amount, magic)
       ])
     or
     (
diff --git a/cpp/ql/lib/semmle/code/cpp/models/interfaces/FormattingFunction.qll b/cpp/ql/lib/semmle/code/cpp/models/interfaces/FormattingFunction.qll
index ce65a65319a..757db13fe8c 100644
--- a/cpp/ql/lib/semmle/code/cpp/models/interfaces/FormattingFunction.qll
+++ b/cpp/ql/lib/semmle/code/cpp/models/interfaces/FormattingFunction.qll
@@ -170,6 +170,16 @@ abstract class FormattingFunction extends ArrayFunction, TaintFunction {
       output.isParameterDeref(this.getOutputParameterIndex(_))
     )
   }
+
+  final override predicate isPartialWrite(FunctionOutput output) {
+    exists(int outputParameterIndex |
+      output.isParameterDeref(outputParameterIndex) and
+      // We require the output to be a stream since that definitely means that
+      // it's a partial write. If it's not a stream then it will most likely
+      // fill the whole buffer.
+      outputParameterIndex = this.getOutputParameterIndex(true)
+    )
+  }
 }
 
 /**
diff --git a/cpp/ql/lib/semmle/code/cpp/models/interfaces/FunctionInputsAndOutputs.qll b/cpp/ql/lib/semmle/code/cpp/models/interfaces/FunctionInputsAndOutputs.qll
index 9c8ee43b52a..d81bc960988 100644
--- a/cpp/ql/lib/semmle/code/cpp/models/interfaces/FunctionInputsAndOutputs.qll
+++ b/cpp/ql/lib/semmle/code/cpp/models/interfaces/FunctionInputsAndOutputs.qll
@@ -371,7 +371,7 @@ class FunctionOutput extends TFunctionOutput {
   /**
    * Holds if this is the output value pointed to by a pointer parameter to a function, or the
    * output value referred to by a reference parameter to a function, where the parameter has
-   * index `index`.
+   * index `i`.
    *
    * Example:
    * ```
@@ -389,7 +389,7 @@ class FunctionOutput extends TFunctionOutput {
   /**
    * Holds if this is the output value pointed to by a pointer parameter (through `ind` number
    * of indirections) to a function, or the output value referred to by a reference parameter to
-   * a function, where the parameter has index `index`.
+   * a function, where the parameter has index `i`.
    *
    * Example:
    * ```
diff --git a/cpp/ql/lib/semmle/code/cpp/rangeanalysis/RangeAnalysisUtils.qll b/cpp/ql/lib/semmle/code/cpp/rangeanalysis/RangeAnalysisUtils.qll
index 07c6ee1cd2b..2423a3a71a0 100644
--- a/cpp/ql/lib/semmle/code/cpp/rangeanalysis/RangeAnalysisUtils.qll
+++ b/cpp/ql/lib/semmle/code/cpp/rangeanalysis/RangeAnalysisUtils.qll
@@ -1,10 +1,10 @@
 import cpp
 
 /**
- * Describes whether a relation is 'strict' (that is, a `<` or `>`
+ * The strictness of a relation. Either 'strict' (that is, a `<` or `>`
  * relation) or 'non-strict' (a `<=` or `>=` relation).
  */
-newtype RelationStrictness =
+newtype TRelationStrictness =
   /**
    * Represents that a relation is 'strict' (that is, a `<` or `>` relation).
    */
@@ -14,6 +14,19 @@ newtype RelationStrictness =
    */
   Nonstrict()
 
+/**
+ * The strictness of a relation. Either 'strict' (that is, a `<` or `>`
+ * relation) or 'non-strict' (a `<=` or `>=` relation).
+ */
+class RelationStrictness extends TRelationStrictness {
+  /** Gets the string representation of this relation strictness. */
+  string toString() {
+    this = Strict() and result = "strict"
+    or
+    this = Nonstrict() and result = "non-strict"
+  }
+}
+
 /**
  * Describes whether a relation is 'greater' (that is, a `>` or `>=`
  * relation) or 'lesser' (a `<` or `<=` relation).
@@ -105,10 +118,10 @@ predicate relOpWithSwap(
  *
  * This allows for the relation to be either as written, or with its
  * arguments reversed; for example, if `rel` is `x < 5` then
- * `relOpWithSwapAndNegate(rel, x, 5, Lesser(), Strict(), true)`,
- * `relOpWithSwapAndNegate(rel, 5, x, Greater(), Strict(), true)`,
- * `relOpWithSwapAndNegate(rel, x, 5, Greater(), Nonstrict(), false)` and
- * `relOpWithSwapAndNegate(rel, 5, x, Lesser(), Nonstrict(), false)` hold.
+ * - `relOpWithSwapAndNegate(rel, x, 5, Lesser(), Strict(), true)`,
+ * - `relOpWithSwapAndNegate(rel, 5, x, Greater(), Strict(), true)`,
+ * - `relOpWithSwapAndNegate(rel, x, 5, Greater(), Nonstrict(), false)` and
+ * - `relOpWithSwapAndNegate(rel, 5, x, Lesser(), Nonstrict(), false)` hold.
  */
 predicate relOpWithSwapAndNegate(
   RelationalOperation rel, Expr a, Expr b, RelationDirection dir, RelationStrictness strict,
diff --git a/cpp/ql/lib/semmle/code/cpp/rangeanalysis/SimpleRangeAnalysis.qll b/cpp/ql/lib/semmle/code/cpp/rangeanalysis/SimpleRangeAnalysis.qll
index 673d0c3c4ea..95cdb2624b5 100644
--- a/cpp/ql/lib/semmle/code/cpp/rangeanalysis/SimpleRangeAnalysis.qll
+++ b/cpp/ql/lib/semmle/code/cpp/rangeanalysis/SimpleRangeAnalysis.qll
@@ -99,25 +99,24 @@ private float wideningUpperBounds(ArithmeticType t) {
  * compilation units, which doesn't necessarily have a getValue() result from the extractor.
  */
 private string getValue(Expr e) {
-  if exists(e.getValue())
-  then result = e.getValue()
-  else
-    /*
-     * It should be safe to propagate the initialization value to a variable if:
-     * The type of v is const, and
-     * The type of v is not volatile, and
-     * Either:
-     *   v is a local/global variable, or
-     *   v is a static member variable
-     */
+  result = e.getValue()
+  or
+  not exists(e.getValue()) and
+  /*
+   * It should be safe to propagate the initialization value to a variable if:
+   * The type of v is const, and
+   * The type of v is not volatile, and
+   * Either:
+   *   v is a local/global variable, or
+   *   v is a static member variable
+   */
 
-    exists(VariableAccess access, StaticStorageDurationVariable v |
-      not v.getUnderlyingType().isVolatile() and
-      v.getUnderlyingType().isConst() and
-      e = access and
-      v = access.getTarget() and
-      result = getValue(v.getAnAssignedValue())
-    )
+  exists(StaticStorageDurationVariable v |
+    not v.getUnderlyingType().isVolatile() and
+    v.getUnderlyingType().isConst() and
+    v = e.(VariableAccess).getTarget() and
+    result = getValue(v.getAnAssignedValue())
+  )
 }
 
 /**
@@ -890,7 +889,7 @@ private float getLowerBoundsImpl(Expr expr) {
       // equal to `min(-y + 1,y - 1)`.
       exists(float childLB |
         childLB = getFullyConvertedLowerBounds(remExpr.getAnOperand()) and
-        not childLB >= 0
+        childLB < 0
       |
         result = getFullyConvertedLowerBounds(remExpr.getRightOperand()) - 1
         or
@@ -1102,8 +1101,7 @@ private float getUpperBoundsImpl(Expr expr) {
       // adding `-rhsLB` to the set of upper bounds.
       exists(float rhsLB |
         rhsLB = getFullyConvertedLowerBounds(remExpr.getRightOperand()) and
-        not rhsLB >= 0
-      |
+        rhsLB < 0 and
         result = -rhsLB + 1
       )
     )
@@ -1248,8 +1246,7 @@ private float getPhiLowerBounds(StackVariable v, RangeSsaDefinition phi) {
   exists(VariableAccess access, Expr guard, boolean branch, float defLB, float guardLB |
     phi.isGuardPhi(v, access, guard, branch) and
     lowerBoundFromGuard(guard, access, guardLB, branch) and
-    defLB = getFullyConvertedLowerBounds(access)
-  |
+    defLB = getFullyConvertedLowerBounds(access) and
     // Compute the maximum of `guardLB` and `defLB`.
     if guardLB > defLB then result = guardLB else result = defLB
   )
@@ -1273,8 +1270,7 @@ private float getPhiUpperBounds(StackVariable v, RangeSsaDefinition phi) {
   exists(VariableAccess access, Expr guard, boolean branch, float defUB, float guardUB |
     phi.isGuardPhi(v, access, guard, branch) and
     upperBoundFromGuard(guard, access, guardUB, branch) and
-    defUB = getFullyConvertedUpperBounds(access)
-  |
+    defUB = getFullyConvertedUpperBounds(access) and
     // Compute the minimum of `guardUB` and `defUB`.
     if guardUB < defUB then result = guardUB else result = defUB
   )
@@ -1438,8 +1434,7 @@ private predicate upperBoundFromGuard(Expr guard, VariableAccess v, float ub, bo
 }
 
 /**
- * This predicate simplifies the results returned by
- * `linearBoundFromGuard`.
+ * This predicate simplifies the results returned by `linearBoundFromGuard`.
  */
 private predicate boundFromGuard(
   Expr guard, VariableAccess v, float boundValue, boolean isLowerBound,
@@ -1447,22 +1442,10 @@ private predicate boundFromGuard(
 ) {
   exists(float p, float q, float r, boolean isLB |
     linearBoundFromGuard(guard, v, p, q, r, isLB, strictness, branch) and
-    boundValue = (r - q) / p
-  |
+    boundValue = (r - q) / p and
     // If the multiplier is negative then the direction of the comparison
     // needs to be flipped.
-    p > 0 and isLowerBound = isLB
-    or
-    p < 0 and isLowerBound = isLB.booleanNot()
-  )
-  or
-  // When `!e` is true, we know that `0 <= e <= 0`
-  exists(float p, float q, Expr e |
-    linearAccess(e, v, p, q) and
-    eqZeroWithNegate(guard, e, true, branch) and
-    boundValue = (0.0 - q) / p and
-    isLowerBound = [false, true] and
-    strictness = Nonstrict()
+    if p < 0 then isLowerBound = isLB.booleanNot() else isLowerBound = isLB
   )
 }
 
@@ -1472,54 +1455,57 @@ private predicate boundFromGuard(
  * lower or upper bound for `v`.
  */
 private predicate linearBoundFromGuard(
-  ComparisonOperation guard, VariableAccess v, float p, float q, float boundValue,
+  Expr guard, VariableAccess v, float p, float q, float r,
   boolean isLowerBound, // Is this a lower or an upper bound?
   RelationStrictness strictness, boolean branch // Which control-flow branch is this bound valid on?
 ) {
-  // For the comparison x < RHS, we create two bounds:
-  //
-  //   1. x < upperbound(RHS)
-  //   2. x >= typeLowerBound(RHS.getUnspecifiedType())
-  //
-  exists(Expr lhs, Expr rhs, RelationDirection dir, RelationStrictness st |
-    linearAccess(lhs, v, p, q) and
-    relOpWithSwapAndNegate(guard, lhs, rhs, dir, st, branch)
-  |
-    isLowerBound = directionIsGreater(dir) and
-    strictness = st and
-    getBounds(rhs, boundValue, isLowerBound)
+  exists(Expr lhs | linearAccess(lhs, v, p, q) |
+    // For the comparison x < RHS, we create the following bounds:
+    //   1. x < upperbound(RHS)
+    //   2. x >= typeLowerBound(RHS.getUnspecifiedType())
+    exists(Expr rhs, RelationDirection dir, RelationStrictness st |
+      relOpWithSwapAndNegate(guard, lhs, rhs, dir, st, branch)
+    |
+      isLowerBound = directionIsGreater(dir) and
+      strictness = st and
+      r = getBounds(rhs, isLowerBound)
+      or
+      isLowerBound = directionIsLesser(dir) and
+      strictness = Nonstrict() and
+      r = getExprTypeBounds(rhs, isLowerBound)
+    )
     or
-    isLowerBound = directionIsLesser(dir) and
-    strictness = Nonstrict() and
-    exprTypeBounds(rhs, boundValue, isLowerBound)
-  )
-  or
-  // For x == RHS, we create the following bounds:
-  //
-  //   1. x <= upperbound(RHS)
-  //   2. x >= lowerbound(RHS)
-  //
-  exists(Expr lhs, Expr rhs |
-    linearAccess(lhs, v, p, q) and
-    eqOpWithSwapAndNegate(guard, lhs, rhs, true, branch) and
-    getBounds(rhs, boundValue, isLowerBound) and
+    // For x == RHS, we create the following bounds:
+    //   1. x <= upperbound(RHS)
+    //   2. x >= lowerbound(RHS)
+    exists(Expr rhs |
+      eqOpWithSwapAndNegate(guard, lhs, rhs, true, branch) and
+      r = getBounds(rhs, isLowerBound) and
+      strictness = Nonstrict()
+    )
+    or
+    // When `x` is equal to 0 we create the following bounds:
+    //   1. x <= 0
+    //   2. x >= 0
+    eqZeroWithNegate(guard, lhs, true, branch) and
+    r = 0.0 and
+    isLowerBound = [false, true] and
     strictness = Nonstrict()
   )
-  // x != RHS and !x are handled elsewhere
+}
+
+/** Get the fully converted lower or upper bounds of `expr` based on `isLowerBound`. */
+private float getBounds(Expr expr, boolean isLowerBound) {
+  isLowerBound = true and result = getFullyConvertedLowerBounds(expr)
+  or
+  isLowerBound = false and result = getFullyConvertedUpperBounds(expr)
 }
 
 /** Utility for `linearBoundFromGuard`. */
-private predicate getBounds(Expr expr, float boundValue, boolean isLowerBound) {
-  isLowerBound = true and boundValue = getFullyConvertedLowerBounds(expr)
+private float getExprTypeBounds(Expr expr, boolean isLowerBound) {
+  isLowerBound = true and result = exprMinVal(expr.getFullyConverted())
   or
-  isLowerBound = false and boundValue = getFullyConvertedUpperBounds(expr)
-}
-
-/** Utility for `linearBoundFromGuard`. */
-private predicate exprTypeBounds(Expr expr, float boundValue, boolean isLowerBound) {
-  isLowerBound = true and boundValue = exprMinVal(expr.getFullyConverted())
-  or
-  isLowerBound = false and boundValue = exprMaxVal(expr.getFullyConverted())
+  isLowerBound = false and result = exprMaxVal(expr.getFullyConverted())
 }
 
 /**
diff --git a/cpp/ql/lib/semmle/code/cpp/rangeanalysis/new/internal/semantic/SemanticExpr.qll b/cpp/ql/lib/semmle/code/cpp/rangeanalysis/new/internal/semantic/SemanticExpr.qll
index 668d9b52659..f269d0dfff2 100644
--- a/cpp/ql/lib/semmle/code/cpp/rangeanalysis/new/internal/semantic/SemanticExpr.qll
+++ b/cpp/ql/lib/semmle/code/cpp/rangeanalysis/new/internal/semantic/SemanticExpr.qll
@@ -307,13 +307,12 @@ class SemStoreExpr extends SemUnaryExpr {
 }
 
 class SemConditionalExpr extends SemKnownExpr {
-  SemExpr condition;
   SemExpr trueResult;
   SemExpr falseResult;
 
   SemConditionalExpr() {
     opcode instanceof Opcode::Conditional and
-    Specific::conditionalExpr(this, type, condition, trueResult, falseResult)
+    Specific::conditionalExpr(this, type, any(SemExpr condition), trueResult, falseResult)
   }
 
   final SemExpr getBranchExpr(boolean branch) {
diff --git a/cpp/ql/lib/semmle/code/cpp/rangeanalysis/new/internal/semantic/SemanticExprSpecific.qll b/cpp/ql/lib/semmle/code/cpp/rangeanalysis/new/internal/semantic/SemanticExprSpecific.qll
index 224f968ce69..242c023118f 100644
--- a/cpp/ql/lib/semmle/code/cpp/rangeanalysis/new/internal/semantic/SemanticExprSpecific.qll
+++ b/cpp/ql/lib/semmle/code/cpp/rangeanalysis/new/internal/semantic/SemanticExprSpecific.qll
@@ -259,7 +259,7 @@ module SemanticExprConfig {
   }
 
   predicate guardHasBranchEdge(Guard guard, BasicBlock bb1, BasicBlock bb2, boolean branch) {
-    guard.controlsEdge(bb1, bb2, branch)
+    guard.controlsBranchEdge(bb1, bb2, branch)
   }
 
   Guard comparisonGuard(Expr e) { getSemanticExpr(result) = e }
diff --git a/cpp/ql/lib/semmle/code/cpp/security/FileWrite.qll b/cpp/ql/lib/semmle/code/cpp/security/FileWrite.qll
index dc421e8f3ae..6c0552a7d18 100644
--- a/cpp/ql/lib/semmle/code/cpp/security/FileWrite.qll
+++ b/cpp/ql/lib/semmle/code/cpp/security/FileWrite.qll
@@ -21,7 +21,9 @@ class FileWrite extends Expr {
   Expr getDest() { fileWrite(this, _, result) }
 
   /**
-   * Gets the conversion character for this write, if it exists and is known. For example in the following code the write of `value1` has conversion character `"s"`, whereas the write of `value2` has no conversion specifier.
+   * Gets the conversion character from `source` for this write, if it exists and is known.
+   * For example in the following code the write of `value1` has conversion character `"s"`, whereas
+   * the write of `value2` has no conversion specifier.
    * ```
    * fprintf(file, "%s", value1);
    * stream << value2;
diff --git a/cpp/ql/lib/semmle/code/cpp/security/boostorg/asio/protocols.qll b/cpp/ql/lib/semmle/code/cpp/security/boostorg/asio/protocols.qll
index 559ebd444f3..984bd874ae5 100644
--- a/cpp/ql/lib/semmle/code/cpp/security/boostorg/asio/protocols.qll
+++ b/cpp/ql/lib/semmle/code/cpp/security/boostorg/asio/protocols.qll
@@ -191,11 +191,19 @@ module BoostorgAsio {
   class SslContextClass extends Class {
     SslContextClass() { this.getQualifiedName() = "boost::asio::ssl::context" }
 
-    ConstructorCall getAContructorCall() {
+    /**
+     * Gets a constructor call, if any.
+     */
+    ConstructorCall getAConstructorCall() {
       this.getAConstructor().getACallToThisFunction() = result and
       not result.getLocation().getFile().toString().matches("%/boost/asio/%") and
       result.fromSource()
     }
+
+    /**
+     * DEPRECATED: Use `getAConstructorCall` instead.
+     */
+    deprecated ConstructorCall getAContructorCall() { result = this.getAConstructorCall() }
   }
 
   /**
@@ -368,7 +376,7 @@ module BoostorgAsio {
      */
     default predicate isSink(DataFlow::Node sink) {
       exists(ConstructorCall cc, SslContextClass c, Expr e | e = sink.asExpr() |
-        c.getAContructorCall() = cc and
+        c.getAConstructorCall() = cc and
         cc.getArgument(0) = e
       )
     }
@@ -468,7 +476,7 @@ module BoostorgAsio {
     predicate isSource(DataFlow::Node source) {
       exists(SslContextClass c, ConstructorCall cc |
         cc = source.asExpr() and
-        c.getAContructorCall() = cc
+        c.getAConstructorCall() = cc
       )
     }
 
diff --git a/cpp/ql/lib/semmle/code/cpp/stmts/Stmt.qll b/cpp/ql/lib/semmle/code/cpp/stmts/Stmt.qll
index 5305c8ca58f..bd3a54c6159 100644
--- a/cpp/ql/lib/semmle/code/cpp/stmts/Stmt.qll
+++ b/cpp/ql/lib/semmle/code/cpp/stmts/Stmt.qll
@@ -2355,6 +2355,20 @@ class VlaDeclStmt extends Stmt, @stmt_vla_decl {
     )
   }
 
+  /**
+   * Gets the number of VLA dimension statements in this VLA declaration
+   * statement and transitively of the VLA declaration used to define its
+   * base type. if any.
+   */
+  int getTransitiveNumberOfVlaDimensionStmts() {
+    not exists(this.getParentVlaDecl()) and
+    result = this.getNumberOfVlaDimensionStmts()
+    or
+    result =
+      this.getNumberOfVlaDimensionStmts() +
+        this.getParentVlaDecl().getTransitiveNumberOfVlaDimensionStmts()
+  }
+
   /**
    * Gets the `i`th VLA dimension statement in this VLA
    * declaration statement.
@@ -2367,6 +2381,19 @@ class VlaDeclStmt extends Stmt, @stmt_vla_decl {
     )
   }
 
+  /**
+   * Gets the `i`th VLA dimension statement in this VLA declaration
+   * statement or transitively of the VLA declaration used to define
+   * its base type.
+   */
+  VlaDimensionStmt getTransitiveVlaDimensionStmt(int i) {
+    i < this.getNumberOfVlaDimensionStmts() and
+    result = this.getVlaDimensionStmt(i)
+    or
+    result =
+      this.getParentVlaDecl().getTransitiveVlaDimensionStmt(i - this.getNumberOfVlaDimensionStmts())
+  }
+
   /**
    * Gets the type that this VLA declaration statement relates to,
    * if any.
@@ -2378,4 +2405,31 @@ class VlaDeclStmt extends Stmt, @stmt_vla_decl {
    * if any.
    */
   Variable getVariable() { variable_vla(unresolveElement(result), underlyingElement(this)) }
+
+  /**
+   * Get the VLA declaration used to define the base type of
+   * this VLA declaration, if any.
+   */
+  VlaDeclStmt getParentVlaDecl() {
+    exists(Variable v, Type baseType |
+      v = this.getVariable() and
+      baseType = this.getBaseType(v.getType(), this.getNumberOfVlaDimensionStmts())
+    |
+      result.getType() = baseType
+    )
+    or
+    exists(Type t, Type baseType |
+      t = this.getType().(TypedefType).getBaseType() and
+      baseType = this.getBaseType(t, this.getNumberOfVlaDimensionStmts())
+    |
+      result.getType() = baseType
+    )
+  }
+
+  private Type getBaseType(Type type, int n) {
+    n = 0 and
+    result = type
+    or
+    result = this.getBaseType(type.(DerivedType).getBaseType(), n - 1)
+  }
 }
diff --git a/cpp/ql/lib/semmlecode.cpp.dbscheme b/cpp/ql/lib/semmlecode.cpp.dbscheme
index 5340d6d5f42..2121ffec11f 100644
--- a/cpp/ql/lib/semmlecode.cpp.dbscheme
+++ b/cpp/ql/lib/semmlecode.cpp.dbscheme
@@ -222,6 +222,19 @@ extractor_version(
     string frontend_version: string ref
 )
 
+pch_uses(
+    int pch: @pch ref,
+    int compilation: @compilation ref,
+    int id: @file ref
+)
+
+#keyset[pch, compilation]
+pch_creations(
+    int pch: @pch,
+    int compilation: @compilation ref,
+    int from: @file ref
+)
+
 /** An element for which line-count information is available. */
 @sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
 
@@ -1314,7 +1327,8 @@ specialnamequalifyingelements(
 @namequalifiableelement = @expr | @namequalifier;
 @namequalifyingelement = @namespace
                        | @specialnamequalifyingelement
-                       | @usertype;
+                       | @usertype
+                       | @decltype;
 
 namequalifiers(
     unique int id: @namequalifier,
diff --git a/cpp/ql/lib/semmlecode.cpp.dbscheme.stats b/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
index ef86a76e7ed..42cff5d8d16 100644
--- a/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
+++ b/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
@@ -2,7 +2,7 @@
     <typesizes>
         <e>
             <k>@compilation</k>
-            <v>12642</v>
+            <v>12643</v>
         </e>
         <e>
             <k>@externalDataElement</k>
@@ -10,7 +10,7 @@
         </e>
         <e>
             <k>@file</k>
-            <v>65211</v>
+            <v>65212</v>
         </e>
         <e>
             <k>@folder</k>
@@ -22,11 +22,15 @@
         </e>
         <e>
             <k>@location_default</k>
-            <v>46965929</v>
+            <v>46945087</v>
+        </e>
+        <e>
+            <k>@pch</k>
+            <v>249</v>
         </e>
         <e>
             <k>@macro_expansion</k>
-            <v>40257319</v>
+            <v>40256583</v>
         </e>
         <e>
             <k>@other_macro_reference</k>
@@ -34,7 +38,7 @@
         </e>
         <e>
             <k>@normal_function</k>
-            <v>2740505</v>
+            <v>2738022</v>
         </e>
         <e>
             <k>@unknown_function</k>
@@ -42,19 +46,19 @@
         </e>
         <e>
             <k>@constructor</k>
-            <v>698724</v>
+            <v>698728</v>
         </e>
         <e>
             <k>@destructor</k>
-            <v>86280</v>
+            <v>86202</v>
         </e>
         <e>
             <k>@conversion_function</k>
-            <v>10363</v>
+            <v>10354</v>
         </e>
         <e>
             <k>@operator</k>
-            <v>653036</v>
+            <v>652444</v>
         </e>
         <e>
             <k>@user_defined_literal</k>
@@ -62,27 +66,27 @@
         </e>
         <e>
             <k>@deduction_guide</k>
-            <v>5868</v>
+            <v>5863</v>
         </e>
         <e>
             <k>@fun_decl</k>
-            <v>4206778</v>
+            <v>4202967</v>
         </e>
         <e>
             <k>@var_decl</k>
-            <v>9391612</v>
+            <v>9383104</v>
         </e>
         <e>
             <k>@type_decl</k>
-            <v>1634963</v>
+            <v>1633482</v>
         </e>
         <e>
             <k>@namespace_decl</k>
-            <v>407321</v>
+            <v>407775</v>
         </e>
         <e>
             <k>@using_declaration</k>
-            <v>267931</v>
+            <v>267822</v>
         </e>
         <e>
             <k>@using_directive</k>
@@ -94,27 +98,27 @@
         </e>
         <e>
             <k>@static_assert</k>
-            <v>173266</v>
+            <v>173262</v>
         </e>
         <e>
             <k>@parameter</k>
-            <v>7026197</v>
+            <v>7019832</v>
         </e>
         <e>
             <k>@membervariable</k>
-            <v>1496815</v>
+            <v>1497674</v>
         </e>
         <e>
             <k>@globalvariable</k>
-            <v>488591</v>
+            <v>488148</v>
         </e>
         <e>
             <k>@localvariable</k>
-            <v>726232</v>
+            <v>726300</v>
         </e>
         <e>
             <k>@enumconstant</k>
-            <v>345733</v>
+            <v>347816</v>
         </e>
         <e>
             <k>@errortype</k>
@@ -362,23 +366,23 @@
         </e>
         <e>
             <k>@pointer</k>
-            <v>452880</v>
+            <v>452469</v>
         </e>
         <e>
             <k>@type_with_specifiers</k>
-            <v>693866</v>
+            <v>693238</v>
         </e>
         <e>
             <k>@array</k>
-            <v>90401</v>
+            <v>90319</v>
         </e>
         <e>
             <k>@routineptr</k>
-            <v>684109</v>
+            <v>684112</v>
         </e>
         <e>
             <k>@reference</k>
-            <v>968192</v>
+            <v>967314</v>
         </e>
         <e>
             <k>@gnu_vector</k>
@@ -390,7 +394,7 @@
         </e>
         <e>
             <k>@rvalue_reference</k>
-            <v>291306</v>
+            <v>291042</v>
         </e>
         <e>
             <k>@block</k>
@@ -410,7 +414,7 @@
         </e>
         <e>
             <k>@underlying_type</k>
-            <v>624</v>
+            <v>623</v>
         </e>
         <e>
             <k>@bases</k>
@@ -486,23 +490,23 @@
         </e>
         <e>
             <k>@struct</k>
-            <v>979865</v>
+            <v>979892</v>
         </e>
         <e>
             <k>@union</k>
-            <v>20977</v>
+            <v>20958</v>
         </e>
         <e>
             <k>@enum</k>
-            <v>41337</v>
+            <v>41550</v>
         </e>
         <e>
             <k>@template_parameter</k>
-            <v>867072</v>
+            <v>867095</v>
         </e>
         <e>
             <k>@alias</k>
-            <v>1762239</v>
+            <v>1762360</v>
         </e>
         <e>
             <k>@unknown_usertype</k>
@@ -510,7 +514,7 @@
         </e>
         <e>
             <k>@class</k>
-            <v>325269</v>
+            <v>324974</v>
         </e>
         <e>
             <k>@template_template_parameter</k>
@@ -518,31 +522,31 @@
         </e>
         <e>
             <k>@proxy_class</k>
-            <v>48438</v>
+            <v>48439</v>
         </e>
         <e>
             <k>@scoped_enum</k>
-            <v>11612</v>
+            <v>11601</v>
         </e>
         <e>
             <k>@template_struct</k>
-            <v>212078</v>
+            <v>212084</v>
         </e>
         <e>
             <k>@template_class</k>
-            <v>29342</v>
+            <v>29316</v>
         </e>
         <e>
             <k>@template_union</k>
-            <v>1373</v>
+            <v>1372</v>
         </e>
         <e>
             <k>@mangledname</k>
-            <v>6370039</v>
+            <v>6364268</v>
         </e>
         <e>
             <k>@type_mention</k>
-            <v>5902897</v>
+            <v>5903894</v>
         </e>
         <e>
             <k>@concept_template</k>
@@ -550,15 +554,15 @@
         </e>
         <e>
             <k>@routinetype</k>
-            <v>604319</v>
+            <v>604322</v>
         </e>
         <e>
             <k>@ptrtomember</k>
-            <v>9727</v>
+            <v>9728</v>
         </e>
         <e>
             <k>@specifier</k>
-            <v>7741</v>
+            <v>7734</v>
         </e>
         <e>
             <k>@gnuattribute</k>
@@ -566,11 +570,11 @@
         </e>
         <e>
             <k>@stdattribute</k>
-            <v>353114</v>
+            <v>352794</v>
         </e>
         <e>
             <k>@declspec</k>
-            <v>330047</v>
+            <v>330281</v>
         </e>
         <e>
             <k>@msattribute</k>
@@ -578,7 +582,7 @@
         </e>
         <e>
             <k>@alignas</k>
-            <v>2166</v>
+            <v>2164</v>
         </e>
         <e>
             <k>@attribute_arg_token</k>
@@ -586,7 +590,7 @@
         </e>
         <e>
             <k>@attribute_arg_constant_expr</k>
-            <v>71875</v>
+            <v>71856</v>
         </e>
         <e>
             <k>@attribute_arg_expr</k>
@@ -606,15 +610,15 @@
         </e>
         <e>
             <k>@derivation</k>
-            <v>476900</v>
+            <v>476902</v>
         </e>
         <e>
             <k>@frienddecl</k>
-            <v>700462</v>
+            <v>700465</v>
         </e>
         <e>
             <k>@comment</k>
-            <v>11241965</v>
+            <v>11233402</v>
         </e>
         <e>
             <k>@namespace</k>
@@ -626,15 +630,15 @@
         </e>
         <e>
             <k>@namequalifier</k>
-            <v>3041863</v>
+            <v>3041979</v>
         </e>
         <e>
             <k>@value</k>
-            <v>13474606</v>
+            <v>13474601</v>
         </e>
         <e>
             <k>@initialiser</k>
-            <v>2251035</v>
+            <v>2251321</v>
         </e>
         <e>
             <k>@address_of</k>
@@ -646,11 +650,11 @@
         </e>
         <e>
             <k>@array_to_pointer</k>
-            <v>1953751</v>
+            <v>1953750</v>
         </e>
         <e>
             <k>@parexpr</k>
-            <v>4915208</v>
+            <v>4915206</v>
         </e>
         <e>
             <k>@arithnegexpr</k>
@@ -658,7 +662,7 @@
         </e>
         <e>
             <k>@unaryplusexpr</k>
-            <v>4073</v>
+            <v>4069</v>
         </e>
         <e>
             <k>@complementexpr</k>
@@ -670,7 +674,7 @@
         </e>
         <e>
             <k>@postincrexpr</k>
-            <v>84581</v>
+            <v>84571</v>
         </e>
         <e>
             <k>@postdecrexpr</k>
@@ -686,11 +690,11 @@
         </e>
         <e>
             <k>@conditionalexpr</k>
-            <v>897880</v>
+            <v>897879</v>
         </e>
         <e>
             <k>@addexpr</k>
-            <v>571553</v>
+            <v>571552</v>
         </e>
         <e>
             <k>@subexpr</k>
@@ -702,7 +706,7 @@
         </e>
         <e>
             <k>@divexpr</k>
-            <v>52393</v>
+            <v>52387</v>
         </e>
         <e>
             <k>@remexpr</k>
@@ -714,11 +718,11 @@
         </e>
         <e>
             <k>@psubexpr</k>
-            <v>68024</v>
+            <v>68016</v>
         </e>
         <e>
             <k>@pdiffexpr</k>
-            <v>43951</v>
+            <v>43912</v>
         </e>
         <e>
             <k>@lshiftexpr</k>
@@ -738,7 +742,7 @@
         </e>
         <e>
             <k>@xorexpr</k>
-            <v>73961</v>
+            <v>73952</v>
         </e>
         <e>
             <k>@eqexpr</k>
@@ -758,7 +762,7 @@
         </e>
         <e>
             <k>@geexpr</k>
-            <v>81368</v>
+            <v>81358</v>
         </e>
         <e>
             <k>@leexpr</k>
@@ -786,7 +790,7 @@
         </e>
         <e>
             <k>@assignremexpr</k>
-            <v>874</v>
+            <v>873</v>
         </e>
         <e>
             <k>@assignlshiftexpr</k>
@@ -822,19 +826,19 @@
         </e>
         <e>
             <k>@orlogicalexpr</k>
-            <v>1103523</v>
+            <v>1103522</v>
         </e>
         <e>
             <k>@commaexpr</k>
-            <v>168440</v>
+            <v>168288</v>
         </e>
         <e>
             <k>@subscriptexpr</k>
-            <v>435143</v>
+            <v>435142</v>
         </e>
         <e>
             <k>@callexpr</k>
-            <v>239778</v>
+            <v>239780</v>
         </e>
         <e>
             <k>@vastartexpr</k>
@@ -846,7 +850,7 @@
         </e>
         <e>
             <k>@vaendexpr</k>
-            <v>2941</v>
+            <v>2940</v>
         </e>
         <e>
             <k>@vacopyexpr</k>
@@ -854,7 +858,7 @@
         </e>
         <e>
             <k>@varaccess</k>
-            <v>8254632</v>
+            <v>8254629</v>
         </e>
         <e>
             <k>@runtime_sizeof</k>
@@ -870,11 +874,11 @@
         </e>
         <e>
             <k>@routineexpr</k>
-            <v>5732226</v>
+            <v>5732444</v>
         </e>
         <e>
             <k>@type_operand</k>
-            <v>1405363</v>
+            <v>1405362</v>
         </e>
         <e>
             <k>@offsetofexpr</k>
@@ -886,7 +890,7 @@
         </e>
         <e>
             <k>@literal</k>
-            <v>7967630</v>
+            <v>7966299</v>
         </e>
         <e>
             <k>@aggregateliteral</k>
@@ -894,11 +898,11 @@
         </e>
         <e>
             <k>@c_style_cast</k>
-            <v>6026986</v>
+            <v>6026987</v>
         </e>
         <e>
             <k>@temp_init</k>
-            <v>992324</v>
+            <v>992173</v>
         </e>
         <e>
             <k>@errorexpr</k>
@@ -906,11 +910,11 @@
         </e>
         <e>
             <k>@reference_to</k>
-            <v>1902638</v>
+            <v>1903138</v>
         </e>
         <e>
             <k>@ref_indirect</k>
-            <v>2107314</v>
+            <v>2107325</v>
         </e>
         <e>
             <k>@vacuous_destructor_call</k>
@@ -970,11 +974,11 @@
         </e>
         <e>
             <k>@thisaccess</k>
-            <v>1558310</v>
+            <v>1558277</v>
         </e>
         <e>
             <k>@new_expr</k>
-            <v>46197</v>
+            <v>46198</v>
         </e>
         <e>
             <k>@delete_expr</k>
@@ -982,11 +986,11 @@
         </e>
         <e>
             <k>@throw_expr</k>
-            <v>24105</v>
+            <v>24178</v>
         </e>
         <e>
             <k>@condition_decl</k>
-            <v>408905</v>
+            <v>408920</v>
         </e>
         <e>
             <k>@braced_init_list</k>
@@ -1058,11 +1062,11 @@
         </e>
         <e>
             <k>@isemptyexpr</k>
-            <v>8865</v>
+            <v>8857</v>
         </e>
         <e>
             <k>@isenumexpr</k>
-            <v>2996</v>
+            <v>2994</v>
         </e>
         <e>
             <k>@ispodexpr</k>
@@ -1086,7 +1090,7 @@
         </e>
         <e>
             <k>@uuidof</k>
-            <v>26588</v>
+            <v>26677</v>
         </e>
         <e>
             <k>@delete_array_expr</k>
@@ -1110,11 +1114,11 @@
         </e>
         <e>
             <k>@ctorfieldinit</k>
-            <v>206399</v>
+            <v>206212</v>
         </e>
         <e>
             <k>@ctordelegatinginit</k>
-            <v>3621</v>
+            <v>3617</v>
         </e>
         <e>
             <k>@dtordirectdestruct</k>
@@ -1126,15 +1130,15 @@
         </e>
         <e>
             <k>@dtorfielddestruct</k>
-            <v>39826</v>
+            <v>39827</v>
         </e>
         <e>
             <k>@static_cast</k>
-            <v>348369</v>
+            <v>348053</v>
         </e>
         <e>
             <k>@reinterpret_cast</k>
-            <v>40089</v>
+            <v>40088</v>
         </e>
         <e>
             <k>@const_cast</k>
@@ -1150,7 +1154,7 @@
         </e>
         <e>
             <k>@param_ref</k>
-            <v>164014</v>
+            <v>164066</v>
         </e>
         <e>
             <k>@noopexpr</k>
@@ -1158,7 +1162,7 @@
         </e>
         <e>
             <k>@istriviallyconstructibleexpr</k>
-            <v>3745</v>
+            <v>3742</v>
         </e>
         <e>
             <k>@isdestructibleexpr</k>
@@ -1174,15 +1178,15 @@
         </e>
         <e>
             <k>@istriviallyassignableexpr</k>
-            <v>3745</v>
+            <v>3742</v>
         </e>
         <e>
             <k>@isnothrowassignableexpr</k>
-            <v>5119</v>
+            <v>5114</v>
         </e>
         <e>
             <k>@istrivialexpr</k>
-            <v>3368</v>
+            <v>3367</v>
         </e>
         <e>
             <k>@isstandardlayoutexpr</k>
@@ -1190,7 +1194,7 @@
         </e>
         <e>
             <k>@istriviallycopyableexpr</k>
-            <v>1373</v>
+            <v>1372</v>
         </e>
         <e>
             <k>@isliteraltypeexpr</k>
@@ -1210,11 +1214,11 @@
         </e>
         <e>
             <k>@isconstructibleexpr</k>
-            <v>3621</v>
+            <v>3617</v>
         </e>
         <e>
             <k>@isnothrowconstructibleexpr</k>
-            <v>20727</v>
+            <v>20708</v>
         </e>
         <e>
             <k>@hasfinalizerexpr</k>
@@ -1254,7 +1258,7 @@
         </e>
         <e>
             <k>@noexceptexpr</k>
-            <v>28356</v>
+            <v>28465</v>
         </e>
         <e>
             <k>@builtinshufflevector</k>
@@ -1266,7 +1270,7 @@
         </e>
         <e>
             <k>@builtinaddressof</k>
-            <v>15483</v>
+            <v>15469</v>
         </e>
         <e>
             <k>@vec_fill</k>
@@ -1426,7 +1430,7 @@
         </e>
         <e>
             <k>@reuseexpr</k>
-            <v>847007</v>
+            <v>847039</v>
         </e>
         <e>
             <k>@istriviallycopyassignable</k>
@@ -1526,7 +1530,7 @@
         </e>
         <e>
             <k>@requires_expr</k>
-            <v>16502</v>
+            <v>16503</v>
         </e>
         <e>
             <k>@nested_requirement</k>
@@ -1538,15 +1542,15 @@
         </e>
         <e>
             <k>@concept_id</k>
-            <v>90430</v>
+            <v>90433</v>
         </e>
         <e>
             <k>@lambdacapture</k>
-            <v>31966</v>
+            <v>31965</v>
         </e>
         <e>
             <k>@stmt_expr</k>
-            <v>2031614</v>
+            <v>2031613</v>
         </e>
         <e>
             <k>@stmt_if</k>
@@ -1558,19 +1562,19 @@
         </e>
         <e>
             <k>@stmt_goto</k>
-            <v>157904</v>
+            <v>157909</v>
         </e>
         <e>
             <k>@stmt_label</k>
-            <v>78022</v>
+            <v>78025</v>
         </e>
         <e>
             <k>@stmt_return</k>
-            <v>1241797</v>
+            <v>1241788</v>
         </e>
         <e>
             <k>@stmt_block</k>
-            <v>1729360</v>
+            <v>1728666</v>
         </e>
         <e>
             <k>@stmt_end_test_while</k>
@@ -1582,11 +1586,11 @@
         </e>
         <e>
             <k>@stmt_switch_case</k>
-            <v>836120</v>
+            <v>836152</v>
         </e>
         <e>
             <k>@stmt_switch</k>
-            <v>411852</v>
+            <v>411868</v>
         </e>
         <e>
             <k>@stmt_asm</k>
@@ -1594,11 +1598,11 @@
         </e>
         <e>
             <k>@stmt_decl</k>
-            <v>772441</v>
+            <v>772425</v>
         </e>
         <e>
             <k>@stmt_empty</k>
-            <v>429388</v>
+            <v>429404</v>
         </e>
         <e>
             <k>@stmt_continue</k>
@@ -1606,11 +1610,11 @@
         </e>
         <e>
             <k>@stmt_break</k>
-            <v>137937</v>
+            <v>137934</v>
         </e>
         <e>
             <k>@stmt_try_block</k>
-            <v>26698</v>
+            <v>26740</v>
         </e>
         <e>
             <k>@stmt_microsoft_try</k>
@@ -1630,15 +1634,15 @@
         </e>
         <e>
             <k>@stmt_range_based_for</k>
-            <v>6387</v>
+            <v>6384</v>
         </e>
         <e>
             <k>@stmt_handler</k>
-            <v>43746</v>
+            <v>43781</v>
         </e>
         <e>
             <k>@stmt_constexpr_if</k>
-            <v>106134</v>
+            <v>106037</v>
         </e>
         <e>
             <k>@stmt_co_return</k>
@@ -1658,7 +1662,7 @@
         </e>
         <e>
             <k>@ppd_if</k>
-            <v>591478</v>
+            <v>590942</v>
         </e>
         <e>
             <k>@ppd_ifdef</k>
@@ -1666,35 +1670,35 @@
         </e>
         <e>
             <k>@ppd_ifndef</k>
-            <v>158651</v>
+            <v>158633</v>
         </e>
         <e>
             <k>@ppd_elif</k>
-            <v>21916</v>
+            <v>21917</v>
         </e>
         <e>
             <k>@ppd_else</k>
-            <v>235118</v>
+            <v>234905</v>
         </e>
         <e>
             <k>@ppd_endif</k>
-            <v>889777</v>
+            <v>888971</v>
         </e>
         <e>
             <k>@ppd_plain_include</k>
-            <v>318555</v>
+            <v>318564</v>
         </e>
         <e>
             <k>@ppd_define</k>
-            <v>2752617</v>
+            <v>2750123</v>
         </e>
         <e>
             <k>@ppd_undef</k>
-            <v>100515</v>
+            <v>100424</v>
         </e>
         <e>
             <k>@ppd_pragma</k>
-            <v>406555</v>
+            <v>406187</v>
         </e>
         <e>
             <k>@ppd_include_next</k>
@@ -1702,7 +1706,7 @@
         </e>
         <e>
             <k>@ppd_line</k>
-            <v>18827</v>
+            <v>18812</v>
         </e>
         <e>
             <k>@ppd_error</k>
@@ -1760,11 +1764,11 @@
     <stats>
         <relation>
             <name>compilations</name>
-            <cardinality>12642</cardinality>
+            <cardinality>12643</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12642</v>
+                    <v>12643</v>
                 </e>
                 <e>
                     <k>cwd</k>
@@ -1782,7 +1786,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12642</v>
+                                    <v>12643</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1808,11 +1812,11 @@
         </relation>
         <relation>
             <name>compilation_args</name>
-            <cardinality>1012186</cardinality>
+            <cardinality>1012213</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12642</v>
+                    <v>12643</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -1820,7 +1824,7 @@
                 </e>
                 <e>
                     <k>arg</k>
-                    <v>29267</v>
+                    <v>29268</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2179,7 +2183,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19381</v>
+                                    <v>19382</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -2199,15 +2203,15 @@
         </relation>
         <relation>
             <name>compilation_build_mode</name>
-            <cardinality>12642</cardinality>
+            <cardinality>2</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12642</v>
+                    <v>2</v>
                 </e>
                 <e>
                     <k>mode</k>
-                    <v>10</v>
+                    <v>2</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2221,7 +2225,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12642</v>
+                                    <v>2</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2235,9 +2239,9 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>1197</a>
-                                    <b>1198</b>
-                                    <v>10</v>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2247,19 +2251,19 @@
         </relation>
         <relation>
             <name>compilation_compiling_files</name>
-            <cardinality>15739</cardinality>
+            <cardinality>15738</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2723</v>
+                    <v>2722</v>
                 </e>
                 <e>
                     <k>num</k>
-                    <v>4520</v>
+                    <v>4519</v>
                 </e>
                 <e>
                     <k>file</k>
-                    <v>13670</v>
+                    <v>13668</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2447,7 +2451,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12308</v>
+                                    <v>12307</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -2473,7 +2477,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12526</v>
+                                    <v>12525</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -2493,15 +2497,15 @@
         </relation>
         <relation>
             <name>compilation_time</name>
-            <cardinality>62959</cardinality>
+            <cardinality>62952</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2723</v>
+                    <v>2722</v>
                 </e>
                 <e>
                     <k>num</k>
-                    <v>4520</v>
+                    <v>4519</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -2509,7 +2513,7 @@
                 </e>
                 <e>
                     <k>seconds</k>
-                    <v>13343</v>
+                    <v>13396</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2574,7 +2578,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>2723</v>
+                                    <v>2722</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2587,20 +2591,15 @@
                         <hist>
                             <budget>12</budget>
                             <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>54</v>
-                                </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>653</v>
+                                    <v>816</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>653</v>
+                                    <v>544</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -2619,24 +2618,24 @@
                                 </b>
                                 <b>
                                     <a>11</a>
-                                    <b>14</b>
+                                    <b>15</b>
                                     <v>217</v>
                                 </b>
                                 <b>
-                                    <a>16</a>
-                                    <b>18</b>
+                                    <a>15</a>
+                                    <b>19</b>
+                                    <v>217</v>
+                                </b>
+                                <b>
+                                    <a>19</a>
+                                    <b>26</b>
+                                    <v>217</v>
+                                </b>
+                                <b>
+                                    <a>42</a>
+                                    <b>92</b>
                                     <v>163</v>
                                 </b>
-                                <b>
-                                    <a>18</a>
-                                    <b>22</b>
-                                    <v>217</v>
-                                </b>
-                                <b>
-                                    <a>25</a>
-                                    <b>103</b>
-                                    <v>217</v>
-                                </b>
                             </bs>
                         </hist>
                     </val>
@@ -2687,7 +2686,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>4520</v>
+                                    <v>4519</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2700,6 +2699,11 @@
                         <hist>
                             <budget>12</budget>
                             <bs>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>54</v>
+                                </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
@@ -2708,38 +2712,43 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1034</v>
+                                    <v>980</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>326</v>
+                                    <v>272</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>381</v>
+                                    <v>544</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>326</v>
+                                    <v>163</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>326</v>
+                                    <v>272</v>
                                 </b>
                                 <b>
                                     <a>9</a>
-                                    <b>22</b>
+                                    <b>14</b>
                                     <v>381</v>
                                 </b>
                                 <b>
-                                    <a>25</a>
-                                    <b>91</b>
+                                    <a>17</a>
+                                    <b>44</b>
                                     <v>381</v>
                                 </b>
+                                <b>
+                                    <a>49</a>
+                                    <b>87</b>
+                                    <v>108</v>
+                                </b>
                             </bs>
                         </hist>
                     </val>
@@ -2794,13 +2803,13 @@
                                     <v>54</v>
                                 </b>
                                 <b>
-                                    <a>148</a>
-                                    <b>149</b>
+                                    <a>144</a>
+                                    <b>145</b>
                                     <v>54</v>
                                 </b>
                                 <b>
-                                    <a>154</a>
-                                    <b>155</b>
+                                    <a>149</a>
+                                    <b>150</b>
                                     <v>54</v>
                                 </b>
                             </bs>
@@ -2817,27 +2826,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6644</v>
+                                    <v>6807</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3267</v>
+                                    <v>3376</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1797</v>
+                                    <v>1633</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>6</b>
-                                    <v>1198</v>
+                                    <b>5</b>
+                                    <v>1034</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>48</b>
-                                    <v>435</v>
+                                    <a>5</a>
+                                    <b>45</b>
+                                    <v>544</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2853,17 +2862,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5882</v>
+                                    <v>6208</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2941</v>
+                                    <v>2668</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1960</v>
+                                    <v>2069</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -2872,13 +2881,13 @@
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>7</b>
+                                    <b>8</b>
                                     <v>1198</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>73</b>
-                                    <v>435</v>
+                                    <a>8</a>
+                                    <b>74</b>
+                                    <v>326</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2894,12 +2903,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9857</v>
+                                    <v>10510</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3485</v>
+                                    <v>2831</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>54</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3155,15 +3169,15 @@
         </relation>
         <relation>
             <name>compilation_finished</name>
-            <cardinality>12642</cardinality>
+            <cardinality>12643</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12642</v>
+                    <v>12643</v>
                 </e>
                 <e>
                     <k>cpu_seconds</k>
-                    <v>9579</v>
+                    <v>9379</v>
                 </e>
                 <e>
                     <k>elapsed_seconds</k>
@@ -3181,7 +3195,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12642</v>
+                                    <v>12643</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3197,7 +3211,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12642</v>
+                                    <v>12643</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3213,17 +3227,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8080</v>
+                                    <v>7763</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1077</v>
+                                    <v>1172</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>25</b>
-                                    <v>422</v>
+                                    <b>29</b>
+                                    <v>443</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3239,12 +3253,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9051</v>
+                                    <v>8735</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>528</v>
+                                    <v>644</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3260,48 +3274,48 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>73</v>
+                                    <v>63</v>
                                 </b>
                                 <b>
                                     <a>2</a>
+                                    <b>3</b>
+                                    <v>21</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
                                     <b>5</b>
                                     <v>21</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>8</b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>31</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>15</b>
                                     <v>21</v>
                                 </b>
                                 <b>
-                                    <a>11</a>
-                                    <b>12</b>
+                                    <a>15</a>
+                                    <b>37</b>
+                                    <v>21</v>
+                                </b>
+                                <b>
+                                    <a>51</a>
+                                    <b>177</b>
+                                    <v>21</v>
+                                </b>
+                                <b>
+                                    <a>241</a>
+                                    <b>286</b>
+                                    <v>21</v>
+                                </b>
+                                <b>
+                                    <a>326</a>
+                                    <b>327</b>
                                     <v>10</v>
                                 </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>14</b>
-                                    <v>21</v>
-                                </b>
-                                <b>
-                                    <a>14</a>
-                                    <b>17</b>
-                                    <v>21</v>
-                                </b>
-                                <b>
-                                    <a>27</a>
-                                    <b>54</b>
-                                    <v>21</v>
-                                </b>
-                                <b>
-                                    <a>164</a>
-                                    <b>251</b>
-                                    <v>21</v>
-                                </b>
-                                <b>
-                                    <a>289</a>
-                                    <b>322</b>
-                                    <v>21</v>
-                                </b>
                             </bs>
                         </hist>
                     </val>
@@ -3316,48 +3330,48 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>73</v>
+                                    <v>63</v>
                                 </b>
                                 <b>
                                     <a>2</a>
+                                    <b>3</b>
+                                    <v>21</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
                                     <b>5</b>
                                     <v>21</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>8</b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>31</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>15</b>
                                     <v>21</v>
                                 </b>
                                 <b>
-                                    <a>11</a>
-                                    <b>12</b>
+                                    <a>15</a>
+                                    <b>37</b>
+                                    <v>21</v>
+                                </b>
+                                <b>
+                                    <a>48</a>
+                                    <b>162</b>
+                                    <v>21</v>
+                                </b>
+                                <b>
+                                    <a>165</a>
+                                    <b>221</b>
+                                    <v>21</v>
+                                </b>
+                                <b>
+                                    <a>237</a>
+                                    <b>238</b>
                                     <v>10</v>
                                 </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>14</b>
-                                    <v>21</v>
-                                </b>
-                                <b>
-                                    <a>14</a>
-                                    <b>17</b>
-                                    <v>21</v>
-                                </b>
-                                <b>
-                                    <a>26</a>
-                                    <b>53</b>
-                                    <v>21</v>
-                                </b>
-                                <b>
-                                    <a>154</a>
-                                    <b>161</b>
-                                    <v>21</v>
-                                </b>
-                                <b>
-                                    <a>227</a>
-                                    <b>246</b>
-                                    <v>21</v>
-                                </b>
                             </bs>
                         </hist>
                     </val>
@@ -3593,31 +3607,31 @@
         </relation>
         <relation>
             <name>locations_default</name>
-            <cardinality>46965929</cardinality>
+            <cardinality>46945087</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>46965929</v>
+                    <v>46945087</v>
                 </e>
                 <e>
                     <k>file</k>
-                    <v>40955</v>
+                    <v>40918</v>
                 </e>
                 <e>
                     <k>beginLine</k>
-                    <v>7507421</v>
+                    <v>7500620</v>
                 </e>
                 <e>
                     <k>beginColumn</k>
-                    <v>21975</v>
+                    <v>21956</v>
                 </e>
                 <e>
                     <k>endLine</k>
-                    <v>7508545</v>
+                    <v>7501742</v>
                 </e>
                 <e>
                     <k>endColumn</k>
-                    <v>53441</v>
+                    <v>53393</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -3631,7 +3645,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46965929</v>
+                                    <v>46945087</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3647,7 +3661,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46965929</v>
+                                    <v>46945087</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3663,7 +3677,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46965929</v>
+                                    <v>46945087</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3679,7 +3693,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46965929</v>
+                                    <v>46945087</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3695,7 +3709,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46965929</v>
+                                    <v>46945087</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3711,67 +3725,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>15</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>41</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>72</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>72</a>
                                     <b>114</b>
-                                    <v>3371</v>
+                                    <v>3368</v>
                                 </b>
                                 <b>
                                     <a>114</a>
                                     <b>142</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>143</a>
                                     <b>211</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>213</a>
                                     <b>307</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>310</a>
                                     <b>430</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>437</a>
                                     <b>596</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>607</a>
                                     <b>827</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>839</a>
                                     <b>1298</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>1300</a>
-                                    <b>2722</b>
-                                    <v>3121</v>
+                                    <b>2855</b>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>3114</a>
                                     <b>30788</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>57880</a>
@@ -3792,67 +3806,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>13</b>
-                                    <v>3371</v>
+                                    <v>3368</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>31</b>
-                                    <v>3371</v>
+                                    <v>3368</v>
                                 </b>
                                 <b>
                                     <a>31</a>
                                     <b>47</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>47</a>
                                     <b>64</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>64</a>
                                     <b>84</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>85</a>
                                     <b>115</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>116</a>
                                     <b>160</b>
-                                    <v>3246</v>
+                                    <v>3243</v>
                                 </b>
                                 <b>
                                     <a>160</a>
                                     <b>206</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>206</a>
                                     <b>291</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>298</a>
                                     <b>388</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>395</a>
                                     <b>527</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>561</a>
                                     <b>1339</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>1375</a>
                                     <b>57764</b>
-                                    <v>2871</v>
+                                    <v>2869</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3868,67 +3882,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>5</b>
-                                    <v>3745</v>
+                                    <v>3742</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>9</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>15</b>
-                                    <v>3246</v>
+                                    <v>3243</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>20</b>
-                                    <v>3246</v>
+                                    <v>3243</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>28</b>
-                                    <v>3246</v>
+                                    <v>3243</v>
                                 </b>
                                 <b>
                                     <a>28</a>
                                     <b>36</b>
-                                    <v>3246</v>
+                                    <v>3243</v>
                                 </b>
                                 <b>
                                     <a>36</a>
                                     <b>42</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>53</b>
-                                    <v>3371</v>
+                                    <v>3368</v>
                                 </b>
                                 <b>
                                     <a>53</a>
                                     <b>62</b>
-                                    <v>3246</v>
+                                    <v>3243</v>
                                 </b>
                                 <b>
                                     <a>62</a>
                                     <b>81</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>81</a>
                                     <b>95</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>95</a>
                                     <b>111</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>112</a>
                                     <b>156</b>
-                                    <v>1997</v>
+                                    <v>1996</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3944,67 +3958,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>13</b>
-                                    <v>3371</v>
+                                    <v>3368</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>31</b>
-                                    <v>3371</v>
+                                    <v>3368</v>
                                 </b>
                                 <b>
                                     <a>31</a>
                                     <b>46</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>46</a>
                                     <b>63</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>63</a>
                                     <b>84</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>84</a>
                                     <b>114</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>118</a>
                                     <b>160</b>
-                                    <v>3246</v>
+                                    <v>3243</v>
                                 </b>
                                 <b>
                                     <a>160</a>
                                     <b>206</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>207</a>
                                     <b>291</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>300</a>
                                     <b>390</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>395</a>
                                     <b>562</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>564</a>
                                     <b>1350</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>1420</a>
                                     <b>57764</b>
-                                    <v>2871</v>
+                                    <v>2869</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4020,67 +4034,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>12</b>
-                                    <v>3371</v>
+                                    <v>3368</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>26</b>
-                                    <v>3496</v>
+                                    <v>3493</v>
                                 </b>
                                 <b>
                                     <a>26</a>
                                     <b>34</b>
-                                    <v>3246</v>
+                                    <v>3243</v>
                                 </b>
                                 <b>
                                     <a>34</a>
                                     <b>42</b>
-                                    <v>3246</v>
+                                    <v>3243</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>50</b>
-                                    <v>3246</v>
+                                    <v>3243</v>
                                 </b>
                                 <b>
                                     <a>50</a>
                                     <b>61</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>61</a>
                                     <b>67</b>
-                                    <v>3246</v>
+                                    <v>3243</v>
                                 </b>
                                 <b>
                                     <a>67</a>
                                     <b>76</b>
-                                    <v>3496</v>
+                                    <v>3493</v>
                                 </b>
                                 <b>
                                     <a>76</a>
                                     <b>88</b>
-                                    <v>3246</v>
+                                    <v>3243</v>
                                 </b>
                                 <b>
                                     <a>89</a>
                                     <b>102</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>102</a>
                                     <b>116</b>
-                                    <v>3496</v>
+                                    <v>3493</v>
                                 </b>
                                 <b>
                                     <a>116</a>
                                     <b>133</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>136</a>
                                     <b>363</b>
-                                    <v>1498</v>
+                                    <v>1497</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4096,32 +4110,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4961952</v>
+                                    <v>4957457</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>779772</v>
+                                    <v>779066</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>544405</v>
+                                    <v>543911</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>12</b>
-                                    <v>570876</v>
+                                    <v>570359</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>97</b>
-                                    <v>563134</v>
+                                    <v>563372</v>
                                 </b>
                                 <b>
                                     <a>97</a>
                                     <b>637</b>
-                                    <v>87279</v>
+                                    <v>86452</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4137,27 +4151,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5024010</v>
+                                    <v>5019458</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1222414</v>
+                                    <v>1221306</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>640550</v>
+                                    <v>639969</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>57</b>
-                                    <v>563509</v>
+                                    <v>563248</v>
                                 </b>
                                 <b>
                                     <a>57</a>
                                     <b>329</b>
-                                    <v>56937</v>
+                                    <v>56636</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4173,27 +4187,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5646455</v>
+                                    <v>5641339</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>483596</v>
+                                    <v>483158</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>582613</v>
+                                    <v>582085</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>25</b>
-                                    <v>566256</v>
+                                    <v>565244</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>94</b>
-                                    <v>228500</v>
+                                    <v>228792</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4209,12 +4223,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7041180</v>
+                                    <v>7034552</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>85</b>
-                                    <v>466240</v>
+                                    <v>466067</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4230,32 +4244,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5031002</v>
+                                    <v>5026444</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>740066</v>
+                                    <v>739395</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>540284</v>
+                                    <v>539795</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>12</b>
-                                    <v>587483</v>
+                                    <v>586950</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>72</b>
-                                    <v>565257</v>
+                                    <v>564121</v>
                                 </b>
                                 <b>
                                     <a>72</a>
                                     <b>250</b>
-                                    <v>43327</v>
+                                    <v>43912</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4271,67 +4285,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>1997</v>
+                                    <v>1996</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>12</b>
-                                    <v>1872</v>
+                                    <v>1871</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>40</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
                                     <a>49</a>
                                     <b>128</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
                                     <a>129</a>
                                     <b>253</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
                                     <a>316</a>
                                     <b>707</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
                                     <a>791</a>
                                     <b>1267</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
                                     <a>1281</a>
                                     <b>1943</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
                                     <a>2017</a>
                                     <b>2398</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
-                                    <a>2491</a>
-                                    <b>3203</b>
-                                    <v>1748</v>
+                                    <a>2493</a>
+                                    <b>3212</b>
+                                    <v>1746</v>
                                 </b>
                                 <b>
-                                    <a>3252</a>
+                                    <a>3260</a>
                                     <b>7915</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
-                                    <a>10983</a>
+                                    <a>11053</a>
                                     <b>121029</b>
-                                    <v>624</v>
+                                    <v>623</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4347,62 +4361,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1997</v>
+                                    <v>1996</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>18</b>
-                                    <v>1872</v>
+                                    <v>1871</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>43</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
                                     <a>44</a>
                                     <b>60</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
                                     <a>66</a>
                                     <b>93</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
                                     <a>96</a>
                                     <b>117</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
                                     <a>117</a>
                                     <b>150</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
                                     <a>150</a>
                                     <b>169</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
                                     <a>169</a>
                                     <b>181</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
                                     <a>182</a>
                                     <b>217</b>
-                                    <v>1872</v>
+                                    <v>1871</v>
                                 </b>
                                 <b>
                                     <a>243</a>
@@ -4423,67 +4437,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1872</v>
+                                    <v>1871</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>1872</v>
+                                    <v>1871</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>11</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>36</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
                                     <a>36</a>
                                     <b>101</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
                                     <a>108</a>
                                     <b>217</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
-                                    <a>226</a>
+                                    <a>225</a>
                                     <b>543</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
                                     <a>633</a>
-                                    <b>1057</b>
-                                    <v>1748</v>
+                                    <b>1059</b>
+                                    <v>1746</v>
                                 </b>
                                 <b>
-                                    <a>1072</a>
-                                    <b>1409</b>
-                                    <v>1748</v>
+                                    <a>1071</a>
+                                    <b>1410</b>
+                                    <v>1746</v>
                                 </b>
                                 <b>
-                                    <a>1416</a>
-                                    <b>1614</b>
-                                    <v>1748</v>
+                                    <a>1414</a>
+                                    <b>1610</b>
+                                    <v>1746</v>
                                 </b>
                                 <b>
-                                    <a>1615</a>
-                                    <b>1810</b>
-                                    <v>1748</v>
+                                    <a>1613</a>
+                                    <b>1807</b>
+                                    <v>1746</v>
                                 </b>
                                 <b>
-                                    <a>1826</a>
-                                    <b>3777</b>
-                                    <v>1748</v>
+                                    <a>1834</a>
+                                    <b>3791</b>
+                                    <v>1746</v>
                                 </b>
                                 <b>
-                                    <a>3834</a>
+                                    <a>3837</a>
                                     <b>59554</b>
-                                    <v>749</v>
+                                    <v>748</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4499,67 +4513,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1872</v>
+                                    <v>1871</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>1872</v>
+                                    <v>1871</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>11</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>36</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
                                     <a>36</a>
                                     <b>102</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
                                     <a>109</a>
                                     <b>218</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
-                                    <a>225</a>
+                                    <a>224</a>
                                     <b>545</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
                                     <a>631</a>
-                                    <b>1055</b>
-                                    <v>1748</v>
+                                    <b>1057</b>
+                                    <v>1746</v>
                                 </b>
                                 <b>
-                                    <a>1074</a>
+                                    <a>1073</a>
                                     <b>1407</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
-                                    <a>1425</a>
-                                    <b>1611</b>
-                                    <v>1748</v>
+                                    <a>1423</a>
+                                    <b>1609</b>
+                                    <v>1746</v>
                                 </b>
                                 <b>
-                                    <a>1614</a>
-                                    <b>1807</b>
-                                    <v>1748</v>
+                                    <a>1612</a>
+                                    <b>1805</b>
+                                    <v>1746</v>
                                 </b>
                                 <b>
-                                    <a>1827</a>
-                                    <b>3760</b>
-                                    <v>1748</v>
+                                    <a>1835</a>
+                                    <b>3774</b>
+                                    <v>1746</v>
                                 </b>
                                 <b>
-                                    <a>3827</a>
+                                    <a>3830</a>
                                     <b>59562</b>
-                                    <v>749</v>
+                                    <v>748</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4575,67 +4589,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2122</v>
+                                    <v>2120</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>1498</v>
+                                    <v>1497</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>1623</v>
+                                    <v>1621</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>13</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>23</b>
-                                    <v>1997</v>
+                                    <v>1996</v>
                                 </b>
                                 <b>
                                     <a>23</a>
                                     <b>33</b>
-                                    <v>1872</v>
+                                    <v>1871</v>
                                 </b>
                                 <b>
                                     <a>34</a>
                                     <b>44</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
                                     <a>45</a>
                                     <b>57</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
                                     <a>58</a>
-                                    <b>74</b>
-                                    <v>1997</v>
+                                    <b>73</b>
+                                    <v>1497</v>
                                 </b>
                                 <b>
-                                    <a>77</a>
-                                    <b>86</b>
-                                    <v>1872</v>
+                                    <a>73</a>
+                                    <b>83</b>
+                                    <v>1746</v>
                                 </b>
                                 <b>
-                                    <a>86</a>
-                                    <b>98</b>
-                                    <v>1748</v>
+                                    <a>83</a>
+                                    <b>92</b>
+                                    <v>1746</v>
                                 </b>
                                 <b>
-                                    <a>98</a>
-                                    <b>160</b>
-                                    <v>1748</v>
+                                    <a>92</a>
+                                    <b>144</b>
+                                    <v>1746</v>
                                 </b>
                                 <b>
-                                    <a>258</a>
+                                    <a>147</a>
                                     <b>299</b>
-                                    <v>249</v>
+                                    <v>873</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4651,32 +4665,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4959830</v>
+                                    <v>4955336</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>782270</v>
+                                    <v>781561</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>545279</v>
+                                    <v>544785</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>12</b>
-                                    <v>568378</v>
+                                    <v>567864</v>
                                 </b>
                                 <b>
                                     <a>12</a>
-                                    <b>96</b>
-                                    <v>564757</v>
+                                    <b>95</b>
+                                    <v>563497</v>
                                 </b>
                                 <b>
-                                    <a>96</a>
+                                    <a>95</a>
                                     <b>620</b>
-                                    <v>88028</v>
+                                    <v>88697</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4692,27 +4706,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5021138</v>
+                                    <v>5016589</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1224911</v>
+                                    <v>1223801</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>633932</v>
+                                    <v>633357</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>52</b>
-                                    <v>564633</v>
+                                    <v>564121</v>
                                 </b>
                                 <b>
                                     <a>52</a>
                                     <b>329</b>
-                                    <v>63930</v>
+                                    <v>63872</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4728,12 +4742,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7057912</v>
+                                    <v>7051643</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>18</b>
-                                    <v>450632</v>
+                                    <b>15</b>
+                                    <v>450099</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4749,27 +4763,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5645580</v>
+                                    <v>5640466</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>480974</v>
+                                    <v>480538</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>587607</v>
+                                    <v>587075</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>25</b>
-                                    <v>569752</v>
+                                    <v>568862</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>89</b>
-                                    <v>224629</v>
+                                    <v>224800</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4785,32 +4799,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5029629</v>
+                                    <v>5025072</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>744436</v>
+                                    <v>743762</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>540034</v>
+                                    <v>539545</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>12</b>
-                                    <v>588107</v>
+                                    <v>587574</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>72</b>
-                                    <v>563509</v>
+                                    <v>562749</v>
                                 </b>
                                 <b>
                                     <a>72</a>
                                     <b>250</b>
-                                    <v>42828</v>
+                                    <v>43038</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4826,52 +4840,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15732</v>
+                                    <v>15718</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5618</v>
+                                    <v>5613</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>4245</v>
+                                    <v>4241</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>17</b>
-                                    <v>4120</v>
+                                    <v>4116</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>33</b>
-                                    <v>4120</v>
+                                    <v>4116</v>
                                 </b>
                                 <b>
                                     <a>33</a>
                                     <b>106</b>
-                                    <v>4120</v>
+                                    <v>4116</v>
                                 </b>
                                 <b>
                                     <a>114</a>
                                     <b>689</b>
-                                    <v>4120</v>
+                                    <v>4116</v>
                                 </b>
                                 <b>
                                     <a>721</a>
-                                    <b>2458</b>
-                                    <v>4120</v>
+                                    <b>2460</b>
+                                    <v>4116</v>
                                 </b>
                                 <b>
-                                    <a>2593</a>
-                                    <b>4731</b>
-                                    <v>4120</v>
+                                    <a>2595</a>
+                                    <b>4737</b>
+                                    <v>4116</v>
                                 </b>
                                 <b>
                                     <a>4759</a>
                                     <b>33780</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4887,52 +4901,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18604</v>
+                                    <v>18587</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5618</v>
+                                    <v>5613</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>3621</v>
+                                    <v>3617</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>3745</v>
+                                    <v>3742</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>16</b>
-                                    <v>4370</v>
+                                    <v>4366</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>80</b>
-                                    <v>4120</v>
+                                    <v>4116</v>
                                 </b>
                                 <b>
                                     <a>81</a>
                                     <b>152</b>
-                                    <v>4245</v>
+                                    <v>4241</v>
                                 </b>
                                 <b>
                                     <a>158</a>
                                     <b>212</b>
-                                    <v>4245</v>
+                                    <v>4241</v>
                                 </b>
                                 <b>
                                     <a>212</a>
                                     <b>265</b>
-                                    <v>4120</v>
+                                    <v>4116</v>
                                 </b>
                                 <b>
                                     <a>265</a>
                                     <b>329</b>
-                                    <v>749</v>
+                                    <v>748</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4948,52 +4962,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15982</v>
+                                    <v>15968</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5993</v>
+                                    <v>5988</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>4245</v>
+                                    <v>4241</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>18</b>
-                                    <v>4370</v>
+                                    <v>4366</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>42</b>
-                                    <v>4120</v>
+                                    <v>4116</v>
                                 </b>
                                 <b>
                                     <a>43</a>
                                     <b>218</b>
-                                    <v>4120</v>
+                                    <v>4116</v>
                                 </b>
                                 <b>
-                                    <a>235</a>
-                                    <b>759</b>
-                                    <v>4120</v>
+                                    <a>234</a>
+                                    <b>758</b>
+                                    <v>4116</v>
                                 </b>
                                 <b>
-                                    <a>768</a>
-                                    <b>2177</b>
-                                    <v>4120</v>
+                                    <a>767</a>
+                                    <b>2176</b>
+                                    <v>4116</v>
                                 </b>
                                 <b>
-                                    <a>2209</a>
-                                    <b>2884</b>
-                                    <v>4120</v>
+                                    <a>2206</a>
+                                    <b>2882</b>
+                                    <v>4116</v>
                                 </b>
                                 <b>
-                                    <a>2885</a>
+                                    <a>2890</a>
                                     <b>30763</b>
-                                    <v>2247</v>
+                                    <v>2245</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5009,52 +5023,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17231</v>
+                                    <v>17215</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6243</v>
+                                    <v>6237</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>3246</v>
+                                    <v>3243</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>4245</v>
+                                    <v>4241</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>14</b>
-                                    <v>4245</v>
+                                    <v>4241</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>28</b>
-                                    <v>4120</v>
+                                    <v>4491</v>
                                 </b>
                                 <b>
                                     <a>28</a>
-                                    <b>45</b>
-                                    <v>4245</v>
+                                    <b>46</b>
+                                    <v>4116</v>
                                 </b>
                                 <b>
-                                    <a>45</a>
-                                    <b>69</b>
-                                    <v>4120</v>
+                                    <a>46</a>
+                                    <b>70</b>
+                                    <v>4116</v>
                                 </b>
                                 <b>
-                                    <a>69</a>
-                                    <b>81</b>
-                                    <v>4245</v>
+                                    <a>70</a>
+                                    <b>82</b>
+                                    <v>4241</v>
                                 </b>
                                 <b>
-                                    <a>81</a>
+                                    <a>82</a>
                                     <b>117</b>
-                                    <v>1498</v>
+                                    <v>1247</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5070,52 +5084,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15982</v>
+                                    <v>15968</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5993</v>
+                                    <v>5988</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>4245</v>
+                                    <v>4241</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>18</b>
-                                    <v>4370</v>
+                                    <v>4366</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>41</b>
-                                    <v>4120</v>
+                                    <v>4116</v>
                                 </b>
                                 <b>
                                     <a>43</a>
                                     <b>217</b>
-                                    <v>4120</v>
+                                    <v>4116</v>
                                 </b>
                                 <b>
-                                    <a>233</a>
-                                    <b>756</b>
-                                    <v>4120</v>
+                                    <a>232</a>
+                                    <b>755</b>
+                                    <v>4116</v>
                                 </b>
                                 <b>
                                     <a>768</a>
-                                    <b>2177</b>
-                                    <v>4120</v>
+                                    <b>2176</b>
+                                    <v>4116</v>
                                 </b>
                                 <b>
-                                    <a>2208</a>
-                                    <b>2858</b>
-                                    <v>4120</v>
+                                    <a>2206</a>
+                                    <b>2862</b>
+                                    <v>4116</v>
                                 </b>
                                 <b>
-                                    <a>2868</a>
+                                    <a>2867</a>
                                     <b>30757</b>
-                                    <v>2247</v>
+                                    <v>2245</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5125,15 +5139,15 @@
         </relation>
         <relation>
             <name>files</name>
-            <cardinality>65211</cardinality>
+            <cardinality>65212</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>65211</v>
+                    <v>65212</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>65211</v>
+                    <v>65212</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -5147,7 +5161,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>65211</v>
+                                    <v>65212</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5163,7 +5177,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>65211</v>
+                                    <v>65212</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5221,7 +5235,7 @@
         </relation>
         <relation>
             <name>containerparent</name>
-            <cardinality>77579</cardinality>
+            <cardinality>77581</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
@@ -5229,7 +5243,7 @@
                 </e>
                 <e>
                     <k>child</k>
-                    <v>77579</v>
+                    <v>77581</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -5294,7 +5308,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>77579</v>
+                                    <v>77581</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5304,23 +5318,23 @@
         </relation>
         <relation>
             <name>numlines</name>
-            <cardinality>808616</cardinality>
+            <cardinality>807883</cardinality>
             <columnsizes>
                 <e>
                     <k>element_id</k>
-                    <v>807492</v>
+                    <v>806761</v>
                 </e>
                 <e>
                     <k>num_lines</k>
-                    <v>39456</v>
+                    <v>39421</v>
                 </e>
                 <e>
                     <k>num_code</k>
-                    <v>34087</v>
+                    <v>34056</v>
                 </e>
                 <e>
                     <k>num_comment</k>
-                    <v>18230</v>
+                    <v>18338</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -5334,12 +5348,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>806368</v>
+                                    <v>805638</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1123</v>
+                                    <v>1122</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5355,12 +5369,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>806368</v>
+                                    <v>805638</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1123</v>
+                                    <v>1122</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5376,7 +5390,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>807242</v>
+                                    <v>806511</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5397,27 +5411,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26720</v>
+                                    <v>26696</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3745</v>
+                                    <v>3742</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>3371</v>
+                                    <v>3368</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>35</b>
-                                    <v>2996</v>
+                                    <v>2994</v>
                                 </b>
                                 <b>
                                     <a>39</a>
                                     <b>1983</b>
-                                    <v>2622</v>
+                                    <v>2619</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5433,27 +5447,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27220</v>
+                                    <v>27195</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4120</v>
+                                    <v>4116</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2497</v>
+                                    <v>2495</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>3496</v>
+                                    <v>3493</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>12</b>
-                                    <v>2122</v>
+                                    <v>2120</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5469,27 +5483,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26845</v>
+                                    <v>26821</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4120</v>
+                                    <v>4116</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2372</v>
+                                    <v>2370</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>3246</v>
+                                    <v>3243</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>2871</v>
+                                    <v>2869</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5505,32 +5519,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21851</v>
+                                    <v>21831</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3621</v>
+                                    <v>3617</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2372</v>
+                                    <v>2370</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>13</b>
-                                    <v>2871</v>
+                                    <v>2869</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>198</b>
-                                    <v>2622</v>
+                                    <v>2619</v>
                                 </b>
                                 <b>
                                     <a>204</a>
                                     <b>2092</b>
-                                    <v>749</v>
+                                    <v>748</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5546,32 +5560,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22225</v>
+                                    <v>22205</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3621</v>
+                                    <v>3617</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2122</v>
+                                    <v>2120</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>1872</v>
+                                    <v>1871</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>2746</v>
+                                    <v>2744</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>13</b>
-                                    <v>1498</v>
+                                    <v>1497</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5587,27 +5601,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21975</v>
+                                    <v>21956</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4245</v>
+                                    <v>4241</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>2871</v>
+                                    <v>2869</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>12</b>
-                                    <v>1872</v>
+                                    <v>1871</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5623,32 +5637,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11112</v>
+                                    <v>11352</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2122</v>
+                                    <v>1996</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1123</v>
+                                    <v>1122</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>1498</v>
+                                    <v>1497</v>
                                 </b>
                                 <b>
                                     <a>8</a>
-                                    <b>21</b>
-                                    <v>1373</v>
+                                    <b>22</b>
+                                    <v>1497</v>
                                 </b>
                                 <b>
-                                    <a>21</a>
+                                    <a>42</a>
                                     <b>3651</b>
-                                    <v>998</v>
+                                    <v>873</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5664,32 +5678,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11112</v>
+                                    <v>11352</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2122</v>
+                                    <v>1996</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1123</v>
+                                    <v>1122</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>1623</v>
+                                    <v>1621</v>
                                 </b>
                                 <b>
                                     <a>8</a>
-                                    <b>21</b>
-                                    <v>1373</v>
+                                    <b>27</b>
+                                    <v>1497</v>
                                 </b>
                                 <b>
-                                    <a>26</a>
+                                    <a>30</a>
                                     <b>48</b>
-                                    <v>874</v>
+                                    <v>748</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5705,32 +5719,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11112</v>
+                                    <v>11352</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2122</v>
+                                    <v>1996</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1373</v>
+                                    <v>1372</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>7</b>
-                                    <v>1373</v>
+                                    <b>8</b>
+                                    <v>1497</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>21</b>
-                                    <v>1373</v>
+                                    <a>8</a>
+                                    <b>31</b>
+                                    <v>1497</v>
                                 </b>
                                 <b>
-                                    <a>23</a>
+                                    <a>35</a>
                                     <b>42</b>
-                                    <v>874</v>
+                                    <v>623</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6343,13 +6357,395 @@
                 </dep>
             </dependencies>
         </relation>
+        <relation>
+            <name>pch_uses</name>
+            <cardinality>4134</cardinality>
+            <columnsizes>
+                <e>
+                    <k>pch</k>
+                    <v>162</v>
+                </e>
+                <e>
+                    <k>compilation</k>
+                    <v>4134</v>
+                </e>
+                <e>
+                    <k>id</k>
+                    <v>4134</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>pch</src>
+                    <trg>compilation</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>24</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>11</b>
+                                    <v>16</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>14</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>15</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>19</a>
+                                    <b>20</b>
+                                    <v>16</v>
+                                </b>
+                                <b>
+                                    <a>24</a>
+                                    <b>25</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>25</a>
+                                    <b>26</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>26</a>
+                                    <b>27</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>36</a>
+                                    <b>37</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>42</a>
+                                    <b>43</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>51</a>
+                                    <b>52</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>87</a>
+                                    <b>88</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>107</a>
+                                    <b>108</b>
+                                    <v>8</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>pch</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>24</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>11</b>
+                                    <v>16</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>14</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>15</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>19</a>
+                                    <b>20</b>
+                                    <v>16</v>
+                                </b>
+                                <b>
+                                    <a>24</a>
+                                    <b>25</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>25</a>
+                                    <b>26</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>26</a>
+                                    <b>27</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>36</a>
+                                    <b>37</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>42</a>
+                                    <b>43</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>51</a>
+                                    <b>52</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>87</a>
+                                    <b>88</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>107</a>
+                                    <b>108</b>
+                                    <v>8</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>compilation</src>
+                    <trg>pch</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4134</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>compilation</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4134</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>pch</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4134</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>compilation</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4134</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>pch_creations</name>
+            <cardinality>249</cardinality>
+            <columnsizes>
+                <e>
+                    <k>pch</k>
+                    <v>249</v>
+                </e>
+                <e>
+                    <k>compilation</k>
+                    <v>249</v>
+                </e>
+                <e>
+                    <k>from</k>
+                    <v>249</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>pch</src>
+                    <trg>compilation</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>249</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>pch</src>
+                    <trg>from</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>249</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>compilation</src>
+                    <trg>pch</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>249</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>compilation</src>
+                    <trg>from</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>249</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>from</src>
+                    <trg>pch</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>249</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>from</src>
+                    <trg>compilation</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>249</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
         <relation>
             <name>fileannotations</name>
-            <cardinality>4200439</cardinality>
+            <cardinality>4200551</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5766</v>
+                    <v>5767</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -6357,11 +6753,11 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>58715</v>
+                    <v>58716</v>
                 </e>
                 <e>
                     <k>value</k>
-                    <v>39513</v>
+                    <v>39514</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -6606,7 +7002,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11026</v>
+                                    <v>11027</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -6651,7 +7047,7 @@
                                 <b>
                                     <a>47</a>
                                     <b>128</b>
-                                    <v>4921</v>
+                                    <v>4922</v>
                                 </b>
                                 <b>
                                     <a>128</a>
@@ -6677,7 +7073,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>58715</v>
+                                    <v>58716</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6693,7 +7089,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11586</v>
+                                    <v>11587</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -6774,12 +7170,12 @@
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>2460</v>
+                                    <v>2461</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>14</b>
-                                    <v>2967</v>
+                                    <v>2968</v>
                                 </b>
                                 <b>
                                     <a>14</a>
@@ -6840,7 +7236,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>39502</v>
+                                    <v>39503</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -6936,15 +7332,15 @@
         </relation>
         <relation>
             <name>inmacroexpansion</name>
-            <cardinality>149995963</cardinality>
+            <cardinality>149995903</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>24670878</v>
+                    <v>24670868</v>
                 </e>
                 <e>
                     <k>inv</k>
-                    <v>3705272</v>
+                    <v>3705270</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -6968,22 +7364,22 @@
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>1620369</v>
+                                    <v>1620368</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>6582545</v>
+                                    <v>6582542</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>8719001</v>
+                                    <v>8718997</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>3557049</v>
+                                    <v>3557047</v>
                                 </b>
                                 <b>
                                     <a>9</a>
@@ -7024,12 +7420,12 @@
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>282153</v>
+                                    <v>282152</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>330247</v>
+                                    <v>330246</v>
                                 </b>
                                 <b>
                                     <a>9</a>
@@ -7064,15 +7460,15 @@
         </relation>
         <relation>
             <name>affectedbymacroexpansion</name>
-            <cardinality>48735840</cardinality>
+            <cardinality>48735823</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7044740</v>
+                    <v>7044739</v>
                 </e>
                 <e>
                     <k>inv</k>
-                    <v>3803121</v>
+                    <v>3803120</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -7091,7 +7487,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>766305</v>
+                                    <v>766304</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -7142,7 +7538,7 @@
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>301088</v>
+                                    <v>301087</v>
                                 </b>
                                 <b>
                                     <a>9</a>
@@ -7202,19 +7598,19 @@
         </relation>
         <relation>
             <name>macroinvocations</name>
-            <cardinality>40338469</cardinality>
+            <cardinality>40337724</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>40338469</v>
+                    <v>40337724</v>
                 </e>
                 <e>
                     <k>macro_id</k>
-                    <v>182070</v>
+                    <v>182049</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>5912755</v>
+                    <v>5912934</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -7232,7 +7628,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40338469</v>
+                                    <v>40337724</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7248,7 +7644,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40338469</v>
+                                    <v>40337724</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7264,7 +7660,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40338469</v>
+                                    <v>40337724</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7280,47 +7676,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>60781</v>
+                                    <v>60773</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>27558</v>
+                                    <v>27555</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>17972</v>
+                                    <v>17970</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>10021</v>
+                                    <v>10020</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>13779</v>
+                                    <v>13777</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>13</b>
-                                    <v>14705</v>
+                                    <v>14703</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>33</b>
-                                    <v>13779</v>
+                                    <v>13777</v>
                                 </b>
                                 <b>
                                     <a>33</a>
                                     <b>180</b>
-                                    <v>13670</v>
+                                    <v>13668</v>
                                 </b>
                                 <b>
                                     <a>181</a>
-                                    <b>72144</b>
-                                    <v>9803</v>
+                                    <b>72152</b>
+                                    <v>9802</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7336,42 +7732,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>77283</v>
+                                    <v>77274</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>30553</v>
+                                    <v>30550</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>14323</v>
+                                    <v>14322</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>10293</v>
+                                    <v>10292</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>14105</v>
+                                    <v>14104</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>18</b>
-                                    <v>14160</v>
+                                    <v>14158</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>88</b>
-                                    <v>13670</v>
+                                    <v>13668</v>
                                 </b>
                                 <b>
                                     <a>89</a>
-                                    <b>12189</b>
-                                    <v>7679</v>
+                                    <b>12187</b>
+                                    <v>7678</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7387,7 +7783,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>177495</v>
+                                    <v>177475</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -7408,17 +7804,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5255927</v>
+                                    <v>5256183</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>422362</v>
+                                    <v>422313</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>72144</b>
-                                    <v>234464</v>
+                                    <b>72152</b>
+                                    <v>234437</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7434,12 +7830,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5890588</v>
+                                    <v>5890770</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>37</b>
-                                    <v>22166</v>
+                                    <v>22163</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7455,7 +7851,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5912755</v>
+                                    <v>5912934</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7474,8 +7870,8 @@
                                     <v>54</v>
                                 </b>
                                 <b>
-                                    <a>739164</a>
-                                    <b>739165</b>
+                                    <a>739237</a>
+                                    <b>739238</b>
                                     <v>54</v>
                                 </b>
                             </bs>
@@ -7516,8 +7912,8 @@
                                     <v>54</v>
                                 </b>
                                 <b>
-                                    <a>107495</a>
-                                    <b>107496</b>
+                                    <a>107511</a>
+                                    <b>107512</b>
                                     <v>54</v>
                                 </b>
                             </bs>
@@ -7528,15 +7924,15 @@
         </relation>
         <relation>
             <name>macroparent</name>
-            <cardinality>33655984</cardinality>
+            <cardinality>33655149</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>33655984</v>
+                    <v>33655149</v>
                 </e>
                 <e>
                     <k>parent_id</k>
-                    <v>15926379</v>
+                    <v>15926203</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -7550,7 +7946,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33655984</v>
+                                    <v>33655149</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7566,27 +7962,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7806498</v>
+                                    <v>7806456</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1595448</v>
+                                    <v>1595479</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4702906</v>
+                                    <v>4702955</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1295464</v>
+                                    <v>1295312</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>205</b>
-                                    <v>526061</v>
+                                    <v>525999</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7596,15 +7992,15 @@
         </relation>
         <relation>
             <name>macrolocationbind</name>
-            <cardinality>6046191</cardinality>
+            <cardinality>6040022</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4227950</v>
+                    <v>4221190</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2278566</v>
+                    <v>2279306</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -7618,27 +8014,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3302009</v>
+                                    <v>3294948</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>491104</v>
+                                    <v>491264</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>7893</v>
+                                    <v>7896</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>413756</v>
+                                    <v>413891</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>17</b>
-                                    <v>13185</v>
+                                    <v>13189</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7654,27 +8050,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1336578</v>
+                                    <v>1337013</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>481984</v>
+                                    <v>482141</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>7807</v>
+                                    <v>7810</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>428082</v>
+                                    <v>428221</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>522</b>
-                                    <v>24112</v>
+                                    <v>24119</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7684,11 +8080,11 @@
         </relation>
         <relation>
             <name>macro_argument_unexpanded</name>
-            <cardinality>82497361</cardinality>
+            <cardinality>82495572</cardinality>
             <columnsizes>
                 <e>
                     <k>invocation</k>
-                    <v>26285935</v>
+                    <v>26282637</v>
                 </e>
                 <e>
                     <k>argument_index</k>
@@ -7696,7 +8092,7 @@
                 </e>
                 <e>
                     <k>text</k>
-                    <v>343260</v>
+                    <v>343270</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -7710,22 +8106,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9683509</v>
+                                    <v>9679766</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9770372</v>
+                                    <v>9770635</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5002131</v>
+                                    <v>5002265</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1829922</v>
+                                    <v>1829971</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7741,22 +8137,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9866140</v>
+                                    <v>9862401</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9787916</v>
+                                    <v>9788179</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4845472</v>
+                                    <v>4845602</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1786405</v>
+                                    <v>1786453</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7781,7 +8177,7 @@
                                 </b>
                                 <b>
                                     <a>646840</a>
-                                    <b>2488681</b>
+                                    <b>2488302</b>
                                     <v>31</v>
                                 </b>
                             </bs>
@@ -7824,12 +8220,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>39703</v>
+                                    <v>39704</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>62327</v>
+                                    <v>62329</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -7839,37 +8235,37 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>34580</v>
+                                    <v>34581</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>39249</v>
+                                    <v>39250</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>30873</v>
+                                    <v>30874</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>15</b>
-                                    <v>28982</v>
+                                    <v>28983</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>26</b>
-                                    <v>25887</v>
+                                    <v>25888</v>
                                 </b>
                                 <b>
                                     <a>26</a>
                                     <b>57</b>
-                                    <v>27144</v>
+                                    <v>27145</v>
                                 </b>
                                 <b>
                                     <a>57</a>
                                     <b>517</b>
-                                    <v>25993</v>
+                                    <v>25994</v>
                                 </b>
                                 <b>
                                     <a>518</a>
@@ -7890,12 +8286,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>243173</v>
+                                    <v>243180</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>89873</v>
+                                    <v>89876</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -7910,11 +8306,11 @@
         </relation>
         <relation>
             <name>macro_argument_expanded</name>
-            <cardinality>82497361</cardinality>
+            <cardinality>82495572</cardinality>
             <columnsizes>
                 <e>
                     <k>invocation</k>
-                    <v>26285935</v>
+                    <v>26282637</v>
                 </e>
                 <e>
                     <k>argument_index</k>
@@ -7922,7 +8318,7 @@
                 </e>
                 <e>
                     <k>text</k>
-                    <v>207927</v>
+                    <v>207933</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -7936,22 +8332,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9683509</v>
+                                    <v>9679766</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9770372</v>
+                                    <v>9770635</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5002131</v>
+                                    <v>5002265</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1829922</v>
+                                    <v>1829971</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7967,22 +8363,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12642108</v>
+                                    <v>12638444</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8428244</v>
+                                    <v>8428470</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4225217</v>
+                                    <v>4225331</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>990364</v>
+                                    <v>990391</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8007,7 +8403,7 @@
                                 </b>
                                 <b>
                                     <a>646840</a>
-                                    <b>2488681</b>
+                                    <b>2488302</b>
                                     <v>31</v>
                                 </b>
                             </bs>
@@ -8055,17 +8451,17 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>26859</v>
+                                    <v>26860</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>43495</v>
+                                    <v>43496</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>15906</v>
+                                    <v>15907</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -8080,7 +8476,7 @@
                                 <b>
                                     <a>7</a>
                                     <b>10</b>
-                                    <v>18969</v>
+                                    <v>18970</v>
                                 </b>
                                 <b>
                                     <a>10</a>
@@ -8090,7 +8486,7 @@
                                 <b>
                                     <a>19</a>
                                     <b>51</b>
-                                    <v>15779</v>
+                                    <v>15780</v>
                                 </b>
                                 <b>
                                     <a>51</a>
@@ -8099,7 +8495,7 @@
                                 </b>
                                 <b>
                                     <a>252</a>
-                                    <b>1169584</b>
+                                    <b>1169205</b>
                                     <v>9495</v>
                                 </b>
                             </bs>
@@ -8116,12 +8512,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>105083</v>
+                                    <v>105086</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>88912</v>
+                                    <v>88914</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -8136,19 +8532,19 @@
         </relation>
         <relation>
             <name>functions</name>
-            <cardinality>4053071</cardinality>
+            <cardinality>4049399</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4053071</v>
+                    <v>4049399</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1694897</v>
+                    <v>1693362</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>874</v>
+                    <v>873</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8162,7 +8558,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4053071</v>
+                                    <v>4049399</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8178,7 +8574,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4053071</v>
+                                    <v>4049399</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8194,17 +8590,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1448542</v>
+                                    <v>1447229</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>139098</v>
+                                    <v>138971</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>3162</b>
-                                    <v>107257</v>
+                                    <v>107160</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8220,12 +8616,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1692026</v>
+                                    <v>1690493</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2871</v>
+                                    <v>2869</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8338,15 +8734,15 @@
         </relation>
         <relation>
             <name>function_entry_point</name>
-            <cardinality>1141555</cardinality>
+            <cardinality>1141561</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1137808</v>
+                    <v>1137813</v>
                 </e>
                 <e>
                     <k>entry_point</k>
-                    <v>1141555</v>
+                    <v>1141561</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8360,7 +8756,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1134605</v>
+                                    <v>1134611</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -8381,7 +8777,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1141555</v>
+                                    <v>1141561</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8391,15 +8787,15 @@
         </relation>
         <relation>
             <name>function_return_type</name>
-            <cardinality>4070552</cardinality>
+            <cardinality>4066864</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4053071</v>
+                    <v>4049399</v>
                 </e>
                 <e>
                     <k>return_type</k>
-                    <v>619822</v>
+                    <v>619261</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8413,12 +8809,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4035590</v>
+                                    <v>4031934</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>17480</v>
+                                    <v>17465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8434,27 +8830,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>310161</v>
+                                    <v>309880</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>213891</v>
+                                    <v>213697</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>48072</v>
+                                    <v>48028</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>365</b>
-                                    <v>46574</v>
+                                    <v>46531</v>
                                 </b>
                                 <b>
                                     <a>432</a>
                                     <b>9944</b>
-                                    <v>1123</v>
+                                    <v>1122</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8734,59 +9130,59 @@
         </relation>
         <relation>
             <name>purefunctions</name>
-            <cardinality>131414</cardinality>
+            <cardinality>131703</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>131414</v>
+                    <v>131703</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_deleted</name>
-            <cardinality>88085</cardinality>
+            <cardinality>88088</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>88085</v>
+                    <v>88088</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_defaulted</name>
-            <cardinality>51680</cardinality>
+            <cardinality>51682</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>51680</v>
+                    <v>51682</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_prototyped</name>
-            <cardinality>4051572</cardinality>
+            <cardinality>4047902</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4051572</v>
+                    <v>4047902</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>deduction_guide_for_class</name>
-            <cardinality>5868</cardinality>
+            <cardinality>5863</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5868</v>
+                    <v>5863</v>
                 </e>
                 <e>
                     <k>class_template</k>
-                    <v>2247</v>
+                    <v>2245</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8800,7 +9196,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5868</v>
+                                    <v>5863</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8816,7 +9212,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1123</v>
+                                    <v>1122</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -8851,15 +9247,15 @@
         </relation>
         <relation>
             <name>member_function_this_type</name>
-            <cardinality>674762</cardinality>
+            <cardinality>674151</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>674762</v>
+                    <v>674151</v>
                 </e>
                 <e>
                     <k>this_type</k>
-                    <v>176182</v>
+                    <v>176022</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8873,7 +9269,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>674762</v>
+                                    <v>674151</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8889,37 +9285,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>47198</v>
+                                    <v>47155</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>36959</v>
+                                    <v>36926</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>32714</v>
+                                    <v>32684</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>20103</v>
+                                    <v>20084</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>12860</v>
+                                    <v>12849</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>14484</v>
+                                    <v>14471</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>65</b>
-                                    <v>11862</v>
+                                    <v>11851</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8929,27 +9325,27 @@
         </relation>
         <relation>
             <name>fun_decls</name>
-            <cardinality>4212771</cardinality>
+            <cardinality>4208955</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4206778</v>
+                    <v>4202967</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>4028473</v>
+                    <v>4024823</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>611831</v>
+                    <v>611277</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1693399</v>
+                    <v>1691865</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2815798</v>
+                    <v>2813247</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8963,7 +9359,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4206778</v>
+                                    <v>4202967</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8979,12 +9375,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4200784</v>
+                                    <v>4196979</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5993</v>
+                                    <v>5988</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9000,7 +9396,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4206778</v>
+                                    <v>4202967</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9016,7 +9412,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4206778</v>
+                                    <v>4202967</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9032,12 +9428,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3864776</v>
+                                    <v>3861275</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>163696</v>
+                                    <v>163547</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9053,12 +9449,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4009993</v>
+                                    <v>4006360</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>18479</v>
+                                    <v>18463</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9074,7 +9470,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4028473</v>
+                                    <v>4024823</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9090,12 +9486,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3885254</v>
+                                    <v>3881734</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>143218</v>
+                                    <v>143088</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9111,27 +9507,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>295427</v>
+                                    <v>295159</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>220758</v>
+                                    <v>220558</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>48447</v>
+                                    <v>48403</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>364</b>
-                                    <v>45949</v>
+                                    <v>45908</v>
                                 </b>
                                 <b>
                                     <a>364</a>
                                     <b>10292</b>
-                                    <v>1248</v>
+                                    <v>1247</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9147,22 +9543,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>305541</v>
+                                    <v>305264</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>212018</v>
+                                    <v>211826</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>48072</v>
+                                    <v>48028</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>1163</b>
-                                    <v>45949</v>
+                                    <v>45908</v>
                                 </b>
                                 <b>
                                     <a>1483</a>
@@ -9183,22 +9579,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>491962</v>
+                                    <v>491516</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>52942</v>
+                                    <v>52894</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>50195</v>
+                                    <v>50149</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>2238</b>
-                                    <v>16731</v>
+                                    <v>16716</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9214,22 +9610,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>455377</v>
+                                    <v>454964</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>69549</v>
+                                    <v>69485</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>56063</v>
+                                    <v>56012</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>4756</b>
-                                    <v>30841</v>
+                                    <v>30813</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9245,22 +9641,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1332543</v>
+                                    <v>1331336</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>194662</v>
+                                    <v>194485</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>11</b>
-                                    <v>129608</v>
+                                    <v>129490</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>3169</b>
-                                    <v>36585</v>
+                                    <v>36551</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9276,17 +9672,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1448042</v>
+                                    <v>1446730</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>139597</v>
+                                    <v>139470</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>3162</b>
-                                    <v>105759</v>
+                                    <v>105663</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9302,12 +9698,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1603497</v>
+                                    <v>1602045</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>1596</b>
-                                    <v>89901</v>
+                                    <v>89820</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9323,17 +9719,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1368504</v>
+                                    <v>1367264</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>208522</v>
+                                    <v>208333</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>1592</b>
-                                    <v>116372</v>
+                                    <v>116267</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9349,17 +9745,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2422477</v>
+                                    <v>2420283</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>251724</v>
+                                    <v>251496</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>211</b>
-                                    <v>141595</v>
+                                    <v>141466</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9375,17 +9771,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2441207</v>
+                                    <v>2438995</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>233494</v>
+                                    <v>233283</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>211</b>
-                                    <v>141095</v>
+                                    <v>140967</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9401,12 +9797,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2701298</v>
+                                    <v>2698851</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>211</b>
-                                    <v>114499</v>
+                                    <v>114396</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9422,12 +9818,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2776590</v>
+                                    <v>2774075</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>39207</v>
+                                    <v>39171</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9437,11 +9833,11 @@
         </relation>
         <relation>
             <name>fun_def</name>
-            <cardinality>1423569</cardinality>
+            <cardinality>1422279</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1423569</v>
+                    <v>1422279</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -9470,15 +9866,15 @@
         </relation>
         <relation>
             <name>fun_decl_specifiers</name>
-            <cardinality>4283569</cardinality>
+            <cardinality>4279688</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1749837</v>
+                    <v>1748252</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1373</v>
+                    <v>1372</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -9492,22 +9888,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>363228</v>
+                                    <v>362899</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>262463</v>
+                                    <v>262225</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1101171</v>
+                                    <v>1100174</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>22974</v>
+                                    <v>22954</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9704,22 +10100,22 @@
         </relation>
         <relation>
             <name>fun_decl_empty_throws</name>
-            <cardinality>420457</cardinality>
+            <cardinality>420911</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>420457</v>
+                    <v>420911</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>fun_decl_noexcept</name>
-            <cardinality>141829</cardinality>
+            <cardinality>141830</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>141829</v>
+                    <v>141830</v>
                 </e>
                 <e>
                     <k>constant</k>
@@ -9737,7 +10133,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>141829</v>
+                                    <v>141830</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9768,22 +10164,22 @@
         </relation>
         <relation>
             <name>fun_decl_empty_noexcept</name>
-            <cardinality>1164727</cardinality>
+            <cardinality>1163672</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>1164727</v>
+                    <v>1163672</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>fun_decl_typedef_type</name>
-            <cardinality>2763</cardinality>
+            <cardinality>2761</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>2763</v>
+                    <v>2761</v>
                 </e>
                 <e>
                     <k>typedeftype_id</k>
@@ -9801,7 +10197,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2763</v>
+                                    <v>2761</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9877,7 +10273,7 @@
         </relation>
         <relation>
             <name>fun_requires</name>
-            <cardinality>29110</cardinality>
+            <cardinality>29111</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -9889,7 +10285,7 @@
                 </e>
                 <e>
                     <k>constraint</k>
-                    <v>28874</v>
+                    <v>28875</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -9903,7 +10299,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10047</v>
+                                    <v>10048</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10007,7 +10403,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28637</v>
+                                    <v>28638</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10028,7 +10424,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28874</v>
+                                    <v>28875</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10038,19 +10434,19 @@
         </relation>
         <relation>
             <name>param_decl_bind</name>
-            <cardinality>7317004</cardinality>
+            <cardinality>7310375</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7317004</v>
+                    <v>7310375</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>7991</v>
+                    <v>7984</v>
                 </e>
                 <e>
                     <k>fun_decl</k>
-                    <v>3534887</v>
+                    <v>3531684</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -10064,7 +10460,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7317004</v>
+                                    <v>7310375</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10080,7 +10476,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7317004</v>
+                                    <v>7310375</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10096,27 +10492,27 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3995</v>
+                                    <v>3992</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>1997</v>
+                                    <v>1996</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>20</b>
-                                    <v>624</v>
+                                    <v>623</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>147</b>
-                                    <v>624</v>
+                                    <v>623</v>
                                 </b>
                                 <b>
                                     <a>343</a>
                                     <b>16215</b>
-                                    <v>624</v>
+                                    <v>623</v>
                                 </b>
                                 <b>
                                     <a>28310</a>
@@ -10137,27 +10533,27 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3995</v>
+                                    <v>3992</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>1997</v>
+                                    <v>1996</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>20</b>
-                                    <v>624</v>
+                                    <v>623</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>147</b>
-                                    <v>624</v>
+                                    <v>623</v>
                                 </b>
                                 <b>
                                     <a>343</a>
                                     <b>16215</b>
-                                    <v>624</v>
+                                    <v>623</v>
                                 </b>
                                 <b>
                                     <a>28310</a>
@@ -10178,27 +10574,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1510349</v>
+                                    <v>1508981</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>977182</v>
+                                    <v>976296</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>602591</v>
+                                    <v>602045</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>290932</v>
+                                    <v>290668</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>65</b>
-                                    <v>153831</v>
+                                    <v>153692</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10214,27 +10610,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1510349</v>
+                                    <v>1508981</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>977182</v>
+                                    <v>976296</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>602591</v>
+                                    <v>602045</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>290932</v>
+                                    <v>290668</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>65</b>
-                                    <v>153831</v>
+                                    <v>153692</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10244,27 +10640,27 @@
         </relation>
         <relation>
             <name>var_decls</name>
-            <cardinality>9398480</cardinality>
+            <cardinality>9389965</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9391612</v>
+                    <v>9383104</v>
                 </e>
                 <e>
                     <k>variable</k>
-                    <v>9042868</v>
+                    <v>9034676</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1457782</v>
+                    <v>1456461</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>853317</v>
+                    <v>852544</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>6280262</v>
+                    <v>6274572</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -10278,7 +10674,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9391612</v>
+                                    <v>9383104</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10294,12 +10690,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9384745</v>
+                                    <v>9376243</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6867</v>
+                                    <v>6861</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10315,7 +10711,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9391612</v>
+                                    <v>9383104</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10331,7 +10727,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9391612</v>
+                                    <v>9383104</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10347,12 +10743,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8711605</v>
+                                    <v>8703713</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>331263</v>
+                                    <v>330962</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10368,12 +10764,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8989302</v>
+                                    <v>8981158</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>53566</v>
+                                    <v>53517</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10389,12 +10785,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8937359</v>
+                                    <v>8929262</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>105509</v>
+                                    <v>105414</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10410,12 +10806,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8791018</v>
+                                    <v>8783054</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>251849</v>
+                                    <v>251621</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10431,27 +10827,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>850695</v>
+                                    <v>849924</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>284314</v>
+                                    <v>284056</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>127485</v>
+                                    <v>127370</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>11</b>
-                                    <v>113251</v>
+                                    <v>113148</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>2944</b>
-                                    <v>82035</v>
+                                    <v>81961</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10467,27 +10863,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>871547</v>
+                                    <v>870758</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>269330</v>
+                                    <v>269086</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>122865</v>
+                                    <v>122754</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>11</b>
-                                    <v>113126</v>
+                                    <v>113023</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>2860</b>
-                                    <v>80911</v>
+                                    <v>80838</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10503,22 +10899,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1120525</v>
+                                    <v>1119510</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>192789</v>
+                                    <v>192614</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>115373</v>
+                                    <v>115269</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>1038</b>
-                                    <v>29093</v>
+                                    <v>29066</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10534,27 +10930,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>986297</v>
+                                    <v>985403</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>219260</v>
+                                    <v>219061</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>133728</v>
+                                    <v>133607</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>95</b>
-                                    <v>109380</v>
+                                    <v>109281</v>
                                 </b>
                                 <b>
                                     <a>97</a>
                                     <b>2622</b>
-                                    <v>9115</v>
+                                    <v>9106</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10570,32 +10966,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>466365</v>
+                                    <v>465942</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>165943</v>
+                                    <v>165793</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>59684</v>
+                                    <v>59630</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>65927</v>
+                                    <v>65868</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>25</b>
-                                    <v>64179</v>
+                                    <v>64121</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>27139</b>
-                                    <v>31215</v>
+                                    <v>31187</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10611,32 +11007,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>479351</v>
+                                    <v>478916</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>165194</v>
+                                    <v>165044</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>54690</v>
+                                    <v>54640</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>71671</v>
+                                    <v>71606</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>45</b>
-                                    <v>64304</v>
+                                    <v>64246</v>
                                 </b>
                                 <b>
                                     <a>45</a>
                                     <b>26704</b>
-                                    <v>18105</v>
+                                    <v>18088</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10652,22 +11048,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>655283</v>
+                                    <v>654690</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>110878</v>
+                                    <v>110778</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>11</b>
-                                    <v>65553</v>
+                                    <v>65493</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>3463</b>
-                                    <v>21601</v>
+                                    <v>21581</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10683,27 +11079,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>494209</v>
+                                    <v>493762</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>183424</v>
+                                    <v>183258</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>51693</v>
+                                    <v>51646</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>65053</v>
+                                    <v>64994</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>22619</b>
-                                    <v>58935</v>
+                                    <v>58882</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10719,17 +11115,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5780059</v>
+                                    <v>5774822</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>21</b>
-                                    <v>472733</v>
+                                    <v>472305</v>
                                 </b>
                                 <b>
                                     <a>21</a>
                                     <b>2943</b>
-                                    <v>27469</v>
+                                    <v>27445</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10745,12 +11141,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5860970</v>
+                                    <v>5855660</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>2935</b>
-                                    <v>419291</v>
+                                    <v>418911</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10766,12 +11162,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5981463</v>
+                                    <v>5976045</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>2555</b>
-                                    <v>298798</v>
+                                    <v>298527</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10787,12 +11183,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6267900</v>
+                                    <v>6262222</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>12361</v>
+                                    <v>12350</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10802,11 +11198,11 @@
         </relation>
         <relation>
             <name>var_def</name>
-            <cardinality>3770380</cardinality>
+            <cardinality>3766964</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3770380</v>
+                    <v>3766964</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -10824,11 +11220,11 @@
         </relation>
         <relation>
             <name>var_decl_specifiers</name>
-            <cardinality>490339</cardinality>
+            <cardinality>489894</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>490339</v>
+                    <v>489894</v>
                 </e>
                 <e>
                     <k>name</k>
@@ -10846,7 +11242,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>490339</v>
+                                    <v>489894</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10956,19 +11352,19 @@
         </relation>
         <relation>
             <name>type_decls</name>
-            <cardinality>1634963</cardinality>
+            <cardinality>1633482</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1634963</v>
+                    <v>1633482</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1615984</v>
+                    <v>1614520</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>1548807</v>
+                    <v>1547404</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -10982,7 +11378,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1634963</v>
+                                    <v>1633482</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10998,7 +11394,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1634963</v>
+                                    <v>1633482</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11014,12 +11410,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1599627</v>
+                                    <v>1598177</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>10</b>
-                                    <v>16357</v>
+                                    <v>16342</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11035,12 +11431,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1599751</v>
+                                    <v>1598302</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>10</b>
-                                    <v>16232</v>
+                                    <v>16217</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11056,12 +11452,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1526706</v>
+                                    <v>1525323</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>64</b>
-                                    <v>22100</v>
+                                    <v>22080</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11077,12 +11473,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1526831</v>
+                                    <v>1525448</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>64</b>
-                                    <v>21975</v>
+                                    <v>21956</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11092,22 +11488,22 @@
         </relation>
         <relation>
             <name>type_def</name>
-            <cardinality>1096551</cardinality>
+            <cardinality>1095558</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1096551</v>
+                    <v>1095558</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>type_decl_top</name>
-            <cardinality>673602</cardinality>
+            <cardinality>673959</cardinality>
             <columnsizes>
                 <e>
                     <k>type_decl</k>
-                    <v>673602</v>
+                    <v>673959</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -11118,7 +11514,7 @@
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2043</v>
+                    <v>2044</v>
                 </e>
                 <e>
                     <k>constraint</k>
@@ -11187,11 +11583,11 @@
         </relation>
         <relation>
             <name>namespace_decls</name>
-            <cardinality>407321</cardinality>
+            <cardinality>407775</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>407321</v>
+                    <v>407775</v>
                 </e>
                 <e>
                     <k>namespace_id</k>
@@ -11199,11 +11595,11 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>407321</v>
+                    <v>407775</v>
                 </e>
                 <e>
                     <k>bodylocation</k>
-                    <v>407321</v>
+                    <v>407775</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11217,7 +11613,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>407321</v>
+                                    <v>407775</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11233,7 +11629,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>407321</v>
+                                    <v>407775</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11249,7 +11645,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>407321</v>
+                                    <v>407775</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11308,13 +11704,13 @@
                                     <v>146</v>
                                 </b>
                                 <b>
-                                    <a>268</a>
-                                    <b>1868</b>
+                                    <a>270</a>
+                                    <b>1870</b>
                                     <v>146</v>
                                 </b>
                                 <b>
                                     <a>2205</a>
-                                    <b>12449</b>
+                                    <b>12461</b>
                                     <v>32</v>
                                 </b>
                             </bs>
@@ -11374,13 +11770,13 @@
                                     <v>146</v>
                                 </b>
                                 <b>
-                                    <a>268</a>
-                                    <b>1868</b>
+                                    <a>270</a>
+                                    <b>1870</b>
                                     <v>146</v>
                                 </b>
                                 <b>
                                     <a>2205</a>
-                                    <b>12449</b>
+                                    <b>12461</b>
                                     <v>32</v>
                                 </b>
                             </bs>
@@ -11440,13 +11836,13 @@
                                     <v>146</v>
                                 </b>
                                 <b>
-                                    <a>268</a>
-                                    <b>1868</b>
+                                    <a>270</a>
+                                    <b>1870</b>
                                     <v>146</v>
                                 </b>
                                 <b>
                                     <a>2205</a>
-                                    <b>12449</b>
+                                    <b>12461</b>
                                     <v>32</v>
                                 </b>
                             </bs>
@@ -11463,7 +11859,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>407321</v>
+                                    <v>407775</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11479,7 +11875,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>407321</v>
+                                    <v>407775</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11495,7 +11891,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>407321</v>
+                                    <v>407775</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11511,7 +11907,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>407321</v>
+                                    <v>407775</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11527,7 +11923,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>407321</v>
+                                    <v>407775</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11543,7 +11939,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>407321</v>
+                                    <v>407775</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11553,15 +11949,15 @@
         </relation>
         <relation>
             <name>usings</name>
-            <cardinality>272082</cardinality>
+            <cardinality>271973</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>272082</v>
+                    <v>271973</v>
                 </e>
                 <e>
                     <k>element_id</k>
-                    <v>59053</v>
+                    <v>58938</v>
                 </e>
                 <e>
                     <k>location</k>
@@ -11583,7 +11979,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>272082</v>
+                                    <v>271973</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11599,7 +11995,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>272082</v>
+                                    <v>271973</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11615,7 +12011,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>272082</v>
+                                    <v>271973</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11631,7 +12027,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>51321</v>
+                                    <v>51206</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11657,7 +12053,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>51321</v>
+                                    <v>51206</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11683,7 +12079,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>59053</v>
+                                    <v>58938</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11704,12 +12100,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>2302</v>
+                                    <v>2292</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>132</b>
-                                    <v>1943</v>
+                                    <v>1954</v>
                                 </b>
                                 <b>
                                     <a>145</a>
@@ -11735,12 +12131,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>2302</v>
+                                    <v>2292</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>132</b>
-                                    <v>1943</v>
+                                    <v>1954</v>
                                 </b>
                                 <b>
                                     <a>145</a>
@@ -11780,8 +12176,8 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>25367</a>
-                                    <b>25368</b>
+                                    <a>25356</a>
+                                    <b>25357</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -11801,8 +12197,8 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>5377</a>
-                                    <b>5378</b>
+                                    <a>5366</a>
+                                    <b>5367</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -11834,15 +12230,15 @@
         </relation>
         <relation>
             <name>using_container</name>
-            <cardinality>580149</cardinality>
+            <cardinality>580049</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>21895</v>
+                    <v>21874</v>
                 </e>
                 <e>
                     <k>child</k>
-                    <v>272082</v>
+                    <v>271973</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11871,7 +12267,7 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>2291</v>
+                                    <v>2270</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -11907,22 +12303,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>96601</v>
+                                    <v>96488</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>120282</v>
+                                    <v>120285</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>20099</v>
+                                    <v>20100</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>26711</v>
+                                    <v>26712</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -11937,23 +12333,23 @@
         </relation>
         <relation>
             <name>static_asserts</name>
-            <cardinality>173266</cardinality>
+            <cardinality>173262</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>173266</v>
+                    <v>173262</v>
                 </e>
                 <e>
                     <k>condition</k>
-                    <v>173266</v>
+                    <v>173262</v>
                 </e>
                 <e>
                     <k>message</k>
-                    <v>38765</v>
+                    <v>38764</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>22648</v>
+                    <v>22647</v>
                 </e>
                 <e>
                     <k>enclosing</k>
@@ -11971,7 +12367,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>173266</v>
+                                    <v>173262</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11987,7 +12383,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>173266</v>
+                                    <v>173262</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12003,7 +12399,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>173266</v>
+                                    <v>173262</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12019,7 +12415,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>173266</v>
+                                    <v>173262</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12035,7 +12431,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>173266</v>
+                                    <v>173262</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12051,7 +12447,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>173266</v>
+                                    <v>173262</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12067,7 +12463,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>173266</v>
+                                    <v>173262</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12083,7 +12479,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>173266</v>
+                                    <v>173262</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12099,7 +12495,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28505</v>
+                                    <v>28504</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12140,7 +12536,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28505</v>
+                                    <v>28504</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12181,7 +12577,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>35922</v>
+                                    <v>35921</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12217,7 +12613,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>12</b>
-                                    <v>1909</v>
+                                    <v>1908</v>
                                 </b>
                                 <b>
                                     <a>12</a>
@@ -12258,7 +12654,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>4736</v>
+                                    <v>4735</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -12319,7 +12715,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>4736</v>
+                                    <v>4735</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -12391,12 +12787,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5069</v>
+                                    <v>5068</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8099</v>
+                                    <v>8098</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -12499,7 +12895,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5857</v>
+                                    <v>5856</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12545,23 +12941,23 @@
         </relation>
         <relation>
             <name>params</name>
-            <cardinality>7067152</cardinality>
+            <cardinality>7060750</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7026197</v>
+                    <v>7019832</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>3408025</v>
+                    <v>3404938</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>7991</v>
+                    <v>7984</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1221415</v>
+                    <v>1220308</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12575,7 +12971,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7026197</v>
+                                    <v>7019832</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12591,7 +12987,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7026197</v>
+                                    <v>7019832</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12607,12 +13003,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6985242</v>
+                                    <v>6978913</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>40955</v>
+                                    <v>40918</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12628,27 +13024,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1474513</v>
+                                    <v>1473177</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>927111</v>
+                                    <v>926272</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>579242</v>
+                                    <v>578717</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>281067</v>
+                                    <v>280813</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>65</b>
-                                    <v>146090</v>
+                                    <v>145958</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12664,27 +13060,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1474513</v>
+                                    <v>1473177</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>927111</v>
+                                    <v>926272</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>579242</v>
+                                    <v>578717</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>281067</v>
+                                    <v>280813</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>65</b>
-                                    <v>146090</v>
+                                    <v>145958</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12700,22 +13096,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1783301</v>
+                                    <v>1781685</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1031622</v>
+                                    <v>1030688</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>437896</v>
+                                    <v>437499</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>11</b>
-                                    <v>155205</v>
+                                    <v>155064</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12731,27 +13127,27 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3995</v>
+                                    <v>3992</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>1997</v>
+                                    <v>1996</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>18</b>
-                                    <v>624</v>
+                                    <v>623</v>
                                 </b>
                                 <b>
                                     <a>23</a>
                                     <b>138</b>
-                                    <v>624</v>
+                                    <v>623</v>
                                 </b>
                                 <b>
                                     <a>320</a>
                                     <b>15486</b>
-                                    <v>624</v>
+                                    <v>623</v>
                                 </b>
                                 <b>
                                     <a>27294</a>
@@ -12772,27 +13168,27 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3995</v>
+                                    <v>3992</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>1997</v>
+                                    <v>1996</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>18</b>
-                                    <v>624</v>
+                                    <v>623</v>
                                 </b>
                                 <b>
                                     <a>23</a>
                                     <b>138</b>
-                                    <v>624</v>
+                                    <v>623</v>
                                 </b>
                                 <b>
                                     <a>320</a>
                                     <b>15486</b>
-                                    <v>624</v>
+                                    <v>623</v>
                                 </b>
                                 <b>
                                     <a>27294</a>
@@ -12813,27 +13209,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3995</v>
+                                    <v>3992</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1997</v>
+                                    <v>1996</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>624</v>
+                                    <v>623</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>55</b>
-                                    <v>624</v>
+                                    <v>623</v>
                                 </b>
                                 <b>
                                     <a>116</a>
                                     <b>2703</b>
-                                    <v>624</v>
+                                    <v>623</v>
                                 </b>
                                 <b>
                                     <a>7497</a>
@@ -12854,27 +13250,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>738193</v>
+                                    <v>737524</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>240612</v>
+                                    <v>240394</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>93273</v>
+                                    <v>93188</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>13</b>
-                                    <v>93897</v>
+                                    <v>93812</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>2574</b>
-                                    <v>55439</v>
+                                    <v>55389</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12890,27 +13286,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>820353</v>
+                                    <v>819610</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>179803</v>
+                                    <v>179640</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>106258</v>
+                                    <v>106162</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>27</b>
-                                    <v>92274</v>
+                                    <v>92190</v>
                                 </b>
                                 <b>
                                     <a>27</a>
                                     <b>2562</b>
-                                    <v>22725</v>
+                                    <v>22704</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12926,17 +13322,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>996036</v>
+                                    <v>995134</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>166942</v>
+                                    <v>166791</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>65</b>
-                                    <v>58436</v>
+                                    <v>58383</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12946,11 +13342,11 @@
         </relation>
         <relation>
             <name>overrides</name>
-            <cardinality>159781</cardinality>
+            <cardinality>159778</cardinality>
             <columnsizes>
                 <e>
                     <k>new</k>
-                    <v>151073</v>
+                    <v>151069</v>
                 </e>
                 <e>
                     <k>old</k>
@@ -12968,7 +13364,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>142372</v>
+                                    <v>142369</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13024,19 +13420,19 @@
         </relation>
         <relation>
             <name>membervariables</name>
-            <cardinality>1499266</cardinality>
+            <cardinality>1500125</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1496815</v>
+                    <v>1497674</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>456075</v>
+                    <v>456185</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>641686</v>
+                    <v>642156</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13050,7 +13446,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1494473</v>
+                                    <v>1495333</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13071,7 +13467,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1496815</v>
+                                    <v>1497674</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13087,22 +13483,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>338326</v>
+                                    <v>338449</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>72218</v>
+                                    <v>72155</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>10</b>
-                                    <v>35401</v>
+                                    <v>35451</v>
                                 </b>
                                 <b>
                                     <a>10</a>
-                                    <b>4444</b>
-                                    <v>10130</v>
+                                    <b>4445</b>
+                                    <v>10128</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13118,22 +13514,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>355917</v>
+                                    <v>356039</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>64321</v>
+                                    <v>64313</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>49</b>
-                                    <v>34311</v>
+                                    <v>34253</v>
                                 </b>
                                 <b>
-                                    <a>56</a>
-                                    <b>2185</b>
-                                    <v>1524</v>
+                                    <a>49</a>
+                                    <b>2186</b>
+                                    <v>1579</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13149,22 +13545,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>421164</v>
+                                    <v>421496</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>122542</v>
+                                    <v>122419</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>57785</v>
+                                    <v>58051</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>656</b>
-                                    <v>40193</v>
+                                    <v>40189</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13180,17 +13576,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>524318</v>
+                                    <v>524420</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>72817</v>
+                                    <v>73190</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>660</b>
-                                    <v>44550</v>
+                                    <v>44545</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13200,19 +13596,19 @@
         </relation>
         <relation>
             <name>globalvariables</name>
-            <cardinality>488591</cardinality>
+            <cardinality>488148</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>488591</v>
+                    <v>488148</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>10363</v>
+                    <v>10354</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>112626</v>
+                    <v>112524</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13226,7 +13622,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>488591</v>
+                                    <v>488148</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13242,7 +13638,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>488591</v>
+                                    <v>488148</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13258,7 +13654,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6992</v>
+                                    <v>6986</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13268,17 +13664,17 @@
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>749</v>
+                                    <v>748</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>20</b>
-                                    <v>874</v>
+                                    <v>873</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>74</b>
-                                    <v>874</v>
+                                    <v>873</v>
                                 </b>
                                 <b>
                                     <a>152</a>
@@ -13299,7 +13695,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7117</v>
+                                    <v>7110</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13309,17 +13705,17 @@
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>749</v>
+                                    <v>748</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>20</b>
-                                    <v>749</v>
+                                    <v>748</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>74</b>
-                                    <v>874</v>
+                                    <v>873</v>
                                 </b>
                                 <b>
                                     <a>125</a>
@@ -13340,17 +13736,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>95395</v>
+                                    <v>95309</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>8865</v>
+                                    <v>8857</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>604</b>
-                                    <v>8365</v>
+                                    <v>8358</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13366,12 +13762,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>97018</v>
+                                    <v>96931</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>15358</v>
+                                    <v>15344</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -13386,19 +13782,19 @@
         </relation>
         <relation>
             <name>localvariables</name>
-            <cardinality>726232</cardinality>
+            <cardinality>726300</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>726232</v>
+                    <v>726300</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>53437</v>
+                    <v>53440</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>101525</v>
+                    <v>101634</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13412,7 +13808,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>726232</v>
+                                    <v>726300</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13428,7 +13824,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>726232</v>
+                                    <v>726300</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13444,37 +13840,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28883</v>
+                                    <v>28865</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7837</v>
+                                    <v>7843</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4028</v>
+                                    <v>4029</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>4053</v>
+                                    <v>4065</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>12</b>
-                                    <v>4145</v>
+                                    <v>4133</v>
                                 </b>
                                 <b>
                                     <a>12</a>
-                                    <b>165</b>
-                                    <v>4008</v>
+                                    <b>162</b>
+                                    <v>4009</v>
                                 </b>
                                 <b>
-                                    <a>165</a>
-                                    <b>19323</b>
-                                    <v>480</v>
+                                    <a>162</a>
+                                    <b>19347</b>
+                                    <v>492</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13490,22 +13886,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>38383</v>
+                                    <v>38369</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6700</v>
+                                    <v>6707</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>4465</v>
+                                    <v>4478</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>3502</b>
-                                    <v>3888</v>
+                                    <b>3509</b>
+                                    <v>3885</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13521,32 +13917,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>62449</v>
+                                    <v>62540</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>16031</v>
+                                    <v>16039</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>6524</v>
+                                    <v>6530</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>8146</v>
+                                    <v>8147</v>
                                 </b>
                                 <b>
                                     <a>8</a>
-                                    <b>132</b>
-                                    <v>7617</v>
+                                    <b>134</b>
+                                    <v>7623</v>
                                 </b>
                                 <b>
-                                    <a>132</a>
-                                    <b>7547</b>
-                                    <v>756</v>
+                                    <a>134</a>
+                                    <b>7549</b>
+                                    <v>752</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13562,22 +13958,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>84480</v>
+                                    <v>84586</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8414</v>
+                                    <v>8411</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>15</b>
-                                    <v>7677</v>
+                                    <v>7683</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>1509</b>
-                                    <v>953</v>
+                                    <v>952</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13587,15 +13983,15 @@
         </relation>
         <relation>
             <name>autoderivation</name>
-            <cardinality>229374</cardinality>
+            <cardinality>229166</cardinality>
             <columnsizes>
                 <e>
                     <k>var</k>
-                    <v>229374</v>
+                    <v>229166</v>
                 </e>
                 <e>
                     <k>derivation_type</k>
-                    <v>624</v>
+                    <v>623</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13609,7 +14005,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>229374</v>
+                                    <v>229166</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13655,15 +14051,15 @@
         </relation>
         <relation>
             <name>orphaned_variables</name>
-            <cardinality>44323</cardinality>
+            <cardinality>44324</cardinality>
             <columnsizes>
                 <e>
                     <k>var</k>
-                    <v>44323</v>
+                    <v>44324</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>41052</v>
+                    <v>41053</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13677,7 +14073,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>44323</v>
+                                    <v>44324</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13708,19 +14104,19 @@
         </relation>
         <relation>
             <name>enumconstants</name>
-            <cardinality>345733</cardinality>
+            <cardinality>347816</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>345733</v>
+                    <v>347816</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>41337</v>
+                    <v>41550</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>13942</v>
+                    <v>13940</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -13728,11 +14124,11 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>345351</v>
+                    <v>347435</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>318338</v>
+                    <v>320424</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13746,7 +14142,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>345733</v>
+                                    <v>347816</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13762,7 +14158,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>345733</v>
+                                    <v>347816</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13778,7 +14174,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>345733</v>
+                                    <v>347816</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13794,7 +14190,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>345733</v>
+                                    <v>347816</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13810,7 +14206,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>345733</v>
+                                    <v>347816</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13831,17 +14227,17 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5773</v>
+                                    <v>5772</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>8714</v>
+                                    <v>8713</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>5500</v>
+                                    <v>5554</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -13861,22 +14257,22 @@
                                 <b>
                                     <a>8</a>
                                     <b>10</b>
-                                    <v>2941</v>
+                                    <v>2995</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>15</b>
-                                    <v>3322</v>
+                                    <v>3430</v>
                                 </b>
                                 <b>
                                     <a>15</a>
-                                    <b>32</b>
-                                    <v>3104</v>
+                                    <b>33</b>
+                                    <v>3158</v>
                                 </b>
                                 <b>
-                                    <a>32</a>
+                                    <a>33</a>
                                     <b>257</b>
-                                    <v>1361</v>
+                                    <v>1306</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13897,17 +14293,17 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5773</v>
+                                    <v>5772</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>8714</v>
+                                    <v>8713</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>5500</v>
+                                    <v>5554</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -13927,22 +14323,22 @@
                                 <b>
                                     <a>8</a>
                                     <b>10</b>
-                                    <v>2941</v>
+                                    <v>2995</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>15</b>
-                                    <v>3322</v>
+                                    <v>3430</v>
                                 </b>
                                 <b>
                                     <a>15</a>
-                                    <b>32</b>
-                                    <v>3104</v>
+                                    <b>33</b>
+                                    <v>3158</v>
                                 </b>
                                 <b>
-                                    <a>32</a>
+                                    <a>33</a>
                                     <b>257</b>
-                                    <v>1361</v>
+                                    <v>1306</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13958,7 +14354,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>41337</v>
+                                    <v>41550</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13979,17 +14375,17 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5773</v>
+                                    <v>5772</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>8714</v>
+                                    <v>8713</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>5500</v>
+                                    <v>5554</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -14009,22 +14405,22 @@
                                 <b>
                                     <a>8</a>
                                     <b>10</b>
-                                    <v>2941</v>
+                                    <v>2995</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>15</b>
-                                    <v>3322</v>
+                                    <v>3430</v>
                                 </b>
                                 <b>
                                     <a>15</a>
-                                    <b>32</b>
-                                    <v>3104</v>
+                                    <b>33</b>
+                                    <v>3158</v>
                                 </b>
                                 <b>
-                                    <a>32</a>
+                                    <a>33</a>
                                     <b>257</b>
-                                    <v>1361</v>
+                                    <v>1306</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14040,7 +14436,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2124</v>
+                                    <v>2123</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14050,12 +14446,12 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>8768</v>
+                                    <v>8767</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>5446</v>
+                                    <v>5500</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -14075,22 +14471,22 @@
                                 <b>
                                     <a>8</a>
                                     <b>11</b>
-                                    <v>3757</v>
+                                    <v>3811</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>17</b>
-                                    <v>3104</v>
+                                    <v>3212</v>
                                 </b>
                                 <b>
                                     <a>17</a>
-                                    <b>123</b>
-                                    <v>3104</v>
+                                    <b>165</b>
+                                    <v>3158</v>
                                 </b>
                                 <b>
-                                    <a>164</a>
+                                    <a>256</a>
                                     <b>257</b>
-                                    <v>108</v>
+                                    <v>54</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14145,7 +14541,7 @@
                                 </b>
                                 <b>
                                     <a>64</a>
-                                    <b>760</b>
+                                    <b>764</b>
                                     <v>980</v>
                                 </b>
                             </bs>
@@ -14201,7 +14597,7 @@
                                 </b>
                                 <b>
                                     <a>64</a>
-                                    <b>760</b>
+                                    <b>764</b>
                                     <v>980</v>
                                 </b>
                             </bs>
@@ -14218,7 +14614,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13942</v>
+                                    <v>13940</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14273,7 +14669,7 @@
                                 </b>
                                 <b>
                                     <a>64</a>
-                                    <b>757</b>
+                                    <b>761</b>
                                     <v>980</v>
                                 </b>
                             </bs>
@@ -14329,7 +14725,7 @@
                                 </b>
                                 <b>
                                     <a>64</a>
-                                    <b>760</b>
+                                    <b>764</b>
                                     <v>980</v>
                                 </b>
                             </bs>
@@ -14344,8 +14740,8 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>6348</a>
-                                    <b>6349</b>
+                                    <a>6387</a>
+                                    <b>6388</b>
                                     <v>54</v>
                                 </b>
                             </bs>
@@ -14360,8 +14756,8 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>759</a>
-                                    <b>760</b>
+                                    <a>763</a>
+                                    <b>764</b>
                                     <v>54</v>
                                 </b>
                             </bs>
@@ -14392,8 +14788,8 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>6341</a>
-                                    <b>6342</b>
+                                    <a>6380</a>
+                                    <b>6381</b>
                                     <v>54</v>
                                 </b>
                             </bs>
@@ -14408,8 +14804,8 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>5845</a>
-                                    <b>5846</b>
+                                    <a>5884</a>
+                                    <b>5885</b>
                                     <v>54</v>
                                 </b>
                             </bs>
@@ -14426,7 +14822,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>344970</v>
+                                    <v>347054</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14447,7 +14843,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>344970</v>
+                                    <v>347054</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14468,7 +14864,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>345351</v>
+                                    <v>347435</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14484,7 +14880,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>345351</v>
+                                    <v>347435</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14500,7 +14896,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>344970</v>
+                                    <v>347054</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14521,7 +14917,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>317303</v>
+                                    <v>319389</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14542,7 +14938,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>318338</v>
+                                    <v>320424</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14558,7 +14954,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>317303</v>
+                                    <v>319389</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14579,7 +14975,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>318338</v>
+                                    <v>320424</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14595,7 +14991,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>317303</v>
+                                    <v>319389</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14610,23 +15006,23 @@
         </relation>
         <relation>
             <name>builtintypes</name>
-            <cardinality>7616</cardinality>
+            <cardinality>7609</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7616</v>
+                    <v>7609</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>7616</v>
+                    <v>7609</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>7616</v>
+                    <v>7609</v>
                 </e>
                 <e>
                     <k>size</k>
-                    <v>874</v>
+                    <v>873</v>
                 </e>
                 <e>
                     <k>sign</k>
@@ -14634,7 +15030,7 @@
                 </e>
                 <e>
                     <k>alignment</k>
-                    <v>624</v>
+                    <v>623</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14648,7 +15044,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7616</v>
+                                    <v>7609</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14664,7 +15060,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7616</v>
+                                    <v>7609</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14680,7 +15076,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7616</v>
+                                    <v>7609</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14696,7 +15092,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7616</v>
+                                    <v>7609</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14712,7 +15108,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7616</v>
+                                    <v>7609</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14728,7 +15124,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7616</v>
+                                    <v>7609</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14744,7 +15140,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7616</v>
+                                    <v>7609</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14760,7 +15156,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7616</v>
+                                    <v>7609</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14776,7 +15172,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7616</v>
+                                    <v>7609</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14792,7 +15188,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7616</v>
+                                    <v>7609</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14808,7 +15204,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7616</v>
+                                    <v>7609</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14824,7 +15220,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7616</v>
+                                    <v>7609</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14840,7 +15236,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7616</v>
+                                    <v>7609</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14856,7 +15252,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7616</v>
+                                    <v>7609</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14872,7 +15268,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7616</v>
+                                    <v>7609</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15016,7 +15412,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>624</v>
+                                    <v>623</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15261,7 +15657,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>624</v>
+                                    <v>623</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15277,7 +15673,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>624</v>
+                                    <v>623</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15287,23 +15683,23 @@
         </relation>
         <relation>
             <name>derivedtypes</name>
-            <cardinality>3033685</cardinality>
+            <cardinality>3030936</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3033685</v>
+                    <v>3030936</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1461902</v>
+                    <v>1460578</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>749</v>
+                    <v>748</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1948495</v>
+                    <v>1946730</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -15317,7 +15713,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3033685</v>
+                                    <v>3030936</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15333,7 +15729,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3033685</v>
+                                    <v>3030936</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15349,7 +15745,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3033685</v>
+                                    <v>3030936</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15365,17 +15761,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1345279</v>
+                                    <v>1344061</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>28</b>
-                                    <v>110004</v>
+                                    <v>109905</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>4302</b>
-                                    <v>6617</v>
+                                    <v>6611</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15391,7 +15787,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1461902</v>
+                                    <v>1460578</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15407,17 +15803,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1345404</v>
+                                    <v>1344185</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>28</b>
-                                    <v>109879</v>
+                                    <v>109780</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>4302</b>
-                                    <v>6617</v>
+                                    <v>6611</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15556,22 +15952,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1318684</v>
+                                    <v>1317489</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>376213</v>
+                                    <v>375873</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>123365</v>
+                                    <v>123253</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>137</b>
-                                    <v>130232</v>
+                                    <v>130114</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15587,22 +15983,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1320182</v>
+                                    <v>1318986</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>376213</v>
+                                    <v>375873</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>121866</v>
+                                    <v>121756</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>137</b>
-                                    <v>130232</v>
+                                    <v>130114</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15618,22 +16014,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1320557</v>
+                                    <v>1319360</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>376838</v>
+                                    <v>376496</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>123614</v>
+                                    <v>123502</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>127485</v>
+                                    <v>127370</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15643,11 +16039,11 @@
         </relation>
         <relation>
             <name>pointerishsize</name>
-            <cardinality>2249417</cardinality>
+            <cardinality>2247379</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2249417</v>
+                    <v>2247379</v>
                 </e>
                 <e>
                     <k>size</k>
@@ -15669,7 +16065,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2249417</v>
+                                    <v>2247379</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15685,7 +16081,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2249417</v>
+                                    <v>2247379</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15769,23 +16165,23 @@
         </relation>
         <relation>
             <name>arraysizes</name>
-            <cardinality>80661</cardinality>
+            <cardinality>80588</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>80661</v>
+                    <v>80588</v>
                 </e>
                 <e>
                     <k>num_elements</k>
-                    <v>17855</v>
+                    <v>17839</v>
                 </e>
                 <e>
                     <k>bytesize</k>
-                    <v>20227</v>
+                    <v>20209</v>
                 </e>
                 <e>
                     <k>alignment</k>
-                    <v>624</v>
+                    <v>623</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -15799,7 +16195,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>80661</v>
+                                    <v>80588</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15815,7 +16211,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>80661</v>
+                                    <v>80588</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15831,7 +16227,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>80661</v>
+                                    <v>80588</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15852,7 +16248,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>10863</v>
+                                    <v>10853</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -15862,17 +16258,17 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>3496</v>
+                                    <v>3493</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>9</b>
-                                    <v>1498</v>
+                                    <v>1497</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>42</b>
-                                    <v>1373</v>
+                                    <v>1372</v>
                                 </b>
                                 <b>
                                     <a>56</a>
@@ -15893,12 +16289,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11737</v>
+                                    <v>11726</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3995</v>
+                                    <v>3992</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -15908,7 +16304,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>11</b>
-                                    <v>1123</v>
+                                    <v>1122</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15924,22 +16320,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11737</v>
+                                    <v>11726</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3995</v>
+                                    <v>3992</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>749</v>
+                                    <v>748</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>1373</v>
+                                    <v>1372</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15955,12 +16351,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>624</v>
+                                    <v>623</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12736</v>
+                                    <v>12724</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -15970,17 +16366,17 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>2746</v>
+                                    <v>2744</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>1498</v>
+                                    <v>1497</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>17</b>
-                                    <v>1623</v>
+                                    <v>1621</v>
                                 </b>
                                 <b>
                                     <a>24</a>
@@ -16001,17 +16397,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14609</v>
+                                    <v>14595</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3621</v>
+                                    <v>3617</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>1872</v>
+                                    <v>1871</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -16032,17 +16428,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14858</v>
+                                    <v>14845</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3371</v>
+                                    <v>3368</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>1623</v>
+                                    <v>1621</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -16208,15 +16604,15 @@
         </relation>
         <relation>
             <name>typedefbase</name>
-            <cardinality>1762239</cardinality>
+            <cardinality>1762360</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1762239</v>
+                    <v>1762360</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>838004</v>
+                    <v>838037</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -16230,7 +16626,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1762239</v>
+                                    <v>1762360</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16246,22 +16642,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>662556</v>
+                                    <v>662552</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>80927</v>
+                                    <v>80940</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>64154</v>
+                                    <v>64177</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>4526</b>
-                                    <v>30366</v>
+                                    <v>30367</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16271,7 +16667,7 @@
         </relation>
         <relation>
             <name>decltypes</name>
-            <cardinality>814476</cardinality>
+            <cardinality>814475</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -16279,7 +16675,7 @@
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>814476</v>
+                    <v>814475</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -16409,7 +16805,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>814476</v>
+                                    <v>814475</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16425,7 +16821,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>814476</v>
+                                    <v>814475</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16441,7 +16837,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>814476</v>
+                                    <v>814475</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16457,7 +16853,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>814476</v>
+                                    <v>814475</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16719,11 +17115,11 @@
         </relation>
         <relation>
             <name>type_operators</name>
-            <cardinality>7960</cardinality>
+            <cardinality>7961</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7960</v>
+                    <v>7961</v>
                 </e>
                 <e>
                     <k>arg_type</k>
@@ -16735,7 +17131,7 @@
                 </e>
                 <e>
                     <k>base_type</k>
-                    <v>5249</v>
+                    <v>5250</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -16749,7 +17145,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7960</v>
+                                    <v>7961</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16765,7 +17161,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7960</v>
+                                    <v>7961</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16781,7 +17177,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7960</v>
+                                    <v>7961</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17015,7 +17411,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4087</v>
+                                    <v>4088</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -17035,15 +17431,15 @@
         </relation>
         <relation>
             <name>usertypes</name>
-            <cardinality>4151525</cardinality>
+            <cardinality>4151710</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4151525</v>
+                    <v>4151710</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>918510</v>
+                    <v>918534</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -17061,7 +17457,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4151525</v>
+                                    <v>4151710</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17077,7 +17473,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4151525</v>
+                                    <v>4151710</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17093,22 +17489,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>654243</v>
+                                    <v>654261</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>158665</v>
+                                    <v>158669</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>70566</v>
+                                    <v>70567</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>32669</b>
-                                    <v>35034</v>
+                                    <v>35035</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17124,12 +17520,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>866765</v>
+                                    <v>866789</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>10</b>
-                                    <v>51744</v>
+                                    <v>51745</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17198,8 +17594,8 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>166844</a>
-                                    <b>166845</b>
+                                    <a>166851</a>
+                                    <b>166852</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -17281,11 +17677,11 @@
         </relation>
         <relation>
             <name>usertypesize</name>
-            <cardinality>1363780</cardinality>
+            <cardinality>1363817</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1363780</v>
+                    <v>1363817</v>
                 </e>
                 <e>
                     <k>size</k>
@@ -17307,7 +17703,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1363780</v>
+                                    <v>1363817</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17323,7 +17719,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1363780</v>
+                                    <v>1363817</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17517,26 +17913,26 @@
         </relation>
         <relation>
             <name>usertype_final</name>
-            <cardinality>11487</cardinality>
+            <cardinality>11477</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>11487</v>
+                    <v>11477</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>usertype_uuid</name>
-            <cardinality>47628</cardinality>
+            <cardinality>47716</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>47628</v>
+                    <v>47716</v>
                 </e>
                 <e>
                     <k>uuid</k>
-                    <v>47148</v>
+                    <v>47237</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -17550,7 +17946,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>47628</v>
+                                    <v>47716</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17566,7 +17962,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46669</v>
+                                    <v>46758</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -17581,11 +17977,11 @@
         </relation>
         <relation>
             <name>usertype_alias_kind</name>
-            <cardinality>1762239</cardinality>
+            <cardinality>1762360</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1762239</v>
+                    <v>1762360</v>
                 </e>
                 <e>
                     <k>alias_kind</k>
@@ -17603,7 +17999,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1762239</v>
+                                    <v>1762360</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17617,8 +18013,8 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>36900</a>
-                                    <b>36901</b>
+                                    <a>36907</a>
+                                    <b>36908</b>
                                     <v>10</v>
                                 </b>
                                 <b>
@@ -17634,26 +18030,26 @@
         </relation>
         <relation>
             <name>nontype_template_parameters</name>
-            <cardinality>766283</cardinality>
+            <cardinality>766287</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>766283</v>
+                    <v>766287</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>type_template_type_constraint</name>
-            <cardinality>27152</cardinality>
+            <cardinality>27153</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>13382</v>
+                    <v>13383</v>
                 </e>
                 <e>
                     <k>constraint</k>
-                    <v>26012</v>
+                    <v>26013</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -17667,7 +18063,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10219</v>
+                                    <v>10220</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -17703,7 +18099,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>24872</v>
+                                    <v>24873</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -17718,15 +18114,15 @@
         </relation>
         <relation>
             <name>mangled_name</name>
-            <cardinality>7859536</cardinality>
+            <cardinality>7852416</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7859536</v>
+                    <v>7852416</v>
                 </e>
                 <e>
                     <k>mangled_name</k>
-                    <v>6370039</v>
+                    <v>6364268</v>
                 </e>
                 <e>
                     <k>is_complete</k>
@@ -17744,7 +18140,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7859536</v>
+                                    <v>7852416</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17760,7 +18156,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7859536</v>
+                                    <v>7852416</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17776,12 +18172,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6041648</v>
+                                    <v>6036174</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>1120</b>
-                                    <v>328391</v>
+                                    <v>328093</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17797,7 +18193,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6370039</v>
+                                    <v>6364268</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17849,59 +18245,59 @@
         </relation>
         <relation>
             <name>is_pod_class</name>
-            <cardinality>593757</cardinality>
+            <cardinality>593760</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>593757</v>
+                    <v>593760</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_standard_layout_class</name>
-            <cardinality>1124388</cardinality>
+            <cardinality>1124418</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1124388</v>
+                    <v>1124418</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_complete</name>
-            <cardinality>1346258</cardinality>
+            <cardinality>1346294</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1346258</v>
+                    <v>1346294</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_class_template</name>
-            <cardinality>232167</cardinality>
+            <cardinality>232173</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>232167</v>
+                    <v>232173</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>class_instantiation</name>
-            <cardinality>1126046</cardinality>
+            <cardinality>1126076</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>1123004</v>
+                    <v>1123034</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>71801</v>
+                    <v>71803</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -17915,7 +18311,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1120871</v>
+                                    <v>1120901</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -17936,12 +18332,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20490</v>
+                                    <v>20501</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12885</v>
+                                    <v>12886</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -17951,7 +18347,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>4657</v>
+                                    <v>4658</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -17961,7 +18357,7 @@
                                 <b>
                                     <a>7</a>
                                     <b>10</b>
-                                    <v>5724</v>
+                                    <v>5714</v>
                                 </b>
                                 <b>
                                     <a>10</a>
@@ -17986,11 +18382,11 @@
         </relation>
         <relation>
             <name>class_template_argument</name>
-            <cardinality>2898595</cardinality>
+            <cardinality>2898672</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>1367076</v>
+                    <v>1367112</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -17998,7 +18394,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>822077</v>
+                    <v>822099</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18012,27 +18408,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>579347</v>
+                                    <v>579362</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>410278</v>
+                                    <v>410289</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>251042</v>
+                                    <v>251049</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>103097</v>
+                                    <v>103100</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>113</b>
-                                    <v>23310</v>
+                                    <v>23311</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18048,22 +18444,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>607886</v>
+                                    <v>607902</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>424283</v>
+                                    <v>424294</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>251876</v>
+                                    <v>251883</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>113</b>
-                                    <v>83029</v>
+                                    <v>83031</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18171,22 +18567,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>513703</v>
+                                    <v>513716</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>167643</v>
+                                    <v>167647</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>75086</v>
+                                    <v>75088</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>47</b>
-                                    <v>61736</v>
+                                    <v>61737</v>
                                 </b>
                                 <b>
                                     <a>47</a>
@@ -18207,17 +18603,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>723795</v>
+                                    <v>723815</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>79913</v>
+                                    <v>79915</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>22</b>
-                                    <v>18367</v>
+                                    <v>18368</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18227,11 +18623,11 @@
         </relation>
         <relation>
             <name>class_template_argument_value</name>
-            <cardinality>510083</cardinality>
+            <cardinality>510086</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>205811</v>
+                    <v>205812</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -18239,7 +18635,7 @@
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>509947</v>
+                    <v>509949</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18253,7 +18649,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>155798</v>
+                                    <v>155799</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18279,7 +18675,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>147928</v>
+                                    <v>147929</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18422,7 +18818,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>509811</v>
+                                    <v>509813</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18443,7 +18839,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>509947</v>
+                                    <v>509949</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18453,15 +18849,15 @@
         </relation>
         <relation>
             <name>is_proxy_class_for</name>
-            <cardinality>48438</cardinality>
+            <cardinality>48439</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>48438</v>
+                    <v>48439</v>
                 </e>
                 <e>
                     <k>templ_param_id</k>
-                    <v>45766</v>
+                    <v>45767</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18475,7 +18871,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>48438</v>
+                                    <v>48439</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18491,7 +18887,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>45047</v>
+                                    <v>45048</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18506,19 +18902,19 @@
         </relation>
         <relation>
             <name>type_mentions</name>
-            <cardinality>5902897</cardinality>
+            <cardinality>5903894</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5902897</v>
+                    <v>5903894</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>276673</v>
+                    <v>276913</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>5846582</v>
+                    <v>5847585</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -18536,7 +18932,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5902897</v>
+                                    <v>5903894</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18552,7 +18948,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5902897</v>
+                                    <v>5903894</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18568,7 +18964,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5902897</v>
+                                    <v>5903894</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18584,42 +18980,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>136593</v>
+                                    <v>136795</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>31153</v>
+                                    <v>31203</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>11273</v>
+                                    <v>11272</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>14922</v>
+                                    <v>14921</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>19988</v>
+                                    <v>19931</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>12</b>
-                                    <v>21785</v>
+                                    <v>21837</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>28</b>
-                                    <v>21077</v>
+                                    <v>21074</v>
                                 </b>
                                 <b>
                                     <a>28</a>
-                                    <b>8940</b>
-                                    <v>19879</v>
+                                    <b>8941</b>
+                                    <v>19876</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18635,42 +19031,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>136593</v>
+                                    <v>136795</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>31153</v>
+                                    <v>31203</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>11273</v>
+                                    <v>11272</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>14922</v>
+                                    <v>14921</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>19988</v>
+                                    <v>19931</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>12</b>
-                                    <v>21785</v>
+                                    <v>21837</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>28</b>
-                                    <v>21077</v>
+                                    <v>21074</v>
                                 </b>
                                 <b>
                                     <a>28</a>
-                                    <b>8940</b>
-                                    <v>19879</v>
+                                    <b>8941</b>
+                                    <v>19876</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18686,7 +19082,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>276673</v>
+                                    <v>276913</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18702,12 +19098,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5800887</v>
+                                    <v>5801896</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>45694</v>
+                                    <v>45689</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18723,12 +19119,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5800887</v>
+                                    <v>5801896</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>45694</v>
+                                    <v>45689</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18744,7 +19140,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5846582</v>
+                                    <v>5847585</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18758,8 +19154,8 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>108383</a>
-                                    <b>108384</b>
+                                    <a>108414</a>
+                                    <b>108415</b>
                                     <v>54</v>
                                 </b>
                             </bs>
@@ -18774,8 +19170,8 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>5080</a>
-                                    <b>5081</b>
+                                    <a>5085</a>
+                                    <b>5086</b>
                                     <v>54</v>
                                 </b>
                             </bs>
@@ -18790,8 +19186,8 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>107349</a>
-                                    <b>107350</b>
+                                    <a>107380</a>
+                                    <b>107381</b>
                                     <v>54</v>
                                 </b>
                             </bs>
@@ -18802,26 +19198,26 @@
         </relation>
         <relation>
             <name>is_function_template</name>
-            <cardinality>1332543</cardinality>
+            <cardinality>1331336</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1332543</v>
+                    <v>1331336</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_instantiation</name>
-            <cardinality>973628</cardinality>
+            <cardinality>973633</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>973628</v>
+                    <v>973633</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>182644</v>
+                    <v>182645</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18835,7 +19231,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>973628</v>
+                                    <v>973633</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18851,12 +19247,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>110588</v>
+                                    <v>110589</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>42790</v>
+                                    <v>42791</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -18881,11 +19277,11 @@
         </relation>
         <relation>
             <name>function_template_argument</name>
-            <cardinality>2484801</cardinality>
+            <cardinality>2484813</cardinality>
             <columnsizes>
                 <e>
                     <k>function_id</k>
-                    <v>1453288</v>
+                    <v>1453296</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -18893,7 +19289,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>298003</v>
+                    <v>298004</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18907,17 +19303,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>783011</v>
+                                    <v>783015</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>413156</v>
+                                    <v>413158</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>171810</v>
+                                    <v>171811</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -18938,17 +19334,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>802158</v>
+                                    <v>802162</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>411249</v>
+                                    <v>411251</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>169630</v>
+                                    <v>169631</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -19091,7 +19487,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>174774</v>
+                                    <v>174775</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19137,7 +19533,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>256813</v>
+                                    <v>256814</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19157,11 +19553,11 @@
         </relation>
         <relation>
             <name>function_template_argument_value</name>
-            <cardinality>452779</cardinality>
+            <cardinality>452781</cardinality>
             <columnsizes>
                 <e>
                     <k>function_id</k>
-                    <v>196783</v>
+                    <v>196784</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -19169,7 +19565,7 @@
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>450087</v>
+                    <v>450090</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19183,7 +19579,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>151403</v>
+                                    <v>151404</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19209,7 +19605,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>144487</v>
+                                    <v>144488</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19362,7 +19758,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>447396</v>
+                                    <v>447398</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19383,7 +19779,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>450087</v>
+                                    <v>450090</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19393,26 +19789,26 @@
         </relation>
         <relation>
             <name>is_variable_template</name>
-            <cardinality>58685</cardinality>
+            <cardinality>58632</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>58685</v>
+                    <v>58632</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>variable_instantiation</name>
-            <cardinality>423162</cardinality>
+            <cardinality>422779</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>423162</v>
+                    <v>422779</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>35336</v>
+                    <v>35304</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19426,7 +19822,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>423162</v>
+                                    <v>422779</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19442,42 +19838,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15233</v>
+                                    <v>15219</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3870</v>
+                                    <v>3867</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2372</v>
+                                    <v>2370</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>2996</v>
+                                    <v>2994</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>2247</v>
+                                    <v>2245</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>12</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>31</b>
-                                    <v>2746</v>
+                                    <v>2744</v>
                                 </b>
                                 <b>
                                     <a>32</a>
                                     <b>546</b>
-                                    <v>2746</v>
+                                    <v>2744</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19487,19 +19883,19 @@
         </relation>
         <relation>
             <name>variable_template_argument</name>
-            <cardinality>769159</cardinality>
+            <cardinality>768462</cardinality>
             <columnsizes>
                 <e>
                     <k>variable_id</k>
-                    <v>401311</v>
+                    <v>400947</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>1997</v>
+                    <v>1996</v>
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>256344</v>
+                    <v>256112</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19513,22 +19909,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>156703</v>
+                                    <v>156561</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>189917</v>
+                                    <v>189745</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>36460</v>
+                                    <v>36427</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>17</b>
-                                    <v>18230</v>
+                                    <v>18213</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19544,22 +19940,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>171562</v>
+                                    <v>171407</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>180178</v>
+                                    <v>180014</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>33713</v>
+                                    <v>33682</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>17</b>
-                                    <v>15857</v>
+                                    <v>15843</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19575,7 +19971,7 @@
                                 <b>
                                     <a>28</a>
                                     <b>29</b>
-                                    <v>874</v>
+                                    <v>873</v>
                                 </b>
                                 <b>
                                     <a>34</a>
@@ -19626,7 +20022,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>874</v>
+                                    <v>873</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19677,22 +20073,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>175558</v>
+                                    <v>175399</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>44701</v>
+                                    <v>44660</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>21601</v>
+                                    <v>21581</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>206</b>
-                                    <v>14484</v>
+                                    <v>14471</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19708,17 +20104,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>228000</v>
+                                    <v>227794</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>24722</v>
+                                    <v>24700</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>3621</v>
+                                    <v>3617</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19728,11 +20124,11 @@
         </relation>
         <relation>
             <name>variable_template_argument_value</name>
-            <cardinality>19978</cardinality>
+            <cardinality>19960</cardinality>
             <columnsizes>
                 <e>
                     <k>variable_id</k>
-                    <v>14858</v>
+                    <v>14845</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -19740,7 +20136,7 @@
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>19978</v>
+                    <v>19960</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19754,12 +20150,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13360</v>
+                                    <v>13348</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1498</v>
+                                    <v>1497</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19775,12 +20171,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10488</v>
+                                    <v>10479</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3995</v>
+                                    <v>3992</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -19863,7 +20259,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19978</v>
+                                    <v>19960</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19879,7 +20275,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19978</v>
+                                    <v>19960</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19889,15 +20285,15 @@
         </relation>
         <relation>
             <name>template_template_instantiation</name>
-            <cardinality>6368</cardinality>
+            <cardinality>6362</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>4994</v>
+                    <v>4990</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>1123</v>
+                    <v>1122</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19911,12 +20307,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3621</v>
+                                    <v>3617</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1373</v>
+                                    <v>1372</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19932,7 +20328,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>749</v>
+                                    <v>748</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19957,7 +20353,7 @@
         </relation>
         <relation>
             <name>template_template_argument</name>
-            <cardinality>9674</cardinality>
+            <cardinality>9675</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
@@ -20167,7 +20563,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9051</v>
+                                    <v>9052</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -20455,11 +20851,11 @@
         </relation>
         <relation>
             <name>concept_instantiation</name>
-            <cardinality>90430</cardinality>
+            <cardinality>90433</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>90430</v>
+                    <v>90433</v>
                 </e>
                 <e>
                     <k>from</k>
@@ -20477,7 +20873,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>90430</v>
+                                    <v>90433</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20573,22 +20969,22 @@
         </relation>
         <relation>
             <name>is_type_constraint</name>
-            <cardinality>36899</cardinality>
+            <cardinality>36900</cardinality>
             <columnsizes>
                 <e>
                     <k>concept_id</k>
-                    <v>36899</v>
+                    <v>36900</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>concept_template_argument</name>
-            <cardinality>113043</cardinality>
+            <cardinality>113047</cardinality>
             <columnsizes>
                 <e>
                     <k>concept_id</k>
-                    <v>76380</v>
+                    <v>76383</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -20596,7 +20992,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>21429</v>
+                    <v>21430</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -20610,12 +21006,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46473</v>
+                                    <v>46475</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>24678</v>
+                                    <v>24679</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -20636,17 +21032,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>50088</v>
+                                    <v>50090</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>22376</v>
+                                    <v>22377</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>3915</v>
+                                    <v>3916</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20946,15 +21342,15 @@
         </relation>
         <relation>
             <name>routinetypes</name>
-            <cardinality>604319</cardinality>
+            <cardinality>604322</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>604319</v>
+                    <v>604322</v>
                 </e>
                 <e>
                     <k>return_type</k>
-                    <v>283864</v>
+                    <v>283865</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -20968,7 +21364,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>604319</v>
+                                    <v>604322</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20984,7 +21380,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>234225</v>
+                                    <v>234226</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -21004,11 +21400,11 @@
         </relation>
         <relation>
             <name>routinetypeargs</name>
-            <cardinality>1176788</cardinality>
+            <cardinality>1176651</cardinality>
             <columnsizes>
                 <e>
                     <k>routine</k>
-                    <v>415119</v>
+                    <v>415070</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -21016,7 +21412,7 @@
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>111595</v>
+                    <v>111582</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21030,32 +21426,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>82511</v>
+                                    <v>82502</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>126028</v>
+                                    <v>126013</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>107456</v>
+                                    <v>107443</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>49289</v>
+                                    <v>49283</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>33168</v>
+                                    <v>33164</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>19</b>
-                                    <v>16665</v>
+                                    <v>16663</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21071,27 +21467,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>88502</v>
+                                    <v>88492</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>138663</v>
+                                    <v>138647</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>114209</v>
+                                    <v>114196</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>40738</v>
+                                    <v>40733</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>10</b>
-                                    <v>32895</v>
+                                    <v>32891</v>
                                 </b>
                                 <b>
                                     <a>10</a>
@@ -21289,42 +21685,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33222</v>
+                                    <v>33218</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>15195</v>
+                                    <v>15193</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>13234</v>
+                                    <v>13233</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>9803</v>
+                                    <v>9802</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>6372</v>
+                                    <v>6371</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>9476</v>
+                                    <v>9475</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>13</b>
-                                    <v>9531</v>
+                                    <v>9529</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>26</b>
-                                    <v>8659</v>
+                                    <v>8658</v>
                                 </b>
                                 <b>
                                     <a>26</a>
@@ -21345,22 +21741,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>78917</v>
+                                    <v>78908</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>17537</v>
+                                    <v>17535</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>9476</v>
+                                    <v>9475</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>17</b>
-                                    <v>5664</v>
+                                    <v>5663</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21370,11 +21766,11 @@
         </relation>
         <relation>
             <name>ptrtomembers</name>
-            <cardinality>9727</cardinality>
+            <cardinality>9728</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9727</v>
+                    <v>9728</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -21396,7 +21792,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9727</v>
+                                    <v>9728</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21412,7 +21808,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9727</v>
+                                    <v>9728</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21526,15 +21922,15 @@
         </relation>
         <relation>
             <name>specifiers</name>
-            <cardinality>7741</cardinality>
+            <cardinality>7734</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7741</v>
+                    <v>7734</v>
                 </e>
                 <e>
                     <k>str</k>
-                    <v>7741</v>
+                    <v>7734</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21548,7 +21944,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7741</v>
+                                    <v>7734</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21564,7 +21960,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7741</v>
+                                    <v>7734</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21574,15 +21970,15 @@
         </relation>
         <relation>
             <name>typespecifiers</name>
-            <cardinality>854940</cardinality>
+            <cardinality>854272</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>847448</v>
+                    <v>849128</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>1623</v>
+                    <v>95</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21596,12 +21992,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>839957</v>
+                                    <v>843984</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7491</v>
+                                    <v>5143</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21615,69 +22011,49 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>124</v>
+                                    <a>168</a>
+                                    <b>169</b>
+                                    <v>10</v>
                                 </b>
                                 <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>124</v>
+                                    <a>215</a>
+                                    <b>216</b>
+                                    <v>10</v>
                                 </b>
                                 <b>
-                                    <a>16</a>
-                                    <b>17</b>
-                                    <v>124</v>
+                                    <a>225</a>
+                                    <b>226</b>
+                                    <v>10</v>
                                 </b>
                                 <b>
-                                    <a>17</a>
-                                    <b>18</b>
-                                    <v>124</v>
+                                    <a>533</a>
+                                    <b>534</b>
+                                    <v>10</v>
                                 </b>
                                 <b>
-                                    <a>24</a>
-                                    <b>25</b>
-                                    <v>124</v>
+                                    <a>821</a>
+                                    <b>822</b>
+                                    <v>10</v>
                                 </b>
                                 <b>
-                                    <a>44</a>
-                                    <b>45</b>
-                                    <v>124</v>
+                                    <a>1568</a>
+                                    <b>1569</b>
+                                    <v>10</v>
                                 </b>
                                 <b>
-                                    <a>49</a>
-                                    <b>50</b>
-                                    <v>124</v>
+                                    <a>4195</a>
+                                    <b>4196</b>
+                                    <v>10</v>
                                 </b>
                                 <b>
-                                    <a>51</a>
-                                    <b>52</b>
-                                    <v>124</v>
+                                    <a>18295</a>
+                                    <b>18296</b>
+                                    <v>10</v>
                                 </b>
                                 <b>
-                                    <a>112</a>
-                                    <b>113</b>
-                                    <v>124</v>
-                                </b>
-                                <b>
-                                    <a>199</a>
-                                    <b>200</b>
-                                    <v>124</v>
-                                </b>
-                                <b>
-                                    <a>325</a>
-                                    <b>326</b>
-                                    <v>124</v>
-                                </b>
-                                <b>
-                                    <a>545</a>
-                                    <b>546</b>
-                                    <v>124</v>
-                                </b>
-                                <b>
-                                    <a>5462</a>
-                                    <b>5463</b>
-                                    <v>124</v>
+                                    <a>54858</a>
+                                    <b>54859</b>
+                                    <v>10</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21687,15 +22063,15 @@
         </relation>
         <relation>
             <name>funspecifiers</name>
-            <cardinality>9723250</cardinality>
+            <cardinality>9714441</cardinality>
             <columnsizes>
                 <e>
                     <k>func_id</k>
-                    <v>4012490</v>
+                    <v>4008855</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>2372</v>
+                    <v>2370</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21709,27 +22085,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1528454</v>
+                                    <v>1527070</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>506696</v>
+                                    <v>506237</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1037865</v>
+                                    <v>1036925</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>693492</v>
+                                    <v>692863</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>245981</v>
+                                    <v>245758</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21845,15 +22221,15 @@
         </relation>
         <relation>
             <name>varspecifiers</name>
-            <cardinality>3078136</cardinality>
+            <cardinality>3075347</cardinality>
             <columnsizes>
                 <e>
                     <k>var_id</k>
-                    <v>2316968</v>
+                    <v>2314869</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>1123</v>
+                    <v>1122</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21867,17 +22243,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1659561</v>
+                                    <v>1658058</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>554144</v>
+                                    <v>553642</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>103262</v>
+                                    <v>103168</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21943,15 +22319,15 @@
         </relation>
         <relation>
             <name>explicit_specifier_exprs</name>
-            <cardinality>41329</cardinality>
+            <cardinality>41292</cardinality>
             <columnsizes>
                 <e>
                     <k>func_id</k>
-                    <v>41329</v>
+                    <v>41292</v>
                 </e>
                 <e>
                     <k>constant</k>
-                    <v>41329</v>
+                    <v>41292</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21965,7 +22341,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>41329</v>
+                                    <v>41292</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21981,7 +22357,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>41329</v>
+                                    <v>41292</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21991,11 +22367,11 @@
         </relation>
         <relation>
             <name>attributes</name>
-            <cardinality>654409</cardinality>
+            <cardinality>653817</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>654409</v>
+                    <v>653817</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -22003,7 +22379,7 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>2122</v>
+                    <v>2120</v>
                 </e>
                 <e>
                     <k>name_space</k>
@@ -22011,7 +22387,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>648291</v>
+                    <v>647704</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22025,7 +22401,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>654409</v>
+                                    <v>653817</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22041,7 +22417,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>654409</v>
+                                    <v>653817</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22057,7 +22433,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>654409</v>
+                                    <v>653817</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22073,7 +22449,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>654409</v>
+                                    <v>653817</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22269,7 +22645,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1872</v>
+                                    <v>1871</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -22290,7 +22666,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2122</v>
+                                    <v>2120</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22476,12 +22852,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>642423</v>
+                                    <v>641841</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>5868</v>
+                                    <v>5863</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22497,7 +22873,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>648291</v>
+                                    <v>647704</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22513,12 +22889,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>643172</v>
+                                    <v>642589</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5119</v>
+                                    <v>5114</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22534,7 +22910,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>648291</v>
+                                    <v>647704</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23243,15 +23619,15 @@
         </relation>
         <relation>
             <name>attribute_arg_constant</name>
-            <cardinality>71875</cardinality>
+            <cardinality>71856</cardinality>
             <columnsizes>
                 <e>
                     <k>arg</k>
-                    <v>71875</v>
+                    <v>71856</v>
                 </e>
                 <e>
                     <k>constant</k>
-                    <v>71875</v>
+                    <v>71856</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23265,7 +23641,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>71875</v>
+                                    <v>71856</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23281,7 +23657,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>71875</v>
+                                    <v>71856</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23392,15 +23768,15 @@
         </relation>
         <relation>
             <name>typeattributes</name>
-            <cardinality>96394</cardinality>
+            <cardinality>96307</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>94646</v>
+                    <v>94560</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>32464</v>
+                    <v>32435</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23414,12 +23790,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>92898</v>
+                                    <v>92814</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23435,17 +23811,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27969</v>
+                                    <v>27944</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>9</b>
-                                    <v>2497</v>
+                                    <v>2495</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>58</b>
-                                    <v>1997</v>
+                                    <v>1996</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23455,15 +23831,15 @@
         </relation>
         <relation>
             <name>funcattributes</name>
-            <cardinality>844327</cardinality>
+            <cardinality>843562</cardinality>
             <columnsizes>
                 <e>
                     <k>func_id</k>
-                    <v>799751</v>
+                    <v>799026</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>617325</v>
+                    <v>616766</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23477,12 +23853,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>759669</v>
+                                    <v>758981</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>40081</v>
+                                    <v>40044</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23498,12 +23874,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>572249</v>
+                                    <v>571731</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>213</b>
-                                    <v>45075</v>
+                                    <v>45034</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23702,15 +24078,15 @@
         </relation>
         <relation>
             <name>unspecifiedtype</name>
-            <cardinality>7179404</cardinality>
+            <cardinality>7172900</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>7179404</v>
+                    <v>7172900</v>
                 </e>
                 <e>
                     <k>unspecified_type_id</k>
-                    <v>3965916</v>
+                    <v>3962323</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23724,7 +24100,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7179404</v>
+                                    <v>7172900</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23740,22 +24116,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2482787</v>
+                                    <v>2480537</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1117778</v>
+                                    <v>1116765</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>302918</v>
+                                    <v>302644</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>537</b>
-                                    <v>62431</v>
+                                    <v>62375</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23765,19 +24141,19 @@
         </relation>
         <relation>
             <name>member</name>
-            <cardinality>4193417</cardinality>
+            <cardinality>4189618</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>543780</v>
+                    <v>543288</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>29717</v>
+                    <v>29690</v>
                 </e>
                 <e>
                     <k>child</k>
-                    <v>4188797</v>
+                    <v>4185003</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23791,57 +24167,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>129108</v>
+                                    <v>128991</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>83408</v>
+                                    <v>83333</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>32464</v>
+                                    <v>32435</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>44950</v>
+                                    <v>44910</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>42453</v>
+                                    <v>42415</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>33962</v>
+                                    <v>33932</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>42328</v>
+                                    <v>42290</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>13</b>
-                                    <v>41204</v>
+                                    <v>41167</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>18</b>
-                                    <v>41329</v>
+                                    <v>41292</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>42</b>
-                                    <v>40830</v>
+                                    <v>40793</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>239</b>
-                                    <v>11737</v>
+                                    <v>11726</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23857,57 +24233,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>128859</v>
+                                    <v>128742</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>83533</v>
+                                    <v>83458</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>32214</v>
+                                    <v>32185</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>45075</v>
+                                    <v>45034</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>42578</v>
+                                    <v>42539</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>32839</v>
+                                    <v>32809</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>42703</v>
+                                    <v>42664</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>13</b>
-                                    <v>41579</v>
+                                    <v>41541</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>18</b>
-                                    <v>41454</v>
+                                    <v>41417</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>42</b>
-                                    <v>40955</v>
+                                    <v>40918</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>265</b>
-                                    <v>11986</v>
+                                    <v>11976</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23923,57 +24299,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6492</v>
+                                    <v>6487</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2622</v>
+                                    <v>2619</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>1872</v>
+                                    <v>1871</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>2871</v>
+                                    <v>2869</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>19</b>
-                                    <v>2247</v>
+                                    <v>2245</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>26</b>
-                                    <v>2247</v>
+                                    <v>2245</v>
                                 </b>
                                 <b>
                                     <a>26</a>
                                     <b>36</b>
-                                    <v>2497</v>
+                                    <v>2495</v>
                                 </b>
                                 <b>
                                     <a>36</a>
                                     <b>50</b>
-                                    <v>2247</v>
+                                    <v>2245</v>
                                 </b>
                                 <b>
                                     <a>54</a>
                                     <b>141</b>
-                                    <v>2247</v>
+                                    <v>2245</v>
                                 </b>
                                 <b>
                                     <a>150</a>
                                     <b>468</b>
-                                    <v>2247</v>
+                                    <v>2245</v>
                                 </b>
                                 <b>
                                     <a>480</a>
                                     <b>4310</b>
-                                    <v>2122</v>
+                                    <v>2120</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23989,57 +24365,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5493</v>
+                                    <v>5489</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3621</v>
+                                    <v>3617</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>9</b>
-                                    <v>1872</v>
+                                    <v>1871</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>2871</v>
+                                    <v>2869</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>20</b>
-                                    <v>2372</v>
+                                    <v>2370</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>28</b>
-                                    <v>2372</v>
+                                    <v>2370</v>
                                 </b>
                                 <b>
                                     <a>28</a>
                                     <b>37</b>
-                                    <v>2372</v>
+                                    <v>2370</v>
                                 </b>
                                 <b>
                                     <a>37</a>
                                     <b>56</b>
-                                    <v>2372</v>
+                                    <v>2370</v>
                                 </b>
                                 <b>
                                     <a>58</a>
                                     <b>156</b>
-                                    <v>2247</v>
+                                    <v>2245</v>
                                 </b>
                                 <b>
                                     <a>163</a>
                                     <b>527</b>
-                                    <v>2247</v>
+                                    <v>2245</v>
                                 </b>
                                 <b>
                                     <a>547</a>
                                     <b>4330</b>
-                                    <v>1872</v>
+                                    <v>1871</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24055,7 +24431,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4188797</v>
+                                    <v>4185003</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24071,12 +24447,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4184177</v>
+                                    <v>4180387</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4619</v>
+                                    <v>4615</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24094,7 +24470,7 @@
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>71340</v>
+                    <v>71341</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24149,15 +24525,15 @@
         </relation>
         <relation>
             <name>derivations</name>
-            <cardinality>476900</cardinality>
+            <cardinality>476902</cardinality>
             <columnsizes>
                 <e>
                     <k>derivation</k>
-                    <v>476900</v>
+                    <v>476902</v>
                 </e>
                 <e>
                     <k>sub</k>
-                    <v>455164</v>
+                    <v>455166</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -24165,11 +24541,11 @@
                 </e>
                 <e>
                     <k>super</k>
-                    <v>235554</v>
+                    <v>235555</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>35397</v>
+                    <v>35398</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24183,7 +24559,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>476900</v>
+                                    <v>476902</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24199,7 +24575,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>476900</v>
+                                    <v>476902</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24215,7 +24591,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>476900</v>
+                                    <v>476902</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24231,7 +24607,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>476900</v>
+                                    <v>476902</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24247,7 +24623,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>438640</v>
+                                    <v>438642</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -24268,7 +24644,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>438640</v>
+                                    <v>438642</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -24289,7 +24665,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>438640</v>
+                                    <v>438642</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -24310,7 +24686,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>438640</v>
+                                    <v>438642</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -24470,7 +24846,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>225742</v>
+                                    <v>225743</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -24491,7 +24867,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>225742</v>
+                                    <v>225743</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -24512,7 +24888,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>235111</v>
+                                    <v>235112</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -24533,7 +24909,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>230205</v>
+                                    <v>230206</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -24626,7 +25002,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>35397</v>
+                                    <v>35398</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24667,11 +25043,11 @@
         </relation>
         <relation>
             <name>derspecifiers</name>
-            <cardinality>478671</cardinality>
+            <cardinality>478674</cardinality>
             <columnsizes>
                 <e>
                     <k>der_id</k>
-                    <v>476457</v>
+                    <v>476459</v>
                 </e>
                 <e>
                     <k>spec_id</k>
@@ -24689,7 +25065,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>474242</v>
+                                    <v>474245</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -24735,11 +25111,11 @@
         </relation>
         <relation>
             <name>direct_base_offsets</name>
-            <cardinality>449985</cardinality>
+            <cardinality>449987</cardinality>
             <columnsizes>
                 <e>
                     <k>der_id</k>
-                    <v>449985</v>
+                    <v>449987</v>
                 </e>
                 <e>
                     <k>offset</k>
@@ -24757,7 +25133,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>449985</v>
+                                    <v>449987</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24954,11 +25330,11 @@
         </relation>
         <relation>
             <name>frienddecls</name>
-            <cardinality>700462</cardinality>
+            <cardinality>700465</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>700462</v>
+                    <v>700465</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -24984,7 +25360,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>700462</v>
+                                    <v>700465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25000,7 +25376,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>700462</v>
+                                    <v>700465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25016,7 +25392,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>700462</v>
+                                    <v>700465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25047,7 +25423,7 @@
                                 <b>
                                     <a>7</a>
                                     <b>12</b>
-                                    <v>3440</v>
+                                    <v>3441</v>
                                 </b>
                                 <b>
                                     <a>12</a>
@@ -25103,7 +25479,7 @@
                                 <b>
                                     <a>7</a>
                                     <b>12</b>
-                                    <v>3440</v>
+                                    <v>3441</v>
                                 </b>
                                 <b>
                                     <a>12</a>
@@ -25247,7 +25623,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>77166</v>
+                                    <v>77167</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25325,19 +25701,19 @@
         </relation>
         <relation>
             <name>comments</name>
-            <cardinality>11241965</cardinality>
+            <cardinality>11233402</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>11241965</v>
+                    <v>11233402</v>
                 </e>
                 <e>
                     <k>contents</k>
-                    <v>4306669</v>
+                    <v>4303640</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>11241965</v>
+                    <v>11233402</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25351,7 +25727,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11241965</v>
+                                    <v>11233402</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25367,7 +25743,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11241965</v>
+                                    <v>11233402</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25383,17 +25759,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3932328</v>
+                                    <v>3928890</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>7</b>
-                                    <v>330014</v>
+                                    <b>6</b>
+                                    <v>322978</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
+                                    <a>6</a>
                                     <b>34447</b>
-                                    <v>44326</v>
+                                    <v>51771</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25409,17 +25785,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3932328</v>
+                                    <v>3928890</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>7</b>
-                                    <v>330014</v>
+                                    <b>6</b>
+                                    <v>322978</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
+                                    <a>6</a>
                                     <b>34447</b>
-                                    <v>44326</v>
+                                    <v>51771</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25435,7 +25811,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11241965</v>
+                                    <v>11233402</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25451,7 +25827,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11241965</v>
+                                    <v>11233402</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25461,15 +25837,15 @@
         </relation>
         <relation>
             <name>commentbinding</name>
-            <cardinality>3916720</cardinality>
+            <cardinality>3914793</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3352211</v>
+                    <v>3350796</v>
                 </e>
                 <e>
                     <k>element</k>
-                    <v>3751026</v>
+                    <v>3749249</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25483,12 +25859,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3290529</v>
+                                    <v>3289170</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>1706</b>
-                                    <v>61682</v>
+                                    <v>61626</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25504,12 +25880,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3585332</v>
+                                    <v>3583705</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>165693</v>
+                                    <v>165543</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25519,15 +25895,15 @@
         </relation>
         <relation>
             <name>exprconv</name>
-            <cardinality>9633088</cardinality>
+            <cardinality>9633084</cardinality>
             <columnsizes>
                 <e>
                     <k>converted</k>
-                    <v>9632982</v>
+                    <v>9632979</v>
                 </e>
                 <e>
                     <k>conversion</k>
-                    <v>9633088</v>
+                    <v>9633084</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25541,7 +25917,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9632877</v>
+                                    <v>9632873</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25562,7 +25938,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9633088</v>
+                                    <v>9633084</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25572,22 +25948,22 @@
         </relation>
         <relation>
             <name>compgenerated</name>
-            <cardinality>9891529</cardinality>
+            <cardinality>9892394</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9891529</v>
+                    <v>9892394</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>synthetic_destructor_call</name>
-            <cardinality>1671638</cardinality>
+            <cardinality>1671701</cardinality>
             <columnsizes>
                 <e>
                     <k>element</k>
-                    <v>1244918</v>
+                    <v>1244965</v>
                 </e>
                 <e>
                     <k>i</k>
@@ -25595,7 +25971,7 @@
                 </e>
                 <e>
                     <k>destructor_call</k>
-                    <v>1671638</v>
+                    <v>1671701</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25609,17 +25985,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>828654</v>
+                                    <v>828685</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>409464</v>
+                                    <v>409480</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>19</b>
-                                    <v>6798</v>
+                                    <v>6799</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25635,17 +26011,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>828654</v>
+                                    <v>828685</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>409464</v>
+                                    <v>409480</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>19</b>
-                                    <v>6798</v>
+                                    <v>6799</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25793,7 +26169,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1671638</v>
+                                    <v>1671701</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25809,7 +26185,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1671638</v>
+                                    <v>1671701</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25888,15 +26264,15 @@
         </relation>
         <relation>
             <name>namespacembrs</name>
-            <cardinality>2039521</cardinality>
+            <cardinality>2037673</cardinality>
             <columnsizes>
                 <e>
                     <k>parentid</k>
-                    <v>3995</v>
+                    <v>3992</v>
                 </e>
                 <e>
                     <k>memberid</k>
-                    <v>2039521</v>
+                    <v>2037673</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25925,7 +26301,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>624</v>
+                                    <v>623</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -25986,7 +26362,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2039521</v>
+                                    <v>2037673</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25996,11 +26372,11 @@
         </relation>
         <relation>
             <name>exprparents</name>
-            <cardinality>19454218</cardinality>
+            <cardinality>19454210</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>19454218</v>
+                    <v>19454210</v>
                 </e>
                 <e>
                     <k>child_index</k>
@@ -26008,7 +26384,7 @@
                 </e>
                 <e>
                     <k>parent_id</k>
-                    <v>12939988</v>
+                    <v>12939983</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26022,7 +26398,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19454218</v>
+                                    <v>19454210</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26038,7 +26414,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19454218</v>
+                                    <v>19454210</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26156,12 +26532,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7394757</v>
+                                    <v>7394754</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5082680</v>
+                                    <v>5082678</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -26182,12 +26558,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7394757</v>
+                                    <v>7394754</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5082680</v>
+                                    <v>5082678</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -26202,22 +26578,22 @@
         </relation>
         <relation>
             <name>expr_isload</name>
-            <cardinality>6909475</cardinality>
+            <cardinality>6909332</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>6909475</v>
+                    <v>6909332</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>conversionkinds</name>
-            <cardinality>6050433</cardinality>
+            <cardinality>6050443</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>6050433</v>
+                    <v>6050443</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -26235,7 +26611,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6050433</v>
+                                    <v>6050443</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26259,8 +26635,8 @@
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>7362</a>
-                                    <b>7363</b>
+                                    <a>7371</a>
+                                    <b>7372</b>
                                     <v>1</v>
                                 </b>
                                 <b>
@@ -26279,8 +26655,8 @@
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>5831534</a>
-                                    <b>5831535</b>
+                                    <a>5831535</a>
+                                    <b>5831536</b>
                                     <v>1</v>
                                 </b>
                             </bs>
@@ -26291,11 +26667,11 @@
         </relation>
         <relation>
             <name>iscall</name>
-            <cardinality>5802603</cardinality>
+            <cardinality>5802824</cardinality>
             <columnsizes>
                 <e>
                     <k>caller</k>
-                    <v>5802603</v>
+                    <v>5802824</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -26313,7 +26689,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5802603</v>
+                                    <v>5802824</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26349,11 +26725,11 @@
         </relation>
         <relation>
             <name>numtemplatearguments</name>
-            <cardinality>627938</cardinality>
+            <cardinality>627369</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>627938</v>
+                    <v>627369</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -26371,7 +26747,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>627938</v>
+                                    <v>627369</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26455,23 +26831,23 @@
         </relation>
         <relation>
             <name>namequalifiers</name>
-            <cardinality>3041863</cardinality>
+            <cardinality>3041979</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3041863</v>
+                    <v>3041979</v>
                 </e>
                 <e>
                     <k>qualifiableelement</k>
-                    <v>3041863</v>
+                    <v>3041979</v>
                 </e>
                 <e>
                     <k>qualifyingelement</k>
-                    <v>47485</v>
+                    <v>47486</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>552436</v>
+                    <v>552457</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26485,7 +26861,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3041863</v>
+                                    <v>3041979</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26501,7 +26877,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3041863</v>
+                                    <v>3041979</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26517,7 +26893,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3041863</v>
+                                    <v>3041979</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26533,7 +26909,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3041863</v>
+                                    <v>3041979</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26549,7 +26925,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3041863</v>
+                                    <v>3041979</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26565,7 +26941,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3041863</v>
+                                    <v>3041979</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26581,12 +26957,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31541</v>
+                                    <v>31543</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8175</v>
+                                    <v>8176</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -26617,12 +26993,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31541</v>
+                                    <v>31543</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8175</v>
+                                    <v>8176</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -26653,7 +27029,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>34403</v>
+                                    <v>34404</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26684,22 +27060,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>79134</v>
+                                    <v>79137</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>38104</v>
+                                    <v>38105</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>398986</v>
+                                    <v>399001</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>192</b>
-                                    <v>36210</v>
+                                    <v>36212</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26715,22 +27091,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>79134</v>
+                                    <v>79137</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>38104</v>
+                                    <v>38105</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>398986</v>
+                                    <v>399001</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>192</b>
-                                    <v>36210</v>
+                                    <v>36212</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26746,22 +27122,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>111537</v>
+                                    <v>111541</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>13296</v>
+                                    <v>13297</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>415295</v>
+                                    <v>415311</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>33</b>
-                                    <v>12306</v>
+                                    <v>12307</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26771,15 +27147,15 @@
         </relation>
         <relation>
             <name>varbind</name>
-            <cardinality>8254632</cardinality>
+            <cardinality>8254629</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>8254632</v>
+                    <v>8254629</v>
                 </e>
                 <e>
                     <k>var</k>
-                    <v>1050376</v>
+                    <v>1050375</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26793,7 +27169,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8254632</v>
+                                    <v>8254629</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26829,7 +27205,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>83151</v>
+                                    <v>83150</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -26864,15 +27240,15 @@
         </relation>
         <relation>
             <name>funbind</name>
-            <cardinality>5812199</cardinality>
+            <cardinality>5812528</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>5809833</v>
+                    <v>5810054</v>
                 </e>
                 <e>
                     <k>fun</k>
-                    <v>275916</v>
+                    <v>275948</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26886,12 +27262,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5807466</v>
+                                    <v>5807579</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2366</v>
+                                    <v>2474</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26907,27 +27283,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>181420</v>
+                                    <v>181448</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>38835</v>
+                                    <v>38837</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>17212</v>
+                                    <v>17191</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>22720</v>
+                                    <v>22742</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>37798</b>
-                                    <v>15727</v>
+                                    <v>15728</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26937,11 +27313,11 @@
         </relation>
         <relation>
             <name>expr_allocator</name>
-            <cardinality>45243</cardinality>
+            <cardinality>45244</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>45243</v>
+                    <v>45244</v>
                 </e>
                 <e>
                     <k>func</k>
@@ -26963,7 +27339,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>45243</v>
+                                    <v>45244</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26979,7 +27355,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>45243</v>
+                                    <v>45244</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27210,15 +27586,15 @@
         </relation>
         <relation>
             <name>expr_cond_guard</name>
-            <cardinality>897880</cardinality>
+            <cardinality>897879</cardinality>
             <columnsizes>
                 <e>
                     <k>cond</k>
-                    <v>897880</v>
+                    <v>897879</v>
                 </e>
                 <e>
                     <k>guard</k>
-                    <v>897880</v>
+                    <v>897879</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27232,7 +27608,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>897880</v>
+                                    <v>897879</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27248,7 +27624,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>897880</v>
+                                    <v>897879</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27306,15 +27682,15 @@
         </relation>
         <relation>
             <name>expr_cond_false</name>
-            <cardinality>897880</cardinality>
+            <cardinality>897879</cardinality>
             <columnsizes>
                 <e>
                     <k>cond</k>
-                    <v>897880</v>
+                    <v>897879</v>
                 </e>
                 <e>
                     <k>false</k>
-                    <v>897880</v>
+                    <v>897879</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27328,7 +27704,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>897880</v>
+                                    <v>897879</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27344,7 +27720,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>897880</v>
+                                    <v>897879</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27354,11 +27730,11 @@
         </relation>
         <relation>
             <name>values</name>
-            <cardinality>13474606</cardinality>
+            <cardinality>13474601</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>13474606</v>
+                    <v>13474601</v>
                 </e>
                 <e>
                     <k>str</k>
@@ -27376,7 +27752,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13474606</v>
+                                    <v>13474601</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27422,11 +27798,11 @@
         </relation>
         <relation>
             <name>valuetext</name>
-            <cardinality>6647578</cardinality>
+            <cardinality>6647456</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>6647578</v>
+                    <v>6647456</v>
                 </e>
                 <e>
                     <k>text</k>
@@ -27444,7 +27820,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6647578</v>
+                                    <v>6647456</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27485,15 +27861,15 @@
         </relation>
         <relation>
             <name>valuebind</name>
-            <cardinality>13583189</cardinality>
+            <cardinality>13583183</cardinality>
             <columnsizes>
                 <e>
                     <k>val</k>
-                    <v>13474606</v>
+                    <v>13474601</v>
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>13583189</v>
+                    <v>13583183</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27507,7 +27883,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13384052</v>
+                                    <v>13384046</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27528,7 +27904,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13583189</v>
+                                    <v>13583183</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27538,15 +27914,15 @@
         </relation>
         <relation>
             <name>fieldoffsets</name>
-            <cardinality>1496815</cardinality>
+            <cardinality>1497674</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1496815</v>
+                    <v>1497674</v>
                 </e>
                 <e>
                     <k>byteoffset</k>
-                    <v>31370</v>
+                    <v>31367</v>
                 </e>
                 <e>
                     <k>bitoffset</k>
@@ -27564,7 +27940,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1496815</v>
+                                    <v>1497674</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27580,7 +27956,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1496815</v>
+                                    <v>1497674</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27596,7 +27972,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17700</v>
+                                    <v>17698</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27611,7 +27987,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>12</b>
-                                    <v>2614</v>
+                                    <v>2613</v>
                                 </b>
                                 <b>
                                     <a>12</a>
@@ -27625,7 +28001,7 @@
                                 </b>
                                 <b>
                                     <a>250</a>
-                                    <b>5947</b>
+                                    <b>5950</b>
                                     <v>1089</v>
                                 </b>
                             </bs>
@@ -27642,7 +28018,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30390</v>
+                                    <v>30386</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27696,8 +28072,8 @@
                                     <v>54</v>
                                 </b>
                                 <b>
-                                    <a>27127</a>
-                                    <b>27128</b>
+                                    <a>27146</a>
+                                    <b>27147</b>
                                     <v>54</v>
                                 </b>
                             </bs>
@@ -27739,19 +28115,19 @@
         </relation>
         <relation>
             <name>bitfield</name>
-            <cardinality>30341</cardinality>
+            <cardinality>30314</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>30341</v>
+                    <v>30314</v>
                 </e>
                 <e>
                     <k>bits</k>
-                    <v>3496</v>
+                    <v>3493</v>
                 </e>
                 <e>
                     <k>declared_bits</k>
-                    <v>3496</v>
+                    <v>3493</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27765,7 +28141,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30341</v>
+                                    <v>30314</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27781,7 +28157,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30341</v>
+                                    <v>30314</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27802,7 +28178,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>749</v>
+                                    <v>748</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -27848,7 +28224,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3496</v>
+                                    <v>3493</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27869,7 +28245,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>749</v>
+                                    <v>748</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -27915,7 +28291,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3496</v>
+                                    <v>3493</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27925,23 +28301,23 @@
         </relation>
         <relation>
             <name>initialisers</name>
-            <cardinality>2251035</cardinality>
+            <cardinality>2251321</cardinality>
             <columnsizes>
                 <e>
                     <k>init</k>
-                    <v>2251035</v>
+                    <v>2251321</v>
                 </e>
                 <e>
                     <k>var</k>
-                    <v>980971</v>
+                    <v>981178</v>
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>2251035</v>
+                    <v>2251321</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>516371</v>
+                    <v>516961</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27955,7 +28331,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2251035</v>
+                                    <v>2251321</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27971,7 +28347,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2251035</v>
+                                    <v>2251321</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27987,7 +28363,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2251035</v>
+                                    <v>2251321</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28003,17 +28379,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>870556</v>
+                                    <v>870758</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>15</b>
-                                    <v>37441</v>
+                                    <v>37448</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>25</b>
-                                    <v>72973</v>
+                                    <v>72972</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28029,17 +28405,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>870556</v>
+                                    <v>870758</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>15</b>
-                                    <v>37441</v>
+                                    <v>37448</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>25</b>
-                                    <v>72973</v>
+                                    <v>72972</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28055,7 +28431,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>980963</v>
+                                    <v>981170</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28076,7 +28452,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2251035</v>
+                                    <v>2251321</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28092,7 +28468,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2251035</v>
+                                    <v>2251321</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28108,7 +28484,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2251035</v>
+                                    <v>2251321</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28124,22 +28500,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>414356</v>
+                                    <v>415111</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>33606</v>
+                                    <v>33614</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>13</b>
-                                    <v>42250</v>
+                                    <v>42070</v>
                                 </b>
                                 <b>
                                     <a>13</a>
-                                    <b>111911</b>
-                                    <v>26157</v>
+                                    <b>111925</b>
+                                    <v>26165</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28155,17 +28531,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>443657</v>
+                                    <v>444412</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>34516</v>
+                                    <v>34524</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>12237</b>
-                                    <v>38196</v>
+                                    <b>12238</b>
+                                    <v>38025</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28181,22 +28557,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>414356</v>
+                                    <v>415111</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>33606</v>
+                                    <v>33614</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>13</b>
-                                    <v>42250</v>
+                                    <v>42070</v>
                                 </b>
                                 <b>
                                     <a>13</a>
-                                    <b>111911</b>
-                                    <v>26157</v>
+                                    <b>111925</b>
+                                    <v>26165</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28206,26 +28582,26 @@
         </relation>
         <relation>
             <name>braced_initialisers</name>
-            <cardinality>68468</cardinality>
+            <cardinality>68438</cardinality>
             <columnsizes>
                 <e>
                     <k>init</k>
-                    <v>68468</v>
+                    <v>68438</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>expr_ancestor</name>
-            <cardinality>1677619</cardinality>
+            <cardinality>1677683</cardinality>
             <columnsizes>
                 <e>
                     <k>exp</k>
-                    <v>1677619</v>
+                    <v>1677683</v>
                 </e>
                 <e>
                     <k>ancestor</k>
-                    <v>839627</v>
+                    <v>839659</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28239,7 +28615,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1677619</v>
+                                    <v>1677683</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28255,12 +28631,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17083</v>
+                                    <v>17084</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>812474</v>
+                                    <v>812505</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -28275,11 +28651,11 @@
         </relation>
         <relation>
             <name>exprs</name>
-            <cardinality>25210577</cardinality>
+            <cardinality>25210567</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>25210577</v>
+                    <v>25210567</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -28287,7 +28663,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>10582671</v>
+                    <v>10585854</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28301,7 +28677,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25210577</v>
+                                    <v>25210567</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28317,7 +28693,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25210577</v>
+                                    <v>25210567</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28477,8 +28853,8 @@
                                     <v>109</v>
                                 </b>
                                 <b>
-                                    <a>224080</a>
-                                    <b>224081</b>
+                                    <a>224225</a>
+                                    <b>224226</b>
                                     <v>21</v>
                                 </b>
                             </bs>
@@ -28495,7 +28871,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8900701</v>
+                                    <v>8903885</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28505,7 +28881,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>16</b>
-                                    <v>797199</v>
+                                    <v>797198</v>
                                 </b>
                                 <b>
                                     <a>16</a>
@@ -28526,12 +28902,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9040103</v>
+                                    <v>9043287</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>774273</v>
+                                    <v>774272</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -28546,15 +28922,15 @@
         </relation>
         <relation>
             <name>expr_reuse</name>
-            <cardinality>847007</cardinality>
+            <cardinality>847039</cardinality>
             <columnsizes>
                 <e>
                     <k>reuse</k>
-                    <v>847007</v>
+                    <v>847039</v>
                 </e>
                 <e>
                     <k>original</k>
-                    <v>847007</v>
+                    <v>847039</v>
                 </e>
                 <e>
                     <k>value_category</k>
@@ -28572,7 +28948,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>847007</v>
+                                    <v>847039</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28588,7 +28964,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>847007</v>
+                                    <v>847039</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28604,7 +28980,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>847007</v>
+                                    <v>847039</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28620,7 +28996,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>847007</v>
+                                    <v>847039</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28672,11 +29048,11 @@
         </relation>
         <relation>
             <name>expr_types</name>
-            <cardinality>25210577</cardinality>
+            <cardinality>25210567</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>25210577</v>
+                    <v>25210567</v>
                 </e>
                 <e>
                     <k>typeid</k>
@@ -28698,7 +29074,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25210577</v>
+                                    <v>25210567</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28714,7 +29090,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25210577</v>
+                                    <v>25210567</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28859,11 +29235,11 @@
         </relation>
         <relation>
             <name>new_allocated_type</name>
-            <cardinality>46197</cardinality>
+            <cardinality>46198</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>46197</v>
+                    <v>46198</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -28881,7 +29257,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46197</v>
+                                    <v>46198</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30316,15 +30692,15 @@
         </relation>
         <relation>
             <name>condition_decl_bind</name>
-            <cardinality>408905</cardinality>
+            <cardinality>408920</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>408905</v>
+                    <v>408920</v>
                 </e>
                 <e>
                     <k>decl</k>
-                    <v>408905</v>
+                    <v>408920</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30338,7 +30714,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>408905</v>
+                                    <v>408920</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30354,7 +30730,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>408905</v>
+                                    <v>408920</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30422,15 +30798,15 @@
         </relation>
         <relation>
             <name>uuidof_bind</name>
-            <cardinality>26588</cardinality>
+            <cardinality>26677</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>26588</v>
+                    <v>26677</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>26336</v>
+                    <v>26425</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30444,7 +30820,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26588</v>
+                                    <v>26677</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30460,7 +30836,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26125</v>
+                                    <v>26214</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -30475,11 +30851,11 @@
         </relation>
         <relation>
             <name>sizeof_bind</name>
-            <cardinality>242027</cardinality>
+            <cardinality>242026</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>242027</v>
+                    <v>242026</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -30497,7 +30873,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>242027</v>
+                                    <v>242026</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30852,11 +31228,11 @@
         </relation>
         <relation>
             <name>lambda_capture</name>
-            <cardinality>31966</cardinality>
+            <cardinality>31965</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>31966</v>
+                    <v>31965</v>
                 </e>
                 <e>
                     <k>lambda</k>
@@ -30868,7 +31244,7 @@
                 </e>
                 <e>
                     <k>field</k>
-                    <v>31966</v>
+                    <v>31965</v>
                 </e>
                 <e>
                     <k>captured_by_reference</k>
@@ -30894,7 +31270,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31966</v>
+                                    <v>31965</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30910,7 +31286,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31966</v>
+                                    <v>31965</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30926,7 +31302,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31966</v>
+                                    <v>31965</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30942,7 +31318,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31966</v>
+                                    <v>31965</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30958,7 +31334,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31966</v>
+                                    <v>31965</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30974,7 +31350,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31966</v>
+                                    <v>31965</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31602,7 +31978,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31966</v>
+                                    <v>31965</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31618,7 +31994,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31966</v>
+                                    <v>31965</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31634,7 +32010,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31966</v>
+                                    <v>31965</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31650,7 +32026,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31966</v>
+                                    <v>31965</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31666,7 +32042,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31966</v>
+                                    <v>31965</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31682,7 +32058,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31966</v>
+                                    <v>31965</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31992,7 +32368,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17254</v>
+                                    <v>17253</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -32196,11 +32572,11 @@
         </relation>
         <relation>
             <name>stmts</name>
-            <cardinality>6368968</cardinality>
+            <cardinality>6368836</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>6368968</v>
+                    <v>6368836</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -32208,7 +32584,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2684538</v>
+                    <v>2684483</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -32222,7 +32598,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6368968</v>
+                                    <v>6368836</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32238,7 +32614,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6368968</v>
+                                    <v>6368836</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32476,22 +32852,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2225039</v>
+                                    <v>2224993</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>182234</v>
+                                    <v>182231</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>10</b>
-                                    <v>202178</v>
+                                    <v>202173</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>1789</b>
-                                    <v>75085</v>
+                                    <v>75084</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32507,12 +32883,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2601581</v>
+                                    <v>2601527</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>10</b>
-                                    <v>82957</v>
+                                    <v>82955</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32725,15 +33101,15 @@
         </relation>
         <relation>
             <name>if_else</name>
-            <cardinality>437090</cardinality>
+            <cardinality>437107</cardinality>
             <columnsizes>
                 <e>
                     <k>if_stmt</k>
-                    <v>437090</v>
+                    <v>437107</v>
                 </e>
                 <e>
                     <k>else_id</k>
-                    <v>437090</v>
+                    <v>437107</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -32747,7 +33123,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>437090</v>
+                                    <v>437107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32763,7 +33139,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>437090</v>
+                                    <v>437107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32821,15 +33197,15 @@
         </relation>
         <relation>
             <name>constexpr_if_then</name>
-            <cardinality>106134</cardinality>
+            <cardinality>106037</cardinality>
             <columnsizes>
                 <e>
                     <k>constexpr_if_stmt</k>
-                    <v>106134</v>
+                    <v>106037</v>
                 </e>
                 <e>
                     <k>then_id</k>
-                    <v>106134</v>
+                    <v>106037</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -32843,7 +33219,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>106134</v>
+                                    <v>106037</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32859,7 +33235,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>106134</v>
+                                    <v>106037</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32869,15 +33245,15 @@
         </relation>
         <relation>
             <name>constexpr_if_else</name>
-            <cardinality>76166</cardinality>
+            <cardinality>76097</cardinality>
             <columnsizes>
                 <e>
                     <k>constexpr_if_stmt</k>
-                    <v>76166</v>
+                    <v>76097</v>
                 </e>
                 <e>
                     <k>else_id</k>
-                    <v>76166</v>
+                    <v>76097</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -32891,7 +33267,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>76166</v>
+                                    <v>76097</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32907,7 +33283,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>76166</v>
+                                    <v>76097</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33157,11 +33533,11 @@
         </relation>
         <relation>
             <name>switch_case</name>
-            <cardinality>836120</cardinality>
+            <cardinality>836152</cardinality>
             <columnsizes>
                 <e>
                     <k>switch_stmt</k>
-                    <v>411852</v>
+                    <v>411868</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -33169,7 +33545,7 @@
                 </e>
                 <e>
                     <k>case_id</k>
-                    <v>836120</v>
+                    <v>836152</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -33188,7 +33564,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>408969</v>
+                                    <v>408985</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -33214,7 +33590,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>408969</v>
+                                    <v>408985</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -33377,7 +33753,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>836120</v>
+                                    <v>836152</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33393,7 +33769,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>836120</v>
+                                    <v>836152</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33403,15 +33779,15 @@
         </relation>
         <relation>
             <name>switch_body</name>
-            <cardinality>411852</cardinality>
+            <cardinality>411868</cardinality>
             <columnsizes>
                 <e>
                     <k>switch_stmt</k>
-                    <v>411852</v>
+                    <v>411868</v>
                 </e>
                 <e>
                     <k>body_id</k>
-                    <v>411852</v>
+                    <v>411868</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -33425,7 +33801,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>411852</v>
+                                    <v>411868</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33441,7 +33817,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>411852</v>
+                                    <v>411868</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33643,11 +34019,11 @@
         </relation>
         <relation>
             <name>stmtparents</name>
-            <cardinality>5628380</cardinality>
+            <cardinality>5628263</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5628380</v>
+                    <v>5628263</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -33655,7 +34031,7 @@
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>2381490</v>
+                    <v>2381441</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -33669,7 +34045,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5628380</v>
+                                    <v>5628263</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33685,7 +34061,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5628380</v>
+                                    <v>5628263</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33721,7 +34097,7 @@
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>1316</v>
+                                    <v>1315</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -33782,7 +34158,7 @@
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>1316</v>
+                                    <v>1315</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -33823,27 +34199,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1359015</v>
+                                    <v>1358987</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>517378</v>
+                                    <v>517368</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>151519</v>
+                                    <v>151516</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>155727</v>
+                                    <v>155724</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>16</b>
-                                    <v>178871</v>
+                                    <v>178868</v>
                                 </b>
                                 <b>
                                     <a>16</a>
@@ -33864,27 +34240,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1359015</v>
+                                    <v>1358987</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>517378</v>
+                                    <v>517368</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>151519</v>
+                                    <v>151516</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>155727</v>
+                                    <v>155724</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>16</b>
-                                    <v>178871</v>
+                                    <v>178868</v>
                                 </b>
                                 <b>
                                     <a>16</a>
@@ -33899,22 +34275,22 @@
         </relation>
         <relation>
             <name>ishandler</name>
-            <cardinality>43746</cardinality>
+            <cardinality>43781</cardinality>
             <columnsizes>
                 <e>
                     <k>block</k>
-                    <v>43746</v>
+                    <v>43781</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>stmt_decl_bind</name>
-            <cardinality>725885</cardinality>
+            <cardinality>725870</cardinality>
             <columnsizes>
                 <e>
                     <k>stmt</k>
-                    <v>715316</v>
+                    <v>715301</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -33922,7 +34298,7 @@
                 </e>
                 <e>
                     <k>decl</k>
-                    <v>725885</v>
+                    <v>725870</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -33936,7 +34312,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>707850</v>
+                                    <v>707836</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -33957,7 +34333,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>707850</v>
+                                    <v>707836</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -34090,7 +34466,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>725885</v>
+                                    <v>725870</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34106,7 +34482,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>725885</v>
+                                    <v>725870</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34116,11 +34492,11 @@
         </relation>
         <relation>
             <name>stmt_decl_entry_bind</name>
-            <cardinality>725885</cardinality>
+            <cardinality>725870</cardinality>
             <columnsizes>
                 <e>
                     <k>stmt</k>
-                    <v>715316</v>
+                    <v>715301</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -34128,7 +34504,7 @@
                 </e>
                 <e>
                     <k>decl_entry</k>
-                    <v>725885</v>
+                    <v>725870</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34142,7 +34518,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>707850</v>
+                                    <v>707836</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -34163,7 +34539,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>707850</v>
+                                    <v>707836</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -34296,7 +34672,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>725885</v>
+                                    <v>725870</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34312,7 +34688,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>725885</v>
+                                    <v>725870</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34322,15 +34698,15 @@
         </relation>
         <relation>
             <name>blockscope</name>
-            <cardinality>1644952</cardinality>
+            <cardinality>1644335</cardinality>
             <columnsizes>
                 <e>
                     <k>block</k>
-                    <v>1644952</v>
+                    <v>1644335</v>
                 </e>
                 <e>
                     <k>enclosing</k>
-                    <v>1428064</v>
+                    <v>1427145</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34344,7 +34720,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1644952</v>
+                                    <v>1644335</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34360,17 +34736,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1295584</v>
+                                    <v>1294535</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>117122</v>
+                                    <v>117265</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>28</b>
-                                    <v>15358</v>
+                                    <b>29</b>
+                                    <v>15344</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34561,19 +34937,19 @@
         </relation>
         <relation>
             <name>preprocdirects</name>
-            <cardinality>5413334</cardinality>
+            <cardinality>5408430</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5413334</v>
+                    <v>5408430</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>1373</v>
+                    <v>1372</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>5410088</v>
+                    <v>5405187</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34587,7 +34963,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5413334</v>
+                                    <v>5408430</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34603,7 +34979,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5413334</v>
+                                    <v>5408430</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34751,7 +35127,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5409963</v>
+                                    <v>5405062</v>
                                 </b>
                                 <b>
                                     <a>27</a>
@@ -34772,7 +35148,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5410088</v>
+                                    <v>5405187</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34782,15 +35158,15 @@
         </relation>
         <relation>
             <name>preprocpair</name>
-            <cardinality>1142251</cardinality>
+            <cardinality>1141217</cardinality>
             <columnsizes>
                 <e>
                     <k>begin</k>
-                    <v>889777</v>
+                    <v>888971</v>
                 </e>
                 <e>
                     <k>elseelifend</k>
-                    <v>1142251</v>
+                    <v>1141217</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34804,17 +35180,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>650164</v>
+                                    <v>649575</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>230622</v>
+                                    <v>230414</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>9</b>
-                                    <v>8990</v>
+                                    <v>8982</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34830,7 +35206,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1142251</v>
+                                    <v>1141217</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34840,41 +35216,41 @@
         </relation>
         <relation>
             <name>preproctrue</name>
-            <cardinality>439769</cardinality>
+            <cardinality>439371</cardinality>
             <columnsizes>
                 <e>
                     <k>branch</k>
-                    <v>439769</v>
+                    <v>439371</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>preprocfalse</name>
-            <cardinality>285562</cardinality>
+            <cardinality>285304</cardinality>
             <columnsizes>
                 <e>
                     <k>branch</k>
-                    <v>285562</v>
+                    <v>285304</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>preproctext</name>
-            <cardinality>4356364</cardinality>
+            <cardinality>4352418</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4356364</v>
+                    <v>4352418</v>
                 </e>
                 <e>
                     <k>head</k>
-                    <v>2957767</v>
+                    <v>2955088</v>
                 </e>
                 <e>
                     <k>body</k>
-                    <v>1684908</v>
+                    <v>1683382</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34888,7 +35264,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4356364</v>
+                                    <v>4352418</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34904,7 +35280,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4356364</v>
+                                    <v>4352418</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34920,12 +35296,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2758985</v>
+                                    <v>2756485</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>798</b>
-                                    <v>198782</v>
+                                    <v>198602</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34941,12 +35317,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2876481</v>
+                                    <v>2873875</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>81286</v>
+                                    <v>81212</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34962,17 +35338,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1536570</v>
+                                    <v>1535178</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>10</b>
-                                    <v>127360</v>
+                                    <v>127245</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>13606</b>
-                                    <v>20977</v>
+                                    <v>20958</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34988,17 +35364,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1540816</v>
+                                    <v>1539420</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>12</b>
-                                    <v>126986</v>
+                                    <v>126871</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>3246</b>
-                                    <v>17106</v>
+                                    <v>17090</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35008,15 +35384,15 @@
         </relation>
         <relation>
             <name>includes</name>
-            <cardinality>318629</cardinality>
+            <cardinality>318638</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>318629</v>
+                    <v>318638</v>
                 </e>
                 <e>
                     <k>included</k>
-                    <v>58694</v>
+                    <v>58695</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35030,7 +35406,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>318629</v>
+                                    <v>318638</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35134,11 +35510,11 @@
         </relation>
         <relation>
             <name>link_parent</name>
-            <cardinality>30398086</cardinality>
+            <cardinality>30398238</cardinality>
             <columnsizes>
                 <e>
                     <k>element</k>
-                    <v>3866101</v>
+                    <v>3866121</v>
                 </e>
                 <e>
                     <k>link_target</k>
@@ -35156,7 +35532,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>530457</v>
+                                    <v>530459</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -35166,7 +35542,7 @@
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>3308696</v>
+                                    <v>3308712</v>
                                 </b>
                             </bs>
                         </hist>
diff --git a/cpp/ql/lib/upgrades/5340d6d5f428557632b1a50113e406430f29ef7d/old.dbscheme b/cpp/ql/lib/upgrades/5340d6d5f428557632b1a50113e406430f29ef7d/old.dbscheme
new file mode 100644
index 00000000000..5340d6d5f42
--- /dev/null
+++ b/cpp/ql/lib/upgrades/5340d6d5f428557632b1a50113e406430f29ef7d/old.dbscheme
@@ -0,0 +1,2423 @@
+/*- Compilations -*/
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- C++ dbscheme -*/
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location_default ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+case @function.kind of
+  0 = @unknown_function
+| 1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+// ... 6 = @builtin_function deprecated    // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+builtin_functions(
+    int id: @function ref
+)
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+| 40 = @decimal32             // _Decimal32
+| 41 = @decimal64             // _Decimal64
+| 42 = @decimal128            // _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+| 62 = @mfp8                  // __mfp8
+| 63 = @scalable_vector_count // __SVCount_t
+| 64 = @complex_fp16          // _Complex __fp16
+| 65 = @complex_std_bfloat16  // _Complex __bf16
+| 66 = @complex_std_float16   // _Complex std::float16_t
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+| 11 = @scalable_vector // Arm SVE
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+tupleelements(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+case @type_operator.kind of
+   0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+case @usertype.kind of
+   0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location_default ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+namespaceattributes(
+    int namespace_id: @namespace ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_default ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+|  40 = @stmt_leave
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue | @stmt_leave;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
diff --git a/cpp/ql/lib/upgrades/5340d6d5f428557632b1a50113e406430f29ef7d/semmlecode.cpp.dbscheme b/cpp/ql/lib/upgrades/5340d6d5f428557632b1a50113e406430f29ef7d/semmlecode.cpp.dbscheme
new file mode 100644
index 00000000000..c16b29b27f7
--- /dev/null
+++ b/cpp/ql/lib/upgrades/5340d6d5f428557632b1a50113e406430f29ef7d/semmlecode.cpp.dbscheme
@@ -0,0 +1,2436 @@
+/*- Compilations -*/
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- C++ dbscheme -*/
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+pch_uses(
+    int pch: @pch ref,
+    int compilation: @compilation ref,
+    int id: @file ref
+)
+
+#keyset[pch, compilation]
+pch_creations(
+    int pch: @pch,
+    int compilation: @compilation ref,
+    int from: @file ref
+)
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location_default ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+case @function.kind of
+  0 = @unknown_function
+| 1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+// ... 6 = @builtin_function deprecated    // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+builtin_functions(
+    int id: @function ref
+)
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+| 40 = @decimal32             // _Decimal32
+| 41 = @decimal64             // _Decimal64
+| 42 = @decimal128            // _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+| 62 = @mfp8                  // __mfp8
+| 63 = @scalable_vector_count // __SVCount_t
+| 64 = @complex_fp16          // _Complex __fp16
+| 65 = @complex_std_bfloat16  // _Complex __bf16
+| 66 = @complex_std_float16   // _Complex std::float16_t
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+| 11 = @scalable_vector // Arm SVE
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+tupleelements(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+case @type_operator.kind of
+   0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+case @usertype.kind of
+   0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location_default ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+namespaceattributes(
+    int namespace_id: @namespace ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_default ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+|  40 = @stmt_leave
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue | @stmt_leave;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
diff --git a/cpp/ql/lib/upgrades/5340d6d5f428557632b1a50113e406430f29ef7d/upgrade.properties b/cpp/ql/lib/upgrades/5340d6d5f428557632b1a50113e406430f29ef7d/upgrade.properties
new file mode 100644
index 00000000000..d8e09e944fe
--- /dev/null
+++ b/cpp/ql/lib/upgrades/5340d6d5f428557632b1a50113e406430f29ef7d/upgrade.properties
@@ -0,0 +1,2 @@
+description: Link PCH creations and uses
+compatibility: backwards
diff --git a/cpp/ql/lib/upgrades/c16b29b27f71247023321cc0d0360998b318837c/old.dbscheme b/cpp/ql/lib/upgrades/c16b29b27f71247023321cc0d0360998b318837c/old.dbscheme
new file mode 100644
index 00000000000..c16b29b27f7
--- /dev/null
+++ b/cpp/ql/lib/upgrades/c16b29b27f71247023321cc0d0360998b318837c/old.dbscheme
@@ -0,0 +1,2436 @@
+/*- Compilations -*/
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- C++ dbscheme -*/
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+pch_uses(
+    int pch: @pch ref,
+    int compilation: @compilation ref,
+    int id: @file ref
+)
+
+#keyset[pch, compilation]
+pch_creations(
+    int pch: @pch,
+    int compilation: @compilation ref,
+    int from: @file ref
+)
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location_default ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+case @function.kind of
+  0 = @unknown_function
+| 1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+// ... 6 = @builtin_function deprecated    // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+builtin_functions(
+    int id: @function ref
+)
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+| 40 = @decimal32             // _Decimal32
+| 41 = @decimal64             // _Decimal64
+| 42 = @decimal128            // _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+| 62 = @mfp8                  // __mfp8
+| 63 = @scalable_vector_count // __SVCount_t
+| 64 = @complex_fp16          // _Complex __fp16
+| 65 = @complex_std_bfloat16  // _Complex __bf16
+| 66 = @complex_std_float16   // _Complex std::float16_t
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+| 11 = @scalable_vector // Arm SVE
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+tupleelements(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+case @type_operator.kind of
+   0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+case @usertype.kind of
+   0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location_default ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+namespaceattributes(
+    int namespace_id: @namespace ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_default ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+|  40 = @stmt_leave
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue | @stmt_leave;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
diff --git a/cpp/ql/lib/upgrades/c16b29b27f71247023321cc0d0360998b318837c/semmlecode.cpp.dbscheme b/cpp/ql/lib/upgrades/c16b29b27f71247023321cc0d0360998b318837c/semmlecode.cpp.dbscheme
new file mode 100644
index 00000000000..2121ffec11f
--- /dev/null
+++ b/cpp/ql/lib/upgrades/c16b29b27f71247023321cc0d0360998b318837c/semmlecode.cpp.dbscheme
@@ -0,0 +1,2437 @@
+/*- Compilations -*/
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- C++ dbscheme -*/
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+pch_uses(
+    int pch: @pch ref,
+    int compilation: @compilation ref,
+    int id: @file ref
+)
+
+#keyset[pch, compilation]
+pch_creations(
+    int pch: @pch,
+    int compilation: @compilation ref,
+    int from: @file ref
+)
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location_default ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+case @function.kind of
+  0 = @unknown_function
+| 1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+// ... 6 = @builtin_function deprecated    // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+builtin_functions(
+    int id: @function ref
+)
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+| 40 = @decimal32             // _Decimal32
+| 41 = @decimal64             // _Decimal64
+| 42 = @decimal128            // _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+| 62 = @mfp8                  // __mfp8
+| 63 = @scalable_vector_count // __SVCount_t
+| 64 = @complex_fp16          // _Complex __fp16
+| 65 = @complex_std_bfloat16  // _Complex __bf16
+| 66 = @complex_std_float16   // _Complex std::float16_t
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+| 11 = @scalable_vector // Arm SVE
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+tupleelements(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+case @type_operator.kind of
+   0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+case @usertype.kind of
+   0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location_default ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+namespaceattributes(
+    int namespace_id: @namespace ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype
+                       | @decltype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_default ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+|  40 = @stmt_leave
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue | @stmt_leave;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
diff --git a/cpp/ql/lib/upgrades/c16b29b27f71247023321cc0d0360998b318837c/upgrade.properties b/cpp/ql/lib/upgrades/c16b29b27f71247023321cc0d0360998b318837c/upgrade.properties
new file mode 100644
index 00000000000..a951593a337
--- /dev/null
+++ b/cpp/ql/lib/upgrades/c16b29b27f71247023321cc0d0360998b318837c/upgrade.properties
@@ -0,0 +1,2 @@
+description: Fix decltype qualifier issue
+compatibility: full
diff --git a/cpp/ql/src/Best Practices/Magic Constants/MagicConstants.qll b/cpp/ql/src/Best Practices/Magic Constants/MagicConstants.qll
index 53e33ab4fa5..03384076483 100644
--- a/cpp/ql/src/Best Practices/Magic Constants/MagicConstants.qll	
+++ b/cpp/ql/src/Best Practices/Magic Constants/MagicConstants.qll	
@@ -164,12 +164,17 @@ predicate valueOccurrenceCount(string value, int n) {
   n > 20
 }
 
-predicate occurenceCount(Literal lit, string value, int n) {
+predicate occurrenceCount(Literal lit, string value, int n) {
   valueOccurrenceCount(value, n) and
   value = lit.getValue() and
   nonTrivialValue(_, lit)
 }
 
+/**
+ * DEPRECATED: Use `occurrenceCount` instead.
+ */
+deprecated predicate occurenceCount = occurrenceCount/3;
+
 /*
  * Literals repeated frequently
  */
@@ -178,7 +183,7 @@ predicate check(Literal lit, string value, int n, File f) {
   // Check that the literal is nontrivial
   not trivial(lit) and
   // Check that it is repeated a number of times
-  occurenceCount(lit, value, n) and
+  occurrenceCount(lit, value, n) and
   n > 20 and
   f = lit.getFile() and
   // Exclude generated files
diff --git a/cpp/ql/src/Best Practices/SloppyGlobal.ql b/cpp/ql/src/Best Practices/SloppyGlobal.ql
index 4c1935627d5..b20e0271db8 100644
--- a/cpp/ql/src/Best Practices/SloppyGlobal.ql	
+++ b/cpp/ql/src/Best Practices/SloppyGlobal.ql	
@@ -14,6 +14,9 @@ import semmle.code.cpp.ConfigurationTestFile
 from GlobalVariable gv
 where
   gv.getName().length() <= 3 and
+  // We will give an alert for the TemplateVariable, so we don't
+  // need to also give one for each instantiation
+  not gv instanceof VariableTemplateInstantiation and
   not gv.isStatic() and
   not gv.getFile() instanceof ConfigurationTestFile // variables in files generated during configuration are likely false positives
 select gv,
diff --git a/cpp/ql/src/CHANGELOG.md b/cpp/ql/src/CHANGELOG.md
index 589dfb68e1e..880cab8a58d 100644
--- a/cpp/ql/src/CHANGELOG.md
+++ b/cpp/ql/src/CHANGELOG.md
@@ -1,3 +1,40 @@
+## 1.5.3
+
+No user-facing changes.
+
+## 1.5.2
+
+No user-facing changes.
+
+## 1.5.1
+
+No user-facing changes.
+
+## 1.5.0
+
+### Major Analysis Improvements
+
+* The queries `cpp/wrong-type-format-argument`, `cpp/comparison-with-wider-type`, `cpp/integer-multiplication-cast-to-long`, `cpp/implicit-function-declaration` and `cpp/suspicious-add-sizeof` have had their precisions reduced from `high` to `medium`. They will also now give alerts for projects built with `build-mode: none`.
+* The queries `cpp/wrong-type-format-argument`, `cpp/comparison-with-wider-type`, `cpp/integer-multiplication-cast-to-long` and `cpp/suspicious-add-sizeof` are no longer included in the `code-scanning` suite.
+
+### Bug Fixes
+
+* The predicate `occurenceCount` in the file module `MagicConstants` has been deprecated. Use `occurrenceCount` instead.
+* The predicate `additionalAdditionOrSubstractionCheckForLeapYear` in the file module `LeapYear` has been deprecated. Use `additionalAdditionOrSubtractionCheckForLeapYear` instead.
+
+## 1.4.7
+
+### Bug Fixes
+
+* Fixed an inconsistency across languages where most have a `Customizations.qll` file for adding customizations, but not all did.
+
+## 1.4.6
+
+### Minor Analysis Improvements
+
+* The `cpp/short-global-name` query will no longer give alerts for instantiations of template variables, only for the template itself.
+* Fixed a false positive in `cpp/overflow-buffer` when the type of the destination buffer is a reference to a class/struct type.
+
 ## 1.4.5
 
 ### Minor Analysis Improvements
diff --git a/cpp/ql/src/Critical/OverflowDestination.ql b/cpp/ql/src/Critical/OverflowDestination.ql
index 4cfaaf8981b..f3f25dfa822 100644
--- a/cpp/ql/src/Critical/OverflowDestination.ql
+++ b/cpp/ql/src/Critical/OverflowDestination.ql
@@ -82,6 +82,14 @@ module OverflowDestinationConfig implements DataFlow::ConfigSig {
       nodeIsBarrierEqualityCandidate(node, access, checkedVar)
     )
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
+
+  Location getASelectedSinkLocation(DataFlow::Node sink) {
+    exists(FunctionCall fc | result = [fc.getLocation(), sink.getLocation()] |
+      sourceSized(fc, sink.asIndirectConvertedExpr())
+    )
+  }
 }
 
 module OverflowDestination = TaintTracking::Global<OverflowDestinationConfig>;
diff --git a/cpp/ql/src/Critical/ScanfChecks.qll b/cpp/ql/src/Critical/ScanfChecks.qll
index 340c52a3b93..0e191cc833c 100644
--- a/cpp/ql/src/Critical/ScanfChecks.qll
+++ b/cpp/ql/src/Critical/ScanfChecks.qll
@@ -4,13 +4,9 @@ private import semmle.code.cpp.controlflow.IRGuards
 private import semmle.code.cpp.ir.ValueNumbering
 
 private predicate exprInBooleanContext(Expr e) {
-  exists(IRGuardCondition gc |
-    exists(Instruction i |
-      i.getUnconvertedResultExpression() = e and
-      gc.comparesEq(valueNumber(i).getAUse(), 0, _, _)
-    )
-    or
-    gc.getUnconvertedResultExpression() = e
+  exists(IRGuardCondition gc, Instruction i |
+    i.getUnconvertedResultExpression() = e and
+    gc.comparesEq(valueNumber(i).getAUse(), 0, _, _)
   )
 }
 
@@ -36,20 +32,18 @@ private string getEofValue() {
  * Holds if the value of `call` has been checked to not equal `EOF`.
  */
 private predicate checkedForEof(ScanfFunctionCall call) {
-  exists(IRGuardCondition gc |
-    exists(CallInstruction i | i.getUnconvertedResultExpression() = call |
-      exists(int val | gc.comparesEq(valueNumber(i).getAUse(), val, _, _) |
-        // call == EOF
-        val = getEofValue().toInt()
-        or
-        // call == [any positive number]
-        val > 0
-      )
+  exists(IRGuardCondition gc, CallInstruction i | i.getUnconvertedResultExpression() = call |
+    exists(int val | gc.comparesEq(valueNumber(i).getAUse(), val, _, _) |
+      // call == EOF
+      val = getEofValue().toInt()
       or
-      exists(int val | gc.comparesLt(valueNumber(i).getAUse(), val, true, _) |
-        // call < [any non-negative number] (EOF is guaranteed to be negative)
-        val >= 0
-      )
+      // call == [any positive number]
+      val > 0
+    )
+    or
+    exists(int val | gc.comparesLt(valueNumber(i).getAUse(), val, true, _) |
+      // call < [any non-negative number] (EOF is guaranteed to be negative)
+      val >= 0
     )
   )
 }
diff --git a/cpp/ql/src/Likely Bugs/Arithmetic/IntMultToLong.ql b/cpp/ql/src/Likely Bugs/Arithmetic/IntMultToLong.ql
index 7eb465d35a9..a54ac9020c8 100644
--- a/cpp/ql/src/Likely Bugs/Arithmetic/IntMultToLong.ql	
+++ b/cpp/ql/src/Likely Bugs/Arithmetic/IntMultToLong.ql	
@@ -5,7 +5,7 @@
  * @kind problem
  * @problem.severity warning
  * @security-severity 8.1
- * @precision high
+ * @precision medium
  * @id cpp/integer-multiplication-cast-to-long
  * @tags reliability
  *       security
@@ -179,7 +179,6 @@ predicate overflows(MulExpr me, Type t) {
 
 from MulExpr me, Type t1, Type t2
 where
-  not any(Compilation c).buildModeNone() and
   t1 = me.getType().getUnderlyingType() and
   t2 = me.getConversion().getType().getUnderlyingType() and
   t1.getSize() < t2.getSize() and
diff --git a/cpp/ql/src/Likely Bugs/Format/NonConstantFormat.ql b/cpp/ql/src/Likely Bugs/Format/NonConstantFormat.ql
index 62c3c98e197..ed39b8da5cd 100644
--- a/cpp/ql/src/Likely Bugs/Format/NonConstantFormat.ql	
+++ b/cpp/ql/src/Likely Bugs/Format/NonConstantFormat.ql	
@@ -168,6 +168,17 @@ module NonConstFlowConfig implements DataFlow::ConfigSig {
       cannotContainString(t)
     )
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
+
+  Location getASelectedSinkLocation(DataFlow::Node sink) {
+    exists(FormattingFunctionCall call, Expr formatString |
+      result = [call.getLocation(), sink.getLocation()]
+    |
+      isSinkImpl(sink, formatString) and
+      call.getArgument(call.getFormatParameterIndex()) = formatString
+    )
+  }
 }
 
 module NonConstFlow = TaintTracking::Global<NonConstFlowConfig>;
diff --git a/cpp/ql/src/Likely Bugs/Format/WrongTypeFormatArguments.ql b/cpp/ql/src/Likely Bugs/Format/WrongTypeFormatArguments.ql
index 02975d2bdca..33fe3a0b7a1 100644
--- a/cpp/ql/src/Likely Bugs/Format/WrongTypeFormatArguments.ql	
+++ b/cpp/ql/src/Likely Bugs/Format/WrongTypeFormatArguments.ql	
@@ -5,7 +5,7 @@
  * @kind problem
  * @problem.severity error
  * @security-severity 7.5
- * @precision high
+ * @precision medium
  * @id cpp/wrong-type-format-argument
  * @tags reliability
  *       correctness
@@ -154,7 +154,6 @@ int sizeof_IntType() { exists(IntType it | result = it.getSize()) }
 
 from FormattingFunctionCall ffc, int n, Expr arg, Type expected, Type actual
 where
-  not any(Compilation c).buildModeNone() and
   (
     formattingFunctionCallExpectedType(ffc, n, expected) and
     formattingFunctionCallActualType(ffc, n, arg, actual) and
diff --git a/cpp/ql/src/Likely Bugs/Leap Year/LeapYear.qll b/cpp/ql/src/Likely Bugs/Leap Year/LeapYear.qll
index 3cff86412e4..2b68730fa58 100644
--- a/cpp/ql/src/Likely Bugs/Leap Year/LeapYear.qll	
+++ b/cpp/ql/src/Likely Bugs/Leap Year/LeapYear.qll	
@@ -128,11 +128,18 @@ abstract class LeapYearFieldAccess extends YearFieldAccess {
   /**
    * Holds if the top-level binary operation includes an addition or subtraction operator with an operand specified by `valueToCheck`.
    */
-  predicate additionalAdditionOrSubstractionCheckForLeapYear(int valueToCheck) {
+  predicate additionalAdditionOrSubtractionCheckForLeapYear(int valueToCheck) {
     additionalLogicalCheck(this, "+", valueToCheck) or
     additionalLogicalCheck(this, "-", valueToCheck)
   }
 
+  /**
+   * DEPRECATED: Use `additionalAdditionOrSubtractionCheckForLeapYear` instead.
+   */
+  deprecated predicate additionalAdditionOrSubstractionCheckForLeapYear(int valueToCheck) {
+    this.additionalAdditionOrSubtractionCheckForLeapYear(valueToCheck)
+  }
+
   /**
    * Holds if this object is used on a modulus 4 operation, which would likely indicate the start of a leap year check.
    */
@@ -180,13 +187,13 @@ class StructTmLeapYearFieldAccess extends LeapYearFieldAccess {
     this.additionalModulusCheckForLeapYear(100) and
     // tm_year represents years since 1900
     (
-      this.additionalAdditionOrSubstractionCheckForLeapYear(1900)
+      this.additionalAdditionOrSubtractionCheckForLeapYear(1900)
       or
       // some systems may use 2000 for 2-digit year conversions
-      this.additionalAdditionOrSubstractionCheckForLeapYear(2000)
+      this.additionalAdditionOrSubtractionCheckForLeapYear(2000)
       or
       // converting from/to Unix epoch
-      this.additionalAdditionOrSubstractionCheckForLeapYear(1970)
+      this.additionalAdditionOrSubtractionCheckForLeapYear(1970)
     )
   }
 }
@@ -215,6 +222,10 @@ private module LeapYearCheckConfig implements DataFlow::ConfigSig {
   predicate isSink(DataFlow::Node sink) {
     exists(ChecksForLeapYearFunctionCall fc | sink.asExpr() = fc.getAnArgument())
   }
+
+  predicate observeDiffInformedIncrementalMode() {
+    none() // only used negatively in UncheckedLeapYearAfterYearModification.ql
+  }
 }
 
 module LeapYearCheckFlow = DataFlow::Global<LeapYearCheckConfig>;
@@ -285,6 +296,14 @@ private module PossibleYearArithmeticOperationCheckConfig implements DataFlow::C
       aexpr.getLValue() = fa
     )
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
+
+  Location getASelectedSourceLocation(DataFlow::Node source) {
+    result = source.asExpr().getLocation()
+  }
+
+  Location getASelectedSinkLocation(DataFlow::Node sink) { result = sink.asExpr().getLocation() }
 }
 
 module PossibleYearArithmeticOperationCheckFlow =
diff --git a/cpp/ql/src/Likely Bugs/Memory Management/NtohlArrayNoBound.qll b/cpp/ql/src/Likely Bugs/Memory Management/NtohlArrayNoBound.qll
index 40c0f2173d9..f736a793a07 100644
--- a/cpp/ql/src/Likely Bugs/Memory Management/NtohlArrayNoBound.qll	
+++ b/cpp/ql/src/Likely Bugs/Memory Management/NtohlArrayNoBound.qll	
@@ -136,7 +136,7 @@ private module NetworkToBufferSizeConfig implements DataFlow::ConfigSig {
 
   predicate isBarrier(DataFlow::Node node) {
     exists(GuardCondition gc, GVN gvn |
-      gc.getAChild*() = gvn.getAnExpr() and
+      gc.(Expr).getAChild*() = gvn.getAnExpr() and
       globalValueNumber(node.asExpr()) = gvn and
       gc.controls(node.asExpr().getBasicBlock(), _)
     )
diff --git a/cpp/ql/src/Likely Bugs/Protocols/TlsSettingsMisconfiguration.ql b/cpp/ql/src/Likely Bugs/Protocols/TlsSettingsMisconfiguration.ql
index f5d1a09d04e..e50a2d54543 100644
--- a/cpp/ql/src/Likely Bugs/Protocols/TlsSettingsMisconfiguration.ql	
+++ b/cpp/ql/src/Likely Bugs/Protocols/TlsSettingsMisconfiguration.ql	
@@ -14,7 +14,7 @@ import cpp
 import semmle.code.cpp.security.boostorg.asio.protocols
 
 predicate isSourceImpl(DataFlow::Node source, ConstructorCall cc) {
-  exists(BoostorgAsio::SslContextClass c | c.getAContructorCall() = cc and cc = source.asExpr())
+  exists(BoostorgAsio::SslContextClass c | c.getAConstructorCall() = cc and cc = source.asExpr())
 }
 
 predicate isSinkImpl(DataFlow::Node sink, FunctionCall fcSetOptions) {
diff --git a/cpp/ql/src/Likely Bugs/Underspecified Functions/ImplicitFunctionDeclaration.ql b/cpp/ql/src/Likely Bugs/Underspecified Functions/ImplicitFunctionDeclaration.ql
index aa9d5d43c73..6a55557cf70 100644
--- a/cpp/ql/src/Likely Bugs/Underspecified Functions/ImplicitFunctionDeclaration.ql	
+++ b/cpp/ql/src/Likely Bugs/Underspecified Functions/ImplicitFunctionDeclaration.ql	
@@ -5,7 +5,7 @@
  * may lead to unpredictable behavior.
  * @kind problem
  * @problem.severity warning
- * @precision high
+ * @precision medium
  * @id cpp/implicit-function-declaration
  * @tags correctness
  *       maintainability
@@ -38,7 +38,6 @@ predicate isCompiledAsC(File f) {
 
 from FunctionDeclarationEntry fdeIm, FunctionCall fc
 where
-  not any(Compilation c).buildModeNone() and
   isCompiledAsC(fdeIm.getFile()) and
   not isFromMacroDefinition(fc) and
   fdeIm.isImplicit() and
diff --git a/cpp/ql/src/Metrics/Internal/CallableExtents.ql b/cpp/ql/src/Metrics/Internal/CallableExtents.ql
index 7a376c6da72..7ebae0385da 100644
--- a/cpp/ql/src/Metrics/Internal/CallableExtents.ql
+++ b/cpp/ql/src/Metrics/Internal/CallableExtents.ql
@@ -20,12 +20,14 @@ class RangeFunction extends Function {
    * For more information, see
    * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
    */
-  predicate hasLocationInfo(string path, int sl, int sc, int el, int ec) {
-    super.getLocation().hasLocationInfo(path, sl, sc, _, _) and
+  predicate hasLocationInfo(
+    string filepath, int startline, int startcolumn, int endline, int endcolumn
+  ) {
+    super.getLocation().hasLocationInfo(filepath, startline, startcolumn, _, _) and
     (
-      this.getBlock().getLocation().hasLocationInfo(path, _, _, el, ec)
+      this.getBlock().getLocation().hasLocationInfo(filepath, _, _, endline, endcolumn)
       or
-      not exists(this.getBlock()) and el = sl + 1 and ec = 1
+      not exists(this.getBlock()) and endline = startline + 1 and endcolumn = 1
     )
   }
 }
diff --git a/cpp/ql/src/Security/CWE/CWE-022/TaintedPath.ql b/cpp/ql/src/Security/CWE/CWE-022/TaintedPath.ql
index 94a9cacf9f4..1a15f6c3a15 100644
--- a/cpp/ql/src/Security/CWE/CWE-022/TaintedPath.ql
+++ b/cpp/ql/src/Security/CWE/CWE-022/TaintedPath.ql
@@ -93,6 +93,12 @@ module TaintedPathConfig implements DataFlow::ConfigSig {
     // make sinks barriers so that we only report the closest instance
     isSink(node)
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
+
+  Location getASelectedSinkLocation(DataFlow::Node sink) {
+    result = sink.asIndirectArgument().getLocation()
+  }
 }
 
 module TaintedPath = TaintTracking::Global<TaintedPathConfig>;
diff --git a/cpp/ql/src/Security/CWE/CWE-078/ExecTainted.ql b/cpp/ql/src/Security/CWE/CWE-078/ExecTainted.ql
index a609724937a..0e5f0f36f10 100644
--- a/cpp/ql/src/Security/CWE/CWE-078/ExecTainted.ql
+++ b/cpp/ql/src/Security/CWE/CWE-078/ExecTainted.ql
@@ -147,8 +147,19 @@ module ExecTaintConfig implements DataFlow::StateConfigSig {
 
   predicate isBarrier(DataFlow::Node node) { isBarrierImpl(node) }
 
-  predicate isBarrierOut(DataFlow::Node node) {
-    isSink(node, _) // Prevent duplicates along a call chain, since `shellCommand` will include wrappers
+  predicate isBarrierOut(DataFlow::Node node, FlowState state) {
+    isSink(node, state) // Prevent duplicates along a call chain, since `shellCommand` will include wrappers
+  }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
+
+  Location getASelectedSinkLocation(DataFlow::Node sink) {
+    exists(DataFlow::Node concatResult, Expr command, ExecState state |
+      result = [concatResult.getLocation(), command.getLocation(), sink.getLocation()] and
+      isSink(sink, state) and
+      isSinkImpl(sink, command, _) and
+      concatResult = state.getOutgoingNode()
+    )
   }
 }
 
diff --git a/cpp/ql/src/Security/CWE/CWE-079/CgiXss.ql b/cpp/ql/src/Security/CWE/CWE-079/CgiXss.ql
index 9b27e95fd65..994aba733d2 100644
--- a/cpp/ql/src/Security/CWE/CWE-079/CgiXss.ql
+++ b/cpp/ql/src/Security/CWE/CWE-079/CgiXss.ql
@@ -39,6 +39,12 @@ module Config implements DataFlow::ConfigSig {
     or
     node.asCertainDefinition().getUnspecifiedType() instanceof ArithmeticType
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
+
+  Location getASelectedSourceLocation(DataFlow::Node source) {
+    exists(QueryString query | result = query.getLocation() | query = source.asIndirectExpr())
+  }
 }
 
 module Flow = TaintTracking::Global<Config>;
diff --git a/cpp/ql/src/Security/CWE/CWE-089/SqlTainted.ql b/cpp/ql/src/Security/CWE/CWE-089/SqlTainted.ql
index 0ea4ce2e95f..5d08afbe304 100644
--- a/cpp/ql/src/Security/CWE/CWE-089/SqlTainted.ql
+++ b/cpp/ql/src/Security/CWE/CWE-089/SqlTainted.ql
@@ -54,6 +54,14 @@ module SqlTaintedConfig implements DataFlow::ConfigSig {
       sql.barrierSqlArgument(input, _)
     )
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
+
+  Location getASelectedSinkLocation(DataFlow::Node sink) {
+    exists(Expr taintedArg | result = [taintedArg.getLocation(), sink.getLocation()] |
+      taintedArg = asSinkExpr(sink)
+    )
+  }
 }
 
 module SqlTainted = TaintTracking::Global<SqlTaintedConfig>;
diff --git a/cpp/ql/src/Security/CWE/CWE-120/UnboundedWrite.ql b/cpp/ql/src/Security/CWE/CWE-120/UnboundedWrite.ql
index ec3543c1992..4d33ede9315 100644
--- a/cpp/ql/src/Security/CWE/CWE-120/UnboundedWrite.ql
+++ b/cpp/ql/src/Security/CWE/CWE-120/UnboundedWrite.ql
@@ -109,7 +109,7 @@ predicate lessThanOrEqual(IRGuardCondition g, Expr e, boolean branch) {
     g.comparesEq(left, _, _, true, branch)
   |
     interestingLessThanOrEqual(left) and
-    left.getDef().getUnconvertedResultExpression() = e
+    left.getDef().getConvertedResultExpression() = e
   )
 }
 
@@ -124,6 +124,12 @@ module Config implements DataFlow::ConfigSig {
     // Block flow if the node is guarded by any <, <= or = operations.
     node = DataFlow::BarrierGuard<lessThanOrEqual/3>::getABarrierNode()
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
+
+  Location getASelectedSinkLocation(DataFlow::Node sink) {
+    exists(BufferWrite bw | result = [bw.getLocation(), sink.getLocation()] | isSink(sink, bw, _))
+  }
 }
 
 module Flow = TaintTracking::Global<Config>;
diff --git a/cpp/ql/src/Security/CWE/CWE-129/ImproperArrayIndexValidation.ql b/cpp/ql/src/Security/CWE/CWE-129/ImproperArrayIndexValidation.ql
index 17c1b09c3e6..36f4522b56c 100644
--- a/cpp/ql/src/Security/CWE/CWE-129/ImproperArrayIndexValidation.ql
+++ b/cpp/ql/src/Security/CWE/CWE-129/ImproperArrayIndexValidation.ql
@@ -26,13 +26,13 @@ predicate isFlowSource(FS::FlowSource source, string sourceType) {
 predicate guardChecks(IRGuardCondition g, Expr e, boolean branch) {
   exists(Operand op | op.getDef().getConvertedResultExpression() = e |
     // `op < k` is true and `k > 0`
-    g.comparesLt(op, any(int k | k > 0), true, any(BooleanValue bv | bv.getValue() = branch))
+    g.comparesLt(op, any(int k | k > 0), true, any(GuardValue bv | bv.asBooleanValue() = branch))
     or
     // `op < _ + k` is true and `k > 0`.
     g.comparesLt(op, _, any(int k | k > 0), true, branch)
     or
     // op == k
-    g.comparesEq(op, _, true, any(BooleanValue bv | bv.getValue() = branch))
+    g.comparesEq(op, _, true, any(GuardValue bv | bv.asBooleanValue() = branch))
     or
     // op == _ + k
     g.comparesEq(op, _, _, true, branch)
diff --git a/cpp/ql/src/Security/CWE/CWE-170/ImproperNullTerminationTainted.ql b/cpp/ql/src/Security/CWE/CWE-170/ImproperNullTerminationTainted.ql
index 9b595657fce..2f051776dbe 100644
--- a/cpp/ql/src/Security/CWE/CWE-170/ImproperNullTerminationTainted.ql
+++ b/cpp/ql/src/Security/CWE/CWE-170/ImproperNullTerminationTainted.ql
@@ -43,6 +43,12 @@ private module Config implements DataFlow::ConfigSig {
   }
 
   predicate isSink(DataFlow::Node sink) { isSink(sink, _) }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
+
+  Location getASelectedSinkLocation(DataFlow::Node sink) {
+    exists(VariableAccess va | result = va.getLocation() | isSink(sink, va))
+  }
 }
 
 module Flow = TaintTracking::Global<Config>;
diff --git a/cpp/ql/src/Security/CWE/CWE-190/ArithmeticTainted.ql b/cpp/ql/src/Security/CWE/CWE-190/ArithmeticTainted.ql
index c9efaf9f695..86806c0b776 100644
--- a/cpp/ql/src/Security/CWE/CWE-190/ArithmeticTainted.ql
+++ b/cpp/ql/src/Security/CWE/CWE-190/ArithmeticTainted.ql
@@ -106,6 +106,12 @@ module Config implements DataFlow::ConfigSig {
       not iTo instanceof PointerArithmeticInstruction
     )
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
+
+  Location getASelectedSinkLocation(DataFlow::Node sink) {
+    exists(Expr e | result = e.getLocation() | isSink(sink, _, e))
+  }
 }
 
 module Flow = TaintTracking::Global<Config>;
diff --git a/cpp/ql/src/Security/CWE/CWE-190/ArithmeticUncontrolled.ql b/cpp/ql/src/Security/CWE/CWE-190/ArithmeticUncontrolled.ql
index 54c3b013471..3126573ac5a 100644
--- a/cpp/ql/src/Security/CWE/CWE-190/ArithmeticUncontrolled.ql
+++ b/cpp/ql/src/Security/CWE/CWE-190/ArithmeticUncontrolled.ql
@@ -120,6 +120,13 @@ module UncontrolledArithConfig implements DataFlow::ConfigSig {
     // block unintended flow to pointers
     node.asExpr().getUnspecifiedType() instanceof PointerType
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
+
+  Location getASelectedSourceLocation(DataFlow::Node source) {
+    isSource(source) and
+    result = [getExpr(source).getLocation(), source.getLocation()]
+  }
 }
 
 module UncontrolledArith = TaintTracking::Global<UncontrolledArithConfig>;
diff --git a/cpp/ql/src/Security/CWE/CWE-190/ArithmeticWithExtremeValues.ql b/cpp/ql/src/Security/CWE/CWE-190/ArithmeticWithExtremeValues.ql
index 15fd2cbca15..50cef092600 100644
--- a/cpp/ql/src/Security/CWE/CWE-190/ArithmeticWithExtremeValues.ql
+++ b/cpp/ql/src/Security/CWE/CWE-190/ArithmeticWithExtremeValues.ql
@@ -113,6 +113,12 @@ module Config implements DataFlow::ConfigSig {
       not iTo instanceof PointerArithmeticInstruction
     )
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
+
+  Location getASelectedSinkLocation(DataFlow::Node sink) {
+    exists(VariableAccess va | result = va.getLocation() | isSink(sink, va, _))
+  }
 }
 
 module Flow = TaintTracking::Global<Config>;
diff --git a/cpp/ql/src/Security/CWE/CWE-190/ComparisonWithWiderType.ql b/cpp/ql/src/Security/CWE/CWE-190/ComparisonWithWiderType.ql
index 021be5d091b..3f330807304 100644
--- a/cpp/ql/src/Security/CWE/CWE-190/ComparisonWithWiderType.ql
+++ b/cpp/ql/src/Security/CWE/CWE-190/ComparisonWithWiderType.ql
@@ -6,7 +6,7 @@
  * @kind problem
  * @problem.severity warning
  * @security-severity 7.8
- * @precision high
+ * @precision medium
  * @tags reliability
  *       security
  *       external/cwe/cwe-190
@@ -51,7 +51,6 @@ int getComparisonSizeAdjustment(Expr e) {
 
 from Loop l, RelationalOperation rel, VariableAccess small, Expr large
 where
-  not any(Compilation c).buildModeNone() and
   small = rel.getLesserOperand() and
   large = rel.getGreaterOperand() and
   rel = l.getCondition().getAChild*() and
diff --git a/cpp/ql/src/Security/CWE/CWE-190/IntegerOverflowTainted.ql b/cpp/ql/src/Security/CWE/CWE-190/IntegerOverflowTainted.ql
index 6ff06d355b9..3978d2ded95 100644
--- a/cpp/ql/src/Security/CWE/CWE-190/IntegerOverflowTainted.ql
+++ b/cpp/ql/src/Security/CWE/CWE-190/IntegerOverflowTainted.ql
@@ -25,10 +25,10 @@ import semmle.code.cpp.controlflow.IRGuards as IRGuards
 predicate outOfBoundsExpr(Expr expr, string kind) {
   if convertedExprMightOverflowPositively(expr)
   then kind = "overflow"
-  else
-    if convertedExprMightOverflowNegatively(expr)
-    then kind = "overflow negatively"
-    else none()
+  else (
+    convertedExprMightOverflowNegatively(expr) and
+    kind = "overflow negatively"
+  )
 }
 
 predicate isSource(FS::FlowSource source, string sourceType) { sourceType = source.getSourceType() }
diff --git a/cpp/ql/src/Security/CWE/CWE-190/TaintedAllocationSize.ql b/cpp/ql/src/Security/CWE/CWE-190/TaintedAllocationSize.ql
index 6307ddf5fe6..cf3542ebae5 100644
--- a/cpp/ql/src/Security/CWE/CWE-190/TaintedAllocationSize.ql
+++ b/cpp/ql/src/Security/CWE/CWE-190/TaintedAllocationSize.ql
@@ -91,6 +91,12 @@ module TaintedAllocationSizeConfig implements DataFlow::ConfigSig {
     // to duplicate results)
     any(HeuristicAllocationFunction f).getAParameter() = node.asParameter()
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
+
+  Location getASelectedSinkLocation(DataFlow::Node sink) {
+    exists(Expr alloc | result = [alloc.getLocation(), sink.getLocation()] | allocSink(alloc, sink))
+  }
 }
 
 module TaintedAllocationSize = TaintTracking::Global<TaintedAllocationSizeConfig>;
diff --git a/cpp/ql/src/Security/CWE/CWE-290/AuthenticationBypass.ql b/cpp/ql/src/Security/CWE/CWE-290/AuthenticationBypass.ql
index ada0180668e..8ee429b8c52 100644
--- a/cpp/ql/src/Security/CWE/CWE-290/AuthenticationBypass.ql
+++ b/cpp/ql/src/Security/CWE/CWE-290/AuthenticationBypass.ql
@@ -72,6 +72,14 @@ module Config implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { isSource(source, _) }
 
   predicate isSink(DataFlow::Node sink) { isSink(sink, _) }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
+
+  Location getASelectedSinkLocation(DataFlow::Node sink) {
+    exists(Expr condition | result = [condition.getLocation(), sink.getLocation()] |
+      isSink(sink, condition)
+    )
+  }
 }
 
 module Flow = TaintTracking::Global<Config>;
diff --git a/cpp/ql/src/Security/CWE/CWE-295/SSLResultConflation.ql b/cpp/ql/src/Security/CWE/CWE-295/SSLResultConflation.ql
index 8a3c2f3664d..9eccaebfdbd 100644
--- a/cpp/ql/src/Security/CWE/CWE-295/SSLResultConflation.ql
+++ b/cpp/ql/src/Security/CWE/CWE-295/SSLResultConflation.ql
@@ -29,7 +29,15 @@ module VerifyResultConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { source.asExpr() instanceof SslGetVerifyResultCall }
 
   predicate isSink(DataFlow::Node sink) {
-    exists(GuardCondition guard | guard.getAChild*() = sink.asExpr())
+    exists(GuardCondition guard | guard.(Expr).getAChild*() = sink.asExpr())
+  }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
+
+  Location getASelectedSinkLocation(DataFlow::Node sink) {
+    exists(GuardCondition guard | result = guard.getLocation() |
+      guard.comparesEq(sink.asExpr(), _, 0, false, _)
+    )
   }
 }
 
diff --git a/cpp/ql/src/Security/CWE/CWE-295/SSLResultNotChecked.ql b/cpp/ql/src/Security/CWE/CWE-295/SSLResultNotChecked.ql
index de8520de1b3..779457508b7 100644
--- a/cpp/ql/src/Security/CWE/CWE-295/SSLResultNotChecked.ql
+++ b/cpp/ql/src/Security/CWE/CWE-295/SSLResultNotChecked.ql
@@ -55,30 +55,9 @@ predicate resultIsChecked(SslGetPeerCertificateCall getCertCall, ControlFlowNode
 predicate certIsZero(
   SslGetPeerCertificateCall getCertCall, ControlFlowNode node1, ControlFlowNode node2
 ) {
-  exists(Expr cert | cert = globalValueNumber(getCertCall).getAnExpr() |
-    exists(GuardCondition guard, Expr zero |
-      zero.getValue().toInt() = 0 and
-      node1 = guard and
-      (
-        // if (cert == zero) {
-        guard.comparesEq(cert, zero, 0, true, true) and
-        node2 = guard.getATrueSuccessor()
-        or
-        // if (cert != zero) { }
-        guard.comparesEq(cert, zero, 0, false, true) and
-        node2 = guard.getAFalseSuccessor()
-      )
-    )
-    or
-    (
-      // if (cert) { }
-      node1 = cert
-      or
-      // if (!cert) {
-      node1.(NotExpr).getAChild() = cert
-    ) and
-    node2 = node1.getASuccessor() and
-    not cert.(GuardCondition).controls(node2, true) // cert may be false
+  exists(Expr cert |
+    cert = globalValueNumber(getCertCall).getAnExpr() and
+    node1.(GuardCondition).ensuresEqEdge(cert, 0, _, node2.getBasicBlock(), true)
   )
 }
 
diff --git a/cpp/ql/src/Security/CWE/CWE-311/CleartextBufferWrite.ql b/cpp/ql/src/Security/CWE/CWE-311/CleartextBufferWrite.ql
index f2754c5811f..c03c433a532 100644
--- a/cpp/ql/src/Security/CWE/CWE-311/CleartextBufferWrite.ql
+++ b/cpp/ql/src/Security/CWE/CWE-311/CleartextBufferWrite.ql
@@ -47,6 +47,14 @@ module ToBufferConfig implements DataFlow::ConfigSig {
   }
 
   predicate isSink(DataFlow::Node sink) { isSinkImpl(sink, _) }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
+
+  Location getASelectedSinkLocation(DataFlow::Node sink) {
+    exists(SensitiveBufferWrite w | result = [w.getLocation(), sink.getLocation()] |
+      isSinkImpl(sink, w)
+    )
+  }
 }
 
 module ToBufferFlow = TaintTracking::Global<ToBufferConfig>;
diff --git a/cpp/ql/src/Security/CWE/CWE-311/CleartextFileWrite.ql b/cpp/ql/src/Security/CWE/CWE-311/CleartextFileWrite.ql
index c04ceae7ada..17f4b7ae0fd 100644
--- a/cpp/ql/src/Security/CWE/CWE-311/CleartextFileWrite.ql
+++ b/cpp/ql/src/Security/CWE/CWE-311/CleartextFileWrite.ql
@@ -31,6 +31,18 @@ module FromSensitiveConfig implements DataFlow::ConfigSig {
   predicate isBarrier(DataFlow::Node node) {
     node.asExpr().getUnspecifiedType() instanceof IntegralType
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
+
+  Location getASelectedSourceLocation(DataFlow::Node sourceNode) {
+    exists(SensitiveExpr source | result = [source.getLocation(), sourceNode.getLocation()] |
+      isSourceImpl(sourceNode, source)
+    )
+  }
+
+  Location getASelectedSinkLocation(DataFlow::Node sink) {
+    exists(FileWrite w | result = [w.getLocation(), sink.getLocation()] | isSinkImpl(sink, w, _))
+  }
 }
 
 module FromSensitiveFlow = TaintTracking::Global<FromSensitiveConfig>;
diff --git a/cpp/ql/src/Security/CWE/CWE-311/CleartextTransmission.ql b/cpp/ql/src/Security/CWE/CWE-311/CleartextTransmission.ql
index 09db3f21602..01d078cf545 100644
--- a/cpp/ql/src/Security/CWE/CWE-311/CleartextTransmission.ql
+++ b/cpp/ql/src/Security/CWE/CWE-311/CleartextTransmission.ql
@@ -245,6 +245,16 @@ module FromSensitiveConfig implements DataFlow::ConfigSig {
     // sources to not get path duplication.
     isSource(node)
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
+
+  Location getASelectedSinkLocation(DataFlow::Node sink) {
+    exists(NetworkSendRecv networkSendRecv |
+      result = [networkSendRecv.getLocation(), sink.getLocation()]
+    |
+      isSinkSendRecv(sink, networkSendRecv)
+    )
+  }
 }
 
 module FromSensitiveFlow = TaintTracking::Global<FromSensitiveConfig>;
@@ -266,6 +276,10 @@ module ToEncryptionConfig implements DataFlow::ConfigSig {
     // sources to not get path duplication.
     isSource(node)
   }
+
+  predicate observeDiffInformedIncrementalMode() {
+    none() // only used negatively
+  }
 }
 
 module ToEncryptionFlow = TaintTracking::Global<ToEncryptionConfig>;
@@ -281,6 +295,10 @@ module FromEncryptionConfig implements DataFlow::ConfigSig {
   predicate isBarrier(DataFlow::Node node) {
     node.asExpr().getUnspecifiedType() instanceof IntegralType
   }
+
+  predicate observeDiffInformedIncrementalMode() {
+    none() // only used negatively
+  }
 }
 
 module FromEncryptionFlow = TaintTracking::Global<FromEncryptionConfig>;
diff --git a/cpp/ql/src/Security/CWE/CWE-313/CleartextSqliteDatabase.ql b/cpp/ql/src/Security/CWE/CWE-313/CleartextSqliteDatabase.ql
index 0c060befeff..7cd146e2cac 100644
--- a/cpp/ql/src/Security/CWE/CWE-313/CleartextSqliteDatabase.ql
+++ b/cpp/ql/src/Security/CWE/CWE-313/CleartextSqliteDatabase.ql
@@ -123,6 +123,20 @@ module FromSensitiveConfig implements DataFlow::ConfigSig {
       content.(DataFlow::FieldContent).getField() = getRecField(t.stripType())
     )
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
+
+  Location getASelectedSourceLocation(DataFlow::Node source) {
+    exists(SensitiveExpr sensitive | result = [sensitive.getLocation(), source.getLocation()] |
+      isSourceImpl(source, sensitive)
+    )
+  }
+
+  Location getASelectedSinkLocation(DataFlow::Node sink) {
+    exists(SqliteFunctionCall sqliteCall | result = [sqliteCall.getLocation(), sink.getLocation()] |
+      isSinkImpl(sink, sqliteCall, _)
+    )
+  }
 }
 
 module FromSensitiveFlow = TaintTracking::Global<FromSensitiveConfig>;
diff --git a/cpp/ql/src/Security/CWE/CWE-319/UseOfHttp.ql b/cpp/ql/src/Security/CWE/CWE-319/UseOfHttp.ql
index 423ed57dd98..682d8387433 100644
--- a/cpp/ql/src/Security/CWE/CWE-319/UseOfHttp.ql
+++ b/cpp/ql/src/Security/CWE/CWE-319/UseOfHttp.ql
@@ -87,6 +87,13 @@ module HttpStringToUrlOpenConfig implements DataFlow::ConfigSig {
       sink.asIndirectExpr() = fc.getArgument(3)
     )
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
+
+  Location getASelectedSourceLocation(DataFlow::Node source) {
+    isSource(source) and
+    result = [source.asIndirectExpr().getLocation(), source.getLocation()]
+  }
 }
 
 module HttpStringToUrlOpen = TaintTracking::Global<HttpStringToUrlOpenConfig>;
diff --git a/cpp/ql/src/Security/CWE/CWE-326/InsufficientKeySize.ql b/cpp/ql/src/Security/CWE/CWE-326/InsufficientKeySize.ql
index 3cc10b7ad19..9f75475854d 100644
--- a/cpp/ql/src/Security/CWE/CWE-326/InsufficientKeySize.ql
+++ b/cpp/ql/src/Security/CWE/CWE-326/InsufficientKeySize.ql
@@ -44,6 +44,12 @@ module KeyStrengthFlowConfig implements DataFlow::ConfigSig {
       exists(getMinimumKeyStrength(name, param))
     )
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
+
+  Location getASelectedSinkLocation(DataFlow::Node sink) {
+    exists(FunctionCall fc | result = fc.getLocation() | sink.asExpr() = fc.getArgument(_))
+  }
 }
 
 module KeyStrengthFlow = DataFlow::Global<KeyStrengthFlowConfig>;
diff --git a/cpp/ql/src/Security/CWE/CWE-327/BrokenCryptoAlgorithm.qhelp b/cpp/ql/src/Security/CWE/CWE-327/BrokenCryptoAlgorithm.qhelp
index 0fcbd89d892..33561b3d1bf 100644
--- a/cpp/ql/src/Security/CWE/CWE-327/BrokenCryptoAlgorithm.qhelp
+++ b/cpp/ql/src/Security/CWE/CWE-327/BrokenCryptoAlgorithm.qhelp
@@ -3,11 +3,15 @@
   "qhelp.dtd">
 <qhelp>
 <overview>
-<p>Using broken or weak cryptographic algorithms can leave data vulnerable to being decrypted.</p>
+<p>Using broken or weak cryptographic algorithms may compromise security guarantees such as confidentiality, integrity, and authenticity.</p>
 
-<p>Many cryptographic algorithms provided by cryptography libraries are known to be weak, or 
-flawed. Using such an algorithm means that an attacker may be able to easily decrypt the encrypted
-data.</p>
+<p>Many cryptographic algorithms are known to be weak or flawed. The security guarantees of a system often rely on the underlying cryptography, so using a weak algorithm can have severe consequences. For example:
+</p>
+<ul>
+  <li>If a weak encryption algorithm is used, an attacker may be able to decrypt sensitive data.</li>
+  <li>If a weak hashing algorithm is used to protect data integrity, an attacker may be able to craft a malicious input that has the same hash as a benign one.</li>
+  <li>If a weak algorithm is used for digital signatures, an attacker may be able to forge signatures and impersonate legitimate users.</li>
+</ul>
 
 </overview>
 <recommendation>
diff --git a/cpp/ql/src/Security/CWE/CWE-367/TOCTOUFilesystemRace.ql b/cpp/ql/src/Security/CWE/CWE-367/TOCTOUFilesystemRace.ql
index 4b28a80f662..5fd1b981974 100644
--- a/cpp/ql/src/Security/CWE/CWE-367/TOCTOUFilesystemRace.ql
+++ b/cpp/ql/src/Security/CWE/CWE-367/TOCTOUFilesystemRace.ql
@@ -115,7 +115,7 @@ predicate checksPath(Expr check, Expr checkPath) {
 
 pragma[nomagic]
 predicate checkPathControlsUse(Expr check, Expr checkPath, Expr use) {
-  exists(GuardCondition guard | referenceTo(check, guard.getAChild*()) |
+  exists(GuardCondition guard | referenceTo(check, guard.(Expr).getAChild*()) |
     guard.controls(use.getBasicBlock(), _)
   ) and
   checksPath(pragma[only_bind_into](check), checkPath)
@@ -123,7 +123,7 @@ predicate checkPathControlsUse(Expr check, Expr checkPath, Expr use) {
 
 pragma[nomagic]
 predicate fileNameOperationControlsUse(Expr check, Expr checkPath, Expr use) {
-  exists(GuardCondition guard | referenceTo(check, guard.getAChild*()) |
+  exists(GuardCondition guard | referenceTo(check, guard.(Expr).getAChild*()) |
     guard.controls(use.getBasicBlock(), _)
   ) and
   pragma[only_bind_into](check) = filenameOperation(checkPath)
diff --git a/cpp/ql/src/Security/CWE/CWE-416/IteratorToExpiredContainer.ql b/cpp/ql/src/Security/CWE/CWE-416/IteratorToExpiredContainer.ql
index 11d628c1aff..c386cb1da4d 100644
--- a/cpp/ql/src/Security/CWE/CWE-416/IteratorToExpiredContainer.ql
+++ b/cpp/ql/src/Security/CWE/CWE-416/IteratorToExpiredContainer.ql
@@ -145,6 +145,18 @@ module Config implements DataFlow::StateConfigSig {
     // ```
     result instanceof DataFlow::FeatureHasSinkCallContext
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
+
+  Location getASelectedSourceLocation(DataFlow::Node source) { none() }
+
+  Location getASelectedSinkLocation(DataFlow::Node sink) {
+    exists(DataFlow::Node mid, FlowState state | result = mid.getLocation() |
+      destroyedToBeginSink(sink) and
+      isSink(sink, state) and
+      state = Config::DestroyedToBegin(mid)
+    )
+  }
 }
 
 module Flow = DataFlow::GlobalWithState<Config>;
diff --git a/cpp/ql/src/Security/CWE/CWE-428/UnsafeCreateProcessCall.ql b/cpp/ql/src/Security/CWE/CWE-428/UnsafeCreateProcessCall.ql
index 2703f819b54..f0851b7d807 100644
--- a/cpp/ql/src/Security/CWE/CWE-428/UnsafeCreateProcessCall.ql
+++ b/cpp/ql/src/Security/CWE/CWE-428/UnsafeCreateProcessCall.ql
@@ -62,6 +62,16 @@ module NullAppNameCreateProcessFunctionConfig implements DataFlow::ConfigSig {
       val = call.getArgument(call.getApplicationNameArgumentId())
     )
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
+
+  Location getASelectedSourceLocation(DataFlow::Node source) { none() }
+
+  Location getASelectedSinkLocation(DataFlow::Node sink) {
+    exists(CreateProcessFunctionCall call | result = call.getLocation() |
+      sink.asExpr() = call.getArgument(call.getApplicationNameArgumentId())
+    )
+  }
 }
 
 module NullAppNameCreateProcessFunction = DataFlow::Global<NullAppNameCreateProcessFunctionConfig>;
@@ -82,6 +92,16 @@ module QuotedCommandInCreateProcessFunctionConfig implements DataFlow::ConfigSig
       val = call.getArgument(call.getCommandLineArgumentId())
     )
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
+
+  Location getASelectedSourceLocation(DataFlow::Node source) { none() }
+
+  Location getASelectedSinkLocation(DataFlow::Node sink) {
+    exists(CreateProcessFunctionCall call | result = call.getLocation() |
+      sink.asExpr() = call.getArgument(call.getCommandLineArgumentId())
+    )
+  }
 }
 
 module QuotedCommandInCreateProcessFunction =
diff --git a/cpp/ql/src/Security/CWE/CWE-457/UninitializedVariables.qll b/cpp/ql/src/Security/CWE/CWE-457/UninitializedVariables.qll
index 14eec81ff58..804d6a48754 100644
--- a/cpp/ql/src/Security/CWE/CWE-457/UninitializedVariables.qll
+++ b/cpp/ql/src/Security/CWE/CWE-457/UninitializedVariables.qll
@@ -31,27 +31,28 @@ private predicate hasConditionalInitialization(
 class ConditionallyInitializedVariable extends LocalVariable {
   ConditionalInitializationCall call;
   ConditionalInitializationFunction f;
-  VariableAccess initAccess;
   Evidence e;
 
   ConditionallyInitializedVariable() {
     // Find a call that conditionally initializes this variable
-    hasConditionalInitialization(f, call, this, initAccess, e) and
-    // Ignore cases where the variable is assigned prior to the call
-    not reaches(this.getAnAssignedValue(), initAccess) and
-    // Ignore cases where the variable is assigned field-wise prior to the call.
-    not exists(FieldAccess fa |
-      exists(Assignment a |
-        fa = getAFieldAccess(this) and
-        a.getLValue() = fa
+    exists(VariableAccess initAccess |
+      hasConditionalInitialization(f, call, this, initAccess, e) and
+      // Ignore cases where the variable is assigned prior to the call
+      not reaches(this.getAnAssignedValue(), initAccess) and
+      // Ignore cases where the variable is assigned field-wise prior to the call.
+      not exists(FieldAccess fa |
+        exists(Assignment a |
+          fa = getAFieldAccess(this) and
+          a.getLValue() = fa
+        )
+      |
+        reaches(fa, initAccess)
+      ) and
+      // Ignore cases where the variable is assigned by a prior call to an initialization function
+      not exists(Call c |
+        this.getAnAccess() = getAnInitializedArgument(c).(AddressOfExpr).getOperand() and
+        reaches(c, initAccess)
       )
-    |
-      reaches(fa, initAccess)
-    ) and
-    // Ignore cases where the variable is assigned by a prior call to an initialization function
-    not exists(Call c |
-      this.getAnAccess() = getAnInitializedArgument(c).(AddressOfExpr).getOperand() and
-      reaches(c, initAccess)
     ) and
     /*
      * Static local variables with constant initializers do not have the initializer expr as part of
diff --git a/cpp/ql/src/Security/CWE/CWE-468/SuspiciousAddWithSizeof.ql b/cpp/ql/src/Security/CWE/CWE-468/SuspiciousAddWithSizeof.ql
index da92c792432..d9c9df4fd91 100644
--- a/cpp/ql/src/Security/CWE/CWE-468/SuspiciousAddWithSizeof.ql
+++ b/cpp/ql/src/Security/CWE/CWE-468/SuspiciousAddWithSizeof.ql
@@ -6,7 +6,7 @@
  * @kind problem
  * @problem.severity warning
  * @security-severity 8.8
- * @precision high
+ * @precision medium
  * @id cpp/suspicious-add-sizeof
  * @tags security
  *       external/cwe/cwe-468
@@ -24,7 +24,6 @@ private predicate isCharSzPtrExpr(Expr e) {
 
 from Expr sizeofExpr, Expr e
 where
-  not any(Compilation c).buildModeNone() and
   // If we see an addWithSizeof then we expect the type of
   // the pointer expression to be `char*` or `void*`. Otherwise it
   // is probably a mistake.
diff --git a/cpp/ql/src/Security/CWE/CWE-570/IncorrectAllocationErrorHandling.ql b/cpp/ql/src/Security/CWE/CWE-570/IncorrectAllocationErrorHandling.ql
index d4d908f8474..c03ae995090 100644
--- a/cpp/ql/src/Security/CWE/CWE-570/IncorrectAllocationErrorHandling.ql
+++ b/cpp/ql/src/Security/CWE/CWE-570/IncorrectAllocationErrorHandling.ql
@@ -41,7 +41,7 @@ predicate deleteMayThrow(DeleteOrDeleteArrayExpr deleteExpr) {
 }
 
 /**
- * Holds if the function may throw an exception when called. That is, if the body of the function looks
+ * Holds if the function `f` may throw an exception when called. That is, if the body of the function looks
  * like it might throw an exception, and the function does not have a `noexcept` or `throw()` specifier.
  */
 predicate functionMayThrow(Function f) {
diff --git a/cpp/ql/src/Security/CWE/CWE-732/UnsafeDaclSecurityDescriptor.ql b/cpp/ql/src/Security/CWE/CWE-732/UnsafeDaclSecurityDescriptor.ql
index 5ed30e19bb3..a0096f410c5 100644
--- a/cpp/ql/src/Security/CWE/CWE-732/UnsafeDaclSecurityDescriptor.ql
+++ b/cpp/ql/src/Security/CWE/CWE-732/UnsafeDaclSecurityDescriptor.ql
@@ -37,6 +37,16 @@ module NullDaclConfig implements DataFlow::ConfigSig {
       val = call.getArgument(2)
     )
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
+
+  Location getASelectedSourceLocation(DataFlow::Node source) { none() }
+
+  Location getASelectedSinkLocation(DataFlow::Node sink) {
+    exists(SetSecurityDescriptorDaclFunctionCall call | result = call.getLocation() |
+      sink.asExpr() = call.getArgument(2)
+    )
+  }
 }
 
 module NullDaclFlow = DataFlow::Global<NullDaclConfig>;
@@ -68,6 +78,10 @@ module NonNullDaclConfig implements DataFlow::ConfigSig {
   predicate isSink(DataFlow::Node sink) {
     exists(SetSecurityDescriptorDaclFunctionCall call | sink.asExpr() = call.getArgument(2))
   }
+
+  predicate observeDiffInformedIncrementalMode() {
+    none() // only used negatively
+  }
 }
 
 module NonNullDaclFlow = DataFlow::Global<NonNullDaclConfig>;
diff --git a/cpp/ql/src/Security/CWE/CWE-807/TaintedCondition.ql b/cpp/ql/src/Security/CWE/CWE-807/TaintedCondition.ql
index 7eaa5df849d..171fbd26dd9 100644
--- a/cpp/ql/src/Security/CWE/CWE-807/TaintedCondition.ql
+++ b/cpp/ql/src/Security/CWE/CWE-807/TaintedCondition.ql
@@ -65,6 +65,16 @@ module Config implements DataFlow::ConfigSig {
       iFrom1 != iFrom2
     )
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
+
+  Location getASelectedSinkLocation(DataFlow::Node sink) {
+    result = sink.getLocation()
+    or
+    exists(Expr raise | result = raise.getLocation() |
+      sensitiveCondition([sink.asExpr(), sink.asIndirectExpr()], raise)
+    )
+  }
 }
 
 module Flow = TaintTracking::Global<Config>;
diff --git a/cpp/ql/src/Security/CWE/CWE-843/TypeConfusion.ql b/cpp/ql/src/Security/CWE/CWE-843/TypeConfusion.ql
index acfd27cc45b..4ca30c3e916 100644
--- a/cpp/ql/src/Security/CWE/CWE-843/TypeConfusion.ql
+++ b/cpp/ql/src/Security/CWE/CWE-843/TypeConfusion.ql
@@ -178,6 +178,10 @@ module Config implements DataFlow::ConfigSig {
   predicate isSink(DataFlow::Node sink) { sink.asExpr() = any(UnsafeCast cast).getUnconverted() }
 
   int fieldFlowBranchLimit() { result = 0 }
+
+  predicate observeDiffInformedIncrementalMode() {
+    none() // used both positively and negatively
+  }
 }
 
 module Flow = DataFlow::Global<Config>;
diff --git a/cpp/ql/src/change-notes/2025-08-08-overflow-buffer.md b/cpp/ql/src/change-notes/2025-08-08-overflow-buffer.md
deleted file mode 100644
index 02c73804c9f..00000000000
--- a/cpp/ql/src/change-notes/2025-08-08-overflow-buffer.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* Fixed a false positive in `cpp/overflow-buffer` when the type of the destination buffer is a reference to a class/struct type.
\ No newline at end of file
diff --git a/cpp/ql/src/change-notes/released/1.4.6.md b/cpp/ql/src/change-notes/released/1.4.6.md
new file mode 100644
index 00000000000..6f6c9bbc385
--- /dev/null
+++ b/cpp/ql/src/change-notes/released/1.4.6.md
@@ -0,0 +1,6 @@
+## 1.4.6
+
+### Minor Analysis Improvements
+
+* The `cpp/short-global-name` query will no longer give alerts for instantiations of template variables, only for the template itself.
+* Fixed a false positive in `cpp/overflow-buffer` when the type of the destination buffer is a reference to a class/struct type.
diff --git a/cpp/ql/src/change-notes/released/1.4.7.md b/cpp/ql/src/change-notes/released/1.4.7.md
new file mode 100644
index 00000000000..d3b9a12c798
--- /dev/null
+++ b/cpp/ql/src/change-notes/released/1.4.7.md
@@ -0,0 +1,5 @@
+## 1.4.7
+
+### Bug Fixes
+
+* Fixed an inconsistency across languages where most have a `Customizations.qll` file for adding customizations, but not all did.
diff --git a/cpp/ql/src/change-notes/released/1.5.0.md b/cpp/ql/src/change-notes/released/1.5.0.md
new file mode 100644
index 00000000000..383825331ff
--- /dev/null
+++ b/cpp/ql/src/change-notes/released/1.5.0.md
@@ -0,0 +1,11 @@
+## 1.5.0
+
+### Major Analysis Improvements
+
+* The queries `cpp/wrong-type-format-argument`, `cpp/comparison-with-wider-type`, `cpp/integer-multiplication-cast-to-long`, `cpp/implicit-function-declaration` and `cpp/suspicious-add-sizeof` have had their precisions reduced from `high` to `medium`. They will also now give alerts for projects built with `build-mode: none`.
+* The queries `cpp/wrong-type-format-argument`, `cpp/comparison-with-wider-type`, `cpp/integer-multiplication-cast-to-long` and `cpp/suspicious-add-sizeof` are no longer included in the `code-scanning` suite.
+
+### Bug Fixes
+
+* The predicate `occurenceCount` in the file module `MagicConstants` has been deprecated. Use `occurrenceCount` instead.
+* The predicate `additionalAdditionOrSubstractionCheckForLeapYear` in the file module `LeapYear` has been deprecated. Use `additionalAdditionOrSubtractionCheckForLeapYear` instead.
diff --git a/cpp/ql/src/change-notes/released/1.5.1.md b/cpp/ql/src/change-notes/released/1.5.1.md
new file mode 100644
index 00000000000..7b24a64aca3
--- /dev/null
+++ b/cpp/ql/src/change-notes/released/1.5.1.md
@@ -0,0 +1,3 @@
+## 1.5.1
+
+No user-facing changes.
diff --git a/cpp/ql/src/change-notes/released/1.5.2.md b/cpp/ql/src/change-notes/released/1.5.2.md
new file mode 100644
index 00000000000..384c27833f1
--- /dev/null
+++ b/cpp/ql/src/change-notes/released/1.5.2.md
@@ -0,0 +1,3 @@
+## 1.5.2
+
+No user-facing changes.
diff --git a/cpp/ql/src/change-notes/released/1.5.3.md b/cpp/ql/src/change-notes/released/1.5.3.md
new file mode 100644
index 00000000000..2e9bcb5e663
--- /dev/null
+++ b/cpp/ql/src/change-notes/released/1.5.3.md
@@ -0,0 +1,3 @@
+## 1.5.3
+
+No user-facing changes.
diff --git a/cpp/ql/src/codeql-pack.release.yml b/cpp/ql/src/codeql-pack.release.yml
index a74b6b08d86..232224b0e26 100644
--- 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.5.3
diff --git a/cpp/ql/src/definitions.ql b/cpp/ql/src/definitions.ql
index c12277eaf23..339b481f5f7 100644
--- a/cpp/ql/src/definitions.ql
+++ b/cpp/ql/src/definitions.ql
@@ -13,6 +13,6 @@ where
   def = definitionOf(e, kind) and
   // We need to exclude definitions for elements inside template instantiations,
   // as these often lead to multiple links to definitions from the same source location.
-  // LGTM does not support this behaviour.
+  // LGTM does not support this behavior.
   not e.isFromTemplateInstantiation(_)
 select e, def, kind
diff --git a/cpp/ql/src/experimental/Likely Bugs/RedundantNullCheckParam.ql b/cpp/ql/src/experimental/Likely Bugs/RedundantNullCheckParam.ql
index 36e42cae92a..ce3497bb965 100644
--- a/cpp/ql/src/experimental/Likely Bugs/RedundantNullCheckParam.ql	
+++ b/cpp/ql/src/experimental/Likely Bugs/RedundantNullCheckParam.ql	
@@ -47,7 +47,7 @@ where
   // for a function parameter
   unchecked.getTarget() = param and
   // this function parameter is not overwritten
-  count(param.getAnAssignment()) = 0 and
+  not exists(param.getAnAssignment()) and
   check.getTarget() = param and
   // which is once checked
   candidateResultChecked(check, eqop) and
diff --git a/cpp/ql/src/experimental/Security/CWE/CWE-078/WordexpTainted.ql b/cpp/ql/src/experimental/Security/CWE/CWE-078/WordexpTainted.ql
index 1d032a63ba3..cfe04ba23bf 100644
--- a/cpp/ql/src/experimental/Security/CWE/CWE-078/WordexpTainted.ql
+++ b/cpp/ql/src/experimental/Security/CWE/CWE-078/WordexpTainted.ql
@@ -50,8 +50,6 @@ module WordexpTaintConfig implements DataFlow::ConfigSig {
   }
 
   predicate observeDiffInformedIncrementalMode() { any() }
-
-  Location getASelectedSourceLocation(DataFlow::Node source) { none() }
 }
 
 module WordexpTaint = TaintTracking::Global<WordexpTaintConfig>;
diff --git a/cpp/ql/src/experimental/Security/CWE/CWE-1126/DeclarationOfVariableWithUnnecessarilyWideScope.ql b/cpp/ql/src/experimental/Security/CWE/CWE-1126/DeclarationOfVariableWithUnnecessarilyWideScope.ql
index 136931f00ec..bbb219a22da 100644
--- a/cpp/ql/src/experimental/Security/CWE/CWE-1126/DeclarationOfVariableWithUnnecessarilyWideScope.ql
+++ b/cpp/ql/src/experimental/Security/CWE/CWE-1126/DeclarationOfVariableWithUnnecessarilyWideScope.ql
@@ -19,16 +19,17 @@ import cpp
  * Errors when using a variable declaration inside a loop.
  */
 class DangerousWhileLoop extends WhileStmt {
-  Expr exp;
   Declaration dl;
 
   DangerousWhileLoop() {
     this = dl.getParentScope().(BlockStmt).getParent*() and
-    exp = this.getCondition().getAChild*() and
-    not exp instanceof PointerFieldAccess and
-    not exp instanceof ValueFieldAccess and
-    exp.(VariableAccess).getTarget().getName() = dl.getName() and
-    not exp.getParent*() instanceof FunctionCall
+    exists(Expr exp |
+      exp = this.getCondition().getAChild*() and
+      not exp instanceof PointerFieldAccess and
+      not exp instanceof ValueFieldAccess and
+      exp.(VariableAccess).getTarget().getName() = dl.getName() and
+      not exp.getParent*() instanceof FunctionCall
+    )
   }
 
   Declaration getDeclaration() { result = dl }
diff --git a/cpp/ql/src/experimental/Security/CWE/CWE-125/DangerousWorksWithMultibyteOrWideCharacters.ql b/cpp/ql/src/experimental/Security/CWE/CWE-125/DangerousWorksWithMultibyteOrWideCharacters.ql
index 6529bf6cdf8..74ac8e6da66 100644
--- a/cpp/ql/src/experimental/Security/CWE/CWE-125/DangerousWorksWithMultibyteOrWideCharacters.ql
+++ b/cpp/ql/src/experimental/Security/CWE/CWE-125/DangerousWorksWithMultibyteOrWideCharacters.ql
@@ -46,7 +46,7 @@ predicate exprMayBeString(Expr exp) {
   )
 }
 
-/** Holds if expression is constant or operator call `sizeof`. */
+/** Holds if expression `exp` is constant or operator call `sizeof`. */
 predicate argConstOrSizeof(Expr exp) {
   exp.getValue().toInt() > 1 or
   exp.(SizeofTypeOperator).getTypeOperand().getSize() > 1
diff --git a/cpp/ql/src/experimental/Security/CWE/CWE-193/ConstantSizeArrayOffByOne.ql b/cpp/ql/src/experimental/Security/CWE/CWE-193/ConstantSizeArrayOffByOne.ql
index c38a012b27b..58f5dc2ade4 100644
--- a/cpp/ql/src/experimental/Security/CWE/CWE-193/ConstantSizeArrayOffByOne.ql
+++ b/cpp/ql/src/experimental/Security/CWE/CWE-193/ConstantSizeArrayOffByOne.ql
@@ -183,6 +183,22 @@ module ArrayAddressToDerefConfig implements DataFlow::StateConfigSig {
       pointerArithOverflow(pai, _)
     )
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
+
+  Location getASelectedSourceLocation(DataFlow::Node source) {
+    exists(Variable v | result = v.getLocation() or result = source.getLocation() |
+      isSourceImpl(source, v)
+    )
+  }
+
+  Location getASelectedSinkLocation(DataFlow::Node sink) {
+    exists(PointerArithmeticInstruction pai, Instruction deref |
+      result = [[pai, deref].getLocation(), sink.getLocation()] and
+      isInvalidPointerDerefSink2(sink, deref, _) and
+      isSink(sink, ArrayAddressToDerefConfig::TOverflowArithmetic(pai))
+    )
+  }
 }
 
 module ArrayAddressToDerefFlow = DataFlow::GlobalWithState<ArrayAddressToDerefConfig>;
diff --git a/cpp/ql/src/experimental/Security/CWE/CWE-243/IncorrectChangingWorkingDirectory.ql b/cpp/ql/src/experimental/Security/CWE/CWE-243/IncorrectChangingWorkingDirectory.ql
index ce5f4dd00f8..9d61418fd77 100644
--- a/cpp/ql/src/experimental/Security/CWE/CWE-243/IncorrectChangingWorkingDirectory.ql
+++ b/cpp/ql/src/experimental/Security/CWE/CWE-243/IncorrectChangingWorkingDirectory.ql
@@ -15,7 +15,7 @@
 import cpp
 import semmle.code.cpp.commons.Exclusions
 
-/** Holds if a `fc` function call is available before or after a `chdir` function call. */
+/** Holds if a `fcp` function call is available before or after a `chdir` function call. */
 predicate inExistsChdir(FunctionCall fcp) {
   exists(FunctionCall fctmp |
     (
@@ -29,7 +29,7 @@ predicate inExistsChdir(FunctionCall fcp) {
   )
 }
 
-/** Holds if a `fc` function call is available before or after a function call containing a `chdir` call. */
+/** Holds if a `fcp` function call is available before or after a function call containing a `chdir` call. */
 predicate outExistsChdir(FunctionCall fcp) {
   exists(FunctionCall fctmp |
     exists(FunctionCall fctmp2 |
diff --git a/cpp/ql/src/experimental/Security/CWE/CWE-401/MemoryLeakOnFailedCallToRealloc.ql b/cpp/ql/src/experimental/Security/CWE/CWE-401/MemoryLeakOnFailedCallToRealloc.ql
index 3132b103bbc..df2fd13d79c 100644
--- a/cpp/ql/src/experimental/Security/CWE/CWE-401/MemoryLeakOnFailedCallToRealloc.ql
+++ b/cpp/ql/src/experimental/Security/CWE/CWE-401/MemoryLeakOnFailedCallToRealloc.ql
@@ -51,7 +51,7 @@ class ReallocCallLeak extends FunctionCall {
   predicate mayHandleByTermination() {
     exists(GuardCondition guard, CallMayNotReturn exit |
       this.(ControlFlowNode).getASuccessor*() = guard and
-      guard.getAChild*() = v.getAnAccess() and
+      guard.(Expr).getAChild*() = v.getAnAccess() and
       guard.controls(exit.getBasicBlock(), _)
     )
   }
diff --git a/cpp/ql/src/experimental/Security/CWE/CWE-409/DecompressionBombs.ql b/cpp/ql/src/experimental/Security/CWE/CWE-409/DecompressionBombs.ql
index bfa11e65b06..ec4ba042cb7 100644
--- a/cpp/ql/src/experimental/Security/CWE/CWE-409/DecompressionBombs.ql
+++ b/cpp/ql/src/experimental/Security/CWE/CWE-409/DecompressionBombs.ql
@@ -28,6 +28,12 @@ module DecompressionTaintConfig implements DataFlow::ConfigSig {
   predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
     any(DecompressionFlowStep s).isAdditionalFlowStep(node1, node2)
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
+
+  Location getASelectedSinkLocation(DataFlow::Node sink) {
+    exists(FunctionCall fc | result = [sink.getLocation(), fc.getLocation()] | isSink(fc, sink))
+  }
 }
 
 module DecompressionTaint = TaintTracking::Global<DecompressionTaintConfig>;
diff --git a/cpp/ql/src/experimental/Security/CWE/CWE-416/UseAfterExpiredLifetime.ql b/cpp/ql/src/experimental/Security/CWE/CWE-416/UseAfterExpiredLifetime.ql
index ffcac802b6d..fec373ce521 100644
--- a/cpp/ql/src/experimental/Security/CWE/CWE-416/UseAfterExpiredLifetime.ql
+++ b/cpp/ql/src/experimental/Security/CWE/CWE-416/UseAfterExpiredLifetime.ql
@@ -266,7 +266,7 @@ class LifetimePointerType extends LifetimeIndirectionType {
 class FullExpr extends Expr {
   FullExpr() {
     // A full-expression is not a subexpression
-    not exists(Expr p | this.getParent() = p)
+    not this.getParent() instanceof Expr
     or
     // A sub-expression that is an unevaluated operand
     this.isUnevaluated()
diff --git a/cpp/ql/src/external/DefectFilter.qll b/cpp/ql/src/external/DefectFilter.qll
index ad786e9cbc9..a3719140741 100644
--- a/cpp/ql/src/external/DefectFilter.qll
+++ b/cpp/ql/src/external/DefectFilter.qll
@@ -5,8 +5,8 @@ import cpp
 /**
  * Holds if `id` in the opaque identifier of a result reported by query `queryPath`,
  * such that `message` is the associated message and the location of the result spans
- * column `startcolumn` of line `startline` to column `endcolumn` of line `endline`
- * in file `filepath`.
+ * column `startcol` of line `startline` to column `endcol` of line `endline`
+ * in file `file`.
  *
  * For more information, see [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
  */
diff --git a/cpp/ql/src/external/MetricFilter.qll b/cpp/ql/src/external/MetricFilter.qll
index 0315cd23c8d..39475451b7a 100644
--- a/cpp/ql/src/external/MetricFilter.qll
+++ b/cpp/ql/src/external/MetricFilter.qll
@@ -5,8 +5,8 @@ import cpp
 /**
  * Holds if `id` in the opaque identifier of a result reported by query `queryPath`,
  * such that `value` is the reported metric value and the location of the result spans
- * column `startcolumn` of line `startline` to column `endcolumn` of line `endline`
- * in file `filepath`.
+ * column `startcol` of line `startline` to column `endcol` of line `endline`
+ * in file `file`.
  *
  * For more information, see [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
  */
diff --git a/cpp/ql/src/jsf/4.10 Classes/AV Rule 96.ql b/cpp/ql/src/jsf/4.10 Classes/AV Rule 96.ql
index 67e01ffc7c0..4697af80c17 100644
--- a/cpp/ql/src/jsf/4.10 Classes/AV Rule 96.ql	
+++ b/cpp/ql/src/jsf/4.10 Classes/AV Rule 96.ql	
@@ -28,7 +28,7 @@ where
   exists(FunctionCall c, int i, Function f |
     c.getArgument(i) = e and
     c.getTarget() = f and
-    exists(Parameter p | f.getParameter(i) = p) and // varargs
+    exists(f.getParameter(i)) and // varargs
     baseElement(e.getType(), cl) and // only interested in arrays with classes
     not compatible(f.getParameter(i).getUnspecifiedType(), e.getUnspecifiedType())
   )
diff --git a/cpp/ql/src/qlpack.yml b/cpp/ql/src/qlpack.yml
index ad3dc6c91f9..39cdb717ca7 100644
--- a/cpp/ql/src/qlpack.yml
+++ b/cpp/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cpp-queries
-version: 1.4.6-dev
+version: 1.5.4-dev
 groups:
   - cpp
   - queries
diff --git a/cpp/ql/test/examples/docs-examples/analyzing-data-flow-in-cpp/index-flow-from-ntohl.ql b/cpp/ql/test/examples/docs-examples/analyzing-data-flow-in-cpp/index-flow-from-ntohl.ql
index 15cc379131a..aaca52799d7 100644
--- a/cpp/ql/test/examples/docs-examples/analyzing-data-flow-in-cpp/index-flow-from-ntohl.ql
+++ b/cpp/ql/test/examples/docs-examples/analyzing-data-flow-in-cpp/index-flow-from-ntohl.ql
@@ -22,7 +22,7 @@ module NetworkToBufferSizeConfig implements DataFlow::ConfigSig {
 
   predicate isBarrier(DataFlow::Node node) {
     exists(GuardCondition gc, Variable v |
-      gc.getAChild*() = v.getAnAccess() and
+      gc.(Expr).getAChild*() = v.getAnAccess() and
       node.asExpr() = v.getAnAccess() and
       gc.controls(node.asExpr().getBasicBlock(), _) and
       not exists(Loop loop | loop.getControllingExpr() = gc)
diff --git a/cpp/ql/test/experimental/library-tests/quantum/node_edges.expected b/cpp/ql/test/experimental/library-tests/quantum/node_edges.expected
index 27be8e5cfba..5870bdecd8e 100644
--- a/cpp/ql/test/experimental/library-tests/quantum/node_edges.expected
+++ b/cpp/ql/test/experimental/library-tests/quantum/node_edges.expected
@@ -13,7 +13,8 @@
 | openssl_basic.c:69:33:69:47 | KeyOperationAlgorithm | Padding | openssl_basic.c:69:33:69:47 | KeyOperationAlgorithm |
 | openssl_basic.c:77:45:77:47 | Key | Source | openssl_basic.c:179:43:179:76 | Constant |
 | openssl_basic.c:77:50:77:51 | Nonce | Source | openssl_basic.c:180:42:180:59 | Constant |
-| openssl_basic.c:81:49:81:58 | Message | Source | openssl_basic.c:81:49:81:58 | Message |
+| openssl_basic.c:81:49:81:58 | Message | Source | openssl_basic.c:35:36:35:45 | KeyOperationOutput |
+| openssl_basic.c:81:49:81:58 | Message | Source | openssl_basic.c:40:38:40:53 | KeyOperationOutput |
 | openssl_basic.c:90:11:90:29 | DecryptOperation | Algorithm | openssl_basic.c:69:33:69:47 | KeyOperationAlgorithm |
 | openssl_basic.c:90:11:90:29 | DecryptOperation | Input | openssl_basic.c:81:49:81:58 | Message |
 | openssl_basic.c:90:11:90:29 | DecryptOperation | Key | openssl_basic.c:77:45:77:47 | Key |
@@ -30,24 +31,39 @@
 | openssl_basic.c:144:13:144:22 | HashOperation | Message | openssl_basic.c:144:24:144:30 | Message |
 | openssl_basic.c:144:24:144:30 | Message | Source | openssl_basic.c:181:49:181:87 | Constant |
 | openssl_basic.c:144:46:144:51 | Digest | Source | openssl_basic.c:144:46:144:51 | Digest |
-| openssl_basic.c:155:22:155:41 | Key | Algorithm | openssl_basic.c:155:22:155:41 | Key |
-| openssl_basic.c:155:22:155:41 | KeyGeneration | Algorithm | openssl_basic.c:155:22:155:41 | KeyGeneration |
+| openssl_basic.c:155:22:155:41 | Key | Algorithm | openssl_basic.c:155:43:155:55 | HMACAlgorithm |
+| openssl_basic.c:155:22:155:41 | KeyGeneration | Algorithm | openssl_basic.c:155:43:155:55 | HMACAlgorithm |
 | openssl_basic.c:155:22:155:41 | KeyGeneration | KeyInput | openssl_basic.c:155:64:155:66 | Key |
 | openssl_basic.c:155:22:155:41 | KeyGeneration | Output | openssl_basic.c:155:22:155:41 | Key |
-| openssl_basic.c:155:43:155:55 | MACAlgorithm | H | openssl_basic.c:160:39:160:48 | HashAlgorithm |
+| openssl_basic.c:155:43:155:55 | HMACAlgorithm | H | openssl_basic.c:160:39:160:48 | HashAlgorithm |
 | openssl_basic.c:155:64:155:66 | Key | Source | openssl_basic.c:179:43:179:76 | Constant |
 | openssl_basic.c:160:59:160:62 | Key | Source | openssl_basic.c:155:22:155:41 | Key |
 | openssl_basic.c:163:35:163:41 | Message | Source | openssl_basic.c:181:49:181:87 | Constant |
-| openssl_basic.c:167:9:167:27 | SignOperation | Algorithm | openssl_basic.c:167:9:167:27 | SignOperation |
-| openssl_basic.c:167:9:167:27 | SignOperation | HashAlgorithm | openssl_basic.c:160:39:160:48 | HashAlgorithm |
-| openssl_basic.c:167:9:167:27 | SignOperation | Input | openssl_basic.c:163:35:163:41 | Message |
-| openssl_basic.c:167:9:167:27 | SignOperation | Key | openssl_basic.c:160:59:160:62 | Key |
-| openssl_basic.c:167:9:167:27 | SignOperation | Output | openssl_basic.c:167:34:167:36 | SignatureOutput |
-| openssl_pkey.c:21:10:21:28 | KeyGeneration | Algorithm | openssl_pkey.c:21:10:21:28 | KeyGeneration |
+| openssl_basic.c:167:9:167:27 | SignatureOrMACOperation | Algorithm | openssl_basic.c:155:43:155:55 | HMACAlgorithm |
+| openssl_basic.c:167:9:167:27 | SignatureOrMACOperation | HashAlgorithm | openssl_basic.c:160:39:160:48 | HashAlgorithm |
+| openssl_basic.c:167:9:167:27 | SignatureOrMACOperation | Input | openssl_basic.c:163:35:163:41 | Message |
+| openssl_basic.c:167:9:167:27 | SignatureOrMACOperation | Key | openssl_basic.c:160:59:160:62 | Key |
+| openssl_basic.c:167:9:167:27 | SignatureOrMACOperation | Nonce | openssl_basic.c:167:9:167:27 | SignatureOrMACOperation |
+| openssl_basic.c:167:9:167:27 | SignatureOrMACOperation | Output | openssl_basic.c:167:34:167:36 | SignatureOutput |
+| openssl_basic.c:235:51:235:55 | KeyOperationAlgorithm | Mode | openssl_basic.c:235:51:235:55 | KeyOperationAlgorithm |
+| openssl_basic.c:235:51:235:55 | KeyOperationAlgorithm | Padding | openssl_basic.c:249:51:249:72 | PaddingAlgorithm |
+| openssl_basic.c:238:9:238:25 | KeyGeneration | Algorithm | openssl_basic.c:235:51:235:55 | KeyOperationAlgorithm |
+| openssl_basic.c:238:9:238:25 | KeyGeneration | Output | openssl_basic.c:238:39:238:43 | Key |
+| openssl_basic.c:238:39:238:43 | Key | Algorithm | openssl_basic.c:235:51:235:55 | KeyOperationAlgorithm |
+| openssl_basic.c:243:52:243:55 | Key | Source | openssl_basic.c:238:39:238:43 | Key |
+| openssl_basic.c:249:51:249:72 | PaddingAlgorithm | MD | openssl_basic.c:250:51:250:60 | HashAlgorithm |
+| openssl_basic.c:249:51:249:72 | PaddingAlgorithm | MGF1Hash | openssl_basic.c:251:51:251:60 | HashAlgorithm |
+| openssl_basic.c:262:24:262:39 | EncryptOperation | Algorithm | openssl_basic.c:235:51:235:55 | KeyOperationAlgorithm |
+| openssl_basic.c:262:24:262:39 | EncryptOperation | Input | openssl_basic.c:263:64:263:70 | Message |
+| openssl_basic.c:262:24:262:39 | EncryptOperation | Key | openssl_basic.c:243:52:243:55 | Key |
+| openssl_basic.c:262:24:262:39 | EncryptOperation | Nonce | openssl_basic.c:262:24:262:39 | EncryptOperation |
+| openssl_basic.c:262:24:262:39 | EncryptOperation | Output | openssl_basic.c:262:54:262:63 | KeyOperationOutput |
+| openssl_basic.c:263:64:263:70 | Message | Source | openssl_basic.c:231:27:231:49 | Constant |
+| openssl_pkey.c:21:10:21:28 | KeyGeneration | Algorithm | openssl_pkey.c:21:10:21:28 | KeyOperationAlgorithm |
 | openssl_pkey.c:21:10:21:28 | KeyGeneration | Output | openssl_pkey.c:21:30:21:32 | Key |
 | openssl_pkey.c:21:10:21:28 | KeyOperationAlgorithm | Mode | openssl_pkey.c:21:10:21:28 | KeyOperationAlgorithm |
 | openssl_pkey.c:21:10:21:28 | KeyOperationAlgorithm | Padding | openssl_pkey.c:21:10:21:28 | KeyOperationAlgorithm |
-| openssl_pkey.c:21:30:21:32 | Key | Algorithm | openssl_pkey.c:21:30:21:32 | Key |
+| openssl_pkey.c:21:30:21:32 | Key | Algorithm | openssl_pkey.c:21:10:21:28 | KeyOperationAlgorithm |
 | openssl_pkey.c:50:31:50:42 | KeyOperationAlgorithm | Mode | openssl_pkey.c:50:31:50:42 | KeyOperationAlgorithm |
 | openssl_pkey.c:50:31:50:42 | KeyOperationAlgorithm | Padding | openssl_pkey.c:50:31:50:42 | KeyOperationAlgorithm |
 | openssl_pkey.c:55:9:55:23 | KeyGeneration | Algorithm | openssl_pkey.c:50:31:50:42 | KeyOperationAlgorithm |
@@ -60,105 +76,174 @@
 | openssl_pkey.c:64:9:64:24 | EncryptOperation | Nonce | openssl_pkey.c:64:9:64:24 | EncryptOperation |
 | openssl_pkey.c:64:9:64:24 | EncryptOperation | Output | openssl_pkey.c:64:31:64:39 | KeyOperationOutput |
 | openssl_pkey.c:64:58:64:66 | Message | Source | openssl_pkey.c:45:49:45:65 | Constant |
-| openssl_signature.c:22:34:22:40 | Message | Source | openssl_signature.c:602:37:602:77 | Constant |
-| openssl_signature.c:22:34:22:40 | Message | Source | openssl_signature.c:685:37:685:77 | Constant |
-| openssl_signature.c:22:34:22:40 | Message | Source | openssl_signature.c:741:37:741:77 | Constant |
-| openssl_signature.c:23:9:23:26 | HashOperation | Algorithm | openssl_signature.c:684:24:684:33 | HashAlgorithm |
-| openssl_signature.c:23:9:23:26 | HashOperation | Algorithm | openssl_signature.c:740:24:740:33 | HashAlgorithm |
-| openssl_signature.c:23:9:23:26 | HashOperation | Digest | openssl_signature.c:23:36:23:41 | Digest |
-| openssl_signature.c:23:9:23:26 | HashOperation | Message | openssl_signature.c:22:34:22:40 | Message |
-| openssl_signature.c:23:36:23:41 | Digest | Source | openssl_signature.c:23:36:23:41 | Digest |
-| openssl_signature.c:70:32:70:38 | Message | Source | openssl_signature.c:602:37:602:77 | Constant |
-| openssl_signature.c:75:28:75:36 | Message | Source | openssl_signature.c:75:28:75:36 | Message |
-| openssl_signature.c:80:9:80:21 | SignOperation | Algorithm | openssl_signature.c:543:35:543:46 | KeyOperationAlgorithm |
-| openssl_signature.c:80:9:80:21 | SignOperation | Algorithm | openssl_signature.c:565:50:565:54 | KeyOperationAlgorithm |
-| openssl_signature.c:80:9:80:21 | SignOperation | HashAlgorithm | openssl_signature.c:684:24:684:33 | HashAlgorithm |
-| openssl_signature.c:80:9:80:21 | SignOperation | HashAlgorithm | openssl_signature.c:740:24:740:33 | HashAlgorithm |
-| openssl_signature.c:80:9:80:21 | SignOperation | Input | openssl_signature.c:70:32:70:38 | Message |
-| openssl_signature.c:80:9:80:21 | SignOperation | Input | openssl_signature.c:75:28:75:36 | Message |
-| openssl_signature.c:80:9:80:21 | SignOperation | Key | openssl_signature.c:80:53:80:56 | Key |
-| openssl_signature.c:80:9:80:21 | SignOperation | Output | openssl_signature.c:80:31:80:40 | SignatureOutput |
-| openssl_signature.c:80:53:80:56 | Key | Source | openssl_signature.c:548:34:548:37 | Key |
-| openssl_signature.c:80:53:80:56 | Key | Source | openssl_signature.c:578:34:578:37 | Key |
-| openssl_signature.c:133:52:133:55 | Key | Source | openssl_signature.c:548:34:548:37 | Key |
-| openssl_signature.c:133:52:133:55 | Key | Source | openssl_signature.c:578:34:578:37 | Key |
-| openssl_signature.c:134:38:134:44 | Message | Source | openssl_signature.c:602:37:602:77 | Constant |
-| openssl_signature.c:135:9:135:27 | SignOperation | Algorithm | openssl_signature.c:543:35:543:46 | KeyOperationAlgorithm |
-| openssl_signature.c:135:9:135:27 | SignOperation | Algorithm | openssl_signature.c:565:50:565:54 | KeyOperationAlgorithm |
-| openssl_signature.c:135:9:135:27 | SignOperation | HashAlgorithm | openssl_signature.c:684:24:684:33 | HashAlgorithm |
-| openssl_signature.c:135:9:135:27 | SignOperation | HashAlgorithm | openssl_signature.c:740:24:740:33 | HashAlgorithm |
-| openssl_signature.c:135:9:135:27 | SignOperation | Input | openssl_signature.c:134:38:134:44 | Message |
-| openssl_signature.c:135:9:135:27 | SignOperation | Key | openssl_signature.c:133:52:133:55 | Key |
-| openssl_signature.c:135:9:135:27 | SignOperation | Output | openssl_signature.c:135:37:135:40 | SignatureOutput |
-| openssl_signature.c:142:9:142:27 | SignOperation | Algorithm | openssl_signature.c:543:35:543:46 | KeyOperationAlgorithm |
-| openssl_signature.c:142:9:142:27 | SignOperation | Algorithm | openssl_signature.c:565:50:565:54 | KeyOperationAlgorithm |
-| openssl_signature.c:142:9:142:27 | SignOperation | HashAlgorithm | openssl_signature.c:684:24:684:33 | HashAlgorithm |
-| openssl_signature.c:142:9:142:27 | SignOperation | HashAlgorithm | openssl_signature.c:740:24:740:33 | HashAlgorithm |
-| openssl_signature.c:142:9:142:27 | SignOperation | Input | openssl_signature.c:134:38:134:44 | Message |
-| openssl_signature.c:142:9:142:27 | SignOperation | Key | openssl_signature.c:133:52:133:55 | Key |
-| openssl_signature.c:142:9:142:27 | SignOperation | Output | openssl_signature.c:142:37:142:46 | SignatureOutput |
-| openssl_signature.c:190:57:190:60 | Key | Source | openssl_signature.c:548:34:548:37 | Key |
-| openssl_signature.c:190:57:190:60 | Key | Source | openssl_signature.c:578:34:578:37 | Key |
-| openssl_signature.c:196:38:196:44 | Message | Source | openssl_signature.c:602:37:602:77 | Constant |
-| openssl_signature.c:197:9:197:27 | SignOperation | Algorithm | openssl_signature.c:543:35:543:46 | KeyOperationAlgorithm |
-| openssl_signature.c:197:9:197:27 | SignOperation | Algorithm | openssl_signature.c:565:50:565:54 | KeyOperationAlgorithm |
-| openssl_signature.c:197:9:197:27 | SignOperation | HashAlgorithm | openssl_signature.c:684:24:684:33 | HashAlgorithm |
-| openssl_signature.c:197:9:197:27 | SignOperation | HashAlgorithm | openssl_signature.c:740:24:740:33 | HashAlgorithm |
-| openssl_signature.c:197:9:197:27 | SignOperation | Input | openssl_signature.c:196:38:196:44 | Message |
-| openssl_signature.c:197:9:197:27 | SignOperation | Key | openssl_signature.c:190:57:190:60 | Key |
-| openssl_signature.c:197:9:197:27 | SignOperation | Output | openssl_signature.c:197:37:197:40 | SignatureOutput |
-| openssl_signature.c:204:9:204:27 | SignOperation | Algorithm | openssl_signature.c:543:35:543:46 | KeyOperationAlgorithm |
-| openssl_signature.c:204:9:204:27 | SignOperation | Algorithm | openssl_signature.c:565:50:565:54 | KeyOperationAlgorithm |
-| openssl_signature.c:204:9:204:27 | SignOperation | HashAlgorithm | openssl_signature.c:684:24:684:33 | HashAlgorithm |
-| openssl_signature.c:204:9:204:27 | SignOperation | HashAlgorithm | openssl_signature.c:740:24:740:33 | HashAlgorithm |
-| openssl_signature.c:204:9:204:27 | SignOperation | Input | openssl_signature.c:196:38:196:44 | Message |
-| openssl_signature.c:204:9:204:27 | SignOperation | Key | openssl_signature.c:190:57:190:60 | Key |
-| openssl_signature.c:204:9:204:27 | SignOperation | Output | openssl_signature.c:204:37:204:46 | SignatureOutput |
-| openssl_signature.c:260:39:260:42 | Key | Source | openssl_signature.c:548:34:548:37 | Key |
-| openssl_signature.c:260:39:260:42 | Key | Source | openssl_signature.c:578:34:578:37 | Key |
-| openssl_signature.c:263:9:263:21 | SignOperation | Algorithm | openssl_signature.c:543:35:543:46 | KeyOperationAlgorithm |
-| openssl_signature.c:263:9:263:21 | SignOperation | Algorithm | openssl_signature.c:565:50:565:54 | KeyOperationAlgorithm |
-| openssl_signature.c:263:9:263:21 | SignOperation | HashAlgorithm | openssl_signature.c:684:24:684:33 | HashAlgorithm |
-| openssl_signature.c:263:9:263:21 | SignOperation | HashAlgorithm | openssl_signature.c:740:24:740:33 | HashAlgorithm |
-| openssl_signature.c:263:9:263:21 | SignOperation | Input | openssl_signature.c:263:54:263:59 | Message |
-| openssl_signature.c:263:9:263:21 | SignOperation | Key | openssl_signature.c:260:39:260:42 | Key |
-| openssl_signature.c:263:9:263:21 | SignOperation | Output | openssl_signature.c:263:33:263:36 | SignatureOutput |
-| openssl_signature.c:263:54:263:59 | Message | Source | openssl_signature.c:263:54:263:59 | Message |
-| openssl_signature.c:270:9:270:21 | SignOperation | Algorithm | openssl_signature.c:543:35:543:46 | KeyOperationAlgorithm |
-| openssl_signature.c:270:9:270:21 | SignOperation | Algorithm | openssl_signature.c:565:50:565:54 | KeyOperationAlgorithm |
-| openssl_signature.c:270:9:270:21 | SignOperation | HashAlgorithm | openssl_signature.c:684:24:684:33 | HashAlgorithm |
-| openssl_signature.c:270:9:270:21 | SignOperation | HashAlgorithm | openssl_signature.c:740:24:740:33 | HashAlgorithm |
-| openssl_signature.c:270:9:270:21 | SignOperation | Input | openssl_signature.c:270:60:270:65 | Message |
-| openssl_signature.c:270:9:270:21 | SignOperation | Key | openssl_signature.c:260:39:260:42 | Key |
-| openssl_signature.c:270:9:270:21 | SignOperation | Output | openssl_signature.c:270:33:270:42 | SignatureOutput |
-| openssl_signature.c:270:60:270:65 | Message | Source | openssl_signature.c:270:60:270:65 | Message |
-| openssl_signature.c:321:39:321:42 | Key | Source | openssl_signature.c:548:34:548:37 | Key |
-| openssl_signature.c:321:39:321:42 | Key | Source | openssl_signature.c:578:34:578:37 | Key |
-| openssl_signature.c:326:48:326:54 | Message | Source | openssl_signature.c:602:37:602:77 | Constant |
-| openssl_signature.c:327:9:327:35 | SignOperation | Algorithm | openssl_signature.c:543:35:543:46 | KeyOperationAlgorithm |
-| openssl_signature.c:327:9:327:35 | SignOperation | Algorithm | openssl_signature.c:565:50:565:54 | KeyOperationAlgorithm |
-| openssl_signature.c:327:9:327:35 | SignOperation | Algorithm | openssl_signature.c:702:60:702:71 | KeyOperationAlgorithm |
-| openssl_signature.c:327:9:327:35 | SignOperation | Algorithm | openssl_signature.c:758:60:758:64 | KeyOperationAlgorithm |
-| openssl_signature.c:327:9:327:35 | SignOperation | HashAlgorithm | openssl_signature.c:327:9:327:35 | SignOperation |
-| openssl_signature.c:327:9:327:35 | SignOperation | Input | openssl_signature.c:326:48:326:54 | Message |
-| openssl_signature.c:327:9:327:35 | SignOperation | Key | openssl_signature.c:321:39:321:42 | Key |
-| openssl_signature.c:327:9:327:35 | SignOperation | Output | openssl_signature.c:327:47:327:50 | SignatureOutput |
-| openssl_signature.c:334:9:334:35 | SignOperation | Algorithm | openssl_signature.c:543:35:543:46 | KeyOperationAlgorithm |
-| openssl_signature.c:334:9:334:35 | SignOperation | Algorithm | openssl_signature.c:565:50:565:54 | KeyOperationAlgorithm |
-| openssl_signature.c:334:9:334:35 | SignOperation | Algorithm | openssl_signature.c:702:60:702:71 | KeyOperationAlgorithm |
-| openssl_signature.c:334:9:334:35 | SignOperation | Algorithm | openssl_signature.c:758:60:758:64 | KeyOperationAlgorithm |
-| openssl_signature.c:334:9:334:35 | SignOperation | HashAlgorithm | openssl_signature.c:334:9:334:35 | SignOperation |
-| openssl_signature.c:334:9:334:35 | SignOperation | Input | openssl_signature.c:326:48:326:54 | Message |
-| openssl_signature.c:334:9:334:35 | SignOperation | Key | openssl_signature.c:321:39:321:42 | Key |
-| openssl_signature.c:334:9:334:35 | SignOperation | Output | openssl_signature.c:334:47:334:56 | SignatureOutput |
-| openssl_signature.c:543:35:543:46 | KeyOperationAlgorithm | Mode | openssl_signature.c:543:35:543:46 | KeyOperationAlgorithm |
-| openssl_signature.c:543:35:543:46 | KeyOperationAlgorithm | Padding | openssl_signature.c:543:35:543:46 | KeyOperationAlgorithm |
-| openssl_signature.c:548:9:548:23 | KeyGeneration | Algorithm | openssl_signature.c:543:35:543:46 | KeyOperationAlgorithm |
-| openssl_signature.c:548:9:548:23 | KeyGeneration | Output | openssl_signature.c:548:34:548:37 | Key |
-| openssl_signature.c:548:34:548:37 | Key | Algorithm | openssl_signature.c:543:35:543:46 | KeyOperationAlgorithm |
-| openssl_signature.c:575:32:575:37 | Key | Source | openssl_signature.c:575:32:575:37 | Key |
-| openssl_signature.c:578:9:578:23 | KeyGeneration | Algorithm | openssl_signature.c:565:50:565:54 | KeyOperationAlgorithm |
-| openssl_signature.c:578:9:578:23 | KeyGeneration | KeyInput | openssl_signature.c:575:32:575:37 | Key |
-| openssl_signature.c:578:9:578:23 | KeyGeneration | Output | openssl_signature.c:578:34:578:37 | Key |
-| openssl_signature.c:578:34:578:37 | Key | Algorithm | openssl_signature.c:565:50:565:54 | KeyOperationAlgorithm |
-| openssl_signature.c:702:60:702:71 | KeyOperationAlgorithm | Padding | openssl_signature.c:702:60:702:71 | KeyOperationAlgorithm |
+| openssl_signature.c:25:34:25:40 | Message | Source | openssl_signature.c:615:37:615:74 | Constant |
+| openssl_signature.c:25:34:25:40 | Message | Source | openssl_signature.c:732:37:732:66 | Constant |
+| openssl_signature.c:26:9:26:26 | HashOperation | Algorithm | openssl_signature.c:616:24:616:33 | HashAlgorithm |
+| openssl_signature.c:26:9:26:26 | HashOperation | Algorithm | openssl_signature.c:733:24:733:31 | HashAlgorithm |
+| openssl_signature.c:26:9:26:26 | HashOperation | Digest | openssl_signature.c:26:36:26:41 | Digest |
+| openssl_signature.c:26:9:26:26 | HashOperation | Message | openssl_signature.c:25:34:25:40 | Message |
+| openssl_signature.c:26:36:26:41 | Digest | Source | openssl_signature.c:26:36:26:41 | Digest |
+| openssl_signature.c:63:32:63:38 | Message | Source | openssl_signature.c:651:37:651:61 | Constant |
+| openssl_signature.c:68:28:68:36 | Message | Source | openssl_signature.c:651:37:651:61 | Constant |
+| openssl_signature.c:73:9:73:21 | SignOperation | Algorithm | openssl_signature.c:661:35:661:46 | KeyOperationAlgorithm |
+| openssl_signature.c:73:9:73:21 | SignOperation | HashAlgorithm | openssl_signature.c:652:24:652:33 | HashAlgorithm |
+| openssl_signature.c:73:9:73:21 | SignOperation | Input | openssl_signature.c:63:32:63:38 | Message |
+| openssl_signature.c:73:9:73:21 | SignOperation | Input | openssl_signature.c:68:28:68:36 | Message |
+| openssl_signature.c:73:9:73:21 | SignOperation | Key | openssl_signature.c:73:53:73:56 | Key |
+| openssl_signature.c:73:9:73:21 | SignOperation | Output | openssl_signature.c:73:31:73:40 | SignatureOutput |
+| openssl_signature.c:73:53:73:56 | Key | Source | openssl_signature.c:666:34:666:37 | Key |
+| openssl_signature.c:98:34:98:40 | Message | Source | openssl_signature.c:651:37:651:61 | Constant |
+| openssl_signature.c:99:34:99:42 | Message | Source | openssl_signature.c:651:37:651:61 | Constant |
+| openssl_signature.c:100:9:100:23 | VerifyOperation | Algorithm | openssl_signature.c:661:35:661:46 | KeyOperationAlgorithm |
+| openssl_signature.c:100:9:100:23 | VerifyOperation | HashAlgorithm | openssl_signature.c:652:24:652:33 | HashAlgorithm |
+| openssl_signature.c:100:9:100:23 | VerifyOperation | Input | openssl_signature.c:98:34:98:40 | Message |
+| openssl_signature.c:100:9:100:23 | VerifyOperation | Input | openssl_signature.c:99:34:99:42 | Message |
+| openssl_signature.c:100:9:100:23 | VerifyOperation | Key | openssl_signature.c:100:73:100:76 | Key |
+| openssl_signature.c:100:9:100:23 | VerifyOperation | Signature | openssl_signature.c:100:33:100:41 | SignatureInput |
+| openssl_signature.c:100:33:100:41 | SignatureInput | Source | openssl_signature.c:73:31:73:40 | SignatureOutput |
+| openssl_signature.c:100:73:100:76 | Key | Source | openssl_signature.c:666:34:666:37 | Key |
+| openssl_signature.c:126:52:126:55 | Key | Source | openssl_signature.c:707:34:707:37 | Key |
+| openssl_signature.c:127:38:127:44 | Message | Source | openssl_signature.c:692:37:692:67 | Constant |
+| openssl_signature.c:135:9:135:27 | SignatureOrMACOperation | Algorithm | openssl_signature.c:702:35:702:46 | KeyOperationAlgorithm |
+| openssl_signature.c:135:9:135:27 | SignatureOrMACOperation | HashAlgorithm | openssl_signature.c:693:24:693:33 | HashAlgorithm |
+| openssl_signature.c:135:9:135:27 | SignatureOrMACOperation | Input | openssl_signature.c:127:38:127:44 | Message |
+| openssl_signature.c:135:9:135:27 | SignatureOrMACOperation | Key | openssl_signature.c:126:52:126:55 | Key |
+| openssl_signature.c:135:9:135:27 | SignatureOrMACOperation | Nonce | openssl_signature.c:135:9:135:27 | SignatureOrMACOperation |
+| openssl_signature.c:135:9:135:27 | SignatureOrMACOperation | Output | openssl_signature.c:135:37:135:46 | SignatureOutput |
+| openssl_signature.c:158:54:158:57 | Key | Source | openssl_signature.c:707:34:707:37 | Key |
+| openssl_signature.c:159:40:159:46 | Message | Source | openssl_signature.c:692:37:692:67 | Constant |
+| openssl_signature.c:160:9:160:29 | VerifyOperation | Algorithm | openssl_signature.c:702:35:702:46 | KeyOperationAlgorithm |
+| openssl_signature.c:160:9:160:29 | VerifyOperation | HashAlgorithm | openssl_signature.c:693:24:693:33 | HashAlgorithm |
+| openssl_signature.c:160:9:160:29 | VerifyOperation | Input | openssl_signature.c:159:40:159:46 | Message |
+| openssl_signature.c:160:9:160:29 | VerifyOperation | Key | openssl_signature.c:158:54:158:57 | Key |
+| openssl_signature.c:160:9:160:29 | VerifyOperation | Signature | openssl_signature.c:160:39:160:47 | SignatureInput |
+| openssl_signature.c:160:39:160:47 | SignatureInput | Source | openssl_signature.c:135:37:135:46 | SignatureOutput |
+| openssl_signature.c:182:57:182:60 | Key | Source | openssl_signature.c:791:34:791:37 | Key |
+| openssl_signature.c:187:38:187:44 | Message | Source | openssl_signature.c:777:37:777:73 | Constant |
+| openssl_signature.c:195:9:195:27 | SignatureOrMACOperation | Algorithm | openssl_signature.c:786:35:786:46 | KeyOperationAlgorithm |
+| openssl_signature.c:195:9:195:27 | SignatureOrMACOperation | HashAlgorithm | openssl_signature.c:778:24:778:31 | HashAlgorithm |
+| openssl_signature.c:195:9:195:27 | SignatureOrMACOperation | Input | openssl_signature.c:187:38:187:44 | Message |
+| openssl_signature.c:195:9:195:27 | SignatureOrMACOperation | Key | openssl_signature.c:182:57:182:60 | Key |
+| openssl_signature.c:195:9:195:27 | SignatureOrMACOperation | Nonce | openssl_signature.c:195:9:195:27 | SignatureOrMACOperation |
+| openssl_signature.c:195:9:195:27 | SignatureOrMACOperation | Output | openssl_signature.c:195:37:195:46 | SignatureOutput |
+| openssl_signature.c:218:59:218:62 | Key | Source | openssl_signature.c:791:34:791:37 | Key |
+| openssl_signature.c:224:40:224:46 | Message | Source | openssl_signature.c:777:37:777:73 | Constant |
+| openssl_signature.c:225:9:225:29 | VerifyOperation | Algorithm | openssl_signature.c:786:35:786:46 | KeyOperationAlgorithm |
+| openssl_signature.c:225:9:225:29 | VerifyOperation | HashAlgorithm | openssl_signature.c:778:24:778:31 | HashAlgorithm |
+| openssl_signature.c:225:9:225:29 | VerifyOperation | Input | openssl_signature.c:224:40:224:46 | Message |
+| openssl_signature.c:225:9:225:29 | VerifyOperation | Key | openssl_signature.c:218:59:218:62 | Key |
+| openssl_signature.c:225:9:225:29 | VerifyOperation | Signature | openssl_signature.c:225:39:225:47 | SignatureInput |
+| openssl_signature.c:225:39:225:47 | SignatureInput | Source | openssl_signature.c:195:37:195:46 | SignatureOutput |
+| openssl_signature.c:250:39:250:42 | Key | Source | openssl_signature.c:751:34:751:37 | Key |
+| openssl_signature.c:260:9:260:21 | SignOperation | Algorithm | openssl_signature.c:746:35:746:46 | KeyOperationAlgorithm |
+| openssl_signature.c:260:9:260:21 | SignOperation | HashAlgorithm | openssl_signature.c:733:24:733:31 | HashAlgorithm |
+| openssl_signature.c:260:9:260:21 | SignOperation | Input | openssl_signature.c:260:60:260:65 | Message |
+| openssl_signature.c:260:9:260:21 | SignOperation | Key | openssl_signature.c:250:39:250:42 | Key |
+| openssl_signature.c:260:9:260:21 | SignOperation | Output | openssl_signature.c:260:33:260:42 | SignatureOutput |
+| openssl_signature.c:260:60:260:65 | Message | Source | openssl_signature.c:26:36:26:41 | Digest |
+| openssl_signature.c:282:39:282:42 | Key | Source | openssl_signature.c:751:34:751:37 | Key |
+| openssl_signature.c:285:9:285:23 | VerifyOperation | Algorithm | openssl_signature.c:746:35:746:46 | KeyOperationAlgorithm |
+| openssl_signature.c:285:9:285:23 | VerifyOperation | HashAlgorithm | openssl_signature.c:733:24:733:31 | HashAlgorithm |
+| openssl_signature.c:285:9:285:23 | VerifyOperation | Input | openssl_signature.c:285:61:285:66 | Message |
+| openssl_signature.c:285:9:285:23 | VerifyOperation | Key | openssl_signature.c:282:39:282:42 | Key |
+| openssl_signature.c:285:9:285:23 | VerifyOperation | Signature | openssl_signature.c:285:35:285:43 | SignatureInput |
+| openssl_signature.c:285:35:285:43 | SignatureInput | Source | openssl_signature.c:260:33:260:42 | SignatureOutput |
+| openssl_signature.c:285:61:285:66 | Message | Source | openssl_signature.c:26:36:26:41 | Digest |
+| openssl_signature.c:311:39:311:42 | Key | Source | openssl_signature.c:829:34:829:37 | Key |
+| openssl_signature.c:316:48:316:54 | Message | Source | openssl_signature.c:817:37:817:63 | Constant |
+| openssl_signature.c:324:9:324:35 | SignOperation | Algorithm | openssl_signature.c:824:35:824:46 | KeyOperationAlgorithm |
+| openssl_signature.c:324:9:324:35 | SignOperation | Algorithm | openssl_signature.c:838:85:838:96 | KeyOperationAlgorithm |
+| openssl_signature.c:324:9:324:35 | SignOperation | HashAlgorithm | openssl_signature.c:838:85:838:96 | HashAlgorithm |
+| openssl_signature.c:324:9:324:35 | SignOperation | Input | openssl_signature.c:316:48:316:54 | Message |
+| openssl_signature.c:324:9:324:35 | SignOperation | Key | openssl_signature.c:311:39:311:42 | Key |
+| openssl_signature.c:324:9:324:35 | SignOperation | Output | openssl_signature.c:324:47:324:56 | SignatureOutput |
+| openssl_signature.c:347:39:347:42 | Key | Source | openssl_signature.c:829:34:829:37 | Key |
+| openssl_signature.c:353:42:353:50 | SignatureInput | Source | openssl_signature.c:324:47:324:56 | SignatureOutput |
+| openssl_signature.c:355:50:355:56 | Message | Source | openssl_signature.c:817:37:817:63 | Constant |
+| openssl_signature.c:356:9:356:37 | VerifyOperation | Algorithm | openssl_signature.c:824:35:824:46 | KeyOperationAlgorithm |
+| openssl_signature.c:356:9:356:37 | VerifyOperation | Algorithm | openssl_signature.c:839:87:839:98 | KeyOperationAlgorithm |
+| openssl_signature.c:356:9:356:37 | VerifyOperation | HashAlgorithm | openssl_signature.c:839:87:839:98 | HashAlgorithm |
+| openssl_signature.c:356:9:356:37 | VerifyOperation | Input | openssl_signature.c:355:50:355:56 | Message |
+| openssl_signature.c:356:9:356:37 | VerifyOperation | Key | openssl_signature.c:347:39:347:42 | Key |
+| openssl_signature.c:356:9:356:37 | VerifyOperation | Signature | openssl_signature.c:353:42:353:50 | SignatureInput |
+| openssl_signature.c:384:9:384:16 | KeyOperationAlgorithm | Mode | openssl_signature.c:384:9:384:16 | KeyOperationAlgorithm |
+| openssl_signature.c:384:9:384:16 | KeyOperationAlgorithm | Padding | openssl_signature.c:384:9:384:16 | KeyOperationAlgorithm |
+| openssl_signature.c:384:9:384:16 | SignOperation | Algorithm | openssl_signature.c:384:9:384:16 | KeyOperationAlgorithm |
+| openssl_signature.c:384:9:384:16 | SignOperation | Algorithm | openssl_signature.c:574:35:574:46 | KeyOperationAlgorithm |
+| openssl_signature.c:384:9:384:16 | SignOperation | HashAlgorithm | openssl_signature.c:595:37:595:46 | HashAlgorithm |
+| openssl_signature.c:384:9:384:16 | SignOperation | Input | openssl_signature.c:384:28:384:34 | Message |
+| openssl_signature.c:384:9:384:16 | SignOperation | Key | openssl_signature.c:385:48:385:54 | Key |
+| openssl_signature.c:384:9:384:16 | SignOperation | Output | openssl_signature.c:384:50:384:59 | SignatureOutput |
+| openssl_signature.c:384:28:384:34 | Message | Source | openssl_signature.c:566:37:566:74 | Constant |
+| openssl_signature.c:385:48:385:54 | Key | Source | openssl_signature.c:579:34:579:37 | Key |
+| openssl_signature.c:403:12:403:21 | KeyOperationAlgorithm | Mode | openssl_signature.c:403:12:403:21 | KeyOperationAlgorithm |
+| openssl_signature.c:403:12:403:21 | KeyOperationAlgorithm | Padding | openssl_signature.c:403:12:403:21 | KeyOperationAlgorithm |
+| openssl_signature.c:403:12:403:21 | VerifyOperation | Algorithm | openssl_signature.c:403:12:403:21 | KeyOperationAlgorithm |
+| openssl_signature.c:403:12:403:21 | VerifyOperation | Algorithm | openssl_signature.c:574:35:574:46 | KeyOperationAlgorithm |
+| openssl_signature.c:403:12:403:21 | VerifyOperation | HashAlgorithm | openssl_signature.c:597:41:597:50 | HashAlgorithm |
+| openssl_signature.c:403:12:403:21 | VerifyOperation | Input | openssl_signature.c:403:33:403:39 | Message |
+| openssl_signature.c:403:12:403:21 | VerifyOperation | Key | openssl_signature.c:404:51:404:57 | Key |
+| openssl_signature.c:403:12:403:21 | VerifyOperation | Signature | openssl_signature.c:403:55:403:63 | SignatureInput |
+| openssl_signature.c:403:33:403:39 | Message | Source | openssl_signature.c:566:37:566:74 | Constant |
+| openssl_signature.c:403:55:403:63 | SignatureInput | Source | openssl_signature.c:384:50:384:59 | SignatureOutput |
+| openssl_signature.c:404:51:404:57 | Key | Source | openssl_signature.c:579:34:579:37 | Key |
+| openssl_signature.c:428:11:428:21 | SignOperation | Algorithm | openssl_signature.c:428:11:428:21 | KeyOperationAlgorithm |
+| openssl_signature.c:428:11:428:21 | SignOperation | Algorithm | openssl_signature.c:533:50:533:54 | KeyOperationAlgorithm |
+| openssl_signature.c:428:11:428:21 | SignOperation | HashAlgorithm | openssl_signature.c:428:11:428:21 | SignOperation |
+| openssl_signature.c:428:11:428:21 | SignOperation | Input | openssl_signature.c:428:23:428:28 | Message |
+| openssl_signature.c:428:11:428:21 | SignOperation | Key | openssl_signature.c:428:43:428:49 | Key |
+| openssl_signature.c:428:11:428:21 | SignOperation | Output | openssl_signature.c:428:11:428:21 | SignatureOutput |
+| openssl_signature.c:428:23:428:28 | Message | Source | openssl_signature.c:26:36:26:41 | Digest |
+| openssl_signature.c:428:43:428:49 | Key | Source | openssl_signature.c:546:34:546:37 | Key |
+| openssl_signature.c:484:15:484:27 | VerifyOperation | Algorithm | openssl_signature.c:484:15:484:27 | KeyOperationAlgorithm |
+| openssl_signature.c:484:15:484:27 | VerifyOperation | Algorithm | openssl_signature.c:533:50:533:54 | KeyOperationAlgorithm |
+| openssl_signature.c:484:15:484:27 | VerifyOperation | HashAlgorithm | openssl_signature.c:484:15:484:27 | VerifyOperation |
+| openssl_signature.c:484:15:484:27 | VerifyOperation | Input | openssl_signature.c:484:29:484:34 | Message |
+| openssl_signature.c:484:15:484:27 | VerifyOperation | Key | openssl_signature.c:484:54:484:60 | Key |
+| openssl_signature.c:484:15:484:27 | VerifyOperation | Signature | openssl_signature.c:484:49:484:51 | SignatureInput |
+| openssl_signature.c:484:29:484:34 | Message | Source | openssl_signature.c:26:36:26:41 | Digest |
+| openssl_signature.c:484:49:484:51 | SignatureInput | Source | openssl_signature.c:428:11:428:21 | SignatureOutput |
+| openssl_signature.c:484:54:484:60 | Key | Source | openssl_signature.c:546:34:546:37 | Key |
+| openssl_signature.c:511:35:511:46 | KeyOperationAlgorithm | Mode | openssl_signature.c:511:35:511:46 | KeyOperationAlgorithm |
+| openssl_signature.c:511:35:511:46 | KeyOperationAlgorithm | Padding | openssl_signature.c:511:35:511:46 | KeyOperationAlgorithm |
+| openssl_signature.c:516:9:516:23 | KeyGeneration | Algorithm | openssl_signature.c:511:35:511:46 | KeyOperationAlgorithm |
+| openssl_signature.c:516:9:516:23 | KeyGeneration | Output | openssl_signature.c:516:34:516:37 | Key |
+| openssl_signature.c:516:34:516:37 | Key | Algorithm | openssl_signature.c:511:35:511:46 | KeyOperationAlgorithm |
+| openssl_signature.c:543:32:543:37 | Key | Source | openssl_signature.c:543:32:543:37 | Key |
+| openssl_signature.c:546:9:546:23 | KeyGeneration | Algorithm | openssl_signature.c:533:50:533:54 | KeyOperationAlgorithm |
+| openssl_signature.c:546:9:546:23 | KeyGeneration | KeyInput | openssl_signature.c:543:32:543:37 | Key |
+| openssl_signature.c:546:9:546:23 | KeyGeneration | Output | openssl_signature.c:546:34:546:37 | Key |
+| openssl_signature.c:546:34:546:37 | Key | Algorithm | openssl_signature.c:533:50:533:54 | KeyOperationAlgorithm |
+| openssl_signature.c:574:35:574:46 | KeyOperationAlgorithm | Mode | openssl_signature.c:574:35:574:46 | KeyOperationAlgorithm |
+| openssl_signature.c:574:35:574:46 | KeyOperationAlgorithm | Padding | openssl_signature.c:574:35:574:46 | KeyOperationAlgorithm |
+| openssl_signature.c:579:9:579:23 | KeyGeneration | Algorithm | openssl_signature.c:574:35:574:46 | KeyOperationAlgorithm |
+| openssl_signature.c:579:9:579:23 | KeyGeneration | Output | openssl_signature.c:579:34:579:37 | Key |
+| openssl_signature.c:579:34:579:37 | Key | Algorithm | openssl_signature.c:574:35:574:46 | KeyOperationAlgorithm |
+| openssl_signature.c:661:35:661:46 | KeyOperationAlgorithm | Mode | openssl_signature.c:661:35:661:46 | KeyOperationAlgorithm |
+| openssl_signature.c:661:35:661:46 | KeyOperationAlgorithm | Padding | openssl_signature.c:661:35:661:46 | KeyOperationAlgorithm |
+| openssl_signature.c:666:9:666:23 | KeyGeneration | Algorithm | openssl_signature.c:661:35:661:46 | KeyOperationAlgorithm |
+| openssl_signature.c:666:9:666:23 | KeyGeneration | Output | openssl_signature.c:666:34:666:37 | Key |
+| openssl_signature.c:666:34:666:37 | Key | Algorithm | openssl_signature.c:661:35:661:46 | KeyOperationAlgorithm |
+| openssl_signature.c:702:35:702:46 | KeyOperationAlgorithm | Mode | openssl_signature.c:702:35:702:46 | KeyOperationAlgorithm |
+| openssl_signature.c:702:35:702:46 | KeyOperationAlgorithm | Padding | openssl_signature.c:702:35:702:46 | KeyOperationAlgorithm |
+| openssl_signature.c:707:9:707:23 | KeyGeneration | Algorithm | openssl_signature.c:702:35:702:46 | KeyOperationAlgorithm |
+| openssl_signature.c:707:9:707:23 | KeyGeneration | Output | openssl_signature.c:707:34:707:37 | Key |
+| openssl_signature.c:707:34:707:37 | Key | Algorithm | openssl_signature.c:702:35:702:46 | KeyOperationAlgorithm |
+| openssl_signature.c:746:35:746:46 | KeyOperationAlgorithm | Mode | openssl_signature.c:746:35:746:46 | KeyOperationAlgorithm |
+| openssl_signature.c:746:35:746:46 | KeyOperationAlgorithm | Padding | openssl_signature.c:746:35:746:46 | KeyOperationAlgorithm |
+| openssl_signature.c:751:9:751:23 | KeyGeneration | Algorithm | openssl_signature.c:746:35:746:46 | KeyOperationAlgorithm |
+| openssl_signature.c:751:9:751:23 | KeyGeneration | Output | openssl_signature.c:751:34:751:37 | Key |
+| openssl_signature.c:751:34:751:37 | Key | Algorithm | openssl_signature.c:746:35:746:46 | KeyOperationAlgorithm |
+| openssl_signature.c:786:35:786:46 | KeyOperationAlgorithm | Mode | openssl_signature.c:786:35:786:46 | KeyOperationAlgorithm |
+| openssl_signature.c:786:35:786:46 | KeyOperationAlgorithm | Padding | openssl_signature.c:185:44:185:64 | PaddingAlgorithm |
+| openssl_signature.c:786:35:786:46 | KeyOperationAlgorithm | Padding | openssl_signature.c:222:44:222:64 | PaddingAlgorithm |
+| openssl_signature.c:791:9:791:23 | KeyGeneration | Algorithm | openssl_signature.c:786:35:786:46 | KeyOperationAlgorithm |
+| openssl_signature.c:791:9:791:23 | KeyGeneration | Output | openssl_signature.c:791:34:791:37 | Key |
+| openssl_signature.c:791:34:791:37 | Key | Algorithm | openssl_signature.c:786:35:786:46 | KeyOperationAlgorithm |
+| openssl_signature.c:824:35:824:46 | KeyOperationAlgorithm | Mode | openssl_signature.c:824:35:824:46 | KeyOperationAlgorithm |
+| openssl_signature.c:824:35:824:46 | KeyOperationAlgorithm | Padding | openssl_signature.c:824:35:824:46 | KeyOperationAlgorithm |
+| openssl_signature.c:829:9:829:23 | KeyGeneration | Algorithm | openssl_signature.c:824:35:824:46 | KeyOperationAlgorithm |
+| openssl_signature.c:829:9:829:23 | KeyGeneration | Output | openssl_signature.c:829:34:829:37 | Key |
+| openssl_signature.c:829:34:829:37 | Key | Algorithm | openssl_signature.c:824:35:824:46 | KeyOperationAlgorithm |
+| openssl_signature.c:838:85:838:96 | KeyOperationAlgorithm | Padding | openssl_signature.c:838:85:838:96 | KeyOperationAlgorithm |
+| openssl_signature.c:839:87:839:98 | KeyOperationAlgorithm | Padding | openssl_signature.c:839:87:839:98 | KeyOperationAlgorithm |
diff --git a/cpp/ql/test/experimental/library-tests/quantum/node_properties.expected b/cpp/ql/test/experimental/library-tests/quantum/node_properties.expected
index 52a7c61502b..4f435517eef 100644
--- a/cpp/ql/test/experimental/library-tests/quantum/node_properties.expected
+++ b/cpp/ql/test/experimental/library-tests/quantum/node_properties.expected
@@ -21,18 +21,34 @@
 | openssl_basic.c:144:67:144:73 | HashAlgorithm | Name | MD5 | openssl_basic.c:144:67:144:73 | openssl_basic.c:144:67:144:73 |
 | openssl_basic.c:144:67:144:73 | HashAlgorithm | RawName | EVP_md5 | openssl_basic.c:144:67:144:73 | openssl_basic.c:144:67:144:73 |
 | openssl_basic.c:155:22:155:41 | Key | KeyType | Asymmetric | openssl_basic.c:155:22:155:41 | openssl_basic.c:155:22:155:41 |
-| openssl_basic.c:155:43:155:55 | MACAlgorithm | Name | HMAC | openssl_basic.c:155:43:155:55 | openssl_basic.c:155:43:155:55 |
-| openssl_basic.c:155:43:155:55 | MACAlgorithm | RawName | 855 | openssl_basic.c:155:43:155:55 | openssl_basic.c:155:43:155:55 |
+| openssl_basic.c:155:43:155:55 | HMACAlgorithm | Name | HMAC | openssl_basic.c:155:43:155:55 | openssl_basic.c:155:43:155:55 |
+| openssl_basic.c:155:43:155:55 | HMACAlgorithm | RawName | 855 | openssl_basic.c:155:43:155:55 | openssl_basic.c:155:43:155:55 |
 | openssl_basic.c:155:64:155:66 | Key | KeyType | Unknown | openssl_basic.c:155:64:155:66 | openssl_basic.c:155:64:155:66 |
 | openssl_basic.c:160:39:160:48 | HashAlgorithm | DigestSize | 256 | openssl_basic.c:160:39:160:48 | openssl_basic.c:160:39:160:48 |
 | openssl_basic.c:160:39:160:48 | HashAlgorithm | Name | SHA2 | openssl_basic.c:160:39:160:48 | openssl_basic.c:160:39:160:48 |
 | openssl_basic.c:160:39:160:48 | HashAlgorithm | RawName | EVP_sha256 | openssl_basic.c:160:39:160:48 | openssl_basic.c:160:39:160:48 |
 | openssl_basic.c:160:59:160:62 | Key | KeyType | Unknown | openssl_basic.c:160:59:160:62 | openssl_basic.c:160:59:160:62 |
-| openssl_basic.c:167:9:167:27 | SignOperation | KeyOperationSubtype | Sign | openssl_basic.c:167:9:167:27 | openssl_basic.c:167:9:167:27 |
+| openssl_basic.c:167:9:167:27 | SignatureOrMACOperation | KeyOperationSubtype | Mac | openssl_basic.c:167:9:167:27 | openssl_basic.c:167:9:167:27 |
+| openssl_basic.c:167:9:167:27 | SignatureOrMACOperation | KeyOperationSubtype | Sign | openssl_basic.c:167:9:167:27 | openssl_basic.c:167:9:167:27 |
 | openssl_basic.c:179:43:179:76 | Constant | Description | 01234567890123456789012345678901 | openssl_basic.c:179:43:179:76 | openssl_basic.c:179:43:179:76 |
 | openssl_basic.c:180:42:180:59 | Constant | Description | 0123456789012345 | openssl_basic.c:180:42:180:59 | openssl_basic.c:180:42:180:59 |
 | openssl_basic.c:181:49:181:87 | Constant | Description | This is a test message for encryption | openssl_basic.c:181:49:181:87 | openssl_basic.c:181:49:181:87 |
 | openssl_basic.c:218:32:218:33 | Constant | Description | 32 | openssl_basic.c:218:32:218:33 | openssl_basic.c:218:32:218:33 |
+| openssl_basic.c:231:27:231:49 | Constant | Description | Encrypt me with OAEP! | openssl_basic.c:231:27:231:49 | openssl_basic.c:231:27:231:49 |
+| openssl_basic.c:235:51:235:55 | KeyOperationAlgorithm | Name | RSA | openssl_basic.c:235:51:235:55 | openssl_basic.c:235:51:235:55 |
+| openssl_basic.c:235:51:235:55 | KeyOperationAlgorithm | RawName | RSA | openssl_basic.c:235:51:235:55 | openssl_basic.c:235:51:235:55 |
+| openssl_basic.c:237:54:237:57 | Constant | Description | 2048 | openssl_basic.c:237:54:237:57 | openssl_basic.c:237:54:237:57 |
+| openssl_basic.c:238:39:238:43 | Key | KeyType | Asymmetric | openssl_basic.c:238:39:238:43 | openssl_basic.c:238:39:238:43 |
+| openssl_basic.c:243:52:243:55 | Key | KeyType | Unknown | openssl_basic.c:243:52:243:55 | openssl_basic.c:243:52:243:55 |
+| openssl_basic.c:249:51:249:72 | PaddingAlgorithm | Name | OAEP | openssl_basic.c:249:51:249:72 | openssl_basic.c:249:51:249:72 |
+| openssl_basic.c:249:51:249:72 | PaddingAlgorithm | RawName | 4 | openssl_basic.c:249:51:249:72 | openssl_basic.c:249:51:249:72 |
+| openssl_basic.c:250:51:250:60 | HashAlgorithm | DigestSize | 256 | openssl_basic.c:250:51:250:60 | openssl_basic.c:250:51:250:60 |
+| openssl_basic.c:250:51:250:60 | HashAlgorithm | Name | SHA2 | openssl_basic.c:250:51:250:60 | openssl_basic.c:250:51:250:60 |
+| openssl_basic.c:250:51:250:60 | HashAlgorithm | RawName | EVP_sha256 | openssl_basic.c:250:51:250:60 | openssl_basic.c:250:51:250:60 |
+| openssl_basic.c:251:51:251:60 | HashAlgorithm | DigestSize | 256 | openssl_basic.c:251:51:251:60 | openssl_basic.c:251:51:251:60 |
+| openssl_basic.c:251:51:251:60 | HashAlgorithm | Name | SHA2 | openssl_basic.c:251:51:251:60 | openssl_basic.c:251:51:251:60 |
+| openssl_basic.c:251:51:251:60 | HashAlgorithm | RawName | EVP_sha256 | openssl_basic.c:251:51:251:60 | openssl_basic.c:251:51:251:60 |
+| openssl_basic.c:262:24:262:39 | EncryptOperation | KeyOperationSubtype | Encrypt | openssl_basic.c:262:24:262:39 | openssl_basic.c:262:24:262:39 |
 | openssl_pkey.c:21:10:21:28 | KeyOperationAlgorithm | Name | RSA | openssl_pkey.c:21:10:21:28 | openssl_pkey.c:21:10:21:28 |
 | openssl_pkey.c:21:10:21:28 | KeyOperationAlgorithm | RawName | RSA_generate_key_ex | openssl_pkey.c:21:10:21:28 | openssl_pkey.c:21:10:21:28 |
 | openssl_pkey.c:21:30:21:32 | Key | KeyType | Asymmetric | openssl_pkey.c:21:30:21:32 | openssl_pkey.c:21:30:21:32 |
@@ -43,44 +59,116 @@
 | openssl_pkey.c:55:30:55:34 | Key | KeyType | Asymmetric | openssl_pkey.c:55:30:55:34 | openssl_pkey.c:55:30:55:34 |
 | openssl_pkey.c:60:28:60:31 | Key | KeyType | Unknown | openssl_pkey.c:60:28:60:31 | openssl_pkey.c:60:28:60:31 |
 | openssl_pkey.c:64:9:64:24 | EncryptOperation | KeyOperationSubtype | Encrypt | openssl_pkey.c:64:9:64:24 | openssl_pkey.c:64:9:64:24 |
-| openssl_signature.c:80:9:80:21 | SignOperation | KeyOperationSubtype | Sign | openssl_signature.c:80:9:80:21 | openssl_signature.c:80:9:80:21 |
-| openssl_signature.c:80:53:80:56 | Key | KeyType | Unknown | openssl_signature.c:80:53:80:56 | openssl_signature.c:80:53:80:56 |
-| openssl_signature.c:133:52:133:55 | Key | KeyType | Unknown | openssl_signature.c:133:52:133:55 | openssl_signature.c:133:52:133:55 |
-| openssl_signature.c:135:9:135:27 | SignOperation | KeyOperationSubtype | Sign | openssl_signature.c:135:9:135:27 | openssl_signature.c:135:9:135:27 |
-| openssl_signature.c:142:9:142:27 | SignOperation | KeyOperationSubtype | Sign | openssl_signature.c:142:9:142:27 | openssl_signature.c:142:9:142:27 |
-| openssl_signature.c:190:57:190:60 | Key | KeyType | Unknown | openssl_signature.c:190:57:190:60 | openssl_signature.c:190:57:190:60 |
-| openssl_signature.c:197:9:197:27 | SignOperation | KeyOperationSubtype | Sign | openssl_signature.c:197:9:197:27 | openssl_signature.c:197:9:197:27 |
-| openssl_signature.c:204:9:204:27 | SignOperation | KeyOperationSubtype | Sign | openssl_signature.c:204:9:204:27 | openssl_signature.c:204:9:204:27 |
-| openssl_signature.c:260:39:260:42 | Key | KeyType | Unknown | openssl_signature.c:260:39:260:42 | openssl_signature.c:260:39:260:42 |
-| openssl_signature.c:263:9:263:21 | SignOperation | KeyOperationSubtype | Sign | openssl_signature.c:263:9:263:21 | openssl_signature.c:263:9:263:21 |
-| openssl_signature.c:270:9:270:21 | SignOperation | KeyOperationSubtype | Sign | openssl_signature.c:270:9:270:21 | openssl_signature.c:270:9:270:21 |
-| openssl_signature.c:321:39:321:42 | Key | KeyType | Unknown | openssl_signature.c:321:39:321:42 | openssl_signature.c:321:39:321:42 |
-| openssl_signature.c:327:9:327:35 | SignOperation | KeyOperationSubtype | Sign | openssl_signature.c:327:9:327:35 | openssl_signature.c:327:9:327:35 |
-| openssl_signature.c:334:9:334:35 | SignOperation | KeyOperationSubtype | Sign | openssl_signature.c:334:9:334:35 | openssl_signature.c:334:9:334:35 |
-| openssl_signature.c:521:46:521:66 | PaddingAlgorithm | Name | PSS | openssl_signature.c:521:46:521:66 | openssl_signature.c:521:46:521:66 |
-| openssl_signature.c:521:46:521:66 | PaddingAlgorithm | RawName | 6 | openssl_signature.c:521:46:521:66 | openssl_signature.c:521:46:521:66 |
-| openssl_signature.c:543:35:543:46 | KeyOperationAlgorithm | Name | RSA | openssl_signature.c:543:35:543:46 | openssl_signature.c:543:35:543:46 |
-| openssl_signature.c:543:35:543:46 | KeyOperationAlgorithm | RawName | 6 | openssl_signature.c:543:35:543:46 | openssl_signature.c:543:35:543:46 |
-| openssl_signature.c:547:51:547:54 | Constant | Description | 2048 | openssl_signature.c:547:51:547:54 | openssl_signature.c:547:51:547:54 |
-| openssl_signature.c:548:34:548:37 | Key | KeyType | Asymmetric | openssl_signature.c:548:34:548:37 | openssl_signature.c:548:34:548:37 |
-| openssl_signature.c:565:50:565:54 | KeyOperationAlgorithm | Name | DSA | openssl_signature.c:565:50:565:54 | openssl_signature.c:565:50:565:54 |
-| openssl_signature.c:565:50:565:54 | KeyOperationAlgorithm | RawName | dsa | openssl_signature.c:565:50:565:54 | openssl_signature.c:565:50:565:54 |
-| openssl_signature.c:569:55:569:58 | Constant | Description | 2048 | openssl_signature.c:569:55:569:58 | openssl_signature.c:569:55:569:58 |
-| openssl_signature.c:575:32:575:37 | Key | KeyType | Unknown | openssl_signature.c:575:32:575:37 | openssl_signature.c:575:32:575:37 |
-| openssl_signature.c:578:34:578:37 | Key | KeyType | Asymmetric | openssl_signature.c:578:34:578:37 | openssl_signature.c:578:34:578:37 |
-| openssl_signature.c:602:37:602:77 | Constant | Description | Test message for OpenSSL signature APIs | openssl_signature.c:602:37:602:77 | openssl_signature.c:602:37:602:77 |
-| openssl_signature.c:684:24:684:33 | HashAlgorithm | DigestSize | 256 | openssl_signature.c:684:24:684:33 | openssl_signature.c:684:24:684:33 |
-| openssl_signature.c:684:24:684:33 | HashAlgorithm | Name | SHA2 | openssl_signature.c:684:24:684:33 | openssl_signature.c:684:24:684:33 |
-| openssl_signature.c:684:24:684:33 | HashAlgorithm | RawName | EVP_sha256 | openssl_signature.c:684:24:684:33 | openssl_signature.c:684:24:684:33 |
-| openssl_signature.c:685:37:685:77 | Constant | Description | Test message for OpenSSL signature APIs | openssl_signature.c:685:37:685:77 | openssl_signature.c:685:37:685:77 |
-| openssl_signature.c:702:60:702:71 | HashAlgorithm | DigestSize | 256 | openssl_signature.c:702:60:702:71 | openssl_signature.c:702:60:702:71 |
-| openssl_signature.c:702:60:702:71 | HashAlgorithm | Name | SHA2 | openssl_signature.c:702:60:702:71 | openssl_signature.c:702:60:702:71 |
-| openssl_signature.c:702:60:702:71 | HashAlgorithm | RawName | RSA-SHA256 | openssl_signature.c:702:60:702:71 | openssl_signature.c:702:60:702:71 |
-| openssl_signature.c:702:60:702:71 | KeyOperationAlgorithm | Name | RSA | openssl_signature.c:702:60:702:71 | openssl_signature.c:702:60:702:71 |
-| openssl_signature.c:702:60:702:71 | KeyOperationAlgorithm | RawName | RSA-SHA256 | openssl_signature.c:702:60:702:71 | openssl_signature.c:702:60:702:71 |
-| openssl_signature.c:740:24:740:33 | HashAlgorithm | DigestSize | 256 | openssl_signature.c:740:24:740:33 | openssl_signature.c:740:24:740:33 |
-| openssl_signature.c:740:24:740:33 | HashAlgorithm | Name | SHA2 | openssl_signature.c:740:24:740:33 | openssl_signature.c:740:24:740:33 |
-| openssl_signature.c:740:24:740:33 | HashAlgorithm | RawName | EVP_sha256 | openssl_signature.c:740:24:740:33 | openssl_signature.c:740:24:740:33 |
-| openssl_signature.c:741:37:741:77 | Constant | Description | Test message for OpenSSL signature APIs | openssl_signature.c:741:37:741:77 | openssl_signature.c:741:37:741:77 |
-| openssl_signature.c:758:60:758:64 | KeyOperationAlgorithm | Name | DSA | openssl_signature.c:758:60:758:64 | openssl_signature.c:758:60:758:64 |
-| openssl_signature.c:758:60:758:64 | KeyOperationAlgorithm | RawName | dsa | openssl_signature.c:758:60:758:64 | openssl_signature.c:758:60:758:64 |
+| openssl_signature.c:73:9:73:21 | SignOperation | KeyOperationSubtype | Sign | openssl_signature.c:73:9:73:21 | openssl_signature.c:73:9:73:21 |
+| openssl_signature.c:73:53:73:56 | Key | KeyType | Unknown | openssl_signature.c:73:53:73:56 | openssl_signature.c:73:53:73:56 |
+| openssl_signature.c:100:9:100:23 | VerifyOperation | KeyOperationSubtype | Verify | openssl_signature.c:100:9:100:23 | openssl_signature.c:100:9:100:23 |
+| openssl_signature.c:100:73:100:76 | Key | KeyType | Unknown | openssl_signature.c:100:73:100:76 | openssl_signature.c:100:73:100:76 |
+| openssl_signature.c:126:52:126:55 | Key | KeyType | Unknown | openssl_signature.c:126:52:126:55 | openssl_signature.c:126:52:126:55 |
+| openssl_signature.c:135:9:135:27 | SignatureOrMACOperation | KeyOperationSubtype | Mac | openssl_signature.c:135:9:135:27 | openssl_signature.c:135:9:135:27 |
+| openssl_signature.c:135:9:135:27 | SignatureOrMACOperation | KeyOperationSubtype | Sign | openssl_signature.c:135:9:135:27 | openssl_signature.c:135:9:135:27 |
+| openssl_signature.c:158:54:158:57 | Key | KeyType | Unknown | openssl_signature.c:158:54:158:57 | openssl_signature.c:158:54:158:57 |
+| openssl_signature.c:160:9:160:29 | VerifyOperation | KeyOperationSubtype | Verify | openssl_signature.c:160:9:160:29 | openssl_signature.c:160:9:160:29 |
+| openssl_signature.c:182:57:182:60 | Key | KeyType | Unknown | openssl_signature.c:182:57:182:60 | openssl_signature.c:182:57:182:60 |
+| openssl_signature.c:185:44:185:64 | PaddingAlgorithm | Name | PSS | openssl_signature.c:185:44:185:64 | openssl_signature.c:185:44:185:64 |
+| openssl_signature.c:185:44:185:64 | PaddingAlgorithm | RawName | 6 | openssl_signature.c:185:44:185:64 | openssl_signature.c:185:44:185:64 |
+| openssl_signature.c:195:9:195:27 | SignatureOrMACOperation | KeyOperationSubtype | Mac | openssl_signature.c:195:9:195:27 | openssl_signature.c:195:9:195:27 |
+| openssl_signature.c:195:9:195:27 | SignatureOrMACOperation | KeyOperationSubtype | Sign | openssl_signature.c:195:9:195:27 | openssl_signature.c:195:9:195:27 |
+| openssl_signature.c:218:59:218:62 | Key | KeyType | Unknown | openssl_signature.c:218:59:218:62 | openssl_signature.c:218:59:218:62 |
+| openssl_signature.c:222:44:222:64 | PaddingAlgorithm | Name | PSS | openssl_signature.c:222:44:222:64 | openssl_signature.c:222:44:222:64 |
+| openssl_signature.c:222:44:222:64 | PaddingAlgorithm | RawName | 6 | openssl_signature.c:222:44:222:64 | openssl_signature.c:222:44:222:64 |
+| openssl_signature.c:225:9:225:29 | VerifyOperation | KeyOperationSubtype | Verify | openssl_signature.c:225:9:225:29 | openssl_signature.c:225:9:225:29 |
+| openssl_signature.c:250:39:250:42 | Key | KeyType | Unknown | openssl_signature.c:250:39:250:42 | openssl_signature.c:250:39:250:42 |
+| openssl_signature.c:260:9:260:21 | SignOperation | KeyOperationSubtype | Sign | openssl_signature.c:260:9:260:21 | openssl_signature.c:260:9:260:21 |
+| openssl_signature.c:282:39:282:42 | Key | KeyType | Unknown | openssl_signature.c:282:39:282:42 | openssl_signature.c:282:39:282:42 |
+| openssl_signature.c:285:9:285:23 | VerifyOperation | KeyOperationSubtype | Verify | openssl_signature.c:285:9:285:23 | openssl_signature.c:285:9:285:23 |
+| openssl_signature.c:311:39:311:42 | Key | KeyType | Unknown | openssl_signature.c:311:39:311:42 | openssl_signature.c:311:39:311:42 |
+| openssl_signature.c:324:9:324:35 | SignOperation | KeyOperationSubtype | Sign | openssl_signature.c:324:9:324:35 | openssl_signature.c:324:9:324:35 |
+| openssl_signature.c:347:39:347:42 | Key | KeyType | Unknown | openssl_signature.c:347:39:347:42 | openssl_signature.c:347:39:347:42 |
+| openssl_signature.c:356:9:356:37 | VerifyOperation | KeyOperationSubtype | Verify | openssl_signature.c:356:9:356:37 | openssl_signature.c:356:9:356:37 |
+| openssl_signature.c:384:9:384:16 | KeyOperationAlgorithm | Name | RSA | openssl_signature.c:384:9:384:16 | openssl_signature.c:384:9:384:16 |
+| openssl_signature.c:384:9:384:16 | KeyOperationAlgorithm | RawName | RSA_sign | openssl_signature.c:384:9:384:16 | openssl_signature.c:384:9:384:16 |
+| openssl_signature.c:384:9:384:16 | SignOperation | KeyOperationSubtype | Sign | openssl_signature.c:384:9:384:16 | openssl_signature.c:384:9:384:16 |
+| openssl_signature.c:385:48:385:54 | Key | KeyType | Unknown | openssl_signature.c:385:48:385:54 | openssl_signature.c:385:48:385:54 |
+| openssl_signature.c:403:12:403:21 | KeyOperationAlgorithm | Name | RSA | openssl_signature.c:403:12:403:21 | openssl_signature.c:403:12:403:21 |
+| openssl_signature.c:403:12:403:21 | KeyOperationAlgorithm | RawName | RSA_verify | openssl_signature.c:403:12:403:21 | openssl_signature.c:403:12:403:21 |
+| openssl_signature.c:403:12:403:21 | VerifyOperation | KeyOperationSubtype | Verify | openssl_signature.c:403:12:403:21 | openssl_signature.c:403:12:403:21 |
+| openssl_signature.c:404:51:404:57 | Key | KeyType | Unknown | openssl_signature.c:404:51:404:57 | openssl_signature.c:404:51:404:57 |
+| openssl_signature.c:428:11:428:21 | KeyOperationAlgorithm | Name | DSA | openssl_signature.c:428:11:428:21 | openssl_signature.c:428:11:428:21 |
+| openssl_signature.c:428:11:428:21 | KeyOperationAlgorithm | RawName | DSA_do_sign | openssl_signature.c:428:11:428:21 | openssl_signature.c:428:11:428:21 |
+| openssl_signature.c:428:11:428:21 | SignOperation | KeyOperationSubtype | Sign | openssl_signature.c:428:11:428:21 | openssl_signature.c:428:11:428:21 |
+| openssl_signature.c:428:43:428:49 | Key | KeyType | Unknown | openssl_signature.c:428:43:428:49 | openssl_signature.c:428:43:428:49 |
+| openssl_signature.c:484:15:484:27 | KeyOperationAlgorithm | Name | DSA | openssl_signature.c:484:15:484:27 | openssl_signature.c:484:15:484:27 |
+| openssl_signature.c:484:15:484:27 | KeyOperationAlgorithm | RawName | DSA_do_verify | openssl_signature.c:484:15:484:27 | openssl_signature.c:484:15:484:27 |
+| openssl_signature.c:484:15:484:27 | VerifyOperation | KeyOperationSubtype | Verify | openssl_signature.c:484:15:484:27 | openssl_signature.c:484:15:484:27 |
+| openssl_signature.c:484:54:484:60 | Key | KeyType | Unknown | openssl_signature.c:484:54:484:60 | openssl_signature.c:484:54:484:60 |
+| openssl_signature.c:511:35:511:46 | KeyOperationAlgorithm | Name | RSA | openssl_signature.c:511:35:511:46 | openssl_signature.c:511:35:511:46 |
+| openssl_signature.c:511:35:511:46 | KeyOperationAlgorithm | RawName | 6 | openssl_signature.c:511:35:511:46 | openssl_signature.c:511:35:511:46 |
+| openssl_signature.c:515:51:515:54 | Constant | Description | 2048 | openssl_signature.c:515:51:515:54 | openssl_signature.c:515:51:515:54 |
+| openssl_signature.c:516:34:516:37 | Key | KeyType | Asymmetric | openssl_signature.c:516:34:516:37 | openssl_signature.c:516:34:516:37 |
+| openssl_signature.c:533:50:533:54 | KeyOperationAlgorithm | Name | DSA | openssl_signature.c:533:50:533:54 | openssl_signature.c:533:50:533:54 |
+| openssl_signature.c:533:50:533:54 | KeyOperationAlgorithm | RawName | dsa | openssl_signature.c:533:50:533:54 | openssl_signature.c:533:50:533:54 |
+| openssl_signature.c:537:55:537:58 | Constant | Description | 2048 | openssl_signature.c:537:55:537:58 | openssl_signature.c:537:55:537:58 |
+| openssl_signature.c:543:32:543:37 | Key | KeyType | Unknown | openssl_signature.c:543:32:543:37 | openssl_signature.c:543:32:543:37 |
+| openssl_signature.c:546:34:546:37 | Key | KeyType | Asymmetric | openssl_signature.c:546:34:546:37 | openssl_signature.c:546:34:546:37 |
+| openssl_signature.c:566:37:566:74 | Constant | Description | testLowLevelRSASignAndVerify message | openssl_signature.c:566:37:566:74 | openssl_signature.c:566:37:566:74 |
+| openssl_signature.c:574:35:574:46 | KeyOperationAlgorithm | Name | RSA | openssl_signature.c:574:35:574:46 | openssl_signature.c:574:35:574:46 |
+| openssl_signature.c:574:35:574:46 | KeyOperationAlgorithm | RawName | 6 | openssl_signature.c:574:35:574:46 | openssl_signature.c:574:35:574:46 |
+| openssl_signature.c:578:51:578:54 | Constant | Description | 2048 | openssl_signature.c:578:51:578:54 | openssl_signature.c:578:51:578:54 |
+| openssl_signature.c:579:34:579:37 | Key | KeyType | Asymmetric | openssl_signature.c:579:34:579:37 | openssl_signature.c:579:34:579:37 |
+| openssl_signature.c:595:37:595:46 | HashAlgorithm | DigestSize | 256 | openssl_signature.c:595:37:595:46 | openssl_signature.c:595:37:595:46 |
+| openssl_signature.c:595:37:595:46 | HashAlgorithm | Name | SHA2 | openssl_signature.c:595:37:595:46 | openssl_signature.c:595:37:595:46 |
+| openssl_signature.c:595:37:595:46 | HashAlgorithm | RawName | 672 | openssl_signature.c:595:37:595:46 | openssl_signature.c:595:37:595:46 |
+| openssl_signature.c:597:41:597:50 | HashAlgorithm | DigestSize | 256 | openssl_signature.c:597:41:597:50 | openssl_signature.c:597:41:597:50 |
+| openssl_signature.c:597:41:597:50 | HashAlgorithm | Name | SHA2 | openssl_signature.c:597:41:597:50 | openssl_signature.c:597:41:597:50 |
+| openssl_signature.c:597:41:597:50 | HashAlgorithm | RawName | 672 | openssl_signature.c:597:41:597:50 | openssl_signature.c:597:41:597:50 |
+| openssl_signature.c:615:37:615:74 | Constant | Description | testLowLevelDSASignAndVerify message | openssl_signature.c:615:37:615:74 | openssl_signature.c:615:37:615:74 |
+| openssl_signature.c:616:24:616:33 | HashAlgorithm | DigestSize | 256 | openssl_signature.c:616:24:616:33 | openssl_signature.c:616:24:616:33 |
+| openssl_signature.c:616:24:616:33 | HashAlgorithm | Name | SHA2 | openssl_signature.c:616:24:616:33 | openssl_signature.c:616:24:616:33 |
+| openssl_signature.c:616:24:616:33 | HashAlgorithm | RawName | EVP_sha256 | openssl_signature.c:616:24:616:33 | openssl_signature.c:616:24:616:33 |
+| openssl_signature.c:651:37:651:61 | Constant | Description | testEVP_SignAPI message | openssl_signature.c:651:37:651:61 | openssl_signature.c:651:37:651:61 |
+| openssl_signature.c:652:24:652:33 | HashAlgorithm | DigestSize | 224 | openssl_signature.c:652:24:652:33 | openssl_signature.c:652:24:652:33 |
+| openssl_signature.c:652:24:652:33 | HashAlgorithm | Name | SHA2 | openssl_signature.c:652:24:652:33 | openssl_signature.c:652:24:652:33 |
+| openssl_signature.c:652:24:652:33 | HashAlgorithm | RawName | EVP_sha224 | openssl_signature.c:652:24:652:33 | openssl_signature.c:652:24:652:33 |
+| openssl_signature.c:661:35:661:46 | KeyOperationAlgorithm | Name | RSA | openssl_signature.c:661:35:661:46 | openssl_signature.c:661:35:661:46 |
+| openssl_signature.c:661:35:661:46 | KeyOperationAlgorithm | RawName | 6 | openssl_signature.c:661:35:661:46 | openssl_signature.c:661:35:661:46 |
+| openssl_signature.c:665:51:665:54 | Constant | Description | 2048 | openssl_signature.c:665:51:665:54 | openssl_signature.c:665:51:665:54 |
+| openssl_signature.c:666:34:666:37 | Key | KeyType | Asymmetric | openssl_signature.c:666:34:666:37 | openssl_signature.c:666:34:666:37 |
+| openssl_signature.c:692:37:692:67 | Constant | Description | testEVP_DigestSignAPI message | openssl_signature.c:692:37:692:67 | openssl_signature.c:692:37:692:67 |
+| openssl_signature.c:693:24:693:33 | HashAlgorithm | DigestSize | 224 | openssl_signature.c:693:24:693:33 | openssl_signature.c:693:24:693:33 |
+| openssl_signature.c:693:24:693:33 | HashAlgorithm | Name | SHA2 | openssl_signature.c:693:24:693:33 | openssl_signature.c:693:24:693:33 |
+| openssl_signature.c:693:24:693:33 | HashAlgorithm | RawName | EVP_sha224 | openssl_signature.c:693:24:693:33 | openssl_signature.c:693:24:693:33 |
+| openssl_signature.c:702:35:702:46 | KeyOperationAlgorithm | Name | RSA | openssl_signature.c:702:35:702:46 | openssl_signature.c:702:35:702:46 |
+| openssl_signature.c:702:35:702:46 | KeyOperationAlgorithm | RawName | 6 | openssl_signature.c:702:35:702:46 | openssl_signature.c:702:35:702:46 |
+| openssl_signature.c:706:51:706:54 | Constant | Description | 2048 | openssl_signature.c:706:51:706:54 | openssl_signature.c:706:51:706:54 |
+| openssl_signature.c:707:34:707:37 | Key | KeyType | Asymmetric | openssl_signature.c:707:34:707:37 | openssl_signature.c:707:34:707:37 |
+| openssl_signature.c:732:37:732:66 | Constant | Description | testEVP_PKEY_signAPI message | openssl_signature.c:732:37:732:66 | openssl_signature.c:732:37:732:66 |
+| openssl_signature.c:733:24:733:31 | HashAlgorithm | DigestSize | 160 | openssl_signature.c:733:24:733:31 | openssl_signature.c:733:24:733:31 |
+| openssl_signature.c:733:24:733:31 | HashAlgorithm | Name | SHA1 | openssl_signature.c:733:24:733:31 | openssl_signature.c:733:24:733:31 |
+| openssl_signature.c:733:24:733:31 | HashAlgorithm | RawName | EVP_sha1 | openssl_signature.c:733:24:733:31 | openssl_signature.c:733:24:733:31 |
+| openssl_signature.c:746:35:746:46 | KeyOperationAlgorithm | Name | RSA | openssl_signature.c:746:35:746:46 | openssl_signature.c:746:35:746:46 |
+| openssl_signature.c:746:35:746:46 | KeyOperationAlgorithm | RawName | 6 | openssl_signature.c:746:35:746:46 | openssl_signature.c:746:35:746:46 |
+| openssl_signature.c:750:51:750:54 | Constant | Description | 2048 | openssl_signature.c:750:51:750:54 | openssl_signature.c:750:51:750:54 |
+| openssl_signature.c:751:34:751:37 | Key | KeyType | Asymmetric | openssl_signature.c:751:34:751:37 | openssl_signature.c:751:34:751:37 |
+| openssl_signature.c:777:37:777:73 | Constant | Description | testEVP_DigestSign_with_ctx message | openssl_signature.c:777:37:777:73 | openssl_signature.c:777:37:777:73 |
+| openssl_signature.c:778:24:778:31 | HashAlgorithm | DigestSize | 160 | openssl_signature.c:778:24:778:31 | openssl_signature.c:778:24:778:31 |
+| openssl_signature.c:778:24:778:31 | HashAlgorithm | Name | SHA1 | openssl_signature.c:778:24:778:31 | openssl_signature.c:778:24:778:31 |
+| openssl_signature.c:778:24:778:31 | HashAlgorithm | RawName | EVP_sha1 | openssl_signature.c:778:24:778:31 | openssl_signature.c:778:24:778:31 |
+| openssl_signature.c:786:35:786:46 | KeyOperationAlgorithm | Name | RSA | openssl_signature.c:786:35:786:46 | openssl_signature.c:786:35:786:46 |
+| openssl_signature.c:786:35:786:46 | KeyOperationAlgorithm | RawName | 6 | openssl_signature.c:786:35:786:46 | openssl_signature.c:786:35:786:46 |
+| openssl_signature.c:790:51:790:54 | Constant | Description | 2048 | openssl_signature.c:790:51:790:54 | openssl_signature.c:790:51:790:54 |
+| openssl_signature.c:791:34:791:37 | Key | KeyType | Asymmetric | openssl_signature.c:791:34:791:37 | openssl_signature.c:791:34:791:37 |
+| openssl_signature.c:817:37:817:63 | Constant | Description | testEVP_PKEY_sign_message | openssl_signature.c:817:37:817:63 | openssl_signature.c:817:37:817:63 |
+| openssl_signature.c:824:35:824:46 | KeyOperationAlgorithm | Name | RSA | openssl_signature.c:824:35:824:46 | openssl_signature.c:824:35:824:46 |
+| openssl_signature.c:824:35:824:46 | KeyOperationAlgorithm | RawName | 6 | openssl_signature.c:824:35:824:46 | openssl_signature.c:824:35:824:46 |
+| openssl_signature.c:828:51:828:54 | Constant | Description | 2048 | openssl_signature.c:828:51:828:54 | openssl_signature.c:828:51:828:54 |
+| openssl_signature.c:829:34:829:37 | Key | KeyType | Asymmetric | openssl_signature.c:829:34:829:37 | openssl_signature.c:829:34:829:37 |
+| openssl_signature.c:838:85:838:96 | HashAlgorithm | DigestSize | 256 | openssl_signature.c:838:85:838:96 | openssl_signature.c:838:85:838:96 |
+| openssl_signature.c:838:85:838:96 | HashAlgorithm | Name | SHA2 | openssl_signature.c:838:85:838:96 | openssl_signature.c:838:85:838:96 |
+| openssl_signature.c:838:85:838:96 | HashAlgorithm | RawName | RSA-SHA256 | openssl_signature.c:838:85:838:96 | openssl_signature.c:838:85:838:96 |
+| openssl_signature.c:838:85:838:96 | KeyOperationAlgorithm | Name | RSA | openssl_signature.c:838:85:838:96 | openssl_signature.c:838:85:838:96 |
+| openssl_signature.c:838:85:838:96 | KeyOperationAlgorithm | RawName | RSA-SHA256 | openssl_signature.c:838:85:838:96 | openssl_signature.c:838:85:838:96 |
+| openssl_signature.c:839:87:839:98 | HashAlgorithm | DigestSize | 256 | openssl_signature.c:839:87:839:98 | openssl_signature.c:839:87:839:98 |
+| openssl_signature.c:839:87:839:98 | HashAlgorithm | Name | SHA2 | openssl_signature.c:839:87:839:98 | openssl_signature.c:839:87:839:98 |
+| openssl_signature.c:839:87:839:98 | HashAlgorithm | RawName | RSA-SHA256 | openssl_signature.c:839:87:839:98 | openssl_signature.c:839:87:839:98 |
+| openssl_signature.c:839:87:839:98 | KeyOperationAlgorithm | Name | RSA | openssl_signature.c:839:87:839:98 | openssl_signature.c:839:87:839:98 |
+| openssl_signature.c:839:87:839:98 | KeyOperationAlgorithm | RawName | RSA-SHA256 | openssl_signature.c:839:87:839:98 | openssl_signature.c:839:87:839:98 |
diff --git a/cpp/ql/test/experimental/library-tests/quantum/nodes.expected b/cpp/ql/test/experimental/library-tests/quantum/nodes.expected
index 223f7bfca6c..62877e56182 100644
--- a/cpp/ql/test/experimental/library-tests/quantum/nodes.expected
+++ b/cpp/ql/test/experimental/library-tests/quantum/nodes.expected
@@ -24,17 +24,29 @@
 | openssl_basic.c:144:67:144:73 | HashAlgorithm |
 | openssl_basic.c:155:22:155:41 | Key |
 | openssl_basic.c:155:22:155:41 | KeyGeneration |
-| openssl_basic.c:155:43:155:55 | MACAlgorithm |
+| openssl_basic.c:155:43:155:55 | HMACAlgorithm |
 | openssl_basic.c:155:64:155:66 | Key |
 | openssl_basic.c:160:39:160:48 | HashAlgorithm |
 | openssl_basic.c:160:59:160:62 | Key |
 | openssl_basic.c:163:35:163:41 | Message |
-| openssl_basic.c:167:9:167:27 | SignOperation |
+| openssl_basic.c:167:9:167:27 | SignatureOrMACOperation |
 | openssl_basic.c:167:34:167:36 | SignatureOutput |
 | openssl_basic.c:179:43:179:76 | Constant |
 | openssl_basic.c:180:42:180:59 | Constant |
 | openssl_basic.c:181:49:181:87 | Constant |
 | openssl_basic.c:218:32:218:33 | Constant |
+| openssl_basic.c:231:27:231:49 | Constant |
+| openssl_basic.c:235:51:235:55 | KeyOperationAlgorithm |
+| openssl_basic.c:237:54:237:57 | Constant |
+| openssl_basic.c:238:9:238:25 | KeyGeneration |
+| openssl_basic.c:238:39:238:43 | Key |
+| openssl_basic.c:243:52:243:55 | Key |
+| openssl_basic.c:249:51:249:72 | PaddingAlgorithm |
+| openssl_basic.c:250:51:250:60 | HashAlgorithm |
+| openssl_basic.c:251:51:251:60 | HashAlgorithm |
+| openssl_basic.c:262:24:262:39 | EncryptOperation |
+| openssl_basic.c:262:54:262:63 | KeyOperationOutput |
+| openssl_basic.c:263:64:263:70 | Message |
 | openssl_pkey.c:21:10:21:28 | KeyGeneration |
 | openssl_pkey.c:21:10:21:28 | KeyOperationAlgorithm |
 | openssl_pkey.c:21:30:21:32 | Key |
@@ -47,54 +59,121 @@
 | openssl_pkey.c:64:9:64:24 | EncryptOperation |
 | openssl_pkey.c:64:31:64:39 | KeyOperationOutput |
 | openssl_pkey.c:64:58:64:66 | Message |
-| openssl_signature.c:22:34:22:40 | Message |
-| openssl_signature.c:23:9:23:26 | HashOperation |
-| openssl_signature.c:23:36:23:41 | Digest |
-| openssl_signature.c:70:32:70:38 | Message |
-| openssl_signature.c:75:28:75:36 | Message |
-| openssl_signature.c:80:9:80:21 | SignOperation |
-| openssl_signature.c:80:31:80:40 | SignatureOutput |
-| openssl_signature.c:80:53:80:56 | Key |
-| openssl_signature.c:133:52:133:55 | Key |
-| openssl_signature.c:134:38:134:44 | Message |
-| openssl_signature.c:135:9:135:27 | SignOperation |
-| openssl_signature.c:135:37:135:40 | SignatureOutput |
-| openssl_signature.c:142:9:142:27 | SignOperation |
-| openssl_signature.c:142:37:142:46 | SignatureOutput |
-| openssl_signature.c:190:57:190:60 | Key |
-| openssl_signature.c:196:38:196:44 | Message |
-| openssl_signature.c:197:9:197:27 | SignOperation |
-| openssl_signature.c:197:37:197:40 | SignatureOutput |
-| openssl_signature.c:204:9:204:27 | SignOperation |
-| openssl_signature.c:204:37:204:46 | SignatureOutput |
-| openssl_signature.c:260:39:260:42 | Key |
-| openssl_signature.c:263:9:263:21 | SignOperation |
-| openssl_signature.c:263:33:263:36 | SignatureOutput |
-| openssl_signature.c:263:54:263:59 | Message |
-| openssl_signature.c:270:9:270:21 | SignOperation |
-| openssl_signature.c:270:33:270:42 | SignatureOutput |
-| openssl_signature.c:270:60:270:65 | Message |
-| openssl_signature.c:321:39:321:42 | Key |
-| openssl_signature.c:326:48:326:54 | Message |
-| openssl_signature.c:327:9:327:35 | SignOperation |
-| openssl_signature.c:327:47:327:50 | SignatureOutput |
-| openssl_signature.c:334:9:334:35 | SignOperation |
-| openssl_signature.c:334:47:334:56 | SignatureOutput |
-| openssl_signature.c:521:46:521:66 | PaddingAlgorithm |
-| openssl_signature.c:543:35:543:46 | KeyOperationAlgorithm |
-| openssl_signature.c:547:51:547:54 | Constant |
-| openssl_signature.c:548:9:548:23 | KeyGeneration |
-| openssl_signature.c:548:34:548:37 | Key |
-| openssl_signature.c:565:50:565:54 | KeyOperationAlgorithm |
-| openssl_signature.c:569:55:569:58 | Constant |
-| openssl_signature.c:575:32:575:37 | Key |
-| openssl_signature.c:578:9:578:23 | KeyGeneration |
-| openssl_signature.c:578:34:578:37 | Key |
-| openssl_signature.c:602:37:602:77 | Constant |
-| openssl_signature.c:684:24:684:33 | HashAlgorithm |
-| openssl_signature.c:685:37:685:77 | Constant |
-| openssl_signature.c:702:60:702:71 | HashAlgorithm |
-| openssl_signature.c:702:60:702:71 | KeyOperationAlgorithm |
-| openssl_signature.c:740:24:740:33 | HashAlgorithm |
-| openssl_signature.c:741:37:741:77 | Constant |
-| openssl_signature.c:758:60:758:64 | KeyOperationAlgorithm |
+| openssl_signature.c:25:34:25:40 | Message |
+| openssl_signature.c:26:9:26:26 | HashOperation |
+| openssl_signature.c:26:36:26:41 | Digest |
+| openssl_signature.c:63:32:63:38 | Message |
+| openssl_signature.c:68:28:68:36 | Message |
+| openssl_signature.c:73:9:73:21 | SignOperation |
+| openssl_signature.c:73:31:73:40 | SignatureOutput |
+| openssl_signature.c:73:53:73:56 | Key |
+| openssl_signature.c:98:34:98:40 | Message |
+| openssl_signature.c:99:34:99:42 | Message |
+| openssl_signature.c:100:9:100:23 | VerifyOperation |
+| openssl_signature.c:100:33:100:41 | SignatureInput |
+| openssl_signature.c:100:73:100:76 | Key |
+| openssl_signature.c:126:52:126:55 | Key |
+| openssl_signature.c:127:38:127:44 | Message |
+| openssl_signature.c:135:9:135:27 | SignatureOrMACOperation |
+| openssl_signature.c:135:37:135:46 | SignatureOutput |
+| openssl_signature.c:158:54:158:57 | Key |
+| openssl_signature.c:159:40:159:46 | Message |
+| openssl_signature.c:160:9:160:29 | VerifyOperation |
+| openssl_signature.c:160:39:160:47 | SignatureInput |
+| openssl_signature.c:182:57:182:60 | Key |
+| openssl_signature.c:185:44:185:64 | PaddingAlgorithm |
+| openssl_signature.c:187:38:187:44 | Message |
+| openssl_signature.c:195:9:195:27 | SignatureOrMACOperation |
+| openssl_signature.c:195:37:195:46 | SignatureOutput |
+| openssl_signature.c:218:59:218:62 | Key |
+| openssl_signature.c:222:44:222:64 | PaddingAlgorithm |
+| openssl_signature.c:224:40:224:46 | Message |
+| openssl_signature.c:225:9:225:29 | VerifyOperation |
+| openssl_signature.c:225:39:225:47 | SignatureInput |
+| openssl_signature.c:250:39:250:42 | Key |
+| openssl_signature.c:260:9:260:21 | SignOperation |
+| openssl_signature.c:260:33:260:42 | SignatureOutput |
+| openssl_signature.c:260:60:260:65 | Message |
+| openssl_signature.c:282:39:282:42 | Key |
+| openssl_signature.c:285:9:285:23 | VerifyOperation |
+| openssl_signature.c:285:35:285:43 | SignatureInput |
+| openssl_signature.c:285:61:285:66 | Message |
+| openssl_signature.c:311:39:311:42 | Key |
+| openssl_signature.c:316:48:316:54 | Message |
+| openssl_signature.c:324:9:324:35 | SignOperation |
+| openssl_signature.c:324:47:324:56 | SignatureOutput |
+| openssl_signature.c:347:39:347:42 | Key |
+| openssl_signature.c:353:42:353:50 | SignatureInput |
+| openssl_signature.c:355:50:355:56 | Message |
+| openssl_signature.c:356:9:356:37 | VerifyOperation |
+| openssl_signature.c:384:9:384:16 | KeyOperationAlgorithm |
+| openssl_signature.c:384:9:384:16 | SignOperation |
+| openssl_signature.c:384:28:384:34 | Message |
+| openssl_signature.c:384:50:384:59 | SignatureOutput |
+| openssl_signature.c:385:48:385:54 | Key |
+| openssl_signature.c:403:12:403:21 | KeyOperationAlgorithm |
+| openssl_signature.c:403:12:403:21 | VerifyOperation |
+| openssl_signature.c:403:33:403:39 | Message |
+| openssl_signature.c:403:55:403:63 | SignatureInput |
+| openssl_signature.c:404:51:404:57 | Key |
+| openssl_signature.c:428:11:428:21 | KeyOperationAlgorithm |
+| openssl_signature.c:428:11:428:21 | SignOperation |
+| openssl_signature.c:428:11:428:21 | SignatureOutput |
+| openssl_signature.c:428:23:428:28 | Message |
+| openssl_signature.c:428:43:428:49 | Key |
+| openssl_signature.c:484:15:484:27 | KeyOperationAlgorithm |
+| openssl_signature.c:484:15:484:27 | VerifyOperation |
+| openssl_signature.c:484:29:484:34 | Message |
+| openssl_signature.c:484:49:484:51 | SignatureInput |
+| openssl_signature.c:484:54:484:60 | Key |
+| openssl_signature.c:511:35:511:46 | KeyOperationAlgorithm |
+| openssl_signature.c:515:51:515:54 | Constant |
+| openssl_signature.c:516:9:516:23 | KeyGeneration |
+| openssl_signature.c:516:34:516:37 | Key |
+| openssl_signature.c:533:50:533:54 | KeyOperationAlgorithm |
+| openssl_signature.c:537:55:537:58 | Constant |
+| openssl_signature.c:543:32:543:37 | Key |
+| openssl_signature.c:546:9:546:23 | KeyGeneration |
+| openssl_signature.c:546:34:546:37 | Key |
+| openssl_signature.c:566:37:566:74 | Constant |
+| openssl_signature.c:574:35:574:46 | KeyOperationAlgorithm |
+| openssl_signature.c:578:51:578:54 | Constant |
+| openssl_signature.c:579:9:579:23 | KeyGeneration |
+| openssl_signature.c:579:34:579:37 | Key |
+| openssl_signature.c:595:37:595:46 | HashAlgorithm |
+| openssl_signature.c:597:41:597:50 | HashAlgorithm |
+| openssl_signature.c:615:37:615:74 | Constant |
+| openssl_signature.c:616:24:616:33 | HashAlgorithm |
+| openssl_signature.c:651:37:651:61 | Constant |
+| openssl_signature.c:652:24:652:33 | HashAlgorithm |
+| openssl_signature.c:661:35:661:46 | KeyOperationAlgorithm |
+| openssl_signature.c:665:51:665:54 | Constant |
+| openssl_signature.c:666:9:666:23 | KeyGeneration |
+| openssl_signature.c:666:34:666:37 | Key |
+| openssl_signature.c:692:37:692:67 | Constant |
+| openssl_signature.c:693:24:693:33 | HashAlgorithm |
+| openssl_signature.c:702:35:702:46 | KeyOperationAlgorithm |
+| openssl_signature.c:706:51:706:54 | Constant |
+| openssl_signature.c:707:9:707:23 | KeyGeneration |
+| openssl_signature.c:707:34:707:37 | Key |
+| openssl_signature.c:732:37:732:66 | Constant |
+| openssl_signature.c:733:24:733:31 | HashAlgorithm |
+| openssl_signature.c:746:35:746:46 | KeyOperationAlgorithm |
+| openssl_signature.c:750:51:750:54 | Constant |
+| openssl_signature.c:751:9:751:23 | KeyGeneration |
+| openssl_signature.c:751:34:751:37 | Key |
+| openssl_signature.c:777:37:777:73 | Constant |
+| openssl_signature.c:778:24:778:31 | HashAlgorithm |
+| openssl_signature.c:786:35:786:46 | KeyOperationAlgorithm |
+| openssl_signature.c:790:51:790:54 | Constant |
+| openssl_signature.c:791:9:791:23 | KeyGeneration |
+| openssl_signature.c:791:34:791:37 | Key |
+| openssl_signature.c:817:37:817:63 | Constant |
+| openssl_signature.c:824:35:824:46 | KeyOperationAlgorithm |
+| openssl_signature.c:828:51:828:54 | Constant |
+| openssl_signature.c:829:9:829:23 | KeyGeneration |
+| openssl_signature.c:829:34:829:37 | Key |
+| openssl_signature.c:838:85:838:96 | HashAlgorithm |
+| openssl_signature.c:838:85:838:96 | KeyOperationAlgorithm |
+| openssl_signature.c:839:87:839:98 | HashAlgorithm |
+| openssl_signature.c:839:87:839:98 | KeyOperationAlgorithm |
diff --git a/cpp/ql/test/experimental/library-tests/quantum/openssl_basic.c b/cpp/ql/test/experimental/library-tests/quantum/openssl_basic.c
index f1ffbfa24d3..04504070ddd 100644
--- a/cpp/ql/test/experimental/library-tests/quantum/openssl_basic.c
+++ b/cpp/ql/test/experimental/library-tests/quantum/openssl_basic.c
@@ -1,7 +1,7 @@
 #include "openssl/evp.h"
 #include "openssl/obj_mac.h"
 #include "openssl/rand.h"
-
+#include "openssl/rsa.h"
 size_t strlen(const char* str);
 
 // Sample OpenSSL code that demonstrates various cryptographic operations
@@ -218,4 +218,58 @@ int test_main() {
     calculate_hmac_sha256(key, 32, plaintext, plaintext_len, hmac);
     
     return 0;
-} 
\ No newline at end of file
+} 
+
+/**
+ * Simplified signature test
+ */
+int test_rsa_oaep_basic(void) {
+    EVP_PKEY_CTX *keygen_ctx = NULL, *encrypt_ctx = NULL;
+    EVP_PKEY *pkey = NULL;
+    unsigned char *ciphertext = NULL;
+    size_t ciphertext_len = 0;
+    const char *message = "Encrypt me with OAEP!";
+    int ret = 1;
+
+    // Generate RSA key
+    keygen_ctx = EVP_PKEY_CTX_new_from_name(NULL, "RSA", NULL);
+    if (!keygen_ctx || EVP_PKEY_keygen_init(keygen_ctx) <= 0 ||
+        EVP_PKEY_CTX_set_rsa_keygen_bits(keygen_ctx, 2048) <= 0 ||
+        EVP_PKEY_generate(keygen_ctx, &pkey) <= 0) {
+        goto cleanup;
+    }
+
+    // Create encryption context
+    encrypt_ctx = EVP_PKEY_CTX_new_from_pkey(NULL, pkey, NULL);
+    if (!encrypt_ctx || EVP_PKEY_encrypt_init(encrypt_ctx) <= 0) {
+        goto cleanup;
+    }
+
+    // Set OAEP padding
+    if (EVP_PKEY_CTX_set_rsa_padding(encrypt_ctx, RSA_PKCS1_OAEP_PADDING) <= 0 ||
+        EVP_PKEY_CTX_set_rsa_oaep_md(encrypt_ctx, EVP_sha256()) <= 0 ||
+        EVP_PKEY_CTX_set_rsa_mgf1_md(encrypt_ctx, EVP_sha256()) <= 0) {
+        goto cleanup;
+    }
+
+    // Determine buffer size
+    if (EVP_PKEY_encrypt(encrypt_ctx, NULL, &ciphertext_len,
+                         (const unsigned char *)message, strlen(message)) <= 0) {
+        goto cleanup;
+    }
+
+    ciphertext = OPENSSL_malloc(ciphertext_len);
+    if (!ciphertext || EVP_PKEY_encrypt(encrypt_ctx, ciphertext, &ciphertext_len,
+                                        (const unsigned char *)message, strlen(message)) <= 0) {
+        goto cleanup;
+    }
+
+    ret = 0;
+
+cleanup:
+    EVP_PKEY_CTX_free(keygen_ctx);
+    EVP_PKEY_CTX_free(encrypt_ctx);
+    EVP_PKEY_free(pkey);
+    OPENSSL_free(ciphertext);
+    return ret;
+}
\ No newline at end of file
diff --git a/cpp/ql/test/experimental/library-tests/quantum/openssl_signature.c b/cpp/ql/test/experimental/library-tests/quantum/openssl_signature.c
index f8be7441642..6d72c5366dd 100644
--- a/cpp/ql/test/experimental/library-tests/quantum/openssl_signature.c
+++ b/cpp/ql/test/experimental/library-tests/quantum/openssl_signature.c
@@ -4,6 +4,9 @@
 #include <openssl/dsa.h>
 #include <openssl/obj_mac.h>
 
+
+
+
 /* =============================================================================
  * UTILITY FUNCTIONS - Common operations shared across signature APIs
  * =============================================================================
@@ -38,16 +41,6 @@ static unsigned char* allocate_signature_buffer(size_t *sig_len, const EVP_PKEY
     return OPENSSL_malloc(*sig_len);
 }
 
-/**
- * Helper to extract key from EVP_PKEY
- */
-static RSA* get_rsa_from_pkey(EVP_PKEY *pkey) {
-    return EVP_PKEY_get1_RSA(pkey);
-}
-
-static DSA* get_dsa_from_pkey(EVP_PKEY *pkey) {
-    return EVP_PKEY_get1_DSA(pkey);
-}
 
 /* =============================================================================
  * EVP_SIGN/VERIFY API - Legacy high-level API (older, simpler)
@@ -180,8 +173,7 @@ cleanup:
  */
 int sign_using_digestsign_with_ctx(const unsigned char *message, size_t message_len,
                                   unsigned char **signature, size_t *signature_len,
-                                  EVP_PKEY *pkey, const EVP_MD *md, 
-                                  int (*param_setter)(EVP_PKEY_CTX *ctx)) {
+                                  EVP_PKEY *pkey, const EVP_MD *md) {
     EVP_MD_CTX *md_ctx = NULL;
     EVP_PKEY_CTX *pkey_ctx = NULL;
     int ret = 0;
@@ -190,8 +182,7 @@ int sign_using_digestsign_with_ctx(const unsigned char *message, size_t message_
         EVP_DigestSignInit(md_ctx, &pkey_ctx, md, NULL, pkey) != 1) {
         goto cleanup;
     }
-    
-    if (param_setter && param_setter(pkey_ctx) != 1) goto cleanup;
+    EVP_PKEY_CTX_set_rsa_padding(pkey_ctx, RSA_PKCS1_PSS_PADDING);
     
     if (EVP_DigestSignUpdate(md_ctx, message, message_len) != 1 ||
         EVP_DigestSignFinal(md_ctx, NULL, signature_len) != 1) {
@@ -218,8 +209,7 @@ cleanup:
  */
 int verify_using_digestverify_with_ctx(const unsigned char *message, size_t message_len,
                                       const unsigned char *signature, size_t signature_len,
-                                      EVP_PKEY *pkey, const EVP_MD *md,
-                                      int (*param_setter)(EVP_PKEY_CTX *ctx)) {
+                                      EVP_PKEY *pkey, const EVP_MD *md) {
     EVP_MD_CTX *md_ctx = NULL;
     EVP_PKEY_CTX *pkey_ctx = NULL;
     int ret = 0;
@@ -228,9 +218,9 @@ int verify_using_digestverify_with_ctx(const unsigned char *message, size_t mess
         EVP_DigestVerifyInit(md_ctx, &pkey_ctx, md, NULL, pkey) != 1) {
         goto cleanup;
     }
-    
-    if (param_setter && param_setter(pkey_ctx) != 1) goto cleanup;
-    
+
+    EVP_PKEY_CTX_set_rsa_padding(pkey_ctx, RSA_PKCS1_PSS_PADDING);
+
     if (EVP_DigestVerifyUpdate(md_ctx, message, message_len) != 1 ||
         EVP_DigestVerifyFinal(md_ctx, signature, signature_len) != 1) {
         goto cleanup;
@@ -313,7 +303,7 @@ cleanup:
  */
 int sign_using_evp_pkey_sign_message(const unsigned char *message, size_t message_len,
                                      unsigned char **signature, size_t *signature_len,
-                                     EVP_PKEY *pkey, const EVP_MD *md, const char *alg_name) {
+                                     EVP_PKEY *pkey, const char *alg_name) {
     EVP_PKEY_CTX *pkey_ctx = NULL;
     EVP_SIGNATURE *alg = NULL;
     int ret = 0;
@@ -349,7 +339,7 @@ cleanup:
  */
 int verify_using_evp_pkey_verify_message(const unsigned char *message, size_t message_len,
                                         const unsigned char *signature, size_t signature_len,
-                                        EVP_PKEY *pkey, const EVP_MD *md, const char *alg_name) {
+                                        EVP_PKEY *pkey, const char *alg_name) {
     EVP_PKEY_CTX *pkey_ctx = NULL;
     EVP_SIGNATURE *alg = NULL;
     int ret = 0;
@@ -373,10 +363,10 @@ cleanup:
     return ret;
 }
 
-/* =============================================================================
- * LOW-LEVEL RSA API - Algorithm-specific functions (deprecated)
- * =============================================================================
- */
+// /* =============================================================================
+//  * LOW-LEVEL RSA API - Algorithm-specific functions (deprecated)
+//  * =============================================================================
+//  */
 
 /**
  * Sign using low-level RSA_sign API (deprecated, RSA-only)
@@ -384,18 +374,14 @@ cleanup:
  */
 int sign_using_rsa_sign(const unsigned char *message, size_t message_len,
                        unsigned char **signature, size_t *signature_len,
-                       RSA *rsa_key, int hash_nid, const EVP_MD *md) {
-    unsigned char digest[EVP_MAX_MD_SIZE];
-    unsigned int digest_len;
+                       RSA *rsa_key, int hash_nid) {
     int ret = 0;
     
-    if (!create_digest(message, message_len, md, digest, &digest_len)) return 0;
-    
     *signature_len = RSA_size(rsa_key);
     *signature = OPENSSL_malloc(*signature_len);
     if (!*signature) return 0;
-    
-    if (RSA_sign(hash_nid, digest, digest_len, *signature, 
+
+    if (RSA_sign(hash_nid, message, message_len, *signature,
                  (unsigned int*)signature_len, rsa_key) == 1) {
         ret = 1;
     } else {
@@ -412,20 +398,16 @@ int sign_using_rsa_sign(const unsigned char *message, size_t message_len,
  */
 int verify_using_rsa_verify(const unsigned char *message, size_t message_len,
                            const unsigned char *signature, size_t signature_len,
-                           RSA *rsa_key, int hash_nid, const EVP_MD *md) {
-    unsigned char digest[EVP_MAX_MD_SIZE];
-    unsigned int digest_len;
-    
-    if (!create_digest(message, message_len, md, digest, &digest_len)) return 0;
-    
-    return RSA_verify(hash_nid, digest, digest_len, signature, 
+                           RSA *rsa_key, int hash_nid) {
+
+    return RSA_verify(hash_nid, message, message_len, signature,
                      (unsigned int)signature_len, rsa_key);
 }
 
-/* =============================================================================
- * LOW-LEVEL DSA API - Algorithm-specific functions (deprecated)
- * =============================================================================
- */
+// /* =============================================================================
+//  * LOW-LEVEL DSA API - Algorithm-specific functions (deprecated)
+//  * =============================================================================
+//  */
 
 /**
  * Sign using low-level DSA_do_sign API (deprecated, DSA-only)
@@ -514,20 +496,6 @@ cleanup:
  * =============================================================================
  */
 
-/**
- * Set RSA PSS padding mode
- */
-int set_rsa_pss_padding(EVP_PKEY_CTX *ctx) {
-    return EVP_PKEY_CTX_set_rsa_padding(ctx, RSA_PKCS1_PSS_PADDING);
-}
-
-/**
- * No-op parameter setter for default behavior
- */
-int no_parameter_setter(EVP_PKEY_CTX *ctx) {
-    return 1;
-}
-
 /* =============================================================================
  * KEY GENERATION HELPERS
  * =============================================================================
@@ -592,228 +560,289 @@ cleanup:
  * =============================================================================
  */
 
-/**
- * Test all signature APIs with a given key and algorithm
- * Demonstrates the 6 different signature API approaches
- */
-int test_signature_apis(EVP_PKEY *key, const EVP_MD *md, 
-                       int (*param_setter)(EVP_PKEY_CTX *ctx),
-                       const char *algo_name) {
-    const unsigned char message[] = "Test message for OpenSSL signature APIs";
+int testLowLevelRSASignAndVerify(){
+    EVP_PKEY *key = NULL;
+    RSA *rsa_key = NULL;
+    const unsigned char message[] = "testLowLevelRSASignAndVerify message";
+    const size_t message_len = strlen((char *)message);
+    unsigned char *sig = NULL;
+    size_t sig_len = 0;
+    int success = 1;
+    EVP_PKEY_CTX *key_ctx = NULL;
+
+ 
+    key_ctx = EVP_PKEY_CTX_new_id(EVP_PKEY_RSA, NULL);
+    if (!key_ctx) return NULL;
+    
+    if (EVP_PKEY_keygen_init(key_ctx) <= 0 ||
+        EVP_PKEY_CTX_set_rsa_keygen_bits(key_ctx, 2048) <= 0 ||
+        EVP_PKEY_keygen(key_ctx, &key) <= 0) {
+        EVP_PKEY_free(key);
+        key = NULL;
+    }
+    
+    EVP_PKEY_CTX_free(key_ctx);
+    if (!key) return 0;
+
+    rsa_key = EVP_PKEY_get1_RSA(key);
+
+    if (!rsa_key) {
+        EVP_PKEY_free(key);
+        success = 0;
+    }
+
+    if (sign_using_rsa_sign(message, message_len, &sig, &sig_len, 
+                           rsa_key, NID_sha256) &&
+        verify_using_rsa_verify(message, message_len, sig, sig_len, 
+                               rsa_key, NID_sha256)) {
+        printf("PASS\n");
+    } else {
+        printf("FAIL\n");
+        success = 0;
+    }
+
+    /* Cleanup */
+    OPENSSL_free(sig);
+    EVP_PKEY_free(key);
+
+    return success;
+}
+
+
+int testLowLevelDSASignAndVerify(){
+    EVP_PKEY *key = NULL;
+    DSA *dsa_key = NULL;
+    const unsigned char message[] = "testLowLevelDSASignAndVerify message";
+    const EVP_MD *md = EVP_sha256();
+    int success = 1;
+
+    EVP_PKEY_CTX *param_ctx = NULL, *key_ctx = NULL;
+    EVP_PKEY *params = NULL;
+
+    const size_t message_len = strlen((char *)message);
+    unsigned char *sig = NULL;
+    size_t sig_len = 0;
+    
+    key = generate_dsa_key();
+    dsa_key = EVP_PKEY_get1_DSA(key);
+
+    if (!dsa_key) {
+        EVP_PKEY_free(key);
+        success = 0;
+    }
+
+    if (sign_using_dsa_sign(message, message_len, &sig, &sig_len, dsa_key, md) &&
+        verify_using_dsa_verify(message, message_len, sig, sig_len, dsa_key, md)) {
+        printf("PASS\n");
+    } else {
+        printf("FAIL\n");
+        success = 0;
+    }
+
+    /* Cleanup */
+    OPENSSL_free(sig);
+    EVP_PKEY_free(key);
+
+    return success;
+}
+
+int testEVP_SignAPI(){
+    EVP_PKEY *key = NULL;
+    const unsigned char message[] = "testEVP_SignAPI message";
+    const EVP_MD *md = EVP_sha224();
+
+    const size_t message_len = strlen((char *)message);
+
+    unsigned char *sig = NULL;
+    size_t sig_len = 0;
+    int success = 1;
+    EVP_PKEY_CTX *key_ctx = NULL;
+
+    key_ctx = EVP_PKEY_CTX_new_id(EVP_PKEY_RSA, NULL);
+    if (!key_ctx) return NULL;
+    
+    if (EVP_PKEY_keygen_init(key_ctx) <= 0 ||
+        EVP_PKEY_CTX_set_rsa_keygen_bits(key_ctx, 2048) <= 0 ||
+        EVP_PKEY_keygen(key_ctx, &key) <= 0) {
+        EVP_PKEY_free(key);
+        key = NULL;
+    }
+    
+    EVP_PKEY_CTX_free(key_ctx);
+    if (!key) return 0;
+
+
+       /* Test 1: EVP_Sign API */
+    printf("1. EVP_Sign API: ");
+    if (sign_using_evp_sign(message, message_len, &sig, &sig_len, key, md) &&
+        verify_using_evp_verify(message, message_len, sig, sig_len, key, md)) {
+        printf("PASS\n");
+    } else {
+        printf("FAIL\n");
+        success = 0;
+    }
+    OPENSSL_free(sig);
+    EVP_PKEY_free(key);
+    return success;
+}
+
+
+int testEVP_DigestSignAPI(){
+    EVP_PKEY *key = NULL;
+    const unsigned char message[] = "testEVP_DigestSignAPI message";
+    const EVP_MD *md = EVP_sha224();
+
     const size_t message_len = strlen((char *)message);
     
-    unsigned char *sig1 = NULL, *sig2 = NULL, *sig3 = NULL, 
-                  *sig4 = NULL, *sig6 = NULL;
-    size_t sig_len1 = 0, sig_len2 = 0, sig_len3 = 0, sig_len4 = 0, sig_len6 = 0;
-    
-    unsigned char digest[EVP_MAX_MD_SIZE];
-    unsigned int digest_len;
+    unsigned char *sig = NULL;
+    size_t sig_len = 0;
     int success = 1;
+    EVP_PKEY_CTX *key_ctx = NULL;
+
+    key_ctx = EVP_PKEY_CTX_new_id(EVP_PKEY_RSA, NULL);
+    if (!key_ctx) return NULL;
     
-    printf("\nTesting signature APIs with %s:\n", algo_name);
-    
-    /* Test 1: EVP_Sign API */
-    printf("1. EVP_Sign API: ");
-    if (sign_using_evp_sign(message, message_len, &sig1, &sig_len1, key, md) &&
-        verify_using_evp_verify(message, message_len, sig1, sig_len1, key, md)) {
-        printf("PASS\n");
-    } else {
-        printf("FAIL\n");
-        success = 0;
+    if (EVP_PKEY_keygen_init(key_ctx) <= 0 ||
+        EVP_PKEY_CTX_set_rsa_keygen_bits(key_ctx, 2048) <= 0 ||
+        EVP_PKEY_keygen(key_ctx, &key) <= 0) {
+        EVP_PKEY_free(key);
+        key = NULL;
     }
     
+    EVP_PKEY_CTX_free(key_ctx);
+    if (!key) return 0;
+
+
     /* Test 2: EVP_DigestSign API */
     printf("2. EVP_DigestSign API: ");
-    if (sign_using_evp_digestsign(message, message_len, &sig2, &sig_len2, key, md) &&
-        verify_using_evp_digestverify(message, message_len, sig2, sig_len2, key, md)) {
+    if (sign_using_evp_digestsign(message, message_len, &sig, &sig_len, key, md) &&
+        verify_using_evp_digestverify(message, message_len, sig, sig_len, key, md)) {
         printf("PASS\n");
     } else {
         printf("FAIL\n");
         success = 0;
     }
+    OPENSSL_free(sig);
+    EVP_PKEY_free(key);
+    return success;
+}
+
+int testEVP_PKEY_signAPI(){
+    EVP_PKEY *key = NULL;
+    const unsigned char message[] = "testEVP_PKEY_signAPI message";
+    const EVP_MD *md = EVP_sha1();
+
+    const size_t message_len = strlen((char *)message);
     
+    unsigned char *sig = NULL;
+    size_t sig_len = 0;
+    int success = 1;
+
+    EVP_PKEY_CTX *key_ctx = NULL;
+
+    unsigned char digest[EVP_MAX_MD_SIZE];
+    unsigned int digest_len;
+
+    key_ctx = EVP_PKEY_CTX_new_id(EVP_PKEY_RSA, NULL);
+    if (!key_ctx) return NULL;
+    
+    if (EVP_PKEY_keygen_init(key_ctx) <= 0 ||
+        EVP_PKEY_CTX_set_rsa_keygen_bits(key_ctx, 2048) <= 0 ||
+        EVP_PKEY_keygen(key_ctx, &key) <= 0) {
+        EVP_PKEY_free(key);
+        key = NULL;
+    }
+    
+    EVP_PKEY_CTX_free(key_ctx);
+    if (!key) return 0;
+
     /* Test 3: EVP_PKEY_sign API (requires pre-hashed input) */
     printf("3. EVP_PKEY_sign API: ");
     if (create_digest(message, message_len, md, digest, &digest_len) &&
-        sign_using_evp_pkey_sign(digest, digest_len, &sig3, &sig_len3, key, md) &&
-        verify_using_evp_pkey_verify(digest, digest_len, sig3, sig_len3, key, md)) {
+        sign_using_evp_pkey_sign(digest, digest_len, &sig, &sig_len, key, md) &&
+        verify_using_evp_pkey_verify(digest, digest_len, sig, sig_len, key, md)) {
         printf("PASS\n");
     } else {
         printf("FAIL\n");
         success = 0;
     }
+
+    OPENSSL_free(sig);
+    EVP_PKEY_free(key);
+    return success;
+}
+
+int testEVP_DigestSign_with_ctx(void) {
+    EVP_PKEY *key = NULL;
+    const unsigned char message[] = "testEVP_DigestSign_with_ctx message";
+    const EVP_MD *md = EVP_sha1();
+
+    const size_t message_len = strlen((char *)message);
+    unsigned char *sig = NULL;
+    size_t sig_len = 0;
+    int success = 1;
+    EVP_PKEY_CTX *key_ctx = NULL;
+
+    key_ctx = EVP_PKEY_CTX_new_id(EVP_PKEY_RSA, NULL);
+    if (!key_ctx) return NULL;
     
+    if (EVP_PKEY_keygen_init(key_ctx) <= 0 ||
+        EVP_PKEY_CTX_set_rsa_keygen_bits(key_ctx, 2048) <= 0 ||
+        EVP_PKEY_keygen(key_ctx, &key) <= 0) {
+        EVP_PKEY_free(key);
+        key = NULL;
+    }
+    
+    EVP_PKEY_CTX_free(key_ctx);
+    if (!key) return 0;
+
     /* Test 4: EVP_DigestSign with explicit PKEY_CTX */
     printf("4. EVP_DigestSign with explicit PKEY_CTX: ");
-    if (sign_using_digestsign_with_ctx(message, message_len, &sig4, &sig_len4, 
-                                      key, md, param_setter) &&
-        verify_using_digestverify_with_ctx(message, message_len, sig4, sig_len4, 
-                                          key, md, param_setter)) {
+    if (sign_using_digestsign_with_ctx(message, message_len, &sig, &sig_len, 
+                                      key, md) &&
+        verify_using_digestverify_with_ctx(message, message_len, sig, sig_len, 
+                                          key, md)) {
         printf("PASS\n");
     } else {
         printf("FAIL\n");
         success = 0;
     }
+    OPENSSL_free(sig);
+    EVP_PKEY_free(key);
+    return success;
+}
+
+int testEVP_PKEY_sign_message(void) {
+    EVP_PKEY *key = NULL;
+    const unsigned char message[] = "testEVP_PKEY_sign_message";
+    const size_t message_len = strlen((char *)message);
+    unsigned char *sig = NULL;
+    size_t sig_len = 0;
+    int success = 1;
+    EVP_PKEY_CTX *key_ctx = NULL;
+
+    key_ctx = EVP_PKEY_CTX_new_id(EVP_PKEY_RSA, NULL);
+    if (!key_ctx) return NULL;
     
-    /* Test 6: EVP_PKEY_sign_message API */
+    if (EVP_PKEY_keygen_init(key_ctx) <= 0 ||
+        EVP_PKEY_CTX_set_rsa_keygen_bits(key_ctx, 2048) <= 0 ||
+        EVP_PKEY_keygen(key_ctx, &key) <= 0) {
+        EVP_PKEY_free(key);
+        key = NULL;
+    }
+    
+    EVP_PKEY_CTX_free(key_ctx);
+    if (!key) return 0;
+
     printf("6. EVP_PKEY_sign_message API: ");
-    if (sign_using_evp_pkey_sign_message(message, message_len, &sig6, &sig_len6, key, md, algo_name) &&
-        verify_using_evp_pkey_verify_message(message, message_len, sig6, sig_len6, key, md, algo_name)) {
+    if (sign_using_evp_pkey_sign_message(message, message_len, &sig, &sig_len, key, "RSA-SHA256") &&
+        verify_using_evp_pkey_verify_message(message, message_len, sig, sig_len, key, "RSA-SHA256")) {
         printf("PASS\n");
     } else {
         printf("FAIL\n");
         success = 0;
     }
-    
-    /* Cleanup */
-    OPENSSL_free(sig1);
-    OPENSSL_free(sig2);
-    OPENSSL_free(sig3);
-    OPENSSL_free(sig4);
-    OPENSSL_free(sig6);
-    
-    return success;
-}
-
-/**
- * Test RSA-specific signature APIs including low-level RSA functions
- */
-int test_signature_apis_rsa(void) {
-    EVP_PKEY *key = NULL;
-    RSA *rsa_key = NULL;
-    const EVP_MD *md = EVP_sha256();
-    const unsigned char message[] = "Test message for OpenSSL signature APIs";
-    const size_t message_len = strlen((char *)message);
-    unsigned char *sig5 = NULL;
-    size_t sig_len5 = 0;
-    int success = 1;
-    
-    printf("\nGenerating RSA key pair...\n");
-    key = generate_rsa_key();
-    if (!key) return 0;
-    
-    rsa_key = get_rsa_from_pkey(key);
-    if (!rsa_key) {
-        EVP_PKEY_free(key);
-        return 0;
-    }
-    
-    /* Test generic APIs */
-    if (!test_signature_apis(key, md, set_rsa_pss_padding, "RSA-SHA256")) {
-        success = 0;
-    }
-    
-    /* Test 5: Low-level RSA API */
-    printf("5. Low-level RSA API: ");
-    if (sign_using_rsa_sign(message, message_len, &sig5, &sig_len5, 
-                           rsa_key, NID_sha256, md) &&
-        verify_using_rsa_verify(message, message_len, sig5, sig_len5, 
-                               rsa_key, NID_sha256, md)) {
-        printf("PASS\n");
-    } else {
-        printf("FAIL\n");
-        success = 0;
-    }
-    
-    printf("\nRSA API Summary:\n");
-    printf("1. EVP_Sign API: Legacy, simple\n");
-    printf("2. EVP_DigestSign API: Modern, recommended\n");
-    printf("3. EVP_PKEY_sign API: Lower-level, pre-hashed input\n");
-    printf("4. EVP_DigestSign with PKEY_CTX: Fine-grained control\n");
-    printf("5. Low-level RSA API: Deprecated, algorithm-specific\n");
-    printf("6. EVP_PKEY_sign_message API: Streamlined message signing\n");
-    
-    /* Cleanup */
-    OPENSSL_free(sig5);
-    RSA_free(rsa_key);
+    OPENSSL_free(sig);
     EVP_PKEY_free(key);
-    
     return success;
-}
-
-/**
- * Test DSA-specific signature APIs including low-level DSA functions
- */
-int test_signature_apis_dsa(void) {
-    EVP_PKEY *key = NULL;
-    DSA *dsa_key = NULL;
-    const EVP_MD *md = EVP_sha256();
-    const unsigned char message[] = "Test message for OpenSSL signature APIs";
-    const size_t message_len = strlen((char *)message);
-    unsigned char *sig5 = NULL;
-    size_t sig_len5 = 0;
-    int success = 1;
-    
-    printf("\nGenerating DSA key pair...\n");
-    key = generate_dsa_key();
-    if (!key) return 0;
-    
-    dsa_key = get_dsa_from_pkey(key);
-    if (!dsa_key) {
-        EVP_PKEY_free(key);
-        return 0;
-    }
-    
-    /* Test generic APIs */
-    if (!test_signature_apis(key, md, no_parameter_setter, "dsa")) {
-        success = 0;
-    }
-    
-    /* Test 5: Low-level DSA API */
-    printf("5. Low-level DSA API: ");
-    if (sign_using_dsa_sign(message, message_len, &sig5, &sig_len5, dsa_key, md) &&
-        verify_using_dsa_verify(message, message_len, sig5, sig_len5, dsa_key, md)) {
-        printf("PASS\n");
-    } else {
-        printf("FAIL\n");
-        success = 0;
-    }
-    
-    printf("\nDSA API Summary:\n");
-    printf("1. EVP_Sign API: Legacy, simple\n");
-    printf("2. EVP_DigestSign API: Modern, recommended\n");
-    printf("3. EVP_PKEY_sign API: Lower-level, pre-hashed input\n");
-    printf("4. EVP_DigestSign with PKEY_CTX: Fine-grained control\n");
-    printf("5. Low-level DSA API: Deprecated, algorithm-specific\n");
-    printf("6. EVP_PKEY_sign_message API: Streamlined message signing\n");
-    
-    /* Cleanup */
-    OPENSSL_free(sig5);
-    EVP_PKEY_free(key);
-    
-    return success;
-}
-
-/* =============================================================================
- * MAIN FUNCTION - Entry point for testing all signature APIs
- * =============================================================================
- */
-
-// /**
-//  * Main function demonstrating all OpenSSL signature APIs
-//  * Tests both RSA and DSA algorithms with all 6 API approaches
-//  */
-// int main(void) {
-//     /* Initialize OpenSSL */
-//     OpenSSL_add_all_algorithms();
-//     ERR_load_crypto_strings();
-    
-//     printf("=================================================================\n");
-//     printf("OpenSSL Signature API Demonstration\n");
-//     printf("=================================================================\n");
-    
-//     printf("\n-------- TESTING RSA SIGNATURES --------\n");
-//     int rsa_result = test_signature_apis_rsa();
-    
-//     printf("\n-------- TESTING DSA SIGNATURES --------\n");
-//     int dsa_result = test_signature_apis_dsa();
-    
-//     printf("\n=================================================================\n");
-//     if (rsa_result && dsa_result) {
-//         printf("All tests completed successfully.\n");
-//         return 0;
-//     } else {
-//         printf("Some tests failed.\n");
-//         return 1;
-//     }
-// }
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/cpp/ql/test/experimental/library-tests/rangeanalysis/rangeanalysis/RangeAnalysis.expected b/cpp/ql/test/experimental/library-tests/rangeanalysis/rangeanalysis/RangeAnalysis.expected
index 15125038d19..abdb752ca69 100644
--- a/cpp/ql/test/experimental/library-tests/rangeanalysis/rangeanalysis/RangeAnalysis.expected
+++ b/cpp/ql/test/experimental/library-tests/rangeanalysis/rangeanalysis/RangeAnalysis.expected
@@ -60,7 +60,6 @@
 | test.cpp:177:10:177:10 | Load: i | test.cpp:175:23:175:23 | ValueNumberBound | 1 | false | CompareLT: ... < ... | test.cpp:176:7:176:11 | test.cpp:176:7:176:11 |
 | test.cpp:179:10:179:10 | Load: i | test.cpp:175:23:175:23 | ValueNumberBound | 0 | true | CompareLT: ... < ... | test.cpp:176:7:176:11 | test.cpp:176:7:176:11 |
 | test.cpp:183:10:183:10 | Load: i | test.cpp:175:23:175:23 | ValueNumberBound | -1 | true | CompareLT: ... < ... | test.cpp:182:9:182:13 | test.cpp:182:9:182:13 |
-| test.cpp:185:10:185:10 | Load: i | test.cpp:175:23:175:23 | ValueNumberBound | 0 | true | CompareLT: ... < ... | test.cpp:176:7:176:11 | test.cpp:176:7:176:11 |
 | test.cpp:187:10:187:10 | Store: i | test.cpp:175:23:175:23 | ValueNumberBound | 0 | false | CompareLT: ... < ... | test.cpp:182:9:182:13 | test.cpp:182:9:182:13 |
 | test.cpp:194:8:194:8 | Load: l | test.cpp:191:16:191:16 | ValueNumberBound | 0 | false | NoReason | file://:0:0:0:0 | file://:0:0:0:0 |
 | test.cpp:194:8:194:8 | Load: l | test.cpp:191:16:191:16 | ValueNumberBound | 0 | true | NoReason | file://:0:0:0:0 | file://:0:0:0:0 |
diff --git a/cpp/ql/test/library-tests/controlflow/guards-ir/tests.expected b/cpp/ql/test/library-tests/controlflow/guards-ir/tests.expected
index 1d138afcbea..2e18dcd7a62 100644
--- a/cpp/ql/test/library-tests/controlflow/guards-ir/tests.expected
+++ b/cpp/ql/test/library-tests/controlflow/guards-ir/tests.expected
@@ -1,44 +1,3 @@
-astGuards
-| test.c:7:9:7:13 | ... > ... |
-| test.c:17:8:17:12 | ... < ... |
-| test.c:17:8:17:21 | ... && ... |
-| test.c:17:17:17:21 | ... > ... |
-| test.c:26:11:26:15 | ... > ... |
-| test.c:34:16:34:21 | ... < ... |
-| test.c:42:16:42:21 | ... < ... |
-| test.c:44:12:44:16 | ... > ... |
-| test.c:45:16:45:20 | ... > ... |
-| test.c:58:9:58:14 | ... == ... |
-| test.c:58:9:58:23 | ... \|\| ... |
-| test.c:58:19:58:23 | ... < ... |
-| test.c:75:9:75:14 | ... == ... |
-| test.c:85:8:85:13 | ... == ... |
-| test.c:85:8:85:23 | ... && ... |
-| test.c:85:18:85:23 | ... != ... |
-| test.c:94:11:94:16 | ... != ... |
-| test.c:102:16:102:21 | ... < ... |
-| test.c:109:9:109:14 | ... == ... |
-| test.c:109:9:109:23 | ... \|\| ... |
-| test.c:109:19:109:23 | ... < ... |
-| test.c:126:7:126:7 | 1 |
-| test.c:126:7:126:28 | ... && ... |
-| test.c:126:12:126:26 | call to test3_condition |
-| test.c:131:7:131:7 | b |
-| test.c:137:7:137:7 | 0 |
-| test.c:146:7:146:8 | ! ... |
-| test.c:146:8:146:8 | x |
-| test.c:152:10:152:10 | x |
-| test.c:152:10:152:15 | ... && ... |
-| test.c:152:15:152:15 | y |
-| test.c:156:9:156:19 | ... == ... |
-| test.c:159:9:159:19 | ... == ... |
-| test.c:162:9:162:18 | ... < ... |
-| test.c:165:9:165:18 | ... < ... |
-| test.c:175:13:175:32 | ... == ... |
-| test.c:181:9:181:9 | x |
-| test.cpp:18:8:18:10 | call to get |
-| test.cpp:31:7:31:13 | ... == ... |
-| test.cpp:42:13:42:20 | call to getABool |
 astGuardsCompare
 | 7 | 0 < x+0 when ... > ... is true |
 | 7 | 0 >= x+0 when ... > ... is false |
@@ -425,7 +384,9 @@ astGuardsControl
 | test.c:126:7:126:7 | 1 | true | 131 | 132 |
 | test.c:126:7:126:7 | 1 | true | 134 | 123 |
 | test.c:126:7:126:28 | ... && ... | true | 126 | 128 |
+| test.c:126:7:126:28 | ... && ... | true | 131 | 132 |
 | test.c:126:12:126:26 | call to test3_condition | true | 126 | 128 |
+| test.c:126:12:126:26 | call to test3_condition | true | 131 | 132 |
 | test.c:131:7:131:7 | b | true | 131 | 132 |
 | test.c:137:7:137:7 | 0 | false | 142 | 136 |
 | test.c:146:7:146:8 | ! ... | true | 146 | 147 |
@@ -832,11 +793,17 @@ astGuardsEnsure_const
 | test.c:126:7:126:7 | 1 | test.c:126:7:126:7 | 1 | == | 1 | 131 | 132 |
 | test.c:126:7:126:7 | 1 | test.c:126:7:126:7 | 1 | == | 1 | 134 | 123 |
 | test.c:126:7:126:28 | ... && ... | test.c:126:7:126:7 | 1 | != | 0 | 126 | 128 |
+| test.c:126:7:126:28 | ... && ... | test.c:126:7:126:7 | 1 | != | 0 | 131 | 132 |
 | test.c:126:7:126:28 | ... && ... | test.c:126:7:126:7 | 1 | == | 1 | 126 | 128 |
+| test.c:126:7:126:28 | ... && ... | test.c:126:7:126:7 | 1 | == | 1 | 131 | 132 |
 | test.c:126:7:126:28 | ... && ... | test.c:126:12:126:26 | call to test3_condition | != | 0 | 126 | 128 |
+| test.c:126:7:126:28 | ... && ... | test.c:126:12:126:26 | call to test3_condition | != | 0 | 131 | 132 |
 | test.c:126:7:126:28 | ... && ... | test.c:126:12:126:26 | call to test3_condition | == | 1 | 126 | 128 |
+| test.c:126:7:126:28 | ... && ... | test.c:126:12:126:26 | call to test3_condition | == | 1 | 131 | 132 |
 | test.c:126:12:126:26 | call to test3_condition | test.c:126:12:126:26 | call to test3_condition | != | 0 | 126 | 128 |
+| test.c:126:12:126:26 | call to test3_condition | test.c:126:12:126:26 | call to test3_condition | != | 0 | 131 | 132 |
 | test.c:126:12:126:26 | call to test3_condition | test.c:126:12:126:26 | call to test3_condition | == | 1 | 126 | 128 |
+| test.c:126:12:126:26 | call to test3_condition | test.c:126:12:126:26 | call to test3_condition | == | 1 | 131 | 132 |
 | test.c:131:7:131:7 | b | test.c:131:7:131:7 | b | != | 0 | 131 | 132 |
 | test.c:131:7:131:7 | b | test.c:131:7:131:7 | b | == | 1 | 131 | 132 |
 | test.c:137:7:137:7 | 0 | test.c:137:7:137:7 | 0 | != | 1 | 142 | 136 |
@@ -893,40 +860,6 @@ astGuardsEnsure_const
 | test.cpp:31:7:31:13 | ... == ... | test.cpp:31:7:31:13 | ... == ... | == | 1 | 31 | 32 |
 | test.cpp:42:13:42:20 | call to getABool | test.cpp:42:13:42:20 | call to getABool | != | 0 | 43 | 45 |
 | test.cpp:42:13:42:20 | call to getABool | test.cpp:42:13:42:20 | call to getABool | == | 1 | 43 | 45 |
-irGuards
-| test.c:7:9:7:13 | CompareGT: ... > ... |
-| test.c:17:8:17:12 | CompareLT: ... < ... |
-| test.c:17:17:17:21 | CompareGT: ... > ... |
-| test.c:26:11:26:15 | CompareGT: ... > ... |
-| test.c:34:16:34:21 | CompareLT: ... < ... |
-| test.c:42:16:42:21 | CompareLT: ... < ... |
-| test.c:44:12:44:16 | CompareGT: ... > ... |
-| test.c:45:16:45:20 | CompareGT: ... > ... |
-| test.c:58:9:58:14 | CompareEQ: ... == ... |
-| test.c:58:19:58:23 | CompareLT: ... < ... |
-| test.c:75:9:75:14 | CompareEQ: ... == ... |
-| test.c:85:8:85:13 | CompareEQ: ... == ... |
-| test.c:85:18:85:23 | CompareNE: ... != ... |
-| test.c:94:11:94:16 | CompareNE: ... != ... |
-| test.c:102:16:102:21 | CompareLT: ... < ... |
-| test.c:109:9:109:14 | CompareEQ: ... == ... |
-| test.c:109:19:109:23 | CompareLT: ... < ... |
-| test.c:126:7:126:7 | CompareNE: 1 |
-| test.c:126:12:126:26 | CompareNE: call to test3_condition |
-| test.c:131:7:131:7 | CompareNE: b |
-| test.c:137:7:137:7 | CompareNE: 0 |
-| test.c:146:7:146:8 | CompareEQ: ! ... |
-| test.c:152:10:152:10 | CompareNE: x |
-| test.c:152:15:152:15 | CompareNE: y |
-| test.c:156:9:156:19 | CompareEQ: ... == ... |
-| test.c:159:9:159:19 | CompareEQ: ... == ... |
-| test.c:162:9:162:18 | CompareLT: ... < ... |
-| test.c:165:9:165:18 | CompareLT: ... < ... |
-| test.c:175:13:175:32 | CompareEQ: ... == ... |
-| test.c:181:9:181:9 | CompareNE: x |
-| test.cpp:18:8:18:12 | CompareNE: (bool)... |
-| test.cpp:31:7:31:13 | CompareEQ: ... == ... |
-| test.cpp:42:13:42:20 | Call: call to getABool |
 irGuardsCompare
 | 7 | 0 < x+0 when CompareGT: ... > ... is true |
 | 7 | 0 >= x+0 when CompareGT: ... > ... is false |
@@ -1139,13 +1072,21 @@ irGuardsCompare
 | 146 | x != 0 when CompareEQ: ! ... is false |
 | 146 | x == 0 when CompareEQ: ! ... is true |
 | 152 | x != 0 when CompareNE: x is true |
+| 152 | x != 0 when Load: ... && ... is true |
+| 152 | x != 0 when Phi: ... && ... is true |
 | 152 | x != 1 when CompareNE: x is false |
 | 152 | x == 0 when CompareNE: x is false |
 | 152 | x == 1 when CompareNE: x is true |
+| 152 | x == 1 when Load: ... && ... is true |
+| 152 | x == 1 when Phi: ... && ... is true |
 | 152 | y != 0 when CompareNE: y is true |
+| 152 | y != 0 when Load: ... && ... is true |
+| 152 | y != 0 when Phi: ... && ... is true |
 | 152 | y != 1 when CompareNE: y is false |
 | 152 | y == 0 when CompareNE: y is false |
 | 152 | y == 1 when CompareNE: y is true |
+| 152 | y == 1 when Load: ... && ... is true |
+| 152 | y == 1 when Phi: ... && ... is true |
 | 156 | ... + ... != x+0 when CompareEQ: ... == ... is false |
 | 156 | ... + ... == x+0 when CompareEQ: ... == ... is true |
 | 156 | ... == ... != 0 when CompareEQ: ... == ... is true |
@@ -1211,9 +1152,14 @@ irGuardsCompare
 irGuardsControl
 | test.c:7:9:7:13 | CompareGT: ... > ... | false | 11 | 11 |
 | test.c:7:9:7:13 | CompareGT: ... > ... | true | 8 | 8 |
+| test.c:7:9:7:13 | ConditionalBranch: ... > ... | false | 11 | 11 |
+| test.c:7:9:7:13 | ConditionalBranch: ... > ... | true | 8 | 8 |
 | test.c:17:8:17:12 | CompareLT: ... < ... | true | 17 | 17 |
 | test.c:17:8:17:12 | CompareLT: ... < ... | true | 18 | 18 |
+| test.c:17:8:17:12 | ConditionalBranch: ... < ... | true | 17 | 17 |
+| test.c:17:8:17:12 | ConditionalBranch: ... < ... | true | 18 | 18 |
 | test.c:17:17:17:21 | CompareGT: ... > ... | true | 18 | 18 |
+| test.c:17:17:17:21 | ConditionalBranch: ... > ... | true | 18 | 18 |
 | test.c:26:11:26:15 | CompareGT: ... > ... | false | 2 | 2 |
 | test.c:26:11:26:15 | CompareGT: ... > ... | false | 31 | 31 |
 | test.c:26:11:26:15 | CompareGT: ... > ... | false | 34 | 34 |
@@ -1229,6 +1175,21 @@ irGuardsControl
 | test.c:26:11:26:15 | CompareGT: ... > ... | false | 59 | 59 |
 | test.c:26:11:26:15 | CompareGT: ... > ... | false | 62 | 62 |
 | test.c:26:11:26:15 | CompareGT: ... > ... | true | 27 | 27 |
+| test.c:26:11:26:15 | ConditionalBranch: ... > ... | false | 2 | 2 |
+| test.c:26:11:26:15 | ConditionalBranch: ... > ... | false | 31 | 31 |
+| test.c:26:11:26:15 | ConditionalBranch: ... > ... | false | 34 | 34 |
+| test.c:26:11:26:15 | ConditionalBranch: ... > ... | false | 35 | 35 |
+| test.c:26:11:26:15 | ConditionalBranch: ... > ... | false | 39 | 39 |
+| test.c:26:11:26:15 | ConditionalBranch: ... > ... | false | 42 | 42 |
+| test.c:26:11:26:15 | ConditionalBranch: ... > ... | false | 43 | 43 |
+| test.c:26:11:26:15 | ConditionalBranch: ... > ... | false | 45 | 45 |
+| test.c:26:11:26:15 | ConditionalBranch: ... > ... | false | 46 | 46 |
+| test.c:26:11:26:15 | ConditionalBranch: ... > ... | false | 52 | 52 |
+| test.c:26:11:26:15 | ConditionalBranch: ... > ... | false | 56 | 56 |
+| test.c:26:11:26:15 | ConditionalBranch: ... > ... | false | 58 | 58 |
+| test.c:26:11:26:15 | ConditionalBranch: ... > ... | false | 59 | 59 |
+| test.c:26:11:26:15 | ConditionalBranch: ... > ... | false | 62 | 62 |
+| test.c:26:11:26:15 | ConditionalBranch: ... > ... | true | 27 | 27 |
 | test.c:34:16:34:21 | CompareLT: ... < ... | false | 2 | 2 |
 | test.c:34:16:34:21 | CompareLT: ... < ... | false | 39 | 39 |
 | test.c:34:16:34:21 | CompareLT: ... < ... | false | 42 | 42 |
@@ -1241,22 +1202,56 @@ irGuardsControl
 | test.c:34:16:34:21 | CompareLT: ... < ... | false | 59 | 59 |
 | test.c:34:16:34:21 | CompareLT: ... < ... | false | 62 | 62 |
 | test.c:34:16:34:21 | CompareLT: ... < ... | true | 35 | 35 |
+| test.c:34:16:34:21 | ConditionalBranch: ... < ... | false | 2 | 2 |
+| test.c:34:16:34:21 | ConditionalBranch: ... < ... | false | 39 | 39 |
+| test.c:34:16:34:21 | ConditionalBranch: ... < ... | false | 42 | 42 |
+| test.c:34:16:34:21 | ConditionalBranch: ... < ... | false | 43 | 43 |
+| test.c:34:16:34:21 | ConditionalBranch: ... < ... | false | 45 | 45 |
+| test.c:34:16:34:21 | ConditionalBranch: ... < ... | false | 46 | 46 |
+| test.c:34:16:34:21 | ConditionalBranch: ... < ... | false | 52 | 52 |
+| test.c:34:16:34:21 | ConditionalBranch: ... < ... | false | 56 | 56 |
+| test.c:34:16:34:21 | ConditionalBranch: ... < ... | false | 58 | 58 |
+| test.c:34:16:34:21 | ConditionalBranch: ... < ... | false | 59 | 59 |
+| test.c:34:16:34:21 | ConditionalBranch: ... < ... | false | 62 | 62 |
+| test.c:34:16:34:21 | ConditionalBranch: ... < ... | true | 35 | 35 |
+| test.c:42:16:42:21 | CompareLT: ... < ... | true | 2 | 2 |
 | test.c:42:16:42:21 | CompareLT: ... < ... | true | 43 | 43 |
 | test.c:42:16:42:21 | CompareLT: ... < ... | true | 45 | 45 |
 | test.c:42:16:42:21 | CompareLT: ... < ... | true | 46 | 46 |
 | test.c:42:16:42:21 | CompareLT: ... < ... | true | 52 | 52 |
+| test.c:42:16:42:21 | ConditionalBranch: ... < ... | true | 2 | 2 |
+| test.c:42:16:42:21 | ConditionalBranch: ... < ... | true | 43 | 43 |
+| test.c:42:16:42:21 | ConditionalBranch: ... < ... | true | 45 | 45 |
+| test.c:42:16:42:21 | ConditionalBranch: ... < ... | true | 46 | 46 |
+| test.c:42:16:42:21 | ConditionalBranch: ... < ... | true | 52 | 52 |
 | test.c:44:12:44:16 | CompareGT: ... > ... | false | 52 | 52 |
+| test.c:44:12:44:16 | CompareGT: ... > ... | true | 2 | 2 |
 | test.c:44:12:44:16 | CompareGT: ... > ... | true | 45 | 45 |
 | test.c:44:12:44:16 | CompareGT: ... > ... | true | 46 | 46 |
+| test.c:44:12:44:16 | ConditionalBranch: ... > ... | false | 52 | 52 |
+| test.c:44:12:44:16 | ConditionalBranch: ... > ... | true | 2 | 2 |
+| test.c:44:12:44:16 | ConditionalBranch: ... > ... | true | 45 | 45 |
+| test.c:44:12:44:16 | ConditionalBranch: ... > ... | true | 46 | 46 |
+| test.c:45:16:45:20 | CompareGT: ... > ... | false | 2 | 2 |
 | test.c:45:16:45:20 | CompareGT: ... > ... | true | 46 | 46 |
+| test.c:45:16:45:20 | ConditionalBranch: ... > ... | false | 2 | 2 |
+| test.c:45:16:45:20 | ConditionalBranch: ... > ... | true | 46 | 46 |
 | test.c:58:9:58:14 | CompareEQ: ... == ... | false | 58 | 58 |
 | test.c:58:9:58:14 | CompareEQ: ... == ... | false | 62 | 62 |
+| test.c:58:9:58:14 | ConditionalBranch: ... == ... | false | 58 | 58 |
+| test.c:58:9:58:14 | ConditionalBranch: ... == ... | false | 62 | 62 |
 | test.c:58:19:58:23 | CompareLT: ... < ... | false | 62 | 62 |
+| test.c:58:19:58:23 | ConditionalBranch: ... < ... | false | 62 | 62 |
 | test.c:75:9:75:14 | CompareEQ: ... == ... | false | 79 | 79 |
 | test.c:75:9:75:14 | CompareEQ: ... == ... | true | 76 | 76 |
+| test.c:75:9:75:14 | ConditionalBranch: ... == ... | false | 79 | 79 |
+| test.c:75:9:75:14 | ConditionalBranch: ... == ... | true | 76 | 76 |
 | test.c:85:8:85:13 | CompareEQ: ... == ... | true | 85 | 85 |
 | test.c:85:8:85:13 | CompareEQ: ... == ... | true | 86 | 86 |
+| test.c:85:8:85:13 | ConditionalBranch: ... == ... | true | 85 | 85 |
+| test.c:85:8:85:13 | ConditionalBranch: ... == ... | true | 86 | 86 |
 | test.c:85:18:85:23 | CompareNE: ... != ... | true | 86 | 86 |
+| test.c:85:18:85:23 | ConditionalBranch: ... != ... | true | 86 | 86 |
 | test.c:94:11:94:16 | CompareNE: ... != ... | false | 70 | 70 |
 | test.c:94:11:94:16 | CompareNE: ... != ... | false | 99 | 99 |
 | test.c:94:11:94:16 | CompareNE: ... != ... | false | 102 | 102 |
@@ -1266,40 +1261,89 @@ irGuardsControl
 | test.c:94:11:94:16 | CompareNE: ... != ... | false | 110 | 110 |
 | test.c:94:11:94:16 | CompareNE: ... != ... | false | 113 | 113 |
 | test.c:94:11:94:16 | CompareNE: ... != ... | true | 95 | 95 |
+| test.c:94:11:94:16 | ConditionalBranch: ... != ... | false | 70 | 70 |
+| test.c:94:11:94:16 | ConditionalBranch: ... != ... | false | 99 | 99 |
+| test.c:94:11:94:16 | ConditionalBranch: ... != ... | false | 102 | 102 |
+| test.c:94:11:94:16 | ConditionalBranch: ... != ... | false | 103 | 103 |
+| test.c:94:11:94:16 | ConditionalBranch: ... != ... | false | 107 | 107 |
+| test.c:94:11:94:16 | ConditionalBranch: ... != ... | false | 109 | 109 |
+| test.c:94:11:94:16 | ConditionalBranch: ... != ... | false | 110 | 110 |
+| test.c:94:11:94:16 | ConditionalBranch: ... != ... | false | 113 | 113 |
+| test.c:94:11:94:16 | ConditionalBranch: ... != ... | true | 95 | 95 |
 | test.c:102:16:102:21 | CompareLT: ... < ... | false | 70 | 70 |
 | test.c:102:16:102:21 | CompareLT: ... < ... | false | 107 | 107 |
 | test.c:102:16:102:21 | CompareLT: ... < ... | false | 109 | 109 |
 | test.c:102:16:102:21 | CompareLT: ... < ... | false | 110 | 110 |
 | test.c:102:16:102:21 | CompareLT: ... < ... | false | 113 | 113 |
 | test.c:102:16:102:21 | CompareLT: ... < ... | true | 103 | 103 |
+| test.c:102:16:102:21 | ConditionalBranch: ... < ... | false | 70 | 70 |
+| test.c:102:16:102:21 | ConditionalBranch: ... < ... | false | 107 | 107 |
+| test.c:102:16:102:21 | ConditionalBranch: ... < ... | false | 109 | 109 |
+| test.c:102:16:102:21 | ConditionalBranch: ... < ... | false | 110 | 110 |
+| test.c:102:16:102:21 | ConditionalBranch: ... < ... | false | 113 | 113 |
+| test.c:102:16:102:21 | ConditionalBranch: ... < ... | true | 103 | 103 |
 | test.c:109:9:109:14 | CompareEQ: ... == ... | false | 109 | 109 |
 | test.c:109:9:109:14 | CompareEQ: ... == ... | false | 113 | 113 |
+| test.c:109:9:109:14 | ConditionalBranch: ... == ... | false | 109 | 109 |
+| test.c:109:9:109:14 | ConditionalBranch: ... == ... | false | 113 | 113 |
 | test.c:109:19:109:23 | CompareLT: ... < ... | false | 113 | 113 |
+| test.c:109:19:109:23 | ConditionalBranch: ... < ... | false | 113 | 113 |
+| test.c:126:7:126:7 | CompareNE: 1 | false | 123 | 123 |
 | test.c:126:7:126:7 | CompareNE: 1 | true | 126 | 126 |
 | test.c:126:7:126:7 | CompareNE: 1 | true | 127 | 127 |
 | test.c:126:7:126:7 | CompareNE: 1 | true | 131 | 131 |
 | test.c:126:7:126:7 | CompareNE: 1 | true | 132 | 132 |
 | test.c:126:7:126:7 | CompareNE: 1 | true | 134 | 134 |
+| test.c:126:7:126:7 | ConditionalBranch: 1 | false | 123 | 123 |
+| test.c:126:7:126:7 | ConditionalBranch: 1 | true | 126 | 126 |
+| test.c:126:7:126:7 | ConditionalBranch: 1 | true | 127 | 127 |
+| test.c:126:7:126:7 | ConditionalBranch: 1 | true | 131 | 131 |
+| test.c:126:7:126:7 | ConditionalBranch: 1 | true | 132 | 132 |
+| test.c:126:7:126:7 | ConditionalBranch: 1 | true | 134 | 134 |
 | test.c:126:12:126:26 | CompareNE: call to test3_condition | true | 127 | 127 |
+| test.c:126:12:126:26 | CompareNE: call to test3_condition | true | 132 | 132 |
+| test.c:126:12:126:26 | ConditionalBranch: call to test3_condition | true | 127 | 127 |
+| test.c:126:12:126:26 | ConditionalBranch: call to test3_condition | true | 132 | 132 |
 | test.c:131:7:131:7 | CompareNE: b | true | 132 | 132 |
+| test.c:131:7:131:7 | ConditionalBranch: b | true | 132 | 132 |
 | test.c:137:7:137:7 | CompareNE: 0 | false | 142 | 142 |
+| test.c:137:7:137:7 | CompareNE: 0 | true | 136 | 136 |
+| test.c:137:7:137:7 | ConditionalBranch: 0 | false | 142 | 142 |
+| test.c:137:7:137:7 | ConditionalBranch: 0 | true | 136 | 136 |
 | test.c:146:7:146:8 | CompareEQ: ! ... | true | 147 | 147 |
+| test.c:146:7:146:8 | ConditionalBranch: ! ... | true | 147 | 147 |
 | test.c:152:10:152:10 | CompareNE: x | true | 152 | 152 |
+| test.c:152:10:152:10 | ConditionalBranch: x | true | 152 | 152 |
 | test.c:152:15:152:15 | CompareNE: y | true | 152 | 152 |
+| test.c:152:15:152:15 | ConditionalBranch: y | true | 152 | 152 |
 | test.c:156:9:156:19 | CompareEQ: ... == ... | true | 156 | 157 |
+| test.c:156:9:156:19 | ConditionalBranch: ... == ... | true | 156 | 157 |
 | test.c:159:9:159:19 | CompareEQ: ... == ... | true | 159 | 160 |
+| test.c:159:9:159:19 | ConditionalBranch: ... == ... | true | 159 | 160 |
 | test.c:162:9:162:18 | CompareLT: ... < ... | true | 162 | 163 |
+| test.c:162:9:162:18 | ConditionalBranch: ... < ... | true | 162 | 163 |
 | test.c:165:9:165:18 | CompareLT: ... < ... | true | 165 | 166 |
+| test.c:165:9:165:18 | ConditionalBranch: ... < ... | true | 165 | 166 |
 | test.c:175:13:175:32 | CompareEQ: ... == ... | false | 175 | 175 |
 | test.c:175:13:175:32 | CompareEQ: ... == ... | true | 175 | 175 |
+| test.c:175:13:175:32 | ConditionalBranch: ... == ... | false | 175 | 175 |
+| test.c:175:13:175:32 | ConditionalBranch: ... == ... | true | 175 | 175 |
 | test.c:181:9:181:9 | CompareNE: x | false | 184 | 184 |
 | test.c:181:9:181:9 | CompareNE: x | true | 182 | 182 |
+| test.c:181:9:181:9 | ConditionalBranch: x | false | 184 | 184 |
+| test.c:181:9:181:9 | ConditionalBranch: x | true | 182 | 182 |
 | test.cpp:18:8:18:12 | CompareNE: (bool)... | true | 19 | 19 |
+| test.cpp:18:8:18:12 | ConditionalBranch: (bool)... | true | 19 | 19 |
 | test.cpp:31:7:31:13 | CompareEQ: ... == ... | false | 34 | 34 |
 | test.cpp:31:7:31:13 | CompareEQ: ... == ... | true | 30 | 30 |
 | test.cpp:31:7:31:13 | CompareEQ: ... == ... | true | 32 | 32 |
+| test.cpp:31:7:31:13 | ConditionalBranch: ... == ... | false | 34 | 34 |
+| test.cpp:31:7:31:13 | ConditionalBranch: ... == ... | true | 30 | 30 |
+| test.cpp:31:7:31:13 | ConditionalBranch: ... == ... | true | 32 | 32 |
 | test.cpp:42:13:42:20 | Call: call to getABool | true | 44 | 44 |
 | test.cpp:42:13:42:20 | Call: call to getABool | true | 45 | 45 |
+| test.cpp:42:13:42:20 | ConditionalBranch: call to getABool | true | 44 | 44 |
+| test.cpp:42:13:42:20 | ConditionalBranch: call to getABool | true | 45 | 45 |
 irGuardsEnsure
 | test.c:7:9:7:13 | CompareGT: ... > ... | test.c:7:9:7:9 | Load: x | < | test.c:7:13:7:13 | Constant: 0 | 1 | 11 | 11 |
 | test.c:7:9:7:13 | CompareGT: ... > ... | test.c:7:9:7:9 | Load: x | >= | test.c:7:13:7:13 | Constant: 0 | 1 | 8 | 8 |
@@ -1365,22 +1409,28 @@ irGuardsEnsure
 | test.c:34:16:34:21 | CompareLT: ... < ... | test.c:34:20:34:21 | Constant: 10 | < | test.c:34:16:34:16 | Load: j | 1 | 59 | 59 |
 | test.c:34:16:34:21 | CompareLT: ... < ... | test.c:34:20:34:21 | Constant: 10 | < | test.c:34:16:34:16 | Load: j | 1 | 62 | 62 |
 | test.c:34:16:34:21 | CompareLT: ... < ... | test.c:34:20:34:21 | Constant: 10 | >= | test.c:34:16:34:16 | Load: j | 1 | 35 | 35 |
+| test.c:42:16:42:21 | CompareLT: ... < ... | test.c:42:16:42:16 | Load: j | < | test.c:42:20:42:21 | Constant: 10 | 0 | 2 | 2 |
 | test.c:42:16:42:21 | CompareLT: ... < ... | test.c:42:16:42:16 | Load: j | < | test.c:42:20:42:21 | Constant: 10 | 0 | 43 | 43 |
 | test.c:42:16:42:21 | CompareLT: ... < ... | test.c:42:16:42:16 | Load: j | < | test.c:42:20:42:21 | Constant: 10 | 0 | 45 | 45 |
 | test.c:42:16:42:21 | CompareLT: ... < ... | test.c:42:16:42:16 | Load: j | < | test.c:42:20:42:21 | Constant: 10 | 0 | 46 | 46 |
 | test.c:42:16:42:21 | CompareLT: ... < ... | test.c:42:16:42:16 | Load: j | < | test.c:42:20:42:21 | Constant: 10 | 0 | 52 | 52 |
+| test.c:42:16:42:21 | CompareLT: ... < ... | test.c:42:20:42:21 | Constant: 10 | >= | test.c:42:16:42:16 | Load: j | 1 | 2 | 2 |
 | test.c:42:16:42:21 | CompareLT: ... < ... | test.c:42:20:42:21 | Constant: 10 | >= | test.c:42:16:42:16 | Load: j | 1 | 43 | 43 |
 | test.c:42:16:42:21 | CompareLT: ... < ... | test.c:42:20:42:21 | Constant: 10 | >= | test.c:42:16:42:16 | Load: j | 1 | 45 | 45 |
 | test.c:42:16:42:21 | CompareLT: ... < ... | test.c:42:20:42:21 | Constant: 10 | >= | test.c:42:16:42:16 | Load: j | 1 | 46 | 46 |
 | test.c:42:16:42:21 | CompareLT: ... < ... | test.c:42:20:42:21 | Constant: 10 | >= | test.c:42:16:42:16 | Load: j | 1 | 52 | 52 |
 | test.c:44:12:44:16 | CompareGT: ... > ... | test.c:44:12:44:12 | Load: z | < | test.c:44:16:44:16 | Constant: 0 | 1 | 52 | 52 |
+| test.c:44:12:44:16 | CompareGT: ... > ... | test.c:44:12:44:12 | Load: z | >= | test.c:44:16:44:16 | Constant: 0 | 1 | 2 | 2 |
 | test.c:44:12:44:16 | CompareGT: ... > ... | test.c:44:12:44:12 | Load: z | >= | test.c:44:16:44:16 | Constant: 0 | 1 | 45 | 45 |
 | test.c:44:12:44:16 | CompareGT: ... > ... | test.c:44:12:44:12 | Load: z | >= | test.c:44:16:44:16 | Constant: 0 | 1 | 46 | 46 |
+| test.c:44:12:44:16 | CompareGT: ... > ... | test.c:44:16:44:16 | Constant: 0 | < | test.c:44:12:44:12 | Load: z | 0 | 2 | 2 |
 | test.c:44:12:44:16 | CompareGT: ... > ... | test.c:44:16:44:16 | Constant: 0 | < | test.c:44:12:44:12 | Load: z | 0 | 45 | 45 |
 | test.c:44:12:44:16 | CompareGT: ... > ... | test.c:44:16:44:16 | Constant: 0 | < | test.c:44:12:44:12 | Load: z | 0 | 46 | 46 |
 | test.c:44:12:44:16 | CompareGT: ... > ... | test.c:44:16:44:16 | Constant: 0 | >= | test.c:44:12:44:12 | Load: z | 0 | 52 | 52 |
+| test.c:45:16:45:20 | CompareGT: ... > ... | test.c:45:16:45:16 | Load: y | < | test.c:45:20:45:20 | Constant: (long)... | 1 | 2 | 2 |
 | test.c:45:16:45:20 | CompareGT: ... > ... | test.c:45:16:45:16 | Load: y | >= | test.c:45:20:45:20 | Constant: (long)... | 1 | 46 | 46 |
 | test.c:45:16:45:20 | CompareGT: ... > ... | test.c:45:20:45:20 | Constant: (long)... | < | test.c:45:16:45:16 | Load: y | 0 | 46 | 46 |
+| test.c:45:16:45:20 | CompareGT: ... > ... | test.c:45:20:45:20 | Constant: (long)... | >= | test.c:45:16:45:16 | Load: y | 0 | 2 | 2 |
 | test.c:58:9:58:14 | CompareEQ: ... == ... | test.c:58:9:58:9 | Load: x | != | test.c:58:14:58:14 | Constant: 0 | 0 | 58 | 58 |
 | test.c:58:9:58:14 | CompareEQ: ... == ... | test.c:58:9:58:9 | Load: x | != | test.c:58:14:58:14 | Constant: 0 | 0 | 62 | 62 |
 | test.c:58:9:58:14 | CompareEQ: ... == ... | test.c:58:14:58:14 | Constant: 0 | != | test.c:58:9:58:9 | Load: x | 0 | 58 | 58 |
@@ -1451,10 +1501,16 @@ irGuardsEnsure
 | test.c:126:7:126:7 | CompareNE: 1 | test.c:126:7:126:7 | Constant: 1 | != | test.c:126:7:126:7 | Constant: 1 | 0 | 132 | 132 |
 | test.c:126:7:126:7 | CompareNE: 1 | test.c:126:7:126:7 | Constant: 1 | != | test.c:126:7:126:7 | Constant: 1 | 0 | 134 | 134 |
 | test.c:126:7:126:7 | CompareNE: 1 | test.c:126:7:126:7 | Constant: 1 | != | test.c:126:7:126:7 | Constant: 1 | 0 | 134 | 134 |
+| test.c:126:7:126:7 | CompareNE: 1 | test.c:126:7:126:7 | Constant: 1 | == | test.c:126:7:126:7 | Constant: 1 | 0 | 123 | 123 |
+| test.c:126:7:126:7 | CompareNE: 1 | test.c:126:7:126:7 | Constant: 1 | == | test.c:126:7:126:7 | Constant: 1 | 0 | 123 | 123 |
 | test.c:126:12:126:26 | CompareNE: call to test3_condition | test.c:126:12:126:26 | Call: call to test3_condition | != | test.c:126:12:126:26 | Constant: call to test3_condition | 0 | 127 | 127 |
+| test.c:126:12:126:26 | CompareNE: call to test3_condition | test.c:126:12:126:26 | Call: call to test3_condition | != | test.c:126:12:126:26 | Constant: call to test3_condition | 0 | 132 | 132 |
 | test.c:126:12:126:26 | CompareNE: call to test3_condition | test.c:126:12:126:26 | Constant: call to test3_condition | != | test.c:126:12:126:26 | Call: call to test3_condition | 0 | 127 | 127 |
+| test.c:126:12:126:26 | CompareNE: call to test3_condition | test.c:126:12:126:26 | Constant: call to test3_condition | != | test.c:126:12:126:26 | Call: call to test3_condition | 0 | 132 | 132 |
 | test.c:131:7:131:7 | CompareNE: b | test.c:131:7:131:7 | Constant: b | != | test.c:131:7:131:7 | Load: b | 0 | 132 | 132 |
 | test.c:131:7:131:7 | CompareNE: b | test.c:131:7:131:7 | Load: b | != | test.c:131:7:131:7 | Constant: b | 0 | 132 | 132 |
+| test.c:137:7:137:7 | CompareNE: 0 | test.c:137:7:137:7 | Constant: 0 | != | test.c:137:7:137:7 | Constant: 0 | 0 | 136 | 136 |
+| test.c:137:7:137:7 | CompareNE: 0 | test.c:137:7:137:7 | Constant: 0 | != | test.c:137:7:137:7 | Constant: 0 | 0 | 136 | 136 |
 | test.c:137:7:137:7 | CompareNE: 0 | test.c:137:7:137:7 | Constant: 0 | == | test.c:137:7:137:7 | Constant: 0 | 0 | 142 | 142 |
 | test.c:137:7:137:7 | CompareNE: 0 | test.c:137:7:137:7 | Constant: 0 | == | test.c:137:7:137:7 | Constant: 0 | 0 | 142 | 142 |
 | test.c:146:7:146:8 | CompareEQ: ! ... | test.c:146:7:146:8 | Constant: ! ... | == | test.c:146:8:146:8 | Load: x | 0 | 147 | 147 |
@@ -1592,29 +1648,38 @@ irGuardsEnsure_const
 | test.c:34:16:34:21 | CompareLT: ... < ... | test.c:34:16:34:21 | CompareLT: ... < ... | == | 0 | 59 | 59 |
 | test.c:34:16:34:21 | CompareLT: ... < ... | test.c:34:16:34:21 | CompareLT: ... < ... | == | 0 | 62 | 62 |
 | test.c:34:16:34:21 | CompareLT: ... < ... | test.c:34:16:34:21 | CompareLT: ... < ... | == | 1 | 35 | 35 |
+| test.c:42:16:42:21 | CompareLT: ... < ... | test.c:42:16:42:16 | Load: j | < | 10 | 2 | 2 |
 | test.c:42:16:42:21 | CompareLT: ... < ... | test.c:42:16:42:16 | Load: j | < | 10 | 43 | 43 |
 | test.c:42:16:42:21 | CompareLT: ... < ... | test.c:42:16:42:16 | Load: j | < | 10 | 45 | 45 |
 | test.c:42:16:42:21 | CompareLT: ... < ... | test.c:42:16:42:16 | Load: j | < | 10 | 46 | 46 |
 | test.c:42:16:42:21 | CompareLT: ... < ... | test.c:42:16:42:16 | Load: j | < | 10 | 52 | 52 |
+| test.c:42:16:42:21 | CompareLT: ... < ... | test.c:42:16:42:21 | CompareLT: ... < ... | != | 0 | 2 | 2 |
 | test.c:42:16:42:21 | CompareLT: ... < ... | test.c:42:16:42:21 | CompareLT: ... < ... | != | 0 | 43 | 43 |
 | test.c:42:16:42:21 | CompareLT: ... < ... | test.c:42:16:42:21 | CompareLT: ... < ... | != | 0 | 45 | 45 |
 | test.c:42:16:42:21 | CompareLT: ... < ... | test.c:42:16:42:21 | CompareLT: ... < ... | != | 0 | 46 | 46 |
 | test.c:42:16:42:21 | CompareLT: ... < ... | test.c:42:16:42:21 | CompareLT: ... < ... | != | 0 | 52 | 52 |
+| test.c:42:16:42:21 | CompareLT: ... < ... | test.c:42:16:42:21 | CompareLT: ... < ... | == | 1 | 2 | 2 |
 | test.c:42:16:42:21 | CompareLT: ... < ... | test.c:42:16:42:21 | CompareLT: ... < ... | == | 1 | 43 | 43 |
 | test.c:42:16:42:21 | CompareLT: ... < ... | test.c:42:16:42:21 | CompareLT: ... < ... | == | 1 | 45 | 45 |
 | test.c:42:16:42:21 | CompareLT: ... < ... | test.c:42:16:42:21 | CompareLT: ... < ... | == | 1 | 46 | 46 |
 | test.c:42:16:42:21 | CompareLT: ... < ... | test.c:42:16:42:21 | CompareLT: ... < ... | == | 1 | 52 | 52 |
 | test.c:44:12:44:16 | CompareGT: ... > ... | test.c:44:12:44:12 | Load: z | < | 1 | 52 | 52 |
+| test.c:44:12:44:16 | CompareGT: ... > ... | test.c:44:12:44:12 | Load: z | >= | 1 | 2 | 2 |
 | test.c:44:12:44:16 | CompareGT: ... > ... | test.c:44:12:44:12 | Load: z | >= | 1 | 45 | 45 |
 | test.c:44:12:44:16 | CompareGT: ... > ... | test.c:44:12:44:12 | Load: z | >= | 1 | 46 | 46 |
+| test.c:44:12:44:16 | CompareGT: ... > ... | test.c:44:12:44:16 | CompareGT: ... > ... | != | 0 | 2 | 2 |
 | test.c:44:12:44:16 | CompareGT: ... > ... | test.c:44:12:44:16 | CompareGT: ... > ... | != | 0 | 45 | 45 |
 | test.c:44:12:44:16 | CompareGT: ... > ... | test.c:44:12:44:16 | CompareGT: ... > ... | != | 0 | 46 | 46 |
 | test.c:44:12:44:16 | CompareGT: ... > ... | test.c:44:12:44:16 | CompareGT: ... > ... | != | 1 | 52 | 52 |
 | test.c:44:12:44:16 | CompareGT: ... > ... | test.c:44:12:44:16 | CompareGT: ... > ... | == | 0 | 52 | 52 |
+| test.c:44:12:44:16 | CompareGT: ... > ... | test.c:44:12:44:16 | CompareGT: ... > ... | == | 1 | 2 | 2 |
 | test.c:44:12:44:16 | CompareGT: ... > ... | test.c:44:12:44:16 | CompareGT: ... > ... | == | 1 | 45 | 45 |
 | test.c:44:12:44:16 | CompareGT: ... > ... | test.c:44:12:44:16 | CompareGT: ... > ... | == | 1 | 46 | 46 |
+| test.c:45:16:45:20 | CompareGT: ... > ... | test.c:45:16:45:16 | Load: y | < | 1 | 2 | 2 |
 | test.c:45:16:45:20 | CompareGT: ... > ... | test.c:45:16:45:16 | Load: y | >= | 1 | 46 | 46 |
 | test.c:45:16:45:20 | CompareGT: ... > ... | test.c:45:16:45:20 | CompareGT: ... > ... | != | 0 | 46 | 46 |
+| test.c:45:16:45:20 | CompareGT: ... > ... | test.c:45:16:45:20 | CompareGT: ... > ... | != | 1 | 2 | 2 |
+| test.c:45:16:45:20 | CompareGT: ... > ... | test.c:45:16:45:20 | CompareGT: ... > ... | == | 0 | 2 | 2 |
 | test.c:45:16:45:20 | CompareGT: ... > ... | test.c:45:16:45:20 | CompareGT: ... > ... | == | 1 | 46 | 46 |
 | test.c:58:9:58:14 | CompareEQ: ... == ... | test.c:58:9:58:9 | Load: x | != | 0 | 58 | 58 |
 | test.c:58:9:58:14 | CompareEQ: ... == ... | test.c:58:9:58:9 | Load: x | != | 0 | 62 | 62 |
@@ -1711,6 +1776,8 @@ irGuardsEnsure_const
 | test.c:126:7:126:7 | CompareNE: 1 | test.c:126:7:126:7 | CompareNE: 1 | != | 0 | 131 | 131 |
 | test.c:126:7:126:7 | CompareNE: 1 | test.c:126:7:126:7 | CompareNE: 1 | != | 0 | 132 | 132 |
 | test.c:126:7:126:7 | CompareNE: 1 | test.c:126:7:126:7 | CompareNE: 1 | != | 0 | 134 | 134 |
+| test.c:126:7:126:7 | CompareNE: 1 | test.c:126:7:126:7 | CompareNE: 1 | != | 1 | 123 | 123 |
+| test.c:126:7:126:7 | CompareNE: 1 | test.c:126:7:126:7 | CompareNE: 1 | == | 0 | 123 | 123 |
 | test.c:126:7:126:7 | CompareNE: 1 | test.c:126:7:126:7 | CompareNE: 1 | == | 1 | 126 | 126 |
 | test.c:126:7:126:7 | CompareNE: 1 | test.c:126:7:126:7 | CompareNE: 1 | == | 1 | 127 | 127 |
 | test.c:126:7:126:7 | CompareNE: 1 | test.c:126:7:126:7 | CompareNE: 1 | == | 1 | 131 | 131 |
@@ -1726,14 +1793,23 @@ irGuardsEnsure_const
 | test.c:126:7:126:7 | CompareNE: 1 | test.c:126:7:126:7 | Constant: 1 | != | 1 | 131 | 131 |
 | test.c:126:7:126:7 | CompareNE: 1 | test.c:126:7:126:7 | Constant: 1 | != | 1 | 132 | 132 |
 | test.c:126:7:126:7 | CompareNE: 1 | test.c:126:7:126:7 | Constant: 1 | != | 1 | 134 | 134 |
+| test.c:126:7:126:7 | CompareNE: 1 | test.c:126:7:126:7 | Constant: 1 | == | 0 | 123 | 123 |
+| test.c:126:7:126:7 | CompareNE: 1 | test.c:126:7:126:7 | Constant: 1 | == | 1 | 123 | 123 |
 | test.c:126:12:126:26 | CompareNE: call to test3_condition | test.c:126:12:126:26 | Call: call to test3_condition | != | 0 | 127 | 127 |
+| test.c:126:12:126:26 | CompareNE: call to test3_condition | test.c:126:12:126:26 | Call: call to test3_condition | != | 0 | 132 | 132 |
 | test.c:126:12:126:26 | CompareNE: call to test3_condition | test.c:126:12:126:26 | CompareNE: call to test3_condition | != | 0 | 127 | 127 |
+| test.c:126:12:126:26 | CompareNE: call to test3_condition | test.c:126:12:126:26 | CompareNE: call to test3_condition | != | 0 | 132 | 132 |
 | test.c:126:12:126:26 | CompareNE: call to test3_condition | test.c:126:12:126:26 | CompareNE: call to test3_condition | == | 1 | 127 | 127 |
+| test.c:126:12:126:26 | CompareNE: call to test3_condition | test.c:126:12:126:26 | CompareNE: call to test3_condition | == | 1 | 132 | 132 |
 | test.c:131:7:131:7 | CompareNE: b | test.c:131:7:131:7 | CompareNE: b | != | 0 | 132 | 132 |
 | test.c:131:7:131:7 | CompareNE: b | test.c:131:7:131:7 | CompareNE: b | == | 1 | 132 | 132 |
 | test.c:131:7:131:7 | CompareNE: b | test.c:131:7:131:7 | Load: b | != | 0 | 132 | 132 |
+| test.c:137:7:137:7 | CompareNE: 0 | test.c:137:7:137:7 | CompareNE: 0 | != | 0 | 136 | 136 |
 | test.c:137:7:137:7 | CompareNE: 0 | test.c:137:7:137:7 | CompareNE: 0 | != | 1 | 142 | 142 |
 | test.c:137:7:137:7 | CompareNE: 0 | test.c:137:7:137:7 | CompareNE: 0 | == | 0 | 142 | 142 |
+| test.c:137:7:137:7 | CompareNE: 0 | test.c:137:7:137:7 | CompareNE: 0 | == | 1 | 136 | 136 |
+| test.c:137:7:137:7 | CompareNE: 0 | test.c:137:7:137:7 | Constant: 0 | != | 0 | 136 | 136 |
+| test.c:137:7:137:7 | CompareNE: 0 | test.c:137:7:137:7 | Constant: 0 | != | 0 | 136 | 136 |
 | test.c:137:7:137:7 | CompareNE: 0 | test.c:137:7:137:7 | Constant: 0 | == | 0 | 142 | 142 |
 | test.c:137:7:137:7 | CompareNE: 0 | test.c:137:7:137:7 | Constant: 0 | == | 0 | 142 | 142 |
 | test.c:146:7:146:8 | CompareEQ: ! ... | test.c:146:7:146:8 | CompareEQ: ! ... | != | 0 | 147 | 147 |
diff --git a/cpp/ql/test/library-tests/controlflow/guards-ir/tests.ql b/cpp/ql/test/library-tests/controlflow/guards-ir/tests.ql
index 0f147f9ea8d..f91ae1e423d 100644
--- a/cpp/ql/test/library-tests/controlflow/guards-ir/tests.ql
+++ b/cpp/ql/test/library-tests/controlflow/guards-ir/tests.ql
@@ -1,8 +1,6 @@
 import cpp
 import semmle.code.cpp.controlflow.IRGuards
 
-query predicate astGuards(GuardCondition guard) { any() }
-
 query predicate astGuardsCompare(int startLine, string msg) {
   exists(GuardCondition guard, Expr left, int k, string op |
     exists(boolean sense, string which |
@@ -23,7 +21,7 @@ query predicate astGuardsCompare(int startLine, string msg) {
       )
     )
     or
-    exists(AbstractValue value |
+    exists(GuardValue value |
       guard.comparesEq(left, k, true, value) and op = " == "
       or
       guard.comparesEq(left, k, false, value) and op = " != "
@@ -70,8 +68,6 @@ query predicate astGuardsEnsure_const(
   )
 }
 
-query predicate irGuards(IRGuardCondition guard) { any() }
-
 query predicate irGuardsCompare(int startLine, string msg) {
   exists(IRGuardCondition guard, Operand left, int k, string op |
     exists(boolean sense, string which |
@@ -95,7 +91,7 @@ query predicate irGuardsCompare(int startLine, string msg) {
       )
     )
     or
-    exists(AbstractValue value |
+    exists(GuardValue value |
       guard.comparesLt(left, k, true, value) and op = " < "
       or
       guard.comparesLt(left, k, false, value) and op = " >= "
diff --git a/cpp/ql/test/library-tests/controlflow/guards/Guards.expected b/cpp/ql/test/library-tests/controlflow/guards/Guards.expected
deleted file mode 100644
index 70290c7e226..00000000000
--- a/cpp/ql/test/library-tests/controlflow/guards/Guards.expected
+++ /dev/null
@@ -1,108 +0,0 @@
-| test.c:7:9:7:13 | ... > ... |
-| test.c:17:8:17:12 | ... < ... |
-| test.c:17:8:17:21 | ... && ... |
-| test.c:17:17:17:21 | ... > ... |
-| test.c:26:11:26:15 | ... > ... |
-| test.c:34:16:34:21 | ... < ... |
-| test.c:42:16:42:21 | ... < ... |
-| test.c:44:12:44:16 | ... > ... |
-| test.c:45:16:45:20 | ... > ... |
-| test.c:58:9:58:14 | ... == ... |
-| test.c:58:9:58:23 | ... \|\| ... |
-| test.c:58:19:58:23 | ... < ... |
-| test.c:75:9:75:14 | ... == ... |
-| test.c:85:8:85:13 | ... == ... |
-| test.c:85:8:85:23 | ... && ... |
-| test.c:85:18:85:23 | ... != ... |
-| test.c:94:11:94:16 | ... != ... |
-| test.c:102:16:102:21 | ... < ... |
-| test.c:109:9:109:14 | ... == ... |
-| test.c:109:9:109:23 | ... \|\| ... |
-| test.c:109:19:109:23 | ... < ... |
-| test.c:126:7:126:7 | 1 |
-| test.c:126:7:126:28 | ... && ... |
-| test.c:126:12:126:26 | call to test3_condition |
-| test.c:131:7:131:7 | b |
-| test.c:137:7:137:7 | 0 |
-| test.c:146:7:146:8 | ! ... |
-| test.c:146:8:146:8 | x |
-| test.c:152:8:152:8 | p |
-| test.c:158:8:158:9 | ! ... |
-| test.c:158:9:158:9 | p |
-| test.c:164:8:164:8 | s |
-| test.c:170:8:170:9 | ! ... |
-| test.c:170:9:170:9 | s |
-| test.c:176:8:176:15 | ! ... |
-| test.c:176:10:176:14 | ... < ... |
-| test.c:182:8:182:34 | ! ... |
-| test.c:182:10:182:20 | ... >= ... |
-| test.c:182:10:182:33 | ... && ... |
-| test.c:182:25:182:33 | ... < ... |
-| test.c:190:7:190:8 | ! ... |
-| test.c:190:8:190:8 | c |
-| test.c:198:7:198:8 | ! ... |
-| test.c:198:8:198:8 | b |
-| test.c:206:7:206:8 | ! ... |
-| test.c:206:8:206:8 | c |
-| test.c:215:6:215:18 | call to __builtin_expect |
-| test.c:219:9:219:22 | call to __builtin_expect |
-| test.cpp:18:8:18:10 | call to get |
-| test.cpp:31:7:31:13 | ... == ... |
-| test.cpp:42:13:42:20 | call to getABool |
-| test.cpp:61:10:61:10 | i |
-| test.cpp:74:10:74:10 | i |
-| test.cpp:84:10:84:10 | i |
-| test.cpp:93:6:93:6 | c |
-| test.cpp:99:6:99:6 | f |
-| test.cpp:105:6:105:14 | ... != ... |
-| test.cpp:111:6:111:14 | ... != ... |
-| test.cpp:122:9:122:9 | b |
-| test.cpp:125:13:125:20 | ! ... |
-| test.cpp:125:14:125:17 | call to safe |
-| test.cpp:131:6:131:21 | call to __builtin_expect |
-| test.cpp:135:6:135:21 | call to __builtin_expect |
-| test.cpp:141:6:141:21 | call to __builtin_expect |
-| test.cpp:145:6:145:21 | call to __builtin_expect |
-| test.cpp:152:7:152:8 | ! ... |
-| test.cpp:152:8:152:8 | b |
-| test.cpp:160:7:160:8 | ! ... |
-| test.cpp:160:8:160:8 | c |
-| test.cpp:168:7:168:8 | ! ... |
-| test.cpp:168:8:168:8 | b |
-| test.cpp:176:7:176:8 | ! ... |
-| test.cpp:176:8:176:8 | c |
-| test.cpp:182:6:182:16 | ! ... |
-| test.cpp:182:8:182:9 | b1 |
-| test.cpp:182:8:182:15 | ... && ... |
-| test.cpp:182:14:182:15 | b2 |
-| test.cpp:193:6:193:16 | ! ... |
-| test.cpp:193:8:193:9 | b1 |
-| test.cpp:193:8:193:15 | ... \|\| ... |
-| test.cpp:193:14:193:15 | b2 |
-| test.cpp:211:9:211:15 | ... == ... |
-| test.cpp:214:9:214:17 | ... == ... |
-| test.cpp:217:9:217:15 | ... == ... |
-| test.cpp:220:9:220:14 | ... == ... |
-| test.cpp:223:9:223:16 | ... == ... |
-| test.cpp:226:9:226:14 | ... == ... |
-| test.cpp:229:9:229:14 | ... == ... |
-| test.cpp:232:9:232:18 | ... == ... |
-| test.cpp:235:9:235:17 | ... == ... |
-| test.cpp:238:9:238:17 | ... == ... |
-| test.cpp:241:9:241:17 | ... == ... |
-| test.cpp:241:9:241:30 | ... && ... |
-| test.cpp:241:9:241:43 | ... && ... |
-| test.cpp:241:22:241:30 | ... == ... |
-| test.cpp:241:35:241:43 | ... == ... |
-| test.cpp:247:6:247:18 | ... == ... |
-| test.cpp:253:6:253:18 | ... != ... |
-| test.cpp:260:6:260:18 | ... == ... |
-| test.cpp:266:6:266:18 | ... != ... |
-| test.cpp:273:6:273:17 | ... == ... |
-| test.cpp:279:6:279:17 | ... != ... |
-| test.cpp:287:6:287:19 | ... == ... |
-| test.cpp:293:6:293:19 | ... != ... |
-| test.cpp:300:6:300:19 | ... == ... |
-| test.cpp:306:6:306:19 | ... != ... |
-| test.cpp:312:6:312:18 | ... == ... |
-| test.cpp:318:6:318:18 | ... != ... |
diff --git a/cpp/ql/test/library-tests/controlflow/guards/Guards.ql b/cpp/ql/test/library-tests/controlflow/guards/Guards.ql
deleted file mode 100644
index 6580c2acf58..00000000000
--- a/cpp/ql/test/library-tests/controlflow/guards/Guards.ql
+++ /dev/null
@@ -1,5 +0,0 @@
-import cpp
-import semmle.code.cpp.controlflow.Guards
-
-from GuardCondition guard
-select guard
diff --git a/cpp/ql/test/library-tests/controlflow/guards/GuardsCompare.expected b/cpp/ql/test/library-tests/controlflow/guards/GuardsCompare.expected
index 5d3232d50fa..4d78c4016da 100644
--- a/cpp/ql/test/library-tests/controlflow/guards/GuardsCompare.expected
+++ b/cpp/ql/test/library-tests/controlflow/guards/GuardsCompare.expected
@@ -392,6 +392,12 @@
 | test.c:206:8:206:8 | c | b >= a+0 when c is false |
 | test.c:206:8:206:8 | c | c != 0 when c is true |
 | test.c:206:8:206:8 | c | c == 0 when c is false |
+| test.c:215:6:215:18 | ! ... | ... > ... != 0 when ! ... is false |
+| test.c:215:6:215:18 | ! ... | ... > ... == 0 when ! ... is true |
+| test.c:215:6:215:18 | ! ... | a < b+1 when ! ... is true |
+| test.c:215:6:215:18 | ! ... | a >= b+1 when ! ... is false |
+| test.c:215:6:215:18 | ! ... | b < a+0 when ! ... is false |
+| test.c:215:6:215:18 | ! ... | b >= a+0 when ! ... is true |
 | test.c:215:6:215:18 | call to __builtin_expect | ... > ... != 0 when call to __builtin_expect is true |
 | test.c:215:6:215:18 | call to __builtin_expect | ... > ... == 0 when call to __builtin_expect is false |
 | test.c:215:6:215:18 | call to __builtin_expect | a < b+1 when call to __builtin_expect is false |
@@ -402,6 +408,20 @@
 | test.c:215:6:215:18 | call to __builtin_expect | call to __builtin_expect != 1 when call to __builtin_expect is false |
 | test.c:215:6:215:18 | call to __builtin_expect | call to __builtin_expect == 0 when call to __builtin_expect is false |
 | test.c:215:6:215:18 | call to __builtin_expect | call to __builtin_expect == 1 when call to __builtin_expect is true |
+| test.c:215:13:215:17 | ... > ... | ... > ... != 0 when ... > ... is true |
+| test.c:215:13:215:17 | ... > ... | ... > ... == 0 when ... > ... is false |
+| test.c:215:13:215:17 | ... > ... | a < b+1 when ... > ... is false |
+| test.c:215:13:215:17 | ... > ... | a >= b+1 when ... > ... is true |
+| test.c:215:13:215:17 | ... > ... | b < a+0 when ... > ... is true |
+| test.c:215:13:215:17 | ... > ... | b >= a+0 when ... > ... is false |
+| test.c:219:9:219:22 | ! ... | 42 < a+0 when ! ... is false |
+| test.c:219:9:219:22 | ! ... | 42 >= a+0 when ! ... is true |
+| test.c:219:9:219:22 | ! ... | ... > ... != 0 when ! ... is false |
+| test.c:219:9:219:22 | ! ... | ... > ... == 0 when ! ... is true |
+| test.c:219:9:219:22 | ! ... | a < 42+1 when ! ... is true |
+| test.c:219:9:219:22 | ! ... | a < 43 when ! ... is true |
+| test.c:219:9:219:22 | ! ... | a >= 42+1 when ! ... is false |
+| test.c:219:9:219:22 | ! ... | a >= 43 when ! ... is false |
 | test.c:219:9:219:22 | call to __builtin_expect | 42 < a+0 when call to __builtin_expect is true |
 | test.c:219:9:219:22 | call to __builtin_expect | 42 >= a+0 when call to __builtin_expect is false |
 | test.c:219:9:219:22 | call to __builtin_expect | ... > ... != 0 when call to __builtin_expect is true |
@@ -414,6 +434,14 @@
 | test.c:219:9:219:22 | call to __builtin_expect | call to __builtin_expect != 1 when call to __builtin_expect is false |
 | test.c:219:9:219:22 | call to __builtin_expect | call to __builtin_expect == 0 when call to __builtin_expect is false |
 | test.c:219:9:219:22 | call to __builtin_expect | call to __builtin_expect == 1 when call to __builtin_expect is true |
+| test.c:219:16:219:21 | ... > ... | 42 < a+0 when ... > ... is true |
+| test.c:219:16:219:21 | ... > ... | 42 >= a+0 when ... > ... is false |
+| test.c:219:16:219:21 | ... > ... | ... > ... != 0 when ... > ... is true |
+| test.c:219:16:219:21 | ... > ... | ... > ... == 0 when ... > ... is false |
+| test.c:219:16:219:21 | ... > ... | a < 42+1 when ... > ... is false |
+| test.c:219:16:219:21 | ... > ... | a < 43 when ... > ... is false |
+| test.c:219:16:219:21 | ... > ... | a >= 42+1 when ... > ... is true |
+| test.c:219:16:219:21 | ... > ... | a >= 43 when ... > ... is true |
 | test.cpp:18:8:18:10 | call to get | call to get != 0 when call to get is true |
 | test.cpp:18:8:18:10 | call to get | call to get != 1 when call to get is false |
 | test.cpp:18:8:18:10 | call to get | call to get == 0 when call to get is false |
@@ -432,13 +460,52 @@
 | test.cpp:42:13:42:20 | call to getABool | call to getABool != 1 when call to getABool is false |
 | test.cpp:42:13:42:20 | call to getABool | call to getABool == 0 when call to getABool is false |
 | test.cpp:42:13:42:20 | call to getABool | call to getABool == 1 when call to getABool is true |
-| test.cpp:61:10:61:10 | i | i == 0 when i is Case[0] |
-| test.cpp:61:10:61:10 | i | i == 1 when i is Case[1] |
-| test.cpp:61:10:61:10 | i | i == 2 when i is Case[2] |
-| test.cpp:74:10:74:10 | i | i < 11 when i is Case[0..10] |
-| test.cpp:74:10:74:10 | i | i < 21 when i is Case[11..20] |
-| test.cpp:74:10:74:10 | i | i >= 0 when i is Case[0..10] |
-| test.cpp:74:10:74:10 | i | i >= 11 when i is Case[11..20] |
+| test.cpp:60:31:60:31 | i | i != 0 when i is not 0 |
+| test.cpp:60:31:60:31 | i | i != 1 when i is not 1 |
+| test.cpp:60:31:60:31 | i | i != 2 when i is not 2 |
+| test.cpp:60:31:60:31 | i | i == 0 when i is 0 |
+| test.cpp:60:31:60:31 | i | i == 1 when i is 1 |
+| test.cpp:60:31:60:31 | i | i == 2 when i is 2 |
+| test.cpp:61:10:61:10 | i | i != 0 when i is not 0 |
+| test.cpp:61:10:61:10 | i | i != 1 when i is not 1 |
+| test.cpp:61:10:61:10 | i | i != 2 when i is not 2 |
+| test.cpp:61:10:61:10 | i | i == 0 when i is 0 |
+| test.cpp:61:10:61:10 | i | i == 1 when i is 1 |
+| test.cpp:61:10:61:10 | i | i == 2 when i is 2 |
+| test.cpp:63:12:63:12 | i | i != 0 when i is not 0 |
+| test.cpp:63:12:63:12 | i | i != 1 when i is not 1 |
+| test.cpp:63:12:63:12 | i | i != 2 when i is not 2 |
+| test.cpp:63:12:63:12 | i | i == 0 when i is 0 |
+| test.cpp:63:12:63:12 | i | i == 1 when i is 1 |
+| test.cpp:63:12:63:12 | i | i == 2 when i is 2 |
+| test.cpp:66:12:66:12 | i | i != 0 when i is not 0 |
+| test.cpp:66:12:66:12 | i | i != 1 when i is not 1 |
+| test.cpp:66:12:66:12 | i | i != 2 when i is not 2 |
+| test.cpp:66:12:66:12 | i | i == 0 when i is 0 |
+| test.cpp:66:12:66:12 | i | i == 1 when i is 1 |
+| test.cpp:66:12:66:12 | i | i == 2 when i is 2 |
+| test.cpp:69:12:69:12 | i | i != 0 when i is not 0 |
+| test.cpp:69:12:69:12 | i | i != 1 when i is not 1 |
+| test.cpp:69:12:69:12 | i | i != 2 when i is not 2 |
+| test.cpp:69:12:69:12 | i | i == 0 when i is 0 |
+| test.cpp:69:12:69:12 | i | i == 1 when i is 1 |
+| test.cpp:69:12:69:12 | i | i == 2 when i is 2 |
+| test.cpp:73:30:73:30 | i | i < 11 when i is Upper bound 10 |
+| test.cpp:73:30:73:30 | i | i < 21 when i is Upper bound 20 |
+| test.cpp:73:30:73:30 | i | i >= 0 when i is Lower bound 0 |
+| test.cpp:73:30:73:30 | i | i >= 11 when i is Lower bound 11 |
+| test.cpp:74:10:74:10 | i | i < 11 when i is Upper bound 10 |
+| test.cpp:74:10:74:10 | i | i < 21 when i is Upper bound 20 |
+| test.cpp:74:10:74:10 | i | i >= 0 when i is Lower bound 0 |
+| test.cpp:74:10:74:10 | i | i >= 11 when i is Lower bound 11 |
+| test.cpp:76:12:76:12 | i | i < 11 when i is Upper bound 10 |
+| test.cpp:76:12:76:12 | i | i < 21 when i is Upper bound 20 |
+| test.cpp:76:12:76:12 | i | i >= 0 when i is Lower bound 0 |
+| test.cpp:76:12:76:12 | i | i >= 11 when i is Lower bound 11 |
+| test.cpp:79:12:79:12 | i | i < 11 when i is Upper bound 10 |
+| test.cpp:79:12:79:12 | i | i < 21 when i is Upper bound 20 |
+| test.cpp:79:12:79:12 | i | i >= 0 when i is Lower bound 0 |
+| test.cpp:79:12:79:12 | i | i >= 11 when i is Lower bound 11 |
 | test.cpp:93:6:93:6 | c | c != 0 when c is true |
 | test.cpp:93:6:93:6 | c | c != 1 when c is false |
 | test.cpp:93:6:93:6 | c | c == 0 when c is false |
@@ -463,6 +530,10 @@
 | test.cpp:111:6:111:14 | ... != ... | ... != ... == 1 when ... != ... is true |
 | test.cpp:111:6:111:14 | ... != ... | i != 0.0+0 when ... != ... is true |
 | test.cpp:111:6:111:14 | ... != ... | i == 0.0+0 when ... != ... is false |
+| test.cpp:119:16:119:16 | b | b != 0 when b is true |
+| test.cpp:119:16:119:16 | b | b != 1 when b is false |
+| test.cpp:119:16:119:16 | b | b == 0 when b is false |
+| test.cpp:119:16:119:16 | b | b == 1 when b is true |
 | test.cpp:122:9:122:9 | b | b != 0 when b is true |
 | test.cpp:122:9:122:9 | b | b != 1 when b is false |
 | test.cpp:122:9:122:9 | b | b == 0 when b is false |
@@ -495,6 +566,14 @@
 | test.cpp:131:6:131:21 | call to __builtin_expect | call to __builtin_expect != 1 when call to __builtin_expect is false |
 | test.cpp:131:6:131:21 | call to __builtin_expect | call to __builtin_expect == 0 when call to __builtin_expect is false |
 | test.cpp:131:6:131:21 | call to __builtin_expect | call to __builtin_expect == 1 when call to __builtin_expect is true |
+| test.cpp:131:23:131:33 | ... == ... | ... + ... != a+0 when ... == ... is false |
+| test.cpp:131:23:131:33 | ... == ... | ... + ... == a+0 when ... == ... is true |
+| test.cpp:131:23:131:33 | ... == ... | a != ... + ...+0 when ... == ... is false |
+| test.cpp:131:23:131:33 | ... == ... | a != b+42 when ... == ... is false |
+| test.cpp:131:23:131:33 | ... == ... | a == ... + ...+0 when ... == ... is true |
+| test.cpp:131:23:131:33 | ... == ... | a == b+42 when ... == ... is true |
+| test.cpp:131:23:131:33 | ... == ... | b != a+-42 when ... == ... is false |
+| test.cpp:131:23:131:33 | ... == ... | b == a+-42 when ... == ... is true |
 | test.cpp:135:6:135:21 | call to __builtin_expect | ... + ... != a+0 when call to __builtin_expect is true |
 | test.cpp:135:6:135:21 | call to __builtin_expect | ... + ... == a+0 when call to __builtin_expect is false |
 | test.cpp:135:6:135:21 | call to __builtin_expect | a != ... + ...+0 when call to __builtin_expect is true |
@@ -507,6 +586,14 @@
 | test.cpp:135:6:135:21 | call to __builtin_expect | call to __builtin_expect != 1 when call to __builtin_expect is false |
 | test.cpp:135:6:135:21 | call to __builtin_expect | call to __builtin_expect == 0 when call to __builtin_expect is false |
 | test.cpp:135:6:135:21 | call to __builtin_expect | call to __builtin_expect == 1 when call to __builtin_expect is true |
+| test.cpp:135:23:135:33 | ... != ... | ... + ... != a+0 when ... != ... is true |
+| test.cpp:135:23:135:33 | ... != ... | ... + ... == a+0 when ... != ... is false |
+| test.cpp:135:23:135:33 | ... != ... | a != ... + ...+0 when ... != ... is true |
+| test.cpp:135:23:135:33 | ... != ... | a != b+42 when ... != ... is true |
+| test.cpp:135:23:135:33 | ... != ... | a == ... + ...+0 when ... != ... is false |
+| test.cpp:135:23:135:33 | ... != ... | a == b+42 when ... != ... is false |
+| test.cpp:135:23:135:33 | ... != ... | b != a+-42 when ... != ... is true |
+| test.cpp:135:23:135:33 | ... != ... | b == a+-42 when ... != ... is false |
 | test.cpp:141:6:141:21 | call to __builtin_expect | 42 != a+0 when call to __builtin_expect is false |
 | test.cpp:141:6:141:21 | call to __builtin_expect | 42 == a+0 when call to __builtin_expect is true |
 | test.cpp:141:6:141:21 | call to __builtin_expect | a != 42 when call to __builtin_expect is false |
@@ -517,6 +604,12 @@
 | test.cpp:141:6:141:21 | call to __builtin_expect | call to __builtin_expect != 1 when call to __builtin_expect is false |
 | test.cpp:141:6:141:21 | call to __builtin_expect | call to __builtin_expect == 0 when call to __builtin_expect is false |
 | test.cpp:141:6:141:21 | call to __builtin_expect | call to __builtin_expect == 1 when call to __builtin_expect is true |
+| test.cpp:141:23:141:29 | ... == ... | 42 != a+0 when ... == ... is false |
+| test.cpp:141:23:141:29 | ... == ... | 42 == a+0 when ... == ... is true |
+| test.cpp:141:23:141:29 | ... == ... | a != 42 when ... == ... is false |
+| test.cpp:141:23:141:29 | ... == ... | a != 42+0 when ... == ... is false |
+| test.cpp:141:23:141:29 | ... == ... | a == 42 when ... == ... is true |
+| test.cpp:141:23:141:29 | ... == ... | a == 42+0 when ... == ... is true |
 | test.cpp:145:6:145:21 | call to __builtin_expect | 42 != a+0 when call to __builtin_expect is true |
 | test.cpp:145:6:145:21 | call to __builtin_expect | 42 == a+0 when call to __builtin_expect is false |
 | test.cpp:145:6:145:21 | call to __builtin_expect | a != 42 when call to __builtin_expect is true |
@@ -527,6 +620,26 @@
 | test.cpp:145:6:145:21 | call to __builtin_expect | call to __builtin_expect != 1 when call to __builtin_expect is false |
 | test.cpp:145:6:145:21 | call to __builtin_expect | call to __builtin_expect == 0 when call to __builtin_expect is false |
 | test.cpp:145:6:145:21 | call to __builtin_expect | call to __builtin_expect == 1 when call to __builtin_expect is true |
+| test.cpp:145:23:145:29 | ... != ... | 42 != a+0 when ... != ... is true |
+| test.cpp:145:23:145:29 | ... != ... | 42 == a+0 when ... != ... is false |
+| test.cpp:145:23:145:29 | ... != ... | a != 42 when ... != ... is true |
+| test.cpp:145:23:145:29 | ... != ... | a != 42+0 when ... != ... is true |
+| test.cpp:145:23:145:29 | ... != ... | a == 42 when ... != ... is false |
+| test.cpp:145:23:145:29 | ... != ... | a == 42+0 when ... != ... is false |
+| test.cpp:151:8:151:13 | ... < ... | 10 < a+1 when ... < ... is false |
+| test.cpp:151:8:151:13 | ... < ... | 10 >= a+1 when ... < ... is true |
+| test.cpp:151:8:151:13 | ... < ... | ... < ... != 0 when ... < ... is true |
+| test.cpp:151:8:151:13 | ... < ... | ... < ... != 1 when ... < ... is false |
+| test.cpp:151:8:151:13 | ... < ... | ... < ... == 0 when ... < ... is false |
+| test.cpp:151:8:151:13 | ... < ... | ... < ... == 1 when ... < ... is true |
+| test.cpp:151:8:151:13 | ... < ... | a < 10 when ... < ... is true |
+| test.cpp:151:8:151:13 | ... < ... | a < 10+0 when ... < ... is true |
+| test.cpp:151:8:151:13 | ... < ... | a >= 10 when ... < ... is false |
+| test.cpp:151:8:151:13 | ... < ... | a >= 10+0 when ... < ... is false |
+| test.cpp:151:8:151:13 | ... < ... | b != 0 when ... < ... is true |
+| test.cpp:151:8:151:13 | ... < ... | b != 1 when ... < ... is false |
+| test.cpp:151:8:151:13 | ... < ... | b == 0 when ... < ... is false |
+| test.cpp:151:8:151:13 | ... < ... | b == 1 when ... < ... is true |
 | test.cpp:152:7:152:8 | ! ... | 10 < a+1 when ! ... is true |
 | test.cpp:152:7:152:8 | ! ... | 10 >= a+1 when ! ... is false |
 | test.cpp:152:7:152:8 | ! ... | ! ... != 0 when ! ... is true |
@@ -563,6 +676,18 @@
 | test.cpp:152:8:152:8 | b | b != 1 when b is false |
 | test.cpp:152:8:152:8 | b | b == 0 when b is false |
 | test.cpp:152:8:152:8 | b | b == 1 when b is true |
+| test.cpp:158:12:158:17 | ... != ... | ... != ... != 0 when ... != ... is true |
+| test.cpp:158:12:158:17 | ... != ... | ... != ... != 1 when ... != ... is false |
+| test.cpp:158:12:158:17 | ... != ... | ... != ... == 0 when ... != ... is false |
+| test.cpp:158:12:158:17 | ... != ... | ... != ... == 1 when ... != ... is true |
+| test.cpp:158:12:158:17 | ... != ... | a != b+0 when ... != ... is true |
+| test.cpp:158:12:158:17 | ... != ... | a == b+0 when ... != ... is false |
+| test.cpp:158:12:158:17 | ... != ... | b != a+0 when ... != ... is true |
+| test.cpp:158:12:158:17 | ... != ... | b == a+0 when ... != ... is false |
+| test.cpp:158:12:158:17 | ... != ... | c != 0 when ... != ... is true |
+| test.cpp:158:12:158:17 | ... != ... | c != 1 when ... != ... is false |
+| test.cpp:158:12:158:17 | ... != ... | c == 0 when ... != ... is false |
+| test.cpp:158:12:158:17 | ... != ... | c == 1 when ... != ... is true |
 | test.cpp:160:7:160:8 | ! ... | ! ... != 0 when ! ... is true |
 | test.cpp:160:7:160:8 | ! ... | ! ... != 1 when ! ... is false |
 | test.cpp:160:7:160:8 | ! ... | ! ... == 0 when ! ... is false |
@@ -595,6 +720,20 @@
 | test.cpp:160:8:160:8 | c | c != 1 when c is false |
 | test.cpp:160:8:160:8 | c | c == 0 when c is false |
 | test.cpp:160:8:160:8 | c | c == 1 when c is true |
+| test.cpp:166:12:166:17 | ... > ... | 10 < a+0 when ... > ... is true |
+| test.cpp:166:12:166:17 | ... > ... | 10 >= a+0 when ... > ... is false |
+| test.cpp:166:12:166:17 | ... > ... | ... > ... != 0 when ... > ... is true |
+| test.cpp:166:12:166:17 | ... > ... | ... > ... != 1 when ... > ... is false |
+| test.cpp:166:12:166:17 | ... > ... | ... > ... == 0 when ... > ... is false |
+| test.cpp:166:12:166:17 | ... > ... | ... > ... == 1 when ... > ... is true |
+| test.cpp:166:12:166:17 | ... > ... | a < 10+1 when ... > ... is false |
+| test.cpp:166:12:166:17 | ... > ... | a < 11 when ... > ... is false |
+| test.cpp:166:12:166:17 | ... > ... | a >= 10+1 when ... > ... is true |
+| test.cpp:166:12:166:17 | ... > ... | a >= 11 when ... > ... is true |
+| test.cpp:166:12:166:17 | ... > ... | b != 0 when ... > ... is true |
+| test.cpp:166:12:166:17 | ... > ... | b != 1 when ... > ... is false |
+| test.cpp:166:12:166:17 | ... > ... | b == 0 when ... > ... is false |
+| test.cpp:166:12:166:17 | ... > ... | b == 1 when ... > ... is true |
 | test.cpp:168:7:168:8 | ! ... | 10 < a+0 when ! ... is false |
 | test.cpp:168:7:168:8 | ! ... | 10 >= a+0 when ! ... is true |
 | test.cpp:168:7:168:8 | ! ... | ! ... != 0 when ! ... is true |
@@ -631,6 +770,18 @@
 | test.cpp:168:8:168:8 | b | b != 1 when b is false |
 | test.cpp:168:8:168:8 | b | b == 0 when b is false |
 | test.cpp:168:8:168:8 | b | b == 1 when b is true |
+| test.cpp:174:12:174:16 | ... > ... | ... > ... != 0 when ... > ... is true |
+| test.cpp:174:12:174:16 | ... > ... | ... > ... != 1 when ... > ... is false |
+| test.cpp:174:12:174:16 | ... > ... | ... > ... == 0 when ... > ... is false |
+| test.cpp:174:12:174:16 | ... > ... | ... > ... == 1 when ... > ... is true |
+| test.cpp:174:12:174:16 | ... > ... | a < b+1 when ... > ... is false |
+| test.cpp:174:12:174:16 | ... > ... | a >= b+1 when ... > ... is true |
+| test.cpp:174:12:174:16 | ... > ... | b < a+0 when ... > ... is true |
+| test.cpp:174:12:174:16 | ... > ... | b >= a+0 when ... > ... is false |
+| test.cpp:174:12:174:16 | ... > ... | c != 0 when ... > ... is true |
+| test.cpp:174:12:174:16 | ... > ... | c != 1 when ... > ... is false |
+| test.cpp:174:12:174:16 | ... > ... | c == 0 when ... > ... is false |
+| test.cpp:174:12:174:16 | ... > ... | c == 1 when ... > ... is true |
 | test.cpp:176:7:176:8 | ! ... | ! ... != 0 when ! ... is true |
 | test.cpp:176:7:176:8 | ! ... | ! ... != 1 when ! ... is false |
 | test.cpp:176:7:176:8 | ! ... | ! ... == 0 when ! ... is false |
@@ -663,6 +814,14 @@
 | test.cpp:176:8:176:8 | c | c != 1 when c is false |
 | test.cpp:176:8:176:8 | c | c == 0 when c is false |
 | test.cpp:176:8:176:8 | c | c == 1 when c is true |
+| test.cpp:181:28:181:29 | b1 | b1 != 0 when b1 is true |
+| test.cpp:181:28:181:29 | b1 | b1 != 1 when b1 is false |
+| test.cpp:181:28:181:29 | b1 | b1 == 0 when b1 is false |
+| test.cpp:181:28:181:29 | b1 | b1 == 1 when b1 is true |
+| test.cpp:181:37:181:38 | b2 | b2 != 0 when b2 is true |
+| test.cpp:181:37:181:38 | b2 | b2 != 1 when b2 is false |
+| test.cpp:181:37:181:38 | b2 | b2 == 0 when b2 is false |
+| test.cpp:181:37:181:38 | b2 | b2 == 1 when b2 is true |
 | test.cpp:182:6:182:16 | ! ... | ! ... != 0 when ! ... is true |
 | test.cpp:182:6:182:16 | ! ... | ! ... != 1 when ! ... is false |
 | test.cpp:182:6:182:16 | ! ... | ! ... == 0 when ! ... is false |
@@ -695,6 +854,30 @@
 | test.cpp:182:14:182:15 | b2 | b2 != 1 when b2 is false |
 | test.cpp:182:14:182:15 | b2 | b2 == 0 when b2 is false |
 | test.cpp:182:14:182:15 | b2 | b2 == 1 when b2 is true |
+| test.cpp:183:9:183:10 | b1 | b1 != 0 when b1 is true |
+| test.cpp:183:9:183:10 | b1 | b1 != 1 when b1 is false |
+| test.cpp:183:9:183:10 | b1 | b1 == 0 when b1 is false |
+| test.cpp:183:9:183:10 | b1 | b1 == 1 when b1 is true |
+| test.cpp:184:9:184:10 | b2 | b2 != 0 when b2 is true |
+| test.cpp:184:9:184:10 | b2 | b2 != 1 when b2 is false |
+| test.cpp:184:9:184:10 | b2 | b2 == 0 when b2 is false |
+| test.cpp:184:9:184:10 | b2 | b2 == 1 when b2 is true |
+| test.cpp:187:9:187:10 | b1 | b1 != 0 when b1 is true |
+| test.cpp:187:9:187:10 | b1 | b1 != 1 when b1 is false |
+| test.cpp:187:9:187:10 | b1 | b1 == 0 when b1 is false |
+| test.cpp:187:9:187:10 | b1 | b1 == 1 when b1 is true |
+| test.cpp:188:9:188:10 | b2 | b2 != 0 when b2 is true |
+| test.cpp:188:9:188:10 | b2 | b2 != 1 when b2 is false |
+| test.cpp:188:9:188:10 | b2 | b2 == 0 when b2 is false |
+| test.cpp:188:9:188:10 | b2 | b2 == 1 when b2 is true |
+| test.cpp:192:27:192:28 | b1 | b1 != 0 when b1 is true |
+| test.cpp:192:27:192:28 | b1 | b1 != 1 when b1 is false |
+| test.cpp:192:27:192:28 | b1 | b1 == 0 when b1 is false |
+| test.cpp:192:27:192:28 | b1 | b1 == 1 when b1 is true |
+| test.cpp:192:36:192:37 | b2 | b2 != 0 when b2 is true |
+| test.cpp:192:36:192:37 | b2 | b2 != 1 when b2 is false |
+| test.cpp:192:36:192:37 | b2 | b2 == 0 when b2 is false |
+| test.cpp:192:36:192:37 | b2 | b2 == 1 when b2 is true |
 | test.cpp:193:6:193:16 | ! ... | ! ... != 0 when ! ... is true |
 | test.cpp:193:6:193:16 | ! ... | ! ... != 1 when ! ... is false |
 | test.cpp:193:6:193:16 | ! ... | ! ... == 0 when ! ... is false |
@@ -727,6 +910,22 @@
 | test.cpp:193:14:193:15 | b2 | b2 != 1 when b2 is false |
 | test.cpp:193:14:193:15 | b2 | b2 == 0 when b2 is false |
 | test.cpp:193:14:193:15 | b2 | b2 == 1 when b2 is true |
+| test.cpp:195:9:195:10 | b1 | b1 != 0 when b1 is true |
+| test.cpp:195:9:195:10 | b1 | b1 != 1 when b1 is false |
+| test.cpp:195:9:195:10 | b1 | b1 == 0 when b1 is false |
+| test.cpp:195:9:195:10 | b1 | b1 == 1 when b1 is true |
+| test.cpp:196:9:196:10 | b2 | b2 != 0 when b2 is true |
+| test.cpp:196:9:196:10 | b2 | b2 != 1 when b2 is false |
+| test.cpp:196:9:196:10 | b2 | b2 == 0 when b2 is false |
+| test.cpp:196:9:196:10 | b2 | b2 == 1 when b2 is true |
+| test.cpp:198:9:198:10 | b1 | b1 != 0 when b1 is true |
+| test.cpp:198:9:198:10 | b1 | b1 != 1 when b1 is false |
+| test.cpp:198:9:198:10 | b1 | b1 == 0 when b1 is false |
+| test.cpp:198:9:198:10 | b1 | b1 == 1 when b1 is true |
+| test.cpp:199:9:199:10 | b2 | b2 != 0 when b2 is true |
+| test.cpp:199:9:199:10 | b2 | b2 != 1 when b2 is false |
+| test.cpp:199:9:199:10 | b2 | b2 == 0 when b2 is false |
+| test.cpp:199:9:199:10 | b2 | b2 == 1 when b2 is true |
 | test.cpp:211:9:211:15 | ... == ... | 0 != sc+0 when ... == ... is false |
 | test.cpp:211:9:211:15 | ... == ... | 0 == sc+0 when ... == ... is true |
 | test.cpp:211:9:211:15 | ... == ... | ... == ... != 0 when ... == ... is true |
@@ -875,6 +1074,10 @@
 | test.cpp:247:6:247:18 | ... == ... | a == b+0 when ... == ... is false |
 | test.cpp:247:6:247:18 | ... == ... | b != a+0 when ... == ... is true |
 | test.cpp:247:6:247:18 | ... == ... | b == a+0 when ... == ... is false |
+| test.cpp:247:7:247:12 | ... == ... | a != b+0 when ... == ... is false |
+| test.cpp:247:7:247:12 | ... == ... | a == b+0 when ... == ... is true |
+| test.cpp:247:7:247:12 | ... == ... | b != a+0 when ... == ... is false |
+| test.cpp:247:7:247:12 | ... == ... | b == a+0 when ... == ... is true |
 | test.cpp:253:6:253:18 | ... != ... | 0 != ... == ...+0 when ... != ... is true |
 | test.cpp:253:6:253:18 | ... != ... | 0 == ... == ...+0 when ... != ... is false |
 | test.cpp:253:6:253:18 | ... != ... | ... != ... != 0 when ... != ... is true |
@@ -889,6 +1092,10 @@
 | test.cpp:253:6:253:18 | ... != ... | a == b+0 when ... != ... is true |
 | test.cpp:253:6:253:18 | ... != ... | b != a+0 when ... != ... is false |
 | test.cpp:253:6:253:18 | ... != ... | b == a+0 when ... != ... is true |
+| test.cpp:253:7:253:12 | ... == ... | a != b+0 when ... == ... is false |
+| test.cpp:253:7:253:12 | ... == ... | a == b+0 when ... == ... is true |
+| test.cpp:253:7:253:12 | ... == ... | b != a+0 when ... == ... is false |
+| test.cpp:253:7:253:12 | ... == ... | b == a+0 when ... == ... is true |
 | test.cpp:260:6:260:18 | ... == ... | 0 != ... != ...+0 when ... == ... is false |
 | test.cpp:260:6:260:18 | ... == ... | 0 == ... != ...+0 when ... == ... is true |
 | test.cpp:260:6:260:18 | ... == ... | ... != ... != 0 when ... == ... is false |
@@ -903,6 +1110,10 @@
 | test.cpp:260:6:260:18 | ... == ... | a == b+0 when ... == ... is true |
 | test.cpp:260:6:260:18 | ... == ... | b != a+0 when ... == ... is false |
 | test.cpp:260:6:260:18 | ... == ... | b == a+0 when ... == ... is true |
+| test.cpp:260:7:260:12 | ... != ... | a != b+0 when ... != ... is true |
+| test.cpp:260:7:260:12 | ... != ... | a == b+0 when ... != ... is false |
+| test.cpp:260:7:260:12 | ... != ... | b != a+0 when ... != ... is true |
+| test.cpp:260:7:260:12 | ... != ... | b == a+0 when ... != ... is false |
 | test.cpp:266:6:266:18 | ... != ... | 0 != ... != ...+0 when ... != ... is true |
 | test.cpp:266:6:266:18 | ... != ... | 0 == ... != ...+0 when ... != ... is false |
 | test.cpp:266:6:266:18 | ... != ... | ... != ... != 0 when ... != ... is true |
@@ -915,6 +1126,10 @@
 | test.cpp:266:6:266:18 | ... != ... | a == b+0 when ... != ... is false |
 | test.cpp:266:6:266:18 | ... != ... | b != a+0 when ... != ... is true |
 | test.cpp:266:6:266:18 | ... != ... | b == a+0 when ... != ... is false |
+| test.cpp:266:7:266:12 | ... != ... | a != b+0 when ... != ... is true |
+| test.cpp:266:7:266:12 | ... != ... | a == b+0 when ... != ... is false |
+| test.cpp:266:7:266:12 | ... != ... | b != a+0 when ... != ... is true |
+| test.cpp:266:7:266:12 | ... != ... | b == a+0 when ... != ... is false |
 | test.cpp:273:6:273:17 | ... == ... | 0 != ... < ...+0 when ... == ... is false |
 | test.cpp:273:6:273:17 | ... == ... | 0 == ... < ...+0 when ... == ... is true |
 | test.cpp:273:6:273:17 | ... == ... | ... < ... != 0 when ... == ... is false |
@@ -929,6 +1144,10 @@
 | test.cpp:273:6:273:17 | ... == ... | a >= b+0 when ... == ... is true |
 | test.cpp:273:6:273:17 | ... == ... | b < a+1 when ... == ... is true |
 | test.cpp:273:6:273:17 | ... == ... | b >= a+1 when ... == ... is false |
+| test.cpp:273:7:273:11 | ... < ... | a < b+0 when ... < ... is true |
+| test.cpp:273:7:273:11 | ... < ... | a >= b+0 when ... < ... is false |
+| test.cpp:273:7:273:11 | ... < ... | b < a+1 when ... < ... is false |
+| test.cpp:273:7:273:11 | ... < ... | b >= a+1 when ... < ... is true |
 | test.cpp:279:6:279:17 | ... != ... | 0 != ... < ...+0 when ... != ... is true |
 | test.cpp:279:6:279:17 | ... != ... | 0 == ... < ...+0 when ... != ... is false |
 | test.cpp:279:6:279:17 | ... != ... | ... != ... != 0 when ... != ... is true |
@@ -943,6 +1162,10 @@
 | test.cpp:279:6:279:17 | ... != ... | a >= b+0 when ... != ... is false |
 | test.cpp:279:6:279:17 | ... != ... | b < a+1 when ... != ... is false |
 | test.cpp:279:6:279:17 | ... != ... | b >= a+1 when ... != ... is true |
+| test.cpp:279:7:279:11 | ... < ... | a < b+0 when ... < ... is true |
+| test.cpp:279:7:279:11 | ... < ... | a >= b+0 when ... < ... is false |
+| test.cpp:279:7:279:11 | ... < ... | b < a+1 when ... < ... is false |
+| test.cpp:279:7:279:11 | ... < ... | b >= a+1 when ... < ... is true |
 | test.cpp:287:6:287:19 | ... == ... | 0 != ... == ...+0 when ... == ... is false |
 | test.cpp:287:6:287:19 | ... == ... | 0 == ... == ...+0 when ... == ... is true |
 | test.cpp:287:6:287:19 | ... == ... | 42 != a+0 when ... == ... is true |
@@ -959,6 +1182,12 @@
 | test.cpp:287:6:287:19 | ... == ... | a != 42+0 when ... == ... is true |
 | test.cpp:287:6:287:19 | ... == ... | a == 42 when ... == ... is false |
 | test.cpp:287:6:287:19 | ... == ... | a == 42+0 when ... == ... is false |
+| test.cpp:287:7:287:13 | ... == ... | 42 != a+0 when ... == ... is false |
+| test.cpp:287:7:287:13 | ... == ... | 42 == a+0 when ... == ... is true |
+| test.cpp:287:7:287:13 | ... == ... | a != 42 when ... == ... is false |
+| test.cpp:287:7:287:13 | ... == ... | a != 42+0 when ... == ... is false |
+| test.cpp:287:7:287:13 | ... == ... | a == 42 when ... == ... is true |
+| test.cpp:287:7:287:13 | ... == ... | a == 42+0 when ... == ... is true |
 | test.cpp:293:6:293:19 | ... != ... | 0 != ... == ...+0 when ... != ... is true |
 | test.cpp:293:6:293:19 | ... != ... | 0 == ... == ...+0 when ... != ... is false |
 | test.cpp:293:6:293:19 | ... != ... | 42 != a+0 when ... != ... is false |
@@ -975,6 +1204,12 @@
 | test.cpp:293:6:293:19 | ... != ... | a != 42+0 when ... != ... is false |
 | test.cpp:293:6:293:19 | ... != ... | a == 42 when ... != ... is true |
 | test.cpp:293:6:293:19 | ... != ... | a == 42+0 when ... != ... is true |
+| test.cpp:293:7:293:13 | ... == ... | 42 != a+0 when ... == ... is false |
+| test.cpp:293:7:293:13 | ... == ... | 42 == a+0 when ... == ... is true |
+| test.cpp:293:7:293:13 | ... == ... | a != 42 when ... == ... is false |
+| test.cpp:293:7:293:13 | ... == ... | a != 42+0 when ... == ... is false |
+| test.cpp:293:7:293:13 | ... == ... | a == 42 when ... == ... is true |
+| test.cpp:293:7:293:13 | ... == ... | a == 42+0 when ... == ... is true |
 | test.cpp:300:6:300:19 | ... == ... | 0 != ... != ...+0 when ... == ... is false |
 | test.cpp:300:6:300:19 | ... == ... | 0 == ... != ...+0 when ... == ... is true |
 | test.cpp:300:6:300:19 | ... == ... | 42 != a+0 when ... == ... is false |
@@ -991,6 +1226,12 @@
 | test.cpp:300:6:300:19 | ... == ... | a != 42+0 when ... == ... is false |
 | test.cpp:300:6:300:19 | ... == ... | a == 42 when ... == ... is true |
 | test.cpp:300:6:300:19 | ... == ... | a == 42+0 when ... == ... is true |
+| test.cpp:300:7:300:13 | ... != ... | 42 != a+0 when ... != ... is true |
+| test.cpp:300:7:300:13 | ... != ... | 42 == a+0 when ... != ... is false |
+| test.cpp:300:7:300:13 | ... != ... | a != 42 when ... != ... is true |
+| test.cpp:300:7:300:13 | ... != ... | a != 42+0 when ... != ... is true |
+| test.cpp:300:7:300:13 | ... != ... | a == 42 when ... != ... is false |
+| test.cpp:300:7:300:13 | ... != ... | a == 42+0 when ... != ... is false |
 | test.cpp:306:6:306:19 | ... != ... | 0 != ... != ...+0 when ... != ... is true |
 | test.cpp:306:6:306:19 | ... != ... | 0 == ... != ...+0 when ... != ... is false |
 | test.cpp:306:6:306:19 | ... != ... | 42 != a+0 when ... != ... is true |
@@ -1005,6 +1246,12 @@
 | test.cpp:306:6:306:19 | ... != ... | a != 42+0 when ... != ... is true |
 | test.cpp:306:6:306:19 | ... != ... | a == 42 when ... != ... is false |
 | test.cpp:306:6:306:19 | ... != ... | a == 42+0 when ... != ... is false |
+| test.cpp:306:7:306:13 | ... != ... | 42 != a+0 when ... != ... is true |
+| test.cpp:306:7:306:13 | ... != ... | 42 == a+0 when ... != ... is false |
+| test.cpp:306:7:306:13 | ... != ... | a != 42 when ... != ... is true |
+| test.cpp:306:7:306:13 | ... != ... | a != 42+0 when ... != ... is true |
+| test.cpp:306:7:306:13 | ... != ... | a == 42 when ... != ... is false |
+| test.cpp:306:7:306:13 | ... != ... | a == 42+0 when ... != ... is false |
 | test.cpp:312:6:312:18 | ... == ... | 0 != ... < ...+0 when ... == ... is false |
 | test.cpp:312:6:312:18 | ... == ... | 0 == ... < ...+0 when ... == ... is true |
 | test.cpp:312:6:312:18 | ... == ... | 42 < a+1 when ... == ... is true |
@@ -1021,6 +1268,12 @@
 | test.cpp:312:6:312:18 | ... == ... | a < 42+0 when ... == ... is false |
 | test.cpp:312:6:312:18 | ... == ... | a >= 42 when ... == ... is true |
 | test.cpp:312:6:312:18 | ... == ... | a >= 42+0 when ... == ... is true |
+| test.cpp:312:7:312:12 | ... < ... | 42 < a+1 when ... < ... is false |
+| test.cpp:312:7:312:12 | ... < ... | 42 >= a+1 when ... < ... is true |
+| test.cpp:312:7:312:12 | ... < ... | a < 42 when ... < ... is true |
+| test.cpp:312:7:312:12 | ... < ... | a < 42+0 when ... < ... is true |
+| test.cpp:312:7:312:12 | ... < ... | a >= 42 when ... < ... is false |
+| test.cpp:312:7:312:12 | ... < ... | a >= 42+0 when ... < ... is false |
 | test.cpp:318:6:318:18 | ... != ... | 0 != ... < ...+0 when ... != ... is true |
 | test.cpp:318:6:318:18 | ... != ... | 0 == ... < ...+0 when ... != ... is false |
 | test.cpp:318:6:318:18 | ... != ... | 42 < a+1 when ... != ... is false |
@@ -1037,3 +1290,155 @@
 | test.cpp:318:6:318:18 | ... != ... | a < 42+0 when ... != ... is true |
 | test.cpp:318:6:318:18 | ... != ... | a >= 42 when ... != ... is false |
 | test.cpp:318:6:318:18 | ... != ... | a >= 42+0 when ... != ... is false |
+| test.cpp:318:7:318:12 | ... < ... | 42 < a+1 when ... < ... is false |
+| test.cpp:318:7:318:12 | ... < ... | 42 >= a+1 when ... < ... is true |
+| test.cpp:318:7:318:12 | ... < ... | a < 42 when ... < ... is true |
+| test.cpp:318:7:318:12 | ... < ... | a < 42+0 when ... < ... is true |
+| test.cpp:318:7:318:12 | ... < ... | a >= 42 when ... < ... is false |
+| test.cpp:318:7:318:12 | ... < ... | a >= 42+0 when ... < ... is false |
+| test.cpp:327:46:327:46 | b | b != 0 when b is true |
+| test.cpp:327:46:327:46 | b | b != 1 when b is false |
+| test.cpp:327:46:327:46 | b | b == 0 when b is false |
+| test.cpp:327:46:327:46 | b | b == 1 when b is true |
+| test.cpp:330:7:330:7 | b | b != 0 when b is true |
+| test.cpp:330:7:330:7 | b | b != 1 when b is false |
+| test.cpp:330:7:330:7 | b | b == 0 when b is false |
+| test.cpp:330:7:330:7 | b | b == 1 when b is true |
+| test.cpp:334:11:334:11 | x | x < 51 when x is Upper bound 50 |
+| test.cpp:334:11:334:11 | x | x >= 40 when x is Lower bound 40 |
+| test.cpp:338:9:338:9 | x | x < 51 when x is Upper bound 50 |
+| test.cpp:338:9:338:9 | x | x >= 40 when x is Lower bound 40 |
+| test.cpp:345:10:345:25 | ... != ... | 0 != input+0 when ... != ... is true |
+| test.cpp:345:10:345:25 | ... != ... | 0 == input+0 when ... != ... is false |
+| test.cpp:345:10:345:25 | ... != ... | input != 0 when ... != ... is true |
+| test.cpp:345:10:345:25 | ... != ... | input != 0+0 when ... != ... is true |
+| test.cpp:345:10:345:25 | ... != ... | input == 0 when ... != ... is false |
+| test.cpp:345:10:345:25 | ... != ... | input == 0+0 when ... != ... is false |
+| test.cpp:349:11:349:22 | call to testNotNull1 | call to testNotNull1 != 0 when call to testNotNull1 is true |
+| test.cpp:349:11:349:22 | call to testNotNull1 | call to testNotNull1 != 1 when call to testNotNull1 is false |
+| test.cpp:349:11:349:22 | call to testNotNull1 | call to testNotNull1 == 0 when call to testNotNull1 is false |
+| test.cpp:349:11:349:22 | call to testNotNull1 | call to testNotNull1 == 1 when call to testNotNull1 is true |
+| test.cpp:350:7:350:12 | ... != ... | 0 != x+0 when ... != ... is true |
+| test.cpp:350:7:350:12 | ... != ... | 0 == x+0 when ... != ... is false |
+| test.cpp:350:7:350:12 | ... != ... | ... != ... != 0 when ... != ... is true |
+| test.cpp:350:7:350:12 | ... != ... | ... != ... != 1 when ... != ... is false |
+| test.cpp:350:7:350:12 | ... != ... | ... != ... == 0 when ... != ... is false |
+| test.cpp:350:7:350:12 | ... != ... | ... != ... == 1 when ... != ... is true |
+| test.cpp:350:7:350:12 | ... != ... | x != 0 when ... != ... is true |
+| test.cpp:350:7:350:12 | ... != ... | x != 0+0 when ... != ... is true |
+| test.cpp:350:7:350:12 | ... != ... | x == 0 when ... != ... is false |
+| test.cpp:350:7:350:12 | ... != ... | x == 0+0 when ... != ... is false |
+| test.cpp:356:7:356:22 | ... == ... | 0 != input+0 when ... == ... is false |
+| test.cpp:356:7:356:22 | ... == ... | 0 == input+0 when ... == ... is true |
+| test.cpp:356:7:356:22 | ... == ... | ... == ... != 0 when ... == ... is true |
+| test.cpp:356:7:356:22 | ... == ... | ... == ... != 1 when ... == ... is false |
+| test.cpp:356:7:356:22 | ... == ... | ... == ... == 0 when ... == ... is false |
+| test.cpp:356:7:356:22 | ... == ... | ... == ... == 1 when ... == ... is true |
+| test.cpp:356:7:356:22 | ... == ... | input != 0 when ... == ... is false |
+| test.cpp:356:7:356:22 | ... == ... | input != 0+0 when ... == ... is false |
+| test.cpp:356:7:356:22 | ... == ... | input == 0 when ... == ... is true |
+| test.cpp:356:7:356:22 | ... == ... | input == 0+0 when ... == ... is true |
+| test.cpp:361:10:361:26 | ... == ... | 0 != number+0 when ... == ... is false |
+| test.cpp:361:10:361:26 | ... == ... | 0 == number+0 when ... == ... is true |
+| test.cpp:361:10:361:26 | ... == ... | ... == ... != 0 when ... == ... is true |
+| test.cpp:361:10:361:26 | ... == ... | ... == ... != 1 when ... == ... is false |
+| test.cpp:361:10:361:26 | ... == ... | ... == ... == 0 when ... == ... is false |
+| test.cpp:361:10:361:26 | ... == ... | ... == ... == 1 when ... == ... is true |
+| test.cpp:361:10:361:26 | ... == ... | number != 0 when ... == ... is false |
+| test.cpp:361:10:361:26 | ... == ... | number != 0+0 when ... == ... is false |
+| test.cpp:361:10:361:26 | ... == ... | number == 0 when ... == ... is true |
+| test.cpp:361:10:361:26 | ... == ... | number == 0+0 when ... == ... is true |
+| test.cpp:365:7:365:9 | ! ... | ! ... != 0 when ! ... is true |
+| test.cpp:365:7:365:9 | ! ... | ! ... != 1 when ! ... is false |
+| test.cpp:365:7:365:9 | ! ... | ! ... == 0 when ! ... is false |
+| test.cpp:365:7:365:9 | ! ... | ! ... == 1 when ! ... is true |
+| test.cpp:365:7:365:9 | ! ... | s1 != 0 when ! ... is false |
+| test.cpp:365:7:365:9 | ! ... | s1 != 1 when ! ... is true |
+| test.cpp:365:7:365:9 | ! ... | s1 == 0 when ! ... is true |
+| test.cpp:365:7:365:9 | ! ... | s1 == 1 when ! ... is false |
+| test.cpp:365:7:365:16 | ... \|\| ... | ! ... != 1 when ... \|\| ... is false |
+| test.cpp:365:7:365:16 | ... \|\| ... | ! ... == 0 when ... \|\| ... is false |
+| test.cpp:365:7:365:16 | ... \|\| ... | s1 != 0 when ... \|\| ... is false |
+| test.cpp:365:7:365:16 | ... \|\| ... | s1 == 1 when ... \|\| ... is false |
+| test.cpp:365:7:365:16 | ... \|\| ... | s2 != 0 when ... \|\| ... is false |
+| test.cpp:365:7:365:16 | ... \|\| ... | s2 == 1 when ... \|\| ... is false |
+| test.cpp:365:8:365:9 | s1 | ! ... != 0 when s1 is false |
+| test.cpp:365:8:365:9 | s1 | ! ... != 1 when s1 is true |
+| test.cpp:365:8:365:9 | s1 | ! ... == 0 when s1 is true |
+| test.cpp:365:8:365:9 | s1 | ! ... == 1 when s1 is false |
+| test.cpp:365:8:365:9 | s1 | s1 != 0 when s1 is true |
+| test.cpp:365:8:365:9 | s1 | s1 != 1 when s1 is false |
+| test.cpp:365:8:365:9 | s1 | s1 == 0 when s1 is false |
+| test.cpp:365:8:365:9 | s1 | s1 == 1 when s1 is true |
+| test.cpp:365:14:365:16 | ! ... | ! ... != 0 when ! ... is true |
+| test.cpp:365:14:365:16 | ! ... | ! ... != 1 when ! ... is false |
+| test.cpp:365:14:365:16 | ! ... | ! ... == 0 when ! ... is false |
+| test.cpp:365:14:365:16 | ! ... | ! ... == 1 when ! ... is true |
+| test.cpp:365:14:365:16 | ! ... | s2 != 0 when ! ... is false |
+| test.cpp:365:14:365:16 | ! ... | s2 != 1 when ! ... is true |
+| test.cpp:365:14:365:16 | ! ... | s2 == 0 when ! ... is true |
+| test.cpp:365:14:365:16 | ! ... | s2 == 1 when ! ... is false |
+| test.cpp:365:15:365:16 | s2 | ! ... != 0 when s2 is false |
+| test.cpp:365:15:365:16 | s2 | ! ... != 1 when s2 is true |
+| test.cpp:365:15:365:16 | s2 | ! ... == 0 when s2 is true |
+| test.cpp:365:15:365:16 | s2 | ! ... == 1 when s2 is false |
+| test.cpp:365:15:365:16 | s2 | s2 != 0 when s2 is true |
+| test.cpp:365:15:365:16 | s2 | s2 != 1 when s2 is false |
+| test.cpp:365:15:365:16 | s2 | s2 == 0 when s2 is false |
+| test.cpp:365:15:365:16 | s2 | s2 == 1 when s2 is true |
+| test.cpp:371:29:371:32 | flag | flag != 0 when flag is true |
+| test.cpp:371:29:371:32 | flag | flag != 1 when flag is false |
+| test.cpp:371:29:371:32 | flag | flag == 0 when flag is false |
+| test.cpp:371:29:371:32 | flag | flag == 1 when flag is true |
+| test.cpp:372:10:372:13 | flag | flag != 0 when flag is true |
+| test.cpp:372:10:372:13 | flag | flag != 1 when flag is false |
+| test.cpp:372:10:372:13 | flag | flag == 0 when flag is false |
+| test.cpp:372:10:372:13 | flag | flag == 1 when flag is true |
+| test.cpp:376:7:376:18 | call to testNotNull1 | call to testNotNull1 != 0 when call to testNotNull1 is true |
+| test.cpp:376:7:376:18 | call to testNotNull1 | call to testNotNull1 != 1 when call to testNotNull1 is false |
+| test.cpp:376:7:376:18 | call to testNotNull1 | call to testNotNull1 == 0 when call to testNotNull1 is false |
+| test.cpp:376:7:376:18 | call to testNotNull1 | call to testNotNull1 == 1 when call to testNotNull1 is true |
+| test.cpp:382:7:382:18 | call to testNotNull2 | call to testNotNull2 != 0 when call to testNotNull2 is true |
+| test.cpp:382:7:382:18 | call to testNotNull2 | call to testNotNull2 != 1 when call to testNotNull2 is false |
+| test.cpp:382:7:382:18 | call to testNotNull2 | call to testNotNull2 == 0 when call to testNotNull2 is false |
+| test.cpp:382:7:382:18 | call to testNotNull2 | call to testNotNull2 == 1 when call to testNotNull2 is true |
+| test.cpp:388:7:388:29 | ... == ... | 0 != call to getNumOrDefault+0 when ... == ... is false |
+| test.cpp:388:7:388:29 | ... == ... | 0 == call to getNumOrDefault+0 when ... == ... is true |
+| test.cpp:388:7:388:29 | ... == ... | ... == ... != 0 when ... == ... is true |
+| test.cpp:388:7:388:29 | ... == ... | ... == ... != 1 when ... == ... is false |
+| test.cpp:388:7:388:29 | ... == ... | ... == ... == 0 when ... == ... is false |
+| test.cpp:388:7:388:29 | ... == ... | ... == ... == 1 when ... == ... is true |
+| test.cpp:388:7:388:29 | ... == ... | call to getNumOrDefault != 0 when ... == ... is false |
+| test.cpp:388:7:388:29 | ... == ... | call to getNumOrDefault != 0+0 when ... == ... is false |
+| test.cpp:388:7:388:29 | ... == ... | call to getNumOrDefault == 0 when ... == ... is true |
+| test.cpp:388:7:388:29 | ... == ... | call to getNumOrDefault == 0+0 when ... == ... is true |
+| test.cpp:394:7:394:47 | ... == ... | 0 != call to returnAIfNoneAreNull+0 when ... == ... is false |
+| test.cpp:394:7:394:47 | ... == ... | 0 == call to returnAIfNoneAreNull+0 when ... == ... is true |
+| test.cpp:394:7:394:47 | ... == ... | ... == ... != 0 when ... == ... is true |
+| test.cpp:394:7:394:47 | ... == ... | ... == ... != 1 when ... == ... is false |
+| test.cpp:394:7:394:47 | ... == ... | ... == ... == 0 when ... == ... is false |
+| test.cpp:394:7:394:47 | ... == ... | ... == ... == 1 when ... == ... is true |
+| test.cpp:394:7:394:47 | ... == ... | call to returnAIfNoneAreNull != 0 when ... == ... is false |
+| test.cpp:394:7:394:47 | ... == ... | call to returnAIfNoneAreNull != 0+0 when ... == ... is false |
+| test.cpp:394:7:394:47 | ... == ... | call to returnAIfNoneAreNull == 0 when ... == ... is true |
+| test.cpp:394:7:394:47 | ... == ... | call to returnAIfNoneAreNull == 0+0 when ... == ... is true |
+| test.cpp:400:11:400:25 | call to testEnumWrapper | call to testEnumWrapper != 1 when call to testEnumWrapper is not 1 |
+| test.cpp:400:11:400:25 | call to testEnumWrapper | call to testEnumWrapper != 2 when call to testEnumWrapper is not 2 |
+| test.cpp:400:11:400:25 | call to testEnumWrapper | call to testEnumWrapper == 1 when call to testEnumWrapper is 1 |
+| test.cpp:400:11:400:25 | call to testEnumWrapper | call to testEnumWrapper == 2 when call to testEnumWrapper is 2 |
+| test.cpp:411:7:411:8 | ! ... | ! ... != 0 when ! ... is true |
+| test.cpp:411:7:411:8 | ! ... | ! ... != 1 when ! ... is false |
+| test.cpp:411:7:411:8 | ! ... | ! ... == 0 when ! ... is false |
+| test.cpp:411:7:411:8 | ! ... | ! ... == 1 when ! ... is true |
+| test.cpp:411:7:411:8 | ! ... | o != 0 when ! ... is false |
+| test.cpp:411:7:411:8 | ! ... | o != 1 when ! ... is true |
+| test.cpp:411:7:411:8 | ! ... | o == 0 when ! ... is true |
+| test.cpp:411:7:411:8 | ! ... | o == 1 when ! ... is false |
+| test.cpp:411:8:411:8 | o | ! ... != 0 when o is false |
+| test.cpp:411:8:411:8 | o | ! ... != 1 when o is true |
+| test.cpp:411:8:411:8 | o | ! ... == 0 when o is true |
+| test.cpp:411:8:411:8 | o | ! ... == 1 when o is false |
+| test.cpp:411:8:411:8 | o | o != 0 when o is true |
+| test.cpp:411:8:411:8 | o | o != 1 when o is false |
+| test.cpp:411:8:411:8 | o | o == 0 when o is false |
+| test.cpp:411:8:411:8 | o | o == 1 when o is true |
diff --git a/cpp/ql/test/library-tests/controlflow/guards/GuardsCompare.ql b/cpp/ql/test/library-tests/controlflow/guards/GuardsCompare.ql
index 59996548113..a925bf91407 100644
--- a/cpp/ql/test/library-tests/controlflow/guards/GuardsCompare.ql
+++ b/cpp/ql/test/library-tests/controlflow/guards/GuardsCompare.ql
@@ -27,7 +27,7 @@ where
     )
   )
   or
-  exists(AbstractValue value |
+  exists(GuardValue value |
     guard.comparesLt(left, k, true, value) and op = " < "
     or
     guard.comparesLt(left, k, false, value) and op = " >= "
diff --git a/cpp/ql/test/library-tests/controlflow/guards/GuardsControl.expected b/cpp/ql/test/library-tests/controlflow/guards/GuardsControl.expected
index 05afe345b8c..80a6530291d 100644
--- a/cpp/ql/test/library-tests/controlflow/guards/GuardsControl.expected
+++ b/cpp/ql/test/library-tests/controlflow/guards/GuardsControl.expected
@@ -43,16 +43,36 @@
 | test.c:44:12:44:16 | ... > ... | true | test.c:45:13:45:20 | if (...) ...  |
 | test.c:44:12:44:16 | ... > ... | true | test.c:45:23:47:22 | { ... } |
 | test.c:45:16:45:20 | ... > ... | true | test.c:45:23:47:22 | { ... } |
+| test.c:58:9:58:9 | x | not 0 | test.c:58:19:58:23 | y |
+| test.c:58:9:58:9 | x | not 0 | test.c:62:9:62:16 | return ... |
 | test.c:58:9:58:14 | ... == ... | false | test.c:58:19:58:23 | y |
 | test.c:58:9:58:14 | ... == ... | false | test.c:62:9:62:16 | return ... |
 | test.c:58:9:58:23 | ... \|\| ... | false | test.c:62:9:62:16 | return ... |
 | test.c:58:19:58:23 | ... < ... | false | test.c:62:9:62:16 | return ... |
+| test.c:70:15:70:15 | x | 0 | test.c:75:17:77:14 | { ... } |
+| test.c:70:15:70:15 | x | 0 | test.c:85:18:85:23 | y |
+| test.c:70:15:70:15 | x | 0 | test.c:86:9:86:14 | ExprStmt |
+| test.c:70:15:70:15 | x | not 0 | test.c:78:12:79:14 | { ... } |
+| test.c:75:9:75:9 | x | 0 | test.c:75:17:77:14 | { ... } |
+| test.c:75:9:75:9 | x | not 0 | test.c:78:12:79:14 | { ... } |
 | test.c:75:9:75:14 | ... == ... | false | test.c:78:12:79:14 | { ... } |
 | test.c:75:9:75:14 | ... == ... | true | test.c:75:17:77:14 | { ... } |
+| test.c:85:8:85:8 | x | 0 | test.c:85:18:85:23 | y |
+| test.c:85:8:85:8 | x | 0 | test.c:86:9:86:14 | ExprStmt |
 | test.c:85:8:85:13 | ... == ... | true | test.c:85:18:85:23 | y |
 | test.c:85:8:85:13 | ... == ... | true | test.c:86:9:86:14 | ExprStmt |
 | test.c:85:8:85:23 | ... && ... | true | test.c:86:9:86:14 | ExprStmt |
+| test.c:85:18:85:18 | y | not 0 | test.c:86:9:86:14 | ExprStmt |
 | test.c:85:18:85:23 | ... != ... | true | test.c:86:9:86:14 | ExprStmt |
+| test.c:94:11:94:11 | x | 0 | test.c:70:5:70:9 | test2 |
+| test.c:94:11:94:11 | x | 0 | test.c:99:5:102:13 | ExprStmt |
+| test.c:94:11:94:11 | x | 0 | test.c:102:16:102:21 | j |
+| test.c:94:11:94:11 | x | 0 | test.c:102:29:102:26 | { ... } |
+| test.c:94:11:94:11 | x | 0 | test.c:107:5:109:14 | ExprStmt |
+| test.c:94:11:94:11 | x | 0 | test.c:109:19:109:23 | y |
+| test.c:94:11:94:11 | x | 0 | test.c:109:26:117:12 | { ... } |
+| test.c:94:11:94:11 | x | 0 | test.c:113:9:113:16 | return ... |
+| test.c:94:11:94:11 | x | not 0 | test.c:94:19:96:11 | { ... } |
 | test.c:94:11:94:16 | ... != ... | false | test.c:70:5:70:9 | test2 |
 | test.c:94:11:94:16 | ... != ... | false | test.c:99:5:102:13 | ExprStmt |
 | test.c:94:11:94:16 | ... != ... | false | test.c:102:16:102:21 | j |
@@ -68,98 +88,187 @@
 | test.c:102:16:102:21 | ... < ... | false | test.c:109:26:117:12 | { ... } |
 | test.c:102:16:102:21 | ... < ... | false | test.c:113:9:113:16 | return ... |
 | test.c:102:16:102:21 | ... < ... | true | test.c:102:29:102:26 | { ... } |
+| test.c:109:9:109:9 | x | not 0 | test.c:109:19:109:23 | y |
+| test.c:109:9:109:9 | x | not 0 | test.c:113:9:113:16 | return ... |
 | test.c:109:9:109:14 | ... == ... | false | test.c:109:19:109:23 | y |
 | test.c:109:9:109:14 | ... == ... | false | test.c:113:9:113:16 | return ... |
 | test.c:109:9:109:23 | ... \|\| ... | false | test.c:113:9:113:16 | return ... |
 | test.c:109:19:109:23 | ... < ... | false | test.c:113:9:113:16 | return ... |
+| test.c:126:7:126:7 | 1 | not 0 | test.c:126:12:126:26 | call to test3_condition |
+| test.c:126:7:126:7 | 1 | not 0 | test.c:126:31:128:16 | { ... } |
+| test.c:126:7:126:7 | 1 | not 0 | test.c:131:3:131:7 | if (...) ...  |
+| test.c:126:7:126:7 | 1 | not 0 | test.c:131:10:132:16 | { ... } |
+| test.c:126:7:126:7 | 1 | not 0 | test.c:134:1:123:10 | return ... |
 | test.c:126:7:126:7 | 1 | true | test.c:126:12:126:26 | call to test3_condition |
 | test.c:126:7:126:7 | 1 | true | test.c:126:31:128:16 | { ... } |
 | test.c:126:7:126:7 | 1 | true | test.c:131:3:131:7 | if (...) ...  |
 | test.c:126:7:126:7 | 1 | true | test.c:131:10:132:16 | { ... } |
 | test.c:126:7:126:7 | 1 | true | test.c:134:1:123:10 | return ... |
+| test.c:126:7:126:28 | ... && ... | not 0 | test.c:126:31:128:16 | { ... } |
+| test.c:126:7:126:28 | ... && ... | not 0 | test.c:131:10:132:16 | { ... } |
 | test.c:126:7:126:28 | ... && ... | true | test.c:126:31:128:16 | { ... } |
+| test.c:126:7:126:28 | ... && ... | true | test.c:131:10:132:16 | { ... } |
+| test.c:126:12:126:26 | call to test3_condition | not 0 | test.c:126:31:128:16 | { ... } |
+| test.c:126:12:126:26 | call to test3_condition | not 0 | test.c:131:10:132:16 | { ... } |
 | test.c:126:12:126:26 | call to test3_condition | true | test.c:126:31:128:16 | { ... } |
+| test.c:126:12:126:26 | call to test3_condition | true | test.c:131:10:132:16 | { ... } |
+| test.c:127:9:127:9 | 1 | not 0 | test.c:131:10:132:16 | { ... } |
+| test.c:131:7:131:7 | b | not 0 | test.c:131:10:132:16 | { ... } |
 | test.c:131:7:131:7 | b | true | test.c:131:10:132:16 | { ... } |
 | test.c:137:7:137:7 | 0 | false | test.c:142:3:136:10 | return ... |
+| test.c:145:16:145:16 | x | 0 | test.c:146:11:147:9 | { ... } |
 | test.c:146:7:146:8 | ! ... | true | test.c:146:11:147:9 | { ... } |
+| test.c:146:8:146:8 | x | 0 | test.c:146:11:147:9 | { ... } |
 | test.c:146:8:146:8 | x | false | test.c:146:11:147:9 | { ... } |
+| test.c:151:18:151:18 | p | not null | test.c:152:11:154:5 | { ... } |
+| test.c:152:8:152:8 | p | not null | test.c:152:11:154:5 | { ... } |
 | test.c:152:8:152:8 | p | true | test.c:152:11:154:5 | { ... } |
+| test.c:157:18:157:18 | p | null | test.c:158:12:160:5 | { ... } |
 | test.c:158:8:158:9 | ! ... | true | test.c:158:12:160:5 | { ... } |
 | test.c:158:9:158:9 | p | false | test.c:158:12:160:5 | { ... } |
+| test.c:158:9:158:9 | p | null | test.c:158:12:160:5 | { ... } |
+| test.c:163:18:163:18 | s | not 0 | test.c:164:11:166:5 | { ... } |
+| test.c:164:8:164:8 | s | not 0 | test.c:164:11:166:5 | { ... } |
 | test.c:164:8:164:8 | s | true | test.c:164:11:166:5 | { ... } |
+| test.c:169:18:169:18 | s | 0 | test.c:170:12:172:5 | { ... } |
 | test.c:170:8:170:9 | ! ... | true | test.c:170:12:172:5 | { ... } |
+| test.c:170:9:170:9 | s | 0 | test.c:170:12:172:5 | { ... } |
 | test.c:170:9:170:9 | s | false | test.c:170:12:172:5 | { ... } |
 | test.c:176:8:176:15 | ! ... | true | test.c:176:18:178:5 | { ... } |
+| test.c:176:10:176:14 | ... < ... | 0 | test.c:176:18:178:5 | { ... } |
 | test.c:176:10:176:14 | ... < ... | false | test.c:176:18:178:5 | { ... } |
 | test.c:182:8:182:34 | ! ... | true | test.c:182:37:184:5 | { ... } |
 | test.c:182:10:182:20 | ... >= ... | true | test.c:181:25:182:20 | { ... } |
 | test.c:182:10:182:20 | ... >= ... | true | test.c:182:25:182:33 | foo |
+| test.c:182:10:182:33 | ... && ... | 0 | test.c:182:37:184:5 | { ... } |
 | test.c:182:10:182:33 | ... && ... | false | test.c:182:37:184:5 | { ... } |
 | test.c:182:10:182:33 | ... && ... | true | test.c:181:25:182:20 | { ... } |
 | test.c:182:25:182:33 | ... < ... | true | test.c:181:25:182:20 | { ... } |
+| test.c:188:11:188:16 | ... != ... | 0 | test.c:190:11:192:3 | { ... } |
 | test.c:190:7:190:8 | ! ... | true | test.c:190:11:192:3 | { ... } |
+| test.c:190:8:190:8 | c | 0 | test.c:190:11:192:3 | { ... } |
 | test.c:190:8:190:8 | c | false | test.c:190:11:192:3 | { ... } |
+| test.c:196:11:196:16 | ... > ... | 0 | test.c:198:11:200:3 | { ... } |
 | test.c:198:7:198:8 | ! ... | true | test.c:198:11:200:3 | { ... } |
+| test.c:198:8:198:8 | b | 0 | test.c:198:11:200:3 | { ... } |
 | test.c:198:8:198:8 | b | false | test.c:198:11:200:3 | { ... } |
+| test.c:204:11:204:15 | ... > ... | 0 | test.c:206:11:208:3 | { ... } |
 | test.c:206:7:206:8 | ! ... | true | test.c:206:11:208:3 | { ... } |
+| test.c:206:8:206:8 | c | 0 | test.c:206:11:208:3 | { ... } |
 | test.c:206:8:206:8 | c | false | test.c:206:11:208:3 | { ... } |
+| test.c:215:6:215:18 | call to __builtin_expect | not 0 | test.c:215:21:217:5 | { ... } |
 | test.c:215:6:215:18 | call to __builtin_expect | true | test.c:215:21:217:5 | { ... } |
+| test.c:219:9:219:22 | call to __builtin_expect | not 0 | test.c:219:25:221:5 | { ... } |
 | test.c:219:9:219:22 | call to __builtin_expect | true | test.c:219:25:221:5 | { ... } |
+| test.cpp:18:8:18:10 | call to get | not null | test.cpp:19:5:19:14 | ExprStmt |
 | test.cpp:18:8:18:10 | call to get | true | test.cpp:19:5:19:14 | ExprStmt |
+| test.cpp:30:22:30:22 | x | -1 | test.cpp:30:6:30:16 | doSomething |
+| test.cpp:30:22:30:22 | x | -1 | test.cpp:31:16:32:21 | { ... } |
+| test.cpp:30:22:30:22 | x | not -1 | test.cpp:30:6:30:16 | doSomething |
+| test.cpp:30:22:30:22 | x | not -1 | test.cpp:34:1:34:1 | return ... |
+| test.cpp:31:7:31:7 | x | -1 | test.cpp:30:6:30:16 | doSomething |
+| test.cpp:31:7:31:7 | x | -1 | test.cpp:31:16:32:21 | { ... } |
+| test.cpp:31:7:31:7 | x | not -1 | test.cpp:30:6:30:16 | doSomething |
+| test.cpp:31:7:31:7 | x | not -1 | test.cpp:34:1:34:1 | return ... |
 | test.cpp:31:7:31:13 | ... == ... | false | test.cpp:30:6:30:16 | doSomething |
 | test.cpp:31:7:31:13 | ... == ... | false | test.cpp:34:1:34:1 | return ... |
 | test.cpp:31:7:31:13 | ... == ... | true | test.cpp:30:6:30:16 | doSomething |
 | test.cpp:31:7:31:13 | ... == ... | true | test.cpp:31:16:32:21 | { ... } |
 | test.cpp:42:13:42:20 | call to getABool | true | test.cpp:43:9:45:23 | { ... } |
-| test.cpp:61:10:61:10 | i | Case[0] | test.cpp:62:5:64:12 | case ...: |
-| test.cpp:61:10:61:10 | i | Case[1] | test.cpp:65:5:66:10 | case ...: |
-| test.cpp:74:10:74:10 | i | Case[0..10] | test.cpp:75:5:77:12 | case ...: |
-| test.cpp:74:10:74:10 | i | Case[11..20] | test.cpp:78:5:79:10 | case ...: |
+| test.cpp:60:31:60:31 | i | 0 | test.cpp:62:5:64:12 | case ...: |
+| test.cpp:60:31:60:31 | i | 1 | test.cpp:65:5:66:10 | case ...: |
+| test.cpp:61:10:61:10 | i | 0 | test.cpp:62:5:64:12 | case ...: |
+| test.cpp:61:10:61:10 | i | 1 | test.cpp:65:5:66:10 | case ...: |
+| test.cpp:73:30:73:30 | i | Lower bound 0 | test.cpp:75:5:77:12 | case ...: |
+| test.cpp:73:30:73:30 | i | Lower bound 11 | test.cpp:78:5:79:10 | case ...: |
+| test.cpp:73:30:73:30 | i | Upper bound 10 | test.cpp:75:5:77:12 | case ...: |
+| test.cpp:73:30:73:30 | i | Upper bound 20 | test.cpp:78:5:79:10 | case ...: |
+| test.cpp:74:10:74:10 | i | Lower bound 0 | test.cpp:75:5:77:12 | case ...: |
+| test.cpp:74:10:74:10 | i | Lower bound 11 | test.cpp:78:5:79:10 | case ...: |
+| test.cpp:74:10:74:10 | i | Upper bound 10 | test.cpp:75:5:77:12 | case ...: |
+| test.cpp:74:10:74:10 | i | Upper bound 20 | test.cpp:78:5:79:10 | case ...: |
+| test.cpp:92:31:92:31 | c | not null | test.cpp:93:9:94:7 | { ... } |
+| test.cpp:93:6:93:6 | c | not null | test.cpp:93:9:94:7 | { ... } |
 | test.cpp:93:6:93:6 | c | true | test.cpp:93:9:94:7 | { ... } |
 | test.cpp:99:6:99:6 | f | true | test.cpp:99:9:100:7 | { ... } |
 | test.cpp:105:6:105:14 | ... != ... | true | test.cpp:105:17:106:7 | { ... } |
 | test.cpp:111:6:111:14 | ... != ... | true | test.cpp:111:17:112:7 | { ... } |
+| test.cpp:119:16:119:16 | b | true | test.cpp:123:5:125:20 | { ... } |
+| test.cpp:119:16:119:16 | b | true | test.cpp:125:23:125:29 | return ... |
 | test.cpp:122:9:122:9 | b | true | test.cpp:123:5:125:20 | { ... } |
 | test.cpp:122:9:122:9 | b | true | test.cpp:125:23:125:29 | return ... |
 | test.cpp:125:13:125:20 | ! ... | true | test.cpp:125:23:125:29 | return ... |
 | test.cpp:125:14:125:17 | call to safe | false | test.cpp:125:23:125:29 | return ... |
+| test.cpp:131:6:131:21 | call to __builtin_expect | not 0 | test.cpp:131:40:132:9 | { ... } |
 | test.cpp:131:6:131:21 | call to __builtin_expect | true | test.cpp:131:40:132:9 | { ... } |
+| test.cpp:135:6:135:21 | call to __builtin_expect | not 0 | test.cpp:135:40:136:9 | { ... } |
 | test.cpp:135:6:135:21 | call to __builtin_expect | true | test.cpp:135:40:136:9 | { ... } |
+| test.cpp:141:6:141:21 | call to __builtin_expect | not 0 | test.cpp:141:36:142:9 | { ... } |
 | test.cpp:141:6:141:21 | call to __builtin_expect | true | test.cpp:141:36:142:9 | { ... } |
+| test.cpp:145:6:145:21 | call to __builtin_expect | not 0 | test.cpp:145:36:146:9 | { ... } |
 | test.cpp:145:6:145:21 | call to __builtin_expect | true | test.cpp:145:36:146:9 | { ... } |
+| test.cpp:151:8:151:13 | ... < ... | false | test.cpp:152:11:153:9 | { ... } |
 | test.cpp:152:7:152:8 | ! ... | true | test.cpp:152:11:153:9 | { ... } |
 | test.cpp:152:8:152:8 | b | false | test.cpp:152:11:153:9 | { ... } |
+| test.cpp:158:12:158:17 | ... != ... | false | test.cpp:160:11:162:3 | { ... } |
 | test.cpp:160:7:160:8 | ! ... | true | test.cpp:160:11:162:3 | { ... } |
 | test.cpp:160:8:160:8 | c | false | test.cpp:160:11:162:3 | { ... } |
+| test.cpp:166:12:166:17 | ... > ... | false | test.cpp:168:11:170:3 | { ... } |
 | test.cpp:168:7:168:8 | ! ... | true | test.cpp:168:11:170:3 | { ... } |
 | test.cpp:168:8:168:8 | b | false | test.cpp:168:11:170:3 | { ... } |
+| test.cpp:174:12:174:16 | ... > ... | false | test.cpp:176:11:178:3 | { ... } |
 | test.cpp:176:7:176:8 | ! ... | true | test.cpp:176:11:178:3 | { ... } |
 | test.cpp:176:8:176:8 | c | false | test.cpp:176:11:178:3 | { ... } |
+| test.cpp:181:28:181:29 | b1 | true | test.cpp:181:41:182:9 | { ... } |
+| test.cpp:181:28:181:29 | b1 | true | test.cpp:182:14:182:15 | b2 |
+| test.cpp:181:28:181:29 | b1 | true | test.cpp:185:10:188:7 | { ... } |
+| test.cpp:181:37:181:38 | b2 | true | test.cpp:181:41:182:9 | { ... } |
+| test.cpp:181:37:181:38 | b2 | true | test.cpp:185:10:188:7 | { ... } |
 | test.cpp:182:6:182:16 | ! ... | false | test.cpp:185:10:188:7 | { ... } |
 | test.cpp:182:6:182:16 | ! ... | true | test.cpp:182:19:184:7 | { ... } |
 | test.cpp:182:8:182:9 | b1 | true | test.cpp:181:41:182:9 | { ... } |
 | test.cpp:182:8:182:9 | b1 | true | test.cpp:182:14:182:15 | b2 |
+| test.cpp:182:8:182:9 | b1 | true | test.cpp:185:10:188:7 | { ... } |
 | test.cpp:182:8:182:15 | ... && ... | false | test.cpp:182:19:184:7 | { ... } |
 | test.cpp:182:8:182:15 | ... && ... | true | test.cpp:181:41:182:9 | { ... } |
 | test.cpp:182:8:182:15 | ... && ... | true | test.cpp:185:10:188:7 | { ... } |
 | test.cpp:182:14:182:15 | b2 | true | test.cpp:181:41:182:9 | { ... } |
+| test.cpp:182:14:182:15 | b2 | true | test.cpp:185:10:188:7 | { ... } |
+| test.cpp:192:27:192:28 | b1 | false | test.cpp:192:40:193:9 | { ... } |
+| test.cpp:192:27:192:28 | b1 | false | test.cpp:193:14:193:15 | b2 |
+| test.cpp:192:27:192:28 | b1 | false | test.cpp:193:19:196:7 | { ... } |
+| test.cpp:192:36:192:37 | b2 | false | test.cpp:192:40:193:9 | { ... } |
+| test.cpp:192:36:192:37 | b2 | false | test.cpp:193:19:196:7 | { ... } |
 | test.cpp:193:6:193:16 | ! ... | false | test.cpp:197:10:199:7 | { ... } |
 | test.cpp:193:6:193:16 | ! ... | true | test.cpp:193:19:196:7 | { ... } |
 | test.cpp:193:8:193:9 | b1 | false | test.cpp:192:40:193:9 | { ... } |
 | test.cpp:193:8:193:9 | b1 | false | test.cpp:193:14:193:15 | b2 |
+| test.cpp:193:8:193:9 | b1 | false | test.cpp:193:19:196:7 | { ... } |
 | test.cpp:193:8:193:15 | ... \|\| ... | false | test.cpp:192:40:193:9 | { ... } |
 | test.cpp:193:8:193:15 | ... \|\| ... | false | test.cpp:193:19:196:7 | { ... } |
 | test.cpp:193:8:193:15 | ... \|\| ... | true | test.cpp:197:10:199:7 | { ... } |
 | test.cpp:193:14:193:15 | b2 | false | test.cpp:192:40:193:9 | { ... } |
+| test.cpp:193:14:193:15 | b2 | false | test.cpp:193:19:196:7 | { ... } |
+| test.cpp:208:28:208:29 | sc | 0 | test.cpp:211:18:212:13 | { ... } |
+| test.cpp:208:28:208:29 | sc | 0 | test.cpp:214:20:215:13 | { ... } |
+| test.cpp:208:46:208:47 | ul | 0 | test.cpp:217:18:218:13 | { ... } |
+| test.cpp:208:74:208:74 | b | 0 | test.cpp:229:17:230:13 | { ... } |
+| test.cpp:208:74:208:74 | b | 0 | test.cpp:232:21:233:13 | { ... } |
+| test.cpp:211:9:211:10 | sc | 0 | test.cpp:211:18:212:13 | { ... } |
 | test.cpp:211:9:211:15 | ... == ... | true | test.cpp:211:18:212:13 | { ... } |
+| test.cpp:214:9:214:10 | sc | 0 | test.cpp:214:20:215:13 | { ... } |
 | test.cpp:214:9:214:17 | ... == ... | true | test.cpp:214:20:215:13 | { ... } |
+| test.cpp:217:9:217:10 | ul | 0 | test.cpp:217:18:218:13 | { ... } |
 | test.cpp:217:9:217:15 | ... == ... | true | test.cpp:217:18:218:13 | { ... } |
 | test.cpp:220:9:220:14 | ... == ... | true | test.cpp:220:17:221:13 | { ... } |
 | test.cpp:223:9:223:16 | ... == ... | true | test.cpp:223:19:224:13 | { ... } |
 | test.cpp:226:9:226:14 | ... == ... | true | test.cpp:226:17:227:13 | { ... } |
+| test.cpp:229:9:229:9 | b | 0 | test.cpp:229:17:230:13 | { ... } |
 | test.cpp:229:9:229:14 | ... == ... | true | test.cpp:229:17:230:13 | { ... } |
+| test.cpp:232:9:232:9 | b | 0 | test.cpp:232:21:233:13 | { ... } |
 | test.cpp:232:9:232:18 | ... == ... | true | test.cpp:232:21:233:13 | { ... } |
 | test.cpp:235:9:235:17 | ... == ... | true | test.cpp:235:20:236:13 | { ... } |
+| test.cpp:235:12:235:12 | i | 0 | test.cpp:235:20:236:13 | { ... } |
 | test.cpp:238:9:238:17 | ... == ... | true | test.cpp:238:20:239:13 | { ... } |
 | test.cpp:241:9:241:17 | ... == ... | true | test.cpp:241:22:241:30 | ms |
 | test.cpp:241:9:241:17 | ... == ... | true | test.cpp:241:35:241:43 | ms |
@@ -167,30 +276,151 @@
 | test.cpp:241:9:241:30 | ... && ... | true | test.cpp:241:35:241:43 | ms |
 | test.cpp:241:9:241:30 | ... && ... | true | test.cpp:241:46:242:13 | { ... } |
 | test.cpp:241:9:241:43 | ... && ... | true | test.cpp:241:46:242:13 | { ... } |
+| test.cpp:241:12:241:12 | i | 0 | test.cpp:241:22:241:30 | ms |
+| test.cpp:241:12:241:12 | i | 0 | test.cpp:241:35:241:43 | ms |
+| test.cpp:241:12:241:12 | i | 0 | test.cpp:241:46:242:13 | { ... } |
 | test.cpp:241:22:241:30 | ... == ... | true | test.cpp:241:35:241:43 | ms |
 | test.cpp:241:22:241:30 | ... == ... | true | test.cpp:241:46:242:13 | { ... } |
 | test.cpp:241:35:241:43 | ... == ... | true | test.cpp:241:46:242:13 | { ... } |
+| test.cpp:241:38:241:38 | i | 0 | test.cpp:241:46:242:13 | { ... } |
 | test.cpp:247:6:247:18 | ... == ... | false | test.cpp:249:10:251:3 | { ... } |
 | test.cpp:247:6:247:18 | ... == ... | true | test.cpp:247:21:249:3 | { ... } |
+| test.cpp:247:7:247:12 | ... == ... | 0 | test.cpp:247:21:249:3 | { ... } |
+| test.cpp:247:7:247:12 | ... == ... | not 0 | test.cpp:249:10:251:3 | { ... } |
 | test.cpp:253:6:253:18 | ... != ... | false | test.cpp:255:10:257:3 | { ... } |
 | test.cpp:253:6:253:18 | ... != ... | true | test.cpp:253:21:255:3 | { ... } |
+| test.cpp:253:7:253:12 | ... == ... | 0 | test.cpp:255:10:257:3 | { ... } |
+| test.cpp:253:7:253:12 | ... == ... | not 0 | test.cpp:253:21:255:3 | { ... } |
 | test.cpp:260:6:260:18 | ... == ... | false | test.cpp:262:10:264:3 | { ... } |
 | test.cpp:260:6:260:18 | ... == ... | true | test.cpp:260:21:262:3 | { ... } |
+| test.cpp:260:7:260:12 | ... != ... | 0 | test.cpp:260:21:262:3 | { ... } |
+| test.cpp:260:7:260:12 | ... != ... | not 0 | test.cpp:262:10:264:3 | { ... } |
 | test.cpp:266:6:266:18 | ... != ... | false | test.cpp:268:10:270:3 | { ... } |
 | test.cpp:266:6:266:18 | ... != ... | true | test.cpp:266:21:268:3 | { ... } |
+| test.cpp:266:7:266:12 | ... != ... | 0 | test.cpp:268:10:270:3 | { ... } |
+| test.cpp:266:7:266:12 | ... != ... | not 0 | test.cpp:266:21:268:3 | { ... } |
 | test.cpp:273:6:273:17 | ... == ... | false | test.cpp:275:10:277:3 | { ... } |
 | test.cpp:273:6:273:17 | ... == ... | true | test.cpp:273:20:275:3 | { ... } |
+| test.cpp:273:7:273:11 | ... < ... | 0 | test.cpp:273:20:275:3 | { ... } |
+| test.cpp:273:7:273:11 | ... < ... | not 0 | test.cpp:275:10:277:3 | { ... } |
 | test.cpp:279:6:279:17 | ... != ... | false | test.cpp:281:10:283:3 | { ... } |
 | test.cpp:279:6:279:17 | ... != ... | true | test.cpp:279:20:281:3 | { ... } |
+| test.cpp:279:7:279:11 | ... < ... | 0 | test.cpp:281:10:283:3 | { ... } |
+| test.cpp:279:7:279:11 | ... < ... | not 0 | test.cpp:279:20:281:3 | { ... } |
 | test.cpp:287:6:287:19 | ... == ... | false | test.cpp:289:10:291:3 | { ... } |
 | test.cpp:287:6:287:19 | ... == ... | true | test.cpp:287:22:289:3 | { ... } |
+| test.cpp:287:7:287:13 | ... == ... | 0 | test.cpp:287:22:289:3 | { ... } |
+| test.cpp:287:7:287:13 | ... == ... | not 0 | test.cpp:289:10:291:3 | { ... } |
 | test.cpp:293:6:293:19 | ... != ... | false | test.cpp:295:10:297:3 | { ... } |
 | test.cpp:293:6:293:19 | ... != ... | true | test.cpp:293:22:295:3 | { ... } |
+| test.cpp:293:7:293:13 | ... == ... | 0 | test.cpp:295:10:297:3 | { ... } |
+| test.cpp:293:7:293:13 | ... == ... | not 0 | test.cpp:293:22:295:3 | { ... } |
 | test.cpp:300:6:300:19 | ... == ... | false | test.cpp:302:10:304:3 | { ... } |
 | test.cpp:300:6:300:19 | ... == ... | true | test.cpp:300:22:302:3 | { ... } |
+| test.cpp:300:7:300:13 | ... != ... | 0 | test.cpp:300:22:302:3 | { ... } |
+| test.cpp:300:7:300:13 | ... != ... | not 0 | test.cpp:302:10:304:3 | { ... } |
 | test.cpp:306:6:306:19 | ... != ... | false | test.cpp:308:10:310:3 | { ... } |
 | test.cpp:306:6:306:19 | ... != ... | true | test.cpp:306:22:308:3 | { ... } |
+| test.cpp:306:7:306:13 | ... != ... | 0 | test.cpp:308:10:310:3 | { ... } |
+| test.cpp:306:7:306:13 | ... != ... | not 0 | test.cpp:306:22:308:3 | { ... } |
 | test.cpp:312:6:312:18 | ... == ... | false | test.cpp:314:10:316:3 | { ... } |
 | test.cpp:312:6:312:18 | ... == ... | true | test.cpp:312:21:314:3 | { ... } |
+| test.cpp:312:7:312:12 | ... < ... | 0 | test.cpp:312:21:314:3 | { ... } |
+| test.cpp:312:7:312:12 | ... < ... | not 0 | test.cpp:314:10:316:3 | { ... } |
 | test.cpp:318:6:318:18 | ... != ... | false | test.cpp:320:10:322:3 | { ... } |
 | test.cpp:318:6:318:18 | ... != ... | true | test.cpp:318:21:320:3 | { ... } |
+| test.cpp:318:7:318:12 | ... < ... | 0 | test.cpp:320:10:322:3 | { ... } |
+| test.cpp:318:7:318:12 | ... < ... | not 0 | test.cpp:318:21:320:3 | { ... } |
+| test.cpp:327:46:327:46 | b | true | test.cpp:331:3:332:10 | { ... } |
+| test.cpp:330:7:330:7 | b | true | test.cpp:331:3:332:10 | { ... } |
+| test.cpp:334:11:334:11 | x | Lower bound 40 | test.cpp:336:3:338:7 | case ...: |
+| test.cpp:334:11:334:11 | x | Upper bound 50 | test.cpp:336:3:338:7 | case ...: |
+| test.cpp:348:25:348:25 | y | not null | test.cpp:349:29:349:30 | 42 |
+| test.cpp:348:25:348:25 | y | not null | test.cpp:350:15:351:7 | { ... } |
+| test.cpp:348:25:348:25 | y | null | test.cpp:349:34:349:34 | 0 |
+| test.cpp:349:11:349:22 | call to testNotNull1 | false | test.cpp:349:34:349:34 | 0 |
+| test.cpp:349:11:349:22 | call to testNotNull1 | true | test.cpp:349:29:349:30 | 42 |
+| test.cpp:349:11:349:22 | call to testNotNull1 | true | test.cpp:350:15:351:7 | { ... } |
+| test.cpp:349:11:349:34 | ... ? ... : ... | not 0 | test.cpp:350:15:351:7 | { ... } |
+| test.cpp:349:24:349:24 | y | not null | test.cpp:349:29:349:30 | 42 |
+| test.cpp:349:24:349:24 | y | not null | test.cpp:350:15:351:7 | { ... } |
+| test.cpp:349:24:349:24 | y | null | test.cpp:349:34:349:34 | 0 |
+| test.cpp:349:29:349:30 | 42 | not 0 | test.cpp:350:15:351:7 | { ... } |
+| test.cpp:350:7:350:7 | x | not 0 | test.cpp:350:15:351:7 | { ... } |
+| test.cpp:350:7:350:12 | ... != ... | true | test.cpp:350:15:351:7 | { ... } |
+| test.cpp:355:25:355:29 | input | not null | test.cpp:357:3:357:13 | return ... |
+| test.cpp:355:25:355:29 | input | null | test.cpp:356:25:356:36 | return ... |
+| test.cpp:356:7:356:11 | input | not null | test.cpp:357:3:357:13 | return ... |
+| test.cpp:356:7:356:11 | input | null | test.cpp:356:25:356:36 | return ... |
+| test.cpp:356:7:356:22 | ... == ... | false | test.cpp:357:3:357:13 | return ... |
+| test.cpp:356:7:356:22 | ... == ... | true | test.cpp:356:25:356:36 | return ... |
+| test.cpp:360:26:360:31 | number | not null | test.cpp:361:35:361:40 | number |
+| test.cpp:360:26:360:31 | number | null | test.cpp:361:30:361:30 | 0 |
+| test.cpp:361:10:361:15 | number | not null | test.cpp:361:35:361:40 | number |
+| test.cpp:361:10:361:15 | number | null | test.cpp:361:30:361:30 | 0 |
+| test.cpp:361:10:361:26 | ... == ... | false | test.cpp:361:35:361:40 | number |
+| test.cpp:361:10:361:26 | ... == ... | true | test.cpp:361:30:361:30 | 0 |
+| test.cpp:364:33:364:34 | s1 | not null | test.cpp:365:15:365:16 | s2 |
+| test.cpp:364:33:364:34 | s1 | not null | test.cpp:366:3:366:12 | return ... |
+| test.cpp:364:43:364:44 | s2 | not null | test.cpp:366:3:366:12 | return ... |
+| test.cpp:365:7:365:9 | ! ... | false | test.cpp:365:15:365:16 | s2 |
+| test.cpp:365:7:365:9 | ! ... | false | test.cpp:366:3:366:12 | return ... |
+| test.cpp:365:7:365:16 | ... \|\| ... | false | test.cpp:366:3:366:12 | return ... |
+| test.cpp:365:8:365:9 | s1 | not null | test.cpp:365:15:365:16 | s2 |
+| test.cpp:365:8:365:9 | s1 | not null | test.cpp:366:3:366:12 | return ... |
+| test.cpp:365:8:365:9 | s1 | true | test.cpp:365:15:365:16 | s2 |
+| test.cpp:365:8:365:9 | s1 | true | test.cpp:366:3:366:12 | return ... |
+| test.cpp:365:14:365:16 | ! ... | false | test.cpp:366:3:366:12 | return ... |
+| test.cpp:365:15:365:16 | s2 | not null | test.cpp:366:3:366:12 | return ... |
+| test.cpp:365:15:365:16 | s2 | true | test.cpp:366:3:366:12 | return ... |
+| test.cpp:371:29:371:32 | flag | false | test.cpp:372:35:372:49 | FAILURE |
+| test.cpp:371:29:371:32 | flag | true | test.cpp:372:17:372:31 | SUCCESS |
+| test.cpp:372:10:372:13 | flag | false | test.cpp:372:35:372:49 | FAILURE |
+| test.cpp:372:10:372:13 | flag | true | test.cpp:372:17:372:31 | SUCCESS |
+| test.cpp:375:25:375:25 | p | not null | test.cpp:376:24:377:7 | { ... } |
+| test.cpp:375:25:375:25 | p | not null | test.cpp:382:24:383:7 | { ... } |
+| test.cpp:375:25:375:25 | p | null | test.cpp:378:10:379:7 | { ... } |
+| test.cpp:375:25:375:25 | p | null | test.cpp:384:10:385:7 | { ... } |
+| test.cpp:375:33:375:33 | i | not null | test.cpp:390:10:391:7 | { ... } |
+| test.cpp:375:42:375:42 | s | not null | test.cpp:396:10:397:7 | { ... } |
+| test.cpp:375:50:375:50 | b | false | test.cpp:404:5:406:12 | case ...: |
+| test.cpp:375:50:375:50 | b | true | test.cpp:401:5:403:12 | case ...: |
+| test.cpp:376:7:376:18 | call to testNotNull1 | false | test.cpp:378:10:379:7 | { ... } |
+| test.cpp:376:7:376:18 | call to testNotNull1 | true | test.cpp:376:24:377:7 | { ... } |
+| test.cpp:376:20:376:20 | p | not null | test.cpp:376:24:377:7 | { ... } |
+| test.cpp:376:20:376:20 | p | null | test.cpp:378:10:379:7 | { ... } |
+| test.cpp:382:7:382:18 | call to testNotNull2 | false | test.cpp:384:10:385:7 | { ... } |
+| test.cpp:382:7:382:18 | call to testNotNull2 | true | test.cpp:382:24:383:7 | { ... } |
+| test.cpp:382:20:382:20 | p | not null | test.cpp:382:24:383:7 | { ... } |
+| test.cpp:382:20:382:20 | p | null | test.cpp:384:10:385:7 | { ... } |
+| test.cpp:388:7:388:29 | ... == ... | false | test.cpp:390:10:391:7 | { ... } |
+| test.cpp:388:7:388:29 | ... == ... | true | test.cpp:388:32:389:7 | { ... } |
+| test.cpp:388:12:388:26 | call to getNumOrDefault | 0 | test.cpp:388:32:389:7 | { ... } |
+| test.cpp:388:12:388:26 | call to getNumOrDefault | not 0 | test.cpp:390:10:391:7 | { ... } |
+| test.cpp:388:28:388:28 | i | not null | test.cpp:390:10:391:7 | { ... } |
+| test.cpp:394:7:394:47 | ... == ... | false | test.cpp:396:10:397:7 | { ... } |
+| test.cpp:394:7:394:47 | ... == ... | true | test.cpp:394:50:395:7 | { ... } |
+| test.cpp:394:15:394:34 | call to returnAIfNoneAreNull | 0 | test.cpp:394:50:395:7 | { ... } |
+| test.cpp:394:15:394:34 | call to returnAIfNoneAreNull | not 0 | test.cpp:396:10:397:7 | { ... } |
+| test.cpp:394:36:394:36 | s | not null | test.cpp:396:10:397:7 | { ... } |
+| test.cpp:394:39:394:46 | suffix | not null | test.cpp:396:10:397:7 | { ... } |
+| test.cpp:400:11:400:25 | call to testEnumWrapper | 1 | test.cpp:401:5:403:12 | case ...: |
+| test.cpp:400:11:400:25 | call to testEnumWrapper | 2 | test.cpp:404:5:406:12 | case ...: |
+| test.cpp:400:27:400:27 | b | false | test.cpp:404:5:406:12 | case ...: |
+| test.cpp:400:27:400:27 | b | true | test.cpp:401:5:403:12 | case ...: |
+| test.cpp:410:26:410:26 | o | not null | test.cpp:410:6:410:18 | ensureNotNull |
+| test.cpp:410:26:410:26 | o | not null | test.cpp:412:1:412:1 | return ... |
+| test.cpp:410:26:410:26 | o | null | test.cpp:410:6:410:18 | ensureNotNull |
+| test.cpp:410:26:410:26 | o | null | test.cpp:411:11:411:18 | ExprStmt |
+| test.cpp:411:7:411:8 | ! ... | false | test.cpp:410:6:410:18 | ensureNotNull |
+| test.cpp:411:7:411:8 | ! ... | false | test.cpp:412:1:412:1 | return ... |
+| test.cpp:411:7:411:8 | ! ... | true | test.cpp:410:6:410:18 | ensureNotNull |
+| test.cpp:411:7:411:8 | ! ... | true | test.cpp:411:11:411:18 | ExprStmt |
+| test.cpp:411:8:411:8 | o | false | test.cpp:410:6:410:18 | ensureNotNull |
+| test.cpp:411:8:411:8 | o | false | test.cpp:411:11:411:18 | ExprStmt |
+| test.cpp:411:8:411:8 | o | not null | test.cpp:410:6:410:18 | ensureNotNull |
+| test.cpp:411:8:411:8 | o | not null | test.cpp:412:1:412:1 | return ... |
+| test.cpp:411:8:411:8 | o | null | test.cpp:410:6:410:18 | ensureNotNull |
+| test.cpp:411:8:411:8 | o | null | test.cpp:411:11:411:18 | ExprStmt |
+| test.cpp:411:8:411:8 | o | true | test.cpp:410:6:410:18 | ensureNotNull |
+| test.cpp:411:8:411:8 | o | true | test.cpp:412:1:412:1 | return ... |
diff --git a/cpp/ql/test/library-tests/controlflow/guards/GuardsControl.ql b/cpp/ql/test/library-tests/controlflow/guards/GuardsControl.ql
index 698b80a06a0..1d9282807bd 100644
--- a/cpp/ql/test/library-tests/controlflow/guards/GuardsControl.ql
+++ b/cpp/ql/test/library-tests/controlflow/guards/GuardsControl.ql
@@ -7,6 +7,6 @@
 import cpp
 import semmle.code.cpp.controlflow.Guards
 
-from GuardCondition guard, AbstractValue value, BasicBlock block
+from GuardCondition guard, GuardValue value, BasicBlock block
 where guard.valueControls(block, value)
 select guard, value, block
diff --git a/cpp/ql/test/library-tests/controlflow/guards/GuardsEnsure.expected b/cpp/ql/test/library-tests/controlflow/guards/GuardsEnsure.expected
index c9f52e5f190..0de63fa505b 100644
--- a/cpp/ql/test/library-tests/controlflow/guards/GuardsEnsure.expected
+++ b/cpp/ql/test/library-tests/controlflow/guards/GuardsEnsure.expected
@@ -219,18 +219,26 @@ binary
 | test.cpp:141:6:141:21 | call to __builtin_expect | test.cpp:141:28:141:29 | 42 | == | test.cpp:141:23:141:23 | a | 0 | test.cpp:141:36:142:9 | { ... } |
 | test.cpp:145:6:145:21 | call to __builtin_expect | test.cpp:145:23:145:23 | a | != | test.cpp:145:28:145:29 | 42 | 0 | test.cpp:145:36:146:9 | { ... } |
 | test.cpp:145:6:145:21 | call to __builtin_expect | test.cpp:145:28:145:29 | 42 | != | test.cpp:145:23:145:23 | a | 0 | test.cpp:145:36:146:9 | { ... } |
+| test.cpp:151:8:151:13 | ... < ... | test.cpp:151:8:151:8 | a | >= | test.cpp:151:12:151:13 | 10 | 0 | test.cpp:152:11:153:9 | { ... } |
+| test.cpp:151:8:151:13 | ... < ... | test.cpp:151:12:151:13 | 10 | < | test.cpp:151:8:151:8 | a | 1 | test.cpp:152:11:153:9 | { ... } |
 | test.cpp:152:7:152:8 | ! ... | test.cpp:151:8:151:8 | a | >= | test.cpp:151:12:151:13 | 10 | 0 | test.cpp:152:11:153:9 | { ... } |
 | test.cpp:152:7:152:8 | ! ... | test.cpp:151:12:151:13 | 10 | < | test.cpp:151:8:151:8 | a | 1 | test.cpp:152:11:153:9 | { ... } |
 | test.cpp:152:8:152:8 | b | test.cpp:151:8:151:8 | a | >= | test.cpp:151:12:151:13 | 10 | 0 | test.cpp:152:11:153:9 | { ... } |
 | test.cpp:152:8:152:8 | b | test.cpp:151:12:151:13 | 10 | < | test.cpp:151:8:151:8 | a | 1 | test.cpp:152:11:153:9 | { ... } |
+| test.cpp:158:12:158:17 | ... != ... | test.cpp:158:12:158:12 | a | == | test.cpp:158:17:158:17 | b | 0 | test.cpp:160:11:162:3 | { ... } |
+| test.cpp:158:12:158:17 | ... != ... | test.cpp:158:17:158:17 | b | == | test.cpp:158:12:158:12 | a | 0 | test.cpp:160:11:162:3 | { ... } |
 | test.cpp:160:7:160:8 | ! ... | test.cpp:158:12:158:12 | a | == | test.cpp:158:17:158:17 | b | 0 | test.cpp:160:11:162:3 | { ... } |
 | test.cpp:160:7:160:8 | ! ... | test.cpp:158:17:158:17 | b | == | test.cpp:158:12:158:12 | a | 0 | test.cpp:160:11:162:3 | { ... } |
 | test.cpp:160:8:160:8 | c | test.cpp:158:12:158:12 | a | == | test.cpp:158:17:158:17 | b | 0 | test.cpp:160:11:162:3 | { ... } |
 | test.cpp:160:8:160:8 | c | test.cpp:158:17:158:17 | b | == | test.cpp:158:12:158:12 | a | 0 | test.cpp:160:11:162:3 | { ... } |
+| test.cpp:166:12:166:17 | ... > ... | test.cpp:166:12:166:12 | a | < | test.cpp:166:16:166:17 | 10 | 1 | test.cpp:168:11:170:3 | { ... } |
+| test.cpp:166:12:166:17 | ... > ... | test.cpp:166:16:166:17 | 10 | >= | test.cpp:166:12:166:12 | a | 0 | test.cpp:168:11:170:3 | { ... } |
 | test.cpp:168:7:168:8 | ! ... | test.cpp:166:12:166:12 | a | < | test.cpp:166:16:166:17 | 10 | 1 | test.cpp:168:11:170:3 | { ... } |
 | test.cpp:168:7:168:8 | ! ... | test.cpp:166:16:166:17 | 10 | >= | test.cpp:166:12:166:12 | a | 0 | test.cpp:168:11:170:3 | { ... } |
 | test.cpp:168:8:168:8 | b | test.cpp:166:12:166:12 | a | < | test.cpp:166:16:166:17 | 10 | 1 | test.cpp:168:11:170:3 | { ... } |
 | test.cpp:168:8:168:8 | b | test.cpp:166:16:166:17 | 10 | >= | test.cpp:166:12:166:12 | a | 0 | test.cpp:168:11:170:3 | { ... } |
+| test.cpp:174:12:174:16 | ... > ... | test.cpp:174:12:174:12 | a | < | test.cpp:174:16:174:16 | b | 1 | test.cpp:176:11:178:3 | { ... } |
+| test.cpp:174:12:174:16 | ... > ... | test.cpp:174:16:174:16 | b | >= | test.cpp:174:12:174:12 | a | 0 | test.cpp:176:11:178:3 | { ... } |
 | test.cpp:176:7:176:8 | ! ... | test.cpp:174:12:174:12 | a | < | test.cpp:174:16:174:16 | b | 1 | test.cpp:176:11:178:3 | { ... } |
 | test.cpp:176:7:176:8 | ! ... | test.cpp:174:16:174:16 | b | >= | test.cpp:174:12:174:12 | a | 0 | test.cpp:176:11:178:3 | { ... } |
 | test.cpp:176:8:176:8 | c | test.cpp:174:12:174:12 | a | < | test.cpp:174:16:174:16 | b | 1 | test.cpp:176:11:178:3 | { ... } |
@@ -475,6 +483,24 @@ binary
 | test.cpp:318:6:318:18 | ... != ... | test.cpp:318:11:318:12 | 42 | >= | test.cpp:318:7:318:7 | a | 1 | test.cpp:318:21:320:3 | { ... } |
 | test.cpp:318:6:318:18 | ... != ... | test.cpp:318:18:318:18 | 0 | != | test.cpp:318:7:318:12 | ... < ... | 0 | test.cpp:318:21:320:3 | { ... } |
 | test.cpp:318:6:318:18 | ... != ... | test.cpp:318:18:318:18 | 0 | == | test.cpp:318:7:318:12 | ... < ... | 0 | test.cpp:320:10:322:3 | { ... } |
+| test.cpp:350:7:350:12 | ... != ... | test.cpp:350:7:350:7 | x | != | test.cpp:350:12:350:12 | 0 | 0 | test.cpp:350:15:351:7 | { ... } |
+| test.cpp:350:7:350:12 | ... != ... | test.cpp:350:12:350:12 | 0 | != | test.cpp:350:7:350:7 | x | 0 | test.cpp:350:15:351:7 | { ... } |
+| test.cpp:356:7:356:22 | ... == ... | test.cpp:356:7:356:11 | input | != | test.cpp:356:16:356:22 | 0 | 0 | test.cpp:357:3:357:13 | return ... |
+| test.cpp:356:7:356:22 | ... == ... | test.cpp:356:7:356:11 | input | == | test.cpp:356:16:356:22 | 0 | 0 | test.cpp:356:25:356:36 | return ... |
+| test.cpp:356:7:356:22 | ... == ... | test.cpp:356:16:356:22 | 0 | != | test.cpp:356:7:356:11 | input | 0 | test.cpp:357:3:357:13 | return ... |
+| test.cpp:356:7:356:22 | ... == ... | test.cpp:356:16:356:22 | 0 | == | test.cpp:356:7:356:11 | input | 0 | test.cpp:356:25:356:36 | return ... |
+| test.cpp:361:10:361:26 | ... == ... | test.cpp:361:10:361:15 | number | != | test.cpp:361:20:361:26 | 0 | 0 | test.cpp:361:35:361:40 | number |
+| test.cpp:361:10:361:26 | ... == ... | test.cpp:361:10:361:15 | number | == | test.cpp:361:20:361:26 | 0 | 0 | test.cpp:361:30:361:30 | 0 |
+| test.cpp:361:10:361:26 | ... == ... | test.cpp:361:20:361:26 | 0 | != | test.cpp:361:10:361:15 | number | 0 | test.cpp:361:35:361:40 | number |
+| test.cpp:361:10:361:26 | ... == ... | test.cpp:361:20:361:26 | 0 | == | test.cpp:361:10:361:15 | number | 0 | test.cpp:361:30:361:30 | 0 |
+| test.cpp:388:7:388:29 | ... == ... | test.cpp:388:7:388:7 | 0 | != | test.cpp:388:12:388:26 | call to getNumOrDefault | 0 | test.cpp:390:10:391:7 | { ... } |
+| test.cpp:388:7:388:29 | ... == ... | test.cpp:388:7:388:7 | 0 | == | test.cpp:388:12:388:26 | call to getNumOrDefault | 0 | test.cpp:388:32:389:7 | { ... } |
+| test.cpp:388:7:388:29 | ... == ... | test.cpp:388:12:388:26 | call to getNumOrDefault | != | test.cpp:388:7:388:7 | 0 | 0 | test.cpp:390:10:391:7 | { ... } |
+| test.cpp:388:7:388:29 | ... == ... | test.cpp:388:12:388:26 | call to getNumOrDefault | == | test.cpp:388:7:388:7 | 0 | 0 | test.cpp:388:32:389:7 | { ... } |
+| test.cpp:394:7:394:47 | ... == ... | test.cpp:394:7:394:10 | 0 | != | test.cpp:394:15:394:34 | call to returnAIfNoneAreNull | 0 | test.cpp:396:10:397:7 | { ... } |
+| test.cpp:394:7:394:47 | ... == ... | test.cpp:394:7:394:10 | 0 | == | test.cpp:394:15:394:34 | call to returnAIfNoneAreNull | 0 | test.cpp:394:50:395:7 | { ... } |
+| test.cpp:394:7:394:47 | ... == ... | test.cpp:394:15:394:34 | call to returnAIfNoneAreNull | != | test.cpp:394:7:394:10 | 0 | 0 | test.cpp:396:10:397:7 | { ... } |
+| test.cpp:394:7:394:47 | ... == ... | test.cpp:394:15:394:34 | call to returnAIfNoneAreNull | == | test.cpp:394:7:394:10 | 0 | 0 | test.cpp:394:50:395:7 | { ... } |
 unary
 | test.c:7:9:7:13 | ... > ... | test.c:7:9:7:9 | x | < | 1 | test.c:10:12:11:14 | { ... } |
 | test.c:7:9:7:13 | ... > ... | test.c:7:9:7:9 | x | >= | 1 | test.c:7:16:9:14 | { ... } |
@@ -736,11 +762,17 @@ unary
 | test.c:126:7:126:7 | 1 | test.c:126:7:126:7 | 1 | == | 1 | test.c:131:10:132:16 | { ... } |
 | test.c:126:7:126:7 | 1 | test.c:126:7:126:7 | 1 | == | 1 | test.c:134:1:123:10 | return ... |
 | test.c:126:7:126:28 | ... && ... | test.c:126:7:126:7 | 1 | != | 0 | test.c:126:31:128:16 | { ... } |
+| test.c:126:7:126:28 | ... && ... | test.c:126:7:126:7 | 1 | != | 0 | test.c:131:10:132:16 | { ... } |
 | test.c:126:7:126:28 | ... && ... | test.c:126:7:126:7 | 1 | == | 1 | test.c:126:31:128:16 | { ... } |
+| test.c:126:7:126:28 | ... && ... | test.c:126:7:126:7 | 1 | == | 1 | test.c:131:10:132:16 | { ... } |
 | test.c:126:7:126:28 | ... && ... | test.c:126:12:126:26 | call to test3_condition | != | 0 | test.c:126:31:128:16 | { ... } |
+| test.c:126:7:126:28 | ... && ... | test.c:126:12:126:26 | call to test3_condition | != | 0 | test.c:131:10:132:16 | { ... } |
 | test.c:126:7:126:28 | ... && ... | test.c:126:12:126:26 | call to test3_condition | == | 1 | test.c:126:31:128:16 | { ... } |
+| test.c:126:7:126:28 | ... && ... | test.c:126:12:126:26 | call to test3_condition | == | 1 | test.c:131:10:132:16 | { ... } |
 | test.c:126:12:126:26 | call to test3_condition | test.c:126:12:126:26 | call to test3_condition | != | 0 | test.c:126:31:128:16 | { ... } |
+| test.c:126:12:126:26 | call to test3_condition | test.c:126:12:126:26 | call to test3_condition | != | 0 | test.c:131:10:132:16 | { ... } |
 | test.c:126:12:126:26 | call to test3_condition | test.c:126:12:126:26 | call to test3_condition | == | 1 | test.c:126:31:128:16 | { ... } |
+| test.c:126:12:126:26 | call to test3_condition | test.c:126:12:126:26 | call to test3_condition | == | 1 | test.c:131:10:132:16 | { ... } |
 | test.c:131:7:131:7 | b | test.c:131:7:131:7 | b | != | 0 | test.c:131:10:132:16 | { ... } |
 | test.c:131:7:131:7 | b | test.c:131:7:131:7 | b | == | 1 | test.c:131:10:132:16 | { ... } |
 | test.c:137:7:137:7 | 0 | test.c:137:7:137:7 | 0 | != | 1 | test.c:142:3:136:10 | return ... |
@@ -835,8 +867,14 @@ unary
 | test.cpp:31:7:31:13 | ... == ... | test.cpp:31:7:31:13 | ... == ... | == | 1 | test.cpp:31:16:32:21 | { ... } |
 | test.cpp:42:13:42:20 | call to getABool | test.cpp:42:13:42:20 | call to getABool | != | 0 | test.cpp:43:9:45:23 | { ... } |
 | test.cpp:42:13:42:20 | call to getABool | test.cpp:42:13:42:20 | call to getABool | == | 1 | test.cpp:43:9:45:23 | { ... } |
+| test.cpp:60:31:60:31 | i | test.cpp:61:10:61:10 | i | == | 0 | test.cpp:62:5:64:12 | case ...: |
+| test.cpp:60:31:60:31 | i | test.cpp:61:10:61:10 | i | == | 1 | test.cpp:65:5:66:10 | case ...: |
 | test.cpp:61:10:61:10 | i | test.cpp:61:10:61:10 | i | == | 0 | test.cpp:62:5:64:12 | case ...: |
 | test.cpp:61:10:61:10 | i | test.cpp:61:10:61:10 | i | == | 1 | test.cpp:65:5:66:10 | case ...: |
+| test.cpp:73:30:73:30 | i | test.cpp:74:10:74:10 | i | < | 11 | test.cpp:75:5:77:12 | case ...: |
+| test.cpp:73:30:73:30 | i | test.cpp:74:10:74:10 | i | < | 21 | test.cpp:78:5:79:10 | case ...: |
+| test.cpp:73:30:73:30 | i | test.cpp:74:10:74:10 | i | >= | 0 | test.cpp:75:5:77:12 | case ...: |
+| test.cpp:73:30:73:30 | i | test.cpp:74:10:74:10 | i | >= | 11 | test.cpp:78:5:79:10 | case ...: |
 | test.cpp:74:10:74:10 | i | test.cpp:74:10:74:10 | i | < | 11 | test.cpp:75:5:77:12 | case ...: |
 | test.cpp:74:10:74:10 | i | test.cpp:74:10:74:10 | i | < | 21 | test.cpp:78:5:79:10 | case ...: |
 | test.cpp:74:10:74:10 | i | test.cpp:74:10:74:10 | i | >= | 0 | test.cpp:75:5:77:12 | case ...: |
@@ -849,6 +887,10 @@ unary
 | test.cpp:105:6:105:14 | ... != ... | test.cpp:105:6:105:14 | ... != ... | == | 1 | test.cpp:105:17:106:7 | { ... } |
 | test.cpp:111:6:111:14 | ... != ... | test.cpp:111:6:111:14 | ... != ... | != | 0 | test.cpp:111:17:112:7 | { ... } |
 | test.cpp:111:6:111:14 | ... != ... | test.cpp:111:6:111:14 | ... != ... | == | 1 | test.cpp:111:17:112:7 | { ... } |
+| test.cpp:119:16:119:16 | b | test.cpp:122:9:122:9 | b | != | 0 | test.cpp:123:5:125:20 | { ... } |
+| test.cpp:119:16:119:16 | b | test.cpp:122:9:122:9 | b | != | 0 | test.cpp:125:23:125:29 | return ... |
+| test.cpp:119:16:119:16 | b | test.cpp:122:9:122:9 | b | == | 1 | test.cpp:123:5:125:20 | { ... } |
+| test.cpp:119:16:119:16 | b | test.cpp:122:9:122:9 | b | == | 1 | test.cpp:125:23:125:29 | return ... |
 | test.cpp:122:9:122:9 | b | test.cpp:122:9:122:9 | b | != | 0 | test.cpp:123:5:125:20 | { ... } |
 | test.cpp:122:9:122:9 | b | test.cpp:122:9:122:9 | b | != | 0 | test.cpp:125:23:125:29 | return ... |
 | test.cpp:122:9:122:9 | b | test.cpp:122:9:122:9 | b | == | 1 | test.cpp:123:5:125:20 | { ... } |
@@ -871,6 +913,11 @@ unary
 | test.cpp:145:6:145:21 | call to __builtin_expect | test.cpp:145:6:145:21 | call to __builtin_expect | != | 0 | test.cpp:145:36:146:9 | { ... } |
 | test.cpp:145:6:145:21 | call to __builtin_expect | test.cpp:145:6:145:21 | call to __builtin_expect | == | 1 | test.cpp:145:36:146:9 | { ... } |
 | test.cpp:145:6:145:21 | call to __builtin_expect | test.cpp:145:23:145:23 | a | != | 42 | test.cpp:145:36:146:9 | { ... } |
+| test.cpp:151:8:151:13 | ... < ... | test.cpp:151:8:151:8 | a | >= | 10 | test.cpp:152:11:153:9 | { ... } |
+| test.cpp:151:8:151:13 | ... < ... | test.cpp:151:8:151:13 | ... < ... | != | 1 | test.cpp:152:11:153:9 | { ... } |
+| test.cpp:151:8:151:13 | ... < ... | test.cpp:151:8:151:13 | ... < ... | == | 0 | test.cpp:152:11:153:9 | { ... } |
+| test.cpp:151:8:151:13 | ... < ... | test.cpp:152:8:152:8 | b | != | 1 | test.cpp:152:11:153:9 | { ... } |
+| test.cpp:151:8:151:13 | ... < ... | test.cpp:152:8:152:8 | b | == | 0 | test.cpp:152:11:153:9 | { ... } |
 | test.cpp:152:7:152:8 | ! ... | test.cpp:151:8:151:8 | a | >= | 10 | test.cpp:152:11:153:9 | { ... } |
 | test.cpp:152:7:152:8 | ! ... | test.cpp:151:8:151:13 | ... < ... | != | 1 | test.cpp:152:11:153:9 | { ... } |
 | test.cpp:152:7:152:8 | ! ... | test.cpp:151:8:151:13 | ... < ... | == | 0 | test.cpp:152:11:153:9 | { ... } |
@@ -885,6 +932,10 @@ unary
 | test.cpp:152:8:152:8 | b | test.cpp:152:7:152:8 | ! ... | == | 1 | test.cpp:152:11:153:9 | { ... } |
 | test.cpp:152:8:152:8 | b | test.cpp:152:8:152:8 | b | != | 1 | test.cpp:152:11:153:9 | { ... } |
 | test.cpp:152:8:152:8 | b | test.cpp:152:8:152:8 | b | == | 0 | test.cpp:152:11:153:9 | { ... } |
+| test.cpp:158:12:158:17 | ... != ... | test.cpp:158:12:158:17 | ... != ... | != | 1 | test.cpp:160:11:162:3 | { ... } |
+| test.cpp:158:12:158:17 | ... != ... | test.cpp:158:12:158:17 | ... != ... | == | 0 | test.cpp:160:11:162:3 | { ... } |
+| test.cpp:158:12:158:17 | ... != ... | test.cpp:160:8:160:8 | c | != | 1 | test.cpp:160:11:162:3 | { ... } |
+| test.cpp:158:12:158:17 | ... != ... | test.cpp:160:8:160:8 | c | == | 0 | test.cpp:160:11:162:3 | { ... } |
 | test.cpp:160:7:160:8 | ! ... | test.cpp:158:12:158:17 | ... != ... | != | 1 | test.cpp:160:11:162:3 | { ... } |
 | test.cpp:160:7:160:8 | ! ... | test.cpp:158:12:158:17 | ... != ... | == | 0 | test.cpp:160:11:162:3 | { ... } |
 | test.cpp:160:7:160:8 | ! ... | test.cpp:160:7:160:8 | ! ... | != | 0 | test.cpp:160:11:162:3 | { ... } |
@@ -897,6 +948,11 @@ unary
 | test.cpp:160:8:160:8 | c | test.cpp:160:7:160:8 | ! ... | == | 1 | test.cpp:160:11:162:3 | { ... } |
 | test.cpp:160:8:160:8 | c | test.cpp:160:8:160:8 | c | != | 1 | test.cpp:160:11:162:3 | { ... } |
 | test.cpp:160:8:160:8 | c | test.cpp:160:8:160:8 | c | == | 0 | test.cpp:160:11:162:3 | { ... } |
+| test.cpp:166:12:166:17 | ... > ... | test.cpp:166:12:166:12 | a | < | 11 | test.cpp:168:11:170:3 | { ... } |
+| test.cpp:166:12:166:17 | ... > ... | test.cpp:166:12:166:17 | ... > ... | != | 1 | test.cpp:168:11:170:3 | { ... } |
+| test.cpp:166:12:166:17 | ... > ... | test.cpp:166:12:166:17 | ... > ... | == | 0 | test.cpp:168:11:170:3 | { ... } |
+| test.cpp:166:12:166:17 | ... > ... | test.cpp:168:8:168:8 | b | != | 1 | test.cpp:168:11:170:3 | { ... } |
+| test.cpp:166:12:166:17 | ... > ... | test.cpp:168:8:168:8 | b | == | 0 | test.cpp:168:11:170:3 | { ... } |
 | test.cpp:168:7:168:8 | ! ... | test.cpp:166:12:166:12 | a | < | 11 | test.cpp:168:11:170:3 | { ... } |
 | test.cpp:168:7:168:8 | ! ... | test.cpp:166:12:166:17 | ... > ... | != | 1 | test.cpp:168:11:170:3 | { ... } |
 | test.cpp:168:7:168:8 | ! ... | test.cpp:166:12:166:17 | ... > ... | == | 0 | test.cpp:168:11:170:3 | { ... } |
@@ -911,6 +967,10 @@ unary
 | test.cpp:168:8:168:8 | b | test.cpp:168:7:168:8 | ! ... | == | 1 | test.cpp:168:11:170:3 | { ... } |
 | test.cpp:168:8:168:8 | b | test.cpp:168:8:168:8 | b | != | 1 | test.cpp:168:11:170:3 | { ... } |
 | test.cpp:168:8:168:8 | b | test.cpp:168:8:168:8 | b | == | 0 | test.cpp:168:11:170:3 | { ... } |
+| test.cpp:174:12:174:16 | ... > ... | test.cpp:174:12:174:16 | ... > ... | != | 1 | test.cpp:176:11:178:3 | { ... } |
+| test.cpp:174:12:174:16 | ... > ... | test.cpp:174:12:174:16 | ... > ... | == | 0 | test.cpp:176:11:178:3 | { ... } |
+| test.cpp:174:12:174:16 | ... > ... | test.cpp:176:8:176:8 | c | != | 1 | test.cpp:176:11:178:3 | { ... } |
+| test.cpp:174:12:174:16 | ... > ... | test.cpp:176:8:176:8 | c | == | 0 | test.cpp:176:11:178:3 | { ... } |
 | test.cpp:176:7:176:8 | ! ... | test.cpp:174:12:174:16 | ... > ... | != | 1 | test.cpp:176:11:178:3 | { ... } |
 | test.cpp:176:7:176:8 | ! ... | test.cpp:174:12:174:16 | ... > ... | == | 0 | test.cpp:176:11:178:3 | { ... } |
 | test.cpp:176:7:176:8 | ! ... | test.cpp:176:7:176:8 | ! ... | != | 0 | test.cpp:176:11:178:3 | { ... } |
@@ -923,6 +983,16 @@ unary
 | test.cpp:176:8:176:8 | c | test.cpp:176:7:176:8 | ! ... | == | 1 | test.cpp:176:11:178:3 | { ... } |
 | test.cpp:176:8:176:8 | c | test.cpp:176:8:176:8 | c | != | 1 | test.cpp:176:11:178:3 | { ... } |
 | test.cpp:176:8:176:8 | c | test.cpp:176:8:176:8 | c | == | 0 | test.cpp:176:11:178:3 | { ... } |
+| test.cpp:181:28:181:29 | b1 | test.cpp:182:8:182:9 | b1 | != | 0 | test.cpp:181:41:182:9 | { ... } |
+| test.cpp:181:28:181:29 | b1 | test.cpp:182:8:182:9 | b1 | != | 0 | test.cpp:182:14:182:15 | b2 |
+| test.cpp:181:28:181:29 | b1 | test.cpp:182:8:182:9 | b1 | != | 0 | test.cpp:185:10:188:7 | { ... } |
+| test.cpp:181:28:181:29 | b1 | test.cpp:182:8:182:9 | b1 | == | 1 | test.cpp:181:41:182:9 | { ... } |
+| test.cpp:181:28:181:29 | b1 | test.cpp:182:8:182:9 | b1 | == | 1 | test.cpp:182:14:182:15 | b2 |
+| test.cpp:181:28:181:29 | b1 | test.cpp:182:8:182:9 | b1 | == | 1 | test.cpp:185:10:188:7 | { ... } |
+| test.cpp:181:37:181:38 | b2 | test.cpp:182:14:182:15 | b2 | != | 0 | test.cpp:181:41:182:9 | { ... } |
+| test.cpp:181:37:181:38 | b2 | test.cpp:182:14:182:15 | b2 | != | 0 | test.cpp:185:10:188:7 | { ... } |
+| test.cpp:181:37:181:38 | b2 | test.cpp:182:14:182:15 | b2 | == | 1 | test.cpp:181:41:182:9 | { ... } |
+| test.cpp:181:37:181:38 | b2 | test.cpp:182:14:182:15 | b2 | == | 1 | test.cpp:185:10:188:7 | { ... } |
 | test.cpp:182:6:182:16 | ! ... | test.cpp:182:6:182:16 | ! ... | != | 0 | test.cpp:182:19:184:7 | { ... } |
 | test.cpp:182:6:182:16 | ! ... | test.cpp:182:6:182:16 | ! ... | != | 1 | test.cpp:185:10:188:7 | { ... } |
 | test.cpp:182:6:182:16 | ! ... | test.cpp:182:6:182:16 | ! ... | == | 0 | test.cpp:185:10:188:7 | { ... } |
@@ -937,8 +1007,10 @@ unary
 | test.cpp:182:6:182:16 | ! ... | test.cpp:182:14:182:15 | b2 | == | 1 | test.cpp:185:10:188:7 | { ... } |
 | test.cpp:182:8:182:9 | b1 | test.cpp:182:8:182:9 | b1 | != | 0 | test.cpp:181:41:182:9 | { ... } |
 | test.cpp:182:8:182:9 | b1 | test.cpp:182:8:182:9 | b1 | != | 0 | test.cpp:182:14:182:15 | b2 |
+| test.cpp:182:8:182:9 | b1 | test.cpp:182:8:182:9 | b1 | != | 0 | test.cpp:185:10:188:7 | { ... } |
 | test.cpp:182:8:182:9 | b1 | test.cpp:182:8:182:9 | b1 | == | 1 | test.cpp:181:41:182:9 | { ... } |
 | test.cpp:182:8:182:9 | b1 | test.cpp:182:8:182:9 | b1 | == | 1 | test.cpp:182:14:182:15 | b2 |
+| test.cpp:182:8:182:9 | b1 | test.cpp:182:8:182:9 | b1 | == | 1 | test.cpp:185:10:188:7 | { ... } |
 | test.cpp:182:8:182:15 | ... && ... | test.cpp:182:6:182:16 | ! ... | != | 0 | test.cpp:182:19:184:7 | { ... } |
 | test.cpp:182:8:182:15 | ... && ... | test.cpp:182:6:182:16 | ! ... | != | 1 | test.cpp:181:41:182:9 | { ... } |
 | test.cpp:182:8:182:15 | ... && ... | test.cpp:182:6:182:16 | ! ... | != | 1 | test.cpp:185:10:188:7 | { ... } |
@@ -960,7 +1032,19 @@ unary
 | test.cpp:182:8:182:15 | ... && ... | test.cpp:182:14:182:15 | b2 | == | 1 | test.cpp:181:41:182:9 | { ... } |
 | test.cpp:182:8:182:15 | ... && ... | test.cpp:182:14:182:15 | b2 | == | 1 | test.cpp:185:10:188:7 | { ... } |
 | test.cpp:182:14:182:15 | b2 | test.cpp:182:14:182:15 | b2 | != | 0 | test.cpp:181:41:182:9 | { ... } |
+| test.cpp:182:14:182:15 | b2 | test.cpp:182:14:182:15 | b2 | != | 0 | test.cpp:185:10:188:7 | { ... } |
 | test.cpp:182:14:182:15 | b2 | test.cpp:182:14:182:15 | b2 | == | 1 | test.cpp:181:41:182:9 | { ... } |
+| test.cpp:182:14:182:15 | b2 | test.cpp:182:14:182:15 | b2 | == | 1 | test.cpp:185:10:188:7 | { ... } |
+| test.cpp:192:27:192:28 | b1 | test.cpp:193:8:193:9 | b1 | != | 1 | test.cpp:192:40:193:9 | { ... } |
+| test.cpp:192:27:192:28 | b1 | test.cpp:193:8:193:9 | b1 | != | 1 | test.cpp:193:14:193:15 | b2 |
+| test.cpp:192:27:192:28 | b1 | test.cpp:193:8:193:9 | b1 | != | 1 | test.cpp:193:19:196:7 | { ... } |
+| test.cpp:192:27:192:28 | b1 | test.cpp:193:8:193:9 | b1 | == | 0 | test.cpp:192:40:193:9 | { ... } |
+| test.cpp:192:27:192:28 | b1 | test.cpp:193:8:193:9 | b1 | == | 0 | test.cpp:193:14:193:15 | b2 |
+| test.cpp:192:27:192:28 | b1 | test.cpp:193:8:193:9 | b1 | == | 0 | test.cpp:193:19:196:7 | { ... } |
+| test.cpp:192:36:192:37 | b2 | test.cpp:193:14:193:15 | b2 | != | 1 | test.cpp:192:40:193:9 | { ... } |
+| test.cpp:192:36:192:37 | b2 | test.cpp:193:14:193:15 | b2 | != | 1 | test.cpp:193:19:196:7 | { ... } |
+| test.cpp:192:36:192:37 | b2 | test.cpp:193:14:193:15 | b2 | == | 0 | test.cpp:192:40:193:9 | { ... } |
+| test.cpp:192:36:192:37 | b2 | test.cpp:193:14:193:15 | b2 | == | 0 | test.cpp:193:19:196:7 | { ... } |
 | test.cpp:193:6:193:16 | ! ... | test.cpp:193:6:193:16 | ! ... | != | 0 | test.cpp:193:19:196:7 | { ... } |
 | test.cpp:193:6:193:16 | ! ... | test.cpp:193:6:193:16 | ! ... | != | 1 | test.cpp:197:10:199:7 | { ... } |
 | test.cpp:193:6:193:16 | ! ... | test.cpp:193:6:193:16 | ! ... | == | 0 | test.cpp:197:10:199:7 | { ... } |
@@ -975,8 +1059,10 @@ unary
 | test.cpp:193:6:193:16 | ! ... | test.cpp:193:14:193:15 | b2 | == | 0 | test.cpp:193:19:196:7 | { ... } |
 | test.cpp:193:8:193:9 | b1 | test.cpp:193:8:193:9 | b1 | != | 1 | test.cpp:192:40:193:9 | { ... } |
 | test.cpp:193:8:193:9 | b1 | test.cpp:193:8:193:9 | b1 | != | 1 | test.cpp:193:14:193:15 | b2 |
+| test.cpp:193:8:193:9 | b1 | test.cpp:193:8:193:9 | b1 | != | 1 | test.cpp:193:19:196:7 | { ... } |
 | test.cpp:193:8:193:9 | b1 | test.cpp:193:8:193:9 | b1 | == | 0 | test.cpp:192:40:193:9 | { ... } |
 | test.cpp:193:8:193:9 | b1 | test.cpp:193:8:193:9 | b1 | == | 0 | test.cpp:193:14:193:15 | b2 |
+| test.cpp:193:8:193:9 | b1 | test.cpp:193:8:193:9 | b1 | == | 0 | test.cpp:193:19:196:7 | { ... } |
 | test.cpp:193:8:193:15 | ... \|\| ... | test.cpp:193:6:193:16 | ! ... | != | 0 | test.cpp:192:40:193:9 | { ... } |
 | test.cpp:193:8:193:15 | ... \|\| ... | test.cpp:193:6:193:16 | ! ... | != | 0 | test.cpp:193:19:196:7 | { ... } |
 | test.cpp:193:8:193:15 | ... \|\| ... | test.cpp:193:6:193:16 | ! ... | != | 1 | test.cpp:197:10:199:7 | { ... } |
@@ -998,7 +1084,9 @@ unary
 | test.cpp:193:8:193:15 | ... \|\| ... | test.cpp:193:14:193:15 | b2 | == | 0 | test.cpp:192:40:193:9 | { ... } |
 | test.cpp:193:8:193:15 | ... \|\| ... | test.cpp:193:14:193:15 | b2 | == | 0 | test.cpp:193:19:196:7 | { ... } |
 | test.cpp:193:14:193:15 | b2 | test.cpp:193:14:193:15 | b2 | != | 1 | test.cpp:192:40:193:9 | { ... } |
+| test.cpp:193:14:193:15 | b2 | test.cpp:193:14:193:15 | b2 | != | 1 | test.cpp:193:19:196:7 | { ... } |
 | test.cpp:193:14:193:15 | b2 | test.cpp:193:14:193:15 | b2 | == | 0 | test.cpp:192:40:193:9 | { ... } |
+| test.cpp:193:14:193:15 | b2 | test.cpp:193:14:193:15 | b2 | == | 0 | test.cpp:193:19:196:7 | { ... } |
 | test.cpp:211:9:211:15 | ... == ... | test.cpp:211:9:211:10 | sc | == | 0 | test.cpp:211:18:212:13 | { ... } |
 | test.cpp:211:9:211:15 | ... == ... | test.cpp:211:9:211:15 | ... == ... | != | 0 | test.cpp:211:18:212:13 | { ... } |
 | test.cpp:211:9:211:15 | ... == ... | test.cpp:211:9:211:15 | ... == ... | == | 1 | test.cpp:211:18:212:13 | { ... } |
@@ -1224,3 +1312,124 @@ unary
 | test.cpp:318:6:318:18 | ... != ... | test.cpp:318:7:318:7 | a | >= | 42 | test.cpp:320:10:322:3 | { ... } |
 | test.cpp:318:6:318:18 | ... != ... | test.cpp:318:7:318:12 | ... < ... | != | 0 | test.cpp:318:21:320:3 | { ... } |
 | test.cpp:318:6:318:18 | ... != ... | test.cpp:318:7:318:12 | ... < ... | == | 0 | test.cpp:320:10:322:3 | { ... } |
+| test.cpp:327:46:327:46 | b | test.cpp:330:7:330:7 | b | != | 0 | test.cpp:331:3:332:10 | { ... } |
+| test.cpp:327:46:327:46 | b | test.cpp:330:7:330:7 | b | == | 1 | test.cpp:331:3:332:10 | { ... } |
+| test.cpp:330:7:330:7 | b | test.cpp:330:7:330:7 | b | != | 0 | test.cpp:331:3:332:10 | { ... } |
+| test.cpp:330:7:330:7 | b | test.cpp:330:7:330:7 | b | == | 1 | test.cpp:331:3:332:10 | { ... } |
+| test.cpp:334:11:334:11 | x | test.cpp:334:11:334:11 | x | < | 51 | test.cpp:336:3:338:7 | case ...: |
+| test.cpp:334:11:334:11 | x | test.cpp:334:11:334:11 | x | >= | 40 | test.cpp:336:3:338:7 | case ...: |
+| test.cpp:349:11:349:22 | call to testNotNull1 | test.cpp:349:11:349:22 | call to testNotNull1 | != | 0 | test.cpp:349:29:349:30 | 42 |
+| test.cpp:349:11:349:22 | call to testNotNull1 | test.cpp:349:11:349:22 | call to testNotNull1 | != | 0 | test.cpp:350:15:351:7 | { ... } |
+| test.cpp:349:11:349:22 | call to testNotNull1 | test.cpp:349:11:349:22 | call to testNotNull1 | != | 1 | test.cpp:349:34:349:34 | 0 |
+| test.cpp:349:11:349:22 | call to testNotNull1 | test.cpp:349:11:349:22 | call to testNotNull1 | == | 0 | test.cpp:349:34:349:34 | 0 |
+| test.cpp:349:11:349:22 | call to testNotNull1 | test.cpp:349:11:349:22 | call to testNotNull1 | == | 1 | test.cpp:349:29:349:30 | 42 |
+| test.cpp:349:11:349:22 | call to testNotNull1 | test.cpp:349:11:349:22 | call to testNotNull1 | == | 1 | test.cpp:350:15:351:7 | { ... } |
+| test.cpp:350:7:350:12 | ... != ... | test.cpp:350:7:350:7 | x | != | 0 | test.cpp:350:15:351:7 | { ... } |
+| test.cpp:350:7:350:12 | ... != ... | test.cpp:350:7:350:12 | ... != ... | != | 0 | test.cpp:350:15:351:7 | { ... } |
+| test.cpp:350:7:350:12 | ... != ... | test.cpp:350:7:350:12 | ... != ... | == | 1 | test.cpp:350:15:351:7 | { ... } |
+| test.cpp:356:7:356:22 | ... == ... | test.cpp:356:7:356:11 | input | != | 0 | test.cpp:357:3:357:13 | return ... |
+| test.cpp:356:7:356:22 | ... == ... | test.cpp:356:7:356:11 | input | == | 0 | test.cpp:356:25:356:36 | return ... |
+| test.cpp:356:7:356:22 | ... == ... | test.cpp:356:7:356:22 | ... == ... | != | 0 | test.cpp:356:25:356:36 | return ... |
+| test.cpp:356:7:356:22 | ... == ... | test.cpp:356:7:356:22 | ... == ... | != | 1 | test.cpp:357:3:357:13 | return ... |
+| test.cpp:356:7:356:22 | ... == ... | test.cpp:356:7:356:22 | ... == ... | == | 0 | test.cpp:357:3:357:13 | return ... |
+| test.cpp:356:7:356:22 | ... == ... | test.cpp:356:7:356:22 | ... == ... | == | 1 | test.cpp:356:25:356:36 | return ... |
+| test.cpp:361:10:361:26 | ... == ... | test.cpp:361:10:361:15 | number | != | 0 | test.cpp:361:35:361:40 | number |
+| test.cpp:361:10:361:26 | ... == ... | test.cpp:361:10:361:15 | number | == | 0 | test.cpp:361:30:361:30 | 0 |
+| test.cpp:361:10:361:26 | ... == ... | test.cpp:361:10:361:26 | ... == ... | != | 0 | test.cpp:361:30:361:30 | 0 |
+| test.cpp:361:10:361:26 | ... == ... | test.cpp:361:10:361:26 | ... == ... | != | 1 | test.cpp:361:35:361:40 | number |
+| test.cpp:361:10:361:26 | ... == ... | test.cpp:361:10:361:26 | ... == ... | == | 0 | test.cpp:361:35:361:40 | number |
+| test.cpp:361:10:361:26 | ... == ... | test.cpp:361:10:361:26 | ... == ... | == | 1 | test.cpp:361:30:361:30 | 0 |
+| test.cpp:365:7:365:9 | ! ... | test.cpp:365:7:365:9 | ! ... | != | 1 | test.cpp:365:15:365:16 | s2 |
+| test.cpp:365:7:365:9 | ! ... | test.cpp:365:7:365:9 | ! ... | != | 1 | test.cpp:366:3:366:12 | return ... |
+| test.cpp:365:7:365:9 | ! ... | test.cpp:365:7:365:9 | ! ... | == | 0 | test.cpp:365:15:365:16 | s2 |
+| test.cpp:365:7:365:9 | ! ... | test.cpp:365:7:365:9 | ! ... | == | 0 | test.cpp:366:3:366:12 | return ... |
+| test.cpp:365:7:365:9 | ! ... | test.cpp:365:8:365:9 | s1 | != | 0 | test.cpp:365:15:365:16 | s2 |
+| test.cpp:365:7:365:9 | ! ... | test.cpp:365:8:365:9 | s1 | != | 0 | test.cpp:366:3:366:12 | return ... |
+| test.cpp:365:7:365:9 | ! ... | test.cpp:365:8:365:9 | s1 | == | 1 | test.cpp:365:15:365:16 | s2 |
+| test.cpp:365:7:365:9 | ! ... | test.cpp:365:8:365:9 | s1 | == | 1 | test.cpp:366:3:366:12 | return ... |
+| test.cpp:365:7:365:16 | ... \|\| ... | test.cpp:365:7:365:9 | ! ... | != | 1 | test.cpp:366:3:366:12 | return ... |
+| test.cpp:365:7:365:16 | ... \|\| ... | test.cpp:365:7:365:9 | ! ... | == | 0 | test.cpp:366:3:366:12 | return ... |
+| test.cpp:365:7:365:16 | ... \|\| ... | test.cpp:365:8:365:9 | s1 | != | 0 | test.cpp:366:3:366:12 | return ... |
+| test.cpp:365:7:365:16 | ... \|\| ... | test.cpp:365:8:365:9 | s1 | == | 1 | test.cpp:366:3:366:12 | return ... |
+| test.cpp:365:7:365:16 | ... \|\| ... | test.cpp:365:14:365:16 | ! ... | != | 1 | test.cpp:366:3:366:12 | return ... |
+| test.cpp:365:7:365:16 | ... \|\| ... | test.cpp:365:14:365:16 | ! ... | == | 0 | test.cpp:366:3:366:12 | return ... |
+| test.cpp:365:7:365:16 | ... \|\| ... | test.cpp:365:15:365:16 | s2 | != | 0 | test.cpp:366:3:366:12 | return ... |
+| test.cpp:365:7:365:16 | ... \|\| ... | test.cpp:365:15:365:16 | s2 | == | 1 | test.cpp:366:3:366:12 | return ... |
+| test.cpp:365:8:365:9 | s1 | test.cpp:365:7:365:9 | ! ... | != | 1 | test.cpp:365:15:365:16 | s2 |
+| test.cpp:365:8:365:9 | s1 | test.cpp:365:7:365:9 | ! ... | != | 1 | test.cpp:366:3:366:12 | return ... |
+| test.cpp:365:8:365:9 | s1 | test.cpp:365:7:365:9 | ! ... | == | 0 | test.cpp:365:15:365:16 | s2 |
+| test.cpp:365:8:365:9 | s1 | test.cpp:365:7:365:9 | ! ... | == | 0 | test.cpp:366:3:366:12 | return ... |
+| test.cpp:365:8:365:9 | s1 | test.cpp:365:8:365:9 | s1 | != | 0 | test.cpp:365:15:365:16 | s2 |
+| test.cpp:365:8:365:9 | s1 | test.cpp:365:8:365:9 | s1 | != | 0 | test.cpp:366:3:366:12 | return ... |
+| test.cpp:365:8:365:9 | s1 | test.cpp:365:8:365:9 | s1 | == | 1 | test.cpp:365:15:365:16 | s2 |
+| test.cpp:365:8:365:9 | s1 | test.cpp:365:8:365:9 | s1 | == | 1 | test.cpp:366:3:366:12 | return ... |
+| test.cpp:365:14:365:16 | ! ... | test.cpp:365:14:365:16 | ! ... | != | 1 | test.cpp:366:3:366:12 | return ... |
+| test.cpp:365:14:365:16 | ! ... | test.cpp:365:14:365:16 | ! ... | == | 0 | test.cpp:366:3:366:12 | return ... |
+| test.cpp:365:14:365:16 | ! ... | test.cpp:365:15:365:16 | s2 | != | 0 | test.cpp:366:3:366:12 | return ... |
+| test.cpp:365:14:365:16 | ! ... | test.cpp:365:15:365:16 | s2 | == | 1 | test.cpp:366:3:366:12 | return ... |
+| test.cpp:365:15:365:16 | s2 | test.cpp:365:14:365:16 | ! ... | != | 1 | test.cpp:366:3:366:12 | return ... |
+| test.cpp:365:15:365:16 | s2 | test.cpp:365:14:365:16 | ! ... | == | 0 | test.cpp:366:3:366:12 | return ... |
+| test.cpp:365:15:365:16 | s2 | test.cpp:365:15:365:16 | s2 | != | 0 | test.cpp:366:3:366:12 | return ... |
+| test.cpp:365:15:365:16 | s2 | test.cpp:365:15:365:16 | s2 | == | 1 | test.cpp:366:3:366:12 | return ... |
+| test.cpp:371:29:371:32 | flag | test.cpp:372:10:372:13 | flag | != | 0 | test.cpp:372:17:372:31 | SUCCESS |
+| test.cpp:371:29:371:32 | flag | test.cpp:372:10:372:13 | flag | != | 1 | test.cpp:372:35:372:49 | FAILURE |
+| test.cpp:371:29:371:32 | flag | test.cpp:372:10:372:13 | flag | == | 0 | test.cpp:372:35:372:49 | FAILURE |
+| test.cpp:371:29:371:32 | flag | test.cpp:372:10:372:13 | flag | == | 1 | test.cpp:372:17:372:31 | SUCCESS |
+| test.cpp:372:10:372:13 | flag | test.cpp:372:10:372:13 | flag | != | 0 | test.cpp:372:17:372:31 | SUCCESS |
+| test.cpp:372:10:372:13 | flag | test.cpp:372:10:372:13 | flag | != | 1 | test.cpp:372:35:372:49 | FAILURE |
+| test.cpp:372:10:372:13 | flag | test.cpp:372:10:372:13 | flag | == | 0 | test.cpp:372:35:372:49 | FAILURE |
+| test.cpp:372:10:372:13 | flag | test.cpp:372:10:372:13 | flag | == | 1 | test.cpp:372:17:372:31 | SUCCESS |
+| test.cpp:376:7:376:18 | call to testNotNull1 | test.cpp:376:7:376:18 | call to testNotNull1 | != | 0 | test.cpp:376:24:377:7 | { ... } |
+| test.cpp:376:7:376:18 | call to testNotNull1 | test.cpp:376:7:376:18 | call to testNotNull1 | != | 1 | test.cpp:378:10:379:7 | { ... } |
+| test.cpp:376:7:376:18 | call to testNotNull1 | test.cpp:376:7:376:18 | call to testNotNull1 | == | 0 | test.cpp:378:10:379:7 | { ... } |
+| test.cpp:376:7:376:18 | call to testNotNull1 | test.cpp:376:7:376:18 | call to testNotNull1 | == | 1 | test.cpp:376:24:377:7 | { ... } |
+| test.cpp:382:7:382:18 | call to testNotNull2 | test.cpp:382:7:382:18 | call to testNotNull2 | != | 0 | test.cpp:382:24:383:7 | { ... } |
+| test.cpp:382:7:382:18 | call to testNotNull2 | test.cpp:382:7:382:18 | call to testNotNull2 | != | 1 | test.cpp:384:10:385:7 | { ... } |
+| test.cpp:382:7:382:18 | call to testNotNull2 | test.cpp:382:7:382:18 | call to testNotNull2 | == | 0 | test.cpp:384:10:385:7 | { ... } |
+| test.cpp:382:7:382:18 | call to testNotNull2 | test.cpp:382:7:382:18 | call to testNotNull2 | == | 1 | test.cpp:382:24:383:7 | { ... } |
+| test.cpp:388:7:388:29 | ... == ... | test.cpp:388:7:388:29 | ... == ... | != | 0 | test.cpp:388:32:389:7 | { ... } |
+| test.cpp:388:7:388:29 | ... == ... | test.cpp:388:7:388:29 | ... == ... | != | 1 | test.cpp:390:10:391:7 | { ... } |
+| test.cpp:388:7:388:29 | ... == ... | test.cpp:388:7:388:29 | ... == ... | == | 0 | test.cpp:390:10:391:7 | { ... } |
+| test.cpp:388:7:388:29 | ... == ... | test.cpp:388:7:388:29 | ... == ... | == | 1 | test.cpp:388:32:389:7 | { ... } |
+| test.cpp:388:7:388:29 | ... == ... | test.cpp:388:12:388:26 | call to getNumOrDefault | != | 0 | test.cpp:390:10:391:7 | { ... } |
+| test.cpp:388:7:388:29 | ... == ... | test.cpp:388:12:388:26 | call to getNumOrDefault | == | 0 | test.cpp:388:32:389:7 | { ... } |
+| test.cpp:394:7:394:47 | ... == ... | test.cpp:394:7:394:47 | ... == ... | != | 0 | test.cpp:394:50:395:7 | { ... } |
+| test.cpp:394:7:394:47 | ... == ... | test.cpp:394:7:394:47 | ... == ... | != | 1 | test.cpp:396:10:397:7 | { ... } |
+| test.cpp:394:7:394:47 | ... == ... | test.cpp:394:7:394:47 | ... == ... | == | 0 | test.cpp:396:10:397:7 | { ... } |
+| test.cpp:394:7:394:47 | ... == ... | test.cpp:394:7:394:47 | ... == ... | == | 1 | test.cpp:394:50:395:7 | { ... } |
+| test.cpp:394:7:394:47 | ... == ... | test.cpp:394:15:394:34 | call to returnAIfNoneAreNull | != | 0 | test.cpp:396:10:397:7 | { ... } |
+| test.cpp:394:7:394:47 | ... == ... | test.cpp:394:15:394:34 | call to returnAIfNoneAreNull | == | 0 | test.cpp:394:50:395:7 | { ... } |
+| test.cpp:400:11:400:25 | call to testEnumWrapper | test.cpp:400:11:400:25 | call to testEnumWrapper | == | 1 | test.cpp:401:5:403:12 | case ...: |
+| test.cpp:400:11:400:25 | call to testEnumWrapper | test.cpp:400:11:400:25 | call to testEnumWrapper | == | 2 | test.cpp:404:5:406:12 | case ...: |
+| test.cpp:411:7:411:8 | ! ... | test.cpp:411:7:411:8 | ! ... | != | 0 | test.cpp:410:6:410:18 | ensureNotNull |
+| test.cpp:411:7:411:8 | ! ... | test.cpp:411:7:411:8 | ! ... | != | 0 | test.cpp:411:11:411:18 | ExprStmt |
+| test.cpp:411:7:411:8 | ! ... | test.cpp:411:7:411:8 | ! ... | != | 1 | test.cpp:410:6:410:18 | ensureNotNull |
+| test.cpp:411:7:411:8 | ! ... | test.cpp:411:7:411:8 | ! ... | != | 1 | test.cpp:412:1:412:1 | return ... |
+| test.cpp:411:7:411:8 | ! ... | test.cpp:411:7:411:8 | ! ... | == | 0 | test.cpp:410:6:410:18 | ensureNotNull |
+| test.cpp:411:7:411:8 | ! ... | test.cpp:411:7:411:8 | ! ... | == | 0 | test.cpp:412:1:412:1 | return ... |
+| test.cpp:411:7:411:8 | ! ... | test.cpp:411:7:411:8 | ! ... | == | 1 | test.cpp:410:6:410:18 | ensureNotNull |
+| test.cpp:411:7:411:8 | ! ... | test.cpp:411:7:411:8 | ! ... | == | 1 | test.cpp:411:11:411:18 | ExprStmt |
+| test.cpp:411:7:411:8 | ! ... | test.cpp:411:8:411:8 | o | != | 0 | test.cpp:410:6:410:18 | ensureNotNull |
+| test.cpp:411:7:411:8 | ! ... | test.cpp:411:8:411:8 | o | != | 0 | test.cpp:412:1:412:1 | return ... |
+| test.cpp:411:7:411:8 | ! ... | test.cpp:411:8:411:8 | o | != | 1 | test.cpp:410:6:410:18 | ensureNotNull |
+| test.cpp:411:7:411:8 | ! ... | test.cpp:411:8:411:8 | o | != | 1 | test.cpp:411:11:411:18 | ExprStmt |
+| test.cpp:411:7:411:8 | ! ... | test.cpp:411:8:411:8 | o | == | 0 | test.cpp:410:6:410:18 | ensureNotNull |
+| test.cpp:411:7:411:8 | ! ... | test.cpp:411:8:411:8 | o | == | 0 | test.cpp:411:11:411:18 | ExprStmt |
+| test.cpp:411:7:411:8 | ! ... | test.cpp:411:8:411:8 | o | == | 1 | test.cpp:410:6:410:18 | ensureNotNull |
+| test.cpp:411:7:411:8 | ! ... | test.cpp:411:8:411:8 | o | == | 1 | test.cpp:412:1:412:1 | return ... |
+| test.cpp:411:8:411:8 | o | test.cpp:411:7:411:8 | ! ... | != | 0 | test.cpp:410:6:410:18 | ensureNotNull |
+| test.cpp:411:8:411:8 | o | test.cpp:411:7:411:8 | ! ... | != | 0 | test.cpp:411:11:411:18 | ExprStmt |
+| test.cpp:411:8:411:8 | o | test.cpp:411:7:411:8 | ! ... | != | 1 | test.cpp:410:6:410:18 | ensureNotNull |
+| test.cpp:411:8:411:8 | o | test.cpp:411:7:411:8 | ! ... | != | 1 | test.cpp:412:1:412:1 | return ... |
+| test.cpp:411:8:411:8 | o | test.cpp:411:7:411:8 | ! ... | == | 0 | test.cpp:410:6:410:18 | ensureNotNull |
+| test.cpp:411:8:411:8 | o | test.cpp:411:7:411:8 | ! ... | == | 0 | test.cpp:412:1:412:1 | return ... |
+| test.cpp:411:8:411:8 | o | test.cpp:411:7:411:8 | ! ... | == | 1 | test.cpp:410:6:410:18 | ensureNotNull |
+| test.cpp:411:8:411:8 | o | test.cpp:411:7:411:8 | ! ... | == | 1 | test.cpp:411:11:411:18 | ExprStmt |
+| test.cpp:411:8:411:8 | o | test.cpp:411:8:411:8 | o | != | 0 | test.cpp:410:6:410:18 | ensureNotNull |
+| test.cpp:411:8:411:8 | o | test.cpp:411:8:411:8 | o | != | 0 | test.cpp:412:1:412:1 | return ... |
+| test.cpp:411:8:411:8 | o | test.cpp:411:8:411:8 | o | != | 1 | test.cpp:410:6:410:18 | ensureNotNull |
+| test.cpp:411:8:411:8 | o | test.cpp:411:8:411:8 | o | != | 1 | test.cpp:411:11:411:18 | ExprStmt |
+| test.cpp:411:8:411:8 | o | test.cpp:411:8:411:8 | o | == | 0 | test.cpp:410:6:410:18 | ensureNotNull |
+| test.cpp:411:8:411:8 | o | test.cpp:411:8:411:8 | o | == | 0 | test.cpp:411:11:411:18 | ExprStmt |
+| test.cpp:411:8:411:8 | o | test.cpp:411:8:411:8 | o | == | 1 | test.cpp:410:6:410:18 | ensureNotNull |
+| test.cpp:411:8:411:8 | o | test.cpp:411:8:411:8 | o | == | 1 | test.cpp:412:1:412:1 | return ... |
diff --git a/cpp/ql/test/library-tests/controlflow/guards/GuardsInline.expected b/cpp/ql/test/library-tests/controlflow/guards/GuardsInline.expected
new file mode 100644
index 00000000000..afc6f314316
--- /dev/null
+++ b/cpp/ql/test/library-tests/controlflow/guards/GuardsInline.expected
@@ -0,0 +1,31 @@
+| test.cpp:351:5:351:7 | Call: call to chk | '42:not 0' |
+| test.cpp:351:5:351:7 | Call: call to chk | '... ? ... : ...:not 0' |
+| test.cpp:351:5:351:7 | Call: call to chk | 'call to testNotNull1:true' |
+| test.cpp:351:5:351:7 | Call: call to chk | 'x != 0:true' |
+| test.cpp:351:5:351:7 | Call: call to chk | 'x:not 0' |
+| test.cpp:351:5:351:7 | Call: call to chk | 'y:not null' |
+| test.cpp:377:5:377:7 | Call: call to chk | 'call to testNotNull1:true' |
+| test.cpp:377:5:377:7 | Call: call to chk | 'p:not null' |
+| test.cpp:379:5:379:7 | Call: call to chk | 'call to testNotNull1:false' |
+| test.cpp:379:5:379:7 | Call: call to chk | p:null |
+| test.cpp:383:5:383:7 | Call: call to chk | 'call to testNotNull2:true' |
+| test.cpp:383:5:383:7 | Call: call to chk | 'p:not null' |
+| test.cpp:385:5:385:7 | Call: call to chk | 'call to testNotNull2:false' |
+| test.cpp:385:5:385:7 | Call: call to chk | p:null |
+| test.cpp:389:5:389:7 | Call: call to chk | '0 == call to getNumOrDefault:true' |
+| test.cpp:389:5:389:7 | Call: call to chk | 'call to getNumOrDefault:0' |
+| test.cpp:391:5:391:7 | Call: call to chk | '0 == call to getNumOrDefault:false' |
+| test.cpp:391:5:391:7 | Call: call to chk | 'call to getNumOrDefault:not 0' |
+| test.cpp:391:5:391:7 | Call: call to chk | 'i:not null' |
+| test.cpp:395:5:395:7 | Call: call to chk | '0 == call to returnAIfNoneAreNull:true' |
+| test.cpp:395:5:395:7 | Call: call to chk | 'call to returnAIfNoneAreNull:0' |
+| test.cpp:397:5:397:7 | Call: call to chk | '0 == call to returnAIfNoneAreNull:false' |
+| test.cpp:397:5:397:7 | Call: call to chk | 'call to returnAIfNoneAreNull:not 0' |
+| test.cpp:397:5:397:7 | Call: call to chk | 's:not null' |
+| test.cpp:397:5:397:7 | Call: call to chk | 'suffix:not null' |
+| test.cpp:402:7:402:9 | Call: call to chk | 'call to testEnumWrapper:1' |
+| test.cpp:402:7:402:9 | Call: call to chk | 'call to testEnumWrapper=SUCCESS:true' |
+| test.cpp:402:7:402:9 | Call: call to chk | b:true |
+| test.cpp:405:7:405:9 | Call: call to chk | 'call to testEnumWrapper:2' |
+| test.cpp:405:7:405:9 | Call: call to chk | 'call to testEnumWrapper=FAILURE:true' |
+| test.cpp:405:7:405:9 | Call: call to chk | b:false |
diff --git a/cpp/ql/test/library-tests/controlflow/guards/GuardsInline.ql b/cpp/ql/test/library-tests/controlflow/guards/GuardsInline.ql
new file mode 100644
index 00000000000..a6875080d37
--- /dev/null
+++ b/cpp/ql/test/library-tests/controlflow/guards/GuardsInline.ql
@@ -0,0 +1,44 @@
+import cpp
+import semmle.code.cpp.controlflow.Guards
+import codeql.util.Boolean
+
+bindingset[s]
+string escape(string s) { if s.matches("% %") then result = "'" + s + "'" else result = s }
+
+Expr getUnconverted(Element e) {
+  not e instanceof Expr and
+  result = e
+  or
+  result = e.(Expr).getUnconverted()
+}
+
+string ppGuard(IRGuardCondition g, GuardValue val) {
+  exists(BinaryOperation bin |
+    bin = getUnconverted(g.getAst()) and
+    result =
+      bin.getLeftOperand() + " " + bin.getOperator() + " " + bin.getRightOperand() + ":" + val
+  )
+  or
+  exists(SwitchCase cc, Expr s, string value |
+    cc = g.getAst() and
+    cc.getExpr() = s and
+    result = cc.getSwitchStmt().getExpr() + "=" + value + ":" + val
+  |
+    value = cc.getExpr().toString()
+    or
+    cc.isDefault() and value = "default"
+  )
+}
+
+query predicate guarded(CallInstruction c, string guard) {
+  c.getStaticCallTarget().hasName("chk") and
+  exists(IRGuardCondition g, IRBlock bb, GuardValue val |
+    g.valueControls(bb, val) and
+    c.getBlock() = bb
+  |
+    guard = escape(ppGuard(g, val))
+    or
+    not exists(ppGuard(g, val)) and
+    guard = escape(getUnconverted(g.getAst()).toString() + ":" + val)
+  )
+}
diff --git a/cpp/ql/test/library-tests/controlflow/guards/GuardsInline.qlref b/cpp/ql/test/library-tests/controlflow/guards/GuardsInline.qlref
new file mode 100644
index 00000000000..5a66d6da1a0
--- /dev/null
+++ b/cpp/ql/test/library-tests/controlflow/guards/GuardsInline.qlref
@@ -0,0 +1,2 @@
+query: GuardsInline.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/cpp/ql/test/library-tests/controlflow/guards/test.cpp b/cpp/ql/test/library-tests/controlflow/guards/test.cpp
index 2ef61734e69..7b042f95e71 100644
--- a/cpp/ql/test/library-tests/controlflow/guards/test.cpp
+++ b/cpp/ql/test/library-tests/controlflow/guards/test.cpp
@@ -320,4 +320,99 @@ void test_cmp_implies_unary(int a) {
   } else {
 
   }
-}
\ No newline at end of file
+}
+
+int foo();
+
+void test_constant_value_and_case_range(bool b)
+{
+  int x = foo();
+  if (b)
+  {
+    x = 42;
+  }
+  switch (x)
+  {
+  case 40 ... 50:
+    // should not be guarded by `foo() = 40..50`
+    use(x);
+  }
+}
+
+void chk();
+
+bool testNotNull1(void* input) {
+  return input != nullptr;
+}
+
+void test_ternary(void* y) {
+  int x = testNotNull1(y) ? 42 : 0;
+  if (x != 0) {
+    chk(); // $ guarded='... ? ... : ...:not 0' guarded='42:not 0' guarded='call to testNotNull1:true' guarded='x != 0:true' guarded='x:not 0' guarded='y:not null'
+  }
+}
+
+bool testNotNull2(void* input) {
+  if (input == nullptr) return false;
+  return true;
+}
+
+int getNumOrDefault(int* number) {
+  return number == nullptr ? 0 : *number;
+}
+
+char returnAIfNoneAreNull(char* s1, char* s2) {
+  if (!s1 || !s2) return '\0';
+  return 'a';
+}
+
+enum class Status { SUCCESS = 1, FAILURE = 2 };
+
+Status testEnumWrapper(bool flag) {
+  return flag ? Status::SUCCESS : Status::FAILURE;
+}
+
+void testWrappers(void* p, int* i, char* s, bool b) {
+  if (testNotNull1(p)) {
+    chk(); // $ guarded='p:not null' guarded='call to testNotNull1:true'
+  } else {
+    chk(); // $ guarded=p:null guarded='call to testNotNull1:false'
+  }
+
+  if (testNotNull2(p)) {
+    chk(); // $ guarded='call to testNotNull2:true' guarded='p:not null'
+  } else {
+    chk(); // $ guarded='call to testNotNull2:false' guarded=p:null
+  }
+
+  if (0 == getNumOrDefault(i)) {
+    chk(); // $ guarded='0 == call to getNumOrDefault:true' guarded='call to getNumOrDefault:0'
+  } else {
+    chk(); // $ guarded='0 == call to getNumOrDefault:false' guarded='call to getNumOrDefault:not 0' guarded='i:not null'
+  }
+
+  if ('\0' == returnAIfNoneAreNull(s, "suffix")) {
+    chk(); // $ guarded='0 == call to returnAIfNoneAreNull:true' guarded='call to returnAIfNoneAreNull:0'
+  } else {
+    chk(); // $ guarded='0 == call to returnAIfNoneAreNull:false' guarded='call to returnAIfNoneAreNull:not 0' guarded='s:not null' guarded='suffix:not null'
+  }
+
+  switch (testEnumWrapper(b)) {
+    case Status::SUCCESS:
+      chk(); // $ guarded='call to testEnumWrapper=SUCCESS:true' guarded='call to testEnumWrapper:1' guarded=b:true 
+      break;
+    case Status::FAILURE:
+      chk(); // $ guarded='call to testEnumWrapper=FAILURE:true' guarded='call to testEnumWrapper:2' guarded=b:false
+      break;
+  }
+}
+
+void ensureNotNull(void* o) {
+  if (!o) throw 42;
+}
+
+void testExceptionWrapper(void* s) {
+  chk(); // nothing guards here
+  ensureNotNull(s);
+  chk(); // $ MISSING: guarded='call to ensureNotNull:no exception' guarded='s:not null'
+}
diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/BarrierGuard.cpp b/cpp/ql/test/library-tests/dataflow/dataflow-tests/BarrierGuard.cpp
index 71d22ad4edd..5cddd92d27b 100644
--- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/BarrierGuard.cpp
+++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/BarrierGuard.cpp
@@ -125,4 +125,67 @@ void test_phi_read_guard_2(bool b) {
   }
   
   sink(x); // $ SPURIOUS: ast
-}
\ No newline at end of file
+}
+
+bool guarded_wrapper(int x) {
+  if(guarded(x)) {
+    return true;
+  } else {
+    return false;
+  }
+}
+
+bool guarded_wrapper_2(int x) {
+  bool b;
+  if(guarded(x)) {
+    b = true;
+  } else {
+    b = false;
+  }
+  return b;
+}
+
+bool guarded_wrapper_3(int x) {
+  bool b = false;
+  if(guarded(x)) {
+    b = true;
+  }
+  return b;
+}
+
+bool guarded_wrapper_4(int x) {
+  bool b = false;
+  if(guarded(x)) {
+    return true;
+  }
+  return b;
+}
+
+void test_guarded_wrapper() {
+  int x = source();
+
+  if(guarded_wrapper(x)) {
+    sink(x); // $ SPURIOUS: ast
+  } else {
+    sink(x); // $ ast,ir
+  }
+
+  if(guarded_wrapper_2(x)) {
+    sink(x); // $ SPURIOUS: ast
+  } else {
+    sink(x); // $ ast,ir
+  }
+
+  if(guarded_wrapper_3(x)) {
+    sink(x); // $ SPURIOUS: ast
+  } else {
+    sink(x); // $ ast,ir
+  }
+
+  if(guarded_wrapper_4(x)) {
+    sink(x); // $ SPURIOUS: ast
+  } else {
+    sink(x); // $ ast,ir
+  }
+}
+
diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/dataflow-consistency.expected b/cpp/ql/test/library-tests/dataflow/dataflow-tests/dataflow-consistency.expected
index cb25f1a21e3..ff41f299f9c 100644
--- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/dataflow-consistency.expected
+++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/dataflow-consistency.expected
@@ -50,37 +50,21 @@ argHasPostUpdate
 postWithInFlow
 | BarrierGuard.cpp:49:6:49:6 | x [post update] | PostUpdateNode should not be the target of local flow. |
 | BarrierGuard.cpp:60:7:60:7 | x [post update] | PostUpdateNode should not be the target of local flow. |
-| clang.cpp:22:9:22:20 | sourceArray1 [inner post update] | PostUpdateNode should not be the target of local flow. |
-| clang.cpp:23:18:23:29 | sourceArray1 [inner post update] | PostUpdateNode should not be the target of local flow. |
 | clang.cpp:29:22:29:23 | m1 [post update] | PostUpdateNode should not be the target of local flow. |
-| clang.cpp:51:3:51:12 | stackArray [inner post update] | PostUpdateNode should not be the target of local flow. |
 | clang.cpp:51:3:51:15 | access to array [post update] | PostUpdateNode should not be the target of local flow. |
 | dispatch.cpp:60:3:60:14 | globalBottom [post update] | PostUpdateNode should not be the target of local flow. |
 | dispatch.cpp:61:3:61:14 | globalMiddle [post update] | PostUpdateNode should not be the target of local flow. |
-| dispatch.cpp:78:24:78:37 | call to allocateBottom [inner post update] | PostUpdateNode should not be the target of local flow. |
 | dispatch.cpp:148:5:148:5 | f [post update] | PostUpdateNode should not be the target of local flow. |
 | dispatch.cpp:168:8:168:8 | f [post update] | PostUpdateNode should not be the target of local flow. |
 | example.c:24:9:24:9 | x [post update] | PostUpdateNode should not be the target of local flow. |
 | example.c:24:20:24:20 | y [post update] | PostUpdateNode should not be the target of local flow. |
 | example.c:26:9:26:9 | x [post update] | PostUpdateNode should not be the target of local flow. |
-| example.c:26:19:26:24 | coords [inner post update] | PostUpdateNode should not be the target of local flow. |
-| example.c:28:23:28:25 | pos [inner post update] | PostUpdateNode should not be the target of local flow. |
 | flowOut.cpp:5:5:5:12 | * ... [post update] | PostUpdateNode should not be the target of local flow. |
-| flowOut.cpp:5:6:5:12 | toTaint [inner post update] | PostUpdateNode should not be the target of local flow. |
 | flowOut.cpp:8:5:8:12 | * ... [post update] | PostUpdateNode should not be the target of local flow. |
-| flowOut.cpp:8:6:8:12 | toTaint [inner post update] | PostUpdateNode should not be the target of local flow. |
-| flowOut.cpp:18:17:18:17 | x [inner post update] | PostUpdateNode should not be the target of local flow. |
-| flowOut.cpp:30:12:30:12 | x [inner post update] | PostUpdateNode should not be the target of local flow. |
-| flowOut.cpp:37:5:37:6 | p2 [inner post update] | PostUpdateNode should not be the target of local flow. |
 | flowOut.cpp:37:5:37:9 | access to array [post update] | PostUpdateNode should not be the target of local flow. |
-| flowOut.cpp:84:3:84:7 | call to deref [inner post update] | PostUpdateNode should not be the target of local flow. |
 | flowOut.cpp:84:3:84:14 | access to array [post update] | PostUpdateNode should not be the target of local flow. |
-| flowOut.cpp:84:10:84:10 | p [inner post update] | PostUpdateNode should not be the target of local flow. |
 | flowOut.cpp:90:3:90:4 | * ... [post update] | PostUpdateNode should not be the target of local flow. |
-| flowOut.cpp:90:4:90:4 | q [inner post update] | PostUpdateNode should not be the target of local flow. |
-| flowOut.cpp:101:14:101:14 | p [inner post update] | PostUpdateNode should not be the target of local flow. |
 | flowOut.cpp:168:3:168:10 | * ... [post update] | PostUpdateNode should not be the target of local flow. |
-| flowOut.cpp:168:4:168:10 | toTaint [inner post update] | PostUpdateNode should not be the target of local flow. |
 | globals.cpp:13:5:13:19 | flowTestGlobal1 [post update] | PostUpdateNode should not be the target of local flow. |
 | globals.cpp:23:5:23:19 | flowTestGlobal2 [post update] | PostUpdateNode should not be the target of local flow. |
 | lambdas.cpp:23:3:23:14 | v [post update] | PostUpdateNode should not be the target of local flow. |
@@ -106,57 +90,30 @@ postWithInFlow
 | ref.cpp:109:9:109:11 | val [post update] | PostUpdateNode should not be the target of local flow. |
 | ref.cpp:113:11:113:13 | val [post update] | PostUpdateNode should not be the target of local flow. |
 | ref.cpp:115:11:115:13 | val [post update] | PostUpdateNode should not be the target of local flow. |
-| self_parameter_flow.cpp:3:4:3:5 | ps [inner post update] | PostUpdateNode should not be the target of local flow. |
-| self_parameter_flow.cpp:8:9:8:9 | s [inner post update] | PostUpdateNode should not be the target of local flow. |
 | test.cpp:91:3:91:9 | source1 [post update] | PostUpdateNode should not be the target of local flow. |
 | test.cpp:115:3:115:6 | * ... [post update] | PostUpdateNode should not be the target of local flow. |
-| test.cpp:115:4:115:6 | out [inner post update] | PostUpdateNode should not be the target of local flow. |
 | test.cpp:120:3:120:6 | * ... [post update] | PostUpdateNode should not be the target of local flow. |
-| test.cpp:120:4:120:6 | out [inner post update] | PostUpdateNode should not be the target of local flow. |
 | test.cpp:125:3:125:6 | * ... [post update] | PostUpdateNode should not be the target of local flow. |
-| test.cpp:125:4:125:6 | out [inner post update] | PostUpdateNode should not be the target of local flow. |
 | test.cpp:333:5:333:13 | globalVar [post update] | PostUpdateNode should not be the target of local flow. |
 | test.cpp:347:5:347:13 | globalVar [post update] | PostUpdateNode should not be the target of local flow. |
 | test.cpp:359:5:359:9 | field [post update] | PostUpdateNode should not be the target of local flow. |
 | test.cpp:373:5:373:9 | field [post update] | PostUpdateNode should not be the target of local flow. |
 | test.cpp:384:10:384:13 | ref arg & ... | PostUpdateNode should not be the target of local flow. |
-| test.cpp:384:11:384:13 | tmp [inner post update] | PostUpdateNode should not be the target of local flow. |
 | test.cpp:391:10:391:13 | ref arg & ... | PostUpdateNode should not be the target of local flow. |
-| test.cpp:391:11:391:13 | tmp [inner post update] | PostUpdateNode should not be the target of local flow. |
 | test.cpp:400:10:400:13 | ref arg & ... | PostUpdateNode should not be the target of local flow. |
-| test.cpp:400:11:400:13 | tmp [inner post update] | PostUpdateNode should not be the target of local flow. |
 | test.cpp:407:10:407:13 | ref arg & ... | PostUpdateNode should not be the target of local flow. |
-| test.cpp:407:11:407:13 | tmp [inner post update] | PostUpdateNode should not be the target of local flow. |
-| test.cpp:423:21:423:25 | local [inner post update] | PostUpdateNode should not be the target of local flow. |
-| test.cpp:441:19:441:23 | local [inner post update] | PostUpdateNode should not be the target of local flow. |
 | test.cpp:472:3:472:4 | * ... [post update] | PostUpdateNode should not be the target of local flow. |
-| test.cpp:472:4:472:4 | p [inner post update] | PostUpdateNode should not be the target of local flow. |
-| test.cpp:477:22:477:22 | x [inner post update] | PostUpdateNode should not be the target of local flow. |
 | test.cpp:506:3:506:4 | * ... [post update] | PostUpdateNode should not be the target of local flow. |
-| test.cpp:506:4:506:4 | p [inner post update] | PostUpdateNode should not be the target of local flow. |
-| test.cpp:512:35:512:35 | x [inner post update] | PostUpdateNode should not be the target of local flow. |
-| test.cpp:519:3:519:12 | stackArray [inner post update] | PostUpdateNode should not be the target of local flow. |
 | test.cpp:519:3:519:15 | access to array [post update] | PostUpdateNode should not be the target of local flow. |
-| test.cpp:520:3:520:12 | stackArray [inner post update] | PostUpdateNode should not be the target of local flow. |
 | test.cpp:520:3:520:15 | access to array [post update] | PostUpdateNode should not be the target of local flow. |
 | test.cpp:526:3:526:4 | * ... [post update] | PostUpdateNode should not be the target of local flow. |
-| test.cpp:526:4:526:4 | e [inner post update] | PostUpdateNode should not be the target of local flow. |
-| test.cpp:531:40:531:40 | e [inner post update] | PostUpdateNode should not be the target of local flow. |
 | test.cpp:537:5:537:6 | * ... [post update] | PostUpdateNode should not be the target of local flow. |
-| test.cpp:537:6:537:6 | p [inner post update] | PostUpdateNode should not be the target of local flow. |
 | test.cpp:542:5:542:6 | * ... [post update] | PostUpdateNode should not be the target of local flow. |
-| test.cpp:542:6:542:6 | p [inner post update] | PostUpdateNode should not be the target of local flow. |
-| test.cpp:548:25:548:25 | x [inner post update] | PostUpdateNode should not be the target of local flow. |
-| test.cpp:552:25:552:25 | y [inner post update] | PostUpdateNode should not be the target of local flow. |
 | test.cpp:562:5:562:13 | globalInt [post update] | PostUpdateNode should not be the target of local flow. |
 | test.cpp:576:5:576:13 | globalInt [post update] | PostUpdateNode should not be the target of local flow. |
-| test.cpp:589:19:589:19 | x [inner post update] | PostUpdateNode should not be the target of local flow. |
-| test.cpp:596:3:596:4 | xs [inner post update] | PostUpdateNode should not be the target of local flow. |
 | test.cpp:596:3:596:7 | access to array [post update] | PostUpdateNode should not be the target of local flow. |
-| test.cpp:602:3:602:3 | p [inner post update] | PostUpdateNode should not be the target of local flow. |
 | test.cpp:602:3:602:7 | access to array [post update] | PostUpdateNode should not be the target of local flow. |
 | test.cpp:608:3:608:4 | * ... [post update] | PostUpdateNode should not be the target of local flow. |
-| test.cpp:608:4:608:4 | p [inner post update] | PostUpdateNode should not be the target of local flow. |
 | test.cpp:639:3:639:3 | x [post update] | PostUpdateNode should not be the target of local flow. |
 | test.cpp:646:3:646:3 | x [post update] | PostUpdateNode should not be the target of local flow. |
 | test.cpp:652:3:652:3 | x [post update] | PostUpdateNode should not be the target of local flow. |
@@ -167,40 +124,23 @@ postWithInFlow
 | test.cpp:681:3:681:3 | s [post update] | PostUpdateNode should not be the target of local flow. |
 | test.cpp:689:3:689:3 | s [post update] | PostUpdateNode should not be the target of local flow. |
 | test.cpp:690:3:690:3 | s [post update] | PostUpdateNode should not be the target of local flow. |
-| test.cpp:694:4:694:6 | buf [inner post update] | PostUpdateNode should not be the target of local flow. |
-| test.cpp:704:23:704:25 | buf [inner post update] | PostUpdateNode should not be the target of local flow. |
-| test.cpp:715:25:715:25 | c [inner post update] | PostUpdateNode should not be the target of local flow. |
 | test.cpp:728:3:728:4 | * ... [post update] | PostUpdateNode should not be the target of local flow. |
-| test.cpp:728:4:728:4 | p [inner post update] | PostUpdateNode should not be the target of local flow. |
-| test.cpp:734:41:734:41 | x [inner post update] | PostUpdateNode should not be the target of local flow. |
 | test.cpp:808:5:808:21 | * ... [post update] | PostUpdateNode should not be the target of local flow. |
-| test.cpp:808:6:808:21 | global_indirect1 [inner post update] | PostUpdateNode should not be the target of local flow. |
 | test.cpp:832:5:832:17 | global_direct [post update] | PostUpdateNode should not be the target of local flow. |
 | test.cpp:931:5:931:18 | global_pointer [post update] | PostUpdateNode should not be the target of local flow. |
 | test.cpp:932:5:932:19 | * ... [post update] | PostUpdateNode should not be the target of local flow. |
-| test.cpp:932:6:932:19 | global_pointer [inner post update] | PostUpdateNode should not be the target of local flow. |
 | test.cpp:1045:9:1045:11 | ref arg buf | PostUpdateNode should not be the target of local flow. |
 | test.cpp:1066:5:1066:5 | i [post update] | PostUpdateNode should not be the target of local flow. |
 | test.cpp:1069:5:1069:5 | i [post update] | PostUpdateNode should not be the target of local flow. |
 | test.cpp:1087:5:1087:11 | content [post update] | PostUpdateNode should not be the target of local flow. |
-| test.cpp:1088:9:1088:9 | a [inner post update] | PostUpdateNode should not be the target of local flow. |
 | test.cpp:1092:5:1092:7 | * ... [post update] | PostUpdateNode should not be the target of local flow. |
-| test.cpp:1092:6:1092:7 | pp [inner post update] | PostUpdateNode should not be the target of local flow. |
-| test.cpp:1098:53:1098:53 | p [inner post update] | PostUpdateNode should not be the target of local flow. |
 | test.cpp:1108:3:1108:4 | * ... [post update] | PostUpdateNode should not be the target of local flow. |
-| test.cpp:1108:4:1108:4 | p [inner post update] | PostUpdateNode should not be the target of local flow. |
 | test.cpp:1109:3:1109:4 | * ... [post update] | PostUpdateNode should not be the target of local flow. |
-| test.cpp:1109:4:1109:4 | p [inner post update] | PostUpdateNode should not be the target of local flow. |
 | test.cpp:1138:3:1138:13 | * ... [post update] | PostUpdateNode should not be the target of local flow. |
-| test.cpp:1138:5:1138:8 | data [inner post update] | PostUpdateNode should not be the target of local flow. |
 | test.cpp:1139:3:1139:7 | * ... [post update] | PostUpdateNode should not be the target of local flow. |
-| test.cpp:1139:4:1139:7 | data [inner post update] | PostUpdateNode should not be the target of local flow. |
 | test.cpp:1153:5:1153:6 | * ... [post update] | PostUpdateNode should not be the target of local flow. |
-| test.cpp:1153:6:1153:6 | p [inner post update] | PostUpdateNode should not be the target of local flow. |
 | test.cpp:1165:5:1165:6 | * ... [post update] | PostUpdateNode should not be the target of local flow. |
-| test.cpp:1165:6:1165:6 | p [inner post update] | PostUpdateNode should not be the target of local flow. |
 | test.cpp:1195:5:1195:6 | * ... [post update] | PostUpdateNode should not be the target of local flow. |
-| test.cpp:1195:6:1195:6 | p [inner post update] | PostUpdateNode should not be the target of local flow. |
 viableImplInCallContextTooLarge
 uniqueParameterNodeAtPosition
 uniqueParameterNodePosition
diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/dispatch.cpp b/cpp/ql/test/library-tests/dataflow/dataflow-tests/dispatch.cpp
index 105212ccca6..63528d712c0 100644
--- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/dispatch.cpp
+++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/dispatch.cpp
@@ -8,7 +8,7 @@ struct Top {
   virtual void isSink(int x) { }
   virtual int notSource1() { return source(); }
   virtual int notSource2() { return source(); }
-  virtual void notSink(int x) { sink(x); } // $ SPURIOUS: ast,ir=37:19 ast,ir=45:18
+  virtual void notSink(int x) { sink(x); } // $ SPURIOUS: ast=37:19 ast=45:18
 };
 
 // This class has the correct behavior for just the functions ending in 2.
@@ -32,16 +32,16 @@ void VirtualDispatch(Bottom *bottomPtr, Bottom &bottomRef) { // $ ast-def=bottom
   sink(topPtr->isSource2()); // $ ir MISSING: ast
   topPtr->isSink(source()); // causing a MISSING for ast
 
-  sink(topPtr->notSource1()); // $ SPURIOUS: ast,ir
-  sink(topPtr->notSource2()); // $ SPURIOUS: ast,ir
+  sink(topPtr->notSource1()); // $ SPURIOUS: ast
+  sink(topPtr->notSource2()); // $ SPURIOUS: ast
   topPtr->notSink(source()); // causing SPURIOUS for ast,ir
 
   sink(topRef.isSource1()); // $ ir MISSING: ast
   sink(topRef.isSource2()); // $ ir MISSING: ast
   topRef.isSink(source()); // causing a MISSING for ast
 
-  sink(topRef.notSource1()); // $ SPURIOUS: ast,ir
-  sink(topRef.notSource2()); // $ SPURIOUS: ast,ir
+  sink(topRef.notSource1()); // $ SPURIOUS: ast
+  sink(topRef.notSource2()); // $ SPURIOUS: ast
   topRef.notSink(source()); // causing SPURIOUS for ast,ir
 }
 
@@ -126,8 +126,8 @@ namespace virtual_inheritance {
     // get flow from a `Middle` value to the call qualifier.
     Top *topPtr = bottomPtr, &topRef = bottomRef;
 
-    sink(topPtr->isSource()); // $ MISSING: ast,ir
-    sink(topRef.isSource()); // $ MISSING: ast,ir
+    sink(topPtr->isSource()); // $ ir MISSING: ast
+    sink(topRef.isSource()); // $ ir MISSING: ast
   }
 }
 
diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/guard-condition-regression-test.ql b/cpp/ql/test/library-tests/dataflow/dataflow-tests/guard-condition-regression-test.ql
index a21cd910a2a..1218fe396c8 100644
--- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/guard-condition-regression-test.ql
+++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/guard-condition-regression-test.ql
@@ -17,7 +17,7 @@ module IRTestAllocationConfig implements DataFlow::ConfigSig {
   }
 
   predicate isBarrier(DataFlow::Node node) {
-    exists(GuardCondition gc | node.asExpr() = gc.getAChild*())
+    exists(GuardCondition gc | node.asExpr() = gc.(Expr).getAChild*())
   }
 }
 
diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/test-source-sink.expected b/cpp/ql/test/library-tests/dataflow/dataflow-tests/test-source-sink.expected
index 6e0b03be9c6..d9ac3c3dee5 100644
--- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/test-source-sink.expected
+++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/test-source-sink.expected
@@ -16,6 +16,14 @@ astFlow
 | BarrierGuard.cpp:90:11:90:16 | call to source | BarrierGuard.cpp:101:8:101:8 | x |
 | BarrierGuard.cpp:107:11:107:16 | call to source | BarrierGuard.cpp:112:8:112:8 | x |
 | BarrierGuard.cpp:116:11:116:16 | call to source | BarrierGuard.cpp:127:8:127:8 | x |
+| BarrierGuard.cpp:165:11:165:16 | call to source | BarrierGuard.cpp:168:10:168:10 | x |
+| BarrierGuard.cpp:165:11:165:16 | call to source | BarrierGuard.cpp:170:10:170:10 | x |
+| BarrierGuard.cpp:165:11:165:16 | call to source | BarrierGuard.cpp:174:10:174:10 | x |
+| BarrierGuard.cpp:165:11:165:16 | call to source | BarrierGuard.cpp:176:10:176:10 | x |
+| BarrierGuard.cpp:165:11:165:16 | call to source | BarrierGuard.cpp:180:10:180:10 | x |
+| BarrierGuard.cpp:165:11:165:16 | call to source | BarrierGuard.cpp:182:10:182:10 | x |
+| BarrierGuard.cpp:165:11:165:16 | call to source | BarrierGuard.cpp:186:10:186:10 | x |
+| BarrierGuard.cpp:165:11:165:16 | call to source | BarrierGuard.cpp:188:10:188:10 | x |
 | acrossLinkTargets.cpp:19:27:19:32 | call to source | acrossLinkTargets.cpp:12:8:12:8 | x |
 | clang.cpp:12:9:12:20 | sourceArray1 | clang.cpp:18:8:18:19 | sourceArray1 |
 | clang.cpp:12:9:12:20 | sourceArray1 | clang.cpp:22:8:22:20 | & ... |
@@ -156,6 +164,10 @@ irFlow
 | BarrierGuard.cpp:49:10:49:15 | call to source | BarrierGuard.cpp:55:13:55:13 | x |
 | BarrierGuard.cpp:60:11:60:16 | call to source | BarrierGuard.cpp:64:14:64:14 | x |
 | BarrierGuard.cpp:60:11:60:16 | call to source | BarrierGuard.cpp:66:14:66:14 | x |
+| BarrierGuard.cpp:165:11:165:16 | call to source | BarrierGuard.cpp:170:10:170:10 | x |
+| BarrierGuard.cpp:165:11:165:16 | call to source | BarrierGuard.cpp:176:10:176:10 | x |
+| BarrierGuard.cpp:165:11:165:16 | call to source | BarrierGuard.cpp:182:10:182:10 | x |
+| BarrierGuard.cpp:165:11:165:16 | call to source | BarrierGuard.cpp:188:10:188:10 | x |
 | acrossLinkTargets.cpp:19:27:19:32 | call to source | acrossLinkTargets.cpp:12:8:12:8 | x |
 | clang.cpp:12:9:12:20 | sourceArray1 | clang.cpp:18:8:18:19 | sourceArray1 |
 | clang.cpp:12:9:12:20 | sourceArray1 | clang.cpp:23:17:23:29 | *& ... |
@@ -169,10 +181,6 @@ irFlow
 | clang.cpp:50:35:50:40 | call to source | clang.cpp:53:17:53:26 | *stackArray |
 | clang.cpp:51:19:51:24 | call to source | clang.cpp:53:17:53:26 | *stackArray |
 | clang.cpp:57:21:57:28 | call to source | clang.cpp:59:8:59:8 | d |
-| dispatch.cpp:9:37:9:42 | call to source | dispatch.cpp:35:16:35:25 | call to notSource1 |
-| dispatch.cpp:9:37:9:42 | call to source | dispatch.cpp:43:15:43:24 | call to notSource1 |
-| dispatch.cpp:10:37:10:42 | call to source | dispatch.cpp:36:16:36:25 | call to notSource2 |
-| dispatch.cpp:10:37:10:42 | call to source | dispatch.cpp:44:15:44:24 | call to notSource2 |
 | dispatch.cpp:16:37:16:42 | call to source | dispatch.cpp:32:16:32:24 | call to isSource2 |
 | dispatch.cpp:16:37:16:42 | call to source | dispatch.cpp:40:15:40:23 | call to isSource2 |
 | dispatch.cpp:22:37:22:42 | call to source | dispatch.cpp:31:16:31:24 | call to isSource1 |
@@ -180,13 +188,13 @@ irFlow
 | dispatch.cpp:22:37:22:42 | call to source | dispatch.cpp:55:22:55:30 | call to isSource1 |
 | dispatch.cpp:22:37:22:42 | call to source | dispatch.cpp:58:28:58:36 | call to isSource1 |
 | dispatch.cpp:33:18:33:23 | call to source | dispatch.cpp:23:38:23:38 | x |
-| dispatch.cpp:37:19:37:24 | call to source | dispatch.cpp:11:38:11:38 | x |
 | dispatch.cpp:41:17:41:22 | call to source | dispatch.cpp:23:38:23:38 | x |
-| dispatch.cpp:45:18:45:23 | call to source | dispatch.cpp:11:38:11:38 | x |
 | dispatch.cpp:69:15:69:20 | call to source | dispatch.cpp:23:38:23:38 | x |
 | dispatch.cpp:73:14:73:19 | call to source | dispatch.cpp:23:38:23:38 | x |
 | dispatch.cpp:81:13:81:18 | call to source | dispatch.cpp:23:38:23:38 | x |
 | dispatch.cpp:107:17:107:22 | call to source | dispatch.cpp:96:8:96:8 | x |
+| dispatch.cpp:117:38:117:43 | call to source | dispatch.cpp:129:18:129:25 | call to isSource |
+| dispatch.cpp:117:38:117:43 | call to source | dispatch.cpp:130:17:130:24 | call to isSource |
 | dispatch.cpp:140:8:140:13 | call to source | dispatch.cpp:96:8:96:8 | x |
 | dispatch.cpp:144:8:144:13 | call to source | dispatch.cpp:96:8:96:8 | x |
 | flowOut.cpp:5:16:5:21 | call to source | flowOut.cpp:31:9:31:9 | x |
diff --git a/cpp/ql/test/library-tests/dataflow/dispatch/test.cpp b/cpp/ql/test/library-tests/dataflow/dispatch/test.cpp
new file mode 100644
index 00000000000..f243b76ad14
--- /dev/null
+++ b/cpp/ql/test/library-tests/dataflow/dispatch/test.cpp
@@ -0,0 +1,127 @@
+struct Base {
+  void f();
+  virtual void virtual_f();
+};
+
+struct Derived : Base {
+  void f();
+  void virtual_f();
+};
+
+void test_simple() {
+  Base b;
+  b.f(); // $ target=2
+  b.virtual_f(); // $ target=3
+
+  Derived d;
+  d.f(); // $ target=7
+  d.virtual_f(); // $ target=8
+
+  Base* b_ptr = &d;
+  b_ptr->f(); // $ target=2
+  b_ptr->virtual_f(); // $ target=8
+
+  Base& b_ref = d;
+  b_ref.f(); // $ target=2
+  b_ref.virtual_f(); // $ target=8
+
+  Base* b_null = nullptr;
+  b_null->f(); // $ target=2
+  b_null->virtual_f(); // $ target=3
+
+  Base* base_is_derived = new Derived();
+  base_is_derived->f(); // $ target=2
+  base_is_derived->virtual_f(); // $ target=8
+
+  Base* base_is_base = new Base();
+  base_is_base->f(); // $ target=2
+  base_is_base->virtual_f(); // $ target=3
+
+  Derived* derived_is_derived = new Derived();
+  derived_is_derived->f(); // $ target=7
+  derived_is_derived->virtual_f(); // $ target=8
+
+  Base& b_ref2 = b;
+  b_ref2 = d;
+  b_ref2.f(); // $ target=2
+  b_ref2.virtual_f(); // $ target=3
+}
+
+struct S {
+  Base* b1;
+  Base* b2;
+};
+
+void test_fields() {
+  S s;
+
+  s.b1 = new Base();
+  s.b2 = new Derived();
+
+  s.b1->virtual_f(); // $ target=3
+  s.b2->virtual_f(); // $ target=8
+
+  s.b1 = new Derived();
+  s.b2 = new Base();
+  s.b1->virtual_f(); // $ target=8 SPURIOUS: target=3 // type-tracking has no 'clearsContent' feature and C/C++ doesn't have field-based SSA
+  s.b2->virtual_f(); // $ target=3 SPURIOUS: target=8 // type-tracking has no 'clearsContent' feature and C/C++ doesn't have field-based SSA
+}
+
+Base* getDerived() {
+  return new Derived();
+}
+
+void test_getDerived() {
+  Base* b = getDerived();
+  b->virtual_f(); // $ target=8
+
+  Derived d = *(Derived*)getDerived();
+  d.virtual_f(); // $ target=8
+}
+
+void write_to_arg(Base* b) {
+  *b = Derived();
+}
+
+void write_to_arg_2(Base** b) {
+	Derived* d = new Derived();
+  *b = d;
+}
+
+void test_write_to_arg() {
+  {
+    Base b;
+    write_to_arg(&b);
+    b.virtual_f(); // $ SPURIOUS: target=3 MISSING: target=8 // missing flow through the copy-constructor in write_to_arg
+  }
+
+  {
+    Base* b;
+    write_to_arg_2(&b);
+    b->virtual_f(); // $ target=8
+  }
+}
+
+Base* global_derived;
+
+void set_global_to_derived() {
+  global_derived = new Derived();
+}
+
+void read_global() {
+  global_derived->virtual_f(); // $ target=8
+}
+
+Base* global_base_or_derived;
+
+void set_global_base_or_derived_1() {
+  global_base_or_derived = new Base();
+}
+
+void set_global_base_or_derived_2() {
+  global_base_or_derived = new Derived();
+}
+
+void read_global_base_or_derived() {
+  global_base_or_derived->virtual_f(); // $ target=3 target=8
+}
\ No newline at end of file
diff --git a/python/ql/test/query-tests/Resources/FileNotAlwaysClosed/test.expected b/cpp/ql/test/library-tests/dataflow/dispatch/test.expected
similarity index 100%
rename from python/ql/test/query-tests/Resources/FileNotAlwaysClosed/test.expected
rename to cpp/ql/test/library-tests/dataflow/dispatch/test.expected
diff --git a/cpp/ql/test/library-tests/dataflow/dispatch/test.ql b/cpp/ql/test/library-tests/dataflow/dispatch/test.ql
new file mode 100644
index 00000000000..de16d6da1ef
--- /dev/null
+++ b/cpp/ql/test/library-tests/dataflow/dispatch/test.ql
@@ -0,0 +1,22 @@
+import cpp
+import utils.test.InlineExpectationsTest
+import semmle.code.cpp.ir.dataflow.internal.DataFlowDispatch
+import semmle.code.cpp.ir.dataflow.internal.DataFlowPrivate
+
+module ResolveDispatchTest implements TestSig {
+  string getARelevantTag() { result = "target" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    exists(DataFlowCall call, SourceCallable callable, MemberFunction mf |
+      mf = callable.asSourceCallable() and
+      not mf.isCompilerGenerated() and
+      callable = viableCallable(call) and
+      location = call.getLocation() and
+      element = call.toString() and
+      tag = "target" and
+      value = callable.getLocation().getStartLine().toString()
+    )
+  }
+}
+
+import MakeTest<ResolveDispatchTest>
diff --git a/cpp/ql/test/library-tests/dataflow/external-models/validatemodels.expected b/cpp/ql/test/library-tests/dataflow/external-models/validatemodels.expected
index aeb2362ef33..1b74b290eb3 100644
--- a/cpp/ql/test/library-tests/dataflow/external-models/validatemodels.expected
+++ b/cpp/ql/test/library-tests/dataflow/external-models/validatemodels.expected
@@ -6,12 +6,14 @@
 | Dubious member name "operator LPWSTR" in summary model. |
 | Dubious member name "operator PCXSTR" in summary model. |
 | Dubious member name "operator PXSTR" in summary model. |
+| Dubious member name "operator void**" in summary model. |
 | Dubious member name "operator&" in summary model. |
 | Dubious member name "operator*" in summary model. |
 | Dubious member name "operator+" in summary model. |
 | Dubious member name "operator+=" in summary model. |
 | Dubious member name "operator->" in summary model. |
 | Dubious member name "operator=" in summary model. |
+| Dubious member name "operator=<U>" in summary model. |
 | Dubious member name "operator[]" in summary model. |
 | Dubious signature "(..(*)(..))" in summary model. |
 | Dubious signature "(..(*)(..),..(*)(..),..(*)(..),..(*)(..))" in summary model. |
@@ -503,6 +505,7 @@
 | Dubious signature "(CURLU *,CURLUPart,const char *,unsigned int)" in summary model. |
 | Dubious signature "(CURLU *,const char *)" in summary model. |
 | Dubious signature "(CURLU *,const char *,char **,OperationConfig *)" in summary model. |
+| Dubious signature "(ComPtr &&)" in summary model. |
 | Dubious signature "(CompoundDictionary *,const PreparedDictionary *)" in summary model. |
 | Dubious signature "(Curl_cfilter *)" in summary model. |
 | Dubious signature "(Curl_cfilter **,Curl_easy *)" in summary model. |
@@ -2130,6 +2133,7 @@
 | Dubious signature "(RAND_POOL *,unsigned char *)" in summary model. |
 | Dubious signature "(RAND_POOL *,unsigned int)" in summary model. |
 | Dubious signature "(RECORD_LAYER *,SSL_CONNECTION *)" in summary model. |
+| Dubious signature "(REFIID,void **)" in summary model. |
 | Dubious signature "(RIO_NOTIFIER *)" in summary model. |
 | Dubious signature "(RIPEMD160_CTX *,const unsigned char *)" in summary model. |
 | Dubious signature "(RIPEMD160_CTX *,const void *,size_t)" in summary model. |
@@ -2431,6 +2435,8 @@
 | Dubious signature "(Strent *)" in summary model. |
 | Dubious signature "(Strtab *,const char *,size_t)" in summary model. |
 | Dubious signature "(Strtab *,size_t *)" in summary model. |
+| Dubious signature "(T *)" in summary model. |
+| Dubious signature "(T **)" in summary model. |
 | Dubious signature "(TLS_FEATURE *)" in summary model. |
 | Dubious signature "(TLS_RL_RECORD *,const unsigned char *)" in summary model. |
 | Dubious signature "(TS_ACCURACY *)" in summary model. |
@@ -2493,6 +2499,7 @@
 | Dubious signature "(TS_VERIFY_CTX *,unsigned char *,long)" in summary model. |
 | Dubious signature "(TXT_DB *,OPENSSL_STRING *)" in summary model. |
 | Dubious signature "(TXT_DB *,int,..(*)(..),OPENSSL_LH_HASHFUNC,OPENSSL_LH_COMPFUNC)" in summary model. |
+| Dubious signature "(U *)" in summary model. |
 | Dubious signature "(UI *)" in summary model. |
 | Dubious signature "(UI *,UI_STRING *,const char *)" in summary model. |
 | Dubious signature "(UI *,UI_STRING *,const char *,int)" in summary model. |
@@ -3155,6 +3162,7 @@
 | Dubious signature "(const CT_POLICY_EVAL_CTX *)" in summary model. |
 | Dubious signature "(const CURLU *)" in summary model. |
 | Dubious signature "(const CURLU *,CURLUPart,char **,unsigned int)" in summary model. |
+| Dubious signature "(const ComPtr &)" in summary model. |
 | Dubious signature "(const Command *,const size_t,const BlockSplit *,const BlockSplit *,const BlockSplit *,const uint8_t *,size_t,size_t,uint8_t,uint8_t,const ContextType *,HistogramLiteral *,HistogramCommand *,HistogramDistance *)" in summary model. |
 | Dubious signature "(const Curl_easy *,const connectdata *,int)" in summary model. |
 | Dubious signature "(const DH *)" in summary model. |
diff --git a/cpp/ql/test/library-tests/dataflow/fields/dataflow-consistency.expected b/cpp/ql/test/library-tests/dataflow/fields/dataflow-consistency.expected
index 88dd9751f27..4021dbc492a 100644
--- a/cpp/ql/test/library-tests/dataflow/fields/dataflow-consistency.expected
+++ b/cpp/ql/test/library-tests/dataflow/fields/dataflow-consistency.expected
@@ -48,8 +48,6 @@ argHasPostUpdate
 postWithInFlow
 | A.cpp:25:13:25:13 | c [post update] | PostUpdateNode should not be the target of local flow. |
 | A.cpp:27:28:27:28 | c [post update] | PostUpdateNode should not be the target of local flow. |
-| A.cpp:42:11:42:12 | cc [inner post update] | PostUpdateNode should not be the target of local flow. |
-| A.cpp:43:11:43:12 | ct [inner post update] | PostUpdateNode should not be the target of local flow. |
 | A.cpp:100:9:100:9 | a [post update] | PostUpdateNode should not be the target of local flow. |
 | A.cpp:142:10:142:10 | c [post update] | PostUpdateNode should not be the target of local flow. |
 | A.cpp:143:13:143:13 | b [post update] | PostUpdateNode should not be the target of local flow. |
@@ -67,11 +65,9 @@ postWithInFlow
 | D.cpp:44:19:44:22 | elem [post update] | PostUpdateNode should not be the target of local flow. |
 | D.cpp:57:5:57:12 | boxfield [post update] | PostUpdateNode should not be the target of local flow. |
 | D.cpp:58:20:58:23 | elem [post update] | PostUpdateNode should not be the target of local flow. |
-| E.cpp:33:19:33:19 | p [inner post update] | PostUpdateNode should not be the target of local flow. |
 | aliasing.cpp:9:6:9:7 | m1 [post update] | PostUpdateNode should not be the target of local flow. |
 | aliasing.cpp:13:5:13:6 | m1 [post update] | PostUpdateNode should not be the target of local flow. |
 | aliasing.cpp:17:5:17:6 | m1 [post update] | PostUpdateNode should not be the target of local flow. |
-| aliasing.cpp:25:18:25:19 | s1 [inner post update] | PostUpdateNode should not be the target of local flow. |
 | aliasing.cpp:37:8:37:9 | m1 [post update] | PostUpdateNode should not be the target of local flow. |
 | aliasing.cpp:42:6:42:7 | m1 [post update] | PostUpdateNode should not be the target of local flow. |
 | aliasing.cpp:49:9:49:10 | m1 [post update] | PostUpdateNode should not be the target of local flow. |
@@ -83,70 +79,31 @@ postWithInFlow
 | aliasing.cpp:92:7:92:8 | m1 [post update] | PostUpdateNode should not be the target of local flow. |
 | aliasing.cpp:98:5:98:6 | m1 [post update] | PostUpdateNode should not be the target of local flow. |
 | aliasing.cpp:106:3:106:5 | * ... [post update] | PostUpdateNode should not be the target of local flow. |
-| aliasing.cpp:106:4:106:5 | pa [inner post update] | PostUpdateNode should not be the target of local flow. |
-| aliasing.cpp:111:18:111:19 | m1 [inner post update] | PostUpdateNode should not be the target of local flow. |
-| aliasing.cpp:126:15:126:16 | xs [inner post update] | PostUpdateNode should not be the target of local flow. |
-| aliasing.cpp:136:16:136:17 | xs [inner post update] | PostUpdateNode should not be the target of local flow. |
-| aliasing.cpp:147:16:147:16 | s [inner post update] | PostUpdateNode should not be the target of local flow. |
-| aliasing.cpp:147:21:147:22 | m1 [inner post update] | PostUpdateNode should not be the target of local flow. |
-| aliasing.cpp:175:21:175:22 | m1 [inner post update] | PostUpdateNode should not be the target of local flow. |
-| aliasing.cpp:181:21:181:22 | m1 [inner post update] | PostUpdateNode should not be the target of local flow. |
-| aliasing.cpp:187:21:187:22 | m1 [inner post update] | PostUpdateNode should not be the target of local flow. |
-| aliasing.cpp:194:21:194:22 | m1 [inner post update] | PostUpdateNode should not be the target of local flow. |
-| aliasing.cpp:200:23:200:24 | m1 [inner post update] | PostUpdateNode should not be the target of local flow. |
-| aliasing.cpp:205:23:205:24 | m1 [inner post update] | PostUpdateNode should not be the target of local flow. |
 | aliasing.cpp:215:14:215:15 | m1 [post update] | PostUpdateNode should not be the target of local flow. |
 | aliasing.cpp:223:17:223:18 | m1 [post update] | PostUpdateNode should not be the target of local flow. |
 | aliasing.cpp:234:19:234:20 | m1 [post update] | PostUpdateNode should not be the target of local flow. |
 | aliasing.cpp:242:22:242:23 | m1 [post update] | PostUpdateNode should not be the target of local flow. |
 | aliasing.cpp:252:5:252:31 | * ... [post update] | PostUpdateNode should not be the target of local flow. |
-| aliasing.cpp:252:28:252:31 | data [inner post update] | PostUpdateNode should not be the target of local flow. |
 | aliasing.cpp:262:5:262:29 | * ... [post update] | PostUpdateNode should not be the target of local flow. |
-| aliasing.cpp:262:26:262:29 | data [inner post update] | PostUpdateNode should not be the target of local flow. |
-| arrays.cpp:6:3:6:5 | arr [inner post update] | PostUpdateNode should not be the target of local flow. |
 | arrays.cpp:6:3:6:8 | access to array [post update] | PostUpdateNode should not be the target of local flow. |
 | arrays.cpp:15:3:15:10 | * ... [post update] | PostUpdateNode should not be the target of local flow. |
-| arrays.cpp:15:5:15:7 | arr [inner post update] | PostUpdateNode should not be the target of local flow. |
-| arrays.cpp:36:12:36:14 | arr [inner post update] | PostUpdateNode should not be the target of local flow. |
 | arrays.cpp:36:19:36:22 | data [post update] | PostUpdateNode should not be the target of local flow. |
-| arrays.cpp:37:17:37:19 | arr [inner post update] | PostUpdateNode should not be the target of local flow. |
-| arrays.cpp:38:17:38:19 | arr [inner post update] | PostUpdateNode should not be the target of local flow. |
-| arrays.cpp:42:15:42:17 | arr [inner post update] | PostUpdateNode should not be the target of local flow. |
 | arrays.cpp:42:22:42:25 | data [post update] | PostUpdateNode should not be the target of local flow. |
-| arrays.cpp:43:20:43:22 | arr [inner post update] | PostUpdateNode should not be the target of local flow. |
-| arrays.cpp:44:20:44:22 | arr [inner post update] | PostUpdateNode should not be the target of local flow. |
-| arrays.cpp:48:15:48:17 | ptr [inner post update] | PostUpdateNode should not be the target of local flow. |
 | arrays.cpp:48:22:48:25 | data [post update] | PostUpdateNode should not be the target of local flow. |
-| arrays.cpp:49:20:49:22 | ptr [inner post update] | PostUpdateNode should not be the target of local flow. |
-| arrays.cpp:50:20:50:22 | ptr [inner post update] | PostUpdateNode should not be the target of local flow. |
 | by_reference.cpp:12:8:12:8 | a [post update] | PostUpdateNode should not be the target of local flow. |
 | by_reference.cpp:16:11:16:11 | a [post update] | PostUpdateNode should not be the target of local flow. |
-| by_reference.cpp:68:18:68:18 | s [inner post update] | PostUpdateNode should not be the target of local flow. |
 | by_reference.cpp:84:10:84:10 | a [post update] | PostUpdateNode should not be the target of local flow. |
 | by_reference.cpp:88:9:88:9 | a [post update] | PostUpdateNode should not be the target of local flow. |
 | by_reference.cpp:92:3:92:5 | * ... [post update] | PostUpdateNode should not be the target of local flow. |
-| by_reference.cpp:92:4:92:5 | pa [inner post update] | PostUpdateNode should not be the target of local flow. |
 | by_reference.cpp:96:3:96:4 | pa [post update] | PostUpdateNode should not be the target of local flow. |
-| by_reference.cpp:102:28:102:39 | inner_nested [inner post update] | PostUpdateNode should not be the target of local flow. |
-| by_reference.cpp:104:22:104:22 | a [inner post update] | PostUpdateNode should not be the target of local flow. |
-| by_reference.cpp:106:30:106:41 | inner_nested [inner post update] | PostUpdateNode should not be the target of local flow. |
-| by_reference.cpp:108:24:108:24 | a [inner post update] | PostUpdateNode should not be the target of local flow. |
-| by_reference.cpp:123:28:123:36 | inner_ptr [inner post update] | PostUpdateNode should not be the target of local flow. |
-| by_reference.cpp:127:30:127:38 | inner_ptr [inner post update] | PostUpdateNode should not be the target of local flow. |
 | clearning.cpp:19:3:19:6 | * ... [post update] | PostUpdateNode should not be the target of local flow. |
-| clearning.cpp:19:6:19:6 | x [inner post update] | PostUpdateNode should not be the target of local flow. |
 | clearning.cpp:32:3:32:6 | * ... [post update] | PostUpdateNode should not be the target of local flow. |
-| clearning.cpp:32:6:32:6 | x [inner post update] | PostUpdateNode should not be the target of local flow. |
 | clearning.cpp:39:3:39:6 | * ... [post update] | PostUpdateNode should not be the target of local flow. |
-| clearning.cpp:39:6:39:6 | x [inner post update] | PostUpdateNode should not be the target of local flow. |
 | clearning.cpp:40:5:40:5 | x [post update] | PostUpdateNode should not be the target of local flow. |
 | clearning.cpp:47:5:47:5 | x [post update] | PostUpdateNode should not be the target of local flow. |
 | clearning.cpp:53:3:53:6 | * ... [post update] | PostUpdateNode should not be the target of local flow. |
-| clearning.cpp:53:6:53:6 | x [inner post update] | PostUpdateNode should not be the target of local flow. |
 | clearning.cpp:75:2:75:10 | access to array [post update] | PostUpdateNode should not be the target of local flow. |
-| clearning.cpp:75:4:75:6 | val [inner post update] | PostUpdateNode should not be the target of local flow. |
 | clearning.cpp:82:2:82:9 | access to array [post update] | PostUpdateNode should not be the target of local flow. |
-| clearning.cpp:82:4:82:6 | val [inner post update] | PostUpdateNode should not be the target of local flow. |
 | clearning.cpp:83:7:83:9 | val [post update] | PostUpdateNode should not be the target of local flow. |
 | clearning.cpp:97:4:97:6 | val [post update] | PostUpdateNode should not be the target of local flow. |
 | clearning.cpp:124:4:124:6 | val [post update] | PostUpdateNode should not be the target of local flow. |
@@ -162,7 +119,6 @@ postWithInFlow
 | complex.cpp:11:22:11:23 | a_ [post update] | PostUpdateNode should not be the target of local flow. |
 | complex.cpp:12:22:12:23 | b_ [post update] | PostUpdateNode should not be the target of local flow. |
 | conflated.cpp:10:3:10:7 | * ... [post update] | PostUpdateNode should not be the target of local flow. |
-| conflated.cpp:10:7:10:7 | p [inner post update] | PostUpdateNode should not be the target of local flow. |
 | conflated.cpp:29:7:29:7 | x [post update] | PostUpdateNode should not be the target of local flow. |
 | conflated.cpp:36:7:36:7 | x [post update] | PostUpdateNode should not be the target of local flow. |
 | conflated.cpp:53:7:53:10 | next [post update] | PostUpdateNode should not be the target of local flow. |
@@ -174,19 +130,11 @@ postWithInFlow
 | qualifiers.cpp:12:56:12:56 | a [post update] | PostUpdateNode should not be the target of local flow. |
 | qualifiers.cpp:13:57:13:57 | a [post update] | PostUpdateNode should not be the target of local flow. |
 | qualifiers.cpp:22:23:22:23 | a [post update] | PostUpdateNode should not be the target of local flow. |
-| qualifiers.cpp:37:26:37:33 | call to getInner [inner post update] | PostUpdateNode should not be the target of local flow. |
-| qualifiers.cpp:42:13:42:20 | call to getInner [inner post update] | PostUpdateNode should not be the target of local flow. |
 | qualifiers.cpp:42:25:42:25 | a [post update] | PostUpdateNode should not be the target of local flow. |
-| qualifiers.cpp:47:7:47:11 | outer [inner post update] | PostUpdateNode should not be the target of local flow. |
 | qualifiers.cpp:47:27:47:27 | a [post update] | PostUpdateNode should not be the target of local flow. |
-| realistic.cpp:49:13:49:15 | bar [inner post update] | PostUpdateNode should not be the target of local flow. |
 | realistic.cpp:49:20:49:22 | baz [post update] | PostUpdateNode should not be the target of local flow. |
-| realistic.cpp:53:13:53:15 | bar [inner post update] | PostUpdateNode should not be the target of local flow. |
 | realistic.cpp:53:35:53:43 | bufferLen [post update] | PostUpdateNode should not be the target of local flow. |
-| realistic.cpp:54:20:54:22 | bar [inner post update] | PostUpdateNode should not be the target of local flow. |
 | realistic.cpp:60:16:60:18 | ref arg dst | PostUpdateNode should not be the target of local flow. |
-| realistic.cpp:61:25:61:27 | bar [inner post update] | PostUpdateNode should not be the target of local flow. |
-| realistic.cpp:65:25:65:27 | bar [inner post update] | PostUpdateNode should not be the target of local flow. |
 | simple.cpp:20:24:20:25 | a_ [post update] | PostUpdateNode should not be the target of local flow. |
 | simple.cpp:21:24:21:25 | b_ [post update] | PostUpdateNode should not be the target of local flow. |
 | simple.cpp:65:7:65:7 | i [post update] | PostUpdateNode should not be the target of local flow. |
@@ -194,9 +142,6 @@ postWithInFlow
 | simple.cpp:92:7:92:7 | i [post update] | PostUpdateNode should not be the target of local flow. |
 | simple.cpp:118:7:118:7 | i [post update] | PostUpdateNode should not be the target of local flow. |
 | simple.cpp:124:5:124:6 | * ... [post update] | PostUpdateNode should not be the target of local flow. |
-| simple.cpp:124:6:124:6 | p [inner post update] | PostUpdateNode should not be the target of local flow. |
-| struct_init.c:24:11:24:12 | ab [inner post update] | PostUpdateNode should not be the target of local flow. |
-| struct_init.c:36:17:36:24 | nestedAB [inner post update] | PostUpdateNode should not be the target of local flow. |
 viableImplInCallContextTooLarge
 uniqueParameterNodeAtPosition
 uniqueParameterNodePosition
diff --git a/cpp/ql/test/library-tests/dataflow/ir-barrier-guards/test.ql b/cpp/ql/test/library-tests/dataflow/ir-barrier-guards/test.ql
index 15b165a7de1..20610c55385 100644
--- a/cpp/ql/test/library-tests/dataflow/ir-barrier-guards/test.ql
+++ b/cpp/ql/test/library-tests/dataflow/ir-barrier-guards/test.ql
@@ -7,7 +7,7 @@ predicate instructionGuardChecks(IRGuardCondition gc, Instruction checked, boole
   exists(CallInstruction call |
     call.getStaticCallTarget().hasName("checkArgument") and
     checked = call.getAnArgument() and
-    gc.comparesEq(call.getAUse(), 0, false, any(BooleanValue bv | bv.getValue() = branch))
+    gc.comparesEq(call.getAUse(), 0, false, any(GuardValue bv | bv.asBooleanValue() = branch))
   )
 }
 
diff --git a/cpp/ql/test/library-tests/dataflow/models-as-data/consistency.expected b/cpp/ql/test/library-tests/dataflow/models-as-data/consistency.expected
index 49b1f021f07..c89f4455bc5 100644
--- a/cpp/ql/test/library-tests/dataflow/models-as-data/consistency.expected
+++ b/cpp/ql/test/library-tests/dataflow/models-as-data/consistency.expected
@@ -18,7 +18,6 @@ postIsInSameCallable
 reverseRead
 argHasPostUpdate
 postWithInFlow
-| tests.cpp:436:6:436:25 | [summary] to write: Argument[1] in madCallArg0WithValue | PostUpdateNode should not be the target of local flow. |
 viableImplInCallContextTooLarge
 uniqueParameterNodeAtPosition
 uniqueParameterNodePosition
diff --git a/cpp/ql/test/library-tests/dataflow/taint-tests/atl.cpp b/cpp/ql/test/library-tests/dataflow/taint-tests/atl.cpp
index e26416a0e68..aff51f62964 100644
--- a/cpp/ql/test/library-tests/dataflow/taint-tests/atl.cpp
+++ b/cpp/ql/test/library-tests/dataflow/taint-tests/atl.cpp
@@ -1241,4 +1241,221 @@ namespace ATL {
     sink(static_cast<CStrBufT<char>::PCXSTR>(b)); // $ ir
     sink(static_cast<CStrBufT<char>::PXSTR>(b)); // $ ir
   }
+}
+
+namespace Microsoft {
+  namespace WRL {
+  template <typename T>
+  class ComPtr;
+
+  struct GUID;
+
+  typedef GUID IID;
+
+  typedef IID *REFIID;
+
+  class IUnknown;
+
+  class WeakRef;
+
+  namespace Details {
+    template <typename T>
+    class ComPtrRef {
+      public:
+      using InterfaceType = T;
+
+      ComPtrRef(T*);
+
+      InterfaceType* const * GetAddressOf() const;
+      InterfaceType** ReleaseAndGetAddressOf();
+
+      operator InterfaceType**();
+      operator T*();
+      operator void**() const;
+      InterfaceType* operator *();
+    };
+  }
+
+  template <typename T>
+  class ComPtr
+  {
+  public:
+    using InterfaceType = T;
+
+    ComPtr();
+    ComPtr(const ComPtr &);
+    ComPtr(ComPtr &&);
+
+    template <typename U>
+    ComPtr(U *);
+
+    ~ComPtr();
+
+    template <typename U>
+    HRESULT As(ComPtr<U> *p) const;
+
+    HRESULT AsWeak(WeakRef *);
+
+    void Attach(InterfaceType *);
+
+    HRESULT CopyTo(InterfaceType **);
+
+    HRESULT CopyTo(REFIID, void **) const;
+
+    template <typename U>
+    HRESULT CopyTo(U **) const;
+
+    T *Detach();
+
+    T *Get() const;
+
+    T *const *GetAddressOf() const;
+    T **GetAddressOf();
+
+    T **ReleaseAndGetAddressOf();
+
+    unsigned long Reset();
+
+    void Swap(ComPtr &&r);
+
+    void Swap(ComPtr &r);
+
+    Details::ComPtrRef<ComPtr<T>> operator&();
+    const Details::ComPtrRef<const ComPtr<T>> operator&() const;
+
+    InterfaceType* operator->() const; // return type simplified from Microsoft::WRL::Details::RemoveIUnknown<InterfaceType>*
+
+    ComPtr& operator=(T *);
+    template <typename U>
+    ComPtr& operator=(U *);
+    ComPtr& operator=(const ComPtr &);
+    template<class U>
+    ComPtr& operator=(const ComPtr<U>&);
+    ComPtr& operator=(ComPtr &&);
+    template<class U>
+    ComPtr& operator=(ComPtr<U>&&);
+    };
+
+  }
+}
+
+namespace std {
+  template<class T> T&& move(T& t) noexcept; // simplified signature
+}
+
+void test_constructor()
+{
+  Microsoft::WRL::ComPtr<int> p0;
+  sink(*p0.Get()); // clean
+
+  int x = source<int>();
+  Microsoft::WRL::ComPtr<int> p1(new int(x));
+  sink(*p1.Get()); // $ ir MISSING: ast
+  sink(*p1.Detach()); // $ ir MISSING: ast
+
+  Microsoft::WRL::ComPtr<int> p2(p1);
+  sink(*p2.Get()); // $ ir MISSING: ast
+
+  Microsoft::WRL::ComPtr<int> p3(std::move(p1));
+  sink(*p3.Get()); // $ ir MISSING: ast
+}
+
+void test_As()
+{
+  int x = source<int>();
+  Microsoft::WRL::ComPtr<int> p1(new int(x));
+  Microsoft::WRL::ComPtr<int>* p2;
+  p1.As(p2);
+  sink(*p2->Get()); // $ ir MISSING: ast
+}
+
+void test_CopyTo()
+{
+  int x = source<int>();
+  Microsoft::WRL::ComPtr<int> p1(new int(x));
+  int *raw = nullptr;
+  p1.CopyTo(&raw);
+  sink(*raw); // $ ir MISSING: ast
+
+  Microsoft::WRL::ComPtr<int> p2;
+  p1.CopyTo(nullptr, (void**)&raw);
+  sink(*raw); // $ ir MISSING: ast
+
+  Microsoft::WRL::ComPtr<int> p3(new int(x));
+
+  int* raw2 = nullptr;
+  p3.CopyTo<int>(&raw2);
+  sink(*raw2); // $ ir MISSING: ast
+}
+
+void test_Swap()
+{
+  int x = source<int>();
+  Microsoft::WRL::ComPtr<int> p1(new int(x));
+  Microsoft::WRL::ComPtr<int> p2;
+  p1.Swap(p2);
+  sink(*p2.Get()); // $ ir MISSING: ast
+  sink(*p1.Get()); // $ SPURIOUS: ir
+}
+
+void test_GetAddressOf()
+{
+  int x = source<int>();
+  Microsoft::WRL::ComPtr<int> p1(new int(x));
+  sink(**p1.GetAddressOf()); // $ ir MISSING: ast
+ 
+  const Microsoft::WRL::ComPtr<int> p2(new int(x));
+  sink(**p2.GetAddressOf()); // $ ir MISSING: ast
+
+  Microsoft::WRL::ComPtr<int> p3(new int(x));
+  int **pp = p3.ReleaseAndGetAddressOf();
+  sink(**pp); // $ ir MISSING: ast
+}
+
+struct S {
+  int x;
+};
+
+void test_address_of_deref_operators() {
+  int x = source<int>();
+  Microsoft::WRL::ComPtr<int> p1(new int(x));
+  Microsoft::WRL::Details::ComPtrRef<Microsoft::WRL::ComPtr<int>> pp = &p1;
+  Microsoft::WRL::ComPtr<int>* qq = *pp;
+  sink(*qq->Get()); // $ ir MISSING: ast
+  
+  const Microsoft::WRL::ComPtr<int> p2(new int(x));
+  Microsoft::WRL::Details::ComPtrRef<const Microsoft::WRL::ComPtr<int>> pp2 = &p2;
+  const Microsoft::WRL::ComPtr<int>* qq2 = *pp2;
+  sink(*qq2->Get()); // $ ir MISSING: ast
+
+  S s;
+  s.x = source<int>();
+  Microsoft::WRL::ComPtr<S> p3(&s);
+  sink(p3->x); // $ ir MISSING: ast
+}
+
+void test_assignments() {
+  Microsoft::WRL::ComPtr<int> p1;
+  p1 = new int(source<int>());
+  sink(*p1.Get()); // $ ir MISSING: ast
+
+  Microsoft::WRL::ComPtr<int> p2;
+  p2 = new long(source<long>());
+  sink(*p2.Get()); // $ ir MISSING: ast
+
+  Microsoft::WRL::ComPtr<int> p3;
+  p3 = p1;
+  sink(*p3.Get()); // $ ir MISSING: ast
+
+  Microsoft::WRL::ComPtr<long> p4;
+  p4 = p1;
+  sink(*p4.Get()); // $ ir MISSING: ast
+
+  Microsoft::WRL::ComPtr<int> p5;
+  p5 = std::move(p1);
+  sink(*p5.Get()); // $ ir MISSING: ast
+
+  Microsoft::WRL::ComPtr<long> p6;
+  p6 = std::move(p1);
+  sink(*p6.Get()); // $ ir MISSING: ast
 }
\ No newline at end of file
diff --git a/cpp/ql/test/library-tests/dataflow/taint-tests/localTaint.expected b/cpp/ql/test/library-tests/dataflow/taint-tests/localTaint.expected
index e19f34eb217..0f4d67f2695 100644
--- a/cpp/ql/test/library-tests/dataflow/taint-tests/localTaint.expected
+++ b/cpp/ql/test/library-tests/dataflow/taint-tests/localTaint.expected
@@ -1278,6 +1278,223 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | atl.cpp:1240:22:1240:30 | call to CStrBufT | atl.cpp:1241:46:1241:46 | b |  |
 | atl.cpp:1240:22:1240:30 | call to CStrBufT | atl.cpp:1242:45:1242:45 | b |  |
 | atl.cpp:1241:46:1241:46 | ref arg b | atl.cpp:1242:45:1242:45 | b |  |
+| atl.cpp:1348:31:1348:32 | call to ComPtr | atl.cpp:1349:9:1349:10 | p0 |  |
+| atl.cpp:1348:31:1348:32 | call to ComPtr | atl.cpp:1361:1:1361:1 | p0 |  |
+| atl.cpp:1349:9:1349:10 | ref arg p0 | atl.cpp:1361:1:1361:1 | p0 |  |
+| atl.cpp:1349:12:1349:14 | call to Get | atl.cpp:1349:8:1349:16 | * ... | TAINT |
+| atl.cpp:1351:11:1351:21 | call to source | atl.cpp:1352:42:1352:42 | x |  |
+| atl.cpp:1352:34:1352:43 | new | atl.cpp:1352:34:1352:44 | call to ComPtr | TAINT |
+| atl.cpp:1352:34:1352:44 | call to ComPtr | atl.cpp:1353:9:1353:10 | p1 |  |
+| atl.cpp:1352:34:1352:44 | call to ComPtr | atl.cpp:1354:9:1354:10 | p1 |  |
+| atl.cpp:1352:34:1352:44 | call to ComPtr | atl.cpp:1356:34:1356:35 | p1 |  |
+| atl.cpp:1352:34:1352:44 | call to ComPtr | atl.cpp:1359:44:1359:45 | p1 |  |
+| atl.cpp:1352:34:1352:44 | call to ComPtr | atl.cpp:1361:1:1361:1 | p1 |  |
+| atl.cpp:1352:42:1352:42 | x | atl.cpp:1352:34:1352:43 | new |  |
+| atl.cpp:1353:9:1353:10 | ref arg p1 | atl.cpp:1354:9:1354:10 | p1 |  |
+| atl.cpp:1353:9:1353:10 | ref arg p1 | atl.cpp:1356:34:1356:35 | p1 |  |
+| atl.cpp:1353:9:1353:10 | ref arg p1 | atl.cpp:1359:44:1359:45 | p1 |  |
+| atl.cpp:1353:9:1353:10 | ref arg p1 | atl.cpp:1361:1:1361:1 | p1 |  |
+| atl.cpp:1353:12:1353:14 | call to Get | atl.cpp:1353:8:1353:16 | * ... | TAINT |
+| atl.cpp:1354:9:1354:10 | ref arg p1 | atl.cpp:1356:34:1356:35 | p1 |  |
+| atl.cpp:1354:9:1354:10 | ref arg p1 | atl.cpp:1359:44:1359:45 | p1 |  |
+| atl.cpp:1354:9:1354:10 | ref arg p1 | atl.cpp:1361:1:1361:1 | p1 |  |
+| atl.cpp:1354:12:1354:17 | call to Detach | atl.cpp:1354:8:1354:19 | * ... | TAINT |
+| atl.cpp:1356:34:1356:35 | p1 | atl.cpp:1356:34:1356:36 | call to ComPtr |  |
+| atl.cpp:1356:34:1356:36 | call to ComPtr | atl.cpp:1357:9:1357:10 | p2 |  |
+| atl.cpp:1356:34:1356:36 | call to ComPtr | atl.cpp:1361:1:1361:1 | p2 |  |
+| atl.cpp:1357:9:1357:10 | ref arg p2 | atl.cpp:1361:1:1361:1 | p2 |  |
+| atl.cpp:1357:12:1357:14 | call to Get | atl.cpp:1357:8:1357:16 | * ... | TAINT |
+| atl.cpp:1359:34:1359:42 | call to move | atl.cpp:1359:34:1359:47 | call to ComPtr | TAINT |
+| atl.cpp:1359:34:1359:42 | ref arg call to move | atl.cpp:1359:44:1359:45 | p1 [inner post update] |  |
+| atl.cpp:1359:34:1359:42 | ref arg call to move | atl.cpp:1361:1:1361:1 | p1 |  |
+| atl.cpp:1359:34:1359:47 | call to ComPtr | atl.cpp:1360:9:1360:10 | p3 |  |
+| atl.cpp:1359:34:1359:47 | call to ComPtr | atl.cpp:1361:1:1361:1 | p3 |  |
+| atl.cpp:1359:44:1359:45 | p1 | atl.cpp:1359:34:1359:42 | call to move | TAINT |
+| atl.cpp:1359:44:1359:45 | p1 | atl.cpp:1359:34:1359:47 | call to ComPtr |  |
+| atl.cpp:1360:9:1360:10 | ref arg p3 | atl.cpp:1361:1:1361:1 | p3 |  |
+| atl.cpp:1360:12:1360:14 | call to Get | atl.cpp:1360:8:1360:16 | * ... | TAINT |
+| atl.cpp:1365:11:1365:21 | call to source | atl.cpp:1366:42:1366:42 | x |  |
+| atl.cpp:1366:34:1366:43 | new | atl.cpp:1366:34:1366:44 | call to ComPtr | TAINT |
+| atl.cpp:1366:34:1366:44 | call to ComPtr | atl.cpp:1368:3:1368:4 | p1 |  |
+| atl.cpp:1366:34:1366:44 | call to ComPtr | atl.cpp:1370:1:1370:1 | p1 |  |
+| atl.cpp:1366:42:1366:42 | x | atl.cpp:1366:34:1366:43 | new |  |
+| atl.cpp:1367:32:1367:33 | p2 | atl.cpp:1368:9:1368:10 | p2 |  |
+| atl.cpp:1367:32:1367:33 | p2 | atl.cpp:1369:9:1369:10 | p2 |  |
+| atl.cpp:1368:9:1368:10 | ref arg p2 | atl.cpp:1369:9:1369:10 | p2 |  |
+| atl.cpp:1369:13:1369:15 | call to Get | atl.cpp:1369:8:1369:17 | * ... | TAINT |
+| atl.cpp:1374:11:1374:21 | call to source | atl.cpp:1375:42:1375:42 | x |  |
+| atl.cpp:1374:11:1374:21 | call to source | atl.cpp:1384:42:1384:42 | x |  |
+| atl.cpp:1375:34:1375:43 | new | atl.cpp:1375:34:1375:44 | call to ComPtr | TAINT |
+| atl.cpp:1375:34:1375:44 | call to ComPtr | atl.cpp:1377:3:1377:4 | p1 |  |
+| atl.cpp:1375:34:1375:44 | call to ComPtr | atl.cpp:1381:3:1381:4 | p1 |  |
+| atl.cpp:1375:34:1375:44 | call to ComPtr | atl.cpp:1389:1:1389:1 | p1 |  |
+| atl.cpp:1375:42:1375:42 | x | atl.cpp:1375:34:1375:43 | new |  |
+| atl.cpp:1376:14:1376:20 | 0 | atl.cpp:1377:14:1377:16 | raw |  |
+| atl.cpp:1376:14:1376:20 | 0 | atl.cpp:1378:9:1378:11 | raw |  |
+| atl.cpp:1376:14:1376:20 | 0 | atl.cpp:1381:31:1381:33 | raw |  |
+| atl.cpp:1376:14:1376:20 | 0 | atl.cpp:1382:9:1382:11 | raw |  |
+| atl.cpp:1377:3:1377:4 | ref arg p1 | atl.cpp:1381:3:1381:4 | p1 |  |
+| atl.cpp:1377:3:1377:4 | ref arg p1 | atl.cpp:1389:1:1389:1 | p1 |  |
+| atl.cpp:1377:13:1377:16 | ref arg & ... | atl.cpp:1377:14:1377:16 | raw [inner post update] |  |
+| atl.cpp:1377:13:1377:16 | ref arg & ... | atl.cpp:1378:9:1378:11 | raw |  |
+| atl.cpp:1377:13:1377:16 | ref arg & ... | atl.cpp:1381:31:1381:33 | raw |  |
+| atl.cpp:1377:13:1377:16 | ref arg & ... | atl.cpp:1382:9:1382:11 | raw |  |
+| atl.cpp:1377:14:1377:16 | raw | atl.cpp:1377:13:1377:16 | & ... |  |
+| atl.cpp:1378:9:1378:11 | raw | atl.cpp:1378:8:1378:11 | * ... | TAINT |
+| atl.cpp:1380:31:1380:32 | call to ComPtr | atl.cpp:1389:1:1389:1 | p2 |  |
+| atl.cpp:1381:30:1381:33 | ref arg & ... | atl.cpp:1381:31:1381:33 | raw [inner post update] |  |
+| atl.cpp:1381:30:1381:33 | ref arg & ... | atl.cpp:1382:9:1382:11 | raw |  |
+| atl.cpp:1381:31:1381:33 | raw | atl.cpp:1381:30:1381:33 | & ... |  |
+| atl.cpp:1382:9:1382:11 | raw | atl.cpp:1382:8:1382:11 | * ... | TAINT |
+| atl.cpp:1384:34:1384:43 | new | atl.cpp:1384:34:1384:44 | call to ComPtr | TAINT |
+| atl.cpp:1384:34:1384:44 | call to ComPtr | atl.cpp:1387:3:1387:4 | p3 |  |
+| atl.cpp:1384:34:1384:44 | call to ComPtr | atl.cpp:1389:1:1389:1 | p3 |  |
+| atl.cpp:1384:42:1384:42 | x | atl.cpp:1384:34:1384:43 | new |  |
+| atl.cpp:1386:15:1386:21 | 0 | atl.cpp:1387:19:1387:22 | raw2 |  |
+| atl.cpp:1386:15:1386:21 | 0 | atl.cpp:1388:9:1388:12 | raw2 |  |
+| atl.cpp:1387:18:1387:22 | ref arg & ... | atl.cpp:1387:19:1387:22 | raw2 [inner post update] |  |
+| atl.cpp:1387:18:1387:22 | ref arg & ... | atl.cpp:1388:9:1388:12 | raw2 |  |
+| atl.cpp:1387:19:1387:22 | raw2 | atl.cpp:1387:18:1387:22 | & ... |  |
+| atl.cpp:1388:9:1388:12 | raw2 | atl.cpp:1388:8:1388:12 | * ... | TAINT |
+| atl.cpp:1393:11:1393:21 | call to source | atl.cpp:1394:42:1394:42 | x |  |
+| atl.cpp:1394:34:1394:43 | new | atl.cpp:1394:34:1394:44 | call to ComPtr | TAINT |
+| atl.cpp:1394:34:1394:44 | call to ComPtr | atl.cpp:1396:3:1396:4 | p1 |  |
+| atl.cpp:1394:34:1394:44 | call to ComPtr | atl.cpp:1398:9:1398:10 | p1 |  |
+| atl.cpp:1394:34:1394:44 | call to ComPtr | atl.cpp:1399:1:1399:1 | p1 |  |
+| atl.cpp:1394:42:1394:42 | x | atl.cpp:1394:34:1394:43 | new |  |
+| atl.cpp:1395:31:1395:32 | call to ComPtr | atl.cpp:1396:11:1396:12 | p2 |  |
+| atl.cpp:1395:31:1395:32 | call to ComPtr | atl.cpp:1397:9:1397:10 | p2 |  |
+| atl.cpp:1395:31:1395:32 | call to ComPtr | atl.cpp:1399:1:1399:1 | p2 |  |
+| atl.cpp:1396:3:1396:4 | ref arg p1 | atl.cpp:1398:9:1398:10 | p1 |  |
+| atl.cpp:1396:3:1396:4 | ref arg p1 | atl.cpp:1399:1:1399:1 | p1 |  |
+| atl.cpp:1396:11:1396:12 | ref arg p2 | atl.cpp:1397:9:1397:10 | p2 |  |
+| atl.cpp:1396:11:1396:12 | ref arg p2 | atl.cpp:1399:1:1399:1 | p2 |  |
+| atl.cpp:1397:9:1397:10 | ref arg p2 | atl.cpp:1399:1:1399:1 | p2 |  |
+| atl.cpp:1397:12:1397:14 | call to Get | atl.cpp:1397:8:1397:16 | * ... | TAINT |
+| atl.cpp:1398:9:1398:10 | ref arg p1 | atl.cpp:1399:1:1399:1 | p1 |  |
+| atl.cpp:1398:12:1398:14 | call to Get | atl.cpp:1398:8:1398:16 | * ... | TAINT |
+| atl.cpp:1403:11:1403:21 | call to source | atl.cpp:1404:42:1404:42 | x |  |
+| atl.cpp:1403:11:1403:21 | call to source | atl.cpp:1407:48:1407:48 | x |  |
+| atl.cpp:1403:11:1403:21 | call to source | atl.cpp:1410:42:1410:42 | x |  |
+| atl.cpp:1404:34:1404:43 | new | atl.cpp:1404:34:1404:44 | call to ComPtr | TAINT |
+| atl.cpp:1404:34:1404:44 | call to ComPtr | atl.cpp:1405:10:1405:11 | p1 |  |
+| atl.cpp:1404:34:1404:44 | call to ComPtr | atl.cpp:1413:1:1413:1 | p1 |  |
+| atl.cpp:1404:42:1404:42 | x | atl.cpp:1404:34:1404:43 | new |  |
+| atl.cpp:1405:9:1405:26 | * ... | atl.cpp:1405:8:1405:26 | * ... | TAINT |
+| atl.cpp:1405:10:1405:11 | ref arg p1 | atl.cpp:1413:1:1413:1 | p1 |  |
+| atl.cpp:1405:13:1405:24 | call to GetAddressOf | atl.cpp:1405:9:1405:26 | * ... | TAINT |
+| atl.cpp:1407:40:1407:49 | new | atl.cpp:1407:40:1407:50 | call to ComPtr | TAINT |
+| atl.cpp:1407:40:1407:50 | call to ComPtr | atl.cpp:1408:10:1408:11 | p2 |  |
+| atl.cpp:1407:40:1407:50 | call to ComPtr | atl.cpp:1413:1:1413:1 | p2 |  |
+| atl.cpp:1407:48:1407:48 | x | atl.cpp:1407:40:1407:49 | new |  |
+| atl.cpp:1408:9:1408:26 | * ... | atl.cpp:1408:8:1408:26 | * ... | TAINT |
+| atl.cpp:1408:10:1408:11 | ref arg p2 | atl.cpp:1413:1:1413:1 | p2 |  |
+| atl.cpp:1408:13:1408:24 | call to GetAddressOf | atl.cpp:1408:9:1408:26 | * ... | TAINT |
+| atl.cpp:1410:34:1410:43 | new | atl.cpp:1410:34:1410:44 | call to ComPtr | TAINT |
+| atl.cpp:1410:34:1410:44 | call to ComPtr | atl.cpp:1411:14:1411:15 | p3 |  |
+| atl.cpp:1410:34:1410:44 | call to ComPtr | atl.cpp:1413:1:1413:1 | p3 |  |
+| atl.cpp:1410:42:1410:42 | x | atl.cpp:1410:34:1410:43 | new |  |
+| atl.cpp:1411:14:1411:15 | ref arg p3 | atl.cpp:1413:1:1413:1 | p3 |  |
+| atl.cpp:1411:17:1411:38 | call to ReleaseAndGetAddressOf | atl.cpp:1412:10:1412:11 | pp |  |
+| atl.cpp:1412:9:1412:11 | * ... | atl.cpp:1412:8:1412:11 | * ... | TAINT |
+| atl.cpp:1412:10:1412:11 | pp | atl.cpp:1412:9:1412:11 | * ... | TAINT |
+| atl.cpp:1420:11:1420:21 | call to source | atl.cpp:1421:42:1421:42 | x |  |
+| atl.cpp:1420:11:1420:21 | call to source | atl.cpp:1426:48:1426:48 | x |  |
+| atl.cpp:1421:34:1421:43 | new | atl.cpp:1421:34:1421:44 | call to ComPtr | TAINT |
+| atl.cpp:1421:34:1421:44 | call to ComPtr | atl.cpp:1422:73:1422:74 | p1 |  |
+| atl.cpp:1421:34:1421:44 | call to ComPtr | atl.cpp:1435:1:1435:1 | p1 |  |
+| atl.cpp:1421:42:1421:42 | x | atl.cpp:1421:34:1421:43 | new |  |
+| atl.cpp:1422:72:1422:72 | call to operator& | atl.cpp:1423:38:1423:39 | pp |  |
+| atl.cpp:1422:73:1422:74 | ref arg p1 | atl.cpp:1435:1:1435:1 | p1 |  |
+| atl.cpp:1423:37:1423:37 | call to operator* | atl.cpp:1424:9:1424:10 | qq |  |
+| atl.cpp:1424:13:1424:15 | call to Get | atl.cpp:1424:8:1424:17 | * ... | TAINT |
+| atl.cpp:1426:40:1426:49 | new | atl.cpp:1426:40:1426:50 | call to ComPtr | TAINT |
+| atl.cpp:1426:40:1426:50 | call to ComPtr | atl.cpp:1427:80:1427:81 | p2 |  |
+| atl.cpp:1426:40:1426:50 | call to ComPtr | atl.cpp:1435:1:1435:1 | p2 |  |
+| atl.cpp:1426:48:1426:48 | x | atl.cpp:1426:40:1426:49 | new |  |
+| atl.cpp:1427:79:1427:79 | call to operator& | atl.cpp:1428:45:1428:47 | pp2 |  |
+| atl.cpp:1428:44:1428:44 | call to operator* | atl.cpp:1429:9:1429:11 | qq2 |  |
+| atl.cpp:1429:14:1429:16 | call to Get | atl.cpp:1429:8:1429:18 | * ... | TAINT |
+| atl.cpp:1431:5:1431:5 | s | atl.cpp:1432:3:1432:3 | s |  |
+| atl.cpp:1431:5:1431:5 | s | atl.cpp:1433:33:1433:33 | s |  |
+| atl.cpp:1432:3:1432:3 | s [post update] | atl.cpp:1433:33:1433:33 | s |  |
+| atl.cpp:1432:3:1432:21 | ... = ... | atl.cpp:1432:5:1432:5 | x [post update] |  |
+| atl.cpp:1432:9:1432:19 | call to source | atl.cpp:1432:3:1432:21 | ... = ... |  |
+| atl.cpp:1433:32:1433:33 | & ... | atl.cpp:1433:32:1433:34 | call to ComPtr | TAINT |
+| atl.cpp:1433:32:1433:33 | ref arg & ... | atl.cpp:1433:33:1433:33 | s [inner post update] |  |
+| atl.cpp:1433:32:1433:34 | call to ComPtr | atl.cpp:1434:8:1434:9 | p3 |  |
+| atl.cpp:1433:32:1433:34 | call to ComPtr | atl.cpp:1435:1:1435:1 | p3 |  |
+| atl.cpp:1433:33:1433:33 | s | atl.cpp:1433:32:1433:33 | & ... |  |
+| atl.cpp:1434:8:1434:9 | ref arg p3 | atl.cpp:1435:1:1435:1 | p3 |  |
+| atl.cpp:1438:31:1438:32 | call to ComPtr | atl.cpp:1439:3:1439:4 | p1 |  |
+| atl.cpp:1438:31:1438:32 | call to ComPtr | atl.cpp:1440:9:1440:10 | p1 |  |
+| atl.cpp:1438:31:1438:32 | call to ComPtr | atl.cpp:1447:8:1447:9 | p1 |  |
+| atl.cpp:1438:31:1438:32 | call to ComPtr | atl.cpp:1451:8:1451:9 | p1 |  |
+| atl.cpp:1438:31:1438:32 | call to ComPtr | atl.cpp:1455:18:1455:19 | p1 |  |
+| atl.cpp:1438:31:1438:32 | call to ComPtr | atl.cpp:1459:18:1459:19 | p1 |  |
+| atl.cpp:1438:31:1438:32 | call to ComPtr | atl.cpp:1461:1:1461:1 | p1 |  |
+| atl.cpp:1439:3:1439:4 | ref arg p1 | atl.cpp:1440:9:1440:10 | p1 |  |
+| atl.cpp:1439:3:1439:4 | ref arg p1 | atl.cpp:1447:8:1447:9 | p1 |  |
+| atl.cpp:1439:3:1439:4 | ref arg p1 | atl.cpp:1451:8:1451:9 | p1 |  |
+| atl.cpp:1439:3:1439:4 | ref arg p1 | atl.cpp:1455:18:1455:19 | p1 |  |
+| atl.cpp:1439:3:1439:4 | ref arg p1 | atl.cpp:1459:18:1459:19 | p1 |  |
+| atl.cpp:1439:3:1439:4 | ref arg p1 | atl.cpp:1461:1:1461:1 | p1 |  |
+| atl.cpp:1439:16:1439:26 | call to source | atl.cpp:1439:8:1439:29 | new |  |
+| atl.cpp:1440:9:1440:10 | ref arg p1 | atl.cpp:1447:8:1447:9 | p1 |  |
+| atl.cpp:1440:9:1440:10 | ref arg p1 | atl.cpp:1451:8:1451:9 | p1 |  |
+| atl.cpp:1440:9:1440:10 | ref arg p1 | atl.cpp:1455:18:1455:19 | p1 |  |
+| atl.cpp:1440:9:1440:10 | ref arg p1 | atl.cpp:1459:18:1459:19 | p1 |  |
+| atl.cpp:1440:9:1440:10 | ref arg p1 | atl.cpp:1461:1:1461:1 | p1 |  |
+| atl.cpp:1440:12:1440:14 | call to Get | atl.cpp:1440:8:1440:16 | * ... | TAINT |
+| atl.cpp:1442:31:1442:32 | call to ComPtr | atl.cpp:1443:3:1443:4 | p2 |  |
+| atl.cpp:1442:31:1442:32 | call to ComPtr | atl.cpp:1444:9:1444:10 | p2 |  |
+| atl.cpp:1442:31:1442:32 | call to ComPtr | atl.cpp:1461:1:1461:1 | p2 |  |
+| atl.cpp:1443:3:1443:4 | ref arg p2 | atl.cpp:1444:9:1444:10 | p2 |  |
+| atl.cpp:1443:3:1443:4 | ref arg p2 | atl.cpp:1461:1:1461:1 | p2 |  |
+| atl.cpp:1443:17:1443:28 | call to source | atl.cpp:1443:8:1443:31 | new |  |
+| atl.cpp:1444:9:1444:10 | ref arg p2 | atl.cpp:1461:1:1461:1 | p2 |  |
+| atl.cpp:1444:12:1444:14 | call to Get | atl.cpp:1444:8:1444:16 | * ... | TAINT |
+| atl.cpp:1446:31:1446:32 | call to ComPtr | atl.cpp:1447:3:1447:4 | p3 |  |
+| atl.cpp:1446:31:1446:32 | call to ComPtr | atl.cpp:1448:9:1448:10 | p3 |  |
+| atl.cpp:1446:31:1446:32 | call to ComPtr | atl.cpp:1461:1:1461:1 | p3 |  |
+| atl.cpp:1447:3:1447:4 | ref arg p3 | atl.cpp:1448:9:1448:10 | p3 |  |
+| atl.cpp:1447:3:1447:4 | ref arg p3 | atl.cpp:1461:1:1461:1 | p3 |  |
+| atl.cpp:1447:8:1447:9 | p1 | atl.cpp:1447:3:1447:4 | ref arg p3 | TAINT |
+| atl.cpp:1447:8:1447:9 | p1 | atl.cpp:1447:6:1447:6 | call to operator= | TAINT |
+| atl.cpp:1448:9:1448:10 | ref arg p3 | atl.cpp:1461:1:1461:1 | p3 |  |
+| atl.cpp:1448:12:1448:14 | call to Get | atl.cpp:1448:8:1448:16 | * ... | TAINT |
+| atl.cpp:1450:32:1450:33 | call to ComPtr | atl.cpp:1451:3:1451:4 | p4 |  |
+| atl.cpp:1450:32:1450:33 | call to ComPtr | atl.cpp:1452:9:1452:10 | p4 |  |
+| atl.cpp:1450:32:1450:33 | call to ComPtr | atl.cpp:1461:1:1461:1 | p4 |  |
+| atl.cpp:1451:3:1451:4 | ref arg p4 | atl.cpp:1452:9:1452:10 | p4 |  |
+| atl.cpp:1451:3:1451:4 | ref arg p4 | atl.cpp:1461:1:1461:1 | p4 |  |
+| atl.cpp:1452:9:1452:10 | ref arg p4 | atl.cpp:1461:1:1461:1 | p4 |  |
+| atl.cpp:1452:12:1452:14 | call to Get | atl.cpp:1452:8:1452:16 | * ... | TAINT |
+| atl.cpp:1454:31:1454:32 | call to ComPtr | atl.cpp:1455:3:1455:4 | p5 |  |
+| atl.cpp:1454:31:1454:32 | call to ComPtr | atl.cpp:1456:9:1456:10 | p5 |  |
+| atl.cpp:1454:31:1454:32 | call to ComPtr | atl.cpp:1461:1:1461:1 | p5 |  |
+| atl.cpp:1455:3:1455:4 | ref arg p5 | atl.cpp:1456:9:1456:10 | p5 |  |
+| atl.cpp:1455:3:1455:4 | ref arg p5 | atl.cpp:1461:1:1461:1 | p5 |  |
+| atl.cpp:1455:8:1455:16 | call to move | atl.cpp:1455:3:1455:4 | ref arg p5 | TAINT |
+| atl.cpp:1455:8:1455:16 | call to move | atl.cpp:1455:6:1455:6 | call to operator= | TAINT |
+| atl.cpp:1455:8:1455:16 | ref arg call to move | atl.cpp:1455:18:1455:19 | p1 [inner post update] |  |
+| atl.cpp:1455:8:1455:16 | ref arg call to move | atl.cpp:1459:18:1459:19 | p1 |  |
+| atl.cpp:1455:8:1455:16 | ref arg call to move | atl.cpp:1461:1:1461:1 | p1 |  |
+| atl.cpp:1455:18:1455:19 | p1 | atl.cpp:1455:3:1455:4 | ref arg p5 | TAINT |
+| atl.cpp:1455:18:1455:19 | p1 | atl.cpp:1455:6:1455:6 | call to operator= | TAINT |
+| atl.cpp:1455:18:1455:19 | p1 | atl.cpp:1455:8:1455:16 | call to move | TAINT |
+| atl.cpp:1456:9:1456:10 | ref arg p5 | atl.cpp:1461:1:1461:1 | p5 |  |
+| atl.cpp:1456:12:1456:14 | call to Get | atl.cpp:1456:8:1456:16 | * ... | TAINT |
+| atl.cpp:1458:32:1458:33 | call to ComPtr | atl.cpp:1459:3:1459:4 | p6 |  |
+| atl.cpp:1458:32:1458:33 | call to ComPtr | atl.cpp:1460:9:1460:10 | p6 |  |
+| atl.cpp:1458:32:1458:33 | call to ComPtr | atl.cpp:1461:1:1461:1 | p6 |  |
+| atl.cpp:1459:3:1459:4 | ref arg p6 | atl.cpp:1460:9:1460:10 | p6 |  |
+| atl.cpp:1459:3:1459:4 | ref arg p6 | atl.cpp:1461:1:1461:1 | p6 |  |
+| atl.cpp:1459:8:1459:16 | ref arg call to move | atl.cpp:1459:18:1459:19 | p1 [inner post update] |  |
+| atl.cpp:1459:8:1459:16 | ref arg call to move | atl.cpp:1461:1:1461:1 | p1 |  |
+| atl.cpp:1459:18:1459:19 | p1 | atl.cpp:1459:8:1459:16 | call to move | TAINT |
+| atl.cpp:1460:9:1460:10 | ref arg p6 | atl.cpp:1461:1:1461:1 | p6 |  |
+| atl.cpp:1460:12:1460:14 | call to Get | atl.cpp:1460:8:1460:16 | * ... | TAINT |
 | bsd.cpp:17:11:17:16 | call to source | bsd.cpp:20:18:20:18 | s |  |
 | bsd.cpp:18:12:18:15 | addr | bsd.cpp:20:22:20:25 | addr |  |
 | bsd.cpp:18:12:18:15 | addr | bsd.cpp:23:8:23:11 | addr |  |
@@ -7767,6 +7984,30 @@ 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 |  |
+| taint.cpp:841:21:841:35 | call to indirect_source | taint.cpp:842:11:842:12 | fp |  |
+| taint.cpp:841:21:841:35 | call to indirect_source | taint.cpp:843:16:843:17 | fp |  |
+| taint.cpp:842:11:842:12 | ref arg fp | taint.cpp:843:16:843:17 | fp |  |
+| taint.cpp:842:15:842:16 |  | taint.cpp:842:11:842:12 | ref arg fp | TAINT |
+| taint.cpp:851:10:851:15 | call to source | taint.cpp:852:18:852:18 | s |  |
+| taint.cpp:851:10:851:15 | call to source | taint.cpp:854:18:854:18 | s |  |
+| taint.cpp:852:10:852:16 | call to toupper | taint.cpp:853:7:853:7 | u |  |
+| taint.cpp:854:10:854:16 | call to tolower | taint.cpp:855:7:855:7 | l |  |
+| taint.cpp:861:24:861:27 | size | taint.cpp:866:16:866:19 | size |  |
+| taint.cpp:862:12:862:26 | call to indirect_source | taint.cpp:866:12:866:12 | s |  |
+| taint.cpp:863:7:863:9 | out | taint.cpp:864:12:864:14 | out |  |
+| taint.cpp:864:12:864:14 | out | taint.cpp:866:23:866:23 | p |  |
+| taint.cpp:864:12:864:14 | out | taint.cpp:867:8:867:8 | p |  |
+| taint.cpp:865:9:865:16 | size_out | taint.cpp:866:27:866:34 | size_out |  |
+| taint.cpp:866:11:866:12 | ref arg & ... | taint.cpp:866:12:866:12 | s [inner post update] |  |
+| taint.cpp:866:12:866:12 | s | taint.cpp:866:11:866:12 | & ... |  |
+| taint.cpp:866:15:866:19 | ref arg & ... | taint.cpp:866:16:866:19 | size [inner post update] |  |
+| taint.cpp:866:16:866:19 | size | taint.cpp:866:15:866:19 | & ... |  |
+| taint.cpp:866:22:866:23 | ref arg & ... | taint.cpp:866:23:866:23 | p [inner post update] |  |
+| taint.cpp:866:22:866:23 | ref arg & ... | taint.cpp:867:8:867:8 | p |  |
+| taint.cpp:866:23:866:23 | p | taint.cpp:866:22:866:23 | & ... |  |
+| taint.cpp:866:26:866:34 | ref arg & ... | taint.cpp:866:27:866:34 | size_out [inner post update] |  |
+| taint.cpp:866:27:866:34 | size_out | taint.cpp:866:26:866:34 | & ... |  |
+| taint.cpp:867:8:867:8 | p | taint.cpp:867:7:867:8 | * ... | TAINT |
 | 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 |  |
diff --git a/cpp/ql/test/library-tests/dataflow/taint-tests/taint.cpp b/cpp/ql/test/library-tests/dataflow/taint-tests/taint.cpp
index 74bcf26ea7d..70d5b8c7b00 100644
--- a/cpp/ql/test/library-tests/dataflow/taint-tests/taint.cpp
+++ b/cpp/ql/test/library-tests/dataflow/taint-tests/taint.cpp
@@ -831,4 +831,38 @@ void test_write_to_const_ptr_ptr() {
   const char* out;
   take_const_ptr(out, in);
   sink(out); // $ SPURIOUS: ast
+}
+
+void indirect_sink(FILE *fp);
+int fprintf(FILE *fp, const char *format, ...);
+
+int f7(void)
+{
+  FILE* fp = (FILE*)indirect_source();
+  fprintf(fp, "");
+	indirect_sink(fp); // $ ir MISSING: ast
+  return 0;
+}
+
+int toupper(int);
+int tolower(int);
+
+void test_toupper_and_tolower() {
+	int s = source();
+	int u = toupper(s);
+	sink(u); // $ ir MISSING: ast
+	int l = tolower(s);
+	sink(l); // $ ir MISSING: ast
+}
+
+typedef int iconv_t;
+size_t iconv(iconv_t cd, char **, size_t *, char **, size_t *);
+
+void test_iconv(size_t size) {
+	char* s = indirect_source();
+	char out[10];
+	char* p = out;
+	size_t size_out;
+	iconv(0, &s, &size, &p, &size_out);
+	sink(*p); // $ ast,ir
 }
\ No newline at end of file
diff --git a/cpp/ql/test/library-tests/dataflow/taint-tests/taint.ql b/cpp/ql/test/library-tests/dataflow/taint-tests/taint.ql
index f5f483cdf1b..3bde6ca03f0 100644
--- a/cpp/ql/test/library-tests/dataflow/taint-tests/taint.ql
+++ b/cpp/ql/test/library-tests/dataflow/taint-tests/taint.ql
@@ -117,6 +117,11 @@ module IRTest {
         call.getTarget().getName() = "sink" and
         [sink.asExpr(), sink.asIndirectExpr()] = call.getAnArgument()
       )
+      or
+      exists(FunctionCall call |
+        call.getTarget().getName() = "indirect_sink" and
+        sink.asIndirectExpr() = call.getAnArgument()
+      )
     }
 
     predicate isBarrier(DataFlow::Node barrier) {
diff --git 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
index 239ed2ec607..2409e711e6d 100644
--- 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
@@ -1,19372 +1,142 @@
 signatureMatches
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | ASN1_STRING_type_new | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | ASN1_tag2bit | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | ASN1_tag2str | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | Jim_ReturnCode | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | Jim_SignalId | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | OBJ_nid2ln | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | OBJ_nid2obj | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | OBJ_nid2sn | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | OSSL_trace_get_category_name | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | PKCS12_init | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | Symbol_Nth | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | X509_PURPOSE_get0 | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | X509_TRUST_get0 | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | X509_TRUST_get_by_id | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | __btowc | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | __current_locale_name | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | __fdopendir | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | __get_errlist | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | __get_errname | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | __math_invalid_i | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | __math_invalidf_i | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | __p_class | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | __p_rcode | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | __p_type | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | __pkey_get | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | __sigdescr_np | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | __strerrordesc_np | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | _tolower | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | _toupper | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | btowc | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | c_tolower | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | c_toupper | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | curlx_sitouz | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | evp_pkey_type2name | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | inet6_option_space | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | isalnum | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | isalpha | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | isblank | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | iscntrl | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | isdigit | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | isgraph | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | islower | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | isprint | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | ispunct | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | isspace | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | isupper | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | isxdigit | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | ossl_tolower | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | ossl_toupper | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | sigabbrev_np | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | sqlite3_compileoption_get | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | sqlite3_errstr | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | strerrorname_np | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | support_report_failure | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | svcudp_create | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | tls13_alert_code | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | toascii | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | tolower | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | toupper | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | uabs | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | uv__accept | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | uv_err_name | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | uv_get_osfhandle | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | uv_strerror | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | uv_translate_sys_error | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) |  | zError | 0 |
-| arrayassignment.cpp:3:6:3:9 | sink | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | ASN1_STRING_type_new | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | ASN1_tag2bit | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | ASN1_tag2str | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | Jim_ReturnCode | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | Jim_SignalId | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | OBJ_nid2ln | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | OBJ_nid2obj | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | OBJ_nid2sn | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | OSSL_trace_get_category_name | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | PKCS12_init | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | Symbol_Nth | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | X509_PURPOSE_get0 | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | X509_TRUST_get0 | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | X509_TRUST_get_by_id | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | __btowc | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | __current_locale_name | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | __fdopendir | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | __get_errlist | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | __get_errname | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | __math_invalid_i | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | __math_invalidf_i | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | __p_class | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | __p_rcode | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | __p_type | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | __pkey_get | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | __sigdescr_np | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | __strerrordesc_np | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | _tolower | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | _toupper | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | btowc | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | c_tolower | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | c_toupper | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | curlx_sitouz | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | evp_pkey_type2name | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | inet6_option_space | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | isalnum | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | isalpha | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | isblank | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | iscntrl | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | isdigit | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | isgraph | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | islower | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | isprint | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | ispunct | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | isspace | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | isupper | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | isxdigit | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | ossl_tolower | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | ossl_toupper | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | sigabbrev_np | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | sqlite3_compileoption_get | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | sqlite3_errstr | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | strerrorname_np | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | support_report_failure | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | svcudp_create | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | tls13_alert_code | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | toascii | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | tolower | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | toupper | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | uabs | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | uv__accept | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | uv_err_name | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | uv_get_osfhandle | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | uv_strerror | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | uv_translate_sys_error | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) |  | zError | 0 |
-| arrayassignment.cpp:88:7:88:9 | get | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | ASN1_STRING_type_new | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | ASN1_tag2bit | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | ASN1_tag2str | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | Jim_ReturnCode | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | Jim_SignalId | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | OBJ_nid2ln | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | OBJ_nid2obj | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | OBJ_nid2sn | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | OSSL_trace_get_category_name | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | PKCS12_init | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | Symbol_Nth | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | X509_PURPOSE_get0 | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | X509_TRUST_get0 | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | X509_TRUST_get_by_id | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | __btowc | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | __current_locale_name | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | __fdopendir | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | __get_errlist | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | __get_errname | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | __math_invalid_i | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | __math_invalidf_i | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | __p_class | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | __p_rcode | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | __p_type | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | __pkey_get | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | __sigdescr_np | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | __strerrordesc_np | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | _tolower | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | _toupper | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | btowc | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | c_tolower | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | c_toupper | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | curlx_sitouz | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | evp_pkey_type2name | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | inet6_option_space | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | isalnum | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | isalpha | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | isblank | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | iscntrl | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | isdigit | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | isgraph | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | islower | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | isprint | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | ispunct | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | isspace | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | isupper | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | isxdigit | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | ossl_tolower | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | ossl_toupper | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | sigabbrev_np | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | sqlite3_compileoption_get | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | sqlite3_errstr | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | strerrorname_np | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | support_report_failure | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | svcudp_create | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | tls13_alert_code | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | toascii | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | tolower | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | toupper | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | uabs | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | uv__accept | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | uv_err_name | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | uv_get_osfhandle | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | uv_strerror | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | uv_translate_sys_error | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) |  | zError | 0 |
-| arrayassignment.cpp:90:7:90:16 | operator[] | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| arrayassignment.cpp:124:6:124:9 | sink | (int *) |  | rresvport | 0 |
-| atl.cpp:71:5:71:17 | _U_STRINGorID | (UINT) | CComBSTR | LoadString | 0 |
-| atl.cpp:71:5:71:17 | _U_STRINGorID | (UINT) | _U_STRINGorID | _U_STRINGorID | 0 |
-| atl.cpp:71:5:71:17 | _U_STRINGorID | (unsigned int) |  | Jim_IntHashFunction | 0 |
-| atl.cpp:71:5:71:17 | _U_STRINGorID | (unsigned int) |  | __sleep | 0 |
-| atl.cpp:71:5:71:17 | _U_STRINGorID | (unsigned int) |  | __x86_get_cpuid_feature_leaf | 0 |
-| atl.cpp:71:5:71:17 | _U_STRINGorID | (unsigned int) |  | curlx_uitous | 0 |
-| atl.cpp:71:5:71:17 | _U_STRINGorID | (unsigned int) |  | la_version | 0 |
-| atl.cpp:71:5:71:17 | _U_STRINGorID | (unsigned int) |  | ssl3_get_cipher | 0 |
-| atl.cpp:72:5:72:17 | _U_STRINGorID | (LPCTSTR) | _U_STRINGorID | _U_STRINGorID | 0 |
-| atl.cpp:72:5:72:17 | _U_STRINGorID | (const char *) |  | BIO_gethostbyname | 0 |
-| atl.cpp:72:5:72:17 | _U_STRINGorID | (const char *) |  | Curl_copy_header_value | 0 |
-| atl.cpp:72:5:72:17 | _U_STRINGorID | (const char *) |  | Curl_get_scheme_handler | 0 |
-| atl.cpp:72:5:72:17 | _U_STRINGorID | (const char *) |  | Curl_getdate_capped | 0 |
-| atl.cpp:72:5:72:17 | _U_STRINGorID | (const char *) |  | Jim_StrDup | 0 |
-| atl.cpp:72:5:72:17 | _U_STRINGorID | (const char *) |  | OPENSSL_LH_strhash | 0 |
-| atl.cpp:72:5:72:17 | _U_STRINGorID | (const char *) |  | OSSL_STORE_SEARCH_by_alias | 0 |
-| atl.cpp:72:5:72:17 | _U_STRINGorID | (const char *) |  | Strsafe | 0 |
-| atl.cpp:72:5:72:17 | _U_STRINGorID | (const char *) |  | Symbol_new | 0 |
-| atl.cpp:72:5:72:17 | _U_STRINGorID | (const char *) |  | UI_create_method | 0 |
-| atl.cpp:72:5:72:17 | _U_STRINGorID | (const char *) |  | X509V3_parse_list | 0 |
-| atl.cpp:72:5:72:17 | _U_STRINGorID | (const char *) |  | X509_LOOKUP_meth_new | 0 |
-| atl.cpp:72:5:72:17 | _U_STRINGorID | (const char *) |  | __basename | 0 |
-| atl.cpp:72:5:72:17 | _U_STRINGorID | (const char *) |  | __gconv_find_shlib | 0 |
-| atl.cpp:72:5:72:17 | _U_STRINGorID | (const char *) |  | __gettext | 0 |
-| atl.cpp:72:5:72:17 | _U_STRINGorID | (const char *) |  | __hash_string | 0 |
-| atl.cpp:72:5:72:17 | _U_STRINGorID | (const char *) |  | __nss_action_parse | 0 |
-| atl.cpp:72:5:72:17 | _U_STRINGorID | (const char *) |  | __strdup | 0 |
-| atl.cpp:72:5:72:17 | _U_STRINGorID | (const char *) |  | __textdomain | 0 |
-| atl.cpp:72:5:72:17 | _U_STRINGorID | (const char *) |  | __tzset_parse_tz | 0 |
-| atl.cpp:72:5:72:17 | _U_STRINGorID | (const char *) |  | __tzstring | 0 |
-| atl.cpp:72:5:72:17 | _U_STRINGorID | (const char *) |  | a2i_IPADDRESS | 0 |
-| atl.cpp:72:5:72:17 | _U_STRINGorID | (const char *) |  | a2i_IPADDRESS_NC | 0 |
-| atl.cpp:72:5:72:17 | _U_STRINGorID | (const char *) |  | a64l | 0 |
-| atl.cpp:72:5:72:17 | _U_STRINGorID | (const char *) |  | charmap_opendir | 0 |
-| atl.cpp:72:5:72:17 | _U_STRINGorID | (const char *) |  | ether_aton | 0 |
-| atl.cpp:72:5:72:17 | _U_STRINGorID | (const char *) |  | getdate | 0 |
-| atl.cpp:72:5:72:17 | _U_STRINGorID | (const char *) |  | inetstr2int | 0 |
-| atl.cpp:72:5:72:17 | _U_STRINGorID | (const char *) |  | last_component | 0 |
-| atl.cpp:72:5:72:17 | _U_STRINGorID | (const char *) |  | new_glibc_hwcaps_subdirectory | 0 |
-| atl.cpp:72:5:72:17 | _U_STRINGorID | (const char *) |  | opt_path_end | 0 |
-| atl.cpp:72:5:72:17 | _U_STRINGorID | (const char *) |  | opt_progname | 0 |
-| atl.cpp:72:5:72:17 | _U_STRINGorID | (const char *) |  | ossl_lh_strcasehash | 0 |
-| atl.cpp:72:5:72:17 | _U_STRINGorID | (const char *) |  | repertoire_read | 0 |
-| atl.cpp:72:5:72:17 | _U_STRINGorID | (const char *) |  | res_gethostbyname | 0 |
-| atl.cpp:72:5:72:17 | _U_STRINGorID | (const char *) |  | sgetsgent | 0 |
-| atl.cpp:72:5:72:17 | _U_STRINGorID | (const char *) |  | sgetspent | 0 |
-| atl.cpp:72:5:72:17 | _U_STRINGorID | (const char *) |  | strhash | 0 |
-| atl.cpp:72:5:72:17 | _U_STRINGorID | (const char *) |  | uc_script_byname | 0 |
-| atl.cpp:72:5:72:17 | _U_STRINGorID | (const char *) |  | uv__strdup | 0 |
-| atl.cpp:72:5:72:17 | _U_STRINGorID | (const char *) |  | uv_wtf8_length_as_utf16 | 0 |
-| atl.cpp:72:5:72:17 | _U_STRINGorID | (const char *) |  | xstrdup | 0 |
-| atl.cpp:201:8:201:12 | GetAt | (size_t) |  | BrotliEncoderMaxCompressedSize | 0 |
-| atl.cpp:201:8:201:12 | GetAt | (size_t) |  | EVP_PKEY_meth_get0 | 0 |
-| atl.cpp:201:8:201:12 | GetAt | (size_t) |  | __libc_malloc | 0 |
-| atl.cpp:201:8:201:12 | GetAt | (size_t) |  | __libc_valloc | 0 |
-| atl.cpp:201:8:201:12 | GetAt | (size_t) |  | _dl_early_allocate | 0 |
-| atl.cpp:201:8:201:12 | GetAt | (size_t) |  | curlx_uztosi | 0 |
-| atl.cpp:201:8:201:12 | GetAt | (size_t) |  | curlx_uztosz | 0 |
-| atl.cpp:201:8:201:12 | GetAt | (size_t) |  | curlx_uztoui | 0 |
-| atl.cpp:201:8:201:12 | GetAt | (size_t) |  | curlx_uztoul | 0 |
-| atl.cpp:201:8:201:12 | GetAt | (size_t) |  | malloc | 0 |
-| atl.cpp:201:8:201:12 | GetAt | (size_t) |  | ossl_get_extension_type | 0 |
-| atl.cpp:201:8:201:12 | GetAt | (size_t) |  | ossl_param_bytes_to_blocks | 0 |
-| atl.cpp:201:8:201:12 | GetAt | (size_t) |  | ossl_quic_sstream_new | 0 |
-| atl.cpp:201:8:201:12 | GetAt | (size_t) |  | ssl_cert_new | 0 |
-| atl.cpp:201:8:201:12 | GetAt | (size_t) |  | support_next_to_fault_allocate | 0 |
-| atl.cpp:201:8:201:12 | GetAt | (size_t) |  | support_next_to_fault_allocate_before | 0 |
-| atl.cpp:201:8:201:12 | GetAt | (size_t) |  | support_stack_alloc | 0 |
-| atl.cpp:201:8:201:12 | GetAt | (size_t) |  | xalloc_sigstack | 0 |
-| atl.cpp:206:10:206:17 | InsertAt | (BLAKE2B_CTX *,const void *,size_t) |  | ossl_blake2b_update | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (BLAKE2B_PARAM *,const uint8_t *,size_t) |  | ossl_blake2b_param_set_personal | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (BLAKE2B_PARAM *,const uint8_t *,size_t) |  | ossl_blake2b_param_set_salt | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (BLAKE2S_CTX *,const void *,size_t) |  | ossl_blake2s_update | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (BLAKE2S_PARAM *,const uint8_t *,size_t) |  | ossl_blake2s_param_set_personal | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (BLAKE2S_PARAM *,const uint8_t *,size_t) |  | ossl_blake2s_param_set_salt | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (CCM128_CONTEXT *,const unsigned char *,size_t) |  | CRYPTO_ccm128_aad | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (CCM128_CONTEXT *,unsigned char *,size_t) |  | CRYPTO_ccm128_tag | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (CMAC_CTX *,const void *,size_t) |  | CMAC_Update | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (CMS_RecipientInfo *,const unsigned char *,size_t) |  | CMS_RecipientInfo_kekri_id_cmp | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (Curl_easy *,unsigned char *,size_t) |  | Curl_rand_alnum | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (Curl_easy *,unsigned char *,size_t) |  | Curl_rand_bytes | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (Curl_easy *,unsigned char *,size_t) |  | Curl_rand_hex | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (DH *,const unsigned char *,size_t) |  | ossl_dh_buf2key | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (EC_GROUP *,const unsigned char *,size_t) |  | EC_GROUP_set_seed | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (EC_KEY *,const unsigned char *,size_t) |  | ossl_ec_key_simple_oct2priv | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (EVP_MAC_CTX **,const void *,size_t) |  | _libssh2_hmac_update | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (EVP_MAC_CTX **,void *,size_t) |  | _libssh2_hmac_sha1_init | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (EVP_MAC_CTX **,void *,size_t) |  | _libssh2_hmac_sha256_init | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (EVP_MAC_CTX **,void *,size_t) |  | _libssh2_hmac_sha512_init | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (EVP_MD_CTX **,const void *,size_t) |  | _libssh2_sha1_update | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (EVP_MD_CTX **,const void *,size_t) |  | _libssh2_sha256_update | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (EVP_MD_CTX **,const void *,size_t) |  | _libssh2_sha384_update | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (EVP_MD_CTX **,const void *,size_t) |  | _libssh2_sha512_update | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (EVP_MD_CTX *,const unsigned char *,size_t) |  | EVP_DigestVerifyFinal | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (EVP_PKEY *,char *,size_t) |  | EVP_PKEY_get_default_digest_name | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (EVP_RAND_CTX *,unsigned char *,size_t) |  | EVP_RAND_nonce | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (FFC_PARAMS *,const unsigned char *,size_t) |  | ossl_ffc_params_set_seed | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (FILE *,const char *,size_t) |  | _IO_new_do_write | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (FILE *,const void *,size_t) |  | _IO_default_xsputn | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (FILE *,const void *,size_t) |  | _IO_new_file_xsputn | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (FILE *,const void *,size_t) |  | _IO_wdefault_xsputn | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (FILE *,const void *,size_t) |  | _IO_wfile_xsputn | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (FILE *,const void *,size_t) |  | __printf_buffer_as_file_xsputn | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (FILE *,const void *,size_t) |  | __wprintf_buffer_as_file_xsputn | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (FILE *,void *,size_t) |  | _IO_default_xsgetn | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (FILE *,void *,size_t) |  | _IO_file_xsgetn | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (FILE *,void *,size_t) |  | _IO_file_xsgetn_mmap | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (FILE *,void *,size_t) |  | _IO_wdefault_xsgetn | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (GCM128_CONTEXT *,const unsigned char *,size_t) |  | CRYPTO_gcm128_aad | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (GCM128_CONTEXT *,const unsigned char *,size_t) |  | CRYPTO_gcm128_setiv | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (GCM128_CONTEXT *,unsigned char *,size_t) |  | CRYPTO_gcm128_tag | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (KECCAK1600_CTX *,const void *,size_t) |  | ossl_sha3_update | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (KECCAK1600_CTX *,unsigned char *,size_t) |  | ossl_sha3_squeeze | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (KECCAK1600_CTX *,unsigned char,size_t) |  | ossl_sha3_init | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (LIBSSH2_CHANNEL *,const char *,size_t) |  | libssh2_channel_signal_ex | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (LIBSSH2_SFTP_HANDLE *,char *,size_t) |  | libssh2_sftp_read | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (LIBSSH2_SFTP_HANDLE *,const char *,size_t) |  | libssh2_sftp_write | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (MD4_CTX *,const void *,size_t) |  | MD4_Update | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (MD4_CTX *,const void *,size_t) |  | md4_block_data_order | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (MD5_CTX *,const void *,size_t) |  | MD5_Update | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (MD5_SHA1_CTX *,const void *,size_t) |  | ossl_md5_sha1_update | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (MDC2_CTX *,const unsigned char *,size_t) |  | MDC2_Update | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (ML_DSA_KEY *,const uint8_t *,size_t) |  | ossl_ml_dsa_pk_decode | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (ML_DSA_KEY *,const uint8_t *,size_t) |  | ossl_ml_dsa_sk_decode | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (MemoryManager *,const uint8_t *,size_t) |  | CreatePreparedDictionary | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (OCB128_CONTEXT *,const unsigned char *,size_t) |  | CRYPTO_ocb128_aad | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (OCB128_CONTEXT *,unsigned char *,size_t) |  | CRYPTO_ocb128_tag | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (OSSL_HPKE_CTX *,const unsigned char *,size_t) |  | OSSL_HPKE_CTX_set1_ikme | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (OSSL_JSON_ENC *,const char *,size_t) |  | ossl_json_str_len | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (OSSL_JSON_ENC *,const void *,size_t) |  | ossl_json_str_hex | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (OSSL_LIB_CTX *,unsigned char *,size_t) |  | ossl_rand_cleanup_entropy | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (OSSL_LIB_CTX *,unsigned char *,size_t) |  | ossl_rand_cleanup_user_entropy | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (OSSL_PARAM *,const void *,size_t) |  | OSSL_PARAM_set_octet_ptr | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (OSSL_PARAM *,const void *,size_t) |  | OSSL_PARAM_set_octet_string | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (OSSL_PARAM *,const void *,size_t) |  | OSSL_PARAM_set_octet_string_or_ptr | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (OSSL_PARAM *,void *,size_t) |  | ossl_param_set_secure_block | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (OSSL_RECORD_LAYER *,OSSL_RECORD_TEMPLATE *,size_t) |  | tls_write_records_default | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (OSSL_RECORD_LAYER *,OSSL_RECORD_TEMPLATE *,size_t) |  | tls_write_records_multiblock | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (POLY1305 *,const unsigned char *,size_t) |  | Poly1305_Update | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (PROV_CIPHER_CTX *,const unsigned char *,size_t) |  | ossl_cipher_generic_initiv | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (PROV_CIPHER_CTX *,const unsigned char *,size_t) |  | ossl_cipher_hw_tdes_ede3_initkey | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (PROV_GCM_CTX *,const unsigned char *,size_t) |  | ossl_gcm_aad_update | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (QUIC_PN,unsigned char *,size_t) |  | ossl_quic_wire_encode_pkt_hdr_pn | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (QUIC_RXFC *,OSSL_STATM *,size_t) |  | ossl_quic_rstream_new | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (QUIC_TLS *,const unsigned char *,size_t) |  | ossl_quic_tls_set_transport_params | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (RAND_POOL *,const unsigned char *,size_t) |  | ossl_rand_pool_adin_mix_in | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (RAND_POOL *,size_t,size_t) |  | ossl_rand_pool_add_end | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (RIPEMD160_CTX *,const void *,size_t) |  | RIPEMD160_Update | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (RIPEMD160_CTX *,const void *,size_t) |  | ripemd160_block_data_order | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (SCT **,const unsigned char **,size_t) |  | o2i_SCT | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (SCT *,const unsigned char **,size_t) |  | o2i_SCT_signature | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (SCT *,const unsigned char *,size_t) |  | SCT_set1_extensions | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (SCT *,const unsigned char *,size_t) |  | SCT_set1_log_id | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (SCT *,const unsigned char *,size_t) |  | SCT_set1_signature | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (SCT *,unsigned char *,size_t) |  | SCT_set0_extensions | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (SCT *,unsigned char *,size_t) |  | SCT_set0_log_id | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (SCT *,unsigned char *,size_t) |  | SCT_set0_signature | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (SHA256_CTX *,const void *,size_t) |  | SHA224_Update | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (SHA256_CTX *,const void *,size_t) |  | SHA256_Update | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (SHA512_CTX *,const void *,size_t) |  | SHA384_Update | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (SHA512_CTX *,const void *,size_t) |  | SHA512_Update | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (SHA_CTX *,const void *,size_t) |  | SHA1_Update | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (SIPHASH *,const unsigned char *,size_t) |  | SipHash_Update | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (SIPHASH *,unsigned char *,size_t) |  | SipHash_Final | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (SIV128_CONTEXT *,const unsigned char *,size_t) |  | ossl_siv128_set_tag | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (SIV128_CONTEXT *,unsigned char *,size_t) |  | ossl_siv128_get_tag | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (SLH_DSA_KEY *,const uint8_t *,size_t) |  | ossl_slh_dsa_set_priv | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (SLH_DSA_KEY *,const uint8_t *,size_t) |  | ossl_slh_dsa_set_pub | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (SM3_CTX *,const void *,size_t) |  | ossl_sm3_block_data_order | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (SM3_CTX *,const void *,size_t) |  | ossl_sm3_update | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (SSL *,const unsigned char *,size_t) |  | SSL_set1_client_cert_type | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (SSL *,const unsigned char *,size_t) |  | SSL_set1_server_cert_type | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (SSL *,const unsigned char *,size_t) |  | SSL_set_quic_tls_transport_params | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (SSL *,size_t,size_t) |  | SSL_set_block_padding_ex | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (SSL_CONNECTION *,TLS_RECORD *,size_t) |  | ssl_release_record | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (SSL_CONNECTION *,const unsigned char *,size_t) |  | lookup_sess_in_cache | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (SSL_CTX *,const unsigned char *,size_t) |  | SSL_CTX_set1_client_cert_type | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (SSL_CTX *,const unsigned char *,size_t) |  | SSL_CTX_set1_server_cert_type | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (SSL_CTX *,size_t,size_t) |  | SSL_CTX_set_block_padding_ex | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (SSL_SESSION *,const unsigned char *,size_t) |  | SSL_SESSION_set1_alpn_selected | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (SSL_SESSION *,const unsigned char *,size_t) |  | SSL_SESSION_set1_master_key | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (SSL_SESSION *,const void *,size_t) |  | SSL_SESSION_set1_ticket_appdata | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (Strtab *,const char *,size_t) |  | strtabadd | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (WHIRLPOOL_CTX *,const void *,size_t) |  | WHIRLPOOL_BitUpdate | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (WHIRLPOOL_CTX *,const void *,size_t) |  | WHIRLPOOL_Update | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (WPACKET *,BUF_MEM *,size_t) |  | WPACKET_init_len | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (WPACKET *,const unsigned char *,size_t) |  | ossl_quic_wire_encode_frame_new_token | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (WPACKET *,const void *,size_t) |  | WPACKET_memcpy | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (WPACKET *,int,size_t) |  | WPACKET_memset | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (WPACKET *,uint64_t,size_t) |  | WPACKET_put_bytes__ | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (WPACKET *,unsigned char *,size_t) |  | WPACKET_init_der | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (WPACKET *,unsigned char *,size_t) |  | dtls_raw_hello_verify_request | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (X509_VERIFY_PARAM *,const char *,size_t) |  | X509_VERIFY_PARAM_add1_host | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (X509_VERIFY_PARAM *,const char *,size_t) |  | X509_VERIFY_PARAM_set1_email | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (X509_VERIFY_PARAM *,const char *,size_t) |  | X509_VERIFY_PARAM_set1_host | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (X509_VERIFY_PARAM *,const unsigned char *,size_t) |  | X509_VERIFY_PARAM_set1_ip | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (__printf_buffer *,char,size_t) |  | __printf_buffer_pad_1 | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (__printf_buffer *,const char *,size_t) |  | __printf_buffer_write | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (__printf_buffer_snprintf *,char *,size_t) |  | __printf_buffer_snprintf_init | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (__wprintf_buffer *,const wchar_t *,size_t) |  | __wprintf_buffer_write | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (__wprintf_buffer *,wchar_t,size_t) |  | __wprintf_buffer_pad_1 | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (alloc_buffer,const void *,size_t) |  | __libc_alloc_buffer_copy_bytes | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (argp_fmtstream *,argp_fmtstream_t,size_t) |  | __argp_fmtstream_ensure | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (argp_fmtstream_t,const char *,size_t) |  | __argp_fmtstream_write | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (bufc_pool *,size_t,size_t) |  | Curl_bufcp_init | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (bufq *,size_t,size_t) |  | Curl_bufq_init | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (bufref *,const void *,size_t) |  | Curl_bufref_memdup | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (char **,size_t *,size_t) |  | Curl_str_number | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (char *,const char *,size_t) |  | Curl_strntolower | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (char *,const char *,size_t) |  | Curl_strntoupper | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (char *,const char *,size_t) |  | OPENSSL_strlcat | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (char *,const char *,size_t) |  | OPENSSL_strlcpy | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (char *,const char *,size_t) |  | uv__strscpy | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (char *,size_t,size_t) |  | __getcwd_chk | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (char *__restrict__,const char *__restrict__,size_t) |  | __strlcat | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (char *__restrict__,const char *__restrict__,size_t) |  | __strlcpy | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (const CTLOG_STORE *,const uint8_t *,size_t) |  | CTLOG_STORE_get0_log_by_id | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (const EC_KEY *,unsigned char *,size_t) |  | ossl_ec_key_simple_priv2oct | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (const EVP_MD *,const OSSL_ITEM *,size_t) |  | ossl_digest_md_to_nid | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (const EVP_MD *,const unsigned char *,size_t) |  | OSSL_STORE_SEARCH_by_key_fingerprint | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (const OSSL_CMP_CTX *,char *,size_t) |  | OSSL_CMP_CTX_snprint_PKIStatus | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (const OSSL_CMP_PKISI *,char *,size_t) |  | OSSL_CMP_snprint_PKIStatusInfo | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (const OSSL_NAMEMAP *,int,size_t) |  | ossl_namemap_num2name | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (const OSSL_PARAM *,char **,size_t) |  | OSSL_PARAM_get_utf8_string | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (const SSL *,unsigned char *,size_t) |  | SSL_get_client_random | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (const SSL *,unsigned char *,size_t) |  | SSL_get_server_random | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (const SSL_SESSION *,unsigned char *,size_t) |  | SSL_SESSION_get_master_key | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (const char *,char **,size_t) |  | OSSL_PARAM_construct_utf8_ptr | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (const char *,char *,size_t) |  | OSSL_PARAM_construct_utf8_string | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (const char *,char *,size_t) |  | __libc_ns_makecanon | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (const char *,char *,size_t) |  | __realpath_chk | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (const char *,char *,size_t) |  | getpass_r | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (const char *,char *,size_t) |  | ns_makecanon | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (const char *,const char *,size_t) |  | OPENSSL_strncasecmp | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (const char *,const char *,size_t) |  | c_strncasecmp | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (const char *,uint16_t *,size_t) |  | uv_wtf8_to_utf16 | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (const char *,unsigned char *,size_t) |  | OSSL_PARAM_construct_BN | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (const char *,void **,size_t) |  | OSSL_PARAM_construct_octet_ptr | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (const char *,void *,size_t) |  | OSSL_PARAM_construct_octet_string | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (const char *,void *,size_t) |  | uv__random_readpath | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (const charmap_t *,const char *,size_t) |  | charmap_find_symbol | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (const charmap_t *,const char *,size_t) |  | charmap_find_value | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (const repertoire_t *,const char *,size_t) |  | repertoire_find_value | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (const sockaddr *,char *,size_t) |  | uv_ip_name | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (const sockaddr_in6 *,char *,size_t) |  | uv_ip6_name | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (const sockaddr_in *,char *,size_t) |  | uv_ip4_name | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (const unsigned char *,char *,size_t) |  | ___ns_name_ntop | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (const unsigned char *,size_t,size_t) |  | ossl_rand_pool_attach | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (const void *,const void *,size_t) |  | chachapoly_timingsafe_bcmp | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (const void *,size_t,size_t) |  | support_blob_repeat_allocate | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (const void *,size_t,size_t) |  | support_blob_repeat_allocate_shared | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (const_nis_name,char *,size_t) |  | nis_domain_of_r | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (const_nis_name,char *,size_t) |  | nis_leaf_of_r | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (const_nis_name,char *,size_t) |  | nis_name_of_r | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (curl_mimepart *,const char *,size_t) |  | curl_mime_data | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (curve448_scalar_t,const unsigned char *,size_t) |  | ossl_curve448_scalar_decode_long | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (dynbuf *,const void *,size_t) |  | Curl_dyn_addn | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (dynbuf *,const void *,size_t) |  | curlx_dyn_addn | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (dynhds *,const char *,size_t) |  | Curl_dynhds_get | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (dynhds *,const char *,size_t) |  | Curl_dynhds_h1_add_line | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (dynhds *,size_t,size_t) |  | Curl_dynhds_init | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (int *,const char *,size_t) |  | Curl_http_decode_status | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (int *,int *,size_t) |  | EVP_PBE_get | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (int,char *,size_t) |  | Curl_strerror | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (int,char *,size_t) |  | __strerror_r | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (int,char *,size_t) |  | __ttyname_r | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (int,char *,size_t) |  | uv_err_name_r | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (int,char *,size_t) |  | uv_strerror_r | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (int,const void *,size_t) |  | _nl_intern_locale_data | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (int,const void *,size_t) |  | writeall | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (int,int,size_t) |  | BrotliEncoderEstimatePeakMemoryUsage | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (int,void *,size_t) |  | __readall | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (locale_file *,const uint32_t *,size_t) |  | add_locale_uint32_array | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (nghttp2_buf *,uint8_t *,size_t) |  | nghttp2_buf_wrap_init | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (nghttp2_extension *,nghttp2_origin_entry *,size_t) |  | nghttp2_frame_origin_init | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (nghttp2_extpri *,const uint8_t *,size_t) |  | nghttp2_extpri_parse_priority | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (nghttp2_extpri *,const uint8_t *,size_t) |  | nghttp2_http_parse_priority | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (nghttp2_hd_deflater *,const nghttp2_nv *,size_t) |  | nghttp2_hd_deflate_bound | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (nghttp2_session *,const uint8_t *,size_t) |  | nghttp2_session_mem_recv | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (nghttp2_session *,const uint8_t *,size_t) |  | nghttp2_session_mem_recv2 | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (nghttp2_session *,int32_t,size_t) |  | nghttp2_session_consume | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (nghttp2_session *,nghttp2_settings_entry *,size_t) |  | nghttp2_session_update_local_settings | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (nghttp2_settings *,nghttp2_settings_entry *,size_t) |  | nghttp2_frame_unpack_settings_payload | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (ns_rr_cursor *,const unsigned char *,size_t) |  | __ns_rr_cursor_init | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (pthread_attr_t *,void *,size_t) |  | __pthread_attr_setstack | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (scratch_buffer *,size_t,size_t) |  | __libc_scratch_buffer_set_array_size | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (sfparse_parser *,const uint8_t *,size_t) |  | sfparse_parser_init | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (size_t,OSSL_QTX_IOVEC *,size_t) |  | ossl_quic_sstream_adjust_iov | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (stack_st_SCT **,const unsigned char **,size_t) |  | o2i_SCT_LIST | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (ucs4_t *,const uint8_t *,size_t) |  | u8_mbtouc_aux | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (uint8_t *,const nghttp2_settings_entry *,size_t) |  | nghttp2_frame_pack_settings_payload | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (uint8_t *,const void *,size_t) |  | nghttp2_cpymem | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (unsigned char **,const char *,size_t) |  | _libssh2_store_str | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (unsigned char **,const unsigned char *,size_t) |  | _libssh2_store_bignum2_bytes | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (unsigned char *,const unsigned char *,size_t) |  | BUF_reverse | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (unsigned char *,size_t *,size_t) |  | ossl_cipher_padblock | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (unsigned char *,size_t *,size_t) |  | ossl_cipher_unpadblock | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (unsigned int,char *,size_t) |  | __initstate | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (uv_thread_t *,char *,size_t) |  | uv__thread_getname | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (uv_thread_t *,char *,size_t) |  | uv_thread_getaffinity | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (uv_thread_t *,char *,size_t) |  | uv_thread_getname | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (void **,size_t,size_t) |  | __posix_memalign | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (void *,size_t,size_t) |  | Curl_hash_str | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (void *,size_t,size_t) |  | __libc_reallocarray | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (void *,unsigned char *,size_t) |  | ossl_drbg_clear_seed | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (wchar_t *,const wchar_t *,size_t) |  | __wmemcpy | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (wchar_t *,const wchar_t *,size_t) |  | __wmemmove | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (wchar_t *__restrict__,const wchar_t *__restrict__,size_t) |  | __wcslcat | 2 |
-| atl.cpp:206:10:206:17 | InsertAt | (wchar_t *__restrict__,const wchar_t *__restrict__,size_t) |  | __wcslcpy | 2 |
-| atl.cpp:213:8:213:17 | operator[] | (size_t) |  | BrotliEncoderMaxCompressedSize | 0 |
-| atl.cpp:213:8:213:17 | operator[] | (size_t) |  | EVP_PKEY_meth_get0 | 0 |
-| atl.cpp:213:8:213:17 | operator[] | (size_t) |  | __libc_malloc | 0 |
-| atl.cpp:213:8:213:17 | operator[] | (size_t) |  | __libc_valloc | 0 |
-| atl.cpp:213:8:213:17 | operator[] | (size_t) |  | _dl_early_allocate | 0 |
-| atl.cpp:213:8:213:17 | operator[] | (size_t) |  | curlx_uztosi | 0 |
-| atl.cpp:213:8:213:17 | operator[] | (size_t) |  | curlx_uztosz | 0 |
-| atl.cpp:213:8:213:17 | operator[] | (size_t) |  | curlx_uztoui | 0 |
-| atl.cpp:213:8:213:17 | operator[] | (size_t) |  | curlx_uztoul | 0 |
-| atl.cpp:213:8:213:17 | operator[] | (size_t) |  | malloc | 0 |
-| atl.cpp:213:8:213:17 | operator[] | (size_t) |  | ossl_get_extension_type | 0 |
-| atl.cpp:213:8:213:17 | operator[] | (size_t) |  | ossl_param_bytes_to_blocks | 0 |
-| atl.cpp:213:8:213:17 | operator[] | (size_t) |  | ossl_quic_sstream_new | 0 |
-| atl.cpp:213:8:213:17 | operator[] | (size_t) |  | ssl_cert_new | 0 |
-| atl.cpp:213:8:213:17 | operator[] | (size_t) |  | support_next_to_fault_allocate | 0 |
-| atl.cpp:213:8:213:17 | operator[] | (size_t) |  | support_next_to_fault_allocate_before | 0 |
-| atl.cpp:213:8:213:17 | operator[] | (size_t) |  | support_stack_alloc | 0 |
-| atl.cpp:213:8:213:17 | operator[] | (size_t) |  | xalloc_sigstack | 0 |
-| atl.cpp:259:5:259:12 | CAtlList | (UINT) | CComBSTR | LoadString | 0 |
-| atl.cpp:259:5:259:12 | CAtlList | (UINT) | CComBSTR | LoadString | 0 |
-| atl.cpp:259:5:259:12 | CAtlList | (UINT) | _U_STRINGorID | _U_STRINGorID | 0 |
-| atl.cpp:259:5:259:12 | CAtlList | (UINT) | _U_STRINGorID | _U_STRINGorID | 0 |
-| atl.cpp:259:5:259:12 | CAtlList | (unsigned int) |  | Jim_IntHashFunction | 0 |
-| atl.cpp:259:5:259:12 | CAtlList | (unsigned int) |  | Jim_IntHashFunction | 0 |
-| atl.cpp:259:5:259:12 | CAtlList | (unsigned int) |  | __sleep | 0 |
-| atl.cpp:259:5:259:12 | CAtlList | (unsigned int) |  | __sleep | 0 |
-| atl.cpp:259:5:259:12 | CAtlList | (unsigned int) |  | __x86_get_cpuid_feature_leaf | 0 |
-| atl.cpp:259:5:259:12 | CAtlList | (unsigned int) |  | __x86_get_cpuid_feature_leaf | 0 |
-| atl.cpp:259:5:259:12 | CAtlList | (unsigned int) |  | curlx_uitous | 0 |
-| atl.cpp:259:5:259:12 | CAtlList | (unsigned int) |  | curlx_uitous | 0 |
-| atl.cpp:259:5:259:12 | CAtlList | (unsigned int) |  | la_version | 0 |
-| atl.cpp:259:5:259:12 | CAtlList | (unsigned int) |  | la_version | 0 |
-| atl.cpp:259:5:259:12 | CAtlList | (unsigned int) |  | ssl3_get_cipher | 0 |
-| atl.cpp:259:5:259:12 | CAtlList | (unsigned int) |  | ssl3_get_cipher | 0 |
-| atl.cpp:268:14:268:22 | FindIndex | (size_t) |  | BrotliEncoderMaxCompressedSize | 0 |
-| atl.cpp:268:14:268:22 | FindIndex | (size_t) |  | BrotliEncoderMaxCompressedSize | 0 |
-| atl.cpp:268:14:268:22 | FindIndex | (size_t) |  | EVP_PKEY_meth_get0 | 0 |
-| atl.cpp:268:14:268:22 | FindIndex | (size_t) |  | EVP_PKEY_meth_get0 | 0 |
-| atl.cpp:268:14:268:22 | FindIndex | (size_t) |  | __libc_malloc | 0 |
-| atl.cpp:268:14:268:22 | FindIndex | (size_t) |  | __libc_malloc | 0 |
-| atl.cpp:268:14:268:22 | FindIndex | (size_t) |  | __libc_valloc | 0 |
-| atl.cpp:268:14:268:22 | FindIndex | (size_t) |  | __libc_valloc | 0 |
-| atl.cpp:268:14:268:22 | FindIndex | (size_t) |  | _dl_early_allocate | 0 |
-| atl.cpp:268:14:268:22 | FindIndex | (size_t) |  | _dl_early_allocate | 0 |
-| atl.cpp:268:14:268:22 | FindIndex | (size_t) |  | curlx_uztosi | 0 |
-| atl.cpp:268:14:268:22 | FindIndex | (size_t) |  | curlx_uztosi | 0 |
-| atl.cpp:268:14:268:22 | FindIndex | (size_t) |  | curlx_uztosz | 0 |
-| atl.cpp:268:14:268:22 | FindIndex | (size_t) |  | curlx_uztosz | 0 |
-| atl.cpp:268:14:268:22 | FindIndex | (size_t) |  | curlx_uztoui | 0 |
-| atl.cpp:268:14:268:22 | FindIndex | (size_t) |  | curlx_uztoui | 0 |
-| atl.cpp:268:14:268:22 | FindIndex | (size_t) |  | curlx_uztoul | 0 |
-| atl.cpp:268:14:268:22 | FindIndex | (size_t) |  | curlx_uztoul | 0 |
-| atl.cpp:268:14:268:22 | FindIndex | (size_t) |  | malloc | 0 |
-| atl.cpp:268:14:268:22 | FindIndex | (size_t) |  | malloc | 0 |
-| atl.cpp:268:14:268:22 | FindIndex | (size_t) |  | ossl_get_extension_type | 0 |
-| atl.cpp:268:14:268:22 | FindIndex | (size_t) |  | ossl_get_extension_type | 0 |
-| atl.cpp:268:14:268:22 | FindIndex | (size_t) |  | ossl_param_bytes_to_blocks | 0 |
-| atl.cpp:268:14:268:22 | FindIndex | (size_t) |  | ossl_param_bytes_to_blocks | 0 |
-| atl.cpp:268:14:268:22 | FindIndex | (size_t) |  | ossl_quic_sstream_new | 0 |
-| atl.cpp:268:14:268:22 | FindIndex | (size_t) |  | ossl_quic_sstream_new | 0 |
-| atl.cpp:268:14:268:22 | FindIndex | (size_t) |  | ssl_cert_new | 0 |
-| atl.cpp:268:14:268:22 | FindIndex | (size_t) |  | ssl_cert_new | 0 |
-| atl.cpp:268:14:268:22 | FindIndex | (size_t) |  | support_next_to_fault_allocate | 0 |
-| atl.cpp:268:14:268:22 | FindIndex | (size_t) |  | support_next_to_fault_allocate | 0 |
-| atl.cpp:268:14:268:22 | FindIndex | (size_t) |  | support_next_to_fault_allocate_before | 0 |
-| atl.cpp:268:14:268:22 | FindIndex | (size_t) |  | support_next_to_fault_allocate_before | 0 |
-| atl.cpp:268:14:268:22 | FindIndex | (size_t) |  | support_stack_alloc | 0 |
-| atl.cpp:268:14:268:22 | FindIndex | (size_t) |  | support_stack_alloc | 0 |
-| atl.cpp:268:14:268:22 | FindIndex | (size_t) |  | xalloc_sigstack | 0 |
-| atl.cpp:268:14:268:22 | FindIndex | (size_t) |  | xalloc_sigstack | 0 |
-| atl.cpp:409:10:409:10 | operator= | (const CComBSTR &) | CComBSTR | Append | 0 |
-| atl.cpp:409:10:409:10 | operator= | (const CComBSTR &) | CComBSTR | CComBSTR | 0 |
-| atl.cpp:411:5:411:12 | CComBSTR | (const CComBSTR &) | CComBSTR | Append | 0 |
-| atl.cpp:411:5:411:12 | CComBSTR | (const CComBSTR &) | CComBSTR | CComBSTR | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | ASN1_STRING_type_new | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | ASN1_tag2bit | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | ASN1_tag2str | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | Jim_ReturnCode | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | Jim_SignalId | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | OBJ_nid2ln | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | OBJ_nid2obj | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | OBJ_nid2sn | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | OSSL_trace_get_category_name | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | PKCS12_init | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | Symbol_Nth | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | X509_PURPOSE_get0 | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | X509_TRUST_get0 | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | X509_TRUST_get_by_id | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | __btowc | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | __current_locale_name | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | __fdopendir | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | __get_errlist | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | __get_errname | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | __math_invalid_i | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | __math_invalidf_i | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | __p_class | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | __p_rcode | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | __p_type | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | __pkey_get | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | __sigdescr_np | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | __strerrordesc_np | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | _tolower | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | _toupper | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | btowc | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | c_tolower | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | c_toupper | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | curlx_sitouz | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | evp_pkey_type2name | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | inet6_option_space | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | isalnum | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | isalpha | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | isblank | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | iscntrl | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | isdigit | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | isgraph | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | islower | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | isprint | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | ispunct | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | isspace | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | isupper | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | isxdigit | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | ossl_tolower | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | ossl_toupper | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | sigabbrev_np | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | sqlite3_compileoption_get | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | sqlite3_errstr | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | strerrorname_np | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | support_report_failure | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | svcudp_create | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | tls13_alert_code | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | toascii | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | tolower | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | toupper | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | uabs | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | uv__accept | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | uv_err_name | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | uv_get_osfhandle | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | uv_strerror | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | uv_translate_sys_error | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) |  | zError | 0 |
-| atl.cpp:412:5:412:12 | CComBSTR | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| atl.cpp:413:5:413:12 | CComBSTR | (__wprintf_buffer *,const wchar_t *) |  | __wprintf_buffer_puts_1 | 1 |
-| atl.cpp:413:5:413:12 | CComBSTR | (const wchar_t *,const wchar_t *) |  | __wcscoll | 1 |
-| atl.cpp:413:5:413:12 | CComBSTR | (const wchar_t *,const wchar_t *) |  | wcspbrk | 1 |
-| atl.cpp:413:5:413:12 | CComBSTR | (const wchar_t *,const wchar_t *) |  | wcsstr | 1 |
-| atl.cpp:413:5:413:12 | CComBSTR | (int,LPCOLESTR) | CComBSTR | CComBSTR | 0 |
-| atl.cpp:413:5:413:12 | CComBSTR | (int,LPCOLESTR) | CComBSTR | CComBSTR | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (ASN1_GENERALIZEDTIME *,const char *) |  | ASN1_GENERALIZEDTIME_set_string | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (ASN1_TIME *,const char *) |  | ASN1_TIME_set_string | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (ASN1_TIME *,const char *) |  | ASN1_TIME_set_string_X509 | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (ASN1_UTCTIME *,const char *) |  | ASN1_UTCTIME_set_string | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (BIGNUM **,const char *) |  | BN_asc2bn | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (BIGNUM **,const char *) |  | BN_dec2bn | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (BIGNUM **,const char *) |  | BN_hex2bn | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (CONF *,const char *) |  | TS_CONF_get_tsa_section | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (CONF *,const char *) |  | _CONF_new_section | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (CURLU *,const char *) |  | Curl_url_set_authority | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (Curl_easy *,const char *) |  | Curl_cwriter_get_by_name | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (Curl_easy *,const char *) |  | Curl_rtsp_parseheader | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (DH_METHOD *,const char *) |  | DH_meth_set1_name | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (DSA_METHOD *,const char *) |  | DSA_meth_set1_name | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (DSO *,const char *) |  | DSO_convert_filename | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (DSO *,const char *) |  | DSO_set_filename | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (ENGINE *,const char *) |  | ENGINE_set_id | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (ENGINE *,const char *) |  | ENGINE_set_name | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (ENGINE *,const char *) |  | OSSL_STORE_LOADER_new | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (EVP_PKEY *,const char *) |  | CTLOG_new | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (EVP_PKEY_CTX *,const char *) |  | app_paramgen | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (EVP_PKEY_CTX *,const char *) |  | pkey_ctrl_string | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (GlobalConfig *,const char *) |  | setvariable | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (Jim_Interp *,const char *) |  | Jim_Eval | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (Jim_Interp *,const char *) |  | Jim_EvalFile | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (Jim_Interp *,const char *) |  | Jim_EvalFileGlobal | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (Jim_Interp *,const char *) |  | Jim_EvalGlobal | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (LIBSSH2_AGENT *,const char *) |  | libssh2_agent_set_identity_path | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (LIBSSH2_SESSION *,const char *) |  | libssh2_banner_set | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (LIBSSH2_SESSION *,const char *) |  | libssh2_session_banner_set | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (Lmid_t,const char *) |  | _dl_lookup_map | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (OPENSSL_DIR_CTX **,const char *) |  | OPENSSL_DIR_read | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (OPENSSL_INIT_SETTINGS *,const char *) |  | OPENSSL_INIT_set_config_appname | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (OPENSSL_INIT_SETTINGS *,const char *) |  | OPENSSL_INIT_set_config_filename | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (OSSL_CMP_CTX *,const char *) |  | OSSL_CMP_CTX_set1_no_proxy | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (OSSL_CMP_CTX *,const char *) |  | OSSL_CMP_CTX_set1_proxy | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (OSSL_CMP_CTX *,const char *) |  | OSSL_CMP_CTX_set1_server | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (OSSL_CMP_CTX *,const char *) |  | OSSL_CMP_CTX_set1_serverPath | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (OSSL_DECODER_CTX *,const char *) |  | OSSL_DECODER_CTX_set_input_structure | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (OSSL_DECODER_CTX *,const char *) |  | OSSL_DECODER_CTX_set_input_type | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (OSSL_ENCODER_CTX *,const char *) |  | OSSL_ENCODER_CTX_set_output_structure | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (OSSL_ENCODER_CTX *,const char *) |  | OSSL_ENCODER_CTX_set_output_type | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (OSSL_JSON_ENC *,const char *) |  | ossl_json_key | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (OSSL_JSON_ENC *,const char *) |  | ossl_json_str | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (OSSL_LIB_CTX *,const char *) |  | CMS_ContentInfo_new_ex | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (OSSL_LIB_CTX *,const char *) |  | CTLOG_STORE_new_ex | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (OSSL_LIB_CTX *,const char *) |  | CT_POLICY_EVAL_CTX_new_ex | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (OSSL_LIB_CTX *,const char *) |  | EC_KEY_new_ex | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (OSSL_LIB_CTX *,const char *) |  | OSSL_CMP_CTX_new | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (OSSL_LIB_CTX *,const char *) |  | OSSL_CMP_MSG_new | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (OSSL_LIB_CTX *,const char *) |  | OSSL_CMP_SRV_CTX_new | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (OSSL_LIB_CTX *,const char *) |  | OSSL_PROVIDER_load | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (OSSL_LIB_CTX *,const char *) |  | PKCS7_new_ex | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (OSSL_LIB_CTX *,const char *) |  | SCT_CTX_new | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (OSSL_LIB_CTX *,const char *) |  | TS_RESP_CTX_new_ex | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (OSSL_LIB_CTX *,const char *) |  | X509_CRL_new_ex | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (OSSL_LIB_CTX *,const char *) |  | X509_PUBKEY_new_ex | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (OSSL_LIB_CTX *,const char *) |  | X509_REQ_new_ex | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (OSSL_LIB_CTX *,const char *) |  | X509_STORE_CTX_new_ex | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (OSSL_LIB_CTX *,const char *) |  | X509_new_ex | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (OSSL_LIB_CTX *,const char *) |  | ossl_cmp_mock_srv_new | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (OSSL_LIB_CTX *,const char *) |  | ossl_cms_Data_create | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (OSSL_LIB_CTX *,const char *) |  | ossl_parse_property | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (OSSL_PARAM *,const char *) |  | OSSL_PARAM_locate | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (OSSL_PARAM *,const char *) |  | OSSL_PARAM_set_utf8_ptr | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (OSSL_PARAM *,const char *) |  | OSSL_PARAM_set_utf8_string | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (OSSL_PROVIDER *,const char *) |  | ossl_provider_set_module_path | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (PKCS7 *,const char *) |  | ossl_pkcs7_set1_propq | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (RSA_METHOD *,const char *) |  | RSA_meth_set1_name | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (SSL *,const char *) |  | SSL_add1_host | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (SSL *,const char *) |  | SSL_set1_host | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (SSL *,const char *) |  | SSL_set_cipher_list | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (SSL *,const char *) |  | SSL_use_psk_identity_hint | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (SSL_CONF_CTX *,const char *) |  | SSL_CONF_CTX_set1_prefix | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (SSL_CONF_CTX *,const char *) |  | SSL_CONF_cmd_value_type | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (SSL_CTX *,const char *) |  | SSL_CTX_set_cipher_list | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (SSL_CTX *,const char *) |  | SSL_CTX_use_psk_identity_hint | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (SSL_CTX *,const char *) |  | ossl_quic_set_diag_title | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (SSL_SESSION *,const char *) |  | SSL_SESSION_set1_hostname | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (UI *,const char *) |  | UI_add_error_string | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (UI *,const char *) |  | UI_add_info_string | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (UI *,const char *) |  | UI_dup_error_string | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (UI *,const char *) |  | UI_dup_info_string | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (X509 *,const char *) |  | x509_ctrl_string | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (X509_REQ *,const char *) |  | x509_req_ctrl_string | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (X509_VERIFY_PARAM *,const char *) |  | X509_VERIFY_PARAM_set1_ip_asc | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (X509_VERIFY_PARAM *,const char *) |  | X509_VERIFY_PARAM_set1_name | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (__printf_buffer *,const char *) |  | __printf_buffer_puts_1 | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (alloc_buffer,const char *) |  | __libc_alloc_buffer_copy_string | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (argp_fmtstream_t,const char *) |  | __argp_fmtstream_puts | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (char **,const char *) |  | Curl_setstropt | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (char **,const char *) |  | __strsep | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (char *,const char *) |  | xstrdup | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (const OSSL_PARAM *,const char *) |  | OSSL_PARAM_locate_const | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (const char **,const char *) |  | uv__utf8_decode1 | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (const char *,const char *) |  | Configcmp | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (const char *,const char *) |  | Curl_timestrcmp | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (const char *,const char *) |  | DES_crypt | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (const char *,const char *) |  | OPENSSL_strcasecmp | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (const char *,const char *) |  | __bind_textdomain_codeset | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (const char *,const char *) |  | __bindtextdomain | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (const char *,const char *) |  | __dgettext | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (const char *,const char *) |  | __gconv_compare_alias | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (const char *,const char *) |  | __strcasestr | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (const char *,const char *) |  | __strcspn_generic | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (const char *,const char *) |  | __strcspn_sse42 | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (const char *,const char *) |  | __strpbrk_generic | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (const char *,const char *) |  | __strpbrk_sse42 | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (const char *,const char *) |  | __strspn_generic | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (const char *,const char *) |  | __strspn_sse42 | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (const char *,const char *) |  | __strstr_generic | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (const char *,const char *) |  | __strverscmp | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (const char *,const char *) |  | _dl_cache_libcmp | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (const char *,const char *) |  | advance | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (const char *,const char *) |  | c_strcasecmp | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (const char *,const char *) |  | charmap_aliases | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (const char *,const char *) |  | charmap_open | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (const char *,const char *) |  | chroot_canon | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (const char *,const char *) |  | get_passwd | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (const char *,const char *) |  | gzopen | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (const char *,const char *) |  | gzopen64 | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (const char *,const char *) |  | iconv_open | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (const char *,const char *) |  | openssl_fopen | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (const char *,const char *) |  | ossl_pem_check_suffix | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (const char *,const char *) |  | ossl_v3_name_cmp | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (const char *,const char *) |  | sqlite3_strglob | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (const char *,const char *) |  | sqlite3_stricmp | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (const char *,const char *) |  | step | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (const char *,const char *) |  | tempnam | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (const char *,const char *) |  | xfopen | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (const mntent *,const char *) |  | __hasmntopt | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (const nis_error,const char *) |  | nis_sperror | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (curl_mimepart *,const char *) |  | curl_mime_filedata | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (curl_off_t *,const char *) |  | str2offset | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (curl_pushheaders *,const char *) |  | curl_pushheader_byname | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (curl_slist **,const char *) |  | add2list | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (curl_slist *,const char *) |  | curl_slist_append | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (dynbuf *,const char *) |  | Curl_dyn_add | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (dynbuf *,const char *) |  | curlx_dyn_add | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (dynhds *,const char *) |  | Curl_dynhds_cget | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (dynhds *,const char *) |  | Curl_dynhds_h1_cadd_line | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (gconv_fcts *,const char *) |  | __wcsmbs_named_conv | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (gzFile,const char *) |  | gzputs | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (int,LPCSTR) | CComBSTR | CComBSTR | 0 |
-| atl.cpp:414:5:414:12 | CComBSTR | (int,LPCSTR) | CComBSTR | CComBSTR | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (int,const char *) |  | BIO_meth_new | 0 |
-| atl.cpp:414:5:414:12 | CComBSTR | (int,const char *) |  | BIO_meth_new | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (int,const char *) |  | _IO_new_fdopen | 0 |
-| atl.cpp:414:5:414:12 | CComBSTR | (int,const char *) |  | _IO_new_fdopen | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (int,const char *) |  | gzdopen | 0 |
-| atl.cpp:414:5:414:12 | CComBSTR | (int,const char *) |  | gzdopen | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (int,const char *) |  | setlocale | 0 |
-| atl.cpp:414:5:414:12 | CComBSTR | (int,const char *) |  | setlocale | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (int,const char *) |  | xsetlocale | 0 |
-| atl.cpp:414:5:414:12 | CComBSTR | (int,const char *) |  | xsetlocale | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (lemon *,const char *) |  | file_makename | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (long *,const char *) |  | secs2ms | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (long *,const char *) |  | str2num | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (long *,const char *) |  | str2unum | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (nss_module *,const char *) |  | __nss_module_get_function | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (size_t *,const char *) |  | next_protos_parse | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (slist_wc **,const char *) |  | easysrc_add | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (slist_wc *,const char *) |  | slist_wc_append | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (sockaddr_un *,const char *) |  | __sockaddr_un_set | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (sqlite3 *,const char *) |  | sqlite3_declare_vtab | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (sqlite3 *,const char *) |  | sqlite3_get_clientdata | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (sqlite3 *,const char *) |  | sqlite3_wal_checkpoint | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (sqlite3_intck *,const char *) |  | sqlite3_intck_test_sql | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (sqlite3_stmt *,const char *) |  | sqlite3_bind_parameter_index | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (sqlite3_str *,const char *) |  | sqlite3_str_appendall | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (sqlite3_value *,const char *) |  | sqlite3_value_pointer | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (stringtable *,const char *) |  | stringtable_add | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (unsigned char *,const char *) |  | ossl_a2i_ipadd | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (unsigned long *,const char *) |  | set_cert_ex | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (unsigned long *,const char *) |  | set_name_ex | 1 |
-| atl.cpp:414:5:414:12 | CComBSTR | (uv_pipe_t *,const char *) |  | uv_pipe_bind | 1 |
-| atl.cpp:415:5:415:12 | CComBSTR | (LPCOLESTR) | CComBSTR | Append | 0 |
-| atl.cpp:415:5:415:12 | CComBSTR | (LPCOLESTR) | CComBSTR | CComBSTR | 0 |
-| atl.cpp:416:5:416:12 | CComBSTR | (LPCSTR) | CComBSTR | Append | 0 |
-| atl.cpp:416:5:416:12 | CComBSTR | (LPCSTR) | CComBSTR | CComBSTR | 0 |
-| atl.cpp:416:5:416:12 | CComBSTR | (const char *) |  | BIO_gethostbyname | 0 |
-| atl.cpp:416:5:416:12 | CComBSTR | (const char *) |  | Curl_copy_header_value | 0 |
-| atl.cpp:416:5:416:12 | CComBSTR | (const char *) |  | Curl_get_scheme_handler | 0 |
-| atl.cpp:416:5:416:12 | CComBSTR | (const char *) |  | Curl_getdate_capped | 0 |
-| atl.cpp:416:5:416:12 | CComBSTR | (const char *) |  | Jim_StrDup | 0 |
-| atl.cpp:416:5:416:12 | CComBSTR | (const char *) |  | OPENSSL_LH_strhash | 0 |
-| atl.cpp:416:5:416:12 | CComBSTR | (const char *) |  | OSSL_STORE_SEARCH_by_alias | 0 |
-| atl.cpp:416:5:416:12 | CComBSTR | (const char *) |  | Strsafe | 0 |
-| atl.cpp:416:5:416:12 | CComBSTR | (const char *) |  | Symbol_new | 0 |
-| atl.cpp:416:5:416:12 | CComBSTR | (const char *) |  | UI_create_method | 0 |
-| atl.cpp:416:5:416:12 | CComBSTR | (const char *) |  | X509V3_parse_list | 0 |
-| atl.cpp:416:5:416:12 | CComBSTR | (const char *) |  | X509_LOOKUP_meth_new | 0 |
-| atl.cpp:416:5:416:12 | CComBSTR | (const char *) |  | __basename | 0 |
-| atl.cpp:416:5:416:12 | CComBSTR | (const char *) |  | __gconv_find_shlib | 0 |
-| atl.cpp:416:5:416:12 | CComBSTR | (const char *) |  | __gettext | 0 |
-| atl.cpp:416:5:416:12 | CComBSTR | (const char *) |  | __hash_string | 0 |
-| atl.cpp:416:5:416:12 | CComBSTR | (const char *) |  | __nss_action_parse | 0 |
-| atl.cpp:416:5:416:12 | CComBSTR | (const char *) |  | __strdup | 0 |
-| atl.cpp:416:5:416:12 | CComBSTR | (const char *) |  | __textdomain | 0 |
-| atl.cpp:416:5:416:12 | CComBSTR | (const char *) |  | __tzset_parse_tz | 0 |
-| atl.cpp:416:5:416:12 | CComBSTR | (const char *) |  | __tzstring | 0 |
-| atl.cpp:416:5:416:12 | CComBSTR | (const char *) |  | a2i_IPADDRESS | 0 |
-| atl.cpp:416:5:416:12 | CComBSTR | (const char *) |  | a2i_IPADDRESS_NC | 0 |
-| atl.cpp:416:5:416:12 | CComBSTR | (const char *) |  | a64l | 0 |
-| atl.cpp:416:5:416:12 | CComBSTR | (const char *) |  | charmap_opendir | 0 |
-| atl.cpp:416:5:416:12 | CComBSTR | (const char *) |  | ether_aton | 0 |
-| atl.cpp:416:5:416:12 | CComBSTR | (const char *) |  | getdate | 0 |
-| atl.cpp:416:5:416:12 | CComBSTR | (const char *) |  | inetstr2int | 0 |
-| atl.cpp:416:5:416:12 | CComBSTR | (const char *) |  | last_component | 0 |
-| atl.cpp:416:5:416:12 | CComBSTR | (const char *) |  | new_glibc_hwcaps_subdirectory | 0 |
-| atl.cpp:416:5:416:12 | CComBSTR | (const char *) |  | opt_path_end | 0 |
-| atl.cpp:416:5:416:12 | CComBSTR | (const char *) |  | opt_progname | 0 |
-| atl.cpp:416:5:416:12 | CComBSTR | (const char *) |  | ossl_lh_strcasehash | 0 |
-| atl.cpp:416:5:416:12 | CComBSTR | (const char *) |  | repertoire_read | 0 |
-| atl.cpp:416:5:416:12 | CComBSTR | (const char *) |  | res_gethostbyname | 0 |
-| atl.cpp:416:5:416:12 | CComBSTR | (const char *) |  | sgetsgent | 0 |
-| atl.cpp:416:5:416:12 | CComBSTR | (const char *) |  | sgetspent | 0 |
-| atl.cpp:416:5:416:12 | CComBSTR | (const char *) |  | strhash | 0 |
-| atl.cpp:416:5:416:12 | CComBSTR | (const char *) |  | uc_script_byname | 0 |
-| atl.cpp:416:5:416:12 | CComBSTR | (const char *) |  | uv__strdup | 0 |
-| atl.cpp:416:5:416:12 | CComBSTR | (const char *) |  | uv_wtf8_length_as_utf16 | 0 |
-| atl.cpp:416:5:416:12 | CComBSTR | (const char *) |  | xstrdup | 0 |
-| atl.cpp:417:5:417:12 | CComBSTR | (CComBSTR &&) | CComBSTR | CComBSTR | 0 |
-| atl.cpp:420:13:420:18 | Append | (const CComBSTR &) | CComBSTR | Append | 0 |
-| atl.cpp:420:13:420:18 | Append | (const CComBSTR &) | CComBSTR | CComBSTR | 0 |
-| atl.cpp:421:13:421:18 | Append | (wchar_t) |  | operator+= | 0 |
-| atl.cpp:421:13:421:18 | Append | (wchar_t) |  | wcwidth | 0 |
-| atl.cpp:421:13:421:18 | Append | (wchar_t) | CComBSTR | Append | 0 |
-| atl.cpp:421:13:421:18 | Append | (wchar_t) | CSimpleStringT | operator+= | 0 |
-| atl.cpp:422:13:422:18 | Append | (char) |  | Curl_raw_tolower | 0 |
-| atl.cpp:422:13:422:18 | Append | (char) |  | Curl_raw_toupper | 0 |
-| atl.cpp:422:13:422:18 | Append | (char) |  | findshortopt | 0 |
-| atl.cpp:422:13:422:18 | Append | (char) |  | operator+= | 0 |
-| atl.cpp:422:13:422:18 | Append | (char) | CComBSTR | Append | 0 |
-| atl.cpp:422:13:422:18 | Append | (char) | CSimpleStringT | operator+= | 0 |
-| atl.cpp:423:13:423:18 | Append | (LPCOLESTR) | CComBSTR | Append | 0 |
-| atl.cpp:423:13:423:18 | Append | (LPCOLESTR) | CComBSTR | CComBSTR | 0 |
-| atl.cpp:424:13:424:18 | Append | (LPCSTR) | CComBSTR | Append | 0 |
-| atl.cpp:424:13:424:18 | Append | (LPCSTR) | CComBSTR | CComBSTR | 0 |
-| atl.cpp:424:13:424:18 | Append | (const char *) |  | BIO_gethostbyname | 0 |
-| atl.cpp:424:13:424:18 | Append | (const char *) |  | Curl_copy_header_value | 0 |
-| atl.cpp:424:13:424:18 | Append | (const char *) |  | Curl_get_scheme_handler | 0 |
-| atl.cpp:424:13:424:18 | Append | (const char *) |  | Curl_getdate_capped | 0 |
-| atl.cpp:424:13:424:18 | Append | (const char *) |  | Jim_StrDup | 0 |
-| atl.cpp:424:13:424:18 | Append | (const char *) |  | OPENSSL_LH_strhash | 0 |
-| atl.cpp:424:13:424:18 | Append | (const char *) |  | OSSL_STORE_SEARCH_by_alias | 0 |
-| atl.cpp:424:13:424:18 | Append | (const char *) |  | Strsafe | 0 |
-| atl.cpp:424:13:424:18 | Append | (const char *) |  | Symbol_new | 0 |
-| atl.cpp:424:13:424:18 | Append | (const char *) |  | UI_create_method | 0 |
-| atl.cpp:424:13:424:18 | Append | (const char *) |  | X509V3_parse_list | 0 |
-| atl.cpp:424:13:424:18 | Append | (const char *) |  | X509_LOOKUP_meth_new | 0 |
-| atl.cpp:424:13:424:18 | Append | (const char *) |  | __basename | 0 |
-| atl.cpp:424:13:424:18 | Append | (const char *) |  | __gconv_find_shlib | 0 |
-| atl.cpp:424:13:424:18 | Append | (const char *) |  | __gettext | 0 |
-| atl.cpp:424:13:424:18 | Append | (const char *) |  | __hash_string | 0 |
-| atl.cpp:424:13:424:18 | Append | (const char *) |  | __nss_action_parse | 0 |
-| atl.cpp:424:13:424:18 | Append | (const char *) |  | __strdup | 0 |
-| atl.cpp:424:13:424:18 | Append | (const char *) |  | __textdomain | 0 |
-| atl.cpp:424:13:424:18 | Append | (const char *) |  | __tzset_parse_tz | 0 |
-| atl.cpp:424:13:424:18 | Append | (const char *) |  | __tzstring | 0 |
-| atl.cpp:424:13:424:18 | Append | (const char *) |  | a2i_IPADDRESS | 0 |
-| atl.cpp:424:13:424:18 | Append | (const char *) |  | a2i_IPADDRESS_NC | 0 |
-| atl.cpp:424:13:424:18 | Append | (const char *) |  | a64l | 0 |
-| atl.cpp:424:13:424:18 | Append | (const char *) |  | charmap_opendir | 0 |
-| atl.cpp:424:13:424:18 | Append | (const char *) |  | ether_aton | 0 |
-| atl.cpp:424:13:424:18 | Append | (const char *) |  | getdate | 0 |
-| atl.cpp:424:13:424:18 | Append | (const char *) |  | inetstr2int | 0 |
-| atl.cpp:424:13:424:18 | Append | (const char *) |  | last_component | 0 |
-| atl.cpp:424:13:424:18 | Append | (const char *) |  | new_glibc_hwcaps_subdirectory | 0 |
-| atl.cpp:424:13:424:18 | Append | (const char *) |  | opt_path_end | 0 |
-| atl.cpp:424:13:424:18 | Append | (const char *) |  | opt_progname | 0 |
-| atl.cpp:424:13:424:18 | Append | (const char *) |  | ossl_lh_strcasehash | 0 |
-| atl.cpp:424:13:424:18 | Append | (const char *) |  | repertoire_read | 0 |
-| atl.cpp:424:13:424:18 | Append | (const char *) |  | res_gethostbyname | 0 |
-| atl.cpp:424:13:424:18 | Append | (const char *) |  | sgetsgent | 0 |
-| atl.cpp:424:13:424:18 | Append | (const char *) |  | sgetspent | 0 |
-| atl.cpp:424:13:424:18 | Append | (const char *) |  | strhash | 0 |
-| atl.cpp:424:13:424:18 | Append | (const char *) |  | uc_script_byname | 0 |
-| atl.cpp:424:13:424:18 | Append | (const char *) |  | uv__strdup | 0 |
-| atl.cpp:424:13:424:18 | Append | (const char *) |  | uv_wtf8_length_as_utf16 | 0 |
-| atl.cpp:424:13:424:18 | Append | (const char *) |  | xstrdup | 0 |
-| atl.cpp:425:13:425:18 | Append | (ASN1_STRING *,int) |  | ASN1_STRING_length_set | 1 |
-| atl.cpp:425:13:425:18 | Append | (ASYNC_WAIT_CTX *,int) |  | ASYNC_WAIT_CTX_set_status | 1 |
-| atl.cpp:425:13:425:18 | Append | (BIGNUM *,int) |  | BN_clear_bit | 1 |
-| atl.cpp:425:13:425:18 | Append | (BIGNUM *,int) |  | BN_mask_bits | 1 |
-| atl.cpp:425:13:425:18 | Append | (BIGNUM *,int) |  | BN_set_bit | 1 |
-| atl.cpp:425:13:425:18 | Append | (BIGNUM *,int) |  | BN_set_flags | 1 |
-| atl.cpp:425:13:425:18 | Append | (BIGNUM *,int) |  | bn_expand2 | 1 |
-| atl.cpp:425:13:425:18 | Append | (BIGNUM *,int) |  | bn_wexpand | 1 |
-| atl.cpp:425:13:425:18 | Append | (BIGNUM *,int) |  | ossl_bn_mask_bits_fixed_top | 1 |
-| atl.cpp:425:13:425:18 | Append | (BIO *,int) |  | BIO_clear_flags | 1 |
-| atl.cpp:425:13:425:18 | Append | (BIO *,int) |  | BIO_find_type | 1 |
-| atl.cpp:425:13:425:18 | Append | (BIO *,int) |  | BIO_set_flags | 1 |
-| atl.cpp:425:13:425:18 | Append | (BIO *,int) |  | BIO_set_init | 1 |
-| atl.cpp:425:13:425:18 | Append | (BIO *,int) |  | BIO_set_retry_reason | 1 |
-| atl.cpp:425:13:425:18 | Append | (BIO *,int) |  | BIO_set_shutdown | 1 |
-| atl.cpp:425:13:425:18 | Append | (BIO *,int) |  | TXT_DB_read | 1 |
-| atl.cpp:425:13:425:18 | Append | (CMS_SignerInfo *,int) |  | CMS_signed_delete_attr | 1 |
-| atl.cpp:425:13:425:18 | Append | (CMS_SignerInfo *,int) |  | CMS_unsigned_delete_attr | 1 |
-| atl.cpp:425:13:425:18 | Append | (CURL *,int) |  | curl_easy_pause | 1 |
-| atl.cpp:425:13:425:18 | Append | (Curl_easy *,int) |  | Curl_conn_get_socket | 1 |
-| atl.cpp:425:13:425:18 | Append | (DH *,int) |  | DH_clear_flags | 1 |
-| atl.cpp:425:13:425:18 | Append | (DH *,int) |  | DH_set_flags | 1 |
-| atl.cpp:425:13:425:18 | Append | (DH_METHOD *,int) |  | DH_meth_set_flags | 1 |
-| atl.cpp:425:13:425:18 | Append | (DSA *,int) |  | DSA_clear_flags | 1 |
-| atl.cpp:425:13:425:18 | Append | (DSA *,int) |  | DSA_set_flags | 1 |
-| atl.cpp:425:13:425:18 | Append | (DSA_METHOD *,int) |  | DSA_meth_set_flags | 1 |
-| atl.cpp:425:13:425:18 | Append | (EC_GROUP *,int) |  | EC_GROUP_set_asn1_flag | 1 |
-| atl.cpp:425:13:425:18 | Append | (EC_GROUP *,int) |  | EC_GROUP_set_curve_name | 1 |
-| atl.cpp:425:13:425:18 | Append | (EC_KEY *,int) |  | EC_KEY_clear_flags | 1 |
-| atl.cpp:425:13:425:18 | Append | (EC_KEY *,int) |  | EC_KEY_set_asn1_flag | 1 |
-| atl.cpp:425:13:425:18 | Append | (EC_KEY *,int) |  | EC_KEY_set_flags | 1 |
-| atl.cpp:425:13:425:18 | Append | (ENGINE *,int) |  | ENGINE_cmd_is_executable | 1 |
-| atl.cpp:425:13:425:18 | Append | (ENGINE *,int) |  | ENGINE_set_flags | 1 |
-| atl.cpp:425:13:425:18 | Append | (EVP_CIPHER *,int) |  | EVP_CIPHER_meth_set_impl_ctx_size | 1 |
-| atl.cpp:425:13:425:18 | Append | (EVP_CIPHER *,int) |  | EVP_CIPHER_meth_set_iv_length | 1 |
-| atl.cpp:425:13:425:18 | Append | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_clear_flags | 1 |
-| atl.cpp:425:13:425:18 | Append | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_flags | 1 |
-| atl.cpp:425:13:425:18 | Append | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_key_length | 1 |
-| atl.cpp:425:13:425:18 | Append | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_num | 1 |
-| atl.cpp:425:13:425:18 | Append | (EVP_KEYMGMT *,int) |  | evp_keymgmt_util_query_operation_name | 1 |
-| atl.cpp:425:13:425:18 | Append | (EVP_MD *,int) |  | EVP_MD_meth_set_app_datasize | 1 |
-| atl.cpp:425:13:425:18 | Append | (EVP_MD *,int) |  | EVP_MD_meth_set_input_blocksize | 1 |
-| atl.cpp:425:13:425:18 | Append | (EVP_MD *,int) |  | EVP_MD_meth_set_result_size | 1 |
-| atl.cpp:425:13:425:18 | Append | (EVP_MD_CTX *,int) |  | EVP_MD_CTX_clear_flags | 1 |
-| atl.cpp:425:13:425:18 | Append | (EVP_MD_CTX *,int) |  | EVP_MD_CTX_set_flags | 1 |
-| atl.cpp:425:13:425:18 | Append | (EVP_PKEY *,int) |  | EVP_PKEY_delete_attr | 1 |
-| atl.cpp:425:13:425:18 | Append | (EVP_PKEY *,int) |  | EVP_PKEY_save_parameters | 1 |
-| atl.cpp:425:13:425:18 | Append | (EVP_PKEY *,int) |  | EVP_PKEY_set_type | 1 |
-| atl.cpp:425:13:425:18 | Append | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_get_keygen_info | 1 |
-| atl.cpp:425:13:425:18 | Append | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_kdf_type | 1 |
-| atl.cpp:425:13:425:18 | Append | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_nid | 1 |
-| atl.cpp:425:13:425:18 | Append | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_paramgen_type | 1 |
-| atl.cpp:425:13:425:18 | Append | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_rfc5114 | 1 |
-| atl.cpp:425:13:425:18 | Append | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dhx_rfc5114 | 1 |
-| atl.cpp:425:13:425:18 | Append | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ec_param_enc | 1 |
-| atl.cpp:425:13:425:18 | Append | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ec_paramgen_curve_nid | 1 |
-| atl.cpp:425:13:425:18 | Append | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ecdh_kdf_type | 1 |
-| atl.cpp:425:13:425:18 | Append | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_hkdf_mode | 1 |
-| atl.cpp:425:13:425:18 | Append | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_rsa_padding | 1 |
-| atl.cpp:425:13:425:18 | Append | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_rsa_pss_saltlen | 1 |
-| atl.cpp:425:13:425:18 | Append | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_gindex | 1 |
-| atl.cpp:425:13:425:18 | Append | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_h | 1 |
-| atl.cpp:425:13:425:18 | Append | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_pcounter | 1 |
-| atl.cpp:425:13:425:18 | Append | (FILE *,int) |  | _IO_default_pbackfail | 1 |
-| atl.cpp:425:13:425:18 | Append | (FILE *,int) |  | _IO_fwide | 1 |
-| atl.cpp:425:13:425:18 | Append | (FILE *,int) |  | _IO_init | 1 |
-| atl.cpp:425:13:425:18 | Append | (FILE *,int) |  | _IO_init_internal | 1 |
-| atl.cpp:425:13:425:18 | Append | (FILE *,int) |  | _IO_new_file_attach | 1 |
-| atl.cpp:425:13:425:18 | Append | (FILE *,int) |  | _IO_new_file_overflow | 1 |
-| atl.cpp:425:13:425:18 | Append | (FILE *,int) |  | _IO_old_init | 1 |
-| atl.cpp:425:13:425:18 | Append | (FILE *,int) |  | _IO_sputbackc | 1 |
-| atl.cpp:425:13:425:18 | Append | (FILE *,int) |  | _IO_str_overflow | 1 |
-| atl.cpp:425:13:425:18 | Append | (FILE *,int) |  | _IO_str_pbackfail | 1 |
-| atl.cpp:425:13:425:18 | Append | (FILE *,int) |  | __printf_buffer_as_file_overflow | 1 |
-| atl.cpp:425:13:425:18 | Append | (FILE *,int) |  | __wprintf_buffer_as_file_overflow | 1 |
-| atl.cpp:425:13:425:18 | Append | (FTS *,int) |  | fts_children | 1 |
-| atl.cpp:425:13:425:18 | Append | (LIBSSH2_CHANNEL *,int) |  | _libssh2_channel_extended_data | 1 |
-| atl.cpp:425:13:425:18 | Append | (LIBSSH2_CHANNEL *,int) |  | _libssh2_channel_flush | 1 |
-| atl.cpp:425:13:425:18 | Append | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_flush_ex | 1 |
-| atl.cpp:425:13:425:18 | Append | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_handle_extended_data | 1 |
-| atl.cpp:425:13:425:18 | Append | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_handle_extended_data2 | 1 |
-| atl.cpp:425:13:425:18 | Append | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_set_blocking | 1 |
-| atl.cpp:425:13:425:18 | Append | (LIBSSH2_SESSION *,int) |  | _libssh2_session_set_blocking | 1 |
-| atl.cpp:425:13:425:18 | Append | (LIBSSH2_SESSION *,int) |  | libssh2_hostkey_hash | 1 |
-| atl.cpp:425:13:425:18 | Append | (LIBSSH2_SESSION *,int) |  | libssh2_session_methods | 1 |
-| atl.cpp:425:13:425:18 | Append | (LIBSSH2_SESSION *,int) |  | libssh2_session_set_blocking | 1 |
-| atl.cpp:425:13:425:18 | Append | (LIBSSH2_SESSION *,int) |  | libssh2_session_startup | 1 |
-| atl.cpp:425:13:425:18 | Append | (LPCOLESTR,int) | CComBSTR | Append | 0 |
-| atl.cpp:425:13:425:18 | Append | (LPCOLESTR,int) | CComBSTR | Append | 1 |
-| atl.cpp:425:13:425:18 | Append | (OCSP_BASICRESP *,int) |  | OCSP_BASICRESP_delete_ext | 1 |
-| atl.cpp:425:13:425:18 | Append | (OCSP_BASICRESP *,int) |  | OCSP_BASICRESP_get_ext | 1 |
-| atl.cpp:425:13:425:18 | Append | (OCSP_BASICRESP *,int) |  | OCSP_resp_get0 | 1 |
-| atl.cpp:425:13:425:18 | Append | (OCSP_ONEREQ *,int) |  | OCSP_ONEREQ_delete_ext | 1 |
-| atl.cpp:425:13:425:18 | Append | (OCSP_ONEREQ *,int) |  | OCSP_ONEREQ_get_ext | 1 |
-| atl.cpp:425:13:425:18 | Append | (OCSP_REQUEST *,int) |  | OCSP_REQUEST_delete_ext | 1 |
-| atl.cpp:425:13:425:18 | Append | (OCSP_REQUEST *,int) |  | OCSP_REQUEST_get_ext | 1 |
-| atl.cpp:425:13:425:18 | Append | (OCSP_REQUEST *,int) |  | OCSP_request_onereq_get0 | 1 |
-| atl.cpp:425:13:425:18 | Append | (OCSP_SINGLERESP *,int) |  | OCSP_SINGLERESP_delete_ext | 1 |
-| atl.cpp:425:13:425:18 | Append | (OCSP_SINGLERESP *,int) |  | OCSP_SINGLERESP_get_ext | 1 |
-| atl.cpp:425:13:425:18 | Append | (OPENSSL_STACK *,int) |  | OPENSSL_sk_delete | 1 |
-| atl.cpp:425:13:425:18 | Append | (OPENSSL_STACK *,int) |  | OPENSSL_sk_reserve | 1 |
-| atl.cpp:425:13:425:18 | Append | (OPENSSL_sk_compfunc,int) |  | OPENSSL_sk_new_reserve | 1 |
-| atl.cpp:425:13:425:18 | Append | (OSSL_ACKM *,int) |  | ossl_ackm_get_ack_deadline | 1 |
-| atl.cpp:425:13:425:18 | Append | (OSSL_ACKM *,int) |  | ossl_ackm_get_ack_frame | 1 |
-| atl.cpp:425:13:425:18 | Append | (OSSL_ACKM *,int) |  | ossl_ackm_get_largest_acked | 1 |
-| atl.cpp:425:13:425:18 | Append | (OSSL_ACKM *,int) |  | ossl_ackm_on_pkt_space_discarded | 1 |
-| atl.cpp:425:13:425:18 | Append | (OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_set_serverPort | 1 |
-| atl.cpp:425:13:425:18 | Append | (OSSL_CMP_CTX *,int) |  | ossl_cmp_ctx_set_failInfoCode | 1 |
-| atl.cpp:425:13:425:18 | Append | (OSSL_CMP_CTX *,int) |  | ossl_cmp_ctx_set_status | 1 |
-| atl.cpp:425:13:425:18 | Append | (OSSL_CMP_CTX *,int) |  | ossl_cmp_msg_create | 1 |
-| atl.cpp:425:13:425:18 | Append | (OSSL_CMP_CTX *,int) |  | ossl_cmp_pollReq_new | 1 |
-| atl.cpp:425:13:425:18 | Append | (OSSL_CMP_MSG *,int) |  | ossl_cmp_msg_set_bodytype | 1 |
-| atl.cpp:425:13:425:18 | Append | (OSSL_CMP_PKIHEADER *,int) |  | ossl_cmp_hdr_set_pvno | 1 |
-| atl.cpp:425:13:425:18 | Append | (OSSL_CMP_REVREPCONTENT *,int) |  | ossl_cmp_revrepcontent_get_CertId | 1 |
-| atl.cpp:425:13:425:18 | Append | (OSSL_CMP_REVREPCONTENT *,int) |  | ossl_cmp_revrepcontent_get_pkisi | 1 |
-| atl.cpp:425:13:425:18 | Append | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_accept_raverified | 1 |
-| atl.cpp:425:13:425:18 | Append | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_accept_unprotected | 1 |
-| atl.cpp:425:13:425:18 | Append | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_grant_implicit_confirm | 1 |
-| atl.cpp:425:13:425:18 | Append | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_send_unprotected_errors | 1 |
-| atl.cpp:425:13:425:18 | Append | (OSSL_CRMF_PKIPUBLICATIONINFO *,int) |  | OSSL_CRMF_MSG_set_PKIPublicationInfo_action | 1 |
-| atl.cpp:425:13:425:18 | Append | (OSSL_DECODER_CTX *,int) |  | OSSL_DECODER_CTX_set_selection | 1 |
-| atl.cpp:425:13:425:18 | Append | (OSSL_ENCODER_CTX *,int) |  | OSSL_ENCODER_CTX_set_selection | 1 |
-| atl.cpp:425:13:425:18 | Append | (OSSL_LIB_CTX *,int) |  | OSSL_LIB_CTX_get_data | 1 |
-| atl.cpp:425:13:425:18 | Append | (OSSL_LIB_CTX *,int) |  | OSSL_LIB_CTX_set_conf_diagnostics | 1 |
-| atl.cpp:425:13:425:18 | Append | (OSSL_LIB_CTX *,int) |  | ossl_ctx_global_properties | 1 |
-| atl.cpp:425:13:425:18 | Append | (OSSL_LIB_CTX *,int) |  | ossl_dh_new_by_nid_ex | 1 |
-| atl.cpp:425:13:425:18 | Append | (OSSL_LIB_CTX *,int) |  | ossl_lib_ctx_get_data | 1 |
-| atl.cpp:425:13:425:18 | Append | (OSSL_LIB_CTX *,int) |  | ossl_mac_key_new | 1 |
-| atl.cpp:425:13:425:18 | Append | (OSSL_PARAM *,int) |  | OSSL_PARAM_set_int | 1 |
-| atl.cpp:425:13:425:18 | Append | (OSSL_QRX *,int) |  | ossl_qrx_get_bytes_received | 1 |
-| atl.cpp:425:13:425:18 | Append | (OSSL_RECORD_LAYER *,int) |  | tls_set_first_handshake | 1 |
-| atl.cpp:425:13:425:18 | Append | (OSSL_RECORD_LAYER *,int) |  | tls_set_plain_alerts | 1 |
-| atl.cpp:425:13:425:18 | Append | (OSSL_STORE_CTX *,int) |  | OSSL_STORE_expect | 1 |
-| atl.cpp:425:13:425:18 | Append | (PKCS7 *,int) |  | PKCS7_set_type | 1 |
-| atl.cpp:425:13:425:18 | Append | (QUIC_CHANNEL *,int) |  | ossl_quic_channel_new_stream_local | 1 |
-| atl.cpp:425:13:425:18 | Append | (QUIC_ENGINE *,int) |  | ossl_quic_engine_set_inhibit_tick | 1 |
-| atl.cpp:425:13:425:18 | Append | (QUIC_PORT *,int) |  | ossl_quic_port_set_allow_incoming | 1 |
-| atl.cpp:425:13:425:18 | Append | (QUIC_RCIDM *,int) |  | ossl_quic_rcidm_get_preferred_tx_dcid_changed | 1 |
-| atl.cpp:425:13:425:18 | Append | (QUIC_RSTREAM *,int) |  | ossl_quic_rstream_set_cleanse | 1 |
-| atl.cpp:425:13:425:18 | Append | (QUIC_RXFC *,int) |  | ossl_quic_rxfc_get_error | 1 |
-| atl.cpp:425:13:425:18 | Append | (QUIC_RXFC *,int) |  | ossl_quic_rxfc_has_cwm_changed | 1 |
-| atl.cpp:425:13:425:18 | Append | (QUIC_SSTREAM *,int) |  | ossl_quic_sstream_set_cleanse | 1 |
-| atl.cpp:425:13:425:18 | Append | (QUIC_STREAM_MAP *,int) |  | ossl_quic_stream_map_get_accept_queue_len | 1 |
-| atl.cpp:425:13:425:18 | Append | (QUIC_TXFC *,int) |  | ossl_quic_txfc_has_become_blocked | 1 |
-| atl.cpp:425:13:425:18 | Append | (RSA *,int) |  | RSA_clear_flags | 1 |
-| atl.cpp:425:13:425:18 | Append | (RSA *,int) |  | RSA_set_flags | 1 |
-| atl.cpp:425:13:425:18 | Append | (RSA_METHOD *,int) |  | RSA_meth_set_flags | 1 |
-| atl.cpp:425:13:425:18 | Append | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_hashalg | 1 |
-| atl.cpp:425:13:425:18 | Append | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_maskgenhashalg | 1 |
-| atl.cpp:425:13:425:18 | Append | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_saltlen | 1 |
-| atl.cpp:425:13:425:18 | Append | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_trailerfield | 1 |
-| atl.cpp:425:13:425:18 | Append | (SSL *,int) |  | SSL_key_update | 1 |
-| atl.cpp:425:13:425:18 | Append | (SSL *,int) |  | SSL_set_post_handshake_auth | 1 |
-| atl.cpp:425:13:425:18 | Append | (SSL *,int) |  | SSL_set_purpose | 1 |
-| atl.cpp:425:13:425:18 | Append | (SSL *,int) |  | SSL_set_quic_tls_early_data_enabled | 1 |
-| atl.cpp:425:13:425:18 | Append | (SSL *,int) |  | SSL_set_quiet_shutdown | 1 |
-| atl.cpp:425:13:425:18 | Append | (SSL *,int) |  | SSL_set_read_ahead | 1 |
-| atl.cpp:425:13:425:18 | Append | (SSL *,int) |  | SSL_set_security_level | 1 |
-| atl.cpp:425:13:425:18 | Append | (SSL *,int) |  | SSL_set_shutdown | 1 |
-| atl.cpp:425:13:425:18 | Append | (SSL *,int) |  | SSL_set_trust | 1 |
-| atl.cpp:425:13:425:18 | Append | (SSL *,int) |  | SSL_set_verify_depth | 1 |
-| atl.cpp:425:13:425:18 | Append | (SSL_CONNECTION *,int) |  | dtls1_read_failed | 1 |
-| atl.cpp:425:13:425:18 | Append | (SSL_CONNECTION *,int) |  | ossl_statem_send_fatal | 1 |
-| atl.cpp:425:13:425:18 | Append | (SSL_CONNECTION *,int) |  | ossl_statem_set_in_init | 1 |
-| atl.cpp:425:13:425:18 | Append | (SSL_CONNECTION *,int) |  | tls1_shared_group | 1 |
-| atl.cpp:425:13:425:18 | Append | (SSL_CTX *,int) |  | SSL_CTX_set_post_handshake_auth | 1 |
-| atl.cpp:425:13:425:18 | Append | (SSL_CTX *,int) |  | SSL_CTX_set_purpose | 1 |
-| atl.cpp:425:13:425:18 | Append | (SSL_CTX *,int) |  | SSL_CTX_set_quiet_shutdown | 1 |
-| atl.cpp:425:13:425:18 | Append | (SSL_CTX *,int) |  | SSL_CTX_set_security_level | 1 |
-| atl.cpp:425:13:425:18 | Append | (SSL_CTX *,int) |  | SSL_CTX_set_srp_strength | 1 |
-| atl.cpp:425:13:425:18 | Append | (SSL_CTX *,int) |  | SSL_CTX_set_trust | 1 |
-| atl.cpp:425:13:425:18 | Append | (SSL_CTX *,int) |  | SSL_CTX_set_verify_depth | 1 |
-| atl.cpp:425:13:425:18 | Append | (SSL_CTX *,int) |  | ssl_md | 1 |
-| atl.cpp:425:13:425:18 | Append | (SSL_SESSION *,int) |  | SSL_SESSION_set_protocol_version | 1 |
-| atl.cpp:425:13:425:18 | Append | (TS_REQ *,int) |  | TS_REQ_delete_ext | 1 |
-| atl.cpp:425:13:425:18 | Append | (TS_REQ *,int) |  | TS_REQ_get_ext | 1 |
-| atl.cpp:425:13:425:18 | Append | (TS_RESP_CTX *,int) |  | TS_RESP_CTX_add_flags | 1 |
-| atl.cpp:425:13:425:18 | Append | (TS_STATUS_INFO *,int) |  | TS_STATUS_INFO_set_status | 1 |
-| atl.cpp:425:13:425:18 | Append | (TS_TST_INFO *,int) |  | TS_TST_INFO_delete_ext | 1 |
-| atl.cpp:425:13:425:18 | Append | (TS_TST_INFO *,int) |  | TS_TST_INFO_get_ext | 1 |
-| atl.cpp:425:13:425:18 | Append | (TS_VERIFY_CTX *,int) |  | TS_VERIFY_CTX_add_flags | 1 |
-| atl.cpp:425:13:425:18 | Append | (TS_VERIFY_CTX *,int) |  | TS_VERIFY_CTX_set_flags | 1 |
-| atl.cpp:425:13:425:18 | Append | (WPACKET *,int) |  | ossl_DER_w_begin_sequence | 1 |
-| atl.cpp:425:13:425:18 | Append | (X509 *,int) |  | X509_delete_ext | 1 |
-| atl.cpp:425:13:425:18 | Append | (X509 *,int) |  | X509_self_signed | 1 |
-| atl.cpp:425:13:425:18 | Append | (X509_ACERT *,int) |  | X509_ACERT_delete_attr | 1 |
-| atl.cpp:425:13:425:18 | Append | (X509_ATTRIBUTE *,int) |  | X509_ATTRIBUTE_get0_type | 1 |
-| atl.cpp:425:13:425:18 | Append | (X509_CRL *,int) |  | X509_CRL_delete_ext | 1 |
-| atl.cpp:425:13:425:18 | Append | (X509_NAME *,int) |  | X509_NAME_delete_entry | 1 |
-| atl.cpp:425:13:425:18 | Append | (X509_REQ *,int) |  | X509_REQ_delete_attr | 1 |
-| atl.cpp:425:13:425:18 | Append | (X509_REVOKED *,int) |  | X509_REVOKED_delete_ext | 1 |
-| atl.cpp:425:13:425:18 | Append | (X509_STORE *,int) |  | X509_STORE_set_depth | 1 |
-| atl.cpp:425:13:425:18 | Append | (X509_STORE *,int) |  | X509_STORE_set_purpose | 1 |
-| atl.cpp:425:13:425:18 | Append | (X509_STORE *,int) |  | X509_STORE_set_trust | 1 |
-| atl.cpp:425:13:425:18 | Append | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_depth | 1 |
-| atl.cpp:425:13:425:18 | Append | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_error | 1 |
-| atl.cpp:425:13:425:18 | Append | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_error_depth | 1 |
-| atl.cpp:425:13:425:18 | Append | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_purpose | 1 |
-| atl.cpp:425:13:425:18 | Append | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_trust | 1 |
-| atl.cpp:425:13:425:18 | Append | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_get0_host | 1 |
-| atl.cpp:425:13:425:18 | Append | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_auth_level | 1 |
-| atl.cpp:425:13:425:18 | Append | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_depth | 1 |
-| atl.cpp:425:13:425:18 | Append | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_purpose | 1 |
-| atl.cpp:425:13:425:18 | Append | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_trust | 1 |
-| atl.cpp:425:13:425:18 | Append | (_Float128,int) |  | __ldexpf128 | 1 |
-| atl.cpp:425:13:425:18 | Append | (_Float128,int) |  | __scalbnf128 | 1 |
-| atl.cpp:425:13:425:18 | Append | (__sigset_t *,int) |  | __sigaddset_compat | 1 |
-| atl.cpp:425:13:425:18 | Append | (__sigset_t *,int) |  | __sigdelset_compat | 1 |
-| atl.cpp:425:13:425:18 | Append | (acttab *,int) |  | acttab_insert | 1 |
-| atl.cpp:425:13:425:18 | Append | (addrinfo *,int) |  | support_format_addrinfo | 1 |
-| atl.cpp:425:13:425:18 | Append | (aiocb_union *,int) |  | __aio_enqueue_request | 1 |
-| atl.cpp:425:13:425:18 | Append | (argp_fmtstream_t,int) |  | __argp_fmtstream_putc | 1 |
-| atl.cpp:425:13:425:18 | Append | (char **,int) |  | addrsort | 1 |
-| atl.cpp:425:13:425:18 | Append | (char *,int) |  | Curl_str2addr | 1 |
-| atl.cpp:425:13:425:18 | Append | (char *,int) |  | PEM_proc_type | 1 |
-| atl.cpp:425:13:425:18 | Append | (char,int) | CStringT | CStringT | 1 |
-| atl.cpp:425:13:425:18 | Append | (connectdata *,int) |  | Curl_conn_is_ssl | 1 |
-| atl.cpp:425:13:425:18 | Append | (const ASN1_BIT_STRING *,int) |  | ASN1_BIT_STRING_get_bit | 1 |
-| atl.cpp:425:13:425:18 | Append | (const BIGNUM *,int) |  | BN_get_flags | 1 |
-| atl.cpp:425:13:425:18 | Append | (const BIGNUM *,int) |  | BN_is_bit_set | 1 |
-| atl.cpp:425:13:425:18 | Append | (const BIO *,int) |  | BIO_get_ex_data | 1 |
-| atl.cpp:425:13:425:18 | Append | (const BIO *,int) |  | BIO_test_flags | 1 |
-| atl.cpp:425:13:425:18 | Append | (const CMS_SignerInfo *,int) |  | CMS_signed_get_attr | 1 |
-| atl.cpp:425:13:425:18 | Append | (const CMS_SignerInfo *,int) |  | CMS_unsigned_get_attr | 1 |
-| atl.cpp:425:13:425:18 | Append | (const CRYPTO_EX_DATA *,int) |  | CRYPTO_get_ex_data | 1 |
-| atl.cpp:425:13:425:18 | Append | (const DH *,int) |  | DH_get_ex_data | 1 |
-| atl.cpp:425:13:425:18 | Append | (const DH *,int) |  | DH_test_flags | 1 |
-| atl.cpp:425:13:425:18 | Append | (const DH *,int) |  | ossl_dh_dup | 1 |
-| atl.cpp:425:13:425:18 | Append | (const DSA *,int) |  | DSA_get_ex_data | 1 |
-| atl.cpp:425:13:425:18 | Append | (const DSA *,int) |  | DSA_test_flags | 1 |
-| atl.cpp:425:13:425:18 | Append | (const DSA *,int) |  | ossl_dsa_dup | 1 |
-| atl.cpp:425:13:425:18 | Append | (const ECX_KEY *,int) |  | ossl_ecx_key_dup | 1 |
-| atl.cpp:425:13:425:18 | Append | (const EC_KEY *,int) |  | EC_KEY_get_ex_data | 1 |
-| atl.cpp:425:13:425:18 | Append | (const EC_KEY *,int) |  | ossl_ec_key_dup | 1 |
-| atl.cpp:425:13:425:18 | Append | (const ENGINE *,int) |  | ENGINE_get_ex_data | 1 |
-| atl.cpp:425:13:425:18 | Append | (const EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_test_flags | 1 |
-| atl.cpp:425:13:425:18 | Append | (const EVP_MD_CTX *,int) |  | EVP_MD_CTX_test_flags | 1 |
-| atl.cpp:425:13:425:18 | Append | (const EVP_PKEY *,int) |  | EVP_PKEY_get_attr | 1 |
-| atl.cpp:425:13:425:18 | Append | (const EVP_PKEY *,int) |  | EVP_PKEY_get_ex_data | 1 |
-| atl.cpp:425:13:425:18 | Append | (const ML_DSA_KEY *,int) |  | ossl_ml_dsa_key_dup | 1 |
-| atl.cpp:425:13:425:18 | Append | (const ML_KEM_KEY *,int) |  | ossl_ml_kem_key_dup | 1 |
-| atl.cpp:425:13:425:18 | Append | (const OPENSSL_STACK *,int) |  | OPENSSL_sk_value | 1 |
-| atl.cpp:425:13:425:18 | Append | (const OSSL_CMP_CERTREPMESSAGE *,int) |  | ossl_cmp_certrepmessage_get0_certresponse | 1 |
-| atl.cpp:425:13:425:18 | Append | (const OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_get0_newPkey | 1 |
-| atl.cpp:425:13:425:18 | Append | (const OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_get_option | 1 |
-| atl.cpp:425:13:425:18 | Append | (const OSSL_CMP_PKISI *,int) |  | ossl_cmp_pkisi_check_pkifailureinfo | 1 |
-| atl.cpp:425:13:425:18 | Append | (const OSSL_CMP_POLLREPCONTENT *,int) |  | ossl_cmp_pollrepcontent_get0_pollrep | 1 |
-| atl.cpp:425:13:425:18 | Append | (const QUIC_CHANNEL *,int) |  | ossl_quic_channel_get_local_stream_count_avail | 1 |
-| atl.cpp:425:13:425:18 | Append | (const QUIC_CHANNEL *,int) |  | ossl_quic_channel_get_remote_stream_count_avail | 1 |
-| atl.cpp:425:13:425:18 | Append | (const RSA *,int) |  | RSA_get_ex_data | 1 |
-| atl.cpp:425:13:425:18 | Append | (const RSA *,int) |  | RSA_test_flags | 1 |
-| atl.cpp:425:13:425:18 | Append | (const RSA *,int) |  | ossl_rsa_dup | 1 |
-| atl.cpp:425:13:425:18 | Append | (const SLH_DSA_KEY *,int) |  | ossl_slh_dsa_key_dup | 1 |
-| atl.cpp:425:13:425:18 | Append | (const SSL *,int) |  | SSL_get_ex_data | 1 |
-| atl.cpp:425:13:425:18 | Append | (const SSL_CTX *,int) |  | SSL_CTX_get_ex_data | 1 |
-| atl.cpp:425:13:425:18 | Append | (const SSL_SESSION *,int) |  | SSL_SESSION_get_ex_data | 1 |
-| atl.cpp:425:13:425:18 | Append | (const SSL_SESSION *,int) |  | ssl_session_dup | 1 |
-| atl.cpp:425:13:425:18 | Append | (const UI *,int) |  | UI_get_ex_data | 1 |
-| atl.cpp:425:13:425:18 | Append | (const UI_METHOD *,int) |  | UI_method_get_ex_data | 1 |
-| atl.cpp:425:13:425:18 | Append | (const X509 *,int) |  | X509_get_ex_data | 1 |
-| atl.cpp:425:13:425:18 | Append | (const X509 *,int) |  | X509_get_ext | 1 |
-| atl.cpp:425:13:425:18 | Append | (const X509_ACERT *,int) |  | X509_ACERT_get_attr | 1 |
-| atl.cpp:425:13:425:18 | Append | (const X509_CRL *,int) |  | X509_CRL_get_ext | 1 |
-| atl.cpp:425:13:425:18 | Append | (const X509_NAME *,int) |  | X509_NAME_get_entry | 1 |
-| atl.cpp:425:13:425:18 | Append | (const X509_POLICY_LEVEL *,int) |  | X509_policy_level_get0_node | 1 |
-| atl.cpp:425:13:425:18 | Append | (const X509_POLICY_TREE *,int) |  | X509_policy_tree_get0_level | 1 |
-| atl.cpp:425:13:425:18 | Append | (const X509_REQ *,int) |  | X509_REQ_get_attr | 1 |
-| atl.cpp:425:13:425:18 | Append | (const X509_REVOKED *,int) |  | X509_REVOKED_get_ext | 1 |
-| atl.cpp:425:13:425:18 | Append | (const X509_STORE *,int) |  | X509_STORE_get_ex_data | 1 |
-| atl.cpp:425:13:425:18 | Append | (const X509_STORE_CTX *,int) |  | X509_STORE_CTX_get_ex_data | 1 |
-| atl.cpp:425:13:425:18 | Append | (const XCHAR *,int) | CStringT | CStringT | 1 |
-| atl.cpp:425:13:425:18 | Append | (const YCHAR *,int) | CStringT | CStringT | 1 |
-| atl.cpp:425:13:425:18 | Append | (const char *,int) |  | DH_meth_new | 1 |
-| atl.cpp:425:13:425:18 | Append | (const char *,int) |  | DSA_meth_new | 1 |
-| atl.cpp:425:13:425:18 | Append | (const char *,int) |  | Jim_StrDupLen | 1 |
-| atl.cpp:425:13:425:18 | Append | (const char *,int) |  | NETSCAPE_SPKI_b64_decode | 1 |
-| atl.cpp:425:13:425:18 | Append | (const char *,int) |  | RSA_meth_new | 1 |
-| atl.cpp:425:13:425:18 | Append | (const char *,int) |  | ftok | 1 |
-| atl.cpp:425:13:425:18 | Append | (const char *,int) |  | gethostbyname2 | 1 |
-| atl.cpp:425:13:425:18 | Append | (const char *,int) |  | parse_yesno | 1 |
-| atl.cpp:425:13:425:18 | Append | (const char *,int) |  | res_gethostbyname2 | 1 |
-| atl.cpp:425:13:425:18 | Append | (const stack_st_X509_ATTRIBUTE *,int) |  | X509at_get_attr | 1 |
-| atl.cpp:425:13:425:18 | Append | (const stack_st_X509_EXTENSION *,int) |  | X509v3_get_ext | 1 |
-| atl.cpp:425:13:425:18 | Append | (const unsigned char *,int) |  | Jim_GenHashFunction | 1 |
-| atl.cpp:425:13:425:18 | Append | (const unsigned char *,int) |  | OPENSSL_uni2asc | 1 |
-| atl.cpp:425:13:425:18 | Append | (const unsigned char *,int) |  | OPENSSL_uni2utf8 | 1 |
-| atl.cpp:425:13:425:18 | Append | (const void *,int) |  | inet6_rth_getaddr | 1 |
-| atl.cpp:425:13:425:18 | Append | (double,int) |  | __ldexp | 1 |
-| atl.cpp:425:13:425:18 | Append | (double,int) |  | __scalbn | 1 |
-| atl.cpp:425:13:425:18 | Append | (double[],int) |  | getloadavg | 1 |
-| atl.cpp:425:13:425:18 | Append | (dynhds *,int) |  | Curl_dynhds_set_opts | 1 |
-| atl.cpp:425:13:425:18 | Append | (fexcept_t *,int) |  | fegetexceptflag | 1 |
-| atl.cpp:425:13:425:18 | Append | (float,int) |  | __ldexpf | 1 |
-| atl.cpp:425:13:425:18 | Append | (float,int) |  | __scalbnf | 1 |
-| atl.cpp:425:13:425:18 | Append | (gzFile,int) |  | gzflush | 1 |
-| atl.cpp:425:13:425:18 | Append | (gzFile,int) |  | gzputc | 1 |
-| atl.cpp:425:13:425:18 | Append | (int *,int) |  | X509_PURPOSE_set | 1 |
-| atl.cpp:425:13:425:18 | Append | (int *,int) |  | X509_TRUST_set | 1 |
-| atl.cpp:425:13:425:18 | Append | (int *,int) |  | __lll_unlock_elision | 1 |
-| atl.cpp:425:13:425:18 | Append | (int,int) |  | BN_security_bits | 1 |
-| atl.cpp:425:13:425:18 | Append | (int,int) |  | EVP_MD_meth_new | 1 |
-| atl.cpp:425:13:425:18 | Append | (int,int) |  | EVP_PKEY_meth_new | 1 |
-| atl.cpp:425:13:425:18 | Append | (int,int) |  | __isctype | 1 |
-| atl.cpp:425:13:425:18 | Append | (int,int) |  | acttab_alloc | 1 |
-| atl.cpp:425:13:425:18 | Append | (int,int) |  | div | 1 |
-| atl.cpp:425:13:425:18 | Append | (int,int) |  | inet6_rth_space | 1 |
-| atl.cpp:425:13:425:18 | Append | (long double,int) |  | __ldexpl | 1 |
-| atl.cpp:425:13:425:18 | Append | (netlink_handle *,int) |  | __netlink_request | 1 |
-| atl.cpp:425:13:425:18 | Append | (nghttp2_option *,int) |  | nghttp2_option_set_no_auto_ping_ack | 1 |
-| atl.cpp:425:13:425:18 | Append | (nghttp2_option *,int) |  | nghttp2_option_set_no_auto_window_update | 1 |
-| atl.cpp:425:13:425:18 | Append | (nghttp2_option *,int) |  | nghttp2_option_set_no_closed_streams | 1 |
-| atl.cpp:425:13:425:18 | Append | (nghttp2_option *,int) |  | nghttp2_option_set_no_http_messaging | 1 |
-| atl.cpp:425:13:425:18 | Append | (nghttp2_option *,int) |  | nghttp2_option_set_no_recv_client_magic | 1 |
-| atl.cpp:425:13:425:18 | Append | (nghttp2_option *,int) |  | nghttp2_option_set_no_rfc9113_leading_and_trailing_ws_validation | 1 |
-| atl.cpp:425:13:425:18 | Append | (nghttp2_option *,int) |  | nghttp2_option_set_server_fallback_rfc7540_priorities | 1 |
-| atl.cpp:425:13:425:18 | Append | (ns_msg,int) |  | ns_msg_getflag | 1 |
-| atl.cpp:425:13:425:18 | Append | (obstack *,int) |  | _obstack_newchunk | 1 |
-| atl.cpp:425:13:425:18 | Append | (posix_spawnattr_t *,int) |  | posix_spawnattr_setcgroup_np | 1 |
-| atl.cpp:425:13:425:18 | Append | (posix_spawnattr_t *,int) |  | posix_spawnattr_setschedpolicy | 1 |
-| atl.cpp:425:13:425:18 | Append | (pthread_attr_t *,int) |  | __pthread_attr_setschedpolicy | 1 |
-| atl.cpp:425:13:425:18 | Append | (pthread_barrierattr_t *,int) |  | __pthread_barrierattr_setpshared | 1 |
-| atl.cpp:425:13:425:18 | Append | (pthread_mutexattr_t *,int) |  | ___pthread_mutexattr_settype | 1 |
-| atl.cpp:425:13:425:18 | Append | (pthread_mutexattr_t *,int) |  | __pthread_mutexattr_setprioceiling | 1 |
-| atl.cpp:425:13:425:18 | Append | (pthread_mutexattr_t *,int) |  | __pthread_mutexattr_setprotocol | 1 |
-| atl.cpp:425:13:425:18 | Append | (pthread_rwlockattr_t *,int) |  | __pthread_rwlockattr_setkind_np | 1 |
-| atl.cpp:425:13:425:18 | Append | (pthread_rwlockattr_t *,int) |  | __pthread_rwlockattr_setpshared | 1 |
-| atl.cpp:425:13:425:18 | Append | (rule *,int) |  | Configlist_add | 1 |
-| atl.cpp:425:13:425:18 | Append | (rule *,int) |  | Configlist_addbasis | 1 |
-| atl.cpp:425:13:425:18 | Append | (sigset_t *,int) |  | sigaddset | 1 |
-| atl.cpp:425:13:425:18 | Append | (sigset_t *,int) |  | sigdelset | 1 |
-| atl.cpp:425:13:425:18 | Append | (sqlite3 *,int) |  | sqlite3_busy_timeout | 1 |
-| atl.cpp:425:13:425:18 | Append | (sqlite3 *,int) |  | sqlite3_db_name | 1 |
-| atl.cpp:425:13:425:18 | Append | (sqlite3 *,int) |  | sqlite3_wal_autocheckpoint | 1 |
-| atl.cpp:425:13:425:18 | Append | (sqlite3_backup *,int) |  | sqlite3_backup_step | 1 |
-| atl.cpp:425:13:425:18 | Append | (sqlite3_context *,int) |  | sqlite3_aggregate_context | 1 |
-| atl.cpp:425:13:425:18 | Append | (sqlite3_context *,int) |  | sqlite3_result_error_code | 1 |
-| atl.cpp:425:13:425:18 | Append | (sqlite3_index_info *,int) |  | sqlite3_vtab_collation | 1 |
-| atl.cpp:425:13:425:18 | Append | (sqlite3_stmt *,int) |  | sqlite3_bind_parameter_name | 1 |
-| atl.cpp:425:13:425:18 | Append | (sqlite3_stmt *,int) |  | sqlite3_column_blob | 1 |
-| atl.cpp:425:13:425:18 | Append | (sqlite3_stmt *,int) |  | sqlite3_column_bytes | 1 |
-| atl.cpp:425:13:425:18 | Append | (sqlite3_stmt *,int) |  | sqlite3_column_bytes16 | 1 |
-| atl.cpp:425:13:425:18 | Append | (sqlite3_stmt *,int) |  | sqlite3_column_decltype | 1 |
-| atl.cpp:425:13:425:18 | Append | (sqlite3_stmt *,int) |  | sqlite3_column_decltype16 | 1 |
-| atl.cpp:425:13:425:18 | Append | (sqlite3_stmt *,int) |  | sqlite3_column_double | 1 |
-| atl.cpp:425:13:425:18 | Append | (sqlite3_stmt *,int) |  | sqlite3_column_int | 1 |
-| atl.cpp:425:13:425:18 | Append | (sqlite3_stmt *,int) |  | sqlite3_column_int64 | 1 |
-| atl.cpp:425:13:425:18 | Append | (sqlite3_stmt *,int) |  | sqlite3_column_name | 1 |
-| atl.cpp:425:13:425:18 | Append | (sqlite3_stmt *,int) |  | sqlite3_column_name16 | 1 |
-| atl.cpp:425:13:425:18 | Append | (sqlite3_stmt *,int) |  | sqlite3_column_text | 1 |
-| atl.cpp:425:13:425:18 | Append | (sqlite3_stmt *,int) |  | sqlite3_column_text16 | 1 |
-| atl.cpp:425:13:425:18 | Append | (sqlite3_stmt *,int) |  | sqlite3_column_type | 1 |
-| atl.cpp:425:13:425:18 | Append | (sqlite3_stmt *,int) |  | sqlite3_column_value | 1 |
-| atl.cpp:425:13:425:18 | Append | (sqlite3_stmt *,int) |  | sqlite3_stmt_explain | 1 |
-| atl.cpp:425:13:425:18 | Append | (stack_st_PKCS7 *,int) |  | PKCS12_add_safes | 1 |
-| atl.cpp:425:13:425:18 | Append | (stack_st_SSL_COMP *,int) |  | ssl3_comp_find | 1 |
-| atl.cpp:425:13:425:18 | Append | (stack_st_X509_ATTRIBUTE *,int) |  | X509at_delete_attr | 1 |
-| atl.cpp:425:13:425:18 | Append | (stack_st_X509_EXTENSION *,int) |  | X509v3_delete_ext | 1 |
-| atl.cpp:425:13:425:18 | Append | (timespec *,int) |  | __timespec_get | 1 |
-| atl.cpp:425:13:425:18 | Append | (timespec *,int) |  | __timespec_getres | 1 |
-| atl.cpp:425:13:425:18 | Append | (uint16_t,int) |  | tls1_group_id2nid | 1 |
-| atl.cpp:425:13:425:18 | Append | (unsigned char *,int) |  | RAND_bytes | 1 |
-| atl.cpp:425:13:425:18 | Append | (unsigned char *,int) |  | RAND_priv_bytes | 1 |
-| atl.cpp:425:13:425:18 | Append | (unsigned char *,int) |  | ossl_ipaddr_to_asc | 1 |
-| atl.cpp:425:13:425:18 | Append | (unsigned short,int) |  | dtls1_get_queue_priority | 1 |
-| atl.cpp:425:13:425:18 | Append | (uv_env_item_t *,int) |  | uv_os_free_environ | 1 |
-| atl.cpp:425:13:425:18 | Append | (void *,int) |  | DSO_dsobyaddr | 1 |
-| atl.cpp:425:13:425:18 | Append | (void *,int) |  | sqlite3_realloc | 1 |
-| atl.cpp:425:13:425:18 | Append | (void *const *,int) |  | __backtrace_symbols | 1 |
-| atl.cpp:425:13:425:18 | Append | (wchar_t,int) | CStringT | CStringT | 1 |
-| atl.cpp:426:13:426:22 | AppendBSTR | (wchar_t *) | CStringT | CStringT | 0 |
-| atl.cpp:427:13:427:23 | AppendBytes | (ASN1_STRING *,int) |  | ASN1_STRING_length_set | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (ASYNC_WAIT_CTX *,int) |  | ASYNC_WAIT_CTX_set_status | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (BIGNUM *,int) |  | BN_clear_bit | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (BIGNUM *,int) |  | BN_mask_bits | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (BIGNUM *,int) |  | BN_set_bit | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (BIGNUM *,int) |  | BN_set_flags | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (BIGNUM *,int) |  | bn_expand2 | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (BIGNUM *,int) |  | bn_wexpand | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (BIGNUM *,int) |  | ossl_bn_mask_bits_fixed_top | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (BIO *,int) |  | BIO_clear_flags | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (BIO *,int) |  | BIO_find_type | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (BIO *,int) |  | BIO_set_flags | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (BIO *,int) |  | BIO_set_init | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (BIO *,int) |  | BIO_set_retry_reason | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (BIO *,int) |  | BIO_set_shutdown | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (BIO *,int) |  | TXT_DB_read | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (CMS_SignerInfo *,int) |  | CMS_signed_delete_attr | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (CMS_SignerInfo *,int) |  | CMS_unsigned_delete_attr | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (CURL *,int) |  | curl_easy_pause | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (Curl_easy *,int) |  | Curl_conn_get_socket | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (DH *,int) |  | DH_clear_flags | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (DH *,int) |  | DH_set_flags | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (DH_METHOD *,int) |  | DH_meth_set_flags | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (DSA *,int) |  | DSA_clear_flags | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (DSA *,int) |  | DSA_set_flags | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (DSA_METHOD *,int) |  | DSA_meth_set_flags | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (EC_GROUP *,int) |  | EC_GROUP_set_asn1_flag | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (EC_GROUP *,int) |  | EC_GROUP_set_curve_name | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (EC_KEY *,int) |  | EC_KEY_clear_flags | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (EC_KEY *,int) |  | EC_KEY_set_asn1_flag | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (EC_KEY *,int) |  | EC_KEY_set_flags | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (ENGINE *,int) |  | ENGINE_cmd_is_executable | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (ENGINE *,int) |  | ENGINE_set_flags | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (EVP_CIPHER *,int) |  | EVP_CIPHER_meth_set_impl_ctx_size | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (EVP_CIPHER *,int) |  | EVP_CIPHER_meth_set_iv_length | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_clear_flags | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_flags | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_key_length | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_num | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (EVP_KEYMGMT *,int) |  | evp_keymgmt_util_query_operation_name | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (EVP_MD *,int) |  | EVP_MD_meth_set_app_datasize | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (EVP_MD *,int) |  | EVP_MD_meth_set_input_blocksize | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (EVP_MD *,int) |  | EVP_MD_meth_set_result_size | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (EVP_MD_CTX *,int) |  | EVP_MD_CTX_clear_flags | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (EVP_MD_CTX *,int) |  | EVP_MD_CTX_set_flags | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (EVP_PKEY *,int) |  | EVP_PKEY_delete_attr | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (EVP_PKEY *,int) |  | EVP_PKEY_save_parameters | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (EVP_PKEY *,int) |  | EVP_PKEY_set_type | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_get_keygen_info | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_kdf_type | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_nid | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_paramgen_type | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_rfc5114 | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dhx_rfc5114 | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ec_param_enc | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ec_paramgen_curve_nid | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ecdh_kdf_type | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_hkdf_mode | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_rsa_padding | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_rsa_pss_saltlen | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_gindex | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_h | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_pcounter | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (FILE *,int) |  | _IO_default_pbackfail | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (FILE *,int) |  | _IO_fwide | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (FILE *,int) |  | _IO_init | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (FILE *,int) |  | _IO_init_internal | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (FILE *,int) |  | _IO_new_file_attach | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (FILE *,int) |  | _IO_new_file_overflow | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (FILE *,int) |  | _IO_old_init | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (FILE *,int) |  | _IO_sputbackc | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (FILE *,int) |  | _IO_str_overflow | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (FILE *,int) |  | _IO_str_pbackfail | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (FILE *,int) |  | __printf_buffer_as_file_overflow | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (FILE *,int) |  | __wprintf_buffer_as_file_overflow | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (FTS *,int) |  | fts_children | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (LIBSSH2_CHANNEL *,int) |  | _libssh2_channel_extended_data | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (LIBSSH2_CHANNEL *,int) |  | _libssh2_channel_flush | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_flush_ex | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_handle_extended_data | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_handle_extended_data2 | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_set_blocking | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (LIBSSH2_SESSION *,int) |  | _libssh2_session_set_blocking | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (LIBSSH2_SESSION *,int) |  | libssh2_hostkey_hash | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (LIBSSH2_SESSION *,int) |  | libssh2_session_methods | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (LIBSSH2_SESSION *,int) |  | libssh2_session_set_blocking | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (LIBSSH2_SESSION *,int) |  | libssh2_session_startup | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (LPCOLESTR,int) | CComBSTR | Append | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (OCSP_BASICRESP *,int) |  | OCSP_BASICRESP_delete_ext | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (OCSP_BASICRESP *,int) |  | OCSP_BASICRESP_get_ext | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (OCSP_BASICRESP *,int) |  | OCSP_resp_get0 | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (OCSP_ONEREQ *,int) |  | OCSP_ONEREQ_delete_ext | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (OCSP_ONEREQ *,int) |  | OCSP_ONEREQ_get_ext | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (OCSP_REQUEST *,int) |  | OCSP_REQUEST_delete_ext | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (OCSP_REQUEST *,int) |  | OCSP_REQUEST_get_ext | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (OCSP_REQUEST *,int) |  | OCSP_request_onereq_get0 | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (OCSP_SINGLERESP *,int) |  | OCSP_SINGLERESP_delete_ext | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (OCSP_SINGLERESP *,int) |  | OCSP_SINGLERESP_get_ext | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (OPENSSL_STACK *,int) |  | OPENSSL_sk_delete | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (OPENSSL_STACK *,int) |  | OPENSSL_sk_reserve | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (OPENSSL_sk_compfunc,int) |  | OPENSSL_sk_new_reserve | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (OSSL_ACKM *,int) |  | ossl_ackm_get_ack_deadline | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (OSSL_ACKM *,int) |  | ossl_ackm_get_ack_frame | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (OSSL_ACKM *,int) |  | ossl_ackm_get_largest_acked | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (OSSL_ACKM *,int) |  | ossl_ackm_on_pkt_space_discarded | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_set_serverPort | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (OSSL_CMP_CTX *,int) |  | ossl_cmp_ctx_set_failInfoCode | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (OSSL_CMP_CTX *,int) |  | ossl_cmp_ctx_set_status | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (OSSL_CMP_CTX *,int) |  | ossl_cmp_msg_create | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (OSSL_CMP_CTX *,int) |  | ossl_cmp_pollReq_new | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (OSSL_CMP_MSG *,int) |  | ossl_cmp_msg_set_bodytype | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (OSSL_CMP_PKIHEADER *,int) |  | ossl_cmp_hdr_set_pvno | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (OSSL_CMP_REVREPCONTENT *,int) |  | ossl_cmp_revrepcontent_get_CertId | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (OSSL_CMP_REVREPCONTENT *,int) |  | ossl_cmp_revrepcontent_get_pkisi | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_accept_raverified | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_accept_unprotected | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_grant_implicit_confirm | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_send_unprotected_errors | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (OSSL_CRMF_PKIPUBLICATIONINFO *,int) |  | OSSL_CRMF_MSG_set_PKIPublicationInfo_action | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (OSSL_DECODER_CTX *,int) |  | OSSL_DECODER_CTX_set_selection | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (OSSL_ENCODER_CTX *,int) |  | OSSL_ENCODER_CTX_set_selection | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (OSSL_LIB_CTX *,int) |  | OSSL_LIB_CTX_get_data | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (OSSL_LIB_CTX *,int) |  | OSSL_LIB_CTX_set_conf_diagnostics | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (OSSL_LIB_CTX *,int) |  | ossl_ctx_global_properties | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (OSSL_LIB_CTX *,int) |  | ossl_dh_new_by_nid_ex | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (OSSL_LIB_CTX *,int) |  | ossl_lib_ctx_get_data | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (OSSL_LIB_CTX *,int) |  | ossl_mac_key_new | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (OSSL_PARAM *,int) |  | OSSL_PARAM_set_int | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (OSSL_QRX *,int) |  | ossl_qrx_get_bytes_received | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (OSSL_RECORD_LAYER *,int) |  | tls_set_first_handshake | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (OSSL_RECORD_LAYER *,int) |  | tls_set_plain_alerts | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (OSSL_STORE_CTX *,int) |  | OSSL_STORE_expect | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (PKCS7 *,int) |  | PKCS7_set_type | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (QUIC_CHANNEL *,int) |  | ossl_quic_channel_new_stream_local | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (QUIC_ENGINE *,int) |  | ossl_quic_engine_set_inhibit_tick | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (QUIC_PORT *,int) |  | ossl_quic_port_set_allow_incoming | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (QUIC_RCIDM *,int) |  | ossl_quic_rcidm_get_preferred_tx_dcid_changed | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (QUIC_RSTREAM *,int) |  | ossl_quic_rstream_set_cleanse | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (QUIC_RXFC *,int) |  | ossl_quic_rxfc_get_error | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (QUIC_RXFC *,int) |  | ossl_quic_rxfc_has_cwm_changed | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (QUIC_SSTREAM *,int) |  | ossl_quic_sstream_set_cleanse | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (QUIC_STREAM_MAP *,int) |  | ossl_quic_stream_map_get_accept_queue_len | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (QUIC_TXFC *,int) |  | ossl_quic_txfc_has_become_blocked | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (RSA *,int) |  | RSA_clear_flags | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (RSA *,int) |  | RSA_set_flags | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (RSA_METHOD *,int) |  | RSA_meth_set_flags | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_hashalg | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_maskgenhashalg | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_saltlen | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_trailerfield | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (SSL *,int) |  | SSL_key_update | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (SSL *,int) |  | SSL_set_post_handshake_auth | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (SSL *,int) |  | SSL_set_purpose | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (SSL *,int) |  | SSL_set_quic_tls_early_data_enabled | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (SSL *,int) |  | SSL_set_quiet_shutdown | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (SSL *,int) |  | SSL_set_read_ahead | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (SSL *,int) |  | SSL_set_security_level | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (SSL *,int) |  | SSL_set_shutdown | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (SSL *,int) |  | SSL_set_trust | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (SSL *,int) |  | SSL_set_verify_depth | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (SSL_CONNECTION *,int) |  | dtls1_read_failed | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (SSL_CONNECTION *,int) |  | ossl_statem_send_fatal | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (SSL_CONNECTION *,int) |  | ossl_statem_set_in_init | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (SSL_CONNECTION *,int) |  | tls1_shared_group | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (SSL_CTX *,int) |  | SSL_CTX_set_post_handshake_auth | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (SSL_CTX *,int) |  | SSL_CTX_set_purpose | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (SSL_CTX *,int) |  | SSL_CTX_set_quiet_shutdown | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (SSL_CTX *,int) |  | SSL_CTX_set_security_level | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (SSL_CTX *,int) |  | SSL_CTX_set_srp_strength | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (SSL_CTX *,int) |  | SSL_CTX_set_trust | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (SSL_CTX *,int) |  | SSL_CTX_set_verify_depth | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (SSL_CTX *,int) |  | ssl_md | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (SSL_SESSION *,int) |  | SSL_SESSION_set_protocol_version | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (TS_REQ *,int) |  | TS_REQ_delete_ext | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (TS_REQ *,int) |  | TS_REQ_get_ext | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (TS_RESP_CTX *,int) |  | TS_RESP_CTX_add_flags | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (TS_STATUS_INFO *,int) |  | TS_STATUS_INFO_set_status | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (TS_TST_INFO *,int) |  | TS_TST_INFO_delete_ext | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (TS_TST_INFO *,int) |  | TS_TST_INFO_get_ext | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (TS_VERIFY_CTX *,int) |  | TS_VERIFY_CTX_add_flags | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (TS_VERIFY_CTX *,int) |  | TS_VERIFY_CTX_set_flags | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (WPACKET *,int) |  | ossl_DER_w_begin_sequence | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (X509 *,int) |  | X509_delete_ext | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (X509 *,int) |  | X509_self_signed | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (X509_ACERT *,int) |  | X509_ACERT_delete_attr | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (X509_ATTRIBUTE *,int) |  | X509_ATTRIBUTE_get0_type | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (X509_CRL *,int) |  | X509_CRL_delete_ext | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (X509_NAME *,int) |  | X509_NAME_delete_entry | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (X509_REQ *,int) |  | X509_REQ_delete_attr | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (X509_REVOKED *,int) |  | X509_REVOKED_delete_ext | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (X509_STORE *,int) |  | X509_STORE_set_depth | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (X509_STORE *,int) |  | X509_STORE_set_purpose | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (X509_STORE *,int) |  | X509_STORE_set_trust | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_depth | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_error | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_error_depth | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_purpose | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_trust | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_get0_host | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_auth_level | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_depth | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_purpose | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_trust | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (_Float128,int) |  | __ldexpf128 | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (_Float128,int) |  | __scalbnf128 | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (__sigset_t *,int) |  | __sigaddset_compat | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (__sigset_t *,int) |  | __sigdelset_compat | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (acttab *,int) |  | acttab_insert | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (addrinfo *,int) |  | support_format_addrinfo | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (aiocb_union *,int) |  | __aio_enqueue_request | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (argp_fmtstream_t,int) |  | __argp_fmtstream_putc | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (char **,int) |  | addrsort | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (char *,int) |  | Curl_str2addr | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (char *,int) |  | PEM_proc_type | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (char,int) | CStringT | CStringT | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (connectdata *,int) |  | Curl_conn_is_ssl | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const ASN1_BIT_STRING *,int) |  | ASN1_BIT_STRING_get_bit | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const BIGNUM *,int) |  | BN_get_flags | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const BIGNUM *,int) |  | BN_is_bit_set | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const BIO *,int) |  | BIO_get_ex_data | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const BIO *,int) |  | BIO_test_flags | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const CMS_SignerInfo *,int) |  | CMS_signed_get_attr | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const CMS_SignerInfo *,int) |  | CMS_unsigned_get_attr | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const CRYPTO_EX_DATA *,int) |  | CRYPTO_get_ex_data | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const DH *,int) |  | DH_get_ex_data | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const DH *,int) |  | DH_test_flags | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const DH *,int) |  | ossl_dh_dup | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const DSA *,int) |  | DSA_get_ex_data | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const DSA *,int) |  | DSA_test_flags | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const DSA *,int) |  | ossl_dsa_dup | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const ECX_KEY *,int) |  | ossl_ecx_key_dup | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const EC_KEY *,int) |  | EC_KEY_get_ex_data | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const EC_KEY *,int) |  | ossl_ec_key_dup | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const ENGINE *,int) |  | ENGINE_get_ex_data | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_test_flags | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const EVP_MD_CTX *,int) |  | EVP_MD_CTX_test_flags | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const EVP_PKEY *,int) |  | EVP_PKEY_get_attr | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const EVP_PKEY *,int) |  | EVP_PKEY_get_ex_data | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const ML_DSA_KEY *,int) |  | ossl_ml_dsa_key_dup | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const ML_KEM_KEY *,int) |  | ossl_ml_kem_key_dup | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const OPENSSL_STACK *,int) |  | OPENSSL_sk_value | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const OSSL_CMP_CERTREPMESSAGE *,int) |  | ossl_cmp_certrepmessage_get0_certresponse | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_get0_newPkey | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_get_option | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const OSSL_CMP_PKISI *,int) |  | ossl_cmp_pkisi_check_pkifailureinfo | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const OSSL_CMP_POLLREPCONTENT *,int) |  | ossl_cmp_pollrepcontent_get0_pollrep | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const QUIC_CHANNEL *,int) |  | ossl_quic_channel_get_local_stream_count_avail | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const QUIC_CHANNEL *,int) |  | ossl_quic_channel_get_remote_stream_count_avail | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const RSA *,int) |  | RSA_get_ex_data | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const RSA *,int) |  | RSA_test_flags | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const RSA *,int) |  | ossl_rsa_dup | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const SLH_DSA_KEY *,int) |  | ossl_slh_dsa_key_dup | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const SSL *,int) |  | SSL_get_ex_data | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const SSL_CTX *,int) |  | SSL_CTX_get_ex_data | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const SSL_SESSION *,int) |  | SSL_SESSION_get_ex_data | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const SSL_SESSION *,int) |  | ssl_session_dup | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const UI *,int) |  | UI_get_ex_data | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const UI_METHOD *,int) |  | UI_method_get_ex_data | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const X509 *,int) |  | X509_get_ex_data | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const X509 *,int) |  | X509_get_ext | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const X509_ACERT *,int) |  | X509_ACERT_get_attr | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const X509_CRL *,int) |  | X509_CRL_get_ext | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const X509_NAME *,int) |  | X509_NAME_get_entry | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const X509_POLICY_LEVEL *,int) |  | X509_policy_level_get0_node | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const X509_POLICY_TREE *,int) |  | X509_policy_tree_get0_level | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const X509_REQ *,int) |  | X509_REQ_get_attr | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const X509_REVOKED *,int) |  | X509_REVOKED_get_ext | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const X509_STORE *,int) |  | X509_STORE_get_ex_data | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const X509_STORE_CTX *,int) |  | X509_STORE_CTX_get_ex_data | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const XCHAR *,int) | CStringT | CStringT | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const YCHAR *,int) | CStringT | CStringT | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const char *,int) |  | DH_meth_new | 0 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const char *,int) |  | DH_meth_new | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const char *,int) |  | DSA_meth_new | 0 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const char *,int) |  | DSA_meth_new | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const char *,int) |  | Jim_StrDupLen | 0 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const char *,int) |  | Jim_StrDupLen | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const char *,int) |  | NETSCAPE_SPKI_b64_decode | 0 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const char *,int) |  | NETSCAPE_SPKI_b64_decode | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const char *,int) |  | RSA_meth_new | 0 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const char *,int) |  | RSA_meth_new | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const char *,int) |  | ftok | 0 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const char *,int) |  | ftok | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const char *,int) |  | gethostbyname2 | 0 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const char *,int) |  | gethostbyname2 | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const char *,int) |  | parse_yesno | 0 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const char *,int) |  | parse_yesno | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const char *,int) |  | res_gethostbyname2 | 0 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const char *,int) |  | res_gethostbyname2 | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const stack_st_X509_ATTRIBUTE *,int) |  | X509at_get_attr | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const stack_st_X509_EXTENSION *,int) |  | X509v3_get_ext | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const unsigned char *,int) |  | Jim_GenHashFunction | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const unsigned char *,int) |  | OPENSSL_uni2asc | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const unsigned char *,int) |  | OPENSSL_uni2utf8 | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (const void *,int) |  | inet6_rth_getaddr | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (double,int) |  | __ldexp | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (double,int) |  | __scalbn | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (double[],int) |  | getloadavg | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (dynhds *,int) |  | Curl_dynhds_set_opts | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (fexcept_t *,int) |  | fegetexceptflag | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (float,int) |  | __ldexpf | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (float,int) |  | __scalbnf | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (gzFile,int) |  | gzflush | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (gzFile,int) |  | gzputc | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (int *,int) |  | X509_PURPOSE_set | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (int *,int) |  | X509_TRUST_set | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (int *,int) |  | __lll_unlock_elision | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (int,int) |  | BN_security_bits | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (int,int) |  | EVP_MD_meth_new | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (int,int) |  | EVP_PKEY_meth_new | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (int,int) |  | __isctype | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (int,int) |  | acttab_alloc | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (int,int) |  | div | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (int,int) |  | inet6_rth_space | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (long double,int) |  | __ldexpl | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (netlink_handle *,int) |  | __netlink_request | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (nghttp2_option *,int) |  | nghttp2_option_set_no_auto_ping_ack | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (nghttp2_option *,int) |  | nghttp2_option_set_no_auto_window_update | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (nghttp2_option *,int) |  | nghttp2_option_set_no_closed_streams | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (nghttp2_option *,int) |  | nghttp2_option_set_no_http_messaging | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (nghttp2_option *,int) |  | nghttp2_option_set_no_recv_client_magic | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (nghttp2_option *,int) |  | nghttp2_option_set_no_rfc9113_leading_and_trailing_ws_validation | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (nghttp2_option *,int) |  | nghttp2_option_set_server_fallback_rfc7540_priorities | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (ns_msg,int) |  | ns_msg_getflag | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (obstack *,int) |  | _obstack_newchunk | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (posix_spawnattr_t *,int) |  | posix_spawnattr_setcgroup_np | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (posix_spawnattr_t *,int) |  | posix_spawnattr_setschedpolicy | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (pthread_attr_t *,int) |  | __pthread_attr_setschedpolicy | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (pthread_barrierattr_t *,int) |  | __pthread_barrierattr_setpshared | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (pthread_mutexattr_t *,int) |  | ___pthread_mutexattr_settype | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (pthread_mutexattr_t *,int) |  | __pthread_mutexattr_setprioceiling | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (pthread_mutexattr_t *,int) |  | __pthread_mutexattr_setprotocol | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (pthread_rwlockattr_t *,int) |  | __pthread_rwlockattr_setkind_np | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (pthread_rwlockattr_t *,int) |  | __pthread_rwlockattr_setpshared | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (rule *,int) |  | Configlist_add | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (rule *,int) |  | Configlist_addbasis | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (sigset_t *,int) |  | sigaddset | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (sigset_t *,int) |  | sigdelset | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (sqlite3 *,int) |  | sqlite3_busy_timeout | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (sqlite3 *,int) |  | sqlite3_db_name | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (sqlite3 *,int) |  | sqlite3_wal_autocheckpoint | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (sqlite3_backup *,int) |  | sqlite3_backup_step | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (sqlite3_context *,int) |  | sqlite3_aggregate_context | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (sqlite3_context *,int) |  | sqlite3_result_error_code | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (sqlite3_index_info *,int) |  | sqlite3_vtab_collation | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (sqlite3_stmt *,int) |  | sqlite3_bind_parameter_name | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (sqlite3_stmt *,int) |  | sqlite3_column_blob | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (sqlite3_stmt *,int) |  | sqlite3_column_bytes | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (sqlite3_stmt *,int) |  | sqlite3_column_bytes16 | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (sqlite3_stmt *,int) |  | sqlite3_column_decltype | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (sqlite3_stmt *,int) |  | sqlite3_column_decltype16 | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (sqlite3_stmt *,int) |  | sqlite3_column_double | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (sqlite3_stmt *,int) |  | sqlite3_column_int | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (sqlite3_stmt *,int) |  | sqlite3_column_int64 | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (sqlite3_stmt *,int) |  | sqlite3_column_name | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (sqlite3_stmt *,int) |  | sqlite3_column_name16 | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (sqlite3_stmt *,int) |  | sqlite3_column_text | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (sqlite3_stmt *,int) |  | sqlite3_column_text16 | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (sqlite3_stmt *,int) |  | sqlite3_column_type | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (sqlite3_stmt *,int) |  | sqlite3_column_value | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (sqlite3_stmt *,int) |  | sqlite3_stmt_explain | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (stack_st_PKCS7 *,int) |  | PKCS12_add_safes | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (stack_st_SSL_COMP *,int) |  | ssl3_comp_find | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (stack_st_X509_ATTRIBUTE *,int) |  | X509at_delete_attr | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (stack_st_X509_EXTENSION *,int) |  | X509v3_delete_ext | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (timespec *,int) |  | __timespec_get | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (timespec *,int) |  | __timespec_getres | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (uint16_t,int) |  | tls1_group_id2nid | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (unsigned char *,int) |  | RAND_bytes | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (unsigned char *,int) |  | RAND_priv_bytes | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (unsigned char *,int) |  | ossl_ipaddr_to_asc | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (unsigned short,int) |  | dtls1_get_queue_priority | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (uv_env_item_t *,int) |  | uv_os_free_environ | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (void *,int) |  | DSO_dsobyaddr | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (void *,int) |  | sqlite3_realloc | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (void *const *,int) |  | __backtrace_symbols | 1 |
-| atl.cpp:427:13:427:23 | AppendBytes | (wchar_t,int) | CStringT | CStringT | 1 |
-| atl.cpp:428:13:428:23 | ArrayToBSTR | (const SAFEARRAY *) | CComSafeArray | Add | 0 |
-| atl.cpp:428:13:428:23 | ArrayToBSTR | (const SAFEARRAY *) | CComSafeArray | CComSafeArray | 0 |
-| atl.cpp:428:13:428:23 | ArrayToBSTR | (const SAFEARRAY *) | CComSafeArray | operator= | 0 |
-| atl.cpp:430:10:430:15 | Attach | (wchar_t *) | CStringT | CStringT | 0 |
-| atl.cpp:440:10:440:19 | LoadString | (ASN1_STRING *,unsigned int) |  | ossl_asn1_string_set_bits_left | 1 |
-| atl.cpp:440:10:440:19 | LoadString | (Curl_easy *,unsigned int) |  | Curl_ssl_supports | 1 |
-| atl.cpp:440:10:440:19 | LoadString | (EC_KEY *,unsigned int) |  | EC_KEY_set_enc_flags | 1 |
-| atl.cpp:440:10:440:19 | LoadString | (EVP_ENCODE_CTX *,unsigned int) |  | evp_encode_ctx_set_flags | 1 |
-| atl.cpp:440:10:440:19 | LoadString | (FFC_PARAMS *,unsigned int) |  | ossl_ffc_params_set_flags | 1 |
-| atl.cpp:440:10:440:19 | LoadString | (HINSTANCE,UINT) | CComBSTR | LoadString | 0 |
-| atl.cpp:440:10:440:19 | LoadString | (HINSTANCE,UINT) | CComBSTR | LoadString | 1 |
-| atl.cpp:440:10:440:19 | LoadString | (OSSL_PARAM *,unsigned int) |  | OSSL_PARAM_set_uint | 1 |
-| atl.cpp:440:10:440:19 | LoadString | (QUIC_DEMUX *,unsigned int) |  | ossl_quic_demux_set_mtu | 1 |
-| atl.cpp:440:10:440:19 | LoadString | (QUIC_OBJ *,unsigned int) |  | ossl_quic_obj_set_blocking_mode | 1 |
-| atl.cpp:440:10:440:19 | LoadString | (RAND_POOL *,unsigned int) |  | ossl_rand_pool_bytes_needed | 1 |
-| atl.cpp:440:10:440:19 | LoadString | (SSL *,unsigned int) |  | SSL_set_hostflags | 1 |
-| atl.cpp:440:10:440:19 | LoadString | (SSL_CONF_CTX *,unsigned int) |  | SSL_CONF_CTX_clear_flags | 1 |
-| atl.cpp:440:10:440:19 | LoadString | (SSL_CONF_CTX *,unsigned int) |  | SSL_CONF_CTX_set_flags | 1 |
-| atl.cpp:440:10:440:19 | LoadString | (TS_RESP_CTX *,unsigned int) |  | TS_RESP_CTX_set_clock_precision_digits | 1 |
-| atl.cpp:440:10:440:19 | LoadString | (WPACKET *,unsigned int) |  | WPACKET_set_flags | 1 |
-| atl.cpp:440:10:440:19 | LoadString | (X509_STORE_CTX *,unsigned int) |  | X509_STORE_CTX_set_current_reasons | 1 |
-| atl.cpp:440:10:440:19 | LoadString | (X509_VERIFY_PARAM *,unsigned int) |  | X509_VERIFY_PARAM_set_hostflags | 1 |
-| atl.cpp:440:10:440:19 | LoadString | (char *,unsigned int) |  | __nis_default_access | 1 |
-| atl.cpp:440:10:440:19 | LoadString | (char *,unsigned int) |  | utf8_fromunicode | 1 |
-| atl.cpp:440:10:440:19 | LoadString | (char *,unsigned int) |  | uv_buf_init | 1 |
-| atl.cpp:440:10:440:19 | LoadString | (const uv__io_t *,unsigned int) |  | uv__io_active | 1 |
-| atl.cpp:440:10:440:19 | LoadString | (const uv_buf_t[],unsigned int) |  | uv__count_bufs | 1 |
-| atl.cpp:440:10:440:19 | LoadString | (const_nis_name,unsigned int) |  | __create_ib_request | 1 |
-| atl.cpp:440:10:440:19 | LoadString | (grouping_iterator *,unsigned int) |  | __grouping_iterator_init_none | 1 |
-| atl.cpp:440:10:440:19 | LoadString | (gzFile,unsigned int) |  | gzbuffer | 1 |
-| atl.cpp:440:10:440:19 | LoadString | (res_state,unsigned int) |  | __res_get_nsaddr | 1 |
-| atl.cpp:440:10:440:19 | LoadString | (unsigned int,unsigned int) |  | __gnu_dev_makedev | 1 |
-| atl.cpp:440:10:440:19 | LoadString | (unsigned int,unsigned int) |  | gnu_dev_makedev | 1 |
-| atl.cpp:440:10:440:19 | LoadString | (z_streamp,unsigned int) |  | inflate_fast | 1 |
-| atl.cpp:441:10:441:19 | LoadString | (UINT) | CComBSTR | LoadString | 0 |
-| atl.cpp:441:10:441:19 | LoadString | (UINT) | _U_STRINGorID | _U_STRINGorID | 0 |
-| atl.cpp:441:10:441:19 | LoadString | (unsigned int) |  | Jim_IntHashFunction | 0 |
-| atl.cpp:441:10:441:19 | LoadString | (unsigned int) |  | __sleep | 0 |
-| atl.cpp:441:10:441:19 | LoadString | (unsigned int) |  | __x86_get_cpuid_feature_leaf | 0 |
-| atl.cpp:441:10:441:19 | LoadString | (unsigned int) |  | curlx_uitous | 0 |
-| atl.cpp:441:10:441:19 | LoadString | (unsigned int) |  | la_version | 0 |
-| atl.cpp:441:10:441:19 | LoadString | (unsigned int) |  | ssl3_get_cipher | 0 |
-| atl.cpp:449:15:449:24 | operator+= | (const CComBSTR &) | CComBSTR | Append | 0 |
-| atl.cpp:449:15:449:24 | operator+= | (const CComBSTR &) | CComBSTR | CComBSTR | 0 |
-| atl.cpp:450:15:450:24 | operator+= | (LPCOLESTR) | CComBSTR | Append | 0 |
-| atl.cpp:450:15:450:24 | operator+= | (LPCOLESTR) | CComBSTR | CComBSTR | 0 |
-| atl.cpp:540:5:540:17 | CComSafeArray | (const SAFEARRAY *) | CComSafeArray | Add | 0 |
-| atl.cpp:540:5:540:17 | CComSafeArray | (const SAFEARRAY *) | CComSafeArray | CComSafeArray | 0 |
-| atl.cpp:540:5:540:17 | CComSafeArray | (const SAFEARRAY *) | CComSafeArray | operator= | 0 |
-| atl.cpp:544:13:544:15 | Add | (const SAFEARRAY *) | CComSafeArray | Add | 0 |
-| atl.cpp:544:13:544:15 | Add | (const SAFEARRAY *) | CComSafeArray | CComSafeArray | 0 |
-| atl.cpp:544:13:544:15 | Add | (const SAFEARRAY *) | CComSafeArray | operator= | 0 |
-| atl.cpp:546:13:546:15 | Add | (Curl_easy *,bool) |  | Curl_creader_set_rewind | 1 |
-| atl.cpp:546:13:546:15 | Add | (Curl_easy *,bool) |  | Curl_set_in_callback | 1 |
-| atl.cpp:546:13:546:15 | Add | (const T &,BOOL) | CComSafeArray<T> | Add | 0 |
-| atl.cpp:546:13:546:15 | Add | (const T &,BOOL) | CComSafeArray<T> | Add | 1 |
-| atl.cpp:546:13:546:15 | Add | (curl_socket_t[2],bool) |  | Curl_eventfd | 1 |
-| atl.cpp:546:13:546:15 | Add | (support_fuse *,bool) |  | support_fuse_filter_forget | 1 |
-| atl.cpp:546:13:546:15 | Add | (void *,bool) |  | _dl_allocate_tls_init | 1 |
-| atl.cpp:546:13:546:15 | Add | (void *,bool) |  | _dl_deallocate_tls | 1 |
-| atl.cpp:554:8:554:12 | GetAt | (long) |  | __fdelt_chk | 0 |
-| atl.cpp:554:8:554:12 | GetAt | (long) |  | __math_invalid_li | 0 |
-| atl.cpp:554:8:554:12 | GetAt | (long) |  | __math_invalidf_li | 0 |
-| atl.cpp:554:8:554:12 | GetAt | (long) |  | curlx_sltosi | 0 |
-| atl.cpp:554:8:554:12 | GetAt | (long) |  | curlx_sltoui | 0 |
-| atl.cpp:554:8:554:12 | GetAt | (long) |  | curlx_sltous | 0 |
-| atl.cpp:554:8:554:12 | GetAt | (long) |  | l64a | 0 |
-| atl.cpp:554:8:554:12 | GetAt | (long) |  | ulabs | 0 |
-| atl.cpp:565:13:565:17 | SetAt | (Curl_easy *,CURLcode,bool) |  | Curl_http_done | 2 |
-| atl.cpp:565:13:565:17 | SetAt | (Curl_easy *,Curl_chunker *,bool) |  | Curl_httpchunk_init | 2 |
-| atl.cpp:565:13:565:17 | SetAt | (Curl_easy *,Curl_chunker *,bool) |  | Curl_httpchunk_reset | 2 |
-| atl.cpp:565:13:565:17 | SetAt | (Curl_easy *,connectdata *,bool) |  | Curl_cpool_disconnect | 2 |
-| atl.cpp:565:13:565:17 | SetAt | (Curl_easy *,connectdata *,bool) |  | Curl_on_disconnect | 2 |
-| atl.cpp:565:13:565:17 | SetAt | (Curl_easy *,curltime *,bool) |  | Curl_timeleft | 2 |
-| atl.cpp:565:13:565:17 | SetAt | (Curl_easy *,pingpong *,bool) |  | Curl_pp_state_timeout | 2 |
-| atl.cpp:565:13:565:17 | SetAt | (Curl_easy *,size_t,bool) |  | Curl_bump_headersize | 2 |
-| atl.cpp:565:13:565:17 | SetAt | (GlobalConfig *,timeval *,bool) |  | progress_meter | 2 |
-| atl.cpp:565:13:565:17 | SetAt | (link_map *,Dl_serinfo *,bool) |  | _dl_rtld_di_serinfo | 2 |
-| atl.cpp:565:13:565:17 | SetAt | (link_map *,link_map_public *,bool) |  | _dl_close_worker | 2 |
-| atl.cpp:565:13:565:17 | SetAt | (size_t,char *[],bool) |  | add_locales_to_archive | 2 |
-| atl.cpp:567:8:567:17 | operator[] | (long) |  | __fdelt_chk | 0 |
-| atl.cpp:567:8:567:17 | operator[] | (long) |  | __math_invalid_li | 0 |
-| atl.cpp:567:8:567:17 | operator[] | (long) |  | __math_invalidf_li | 0 |
-| atl.cpp:567:8:567:17 | operator[] | (long) |  | curlx_sltosi | 0 |
-| atl.cpp:567:8:567:17 | operator[] | (long) |  | curlx_sltoui | 0 |
-| atl.cpp:567:8:567:17 | operator[] | (long) |  | curlx_sltous | 0 |
-| atl.cpp:567:8:567:17 | operator[] | (long) |  | l64a | 0 |
-| atl.cpp:567:8:567:17 | operator[] | (long) |  | ulabs | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | ASN1_STRING_type_new | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | ASN1_tag2bit | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | ASN1_tag2str | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | Jim_ReturnCode | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | Jim_SignalId | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | OBJ_nid2ln | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | OBJ_nid2obj | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | OBJ_nid2sn | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | OSSL_trace_get_category_name | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | PKCS12_init | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | Symbol_Nth | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | X509_PURPOSE_get0 | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | X509_TRUST_get0 | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | X509_TRUST_get_by_id | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | __btowc | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | __current_locale_name | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | __fdopendir | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | __get_errlist | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | __get_errname | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | __math_invalid_i | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | __math_invalidf_i | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | __p_class | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | __p_rcode | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | __p_type | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | __pkey_get | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | __sigdescr_np | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | __strerrordesc_np | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | _tolower | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | _toupper | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | btowc | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | c_tolower | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | c_toupper | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | curlx_sitouz | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | evp_pkey_type2name | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | inet6_option_space | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | isalnum | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | isalpha | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | isblank | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | iscntrl | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | isdigit | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | isgraph | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | islower | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | isprint | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | ispunct | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | isspace | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | isupper | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | isxdigit | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | ossl_tolower | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | ossl_toupper | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | sigabbrev_np | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | sqlite3_compileoption_get | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | sqlite3_errstr | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | strerrorname_np | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | support_report_failure | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | svcudp_create | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | tls13_alert_code | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | toascii | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | tolower | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | toupper | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | uabs | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | uv__accept | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | uv_err_name | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | uv_get_osfhandle | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | uv_strerror | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | uv_translate_sys_error | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) |  | zError | 0 |
-| atl.cpp:568:8:568:17 | operator[] | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| atl.cpp:612:5:612:10 | CPathT | (PCXSTR) |  | operator+= | 0 |
-| atl.cpp:612:5:612:10 | CPathT | (PCXSTR) | CSimpleStringT | operator+= | 0 |
-| atl.cpp:612:5:612:10 | CPathT | (PCXSTR) | CStringT | operator= | 0 |
-| atl.cpp:617:10:617:21 | AddExtension | (PCXSTR) |  | operator+= | 0 |
-| atl.cpp:617:10:617:21 | AddExtension | (PCXSTR) | CSimpleStringT | operator+= | 0 |
-| atl.cpp:617:10:617:21 | AddExtension | (PCXSTR) | CStringT | operator= | 0 |
-| atl.cpp:618:10:618:15 | Append | (PCXSTR) |  | operator+= | 0 |
-| atl.cpp:618:10:618:15 | Append | (PCXSTR) | CSimpleStringT | operator+= | 0 |
-| atl.cpp:618:10:618:15 | Append | (PCXSTR) | CStringT | operator= | 0 |
-| atl.cpp:621:10:621:16 | Combine | (PCXSTR,PCXSTR) | CStringT | Replace | 0 |
-| atl.cpp:621:10:621:16 | Combine | (PCXSTR,PCXSTR) | CStringT | Replace | 1 |
-| atl.cpp:621:10:621:16 | Combine | (const CStringT &,PCXSTR) |  | operator+ | 1 |
-| atl.cpp:621:10:621:16 | Combine | (int,PCXSTR) | CStringT | Insert | 1 |
-| atl.cpp:622:24:622:35 | CommonPrefix | (PCXSTR) |  | operator+= | 0 |
-| atl.cpp:622:24:622:35 | CommonPrefix | (PCXSTR) | CSimpleStringT | operator+= | 0 |
-| atl.cpp:622:24:622:35 | CommonPrefix | (PCXSTR) | CStringT | operator= | 0 |
-| atl.cpp:659:25:659:34 | operator+= | (PCXSTR) |  | operator+= | 0 |
-| atl.cpp:659:25:659:34 | operator+= | (PCXSTR) | CSimpleStringT | operator+= | 0 |
-| atl.cpp:659:25:659:34 | operator+= | (PCXSTR) | CStringT | operator= | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | ASN1_STRING_type_new | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | ASN1_tag2bit | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | ASN1_tag2str | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | Jim_ReturnCode | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | Jim_SignalId | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | OBJ_nid2ln | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | OBJ_nid2obj | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | OBJ_nid2sn | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | OSSL_trace_get_category_name | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | PKCS12_init | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | Symbol_Nth | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | X509_PURPOSE_get0 | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | X509_TRUST_get0 | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | X509_TRUST_get_by_id | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | __btowc | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | __current_locale_name | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | __fdopendir | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | __get_errlist | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | __get_errname | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | __math_invalid_i | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | __math_invalidf_i | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | __p_class | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | __p_rcode | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | __p_type | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | __pkey_get | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | __sigdescr_np | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | __strerrordesc_np | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | _tolower | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | _toupper | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | btowc | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | c_tolower | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | c_toupper | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | curlx_sitouz | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | evp_pkey_type2name | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | inet6_option_space | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | isalnum | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | isalpha | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | isblank | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | iscntrl | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | isdigit | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | isgraph | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | islower | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | isprint | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | ispunct | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | isspace | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | isupper | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | isxdigit | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | ossl_tolower | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | ossl_toupper | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | sigabbrev_np | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | sqlite3_compileoption_get | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | sqlite3_errstr | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | strerrorname_np | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | support_report_failure | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | svcudp_create | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | tls13_alert_code | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | toascii | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | tolower | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | toupper | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | uabs | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | uv__accept | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | uv_err_name | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | uv_get_osfhandle | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | uv_strerror | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | uv_translate_sys_error | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) |  | zError | 0 |
-| atl.cpp:731:8:731:17 | operator[] | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| atl.cpp:765:10:765:12 | Add | (const deque &,const Allocator &) | deque<T,Allocator> | deque | 1 |
-| atl.cpp:765:10:765:12 | Add | (const forward_list &,const Allocator &) | forward_list<T,Allocator> | forward_list | 1 |
-| atl.cpp:765:10:765:12 | Add | (const list &,const Allocator &) | list<T,Allocator> | list | 1 |
-| atl.cpp:765:10:765:12 | Add | (const vector &,const Allocator &) | vector<T,Allocator> | vector | 1 |
-| atl.cpp:765:10:765:12 | Add | (deque &&,const Allocator &) | deque<T,Allocator> | deque | 1 |
-| atl.cpp:765:10:765:12 | Add | (forward_list &&,const Allocator &) | forward_list<T,Allocator> | forward_list | 1 |
-| atl.cpp:765:10:765:12 | Add | (list &&,const Allocator &) | list<T,Allocator> | list | 1 |
-| atl.cpp:765:10:765:12 | Add | (vector &&,const Allocator &) | vector<T,Allocator> | vector | 1 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | ASN1_STRING_type_new | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | ASN1_tag2bit | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | ASN1_tag2str | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | Jim_ReturnCode | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | Jim_SignalId | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | OBJ_nid2ln | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | OBJ_nid2obj | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | OBJ_nid2sn | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | OSSL_trace_get_category_name | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | PKCS12_init | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | Symbol_Nth | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | X509_PURPOSE_get0 | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | X509_TRUST_get0 | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | X509_TRUST_get_by_id | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | __btowc | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | __current_locale_name | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | __fdopendir | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | __get_errlist | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | __get_errname | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | __math_invalid_i | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | __math_invalidf_i | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | __p_class | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | __p_rcode | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | __p_type | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | __pkey_get | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | __sigdescr_np | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | __strerrordesc_np | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | _tolower | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | _toupper | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | btowc | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | c_tolower | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | c_toupper | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | curlx_sitouz | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | evp_pkey_type2name | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | inet6_option_space | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | isalnum | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | isalpha | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | isblank | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | iscntrl | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | isdigit | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | isgraph | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | islower | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | isprint | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | ispunct | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | isspace | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | isupper | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | isxdigit | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | ossl_tolower | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | ossl_toupper | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | sigabbrev_np | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | sqlite3_compileoption_get | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | sqlite3_errstr | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | strerrorname_np | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | support_report_failure | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | svcudp_create | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | tls13_alert_code | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | toascii | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | tolower | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | toupper | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | uabs | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | uv__accept | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | uv_err_name | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | uv_get_osfhandle | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | uv_strerror | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | uv_translate_sys_error | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) |  | zError | 0 |
-| atl.cpp:770:11:770:20 | GetValueAt | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| atl.cpp:776:10:776:14 | SetAt | (const deque &,const Allocator &) | deque<T,Allocator> | deque | 1 |
-| atl.cpp:776:10:776:14 | SetAt | (const forward_list &,const Allocator &) | forward_list<T,Allocator> | forward_list | 1 |
-| atl.cpp:776:10:776:14 | SetAt | (const list &,const Allocator &) | list<T,Allocator> | list | 1 |
-| atl.cpp:776:10:776:14 | SetAt | (const vector &,const Allocator &) | vector<T,Allocator> | vector | 1 |
-| atl.cpp:776:10:776:14 | SetAt | (deque &&,const Allocator &) | deque<T,Allocator> | deque | 1 |
-| atl.cpp:776:10:776:14 | SetAt | (forward_list &&,const Allocator &) | forward_list<T,Allocator> | forward_list | 1 |
-| atl.cpp:776:10:776:14 | SetAt | (list &&,const Allocator &) | list<T,Allocator> | list | 1 |
-| atl.cpp:776:10:776:14 | SetAt | (vector &&,const Allocator &) | vector<T,Allocator> | vector | 1 |
-| atl.cpp:777:10:777:19 | SetAtIndex | (InputIterator,InputIterator,const Allocator &) | deque<T,Allocator> | deque<InputIterator> | 2 |
-| atl.cpp:777:10:777:19 | SetAtIndex | (InputIterator,InputIterator,const Allocator &) | forward_list<T,Allocator> | forward_list | 2 |
-| atl.cpp:777:10:777:19 | SetAtIndex | (InputIterator,InputIterator,const Allocator &) | list<T,Allocator> | list<InputIterator> | 2 |
-| atl.cpp:777:10:777:19 | SetAtIndex | (InputIterator,InputIterator,const Allocator &) | vector<T,Allocator> | vector<InputIterator> | 2 |
-| atl.cpp:777:10:777:19 | SetAtIndex | (size_type,const T &,const Allocator &) | deque<T,Allocator> | deque | 1 |
-| atl.cpp:777:10:777:19 | SetAtIndex | (size_type,const T &,const Allocator &) | deque<T,Allocator> | deque | 2 |
-| atl.cpp:777:10:777:19 | SetAtIndex | (size_type,const T &,const Allocator &) | forward_list<T,Allocator> | forward_list | 1 |
-| atl.cpp:777:10:777:19 | SetAtIndex | (size_type,const T &,const Allocator &) | forward_list<T,Allocator> | forward_list | 2 |
-| atl.cpp:777:10:777:19 | SetAtIndex | (size_type,const T &,const Allocator &) | list<T,Allocator> | list | 1 |
-| atl.cpp:777:10:777:19 | SetAtIndex | (size_type,const T &,const Allocator &) | list<T,Allocator> | list | 2 |
-| atl.cpp:777:10:777:19 | SetAtIndex | (size_type,const T &,const Allocator &) | vector<T,Allocator> | vector | 1 |
-| atl.cpp:777:10:777:19 | SetAtIndex | (size_type,const T &,const Allocator &) | vector<T,Allocator> | vector | 2 |
-| atl.cpp:821:17:821:28 | Canonicalize | (unsigned long) |  | BN_num_bits_word | 0 |
-| atl.cpp:821:17:821:28 | Canonicalize | (unsigned long) |  | BUF_MEM_new_ex | 0 |
-| atl.cpp:821:17:821:28 | Canonicalize | (unsigned long) |  | curlx_ultouc | 0 |
-| atl.cpp:821:17:821:28 | Canonicalize | (unsigned long) |  | curlx_ultous | 0 |
-| atl.cpp:821:17:821:28 | Canonicalize | (unsigned long) |  | next_prime | 0 |
-| atl.cpp:824:10:824:17 | CrackUrl | (ASN1_PCTX *,unsigned long) |  | ASN1_PCTX_set_cert_flags | 1 |
-| atl.cpp:824:10:824:17 | CrackUrl | (ASN1_PCTX *,unsigned long) |  | ASN1_PCTX_set_flags | 1 |
-| atl.cpp:824:10:824:17 | CrackUrl | (ASN1_PCTX *,unsigned long) |  | ASN1_PCTX_set_nm_flags | 1 |
-| atl.cpp:824:10:824:17 | CrackUrl | (ASN1_PCTX *,unsigned long) |  | ASN1_PCTX_set_oid_flags | 1 |
-| atl.cpp:824:10:824:17 | CrackUrl | (ASN1_PCTX *,unsigned long) |  | ASN1_PCTX_set_str_flags | 1 |
-| atl.cpp:824:10:824:17 | CrackUrl | (BIGNUM *,unsigned long) |  | BN_add_word | 1 |
-| atl.cpp:824:10:824:17 | CrackUrl | (BIGNUM *,unsigned long) |  | BN_div_word | 1 |
-| atl.cpp:824:10:824:17 | CrackUrl | (BIGNUM *,unsigned long) |  | BN_set_word | 1 |
-| atl.cpp:824:10:824:17 | CrackUrl | (BIGNUM *,unsigned long) |  | BN_sub_word | 1 |
-| atl.cpp:824:10:824:17 | CrackUrl | (BN_BLINDING *,unsigned long) |  | BN_BLINDING_set_flags | 1 |
-| atl.cpp:824:10:824:17 | CrackUrl | (CONF_IMODULE *,unsigned long) |  | CONF_imodule_set_flags | 1 |
-| atl.cpp:824:10:824:17 | CrackUrl | (EVP_CIPHER *,unsigned long) |  | EVP_CIPHER_meth_set_flags | 1 |
-| atl.cpp:824:10:824:17 | CrackUrl | (EVP_MD *,unsigned long) |  | EVP_MD_meth_set_flags | 1 |
-| atl.cpp:824:10:824:17 | CrackUrl | (HMAC_CTX *,unsigned long) |  | HMAC_CTX_set_flags | 1 |
-| atl.cpp:824:10:824:17 | CrackUrl | (OPENSSL_INIT_SETTINGS *,unsigned long) |  | OPENSSL_INIT_set_config_file_flags | 1 |
-| atl.cpp:824:10:824:17 | CrackUrl | (OPENSSL_LHASH *,unsigned long) |  | OPENSSL_LH_set_down_load | 1 |
-| atl.cpp:824:10:824:17 | CrackUrl | (OSSL_HTTP_REQ_CTX *,unsigned long) |  | OSSL_HTTP_REQ_CTX_set_max_response_length | 1 |
-| atl.cpp:824:10:824:17 | CrackUrl | (OSSL_PARAM *,unsigned long) |  | OSSL_PARAM_set_ulong | 1 |
-| atl.cpp:824:10:824:17 | CrackUrl | (SSL *,unsigned long) |  | SSL_dane_clear_flags | 1 |
-| atl.cpp:824:10:824:17 | CrackUrl | (SSL *,unsigned long) |  | SSL_dane_set_flags | 1 |
-| atl.cpp:824:10:824:17 | CrackUrl | (SSL_CONNECTION *,unsigned long) |  | tls1_check_ec_tmp_key | 1 |
-| atl.cpp:824:10:824:17 | CrackUrl | (SSL_CTX *,unsigned long) |  | SSL_CTX_dane_clear_flags | 1 |
-| atl.cpp:824:10:824:17 | CrackUrl | (SSL_CTX *,unsigned long) |  | SSL_CTX_dane_set_flags | 1 |
-| atl.cpp:824:10:824:17 | CrackUrl | (X509_STORE *,unsigned long) |  | X509_STORE_set_flags | 1 |
-| atl.cpp:824:10:824:17 | CrackUrl | (X509_STORE_CTX *,unsigned long) |  | X509_STORE_CTX_set_flags | 1 |
-| atl.cpp:824:10:824:17 | CrackUrl | (X509_VERIFY_PARAM *,unsigned long) |  | X509_VERIFY_PARAM_clear_flags | 1 |
-| atl.cpp:824:10:824:17 | CrackUrl | (X509_VERIFY_PARAM *,unsigned long) |  | X509_VERIFY_PARAM_set_flags | 1 |
-| atl.cpp:824:10:824:17 | CrackUrl | (const BIGNUM *,unsigned long) |  | BN_mod_word | 1 |
-| atl.cpp:824:10:824:17 | CrackUrl | (hash_table *,unsigned long) |  | init_hash | 1 |
-| atl.cpp:824:10:824:17 | CrackUrl | (u_long,unsigned long) |  | __p_option | 1 |
-| atl.cpp:825:17:825:25 | CreateUrl | (BIO *,OCSP_REQUEST *,unsigned long) |  | OCSP_REQUEST_print | 2 |
-| atl.cpp:825:17:825:25 | CreateUrl | (BIO *,OCSP_RESPONSE *,unsigned long) |  | OCSP_RESPONSE_print | 2 |
-| atl.cpp:825:17:825:25 | CreateUrl | (BIO *,X509 *,unsigned long) |  | ossl_x509_print_ex_brief | 2 |
-| atl.cpp:825:17:825:25 | CreateUrl | (BIO *,X509_CRL *,unsigned long) |  | X509_CRL_print_ex | 2 |
-| atl.cpp:825:17:825:25 | CreateUrl | (BIO *,const ASN1_STRING *,unsigned long) |  | ASN1_STRING_print_ex | 2 |
-| atl.cpp:825:17:825:25 | CreateUrl | (FILE *,const ASN1_STRING *,unsigned long) |  | ASN1_STRING_print_ex_fp | 2 |
-| atl.cpp:825:17:825:25 | CreateUrl | (const char *,const char *,unsigned long) |  | __ngettext | 2 |
-| atl.cpp:825:17:825:25 | CreateUrl | (unsigned char *,int,unsigned long) |  | UTF8_putc | 2 |
-| atl.cpp:842:17:842:28 | SetExtraInfo | (LPCTSTR) | _U_STRINGorID | _U_STRINGorID | 0 |
-| atl.cpp:842:17:842:28 | SetExtraInfo | (const char *) |  | BIO_gethostbyname | 0 |
-| atl.cpp:842:17:842:28 | SetExtraInfo | (const char *) |  | Curl_copy_header_value | 0 |
-| atl.cpp:842:17:842:28 | SetExtraInfo | (const char *) |  | Curl_get_scheme_handler | 0 |
-| atl.cpp:842:17:842:28 | SetExtraInfo | (const char *) |  | Curl_getdate_capped | 0 |
-| atl.cpp:842:17:842:28 | SetExtraInfo | (const char *) |  | Jim_StrDup | 0 |
-| atl.cpp:842:17:842:28 | SetExtraInfo | (const char *) |  | OPENSSL_LH_strhash | 0 |
-| atl.cpp:842:17:842:28 | SetExtraInfo | (const char *) |  | OSSL_STORE_SEARCH_by_alias | 0 |
-| atl.cpp:842:17:842:28 | SetExtraInfo | (const char *) |  | Strsafe | 0 |
-| atl.cpp:842:17:842:28 | SetExtraInfo | (const char *) |  | Symbol_new | 0 |
-| atl.cpp:842:17:842:28 | SetExtraInfo | (const char *) |  | UI_create_method | 0 |
-| atl.cpp:842:17:842:28 | SetExtraInfo | (const char *) |  | X509V3_parse_list | 0 |
-| atl.cpp:842:17:842:28 | SetExtraInfo | (const char *) |  | X509_LOOKUP_meth_new | 0 |
-| atl.cpp:842:17:842:28 | SetExtraInfo | (const char *) |  | __basename | 0 |
-| atl.cpp:842:17:842:28 | SetExtraInfo | (const char *) |  | __gconv_find_shlib | 0 |
-| atl.cpp:842:17:842:28 | SetExtraInfo | (const char *) |  | __gettext | 0 |
-| atl.cpp:842:17:842:28 | SetExtraInfo | (const char *) |  | __hash_string | 0 |
-| atl.cpp:842:17:842:28 | SetExtraInfo | (const char *) |  | __nss_action_parse | 0 |
-| atl.cpp:842:17:842:28 | SetExtraInfo | (const char *) |  | __strdup | 0 |
-| atl.cpp:842:17:842:28 | SetExtraInfo | (const char *) |  | __textdomain | 0 |
-| atl.cpp:842:17:842:28 | SetExtraInfo | (const char *) |  | __tzset_parse_tz | 0 |
-| atl.cpp:842:17:842:28 | SetExtraInfo | (const char *) |  | __tzstring | 0 |
-| atl.cpp:842:17:842:28 | SetExtraInfo | (const char *) |  | a2i_IPADDRESS | 0 |
-| atl.cpp:842:17:842:28 | SetExtraInfo | (const char *) |  | a2i_IPADDRESS_NC | 0 |
-| atl.cpp:842:17:842:28 | SetExtraInfo | (const char *) |  | a64l | 0 |
-| atl.cpp:842:17:842:28 | SetExtraInfo | (const char *) |  | charmap_opendir | 0 |
-| atl.cpp:842:17:842:28 | SetExtraInfo | (const char *) |  | ether_aton | 0 |
-| atl.cpp:842:17:842:28 | SetExtraInfo | (const char *) |  | getdate | 0 |
-| atl.cpp:842:17:842:28 | SetExtraInfo | (const char *) |  | inetstr2int | 0 |
-| atl.cpp:842:17:842:28 | SetExtraInfo | (const char *) |  | last_component | 0 |
-| atl.cpp:842:17:842:28 | SetExtraInfo | (const char *) |  | new_glibc_hwcaps_subdirectory | 0 |
-| atl.cpp:842:17:842:28 | SetExtraInfo | (const char *) |  | opt_path_end | 0 |
-| atl.cpp:842:17:842:28 | SetExtraInfo | (const char *) |  | opt_progname | 0 |
-| atl.cpp:842:17:842:28 | SetExtraInfo | (const char *) |  | ossl_lh_strcasehash | 0 |
-| atl.cpp:842:17:842:28 | SetExtraInfo | (const char *) |  | repertoire_read | 0 |
-| atl.cpp:842:17:842:28 | SetExtraInfo | (const char *) |  | res_gethostbyname | 0 |
-| atl.cpp:842:17:842:28 | SetExtraInfo | (const char *) |  | sgetsgent | 0 |
-| atl.cpp:842:17:842:28 | SetExtraInfo | (const char *) |  | sgetspent | 0 |
-| atl.cpp:842:17:842:28 | SetExtraInfo | (const char *) |  | strhash | 0 |
-| atl.cpp:842:17:842:28 | SetExtraInfo | (const char *) |  | uc_script_byname | 0 |
-| atl.cpp:842:17:842:28 | SetExtraInfo | (const char *) |  | uv__strdup | 0 |
-| atl.cpp:842:17:842:28 | SetExtraInfo | (const char *) |  | uv_wtf8_length_as_utf16 | 0 |
-| atl.cpp:842:17:842:28 | SetExtraInfo | (const char *) |  | xstrdup | 0 |
-| atl.cpp:843:17:843:27 | SetHostName | (LPCTSTR) | _U_STRINGorID | _U_STRINGorID | 0 |
-| atl.cpp:843:17:843:27 | SetHostName | (const char *) |  | BIO_gethostbyname | 0 |
-| atl.cpp:843:17:843:27 | SetHostName | (const char *) |  | Curl_copy_header_value | 0 |
-| atl.cpp:843:17:843:27 | SetHostName | (const char *) |  | Curl_get_scheme_handler | 0 |
-| atl.cpp:843:17:843:27 | SetHostName | (const char *) |  | Curl_getdate_capped | 0 |
-| atl.cpp:843:17:843:27 | SetHostName | (const char *) |  | Jim_StrDup | 0 |
-| atl.cpp:843:17:843:27 | SetHostName | (const char *) |  | OPENSSL_LH_strhash | 0 |
-| atl.cpp:843:17:843:27 | SetHostName | (const char *) |  | OSSL_STORE_SEARCH_by_alias | 0 |
-| atl.cpp:843:17:843:27 | SetHostName | (const char *) |  | Strsafe | 0 |
-| atl.cpp:843:17:843:27 | SetHostName | (const char *) |  | Symbol_new | 0 |
-| atl.cpp:843:17:843:27 | SetHostName | (const char *) |  | UI_create_method | 0 |
-| atl.cpp:843:17:843:27 | SetHostName | (const char *) |  | X509V3_parse_list | 0 |
-| atl.cpp:843:17:843:27 | SetHostName | (const char *) |  | X509_LOOKUP_meth_new | 0 |
-| atl.cpp:843:17:843:27 | SetHostName | (const char *) |  | __basename | 0 |
-| atl.cpp:843:17:843:27 | SetHostName | (const char *) |  | __gconv_find_shlib | 0 |
-| atl.cpp:843:17:843:27 | SetHostName | (const char *) |  | __gettext | 0 |
-| atl.cpp:843:17:843:27 | SetHostName | (const char *) |  | __hash_string | 0 |
-| atl.cpp:843:17:843:27 | SetHostName | (const char *) |  | __nss_action_parse | 0 |
-| atl.cpp:843:17:843:27 | SetHostName | (const char *) |  | __strdup | 0 |
-| atl.cpp:843:17:843:27 | SetHostName | (const char *) |  | __textdomain | 0 |
-| atl.cpp:843:17:843:27 | SetHostName | (const char *) |  | __tzset_parse_tz | 0 |
-| atl.cpp:843:17:843:27 | SetHostName | (const char *) |  | __tzstring | 0 |
-| atl.cpp:843:17:843:27 | SetHostName | (const char *) |  | a2i_IPADDRESS | 0 |
-| atl.cpp:843:17:843:27 | SetHostName | (const char *) |  | a2i_IPADDRESS_NC | 0 |
-| atl.cpp:843:17:843:27 | SetHostName | (const char *) |  | a64l | 0 |
-| atl.cpp:843:17:843:27 | SetHostName | (const char *) |  | charmap_opendir | 0 |
-| atl.cpp:843:17:843:27 | SetHostName | (const char *) |  | ether_aton | 0 |
-| atl.cpp:843:17:843:27 | SetHostName | (const char *) |  | getdate | 0 |
-| atl.cpp:843:17:843:27 | SetHostName | (const char *) |  | inetstr2int | 0 |
-| atl.cpp:843:17:843:27 | SetHostName | (const char *) |  | last_component | 0 |
-| atl.cpp:843:17:843:27 | SetHostName | (const char *) |  | new_glibc_hwcaps_subdirectory | 0 |
-| atl.cpp:843:17:843:27 | SetHostName | (const char *) |  | opt_path_end | 0 |
-| atl.cpp:843:17:843:27 | SetHostName | (const char *) |  | opt_progname | 0 |
-| atl.cpp:843:17:843:27 | SetHostName | (const char *) |  | ossl_lh_strcasehash | 0 |
-| atl.cpp:843:17:843:27 | SetHostName | (const char *) |  | repertoire_read | 0 |
-| atl.cpp:843:17:843:27 | SetHostName | (const char *) |  | res_gethostbyname | 0 |
-| atl.cpp:843:17:843:27 | SetHostName | (const char *) |  | sgetsgent | 0 |
-| atl.cpp:843:17:843:27 | SetHostName | (const char *) |  | sgetspent | 0 |
-| atl.cpp:843:17:843:27 | SetHostName | (const char *) |  | strhash | 0 |
-| atl.cpp:843:17:843:27 | SetHostName | (const char *) |  | uc_script_byname | 0 |
-| atl.cpp:843:17:843:27 | SetHostName | (const char *) |  | uv__strdup | 0 |
-| atl.cpp:843:17:843:27 | SetHostName | (const char *) |  | uv_wtf8_length_as_utf16 | 0 |
-| atl.cpp:843:17:843:27 | SetHostName | (const char *) |  | xstrdup | 0 |
-| atl.cpp:844:17:844:27 | SetPassword | (LPCTSTR) | _U_STRINGorID | _U_STRINGorID | 0 |
-| atl.cpp:844:17:844:27 | SetPassword | (const char *) |  | BIO_gethostbyname | 0 |
-| atl.cpp:844:17:844:27 | SetPassword | (const char *) |  | Curl_copy_header_value | 0 |
-| atl.cpp:844:17:844:27 | SetPassword | (const char *) |  | Curl_get_scheme_handler | 0 |
-| atl.cpp:844:17:844:27 | SetPassword | (const char *) |  | Curl_getdate_capped | 0 |
-| atl.cpp:844:17:844:27 | SetPassword | (const char *) |  | Jim_StrDup | 0 |
-| atl.cpp:844:17:844:27 | SetPassword | (const char *) |  | OPENSSL_LH_strhash | 0 |
-| atl.cpp:844:17:844:27 | SetPassword | (const char *) |  | OSSL_STORE_SEARCH_by_alias | 0 |
-| atl.cpp:844:17:844:27 | SetPassword | (const char *) |  | Strsafe | 0 |
-| atl.cpp:844:17:844:27 | SetPassword | (const char *) |  | Symbol_new | 0 |
-| atl.cpp:844:17:844:27 | SetPassword | (const char *) |  | UI_create_method | 0 |
-| atl.cpp:844:17:844:27 | SetPassword | (const char *) |  | X509V3_parse_list | 0 |
-| atl.cpp:844:17:844:27 | SetPassword | (const char *) |  | X509_LOOKUP_meth_new | 0 |
-| atl.cpp:844:17:844:27 | SetPassword | (const char *) |  | __basename | 0 |
-| atl.cpp:844:17:844:27 | SetPassword | (const char *) |  | __gconv_find_shlib | 0 |
-| atl.cpp:844:17:844:27 | SetPassword | (const char *) |  | __gettext | 0 |
-| atl.cpp:844:17:844:27 | SetPassword | (const char *) |  | __hash_string | 0 |
-| atl.cpp:844:17:844:27 | SetPassword | (const char *) |  | __nss_action_parse | 0 |
-| atl.cpp:844:17:844:27 | SetPassword | (const char *) |  | __strdup | 0 |
-| atl.cpp:844:17:844:27 | SetPassword | (const char *) |  | __textdomain | 0 |
-| atl.cpp:844:17:844:27 | SetPassword | (const char *) |  | __tzset_parse_tz | 0 |
-| atl.cpp:844:17:844:27 | SetPassword | (const char *) |  | __tzstring | 0 |
-| atl.cpp:844:17:844:27 | SetPassword | (const char *) |  | a2i_IPADDRESS | 0 |
-| atl.cpp:844:17:844:27 | SetPassword | (const char *) |  | a2i_IPADDRESS_NC | 0 |
-| atl.cpp:844:17:844:27 | SetPassword | (const char *) |  | a64l | 0 |
-| atl.cpp:844:17:844:27 | SetPassword | (const char *) |  | charmap_opendir | 0 |
-| atl.cpp:844:17:844:27 | SetPassword | (const char *) |  | ether_aton | 0 |
-| atl.cpp:844:17:844:27 | SetPassword | (const char *) |  | getdate | 0 |
-| atl.cpp:844:17:844:27 | SetPassword | (const char *) |  | inetstr2int | 0 |
-| atl.cpp:844:17:844:27 | SetPassword | (const char *) |  | last_component | 0 |
-| atl.cpp:844:17:844:27 | SetPassword | (const char *) |  | new_glibc_hwcaps_subdirectory | 0 |
-| atl.cpp:844:17:844:27 | SetPassword | (const char *) |  | opt_path_end | 0 |
-| atl.cpp:844:17:844:27 | SetPassword | (const char *) |  | opt_progname | 0 |
-| atl.cpp:844:17:844:27 | SetPassword | (const char *) |  | ossl_lh_strcasehash | 0 |
-| atl.cpp:844:17:844:27 | SetPassword | (const char *) |  | repertoire_read | 0 |
-| atl.cpp:844:17:844:27 | SetPassword | (const char *) |  | res_gethostbyname | 0 |
-| atl.cpp:844:17:844:27 | SetPassword | (const char *) |  | sgetsgent | 0 |
-| atl.cpp:844:17:844:27 | SetPassword | (const char *) |  | sgetspent | 0 |
-| atl.cpp:844:17:844:27 | SetPassword | (const char *) |  | strhash | 0 |
-| atl.cpp:844:17:844:27 | SetPassword | (const char *) |  | uc_script_byname | 0 |
-| atl.cpp:844:17:844:27 | SetPassword | (const char *) |  | uv__strdup | 0 |
-| atl.cpp:844:17:844:27 | SetPassword | (const char *) |  | uv_wtf8_length_as_utf16 | 0 |
-| atl.cpp:844:17:844:27 | SetPassword | (const char *) |  | xstrdup | 0 |
-| atl.cpp:847:17:847:29 | SetSchemeName | (LPCTSTR) | _U_STRINGorID | _U_STRINGorID | 0 |
-| atl.cpp:847:17:847:29 | SetSchemeName | (const char *) |  | BIO_gethostbyname | 0 |
-| atl.cpp:847:17:847:29 | SetSchemeName | (const char *) |  | Curl_copy_header_value | 0 |
-| atl.cpp:847:17:847:29 | SetSchemeName | (const char *) |  | Curl_get_scheme_handler | 0 |
-| atl.cpp:847:17:847:29 | SetSchemeName | (const char *) |  | Curl_getdate_capped | 0 |
-| atl.cpp:847:17:847:29 | SetSchemeName | (const char *) |  | Jim_StrDup | 0 |
-| atl.cpp:847:17:847:29 | SetSchemeName | (const char *) |  | OPENSSL_LH_strhash | 0 |
-| atl.cpp:847:17:847:29 | SetSchemeName | (const char *) |  | OSSL_STORE_SEARCH_by_alias | 0 |
-| atl.cpp:847:17:847:29 | SetSchemeName | (const char *) |  | Strsafe | 0 |
-| atl.cpp:847:17:847:29 | SetSchemeName | (const char *) |  | Symbol_new | 0 |
-| atl.cpp:847:17:847:29 | SetSchemeName | (const char *) |  | UI_create_method | 0 |
-| atl.cpp:847:17:847:29 | SetSchemeName | (const char *) |  | X509V3_parse_list | 0 |
-| atl.cpp:847:17:847:29 | SetSchemeName | (const char *) |  | X509_LOOKUP_meth_new | 0 |
-| atl.cpp:847:17:847:29 | SetSchemeName | (const char *) |  | __basename | 0 |
-| atl.cpp:847:17:847:29 | SetSchemeName | (const char *) |  | __gconv_find_shlib | 0 |
-| atl.cpp:847:17:847:29 | SetSchemeName | (const char *) |  | __gettext | 0 |
-| atl.cpp:847:17:847:29 | SetSchemeName | (const char *) |  | __hash_string | 0 |
-| atl.cpp:847:17:847:29 | SetSchemeName | (const char *) |  | __nss_action_parse | 0 |
-| atl.cpp:847:17:847:29 | SetSchemeName | (const char *) |  | __strdup | 0 |
-| atl.cpp:847:17:847:29 | SetSchemeName | (const char *) |  | __textdomain | 0 |
-| atl.cpp:847:17:847:29 | SetSchemeName | (const char *) |  | __tzset_parse_tz | 0 |
-| atl.cpp:847:17:847:29 | SetSchemeName | (const char *) |  | __tzstring | 0 |
-| atl.cpp:847:17:847:29 | SetSchemeName | (const char *) |  | a2i_IPADDRESS | 0 |
-| atl.cpp:847:17:847:29 | SetSchemeName | (const char *) |  | a2i_IPADDRESS_NC | 0 |
-| atl.cpp:847:17:847:29 | SetSchemeName | (const char *) |  | a64l | 0 |
-| atl.cpp:847:17:847:29 | SetSchemeName | (const char *) |  | charmap_opendir | 0 |
-| atl.cpp:847:17:847:29 | SetSchemeName | (const char *) |  | ether_aton | 0 |
-| atl.cpp:847:17:847:29 | SetSchemeName | (const char *) |  | getdate | 0 |
-| atl.cpp:847:17:847:29 | SetSchemeName | (const char *) |  | inetstr2int | 0 |
-| atl.cpp:847:17:847:29 | SetSchemeName | (const char *) |  | last_component | 0 |
-| atl.cpp:847:17:847:29 | SetSchemeName | (const char *) |  | new_glibc_hwcaps_subdirectory | 0 |
-| atl.cpp:847:17:847:29 | SetSchemeName | (const char *) |  | opt_path_end | 0 |
-| atl.cpp:847:17:847:29 | SetSchemeName | (const char *) |  | opt_progname | 0 |
-| atl.cpp:847:17:847:29 | SetSchemeName | (const char *) |  | ossl_lh_strcasehash | 0 |
-| atl.cpp:847:17:847:29 | SetSchemeName | (const char *) |  | repertoire_read | 0 |
-| atl.cpp:847:17:847:29 | SetSchemeName | (const char *) |  | res_gethostbyname | 0 |
-| atl.cpp:847:17:847:29 | SetSchemeName | (const char *) |  | sgetsgent | 0 |
-| atl.cpp:847:17:847:29 | SetSchemeName | (const char *) |  | sgetspent | 0 |
-| atl.cpp:847:17:847:29 | SetSchemeName | (const char *) |  | strhash | 0 |
-| atl.cpp:847:17:847:29 | SetSchemeName | (const char *) |  | uc_script_byname | 0 |
-| atl.cpp:847:17:847:29 | SetSchemeName | (const char *) |  | uv__strdup | 0 |
-| atl.cpp:847:17:847:29 | SetSchemeName | (const char *) |  | uv_wtf8_length_as_utf16 | 0 |
-| atl.cpp:847:17:847:29 | SetSchemeName | (const char *) |  | xstrdup | 0 |
-| atl.cpp:848:17:848:26 | SetUrlPath | (LPCTSTR) | _U_STRINGorID | _U_STRINGorID | 0 |
-| atl.cpp:848:17:848:26 | SetUrlPath | (const char *) |  | BIO_gethostbyname | 0 |
-| atl.cpp:848:17:848:26 | SetUrlPath | (const char *) |  | Curl_copy_header_value | 0 |
-| atl.cpp:848:17:848:26 | SetUrlPath | (const char *) |  | Curl_get_scheme_handler | 0 |
-| atl.cpp:848:17:848:26 | SetUrlPath | (const char *) |  | Curl_getdate_capped | 0 |
-| atl.cpp:848:17:848:26 | SetUrlPath | (const char *) |  | Jim_StrDup | 0 |
-| atl.cpp:848:17:848:26 | SetUrlPath | (const char *) |  | OPENSSL_LH_strhash | 0 |
-| atl.cpp:848:17:848:26 | SetUrlPath | (const char *) |  | OSSL_STORE_SEARCH_by_alias | 0 |
-| atl.cpp:848:17:848:26 | SetUrlPath | (const char *) |  | Strsafe | 0 |
-| atl.cpp:848:17:848:26 | SetUrlPath | (const char *) |  | Symbol_new | 0 |
-| atl.cpp:848:17:848:26 | SetUrlPath | (const char *) |  | UI_create_method | 0 |
-| atl.cpp:848:17:848:26 | SetUrlPath | (const char *) |  | X509V3_parse_list | 0 |
-| atl.cpp:848:17:848:26 | SetUrlPath | (const char *) |  | X509_LOOKUP_meth_new | 0 |
-| atl.cpp:848:17:848:26 | SetUrlPath | (const char *) |  | __basename | 0 |
-| atl.cpp:848:17:848:26 | SetUrlPath | (const char *) |  | __gconv_find_shlib | 0 |
-| atl.cpp:848:17:848:26 | SetUrlPath | (const char *) |  | __gettext | 0 |
-| atl.cpp:848:17:848:26 | SetUrlPath | (const char *) |  | __hash_string | 0 |
-| atl.cpp:848:17:848:26 | SetUrlPath | (const char *) |  | __nss_action_parse | 0 |
-| atl.cpp:848:17:848:26 | SetUrlPath | (const char *) |  | __strdup | 0 |
-| atl.cpp:848:17:848:26 | SetUrlPath | (const char *) |  | __textdomain | 0 |
-| atl.cpp:848:17:848:26 | SetUrlPath | (const char *) |  | __tzset_parse_tz | 0 |
-| atl.cpp:848:17:848:26 | SetUrlPath | (const char *) |  | __tzstring | 0 |
-| atl.cpp:848:17:848:26 | SetUrlPath | (const char *) |  | a2i_IPADDRESS | 0 |
-| atl.cpp:848:17:848:26 | SetUrlPath | (const char *) |  | a2i_IPADDRESS_NC | 0 |
-| atl.cpp:848:17:848:26 | SetUrlPath | (const char *) |  | a64l | 0 |
-| atl.cpp:848:17:848:26 | SetUrlPath | (const char *) |  | charmap_opendir | 0 |
-| atl.cpp:848:17:848:26 | SetUrlPath | (const char *) |  | ether_aton | 0 |
-| atl.cpp:848:17:848:26 | SetUrlPath | (const char *) |  | getdate | 0 |
-| atl.cpp:848:17:848:26 | SetUrlPath | (const char *) |  | inetstr2int | 0 |
-| atl.cpp:848:17:848:26 | SetUrlPath | (const char *) |  | last_component | 0 |
-| atl.cpp:848:17:848:26 | SetUrlPath | (const char *) |  | new_glibc_hwcaps_subdirectory | 0 |
-| atl.cpp:848:17:848:26 | SetUrlPath | (const char *) |  | opt_path_end | 0 |
-| atl.cpp:848:17:848:26 | SetUrlPath | (const char *) |  | opt_progname | 0 |
-| atl.cpp:848:17:848:26 | SetUrlPath | (const char *) |  | ossl_lh_strcasehash | 0 |
-| atl.cpp:848:17:848:26 | SetUrlPath | (const char *) |  | repertoire_read | 0 |
-| atl.cpp:848:17:848:26 | SetUrlPath | (const char *) |  | res_gethostbyname | 0 |
-| atl.cpp:848:17:848:26 | SetUrlPath | (const char *) |  | sgetsgent | 0 |
-| atl.cpp:848:17:848:26 | SetUrlPath | (const char *) |  | sgetspent | 0 |
-| atl.cpp:848:17:848:26 | SetUrlPath | (const char *) |  | strhash | 0 |
-| atl.cpp:848:17:848:26 | SetUrlPath | (const char *) |  | uc_script_byname | 0 |
-| atl.cpp:848:17:848:26 | SetUrlPath | (const char *) |  | uv__strdup | 0 |
-| atl.cpp:848:17:848:26 | SetUrlPath | (const char *) |  | uv_wtf8_length_as_utf16 | 0 |
-| atl.cpp:848:17:848:26 | SetUrlPath | (const char *) |  | xstrdup | 0 |
-| atl.cpp:849:17:849:27 | SetUserName | (LPCTSTR) | _U_STRINGorID | _U_STRINGorID | 0 |
-| atl.cpp:849:17:849:27 | SetUserName | (const char *) |  | BIO_gethostbyname | 0 |
-| atl.cpp:849:17:849:27 | SetUserName | (const char *) |  | Curl_copy_header_value | 0 |
-| atl.cpp:849:17:849:27 | SetUserName | (const char *) |  | Curl_get_scheme_handler | 0 |
-| atl.cpp:849:17:849:27 | SetUserName | (const char *) |  | Curl_getdate_capped | 0 |
-| atl.cpp:849:17:849:27 | SetUserName | (const char *) |  | Jim_StrDup | 0 |
-| atl.cpp:849:17:849:27 | SetUserName | (const char *) |  | OPENSSL_LH_strhash | 0 |
-| atl.cpp:849:17:849:27 | SetUserName | (const char *) |  | OSSL_STORE_SEARCH_by_alias | 0 |
-| atl.cpp:849:17:849:27 | SetUserName | (const char *) |  | Strsafe | 0 |
-| atl.cpp:849:17:849:27 | SetUserName | (const char *) |  | Symbol_new | 0 |
-| atl.cpp:849:17:849:27 | SetUserName | (const char *) |  | UI_create_method | 0 |
-| atl.cpp:849:17:849:27 | SetUserName | (const char *) |  | X509V3_parse_list | 0 |
-| atl.cpp:849:17:849:27 | SetUserName | (const char *) |  | X509_LOOKUP_meth_new | 0 |
-| atl.cpp:849:17:849:27 | SetUserName | (const char *) |  | __basename | 0 |
-| atl.cpp:849:17:849:27 | SetUserName | (const char *) |  | __gconv_find_shlib | 0 |
-| atl.cpp:849:17:849:27 | SetUserName | (const char *) |  | __gettext | 0 |
-| atl.cpp:849:17:849:27 | SetUserName | (const char *) |  | __hash_string | 0 |
-| atl.cpp:849:17:849:27 | SetUserName | (const char *) |  | __nss_action_parse | 0 |
-| atl.cpp:849:17:849:27 | SetUserName | (const char *) |  | __strdup | 0 |
-| atl.cpp:849:17:849:27 | SetUserName | (const char *) |  | __textdomain | 0 |
-| atl.cpp:849:17:849:27 | SetUserName | (const char *) |  | __tzset_parse_tz | 0 |
-| atl.cpp:849:17:849:27 | SetUserName | (const char *) |  | __tzstring | 0 |
-| atl.cpp:849:17:849:27 | SetUserName | (const char *) |  | a2i_IPADDRESS | 0 |
-| atl.cpp:849:17:849:27 | SetUserName | (const char *) |  | a2i_IPADDRESS_NC | 0 |
-| atl.cpp:849:17:849:27 | SetUserName | (const char *) |  | a64l | 0 |
-| atl.cpp:849:17:849:27 | SetUserName | (const char *) |  | charmap_opendir | 0 |
-| atl.cpp:849:17:849:27 | SetUserName | (const char *) |  | ether_aton | 0 |
-| atl.cpp:849:17:849:27 | SetUserName | (const char *) |  | getdate | 0 |
-| atl.cpp:849:17:849:27 | SetUserName | (const char *) |  | inetstr2int | 0 |
-| atl.cpp:849:17:849:27 | SetUserName | (const char *) |  | last_component | 0 |
-| atl.cpp:849:17:849:27 | SetUserName | (const char *) |  | new_glibc_hwcaps_subdirectory | 0 |
-| atl.cpp:849:17:849:27 | SetUserName | (const char *) |  | opt_path_end | 0 |
-| atl.cpp:849:17:849:27 | SetUserName | (const char *) |  | opt_progname | 0 |
-| atl.cpp:849:17:849:27 | SetUserName | (const char *) |  | ossl_lh_strcasehash | 0 |
-| atl.cpp:849:17:849:27 | SetUserName | (const char *) |  | repertoire_read | 0 |
-| atl.cpp:849:17:849:27 | SetUserName | (const char *) |  | res_gethostbyname | 0 |
-| atl.cpp:849:17:849:27 | SetUserName | (const char *) |  | sgetsgent | 0 |
-| atl.cpp:849:17:849:27 | SetUserName | (const char *) |  | sgetspent | 0 |
-| atl.cpp:849:17:849:27 | SetUserName | (const char *) |  | strhash | 0 |
-| atl.cpp:849:17:849:27 | SetUserName | (const char *) |  | uc_script_byname | 0 |
-| atl.cpp:849:17:849:27 | SetUserName | (const char *) |  | uv__strdup | 0 |
-| atl.cpp:849:17:849:27 | SetUserName | (const char *) |  | uv_wtf8_length_as_utf16 | 0 |
-| atl.cpp:849:17:849:27 | SetUserName | (const char *) |  | xstrdup | 0 |
-| atl.cpp:915:5:915:18 | CSimpleStringT | (const XCHAR *,int,IAtlStringMgr *) | CSimpleStringT | CSimpleStringT | 0 |
-| atl.cpp:915:5:915:18 | CSimpleStringT | (const XCHAR *,int,IAtlStringMgr *) | CSimpleStringT | CSimpleStringT | 1 |
-| atl.cpp:915:5:915:18 | CSimpleStringT | (const XCHAR *,int,IAtlStringMgr *) | CSimpleStringT | CSimpleStringT | 2 |
-| atl.cpp:915:5:915:18 | CSimpleStringT | (const YCHAR *,int,IAtlStringMgr *) | CStringT | CStringT | 1 |
-| atl.cpp:915:5:915:18 | CSimpleStringT | (const YCHAR *,int,IAtlStringMgr *) | CStringT | CStringT | 2 |
-| atl.cpp:916:5:916:18 | CSimpleStringT | (LPCSTR,IAtlStringMgr *) | CStringT | CStringT | 1 |
-| atl.cpp:916:5:916:18 | CSimpleStringT | (LPCWSTR,IAtlStringMgr *) | CStringT | CStringT | 1 |
-| atl.cpp:916:5:916:18 | CSimpleStringT | (PCXSTR,IAtlStringMgr *) | CSimpleStringT | CSimpleStringT | 0 |
-| atl.cpp:916:5:916:18 | CSimpleStringT | (PCXSTR,IAtlStringMgr *) | CSimpleStringT | CSimpleStringT | 1 |
-| atl.cpp:916:5:916:18 | CSimpleStringT | (const VARIANT &,IAtlStringMgr *) | CStringT | CStringT | 1 |
-| atl.cpp:916:5:916:18 | CSimpleStringT | (const unsigned char *,IAtlStringMgr *) | CStringT | CStringT | 1 |
-| atl.cpp:917:5:917:18 | CSimpleStringT | (const CSimpleStringT &) |  | operator+= | 0 |
-| atl.cpp:917:5:917:18 | CSimpleStringT | (const CSimpleStringT &) | CSimpleStringT | CSimpleStringT | 0 |
-| atl.cpp:917:5:917:18 | CSimpleStringT | (const CSimpleStringT &) | CSimpleStringT | operator+= | 0 |
-| atl.cpp:917:5:917:18 | CSimpleStringT | (const CSimpleStringT &) | CStringT | CStringT | 0 |
-| atl.cpp:917:5:917:18 | CSimpleStringT | (const CSimpleStringT &) | CStringT | operator= | 0 |
-| atl.cpp:921:10:921:15 | Append | (const CSimpleStringT &) |  | operator+= | 0 |
-| atl.cpp:921:10:921:15 | Append | (const CSimpleStringT &) | CSimpleStringT | CSimpleStringT | 0 |
-| atl.cpp:921:10:921:15 | Append | (const CSimpleStringT &) | CSimpleStringT | operator+= | 0 |
-| atl.cpp:921:10:921:15 | Append | (const CSimpleStringT &) | CStringT | CStringT | 0 |
-| atl.cpp:921:10:921:15 | Append | (const CSimpleStringT &) | CStringT | operator= | 0 |
-| atl.cpp:922:10:922:15 | Append | (ASN1_STRING *,int) |  | ASN1_STRING_length_set | 1 |
-| atl.cpp:922:10:922:15 | Append | (ASYNC_WAIT_CTX *,int) |  | ASYNC_WAIT_CTX_set_status | 1 |
-| atl.cpp:922:10:922:15 | Append | (BIGNUM *,int) |  | BN_clear_bit | 1 |
-| atl.cpp:922:10:922:15 | Append | (BIGNUM *,int) |  | BN_mask_bits | 1 |
-| atl.cpp:922:10:922:15 | Append | (BIGNUM *,int) |  | BN_set_bit | 1 |
-| atl.cpp:922:10:922:15 | Append | (BIGNUM *,int) |  | BN_set_flags | 1 |
-| atl.cpp:922:10:922:15 | Append | (BIGNUM *,int) |  | bn_expand2 | 1 |
-| atl.cpp:922:10:922:15 | Append | (BIGNUM *,int) |  | bn_wexpand | 1 |
-| atl.cpp:922:10:922:15 | Append | (BIGNUM *,int) |  | ossl_bn_mask_bits_fixed_top | 1 |
-| atl.cpp:922:10:922:15 | Append | (BIO *,int) |  | BIO_clear_flags | 1 |
-| atl.cpp:922:10:922:15 | Append | (BIO *,int) |  | BIO_find_type | 1 |
-| atl.cpp:922:10:922:15 | Append | (BIO *,int) |  | BIO_set_flags | 1 |
-| atl.cpp:922:10:922:15 | Append | (BIO *,int) |  | BIO_set_init | 1 |
-| atl.cpp:922:10:922:15 | Append | (BIO *,int) |  | BIO_set_retry_reason | 1 |
-| atl.cpp:922:10:922:15 | Append | (BIO *,int) |  | BIO_set_shutdown | 1 |
-| atl.cpp:922:10:922:15 | Append | (BIO *,int) |  | TXT_DB_read | 1 |
-| atl.cpp:922:10:922:15 | Append | (CMS_SignerInfo *,int) |  | CMS_signed_delete_attr | 1 |
-| atl.cpp:922:10:922:15 | Append | (CMS_SignerInfo *,int) |  | CMS_unsigned_delete_attr | 1 |
-| atl.cpp:922:10:922:15 | Append | (CURL *,int) |  | curl_easy_pause | 1 |
-| atl.cpp:922:10:922:15 | Append | (Curl_easy *,int) |  | Curl_conn_get_socket | 1 |
-| atl.cpp:922:10:922:15 | Append | (DH *,int) |  | DH_clear_flags | 1 |
-| atl.cpp:922:10:922:15 | Append | (DH *,int) |  | DH_set_flags | 1 |
-| atl.cpp:922:10:922:15 | Append | (DH_METHOD *,int) |  | DH_meth_set_flags | 1 |
-| atl.cpp:922:10:922:15 | Append | (DSA *,int) |  | DSA_clear_flags | 1 |
-| atl.cpp:922:10:922:15 | Append | (DSA *,int) |  | DSA_set_flags | 1 |
-| atl.cpp:922:10:922:15 | Append | (DSA_METHOD *,int) |  | DSA_meth_set_flags | 1 |
-| atl.cpp:922:10:922:15 | Append | (EC_GROUP *,int) |  | EC_GROUP_set_asn1_flag | 1 |
-| atl.cpp:922:10:922:15 | Append | (EC_GROUP *,int) |  | EC_GROUP_set_curve_name | 1 |
-| atl.cpp:922:10:922:15 | Append | (EC_KEY *,int) |  | EC_KEY_clear_flags | 1 |
-| atl.cpp:922:10:922:15 | Append | (EC_KEY *,int) |  | EC_KEY_set_asn1_flag | 1 |
-| atl.cpp:922:10:922:15 | Append | (EC_KEY *,int) |  | EC_KEY_set_flags | 1 |
-| atl.cpp:922:10:922:15 | Append | (ENGINE *,int) |  | ENGINE_cmd_is_executable | 1 |
-| atl.cpp:922:10:922:15 | Append | (ENGINE *,int) |  | ENGINE_set_flags | 1 |
-| atl.cpp:922:10:922:15 | Append | (EVP_CIPHER *,int) |  | EVP_CIPHER_meth_set_impl_ctx_size | 1 |
-| atl.cpp:922:10:922:15 | Append | (EVP_CIPHER *,int) |  | EVP_CIPHER_meth_set_iv_length | 1 |
-| atl.cpp:922:10:922:15 | Append | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_clear_flags | 1 |
-| atl.cpp:922:10:922:15 | Append | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_flags | 1 |
-| atl.cpp:922:10:922:15 | Append | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_key_length | 1 |
-| atl.cpp:922:10:922:15 | Append | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_num | 1 |
-| atl.cpp:922:10:922:15 | Append | (EVP_KEYMGMT *,int) |  | evp_keymgmt_util_query_operation_name | 1 |
-| atl.cpp:922:10:922:15 | Append | (EVP_MD *,int) |  | EVP_MD_meth_set_app_datasize | 1 |
-| atl.cpp:922:10:922:15 | Append | (EVP_MD *,int) |  | EVP_MD_meth_set_input_blocksize | 1 |
-| atl.cpp:922:10:922:15 | Append | (EVP_MD *,int) |  | EVP_MD_meth_set_result_size | 1 |
-| atl.cpp:922:10:922:15 | Append | (EVP_MD_CTX *,int) |  | EVP_MD_CTX_clear_flags | 1 |
-| atl.cpp:922:10:922:15 | Append | (EVP_MD_CTX *,int) |  | EVP_MD_CTX_set_flags | 1 |
-| atl.cpp:922:10:922:15 | Append | (EVP_PKEY *,int) |  | EVP_PKEY_delete_attr | 1 |
-| atl.cpp:922:10:922:15 | Append | (EVP_PKEY *,int) |  | EVP_PKEY_save_parameters | 1 |
-| atl.cpp:922:10:922:15 | Append | (EVP_PKEY *,int) |  | EVP_PKEY_set_type | 1 |
-| atl.cpp:922:10:922:15 | Append | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_get_keygen_info | 1 |
-| atl.cpp:922:10:922:15 | Append | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_kdf_type | 1 |
-| atl.cpp:922:10:922:15 | Append | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_nid | 1 |
-| atl.cpp:922:10:922:15 | Append | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_paramgen_type | 1 |
-| atl.cpp:922:10:922:15 | Append | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_rfc5114 | 1 |
-| atl.cpp:922:10:922:15 | Append | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dhx_rfc5114 | 1 |
-| atl.cpp:922:10:922:15 | Append | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ec_param_enc | 1 |
-| atl.cpp:922:10:922:15 | Append | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ec_paramgen_curve_nid | 1 |
-| atl.cpp:922:10:922:15 | Append | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ecdh_kdf_type | 1 |
-| atl.cpp:922:10:922:15 | Append | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_hkdf_mode | 1 |
-| atl.cpp:922:10:922:15 | Append | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_rsa_padding | 1 |
-| atl.cpp:922:10:922:15 | Append | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_rsa_pss_saltlen | 1 |
-| atl.cpp:922:10:922:15 | Append | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_gindex | 1 |
-| atl.cpp:922:10:922:15 | Append | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_h | 1 |
-| atl.cpp:922:10:922:15 | Append | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_pcounter | 1 |
-| atl.cpp:922:10:922:15 | Append | (FILE *,int) |  | _IO_default_pbackfail | 1 |
-| atl.cpp:922:10:922:15 | Append | (FILE *,int) |  | _IO_fwide | 1 |
-| atl.cpp:922:10:922:15 | Append | (FILE *,int) |  | _IO_init | 1 |
-| atl.cpp:922:10:922:15 | Append | (FILE *,int) |  | _IO_init_internal | 1 |
-| atl.cpp:922:10:922:15 | Append | (FILE *,int) |  | _IO_new_file_attach | 1 |
-| atl.cpp:922:10:922:15 | Append | (FILE *,int) |  | _IO_new_file_overflow | 1 |
-| atl.cpp:922:10:922:15 | Append | (FILE *,int) |  | _IO_old_init | 1 |
-| atl.cpp:922:10:922:15 | Append | (FILE *,int) |  | _IO_sputbackc | 1 |
-| atl.cpp:922:10:922:15 | Append | (FILE *,int) |  | _IO_str_overflow | 1 |
-| atl.cpp:922:10:922:15 | Append | (FILE *,int) |  | _IO_str_pbackfail | 1 |
-| atl.cpp:922:10:922:15 | Append | (FILE *,int) |  | __printf_buffer_as_file_overflow | 1 |
-| atl.cpp:922:10:922:15 | Append | (FILE *,int) |  | __wprintf_buffer_as_file_overflow | 1 |
-| atl.cpp:922:10:922:15 | Append | (FTS *,int) |  | fts_children | 1 |
-| atl.cpp:922:10:922:15 | Append | (LIBSSH2_CHANNEL *,int) |  | _libssh2_channel_extended_data | 1 |
-| atl.cpp:922:10:922:15 | Append | (LIBSSH2_CHANNEL *,int) |  | _libssh2_channel_flush | 1 |
-| atl.cpp:922:10:922:15 | Append | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_flush_ex | 1 |
-| atl.cpp:922:10:922:15 | Append | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_handle_extended_data | 1 |
-| atl.cpp:922:10:922:15 | Append | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_handle_extended_data2 | 1 |
-| atl.cpp:922:10:922:15 | Append | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_set_blocking | 1 |
-| atl.cpp:922:10:922:15 | Append | (LIBSSH2_SESSION *,int) |  | _libssh2_session_set_blocking | 1 |
-| atl.cpp:922:10:922:15 | Append | (LIBSSH2_SESSION *,int) |  | libssh2_hostkey_hash | 1 |
-| atl.cpp:922:10:922:15 | Append | (LIBSSH2_SESSION *,int) |  | libssh2_session_methods | 1 |
-| atl.cpp:922:10:922:15 | Append | (LIBSSH2_SESSION *,int) |  | libssh2_session_set_blocking | 1 |
-| atl.cpp:922:10:922:15 | Append | (LIBSSH2_SESSION *,int) |  | libssh2_session_startup | 1 |
-| atl.cpp:922:10:922:15 | Append | (LPCOLESTR,int) | CComBSTR | Append | 1 |
-| atl.cpp:922:10:922:15 | Append | (OCSP_BASICRESP *,int) |  | OCSP_BASICRESP_delete_ext | 1 |
-| atl.cpp:922:10:922:15 | Append | (OCSP_BASICRESP *,int) |  | OCSP_BASICRESP_get_ext | 1 |
-| atl.cpp:922:10:922:15 | Append | (OCSP_BASICRESP *,int) |  | OCSP_resp_get0 | 1 |
-| atl.cpp:922:10:922:15 | Append | (OCSP_ONEREQ *,int) |  | OCSP_ONEREQ_delete_ext | 1 |
-| atl.cpp:922:10:922:15 | Append | (OCSP_ONEREQ *,int) |  | OCSP_ONEREQ_get_ext | 1 |
-| atl.cpp:922:10:922:15 | Append | (OCSP_REQUEST *,int) |  | OCSP_REQUEST_delete_ext | 1 |
-| atl.cpp:922:10:922:15 | Append | (OCSP_REQUEST *,int) |  | OCSP_REQUEST_get_ext | 1 |
-| atl.cpp:922:10:922:15 | Append | (OCSP_REQUEST *,int) |  | OCSP_request_onereq_get0 | 1 |
-| atl.cpp:922:10:922:15 | Append | (OCSP_SINGLERESP *,int) |  | OCSP_SINGLERESP_delete_ext | 1 |
-| atl.cpp:922:10:922:15 | Append | (OCSP_SINGLERESP *,int) |  | OCSP_SINGLERESP_get_ext | 1 |
-| atl.cpp:922:10:922:15 | Append | (OPENSSL_STACK *,int) |  | OPENSSL_sk_delete | 1 |
-| atl.cpp:922:10:922:15 | Append | (OPENSSL_STACK *,int) |  | OPENSSL_sk_reserve | 1 |
-| atl.cpp:922:10:922:15 | Append | (OPENSSL_sk_compfunc,int) |  | OPENSSL_sk_new_reserve | 1 |
-| atl.cpp:922:10:922:15 | Append | (OSSL_ACKM *,int) |  | ossl_ackm_get_ack_deadline | 1 |
-| atl.cpp:922:10:922:15 | Append | (OSSL_ACKM *,int) |  | ossl_ackm_get_ack_frame | 1 |
-| atl.cpp:922:10:922:15 | Append | (OSSL_ACKM *,int) |  | ossl_ackm_get_largest_acked | 1 |
-| atl.cpp:922:10:922:15 | Append | (OSSL_ACKM *,int) |  | ossl_ackm_on_pkt_space_discarded | 1 |
-| atl.cpp:922:10:922:15 | Append | (OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_set_serverPort | 1 |
-| atl.cpp:922:10:922:15 | Append | (OSSL_CMP_CTX *,int) |  | ossl_cmp_ctx_set_failInfoCode | 1 |
-| atl.cpp:922:10:922:15 | Append | (OSSL_CMP_CTX *,int) |  | ossl_cmp_ctx_set_status | 1 |
-| atl.cpp:922:10:922:15 | Append | (OSSL_CMP_CTX *,int) |  | ossl_cmp_msg_create | 1 |
-| atl.cpp:922:10:922:15 | Append | (OSSL_CMP_CTX *,int) |  | ossl_cmp_pollReq_new | 1 |
-| atl.cpp:922:10:922:15 | Append | (OSSL_CMP_MSG *,int) |  | ossl_cmp_msg_set_bodytype | 1 |
-| atl.cpp:922:10:922:15 | Append | (OSSL_CMP_PKIHEADER *,int) |  | ossl_cmp_hdr_set_pvno | 1 |
-| atl.cpp:922:10:922:15 | Append | (OSSL_CMP_REVREPCONTENT *,int) |  | ossl_cmp_revrepcontent_get_CertId | 1 |
-| atl.cpp:922:10:922:15 | Append | (OSSL_CMP_REVREPCONTENT *,int) |  | ossl_cmp_revrepcontent_get_pkisi | 1 |
-| atl.cpp:922:10:922:15 | Append | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_accept_raverified | 1 |
-| atl.cpp:922:10:922:15 | Append | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_accept_unprotected | 1 |
-| atl.cpp:922:10:922:15 | Append | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_grant_implicit_confirm | 1 |
-| atl.cpp:922:10:922:15 | Append | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_send_unprotected_errors | 1 |
-| atl.cpp:922:10:922:15 | Append | (OSSL_CRMF_PKIPUBLICATIONINFO *,int) |  | OSSL_CRMF_MSG_set_PKIPublicationInfo_action | 1 |
-| atl.cpp:922:10:922:15 | Append | (OSSL_DECODER_CTX *,int) |  | OSSL_DECODER_CTX_set_selection | 1 |
-| atl.cpp:922:10:922:15 | Append | (OSSL_ENCODER_CTX *,int) |  | OSSL_ENCODER_CTX_set_selection | 1 |
-| atl.cpp:922:10:922:15 | Append | (OSSL_LIB_CTX *,int) |  | OSSL_LIB_CTX_get_data | 1 |
-| atl.cpp:922:10:922:15 | Append | (OSSL_LIB_CTX *,int) |  | OSSL_LIB_CTX_set_conf_diagnostics | 1 |
-| atl.cpp:922:10:922:15 | Append | (OSSL_LIB_CTX *,int) |  | ossl_ctx_global_properties | 1 |
-| atl.cpp:922:10:922:15 | Append | (OSSL_LIB_CTX *,int) |  | ossl_dh_new_by_nid_ex | 1 |
-| atl.cpp:922:10:922:15 | Append | (OSSL_LIB_CTX *,int) |  | ossl_lib_ctx_get_data | 1 |
-| atl.cpp:922:10:922:15 | Append | (OSSL_LIB_CTX *,int) |  | ossl_mac_key_new | 1 |
-| atl.cpp:922:10:922:15 | Append | (OSSL_PARAM *,int) |  | OSSL_PARAM_set_int | 1 |
-| atl.cpp:922:10:922:15 | Append | (OSSL_QRX *,int) |  | ossl_qrx_get_bytes_received | 1 |
-| atl.cpp:922:10:922:15 | Append | (OSSL_RECORD_LAYER *,int) |  | tls_set_first_handshake | 1 |
-| atl.cpp:922:10:922:15 | Append | (OSSL_RECORD_LAYER *,int) |  | tls_set_plain_alerts | 1 |
-| atl.cpp:922:10:922:15 | Append | (OSSL_STORE_CTX *,int) |  | OSSL_STORE_expect | 1 |
-| atl.cpp:922:10:922:15 | Append | (PKCS7 *,int) |  | PKCS7_set_type | 1 |
-| atl.cpp:922:10:922:15 | Append | (QUIC_CHANNEL *,int) |  | ossl_quic_channel_new_stream_local | 1 |
-| atl.cpp:922:10:922:15 | Append | (QUIC_ENGINE *,int) |  | ossl_quic_engine_set_inhibit_tick | 1 |
-| atl.cpp:922:10:922:15 | Append | (QUIC_PORT *,int) |  | ossl_quic_port_set_allow_incoming | 1 |
-| atl.cpp:922:10:922:15 | Append | (QUIC_RCIDM *,int) |  | ossl_quic_rcidm_get_preferred_tx_dcid_changed | 1 |
-| atl.cpp:922:10:922:15 | Append | (QUIC_RSTREAM *,int) |  | ossl_quic_rstream_set_cleanse | 1 |
-| atl.cpp:922:10:922:15 | Append | (QUIC_RXFC *,int) |  | ossl_quic_rxfc_get_error | 1 |
-| atl.cpp:922:10:922:15 | Append | (QUIC_RXFC *,int) |  | ossl_quic_rxfc_has_cwm_changed | 1 |
-| atl.cpp:922:10:922:15 | Append | (QUIC_SSTREAM *,int) |  | ossl_quic_sstream_set_cleanse | 1 |
-| atl.cpp:922:10:922:15 | Append | (QUIC_STREAM_MAP *,int) |  | ossl_quic_stream_map_get_accept_queue_len | 1 |
-| atl.cpp:922:10:922:15 | Append | (QUIC_TXFC *,int) |  | ossl_quic_txfc_has_become_blocked | 1 |
-| atl.cpp:922:10:922:15 | Append | (RSA *,int) |  | RSA_clear_flags | 1 |
-| atl.cpp:922:10:922:15 | Append | (RSA *,int) |  | RSA_set_flags | 1 |
-| atl.cpp:922:10:922:15 | Append | (RSA_METHOD *,int) |  | RSA_meth_set_flags | 1 |
-| atl.cpp:922:10:922:15 | Append | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_hashalg | 1 |
-| atl.cpp:922:10:922:15 | Append | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_maskgenhashalg | 1 |
-| atl.cpp:922:10:922:15 | Append | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_saltlen | 1 |
-| atl.cpp:922:10:922:15 | Append | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_trailerfield | 1 |
-| atl.cpp:922:10:922:15 | Append | (SSL *,int) |  | SSL_key_update | 1 |
-| atl.cpp:922:10:922:15 | Append | (SSL *,int) |  | SSL_set_post_handshake_auth | 1 |
-| atl.cpp:922:10:922:15 | Append | (SSL *,int) |  | SSL_set_purpose | 1 |
-| atl.cpp:922:10:922:15 | Append | (SSL *,int) |  | SSL_set_quic_tls_early_data_enabled | 1 |
-| atl.cpp:922:10:922:15 | Append | (SSL *,int) |  | SSL_set_quiet_shutdown | 1 |
-| atl.cpp:922:10:922:15 | Append | (SSL *,int) |  | SSL_set_read_ahead | 1 |
-| atl.cpp:922:10:922:15 | Append | (SSL *,int) |  | SSL_set_security_level | 1 |
-| atl.cpp:922:10:922:15 | Append | (SSL *,int) |  | SSL_set_shutdown | 1 |
-| atl.cpp:922:10:922:15 | Append | (SSL *,int) |  | SSL_set_trust | 1 |
-| atl.cpp:922:10:922:15 | Append | (SSL *,int) |  | SSL_set_verify_depth | 1 |
-| atl.cpp:922:10:922:15 | Append | (SSL_CONNECTION *,int) |  | dtls1_read_failed | 1 |
-| atl.cpp:922:10:922:15 | Append | (SSL_CONNECTION *,int) |  | ossl_statem_send_fatal | 1 |
-| atl.cpp:922:10:922:15 | Append | (SSL_CONNECTION *,int) |  | ossl_statem_set_in_init | 1 |
-| atl.cpp:922:10:922:15 | Append | (SSL_CONNECTION *,int) |  | tls1_shared_group | 1 |
-| atl.cpp:922:10:922:15 | Append | (SSL_CTX *,int) |  | SSL_CTX_set_post_handshake_auth | 1 |
-| atl.cpp:922:10:922:15 | Append | (SSL_CTX *,int) |  | SSL_CTX_set_purpose | 1 |
-| atl.cpp:922:10:922:15 | Append | (SSL_CTX *,int) |  | SSL_CTX_set_quiet_shutdown | 1 |
-| atl.cpp:922:10:922:15 | Append | (SSL_CTX *,int) |  | SSL_CTX_set_security_level | 1 |
-| atl.cpp:922:10:922:15 | Append | (SSL_CTX *,int) |  | SSL_CTX_set_srp_strength | 1 |
-| atl.cpp:922:10:922:15 | Append | (SSL_CTX *,int) |  | SSL_CTX_set_trust | 1 |
-| atl.cpp:922:10:922:15 | Append | (SSL_CTX *,int) |  | SSL_CTX_set_verify_depth | 1 |
-| atl.cpp:922:10:922:15 | Append | (SSL_CTX *,int) |  | ssl_md | 1 |
-| atl.cpp:922:10:922:15 | Append | (SSL_SESSION *,int) |  | SSL_SESSION_set_protocol_version | 1 |
-| atl.cpp:922:10:922:15 | Append | (TS_REQ *,int) |  | TS_REQ_delete_ext | 1 |
-| atl.cpp:922:10:922:15 | Append | (TS_REQ *,int) |  | TS_REQ_get_ext | 1 |
-| atl.cpp:922:10:922:15 | Append | (TS_RESP_CTX *,int) |  | TS_RESP_CTX_add_flags | 1 |
-| atl.cpp:922:10:922:15 | Append | (TS_STATUS_INFO *,int) |  | TS_STATUS_INFO_set_status | 1 |
-| atl.cpp:922:10:922:15 | Append | (TS_TST_INFO *,int) |  | TS_TST_INFO_delete_ext | 1 |
-| atl.cpp:922:10:922:15 | Append | (TS_TST_INFO *,int) |  | TS_TST_INFO_get_ext | 1 |
-| atl.cpp:922:10:922:15 | Append | (TS_VERIFY_CTX *,int) |  | TS_VERIFY_CTX_add_flags | 1 |
-| atl.cpp:922:10:922:15 | Append | (TS_VERIFY_CTX *,int) |  | TS_VERIFY_CTX_set_flags | 1 |
-| atl.cpp:922:10:922:15 | Append | (WPACKET *,int) |  | ossl_DER_w_begin_sequence | 1 |
-| atl.cpp:922:10:922:15 | Append | (X509 *,int) |  | X509_delete_ext | 1 |
-| atl.cpp:922:10:922:15 | Append | (X509 *,int) |  | X509_self_signed | 1 |
-| atl.cpp:922:10:922:15 | Append | (X509_ACERT *,int) |  | X509_ACERT_delete_attr | 1 |
-| atl.cpp:922:10:922:15 | Append | (X509_ATTRIBUTE *,int) |  | X509_ATTRIBUTE_get0_type | 1 |
-| atl.cpp:922:10:922:15 | Append | (X509_CRL *,int) |  | X509_CRL_delete_ext | 1 |
-| atl.cpp:922:10:922:15 | Append | (X509_NAME *,int) |  | X509_NAME_delete_entry | 1 |
-| atl.cpp:922:10:922:15 | Append | (X509_REQ *,int) |  | X509_REQ_delete_attr | 1 |
-| atl.cpp:922:10:922:15 | Append | (X509_REVOKED *,int) |  | X509_REVOKED_delete_ext | 1 |
-| atl.cpp:922:10:922:15 | Append | (X509_STORE *,int) |  | X509_STORE_set_depth | 1 |
-| atl.cpp:922:10:922:15 | Append | (X509_STORE *,int) |  | X509_STORE_set_purpose | 1 |
-| atl.cpp:922:10:922:15 | Append | (X509_STORE *,int) |  | X509_STORE_set_trust | 1 |
-| atl.cpp:922:10:922:15 | Append | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_depth | 1 |
-| atl.cpp:922:10:922:15 | Append | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_error | 1 |
-| atl.cpp:922:10:922:15 | Append | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_error_depth | 1 |
-| atl.cpp:922:10:922:15 | Append | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_purpose | 1 |
-| atl.cpp:922:10:922:15 | Append | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_trust | 1 |
-| atl.cpp:922:10:922:15 | Append | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_get0_host | 1 |
-| atl.cpp:922:10:922:15 | Append | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_auth_level | 1 |
-| atl.cpp:922:10:922:15 | Append | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_depth | 1 |
-| atl.cpp:922:10:922:15 | Append | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_purpose | 1 |
-| atl.cpp:922:10:922:15 | Append | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_trust | 1 |
-| atl.cpp:922:10:922:15 | Append | (_Float128,int) |  | __ldexpf128 | 1 |
-| atl.cpp:922:10:922:15 | Append | (_Float128,int) |  | __scalbnf128 | 1 |
-| atl.cpp:922:10:922:15 | Append | (__sigset_t *,int) |  | __sigaddset_compat | 1 |
-| atl.cpp:922:10:922:15 | Append | (__sigset_t *,int) |  | __sigdelset_compat | 1 |
-| atl.cpp:922:10:922:15 | Append | (acttab *,int) |  | acttab_insert | 1 |
-| atl.cpp:922:10:922:15 | Append | (addrinfo *,int) |  | support_format_addrinfo | 1 |
-| atl.cpp:922:10:922:15 | Append | (aiocb_union *,int) |  | __aio_enqueue_request | 1 |
-| atl.cpp:922:10:922:15 | Append | (argp_fmtstream_t,int) |  | __argp_fmtstream_putc | 1 |
-| atl.cpp:922:10:922:15 | Append | (char **,int) |  | addrsort | 1 |
-| atl.cpp:922:10:922:15 | Append | (char *,int) |  | Curl_str2addr | 1 |
-| atl.cpp:922:10:922:15 | Append | (char *,int) |  | PEM_proc_type | 1 |
-| atl.cpp:922:10:922:15 | Append | (char,int) | CStringT | CStringT | 1 |
-| atl.cpp:922:10:922:15 | Append | (connectdata *,int) |  | Curl_conn_is_ssl | 1 |
-| atl.cpp:922:10:922:15 | Append | (const ASN1_BIT_STRING *,int) |  | ASN1_BIT_STRING_get_bit | 1 |
-| atl.cpp:922:10:922:15 | Append | (const BIGNUM *,int) |  | BN_get_flags | 1 |
-| atl.cpp:922:10:922:15 | Append | (const BIGNUM *,int) |  | BN_is_bit_set | 1 |
-| atl.cpp:922:10:922:15 | Append | (const BIO *,int) |  | BIO_get_ex_data | 1 |
-| atl.cpp:922:10:922:15 | Append | (const BIO *,int) |  | BIO_test_flags | 1 |
-| atl.cpp:922:10:922:15 | Append | (const CMS_SignerInfo *,int) |  | CMS_signed_get_attr | 1 |
-| atl.cpp:922:10:922:15 | Append | (const CMS_SignerInfo *,int) |  | CMS_unsigned_get_attr | 1 |
-| atl.cpp:922:10:922:15 | Append | (const CRYPTO_EX_DATA *,int) |  | CRYPTO_get_ex_data | 1 |
-| atl.cpp:922:10:922:15 | Append | (const DH *,int) |  | DH_get_ex_data | 1 |
-| atl.cpp:922:10:922:15 | Append | (const DH *,int) |  | DH_test_flags | 1 |
-| atl.cpp:922:10:922:15 | Append | (const DH *,int) |  | ossl_dh_dup | 1 |
-| atl.cpp:922:10:922:15 | Append | (const DSA *,int) |  | DSA_get_ex_data | 1 |
-| atl.cpp:922:10:922:15 | Append | (const DSA *,int) |  | DSA_test_flags | 1 |
-| atl.cpp:922:10:922:15 | Append | (const DSA *,int) |  | ossl_dsa_dup | 1 |
-| atl.cpp:922:10:922:15 | Append | (const ECX_KEY *,int) |  | ossl_ecx_key_dup | 1 |
-| atl.cpp:922:10:922:15 | Append | (const EC_KEY *,int) |  | EC_KEY_get_ex_data | 1 |
-| atl.cpp:922:10:922:15 | Append | (const EC_KEY *,int) |  | ossl_ec_key_dup | 1 |
-| atl.cpp:922:10:922:15 | Append | (const ENGINE *,int) |  | ENGINE_get_ex_data | 1 |
-| atl.cpp:922:10:922:15 | Append | (const EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_test_flags | 1 |
-| atl.cpp:922:10:922:15 | Append | (const EVP_MD_CTX *,int) |  | EVP_MD_CTX_test_flags | 1 |
-| atl.cpp:922:10:922:15 | Append | (const EVP_PKEY *,int) |  | EVP_PKEY_get_attr | 1 |
-| atl.cpp:922:10:922:15 | Append | (const EVP_PKEY *,int) |  | EVP_PKEY_get_ex_data | 1 |
-| atl.cpp:922:10:922:15 | Append | (const ML_DSA_KEY *,int) |  | ossl_ml_dsa_key_dup | 1 |
-| atl.cpp:922:10:922:15 | Append | (const ML_KEM_KEY *,int) |  | ossl_ml_kem_key_dup | 1 |
-| atl.cpp:922:10:922:15 | Append | (const OPENSSL_STACK *,int) |  | OPENSSL_sk_value | 1 |
-| atl.cpp:922:10:922:15 | Append | (const OSSL_CMP_CERTREPMESSAGE *,int) |  | ossl_cmp_certrepmessage_get0_certresponse | 1 |
-| atl.cpp:922:10:922:15 | Append | (const OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_get0_newPkey | 1 |
-| atl.cpp:922:10:922:15 | Append | (const OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_get_option | 1 |
-| atl.cpp:922:10:922:15 | Append | (const OSSL_CMP_PKISI *,int) |  | ossl_cmp_pkisi_check_pkifailureinfo | 1 |
-| atl.cpp:922:10:922:15 | Append | (const OSSL_CMP_POLLREPCONTENT *,int) |  | ossl_cmp_pollrepcontent_get0_pollrep | 1 |
-| atl.cpp:922:10:922:15 | Append | (const QUIC_CHANNEL *,int) |  | ossl_quic_channel_get_local_stream_count_avail | 1 |
-| atl.cpp:922:10:922:15 | Append | (const QUIC_CHANNEL *,int) |  | ossl_quic_channel_get_remote_stream_count_avail | 1 |
-| atl.cpp:922:10:922:15 | Append | (const RSA *,int) |  | RSA_get_ex_data | 1 |
-| atl.cpp:922:10:922:15 | Append | (const RSA *,int) |  | RSA_test_flags | 1 |
-| atl.cpp:922:10:922:15 | Append | (const RSA *,int) |  | ossl_rsa_dup | 1 |
-| atl.cpp:922:10:922:15 | Append | (const SLH_DSA_KEY *,int) |  | ossl_slh_dsa_key_dup | 1 |
-| atl.cpp:922:10:922:15 | Append | (const SSL *,int) |  | SSL_get_ex_data | 1 |
-| atl.cpp:922:10:922:15 | Append | (const SSL_CTX *,int) |  | SSL_CTX_get_ex_data | 1 |
-| atl.cpp:922:10:922:15 | Append | (const SSL_SESSION *,int) |  | SSL_SESSION_get_ex_data | 1 |
-| atl.cpp:922:10:922:15 | Append | (const SSL_SESSION *,int) |  | ssl_session_dup | 1 |
-| atl.cpp:922:10:922:15 | Append | (const UI *,int) |  | UI_get_ex_data | 1 |
-| atl.cpp:922:10:922:15 | Append | (const UI_METHOD *,int) |  | UI_method_get_ex_data | 1 |
-| atl.cpp:922:10:922:15 | Append | (const X509 *,int) |  | X509_get_ex_data | 1 |
-| atl.cpp:922:10:922:15 | Append | (const X509 *,int) |  | X509_get_ext | 1 |
-| atl.cpp:922:10:922:15 | Append | (const X509_ACERT *,int) |  | X509_ACERT_get_attr | 1 |
-| atl.cpp:922:10:922:15 | Append | (const X509_CRL *,int) |  | X509_CRL_get_ext | 1 |
-| atl.cpp:922:10:922:15 | Append | (const X509_NAME *,int) |  | X509_NAME_get_entry | 1 |
-| atl.cpp:922:10:922:15 | Append | (const X509_POLICY_LEVEL *,int) |  | X509_policy_level_get0_node | 1 |
-| atl.cpp:922:10:922:15 | Append | (const X509_POLICY_TREE *,int) |  | X509_policy_tree_get0_level | 1 |
-| atl.cpp:922:10:922:15 | Append | (const X509_REQ *,int) |  | X509_REQ_get_attr | 1 |
-| atl.cpp:922:10:922:15 | Append | (const X509_REVOKED *,int) |  | X509_REVOKED_get_ext | 1 |
-| atl.cpp:922:10:922:15 | Append | (const X509_STORE *,int) |  | X509_STORE_get_ex_data | 1 |
-| atl.cpp:922:10:922:15 | Append | (const X509_STORE_CTX *,int) |  | X509_STORE_CTX_get_ex_data | 1 |
-| atl.cpp:922:10:922:15 | Append | (const XCHAR *,int) | CStringT | CStringT | 1 |
-| atl.cpp:922:10:922:15 | Append | (const YCHAR *,int) | CStringT | CStringT | 1 |
-| atl.cpp:922:10:922:15 | Append | (const char *,int) |  | DH_meth_new | 1 |
-| atl.cpp:922:10:922:15 | Append | (const char *,int) |  | DSA_meth_new | 1 |
-| atl.cpp:922:10:922:15 | Append | (const char *,int) |  | Jim_StrDupLen | 1 |
-| atl.cpp:922:10:922:15 | Append | (const char *,int) |  | NETSCAPE_SPKI_b64_decode | 1 |
-| atl.cpp:922:10:922:15 | Append | (const char *,int) |  | RSA_meth_new | 1 |
-| atl.cpp:922:10:922:15 | Append | (const char *,int) |  | ftok | 1 |
-| atl.cpp:922:10:922:15 | Append | (const char *,int) |  | gethostbyname2 | 1 |
-| atl.cpp:922:10:922:15 | Append | (const char *,int) |  | parse_yesno | 1 |
-| atl.cpp:922:10:922:15 | Append | (const char *,int) |  | res_gethostbyname2 | 1 |
-| atl.cpp:922:10:922:15 | Append | (const stack_st_X509_ATTRIBUTE *,int) |  | X509at_get_attr | 1 |
-| atl.cpp:922:10:922:15 | Append | (const stack_st_X509_EXTENSION *,int) |  | X509v3_get_ext | 1 |
-| atl.cpp:922:10:922:15 | Append | (const unsigned char *,int) |  | Jim_GenHashFunction | 1 |
-| atl.cpp:922:10:922:15 | Append | (const unsigned char *,int) |  | OPENSSL_uni2asc | 1 |
-| atl.cpp:922:10:922:15 | Append | (const unsigned char *,int) |  | OPENSSL_uni2utf8 | 1 |
-| atl.cpp:922:10:922:15 | Append | (const void *,int) |  | inet6_rth_getaddr | 1 |
-| atl.cpp:922:10:922:15 | Append | (double,int) |  | __ldexp | 1 |
-| atl.cpp:922:10:922:15 | Append | (double,int) |  | __scalbn | 1 |
-| atl.cpp:922:10:922:15 | Append | (double[],int) |  | getloadavg | 1 |
-| atl.cpp:922:10:922:15 | Append | (dynhds *,int) |  | Curl_dynhds_set_opts | 1 |
-| atl.cpp:922:10:922:15 | Append | (fexcept_t *,int) |  | fegetexceptflag | 1 |
-| atl.cpp:922:10:922:15 | Append | (float,int) |  | __ldexpf | 1 |
-| atl.cpp:922:10:922:15 | Append | (float,int) |  | __scalbnf | 1 |
-| atl.cpp:922:10:922:15 | Append | (gzFile,int) |  | gzflush | 1 |
-| atl.cpp:922:10:922:15 | Append | (gzFile,int) |  | gzputc | 1 |
-| atl.cpp:922:10:922:15 | Append | (int *,int) |  | X509_PURPOSE_set | 1 |
-| atl.cpp:922:10:922:15 | Append | (int *,int) |  | X509_TRUST_set | 1 |
-| atl.cpp:922:10:922:15 | Append | (int *,int) |  | __lll_unlock_elision | 1 |
-| atl.cpp:922:10:922:15 | Append | (int,int) |  | BN_security_bits | 1 |
-| atl.cpp:922:10:922:15 | Append | (int,int) |  | EVP_MD_meth_new | 1 |
-| atl.cpp:922:10:922:15 | Append | (int,int) |  | EVP_PKEY_meth_new | 1 |
-| atl.cpp:922:10:922:15 | Append | (int,int) |  | __isctype | 1 |
-| atl.cpp:922:10:922:15 | Append | (int,int) |  | acttab_alloc | 1 |
-| atl.cpp:922:10:922:15 | Append | (int,int) |  | div | 1 |
-| atl.cpp:922:10:922:15 | Append | (int,int) |  | inet6_rth_space | 1 |
-| atl.cpp:922:10:922:15 | Append | (long double,int) |  | __ldexpl | 1 |
-| atl.cpp:922:10:922:15 | Append | (netlink_handle *,int) |  | __netlink_request | 1 |
-| atl.cpp:922:10:922:15 | Append | (nghttp2_option *,int) |  | nghttp2_option_set_no_auto_ping_ack | 1 |
-| atl.cpp:922:10:922:15 | Append | (nghttp2_option *,int) |  | nghttp2_option_set_no_auto_window_update | 1 |
-| atl.cpp:922:10:922:15 | Append | (nghttp2_option *,int) |  | nghttp2_option_set_no_closed_streams | 1 |
-| atl.cpp:922:10:922:15 | Append | (nghttp2_option *,int) |  | nghttp2_option_set_no_http_messaging | 1 |
-| atl.cpp:922:10:922:15 | Append | (nghttp2_option *,int) |  | nghttp2_option_set_no_recv_client_magic | 1 |
-| atl.cpp:922:10:922:15 | Append | (nghttp2_option *,int) |  | nghttp2_option_set_no_rfc9113_leading_and_trailing_ws_validation | 1 |
-| atl.cpp:922:10:922:15 | Append | (nghttp2_option *,int) |  | nghttp2_option_set_server_fallback_rfc7540_priorities | 1 |
-| atl.cpp:922:10:922:15 | Append | (ns_msg,int) |  | ns_msg_getflag | 1 |
-| atl.cpp:922:10:922:15 | Append | (obstack *,int) |  | _obstack_newchunk | 1 |
-| atl.cpp:922:10:922:15 | Append | (posix_spawnattr_t *,int) |  | posix_spawnattr_setcgroup_np | 1 |
-| atl.cpp:922:10:922:15 | Append | (posix_spawnattr_t *,int) |  | posix_spawnattr_setschedpolicy | 1 |
-| atl.cpp:922:10:922:15 | Append | (pthread_attr_t *,int) |  | __pthread_attr_setschedpolicy | 1 |
-| atl.cpp:922:10:922:15 | Append | (pthread_barrierattr_t *,int) |  | __pthread_barrierattr_setpshared | 1 |
-| atl.cpp:922:10:922:15 | Append | (pthread_mutexattr_t *,int) |  | ___pthread_mutexattr_settype | 1 |
-| atl.cpp:922:10:922:15 | Append | (pthread_mutexattr_t *,int) |  | __pthread_mutexattr_setprioceiling | 1 |
-| atl.cpp:922:10:922:15 | Append | (pthread_mutexattr_t *,int) |  | __pthread_mutexattr_setprotocol | 1 |
-| atl.cpp:922:10:922:15 | Append | (pthread_rwlockattr_t *,int) |  | __pthread_rwlockattr_setkind_np | 1 |
-| atl.cpp:922:10:922:15 | Append | (pthread_rwlockattr_t *,int) |  | __pthread_rwlockattr_setpshared | 1 |
-| atl.cpp:922:10:922:15 | Append | (rule *,int) |  | Configlist_add | 1 |
-| atl.cpp:922:10:922:15 | Append | (rule *,int) |  | Configlist_addbasis | 1 |
-| atl.cpp:922:10:922:15 | Append | (sigset_t *,int) |  | sigaddset | 1 |
-| atl.cpp:922:10:922:15 | Append | (sigset_t *,int) |  | sigdelset | 1 |
-| atl.cpp:922:10:922:15 | Append | (sqlite3 *,int) |  | sqlite3_busy_timeout | 1 |
-| atl.cpp:922:10:922:15 | Append | (sqlite3 *,int) |  | sqlite3_db_name | 1 |
-| atl.cpp:922:10:922:15 | Append | (sqlite3 *,int) |  | sqlite3_wal_autocheckpoint | 1 |
-| atl.cpp:922:10:922:15 | Append | (sqlite3_backup *,int) |  | sqlite3_backup_step | 1 |
-| atl.cpp:922:10:922:15 | Append | (sqlite3_context *,int) |  | sqlite3_aggregate_context | 1 |
-| atl.cpp:922:10:922:15 | Append | (sqlite3_context *,int) |  | sqlite3_result_error_code | 1 |
-| atl.cpp:922:10:922:15 | Append | (sqlite3_index_info *,int) |  | sqlite3_vtab_collation | 1 |
-| atl.cpp:922:10:922:15 | Append | (sqlite3_stmt *,int) |  | sqlite3_bind_parameter_name | 1 |
-| atl.cpp:922:10:922:15 | Append | (sqlite3_stmt *,int) |  | sqlite3_column_blob | 1 |
-| atl.cpp:922:10:922:15 | Append | (sqlite3_stmt *,int) |  | sqlite3_column_bytes | 1 |
-| atl.cpp:922:10:922:15 | Append | (sqlite3_stmt *,int) |  | sqlite3_column_bytes16 | 1 |
-| atl.cpp:922:10:922:15 | Append | (sqlite3_stmt *,int) |  | sqlite3_column_decltype | 1 |
-| atl.cpp:922:10:922:15 | Append | (sqlite3_stmt *,int) |  | sqlite3_column_decltype16 | 1 |
-| atl.cpp:922:10:922:15 | Append | (sqlite3_stmt *,int) |  | sqlite3_column_double | 1 |
-| atl.cpp:922:10:922:15 | Append | (sqlite3_stmt *,int) |  | sqlite3_column_int | 1 |
-| atl.cpp:922:10:922:15 | Append | (sqlite3_stmt *,int) |  | sqlite3_column_int64 | 1 |
-| atl.cpp:922:10:922:15 | Append | (sqlite3_stmt *,int) |  | sqlite3_column_name | 1 |
-| atl.cpp:922:10:922:15 | Append | (sqlite3_stmt *,int) |  | sqlite3_column_name16 | 1 |
-| atl.cpp:922:10:922:15 | Append | (sqlite3_stmt *,int) |  | sqlite3_column_text | 1 |
-| atl.cpp:922:10:922:15 | Append | (sqlite3_stmt *,int) |  | sqlite3_column_text16 | 1 |
-| atl.cpp:922:10:922:15 | Append | (sqlite3_stmt *,int) |  | sqlite3_column_type | 1 |
-| atl.cpp:922:10:922:15 | Append | (sqlite3_stmt *,int) |  | sqlite3_column_value | 1 |
-| atl.cpp:922:10:922:15 | Append | (sqlite3_stmt *,int) |  | sqlite3_stmt_explain | 1 |
-| atl.cpp:922:10:922:15 | Append | (stack_st_PKCS7 *,int) |  | PKCS12_add_safes | 1 |
-| atl.cpp:922:10:922:15 | Append | (stack_st_SSL_COMP *,int) |  | ssl3_comp_find | 1 |
-| atl.cpp:922:10:922:15 | Append | (stack_st_X509_ATTRIBUTE *,int) |  | X509at_delete_attr | 1 |
-| atl.cpp:922:10:922:15 | Append | (stack_st_X509_EXTENSION *,int) |  | X509v3_delete_ext | 1 |
-| atl.cpp:922:10:922:15 | Append | (timespec *,int) |  | __timespec_get | 1 |
-| atl.cpp:922:10:922:15 | Append | (timespec *,int) |  | __timespec_getres | 1 |
-| atl.cpp:922:10:922:15 | Append | (uint16_t,int) |  | tls1_group_id2nid | 1 |
-| atl.cpp:922:10:922:15 | Append | (unsigned char *,int) |  | RAND_bytes | 1 |
-| atl.cpp:922:10:922:15 | Append | (unsigned char *,int) |  | RAND_priv_bytes | 1 |
-| atl.cpp:922:10:922:15 | Append | (unsigned char *,int) |  | ossl_ipaddr_to_asc | 1 |
-| atl.cpp:922:10:922:15 | Append | (unsigned short,int) |  | dtls1_get_queue_priority | 1 |
-| atl.cpp:922:10:922:15 | Append | (uv_env_item_t *,int) |  | uv_os_free_environ | 1 |
-| atl.cpp:922:10:922:15 | Append | (void *,int) |  | DSO_dsobyaddr | 1 |
-| atl.cpp:922:10:922:15 | Append | (void *,int) |  | sqlite3_realloc | 1 |
-| atl.cpp:922:10:922:15 | Append | (void *const *,int) |  | __backtrace_symbols | 1 |
-| atl.cpp:922:10:922:15 | Append | (wchar_t,int) | CStringT | CStringT | 1 |
-| atl.cpp:923:10:923:15 | Append | (PCXSTR) |  | operator+= | 0 |
-| atl.cpp:923:10:923:15 | Append | (PCXSTR) | CSimpleStringT | operator+= | 0 |
-| atl.cpp:923:10:923:15 | Append | (PCXSTR) | CStringT | operator= | 0 |
-| atl.cpp:927:17:927:25 | CopyChars | (ASN1_BIT_STRING *,int,int) |  | ASN1_BIT_STRING_set_bit | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (ASN1_BIT_STRING *,unsigned char *,int) |  | ASN1_BIT_STRING_set | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (ASN1_OCTET_STRING **,const unsigned char *,int) |  | ossl_cmp_asn1_octet_string_set1_bytes | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (ASN1_OCTET_STRING *,const unsigned char *,int) |  | ASN1_OCTET_STRING_set | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (ASN1_STRING *,const void *,int) |  | ASN1_STRING_set | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (ASN1_STRING *,void *,int) |  | ASN1_STRING_set0 | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (ASN1_TIME *,tm *,int) |  | ossl_asn1_time_from_tm | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (ASN1_TYPE *,unsigned char *,int) |  | ASN1_TYPE_set_octetstring | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (ASN1_VALUE **,const ASN1_ITEM *,int) |  | ossl_asn1_item_embed_free | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (ASN1_VALUE **,const ASN1_ITEM *,int) |  | ossl_asn1_primitive_free | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (BIGNUM *,const BIGNUM *,int) |  | BN_lshift | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (BIGNUM *,const BIGNUM *,int) |  | BN_rshift | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (BIGNUM *,const BIGNUM *,int) |  | BN_with_flags | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (BIGNUM *,const BIGNUM *,int) |  | bn_lshift_fixed_top | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (BIGNUM *,const BIGNUM *,int) |  | bn_rshift_fixed_top | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (BIGNUM *,const unsigned long *,int) |  | bn_set_static_words | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (BIGNUM *,const unsigned long *,int) |  | bn_set_words | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (BIO *,BIO *,int) |  | OSSL_HTTP_REQ_CTX_new | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (BIO *,BIO *,int) |  | SMIME_crlf_copy | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (BIO *,GENERAL_NAMES *,int) |  | OSSL_GENERAL_NAMES_print | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (BIO *,char *,int) |  | BIO_get_line | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (BIO *,const DSA *,int) |  | DSA_print | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (BIO *,const RSA *,int) |  | RSA_print | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (CERT *,X509_STORE **,int) |  | ssl_cert_get_cert_store | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (CRYPTO_THREAD_ROUTINE,void *,int) |  | ossl_crypto_thread_native_start | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (Curl_easy *,connectdata *,int) |  | Curl_conn_cf_discard_all | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (Curl_easy *,connectdata *,int) |  | Curl_http2_may_switch | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (Curl_easy *,connectdata *,int) |  | Curl_http2_switch | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (Curl_easy *,connectdata *,int) |  | Curl_ssl_cfilter_add | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (Curl_sockaddr_ex *,const Curl_addrinfo *,int) |  | Curl_sock_assign_addr | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (DH *,const OSSL_PARAM[],int) |  | ossl_dh_key_fromdata | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (DSA *,const OSSL_PARAM[],int) |  | ossl_dsa_key_fromdata | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (ECX_KEY *,const OSSL_PARAM[],int) |  | ossl_ecx_key_fromdata | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (EC_KEY *,const OSSL_PARAM[],int) |  | ossl_ec_key_fromdata | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (ENGINE *,ENGINE_DYNAMIC_ID,int) |  | engine_add_dynamic_id | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (EVP_PKEY *,EVP_KEYMGMT *,int) |  | evp_keymgmt_util_export_to_provider | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (EVP_PKEY *,EVP_KEYMGMT *,int) |  | evp_keymgmt_util_find_operation_cache | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (EVP_PKEY *,EVP_PKEY *,int) |  | evp_keymgmt_util_copy | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (EVP_PKEY_CTX *,EVP_PKEY *,int) |  | EVP_PKEY_derive_set_peer_ex | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (EVP_PKEY_CTX *,const char *,int) |  | EVP_PKEY_CTX_set1_pbe_pass | 1 |
-| atl.cpp:927:17:927:25 | CopyChars | (EVP_PKEY_CTX *,const char *,int) |  | EVP_PKEY_CTX_set1_pbe_pass | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (EVP_PKEY_CTX *,const unsigned char *,int) |  | EVP_PKEY_CTX_add1_hkdf_info | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (EVP_PKEY_CTX *,const unsigned char *,int) |  | EVP_PKEY_CTX_add1_tls1_prf_seed | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (EVP_PKEY_CTX *,const unsigned char *,int) |  | EVP_PKEY_CTX_set1_hkdf_key | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (EVP_PKEY_CTX *,const unsigned char *,int) |  | EVP_PKEY_CTX_set1_hkdf_salt | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (EVP_PKEY_CTX *,const unsigned char *,int) |  | EVP_PKEY_CTX_set1_scrypt_salt | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (EVP_PKEY_CTX *,const unsigned char *,int) |  | EVP_PKEY_CTX_set1_tls1_prf_secret | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (EVP_PKEY_CTX *,const unsigned char *,int) |  | EVP_PKEY_CTX_set_mac_key | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (EVP_PKEY_CTX *,const void *,int) |  | EVP_PKEY_CTX_set1_id | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (EVP_PKEY_CTX *,int *,int) |  | EVP_PKEY_CTX_set0_keygen_info | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (FFC_PARAMS *,unsigned int,int) |  | ossl_ffc_params_enable_flags | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (FILE *,_IO_marker *,int) |  | _IO_seekmark | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (FILE *,_IO_marker *,int) |  | _IO_seekwmark | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (FILE *,__FILE *,int) |  | fwide | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (FILE *,const DSA *,int) |  | DSA_print_fp | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (FILE *,const RSA *,int) |  | RSA_print_fp | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (FILE *,off64_t,int) |  | _IO_cookie_seek | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (FILE *,rule *,int) |  | RulePrint | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (FTS *,FTSENT *,int) |  | fts_set | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (Jim_Interp *,Jim_Obj *,int) |  | Jim_GetCommand | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (Jim_Interp *,Jim_Obj *,int) |  | Jim_GetGlobalVariable | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (Jim_Interp *,Jim_Obj *,int) |  | Jim_GetVariable | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (Jim_Interp *,Jim_Obj *,int) |  | Jim_ListGetIndex | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (Jim_Interp *,Jim_Obj *,int) |  | Jim_UnsetVariable | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (Jim_Interp *,Jim_Obj *const *,int) |  | Jim_NewDictObj | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (Jim_Interp *,Jim_Obj *const *,int) |  | Jim_NewListObj | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (Jim_Interp *,char *,int) |  | Jim_NewStringObjNoAlloc | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (Jim_Interp *,const char *,int) |  | Jim_GetGlobalVariableStr | 1 |
-| atl.cpp:927:17:927:25 | CopyChars | (Jim_Interp *,const char *,int) |  | Jim_GetGlobalVariableStr | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (Jim_Interp *,const char *,int) |  | Jim_GetVariableStr | 1 |
-| atl.cpp:927:17:927:25 | CopyChars | (Jim_Interp *,const char *,int) |  | Jim_GetVariableStr | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (Jim_Interp *,const char *,int) |  | Jim_MakeTempFile | 1 |
-| atl.cpp:927:17:927:25 | CopyChars | (Jim_Interp *,const char *,int) |  | Jim_MakeTempFile | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (Jim_Interp *,const char *,int) |  | Jim_NewStringObj | 1 |
-| atl.cpp:927:17:927:25 | CopyChars | (Jim_Interp *,const char *,int) |  | Jim_NewStringObj | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (Jim_Interp *,const char *,int) |  | Jim_NewStringObjUtf8 | 1 |
-| atl.cpp:927:17:927:25 | CopyChars | (Jim_Interp *,const char *,int) |  | Jim_NewStringObjUtf8 | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (LIBSSH2_SESSION *,int,int) |  | libssh2_session_flag | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (LIBSSH2_SFTP_HANDLE *,LIBSSH2_SFTP_ATTRIBUTES *,int) |  | libssh2_sftp_fstat_ex | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (OCSP_BASICRESP *,OCSP_CERTID *,int) |  | OCSP_resp_find | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (OCSP_BASICRESP *,X509_EXTENSION *,int) |  | OCSP_BASICRESP_add_ext | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (OCSP_BASICRESP *,const ASN1_OBJECT *,int) |  | OCSP_BASICRESP_get_ext_by_OBJ | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (OCSP_BASICRESP *,int,int) |  | OCSP_BASICRESP_get_ext_by_NID | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (OCSP_BASICRESP *,int,int) |  | OCSP_BASICRESP_get_ext_by_critical | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (OCSP_ONEREQ *,X509_EXTENSION *,int) |  | OCSP_ONEREQ_add_ext | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (OCSP_ONEREQ *,const ASN1_OBJECT *,int) |  | OCSP_ONEREQ_get_ext_by_OBJ | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (OCSP_ONEREQ *,int,int) |  | OCSP_ONEREQ_get_ext_by_NID | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (OCSP_ONEREQ *,int,int) |  | OCSP_ONEREQ_get_ext_by_critical | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (OCSP_REQUEST *,X509_EXTENSION *,int) |  | OCSP_REQUEST_add_ext | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (OCSP_REQUEST *,const ASN1_OBJECT *,int) |  | OCSP_REQUEST_get_ext_by_OBJ | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (OCSP_REQUEST *,int,int) |  | OCSP_REQUEST_get_ext_by_NID | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (OCSP_REQUEST *,int,int) |  | OCSP_REQUEST_get_ext_by_critical | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (OCSP_SINGLERESP *,X509_EXTENSION *,int) |  | OCSP_SINGLERESP_add_ext | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (OCSP_SINGLERESP *,const ASN1_OBJECT *,int) |  | OCSP_SINGLERESP_get_ext_by_OBJ | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (OCSP_SINGLERESP *,int,int) |  | OCSP_SINGLERESP_get_ext_by_NID | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (OCSP_SINGLERESP *,int,int) |  | OCSP_SINGLERESP_get_ext_by_critical | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (OPENSSL_STACK *,const void *,int) |  | OPENSSL_sk_insert | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (OSSL_CMP_CTX *,const unsigned char *,int) |  | OSSL_CMP_CTX_set1_referenceValue | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (OSSL_CMP_CTX *,const unsigned char *,int) |  | OSSL_CMP_CTX_set1_secretValue | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (OSSL_CMP_CTX *,int,int) |  | OSSL_CMP_CTX_set_option | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (OSSL_LIB_CTX *,const char *,int) |  | EC_GROUP_new_by_curve_name_ex | 1 |
-| atl.cpp:927:17:927:25 | CopyChars | (OSSL_LIB_CTX *,const char *,int) |  | EC_GROUP_new_by_curve_name_ex | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (OSSL_LIB_CTX *,const char *,int) |  | EC_KEY_new_by_curve_name_ex | 1 |
-| atl.cpp:927:17:927:25 | CopyChars | (OSSL_LIB_CTX *,const char *,int) |  | EC_KEY_new_by_curve_name_ex | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (OSSL_LIB_CTX *,const char *,int) |  | OSSL_PROVIDER_try_load | 1 |
-| atl.cpp:927:17:927:25 | CopyChars | (OSSL_LIB_CTX *,const char *,int) |  | OSSL_PROVIDER_try_load | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (OSSL_LIB_CTX *,const char *,int) |  | ossl_ml_dsa_key_new | 1 |
-| atl.cpp:927:17:927:25 | CopyChars | (OSSL_LIB_CTX *,const char *,int) |  | ossl_ml_dsa_key_new | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (OSSL_LIB_CTX *,const char *,int) |  | ossl_ml_kem_key_new | 1 |
-| atl.cpp:927:17:927:25 | CopyChars | (OSSL_LIB_CTX *,const char *,int) |  | ossl_ml_kem_key_new | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (OSSL_LIB_CTX *,const char *,int) |  | ossl_parse_query | 1 |
-| atl.cpp:927:17:927:25 | CopyChars | (OSSL_LIB_CTX *,const char *,int) |  | ossl_parse_query | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (OSSL_LIB_CTX *,const char *,int) |  | ossl_property_name | 1 |
-| atl.cpp:927:17:927:25 | CopyChars | (OSSL_LIB_CTX *,const char *,int) |  | ossl_property_name | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (OSSL_LIB_CTX *,const char *,int) |  | ossl_property_value | 1 |
-| atl.cpp:927:17:927:25 | CopyChars | (OSSL_LIB_CTX *,const char *,int) |  | ossl_property_value | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (OSSL_PROVIDER *,OSSL_PROVIDER **,int) |  | ossl_provider_add_to_store | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (OSSL_QRL_ENC_LEVEL_SET *,uint32_t,int) |  | ossl_qrl_enc_level_set_get | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (PKCS7 *,stack_st_X509 *,int) |  | PKCS7_get0_signers | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (POLICYINFO *,const ASN1_OBJECT *,int) |  | ossl_policy_data_new | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (PROV_CTX *,const char *,int) |  | ossl_prov_ctx_get_bool_param | 1 |
-| atl.cpp:927:17:927:25 | CopyChars | (PROV_CTX *,const char *,int) |  | ossl_prov_ctx_get_bool_param | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (PROV_CTX *,const char *,int) |  | ossl_prov_ml_dsa_new | 1 |
-| atl.cpp:927:17:927:25 | CopyChars | (PROV_CTX *,const char *,int) |  | ossl_prov_ml_dsa_new | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (PROV_CTX *,const char *,int) |  | ossl_prov_ml_kem_new | 1 |
-| atl.cpp:927:17:927:25 | CopyChars | (PROV_CTX *,const char *,int) |  | ossl_prov_ml_kem_new | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (QLOG *,uint32_t,int) |  | ossl_qlog_set_event_type_enabled | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (QUIC_RXFC *,uint64_t,int) |  | ossl_quic_rxfc_on_rx_stream_frame | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (QUIC_STREAM_ITER *,QUIC_STREAM_MAP *,int) |  | ossl_quic_stream_iter_init | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (QUIC_STREAM_MAP *,uint64_t,int) |  | ossl_quic_stream_map_alloc | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (RSA *,const OSSL_PARAM[],int) |  | ossl_rsa_fromdata | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (SSL *,const unsigned char *,int) |  | SSL_use_certificate_ASN1 | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (SSL *,const void *,int) |  | SSL_write | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (SSL *,void *,int) |  | SSL_peek | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (SSL *,void *,int) |  | SSL_read | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (SSL *,void *,int) |  | SSL_set_session_ticket_ext | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (SSL_CIPHER *,const SSL_CIPHER *,int) |  | OBJ_bsearch_ssl_cipher_id | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (SSL_CONNECTION *,PACKET *,int) |  | ssl_cache_cipherlist | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (SSL_CONNECTION *,WPACKET *,int) |  | dtls1_close_construct_packet | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (SSL_CONNECTION *,WPACKET *,int) |  | dtls1_set_handshake_header | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (SSL_CONNECTION *,WPACKET *,int) |  | tls_close_construct_packet | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (SSL_CONNECTION *,int,int) |  | ssl3_send_alert | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (TS_MSG_IMPRINT *,unsigned char *,int) |  | TS_MSG_IMPRINT_set_msg | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (TS_REQ *,X509_EXTENSION *,int) |  | TS_REQ_add_ext | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (TS_REQ *,const ASN1_OBJECT *,int) |  | TS_REQ_get_ext_by_OBJ | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (TS_REQ *,int,int) |  | TS_REQ_get_ext_by_NID | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (TS_REQ *,int,int) |  | TS_REQ_get_ext_by_critical | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (TS_TST_INFO *,X509_EXTENSION *,int) |  | TS_TST_INFO_add_ext | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (TS_TST_INFO *,const ASN1_OBJECT *,int) |  | TS_TST_INFO_get_ext_by_OBJ | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (TS_TST_INFO *,int,int) |  | TS_TST_INFO_get_ext_by_NID | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (TS_TST_INFO *,int,int) |  | TS_TST_INFO_get_ext_by_critical | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (X509 *,X509_EXTENSION *,int) |  | X509_add_ext | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (X509 *,int,int) |  | X509_check_purpose | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (X509 *,int,int) |  | X509_check_trust | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (X509_CRL *,X509_EXTENSION *,int) |  | X509_CRL_add_ext | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (X509_PUBKEY *,unsigned char *,int) |  | X509_PUBKEY_set0_public_key | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (X509_REVOKED *,X509_EXTENSION *,int) |  | X509_REVOKED_add_ext | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (X509_STORE_CTX *,X509 *,int) |  | ossl_x509_check_cert_time | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (XCHAR *,const XCHAR *,int) | CSimpleStringT | CopyChars | 0 |
-| atl.cpp:927:17:927:25 | CopyChars | (XCHAR *,const XCHAR *,int) | CSimpleStringT | CopyChars | 1 |
-| atl.cpp:927:17:927:25 | CopyChars | (XCHAR *,const XCHAR *,int) | CSimpleStringT | CopyChars | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (XCHAR *,const XCHAR *,int) | CSimpleStringT | CopyCharsOverlapped | 0 |
-| atl.cpp:927:17:927:25 | CopyChars | (XCHAR *,const XCHAR *,int) | CSimpleStringT | CopyCharsOverlapped | 1 |
-| atl.cpp:927:17:927:25 | CopyChars | (XCHAR *,const XCHAR *,int) | CSimpleStringT | CopyCharsOverlapped | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (_Float128,_Float128,int) |  | __kernel_sinf128 | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (_Float128,_Float128,int) |  | __kernel_tanf128 | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (_IO_strfile *,const char *,int) |  | _IO_str_init_readonly | 1 |
-| atl.cpp:927:17:927:25 | CopyChars | (_IO_strfile *,const char *,int) |  | _IO_str_init_readonly | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (action *,FILE *,int) |  | PrintAction | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (acttab *,int,int) |  | acttab_action | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (char *,size_t,int) |  | __argz_stringify | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const ASN1_VALUE *,const ASN1_TEMPLATE *,int) |  | ossl_asn1_do_adb | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const BIGNUM *,int[],int) |  | BN_GF2m_poly2arr | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const BIGNUM *,unsigned char *,int) |  | BN_bn2binpad | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const BIGNUM *,unsigned char *,int) |  | BN_bn2lebinpad | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const BIGNUM *,unsigned char *,int) |  | BN_bn2nativepad | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const BIGNUM *,unsigned char *,int) |  | BN_signed_bn2bin | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const BIGNUM *,unsigned char *,int) |  | BN_signed_bn2lebin | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const BIGNUM *,unsigned char *,int) |  | BN_signed_bn2native | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const CMS_ContentInfo *,BIO *,int) |  | ossl_cms_DigestedData_do_final | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const CMS_SignerInfo *,const ASN1_OBJECT *,int) |  | CMS_signed_get_attr_by_OBJ | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const CMS_SignerInfo *,const ASN1_OBJECT *,int) |  | CMS_unsigned_get_attr_by_OBJ | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const CMS_SignerInfo *,int,int) |  | CMS_signed_get_attr_by_NID | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const CMS_SignerInfo *,int,int) |  | CMS_unsigned_get_attr_by_NID | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const Curl_easy *,const connectdata *,int) |  | Curl_conn_is_http2 | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const EVP_MD *,const EVP_MD *,int) |  | ossl_rsa_pss_params_create | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const EVP_PKEY *,const ASN1_OBJECT *,int) |  | EVP_PKEY_get_attr_by_OBJ | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const EVP_PKEY *,int,int) |  | EVP_PKEY_get_attr_by_NID | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const OSSL_PARAM *,BIO *,int) |  | OSSL_PARAM_print_to_bio | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const OSSL_PROVIDER *,const char *,int) |  | OSSL_PROVIDER_conf_get_bool | 1 |
-| atl.cpp:927:17:927:25 | CopyChars | (const OSSL_PROVIDER *,const char *,int) |  | OSSL_PROVIDER_conf_get_bool | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const SSL *,char *,int) |  | SSL_get_shared_ciphers | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const SSL *,int,int) |  | apps_ssl_info_callback | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const SSL_CIPHER *,char *,int) |  | SSL_CIPHER_description | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const X509 *,const ASN1_OBJECT *,int) |  | X509_get_ext_by_OBJ | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const X509 *,const stack_st_X509 *,int) |  | OSSL_ESS_signing_cert_new_init | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const X509 *,int,int) |  | X509_get_ext_by_NID | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const X509 *,int,int) |  | X509_get_ext_by_critical | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const X509_ACERT *,const ASN1_OBJECT *,int) |  | X509_ACERT_get_attr_by_OBJ | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const X509_ACERT *,int,int) |  | X509_ACERT_get_attr_by_NID | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const X509_CRL *,const ASN1_OBJECT *,int) |  | X509_CRL_get_ext_by_OBJ | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const X509_CRL *,const X509 *,int) |  | OSSL_CMP_CRLSTATUS_create | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const X509_CRL *,int,int) |  | X509_CRL_get_ext_by_NID | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const X509_CRL *,int,int) |  | X509_CRL_get_ext_by_critical | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const X509_NAME *,char *,int) |  | X509_NAME_oneline | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const X509_NAME *,const ASN1_OBJECT *,int) |  | X509_NAME_get_index_by_OBJ | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const X509_NAME *,int,int) |  | X509_NAME_get_index_by_NID | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const X509_REQ *,const ASN1_OBJECT *,int) |  | X509_REQ_get_attr_by_OBJ | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const X509_REQ *,int,int) |  | X509_REQ_get_attr_by_NID | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const X509_REVOKED *,const ASN1_OBJECT *,int) |  | X509_REVOKED_get_ext_by_OBJ | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const X509_REVOKED *,int,int) |  | X509_REVOKED_get_ext_by_NID | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const X509_REVOKED *,int,int) |  | X509_REVOKED_get_ext_by_critical | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const X509_SIG *,const char *,int) |  | PKCS8_decrypt | 1 |
-| atl.cpp:927:17:927:25 | CopyChars | (const X509_SIG *,const char *,int) |  | PKCS8_decrypt | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const char *,char **,int) |  | __strtol | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const char *,char **,int) |  | __strtoul | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const char *,char **,int) |  | idn2_to_ascii_8z | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const char *,const OSSL_PARAM *,int) |  | print_param_types | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const char *,const char *,int) |  | CRYPTO_strdup | 1 |
-| atl.cpp:927:17:927:25 | CopyChars | (const char *,const char *,int) |  | CRYPTO_strdup | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const char *,const char *,int) |  | __dcgettext | 1 |
-| atl.cpp:927:17:927:25 | CopyChars | (const char *,const char *,int) |  | __dcgettext | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const char *,const char *,int) |  | sqlite3_strnicmp | 1 |
-| atl.cpp:927:17:927:25 | CopyChars | (const char *,const char *,int) |  | sqlite3_strnicmp | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const char *,int,int) |  | __old_strpbrk_c2 | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const char *,long *,int) |  | Jim_StringToWide | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const char *,size_t *,int) |  | _dl_sysdep_read_whole_file | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const char *,sqlite3_filename,int) |  | sqlite3_uri_key | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const char *,void *,int) |  | support_readdir_check | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const char *,wordexp_t *,int) |  | wordexp | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const cmsghdr *,uint8_t **,int) |  | inet6_option_find | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const stack_st_X509_ATTRIBUTE *,const ASN1_OBJECT *,int) |  | X509at_get_attr_by_OBJ | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const stack_st_X509_ATTRIBUTE *,int,int) |  | X509at_get_attr_by_NID | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const stack_st_X509_EXTENSION *,const ASN1_OBJECT *,int) |  | X509v3_get_ext_by_OBJ | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const stack_st_X509_EXTENSION *,int,int) |  | X509v3_get_ext_by_NID | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const stack_st_X509_EXTENSION *,int,int) |  | X509v3_get_ext_by_critical | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const uint8_t *,uint8_t **,int) |  | idn2_lookup_u8 | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const unsigned char **,unsigned int,int) |  | ossl_b2i_DSA_after_header | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const unsigned char **,unsigned int,int) |  | ossl_b2i_RSA_after_header | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const void *,const void *,int) |  | ossl_is_partially_overlapping | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const void *,socklen_t,int) |  | res_gethostbyaddr | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const wchar_t *,wchar_t **,int) |  | __wcstol | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (const wchar_t *,wchar_t **,int) |  | __wcstoul | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (curl_mimepart *,curl_mime *,int) |  | Curl_mime_set_subparts | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (curl_mimepart *,curl_slist *,int) |  | curl_mime_headers | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (database_dyn *,size_t,int) |  | mempool_alloc | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (database_dyn *,time_t,int) |  | prune_cache | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (double,double,int) |  | __kernel_standard | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (float,float,int) |  | __kernel_standard_f | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (gconv_spec *,__gconv_t *,int) |  | __gconv_open | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (gzFile,char *,int) |  | gzgets | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (gzFile,int,int) |  | gzsetparams | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (gzFile,off64_t,int) |  | gzseek64 | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (gzFile,off_t,int) |  | gzseek | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (int *,short *,int) |  | __lll_lock_elision | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (int,BIO_ADDR *,int) |  | BIO_accept_ex | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (int,int,int) |  | ASN1_object_size | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (int,int,int) |  | EVP_CIPHER_meth_new | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (long double,long double,int) |  | __kernel_sinl | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (long double,long double,int) |  | __kernel_standard_l | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (long double,long double,int) |  | __kernel_tanl | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (mp_srcptr,int,int) |  | __mpn_construct_double | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (mp_srcptr,int,int) |  | __mpn_construct_float | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (mp_srcptr,int,int) |  | __mpn_construct_float128 | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (regex_t *,const char *,int) |  | jim_regcomp | 1 |
-| atl.cpp:927:17:927:25 | CopyChars | (regex_t *,const char *,int) |  | jim_regcomp | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (requestlist *,requestlist *,int) |  | __aio_remove_request | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (sqlite3 *,const char *,int) |  | sqlite3_overload_function | 1 |
-| atl.cpp:927:17:927:25 | CopyChars | (sqlite3 *,const char *,int) |  | sqlite3_overload_function | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (sqlite3 *,int,int) |  | sqlite3_limit | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (sqlite3_context *,const char *,int) |  | sqlite3_result_error | 1 |
-| atl.cpp:927:17:927:25 | CopyChars | (sqlite3_context *,const char *,int) |  | sqlite3_result_error | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (sqlite3_context *,const void *,int) |  | sqlite3_result_error16 | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (sqlite3_index_info *,int,int) |  | sqlite3_vtab_in | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (sqlite3_stmt *,int,int) |  | sqlite3_bind_int | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (sqlite3_stmt *,int,int) |  | sqlite3_bind_zeroblob | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (sqlite3_stmt *,int,int) |  | sqlite3_stmt_status | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (sqlite3_str *,const char *,int) |  | sqlite3_str_append | 1 |
-| atl.cpp:927:17:927:25 | CopyChars | (sqlite3_str *,const char *,int) |  | sqlite3_str_append | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (sqlite3expert *,int,int) |  | sqlite3_expert_report | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (stack_st_ASN1_UTF8STRING *,const char *,int) |  | ossl_cmp_sk_ASN1_UTF8STRING_push_str | 1 |
-| atl.cpp:927:17:927:25 | CopyChars | (stack_st_ASN1_UTF8STRING *,const char *,int) |  | ossl_cmp_sk_ASN1_UTF8STRING_push_str | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (stack_st_X509 **,X509 *,int) |  | ossl_x509_add_cert_new | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (stack_st_X509 **,stack_st_X509 *,int) |  | ossl_x509_add_certs_new | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (stack_st_X509 *,ASIdentifiers *,int) |  | X509v3_asid_validate_resource_set | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (stack_st_X509 *,IPAddrBlocks *,int) |  | X509v3_addr_validate_resource_set | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (stack_st_X509 *,X509 *,int) |  | X509_add_cert | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (stack_st_X509 *,stack_st_X509 *,int) |  | X509_add_certs | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (stack_st_X509_ALGOR **,int,int) |  | CMS_add_simple_smimecap | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (stack_st_X509_ALGOR *,int,int) |  | PKCS7_simple_smimecap | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (stack_st_X509_EXTENSION **,X509_EXTENSION *,int) |  | X509v3_add_ext | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (td_thragent_t *,uint32_t *,int) |  | _td_check_sizeof | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (uint8_t[56],const gf,int) |  | gf_serialize | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (uint32_t *,SSL_CONNECTION *,int) |  | ssl_set_sig_mask | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (unsigned char *,const char *,int) |  | data_string | 1 |
-| atl.cpp:927:17:927:25 | CopyChars | (unsigned char *,const char *,int) |  | data_string | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (unsigned char *,const unsigned char *,int) |  | EVP_DecodeBlock | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (unsigned char *,const unsigned char *,int) |  | EVP_EncodeBlock | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (unsigned char *,uint64_t,int) |  | ossl_i2c_uint64_int | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (unsigned int,const char *,int) |  | _IO_adjust_column | 1 |
-| atl.cpp:927:17:927:25 | CopyChars | (unsigned int,const char *,int) |  | _IO_adjust_column | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (unsigned int,const wchar_t *,int) |  | _IO_adjust_wcolumn | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (unsigned int,int,int) |  | ossl_blob_length | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (unsigned long *,const BIGNUM *,int) |  | bn_copy_words | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (unsigned long *,const unsigned long *,int) |  | bn_sqr_words | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (uv__io_t *,uv__io_cb,int) |  | uv__io_init | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (uv_loop_t *,uv_fs_t *,int) |  | uv__iou_fs_read_or_write | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (uv_loop_t *,uv_pipe_t *,int) |  | uv_pipe_init | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (uv_loop_t *,uv_poll_t *,int) |  | uv_poll_init | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (uv_signal_t *,uv_signal_cb,int) |  | uv_signal_start | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (uv_signal_t *,uv_signal_cb,int) |  | uv_signal_start_oneshot | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (uv_stream_t *,int,int) |  | uv__stream_open | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (void *,cmsghdr **,int) |  | inet6_option_init | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (void *,const char *,int) |  | CRYPTO_secure_free | 1 |
-| atl.cpp:927:17:927:25 | CopyChars | (void *,const char *,int) |  | CRYPTO_secure_free | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (void *,curl_off_t,int) |  | tool_mime_stdin_seek | 2 |
-| atl.cpp:927:17:927:25 | CopyChars | (void *,socklen_t,int) |  | inet6_opt_finish | 2 |
-| atl.cpp:928:17:928:25 | CopyChars | (BIGNUM *,const BIGNUM *,const BIGNUM *,int) |  | ossl_rsa_check_pminusq_diff | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (BIGNUM *,int,int,int) |  | BN_bntest_rand | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (BIGNUM *,int,int,int) |  | BN_priv_rand | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (BIGNUM *,int,int,int) |  | BN_pseudo_rand | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (BIGNUM *,int,int,int) |  | BN_rand | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (BIO *,CMS_ContentInfo *,BIO *,int) |  | PEM_write_bio_CMS_stream | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (BIO *,CMS_ContentInfo *,BIO *,int) |  | SMIME_write_CMS | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (BIO *,CMS_ContentInfo *,BIO *,int) |  | i2d_CMS_bio_stream | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (BIO *,PKCS7 *,BIO *,int) |  | PEM_write_bio_PKCS7_stream | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (BIO *,PKCS7 *,BIO *,int) |  | SMIME_write_PKCS7 | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (BIO *,PKCS7 *,BIO *,int) |  | i2d_PKCS7_bio_stream | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (BIO *,X509_EXTENSION *,unsigned long,int) |  | X509V3_EXT_print | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (BIO *,const char *,const OCSP_REQUEST *,int) |  | OCSP_sendreq_new | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (BIO *,const unsigned char *,long,int) |  | ASN1_parse | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (BIO *,int,const ASN1_TYPE *,int) |  | ossl_print_attribute_value | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (BIO *,void *,int,int) |  | app_http_tls_cb | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (BrotliDistanceParams *,uint32_t,uint32_t,int) |  | BrotliInitDistanceParams | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (CERT *,const int *,size_t,int) |  | tls1_set_sigalgs | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (CERT *,const uint16_t *,size_t,int) |  | tls1_set_raw_sigalgs | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (DH *,OSSL_PARAM_BLD *,OSSL_PARAM[],int) |  | ossl_dh_key_todata | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (DSO *,const char *,DSO_METHOD *,int) |  | DSO_load | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (ENGINE *,const char *,const char *,int) |  | ENGINE_ctrl_cmd_string | 2 |
-| atl.cpp:928:17:928:25 | CopyChars | (ENGINE *,const char *,const char *,int) |  | ENGINE_ctrl_cmd_string | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (ENGINE_TABLE **,int,const char *,int) |  | ossl_engine_table_select | 2 |
-| atl.cpp:928:17:928:25 | CopyChars | (ENGINE_TABLE **,int,const char *,int) |  | ossl_engine_table_select | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (EVP_PKEY_CTX *,const char *,int,int) |  | app_keygen | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (FFC_PARAMS *,const unsigned char *,size_t,int) |  | ossl_ffc_params_set_validate_params | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (FILE *,char *,char *,int) |  | _IO_setb | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (FILE *,const char *,const char *,int) |  | _IO_new_file_fopen | 2 |
-| atl.cpp:928:17:928:25 | CopyChars | (FILE *,const char *,const char *,int) |  | _IO_new_file_fopen | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (FILE *,lemon *,int *,int) |  | print_stack_union | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (FILE *,mntent *,char *,int) |  | __getmntent_r | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (FILE *,off64_t,int,int) |  | _IO_file_seekoff_mmap | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (FILE *,off64_t,int,int) |  | _IO_new_file_seekoff | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (FILE *,off64_t,int,int) |  | _IO_str_seekoff | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (FILE *,off64_t,int,int) |  | _IO_wfile_seekoff | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (FILE *,off64_t,int,int) |  | _IO_wstr_seekoff | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (FILE *,wchar_t *,wchar_t *,int) |  | _IO_wsetb | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (Jim_Interp *,Jim_Obj *,Jim_Obj **,int) |  | Jim_SubstObj | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (Jim_Interp *,Jim_Obj *,Jim_Obj *,int) |  | Jim_ScanString | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (Jim_Interp *,Jim_Obj *,const char *,int) |  | Jim_AppendString | 2 |
-| atl.cpp:928:17:928:25 | CopyChars | (Jim_Interp *,Jim_Obj *,const char *,int) |  | Jim_AppendString | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (Jim_Interp *,Jim_Obj *,const char *,int) |  | Jim_ListJoin | 2 |
-| atl.cpp:928:17:928:25 | CopyChars | (Jim_Interp *,Jim_Obj *,const char *,int) |  | Jim_ListJoin | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (LIBSSH2_SESSION *,char **,int *,int) |  | libssh2_session_last_error | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (LIBSSH2_SESSION *,const char *,const char *,int) |  | libssh2_channel_direct_streamlocal_ex | 2 |
-| atl.cpp:928:17:928:25 | CopyChars | (LIBSSH2_SESSION *,const char *,const char *,int) |  | libssh2_channel_direct_streamlocal_ex | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (LIBSSH2_SESSION *,int,const char *,int) |  | _libssh2_error_flags | 2 |
-| atl.cpp:928:17:928:25 | CopyChars | (LIBSSH2_SESSION *,int,const char *,int) |  | _libssh2_error_flags | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (OSSL_CMP_CTX *,const OSSL_CMP_MSG *,ossl_cmp_allow_unprotected_cb_t,int) |  | ossl_cmp_msg_check_update | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (OSSL_CMP_CTX *,const OSSL_CMP_PKISI *,const OSSL_CRMF_CERTID *,int) |  | ossl_cmp_rp_new | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (OSSL_LIB_CTX *,const char *,OSSL_PARAM *,int) |  | OSSL_PROVIDER_try_load_ex | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (OSSL_PARAM_BLD *,OSSL_PARAM *,const char *,int) |  | ossl_param_build_set_int | 2 |
-| atl.cpp:928:17:928:25 | CopyChars | (OSSL_PARAM_BLD *,OSSL_PARAM *,const char *,int) |  | ossl_param_build_set_int | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (RSA *,OSSL_PARAM_BLD *,OSSL_PARAM[],int) |  | ossl_rsa_todata | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (SIPHASH *,const unsigned char *,int,int) |  | SipHash_Init | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (SLH_DSA_KEY *,const OSSL_PARAM *,const OSSL_PARAM[],int) |  | ossl_slh_dsa_key_fromdata | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (SSL *,SSL_CTX *,const SSL_METHOD *,int) |  | ossl_ssl_init | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (SSL_CONNECTION *,WPACKET *,CERT_PKEY *,int) |  | ssl3_output_cert_chain | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (SSL_CONNECTION *,stack_st_X509 *,X509 *,int) |  | ssl_security_cert_chain | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (SXNET **,ASN1_INTEGER *,const char *,int) |  | SXNET_add_id_INTEGER | 2 |
-| atl.cpp:928:17:928:25 | CopyChars | (SXNET **,ASN1_INTEGER *,const char *,int) |  | SXNET_add_id_INTEGER | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (SXNET **,const char *,const char *,int) |  | SXNET_add_id_asc | 2 |
-| atl.cpp:928:17:928:25 | CopyChars | (SXNET **,const char *,const char *,int) |  | SXNET_add_id_asc | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (SXNET **,unsigned long,const char *,int) |  | SXNET_add_id_ulong | 2 |
-| atl.cpp:928:17:928:25 | CopyChars | (SXNET **,unsigned long,const char *,int) |  | SXNET_add_id_ulong | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (TS_RESP_CTX *,int,int,int) |  | TS_RESP_CTX_set_accuracy | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (UI *,UI_STRING *,const char *,int) |  | UI_set_result_ex | 2 |
-| atl.cpp:928:17:928:25 | CopyChars | (UI *,UI_STRING *,const char *,int) |  | UI_set_result_ex | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (X509_NAME *,const X509_NAME_ENTRY *,int,int) |  | X509_NAME_add_entry | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (X509_NAME_ENTRY *,int,const unsigned char *,int) |  | X509_NAME_ENTRY_set_data | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (X509_STORE_CTX *,int,int,int) |  | X509_STORE_CTX_purpose_inherit | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (XCHAR *,size_t,const XCHAR *,int) | CSimpleStringT | CopyChars | 0 |
-| atl.cpp:928:17:928:25 | CopyChars | (XCHAR *,size_t,const XCHAR *,int) | CSimpleStringT | CopyChars | 1 |
-| atl.cpp:928:17:928:25 | CopyChars | (XCHAR *,size_t,const XCHAR *,int) | CSimpleStringT | CopyChars | 2 |
-| atl.cpp:928:17:928:25 | CopyChars | (XCHAR *,size_t,const XCHAR *,int) | CSimpleStringT | CopyChars | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (_Float128,_Float128,_Float128,int) |  | __lgamma_productf128 | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (bufq *,bufc_pool *,size_t,int) |  | Curl_bufq_initp | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (bufq *,size_t,size_t,int) |  | Curl_bufq_init2 | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (char *,int,const ASN1_OBJECT *,int) |  | OBJ_obj2txt | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (cmsghdr *,const uint8_t *,int,int) |  | inet6_option_append | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (cmsghdr *,int,int,int) |  | inet6_option_alloc | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (const DH *,unsigned char **,size_t,int) |  | ossl_dh_key2buf | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (const EVP_MD *,const X509 *,const stack_st_X509 *,int) |  | OSSL_ESS_signing_cert_v2_new_init | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (const X509_NAME *,const ASN1_OBJECT *,char *,int) |  | X509_NAME_get_text_by_OBJ | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (const X509_NAME *,int,char *,int) |  | X509_NAME_get_text_by_NID | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (const char *,BIO *,BIO *,int) |  | X509_CRL_load_http | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (const char *,BIO *,BIO *,int) |  | X509_load_http | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (const char *,const char *,char **,int) |  | idn2_register_ul | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (const char *,const char *,const char *,int) |  | OSSL_HTTP_adapt_proxy | 2 |
-| atl.cpp:928:17:928:25 | CopyChars | (const char *,const char *,const char *,int) |  | OSSL_HTTP_adapt_proxy | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (const char *,int,int,int) |  | __old_strpbrk_c3 | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (const char *,int,int,int) |  | append_str | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (const char *,size_t,const char *,int) |  | CRYPTO_strndup | 1 |
-| atl.cpp:928:17:928:25 | CopyChars | (const char *,size_t,const char *,int) |  | CRYPTO_strndup | 2 |
-| atl.cpp:928:17:928:25 | CopyChars | (const char *,size_t,const char *,int) |  | CRYPTO_strndup | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (const char *,sqlite3_filename,const char *,int) |  | sqlite3_uri_boolean | 2 |
-| atl.cpp:928:17:928:25 | CopyChars | (const char *,sqlite3_filename,const char *,int) |  | sqlite3_uri_boolean | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (const char *,u_char *,unsigned char *,int) |  | inet_nsap_addr | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (const uint8_t *,const uint8_t *,uint8_t **,int) |  | idn2_register_u8 | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (const unsigned char *,int,unsigned char *,int) |  | ___res_send | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (const unsigned char *,unsigned char *,RC2_KEY *,int) |  | RC2_ecb_encrypt | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (const unsigned char *,unsigned char *,const BF_KEY *,int) |  | BF_ecb_encrypt | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (const unsigned char *,unsigned char *,const CAST_KEY *,int) |  | CAST_ecb_encrypt | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (const unsigned char *,unsigned char *,const SEED_KEY_SCHEDULE *,int) |  | SEED_ecb_encrypt | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (const void *,size_t,const char *,int) |  | CRYPTO_memdup | 1 |
-| atl.cpp:928:17:928:25 | CopyChars | (const void *,size_t,const char *,int) |  | CRYPTO_memdup | 2 |
-| atl.cpp:928:17:928:25 | CopyChars | (const void *,size_t,const char *,int) |  | CRYPTO_memdup | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (deflate_state *,charf *,ulg,int) |  | _tr_flush_block | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (deflate_state *,charf *,ulg,int) |  | _tr_stored_block | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (double,double,double,int) |  | __lgamma_product | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (int,ENGINE *,const unsigned char *,int) |  | EVP_PKEY_new_mac_key | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (int,const char *,const timespec[2],int) |  | __utimensat | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (int,const void *,const char *,int) |  | Curl_ip2addr | 2 |
-| atl.cpp:928:17:928:25 | CopyChars | (int,const void *,const char *,int) |  | Curl_ip2addr | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (int,int *,int *,int) |  | sqlite3_status | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (int,int,const unsigned char *,int) |  | PKCS5_pbe_set | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (int,sockaddr *,socklen_t *,int) |  | xaccept4 | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (int,sqlite3_int64 *,sqlite3_int64 *,int) |  | sqlite3_status64 | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (link_map *,r_scope_elem *[],int,int) |  | _dl_relocate_object | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (link_map *,r_scope_elem *[],int,int) |  | _dl_relocate_object_no_relro | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (long double,long double,long double,int) |  | __lgamma_productl | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (nghttp2_bufs *,nghttp2_frame_hd *,size_t,int) |  | nghttp2_frame_add_pad | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (nghttp2_priority_spec *,int32_t,int32_t,int) |  | nghttp2_priority_spec_init | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (nghttp2_session *,int32_t,const nghttp2_extpri *,int) |  | nghttp2_session_change_extpri_stream_priority | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (nghttp2_session *,nghttp2_stream *,size_t,int) |  | nghttp2_session_update_recv_stream_window_size | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (sqlite3_blob *,const void *,int,int) |  | sqlite3_blob_write | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (sqlite3_blob *,void *,int,int) |  | sqlite3_blob_read | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (ssl_peer *,Curl_cfilter *,const char *,int) |  | Curl_ssl_peer_init | 2 |
-| atl.cpp:928:17:928:25 | CopyChars | (ssl_peer *,Curl_cfilter *,const char *,int) |  | Curl_ssl_peer_init | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (stack_st_PKCS12_SAFEBAG **,int,const unsigned char *,int) |  | PKCS12_add_secret | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (uint8_t *,unsigned char *,uint64_t,int) |  | ossl_quic_vlint_encode_n | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (unsigned char **,X509_ALGOR *,ASN1_OCTET_STRING *,int) |  | CMS_SharedInfo_encode | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (unsigned char *,int,const char *,int) |  | a2d_ASN1_OBJECT | 2 |
-| atl.cpp:928:17:928:25 | CopyChars | (unsigned char *,int,const char *,int) |  | a2d_ASN1_OBJECT | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (unsigned char *,int,const unsigned char *,int) |  | RSA_padding_add_PKCS1_type_1 | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (unsigned char *,int,const unsigned char *,int) |  | RSA_padding_add_PKCS1_type_2 | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (unsigned char *,int,const unsigned char *,int) |  | RSA_padding_add_X931 | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (unsigned char *,int,const unsigned char *,int) |  | RSA_padding_add_none | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (unsigned long *,unsigned long *,unsigned long *,int) |  | bn_mul_low_normal | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (unsigned long long,char *,unsigned int,int) |  | _itoa | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (unsigned long,BIGNUM *,BIGNUM *,int) |  | BN_consttime_swap | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (unsigned long,char *,unsigned int,int) |  | _fitoa_word | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (unsigned long,char *,unsigned int,int) |  | _itoa_word | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (uv_loop_t *,uv_fs_t *,int,int) |  | uv__iou_fs_statx | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (uv_loop_t *,uv_udp_t *,unsigned int,int) |  | uv__udp_init_ex | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (void *,const ASN1_ITEM *,int,int) |  | PKCS12_item_pack_safebag | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (void *,size_t,const char *,int) |  | CRYPTO_secure_clear_free | 1 |
-| atl.cpp:928:17:928:25 | CopyChars | (void *,size_t,const char *,int) |  | CRYPTO_secure_clear_free | 2 |
-| atl.cpp:928:17:928:25 | CopyChars | (void *,size_t,const char *,int) |  | CRYPTO_secure_clear_free | 3 |
-| atl.cpp:928:17:928:25 | CopyChars | (void *,socklen_t,int,int) |  | inet6_rth_init | 3 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (ASN1_BIT_STRING *,int,int) |  | ASN1_BIT_STRING_set_bit | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (ASN1_BIT_STRING *,unsigned char *,int) |  | ASN1_BIT_STRING_set | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (ASN1_OCTET_STRING **,const unsigned char *,int) |  | ossl_cmp_asn1_octet_string_set1_bytes | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (ASN1_OCTET_STRING *,const unsigned char *,int) |  | ASN1_OCTET_STRING_set | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (ASN1_STRING *,const void *,int) |  | ASN1_STRING_set | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (ASN1_STRING *,void *,int) |  | ASN1_STRING_set0 | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (ASN1_TIME *,tm *,int) |  | ossl_asn1_time_from_tm | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (ASN1_TYPE *,unsigned char *,int) |  | ASN1_TYPE_set_octetstring | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (ASN1_VALUE **,const ASN1_ITEM *,int) |  | ossl_asn1_item_embed_free | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (ASN1_VALUE **,const ASN1_ITEM *,int) |  | ossl_asn1_primitive_free | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (BIGNUM *,const BIGNUM *,int) |  | BN_lshift | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (BIGNUM *,const BIGNUM *,int) |  | BN_rshift | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (BIGNUM *,const BIGNUM *,int) |  | BN_with_flags | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (BIGNUM *,const BIGNUM *,int) |  | bn_lshift_fixed_top | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (BIGNUM *,const BIGNUM *,int) |  | bn_rshift_fixed_top | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (BIGNUM *,const unsigned long *,int) |  | bn_set_static_words | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (BIGNUM *,const unsigned long *,int) |  | bn_set_words | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (BIO *,BIO *,int) |  | OSSL_HTTP_REQ_CTX_new | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (BIO *,BIO *,int) |  | SMIME_crlf_copy | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (BIO *,GENERAL_NAMES *,int) |  | OSSL_GENERAL_NAMES_print | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (BIO *,char *,int) |  | BIO_get_line | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (BIO *,const DSA *,int) |  | DSA_print | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (BIO *,const RSA *,int) |  | RSA_print | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (CERT *,X509_STORE **,int) |  | ssl_cert_get_cert_store | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (CRYPTO_THREAD_ROUTINE,void *,int) |  | ossl_crypto_thread_native_start | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (Curl_easy *,connectdata *,int) |  | Curl_conn_cf_discard_all | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (Curl_easy *,connectdata *,int) |  | Curl_http2_may_switch | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (Curl_easy *,connectdata *,int) |  | Curl_http2_switch | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (Curl_easy *,connectdata *,int) |  | Curl_ssl_cfilter_add | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (Curl_sockaddr_ex *,const Curl_addrinfo *,int) |  | Curl_sock_assign_addr | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (DH *,const OSSL_PARAM[],int) |  | ossl_dh_key_fromdata | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (DSA *,const OSSL_PARAM[],int) |  | ossl_dsa_key_fromdata | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (ECX_KEY *,const OSSL_PARAM[],int) |  | ossl_ecx_key_fromdata | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (EC_KEY *,const OSSL_PARAM[],int) |  | ossl_ec_key_fromdata | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (ENGINE *,ENGINE_DYNAMIC_ID,int) |  | engine_add_dynamic_id | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (EVP_PKEY *,EVP_KEYMGMT *,int) |  | evp_keymgmt_util_export_to_provider | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (EVP_PKEY *,EVP_KEYMGMT *,int) |  | evp_keymgmt_util_find_operation_cache | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (EVP_PKEY *,EVP_PKEY *,int) |  | evp_keymgmt_util_copy | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (EVP_PKEY_CTX *,EVP_PKEY *,int) |  | EVP_PKEY_derive_set_peer_ex | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (EVP_PKEY_CTX *,const char *,int) |  | EVP_PKEY_CTX_set1_pbe_pass | 1 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (EVP_PKEY_CTX *,const char *,int) |  | EVP_PKEY_CTX_set1_pbe_pass | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (EVP_PKEY_CTX *,const unsigned char *,int) |  | EVP_PKEY_CTX_add1_hkdf_info | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (EVP_PKEY_CTX *,const unsigned char *,int) |  | EVP_PKEY_CTX_add1_tls1_prf_seed | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (EVP_PKEY_CTX *,const unsigned char *,int) |  | EVP_PKEY_CTX_set1_hkdf_key | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (EVP_PKEY_CTX *,const unsigned char *,int) |  | EVP_PKEY_CTX_set1_hkdf_salt | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (EVP_PKEY_CTX *,const unsigned char *,int) |  | EVP_PKEY_CTX_set1_scrypt_salt | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (EVP_PKEY_CTX *,const unsigned char *,int) |  | EVP_PKEY_CTX_set1_tls1_prf_secret | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (EVP_PKEY_CTX *,const unsigned char *,int) |  | EVP_PKEY_CTX_set_mac_key | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (EVP_PKEY_CTX *,const void *,int) |  | EVP_PKEY_CTX_set1_id | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (EVP_PKEY_CTX *,int *,int) |  | EVP_PKEY_CTX_set0_keygen_info | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (FFC_PARAMS *,unsigned int,int) |  | ossl_ffc_params_enable_flags | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (FILE *,_IO_marker *,int) |  | _IO_seekmark | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (FILE *,_IO_marker *,int) |  | _IO_seekwmark | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (FILE *,__FILE *,int) |  | fwide | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (FILE *,const DSA *,int) |  | DSA_print_fp | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (FILE *,const RSA *,int) |  | RSA_print_fp | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (FILE *,off64_t,int) |  | _IO_cookie_seek | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (FILE *,rule *,int) |  | RulePrint | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (FTS *,FTSENT *,int) |  | fts_set | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (Jim_Interp *,Jim_Obj *,int) |  | Jim_GetCommand | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (Jim_Interp *,Jim_Obj *,int) |  | Jim_GetGlobalVariable | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (Jim_Interp *,Jim_Obj *,int) |  | Jim_GetVariable | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (Jim_Interp *,Jim_Obj *,int) |  | Jim_ListGetIndex | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (Jim_Interp *,Jim_Obj *,int) |  | Jim_UnsetVariable | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (Jim_Interp *,Jim_Obj *const *,int) |  | Jim_NewDictObj | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (Jim_Interp *,Jim_Obj *const *,int) |  | Jim_NewListObj | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (Jim_Interp *,char *,int) |  | Jim_NewStringObjNoAlloc | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (Jim_Interp *,const char *,int) |  | Jim_GetGlobalVariableStr | 1 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (Jim_Interp *,const char *,int) |  | Jim_GetGlobalVariableStr | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (Jim_Interp *,const char *,int) |  | Jim_GetVariableStr | 1 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (Jim_Interp *,const char *,int) |  | Jim_GetVariableStr | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (Jim_Interp *,const char *,int) |  | Jim_MakeTempFile | 1 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (Jim_Interp *,const char *,int) |  | Jim_MakeTempFile | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (Jim_Interp *,const char *,int) |  | Jim_NewStringObj | 1 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (Jim_Interp *,const char *,int) |  | Jim_NewStringObj | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (Jim_Interp *,const char *,int) |  | Jim_NewStringObjUtf8 | 1 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (Jim_Interp *,const char *,int) |  | Jim_NewStringObjUtf8 | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (LIBSSH2_SESSION *,int,int) |  | libssh2_session_flag | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (LIBSSH2_SFTP_HANDLE *,LIBSSH2_SFTP_ATTRIBUTES *,int) |  | libssh2_sftp_fstat_ex | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (OCSP_BASICRESP *,OCSP_CERTID *,int) |  | OCSP_resp_find | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (OCSP_BASICRESP *,X509_EXTENSION *,int) |  | OCSP_BASICRESP_add_ext | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (OCSP_BASICRESP *,const ASN1_OBJECT *,int) |  | OCSP_BASICRESP_get_ext_by_OBJ | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (OCSP_BASICRESP *,int,int) |  | OCSP_BASICRESP_get_ext_by_NID | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (OCSP_BASICRESP *,int,int) |  | OCSP_BASICRESP_get_ext_by_critical | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (OCSP_ONEREQ *,X509_EXTENSION *,int) |  | OCSP_ONEREQ_add_ext | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (OCSP_ONEREQ *,const ASN1_OBJECT *,int) |  | OCSP_ONEREQ_get_ext_by_OBJ | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (OCSP_ONEREQ *,int,int) |  | OCSP_ONEREQ_get_ext_by_NID | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (OCSP_ONEREQ *,int,int) |  | OCSP_ONEREQ_get_ext_by_critical | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (OCSP_REQUEST *,X509_EXTENSION *,int) |  | OCSP_REQUEST_add_ext | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (OCSP_REQUEST *,const ASN1_OBJECT *,int) |  | OCSP_REQUEST_get_ext_by_OBJ | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (OCSP_REQUEST *,int,int) |  | OCSP_REQUEST_get_ext_by_NID | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (OCSP_REQUEST *,int,int) |  | OCSP_REQUEST_get_ext_by_critical | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (OCSP_SINGLERESP *,X509_EXTENSION *,int) |  | OCSP_SINGLERESP_add_ext | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (OCSP_SINGLERESP *,const ASN1_OBJECT *,int) |  | OCSP_SINGLERESP_get_ext_by_OBJ | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (OCSP_SINGLERESP *,int,int) |  | OCSP_SINGLERESP_get_ext_by_NID | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (OCSP_SINGLERESP *,int,int) |  | OCSP_SINGLERESP_get_ext_by_critical | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (OPENSSL_STACK *,const void *,int) |  | OPENSSL_sk_insert | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (OSSL_CMP_CTX *,const unsigned char *,int) |  | OSSL_CMP_CTX_set1_referenceValue | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (OSSL_CMP_CTX *,const unsigned char *,int) |  | OSSL_CMP_CTX_set1_secretValue | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (OSSL_CMP_CTX *,int,int) |  | OSSL_CMP_CTX_set_option | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (OSSL_LIB_CTX *,const char *,int) |  | EC_GROUP_new_by_curve_name_ex | 1 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (OSSL_LIB_CTX *,const char *,int) |  | EC_GROUP_new_by_curve_name_ex | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (OSSL_LIB_CTX *,const char *,int) |  | EC_KEY_new_by_curve_name_ex | 1 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (OSSL_LIB_CTX *,const char *,int) |  | EC_KEY_new_by_curve_name_ex | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (OSSL_LIB_CTX *,const char *,int) |  | OSSL_PROVIDER_try_load | 1 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (OSSL_LIB_CTX *,const char *,int) |  | OSSL_PROVIDER_try_load | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (OSSL_LIB_CTX *,const char *,int) |  | ossl_ml_dsa_key_new | 1 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (OSSL_LIB_CTX *,const char *,int) |  | ossl_ml_dsa_key_new | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (OSSL_LIB_CTX *,const char *,int) |  | ossl_ml_kem_key_new | 1 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (OSSL_LIB_CTX *,const char *,int) |  | ossl_ml_kem_key_new | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (OSSL_LIB_CTX *,const char *,int) |  | ossl_parse_query | 1 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (OSSL_LIB_CTX *,const char *,int) |  | ossl_parse_query | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (OSSL_LIB_CTX *,const char *,int) |  | ossl_property_name | 1 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (OSSL_LIB_CTX *,const char *,int) |  | ossl_property_name | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (OSSL_LIB_CTX *,const char *,int) |  | ossl_property_value | 1 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (OSSL_LIB_CTX *,const char *,int) |  | ossl_property_value | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (OSSL_PROVIDER *,OSSL_PROVIDER **,int) |  | ossl_provider_add_to_store | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (OSSL_QRL_ENC_LEVEL_SET *,uint32_t,int) |  | ossl_qrl_enc_level_set_get | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (PKCS7 *,stack_st_X509 *,int) |  | PKCS7_get0_signers | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (POLICYINFO *,const ASN1_OBJECT *,int) |  | ossl_policy_data_new | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (PROV_CTX *,const char *,int) |  | ossl_prov_ctx_get_bool_param | 1 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (PROV_CTX *,const char *,int) |  | ossl_prov_ctx_get_bool_param | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (PROV_CTX *,const char *,int) |  | ossl_prov_ml_dsa_new | 1 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (PROV_CTX *,const char *,int) |  | ossl_prov_ml_dsa_new | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (PROV_CTX *,const char *,int) |  | ossl_prov_ml_kem_new | 1 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (PROV_CTX *,const char *,int) |  | ossl_prov_ml_kem_new | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (QLOG *,uint32_t,int) |  | ossl_qlog_set_event_type_enabled | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (QUIC_RXFC *,uint64_t,int) |  | ossl_quic_rxfc_on_rx_stream_frame | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (QUIC_STREAM_ITER *,QUIC_STREAM_MAP *,int) |  | ossl_quic_stream_iter_init | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (QUIC_STREAM_MAP *,uint64_t,int) |  | ossl_quic_stream_map_alloc | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (RSA *,const OSSL_PARAM[],int) |  | ossl_rsa_fromdata | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (SSL *,const unsigned char *,int) |  | SSL_use_certificate_ASN1 | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (SSL *,const void *,int) |  | SSL_write | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (SSL *,void *,int) |  | SSL_peek | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (SSL *,void *,int) |  | SSL_read | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (SSL *,void *,int) |  | SSL_set_session_ticket_ext | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (SSL_CIPHER *,const SSL_CIPHER *,int) |  | OBJ_bsearch_ssl_cipher_id | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (SSL_CONNECTION *,PACKET *,int) |  | ssl_cache_cipherlist | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (SSL_CONNECTION *,WPACKET *,int) |  | dtls1_close_construct_packet | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (SSL_CONNECTION *,WPACKET *,int) |  | dtls1_set_handshake_header | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (SSL_CONNECTION *,WPACKET *,int) |  | tls_close_construct_packet | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (SSL_CONNECTION *,int,int) |  | ssl3_send_alert | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (TS_MSG_IMPRINT *,unsigned char *,int) |  | TS_MSG_IMPRINT_set_msg | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (TS_REQ *,X509_EXTENSION *,int) |  | TS_REQ_add_ext | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (TS_REQ *,const ASN1_OBJECT *,int) |  | TS_REQ_get_ext_by_OBJ | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (TS_REQ *,int,int) |  | TS_REQ_get_ext_by_NID | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (TS_REQ *,int,int) |  | TS_REQ_get_ext_by_critical | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (TS_TST_INFO *,X509_EXTENSION *,int) |  | TS_TST_INFO_add_ext | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (TS_TST_INFO *,const ASN1_OBJECT *,int) |  | TS_TST_INFO_get_ext_by_OBJ | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (TS_TST_INFO *,int,int) |  | TS_TST_INFO_get_ext_by_NID | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (TS_TST_INFO *,int,int) |  | TS_TST_INFO_get_ext_by_critical | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (X509 *,X509_EXTENSION *,int) |  | X509_add_ext | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (X509 *,int,int) |  | X509_check_purpose | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (X509 *,int,int) |  | X509_check_trust | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (X509_CRL *,X509_EXTENSION *,int) |  | X509_CRL_add_ext | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (X509_PUBKEY *,unsigned char *,int) |  | X509_PUBKEY_set0_public_key | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (X509_REVOKED *,X509_EXTENSION *,int) |  | X509_REVOKED_add_ext | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (X509_STORE_CTX *,X509 *,int) |  | ossl_x509_check_cert_time | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (XCHAR *,const XCHAR *,int) | CSimpleStringT | CopyChars | 0 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (XCHAR *,const XCHAR *,int) | CSimpleStringT | CopyChars | 1 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (XCHAR *,const XCHAR *,int) | CSimpleStringT | CopyChars | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (XCHAR *,const XCHAR *,int) | CSimpleStringT | CopyCharsOverlapped | 0 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (XCHAR *,const XCHAR *,int) | CSimpleStringT | CopyCharsOverlapped | 1 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (XCHAR *,const XCHAR *,int) | CSimpleStringT | CopyCharsOverlapped | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (_Float128,_Float128,int) |  | __kernel_sinf128 | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (_Float128,_Float128,int) |  | __kernel_tanf128 | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (_IO_strfile *,const char *,int) |  | _IO_str_init_readonly | 1 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (_IO_strfile *,const char *,int) |  | _IO_str_init_readonly | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (action *,FILE *,int) |  | PrintAction | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (acttab *,int,int) |  | acttab_action | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (char *,size_t,int) |  | __argz_stringify | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const ASN1_VALUE *,const ASN1_TEMPLATE *,int) |  | ossl_asn1_do_adb | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const BIGNUM *,int[],int) |  | BN_GF2m_poly2arr | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const BIGNUM *,unsigned char *,int) |  | BN_bn2binpad | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const BIGNUM *,unsigned char *,int) |  | BN_bn2lebinpad | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const BIGNUM *,unsigned char *,int) |  | BN_bn2nativepad | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const BIGNUM *,unsigned char *,int) |  | BN_signed_bn2bin | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const BIGNUM *,unsigned char *,int) |  | BN_signed_bn2lebin | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const BIGNUM *,unsigned char *,int) |  | BN_signed_bn2native | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const CMS_ContentInfo *,BIO *,int) |  | ossl_cms_DigestedData_do_final | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const CMS_SignerInfo *,const ASN1_OBJECT *,int) |  | CMS_signed_get_attr_by_OBJ | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const CMS_SignerInfo *,const ASN1_OBJECT *,int) |  | CMS_unsigned_get_attr_by_OBJ | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const CMS_SignerInfo *,int,int) |  | CMS_signed_get_attr_by_NID | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const CMS_SignerInfo *,int,int) |  | CMS_unsigned_get_attr_by_NID | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const Curl_easy *,const connectdata *,int) |  | Curl_conn_is_http2 | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const EVP_MD *,const EVP_MD *,int) |  | ossl_rsa_pss_params_create | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const EVP_PKEY *,const ASN1_OBJECT *,int) |  | EVP_PKEY_get_attr_by_OBJ | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const EVP_PKEY *,int,int) |  | EVP_PKEY_get_attr_by_NID | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const OSSL_PARAM *,BIO *,int) |  | OSSL_PARAM_print_to_bio | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const OSSL_PROVIDER *,const char *,int) |  | OSSL_PROVIDER_conf_get_bool | 1 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const OSSL_PROVIDER *,const char *,int) |  | OSSL_PROVIDER_conf_get_bool | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const SSL *,char *,int) |  | SSL_get_shared_ciphers | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const SSL *,int,int) |  | apps_ssl_info_callback | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const SSL_CIPHER *,char *,int) |  | SSL_CIPHER_description | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const X509 *,const ASN1_OBJECT *,int) |  | X509_get_ext_by_OBJ | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const X509 *,const stack_st_X509 *,int) |  | OSSL_ESS_signing_cert_new_init | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const X509 *,int,int) |  | X509_get_ext_by_NID | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const X509 *,int,int) |  | X509_get_ext_by_critical | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const X509_ACERT *,const ASN1_OBJECT *,int) |  | X509_ACERT_get_attr_by_OBJ | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const X509_ACERT *,int,int) |  | X509_ACERT_get_attr_by_NID | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const X509_CRL *,const ASN1_OBJECT *,int) |  | X509_CRL_get_ext_by_OBJ | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const X509_CRL *,const X509 *,int) |  | OSSL_CMP_CRLSTATUS_create | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const X509_CRL *,int,int) |  | X509_CRL_get_ext_by_NID | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const X509_CRL *,int,int) |  | X509_CRL_get_ext_by_critical | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const X509_NAME *,char *,int) |  | X509_NAME_oneline | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const X509_NAME *,const ASN1_OBJECT *,int) |  | X509_NAME_get_index_by_OBJ | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const X509_NAME *,int,int) |  | X509_NAME_get_index_by_NID | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const X509_REQ *,const ASN1_OBJECT *,int) |  | X509_REQ_get_attr_by_OBJ | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const X509_REQ *,int,int) |  | X509_REQ_get_attr_by_NID | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const X509_REVOKED *,const ASN1_OBJECT *,int) |  | X509_REVOKED_get_ext_by_OBJ | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const X509_REVOKED *,int,int) |  | X509_REVOKED_get_ext_by_NID | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const X509_REVOKED *,int,int) |  | X509_REVOKED_get_ext_by_critical | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const X509_SIG *,const char *,int) |  | PKCS8_decrypt | 1 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const X509_SIG *,const char *,int) |  | PKCS8_decrypt | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const char *,char **,int) |  | __strtol | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const char *,char **,int) |  | __strtoul | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const char *,char **,int) |  | idn2_to_ascii_8z | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const char *,const OSSL_PARAM *,int) |  | print_param_types | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const char *,const char *,int) |  | CRYPTO_strdup | 1 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const char *,const char *,int) |  | CRYPTO_strdup | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const char *,const char *,int) |  | __dcgettext | 1 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const char *,const char *,int) |  | __dcgettext | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const char *,const char *,int) |  | sqlite3_strnicmp | 1 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const char *,const char *,int) |  | sqlite3_strnicmp | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const char *,int,int) |  | __old_strpbrk_c2 | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const char *,long *,int) |  | Jim_StringToWide | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const char *,size_t *,int) |  | _dl_sysdep_read_whole_file | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const char *,sqlite3_filename,int) |  | sqlite3_uri_key | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const char *,void *,int) |  | support_readdir_check | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const char *,wordexp_t *,int) |  | wordexp | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const cmsghdr *,uint8_t **,int) |  | inet6_option_find | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const stack_st_X509_ATTRIBUTE *,const ASN1_OBJECT *,int) |  | X509at_get_attr_by_OBJ | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const stack_st_X509_ATTRIBUTE *,int,int) |  | X509at_get_attr_by_NID | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const stack_st_X509_EXTENSION *,const ASN1_OBJECT *,int) |  | X509v3_get_ext_by_OBJ | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const stack_st_X509_EXTENSION *,int,int) |  | X509v3_get_ext_by_NID | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const stack_st_X509_EXTENSION *,int,int) |  | X509v3_get_ext_by_critical | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const uint8_t *,uint8_t **,int) |  | idn2_lookup_u8 | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const unsigned char **,unsigned int,int) |  | ossl_b2i_DSA_after_header | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const unsigned char **,unsigned int,int) |  | ossl_b2i_RSA_after_header | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const void *,const void *,int) |  | ossl_is_partially_overlapping | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const void *,socklen_t,int) |  | res_gethostbyaddr | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const wchar_t *,wchar_t **,int) |  | __wcstol | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (const wchar_t *,wchar_t **,int) |  | __wcstoul | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (curl_mimepart *,curl_mime *,int) |  | Curl_mime_set_subparts | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (curl_mimepart *,curl_slist *,int) |  | curl_mime_headers | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (database_dyn *,size_t,int) |  | mempool_alloc | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (database_dyn *,time_t,int) |  | prune_cache | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (double,double,int) |  | __kernel_standard | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (float,float,int) |  | __kernel_standard_f | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (gconv_spec *,__gconv_t *,int) |  | __gconv_open | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (gzFile,char *,int) |  | gzgets | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (gzFile,int,int) |  | gzsetparams | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (gzFile,off64_t,int) |  | gzseek64 | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (gzFile,off_t,int) |  | gzseek | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (int *,short *,int) |  | __lll_lock_elision | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (int,BIO_ADDR *,int) |  | BIO_accept_ex | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (int,int,int) |  | ASN1_object_size | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (int,int,int) |  | EVP_CIPHER_meth_new | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (long double,long double,int) |  | __kernel_sinl | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (long double,long double,int) |  | __kernel_standard_l | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (long double,long double,int) |  | __kernel_tanl | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (mp_srcptr,int,int) |  | __mpn_construct_double | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (mp_srcptr,int,int) |  | __mpn_construct_float | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (mp_srcptr,int,int) |  | __mpn_construct_float128 | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (regex_t *,const char *,int) |  | jim_regcomp | 1 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (regex_t *,const char *,int) |  | jim_regcomp | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (requestlist *,requestlist *,int) |  | __aio_remove_request | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (sqlite3 *,const char *,int) |  | sqlite3_overload_function | 1 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (sqlite3 *,const char *,int) |  | sqlite3_overload_function | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (sqlite3 *,int,int) |  | sqlite3_limit | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (sqlite3_context *,const char *,int) |  | sqlite3_result_error | 1 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (sqlite3_context *,const char *,int) |  | sqlite3_result_error | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (sqlite3_context *,const void *,int) |  | sqlite3_result_error16 | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (sqlite3_index_info *,int,int) |  | sqlite3_vtab_in | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (sqlite3_stmt *,int,int) |  | sqlite3_bind_int | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (sqlite3_stmt *,int,int) |  | sqlite3_bind_zeroblob | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (sqlite3_stmt *,int,int) |  | sqlite3_stmt_status | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (sqlite3_str *,const char *,int) |  | sqlite3_str_append | 1 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (sqlite3_str *,const char *,int) |  | sqlite3_str_append | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (sqlite3expert *,int,int) |  | sqlite3_expert_report | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (stack_st_ASN1_UTF8STRING *,const char *,int) |  | ossl_cmp_sk_ASN1_UTF8STRING_push_str | 1 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (stack_st_ASN1_UTF8STRING *,const char *,int) |  | ossl_cmp_sk_ASN1_UTF8STRING_push_str | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (stack_st_X509 **,X509 *,int) |  | ossl_x509_add_cert_new | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (stack_st_X509 **,stack_st_X509 *,int) |  | ossl_x509_add_certs_new | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (stack_st_X509 *,ASIdentifiers *,int) |  | X509v3_asid_validate_resource_set | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (stack_st_X509 *,IPAddrBlocks *,int) |  | X509v3_addr_validate_resource_set | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (stack_st_X509 *,X509 *,int) |  | X509_add_cert | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (stack_st_X509 *,stack_st_X509 *,int) |  | X509_add_certs | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (stack_st_X509_ALGOR **,int,int) |  | CMS_add_simple_smimecap | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (stack_st_X509_ALGOR *,int,int) |  | PKCS7_simple_smimecap | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (stack_st_X509_EXTENSION **,X509_EXTENSION *,int) |  | X509v3_add_ext | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (td_thragent_t *,uint32_t *,int) |  | _td_check_sizeof | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (uint8_t[56],const gf,int) |  | gf_serialize | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (uint32_t *,SSL_CONNECTION *,int) |  | ssl_set_sig_mask | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (unsigned char *,const char *,int) |  | data_string | 1 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (unsigned char *,const char *,int) |  | data_string | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (unsigned char *,const unsigned char *,int) |  | EVP_DecodeBlock | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (unsigned char *,const unsigned char *,int) |  | EVP_EncodeBlock | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (unsigned char *,uint64_t,int) |  | ossl_i2c_uint64_int | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (unsigned int,const char *,int) |  | _IO_adjust_column | 1 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (unsigned int,const char *,int) |  | _IO_adjust_column | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (unsigned int,const wchar_t *,int) |  | _IO_adjust_wcolumn | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (unsigned int,int,int) |  | ossl_blob_length | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (unsigned long *,const BIGNUM *,int) |  | bn_copy_words | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (unsigned long *,const unsigned long *,int) |  | bn_sqr_words | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (uv__io_t *,uv__io_cb,int) |  | uv__io_init | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (uv_loop_t *,uv_fs_t *,int) |  | uv__iou_fs_read_or_write | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (uv_loop_t *,uv_pipe_t *,int) |  | uv_pipe_init | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (uv_loop_t *,uv_poll_t *,int) |  | uv_poll_init | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (uv_signal_t *,uv_signal_cb,int) |  | uv_signal_start | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (uv_signal_t *,uv_signal_cb,int) |  | uv_signal_start_oneshot | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (uv_stream_t *,int,int) |  | uv__stream_open | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (void *,cmsghdr **,int) |  | inet6_option_init | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (void *,const char *,int) |  | CRYPTO_secure_free | 1 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (void *,const char *,int) |  | CRYPTO_secure_free | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (void *,curl_off_t,int) |  | tool_mime_stdin_seek | 2 |
-| atl.cpp:929:17:929:35 | CopyCharsOverlapped | (void *,socklen_t,int) |  | inet6_opt_finish | 2 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | ASN1_STRING_type_new | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | ASN1_tag2bit | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | ASN1_tag2str | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | Jim_ReturnCode | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | Jim_SignalId | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | OBJ_nid2ln | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | OBJ_nid2obj | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | OBJ_nid2sn | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | OSSL_trace_get_category_name | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | PKCS12_init | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | Symbol_Nth | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | X509_PURPOSE_get0 | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | X509_TRUST_get0 | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | X509_TRUST_get_by_id | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | __btowc | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | __current_locale_name | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | __fdopendir | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | __get_errlist | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | __get_errname | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | __math_invalid_i | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | __math_invalidf_i | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | __p_class | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | __p_rcode | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | __p_type | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | __pkey_get | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | __sigdescr_np | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | __strerrordesc_np | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | _tolower | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | _toupper | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | btowc | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | c_tolower | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | c_toupper | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | curlx_sitouz | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | evp_pkey_type2name | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | inet6_option_space | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | isalnum | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | isalpha | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | isblank | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | iscntrl | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | isdigit | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | isgraph | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | islower | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | isprint | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | ispunct | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | isspace | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | isupper | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | isxdigit | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | ossl_tolower | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | ossl_toupper | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | sigabbrev_np | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | sqlite3_compileoption_get | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | sqlite3_errstr | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | strerrorname_np | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | support_report_failure | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | svcudp_create | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | tls13_alert_code | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | toascii | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | tolower | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | toupper | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | uabs | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | uv__accept | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | uv_err_name | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | uv_get_osfhandle | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | uv_strerror | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | uv_translate_sys_error | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) |  | zError | 0 |
-| atl.cpp:931:11:931:15 | GetAt | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | ASN1_STRING_type_new | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | ASN1_tag2bit | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | ASN1_tag2str | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | Jim_ReturnCode | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | Jim_SignalId | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | OBJ_nid2ln | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | OBJ_nid2obj | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | OBJ_nid2sn | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | OSSL_trace_get_category_name | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | PKCS12_init | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | Symbol_Nth | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | X509_PURPOSE_get0 | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | X509_TRUST_get0 | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | X509_TRUST_get_by_id | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | __btowc | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | __current_locale_name | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | __fdopendir | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | __get_errlist | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | __get_errname | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | __math_invalid_i | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | __math_invalidf_i | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | __p_class | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | __p_rcode | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | __p_type | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | __pkey_get | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | __sigdescr_np | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | __strerrordesc_np | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | _tolower | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | _toupper | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | btowc | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | c_tolower | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | c_toupper | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | curlx_sitouz | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | evp_pkey_type2name | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | inet6_option_space | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | isalnum | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | isalpha | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | isblank | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | iscntrl | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | isdigit | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | isgraph | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | islower | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | isprint | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | ispunct | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | isspace | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | isupper | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | isxdigit | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | ossl_tolower | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | ossl_toupper | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | sigabbrev_np | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | sqlite3_compileoption_get | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | sqlite3_errstr | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | strerrorname_np | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | support_report_failure | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | svcudp_create | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | tls13_alert_code | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | toascii | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | tolower | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | toupper | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | uabs | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | uv__accept | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | uv_err_name | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | uv_get_osfhandle | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | uv_strerror | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | uv_translate_sys_error | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) |  | zError | 0 |
-| atl.cpp:932:11:932:19 | GetBuffer | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | ASN1_STRING_type_new | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | ASN1_tag2bit | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | ASN1_tag2str | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | Jim_ReturnCode | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | Jim_SignalId | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | OBJ_nid2ln | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | OBJ_nid2obj | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | OBJ_nid2sn | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | OSSL_trace_get_category_name | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | PKCS12_init | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | Symbol_Nth | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | X509_PURPOSE_get0 | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | X509_TRUST_get0 | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | X509_TRUST_get_by_id | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | __btowc | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | __current_locale_name | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | __fdopendir | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | __get_errlist | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | __get_errname | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | __math_invalid_i | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | __math_invalidf_i | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | __p_class | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | __p_rcode | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | __p_type | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | __pkey_get | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | __sigdescr_np | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | __strerrordesc_np | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | _tolower | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | _toupper | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | btowc | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | c_tolower | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | c_toupper | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | curlx_sitouz | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | evp_pkey_type2name | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | inet6_option_space | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | isalnum | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | isalpha | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | isblank | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | iscntrl | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | isdigit | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | isgraph | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | islower | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | isprint | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | ispunct | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | isspace | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | isupper | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | isxdigit | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | ossl_tolower | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | ossl_toupper | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | sigabbrev_np | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | sqlite3_compileoption_get | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | sqlite3_errstr | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | strerrorname_np | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | support_report_failure | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | svcudp_create | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | tls13_alert_code | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | toascii | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | tolower | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | toupper | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | uabs | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | uv__accept | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | uv_err_name | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | uv_get_osfhandle | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | uv_strerror | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | uv_translate_sys_error | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) |  | zError | 0 |
-| atl.cpp:934:11:934:28 | GetBufferSetLength | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| atl.cpp:938:10:938:14 | SetAt | (XCHAR,XCHAR) | CStringT | Replace | 1 |
-| atl.cpp:938:10:938:14 | SetAt | (__printf_buffer *,char) |  | __printf_buffer_putc_1 | 1 |
-| atl.cpp:938:10:938:14 | SetAt | (char **,char) |  | Curl_str_single | 1 |
-| atl.cpp:938:10:938:14 | SetAt | (char **,char) |  | __old_strsep_1c | 1 |
-| atl.cpp:938:10:938:14 | SetAt | (const CStringT &,char) |  | operator+ | 1 |
-| atl.cpp:938:10:938:14 | SetAt | (int,XCHAR) | CStringT | Insert | 0 |
-| atl.cpp:938:10:938:14 | SetAt | (int,XCHAR) | CStringT | Insert | 1 |
-| atl.cpp:939:10:939:18 | SetString | (ASN1_STRING *,int) |  | ASN1_STRING_length_set | 1 |
-| atl.cpp:939:10:939:18 | SetString | (ASYNC_WAIT_CTX *,int) |  | ASYNC_WAIT_CTX_set_status | 1 |
-| atl.cpp:939:10:939:18 | SetString | (BIGNUM *,int) |  | BN_clear_bit | 1 |
-| atl.cpp:939:10:939:18 | SetString | (BIGNUM *,int) |  | BN_mask_bits | 1 |
-| atl.cpp:939:10:939:18 | SetString | (BIGNUM *,int) |  | BN_set_bit | 1 |
-| atl.cpp:939:10:939:18 | SetString | (BIGNUM *,int) |  | BN_set_flags | 1 |
-| atl.cpp:939:10:939:18 | SetString | (BIGNUM *,int) |  | bn_expand2 | 1 |
-| atl.cpp:939:10:939:18 | SetString | (BIGNUM *,int) |  | bn_wexpand | 1 |
-| atl.cpp:939:10:939:18 | SetString | (BIGNUM *,int) |  | ossl_bn_mask_bits_fixed_top | 1 |
-| atl.cpp:939:10:939:18 | SetString | (BIO *,int) |  | BIO_clear_flags | 1 |
-| atl.cpp:939:10:939:18 | SetString | (BIO *,int) |  | BIO_find_type | 1 |
-| atl.cpp:939:10:939:18 | SetString | (BIO *,int) |  | BIO_set_flags | 1 |
-| atl.cpp:939:10:939:18 | SetString | (BIO *,int) |  | BIO_set_init | 1 |
-| atl.cpp:939:10:939:18 | SetString | (BIO *,int) |  | BIO_set_retry_reason | 1 |
-| atl.cpp:939:10:939:18 | SetString | (BIO *,int) |  | BIO_set_shutdown | 1 |
-| atl.cpp:939:10:939:18 | SetString | (BIO *,int) |  | TXT_DB_read | 1 |
-| atl.cpp:939:10:939:18 | SetString | (CMS_SignerInfo *,int) |  | CMS_signed_delete_attr | 1 |
-| atl.cpp:939:10:939:18 | SetString | (CMS_SignerInfo *,int) |  | CMS_unsigned_delete_attr | 1 |
-| atl.cpp:939:10:939:18 | SetString | (CURL *,int) |  | curl_easy_pause | 1 |
-| atl.cpp:939:10:939:18 | SetString | (Curl_easy *,int) |  | Curl_conn_get_socket | 1 |
-| atl.cpp:939:10:939:18 | SetString | (DH *,int) |  | DH_clear_flags | 1 |
-| atl.cpp:939:10:939:18 | SetString | (DH *,int) |  | DH_set_flags | 1 |
-| atl.cpp:939:10:939:18 | SetString | (DH_METHOD *,int) |  | DH_meth_set_flags | 1 |
-| atl.cpp:939:10:939:18 | SetString | (DSA *,int) |  | DSA_clear_flags | 1 |
-| atl.cpp:939:10:939:18 | SetString | (DSA *,int) |  | DSA_set_flags | 1 |
-| atl.cpp:939:10:939:18 | SetString | (DSA_METHOD *,int) |  | DSA_meth_set_flags | 1 |
-| atl.cpp:939:10:939:18 | SetString | (EC_GROUP *,int) |  | EC_GROUP_set_asn1_flag | 1 |
-| atl.cpp:939:10:939:18 | SetString | (EC_GROUP *,int) |  | EC_GROUP_set_curve_name | 1 |
-| atl.cpp:939:10:939:18 | SetString | (EC_KEY *,int) |  | EC_KEY_clear_flags | 1 |
-| atl.cpp:939:10:939:18 | SetString | (EC_KEY *,int) |  | EC_KEY_set_asn1_flag | 1 |
-| atl.cpp:939:10:939:18 | SetString | (EC_KEY *,int) |  | EC_KEY_set_flags | 1 |
-| atl.cpp:939:10:939:18 | SetString | (ENGINE *,int) |  | ENGINE_cmd_is_executable | 1 |
-| atl.cpp:939:10:939:18 | SetString | (ENGINE *,int) |  | ENGINE_set_flags | 1 |
-| atl.cpp:939:10:939:18 | SetString | (EVP_CIPHER *,int) |  | EVP_CIPHER_meth_set_impl_ctx_size | 1 |
-| atl.cpp:939:10:939:18 | SetString | (EVP_CIPHER *,int) |  | EVP_CIPHER_meth_set_iv_length | 1 |
-| atl.cpp:939:10:939:18 | SetString | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_clear_flags | 1 |
-| atl.cpp:939:10:939:18 | SetString | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_flags | 1 |
-| atl.cpp:939:10:939:18 | SetString | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_key_length | 1 |
-| atl.cpp:939:10:939:18 | SetString | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_num | 1 |
-| atl.cpp:939:10:939:18 | SetString | (EVP_KEYMGMT *,int) |  | evp_keymgmt_util_query_operation_name | 1 |
-| atl.cpp:939:10:939:18 | SetString | (EVP_MD *,int) |  | EVP_MD_meth_set_app_datasize | 1 |
-| atl.cpp:939:10:939:18 | SetString | (EVP_MD *,int) |  | EVP_MD_meth_set_input_blocksize | 1 |
-| atl.cpp:939:10:939:18 | SetString | (EVP_MD *,int) |  | EVP_MD_meth_set_result_size | 1 |
-| atl.cpp:939:10:939:18 | SetString | (EVP_MD_CTX *,int) |  | EVP_MD_CTX_clear_flags | 1 |
-| atl.cpp:939:10:939:18 | SetString | (EVP_MD_CTX *,int) |  | EVP_MD_CTX_set_flags | 1 |
-| atl.cpp:939:10:939:18 | SetString | (EVP_PKEY *,int) |  | EVP_PKEY_delete_attr | 1 |
-| atl.cpp:939:10:939:18 | SetString | (EVP_PKEY *,int) |  | EVP_PKEY_save_parameters | 1 |
-| atl.cpp:939:10:939:18 | SetString | (EVP_PKEY *,int) |  | EVP_PKEY_set_type | 1 |
-| atl.cpp:939:10:939:18 | SetString | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_get_keygen_info | 1 |
-| atl.cpp:939:10:939:18 | SetString | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_kdf_type | 1 |
-| atl.cpp:939:10:939:18 | SetString | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_nid | 1 |
-| atl.cpp:939:10:939:18 | SetString | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_paramgen_type | 1 |
-| atl.cpp:939:10:939:18 | SetString | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_rfc5114 | 1 |
-| atl.cpp:939:10:939:18 | SetString | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dhx_rfc5114 | 1 |
-| atl.cpp:939:10:939:18 | SetString | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ec_param_enc | 1 |
-| atl.cpp:939:10:939:18 | SetString | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ec_paramgen_curve_nid | 1 |
-| atl.cpp:939:10:939:18 | SetString | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ecdh_kdf_type | 1 |
-| atl.cpp:939:10:939:18 | SetString | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_hkdf_mode | 1 |
-| atl.cpp:939:10:939:18 | SetString | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_rsa_padding | 1 |
-| atl.cpp:939:10:939:18 | SetString | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_rsa_pss_saltlen | 1 |
-| atl.cpp:939:10:939:18 | SetString | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_gindex | 1 |
-| atl.cpp:939:10:939:18 | SetString | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_h | 1 |
-| atl.cpp:939:10:939:18 | SetString | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_pcounter | 1 |
-| atl.cpp:939:10:939:18 | SetString | (FILE *,int) |  | _IO_default_pbackfail | 1 |
-| atl.cpp:939:10:939:18 | SetString | (FILE *,int) |  | _IO_fwide | 1 |
-| atl.cpp:939:10:939:18 | SetString | (FILE *,int) |  | _IO_init | 1 |
-| atl.cpp:939:10:939:18 | SetString | (FILE *,int) |  | _IO_init_internal | 1 |
-| atl.cpp:939:10:939:18 | SetString | (FILE *,int) |  | _IO_new_file_attach | 1 |
-| atl.cpp:939:10:939:18 | SetString | (FILE *,int) |  | _IO_new_file_overflow | 1 |
-| atl.cpp:939:10:939:18 | SetString | (FILE *,int) |  | _IO_old_init | 1 |
-| atl.cpp:939:10:939:18 | SetString | (FILE *,int) |  | _IO_sputbackc | 1 |
-| atl.cpp:939:10:939:18 | SetString | (FILE *,int) |  | _IO_str_overflow | 1 |
-| atl.cpp:939:10:939:18 | SetString | (FILE *,int) |  | _IO_str_pbackfail | 1 |
-| atl.cpp:939:10:939:18 | SetString | (FILE *,int) |  | __printf_buffer_as_file_overflow | 1 |
-| atl.cpp:939:10:939:18 | SetString | (FILE *,int) |  | __wprintf_buffer_as_file_overflow | 1 |
-| atl.cpp:939:10:939:18 | SetString | (FTS *,int) |  | fts_children | 1 |
-| atl.cpp:939:10:939:18 | SetString | (LIBSSH2_CHANNEL *,int) |  | _libssh2_channel_extended_data | 1 |
-| atl.cpp:939:10:939:18 | SetString | (LIBSSH2_CHANNEL *,int) |  | _libssh2_channel_flush | 1 |
-| atl.cpp:939:10:939:18 | SetString | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_flush_ex | 1 |
-| atl.cpp:939:10:939:18 | SetString | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_handle_extended_data | 1 |
-| atl.cpp:939:10:939:18 | SetString | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_handle_extended_data2 | 1 |
-| atl.cpp:939:10:939:18 | SetString | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_set_blocking | 1 |
-| atl.cpp:939:10:939:18 | SetString | (LIBSSH2_SESSION *,int) |  | _libssh2_session_set_blocking | 1 |
-| atl.cpp:939:10:939:18 | SetString | (LIBSSH2_SESSION *,int) |  | libssh2_hostkey_hash | 1 |
-| atl.cpp:939:10:939:18 | SetString | (LIBSSH2_SESSION *,int) |  | libssh2_session_methods | 1 |
-| atl.cpp:939:10:939:18 | SetString | (LIBSSH2_SESSION *,int) |  | libssh2_session_set_blocking | 1 |
-| atl.cpp:939:10:939:18 | SetString | (LIBSSH2_SESSION *,int) |  | libssh2_session_startup | 1 |
-| atl.cpp:939:10:939:18 | SetString | (LPCOLESTR,int) | CComBSTR | Append | 1 |
-| atl.cpp:939:10:939:18 | SetString | (OCSP_BASICRESP *,int) |  | OCSP_BASICRESP_delete_ext | 1 |
-| atl.cpp:939:10:939:18 | SetString | (OCSP_BASICRESP *,int) |  | OCSP_BASICRESP_get_ext | 1 |
-| atl.cpp:939:10:939:18 | SetString | (OCSP_BASICRESP *,int) |  | OCSP_resp_get0 | 1 |
-| atl.cpp:939:10:939:18 | SetString | (OCSP_ONEREQ *,int) |  | OCSP_ONEREQ_delete_ext | 1 |
-| atl.cpp:939:10:939:18 | SetString | (OCSP_ONEREQ *,int) |  | OCSP_ONEREQ_get_ext | 1 |
-| atl.cpp:939:10:939:18 | SetString | (OCSP_REQUEST *,int) |  | OCSP_REQUEST_delete_ext | 1 |
-| atl.cpp:939:10:939:18 | SetString | (OCSP_REQUEST *,int) |  | OCSP_REQUEST_get_ext | 1 |
-| atl.cpp:939:10:939:18 | SetString | (OCSP_REQUEST *,int) |  | OCSP_request_onereq_get0 | 1 |
-| atl.cpp:939:10:939:18 | SetString | (OCSP_SINGLERESP *,int) |  | OCSP_SINGLERESP_delete_ext | 1 |
-| atl.cpp:939:10:939:18 | SetString | (OCSP_SINGLERESP *,int) |  | OCSP_SINGLERESP_get_ext | 1 |
-| atl.cpp:939:10:939:18 | SetString | (OPENSSL_STACK *,int) |  | OPENSSL_sk_delete | 1 |
-| atl.cpp:939:10:939:18 | SetString | (OPENSSL_STACK *,int) |  | OPENSSL_sk_reserve | 1 |
-| atl.cpp:939:10:939:18 | SetString | (OPENSSL_sk_compfunc,int) |  | OPENSSL_sk_new_reserve | 1 |
-| atl.cpp:939:10:939:18 | SetString | (OSSL_ACKM *,int) |  | ossl_ackm_get_ack_deadline | 1 |
-| atl.cpp:939:10:939:18 | SetString | (OSSL_ACKM *,int) |  | ossl_ackm_get_ack_frame | 1 |
-| atl.cpp:939:10:939:18 | SetString | (OSSL_ACKM *,int) |  | ossl_ackm_get_largest_acked | 1 |
-| atl.cpp:939:10:939:18 | SetString | (OSSL_ACKM *,int) |  | ossl_ackm_on_pkt_space_discarded | 1 |
-| atl.cpp:939:10:939:18 | SetString | (OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_set_serverPort | 1 |
-| atl.cpp:939:10:939:18 | SetString | (OSSL_CMP_CTX *,int) |  | ossl_cmp_ctx_set_failInfoCode | 1 |
-| atl.cpp:939:10:939:18 | SetString | (OSSL_CMP_CTX *,int) |  | ossl_cmp_ctx_set_status | 1 |
-| atl.cpp:939:10:939:18 | SetString | (OSSL_CMP_CTX *,int) |  | ossl_cmp_msg_create | 1 |
-| atl.cpp:939:10:939:18 | SetString | (OSSL_CMP_CTX *,int) |  | ossl_cmp_pollReq_new | 1 |
-| atl.cpp:939:10:939:18 | SetString | (OSSL_CMP_MSG *,int) |  | ossl_cmp_msg_set_bodytype | 1 |
-| atl.cpp:939:10:939:18 | SetString | (OSSL_CMP_PKIHEADER *,int) |  | ossl_cmp_hdr_set_pvno | 1 |
-| atl.cpp:939:10:939:18 | SetString | (OSSL_CMP_REVREPCONTENT *,int) |  | ossl_cmp_revrepcontent_get_CertId | 1 |
-| atl.cpp:939:10:939:18 | SetString | (OSSL_CMP_REVREPCONTENT *,int) |  | ossl_cmp_revrepcontent_get_pkisi | 1 |
-| atl.cpp:939:10:939:18 | SetString | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_accept_raverified | 1 |
-| atl.cpp:939:10:939:18 | SetString | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_accept_unprotected | 1 |
-| atl.cpp:939:10:939:18 | SetString | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_grant_implicit_confirm | 1 |
-| atl.cpp:939:10:939:18 | SetString | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_send_unprotected_errors | 1 |
-| atl.cpp:939:10:939:18 | SetString | (OSSL_CRMF_PKIPUBLICATIONINFO *,int) |  | OSSL_CRMF_MSG_set_PKIPublicationInfo_action | 1 |
-| atl.cpp:939:10:939:18 | SetString | (OSSL_DECODER_CTX *,int) |  | OSSL_DECODER_CTX_set_selection | 1 |
-| atl.cpp:939:10:939:18 | SetString | (OSSL_ENCODER_CTX *,int) |  | OSSL_ENCODER_CTX_set_selection | 1 |
-| atl.cpp:939:10:939:18 | SetString | (OSSL_LIB_CTX *,int) |  | OSSL_LIB_CTX_get_data | 1 |
-| atl.cpp:939:10:939:18 | SetString | (OSSL_LIB_CTX *,int) |  | OSSL_LIB_CTX_set_conf_diagnostics | 1 |
-| atl.cpp:939:10:939:18 | SetString | (OSSL_LIB_CTX *,int) |  | ossl_ctx_global_properties | 1 |
-| atl.cpp:939:10:939:18 | SetString | (OSSL_LIB_CTX *,int) |  | ossl_dh_new_by_nid_ex | 1 |
-| atl.cpp:939:10:939:18 | SetString | (OSSL_LIB_CTX *,int) |  | ossl_lib_ctx_get_data | 1 |
-| atl.cpp:939:10:939:18 | SetString | (OSSL_LIB_CTX *,int) |  | ossl_mac_key_new | 1 |
-| atl.cpp:939:10:939:18 | SetString | (OSSL_PARAM *,int) |  | OSSL_PARAM_set_int | 1 |
-| atl.cpp:939:10:939:18 | SetString | (OSSL_QRX *,int) |  | ossl_qrx_get_bytes_received | 1 |
-| atl.cpp:939:10:939:18 | SetString | (OSSL_RECORD_LAYER *,int) |  | tls_set_first_handshake | 1 |
-| atl.cpp:939:10:939:18 | SetString | (OSSL_RECORD_LAYER *,int) |  | tls_set_plain_alerts | 1 |
-| atl.cpp:939:10:939:18 | SetString | (OSSL_STORE_CTX *,int) |  | OSSL_STORE_expect | 1 |
-| atl.cpp:939:10:939:18 | SetString | (PKCS7 *,int) |  | PKCS7_set_type | 1 |
-| atl.cpp:939:10:939:18 | SetString | (QUIC_CHANNEL *,int) |  | ossl_quic_channel_new_stream_local | 1 |
-| atl.cpp:939:10:939:18 | SetString | (QUIC_ENGINE *,int) |  | ossl_quic_engine_set_inhibit_tick | 1 |
-| atl.cpp:939:10:939:18 | SetString | (QUIC_PORT *,int) |  | ossl_quic_port_set_allow_incoming | 1 |
-| atl.cpp:939:10:939:18 | SetString | (QUIC_RCIDM *,int) |  | ossl_quic_rcidm_get_preferred_tx_dcid_changed | 1 |
-| atl.cpp:939:10:939:18 | SetString | (QUIC_RSTREAM *,int) |  | ossl_quic_rstream_set_cleanse | 1 |
-| atl.cpp:939:10:939:18 | SetString | (QUIC_RXFC *,int) |  | ossl_quic_rxfc_get_error | 1 |
-| atl.cpp:939:10:939:18 | SetString | (QUIC_RXFC *,int) |  | ossl_quic_rxfc_has_cwm_changed | 1 |
-| atl.cpp:939:10:939:18 | SetString | (QUIC_SSTREAM *,int) |  | ossl_quic_sstream_set_cleanse | 1 |
-| atl.cpp:939:10:939:18 | SetString | (QUIC_STREAM_MAP *,int) |  | ossl_quic_stream_map_get_accept_queue_len | 1 |
-| atl.cpp:939:10:939:18 | SetString | (QUIC_TXFC *,int) |  | ossl_quic_txfc_has_become_blocked | 1 |
-| atl.cpp:939:10:939:18 | SetString | (RSA *,int) |  | RSA_clear_flags | 1 |
-| atl.cpp:939:10:939:18 | SetString | (RSA *,int) |  | RSA_set_flags | 1 |
-| atl.cpp:939:10:939:18 | SetString | (RSA_METHOD *,int) |  | RSA_meth_set_flags | 1 |
-| atl.cpp:939:10:939:18 | SetString | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_hashalg | 1 |
-| atl.cpp:939:10:939:18 | SetString | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_maskgenhashalg | 1 |
-| atl.cpp:939:10:939:18 | SetString | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_saltlen | 1 |
-| atl.cpp:939:10:939:18 | SetString | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_trailerfield | 1 |
-| atl.cpp:939:10:939:18 | SetString | (SSL *,int) |  | SSL_key_update | 1 |
-| atl.cpp:939:10:939:18 | SetString | (SSL *,int) |  | SSL_set_post_handshake_auth | 1 |
-| atl.cpp:939:10:939:18 | SetString | (SSL *,int) |  | SSL_set_purpose | 1 |
-| atl.cpp:939:10:939:18 | SetString | (SSL *,int) |  | SSL_set_quic_tls_early_data_enabled | 1 |
-| atl.cpp:939:10:939:18 | SetString | (SSL *,int) |  | SSL_set_quiet_shutdown | 1 |
-| atl.cpp:939:10:939:18 | SetString | (SSL *,int) |  | SSL_set_read_ahead | 1 |
-| atl.cpp:939:10:939:18 | SetString | (SSL *,int) |  | SSL_set_security_level | 1 |
-| atl.cpp:939:10:939:18 | SetString | (SSL *,int) |  | SSL_set_shutdown | 1 |
-| atl.cpp:939:10:939:18 | SetString | (SSL *,int) |  | SSL_set_trust | 1 |
-| atl.cpp:939:10:939:18 | SetString | (SSL *,int) |  | SSL_set_verify_depth | 1 |
-| atl.cpp:939:10:939:18 | SetString | (SSL_CONNECTION *,int) |  | dtls1_read_failed | 1 |
-| atl.cpp:939:10:939:18 | SetString | (SSL_CONNECTION *,int) |  | ossl_statem_send_fatal | 1 |
-| atl.cpp:939:10:939:18 | SetString | (SSL_CONNECTION *,int) |  | ossl_statem_set_in_init | 1 |
-| atl.cpp:939:10:939:18 | SetString | (SSL_CONNECTION *,int) |  | tls1_shared_group | 1 |
-| atl.cpp:939:10:939:18 | SetString | (SSL_CTX *,int) |  | SSL_CTX_set_post_handshake_auth | 1 |
-| atl.cpp:939:10:939:18 | SetString | (SSL_CTX *,int) |  | SSL_CTX_set_purpose | 1 |
-| atl.cpp:939:10:939:18 | SetString | (SSL_CTX *,int) |  | SSL_CTX_set_quiet_shutdown | 1 |
-| atl.cpp:939:10:939:18 | SetString | (SSL_CTX *,int) |  | SSL_CTX_set_security_level | 1 |
-| atl.cpp:939:10:939:18 | SetString | (SSL_CTX *,int) |  | SSL_CTX_set_srp_strength | 1 |
-| atl.cpp:939:10:939:18 | SetString | (SSL_CTX *,int) |  | SSL_CTX_set_trust | 1 |
-| atl.cpp:939:10:939:18 | SetString | (SSL_CTX *,int) |  | SSL_CTX_set_verify_depth | 1 |
-| atl.cpp:939:10:939:18 | SetString | (SSL_CTX *,int) |  | ssl_md | 1 |
-| atl.cpp:939:10:939:18 | SetString | (SSL_SESSION *,int) |  | SSL_SESSION_set_protocol_version | 1 |
-| atl.cpp:939:10:939:18 | SetString | (TS_REQ *,int) |  | TS_REQ_delete_ext | 1 |
-| atl.cpp:939:10:939:18 | SetString | (TS_REQ *,int) |  | TS_REQ_get_ext | 1 |
-| atl.cpp:939:10:939:18 | SetString | (TS_RESP_CTX *,int) |  | TS_RESP_CTX_add_flags | 1 |
-| atl.cpp:939:10:939:18 | SetString | (TS_STATUS_INFO *,int) |  | TS_STATUS_INFO_set_status | 1 |
-| atl.cpp:939:10:939:18 | SetString | (TS_TST_INFO *,int) |  | TS_TST_INFO_delete_ext | 1 |
-| atl.cpp:939:10:939:18 | SetString | (TS_TST_INFO *,int) |  | TS_TST_INFO_get_ext | 1 |
-| atl.cpp:939:10:939:18 | SetString | (TS_VERIFY_CTX *,int) |  | TS_VERIFY_CTX_add_flags | 1 |
-| atl.cpp:939:10:939:18 | SetString | (TS_VERIFY_CTX *,int) |  | TS_VERIFY_CTX_set_flags | 1 |
-| atl.cpp:939:10:939:18 | SetString | (WPACKET *,int) |  | ossl_DER_w_begin_sequence | 1 |
-| atl.cpp:939:10:939:18 | SetString | (X509 *,int) |  | X509_delete_ext | 1 |
-| atl.cpp:939:10:939:18 | SetString | (X509 *,int) |  | X509_self_signed | 1 |
-| atl.cpp:939:10:939:18 | SetString | (X509_ACERT *,int) |  | X509_ACERT_delete_attr | 1 |
-| atl.cpp:939:10:939:18 | SetString | (X509_ATTRIBUTE *,int) |  | X509_ATTRIBUTE_get0_type | 1 |
-| atl.cpp:939:10:939:18 | SetString | (X509_CRL *,int) |  | X509_CRL_delete_ext | 1 |
-| atl.cpp:939:10:939:18 | SetString | (X509_NAME *,int) |  | X509_NAME_delete_entry | 1 |
-| atl.cpp:939:10:939:18 | SetString | (X509_REQ *,int) |  | X509_REQ_delete_attr | 1 |
-| atl.cpp:939:10:939:18 | SetString | (X509_REVOKED *,int) |  | X509_REVOKED_delete_ext | 1 |
-| atl.cpp:939:10:939:18 | SetString | (X509_STORE *,int) |  | X509_STORE_set_depth | 1 |
-| atl.cpp:939:10:939:18 | SetString | (X509_STORE *,int) |  | X509_STORE_set_purpose | 1 |
-| atl.cpp:939:10:939:18 | SetString | (X509_STORE *,int) |  | X509_STORE_set_trust | 1 |
-| atl.cpp:939:10:939:18 | SetString | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_depth | 1 |
-| atl.cpp:939:10:939:18 | SetString | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_error | 1 |
-| atl.cpp:939:10:939:18 | SetString | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_error_depth | 1 |
-| atl.cpp:939:10:939:18 | SetString | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_purpose | 1 |
-| atl.cpp:939:10:939:18 | SetString | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_trust | 1 |
-| atl.cpp:939:10:939:18 | SetString | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_get0_host | 1 |
-| atl.cpp:939:10:939:18 | SetString | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_auth_level | 1 |
-| atl.cpp:939:10:939:18 | SetString | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_depth | 1 |
-| atl.cpp:939:10:939:18 | SetString | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_purpose | 1 |
-| atl.cpp:939:10:939:18 | SetString | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_trust | 1 |
-| atl.cpp:939:10:939:18 | SetString | (_Float128,int) |  | __ldexpf128 | 1 |
-| atl.cpp:939:10:939:18 | SetString | (_Float128,int) |  | __scalbnf128 | 1 |
-| atl.cpp:939:10:939:18 | SetString | (__sigset_t *,int) |  | __sigaddset_compat | 1 |
-| atl.cpp:939:10:939:18 | SetString | (__sigset_t *,int) |  | __sigdelset_compat | 1 |
-| atl.cpp:939:10:939:18 | SetString | (acttab *,int) |  | acttab_insert | 1 |
-| atl.cpp:939:10:939:18 | SetString | (addrinfo *,int) |  | support_format_addrinfo | 1 |
-| atl.cpp:939:10:939:18 | SetString | (aiocb_union *,int) |  | __aio_enqueue_request | 1 |
-| atl.cpp:939:10:939:18 | SetString | (argp_fmtstream_t,int) |  | __argp_fmtstream_putc | 1 |
-| atl.cpp:939:10:939:18 | SetString | (char **,int) |  | addrsort | 1 |
-| atl.cpp:939:10:939:18 | SetString | (char *,int) |  | Curl_str2addr | 1 |
-| atl.cpp:939:10:939:18 | SetString | (char *,int) |  | PEM_proc_type | 1 |
-| atl.cpp:939:10:939:18 | SetString | (char,int) | CStringT | CStringT | 1 |
-| atl.cpp:939:10:939:18 | SetString | (connectdata *,int) |  | Curl_conn_is_ssl | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const ASN1_BIT_STRING *,int) |  | ASN1_BIT_STRING_get_bit | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const BIGNUM *,int) |  | BN_get_flags | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const BIGNUM *,int) |  | BN_is_bit_set | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const BIO *,int) |  | BIO_get_ex_data | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const BIO *,int) |  | BIO_test_flags | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const CMS_SignerInfo *,int) |  | CMS_signed_get_attr | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const CMS_SignerInfo *,int) |  | CMS_unsigned_get_attr | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const CRYPTO_EX_DATA *,int) |  | CRYPTO_get_ex_data | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const DH *,int) |  | DH_get_ex_data | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const DH *,int) |  | DH_test_flags | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const DH *,int) |  | ossl_dh_dup | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const DSA *,int) |  | DSA_get_ex_data | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const DSA *,int) |  | DSA_test_flags | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const DSA *,int) |  | ossl_dsa_dup | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const ECX_KEY *,int) |  | ossl_ecx_key_dup | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const EC_KEY *,int) |  | EC_KEY_get_ex_data | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const EC_KEY *,int) |  | ossl_ec_key_dup | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const ENGINE *,int) |  | ENGINE_get_ex_data | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_test_flags | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const EVP_MD_CTX *,int) |  | EVP_MD_CTX_test_flags | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const EVP_PKEY *,int) |  | EVP_PKEY_get_attr | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const EVP_PKEY *,int) |  | EVP_PKEY_get_ex_data | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const ML_DSA_KEY *,int) |  | ossl_ml_dsa_key_dup | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const ML_KEM_KEY *,int) |  | ossl_ml_kem_key_dup | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const OPENSSL_STACK *,int) |  | OPENSSL_sk_value | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const OSSL_CMP_CERTREPMESSAGE *,int) |  | ossl_cmp_certrepmessage_get0_certresponse | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_get0_newPkey | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_get_option | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const OSSL_CMP_PKISI *,int) |  | ossl_cmp_pkisi_check_pkifailureinfo | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const OSSL_CMP_POLLREPCONTENT *,int) |  | ossl_cmp_pollrepcontent_get0_pollrep | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const QUIC_CHANNEL *,int) |  | ossl_quic_channel_get_local_stream_count_avail | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const QUIC_CHANNEL *,int) |  | ossl_quic_channel_get_remote_stream_count_avail | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const RSA *,int) |  | RSA_get_ex_data | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const RSA *,int) |  | RSA_test_flags | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const RSA *,int) |  | ossl_rsa_dup | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const SLH_DSA_KEY *,int) |  | ossl_slh_dsa_key_dup | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const SSL *,int) |  | SSL_get_ex_data | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const SSL_CTX *,int) |  | SSL_CTX_get_ex_data | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const SSL_SESSION *,int) |  | SSL_SESSION_get_ex_data | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const SSL_SESSION *,int) |  | ssl_session_dup | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const UI *,int) |  | UI_get_ex_data | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const UI_METHOD *,int) |  | UI_method_get_ex_data | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const X509 *,int) |  | X509_get_ex_data | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const X509 *,int) |  | X509_get_ext | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const X509_ACERT *,int) |  | X509_ACERT_get_attr | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const X509_CRL *,int) |  | X509_CRL_get_ext | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const X509_NAME *,int) |  | X509_NAME_get_entry | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const X509_POLICY_LEVEL *,int) |  | X509_policy_level_get0_node | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const X509_POLICY_TREE *,int) |  | X509_policy_tree_get0_level | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const X509_REQ *,int) |  | X509_REQ_get_attr | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const X509_REVOKED *,int) |  | X509_REVOKED_get_ext | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const X509_STORE *,int) |  | X509_STORE_get_ex_data | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const X509_STORE_CTX *,int) |  | X509_STORE_CTX_get_ex_data | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const XCHAR *,int) | CStringT | CStringT | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const YCHAR *,int) | CStringT | CStringT | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const char *,int) |  | DH_meth_new | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const char *,int) |  | DSA_meth_new | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const char *,int) |  | Jim_StrDupLen | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const char *,int) |  | NETSCAPE_SPKI_b64_decode | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const char *,int) |  | RSA_meth_new | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const char *,int) |  | ftok | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const char *,int) |  | gethostbyname2 | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const char *,int) |  | parse_yesno | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const char *,int) |  | res_gethostbyname2 | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const stack_st_X509_ATTRIBUTE *,int) |  | X509at_get_attr | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const stack_st_X509_EXTENSION *,int) |  | X509v3_get_ext | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const unsigned char *,int) |  | Jim_GenHashFunction | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const unsigned char *,int) |  | OPENSSL_uni2asc | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const unsigned char *,int) |  | OPENSSL_uni2utf8 | 1 |
-| atl.cpp:939:10:939:18 | SetString | (const void *,int) |  | inet6_rth_getaddr | 1 |
-| atl.cpp:939:10:939:18 | SetString | (double,int) |  | __ldexp | 1 |
-| atl.cpp:939:10:939:18 | SetString | (double,int) |  | __scalbn | 1 |
-| atl.cpp:939:10:939:18 | SetString | (double[],int) |  | getloadavg | 1 |
-| atl.cpp:939:10:939:18 | SetString | (dynhds *,int) |  | Curl_dynhds_set_opts | 1 |
-| atl.cpp:939:10:939:18 | SetString | (fexcept_t *,int) |  | fegetexceptflag | 1 |
-| atl.cpp:939:10:939:18 | SetString | (float,int) |  | __ldexpf | 1 |
-| atl.cpp:939:10:939:18 | SetString | (float,int) |  | __scalbnf | 1 |
-| atl.cpp:939:10:939:18 | SetString | (gzFile,int) |  | gzflush | 1 |
-| atl.cpp:939:10:939:18 | SetString | (gzFile,int) |  | gzputc | 1 |
-| atl.cpp:939:10:939:18 | SetString | (int *,int) |  | X509_PURPOSE_set | 1 |
-| atl.cpp:939:10:939:18 | SetString | (int *,int) |  | X509_TRUST_set | 1 |
-| atl.cpp:939:10:939:18 | SetString | (int *,int) |  | __lll_unlock_elision | 1 |
-| atl.cpp:939:10:939:18 | SetString | (int,int) |  | BN_security_bits | 1 |
-| atl.cpp:939:10:939:18 | SetString | (int,int) |  | EVP_MD_meth_new | 1 |
-| atl.cpp:939:10:939:18 | SetString | (int,int) |  | EVP_PKEY_meth_new | 1 |
-| atl.cpp:939:10:939:18 | SetString | (int,int) |  | __isctype | 1 |
-| atl.cpp:939:10:939:18 | SetString | (int,int) |  | acttab_alloc | 1 |
-| atl.cpp:939:10:939:18 | SetString | (int,int) |  | div | 1 |
-| atl.cpp:939:10:939:18 | SetString | (int,int) |  | inet6_rth_space | 1 |
-| atl.cpp:939:10:939:18 | SetString | (long double,int) |  | __ldexpl | 1 |
-| atl.cpp:939:10:939:18 | SetString | (netlink_handle *,int) |  | __netlink_request | 1 |
-| atl.cpp:939:10:939:18 | SetString | (nghttp2_option *,int) |  | nghttp2_option_set_no_auto_ping_ack | 1 |
-| atl.cpp:939:10:939:18 | SetString | (nghttp2_option *,int) |  | nghttp2_option_set_no_auto_window_update | 1 |
-| atl.cpp:939:10:939:18 | SetString | (nghttp2_option *,int) |  | nghttp2_option_set_no_closed_streams | 1 |
-| atl.cpp:939:10:939:18 | SetString | (nghttp2_option *,int) |  | nghttp2_option_set_no_http_messaging | 1 |
-| atl.cpp:939:10:939:18 | SetString | (nghttp2_option *,int) |  | nghttp2_option_set_no_recv_client_magic | 1 |
-| atl.cpp:939:10:939:18 | SetString | (nghttp2_option *,int) |  | nghttp2_option_set_no_rfc9113_leading_and_trailing_ws_validation | 1 |
-| atl.cpp:939:10:939:18 | SetString | (nghttp2_option *,int) |  | nghttp2_option_set_server_fallback_rfc7540_priorities | 1 |
-| atl.cpp:939:10:939:18 | SetString | (ns_msg,int) |  | ns_msg_getflag | 1 |
-| atl.cpp:939:10:939:18 | SetString | (obstack *,int) |  | _obstack_newchunk | 1 |
-| atl.cpp:939:10:939:18 | SetString | (posix_spawnattr_t *,int) |  | posix_spawnattr_setcgroup_np | 1 |
-| atl.cpp:939:10:939:18 | SetString | (posix_spawnattr_t *,int) |  | posix_spawnattr_setschedpolicy | 1 |
-| atl.cpp:939:10:939:18 | SetString | (pthread_attr_t *,int) |  | __pthread_attr_setschedpolicy | 1 |
-| atl.cpp:939:10:939:18 | SetString | (pthread_barrierattr_t *,int) |  | __pthread_barrierattr_setpshared | 1 |
-| atl.cpp:939:10:939:18 | SetString | (pthread_mutexattr_t *,int) |  | ___pthread_mutexattr_settype | 1 |
-| atl.cpp:939:10:939:18 | SetString | (pthread_mutexattr_t *,int) |  | __pthread_mutexattr_setprioceiling | 1 |
-| atl.cpp:939:10:939:18 | SetString | (pthread_mutexattr_t *,int) |  | __pthread_mutexattr_setprotocol | 1 |
-| atl.cpp:939:10:939:18 | SetString | (pthread_rwlockattr_t *,int) |  | __pthread_rwlockattr_setkind_np | 1 |
-| atl.cpp:939:10:939:18 | SetString | (pthread_rwlockattr_t *,int) |  | __pthread_rwlockattr_setpshared | 1 |
-| atl.cpp:939:10:939:18 | SetString | (rule *,int) |  | Configlist_add | 1 |
-| atl.cpp:939:10:939:18 | SetString | (rule *,int) |  | Configlist_addbasis | 1 |
-| atl.cpp:939:10:939:18 | SetString | (sigset_t *,int) |  | sigaddset | 1 |
-| atl.cpp:939:10:939:18 | SetString | (sigset_t *,int) |  | sigdelset | 1 |
-| atl.cpp:939:10:939:18 | SetString | (sqlite3 *,int) |  | sqlite3_busy_timeout | 1 |
-| atl.cpp:939:10:939:18 | SetString | (sqlite3 *,int) |  | sqlite3_db_name | 1 |
-| atl.cpp:939:10:939:18 | SetString | (sqlite3 *,int) |  | sqlite3_wal_autocheckpoint | 1 |
-| atl.cpp:939:10:939:18 | SetString | (sqlite3_backup *,int) |  | sqlite3_backup_step | 1 |
-| atl.cpp:939:10:939:18 | SetString | (sqlite3_context *,int) |  | sqlite3_aggregate_context | 1 |
-| atl.cpp:939:10:939:18 | SetString | (sqlite3_context *,int) |  | sqlite3_result_error_code | 1 |
-| atl.cpp:939:10:939:18 | SetString | (sqlite3_index_info *,int) |  | sqlite3_vtab_collation | 1 |
-| atl.cpp:939:10:939:18 | SetString | (sqlite3_stmt *,int) |  | sqlite3_bind_parameter_name | 1 |
-| atl.cpp:939:10:939:18 | SetString | (sqlite3_stmt *,int) |  | sqlite3_column_blob | 1 |
-| atl.cpp:939:10:939:18 | SetString | (sqlite3_stmt *,int) |  | sqlite3_column_bytes | 1 |
-| atl.cpp:939:10:939:18 | SetString | (sqlite3_stmt *,int) |  | sqlite3_column_bytes16 | 1 |
-| atl.cpp:939:10:939:18 | SetString | (sqlite3_stmt *,int) |  | sqlite3_column_decltype | 1 |
-| atl.cpp:939:10:939:18 | SetString | (sqlite3_stmt *,int) |  | sqlite3_column_decltype16 | 1 |
-| atl.cpp:939:10:939:18 | SetString | (sqlite3_stmt *,int) |  | sqlite3_column_double | 1 |
-| atl.cpp:939:10:939:18 | SetString | (sqlite3_stmt *,int) |  | sqlite3_column_int | 1 |
-| atl.cpp:939:10:939:18 | SetString | (sqlite3_stmt *,int) |  | sqlite3_column_int64 | 1 |
-| atl.cpp:939:10:939:18 | SetString | (sqlite3_stmt *,int) |  | sqlite3_column_name | 1 |
-| atl.cpp:939:10:939:18 | SetString | (sqlite3_stmt *,int) |  | sqlite3_column_name16 | 1 |
-| atl.cpp:939:10:939:18 | SetString | (sqlite3_stmt *,int) |  | sqlite3_column_text | 1 |
-| atl.cpp:939:10:939:18 | SetString | (sqlite3_stmt *,int) |  | sqlite3_column_text16 | 1 |
-| atl.cpp:939:10:939:18 | SetString | (sqlite3_stmt *,int) |  | sqlite3_column_type | 1 |
-| atl.cpp:939:10:939:18 | SetString | (sqlite3_stmt *,int) |  | sqlite3_column_value | 1 |
-| atl.cpp:939:10:939:18 | SetString | (sqlite3_stmt *,int) |  | sqlite3_stmt_explain | 1 |
-| atl.cpp:939:10:939:18 | SetString | (stack_st_PKCS7 *,int) |  | PKCS12_add_safes | 1 |
-| atl.cpp:939:10:939:18 | SetString | (stack_st_SSL_COMP *,int) |  | ssl3_comp_find | 1 |
-| atl.cpp:939:10:939:18 | SetString | (stack_st_X509_ATTRIBUTE *,int) |  | X509at_delete_attr | 1 |
-| atl.cpp:939:10:939:18 | SetString | (stack_st_X509_EXTENSION *,int) |  | X509v3_delete_ext | 1 |
-| atl.cpp:939:10:939:18 | SetString | (timespec *,int) |  | __timespec_get | 1 |
-| atl.cpp:939:10:939:18 | SetString | (timespec *,int) |  | __timespec_getres | 1 |
-| atl.cpp:939:10:939:18 | SetString | (uint16_t,int) |  | tls1_group_id2nid | 1 |
-| atl.cpp:939:10:939:18 | SetString | (unsigned char *,int) |  | RAND_bytes | 1 |
-| atl.cpp:939:10:939:18 | SetString | (unsigned char *,int) |  | RAND_priv_bytes | 1 |
-| atl.cpp:939:10:939:18 | SetString | (unsigned char *,int) |  | ossl_ipaddr_to_asc | 1 |
-| atl.cpp:939:10:939:18 | SetString | (unsigned short,int) |  | dtls1_get_queue_priority | 1 |
-| atl.cpp:939:10:939:18 | SetString | (uv_env_item_t *,int) |  | uv_os_free_environ | 1 |
-| atl.cpp:939:10:939:18 | SetString | (void *,int) |  | DSO_dsobyaddr | 1 |
-| atl.cpp:939:10:939:18 | SetString | (void *,int) |  | sqlite3_realloc | 1 |
-| atl.cpp:939:10:939:18 | SetString | (void *const *,int) |  | __backtrace_symbols | 1 |
-| atl.cpp:939:10:939:18 | SetString | (wchar_t,int) | CStringT | CStringT | 1 |
-| atl.cpp:940:10:940:18 | SetString | (PCXSTR) |  | operator+= | 0 |
-| atl.cpp:940:10:940:18 | SetString | (PCXSTR) | CSimpleStringT | operator+= | 0 |
-| atl.cpp:940:10:940:18 | SetString | (PCXSTR) | CStringT | operator= | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | ASN1_STRING_type_new | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | ASN1_tag2bit | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | ASN1_tag2str | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | Jim_ReturnCode | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | Jim_SignalId | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | OBJ_nid2ln | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | OBJ_nid2obj | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | OBJ_nid2sn | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | OSSL_trace_get_category_name | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | PKCS12_init | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | Symbol_Nth | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | X509_PURPOSE_get0 | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | X509_TRUST_get0 | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | X509_TRUST_get_by_id | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | __btowc | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | __current_locale_name | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | __fdopendir | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | __get_errlist | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | __get_errname | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | __math_invalid_i | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | __math_invalidf_i | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | __p_class | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | __p_rcode | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | __p_type | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | __pkey_get | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | __sigdescr_np | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | __strerrordesc_np | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | _tolower | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | _toupper | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | btowc | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | c_tolower | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | c_toupper | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | curlx_sitouz | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | evp_pkey_type2name | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | inet6_option_space | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | isalnum | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | isalpha | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | isblank | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | iscntrl | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | isdigit | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | isgraph | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | islower | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | isprint | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | ispunct | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | isspace | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | isupper | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | isxdigit | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | ossl_tolower | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | ossl_toupper | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | sigabbrev_np | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | sqlite3_compileoption_get | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | sqlite3_errstr | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | strerrorname_np | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | support_report_failure | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | svcudp_create | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | tls13_alert_code | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | toascii | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | tolower | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | toupper | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | uabs | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | uv__accept | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | uv_err_name | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | uv_get_osfhandle | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | uv_strerror | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | uv_translate_sys_error | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) |  | zError | 0 |
-| atl.cpp:942:11:942:20 | operator[] | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| atl.cpp:1036:5:1036:12 | CStringT | (const VARIANT &) |  | operator+= | 0 |
-| atl.cpp:1036:5:1036:12 | CStringT | (const VARIANT &) | CStringT | CStringT | 0 |
-| atl.cpp:1036:5:1036:12 | CStringT | (const VARIANT &) | CStringT | operator= | 0 |
-| atl.cpp:1037:5:1037:12 | CStringT | (LPCSTR,IAtlStringMgr *) | CStringT | CStringT | 1 |
-| atl.cpp:1037:5:1037:12 | CStringT | (LPCWSTR,IAtlStringMgr *) | CStringT | CStringT | 1 |
-| atl.cpp:1037:5:1037:12 | CStringT | (PCXSTR,IAtlStringMgr *) | CSimpleStringT | CSimpleStringT | 1 |
-| atl.cpp:1037:5:1037:12 | CStringT | (const VARIANT &,IAtlStringMgr *) | CStringT | CStringT | 0 |
-| atl.cpp:1037:5:1037:12 | CStringT | (const VARIANT &,IAtlStringMgr *) | CStringT | CStringT | 1 |
-| atl.cpp:1037:5:1037:12 | CStringT | (const unsigned char *,IAtlStringMgr *) | CStringT | CStringT | 1 |
-| atl.cpp:1038:5:1038:12 | CStringT | (const CStringT &) | CStringT | CStringT | 0 |
-| atl.cpp:1038:5:1038:12 | CStringT | (const CStringT &) | CStringT | operator= | 0 |
-| atl.cpp:1042:5:1042:12 | CStringT | (LPCSTR,IAtlStringMgr *) | CStringT | CStringT | 0 |
-| atl.cpp:1042:5:1042:12 | CStringT | (LPCSTR,IAtlStringMgr *) | CStringT | CStringT | 1 |
-| atl.cpp:1042:5:1042:12 | CStringT | (LPCWSTR,IAtlStringMgr *) | CStringT | CStringT | 1 |
-| atl.cpp:1042:5:1042:12 | CStringT | (PCXSTR,IAtlStringMgr *) | CSimpleStringT | CSimpleStringT | 1 |
-| atl.cpp:1042:5:1042:12 | CStringT | (const VARIANT &,IAtlStringMgr *) | CStringT | CStringT | 1 |
-| atl.cpp:1042:5:1042:12 | CStringT | (const unsigned char *,IAtlStringMgr *) | CStringT | CStringT | 1 |
-| atl.cpp:1043:5:1043:12 | CStringT | (LPCSTR,IAtlStringMgr *) | CStringT | CStringT | 1 |
-| atl.cpp:1043:5:1043:12 | CStringT | (LPCWSTR,IAtlStringMgr *) | CStringT | CStringT | 0 |
-| atl.cpp:1043:5:1043:12 | CStringT | (LPCWSTR,IAtlStringMgr *) | CStringT | CStringT | 1 |
-| atl.cpp:1043:5:1043:12 | CStringT | (PCXSTR,IAtlStringMgr *) | CSimpleStringT | CSimpleStringT | 1 |
-| atl.cpp:1043:5:1043:12 | CStringT | (const VARIANT &,IAtlStringMgr *) | CStringT | CStringT | 1 |
-| atl.cpp:1043:5:1043:12 | CStringT | (const unsigned char *,IAtlStringMgr *) | CStringT | CStringT | 1 |
-| atl.cpp:1045:5:1045:12 | CStringT | (char *) |  | SRP_VBASE_new | 0 |
-| atl.cpp:1045:5:1045:12 | CStringT | (char *) |  | _IO_gets | 0 |
-| atl.cpp:1045:5:1045:12 | CStringT | (char *) |  | __mktemp | 0 |
-| atl.cpp:1045:5:1045:12 | CStringT | (char *) |  | __nis_default_group | 0 |
-| atl.cpp:1045:5:1045:12 | CStringT | (char *) |  | __nis_default_owner | 0 |
-| atl.cpp:1045:5:1045:12 | CStringT | (char *) |  | __nis_default_ttl | 0 |
-| atl.cpp:1045:5:1045:12 | CStringT | (char *) |  | __xpg_basename | 0 |
-| atl.cpp:1045:5:1045:12 | CStringT | (char *) |  | ctermid | 0 |
-| atl.cpp:1045:5:1045:12 | CStringT | (char *) |  | cuserid | 0 |
-| atl.cpp:1045:5:1045:12 | CStringT | (char *) |  | defossilize | 0 |
-| atl.cpp:1045:5:1045:12 | CStringT | (char *) |  | des_setparity | 0 |
-| atl.cpp:1045:5:1045:12 | CStringT | (char *) |  | dirname | 0 |
-| atl.cpp:1045:5:1045:12 | CStringT | (char *) |  | getwd | 0 |
-| atl.cpp:1045:5:1045:12 | CStringT | (char *) |  | make_uppercase | 0 |
-| atl.cpp:1045:5:1045:12 | CStringT | (char *) |  | mkdtemp | 0 |
-| atl.cpp:1045:5:1045:12 | CStringT | (char *) |  | next_item | 0 |
-| atl.cpp:1045:5:1045:12 | CStringT | (char *) |  | strfry | 0 |
-| atl.cpp:1045:5:1045:12 | CStringT | (char *) | CStringT | CStringT | 0 |
-| atl.cpp:1046:5:1046:12 | CStringT | (unsigned char *) | CStringT | CStringT | 0 |
-| atl.cpp:1047:5:1047:12 | CStringT | (wchar_t *) | CStringT | CStringT | 0 |
-| atl.cpp:1049:5:1049:12 | CStringT | (ASN1_STRING *,int) |  | ASN1_STRING_length_set | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (ASYNC_WAIT_CTX *,int) |  | ASYNC_WAIT_CTX_set_status | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (BIGNUM *,int) |  | BN_clear_bit | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (BIGNUM *,int) |  | BN_mask_bits | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (BIGNUM *,int) |  | BN_set_bit | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (BIGNUM *,int) |  | BN_set_flags | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (BIGNUM *,int) |  | bn_expand2 | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (BIGNUM *,int) |  | bn_wexpand | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (BIGNUM *,int) |  | ossl_bn_mask_bits_fixed_top | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (BIO *,int) |  | BIO_clear_flags | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (BIO *,int) |  | BIO_find_type | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (BIO *,int) |  | BIO_set_flags | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (BIO *,int) |  | BIO_set_init | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (BIO *,int) |  | BIO_set_retry_reason | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (BIO *,int) |  | BIO_set_shutdown | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (BIO *,int) |  | TXT_DB_read | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (CMS_SignerInfo *,int) |  | CMS_signed_delete_attr | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (CMS_SignerInfo *,int) |  | CMS_unsigned_delete_attr | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (CURL *,int) |  | curl_easy_pause | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (Curl_easy *,int) |  | Curl_conn_get_socket | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (DH *,int) |  | DH_clear_flags | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (DH *,int) |  | DH_set_flags | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (DH_METHOD *,int) |  | DH_meth_set_flags | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (DSA *,int) |  | DSA_clear_flags | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (DSA *,int) |  | DSA_set_flags | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (DSA_METHOD *,int) |  | DSA_meth_set_flags | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (EC_GROUP *,int) |  | EC_GROUP_set_asn1_flag | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (EC_GROUP *,int) |  | EC_GROUP_set_curve_name | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (EC_KEY *,int) |  | EC_KEY_clear_flags | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (EC_KEY *,int) |  | EC_KEY_set_asn1_flag | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (EC_KEY *,int) |  | EC_KEY_set_flags | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (ENGINE *,int) |  | ENGINE_cmd_is_executable | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (ENGINE *,int) |  | ENGINE_set_flags | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (EVP_CIPHER *,int) |  | EVP_CIPHER_meth_set_impl_ctx_size | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (EVP_CIPHER *,int) |  | EVP_CIPHER_meth_set_iv_length | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_clear_flags | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_flags | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_key_length | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_num | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (EVP_KEYMGMT *,int) |  | evp_keymgmt_util_query_operation_name | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (EVP_MD *,int) |  | EVP_MD_meth_set_app_datasize | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (EVP_MD *,int) |  | EVP_MD_meth_set_input_blocksize | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (EVP_MD *,int) |  | EVP_MD_meth_set_result_size | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (EVP_MD_CTX *,int) |  | EVP_MD_CTX_clear_flags | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (EVP_MD_CTX *,int) |  | EVP_MD_CTX_set_flags | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (EVP_PKEY *,int) |  | EVP_PKEY_delete_attr | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (EVP_PKEY *,int) |  | EVP_PKEY_save_parameters | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (EVP_PKEY *,int) |  | EVP_PKEY_set_type | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_get_keygen_info | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_kdf_type | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_nid | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_paramgen_type | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_rfc5114 | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dhx_rfc5114 | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ec_param_enc | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ec_paramgen_curve_nid | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ecdh_kdf_type | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_hkdf_mode | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_rsa_padding | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_rsa_pss_saltlen | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_gindex | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_h | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_pcounter | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (FILE *,int) |  | _IO_default_pbackfail | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (FILE *,int) |  | _IO_fwide | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (FILE *,int) |  | _IO_init | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (FILE *,int) |  | _IO_init_internal | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (FILE *,int) |  | _IO_new_file_attach | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (FILE *,int) |  | _IO_new_file_overflow | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (FILE *,int) |  | _IO_old_init | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (FILE *,int) |  | _IO_sputbackc | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (FILE *,int) |  | _IO_str_overflow | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (FILE *,int) |  | _IO_str_pbackfail | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (FILE *,int) |  | __printf_buffer_as_file_overflow | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (FILE *,int) |  | __wprintf_buffer_as_file_overflow | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (FTS *,int) |  | fts_children | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (LIBSSH2_CHANNEL *,int) |  | _libssh2_channel_extended_data | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (LIBSSH2_CHANNEL *,int) |  | _libssh2_channel_flush | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_flush_ex | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_handle_extended_data | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_handle_extended_data2 | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_set_blocking | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (LIBSSH2_SESSION *,int) |  | _libssh2_session_set_blocking | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (LIBSSH2_SESSION *,int) |  | libssh2_hostkey_hash | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (LIBSSH2_SESSION *,int) |  | libssh2_session_methods | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (LIBSSH2_SESSION *,int) |  | libssh2_session_set_blocking | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (LIBSSH2_SESSION *,int) |  | libssh2_session_startup | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (LPCOLESTR,int) | CComBSTR | Append | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (OCSP_BASICRESP *,int) |  | OCSP_BASICRESP_delete_ext | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (OCSP_BASICRESP *,int) |  | OCSP_BASICRESP_get_ext | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (OCSP_BASICRESP *,int) |  | OCSP_resp_get0 | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (OCSP_ONEREQ *,int) |  | OCSP_ONEREQ_delete_ext | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (OCSP_ONEREQ *,int) |  | OCSP_ONEREQ_get_ext | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (OCSP_REQUEST *,int) |  | OCSP_REQUEST_delete_ext | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (OCSP_REQUEST *,int) |  | OCSP_REQUEST_get_ext | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (OCSP_REQUEST *,int) |  | OCSP_request_onereq_get0 | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (OCSP_SINGLERESP *,int) |  | OCSP_SINGLERESP_delete_ext | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (OCSP_SINGLERESP *,int) |  | OCSP_SINGLERESP_get_ext | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (OPENSSL_STACK *,int) |  | OPENSSL_sk_delete | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (OPENSSL_STACK *,int) |  | OPENSSL_sk_reserve | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (OPENSSL_sk_compfunc,int) |  | OPENSSL_sk_new_reserve | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (OSSL_ACKM *,int) |  | ossl_ackm_get_ack_deadline | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (OSSL_ACKM *,int) |  | ossl_ackm_get_ack_frame | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (OSSL_ACKM *,int) |  | ossl_ackm_get_largest_acked | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (OSSL_ACKM *,int) |  | ossl_ackm_on_pkt_space_discarded | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_set_serverPort | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (OSSL_CMP_CTX *,int) |  | ossl_cmp_ctx_set_failInfoCode | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (OSSL_CMP_CTX *,int) |  | ossl_cmp_ctx_set_status | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (OSSL_CMP_CTX *,int) |  | ossl_cmp_msg_create | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (OSSL_CMP_CTX *,int) |  | ossl_cmp_pollReq_new | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (OSSL_CMP_MSG *,int) |  | ossl_cmp_msg_set_bodytype | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (OSSL_CMP_PKIHEADER *,int) |  | ossl_cmp_hdr_set_pvno | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (OSSL_CMP_REVREPCONTENT *,int) |  | ossl_cmp_revrepcontent_get_CertId | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (OSSL_CMP_REVREPCONTENT *,int) |  | ossl_cmp_revrepcontent_get_pkisi | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_accept_raverified | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_accept_unprotected | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_grant_implicit_confirm | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_send_unprotected_errors | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (OSSL_CRMF_PKIPUBLICATIONINFO *,int) |  | OSSL_CRMF_MSG_set_PKIPublicationInfo_action | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (OSSL_DECODER_CTX *,int) |  | OSSL_DECODER_CTX_set_selection | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (OSSL_ENCODER_CTX *,int) |  | OSSL_ENCODER_CTX_set_selection | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (OSSL_LIB_CTX *,int) |  | OSSL_LIB_CTX_get_data | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (OSSL_LIB_CTX *,int) |  | OSSL_LIB_CTX_set_conf_diagnostics | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (OSSL_LIB_CTX *,int) |  | ossl_ctx_global_properties | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (OSSL_LIB_CTX *,int) |  | ossl_dh_new_by_nid_ex | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (OSSL_LIB_CTX *,int) |  | ossl_lib_ctx_get_data | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (OSSL_LIB_CTX *,int) |  | ossl_mac_key_new | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (OSSL_PARAM *,int) |  | OSSL_PARAM_set_int | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (OSSL_QRX *,int) |  | ossl_qrx_get_bytes_received | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (OSSL_RECORD_LAYER *,int) |  | tls_set_first_handshake | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (OSSL_RECORD_LAYER *,int) |  | tls_set_plain_alerts | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (OSSL_STORE_CTX *,int) |  | OSSL_STORE_expect | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (PKCS7 *,int) |  | PKCS7_set_type | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (QUIC_CHANNEL *,int) |  | ossl_quic_channel_new_stream_local | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (QUIC_ENGINE *,int) |  | ossl_quic_engine_set_inhibit_tick | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (QUIC_PORT *,int) |  | ossl_quic_port_set_allow_incoming | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (QUIC_RCIDM *,int) |  | ossl_quic_rcidm_get_preferred_tx_dcid_changed | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (QUIC_RSTREAM *,int) |  | ossl_quic_rstream_set_cleanse | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (QUIC_RXFC *,int) |  | ossl_quic_rxfc_get_error | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (QUIC_RXFC *,int) |  | ossl_quic_rxfc_has_cwm_changed | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (QUIC_SSTREAM *,int) |  | ossl_quic_sstream_set_cleanse | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (QUIC_STREAM_MAP *,int) |  | ossl_quic_stream_map_get_accept_queue_len | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (QUIC_TXFC *,int) |  | ossl_quic_txfc_has_become_blocked | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (RSA *,int) |  | RSA_clear_flags | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (RSA *,int) |  | RSA_set_flags | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (RSA_METHOD *,int) |  | RSA_meth_set_flags | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_hashalg | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_maskgenhashalg | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_saltlen | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_trailerfield | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (SSL *,int) |  | SSL_key_update | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (SSL *,int) |  | SSL_set_post_handshake_auth | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (SSL *,int) |  | SSL_set_purpose | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (SSL *,int) |  | SSL_set_quic_tls_early_data_enabled | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (SSL *,int) |  | SSL_set_quiet_shutdown | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (SSL *,int) |  | SSL_set_read_ahead | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (SSL *,int) |  | SSL_set_security_level | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (SSL *,int) |  | SSL_set_shutdown | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (SSL *,int) |  | SSL_set_trust | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (SSL *,int) |  | SSL_set_verify_depth | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (SSL_CONNECTION *,int) |  | dtls1_read_failed | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (SSL_CONNECTION *,int) |  | ossl_statem_send_fatal | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (SSL_CONNECTION *,int) |  | ossl_statem_set_in_init | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (SSL_CONNECTION *,int) |  | tls1_shared_group | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (SSL_CTX *,int) |  | SSL_CTX_set_post_handshake_auth | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (SSL_CTX *,int) |  | SSL_CTX_set_purpose | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (SSL_CTX *,int) |  | SSL_CTX_set_quiet_shutdown | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (SSL_CTX *,int) |  | SSL_CTX_set_security_level | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (SSL_CTX *,int) |  | SSL_CTX_set_srp_strength | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (SSL_CTX *,int) |  | SSL_CTX_set_trust | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (SSL_CTX *,int) |  | SSL_CTX_set_verify_depth | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (SSL_CTX *,int) |  | ssl_md | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (SSL_SESSION *,int) |  | SSL_SESSION_set_protocol_version | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (TS_REQ *,int) |  | TS_REQ_delete_ext | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (TS_REQ *,int) |  | TS_REQ_get_ext | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (TS_RESP_CTX *,int) |  | TS_RESP_CTX_add_flags | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (TS_STATUS_INFO *,int) |  | TS_STATUS_INFO_set_status | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (TS_TST_INFO *,int) |  | TS_TST_INFO_delete_ext | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (TS_TST_INFO *,int) |  | TS_TST_INFO_get_ext | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (TS_VERIFY_CTX *,int) |  | TS_VERIFY_CTX_add_flags | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (TS_VERIFY_CTX *,int) |  | TS_VERIFY_CTX_set_flags | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (WPACKET *,int) |  | ossl_DER_w_begin_sequence | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (X509 *,int) |  | X509_delete_ext | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (X509 *,int) |  | X509_self_signed | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (X509_ACERT *,int) |  | X509_ACERT_delete_attr | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (X509_ATTRIBUTE *,int) |  | X509_ATTRIBUTE_get0_type | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (X509_CRL *,int) |  | X509_CRL_delete_ext | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (X509_NAME *,int) |  | X509_NAME_delete_entry | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (X509_REQ *,int) |  | X509_REQ_delete_attr | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (X509_REVOKED *,int) |  | X509_REVOKED_delete_ext | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (X509_STORE *,int) |  | X509_STORE_set_depth | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (X509_STORE *,int) |  | X509_STORE_set_purpose | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (X509_STORE *,int) |  | X509_STORE_set_trust | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_depth | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_error | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_error_depth | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_purpose | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_trust | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_get0_host | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_auth_level | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_depth | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_purpose | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_trust | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (_Float128,int) |  | __ldexpf128 | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (_Float128,int) |  | __scalbnf128 | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (__sigset_t *,int) |  | __sigaddset_compat | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (__sigset_t *,int) |  | __sigdelset_compat | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (acttab *,int) |  | acttab_insert | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (addrinfo *,int) |  | support_format_addrinfo | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (aiocb_union *,int) |  | __aio_enqueue_request | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (argp_fmtstream_t,int) |  | __argp_fmtstream_putc | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (char **,int) |  | addrsort | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (char *,int) |  | Curl_str2addr | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (char *,int) |  | PEM_proc_type | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (char,int) | CStringT | CStringT | 0 |
-| atl.cpp:1049:5:1049:12 | CStringT | (char,int) | CStringT | CStringT | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (connectdata *,int) |  | Curl_conn_is_ssl | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const ASN1_BIT_STRING *,int) |  | ASN1_BIT_STRING_get_bit | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const BIGNUM *,int) |  | BN_get_flags | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const BIGNUM *,int) |  | BN_is_bit_set | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const BIO *,int) |  | BIO_get_ex_data | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const BIO *,int) |  | BIO_test_flags | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const CMS_SignerInfo *,int) |  | CMS_signed_get_attr | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const CMS_SignerInfo *,int) |  | CMS_unsigned_get_attr | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const CRYPTO_EX_DATA *,int) |  | CRYPTO_get_ex_data | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const DH *,int) |  | DH_get_ex_data | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const DH *,int) |  | DH_test_flags | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const DH *,int) |  | ossl_dh_dup | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const DSA *,int) |  | DSA_get_ex_data | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const DSA *,int) |  | DSA_test_flags | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const DSA *,int) |  | ossl_dsa_dup | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const ECX_KEY *,int) |  | ossl_ecx_key_dup | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const EC_KEY *,int) |  | EC_KEY_get_ex_data | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const EC_KEY *,int) |  | ossl_ec_key_dup | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const ENGINE *,int) |  | ENGINE_get_ex_data | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_test_flags | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const EVP_MD_CTX *,int) |  | EVP_MD_CTX_test_flags | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const EVP_PKEY *,int) |  | EVP_PKEY_get_attr | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const EVP_PKEY *,int) |  | EVP_PKEY_get_ex_data | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const ML_DSA_KEY *,int) |  | ossl_ml_dsa_key_dup | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const ML_KEM_KEY *,int) |  | ossl_ml_kem_key_dup | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const OPENSSL_STACK *,int) |  | OPENSSL_sk_value | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const OSSL_CMP_CERTREPMESSAGE *,int) |  | ossl_cmp_certrepmessage_get0_certresponse | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_get0_newPkey | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_get_option | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const OSSL_CMP_PKISI *,int) |  | ossl_cmp_pkisi_check_pkifailureinfo | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const OSSL_CMP_POLLREPCONTENT *,int) |  | ossl_cmp_pollrepcontent_get0_pollrep | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const QUIC_CHANNEL *,int) |  | ossl_quic_channel_get_local_stream_count_avail | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const QUIC_CHANNEL *,int) |  | ossl_quic_channel_get_remote_stream_count_avail | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const RSA *,int) |  | RSA_get_ex_data | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const RSA *,int) |  | RSA_test_flags | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const RSA *,int) |  | ossl_rsa_dup | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const SLH_DSA_KEY *,int) |  | ossl_slh_dsa_key_dup | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const SSL *,int) |  | SSL_get_ex_data | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const SSL_CTX *,int) |  | SSL_CTX_get_ex_data | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const SSL_SESSION *,int) |  | SSL_SESSION_get_ex_data | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const SSL_SESSION *,int) |  | ssl_session_dup | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const UI *,int) |  | UI_get_ex_data | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const UI_METHOD *,int) |  | UI_method_get_ex_data | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const X509 *,int) |  | X509_get_ex_data | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const X509 *,int) |  | X509_get_ext | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const X509_ACERT *,int) |  | X509_ACERT_get_attr | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const X509_CRL *,int) |  | X509_CRL_get_ext | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const X509_NAME *,int) |  | X509_NAME_get_entry | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const X509_POLICY_LEVEL *,int) |  | X509_policy_level_get0_node | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const X509_POLICY_TREE *,int) |  | X509_policy_tree_get0_level | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const X509_REQ *,int) |  | X509_REQ_get_attr | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const X509_REVOKED *,int) |  | X509_REVOKED_get_ext | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const X509_STORE *,int) |  | X509_STORE_get_ex_data | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const X509_STORE_CTX *,int) |  | X509_STORE_CTX_get_ex_data | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const XCHAR *,int) | CStringT | CStringT | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const YCHAR *,int) | CStringT | CStringT | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const char *,int) |  | DH_meth_new | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const char *,int) |  | DSA_meth_new | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const char *,int) |  | Jim_StrDupLen | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const char *,int) |  | NETSCAPE_SPKI_b64_decode | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const char *,int) |  | RSA_meth_new | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const char *,int) |  | ftok | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const char *,int) |  | gethostbyname2 | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const char *,int) |  | parse_yesno | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const char *,int) |  | res_gethostbyname2 | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const stack_st_X509_ATTRIBUTE *,int) |  | X509at_get_attr | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const stack_st_X509_EXTENSION *,int) |  | X509v3_get_ext | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const unsigned char *,int) |  | Jim_GenHashFunction | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const unsigned char *,int) |  | OPENSSL_uni2asc | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const unsigned char *,int) |  | OPENSSL_uni2utf8 | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (const void *,int) |  | inet6_rth_getaddr | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (double,int) |  | __ldexp | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (double,int) |  | __scalbn | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (double[],int) |  | getloadavg | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (dynhds *,int) |  | Curl_dynhds_set_opts | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (fexcept_t *,int) |  | fegetexceptflag | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (float,int) |  | __ldexpf | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (float,int) |  | __scalbnf | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (gzFile,int) |  | gzflush | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (gzFile,int) |  | gzputc | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (int *,int) |  | X509_PURPOSE_set | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (int *,int) |  | X509_TRUST_set | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (int *,int) |  | __lll_unlock_elision | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (int,int) |  | BN_security_bits | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (int,int) |  | EVP_MD_meth_new | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (int,int) |  | EVP_PKEY_meth_new | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (int,int) |  | __isctype | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (int,int) |  | acttab_alloc | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (int,int) |  | div | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (int,int) |  | inet6_rth_space | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (long double,int) |  | __ldexpl | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (netlink_handle *,int) |  | __netlink_request | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (nghttp2_option *,int) |  | nghttp2_option_set_no_auto_ping_ack | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (nghttp2_option *,int) |  | nghttp2_option_set_no_auto_window_update | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (nghttp2_option *,int) |  | nghttp2_option_set_no_closed_streams | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (nghttp2_option *,int) |  | nghttp2_option_set_no_http_messaging | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (nghttp2_option *,int) |  | nghttp2_option_set_no_recv_client_magic | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (nghttp2_option *,int) |  | nghttp2_option_set_no_rfc9113_leading_and_trailing_ws_validation | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (nghttp2_option *,int) |  | nghttp2_option_set_server_fallback_rfc7540_priorities | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (ns_msg,int) |  | ns_msg_getflag | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (obstack *,int) |  | _obstack_newchunk | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (posix_spawnattr_t *,int) |  | posix_spawnattr_setcgroup_np | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (posix_spawnattr_t *,int) |  | posix_spawnattr_setschedpolicy | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (pthread_attr_t *,int) |  | __pthread_attr_setschedpolicy | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (pthread_barrierattr_t *,int) |  | __pthread_barrierattr_setpshared | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (pthread_mutexattr_t *,int) |  | ___pthread_mutexattr_settype | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (pthread_mutexattr_t *,int) |  | __pthread_mutexattr_setprioceiling | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (pthread_mutexattr_t *,int) |  | __pthread_mutexattr_setprotocol | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (pthread_rwlockattr_t *,int) |  | __pthread_rwlockattr_setkind_np | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (pthread_rwlockattr_t *,int) |  | __pthread_rwlockattr_setpshared | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (rule *,int) |  | Configlist_add | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (rule *,int) |  | Configlist_addbasis | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (sigset_t *,int) |  | sigaddset | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (sigset_t *,int) |  | sigdelset | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (sqlite3 *,int) |  | sqlite3_busy_timeout | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (sqlite3 *,int) |  | sqlite3_db_name | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (sqlite3 *,int) |  | sqlite3_wal_autocheckpoint | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (sqlite3_backup *,int) |  | sqlite3_backup_step | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (sqlite3_context *,int) |  | sqlite3_aggregate_context | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (sqlite3_context *,int) |  | sqlite3_result_error_code | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (sqlite3_index_info *,int) |  | sqlite3_vtab_collation | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (sqlite3_stmt *,int) |  | sqlite3_bind_parameter_name | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (sqlite3_stmt *,int) |  | sqlite3_column_blob | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (sqlite3_stmt *,int) |  | sqlite3_column_bytes | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (sqlite3_stmt *,int) |  | sqlite3_column_bytes16 | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (sqlite3_stmt *,int) |  | sqlite3_column_decltype | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (sqlite3_stmt *,int) |  | sqlite3_column_decltype16 | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (sqlite3_stmt *,int) |  | sqlite3_column_double | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (sqlite3_stmt *,int) |  | sqlite3_column_int | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (sqlite3_stmt *,int) |  | sqlite3_column_int64 | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (sqlite3_stmt *,int) |  | sqlite3_column_name | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (sqlite3_stmt *,int) |  | sqlite3_column_name16 | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (sqlite3_stmt *,int) |  | sqlite3_column_text | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (sqlite3_stmt *,int) |  | sqlite3_column_text16 | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (sqlite3_stmt *,int) |  | sqlite3_column_type | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (sqlite3_stmt *,int) |  | sqlite3_column_value | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (sqlite3_stmt *,int) |  | sqlite3_stmt_explain | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (stack_st_PKCS7 *,int) |  | PKCS12_add_safes | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (stack_st_SSL_COMP *,int) |  | ssl3_comp_find | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (stack_st_X509_ATTRIBUTE *,int) |  | X509at_delete_attr | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (stack_st_X509_EXTENSION *,int) |  | X509v3_delete_ext | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (timespec *,int) |  | __timespec_get | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (timespec *,int) |  | __timespec_getres | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (uint16_t,int) |  | tls1_group_id2nid | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (unsigned char *,int) |  | RAND_bytes | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (unsigned char *,int) |  | RAND_priv_bytes | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (unsigned char *,int) |  | ossl_ipaddr_to_asc | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (unsigned short,int) |  | dtls1_get_queue_priority | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (uv_env_item_t *,int) |  | uv_os_free_environ | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (void *,int) |  | DSO_dsobyaddr | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (void *,int) |  | sqlite3_realloc | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (void *const *,int) |  | __backtrace_symbols | 1 |
-| atl.cpp:1049:5:1049:12 | CStringT | (wchar_t,int) | CStringT | CStringT | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (ASN1_STRING *,int) |  | ASN1_STRING_length_set | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (ASYNC_WAIT_CTX *,int) |  | ASYNC_WAIT_CTX_set_status | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (BIGNUM *,int) |  | BN_clear_bit | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (BIGNUM *,int) |  | BN_mask_bits | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (BIGNUM *,int) |  | BN_set_bit | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (BIGNUM *,int) |  | BN_set_flags | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (BIGNUM *,int) |  | bn_expand2 | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (BIGNUM *,int) |  | bn_wexpand | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (BIGNUM *,int) |  | ossl_bn_mask_bits_fixed_top | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (BIO *,int) |  | BIO_clear_flags | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (BIO *,int) |  | BIO_find_type | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (BIO *,int) |  | BIO_set_flags | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (BIO *,int) |  | BIO_set_init | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (BIO *,int) |  | BIO_set_retry_reason | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (BIO *,int) |  | BIO_set_shutdown | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (BIO *,int) |  | TXT_DB_read | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (CMS_SignerInfo *,int) |  | CMS_signed_delete_attr | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (CMS_SignerInfo *,int) |  | CMS_unsigned_delete_attr | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (CURL *,int) |  | curl_easy_pause | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (Curl_easy *,int) |  | Curl_conn_get_socket | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (DH *,int) |  | DH_clear_flags | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (DH *,int) |  | DH_set_flags | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (DH_METHOD *,int) |  | DH_meth_set_flags | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (DSA *,int) |  | DSA_clear_flags | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (DSA *,int) |  | DSA_set_flags | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (DSA_METHOD *,int) |  | DSA_meth_set_flags | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (EC_GROUP *,int) |  | EC_GROUP_set_asn1_flag | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (EC_GROUP *,int) |  | EC_GROUP_set_curve_name | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (EC_KEY *,int) |  | EC_KEY_clear_flags | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (EC_KEY *,int) |  | EC_KEY_set_asn1_flag | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (EC_KEY *,int) |  | EC_KEY_set_flags | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (ENGINE *,int) |  | ENGINE_cmd_is_executable | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (ENGINE *,int) |  | ENGINE_set_flags | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (EVP_CIPHER *,int) |  | EVP_CIPHER_meth_set_impl_ctx_size | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (EVP_CIPHER *,int) |  | EVP_CIPHER_meth_set_iv_length | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_clear_flags | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_flags | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_key_length | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_num | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (EVP_KEYMGMT *,int) |  | evp_keymgmt_util_query_operation_name | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (EVP_MD *,int) |  | EVP_MD_meth_set_app_datasize | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (EVP_MD *,int) |  | EVP_MD_meth_set_input_blocksize | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (EVP_MD *,int) |  | EVP_MD_meth_set_result_size | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (EVP_MD_CTX *,int) |  | EVP_MD_CTX_clear_flags | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (EVP_MD_CTX *,int) |  | EVP_MD_CTX_set_flags | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (EVP_PKEY *,int) |  | EVP_PKEY_delete_attr | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (EVP_PKEY *,int) |  | EVP_PKEY_save_parameters | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (EVP_PKEY *,int) |  | EVP_PKEY_set_type | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_get_keygen_info | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_kdf_type | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_nid | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_paramgen_type | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_rfc5114 | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dhx_rfc5114 | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ec_param_enc | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ec_paramgen_curve_nid | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ecdh_kdf_type | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_hkdf_mode | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_rsa_padding | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_rsa_pss_saltlen | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_gindex | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_h | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_pcounter | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (FILE *,int) |  | _IO_default_pbackfail | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (FILE *,int) |  | _IO_fwide | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (FILE *,int) |  | _IO_init | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (FILE *,int) |  | _IO_init_internal | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (FILE *,int) |  | _IO_new_file_attach | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (FILE *,int) |  | _IO_new_file_overflow | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (FILE *,int) |  | _IO_old_init | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (FILE *,int) |  | _IO_sputbackc | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (FILE *,int) |  | _IO_str_overflow | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (FILE *,int) |  | _IO_str_pbackfail | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (FILE *,int) |  | __printf_buffer_as_file_overflow | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (FILE *,int) |  | __wprintf_buffer_as_file_overflow | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (FTS *,int) |  | fts_children | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (LIBSSH2_CHANNEL *,int) |  | _libssh2_channel_extended_data | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (LIBSSH2_CHANNEL *,int) |  | _libssh2_channel_flush | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_flush_ex | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_handle_extended_data | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_handle_extended_data2 | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_set_blocking | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (LIBSSH2_SESSION *,int) |  | _libssh2_session_set_blocking | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (LIBSSH2_SESSION *,int) |  | libssh2_hostkey_hash | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (LIBSSH2_SESSION *,int) |  | libssh2_session_methods | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (LIBSSH2_SESSION *,int) |  | libssh2_session_set_blocking | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (LIBSSH2_SESSION *,int) |  | libssh2_session_startup | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (LPCOLESTR,int) | CComBSTR | Append | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (OCSP_BASICRESP *,int) |  | OCSP_BASICRESP_delete_ext | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (OCSP_BASICRESP *,int) |  | OCSP_BASICRESP_get_ext | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (OCSP_BASICRESP *,int) |  | OCSP_resp_get0 | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (OCSP_ONEREQ *,int) |  | OCSP_ONEREQ_delete_ext | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (OCSP_ONEREQ *,int) |  | OCSP_ONEREQ_get_ext | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (OCSP_REQUEST *,int) |  | OCSP_REQUEST_delete_ext | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (OCSP_REQUEST *,int) |  | OCSP_REQUEST_get_ext | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (OCSP_REQUEST *,int) |  | OCSP_request_onereq_get0 | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (OCSP_SINGLERESP *,int) |  | OCSP_SINGLERESP_delete_ext | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (OCSP_SINGLERESP *,int) |  | OCSP_SINGLERESP_get_ext | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (OPENSSL_STACK *,int) |  | OPENSSL_sk_delete | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (OPENSSL_STACK *,int) |  | OPENSSL_sk_reserve | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (OPENSSL_sk_compfunc,int) |  | OPENSSL_sk_new_reserve | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (OSSL_ACKM *,int) |  | ossl_ackm_get_ack_deadline | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (OSSL_ACKM *,int) |  | ossl_ackm_get_ack_frame | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (OSSL_ACKM *,int) |  | ossl_ackm_get_largest_acked | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (OSSL_ACKM *,int) |  | ossl_ackm_on_pkt_space_discarded | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_set_serverPort | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (OSSL_CMP_CTX *,int) |  | ossl_cmp_ctx_set_failInfoCode | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (OSSL_CMP_CTX *,int) |  | ossl_cmp_ctx_set_status | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (OSSL_CMP_CTX *,int) |  | ossl_cmp_msg_create | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (OSSL_CMP_CTX *,int) |  | ossl_cmp_pollReq_new | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (OSSL_CMP_MSG *,int) |  | ossl_cmp_msg_set_bodytype | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (OSSL_CMP_PKIHEADER *,int) |  | ossl_cmp_hdr_set_pvno | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (OSSL_CMP_REVREPCONTENT *,int) |  | ossl_cmp_revrepcontent_get_CertId | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (OSSL_CMP_REVREPCONTENT *,int) |  | ossl_cmp_revrepcontent_get_pkisi | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_accept_raverified | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_accept_unprotected | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_grant_implicit_confirm | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_send_unprotected_errors | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (OSSL_CRMF_PKIPUBLICATIONINFO *,int) |  | OSSL_CRMF_MSG_set_PKIPublicationInfo_action | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (OSSL_DECODER_CTX *,int) |  | OSSL_DECODER_CTX_set_selection | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (OSSL_ENCODER_CTX *,int) |  | OSSL_ENCODER_CTX_set_selection | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (OSSL_LIB_CTX *,int) |  | OSSL_LIB_CTX_get_data | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (OSSL_LIB_CTX *,int) |  | OSSL_LIB_CTX_set_conf_diagnostics | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (OSSL_LIB_CTX *,int) |  | ossl_ctx_global_properties | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (OSSL_LIB_CTX *,int) |  | ossl_dh_new_by_nid_ex | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (OSSL_LIB_CTX *,int) |  | ossl_lib_ctx_get_data | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (OSSL_LIB_CTX *,int) |  | ossl_mac_key_new | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (OSSL_PARAM *,int) |  | OSSL_PARAM_set_int | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (OSSL_QRX *,int) |  | ossl_qrx_get_bytes_received | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (OSSL_RECORD_LAYER *,int) |  | tls_set_first_handshake | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (OSSL_RECORD_LAYER *,int) |  | tls_set_plain_alerts | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (OSSL_STORE_CTX *,int) |  | OSSL_STORE_expect | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (PKCS7 *,int) |  | PKCS7_set_type | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (QUIC_CHANNEL *,int) |  | ossl_quic_channel_new_stream_local | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (QUIC_ENGINE *,int) |  | ossl_quic_engine_set_inhibit_tick | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (QUIC_PORT *,int) |  | ossl_quic_port_set_allow_incoming | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (QUIC_RCIDM *,int) |  | ossl_quic_rcidm_get_preferred_tx_dcid_changed | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (QUIC_RSTREAM *,int) |  | ossl_quic_rstream_set_cleanse | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (QUIC_RXFC *,int) |  | ossl_quic_rxfc_get_error | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (QUIC_RXFC *,int) |  | ossl_quic_rxfc_has_cwm_changed | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (QUIC_SSTREAM *,int) |  | ossl_quic_sstream_set_cleanse | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (QUIC_STREAM_MAP *,int) |  | ossl_quic_stream_map_get_accept_queue_len | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (QUIC_TXFC *,int) |  | ossl_quic_txfc_has_become_blocked | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (RSA *,int) |  | RSA_clear_flags | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (RSA *,int) |  | RSA_set_flags | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (RSA_METHOD *,int) |  | RSA_meth_set_flags | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_hashalg | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_maskgenhashalg | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_saltlen | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_trailerfield | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (SSL *,int) |  | SSL_key_update | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (SSL *,int) |  | SSL_set_post_handshake_auth | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (SSL *,int) |  | SSL_set_purpose | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (SSL *,int) |  | SSL_set_quic_tls_early_data_enabled | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (SSL *,int) |  | SSL_set_quiet_shutdown | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (SSL *,int) |  | SSL_set_read_ahead | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (SSL *,int) |  | SSL_set_security_level | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (SSL *,int) |  | SSL_set_shutdown | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (SSL *,int) |  | SSL_set_trust | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (SSL *,int) |  | SSL_set_verify_depth | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (SSL_CONNECTION *,int) |  | dtls1_read_failed | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (SSL_CONNECTION *,int) |  | ossl_statem_send_fatal | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (SSL_CONNECTION *,int) |  | ossl_statem_set_in_init | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (SSL_CONNECTION *,int) |  | tls1_shared_group | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (SSL_CTX *,int) |  | SSL_CTX_set_post_handshake_auth | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (SSL_CTX *,int) |  | SSL_CTX_set_purpose | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (SSL_CTX *,int) |  | SSL_CTX_set_quiet_shutdown | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (SSL_CTX *,int) |  | SSL_CTX_set_security_level | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (SSL_CTX *,int) |  | SSL_CTX_set_srp_strength | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (SSL_CTX *,int) |  | SSL_CTX_set_trust | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (SSL_CTX *,int) |  | SSL_CTX_set_verify_depth | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (SSL_CTX *,int) |  | ssl_md | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (SSL_SESSION *,int) |  | SSL_SESSION_set_protocol_version | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (TS_REQ *,int) |  | TS_REQ_delete_ext | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (TS_REQ *,int) |  | TS_REQ_get_ext | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (TS_RESP_CTX *,int) |  | TS_RESP_CTX_add_flags | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (TS_STATUS_INFO *,int) |  | TS_STATUS_INFO_set_status | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (TS_TST_INFO *,int) |  | TS_TST_INFO_delete_ext | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (TS_TST_INFO *,int) |  | TS_TST_INFO_get_ext | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (TS_VERIFY_CTX *,int) |  | TS_VERIFY_CTX_add_flags | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (TS_VERIFY_CTX *,int) |  | TS_VERIFY_CTX_set_flags | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (WPACKET *,int) |  | ossl_DER_w_begin_sequence | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (X509 *,int) |  | X509_delete_ext | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (X509 *,int) |  | X509_self_signed | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (X509_ACERT *,int) |  | X509_ACERT_delete_attr | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (X509_ATTRIBUTE *,int) |  | X509_ATTRIBUTE_get0_type | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (X509_CRL *,int) |  | X509_CRL_delete_ext | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (X509_NAME *,int) |  | X509_NAME_delete_entry | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (X509_REQ *,int) |  | X509_REQ_delete_attr | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (X509_REVOKED *,int) |  | X509_REVOKED_delete_ext | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (X509_STORE *,int) |  | X509_STORE_set_depth | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (X509_STORE *,int) |  | X509_STORE_set_purpose | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (X509_STORE *,int) |  | X509_STORE_set_trust | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_depth | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_error | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_error_depth | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_purpose | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_trust | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_get0_host | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_auth_level | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_depth | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_purpose | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_trust | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (_Float128,int) |  | __ldexpf128 | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (_Float128,int) |  | __scalbnf128 | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (__sigset_t *,int) |  | __sigaddset_compat | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (__sigset_t *,int) |  | __sigdelset_compat | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (acttab *,int) |  | acttab_insert | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (addrinfo *,int) |  | support_format_addrinfo | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (aiocb_union *,int) |  | __aio_enqueue_request | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (argp_fmtstream_t,int) |  | __argp_fmtstream_putc | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (char **,int) |  | addrsort | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (char *,int) |  | Curl_str2addr | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (char *,int) |  | PEM_proc_type | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (char,int) | CStringT | CStringT | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (connectdata *,int) |  | Curl_conn_is_ssl | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const ASN1_BIT_STRING *,int) |  | ASN1_BIT_STRING_get_bit | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const BIGNUM *,int) |  | BN_get_flags | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const BIGNUM *,int) |  | BN_is_bit_set | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const BIO *,int) |  | BIO_get_ex_data | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const BIO *,int) |  | BIO_test_flags | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const CMS_SignerInfo *,int) |  | CMS_signed_get_attr | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const CMS_SignerInfo *,int) |  | CMS_unsigned_get_attr | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const CRYPTO_EX_DATA *,int) |  | CRYPTO_get_ex_data | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const DH *,int) |  | DH_get_ex_data | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const DH *,int) |  | DH_test_flags | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const DH *,int) |  | ossl_dh_dup | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const DSA *,int) |  | DSA_get_ex_data | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const DSA *,int) |  | DSA_test_flags | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const DSA *,int) |  | ossl_dsa_dup | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const ECX_KEY *,int) |  | ossl_ecx_key_dup | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const EC_KEY *,int) |  | EC_KEY_get_ex_data | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const EC_KEY *,int) |  | ossl_ec_key_dup | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const ENGINE *,int) |  | ENGINE_get_ex_data | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_test_flags | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const EVP_MD_CTX *,int) |  | EVP_MD_CTX_test_flags | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const EVP_PKEY *,int) |  | EVP_PKEY_get_attr | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const EVP_PKEY *,int) |  | EVP_PKEY_get_ex_data | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const ML_DSA_KEY *,int) |  | ossl_ml_dsa_key_dup | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const ML_KEM_KEY *,int) |  | ossl_ml_kem_key_dup | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const OPENSSL_STACK *,int) |  | OPENSSL_sk_value | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const OSSL_CMP_CERTREPMESSAGE *,int) |  | ossl_cmp_certrepmessage_get0_certresponse | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_get0_newPkey | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_get_option | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const OSSL_CMP_PKISI *,int) |  | ossl_cmp_pkisi_check_pkifailureinfo | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const OSSL_CMP_POLLREPCONTENT *,int) |  | ossl_cmp_pollrepcontent_get0_pollrep | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const QUIC_CHANNEL *,int) |  | ossl_quic_channel_get_local_stream_count_avail | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const QUIC_CHANNEL *,int) |  | ossl_quic_channel_get_remote_stream_count_avail | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const RSA *,int) |  | RSA_get_ex_data | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const RSA *,int) |  | RSA_test_flags | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const RSA *,int) |  | ossl_rsa_dup | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const SLH_DSA_KEY *,int) |  | ossl_slh_dsa_key_dup | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const SSL *,int) |  | SSL_get_ex_data | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const SSL_CTX *,int) |  | SSL_CTX_get_ex_data | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const SSL_SESSION *,int) |  | SSL_SESSION_get_ex_data | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const SSL_SESSION *,int) |  | ssl_session_dup | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const UI *,int) |  | UI_get_ex_data | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const UI_METHOD *,int) |  | UI_method_get_ex_data | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const X509 *,int) |  | X509_get_ex_data | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const X509 *,int) |  | X509_get_ext | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const X509_ACERT *,int) |  | X509_ACERT_get_attr | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const X509_CRL *,int) |  | X509_CRL_get_ext | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const X509_NAME *,int) |  | X509_NAME_get_entry | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const X509_POLICY_LEVEL *,int) |  | X509_policy_level_get0_node | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const X509_POLICY_TREE *,int) |  | X509_policy_tree_get0_level | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const X509_REQ *,int) |  | X509_REQ_get_attr | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const X509_REVOKED *,int) |  | X509_REVOKED_get_ext | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const X509_STORE *,int) |  | X509_STORE_get_ex_data | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const X509_STORE_CTX *,int) |  | X509_STORE_CTX_get_ex_data | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const XCHAR *,int) | CStringT | CStringT | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const YCHAR *,int) | CStringT | CStringT | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const char *,int) |  | DH_meth_new | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const char *,int) |  | DSA_meth_new | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const char *,int) |  | Jim_StrDupLen | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const char *,int) |  | NETSCAPE_SPKI_b64_decode | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const char *,int) |  | RSA_meth_new | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const char *,int) |  | ftok | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const char *,int) |  | gethostbyname2 | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const char *,int) |  | parse_yesno | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const char *,int) |  | res_gethostbyname2 | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const stack_st_X509_ATTRIBUTE *,int) |  | X509at_get_attr | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const stack_st_X509_EXTENSION *,int) |  | X509v3_get_ext | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const unsigned char *,int) |  | Jim_GenHashFunction | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const unsigned char *,int) |  | OPENSSL_uni2asc | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const unsigned char *,int) |  | OPENSSL_uni2utf8 | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (const void *,int) |  | inet6_rth_getaddr | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (double,int) |  | __ldexp | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (double,int) |  | __scalbn | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (double[],int) |  | getloadavg | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (dynhds *,int) |  | Curl_dynhds_set_opts | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (fexcept_t *,int) |  | fegetexceptflag | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (float,int) |  | __ldexpf | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (float,int) |  | __scalbnf | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (gzFile,int) |  | gzflush | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (gzFile,int) |  | gzputc | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (int *,int) |  | X509_PURPOSE_set | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (int *,int) |  | X509_TRUST_set | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (int *,int) |  | __lll_unlock_elision | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (int,int) |  | BN_security_bits | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (int,int) |  | EVP_MD_meth_new | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (int,int) |  | EVP_PKEY_meth_new | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (int,int) |  | __isctype | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (int,int) |  | acttab_alloc | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (int,int) |  | div | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (int,int) |  | inet6_rth_space | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (long double,int) |  | __ldexpl | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (netlink_handle *,int) |  | __netlink_request | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (nghttp2_option *,int) |  | nghttp2_option_set_no_auto_ping_ack | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (nghttp2_option *,int) |  | nghttp2_option_set_no_auto_window_update | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (nghttp2_option *,int) |  | nghttp2_option_set_no_closed_streams | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (nghttp2_option *,int) |  | nghttp2_option_set_no_http_messaging | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (nghttp2_option *,int) |  | nghttp2_option_set_no_recv_client_magic | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (nghttp2_option *,int) |  | nghttp2_option_set_no_rfc9113_leading_and_trailing_ws_validation | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (nghttp2_option *,int) |  | nghttp2_option_set_server_fallback_rfc7540_priorities | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (ns_msg,int) |  | ns_msg_getflag | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (obstack *,int) |  | _obstack_newchunk | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (posix_spawnattr_t *,int) |  | posix_spawnattr_setcgroup_np | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (posix_spawnattr_t *,int) |  | posix_spawnattr_setschedpolicy | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (pthread_attr_t *,int) |  | __pthread_attr_setschedpolicy | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (pthread_barrierattr_t *,int) |  | __pthread_barrierattr_setpshared | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (pthread_mutexattr_t *,int) |  | ___pthread_mutexattr_settype | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (pthread_mutexattr_t *,int) |  | __pthread_mutexattr_setprioceiling | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (pthread_mutexattr_t *,int) |  | __pthread_mutexattr_setprotocol | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (pthread_rwlockattr_t *,int) |  | __pthread_rwlockattr_setkind_np | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (pthread_rwlockattr_t *,int) |  | __pthread_rwlockattr_setpshared | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (rule *,int) |  | Configlist_add | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (rule *,int) |  | Configlist_addbasis | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (sigset_t *,int) |  | sigaddset | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (sigset_t *,int) |  | sigdelset | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (sqlite3 *,int) |  | sqlite3_busy_timeout | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (sqlite3 *,int) |  | sqlite3_db_name | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (sqlite3 *,int) |  | sqlite3_wal_autocheckpoint | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (sqlite3_backup *,int) |  | sqlite3_backup_step | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (sqlite3_context *,int) |  | sqlite3_aggregate_context | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (sqlite3_context *,int) |  | sqlite3_result_error_code | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (sqlite3_index_info *,int) |  | sqlite3_vtab_collation | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (sqlite3_stmt *,int) |  | sqlite3_bind_parameter_name | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (sqlite3_stmt *,int) |  | sqlite3_column_blob | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (sqlite3_stmt *,int) |  | sqlite3_column_bytes | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (sqlite3_stmt *,int) |  | sqlite3_column_bytes16 | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (sqlite3_stmt *,int) |  | sqlite3_column_decltype | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (sqlite3_stmt *,int) |  | sqlite3_column_decltype16 | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (sqlite3_stmt *,int) |  | sqlite3_column_double | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (sqlite3_stmt *,int) |  | sqlite3_column_int | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (sqlite3_stmt *,int) |  | sqlite3_column_int64 | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (sqlite3_stmt *,int) |  | sqlite3_column_name | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (sqlite3_stmt *,int) |  | sqlite3_column_name16 | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (sqlite3_stmt *,int) |  | sqlite3_column_text | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (sqlite3_stmt *,int) |  | sqlite3_column_text16 | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (sqlite3_stmt *,int) |  | sqlite3_column_type | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (sqlite3_stmt *,int) |  | sqlite3_column_value | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (sqlite3_stmt *,int) |  | sqlite3_stmt_explain | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (stack_st_PKCS7 *,int) |  | PKCS12_add_safes | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (stack_st_SSL_COMP *,int) |  | ssl3_comp_find | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (stack_st_X509_ATTRIBUTE *,int) |  | X509at_delete_attr | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (stack_st_X509_EXTENSION *,int) |  | X509v3_delete_ext | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (timespec *,int) |  | __timespec_get | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (timespec *,int) |  | __timespec_getres | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (uint16_t,int) |  | tls1_group_id2nid | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (unsigned char *,int) |  | RAND_bytes | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (unsigned char *,int) |  | RAND_priv_bytes | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (unsigned char *,int) |  | ossl_ipaddr_to_asc | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (unsigned short,int) |  | dtls1_get_queue_priority | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (uv_env_item_t *,int) |  | uv_os_free_environ | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (void *,int) |  | DSO_dsobyaddr | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (void *,int) |  | sqlite3_realloc | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (void *const *,int) |  | __backtrace_symbols | 1 |
-| atl.cpp:1050:5:1050:12 | CStringT | (wchar_t,int) | CStringT | CStringT | 0 |
-| atl.cpp:1050:5:1050:12 | CStringT | (wchar_t,int) | CStringT | CStringT | 1 |
-| atl.cpp:1061:10:1061:21 | AppendFormat | (PCXSTR,...) | CStringT | AppendFormat | 0 |
-| atl.cpp:1061:10:1061:21 | AppendFormat | (PCXSTR,...) | CStringT | AppendFormat | 1 |
-| atl.cpp:1061:10:1061:21 | AppendFormat | (PCXSTR,...) | CStringT | Format | 0 |
-| atl.cpp:1061:10:1061:21 | AppendFormat | (PCXSTR,...) | CStringT | Format | 1 |
-| atl.cpp:1061:10:1061:21 | AppendFormat | (PCXSTR,...) | CStringT | FormatMessage | 0 |
-| atl.cpp:1061:10:1061:21 | AppendFormat | (PCXSTR,...) | CStringT | FormatMessage | 1 |
-| atl.cpp:1061:10:1061:21 | AppendFormat | (UINT,...) | CStringT | AppendFormat | 1 |
-| atl.cpp:1061:10:1061:21 | AppendFormat | (UINT,...) | CStringT | Format | 1 |
-| atl.cpp:1061:10:1061:21 | AppendFormat | (UINT,...) | CStringT | FormatMessage | 1 |
-| atl.cpp:1062:10:1062:21 | AppendFormat | (PCXSTR,...) | CStringT | AppendFormat | 1 |
-| atl.cpp:1062:10:1062:21 | AppendFormat | (PCXSTR,...) | CStringT | Format | 1 |
-| atl.cpp:1062:10:1062:21 | AppendFormat | (PCXSTR,...) | CStringT | FormatMessage | 1 |
-| atl.cpp:1062:10:1062:21 | AppendFormat | (UINT,...) | CStringT | AppendFormat | 0 |
-| atl.cpp:1062:10:1062:21 | AppendFormat | (UINT,...) | CStringT | AppendFormat | 1 |
-| atl.cpp:1062:10:1062:21 | AppendFormat | (UINT,...) | CStringT | Format | 0 |
-| atl.cpp:1062:10:1062:21 | AppendFormat | (UINT,...) | CStringT | Format | 1 |
-| atl.cpp:1062:10:1062:21 | AppendFormat | (UINT,...) | CStringT | FormatMessage | 0 |
-| atl.cpp:1062:10:1062:21 | AppendFormat | (UINT,...) | CStringT | FormatMessage | 1 |
-| atl.cpp:1070:9:1070:14 | Insert | (PCXSTR,PCXSTR) | CStringT | Replace | 1 |
-| atl.cpp:1070:9:1070:14 | Insert | (const CStringT &,PCXSTR) |  | operator+ | 1 |
-| atl.cpp:1070:9:1070:14 | Insert | (int,PCXSTR) | CStringT | Insert | 0 |
-| atl.cpp:1070:9:1070:14 | Insert | (int,PCXSTR) | CStringT | Insert | 1 |
-| atl.cpp:1071:9:1071:14 | Insert | (XCHAR,XCHAR) | CStringT | Replace | 1 |
-| atl.cpp:1071:9:1071:14 | Insert | (int,XCHAR) | CStringT | Insert | 0 |
-| atl.cpp:1071:9:1071:14 | Insert | (int,XCHAR) | CStringT | Insert | 1 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | ASN1_STRING_type_new | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | ASN1_tag2bit | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | ASN1_tag2str | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | Jim_ReturnCode | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | Jim_SignalId | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | OBJ_nid2ln | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | OBJ_nid2obj | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | OBJ_nid2sn | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | OSSL_trace_get_category_name | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | PKCS12_init | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | Symbol_Nth | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | X509_PURPOSE_get0 | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | X509_TRUST_get0 | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | X509_TRUST_get_by_id | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | __btowc | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | __current_locale_name | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | __fdopendir | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | __get_errlist | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | __get_errname | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | __math_invalid_i | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | __math_invalidf_i | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | __p_class | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | __p_rcode | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | __p_type | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | __pkey_get | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | __sigdescr_np | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | __strerrordesc_np | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | _tolower | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | _toupper | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | btowc | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | c_tolower | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | c_toupper | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | curlx_sitouz | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | evp_pkey_type2name | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | inet6_option_space | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | isalnum | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | isalpha | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | isblank | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | iscntrl | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | isdigit | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | isgraph | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | islower | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | isprint | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | ispunct | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | isspace | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | isupper | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | isxdigit | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | ossl_tolower | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | ossl_toupper | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | sigabbrev_np | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | sqlite3_compileoption_get | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | sqlite3_errstr | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | strerrorname_np | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | support_report_failure | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | svcudp_create | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | tls13_alert_code | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | toascii | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | tolower | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | toupper | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | uabs | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | uv__accept | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | uv_err_name | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | uv_get_osfhandle | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | uv_strerror | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | uv_translate_sys_error | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) |  | zError | 0 |
-| atl.cpp:1072:14:1072:17 | Left | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| atl.cpp:1075:10:1075:19 | LoadString | (UINT) | CComBSTR | LoadString | 0 |
-| atl.cpp:1075:10:1075:19 | LoadString | (UINT) | _U_STRINGorID | _U_STRINGorID | 0 |
-| atl.cpp:1075:10:1075:19 | LoadString | (unsigned int) |  | Jim_IntHashFunction | 0 |
-| atl.cpp:1075:10:1075:19 | LoadString | (unsigned int) |  | __sleep | 0 |
-| atl.cpp:1075:10:1075:19 | LoadString | (unsigned int) |  | __x86_get_cpuid_feature_leaf | 0 |
-| atl.cpp:1075:10:1075:19 | LoadString | (unsigned int) |  | curlx_uitous | 0 |
-| atl.cpp:1075:10:1075:19 | LoadString | (unsigned int) |  | la_version | 0 |
-| atl.cpp:1075:10:1075:19 | LoadString | (unsigned int) |  | ssl3_get_cipher | 0 |
-| atl.cpp:1079:14:1079:16 | Mid | (ASN1_STRING *,int) |  | ASN1_STRING_length_set | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (ASYNC_WAIT_CTX *,int) |  | ASYNC_WAIT_CTX_set_status | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (BIGNUM *,int) |  | BN_clear_bit | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (BIGNUM *,int) |  | BN_mask_bits | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (BIGNUM *,int) |  | BN_set_bit | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (BIGNUM *,int) |  | BN_set_flags | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (BIGNUM *,int) |  | bn_expand2 | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (BIGNUM *,int) |  | bn_wexpand | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (BIGNUM *,int) |  | ossl_bn_mask_bits_fixed_top | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (BIO *,int) |  | BIO_clear_flags | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (BIO *,int) |  | BIO_find_type | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (BIO *,int) |  | BIO_set_flags | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (BIO *,int) |  | BIO_set_init | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (BIO *,int) |  | BIO_set_retry_reason | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (BIO *,int) |  | BIO_set_shutdown | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (BIO *,int) |  | TXT_DB_read | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (CMS_SignerInfo *,int) |  | CMS_signed_delete_attr | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (CMS_SignerInfo *,int) |  | CMS_unsigned_delete_attr | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (CURL *,int) |  | curl_easy_pause | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (Curl_easy *,int) |  | Curl_conn_get_socket | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (DH *,int) |  | DH_clear_flags | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (DH *,int) |  | DH_set_flags | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (DH_METHOD *,int) |  | DH_meth_set_flags | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (DSA *,int) |  | DSA_clear_flags | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (DSA *,int) |  | DSA_set_flags | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (DSA_METHOD *,int) |  | DSA_meth_set_flags | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (EC_GROUP *,int) |  | EC_GROUP_set_asn1_flag | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (EC_GROUP *,int) |  | EC_GROUP_set_curve_name | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (EC_KEY *,int) |  | EC_KEY_clear_flags | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (EC_KEY *,int) |  | EC_KEY_set_asn1_flag | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (EC_KEY *,int) |  | EC_KEY_set_flags | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (ENGINE *,int) |  | ENGINE_cmd_is_executable | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (ENGINE *,int) |  | ENGINE_set_flags | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (EVP_CIPHER *,int) |  | EVP_CIPHER_meth_set_impl_ctx_size | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (EVP_CIPHER *,int) |  | EVP_CIPHER_meth_set_iv_length | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_clear_flags | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_flags | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_key_length | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_num | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (EVP_KEYMGMT *,int) |  | evp_keymgmt_util_query_operation_name | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (EVP_MD *,int) |  | EVP_MD_meth_set_app_datasize | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (EVP_MD *,int) |  | EVP_MD_meth_set_input_blocksize | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (EVP_MD *,int) |  | EVP_MD_meth_set_result_size | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (EVP_MD_CTX *,int) |  | EVP_MD_CTX_clear_flags | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (EVP_MD_CTX *,int) |  | EVP_MD_CTX_set_flags | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (EVP_PKEY *,int) |  | EVP_PKEY_delete_attr | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (EVP_PKEY *,int) |  | EVP_PKEY_save_parameters | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (EVP_PKEY *,int) |  | EVP_PKEY_set_type | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_get_keygen_info | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_kdf_type | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_nid | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_paramgen_type | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_rfc5114 | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dhx_rfc5114 | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ec_param_enc | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ec_paramgen_curve_nid | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ecdh_kdf_type | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_hkdf_mode | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_rsa_padding | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_rsa_pss_saltlen | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_gindex | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_h | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_pcounter | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (FILE *,int) |  | _IO_default_pbackfail | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (FILE *,int) |  | _IO_fwide | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (FILE *,int) |  | _IO_init | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (FILE *,int) |  | _IO_init_internal | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (FILE *,int) |  | _IO_new_file_attach | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (FILE *,int) |  | _IO_new_file_overflow | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (FILE *,int) |  | _IO_old_init | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (FILE *,int) |  | _IO_sputbackc | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (FILE *,int) |  | _IO_str_overflow | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (FILE *,int) |  | _IO_str_pbackfail | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (FILE *,int) |  | __printf_buffer_as_file_overflow | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (FILE *,int) |  | __wprintf_buffer_as_file_overflow | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (FTS *,int) |  | fts_children | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (LIBSSH2_CHANNEL *,int) |  | _libssh2_channel_extended_data | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (LIBSSH2_CHANNEL *,int) |  | _libssh2_channel_flush | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_flush_ex | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_handle_extended_data | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_handle_extended_data2 | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_set_blocking | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (LIBSSH2_SESSION *,int) |  | _libssh2_session_set_blocking | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (LIBSSH2_SESSION *,int) |  | libssh2_hostkey_hash | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (LIBSSH2_SESSION *,int) |  | libssh2_session_methods | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (LIBSSH2_SESSION *,int) |  | libssh2_session_set_blocking | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (LIBSSH2_SESSION *,int) |  | libssh2_session_startup | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (LPCOLESTR,int) | CComBSTR | Append | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (OCSP_BASICRESP *,int) |  | OCSP_BASICRESP_delete_ext | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (OCSP_BASICRESP *,int) |  | OCSP_BASICRESP_get_ext | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (OCSP_BASICRESP *,int) |  | OCSP_resp_get0 | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (OCSP_ONEREQ *,int) |  | OCSP_ONEREQ_delete_ext | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (OCSP_ONEREQ *,int) |  | OCSP_ONEREQ_get_ext | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (OCSP_REQUEST *,int) |  | OCSP_REQUEST_delete_ext | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (OCSP_REQUEST *,int) |  | OCSP_REQUEST_get_ext | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (OCSP_REQUEST *,int) |  | OCSP_request_onereq_get0 | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (OCSP_SINGLERESP *,int) |  | OCSP_SINGLERESP_delete_ext | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (OCSP_SINGLERESP *,int) |  | OCSP_SINGLERESP_get_ext | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (OPENSSL_STACK *,int) |  | OPENSSL_sk_delete | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (OPENSSL_STACK *,int) |  | OPENSSL_sk_reserve | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (OPENSSL_sk_compfunc,int) |  | OPENSSL_sk_new_reserve | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (OSSL_ACKM *,int) |  | ossl_ackm_get_ack_deadline | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (OSSL_ACKM *,int) |  | ossl_ackm_get_ack_frame | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (OSSL_ACKM *,int) |  | ossl_ackm_get_largest_acked | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (OSSL_ACKM *,int) |  | ossl_ackm_on_pkt_space_discarded | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_set_serverPort | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (OSSL_CMP_CTX *,int) |  | ossl_cmp_ctx_set_failInfoCode | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (OSSL_CMP_CTX *,int) |  | ossl_cmp_ctx_set_status | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (OSSL_CMP_CTX *,int) |  | ossl_cmp_msg_create | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (OSSL_CMP_CTX *,int) |  | ossl_cmp_pollReq_new | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (OSSL_CMP_MSG *,int) |  | ossl_cmp_msg_set_bodytype | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (OSSL_CMP_PKIHEADER *,int) |  | ossl_cmp_hdr_set_pvno | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (OSSL_CMP_REVREPCONTENT *,int) |  | ossl_cmp_revrepcontent_get_CertId | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (OSSL_CMP_REVREPCONTENT *,int) |  | ossl_cmp_revrepcontent_get_pkisi | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_accept_raverified | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_accept_unprotected | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_grant_implicit_confirm | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_send_unprotected_errors | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (OSSL_CRMF_PKIPUBLICATIONINFO *,int) |  | OSSL_CRMF_MSG_set_PKIPublicationInfo_action | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (OSSL_DECODER_CTX *,int) |  | OSSL_DECODER_CTX_set_selection | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (OSSL_ENCODER_CTX *,int) |  | OSSL_ENCODER_CTX_set_selection | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (OSSL_LIB_CTX *,int) |  | OSSL_LIB_CTX_get_data | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (OSSL_LIB_CTX *,int) |  | OSSL_LIB_CTX_set_conf_diagnostics | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (OSSL_LIB_CTX *,int) |  | ossl_ctx_global_properties | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (OSSL_LIB_CTX *,int) |  | ossl_dh_new_by_nid_ex | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (OSSL_LIB_CTX *,int) |  | ossl_lib_ctx_get_data | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (OSSL_LIB_CTX *,int) |  | ossl_mac_key_new | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (OSSL_PARAM *,int) |  | OSSL_PARAM_set_int | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (OSSL_QRX *,int) |  | ossl_qrx_get_bytes_received | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (OSSL_RECORD_LAYER *,int) |  | tls_set_first_handshake | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (OSSL_RECORD_LAYER *,int) |  | tls_set_plain_alerts | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (OSSL_STORE_CTX *,int) |  | OSSL_STORE_expect | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (PKCS7 *,int) |  | PKCS7_set_type | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (QUIC_CHANNEL *,int) |  | ossl_quic_channel_new_stream_local | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (QUIC_ENGINE *,int) |  | ossl_quic_engine_set_inhibit_tick | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (QUIC_PORT *,int) |  | ossl_quic_port_set_allow_incoming | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (QUIC_RCIDM *,int) |  | ossl_quic_rcidm_get_preferred_tx_dcid_changed | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (QUIC_RSTREAM *,int) |  | ossl_quic_rstream_set_cleanse | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (QUIC_RXFC *,int) |  | ossl_quic_rxfc_get_error | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (QUIC_RXFC *,int) |  | ossl_quic_rxfc_has_cwm_changed | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (QUIC_SSTREAM *,int) |  | ossl_quic_sstream_set_cleanse | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (QUIC_STREAM_MAP *,int) |  | ossl_quic_stream_map_get_accept_queue_len | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (QUIC_TXFC *,int) |  | ossl_quic_txfc_has_become_blocked | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (RSA *,int) |  | RSA_clear_flags | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (RSA *,int) |  | RSA_set_flags | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (RSA_METHOD *,int) |  | RSA_meth_set_flags | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_hashalg | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_maskgenhashalg | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_saltlen | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_trailerfield | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (SSL *,int) |  | SSL_key_update | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (SSL *,int) |  | SSL_set_post_handshake_auth | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (SSL *,int) |  | SSL_set_purpose | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (SSL *,int) |  | SSL_set_quic_tls_early_data_enabled | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (SSL *,int) |  | SSL_set_quiet_shutdown | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (SSL *,int) |  | SSL_set_read_ahead | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (SSL *,int) |  | SSL_set_security_level | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (SSL *,int) |  | SSL_set_shutdown | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (SSL *,int) |  | SSL_set_trust | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (SSL *,int) |  | SSL_set_verify_depth | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (SSL_CONNECTION *,int) |  | dtls1_read_failed | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (SSL_CONNECTION *,int) |  | ossl_statem_send_fatal | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (SSL_CONNECTION *,int) |  | ossl_statem_set_in_init | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (SSL_CONNECTION *,int) |  | tls1_shared_group | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (SSL_CTX *,int) |  | SSL_CTX_set_post_handshake_auth | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (SSL_CTX *,int) |  | SSL_CTX_set_purpose | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (SSL_CTX *,int) |  | SSL_CTX_set_quiet_shutdown | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (SSL_CTX *,int) |  | SSL_CTX_set_security_level | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (SSL_CTX *,int) |  | SSL_CTX_set_srp_strength | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (SSL_CTX *,int) |  | SSL_CTX_set_trust | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (SSL_CTX *,int) |  | SSL_CTX_set_verify_depth | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (SSL_CTX *,int) |  | ssl_md | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (SSL_SESSION *,int) |  | SSL_SESSION_set_protocol_version | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (TS_REQ *,int) |  | TS_REQ_delete_ext | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (TS_REQ *,int) |  | TS_REQ_get_ext | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (TS_RESP_CTX *,int) |  | TS_RESP_CTX_add_flags | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (TS_STATUS_INFO *,int) |  | TS_STATUS_INFO_set_status | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (TS_TST_INFO *,int) |  | TS_TST_INFO_delete_ext | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (TS_TST_INFO *,int) |  | TS_TST_INFO_get_ext | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (TS_VERIFY_CTX *,int) |  | TS_VERIFY_CTX_add_flags | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (TS_VERIFY_CTX *,int) |  | TS_VERIFY_CTX_set_flags | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (WPACKET *,int) |  | ossl_DER_w_begin_sequence | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (X509 *,int) |  | X509_delete_ext | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (X509 *,int) |  | X509_self_signed | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (X509_ACERT *,int) |  | X509_ACERT_delete_attr | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (X509_ATTRIBUTE *,int) |  | X509_ATTRIBUTE_get0_type | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (X509_CRL *,int) |  | X509_CRL_delete_ext | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (X509_NAME *,int) |  | X509_NAME_delete_entry | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (X509_REQ *,int) |  | X509_REQ_delete_attr | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (X509_REVOKED *,int) |  | X509_REVOKED_delete_ext | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (X509_STORE *,int) |  | X509_STORE_set_depth | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (X509_STORE *,int) |  | X509_STORE_set_purpose | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (X509_STORE *,int) |  | X509_STORE_set_trust | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_depth | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_error | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_error_depth | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_purpose | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_trust | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_get0_host | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_auth_level | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_depth | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_purpose | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_trust | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (_Float128,int) |  | __ldexpf128 | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (_Float128,int) |  | __scalbnf128 | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (__sigset_t *,int) |  | __sigaddset_compat | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (__sigset_t *,int) |  | __sigdelset_compat | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (acttab *,int) |  | acttab_insert | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (addrinfo *,int) |  | support_format_addrinfo | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (aiocb_union *,int) |  | __aio_enqueue_request | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (argp_fmtstream_t,int) |  | __argp_fmtstream_putc | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (char **,int) |  | addrsort | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (char *,int) |  | Curl_str2addr | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (char *,int) |  | PEM_proc_type | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (char,int) | CStringT | CStringT | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (connectdata *,int) |  | Curl_conn_is_ssl | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const ASN1_BIT_STRING *,int) |  | ASN1_BIT_STRING_get_bit | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const BIGNUM *,int) |  | BN_get_flags | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const BIGNUM *,int) |  | BN_is_bit_set | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const BIO *,int) |  | BIO_get_ex_data | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const BIO *,int) |  | BIO_test_flags | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const CMS_SignerInfo *,int) |  | CMS_signed_get_attr | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const CMS_SignerInfo *,int) |  | CMS_unsigned_get_attr | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const CRYPTO_EX_DATA *,int) |  | CRYPTO_get_ex_data | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const DH *,int) |  | DH_get_ex_data | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const DH *,int) |  | DH_test_flags | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const DH *,int) |  | ossl_dh_dup | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const DSA *,int) |  | DSA_get_ex_data | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const DSA *,int) |  | DSA_test_flags | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const DSA *,int) |  | ossl_dsa_dup | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const ECX_KEY *,int) |  | ossl_ecx_key_dup | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const EC_KEY *,int) |  | EC_KEY_get_ex_data | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const EC_KEY *,int) |  | ossl_ec_key_dup | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const ENGINE *,int) |  | ENGINE_get_ex_data | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_test_flags | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const EVP_MD_CTX *,int) |  | EVP_MD_CTX_test_flags | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const EVP_PKEY *,int) |  | EVP_PKEY_get_attr | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const EVP_PKEY *,int) |  | EVP_PKEY_get_ex_data | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const ML_DSA_KEY *,int) |  | ossl_ml_dsa_key_dup | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const ML_KEM_KEY *,int) |  | ossl_ml_kem_key_dup | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const OPENSSL_STACK *,int) |  | OPENSSL_sk_value | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const OSSL_CMP_CERTREPMESSAGE *,int) |  | ossl_cmp_certrepmessage_get0_certresponse | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_get0_newPkey | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_get_option | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const OSSL_CMP_PKISI *,int) |  | ossl_cmp_pkisi_check_pkifailureinfo | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const OSSL_CMP_POLLREPCONTENT *,int) |  | ossl_cmp_pollrepcontent_get0_pollrep | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const QUIC_CHANNEL *,int) |  | ossl_quic_channel_get_local_stream_count_avail | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const QUIC_CHANNEL *,int) |  | ossl_quic_channel_get_remote_stream_count_avail | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const RSA *,int) |  | RSA_get_ex_data | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const RSA *,int) |  | RSA_test_flags | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const RSA *,int) |  | ossl_rsa_dup | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const SLH_DSA_KEY *,int) |  | ossl_slh_dsa_key_dup | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const SSL *,int) |  | SSL_get_ex_data | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const SSL_CTX *,int) |  | SSL_CTX_get_ex_data | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const SSL_SESSION *,int) |  | SSL_SESSION_get_ex_data | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const SSL_SESSION *,int) |  | ssl_session_dup | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const UI *,int) |  | UI_get_ex_data | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const UI_METHOD *,int) |  | UI_method_get_ex_data | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const X509 *,int) |  | X509_get_ex_data | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const X509 *,int) |  | X509_get_ext | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const X509_ACERT *,int) |  | X509_ACERT_get_attr | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const X509_CRL *,int) |  | X509_CRL_get_ext | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const X509_NAME *,int) |  | X509_NAME_get_entry | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const X509_POLICY_LEVEL *,int) |  | X509_policy_level_get0_node | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const X509_POLICY_TREE *,int) |  | X509_policy_tree_get0_level | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const X509_REQ *,int) |  | X509_REQ_get_attr | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const X509_REVOKED *,int) |  | X509_REVOKED_get_ext | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const X509_STORE *,int) |  | X509_STORE_get_ex_data | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const X509_STORE_CTX *,int) |  | X509_STORE_CTX_get_ex_data | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const XCHAR *,int) | CStringT | CStringT | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const YCHAR *,int) | CStringT | CStringT | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const char *,int) |  | DH_meth_new | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const char *,int) |  | DSA_meth_new | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const char *,int) |  | Jim_StrDupLen | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const char *,int) |  | NETSCAPE_SPKI_b64_decode | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const char *,int) |  | RSA_meth_new | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const char *,int) |  | ftok | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const char *,int) |  | gethostbyname2 | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const char *,int) |  | parse_yesno | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const char *,int) |  | res_gethostbyname2 | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const stack_st_X509_ATTRIBUTE *,int) |  | X509at_get_attr | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const stack_st_X509_EXTENSION *,int) |  | X509v3_get_ext | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const unsigned char *,int) |  | Jim_GenHashFunction | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const unsigned char *,int) |  | OPENSSL_uni2asc | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const unsigned char *,int) |  | OPENSSL_uni2utf8 | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (const void *,int) |  | inet6_rth_getaddr | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (double,int) |  | __ldexp | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (double,int) |  | __scalbn | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (double[],int) |  | getloadavg | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (dynhds *,int) |  | Curl_dynhds_set_opts | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (fexcept_t *,int) |  | fegetexceptflag | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (float,int) |  | __ldexpf | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (float,int) |  | __scalbnf | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (gzFile,int) |  | gzflush | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (gzFile,int) |  | gzputc | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (int *,int) |  | X509_PURPOSE_set | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (int *,int) |  | X509_TRUST_set | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (int *,int) |  | __lll_unlock_elision | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (int,int) |  | BN_security_bits | 0 |
-| atl.cpp:1079:14:1079:16 | Mid | (int,int) |  | BN_security_bits | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (int,int) |  | EVP_MD_meth_new | 0 |
-| atl.cpp:1079:14:1079:16 | Mid | (int,int) |  | EVP_MD_meth_new | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (int,int) |  | EVP_PKEY_meth_new | 0 |
-| atl.cpp:1079:14:1079:16 | Mid | (int,int) |  | EVP_PKEY_meth_new | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (int,int) |  | __isctype | 0 |
-| atl.cpp:1079:14:1079:16 | Mid | (int,int) |  | __isctype | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (int,int) |  | acttab_alloc | 0 |
-| atl.cpp:1079:14:1079:16 | Mid | (int,int) |  | acttab_alloc | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (int,int) |  | div | 0 |
-| atl.cpp:1079:14:1079:16 | Mid | (int,int) |  | div | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (int,int) |  | inet6_rth_space | 0 |
-| atl.cpp:1079:14:1079:16 | Mid | (int,int) |  | inet6_rth_space | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (long double,int) |  | __ldexpl | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (netlink_handle *,int) |  | __netlink_request | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (nghttp2_option *,int) |  | nghttp2_option_set_no_auto_ping_ack | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (nghttp2_option *,int) |  | nghttp2_option_set_no_auto_window_update | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (nghttp2_option *,int) |  | nghttp2_option_set_no_closed_streams | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (nghttp2_option *,int) |  | nghttp2_option_set_no_http_messaging | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (nghttp2_option *,int) |  | nghttp2_option_set_no_recv_client_magic | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (nghttp2_option *,int) |  | nghttp2_option_set_no_rfc9113_leading_and_trailing_ws_validation | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (nghttp2_option *,int) |  | nghttp2_option_set_server_fallback_rfc7540_priorities | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (ns_msg,int) |  | ns_msg_getflag | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (obstack *,int) |  | _obstack_newchunk | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (posix_spawnattr_t *,int) |  | posix_spawnattr_setcgroup_np | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (posix_spawnattr_t *,int) |  | posix_spawnattr_setschedpolicy | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (pthread_attr_t *,int) |  | __pthread_attr_setschedpolicy | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (pthread_barrierattr_t *,int) |  | __pthread_barrierattr_setpshared | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (pthread_mutexattr_t *,int) |  | ___pthread_mutexattr_settype | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (pthread_mutexattr_t *,int) |  | __pthread_mutexattr_setprioceiling | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (pthread_mutexattr_t *,int) |  | __pthread_mutexattr_setprotocol | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (pthread_rwlockattr_t *,int) |  | __pthread_rwlockattr_setkind_np | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (pthread_rwlockattr_t *,int) |  | __pthread_rwlockattr_setpshared | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (rule *,int) |  | Configlist_add | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (rule *,int) |  | Configlist_addbasis | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (sigset_t *,int) |  | sigaddset | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (sigset_t *,int) |  | sigdelset | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (sqlite3 *,int) |  | sqlite3_busy_timeout | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (sqlite3 *,int) |  | sqlite3_db_name | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (sqlite3 *,int) |  | sqlite3_wal_autocheckpoint | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (sqlite3_backup *,int) |  | sqlite3_backup_step | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (sqlite3_context *,int) |  | sqlite3_aggregate_context | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (sqlite3_context *,int) |  | sqlite3_result_error_code | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (sqlite3_index_info *,int) |  | sqlite3_vtab_collation | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (sqlite3_stmt *,int) |  | sqlite3_bind_parameter_name | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (sqlite3_stmt *,int) |  | sqlite3_column_blob | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (sqlite3_stmt *,int) |  | sqlite3_column_bytes | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (sqlite3_stmt *,int) |  | sqlite3_column_bytes16 | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (sqlite3_stmt *,int) |  | sqlite3_column_decltype | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (sqlite3_stmt *,int) |  | sqlite3_column_decltype16 | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (sqlite3_stmt *,int) |  | sqlite3_column_double | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (sqlite3_stmt *,int) |  | sqlite3_column_int | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (sqlite3_stmt *,int) |  | sqlite3_column_int64 | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (sqlite3_stmt *,int) |  | sqlite3_column_name | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (sqlite3_stmt *,int) |  | sqlite3_column_name16 | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (sqlite3_stmt *,int) |  | sqlite3_column_text | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (sqlite3_stmt *,int) |  | sqlite3_column_text16 | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (sqlite3_stmt *,int) |  | sqlite3_column_type | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (sqlite3_stmt *,int) |  | sqlite3_column_value | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (sqlite3_stmt *,int) |  | sqlite3_stmt_explain | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (stack_st_PKCS7 *,int) |  | PKCS12_add_safes | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (stack_st_SSL_COMP *,int) |  | ssl3_comp_find | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (stack_st_X509_ATTRIBUTE *,int) |  | X509at_delete_attr | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (stack_st_X509_EXTENSION *,int) |  | X509v3_delete_ext | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (timespec *,int) |  | __timespec_get | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (timespec *,int) |  | __timespec_getres | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (uint16_t,int) |  | tls1_group_id2nid | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (unsigned char *,int) |  | RAND_bytes | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (unsigned char *,int) |  | RAND_priv_bytes | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (unsigned char *,int) |  | ossl_ipaddr_to_asc | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (unsigned short,int) |  | dtls1_get_queue_priority | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (uv_env_item_t *,int) |  | uv_os_free_environ | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (void *,int) |  | DSO_dsobyaddr | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (void *,int) |  | sqlite3_realloc | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (void *const *,int) |  | __backtrace_symbols | 1 |
-| atl.cpp:1079:14:1079:16 | Mid | (wchar_t,int) | CStringT | CStringT | 1 |
-| atl.cpp:1081:9:1081:15 | Replace | (PCXSTR,PCXSTR) | CStringT | Replace | 0 |
-| atl.cpp:1081:9:1081:15 | Replace | (PCXSTR,PCXSTR) | CStringT | Replace | 1 |
-| atl.cpp:1081:9:1081:15 | Replace | (const CStringT &,PCXSTR) |  | operator+ | 1 |
-| atl.cpp:1081:9:1081:15 | Replace | (int,PCXSTR) | CStringT | Insert | 1 |
-| atl.cpp:1082:9:1082:15 | Replace | (XCHAR,XCHAR) | CStringT | Replace | 0 |
-| atl.cpp:1082:9:1082:15 | Replace | (XCHAR,XCHAR) | CStringT | Replace | 1 |
-| atl.cpp:1082:9:1082:15 | Replace | (int,XCHAR) | CStringT | Insert | 1 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | ASN1_STRING_type_new | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | ASN1_tag2bit | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | ASN1_tag2str | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | Jim_ReturnCode | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | Jim_SignalId | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | OBJ_nid2ln | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | OBJ_nid2obj | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | OBJ_nid2sn | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | OSSL_trace_get_category_name | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | PKCS12_init | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | Symbol_Nth | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | X509_PURPOSE_get0 | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | X509_TRUST_get0 | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | X509_TRUST_get_by_id | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | __btowc | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | __current_locale_name | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | __fdopendir | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | __get_errlist | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | __get_errname | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | __math_invalid_i | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | __math_invalidf_i | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | __p_class | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | __p_rcode | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | __p_type | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | __pkey_get | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | __sigdescr_np | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | __strerrordesc_np | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | _tolower | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | _toupper | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | btowc | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | c_tolower | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | c_toupper | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | curlx_sitouz | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | evp_pkey_type2name | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | inet6_option_space | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | isalnum | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | isalpha | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | isblank | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | iscntrl | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | isdigit | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | isgraph | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | islower | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | isprint | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | ispunct | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | isspace | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | isupper | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | isxdigit | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | ossl_tolower | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | ossl_toupper | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | sigabbrev_np | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | sqlite3_compileoption_get | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | sqlite3_errstr | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | strerrorname_np | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | support_report_failure | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | svcudp_create | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | tls13_alert_code | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | toascii | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | tolower | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | toupper | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | uabs | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | uv__accept | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | uv_err_name | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | uv_get_osfhandle | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | uv_strerror | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | uv_translate_sys_error | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) |  | zError | 0 |
-| atl.cpp:1083:14:1083:18 | Right | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| atl.cpp:1085:14:1085:26 | SpanExcluding | (PCXSTR) |  | operator+= | 0 |
-| atl.cpp:1085:14:1085:26 | SpanExcluding | (PCXSTR) | CSimpleStringT | operator+= | 0 |
-| atl.cpp:1085:14:1085:26 | SpanExcluding | (PCXSTR) | CStringT | operator= | 0 |
-| atl.cpp:1086:14:1086:26 | SpanIncluding | (PCXSTR) |  | operator+= | 0 |
-| atl.cpp:1086:14:1086:26 | SpanIncluding | (PCXSTR) | CSimpleStringT | operator+= | 0 |
-| atl.cpp:1086:14:1086:26 | SpanIncluding | (PCXSTR) | CStringT | operator= | 0 |
-| atl.cpp:1088:15:1088:18 | Trim | (XCHAR) | CStringT | operator= | 0 |
-| atl.cpp:1089:15:1089:18 | Trim | (PCXSTR) |  | operator+= | 0 |
-| atl.cpp:1089:15:1089:18 | Trim | (PCXSTR) | CSimpleStringT | operator+= | 0 |
-| atl.cpp:1089:15:1089:18 | Trim | (PCXSTR) | CStringT | operator= | 0 |
-| atl.cpp:1091:15:1091:22 | TrimLeft | (XCHAR) | CStringT | operator= | 0 |
-| atl.cpp:1092:15:1092:22 | TrimLeft | (PCXSTR) |  | operator+= | 0 |
-| atl.cpp:1092:15:1092:22 | TrimLeft | (PCXSTR) | CSimpleStringT | operator+= | 0 |
-| atl.cpp:1092:15:1092:22 | TrimLeft | (PCXSTR) | CStringT | operator= | 0 |
-| atl.cpp:1094:15:1094:23 | TrimRight | (XCHAR) | CStringT | operator= | 0 |
-| atl.cpp:1095:15:1095:23 | TrimRight | (PCXSTR) |  | operator+= | 0 |
-| atl.cpp:1095:15:1095:23 | TrimRight | (PCXSTR) | CSimpleStringT | operator+= | 0 |
-| atl.cpp:1095:15:1095:23 | TrimRight | (PCXSTR) | CStringT | operator= | 0 |
-| atl.cpp:1231:5:1231:12 | CStrBufT | (BIO *,OCSP_REQUEST *,unsigned long) |  | OCSP_REQUEST_print | 2 |
-| atl.cpp:1231:5:1231:12 | CStrBufT | (BIO *,OCSP_RESPONSE *,unsigned long) |  | OCSP_RESPONSE_print | 2 |
-| atl.cpp:1231:5:1231:12 | CStrBufT | (BIO *,X509 *,unsigned long) |  | ossl_x509_print_ex_brief | 2 |
-| atl.cpp:1231:5:1231:12 | CStrBufT | (BIO *,X509_CRL *,unsigned long) |  | X509_CRL_print_ex | 2 |
-| atl.cpp:1231:5:1231:12 | CStrBufT | (BIO *,const ASN1_STRING *,unsigned long) |  | ASN1_STRING_print_ex | 2 |
-| atl.cpp:1231:5:1231:12 | CStrBufT | (FILE *,const ASN1_STRING *,unsigned long) |  | ASN1_STRING_print_ex_fp | 2 |
-| atl.cpp:1231:5:1231:12 | CStrBufT | (const char *,const char *,unsigned long) |  | __ngettext | 2 |
-| atl.cpp:1231:5:1231:12 | CStrBufT | (unsigned char *,int,unsigned long) |  | UTF8_putc | 1 |
-| atl.cpp:1231:5:1231:12 | CStrBufT | (unsigned char *,int,unsigned long) |  | UTF8_putc | 2 |
-| bsd.cpp:12:5:12:10 | accept | (CURLM *,curl_socket_t,int *) |  | curl_multi_socket | 2 |
-| bsd.cpp:12:5:12:10 | accept | (Curl_easy *,ssize_t *,int *) |  | Curl_GetFTPResponse | 2 |
-| bsd.cpp:12:5:12:10 | accept | (EVP_CIPHER_CTX *,unsigned char *,int *) |  | EVP_CipherFinal | 2 |
-| bsd.cpp:12:5:12:10 | accept | (EVP_CIPHER_CTX *,unsigned char *,int *) |  | EVP_CipherFinal_ex | 2 |
-| bsd.cpp:12:5:12:10 | accept | (EVP_CIPHER_CTX *,unsigned char *,int *) |  | EVP_DecryptFinal | 2 |
-| bsd.cpp:12:5:12:10 | accept | (EVP_CIPHER_CTX *,unsigned char *,int *) |  | EVP_DecryptFinal_ex | 2 |
-| bsd.cpp:12:5:12:10 | accept | (EVP_CIPHER_CTX *,unsigned char *,int *) |  | EVP_EncryptFinal | 2 |
-| bsd.cpp:12:5:12:10 | accept | (EVP_CIPHER_CTX *,unsigned char *,int *) |  | EVP_EncryptFinal_ex | 2 |
-| bsd.cpp:12:5:12:10 | accept | (EVP_CIPHER_CTX *,unsigned char *,int *) |  | EVP_OpenFinal | 2 |
-| bsd.cpp:12:5:12:10 | accept | (EVP_CIPHER_CTX *,unsigned char *,int *) |  | EVP_SealFinal | 2 |
-| bsd.cpp:12:5:12:10 | accept | (EVP_ENCODE_CTX *,unsigned char *,int *) |  | EVP_DecodeFinal | 2 |
-| bsd.cpp:12:5:12:10 | accept | (EVP_ENCODE_CTX *,unsigned char *,int *) |  | EVP_EncodeFinal | 2 |
-| bsd.cpp:12:5:12:10 | accept | (Jim_Interp *,Jim_Obj *,int *) |  | Jim_DictPairs | 2 |
-| bsd.cpp:12:5:12:10 | accept | (Jim_Interp *,Jim_Obj *,int *) |  | Jim_GetBoolFromExpr | 2 |
-| bsd.cpp:12:5:12:10 | accept | (Jim_Interp *,Jim_Obj *,int *) |  | Jim_GetBoolean | 2 |
-| bsd.cpp:12:5:12:10 | accept | (Jim_Interp *,Jim_Obj *,int *) |  | Jim_GetIndex | 2 |
-| bsd.cpp:12:5:12:10 | accept | (Jim_Interp *,Jim_Obj *,int *) |  | Jim_GetReturnCode | 2 |
-| bsd.cpp:12:5:12:10 | accept | (Jim_Interp *,Jim_Obj *,int *) |  | Jim_GetSourceInfo | 2 |
-| bsd.cpp:12:5:12:10 | accept | (LIBSSH2_SESSION *,size_t *,int *) |  | libssh2_session_hostkey | 2 |
-| bsd.cpp:12:5:12:10 | accept | (OPENSSL_STACK *,const void *,int *) |  | OPENSSL_sk_find_all | 2 |
-| bsd.cpp:12:5:12:10 | accept | (OSSL_DECODER *,const char *,int *) |  | ossl_decoder_fast_is_a | 2 |
-| bsd.cpp:12:5:12:10 | accept | (OSSL_LIB_CTX *,uint32_t,int *) |  | ossl_rand_uniform_uint32 | 2 |
-| bsd.cpp:12:5:12:10 | accept | (OSSL_PROVIDER *,size_t,int *) |  | ossl_provider_test_operation_bit | 2 |
-| bsd.cpp:12:5:12:10 | accept | (PACKET *,uint64_t *,int *) |  | ossl_quic_wire_peek_frame_header | 2 |
-| bsd.cpp:12:5:12:10 | accept | (PROV_DRBG *,OSSL_PARAM[],int *) |  | ossl_drbg_get_ctx_params_no_lock | 2 |
-| bsd.cpp:12:5:12:10 | accept | (QUIC_RSTREAM *,size_t *,int *) |  | ossl_quic_rstream_available | 2 |
-| bsd.cpp:12:5:12:10 | accept | (_Float128,_Float128,int *) |  | __remquof128 | 2 |
-| bsd.cpp:12:5:12:10 | accept | (const BIGNUM *,const BIGNUM *,int *) |  | ossl_ffc_validate_private_key | 2 |
-| bsd.cpp:12:5:12:10 | accept | (const DH *,const BIGNUM *,int *) |  | DH_check_pub_key | 2 |
-| bsd.cpp:12:5:12:10 | accept | (const DH *,const BIGNUM *,int *) |  | ossl_dh_check_priv_key | 2 |
-| bsd.cpp:12:5:12:10 | accept | (const DH *,const BIGNUM *,int *) |  | ossl_dh_check_pub_key_partial | 2 |
-| bsd.cpp:12:5:12:10 | accept | (const DSA *,const BIGNUM *,int *) |  | ossl_dsa_check_priv_key | 2 |
-| bsd.cpp:12:5:12:10 | accept | (const DSA *,const BIGNUM *,int *) |  | ossl_dsa_check_pub_key | 2 |
-| bsd.cpp:12:5:12:10 | accept | (const DSA *,const BIGNUM *,int *) |  | ossl_dsa_check_pub_key_partial | 2 |
-| bsd.cpp:12:5:12:10 | accept | (const DSA *,int,int *) |  | ossl_dsa_check_params | 2 |
-| bsd.cpp:12:5:12:10 | accept | (const FFC_PARAMS *,const BIGNUM *,int *) |  | ossl_ffc_validate_public_key | 2 |
-| bsd.cpp:12:5:12:10 | accept | (const FFC_PARAMS *,const BIGNUM *,int *) |  | ossl_ffc_validate_public_key_partial | 2 |
-| bsd.cpp:12:5:12:10 | accept | (const SSL *,const SSL_CTX *,int *) |  | ssl_get_security_level_bits | 2 |
-| bsd.cpp:12:5:12:10 | accept | (const X509 *,EVP_MD **,int *) |  | X509_digest_sig | 2 |
-| bsd.cpp:12:5:12:10 | accept | (const char *,const OPT_PAIR *,int *) |  | opt_pair | 2 |
-| bsd.cpp:12:5:12:10 | accept | (const char *,const char *,int *) |  | __gconv_compare_alias_cache | 2 |
-| bsd.cpp:12:5:12:10 | accept | (const res_sym *,const char *,int *) |  | __sym_ston | 2 |
-| bsd.cpp:12:5:12:10 | accept | (const res_sym *,int,int *) |  | __sym_ntop | 2 |
-| bsd.cpp:12:5:12:10 | accept | (const res_sym *,int,int *) |  | __sym_ntos | 2 |
-| bsd.cpp:12:5:12:10 | accept | (const unsigned char **,unsigned int,int *) |  | ossl_b2i | 2 |
-| bsd.cpp:12:5:12:10 | accept | (const uv_tcp_t *,sockaddr *,int *) |  | uv_tcp_getpeername | 1 |
-| bsd.cpp:12:5:12:10 | accept | (const uv_tcp_t *,sockaddr *,int *) |  | uv_tcp_getpeername | 2 |
-| bsd.cpp:12:5:12:10 | accept | (const uv_tcp_t *,sockaddr *,int *) |  | uv_tcp_getsockname | 1 |
-| bsd.cpp:12:5:12:10 | accept | (const uv_tcp_t *,sockaddr *,int *) |  | uv_tcp_getsockname | 2 |
-| bsd.cpp:12:5:12:10 | accept | (const uv_udp_t *,sockaddr *,int *) |  | uv_udp_getpeername | 1 |
-| bsd.cpp:12:5:12:10 | accept | (const uv_udp_t *,sockaddr *,int *) |  | uv_udp_getpeername | 2 |
-| bsd.cpp:12:5:12:10 | accept | (const uv_udp_t *,sockaddr *,int *) |  | uv_udp_getsockname | 1 |
-| bsd.cpp:12:5:12:10 | accept | (const uv_udp_t *,sockaddr *,int *) |  | uv_udp_getsockname | 2 |
-| bsd.cpp:12:5:12:10 | accept | (double,double,int *) |  | __remquo | 2 |
-| bsd.cpp:12:5:12:10 | accept | (float,float,int *) |  | __remquof | 2 |
-| bsd.cpp:12:5:12:10 | accept | (int,const char **,int *) |  | sqlite3_keyword_name | 2 |
-| bsd.cpp:12:5:12:10 | accept | (int,int,int *) |  | ssl_set_version_bound | 2 |
-| bsd.cpp:12:5:12:10 | accept | (long double,long double,int *) |  | __remquol | 2 |
-| bsd.cpp:12:5:12:10 | accept | (pthread_mutex_t *,int,int *) |  | __pthread_mutex_setprioceiling | 2 |
-| bsd.cpp:12:5:12:10 | accept | (size_t,size_t *,int *) |  | __malloc_hugepage_config | 2 |
-| bsd.cpp:12:5:12:10 | accept | (uv_handle_t *,int,int *) |  | uv__socket_sockopt | 2 |
-| bsd.cpp:12:5:12:10 | accept | (z_streamp,unsigned int *,int *) |  | deflatePending | 2 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | ASN1_STRING_type_new | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | ASN1_tag2bit | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | ASN1_tag2str | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | Jim_ReturnCode | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | Jim_SignalId | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | OBJ_nid2ln | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | OBJ_nid2obj | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | OBJ_nid2sn | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | OSSL_trace_get_category_name | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | PKCS12_init | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | Symbol_Nth | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | X509_PURPOSE_get0 | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | X509_TRUST_get0 | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | X509_TRUST_get_by_id | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | __btowc | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | __current_locale_name | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | __fdopendir | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | __get_errlist | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | __get_errname | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | __math_invalid_i | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | __math_invalidf_i | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | __p_class | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | __p_rcode | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | __p_type | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | __pkey_get | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | __sigdescr_np | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | __strerrordesc_np | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | _tolower | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | _toupper | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | btowc | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | c_tolower | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | c_toupper | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | curlx_sitouz | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | evp_pkey_type2name | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | inet6_option_space | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | isalnum | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | isalpha | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | isblank | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | iscntrl | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | isdigit | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | isgraph | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | islower | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | isprint | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | ispunct | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | isspace | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | isupper | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | isxdigit | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | ossl_tolower | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | ossl_toupper | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | sigabbrev_np | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | sqlite3_compileoption_get | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | sqlite3_errstr | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | strerrorname_np | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | support_report_failure | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | svcudp_create | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | tls13_alert_code | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | toascii | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | tolower | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | toupper | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | uabs | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | uv__accept | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | uv_err_name | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | uv_get_osfhandle | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | uv_strerror | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | uv_translate_sys_error | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) |  | zError | 0 |
-| constructor_delegation.cpp:8:2:8:8 | MyValue | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| constructor_delegation.cpp:9:2:9:8 | MyValue | (Curl_easy *,bool) |  | Curl_creader_set_rewind | 1 |
-| constructor_delegation.cpp:9:2:9:8 | MyValue | (Curl_easy *,bool) |  | Curl_set_in_callback | 1 |
-| constructor_delegation.cpp:9:2:9:8 | MyValue | (curl_socket_t[2],bool) |  | Curl_eventfd | 1 |
-| constructor_delegation.cpp:9:2:9:8 | MyValue | (support_fuse *,bool) |  | support_fuse_filter_forget | 1 |
-| constructor_delegation.cpp:9:2:9:8 | MyValue | (void *,bool) |  | _dl_allocate_tls_init | 1 |
-| constructor_delegation.cpp:9:2:9:8 | MyValue | (void *,bool) |  | _dl_deallocate_tls | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (ASN1_STRING *,int) |  | ASN1_STRING_length_set | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (ASYNC_WAIT_CTX *,int) |  | ASYNC_WAIT_CTX_set_status | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (BIGNUM *,int) |  | BN_clear_bit | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (BIGNUM *,int) |  | BN_mask_bits | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (BIGNUM *,int) |  | BN_set_bit | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (BIGNUM *,int) |  | BN_set_flags | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (BIGNUM *,int) |  | bn_expand2 | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (BIGNUM *,int) |  | bn_wexpand | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (BIGNUM *,int) |  | ossl_bn_mask_bits_fixed_top | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (BIO *,int) |  | BIO_clear_flags | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (BIO *,int) |  | BIO_find_type | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (BIO *,int) |  | BIO_set_flags | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (BIO *,int) |  | BIO_set_init | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (BIO *,int) |  | BIO_set_retry_reason | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (BIO *,int) |  | BIO_set_shutdown | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (BIO *,int) |  | TXT_DB_read | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (CMS_SignerInfo *,int) |  | CMS_signed_delete_attr | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (CMS_SignerInfo *,int) |  | CMS_unsigned_delete_attr | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (CURL *,int) |  | curl_easy_pause | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (Curl_easy *,int) |  | Curl_conn_get_socket | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (DH *,int) |  | DH_clear_flags | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (DH *,int) |  | DH_set_flags | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (DH_METHOD *,int) |  | DH_meth_set_flags | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (DSA *,int) |  | DSA_clear_flags | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (DSA *,int) |  | DSA_set_flags | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (DSA_METHOD *,int) |  | DSA_meth_set_flags | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (EC_GROUP *,int) |  | EC_GROUP_set_asn1_flag | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (EC_GROUP *,int) |  | EC_GROUP_set_curve_name | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (EC_KEY *,int) |  | EC_KEY_clear_flags | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (EC_KEY *,int) |  | EC_KEY_set_asn1_flag | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (EC_KEY *,int) |  | EC_KEY_set_flags | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (ENGINE *,int) |  | ENGINE_cmd_is_executable | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (ENGINE *,int) |  | ENGINE_set_flags | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (EVP_CIPHER *,int) |  | EVP_CIPHER_meth_set_impl_ctx_size | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (EVP_CIPHER *,int) |  | EVP_CIPHER_meth_set_iv_length | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_clear_flags | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_flags | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_key_length | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_num | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (EVP_KEYMGMT *,int) |  | evp_keymgmt_util_query_operation_name | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (EVP_MD *,int) |  | EVP_MD_meth_set_app_datasize | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (EVP_MD *,int) |  | EVP_MD_meth_set_input_blocksize | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (EVP_MD *,int) |  | EVP_MD_meth_set_result_size | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (EVP_MD_CTX *,int) |  | EVP_MD_CTX_clear_flags | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (EVP_MD_CTX *,int) |  | EVP_MD_CTX_set_flags | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (EVP_PKEY *,int) |  | EVP_PKEY_delete_attr | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (EVP_PKEY *,int) |  | EVP_PKEY_save_parameters | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (EVP_PKEY *,int) |  | EVP_PKEY_set_type | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_get_keygen_info | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_kdf_type | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_nid | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_paramgen_type | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_rfc5114 | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dhx_rfc5114 | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ec_param_enc | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ec_paramgen_curve_nid | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ecdh_kdf_type | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_hkdf_mode | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_rsa_padding | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_rsa_pss_saltlen | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_gindex | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_h | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_pcounter | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (FILE *,int) |  | _IO_default_pbackfail | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (FILE *,int) |  | _IO_fwide | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (FILE *,int) |  | _IO_init | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (FILE *,int) |  | _IO_init_internal | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (FILE *,int) |  | _IO_new_file_attach | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (FILE *,int) |  | _IO_new_file_overflow | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (FILE *,int) |  | _IO_old_init | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (FILE *,int) |  | _IO_sputbackc | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (FILE *,int) |  | _IO_str_overflow | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (FILE *,int) |  | _IO_str_pbackfail | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (FILE *,int) |  | __printf_buffer_as_file_overflow | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (FILE *,int) |  | __wprintf_buffer_as_file_overflow | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (FTS *,int) |  | fts_children | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (LIBSSH2_CHANNEL *,int) |  | _libssh2_channel_extended_data | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (LIBSSH2_CHANNEL *,int) |  | _libssh2_channel_flush | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_flush_ex | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_handle_extended_data | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_handle_extended_data2 | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_set_blocking | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (LIBSSH2_SESSION *,int) |  | _libssh2_session_set_blocking | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (LIBSSH2_SESSION *,int) |  | libssh2_hostkey_hash | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (LIBSSH2_SESSION *,int) |  | libssh2_session_methods | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (LIBSSH2_SESSION *,int) |  | libssh2_session_set_blocking | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (LIBSSH2_SESSION *,int) |  | libssh2_session_startup | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (LPCOLESTR,int) | CComBSTR | Append | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (OCSP_BASICRESP *,int) |  | OCSP_BASICRESP_delete_ext | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (OCSP_BASICRESP *,int) |  | OCSP_BASICRESP_get_ext | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (OCSP_BASICRESP *,int) |  | OCSP_resp_get0 | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (OCSP_ONEREQ *,int) |  | OCSP_ONEREQ_delete_ext | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (OCSP_ONEREQ *,int) |  | OCSP_ONEREQ_get_ext | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (OCSP_REQUEST *,int) |  | OCSP_REQUEST_delete_ext | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (OCSP_REQUEST *,int) |  | OCSP_REQUEST_get_ext | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (OCSP_REQUEST *,int) |  | OCSP_request_onereq_get0 | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (OCSP_SINGLERESP *,int) |  | OCSP_SINGLERESP_delete_ext | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (OCSP_SINGLERESP *,int) |  | OCSP_SINGLERESP_get_ext | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (OPENSSL_STACK *,int) |  | OPENSSL_sk_delete | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (OPENSSL_STACK *,int) |  | OPENSSL_sk_reserve | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (OPENSSL_sk_compfunc,int) |  | OPENSSL_sk_new_reserve | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (OSSL_ACKM *,int) |  | ossl_ackm_get_ack_deadline | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (OSSL_ACKM *,int) |  | ossl_ackm_get_ack_frame | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (OSSL_ACKM *,int) |  | ossl_ackm_get_largest_acked | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (OSSL_ACKM *,int) |  | ossl_ackm_on_pkt_space_discarded | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_set_serverPort | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (OSSL_CMP_CTX *,int) |  | ossl_cmp_ctx_set_failInfoCode | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (OSSL_CMP_CTX *,int) |  | ossl_cmp_ctx_set_status | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (OSSL_CMP_CTX *,int) |  | ossl_cmp_msg_create | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (OSSL_CMP_CTX *,int) |  | ossl_cmp_pollReq_new | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (OSSL_CMP_MSG *,int) |  | ossl_cmp_msg_set_bodytype | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (OSSL_CMP_PKIHEADER *,int) |  | ossl_cmp_hdr_set_pvno | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (OSSL_CMP_REVREPCONTENT *,int) |  | ossl_cmp_revrepcontent_get_CertId | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (OSSL_CMP_REVREPCONTENT *,int) |  | ossl_cmp_revrepcontent_get_pkisi | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_accept_raverified | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_accept_unprotected | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_grant_implicit_confirm | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_send_unprotected_errors | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (OSSL_CRMF_PKIPUBLICATIONINFO *,int) |  | OSSL_CRMF_MSG_set_PKIPublicationInfo_action | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (OSSL_DECODER_CTX *,int) |  | OSSL_DECODER_CTX_set_selection | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (OSSL_ENCODER_CTX *,int) |  | OSSL_ENCODER_CTX_set_selection | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (OSSL_LIB_CTX *,int) |  | OSSL_LIB_CTX_get_data | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (OSSL_LIB_CTX *,int) |  | OSSL_LIB_CTX_set_conf_diagnostics | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (OSSL_LIB_CTX *,int) |  | ossl_ctx_global_properties | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (OSSL_LIB_CTX *,int) |  | ossl_dh_new_by_nid_ex | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (OSSL_LIB_CTX *,int) |  | ossl_lib_ctx_get_data | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (OSSL_LIB_CTX *,int) |  | ossl_mac_key_new | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (OSSL_PARAM *,int) |  | OSSL_PARAM_set_int | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (OSSL_QRX *,int) |  | ossl_qrx_get_bytes_received | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (OSSL_RECORD_LAYER *,int) |  | tls_set_first_handshake | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (OSSL_RECORD_LAYER *,int) |  | tls_set_plain_alerts | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (OSSL_STORE_CTX *,int) |  | OSSL_STORE_expect | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (PKCS7 *,int) |  | PKCS7_set_type | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (QUIC_CHANNEL *,int) |  | ossl_quic_channel_new_stream_local | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (QUIC_ENGINE *,int) |  | ossl_quic_engine_set_inhibit_tick | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (QUIC_PORT *,int) |  | ossl_quic_port_set_allow_incoming | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (QUIC_RCIDM *,int) |  | ossl_quic_rcidm_get_preferred_tx_dcid_changed | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (QUIC_RSTREAM *,int) |  | ossl_quic_rstream_set_cleanse | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (QUIC_RXFC *,int) |  | ossl_quic_rxfc_get_error | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (QUIC_RXFC *,int) |  | ossl_quic_rxfc_has_cwm_changed | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (QUIC_SSTREAM *,int) |  | ossl_quic_sstream_set_cleanse | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (QUIC_STREAM_MAP *,int) |  | ossl_quic_stream_map_get_accept_queue_len | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (QUIC_TXFC *,int) |  | ossl_quic_txfc_has_become_blocked | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (RSA *,int) |  | RSA_clear_flags | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (RSA *,int) |  | RSA_set_flags | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (RSA_METHOD *,int) |  | RSA_meth_set_flags | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_hashalg | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_maskgenhashalg | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_saltlen | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_trailerfield | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (SSL *,int) |  | SSL_key_update | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (SSL *,int) |  | SSL_set_post_handshake_auth | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (SSL *,int) |  | SSL_set_purpose | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (SSL *,int) |  | SSL_set_quic_tls_early_data_enabled | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (SSL *,int) |  | SSL_set_quiet_shutdown | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (SSL *,int) |  | SSL_set_read_ahead | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (SSL *,int) |  | SSL_set_security_level | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (SSL *,int) |  | SSL_set_shutdown | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (SSL *,int) |  | SSL_set_trust | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (SSL *,int) |  | SSL_set_verify_depth | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (SSL_CONNECTION *,int) |  | dtls1_read_failed | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (SSL_CONNECTION *,int) |  | ossl_statem_send_fatal | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (SSL_CONNECTION *,int) |  | ossl_statem_set_in_init | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (SSL_CONNECTION *,int) |  | tls1_shared_group | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (SSL_CTX *,int) |  | SSL_CTX_set_post_handshake_auth | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (SSL_CTX *,int) |  | SSL_CTX_set_purpose | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (SSL_CTX *,int) |  | SSL_CTX_set_quiet_shutdown | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (SSL_CTX *,int) |  | SSL_CTX_set_security_level | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (SSL_CTX *,int) |  | SSL_CTX_set_srp_strength | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (SSL_CTX *,int) |  | SSL_CTX_set_trust | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (SSL_CTX *,int) |  | SSL_CTX_set_verify_depth | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (SSL_CTX *,int) |  | ssl_md | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (SSL_SESSION *,int) |  | SSL_SESSION_set_protocol_version | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (TS_REQ *,int) |  | TS_REQ_delete_ext | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (TS_REQ *,int) |  | TS_REQ_get_ext | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (TS_RESP_CTX *,int) |  | TS_RESP_CTX_add_flags | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (TS_STATUS_INFO *,int) |  | TS_STATUS_INFO_set_status | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (TS_TST_INFO *,int) |  | TS_TST_INFO_delete_ext | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (TS_TST_INFO *,int) |  | TS_TST_INFO_get_ext | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (TS_VERIFY_CTX *,int) |  | TS_VERIFY_CTX_add_flags | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (TS_VERIFY_CTX *,int) |  | TS_VERIFY_CTX_set_flags | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (WPACKET *,int) |  | ossl_DER_w_begin_sequence | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (X509 *,int) |  | X509_delete_ext | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (X509 *,int) |  | X509_self_signed | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (X509_ACERT *,int) |  | X509_ACERT_delete_attr | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (X509_ATTRIBUTE *,int) |  | X509_ATTRIBUTE_get0_type | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (X509_CRL *,int) |  | X509_CRL_delete_ext | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (X509_NAME *,int) |  | X509_NAME_delete_entry | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (X509_REQ *,int) |  | X509_REQ_delete_attr | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (X509_REVOKED *,int) |  | X509_REVOKED_delete_ext | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (X509_STORE *,int) |  | X509_STORE_set_depth | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (X509_STORE *,int) |  | X509_STORE_set_purpose | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (X509_STORE *,int) |  | X509_STORE_set_trust | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_depth | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_error | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_error_depth | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_purpose | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_trust | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_get0_host | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_auth_level | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_depth | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_purpose | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_trust | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (_Float128,int) |  | __ldexpf128 | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (_Float128,int) |  | __scalbnf128 | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (__sigset_t *,int) |  | __sigaddset_compat | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (__sigset_t *,int) |  | __sigdelset_compat | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (acttab *,int) |  | acttab_insert | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (addrinfo *,int) |  | support_format_addrinfo | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (aiocb_union *,int) |  | __aio_enqueue_request | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (argp_fmtstream_t,int) |  | __argp_fmtstream_putc | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (char **,int) |  | addrsort | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (char *,int) |  | Curl_str2addr | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (char *,int) |  | PEM_proc_type | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (char,int) | CStringT | CStringT | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (connectdata *,int) |  | Curl_conn_is_ssl | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const ASN1_BIT_STRING *,int) |  | ASN1_BIT_STRING_get_bit | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const BIGNUM *,int) |  | BN_get_flags | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const BIGNUM *,int) |  | BN_is_bit_set | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const BIO *,int) |  | BIO_get_ex_data | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const BIO *,int) |  | BIO_test_flags | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const CMS_SignerInfo *,int) |  | CMS_signed_get_attr | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const CMS_SignerInfo *,int) |  | CMS_unsigned_get_attr | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const CRYPTO_EX_DATA *,int) |  | CRYPTO_get_ex_data | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const DH *,int) |  | DH_get_ex_data | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const DH *,int) |  | DH_test_flags | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const DH *,int) |  | ossl_dh_dup | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const DSA *,int) |  | DSA_get_ex_data | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const DSA *,int) |  | DSA_test_flags | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const DSA *,int) |  | ossl_dsa_dup | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const ECX_KEY *,int) |  | ossl_ecx_key_dup | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const EC_KEY *,int) |  | EC_KEY_get_ex_data | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const EC_KEY *,int) |  | ossl_ec_key_dup | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const ENGINE *,int) |  | ENGINE_get_ex_data | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_test_flags | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const EVP_MD_CTX *,int) |  | EVP_MD_CTX_test_flags | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const EVP_PKEY *,int) |  | EVP_PKEY_get_attr | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const EVP_PKEY *,int) |  | EVP_PKEY_get_ex_data | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const ML_DSA_KEY *,int) |  | ossl_ml_dsa_key_dup | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const ML_KEM_KEY *,int) |  | ossl_ml_kem_key_dup | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const OPENSSL_STACK *,int) |  | OPENSSL_sk_value | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const OSSL_CMP_CERTREPMESSAGE *,int) |  | ossl_cmp_certrepmessage_get0_certresponse | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_get0_newPkey | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_get_option | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const OSSL_CMP_PKISI *,int) |  | ossl_cmp_pkisi_check_pkifailureinfo | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const OSSL_CMP_POLLREPCONTENT *,int) |  | ossl_cmp_pollrepcontent_get0_pollrep | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const QUIC_CHANNEL *,int) |  | ossl_quic_channel_get_local_stream_count_avail | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const QUIC_CHANNEL *,int) |  | ossl_quic_channel_get_remote_stream_count_avail | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const RSA *,int) |  | RSA_get_ex_data | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const RSA *,int) |  | RSA_test_flags | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const RSA *,int) |  | ossl_rsa_dup | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const SLH_DSA_KEY *,int) |  | ossl_slh_dsa_key_dup | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const SSL *,int) |  | SSL_get_ex_data | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const SSL_CTX *,int) |  | SSL_CTX_get_ex_data | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const SSL_SESSION *,int) |  | SSL_SESSION_get_ex_data | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const SSL_SESSION *,int) |  | ssl_session_dup | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const UI *,int) |  | UI_get_ex_data | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const UI_METHOD *,int) |  | UI_method_get_ex_data | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const X509 *,int) |  | X509_get_ex_data | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const X509 *,int) |  | X509_get_ext | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const X509_ACERT *,int) |  | X509_ACERT_get_attr | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const X509_CRL *,int) |  | X509_CRL_get_ext | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const X509_NAME *,int) |  | X509_NAME_get_entry | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const X509_POLICY_LEVEL *,int) |  | X509_policy_level_get0_node | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const X509_POLICY_TREE *,int) |  | X509_policy_tree_get0_level | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const X509_REQ *,int) |  | X509_REQ_get_attr | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const X509_REVOKED *,int) |  | X509_REVOKED_get_ext | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const X509_STORE *,int) |  | X509_STORE_get_ex_data | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const X509_STORE_CTX *,int) |  | X509_STORE_CTX_get_ex_data | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const XCHAR *,int) | CStringT | CStringT | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const YCHAR *,int) | CStringT | CStringT | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const char *,int) |  | DH_meth_new | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const char *,int) |  | DSA_meth_new | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const char *,int) |  | Jim_StrDupLen | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const char *,int) |  | NETSCAPE_SPKI_b64_decode | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const char *,int) |  | RSA_meth_new | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const char *,int) |  | ftok | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const char *,int) |  | gethostbyname2 | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const char *,int) |  | parse_yesno | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const char *,int) |  | res_gethostbyname2 | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const stack_st_X509_ATTRIBUTE *,int) |  | X509at_get_attr | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const stack_st_X509_EXTENSION *,int) |  | X509v3_get_ext | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const unsigned char *,int) |  | Jim_GenHashFunction | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const unsigned char *,int) |  | OPENSSL_uni2asc | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const unsigned char *,int) |  | OPENSSL_uni2utf8 | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (const void *,int) |  | inet6_rth_getaddr | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (double,int) |  | __ldexp | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (double,int) |  | __scalbn | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (double[],int) |  | getloadavg | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (dynhds *,int) |  | Curl_dynhds_set_opts | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (fexcept_t *,int) |  | fegetexceptflag | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (float,int) |  | __ldexpf | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (float,int) |  | __scalbnf | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (gzFile,int) |  | gzflush | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (gzFile,int) |  | gzputc | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (int *,int) |  | X509_PURPOSE_set | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (int *,int) |  | X509_TRUST_set | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (int *,int) |  | __lll_unlock_elision | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (int,int) |  | BN_security_bits | 0 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (int,int) |  | BN_security_bits | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (int,int) |  | EVP_MD_meth_new | 0 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (int,int) |  | EVP_MD_meth_new | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (int,int) |  | EVP_PKEY_meth_new | 0 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (int,int) |  | EVP_PKEY_meth_new | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (int,int) |  | __isctype | 0 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (int,int) |  | __isctype | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (int,int) |  | acttab_alloc | 0 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (int,int) |  | acttab_alloc | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (int,int) |  | div | 0 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (int,int) |  | div | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (int,int) |  | inet6_rth_space | 0 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (int,int) |  | inet6_rth_space | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (long double,int) |  | __ldexpl | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (netlink_handle *,int) |  | __netlink_request | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (nghttp2_option *,int) |  | nghttp2_option_set_no_auto_ping_ack | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (nghttp2_option *,int) |  | nghttp2_option_set_no_auto_window_update | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (nghttp2_option *,int) |  | nghttp2_option_set_no_closed_streams | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (nghttp2_option *,int) |  | nghttp2_option_set_no_http_messaging | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (nghttp2_option *,int) |  | nghttp2_option_set_no_recv_client_magic | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (nghttp2_option *,int) |  | nghttp2_option_set_no_rfc9113_leading_and_trailing_ws_validation | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (nghttp2_option *,int) |  | nghttp2_option_set_server_fallback_rfc7540_priorities | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (ns_msg,int) |  | ns_msg_getflag | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (obstack *,int) |  | _obstack_newchunk | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (posix_spawnattr_t *,int) |  | posix_spawnattr_setcgroup_np | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (posix_spawnattr_t *,int) |  | posix_spawnattr_setschedpolicy | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (pthread_attr_t *,int) |  | __pthread_attr_setschedpolicy | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (pthread_barrierattr_t *,int) |  | __pthread_barrierattr_setpshared | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (pthread_mutexattr_t *,int) |  | ___pthread_mutexattr_settype | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (pthread_mutexattr_t *,int) |  | __pthread_mutexattr_setprioceiling | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (pthread_mutexattr_t *,int) |  | __pthread_mutexattr_setprotocol | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (pthread_rwlockattr_t *,int) |  | __pthread_rwlockattr_setkind_np | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (pthread_rwlockattr_t *,int) |  | __pthread_rwlockattr_setpshared | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (rule *,int) |  | Configlist_add | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (rule *,int) |  | Configlist_addbasis | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (sigset_t *,int) |  | sigaddset | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (sigset_t *,int) |  | sigdelset | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (sqlite3 *,int) |  | sqlite3_busy_timeout | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (sqlite3 *,int) |  | sqlite3_db_name | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (sqlite3 *,int) |  | sqlite3_wal_autocheckpoint | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (sqlite3_backup *,int) |  | sqlite3_backup_step | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (sqlite3_context *,int) |  | sqlite3_aggregate_context | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (sqlite3_context *,int) |  | sqlite3_result_error_code | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (sqlite3_index_info *,int) |  | sqlite3_vtab_collation | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (sqlite3_stmt *,int) |  | sqlite3_bind_parameter_name | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (sqlite3_stmt *,int) |  | sqlite3_column_blob | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (sqlite3_stmt *,int) |  | sqlite3_column_bytes | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (sqlite3_stmt *,int) |  | sqlite3_column_bytes16 | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (sqlite3_stmt *,int) |  | sqlite3_column_decltype | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (sqlite3_stmt *,int) |  | sqlite3_column_decltype16 | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (sqlite3_stmt *,int) |  | sqlite3_column_double | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (sqlite3_stmt *,int) |  | sqlite3_column_int | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (sqlite3_stmt *,int) |  | sqlite3_column_int64 | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (sqlite3_stmt *,int) |  | sqlite3_column_name | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (sqlite3_stmt *,int) |  | sqlite3_column_name16 | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (sqlite3_stmt *,int) |  | sqlite3_column_text | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (sqlite3_stmt *,int) |  | sqlite3_column_text16 | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (sqlite3_stmt *,int) |  | sqlite3_column_type | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (sqlite3_stmt *,int) |  | sqlite3_column_value | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (sqlite3_stmt *,int) |  | sqlite3_stmt_explain | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (stack_st_PKCS7 *,int) |  | PKCS12_add_safes | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (stack_st_SSL_COMP *,int) |  | ssl3_comp_find | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (stack_st_X509_ATTRIBUTE *,int) |  | X509at_delete_attr | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (stack_st_X509_EXTENSION *,int) |  | X509v3_delete_ext | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (timespec *,int) |  | __timespec_get | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (timespec *,int) |  | __timespec_getres | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (uint16_t,int) |  | tls1_group_id2nid | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (unsigned char *,int) |  | RAND_bytes | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (unsigned char *,int) |  | RAND_priv_bytes | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (unsigned char *,int) |  | ossl_ipaddr_to_asc | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (unsigned short,int) |  | dtls1_get_queue_priority | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (uv_env_item_t *,int) |  | uv_os_free_environ | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (void *,int) |  | DSO_dsobyaddr | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (void *,int) |  | sqlite3_realloc | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (void *const *,int) |  | __backtrace_symbols | 1 |
-| constructor_delegation.cpp:10:2:10:8 | MyValue | (wchar_t,int) | CStringT | CStringT | 1 |
-| constructor_delegation.cpp:11:2:11:8 | MyValue | (Curl_easy *,CURLcode,bool) |  | Curl_http_done | 2 |
-| constructor_delegation.cpp:11:2:11:8 | MyValue | (Curl_easy *,Curl_chunker *,bool) |  | Curl_httpchunk_init | 2 |
-| constructor_delegation.cpp:11:2:11:8 | MyValue | (Curl_easy *,Curl_chunker *,bool) |  | Curl_httpchunk_reset | 2 |
-| constructor_delegation.cpp:11:2:11:8 | MyValue | (Curl_easy *,connectdata *,bool) |  | Curl_cpool_disconnect | 2 |
-| constructor_delegation.cpp:11:2:11:8 | MyValue | (Curl_easy *,connectdata *,bool) |  | Curl_on_disconnect | 2 |
-| constructor_delegation.cpp:11:2:11:8 | MyValue | (Curl_easy *,curltime *,bool) |  | Curl_timeleft | 2 |
-| constructor_delegation.cpp:11:2:11:8 | MyValue | (Curl_easy *,pingpong *,bool) |  | Curl_pp_state_timeout | 2 |
-| constructor_delegation.cpp:11:2:11:8 | MyValue | (Curl_easy *,size_t,bool) |  | Curl_bump_headersize | 2 |
-| constructor_delegation.cpp:11:2:11:8 | MyValue | (GlobalConfig *,timeval *,bool) |  | progress_meter | 2 |
-| constructor_delegation.cpp:11:2:11:8 | MyValue | (link_map *,Dl_serinfo *,bool) |  | _dl_rtld_di_serinfo | 2 |
-| constructor_delegation.cpp:11:2:11:8 | MyValue | (link_map *,link_map_public *,bool) |  | _dl_close_worker | 2 |
-| constructor_delegation.cpp:11:2:11:8 | MyValue | (size_t,char *[],bool) |  | add_locales_to_archive | 2 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (ASN1_STRING *,int) |  | ASN1_STRING_length_set | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (ASYNC_WAIT_CTX *,int) |  | ASYNC_WAIT_CTX_set_status | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (BIGNUM *,int) |  | BN_clear_bit | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (BIGNUM *,int) |  | BN_mask_bits | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (BIGNUM *,int) |  | BN_set_bit | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (BIGNUM *,int) |  | BN_set_flags | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (BIGNUM *,int) |  | bn_expand2 | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (BIGNUM *,int) |  | bn_wexpand | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (BIGNUM *,int) |  | ossl_bn_mask_bits_fixed_top | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (BIO *,int) |  | BIO_clear_flags | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (BIO *,int) |  | BIO_find_type | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (BIO *,int) |  | BIO_set_flags | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (BIO *,int) |  | BIO_set_init | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (BIO *,int) |  | BIO_set_retry_reason | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (BIO *,int) |  | BIO_set_shutdown | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (BIO *,int) |  | TXT_DB_read | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (CMS_SignerInfo *,int) |  | CMS_signed_delete_attr | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (CMS_SignerInfo *,int) |  | CMS_unsigned_delete_attr | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (CURL *,int) |  | curl_easy_pause | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (Curl_easy *,int) |  | Curl_conn_get_socket | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (DH *,int) |  | DH_clear_flags | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (DH *,int) |  | DH_set_flags | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (DH_METHOD *,int) |  | DH_meth_set_flags | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (DSA *,int) |  | DSA_clear_flags | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (DSA *,int) |  | DSA_set_flags | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (DSA_METHOD *,int) |  | DSA_meth_set_flags | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (EC_GROUP *,int) |  | EC_GROUP_set_asn1_flag | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (EC_GROUP *,int) |  | EC_GROUP_set_curve_name | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (EC_KEY *,int) |  | EC_KEY_clear_flags | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (EC_KEY *,int) |  | EC_KEY_set_asn1_flag | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (EC_KEY *,int) |  | EC_KEY_set_flags | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (ENGINE *,int) |  | ENGINE_cmd_is_executable | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (ENGINE *,int) |  | ENGINE_set_flags | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (EVP_CIPHER *,int) |  | EVP_CIPHER_meth_set_impl_ctx_size | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (EVP_CIPHER *,int) |  | EVP_CIPHER_meth_set_iv_length | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_clear_flags | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_flags | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_key_length | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_num | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (EVP_KEYMGMT *,int) |  | evp_keymgmt_util_query_operation_name | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (EVP_MD *,int) |  | EVP_MD_meth_set_app_datasize | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (EVP_MD *,int) |  | EVP_MD_meth_set_input_blocksize | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (EVP_MD *,int) |  | EVP_MD_meth_set_result_size | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (EVP_MD_CTX *,int) |  | EVP_MD_CTX_clear_flags | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (EVP_MD_CTX *,int) |  | EVP_MD_CTX_set_flags | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (EVP_PKEY *,int) |  | EVP_PKEY_delete_attr | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (EVP_PKEY *,int) |  | EVP_PKEY_save_parameters | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (EVP_PKEY *,int) |  | EVP_PKEY_set_type | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_get_keygen_info | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_kdf_type | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_nid | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_paramgen_type | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_rfc5114 | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dhx_rfc5114 | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ec_param_enc | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ec_paramgen_curve_nid | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ecdh_kdf_type | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_hkdf_mode | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_rsa_padding | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_rsa_pss_saltlen | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_gindex | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_h | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_pcounter | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (FILE *,int) |  | _IO_default_pbackfail | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (FILE *,int) |  | _IO_fwide | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (FILE *,int) |  | _IO_init | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (FILE *,int) |  | _IO_init_internal | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (FILE *,int) |  | _IO_new_file_attach | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (FILE *,int) |  | _IO_new_file_overflow | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (FILE *,int) |  | _IO_old_init | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (FILE *,int) |  | _IO_sputbackc | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (FILE *,int) |  | _IO_str_overflow | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (FILE *,int) |  | _IO_str_pbackfail | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (FILE *,int) |  | __printf_buffer_as_file_overflow | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (FILE *,int) |  | __wprintf_buffer_as_file_overflow | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (FTS *,int) |  | fts_children | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (LIBSSH2_CHANNEL *,int) |  | _libssh2_channel_extended_data | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (LIBSSH2_CHANNEL *,int) |  | _libssh2_channel_flush | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_flush_ex | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_handle_extended_data | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_handle_extended_data2 | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_set_blocking | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (LIBSSH2_SESSION *,int) |  | _libssh2_session_set_blocking | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (LIBSSH2_SESSION *,int) |  | libssh2_hostkey_hash | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (LIBSSH2_SESSION *,int) |  | libssh2_session_methods | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (LIBSSH2_SESSION *,int) |  | libssh2_session_set_blocking | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (LIBSSH2_SESSION *,int) |  | libssh2_session_startup | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (LPCOLESTR,int) | CComBSTR | Append | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (OCSP_BASICRESP *,int) |  | OCSP_BASICRESP_delete_ext | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (OCSP_BASICRESP *,int) |  | OCSP_BASICRESP_get_ext | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (OCSP_BASICRESP *,int) |  | OCSP_resp_get0 | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (OCSP_ONEREQ *,int) |  | OCSP_ONEREQ_delete_ext | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (OCSP_ONEREQ *,int) |  | OCSP_ONEREQ_get_ext | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (OCSP_REQUEST *,int) |  | OCSP_REQUEST_delete_ext | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (OCSP_REQUEST *,int) |  | OCSP_REQUEST_get_ext | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (OCSP_REQUEST *,int) |  | OCSP_request_onereq_get0 | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (OCSP_SINGLERESP *,int) |  | OCSP_SINGLERESP_delete_ext | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (OCSP_SINGLERESP *,int) |  | OCSP_SINGLERESP_get_ext | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (OPENSSL_STACK *,int) |  | OPENSSL_sk_delete | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (OPENSSL_STACK *,int) |  | OPENSSL_sk_reserve | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (OPENSSL_sk_compfunc,int) |  | OPENSSL_sk_new_reserve | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (OSSL_ACKM *,int) |  | ossl_ackm_get_ack_deadline | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (OSSL_ACKM *,int) |  | ossl_ackm_get_ack_frame | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (OSSL_ACKM *,int) |  | ossl_ackm_get_largest_acked | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (OSSL_ACKM *,int) |  | ossl_ackm_on_pkt_space_discarded | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_set_serverPort | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (OSSL_CMP_CTX *,int) |  | ossl_cmp_ctx_set_failInfoCode | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (OSSL_CMP_CTX *,int) |  | ossl_cmp_ctx_set_status | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (OSSL_CMP_CTX *,int) |  | ossl_cmp_msg_create | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (OSSL_CMP_CTX *,int) |  | ossl_cmp_pollReq_new | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (OSSL_CMP_MSG *,int) |  | ossl_cmp_msg_set_bodytype | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (OSSL_CMP_PKIHEADER *,int) |  | ossl_cmp_hdr_set_pvno | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (OSSL_CMP_REVREPCONTENT *,int) |  | ossl_cmp_revrepcontent_get_CertId | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (OSSL_CMP_REVREPCONTENT *,int) |  | ossl_cmp_revrepcontent_get_pkisi | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_accept_raverified | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_accept_unprotected | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_grant_implicit_confirm | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_send_unprotected_errors | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (OSSL_CRMF_PKIPUBLICATIONINFO *,int) |  | OSSL_CRMF_MSG_set_PKIPublicationInfo_action | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (OSSL_DECODER_CTX *,int) |  | OSSL_DECODER_CTX_set_selection | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (OSSL_ENCODER_CTX *,int) |  | OSSL_ENCODER_CTX_set_selection | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (OSSL_LIB_CTX *,int) |  | OSSL_LIB_CTX_get_data | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (OSSL_LIB_CTX *,int) |  | OSSL_LIB_CTX_set_conf_diagnostics | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (OSSL_LIB_CTX *,int) |  | ossl_ctx_global_properties | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (OSSL_LIB_CTX *,int) |  | ossl_dh_new_by_nid_ex | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (OSSL_LIB_CTX *,int) |  | ossl_lib_ctx_get_data | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (OSSL_LIB_CTX *,int) |  | ossl_mac_key_new | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (OSSL_PARAM *,int) |  | OSSL_PARAM_set_int | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (OSSL_QRX *,int) |  | ossl_qrx_get_bytes_received | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (OSSL_RECORD_LAYER *,int) |  | tls_set_first_handshake | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (OSSL_RECORD_LAYER *,int) |  | tls_set_plain_alerts | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (OSSL_STORE_CTX *,int) |  | OSSL_STORE_expect | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (PKCS7 *,int) |  | PKCS7_set_type | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (QUIC_CHANNEL *,int) |  | ossl_quic_channel_new_stream_local | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (QUIC_ENGINE *,int) |  | ossl_quic_engine_set_inhibit_tick | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (QUIC_PORT *,int) |  | ossl_quic_port_set_allow_incoming | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (QUIC_RCIDM *,int) |  | ossl_quic_rcidm_get_preferred_tx_dcid_changed | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (QUIC_RSTREAM *,int) |  | ossl_quic_rstream_set_cleanse | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (QUIC_RXFC *,int) |  | ossl_quic_rxfc_get_error | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (QUIC_RXFC *,int) |  | ossl_quic_rxfc_has_cwm_changed | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (QUIC_SSTREAM *,int) |  | ossl_quic_sstream_set_cleanse | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (QUIC_STREAM_MAP *,int) |  | ossl_quic_stream_map_get_accept_queue_len | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (QUIC_TXFC *,int) |  | ossl_quic_txfc_has_become_blocked | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (RSA *,int) |  | RSA_clear_flags | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (RSA *,int) |  | RSA_set_flags | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (RSA_METHOD *,int) |  | RSA_meth_set_flags | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_hashalg | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_maskgenhashalg | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_saltlen | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_trailerfield | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (SSL *,int) |  | SSL_key_update | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (SSL *,int) |  | SSL_set_post_handshake_auth | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (SSL *,int) |  | SSL_set_purpose | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (SSL *,int) |  | SSL_set_quic_tls_early_data_enabled | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (SSL *,int) |  | SSL_set_quiet_shutdown | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (SSL *,int) |  | SSL_set_read_ahead | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (SSL *,int) |  | SSL_set_security_level | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (SSL *,int) |  | SSL_set_shutdown | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (SSL *,int) |  | SSL_set_trust | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (SSL *,int) |  | SSL_set_verify_depth | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (SSL_CONNECTION *,int) |  | dtls1_read_failed | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (SSL_CONNECTION *,int) |  | ossl_statem_send_fatal | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (SSL_CONNECTION *,int) |  | ossl_statem_set_in_init | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (SSL_CONNECTION *,int) |  | tls1_shared_group | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (SSL_CTX *,int) |  | SSL_CTX_set_post_handshake_auth | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (SSL_CTX *,int) |  | SSL_CTX_set_purpose | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (SSL_CTX *,int) |  | SSL_CTX_set_quiet_shutdown | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (SSL_CTX *,int) |  | SSL_CTX_set_security_level | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (SSL_CTX *,int) |  | SSL_CTX_set_srp_strength | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (SSL_CTX *,int) |  | SSL_CTX_set_trust | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (SSL_CTX *,int) |  | SSL_CTX_set_verify_depth | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (SSL_CTX *,int) |  | ssl_md | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (SSL_SESSION *,int) |  | SSL_SESSION_set_protocol_version | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (TS_REQ *,int) |  | TS_REQ_delete_ext | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (TS_REQ *,int) |  | TS_REQ_get_ext | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (TS_RESP_CTX *,int) |  | TS_RESP_CTX_add_flags | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (TS_STATUS_INFO *,int) |  | TS_STATUS_INFO_set_status | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (TS_TST_INFO *,int) |  | TS_TST_INFO_delete_ext | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (TS_TST_INFO *,int) |  | TS_TST_INFO_get_ext | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (TS_VERIFY_CTX *,int) |  | TS_VERIFY_CTX_add_flags | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (TS_VERIFY_CTX *,int) |  | TS_VERIFY_CTX_set_flags | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (WPACKET *,int) |  | ossl_DER_w_begin_sequence | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (X509 *,int) |  | X509_delete_ext | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (X509 *,int) |  | X509_self_signed | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (X509_ACERT *,int) |  | X509_ACERT_delete_attr | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (X509_ATTRIBUTE *,int) |  | X509_ATTRIBUTE_get0_type | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (X509_CRL *,int) |  | X509_CRL_delete_ext | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (X509_NAME *,int) |  | X509_NAME_delete_entry | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (X509_REQ *,int) |  | X509_REQ_delete_attr | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (X509_REVOKED *,int) |  | X509_REVOKED_delete_ext | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (X509_STORE *,int) |  | X509_STORE_set_depth | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (X509_STORE *,int) |  | X509_STORE_set_purpose | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (X509_STORE *,int) |  | X509_STORE_set_trust | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_depth | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_error | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_error_depth | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_purpose | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_trust | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_get0_host | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_auth_level | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_depth | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_purpose | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_trust | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (_Float128,int) |  | __ldexpf128 | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (_Float128,int) |  | __scalbnf128 | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (__sigset_t *,int) |  | __sigaddset_compat | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (__sigset_t *,int) |  | __sigdelset_compat | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (acttab *,int) |  | acttab_insert | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (addrinfo *,int) |  | support_format_addrinfo | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (aiocb_union *,int) |  | __aio_enqueue_request | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (argp_fmtstream_t,int) |  | __argp_fmtstream_putc | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (char **,int) |  | addrsort | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (char *,int) |  | Curl_str2addr | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (char *,int) |  | PEM_proc_type | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (char,int) | CStringT | CStringT | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (connectdata *,int) |  | Curl_conn_is_ssl | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const ASN1_BIT_STRING *,int) |  | ASN1_BIT_STRING_get_bit | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const BIGNUM *,int) |  | BN_get_flags | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const BIGNUM *,int) |  | BN_is_bit_set | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const BIO *,int) |  | BIO_get_ex_data | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const BIO *,int) |  | BIO_test_flags | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const CMS_SignerInfo *,int) |  | CMS_signed_get_attr | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const CMS_SignerInfo *,int) |  | CMS_unsigned_get_attr | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const CRYPTO_EX_DATA *,int) |  | CRYPTO_get_ex_data | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const DH *,int) |  | DH_get_ex_data | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const DH *,int) |  | DH_test_flags | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const DH *,int) |  | ossl_dh_dup | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const DSA *,int) |  | DSA_get_ex_data | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const DSA *,int) |  | DSA_test_flags | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const DSA *,int) |  | ossl_dsa_dup | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const ECX_KEY *,int) |  | ossl_ecx_key_dup | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const EC_KEY *,int) |  | EC_KEY_get_ex_data | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const EC_KEY *,int) |  | ossl_ec_key_dup | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const ENGINE *,int) |  | ENGINE_get_ex_data | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_test_flags | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const EVP_MD_CTX *,int) |  | EVP_MD_CTX_test_flags | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const EVP_PKEY *,int) |  | EVP_PKEY_get_attr | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const EVP_PKEY *,int) |  | EVP_PKEY_get_ex_data | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const ML_DSA_KEY *,int) |  | ossl_ml_dsa_key_dup | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const ML_KEM_KEY *,int) |  | ossl_ml_kem_key_dup | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const OPENSSL_STACK *,int) |  | OPENSSL_sk_value | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const OSSL_CMP_CERTREPMESSAGE *,int) |  | ossl_cmp_certrepmessage_get0_certresponse | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_get0_newPkey | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_get_option | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const OSSL_CMP_PKISI *,int) |  | ossl_cmp_pkisi_check_pkifailureinfo | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const OSSL_CMP_POLLREPCONTENT *,int) |  | ossl_cmp_pollrepcontent_get0_pollrep | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const QUIC_CHANNEL *,int) |  | ossl_quic_channel_get_local_stream_count_avail | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const QUIC_CHANNEL *,int) |  | ossl_quic_channel_get_remote_stream_count_avail | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const RSA *,int) |  | RSA_get_ex_data | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const RSA *,int) |  | RSA_test_flags | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const RSA *,int) |  | ossl_rsa_dup | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const SLH_DSA_KEY *,int) |  | ossl_slh_dsa_key_dup | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const SSL *,int) |  | SSL_get_ex_data | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const SSL_CTX *,int) |  | SSL_CTX_get_ex_data | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const SSL_SESSION *,int) |  | SSL_SESSION_get_ex_data | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const SSL_SESSION *,int) |  | ssl_session_dup | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const UI *,int) |  | UI_get_ex_data | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const UI_METHOD *,int) |  | UI_method_get_ex_data | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const X509 *,int) |  | X509_get_ex_data | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const X509 *,int) |  | X509_get_ext | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const X509_ACERT *,int) |  | X509_ACERT_get_attr | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const X509_CRL *,int) |  | X509_CRL_get_ext | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const X509_NAME *,int) |  | X509_NAME_get_entry | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const X509_POLICY_LEVEL *,int) |  | X509_policy_level_get0_node | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const X509_POLICY_TREE *,int) |  | X509_policy_tree_get0_level | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const X509_REQ *,int) |  | X509_REQ_get_attr | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const X509_REVOKED *,int) |  | X509_REVOKED_get_ext | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const X509_STORE *,int) |  | X509_STORE_get_ex_data | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const X509_STORE_CTX *,int) |  | X509_STORE_CTX_get_ex_data | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const XCHAR *,int) | CStringT | CStringT | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const YCHAR *,int) | CStringT | CStringT | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const char *,int) |  | DH_meth_new | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const char *,int) |  | DSA_meth_new | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const char *,int) |  | Jim_StrDupLen | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const char *,int) |  | NETSCAPE_SPKI_b64_decode | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const char *,int) |  | RSA_meth_new | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const char *,int) |  | ftok | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const char *,int) |  | gethostbyname2 | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const char *,int) |  | parse_yesno | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const char *,int) |  | res_gethostbyname2 | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const stack_st_X509_ATTRIBUTE *,int) |  | X509at_get_attr | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const stack_st_X509_EXTENSION *,int) |  | X509v3_get_ext | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const unsigned char *,int) |  | Jim_GenHashFunction | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const unsigned char *,int) |  | OPENSSL_uni2asc | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const unsigned char *,int) |  | OPENSSL_uni2utf8 | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (const void *,int) |  | inet6_rth_getaddr | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (double,int) |  | __ldexp | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (double,int) |  | __scalbn | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (double[],int) |  | getloadavg | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (dynhds *,int) |  | Curl_dynhds_set_opts | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (fexcept_t *,int) |  | fegetexceptflag | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (float,int) |  | __ldexpf | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (float,int) |  | __scalbnf | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (gzFile,int) |  | gzflush | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (gzFile,int) |  | gzputc | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (int *,int) |  | X509_PURPOSE_set | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (int *,int) |  | X509_TRUST_set | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (int *,int) |  | __lll_unlock_elision | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (int,int) |  | BN_security_bits | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (int,int) |  | EVP_MD_meth_new | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (int,int) |  | EVP_PKEY_meth_new | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (int,int) |  | __isctype | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (int,int) |  | acttab_alloc | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (int,int) |  | div | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (int,int) |  | inet6_rth_space | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (long double,int) |  | __ldexpl | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (netlink_handle *,int) |  | __netlink_request | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (nghttp2_option *,int) |  | nghttp2_option_set_no_auto_ping_ack | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (nghttp2_option *,int) |  | nghttp2_option_set_no_auto_window_update | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (nghttp2_option *,int) |  | nghttp2_option_set_no_closed_streams | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (nghttp2_option *,int) |  | nghttp2_option_set_no_http_messaging | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (nghttp2_option *,int) |  | nghttp2_option_set_no_recv_client_magic | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (nghttp2_option *,int) |  | nghttp2_option_set_no_rfc9113_leading_and_trailing_ws_validation | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (nghttp2_option *,int) |  | nghttp2_option_set_server_fallback_rfc7540_priorities | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (ns_msg,int) |  | ns_msg_getflag | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (obstack *,int) |  | _obstack_newchunk | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (posix_spawnattr_t *,int) |  | posix_spawnattr_setcgroup_np | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (posix_spawnattr_t *,int) |  | posix_spawnattr_setschedpolicy | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (pthread_attr_t *,int) |  | __pthread_attr_setschedpolicy | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (pthread_barrierattr_t *,int) |  | __pthread_barrierattr_setpshared | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (pthread_mutexattr_t *,int) |  | ___pthread_mutexattr_settype | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (pthread_mutexattr_t *,int) |  | __pthread_mutexattr_setprioceiling | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (pthread_mutexattr_t *,int) |  | __pthread_mutexattr_setprotocol | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (pthread_rwlockattr_t *,int) |  | __pthread_rwlockattr_setkind_np | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (pthread_rwlockattr_t *,int) |  | __pthread_rwlockattr_setpshared | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (rule *,int) |  | Configlist_add | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (rule *,int) |  | Configlist_addbasis | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (sigset_t *,int) |  | sigaddset | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (sigset_t *,int) |  | sigdelset | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (sqlite3 *,int) |  | sqlite3_busy_timeout | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (sqlite3 *,int) |  | sqlite3_db_name | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (sqlite3 *,int) |  | sqlite3_wal_autocheckpoint | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (sqlite3_backup *,int) |  | sqlite3_backup_step | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (sqlite3_context *,int) |  | sqlite3_aggregate_context | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (sqlite3_context *,int) |  | sqlite3_result_error_code | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (sqlite3_index_info *,int) |  | sqlite3_vtab_collation | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (sqlite3_stmt *,int) |  | sqlite3_bind_parameter_name | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (sqlite3_stmt *,int) |  | sqlite3_column_blob | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (sqlite3_stmt *,int) |  | sqlite3_column_bytes | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (sqlite3_stmt *,int) |  | sqlite3_column_bytes16 | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (sqlite3_stmt *,int) |  | sqlite3_column_decltype | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (sqlite3_stmt *,int) |  | sqlite3_column_decltype16 | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (sqlite3_stmt *,int) |  | sqlite3_column_double | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (sqlite3_stmt *,int) |  | sqlite3_column_int | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (sqlite3_stmt *,int) |  | sqlite3_column_int64 | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (sqlite3_stmt *,int) |  | sqlite3_column_name | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (sqlite3_stmt *,int) |  | sqlite3_column_name16 | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (sqlite3_stmt *,int) |  | sqlite3_column_text | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (sqlite3_stmt *,int) |  | sqlite3_column_text16 | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (sqlite3_stmt *,int) |  | sqlite3_column_type | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (sqlite3_stmt *,int) |  | sqlite3_column_value | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (sqlite3_stmt *,int) |  | sqlite3_stmt_explain | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (stack_st_PKCS7 *,int) |  | PKCS12_add_safes | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (stack_st_SSL_COMP *,int) |  | ssl3_comp_find | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (stack_st_X509_ATTRIBUTE *,int) |  | X509at_delete_attr | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (stack_st_X509_EXTENSION *,int) |  | X509v3_delete_ext | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (timespec *,int) |  | __timespec_get | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (timespec *,int) |  | __timespec_getres | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (uint16_t,int) |  | tls1_group_id2nid | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (unsigned char *,int) |  | RAND_bytes | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (unsigned char *,int) |  | RAND_priv_bytes | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (unsigned char *,int) |  | ossl_ipaddr_to_asc | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (unsigned short,int) |  | dtls1_get_queue_priority | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (uv_env_item_t *,int) |  | uv_os_free_environ | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (void *,int) |  | DSO_dsobyaddr | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (void *,int) |  | sqlite3_realloc | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (void *const *,int) |  | __backtrace_symbols | 1 |
-| constructor_delegation.cpp:19:2:19:15 | MyDerivedValue | (wchar_t,int) | CStringT | CStringT | 1 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | ASN1_STRING_type_new | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | ASN1_tag2bit | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | ASN1_tag2str | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | Jim_ReturnCode | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | Jim_SignalId | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | OBJ_nid2ln | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | OBJ_nid2obj | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | OBJ_nid2sn | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | OSSL_trace_get_category_name | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | PKCS12_init | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | Symbol_Nth | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | X509_PURPOSE_get0 | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | X509_TRUST_get0 | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | X509_TRUST_get_by_id | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | __btowc | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | __current_locale_name | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | __fdopendir | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | __get_errlist | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | __get_errname | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | __math_invalid_i | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | __math_invalidf_i | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | __p_class | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | __p_rcode | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | __p_type | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | __pkey_get | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | __sigdescr_np | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | __strerrordesc_np | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | _tolower | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | _toupper | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | btowc | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | c_tolower | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | c_toupper | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | curlx_sitouz | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | evp_pkey_type2name | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | inet6_option_space | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | isalnum | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | isalpha | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | isblank | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | iscntrl | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | isdigit | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | isgraph | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | islower | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | isprint | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | ispunct | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | isspace | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | isupper | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | isxdigit | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | ossl_tolower | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | ossl_toupper | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | sigabbrev_np | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | sqlite3_compileoption_get | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | sqlite3_errstr | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | strerrorname_np | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | support_report_failure | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | svcudp_create | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | tls13_alert_code | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | toascii | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | tolower | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | toupper | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | uabs | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | uv__accept | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | uv_err_name | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | uv_get_osfhandle | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | uv_strerror | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | uv_translate_sys_error | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) |  | zError | 0 |
-| copyableclass.cpp:8:2:8:16 | MyCopyableClass | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | ASN1_STRING_type_new | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | ASN1_tag2bit | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | ASN1_tag2str | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | Jim_ReturnCode | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | Jim_SignalId | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | OBJ_nid2ln | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | OBJ_nid2obj | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | OBJ_nid2sn | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | OSSL_trace_get_category_name | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | PKCS12_init | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | Symbol_Nth | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | X509_PURPOSE_get0 | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | X509_TRUST_get0 | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | X509_TRUST_get_by_id | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | __btowc | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | __current_locale_name | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | __fdopendir | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | __get_errlist | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | __get_errname | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | __math_invalid_i | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | __math_invalidf_i | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | __p_class | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | __p_rcode | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | __p_type | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | __pkey_get | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | __sigdescr_np | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | __strerrordesc_np | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | _tolower | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | _toupper | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | btowc | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | c_tolower | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | c_toupper | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | curlx_sitouz | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | evp_pkey_type2name | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | inet6_option_space | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | isalnum | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | isalpha | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | isblank | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | iscntrl | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | isdigit | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | isgraph | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | islower | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | isprint | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | ispunct | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | isspace | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | isupper | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | isxdigit | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | ossl_tolower | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | ossl_toupper | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | sigabbrev_np | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | sqlite3_compileoption_get | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | sqlite3_errstr | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | strerrorname_np | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | support_report_failure | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | svcudp_create | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | tls13_alert_code | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | toascii | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | tolower | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | toupper | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | uabs | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | uv__accept | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | uv_err_name | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | uv_get_osfhandle | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | uv_strerror | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | uv_translate_sys_error | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) |  | zError | 0 |
-| copyableclass_declonly.cpp:8:2:8:24 | MyCopyableClassDeclOnly | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| file://:0:0:0:0 | operator delete | (void *) |  | Curl_cpool_upkeep | 0 |
-| file://:0:0:0:0 | operator delete | (void *) |  | __dlclose | 0 |
-| file://:0:0:0:0 | operator delete | (void *) |  | __libc_dlclose | 0 |
-| file://:0:0:0:0 | operator delete | (void *) |  | __libc_free | 0 |
-| file://:0:0:0:0 | operator delete | (void *) |  | __malloc_usable_size | 0 |
-| file://:0:0:0:0 | operator delete | (void *) |  | _dl_allocate_tls | 0 |
-| file://:0:0:0:0 | operator delete | (void *) |  | _dl_close | 0 |
-| file://:0:0:0:0 | operator delete | (void *) |  | malloc_usable_size | 0 |
-| file://:0:0:0:0 | operator delete | (void *) |  | ossl_kdf_data_new | 0 |
-| file://:0:0:0:0 | operator delete | (void *) |  | support_shared_free | 0 |
-| file://:0:0:0:0 | operator new | (unsigned long) |  | BN_num_bits_word | 0 |
-| file://:0:0:0:0 | operator new | (unsigned long) |  | BUF_MEM_new_ex | 0 |
-| file://:0:0:0:0 | operator new | (unsigned long) |  | curlx_ultouc | 0 |
-| file://:0:0:0:0 | operator new | (unsigned long) |  | curlx_ultous | 0 |
-| file://:0:0:0:0 | operator new | (unsigned long) |  | next_prime | 0 |
-| format.cpp:5:5:5:12 | snprintf | (StrAccum *,sqlite3_str *,const char *,...) |  | sqlite3_str_appendf | 2 |
-| format.cpp:5:5:5:12 | snprintf | (StrAccum *,sqlite3_str *,const char *,...) |  | sqlite3_str_appendf | 3 |
-| format.cpp:5:5:5:12 | snprintf | (char **,int,const char *,...) |  | ___asprintf_chk | 2 |
-| format.cpp:5:5:5:12 | snprintf | (char **,int,const char *,...) |  | ___asprintf_chk | 3 |
-| format.cpp:5:5:5:12 | snprintf | (char *,size_t,const char *,...) |  | BIO_snprintf | 0 |
-| format.cpp:5:5:5:12 | snprintf | (char *,size_t,const char *,...) |  | BIO_snprintf | 1 |
-| format.cpp:5:5:5:12 | snprintf | (char *,size_t,const char *,...) |  | BIO_snprintf | 2 |
-| format.cpp:5:5:5:12 | snprintf | (char *,size_t,const char *,...) |  | BIO_snprintf | 3 |
-| format.cpp:5:5:5:12 | snprintf | (char *,size_t,const char *,...) |  | __strfmon | 0 |
-| format.cpp:5:5:5:12 | snprintf | (char *,size_t,const char *,...) |  | __strfmon | 1 |
-| format.cpp:5:5:5:12 | snprintf | (char *,size_t,const char *,...) |  | __strfmon | 2 |
-| format.cpp:5:5:5:12 | snprintf | (char *,size_t,const char *,...) |  | __strfmon | 3 |
-| format.cpp:5:5:5:12 | snprintf | (int,char *,const char *,...) |  | sqlite3_snprintf | 2 |
-| format.cpp:5:5:5:12 | snprintf | (int,char *,const char *,...) |  | sqlite3_snprintf | 3 |
-| format.cpp:5:5:5:12 | snprintf | (ucontext_t *,..(*)(..),int,...) |  | __makecontext | 3 |
-| format.cpp:6:5:6:11 | sprintf | (CURLSH *,CURLSHoption,...) |  | curl_share_setopt | 2 |
-| format.cpp:6:5:6:11 | sprintf | (Jim_Interp *,const char *,...) |  | Jim_SetResultFormatted | 1 |
-| format.cpp:6:5:6:11 | sprintf | (Jim_Interp *,const char *,...) |  | Jim_SetResultFormatted | 2 |
-| format.cpp:6:5:6:11 | sprintf | (char **,const char *,...) |  | ___asprintf | 1 |
-| format.cpp:6:5:6:11 | sprintf | (char **,const char *,...) |  | ___asprintf | 2 |
-| format.cpp:6:5:6:11 | sprintf | (curl_httppost **,curl_httppost **,...) |  | curl_formadd | 2 |
-| format.cpp:7:5:7:12 | swprintf | (StrAccum *,sqlite3_str *,const char *,...) |  | sqlite3_str_appendf | 3 |
-| format.cpp:7:5:7:12 | swprintf | (char **,int,const char *,...) |  | ___asprintf_chk | 3 |
-| format.cpp:7:5:7:12 | swprintf | (char *,size_t,const char *,...) |  | BIO_snprintf | 3 |
-| format.cpp:7:5:7:12 | swprintf | (char *,size_t,const char *,...) |  | __strfmon | 3 |
-| format.cpp:7:5:7:12 | swprintf | (int,char *,const char *,...) |  | sqlite3_snprintf | 3 |
-| format.cpp:7:5:7:12 | swprintf | (ucontext_t *,..(*)(..),int,...) |  | __makecontext | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (..(*)(..),..(*)(..),..(*)(..),void *) |  | libssh2_session_init_ex | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (BIO *,CMS_ContentInfo **,pem_password_cb *,void *) |  | PEM_read_bio_CMS | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (BIO *,DH **,pem_password_cb *,void *) |  | PEM_read_bio_DHparams | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (BIO *,DSA **,pem_password_cb *,void *) |  | PEM_read_bio_DSAPrivateKey | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (BIO *,DSA **,pem_password_cb *,void *) |  | PEM_read_bio_DSA_PUBKEY | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (BIO *,DSA **,pem_password_cb *,void *) |  | PEM_read_bio_DSAparams | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (BIO *,EC_GROUP **,pem_password_cb *,void *) |  | PEM_read_bio_ECPKParameters | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (BIO *,EC_KEY **,pem_password_cb *,void *) |  | PEM_read_bio_ECPrivateKey | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (BIO *,EC_KEY **,pem_password_cb *,void *) |  | PEM_read_bio_EC_PUBKEY | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (BIO *,EVP_PKEY **,pem_password_cb *,void *) |  | PEM_read_bio_PUBKEY | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (BIO *,EVP_PKEY **,pem_password_cb *,void *) |  | PEM_read_bio_PrivateKey | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (BIO *,EVP_PKEY **,pem_password_cb *,void *) |  | d2i_PKCS8PrivateKey_bio | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (BIO *,NETSCAPE_CERT_SEQUENCE **,pem_password_cb *,void *) |  | PEM_read_bio_NETSCAPE_CERT_SEQUENCE | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (BIO *,PKCS7 **,pem_password_cb *,void *) |  | PEM_read_bio_PKCS7 | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (BIO *,PKCS8_PRIV_KEY_INFO **,pem_password_cb *,void *) |  | PEM_read_bio_PKCS8_PRIV_KEY_INFO | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (BIO *,RSA **,pem_password_cb *,void *) |  | PEM_read_bio_RSAPrivateKey | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (BIO *,RSA **,pem_password_cb *,void *) |  | PEM_read_bio_RSAPublicKey | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (BIO *,RSA **,pem_password_cb *,void *) |  | PEM_read_bio_RSA_PUBKEY | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (BIO *,SSL_SESSION **,pem_password_cb *,void *) |  | PEM_read_bio_SSL_SESSION | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (BIO *,X509 **,pem_password_cb *,void *) |  | PEM_read_bio_X509 | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (BIO *,X509 **,pem_password_cb *,void *) |  | PEM_read_bio_X509_AUX | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (BIO *,X509_ACERT **,pem_password_cb *,void *) |  | PEM_read_bio_X509_ACERT | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (BIO *,X509_CRL **,pem_password_cb *,void *) |  | PEM_read_bio_X509_CRL | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (BIO *,X509_PUBKEY **,pem_password_cb *,void *) |  | PEM_read_bio_X509_PUBKEY | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (BIO *,X509_REQ **,pem_password_cb *,void *) |  | PEM_read_bio_X509_REQ | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (BIO *,X509_SIG **,pem_password_cb *,void *) |  | PEM_read_bio_PKCS8 | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (BIO *,size_t,..(*)(..),void *) |  | ossl_quic_demux_new | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (BIO *,stack_st_X509_INFO *,pem_password_cb *,void *) |  | PEM_X509_INFO_read_bio | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (BrotliDecoderStateInternal *,brotli_alloc_func,brotli_free_func,void *) |  | BrotliDecoderStateInit | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (Curl_easy *,connectdata *,Curl_cpool_conn_do_cb *,void *) |  | Curl_cpool_do_locked | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (Curl_easy *,pingpong *,const char *,va_list) |  | Curl_pp_vsendf | 2 |
-| format.cpp:14:5:14:13 | vsnprintf | (Curl_easy *,pingpong *,const char *,va_list) |  | Curl_pp_vsendf | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (Curl_hash *,void *,size_t,void *) |  | Curl_hash_add | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (DSO *,int,long,void *) |  | DSO_ctrl | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (EVP_CIPHER_CTX *,int,int,void *) |  | EVP_CIPHER_CTX_ctrl | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (FILE *,CMS_ContentInfo **,pem_password_cb *,void *) |  | PEM_read_CMS | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (FILE *,DH **,pem_password_cb *,void *) |  | PEM_read_DHparams | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (FILE *,DSA **,pem_password_cb *,void *) |  | PEM_read_DSAPrivateKey | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (FILE *,DSA **,pem_password_cb *,void *) |  | PEM_read_DSA_PUBKEY | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (FILE *,DSA **,pem_password_cb *,void *) |  | PEM_read_DSAparams | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (FILE *,EC_GROUP **,pem_password_cb *,void *) |  | PEM_read_ECPKParameters | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (FILE *,EC_KEY **,pem_password_cb *,void *) |  | PEM_read_ECPrivateKey | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (FILE *,EC_KEY **,pem_password_cb *,void *) |  | PEM_read_EC_PUBKEY | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (FILE *,EVP_PKEY **,pem_password_cb *,void *) |  | PEM_read_PUBKEY | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (FILE *,EVP_PKEY **,pem_password_cb *,void *) |  | PEM_read_PrivateKey | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (FILE *,EVP_PKEY **,pem_password_cb *,void *) |  | d2i_PKCS8PrivateKey_fp | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (FILE *,NETSCAPE_CERT_SEQUENCE **,pem_password_cb *,void *) |  | PEM_read_NETSCAPE_CERT_SEQUENCE | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (FILE *,PKCS7 **,pem_password_cb *,void *) |  | PEM_read_PKCS7 | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (FILE *,PKCS8_PRIV_KEY_INFO **,pem_password_cb *,void *) |  | PEM_read_PKCS8_PRIV_KEY_INFO | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (FILE *,RSA **,pem_password_cb *,void *) |  | PEM_read_RSAPrivateKey | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (FILE *,RSA **,pem_password_cb *,void *) |  | PEM_read_RSAPublicKey | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (FILE *,RSA **,pem_password_cb *,void *) |  | PEM_read_RSA_PUBKEY | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (FILE *,SSL_SESSION **,pem_password_cb *,void *) |  | PEM_read_SSL_SESSION | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (FILE *,X509 **,pem_password_cb *,void *) |  | PEM_read_X509 | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (FILE *,X509 **,pem_password_cb *,void *) |  | PEM_read_X509_AUX | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (FILE *,X509_ACERT **,pem_password_cb *,void *) |  | PEM_read_X509_ACERT | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (FILE *,X509_CRL **,pem_password_cb *,void *) |  | PEM_read_X509_CRL | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (FILE *,X509_PUBKEY **,pem_password_cb *,void *) |  | PEM_read_X509_PUBKEY | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (FILE *,X509_REQ **,pem_password_cb *,void *) |  | PEM_read_X509_REQ | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (FILE *,X509_SIG **,pem_password_cb *,void *) |  | PEM_read_PKCS8 | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (FILE *,int,const char *,va_list) |  | ___vfprintf_chk | 2 |
-| format.cpp:14:5:14:13 | vsnprintf | (FILE *,int,const char *,va_list) |  | ___vfprintf_chk | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (FILE *,stack_st_X509_INFO *,pem_password_cb *,void *) |  | PEM_X509_INFO_read | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (HT *,size_t,..(*)(..),void *) |  | ossl_ht_filter | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (MD5_SHA1_CTX *,int,int,void *) |  | ossl_md5_sha1_ctrl | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (MemoryManager *,brotli_alloc_func,brotli_free_func,void *) |  | BrotliInitMemoryManager | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (OCB128_CONTEXT *,OCB128_CONTEXT *,void *,void *) |  | CRYPTO_ocb128_copy_ctx | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (OPENSSL_LHASH *,OPENSSL_LH_DOALL_FUNCARG_THUNK,OPENSSL_LH_DOALL_FUNCARG,void *) |  | OPENSSL_LH_doall_arg_thunk | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (OSSL_PROVIDER *,int,..(*)(..),void *) |  | evp_names_do_all | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (OSSL_QTX *,ossl_mutate_packet_cb,ossl_finish_mutate_cb,void *) |  | ossl_qtx_set_mutator | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (QUIC_CHANNEL *,ossl_mutate_packet_cb,ossl_finish_mutate_cb,void *) |  | ossl_quic_channel_set_mutator | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (QUIC_RXFC *,uint64_t,..(*)(..),void *) |  | ossl_quic_rxfc_init_standalone | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (SHA_CTX *,int,int,void *) |  | ossl_sha1_ctrl | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (SSL *,int,long,void *) |  | SSL_ctrl | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (SSL *,int,long,void *) |  | dtls1_ctrl | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (SSL *,int,long,void *) |  | ossl_quic_ctrl | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (SSL *,int,long,void *) |  | ssl3_ctrl | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (SSL *,ossl_statem_mutate_handshake_cb,ossl_statem_finish_mutate_handshake_cb,void *) |  | ossl_statem_set_mutator | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (SSL_CTX *,SSL_CTX_generate_session_ticket_fn,SSL_CTX_decrypt_session_ticket_fn,void *) |  | SSL_CTX_set_session_ticket_cb | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (SSL_CTX *,int,long,void *) |  | SSL_CTX_ctrl | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (SSL_CTX *,int,long,void *) |  | ossl_quic_ctx_ctrl | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (SSL_CTX *,int,long,void *) |  | ssl3_ctx_ctrl | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (X509_ALGOR *,ASN1_OBJECT *,int,void *) |  | X509_ALGOR_set0 | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (char *,int,int,void *) |  | PEM_def_callback | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (char *,int,int,void *) |  | ossl_pw_pem_password | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (char *,int,int,void *) |  | ossl_pw_pvk_password | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (char *,size_t,const char *,va_list) |  | BIO_vsnprintf | 0 |
-| format.cpp:14:5:14:13 | vsnprintf | (char *,size_t,const char *,va_list) |  | BIO_vsnprintf | 1 |
-| format.cpp:14:5:14:13 | vsnprintf | (char *,size_t,const char *,va_list) |  | BIO_vsnprintf | 2 |
-| format.cpp:14:5:14:13 | vsnprintf | (char *,size_t,const char *,va_list) |  | BIO_vsnprintf | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (char *,size_t,const char *,va_list) |  | ___vsnprintf | 0 |
-| format.cpp:14:5:14:13 | vsnprintf | (char *,size_t,const char *,va_list) |  | ___vsnprintf | 1 |
-| format.cpp:14:5:14:13 | vsnprintf | (char *,size_t,const char *,va_list) |  | ___vsnprintf | 2 |
-| format.cpp:14:5:14:13 | vsnprintf | (char *,size_t,const char *,va_list) |  | ___vsnprintf | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (char *,size_t,const char *,va_list) |  | curl_mvsnprintf | 0 |
-| format.cpp:14:5:14:13 | vsnprintf | (char *,size_t,const char *,va_list) |  | curl_mvsnprintf | 1 |
-| format.cpp:14:5:14:13 | vsnprintf | (char *,size_t,const char *,va_list) |  | curl_mvsnprintf | 2 |
-| format.cpp:14:5:14:13 | vsnprintf | (char *,size_t,const char *,va_list) |  | curl_mvsnprintf | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (char *,size_t,size_t,void *) |  | Curl_ftp_parselist | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (char *,size_t,size_t,void *) |  | Curl_mime_read | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (char *,size_t,size_t,void *) |  | tool_header_cb | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (char *,size_t,size_t,void *) |  | tool_mime_stdin_read | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (char *,size_t,size_t,void *) |  | tool_read_cb | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (const OSSL_NAMEMAP *,int,..(*)(..),void *) |  | ossl_namemap_doall_names | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (const char *,const char *,__gnuc_va_list,va_list) |  | _IO_vsscanf | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (const char *,const char *__restrict__,__gnuc_va_list,va_list) |  | __isoc23_vscanf | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (const char *,const char *__restrict__,__gnuc_va_list,va_list) |  | __isoc99_vscanf | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (const char *,int,void *,void *) |  | support_readdir_r_check | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (const wchar_t *,const wchar_t *__restrict__,__gnuc_va_list,va_list) |  | __isoc23_vwscanf | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (const wchar_t *,const wchar_t *__restrict__,__gnuc_va_list,va_list) |  | __isoc99_vwscanf | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (hash_table *,const void *,size_t,void *) |  | insert_entry | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (int,char *,const char *,va_list) |  | sqlite3_vsnprintf | 2 |
-| format.cpp:14:5:14:13 | vsnprintf | (int,char *,const char *,va_list) |  | sqlite3_vsnprintf | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (int,int,const char *,va_list) |  | ERR_vset_error | 2 |
-| format.cpp:14:5:14:13 | vsnprintf | (int,int,const char *,va_list) |  | ERR_vset_error | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (int,unsigned long,..(*)(..),void *) |  | RSA_generate_key | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (nghttp2_session *,const uint8_t *,size_t,void *) |  | nghttp2_session_upgrade | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (sqlite3 *,const char *,..(*)(..),void *) |  | sqlite3_recover_init_sql | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (sqlite3 *,const char *,..(*)(..),void *) |  | sqlite3_rtree_geometry_callback | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (sqlite3 *,const char *,const sqlite3_module *,void *) |  | sqlite3_create_module | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (sqlite3 *,const char *,int,void *) |  | sqlite3_file_control | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (sqlite3 *,int,..(*)(..),void *) |  | sqlite3_progress_handler | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (sqlite3 *,unsigned int,..(*)(..),void *) |  | sqlite3_trace_v2 | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (void *,const char *,const char *,void *) |  | _dl_vsym | 2 |
-| format.cpp:14:5:14:13 | vsnprintf | (void *,const char *,const char *,void *) |  | _dl_vsym | 3 |
-| format.cpp:14:5:14:13 | vsnprintf | (wchar_t *,size_t,const wchar_t *,va_list) |  | __vswprintf | 3 |
-| format.cpp:16:5:16:13 | mysprintf | (StrAccum *,sqlite3_str *,const char *,...) |  | sqlite3_str_appendf | 2 |
-| format.cpp:16:5:16:13 | mysprintf | (StrAccum *,sqlite3_str *,const char *,...) |  | sqlite3_str_appendf | 3 |
-| format.cpp:16:5:16:13 | mysprintf | (char **,int,const char *,...) |  | ___asprintf_chk | 2 |
-| format.cpp:16:5:16:13 | mysprintf | (char **,int,const char *,...) |  | ___asprintf_chk | 3 |
-| format.cpp:16:5:16:13 | mysprintf | (char *,size_t,const char *,...) |  | BIO_snprintf | 0 |
-| format.cpp:16:5:16:13 | mysprintf | (char *,size_t,const char *,...) |  | BIO_snprintf | 1 |
-| format.cpp:16:5:16:13 | mysprintf | (char *,size_t,const char *,...) |  | BIO_snprintf | 2 |
-| format.cpp:16:5:16:13 | mysprintf | (char *,size_t,const char *,...) |  | BIO_snprintf | 3 |
-| format.cpp:16:5:16:13 | mysprintf | (char *,size_t,const char *,...) |  | __strfmon | 0 |
-| format.cpp:16:5:16:13 | mysprintf | (char *,size_t,const char *,...) |  | __strfmon | 1 |
-| format.cpp:16:5:16:13 | mysprintf | (char *,size_t,const char *,...) |  | __strfmon | 2 |
-| format.cpp:16:5:16:13 | mysprintf | (char *,size_t,const char *,...) |  | __strfmon | 3 |
-| format.cpp:16:5:16:13 | mysprintf | (int,char *,const char *,...) |  | sqlite3_snprintf | 2 |
-| format.cpp:16:5:16:13 | mysprintf | (int,char *,const char *,...) |  | sqlite3_snprintf | 3 |
-| format.cpp:16:5:16:13 | mysprintf | (ucontext_t *,..(*)(..),int,...) |  | __makecontext | 3 |
-| format.cpp:28:5:28:10 | sscanf | (CURLSH *,CURLSHoption,...) |  | curl_share_setopt | 2 |
-| format.cpp:28:5:28:10 | sscanf | (Jim_Interp *,const char *,...) |  | Jim_SetResultFormatted | 1 |
-| format.cpp:28:5:28:10 | sscanf | (Jim_Interp *,const char *,...) |  | Jim_SetResultFormatted | 2 |
-| format.cpp:28:5:28:10 | sscanf | (char **,const char *,...) |  | ___asprintf | 1 |
-| format.cpp:28:5:28:10 | sscanf | (char **,const char *,...) |  | ___asprintf | 2 |
-| format.cpp:28:5:28:10 | sscanf | (curl_httppost **,curl_httppost **,...) |  | curl_formadd | 2 |
-| format.cpp:142:8:142:13 | strlen | (const char *) |  | BIO_gethostbyname | 0 |
-| format.cpp:142:8:142:13 | strlen | (const char *) |  | Curl_copy_header_value | 0 |
-| format.cpp:142:8:142:13 | strlen | (const char *) |  | Curl_get_scheme_handler | 0 |
-| format.cpp:142:8:142:13 | strlen | (const char *) |  | Curl_getdate_capped | 0 |
-| format.cpp:142:8:142:13 | strlen | (const char *) |  | Jim_StrDup | 0 |
-| format.cpp:142:8:142:13 | strlen | (const char *) |  | OPENSSL_LH_strhash | 0 |
-| format.cpp:142:8:142:13 | strlen | (const char *) |  | OSSL_STORE_SEARCH_by_alias | 0 |
-| format.cpp:142:8:142:13 | strlen | (const char *) |  | Strsafe | 0 |
-| format.cpp:142:8:142:13 | strlen | (const char *) |  | Symbol_new | 0 |
-| format.cpp:142:8:142:13 | strlen | (const char *) |  | UI_create_method | 0 |
-| format.cpp:142:8:142:13 | strlen | (const char *) |  | X509V3_parse_list | 0 |
-| format.cpp:142:8:142:13 | strlen | (const char *) |  | X509_LOOKUP_meth_new | 0 |
-| format.cpp:142:8:142:13 | strlen | (const char *) |  | __basename | 0 |
-| format.cpp:142:8:142:13 | strlen | (const char *) |  | __gconv_find_shlib | 0 |
-| format.cpp:142:8:142:13 | strlen | (const char *) |  | __gettext | 0 |
-| format.cpp:142:8:142:13 | strlen | (const char *) |  | __hash_string | 0 |
-| format.cpp:142:8:142:13 | strlen | (const char *) |  | __nss_action_parse | 0 |
-| format.cpp:142:8:142:13 | strlen | (const char *) |  | __strdup | 0 |
-| format.cpp:142:8:142:13 | strlen | (const char *) |  | __textdomain | 0 |
-| format.cpp:142:8:142:13 | strlen | (const char *) |  | __tzset_parse_tz | 0 |
-| format.cpp:142:8:142:13 | strlen | (const char *) |  | __tzstring | 0 |
-| format.cpp:142:8:142:13 | strlen | (const char *) |  | a2i_IPADDRESS | 0 |
-| format.cpp:142:8:142:13 | strlen | (const char *) |  | a2i_IPADDRESS_NC | 0 |
-| format.cpp:142:8:142:13 | strlen | (const char *) |  | a64l | 0 |
-| format.cpp:142:8:142:13 | strlen | (const char *) |  | charmap_opendir | 0 |
-| format.cpp:142:8:142:13 | strlen | (const char *) |  | ether_aton | 0 |
-| format.cpp:142:8:142:13 | strlen | (const char *) |  | getdate | 0 |
-| format.cpp:142:8:142:13 | strlen | (const char *) |  | inetstr2int | 0 |
-| format.cpp:142:8:142:13 | strlen | (const char *) |  | last_component | 0 |
-| format.cpp:142:8:142:13 | strlen | (const char *) |  | new_glibc_hwcaps_subdirectory | 0 |
-| format.cpp:142:8:142:13 | strlen | (const char *) |  | opt_path_end | 0 |
-| format.cpp:142:8:142:13 | strlen | (const char *) |  | opt_progname | 0 |
-| format.cpp:142:8:142:13 | strlen | (const char *) |  | ossl_lh_strcasehash | 0 |
-| format.cpp:142:8:142:13 | strlen | (const char *) |  | repertoire_read | 0 |
-| format.cpp:142:8:142:13 | strlen | (const char *) |  | res_gethostbyname | 0 |
-| format.cpp:142:8:142:13 | strlen | (const char *) |  | sgetsgent | 0 |
-| format.cpp:142:8:142:13 | strlen | (const char *) |  | sgetspent | 0 |
-| format.cpp:142:8:142:13 | strlen | (const char *) |  | strhash | 0 |
-| format.cpp:142:8:142:13 | strlen | (const char *) |  | uc_script_byname | 0 |
-| format.cpp:142:8:142:13 | strlen | (const char *) |  | uv__strdup | 0 |
-| format.cpp:142:8:142:13 | strlen | (const char *) |  | uv_wtf8_length_as_utf16 | 0 |
-| format.cpp:142:8:142:13 | strlen | (const char *) |  | xstrdup | 0 |
-| map.cpp:8:6:8:9 | sink | (char *) |  | SRP_VBASE_new | 0 |
-| map.cpp:8:6:8:9 | sink | (char *) |  | _IO_gets | 0 |
-| map.cpp:8:6:8:9 | sink | (char *) |  | __mktemp | 0 |
-| map.cpp:8:6:8:9 | sink | (char *) |  | __nis_default_group | 0 |
-| map.cpp:8:6:8:9 | sink | (char *) |  | __nis_default_owner | 0 |
-| map.cpp:8:6:8:9 | sink | (char *) |  | __nis_default_ttl | 0 |
-| map.cpp:8:6:8:9 | sink | (char *) |  | __xpg_basename | 0 |
-| map.cpp:8:6:8:9 | sink | (char *) |  | ctermid | 0 |
-| map.cpp:8:6:8:9 | sink | (char *) |  | cuserid | 0 |
-| map.cpp:8:6:8:9 | sink | (char *) |  | defossilize | 0 |
-| map.cpp:8:6:8:9 | sink | (char *) |  | des_setparity | 0 |
-| map.cpp:8:6:8:9 | sink | (char *) |  | dirname | 0 |
-| map.cpp:8:6:8:9 | sink | (char *) |  | getwd | 0 |
-| map.cpp:8:6:8:9 | sink | (char *) |  | make_uppercase | 0 |
-| map.cpp:8:6:8:9 | sink | (char *) |  | mkdtemp | 0 |
-| map.cpp:8:6:8:9 | sink | (char *) |  | next_item | 0 |
-| map.cpp:8:6:8:9 | sink | (char *) |  | strfry | 0 |
-| map.cpp:8:6:8:9 | sink | (char *) | CStringT | CStringT | 0 |
-| map.cpp:9:6:9:9 | sink | (const char *) |  | BIO_gethostbyname | 0 |
-| map.cpp:9:6:9:9 | sink | (const char *) |  | Curl_copy_header_value | 0 |
-| map.cpp:9:6:9:9 | sink | (const char *) |  | Curl_get_scheme_handler | 0 |
-| map.cpp:9:6:9:9 | sink | (const char *) |  | Curl_getdate_capped | 0 |
-| map.cpp:9:6:9:9 | sink | (const char *) |  | Jim_StrDup | 0 |
-| map.cpp:9:6:9:9 | sink | (const char *) |  | OPENSSL_LH_strhash | 0 |
-| map.cpp:9:6:9:9 | sink | (const char *) |  | OSSL_STORE_SEARCH_by_alias | 0 |
-| map.cpp:9:6:9:9 | sink | (const char *) |  | Strsafe | 0 |
-| map.cpp:9:6:9:9 | sink | (const char *) |  | Symbol_new | 0 |
-| map.cpp:9:6:9:9 | sink | (const char *) |  | UI_create_method | 0 |
-| map.cpp:9:6:9:9 | sink | (const char *) |  | X509V3_parse_list | 0 |
-| map.cpp:9:6:9:9 | sink | (const char *) |  | X509_LOOKUP_meth_new | 0 |
-| map.cpp:9:6:9:9 | sink | (const char *) |  | __basename | 0 |
-| map.cpp:9:6:9:9 | sink | (const char *) |  | __gconv_find_shlib | 0 |
-| map.cpp:9:6:9:9 | sink | (const char *) |  | __gettext | 0 |
-| map.cpp:9:6:9:9 | sink | (const char *) |  | __hash_string | 0 |
-| map.cpp:9:6:9:9 | sink | (const char *) |  | __nss_action_parse | 0 |
-| map.cpp:9:6:9:9 | sink | (const char *) |  | __strdup | 0 |
-| map.cpp:9:6:9:9 | sink | (const char *) |  | __textdomain | 0 |
-| map.cpp:9:6:9:9 | sink | (const char *) |  | __tzset_parse_tz | 0 |
-| map.cpp:9:6:9:9 | sink | (const char *) |  | __tzstring | 0 |
-| map.cpp:9:6:9:9 | sink | (const char *) |  | a2i_IPADDRESS | 0 |
-| map.cpp:9:6:9:9 | sink | (const char *) |  | a2i_IPADDRESS_NC | 0 |
-| map.cpp:9:6:9:9 | sink | (const char *) |  | a64l | 0 |
-| map.cpp:9:6:9:9 | sink | (const char *) |  | charmap_opendir | 0 |
-| map.cpp:9:6:9:9 | sink | (const char *) |  | ether_aton | 0 |
-| map.cpp:9:6:9:9 | sink | (const char *) |  | getdate | 0 |
-| map.cpp:9:6:9:9 | sink | (const char *) |  | inetstr2int | 0 |
-| map.cpp:9:6:9:9 | sink | (const char *) |  | last_component | 0 |
-| map.cpp:9:6:9:9 | sink | (const char *) |  | new_glibc_hwcaps_subdirectory | 0 |
-| map.cpp:9:6:9:9 | sink | (const char *) |  | opt_path_end | 0 |
-| map.cpp:9:6:9:9 | sink | (const char *) |  | opt_progname | 0 |
-| map.cpp:9:6:9:9 | sink | (const char *) |  | ossl_lh_strcasehash | 0 |
-| map.cpp:9:6:9:9 | sink | (const char *) |  | repertoire_read | 0 |
-| map.cpp:9:6:9:9 | sink | (const char *) |  | res_gethostbyname | 0 |
-| map.cpp:9:6:9:9 | sink | (const char *) |  | sgetsgent | 0 |
-| map.cpp:9:6:9:9 | sink | (const char *) |  | sgetspent | 0 |
-| map.cpp:9:6:9:9 | sink | (const char *) |  | strhash | 0 |
-| map.cpp:9:6:9:9 | sink | (const char *) |  | uc_script_byname | 0 |
-| map.cpp:9:6:9:9 | sink | (const char *) |  | uv__strdup | 0 |
-| map.cpp:9:6:9:9 | sink | (const char *) |  | uv_wtf8_length_as_utf16 | 0 |
-| map.cpp:9:6:9:9 | sink | (const char *) |  | xstrdup | 0 |
-| map.cpp:442:7:442:19 | indirect_sink | (int *) |  | rresvport | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | ASN1_STRING_type_new | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | ASN1_tag2bit | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | ASN1_tag2str | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | Jim_ReturnCode | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | Jim_SignalId | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | OBJ_nid2ln | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | OBJ_nid2obj | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | OBJ_nid2sn | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | OSSL_trace_get_category_name | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | PKCS12_init | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | Symbol_Nth | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | X509_PURPOSE_get0 | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | X509_TRUST_get0 | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | X509_TRUST_get_by_id | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | __btowc | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | __current_locale_name | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | __fdopendir | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | __get_errlist | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | __get_errname | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | __math_invalid_i | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | __math_invalidf_i | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | __p_class | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | __p_rcode | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | __p_type | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | __pkey_get | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | __sigdescr_np | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | __strerrordesc_np | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | _tolower | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | _toupper | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | btowc | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | c_tolower | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | c_toupper | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | curlx_sitouz | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | evp_pkey_type2name | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | inet6_option_space | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | isalnum | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | isalpha | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | isblank | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | iscntrl | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | isdigit | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | isgraph | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | islower | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | isprint | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | ispunct | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | isspace | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | isupper | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | isxdigit | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | ossl_tolower | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | ossl_toupper | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | sigabbrev_np | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | sqlite3_compileoption_get | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | sqlite3_errstr | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | strerrorname_np | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | support_report_failure | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | svcudp_create | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | tls13_alert_code | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | toascii | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | tolower | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | toupper | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | uabs | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | uv__accept | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | uv_err_name | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | uv_get_osfhandle | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | uv_strerror | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | uv_translate_sys_error | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) |  | zError | 0 |
-| movableclass.cpp:8:2:8:15 | MyMovableClass | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| set.cpp:8:6:8:9 | sink | (char *) |  | SRP_VBASE_new | 0 |
-| set.cpp:8:6:8:9 | sink | (char *) |  | _IO_gets | 0 |
-| set.cpp:8:6:8:9 | sink | (char *) |  | __mktemp | 0 |
-| set.cpp:8:6:8:9 | sink | (char *) |  | __nis_default_group | 0 |
-| set.cpp:8:6:8:9 | sink | (char *) |  | __nis_default_owner | 0 |
-| set.cpp:8:6:8:9 | sink | (char *) |  | __nis_default_ttl | 0 |
-| set.cpp:8:6:8:9 | sink | (char *) |  | __xpg_basename | 0 |
-| set.cpp:8:6:8:9 | sink | (char *) |  | ctermid | 0 |
-| set.cpp:8:6:8:9 | sink | (char *) |  | cuserid | 0 |
-| set.cpp:8:6:8:9 | sink | (char *) |  | defossilize | 0 |
-| set.cpp:8:6:8:9 | sink | (char *) |  | des_setparity | 0 |
-| set.cpp:8:6:8:9 | sink | (char *) |  | dirname | 0 |
-| set.cpp:8:6:8:9 | sink | (char *) |  | getwd | 0 |
-| set.cpp:8:6:8:9 | sink | (char *) |  | make_uppercase | 0 |
-| set.cpp:8:6:8:9 | sink | (char *) |  | mkdtemp | 0 |
-| set.cpp:8:6:8:9 | sink | (char *) |  | next_item | 0 |
-| set.cpp:8:6:8:9 | sink | (char *) |  | strfry | 0 |
-| set.cpp:8:6:8:9 | sink | (char *) | CStringT | CStringT | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | ASN1_STRING_type_new | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | ASN1_tag2bit | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | ASN1_tag2str | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | Jim_ReturnCode | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | Jim_SignalId | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | OBJ_nid2ln | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | OBJ_nid2obj | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | OBJ_nid2sn | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | OSSL_trace_get_category_name | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | PKCS12_init | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | Symbol_Nth | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | X509_PURPOSE_get0 | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | X509_TRUST_get0 | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | X509_TRUST_get_by_id | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | __btowc | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | __current_locale_name | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | __fdopendir | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | __get_errlist | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | __get_errname | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | __math_invalid_i | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | __math_invalidf_i | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | __p_class | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | __p_rcode | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | __p_type | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | __pkey_get | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | __sigdescr_np | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | __strerrordesc_np | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | _tolower | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | _toupper | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | btowc | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | c_tolower | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | c_toupper | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | curlx_sitouz | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | evp_pkey_type2name | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | inet6_option_space | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | isalnum | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | isalpha | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | isblank | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | iscntrl | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | isdigit | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | isgraph | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | islower | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | isprint | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | ispunct | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | isspace | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | isupper | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | isxdigit | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | ossl_tolower | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | ossl_toupper | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | sigabbrev_np | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | sqlite3_compileoption_get | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | sqlite3_errstr | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | strerrorname_np | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | support_report_failure | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | svcudp_create | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | tls13_alert_code | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | toascii | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | tolower | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | toupper | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | uabs | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | uv__accept | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | uv_err_name | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | uv_get_osfhandle | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | uv_strerror | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | uv_translate_sys_error | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) |  | zError | 0 |
-| smart_pointer.cpp:4:6:4:9 | sink | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| smart_pointer.cpp:5:6:5:9 | sink | (int *) |  | rresvport | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | ASN1_STRING_type_new | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | ASN1_tag2bit | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | ASN1_tag2str | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | Jim_ReturnCode | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | Jim_SignalId | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | OBJ_nid2ln | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | OBJ_nid2obj | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | OBJ_nid2sn | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | OSSL_trace_get_category_name | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | PKCS12_init | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | Symbol_Nth | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | X509_PURPOSE_get0 | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | X509_TRUST_get0 | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | X509_TRUST_get_by_id | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | __btowc | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | __current_locale_name | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | __fdopendir | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | __get_errlist | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | __get_errname | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | __math_invalid_i | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | __math_invalidf_i | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | __p_class | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | __p_rcode | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | __p_type | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | __pkey_get | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | __sigdescr_np | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | __strerrordesc_np | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | _tolower | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | _toupper | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | btowc | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | c_tolower | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | c_toupper | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | curlx_sitouz | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | evp_pkey_type2name | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | inet6_option_space | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | isalnum | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | isalpha | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | isblank | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | iscntrl | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | isdigit | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | isgraph | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | islower | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | isprint | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | ispunct | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | isspace | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | isupper | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | isxdigit | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | ossl_tolower | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | ossl_toupper | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | sigabbrev_np | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | sqlite3_compileoption_get | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | sqlite3_errstr | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | strerrorname_np | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | support_report_failure | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | svcudp_create | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | tls13_alert_code | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | toascii | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | tolower | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | toupper | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | uabs | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | uv__accept | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | uv_err_name | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | uv_get_osfhandle | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | uv_strerror | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | uv_translate_sys_error | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) |  | zError | 0 |
-| standalone_iterators.cpp:5:6:5:9 | sink | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | ASN1_STRING_type_new | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | ASN1_tag2bit | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | ASN1_tag2str | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | Jim_ReturnCode | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | Jim_SignalId | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | OBJ_nid2ln | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | OBJ_nid2obj | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | OBJ_nid2sn | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | OSSL_trace_get_category_name | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | PKCS12_init | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | Symbol_Nth | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | X509_PURPOSE_get0 | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | X509_TRUST_get0 | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | X509_TRUST_get_by_id | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | __btowc | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | __current_locale_name | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | __fdopendir | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | __get_errlist | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | __get_errname | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | __math_invalid_i | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | __math_invalidf_i | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | __p_class | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | __p_rcode | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | __p_type | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | __pkey_get | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | __sigdescr_np | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | __strerrordesc_np | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | _tolower | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | _toupper | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | btowc | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | c_tolower | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | c_toupper | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | curlx_sitouz | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | evp_pkey_type2name | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | inet6_option_space | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | isalnum | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | isalpha | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | isblank | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | iscntrl | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | isdigit | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | isgraph | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | islower | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | isprint | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | ispunct | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | isspace | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | isupper | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | isxdigit | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | ossl_tolower | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | ossl_toupper | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | sigabbrev_np | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | sqlite3_compileoption_get | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | sqlite3_errstr | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | strerrorname_np | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | support_report_failure | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | svcudp_create | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | tls13_alert_code | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | toascii | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | tolower | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | toupper | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | uabs | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | uv__accept | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | uv_err_name | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | uv_get_osfhandle | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | uv_strerror | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | uv_translate_sys_error | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) |  | zError | 0 |
-| standalone_iterators.cpp:16:30:16:39 | operator++ | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | ASN1_STRING_type_new | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | ASN1_tag2bit | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | ASN1_tag2str | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | Jim_ReturnCode | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | Jim_SignalId | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | OBJ_nid2ln | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | OBJ_nid2obj | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | OBJ_nid2sn | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | OSSL_trace_get_category_name | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | PKCS12_init | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | Symbol_Nth | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | X509_PURPOSE_get0 | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | X509_TRUST_get0 | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | X509_TRUST_get_by_id | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | __btowc | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | __current_locale_name | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | __fdopendir | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | __get_errlist | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | __get_errname | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | __math_invalid_i | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | __math_invalidf_i | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | __p_class | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | __p_rcode | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | __p_type | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | __pkey_get | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | __sigdescr_np | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | __strerrordesc_np | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | _tolower | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | _toupper | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | btowc | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | c_tolower | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | c_toupper | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | curlx_sitouz | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | evp_pkey_type2name | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | inet6_option_space | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | isalnum | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | isalpha | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | isblank | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | iscntrl | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | isdigit | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | isgraph | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | islower | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | isprint | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | ispunct | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | isspace | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | isupper | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | isxdigit | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | ossl_tolower | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | ossl_toupper | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | sigabbrev_np | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | sqlite3_compileoption_get | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | sqlite3_errstr | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | strerrorname_np | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | support_report_failure | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | svcudp_create | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | tls13_alert_code | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | toascii | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | tolower | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | toupper | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | uabs | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | uv__accept | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | uv_err_name | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | uv_get_osfhandle | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | uv_strerror | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | uv_translate_sys_error | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) |  | zError | 0 |
-| standalone_iterators.cpp:23:27:23:36 | operator++ | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | ASN1_STRING_type_new | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | ASN1_tag2bit | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | ASN1_tag2str | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | Jim_ReturnCode | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | Jim_SignalId | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | OBJ_nid2ln | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | OBJ_nid2obj | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | OBJ_nid2sn | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | OSSL_trace_get_category_name | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | PKCS12_init | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | Symbol_Nth | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | X509_PURPOSE_get0 | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | X509_TRUST_get0 | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | X509_TRUST_get_by_id | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | __btowc | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | __current_locale_name | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | __fdopendir | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | __get_errlist | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | __get_errname | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | __math_invalid_i | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | __math_invalidf_i | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | __p_class | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | __p_rcode | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | __p_type | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | __pkey_get | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | __sigdescr_np | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | __strerrordesc_np | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | _tolower | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | _toupper | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | btowc | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | c_tolower | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | c_toupper | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | curlx_sitouz | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | evp_pkey_type2name | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | inet6_option_space | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | isalnum | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | isalpha | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | isblank | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | iscntrl | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | isdigit | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | isgraph | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | islower | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | isprint | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | ispunct | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | isspace | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | isupper | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | isxdigit | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | ossl_tolower | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | ossl_toupper | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | sigabbrev_np | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | sqlite3_compileoption_get | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | sqlite3_errstr | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | strerrorname_np | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | support_report_failure | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | svcudp_create | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | tls13_alert_code | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | toascii | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | tolower | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | toupper | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | uabs | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | uv__accept | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | uv_err_name | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | uv_get_osfhandle | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | uv_strerror | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | uv_translate_sys_error | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) |  | zError | 0 |
-| standalone_iterators.cpp:39:18:39:27 | operator++ | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | ASN1_STRING_type_new | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | ASN1_tag2bit | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | ASN1_tag2str | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | Jim_ReturnCode | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | Jim_SignalId | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | OBJ_nid2ln | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | OBJ_nid2obj | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | OBJ_nid2sn | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | OSSL_trace_get_category_name | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | PKCS12_init | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | Symbol_Nth | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | X509_PURPOSE_get0 | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | X509_TRUST_get0 | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | X509_TRUST_get_by_id | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | __btowc | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | __current_locale_name | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | __fdopendir | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | __get_errlist | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | __get_errname | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | __math_invalid_i | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | __math_invalidf_i | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | __p_class | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | __p_rcode | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | __p_type | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | __pkey_get | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | __sigdescr_np | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | __strerrordesc_np | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | _tolower | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | _toupper | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | btowc | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | c_tolower | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | c_toupper | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | curlx_sitouz | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | evp_pkey_type2name | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | inet6_option_space | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | isalnum | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | isalpha | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | isblank | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | iscntrl | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | isdigit | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | isgraph | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | islower | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | isprint | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | ispunct | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | isspace | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | isupper | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | isxdigit | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | ossl_tolower | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | ossl_toupper | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | sigabbrev_np | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | sqlite3_compileoption_get | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | sqlite3_errstr | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | strerrorname_np | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | support_report_failure | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | svcudp_create | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | tls13_alert_code | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | toascii | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | tolower | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | toupper | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | uabs | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | uv__accept | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | uv_err_name | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | uv_get_osfhandle | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | uv_strerror | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | uv_translate_sys_error | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) |  | zError | 0 |
-| standalone_iterators.cpp:66:30:66:39 | operator++ | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | ASN1_STRING_type_new | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | ASN1_tag2bit | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | ASN1_tag2str | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | Jim_ReturnCode | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | Jim_SignalId | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | OBJ_nid2ln | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | OBJ_nid2obj | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | OBJ_nid2sn | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | OSSL_trace_get_category_name | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | PKCS12_init | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | Symbol_Nth | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | X509_PURPOSE_get0 | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | X509_TRUST_get0 | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | X509_TRUST_get_by_id | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | __btowc | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | __current_locale_name | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | __fdopendir | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | __get_errlist | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | __get_errname | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | __math_invalid_i | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | __math_invalidf_i | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | __p_class | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | __p_rcode | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | __p_type | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | __pkey_get | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | __sigdescr_np | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | __strerrordesc_np | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | _tolower | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | _toupper | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | btowc | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | c_tolower | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | c_toupper | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | curlx_sitouz | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | evp_pkey_type2name | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | inet6_option_space | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | isalnum | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | isalpha | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | isblank | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | iscntrl | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | isdigit | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | isgraph | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | islower | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | isprint | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | ispunct | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | isspace | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | isupper | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | isxdigit | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | ossl_tolower | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | ossl_toupper | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | sigabbrev_np | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | sqlite3_compileoption_get | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | sqlite3_errstr | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | strerrorname_np | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | support_report_failure | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | svcudp_create | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | tls13_alert_code | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | toascii | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | tolower | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | toupper | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | uabs | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | uv__accept | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | uv_err_name | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | uv_get_osfhandle | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | uv_strerror | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | uv_translate_sys_error | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) |  | zError | 0 |
-| standalone_iterators.cpp:68:30:68:39 | operator-- | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | ASN1_STRING_type_new | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | ASN1_tag2bit | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | ASN1_tag2str | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | Jim_ReturnCode | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | Jim_SignalId | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | OBJ_nid2ln | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | OBJ_nid2obj | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | OBJ_nid2sn | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | OSSL_trace_get_category_name | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | PKCS12_init | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | Symbol_Nth | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | X509_PURPOSE_get0 | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | X509_TRUST_get0 | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | X509_TRUST_get_by_id | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | __btowc | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | __current_locale_name | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | __fdopendir | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | __get_errlist | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | __get_errname | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | __math_invalid_i | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | __math_invalidf_i | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | __p_class | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | __p_rcode | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | __p_type | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | __pkey_get | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | __sigdescr_np | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | __strerrordesc_np | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | _tolower | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | _toupper | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | btowc | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | c_tolower | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | c_toupper | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | curlx_sitouz | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | evp_pkey_type2name | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | inet6_option_space | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | isalnum | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | isalpha | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | isblank | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | iscntrl | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | isdigit | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | isgraph | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | islower | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | isprint | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | ispunct | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | isspace | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | isupper | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | isxdigit | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | ossl_tolower | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | ossl_toupper | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | sigabbrev_np | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | sqlite3_compileoption_get | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | sqlite3_errstr | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | strerrorname_np | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | support_report_failure | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | svcudp_create | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | tls13_alert_code | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | toascii | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | tolower | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | toupper | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | uabs | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | uv__accept | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | uv_err_name | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | uv_get_osfhandle | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | uv_strerror | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | uv_translate_sys_error | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) |  | zError | 0 |
-| standalone_iterators.cpp:70:31:70:39 | operator= | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (ASN1_STRING *,int) |  | ASN1_STRING_length_set | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (ASYNC_WAIT_CTX *,int) |  | ASYNC_WAIT_CTX_set_status | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (BIGNUM *,int) |  | BN_clear_bit | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (BIGNUM *,int) |  | BN_mask_bits | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (BIGNUM *,int) |  | BN_set_bit | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (BIGNUM *,int) |  | BN_set_flags | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (BIGNUM *,int) |  | bn_expand2 | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (BIGNUM *,int) |  | bn_wexpand | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (BIGNUM *,int) |  | ossl_bn_mask_bits_fixed_top | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (BIO *,int) |  | BIO_clear_flags | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (BIO *,int) |  | BIO_find_type | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (BIO *,int) |  | BIO_set_flags | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (BIO *,int) |  | BIO_set_init | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (BIO *,int) |  | BIO_set_retry_reason | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (BIO *,int) |  | BIO_set_shutdown | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (BIO *,int) |  | TXT_DB_read | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (CMS_SignerInfo *,int) |  | CMS_signed_delete_attr | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (CMS_SignerInfo *,int) |  | CMS_unsigned_delete_attr | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (CURL *,int) |  | curl_easy_pause | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (Curl_easy *,int) |  | Curl_conn_get_socket | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (DH *,int) |  | DH_clear_flags | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (DH *,int) |  | DH_set_flags | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (DH_METHOD *,int) |  | DH_meth_set_flags | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (DSA *,int) |  | DSA_clear_flags | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (DSA *,int) |  | DSA_set_flags | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (DSA_METHOD *,int) |  | DSA_meth_set_flags | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (EC_GROUP *,int) |  | EC_GROUP_set_asn1_flag | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (EC_GROUP *,int) |  | EC_GROUP_set_curve_name | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (EC_KEY *,int) |  | EC_KEY_clear_flags | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (EC_KEY *,int) |  | EC_KEY_set_asn1_flag | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (EC_KEY *,int) |  | EC_KEY_set_flags | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (ENGINE *,int) |  | ENGINE_cmd_is_executable | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (ENGINE *,int) |  | ENGINE_set_flags | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (EVP_CIPHER *,int) |  | EVP_CIPHER_meth_set_impl_ctx_size | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (EVP_CIPHER *,int) |  | EVP_CIPHER_meth_set_iv_length | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_clear_flags | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_flags | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_key_length | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_num | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (EVP_KEYMGMT *,int) |  | evp_keymgmt_util_query_operation_name | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (EVP_MD *,int) |  | EVP_MD_meth_set_app_datasize | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (EVP_MD *,int) |  | EVP_MD_meth_set_input_blocksize | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (EVP_MD *,int) |  | EVP_MD_meth_set_result_size | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (EVP_MD_CTX *,int) |  | EVP_MD_CTX_clear_flags | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (EVP_MD_CTX *,int) |  | EVP_MD_CTX_set_flags | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (EVP_PKEY *,int) |  | EVP_PKEY_delete_attr | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (EVP_PKEY *,int) |  | EVP_PKEY_save_parameters | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (EVP_PKEY *,int) |  | EVP_PKEY_set_type | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_get_keygen_info | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_kdf_type | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_nid | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_paramgen_type | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_rfc5114 | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dhx_rfc5114 | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ec_param_enc | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ec_paramgen_curve_nid | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ecdh_kdf_type | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_hkdf_mode | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_rsa_padding | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_rsa_pss_saltlen | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_gindex | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_h | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_pcounter | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (FILE *,int) |  | _IO_default_pbackfail | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (FILE *,int) |  | _IO_fwide | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (FILE *,int) |  | _IO_init | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (FILE *,int) |  | _IO_init_internal | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (FILE *,int) |  | _IO_new_file_attach | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (FILE *,int) |  | _IO_new_file_overflow | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (FILE *,int) |  | _IO_old_init | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (FILE *,int) |  | _IO_sputbackc | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (FILE *,int) |  | _IO_str_overflow | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (FILE *,int) |  | _IO_str_pbackfail | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (FILE *,int) |  | __printf_buffer_as_file_overflow | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (FILE *,int) |  | __wprintf_buffer_as_file_overflow | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (FTS *,int) |  | fts_children | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (LIBSSH2_CHANNEL *,int) |  | _libssh2_channel_extended_data | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (LIBSSH2_CHANNEL *,int) |  | _libssh2_channel_flush | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_flush_ex | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_handle_extended_data | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_handle_extended_data2 | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_set_blocking | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (LIBSSH2_SESSION *,int) |  | _libssh2_session_set_blocking | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (LIBSSH2_SESSION *,int) |  | libssh2_hostkey_hash | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (LIBSSH2_SESSION *,int) |  | libssh2_session_methods | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (LIBSSH2_SESSION *,int) |  | libssh2_session_set_blocking | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (LIBSSH2_SESSION *,int) |  | libssh2_session_startup | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (LPCOLESTR,int) | CComBSTR | Append | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (OCSP_BASICRESP *,int) |  | OCSP_BASICRESP_delete_ext | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (OCSP_BASICRESP *,int) |  | OCSP_BASICRESP_get_ext | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (OCSP_BASICRESP *,int) |  | OCSP_resp_get0 | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (OCSP_ONEREQ *,int) |  | OCSP_ONEREQ_delete_ext | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (OCSP_ONEREQ *,int) |  | OCSP_ONEREQ_get_ext | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (OCSP_REQUEST *,int) |  | OCSP_REQUEST_delete_ext | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (OCSP_REQUEST *,int) |  | OCSP_REQUEST_get_ext | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (OCSP_REQUEST *,int) |  | OCSP_request_onereq_get0 | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (OCSP_SINGLERESP *,int) |  | OCSP_SINGLERESP_delete_ext | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (OCSP_SINGLERESP *,int) |  | OCSP_SINGLERESP_get_ext | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (OPENSSL_STACK *,int) |  | OPENSSL_sk_delete | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (OPENSSL_STACK *,int) |  | OPENSSL_sk_reserve | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (OPENSSL_sk_compfunc,int) |  | OPENSSL_sk_new_reserve | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (OSSL_ACKM *,int) |  | ossl_ackm_get_ack_deadline | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (OSSL_ACKM *,int) |  | ossl_ackm_get_ack_frame | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (OSSL_ACKM *,int) |  | ossl_ackm_get_largest_acked | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (OSSL_ACKM *,int) |  | ossl_ackm_on_pkt_space_discarded | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_set_serverPort | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (OSSL_CMP_CTX *,int) |  | ossl_cmp_ctx_set_failInfoCode | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (OSSL_CMP_CTX *,int) |  | ossl_cmp_ctx_set_status | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (OSSL_CMP_CTX *,int) |  | ossl_cmp_msg_create | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (OSSL_CMP_CTX *,int) |  | ossl_cmp_pollReq_new | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (OSSL_CMP_MSG *,int) |  | ossl_cmp_msg_set_bodytype | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (OSSL_CMP_PKIHEADER *,int) |  | ossl_cmp_hdr_set_pvno | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (OSSL_CMP_REVREPCONTENT *,int) |  | ossl_cmp_revrepcontent_get_CertId | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (OSSL_CMP_REVREPCONTENT *,int) |  | ossl_cmp_revrepcontent_get_pkisi | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_accept_raverified | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_accept_unprotected | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_grant_implicit_confirm | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_send_unprotected_errors | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (OSSL_CRMF_PKIPUBLICATIONINFO *,int) |  | OSSL_CRMF_MSG_set_PKIPublicationInfo_action | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (OSSL_DECODER_CTX *,int) |  | OSSL_DECODER_CTX_set_selection | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (OSSL_ENCODER_CTX *,int) |  | OSSL_ENCODER_CTX_set_selection | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (OSSL_LIB_CTX *,int) |  | OSSL_LIB_CTX_get_data | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (OSSL_LIB_CTX *,int) |  | OSSL_LIB_CTX_set_conf_diagnostics | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (OSSL_LIB_CTX *,int) |  | ossl_ctx_global_properties | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (OSSL_LIB_CTX *,int) |  | ossl_dh_new_by_nid_ex | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (OSSL_LIB_CTX *,int) |  | ossl_lib_ctx_get_data | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (OSSL_LIB_CTX *,int) |  | ossl_mac_key_new | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (OSSL_PARAM *,int) |  | OSSL_PARAM_set_int | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (OSSL_QRX *,int) |  | ossl_qrx_get_bytes_received | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (OSSL_RECORD_LAYER *,int) |  | tls_set_first_handshake | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (OSSL_RECORD_LAYER *,int) |  | tls_set_plain_alerts | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (OSSL_STORE_CTX *,int) |  | OSSL_STORE_expect | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (PKCS7 *,int) |  | PKCS7_set_type | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (QUIC_CHANNEL *,int) |  | ossl_quic_channel_new_stream_local | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (QUIC_ENGINE *,int) |  | ossl_quic_engine_set_inhibit_tick | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (QUIC_PORT *,int) |  | ossl_quic_port_set_allow_incoming | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (QUIC_RCIDM *,int) |  | ossl_quic_rcidm_get_preferred_tx_dcid_changed | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (QUIC_RSTREAM *,int) |  | ossl_quic_rstream_set_cleanse | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (QUIC_RXFC *,int) |  | ossl_quic_rxfc_get_error | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (QUIC_RXFC *,int) |  | ossl_quic_rxfc_has_cwm_changed | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (QUIC_SSTREAM *,int) |  | ossl_quic_sstream_set_cleanse | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (QUIC_STREAM_MAP *,int) |  | ossl_quic_stream_map_get_accept_queue_len | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (QUIC_TXFC *,int) |  | ossl_quic_txfc_has_become_blocked | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (RSA *,int) |  | RSA_clear_flags | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (RSA *,int) |  | RSA_set_flags | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (RSA_METHOD *,int) |  | RSA_meth_set_flags | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_hashalg | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_maskgenhashalg | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_saltlen | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_trailerfield | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (SSL *,int) |  | SSL_key_update | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (SSL *,int) |  | SSL_set_post_handshake_auth | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (SSL *,int) |  | SSL_set_purpose | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (SSL *,int) |  | SSL_set_quic_tls_early_data_enabled | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (SSL *,int) |  | SSL_set_quiet_shutdown | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (SSL *,int) |  | SSL_set_read_ahead | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (SSL *,int) |  | SSL_set_security_level | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (SSL *,int) |  | SSL_set_shutdown | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (SSL *,int) |  | SSL_set_trust | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (SSL *,int) |  | SSL_set_verify_depth | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (SSL_CONNECTION *,int) |  | dtls1_read_failed | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (SSL_CONNECTION *,int) |  | ossl_statem_send_fatal | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (SSL_CONNECTION *,int) |  | ossl_statem_set_in_init | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (SSL_CONNECTION *,int) |  | tls1_shared_group | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (SSL_CTX *,int) |  | SSL_CTX_set_post_handshake_auth | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (SSL_CTX *,int) |  | SSL_CTX_set_purpose | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (SSL_CTX *,int) |  | SSL_CTX_set_quiet_shutdown | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (SSL_CTX *,int) |  | SSL_CTX_set_security_level | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (SSL_CTX *,int) |  | SSL_CTX_set_srp_strength | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (SSL_CTX *,int) |  | SSL_CTX_set_trust | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (SSL_CTX *,int) |  | SSL_CTX_set_verify_depth | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (SSL_CTX *,int) |  | ssl_md | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (SSL_SESSION *,int) |  | SSL_SESSION_set_protocol_version | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (TS_REQ *,int) |  | TS_REQ_delete_ext | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (TS_REQ *,int) |  | TS_REQ_get_ext | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (TS_RESP_CTX *,int) |  | TS_RESP_CTX_add_flags | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (TS_STATUS_INFO *,int) |  | TS_STATUS_INFO_set_status | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (TS_TST_INFO *,int) |  | TS_TST_INFO_delete_ext | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (TS_TST_INFO *,int) |  | TS_TST_INFO_get_ext | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (TS_VERIFY_CTX *,int) |  | TS_VERIFY_CTX_add_flags | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (TS_VERIFY_CTX *,int) |  | TS_VERIFY_CTX_set_flags | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (WPACKET *,int) |  | ossl_DER_w_begin_sequence | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (X509 *,int) |  | X509_delete_ext | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (X509 *,int) |  | X509_self_signed | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (X509_ACERT *,int) |  | X509_ACERT_delete_attr | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (X509_ATTRIBUTE *,int) |  | X509_ATTRIBUTE_get0_type | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (X509_CRL *,int) |  | X509_CRL_delete_ext | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (X509_NAME *,int) |  | X509_NAME_delete_entry | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (X509_REQ *,int) |  | X509_REQ_delete_attr | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (X509_REVOKED *,int) |  | X509_REVOKED_delete_ext | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (X509_STORE *,int) |  | X509_STORE_set_depth | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (X509_STORE *,int) |  | X509_STORE_set_purpose | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (X509_STORE *,int) |  | X509_STORE_set_trust | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_depth | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_error | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_error_depth | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_purpose | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_trust | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_get0_host | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_auth_level | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_depth | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_purpose | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_trust | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (_Float128,int) |  | __ldexpf128 | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (_Float128,int) |  | __scalbnf128 | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (__sigset_t *,int) |  | __sigaddset_compat | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (__sigset_t *,int) |  | __sigdelset_compat | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (acttab *,int) |  | acttab_insert | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (addrinfo *,int) |  | support_format_addrinfo | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (aiocb_union *,int) |  | __aio_enqueue_request | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (argp_fmtstream_t,int) |  | __argp_fmtstream_putc | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (char **,int) |  | addrsort | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (char *,int) |  | Curl_str2addr | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (char *,int) |  | PEM_proc_type | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (char,int) | CStringT | CStringT | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (connectdata *,int) |  | Curl_conn_is_ssl | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const ASN1_BIT_STRING *,int) |  | ASN1_BIT_STRING_get_bit | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const BIGNUM *,int) |  | BN_get_flags | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const BIGNUM *,int) |  | BN_is_bit_set | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const BIO *,int) |  | BIO_get_ex_data | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const BIO *,int) |  | BIO_test_flags | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const CMS_SignerInfo *,int) |  | CMS_signed_get_attr | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const CMS_SignerInfo *,int) |  | CMS_unsigned_get_attr | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const CRYPTO_EX_DATA *,int) |  | CRYPTO_get_ex_data | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const DH *,int) |  | DH_get_ex_data | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const DH *,int) |  | DH_test_flags | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const DH *,int) |  | ossl_dh_dup | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const DSA *,int) |  | DSA_get_ex_data | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const DSA *,int) |  | DSA_test_flags | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const DSA *,int) |  | ossl_dsa_dup | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const ECX_KEY *,int) |  | ossl_ecx_key_dup | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const EC_KEY *,int) |  | EC_KEY_get_ex_data | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const EC_KEY *,int) |  | ossl_ec_key_dup | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const ENGINE *,int) |  | ENGINE_get_ex_data | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_test_flags | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const EVP_MD_CTX *,int) |  | EVP_MD_CTX_test_flags | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const EVP_PKEY *,int) |  | EVP_PKEY_get_attr | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const EVP_PKEY *,int) |  | EVP_PKEY_get_ex_data | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const ML_DSA_KEY *,int) |  | ossl_ml_dsa_key_dup | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const ML_KEM_KEY *,int) |  | ossl_ml_kem_key_dup | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const OPENSSL_STACK *,int) |  | OPENSSL_sk_value | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const OSSL_CMP_CERTREPMESSAGE *,int) |  | ossl_cmp_certrepmessage_get0_certresponse | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_get0_newPkey | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_get_option | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const OSSL_CMP_PKISI *,int) |  | ossl_cmp_pkisi_check_pkifailureinfo | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const OSSL_CMP_POLLREPCONTENT *,int) |  | ossl_cmp_pollrepcontent_get0_pollrep | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const QUIC_CHANNEL *,int) |  | ossl_quic_channel_get_local_stream_count_avail | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const QUIC_CHANNEL *,int) |  | ossl_quic_channel_get_remote_stream_count_avail | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const RSA *,int) |  | RSA_get_ex_data | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const RSA *,int) |  | RSA_test_flags | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const RSA *,int) |  | ossl_rsa_dup | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const SLH_DSA_KEY *,int) |  | ossl_slh_dsa_key_dup | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const SSL *,int) |  | SSL_get_ex_data | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const SSL_CTX *,int) |  | SSL_CTX_get_ex_data | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const SSL_SESSION *,int) |  | SSL_SESSION_get_ex_data | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const SSL_SESSION *,int) |  | ssl_session_dup | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const UI *,int) |  | UI_get_ex_data | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const UI_METHOD *,int) |  | UI_method_get_ex_data | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const X509 *,int) |  | X509_get_ex_data | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const X509 *,int) |  | X509_get_ext | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const X509_ACERT *,int) |  | X509_ACERT_get_attr | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const X509_CRL *,int) |  | X509_CRL_get_ext | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const X509_NAME *,int) |  | X509_NAME_get_entry | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const X509_POLICY_LEVEL *,int) |  | X509_policy_level_get0_node | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const X509_POLICY_TREE *,int) |  | X509_policy_tree_get0_level | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const X509_REQ *,int) |  | X509_REQ_get_attr | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const X509_REVOKED *,int) |  | X509_REVOKED_get_ext | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const X509_STORE *,int) |  | X509_STORE_get_ex_data | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const X509_STORE_CTX *,int) |  | X509_STORE_CTX_get_ex_data | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const XCHAR *,int) | CStringT | CStringT | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const YCHAR *,int) | CStringT | CStringT | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const char *,int) |  | DH_meth_new | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const char *,int) |  | DSA_meth_new | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const char *,int) |  | Jim_StrDupLen | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const char *,int) |  | NETSCAPE_SPKI_b64_decode | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const char *,int) |  | RSA_meth_new | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const char *,int) |  | ftok | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const char *,int) |  | gethostbyname2 | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const char *,int) |  | parse_yesno | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const char *,int) |  | res_gethostbyname2 | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const stack_st_X509_ATTRIBUTE *,int) |  | X509at_get_attr | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const stack_st_X509_EXTENSION *,int) |  | X509v3_get_ext | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const unsigned char *,int) |  | Jim_GenHashFunction | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const unsigned char *,int) |  | OPENSSL_uni2asc | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const unsigned char *,int) |  | OPENSSL_uni2utf8 | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (const void *,int) |  | inet6_rth_getaddr | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (double,int) |  | __ldexp | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (double,int) |  | __scalbn | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (double[],int) |  | getloadavg | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (dynhds *,int) |  | Curl_dynhds_set_opts | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (fexcept_t *,int) |  | fegetexceptflag | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (float,int) |  | __ldexpf | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (float,int) |  | __scalbnf | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (gzFile,int) |  | gzflush | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (gzFile,int) |  | gzputc | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (int *,int) |  | X509_PURPOSE_set | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (int *,int) |  | X509_TRUST_set | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (int *,int) |  | __lll_unlock_elision | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (int,int) |  | BN_security_bits | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (int,int) |  | EVP_MD_meth_new | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (int,int) |  | EVP_PKEY_meth_new | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (int,int) |  | __isctype | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (int,int) |  | acttab_alloc | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (int,int) |  | div | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (int,int) |  | inet6_rth_space | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (long double,int) |  | __ldexpl | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (netlink_handle *,int) |  | __netlink_request | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (nghttp2_option *,int) |  | nghttp2_option_set_no_auto_ping_ack | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (nghttp2_option *,int) |  | nghttp2_option_set_no_auto_window_update | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (nghttp2_option *,int) |  | nghttp2_option_set_no_closed_streams | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (nghttp2_option *,int) |  | nghttp2_option_set_no_http_messaging | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (nghttp2_option *,int) |  | nghttp2_option_set_no_recv_client_magic | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (nghttp2_option *,int) |  | nghttp2_option_set_no_rfc9113_leading_and_trailing_ws_validation | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (nghttp2_option *,int) |  | nghttp2_option_set_server_fallback_rfc7540_priorities | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (ns_msg,int) |  | ns_msg_getflag | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (obstack *,int) |  | _obstack_newchunk | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (posix_spawnattr_t *,int) |  | posix_spawnattr_setcgroup_np | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (posix_spawnattr_t *,int) |  | posix_spawnattr_setschedpolicy | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (pthread_attr_t *,int) |  | __pthread_attr_setschedpolicy | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (pthread_barrierattr_t *,int) |  | __pthread_barrierattr_setpshared | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (pthread_mutexattr_t *,int) |  | ___pthread_mutexattr_settype | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (pthread_mutexattr_t *,int) |  | __pthread_mutexattr_setprioceiling | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (pthread_mutexattr_t *,int) |  | __pthread_mutexattr_setprotocol | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (pthread_rwlockattr_t *,int) |  | __pthread_rwlockattr_setkind_np | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (pthread_rwlockattr_t *,int) |  | __pthread_rwlockattr_setpshared | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (rule *,int) |  | Configlist_add | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (rule *,int) |  | Configlist_addbasis | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (sigset_t *,int) |  | sigaddset | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (sigset_t *,int) |  | sigdelset | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (sqlite3 *,int) |  | sqlite3_busy_timeout | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (sqlite3 *,int) |  | sqlite3_db_name | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (sqlite3 *,int) |  | sqlite3_wal_autocheckpoint | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (sqlite3_backup *,int) |  | sqlite3_backup_step | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (sqlite3_context *,int) |  | sqlite3_aggregate_context | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (sqlite3_context *,int) |  | sqlite3_result_error_code | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (sqlite3_index_info *,int) |  | sqlite3_vtab_collation | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (sqlite3_stmt *,int) |  | sqlite3_bind_parameter_name | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (sqlite3_stmt *,int) |  | sqlite3_column_blob | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (sqlite3_stmt *,int) |  | sqlite3_column_bytes | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (sqlite3_stmt *,int) |  | sqlite3_column_bytes16 | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (sqlite3_stmt *,int) |  | sqlite3_column_decltype | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (sqlite3_stmt *,int) |  | sqlite3_column_decltype16 | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (sqlite3_stmt *,int) |  | sqlite3_column_double | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (sqlite3_stmt *,int) |  | sqlite3_column_int | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (sqlite3_stmt *,int) |  | sqlite3_column_int64 | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (sqlite3_stmt *,int) |  | sqlite3_column_name | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (sqlite3_stmt *,int) |  | sqlite3_column_name16 | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (sqlite3_stmt *,int) |  | sqlite3_column_text | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (sqlite3_stmt *,int) |  | sqlite3_column_text16 | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (sqlite3_stmt *,int) |  | sqlite3_column_type | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (sqlite3_stmt *,int) |  | sqlite3_column_value | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (sqlite3_stmt *,int) |  | sqlite3_stmt_explain | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (stack_st_PKCS7 *,int) |  | PKCS12_add_safes | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (stack_st_SSL_COMP *,int) |  | ssl3_comp_find | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (stack_st_X509_ATTRIBUTE *,int) |  | X509at_delete_attr | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (stack_st_X509_EXTENSION *,int) |  | X509v3_delete_ext | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (timespec *,int) |  | __timespec_get | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (timespec *,int) |  | __timespec_getres | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (uint16_t,int) |  | tls1_group_id2nid | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (unsigned char *,int) |  | RAND_bytes | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (unsigned char *,int) |  | RAND_priv_bytes | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (unsigned char *,int) |  | ossl_ipaddr_to_asc | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (unsigned short,int) |  | dtls1_get_queue_priority | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (uv_env_item_t *,int) |  | uv_os_free_environ | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (void *,int) |  | DSO_dsobyaddr | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (void *,int) |  | sqlite3_realloc | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (void *const *,int) |  | __backtrace_symbols | 1 |
-| standalone_iterators.cpp:103:27:103:36 | operator+= | (wchar_t,int) | CStringT | CStringT | 1 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | ASN1_STRING_type_new | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | ASN1_STRING_type_new | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | ASN1_STRING_type_new | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | ASN1_STRING_type_new | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | ASN1_STRING_type_new | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | ASN1_tag2bit | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | ASN1_tag2bit | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | ASN1_tag2bit | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | ASN1_tag2bit | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | ASN1_tag2bit | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | ASN1_tag2str | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | ASN1_tag2str | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | ASN1_tag2str | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | ASN1_tag2str | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | ASN1_tag2str | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | Jim_ReturnCode | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | Jim_ReturnCode | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | Jim_ReturnCode | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | Jim_ReturnCode | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | Jim_ReturnCode | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | Jim_SignalId | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | Jim_SignalId | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | Jim_SignalId | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | Jim_SignalId | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | Jim_SignalId | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | OBJ_nid2ln | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | OBJ_nid2ln | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | OBJ_nid2ln | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | OBJ_nid2ln | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | OBJ_nid2ln | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | OBJ_nid2obj | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | OBJ_nid2obj | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | OBJ_nid2obj | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | OBJ_nid2obj | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | OBJ_nid2obj | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | OBJ_nid2sn | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | OBJ_nid2sn | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | OBJ_nid2sn | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | OBJ_nid2sn | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | OBJ_nid2sn | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | OSSL_trace_get_category_name | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | OSSL_trace_get_category_name | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | OSSL_trace_get_category_name | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | OSSL_trace_get_category_name | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | OSSL_trace_get_category_name | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | PKCS12_init | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | PKCS12_init | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | PKCS12_init | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | PKCS12_init | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | PKCS12_init | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | Symbol_Nth | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | Symbol_Nth | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | Symbol_Nth | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | Symbol_Nth | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | Symbol_Nth | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | X509_PURPOSE_get0 | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | X509_PURPOSE_get0 | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | X509_PURPOSE_get0 | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | X509_PURPOSE_get0 | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | X509_PURPOSE_get0 | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | X509_TRUST_get0 | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | X509_TRUST_get0 | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | X509_TRUST_get0 | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | X509_TRUST_get0 | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | X509_TRUST_get0 | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | X509_TRUST_get_by_id | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | X509_TRUST_get_by_id | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | X509_TRUST_get_by_id | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | X509_TRUST_get_by_id | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | X509_TRUST_get_by_id | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __btowc | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __btowc | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __btowc | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __btowc | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __btowc | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __current_locale_name | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __current_locale_name | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __current_locale_name | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __current_locale_name | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __current_locale_name | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __fdopendir | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __fdopendir | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __fdopendir | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __fdopendir | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __fdopendir | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __get_errlist | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __get_errlist | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __get_errlist | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __get_errlist | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __get_errlist | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __get_errname | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __get_errname | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __get_errname | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __get_errname | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __get_errname | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __math_invalid_i | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __math_invalid_i | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __math_invalid_i | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __math_invalid_i | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __math_invalid_i | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __math_invalidf_i | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __math_invalidf_i | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __math_invalidf_i | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __math_invalidf_i | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __math_invalidf_i | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __p_class | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __p_class | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __p_class | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __p_class | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __p_class | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __p_rcode | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __p_rcode | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __p_rcode | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __p_rcode | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __p_rcode | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __p_type | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __p_type | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __p_type | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __p_type | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __p_type | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __pkey_get | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __pkey_get | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __pkey_get | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __pkey_get | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __pkey_get | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __sigdescr_np | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __sigdescr_np | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __sigdescr_np | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __sigdescr_np | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __sigdescr_np | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __strerrordesc_np | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __strerrordesc_np | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __strerrordesc_np | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __strerrordesc_np | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | __strerrordesc_np | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | _tolower | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | _tolower | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | _tolower | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | _tolower | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | _tolower | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | _toupper | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | _toupper | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | _toupper | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | _toupper | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | _toupper | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | btowc | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | btowc | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | btowc | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | btowc | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | btowc | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | c_tolower | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | c_tolower | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | c_tolower | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | c_tolower | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | c_tolower | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | c_toupper | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | c_toupper | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | c_toupper | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | c_toupper | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | c_toupper | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | curlx_sitouz | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | curlx_sitouz | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | curlx_sitouz | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | curlx_sitouz | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | curlx_sitouz | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | evp_pkey_type2name | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | evp_pkey_type2name | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | evp_pkey_type2name | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | evp_pkey_type2name | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | evp_pkey_type2name | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | inet6_option_space | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | inet6_option_space | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | inet6_option_space | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | inet6_option_space | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | inet6_option_space | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | isalnum | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | isalnum | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | isalnum | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | isalnum | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | isalnum | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | isalpha | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | isalpha | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | isalpha | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | isalpha | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | isalpha | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | isblank | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | isblank | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | isblank | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | isblank | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | isblank | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | iscntrl | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | iscntrl | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | iscntrl | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | iscntrl | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | iscntrl | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | isdigit | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | isdigit | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | isdigit | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | isdigit | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | isdigit | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | isgraph | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | isgraph | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | isgraph | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | isgraph | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | isgraph | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | islower | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | islower | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | islower | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | islower | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | islower | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | isprint | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | isprint | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | isprint | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | isprint | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | isprint | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | ispunct | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | ispunct | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | ispunct | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | ispunct | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | ispunct | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | isspace | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | isspace | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | isspace | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | isspace | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | isspace | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | isupper | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | isupper | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | isupper | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | isupper | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | isupper | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | isxdigit | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | isxdigit | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | isxdigit | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | isxdigit | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | isxdigit | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | ossl_tolower | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | ossl_tolower | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | ossl_tolower | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | ossl_tolower | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | ossl_tolower | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | ossl_toupper | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | ossl_toupper | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | ossl_toupper | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | ossl_toupper | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | ossl_toupper | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | sigabbrev_np | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | sigabbrev_np | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | sigabbrev_np | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | sigabbrev_np | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | sigabbrev_np | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | sqlite3_compileoption_get | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | sqlite3_compileoption_get | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | sqlite3_compileoption_get | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | sqlite3_compileoption_get | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | sqlite3_compileoption_get | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | sqlite3_errstr | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | sqlite3_errstr | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | sqlite3_errstr | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | sqlite3_errstr | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | sqlite3_errstr | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | strerrorname_np | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | strerrorname_np | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | strerrorname_np | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | strerrorname_np | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | strerrorname_np | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | support_report_failure | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | support_report_failure | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | support_report_failure | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | support_report_failure | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | support_report_failure | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | svcudp_create | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | svcudp_create | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | svcudp_create | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | svcudp_create | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | svcudp_create | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | tls13_alert_code | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | tls13_alert_code | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | tls13_alert_code | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | tls13_alert_code | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | tls13_alert_code | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | toascii | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | toascii | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | toascii | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | toascii | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | toascii | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | tolower | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | tolower | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | tolower | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | tolower | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | tolower | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | toupper | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | toupper | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | toupper | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | toupper | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | toupper | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | uabs | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | uabs | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | uabs | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | uabs | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | uabs | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | uv__accept | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | uv__accept | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | uv__accept | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | uv__accept | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | uv__accept | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | uv_err_name | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | uv_err_name | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | uv_err_name | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | uv_err_name | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | uv_err_name | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | uv_get_osfhandle | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | uv_get_osfhandle | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | uv_get_osfhandle | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | uv_get_osfhandle | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | uv_get_osfhandle | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | uv_strerror | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | uv_strerror | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | uv_strerror | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | uv_strerror | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | uv_strerror | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | uv_translate_sys_error | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | uv_translate_sys_error | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | uv_translate_sys_error | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | uv_translate_sys_error | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | uv_translate_sys_error | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | zError | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | zError | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | zError | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | zError | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) |  | zError | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| stl.h:52:12:52:21 | operator++ | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | ASN1_STRING_type_new | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | ASN1_tag2bit | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | ASN1_tag2str | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | Jim_ReturnCode | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | Jim_SignalId | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | OBJ_nid2ln | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | OBJ_nid2obj | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | OBJ_nid2sn | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | OSSL_trace_get_category_name | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | PKCS12_init | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | Symbol_Nth | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | X509_PURPOSE_get0 | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | X509_TRUST_get0 | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | X509_TRUST_get_by_id | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | __btowc | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | __current_locale_name | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | __fdopendir | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | __get_errlist | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | __get_errname | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | __math_invalid_i | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | __math_invalidf_i | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | __p_class | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | __p_rcode | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | __p_type | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | __pkey_get | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | __sigdescr_np | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | __strerrordesc_np | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | _tolower | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | _toupper | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | btowc | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | c_tolower | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | c_toupper | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | curlx_sitouz | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | evp_pkey_type2name | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | inet6_option_space | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | isalnum | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | isalpha | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | isblank | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | iscntrl | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | isdigit | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | isgraph | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | islower | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | isprint | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | ispunct | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | isspace | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | isupper | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | isxdigit | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | ossl_tolower | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | ossl_toupper | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | sigabbrev_np | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | sqlite3_compileoption_get | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | sqlite3_errstr | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | strerrorname_np | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | support_report_failure | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | svcudp_create | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | tls13_alert_code | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | toascii | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | tolower | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | toupper | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | uabs | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | uv__accept | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | uv_err_name | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | uv_get_osfhandle | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | uv_strerror | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | uv_translate_sys_error | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) |  | zError | 0 |
-| stl.h:54:12:54:21 | operator-- | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | ASN1_STRING_type_new | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | ASN1_tag2bit | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | ASN1_tag2str | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | Jim_ReturnCode | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | Jim_SignalId | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | OBJ_nid2ln | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | OBJ_nid2obj | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | OBJ_nid2sn | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | OSSL_trace_get_category_name | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | PKCS12_init | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | Symbol_Nth | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | X509_PURPOSE_get0 | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | X509_TRUST_get0 | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | X509_TRUST_get_by_id | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | __btowc | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | __current_locale_name | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | __fdopendir | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | __get_errlist | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | __get_errname | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | __math_invalid_i | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | __math_invalidf_i | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | __p_class | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | __p_rcode | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | __p_type | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | __pkey_get | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | __sigdescr_np | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | __strerrordesc_np | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | _tolower | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | _toupper | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | btowc | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | c_tolower | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | c_toupper | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | curlx_sitouz | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | evp_pkey_type2name | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | inet6_option_space | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | isalnum | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | isalpha | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | isblank | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | iscntrl | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | isdigit | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | isgraph | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | islower | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | isprint | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | ispunct | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | isspace | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | isupper | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | isxdigit | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | ossl_tolower | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | ossl_toupper | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | sigabbrev_np | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | sqlite3_compileoption_get | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | sqlite3_errstr | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | strerrorname_np | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | support_report_failure | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | svcudp_create | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | tls13_alert_code | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | toascii | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | tolower | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | toupper | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | uabs | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | uv__accept | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | uv_err_name | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | uv_get_osfhandle | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | uv_strerror | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | uv_translate_sys_error | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) |  | zError | 0 |
-| stl.h:59:12:59:20 | operator+ | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | ASN1_STRING_type_new | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | ASN1_tag2bit | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | ASN1_tag2str | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | Jim_ReturnCode | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | Jim_SignalId | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | OBJ_nid2ln | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | OBJ_nid2obj | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | OBJ_nid2sn | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | OSSL_trace_get_category_name | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | PKCS12_init | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | Symbol_Nth | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | X509_PURPOSE_get0 | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | X509_TRUST_get0 | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | X509_TRUST_get_by_id | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | __btowc | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | __current_locale_name | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | __fdopendir | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | __get_errlist | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | __get_errname | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | __math_invalid_i | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | __math_invalidf_i | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | __p_class | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | __p_rcode | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | __p_type | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | __pkey_get | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | __sigdescr_np | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | __strerrordesc_np | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | _tolower | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | _toupper | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | btowc | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | c_tolower | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | c_toupper | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | curlx_sitouz | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | evp_pkey_type2name | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | inet6_option_space | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | isalnum | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | isalpha | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | isblank | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | iscntrl | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | isdigit | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | isgraph | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | islower | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | isprint | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | ispunct | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | isspace | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | isupper | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | isxdigit | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | ossl_tolower | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | ossl_toupper | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | sigabbrev_np | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | sqlite3_compileoption_get | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | sqlite3_errstr | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | strerrorname_np | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | support_report_failure | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | svcudp_create | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | tls13_alert_code | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | toascii | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | tolower | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | toupper | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | uabs | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | uv__accept | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | uv_err_name | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | uv_get_osfhandle | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | uv_strerror | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | uv_translate_sys_error | 0 |
-| stl.h:60:12:60:20 | operator- | (int) |  | zError | 0 |
-| stl.h:60:12:60:20 | operator- | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | ASN1_STRING_type_new | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | ASN1_STRING_type_new | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | ASN1_tag2bit | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | ASN1_tag2bit | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | ASN1_tag2str | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | ASN1_tag2str | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | Jim_ReturnCode | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | Jim_ReturnCode | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | Jim_SignalId | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | Jim_SignalId | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | OBJ_nid2ln | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | OBJ_nid2ln | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | OBJ_nid2obj | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | OBJ_nid2obj | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | OBJ_nid2sn | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | OBJ_nid2sn | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | OSSL_trace_get_category_name | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | OSSL_trace_get_category_name | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | PKCS12_init | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | PKCS12_init | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | Symbol_Nth | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | Symbol_Nth | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | X509_PURPOSE_get0 | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | X509_PURPOSE_get0 | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | X509_TRUST_get0 | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | X509_TRUST_get0 | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | X509_TRUST_get_by_id | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | X509_TRUST_get_by_id | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | __btowc | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | __btowc | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | __current_locale_name | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | __current_locale_name | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | __fdopendir | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | __fdopendir | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | __get_errlist | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | __get_errlist | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | __get_errname | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | __get_errname | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | __math_invalid_i | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | __math_invalid_i | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | __math_invalidf_i | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | __math_invalidf_i | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | __p_class | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | __p_class | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | __p_rcode | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | __p_rcode | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | __p_type | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | __p_type | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | __pkey_get | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | __pkey_get | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | __sigdescr_np | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | __sigdescr_np | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | __strerrordesc_np | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | __strerrordesc_np | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | _tolower | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | _tolower | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | _toupper | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | _toupper | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | btowc | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | btowc | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | c_tolower | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | c_tolower | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | c_toupper | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | c_toupper | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | curlx_sitouz | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | curlx_sitouz | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | evp_pkey_type2name | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | evp_pkey_type2name | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | inet6_option_space | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | inet6_option_space | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | isalnum | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | isalnum | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | isalpha | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | isalpha | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | isblank | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | isblank | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | iscntrl | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | iscntrl | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | isdigit | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | isdigit | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | isgraph | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | isgraph | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | islower | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | islower | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | isprint | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | isprint | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | ispunct | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | ispunct | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | isspace | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | isspace | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | isupper | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | isupper | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | isxdigit | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | isxdigit | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | ossl_tolower | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | ossl_tolower | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | ossl_toupper | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | ossl_toupper | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | sigabbrev_np | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | sigabbrev_np | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | sqlite3_compileoption_get | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | sqlite3_compileoption_get | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | sqlite3_errstr | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | sqlite3_errstr | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | strerrorname_np | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | strerrorname_np | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | support_report_failure | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | support_report_failure | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | svcudp_create | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | svcudp_create | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | tls13_alert_code | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | tls13_alert_code | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | toascii | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | toascii | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | tolower | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | tolower | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | toupper | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | toupper | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | uabs | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | uabs | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | uv__accept | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | uv__accept | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | uv_err_name | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | uv_err_name | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | uv_get_osfhandle | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | uv_get_osfhandle | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | uv_strerror | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | uv_strerror | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | uv_translate_sys_error | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | uv_translate_sys_error | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | zError | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) |  | zError | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| stl.h:61:13:61:22 | operator+= | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | ASN1_STRING_type_new | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | ASN1_tag2bit | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | ASN1_tag2str | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | Jim_ReturnCode | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | Jim_SignalId | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | OBJ_nid2ln | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | OBJ_nid2obj | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | OBJ_nid2sn | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | OSSL_trace_get_category_name | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | PKCS12_init | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | Symbol_Nth | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | X509_PURPOSE_get0 | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | X509_TRUST_get0 | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | X509_TRUST_get_by_id | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | __btowc | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | __current_locale_name | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | __fdopendir | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | __get_errlist | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | __get_errname | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | __math_invalid_i | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | __math_invalidf_i | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | __p_class | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | __p_rcode | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | __p_type | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | __pkey_get | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | __sigdescr_np | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | __strerrordesc_np | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | _tolower | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | _toupper | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | btowc | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | c_tolower | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | c_toupper | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | curlx_sitouz | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | evp_pkey_type2name | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | inet6_option_space | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | isalnum | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | isalpha | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | isblank | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | iscntrl | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | isdigit | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | isgraph | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | islower | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | isprint | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | ispunct | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | isspace | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | isupper | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | isxdigit | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | ossl_tolower | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | ossl_toupper | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | sigabbrev_np | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | sqlite3_compileoption_get | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | sqlite3_errstr | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | strerrorname_np | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | support_report_failure | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | svcudp_create | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | tls13_alert_code | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | toascii | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | tolower | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | toupper | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | uabs | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | uv__accept | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | uv_err_name | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | uv_get_osfhandle | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | uv_strerror | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | uv_translate_sys_error | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) |  | zError | 0 |
-| stl.h:62:13:62:22 | operator-= | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | ASN1_STRING_type_new | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | ASN1_tag2bit | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | ASN1_tag2str | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | Jim_ReturnCode | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | Jim_SignalId | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | OBJ_nid2ln | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | OBJ_nid2obj | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | OBJ_nid2sn | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | OSSL_trace_get_category_name | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | PKCS12_init | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | Symbol_Nth | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | X509_PURPOSE_get0 | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | X509_TRUST_get0 | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | X509_TRUST_get_by_id | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | __btowc | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | __current_locale_name | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | __fdopendir | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | __get_errlist | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | __get_errname | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | __math_invalid_i | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | __math_invalidf_i | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | __p_class | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | __p_rcode | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | __p_type | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | __pkey_get | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | __sigdescr_np | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | __strerrordesc_np | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | _tolower | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | _toupper | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | btowc | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | c_tolower | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | c_toupper | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | curlx_sitouz | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | evp_pkey_type2name | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | inet6_option_space | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | isalnum | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | isalpha | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | isblank | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | iscntrl | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | isdigit | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | isgraph | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | islower | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | isprint | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | ispunct | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | isspace | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | isupper | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | isxdigit | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | ossl_tolower | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | ossl_toupper | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | sigabbrev_np | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | sqlite3_compileoption_get | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | sqlite3_errstr | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | strerrorname_np | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | support_report_failure | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | svcudp_create | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | tls13_alert_code | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | toascii | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | tolower | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | toupper | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | uabs | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | uv__accept | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | uv_err_name | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | uv_get_osfhandle | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | uv_strerror | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | uv_translate_sys_error | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) |  | zError | 0 |
-| stl.h:64:18:64:27 | operator[] | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | ASN1_STRING_type_new | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | ASN1_STRING_type_new | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | ASN1_tag2bit | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | ASN1_tag2bit | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | ASN1_tag2str | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | ASN1_tag2str | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | Jim_ReturnCode | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | Jim_ReturnCode | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | Jim_SignalId | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | Jim_SignalId | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | OBJ_nid2ln | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | OBJ_nid2ln | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | OBJ_nid2obj | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | OBJ_nid2obj | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | OBJ_nid2sn | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | OBJ_nid2sn | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | OSSL_trace_get_category_name | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | OSSL_trace_get_category_name | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | PKCS12_init | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | PKCS12_init | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | Symbol_Nth | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | Symbol_Nth | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | X509_PURPOSE_get0 | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | X509_PURPOSE_get0 | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | X509_TRUST_get0 | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | X509_TRUST_get0 | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | X509_TRUST_get_by_id | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | X509_TRUST_get_by_id | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | __btowc | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | __btowc | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | __current_locale_name | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | __current_locale_name | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | __fdopendir | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | __fdopendir | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | __get_errlist | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | __get_errlist | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | __get_errname | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | __get_errname | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | __math_invalid_i | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | __math_invalid_i | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | __math_invalidf_i | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | __math_invalidf_i | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | __p_class | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | __p_class | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | __p_rcode | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | __p_rcode | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | __p_type | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | __p_type | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | __pkey_get | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | __pkey_get | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | __sigdescr_np | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | __sigdescr_np | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | __strerrordesc_np | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | __strerrordesc_np | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | _tolower | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | _tolower | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | _toupper | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | _toupper | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | btowc | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | btowc | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | c_tolower | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | c_tolower | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | c_toupper | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | c_toupper | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | curlx_sitouz | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | curlx_sitouz | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | evp_pkey_type2name | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | evp_pkey_type2name | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | inet6_option_space | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | inet6_option_space | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | isalnum | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | isalnum | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | isalpha | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | isalpha | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | isblank | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | isblank | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | iscntrl | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | iscntrl | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | isdigit | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | isdigit | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | isgraph | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | isgraph | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | islower | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | islower | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | isprint | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | isprint | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | ispunct | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | ispunct | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | isspace | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | isspace | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | isupper | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | isupper | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | isxdigit | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | isxdigit | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | ossl_tolower | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | ossl_tolower | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | ossl_toupper | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | ossl_toupper | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | sigabbrev_np | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | sigabbrev_np | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | sqlite3_compileoption_get | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | sqlite3_compileoption_get | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | sqlite3_errstr | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | sqlite3_errstr | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | strerrorname_np | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | strerrorname_np | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | support_report_failure | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | support_report_failure | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | svcudp_create | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | svcudp_create | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | tls13_alert_code | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | tls13_alert_code | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | toascii | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | toascii | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | tolower | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | tolower | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | toupper | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | toupper | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | uabs | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | uabs | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | uv__accept | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | uv__accept | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | uv_err_name | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | uv_err_name | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | uv_get_osfhandle | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | uv_get_osfhandle | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | uv_strerror | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | uv_strerror | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | uv_translate_sys_error | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | uv_translate_sys_error | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | zError | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) |  | zError | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| stl.h:91:24:91:33 | operator++ | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| stl.h:182:17:182:22 | assign | (InputIt,InputIt) | deque | assign<InputIt> | 0 |
-| stl.h:182:17:182:22 | assign | (InputIt,InputIt) | deque | assign<InputIt> | 1 |
-| stl.h:182:17:182:22 | assign | (InputIt,InputIt) | forward_list | assign<InputIt> | 0 |
-| stl.h:182:17:182:22 | assign | (InputIt,InputIt) | forward_list | assign<InputIt> | 1 |
-| stl.h:182:17:182:22 | assign | (InputIt,InputIt) | list | assign<InputIt> | 0 |
-| stl.h:182:17:182:22 | assign | (InputIt,InputIt) | list | assign<InputIt> | 1 |
-| stl.h:182:17:182:22 | assign | (InputIt,InputIt) | vector | assign<InputIt> | 0 |
-| stl.h:182:17:182:22 | assign | (InputIt,InputIt) | vector | assign<InputIt> | 1 |
-| stl.h:185:17:185:22 | insert | (InputIt,InputIt) | deque | assign<InputIt> | 0 |
-| stl.h:185:17:185:22 | insert | (InputIt,InputIt) | deque | assign<InputIt> | 1 |
-| stl.h:185:17:185:22 | insert | (InputIt,InputIt) | forward_list | assign<InputIt> | 0 |
-| stl.h:185:17:185:22 | insert | (InputIt,InputIt) | forward_list | assign<InputIt> | 1 |
-| stl.h:185:17:185:22 | insert | (InputIt,InputIt) | list | assign<InputIt> | 0 |
-| stl.h:185:17:185:22 | insert | (InputIt,InputIt) | list | assign<InputIt> | 1 |
-| stl.h:185:17:185:22 | insert | (InputIt,InputIt) | vector | assign<InputIt> | 0 |
-| stl.h:185:17:185:22 | insert | (InputIt,InputIt) | vector | assign<InputIt> | 1 |
-| stl.h:190:17:190:23 | replace | (const_iterator,InputIt,InputIt) | deque | insert<InputIt> | 0 |
-| stl.h:190:17:190:23 | replace | (const_iterator,InputIt,InputIt) | deque | insert<InputIt> | 1 |
-| stl.h:190:17:190:23 | replace | (const_iterator,InputIt,InputIt) | deque | insert<InputIt> | 2 |
-| stl.h:190:17:190:23 | replace | (const_iterator,InputIt,InputIt) | forward_list | insert_after<InputIt> | 0 |
-| stl.h:190:17:190:23 | replace | (const_iterator,InputIt,InputIt) | forward_list | insert_after<InputIt> | 1 |
-| stl.h:190:17:190:23 | replace | (const_iterator,InputIt,InputIt) | forward_list | insert_after<InputIt> | 2 |
-| stl.h:190:17:190:23 | replace | (const_iterator,InputIt,InputIt) | list | insert<InputIt> | 0 |
-| stl.h:190:17:190:23 | replace | (const_iterator,InputIt,InputIt) | list | insert<InputIt> | 1 |
-| stl.h:190:17:190:23 | replace | (const_iterator,InputIt,InputIt) | list | insert<InputIt> | 2 |
-| stl.h:190:17:190:23 | replace | (const_iterator,InputIt,InputIt) | vector | insert<InputIt> | 0 |
-| stl.h:190:17:190:23 | replace | (const_iterator,InputIt,InputIt) | vector | insert<InputIt> | 1 |
-| stl.h:190:17:190:23 | replace | (const_iterator,InputIt,InputIt) | vector | insert<InputIt> | 2 |
-| stl.h:218:33:218:35 | get | (ASN1_PCTX *,unsigned long) |  | ASN1_PCTX_set_cert_flags | 1 |
-| stl.h:218:33:218:35 | get | (ASN1_PCTX *,unsigned long) |  | ASN1_PCTX_set_flags | 1 |
-| stl.h:218:33:218:35 | get | (ASN1_PCTX *,unsigned long) |  | ASN1_PCTX_set_nm_flags | 1 |
-| stl.h:218:33:218:35 | get | (ASN1_PCTX *,unsigned long) |  | ASN1_PCTX_set_oid_flags | 1 |
-| stl.h:218:33:218:35 | get | (ASN1_PCTX *,unsigned long) |  | ASN1_PCTX_set_str_flags | 1 |
-| stl.h:218:33:218:35 | get | (BIGNUM *,unsigned long) |  | BN_add_word | 1 |
-| stl.h:218:33:218:35 | get | (BIGNUM *,unsigned long) |  | BN_div_word | 1 |
-| stl.h:218:33:218:35 | get | (BIGNUM *,unsigned long) |  | BN_set_word | 1 |
-| stl.h:218:33:218:35 | get | (BIGNUM *,unsigned long) |  | BN_sub_word | 1 |
-| stl.h:218:33:218:35 | get | (BN_BLINDING *,unsigned long) |  | BN_BLINDING_set_flags | 1 |
-| stl.h:218:33:218:35 | get | (CONF_IMODULE *,unsigned long) |  | CONF_imodule_set_flags | 1 |
-| stl.h:218:33:218:35 | get | (EVP_CIPHER *,unsigned long) |  | EVP_CIPHER_meth_set_flags | 1 |
-| stl.h:218:33:218:35 | get | (EVP_MD *,unsigned long) |  | EVP_MD_meth_set_flags | 1 |
-| stl.h:218:33:218:35 | get | (HMAC_CTX *,unsigned long) |  | HMAC_CTX_set_flags | 1 |
-| stl.h:218:33:218:35 | get | (OPENSSL_INIT_SETTINGS *,unsigned long) |  | OPENSSL_INIT_set_config_file_flags | 1 |
-| stl.h:218:33:218:35 | get | (OPENSSL_LHASH *,unsigned long) |  | OPENSSL_LH_set_down_load | 1 |
-| stl.h:218:33:218:35 | get | (OSSL_HTTP_REQ_CTX *,unsigned long) |  | OSSL_HTTP_REQ_CTX_set_max_response_length | 1 |
-| stl.h:218:33:218:35 | get | (OSSL_PARAM *,unsigned long) |  | OSSL_PARAM_set_ulong | 1 |
-| stl.h:218:33:218:35 | get | (SSL *,unsigned long) |  | SSL_dane_clear_flags | 1 |
-| stl.h:218:33:218:35 | get | (SSL *,unsigned long) |  | SSL_dane_set_flags | 1 |
-| stl.h:218:33:218:35 | get | (SSL_CONNECTION *,unsigned long) |  | tls1_check_ec_tmp_key | 1 |
-| stl.h:218:33:218:35 | get | (SSL_CTX *,unsigned long) |  | SSL_CTX_dane_clear_flags | 1 |
-| stl.h:218:33:218:35 | get | (SSL_CTX *,unsigned long) |  | SSL_CTX_dane_set_flags | 1 |
-| stl.h:218:33:218:35 | get | (X509_STORE *,unsigned long) |  | X509_STORE_set_flags | 1 |
-| stl.h:218:33:218:35 | get | (X509_STORE_CTX *,unsigned long) |  | X509_STORE_CTX_set_flags | 1 |
-| stl.h:218:33:218:35 | get | (X509_VERIFY_PARAM *,unsigned long) |  | X509_VERIFY_PARAM_clear_flags | 1 |
-| stl.h:218:33:218:35 | get | (X509_VERIFY_PARAM *,unsigned long) |  | X509_VERIFY_PARAM_set_flags | 1 |
-| stl.h:218:33:218:35 | get | (const BIGNUM *,unsigned long) |  | BN_mod_word | 1 |
-| stl.h:218:33:218:35 | get | (hash_table *,unsigned long) |  | init_hash | 1 |
-| stl.h:218:33:218:35 | get | (u_long,unsigned long) |  | __p_option | 1 |
-| stl.h:220:33:220:36 | read | (ASN1_PCTX *,unsigned long) |  | ASN1_PCTX_set_cert_flags | 1 |
-| stl.h:220:33:220:36 | read | (ASN1_PCTX *,unsigned long) |  | ASN1_PCTX_set_flags | 1 |
-| stl.h:220:33:220:36 | read | (ASN1_PCTX *,unsigned long) |  | ASN1_PCTX_set_nm_flags | 1 |
-| stl.h:220:33:220:36 | read | (ASN1_PCTX *,unsigned long) |  | ASN1_PCTX_set_oid_flags | 1 |
-| stl.h:220:33:220:36 | read | (ASN1_PCTX *,unsigned long) |  | ASN1_PCTX_set_str_flags | 1 |
-| stl.h:220:33:220:36 | read | (BIGNUM *,unsigned long) |  | BN_add_word | 1 |
-| stl.h:220:33:220:36 | read | (BIGNUM *,unsigned long) |  | BN_div_word | 1 |
-| stl.h:220:33:220:36 | read | (BIGNUM *,unsigned long) |  | BN_set_word | 1 |
-| stl.h:220:33:220:36 | read | (BIGNUM *,unsigned long) |  | BN_sub_word | 1 |
-| stl.h:220:33:220:36 | read | (BN_BLINDING *,unsigned long) |  | BN_BLINDING_set_flags | 1 |
-| stl.h:220:33:220:36 | read | (CONF_IMODULE *,unsigned long) |  | CONF_imodule_set_flags | 1 |
-| stl.h:220:33:220:36 | read | (EVP_CIPHER *,unsigned long) |  | EVP_CIPHER_meth_set_flags | 1 |
-| stl.h:220:33:220:36 | read | (EVP_MD *,unsigned long) |  | EVP_MD_meth_set_flags | 1 |
-| stl.h:220:33:220:36 | read | (HMAC_CTX *,unsigned long) |  | HMAC_CTX_set_flags | 1 |
-| stl.h:220:33:220:36 | read | (OPENSSL_INIT_SETTINGS *,unsigned long) |  | OPENSSL_INIT_set_config_file_flags | 1 |
-| stl.h:220:33:220:36 | read | (OPENSSL_LHASH *,unsigned long) |  | OPENSSL_LH_set_down_load | 1 |
-| stl.h:220:33:220:36 | read | (OSSL_HTTP_REQ_CTX *,unsigned long) |  | OSSL_HTTP_REQ_CTX_set_max_response_length | 1 |
-| stl.h:220:33:220:36 | read | (OSSL_PARAM *,unsigned long) |  | OSSL_PARAM_set_ulong | 1 |
-| stl.h:220:33:220:36 | read | (SSL *,unsigned long) |  | SSL_dane_clear_flags | 1 |
-| stl.h:220:33:220:36 | read | (SSL *,unsigned long) |  | SSL_dane_set_flags | 1 |
-| stl.h:220:33:220:36 | read | (SSL_CONNECTION *,unsigned long) |  | tls1_check_ec_tmp_key | 1 |
-| stl.h:220:33:220:36 | read | (SSL_CTX *,unsigned long) |  | SSL_CTX_dane_clear_flags | 1 |
-| stl.h:220:33:220:36 | read | (SSL_CTX *,unsigned long) |  | SSL_CTX_dane_set_flags | 1 |
-| stl.h:220:33:220:36 | read | (X509_STORE *,unsigned long) |  | X509_STORE_set_flags | 1 |
-| stl.h:220:33:220:36 | read | (X509_STORE_CTX *,unsigned long) |  | X509_STORE_CTX_set_flags | 1 |
-| stl.h:220:33:220:36 | read | (X509_VERIFY_PARAM *,unsigned long) |  | X509_VERIFY_PARAM_clear_flags | 1 |
-| stl.h:220:33:220:36 | read | (X509_VERIFY_PARAM *,unsigned long) |  | X509_VERIFY_PARAM_set_flags | 1 |
-| stl.h:220:33:220:36 | read | (const BIGNUM *,unsigned long) |  | BN_mod_word | 1 |
-| stl.h:220:33:220:36 | read | (hash_table *,unsigned long) |  | init_hash | 1 |
-| stl.h:220:33:220:36 | read | (u_long,unsigned long) |  | __p_option | 1 |
-| stl.h:221:14:221:21 | readsome | (ASN1_PCTX *,unsigned long) |  | ASN1_PCTX_set_cert_flags | 1 |
-| stl.h:221:14:221:21 | readsome | (ASN1_PCTX *,unsigned long) |  | ASN1_PCTX_set_flags | 1 |
-| stl.h:221:14:221:21 | readsome | (ASN1_PCTX *,unsigned long) |  | ASN1_PCTX_set_nm_flags | 1 |
-| stl.h:221:14:221:21 | readsome | (ASN1_PCTX *,unsigned long) |  | ASN1_PCTX_set_oid_flags | 1 |
-| stl.h:221:14:221:21 | readsome | (ASN1_PCTX *,unsigned long) |  | ASN1_PCTX_set_str_flags | 1 |
-| stl.h:221:14:221:21 | readsome | (BIGNUM *,unsigned long) |  | BN_add_word | 1 |
-| stl.h:221:14:221:21 | readsome | (BIGNUM *,unsigned long) |  | BN_div_word | 1 |
-| stl.h:221:14:221:21 | readsome | (BIGNUM *,unsigned long) |  | BN_set_word | 1 |
-| stl.h:221:14:221:21 | readsome | (BIGNUM *,unsigned long) |  | BN_sub_word | 1 |
-| stl.h:221:14:221:21 | readsome | (BN_BLINDING *,unsigned long) |  | BN_BLINDING_set_flags | 1 |
-| stl.h:221:14:221:21 | readsome | (CONF_IMODULE *,unsigned long) |  | CONF_imodule_set_flags | 1 |
-| stl.h:221:14:221:21 | readsome | (EVP_CIPHER *,unsigned long) |  | EVP_CIPHER_meth_set_flags | 1 |
-| stl.h:221:14:221:21 | readsome | (EVP_MD *,unsigned long) |  | EVP_MD_meth_set_flags | 1 |
-| stl.h:221:14:221:21 | readsome | (HMAC_CTX *,unsigned long) |  | HMAC_CTX_set_flags | 1 |
-| stl.h:221:14:221:21 | readsome | (OPENSSL_INIT_SETTINGS *,unsigned long) |  | OPENSSL_INIT_set_config_file_flags | 1 |
-| stl.h:221:14:221:21 | readsome | (OPENSSL_LHASH *,unsigned long) |  | OPENSSL_LH_set_down_load | 1 |
-| stl.h:221:14:221:21 | readsome | (OSSL_HTTP_REQ_CTX *,unsigned long) |  | OSSL_HTTP_REQ_CTX_set_max_response_length | 1 |
-| stl.h:221:14:221:21 | readsome | (OSSL_PARAM *,unsigned long) |  | OSSL_PARAM_set_ulong | 1 |
-| stl.h:221:14:221:21 | readsome | (SSL *,unsigned long) |  | SSL_dane_clear_flags | 1 |
-| stl.h:221:14:221:21 | readsome | (SSL *,unsigned long) |  | SSL_dane_set_flags | 1 |
-| stl.h:221:14:221:21 | readsome | (SSL_CONNECTION *,unsigned long) |  | tls1_check_ec_tmp_key | 1 |
-| stl.h:221:14:221:21 | readsome | (SSL_CTX *,unsigned long) |  | SSL_CTX_dane_clear_flags | 1 |
-| stl.h:221:14:221:21 | readsome | (SSL_CTX *,unsigned long) |  | SSL_CTX_dane_set_flags | 1 |
-| stl.h:221:14:221:21 | readsome | (X509_STORE *,unsigned long) |  | X509_STORE_set_flags | 1 |
-| stl.h:221:14:221:21 | readsome | (X509_STORE_CTX *,unsigned long) |  | X509_STORE_CTX_set_flags | 1 |
-| stl.h:221:14:221:21 | readsome | (X509_VERIFY_PARAM *,unsigned long) |  | X509_VERIFY_PARAM_clear_flags | 1 |
-| stl.h:221:14:221:21 | readsome | (X509_VERIFY_PARAM *,unsigned long) |  | X509_VERIFY_PARAM_set_flags | 1 |
-| stl.h:221:14:221:21 | readsome | (const BIGNUM *,unsigned long) |  | BN_mod_word | 1 |
-| stl.h:221:14:221:21 | readsome | (hash_table *,unsigned long) |  | init_hash | 1 |
-| stl.h:221:14:221:21 | readsome | (u_long,unsigned long) |  | __p_option | 1 |
-| stl.h:225:32:225:38 | getline | (ASN1_PCTX *,unsigned long) |  | ASN1_PCTX_set_cert_flags | 1 |
-| stl.h:225:32:225:38 | getline | (ASN1_PCTX *,unsigned long) |  | ASN1_PCTX_set_flags | 1 |
-| stl.h:225:32:225:38 | getline | (ASN1_PCTX *,unsigned long) |  | ASN1_PCTX_set_nm_flags | 1 |
-| stl.h:225:32:225:38 | getline | (ASN1_PCTX *,unsigned long) |  | ASN1_PCTX_set_oid_flags | 1 |
-| stl.h:225:32:225:38 | getline | (ASN1_PCTX *,unsigned long) |  | ASN1_PCTX_set_str_flags | 1 |
-| stl.h:225:32:225:38 | getline | (BIGNUM *,unsigned long) |  | BN_add_word | 1 |
-| stl.h:225:32:225:38 | getline | (BIGNUM *,unsigned long) |  | BN_div_word | 1 |
-| stl.h:225:32:225:38 | getline | (BIGNUM *,unsigned long) |  | BN_set_word | 1 |
-| stl.h:225:32:225:38 | getline | (BIGNUM *,unsigned long) |  | BN_sub_word | 1 |
-| stl.h:225:32:225:38 | getline | (BN_BLINDING *,unsigned long) |  | BN_BLINDING_set_flags | 1 |
-| stl.h:225:32:225:38 | getline | (CONF_IMODULE *,unsigned long) |  | CONF_imodule_set_flags | 1 |
-| stl.h:225:32:225:38 | getline | (EVP_CIPHER *,unsigned long) |  | EVP_CIPHER_meth_set_flags | 1 |
-| stl.h:225:32:225:38 | getline | (EVP_MD *,unsigned long) |  | EVP_MD_meth_set_flags | 1 |
-| stl.h:225:32:225:38 | getline | (HMAC_CTX *,unsigned long) |  | HMAC_CTX_set_flags | 1 |
-| stl.h:225:32:225:38 | getline | (OPENSSL_INIT_SETTINGS *,unsigned long) |  | OPENSSL_INIT_set_config_file_flags | 1 |
-| stl.h:225:32:225:38 | getline | (OPENSSL_LHASH *,unsigned long) |  | OPENSSL_LH_set_down_load | 1 |
-| stl.h:225:32:225:38 | getline | (OSSL_HTTP_REQ_CTX *,unsigned long) |  | OSSL_HTTP_REQ_CTX_set_max_response_length | 1 |
-| stl.h:225:32:225:38 | getline | (OSSL_PARAM *,unsigned long) |  | OSSL_PARAM_set_ulong | 1 |
-| stl.h:225:32:225:38 | getline | (SSL *,unsigned long) |  | SSL_dane_clear_flags | 1 |
-| stl.h:225:32:225:38 | getline | (SSL *,unsigned long) |  | SSL_dane_set_flags | 1 |
-| stl.h:225:32:225:38 | getline | (SSL_CONNECTION *,unsigned long) |  | tls1_check_ec_tmp_key | 1 |
-| stl.h:225:32:225:38 | getline | (SSL_CTX *,unsigned long) |  | SSL_CTX_dane_clear_flags | 1 |
-| stl.h:225:32:225:38 | getline | (SSL_CTX *,unsigned long) |  | SSL_CTX_dane_set_flags | 1 |
-| stl.h:225:32:225:38 | getline | (X509_STORE *,unsigned long) |  | X509_STORE_set_flags | 1 |
-| stl.h:225:32:225:38 | getline | (X509_STORE_CTX *,unsigned long) |  | X509_STORE_CTX_set_flags | 1 |
-| stl.h:225:32:225:38 | getline | (X509_VERIFY_PARAM *,unsigned long) |  | X509_VERIFY_PARAM_clear_flags | 1 |
-| stl.h:225:32:225:38 | getline | (X509_VERIFY_PARAM *,unsigned long) |  | X509_VERIFY_PARAM_set_flags | 1 |
-| stl.h:225:32:225:38 | getline | (const BIGNUM *,unsigned long) |  | BN_mod_word | 1 |
-| stl.h:225:32:225:38 | getline | (hash_table *,unsigned long) |  | init_hash | 1 |
-| stl.h:225:32:225:38 | getline | (u_long,unsigned long) |  | __p_option | 1 |
-| stl.h:232:84:232:90 | getline | (const_iterator,InputIt,InputIt) | deque | insert<InputIt> | 2 |
-| stl.h:232:84:232:90 | getline | (const_iterator,InputIt,InputIt) | forward_list | insert_after<InputIt> | 2 |
-| stl.h:232:84:232:90 | getline | (const_iterator,InputIt,InputIt) | list | insert<InputIt> | 2 |
-| stl.h:232:84:232:90 | getline | (const_iterator,InputIt,InputIt) | vector | insert<InputIt> | 2 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | ASN1_STRING_type_new | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | ASN1_tag2bit | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | ASN1_tag2str | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | Jim_ReturnCode | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | Jim_SignalId | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | OBJ_nid2ln | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | OBJ_nid2obj | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | OBJ_nid2sn | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | OSSL_trace_get_category_name | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | PKCS12_init | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | Symbol_Nth | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | X509_PURPOSE_get0 | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | X509_TRUST_get0 | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | X509_TRUST_get_by_id | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | __btowc | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | __current_locale_name | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | __fdopendir | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | __get_errlist | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | __get_errname | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | __math_invalid_i | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | __math_invalidf_i | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | __p_class | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | __p_rcode | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | __p_type | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | __pkey_get | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | __sigdescr_np | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | __strerrordesc_np | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | _tolower | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | _toupper | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | btowc | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | c_tolower | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | c_toupper | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | curlx_sitouz | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | evp_pkey_type2name | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | inet6_option_space | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | isalnum | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | isalpha | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | isblank | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | iscntrl | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | isdigit | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | isgraph | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | islower | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | isprint | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | ispunct | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | isspace | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | isupper | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | isxdigit | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | ossl_tolower | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | ossl_toupper | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | sigabbrev_np | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | sqlite3_compileoption_get | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | sqlite3_errstr | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | strerrorname_np | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | support_report_failure | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | svcudp_create | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | tls13_alert_code | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | toascii | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | tolower | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | toupper | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | uabs | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | uv__accept | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | uv_err_name | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | uv_get_osfhandle | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | uv_strerror | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | uv_translate_sys_error | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) |  | zError | 0 |
-| stl.h:240:33:240:42 | operator<< | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| stl.h:243:33:243:37 | write | (ASN1_PCTX *,unsigned long) |  | ASN1_PCTX_set_cert_flags | 1 |
-| stl.h:243:33:243:37 | write | (ASN1_PCTX *,unsigned long) |  | ASN1_PCTX_set_flags | 1 |
-| stl.h:243:33:243:37 | write | (ASN1_PCTX *,unsigned long) |  | ASN1_PCTX_set_nm_flags | 1 |
-| stl.h:243:33:243:37 | write | (ASN1_PCTX *,unsigned long) |  | ASN1_PCTX_set_oid_flags | 1 |
-| stl.h:243:33:243:37 | write | (ASN1_PCTX *,unsigned long) |  | ASN1_PCTX_set_str_flags | 1 |
-| stl.h:243:33:243:37 | write | (BIGNUM *,unsigned long) |  | BN_add_word | 1 |
-| stl.h:243:33:243:37 | write | (BIGNUM *,unsigned long) |  | BN_div_word | 1 |
-| stl.h:243:33:243:37 | write | (BIGNUM *,unsigned long) |  | BN_set_word | 1 |
-| stl.h:243:33:243:37 | write | (BIGNUM *,unsigned long) |  | BN_sub_word | 1 |
-| stl.h:243:33:243:37 | write | (BN_BLINDING *,unsigned long) |  | BN_BLINDING_set_flags | 1 |
-| stl.h:243:33:243:37 | write | (CONF_IMODULE *,unsigned long) |  | CONF_imodule_set_flags | 1 |
-| stl.h:243:33:243:37 | write | (EVP_CIPHER *,unsigned long) |  | EVP_CIPHER_meth_set_flags | 1 |
-| stl.h:243:33:243:37 | write | (EVP_MD *,unsigned long) |  | EVP_MD_meth_set_flags | 1 |
-| stl.h:243:33:243:37 | write | (HMAC_CTX *,unsigned long) |  | HMAC_CTX_set_flags | 1 |
-| stl.h:243:33:243:37 | write | (OPENSSL_INIT_SETTINGS *,unsigned long) |  | OPENSSL_INIT_set_config_file_flags | 1 |
-| stl.h:243:33:243:37 | write | (OPENSSL_LHASH *,unsigned long) |  | OPENSSL_LH_set_down_load | 1 |
-| stl.h:243:33:243:37 | write | (OSSL_HTTP_REQ_CTX *,unsigned long) |  | OSSL_HTTP_REQ_CTX_set_max_response_length | 1 |
-| stl.h:243:33:243:37 | write | (OSSL_PARAM *,unsigned long) |  | OSSL_PARAM_set_ulong | 1 |
-| stl.h:243:33:243:37 | write | (SSL *,unsigned long) |  | SSL_dane_clear_flags | 1 |
-| stl.h:243:33:243:37 | write | (SSL *,unsigned long) |  | SSL_dane_set_flags | 1 |
-| stl.h:243:33:243:37 | write | (SSL_CONNECTION *,unsigned long) |  | tls1_check_ec_tmp_key | 1 |
-| stl.h:243:33:243:37 | write | (SSL_CTX *,unsigned long) |  | SSL_CTX_dane_clear_flags | 1 |
-| stl.h:243:33:243:37 | write | (SSL_CTX *,unsigned long) |  | SSL_CTX_dane_set_flags | 1 |
-| stl.h:243:33:243:37 | write | (X509_STORE *,unsigned long) |  | X509_STORE_set_flags | 1 |
-| stl.h:243:33:243:37 | write | (X509_STORE_CTX *,unsigned long) |  | X509_STORE_CTX_set_flags | 1 |
-| stl.h:243:33:243:37 | write | (X509_VERIFY_PARAM *,unsigned long) |  | X509_VERIFY_PARAM_clear_flags | 1 |
-| stl.h:243:33:243:37 | write | (X509_VERIFY_PARAM *,unsigned long) |  | X509_VERIFY_PARAM_set_flags | 1 |
-| stl.h:243:33:243:37 | write | (const BIGNUM *,unsigned long) |  | BN_mod_word | 1 |
-| stl.h:243:33:243:37 | write | (hash_table *,unsigned long) |  | init_hash | 1 |
-| stl.h:243:33:243:37 | write | (u_long,unsigned long) |  | __p_option | 1 |
-| stl.h:294:12:294:17 | vector | (const deque &,const Allocator &) | deque<T,Allocator> | deque | 1 |
-| stl.h:294:12:294:17 | vector | (const deque &,const Allocator &) | deque<T,Allocator> | deque | 1 |
-| stl.h:294:12:294:17 | vector | (const deque &,const Allocator &) | deque<T,Allocator> | deque | 1 |
-| stl.h:294:12:294:17 | vector | (const forward_list &,const Allocator &) | forward_list<T,Allocator> | forward_list | 1 |
-| stl.h:294:12:294:17 | vector | (const forward_list &,const Allocator &) | forward_list<T,Allocator> | forward_list | 1 |
-| stl.h:294:12:294:17 | vector | (const forward_list &,const Allocator &) | forward_list<T,Allocator> | forward_list | 1 |
-| stl.h:294:12:294:17 | vector | (const list &,const Allocator &) | list<T,Allocator> | list | 1 |
-| stl.h:294:12:294:17 | vector | (const list &,const Allocator &) | list<T,Allocator> | list | 1 |
-| stl.h:294:12:294:17 | vector | (const list &,const Allocator &) | list<T,Allocator> | list | 1 |
-| stl.h:294:12:294:17 | vector | (const vector &,const Allocator &) | vector<T,Allocator> | vector | 1 |
-| stl.h:294:12:294:17 | vector | (const vector &,const Allocator &) | vector<T,Allocator> | vector | 1 |
-| stl.h:294:12:294:17 | vector | (const vector &,const Allocator &) | vector<T,Allocator> | vector | 1 |
-| stl.h:294:12:294:17 | vector | (deque &&,const Allocator &) | deque<T,Allocator> | deque | 1 |
-| stl.h:294:12:294:17 | vector | (deque &&,const Allocator &) | deque<T,Allocator> | deque | 1 |
-| stl.h:294:12:294:17 | vector | (deque &&,const Allocator &) | deque<T,Allocator> | deque | 1 |
-| stl.h:294:12:294:17 | vector | (forward_list &&,const Allocator &) | forward_list<T,Allocator> | forward_list | 1 |
-| stl.h:294:12:294:17 | vector | (forward_list &&,const Allocator &) | forward_list<T,Allocator> | forward_list | 1 |
-| stl.h:294:12:294:17 | vector | (forward_list &&,const Allocator &) | forward_list<T,Allocator> | forward_list | 1 |
-| stl.h:294:12:294:17 | vector | (list &&,const Allocator &) | list<T,Allocator> | list | 1 |
-| stl.h:294:12:294:17 | vector | (list &&,const Allocator &) | list<T,Allocator> | list | 1 |
-| stl.h:294:12:294:17 | vector | (list &&,const Allocator &) | list<T,Allocator> | list | 1 |
-| stl.h:294:12:294:17 | vector | (vector &&,const Allocator &) | vector<T,Allocator> | vector | 1 |
-| stl.h:294:12:294:17 | vector | (vector &&,const Allocator &) | vector<T,Allocator> | vector | 1 |
-| stl.h:294:12:294:17 | vector | (vector &&,const Allocator &) | vector<T,Allocator> | vector | 1 |
-| stl.h:295:3:295:8 | vector | (InputIterator,InputIterator,const Allocator &) | deque<T,Allocator> | deque<InputIterator> | 2 |
-| stl.h:295:3:295:8 | vector | (InputIterator,InputIterator,const Allocator &) | deque<T,Allocator> | deque<InputIterator> | 2 |
-| stl.h:295:3:295:8 | vector | (InputIterator,InputIterator,const Allocator &) | forward_list<T,Allocator> | forward_list | 2 |
-| stl.h:295:3:295:8 | vector | (InputIterator,InputIterator,const Allocator &) | forward_list<T,Allocator> | forward_list | 2 |
-| stl.h:295:3:295:8 | vector | (InputIterator,InputIterator,const Allocator &) | list<T,Allocator> | list<InputIterator> | 2 |
-| stl.h:295:3:295:8 | vector | (InputIterator,InputIterator,const Allocator &) | list<T,Allocator> | list<InputIterator> | 2 |
-| stl.h:295:3:295:8 | vector | (InputIterator,InputIterator,const Allocator &) | vector<T,Allocator> | vector<InputIterator> | 2 |
-| stl.h:295:3:295:8 | vector | (InputIterator,InputIterator,const Allocator &) | vector<T,Allocator> | vector<InputIterator> | 2 |
-| stl.h:295:3:295:8 | vector | (size_type,const T &,const Allocator &) | deque<T,Allocator> | deque | 0 |
-| stl.h:295:3:295:8 | vector | (size_type,const T &,const Allocator &) | deque<T,Allocator> | deque | 0 |
-| stl.h:295:3:295:8 | vector | (size_type,const T &,const Allocator &) | deque<T,Allocator> | deque | 1 |
-| stl.h:295:3:295:8 | vector | (size_type,const T &,const Allocator &) | deque<T,Allocator> | deque | 1 |
-| stl.h:295:3:295:8 | vector | (size_type,const T &,const Allocator &) | deque<T,Allocator> | deque | 2 |
-| stl.h:295:3:295:8 | vector | (size_type,const T &,const Allocator &) | deque<T,Allocator> | deque | 2 |
-| stl.h:295:3:295:8 | vector | (size_type,const T &,const Allocator &) | forward_list<T,Allocator> | forward_list | 0 |
-| stl.h:295:3:295:8 | vector | (size_type,const T &,const Allocator &) | forward_list<T,Allocator> | forward_list | 0 |
-| stl.h:295:3:295:8 | vector | (size_type,const T &,const Allocator &) | forward_list<T,Allocator> | forward_list | 1 |
-| stl.h:295:3:295:8 | vector | (size_type,const T &,const Allocator &) | forward_list<T,Allocator> | forward_list | 1 |
-| stl.h:295:3:295:8 | vector | (size_type,const T &,const Allocator &) | forward_list<T,Allocator> | forward_list | 2 |
-| stl.h:295:3:295:8 | vector | (size_type,const T &,const Allocator &) | forward_list<T,Allocator> | forward_list | 2 |
-| stl.h:295:3:295:8 | vector | (size_type,const T &,const Allocator &) | list<T,Allocator> | list | 0 |
-| stl.h:295:3:295:8 | vector | (size_type,const T &,const Allocator &) | list<T,Allocator> | list | 0 |
-| stl.h:295:3:295:8 | vector | (size_type,const T &,const Allocator &) | list<T,Allocator> | list | 1 |
-| stl.h:295:3:295:8 | vector | (size_type,const T &,const Allocator &) | list<T,Allocator> | list | 1 |
-| stl.h:295:3:295:8 | vector | (size_type,const T &,const Allocator &) | list<T,Allocator> | list | 2 |
-| stl.h:295:3:295:8 | vector | (size_type,const T &,const Allocator &) | list<T,Allocator> | list | 2 |
-| stl.h:295:3:295:8 | vector | (size_type,const T &,const Allocator &) | vector<T,Allocator> | vector | 0 |
-| stl.h:295:3:295:8 | vector | (size_type,const T &,const Allocator &) | vector<T,Allocator> | vector | 0 |
-| stl.h:295:3:295:8 | vector | (size_type,const T &,const Allocator &) | vector<T,Allocator> | vector | 1 |
-| stl.h:295:3:295:8 | vector | (size_type,const T &,const Allocator &) | vector<T,Allocator> | vector | 1 |
-| stl.h:295:3:295:8 | vector | (size_type,const T &,const Allocator &) | vector<T,Allocator> | vector | 2 |
-| stl.h:295:3:295:8 | vector | (size_type,const T &,const Allocator &) | vector<T,Allocator> | vector | 2 |
-| stl.h:296:101:296:106 | vector | (InputIterator,InputIterator,const Allocator &) | deque<T,Allocator> | deque<InputIterator> | 0 |
-| stl.h:296:101:296:106 | vector | (InputIterator,InputIterator,const Allocator &) | deque<T,Allocator> | deque<InputIterator> | 1 |
-| stl.h:296:101:296:106 | vector | (InputIterator,InputIterator,const Allocator &) | deque<T,Allocator> | deque<InputIterator> | 2 |
-| stl.h:296:101:296:106 | vector | (InputIterator,InputIterator,const Allocator &) | forward_list<T,Allocator> | forward_list | 2 |
-| stl.h:296:101:296:106 | vector | (InputIterator,InputIterator,const Allocator &) | list<T,Allocator> | list<InputIterator> | 0 |
-| stl.h:296:101:296:106 | vector | (InputIterator,InputIterator,const Allocator &) | list<T,Allocator> | list<InputIterator> | 1 |
-| stl.h:296:101:296:106 | vector | (InputIterator,InputIterator,const Allocator &) | list<T,Allocator> | list<InputIterator> | 2 |
-| stl.h:296:101:296:106 | vector | (InputIterator,InputIterator,const Allocator &) | vector<T,Allocator> | vector<InputIterator> | 0 |
-| stl.h:296:101:296:106 | vector | (InputIterator,InputIterator,const Allocator &) | vector<T,Allocator> | vector<InputIterator> | 1 |
-| stl.h:296:101:296:106 | vector | (InputIterator,InputIterator,const Allocator &) | vector<T,Allocator> | vector<InputIterator> | 2 |
-| stl.h:296:101:296:106 | vector | (size_type,const T &,const Allocator &) | deque<T,Allocator> | deque | 2 |
-| stl.h:296:101:296:106 | vector | (size_type,const T &,const Allocator &) | forward_list<T,Allocator> | forward_list | 2 |
-| stl.h:296:101:296:106 | vector | (size_type,const T &,const Allocator &) | list<T,Allocator> | list | 2 |
-| stl.h:296:101:296:106 | vector | (size_type,const T &,const Allocator &) | vector<T,Allocator> | vector | 2 |
-| stl.h:301:11:301:19 | operator= | (const vector &) | vector | vector | 0 |
-| stl.h:302:11:302:19 | operator= | (vector &&) | vector | vector | 0 |
-| stl.h:303:106:303:111 | assign | (InputIt,InputIt) | deque | assign<InputIt> | 0 |
-| stl.h:303:106:303:111 | assign | (InputIt,InputIt) | deque | assign<InputIt> | 1 |
-| stl.h:303:106:303:111 | assign | (InputIt,InputIt) | forward_list | assign<InputIt> | 0 |
-| stl.h:303:106:303:111 | assign | (InputIt,InputIt) | forward_list | assign<InputIt> | 1 |
-| stl.h:303:106:303:111 | assign | (InputIt,InputIt) | list | assign<InputIt> | 0 |
-| stl.h:303:106:303:111 | assign | (InputIt,InputIt) | list | assign<InputIt> | 1 |
-| stl.h:303:106:303:111 | assign | (InputIt,InputIt) | vector | assign<InputIt> | 0 |
-| stl.h:303:106:303:111 | assign | (InputIt,InputIt) | vector | assign<InputIt> | 1 |
-| stl.h:306:8:306:13 | assign | (const_iterator,const T &) | deque<T> | insert | 1 |
-| stl.h:306:8:306:13 | assign | (const_iterator,const T &) | deque<T> | insert | 1 |
-| stl.h:306:8:306:13 | assign | (const_iterator,const T &) | deque<T> | insert | 1 |
-| stl.h:306:8:306:13 | assign | (const_iterator,const T &) | forward_list<T> | insert_after | 1 |
-| stl.h:306:8:306:13 | assign | (const_iterator,const T &) | forward_list<T> | insert_after | 1 |
-| stl.h:306:8:306:13 | assign | (const_iterator,const T &) | forward_list<T> | insert_after | 1 |
-| stl.h:306:8:306:13 | assign | (const_iterator,const T &) | list<T> | insert | 1 |
-| stl.h:306:8:306:13 | assign | (const_iterator,const T &) | list<T> | insert | 1 |
-| stl.h:306:8:306:13 | assign | (const_iterator,const T &) | list<T> | insert | 1 |
-| stl.h:306:8:306:13 | assign | (const_iterator,const T &) | vector<T> | insert | 1 |
-| stl.h:306:8:306:13 | assign | (const_iterator,const T &) | vector<T> | insert | 1 |
-| stl.h:306:8:306:13 | assign | (const_iterator,const T &) | vector<T> | insert | 1 |
-| stl.h:306:8:306:13 | assign | (size_type,const T &) | deque<T,Allocator> | assign | 0 |
-| stl.h:306:8:306:13 | assign | (size_type,const T &) | deque<T,Allocator> | assign | 0 |
-| stl.h:306:8:306:13 | assign | (size_type,const T &) | deque<T,Allocator> | assign | 0 |
-| stl.h:306:8:306:13 | assign | (size_type,const T &) | deque<T,Allocator> | assign | 1 |
-| stl.h:306:8:306:13 | assign | (size_type,const T &) | deque<T,Allocator> | assign | 1 |
-| stl.h:306:8:306:13 | assign | (size_type,const T &) | deque<T,Allocator> | assign | 1 |
-| stl.h:306:8:306:13 | assign | (size_type,const T &) | forward_list<T,Allocator> | assign | 0 |
-| stl.h:306:8:306:13 | assign | (size_type,const T &) | forward_list<T,Allocator> | assign | 0 |
-| stl.h:306:8:306:13 | assign | (size_type,const T &) | forward_list<T,Allocator> | assign | 0 |
-| stl.h:306:8:306:13 | assign | (size_type,const T &) | forward_list<T,Allocator> | assign | 1 |
-| stl.h:306:8:306:13 | assign | (size_type,const T &) | forward_list<T,Allocator> | assign | 1 |
-| stl.h:306:8:306:13 | assign | (size_type,const T &) | forward_list<T,Allocator> | assign | 1 |
-| stl.h:306:8:306:13 | assign | (size_type,const T &) | list<T,Allocator> | assign | 0 |
-| stl.h:306:8:306:13 | assign | (size_type,const T &) | list<T,Allocator> | assign | 0 |
-| stl.h:306:8:306:13 | assign | (size_type,const T &) | list<T,Allocator> | assign | 0 |
-| stl.h:306:8:306:13 | assign | (size_type,const T &) | list<T,Allocator> | assign | 1 |
-| stl.h:306:8:306:13 | assign | (size_type,const T &) | list<T,Allocator> | assign | 1 |
-| stl.h:306:8:306:13 | assign | (size_type,const T &) | list<T,Allocator> | assign | 1 |
-| stl.h:306:8:306:13 | assign | (size_type,const T &) | vector<T,Allocator> | assign | 0 |
-| stl.h:306:8:306:13 | assign | (size_type,const T &) | vector<T,Allocator> | assign | 0 |
-| stl.h:306:8:306:13 | assign | (size_type,const T &) | vector<T,Allocator> | assign | 0 |
-| stl.h:306:8:306:13 | assign | (size_type,const T &) | vector<T,Allocator> | assign | 1 |
-| stl.h:306:8:306:13 | assign | (size_type,const T &) | vector<T,Allocator> | assign | 1 |
-| stl.h:306:8:306:13 | assign | (size_type,const T &) | vector<T,Allocator> | assign | 1 |
-| stl.h:315:13:315:22 | operator[] | (unsigned int) |  | Jim_IntHashFunction | 0 |
-| stl.h:315:13:315:22 | operator[] | (unsigned int) |  | Jim_IntHashFunction | 0 |
-| stl.h:315:13:315:22 | operator[] | (unsigned int) |  | Jim_IntHashFunction | 0 |
-| stl.h:315:13:315:22 | operator[] | (unsigned int) |  | Jim_IntHashFunction | 0 |
-| stl.h:315:13:315:22 | operator[] | (unsigned int) |  | Jim_IntHashFunction | 0 |
-| stl.h:315:13:315:22 | operator[] | (unsigned int) |  | Jim_IntHashFunction | 0 |
-| stl.h:315:13:315:22 | operator[] | (unsigned int) |  | __sleep | 0 |
-| stl.h:315:13:315:22 | operator[] | (unsigned int) |  | __sleep | 0 |
-| stl.h:315:13:315:22 | operator[] | (unsigned int) |  | __sleep | 0 |
-| stl.h:315:13:315:22 | operator[] | (unsigned int) |  | __sleep | 0 |
-| stl.h:315:13:315:22 | operator[] | (unsigned int) |  | __sleep | 0 |
-| stl.h:315:13:315:22 | operator[] | (unsigned int) |  | __sleep | 0 |
-| stl.h:315:13:315:22 | operator[] | (unsigned int) |  | __x86_get_cpuid_feature_leaf | 0 |
-| stl.h:315:13:315:22 | operator[] | (unsigned int) |  | __x86_get_cpuid_feature_leaf | 0 |
-| stl.h:315:13:315:22 | operator[] | (unsigned int) |  | __x86_get_cpuid_feature_leaf | 0 |
-| stl.h:315:13:315:22 | operator[] | (unsigned int) |  | __x86_get_cpuid_feature_leaf | 0 |
-| stl.h:315:13:315:22 | operator[] | (unsigned int) |  | __x86_get_cpuid_feature_leaf | 0 |
-| stl.h:315:13:315:22 | operator[] | (unsigned int) |  | __x86_get_cpuid_feature_leaf | 0 |
-| stl.h:315:13:315:22 | operator[] | (unsigned int) |  | curlx_uitous | 0 |
-| stl.h:315:13:315:22 | operator[] | (unsigned int) |  | curlx_uitous | 0 |
-| stl.h:315:13:315:22 | operator[] | (unsigned int) |  | curlx_uitous | 0 |
-| stl.h:315:13:315:22 | operator[] | (unsigned int) |  | curlx_uitous | 0 |
-| stl.h:315:13:315:22 | operator[] | (unsigned int) |  | curlx_uitous | 0 |
-| stl.h:315:13:315:22 | operator[] | (unsigned int) |  | curlx_uitous | 0 |
-| stl.h:315:13:315:22 | operator[] | (unsigned int) |  | la_version | 0 |
-| stl.h:315:13:315:22 | operator[] | (unsigned int) |  | la_version | 0 |
-| stl.h:315:13:315:22 | operator[] | (unsigned int) |  | la_version | 0 |
-| stl.h:315:13:315:22 | operator[] | (unsigned int) |  | la_version | 0 |
-| stl.h:315:13:315:22 | operator[] | (unsigned int) |  | la_version | 0 |
-| stl.h:315:13:315:22 | operator[] | (unsigned int) |  | la_version | 0 |
-| stl.h:315:13:315:22 | operator[] | (unsigned int) |  | ssl3_get_cipher | 0 |
-| stl.h:315:13:315:22 | operator[] | (unsigned int) |  | ssl3_get_cipher | 0 |
-| stl.h:315:13:315:22 | operator[] | (unsigned int) |  | ssl3_get_cipher | 0 |
-| stl.h:315:13:315:22 | operator[] | (unsigned int) |  | ssl3_get_cipher | 0 |
-| stl.h:315:13:315:22 | operator[] | (unsigned int) |  | ssl3_get_cipher | 0 |
-| stl.h:315:13:315:22 | operator[] | (unsigned int) |  | ssl3_get_cipher | 0 |
-| stl.h:318:13:318:14 | at | (unsigned int) |  | Jim_IntHashFunction | 0 |
-| stl.h:318:13:318:14 | at | (unsigned int) |  | __sleep | 0 |
-| stl.h:318:13:318:14 | at | (unsigned int) |  | __x86_get_cpuid_feature_leaf | 0 |
-| stl.h:318:13:318:14 | at | (unsigned int) |  | curlx_uitous | 0 |
-| stl.h:318:13:318:14 | at | (unsigned int) |  | la_version | 0 |
-| stl.h:318:13:318:14 | at | (unsigned int) |  | ssl3_get_cipher | 0 |
-| stl.h:331:12:331:17 | insert | (const_iterator,T &&) | deque<T> | insert | 0 |
-| stl.h:331:12:331:17 | insert | (const_iterator,T &&) | deque<T> | insert | 1 |
-| stl.h:331:12:331:17 | insert | (const_iterator,T &&) | forward_list<T> | insert_after | 0 |
-| stl.h:331:12:331:17 | insert | (const_iterator,T &&) | forward_list<T> | insert_after | 1 |
-| stl.h:331:12:331:17 | insert | (const_iterator,T &&) | list<T> | insert | 0 |
-| stl.h:331:12:331:17 | insert | (const_iterator,T &&) | list<T> | insert | 1 |
-| stl.h:331:12:331:17 | insert | (const_iterator,T &&) | vector<T> | insert | 0 |
-| stl.h:331:12:331:17 | insert | (const_iterator,T &&) | vector<T> | insert | 1 |
-| stl.h:333:42:333:47 | insert | (const_iterator,InputIt,InputIt) | deque | insert<InputIt> | 0 |
-| stl.h:333:42:333:47 | insert | (const_iterator,InputIt,InputIt) | deque | insert<InputIt> | 0 |
-| stl.h:333:42:333:47 | insert | (const_iterator,InputIt,InputIt) | deque | insert<InputIt> | 1 |
-| stl.h:333:42:333:47 | insert | (const_iterator,InputIt,InputIt) | deque | insert<InputIt> | 1 |
-| stl.h:333:42:333:47 | insert | (const_iterator,InputIt,InputIt) | deque | insert<InputIt> | 2 |
-| stl.h:333:42:333:47 | insert | (const_iterator,InputIt,InputIt) | deque | insert<InputIt> | 2 |
-| stl.h:333:42:333:47 | insert | (const_iterator,InputIt,InputIt) | forward_list | insert_after<InputIt> | 0 |
-| stl.h:333:42:333:47 | insert | (const_iterator,InputIt,InputIt) | forward_list | insert_after<InputIt> | 0 |
-| stl.h:333:42:333:47 | insert | (const_iterator,InputIt,InputIt) | forward_list | insert_after<InputIt> | 1 |
-| stl.h:333:42:333:47 | insert | (const_iterator,InputIt,InputIt) | forward_list | insert_after<InputIt> | 1 |
-| stl.h:333:42:333:47 | insert | (const_iterator,InputIt,InputIt) | forward_list | insert_after<InputIt> | 2 |
-| stl.h:333:42:333:47 | insert | (const_iterator,InputIt,InputIt) | forward_list | insert_after<InputIt> | 2 |
-| stl.h:333:42:333:47 | insert | (const_iterator,InputIt,InputIt) | list | insert<InputIt> | 0 |
-| stl.h:333:42:333:47 | insert | (const_iterator,InputIt,InputIt) | list | insert<InputIt> | 0 |
-| stl.h:333:42:333:47 | insert | (const_iterator,InputIt,InputIt) | list | insert<InputIt> | 1 |
-| stl.h:333:42:333:47 | insert | (const_iterator,InputIt,InputIt) | list | insert<InputIt> | 1 |
-| stl.h:333:42:333:47 | insert | (const_iterator,InputIt,InputIt) | list | insert<InputIt> | 2 |
-| stl.h:333:42:333:47 | insert | (const_iterator,InputIt,InputIt) | list | insert<InputIt> | 2 |
-| stl.h:333:42:333:47 | insert | (const_iterator,InputIt,InputIt) | vector | insert<InputIt> | 0 |
-| stl.h:333:42:333:47 | insert | (const_iterator,InputIt,InputIt) | vector | insert<InputIt> | 0 |
-| stl.h:333:42:333:47 | insert | (const_iterator,InputIt,InputIt) | vector | insert<InputIt> | 1 |
-| stl.h:333:42:333:47 | insert | (const_iterator,InputIt,InputIt) | vector | insert<InputIt> | 1 |
-| stl.h:333:42:333:47 | insert | (const_iterator,InputIt,InputIt) | vector | insert<InputIt> | 2 |
-| stl.h:333:42:333:47 | insert | (const_iterator,InputIt,InputIt) | vector | insert<InputIt> | 2 |
-| stl.h:335:37:335:43 | emplace | (format_string,Args &&) |  | format<Args> | 1 |
-| stl.h:396:3:396:3 | pair | (const deque &,const Allocator &) | deque<T,Allocator> | deque | 1 |
-| stl.h:396:3:396:3 | pair | (const deque &,const Allocator &) | deque<T,Allocator> | deque | 1 |
-| stl.h:396:3:396:3 | pair | (const deque &,const Allocator &) | deque<T,Allocator> | deque | 1 |
-| stl.h:396:3:396:3 | pair | (const deque &,const Allocator &) | deque<T,Allocator> | deque | 1 |
-| stl.h:396:3:396:3 | pair | (const deque &,const Allocator &) | deque<T,Allocator> | deque | 1 |
-| stl.h:396:3:396:3 | pair | (const forward_list &,const Allocator &) | forward_list<T,Allocator> | forward_list | 1 |
-| stl.h:396:3:396:3 | pair | (const forward_list &,const Allocator &) | forward_list<T,Allocator> | forward_list | 1 |
-| stl.h:396:3:396:3 | pair | (const forward_list &,const Allocator &) | forward_list<T,Allocator> | forward_list | 1 |
-| stl.h:396:3:396:3 | pair | (const forward_list &,const Allocator &) | forward_list<T,Allocator> | forward_list | 1 |
-| stl.h:396:3:396:3 | pair | (const forward_list &,const Allocator &) | forward_list<T,Allocator> | forward_list | 1 |
-| stl.h:396:3:396:3 | pair | (const list &,const Allocator &) | list<T,Allocator> | list | 1 |
-| stl.h:396:3:396:3 | pair | (const list &,const Allocator &) | list<T,Allocator> | list | 1 |
-| stl.h:396:3:396:3 | pair | (const list &,const Allocator &) | list<T,Allocator> | list | 1 |
-| stl.h:396:3:396:3 | pair | (const list &,const Allocator &) | list<T,Allocator> | list | 1 |
-| stl.h:396:3:396:3 | pair | (const list &,const Allocator &) | list<T,Allocator> | list | 1 |
-| stl.h:396:3:396:3 | pair | (const vector &,const Allocator &) | vector<T,Allocator> | vector | 1 |
-| stl.h:396:3:396:3 | pair | (const vector &,const Allocator &) | vector<T,Allocator> | vector | 1 |
-| stl.h:396:3:396:3 | pair | (const vector &,const Allocator &) | vector<T,Allocator> | vector | 1 |
-| stl.h:396:3:396:3 | pair | (const vector &,const Allocator &) | vector<T,Allocator> | vector | 1 |
-| stl.h:396:3:396:3 | pair | (const vector &,const Allocator &) | vector<T,Allocator> | vector | 1 |
-| stl.h:396:3:396:3 | pair | (deque &&,const Allocator &) | deque<T,Allocator> | deque | 1 |
-| stl.h:396:3:396:3 | pair | (deque &&,const Allocator &) | deque<T,Allocator> | deque | 1 |
-| stl.h:396:3:396:3 | pair | (deque &&,const Allocator &) | deque<T,Allocator> | deque | 1 |
-| stl.h:396:3:396:3 | pair | (deque &&,const Allocator &) | deque<T,Allocator> | deque | 1 |
-| stl.h:396:3:396:3 | pair | (deque &&,const Allocator &) | deque<T,Allocator> | deque | 1 |
-| stl.h:396:3:396:3 | pair | (forward_list &&,const Allocator &) | forward_list<T,Allocator> | forward_list | 1 |
-| stl.h:396:3:396:3 | pair | (forward_list &&,const Allocator &) | forward_list<T,Allocator> | forward_list | 1 |
-| stl.h:396:3:396:3 | pair | (forward_list &&,const Allocator &) | forward_list<T,Allocator> | forward_list | 1 |
-| stl.h:396:3:396:3 | pair | (forward_list &&,const Allocator &) | forward_list<T,Allocator> | forward_list | 1 |
-| stl.h:396:3:396:3 | pair | (forward_list &&,const Allocator &) | forward_list<T,Allocator> | forward_list | 1 |
-| stl.h:396:3:396:3 | pair | (list &&,const Allocator &) | list<T,Allocator> | list | 1 |
-| stl.h:396:3:396:3 | pair | (list &&,const Allocator &) | list<T,Allocator> | list | 1 |
-| stl.h:396:3:396:3 | pair | (list &&,const Allocator &) | list<T,Allocator> | list | 1 |
-| stl.h:396:3:396:3 | pair | (list &&,const Allocator &) | list<T,Allocator> | list | 1 |
-| stl.h:396:3:396:3 | pair | (list &&,const Allocator &) | list<T,Allocator> | list | 1 |
-| stl.h:396:3:396:3 | pair | (vector &&,const Allocator &) | vector<T,Allocator> | vector | 1 |
-| stl.h:396:3:396:3 | pair | (vector &&,const Allocator &) | vector<T,Allocator> | vector | 1 |
-| stl.h:396:3:396:3 | pair | (vector &&,const Allocator &) | vector<T,Allocator> | vector | 1 |
-| stl.h:396:3:396:3 | pair | (vector &&,const Allocator &) | vector<T,Allocator> | vector | 1 |
-| stl.h:396:3:396:3 | pair | (vector &&,const Allocator &) | vector<T,Allocator> | vector | 1 |
-| stl.h:440:36:440:47 | emplace_hint | (format_string,Args &&) |  | format<Args> | 1 |
-| stl.h:440:36:440:47 | emplace_hint | (format_string,Args &&) |  | format<Args> | 1 |
-| stl.h:448:48:448:58 | try_emplace | (format_string,Args &&) |  | format<Args> | 1 |
-| stl.h:448:48:448:58 | try_emplace | (format_string,Args &&) |  | format<Args> | 1 |
-| stl.h:452:42:452:57 | insert_or_assign | (format_string,Args &&) |  | format<Args> | 1 |
-| stl.h:508:36:508:47 | emplace_hint | (format_string,Args &&) |  | format<Args> | 1 |
-| stl.h:508:36:508:47 | emplace_hint | (format_string,Args &&) |  | format<Args> | 1 |
-| stl.h:516:48:516:58 | try_emplace | (format_string,Args &&) |  | format<Args> | 1 |
-| stl.h:516:48:516:58 | try_emplace | (format_string,Args &&) |  | format<Args> | 1 |
-| stl.h:516:48:516:58 | try_emplace | (format_string,Args &&) |  | format<Args> | 1 |
-| stl.h:516:48:516:58 | try_emplace | (format_string,Args &&) |  | format<Args> | 1 |
-| stl.h:516:48:516:58 | try_emplace | (format_string,Args &&) |  | format<Args> | 1 |
-| stl.h:520:42:520:57 | insert_or_assign | (format_string,Args &&) |  | format<Args> | 1 |
-| stl.h:557:33:557:35 | set | (InputIt,InputIt) | deque | assign<InputIt> | 0 |
-| stl.h:557:33:557:35 | set | (InputIt,InputIt) | deque | assign<InputIt> | 1 |
-| stl.h:557:33:557:35 | set | (InputIt,InputIt) | forward_list | assign<InputIt> | 0 |
-| stl.h:557:33:557:35 | set | (InputIt,InputIt) | forward_list | assign<InputIt> | 1 |
-| stl.h:557:33:557:35 | set | (InputIt,InputIt) | list | assign<InputIt> | 0 |
-| stl.h:557:33:557:35 | set | (InputIt,InputIt) | list | assign<InputIt> | 1 |
-| stl.h:557:33:557:35 | set | (InputIt,InputIt) | vector | assign<InputIt> | 0 |
-| stl.h:557:33:557:35 | set | (InputIt,InputIt) | vector | assign<InputIt> | 1 |
-| stl.h:569:36:569:47 | emplace_hint | (format_string,Args &&) |  | format<Args> | 1 |
-| stl.h:569:36:569:47 | emplace_hint | (format_string,Args &&) |  | format<Args> | 1 |
-| stl.h:573:12:573:17 | insert | (const_iterator,T &&) | deque<T> | insert | 0 |
-| stl.h:573:12:573:17 | insert | (const_iterator,T &&) | deque<T> | insert | 1 |
-| stl.h:573:12:573:17 | insert | (const_iterator,T &&) | forward_list<T> | insert_after | 0 |
-| stl.h:573:12:573:17 | insert | (const_iterator,T &&) | forward_list<T> | insert_after | 1 |
-| stl.h:573:12:573:17 | insert | (const_iterator,T &&) | list<T> | insert | 0 |
-| stl.h:573:12:573:17 | insert | (const_iterator,T &&) | list<T> | insert | 1 |
-| stl.h:573:12:573:17 | insert | (const_iterator,T &&) | vector<T> | insert | 0 |
-| stl.h:573:12:573:17 | insert | (const_iterator,T &&) | vector<T> | insert | 1 |
-| stl.h:574:38:574:43 | insert | (InputIt,InputIt) | deque | assign<InputIt> | 0 |
-| stl.h:574:38:574:43 | insert | (InputIt,InputIt) | deque | assign<InputIt> | 1 |
-| stl.h:574:38:574:43 | insert | (InputIt,InputIt) | forward_list | assign<InputIt> | 0 |
-| stl.h:574:38:574:43 | insert | (InputIt,InputIt) | forward_list | assign<InputIt> | 1 |
-| stl.h:574:38:574:43 | insert | (InputIt,InputIt) | list | assign<InputIt> | 0 |
-| stl.h:574:38:574:43 | insert | (InputIt,InputIt) | list | assign<InputIt> | 1 |
-| stl.h:574:38:574:43 | insert | (InputIt,InputIt) | vector | assign<InputIt> | 0 |
-| stl.h:574:38:574:43 | insert | (InputIt,InputIt) | vector | assign<InputIt> | 1 |
-| stl.h:611:33:611:45 | unordered_set | (BIO *,OCSP_REQUEST *,unsigned long) |  | OCSP_REQUEST_print | 2 |
-| stl.h:611:33:611:45 | unordered_set | (BIO *,OCSP_RESPONSE *,unsigned long) |  | OCSP_RESPONSE_print | 2 |
-| stl.h:611:33:611:45 | unordered_set | (BIO *,X509 *,unsigned long) |  | ossl_x509_print_ex_brief | 2 |
-| stl.h:611:33:611:45 | unordered_set | (BIO *,X509_CRL *,unsigned long) |  | X509_CRL_print_ex | 2 |
-| stl.h:611:33:611:45 | unordered_set | (BIO *,const ASN1_STRING *,unsigned long) |  | ASN1_STRING_print_ex | 2 |
-| stl.h:611:33:611:45 | unordered_set | (FILE *,const ASN1_STRING *,unsigned long) |  | ASN1_STRING_print_ex_fp | 2 |
-| stl.h:611:33:611:45 | unordered_set | (const char *,const char *,unsigned long) |  | __ngettext | 2 |
-| stl.h:611:33:611:45 | unordered_set | (unsigned char *,int,unsigned long) |  | UTF8_putc | 2 |
-| stl.h:623:36:623:47 | emplace_hint | (format_string,Args &&) |  | format<Args> | 1 |
-| stl.h:623:36:623:47 | emplace_hint | (format_string,Args &&) |  | format<Args> | 1 |
-| stl.h:627:12:627:17 | insert | (const_iterator,T &&) | deque<T> | insert | 0 |
-| stl.h:627:12:627:17 | insert | (const_iterator,T &&) | deque<T> | insert | 1 |
-| stl.h:627:12:627:17 | insert | (const_iterator,T &&) | forward_list<T> | insert_after | 0 |
-| stl.h:627:12:627:17 | insert | (const_iterator,T &&) | forward_list<T> | insert_after | 1 |
-| stl.h:627:12:627:17 | insert | (const_iterator,T &&) | list<T> | insert | 0 |
-| stl.h:627:12:627:17 | insert | (const_iterator,T &&) | list<T> | insert | 1 |
-| stl.h:627:12:627:17 | insert | (const_iterator,T &&) | vector<T> | insert | 0 |
-| stl.h:627:12:627:17 | insert | (const_iterator,T &&) | vector<T> | insert | 1 |
-| stl.h:628:38:628:43 | insert | (InputIt,InputIt) | deque | assign<InputIt> | 0 |
-| stl.h:628:38:628:43 | insert | (InputIt,InputIt) | deque | assign<InputIt> | 1 |
-| stl.h:628:38:628:43 | insert | (InputIt,InputIt) | forward_list | assign<InputIt> | 0 |
-| stl.h:628:38:628:43 | insert | (InputIt,InputIt) | forward_list | assign<InputIt> | 1 |
-| stl.h:628:38:628:43 | insert | (InputIt,InputIt) | list | assign<InputIt> | 0 |
-| stl.h:628:38:628:43 | insert | (InputIt,InputIt) | list | assign<InputIt> | 1 |
-| stl.h:628:38:628:43 | insert | (InputIt,InputIt) | vector | assign<InputIt> | 0 |
-| stl.h:628:38:628:43 | insert | (InputIt,InputIt) | vector | assign<InputIt> | 1 |
-| stl.h:678:33:678:38 | format | (format_string,Args &&) |  | format<Args> | 0 |
-| stl.h:678:33:678:38 | format | (format_string,Args &&) |  | format<Args> | 0 |
-| stl.h:678:33:678:38 | format | (format_string,Args &&) |  | format<Args> | 1 |
-| stl.h:678:33:678:38 | format | (format_string,Args &&) |  | format<Args> | 1 |
-| stl.h:683:6:683:48 | same_signature_as_format_but_different_name | (format_string,Args &&) |  | format<Args> | 0 |
-| stl.h:683:6:683:48 | same_signature_as_format_but_different_name | (format_string,Args &&) |  | format<Args> | 1 |
-| string.cpp:17:6:17:9 | sink | (const char *) |  | BIO_gethostbyname | 0 |
-| string.cpp:17:6:17:9 | sink | (const char *) |  | Curl_copy_header_value | 0 |
-| string.cpp:17:6:17:9 | sink | (const char *) |  | Curl_get_scheme_handler | 0 |
-| string.cpp:17:6:17:9 | sink | (const char *) |  | Curl_getdate_capped | 0 |
-| string.cpp:17:6:17:9 | sink | (const char *) |  | Jim_StrDup | 0 |
-| string.cpp:17:6:17:9 | sink | (const char *) |  | OPENSSL_LH_strhash | 0 |
-| string.cpp:17:6:17:9 | sink | (const char *) |  | OSSL_STORE_SEARCH_by_alias | 0 |
-| string.cpp:17:6:17:9 | sink | (const char *) |  | Strsafe | 0 |
-| string.cpp:17:6:17:9 | sink | (const char *) |  | Symbol_new | 0 |
-| string.cpp:17:6:17:9 | sink | (const char *) |  | UI_create_method | 0 |
-| string.cpp:17:6:17:9 | sink | (const char *) |  | X509V3_parse_list | 0 |
-| string.cpp:17:6:17:9 | sink | (const char *) |  | X509_LOOKUP_meth_new | 0 |
-| string.cpp:17:6:17:9 | sink | (const char *) |  | __basename | 0 |
-| string.cpp:17:6:17:9 | sink | (const char *) |  | __gconv_find_shlib | 0 |
-| string.cpp:17:6:17:9 | sink | (const char *) |  | __gettext | 0 |
-| string.cpp:17:6:17:9 | sink | (const char *) |  | __hash_string | 0 |
-| string.cpp:17:6:17:9 | sink | (const char *) |  | __nss_action_parse | 0 |
-| string.cpp:17:6:17:9 | sink | (const char *) |  | __strdup | 0 |
-| string.cpp:17:6:17:9 | sink | (const char *) |  | __textdomain | 0 |
-| string.cpp:17:6:17:9 | sink | (const char *) |  | __tzset_parse_tz | 0 |
-| string.cpp:17:6:17:9 | sink | (const char *) |  | __tzstring | 0 |
-| string.cpp:17:6:17:9 | sink | (const char *) |  | a2i_IPADDRESS | 0 |
-| string.cpp:17:6:17:9 | sink | (const char *) |  | a2i_IPADDRESS_NC | 0 |
-| string.cpp:17:6:17:9 | sink | (const char *) |  | a64l | 0 |
-| string.cpp:17:6:17:9 | sink | (const char *) |  | charmap_opendir | 0 |
-| string.cpp:17:6:17:9 | sink | (const char *) |  | ether_aton | 0 |
-| string.cpp:17:6:17:9 | sink | (const char *) |  | getdate | 0 |
-| string.cpp:17:6:17:9 | sink | (const char *) |  | inetstr2int | 0 |
-| string.cpp:17:6:17:9 | sink | (const char *) |  | last_component | 0 |
-| string.cpp:17:6:17:9 | sink | (const char *) |  | new_glibc_hwcaps_subdirectory | 0 |
-| string.cpp:17:6:17:9 | sink | (const char *) |  | opt_path_end | 0 |
-| string.cpp:17:6:17:9 | sink | (const char *) |  | opt_progname | 0 |
-| string.cpp:17:6:17:9 | sink | (const char *) |  | ossl_lh_strcasehash | 0 |
-| string.cpp:17:6:17:9 | sink | (const char *) |  | repertoire_read | 0 |
-| string.cpp:17:6:17:9 | sink | (const char *) |  | res_gethostbyname | 0 |
-| string.cpp:17:6:17:9 | sink | (const char *) |  | sgetsgent | 0 |
-| string.cpp:17:6:17:9 | sink | (const char *) |  | sgetspent | 0 |
-| string.cpp:17:6:17:9 | sink | (const char *) |  | strhash | 0 |
-| string.cpp:17:6:17:9 | sink | (const char *) |  | uc_script_byname | 0 |
-| string.cpp:17:6:17:9 | sink | (const char *) |  | uv__strdup | 0 |
-| string.cpp:17:6:17:9 | sink | (const char *) |  | uv_wtf8_length_as_utf16 | 0 |
-| string.cpp:17:6:17:9 | sink | (const char *) |  | xstrdup | 0 |
-| string.cpp:19:6:19:9 | sink | (ASN1_GENERALIZEDTIME *,const char *) |  | ASN1_GENERALIZEDTIME_set_string | 1 |
-| string.cpp:19:6:19:9 | sink | (ASN1_TIME *,const char *) |  | ASN1_TIME_set_string | 1 |
-| string.cpp:19:6:19:9 | sink | (ASN1_TIME *,const char *) |  | ASN1_TIME_set_string_X509 | 1 |
-| string.cpp:19:6:19:9 | sink | (ASN1_UTCTIME *,const char *) |  | ASN1_UTCTIME_set_string | 1 |
-| string.cpp:19:6:19:9 | sink | (BIGNUM **,const char *) |  | BN_asc2bn | 1 |
-| string.cpp:19:6:19:9 | sink | (BIGNUM **,const char *) |  | BN_dec2bn | 1 |
-| string.cpp:19:6:19:9 | sink | (BIGNUM **,const char *) |  | BN_hex2bn | 1 |
-| string.cpp:19:6:19:9 | sink | (CONF *,const char *) |  | TS_CONF_get_tsa_section | 1 |
-| string.cpp:19:6:19:9 | sink | (CONF *,const char *) |  | _CONF_new_section | 1 |
-| string.cpp:19:6:19:9 | sink | (CURLU *,const char *) |  | Curl_url_set_authority | 1 |
-| string.cpp:19:6:19:9 | sink | (Curl_easy *,const char *) |  | Curl_cwriter_get_by_name | 1 |
-| string.cpp:19:6:19:9 | sink | (Curl_easy *,const char *) |  | Curl_rtsp_parseheader | 1 |
-| string.cpp:19:6:19:9 | sink | (DH_METHOD *,const char *) |  | DH_meth_set1_name | 1 |
-| string.cpp:19:6:19:9 | sink | (DSA_METHOD *,const char *) |  | DSA_meth_set1_name | 1 |
-| string.cpp:19:6:19:9 | sink | (DSO *,const char *) |  | DSO_convert_filename | 1 |
-| string.cpp:19:6:19:9 | sink | (DSO *,const char *) |  | DSO_set_filename | 1 |
-| string.cpp:19:6:19:9 | sink | (ENGINE *,const char *) |  | ENGINE_set_id | 1 |
-| string.cpp:19:6:19:9 | sink | (ENGINE *,const char *) |  | ENGINE_set_name | 1 |
-| string.cpp:19:6:19:9 | sink | (ENGINE *,const char *) |  | OSSL_STORE_LOADER_new | 1 |
-| string.cpp:19:6:19:9 | sink | (EVP_PKEY *,const char *) |  | CTLOG_new | 1 |
-| string.cpp:19:6:19:9 | sink | (EVP_PKEY_CTX *,const char *) |  | app_paramgen | 1 |
-| string.cpp:19:6:19:9 | sink | (EVP_PKEY_CTX *,const char *) |  | pkey_ctrl_string | 1 |
-| string.cpp:19:6:19:9 | sink | (GlobalConfig *,const char *) |  | setvariable | 1 |
-| string.cpp:19:6:19:9 | sink | (Jim_Interp *,const char *) |  | Jim_Eval | 1 |
-| string.cpp:19:6:19:9 | sink | (Jim_Interp *,const char *) |  | Jim_EvalFile | 1 |
-| string.cpp:19:6:19:9 | sink | (Jim_Interp *,const char *) |  | Jim_EvalFileGlobal | 1 |
-| string.cpp:19:6:19:9 | sink | (Jim_Interp *,const char *) |  | Jim_EvalGlobal | 1 |
-| string.cpp:19:6:19:9 | sink | (LIBSSH2_AGENT *,const char *) |  | libssh2_agent_set_identity_path | 1 |
-| string.cpp:19:6:19:9 | sink | (LIBSSH2_SESSION *,const char *) |  | libssh2_banner_set | 1 |
-| string.cpp:19:6:19:9 | sink | (LIBSSH2_SESSION *,const char *) |  | libssh2_session_banner_set | 1 |
-| string.cpp:19:6:19:9 | sink | (Lmid_t,const char *) |  | _dl_lookup_map | 1 |
-| string.cpp:19:6:19:9 | sink | (OPENSSL_DIR_CTX **,const char *) |  | OPENSSL_DIR_read | 1 |
-| string.cpp:19:6:19:9 | sink | (OPENSSL_INIT_SETTINGS *,const char *) |  | OPENSSL_INIT_set_config_appname | 1 |
-| string.cpp:19:6:19:9 | sink | (OPENSSL_INIT_SETTINGS *,const char *) |  | OPENSSL_INIT_set_config_filename | 1 |
-| string.cpp:19:6:19:9 | sink | (OSSL_CMP_CTX *,const char *) |  | OSSL_CMP_CTX_set1_no_proxy | 1 |
-| string.cpp:19:6:19:9 | sink | (OSSL_CMP_CTX *,const char *) |  | OSSL_CMP_CTX_set1_proxy | 1 |
-| string.cpp:19:6:19:9 | sink | (OSSL_CMP_CTX *,const char *) |  | OSSL_CMP_CTX_set1_server | 1 |
-| string.cpp:19:6:19:9 | sink | (OSSL_CMP_CTX *,const char *) |  | OSSL_CMP_CTX_set1_serverPath | 1 |
-| string.cpp:19:6:19:9 | sink | (OSSL_DECODER_CTX *,const char *) |  | OSSL_DECODER_CTX_set_input_structure | 1 |
-| string.cpp:19:6:19:9 | sink | (OSSL_DECODER_CTX *,const char *) |  | OSSL_DECODER_CTX_set_input_type | 1 |
-| string.cpp:19:6:19:9 | sink | (OSSL_ENCODER_CTX *,const char *) |  | OSSL_ENCODER_CTX_set_output_structure | 1 |
-| string.cpp:19:6:19:9 | sink | (OSSL_ENCODER_CTX *,const char *) |  | OSSL_ENCODER_CTX_set_output_type | 1 |
-| string.cpp:19:6:19:9 | sink | (OSSL_JSON_ENC *,const char *) |  | ossl_json_key | 1 |
-| string.cpp:19:6:19:9 | sink | (OSSL_JSON_ENC *,const char *) |  | ossl_json_str | 1 |
-| string.cpp:19:6:19:9 | sink | (OSSL_LIB_CTX *,const char *) |  | CMS_ContentInfo_new_ex | 1 |
-| string.cpp:19:6:19:9 | sink | (OSSL_LIB_CTX *,const char *) |  | CTLOG_STORE_new_ex | 1 |
-| string.cpp:19:6:19:9 | sink | (OSSL_LIB_CTX *,const char *) |  | CT_POLICY_EVAL_CTX_new_ex | 1 |
-| string.cpp:19:6:19:9 | sink | (OSSL_LIB_CTX *,const char *) |  | EC_KEY_new_ex | 1 |
-| string.cpp:19:6:19:9 | sink | (OSSL_LIB_CTX *,const char *) |  | OSSL_CMP_CTX_new | 1 |
-| string.cpp:19:6:19:9 | sink | (OSSL_LIB_CTX *,const char *) |  | OSSL_CMP_MSG_new | 1 |
-| string.cpp:19:6:19:9 | sink | (OSSL_LIB_CTX *,const char *) |  | OSSL_CMP_SRV_CTX_new | 1 |
-| string.cpp:19:6:19:9 | sink | (OSSL_LIB_CTX *,const char *) |  | OSSL_PROVIDER_load | 1 |
-| string.cpp:19:6:19:9 | sink | (OSSL_LIB_CTX *,const char *) |  | PKCS7_new_ex | 1 |
-| string.cpp:19:6:19:9 | sink | (OSSL_LIB_CTX *,const char *) |  | SCT_CTX_new | 1 |
-| string.cpp:19:6:19:9 | sink | (OSSL_LIB_CTX *,const char *) |  | TS_RESP_CTX_new_ex | 1 |
-| string.cpp:19:6:19:9 | sink | (OSSL_LIB_CTX *,const char *) |  | X509_CRL_new_ex | 1 |
-| string.cpp:19:6:19:9 | sink | (OSSL_LIB_CTX *,const char *) |  | X509_PUBKEY_new_ex | 1 |
-| string.cpp:19:6:19:9 | sink | (OSSL_LIB_CTX *,const char *) |  | X509_REQ_new_ex | 1 |
-| string.cpp:19:6:19:9 | sink | (OSSL_LIB_CTX *,const char *) |  | X509_STORE_CTX_new_ex | 1 |
-| string.cpp:19:6:19:9 | sink | (OSSL_LIB_CTX *,const char *) |  | X509_new_ex | 1 |
-| string.cpp:19:6:19:9 | sink | (OSSL_LIB_CTX *,const char *) |  | ossl_cmp_mock_srv_new | 1 |
-| string.cpp:19:6:19:9 | sink | (OSSL_LIB_CTX *,const char *) |  | ossl_cms_Data_create | 1 |
-| string.cpp:19:6:19:9 | sink | (OSSL_LIB_CTX *,const char *) |  | ossl_parse_property | 1 |
-| string.cpp:19:6:19:9 | sink | (OSSL_PARAM *,const char *) |  | OSSL_PARAM_locate | 1 |
-| string.cpp:19:6:19:9 | sink | (OSSL_PARAM *,const char *) |  | OSSL_PARAM_set_utf8_ptr | 1 |
-| string.cpp:19:6:19:9 | sink | (OSSL_PARAM *,const char *) |  | OSSL_PARAM_set_utf8_string | 1 |
-| string.cpp:19:6:19:9 | sink | (OSSL_PROVIDER *,const char *) |  | ossl_provider_set_module_path | 1 |
-| string.cpp:19:6:19:9 | sink | (PKCS7 *,const char *) |  | ossl_pkcs7_set1_propq | 1 |
-| string.cpp:19:6:19:9 | sink | (RSA_METHOD *,const char *) |  | RSA_meth_set1_name | 1 |
-| string.cpp:19:6:19:9 | sink | (SSL *,const char *) |  | SSL_add1_host | 1 |
-| string.cpp:19:6:19:9 | sink | (SSL *,const char *) |  | SSL_set1_host | 1 |
-| string.cpp:19:6:19:9 | sink | (SSL *,const char *) |  | SSL_set_cipher_list | 1 |
-| string.cpp:19:6:19:9 | sink | (SSL *,const char *) |  | SSL_use_psk_identity_hint | 1 |
-| string.cpp:19:6:19:9 | sink | (SSL_CONF_CTX *,const char *) |  | SSL_CONF_CTX_set1_prefix | 1 |
-| string.cpp:19:6:19:9 | sink | (SSL_CONF_CTX *,const char *) |  | SSL_CONF_cmd_value_type | 1 |
-| string.cpp:19:6:19:9 | sink | (SSL_CTX *,const char *) |  | SSL_CTX_set_cipher_list | 1 |
-| string.cpp:19:6:19:9 | sink | (SSL_CTX *,const char *) |  | SSL_CTX_use_psk_identity_hint | 1 |
-| string.cpp:19:6:19:9 | sink | (SSL_CTX *,const char *) |  | ossl_quic_set_diag_title | 1 |
-| string.cpp:19:6:19:9 | sink | (SSL_SESSION *,const char *) |  | SSL_SESSION_set1_hostname | 1 |
-| string.cpp:19:6:19:9 | sink | (UI *,const char *) |  | UI_add_error_string | 1 |
-| string.cpp:19:6:19:9 | sink | (UI *,const char *) |  | UI_add_info_string | 1 |
-| string.cpp:19:6:19:9 | sink | (UI *,const char *) |  | UI_dup_error_string | 1 |
-| string.cpp:19:6:19:9 | sink | (UI *,const char *) |  | UI_dup_info_string | 1 |
-| string.cpp:19:6:19:9 | sink | (X509 *,const char *) |  | x509_ctrl_string | 1 |
-| string.cpp:19:6:19:9 | sink | (X509_REQ *,const char *) |  | x509_req_ctrl_string | 1 |
-| string.cpp:19:6:19:9 | sink | (X509_VERIFY_PARAM *,const char *) |  | X509_VERIFY_PARAM_set1_ip_asc | 1 |
-| string.cpp:19:6:19:9 | sink | (X509_VERIFY_PARAM *,const char *) |  | X509_VERIFY_PARAM_set1_name | 1 |
-| string.cpp:19:6:19:9 | sink | (__printf_buffer *,const char *) |  | __printf_buffer_puts_1 | 1 |
-| string.cpp:19:6:19:9 | sink | (alloc_buffer,const char *) |  | __libc_alloc_buffer_copy_string | 1 |
-| string.cpp:19:6:19:9 | sink | (argp_fmtstream_t,const char *) |  | __argp_fmtstream_puts | 1 |
-| string.cpp:19:6:19:9 | sink | (char **,const char *) |  | Curl_setstropt | 1 |
-| string.cpp:19:6:19:9 | sink | (char **,const char *) |  | __strsep | 1 |
-| string.cpp:19:6:19:9 | sink | (char *,const char *) |  | xstrdup | 1 |
-| string.cpp:19:6:19:9 | sink | (const OSSL_PARAM *,const char *) |  | OSSL_PARAM_locate_const | 1 |
-| string.cpp:19:6:19:9 | sink | (const char **,const char *) |  | uv__utf8_decode1 | 1 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | Configcmp | 0 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | Configcmp | 1 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | Curl_timestrcmp | 0 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | Curl_timestrcmp | 1 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | DES_crypt | 0 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | DES_crypt | 1 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | OPENSSL_strcasecmp | 0 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | OPENSSL_strcasecmp | 1 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | __bind_textdomain_codeset | 0 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | __bind_textdomain_codeset | 1 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | __bindtextdomain | 0 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | __bindtextdomain | 1 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | __dgettext | 0 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | __dgettext | 1 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | __gconv_compare_alias | 0 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | __gconv_compare_alias | 1 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | __strcasestr | 0 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | __strcasestr | 1 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | __strcspn_generic | 0 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | __strcspn_generic | 1 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | __strcspn_sse42 | 0 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | __strcspn_sse42 | 1 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | __strpbrk_generic | 0 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | __strpbrk_generic | 1 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | __strpbrk_sse42 | 0 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | __strpbrk_sse42 | 1 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | __strspn_generic | 0 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | __strspn_generic | 1 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | __strspn_sse42 | 0 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | __strspn_sse42 | 1 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | __strstr_generic | 0 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | __strstr_generic | 1 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | __strverscmp | 0 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | __strverscmp | 1 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | _dl_cache_libcmp | 0 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | _dl_cache_libcmp | 1 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | advance | 0 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | advance | 1 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | c_strcasecmp | 0 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | c_strcasecmp | 1 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | charmap_aliases | 0 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | charmap_aliases | 1 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | charmap_open | 0 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | charmap_open | 1 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | chroot_canon | 0 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | chroot_canon | 1 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | get_passwd | 0 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | get_passwd | 1 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | gzopen | 0 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | gzopen | 1 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | gzopen64 | 0 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | gzopen64 | 1 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | iconv_open | 0 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | iconv_open | 1 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | openssl_fopen | 0 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | openssl_fopen | 1 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | ossl_pem_check_suffix | 0 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | ossl_pem_check_suffix | 1 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | ossl_v3_name_cmp | 0 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | ossl_v3_name_cmp | 1 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | sqlite3_strglob | 0 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | sqlite3_strglob | 1 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | sqlite3_stricmp | 0 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | sqlite3_stricmp | 1 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | step | 0 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | step | 1 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | tempnam | 0 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | tempnam | 1 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | xfopen | 0 |
-| string.cpp:19:6:19:9 | sink | (const char *,const char *) |  | xfopen | 1 |
-| string.cpp:19:6:19:9 | sink | (const mntent *,const char *) |  | __hasmntopt | 1 |
-| string.cpp:19:6:19:9 | sink | (const nis_error,const char *) |  | nis_sperror | 1 |
-| string.cpp:19:6:19:9 | sink | (curl_mimepart *,const char *) |  | curl_mime_filedata | 1 |
-| string.cpp:19:6:19:9 | sink | (curl_off_t *,const char *) |  | str2offset | 1 |
-| string.cpp:19:6:19:9 | sink | (curl_pushheaders *,const char *) |  | curl_pushheader_byname | 1 |
-| string.cpp:19:6:19:9 | sink | (curl_slist **,const char *) |  | add2list | 1 |
-| string.cpp:19:6:19:9 | sink | (curl_slist *,const char *) |  | curl_slist_append | 1 |
-| string.cpp:19:6:19:9 | sink | (dynbuf *,const char *) |  | Curl_dyn_add | 1 |
-| string.cpp:19:6:19:9 | sink | (dynbuf *,const char *) |  | curlx_dyn_add | 1 |
-| string.cpp:19:6:19:9 | sink | (dynhds *,const char *) |  | Curl_dynhds_cget | 1 |
-| string.cpp:19:6:19:9 | sink | (dynhds *,const char *) |  | Curl_dynhds_h1_cadd_line | 1 |
-| string.cpp:19:6:19:9 | sink | (gconv_fcts *,const char *) |  | __wcsmbs_named_conv | 1 |
-| string.cpp:19:6:19:9 | sink | (gzFile,const char *) |  | gzputs | 1 |
-| string.cpp:19:6:19:9 | sink | (int,const char *) |  | BIO_meth_new | 1 |
-| string.cpp:19:6:19:9 | sink | (int,const char *) |  | _IO_new_fdopen | 1 |
-| string.cpp:19:6:19:9 | sink | (int,const char *) |  | gzdopen | 1 |
-| string.cpp:19:6:19:9 | sink | (int,const char *) |  | setlocale | 1 |
-| string.cpp:19:6:19:9 | sink | (int,const char *) |  | xsetlocale | 1 |
-| string.cpp:19:6:19:9 | sink | (lemon *,const char *) |  | file_makename | 1 |
-| string.cpp:19:6:19:9 | sink | (long *,const char *) |  | secs2ms | 1 |
-| string.cpp:19:6:19:9 | sink | (long *,const char *) |  | str2num | 1 |
-| string.cpp:19:6:19:9 | sink | (long *,const char *) |  | str2unum | 1 |
-| string.cpp:19:6:19:9 | sink | (nss_module *,const char *) |  | __nss_module_get_function | 1 |
-| string.cpp:19:6:19:9 | sink | (size_t *,const char *) |  | next_protos_parse | 1 |
-| string.cpp:19:6:19:9 | sink | (slist_wc **,const char *) |  | easysrc_add | 1 |
-| string.cpp:19:6:19:9 | sink | (slist_wc *,const char *) |  | slist_wc_append | 1 |
-| string.cpp:19:6:19:9 | sink | (sockaddr_un *,const char *) |  | __sockaddr_un_set | 1 |
-| string.cpp:19:6:19:9 | sink | (sqlite3 *,const char *) |  | sqlite3_declare_vtab | 1 |
-| string.cpp:19:6:19:9 | sink | (sqlite3 *,const char *) |  | sqlite3_get_clientdata | 1 |
-| string.cpp:19:6:19:9 | sink | (sqlite3 *,const char *) |  | sqlite3_wal_checkpoint | 1 |
-| string.cpp:19:6:19:9 | sink | (sqlite3_intck *,const char *) |  | sqlite3_intck_test_sql | 1 |
-| string.cpp:19:6:19:9 | sink | (sqlite3_stmt *,const char *) |  | sqlite3_bind_parameter_index | 1 |
-| string.cpp:19:6:19:9 | sink | (sqlite3_str *,const char *) |  | sqlite3_str_appendall | 1 |
-| string.cpp:19:6:19:9 | sink | (sqlite3_value *,const char *) |  | sqlite3_value_pointer | 1 |
-| string.cpp:19:6:19:9 | sink | (stringtable *,const char *) |  | stringtable_add | 1 |
-| string.cpp:19:6:19:9 | sink | (unsigned char *,const char *) |  | ossl_a2i_ipadd | 1 |
-| string.cpp:19:6:19:9 | sink | (unsigned long *,const char *) |  | set_cert_ex | 1 |
-| string.cpp:19:6:19:9 | sink | (unsigned long *,const char *) |  | set_name_ex | 1 |
-| string.cpp:19:6:19:9 | sink | (uv_pipe_t *,const char *) |  | uv_pipe_bind | 1 |
-| string.cpp:20:6:20:9 | sink | (char) |  | Curl_raw_tolower | 0 |
-| string.cpp:20:6:20:9 | sink | (char) |  | Curl_raw_toupper | 0 |
-| string.cpp:20:6:20:9 | sink | (char) |  | findshortopt | 0 |
-| string.cpp:20:6:20:9 | sink | (char) |  | operator+= | 0 |
-| string.cpp:20:6:20:9 | sink | (char) | CComBSTR | Append | 0 |
-| string.cpp:20:6:20:9 | sink | (char) | CSimpleStringT | operator+= | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | ASN1_STRING_type_new | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | ASN1_tag2bit | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | ASN1_tag2str | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | Jim_ReturnCode | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | Jim_SignalId | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | OBJ_nid2ln | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | OBJ_nid2obj | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | OBJ_nid2sn | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | OSSL_trace_get_category_name | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | PKCS12_init | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | Symbol_Nth | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | X509_PURPOSE_get0 | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | X509_TRUST_get0 | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | X509_TRUST_get_by_id | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | __btowc | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | __current_locale_name | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | __fdopendir | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | __get_errlist | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | __get_errname | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | __math_invalid_i | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | __math_invalidf_i | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | __p_class | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | __p_rcode | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | __p_type | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | __pkey_get | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | __sigdescr_np | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | __strerrordesc_np | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | _tolower | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | _toupper | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | btowc | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | c_tolower | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | c_toupper | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | curlx_sitouz | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | evp_pkey_type2name | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | inet6_option_space | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | isalnum | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | isalpha | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | isblank | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | iscntrl | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | isdigit | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | isgraph | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | islower | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | isprint | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | ispunct | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | isspace | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | isupper | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | isxdigit | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | ossl_tolower | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | ossl_toupper | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | sigabbrev_np | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | sqlite3_compileoption_get | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | sqlite3_errstr | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | strerrorname_np | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | support_report_failure | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | svcudp_create | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | tls13_alert_code | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | toascii | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | tolower | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | toupper | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | uabs | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | uv__accept | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | uv_err_name | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | uv_get_osfhandle | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | uv_strerror | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | uv_translate_sys_error | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) |  | zError | 0 |
-| stringstream.cpp:13:6:13:9 | sink | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | ASN1_STRING_type_new | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | ASN1_tag2bit | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | ASN1_tag2str | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | Jim_ReturnCode | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | Jim_SignalId | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | OBJ_nid2ln | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | OBJ_nid2obj | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | OBJ_nid2sn | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | OSSL_trace_get_category_name | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | PKCS12_init | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | Symbol_Nth | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | X509_PURPOSE_get0 | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | X509_TRUST_get0 | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | X509_TRUST_get_by_id | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | __btowc | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | __current_locale_name | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | __fdopendir | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | __get_errlist | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | __get_errname | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | __math_invalid_i | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | __math_invalidf_i | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | __p_class | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | __p_rcode | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | __p_type | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | __pkey_get | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | __sigdescr_np | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | __strerrordesc_np | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | _tolower | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | _toupper | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | btowc | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | c_tolower | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | c_toupper | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | curlx_sitouz | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | evp_pkey_type2name | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | inet6_option_space | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | isalnum | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | isalpha | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | isblank | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | iscntrl | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | isdigit | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | isgraph | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | islower | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | isprint | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | ispunct | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | isspace | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | isupper | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | isxdigit | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | ossl_tolower | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | ossl_toupper | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | sigabbrev_np | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | sqlite3_compileoption_get | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | sqlite3_errstr | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | strerrorname_np | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | support_report_failure | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | svcudp_create | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | tls13_alert_code | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | toascii | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | tolower | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | toupper | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | uabs | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | uv__accept | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | uv_err_name | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | uv_get_osfhandle | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | uv_strerror | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | uv_translate_sys_error | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) |  | zError | 0 |
-| stringstream.cpp:26:6:26:29 | test_stringstream_string | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | ASN1_STRING_type_new | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | ASN1_tag2bit | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | ASN1_tag2str | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | Jim_ReturnCode | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | Jim_SignalId | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | OBJ_nid2ln | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | OBJ_nid2obj | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | OBJ_nid2sn | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | OSSL_trace_get_category_name | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | PKCS12_init | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | Symbol_Nth | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | X509_PURPOSE_get0 | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | X509_TRUST_get0 | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | X509_TRUST_get_by_id | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | __btowc | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | __current_locale_name | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | __fdopendir | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | __get_errlist | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | __get_errname | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | __math_invalid_i | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | __math_invalidf_i | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | __p_class | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | __p_rcode | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | __p_type | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | __pkey_get | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | __sigdescr_np | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | __strerrordesc_np | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | _tolower | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | _toupper | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | btowc | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | c_tolower | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | c_toupper | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | curlx_sitouz | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | evp_pkey_type2name | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | inet6_option_space | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | isalnum | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | isalpha | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | isblank | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | iscntrl | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | isdigit | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | isgraph | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | islower | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | isprint | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | ispunct | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | isspace | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | isupper | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | isxdigit | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | ossl_tolower | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | ossl_toupper | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | sigabbrev_np | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | sqlite3_compileoption_get | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | sqlite3_errstr | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | strerrorname_np | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | support_report_failure | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | svcudp_create | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | tls13_alert_code | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | toascii | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | tolower | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | toupper | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | uabs | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | uv__accept | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | uv_err_name | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | uv_get_osfhandle | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | uv_strerror | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | uv_translate_sys_error | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) |  | zError | 0 |
-| stringstream.cpp:70:6:70:26 | test_stringstream_int | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | ASN1_STRING_type_new | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | ASN1_tag2bit | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | ASN1_tag2str | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | Jim_ReturnCode | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | Jim_SignalId | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | OBJ_nid2ln | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | OBJ_nid2obj | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | OBJ_nid2sn | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | OSSL_trace_get_category_name | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | PKCS12_init | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | Symbol_Nth | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | X509_PURPOSE_get0 | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | X509_TRUST_get0 | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | X509_TRUST_get_by_id | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | __btowc | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | __current_locale_name | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | __fdopendir | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | __get_errlist | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | __get_errname | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | __math_invalid_i | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | __math_invalidf_i | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | __p_class | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | __p_rcode | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | __p_type | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | __pkey_get | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | __sigdescr_np | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | __strerrordesc_np | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | _tolower | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | _toupper | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | btowc | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | c_tolower | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | c_toupper | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | curlx_sitouz | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | evp_pkey_type2name | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | inet6_option_space | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | isalnum | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | isalpha | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | isblank | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | iscntrl | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | isdigit | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | isgraph | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | islower | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | isprint | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | ispunct | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | isspace | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | isupper | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | isxdigit | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | ossl_tolower | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | ossl_toupper | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | sigabbrev_np | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | sqlite3_compileoption_get | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | sqlite3_errstr | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | strerrorname_np | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | support_report_failure | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | svcudp_create | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | tls13_alert_code | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | toascii | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | tolower | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | toupper | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | uabs | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | uv__accept | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | uv_err_name | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | uv_get_osfhandle | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | uv_strerror | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | uv_translate_sys_error | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) |  | zError | 0 |
-| structlikeclass.cpp:8:2:8:16 | StructLikeClass | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| taint.cpp:4:6:4:21 | arithAssignments | (ASN1_STRING *,int) |  | ASN1_STRING_length_set | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (ASYNC_WAIT_CTX *,int) |  | ASYNC_WAIT_CTX_set_status | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (BIGNUM *,int) |  | BN_clear_bit | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (BIGNUM *,int) |  | BN_mask_bits | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (BIGNUM *,int) |  | BN_set_bit | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (BIGNUM *,int) |  | BN_set_flags | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (BIGNUM *,int) |  | bn_expand2 | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (BIGNUM *,int) |  | bn_wexpand | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (BIGNUM *,int) |  | ossl_bn_mask_bits_fixed_top | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (BIO *,int) |  | BIO_clear_flags | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (BIO *,int) |  | BIO_find_type | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (BIO *,int) |  | BIO_set_flags | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (BIO *,int) |  | BIO_set_init | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (BIO *,int) |  | BIO_set_retry_reason | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (BIO *,int) |  | BIO_set_shutdown | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (BIO *,int) |  | TXT_DB_read | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (CMS_SignerInfo *,int) |  | CMS_signed_delete_attr | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (CMS_SignerInfo *,int) |  | CMS_unsigned_delete_attr | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (CURL *,int) |  | curl_easy_pause | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (Curl_easy *,int) |  | Curl_conn_get_socket | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (DH *,int) |  | DH_clear_flags | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (DH *,int) |  | DH_set_flags | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (DH_METHOD *,int) |  | DH_meth_set_flags | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (DSA *,int) |  | DSA_clear_flags | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (DSA *,int) |  | DSA_set_flags | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (DSA_METHOD *,int) |  | DSA_meth_set_flags | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (EC_GROUP *,int) |  | EC_GROUP_set_asn1_flag | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (EC_GROUP *,int) |  | EC_GROUP_set_curve_name | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (EC_KEY *,int) |  | EC_KEY_clear_flags | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (EC_KEY *,int) |  | EC_KEY_set_asn1_flag | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (EC_KEY *,int) |  | EC_KEY_set_flags | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (ENGINE *,int) |  | ENGINE_cmd_is_executable | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (ENGINE *,int) |  | ENGINE_set_flags | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (EVP_CIPHER *,int) |  | EVP_CIPHER_meth_set_impl_ctx_size | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (EVP_CIPHER *,int) |  | EVP_CIPHER_meth_set_iv_length | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_clear_flags | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_flags | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_key_length | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_num | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (EVP_KEYMGMT *,int) |  | evp_keymgmt_util_query_operation_name | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (EVP_MD *,int) |  | EVP_MD_meth_set_app_datasize | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (EVP_MD *,int) |  | EVP_MD_meth_set_input_blocksize | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (EVP_MD *,int) |  | EVP_MD_meth_set_result_size | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (EVP_MD_CTX *,int) |  | EVP_MD_CTX_clear_flags | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (EVP_MD_CTX *,int) |  | EVP_MD_CTX_set_flags | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (EVP_PKEY *,int) |  | EVP_PKEY_delete_attr | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (EVP_PKEY *,int) |  | EVP_PKEY_save_parameters | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (EVP_PKEY *,int) |  | EVP_PKEY_set_type | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_get_keygen_info | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_kdf_type | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_nid | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_paramgen_type | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_rfc5114 | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dhx_rfc5114 | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ec_param_enc | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ec_paramgen_curve_nid | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ecdh_kdf_type | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_hkdf_mode | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_rsa_padding | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_rsa_pss_saltlen | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_gindex | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_h | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_pcounter | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (FILE *,int) |  | _IO_default_pbackfail | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (FILE *,int) |  | _IO_fwide | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (FILE *,int) |  | _IO_init | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (FILE *,int) |  | _IO_init_internal | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (FILE *,int) |  | _IO_new_file_attach | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (FILE *,int) |  | _IO_new_file_overflow | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (FILE *,int) |  | _IO_old_init | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (FILE *,int) |  | _IO_sputbackc | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (FILE *,int) |  | _IO_str_overflow | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (FILE *,int) |  | _IO_str_pbackfail | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (FILE *,int) |  | __printf_buffer_as_file_overflow | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (FILE *,int) |  | __wprintf_buffer_as_file_overflow | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (FTS *,int) |  | fts_children | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (LIBSSH2_CHANNEL *,int) |  | _libssh2_channel_extended_data | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (LIBSSH2_CHANNEL *,int) |  | _libssh2_channel_flush | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_flush_ex | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_handle_extended_data | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_handle_extended_data2 | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_set_blocking | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (LIBSSH2_SESSION *,int) |  | _libssh2_session_set_blocking | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (LIBSSH2_SESSION *,int) |  | libssh2_hostkey_hash | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (LIBSSH2_SESSION *,int) |  | libssh2_session_methods | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (LIBSSH2_SESSION *,int) |  | libssh2_session_set_blocking | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (LIBSSH2_SESSION *,int) |  | libssh2_session_startup | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (LPCOLESTR,int) | CComBSTR | Append | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (OCSP_BASICRESP *,int) |  | OCSP_BASICRESP_delete_ext | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (OCSP_BASICRESP *,int) |  | OCSP_BASICRESP_get_ext | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (OCSP_BASICRESP *,int) |  | OCSP_resp_get0 | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (OCSP_ONEREQ *,int) |  | OCSP_ONEREQ_delete_ext | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (OCSP_ONEREQ *,int) |  | OCSP_ONEREQ_get_ext | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (OCSP_REQUEST *,int) |  | OCSP_REQUEST_delete_ext | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (OCSP_REQUEST *,int) |  | OCSP_REQUEST_get_ext | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (OCSP_REQUEST *,int) |  | OCSP_request_onereq_get0 | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (OCSP_SINGLERESP *,int) |  | OCSP_SINGLERESP_delete_ext | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (OCSP_SINGLERESP *,int) |  | OCSP_SINGLERESP_get_ext | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (OPENSSL_STACK *,int) |  | OPENSSL_sk_delete | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (OPENSSL_STACK *,int) |  | OPENSSL_sk_reserve | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (OPENSSL_sk_compfunc,int) |  | OPENSSL_sk_new_reserve | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (OSSL_ACKM *,int) |  | ossl_ackm_get_ack_deadline | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (OSSL_ACKM *,int) |  | ossl_ackm_get_ack_frame | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (OSSL_ACKM *,int) |  | ossl_ackm_get_largest_acked | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (OSSL_ACKM *,int) |  | ossl_ackm_on_pkt_space_discarded | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_set_serverPort | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (OSSL_CMP_CTX *,int) |  | ossl_cmp_ctx_set_failInfoCode | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (OSSL_CMP_CTX *,int) |  | ossl_cmp_ctx_set_status | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (OSSL_CMP_CTX *,int) |  | ossl_cmp_msg_create | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (OSSL_CMP_CTX *,int) |  | ossl_cmp_pollReq_new | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (OSSL_CMP_MSG *,int) |  | ossl_cmp_msg_set_bodytype | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (OSSL_CMP_PKIHEADER *,int) |  | ossl_cmp_hdr_set_pvno | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (OSSL_CMP_REVREPCONTENT *,int) |  | ossl_cmp_revrepcontent_get_CertId | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (OSSL_CMP_REVREPCONTENT *,int) |  | ossl_cmp_revrepcontent_get_pkisi | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_accept_raverified | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_accept_unprotected | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_grant_implicit_confirm | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_send_unprotected_errors | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (OSSL_CRMF_PKIPUBLICATIONINFO *,int) |  | OSSL_CRMF_MSG_set_PKIPublicationInfo_action | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (OSSL_DECODER_CTX *,int) |  | OSSL_DECODER_CTX_set_selection | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (OSSL_ENCODER_CTX *,int) |  | OSSL_ENCODER_CTX_set_selection | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (OSSL_LIB_CTX *,int) |  | OSSL_LIB_CTX_get_data | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (OSSL_LIB_CTX *,int) |  | OSSL_LIB_CTX_set_conf_diagnostics | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (OSSL_LIB_CTX *,int) |  | ossl_ctx_global_properties | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (OSSL_LIB_CTX *,int) |  | ossl_dh_new_by_nid_ex | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (OSSL_LIB_CTX *,int) |  | ossl_lib_ctx_get_data | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (OSSL_LIB_CTX *,int) |  | ossl_mac_key_new | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (OSSL_PARAM *,int) |  | OSSL_PARAM_set_int | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (OSSL_QRX *,int) |  | ossl_qrx_get_bytes_received | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (OSSL_RECORD_LAYER *,int) |  | tls_set_first_handshake | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (OSSL_RECORD_LAYER *,int) |  | tls_set_plain_alerts | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (OSSL_STORE_CTX *,int) |  | OSSL_STORE_expect | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (PKCS7 *,int) |  | PKCS7_set_type | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (QUIC_CHANNEL *,int) |  | ossl_quic_channel_new_stream_local | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (QUIC_ENGINE *,int) |  | ossl_quic_engine_set_inhibit_tick | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (QUIC_PORT *,int) |  | ossl_quic_port_set_allow_incoming | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (QUIC_RCIDM *,int) |  | ossl_quic_rcidm_get_preferred_tx_dcid_changed | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (QUIC_RSTREAM *,int) |  | ossl_quic_rstream_set_cleanse | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (QUIC_RXFC *,int) |  | ossl_quic_rxfc_get_error | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (QUIC_RXFC *,int) |  | ossl_quic_rxfc_has_cwm_changed | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (QUIC_SSTREAM *,int) |  | ossl_quic_sstream_set_cleanse | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (QUIC_STREAM_MAP *,int) |  | ossl_quic_stream_map_get_accept_queue_len | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (QUIC_TXFC *,int) |  | ossl_quic_txfc_has_become_blocked | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (RSA *,int) |  | RSA_clear_flags | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (RSA *,int) |  | RSA_set_flags | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (RSA_METHOD *,int) |  | RSA_meth_set_flags | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_hashalg | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_maskgenhashalg | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_saltlen | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_trailerfield | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (SSL *,int) |  | SSL_key_update | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (SSL *,int) |  | SSL_set_post_handshake_auth | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (SSL *,int) |  | SSL_set_purpose | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (SSL *,int) |  | SSL_set_quic_tls_early_data_enabled | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (SSL *,int) |  | SSL_set_quiet_shutdown | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (SSL *,int) |  | SSL_set_read_ahead | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (SSL *,int) |  | SSL_set_security_level | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (SSL *,int) |  | SSL_set_shutdown | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (SSL *,int) |  | SSL_set_trust | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (SSL *,int) |  | SSL_set_verify_depth | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (SSL_CONNECTION *,int) |  | dtls1_read_failed | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (SSL_CONNECTION *,int) |  | ossl_statem_send_fatal | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (SSL_CONNECTION *,int) |  | ossl_statem_set_in_init | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (SSL_CONNECTION *,int) |  | tls1_shared_group | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (SSL_CTX *,int) |  | SSL_CTX_set_post_handshake_auth | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (SSL_CTX *,int) |  | SSL_CTX_set_purpose | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (SSL_CTX *,int) |  | SSL_CTX_set_quiet_shutdown | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (SSL_CTX *,int) |  | SSL_CTX_set_security_level | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (SSL_CTX *,int) |  | SSL_CTX_set_srp_strength | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (SSL_CTX *,int) |  | SSL_CTX_set_trust | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (SSL_CTX *,int) |  | SSL_CTX_set_verify_depth | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (SSL_CTX *,int) |  | ssl_md | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (SSL_SESSION *,int) |  | SSL_SESSION_set_protocol_version | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (TS_REQ *,int) |  | TS_REQ_delete_ext | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (TS_REQ *,int) |  | TS_REQ_get_ext | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (TS_RESP_CTX *,int) |  | TS_RESP_CTX_add_flags | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (TS_STATUS_INFO *,int) |  | TS_STATUS_INFO_set_status | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (TS_TST_INFO *,int) |  | TS_TST_INFO_delete_ext | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (TS_TST_INFO *,int) |  | TS_TST_INFO_get_ext | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (TS_VERIFY_CTX *,int) |  | TS_VERIFY_CTX_add_flags | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (TS_VERIFY_CTX *,int) |  | TS_VERIFY_CTX_set_flags | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (WPACKET *,int) |  | ossl_DER_w_begin_sequence | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (X509 *,int) |  | X509_delete_ext | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (X509 *,int) |  | X509_self_signed | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (X509_ACERT *,int) |  | X509_ACERT_delete_attr | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (X509_ATTRIBUTE *,int) |  | X509_ATTRIBUTE_get0_type | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (X509_CRL *,int) |  | X509_CRL_delete_ext | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (X509_NAME *,int) |  | X509_NAME_delete_entry | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (X509_REQ *,int) |  | X509_REQ_delete_attr | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (X509_REVOKED *,int) |  | X509_REVOKED_delete_ext | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (X509_STORE *,int) |  | X509_STORE_set_depth | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (X509_STORE *,int) |  | X509_STORE_set_purpose | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (X509_STORE *,int) |  | X509_STORE_set_trust | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_depth | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_error | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_error_depth | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_purpose | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_trust | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_get0_host | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_auth_level | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_depth | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_purpose | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_trust | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (_Float128,int) |  | __ldexpf128 | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (_Float128,int) |  | __scalbnf128 | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (__sigset_t *,int) |  | __sigaddset_compat | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (__sigset_t *,int) |  | __sigdelset_compat | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (acttab *,int) |  | acttab_insert | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (addrinfo *,int) |  | support_format_addrinfo | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (aiocb_union *,int) |  | __aio_enqueue_request | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (argp_fmtstream_t,int) |  | __argp_fmtstream_putc | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (char **,int) |  | addrsort | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (char *,int) |  | Curl_str2addr | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (char *,int) |  | PEM_proc_type | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (char,int) | CStringT | CStringT | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (connectdata *,int) |  | Curl_conn_is_ssl | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const ASN1_BIT_STRING *,int) |  | ASN1_BIT_STRING_get_bit | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const BIGNUM *,int) |  | BN_get_flags | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const BIGNUM *,int) |  | BN_is_bit_set | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const BIO *,int) |  | BIO_get_ex_data | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const BIO *,int) |  | BIO_test_flags | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const CMS_SignerInfo *,int) |  | CMS_signed_get_attr | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const CMS_SignerInfo *,int) |  | CMS_unsigned_get_attr | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const CRYPTO_EX_DATA *,int) |  | CRYPTO_get_ex_data | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const DH *,int) |  | DH_get_ex_data | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const DH *,int) |  | DH_test_flags | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const DH *,int) |  | ossl_dh_dup | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const DSA *,int) |  | DSA_get_ex_data | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const DSA *,int) |  | DSA_test_flags | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const DSA *,int) |  | ossl_dsa_dup | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const ECX_KEY *,int) |  | ossl_ecx_key_dup | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const EC_KEY *,int) |  | EC_KEY_get_ex_data | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const EC_KEY *,int) |  | ossl_ec_key_dup | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const ENGINE *,int) |  | ENGINE_get_ex_data | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_test_flags | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const EVP_MD_CTX *,int) |  | EVP_MD_CTX_test_flags | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const EVP_PKEY *,int) |  | EVP_PKEY_get_attr | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const EVP_PKEY *,int) |  | EVP_PKEY_get_ex_data | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const ML_DSA_KEY *,int) |  | ossl_ml_dsa_key_dup | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const ML_KEM_KEY *,int) |  | ossl_ml_kem_key_dup | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const OPENSSL_STACK *,int) |  | OPENSSL_sk_value | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const OSSL_CMP_CERTREPMESSAGE *,int) |  | ossl_cmp_certrepmessage_get0_certresponse | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_get0_newPkey | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_get_option | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const OSSL_CMP_PKISI *,int) |  | ossl_cmp_pkisi_check_pkifailureinfo | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const OSSL_CMP_POLLREPCONTENT *,int) |  | ossl_cmp_pollrepcontent_get0_pollrep | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const QUIC_CHANNEL *,int) |  | ossl_quic_channel_get_local_stream_count_avail | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const QUIC_CHANNEL *,int) |  | ossl_quic_channel_get_remote_stream_count_avail | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const RSA *,int) |  | RSA_get_ex_data | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const RSA *,int) |  | RSA_test_flags | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const RSA *,int) |  | ossl_rsa_dup | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const SLH_DSA_KEY *,int) |  | ossl_slh_dsa_key_dup | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const SSL *,int) |  | SSL_get_ex_data | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const SSL_CTX *,int) |  | SSL_CTX_get_ex_data | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const SSL_SESSION *,int) |  | SSL_SESSION_get_ex_data | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const SSL_SESSION *,int) |  | ssl_session_dup | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const UI *,int) |  | UI_get_ex_data | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const UI_METHOD *,int) |  | UI_method_get_ex_data | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const X509 *,int) |  | X509_get_ex_data | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const X509 *,int) |  | X509_get_ext | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const X509_ACERT *,int) |  | X509_ACERT_get_attr | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const X509_CRL *,int) |  | X509_CRL_get_ext | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const X509_NAME *,int) |  | X509_NAME_get_entry | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const X509_POLICY_LEVEL *,int) |  | X509_policy_level_get0_node | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const X509_POLICY_TREE *,int) |  | X509_policy_tree_get0_level | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const X509_REQ *,int) |  | X509_REQ_get_attr | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const X509_REVOKED *,int) |  | X509_REVOKED_get_ext | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const X509_STORE *,int) |  | X509_STORE_get_ex_data | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const X509_STORE_CTX *,int) |  | X509_STORE_CTX_get_ex_data | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const XCHAR *,int) | CStringT | CStringT | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const YCHAR *,int) | CStringT | CStringT | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const char *,int) |  | DH_meth_new | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const char *,int) |  | DSA_meth_new | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const char *,int) |  | Jim_StrDupLen | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const char *,int) |  | NETSCAPE_SPKI_b64_decode | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const char *,int) |  | RSA_meth_new | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const char *,int) |  | ftok | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const char *,int) |  | gethostbyname2 | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const char *,int) |  | parse_yesno | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const char *,int) |  | res_gethostbyname2 | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const stack_st_X509_ATTRIBUTE *,int) |  | X509at_get_attr | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const stack_st_X509_EXTENSION *,int) |  | X509v3_get_ext | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const unsigned char *,int) |  | Jim_GenHashFunction | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const unsigned char *,int) |  | OPENSSL_uni2asc | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const unsigned char *,int) |  | OPENSSL_uni2utf8 | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (const void *,int) |  | inet6_rth_getaddr | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (double,int) |  | __ldexp | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (double,int) |  | __scalbn | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (double[],int) |  | getloadavg | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (dynhds *,int) |  | Curl_dynhds_set_opts | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (fexcept_t *,int) |  | fegetexceptflag | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (float,int) |  | __ldexpf | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (float,int) |  | __scalbnf | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (gzFile,int) |  | gzflush | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (gzFile,int) |  | gzputc | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (int *,int) |  | X509_PURPOSE_set | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (int *,int) |  | X509_TRUST_set | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (int *,int) |  | __lll_unlock_elision | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (int,int) |  | BN_security_bits | 0 |
-| taint.cpp:4:6:4:21 | arithAssignments | (int,int) |  | BN_security_bits | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (int,int) |  | EVP_MD_meth_new | 0 |
-| taint.cpp:4:6:4:21 | arithAssignments | (int,int) |  | EVP_MD_meth_new | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (int,int) |  | EVP_PKEY_meth_new | 0 |
-| taint.cpp:4:6:4:21 | arithAssignments | (int,int) |  | EVP_PKEY_meth_new | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (int,int) |  | __isctype | 0 |
-| taint.cpp:4:6:4:21 | arithAssignments | (int,int) |  | __isctype | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (int,int) |  | acttab_alloc | 0 |
-| taint.cpp:4:6:4:21 | arithAssignments | (int,int) |  | acttab_alloc | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (int,int) |  | div | 0 |
-| taint.cpp:4:6:4:21 | arithAssignments | (int,int) |  | div | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (int,int) |  | inet6_rth_space | 0 |
-| taint.cpp:4:6:4:21 | arithAssignments | (int,int) |  | inet6_rth_space | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (long double,int) |  | __ldexpl | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (netlink_handle *,int) |  | __netlink_request | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (nghttp2_option *,int) |  | nghttp2_option_set_no_auto_ping_ack | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (nghttp2_option *,int) |  | nghttp2_option_set_no_auto_window_update | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (nghttp2_option *,int) |  | nghttp2_option_set_no_closed_streams | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (nghttp2_option *,int) |  | nghttp2_option_set_no_http_messaging | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (nghttp2_option *,int) |  | nghttp2_option_set_no_recv_client_magic | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (nghttp2_option *,int) |  | nghttp2_option_set_no_rfc9113_leading_and_trailing_ws_validation | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (nghttp2_option *,int) |  | nghttp2_option_set_server_fallback_rfc7540_priorities | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (ns_msg,int) |  | ns_msg_getflag | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (obstack *,int) |  | _obstack_newchunk | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (posix_spawnattr_t *,int) |  | posix_spawnattr_setcgroup_np | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (posix_spawnattr_t *,int) |  | posix_spawnattr_setschedpolicy | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (pthread_attr_t *,int) |  | __pthread_attr_setschedpolicy | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (pthread_barrierattr_t *,int) |  | __pthread_barrierattr_setpshared | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (pthread_mutexattr_t *,int) |  | ___pthread_mutexattr_settype | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (pthread_mutexattr_t *,int) |  | __pthread_mutexattr_setprioceiling | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (pthread_mutexattr_t *,int) |  | __pthread_mutexattr_setprotocol | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (pthread_rwlockattr_t *,int) |  | __pthread_rwlockattr_setkind_np | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (pthread_rwlockattr_t *,int) |  | __pthread_rwlockattr_setpshared | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (rule *,int) |  | Configlist_add | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (rule *,int) |  | Configlist_addbasis | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (sigset_t *,int) |  | sigaddset | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (sigset_t *,int) |  | sigdelset | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (sqlite3 *,int) |  | sqlite3_busy_timeout | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (sqlite3 *,int) |  | sqlite3_db_name | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (sqlite3 *,int) |  | sqlite3_wal_autocheckpoint | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (sqlite3_backup *,int) |  | sqlite3_backup_step | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (sqlite3_context *,int) |  | sqlite3_aggregate_context | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (sqlite3_context *,int) |  | sqlite3_result_error_code | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (sqlite3_index_info *,int) |  | sqlite3_vtab_collation | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (sqlite3_stmt *,int) |  | sqlite3_bind_parameter_name | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (sqlite3_stmt *,int) |  | sqlite3_column_blob | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (sqlite3_stmt *,int) |  | sqlite3_column_bytes | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (sqlite3_stmt *,int) |  | sqlite3_column_bytes16 | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (sqlite3_stmt *,int) |  | sqlite3_column_decltype | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (sqlite3_stmt *,int) |  | sqlite3_column_decltype16 | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (sqlite3_stmt *,int) |  | sqlite3_column_double | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (sqlite3_stmt *,int) |  | sqlite3_column_int | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (sqlite3_stmt *,int) |  | sqlite3_column_int64 | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (sqlite3_stmt *,int) |  | sqlite3_column_name | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (sqlite3_stmt *,int) |  | sqlite3_column_name16 | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (sqlite3_stmt *,int) |  | sqlite3_column_text | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (sqlite3_stmt *,int) |  | sqlite3_column_text16 | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (sqlite3_stmt *,int) |  | sqlite3_column_type | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (sqlite3_stmt *,int) |  | sqlite3_column_value | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (sqlite3_stmt *,int) |  | sqlite3_stmt_explain | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (stack_st_PKCS7 *,int) |  | PKCS12_add_safes | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (stack_st_SSL_COMP *,int) |  | ssl3_comp_find | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (stack_st_X509_ATTRIBUTE *,int) |  | X509at_delete_attr | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (stack_st_X509_EXTENSION *,int) |  | X509v3_delete_ext | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (timespec *,int) |  | __timespec_get | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (timespec *,int) |  | __timespec_getres | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (uint16_t,int) |  | tls1_group_id2nid | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (unsigned char *,int) |  | RAND_bytes | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (unsigned char *,int) |  | RAND_priv_bytes | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (unsigned char *,int) |  | ossl_ipaddr_to_asc | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (unsigned short,int) |  | dtls1_get_queue_priority | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (uv_env_item_t *,int) |  | uv_os_free_environ | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (void *,int) |  | DSO_dsobyaddr | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (void *,int) |  | sqlite3_realloc | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (void *const *,int) |  | __backtrace_symbols | 1 |
-| taint.cpp:4:6:4:21 | arithAssignments | (wchar_t,int) | CStringT | CStringT | 1 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | ASN1_STRING_type_new | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | ASN1_tag2bit | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | ASN1_tag2str | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | Jim_ReturnCode | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | Jim_SignalId | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | OBJ_nid2ln | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | OBJ_nid2obj | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | OBJ_nid2sn | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | OSSL_trace_get_category_name | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | PKCS12_init | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | Symbol_Nth | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | X509_PURPOSE_get0 | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | X509_TRUST_get0 | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | X509_TRUST_get_by_id | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | __btowc | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | __current_locale_name | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | __fdopendir | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | __get_errlist | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | __get_errname | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | __math_invalid_i | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | __math_invalidf_i | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | __p_class | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | __p_rcode | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | __p_type | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | __pkey_get | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | __sigdescr_np | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | __strerrordesc_np | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | _tolower | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | _toupper | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | btowc | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | c_tolower | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | c_toupper | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | curlx_sitouz | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | evp_pkey_type2name | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | inet6_option_space | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | isalnum | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | isalpha | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | isblank | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | iscntrl | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | isdigit | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | isgraph | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | islower | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | isprint | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | ispunct | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | isspace | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | isupper | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | isxdigit | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | ossl_tolower | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | ossl_toupper | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | sigabbrev_np | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | sqlite3_compileoption_get | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | sqlite3_errstr | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | strerrorname_np | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | support_report_failure | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | svcudp_create | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | tls13_alert_code | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | toascii | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | tolower | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | toupper | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | uabs | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | uv__accept | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | uv_err_name | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | uv_get_osfhandle | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | uv_strerror | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | uv_translate_sys_error | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) |  | zError | 0 |
-| taint.cpp:22:5:22:13 | increment | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | ASN1_STRING_type_new | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | ASN1_tag2bit | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | ASN1_tag2str | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | Jim_ReturnCode | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | Jim_SignalId | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | OBJ_nid2ln | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | OBJ_nid2obj | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | OBJ_nid2sn | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | OSSL_trace_get_category_name | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | PKCS12_init | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | Symbol_Nth | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | X509_PURPOSE_get0 | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | X509_TRUST_get0 | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | X509_TRUST_get_by_id | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | __btowc | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | __current_locale_name | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | __fdopendir | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | __get_errlist | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | __get_errname | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | __math_invalid_i | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | __math_invalidf_i | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | __p_class | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | __p_rcode | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | __p_type | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | __pkey_get | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | __sigdescr_np | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | __strerrordesc_np | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | _tolower | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | _toupper | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | btowc | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | c_tolower | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | c_toupper | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | curlx_sitouz | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | evp_pkey_type2name | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | inet6_option_space | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | isalnum | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | isalpha | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | isblank | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | iscntrl | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | isdigit | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | isgraph | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | islower | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | isprint | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | ispunct | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | isspace | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | isupper | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | isxdigit | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | ossl_tolower | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | ossl_toupper | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | sigabbrev_np | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | sqlite3_compileoption_get | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | sqlite3_errstr | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | strerrorname_np | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | support_report_failure | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | svcudp_create | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | tls13_alert_code | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | toascii | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | tolower | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | toupper | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | uabs | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | uv__accept | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | uv_err_name | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | uv_get_osfhandle | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | uv_strerror | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | uv_translate_sys_error | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) |  | zError | 0 |
-| taint.cpp:23:5:23:8 | zero | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | ASN1_STRING_type_new | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | ASN1_tag2bit | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | ASN1_tag2str | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | Jim_ReturnCode | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | Jim_SignalId | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | OBJ_nid2ln | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | OBJ_nid2obj | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | OBJ_nid2sn | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | OSSL_trace_get_category_name | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | PKCS12_init | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | Symbol_Nth | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | X509_PURPOSE_get0 | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | X509_TRUST_get0 | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | X509_TRUST_get_by_id | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | __btowc | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | __current_locale_name | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | __fdopendir | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | __get_errlist | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | __get_errname | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | __math_invalid_i | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | __math_invalidf_i | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | __p_class | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | __p_rcode | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | __p_type | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | __pkey_get | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | __sigdescr_np | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | __strerrordesc_np | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | _tolower | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | _toupper | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | btowc | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | c_tolower | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | c_toupper | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | curlx_sitouz | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | evp_pkey_type2name | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | inet6_option_space | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | isalnum | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | isalpha | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | isblank | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | iscntrl | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | isdigit | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | isgraph | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | islower | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | isprint | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | ispunct | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | isspace | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | isupper | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | isxdigit | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | ossl_tolower | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | ossl_toupper | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | sigabbrev_np | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | sqlite3_compileoption_get | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | sqlite3_errstr | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | strerrorname_np | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | support_report_failure | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | svcudp_create | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | tls13_alert_code | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | toascii | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | tolower | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | toupper | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | uabs | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | uv__accept | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | uv_err_name | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | uv_get_osfhandle | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | uv_strerror | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | uv_translate_sys_error | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) |  | zError | 0 |
-| taint.cpp:100:6:100:15 | array_test | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| taint.cpp:142:5:142:10 | select | (ASN1_BIT_STRING *,int,int) |  | ASN1_BIT_STRING_set_bit | 1 |
-| taint.cpp:142:5:142:10 | select | (ASN1_BIT_STRING *,int,int) |  | ASN1_BIT_STRING_set_bit | 2 |
-| taint.cpp:142:5:142:10 | select | (ASN1_BIT_STRING *,unsigned char *,int) |  | ASN1_BIT_STRING_set | 2 |
-| taint.cpp:142:5:142:10 | select | (ASN1_OCTET_STRING **,const unsigned char *,int) |  | ossl_cmp_asn1_octet_string_set1_bytes | 2 |
-| taint.cpp:142:5:142:10 | select | (ASN1_OCTET_STRING *,const unsigned char *,int) |  | ASN1_OCTET_STRING_set | 2 |
-| taint.cpp:142:5:142:10 | select | (ASN1_STRING *,const void *,int) |  | ASN1_STRING_set | 2 |
-| taint.cpp:142:5:142:10 | select | (ASN1_STRING *,void *,int) |  | ASN1_STRING_set0 | 2 |
-| taint.cpp:142:5:142:10 | select | (ASN1_TIME *,tm *,int) |  | ossl_asn1_time_from_tm | 2 |
-| taint.cpp:142:5:142:10 | select | (ASN1_TYPE *,unsigned char *,int) |  | ASN1_TYPE_set_octetstring | 2 |
-| taint.cpp:142:5:142:10 | select | (ASN1_VALUE **,const ASN1_ITEM *,int) |  | ossl_asn1_item_embed_free | 2 |
-| taint.cpp:142:5:142:10 | select | (ASN1_VALUE **,const ASN1_ITEM *,int) |  | ossl_asn1_primitive_free | 2 |
-| taint.cpp:142:5:142:10 | select | (BIGNUM *,const BIGNUM *,int) |  | BN_lshift | 2 |
-| taint.cpp:142:5:142:10 | select | (BIGNUM *,const BIGNUM *,int) |  | BN_rshift | 2 |
-| taint.cpp:142:5:142:10 | select | (BIGNUM *,const BIGNUM *,int) |  | BN_with_flags | 2 |
-| taint.cpp:142:5:142:10 | select | (BIGNUM *,const BIGNUM *,int) |  | bn_lshift_fixed_top | 2 |
-| taint.cpp:142:5:142:10 | select | (BIGNUM *,const BIGNUM *,int) |  | bn_rshift_fixed_top | 2 |
-| taint.cpp:142:5:142:10 | select | (BIGNUM *,const unsigned long *,int) |  | bn_set_static_words | 2 |
-| taint.cpp:142:5:142:10 | select | (BIGNUM *,const unsigned long *,int) |  | bn_set_words | 2 |
-| taint.cpp:142:5:142:10 | select | (BIO *,BIO *,int) |  | OSSL_HTTP_REQ_CTX_new | 2 |
-| taint.cpp:142:5:142:10 | select | (BIO *,BIO *,int) |  | SMIME_crlf_copy | 2 |
-| taint.cpp:142:5:142:10 | select | (BIO *,GENERAL_NAMES *,int) |  | OSSL_GENERAL_NAMES_print | 2 |
-| taint.cpp:142:5:142:10 | select | (BIO *,char *,int) |  | BIO_get_line | 2 |
-| taint.cpp:142:5:142:10 | select | (BIO *,const DSA *,int) |  | DSA_print | 2 |
-| taint.cpp:142:5:142:10 | select | (BIO *,const RSA *,int) |  | RSA_print | 2 |
-| taint.cpp:142:5:142:10 | select | (CERT *,X509_STORE **,int) |  | ssl_cert_get_cert_store | 2 |
-| taint.cpp:142:5:142:10 | select | (CRYPTO_THREAD_ROUTINE,void *,int) |  | ossl_crypto_thread_native_start | 2 |
-| taint.cpp:142:5:142:10 | select | (Curl_easy *,connectdata *,int) |  | Curl_conn_cf_discard_all | 2 |
-| taint.cpp:142:5:142:10 | select | (Curl_easy *,connectdata *,int) |  | Curl_http2_may_switch | 2 |
-| taint.cpp:142:5:142:10 | select | (Curl_easy *,connectdata *,int) |  | Curl_http2_switch | 2 |
-| taint.cpp:142:5:142:10 | select | (Curl_easy *,connectdata *,int) |  | Curl_ssl_cfilter_add | 2 |
-| taint.cpp:142:5:142:10 | select | (Curl_sockaddr_ex *,const Curl_addrinfo *,int) |  | Curl_sock_assign_addr | 2 |
-| taint.cpp:142:5:142:10 | select | (DH *,const OSSL_PARAM[],int) |  | ossl_dh_key_fromdata | 2 |
-| taint.cpp:142:5:142:10 | select | (DSA *,const OSSL_PARAM[],int) |  | ossl_dsa_key_fromdata | 2 |
-| taint.cpp:142:5:142:10 | select | (ECX_KEY *,const OSSL_PARAM[],int) |  | ossl_ecx_key_fromdata | 2 |
-| taint.cpp:142:5:142:10 | select | (EC_KEY *,const OSSL_PARAM[],int) |  | ossl_ec_key_fromdata | 2 |
-| taint.cpp:142:5:142:10 | select | (ENGINE *,ENGINE_DYNAMIC_ID,int) |  | engine_add_dynamic_id | 2 |
-| taint.cpp:142:5:142:10 | select | (EVP_PKEY *,EVP_KEYMGMT *,int) |  | evp_keymgmt_util_export_to_provider | 2 |
-| taint.cpp:142:5:142:10 | select | (EVP_PKEY *,EVP_KEYMGMT *,int) |  | evp_keymgmt_util_find_operation_cache | 2 |
-| taint.cpp:142:5:142:10 | select | (EVP_PKEY *,EVP_PKEY *,int) |  | evp_keymgmt_util_copy | 2 |
-| taint.cpp:142:5:142:10 | select | (EVP_PKEY_CTX *,EVP_PKEY *,int) |  | EVP_PKEY_derive_set_peer_ex | 2 |
-| taint.cpp:142:5:142:10 | select | (EVP_PKEY_CTX *,const char *,int) |  | EVP_PKEY_CTX_set1_pbe_pass | 2 |
-| taint.cpp:142:5:142:10 | select | (EVP_PKEY_CTX *,const unsigned char *,int) |  | EVP_PKEY_CTX_add1_hkdf_info | 2 |
-| taint.cpp:142:5:142:10 | select | (EVP_PKEY_CTX *,const unsigned char *,int) |  | EVP_PKEY_CTX_add1_tls1_prf_seed | 2 |
-| taint.cpp:142:5:142:10 | select | (EVP_PKEY_CTX *,const unsigned char *,int) |  | EVP_PKEY_CTX_set1_hkdf_key | 2 |
-| taint.cpp:142:5:142:10 | select | (EVP_PKEY_CTX *,const unsigned char *,int) |  | EVP_PKEY_CTX_set1_hkdf_salt | 2 |
-| taint.cpp:142:5:142:10 | select | (EVP_PKEY_CTX *,const unsigned char *,int) |  | EVP_PKEY_CTX_set1_scrypt_salt | 2 |
-| taint.cpp:142:5:142:10 | select | (EVP_PKEY_CTX *,const unsigned char *,int) |  | EVP_PKEY_CTX_set1_tls1_prf_secret | 2 |
-| taint.cpp:142:5:142:10 | select | (EVP_PKEY_CTX *,const unsigned char *,int) |  | EVP_PKEY_CTX_set_mac_key | 2 |
-| taint.cpp:142:5:142:10 | select | (EVP_PKEY_CTX *,const void *,int) |  | EVP_PKEY_CTX_set1_id | 2 |
-| taint.cpp:142:5:142:10 | select | (EVP_PKEY_CTX *,int *,int) |  | EVP_PKEY_CTX_set0_keygen_info | 2 |
-| taint.cpp:142:5:142:10 | select | (FFC_PARAMS *,unsigned int,int) |  | ossl_ffc_params_enable_flags | 2 |
-| taint.cpp:142:5:142:10 | select | (FILE *,_IO_marker *,int) |  | _IO_seekmark | 2 |
-| taint.cpp:142:5:142:10 | select | (FILE *,_IO_marker *,int) |  | _IO_seekwmark | 2 |
-| taint.cpp:142:5:142:10 | select | (FILE *,__FILE *,int) |  | fwide | 2 |
-| taint.cpp:142:5:142:10 | select | (FILE *,const DSA *,int) |  | DSA_print_fp | 2 |
-| taint.cpp:142:5:142:10 | select | (FILE *,const RSA *,int) |  | RSA_print_fp | 2 |
-| taint.cpp:142:5:142:10 | select | (FILE *,off64_t,int) |  | _IO_cookie_seek | 2 |
-| taint.cpp:142:5:142:10 | select | (FILE *,rule *,int) |  | RulePrint | 2 |
-| taint.cpp:142:5:142:10 | select | (FTS *,FTSENT *,int) |  | fts_set | 2 |
-| taint.cpp:142:5:142:10 | select | (Jim_Interp *,Jim_Obj *,int) |  | Jim_GetCommand | 2 |
-| taint.cpp:142:5:142:10 | select | (Jim_Interp *,Jim_Obj *,int) |  | Jim_GetGlobalVariable | 2 |
-| taint.cpp:142:5:142:10 | select | (Jim_Interp *,Jim_Obj *,int) |  | Jim_GetVariable | 2 |
-| taint.cpp:142:5:142:10 | select | (Jim_Interp *,Jim_Obj *,int) |  | Jim_ListGetIndex | 2 |
-| taint.cpp:142:5:142:10 | select | (Jim_Interp *,Jim_Obj *,int) |  | Jim_UnsetVariable | 2 |
-| taint.cpp:142:5:142:10 | select | (Jim_Interp *,Jim_Obj *const *,int) |  | Jim_NewDictObj | 2 |
-| taint.cpp:142:5:142:10 | select | (Jim_Interp *,Jim_Obj *const *,int) |  | Jim_NewListObj | 2 |
-| taint.cpp:142:5:142:10 | select | (Jim_Interp *,char *,int) |  | Jim_NewStringObjNoAlloc | 2 |
-| taint.cpp:142:5:142:10 | select | (Jim_Interp *,const char *,int) |  | Jim_GetGlobalVariableStr | 2 |
-| taint.cpp:142:5:142:10 | select | (Jim_Interp *,const char *,int) |  | Jim_GetVariableStr | 2 |
-| taint.cpp:142:5:142:10 | select | (Jim_Interp *,const char *,int) |  | Jim_MakeTempFile | 2 |
-| taint.cpp:142:5:142:10 | select | (Jim_Interp *,const char *,int) |  | Jim_NewStringObj | 2 |
-| taint.cpp:142:5:142:10 | select | (Jim_Interp *,const char *,int) |  | Jim_NewStringObjUtf8 | 2 |
-| taint.cpp:142:5:142:10 | select | (LIBSSH2_SESSION *,int,int) |  | libssh2_session_flag | 1 |
-| taint.cpp:142:5:142:10 | select | (LIBSSH2_SESSION *,int,int) |  | libssh2_session_flag | 2 |
-| taint.cpp:142:5:142:10 | select | (LIBSSH2_SFTP_HANDLE *,LIBSSH2_SFTP_ATTRIBUTES *,int) |  | libssh2_sftp_fstat_ex | 2 |
-| taint.cpp:142:5:142:10 | select | (OCSP_BASICRESP *,OCSP_CERTID *,int) |  | OCSP_resp_find | 2 |
-| taint.cpp:142:5:142:10 | select | (OCSP_BASICRESP *,X509_EXTENSION *,int) |  | OCSP_BASICRESP_add_ext | 2 |
-| taint.cpp:142:5:142:10 | select | (OCSP_BASICRESP *,const ASN1_OBJECT *,int) |  | OCSP_BASICRESP_get_ext_by_OBJ | 2 |
-| taint.cpp:142:5:142:10 | select | (OCSP_BASICRESP *,int,int) |  | OCSP_BASICRESP_get_ext_by_NID | 1 |
-| taint.cpp:142:5:142:10 | select | (OCSP_BASICRESP *,int,int) |  | OCSP_BASICRESP_get_ext_by_NID | 2 |
-| taint.cpp:142:5:142:10 | select | (OCSP_BASICRESP *,int,int) |  | OCSP_BASICRESP_get_ext_by_critical | 1 |
-| taint.cpp:142:5:142:10 | select | (OCSP_BASICRESP *,int,int) |  | OCSP_BASICRESP_get_ext_by_critical | 2 |
-| taint.cpp:142:5:142:10 | select | (OCSP_ONEREQ *,X509_EXTENSION *,int) |  | OCSP_ONEREQ_add_ext | 2 |
-| taint.cpp:142:5:142:10 | select | (OCSP_ONEREQ *,const ASN1_OBJECT *,int) |  | OCSP_ONEREQ_get_ext_by_OBJ | 2 |
-| taint.cpp:142:5:142:10 | select | (OCSP_ONEREQ *,int,int) |  | OCSP_ONEREQ_get_ext_by_NID | 1 |
-| taint.cpp:142:5:142:10 | select | (OCSP_ONEREQ *,int,int) |  | OCSP_ONEREQ_get_ext_by_NID | 2 |
-| taint.cpp:142:5:142:10 | select | (OCSP_ONEREQ *,int,int) |  | OCSP_ONEREQ_get_ext_by_critical | 1 |
-| taint.cpp:142:5:142:10 | select | (OCSP_ONEREQ *,int,int) |  | OCSP_ONEREQ_get_ext_by_critical | 2 |
-| taint.cpp:142:5:142:10 | select | (OCSP_REQUEST *,X509_EXTENSION *,int) |  | OCSP_REQUEST_add_ext | 2 |
-| taint.cpp:142:5:142:10 | select | (OCSP_REQUEST *,const ASN1_OBJECT *,int) |  | OCSP_REQUEST_get_ext_by_OBJ | 2 |
-| taint.cpp:142:5:142:10 | select | (OCSP_REQUEST *,int,int) |  | OCSP_REQUEST_get_ext_by_NID | 1 |
-| taint.cpp:142:5:142:10 | select | (OCSP_REQUEST *,int,int) |  | OCSP_REQUEST_get_ext_by_NID | 2 |
-| taint.cpp:142:5:142:10 | select | (OCSP_REQUEST *,int,int) |  | OCSP_REQUEST_get_ext_by_critical | 1 |
-| taint.cpp:142:5:142:10 | select | (OCSP_REQUEST *,int,int) |  | OCSP_REQUEST_get_ext_by_critical | 2 |
-| taint.cpp:142:5:142:10 | select | (OCSP_SINGLERESP *,X509_EXTENSION *,int) |  | OCSP_SINGLERESP_add_ext | 2 |
-| taint.cpp:142:5:142:10 | select | (OCSP_SINGLERESP *,const ASN1_OBJECT *,int) |  | OCSP_SINGLERESP_get_ext_by_OBJ | 2 |
-| taint.cpp:142:5:142:10 | select | (OCSP_SINGLERESP *,int,int) |  | OCSP_SINGLERESP_get_ext_by_NID | 1 |
-| taint.cpp:142:5:142:10 | select | (OCSP_SINGLERESP *,int,int) |  | OCSP_SINGLERESP_get_ext_by_NID | 2 |
-| taint.cpp:142:5:142:10 | select | (OCSP_SINGLERESP *,int,int) |  | OCSP_SINGLERESP_get_ext_by_critical | 1 |
-| taint.cpp:142:5:142:10 | select | (OCSP_SINGLERESP *,int,int) |  | OCSP_SINGLERESP_get_ext_by_critical | 2 |
-| taint.cpp:142:5:142:10 | select | (OPENSSL_STACK *,const void *,int) |  | OPENSSL_sk_insert | 2 |
-| taint.cpp:142:5:142:10 | select | (OSSL_CMP_CTX *,const unsigned char *,int) |  | OSSL_CMP_CTX_set1_referenceValue | 2 |
-| taint.cpp:142:5:142:10 | select | (OSSL_CMP_CTX *,const unsigned char *,int) |  | OSSL_CMP_CTX_set1_secretValue | 2 |
-| taint.cpp:142:5:142:10 | select | (OSSL_CMP_CTX *,int,int) |  | OSSL_CMP_CTX_set_option | 1 |
-| taint.cpp:142:5:142:10 | select | (OSSL_CMP_CTX *,int,int) |  | OSSL_CMP_CTX_set_option | 2 |
-| taint.cpp:142:5:142:10 | select | (OSSL_LIB_CTX *,const char *,int) |  | EC_GROUP_new_by_curve_name_ex | 2 |
-| taint.cpp:142:5:142:10 | select | (OSSL_LIB_CTX *,const char *,int) |  | EC_KEY_new_by_curve_name_ex | 2 |
-| taint.cpp:142:5:142:10 | select | (OSSL_LIB_CTX *,const char *,int) |  | OSSL_PROVIDER_try_load | 2 |
-| taint.cpp:142:5:142:10 | select | (OSSL_LIB_CTX *,const char *,int) |  | ossl_ml_dsa_key_new | 2 |
-| taint.cpp:142:5:142:10 | select | (OSSL_LIB_CTX *,const char *,int) |  | ossl_ml_kem_key_new | 2 |
-| taint.cpp:142:5:142:10 | select | (OSSL_LIB_CTX *,const char *,int) |  | ossl_parse_query | 2 |
-| taint.cpp:142:5:142:10 | select | (OSSL_LIB_CTX *,const char *,int) |  | ossl_property_name | 2 |
-| taint.cpp:142:5:142:10 | select | (OSSL_LIB_CTX *,const char *,int) |  | ossl_property_value | 2 |
-| taint.cpp:142:5:142:10 | select | (OSSL_PROVIDER *,OSSL_PROVIDER **,int) |  | ossl_provider_add_to_store | 2 |
-| taint.cpp:142:5:142:10 | select | (OSSL_QRL_ENC_LEVEL_SET *,uint32_t,int) |  | ossl_qrl_enc_level_set_get | 2 |
-| taint.cpp:142:5:142:10 | select | (PKCS7 *,stack_st_X509 *,int) |  | PKCS7_get0_signers | 2 |
-| taint.cpp:142:5:142:10 | select | (POLICYINFO *,const ASN1_OBJECT *,int) |  | ossl_policy_data_new | 2 |
-| taint.cpp:142:5:142:10 | select | (PROV_CTX *,const char *,int) |  | ossl_prov_ctx_get_bool_param | 2 |
-| taint.cpp:142:5:142:10 | select | (PROV_CTX *,const char *,int) |  | ossl_prov_ml_dsa_new | 2 |
-| taint.cpp:142:5:142:10 | select | (PROV_CTX *,const char *,int) |  | ossl_prov_ml_kem_new | 2 |
-| taint.cpp:142:5:142:10 | select | (QLOG *,uint32_t,int) |  | ossl_qlog_set_event_type_enabled | 2 |
-| taint.cpp:142:5:142:10 | select | (QUIC_RXFC *,uint64_t,int) |  | ossl_quic_rxfc_on_rx_stream_frame | 2 |
-| taint.cpp:142:5:142:10 | select | (QUIC_STREAM_ITER *,QUIC_STREAM_MAP *,int) |  | ossl_quic_stream_iter_init | 2 |
-| taint.cpp:142:5:142:10 | select | (QUIC_STREAM_MAP *,uint64_t,int) |  | ossl_quic_stream_map_alloc | 2 |
-| taint.cpp:142:5:142:10 | select | (RSA *,const OSSL_PARAM[],int) |  | ossl_rsa_fromdata | 2 |
-| taint.cpp:142:5:142:10 | select | (SSL *,const unsigned char *,int) |  | SSL_use_certificate_ASN1 | 2 |
-| taint.cpp:142:5:142:10 | select | (SSL *,const void *,int) |  | SSL_write | 2 |
-| taint.cpp:142:5:142:10 | select | (SSL *,void *,int) |  | SSL_peek | 2 |
-| taint.cpp:142:5:142:10 | select | (SSL *,void *,int) |  | SSL_read | 2 |
-| taint.cpp:142:5:142:10 | select | (SSL *,void *,int) |  | SSL_set_session_ticket_ext | 2 |
-| taint.cpp:142:5:142:10 | select | (SSL_CIPHER *,const SSL_CIPHER *,int) |  | OBJ_bsearch_ssl_cipher_id | 2 |
-| taint.cpp:142:5:142:10 | select | (SSL_CONNECTION *,PACKET *,int) |  | ssl_cache_cipherlist | 2 |
-| taint.cpp:142:5:142:10 | select | (SSL_CONNECTION *,WPACKET *,int) |  | dtls1_close_construct_packet | 2 |
-| taint.cpp:142:5:142:10 | select | (SSL_CONNECTION *,WPACKET *,int) |  | dtls1_set_handshake_header | 2 |
-| taint.cpp:142:5:142:10 | select | (SSL_CONNECTION *,WPACKET *,int) |  | tls_close_construct_packet | 2 |
-| taint.cpp:142:5:142:10 | select | (SSL_CONNECTION *,int,int) |  | ssl3_send_alert | 1 |
-| taint.cpp:142:5:142:10 | select | (SSL_CONNECTION *,int,int) |  | ssl3_send_alert | 2 |
-| taint.cpp:142:5:142:10 | select | (TS_MSG_IMPRINT *,unsigned char *,int) |  | TS_MSG_IMPRINT_set_msg | 2 |
-| taint.cpp:142:5:142:10 | select | (TS_REQ *,X509_EXTENSION *,int) |  | TS_REQ_add_ext | 2 |
-| taint.cpp:142:5:142:10 | select | (TS_REQ *,const ASN1_OBJECT *,int) |  | TS_REQ_get_ext_by_OBJ | 2 |
-| taint.cpp:142:5:142:10 | select | (TS_REQ *,int,int) |  | TS_REQ_get_ext_by_NID | 1 |
-| taint.cpp:142:5:142:10 | select | (TS_REQ *,int,int) |  | TS_REQ_get_ext_by_NID | 2 |
-| taint.cpp:142:5:142:10 | select | (TS_REQ *,int,int) |  | TS_REQ_get_ext_by_critical | 1 |
-| taint.cpp:142:5:142:10 | select | (TS_REQ *,int,int) |  | TS_REQ_get_ext_by_critical | 2 |
-| taint.cpp:142:5:142:10 | select | (TS_TST_INFO *,X509_EXTENSION *,int) |  | TS_TST_INFO_add_ext | 2 |
-| taint.cpp:142:5:142:10 | select | (TS_TST_INFO *,const ASN1_OBJECT *,int) |  | TS_TST_INFO_get_ext_by_OBJ | 2 |
-| taint.cpp:142:5:142:10 | select | (TS_TST_INFO *,int,int) |  | TS_TST_INFO_get_ext_by_NID | 1 |
-| taint.cpp:142:5:142:10 | select | (TS_TST_INFO *,int,int) |  | TS_TST_INFO_get_ext_by_NID | 2 |
-| taint.cpp:142:5:142:10 | select | (TS_TST_INFO *,int,int) |  | TS_TST_INFO_get_ext_by_critical | 1 |
-| taint.cpp:142:5:142:10 | select | (TS_TST_INFO *,int,int) |  | TS_TST_INFO_get_ext_by_critical | 2 |
-| taint.cpp:142:5:142:10 | select | (X509 *,X509_EXTENSION *,int) |  | X509_add_ext | 2 |
-| taint.cpp:142:5:142:10 | select | (X509 *,int,int) |  | X509_check_purpose | 1 |
-| taint.cpp:142:5:142:10 | select | (X509 *,int,int) |  | X509_check_purpose | 2 |
-| taint.cpp:142:5:142:10 | select | (X509 *,int,int) |  | X509_check_trust | 1 |
-| taint.cpp:142:5:142:10 | select | (X509 *,int,int) |  | X509_check_trust | 2 |
-| taint.cpp:142:5:142:10 | select | (X509_CRL *,X509_EXTENSION *,int) |  | X509_CRL_add_ext | 2 |
-| taint.cpp:142:5:142:10 | select | (X509_PUBKEY *,unsigned char *,int) |  | X509_PUBKEY_set0_public_key | 2 |
-| taint.cpp:142:5:142:10 | select | (X509_REVOKED *,X509_EXTENSION *,int) |  | X509_REVOKED_add_ext | 2 |
-| taint.cpp:142:5:142:10 | select | (X509_STORE_CTX *,X509 *,int) |  | ossl_x509_check_cert_time | 2 |
-| taint.cpp:142:5:142:10 | select | (XCHAR *,const XCHAR *,int) | CSimpleStringT | CopyChars | 2 |
-| taint.cpp:142:5:142:10 | select | (XCHAR *,const XCHAR *,int) | CSimpleStringT | CopyCharsOverlapped | 2 |
-| taint.cpp:142:5:142:10 | select | (_Float128,_Float128,int) |  | __kernel_sinf128 | 2 |
-| taint.cpp:142:5:142:10 | select | (_Float128,_Float128,int) |  | __kernel_tanf128 | 2 |
-| taint.cpp:142:5:142:10 | select | (_IO_strfile *,const char *,int) |  | _IO_str_init_readonly | 2 |
-| taint.cpp:142:5:142:10 | select | (action *,FILE *,int) |  | PrintAction | 2 |
-| taint.cpp:142:5:142:10 | select | (acttab *,int,int) |  | acttab_action | 1 |
-| taint.cpp:142:5:142:10 | select | (acttab *,int,int) |  | acttab_action | 2 |
-| taint.cpp:142:5:142:10 | select | (char *,size_t,int) |  | __argz_stringify | 2 |
-| taint.cpp:142:5:142:10 | select | (const ASN1_VALUE *,const ASN1_TEMPLATE *,int) |  | ossl_asn1_do_adb | 2 |
-| taint.cpp:142:5:142:10 | select | (const BIGNUM *,int[],int) |  | BN_GF2m_poly2arr | 2 |
-| taint.cpp:142:5:142:10 | select | (const BIGNUM *,unsigned char *,int) |  | BN_bn2binpad | 2 |
-| taint.cpp:142:5:142:10 | select | (const BIGNUM *,unsigned char *,int) |  | BN_bn2lebinpad | 2 |
-| taint.cpp:142:5:142:10 | select | (const BIGNUM *,unsigned char *,int) |  | BN_bn2nativepad | 2 |
-| taint.cpp:142:5:142:10 | select | (const BIGNUM *,unsigned char *,int) |  | BN_signed_bn2bin | 2 |
-| taint.cpp:142:5:142:10 | select | (const BIGNUM *,unsigned char *,int) |  | BN_signed_bn2lebin | 2 |
-| taint.cpp:142:5:142:10 | select | (const BIGNUM *,unsigned char *,int) |  | BN_signed_bn2native | 2 |
-| taint.cpp:142:5:142:10 | select | (const CMS_ContentInfo *,BIO *,int) |  | ossl_cms_DigestedData_do_final | 2 |
-| taint.cpp:142:5:142:10 | select | (const CMS_SignerInfo *,const ASN1_OBJECT *,int) |  | CMS_signed_get_attr_by_OBJ | 2 |
-| taint.cpp:142:5:142:10 | select | (const CMS_SignerInfo *,const ASN1_OBJECT *,int) |  | CMS_unsigned_get_attr_by_OBJ | 2 |
-| taint.cpp:142:5:142:10 | select | (const CMS_SignerInfo *,int,int) |  | CMS_signed_get_attr_by_NID | 1 |
-| taint.cpp:142:5:142:10 | select | (const CMS_SignerInfo *,int,int) |  | CMS_signed_get_attr_by_NID | 2 |
-| taint.cpp:142:5:142:10 | select | (const CMS_SignerInfo *,int,int) |  | CMS_unsigned_get_attr_by_NID | 1 |
-| taint.cpp:142:5:142:10 | select | (const CMS_SignerInfo *,int,int) |  | CMS_unsigned_get_attr_by_NID | 2 |
-| taint.cpp:142:5:142:10 | select | (const Curl_easy *,const connectdata *,int) |  | Curl_conn_is_http2 | 2 |
-| taint.cpp:142:5:142:10 | select | (const EVP_MD *,const EVP_MD *,int) |  | ossl_rsa_pss_params_create | 2 |
-| taint.cpp:142:5:142:10 | select | (const EVP_PKEY *,const ASN1_OBJECT *,int) |  | EVP_PKEY_get_attr_by_OBJ | 2 |
-| taint.cpp:142:5:142:10 | select | (const EVP_PKEY *,int,int) |  | EVP_PKEY_get_attr_by_NID | 1 |
-| taint.cpp:142:5:142:10 | select | (const EVP_PKEY *,int,int) |  | EVP_PKEY_get_attr_by_NID | 2 |
-| taint.cpp:142:5:142:10 | select | (const OSSL_PARAM *,BIO *,int) |  | OSSL_PARAM_print_to_bio | 2 |
-| taint.cpp:142:5:142:10 | select | (const OSSL_PROVIDER *,const char *,int) |  | OSSL_PROVIDER_conf_get_bool | 2 |
-| taint.cpp:142:5:142:10 | select | (const SSL *,char *,int) |  | SSL_get_shared_ciphers | 2 |
-| taint.cpp:142:5:142:10 | select | (const SSL *,int,int) |  | apps_ssl_info_callback | 1 |
-| taint.cpp:142:5:142:10 | select | (const SSL *,int,int) |  | apps_ssl_info_callback | 2 |
-| taint.cpp:142:5:142:10 | select | (const SSL_CIPHER *,char *,int) |  | SSL_CIPHER_description | 2 |
-| taint.cpp:142:5:142:10 | select | (const X509 *,const ASN1_OBJECT *,int) |  | X509_get_ext_by_OBJ | 2 |
-| taint.cpp:142:5:142:10 | select | (const X509 *,const stack_st_X509 *,int) |  | OSSL_ESS_signing_cert_new_init | 2 |
-| taint.cpp:142:5:142:10 | select | (const X509 *,int,int) |  | X509_get_ext_by_NID | 1 |
-| taint.cpp:142:5:142:10 | select | (const X509 *,int,int) |  | X509_get_ext_by_NID | 2 |
-| taint.cpp:142:5:142:10 | select | (const X509 *,int,int) |  | X509_get_ext_by_critical | 1 |
-| taint.cpp:142:5:142:10 | select | (const X509 *,int,int) |  | X509_get_ext_by_critical | 2 |
-| taint.cpp:142:5:142:10 | select | (const X509_ACERT *,const ASN1_OBJECT *,int) |  | X509_ACERT_get_attr_by_OBJ | 2 |
-| taint.cpp:142:5:142:10 | select | (const X509_ACERT *,int,int) |  | X509_ACERT_get_attr_by_NID | 1 |
-| taint.cpp:142:5:142:10 | select | (const X509_ACERT *,int,int) |  | X509_ACERT_get_attr_by_NID | 2 |
-| taint.cpp:142:5:142:10 | select | (const X509_CRL *,const ASN1_OBJECT *,int) |  | X509_CRL_get_ext_by_OBJ | 2 |
-| taint.cpp:142:5:142:10 | select | (const X509_CRL *,const X509 *,int) |  | OSSL_CMP_CRLSTATUS_create | 2 |
-| taint.cpp:142:5:142:10 | select | (const X509_CRL *,int,int) |  | X509_CRL_get_ext_by_NID | 1 |
-| taint.cpp:142:5:142:10 | select | (const X509_CRL *,int,int) |  | X509_CRL_get_ext_by_NID | 2 |
-| taint.cpp:142:5:142:10 | select | (const X509_CRL *,int,int) |  | X509_CRL_get_ext_by_critical | 1 |
-| taint.cpp:142:5:142:10 | select | (const X509_CRL *,int,int) |  | X509_CRL_get_ext_by_critical | 2 |
-| taint.cpp:142:5:142:10 | select | (const X509_NAME *,char *,int) |  | X509_NAME_oneline | 2 |
-| taint.cpp:142:5:142:10 | select | (const X509_NAME *,const ASN1_OBJECT *,int) |  | X509_NAME_get_index_by_OBJ | 2 |
-| taint.cpp:142:5:142:10 | select | (const X509_NAME *,int,int) |  | X509_NAME_get_index_by_NID | 1 |
-| taint.cpp:142:5:142:10 | select | (const X509_NAME *,int,int) |  | X509_NAME_get_index_by_NID | 2 |
-| taint.cpp:142:5:142:10 | select | (const X509_REQ *,const ASN1_OBJECT *,int) |  | X509_REQ_get_attr_by_OBJ | 2 |
-| taint.cpp:142:5:142:10 | select | (const X509_REQ *,int,int) |  | X509_REQ_get_attr_by_NID | 1 |
-| taint.cpp:142:5:142:10 | select | (const X509_REQ *,int,int) |  | X509_REQ_get_attr_by_NID | 2 |
-| taint.cpp:142:5:142:10 | select | (const X509_REVOKED *,const ASN1_OBJECT *,int) |  | X509_REVOKED_get_ext_by_OBJ | 2 |
-| taint.cpp:142:5:142:10 | select | (const X509_REVOKED *,int,int) |  | X509_REVOKED_get_ext_by_NID | 1 |
-| taint.cpp:142:5:142:10 | select | (const X509_REVOKED *,int,int) |  | X509_REVOKED_get_ext_by_NID | 2 |
-| taint.cpp:142:5:142:10 | select | (const X509_REVOKED *,int,int) |  | X509_REVOKED_get_ext_by_critical | 1 |
-| taint.cpp:142:5:142:10 | select | (const X509_REVOKED *,int,int) |  | X509_REVOKED_get_ext_by_critical | 2 |
-| taint.cpp:142:5:142:10 | select | (const X509_SIG *,const char *,int) |  | PKCS8_decrypt | 2 |
-| taint.cpp:142:5:142:10 | select | (const char *,char **,int) |  | __strtol | 2 |
-| taint.cpp:142:5:142:10 | select | (const char *,char **,int) |  | __strtoul | 2 |
-| taint.cpp:142:5:142:10 | select | (const char *,char **,int) |  | idn2_to_ascii_8z | 2 |
-| taint.cpp:142:5:142:10 | select | (const char *,const OSSL_PARAM *,int) |  | print_param_types | 2 |
-| taint.cpp:142:5:142:10 | select | (const char *,const char *,int) |  | CRYPTO_strdup | 2 |
-| taint.cpp:142:5:142:10 | select | (const char *,const char *,int) |  | __dcgettext | 2 |
-| taint.cpp:142:5:142:10 | select | (const char *,const char *,int) |  | sqlite3_strnicmp | 2 |
-| taint.cpp:142:5:142:10 | select | (const char *,int,int) |  | __old_strpbrk_c2 | 1 |
-| taint.cpp:142:5:142:10 | select | (const char *,int,int) |  | __old_strpbrk_c2 | 2 |
-| taint.cpp:142:5:142:10 | select | (const char *,long *,int) |  | Jim_StringToWide | 2 |
-| taint.cpp:142:5:142:10 | select | (const char *,size_t *,int) |  | _dl_sysdep_read_whole_file | 2 |
-| taint.cpp:142:5:142:10 | select | (const char *,sqlite3_filename,int) |  | sqlite3_uri_key | 2 |
-| taint.cpp:142:5:142:10 | select | (const char *,void *,int) |  | support_readdir_check | 2 |
-| taint.cpp:142:5:142:10 | select | (const char *,wordexp_t *,int) |  | wordexp | 2 |
-| taint.cpp:142:5:142:10 | select | (const cmsghdr *,uint8_t **,int) |  | inet6_option_find | 2 |
-| taint.cpp:142:5:142:10 | select | (const stack_st_X509_ATTRIBUTE *,const ASN1_OBJECT *,int) |  | X509at_get_attr_by_OBJ | 2 |
-| taint.cpp:142:5:142:10 | select | (const stack_st_X509_ATTRIBUTE *,int,int) |  | X509at_get_attr_by_NID | 1 |
-| taint.cpp:142:5:142:10 | select | (const stack_st_X509_ATTRIBUTE *,int,int) |  | X509at_get_attr_by_NID | 2 |
-| taint.cpp:142:5:142:10 | select | (const stack_st_X509_EXTENSION *,const ASN1_OBJECT *,int) |  | X509v3_get_ext_by_OBJ | 2 |
-| taint.cpp:142:5:142:10 | select | (const stack_st_X509_EXTENSION *,int,int) |  | X509v3_get_ext_by_NID | 1 |
-| taint.cpp:142:5:142:10 | select | (const stack_st_X509_EXTENSION *,int,int) |  | X509v3_get_ext_by_NID | 2 |
-| taint.cpp:142:5:142:10 | select | (const stack_st_X509_EXTENSION *,int,int) |  | X509v3_get_ext_by_critical | 1 |
-| taint.cpp:142:5:142:10 | select | (const stack_st_X509_EXTENSION *,int,int) |  | X509v3_get_ext_by_critical | 2 |
-| taint.cpp:142:5:142:10 | select | (const uint8_t *,uint8_t **,int) |  | idn2_lookup_u8 | 2 |
-| taint.cpp:142:5:142:10 | select | (const unsigned char **,unsigned int,int) |  | ossl_b2i_DSA_after_header | 2 |
-| taint.cpp:142:5:142:10 | select | (const unsigned char **,unsigned int,int) |  | ossl_b2i_RSA_after_header | 2 |
-| taint.cpp:142:5:142:10 | select | (const void *,const void *,int) |  | ossl_is_partially_overlapping | 2 |
-| taint.cpp:142:5:142:10 | select | (const void *,socklen_t,int) |  | res_gethostbyaddr | 2 |
-| taint.cpp:142:5:142:10 | select | (const wchar_t *,wchar_t **,int) |  | __wcstol | 2 |
-| taint.cpp:142:5:142:10 | select | (const wchar_t *,wchar_t **,int) |  | __wcstoul | 2 |
-| taint.cpp:142:5:142:10 | select | (curl_mimepart *,curl_mime *,int) |  | Curl_mime_set_subparts | 2 |
-| taint.cpp:142:5:142:10 | select | (curl_mimepart *,curl_slist *,int) |  | curl_mime_headers | 2 |
-| taint.cpp:142:5:142:10 | select | (database_dyn *,size_t,int) |  | mempool_alloc | 2 |
-| taint.cpp:142:5:142:10 | select | (database_dyn *,time_t,int) |  | prune_cache | 2 |
-| taint.cpp:142:5:142:10 | select | (double,double,int) |  | __kernel_standard | 2 |
-| taint.cpp:142:5:142:10 | select | (float,float,int) |  | __kernel_standard_f | 2 |
-| taint.cpp:142:5:142:10 | select | (gconv_spec *,__gconv_t *,int) |  | __gconv_open | 2 |
-| taint.cpp:142:5:142:10 | select | (gzFile,char *,int) |  | gzgets | 2 |
-| taint.cpp:142:5:142:10 | select | (gzFile,int,int) |  | gzsetparams | 1 |
-| taint.cpp:142:5:142:10 | select | (gzFile,int,int) |  | gzsetparams | 2 |
-| taint.cpp:142:5:142:10 | select | (gzFile,off64_t,int) |  | gzseek64 | 2 |
-| taint.cpp:142:5:142:10 | select | (gzFile,off_t,int) |  | gzseek | 2 |
-| taint.cpp:142:5:142:10 | select | (int *,short *,int) |  | __lll_lock_elision | 2 |
-| taint.cpp:142:5:142:10 | select | (int,BIO_ADDR *,int) |  | BIO_accept_ex | 2 |
-| taint.cpp:142:5:142:10 | select | (int,int,int) |  | ASN1_object_size | 0 |
-| taint.cpp:142:5:142:10 | select | (int,int,int) |  | ASN1_object_size | 1 |
-| taint.cpp:142:5:142:10 | select | (int,int,int) |  | ASN1_object_size | 2 |
-| taint.cpp:142:5:142:10 | select | (int,int,int) |  | EVP_CIPHER_meth_new | 0 |
-| taint.cpp:142:5:142:10 | select | (int,int,int) |  | EVP_CIPHER_meth_new | 1 |
-| taint.cpp:142:5:142:10 | select | (int,int,int) |  | EVP_CIPHER_meth_new | 2 |
-| taint.cpp:142:5:142:10 | select | (long double,long double,int) |  | __kernel_sinl | 2 |
-| taint.cpp:142:5:142:10 | select | (long double,long double,int) |  | __kernel_standard_l | 2 |
-| taint.cpp:142:5:142:10 | select | (long double,long double,int) |  | __kernel_tanl | 2 |
-| taint.cpp:142:5:142:10 | select | (mp_srcptr,int,int) |  | __mpn_construct_double | 1 |
-| taint.cpp:142:5:142:10 | select | (mp_srcptr,int,int) |  | __mpn_construct_double | 2 |
-| taint.cpp:142:5:142:10 | select | (mp_srcptr,int,int) |  | __mpn_construct_float | 1 |
-| taint.cpp:142:5:142:10 | select | (mp_srcptr,int,int) |  | __mpn_construct_float | 2 |
-| taint.cpp:142:5:142:10 | select | (mp_srcptr,int,int) |  | __mpn_construct_float128 | 1 |
-| taint.cpp:142:5:142:10 | select | (mp_srcptr,int,int) |  | __mpn_construct_float128 | 2 |
-| taint.cpp:142:5:142:10 | select | (regex_t *,const char *,int) |  | jim_regcomp | 2 |
-| taint.cpp:142:5:142:10 | select | (requestlist *,requestlist *,int) |  | __aio_remove_request | 2 |
-| taint.cpp:142:5:142:10 | select | (sqlite3 *,const char *,int) |  | sqlite3_overload_function | 2 |
-| taint.cpp:142:5:142:10 | select | (sqlite3 *,int,int) |  | sqlite3_limit | 1 |
-| taint.cpp:142:5:142:10 | select | (sqlite3 *,int,int) |  | sqlite3_limit | 2 |
-| taint.cpp:142:5:142:10 | select | (sqlite3_context *,const char *,int) |  | sqlite3_result_error | 2 |
-| taint.cpp:142:5:142:10 | select | (sqlite3_context *,const void *,int) |  | sqlite3_result_error16 | 2 |
-| taint.cpp:142:5:142:10 | select | (sqlite3_index_info *,int,int) |  | sqlite3_vtab_in | 1 |
-| taint.cpp:142:5:142:10 | select | (sqlite3_index_info *,int,int) |  | sqlite3_vtab_in | 2 |
-| taint.cpp:142:5:142:10 | select | (sqlite3_stmt *,int,int) |  | sqlite3_bind_int | 1 |
-| taint.cpp:142:5:142:10 | select | (sqlite3_stmt *,int,int) |  | sqlite3_bind_int | 2 |
-| taint.cpp:142:5:142:10 | select | (sqlite3_stmt *,int,int) |  | sqlite3_bind_zeroblob | 1 |
-| taint.cpp:142:5:142:10 | select | (sqlite3_stmt *,int,int) |  | sqlite3_bind_zeroblob | 2 |
-| taint.cpp:142:5:142:10 | select | (sqlite3_stmt *,int,int) |  | sqlite3_stmt_status | 1 |
-| taint.cpp:142:5:142:10 | select | (sqlite3_stmt *,int,int) |  | sqlite3_stmt_status | 2 |
-| taint.cpp:142:5:142:10 | select | (sqlite3_str *,const char *,int) |  | sqlite3_str_append | 2 |
-| taint.cpp:142:5:142:10 | select | (sqlite3expert *,int,int) |  | sqlite3_expert_report | 1 |
-| taint.cpp:142:5:142:10 | select | (sqlite3expert *,int,int) |  | sqlite3_expert_report | 2 |
-| taint.cpp:142:5:142:10 | select | (stack_st_ASN1_UTF8STRING *,const char *,int) |  | ossl_cmp_sk_ASN1_UTF8STRING_push_str | 2 |
-| taint.cpp:142:5:142:10 | select | (stack_st_X509 **,X509 *,int) |  | ossl_x509_add_cert_new | 2 |
-| taint.cpp:142:5:142:10 | select | (stack_st_X509 **,stack_st_X509 *,int) |  | ossl_x509_add_certs_new | 2 |
-| taint.cpp:142:5:142:10 | select | (stack_st_X509 *,ASIdentifiers *,int) |  | X509v3_asid_validate_resource_set | 2 |
-| taint.cpp:142:5:142:10 | select | (stack_st_X509 *,IPAddrBlocks *,int) |  | X509v3_addr_validate_resource_set | 2 |
-| taint.cpp:142:5:142:10 | select | (stack_st_X509 *,X509 *,int) |  | X509_add_cert | 2 |
-| taint.cpp:142:5:142:10 | select | (stack_st_X509 *,stack_st_X509 *,int) |  | X509_add_certs | 2 |
-| taint.cpp:142:5:142:10 | select | (stack_st_X509_ALGOR **,int,int) |  | CMS_add_simple_smimecap | 1 |
-| taint.cpp:142:5:142:10 | select | (stack_st_X509_ALGOR **,int,int) |  | CMS_add_simple_smimecap | 2 |
-| taint.cpp:142:5:142:10 | select | (stack_st_X509_ALGOR *,int,int) |  | PKCS7_simple_smimecap | 1 |
-| taint.cpp:142:5:142:10 | select | (stack_st_X509_ALGOR *,int,int) |  | PKCS7_simple_smimecap | 2 |
-| taint.cpp:142:5:142:10 | select | (stack_st_X509_EXTENSION **,X509_EXTENSION *,int) |  | X509v3_add_ext | 2 |
-| taint.cpp:142:5:142:10 | select | (td_thragent_t *,uint32_t *,int) |  | _td_check_sizeof | 2 |
-| taint.cpp:142:5:142:10 | select | (uint8_t[56],const gf,int) |  | gf_serialize | 2 |
-| taint.cpp:142:5:142:10 | select | (uint32_t *,SSL_CONNECTION *,int) |  | ssl_set_sig_mask | 2 |
-| taint.cpp:142:5:142:10 | select | (unsigned char *,const char *,int) |  | data_string | 2 |
-| taint.cpp:142:5:142:10 | select | (unsigned char *,const unsigned char *,int) |  | EVP_DecodeBlock | 2 |
-| taint.cpp:142:5:142:10 | select | (unsigned char *,const unsigned char *,int) |  | EVP_EncodeBlock | 2 |
-| taint.cpp:142:5:142:10 | select | (unsigned char *,uint64_t,int) |  | ossl_i2c_uint64_int | 2 |
-| taint.cpp:142:5:142:10 | select | (unsigned int,const char *,int) |  | _IO_adjust_column | 2 |
-| taint.cpp:142:5:142:10 | select | (unsigned int,const wchar_t *,int) |  | _IO_adjust_wcolumn | 2 |
-| taint.cpp:142:5:142:10 | select | (unsigned int,int,int) |  | ossl_blob_length | 1 |
-| taint.cpp:142:5:142:10 | select | (unsigned int,int,int) |  | ossl_blob_length | 2 |
-| taint.cpp:142:5:142:10 | select | (unsigned long *,const BIGNUM *,int) |  | bn_copy_words | 2 |
-| taint.cpp:142:5:142:10 | select | (unsigned long *,const unsigned long *,int) |  | bn_sqr_words | 2 |
-| taint.cpp:142:5:142:10 | select | (uv__io_t *,uv__io_cb,int) |  | uv__io_init | 2 |
-| taint.cpp:142:5:142:10 | select | (uv_loop_t *,uv_fs_t *,int) |  | uv__iou_fs_read_or_write | 2 |
-| taint.cpp:142:5:142:10 | select | (uv_loop_t *,uv_pipe_t *,int) |  | uv_pipe_init | 2 |
-| taint.cpp:142:5:142:10 | select | (uv_loop_t *,uv_poll_t *,int) |  | uv_poll_init | 2 |
-| taint.cpp:142:5:142:10 | select | (uv_signal_t *,uv_signal_cb,int) |  | uv_signal_start | 2 |
-| taint.cpp:142:5:142:10 | select | (uv_signal_t *,uv_signal_cb,int) |  | uv_signal_start_oneshot | 2 |
-| taint.cpp:142:5:142:10 | select | (uv_stream_t *,int,int) |  | uv__stream_open | 1 |
-| taint.cpp:142:5:142:10 | select | (uv_stream_t *,int,int) |  | uv__stream_open | 2 |
-| taint.cpp:142:5:142:10 | select | (void *,cmsghdr **,int) |  | inet6_option_init | 2 |
-| taint.cpp:142:5:142:10 | select | (void *,const char *,int) |  | CRYPTO_secure_free | 2 |
-| taint.cpp:142:5:142:10 | select | (void *,curl_off_t,int) |  | tool_mime_stdin_seek | 2 |
-| taint.cpp:142:5:142:10 | select | (void *,socklen_t,int) |  | inet6_opt_finish | 2 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | ASN1_STRING_type_new | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | ASN1_tag2bit | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | ASN1_tag2str | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | Jim_ReturnCode | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | Jim_SignalId | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | OBJ_nid2ln | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | OBJ_nid2obj | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | OBJ_nid2sn | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | OSSL_trace_get_category_name | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | PKCS12_init | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | Symbol_Nth | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | X509_PURPOSE_get0 | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | X509_TRUST_get0 | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | X509_TRUST_get_by_id | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | __btowc | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | __current_locale_name | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | __fdopendir | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | __get_errlist | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | __get_errname | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | __math_invalid_i | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | __math_invalidf_i | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | __p_class | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | __p_rcode | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | __p_type | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | __pkey_get | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | __sigdescr_np | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | __strerrordesc_np | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | _tolower | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | _toupper | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | btowc | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | c_tolower | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | c_toupper | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | curlx_sitouz | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | evp_pkey_type2name | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | inet6_option_space | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | isalnum | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | isalpha | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | isblank | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | iscntrl | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | isdigit | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | isgraph | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | islower | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | isprint | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | ispunct | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | isspace | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | isupper | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | isxdigit | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | ossl_tolower | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | ossl_toupper | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | sigabbrev_np | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | sqlite3_compileoption_get | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | sqlite3_errstr | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | strerrorname_np | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | support_report_failure | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | svcudp_create | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | tls13_alert_code | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | toascii | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | tolower | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | toupper | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | uabs | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | uv__accept | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | uv_err_name | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | uv_get_osfhandle | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | uv_strerror | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | uv_translate_sys_error | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) |  | zError | 0 |
-| taint.cpp:150:6:150:12 | fn_test | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| taint.cpp:156:7:156:12 | strcpy | (ASN1_GENERALIZEDTIME *,const char *) |  | ASN1_GENERALIZEDTIME_set_string | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (ASN1_TIME *,const char *) |  | ASN1_TIME_set_string | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (ASN1_TIME *,const char *) |  | ASN1_TIME_set_string_X509 | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (ASN1_UTCTIME *,const char *) |  | ASN1_UTCTIME_set_string | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (BIGNUM **,const char *) |  | BN_asc2bn | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (BIGNUM **,const char *) |  | BN_dec2bn | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (BIGNUM **,const char *) |  | BN_hex2bn | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (CONF *,const char *) |  | TS_CONF_get_tsa_section | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (CONF *,const char *) |  | _CONF_new_section | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (CURLU *,const char *) |  | Curl_url_set_authority | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (Curl_easy *,const char *) |  | Curl_cwriter_get_by_name | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (Curl_easy *,const char *) |  | Curl_rtsp_parseheader | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (DH_METHOD *,const char *) |  | DH_meth_set1_name | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (DSA_METHOD *,const char *) |  | DSA_meth_set1_name | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (DSO *,const char *) |  | DSO_convert_filename | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (DSO *,const char *) |  | DSO_set_filename | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (ENGINE *,const char *) |  | ENGINE_set_id | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (ENGINE *,const char *) |  | ENGINE_set_name | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (ENGINE *,const char *) |  | OSSL_STORE_LOADER_new | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (EVP_PKEY *,const char *) |  | CTLOG_new | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (EVP_PKEY_CTX *,const char *) |  | app_paramgen | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (EVP_PKEY_CTX *,const char *) |  | pkey_ctrl_string | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (GlobalConfig *,const char *) |  | setvariable | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (Jim_Interp *,const char *) |  | Jim_Eval | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (Jim_Interp *,const char *) |  | Jim_EvalFile | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (Jim_Interp *,const char *) |  | Jim_EvalFileGlobal | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (Jim_Interp *,const char *) |  | Jim_EvalGlobal | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (LIBSSH2_AGENT *,const char *) |  | libssh2_agent_set_identity_path | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (LIBSSH2_SESSION *,const char *) |  | libssh2_banner_set | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (LIBSSH2_SESSION *,const char *) |  | libssh2_session_banner_set | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (Lmid_t,const char *) |  | _dl_lookup_map | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (OPENSSL_DIR_CTX **,const char *) |  | OPENSSL_DIR_read | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (OPENSSL_INIT_SETTINGS *,const char *) |  | OPENSSL_INIT_set_config_appname | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (OPENSSL_INIT_SETTINGS *,const char *) |  | OPENSSL_INIT_set_config_filename | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (OSSL_CMP_CTX *,const char *) |  | OSSL_CMP_CTX_set1_no_proxy | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (OSSL_CMP_CTX *,const char *) |  | OSSL_CMP_CTX_set1_proxy | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (OSSL_CMP_CTX *,const char *) |  | OSSL_CMP_CTX_set1_server | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (OSSL_CMP_CTX *,const char *) |  | OSSL_CMP_CTX_set1_serverPath | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (OSSL_DECODER_CTX *,const char *) |  | OSSL_DECODER_CTX_set_input_structure | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (OSSL_DECODER_CTX *,const char *) |  | OSSL_DECODER_CTX_set_input_type | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (OSSL_ENCODER_CTX *,const char *) |  | OSSL_ENCODER_CTX_set_output_structure | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (OSSL_ENCODER_CTX *,const char *) |  | OSSL_ENCODER_CTX_set_output_type | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (OSSL_JSON_ENC *,const char *) |  | ossl_json_key | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (OSSL_JSON_ENC *,const char *) |  | ossl_json_str | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (OSSL_LIB_CTX *,const char *) |  | CMS_ContentInfo_new_ex | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (OSSL_LIB_CTX *,const char *) |  | CTLOG_STORE_new_ex | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (OSSL_LIB_CTX *,const char *) |  | CT_POLICY_EVAL_CTX_new_ex | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (OSSL_LIB_CTX *,const char *) |  | EC_KEY_new_ex | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (OSSL_LIB_CTX *,const char *) |  | OSSL_CMP_CTX_new | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (OSSL_LIB_CTX *,const char *) |  | OSSL_CMP_MSG_new | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (OSSL_LIB_CTX *,const char *) |  | OSSL_CMP_SRV_CTX_new | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (OSSL_LIB_CTX *,const char *) |  | OSSL_PROVIDER_load | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (OSSL_LIB_CTX *,const char *) |  | PKCS7_new_ex | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (OSSL_LIB_CTX *,const char *) |  | SCT_CTX_new | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (OSSL_LIB_CTX *,const char *) |  | TS_RESP_CTX_new_ex | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (OSSL_LIB_CTX *,const char *) |  | X509_CRL_new_ex | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (OSSL_LIB_CTX *,const char *) |  | X509_PUBKEY_new_ex | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (OSSL_LIB_CTX *,const char *) |  | X509_REQ_new_ex | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (OSSL_LIB_CTX *,const char *) |  | X509_STORE_CTX_new_ex | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (OSSL_LIB_CTX *,const char *) |  | X509_new_ex | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (OSSL_LIB_CTX *,const char *) |  | ossl_cmp_mock_srv_new | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (OSSL_LIB_CTX *,const char *) |  | ossl_cms_Data_create | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (OSSL_LIB_CTX *,const char *) |  | ossl_parse_property | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (OSSL_PARAM *,const char *) |  | OSSL_PARAM_locate | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (OSSL_PARAM *,const char *) |  | OSSL_PARAM_set_utf8_ptr | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (OSSL_PARAM *,const char *) |  | OSSL_PARAM_set_utf8_string | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (OSSL_PROVIDER *,const char *) |  | ossl_provider_set_module_path | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (PKCS7 *,const char *) |  | ossl_pkcs7_set1_propq | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (RSA_METHOD *,const char *) |  | RSA_meth_set1_name | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (SSL *,const char *) |  | SSL_add1_host | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (SSL *,const char *) |  | SSL_set1_host | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (SSL *,const char *) |  | SSL_set_cipher_list | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (SSL *,const char *) |  | SSL_use_psk_identity_hint | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (SSL_CONF_CTX *,const char *) |  | SSL_CONF_CTX_set1_prefix | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (SSL_CONF_CTX *,const char *) |  | SSL_CONF_cmd_value_type | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (SSL_CTX *,const char *) |  | SSL_CTX_set_cipher_list | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (SSL_CTX *,const char *) |  | SSL_CTX_use_psk_identity_hint | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (SSL_CTX *,const char *) |  | ossl_quic_set_diag_title | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (SSL_SESSION *,const char *) |  | SSL_SESSION_set1_hostname | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (UI *,const char *) |  | UI_add_error_string | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (UI *,const char *) |  | UI_add_info_string | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (UI *,const char *) |  | UI_dup_error_string | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (UI *,const char *) |  | UI_dup_info_string | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (X509 *,const char *) |  | x509_ctrl_string | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (X509_REQ *,const char *) |  | x509_req_ctrl_string | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (X509_VERIFY_PARAM *,const char *) |  | X509_VERIFY_PARAM_set1_ip_asc | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (X509_VERIFY_PARAM *,const char *) |  | X509_VERIFY_PARAM_set1_name | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (__printf_buffer *,const char *) |  | __printf_buffer_puts_1 | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (alloc_buffer,const char *) |  | __libc_alloc_buffer_copy_string | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (argp_fmtstream_t,const char *) |  | __argp_fmtstream_puts | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (char **,const char *) |  | Curl_setstropt | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (char **,const char *) |  | __strsep | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (char *,const char *) |  | xstrdup | 0 |
-| taint.cpp:156:7:156:12 | strcpy | (char *,const char *) |  | xstrdup | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (const OSSL_PARAM *,const char *) |  | OSSL_PARAM_locate_const | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (const char **,const char *) |  | uv__utf8_decode1 | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (const char *,const char *) |  | Configcmp | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (const char *,const char *) |  | Curl_timestrcmp | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (const char *,const char *) |  | DES_crypt | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (const char *,const char *) |  | OPENSSL_strcasecmp | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (const char *,const char *) |  | __bind_textdomain_codeset | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (const char *,const char *) |  | __bindtextdomain | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (const char *,const char *) |  | __dgettext | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (const char *,const char *) |  | __gconv_compare_alias | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (const char *,const char *) |  | __strcasestr | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (const char *,const char *) |  | __strcspn_generic | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (const char *,const char *) |  | __strcspn_sse42 | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (const char *,const char *) |  | __strpbrk_generic | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (const char *,const char *) |  | __strpbrk_sse42 | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (const char *,const char *) |  | __strspn_generic | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (const char *,const char *) |  | __strspn_sse42 | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (const char *,const char *) |  | __strstr_generic | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (const char *,const char *) |  | __strverscmp | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (const char *,const char *) |  | _dl_cache_libcmp | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (const char *,const char *) |  | advance | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (const char *,const char *) |  | c_strcasecmp | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (const char *,const char *) |  | charmap_aliases | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (const char *,const char *) |  | charmap_open | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (const char *,const char *) |  | chroot_canon | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (const char *,const char *) |  | get_passwd | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (const char *,const char *) |  | gzopen | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (const char *,const char *) |  | gzopen64 | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (const char *,const char *) |  | iconv_open | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (const char *,const char *) |  | openssl_fopen | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (const char *,const char *) |  | ossl_pem_check_suffix | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (const char *,const char *) |  | ossl_v3_name_cmp | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (const char *,const char *) |  | sqlite3_strglob | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (const char *,const char *) |  | sqlite3_stricmp | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (const char *,const char *) |  | step | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (const char *,const char *) |  | tempnam | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (const char *,const char *) |  | xfopen | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (const mntent *,const char *) |  | __hasmntopt | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (const nis_error,const char *) |  | nis_sperror | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (curl_mimepart *,const char *) |  | curl_mime_filedata | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (curl_off_t *,const char *) |  | str2offset | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (curl_pushheaders *,const char *) |  | curl_pushheader_byname | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (curl_slist **,const char *) |  | add2list | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (curl_slist *,const char *) |  | curl_slist_append | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (dynbuf *,const char *) |  | Curl_dyn_add | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (dynbuf *,const char *) |  | curlx_dyn_add | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (dynhds *,const char *) |  | Curl_dynhds_cget | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (dynhds *,const char *) |  | Curl_dynhds_h1_cadd_line | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (gconv_fcts *,const char *) |  | __wcsmbs_named_conv | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (gzFile,const char *) |  | gzputs | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (int,const char *) |  | BIO_meth_new | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (int,const char *) |  | _IO_new_fdopen | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (int,const char *) |  | gzdopen | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (int,const char *) |  | setlocale | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (int,const char *) |  | xsetlocale | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (lemon *,const char *) |  | file_makename | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (long *,const char *) |  | secs2ms | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (long *,const char *) |  | str2num | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (long *,const char *) |  | str2unum | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (nss_module *,const char *) |  | __nss_module_get_function | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (size_t *,const char *) |  | next_protos_parse | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (slist_wc **,const char *) |  | easysrc_add | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (slist_wc *,const char *) |  | slist_wc_append | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (sockaddr_un *,const char *) |  | __sockaddr_un_set | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (sqlite3 *,const char *) |  | sqlite3_declare_vtab | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (sqlite3 *,const char *) |  | sqlite3_get_clientdata | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (sqlite3 *,const char *) |  | sqlite3_wal_checkpoint | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (sqlite3_intck *,const char *) |  | sqlite3_intck_test_sql | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (sqlite3_stmt *,const char *) |  | sqlite3_bind_parameter_index | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (sqlite3_str *,const char *) |  | sqlite3_str_appendall | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (sqlite3_value *,const char *) |  | sqlite3_value_pointer | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (stringtable *,const char *) |  | stringtable_add | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (unsigned char *,const char *) |  | ossl_a2i_ipadd | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (unsigned long *,const char *) |  | set_cert_ex | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (unsigned long *,const char *) |  | set_name_ex | 1 |
-| taint.cpp:156:7:156:12 | strcpy | (uv_pipe_t *,const char *) |  | uv_pipe_bind | 1 |
-| taint.cpp:157:7:157:12 | strcat | (ASN1_GENERALIZEDTIME *,const char *) |  | ASN1_GENERALIZEDTIME_set_string | 1 |
-| taint.cpp:157:7:157:12 | strcat | (ASN1_TIME *,const char *) |  | ASN1_TIME_set_string | 1 |
-| taint.cpp:157:7:157:12 | strcat | (ASN1_TIME *,const char *) |  | ASN1_TIME_set_string_X509 | 1 |
-| taint.cpp:157:7:157:12 | strcat | (ASN1_UTCTIME *,const char *) |  | ASN1_UTCTIME_set_string | 1 |
-| taint.cpp:157:7:157:12 | strcat | (BIGNUM **,const char *) |  | BN_asc2bn | 1 |
-| taint.cpp:157:7:157:12 | strcat | (BIGNUM **,const char *) |  | BN_dec2bn | 1 |
-| taint.cpp:157:7:157:12 | strcat | (BIGNUM **,const char *) |  | BN_hex2bn | 1 |
-| taint.cpp:157:7:157:12 | strcat | (CONF *,const char *) |  | TS_CONF_get_tsa_section | 1 |
-| taint.cpp:157:7:157:12 | strcat | (CONF *,const char *) |  | _CONF_new_section | 1 |
-| taint.cpp:157:7:157:12 | strcat | (CURLU *,const char *) |  | Curl_url_set_authority | 1 |
-| taint.cpp:157:7:157:12 | strcat | (Curl_easy *,const char *) |  | Curl_cwriter_get_by_name | 1 |
-| taint.cpp:157:7:157:12 | strcat | (Curl_easy *,const char *) |  | Curl_rtsp_parseheader | 1 |
-| taint.cpp:157:7:157:12 | strcat | (DH_METHOD *,const char *) |  | DH_meth_set1_name | 1 |
-| taint.cpp:157:7:157:12 | strcat | (DSA_METHOD *,const char *) |  | DSA_meth_set1_name | 1 |
-| taint.cpp:157:7:157:12 | strcat | (DSO *,const char *) |  | DSO_convert_filename | 1 |
-| taint.cpp:157:7:157:12 | strcat | (DSO *,const char *) |  | DSO_set_filename | 1 |
-| taint.cpp:157:7:157:12 | strcat | (ENGINE *,const char *) |  | ENGINE_set_id | 1 |
-| taint.cpp:157:7:157:12 | strcat | (ENGINE *,const char *) |  | ENGINE_set_name | 1 |
-| taint.cpp:157:7:157:12 | strcat | (ENGINE *,const char *) |  | OSSL_STORE_LOADER_new | 1 |
-| taint.cpp:157:7:157:12 | strcat | (EVP_PKEY *,const char *) |  | CTLOG_new | 1 |
-| taint.cpp:157:7:157:12 | strcat | (EVP_PKEY_CTX *,const char *) |  | app_paramgen | 1 |
-| taint.cpp:157:7:157:12 | strcat | (EVP_PKEY_CTX *,const char *) |  | pkey_ctrl_string | 1 |
-| taint.cpp:157:7:157:12 | strcat | (GlobalConfig *,const char *) |  | setvariable | 1 |
-| taint.cpp:157:7:157:12 | strcat | (Jim_Interp *,const char *) |  | Jim_Eval | 1 |
-| taint.cpp:157:7:157:12 | strcat | (Jim_Interp *,const char *) |  | Jim_EvalFile | 1 |
-| taint.cpp:157:7:157:12 | strcat | (Jim_Interp *,const char *) |  | Jim_EvalFileGlobal | 1 |
-| taint.cpp:157:7:157:12 | strcat | (Jim_Interp *,const char *) |  | Jim_EvalGlobal | 1 |
-| taint.cpp:157:7:157:12 | strcat | (LIBSSH2_AGENT *,const char *) |  | libssh2_agent_set_identity_path | 1 |
-| taint.cpp:157:7:157:12 | strcat | (LIBSSH2_SESSION *,const char *) |  | libssh2_banner_set | 1 |
-| taint.cpp:157:7:157:12 | strcat | (LIBSSH2_SESSION *,const char *) |  | libssh2_session_banner_set | 1 |
-| taint.cpp:157:7:157:12 | strcat | (Lmid_t,const char *) |  | _dl_lookup_map | 1 |
-| taint.cpp:157:7:157:12 | strcat | (OPENSSL_DIR_CTX **,const char *) |  | OPENSSL_DIR_read | 1 |
-| taint.cpp:157:7:157:12 | strcat | (OPENSSL_INIT_SETTINGS *,const char *) |  | OPENSSL_INIT_set_config_appname | 1 |
-| taint.cpp:157:7:157:12 | strcat | (OPENSSL_INIT_SETTINGS *,const char *) |  | OPENSSL_INIT_set_config_filename | 1 |
-| taint.cpp:157:7:157:12 | strcat | (OSSL_CMP_CTX *,const char *) |  | OSSL_CMP_CTX_set1_no_proxy | 1 |
-| taint.cpp:157:7:157:12 | strcat | (OSSL_CMP_CTX *,const char *) |  | OSSL_CMP_CTX_set1_proxy | 1 |
-| taint.cpp:157:7:157:12 | strcat | (OSSL_CMP_CTX *,const char *) |  | OSSL_CMP_CTX_set1_server | 1 |
-| taint.cpp:157:7:157:12 | strcat | (OSSL_CMP_CTX *,const char *) |  | OSSL_CMP_CTX_set1_serverPath | 1 |
-| taint.cpp:157:7:157:12 | strcat | (OSSL_DECODER_CTX *,const char *) |  | OSSL_DECODER_CTX_set_input_structure | 1 |
-| taint.cpp:157:7:157:12 | strcat | (OSSL_DECODER_CTX *,const char *) |  | OSSL_DECODER_CTX_set_input_type | 1 |
-| taint.cpp:157:7:157:12 | strcat | (OSSL_ENCODER_CTX *,const char *) |  | OSSL_ENCODER_CTX_set_output_structure | 1 |
-| taint.cpp:157:7:157:12 | strcat | (OSSL_ENCODER_CTX *,const char *) |  | OSSL_ENCODER_CTX_set_output_type | 1 |
-| taint.cpp:157:7:157:12 | strcat | (OSSL_JSON_ENC *,const char *) |  | ossl_json_key | 1 |
-| taint.cpp:157:7:157:12 | strcat | (OSSL_JSON_ENC *,const char *) |  | ossl_json_str | 1 |
-| taint.cpp:157:7:157:12 | strcat | (OSSL_LIB_CTX *,const char *) |  | CMS_ContentInfo_new_ex | 1 |
-| taint.cpp:157:7:157:12 | strcat | (OSSL_LIB_CTX *,const char *) |  | CTLOG_STORE_new_ex | 1 |
-| taint.cpp:157:7:157:12 | strcat | (OSSL_LIB_CTX *,const char *) |  | CT_POLICY_EVAL_CTX_new_ex | 1 |
-| taint.cpp:157:7:157:12 | strcat | (OSSL_LIB_CTX *,const char *) |  | EC_KEY_new_ex | 1 |
-| taint.cpp:157:7:157:12 | strcat | (OSSL_LIB_CTX *,const char *) |  | OSSL_CMP_CTX_new | 1 |
-| taint.cpp:157:7:157:12 | strcat | (OSSL_LIB_CTX *,const char *) |  | OSSL_CMP_MSG_new | 1 |
-| taint.cpp:157:7:157:12 | strcat | (OSSL_LIB_CTX *,const char *) |  | OSSL_CMP_SRV_CTX_new | 1 |
-| taint.cpp:157:7:157:12 | strcat | (OSSL_LIB_CTX *,const char *) |  | OSSL_PROVIDER_load | 1 |
-| taint.cpp:157:7:157:12 | strcat | (OSSL_LIB_CTX *,const char *) |  | PKCS7_new_ex | 1 |
-| taint.cpp:157:7:157:12 | strcat | (OSSL_LIB_CTX *,const char *) |  | SCT_CTX_new | 1 |
-| taint.cpp:157:7:157:12 | strcat | (OSSL_LIB_CTX *,const char *) |  | TS_RESP_CTX_new_ex | 1 |
-| taint.cpp:157:7:157:12 | strcat | (OSSL_LIB_CTX *,const char *) |  | X509_CRL_new_ex | 1 |
-| taint.cpp:157:7:157:12 | strcat | (OSSL_LIB_CTX *,const char *) |  | X509_PUBKEY_new_ex | 1 |
-| taint.cpp:157:7:157:12 | strcat | (OSSL_LIB_CTX *,const char *) |  | X509_REQ_new_ex | 1 |
-| taint.cpp:157:7:157:12 | strcat | (OSSL_LIB_CTX *,const char *) |  | X509_STORE_CTX_new_ex | 1 |
-| taint.cpp:157:7:157:12 | strcat | (OSSL_LIB_CTX *,const char *) |  | X509_new_ex | 1 |
-| taint.cpp:157:7:157:12 | strcat | (OSSL_LIB_CTX *,const char *) |  | ossl_cmp_mock_srv_new | 1 |
-| taint.cpp:157:7:157:12 | strcat | (OSSL_LIB_CTX *,const char *) |  | ossl_cms_Data_create | 1 |
-| taint.cpp:157:7:157:12 | strcat | (OSSL_LIB_CTX *,const char *) |  | ossl_parse_property | 1 |
-| taint.cpp:157:7:157:12 | strcat | (OSSL_PARAM *,const char *) |  | OSSL_PARAM_locate | 1 |
-| taint.cpp:157:7:157:12 | strcat | (OSSL_PARAM *,const char *) |  | OSSL_PARAM_set_utf8_ptr | 1 |
-| taint.cpp:157:7:157:12 | strcat | (OSSL_PARAM *,const char *) |  | OSSL_PARAM_set_utf8_string | 1 |
-| taint.cpp:157:7:157:12 | strcat | (OSSL_PROVIDER *,const char *) |  | ossl_provider_set_module_path | 1 |
-| taint.cpp:157:7:157:12 | strcat | (PKCS7 *,const char *) |  | ossl_pkcs7_set1_propq | 1 |
-| taint.cpp:157:7:157:12 | strcat | (RSA_METHOD *,const char *) |  | RSA_meth_set1_name | 1 |
-| taint.cpp:157:7:157:12 | strcat | (SSL *,const char *) |  | SSL_add1_host | 1 |
-| taint.cpp:157:7:157:12 | strcat | (SSL *,const char *) |  | SSL_set1_host | 1 |
-| taint.cpp:157:7:157:12 | strcat | (SSL *,const char *) |  | SSL_set_cipher_list | 1 |
-| taint.cpp:157:7:157:12 | strcat | (SSL *,const char *) |  | SSL_use_psk_identity_hint | 1 |
-| taint.cpp:157:7:157:12 | strcat | (SSL_CONF_CTX *,const char *) |  | SSL_CONF_CTX_set1_prefix | 1 |
-| taint.cpp:157:7:157:12 | strcat | (SSL_CONF_CTX *,const char *) |  | SSL_CONF_cmd_value_type | 1 |
-| taint.cpp:157:7:157:12 | strcat | (SSL_CTX *,const char *) |  | SSL_CTX_set_cipher_list | 1 |
-| taint.cpp:157:7:157:12 | strcat | (SSL_CTX *,const char *) |  | SSL_CTX_use_psk_identity_hint | 1 |
-| taint.cpp:157:7:157:12 | strcat | (SSL_CTX *,const char *) |  | ossl_quic_set_diag_title | 1 |
-| taint.cpp:157:7:157:12 | strcat | (SSL_SESSION *,const char *) |  | SSL_SESSION_set1_hostname | 1 |
-| taint.cpp:157:7:157:12 | strcat | (UI *,const char *) |  | UI_add_error_string | 1 |
-| taint.cpp:157:7:157:12 | strcat | (UI *,const char *) |  | UI_add_info_string | 1 |
-| taint.cpp:157:7:157:12 | strcat | (UI *,const char *) |  | UI_dup_error_string | 1 |
-| taint.cpp:157:7:157:12 | strcat | (UI *,const char *) |  | UI_dup_info_string | 1 |
-| taint.cpp:157:7:157:12 | strcat | (X509 *,const char *) |  | x509_ctrl_string | 1 |
-| taint.cpp:157:7:157:12 | strcat | (X509_REQ *,const char *) |  | x509_req_ctrl_string | 1 |
-| taint.cpp:157:7:157:12 | strcat | (X509_VERIFY_PARAM *,const char *) |  | X509_VERIFY_PARAM_set1_ip_asc | 1 |
-| taint.cpp:157:7:157:12 | strcat | (X509_VERIFY_PARAM *,const char *) |  | X509_VERIFY_PARAM_set1_name | 1 |
-| taint.cpp:157:7:157:12 | strcat | (__printf_buffer *,const char *) |  | __printf_buffer_puts_1 | 1 |
-| taint.cpp:157:7:157:12 | strcat | (alloc_buffer,const char *) |  | __libc_alloc_buffer_copy_string | 1 |
-| taint.cpp:157:7:157:12 | strcat | (argp_fmtstream_t,const char *) |  | __argp_fmtstream_puts | 1 |
-| taint.cpp:157:7:157:12 | strcat | (char **,const char *) |  | Curl_setstropt | 1 |
-| taint.cpp:157:7:157:12 | strcat | (char **,const char *) |  | __strsep | 1 |
-| taint.cpp:157:7:157:12 | strcat | (char *,const char *) |  | xstrdup | 0 |
-| taint.cpp:157:7:157:12 | strcat | (char *,const char *) |  | xstrdup | 1 |
-| taint.cpp:157:7:157:12 | strcat | (const OSSL_PARAM *,const char *) |  | OSSL_PARAM_locate_const | 1 |
-| taint.cpp:157:7:157:12 | strcat | (const char **,const char *) |  | uv__utf8_decode1 | 1 |
-| taint.cpp:157:7:157:12 | strcat | (const char *,const char *) |  | Configcmp | 1 |
-| taint.cpp:157:7:157:12 | strcat | (const char *,const char *) |  | Curl_timestrcmp | 1 |
-| taint.cpp:157:7:157:12 | strcat | (const char *,const char *) |  | DES_crypt | 1 |
-| taint.cpp:157:7:157:12 | strcat | (const char *,const char *) |  | OPENSSL_strcasecmp | 1 |
-| taint.cpp:157:7:157:12 | strcat | (const char *,const char *) |  | __bind_textdomain_codeset | 1 |
-| taint.cpp:157:7:157:12 | strcat | (const char *,const char *) |  | __bindtextdomain | 1 |
-| taint.cpp:157:7:157:12 | strcat | (const char *,const char *) |  | __dgettext | 1 |
-| taint.cpp:157:7:157:12 | strcat | (const char *,const char *) |  | __gconv_compare_alias | 1 |
-| taint.cpp:157:7:157:12 | strcat | (const char *,const char *) |  | __strcasestr | 1 |
-| taint.cpp:157:7:157:12 | strcat | (const char *,const char *) |  | __strcspn_generic | 1 |
-| taint.cpp:157:7:157:12 | strcat | (const char *,const char *) |  | __strcspn_sse42 | 1 |
-| taint.cpp:157:7:157:12 | strcat | (const char *,const char *) |  | __strpbrk_generic | 1 |
-| taint.cpp:157:7:157:12 | strcat | (const char *,const char *) |  | __strpbrk_sse42 | 1 |
-| taint.cpp:157:7:157:12 | strcat | (const char *,const char *) |  | __strspn_generic | 1 |
-| taint.cpp:157:7:157:12 | strcat | (const char *,const char *) |  | __strspn_sse42 | 1 |
-| taint.cpp:157:7:157:12 | strcat | (const char *,const char *) |  | __strstr_generic | 1 |
-| taint.cpp:157:7:157:12 | strcat | (const char *,const char *) |  | __strverscmp | 1 |
-| taint.cpp:157:7:157:12 | strcat | (const char *,const char *) |  | _dl_cache_libcmp | 1 |
-| taint.cpp:157:7:157:12 | strcat | (const char *,const char *) |  | advance | 1 |
-| taint.cpp:157:7:157:12 | strcat | (const char *,const char *) |  | c_strcasecmp | 1 |
-| taint.cpp:157:7:157:12 | strcat | (const char *,const char *) |  | charmap_aliases | 1 |
-| taint.cpp:157:7:157:12 | strcat | (const char *,const char *) |  | charmap_open | 1 |
-| taint.cpp:157:7:157:12 | strcat | (const char *,const char *) |  | chroot_canon | 1 |
-| taint.cpp:157:7:157:12 | strcat | (const char *,const char *) |  | get_passwd | 1 |
-| taint.cpp:157:7:157:12 | strcat | (const char *,const char *) |  | gzopen | 1 |
-| taint.cpp:157:7:157:12 | strcat | (const char *,const char *) |  | gzopen64 | 1 |
-| taint.cpp:157:7:157:12 | strcat | (const char *,const char *) |  | iconv_open | 1 |
-| taint.cpp:157:7:157:12 | strcat | (const char *,const char *) |  | openssl_fopen | 1 |
-| taint.cpp:157:7:157:12 | strcat | (const char *,const char *) |  | ossl_pem_check_suffix | 1 |
-| taint.cpp:157:7:157:12 | strcat | (const char *,const char *) |  | ossl_v3_name_cmp | 1 |
-| taint.cpp:157:7:157:12 | strcat | (const char *,const char *) |  | sqlite3_strglob | 1 |
-| taint.cpp:157:7:157:12 | strcat | (const char *,const char *) |  | sqlite3_stricmp | 1 |
-| taint.cpp:157:7:157:12 | strcat | (const char *,const char *) |  | step | 1 |
-| taint.cpp:157:7:157:12 | strcat | (const char *,const char *) |  | tempnam | 1 |
-| taint.cpp:157:7:157:12 | strcat | (const char *,const char *) |  | xfopen | 1 |
-| taint.cpp:157:7:157:12 | strcat | (const mntent *,const char *) |  | __hasmntopt | 1 |
-| taint.cpp:157:7:157:12 | strcat | (const nis_error,const char *) |  | nis_sperror | 1 |
-| taint.cpp:157:7:157:12 | strcat | (curl_mimepart *,const char *) |  | curl_mime_filedata | 1 |
-| taint.cpp:157:7:157:12 | strcat | (curl_off_t *,const char *) |  | str2offset | 1 |
-| taint.cpp:157:7:157:12 | strcat | (curl_pushheaders *,const char *) |  | curl_pushheader_byname | 1 |
-| taint.cpp:157:7:157:12 | strcat | (curl_slist **,const char *) |  | add2list | 1 |
-| taint.cpp:157:7:157:12 | strcat | (curl_slist *,const char *) |  | curl_slist_append | 1 |
-| taint.cpp:157:7:157:12 | strcat | (dynbuf *,const char *) |  | Curl_dyn_add | 1 |
-| taint.cpp:157:7:157:12 | strcat | (dynbuf *,const char *) |  | curlx_dyn_add | 1 |
-| taint.cpp:157:7:157:12 | strcat | (dynhds *,const char *) |  | Curl_dynhds_cget | 1 |
-| taint.cpp:157:7:157:12 | strcat | (dynhds *,const char *) |  | Curl_dynhds_h1_cadd_line | 1 |
-| taint.cpp:157:7:157:12 | strcat | (gconv_fcts *,const char *) |  | __wcsmbs_named_conv | 1 |
-| taint.cpp:157:7:157:12 | strcat | (gzFile,const char *) |  | gzputs | 1 |
-| taint.cpp:157:7:157:12 | strcat | (int,const char *) |  | BIO_meth_new | 1 |
-| taint.cpp:157:7:157:12 | strcat | (int,const char *) |  | _IO_new_fdopen | 1 |
-| taint.cpp:157:7:157:12 | strcat | (int,const char *) |  | gzdopen | 1 |
-| taint.cpp:157:7:157:12 | strcat | (int,const char *) |  | setlocale | 1 |
-| taint.cpp:157:7:157:12 | strcat | (int,const char *) |  | xsetlocale | 1 |
-| taint.cpp:157:7:157:12 | strcat | (lemon *,const char *) |  | file_makename | 1 |
-| taint.cpp:157:7:157:12 | strcat | (long *,const char *) |  | secs2ms | 1 |
-| taint.cpp:157:7:157:12 | strcat | (long *,const char *) |  | str2num | 1 |
-| taint.cpp:157:7:157:12 | strcat | (long *,const char *) |  | str2unum | 1 |
-| taint.cpp:157:7:157:12 | strcat | (nss_module *,const char *) |  | __nss_module_get_function | 1 |
-| taint.cpp:157:7:157:12 | strcat | (size_t *,const char *) |  | next_protos_parse | 1 |
-| taint.cpp:157:7:157:12 | strcat | (slist_wc **,const char *) |  | easysrc_add | 1 |
-| taint.cpp:157:7:157:12 | strcat | (slist_wc *,const char *) |  | slist_wc_append | 1 |
-| taint.cpp:157:7:157:12 | strcat | (sockaddr_un *,const char *) |  | __sockaddr_un_set | 1 |
-| taint.cpp:157:7:157:12 | strcat | (sqlite3 *,const char *) |  | sqlite3_declare_vtab | 1 |
-| taint.cpp:157:7:157:12 | strcat | (sqlite3 *,const char *) |  | sqlite3_get_clientdata | 1 |
-| taint.cpp:157:7:157:12 | strcat | (sqlite3 *,const char *) |  | sqlite3_wal_checkpoint | 1 |
-| taint.cpp:157:7:157:12 | strcat | (sqlite3_intck *,const char *) |  | sqlite3_intck_test_sql | 1 |
-| taint.cpp:157:7:157:12 | strcat | (sqlite3_stmt *,const char *) |  | sqlite3_bind_parameter_index | 1 |
-| taint.cpp:157:7:157:12 | strcat | (sqlite3_str *,const char *) |  | sqlite3_str_appendall | 1 |
-| taint.cpp:157:7:157:12 | strcat | (sqlite3_value *,const char *) |  | sqlite3_value_pointer | 1 |
-| taint.cpp:157:7:157:12 | strcat | (stringtable *,const char *) |  | stringtable_add | 1 |
-| taint.cpp:157:7:157:12 | strcat | (unsigned char *,const char *) |  | ossl_a2i_ipadd | 1 |
-| taint.cpp:157:7:157:12 | strcat | (unsigned long *,const char *) |  | set_cert_ex | 1 |
-| taint.cpp:157:7:157:12 | strcat | (unsigned long *,const char *) |  | set_name_ex | 1 |
-| taint.cpp:157:7:157:12 | strcat | (uv_pipe_t *,const char *) |  | uv_pipe_bind | 1 |
-| taint.cpp:180:7:180:12 | callee | (int *) |  | rresvport | 0 |
-| taint.cpp:190:7:190:12 | memcpy | (ASN1_BIT_STRING *,int,int) |  | ASN1_BIT_STRING_set_bit | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (ASN1_BIT_STRING *,unsigned char *,int) |  | ASN1_BIT_STRING_set | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (ASN1_OCTET_STRING **,const unsigned char *,int) |  | ossl_cmp_asn1_octet_string_set1_bytes | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (ASN1_OCTET_STRING *,const unsigned char *,int) |  | ASN1_OCTET_STRING_set | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (ASN1_STRING *,const void *,int) |  | ASN1_STRING_set | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (ASN1_STRING *,void *,int) |  | ASN1_STRING_set0 | 1 |
-| taint.cpp:190:7:190:12 | memcpy | (ASN1_STRING *,void *,int) |  | ASN1_STRING_set0 | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (ASN1_TIME *,tm *,int) |  | ossl_asn1_time_from_tm | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (ASN1_TYPE *,unsigned char *,int) |  | ASN1_TYPE_set_octetstring | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (ASN1_VALUE **,const ASN1_ITEM *,int) |  | ossl_asn1_item_embed_free | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (ASN1_VALUE **,const ASN1_ITEM *,int) |  | ossl_asn1_primitive_free | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (BIGNUM *,const BIGNUM *,int) |  | BN_lshift | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (BIGNUM *,const BIGNUM *,int) |  | BN_rshift | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (BIGNUM *,const BIGNUM *,int) |  | BN_with_flags | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (BIGNUM *,const BIGNUM *,int) |  | bn_lshift_fixed_top | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (BIGNUM *,const BIGNUM *,int) |  | bn_rshift_fixed_top | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (BIGNUM *,const unsigned long *,int) |  | bn_set_static_words | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (BIGNUM *,const unsigned long *,int) |  | bn_set_words | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (BIO *,BIO *,int) |  | OSSL_HTTP_REQ_CTX_new | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (BIO *,BIO *,int) |  | SMIME_crlf_copy | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (BIO *,GENERAL_NAMES *,int) |  | OSSL_GENERAL_NAMES_print | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (BIO *,char *,int) |  | BIO_get_line | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (BIO *,const DSA *,int) |  | DSA_print | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (BIO *,const RSA *,int) |  | RSA_print | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (CERT *,X509_STORE **,int) |  | ssl_cert_get_cert_store | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (CRYPTO_THREAD_ROUTINE,void *,int) |  | ossl_crypto_thread_native_start | 1 |
-| taint.cpp:190:7:190:12 | memcpy | (CRYPTO_THREAD_ROUTINE,void *,int) |  | ossl_crypto_thread_native_start | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (Curl_easy *,connectdata *,int) |  | Curl_conn_cf_discard_all | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (Curl_easy *,connectdata *,int) |  | Curl_http2_may_switch | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (Curl_easy *,connectdata *,int) |  | Curl_http2_switch | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (Curl_easy *,connectdata *,int) |  | Curl_ssl_cfilter_add | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (Curl_sockaddr_ex *,const Curl_addrinfo *,int) |  | Curl_sock_assign_addr | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (DH *,const OSSL_PARAM[],int) |  | ossl_dh_key_fromdata | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (DSA *,const OSSL_PARAM[],int) |  | ossl_dsa_key_fromdata | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (ECX_KEY *,const OSSL_PARAM[],int) |  | ossl_ecx_key_fromdata | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (EC_KEY *,const OSSL_PARAM[],int) |  | ossl_ec_key_fromdata | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (ENGINE *,ENGINE_DYNAMIC_ID,int) |  | engine_add_dynamic_id | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (EVP_PKEY *,EVP_KEYMGMT *,int) |  | evp_keymgmt_util_export_to_provider | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (EVP_PKEY *,EVP_KEYMGMT *,int) |  | evp_keymgmt_util_find_operation_cache | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (EVP_PKEY *,EVP_PKEY *,int) |  | evp_keymgmt_util_copy | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (EVP_PKEY_CTX *,EVP_PKEY *,int) |  | EVP_PKEY_derive_set_peer_ex | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (EVP_PKEY_CTX *,const char *,int) |  | EVP_PKEY_CTX_set1_pbe_pass | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (EVP_PKEY_CTX *,const unsigned char *,int) |  | EVP_PKEY_CTX_add1_hkdf_info | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (EVP_PKEY_CTX *,const unsigned char *,int) |  | EVP_PKEY_CTX_add1_tls1_prf_seed | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (EVP_PKEY_CTX *,const unsigned char *,int) |  | EVP_PKEY_CTX_set1_hkdf_key | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (EVP_PKEY_CTX *,const unsigned char *,int) |  | EVP_PKEY_CTX_set1_hkdf_salt | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (EVP_PKEY_CTX *,const unsigned char *,int) |  | EVP_PKEY_CTX_set1_scrypt_salt | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (EVP_PKEY_CTX *,const unsigned char *,int) |  | EVP_PKEY_CTX_set1_tls1_prf_secret | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (EVP_PKEY_CTX *,const unsigned char *,int) |  | EVP_PKEY_CTX_set_mac_key | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (EVP_PKEY_CTX *,const void *,int) |  | EVP_PKEY_CTX_set1_id | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (EVP_PKEY_CTX *,int *,int) |  | EVP_PKEY_CTX_set0_keygen_info | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (FFC_PARAMS *,unsigned int,int) |  | ossl_ffc_params_enable_flags | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (FILE *,_IO_marker *,int) |  | _IO_seekmark | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (FILE *,_IO_marker *,int) |  | _IO_seekwmark | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (FILE *,__FILE *,int) |  | fwide | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (FILE *,const DSA *,int) |  | DSA_print_fp | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (FILE *,const RSA *,int) |  | RSA_print_fp | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (FILE *,off64_t,int) |  | _IO_cookie_seek | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (FILE *,rule *,int) |  | RulePrint | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (FTS *,FTSENT *,int) |  | fts_set | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (Jim_Interp *,Jim_Obj *,int) |  | Jim_GetCommand | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (Jim_Interp *,Jim_Obj *,int) |  | Jim_GetGlobalVariable | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (Jim_Interp *,Jim_Obj *,int) |  | Jim_GetVariable | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (Jim_Interp *,Jim_Obj *,int) |  | Jim_ListGetIndex | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (Jim_Interp *,Jim_Obj *,int) |  | Jim_UnsetVariable | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (Jim_Interp *,Jim_Obj *const *,int) |  | Jim_NewDictObj | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (Jim_Interp *,Jim_Obj *const *,int) |  | Jim_NewListObj | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (Jim_Interp *,char *,int) |  | Jim_NewStringObjNoAlloc | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (Jim_Interp *,const char *,int) |  | Jim_GetGlobalVariableStr | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (Jim_Interp *,const char *,int) |  | Jim_GetVariableStr | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (Jim_Interp *,const char *,int) |  | Jim_MakeTempFile | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (Jim_Interp *,const char *,int) |  | Jim_NewStringObj | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (Jim_Interp *,const char *,int) |  | Jim_NewStringObjUtf8 | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (LIBSSH2_SESSION *,int,int) |  | libssh2_session_flag | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (LIBSSH2_SFTP_HANDLE *,LIBSSH2_SFTP_ATTRIBUTES *,int) |  | libssh2_sftp_fstat_ex | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (OCSP_BASICRESP *,OCSP_CERTID *,int) |  | OCSP_resp_find | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (OCSP_BASICRESP *,X509_EXTENSION *,int) |  | OCSP_BASICRESP_add_ext | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (OCSP_BASICRESP *,const ASN1_OBJECT *,int) |  | OCSP_BASICRESP_get_ext_by_OBJ | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (OCSP_BASICRESP *,int,int) |  | OCSP_BASICRESP_get_ext_by_NID | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (OCSP_BASICRESP *,int,int) |  | OCSP_BASICRESP_get_ext_by_critical | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (OCSP_ONEREQ *,X509_EXTENSION *,int) |  | OCSP_ONEREQ_add_ext | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (OCSP_ONEREQ *,const ASN1_OBJECT *,int) |  | OCSP_ONEREQ_get_ext_by_OBJ | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (OCSP_ONEREQ *,int,int) |  | OCSP_ONEREQ_get_ext_by_NID | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (OCSP_ONEREQ *,int,int) |  | OCSP_ONEREQ_get_ext_by_critical | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (OCSP_REQUEST *,X509_EXTENSION *,int) |  | OCSP_REQUEST_add_ext | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (OCSP_REQUEST *,const ASN1_OBJECT *,int) |  | OCSP_REQUEST_get_ext_by_OBJ | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (OCSP_REQUEST *,int,int) |  | OCSP_REQUEST_get_ext_by_NID | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (OCSP_REQUEST *,int,int) |  | OCSP_REQUEST_get_ext_by_critical | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (OCSP_SINGLERESP *,X509_EXTENSION *,int) |  | OCSP_SINGLERESP_add_ext | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (OCSP_SINGLERESP *,const ASN1_OBJECT *,int) |  | OCSP_SINGLERESP_get_ext_by_OBJ | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (OCSP_SINGLERESP *,int,int) |  | OCSP_SINGLERESP_get_ext_by_NID | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (OCSP_SINGLERESP *,int,int) |  | OCSP_SINGLERESP_get_ext_by_critical | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (OPENSSL_STACK *,const void *,int) |  | OPENSSL_sk_insert | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (OSSL_CMP_CTX *,const unsigned char *,int) |  | OSSL_CMP_CTX_set1_referenceValue | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (OSSL_CMP_CTX *,const unsigned char *,int) |  | OSSL_CMP_CTX_set1_secretValue | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (OSSL_CMP_CTX *,int,int) |  | OSSL_CMP_CTX_set_option | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (OSSL_LIB_CTX *,const char *,int) |  | EC_GROUP_new_by_curve_name_ex | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (OSSL_LIB_CTX *,const char *,int) |  | EC_KEY_new_by_curve_name_ex | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (OSSL_LIB_CTX *,const char *,int) |  | OSSL_PROVIDER_try_load | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (OSSL_LIB_CTX *,const char *,int) |  | ossl_ml_dsa_key_new | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (OSSL_LIB_CTX *,const char *,int) |  | ossl_ml_kem_key_new | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (OSSL_LIB_CTX *,const char *,int) |  | ossl_parse_query | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (OSSL_LIB_CTX *,const char *,int) |  | ossl_property_name | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (OSSL_LIB_CTX *,const char *,int) |  | ossl_property_value | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (OSSL_PROVIDER *,OSSL_PROVIDER **,int) |  | ossl_provider_add_to_store | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (OSSL_QRL_ENC_LEVEL_SET *,uint32_t,int) |  | ossl_qrl_enc_level_set_get | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (PKCS7 *,stack_st_X509 *,int) |  | PKCS7_get0_signers | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (POLICYINFO *,const ASN1_OBJECT *,int) |  | ossl_policy_data_new | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (PROV_CTX *,const char *,int) |  | ossl_prov_ctx_get_bool_param | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (PROV_CTX *,const char *,int) |  | ossl_prov_ml_dsa_new | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (PROV_CTX *,const char *,int) |  | ossl_prov_ml_kem_new | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (QLOG *,uint32_t,int) |  | ossl_qlog_set_event_type_enabled | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (QUIC_RXFC *,uint64_t,int) |  | ossl_quic_rxfc_on_rx_stream_frame | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (QUIC_STREAM_ITER *,QUIC_STREAM_MAP *,int) |  | ossl_quic_stream_iter_init | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (QUIC_STREAM_MAP *,uint64_t,int) |  | ossl_quic_stream_map_alloc | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (RSA *,const OSSL_PARAM[],int) |  | ossl_rsa_fromdata | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (SSL *,const unsigned char *,int) |  | SSL_use_certificate_ASN1 | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (SSL *,const void *,int) |  | SSL_write | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (SSL *,void *,int) |  | SSL_peek | 1 |
-| taint.cpp:190:7:190:12 | memcpy | (SSL *,void *,int) |  | SSL_peek | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (SSL *,void *,int) |  | SSL_read | 1 |
-| taint.cpp:190:7:190:12 | memcpy | (SSL *,void *,int) |  | SSL_read | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (SSL *,void *,int) |  | SSL_set_session_ticket_ext | 1 |
-| taint.cpp:190:7:190:12 | memcpy | (SSL *,void *,int) |  | SSL_set_session_ticket_ext | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (SSL_CIPHER *,const SSL_CIPHER *,int) |  | OBJ_bsearch_ssl_cipher_id | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (SSL_CONNECTION *,PACKET *,int) |  | ssl_cache_cipherlist | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (SSL_CONNECTION *,WPACKET *,int) |  | dtls1_close_construct_packet | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (SSL_CONNECTION *,WPACKET *,int) |  | dtls1_set_handshake_header | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (SSL_CONNECTION *,WPACKET *,int) |  | tls_close_construct_packet | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (SSL_CONNECTION *,int,int) |  | ssl3_send_alert | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (TS_MSG_IMPRINT *,unsigned char *,int) |  | TS_MSG_IMPRINT_set_msg | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (TS_REQ *,X509_EXTENSION *,int) |  | TS_REQ_add_ext | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (TS_REQ *,const ASN1_OBJECT *,int) |  | TS_REQ_get_ext_by_OBJ | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (TS_REQ *,int,int) |  | TS_REQ_get_ext_by_NID | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (TS_REQ *,int,int) |  | TS_REQ_get_ext_by_critical | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (TS_TST_INFO *,X509_EXTENSION *,int) |  | TS_TST_INFO_add_ext | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (TS_TST_INFO *,const ASN1_OBJECT *,int) |  | TS_TST_INFO_get_ext_by_OBJ | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (TS_TST_INFO *,int,int) |  | TS_TST_INFO_get_ext_by_NID | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (TS_TST_INFO *,int,int) |  | TS_TST_INFO_get_ext_by_critical | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (X509 *,X509_EXTENSION *,int) |  | X509_add_ext | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (X509 *,int,int) |  | X509_check_purpose | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (X509 *,int,int) |  | X509_check_trust | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (X509_CRL *,X509_EXTENSION *,int) |  | X509_CRL_add_ext | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (X509_PUBKEY *,unsigned char *,int) |  | X509_PUBKEY_set0_public_key | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (X509_REVOKED *,X509_EXTENSION *,int) |  | X509_REVOKED_add_ext | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (X509_STORE_CTX *,X509 *,int) |  | ossl_x509_check_cert_time | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (XCHAR *,const XCHAR *,int) | CSimpleStringT | CopyChars | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (XCHAR *,const XCHAR *,int) | CSimpleStringT | CopyCharsOverlapped | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (_Float128,_Float128,int) |  | __kernel_sinf128 | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (_Float128,_Float128,int) |  | __kernel_tanf128 | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (_IO_strfile *,const char *,int) |  | _IO_str_init_readonly | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (action *,FILE *,int) |  | PrintAction | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (acttab *,int,int) |  | acttab_action | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (char *,size_t,int) |  | __argz_stringify | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const ASN1_VALUE *,const ASN1_TEMPLATE *,int) |  | ossl_asn1_do_adb | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const BIGNUM *,int[],int) |  | BN_GF2m_poly2arr | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const BIGNUM *,unsigned char *,int) |  | BN_bn2binpad | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const BIGNUM *,unsigned char *,int) |  | BN_bn2lebinpad | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const BIGNUM *,unsigned char *,int) |  | BN_bn2nativepad | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const BIGNUM *,unsigned char *,int) |  | BN_signed_bn2bin | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const BIGNUM *,unsigned char *,int) |  | BN_signed_bn2lebin | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const BIGNUM *,unsigned char *,int) |  | BN_signed_bn2native | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const CMS_ContentInfo *,BIO *,int) |  | ossl_cms_DigestedData_do_final | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const CMS_SignerInfo *,const ASN1_OBJECT *,int) |  | CMS_signed_get_attr_by_OBJ | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const CMS_SignerInfo *,const ASN1_OBJECT *,int) |  | CMS_unsigned_get_attr_by_OBJ | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const CMS_SignerInfo *,int,int) |  | CMS_signed_get_attr_by_NID | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const CMS_SignerInfo *,int,int) |  | CMS_unsigned_get_attr_by_NID | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const Curl_easy *,const connectdata *,int) |  | Curl_conn_is_http2 | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const EVP_MD *,const EVP_MD *,int) |  | ossl_rsa_pss_params_create | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const EVP_PKEY *,const ASN1_OBJECT *,int) |  | EVP_PKEY_get_attr_by_OBJ | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const EVP_PKEY *,int,int) |  | EVP_PKEY_get_attr_by_NID | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const OSSL_PARAM *,BIO *,int) |  | OSSL_PARAM_print_to_bio | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const OSSL_PROVIDER *,const char *,int) |  | OSSL_PROVIDER_conf_get_bool | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const SSL *,char *,int) |  | SSL_get_shared_ciphers | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const SSL *,int,int) |  | apps_ssl_info_callback | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const SSL_CIPHER *,char *,int) |  | SSL_CIPHER_description | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const X509 *,const ASN1_OBJECT *,int) |  | X509_get_ext_by_OBJ | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const X509 *,const stack_st_X509 *,int) |  | OSSL_ESS_signing_cert_new_init | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const X509 *,int,int) |  | X509_get_ext_by_NID | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const X509 *,int,int) |  | X509_get_ext_by_critical | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const X509_ACERT *,const ASN1_OBJECT *,int) |  | X509_ACERT_get_attr_by_OBJ | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const X509_ACERT *,int,int) |  | X509_ACERT_get_attr_by_NID | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const X509_CRL *,const ASN1_OBJECT *,int) |  | X509_CRL_get_ext_by_OBJ | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const X509_CRL *,const X509 *,int) |  | OSSL_CMP_CRLSTATUS_create | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const X509_CRL *,int,int) |  | X509_CRL_get_ext_by_NID | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const X509_CRL *,int,int) |  | X509_CRL_get_ext_by_critical | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const X509_NAME *,char *,int) |  | X509_NAME_oneline | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const X509_NAME *,const ASN1_OBJECT *,int) |  | X509_NAME_get_index_by_OBJ | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const X509_NAME *,int,int) |  | X509_NAME_get_index_by_NID | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const X509_REQ *,const ASN1_OBJECT *,int) |  | X509_REQ_get_attr_by_OBJ | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const X509_REQ *,int,int) |  | X509_REQ_get_attr_by_NID | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const X509_REVOKED *,const ASN1_OBJECT *,int) |  | X509_REVOKED_get_ext_by_OBJ | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const X509_REVOKED *,int,int) |  | X509_REVOKED_get_ext_by_NID | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const X509_REVOKED *,int,int) |  | X509_REVOKED_get_ext_by_critical | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const X509_SIG *,const char *,int) |  | PKCS8_decrypt | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const char *,char **,int) |  | __strtol | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const char *,char **,int) |  | __strtoul | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const char *,char **,int) |  | idn2_to_ascii_8z | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const char *,const OSSL_PARAM *,int) |  | print_param_types | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const char *,const char *,int) |  | CRYPTO_strdup | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const char *,const char *,int) |  | __dcgettext | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const char *,const char *,int) |  | sqlite3_strnicmp | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const char *,int,int) |  | __old_strpbrk_c2 | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const char *,long *,int) |  | Jim_StringToWide | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const char *,size_t *,int) |  | _dl_sysdep_read_whole_file | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const char *,sqlite3_filename,int) |  | sqlite3_uri_key | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const char *,void *,int) |  | support_readdir_check | 1 |
-| taint.cpp:190:7:190:12 | memcpy | (const char *,void *,int) |  | support_readdir_check | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const char *,wordexp_t *,int) |  | wordexp | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const cmsghdr *,uint8_t **,int) |  | inet6_option_find | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const stack_st_X509_ATTRIBUTE *,const ASN1_OBJECT *,int) |  | X509at_get_attr_by_OBJ | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const stack_st_X509_ATTRIBUTE *,int,int) |  | X509at_get_attr_by_NID | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const stack_st_X509_EXTENSION *,const ASN1_OBJECT *,int) |  | X509v3_get_ext_by_OBJ | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const stack_st_X509_EXTENSION *,int,int) |  | X509v3_get_ext_by_NID | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const stack_st_X509_EXTENSION *,int,int) |  | X509v3_get_ext_by_critical | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const uint8_t *,uint8_t **,int) |  | idn2_lookup_u8 | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const unsigned char **,unsigned int,int) |  | ossl_b2i_DSA_after_header | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const unsigned char **,unsigned int,int) |  | ossl_b2i_RSA_after_header | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const void *,const void *,int) |  | ossl_is_partially_overlapping | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const void *,socklen_t,int) |  | res_gethostbyaddr | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const wchar_t *,wchar_t **,int) |  | __wcstol | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (const wchar_t *,wchar_t **,int) |  | __wcstoul | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (curl_mimepart *,curl_mime *,int) |  | Curl_mime_set_subparts | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (curl_mimepart *,curl_slist *,int) |  | curl_mime_headers | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (database_dyn *,size_t,int) |  | mempool_alloc | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (database_dyn *,time_t,int) |  | prune_cache | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (double,double,int) |  | __kernel_standard | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (float,float,int) |  | __kernel_standard_f | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (gconv_spec *,__gconv_t *,int) |  | __gconv_open | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (gzFile,char *,int) |  | gzgets | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (gzFile,int,int) |  | gzsetparams | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (gzFile,off64_t,int) |  | gzseek64 | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (gzFile,off_t,int) |  | gzseek | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (int *,short *,int) |  | __lll_lock_elision | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (int,BIO_ADDR *,int) |  | BIO_accept_ex | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (int,int,int) |  | ASN1_object_size | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (int,int,int) |  | EVP_CIPHER_meth_new | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (long double,long double,int) |  | __kernel_sinl | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (long double,long double,int) |  | __kernel_standard_l | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (long double,long double,int) |  | __kernel_tanl | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (mp_srcptr,int,int) |  | __mpn_construct_double | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (mp_srcptr,int,int) |  | __mpn_construct_float | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (mp_srcptr,int,int) |  | __mpn_construct_float128 | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (regex_t *,const char *,int) |  | jim_regcomp | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (requestlist *,requestlist *,int) |  | __aio_remove_request | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (sqlite3 *,const char *,int) |  | sqlite3_overload_function | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (sqlite3 *,int,int) |  | sqlite3_limit | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (sqlite3_context *,const char *,int) |  | sqlite3_result_error | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (sqlite3_context *,const void *,int) |  | sqlite3_result_error16 | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (sqlite3_index_info *,int,int) |  | sqlite3_vtab_in | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (sqlite3_stmt *,int,int) |  | sqlite3_bind_int | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (sqlite3_stmt *,int,int) |  | sqlite3_bind_zeroblob | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (sqlite3_stmt *,int,int) |  | sqlite3_stmt_status | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (sqlite3_str *,const char *,int) |  | sqlite3_str_append | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (sqlite3expert *,int,int) |  | sqlite3_expert_report | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (stack_st_ASN1_UTF8STRING *,const char *,int) |  | ossl_cmp_sk_ASN1_UTF8STRING_push_str | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (stack_st_X509 **,X509 *,int) |  | ossl_x509_add_cert_new | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (stack_st_X509 **,stack_st_X509 *,int) |  | ossl_x509_add_certs_new | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (stack_st_X509 *,ASIdentifiers *,int) |  | X509v3_asid_validate_resource_set | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (stack_st_X509 *,IPAddrBlocks *,int) |  | X509v3_addr_validate_resource_set | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (stack_st_X509 *,X509 *,int) |  | X509_add_cert | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (stack_st_X509 *,stack_st_X509 *,int) |  | X509_add_certs | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (stack_st_X509_ALGOR **,int,int) |  | CMS_add_simple_smimecap | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (stack_st_X509_ALGOR *,int,int) |  | PKCS7_simple_smimecap | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (stack_st_X509_EXTENSION **,X509_EXTENSION *,int) |  | X509v3_add_ext | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (td_thragent_t *,uint32_t *,int) |  | _td_check_sizeof | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (uint8_t[56],const gf,int) |  | gf_serialize | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (uint32_t *,SSL_CONNECTION *,int) |  | ssl_set_sig_mask | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (unsigned char *,const char *,int) |  | data_string | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (unsigned char *,const unsigned char *,int) |  | EVP_DecodeBlock | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (unsigned char *,const unsigned char *,int) |  | EVP_EncodeBlock | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (unsigned char *,uint64_t,int) |  | ossl_i2c_uint64_int | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (unsigned int,const char *,int) |  | _IO_adjust_column | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (unsigned int,const wchar_t *,int) |  | _IO_adjust_wcolumn | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (unsigned int,int,int) |  | ossl_blob_length | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (unsigned long *,const BIGNUM *,int) |  | bn_copy_words | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (unsigned long *,const unsigned long *,int) |  | bn_sqr_words | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (uv__io_t *,uv__io_cb,int) |  | uv__io_init | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (uv_loop_t *,uv_fs_t *,int) |  | uv__iou_fs_read_or_write | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (uv_loop_t *,uv_pipe_t *,int) |  | uv_pipe_init | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (uv_loop_t *,uv_poll_t *,int) |  | uv_poll_init | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (uv_signal_t *,uv_signal_cb,int) |  | uv_signal_start | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (uv_signal_t *,uv_signal_cb,int) |  | uv_signal_start_oneshot | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (uv_stream_t *,int,int) |  | uv__stream_open | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (void *,cmsghdr **,int) |  | inet6_option_init | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (void *,const char *,int) |  | CRYPTO_secure_free | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (void *,curl_off_t,int) |  | tool_mime_stdin_seek | 2 |
-| taint.cpp:190:7:190:12 | memcpy | (void *,socklen_t,int) |  | inet6_opt_finish | 2 |
-| taint.cpp:192:6:192:16 | test_memcpy | (int *) |  | rresvport | 0 |
-| taint.cpp:249:13:249:13 | _FUN | (ASN1_STRING *,int) |  | ASN1_STRING_length_set | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (ASYNC_WAIT_CTX *,int) |  | ASYNC_WAIT_CTX_set_status | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (BIGNUM *,int) |  | BN_clear_bit | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (BIGNUM *,int) |  | BN_mask_bits | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (BIGNUM *,int) |  | BN_set_bit | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (BIGNUM *,int) |  | BN_set_flags | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (BIGNUM *,int) |  | bn_expand2 | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (BIGNUM *,int) |  | bn_wexpand | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (BIGNUM *,int) |  | ossl_bn_mask_bits_fixed_top | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (BIO *,int) |  | BIO_clear_flags | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (BIO *,int) |  | BIO_find_type | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (BIO *,int) |  | BIO_set_flags | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (BIO *,int) |  | BIO_set_init | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (BIO *,int) |  | BIO_set_retry_reason | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (BIO *,int) |  | BIO_set_shutdown | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (BIO *,int) |  | TXT_DB_read | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (CMS_SignerInfo *,int) |  | CMS_signed_delete_attr | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (CMS_SignerInfo *,int) |  | CMS_unsigned_delete_attr | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (CURL *,int) |  | curl_easy_pause | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (Curl_easy *,int) |  | Curl_conn_get_socket | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (DH *,int) |  | DH_clear_flags | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (DH *,int) |  | DH_set_flags | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (DH_METHOD *,int) |  | DH_meth_set_flags | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (DSA *,int) |  | DSA_clear_flags | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (DSA *,int) |  | DSA_set_flags | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (DSA_METHOD *,int) |  | DSA_meth_set_flags | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (EC_GROUP *,int) |  | EC_GROUP_set_asn1_flag | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (EC_GROUP *,int) |  | EC_GROUP_set_curve_name | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (EC_KEY *,int) |  | EC_KEY_clear_flags | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (EC_KEY *,int) |  | EC_KEY_set_asn1_flag | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (EC_KEY *,int) |  | EC_KEY_set_flags | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (ENGINE *,int) |  | ENGINE_cmd_is_executable | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (ENGINE *,int) |  | ENGINE_set_flags | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (EVP_CIPHER *,int) |  | EVP_CIPHER_meth_set_impl_ctx_size | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (EVP_CIPHER *,int) |  | EVP_CIPHER_meth_set_iv_length | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_clear_flags | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_flags | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_key_length | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_num | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (EVP_KEYMGMT *,int) |  | evp_keymgmt_util_query_operation_name | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (EVP_MD *,int) |  | EVP_MD_meth_set_app_datasize | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (EVP_MD *,int) |  | EVP_MD_meth_set_input_blocksize | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (EVP_MD *,int) |  | EVP_MD_meth_set_result_size | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (EVP_MD_CTX *,int) |  | EVP_MD_CTX_clear_flags | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (EVP_MD_CTX *,int) |  | EVP_MD_CTX_set_flags | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (EVP_PKEY *,int) |  | EVP_PKEY_delete_attr | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (EVP_PKEY *,int) |  | EVP_PKEY_save_parameters | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (EVP_PKEY *,int) |  | EVP_PKEY_set_type | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_get_keygen_info | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_kdf_type | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_nid | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_paramgen_type | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_rfc5114 | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dhx_rfc5114 | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ec_param_enc | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ec_paramgen_curve_nid | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ecdh_kdf_type | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_hkdf_mode | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_rsa_padding | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_rsa_pss_saltlen | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_gindex | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_h | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_pcounter | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (FILE *,int) |  | _IO_default_pbackfail | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (FILE *,int) |  | _IO_fwide | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (FILE *,int) |  | _IO_init | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (FILE *,int) |  | _IO_init_internal | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (FILE *,int) |  | _IO_new_file_attach | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (FILE *,int) |  | _IO_new_file_overflow | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (FILE *,int) |  | _IO_old_init | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (FILE *,int) |  | _IO_sputbackc | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (FILE *,int) |  | _IO_str_overflow | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (FILE *,int) |  | _IO_str_pbackfail | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (FILE *,int) |  | __printf_buffer_as_file_overflow | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (FILE *,int) |  | __wprintf_buffer_as_file_overflow | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (FTS *,int) |  | fts_children | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (LIBSSH2_CHANNEL *,int) |  | _libssh2_channel_extended_data | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (LIBSSH2_CHANNEL *,int) |  | _libssh2_channel_flush | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_flush_ex | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_handle_extended_data | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_handle_extended_data2 | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_set_blocking | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (LIBSSH2_SESSION *,int) |  | _libssh2_session_set_blocking | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (LIBSSH2_SESSION *,int) |  | libssh2_hostkey_hash | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (LIBSSH2_SESSION *,int) |  | libssh2_session_methods | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (LIBSSH2_SESSION *,int) |  | libssh2_session_set_blocking | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (LIBSSH2_SESSION *,int) |  | libssh2_session_startup | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (LPCOLESTR,int) | CComBSTR | Append | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (OCSP_BASICRESP *,int) |  | OCSP_BASICRESP_delete_ext | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (OCSP_BASICRESP *,int) |  | OCSP_BASICRESP_get_ext | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (OCSP_BASICRESP *,int) |  | OCSP_resp_get0 | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (OCSP_ONEREQ *,int) |  | OCSP_ONEREQ_delete_ext | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (OCSP_ONEREQ *,int) |  | OCSP_ONEREQ_get_ext | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (OCSP_REQUEST *,int) |  | OCSP_REQUEST_delete_ext | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (OCSP_REQUEST *,int) |  | OCSP_REQUEST_get_ext | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (OCSP_REQUEST *,int) |  | OCSP_request_onereq_get0 | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (OCSP_SINGLERESP *,int) |  | OCSP_SINGLERESP_delete_ext | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (OCSP_SINGLERESP *,int) |  | OCSP_SINGLERESP_get_ext | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (OPENSSL_STACK *,int) |  | OPENSSL_sk_delete | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (OPENSSL_STACK *,int) |  | OPENSSL_sk_reserve | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (OPENSSL_sk_compfunc,int) |  | OPENSSL_sk_new_reserve | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (OSSL_ACKM *,int) |  | ossl_ackm_get_ack_deadline | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (OSSL_ACKM *,int) |  | ossl_ackm_get_ack_frame | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (OSSL_ACKM *,int) |  | ossl_ackm_get_largest_acked | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (OSSL_ACKM *,int) |  | ossl_ackm_on_pkt_space_discarded | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_set_serverPort | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (OSSL_CMP_CTX *,int) |  | ossl_cmp_ctx_set_failInfoCode | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (OSSL_CMP_CTX *,int) |  | ossl_cmp_ctx_set_status | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (OSSL_CMP_CTX *,int) |  | ossl_cmp_msg_create | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (OSSL_CMP_CTX *,int) |  | ossl_cmp_pollReq_new | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (OSSL_CMP_MSG *,int) |  | ossl_cmp_msg_set_bodytype | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (OSSL_CMP_PKIHEADER *,int) |  | ossl_cmp_hdr_set_pvno | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (OSSL_CMP_REVREPCONTENT *,int) |  | ossl_cmp_revrepcontent_get_CertId | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (OSSL_CMP_REVREPCONTENT *,int) |  | ossl_cmp_revrepcontent_get_pkisi | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_accept_raverified | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_accept_unprotected | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_grant_implicit_confirm | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_send_unprotected_errors | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (OSSL_CRMF_PKIPUBLICATIONINFO *,int) |  | OSSL_CRMF_MSG_set_PKIPublicationInfo_action | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (OSSL_DECODER_CTX *,int) |  | OSSL_DECODER_CTX_set_selection | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (OSSL_ENCODER_CTX *,int) |  | OSSL_ENCODER_CTX_set_selection | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (OSSL_LIB_CTX *,int) |  | OSSL_LIB_CTX_get_data | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (OSSL_LIB_CTX *,int) |  | OSSL_LIB_CTX_set_conf_diagnostics | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (OSSL_LIB_CTX *,int) |  | ossl_ctx_global_properties | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (OSSL_LIB_CTX *,int) |  | ossl_dh_new_by_nid_ex | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (OSSL_LIB_CTX *,int) |  | ossl_lib_ctx_get_data | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (OSSL_LIB_CTX *,int) |  | ossl_mac_key_new | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (OSSL_PARAM *,int) |  | OSSL_PARAM_set_int | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (OSSL_QRX *,int) |  | ossl_qrx_get_bytes_received | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (OSSL_RECORD_LAYER *,int) |  | tls_set_first_handshake | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (OSSL_RECORD_LAYER *,int) |  | tls_set_plain_alerts | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (OSSL_STORE_CTX *,int) |  | OSSL_STORE_expect | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (PKCS7 *,int) |  | PKCS7_set_type | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (QUIC_CHANNEL *,int) |  | ossl_quic_channel_new_stream_local | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (QUIC_ENGINE *,int) |  | ossl_quic_engine_set_inhibit_tick | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (QUIC_PORT *,int) |  | ossl_quic_port_set_allow_incoming | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (QUIC_RCIDM *,int) |  | ossl_quic_rcidm_get_preferred_tx_dcid_changed | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (QUIC_RSTREAM *,int) |  | ossl_quic_rstream_set_cleanse | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (QUIC_RXFC *,int) |  | ossl_quic_rxfc_get_error | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (QUIC_RXFC *,int) |  | ossl_quic_rxfc_has_cwm_changed | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (QUIC_SSTREAM *,int) |  | ossl_quic_sstream_set_cleanse | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (QUIC_STREAM_MAP *,int) |  | ossl_quic_stream_map_get_accept_queue_len | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (QUIC_TXFC *,int) |  | ossl_quic_txfc_has_become_blocked | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (RSA *,int) |  | RSA_clear_flags | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (RSA *,int) |  | RSA_set_flags | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (RSA_METHOD *,int) |  | RSA_meth_set_flags | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_hashalg | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_maskgenhashalg | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_saltlen | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_trailerfield | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (SSL *,int) |  | SSL_key_update | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (SSL *,int) |  | SSL_set_post_handshake_auth | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (SSL *,int) |  | SSL_set_purpose | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (SSL *,int) |  | SSL_set_quic_tls_early_data_enabled | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (SSL *,int) |  | SSL_set_quiet_shutdown | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (SSL *,int) |  | SSL_set_read_ahead | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (SSL *,int) |  | SSL_set_security_level | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (SSL *,int) |  | SSL_set_shutdown | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (SSL *,int) |  | SSL_set_trust | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (SSL *,int) |  | SSL_set_verify_depth | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (SSL_CONNECTION *,int) |  | dtls1_read_failed | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (SSL_CONNECTION *,int) |  | ossl_statem_send_fatal | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (SSL_CONNECTION *,int) |  | ossl_statem_set_in_init | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (SSL_CONNECTION *,int) |  | tls1_shared_group | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (SSL_CTX *,int) |  | SSL_CTX_set_post_handshake_auth | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (SSL_CTX *,int) |  | SSL_CTX_set_purpose | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (SSL_CTX *,int) |  | SSL_CTX_set_quiet_shutdown | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (SSL_CTX *,int) |  | SSL_CTX_set_security_level | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (SSL_CTX *,int) |  | SSL_CTX_set_srp_strength | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (SSL_CTX *,int) |  | SSL_CTX_set_trust | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (SSL_CTX *,int) |  | SSL_CTX_set_verify_depth | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (SSL_CTX *,int) |  | ssl_md | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (SSL_SESSION *,int) |  | SSL_SESSION_set_protocol_version | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (TS_REQ *,int) |  | TS_REQ_delete_ext | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (TS_REQ *,int) |  | TS_REQ_get_ext | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (TS_RESP_CTX *,int) |  | TS_RESP_CTX_add_flags | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (TS_STATUS_INFO *,int) |  | TS_STATUS_INFO_set_status | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (TS_TST_INFO *,int) |  | TS_TST_INFO_delete_ext | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (TS_TST_INFO *,int) |  | TS_TST_INFO_get_ext | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (TS_VERIFY_CTX *,int) |  | TS_VERIFY_CTX_add_flags | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (TS_VERIFY_CTX *,int) |  | TS_VERIFY_CTX_set_flags | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (WPACKET *,int) |  | ossl_DER_w_begin_sequence | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (X509 *,int) |  | X509_delete_ext | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (X509 *,int) |  | X509_self_signed | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (X509_ACERT *,int) |  | X509_ACERT_delete_attr | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (X509_ATTRIBUTE *,int) |  | X509_ATTRIBUTE_get0_type | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (X509_CRL *,int) |  | X509_CRL_delete_ext | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (X509_NAME *,int) |  | X509_NAME_delete_entry | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (X509_REQ *,int) |  | X509_REQ_delete_attr | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (X509_REVOKED *,int) |  | X509_REVOKED_delete_ext | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (X509_STORE *,int) |  | X509_STORE_set_depth | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (X509_STORE *,int) |  | X509_STORE_set_purpose | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (X509_STORE *,int) |  | X509_STORE_set_trust | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_depth | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_error | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_error_depth | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_purpose | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_trust | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_get0_host | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_auth_level | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_depth | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_purpose | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_trust | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (_Float128,int) |  | __ldexpf128 | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (_Float128,int) |  | __scalbnf128 | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (__sigset_t *,int) |  | __sigaddset_compat | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (__sigset_t *,int) |  | __sigdelset_compat | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (acttab *,int) |  | acttab_insert | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (addrinfo *,int) |  | support_format_addrinfo | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (aiocb_union *,int) |  | __aio_enqueue_request | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (argp_fmtstream_t,int) |  | __argp_fmtstream_putc | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (char **,int) |  | addrsort | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (char *,int) |  | Curl_str2addr | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (char *,int) |  | PEM_proc_type | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (char,int) | CStringT | CStringT | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (connectdata *,int) |  | Curl_conn_is_ssl | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const ASN1_BIT_STRING *,int) |  | ASN1_BIT_STRING_get_bit | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const BIGNUM *,int) |  | BN_get_flags | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const BIGNUM *,int) |  | BN_is_bit_set | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const BIO *,int) |  | BIO_get_ex_data | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const BIO *,int) |  | BIO_test_flags | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const CMS_SignerInfo *,int) |  | CMS_signed_get_attr | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const CMS_SignerInfo *,int) |  | CMS_unsigned_get_attr | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const CRYPTO_EX_DATA *,int) |  | CRYPTO_get_ex_data | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const DH *,int) |  | DH_get_ex_data | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const DH *,int) |  | DH_test_flags | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const DH *,int) |  | ossl_dh_dup | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const DSA *,int) |  | DSA_get_ex_data | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const DSA *,int) |  | DSA_test_flags | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const DSA *,int) |  | ossl_dsa_dup | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const ECX_KEY *,int) |  | ossl_ecx_key_dup | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const EC_KEY *,int) |  | EC_KEY_get_ex_data | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const EC_KEY *,int) |  | ossl_ec_key_dup | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const ENGINE *,int) |  | ENGINE_get_ex_data | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_test_flags | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const EVP_MD_CTX *,int) |  | EVP_MD_CTX_test_flags | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const EVP_PKEY *,int) |  | EVP_PKEY_get_attr | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const EVP_PKEY *,int) |  | EVP_PKEY_get_ex_data | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const ML_DSA_KEY *,int) |  | ossl_ml_dsa_key_dup | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const ML_KEM_KEY *,int) |  | ossl_ml_kem_key_dup | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const OPENSSL_STACK *,int) |  | OPENSSL_sk_value | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const OSSL_CMP_CERTREPMESSAGE *,int) |  | ossl_cmp_certrepmessage_get0_certresponse | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_get0_newPkey | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_get_option | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const OSSL_CMP_PKISI *,int) |  | ossl_cmp_pkisi_check_pkifailureinfo | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const OSSL_CMP_POLLREPCONTENT *,int) |  | ossl_cmp_pollrepcontent_get0_pollrep | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const QUIC_CHANNEL *,int) |  | ossl_quic_channel_get_local_stream_count_avail | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const QUIC_CHANNEL *,int) |  | ossl_quic_channel_get_remote_stream_count_avail | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const RSA *,int) |  | RSA_get_ex_data | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const RSA *,int) |  | RSA_test_flags | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const RSA *,int) |  | ossl_rsa_dup | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const SLH_DSA_KEY *,int) |  | ossl_slh_dsa_key_dup | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const SSL *,int) |  | SSL_get_ex_data | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const SSL_CTX *,int) |  | SSL_CTX_get_ex_data | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const SSL_SESSION *,int) |  | SSL_SESSION_get_ex_data | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const SSL_SESSION *,int) |  | ssl_session_dup | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const UI *,int) |  | UI_get_ex_data | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const UI_METHOD *,int) |  | UI_method_get_ex_data | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const X509 *,int) |  | X509_get_ex_data | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const X509 *,int) |  | X509_get_ext | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const X509_ACERT *,int) |  | X509_ACERT_get_attr | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const X509_CRL *,int) |  | X509_CRL_get_ext | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const X509_NAME *,int) |  | X509_NAME_get_entry | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const X509_POLICY_LEVEL *,int) |  | X509_policy_level_get0_node | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const X509_POLICY_TREE *,int) |  | X509_policy_tree_get0_level | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const X509_REQ *,int) |  | X509_REQ_get_attr | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const X509_REVOKED *,int) |  | X509_REVOKED_get_ext | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const X509_STORE *,int) |  | X509_STORE_get_ex_data | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const X509_STORE_CTX *,int) |  | X509_STORE_CTX_get_ex_data | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const XCHAR *,int) | CStringT | CStringT | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const YCHAR *,int) | CStringT | CStringT | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const char *,int) |  | DH_meth_new | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const char *,int) |  | DSA_meth_new | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const char *,int) |  | Jim_StrDupLen | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const char *,int) |  | NETSCAPE_SPKI_b64_decode | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const char *,int) |  | RSA_meth_new | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const char *,int) |  | ftok | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const char *,int) |  | gethostbyname2 | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const char *,int) |  | parse_yesno | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const char *,int) |  | res_gethostbyname2 | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const stack_st_X509_ATTRIBUTE *,int) |  | X509at_get_attr | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const stack_st_X509_EXTENSION *,int) |  | X509v3_get_ext | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const unsigned char *,int) |  | Jim_GenHashFunction | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const unsigned char *,int) |  | OPENSSL_uni2asc | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const unsigned char *,int) |  | OPENSSL_uni2utf8 | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (const void *,int) |  | inet6_rth_getaddr | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (double,int) |  | __ldexp | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (double,int) |  | __scalbn | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (double[],int) |  | getloadavg | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (dynhds *,int) |  | Curl_dynhds_set_opts | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (fexcept_t *,int) |  | fegetexceptflag | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (float,int) |  | __ldexpf | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (float,int) |  | __scalbnf | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (gzFile,int) |  | gzflush | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (gzFile,int) |  | gzputc | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (int *,int) |  | X509_PURPOSE_set | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (int *,int) |  | X509_TRUST_set | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (int *,int) |  | __lll_unlock_elision | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (int,int) |  | BN_security_bits | 0 |
-| taint.cpp:249:13:249:13 | _FUN | (int,int) |  | BN_security_bits | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (int,int) |  | EVP_MD_meth_new | 0 |
-| taint.cpp:249:13:249:13 | _FUN | (int,int) |  | EVP_MD_meth_new | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (int,int) |  | EVP_PKEY_meth_new | 0 |
-| taint.cpp:249:13:249:13 | _FUN | (int,int) |  | EVP_PKEY_meth_new | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (int,int) |  | __isctype | 0 |
-| taint.cpp:249:13:249:13 | _FUN | (int,int) |  | __isctype | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (int,int) |  | acttab_alloc | 0 |
-| taint.cpp:249:13:249:13 | _FUN | (int,int) |  | acttab_alloc | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (int,int) |  | div | 0 |
-| taint.cpp:249:13:249:13 | _FUN | (int,int) |  | div | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (int,int) |  | inet6_rth_space | 0 |
-| taint.cpp:249:13:249:13 | _FUN | (int,int) |  | inet6_rth_space | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (long double,int) |  | __ldexpl | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (netlink_handle *,int) |  | __netlink_request | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (nghttp2_option *,int) |  | nghttp2_option_set_no_auto_ping_ack | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (nghttp2_option *,int) |  | nghttp2_option_set_no_auto_window_update | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (nghttp2_option *,int) |  | nghttp2_option_set_no_closed_streams | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (nghttp2_option *,int) |  | nghttp2_option_set_no_http_messaging | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (nghttp2_option *,int) |  | nghttp2_option_set_no_recv_client_magic | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (nghttp2_option *,int) |  | nghttp2_option_set_no_rfc9113_leading_and_trailing_ws_validation | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (nghttp2_option *,int) |  | nghttp2_option_set_server_fallback_rfc7540_priorities | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (ns_msg,int) |  | ns_msg_getflag | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (obstack *,int) |  | _obstack_newchunk | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (posix_spawnattr_t *,int) |  | posix_spawnattr_setcgroup_np | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (posix_spawnattr_t *,int) |  | posix_spawnattr_setschedpolicy | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (pthread_attr_t *,int) |  | __pthread_attr_setschedpolicy | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (pthread_barrierattr_t *,int) |  | __pthread_barrierattr_setpshared | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (pthread_mutexattr_t *,int) |  | ___pthread_mutexattr_settype | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (pthread_mutexattr_t *,int) |  | __pthread_mutexattr_setprioceiling | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (pthread_mutexattr_t *,int) |  | __pthread_mutexattr_setprotocol | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (pthread_rwlockattr_t *,int) |  | __pthread_rwlockattr_setkind_np | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (pthread_rwlockattr_t *,int) |  | __pthread_rwlockattr_setpshared | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (rule *,int) |  | Configlist_add | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (rule *,int) |  | Configlist_addbasis | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (sigset_t *,int) |  | sigaddset | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (sigset_t *,int) |  | sigdelset | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (sqlite3 *,int) |  | sqlite3_busy_timeout | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (sqlite3 *,int) |  | sqlite3_db_name | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (sqlite3 *,int) |  | sqlite3_wal_autocheckpoint | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (sqlite3_backup *,int) |  | sqlite3_backup_step | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (sqlite3_context *,int) |  | sqlite3_aggregate_context | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (sqlite3_context *,int) |  | sqlite3_result_error_code | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (sqlite3_index_info *,int) |  | sqlite3_vtab_collation | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (sqlite3_stmt *,int) |  | sqlite3_bind_parameter_name | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (sqlite3_stmt *,int) |  | sqlite3_column_blob | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (sqlite3_stmt *,int) |  | sqlite3_column_bytes | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (sqlite3_stmt *,int) |  | sqlite3_column_bytes16 | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (sqlite3_stmt *,int) |  | sqlite3_column_decltype | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (sqlite3_stmt *,int) |  | sqlite3_column_decltype16 | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (sqlite3_stmt *,int) |  | sqlite3_column_double | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (sqlite3_stmt *,int) |  | sqlite3_column_int | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (sqlite3_stmt *,int) |  | sqlite3_column_int64 | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (sqlite3_stmt *,int) |  | sqlite3_column_name | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (sqlite3_stmt *,int) |  | sqlite3_column_name16 | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (sqlite3_stmt *,int) |  | sqlite3_column_text | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (sqlite3_stmt *,int) |  | sqlite3_column_text16 | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (sqlite3_stmt *,int) |  | sqlite3_column_type | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (sqlite3_stmt *,int) |  | sqlite3_column_value | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (sqlite3_stmt *,int) |  | sqlite3_stmt_explain | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (stack_st_PKCS7 *,int) |  | PKCS12_add_safes | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (stack_st_SSL_COMP *,int) |  | ssl3_comp_find | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (stack_st_X509_ATTRIBUTE *,int) |  | X509at_delete_attr | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (stack_st_X509_EXTENSION *,int) |  | X509v3_delete_ext | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (timespec *,int) |  | __timespec_get | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (timespec *,int) |  | __timespec_getres | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (uint16_t,int) |  | tls1_group_id2nid | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (unsigned char *,int) |  | RAND_bytes | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (unsigned char *,int) |  | RAND_priv_bytes | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (unsigned char *,int) |  | ossl_ipaddr_to_asc | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (unsigned short,int) |  | dtls1_get_queue_priority | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (uv_env_item_t *,int) |  | uv_os_free_environ | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (void *,int) |  | DSO_dsobyaddr | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (void *,int) |  | sqlite3_realloc | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (void *const *,int) |  | __backtrace_symbols | 1 |
-| taint.cpp:249:13:249:13 | _FUN | (wchar_t,int) | CStringT | CStringT | 1 |
-| taint.cpp:249:13:249:13 | operator() | (ASN1_STRING *,int) |  | ASN1_STRING_length_set | 1 |
-| taint.cpp:249:13:249:13 | operator() | (ASYNC_WAIT_CTX *,int) |  | ASYNC_WAIT_CTX_set_status | 1 |
-| taint.cpp:249:13:249:13 | operator() | (BIGNUM *,int) |  | BN_clear_bit | 1 |
-| taint.cpp:249:13:249:13 | operator() | (BIGNUM *,int) |  | BN_mask_bits | 1 |
-| taint.cpp:249:13:249:13 | operator() | (BIGNUM *,int) |  | BN_set_bit | 1 |
-| taint.cpp:249:13:249:13 | operator() | (BIGNUM *,int) |  | BN_set_flags | 1 |
-| taint.cpp:249:13:249:13 | operator() | (BIGNUM *,int) |  | bn_expand2 | 1 |
-| taint.cpp:249:13:249:13 | operator() | (BIGNUM *,int) |  | bn_wexpand | 1 |
-| taint.cpp:249:13:249:13 | operator() | (BIGNUM *,int) |  | ossl_bn_mask_bits_fixed_top | 1 |
-| taint.cpp:249:13:249:13 | operator() | (BIO *,int) |  | BIO_clear_flags | 1 |
-| taint.cpp:249:13:249:13 | operator() | (BIO *,int) |  | BIO_find_type | 1 |
-| taint.cpp:249:13:249:13 | operator() | (BIO *,int) |  | BIO_set_flags | 1 |
-| taint.cpp:249:13:249:13 | operator() | (BIO *,int) |  | BIO_set_init | 1 |
-| taint.cpp:249:13:249:13 | operator() | (BIO *,int) |  | BIO_set_retry_reason | 1 |
-| taint.cpp:249:13:249:13 | operator() | (BIO *,int) |  | BIO_set_shutdown | 1 |
-| taint.cpp:249:13:249:13 | operator() | (BIO *,int) |  | TXT_DB_read | 1 |
-| taint.cpp:249:13:249:13 | operator() | (CMS_SignerInfo *,int) |  | CMS_signed_delete_attr | 1 |
-| taint.cpp:249:13:249:13 | operator() | (CMS_SignerInfo *,int) |  | CMS_unsigned_delete_attr | 1 |
-| taint.cpp:249:13:249:13 | operator() | (CURL *,int) |  | curl_easy_pause | 1 |
-| taint.cpp:249:13:249:13 | operator() | (Curl_easy *,int) |  | Curl_conn_get_socket | 1 |
-| taint.cpp:249:13:249:13 | operator() | (DH *,int) |  | DH_clear_flags | 1 |
-| taint.cpp:249:13:249:13 | operator() | (DH *,int) |  | DH_set_flags | 1 |
-| taint.cpp:249:13:249:13 | operator() | (DH_METHOD *,int) |  | DH_meth_set_flags | 1 |
-| taint.cpp:249:13:249:13 | operator() | (DSA *,int) |  | DSA_clear_flags | 1 |
-| taint.cpp:249:13:249:13 | operator() | (DSA *,int) |  | DSA_set_flags | 1 |
-| taint.cpp:249:13:249:13 | operator() | (DSA_METHOD *,int) |  | DSA_meth_set_flags | 1 |
-| taint.cpp:249:13:249:13 | operator() | (EC_GROUP *,int) |  | EC_GROUP_set_asn1_flag | 1 |
-| taint.cpp:249:13:249:13 | operator() | (EC_GROUP *,int) |  | EC_GROUP_set_curve_name | 1 |
-| taint.cpp:249:13:249:13 | operator() | (EC_KEY *,int) |  | EC_KEY_clear_flags | 1 |
-| taint.cpp:249:13:249:13 | operator() | (EC_KEY *,int) |  | EC_KEY_set_asn1_flag | 1 |
-| taint.cpp:249:13:249:13 | operator() | (EC_KEY *,int) |  | EC_KEY_set_flags | 1 |
-| taint.cpp:249:13:249:13 | operator() | (ENGINE *,int) |  | ENGINE_cmd_is_executable | 1 |
-| taint.cpp:249:13:249:13 | operator() | (ENGINE *,int) |  | ENGINE_set_flags | 1 |
-| taint.cpp:249:13:249:13 | operator() | (EVP_CIPHER *,int) |  | EVP_CIPHER_meth_set_impl_ctx_size | 1 |
-| taint.cpp:249:13:249:13 | operator() | (EVP_CIPHER *,int) |  | EVP_CIPHER_meth_set_iv_length | 1 |
-| taint.cpp:249:13:249:13 | operator() | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_clear_flags | 1 |
-| taint.cpp:249:13:249:13 | operator() | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_flags | 1 |
-| taint.cpp:249:13:249:13 | operator() | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_key_length | 1 |
-| taint.cpp:249:13:249:13 | operator() | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_num | 1 |
-| taint.cpp:249:13:249:13 | operator() | (EVP_KEYMGMT *,int) |  | evp_keymgmt_util_query_operation_name | 1 |
-| taint.cpp:249:13:249:13 | operator() | (EVP_MD *,int) |  | EVP_MD_meth_set_app_datasize | 1 |
-| taint.cpp:249:13:249:13 | operator() | (EVP_MD *,int) |  | EVP_MD_meth_set_input_blocksize | 1 |
-| taint.cpp:249:13:249:13 | operator() | (EVP_MD *,int) |  | EVP_MD_meth_set_result_size | 1 |
-| taint.cpp:249:13:249:13 | operator() | (EVP_MD_CTX *,int) |  | EVP_MD_CTX_clear_flags | 1 |
-| taint.cpp:249:13:249:13 | operator() | (EVP_MD_CTX *,int) |  | EVP_MD_CTX_set_flags | 1 |
-| taint.cpp:249:13:249:13 | operator() | (EVP_PKEY *,int) |  | EVP_PKEY_delete_attr | 1 |
-| taint.cpp:249:13:249:13 | operator() | (EVP_PKEY *,int) |  | EVP_PKEY_save_parameters | 1 |
-| taint.cpp:249:13:249:13 | operator() | (EVP_PKEY *,int) |  | EVP_PKEY_set_type | 1 |
-| taint.cpp:249:13:249:13 | operator() | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_get_keygen_info | 1 |
-| taint.cpp:249:13:249:13 | operator() | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_kdf_type | 1 |
-| taint.cpp:249:13:249:13 | operator() | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_nid | 1 |
-| taint.cpp:249:13:249:13 | operator() | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_paramgen_type | 1 |
-| taint.cpp:249:13:249:13 | operator() | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_rfc5114 | 1 |
-| taint.cpp:249:13:249:13 | operator() | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dhx_rfc5114 | 1 |
-| taint.cpp:249:13:249:13 | operator() | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ec_param_enc | 1 |
-| taint.cpp:249:13:249:13 | operator() | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ec_paramgen_curve_nid | 1 |
-| taint.cpp:249:13:249:13 | operator() | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ecdh_kdf_type | 1 |
-| taint.cpp:249:13:249:13 | operator() | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_hkdf_mode | 1 |
-| taint.cpp:249:13:249:13 | operator() | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_rsa_padding | 1 |
-| taint.cpp:249:13:249:13 | operator() | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_rsa_pss_saltlen | 1 |
-| taint.cpp:249:13:249:13 | operator() | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_gindex | 1 |
-| taint.cpp:249:13:249:13 | operator() | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_h | 1 |
-| taint.cpp:249:13:249:13 | operator() | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_pcounter | 1 |
-| taint.cpp:249:13:249:13 | operator() | (FILE *,int) |  | _IO_default_pbackfail | 1 |
-| taint.cpp:249:13:249:13 | operator() | (FILE *,int) |  | _IO_fwide | 1 |
-| taint.cpp:249:13:249:13 | operator() | (FILE *,int) |  | _IO_init | 1 |
-| taint.cpp:249:13:249:13 | operator() | (FILE *,int) |  | _IO_init_internal | 1 |
-| taint.cpp:249:13:249:13 | operator() | (FILE *,int) |  | _IO_new_file_attach | 1 |
-| taint.cpp:249:13:249:13 | operator() | (FILE *,int) |  | _IO_new_file_overflow | 1 |
-| taint.cpp:249:13:249:13 | operator() | (FILE *,int) |  | _IO_old_init | 1 |
-| taint.cpp:249:13:249:13 | operator() | (FILE *,int) |  | _IO_sputbackc | 1 |
-| taint.cpp:249:13:249:13 | operator() | (FILE *,int) |  | _IO_str_overflow | 1 |
-| taint.cpp:249:13:249:13 | operator() | (FILE *,int) |  | _IO_str_pbackfail | 1 |
-| taint.cpp:249:13:249:13 | operator() | (FILE *,int) |  | __printf_buffer_as_file_overflow | 1 |
-| taint.cpp:249:13:249:13 | operator() | (FILE *,int) |  | __wprintf_buffer_as_file_overflow | 1 |
-| taint.cpp:249:13:249:13 | operator() | (FTS *,int) |  | fts_children | 1 |
-| taint.cpp:249:13:249:13 | operator() | (LIBSSH2_CHANNEL *,int) |  | _libssh2_channel_extended_data | 1 |
-| taint.cpp:249:13:249:13 | operator() | (LIBSSH2_CHANNEL *,int) |  | _libssh2_channel_flush | 1 |
-| taint.cpp:249:13:249:13 | operator() | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_flush_ex | 1 |
-| taint.cpp:249:13:249:13 | operator() | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_handle_extended_data | 1 |
-| taint.cpp:249:13:249:13 | operator() | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_handle_extended_data2 | 1 |
-| taint.cpp:249:13:249:13 | operator() | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_set_blocking | 1 |
-| taint.cpp:249:13:249:13 | operator() | (LIBSSH2_SESSION *,int) |  | _libssh2_session_set_blocking | 1 |
-| taint.cpp:249:13:249:13 | operator() | (LIBSSH2_SESSION *,int) |  | libssh2_hostkey_hash | 1 |
-| taint.cpp:249:13:249:13 | operator() | (LIBSSH2_SESSION *,int) |  | libssh2_session_methods | 1 |
-| taint.cpp:249:13:249:13 | operator() | (LIBSSH2_SESSION *,int) |  | libssh2_session_set_blocking | 1 |
-| taint.cpp:249:13:249:13 | operator() | (LIBSSH2_SESSION *,int) |  | libssh2_session_startup | 1 |
-| taint.cpp:249:13:249:13 | operator() | (LPCOLESTR,int) | CComBSTR | Append | 1 |
-| taint.cpp:249:13:249:13 | operator() | (OCSP_BASICRESP *,int) |  | OCSP_BASICRESP_delete_ext | 1 |
-| taint.cpp:249:13:249:13 | operator() | (OCSP_BASICRESP *,int) |  | OCSP_BASICRESP_get_ext | 1 |
-| taint.cpp:249:13:249:13 | operator() | (OCSP_BASICRESP *,int) |  | OCSP_resp_get0 | 1 |
-| taint.cpp:249:13:249:13 | operator() | (OCSP_ONEREQ *,int) |  | OCSP_ONEREQ_delete_ext | 1 |
-| taint.cpp:249:13:249:13 | operator() | (OCSP_ONEREQ *,int) |  | OCSP_ONEREQ_get_ext | 1 |
-| taint.cpp:249:13:249:13 | operator() | (OCSP_REQUEST *,int) |  | OCSP_REQUEST_delete_ext | 1 |
-| taint.cpp:249:13:249:13 | operator() | (OCSP_REQUEST *,int) |  | OCSP_REQUEST_get_ext | 1 |
-| taint.cpp:249:13:249:13 | operator() | (OCSP_REQUEST *,int) |  | OCSP_request_onereq_get0 | 1 |
-| taint.cpp:249:13:249:13 | operator() | (OCSP_SINGLERESP *,int) |  | OCSP_SINGLERESP_delete_ext | 1 |
-| taint.cpp:249:13:249:13 | operator() | (OCSP_SINGLERESP *,int) |  | OCSP_SINGLERESP_get_ext | 1 |
-| taint.cpp:249:13:249:13 | operator() | (OPENSSL_STACK *,int) |  | OPENSSL_sk_delete | 1 |
-| taint.cpp:249:13:249:13 | operator() | (OPENSSL_STACK *,int) |  | OPENSSL_sk_reserve | 1 |
-| taint.cpp:249:13:249:13 | operator() | (OPENSSL_sk_compfunc,int) |  | OPENSSL_sk_new_reserve | 1 |
-| taint.cpp:249:13:249:13 | operator() | (OSSL_ACKM *,int) |  | ossl_ackm_get_ack_deadline | 1 |
-| taint.cpp:249:13:249:13 | operator() | (OSSL_ACKM *,int) |  | ossl_ackm_get_ack_frame | 1 |
-| taint.cpp:249:13:249:13 | operator() | (OSSL_ACKM *,int) |  | ossl_ackm_get_largest_acked | 1 |
-| taint.cpp:249:13:249:13 | operator() | (OSSL_ACKM *,int) |  | ossl_ackm_on_pkt_space_discarded | 1 |
-| taint.cpp:249:13:249:13 | operator() | (OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_set_serverPort | 1 |
-| taint.cpp:249:13:249:13 | operator() | (OSSL_CMP_CTX *,int) |  | ossl_cmp_ctx_set_failInfoCode | 1 |
-| taint.cpp:249:13:249:13 | operator() | (OSSL_CMP_CTX *,int) |  | ossl_cmp_ctx_set_status | 1 |
-| taint.cpp:249:13:249:13 | operator() | (OSSL_CMP_CTX *,int) |  | ossl_cmp_msg_create | 1 |
-| taint.cpp:249:13:249:13 | operator() | (OSSL_CMP_CTX *,int) |  | ossl_cmp_pollReq_new | 1 |
-| taint.cpp:249:13:249:13 | operator() | (OSSL_CMP_MSG *,int) |  | ossl_cmp_msg_set_bodytype | 1 |
-| taint.cpp:249:13:249:13 | operator() | (OSSL_CMP_PKIHEADER *,int) |  | ossl_cmp_hdr_set_pvno | 1 |
-| taint.cpp:249:13:249:13 | operator() | (OSSL_CMP_REVREPCONTENT *,int) |  | ossl_cmp_revrepcontent_get_CertId | 1 |
-| taint.cpp:249:13:249:13 | operator() | (OSSL_CMP_REVREPCONTENT *,int) |  | ossl_cmp_revrepcontent_get_pkisi | 1 |
-| taint.cpp:249:13:249:13 | operator() | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_accept_raverified | 1 |
-| taint.cpp:249:13:249:13 | operator() | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_accept_unprotected | 1 |
-| taint.cpp:249:13:249:13 | operator() | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_grant_implicit_confirm | 1 |
-| taint.cpp:249:13:249:13 | operator() | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_send_unprotected_errors | 1 |
-| taint.cpp:249:13:249:13 | operator() | (OSSL_CRMF_PKIPUBLICATIONINFO *,int) |  | OSSL_CRMF_MSG_set_PKIPublicationInfo_action | 1 |
-| taint.cpp:249:13:249:13 | operator() | (OSSL_DECODER_CTX *,int) |  | OSSL_DECODER_CTX_set_selection | 1 |
-| taint.cpp:249:13:249:13 | operator() | (OSSL_ENCODER_CTX *,int) |  | OSSL_ENCODER_CTX_set_selection | 1 |
-| taint.cpp:249:13:249:13 | operator() | (OSSL_LIB_CTX *,int) |  | OSSL_LIB_CTX_get_data | 1 |
-| taint.cpp:249:13:249:13 | operator() | (OSSL_LIB_CTX *,int) |  | OSSL_LIB_CTX_set_conf_diagnostics | 1 |
-| taint.cpp:249:13:249:13 | operator() | (OSSL_LIB_CTX *,int) |  | ossl_ctx_global_properties | 1 |
-| taint.cpp:249:13:249:13 | operator() | (OSSL_LIB_CTX *,int) |  | ossl_dh_new_by_nid_ex | 1 |
-| taint.cpp:249:13:249:13 | operator() | (OSSL_LIB_CTX *,int) |  | ossl_lib_ctx_get_data | 1 |
-| taint.cpp:249:13:249:13 | operator() | (OSSL_LIB_CTX *,int) |  | ossl_mac_key_new | 1 |
-| taint.cpp:249:13:249:13 | operator() | (OSSL_PARAM *,int) |  | OSSL_PARAM_set_int | 1 |
-| taint.cpp:249:13:249:13 | operator() | (OSSL_QRX *,int) |  | ossl_qrx_get_bytes_received | 1 |
-| taint.cpp:249:13:249:13 | operator() | (OSSL_RECORD_LAYER *,int) |  | tls_set_first_handshake | 1 |
-| taint.cpp:249:13:249:13 | operator() | (OSSL_RECORD_LAYER *,int) |  | tls_set_plain_alerts | 1 |
-| taint.cpp:249:13:249:13 | operator() | (OSSL_STORE_CTX *,int) |  | OSSL_STORE_expect | 1 |
-| taint.cpp:249:13:249:13 | operator() | (PKCS7 *,int) |  | PKCS7_set_type | 1 |
-| taint.cpp:249:13:249:13 | operator() | (QUIC_CHANNEL *,int) |  | ossl_quic_channel_new_stream_local | 1 |
-| taint.cpp:249:13:249:13 | operator() | (QUIC_ENGINE *,int) |  | ossl_quic_engine_set_inhibit_tick | 1 |
-| taint.cpp:249:13:249:13 | operator() | (QUIC_PORT *,int) |  | ossl_quic_port_set_allow_incoming | 1 |
-| taint.cpp:249:13:249:13 | operator() | (QUIC_RCIDM *,int) |  | ossl_quic_rcidm_get_preferred_tx_dcid_changed | 1 |
-| taint.cpp:249:13:249:13 | operator() | (QUIC_RSTREAM *,int) |  | ossl_quic_rstream_set_cleanse | 1 |
-| taint.cpp:249:13:249:13 | operator() | (QUIC_RXFC *,int) |  | ossl_quic_rxfc_get_error | 1 |
-| taint.cpp:249:13:249:13 | operator() | (QUIC_RXFC *,int) |  | ossl_quic_rxfc_has_cwm_changed | 1 |
-| taint.cpp:249:13:249:13 | operator() | (QUIC_SSTREAM *,int) |  | ossl_quic_sstream_set_cleanse | 1 |
-| taint.cpp:249:13:249:13 | operator() | (QUIC_STREAM_MAP *,int) |  | ossl_quic_stream_map_get_accept_queue_len | 1 |
-| taint.cpp:249:13:249:13 | operator() | (QUIC_TXFC *,int) |  | ossl_quic_txfc_has_become_blocked | 1 |
-| taint.cpp:249:13:249:13 | operator() | (RSA *,int) |  | RSA_clear_flags | 1 |
-| taint.cpp:249:13:249:13 | operator() | (RSA *,int) |  | RSA_set_flags | 1 |
-| taint.cpp:249:13:249:13 | operator() | (RSA_METHOD *,int) |  | RSA_meth_set_flags | 1 |
-| taint.cpp:249:13:249:13 | operator() | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_hashalg | 1 |
-| taint.cpp:249:13:249:13 | operator() | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_maskgenhashalg | 1 |
-| taint.cpp:249:13:249:13 | operator() | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_saltlen | 1 |
-| taint.cpp:249:13:249:13 | operator() | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_trailerfield | 1 |
-| taint.cpp:249:13:249:13 | operator() | (SSL *,int) |  | SSL_key_update | 1 |
-| taint.cpp:249:13:249:13 | operator() | (SSL *,int) |  | SSL_set_post_handshake_auth | 1 |
-| taint.cpp:249:13:249:13 | operator() | (SSL *,int) |  | SSL_set_purpose | 1 |
-| taint.cpp:249:13:249:13 | operator() | (SSL *,int) |  | SSL_set_quic_tls_early_data_enabled | 1 |
-| taint.cpp:249:13:249:13 | operator() | (SSL *,int) |  | SSL_set_quiet_shutdown | 1 |
-| taint.cpp:249:13:249:13 | operator() | (SSL *,int) |  | SSL_set_read_ahead | 1 |
-| taint.cpp:249:13:249:13 | operator() | (SSL *,int) |  | SSL_set_security_level | 1 |
-| taint.cpp:249:13:249:13 | operator() | (SSL *,int) |  | SSL_set_shutdown | 1 |
-| taint.cpp:249:13:249:13 | operator() | (SSL *,int) |  | SSL_set_trust | 1 |
-| taint.cpp:249:13:249:13 | operator() | (SSL *,int) |  | SSL_set_verify_depth | 1 |
-| taint.cpp:249:13:249:13 | operator() | (SSL_CONNECTION *,int) |  | dtls1_read_failed | 1 |
-| taint.cpp:249:13:249:13 | operator() | (SSL_CONNECTION *,int) |  | ossl_statem_send_fatal | 1 |
-| taint.cpp:249:13:249:13 | operator() | (SSL_CONNECTION *,int) |  | ossl_statem_set_in_init | 1 |
-| taint.cpp:249:13:249:13 | operator() | (SSL_CONNECTION *,int) |  | tls1_shared_group | 1 |
-| taint.cpp:249:13:249:13 | operator() | (SSL_CTX *,int) |  | SSL_CTX_set_post_handshake_auth | 1 |
-| taint.cpp:249:13:249:13 | operator() | (SSL_CTX *,int) |  | SSL_CTX_set_purpose | 1 |
-| taint.cpp:249:13:249:13 | operator() | (SSL_CTX *,int) |  | SSL_CTX_set_quiet_shutdown | 1 |
-| taint.cpp:249:13:249:13 | operator() | (SSL_CTX *,int) |  | SSL_CTX_set_security_level | 1 |
-| taint.cpp:249:13:249:13 | operator() | (SSL_CTX *,int) |  | SSL_CTX_set_srp_strength | 1 |
-| taint.cpp:249:13:249:13 | operator() | (SSL_CTX *,int) |  | SSL_CTX_set_trust | 1 |
-| taint.cpp:249:13:249:13 | operator() | (SSL_CTX *,int) |  | SSL_CTX_set_verify_depth | 1 |
-| taint.cpp:249:13:249:13 | operator() | (SSL_CTX *,int) |  | ssl_md | 1 |
-| taint.cpp:249:13:249:13 | operator() | (SSL_SESSION *,int) |  | SSL_SESSION_set_protocol_version | 1 |
-| taint.cpp:249:13:249:13 | operator() | (TS_REQ *,int) |  | TS_REQ_delete_ext | 1 |
-| taint.cpp:249:13:249:13 | operator() | (TS_REQ *,int) |  | TS_REQ_get_ext | 1 |
-| taint.cpp:249:13:249:13 | operator() | (TS_RESP_CTX *,int) |  | TS_RESP_CTX_add_flags | 1 |
-| taint.cpp:249:13:249:13 | operator() | (TS_STATUS_INFO *,int) |  | TS_STATUS_INFO_set_status | 1 |
-| taint.cpp:249:13:249:13 | operator() | (TS_TST_INFO *,int) |  | TS_TST_INFO_delete_ext | 1 |
-| taint.cpp:249:13:249:13 | operator() | (TS_TST_INFO *,int) |  | TS_TST_INFO_get_ext | 1 |
-| taint.cpp:249:13:249:13 | operator() | (TS_VERIFY_CTX *,int) |  | TS_VERIFY_CTX_add_flags | 1 |
-| taint.cpp:249:13:249:13 | operator() | (TS_VERIFY_CTX *,int) |  | TS_VERIFY_CTX_set_flags | 1 |
-| taint.cpp:249:13:249:13 | operator() | (WPACKET *,int) |  | ossl_DER_w_begin_sequence | 1 |
-| taint.cpp:249:13:249:13 | operator() | (X509 *,int) |  | X509_delete_ext | 1 |
-| taint.cpp:249:13:249:13 | operator() | (X509 *,int) |  | X509_self_signed | 1 |
-| taint.cpp:249:13:249:13 | operator() | (X509_ACERT *,int) |  | X509_ACERT_delete_attr | 1 |
-| taint.cpp:249:13:249:13 | operator() | (X509_ATTRIBUTE *,int) |  | X509_ATTRIBUTE_get0_type | 1 |
-| taint.cpp:249:13:249:13 | operator() | (X509_CRL *,int) |  | X509_CRL_delete_ext | 1 |
-| taint.cpp:249:13:249:13 | operator() | (X509_NAME *,int) |  | X509_NAME_delete_entry | 1 |
-| taint.cpp:249:13:249:13 | operator() | (X509_REQ *,int) |  | X509_REQ_delete_attr | 1 |
-| taint.cpp:249:13:249:13 | operator() | (X509_REVOKED *,int) |  | X509_REVOKED_delete_ext | 1 |
-| taint.cpp:249:13:249:13 | operator() | (X509_STORE *,int) |  | X509_STORE_set_depth | 1 |
-| taint.cpp:249:13:249:13 | operator() | (X509_STORE *,int) |  | X509_STORE_set_purpose | 1 |
-| taint.cpp:249:13:249:13 | operator() | (X509_STORE *,int) |  | X509_STORE_set_trust | 1 |
-| taint.cpp:249:13:249:13 | operator() | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_depth | 1 |
-| taint.cpp:249:13:249:13 | operator() | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_error | 1 |
-| taint.cpp:249:13:249:13 | operator() | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_error_depth | 1 |
-| taint.cpp:249:13:249:13 | operator() | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_purpose | 1 |
-| taint.cpp:249:13:249:13 | operator() | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_trust | 1 |
-| taint.cpp:249:13:249:13 | operator() | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_get0_host | 1 |
-| taint.cpp:249:13:249:13 | operator() | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_auth_level | 1 |
-| taint.cpp:249:13:249:13 | operator() | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_depth | 1 |
-| taint.cpp:249:13:249:13 | operator() | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_purpose | 1 |
-| taint.cpp:249:13:249:13 | operator() | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_trust | 1 |
-| taint.cpp:249:13:249:13 | operator() | (_Float128,int) |  | __ldexpf128 | 1 |
-| taint.cpp:249:13:249:13 | operator() | (_Float128,int) |  | __scalbnf128 | 1 |
-| taint.cpp:249:13:249:13 | operator() | (__sigset_t *,int) |  | __sigaddset_compat | 1 |
-| taint.cpp:249:13:249:13 | operator() | (__sigset_t *,int) |  | __sigdelset_compat | 1 |
-| taint.cpp:249:13:249:13 | operator() | (acttab *,int) |  | acttab_insert | 1 |
-| taint.cpp:249:13:249:13 | operator() | (addrinfo *,int) |  | support_format_addrinfo | 1 |
-| taint.cpp:249:13:249:13 | operator() | (aiocb_union *,int) |  | __aio_enqueue_request | 1 |
-| taint.cpp:249:13:249:13 | operator() | (argp_fmtstream_t,int) |  | __argp_fmtstream_putc | 1 |
-| taint.cpp:249:13:249:13 | operator() | (char **,int) |  | addrsort | 1 |
-| taint.cpp:249:13:249:13 | operator() | (char *,int) |  | Curl_str2addr | 1 |
-| taint.cpp:249:13:249:13 | operator() | (char *,int) |  | PEM_proc_type | 1 |
-| taint.cpp:249:13:249:13 | operator() | (char,int) | CStringT | CStringT | 1 |
-| taint.cpp:249:13:249:13 | operator() | (connectdata *,int) |  | Curl_conn_is_ssl | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const ASN1_BIT_STRING *,int) |  | ASN1_BIT_STRING_get_bit | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const BIGNUM *,int) |  | BN_get_flags | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const BIGNUM *,int) |  | BN_is_bit_set | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const BIO *,int) |  | BIO_get_ex_data | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const BIO *,int) |  | BIO_test_flags | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const CMS_SignerInfo *,int) |  | CMS_signed_get_attr | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const CMS_SignerInfo *,int) |  | CMS_unsigned_get_attr | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const CRYPTO_EX_DATA *,int) |  | CRYPTO_get_ex_data | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const DH *,int) |  | DH_get_ex_data | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const DH *,int) |  | DH_test_flags | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const DH *,int) |  | ossl_dh_dup | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const DSA *,int) |  | DSA_get_ex_data | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const DSA *,int) |  | DSA_test_flags | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const DSA *,int) |  | ossl_dsa_dup | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const ECX_KEY *,int) |  | ossl_ecx_key_dup | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const EC_KEY *,int) |  | EC_KEY_get_ex_data | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const EC_KEY *,int) |  | ossl_ec_key_dup | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const ENGINE *,int) |  | ENGINE_get_ex_data | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_test_flags | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const EVP_MD_CTX *,int) |  | EVP_MD_CTX_test_flags | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const EVP_PKEY *,int) |  | EVP_PKEY_get_attr | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const EVP_PKEY *,int) |  | EVP_PKEY_get_ex_data | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const ML_DSA_KEY *,int) |  | ossl_ml_dsa_key_dup | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const ML_KEM_KEY *,int) |  | ossl_ml_kem_key_dup | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const OPENSSL_STACK *,int) |  | OPENSSL_sk_value | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const OSSL_CMP_CERTREPMESSAGE *,int) |  | ossl_cmp_certrepmessage_get0_certresponse | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_get0_newPkey | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_get_option | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const OSSL_CMP_PKISI *,int) |  | ossl_cmp_pkisi_check_pkifailureinfo | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const OSSL_CMP_POLLREPCONTENT *,int) |  | ossl_cmp_pollrepcontent_get0_pollrep | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const QUIC_CHANNEL *,int) |  | ossl_quic_channel_get_local_stream_count_avail | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const QUIC_CHANNEL *,int) |  | ossl_quic_channel_get_remote_stream_count_avail | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const RSA *,int) |  | RSA_get_ex_data | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const RSA *,int) |  | RSA_test_flags | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const RSA *,int) |  | ossl_rsa_dup | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const SLH_DSA_KEY *,int) |  | ossl_slh_dsa_key_dup | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const SSL *,int) |  | SSL_get_ex_data | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const SSL_CTX *,int) |  | SSL_CTX_get_ex_data | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const SSL_SESSION *,int) |  | SSL_SESSION_get_ex_data | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const SSL_SESSION *,int) |  | ssl_session_dup | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const UI *,int) |  | UI_get_ex_data | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const UI_METHOD *,int) |  | UI_method_get_ex_data | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const X509 *,int) |  | X509_get_ex_data | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const X509 *,int) |  | X509_get_ext | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const X509_ACERT *,int) |  | X509_ACERT_get_attr | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const X509_CRL *,int) |  | X509_CRL_get_ext | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const X509_NAME *,int) |  | X509_NAME_get_entry | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const X509_POLICY_LEVEL *,int) |  | X509_policy_level_get0_node | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const X509_POLICY_TREE *,int) |  | X509_policy_tree_get0_level | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const X509_REQ *,int) |  | X509_REQ_get_attr | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const X509_REVOKED *,int) |  | X509_REVOKED_get_ext | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const X509_STORE *,int) |  | X509_STORE_get_ex_data | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const X509_STORE_CTX *,int) |  | X509_STORE_CTX_get_ex_data | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const XCHAR *,int) | CStringT | CStringT | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const YCHAR *,int) | CStringT | CStringT | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const char *,int) |  | DH_meth_new | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const char *,int) |  | DSA_meth_new | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const char *,int) |  | Jim_StrDupLen | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const char *,int) |  | NETSCAPE_SPKI_b64_decode | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const char *,int) |  | RSA_meth_new | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const char *,int) |  | ftok | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const char *,int) |  | gethostbyname2 | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const char *,int) |  | parse_yesno | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const char *,int) |  | res_gethostbyname2 | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const stack_st_X509_ATTRIBUTE *,int) |  | X509at_get_attr | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const stack_st_X509_EXTENSION *,int) |  | X509v3_get_ext | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const unsigned char *,int) |  | Jim_GenHashFunction | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const unsigned char *,int) |  | OPENSSL_uni2asc | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const unsigned char *,int) |  | OPENSSL_uni2utf8 | 1 |
-| taint.cpp:249:13:249:13 | operator() | (const void *,int) |  | inet6_rth_getaddr | 1 |
-| taint.cpp:249:13:249:13 | operator() | (double,int) |  | __ldexp | 1 |
-| taint.cpp:249:13:249:13 | operator() | (double,int) |  | __scalbn | 1 |
-| taint.cpp:249:13:249:13 | operator() | (double[],int) |  | getloadavg | 1 |
-| taint.cpp:249:13:249:13 | operator() | (dynhds *,int) |  | Curl_dynhds_set_opts | 1 |
-| taint.cpp:249:13:249:13 | operator() | (fexcept_t *,int) |  | fegetexceptflag | 1 |
-| taint.cpp:249:13:249:13 | operator() | (float,int) |  | __ldexpf | 1 |
-| taint.cpp:249:13:249:13 | operator() | (float,int) |  | __scalbnf | 1 |
-| taint.cpp:249:13:249:13 | operator() | (gzFile,int) |  | gzflush | 1 |
-| taint.cpp:249:13:249:13 | operator() | (gzFile,int) |  | gzputc | 1 |
-| taint.cpp:249:13:249:13 | operator() | (int *,int) |  | X509_PURPOSE_set | 1 |
-| taint.cpp:249:13:249:13 | operator() | (int *,int) |  | X509_TRUST_set | 1 |
-| taint.cpp:249:13:249:13 | operator() | (int *,int) |  | __lll_unlock_elision | 1 |
-| taint.cpp:249:13:249:13 | operator() | (int,int) |  | BN_security_bits | 0 |
-| taint.cpp:249:13:249:13 | operator() | (int,int) |  | BN_security_bits | 1 |
-| taint.cpp:249:13:249:13 | operator() | (int,int) |  | EVP_MD_meth_new | 0 |
-| taint.cpp:249:13:249:13 | operator() | (int,int) |  | EVP_MD_meth_new | 1 |
-| taint.cpp:249:13:249:13 | operator() | (int,int) |  | EVP_PKEY_meth_new | 0 |
-| taint.cpp:249:13:249:13 | operator() | (int,int) |  | EVP_PKEY_meth_new | 1 |
-| taint.cpp:249:13:249:13 | operator() | (int,int) |  | __isctype | 0 |
-| taint.cpp:249:13:249:13 | operator() | (int,int) |  | __isctype | 1 |
-| taint.cpp:249:13:249:13 | operator() | (int,int) |  | acttab_alloc | 0 |
-| taint.cpp:249:13:249:13 | operator() | (int,int) |  | acttab_alloc | 1 |
-| taint.cpp:249:13:249:13 | operator() | (int,int) |  | div | 0 |
-| taint.cpp:249:13:249:13 | operator() | (int,int) |  | div | 1 |
-| taint.cpp:249:13:249:13 | operator() | (int,int) |  | inet6_rth_space | 0 |
-| taint.cpp:249:13:249:13 | operator() | (int,int) |  | inet6_rth_space | 1 |
-| taint.cpp:249:13:249:13 | operator() | (long double,int) |  | __ldexpl | 1 |
-| taint.cpp:249:13:249:13 | operator() | (netlink_handle *,int) |  | __netlink_request | 1 |
-| taint.cpp:249:13:249:13 | operator() | (nghttp2_option *,int) |  | nghttp2_option_set_no_auto_ping_ack | 1 |
-| taint.cpp:249:13:249:13 | operator() | (nghttp2_option *,int) |  | nghttp2_option_set_no_auto_window_update | 1 |
-| taint.cpp:249:13:249:13 | operator() | (nghttp2_option *,int) |  | nghttp2_option_set_no_closed_streams | 1 |
-| taint.cpp:249:13:249:13 | operator() | (nghttp2_option *,int) |  | nghttp2_option_set_no_http_messaging | 1 |
-| taint.cpp:249:13:249:13 | operator() | (nghttp2_option *,int) |  | nghttp2_option_set_no_recv_client_magic | 1 |
-| taint.cpp:249:13:249:13 | operator() | (nghttp2_option *,int) |  | nghttp2_option_set_no_rfc9113_leading_and_trailing_ws_validation | 1 |
-| taint.cpp:249:13:249:13 | operator() | (nghttp2_option *,int) |  | nghttp2_option_set_server_fallback_rfc7540_priorities | 1 |
-| taint.cpp:249:13:249:13 | operator() | (ns_msg,int) |  | ns_msg_getflag | 1 |
-| taint.cpp:249:13:249:13 | operator() | (obstack *,int) |  | _obstack_newchunk | 1 |
-| taint.cpp:249:13:249:13 | operator() | (posix_spawnattr_t *,int) |  | posix_spawnattr_setcgroup_np | 1 |
-| taint.cpp:249:13:249:13 | operator() | (posix_spawnattr_t *,int) |  | posix_spawnattr_setschedpolicy | 1 |
-| taint.cpp:249:13:249:13 | operator() | (pthread_attr_t *,int) |  | __pthread_attr_setschedpolicy | 1 |
-| taint.cpp:249:13:249:13 | operator() | (pthread_barrierattr_t *,int) |  | __pthread_barrierattr_setpshared | 1 |
-| taint.cpp:249:13:249:13 | operator() | (pthread_mutexattr_t *,int) |  | ___pthread_mutexattr_settype | 1 |
-| taint.cpp:249:13:249:13 | operator() | (pthread_mutexattr_t *,int) |  | __pthread_mutexattr_setprioceiling | 1 |
-| taint.cpp:249:13:249:13 | operator() | (pthread_mutexattr_t *,int) |  | __pthread_mutexattr_setprotocol | 1 |
-| taint.cpp:249:13:249:13 | operator() | (pthread_rwlockattr_t *,int) |  | __pthread_rwlockattr_setkind_np | 1 |
-| taint.cpp:249:13:249:13 | operator() | (pthread_rwlockattr_t *,int) |  | __pthread_rwlockattr_setpshared | 1 |
-| taint.cpp:249:13:249:13 | operator() | (rule *,int) |  | Configlist_add | 1 |
-| taint.cpp:249:13:249:13 | operator() | (rule *,int) |  | Configlist_addbasis | 1 |
-| taint.cpp:249:13:249:13 | operator() | (sigset_t *,int) |  | sigaddset | 1 |
-| taint.cpp:249:13:249:13 | operator() | (sigset_t *,int) |  | sigdelset | 1 |
-| taint.cpp:249:13:249:13 | operator() | (sqlite3 *,int) |  | sqlite3_busy_timeout | 1 |
-| taint.cpp:249:13:249:13 | operator() | (sqlite3 *,int) |  | sqlite3_db_name | 1 |
-| taint.cpp:249:13:249:13 | operator() | (sqlite3 *,int) |  | sqlite3_wal_autocheckpoint | 1 |
-| taint.cpp:249:13:249:13 | operator() | (sqlite3_backup *,int) |  | sqlite3_backup_step | 1 |
-| taint.cpp:249:13:249:13 | operator() | (sqlite3_context *,int) |  | sqlite3_aggregate_context | 1 |
-| taint.cpp:249:13:249:13 | operator() | (sqlite3_context *,int) |  | sqlite3_result_error_code | 1 |
-| taint.cpp:249:13:249:13 | operator() | (sqlite3_index_info *,int) |  | sqlite3_vtab_collation | 1 |
-| taint.cpp:249:13:249:13 | operator() | (sqlite3_stmt *,int) |  | sqlite3_bind_parameter_name | 1 |
-| taint.cpp:249:13:249:13 | operator() | (sqlite3_stmt *,int) |  | sqlite3_column_blob | 1 |
-| taint.cpp:249:13:249:13 | operator() | (sqlite3_stmt *,int) |  | sqlite3_column_bytes | 1 |
-| taint.cpp:249:13:249:13 | operator() | (sqlite3_stmt *,int) |  | sqlite3_column_bytes16 | 1 |
-| taint.cpp:249:13:249:13 | operator() | (sqlite3_stmt *,int) |  | sqlite3_column_decltype | 1 |
-| taint.cpp:249:13:249:13 | operator() | (sqlite3_stmt *,int) |  | sqlite3_column_decltype16 | 1 |
-| taint.cpp:249:13:249:13 | operator() | (sqlite3_stmt *,int) |  | sqlite3_column_double | 1 |
-| taint.cpp:249:13:249:13 | operator() | (sqlite3_stmt *,int) |  | sqlite3_column_int | 1 |
-| taint.cpp:249:13:249:13 | operator() | (sqlite3_stmt *,int) |  | sqlite3_column_int64 | 1 |
-| taint.cpp:249:13:249:13 | operator() | (sqlite3_stmt *,int) |  | sqlite3_column_name | 1 |
-| taint.cpp:249:13:249:13 | operator() | (sqlite3_stmt *,int) |  | sqlite3_column_name16 | 1 |
-| taint.cpp:249:13:249:13 | operator() | (sqlite3_stmt *,int) |  | sqlite3_column_text | 1 |
-| taint.cpp:249:13:249:13 | operator() | (sqlite3_stmt *,int) |  | sqlite3_column_text16 | 1 |
-| taint.cpp:249:13:249:13 | operator() | (sqlite3_stmt *,int) |  | sqlite3_column_type | 1 |
-| taint.cpp:249:13:249:13 | operator() | (sqlite3_stmt *,int) |  | sqlite3_column_value | 1 |
-| taint.cpp:249:13:249:13 | operator() | (sqlite3_stmt *,int) |  | sqlite3_stmt_explain | 1 |
-| taint.cpp:249:13:249:13 | operator() | (stack_st_PKCS7 *,int) |  | PKCS12_add_safes | 1 |
-| taint.cpp:249:13:249:13 | operator() | (stack_st_SSL_COMP *,int) |  | ssl3_comp_find | 1 |
-| taint.cpp:249:13:249:13 | operator() | (stack_st_X509_ATTRIBUTE *,int) |  | X509at_delete_attr | 1 |
-| taint.cpp:249:13:249:13 | operator() | (stack_st_X509_EXTENSION *,int) |  | X509v3_delete_ext | 1 |
-| taint.cpp:249:13:249:13 | operator() | (timespec *,int) |  | __timespec_get | 1 |
-| taint.cpp:249:13:249:13 | operator() | (timespec *,int) |  | __timespec_getres | 1 |
-| taint.cpp:249:13:249:13 | operator() | (uint16_t,int) |  | tls1_group_id2nid | 1 |
-| taint.cpp:249:13:249:13 | operator() | (unsigned char *,int) |  | RAND_bytes | 1 |
-| taint.cpp:249:13:249:13 | operator() | (unsigned char *,int) |  | RAND_priv_bytes | 1 |
-| taint.cpp:249:13:249:13 | operator() | (unsigned char *,int) |  | ossl_ipaddr_to_asc | 1 |
-| taint.cpp:249:13:249:13 | operator() | (unsigned short,int) |  | dtls1_get_queue_priority | 1 |
-| taint.cpp:249:13:249:13 | operator() | (uv_env_item_t *,int) |  | uv_os_free_environ | 1 |
-| taint.cpp:249:13:249:13 | operator() | (void *,int) |  | DSO_dsobyaddr | 1 |
-| taint.cpp:249:13:249:13 | operator() | (void *,int) |  | sqlite3_realloc | 1 |
-| taint.cpp:249:13:249:13 | operator() | (void *const *,int) |  | __backtrace_symbols | 1 |
-| taint.cpp:249:13:249:13 | operator() | (wchar_t,int) | CStringT | CStringT | 1 |
-| taint.cpp:266:5:266:6 | id | (int) |  | ASN1_STRING_type_new | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | ASN1_tag2bit | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | ASN1_tag2str | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | Jim_ReturnCode | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | Jim_SignalId | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | OBJ_nid2ln | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | OBJ_nid2obj | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | OBJ_nid2sn | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | OSSL_trace_get_category_name | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | PKCS12_init | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | Symbol_Nth | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | X509_PURPOSE_get0 | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | X509_TRUST_get0 | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | X509_TRUST_get_by_id | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | __btowc | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | __current_locale_name | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | __fdopendir | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | __get_errlist | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | __get_errname | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | __math_invalid_i | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | __math_invalidf_i | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | __p_class | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | __p_rcode | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | __p_type | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | __pkey_get | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | __sigdescr_np | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | __strerrordesc_np | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | _tolower | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | _toupper | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | btowc | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | c_tolower | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | c_toupper | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | curlx_sitouz | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | evp_pkey_type2name | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | inet6_option_space | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | isalnum | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | isalpha | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | isblank | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | iscntrl | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | isdigit | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | isgraph | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | islower | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | isprint | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | ispunct | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | isspace | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | isupper | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | isxdigit | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | ossl_tolower | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | ossl_toupper | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | sigabbrev_np | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | sqlite3_compileoption_get | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | sqlite3_errstr | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | strerrorname_np | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | support_report_failure | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | svcudp_create | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | tls13_alert_code | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | toascii | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | tolower | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | toupper | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | uabs | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | uv__accept | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | uv_err_name | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | uv_get_osfhandle | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | uv_strerror | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | uv_translate_sys_error | 0 |
-| taint.cpp:266:5:266:6 | id | (int) |  | zError | 0 |
-| taint.cpp:266:5:266:6 | id | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| taint.cpp:302:6:302:14 | myAssign2 | (ASN1_STRING *,int) |  | ASN1_STRING_length_set | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (ASYNC_WAIT_CTX *,int) |  | ASYNC_WAIT_CTX_set_status | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (BIGNUM *,int) |  | BN_clear_bit | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (BIGNUM *,int) |  | BN_mask_bits | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (BIGNUM *,int) |  | BN_set_bit | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (BIGNUM *,int) |  | BN_set_flags | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (BIGNUM *,int) |  | bn_expand2 | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (BIGNUM *,int) |  | bn_wexpand | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (BIGNUM *,int) |  | ossl_bn_mask_bits_fixed_top | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (BIO *,int) |  | BIO_clear_flags | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (BIO *,int) |  | BIO_find_type | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (BIO *,int) |  | BIO_set_flags | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (BIO *,int) |  | BIO_set_init | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (BIO *,int) |  | BIO_set_retry_reason | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (BIO *,int) |  | BIO_set_shutdown | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (BIO *,int) |  | TXT_DB_read | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (CMS_SignerInfo *,int) |  | CMS_signed_delete_attr | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (CMS_SignerInfo *,int) |  | CMS_unsigned_delete_attr | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (CURL *,int) |  | curl_easy_pause | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (Curl_easy *,int) |  | Curl_conn_get_socket | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (DH *,int) |  | DH_clear_flags | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (DH *,int) |  | DH_set_flags | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (DH_METHOD *,int) |  | DH_meth_set_flags | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (DSA *,int) |  | DSA_clear_flags | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (DSA *,int) |  | DSA_set_flags | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (DSA_METHOD *,int) |  | DSA_meth_set_flags | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (EC_GROUP *,int) |  | EC_GROUP_set_asn1_flag | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (EC_GROUP *,int) |  | EC_GROUP_set_curve_name | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (EC_KEY *,int) |  | EC_KEY_clear_flags | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (EC_KEY *,int) |  | EC_KEY_set_asn1_flag | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (EC_KEY *,int) |  | EC_KEY_set_flags | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (ENGINE *,int) |  | ENGINE_cmd_is_executable | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (ENGINE *,int) |  | ENGINE_set_flags | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (EVP_CIPHER *,int) |  | EVP_CIPHER_meth_set_impl_ctx_size | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (EVP_CIPHER *,int) |  | EVP_CIPHER_meth_set_iv_length | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_clear_flags | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_flags | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_key_length | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_num | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (EVP_KEYMGMT *,int) |  | evp_keymgmt_util_query_operation_name | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (EVP_MD *,int) |  | EVP_MD_meth_set_app_datasize | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (EVP_MD *,int) |  | EVP_MD_meth_set_input_blocksize | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (EVP_MD *,int) |  | EVP_MD_meth_set_result_size | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (EVP_MD_CTX *,int) |  | EVP_MD_CTX_clear_flags | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (EVP_MD_CTX *,int) |  | EVP_MD_CTX_set_flags | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (EVP_PKEY *,int) |  | EVP_PKEY_delete_attr | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (EVP_PKEY *,int) |  | EVP_PKEY_save_parameters | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (EVP_PKEY *,int) |  | EVP_PKEY_set_type | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_get_keygen_info | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_kdf_type | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_nid | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_paramgen_type | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_rfc5114 | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dhx_rfc5114 | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ec_param_enc | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ec_paramgen_curve_nid | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ecdh_kdf_type | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_hkdf_mode | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_rsa_padding | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_rsa_pss_saltlen | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_gindex | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_h | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_pcounter | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (FILE *,int) |  | _IO_default_pbackfail | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (FILE *,int) |  | _IO_fwide | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (FILE *,int) |  | _IO_init | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (FILE *,int) |  | _IO_init_internal | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (FILE *,int) |  | _IO_new_file_attach | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (FILE *,int) |  | _IO_new_file_overflow | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (FILE *,int) |  | _IO_old_init | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (FILE *,int) |  | _IO_sputbackc | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (FILE *,int) |  | _IO_str_overflow | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (FILE *,int) |  | _IO_str_pbackfail | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (FILE *,int) |  | __printf_buffer_as_file_overflow | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (FILE *,int) |  | __wprintf_buffer_as_file_overflow | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (FTS *,int) |  | fts_children | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (LIBSSH2_CHANNEL *,int) |  | _libssh2_channel_extended_data | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (LIBSSH2_CHANNEL *,int) |  | _libssh2_channel_flush | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_flush_ex | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_handle_extended_data | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_handle_extended_data2 | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_set_blocking | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (LIBSSH2_SESSION *,int) |  | _libssh2_session_set_blocking | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (LIBSSH2_SESSION *,int) |  | libssh2_hostkey_hash | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (LIBSSH2_SESSION *,int) |  | libssh2_session_methods | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (LIBSSH2_SESSION *,int) |  | libssh2_session_set_blocking | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (LIBSSH2_SESSION *,int) |  | libssh2_session_startup | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (LPCOLESTR,int) | CComBSTR | Append | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (OCSP_BASICRESP *,int) |  | OCSP_BASICRESP_delete_ext | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (OCSP_BASICRESP *,int) |  | OCSP_BASICRESP_get_ext | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (OCSP_BASICRESP *,int) |  | OCSP_resp_get0 | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (OCSP_ONEREQ *,int) |  | OCSP_ONEREQ_delete_ext | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (OCSP_ONEREQ *,int) |  | OCSP_ONEREQ_get_ext | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (OCSP_REQUEST *,int) |  | OCSP_REQUEST_delete_ext | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (OCSP_REQUEST *,int) |  | OCSP_REQUEST_get_ext | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (OCSP_REQUEST *,int) |  | OCSP_request_onereq_get0 | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (OCSP_SINGLERESP *,int) |  | OCSP_SINGLERESP_delete_ext | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (OCSP_SINGLERESP *,int) |  | OCSP_SINGLERESP_get_ext | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (OPENSSL_STACK *,int) |  | OPENSSL_sk_delete | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (OPENSSL_STACK *,int) |  | OPENSSL_sk_reserve | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (OPENSSL_sk_compfunc,int) |  | OPENSSL_sk_new_reserve | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (OSSL_ACKM *,int) |  | ossl_ackm_get_ack_deadline | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (OSSL_ACKM *,int) |  | ossl_ackm_get_ack_frame | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (OSSL_ACKM *,int) |  | ossl_ackm_get_largest_acked | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (OSSL_ACKM *,int) |  | ossl_ackm_on_pkt_space_discarded | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_set_serverPort | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (OSSL_CMP_CTX *,int) |  | ossl_cmp_ctx_set_failInfoCode | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (OSSL_CMP_CTX *,int) |  | ossl_cmp_ctx_set_status | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (OSSL_CMP_CTX *,int) |  | ossl_cmp_msg_create | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (OSSL_CMP_CTX *,int) |  | ossl_cmp_pollReq_new | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (OSSL_CMP_MSG *,int) |  | ossl_cmp_msg_set_bodytype | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (OSSL_CMP_PKIHEADER *,int) |  | ossl_cmp_hdr_set_pvno | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (OSSL_CMP_REVREPCONTENT *,int) |  | ossl_cmp_revrepcontent_get_CertId | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (OSSL_CMP_REVREPCONTENT *,int) |  | ossl_cmp_revrepcontent_get_pkisi | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_accept_raverified | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_accept_unprotected | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_grant_implicit_confirm | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_send_unprotected_errors | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (OSSL_CRMF_PKIPUBLICATIONINFO *,int) |  | OSSL_CRMF_MSG_set_PKIPublicationInfo_action | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (OSSL_DECODER_CTX *,int) |  | OSSL_DECODER_CTX_set_selection | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (OSSL_ENCODER_CTX *,int) |  | OSSL_ENCODER_CTX_set_selection | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (OSSL_LIB_CTX *,int) |  | OSSL_LIB_CTX_get_data | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (OSSL_LIB_CTX *,int) |  | OSSL_LIB_CTX_set_conf_diagnostics | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (OSSL_LIB_CTX *,int) |  | ossl_ctx_global_properties | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (OSSL_LIB_CTX *,int) |  | ossl_dh_new_by_nid_ex | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (OSSL_LIB_CTX *,int) |  | ossl_lib_ctx_get_data | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (OSSL_LIB_CTX *,int) |  | ossl_mac_key_new | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (OSSL_PARAM *,int) |  | OSSL_PARAM_set_int | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (OSSL_QRX *,int) |  | ossl_qrx_get_bytes_received | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (OSSL_RECORD_LAYER *,int) |  | tls_set_first_handshake | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (OSSL_RECORD_LAYER *,int) |  | tls_set_plain_alerts | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (OSSL_STORE_CTX *,int) |  | OSSL_STORE_expect | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (PKCS7 *,int) |  | PKCS7_set_type | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (QUIC_CHANNEL *,int) |  | ossl_quic_channel_new_stream_local | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (QUIC_ENGINE *,int) |  | ossl_quic_engine_set_inhibit_tick | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (QUIC_PORT *,int) |  | ossl_quic_port_set_allow_incoming | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (QUIC_RCIDM *,int) |  | ossl_quic_rcidm_get_preferred_tx_dcid_changed | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (QUIC_RSTREAM *,int) |  | ossl_quic_rstream_set_cleanse | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (QUIC_RXFC *,int) |  | ossl_quic_rxfc_get_error | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (QUIC_RXFC *,int) |  | ossl_quic_rxfc_has_cwm_changed | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (QUIC_SSTREAM *,int) |  | ossl_quic_sstream_set_cleanse | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (QUIC_STREAM_MAP *,int) |  | ossl_quic_stream_map_get_accept_queue_len | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (QUIC_TXFC *,int) |  | ossl_quic_txfc_has_become_blocked | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (RSA *,int) |  | RSA_clear_flags | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (RSA *,int) |  | RSA_set_flags | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (RSA_METHOD *,int) |  | RSA_meth_set_flags | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_hashalg | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_maskgenhashalg | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_saltlen | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_trailerfield | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (SSL *,int) |  | SSL_key_update | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (SSL *,int) |  | SSL_set_post_handshake_auth | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (SSL *,int) |  | SSL_set_purpose | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (SSL *,int) |  | SSL_set_quic_tls_early_data_enabled | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (SSL *,int) |  | SSL_set_quiet_shutdown | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (SSL *,int) |  | SSL_set_read_ahead | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (SSL *,int) |  | SSL_set_security_level | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (SSL *,int) |  | SSL_set_shutdown | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (SSL *,int) |  | SSL_set_trust | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (SSL *,int) |  | SSL_set_verify_depth | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (SSL_CONNECTION *,int) |  | dtls1_read_failed | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (SSL_CONNECTION *,int) |  | ossl_statem_send_fatal | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (SSL_CONNECTION *,int) |  | ossl_statem_set_in_init | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (SSL_CONNECTION *,int) |  | tls1_shared_group | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (SSL_CTX *,int) |  | SSL_CTX_set_post_handshake_auth | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (SSL_CTX *,int) |  | SSL_CTX_set_purpose | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (SSL_CTX *,int) |  | SSL_CTX_set_quiet_shutdown | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (SSL_CTX *,int) |  | SSL_CTX_set_security_level | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (SSL_CTX *,int) |  | SSL_CTX_set_srp_strength | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (SSL_CTX *,int) |  | SSL_CTX_set_trust | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (SSL_CTX *,int) |  | SSL_CTX_set_verify_depth | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (SSL_CTX *,int) |  | ssl_md | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (SSL_SESSION *,int) |  | SSL_SESSION_set_protocol_version | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (TS_REQ *,int) |  | TS_REQ_delete_ext | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (TS_REQ *,int) |  | TS_REQ_get_ext | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (TS_RESP_CTX *,int) |  | TS_RESP_CTX_add_flags | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (TS_STATUS_INFO *,int) |  | TS_STATUS_INFO_set_status | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (TS_TST_INFO *,int) |  | TS_TST_INFO_delete_ext | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (TS_TST_INFO *,int) |  | TS_TST_INFO_get_ext | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (TS_VERIFY_CTX *,int) |  | TS_VERIFY_CTX_add_flags | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (TS_VERIFY_CTX *,int) |  | TS_VERIFY_CTX_set_flags | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (WPACKET *,int) |  | ossl_DER_w_begin_sequence | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (X509 *,int) |  | X509_delete_ext | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (X509 *,int) |  | X509_self_signed | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (X509_ACERT *,int) |  | X509_ACERT_delete_attr | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (X509_ATTRIBUTE *,int) |  | X509_ATTRIBUTE_get0_type | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (X509_CRL *,int) |  | X509_CRL_delete_ext | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (X509_NAME *,int) |  | X509_NAME_delete_entry | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (X509_REQ *,int) |  | X509_REQ_delete_attr | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (X509_REVOKED *,int) |  | X509_REVOKED_delete_ext | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (X509_STORE *,int) |  | X509_STORE_set_depth | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (X509_STORE *,int) |  | X509_STORE_set_purpose | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (X509_STORE *,int) |  | X509_STORE_set_trust | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_depth | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_error | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_error_depth | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_purpose | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_trust | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_get0_host | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_auth_level | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_depth | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_purpose | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_trust | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (_Float128,int) |  | __ldexpf128 | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (_Float128,int) |  | __scalbnf128 | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (__sigset_t *,int) |  | __sigaddset_compat | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (__sigset_t *,int) |  | __sigdelset_compat | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (acttab *,int) |  | acttab_insert | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (addrinfo *,int) |  | support_format_addrinfo | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (aiocb_union *,int) |  | __aio_enqueue_request | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (argp_fmtstream_t,int) |  | __argp_fmtstream_putc | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (char **,int) |  | addrsort | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (char *,int) |  | Curl_str2addr | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (char *,int) |  | PEM_proc_type | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (char,int) | CStringT | CStringT | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (connectdata *,int) |  | Curl_conn_is_ssl | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const ASN1_BIT_STRING *,int) |  | ASN1_BIT_STRING_get_bit | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const BIGNUM *,int) |  | BN_get_flags | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const BIGNUM *,int) |  | BN_is_bit_set | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const BIO *,int) |  | BIO_get_ex_data | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const BIO *,int) |  | BIO_test_flags | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const CMS_SignerInfo *,int) |  | CMS_signed_get_attr | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const CMS_SignerInfo *,int) |  | CMS_unsigned_get_attr | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const CRYPTO_EX_DATA *,int) |  | CRYPTO_get_ex_data | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const DH *,int) |  | DH_get_ex_data | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const DH *,int) |  | DH_test_flags | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const DH *,int) |  | ossl_dh_dup | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const DSA *,int) |  | DSA_get_ex_data | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const DSA *,int) |  | DSA_test_flags | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const DSA *,int) |  | ossl_dsa_dup | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const ECX_KEY *,int) |  | ossl_ecx_key_dup | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const EC_KEY *,int) |  | EC_KEY_get_ex_data | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const EC_KEY *,int) |  | ossl_ec_key_dup | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const ENGINE *,int) |  | ENGINE_get_ex_data | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_test_flags | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const EVP_MD_CTX *,int) |  | EVP_MD_CTX_test_flags | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const EVP_PKEY *,int) |  | EVP_PKEY_get_attr | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const EVP_PKEY *,int) |  | EVP_PKEY_get_ex_data | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const ML_DSA_KEY *,int) |  | ossl_ml_dsa_key_dup | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const ML_KEM_KEY *,int) |  | ossl_ml_kem_key_dup | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const OPENSSL_STACK *,int) |  | OPENSSL_sk_value | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const OSSL_CMP_CERTREPMESSAGE *,int) |  | ossl_cmp_certrepmessage_get0_certresponse | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_get0_newPkey | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_get_option | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const OSSL_CMP_PKISI *,int) |  | ossl_cmp_pkisi_check_pkifailureinfo | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const OSSL_CMP_POLLREPCONTENT *,int) |  | ossl_cmp_pollrepcontent_get0_pollrep | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const QUIC_CHANNEL *,int) |  | ossl_quic_channel_get_local_stream_count_avail | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const QUIC_CHANNEL *,int) |  | ossl_quic_channel_get_remote_stream_count_avail | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const RSA *,int) |  | RSA_get_ex_data | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const RSA *,int) |  | RSA_test_flags | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const RSA *,int) |  | ossl_rsa_dup | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const SLH_DSA_KEY *,int) |  | ossl_slh_dsa_key_dup | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const SSL *,int) |  | SSL_get_ex_data | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const SSL_CTX *,int) |  | SSL_CTX_get_ex_data | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const SSL_SESSION *,int) |  | SSL_SESSION_get_ex_data | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const SSL_SESSION *,int) |  | ssl_session_dup | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const UI *,int) |  | UI_get_ex_data | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const UI_METHOD *,int) |  | UI_method_get_ex_data | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const X509 *,int) |  | X509_get_ex_data | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const X509 *,int) |  | X509_get_ext | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const X509_ACERT *,int) |  | X509_ACERT_get_attr | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const X509_CRL *,int) |  | X509_CRL_get_ext | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const X509_NAME *,int) |  | X509_NAME_get_entry | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const X509_POLICY_LEVEL *,int) |  | X509_policy_level_get0_node | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const X509_POLICY_TREE *,int) |  | X509_policy_tree_get0_level | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const X509_REQ *,int) |  | X509_REQ_get_attr | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const X509_REVOKED *,int) |  | X509_REVOKED_get_ext | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const X509_STORE *,int) |  | X509_STORE_get_ex_data | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const X509_STORE_CTX *,int) |  | X509_STORE_CTX_get_ex_data | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const XCHAR *,int) | CStringT | CStringT | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const YCHAR *,int) | CStringT | CStringT | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const char *,int) |  | DH_meth_new | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const char *,int) |  | DSA_meth_new | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const char *,int) |  | Jim_StrDupLen | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const char *,int) |  | NETSCAPE_SPKI_b64_decode | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const char *,int) |  | RSA_meth_new | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const char *,int) |  | ftok | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const char *,int) |  | gethostbyname2 | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const char *,int) |  | parse_yesno | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const char *,int) |  | res_gethostbyname2 | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const stack_st_X509_ATTRIBUTE *,int) |  | X509at_get_attr | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const stack_st_X509_EXTENSION *,int) |  | X509v3_get_ext | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const unsigned char *,int) |  | Jim_GenHashFunction | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const unsigned char *,int) |  | OPENSSL_uni2asc | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const unsigned char *,int) |  | OPENSSL_uni2utf8 | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (const void *,int) |  | inet6_rth_getaddr | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (double,int) |  | __ldexp | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (double,int) |  | __scalbn | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (double[],int) |  | getloadavg | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (dynhds *,int) |  | Curl_dynhds_set_opts | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (fexcept_t *,int) |  | fegetexceptflag | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (float,int) |  | __ldexpf | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (float,int) |  | __scalbnf | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (gzFile,int) |  | gzflush | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (gzFile,int) |  | gzputc | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (int *,int) |  | X509_PURPOSE_set | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (int *,int) |  | X509_TRUST_set | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (int *,int) |  | __lll_unlock_elision | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (int,int) |  | BN_security_bits | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (int,int) |  | EVP_MD_meth_new | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (int,int) |  | EVP_PKEY_meth_new | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (int,int) |  | __isctype | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (int,int) |  | acttab_alloc | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (int,int) |  | div | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (int,int) |  | inet6_rth_space | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (long double,int) |  | __ldexpl | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (netlink_handle *,int) |  | __netlink_request | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (nghttp2_option *,int) |  | nghttp2_option_set_no_auto_ping_ack | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (nghttp2_option *,int) |  | nghttp2_option_set_no_auto_window_update | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (nghttp2_option *,int) |  | nghttp2_option_set_no_closed_streams | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (nghttp2_option *,int) |  | nghttp2_option_set_no_http_messaging | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (nghttp2_option *,int) |  | nghttp2_option_set_no_recv_client_magic | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (nghttp2_option *,int) |  | nghttp2_option_set_no_rfc9113_leading_and_trailing_ws_validation | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (nghttp2_option *,int) |  | nghttp2_option_set_server_fallback_rfc7540_priorities | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (ns_msg,int) |  | ns_msg_getflag | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (obstack *,int) |  | _obstack_newchunk | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (posix_spawnattr_t *,int) |  | posix_spawnattr_setcgroup_np | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (posix_spawnattr_t *,int) |  | posix_spawnattr_setschedpolicy | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (pthread_attr_t *,int) |  | __pthread_attr_setschedpolicy | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (pthread_barrierattr_t *,int) |  | __pthread_barrierattr_setpshared | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (pthread_mutexattr_t *,int) |  | ___pthread_mutexattr_settype | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (pthread_mutexattr_t *,int) |  | __pthread_mutexattr_setprioceiling | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (pthread_mutexattr_t *,int) |  | __pthread_mutexattr_setprotocol | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (pthread_rwlockattr_t *,int) |  | __pthread_rwlockattr_setkind_np | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (pthread_rwlockattr_t *,int) |  | __pthread_rwlockattr_setpshared | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (rule *,int) |  | Configlist_add | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (rule *,int) |  | Configlist_addbasis | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (sigset_t *,int) |  | sigaddset | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (sigset_t *,int) |  | sigdelset | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (sqlite3 *,int) |  | sqlite3_busy_timeout | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (sqlite3 *,int) |  | sqlite3_db_name | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (sqlite3 *,int) |  | sqlite3_wal_autocheckpoint | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (sqlite3_backup *,int) |  | sqlite3_backup_step | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (sqlite3_context *,int) |  | sqlite3_aggregate_context | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (sqlite3_context *,int) |  | sqlite3_result_error_code | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (sqlite3_index_info *,int) |  | sqlite3_vtab_collation | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (sqlite3_stmt *,int) |  | sqlite3_bind_parameter_name | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (sqlite3_stmt *,int) |  | sqlite3_column_blob | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (sqlite3_stmt *,int) |  | sqlite3_column_bytes | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (sqlite3_stmt *,int) |  | sqlite3_column_bytes16 | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (sqlite3_stmt *,int) |  | sqlite3_column_decltype | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (sqlite3_stmt *,int) |  | sqlite3_column_decltype16 | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (sqlite3_stmt *,int) |  | sqlite3_column_double | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (sqlite3_stmt *,int) |  | sqlite3_column_int | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (sqlite3_stmt *,int) |  | sqlite3_column_int64 | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (sqlite3_stmt *,int) |  | sqlite3_column_name | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (sqlite3_stmt *,int) |  | sqlite3_column_name16 | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (sqlite3_stmt *,int) |  | sqlite3_column_text | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (sqlite3_stmt *,int) |  | sqlite3_column_text16 | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (sqlite3_stmt *,int) |  | sqlite3_column_type | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (sqlite3_stmt *,int) |  | sqlite3_column_value | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (sqlite3_stmt *,int) |  | sqlite3_stmt_explain | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (stack_st_PKCS7 *,int) |  | PKCS12_add_safes | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (stack_st_SSL_COMP *,int) |  | ssl3_comp_find | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (stack_st_X509_ATTRIBUTE *,int) |  | X509at_delete_attr | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (stack_st_X509_EXTENSION *,int) |  | X509v3_delete_ext | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (timespec *,int) |  | __timespec_get | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (timespec *,int) |  | __timespec_getres | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (uint16_t,int) |  | tls1_group_id2nid | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (unsigned char *,int) |  | RAND_bytes | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (unsigned char *,int) |  | RAND_priv_bytes | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (unsigned char *,int) |  | ossl_ipaddr_to_asc | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (unsigned short,int) |  | dtls1_get_queue_priority | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (uv_env_item_t *,int) |  | uv_os_free_environ | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (void *,int) |  | DSO_dsobyaddr | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (void *,int) |  | sqlite3_realloc | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (void *const *,int) |  | __backtrace_symbols | 1 |
-| taint.cpp:302:6:302:14 | myAssign2 | (wchar_t,int) | CStringT | CStringT | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (ASN1_STRING *,int) |  | ASN1_STRING_length_set | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (ASYNC_WAIT_CTX *,int) |  | ASYNC_WAIT_CTX_set_status | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (BIGNUM *,int) |  | BN_clear_bit | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (BIGNUM *,int) |  | BN_mask_bits | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (BIGNUM *,int) |  | BN_set_bit | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (BIGNUM *,int) |  | BN_set_flags | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (BIGNUM *,int) |  | bn_expand2 | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (BIGNUM *,int) |  | bn_wexpand | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (BIGNUM *,int) |  | ossl_bn_mask_bits_fixed_top | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (BIO *,int) |  | BIO_clear_flags | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (BIO *,int) |  | BIO_find_type | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (BIO *,int) |  | BIO_set_flags | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (BIO *,int) |  | BIO_set_init | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (BIO *,int) |  | BIO_set_retry_reason | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (BIO *,int) |  | BIO_set_shutdown | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (BIO *,int) |  | TXT_DB_read | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (CMS_SignerInfo *,int) |  | CMS_signed_delete_attr | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (CMS_SignerInfo *,int) |  | CMS_unsigned_delete_attr | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (CURL *,int) |  | curl_easy_pause | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (Curl_easy *,int) |  | Curl_conn_get_socket | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (DH *,int) |  | DH_clear_flags | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (DH *,int) |  | DH_set_flags | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (DH_METHOD *,int) |  | DH_meth_set_flags | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (DSA *,int) |  | DSA_clear_flags | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (DSA *,int) |  | DSA_set_flags | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (DSA_METHOD *,int) |  | DSA_meth_set_flags | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (EC_GROUP *,int) |  | EC_GROUP_set_asn1_flag | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (EC_GROUP *,int) |  | EC_GROUP_set_curve_name | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (EC_KEY *,int) |  | EC_KEY_clear_flags | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (EC_KEY *,int) |  | EC_KEY_set_asn1_flag | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (EC_KEY *,int) |  | EC_KEY_set_flags | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (ENGINE *,int) |  | ENGINE_cmd_is_executable | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (ENGINE *,int) |  | ENGINE_set_flags | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (EVP_CIPHER *,int) |  | EVP_CIPHER_meth_set_impl_ctx_size | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (EVP_CIPHER *,int) |  | EVP_CIPHER_meth_set_iv_length | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_clear_flags | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_flags | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_key_length | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_num | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (EVP_KEYMGMT *,int) |  | evp_keymgmt_util_query_operation_name | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (EVP_MD *,int) |  | EVP_MD_meth_set_app_datasize | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (EVP_MD *,int) |  | EVP_MD_meth_set_input_blocksize | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (EVP_MD *,int) |  | EVP_MD_meth_set_result_size | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (EVP_MD_CTX *,int) |  | EVP_MD_CTX_clear_flags | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (EVP_MD_CTX *,int) |  | EVP_MD_CTX_set_flags | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (EVP_PKEY *,int) |  | EVP_PKEY_delete_attr | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (EVP_PKEY *,int) |  | EVP_PKEY_save_parameters | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (EVP_PKEY *,int) |  | EVP_PKEY_set_type | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_get_keygen_info | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_kdf_type | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_nid | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_paramgen_type | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_rfc5114 | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dhx_rfc5114 | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ec_param_enc | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ec_paramgen_curve_nid | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ecdh_kdf_type | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_hkdf_mode | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_rsa_padding | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_rsa_pss_saltlen | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_gindex | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_h | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_pcounter | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (FILE *,int) |  | _IO_default_pbackfail | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (FILE *,int) |  | _IO_fwide | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (FILE *,int) |  | _IO_init | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (FILE *,int) |  | _IO_init_internal | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (FILE *,int) |  | _IO_new_file_attach | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (FILE *,int) |  | _IO_new_file_overflow | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (FILE *,int) |  | _IO_old_init | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (FILE *,int) |  | _IO_sputbackc | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (FILE *,int) |  | _IO_str_overflow | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (FILE *,int) |  | _IO_str_pbackfail | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (FILE *,int) |  | __printf_buffer_as_file_overflow | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (FILE *,int) |  | __wprintf_buffer_as_file_overflow | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (FTS *,int) |  | fts_children | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (LIBSSH2_CHANNEL *,int) |  | _libssh2_channel_extended_data | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (LIBSSH2_CHANNEL *,int) |  | _libssh2_channel_flush | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_flush_ex | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_handle_extended_data | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_handle_extended_data2 | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_set_blocking | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (LIBSSH2_SESSION *,int) |  | _libssh2_session_set_blocking | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (LIBSSH2_SESSION *,int) |  | libssh2_hostkey_hash | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (LIBSSH2_SESSION *,int) |  | libssh2_session_methods | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (LIBSSH2_SESSION *,int) |  | libssh2_session_set_blocking | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (LIBSSH2_SESSION *,int) |  | libssh2_session_startup | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (LPCOLESTR,int) | CComBSTR | Append | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (OCSP_BASICRESP *,int) |  | OCSP_BASICRESP_delete_ext | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (OCSP_BASICRESP *,int) |  | OCSP_BASICRESP_get_ext | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (OCSP_BASICRESP *,int) |  | OCSP_resp_get0 | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (OCSP_ONEREQ *,int) |  | OCSP_ONEREQ_delete_ext | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (OCSP_ONEREQ *,int) |  | OCSP_ONEREQ_get_ext | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (OCSP_REQUEST *,int) |  | OCSP_REQUEST_delete_ext | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (OCSP_REQUEST *,int) |  | OCSP_REQUEST_get_ext | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (OCSP_REQUEST *,int) |  | OCSP_request_onereq_get0 | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (OCSP_SINGLERESP *,int) |  | OCSP_SINGLERESP_delete_ext | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (OCSP_SINGLERESP *,int) |  | OCSP_SINGLERESP_get_ext | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (OPENSSL_STACK *,int) |  | OPENSSL_sk_delete | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (OPENSSL_STACK *,int) |  | OPENSSL_sk_reserve | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (OPENSSL_sk_compfunc,int) |  | OPENSSL_sk_new_reserve | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (OSSL_ACKM *,int) |  | ossl_ackm_get_ack_deadline | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (OSSL_ACKM *,int) |  | ossl_ackm_get_ack_frame | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (OSSL_ACKM *,int) |  | ossl_ackm_get_largest_acked | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (OSSL_ACKM *,int) |  | ossl_ackm_on_pkt_space_discarded | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_set_serverPort | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (OSSL_CMP_CTX *,int) |  | ossl_cmp_ctx_set_failInfoCode | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (OSSL_CMP_CTX *,int) |  | ossl_cmp_ctx_set_status | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (OSSL_CMP_CTX *,int) |  | ossl_cmp_msg_create | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (OSSL_CMP_CTX *,int) |  | ossl_cmp_pollReq_new | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (OSSL_CMP_MSG *,int) |  | ossl_cmp_msg_set_bodytype | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (OSSL_CMP_PKIHEADER *,int) |  | ossl_cmp_hdr_set_pvno | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (OSSL_CMP_REVREPCONTENT *,int) |  | ossl_cmp_revrepcontent_get_CertId | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (OSSL_CMP_REVREPCONTENT *,int) |  | ossl_cmp_revrepcontent_get_pkisi | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_accept_raverified | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_accept_unprotected | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_grant_implicit_confirm | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_send_unprotected_errors | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (OSSL_CRMF_PKIPUBLICATIONINFO *,int) |  | OSSL_CRMF_MSG_set_PKIPublicationInfo_action | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (OSSL_DECODER_CTX *,int) |  | OSSL_DECODER_CTX_set_selection | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (OSSL_ENCODER_CTX *,int) |  | OSSL_ENCODER_CTX_set_selection | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (OSSL_LIB_CTX *,int) |  | OSSL_LIB_CTX_get_data | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (OSSL_LIB_CTX *,int) |  | OSSL_LIB_CTX_set_conf_diagnostics | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (OSSL_LIB_CTX *,int) |  | ossl_ctx_global_properties | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (OSSL_LIB_CTX *,int) |  | ossl_dh_new_by_nid_ex | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (OSSL_LIB_CTX *,int) |  | ossl_lib_ctx_get_data | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (OSSL_LIB_CTX *,int) |  | ossl_mac_key_new | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (OSSL_PARAM *,int) |  | OSSL_PARAM_set_int | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (OSSL_QRX *,int) |  | ossl_qrx_get_bytes_received | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (OSSL_RECORD_LAYER *,int) |  | tls_set_first_handshake | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (OSSL_RECORD_LAYER *,int) |  | tls_set_plain_alerts | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (OSSL_STORE_CTX *,int) |  | OSSL_STORE_expect | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (PKCS7 *,int) |  | PKCS7_set_type | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (QUIC_CHANNEL *,int) |  | ossl_quic_channel_new_stream_local | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (QUIC_ENGINE *,int) |  | ossl_quic_engine_set_inhibit_tick | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (QUIC_PORT *,int) |  | ossl_quic_port_set_allow_incoming | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (QUIC_RCIDM *,int) |  | ossl_quic_rcidm_get_preferred_tx_dcid_changed | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (QUIC_RSTREAM *,int) |  | ossl_quic_rstream_set_cleanse | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (QUIC_RXFC *,int) |  | ossl_quic_rxfc_get_error | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (QUIC_RXFC *,int) |  | ossl_quic_rxfc_has_cwm_changed | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (QUIC_SSTREAM *,int) |  | ossl_quic_sstream_set_cleanse | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (QUIC_STREAM_MAP *,int) |  | ossl_quic_stream_map_get_accept_queue_len | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (QUIC_TXFC *,int) |  | ossl_quic_txfc_has_become_blocked | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (RSA *,int) |  | RSA_clear_flags | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (RSA *,int) |  | RSA_set_flags | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (RSA_METHOD *,int) |  | RSA_meth_set_flags | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_hashalg | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_maskgenhashalg | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_saltlen | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_trailerfield | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (SSL *,int) |  | SSL_key_update | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (SSL *,int) |  | SSL_set_post_handshake_auth | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (SSL *,int) |  | SSL_set_purpose | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (SSL *,int) |  | SSL_set_quic_tls_early_data_enabled | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (SSL *,int) |  | SSL_set_quiet_shutdown | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (SSL *,int) |  | SSL_set_read_ahead | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (SSL *,int) |  | SSL_set_security_level | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (SSL *,int) |  | SSL_set_shutdown | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (SSL *,int) |  | SSL_set_trust | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (SSL *,int) |  | SSL_set_verify_depth | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (SSL_CONNECTION *,int) |  | dtls1_read_failed | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (SSL_CONNECTION *,int) |  | ossl_statem_send_fatal | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (SSL_CONNECTION *,int) |  | ossl_statem_set_in_init | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (SSL_CONNECTION *,int) |  | tls1_shared_group | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (SSL_CTX *,int) |  | SSL_CTX_set_post_handshake_auth | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (SSL_CTX *,int) |  | SSL_CTX_set_purpose | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (SSL_CTX *,int) |  | SSL_CTX_set_quiet_shutdown | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (SSL_CTX *,int) |  | SSL_CTX_set_security_level | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (SSL_CTX *,int) |  | SSL_CTX_set_srp_strength | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (SSL_CTX *,int) |  | SSL_CTX_set_trust | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (SSL_CTX *,int) |  | SSL_CTX_set_verify_depth | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (SSL_CTX *,int) |  | ssl_md | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (SSL_SESSION *,int) |  | SSL_SESSION_set_protocol_version | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (TS_REQ *,int) |  | TS_REQ_delete_ext | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (TS_REQ *,int) |  | TS_REQ_get_ext | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (TS_RESP_CTX *,int) |  | TS_RESP_CTX_add_flags | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (TS_STATUS_INFO *,int) |  | TS_STATUS_INFO_set_status | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (TS_TST_INFO *,int) |  | TS_TST_INFO_delete_ext | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (TS_TST_INFO *,int) |  | TS_TST_INFO_get_ext | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (TS_VERIFY_CTX *,int) |  | TS_VERIFY_CTX_add_flags | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (TS_VERIFY_CTX *,int) |  | TS_VERIFY_CTX_set_flags | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (WPACKET *,int) |  | ossl_DER_w_begin_sequence | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (X509 *,int) |  | X509_delete_ext | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (X509 *,int) |  | X509_self_signed | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (X509_ACERT *,int) |  | X509_ACERT_delete_attr | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (X509_ATTRIBUTE *,int) |  | X509_ATTRIBUTE_get0_type | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (X509_CRL *,int) |  | X509_CRL_delete_ext | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (X509_NAME *,int) |  | X509_NAME_delete_entry | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (X509_REQ *,int) |  | X509_REQ_delete_attr | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (X509_REVOKED *,int) |  | X509_REVOKED_delete_ext | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (X509_STORE *,int) |  | X509_STORE_set_depth | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (X509_STORE *,int) |  | X509_STORE_set_purpose | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (X509_STORE *,int) |  | X509_STORE_set_trust | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_depth | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_error | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_error_depth | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_purpose | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_trust | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_get0_host | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_auth_level | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_depth | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_purpose | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_trust | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (_Float128,int) |  | __ldexpf128 | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (_Float128,int) |  | __scalbnf128 | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (__sigset_t *,int) |  | __sigaddset_compat | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (__sigset_t *,int) |  | __sigdelset_compat | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (acttab *,int) |  | acttab_insert | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (addrinfo *,int) |  | support_format_addrinfo | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (aiocb_union *,int) |  | __aio_enqueue_request | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (argp_fmtstream_t,int) |  | __argp_fmtstream_putc | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (char **,int) |  | addrsort | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (char *,int) |  | Curl_str2addr | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (char *,int) |  | PEM_proc_type | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (char,int) | CStringT | CStringT | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (connectdata *,int) |  | Curl_conn_is_ssl | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const ASN1_BIT_STRING *,int) |  | ASN1_BIT_STRING_get_bit | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const BIGNUM *,int) |  | BN_get_flags | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const BIGNUM *,int) |  | BN_is_bit_set | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const BIO *,int) |  | BIO_get_ex_data | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const BIO *,int) |  | BIO_test_flags | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const CMS_SignerInfo *,int) |  | CMS_signed_get_attr | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const CMS_SignerInfo *,int) |  | CMS_unsigned_get_attr | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const CRYPTO_EX_DATA *,int) |  | CRYPTO_get_ex_data | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const DH *,int) |  | DH_get_ex_data | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const DH *,int) |  | DH_test_flags | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const DH *,int) |  | ossl_dh_dup | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const DSA *,int) |  | DSA_get_ex_data | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const DSA *,int) |  | DSA_test_flags | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const DSA *,int) |  | ossl_dsa_dup | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const ECX_KEY *,int) |  | ossl_ecx_key_dup | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const EC_KEY *,int) |  | EC_KEY_get_ex_data | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const EC_KEY *,int) |  | ossl_ec_key_dup | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const ENGINE *,int) |  | ENGINE_get_ex_data | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_test_flags | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const EVP_MD_CTX *,int) |  | EVP_MD_CTX_test_flags | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const EVP_PKEY *,int) |  | EVP_PKEY_get_attr | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const EVP_PKEY *,int) |  | EVP_PKEY_get_ex_data | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const ML_DSA_KEY *,int) |  | ossl_ml_dsa_key_dup | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const ML_KEM_KEY *,int) |  | ossl_ml_kem_key_dup | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const OPENSSL_STACK *,int) |  | OPENSSL_sk_value | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const OSSL_CMP_CERTREPMESSAGE *,int) |  | ossl_cmp_certrepmessage_get0_certresponse | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_get0_newPkey | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_get_option | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const OSSL_CMP_PKISI *,int) |  | ossl_cmp_pkisi_check_pkifailureinfo | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const OSSL_CMP_POLLREPCONTENT *,int) |  | ossl_cmp_pollrepcontent_get0_pollrep | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const QUIC_CHANNEL *,int) |  | ossl_quic_channel_get_local_stream_count_avail | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const QUIC_CHANNEL *,int) |  | ossl_quic_channel_get_remote_stream_count_avail | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const RSA *,int) |  | RSA_get_ex_data | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const RSA *,int) |  | RSA_test_flags | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const RSA *,int) |  | ossl_rsa_dup | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const SLH_DSA_KEY *,int) |  | ossl_slh_dsa_key_dup | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const SSL *,int) |  | SSL_get_ex_data | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const SSL_CTX *,int) |  | SSL_CTX_get_ex_data | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const SSL_SESSION *,int) |  | SSL_SESSION_get_ex_data | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const SSL_SESSION *,int) |  | ssl_session_dup | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const UI *,int) |  | UI_get_ex_data | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const UI_METHOD *,int) |  | UI_method_get_ex_data | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const X509 *,int) |  | X509_get_ex_data | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const X509 *,int) |  | X509_get_ext | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const X509_ACERT *,int) |  | X509_ACERT_get_attr | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const X509_CRL *,int) |  | X509_CRL_get_ext | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const X509_NAME *,int) |  | X509_NAME_get_entry | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const X509_POLICY_LEVEL *,int) |  | X509_policy_level_get0_node | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const X509_POLICY_TREE *,int) |  | X509_policy_tree_get0_level | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const X509_REQ *,int) |  | X509_REQ_get_attr | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const X509_REVOKED *,int) |  | X509_REVOKED_get_ext | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const X509_STORE *,int) |  | X509_STORE_get_ex_data | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const X509_STORE_CTX *,int) |  | X509_STORE_CTX_get_ex_data | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const XCHAR *,int) | CStringT | CStringT | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const YCHAR *,int) | CStringT | CStringT | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const char *,int) |  | DH_meth_new | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const char *,int) |  | DSA_meth_new | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const char *,int) |  | Jim_StrDupLen | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const char *,int) |  | NETSCAPE_SPKI_b64_decode | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const char *,int) |  | RSA_meth_new | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const char *,int) |  | ftok | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const char *,int) |  | gethostbyname2 | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const char *,int) |  | parse_yesno | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const char *,int) |  | res_gethostbyname2 | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const stack_st_X509_ATTRIBUTE *,int) |  | X509at_get_attr | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const stack_st_X509_EXTENSION *,int) |  | X509v3_get_ext | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const unsigned char *,int) |  | Jim_GenHashFunction | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const unsigned char *,int) |  | OPENSSL_uni2asc | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const unsigned char *,int) |  | OPENSSL_uni2utf8 | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (const void *,int) |  | inet6_rth_getaddr | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (double,int) |  | __ldexp | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (double,int) |  | __scalbn | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (double[],int) |  | getloadavg | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (dynhds *,int) |  | Curl_dynhds_set_opts | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (fexcept_t *,int) |  | fegetexceptflag | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (float,int) |  | __ldexpf | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (float,int) |  | __scalbnf | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (gzFile,int) |  | gzflush | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (gzFile,int) |  | gzputc | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (int *,int) |  | X509_PURPOSE_set | 0 |
-| taint.cpp:307:6:307:14 | myAssign3 | (int *,int) |  | X509_PURPOSE_set | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (int *,int) |  | X509_TRUST_set | 0 |
-| taint.cpp:307:6:307:14 | myAssign3 | (int *,int) |  | X509_TRUST_set | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (int *,int) |  | __lll_unlock_elision | 0 |
-| taint.cpp:307:6:307:14 | myAssign3 | (int *,int) |  | __lll_unlock_elision | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (int,int) |  | BN_security_bits | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (int,int) |  | EVP_MD_meth_new | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (int,int) |  | EVP_PKEY_meth_new | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (int,int) |  | __isctype | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (int,int) |  | acttab_alloc | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (int,int) |  | div | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (int,int) |  | inet6_rth_space | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (long double,int) |  | __ldexpl | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (netlink_handle *,int) |  | __netlink_request | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (nghttp2_option *,int) |  | nghttp2_option_set_no_auto_ping_ack | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (nghttp2_option *,int) |  | nghttp2_option_set_no_auto_window_update | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (nghttp2_option *,int) |  | nghttp2_option_set_no_closed_streams | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (nghttp2_option *,int) |  | nghttp2_option_set_no_http_messaging | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (nghttp2_option *,int) |  | nghttp2_option_set_no_recv_client_magic | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (nghttp2_option *,int) |  | nghttp2_option_set_no_rfc9113_leading_and_trailing_ws_validation | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (nghttp2_option *,int) |  | nghttp2_option_set_server_fallback_rfc7540_priorities | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (ns_msg,int) |  | ns_msg_getflag | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (obstack *,int) |  | _obstack_newchunk | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (posix_spawnattr_t *,int) |  | posix_spawnattr_setcgroup_np | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (posix_spawnattr_t *,int) |  | posix_spawnattr_setschedpolicy | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (pthread_attr_t *,int) |  | __pthread_attr_setschedpolicy | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (pthread_barrierattr_t *,int) |  | __pthread_barrierattr_setpshared | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (pthread_mutexattr_t *,int) |  | ___pthread_mutexattr_settype | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (pthread_mutexattr_t *,int) |  | __pthread_mutexattr_setprioceiling | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (pthread_mutexattr_t *,int) |  | __pthread_mutexattr_setprotocol | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (pthread_rwlockattr_t *,int) |  | __pthread_rwlockattr_setkind_np | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (pthread_rwlockattr_t *,int) |  | __pthread_rwlockattr_setpshared | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (rule *,int) |  | Configlist_add | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (rule *,int) |  | Configlist_addbasis | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (sigset_t *,int) |  | sigaddset | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (sigset_t *,int) |  | sigdelset | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (sqlite3 *,int) |  | sqlite3_busy_timeout | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (sqlite3 *,int) |  | sqlite3_db_name | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (sqlite3 *,int) |  | sqlite3_wal_autocheckpoint | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (sqlite3_backup *,int) |  | sqlite3_backup_step | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (sqlite3_context *,int) |  | sqlite3_aggregate_context | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (sqlite3_context *,int) |  | sqlite3_result_error_code | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (sqlite3_index_info *,int) |  | sqlite3_vtab_collation | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (sqlite3_stmt *,int) |  | sqlite3_bind_parameter_name | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (sqlite3_stmt *,int) |  | sqlite3_column_blob | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (sqlite3_stmt *,int) |  | sqlite3_column_bytes | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (sqlite3_stmt *,int) |  | sqlite3_column_bytes16 | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (sqlite3_stmt *,int) |  | sqlite3_column_decltype | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (sqlite3_stmt *,int) |  | sqlite3_column_decltype16 | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (sqlite3_stmt *,int) |  | sqlite3_column_double | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (sqlite3_stmt *,int) |  | sqlite3_column_int | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (sqlite3_stmt *,int) |  | sqlite3_column_int64 | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (sqlite3_stmt *,int) |  | sqlite3_column_name | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (sqlite3_stmt *,int) |  | sqlite3_column_name16 | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (sqlite3_stmt *,int) |  | sqlite3_column_text | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (sqlite3_stmt *,int) |  | sqlite3_column_text16 | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (sqlite3_stmt *,int) |  | sqlite3_column_type | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (sqlite3_stmt *,int) |  | sqlite3_column_value | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (sqlite3_stmt *,int) |  | sqlite3_stmt_explain | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (stack_st_PKCS7 *,int) |  | PKCS12_add_safes | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (stack_st_SSL_COMP *,int) |  | ssl3_comp_find | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (stack_st_X509_ATTRIBUTE *,int) |  | X509at_delete_attr | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (stack_st_X509_EXTENSION *,int) |  | X509v3_delete_ext | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (timespec *,int) |  | __timespec_get | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (timespec *,int) |  | __timespec_getres | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (uint16_t,int) |  | tls1_group_id2nid | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (unsigned char *,int) |  | RAND_bytes | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (unsigned char *,int) |  | RAND_priv_bytes | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (unsigned char *,int) |  | ossl_ipaddr_to_asc | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (unsigned short,int) |  | dtls1_get_queue_priority | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (uv_env_item_t *,int) |  | uv_os_free_environ | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (void *,int) |  | DSO_dsobyaddr | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (void *,int) |  | sqlite3_realloc | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (void *const *,int) |  | __backtrace_symbols | 1 |
-| taint.cpp:307:6:307:14 | myAssign3 | (wchar_t,int) | CStringT | CStringT | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (ASN1_STRING *,int) |  | ASN1_STRING_length_set | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (ASYNC_WAIT_CTX *,int) |  | ASYNC_WAIT_CTX_set_status | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (BIGNUM *,int) |  | BN_clear_bit | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (BIGNUM *,int) |  | BN_mask_bits | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (BIGNUM *,int) |  | BN_set_bit | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (BIGNUM *,int) |  | BN_set_flags | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (BIGNUM *,int) |  | bn_expand2 | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (BIGNUM *,int) |  | bn_wexpand | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (BIGNUM *,int) |  | ossl_bn_mask_bits_fixed_top | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (BIO *,int) |  | BIO_clear_flags | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (BIO *,int) |  | BIO_find_type | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (BIO *,int) |  | BIO_set_flags | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (BIO *,int) |  | BIO_set_init | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (BIO *,int) |  | BIO_set_retry_reason | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (BIO *,int) |  | BIO_set_shutdown | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (BIO *,int) |  | TXT_DB_read | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (CMS_SignerInfo *,int) |  | CMS_signed_delete_attr | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (CMS_SignerInfo *,int) |  | CMS_unsigned_delete_attr | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (CURL *,int) |  | curl_easy_pause | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (Curl_easy *,int) |  | Curl_conn_get_socket | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (DH *,int) |  | DH_clear_flags | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (DH *,int) |  | DH_set_flags | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (DH_METHOD *,int) |  | DH_meth_set_flags | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (DSA *,int) |  | DSA_clear_flags | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (DSA *,int) |  | DSA_set_flags | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (DSA_METHOD *,int) |  | DSA_meth_set_flags | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (EC_GROUP *,int) |  | EC_GROUP_set_asn1_flag | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (EC_GROUP *,int) |  | EC_GROUP_set_curve_name | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (EC_KEY *,int) |  | EC_KEY_clear_flags | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (EC_KEY *,int) |  | EC_KEY_set_asn1_flag | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (EC_KEY *,int) |  | EC_KEY_set_flags | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (ENGINE *,int) |  | ENGINE_cmd_is_executable | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (ENGINE *,int) |  | ENGINE_set_flags | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (EVP_CIPHER *,int) |  | EVP_CIPHER_meth_set_impl_ctx_size | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (EVP_CIPHER *,int) |  | EVP_CIPHER_meth_set_iv_length | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_clear_flags | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_flags | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_key_length | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_num | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (EVP_KEYMGMT *,int) |  | evp_keymgmt_util_query_operation_name | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (EVP_MD *,int) |  | EVP_MD_meth_set_app_datasize | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (EVP_MD *,int) |  | EVP_MD_meth_set_input_blocksize | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (EVP_MD *,int) |  | EVP_MD_meth_set_result_size | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (EVP_MD_CTX *,int) |  | EVP_MD_CTX_clear_flags | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (EVP_MD_CTX *,int) |  | EVP_MD_CTX_set_flags | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (EVP_PKEY *,int) |  | EVP_PKEY_delete_attr | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (EVP_PKEY *,int) |  | EVP_PKEY_save_parameters | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (EVP_PKEY *,int) |  | EVP_PKEY_set_type | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_get_keygen_info | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_kdf_type | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_nid | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_paramgen_type | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_rfc5114 | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dhx_rfc5114 | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ec_param_enc | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ec_paramgen_curve_nid | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ecdh_kdf_type | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_hkdf_mode | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_rsa_padding | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_rsa_pss_saltlen | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_gindex | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_h | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_pcounter | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (FILE *,int) |  | _IO_default_pbackfail | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (FILE *,int) |  | _IO_fwide | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (FILE *,int) |  | _IO_init | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (FILE *,int) |  | _IO_init_internal | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (FILE *,int) |  | _IO_new_file_attach | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (FILE *,int) |  | _IO_new_file_overflow | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (FILE *,int) |  | _IO_old_init | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (FILE *,int) |  | _IO_sputbackc | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (FILE *,int) |  | _IO_str_overflow | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (FILE *,int) |  | _IO_str_pbackfail | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (FILE *,int) |  | __printf_buffer_as_file_overflow | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (FILE *,int) |  | __wprintf_buffer_as_file_overflow | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (FTS *,int) |  | fts_children | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (LIBSSH2_CHANNEL *,int) |  | _libssh2_channel_extended_data | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (LIBSSH2_CHANNEL *,int) |  | _libssh2_channel_flush | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_flush_ex | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_handle_extended_data | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_handle_extended_data2 | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_set_blocking | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (LIBSSH2_SESSION *,int) |  | _libssh2_session_set_blocking | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (LIBSSH2_SESSION *,int) |  | libssh2_hostkey_hash | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (LIBSSH2_SESSION *,int) |  | libssh2_session_methods | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (LIBSSH2_SESSION *,int) |  | libssh2_session_set_blocking | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (LIBSSH2_SESSION *,int) |  | libssh2_session_startup | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (LPCOLESTR,int) | CComBSTR | Append | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (OCSP_BASICRESP *,int) |  | OCSP_BASICRESP_delete_ext | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (OCSP_BASICRESP *,int) |  | OCSP_BASICRESP_get_ext | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (OCSP_BASICRESP *,int) |  | OCSP_resp_get0 | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (OCSP_ONEREQ *,int) |  | OCSP_ONEREQ_delete_ext | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (OCSP_ONEREQ *,int) |  | OCSP_ONEREQ_get_ext | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (OCSP_REQUEST *,int) |  | OCSP_REQUEST_delete_ext | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (OCSP_REQUEST *,int) |  | OCSP_REQUEST_get_ext | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (OCSP_REQUEST *,int) |  | OCSP_request_onereq_get0 | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (OCSP_SINGLERESP *,int) |  | OCSP_SINGLERESP_delete_ext | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (OCSP_SINGLERESP *,int) |  | OCSP_SINGLERESP_get_ext | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (OPENSSL_STACK *,int) |  | OPENSSL_sk_delete | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (OPENSSL_STACK *,int) |  | OPENSSL_sk_reserve | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (OPENSSL_sk_compfunc,int) |  | OPENSSL_sk_new_reserve | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (OSSL_ACKM *,int) |  | ossl_ackm_get_ack_deadline | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (OSSL_ACKM *,int) |  | ossl_ackm_get_ack_frame | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (OSSL_ACKM *,int) |  | ossl_ackm_get_largest_acked | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (OSSL_ACKM *,int) |  | ossl_ackm_on_pkt_space_discarded | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_set_serverPort | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (OSSL_CMP_CTX *,int) |  | ossl_cmp_ctx_set_failInfoCode | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (OSSL_CMP_CTX *,int) |  | ossl_cmp_ctx_set_status | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (OSSL_CMP_CTX *,int) |  | ossl_cmp_msg_create | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (OSSL_CMP_CTX *,int) |  | ossl_cmp_pollReq_new | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (OSSL_CMP_MSG *,int) |  | ossl_cmp_msg_set_bodytype | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (OSSL_CMP_PKIHEADER *,int) |  | ossl_cmp_hdr_set_pvno | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (OSSL_CMP_REVREPCONTENT *,int) |  | ossl_cmp_revrepcontent_get_CertId | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (OSSL_CMP_REVREPCONTENT *,int) |  | ossl_cmp_revrepcontent_get_pkisi | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_accept_raverified | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_accept_unprotected | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_grant_implicit_confirm | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_send_unprotected_errors | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (OSSL_CRMF_PKIPUBLICATIONINFO *,int) |  | OSSL_CRMF_MSG_set_PKIPublicationInfo_action | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (OSSL_DECODER_CTX *,int) |  | OSSL_DECODER_CTX_set_selection | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (OSSL_ENCODER_CTX *,int) |  | OSSL_ENCODER_CTX_set_selection | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (OSSL_LIB_CTX *,int) |  | OSSL_LIB_CTX_get_data | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (OSSL_LIB_CTX *,int) |  | OSSL_LIB_CTX_set_conf_diagnostics | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (OSSL_LIB_CTX *,int) |  | ossl_ctx_global_properties | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (OSSL_LIB_CTX *,int) |  | ossl_dh_new_by_nid_ex | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (OSSL_LIB_CTX *,int) |  | ossl_lib_ctx_get_data | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (OSSL_LIB_CTX *,int) |  | ossl_mac_key_new | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (OSSL_PARAM *,int) |  | OSSL_PARAM_set_int | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (OSSL_QRX *,int) |  | ossl_qrx_get_bytes_received | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (OSSL_RECORD_LAYER *,int) |  | tls_set_first_handshake | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (OSSL_RECORD_LAYER *,int) |  | tls_set_plain_alerts | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (OSSL_STORE_CTX *,int) |  | OSSL_STORE_expect | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (PKCS7 *,int) |  | PKCS7_set_type | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (QUIC_CHANNEL *,int) |  | ossl_quic_channel_new_stream_local | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (QUIC_ENGINE *,int) |  | ossl_quic_engine_set_inhibit_tick | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (QUIC_PORT *,int) |  | ossl_quic_port_set_allow_incoming | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (QUIC_RCIDM *,int) |  | ossl_quic_rcidm_get_preferred_tx_dcid_changed | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (QUIC_RSTREAM *,int) |  | ossl_quic_rstream_set_cleanse | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (QUIC_RXFC *,int) |  | ossl_quic_rxfc_get_error | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (QUIC_RXFC *,int) |  | ossl_quic_rxfc_has_cwm_changed | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (QUIC_SSTREAM *,int) |  | ossl_quic_sstream_set_cleanse | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (QUIC_STREAM_MAP *,int) |  | ossl_quic_stream_map_get_accept_queue_len | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (QUIC_TXFC *,int) |  | ossl_quic_txfc_has_become_blocked | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (RSA *,int) |  | RSA_clear_flags | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (RSA *,int) |  | RSA_set_flags | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (RSA_METHOD *,int) |  | RSA_meth_set_flags | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_hashalg | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_maskgenhashalg | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_saltlen | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_trailerfield | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (SSL *,int) |  | SSL_key_update | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (SSL *,int) |  | SSL_set_post_handshake_auth | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (SSL *,int) |  | SSL_set_purpose | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (SSL *,int) |  | SSL_set_quic_tls_early_data_enabled | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (SSL *,int) |  | SSL_set_quiet_shutdown | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (SSL *,int) |  | SSL_set_read_ahead | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (SSL *,int) |  | SSL_set_security_level | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (SSL *,int) |  | SSL_set_shutdown | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (SSL *,int) |  | SSL_set_trust | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (SSL *,int) |  | SSL_set_verify_depth | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (SSL_CONNECTION *,int) |  | dtls1_read_failed | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (SSL_CONNECTION *,int) |  | ossl_statem_send_fatal | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (SSL_CONNECTION *,int) |  | ossl_statem_set_in_init | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (SSL_CONNECTION *,int) |  | tls1_shared_group | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (SSL_CTX *,int) |  | SSL_CTX_set_post_handshake_auth | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (SSL_CTX *,int) |  | SSL_CTX_set_purpose | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (SSL_CTX *,int) |  | SSL_CTX_set_quiet_shutdown | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (SSL_CTX *,int) |  | SSL_CTX_set_security_level | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (SSL_CTX *,int) |  | SSL_CTX_set_srp_strength | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (SSL_CTX *,int) |  | SSL_CTX_set_trust | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (SSL_CTX *,int) |  | SSL_CTX_set_verify_depth | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (SSL_CTX *,int) |  | ssl_md | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (SSL_SESSION *,int) |  | SSL_SESSION_set_protocol_version | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (TS_REQ *,int) |  | TS_REQ_delete_ext | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (TS_REQ *,int) |  | TS_REQ_get_ext | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (TS_RESP_CTX *,int) |  | TS_RESP_CTX_add_flags | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (TS_STATUS_INFO *,int) |  | TS_STATUS_INFO_set_status | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (TS_TST_INFO *,int) |  | TS_TST_INFO_delete_ext | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (TS_TST_INFO *,int) |  | TS_TST_INFO_get_ext | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (TS_VERIFY_CTX *,int) |  | TS_VERIFY_CTX_add_flags | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (TS_VERIFY_CTX *,int) |  | TS_VERIFY_CTX_set_flags | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (WPACKET *,int) |  | ossl_DER_w_begin_sequence | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (X509 *,int) |  | X509_delete_ext | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (X509 *,int) |  | X509_self_signed | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (X509_ACERT *,int) |  | X509_ACERT_delete_attr | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (X509_ATTRIBUTE *,int) |  | X509_ATTRIBUTE_get0_type | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (X509_CRL *,int) |  | X509_CRL_delete_ext | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (X509_NAME *,int) |  | X509_NAME_delete_entry | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (X509_REQ *,int) |  | X509_REQ_delete_attr | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (X509_REVOKED *,int) |  | X509_REVOKED_delete_ext | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (X509_STORE *,int) |  | X509_STORE_set_depth | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (X509_STORE *,int) |  | X509_STORE_set_purpose | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (X509_STORE *,int) |  | X509_STORE_set_trust | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_depth | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_error | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_error_depth | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_purpose | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_trust | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_get0_host | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_auth_level | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_depth | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_purpose | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_trust | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (_Float128,int) |  | __ldexpf128 | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (_Float128,int) |  | __scalbnf128 | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (__sigset_t *,int) |  | __sigaddset_compat | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (__sigset_t *,int) |  | __sigdelset_compat | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (acttab *,int) |  | acttab_insert | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (addrinfo *,int) |  | support_format_addrinfo | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (aiocb_union *,int) |  | __aio_enqueue_request | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (argp_fmtstream_t,int) |  | __argp_fmtstream_putc | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (char **,int) |  | addrsort | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (char *,int) |  | Curl_str2addr | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (char *,int) |  | PEM_proc_type | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (char,int) | CStringT | CStringT | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (connectdata *,int) |  | Curl_conn_is_ssl | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const ASN1_BIT_STRING *,int) |  | ASN1_BIT_STRING_get_bit | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const BIGNUM *,int) |  | BN_get_flags | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const BIGNUM *,int) |  | BN_is_bit_set | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const BIO *,int) |  | BIO_get_ex_data | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const BIO *,int) |  | BIO_test_flags | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const CMS_SignerInfo *,int) |  | CMS_signed_get_attr | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const CMS_SignerInfo *,int) |  | CMS_unsigned_get_attr | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const CRYPTO_EX_DATA *,int) |  | CRYPTO_get_ex_data | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const DH *,int) |  | DH_get_ex_data | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const DH *,int) |  | DH_test_flags | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const DH *,int) |  | ossl_dh_dup | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const DSA *,int) |  | DSA_get_ex_data | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const DSA *,int) |  | DSA_test_flags | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const DSA *,int) |  | ossl_dsa_dup | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const ECX_KEY *,int) |  | ossl_ecx_key_dup | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const EC_KEY *,int) |  | EC_KEY_get_ex_data | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const EC_KEY *,int) |  | ossl_ec_key_dup | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const ENGINE *,int) |  | ENGINE_get_ex_data | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_test_flags | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const EVP_MD_CTX *,int) |  | EVP_MD_CTX_test_flags | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const EVP_PKEY *,int) |  | EVP_PKEY_get_attr | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const EVP_PKEY *,int) |  | EVP_PKEY_get_ex_data | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const ML_DSA_KEY *,int) |  | ossl_ml_dsa_key_dup | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const ML_KEM_KEY *,int) |  | ossl_ml_kem_key_dup | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const OPENSSL_STACK *,int) |  | OPENSSL_sk_value | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const OSSL_CMP_CERTREPMESSAGE *,int) |  | ossl_cmp_certrepmessage_get0_certresponse | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_get0_newPkey | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_get_option | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const OSSL_CMP_PKISI *,int) |  | ossl_cmp_pkisi_check_pkifailureinfo | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const OSSL_CMP_POLLREPCONTENT *,int) |  | ossl_cmp_pollrepcontent_get0_pollrep | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const QUIC_CHANNEL *,int) |  | ossl_quic_channel_get_local_stream_count_avail | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const QUIC_CHANNEL *,int) |  | ossl_quic_channel_get_remote_stream_count_avail | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const RSA *,int) |  | RSA_get_ex_data | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const RSA *,int) |  | RSA_test_flags | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const RSA *,int) |  | ossl_rsa_dup | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const SLH_DSA_KEY *,int) |  | ossl_slh_dsa_key_dup | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const SSL *,int) |  | SSL_get_ex_data | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const SSL_CTX *,int) |  | SSL_CTX_get_ex_data | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const SSL_SESSION *,int) |  | SSL_SESSION_get_ex_data | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const SSL_SESSION *,int) |  | ssl_session_dup | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const UI *,int) |  | UI_get_ex_data | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const UI_METHOD *,int) |  | UI_method_get_ex_data | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const X509 *,int) |  | X509_get_ex_data | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const X509 *,int) |  | X509_get_ext | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const X509_ACERT *,int) |  | X509_ACERT_get_attr | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const X509_CRL *,int) |  | X509_CRL_get_ext | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const X509_NAME *,int) |  | X509_NAME_get_entry | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const X509_POLICY_LEVEL *,int) |  | X509_policy_level_get0_node | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const X509_POLICY_TREE *,int) |  | X509_policy_tree_get0_level | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const X509_REQ *,int) |  | X509_REQ_get_attr | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const X509_REVOKED *,int) |  | X509_REVOKED_get_ext | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const X509_STORE *,int) |  | X509_STORE_get_ex_data | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const X509_STORE_CTX *,int) |  | X509_STORE_CTX_get_ex_data | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const XCHAR *,int) | CStringT | CStringT | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const YCHAR *,int) | CStringT | CStringT | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const char *,int) |  | DH_meth_new | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const char *,int) |  | DSA_meth_new | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const char *,int) |  | Jim_StrDupLen | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const char *,int) |  | NETSCAPE_SPKI_b64_decode | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const char *,int) |  | RSA_meth_new | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const char *,int) |  | ftok | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const char *,int) |  | gethostbyname2 | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const char *,int) |  | parse_yesno | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const char *,int) |  | res_gethostbyname2 | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const stack_st_X509_ATTRIBUTE *,int) |  | X509at_get_attr | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const stack_st_X509_EXTENSION *,int) |  | X509v3_get_ext | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const unsigned char *,int) |  | Jim_GenHashFunction | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const unsigned char *,int) |  | OPENSSL_uni2asc | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const unsigned char *,int) |  | OPENSSL_uni2utf8 | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (const void *,int) |  | inet6_rth_getaddr | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (double,int) |  | __ldexp | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (double,int) |  | __scalbn | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (double[],int) |  | getloadavg | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (dynhds *,int) |  | Curl_dynhds_set_opts | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (fexcept_t *,int) |  | fegetexceptflag | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (float,int) |  | __ldexpf | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (float,int) |  | __scalbnf | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (gzFile,int) |  | gzflush | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (gzFile,int) |  | gzputc | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (int *,int) |  | X509_PURPOSE_set | 0 |
-| taint.cpp:312:6:312:14 | myAssign4 | (int *,int) |  | X509_PURPOSE_set | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (int *,int) |  | X509_TRUST_set | 0 |
-| taint.cpp:312:6:312:14 | myAssign4 | (int *,int) |  | X509_TRUST_set | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (int *,int) |  | __lll_unlock_elision | 0 |
-| taint.cpp:312:6:312:14 | myAssign4 | (int *,int) |  | __lll_unlock_elision | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (int,int) |  | BN_security_bits | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (int,int) |  | EVP_MD_meth_new | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (int,int) |  | EVP_PKEY_meth_new | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (int,int) |  | __isctype | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (int,int) |  | acttab_alloc | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (int,int) |  | div | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (int,int) |  | inet6_rth_space | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (long double,int) |  | __ldexpl | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (netlink_handle *,int) |  | __netlink_request | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (nghttp2_option *,int) |  | nghttp2_option_set_no_auto_ping_ack | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (nghttp2_option *,int) |  | nghttp2_option_set_no_auto_window_update | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (nghttp2_option *,int) |  | nghttp2_option_set_no_closed_streams | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (nghttp2_option *,int) |  | nghttp2_option_set_no_http_messaging | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (nghttp2_option *,int) |  | nghttp2_option_set_no_recv_client_magic | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (nghttp2_option *,int) |  | nghttp2_option_set_no_rfc9113_leading_and_trailing_ws_validation | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (nghttp2_option *,int) |  | nghttp2_option_set_server_fallback_rfc7540_priorities | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (ns_msg,int) |  | ns_msg_getflag | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (obstack *,int) |  | _obstack_newchunk | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (posix_spawnattr_t *,int) |  | posix_spawnattr_setcgroup_np | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (posix_spawnattr_t *,int) |  | posix_spawnattr_setschedpolicy | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (pthread_attr_t *,int) |  | __pthread_attr_setschedpolicy | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (pthread_barrierattr_t *,int) |  | __pthread_barrierattr_setpshared | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (pthread_mutexattr_t *,int) |  | ___pthread_mutexattr_settype | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (pthread_mutexattr_t *,int) |  | __pthread_mutexattr_setprioceiling | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (pthread_mutexattr_t *,int) |  | __pthread_mutexattr_setprotocol | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (pthread_rwlockattr_t *,int) |  | __pthread_rwlockattr_setkind_np | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (pthread_rwlockattr_t *,int) |  | __pthread_rwlockattr_setpshared | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (rule *,int) |  | Configlist_add | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (rule *,int) |  | Configlist_addbasis | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (sigset_t *,int) |  | sigaddset | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (sigset_t *,int) |  | sigdelset | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (sqlite3 *,int) |  | sqlite3_busy_timeout | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (sqlite3 *,int) |  | sqlite3_db_name | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (sqlite3 *,int) |  | sqlite3_wal_autocheckpoint | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (sqlite3_backup *,int) |  | sqlite3_backup_step | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (sqlite3_context *,int) |  | sqlite3_aggregate_context | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (sqlite3_context *,int) |  | sqlite3_result_error_code | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (sqlite3_index_info *,int) |  | sqlite3_vtab_collation | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (sqlite3_stmt *,int) |  | sqlite3_bind_parameter_name | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (sqlite3_stmt *,int) |  | sqlite3_column_blob | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (sqlite3_stmt *,int) |  | sqlite3_column_bytes | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (sqlite3_stmt *,int) |  | sqlite3_column_bytes16 | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (sqlite3_stmt *,int) |  | sqlite3_column_decltype | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (sqlite3_stmt *,int) |  | sqlite3_column_decltype16 | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (sqlite3_stmt *,int) |  | sqlite3_column_double | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (sqlite3_stmt *,int) |  | sqlite3_column_int | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (sqlite3_stmt *,int) |  | sqlite3_column_int64 | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (sqlite3_stmt *,int) |  | sqlite3_column_name | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (sqlite3_stmt *,int) |  | sqlite3_column_name16 | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (sqlite3_stmt *,int) |  | sqlite3_column_text | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (sqlite3_stmt *,int) |  | sqlite3_column_text16 | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (sqlite3_stmt *,int) |  | sqlite3_column_type | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (sqlite3_stmt *,int) |  | sqlite3_column_value | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (sqlite3_stmt *,int) |  | sqlite3_stmt_explain | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (stack_st_PKCS7 *,int) |  | PKCS12_add_safes | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (stack_st_SSL_COMP *,int) |  | ssl3_comp_find | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (stack_st_X509_ATTRIBUTE *,int) |  | X509at_delete_attr | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (stack_st_X509_EXTENSION *,int) |  | X509v3_delete_ext | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (timespec *,int) |  | __timespec_get | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (timespec *,int) |  | __timespec_getres | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (uint16_t,int) |  | tls1_group_id2nid | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (unsigned char *,int) |  | RAND_bytes | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (unsigned char *,int) |  | RAND_priv_bytes | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (unsigned char *,int) |  | ossl_ipaddr_to_asc | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (unsigned short,int) |  | dtls1_get_queue_priority | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (uv_env_item_t *,int) |  | uv_os_free_environ | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (void *,int) |  | DSO_dsobyaddr | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (void *,int) |  | sqlite3_realloc | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (void *const *,int) |  | __backtrace_symbols | 1 |
-| taint.cpp:312:6:312:14 | myAssign4 | (wchar_t,int) | CStringT | CStringT | 1 |
-| taint.cpp:361:7:361:12 | strdup | (const char *) |  | BIO_gethostbyname | 0 |
-| taint.cpp:361:7:361:12 | strdup | (const char *) |  | Curl_copy_header_value | 0 |
-| taint.cpp:361:7:361:12 | strdup | (const char *) |  | Curl_get_scheme_handler | 0 |
-| taint.cpp:361:7:361:12 | strdup | (const char *) |  | Curl_getdate_capped | 0 |
-| taint.cpp:361:7:361:12 | strdup | (const char *) |  | Jim_StrDup | 0 |
-| taint.cpp:361:7:361:12 | strdup | (const char *) |  | OPENSSL_LH_strhash | 0 |
-| taint.cpp:361:7:361:12 | strdup | (const char *) |  | OSSL_STORE_SEARCH_by_alias | 0 |
-| taint.cpp:361:7:361:12 | strdup | (const char *) |  | Strsafe | 0 |
-| taint.cpp:361:7:361:12 | strdup | (const char *) |  | Symbol_new | 0 |
-| taint.cpp:361:7:361:12 | strdup | (const char *) |  | UI_create_method | 0 |
-| taint.cpp:361:7:361:12 | strdup | (const char *) |  | X509V3_parse_list | 0 |
-| taint.cpp:361:7:361:12 | strdup | (const char *) |  | X509_LOOKUP_meth_new | 0 |
-| taint.cpp:361:7:361:12 | strdup | (const char *) |  | __basename | 0 |
-| taint.cpp:361:7:361:12 | strdup | (const char *) |  | __gconv_find_shlib | 0 |
-| taint.cpp:361:7:361:12 | strdup | (const char *) |  | __gettext | 0 |
-| taint.cpp:361:7:361:12 | strdup | (const char *) |  | __hash_string | 0 |
-| taint.cpp:361:7:361:12 | strdup | (const char *) |  | __nss_action_parse | 0 |
-| taint.cpp:361:7:361:12 | strdup | (const char *) |  | __strdup | 0 |
-| taint.cpp:361:7:361:12 | strdup | (const char *) |  | __textdomain | 0 |
-| taint.cpp:361:7:361:12 | strdup | (const char *) |  | __tzset_parse_tz | 0 |
-| taint.cpp:361:7:361:12 | strdup | (const char *) |  | __tzstring | 0 |
-| taint.cpp:361:7:361:12 | strdup | (const char *) |  | a2i_IPADDRESS | 0 |
-| taint.cpp:361:7:361:12 | strdup | (const char *) |  | a2i_IPADDRESS_NC | 0 |
-| taint.cpp:361:7:361:12 | strdup | (const char *) |  | a64l | 0 |
-| taint.cpp:361:7:361:12 | strdup | (const char *) |  | charmap_opendir | 0 |
-| taint.cpp:361:7:361:12 | strdup | (const char *) |  | ether_aton | 0 |
-| taint.cpp:361:7:361:12 | strdup | (const char *) |  | getdate | 0 |
-| taint.cpp:361:7:361:12 | strdup | (const char *) |  | inetstr2int | 0 |
-| taint.cpp:361:7:361:12 | strdup | (const char *) |  | last_component | 0 |
-| taint.cpp:361:7:361:12 | strdup | (const char *) |  | new_glibc_hwcaps_subdirectory | 0 |
-| taint.cpp:361:7:361:12 | strdup | (const char *) |  | opt_path_end | 0 |
-| taint.cpp:361:7:361:12 | strdup | (const char *) |  | opt_progname | 0 |
-| taint.cpp:361:7:361:12 | strdup | (const char *) |  | ossl_lh_strcasehash | 0 |
-| taint.cpp:361:7:361:12 | strdup | (const char *) |  | repertoire_read | 0 |
-| taint.cpp:361:7:361:12 | strdup | (const char *) |  | res_gethostbyname | 0 |
-| taint.cpp:361:7:361:12 | strdup | (const char *) |  | sgetsgent | 0 |
-| taint.cpp:361:7:361:12 | strdup | (const char *) |  | sgetspent | 0 |
-| taint.cpp:361:7:361:12 | strdup | (const char *) |  | strhash | 0 |
-| taint.cpp:361:7:361:12 | strdup | (const char *) |  | uc_script_byname | 0 |
-| taint.cpp:361:7:361:12 | strdup | (const char *) |  | uv__strdup | 0 |
-| taint.cpp:361:7:361:12 | strdup | (const char *) |  | uv_wtf8_length_as_utf16 | 0 |
-| taint.cpp:361:7:361:12 | strdup | (const char *) |  | xstrdup | 0 |
-| taint.cpp:362:7:362:13 | strndup | (ASN1_PCTX *,unsigned long) |  | ASN1_PCTX_set_cert_flags | 1 |
-| taint.cpp:362:7:362:13 | strndup | (ASN1_PCTX *,unsigned long) |  | ASN1_PCTX_set_flags | 1 |
-| taint.cpp:362:7:362:13 | strndup | (ASN1_PCTX *,unsigned long) |  | ASN1_PCTX_set_nm_flags | 1 |
-| taint.cpp:362:7:362:13 | strndup | (ASN1_PCTX *,unsigned long) |  | ASN1_PCTX_set_oid_flags | 1 |
-| taint.cpp:362:7:362:13 | strndup | (ASN1_PCTX *,unsigned long) |  | ASN1_PCTX_set_str_flags | 1 |
-| taint.cpp:362:7:362:13 | strndup | (BIGNUM *,unsigned long) |  | BN_add_word | 1 |
-| taint.cpp:362:7:362:13 | strndup | (BIGNUM *,unsigned long) |  | BN_div_word | 1 |
-| taint.cpp:362:7:362:13 | strndup | (BIGNUM *,unsigned long) |  | BN_set_word | 1 |
-| taint.cpp:362:7:362:13 | strndup | (BIGNUM *,unsigned long) |  | BN_sub_word | 1 |
-| taint.cpp:362:7:362:13 | strndup | (BN_BLINDING *,unsigned long) |  | BN_BLINDING_set_flags | 1 |
-| taint.cpp:362:7:362:13 | strndup | (BUF_MEM *,size_t) |  | BUF_MEM_grow | 1 |
-| taint.cpp:362:7:362:13 | strndup | (BUF_MEM *,size_t) |  | BUF_MEM_grow_clean | 1 |
-| taint.cpp:362:7:362:13 | strndup | (CONF_IMODULE *,unsigned long) |  | CONF_imodule_set_flags | 1 |
-| taint.cpp:362:7:362:13 | strndup | (Curl_hash *,size_t) |  | Curl_init_dnscache | 1 |
-| taint.cpp:362:7:362:13 | strndup | (EVP_CIPHER *,unsigned long) |  | EVP_CIPHER_meth_set_flags | 1 |
-| taint.cpp:362:7:362:13 | strndup | (EVP_MD *,unsigned long) |  | EVP_MD_meth_set_flags | 1 |
-| taint.cpp:362:7:362:13 | strndup | (HMAC_CTX *,unsigned long) |  | HMAC_CTX_set_flags | 1 |
-| taint.cpp:362:7:362:13 | strndup | (OPENSSL_INIT_SETTINGS *,unsigned long) |  | OPENSSL_INIT_set_config_file_flags | 1 |
-| taint.cpp:362:7:362:13 | strndup | (OPENSSL_LHASH *,unsigned long) |  | OPENSSL_LH_set_down_load | 1 |
-| taint.cpp:362:7:362:13 | strndup | (OSSL_HPKE_SUITE,size_t) |  | OSSL_HPKE_get_ciphertext_size | 1 |
-| taint.cpp:362:7:362:13 | strndup | (OSSL_HTTP_REQ_CTX *,size_t) |  | OSSL_HTTP_REQ_CTX_set_max_response_hdr_lines | 1 |
-| taint.cpp:362:7:362:13 | strndup | (OSSL_HTTP_REQ_CTX *,unsigned long) |  | OSSL_HTTP_REQ_CTX_set_max_response_length | 1 |
-| taint.cpp:362:7:362:13 | strndup | (OSSL_LIB_CTX *,size_t) |  | ossl_quic_lcidm_new | 1 |
-| taint.cpp:362:7:362:13 | strndup | (OSSL_PARAM *,size_t) |  | OSSL_PARAM_set_size_t | 1 |
-| taint.cpp:362:7:362:13 | strndup | (OSSL_PARAM *,unsigned long) |  | OSSL_PARAM_set_ulong | 1 |
-| taint.cpp:362:7:362:13 | strndup | (OSSL_PQUEUE *,size_t) |  | ossl_pqueue_remove | 1 |
-| taint.cpp:362:7:362:13 | strndup | (OSSL_PROVIDER *,size_t) |  | ossl_provider_set_operation_bit | 1 |
-| taint.cpp:362:7:362:13 | strndup | (OSSL_QTX *,size_t) |  | ossl_qtx_set_mdpl | 1 |
-| taint.cpp:362:7:362:13 | strndup | (OSSL_QUIC_TX_PACKETISER *,size_t) |  | ossl_quic_tx_packetiser_add_unvalidated_credit | 1 |
-| taint.cpp:362:7:362:13 | strndup | (OSSL_QUIC_TX_PACKETISER *,size_t) |  | ossl_quic_tx_packetiser_consume_unvalidated_credit | 1 |
-| taint.cpp:362:7:362:13 | strndup | (OSSL_QUIC_TX_PACKETISER *,size_t) |  | ossl_quic_tx_packetiser_record_received_closing_bytes | 1 |
-| taint.cpp:362:7:362:13 | strndup | (OSSL_RECORD_LAYER *,size_t) |  | tls_set_max_frag_len | 1 |
-| taint.cpp:362:7:362:13 | strndup | (OSSL_RECORD_LAYER *,size_t) |  | tls_set_max_pipelines | 1 |
-| taint.cpp:362:7:362:13 | strndup | (QUIC_RSTREAM *,size_t) |  | ossl_quic_rstream_release_record | 1 |
-| taint.cpp:362:7:362:13 | strndup | (QUIC_RSTREAM *,size_t) |  | ossl_quic_rstream_resize_rbuf | 1 |
-| taint.cpp:362:7:362:13 | strndup | (QUIC_RXFC *,size_t) |  | ossl_quic_rxfc_set_max_window_size | 1 |
-| taint.cpp:362:7:362:13 | strndup | (QUIC_SSTREAM *,size_t) |  | ossl_quic_sstream_set_buffer_size | 1 |
-| taint.cpp:362:7:362:13 | strndup | (QUIC_STREAM_MAP *,size_t) |  | ossl_quic_stream_map_set_rr_stepping | 1 |
-| taint.cpp:362:7:362:13 | strndup | (RAND_POOL *,size_t) |  | ossl_rand_pool_add_begin | 1 |
-| taint.cpp:362:7:362:13 | strndup | (SIPHASH *,size_t) |  | SipHash_set_hash_size | 1 |
-| taint.cpp:362:7:362:13 | strndup | (SSL *,size_t) |  | SSL_set_block_padding | 1 |
-| taint.cpp:362:7:362:13 | strndup | (SSL *,size_t) |  | SSL_set_default_read_buffer_len | 1 |
-| taint.cpp:362:7:362:13 | strndup | (SSL *,size_t) |  | SSL_set_num_tickets | 1 |
-| taint.cpp:362:7:362:13 | strndup | (SSL *,unsigned long) |  | SSL_dane_clear_flags | 1 |
-| taint.cpp:362:7:362:13 | strndup | (SSL *,unsigned long) |  | SSL_dane_set_flags | 1 |
-| taint.cpp:362:7:362:13 | strndup | (SSL_CONNECTION *,unsigned long) |  | tls1_check_ec_tmp_key | 1 |
-| taint.cpp:362:7:362:13 | strndup | (SSL_CTX *,size_t) |  | SSL_CTX_set_block_padding | 1 |
-| taint.cpp:362:7:362:13 | strndup | (SSL_CTX *,size_t) |  | SSL_CTX_set_default_read_buffer_len | 1 |
-| taint.cpp:362:7:362:13 | strndup | (SSL_CTX *,size_t) |  | SSL_CTX_set_num_tickets | 1 |
-| taint.cpp:362:7:362:13 | strndup | (SSL_CTX *,unsigned long) |  | SSL_CTX_dane_clear_flags | 1 |
-| taint.cpp:362:7:362:13 | strndup | (SSL_CTX *,unsigned long) |  | SSL_CTX_dane_set_flags | 1 |
-| taint.cpp:362:7:362:13 | strndup | (WPACKET *,size_t) |  | WPACKET_init_null | 1 |
-| taint.cpp:362:7:362:13 | strndup | (WPACKET *,size_t) |  | WPACKET_set_max_size | 1 |
-| taint.cpp:362:7:362:13 | strndup | (WPACKET *,size_t) |  | WPACKET_start_sub_packet_len__ | 1 |
-| taint.cpp:362:7:362:13 | strndup | (WPACKET *,size_t) |  | ossl_quic_wire_encode_padding | 1 |
-| taint.cpp:362:7:362:13 | strndup | (X509_STORE *,unsigned long) |  | X509_STORE_set_flags | 1 |
-| taint.cpp:362:7:362:13 | strndup | (X509_STORE_CTX *,unsigned long) |  | X509_STORE_CTX_set_flags | 1 |
-| taint.cpp:362:7:362:13 | strndup | (X509_VERIFY_PARAM *,unsigned long) |  | X509_VERIFY_PARAM_clear_flags | 1 |
-| taint.cpp:362:7:362:13 | strndup | (X509_VERIFY_PARAM *,unsigned long) |  | X509_VERIFY_PARAM_set_flags | 1 |
-| taint.cpp:362:7:362:13 | strndup | (__gconv_step *,size_t) |  | __gconv_close_transform | 1 |
-| taint.cpp:362:7:362:13 | strndup | (argp_fmtstream_t,size_t) |  | __argp_fmtstream_set_lmargin | 1 |
-| taint.cpp:362:7:362:13 | strndup | (argp_fmtstream_t,size_t) |  | __argp_fmtstream_set_rmargin | 1 |
-| taint.cpp:362:7:362:13 | strndup | (argp_fmtstream_t,size_t) |  | __argp_fmtstream_set_wmargin | 1 |
-| taint.cpp:362:7:362:13 | strndup | (bufq *,size_t) |  | Curl_bufq_skip | 1 |
-| taint.cpp:362:7:362:13 | strndup | (bufq *,size_t) |  | Curl_bufq_unwrite | 1 |
-| taint.cpp:362:7:362:13 | strndup | (char *,size_t) |  | RAND_file_name | 1 |
-| taint.cpp:362:7:362:13 | strndup | (char *,size_t) |  | __getcwd | 1 |
-| taint.cpp:362:7:362:13 | strndup | (char *,size_t) |  | __gets_chk | 1 |
-| taint.cpp:362:7:362:13 | strndup | (char *,size_t) |  | __getwd_chk | 1 |
-| taint.cpp:362:7:362:13 | strndup | (char *,size_t) |  | plain_method | 1 |
-| taint.cpp:362:7:362:13 | strndup | (const BIGNUM *,unsigned long) |  | BN_mod_word | 1 |
-| taint.cpp:362:7:362:13 | strndup | (const char *,size_t) |  | Curl_getn_scheme_handler | 0 |
-| taint.cpp:362:7:362:13 | strndup | (const char *,size_t) |  | Curl_getn_scheme_handler | 1 |
-| taint.cpp:362:7:362:13 | strndup | (const char *,size_t) |  | Curl_memdup0 | 0 |
-| taint.cpp:362:7:362:13 | strndup | (const char *,size_t) |  | Curl_memdup0 | 1 |
-| taint.cpp:362:7:362:13 | strndup | (const char *,size_t) |  | OPENSSL_strnlen | 0 |
-| taint.cpp:362:7:362:13 | strndup | (const char *,size_t) |  | OPENSSL_strnlen | 1 |
-| taint.cpp:362:7:362:13 | strndup | (const char *,size_t) |  | __nss_module_allocate | 0 |
-| taint.cpp:362:7:362:13 | strndup | (const char *,size_t) |  | __nss_module_allocate | 1 |
-| taint.cpp:362:7:362:13 | strndup | (const char *,size_t) |  | __strndup | 0 |
-| taint.cpp:362:7:362:13 | strndup | (const char *,size_t) |  | __strndup | 1 |
-| taint.cpp:362:7:362:13 | strndup | (const char *,size_t) |  | charmap_hash | 0 |
-| taint.cpp:362:7:362:13 | strndup | (const char *,size_t) |  | charmap_hash | 1 |
-| taint.cpp:362:7:362:13 | strndup | (const char *,size_t) |  | locfile_hash | 0 |
-| taint.cpp:362:7:362:13 | strndup | (const char *,size_t) |  | locfile_hash | 1 |
-| taint.cpp:362:7:362:13 | strndup | (const char *,size_t) |  | mblen | 0 |
-| taint.cpp:362:7:362:13 | strndup | (const char *,size_t) |  | mblen | 1 |
-| taint.cpp:362:7:362:13 | strndup | (const char *,size_t) |  | uv__strndup | 0 |
-| taint.cpp:362:7:362:13 | strndup | (const char *,size_t) |  | uv__strndup | 1 |
-| taint.cpp:362:7:362:13 | strndup | (const char *,size_t) |  | xstrndup | 0 |
-| taint.cpp:362:7:362:13 | strndup | (const char *,size_t) |  | xstrndup | 1 |
-| taint.cpp:362:7:362:13 | strndup | (const uint8_t *,size_t) |  | FuzzerTestOneInput | 1 |
-| taint.cpp:362:7:362:13 | strndup | (const uint8_t *,size_t) |  | nghttp2_hd_huff_encode_count | 1 |
-| taint.cpp:362:7:362:13 | strndup | (const uint8_t *,size_t) |  | ossl_ed448_pubkey_verify | 1 |
-| taint.cpp:362:7:362:13 | strndup | (const void *,size_t) |  | Curl_memdup | 1 |
-| taint.cpp:362:7:362:13 | strndup | (const void *,size_t) |  | __nis_hash | 1 |
-| taint.cpp:362:7:362:13 | strndup | (const void *,size_t) |  | __nss_hash | 1 |
-| taint.cpp:362:7:362:13 | strndup | (const void *,size_t) |  | compute_hashval | 1 |
-| taint.cpp:362:7:362:13 | strndup | (const wchar_t *,size_t) |  | __wcsnlen_generic | 1 |
-| taint.cpp:362:7:362:13 | strndup | (const wchar_t *,size_t) |  | wcswidth | 1 |
-| taint.cpp:362:7:362:13 | strndup | (curl_pushheaders *,size_t) |  | curl_pushheader_bynum | 1 |
-| taint.cpp:362:7:362:13 | strndup | (dl_find_object_internal *,size_t) |  | _dlfo_sort_mappings | 1 |
-| taint.cpp:362:7:362:13 | strndup | (dynbuf *,size_t) |  | Curl_dyn_init | 1 |
-| taint.cpp:362:7:362:13 | strndup | (dynbuf *,size_t) |  | Curl_dyn_setlen | 1 |
-| taint.cpp:362:7:362:13 | strndup | (dynbuf *,size_t) |  | Curl_dyn_tail | 1 |
-| taint.cpp:362:7:362:13 | strndup | (dynbuf *,size_t) |  | curlx_dyn_init | 1 |
-| taint.cpp:362:7:362:13 | strndup | (dynbuf *,size_t) |  | curlx_dyn_setlen | 1 |
-| taint.cpp:362:7:362:13 | strndup | (dynbuf *,size_t) |  | curlx_dyn_tail | 1 |
-| taint.cpp:362:7:362:13 | strndup | (dynhds *,size_t) |  | Curl_dynhds_getn | 1 |
-| taint.cpp:362:7:362:13 | strndup | (h1_req_parser *,size_t) |  | Curl_h1_req_parse_init | 1 |
-| taint.cpp:362:7:362:13 | strndup | (hash_table *,unsigned long) |  | init_hash | 1 |
-| taint.cpp:362:7:362:13 | strndup | (int,size_t) |  | ossl_calculate_comp_expansion | 1 |
-| taint.cpp:362:7:362:13 | strndup | (link_map *,size_t) |  | _dl_make_tlsdesc_dynamic | 1 |
-| taint.cpp:362:7:362:13 | strndup | (locale_file *,size_t) |  | init_locale_data | 1 |
-| taint.cpp:362:7:362:13 | strndup | (nghttp2_bufs *,size_t) |  | nghttp2_bufs_realloc | 1 |
-| taint.cpp:362:7:362:13 | strndup | (nghttp2_frame *,size_t) |  | nghttp2_frame_trail_padlen | 1 |
-| taint.cpp:362:7:362:13 | strndup | (nghttp2_hd_context *,size_t) |  | nghttp2_hd_table_get | 1 |
-| taint.cpp:362:7:362:13 | strndup | (nghttp2_hd_deflater **,size_t) |  | nghttp2_hd_deflate_new | 1 |
-| taint.cpp:362:7:362:13 | strndup | (nghttp2_hd_deflater *,size_t) |  | nghttp2_hd_deflate_change_table_size | 1 |
-| taint.cpp:362:7:362:13 | strndup | (nghttp2_hd_deflater *,size_t) |  | nghttp2_hd_deflate_get_table_entry | 1 |
-| taint.cpp:362:7:362:13 | strndup | (nghttp2_hd_inflater *,size_t) |  | nghttp2_hd_inflate_change_table_size | 1 |
-| taint.cpp:362:7:362:13 | strndup | (nghttp2_hd_inflater *,size_t) |  | nghttp2_hd_inflate_get_table_entry | 1 |
-| taint.cpp:362:7:362:13 | strndup | (nghttp2_option *,size_t) |  | nghttp2_option_set_max_continuations | 1 |
-| taint.cpp:362:7:362:13 | strndup | (nghttp2_option *,size_t) |  | nghttp2_option_set_max_deflate_dynamic_table_size | 1 |
-| taint.cpp:362:7:362:13 | strndup | (nghttp2_option *,size_t) |  | nghttp2_option_set_max_outbound_ack | 1 |
-| taint.cpp:362:7:362:13 | strndup | (nghttp2_option *,size_t) |  | nghttp2_option_set_max_send_header_block_length | 1 |
-| taint.cpp:362:7:362:13 | strndup | (nghttp2_option *,size_t) |  | nghttp2_option_set_max_settings | 1 |
-| taint.cpp:362:7:362:13 | strndup | (nghttp2_session *,size_t) |  | nghttp2_session_consume_connection | 1 |
-| taint.cpp:362:7:362:13 | strndup | (nghttp2_session *,size_t) |  | nghttp2_session_update_recv_connection_window_size | 1 |
-| taint.cpp:362:7:362:13 | strndup | (nghttp2_stream *,size_t) |  | nghttp2_http_on_data_chunk | 1 |
-| taint.cpp:362:7:362:13 | strndup | (nss_action *,size_t) |  | __nss_action_allocate | 1 |
-| taint.cpp:362:7:362:13 | strndup | (pthread_attr_t *,size_t) |  | __pthread_attr_setguardsize | 1 |
-| taint.cpp:362:7:362:13 | strndup | (pthread_attr_t *,size_t) |  | __pthread_attr_setstacksize | 1 |
-| taint.cpp:362:7:362:13 | strndup | (size_t,size_t) |  | __libc_memalign | 1 |
-| taint.cpp:362:7:362:13 | strndup | (size_t,size_t) |  | aligned_alloc | 1 |
-| taint.cpp:362:7:362:13 | strndup | (u_long,unsigned long) |  | __p_option | 1 |
-| taint.cpp:362:7:362:13 | strndup | (uint8_t *,size_t) |  | nghttp2_downcase | 1 |
-| taint.cpp:362:7:362:13 | strndup | (uint8_t *,size_t) |  | ossl_fnv1a_hash | 1 |
-| taint.cpp:362:7:362:13 | strndup | (void *,size_t) |  | JimDefaultAllocator | 1 |
-| taint.cpp:362:7:362:13 | strndup | (void *,size_t) |  | __arc4random_buf | 1 |
-| taint.cpp:362:7:362:13 | strndup | (void *,size_t) |  | __libc_realloc | 1 |
-| taint.cpp:362:7:362:13 | strndup | (void *,size_t) |  | __minimal_realloc | 1 |
-| taint.cpp:362:7:362:13 | strndup | (void *,size_t) |  | getentropy | 1 |
-| taint.cpp:362:7:362:13 | strndup | (void *,size_t) |  | uv__random_devurandom | 1 |
-| taint.cpp:362:7:362:13 | strndup | (void *,size_t) |  | uv__random_getrandom | 1 |
-| taint.cpp:362:7:362:13 | strndup | (void *,size_t) |  | xrealloc | 1 |
-| taint.cpp:364:7:364:13 | strdupa | (const char *) |  | BIO_gethostbyname | 0 |
-| taint.cpp:364:7:364:13 | strdupa | (const char *) |  | Curl_copy_header_value | 0 |
-| taint.cpp:364:7:364:13 | strdupa | (const char *) |  | Curl_get_scheme_handler | 0 |
-| taint.cpp:364:7:364:13 | strdupa | (const char *) |  | Curl_getdate_capped | 0 |
-| taint.cpp:364:7:364:13 | strdupa | (const char *) |  | Jim_StrDup | 0 |
-| taint.cpp:364:7:364:13 | strdupa | (const char *) |  | OPENSSL_LH_strhash | 0 |
-| taint.cpp:364:7:364:13 | strdupa | (const char *) |  | OSSL_STORE_SEARCH_by_alias | 0 |
-| taint.cpp:364:7:364:13 | strdupa | (const char *) |  | Strsafe | 0 |
-| taint.cpp:364:7:364:13 | strdupa | (const char *) |  | Symbol_new | 0 |
-| taint.cpp:364:7:364:13 | strdupa | (const char *) |  | UI_create_method | 0 |
-| taint.cpp:364:7:364:13 | strdupa | (const char *) |  | X509V3_parse_list | 0 |
-| taint.cpp:364:7:364:13 | strdupa | (const char *) |  | X509_LOOKUP_meth_new | 0 |
-| taint.cpp:364:7:364:13 | strdupa | (const char *) |  | __basename | 0 |
-| taint.cpp:364:7:364:13 | strdupa | (const char *) |  | __gconv_find_shlib | 0 |
-| taint.cpp:364:7:364:13 | strdupa | (const char *) |  | __gettext | 0 |
-| taint.cpp:364:7:364:13 | strdupa | (const char *) |  | __hash_string | 0 |
-| taint.cpp:364:7:364:13 | strdupa | (const char *) |  | __nss_action_parse | 0 |
-| taint.cpp:364:7:364:13 | strdupa | (const char *) |  | __strdup | 0 |
-| taint.cpp:364:7:364:13 | strdupa | (const char *) |  | __textdomain | 0 |
-| taint.cpp:364:7:364:13 | strdupa | (const char *) |  | __tzset_parse_tz | 0 |
-| taint.cpp:364:7:364:13 | strdupa | (const char *) |  | __tzstring | 0 |
-| taint.cpp:364:7:364:13 | strdupa | (const char *) |  | a2i_IPADDRESS | 0 |
-| taint.cpp:364:7:364:13 | strdupa | (const char *) |  | a2i_IPADDRESS_NC | 0 |
-| taint.cpp:364:7:364:13 | strdupa | (const char *) |  | a64l | 0 |
-| taint.cpp:364:7:364:13 | strdupa | (const char *) |  | charmap_opendir | 0 |
-| taint.cpp:364:7:364:13 | strdupa | (const char *) |  | ether_aton | 0 |
-| taint.cpp:364:7:364:13 | strdupa | (const char *) |  | getdate | 0 |
-| taint.cpp:364:7:364:13 | strdupa | (const char *) |  | inetstr2int | 0 |
-| taint.cpp:364:7:364:13 | strdupa | (const char *) |  | last_component | 0 |
-| taint.cpp:364:7:364:13 | strdupa | (const char *) |  | new_glibc_hwcaps_subdirectory | 0 |
-| taint.cpp:364:7:364:13 | strdupa | (const char *) |  | opt_path_end | 0 |
-| taint.cpp:364:7:364:13 | strdupa | (const char *) |  | opt_progname | 0 |
-| taint.cpp:364:7:364:13 | strdupa | (const char *) |  | ossl_lh_strcasehash | 0 |
-| taint.cpp:364:7:364:13 | strdupa | (const char *) |  | repertoire_read | 0 |
-| taint.cpp:364:7:364:13 | strdupa | (const char *) |  | res_gethostbyname | 0 |
-| taint.cpp:364:7:364:13 | strdupa | (const char *) |  | sgetsgent | 0 |
-| taint.cpp:364:7:364:13 | strdupa | (const char *) |  | sgetspent | 0 |
-| taint.cpp:364:7:364:13 | strdupa | (const char *) |  | strhash | 0 |
-| taint.cpp:364:7:364:13 | strdupa | (const char *) |  | uc_script_byname | 0 |
-| taint.cpp:364:7:364:13 | strdupa | (const char *) |  | uv__strdup | 0 |
-| taint.cpp:364:7:364:13 | strdupa | (const char *) |  | uv_wtf8_length_as_utf16 | 0 |
-| taint.cpp:364:7:364:13 | strdupa | (const char *) |  | xstrdup | 0 |
-| taint.cpp:365:7:365:14 | strndupa | (ASN1_PCTX *,unsigned long) |  | ASN1_PCTX_set_cert_flags | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (ASN1_PCTX *,unsigned long) |  | ASN1_PCTX_set_flags | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (ASN1_PCTX *,unsigned long) |  | ASN1_PCTX_set_nm_flags | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (ASN1_PCTX *,unsigned long) |  | ASN1_PCTX_set_oid_flags | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (ASN1_PCTX *,unsigned long) |  | ASN1_PCTX_set_str_flags | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (BIGNUM *,unsigned long) |  | BN_add_word | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (BIGNUM *,unsigned long) |  | BN_div_word | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (BIGNUM *,unsigned long) |  | BN_set_word | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (BIGNUM *,unsigned long) |  | BN_sub_word | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (BN_BLINDING *,unsigned long) |  | BN_BLINDING_set_flags | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (BUF_MEM *,size_t) |  | BUF_MEM_grow | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (BUF_MEM *,size_t) |  | BUF_MEM_grow_clean | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (CONF_IMODULE *,unsigned long) |  | CONF_imodule_set_flags | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (Curl_hash *,size_t) |  | Curl_init_dnscache | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (EVP_CIPHER *,unsigned long) |  | EVP_CIPHER_meth_set_flags | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (EVP_MD *,unsigned long) |  | EVP_MD_meth_set_flags | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (HMAC_CTX *,unsigned long) |  | HMAC_CTX_set_flags | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (OPENSSL_INIT_SETTINGS *,unsigned long) |  | OPENSSL_INIT_set_config_file_flags | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (OPENSSL_LHASH *,unsigned long) |  | OPENSSL_LH_set_down_load | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (OSSL_HPKE_SUITE,size_t) |  | OSSL_HPKE_get_ciphertext_size | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (OSSL_HTTP_REQ_CTX *,size_t) |  | OSSL_HTTP_REQ_CTX_set_max_response_hdr_lines | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (OSSL_HTTP_REQ_CTX *,unsigned long) |  | OSSL_HTTP_REQ_CTX_set_max_response_length | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (OSSL_LIB_CTX *,size_t) |  | ossl_quic_lcidm_new | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (OSSL_PARAM *,size_t) |  | OSSL_PARAM_set_size_t | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (OSSL_PARAM *,unsigned long) |  | OSSL_PARAM_set_ulong | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (OSSL_PQUEUE *,size_t) |  | ossl_pqueue_remove | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (OSSL_PROVIDER *,size_t) |  | ossl_provider_set_operation_bit | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (OSSL_QTX *,size_t) |  | ossl_qtx_set_mdpl | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (OSSL_QUIC_TX_PACKETISER *,size_t) |  | ossl_quic_tx_packetiser_add_unvalidated_credit | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (OSSL_QUIC_TX_PACKETISER *,size_t) |  | ossl_quic_tx_packetiser_consume_unvalidated_credit | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (OSSL_QUIC_TX_PACKETISER *,size_t) |  | ossl_quic_tx_packetiser_record_received_closing_bytes | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (OSSL_RECORD_LAYER *,size_t) |  | tls_set_max_frag_len | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (OSSL_RECORD_LAYER *,size_t) |  | tls_set_max_pipelines | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (QUIC_RSTREAM *,size_t) |  | ossl_quic_rstream_release_record | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (QUIC_RSTREAM *,size_t) |  | ossl_quic_rstream_resize_rbuf | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (QUIC_RXFC *,size_t) |  | ossl_quic_rxfc_set_max_window_size | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (QUIC_SSTREAM *,size_t) |  | ossl_quic_sstream_set_buffer_size | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (QUIC_STREAM_MAP *,size_t) |  | ossl_quic_stream_map_set_rr_stepping | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (RAND_POOL *,size_t) |  | ossl_rand_pool_add_begin | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (SIPHASH *,size_t) |  | SipHash_set_hash_size | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (SSL *,size_t) |  | SSL_set_block_padding | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (SSL *,size_t) |  | SSL_set_default_read_buffer_len | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (SSL *,size_t) |  | SSL_set_num_tickets | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (SSL *,unsigned long) |  | SSL_dane_clear_flags | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (SSL *,unsigned long) |  | SSL_dane_set_flags | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (SSL_CONNECTION *,unsigned long) |  | tls1_check_ec_tmp_key | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (SSL_CTX *,size_t) |  | SSL_CTX_set_block_padding | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (SSL_CTX *,size_t) |  | SSL_CTX_set_default_read_buffer_len | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (SSL_CTX *,size_t) |  | SSL_CTX_set_num_tickets | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (SSL_CTX *,unsigned long) |  | SSL_CTX_dane_clear_flags | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (SSL_CTX *,unsigned long) |  | SSL_CTX_dane_set_flags | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (WPACKET *,size_t) |  | WPACKET_init_null | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (WPACKET *,size_t) |  | WPACKET_set_max_size | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (WPACKET *,size_t) |  | WPACKET_start_sub_packet_len__ | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (WPACKET *,size_t) |  | ossl_quic_wire_encode_padding | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (X509_STORE *,unsigned long) |  | X509_STORE_set_flags | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (X509_STORE_CTX *,unsigned long) |  | X509_STORE_CTX_set_flags | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (X509_VERIFY_PARAM *,unsigned long) |  | X509_VERIFY_PARAM_clear_flags | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (X509_VERIFY_PARAM *,unsigned long) |  | X509_VERIFY_PARAM_set_flags | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (__gconv_step *,size_t) |  | __gconv_close_transform | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (argp_fmtstream_t,size_t) |  | __argp_fmtstream_set_lmargin | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (argp_fmtstream_t,size_t) |  | __argp_fmtstream_set_rmargin | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (argp_fmtstream_t,size_t) |  | __argp_fmtstream_set_wmargin | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (bufq *,size_t) |  | Curl_bufq_skip | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (bufq *,size_t) |  | Curl_bufq_unwrite | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (char *,size_t) |  | RAND_file_name | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (char *,size_t) |  | __getcwd | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (char *,size_t) |  | __gets_chk | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (char *,size_t) |  | __getwd_chk | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (char *,size_t) |  | plain_method | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (const BIGNUM *,unsigned long) |  | BN_mod_word | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (const char *,size_t) |  | Curl_getn_scheme_handler | 0 |
-| taint.cpp:365:7:365:14 | strndupa | (const char *,size_t) |  | Curl_getn_scheme_handler | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (const char *,size_t) |  | Curl_memdup0 | 0 |
-| taint.cpp:365:7:365:14 | strndupa | (const char *,size_t) |  | Curl_memdup0 | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (const char *,size_t) |  | OPENSSL_strnlen | 0 |
-| taint.cpp:365:7:365:14 | strndupa | (const char *,size_t) |  | OPENSSL_strnlen | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (const char *,size_t) |  | __nss_module_allocate | 0 |
-| taint.cpp:365:7:365:14 | strndupa | (const char *,size_t) |  | __nss_module_allocate | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (const char *,size_t) |  | __strndup | 0 |
-| taint.cpp:365:7:365:14 | strndupa | (const char *,size_t) |  | __strndup | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (const char *,size_t) |  | charmap_hash | 0 |
-| taint.cpp:365:7:365:14 | strndupa | (const char *,size_t) |  | charmap_hash | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (const char *,size_t) |  | locfile_hash | 0 |
-| taint.cpp:365:7:365:14 | strndupa | (const char *,size_t) |  | locfile_hash | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (const char *,size_t) |  | mblen | 0 |
-| taint.cpp:365:7:365:14 | strndupa | (const char *,size_t) |  | mblen | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (const char *,size_t) |  | uv__strndup | 0 |
-| taint.cpp:365:7:365:14 | strndupa | (const char *,size_t) |  | uv__strndup | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (const char *,size_t) |  | xstrndup | 0 |
-| taint.cpp:365:7:365:14 | strndupa | (const char *,size_t) |  | xstrndup | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (const uint8_t *,size_t) |  | FuzzerTestOneInput | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (const uint8_t *,size_t) |  | nghttp2_hd_huff_encode_count | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (const uint8_t *,size_t) |  | ossl_ed448_pubkey_verify | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (const void *,size_t) |  | Curl_memdup | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (const void *,size_t) |  | __nis_hash | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (const void *,size_t) |  | __nss_hash | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (const void *,size_t) |  | compute_hashval | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (const wchar_t *,size_t) |  | __wcsnlen_generic | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (const wchar_t *,size_t) |  | wcswidth | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (curl_pushheaders *,size_t) |  | curl_pushheader_bynum | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (dl_find_object_internal *,size_t) |  | _dlfo_sort_mappings | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (dynbuf *,size_t) |  | Curl_dyn_init | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (dynbuf *,size_t) |  | Curl_dyn_setlen | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (dynbuf *,size_t) |  | Curl_dyn_tail | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (dynbuf *,size_t) |  | curlx_dyn_init | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (dynbuf *,size_t) |  | curlx_dyn_setlen | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (dynbuf *,size_t) |  | curlx_dyn_tail | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (dynhds *,size_t) |  | Curl_dynhds_getn | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (h1_req_parser *,size_t) |  | Curl_h1_req_parse_init | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (hash_table *,unsigned long) |  | init_hash | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (int,size_t) |  | ossl_calculate_comp_expansion | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (link_map *,size_t) |  | _dl_make_tlsdesc_dynamic | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (locale_file *,size_t) |  | init_locale_data | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (nghttp2_bufs *,size_t) |  | nghttp2_bufs_realloc | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (nghttp2_frame *,size_t) |  | nghttp2_frame_trail_padlen | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (nghttp2_hd_context *,size_t) |  | nghttp2_hd_table_get | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (nghttp2_hd_deflater **,size_t) |  | nghttp2_hd_deflate_new | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (nghttp2_hd_deflater *,size_t) |  | nghttp2_hd_deflate_change_table_size | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (nghttp2_hd_deflater *,size_t) |  | nghttp2_hd_deflate_get_table_entry | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (nghttp2_hd_inflater *,size_t) |  | nghttp2_hd_inflate_change_table_size | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (nghttp2_hd_inflater *,size_t) |  | nghttp2_hd_inflate_get_table_entry | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (nghttp2_option *,size_t) |  | nghttp2_option_set_max_continuations | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (nghttp2_option *,size_t) |  | nghttp2_option_set_max_deflate_dynamic_table_size | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (nghttp2_option *,size_t) |  | nghttp2_option_set_max_outbound_ack | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (nghttp2_option *,size_t) |  | nghttp2_option_set_max_send_header_block_length | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (nghttp2_option *,size_t) |  | nghttp2_option_set_max_settings | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (nghttp2_session *,size_t) |  | nghttp2_session_consume_connection | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (nghttp2_session *,size_t) |  | nghttp2_session_update_recv_connection_window_size | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (nghttp2_stream *,size_t) |  | nghttp2_http_on_data_chunk | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (nss_action *,size_t) |  | __nss_action_allocate | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (pthread_attr_t *,size_t) |  | __pthread_attr_setguardsize | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (pthread_attr_t *,size_t) |  | __pthread_attr_setstacksize | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (size_t,size_t) |  | __libc_memalign | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (size_t,size_t) |  | aligned_alloc | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (u_long,unsigned long) |  | __p_option | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (uint8_t *,size_t) |  | nghttp2_downcase | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (uint8_t *,size_t) |  | ossl_fnv1a_hash | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (void *,size_t) |  | JimDefaultAllocator | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (void *,size_t) |  | __arc4random_buf | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (void *,size_t) |  | __libc_realloc | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (void *,size_t) |  | __minimal_realloc | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (void *,size_t) |  | getentropy | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (void *,size_t) |  | uv__random_devurandom | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (void *,size_t) |  | uv__random_getrandom | 1 |
-| taint.cpp:365:7:365:14 | strndupa | (void *,size_t) |  | xrealloc | 1 |
-| taint.cpp:367:6:367:16 | test_strdup | (char *) |  | SRP_VBASE_new | 0 |
-| taint.cpp:367:6:367:16 | test_strdup | (char *) |  | _IO_gets | 0 |
-| taint.cpp:367:6:367:16 | test_strdup | (char *) |  | __mktemp | 0 |
-| taint.cpp:367:6:367:16 | test_strdup | (char *) |  | __nis_default_group | 0 |
-| taint.cpp:367:6:367:16 | test_strdup | (char *) |  | __nis_default_owner | 0 |
-| taint.cpp:367:6:367:16 | test_strdup | (char *) |  | __nis_default_ttl | 0 |
-| taint.cpp:367:6:367:16 | test_strdup | (char *) |  | __xpg_basename | 0 |
-| taint.cpp:367:6:367:16 | test_strdup | (char *) |  | ctermid | 0 |
-| taint.cpp:367:6:367:16 | test_strdup | (char *) |  | cuserid | 0 |
-| taint.cpp:367:6:367:16 | test_strdup | (char *) |  | defossilize | 0 |
-| taint.cpp:367:6:367:16 | test_strdup | (char *) |  | des_setparity | 0 |
-| taint.cpp:367:6:367:16 | test_strdup | (char *) |  | dirname | 0 |
-| taint.cpp:367:6:367:16 | test_strdup | (char *) |  | getwd | 0 |
-| taint.cpp:367:6:367:16 | test_strdup | (char *) |  | make_uppercase | 0 |
-| taint.cpp:367:6:367:16 | test_strdup | (char *) |  | mkdtemp | 0 |
-| taint.cpp:367:6:367:16 | test_strdup | (char *) |  | next_item | 0 |
-| taint.cpp:367:6:367:16 | test_strdup | (char *) |  | strfry | 0 |
-| taint.cpp:367:6:367:16 | test_strdup | (char *) | CStringT | CStringT | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | ASN1_STRING_type_new | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | ASN1_tag2bit | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | ASN1_tag2str | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | Jim_ReturnCode | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | Jim_SignalId | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | OBJ_nid2ln | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | OBJ_nid2obj | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | OBJ_nid2sn | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | OSSL_trace_get_category_name | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | PKCS12_init | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | Symbol_Nth | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | X509_PURPOSE_get0 | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | X509_TRUST_get0 | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | X509_TRUST_get_by_id | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | __btowc | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | __current_locale_name | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | __fdopendir | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | __get_errlist | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | __get_errname | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | __math_invalid_i | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | __math_invalidf_i | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | __p_class | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | __p_rcode | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | __p_type | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | __pkey_get | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | __sigdescr_np | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | __strerrordesc_np | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | _tolower | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | _toupper | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | btowc | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | c_tolower | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | c_toupper | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | curlx_sitouz | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | evp_pkey_type2name | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | inet6_option_space | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | isalnum | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | isalpha | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | isblank | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | iscntrl | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | isdigit | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | isgraph | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | islower | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | isprint | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | ispunct | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | isspace | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | isupper | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | isxdigit | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | ossl_tolower | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | ossl_toupper | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | sigabbrev_np | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | sqlite3_compileoption_get | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | sqlite3_errstr | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | strerrorname_np | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | support_report_failure | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | svcudp_create | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | tls13_alert_code | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | toascii | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | tolower | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | toupper | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | uabs | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | uv__accept | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | uv_err_name | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | uv_get_osfhandle | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | uv_strerror | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | uv_translate_sys_error | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) |  | zError | 0 |
-| taint.cpp:379:6:379:17 | test_strndup | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| taint.cpp:387:6:387:16 | test_wcsdup | (wchar_t *) | CStringT | CStringT | 0 |
-| taint.cpp:397:6:397:17 | test_strdupa | (char *) |  | SRP_VBASE_new | 0 |
-| taint.cpp:397:6:397:17 | test_strdupa | (char *) |  | _IO_gets | 0 |
-| taint.cpp:397:6:397:17 | test_strdupa | (char *) |  | __mktemp | 0 |
-| taint.cpp:397:6:397:17 | test_strdupa | (char *) |  | __nis_default_group | 0 |
-| taint.cpp:397:6:397:17 | test_strdupa | (char *) |  | __nis_default_owner | 0 |
-| taint.cpp:397:6:397:17 | test_strdupa | (char *) |  | __nis_default_ttl | 0 |
-| taint.cpp:397:6:397:17 | test_strdupa | (char *) |  | __xpg_basename | 0 |
-| taint.cpp:397:6:397:17 | test_strdupa | (char *) |  | ctermid | 0 |
-| taint.cpp:397:6:397:17 | test_strdupa | (char *) |  | cuserid | 0 |
-| taint.cpp:397:6:397:17 | test_strdupa | (char *) |  | defossilize | 0 |
-| taint.cpp:397:6:397:17 | test_strdupa | (char *) |  | des_setparity | 0 |
-| taint.cpp:397:6:397:17 | test_strdupa | (char *) |  | dirname | 0 |
-| taint.cpp:397:6:397:17 | test_strdupa | (char *) |  | getwd | 0 |
-| taint.cpp:397:6:397:17 | test_strdupa | (char *) |  | make_uppercase | 0 |
-| taint.cpp:397:6:397:17 | test_strdupa | (char *) |  | mkdtemp | 0 |
-| taint.cpp:397:6:397:17 | test_strdupa | (char *) |  | next_item | 0 |
-| taint.cpp:397:6:397:17 | test_strdupa | (char *) |  | strfry | 0 |
-| taint.cpp:397:6:397:17 | test_strdupa | (char *) | CStringT | CStringT | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | ASN1_STRING_type_new | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | ASN1_tag2bit | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | ASN1_tag2str | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | Jim_ReturnCode | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | Jim_SignalId | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | OBJ_nid2ln | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | OBJ_nid2obj | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | OBJ_nid2sn | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | OSSL_trace_get_category_name | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | PKCS12_init | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | Symbol_Nth | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | X509_PURPOSE_get0 | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | X509_TRUST_get0 | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | X509_TRUST_get_by_id | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | __btowc | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | __current_locale_name | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | __fdopendir | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | __get_errlist | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | __get_errname | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | __math_invalid_i | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | __math_invalidf_i | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | __p_class | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | __p_rcode | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | __p_type | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | __pkey_get | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | __sigdescr_np | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | __strerrordesc_np | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | _tolower | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | _toupper | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | btowc | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | c_tolower | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | c_toupper | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | curlx_sitouz | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | evp_pkey_type2name | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | inet6_option_space | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | isalnum | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | isalpha | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | isblank | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | iscntrl | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | isdigit | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | isgraph | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | islower | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | isprint | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | ispunct | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | isspace | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | isupper | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | isxdigit | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | ossl_tolower | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | ossl_toupper | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | sigabbrev_np | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | sqlite3_compileoption_get | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | sqlite3_errstr | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | strerrorname_np | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | support_report_failure | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | svcudp_create | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | tls13_alert_code | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | toascii | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | tolower | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | toupper | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | uabs | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | uv__accept | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | uv_err_name | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | uv_get_osfhandle | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | uv_strerror | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | uv_translate_sys_error | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) |  | zError | 0 |
-| taint.cpp:409:6:409:18 | test_strndupa | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | ASN1_STRING_type_new | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | ASN1_tag2bit | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | ASN1_tag2str | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | Jim_ReturnCode | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | Jim_SignalId | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | OBJ_nid2ln | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | OBJ_nid2obj | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | OBJ_nid2sn | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | OSSL_trace_get_category_name | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | PKCS12_init | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | Symbol_Nth | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | X509_PURPOSE_get0 | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | X509_TRUST_get0 | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | X509_TRUST_get_by_id | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | __btowc | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | __current_locale_name | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | __fdopendir | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | __get_errlist | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | __get_errname | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | __math_invalid_i | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | __math_invalidf_i | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | __p_class | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | __p_rcode | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | __p_type | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | __pkey_get | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | __sigdescr_np | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | __strerrordesc_np | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | _tolower | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | _toupper | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | btowc | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | c_tolower | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | c_toupper | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | curlx_sitouz | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | evp_pkey_type2name | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | inet6_option_space | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | isalnum | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | isalpha | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | isblank | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | iscntrl | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | isdigit | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | isgraph | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | islower | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | isprint | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | ispunct | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | isspace | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | isupper | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | isxdigit | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | ossl_tolower | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | ossl_toupper | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | sigabbrev_np | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | sqlite3_compileoption_get | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | sqlite3_errstr | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | strerrorname_np | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | support_report_failure | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | svcudp_create | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | tls13_alert_code | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | toascii | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | tolower | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | toupper | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | uabs | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | uv__accept | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | uv_err_name | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | uv_get_osfhandle | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | uv_strerror | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | uv_translate_sys_error | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) |  | zError | 0 |
-| taint.cpp:421:2:421:9 | MyClass2 | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | ASN1_STRING_type_new | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | ASN1_tag2bit | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | ASN1_tag2str | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | Jim_ReturnCode | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | Jim_SignalId | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | OBJ_nid2ln | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | OBJ_nid2obj | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | OBJ_nid2sn | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | OSSL_trace_get_category_name | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | PKCS12_init | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | Symbol_Nth | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | X509_PURPOSE_get0 | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | X509_TRUST_get0 | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | X509_TRUST_get_by_id | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | __btowc | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | __current_locale_name | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | __fdopendir | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | __get_errlist | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | __get_errname | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | __math_invalid_i | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | __math_invalidf_i | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | __p_class | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | __p_rcode | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | __p_type | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | __pkey_get | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | __sigdescr_np | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | __strerrordesc_np | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | _tolower | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | _toupper | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | btowc | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | c_tolower | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | c_toupper | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | curlx_sitouz | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | evp_pkey_type2name | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | inet6_option_space | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | isalnum | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | isalpha | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | isblank | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | iscntrl | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | isdigit | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | isgraph | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | islower | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | isprint | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | ispunct | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | isspace | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | isupper | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | isxdigit | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | ossl_tolower | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | ossl_toupper | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | sigabbrev_np | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | sqlite3_compileoption_get | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | sqlite3_errstr | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | strerrorname_np | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | support_report_failure | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | svcudp_create | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | tls13_alert_code | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | toascii | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | tolower | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | toupper | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | uabs | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | uv__accept | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | uv_err_name | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | uv_get_osfhandle | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | uv_strerror | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | uv_translate_sys_error | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) |  | zError | 0 |
-| taint.cpp:422:7:422:15 | setMember | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| taint.cpp:430:2:430:9 | MyClass3 | (const char *) |  | BIO_gethostbyname | 0 |
-| taint.cpp:430:2:430:9 | MyClass3 | (const char *) |  | Curl_copy_header_value | 0 |
-| taint.cpp:430:2:430:9 | MyClass3 | (const char *) |  | Curl_get_scheme_handler | 0 |
-| taint.cpp:430:2:430:9 | MyClass3 | (const char *) |  | Curl_getdate_capped | 0 |
-| taint.cpp:430:2:430:9 | MyClass3 | (const char *) |  | Jim_StrDup | 0 |
-| taint.cpp:430:2:430:9 | MyClass3 | (const char *) |  | OPENSSL_LH_strhash | 0 |
-| taint.cpp:430:2:430:9 | MyClass3 | (const char *) |  | OSSL_STORE_SEARCH_by_alias | 0 |
-| taint.cpp:430:2:430:9 | MyClass3 | (const char *) |  | Strsafe | 0 |
-| taint.cpp:430:2:430:9 | MyClass3 | (const char *) |  | Symbol_new | 0 |
-| taint.cpp:430:2:430:9 | MyClass3 | (const char *) |  | UI_create_method | 0 |
-| taint.cpp:430:2:430:9 | MyClass3 | (const char *) |  | X509V3_parse_list | 0 |
-| taint.cpp:430:2:430:9 | MyClass3 | (const char *) |  | X509_LOOKUP_meth_new | 0 |
-| taint.cpp:430:2:430:9 | MyClass3 | (const char *) |  | __basename | 0 |
-| taint.cpp:430:2:430:9 | MyClass3 | (const char *) |  | __gconv_find_shlib | 0 |
-| taint.cpp:430:2:430:9 | MyClass3 | (const char *) |  | __gettext | 0 |
-| taint.cpp:430:2:430:9 | MyClass3 | (const char *) |  | __hash_string | 0 |
-| taint.cpp:430:2:430:9 | MyClass3 | (const char *) |  | __nss_action_parse | 0 |
-| taint.cpp:430:2:430:9 | MyClass3 | (const char *) |  | __strdup | 0 |
-| taint.cpp:430:2:430:9 | MyClass3 | (const char *) |  | __textdomain | 0 |
-| taint.cpp:430:2:430:9 | MyClass3 | (const char *) |  | __tzset_parse_tz | 0 |
-| taint.cpp:430:2:430:9 | MyClass3 | (const char *) |  | __tzstring | 0 |
-| taint.cpp:430:2:430:9 | MyClass3 | (const char *) |  | a2i_IPADDRESS | 0 |
-| taint.cpp:430:2:430:9 | MyClass3 | (const char *) |  | a2i_IPADDRESS_NC | 0 |
-| taint.cpp:430:2:430:9 | MyClass3 | (const char *) |  | a64l | 0 |
-| taint.cpp:430:2:430:9 | MyClass3 | (const char *) |  | charmap_opendir | 0 |
-| taint.cpp:430:2:430:9 | MyClass3 | (const char *) |  | ether_aton | 0 |
-| taint.cpp:430:2:430:9 | MyClass3 | (const char *) |  | getdate | 0 |
-| taint.cpp:430:2:430:9 | MyClass3 | (const char *) |  | inetstr2int | 0 |
-| taint.cpp:430:2:430:9 | MyClass3 | (const char *) |  | last_component | 0 |
-| taint.cpp:430:2:430:9 | MyClass3 | (const char *) |  | new_glibc_hwcaps_subdirectory | 0 |
-| taint.cpp:430:2:430:9 | MyClass3 | (const char *) |  | opt_path_end | 0 |
-| taint.cpp:430:2:430:9 | MyClass3 | (const char *) |  | opt_progname | 0 |
-| taint.cpp:430:2:430:9 | MyClass3 | (const char *) |  | ossl_lh_strcasehash | 0 |
-| taint.cpp:430:2:430:9 | MyClass3 | (const char *) |  | repertoire_read | 0 |
-| taint.cpp:430:2:430:9 | MyClass3 | (const char *) |  | res_gethostbyname | 0 |
-| taint.cpp:430:2:430:9 | MyClass3 | (const char *) |  | sgetsgent | 0 |
-| taint.cpp:430:2:430:9 | MyClass3 | (const char *) |  | sgetspent | 0 |
-| taint.cpp:430:2:430:9 | MyClass3 | (const char *) |  | strhash | 0 |
-| taint.cpp:430:2:430:9 | MyClass3 | (const char *) |  | uc_script_byname | 0 |
-| taint.cpp:430:2:430:9 | MyClass3 | (const char *) |  | uv__strdup | 0 |
-| taint.cpp:430:2:430:9 | MyClass3 | (const char *) |  | uv_wtf8_length_as_utf16 | 0 |
-| taint.cpp:430:2:430:9 | MyClass3 | (const char *) |  | xstrdup | 0 |
-| taint.cpp:431:7:431:15 | setString | (const char *) |  | BIO_gethostbyname | 0 |
-| taint.cpp:431:7:431:15 | setString | (const char *) |  | Curl_copy_header_value | 0 |
-| taint.cpp:431:7:431:15 | setString | (const char *) |  | Curl_get_scheme_handler | 0 |
-| taint.cpp:431:7:431:15 | setString | (const char *) |  | Curl_getdate_capped | 0 |
-| taint.cpp:431:7:431:15 | setString | (const char *) |  | Jim_StrDup | 0 |
-| taint.cpp:431:7:431:15 | setString | (const char *) |  | OPENSSL_LH_strhash | 0 |
-| taint.cpp:431:7:431:15 | setString | (const char *) |  | OSSL_STORE_SEARCH_by_alias | 0 |
-| taint.cpp:431:7:431:15 | setString | (const char *) |  | Strsafe | 0 |
-| taint.cpp:431:7:431:15 | setString | (const char *) |  | Symbol_new | 0 |
-| taint.cpp:431:7:431:15 | setString | (const char *) |  | UI_create_method | 0 |
-| taint.cpp:431:7:431:15 | setString | (const char *) |  | X509V3_parse_list | 0 |
-| taint.cpp:431:7:431:15 | setString | (const char *) |  | X509_LOOKUP_meth_new | 0 |
-| taint.cpp:431:7:431:15 | setString | (const char *) |  | __basename | 0 |
-| taint.cpp:431:7:431:15 | setString | (const char *) |  | __gconv_find_shlib | 0 |
-| taint.cpp:431:7:431:15 | setString | (const char *) |  | __gettext | 0 |
-| taint.cpp:431:7:431:15 | setString | (const char *) |  | __hash_string | 0 |
-| taint.cpp:431:7:431:15 | setString | (const char *) |  | __nss_action_parse | 0 |
-| taint.cpp:431:7:431:15 | setString | (const char *) |  | __strdup | 0 |
-| taint.cpp:431:7:431:15 | setString | (const char *) |  | __textdomain | 0 |
-| taint.cpp:431:7:431:15 | setString | (const char *) |  | __tzset_parse_tz | 0 |
-| taint.cpp:431:7:431:15 | setString | (const char *) |  | __tzstring | 0 |
-| taint.cpp:431:7:431:15 | setString | (const char *) |  | a2i_IPADDRESS | 0 |
-| taint.cpp:431:7:431:15 | setString | (const char *) |  | a2i_IPADDRESS_NC | 0 |
-| taint.cpp:431:7:431:15 | setString | (const char *) |  | a64l | 0 |
-| taint.cpp:431:7:431:15 | setString | (const char *) |  | charmap_opendir | 0 |
-| taint.cpp:431:7:431:15 | setString | (const char *) |  | ether_aton | 0 |
-| taint.cpp:431:7:431:15 | setString | (const char *) |  | getdate | 0 |
-| taint.cpp:431:7:431:15 | setString | (const char *) |  | inetstr2int | 0 |
-| taint.cpp:431:7:431:15 | setString | (const char *) |  | last_component | 0 |
-| taint.cpp:431:7:431:15 | setString | (const char *) |  | new_glibc_hwcaps_subdirectory | 0 |
-| taint.cpp:431:7:431:15 | setString | (const char *) |  | opt_path_end | 0 |
-| taint.cpp:431:7:431:15 | setString | (const char *) |  | opt_progname | 0 |
-| taint.cpp:431:7:431:15 | setString | (const char *) |  | ossl_lh_strcasehash | 0 |
-| taint.cpp:431:7:431:15 | setString | (const char *) |  | repertoire_read | 0 |
-| taint.cpp:431:7:431:15 | setString | (const char *) |  | res_gethostbyname | 0 |
-| taint.cpp:431:7:431:15 | setString | (const char *) |  | sgetsgent | 0 |
-| taint.cpp:431:7:431:15 | setString | (const char *) |  | sgetspent | 0 |
-| taint.cpp:431:7:431:15 | setString | (const char *) |  | strhash | 0 |
-| taint.cpp:431:7:431:15 | setString | (const char *) |  | uc_script_byname | 0 |
-| taint.cpp:431:7:431:15 | setString | (const char *) |  | uv__strdup | 0 |
-| taint.cpp:431:7:431:15 | setString | (const char *) |  | uv_wtf8_length_as_utf16 | 0 |
-| taint.cpp:431:7:431:15 | setString | (const char *) |  | xstrdup | 0 |
-| taint.cpp:500:5:500:12 | getdelim | (URLGlob **,char *,curl_off_t *,FILE *) |  | glob_url | 3 |
-| taint.cpp:500:5:500:12 | getdelim | (char *,size_t,int,FILE *) |  | __fgets_chk | 2 |
-| taint.cpp:500:5:500:12 | getdelim | (char *,size_t,int,FILE *) |  | __fgets_chk | 3 |
-| taint.cpp:500:5:500:12 | getdelim | (char *,size_t,int,FILE *) |  | __fgets_unlocked_chk | 2 |
-| taint.cpp:500:5:500:12 | getdelim | (char *,size_t,int,FILE *) |  | __fgets_unlocked_chk | 3 |
-| taint.cpp:500:5:500:12 | getdelim | (const void *,size_t,size_t,FILE *) |  | _IO_fwrite | 3 |
-| taint.cpp:500:5:500:12 | getdelim | (void *,size_t,size_t,FILE *) |  | _IO_fread | 3 |
-| taint.cpp:502:6:502:18 | test_getdelim | (FILE *) |  | _IO_default_uflow | 0 |
-| taint.cpp:502:6:502:18 | test_getdelim | (FILE *) |  | _IO_feof | 0 |
-| taint.cpp:502:6:502:18 | test_getdelim | (FILE *) |  | _IO_ferror | 0 |
-| taint.cpp:502:6:502:18 | test_getdelim | (FILE *) |  | _IO_file_close_mmap | 0 |
-| taint.cpp:502:6:502:18 | test_getdelim | (FILE *) |  | _IO_file_underflow_mmap | 0 |
-| taint.cpp:502:6:502:18 | test_getdelim | (FILE *) |  | _IO_ftell | 0 |
-| taint.cpp:502:6:502:18 | test_getdelim | (FILE *) |  | _IO_getc | 0 |
-| taint.cpp:502:6:502:18 | test_getdelim | (FILE *) |  | _IO_getwc | 0 |
-| taint.cpp:502:6:502:18 | test_getdelim | (FILE *) |  | _IO_new_file_underflow | 0 |
-| taint.cpp:502:6:502:18 | test_getdelim | (FILE *) |  | _IO_peekc_locked | 0 |
-| taint.cpp:502:6:502:18 | test_getdelim | (FILE *) |  | _IO_str_count | 0 |
-| taint.cpp:502:6:502:18 | test_getdelim | (FILE *) |  | _IO_str_underflow | 0 |
-| taint.cpp:502:6:502:18 | test_getdelim | (FILE *) |  | _IO_sungetc | 0 |
-| taint.cpp:502:6:502:18 | test_getdelim | (FILE *) |  | _IO_sungetwc | 0 |
-| taint.cpp:502:6:502:18 | test_getdelim | (FILE *) |  | _IO_wdefault_uflow | 0 |
-| taint.cpp:502:6:502:18 | test_getdelim | (FILE *) |  | _IO_wfile_underflow | 0 |
-| taint.cpp:502:6:502:18 | test_getdelim | (FILE *) |  | _IO_wfile_underflow_mmap | 0 |
-| taint.cpp:502:6:502:18 | test_getdelim | (FILE *) |  | _IO_wstr_count | 0 |
-| taint.cpp:502:6:502:18 | test_getdelim | (FILE *) |  | _IO_wstr_underflow | 0 |
-| taint.cpp:502:6:502:18 | test_getdelim | (FILE *) |  | __fbufsize | 0 |
-| taint.cpp:502:6:502:18 | test_getdelim | (FILE *) |  | __feof_unlocked | 0 |
-| taint.cpp:502:6:502:18 | test_getdelim | (FILE *) |  | __ferror_unlocked | 0 |
-| taint.cpp:502:6:502:18 | test_getdelim | (FILE *) |  | __fileno | 0 |
-| taint.cpp:502:6:502:18 | test_getdelim | (FILE *) |  | __flbf | 0 |
-| taint.cpp:502:6:502:18 | test_getdelim | (FILE *) |  | __fopen_maybe_mmap | 0 |
-| taint.cpp:502:6:502:18 | test_getdelim | (FILE *) |  | __fpending | 0 |
-| taint.cpp:502:6:502:18 | test_getdelim | (FILE *) |  | __ftello | 0 |
-| taint.cpp:502:6:502:18 | test_getdelim | (FILE *) |  | __fwriting | 0 |
-| taint.cpp:502:6:502:18 | test_getdelim | (FILE *) |  | __getc_unlocked | 0 |
-| taint.cpp:502:6:502:18 | test_getdelim | (FILE *) |  | __getwc_unlocked | 0 |
-| taint.cpp:502:6:502:18 | test_getdelim | (FILE *) |  | __uflow | 0 |
-| taint.cpp:502:6:502:18 | test_getdelim | (FILE *) |  | __underflow | 0 |
-| taint.cpp:502:6:502:18 | test_getdelim | (FILE *) |  | __wuflow | 0 |
-| taint.cpp:502:6:502:18 | test_getdelim | (FILE *) |  | __wunderflow | 0 |
-| taint.cpp:502:6:502:18 | test_getdelim | (FILE *) |  | feof_unlocked | 0 |
-| taint.cpp:502:6:502:18 | test_getdelim | (FILE *) |  | ferror_unlocked | 0 |
-| taint.cpp:502:6:502:18 | test_getdelim | (FILE *) |  | fgetc_unlocked | 0 |
-| taint.cpp:502:6:502:18 | test_getdelim | (FILE *) |  | fgetgrent | 0 |
-| taint.cpp:502:6:502:18 | test_getdelim | (FILE *) |  | fgetpwent | 0 |
-| taint.cpp:502:6:502:18 | test_getdelim | (FILE *) |  | fgetsgent | 0 |
-| taint.cpp:502:6:502:18 | test_getdelim | (FILE *) |  | fgetspent | 0 |
-| taint.cpp:502:6:502:18 | test_getdelim | (FILE *) |  | getc_unlocked | 0 |
-| taint.cpp:502:6:502:18 | test_getdelim | (FILE *) |  | getmntent | 0 |
-| taint.cpp:512:7:512:12 | strtok | (ASN1_GENERALIZEDTIME *,const char *) |  | ASN1_GENERALIZEDTIME_set_string | 1 |
-| taint.cpp:512:7:512:12 | strtok | (ASN1_TIME *,const char *) |  | ASN1_TIME_set_string | 1 |
-| taint.cpp:512:7:512:12 | strtok | (ASN1_TIME *,const char *) |  | ASN1_TIME_set_string_X509 | 1 |
-| taint.cpp:512:7:512:12 | strtok | (ASN1_UTCTIME *,const char *) |  | ASN1_UTCTIME_set_string | 1 |
-| taint.cpp:512:7:512:12 | strtok | (BIGNUM **,const char *) |  | BN_asc2bn | 1 |
-| taint.cpp:512:7:512:12 | strtok | (BIGNUM **,const char *) |  | BN_dec2bn | 1 |
-| taint.cpp:512:7:512:12 | strtok | (BIGNUM **,const char *) |  | BN_hex2bn | 1 |
-| taint.cpp:512:7:512:12 | strtok | (CONF *,const char *) |  | TS_CONF_get_tsa_section | 1 |
-| taint.cpp:512:7:512:12 | strtok | (CONF *,const char *) |  | _CONF_new_section | 1 |
-| taint.cpp:512:7:512:12 | strtok | (CURLU *,const char *) |  | Curl_url_set_authority | 1 |
-| taint.cpp:512:7:512:12 | strtok | (Curl_easy *,const char *) |  | Curl_cwriter_get_by_name | 1 |
-| taint.cpp:512:7:512:12 | strtok | (Curl_easy *,const char *) |  | Curl_rtsp_parseheader | 1 |
-| taint.cpp:512:7:512:12 | strtok | (DH_METHOD *,const char *) |  | DH_meth_set1_name | 1 |
-| taint.cpp:512:7:512:12 | strtok | (DSA_METHOD *,const char *) |  | DSA_meth_set1_name | 1 |
-| taint.cpp:512:7:512:12 | strtok | (DSO *,const char *) |  | DSO_convert_filename | 1 |
-| taint.cpp:512:7:512:12 | strtok | (DSO *,const char *) |  | DSO_set_filename | 1 |
-| taint.cpp:512:7:512:12 | strtok | (ENGINE *,const char *) |  | ENGINE_set_id | 1 |
-| taint.cpp:512:7:512:12 | strtok | (ENGINE *,const char *) |  | ENGINE_set_name | 1 |
-| taint.cpp:512:7:512:12 | strtok | (ENGINE *,const char *) |  | OSSL_STORE_LOADER_new | 1 |
-| taint.cpp:512:7:512:12 | strtok | (EVP_PKEY *,const char *) |  | CTLOG_new | 1 |
-| taint.cpp:512:7:512:12 | strtok | (EVP_PKEY_CTX *,const char *) |  | app_paramgen | 1 |
-| taint.cpp:512:7:512:12 | strtok | (EVP_PKEY_CTX *,const char *) |  | pkey_ctrl_string | 1 |
-| taint.cpp:512:7:512:12 | strtok | (GlobalConfig *,const char *) |  | setvariable | 1 |
-| taint.cpp:512:7:512:12 | strtok | (Jim_Interp *,const char *) |  | Jim_Eval | 1 |
-| taint.cpp:512:7:512:12 | strtok | (Jim_Interp *,const char *) |  | Jim_EvalFile | 1 |
-| taint.cpp:512:7:512:12 | strtok | (Jim_Interp *,const char *) |  | Jim_EvalFileGlobal | 1 |
-| taint.cpp:512:7:512:12 | strtok | (Jim_Interp *,const char *) |  | Jim_EvalGlobal | 1 |
-| taint.cpp:512:7:512:12 | strtok | (LIBSSH2_AGENT *,const char *) |  | libssh2_agent_set_identity_path | 1 |
-| taint.cpp:512:7:512:12 | strtok | (LIBSSH2_SESSION *,const char *) |  | libssh2_banner_set | 1 |
-| taint.cpp:512:7:512:12 | strtok | (LIBSSH2_SESSION *,const char *) |  | libssh2_session_banner_set | 1 |
-| taint.cpp:512:7:512:12 | strtok | (Lmid_t,const char *) |  | _dl_lookup_map | 1 |
-| taint.cpp:512:7:512:12 | strtok | (OPENSSL_DIR_CTX **,const char *) |  | OPENSSL_DIR_read | 1 |
-| taint.cpp:512:7:512:12 | strtok | (OPENSSL_INIT_SETTINGS *,const char *) |  | OPENSSL_INIT_set_config_appname | 1 |
-| taint.cpp:512:7:512:12 | strtok | (OPENSSL_INIT_SETTINGS *,const char *) |  | OPENSSL_INIT_set_config_filename | 1 |
-| taint.cpp:512:7:512:12 | strtok | (OSSL_CMP_CTX *,const char *) |  | OSSL_CMP_CTX_set1_no_proxy | 1 |
-| taint.cpp:512:7:512:12 | strtok | (OSSL_CMP_CTX *,const char *) |  | OSSL_CMP_CTX_set1_proxy | 1 |
-| taint.cpp:512:7:512:12 | strtok | (OSSL_CMP_CTX *,const char *) |  | OSSL_CMP_CTX_set1_server | 1 |
-| taint.cpp:512:7:512:12 | strtok | (OSSL_CMP_CTX *,const char *) |  | OSSL_CMP_CTX_set1_serverPath | 1 |
-| taint.cpp:512:7:512:12 | strtok | (OSSL_DECODER_CTX *,const char *) |  | OSSL_DECODER_CTX_set_input_structure | 1 |
-| taint.cpp:512:7:512:12 | strtok | (OSSL_DECODER_CTX *,const char *) |  | OSSL_DECODER_CTX_set_input_type | 1 |
-| taint.cpp:512:7:512:12 | strtok | (OSSL_ENCODER_CTX *,const char *) |  | OSSL_ENCODER_CTX_set_output_structure | 1 |
-| taint.cpp:512:7:512:12 | strtok | (OSSL_ENCODER_CTX *,const char *) |  | OSSL_ENCODER_CTX_set_output_type | 1 |
-| taint.cpp:512:7:512:12 | strtok | (OSSL_JSON_ENC *,const char *) |  | ossl_json_key | 1 |
-| taint.cpp:512:7:512:12 | strtok | (OSSL_JSON_ENC *,const char *) |  | ossl_json_str | 1 |
-| taint.cpp:512:7:512:12 | strtok | (OSSL_LIB_CTX *,const char *) |  | CMS_ContentInfo_new_ex | 1 |
-| taint.cpp:512:7:512:12 | strtok | (OSSL_LIB_CTX *,const char *) |  | CTLOG_STORE_new_ex | 1 |
-| taint.cpp:512:7:512:12 | strtok | (OSSL_LIB_CTX *,const char *) |  | CT_POLICY_EVAL_CTX_new_ex | 1 |
-| taint.cpp:512:7:512:12 | strtok | (OSSL_LIB_CTX *,const char *) |  | EC_KEY_new_ex | 1 |
-| taint.cpp:512:7:512:12 | strtok | (OSSL_LIB_CTX *,const char *) |  | OSSL_CMP_CTX_new | 1 |
-| taint.cpp:512:7:512:12 | strtok | (OSSL_LIB_CTX *,const char *) |  | OSSL_CMP_MSG_new | 1 |
-| taint.cpp:512:7:512:12 | strtok | (OSSL_LIB_CTX *,const char *) |  | OSSL_CMP_SRV_CTX_new | 1 |
-| taint.cpp:512:7:512:12 | strtok | (OSSL_LIB_CTX *,const char *) |  | OSSL_PROVIDER_load | 1 |
-| taint.cpp:512:7:512:12 | strtok | (OSSL_LIB_CTX *,const char *) |  | PKCS7_new_ex | 1 |
-| taint.cpp:512:7:512:12 | strtok | (OSSL_LIB_CTX *,const char *) |  | SCT_CTX_new | 1 |
-| taint.cpp:512:7:512:12 | strtok | (OSSL_LIB_CTX *,const char *) |  | TS_RESP_CTX_new_ex | 1 |
-| taint.cpp:512:7:512:12 | strtok | (OSSL_LIB_CTX *,const char *) |  | X509_CRL_new_ex | 1 |
-| taint.cpp:512:7:512:12 | strtok | (OSSL_LIB_CTX *,const char *) |  | X509_PUBKEY_new_ex | 1 |
-| taint.cpp:512:7:512:12 | strtok | (OSSL_LIB_CTX *,const char *) |  | X509_REQ_new_ex | 1 |
-| taint.cpp:512:7:512:12 | strtok | (OSSL_LIB_CTX *,const char *) |  | X509_STORE_CTX_new_ex | 1 |
-| taint.cpp:512:7:512:12 | strtok | (OSSL_LIB_CTX *,const char *) |  | X509_new_ex | 1 |
-| taint.cpp:512:7:512:12 | strtok | (OSSL_LIB_CTX *,const char *) |  | ossl_cmp_mock_srv_new | 1 |
-| taint.cpp:512:7:512:12 | strtok | (OSSL_LIB_CTX *,const char *) |  | ossl_cms_Data_create | 1 |
-| taint.cpp:512:7:512:12 | strtok | (OSSL_LIB_CTX *,const char *) |  | ossl_parse_property | 1 |
-| taint.cpp:512:7:512:12 | strtok | (OSSL_PARAM *,const char *) |  | OSSL_PARAM_locate | 1 |
-| taint.cpp:512:7:512:12 | strtok | (OSSL_PARAM *,const char *) |  | OSSL_PARAM_set_utf8_ptr | 1 |
-| taint.cpp:512:7:512:12 | strtok | (OSSL_PARAM *,const char *) |  | OSSL_PARAM_set_utf8_string | 1 |
-| taint.cpp:512:7:512:12 | strtok | (OSSL_PROVIDER *,const char *) |  | ossl_provider_set_module_path | 1 |
-| taint.cpp:512:7:512:12 | strtok | (PKCS7 *,const char *) |  | ossl_pkcs7_set1_propq | 1 |
-| taint.cpp:512:7:512:12 | strtok | (RSA_METHOD *,const char *) |  | RSA_meth_set1_name | 1 |
-| taint.cpp:512:7:512:12 | strtok | (SSL *,const char *) |  | SSL_add1_host | 1 |
-| taint.cpp:512:7:512:12 | strtok | (SSL *,const char *) |  | SSL_set1_host | 1 |
-| taint.cpp:512:7:512:12 | strtok | (SSL *,const char *) |  | SSL_set_cipher_list | 1 |
-| taint.cpp:512:7:512:12 | strtok | (SSL *,const char *) |  | SSL_use_psk_identity_hint | 1 |
-| taint.cpp:512:7:512:12 | strtok | (SSL_CONF_CTX *,const char *) |  | SSL_CONF_CTX_set1_prefix | 1 |
-| taint.cpp:512:7:512:12 | strtok | (SSL_CONF_CTX *,const char *) |  | SSL_CONF_cmd_value_type | 1 |
-| taint.cpp:512:7:512:12 | strtok | (SSL_CTX *,const char *) |  | SSL_CTX_set_cipher_list | 1 |
-| taint.cpp:512:7:512:12 | strtok | (SSL_CTX *,const char *) |  | SSL_CTX_use_psk_identity_hint | 1 |
-| taint.cpp:512:7:512:12 | strtok | (SSL_CTX *,const char *) |  | ossl_quic_set_diag_title | 1 |
-| taint.cpp:512:7:512:12 | strtok | (SSL_SESSION *,const char *) |  | SSL_SESSION_set1_hostname | 1 |
-| taint.cpp:512:7:512:12 | strtok | (UI *,const char *) |  | UI_add_error_string | 1 |
-| taint.cpp:512:7:512:12 | strtok | (UI *,const char *) |  | UI_add_info_string | 1 |
-| taint.cpp:512:7:512:12 | strtok | (UI *,const char *) |  | UI_dup_error_string | 1 |
-| taint.cpp:512:7:512:12 | strtok | (UI *,const char *) |  | UI_dup_info_string | 1 |
-| taint.cpp:512:7:512:12 | strtok | (X509 *,const char *) |  | x509_ctrl_string | 1 |
-| taint.cpp:512:7:512:12 | strtok | (X509_REQ *,const char *) |  | x509_req_ctrl_string | 1 |
-| taint.cpp:512:7:512:12 | strtok | (X509_VERIFY_PARAM *,const char *) |  | X509_VERIFY_PARAM_set1_ip_asc | 1 |
-| taint.cpp:512:7:512:12 | strtok | (X509_VERIFY_PARAM *,const char *) |  | X509_VERIFY_PARAM_set1_name | 1 |
-| taint.cpp:512:7:512:12 | strtok | (__printf_buffer *,const char *) |  | __printf_buffer_puts_1 | 1 |
-| taint.cpp:512:7:512:12 | strtok | (alloc_buffer,const char *) |  | __libc_alloc_buffer_copy_string | 1 |
-| taint.cpp:512:7:512:12 | strtok | (argp_fmtstream_t,const char *) |  | __argp_fmtstream_puts | 1 |
-| taint.cpp:512:7:512:12 | strtok | (char **,const char *) |  | Curl_setstropt | 1 |
-| taint.cpp:512:7:512:12 | strtok | (char **,const char *) |  | __strsep | 1 |
-| taint.cpp:512:7:512:12 | strtok | (char *,const char *) |  | xstrdup | 0 |
-| taint.cpp:512:7:512:12 | strtok | (char *,const char *) |  | xstrdup | 1 |
-| taint.cpp:512:7:512:12 | strtok | (const OSSL_PARAM *,const char *) |  | OSSL_PARAM_locate_const | 1 |
-| taint.cpp:512:7:512:12 | strtok | (const char **,const char *) |  | uv__utf8_decode1 | 1 |
-| taint.cpp:512:7:512:12 | strtok | (const char *,const char *) |  | Configcmp | 1 |
-| taint.cpp:512:7:512:12 | strtok | (const char *,const char *) |  | Curl_timestrcmp | 1 |
-| taint.cpp:512:7:512:12 | strtok | (const char *,const char *) |  | DES_crypt | 1 |
-| taint.cpp:512:7:512:12 | strtok | (const char *,const char *) |  | OPENSSL_strcasecmp | 1 |
-| taint.cpp:512:7:512:12 | strtok | (const char *,const char *) |  | __bind_textdomain_codeset | 1 |
-| taint.cpp:512:7:512:12 | strtok | (const char *,const char *) |  | __bindtextdomain | 1 |
-| taint.cpp:512:7:512:12 | strtok | (const char *,const char *) |  | __dgettext | 1 |
-| taint.cpp:512:7:512:12 | strtok | (const char *,const char *) |  | __gconv_compare_alias | 1 |
-| taint.cpp:512:7:512:12 | strtok | (const char *,const char *) |  | __strcasestr | 1 |
-| taint.cpp:512:7:512:12 | strtok | (const char *,const char *) |  | __strcspn_generic | 1 |
-| taint.cpp:512:7:512:12 | strtok | (const char *,const char *) |  | __strcspn_sse42 | 1 |
-| taint.cpp:512:7:512:12 | strtok | (const char *,const char *) |  | __strpbrk_generic | 1 |
-| taint.cpp:512:7:512:12 | strtok | (const char *,const char *) |  | __strpbrk_sse42 | 1 |
-| taint.cpp:512:7:512:12 | strtok | (const char *,const char *) |  | __strspn_generic | 1 |
-| taint.cpp:512:7:512:12 | strtok | (const char *,const char *) |  | __strspn_sse42 | 1 |
-| taint.cpp:512:7:512:12 | strtok | (const char *,const char *) |  | __strstr_generic | 1 |
-| taint.cpp:512:7:512:12 | strtok | (const char *,const char *) |  | __strverscmp | 1 |
-| taint.cpp:512:7:512:12 | strtok | (const char *,const char *) |  | _dl_cache_libcmp | 1 |
-| taint.cpp:512:7:512:12 | strtok | (const char *,const char *) |  | advance | 1 |
-| taint.cpp:512:7:512:12 | strtok | (const char *,const char *) |  | c_strcasecmp | 1 |
-| taint.cpp:512:7:512:12 | strtok | (const char *,const char *) |  | charmap_aliases | 1 |
-| taint.cpp:512:7:512:12 | strtok | (const char *,const char *) |  | charmap_open | 1 |
-| taint.cpp:512:7:512:12 | strtok | (const char *,const char *) |  | chroot_canon | 1 |
-| taint.cpp:512:7:512:12 | strtok | (const char *,const char *) |  | get_passwd | 1 |
-| taint.cpp:512:7:512:12 | strtok | (const char *,const char *) |  | gzopen | 1 |
-| taint.cpp:512:7:512:12 | strtok | (const char *,const char *) |  | gzopen64 | 1 |
-| taint.cpp:512:7:512:12 | strtok | (const char *,const char *) |  | iconv_open | 1 |
-| taint.cpp:512:7:512:12 | strtok | (const char *,const char *) |  | openssl_fopen | 1 |
-| taint.cpp:512:7:512:12 | strtok | (const char *,const char *) |  | ossl_pem_check_suffix | 1 |
-| taint.cpp:512:7:512:12 | strtok | (const char *,const char *) |  | ossl_v3_name_cmp | 1 |
-| taint.cpp:512:7:512:12 | strtok | (const char *,const char *) |  | sqlite3_strglob | 1 |
-| taint.cpp:512:7:512:12 | strtok | (const char *,const char *) |  | sqlite3_stricmp | 1 |
-| taint.cpp:512:7:512:12 | strtok | (const char *,const char *) |  | step | 1 |
-| taint.cpp:512:7:512:12 | strtok | (const char *,const char *) |  | tempnam | 1 |
-| taint.cpp:512:7:512:12 | strtok | (const char *,const char *) |  | xfopen | 1 |
-| taint.cpp:512:7:512:12 | strtok | (const mntent *,const char *) |  | __hasmntopt | 1 |
-| taint.cpp:512:7:512:12 | strtok | (const nis_error,const char *) |  | nis_sperror | 1 |
-| taint.cpp:512:7:512:12 | strtok | (curl_mimepart *,const char *) |  | curl_mime_filedata | 1 |
-| taint.cpp:512:7:512:12 | strtok | (curl_off_t *,const char *) |  | str2offset | 1 |
-| taint.cpp:512:7:512:12 | strtok | (curl_pushheaders *,const char *) |  | curl_pushheader_byname | 1 |
-| taint.cpp:512:7:512:12 | strtok | (curl_slist **,const char *) |  | add2list | 1 |
-| taint.cpp:512:7:512:12 | strtok | (curl_slist *,const char *) |  | curl_slist_append | 1 |
-| taint.cpp:512:7:512:12 | strtok | (dynbuf *,const char *) |  | Curl_dyn_add | 1 |
-| taint.cpp:512:7:512:12 | strtok | (dynbuf *,const char *) |  | curlx_dyn_add | 1 |
-| taint.cpp:512:7:512:12 | strtok | (dynhds *,const char *) |  | Curl_dynhds_cget | 1 |
-| taint.cpp:512:7:512:12 | strtok | (dynhds *,const char *) |  | Curl_dynhds_h1_cadd_line | 1 |
-| taint.cpp:512:7:512:12 | strtok | (gconv_fcts *,const char *) |  | __wcsmbs_named_conv | 1 |
-| taint.cpp:512:7:512:12 | strtok | (gzFile,const char *) |  | gzputs | 1 |
-| taint.cpp:512:7:512:12 | strtok | (int,const char *) |  | BIO_meth_new | 1 |
-| taint.cpp:512:7:512:12 | strtok | (int,const char *) |  | _IO_new_fdopen | 1 |
-| taint.cpp:512:7:512:12 | strtok | (int,const char *) |  | gzdopen | 1 |
-| taint.cpp:512:7:512:12 | strtok | (int,const char *) |  | setlocale | 1 |
-| taint.cpp:512:7:512:12 | strtok | (int,const char *) |  | xsetlocale | 1 |
-| taint.cpp:512:7:512:12 | strtok | (lemon *,const char *) |  | file_makename | 1 |
-| taint.cpp:512:7:512:12 | strtok | (long *,const char *) |  | secs2ms | 1 |
-| taint.cpp:512:7:512:12 | strtok | (long *,const char *) |  | str2num | 1 |
-| taint.cpp:512:7:512:12 | strtok | (long *,const char *) |  | str2unum | 1 |
-| taint.cpp:512:7:512:12 | strtok | (nss_module *,const char *) |  | __nss_module_get_function | 1 |
-| taint.cpp:512:7:512:12 | strtok | (size_t *,const char *) |  | next_protos_parse | 1 |
-| taint.cpp:512:7:512:12 | strtok | (slist_wc **,const char *) |  | easysrc_add | 1 |
-| taint.cpp:512:7:512:12 | strtok | (slist_wc *,const char *) |  | slist_wc_append | 1 |
-| taint.cpp:512:7:512:12 | strtok | (sockaddr_un *,const char *) |  | __sockaddr_un_set | 1 |
-| taint.cpp:512:7:512:12 | strtok | (sqlite3 *,const char *) |  | sqlite3_declare_vtab | 1 |
-| taint.cpp:512:7:512:12 | strtok | (sqlite3 *,const char *) |  | sqlite3_get_clientdata | 1 |
-| taint.cpp:512:7:512:12 | strtok | (sqlite3 *,const char *) |  | sqlite3_wal_checkpoint | 1 |
-| taint.cpp:512:7:512:12 | strtok | (sqlite3_intck *,const char *) |  | sqlite3_intck_test_sql | 1 |
-| taint.cpp:512:7:512:12 | strtok | (sqlite3_stmt *,const char *) |  | sqlite3_bind_parameter_index | 1 |
-| taint.cpp:512:7:512:12 | strtok | (sqlite3_str *,const char *) |  | sqlite3_str_appendall | 1 |
-| taint.cpp:512:7:512:12 | strtok | (sqlite3_value *,const char *) |  | sqlite3_value_pointer | 1 |
-| taint.cpp:512:7:512:12 | strtok | (stringtable *,const char *) |  | stringtable_add | 1 |
-| taint.cpp:512:7:512:12 | strtok | (unsigned char *,const char *) |  | ossl_a2i_ipadd | 1 |
-| taint.cpp:512:7:512:12 | strtok | (unsigned long *,const char *) |  | set_cert_ex | 1 |
-| taint.cpp:512:7:512:12 | strtok | (unsigned long *,const char *) |  | set_name_ex | 1 |
-| taint.cpp:512:7:512:12 | strtok | (uv_pipe_t *,const char *) |  | uv_pipe_bind | 1 |
-| taint.cpp:514:6:514:16 | test_strtok | (char *) |  | SRP_VBASE_new | 0 |
-| taint.cpp:514:6:514:16 | test_strtok | (char *) |  | _IO_gets | 0 |
-| taint.cpp:514:6:514:16 | test_strtok | (char *) |  | __mktemp | 0 |
-| taint.cpp:514:6:514:16 | test_strtok | (char *) |  | __nis_default_group | 0 |
-| taint.cpp:514:6:514:16 | test_strtok | (char *) |  | __nis_default_owner | 0 |
-| taint.cpp:514:6:514:16 | test_strtok | (char *) |  | __nis_default_ttl | 0 |
-| taint.cpp:514:6:514:16 | test_strtok | (char *) |  | __xpg_basename | 0 |
-| taint.cpp:514:6:514:16 | test_strtok | (char *) |  | ctermid | 0 |
-| taint.cpp:514:6:514:16 | test_strtok | (char *) |  | cuserid | 0 |
-| taint.cpp:514:6:514:16 | test_strtok | (char *) |  | defossilize | 0 |
-| taint.cpp:514:6:514:16 | test_strtok | (char *) |  | des_setparity | 0 |
-| taint.cpp:514:6:514:16 | test_strtok | (char *) |  | dirname | 0 |
-| taint.cpp:514:6:514:16 | test_strtok | (char *) |  | getwd | 0 |
-| taint.cpp:514:6:514:16 | test_strtok | (char *) |  | make_uppercase | 0 |
-| taint.cpp:514:6:514:16 | test_strtok | (char *) |  | mkdtemp | 0 |
-| taint.cpp:514:6:514:16 | test_strtok | (char *) |  | next_item | 0 |
-| taint.cpp:514:6:514:16 | test_strtok | (char *) |  | strfry | 0 |
-| taint.cpp:514:6:514:16 | test_strtok | (char *) | CStringT | CStringT | 0 |
-| taint.cpp:523:7:523:13 | _strset | (ASN1_STRING *,int) |  | ASN1_STRING_length_set | 1 |
-| taint.cpp:523:7:523:13 | _strset | (ASYNC_WAIT_CTX *,int) |  | ASYNC_WAIT_CTX_set_status | 1 |
-| taint.cpp:523:7:523:13 | _strset | (BIGNUM *,int) |  | BN_clear_bit | 1 |
-| taint.cpp:523:7:523:13 | _strset | (BIGNUM *,int) |  | BN_mask_bits | 1 |
-| taint.cpp:523:7:523:13 | _strset | (BIGNUM *,int) |  | BN_set_bit | 1 |
-| taint.cpp:523:7:523:13 | _strset | (BIGNUM *,int) |  | BN_set_flags | 1 |
-| taint.cpp:523:7:523:13 | _strset | (BIGNUM *,int) |  | bn_expand2 | 1 |
-| taint.cpp:523:7:523:13 | _strset | (BIGNUM *,int) |  | bn_wexpand | 1 |
-| taint.cpp:523:7:523:13 | _strset | (BIGNUM *,int) |  | ossl_bn_mask_bits_fixed_top | 1 |
-| taint.cpp:523:7:523:13 | _strset | (BIO *,int) |  | BIO_clear_flags | 1 |
-| taint.cpp:523:7:523:13 | _strset | (BIO *,int) |  | BIO_find_type | 1 |
-| taint.cpp:523:7:523:13 | _strset | (BIO *,int) |  | BIO_set_flags | 1 |
-| taint.cpp:523:7:523:13 | _strset | (BIO *,int) |  | BIO_set_init | 1 |
-| taint.cpp:523:7:523:13 | _strset | (BIO *,int) |  | BIO_set_retry_reason | 1 |
-| taint.cpp:523:7:523:13 | _strset | (BIO *,int) |  | BIO_set_shutdown | 1 |
-| taint.cpp:523:7:523:13 | _strset | (BIO *,int) |  | TXT_DB_read | 1 |
-| taint.cpp:523:7:523:13 | _strset | (CMS_SignerInfo *,int) |  | CMS_signed_delete_attr | 1 |
-| taint.cpp:523:7:523:13 | _strset | (CMS_SignerInfo *,int) |  | CMS_unsigned_delete_attr | 1 |
-| taint.cpp:523:7:523:13 | _strset | (CURL *,int) |  | curl_easy_pause | 1 |
-| taint.cpp:523:7:523:13 | _strset | (Curl_easy *,int) |  | Curl_conn_get_socket | 1 |
-| taint.cpp:523:7:523:13 | _strset | (DH *,int) |  | DH_clear_flags | 1 |
-| taint.cpp:523:7:523:13 | _strset | (DH *,int) |  | DH_set_flags | 1 |
-| taint.cpp:523:7:523:13 | _strset | (DH_METHOD *,int) |  | DH_meth_set_flags | 1 |
-| taint.cpp:523:7:523:13 | _strset | (DSA *,int) |  | DSA_clear_flags | 1 |
-| taint.cpp:523:7:523:13 | _strset | (DSA *,int) |  | DSA_set_flags | 1 |
-| taint.cpp:523:7:523:13 | _strset | (DSA_METHOD *,int) |  | DSA_meth_set_flags | 1 |
-| taint.cpp:523:7:523:13 | _strset | (EC_GROUP *,int) |  | EC_GROUP_set_asn1_flag | 1 |
-| taint.cpp:523:7:523:13 | _strset | (EC_GROUP *,int) |  | EC_GROUP_set_curve_name | 1 |
-| taint.cpp:523:7:523:13 | _strset | (EC_KEY *,int) |  | EC_KEY_clear_flags | 1 |
-| taint.cpp:523:7:523:13 | _strset | (EC_KEY *,int) |  | EC_KEY_set_asn1_flag | 1 |
-| taint.cpp:523:7:523:13 | _strset | (EC_KEY *,int) |  | EC_KEY_set_flags | 1 |
-| taint.cpp:523:7:523:13 | _strset | (ENGINE *,int) |  | ENGINE_cmd_is_executable | 1 |
-| taint.cpp:523:7:523:13 | _strset | (ENGINE *,int) |  | ENGINE_set_flags | 1 |
-| taint.cpp:523:7:523:13 | _strset | (EVP_CIPHER *,int) |  | EVP_CIPHER_meth_set_impl_ctx_size | 1 |
-| taint.cpp:523:7:523:13 | _strset | (EVP_CIPHER *,int) |  | EVP_CIPHER_meth_set_iv_length | 1 |
-| taint.cpp:523:7:523:13 | _strset | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_clear_flags | 1 |
-| taint.cpp:523:7:523:13 | _strset | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_flags | 1 |
-| taint.cpp:523:7:523:13 | _strset | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_key_length | 1 |
-| taint.cpp:523:7:523:13 | _strset | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_num | 1 |
-| taint.cpp:523:7:523:13 | _strset | (EVP_KEYMGMT *,int) |  | evp_keymgmt_util_query_operation_name | 1 |
-| taint.cpp:523:7:523:13 | _strset | (EVP_MD *,int) |  | EVP_MD_meth_set_app_datasize | 1 |
-| taint.cpp:523:7:523:13 | _strset | (EVP_MD *,int) |  | EVP_MD_meth_set_input_blocksize | 1 |
-| taint.cpp:523:7:523:13 | _strset | (EVP_MD *,int) |  | EVP_MD_meth_set_result_size | 1 |
-| taint.cpp:523:7:523:13 | _strset | (EVP_MD_CTX *,int) |  | EVP_MD_CTX_clear_flags | 1 |
-| taint.cpp:523:7:523:13 | _strset | (EVP_MD_CTX *,int) |  | EVP_MD_CTX_set_flags | 1 |
-| taint.cpp:523:7:523:13 | _strset | (EVP_PKEY *,int) |  | EVP_PKEY_delete_attr | 1 |
-| taint.cpp:523:7:523:13 | _strset | (EVP_PKEY *,int) |  | EVP_PKEY_save_parameters | 1 |
-| taint.cpp:523:7:523:13 | _strset | (EVP_PKEY *,int) |  | EVP_PKEY_set_type | 1 |
-| taint.cpp:523:7:523:13 | _strset | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_get_keygen_info | 1 |
-| taint.cpp:523:7:523:13 | _strset | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_kdf_type | 1 |
-| taint.cpp:523:7:523:13 | _strset | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_nid | 1 |
-| taint.cpp:523:7:523:13 | _strset | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_paramgen_type | 1 |
-| taint.cpp:523:7:523:13 | _strset | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_rfc5114 | 1 |
-| taint.cpp:523:7:523:13 | _strset | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dhx_rfc5114 | 1 |
-| taint.cpp:523:7:523:13 | _strset | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ec_param_enc | 1 |
-| taint.cpp:523:7:523:13 | _strset | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ec_paramgen_curve_nid | 1 |
-| taint.cpp:523:7:523:13 | _strset | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ecdh_kdf_type | 1 |
-| taint.cpp:523:7:523:13 | _strset | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_hkdf_mode | 1 |
-| taint.cpp:523:7:523:13 | _strset | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_rsa_padding | 1 |
-| taint.cpp:523:7:523:13 | _strset | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_rsa_pss_saltlen | 1 |
-| taint.cpp:523:7:523:13 | _strset | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_gindex | 1 |
-| taint.cpp:523:7:523:13 | _strset | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_h | 1 |
-| taint.cpp:523:7:523:13 | _strset | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_pcounter | 1 |
-| taint.cpp:523:7:523:13 | _strset | (FILE *,int) |  | _IO_default_pbackfail | 1 |
-| taint.cpp:523:7:523:13 | _strset | (FILE *,int) |  | _IO_fwide | 1 |
-| taint.cpp:523:7:523:13 | _strset | (FILE *,int) |  | _IO_init | 1 |
-| taint.cpp:523:7:523:13 | _strset | (FILE *,int) |  | _IO_init_internal | 1 |
-| taint.cpp:523:7:523:13 | _strset | (FILE *,int) |  | _IO_new_file_attach | 1 |
-| taint.cpp:523:7:523:13 | _strset | (FILE *,int) |  | _IO_new_file_overflow | 1 |
-| taint.cpp:523:7:523:13 | _strset | (FILE *,int) |  | _IO_old_init | 1 |
-| taint.cpp:523:7:523:13 | _strset | (FILE *,int) |  | _IO_sputbackc | 1 |
-| taint.cpp:523:7:523:13 | _strset | (FILE *,int) |  | _IO_str_overflow | 1 |
-| taint.cpp:523:7:523:13 | _strset | (FILE *,int) |  | _IO_str_pbackfail | 1 |
-| taint.cpp:523:7:523:13 | _strset | (FILE *,int) |  | __printf_buffer_as_file_overflow | 1 |
-| taint.cpp:523:7:523:13 | _strset | (FILE *,int) |  | __wprintf_buffer_as_file_overflow | 1 |
-| taint.cpp:523:7:523:13 | _strset | (FTS *,int) |  | fts_children | 1 |
-| taint.cpp:523:7:523:13 | _strset | (LIBSSH2_CHANNEL *,int) |  | _libssh2_channel_extended_data | 1 |
-| taint.cpp:523:7:523:13 | _strset | (LIBSSH2_CHANNEL *,int) |  | _libssh2_channel_flush | 1 |
-| taint.cpp:523:7:523:13 | _strset | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_flush_ex | 1 |
-| taint.cpp:523:7:523:13 | _strset | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_handle_extended_data | 1 |
-| taint.cpp:523:7:523:13 | _strset | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_handle_extended_data2 | 1 |
-| taint.cpp:523:7:523:13 | _strset | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_set_blocking | 1 |
-| taint.cpp:523:7:523:13 | _strset | (LIBSSH2_SESSION *,int) |  | _libssh2_session_set_blocking | 1 |
-| taint.cpp:523:7:523:13 | _strset | (LIBSSH2_SESSION *,int) |  | libssh2_hostkey_hash | 1 |
-| taint.cpp:523:7:523:13 | _strset | (LIBSSH2_SESSION *,int) |  | libssh2_session_methods | 1 |
-| taint.cpp:523:7:523:13 | _strset | (LIBSSH2_SESSION *,int) |  | libssh2_session_set_blocking | 1 |
-| taint.cpp:523:7:523:13 | _strset | (LIBSSH2_SESSION *,int) |  | libssh2_session_startup | 1 |
-| taint.cpp:523:7:523:13 | _strset | (LPCOLESTR,int) | CComBSTR | Append | 1 |
-| taint.cpp:523:7:523:13 | _strset | (OCSP_BASICRESP *,int) |  | OCSP_BASICRESP_delete_ext | 1 |
-| taint.cpp:523:7:523:13 | _strset | (OCSP_BASICRESP *,int) |  | OCSP_BASICRESP_get_ext | 1 |
-| taint.cpp:523:7:523:13 | _strset | (OCSP_BASICRESP *,int) |  | OCSP_resp_get0 | 1 |
-| taint.cpp:523:7:523:13 | _strset | (OCSP_ONEREQ *,int) |  | OCSP_ONEREQ_delete_ext | 1 |
-| taint.cpp:523:7:523:13 | _strset | (OCSP_ONEREQ *,int) |  | OCSP_ONEREQ_get_ext | 1 |
-| taint.cpp:523:7:523:13 | _strset | (OCSP_REQUEST *,int) |  | OCSP_REQUEST_delete_ext | 1 |
-| taint.cpp:523:7:523:13 | _strset | (OCSP_REQUEST *,int) |  | OCSP_REQUEST_get_ext | 1 |
-| taint.cpp:523:7:523:13 | _strset | (OCSP_REQUEST *,int) |  | OCSP_request_onereq_get0 | 1 |
-| taint.cpp:523:7:523:13 | _strset | (OCSP_SINGLERESP *,int) |  | OCSP_SINGLERESP_delete_ext | 1 |
-| taint.cpp:523:7:523:13 | _strset | (OCSP_SINGLERESP *,int) |  | OCSP_SINGLERESP_get_ext | 1 |
-| taint.cpp:523:7:523:13 | _strset | (OPENSSL_STACK *,int) |  | OPENSSL_sk_delete | 1 |
-| taint.cpp:523:7:523:13 | _strset | (OPENSSL_STACK *,int) |  | OPENSSL_sk_reserve | 1 |
-| taint.cpp:523:7:523:13 | _strset | (OPENSSL_sk_compfunc,int) |  | OPENSSL_sk_new_reserve | 1 |
-| taint.cpp:523:7:523:13 | _strset | (OSSL_ACKM *,int) |  | ossl_ackm_get_ack_deadline | 1 |
-| taint.cpp:523:7:523:13 | _strset | (OSSL_ACKM *,int) |  | ossl_ackm_get_ack_frame | 1 |
-| taint.cpp:523:7:523:13 | _strset | (OSSL_ACKM *,int) |  | ossl_ackm_get_largest_acked | 1 |
-| taint.cpp:523:7:523:13 | _strset | (OSSL_ACKM *,int) |  | ossl_ackm_on_pkt_space_discarded | 1 |
-| taint.cpp:523:7:523:13 | _strset | (OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_set_serverPort | 1 |
-| taint.cpp:523:7:523:13 | _strset | (OSSL_CMP_CTX *,int) |  | ossl_cmp_ctx_set_failInfoCode | 1 |
-| taint.cpp:523:7:523:13 | _strset | (OSSL_CMP_CTX *,int) |  | ossl_cmp_ctx_set_status | 1 |
-| taint.cpp:523:7:523:13 | _strset | (OSSL_CMP_CTX *,int) |  | ossl_cmp_msg_create | 1 |
-| taint.cpp:523:7:523:13 | _strset | (OSSL_CMP_CTX *,int) |  | ossl_cmp_pollReq_new | 1 |
-| taint.cpp:523:7:523:13 | _strset | (OSSL_CMP_MSG *,int) |  | ossl_cmp_msg_set_bodytype | 1 |
-| taint.cpp:523:7:523:13 | _strset | (OSSL_CMP_PKIHEADER *,int) |  | ossl_cmp_hdr_set_pvno | 1 |
-| taint.cpp:523:7:523:13 | _strset | (OSSL_CMP_REVREPCONTENT *,int) |  | ossl_cmp_revrepcontent_get_CertId | 1 |
-| taint.cpp:523:7:523:13 | _strset | (OSSL_CMP_REVREPCONTENT *,int) |  | ossl_cmp_revrepcontent_get_pkisi | 1 |
-| taint.cpp:523:7:523:13 | _strset | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_accept_raverified | 1 |
-| taint.cpp:523:7:523:13 | _strset | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_accept_unprotected | 1 |
-| taint.cpp:523:7:523:13 | _strset | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_grant_implicit_confirm | 1 |
-| taint.cpp:523:7:523:13 | _strset | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_send_unprotected_errors | 1 |
-| taint.cpp:523:7:523:13 | _strset | (OSSL_CRMF_PKIPUBLICATIONINFO *,int) |  | OSSL_CRMF_MSG_set_PKIPublicationInfo_action | 1 |
-| taint.cpp:523:7:523:13 | _strset | (OSSL_DECODER_CTX *,int) |  | OSSL_DECODER_CTX_set_selection | 1 |
-| taint.cpp:523:7:523:13 | _strset | (OSSL_ENCODER_CTX *,int) |  | OSSL_ENCODER_CTX_set_selection | 1 |
-| taint.cpp:523:7:523:13 | _strset | (OSSL_LIB_CTX *,int) |  | OSSL_LIB_CTX_get_data | 1 |
-| taint.cpp:523:7:523:13 | _strset | (OSSL_LIB_CTX *,int) |  | OSSL_LIB_CTX_set_conf_diagnostics | 1 |
-| taint.cpp:523:7:523:13 | _strset | (OSSL_LIB_CTX *,int) |  | ossl_ctx_global_properties | 1 |
-| taint.cpp:523:7:523:13 | _strset | (OSSL_LIB_CTX *,int) |  | ossl_dh_new_by_nid_ex | 1 |
-| taint.cpp:523:7:523:13 | _strset | (OSSL_LIB_CTX *,int) |  | ossl_lib_ctx_get_data | 1 |
-| taint.cpp:523:7:523:13 | _strset | (OSSL_LIB_CTX *,int) |  | ossl_mac_key_new | 1 |
-| taint.cpp:523:7:523:13 | _strset | (OSSL_PARAM *,int) |  | OSSL_PARAM_set_int | 1 |
-| taint.cpp:523:7:523:13 | _strset | (OSSL_QRX *,int) |  | ossl_qrx_get_bytes_received | 1 |
-| taint.cpp:523:7:523:13 | _strset | (OSSL_RECORD_LAYER *,int) |  | tls_set_first_handshake | 1 |
-| taint.cpp:523:7:523:13 | _strset | (OSSL_RECORD_LAYER *,int) |  | tls_set_plain_alerts | 1 |
-| taint.cpp:523:7:523:13 | _strset | (OSSL_STORE_CTX *,int) |  | OSSL_STORE_expect | 1 |
-| taint.cpp:523:7:523:13 | _strset | (PKCS7 *,int) |  | PKCS7_set_type | 1 |
-| taint.cpp:523:7:523:13 | _strset | (QUIC_CHANNEL *,int) |  | ossl_quic_channel_new_stream_local | 1 |
-| taint.cpp:523:7:523:13 | _strset | (QUIC_ENGINE *,int) |  | ossl_quic_engine_set_inhibit_tick | 1 |
-| taint.cpp:523:7:523:13 | _strset | (QUIC_PORT *,int) |  | ossl_quic_port_set_allow_incoming | 1 |
-| taint.cpp:523:7:523:13 | _strset | (QUIC_RCIDM *,int) |  | ossl_quic_rcidm_get_preferred_tx_dcid_changed | 1 |
-| taint.cpp:523:7:523:13 | _strset | (QUIC_RSTREAM *,int) |  | ossl_quic_rstream_set_cleanse | 1 |
-| taint.cpp:523:7:523:13 | _strset | (QUIC_RXFC *,int) |  | ossl_quic_rxfc_get_error | 1 |
-| taint.cpp:523:7:523:13 | _strset | (QUIC_RXFC *,int) |  | ossl_quic_rxfc_has_cwm_changed | 1 |
-| taint.cpp:523:7:523:13 | _strset | (QUIC_SSTREAM *,int) |  | ossl_quic_sstream_set_cleanse | 1 |
-| taint.cpp:523:7:523:13 | _strset | (QUIC_STREAM_MAP *,int) |  | ossl_quic_stream_map_get_accept_queue_len | 1 |
-| taint.cpp:523:7:523:13 | _strset | (QUIC_TXFC *,int) |  | ossl_quic_txfc_has_become_blocked | 1 |
-| taint.cpp:523:7:523:13 | _strset | (RSA *,int) |  | RSA_clear_flags | 1 |
-| taint.cpp:523:7:523:13 | _strset | (RSA *,int) |  | RSA_set_flags | 1 |
-| taint.cpp:523:7:523:13 | _strset | (RSA_METHOD *,int) |  | RSA_meth_set_flags | 1 |
-| taint.cpp:523:7:523:13 | _strset | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_hashalg | 1 |
-| taint.cpp:523:7:523:13 | _strset | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_maskgenhashalg | 1 |
-| taint.cpp:523:7:523:13 | _strset | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_saltlen | 1 |
-| taint.cpp:523:7:523:13 | _strset | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_trailerfield | 1 |
-| taint.cpp:523:7:523:13 | _strset | (SSL *,int) |  | SSL_key_update | 1 |
-| taint.cpp:523:7:523:13 | _strset | (SSL *,int) |  | SSL_set_post_handshake_auth | 1 |
-| taint.cpp:523:7:523:13 | _strset | (SSL *,int) |  | SSL_set_purpose | 1 |
-| taint.cpp:523:7:523:13 | _strset | (SSL *,int) |  | SSL_set_quic_tls_early_data_enabled | 1 |
-| taint.cpp:523:7:523:13 | _strset | (SSL *,int) |  | SSL_set_quiet_shutdown | 1 |
-| taint.cpp:523:7:523:13 | _strset | (SSL *,int) |  | SSL_set_read_ahead | 1 |
-| taint.cpp:523:7:523:13 | _strset | (SSL *,int) |  | SSL_set_security_level | 1 |
-| taint.cpp:523:7:523:13 | _strset | (SSL *,int) |  | SSL_set_shutdown | 1 |
-| taint.cpp:523:7:523:13 | _strset | (SSL *,int) |  | SSL_set_trust | 1 |
-| taint.cpp:523:7:523:13 | _strset | (SSL *,int) |  | SSL_set_verify_depth | 1 |
-| taint.cpp:523:7:523:13 | _strset | (SSL_CONNECTION *,int) |  | dtls1_read_failed | 1 |
-| taint.cpp:523:7:523:13 | _strset | (SSL_CONNECTION *,int) |  | ossl_statem_send_fatal | 1 |
-| taint.cpp:523:7:523:13 | _strset | (SSL_CONNECTION *,int) |  | ossl_statem_set_in_init | 1 |
-| taint.cpp:523:7:523:13 | _strset | (SSL_CONNECTION *,int) |  | tls1_shared_group | 1 |
-| taint.cpp:523:7:523:13 | _strset | (SSL_CTX *,int) |  | SSL_CTX_set_post_handshake_auth | 1 |
-| taint.cpp:523:7:523:13 | _strset | (SSL_CTX *,int) |  | SSL_CTX_set_purpose | 1 |
-| taint.cpp:523:7:523:13 | _strset | (SSL_CTX *,int) |  | SSL_CTX_set_quiet_shutdown | 1 |
-| taint.cpp:523:7:523:13 | _strset | (SSL_CTX *,int) |  | SSL_CTX_set_security_level | 1 |
-| taint.cpp:523:7:523:13 | _strset | (SSL_CTX *,int) |  | SSL_CTX_set_srp_strength | 1 |
-| taint.cpp:523:7:523:13 | _strset | (SSL_CTX *,int) |  | SSL_CTX_set_trust | 1 |
-| taint.cpp:523:7:523:13 | _strset | (SSL_CTX *,int) |  | SSL_CTX_set_verify_depth | 1 |
-| taint.cpp:523:7:523:13 | _strset | (SSL_CTX *,int) |  | ssl_md | 1 |
-| taint.cpp:523:7:523:13 | _strset | (SSL_SESSION *,int) |  | SSL_SESSION_set_protocol_version | 1 |
-| taint.cpp:523:7:523:13 | _strset | (TS_REQ *,int) |  | TS_REQ_delete_ext | 1 |
-| taint.cpp:523:7:523:13 | _strset | (TS_REQ *,int) |  | TS_REQ_get_ext | 1 |
-| taint.cpp:523:7:523:13 | _strset | (TS_RESP_CTX *,int) |  | TS_RESP_CTX_add_flags | 1 |
-| taint.cpp:523:7:523:13 | _strset | (TS_STATUS_INFO *,int) |  | TS_STATUS_INFO_set_status | 1 |
-| taint.cpp:523:7:523:13 | _strset | (TS_TST_INFO *,int) |  | TS_TST_INFO_delete_ext | 1 |
-| taint.cpp:523:7:523:13 | _strset | (TS_TST_INFO *,int) |  | TS_TST_INFO_get_ext | 1 |
-| taint.cpp:523:7:523:13 | _strset | (TS_VERIFY_CTX *,int) |  | TS_VERIFY_CTX_add_flags | 1 |
-| taint.cpp:523:7:523:13 | _strset | (TS_VERIFY_CTX *,int) |  | TS_VERIFY_CTX_set_flags | 1 |
-| taint.cpp:523:7:523:13 | _strset | (WPACKET *,int) |  | ossl_DER_w_begin_sequence | 1 |
-| taint.cpp:523:7:523:13 | _strset | (X509 *,int) |  | X509_delete_ext | 1 |
-| taint.cpp:523:7:523:13 | _strset | (X509 *,int) |  | X509_self_signed | 1 |
-| taint.cpp:523:7:523:13 | _strset | (X509_ACERT *,int) |  | X509_ACERT_delete_attr | 1 |
-| taint.cpp:523:7:523:13 | _strset | (X509_ATTRIBUTE *,int) |  | X509_ATTRIBUTE_get0_type | 1 |
-| taint.cpp:523:7:523:13 | _strset | (X509_CRL *,int) |  | X509_CRL_delete_ext | 1 |
-| taint.cpp:523:7:523:13 | _strset | (X509_NAME *,int) |  | X509_NAME_delete_entry | 1 |
-| taint.cpp:523:7:523:13 | _strset | (X509_REQ *,int) |  | X509_REQ_delete_attr | 1 |
-| taint.cpp:523:7:523:13 | _strset | (X509_REVOKED *,int) |  | X509_REVOKED_delete_ext | 1 |
-| taint.cpp:523:7:523:13 | _strset | (X509_STORE *,int) |  | X509_STORE_set_depth | 1 |
-| taint.cpp:523:7:523:13 | _strset | (X509_STORE *,int) |  | X509_STORE_set_purpose | 1 |
-| taint.cpp:523:7:523:13 | _strset | (X509_STORE *,int) |  | X509_STORE_set_trust | 1 |
-| taint.cpp:523:7:523:13 | _strset | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_depth | 1 |
-| taint.cpp:523:7:523:13 | _strset | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_error | 1 |
-| taint.cpp:523:7:523:13 | _strset | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_error_depth | 1 |
-| taint.cpp:523:7:523:13 | _strset | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_purpose | 1 |
-| taint.cpp:523:7:523:13 | _strset | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_trust | 1 |
-| taint.cpp:523:7:523:13 | _strset | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_get0_host | 1 |
-| taint.cpp:523:7:523:13 | _strset | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_auth_level | 1 |
-| taint.cpp:523:7:523:13 | _strset | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_depth | 1 |
-| taint.cpp:523:7:523:13 | _strset | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_purpose | 1 |
-| taint.cpp:523:7:523:13 | _strset | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_trust | 1 |
-| taint.cpp:523:7:523:13 | _strset | (_Float128,int) |  | __ldexpf128 | 1 |
-| taint.cpp:523:7:523:13 | _strset | (_Float128,int) |  | __scalbnf128 | 1 |
-| taint.cpp:523:7:523:13 | _strset | (__sigset_t *,int) |  | __sigaddset_compat | 1 |
-| taint.cpp:523:7:523:13 | _strset | (__sigset_t *,int) |  | __sigdelset_compat | 1 |
-| taint.cpp:523:7:523:13 | _strset | (acttab *,int) |  | acttab_insert | 1 |
-| taint.cpp:523:7:523:13 | _strset | (addrinfo *,int) |  | support_format_addrinfo | 1 |
-| taint.cpp:523:7:523:13 | _strset | (aiocb_union *,int) |  | __aio_enqueue_request | 1 |
-| taint.cpp:523:7:523:13 | _strset | (argp_fmtstream_t,int) |  | __argp_fmtstream_putc | 1 |
-| taint.cpp:523:7:523:13 | _strset | (char **,int) |  | addrsort | 1 |
-| taint.cpp:523:7:523:13 | _strset | (char *,int) |  | Curl_str2addr | 0 |
-| taint.cpp:523:7:523:13 | _strset | (char *,int) |  | Curl_str2addr | 1 |
-| taint.cpp:523:7:523:13 | _strset | (char *,int) |  | PEM_proc_type | 0 |
-| taint.cpp:523:7:523:13 | _strset | (char *,int) |  | PEM_proc_type | 1 |
-| taint.cpp:523:7:523:13 | _strset | (char,int) | CStringT | CStringT | 1 |
-| taint.cpp:523:7:523:13 | _strset | (connectdata *,int) |  | Curl_conn_is_ssl | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const ASN1_BIT_STRING *,int) |  | ASN1_BIT_STRING_get_bit | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const BIGNUM *,int) |  | BN_get_flags | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const BIGNUM *,int) |  | BN_is_bit_set | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const BIO *,int) |  | BIO_get_ex_data | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const BIO *,int) |  | BIO_test_flags | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const CMS_SignerInfo *,int) |  | CMS_signed_get_attr | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const CMS_SignerInfo *,int) |  | CMS_unsigned_get_attr | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const CRYPTO_EX_DATA *,int) |  | CRYPTO_get_ex_data | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const DH *,int) |  | DH_get_ex_data | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const DH *,int) |  | DH_test_flags | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const DH *,int) |  | ossl_dh_dup | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const DSA *,int) |  | DSA_get_ex_data | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const DSA *,int) |  | DSA_test_flags | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const DSA *,int) |  | ossl_dsa_dup | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const ECX_KEY *,int) |  | ossl_ecx_key_dup | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const EC_KEY *,int) |  | EC_KEY_get_ex_data | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const EC_KEY *,int) |  | ossl_ec_key_dup | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const ENGINE *,int) |  | ENGINE_get_ex_data | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_test_flags | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const EVP_MD_CTX *,int) |  | EVP_MD_CTX_test_flags | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const EVP_PKEY *,int) |  | EVP_PKEY_get_attr | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const EVP_PKEY *,int) |  | EVP_PKEY_get_ex_data | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const ML_DSA_KEY *,int) |  | ossl_ml_dsa_key_dup | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const ML_KEM_KEY *,int) |  | ossl_ml_kem_key_dup | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const OPENSSL_STACK *,int) |  | OPENSSL_sk_value | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const OSSL_CMP_CERTREPMESSAGE *,int) |  | ossl_cmp_certrepmessage_get0_certresponse | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_get0_newPkey | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_get_option | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const OSSL_CMP_PKISI *,int) |  | ossl_cmp_pkisi_check_pkifailureinfo | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const OSSL_CMP_POLLREPCONTENT *,int) |  | ossl_cmp_pollrepcontent_get0_pollrep | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const QUIC_CHANNEL *,int) |  | ossl_quic_channel_get_local_stream_count_avail | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const QUIC_CHANNEL *,int) |  | ossl_quic_channel_get_remote_stream_count_avail | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const RSA *,int) |  | RSA_get_ex_data | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const RSA *,int) |  | RSA_test_flags | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const RSA *,int) |  | ossl_rsa_dup | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const SLH_DSA_KEY *,int) |  | ossl_slh_dsa_key_dup | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const SSL *,int) |  | SSL_get_ex_data | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const SSL_CTX *,int) |  | SSL_CTX_get_ex_data | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const SSL_SESSION *,int) |  | SSL_SESSION_get_ex_data | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const SSL_SESSION *,int) |  | ssl_session_dup | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const UI *,int) |  | UI_get_ex_data | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const UI_METHOD *,int) |  | UI_method_get_ex_data | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const X509 *,int) |  | X509_get_ex_data | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const X509 *,int) |  | X509_get_ext | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const X509_ACERT *,int) |  | X509_ACERT_get_attr | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const X509_CRL *,int) |  | X509_CRL_get_ext | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const X509_NAME *,int) |  | X509_NAME_get_entry | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const X509_POLICY_LEVEL *,int) |  | X509_policy_level_get0_node | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const X509_POLICY_TREE *,int) |  | X509_policy_tree_get0_level | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const X509_REQ *,int) |  | X509_REQ_get_attr | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const X509_REVOKED *,int) |  | X509_REVOKED_get_ext | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const X509_STORE *,int) |  | X509_STORE_get_ex_data | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const X509_STORE_CTX *,int) |  | X509_STORE_CTX_get_ex_data | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const XCHAR *,int) | CStringT | CStringT | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const YCHAR *,int) | CStringT | CStringT | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const char *,int) |  | DH_meth_new | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const char *,int) |  | DSA_meth_new | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const char *,int) |  | Jim_StrDupLen | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const char *,int) |  | NETSCAPE_SPKI_b64_decode | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const char *,int) |  | RSA_meth_new | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const char *,int) |  | ftok | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const char *,int) |  | gethostbyname2 | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const char *,int) |  | parse_yesno | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const char *,int) |  | res_gethostbyname2 | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const stack_st_X509_ATTRIBUTE *,int) |  | X509at_get_attr | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const stack_st_X509_EXTENSION *,int) |  | X509v3_get_ext | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const unsigned char *,int) |  | Jim_GenHashFunction | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const unsigned char *,int) |  | OPENSSL_uni2asc | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const unsigned char *,int) |  | OPENSSL_uni2utf8 | 1 |
-| taint.cpp:523:7:523:13 | _strset | (const void *,int) |  | inet6_rth_getaddr | 1 |
-| taint.cpp:523:7:523:13 | _strset | (double,int) |  | __ldexp | 1 |
-| taint.cpp:523:7:523:13 | _strset | (double,int) |  | __scalbn | 1 |
-| taint.cpp:523:7:523:13 | _strset | (double[],int) |  | getloadavg | 1 |
-| taint.cpp:523:7:523:13 | _strset | (dynhds *,int) |  | Curl_dynhds_set_opts | 1 |
-| taint.cpp:523:7:523:13 | _strset | (fexcept_t *,int) |  | fegetexceptflag | 1 |
-| taint.cpp:523:7:523:13 | _strset | (float,int) |  | __ldexpf | 1 |
-| taint.cpp:523:7:523:13 | _strset | (float,int) |  | __scalbnf | 1 |
-| taint.cpp:523:7:523:13 | _strset | (gzFile,int) |  | gzflush | 1 |
-| taint.cpp:523:7:523:13 | _strset | (gzFile,int) |  | gzputc | 1 |
-| taint.cpp:523:7:523:13 | _strset | (int *,int) |  | X509_PURPOSE_set | 1 |
-| taint.cpp:523:7:523:13 | _strset | (int *,int) |  | X509_TRUST_set | 1 |
-| taint.cpp:523:7:523:13 | _strset | (int *,int) |  | __lll_unlock_elision | 1 |
-| taint.cpp:523:7:523:13 | _strset | (int,int) |  | BN_security_bits | 1 |
-| taint.cpp:523:7:523:13 | _strset | (int,int) |  | EVP_MD_meth_new | 1 |
-| taint.cpp:523:7:523:13 | _strset | (int,int) |  | EVP_PKEY_meth_new | 1 |
-| taint.cpp:523:7:523:13 | _strset | (int,int) |  | __isctype | 1 |
-| taint.cpp:523:7:523:13 | _strset | (int,int) |  | acttab_alloc | 1 |
-| taint.cpp:523:7:523:13 | _strset | (int,int) |  | div | 1 |
-| taint.cpp:523:7:523:13 | _strset | (int,int) |  | inet6_rth_space | 1 |
-| taint.cpp:523:7:523:13 | _strset | (long double,int) |  | __ldexpl | 1 |
-| taint.cpp:523:7:523:13 | _strset | (netlink_handle *,int) |  | __netlink_request | 1 |
-| taint.cpp:523:7:523:13 | _strset | (nghttp2_option *,int) |  | nghttp2_option_set_no_auto_ping_ack | 1 |
-| taint.cpp:523:7:523:13 | _strset | (nghttp2_option *,int) |  | nghttp2_option_set_no_auto_window_update | 1 |
-| taint.cpp:523:7:523:13 | _strset | (nghttp2_option *,int) |  | nghttp2_option_set_no_closed_streams | 1 |
-| taint.cpp:523:7:523:13 | _strset | (nghttp2_option *,int) |  | nghttp2_option_set_no_http_messaging | 1 |
-| taint.cpp:523:7:523:13 | _strset | (nghttp2_option *,int) |  | nghttp2_option_set_no_recv_client_magic | 1 |
-| taint.cpp:523:7:523:13 | _strset | (nghttp2_option *,int) |  | nghttp2_option_set_no_rfc9113_leading_and_trailing_ws_validation | 1 |
-| taint.cpp:523:7:523:13 | _strset | (nghttp2_option *,int) |  | nghttp2_option_set_server_fallback_rfc7540_priorities | 1 |
-| taint.cpp:523:7:523:13 | _strset | (ns_msg,int) |  | ns_msg_getflag | 1 |
-| taint.cpp:523:7:523:13 | _strset | (obstack *,int) |  | _obstack_newchunk | 1 |
-| taint.cpp:523:7:523:13 | _strset | (posix_spawnattr_t *,int) |  | posix_spawnattr_setcgroup_np | 1 |
-| taint.cpp:523:7:523:13 | _strset | (posix_spawnattr_t *,int) |  | posix_spawnattr_setschedpolicy | 1 |
-| taint.cpp:523:7:523:13 | _strset | (pthread_attr_t *,int) |  | __pthread_attr_setschedpolicy | 1 |
-| taint.cpp:523:7:523:13 | _strset | (pthread_barrierattr_t *,int) |  | __pthread_barrierattr_setpshared | 1 |
-| taint.cpp:523:7:523:13 | _strset | (pthread_mutexattr_t *,int) |  | ___pthread_mutexattr_settype | 1 |
-| taint.cpp:523:7:523:13 | _strset | (pthread_mutexattr_t *,int) |  | __pthread_mutexattr_setprioceiling | 1 |
-| taint.cpp:523:7:523:13 | _strset | (pthread_mutexattr_t *,int) |  | __pthread_mutexattr_setprotocol | 1 |
-| taint.cpp:523:7:523:13 | _strset | (pthread_rwlockattr_t *,int) |  | __pthread_rwlockattr_setkind_np | 1 |
-| taint.cpp:523:7:523:13 | _strset | (pthread_rwlockattr_t *,int) |  | __pthread_rwlockattr_setpshared | 1 |
-| taint.cpp:523:7:523:13 | _strset | (rule *,int) |  | Configlist_add | 1 |
-| taint.cpp:523:7:523:13 | _strset | (rule *,int) |  | Configlist_addbasis | 1 |
-| taint.cpp:523:7:523:13 | _strset | (sigset_t *,int) |  | sigaddset | 1 |
-| taint.cpp:523:7:523:13 | _strset | (sigset_t *,int) |  | sigdelset | 1 |
-| taint.cpp:523:7:523:13 | _strset | (sqlite3 *,int) |  | sqlite3_busy_timeout | 1 |
-| taint.cpp:523:7:523:13 | _strset | (sqlite3 *,int) |  | sqlite3_db_name | 1 |
-| taint.cpp:523:7:523:13 | _strset | (sqlite3 *,int) |  | sqlite3_wal_autocheckpoint | 1 |
-| taint.cpp:523:7:523:13 | _strset | (sqlite3_backup *,int) |  | sqlite3_backup_step | 1 |
-| taint.cpp:523:7:523:13 | _strset | (sqlite3_context *,int) |  | sqlite3_aggregate_context | 1 |
-| taint.cpp:523:7:523:13 | _strset | (sqlite3_context *,int) |  | sqlite3_result_error_code | 1 |
-| taint.cpp:523:7:523:13 | _strset | (sqlite3_index_info *,int) |  | sqlite3_vtab_collation | 1 |
-| taint.cpp:523:7:523:13 | _strset | (sqlite3_stmt *,int) |  | sqlite3_bind_parameter_name | 1 |
-| taint.cpp:523:7:523:13 | _strset | (sqlite3_stmt *,int) |  | sqlite3_column_blob | 1 |
-| taint.cpp:523:7:523:13 | _strset | (sqlite3_stmt *,int) |  | sqlite3_column_bytes | 1 |
-| taint.cpp:523:7:523:13 | _strset | (sqlite3_stmt *,int) |  | sqlite3_column_bytes16 | 1 |
-| taint.cpp:523:7:523:13 | _strset | (sqlite3_stmt *,int) |  | sqlite3_column_decltype | 1 |
-| taint.cpp:523:7:523:13 | _strset | (sqlite3_stmt *,int) |  | sqlite3_column_decltype16 | 1 |
-| taint.cpp:523:7:523:13 | _strset | (sqlite3_stmt *,int) |  | sqlite3_column_double | 1 |
-| taint.cpp:523:7:523:13 | _strset | (sqlite3_stmt *,int) |  | sqlite3_column_int | 1 |
-| taint.cpp:523:7:523:13 | _strset | (sqlite3_stmt *,int) |  | sqlite3_column_int64 | 1 |
-| taint.cpp:523:7:523:13 | _strset | (sqlite3_stmt *,int) |  | sqlite3_column_name | 1 |
-| taint.cpp:523:7:523:13 | _strset | (sqlite3_stmt *,int) |  | sqlite3_column_name16 | 1 |
-| taint.cpp:523:7:523:13 | _strset | (sqlite3_stmt *,int) |  | sqlite3_column_text | 1 |
-| taint.cpp:523:7:523:13 | _strset | (sqlite3_stmt *,int) |  | sqlite3_column_text16 | 1 |
-| taint.cpp:523:7:523:13 | _strset | (sqlite3_stmt *,int) |  | sqlite3_column_type | 1 |
-| taint.cpp:523:7:523:13 | _strset | (sqlite3_stmt *,int) |  | sqlite3_column_value | 1 |
-| taint.cpp:523:7:523:13 | _strset | (sqlite3_stmt *,int) |  | sqlite3_stmt_explain | 1 |
-| taint.cpp:523:7:523:13 | _strset | (stack_st_PKCS7 *,int) |  | PKCS12_add_safes | 1 |
-| taint.cpp:523:7:523:13 | _strset | (stack_st_SSL_COMP *,int) |  | ssl3_comp_find | 1 |
-| taint.cpp:523:7:523:13 | _strset | (stack_st_X509_ATTRIBUTE *,int) |  | X509at_delete_attr | 1 |
-| taint.cpp:523:7:523:13 | _strset | (stack_st_X509_EXTENSION *,int) |  | X509v3_delete_ext | 1 |
-| taint.cpp:523:7:523:13 | _strset | (timespec *,int) |  | __timespec_get | 1 |
-| taint.cpp:523:7:523:13 | _strset | (timespec *,int) |  | __timespec_getres | 1 |
-| taint.cpp:523:7:523:13 | _strset | (uint16_t,int) |  | tls1_group_id2nid | 1 |
-| taint.cpp:523:7:523:13 | _strset | (unsigned char *,int) |  | RAND_bytes | 1 |
-| taint.cpp:523:7:523:13 | _strset | (unsigned char *,int) |  | RAND_priv_bytes | 1 |
-| taint.cpp:523:7:523:13 | _strset | (unsigned char *,int) |  | ossl_ipaddr_to_asc | 1 |
-| taint.cpp:523:7:523:13 | _strset | (unsigned short,int) |  | dtls1_get_queue_priority | 1 |
-| taint.cpp:523:7:523:13 | _strset | (uv_env_item_t *,int) |  | uv_os_free_environ | 1 |
-| taint.cpp:523:7:523:13 | _strset | (void *,int) |  | DSO_dsobyaddr | 1 |
-| taint.cpp:523:7:523:13 | _strset | (void *,int) |  | sqlite3_realloc | 1 |
-| taint.cpp:523:7:523:13 | _strset | (void *const *,int) |  | __backtrace_symbols | 1 |
-| taint.cpp:523:7:523:13 | _strset | (wchar_t,int) | CStringT | CStringT | 1 |
-| taint.cpp:525:6:525:18 | test_strset_1 | (__printf_buffer *,char) |  | __printf_buffer_putc_1 | 1 |
-| taint.cpp:525:6:525:18 | test_strset_1 | (char **,char) |  | Curl_str_single | 1 |
-| taint.cpp:525:6:525:18 | test_strset_1 | (char **,char) |  | __old_strsep_1c | 1 |
-| taint.cpp:525:6:525:18 | test_strset_1 | (const CStringT &,char) |  | operator+ | 1 |
-| taint.cpp:531:6:531:18 | test_strset_2 | (char *) |  | SRP_VBASE_new | 0 |
-| taint.cpp:531:6:531:18 | test_strset_2 | (char *) |  | _IO_gets | 0 |
-| taint.cpp:531:6:531:18 | test_strset_2 | (char *) |  | __mktemp | 0 |
-| taint.cpp:531:6:531:18 | test_strset_2 | (char *) |  | __nis_default_group | 0 |
-| taint.cpp:531:6:531:18 | test_strset_2 | (char *) |  | __nis_default_owner | 0 |
-| taint.cpp:531:6:531:18 | test_strset_2 | (char *) |  | __nis_default_ttl | 0 |
-| taint.cpp:531:6:531:18 | test_strset_2 | (char *) |  | __xpg_basename | 0 |
-| taint.cpp:531:6:531:18 | test_strset_2 | (char *) |  | ctermid | 0 |
-| taint.cpp:531:6:531:18 | test_strset_2 | (char *) |  | cuserid | 0 |
-| taint.cpp:531:6:531:18 | test_strset_2 | (char *) |  | defossilize | 0 |
-| taint.cpp:531:6:531:18 | test_strset_2 | (char *) |  | des_setparity | 0 |
-| taint.cpp:531:6:531:18 | test_strset_2 | (char *) |  | dirname | 0 |
-| taint.cpp:531:6:531:18 | test_strset_2 | (char *) |  | getwd | 0 |
-| taint.cpp:531:6:531:18 | test_strset_2 | (char *) |  | make_uppercase | 0 |
-| taint.cpp:531:6:531:18 | test_strset_2 | (char *) |  | mkdtemp | 0 |
-| taint.cpp:531:6:531:18 | test_strset_2 | (char *) |  | next_item | 0 |
-| taint.cpp:531:6:531:18 | test_strset_2 | (char *) |  | strfry | 0 |
-| taint.cpp:531:6:531:18 | test_strset_2 | (char *) | CStringT | CStringT | 0 |
-| taint.cpp:538:7:538:13 | mempcpy | (BIO *,OCSP_REQUEST *,unsigned long) |  | OCSP_REQUEST_print | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (BIO *,OCSP_RESPONSE *,unsigned long) |  | OCSP_RESPONSE_print | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (BIO *,X509 *,unsigned long) |  | ossl_x509_print_ex_brief | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (BIO *,X509_CRL *,unsigned long) |  | X509_CRL_print_ex | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (BIO *,const ASN1_STRING *,unsigned long) |  | ASN1_STRING_print_ex | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (BLAKE2B_CTX *,const void *,size_t) |  | ossl_blake2b_update | 1 |
-| taint.cpp:538:7:538:13 | mempcpy | (BLAKE2B_CTX *,const void *,size_t) |  | ossl_blake2b_update | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (BLAKE2B_PARAM *,const uint8_t *,size_t) |  | ossl_blake2b_param_set_personal | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (BLAKE2B_PARAM *,const uint8_t *,size_t) |  | ossl_blake2b_param_set_salt | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (BLAKE2S_CTX *,const void *,size_t) |  | ossl_blake2s_update | 1 |
-| taint.cpp:538:7:538:13 | mempcpy | (BLAKE2S_CTX *,const void *,size_t) |  | ossl_blake2s_update | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (BLAKE2S_PARAM *,const uint8_t *,size_t) |  | ossl_blake2s_param_set_personal | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (BLAKE2S_PARAM *,const uint8_t *,size_t) |  | ossl_blake2s_param_set_salt | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (CCM128_CONTEXT *,const unsigned char *,size_t) |  | CRYPTO_ccm128_aad | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (CCM128_CONTEXT *,unsigned char *,size_t) |  | CRYPTO_ccm128_tag | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (CMAC_CTX *,const void *,size_t) |  | CMAC_Update | 1 |
-| taint.cpp:538:7:538:13 | mempcpy | (CMAC_CTX *,const void *,size_t) |  | CMAC_Update | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (CMS_RecipientInfo *,const unsigned char *,size_t) |  | CMS_RecipientInfo_kekri_id_cmp | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (Curl_easy *,unsigned char *,size_t) |  | Curl_rand_alnum | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (Curl_easy *,unsigned char *,size_t) |  | Curl_rand_bytes | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (Curl_easy *,unsigned char *,size_t) |  | Curl_rand_hex | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (DH *,const unsigned char *,size_t) |  | ossl_dh_buf2key | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (EC_GROUP *,const unsigned char *,size_t) |  | EC_GROUP_set_seed | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (EC_KEY *,const unsigned char *,size_t) |  | ossl_ec_key_simple_oct2priv | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (EVP_MAC_CTX **,const void *,size_t) |  | _libssh2_hmac_update | 1 |
-| taint.cpp:538:7:538:13 | mempcpy | (EVP_MAC_CTX **,const void *,size_t) |  | _libssh2_hmac_update | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (EVP_MAC_CTX **,void *,size_t) |  | _libssh2_hmac_sha1_init | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (EVP_MAC_CTX **,void *,size_t) |  | _libssh2_hmac_sha256_init | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (EVP_MAC_CTX **,void *,size_t) |  | _libssh2_hmac_sha512_init | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (EVP_MD_CTX **,const void *,size_t) |  | _libssh2_sha1_update | 1 |
-| taint.cpp:538:7:538:13 | mempcpy | (EVP_MD_CTX **,const void *,size_t) |  | _libssh2_sha1_update | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (EVP_MD_CTX **,const void *,size_t) |  | _libssh2_sha256_update | 1 |
-| taint.cpp:538:7:538:13 | mempcpy | (EVP_MD_CTX **,const void *,size_t) |  | _libssh2_sha256_update | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (EVP_MD_CTX **,const void *,size_t) |  | _libssh2_sha384_update | 1 |
-| taint.cpp:538:7:538:13 | mempcpy | (EVP_MD_CTX **,const void *,size_t) |  | _libssh2_sha384_update | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (EVP_MD_CTX **,const void *,size_t) |  | _libssh2_sha512_update | 1 |
-| taint.cpp:538:7:538:13 | mempcpy | (EVP_MD_CTX **,const void *,size_t) |  | _libssh2_sha512_update | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (EVP_MD_CTX *,const unsigned char *,size_t) |  | EVP_DigestVerifyFinal | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (EVP_PKEY *,char *,size_t) |  | EVP_PKEY_get_default_digest_name | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (EVP_RAND_CTX *,unsigned char *,size_t) |  | EVP_RAND_nonce | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (FFC_PARAMS *,const unsigned char *,size_t) |  | ossl_ffc_params_set_seed | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (FILE *,const ASN1_STRING *,unsigned long) |  | ASN1_STRING_print_ex_fp | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (FILE *,const char *,size_t) |  | _IO_new_do_write | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (FILE *,const void *,size_t) |  | _IO_default_xsputn | 1 |
-| taint.cpp:538:7:538:13 | mempcpy | (FILE *,const void *,size_t) |  | _IO_default_xsputn | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (FILE *,const void *,size_t) |  | _IO_new_file_xsputn | 1 |
-| taint.cpp:538:7:538:13 | mempcpy | (FILE *,const void *,size_t) |  | _IO_new_file_xsputn | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (FILE *,const void *,size_t) |  | _IO_wdefault_xsputn | 1 |
-| taint.cpp:538:7:538:13 | mempcpy | (FILE *,const void *,size_t) |  | _IO_wdefault_xsputn | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (FILE *,const void *,size_t) |  | _IO_wfile_xsputn | 1 |
-| taint.cpp:538:7:538:13 | mempcpy | (FILE *,const void *,size_t) |  | _IO_wfile_xsputn | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (FILE *,const void *,size_t) |  | __printf_buffer_as_file_xsputn | 1 |
-| taint.cpp:538:7:538:13 | mempcpy | (FILE *,const void *,size_t) |  | __printf_buffer_as_file_xsputn | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (FILE *,const void *,size_t) |  | __wprintf_buffer_as_file_xsputn | 1 |
-| taint.cpp:538:7:538:13 | mempcpy | (FILE *,const void *,size_t) |  | __wprintf_buffer_as_file_xsputn | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (FILE *,void *,size_t) |  | _IO_default_xsgetn | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (FILE *,void *,size_t) |  | _IO_file_xsgetn | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (FILE *,void *,size_t) |  | _IO_file_xsgetn_mmap | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (FILE *,void *,size_t) |  | _IO_wdefault_xsgetn | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (GCM128_CONTEXT *,const unsigned char *,size_t) |  | CRYPTO_gcm128_aad | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (GCM128_CONTEXT *,const unsigned char *,size_t) |  | CRYPTO_gcm128_setiv | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (GCM128_CONTEXT *,unsigned char *,size_t) |  | CRYPTO_gcm128_tag | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (KECCAK1600_CTX *,const void *,size_t) |  | ossl_sha3_update | 1 |
-| taint.cpp:538:7:538:13 | mempcpy | (KECCAK1600_CTX *,const void *,size_t) |  | ossl_sha3_update | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (KECCAK1600_CTX *,unsigned char *,size_t) |  | ossl_sha3_squeeze | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (KECCAK1600_CTX *,unsigned char,size_t) |  | ossl_sha3_init | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (LIBSSH2_CHANNEL *,const char *,size_t) |  | libssh2_channel_signal_ex | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (LIBSSH2_SFTP_HANDLE *,char *,size_t) |  | libssh2_sftp_read | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (LIBSSH2_SFTP_HANDLE *,const char *,size_t) |  | libssh2_sftp_write | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (MD4_CTX *,const void *,size_t) |  | MD4_Update | 1 |
-| taint.cpp:538:7:538:13 | mempcpy | (MD4_CTX *,const void *,size_t) |  | MD4_Update | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (MD4_CTX *,const void *,size_t) |  | md4_block_data_order | 1 |
-| taint.cpp:538:7:538:13 | mempcpy | (MD4_CTX *,const void *,size_t) |  | md4_block_data_order | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (MD5_CTX *,const void *,size_t) |  | MD5_Update | 1 |
-| taint.cpp:538:7:538:13 | mempcpy | (MD5_CTX *,const void *,size_t) |  | MD5_Update | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (MD5_SHA1_CTX *,const void *,size_t) |  | ossl_md5_sha1_update | 1 |
-| taint.cpp:538:7:538:13 | mempcpy | (MD5_SHA1_CTX *,const void *,size_t) |  | ossl_md5_sha1_update | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (MDC2_CTX *,const unsigned char *,size_t) |  | MDC2_Update | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (ML_DSA_KEY *,const uint8_t *,size_t) |  | ossl_ml_dsa_pk_decode | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (ML_DSA_KEY *,const uint8_t *,size_t) |  | ossl_ml_dsa_sk_decode | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (MemoryManager *,const uint8_t *,size_t) |  | CreatePreparedDictionary | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (OCB128_CONTEXT *,const unsigned char *,size_t) |  | CRYPTO_ocb128_aad | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (OCB128_CONTEXT *,unsigned char *,size_t) |  | CRYPTO_ocb128_tag | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (OSSL_HPKE_CTX *,const unsigned char *,size_t) |  | OSSL_HPKE_CTX_set1_ikme | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (OSSL_JSON_ENC *,const char *,size_t) |  | ossl_json_str_len | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (OSSL_JSON_ENC *,const void *,size_t) |  | ossl_json_str_hex | 1 |
-| taint.cpp:538:7:538:13 | mempcpy | (OSSL_JSON_ENC *,const void *,size_t) |  | ossl_json_str_hex | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (OSSL_LIB_CTX *,unsigned char *,size_t) |  | ossl_rand_cleanup_entropy | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (OSSL_LIB_CTX *,unsigned char *,size_t) |  | ossl_rand_cleanup_user_entropy | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (OSSL_PARAM *,const void *,size_t) |  | OSSL_PARAM_set_octet_ptr | 1 |
-| taint.cpp:538:7:538:13 | mempcpy | (OSSL_PARAM *,const void *,size_t) |  | OSSL_PARAM_set_octet_ptr | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (OSSL_PARAM *,const void *,size_t) |  | OSSL_PARAM_set_octet_string | 1 |
-| taint.cpp:538:7:538:13 | mempcpy | (OSSL_PARAM *,const void *,size_t) |  | OSSL_PARAM_set_octet_string | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (OSSL_PARAM *,const void *,size_t) |  | OSSL_PARAM_set_octet_string_or_ptr | 1 |
-| taint.cpp:538:7:538:13 | mempcpy | (OSSL_PARAM *,const void *,size_t) |  | OSSL_PARAM_set_octet_string_or_ptr | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (OSSL_PARAM *,void *,size_t) |  | ossl_param_set_secure_block | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (OSSL_RECORD_LAYER *,OSSL_RECORD_TEMPLATE *,size_t) |  | tls_write_records_default | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (OSSL_RECORD_LAYER *,OSSL_RECORD_TEMPLATE *,size_t) |  | tls_write_records_multiblock | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (POLY1305 *,const unsigned char *,size_t) |  | Poly1305_Update | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (PROV_CIPHER_CTX *,const unsigned char *,size_t) |  | ossl_cipher_generic_initiv | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (PROV_CIPHER_CTX *,const unsigned char *,size_t) |  | ossl_cipher_hw_tdes_ede3_initkey | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (PROV_GCM_CTX *,const unsigned char *,size_t) |  | ossl_gcm_aad_update | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (QUIC_PN,unsigned char *,size_t) |  | ossl_quic_wire_encode_pkt_hdr_pn | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (QUIC_RXFC *,OSSL_STATM *,size_t) |  | ossl_quic_rstream_new | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (QUIC_TLS *,const unsigned char *,size_t) |  | ossl_quic_tls_set_transport_params | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (RAND_POOL *,const unsigned char *,size_t) |  | ossl_rand_pool_adin_mix_in | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (RAND_POOL *,size_t,size_t) |  | ossl_rand_pool_add_end | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (RIPEMD160_CTX *,const void *,size_t) |  | RIPEMD160_Update | 1 |
-| taint.cpp:538:7:538:13 | mempcpy | (RIPEMD160_CTX *,const void *,size_t) |  | RIPEMD160_Update | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (RIPEMD160_CTX *,const void *,size_t) |  | ripemd160_block_data_order | 1 |
-| taint.cpp:538:7:538:13 | mempcpy | (RIPEMD160_CTX *,const void *,size_t) |  | ripemd160_block_data_order | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (SCT **,const unsigned char **,size_t) |  | o2i_SCT | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (SCT *,const unsigned char **,size_t) |  | o2i_SCT_signature | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (SCT *,const unsigned char *,size_t) |  | SCT_set1_extensions | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (SCT *,const unsigned char *,size_t) |  | SCT_set1_log_id | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (SCT *,const unsigned char *,size_t) |  | SCT_set1_signature | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (SCT *,unsigned char *,size_t) |  | SCT_set0_extensions | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (SCT *,unsigned char *,size_t) |  | SCT_set0_log_id | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (SCT *,unsigned char *,size_t) |  | SCT_set0_signature | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (SHA256_CTX *,const void *,size_t) |  | SHA224_Update | 1 |
-| taint.cpp:538:7:538:13 | mempcpy | (SHA256_CTX *,const void *,size_t) |  | SHA224_Update | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (SHA256_CTX *,const void *,size_t) |  | SHA256_Update | 1 |
-| taint.cpp:538:7:538:13 | mempcpy | (SHA256_CTX *,const void *,size_t) |  | SHA256_Update | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (SHA512_CTX *,const void *,size_t) |  | SHA384_Update | 1 |
-| taint.cpp:538:7:538:13 | mempcpy | (SHA512_CTX *,const void *,size_t) |  | SHA384_Update | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (SHA512_CTX *,const void *,size_t) |  | SHA512_Update | 1 |
-| taint.cpp:538:7:538:13 | mempcpy | (SHA512_CTX *,const void *,size_t) |  | SHA512_Update | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (SHA_CTX *,const void *,size_t) |  | SHA1_Update | 1 |
-| taint.cpp:538:7:538:13 | mempcpy | (SHA_CTX *,const void *,size_t) |  | SHA1_Update | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (SIPHASH *,const unsigned char *,size_t) |  | SipHash_Update | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (SIPHASH *,unsigned char *,size_t) |  | SipHash_Final | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (SIV128_CONTEXT *,const unsigned char *,size_t) |  | ossl_siv128_set_tag | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (SIV128_CONTEXT *,unsigned char *,size_t) |  | ossl_siv128_get_tag | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (SLH_DSA_KEY *,const uint8_t *,size_t) |  | ossl_slh_dsa_set_priv | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (SLH_DSA_KEY *,const uint8_t *,size_t) |  | ossl_slh_dsa_set_pub | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (SM3_CTX *,const void *,size_t) |  | ossl_sm3_block_data_order | 1 |
-| taint.cpp:538:7:538:13 | mempcpy | (SM3_CTX *,const void *,size_t) |  | ossl_sm3_block_data_order | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (SM3_CTX *,const void *,size_t) |  | ossl_sm3_update | 1 |
-| taint.cpp:538:7:538:13 | mempcpy | (SM3_CTX *,const void *,size_t) |  | ossl_sm3_update | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (SSL *,const unsigned char *,size_t) |  | SSL_set1_client_cert_type | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (SSL *,const unsigned char *,size_t) |  | SSL_set1_server_cert_type | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (SSL *,const unsigned char *,size_t) |  | SSL_set_quic_tls_transport_params | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (SSL *,size_t,size_t) |  | SSL_set_block_padding_ex | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (SSL_CONNECTION *,TLS_RECORD *,size_t) |  | ssl_release_record | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (SSL_CONNECTION *,const unsigned char *,size_t) |  | lookup_sess_in_cache | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (SSL_CTX *,const unsigned char *,size_t) |  | SSL_CTX_set1_client_cert_type | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (SSL_CTX *,const unsigned char *,size_t) |  | SSL_CTX_set1_server_cert_type | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (SSL_CTX *,size_t,size_t) |  | SSL_CTX_set_block_padding_ex | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (SSL_SESSION *,const unsigned char *,size_t) |  | SSL_SESSION_set1_alpn_selected | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (SSL_SESSION *,const unsigned char *,size_t) |  | SSL_SESSION_set1_master_key | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (SSL_SESSION *,const void *,size_t) |  | SSL_SESSION_set1_ticket_appdata | 1 |
-| taint.cpp:538:7:538:13 | mempcpy | (SSL_SESSION *,const void *,size_t) |  | SSL_SESSION_set1_ticket_appdata | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (Strtab *,const char *,size_t) |  | strtabadd | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (WHIRLPOOL_CTX *,const void *,size_t) |  | WHIRLPOOL_BitUpdate | 1 |
-| taint.cpp:538:7:538:13 | mempcpy | (WHIRLPOOL_CTX *,const void *,size_t) |  | WHIRLPOOL_BitUpdate | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (WHIRLPOOL_CTX *,const void *,size_t) |  | WHIRLPOOL_Update | 1 |
-| taint.cpp:538:7:538:13 | mempcpy | (WHIRLPOOL_CTX *,const void *,size_t) |  | WHIRLPOOL_Update | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (WPACKET *,BUF_MEM *,size_t) |  | WPACKET_init_len | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (WPACKET *,const unsigned char *,size_t) |  | ossl_quic_wire_encode_frame_new_token | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (WPACKET *,const void *,size_t) |  | WPACKET_memcpy | 1 |
-| taint.cpp:538:7:538:13 | mempcpy | (WPACKET *,const void *,size_t) |  | WPACKET_memcpy | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (WPACKET *,int,size_t) |  | WPACKET_memset | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (WPACKET *,uint64_t,size_t) |  | WPACKET_put_bytes__ | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (WPACKET *,unsigned char *,size_t) |  | WPACKET_init_der | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (WPACKET *,unsigned char *,size_t) |  | dtls_raw_hello_verify_request | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (X509_VERIFY_PARAM *,const char *,size_t) |  | X509_VERIFY_PARAM_add1_host | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (X509_VERIFY_PARAM *,const char *,size_t) |  | X509_VERIFY_PARAM_set1_email | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (X509_VERIFY_PARAM *,const char *,size_t) |  | X509_VERIFY_PARAM_set1_host | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (X509_VERIFY_PARAM *,const unsigned char *,size_t) |  | X509_VERIFY_PARAM_set1_ip | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (__printf_buffer *,char,size_t) |  | __printf_buffer_pad_1 | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (__printf_buffer *,const char *,size_t) |  | __printf_buffer_write | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (__printf_buffer_snprintf *,char *,size_t) |  | __printf_buffer_snprintf_init | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (__wprintf_buffer *,const wchar_t *,size_t) |  | __wprintf_buffer_write | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (__wprintf_buffer *,wchar_t,size_t) |  | __wprintf_buffer_pad_1 | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (alloc_buffer,const void *,size_t) |  | __libc_alloc_buffer_copy_bytes | 1 |
-| taint.cpp:538:7:538:13 | mempcpy | (alloc_buffer,const void *,size_t) |  | __libc_alloc_buffer_copy_bytes | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (argp_fmtstream *,argp_fmtstream_t,size_t) |  | __argp_fmtstream_ensure | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (argp_fmtstream_t,const char *,size_t) |  | __argp_fmtstream_write | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (bufc_pool *,size_t,size_t) |  | Curl_bufcp_init | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (bufq *,size_t,size_t) |  | Curl_bufq_init | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (bufref *,const void *,size_t) |  | Curl_bufref_memdup | 1 |
-| taint.cpp:538:7:538:13 | mempcpy | (bufref *,const void *,size_t) |  | Curl_bufref_memdup | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (char **,size_t *,size_t) |  | Curl_str_number | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (char *,const char *,size_t) |  | Curl_strntolower | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (char *,const char *,size_t) |  | Curl_strntoupper | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (char *,const char *,size_t) |  | OPENSSL_strlcat | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (char *,const char *,size_t) |  | OPENSSL_strlcpy | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (char *,const char *,size_t) |  | uv__strscpy | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (char *,size_t,size_t) |  | __getcwd_chk | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (char *__restrict__,const char *__restrict__,size_t) |  | __strlcat | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (char *__restrict__,const char *__restrict__,size_t) |  | __strlcpy | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (const CTLOG_STORE *,const uint8_t *,size_t) |  | CTLOG_STORE_get0_log_by_id | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (const EC_KEY *,unsigned char *,size_t) |  | ossl_ec_key_simple_priv2oct | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (const EVP_MD *,const OSSL_ITEM *,size_t) |  | ossl_digest_md_to_nid | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (const EVP_MD *,const unsigned char *,size_t) |  | OSSL_STORE_SEARCH_by_key_fingerprint | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (const OSSL_CMP_CTX *,char *,size_t) |  | OSSL_CMP_CTX_snprint_PKIStatus | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (const OSSL_CMP_PKISI *,char *,size_t) |  | OSSL_CMP_snprint_PKIStatusInfo | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (const OSSL_NAMEMAP *,int,size_t) |  | ossl_namemap_num2name | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (const OSSL_PARAM *,char **,size_t) |  | OSSL_PARAM_get_utf8_string | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (const SSL *,unsigned char *,size_t) |  | SSL_get_client_random | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (const SSL *,unsigned char *,size_t) |  | SSL_get_server_random | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (const SSL_SESSION *,unsigned char *,size_t) |  | SSL_SESSION_get_master_key | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (const char *,char **,size_t) |  | OSSL_PARAM_construct_utf8_ptr | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (const char *,char *,size_t) |  | OSSL_PARAM_construct_utf8_string | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (const char *,char *,size_t) |  | __libc_ns_makecanon | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (const char *,char *,size_t) |  | __realpath_chk | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (const char *,char *,size_t) |  | getpass_r | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (const char *,char *,size_t) |  | ns_makecanon | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (const char *,const char *,size_t) |  | OPENSSL_strncasecmp | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (const char *,const char *,size_t) |  | c_strncasecmp | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (const char *,const char *,unsigned long) |  | __ngettext | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (const char *,uint16_t *,size_t) |  | uv_wtf8_to_utf16 | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (const char *,unsigned char *,size_t) |  | OSSL_PARAM_construct_BN | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (const char *,void **,size_t) |  | OSSL_PARAM_construct_octet_ptr | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (const char *,void *,size_t) |  | OSSL_PARAM_construct_octet_string | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (const char *,void *,size_t) |  | uv__random_readpath | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (const charmap_t *,const char *,size_t) |  | charmap_find_symbol | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (const charmap_t *,const char *,size_t) |  | charmap_find_value | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (const repertoire_t *,const char *,size_t) |  | repertoire_find_value | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (const sockaddr *,char *,size_t) |  | uv_ip_name | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (const sockaddr_in6 *,char *,size_t) |  | uv_ip6_name | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (const sockaddr_in *,char *,size_t) |  | uv_ip4_name | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (const unsigned char *,char *,size_t) |  | ___ns_name_ntop | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (const unsigned char *,size_t,size_t) |  | ossl_rand_pool_attach | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (const void *,const void *,size_t) |  | chachapoly_timingsafe_bcmp | 1 |
-| taint.cpp:538:7:538:13 | mempcpy | (const void *,const void *,size_t) |  | chachapoly_timingsafe_bcmp | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (const void *,size_t,size_t) |  | support_blob_repeat_allocate | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (const void *,size_t,size_t) |  | support_blob_repeat_allocate_shared | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (const_nis_name,char *,size_t) |  | nis_domain_of_r | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (const_nis_name,char *,size_t) |  | nis_leaf_of_r | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (const_nis_name,char *,size_t) |  | nis_name_of_r | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (curl_mimepart *,const char *,size_t) |  | curl_mime_data | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (curve448_scalar_t,const unsigned char *,size_t) |  | ossl_curve448_scalar_decode_long | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (dynbuf *,const void *,size_t) |  | Curl_dyn_addn | 1 |
-| taint.cpp:538:7:538:13 | mempcpy | (dynbuf *,const void *,size_t) |  | Curl_dyn_addn | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (dynbuf *,const void *,size_t) |  | curlx_dyn_addn | 1 |
-| taint.cpp:538:7:538:13 | mempcpy | (dynbuf *,const void *,size_t) |  | curlx_dyn_addn | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (dynhds *,const char *,size_t) |  | Curl_dynhds_get | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (dynhds *,const char *,size_t) |  | Curl_dynhds_h1_add_line | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (dynhds *,size_t,size_t) |  | Curl_dynhds_init | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (int *,const char *,size_t) |  | Curl_http_decode_status | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (int *,int *,size_t) |  | EVP_PBE_get | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (int,char *,size_t) |  | Curl_strerror | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (int,char *,size_t) |  | __strerror_r | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (int,char *,size_t) |  | __ttyname_r | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (int,char *,size_t) |  | uv_err_name_r | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (int,char *,size_t) |  | uv_strerror_r | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (int,const void *,size_t) |  | _nl_intern_locale_data | 1 |
-| taint.cpp:538:7:538:13 | mempcpy | (int,const void *,size_t) |  | _nl_intern_locale_data | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (int,const void *,size_t) |  | writeall | 1 |
-| taint.cpp:538:7:538:13 | mempcpy | (int,const void *,size_t) |  | writeall | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (int,int,size_t) |  | BrotliEncoderEstimatePeakMemoryUsage | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (int,void *,size_t) |  | __readall | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (locale_file *,const uint32_t *,size_t) |  | add_locale_uint32_array | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (nghttp2_buf *,uint8_t *,size_t) |  | nghttp2_buf_wrap_init | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (nghttp2_extension *,nghttp2_origin_entry *,size_t) |  | nghttp2_frame_origin_init | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (nghttp2_extpri *,const uint8_t *,size_t) |  | nghttp2_extpri_parse_priority | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (nghttp2_extpri *,const uint8_t *,size_t) |  | nghttp2_http_parse_priority | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (nghttp2_hd_deflater *,const nghttp2_nv *,size_t) |  | nghttp2_hd_deflate_bound | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (nghttp2_session *,const uint8_t *,size_t) |  | nghttp2_session_mem_recv | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (nghttp2_session *,const uint8_t *,size_t) |  | nghttp2_session_mem_recv2 | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (nghttp2_session *,int32_t,size_t) |  | nghttp2_session_consume | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (nghttp2_session *,nghttp2_settings_entry *,size_t) |  | nghttp2_session_update_local_settings | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (nghttp2_settings *,nghttp2_settings_entry *,size_t) |  | nghttp2_frame_unpack_settings_payload | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (ns_rr_cursor *,const unsigned char *,size_t) |  | __ns_rr_cursor_init | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (pthread_attr_t *,void *,size_t) |  | __pthread_attr_setstack | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (scratch_buffer *,size_t,size_t) |  | __libc_scratch_buffer_set_array_size | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (sfparse_parser *,const uint8_t *,size_t) |  | sfparse_parser_init | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (size_t,OSSL_QTX_IOVEC *,size_t) |  | ossl_quic_sstream_adjust_iov | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (stack_st_SCT **,const unsigned char **,size_t) |  | o2i_SCT_LIST | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (ucs4_t *,const uint8_t *,size_t) |  | u8_mbtouc_aux | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (uint8_t *,const nghttp2_settings_entry *,size_t) |  | nghttp2_frame_pack_settings_payload | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (uint8_t *,const void *,size_t) |  | nghttp2_cpymem | 1 |
-| taint.cpp:538:7:538:13 | mempcpy | (uint8_t *,const void *,size_t) |  | nghttp2_cpymem | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (unsigned char **,const char *,size_t) |  | _libssh2_store_str | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (unsigned char **,const unsigned char *,size_t) |  | _libssh2_store_bignum2_bytes | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (unsigned char *,const unsigned char *,size_t) |  | BUF_reverse | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (unsigned char *,int,unsigned long) |  | UTF8_putc | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (unsigned char *,size_t *,size_t) |  | ossl_cipher_padblock | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (unsigned char *,size_t *,size_t) |  | ossl_cipher_unpadblock | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (unsigned int,char *,size_t) |  | __initstate | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (uv_thread_t *,char *,size_t) |  | uv__thread_getname | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (uv_thread_t *,char *,size_t) |  | uv_thread_getaffinity | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (uv_thread_t *,char *,size_t) |  | uv_thread_getname | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (void **,size_t,size_t) |  | __posix_memalign | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (void *,size_t,size_t) |  | Curl_hash_str | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (void *,size_t,size_t) |  | __libc_reallocarray | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (void *,unsigned char *,size_t) |  | ossl_drbg_clear_seed | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (wchar_t *,const wchar_t *,size_t) |  | __wmemcpy | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (wchar_t *,const wchar_t *,size_t) |  | __wmemmove | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (wchar_t *__restrict__,const wchar_t *__restrict__,size_t) |  | __wcslcat | 2 |
-| taint.cpp:538:7:538:13 | mempcpy | (wchar_t *__restrict__,const wchar_t *__restrict__,size_t) |  | __wcslcpy | 2 |
-| taint.cpp:540:6:540:17 | test_mempcpy | (int *) |  | rresvport | 0 |
-| taint.cpp:548:7:548:13 | memccpy | (BIGNUM **,EVP_PKEY *,const unsigned char *,size_t) |  | _libssh2_ecdh_gen_k | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (BIGNUM *,BIGNUM *,const unsigned char **,size_t) |  | ossl_decode_der_dsa_sig | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (BIO *,X509 *,unsigned long,unsigned long) |  | X509_print_ex | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (BIO *,X509_ACERT *,unsigned long,unsigned long) |  | X509_ACERT_print_ex | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (BIO *,X509_REQ *,unsigned long,unsigned long) |  | X509_REQ_print_ex | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (BIO *,const X509_NAME *,int,unsigned long) |  | X509_NAME_print_ex | 2 |
-| taint.cpp:548:7:548:13 | memccpy | (BIO *,const X509_NAME *,int,unsigned long) |  | X509_NAME_print_ex | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (CCM128_CONTEXT *,const unsigned char *,size_t,size_t) |  | CRYPTO_ccm128_setiv | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (CCM128_CONTEXT *,const unsigned char *,unsigned char *,size_t) |  | CRYPTO_ccm128_decrypt | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (CCM128_CONTEXT *,const unsigned char *,unsigned char *,size_t) |  | CRYPTO_ccm128_encrypt | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (EVP_KEYMGMT *,void *,char *,size_t) |  | evp_keymgmt_util_get_deflt_digest_name | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (FILE *,const X509_NAME *,int,unsigned long) |  | X509_NAME_print_ex_fp | 2 |
-| taint.cpp:548:7:548:13 | memccpy | (FILE *,const X509_NAME *,int,unsigned long) |  | X509_NAME_print_ex_fp | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (GCM128_CONTEXT *,const unsigned char *,unsigned char *,size_t) |  | CRYPTO_gcm128_decrypt | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (GCM128_CONTEXT *,const unsigned char *,unsigned char *,size_t) |  | CRYPTO_gcm128_encrypt | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (KECCAK1600_CTX *,unsigned char,size_t,size_t) |  | ossl_keccak_init | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (LIBSSH2_CHANNEL *,int,char *,size_t) |  | _libssh2_channel_read | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (LIBSSH2_CHANNEL *,int,char *,size_t) |  | libssh2_channel_read_ex | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (LIBSSH2_CHANNEL *,int,const char *,size_t) |  | libssh2_channel_write_ex | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (LIBSSH2_CHANNEL *,int,const unsigned char *,size_t) |  | _libssh2_channel_write | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (MemoryManager *,HistogramCommand *,uint32_t *,size_t) |  | BrotliHistogramReindexCommand | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (MemoryManager *,HistogramDistance *,uint32_t *,size_t) |  | BrotliHistogramReindexDistance | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (MemoryManager *,HistogramLiteral *,uint32_t *,size_t) |  | BrotliHistogramReindexLiteral | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (OCB128_CONTEXT *,const unsigned char *,unsigned char *,size_t) |  | CRYPTO_ocb128_decrypt | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (OCB128_CONTEXT *,const unsigned char *,unsigned char *,size_t) |  | CRYPTO_ocb128_encrypt | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (OSSL_HPKE_CTX *,const char *,const unsigned char *,size_t) |  | OSSL_HPKE_CTX_set1_psk | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (OSSL_LIB_CTX *,const OSSL_PROPERTY_LIST *,char *,size_t) |  | ossl_property_list_to_string | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (OSSL_PARAM[],size_t,size_t,unsigned long) |  | ossl_digest_default_get_params | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (OSSL_PARAM_BLD *,const char *,const BIGNUM *,size_t) |  | OSSL_PARAM_BLD_push_BN_pad | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (OSSL_PARAM_BLD *,const char *,const char *,size_t) |  | OSSL_PARAM_BLD_push_utf8_string | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (OSSL_PARAM_BLD *,const char *,const void *,size_t) |  | OSSL_PARAM_BLD_push_octet_string | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (OSSL_RECORD_LAYER *,size_t,size_t,size_t) |  | tls_setup_write_buffer | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (PROV_CIPHER_CTX *,unsigned char *,const unsigned char *,size_t) |  | ossl_cipher_hw_chunked_cbc | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (PROV_CIPHER_CTX *,unsigned char *,const unsigned char *,size_t) |  | ossl_cipher_hw_chunked_cfb8 | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (PROV_CIPHER_CTX *,unsigned char *,const unsigned char *,size_t) |  | ossl_cipher_hw_chunked_cfb128 | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (PROV_CIPHER_CTX *,unsigned char *,const unsigned char *,size_t) |  | ossl_cipher_hw_chunked_ofb128 | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (PROV_CIPHER_CTX *,unsigned char *,const unsigned char *,size_t) |  | ossl_cipher_hw_generic_cbc | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (PROV_CIPHER_CTX *,unsigned char *,const unsigned char *,size_t) |  | ossl_cipher_hw_generic_cfb1 | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (PROV_CIPHER_CTX *,unsigned char *,const unsigned char *,size_t) |  | ossl_cipher_hw_generic_cfb8 | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (PROV_CIPHER_CTX *,unsigned char *,const unsigned char *,size_t) |  | ossl_cipher_hw_generic_cfb128 | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (PROV_CIPHER_CTX *,unsigned char *,const unsigned char *,size_t) |  | ossl_cipher_hw_generic_ctr | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (PROV_CIPHER_CTX *,unsigned char *,const unsigned char *,size_t) |  | ossl_cipher_hw_generic_ofb128 | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (PROV_CIPHER_CTX *,unsigned char *,const unsigned char *,size_t) |  | ossl_cipher_hw_tdes_cbc | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (PROV_CIPHER_CTX *,unsigned char *,const unsigned char *,size_t) |  | ossl_cipher_hw_tdes_ecb | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (RAND_POOL *,const unsigned char *,size_t,size_t) |  | ossl_rand_pool_add | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (SIV128_CONTEXT *,const unsigned char *,unsigned char *,size_t) |  | ossl_siv128_decrypt | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (SIV128_CONTEXT *,const unsigned char *,unsigned char *,size_t) |  | ossl_siv128_encrypt | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (SSL *,uint64_t,const SSL_SHUTDOWN_EX_ARGS *,size_t) |  | SSL_shutdown_ex | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (SSL_CONNECTION *,unsigned char **,const void *,size_t) |  | construct_key_exchange_tbs | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (WPACKET *,const void *,size_t,size_t) |  | WPACKET_sub_memcpy__ | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (WPACKET *,int,const unsigned char *,size_t) |  | ossl_DER_w_octet_string | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (WPACKET *,int,const unsigned char *,size_t) |  | ossl_DER_w_precompiled | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (WPACKET *,size_t,unsigned char **,size_t) |  | WPACKET_sub_allocate_bytes__ | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (WPACKET *,size_t,unsigned char **,size_t) |  | WPACKET_sub_reserve_bytes__ | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (WPACKET *,uint64_t,const unsigned char *,size_t) |  | ossl_quic_wire_encode_transport_param_bytes | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (WPACKET *,unsigned char *,size_t,size_t) |  | WPACKET_init_static_len | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (alloc_buffer *,size_t,size_t,size_t) |  | __libc_alloc_buffer_alloc_array | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (char *,const wchar_t *,size_t,size_t) |  | __wcstombs_chk | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (char *__restrict__,const char *__restrict__,size_t,size_t) |  | __strlcat_chk | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (char *__restrict__,const char *__restrict__,size_t,size_t) |  | __strlcpy_chk | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (const ML_DSA_KEY *,int,const uint8_t *,size_t) |  | ossl_ml_dsa_mu_init | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (const VECTOR *,uint32_t,uint8_t *,size_t) |  | ossl_ml_dsa_w1_encode | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (const char *,const char *,const char *,unsigned long) |  | __dngettext | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (const char *,u_char *,unsigned char *,size_t) |  | __b64_pton | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (const nis_error,const char *,char *,size_t) |  | nis_sperror_r | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (const u128[16],uint8_t *,const uint8_t *,size_t) |  | ossl_polyval_ghash_hash | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (const unsigned char *,size_t,unsigned char *,size_t) |  | Curl_hexencode | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (const void *,size_t,const void *,size_t) |  | __memmem | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (dynarray_header *,size_t,void *,size_t) |  | __libc_dynarray_resize | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (dynarray_header *,size_t,void *,size_t) |  | __libc_dynarray_resize_clear | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (in_addr_t,uint32_t,char *,size_t) |  | inet_neta | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (int *,X509 *,stack_st_X509 *,unsigned long) |  | X509_chain_check_suiteb | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (int,ENGINE *,const unsigned char *,size_t) |  | EVP_PKEY_new_raw_private_key | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (int,ENGINE *,const unsigned char *,size_t) |  | EVP_PKEY_new_raw_public_key | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (int,char *,size_t,size_t) |  | __ttyname_r_chk | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (int,const char *,void *,size_t) |  | inet_net_pton | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (int,const regex_t *,char *,size_t) |  | jim_regerror | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (int,const void *,char *,size_t) |  | uv_inet_ntop | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (int,int,size_t,size_t) |  | ossl_rand_pool_new | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (nghttp2_extension *,int32_t,uint8_t *,size_t) |  | nghttp2_frame_priority_update_init | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (nghttp2_goaway *,const uint8_t *,uint8_t *,size_t) |  | nghttp2_frame_unpack_goaway_payload | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (nghttp2_hd_deflater *,nghttp2_bufs *,const nghttp2_nv *,size_t) |  | nghttp2_hd_deflate_hd_bufs | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (nghttp2_session *,int32_t,const nghttp2_nv *,size_t) |  | nghttp2_submit_trailer | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (nghttp2_session *,uint8_t,const nghttp2_settings_entry *,size_t) |  | nghttp2_session_add_settings | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (nghttp2_session *,uint8_t,const nghttp2_settings_entry *,size_t) |  | nghttp2_submit_settings | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (nghttp2_settings *,uint8_t,nghttp2_settings_entry *,size_t) |  | nghttp2_frame_settings_init | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (resolv_context *,const char *,char *,size_t) |  | __res_context_hostalias | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (size_t,size_t,size_t,size_t) |  | Curl_multi_handle | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (u64[2],const u128[16],const u8 *,size_t) |  | ossl_gcm_ghash_4bit | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (u_long,unsigned long,char *,size_t) |  | ns_format_ttl | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (uint8_t *,size_t,const nghttp2_settings_entry *,size_t) |  | nghttp2_pack_settings_payload | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (uint8_t *,size_t,const nghttp2_settings_entry *,size_t) |  | nghttp2_pack_settings_payload2 | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (unsigned char *,const unsigned char *,const unsigned char *,size_t) |  | _libssh2_xor_data | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (unsigned char *,size_t,const unsigned char *,size_t) |  | _libssh2_kex_agree_instr | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (unsigned long *,const unsigned long *,int,unsigned long) |  | bn_mul_add_words | 2 |
-| taint.cpp:548:7:548:13 | memccpy | (unsigned long *,const unsigned long *,int,unsigned long) |  | bn_mul_add_words | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (unsigned long *,const unsigned long *,int,unsigned long) |  | bn_mul_words | 2 |
-| taint.cpp:548:7:548:13 | memccpy | (unsigned long *,const unsigned long *,int,unsigned long) |  | bn_mul_words | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (uv_thread_t *,char *,char *,size_t) |  | uv_thread_setaffinity | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (void *,const void *,int,size_t) |  | __memccpy | 0 |
-| taint.cpp:548:7:548:13 | memccpy | (void *,const void *,int,size_t) |  | __memccpy | 1 |
-| taint.cpp:548:7:548:13 | memccpy | (void *,const void *,int,size_t) |  | __memccpy | 2 |
-| taint.cpp:548:7:548:13 | memccpy | (void *,const void *,int,size_t) |  | __memccpy | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (void *,unsigned char *,size_t *,size_t) |  | ossl_ccm_stream_final | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (void *,unsigned char *,size_t *,size_t) |  | ossl_cipher_generic_block_final | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (void *,unsigned char *,size_t *,size_t) |  | ossl_gcm_stream_final | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (wchar_t *,const char *,size_t,size_t) |  | __mbstowcs_chk | 3 |
-| taint.cpp:548:7:548:13 | memccpy | (wchar_t *,const wchar_t *,size_t,size_t) |  | __wmemmove_chk | 3 |
-| taint.cpp:550:6:550:17 | test_memccpy | (int *) |  | rresvport | 0 |
-| taint.cpp:558:7:558:12 | strcat | (ASN1_GENERALIZEDTIME *,const char *) |  | ASN1_GENERALIZEDTIME_set_string | 1 |
-| taint.cpp:558:7:558:12 | strcat | (ASN1_TIME *,const char *) |  | ASN1_TIME_set_string | 1 |
-| taint.cpp:558:7:558:12 | strcat | (ASN1_TIME *,const char *) |  | ASN1_TIME_set_string_X509 | 1 |
-| taint.cpp:558:7:558:12 | strcat | (ASN1_UTCTIME *,const char *) |  | ASN1_UTCTIME_set_string | 1 |
-| taint.cpp:558:7:558:12 | strcat | (BIGNUM **,const char *) |  | BN_asc2bn | 1 |
-| taint.cpp:558:7:558:12 | strcat | (BIGNUM **,const char *) |  | BN_dec2bn | 1 |
-| taint.cpp:558:7:558:12 | strcat | (BIGNUM **,const char *) |  | BN_hex2bn | 1 |
-| taint.cpp:558:7:558:12 | strcat | (CONF *,const char *) |  | TS_CONF_get_tsa_section | 1 |
-| taint.cpp:558:7:558:12 | strcat | (CONF *,const char *) |  | _CONF_new_section | 1 |
-| taint.cpp:558:7:558:12 | strcat | (CURLU *,const char *) |  | Curl_url_set_authority | 1 |
-| taint.cpp:558:7:558:12 | strcat | (Curl_easy *,const char *) |  | Curl_cwriter_get_by_name | 1 |
-| taint.cpp:558:7:558:12 | strcat | (Curl_easy *,const char *) |  | Curl_rtsp_parseheader | 1 |
-| taint.cpp:558:7:558:12 | strcat | (DH_METHOD *,const char *) |  | DH_meth_set1_name | 1 |
-| taint.cpp:558:7:558:12 | strcat | (DSA_METHOD *,const char *) |  | DSA_meth_set1_name | 1 |
-| taint.cpp:558:7:558:12 | strcat | (DSO *,const char *) |  | DSO_convert_filename | 1 |
-| taint.cpp:558:7:558:12 | strcat | (DSO *,const char *) |  | DSO_set_filename | 1 |
-| taint.cpp:558:7:558:12 | strcat | (ENGINE *,const char *) |  | ENGINE_set_id | 1 |
-| taint.cpp:558:7:558:12 | strcat | (ENGINE *,const char *) |  | ENGINE_set_name | 1 |
-| taint.cpp:558:7:558:12 | strcat | (ENGINE *,const char *) |  | OSSL_STORE_LOADER_new | 1 |
-| taint.cpp:558:7:558:12 | strcat | (EVP_PKEY *,const char *) |  | CTLOG_new | 1 |
-| taint.cpp:558:7:558:12 | strcat | (EVP_PKEY_CTX *,const char *) |  | app_paramgen | 1 |
-| taint.cpp:558:7:558:12 | strcat | (EVP_PKEY_CTX *,const char *) |  | pkey_ctrl_string | 1 |
-| taint.cpp:558:7:558:12 | strcat | (GlobalConfig *,const char *) |  | setvariable | 1 |
-| taint.cpp:558:7:558:12 | strcat | (Jim_Interp *,const char *) |  | Jim_Eval | 1 |
-| taint.cpp:558:7:558:12 | strcat | (Jim_Interp *,const char *) |  | Jim_EvalFile | 1 |
-| taint.cpp:558:7:558:12 | strcat | (Jim_Interp *,const char *) |  | Jim_EvalFileGlobal | 1 |
-| taint.cpp:558:7:558:12 | strcat | (Jim_Interp *,const char *) |  | Jim_EvalGlobal | 1 |
-| taint.cpp:558:7:558:12 | strcat | (LIBSSH2_AGENT *,const char *) |  | libssh2_agent_set_identity_path | 1 |
-| taint.cpp:558:7:558:12 | strcat | (LIBSSH2_SESSION *,const char *) |  | libssh2_banner_set | 1 |
-| taint.cpp:558:7:558:12 | strcat | (LIBSSH2_SESSION *,const char *) |  | libssh2_session_banner_set | 1 |
-| taint.cpp:558:7:558:12 | strcat | (Lmid_t,const char *) |  | _dl_lookup_map | 1 |
-| taint.cpp:558:7:558:12 | strcat | (OPENSSL_DIR_CTX **,const char *) |  | OPENSSL_DIR_read | 1 |
-| taint.cpp:558:7:558:12 | strcat | (OPENSSL_INIT_SETTINGS *,const char *) |  | OPENSSL_INIT_set_config_appname | 1 |
-| taint.cpp:558:7:558:12 | strcat | (OPENSSL_INIT_SETTINGS *,const char *) |  | OPENSSL_INIT_set_config_filename | 1 |
-| taint.cpp:558:7:558:12 | strcat | (OSSL_CMP_CTX *,const char *) |  | OSSL_CMP_CTX_set1_no_proxy | 1 |
-| taint.cpp:558:7:558:12 | strcat | (OSSL_CMP_CTX *,const char *) |  | OSSL_CMP_CTX_set1_proxy | 1 |
-| taint.cpp:558:7:558:12 | strcat | (OSSL_CMP_CTX *,const char *) |  | OSSL_CMP_CTX_set1_server | 1 |
-| taint.cpp:558:7:558:12 | strcat | (OSSL_CMP_CTX *,const char *) |  | OSSL_CMP_CTX_set1_serverPath | 1 |
-| taint.cpp:558:7:558:12 | strcat | (OSSL_DECODER_CTX *,const char *) |  | OSSL_DECODER_CTX_set_input_structure | 1 |
-| taint.cpp:558:7:558:12 | strcat | (OSSL_DECODER_CTX *,const char *) |  | OSSL_DECODER_CTX_set_input_type | 1 |
-| taint.cpp:558:7:558:12 | strcat | (OSSL_ENCODER_CTX *,const char *) |  | OSSL_ENCODER_CTX_set_output_structure | 1 |
-| taint.cpp:558:7:558:12 | strcat | (OSSL_ENCODER_CTX *,const char *) |  | OSSL_ENCODER_CTX_set_output_type | 1 |
-| taint.cpp:558:7:558:12 | strcat | (OSSL_JSON_ENC *,const char *) |  | ossl_json_key | 1 |
-| taint.cpp:558:7:558:12 | strcat | (OSSL_JSON_ENC *,const char *) |  | ossl_json_str | 1 |
-| taint.cpp:558:7:558:12 | strcat | (OSSL_LIB_CTX *,const char *) |  | CMS_ContentInfo_new_ex | 1 |
-| taint.cpp:558:7:558:12 | strcat | (OSSL_LIB_CTX *,const char *) |  | CTLOG_STORE_new_ex | 1 |
-| taint.cpp:558:7:558:12 | strcat | (OSSL_LIB_CTX *,const char *) |  | CT_POLICY_EVAL_CTX_new_ex | 1 |
-| taint.cpp:558:7:558:12 | strcat | (OSSL_LIB_CTX *,const char *) |  | EC_KEY_new_ex | 1 |
-| taint.cpp:558:7:558:12 | strcat | (OSSL_LIB_CTX *,const char *) |  | OSSL_CMP_CTX_new | 1 |
-| taint.cpp:558:7:558:12 | strcat | (OSSL_LIB_CTX *,const char *) |  | OSSL_CMP_MSG_new | 1 |
-| taint.cpp:558:7:558:12 | strcat | (OSSL_LIB_CTX *,const char *) |  | OSSL_CMP_SRV_CTX_new | 1 |
-| taint.cpp:558:7:558:12 | strcat | (OSSL_LIB_CTX *,const char *) |  | OSSL_PROVIDER_load | 1 |
-| taint.cpp:558:7:558:12 | strcat | (OSSL_LIB_CTX *,const char *) |  | PKCS7_new_ex | 1 |
-| taint.cpp:558:7:558:12 | strcat | (OSSL_LIB_CTX *,const char *) |  | SCT_CTX_new | 1 |
-| taint.cpp:558:7:558:12 | strcat | (OSSL_LIB_CTX *,const char *) |  | TS_RESP_CTX_new_ex | 1 |
-| taint.cpp:558:7:558:12 | strcat | (OSSL_LIB_CTX *,const char *) |  | X509_CRL_new_ex | 1 |
-| taint.cpp:558:7:558:12 | strcat | (OSSL_LIB_CTX *,const char *) |  | X509_PUBKEY_new_ex | 1 |
-| taint.cpp:558:7:558:12 | strcat | (OSSL_LIB_CTX *,const char *) |  | X509_REQ_new_ex | 1 |
-| taint.cpp:558:7:558:12 | strcat | (OSSL_LIB_CTX *,const char *) |  | X509_STORE_CTX_new_ex | 1 |
-| taint.cpp:558:7:558:12 | strcat | (OSSL_LIB_CTX *,const char *) |  | X509_new_ex | 1 |
-| taint.cpp:558:7:558:12 | strcat | (OSSL_LIB_CTX *,const char *) |  | ossl_cmp_mock_srv_new | 1 |
-| taint.cpp:558:7:558:12 | strcat | (OSSL_LIB_CTX *,const char *) |  | ossl_cms_Data_create | 1 |
-| taint.cpp:558:7:558:12 | strcat | (OSSL_LIB_CTX *,const char *) |  | ossl_parse_property | 1 |
-| taint.cpp:558:7:558:12 | strcat | (OSSL_PARAM *,const char *) |  | OSSL_PARAM_locate | 1 |
-| taint.cpp:558:7:558:12 | strcat | (OSSL_PARAM *,const char *) |  | OSSL_PARAM_set_utf8_ptr | 1 |
-| taint.cpp:558:7:558:12 | strcat | (OSSL_PARAM *,const char *) |  | OSSL_PARAM_set_utf8_string | 1 |
-| taint.cpp:558:7:558:12 | strcat | (OSSL_PROVIDER *,const char *) |  | ossl_provider_set_module_path | 1 |
-| taint.cpp:558:7:558:12 | strcat | (PKCS7 *,const char *) |  | ossl_pkcs7_set1_propq | 1 |
-| taint.cpp:558:7:558:12 | strcat | (RSA_METHOD *,const char *) |  | RSA_meth_set1_name | 1 |
-| taint.cpp:558:7:558:12 | strcat | (SSL *,const char *) |  | SSL_add1_host | 1 |
-| taint.cpp:558:7:558:12 | strcat | (SSL *,const char *) |  | SSL_set1_host | 1 |
-| taint.cpp:558:7:558:12 | strcat | (SSL *,const char *) |  | SSL_set_cipher_list | 1 |
-| taint.cpp:558:7:558:12 | strcat | (SSL *,const char *) |  | SSL_use_psk_identity_hint | 1 |
-| taint.cpp:558:7:558:12 | strcat | (SSL_CONF_CTX *,const char *) |  | SSL_CONF_CTX_set1_prefix | 1 |
-| taint.cpp:558:7:558:12 | strcat | (SSL_CONF_CTX *,const char *) |  | SSL_CONF_cmd_value_type | 1 |
-| taint.cpp:558:7:558:12 | strcat | (SSL_CTX *,const char *) |  | SSL_CTX_set_cipher_list | 1 |
-| taint.cpp:558:7:558:12 | strcat | (SSL_CTX *,const char *) |  | SSL_CTX_use_psk_identity_hint | 1 |
-| taint.cpp:558:7:558:12 | strcat | (SSL_CTX *,const char *) |  | ossl_quic_set_diag_title | 1 |
-| taint.cpp:558:7:558:12 | strcat | (SSL_SESSION *,const char *) |  | SSL_SESSION_set1_hostname | 1 |
-| taint.cpp:558:7:558:12 | strcat | (UI *,const char *) |  | UI_add_error_string | 1 |
-| taint.cpp:558:7:558:12 | strcat | (UI *,const char *) |  | UI_add_info_string | 1 |
-| taint.cpp:558:7:558:12 | strcat | (UI *,const char *) |  | UI_dup_error_string | 1 |
-| taint.cpp:558:7:558:12 | strcat | (UI *,const char *) |  | UI_dup_info_string | 1 |
-| taint.cpp:558:7:558:12 | strcat | (X509 *,const char *) |  | x509_ctrl_string | 1 |
-| taint.cpp:558:7:558:12 | strcat | (X509_REQ *,const char *) |  | x509_req_ctrl_string | 1 |
-| taint.cpp:558:7:558:12 | strcat | (X509_VERIFY_PARAM *,const char *) |  | X509_VERIFY_PARAM_set1_ip_asc | 1 |
-| taint.cpp:558:7:558:12 | strcat | (X509_VERIFY_PARAM *,const char *) |  | X509_VERIFY_PARAM_set1_name | 1 |
-| taint.cpp:558:7:558:12 | strcat | (__printf_buffer *,const char *) |  | __printf_buffer_puts_1 | 1 |
-| taint.cpp:558:7:558:12 | strcat | (alloc_buffer,const char *) |  | __libc_alloc_buffer_copy_string | 1 |
-| taint.cpp:558:7:558:12 | strcat | (argp_fmtstream_t,const char *) |  | __argp_fmtstream_puts | 1 |
-| taint.cpp:558:7:558:12 | strcat | (char **,const char *) |  | Curl_setstropt | 1 |
-| taint.cpp:558:7:558:12 | strcat | (char **,const char *) |  | __strsep | 1 |
-| taint.cpp:558:7:558:12 | strcat | (char *,const char *) |  | xstrdup | 0 |
-| taint.cpp:558:7:558:12 | strcat | (char *,const char *) |  | xstrdup | 1 |
-| taint.cpp:558:7:558:12 | strcat | (const OSSL_PARAM *,const char *) |  | OSSL_PARAM_locate_const | 1 |
-| taint.cpp:558:7:558:12 | strcat | (const char **,const char *) |  | uv__utf8_decode1 | 1 |
-| taint.cpp:558:7:558:12 | strcat | (const char *,const char *) |  | Configcmp | 1 |
-| taint.cpp:558:7:558:12 | strcat | (const char *,const char *) |  | Curl_timestrcmp | 1 |
-| taint.cpp:558:7:558:12 | strcat | (const char *,const char *) |  | DES_crypt | 1 |
-| taint.cpp:558:7:558:12 | strcat | (const char *,const char *) |  | OPENSSL_strcasecmp | 1 |
-| taint.cpp:558:7:558:12 | strcat | (const char *,const char *) |  | __bind_textdomain_codeset | 1 |
-| taint.cpp:558:7:558:12 | strcat | (const char *,const char *) |  | __bindtextdomain | 1 |
-| taint.cpp:558:7:558:12 | strcat | (const char *,const char *) |  | __dgettext | 1 |
-| taint.cpp:558:7:558:12 | strcat | (const char *,const char *) |  | __gconv_compare_alias | 1 |
-| taint.cpp:558:7:558:12 | strcat | (const char *,const char *) |  | __strcasestr | 1 |
-| taint.cpp:558:7:558:12 | strcat | (const char *,const char *) |  | __strcspn_generic | 1 |
-| taint.cpp:558:7:558:12 | strcat | (const char *,const char *) |  | __strcspn_sse42 | 1 |
-| taint.cpp:558:7:558:12 | strcat | (const char *,const char *) |  | __strpbrk_generic | 1 |
-| taint.cpp:558:7:558:12 | strcat | (const char *,const char *) |  | __strpbrk_sse42 | 1 |
-| taint.cpp:558:7:558:12 | strcat | (const char *,const char *) |  | __strspn_generic | 1 |
-| taint.cpp:558:7:558:12 | strcat | (const char *,const char *) |  | __strspn_sse42 | 1 |
-| taint.cpp:558:7:558:12 | strcat | (const char *,const char *) |  | __strstr_generic | 1 |
-| taint.cpp:558:7:558:12 | strcat | (const char *,const char *) |  | __strverscmp | 1 |
-| taint.cpp:558:7:558:12 | strcat | (const char *,const char *) |  | _dl_cache_libcmp | 1 |
-| taint.cpp:558:7:558:12 | strcat | (const char *,const char *) |  | advance | 1 |
-| taint.cpp:558:7:558:12 | strcat | (const char *,const char *) |  | c_strcasecmp | 1 |
-| taint.cpp:558:7:558:12 | strcat | (const char *,const char *) |  | charmap_aliases | 1 |
-| taint.cpp:558:7:558:12 | strcat | (const char *,const char *) |  | charmap_open | 1 |
-| taint.cpp:558:7:558:12 | strcat | (const char *,const char *) |  | chroot_canon | 1 |
-| taint.cpp:558:7:558:12 | strcat | (const char *,const char *) |  | get_passwd | 1 |
-| taint.cpp:558:7:558:12 | strcat | (const char *,const char *) |  | gzopen | 1 |
-| taint.cpp:558:7:558:12 | strcat | (const char *,const char *) |  | gzopen64 | 1 |
-| taint.cpp:558:7:558:12 | strcat | (const char *,const char *) |  | iconv_open | 1 |
-| taint.cpp:558:7:558:12 | strcat | (const char *,const char *) |  | openssl_fopen | 1 |
-| taint.cpp:558:7:558:12 | strcat | (const char *,const char *) |  | ossl_pem_check_suffix | 1 |
-| taint.cpp:558:7:558:12 | strcat | (const char *,const char *) |  | ossl_v3_name_cmp | 1 |
-| taint.cpp:558:7:558:12 | strcat | (const char *,const char *) |  | sqlite3_strglob | 1 |
-| taint.cpp:558:7:558:12 | strcat | (const char *,const char *) |  | sqlite3_stricmp | 1 |
-| taint.cpp:558:7:558:12 | strcat | (const char *,const char *) |  | step | 1 |
-| taint.cpp:558:7:558:12 | strcat | (const char *,const char *) |  | tempnam | 1 |
-| taint.cpp:558:7:558:12 | strcat | (const char *,const char *) |  | xfopen | 1 |
-| taint.cpp:558:7:558:12 | strcat | (const mntent *,const char *) |  | __hasmntopt | 1 |
-| taint.cpp:558:7:558:12 | strcat | (const nis_error,const char *) |  | nis_sperror | 1 |
-| taint.cpp:558:7:558:12 | strcat | (curl_mimepart *,const char *) |  | curl_mime_filedata | 1 |
-| taint.cpp:558:7:558:12 | strcat | (curl_off_t *,const char *) |  | str2offset | 1 |
-| taint.cpp:558:7:558:12 | strcat | (curl_pushheaders *,const char *) |  | curl_pushheader_byname | 1 |
-| taint.cpp:558:7:558:12 | strcat | (curl_slist **,const char *) |  | add2list | 1 |
-| taint.cpp:558:7:558:12 | strcat | (curl_slist *,const char *) |  | curl_slist_append | 1 |
-| taint.cpp:558:7:558:12 | strcat | (dynbuf *,const char *) |  | Curl_dyn_add | 1 |
-| taint.cpp:558:7:558:12 | strcat | (dynbuf *,const char *) |  | curlx_dyn_add | 1 |
-| taint.cpp:558:7:558:12 | strcat | (dynhds *,const char *) |  | Curl_dynhds_cget | 1 |
-| taint.cpp:558:7:558:12 | strcat | (dynhds *,const char *) |  | Curl_dynhds_h1_cadd_line | 1 |
-| taint.cpp:558:7:558:12 | strcat | (gconv_fcts *,const char *) |  | __wcsmbs_named_conv | 1 |
-| taint.cpp:558:7:558:12 | strcat | (gzFile,const char *) |  | gzputs | 1 |
-| taint.cpp:558:7:558:12 | strcat | (int,const char *) |  | BIO_meth_new | 1 |
-| taint.cpp:558:7:558:12 | strcat | (int,const char *) |  | _IO_new_fdopen | 1 |
-| taint.cpp:558:7:558:12 | strcat | (int,const char *) |  | gzdopen | 1 |
-| taint.cpp:558:7:558:12 | strcat | (int,const char *) |  | setlocale | 1 |
-| taint.cpp:558:7:558:12 | strcat | (int,const char *) |  | xsetlocale | 1 |
-| taint.cpp:558:7:558:12 | strcat | (lemon *,const char *) |  | file_makename | 1 |
-| taint.cpp:558:7:558:12 | strcat | (long *,const char *) |  | secs2ms | 1 |
-| taint.cpp:558:7:558:12 | strcat | (long *,const char *) |  | str2num | 1 |
-| taint.cpp:558:7:558:12 | strcat | (long *,const char *) |  | str2unum | 1 |
-| taint.cpp:558:7:558:12 | strcat | (nss_module *,const char *) |  | __nss_module_get_function | 1 |
-| taint.cpp:558:7:558:12 | strcat | (size_t *,const char *) |  | next_protos_parse | 1 |
-| taint.cpp:558:7:558:12 | strcat | (slist_wc **,const char *) |  | easysrc_add | 1 |
-| taint.cpp:558:7:558:12 | strcat | (slist_wc *,const char *) |  | slist_wc_append | 1 |
-| taint.cpp:558:7:558:12 | strcat | (sockaddr_un *,const char *) |  | __sockaddr_un_set | 1 |
-| taint.cpp:558:7:558:12 | strcat | (sqlite3 *,const char *) |  | sqlite3_declare_vtab | 1 |
-| taint.cpp:558:7:558:12 | strcat | (sqlite3 *,const char *) |  | sqlite3_get_clientdata | 1 |
-| taint.cpp:558:7:558:12 | strcat | (sqlite3 *,const char *) |  | sqlite3_wal_checkpoint | 1 |
-| taint.cpp:558:7:558:12 | strcat | (sqlite3_intck *,const char *) |  | sqlite3_intck_test_sql | 1 |
-| taint.cpp:558:7:558:12 | strcat | (sqlite3_stmt *,const char *) |  | sqlite3_bind_parameter_index | 1 |
-| taint.cpp:558:7:558:12 | strcat | (sqlite3_str *,const char *) |  | sqlite3_str_appendall | 1 |
-| taint.cpp:558:7:558:12 | strcat | (sqlite3_value *,const char *) |  | sqlite3_value_pointer | 1 |
-| taint.cpp:558:7:558:12 | strcat | (stringtable *,const char *) |  | stringtable_add | 1 |
-| taint.cpp:558:7:558:12 | strcat | (unsigned char *,const char *) |  | ossl_a2i_ipadd | 1 |
-| taint.cpp:558:7:558:12 | strcat | (unsigned long *,const char *) |  | set_cert_ex | 1 |
-| taint.cpp:558:7:558:12 | strcat | (unsigned long *,const char *) |  | set_name_ex | 1 |
-| taint.cpp:558:7:558:12 | strcat | (uv_pipe_t *,const char *) |  | uv_pipe_bind | 1 |
-| taint.cpp:560:6:560:16 | test_strcat | (PKCS7 *,int,long,char *) |  | PKCS7_ctrl | 3 |
-| taint.cpp:560:6:560:16 | test_strcat | (SSL_CTX *,srpsrvparm *,char *,char *) |  | set_up_srp_verifier_file | 2 |
-| taint.cpp:560:6:560:16 | test_strcat | (SSL_CTX *,srpsrvparm *,char *,char *) |  | set_up_srp_verifier_file | 3 |
-| taint.cpp:560:6:560:16 | test_strcat | (SSL_HMAC *,void *,size_t,char *) |  | ssl_hmac_init | 3 |
-| taint.cpp:560:6:560:16 | test_strcat | (SSL_HMAC *,void *,size_t,char *) |  | ssl_hmac_old_init | 3 |
-| taint.cpp:560:6:560:16 | test_strcat | (_IO_strfile *,char *,int,char *) |  | _IO_str_init_static | 3 |
-| taint.cpp:560:6:560:16 | test_strcat | (action **,e_action,symbol *,char *) |  | Action_add | 3 |
-| taint.cpp:560:6:560:16 | test_strcat | (const char *,const char *,char *,char *) |  | uv__idna_toascii | 2 |
-| taint.cpp:560:6:560:16 | test_strcat | (const char *,const char *,char *,char *) |  | uv__idna_toascii | 3 |
-| taint.cpp:560:6:560:16 | test_strcat | (int,const u_char *,const unsigned char *,char *) |  | inet_nsap_ntoa | 3 |
-| taint.cpp:560:6:560:16 | test_strcat | (int,u_int,u_int,char *) |  | svcunix_create | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (..(*)(..),..(*)(..),..(*)(..),void *) |  | libssh2_session_init_ex | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (BIO *,CMS_ContentInfo **,pem_password_cb *,void *) |  | PEM_read_bio_CMS | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (BIO *,DH **,pem_password_cb *,void *) |  | PEM_read_bio_DHparams | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (BIO *,DSA **,pem_password_cb *,void *) |  | PEM_read_bio_DSAPrivateKey | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (BIO *,DSA **,pem_password_cb *,void *) |  | PEM_read_bio_DSA_PUBKEY | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (BIO *,DSA **,pem_password_cb *,void *) |  | PEM_read_bio_DSAparams | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (BIO *,EC_GROUP **,pem_password_cb *,void *) |  | PEM_read_bio_ECPKParameters | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (BIO *,EC_KEY **,pem_password_cb *,void *) |  | PEM_read_bio_ECPrivateKey | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (BIO *,EC_KEY **,pem_password_cb *,void *) |  | PEM_read_bio_EC_PUBKEY | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (BIO *,EVP_PKEY **,pem_password_cb *,void *) |  | PEM_read_bio_PUBKEY | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (BIO *,EVP_PKEY **,pem_password_cb *,void *) |  | PEM_read_bio_PrivateKey | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (BIO *,EVP_PKEY **,pem_password_cb *,void *) |  | d2i_PKCS8PrivateKey_bio | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (BIO *,NETSCAPE_CERT_SEQUENCE **,pem_password_cb *,void *) |  | PEM_read_bio_NETSCAPE_CERT_SEQUENCE | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (BIO *,PKCS7 **,pem_password_cb *,void *) |  | PEM_read_bio_PKCS7 | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (BIO *,PKCS8_PRIV_KEY_INFO **,pem_password_cb *,void *) |  | PEM_read_bio_PKCS8_PRIV_KEY_INFO | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (BIO *,RSA **,pem_password_cb *,void *) |  | PEM_read_bio_RSAPrivateKey | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (BIO *,RSA **,pem_password_cb *,void *) |  | PEM_read_bio_RSAPublicKey | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (BIO *,RSA **,pem_password_cb *,void *) |  | PEM_read_bio_RSA_PUBKEY | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (BIO *,SSL_SESSION **,pem_password_cb *,void *) |  | PEM_read_bio_SSL_SESSION | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (BIO *,X509 **,pem_password_cb *,void *) |  | PEM_read_bio_X509 | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (BIO *,X509 **,pem_password_cb *,void *) |  | PEM_read_bio_X509_AUX | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (BIO *,X509_ACERT **,pem_password_cb *,void *) |  | PEM_read_bio_X509_ACERT | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (BIO *,X509_CRL **,pem_password_cb *,void *) |  | PEM_read_bio_X509_CRL | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (BIO *,X509_PUBKEY **,pem_password_cb *,void *) |  | PEM_read_bio_X509_PUBKEY | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (BIO *,X509_REQ **,pem_password_cb *,void *) |  | PEM_read_bio_X509_REQ | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (BIO *,X509_SIG **,pem_password_cb *,void *) |  | PEM_read_bio_PKCS8 | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (BIO *,size_t,..(*)(..),void *) |  | ossl_quic_demux_new | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (BIO *,stack_st_X509_INFO *,pem_password_cb *,void *) |  | PEM_X509_INFO_read_bio | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (BrotliDecoderStateInternal *,brotli_alloc_func,brotli_free_func,void *) |  | BrotliDecoderStateInit | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (Curl_easy *,connectdata *,Curl_cpool_conn_do_cb *,void *) |  | Curl_cpool_do_locked | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (Curl_hash *,void *,size_t,void *) |  | Curl_hash_add | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (DSO *,int,long,void *) |  | DSO_ctrl | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (EVP_CIPHER_CTX *,int,int,void *) |  | EVP_CIPHER_CTX_ctrl | 2 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (EVP_CIPHER_CTX *,int,int,void *) |  | EVP_CIPHER_CTX_ctrl | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (FILE *,CMS_ContentInfo **,pem_password_cb *,void *) |  | PEM_read_CMS | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (FILE *,DH **,pem_password_cb *,void *) |  | PEM_read_DHparams | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (FILE *,DSA **,pem_password_cb *,void *) |  | PEM_read_DSAPrivateKey | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (FILE *,DSA **,pem_password_cb *,void *) |  | PEM_read_DSA_PUBKEY | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (FILE *,DSA **,pem_password_cb *,void *) |  | PEM_read_DSAparams | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (FILE *,EC_GROUP **,pem_password_cb *,void *) |  | PEM_read_ECPKParameters | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (FILE *,EC_KEY **,pem_password_cb *,void *) |  | PEM_read_ECPrivateKey | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (FILE *,EC_KEY **,pem_password_cb *,void *) |  | PEM_read_EC_PUBKEY | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (FILE *,EVP_PKEY **,pem_password_cb *,void *) |  | PEM_read_PUBKEY | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (FILE *,EVP_PKEY **,pem_password_cb *,void *) |  | PEM_read_PrivateKey | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (FILE *,EVP_PKEY **,pem_password_cb *,void *) |  | d2i_PKCS8PrivateKey_fp | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (FILE *,NETSCAPE_CERT_SEQUENCE **,pem_password_cb *,void *) |  | PEM_read_NETSCAPE_CERT_SEQUENCE | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (FILE *,PKCS7 **,pem_password_cb *,void *) |  | PEM_read_PKCS7 | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (FILE *,PKCS8_PRIV_KEY_INFO **,pem_password_cb *,void *) |  | PEM_read_PKCS8_PRIV_KEY_INFO | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (FILE *,RSA **,pem_password_cb *,void *) |  | PEM_read_RSAPrivateKey | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (FILE *,RSA **,pem_password_cb *,void *) |  | PEM_read_RSAPublicKey | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (FILE *,RSA **,pem_password_cb *,void *) |  | PEM_read_RSA_PUBKEY | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (FILE *,SSL_SESSION **,pem_password_cb *,void *) |  | PEM_read_SSL_SESSION | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (FILE *,X509 **,pem_password_cb *,void *) |  | PEM_read_X509 | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (FILE *,X509 **,pem_password_cb *,void *) |  | PEM_read_X509_AUX | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (FILE *,X509_ACERT **,pem_password_cb *,void *) |  | PEM_read_X509_ACERT | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (FILE *,X509_CRL **,pem_password_cb *,void *) |  | PEM_read_X509_CRL | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (FILE *,X509_PUBKEY **,pem_password_cb *,void *) |  | PEM_read_X509_PUBKEY | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (FILE *,X509_REQ **,pem_password_cb *,void *) |  | PEM_read_X509_REQ | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (FILE *,X509_SIG **,pem_password_cb *,void *) |  | PEM_read_PKCS8 | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (FILE *,stack_st_X509_INFO *,pem_password_cb *,void *) |  | PEM_X509_INFO_read | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (HT *,size_t,..(*)(..),void *) |  | ossl_ht_filter | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (MD5_SHA1_CTX *,int,int,void *) |  | ossl_md5_sha1_ctrl | 2 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (MD5_SHA1_CTX *,int,int,void *) |  | ossl_md5_sha1_ctrl | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (MemoryManager *,brotli_alloc_func,brotli_free_func,void *) |  | BrotliInitMemoryManager | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (OCB128_CONTEXT *,OCB128_CONTEXT *,void *,void *) |  | CRYPTO_ocb128_copy_ctx | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (OPENSSL_LHASH *,OPENSSL_LH_DOALL_FUNCARG_THUNK,OPENSSL_LH_DOALL_FUNCARG,void *) |  | OPENSSL_LH_doall_arg_thunk | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (OSSL_PROVIDER *,int,..(*)(..),void *) |  | evp_names_do_all | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (OSSL_QTX *,ossl_mutate_packet_cb,ossl_finish_mutate_cb,void *) |  | ossl_qtx_set_mutator | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (QUIC_CHANNEL *,ossl_mutate_packet_cb,ossl_finish_mutate_cb,void *) |  | ossl_quic_channel_set_mutator | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (QUIC_RXFC *,uint64_t,..(*)(..),void *) |  | ossl_quic_rxfc_init_standalone | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (SHA_CTX *,int,int,void *) |  | ossl_sha1_ctrl | 2 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (SHA_CTX *,int,int,void *) |  | ossl_sha1_ctrl | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (SSL *,int,long,void *) |  | SSL_ctrl | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (SSL *,int,long,void *) |  | dtls1_ctrl | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (SSL *,int,long,void *) |  | ossl_quic_ctrl | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (SSL *,int,long,void *) |  | ssl3_ctrl | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (SSL *,ossl_statem_mutate_handshake_cb,ossl_statem_finish_mutate_handshake_cb,void *) |  | ossl_statem_set_mutator | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (SSL_CTX *,SSL_CTX_generate_session_ticket_fn,SSL_CTX_decrypt_session_ticket_fn,void *) |  | SSL_CTX_set_session_ticket_cb | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (SSL_CTX *,int,long,void *) |  | SSL_CTX_ctrl | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (SSL_CTX *,int,long,void *) |  | ossl_quic_ctx_ctrl | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (SSL_CTX *,int,long,void *) |  | ssl3_ctx_ctrl | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (X509_ALGOR *,ASN1_OBJECT *,int,void *) |  | X509_ALGOR_set0 | 2 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (X509_ALGOR *,ASN1_OBJECT *,int,void *) |  | X509_ALGOR_set0 | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (char *,int,int,void *) |  | PEM_def_callback | 2 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (char *,int,int,void *) |  | PEM_def_callback | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (char *,int,int,void *) |  | ossl_pw_pem_password | 2 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (char *,int,int,void *) |  | ossl_pw_pem_password | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (char *,int,int,void *) |  | ossl_pw_pvk_password | 2 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (char *,int,int,void *) |  | ossl_pw_pvk_password | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (char *,size_t,size_t,void *) |  | Curl_ftp_parselist | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (char *,size_t,size_t,void *) |  | Curl_mime_read | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (char *,size_t,size_t,void *) |  | tool_header_cb | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (char *,size_t,size_t,void *) |  | tool_mime_stdin_read | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (char *,size_t,size_t,void *) |  | tool_read_cb | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (const OSSL_NAMEMAP *,int,..(*)(..),void *) |  | ossl_namemap_doall_names | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (const char *,int,void *,void *) |  | support_readdir_r_check | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (hash_table *,const void *,size_t,void *) |  | insert_entry | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (int,unsigned long,..(*)(..),void *) |  | RSA_generate_key | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (nghttp2_session *,const uint8_t *,size_t,void *) |  | nghttp2_session_upgrade | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (sqlite3 *,const char *,..(*)(..),void *) |  | sqlite3_recover_init_sql | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (sqlite3 *,const char *,..(*)(..),void *) |  | sqlite3_rtree_geometry_callback | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (sqlite3 *,const char *,const sqlite3_module *,void *) |  | sqlite3_create_module | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (sqlite3 *,const char *,int,void *) |  | sqlite3_file_control | 2 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (sqlite3 *,const char *,int,void *) |  | sqlite3_file_control | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (sqlite3 *,int,..(*)(..),void *) |  | sqlite3_progress_handler | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (sqlite3 *,unsigned int,..(*)(..),void *) |  | sqlite3_trace_v2 | 3 |
-| taint.cpp:570:16:570:25 | _mbsncat_l | (void *,const char *,const char *,void *) |  | _dl_vsym | 3 |
-| taint.cpp:572:6:572:20 | test__mbsncat_l | (ENGINE *,const char *,long,void *,..(*)(..),int) |  | ENGINE_ctrl_cmd | 5 |
-| taint.cpp:572:6:572:20 | test__mbsncat_l | (ENGINE_TABLE **,ENGINE_CLEANUP_CB *,ENGINE *,const int *,int,int) |  | engine_table_register | 5 |
-| taint.cpp:572:6:572:20 | test__mbsncat_l | (EVP_CIPHER_CTX **,..(*)(..),int,unsigned char *,size_t,int) |  | _libssh2_cipher_crypt | 5 |
-| taint.cpp:572:6:572:20 | test__mbsncat_l | (EVP_CIPHER_CTX *,const EVP_CIPHER *,ENGINE *,const unsigned char *,const unsigned char *,int) |  | EVP_CipherInit_ex | 5 |
-| taint.cpp:572:6:572:20 | test__mbsncat_l | (FILE *,const char *,int,int,int,int) |  | _IO_file_open | 5 |
-| taint.cpp:572:6:572:20 | test__mbsncat_l | (GENERAL_NAME *,const X509V3_EXT_METHOD *,X509V3_CTX *,int,const char *,int) |  | a2i_GENERAL_NAME | 5 |
-| taint.cpp:572:6:572:20 | test__mbsncat_l | (Jim_Interp *,Jim_Obj *,Jim_Obj *const *,int,Jim_Obj **,int) |  | Jim_DictKeysVector | 5 |
-| taint.cpp:572:6:572:20 | test__mbsncat_l | (Jim_Interp *,Jim_Obj *,Jim_Obj *const *,int,Jim_Obj *,int) |  | Jim_SetDictKeysVector | 5 |
-| taint.cpp:572:6:572:20 | test__mbsncat_l | (Jim_Interp *,Jim_Obj *,const char *const *,int *,const char *,int) |  | Jim_GetEnum | 5 |
-| taint.cpp:572:6:572:20 | test__mbsncat_l | (LIBSSH2_KNOWNHOSTS *,libssh2_knownhost *,char *,size_t,size_t *,int) |  | libssh2_knownhost_writeline | 5 |
-| taint.cpp:572:6:572:20 | test__mbsncat_l | (LIBSSH2_SFTP *,const char *,unsigned int,char *,unsigned int,int) |  | libssh2_sftp_symlink_ex | 5 |
-| taint.cpp:572:6:572:20 | test__mbsncat_l | (LIBSSH2_SFTP *,const char *,unsigned int,unsigned long,long,int) |  | libssh2_sftp_open_ex | 5 |
-| taint.cpp:572:6:572:20 | test__mbsncat_l | (PKCS7 *,stack_st_X509 *,X509_STORE *,BIO *,BIO *,int) |  | PKCS7_verify | 5 |
-| taint.cpp:572:6:572:20 | test__mbsncat_l | (QUIC_STREAM_MAP *,..(*)(..),void *,QUIC_RXFC *,QUIC_RXFC *,int) |  | ossl_quic_stream_map_init | 5 |
-| taint.cpp:572:6:572:20 | test__mbsncat_l | (RSA *,const unsigned char *,const EVP_MD *,const EVP_MD *,const unsigned char *,int) |  | RSA_verify_PKCS1_PSS_mgf1 | 5 |
-| taint.cpp:572:6:572:20 | test__mbsncat_l | (RSA *,unsigned char *,const unsigned char *,const EVP_MD *,const EVP_MD *,int) |  | RSA_padding_add_PKCS1_PSS_mgf1 | 5 |
-| taint.cpp:572:6:572:20 | test__mbsncat_l | (SSL_CONNECTION *,PACKET *,unsigned int,RAW_EXTENSION **,size_t *,int) |  | tls_collect_extensions | 5 |
-| taint.cpp:572:6:572:20 | test__mbsncat_l | (SSL_CONNECTION *,int,RAW_EXTENSION *,X509 *,size_t,int) |  | tls_parse_all_extensions | 5 |
-| taint.cpp:572:6:572:20 | test__mbsncat_l | (UI *,const char *,int,char *,int,int) |  | UI_add_input_string | 5 |
-| taint.cpp:572:6:572:20 | test__mbsncat_l | (UI *,const char *,int,char *,int,int) |  | UI_dup_input_string | 5 |
-| taint.cpp:572:6:572:20 | test__mbsncat_l | (X509V3_CTX *,X509 *,X509 *,X509_REQ *,X509_CRL *,int) |  | X509V3_set_ctx | 5 |
-| taint.cpp:572:6:572:20 | test__mbsncat_l | (X509_ALGOR *,const ASN1_ITEM *,const char *,int,void *,int) |  | PKCS12_item_i2d_encrypt | 4 |
-| taint.cpp:572:6:572:20 | test__mbsncat_l | (X509_ALGOR *,const ASN1_ITEM *,const char *,int,void *,int) |  | PKCS12_item_i2d_encrypt | 5 |
-| taint.cpp:572:6:572:20 | test__mbsncat_l | (X509_PUBKEY *,ASN1_OBJECT *,int,void *,unsigned char *,int) |  | X509_PUBKEY_set0_param | 5 |
-| taint.cpp:572:6:572:20 | test__mbsncat_l | (const BIGNUM *,int,..(*)(..),BN_CTX *,void *,int) |  | BN_is_prime_fasttest | 4 |
-| taint.cpp:572:6:572:20 | test__mbsncat_l | (const BIGNUM *,int,..(*)(..),BN_CTX *,void *,int) |  | BN_is_prime_fasttest | 5 |
-| taint.cpp:572:6:572:20 | test__mbsncat_l | (const X509_ALGOR *,const ASN1_ITEM *,const char *,int,const ASN1_OCTET_STRING *,int) |  | PKCS12_item_decrypt_d2i | 5 |
-| taint.cpp:572:6:572:20 | test__mbsncat_l | (const XTS128_CONTEXT *,const unsigned char[16],const unsigned char *,unsigned char *,size_t,int) |  | CRYPTO_xts128_encrypt | 5 |
-| taint.cpp:572:6:572:20 | test__mbsncat_l | (const XTS128_CONTEXT *,const unsigned char[16],const unsigned char *,unsigned char *,size_t,int) |  | ossl_crypto_xts128gb_encrypt | 5 |
-| taint.cpp:572:6:572:20 | test__mbsncat_l | (const char *,const char *,const char *,int,unsigned long,int) |  | __dcigettext | 5 |
-| taint.cpp:572:6:572:20 | test__mbsncat_l | (const char *,const char *,int,int,unsigned char *,int) |  | ___res_querydomain | 5 |
-| taint.cpp:572:6:572:20 | test__mbsncat_l | (const char *,const char *__restrict__,char **,char **__restrict__,int,int) |  | __strtol_internal | 5 |
-| taint.cpp:572:6:572:20 | test__mbsncat_l | (const char *,const char *__restrict__,char **,char **__restrict__,int,int) |  | __strtoul_internal | 5 |
-| taint.cpp:572:6:572:20 | test__mbsncat_l | (const u_char *,const unsigned char *,const u_char *,const unsigned char *,ns_sect,int) |  | ns_skiprr | 5 |
-| taint.cpp:572:6:572:20 | test__mbsncat_l | (const unsigned char *,unsigned char *,long,DES_key_schedule *,DES_cblock *,int) |  | DES_cbc_encrypt | 5 |
-| taint.cpp:572:6:572:20 | test__mbsncat_l | (const unsigned char *,unsigned char *,long,DES_key_schedule *,DES_cblock *,int) |  | DES_ncbc_encrypt | 5 |
-| taint.cpp:572:6:572:20 | test__mbsncat_l | (const unsigned char *,unsigned char *,long,IDEA_KEY_SCHEDULE *,unsigned char *,int) |  | IDEA_cbc_encrypt | 5 |
-| taint.cpp:572:6:572:20 | test__mbsncat_l | (const unsigned char *,unsigned char *,long,RC2_KEY *,unsigned char *,int) |  | RC2_cbc_encrypt | 5 |
-| taint.cpp:572:6:572:20 | test__mbsncat_l | (const unsigned char *,unsigned char *,long,const BF_KEY *,unsigned char *,int) |  | BF_cbc_encrypt | 5 |
-| taint.cpp:572:6:572:20 | test__mbsncat_l | (const unsigned char *,unsigned char *,long,const CAST_KEY *,unsigned char *,int) |  | CAST_cbc_encrypt | 5 |
-| taint.cpp:572:6:572:20 | test__mbsncat_l | (const unsigned char *,unsigned char *,size_t,const SEED_KEY_SCHEDULE *,unsigned char[16],int) |  | SEED_cbc_encrypt | 5 |
-| taint.cpp:572:6:572:20 | test__mbsncat_l | (const void *,const void *,int,int,..(*)(..),int) |  | OBJ_bsearch_ex_ | 5 |
-| taint.cpp:572:6:572:20 | test__mbsncat_l | (const void *,const void *,int,int,..(*)(..),int) |  | ossl_bsearch | 5 |
-| taint.cpp:572:6:572:20 | test__mbsncat_l | (const wchar_t *,const wchar_t *__restrict__,wchar_t **,wchar_t **__restrict__,int,int) |  | __wcstol_internal | 5 |
-| taint.cpp:572:6:572:20 | test__mbsncat_l | (const wchar_t *,const wchar_t *__restrict__,wchar_t **,wchar_t **__restrict__,int,int) |  | __wcstoul_internal | 5 |
-| taint.cpp:572:6:572:20 | test__mbsncat_l | (int,char **,gengetopt_args_info *,int,int,int) |  | cmdline_parser2 | 5 |
-| taint.cpp:572:6:572:20 | test__mbsncat_l | (nghttp2_hd_inflater *,nghttp2_hd_nv *,int *,const uint8_t *,size_t,int) |  | nghttp2_hd_inflate_hd_nv | 5 |
-| taint.cpp:572:6:572:20 | test__mbsncat_l | (nghttp2_hd_inflater *,nghttp2_nv *,int *,const uint8_t *,size_t,int) |  | nghttp2_hd_inflate_hd2 | 5 |
-| taint.cpp:572:6:572:20 | test__mbsncat_l | (nghttp2_hd_inflater *,nghttp2_nv *,int *,const uint8_t *,size_t,int) |  | nghttp2_hd_inflate_hd3 | 5 |
-| taint.cpp:572:6:572:20 | test__mbsncat_l | (nghttp2_hd_inflater *,nghttp2_nv *,int *,uint8_t *,size_t,int) |  | nghttp2_hd_inflate_hd | 5 |
-| taint.cpp:572:6:572:20 | test__mbsncat_l | (res_state,const char *,int,int,unsigned char *,int) |  | ___res_nquery | 5 |
-| taint.cpp:572:6:572:20 | test__mbsncat_l | (res_state,const char *,int,int,unsigned char *,int) |  | ___res_nsearch | 5 |
-| taint.cpp:572:6:572:20 | test__mbsncat_l | (unsigned char *,int,const unsigned char *,int,const unsigned char *,int) |  | RSA_padding_add_PKCS1_OAEP | 5 |
-| taint.cpp:589:7:589:12 | strsep | (ASN1_GENERALIZEDTIME *,const char *) |  | ASN1_GENERALIZEDTIME_set_string | 1 |
-| taint.cpp:589:7:589:12 | strsep | (ASN1_TIME *,const char *) |  | ASN1_TIME_set_string | 1 |
-| taint.cpp:589:7:589:12 | strsep | (ASN1_TIME *,const char *) |  | ASN1_TIME_set_string_X509 | 1 |
-| taint.cpp:589:7:589:12 | strsep | (ASN1_UTCTIME *,const char *) |  | ASN1_UTCTIME_set_string | 1 |
-| taint.cpp:589:7:589:12 | strsep | (BIGNUM **,const char *) |  | BN_asc2bn | 1 |
-| taint.cpp:589:7:589:12 | strsep | (BIGNUM **,const char *) |  | BN_dec2bn | 1 |
-| taint.cpp:589:7:589:12 | strsep | (BIGNUM **,const char *) |  | BN_hex2bn | 1 |
-| taint.cpp:589:7:589:12 | strsep | (CONF *,const char *) |  | TS_CONF_get_tsa_section | 1 |
-| taint.cpp:589:7:589:12 | strsep | (CONF *,const char *) |  | _CONF_new_section | 1 |
-| taint.cpp:589:7:589:12 | strsep | (CURLU *,const char *) |  | Curl_url_set_authority | 1 |
-| taint.cpp:589:7:589:12 | strsep | (Curl_easy *,const char *) |  | Curl_cwriter_get_by_name | 1 |
-| taint.cpp:589:7:589:12 | strsep | (Curl_easy *,const char *) |  | Curl_rtsp_parseheader | 1 |
-| taint.cpp:589:7:589:12 | strsep | (DH_METHOD *,const char *) |  | DH_meth_set1_name | 1 |
-| taint.cpp:589:7:589:12 | strsep | (DSA_METHOD *,const char *) |  | DSA_meth_set1_name | 1 |
-| taint.cpp:589:7:589:12 | strsep | (DSO *,const char *) |  | DSO_convert_filename | 1 |
-| taint.cpp:589:7:589:12 | strsep | (DSO *,const char *) |  | DSO_set_filename | 1 |
-| taint.cpp:589:7:589:12 | strsep | (ENGINE *,const char *) |  | ENGINE_set_id | 1 |
-| taint.cpp:589:7:589:12 | strsep | (ENGINE *,const char *) |  | ENGINE_set_name | 1 |
-| taint.cpp:589:7:589:12 | strsep | (ENGINE *,const char *) |  | OSSL_STORE_LOADER_new | 1 |
-| taint.cpp:589:7:589:12 | strsep | (EVP_PKEY *,const char *) |  | CTLOG_new | 1 |
-| taint.cpp:589:7:589:12 | strsep | (EVP_PKEY_CTX *,const char *) |  | app_paramgen | 1 |
-| taint.cpp:589:7:589:12 | strsep | (EVP_PKEY_CTX *,const char *) |  | pkey_ctrl_string | 1 |
-| taint.cpp:589:7:589:12 | strsep | (GlobalConfig *,const char *) |  | setvariable | 1 |
-| taint.cpp:589:7:589:12 | strsep | (Jim_Interp *,const char *) |  | Jim_Eval | 1 |
-| taint.cpp:589:7:589:12 | strsep | (Jim_Interp *,const char *) |  | Jim_EvalFile | 1 |
-| taint.cpp:589:7:589:12 | strsep | (Jim_Interp *,const char *) |  | Jim_EvalFileGlobal | 1 |
-| taint.cpp:589:7:589:12 | strsep | (Jim_Interp *,const char *) |  | Jim_EvalGlobal | 1 |
-| taint.cpp:589:7:589:12 | strsep | (LIBSSH2_AGENT *,const char *) |  | libssh2_agent_set_identity_path | 1 |
-| taint.cpp:589:7:589:12 | strsep | (LIBSSH2_SESSION *,const char *) |  | libssh2_banner_set | 1 |
-| taint.cpp:589:7:589:12 | strsep | (LIBSSH2_SESSION *,const char *) |  | libssh2_session_banner_set | 1 |
-| taint.cpp:589:7:589:12 | strsep | (Lmid_t,const char *) |  | _dl_lookup_map | 1 |
-| taint.cpp:589:7:589:12 | strsep | (OPENSSL_DIR_CTX **,const char *) |  | OPENSSL_DIR_read | 1 |
-| taint.cpp:589:7:589:12 | strsep | (OPENSSL_INIT_SETTINGS *,const char *) |  | OPENSSL_INIT_set_config_appname | 1 |
-| taint.cpp:589:7:589:12 | strsep | (OPENSSL_INIT_SETTINGS *,const char *) |  | OPENSSL_INIT_set_config_filename | 1 |
-| taint.cpp:589:7:589:12 | strsep | (OSSL_CMP_CTX *,const char *) |  | OSSL_CMP_CTX_set1_no_proxy | 1 |
-| taint.cpp:589:7:589:12 | strsep | (OSSL_CMP_CTX *,const char *) |  | OSSL_CMP_CTX_set1_proxy | 1 |
-| taint.cpp:589:7:589:12 | strsep | (OSSL_CMP_CTX *,const char *) |  | OSSL_CMP_CTX_set1_server | 1 |
-| taint.cpp:589:7:589:12 | strsep | (OSSL_CMP_CTX *,const char *) |  | OSSL_CMP_CTX_set1_serverPath | 1 |
-| taint.cpp:589:7:589:12 | strsep | (OSSL_DECODER_CTX *,const char *) |  | OSSL_DECODER_CTX_set_input_structure | 1 |
-| taint.cpp:589:7:589:12 | strsep | (OSSL_DECODER_CTX *,const char *) |  | OSSL_DECODER_CTX_set_input_type | 1 |
-| taint.cpp:589:7:589:12 | strsep | (OSSL_ENCODER_CTX *,const char *) |  | OSSL_ENCODER_CTX_set_output_structure | 1 |
-| taint.cpp:589:7:589:12 | strsep | (OSSL_ENCODER_CTX *,const char *) |  | OSSL_ENCODER_CTX_set_output_type | 1 |
-| taint.cpp:589:7:589:12 | strsep | (OSSL_JSON_ENC *,const char *) |  | ossl_json_key | 1 |
-| taint.cpp:589:7:589:12 | strsep | (OSSL_JSON_ENC *,const char *) |  | ossl_json_str | 1 |
-| taint.cpp:589:7:589:12 | strsep | (OSSL_LIB_CTX *,const char *) |  | CMS_ContentInfo_new_ex | 1 |
-| taint.cpp:589:7:589:12 | strsep | (OSSL_LIB_CTX *,const char *) |  | CTLOG_STORE_new_ex | 1 |
-| taint.cpp:589:7:589:12 | strsep | (OSSL_LIB_CTX *,const char *) |  | CT_POLICY_EVAL_CTX_new_ex | 1 |
-| taint.cpp:589:7:589:12 | strsep | (OSSL_LIB_CTX *,const char *) |  | EC_KEY_new_ex | 1 |
-| taint.cpp:589:7:589:12 | strsep | (OSSL_LIB_CTX *,const char *) |  | OSSL_CMP_CTX_new | 1 |
-| taint.cpp:589:7:589:12 | strsep | (OSSL_LIB_CTX *,const char *) |  | OSSL_CMP_MSG_new | 1 |
-| taint.cpp:589:7:589:12 | strsep | (OSSL_LIB_CTX *,const char *) |  | OSSL_CMP_SRV_CTX_new | 1 |
-| taint.cpp:589:7:589:12 | strsep | (OSSL_LIB_CTX *,const char *) |  | OSSL_PROVIDER_load | 1 |
-| taint.cpp:589:7:589:12 | strsep | (OSSL_LIB_CTX *,const char *) |  | PKCS7_new_ex | 1 |
-| taint.cpp:589:7:589:12 | strsep | (OSSL_LIB_CTX *,const char *) |  | SCT_CTX_new | 1 |
-| taint.cpp:589:7:589:12 | strsep | (OSSL_LIB_CTX *,const char *) |  | TS_RESP_CTX_new_ex | 1 |
-| taint.cpp:589:7:589:12 | strsep | (OSSL_LIB_CTX *,const char *) |  | X509_CRL_new_ex | 1 |
-| taint.cpp:589:7:589:12 | strsep | (OSSL_LIB_CTX *,const char *) |  | X509_PUBKEY_new_ex | 1 |
-| taint.cpp:589:7:589:12 | strsep | (OSSL_LIB_CTX *,const char *) |  | X509_REQ_new_ex | 1 |
-| taint.cpp:589:7:589:12 | strsep | (OSSL_LIB_CTX *,const char *) |  | X509_STORE_CTX_new_ex | 1 |
-| taint.cpp:589:7:589:12 | strsep | (OSSL_LIB_CTX *,const char *) |  | X509_new_ex | 1 |
-| taint.cpp:589:7:589:12 | strsep | (OSSL_LIB_CTX *,const char *) |  | ossl_cmp_mock_srv_new | 1 |
-| taint.cpp:589:7:589:12 | strsep | (OSSL_LIB_CTX *,const char *) |  | ossl_cms_Data_create | 1 |
-| taint.cpp:589:7:589:12 | strsep | (OSSL_LIB_CTX *,const char *) |  | ossl_parse_property | 1 |
-| taint.cpp:589:7:589:12 | strsep | (OSSL_PARAM *,const char *) |  | OSSL_PARAM_locate | 1 |
-| taint.cpp:589:7:589:12 | strsep | (OSSL_PARAM *,const char *) |  | OSSL_PARAM_set_utf8_ptr | 1 |
-| taint.cpp:589:7:589:12 | strsep | (OSSL_PARAM *,const char *) |  | OSSL_PARAM_set_utf8_string | 1 |
-| taint.cpp:589:7:589:12 | strsep | (OSSL_PROVIDER *,const char *) |  | ossl_provider_set_module_path | 1 |
-| taint.cpp:589:7:589:12 | strsep | (PKCS7 *,const char *) |  | ossl_pkcs7_set1_propq | 1 |
-| taint.cpp:589:7:589:12 | strsep | (RSA_METHOD *,const char *) |  | RSA_meth_set1_name | 1 |
-| taint.cpp:589:7:589:12 | strsep | (SSL *,const char *) |  | SSL_add1_host | 1 |
-| taint.cpp:589:7:589:12 | strsep | (SSL *,const char *) |  | SSL_set1_host | 1 |
-| taint.cpp:589:7:589:12 | strsep | (SSL *,const char *) |  | SSL_set_cipher_list | 1 |
-| taint.cpp:589:7:589:12 | strsep | (SSL *,const char *) |  | SSL_use_psk_identity_hint | 1 |
-| taint.cpp:589:7:589:12 | strsep | (SSL_CONF_CTX *,const char *) |  | SSL_CONF_CTX_set1_prefix | 1 |
-| taint.cpp:589:7:589:12 | strsep | (SSL_CONF_CTX *,const char *) |  | SSL_CONF_cmd_value_type | 1 |
-| taint.cpp:589:7:589:12 | strsep | (SSL_CTX *,const char *) |  | SSL_CTX_set_cipher_list | 1 |
-| taint.cpp:589:7:589:12 | strsep | (SSL_CTX *,const char *) |  | SSL_CTX_use_psk_identity_hint | 1 |
-| taint.cpp:589:7:589:12 | strsep | (SSL_CTX *,const char *) |  | ossl_quic_set_diag_title | 1 |
-| taint.cpp:589:7:589:12 | strsep | (SSL_SESSION *,const char *) |  | SSL_SESSION_set1_hostname | 1 |
-| taint.cpp:589:7:589:12 | strsep | (UI *,const char *) |  | UI_add_error_string | 1 |
-| taint.cpp:589:7:589:12 | strsep | (UI *,const char *) |  | UI_add_info_string | 1 |
-| taint.cpp:589:7:589:12 | strsep | (UI *,const char *) |  | UI_dup_error_string | 1 |
-| taint.cpp:589:7:589:12 | strsep | (UI *,const char *) |  | UI_dup_info_string | 1 |
-| taint.cpp:589:7:589:12 | strsep | (X509 *,const char *) |  | x509_ctrl_string | 1 |
-| taint.cpp:589:7:589:12 | strsep | (X509_REQ *,const char *) |  | x509_req_ctrl_string | 1 |
-| taint.cpp:589:7:589:12 | strsep | (X509_VERIFY_PARAM *,const char *) |  | X509_VERIFY_PARAM_set1_ip_asc | 1 |
-| taint.cpp:589:7:589:12 | strsep | (X509_VERIFY_PARAM *,const char *) |  | X509_VERIFY_PARAM_set1_name | 1 |
-| taint.cpp:589:7:589:12 | strsep | (__printf_buffer *,const char *) |  | __printf_buffer_puts_1 | 1 |
-| taint.cpp:589:7:589:12 | strsep | (alloc_buffer,const char *) |  | __libc_alloc_buffer_copy_string | 1 |
-| taint.cpp:589:7:589:12 | strsep | (argp_fmtstream_t,const char *) |  | __argp_fmtstream_puts | 1 |
-| taint.cpp:589:7:589:12 | strsep | (char **,const char *) |  | Curl_setstropt | 0 |
-| taint.cpp:589:7:589:12 | strsep | (char **,const char *) |  | Curl_setstropt | 1 |
-| taint.cpp:589:7:589:12 | strsep | (char **,const char *) |  | __strsep | 0 |
-| taint.cpp:589:7:589:12 | strsep | (char **,const char *) |  | __strsep | 1 |
-| taint.cpp:589:7:589:12 | strsep | (char *,const char *) |  | xstrdup | 1 |
-| taint.cpp:589:7:589:12 | strsep | (const OSSL_PARAM *,const char *) |  | OSSL_PARAM_locate_const | 1 |
-| taint.cpp:589:7:589:12 | strsep | (const char **,const char *) |  | uv__utf8_decode1 | 1 |
-| taint.cpp:589:7:589:12 | strsep | (const char *,const char *) |  | Configcmp | 1 |
-| taint.cpp:589:7:589:12 | strsep | (const char *,const char *) |  | Curl_timestrcmp | 1 |
-| taint.cpp:589:7:589:12 | strsep | (const char *,const char *) |  | DES_crypt | 1 |
-| taint.cpp:589:7:589:12 | strsep | (const char *,const char *) |  | OPENSSL_strcasecmp | 1 |
-| taint.cpp:589:7:589:12 | strsep | (const char *,const char *) |  | __bind_textdomain_codeset | 1 |
-| taint.cpp:589:7:589:12 | strsep | (const char *,const char *) |  | __bindtextdomain | 1 |
-| taint.cpp:589:7:589:12 | strsep | (const char *,const char *) |  | __dgettext | 1 |
-| taint.cpp:589:7:589:12 | strsep | (const char *,const char *) |  | __gconv_compare_alias | 1 |
-| taint.cpp:589:7:589:12 | strsep | (const char *,const char *) |  | __strcasestr | 1 |
-| taint.cpp:589:7:589:12 | strsep | (const char *,const char *) |  | __strcspn_generic | 1 |
-| taint.cpp:589:7:589:12 | strsep | (const char *,const char *) |  | __strcspn_sse42 | 1 |
-| taint.cpp:589:7:589:12 | strsep | (const char *,const char *) |  | __strpbrk_generic | 1 |
-| taint.cpp:589:7:589:12 | strsep | (const char *,const char *) |  | __strpbrk_sse42 | 1 |
-| taint.cpp:589:7:589:12 | strsep | (const char *,const char *) |  | __strspn_generic | 1 |
-| taint.cpp:589:7:589:12 | strsep | (const char *,const char *) |  | __strspn_sse42 | 1 |
-| taint.cpp:589:7:589:12 | strsep | (const char *,const char *) |  | __strstr_generic | 1 |
-| taint.cpp:589:7:589:12 | strsep | (const char *,const char *) |  | __strverscmp | 1 |
-| taint.cpp:589:7:589:12 | strsep | (const char *,const char *) |  | _dl_cache_libcmp | 1 |
-| taint.cpp:589:7:589:12 | strsep | (const char *,const char *) |  | advance | 1 |
-| taint.cpp:589:7:589:12 | strsep | (const char *,const char *) |  | c_strcasecmp | 1 |
-| taint.cpp:589:7:589:12 | strsep | (const char *,const char *) |  | charmap_aliases | 1 |
-| taint.cpp:589:7:589:12 | strsep | (const char *,const char *) |  | charmap_open | 1 |
-| taint.cpp:589:7:589:12 | strsep | (const char *,const char *) |  | chroot_canon | 1 |
-| taint.cpp:589:7:589:12 | strsep | (const char *,const char *) |  | get_passwd | 1 |
-| taint.cpp:589:7:589:12 | strsep | (const char *,const char *) |  | gzopen | 1 |
-| taint.cpp:589:7:589:12 | strsep | (const char *,const char *) |  | gzopen64 | 1 |
-| taint.cpp:589:7:589:12 | strsep | (const char *,const char *) |  | iconv_open | 1 |
-| taint.cpp:589:7:589:12 | strsep | (const char *,const char *) |  | openssl_fopen | 1 |
-| taint.cpp:589:7:589:12 | strsep | (const char *,const char *) |  | ossl_pem_check_suffix | 1 |
-| taint.cpp:589:7:589:12 | strsep | (const char *,const char *) |  | ossl_v3_name_cmp | 1 |
-| taint.cpp:589:7:589:12 | strsep | (const char *,const char *) |  | sqlite3_strglob | 1 |
-| taint.cpp:589:7:589:12 | strsep | (const char *,const char *) |  | sqlite3_stricmp | 1 |
-| taint.cpp:589:7:589:12 | strsep | (const char *,const char *) |  | step | 1 |
-| taint.cpp:589:7:589:12 | strsep | (const char *,const char *) |  | tempnam | 1 |
-| taint.cpp:589:7:589:12 | strsep | (const char *,const char *) |  | xfopen | 1 |
-| taint.cpp:589:7:589:12 | strsep | (const mntent *,const char *) |  | __hasmntopt | 1 |
-| taint.cpp:589:7:589:12 | strsep | (const nis_error,const char *) |  | nis_sperror | 1 |
-| taint.cpp:589:7:589:12 | strsep | (curl_mimepart *,const char *) |  | curl_mime_filedata | 1 |
-| taint.cpp:589:7:589:12 | strsep | (curl_off_t *,const char *) |  | str2offset | 1 |
-| taint.cpp:589:7:589:12 | strsep | (curl_pushheaders *,const char *) |  | curl_pushheader_byname | 1 |
-| taint.cpp:589:7:589:12 | strsep | (curl_slist **,const char *) |  | add2list | 1 |
-| taint.cpp:589:7:589:12 | strsep | (curl_slist *,const char *) |  | curl_slist_append | 1 |
-| taint.cpp:589:7:589:12 | strsep | (dynbuf *,const char *) |  | Curl_dyn_add | 1 |
-| taint.cpp:589:7:589:12 | strsep | (dynbuf *,const char *) |  | curlx_dyn_add | 1 |
-| taint.cpp:589:7:589:12 | strsep | (dynhds *,const char *) |  | Curl_dynhds_cget | 1 |
-| taint.cpp:589:7:589:12 | strsep | (dynhds *,const char *) |  | Curl_dynhds_h1_cadd_line | 1 |
-| taint.cpp:589:7:589:12 | strsep | (gconv_fcts *,const char *) |  | __wcsmbs_named_conv | 1 |
-| taint.cpp:589:7:589:12 | strsep | (gzFile,const char *) |  | gzputs | 1 |
-| taint.cpp:589:7:589:12 | strsep | (int,const char *) |  | BIO_meth_new | 1 |
-| taint.cpp:589:7:589:12 | strsep | (int,const char *) |  | _IO_new_fdopen | 1 |
-| taint.cpp:589:7:589:12 | strsep | (int,const char *) |  | gzdopen | 1 |
-| taint.cpp:589:7:589:12 | strsep | (int,const char *) |  | setlocale | 1 |
-| taint.cpp:589:7:589:12 | strsep | (int,const char *) |  | xsetlocale | 1 |
-| taint.cpp:589:7:589:12 | strsep | (lemon *,const char *) |  | file_makename | 1 |
-| taint.cpp:589:7:589:12 | strsep | (long *,const char *) |  | secs2ms | 1 |
-| taint.cpp:589:7:589:12 | strsep | (long *,const char *) |  | str2num | 1 |
-| taint.cpp:589:7:589:12 | strsep | (long *,const char *) |  | str2unum | 1 |
-| taint.cpp:589:7:589:12 | strsep | (nss_module *,const char *) |  | __nss_module_get_function | 1 |
-| taint.cpp:589:7:589:12 | strsep | (size_t *,const char *) |  | next_protos_parse | 1 |
-| taint.cpp:589:7:589:12 | strsep | (slist_wc **,const char *) |  | easysrc_add | 1 |
-| taint.cpp:589:7:589:12 | strsep | (slist_wc *,const char *) |  | slist_wc_append | 1 |
-| taint.cpp:589:7:589:12 | strsep | (sockaddr_un *,const char *) |  | __sockaddr_un_set | 1 |
-| taint.cpp:589:7:589:12 | strsep | (sqlite3 *,const char *) |  | sqlite3_declare_vtab | 1 |
-| taint.cpp:589:7:589:12 | strsep | (sqlite3 *,const char *) |  | sqlite3_get_clientdata | 1 |
-| taint.cpp:589:7:589:12 | strsep | (sqlite3 *,const char *) |  | sqlite3_wal_checkpoint | 1 |
-| taint.cpp:589:7:589:12 | strsep | (sqlite3_intck *,const char *) |  | sqlite3_intck_test_sql | 1 |
-| taint.cpp:589:7:589:12 | strsep | (sqlite3_stmt *,const char *) |  | sqlite3_bind_parameter_index | 1 |
-| taint.cpp:589:7:589:12 | strsep | (sqlite3_str *,const char *) |  | sqlite3_str_appendall | 1 |
-| taint.cpp:589:7:589:12 | strsep | (sqlite3_value *,const char *) |  | sqlite3_value_pointer | 1 |
-| taint.cpp:589:7:589:12 | strsep | (stringtable *,const char *) |  | stringtable_add | 1 |
-| taint.cpp:589:7:589:12 | strsep | (unsigned char *,const char *) |  | ossl_a2i_ipadd | 1 |
-| taint.cpp:589:7:589:12 | strsep | (unsigned long *,const char *) |  | set_cert_ex | 1 |
-| taint.cpp:589:7:589:12 | strsep | (unsigned long *,const char *) |  | set_name_ex | 1 |
-| taint.cpp:589:7:589:12 | strsep | (uv_pipe_t *,const char *) |  | uv_pipe_bind | 1 |
-| taint.cpp:591:6:591:16 | test_strsep | (char *) |  | SRP_VBASE_new | 0 |
-| taint.cpp:591:6:591:16 | test_strsep | (char *) |  | _IO_gets | 0 |
-| taint.cpp:591:6:591:16 | test_strsep | (char *) |  | __mktemp | 0 |
-| taint.cpp:591:6:591:16 | test_strsep | (char *) |  | __nis_default_group | 0 |
-| taint.cpp:591:6:591:16 | test_strsep | (char *) |  | __nis_default_owner | 0 |
-| taint.cpp:591:6:591:16 | test_strsep | (char *) |  | __nis_default_ttl | 0 |
-| taint.cpp:591:6:591:16 | test_strsep | (char *) |  | __xpg_basename | 0 |
-| taint.cpp:591:6:591:16 | test_strsep | (char *) |  | ctermid | 0 |
-| taint.cpp:591:6:591:16 | test_strsep | (char *) |  | cuserid | 0 |
-| taint.cpp:591:6:591:16 | test_strsep | (char *) |  | defossilize | 0 |
-| taint.cpp:591:6:591:16 | test_strsep | (char *) |  | des_setparity | 0 |
-| taint.cpp:591:6:591:16 | test_strsep | (char *) |  | dirname | 0 |
-| taint.cpp:591:6:591:16 | test_strsep | (char *) |  | getwd | 0 |
-| taint.cpp:591:6:591:16 | test_strsep | (char *) |  | make_uppercase | 0 |
-| taint.cpp:591:6:591:16 | test_strsep | (char *) |  | mkdtemp | 0 |
-| taint.cpp:591:6:591:16 | test_strsep | (char *) |  | next_item | 0 |
-| taint.cpp:591:6:591:16 | test_strsep | (char *) |  | strfry | 0 |
-| taint.cpp:591:6:591:16 | test_strsep | (char *) | CStringT | CStringT | 0 |
-| taint.cpp:602:7:602:13 | _strinc | (..(*)(..),void *) |  | OSSL_STORE_do_all_loaders | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (..(*)(..),void *) |  | _dlerror_run | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (..(*)(..),void *) | __pthread_cleanup_class | __pthread_cleanup_class | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (ASN1_SCTX *,void *) |  | ASN1_SCTX_set_app_data | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (BIO *,void *) |  | BIO_set_data | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (CONF_IMODULE *,void *) |  | CONF_imodule_set_usr_data | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (CONF_MODULE *,void *) |  | CONF_module_set_usr_data | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (CRYPTO_THREAD_LOCAL *,void *) |  | CRYPTO_THREAD_set_local | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (Curl_tree *,void *) |  | Curl_splayset | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (DH_METHOD *,void *) |  | DH_meth_set0_app_data | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (DSA_METHOD *,void *) |  | DSA_meth_set0_app_data | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (EVP_CIPHER_CTX *,void *) |  | EVP_CIPHER_CTX_set_app_data | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (EVP_CIPHER_CTX *,void *) |  | EVP_CIPHER_CTX_set_cipher_data | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (EVP_KEYMGMT *,void *) |  | evp_keymgmt_util_make_pkey | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (EVP_MAC_CTX **,void *) |  | _libssh2_hmac_final | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (EVP_PKEY_CTX *,void *) |  | EVP_PKEY_CTX_get1_id | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (EVP_PKEY_CTX *,void *) |  | EVP_PKEY_CTX_set_app_data | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (EVP_PKEY_CTX *,void *) |  | EVP_PKEY_CTX_set_data | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (Jim_Stack *,void *) |  | Jim_StackPush | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (OPENSSL_LHASH *,void *) |  | OPENSSL_LH_insert | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (OSSL_CMP_CTX *,void *) |  | OSSL_CMP_CTX_set_certConf_cb_arg | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (OSSL_CMP_CTX *,void *) |  | OSSL_CMP_CTX_set_http_cb_arg | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (OSSL_CMP_CTX *,void *) |  | OSSL_CMP_CTX_set_transfer_cb_arg | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (OSSL_DECODER *,void *) |  | ossl_decoder_instance_new | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (OSSL_DECODER_CTX *,void *) |  | OSSL_DECODER_CTX_set_construct_data | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (OSSL_ENCODER_CTX *,void *) |  | OSSL_ENCODER_CTX_set_construct_data | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (OSSL_QRX *,void *) |  | ossl_qrx_set_msg_callback_arg | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (OSSL_QTX *,void *) |  | ossl_qtx_set_msg_callback_arg | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (OSSL_QUIC_TX_PACKETISER *,void *) |  | ossl_quic_tx_packetiser_set_msg_callback_arg | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (QUIC_CHANNEL *,void *) |  | ossl_quic_channel_set_msg_callback_arg | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (RSA_METHOD *,void *) |  | RSA_meth_set0_app_data | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (SSL *,void *) |  | SSL_set0_security_ex_data | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (SSL *,void *) |  | SSL_set_async_callback_arg | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (SSL *,void *) |  | SSL_set_default_passwd_cb_userdata | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (SSL *,void *) |  | SSL_set_record_padding_callback_arg | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (SSL_CTX *,void *) |  | SSL_CTX_set0_security_ex_data | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (SSL_CTX *,void *) |  | SSL_CTX_set_async_callback_arg | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (SSL_CTX *,void *) |  | SSL_CTX_set_default_passwd_cb_userdata | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (SSL_CTX *,void *) |  | SSL_CTX_set_record_padding_callback_arg | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (SSL_CTX *,void *) |  | SSL_CTX_set_srp_cb_arg | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (UI *,void *) |  | UI_add_user_data | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (X509_CRL *,void *) |  | X509_CRL_set_meth_data | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (X509_LOOKUP *,void *) |  | X509_LOOKUP_set_method_data | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (const OSSL_DISPATCH *,void *) |  | ossl_prov_free_key | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (const OSSL_PARAM[],void *) |  | ossl_store_handle_load_result | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (const char *,void *) |  | collect_names | 0 |
-| taint.cpp:602:7:602:13 | _strinc | (const char *,void *) |  | collect_names | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (const md5_ctx *,void *) |  | __md5_read_ctx | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (const void *,void *) |  | inet6_rth_reverse | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (int,void *) |  | OSSL_STORE_INFO_new | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (int,void *) |  | sqlite3_randomness | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (md5_ctx *,void *) |  | __md5_finish_ctx | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (nghttp2_queue *,void *) |  | nghttp2_queue_push | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (nghttp2_session *,void *) |  | nghttp2_session_set_user_data | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (obstack *,void *) |  | _obstack_allocated_p | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (obstack *,void *) |  | obstack_free | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (pthread_attr_t *,void *) |  | __pthread_attr_setstackaddr | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (tunable_id_t,void *) |  | __tunable_get_default | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (unsigned char *,void *) |  | pitem_new | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (uv_handle_t *,void *) |  | uv_handle_set_data | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (uv_key_t *,void *) |  | uv_key_set | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (uv_loop_t *,void *) |  | uv_loop_set_data | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (uv_req_t *,void *) |  | uv_req_set_data | 1 |
-| taint.cpp:602:7:602:13 | _strinc | (void *,void *) |  | insque | 1 |
-| taint.cpp:603:16:603:22 | _mbsinc | (const unsigned char *) |  | Curl_read16_be | 0 |
-| taint.cpp:603:16:603:22 | _mbsinc | (const unsigned char *) |  | Curl_read16_le | 0 |
-| taint.cpp:603:16:603:22 | _mbsinc | (const unsigned char *) |  | Curl_read32_le | 0 |
-| taint.cpp:603:16:603:22 | _mbsinc | (const unsigned char *) |  | _getlong | 0 |
-| taint.cpp:603:16:603:22 | _mbsinc | (const unsigned char *) |  | _getshort | 0 |
-| taint.cpp:603:16:603:22 | _mbsinc | (const unsigned char *) |  | _libssh2_ntohu32 | 0 |
-| taint.cpp:603:16:603:22 | _mbsinc | (const unsigned char *) |  | _libssh2_ntohu64 | 0 |
-| taint.cpp:603:16:603:22 | _mbsinc | (const unsigned char *) |  | ossl_quic_vlint_decode_unchecked | 0 |
-| taint.cpp:603:16:603:22 | _mbsinc | (const unsigned char *) | CStringT | CStringT | 0 |
-| taint.cpp:603:16:603:22 | _mbsinc | (const unsigned char *) | CStringT | operator= | 0 |
-| taint.cpp:604:16:604:22 | _strdec | (MD4_CTX *,const unsigned char *) |  | MD4_Transform | 1 |
-| taint.cpp:604:16:604:22 | _strdec | (RIPEMD160_CTX *,const unsigned char *) |  | RIPEMD160_Transform | 1 |
-| taint.cpp:604:16:604:22 | _strdec | (SM3_CTX *,const unsigned char *) |  | ossl_sm3_transform | 1 |
-| taint.cpp:604:16:604:22 | _strdec | (TLS_RL_RECORD *,const unsigned char *) |  | ossl_tls_rl_record_set_seq_num | 1 |
-| taint.cpp:604:16:604:22 | _strdec | (const u_char *,const unsigned char *) |  | ns_get16 | 1 |
-| taint.cpp:604:16:604:22 | _strdec | (const u_char *,const unsigned char *) |  | ns_get32 | 1 |
-| taint.cpp:604:16:604:22 | _strdec | (const unsigned char **,const unsigned char *) |  | ___ns_name_skip | 1 |
-| taint.cpp:604:16:604:22 | _strdec | (const unsigned char *,const unsigned char *) |  | ___dn_skipname | 0 |
-| taint.cpp:604:16:604:22 | _strdec | (const unsigned char *,const unsigned char *) |  | ___dn_skipname | 1 |
-| taint.cpp:604:16:604:22 | _strdec | (const unsigned char *,const unsigned char *) |  | __ns_name_length_uncompressed | 0 |
-| taint.cpp:604:16:604:22 | _strdec | (const unsigned char *,const unsigned char *) |  | __ns_name_length_uncompressed | 1 |
-| taint.cpp:606:6:606:17 | test__strinc | (BIO *,const EVP_PKEY *,int,pem_password_cb *,void *) |  | i2b_PVK_bio | 4 |
-| taint.cpp:606:6:606:17 | test__strinc | (BrotliDecoderState *,BrotliDecoderStateInternal *,brotli_decoder_metadata_start_func,brotli_decoder_metadata_chunk_func,void *) |  | BrotliDecoderSetMetadataCallbacks | 4 |
-| taint.cpp:606:6:606:17 | test__strinc | (EVP_CIPHER_INFO *,unsigned char *,long *,pem_password_cb *,void *) |  | PEM_do_header | 4 |
-| taint.cpp:606:6:606:17 | test__strinc | (EVP_PKEY *,EVP_KEYMGMT *,void *,OSSL_CALLBACK *,void *) |  | evp_keymgmt_util_gen | 4 |
-| taint.cpp:606:6:606:17 | test__strinc | (EVP_PKEY_CTX *,int,int,int,void *) |  | RSA_pkey_ctx_ctrl | 4 |
-| taint.cpp:606:6:606:17 | test__strinc | (OSSL_QUIC_TX_PACKETISER *,const unsigned char *,size_t,ossl_quic_initial_token_free_fn *,void *) |  | ossl_quic_tx_packetiser_set_initial_token | 4 |
-| taint.cpp:606:6:606:17 | test__strinc | (char *,size_t,size_t *,const OSSL_PARAM[],void *) |  | ossl_pw_passphrase_callback_dec | 4 |
-| taint.cpp:606:6:606:17 | test__strinc | (char *,size_t,size_t *,const OSSL_PARAM[],void *) |  | ossl_pw_passphrase_callback_enc | 4 |
-| taint.cpp:606:6:606:17 | test__strinc | (const BIGNUM *,int,..(*)(..),BN_CTX *,void *) |  | BN_is_prime | 4 |
-| taint.cpp:606:6:606:17 | test__strinc | (const char **,const char **,bool *,..(*)(..),void *) |  | _dl_catch_error | 4 |
-| taint.cpp:606:6:606:17 | test__strinc | (const char *,const UI_METHOD *,void *,OSSL_STORE_post_process_info_fn,void *) |  | OSSL_STORE_open | 4 |
-| taint.cpp:606:6:606:17 | test__strinc | (const char *,int,int,..(*)(..),void *) |  | CONF_parse_list | 4 |
-| taint.cpp:606:6:606:17 | test__strinc | (nghttp2_extension *,uint8_t,uint8_t,int32_t,void *) |  | nghttp2_frame_extension_init | 4 |
-| taint.cpp:606:6:606:17 | test__strinc | (nghttp2_session *,const uint8_t *,size_t,int,void *) |  | nghttp2_session_upgrade2 | 4 |
-| taint.cpp:606:6:606:17 | test__strinc | (nghttp2_session *,int32_t,uint8_t,nghttp2_stream_state,void *) |  | nghttp2_session_open_stream | 4 |
-| taint.cpp:606:6:606:17 | test__strinc | (sqlite3 *,const char *,const char *,..(*)(..),void *) |  | recoverInit | 4 |
-| taint.cpp:616:6:616:17 | test__mbsinc | (PKCS7 *,int,long,char *) |  | PKCS7_ctrl | 3 |
-| taint.cpp:616:6:616:17 | test__mbsinc | (SSL_CTX *,srpsrvparm *,char *,char *) |  | set_up_srp_verifier_file | 3 |
-| taint.cpp:616:6:616:17 | test__mbsinc | (SSL_HMAC *,void *,size_t,char *) |  | ssl_hmac_init | 3 |
-| taint.cpp:616:6:616:17 | test__mbsinc | (SSL_HMAC *,void *,size_t,char *) |  | ssl_hmac_old_init | 3 |
-| taint.cpp:616:6:616:17 | test__mbsinc | (_IO_strfile *,char *,int,char *) |  | _IO_str_init_static | 3 |
-| taint.cpp:616:6:616:17 | test__mbsinc | (action **,e_action,symbol *,char *) |  | Action_add | 3 |
-| taint.cpp:616:6:616:17 | test__mbsinc | (const char *,const char *,char *,char *) |  | uv__idna_toascii | 3 |
-| taint.cpp:616:6:616:17 | test__mbsinc | (int,const u_char *,const unsigned char *,char *) |  | inet_nsap_ntoa | 3 |
-| taint.cpp:616:6:616:17 | test__mbsinc | (int,u_int,u_int,char *) |  | svcunix_create | 3 |
-| taint.cpp:626:6:626:17 | test__strdec | (BIO *,const BIGNUM *,const char *,int,unsigned char *) |  | print_bignum_var | 4 |
-| taint.cpp:626:6:626:17 | test__strdec | (OSSL_LIB_CTX *,const char *,const QUIC_PKT_HDR *,const QUIC_CONN_ID *,unsigned char *) |  | ossl_quic_calculate_retry_integrity_tag | 4 |
-| taint.cpp:626:6:626:17 | test__strdec | (QUIC_HDR_PROTECTOR *,const unsigned char *,size_t,unsigned char *,unsigned char *) |  | ossl_quic_hdr_protector_decrypt_fields | 3 |
-| taint.cpp:626:6:626:17 | test__strdec | (QUIC_HDR_PROTECTOR *,const unsigned char *,size_t,unsigned char *,unsigned char *) |  | ossl_quic_hdr_protector_decrypt_fields | 4 |
-| taint.cpp:626:6:626:17 | test__strdec | (QUIC_HDR_PROTECTOR *,const unsigned char *,size_t,unsigned char *,unsigned char *) |  | ossl_quic_hdr_protector_encrypt_fields | 3 |
-| taint.cpp:626:6:626:17 | test__strdec | (QUIC_HDR_PROTECTOR *,const unsigned char *,size_t,unsigned char *,unsigned char *) |  | ossl_quic_hdr_protector_encrypt_fields | 4 |
-| taint.cpp:645:14:645:22 | _strnextc | (const char *) |  | BIO_gethostbyname | 0 |
-| taint.cpp:645:14:645:22 | _strnextc | (const char *) |  | Curl_copy_header_value | 0 |
-| taint.cpp:645:14:645:22 | _strnextc | (const char *) |  | Curl_get_scheme_handler | 0 |
-| taint.cpp:645:14:645:22 | _strnextc | (const char *) |  | Curl_getdate_capped | 0 |
-| taint.cpp:645:14:645:22 | _strnextc | (const char *) |  | Jim_StrDup | 0 |
-| taint.cpp:645:14:645:22 | _strnextc | (const char *) |  | OPENSSL_LH_strhash | 0 |
-| taint.cpp:645:14:645:22 | _strnextc | (const char *) |  | OSSL_STORE_SEARCH_by_alias | 0 |
-| taint.cpp:645:14:645:22 | _strnextc | (const char *) |  | Strsafe | 0 |
-| taint.cpp:645:14:645:22 | _strnextc | (const char *) |  | Symbol_new | 0 |
-| taint.cpp:645:14:645:22 | _strnextc | (const char *) |  | UI_create_method | 0 |
-| taint.cpp:645:14:645:22 | _strnextc | (const char *) |  | X509V3_parse_list | 0 |
-| taint.cpp:645:14:645:22 | _strnextc | (const char *) |  | X509_LOOKUP_meth_new | 0 |
-| taint.cpp:645:14:645:22 | _strnextc | (const char *) |  | __basename | 0 |
-| taint.cpp:645:14:645:22 | _strnextc | (const char *) |  | __gconv_find_shlib | 0 |
-| taint.cpp:645:14:645:22 | _strnextc | (const char *) |  | __gettext | 0 |
-| taint.cpp:645:14:645:22 | _strnextc | (const char *) |  | __hash_string | 0 |
-| taint.cpp:645:14:645:22 | _strnextc | (const char *) |  | __nss_action_parse | 0 |
-| taint.cpp:645:14:645:22 | _strnextc | (const char *) |  | __strdup | 0 |
-| taint.cpp:645:14:645:22 | _strnextc | (const char *) |  | __textdomain | 0 |
-| taint.cpp:645:14:645:22 | _strnextc | (const char *) |  | __tzset_parse_tz | 0 |
-| taint.cpp:645:14:645:22 | _strnextc | (const char *) |  | __tzstring | 0 |
-| taint.cpp:645:14:645:22 | _strnextc | (const char *) |  | a2i_IPADDRESS | 0 |
-| taint.cpp:645:14:645:22 | _strnextc | (const char *) |  | a2i_IPADDRESS_NC | 0 |
-| taint.cpp:645:14:645:22 | _strnextc | (const char *) |  | a64l | 0 |
-| taint.cpp:645:14:645:22 | _strnextc | (const char *) |  | charmap_opendir | 0 |
-| taint.cpp:645:14:645:22 | _strnextc | (const char *) |  | ether_aton | 0 |
-| taint.cpp:645:14:645:22 | _strnextc | (const char *) |  | getdate | 0 |
-| taint.cpp:645:14:645:22 | _strnextc | (const char *) |  | inetstr2int | 0 |
-| taint.cpp:645:14:645:22 | _strnextc | (const char *) |  | last_component | 0 |
-| taint.cpp:645:14:645:22 | _strnextc | (const char *) |  | new_glibc_hwcaps_subdirectory | 0 |
-| taint.cpp:645:14:645:22 | _strnextc | (const char *) |  | opt_path_end | 0 |
-| taint.cpp:645:14:645:22 | _strnextc | (const char *) |  | opt_progname | 0 |
-| taint.cpp:645:14:645:22 | _strnextc | (const char *) |  | ossl_lh_strcasehash | 0 |
-| taint.cpp:645:14:645:22 | _strnextc | (const char *) |  | repertoire_read | 0 |
-| taint.cpp:645:14:645:22 | _strnextc | (const char *) |  | res_gethostbyname | 0 |
-| taint.cpp:645:14:645:22 | _strnextc | (const char *) |  | sgetsgent | 0 |
-| taint.cpp:645:14:645:22 | _strnextc | (const char *) |  | sgetspent | 0 |
-| taint.cpp:645:14:645:22 | _strnextc | (const char *) |  | strhash | 0 |
-| taint.cpp:645:14:645:22 | _strnextc | (const char *) |  | uc_script_byname | 0 |
-| taint.cpp:645:14:645:22 | _strnextc | (const char *) |  | uv__strdup | 0 |
-| taint.cpp:645:14:645:22 | _strnextc | (const char *) |  | uv_wtf8_length_as_utf16 | 0 |
-| taint.cpp:645:14:645:22 | _strnextc | (const char *) |  | xstrdup | 0 |
-| taint.cpp:647:6:647:19 | test__strnextc | (const char *) |  | BIO_gethostbyname | 0 |
-| taint.cpp:647:6:647:19 | test__strnextc | (const char *) |  | Curl_copy_header_value | 0 |
-| taint.cpp:647:6:647:19 | test__strnextc | (const char *) |  | Curl_get_scheme_handler | 0 |
-| taint.cpp:647:6:647:19 | test__strnextc | (const char *) |  | Curl_getdate_capped | 0 |
-| taint.cpp:647:6:647:19 | test__strnextc | (const char *) |  | Jim_StrDup | 0 |
-| taint.cpp:647:6:647:19 | test__strnextc | (const char *) |  | OPENSSL_LH_strhash | 0 |
-| taint.cpp:647:6:647:19 | test__strnextc | (const char *) |  | OSSL_STORE_SEARCH_by_alias | 0 |
-| taint.cpp:647:6:647:19 | test__strnextc | (const char *) |  | Strsafe | 0 |
-| taint.cpp:647:6:647:19 | test__strnextc | (const char *) |  | Symbol_new | 0 |
-| taint.cpp:647:6:647:19 | test__strnextc | (const char *) |  | UI_create_method | 0 |
-| taint.cpp:647:6:647:19 | test__strnextc | (const char *) |  | X509V3_parse_list | 0 |
-| taint.cpp:647:6:647:19 | test__strnextc | (const char *) |  | X509_LOOKUP_meth_new | 0 |
-| taint.cpp:647:6:647:19 | test__strnextc | (const char *) |  | __basename | 0 |
-| taint.cpp:647:6:647:19 | test__strnextc | (const char *) |  | __gconv_find_shlib | 0 |
-| taint.cpp:647:6:647:19 | test__strnextc | (const char *) |  | __gettext | 0 |
-| taint.cpp:647:6:647:19 | test__strnextc | (const char *) |  | __hash_string | 0 |
-| taint.cpp:647:6:647:19 | test__strnextc | (const char *) |  | __nss_action_parse | 0 |
-| taint.cpp:647:6:647:19 | test__strnextc | (const char *) |  | __strdup | 0 |
-| taint.cpp:647:6:647:19 | test__strnextc | (const char *) |  | __textdomain | 0 |
-| taint.cpp:647:6:647:19 | test__strnextc | (const char *) |  | __tzset_parse_tz | 0 |
-| taint.cpp:647:6:647:19 | test__strnextc | (const char *) |  | __tzstring | 0 |
-| taint.cpp:647:6:647:19 | test__strnextc | (const char *) |  | a2i_IPADDRESS | 0 |
-| taint.cpp:647:6:647:19 | test__strnextc | (const char *) |  | a2i_IPADDRESS_NC | 0 |
-| taint.cpp:647:6:647:19 | test__strnextc | (const char *) |  | a64l | 0 |
-| taint.cpp:647:6:647:19 | test__strnextc | (const char *) |  | charmap_opendir | 0 |
-| taint.cpp:647:6:647:19 | test__strnextc | (const char *) |  | ether_aton | 0 |
-| taint.cpp:647:6:647:19 | test__strnextc | (const char *) |  | getdate | 0 |
-| taint.cpp:647:6:647:19 | test__strnextc | (const char *) |  | inetstr2int | 0 |
-| taint.cpp:647:6:647:19 | test__strnextc | (const char *) |  | last_component | 0 |
-| taint.cpp:647:6:647:19 | test__strnextc | (const char *) |  | new_glibc_hwcaps_subdirectory | 0 |
-| taint.cpp:647:6:647:19 | test__strnextc | (const char *) |  | opt_path_end | 0 |
-| taint.cpp:647:6:647:19 | test__strnextc | (const char *) |  | opt_progname | 0 |
-| taint.cpp:647:6:647:19 | test__strnextc | (const char *) |  | ossl_lh_strcasehash | 0 |
-| taint.cpp:647:6:647:19 | test__strnextc | (const char *) |  | repertoire_read | 0 |
-| taint.cpp:647:6:647:19 | test__strnextc | (const char *) |  | res_gethostbyname | 0 |
-| taint.cpp:647:6:647:19 | test__strnextc | (const char *) |  | sgetsgent | 0 |
-| taint.cpp:647:6:647:19 | test__strnextc | (const char *) |  | sgetspent | 0 |
-| taint.cpp:647:6:647:19 | test__strnextc | (const char *) |  | strhash | 0 |
-| taint.cpp:647:6:647:19 | test__strnextc | (const char *) |  | uc_script_byname | 0 |
-| taint.cpp:647:6:647:19 | test__strnextc | (const char *) |  | uv__strdup | 0 |
-| taint.cpp:647:6:647:19 | test__strnextc | (const char *) |  | uv_wtf8_length_as_utf16 | 0 |
-| taint.cpp:647:6:647:19 | test__strnextc | (const char *) |  | xstrdup | 0 |
-| taint.cpp:665:6:665:25 | test_no_const_member | (char *) |  | SRP_VBASE_new | 0 |
-| taint.cpp:665:6:665:25 | test_no_const_member | (char *) |  | _IO_gets | 0 |
-| taint.cpp:665:6:665:25 | test_no_const_member | (char *) |  | __mktemp | 0 |
-| taint.cpp:665:6:665:25 | test_no_const_member | (char *) |  | __nis_default_group | 0 |
-| taint.cpp:665:6:665:25 | test_no_const_member | (char *) |  | __nis_default_owner | 0 |
-| taint.cpp:665:6:665:25 | test_no_const_member | (char *) |  | __nis_default_ttl | 0 |
-| taint.cpp:665:6:665:25 | test_no_const_member | (char *) |  | __xpg_basename | 0 |
-| taint.cpp:665:6:665:25 | test_no_const_member | (char *) |  | ctermid | 0 |
-| taint.cpp:665:6:665:25 | test_no_const_member | (char *) |  | cuserid | 0 |
-| taint.cpp:665:6:665:25 | test_no_const_member | (char *) |  | defossilize | 0 |
-| taint.cpp:665:6:665:25 | test_no_const_member | (char *) |  | des_setparity | 0 |
-| taint.cpp:665:6:665:25 | test_no_const_member | (char *) |  | dirname | 0 |
-| taint.cpp:665:6:665:25 | test_no_const_member | (char *) |  | getwd | 0 |
-| taint.cpp:665:6:665:25 | test_no_const_member | (char *) |  | make_uppercase | 0 |
-| taint.cpp:665:6:665:25 | test_no_const_member | (char *) |  | mkdtemp | 0 |
-| taint.cpp:665:6:665:25 | test_no_const_member | (char *) |  | next_item | 0 |
-| taint.cpp:665:6:665:25 | test_no_const_member | (char *) |  | strfry | 0 |
-| taint.cpp:665:6:665:25 | test_no_const_member | (char *) | CStringT | CStringT | 0 |
-| taint.cpp:677:6:677:27 | test_with_const_member | (char *) |  | SRP_VBASE_new | 0 |
-| taint.cpp:677:6:677:27 | test_with_const_member | (char *) |  | _IO_gets | 0 |
-| taint.cpp:677:6:677:27 | test_with_const_member | (char *) |  | __mktemp | 0 |
-| taint.cpp:677:6:677:27 | test_with_const_member | (char *) |  | __nis_default_group | 0 |
-| taint.cpp:677:6:677:27 | test_with_const_member | (char *) |  | __nis_default_owner | 0 |
-| taint.cpp:677:6:677:27 | test_with_const_member | (char *) |  | __nis_default_ttl | 0 |
-| taint.cpp:677:6:677:27 | test_with_const_member | (char *) |  | __xpg_basename | 0 |
-| taint.cpp:677:6:677:27 | test_with_const_member | (char *) |  | ctermid | 0 |
-| taint.cpp:677:6:677:27 | test_with_const_member | (char *) |  | cuserid | 0 |
-| taint.cpp:677:6:677:27 | test_with_const_member | (char *) |  | defossilize | 0 |
-| taint.cpp:677:6:677:27 | test_with_const_member | (char *) |  | des_setparity | 0 |
-| taint.cpp:677:6:677:27 | test_with_const_member | (char *) |  | dirname | 0 |
-| taint.cpp:677:6:677:27 | test_with_const_member | (char *) |  | getwd | 0 |
-| taint.cpp:677:6:677:27 | test_with_const_member | (char *) |  | make_uppercase | 0 |
-| taint.cpp:677:6:677:27 | test_with_const_member | (char *) |  | mkdtemp | 0 |
-| taint.cpp:677:6:677:27 | test_with_const_member | (char *) |  | next_item | 0 |
-| taint.cpp:677:6:677:27 | test_with_const_member | (char *) |  | strfry | 0 |
-| taint.cpp:677:6:677:27 | test_with_const_member | (char *) | CStringT | CStringT | 0 |
-| taint.cpp:683:6:683:20 | argument_source | (void *) |  | Curl_cpool_upkeep | 0 |
-| taint.cpp:683:6:683:20 | argument_source | (void *) |  | __dlclose | 0 |
-| taint.cpp:683:6:683:20 | argument_source | (void *) |  | __libc_dlclose | 0 |
-| taint.cpp:683:6:683:20 | argument_source | (void *) |  | __libc_free | 0 |
-| taint.cpp:683:6:683:20 | argument_source | (void *) |  | __malloc_usable_size | 0 |
-| taint.cpp:683:6:683:20 | argument_source | (void *) |  | _dl_allocate_tls | 0 |
-| taint.cpp:683:6:683:20 | argument_source | (void *) |  | _dl_close | 0 |
-| taint.cpp:683:6:683:20 | argument_source | (void *) |  | malloc_usable_size | 0 |
-| taint.cpp:683:6:683:20 | argument_source | (void *) |  | ossl_kdf_data_new | 0 |
-| taint.cpp:683:6:683:20 | argument_source | (void *) |  | support_shared_free | 0 |
-| taint.cpp:707:8:707:14 | strncpy | (BIO *,OCSP_REQUEST *,unsigned long) |  | OCSP_REQUEST_print | 2 |
-| taint.cpp:707:8:707:14 | strncpy | (BIO *,OCSP_RESPONSE *,unsigned long) |  | OCSP_RESPONSE_print | 2 |
-| taint.cpp:707:8:707:14 | strncpy | (BIO *,X509 *,unsigned long) |  | ossl_x509_print_ex_brief | 2 |
-| taint.cpp:707:8:707:14 | strncpy | (BIO *,X509_CRL *,unsigned long) |  | X509_CRL_print_ex | 2 |
-| taint.cpp:707:8:707:14 | strncpy | (BIO *,const ASN1_STRING *,unsigned long) |  | ASN1_STRING_print_ex | 2 |
-| taint.cpp:707:8:707:14 | strncpy | (FILE *,const ASN1_STRING *,unsigned long) |  | ASN1_STRING_print_ex_fp | 2 |
-| taint.cpp:707:8:707:14 | strncpy | (const char *,const char *,unsigned long) |  | __ngettext | 1 |
-| taint.cpp:707:8:707:14 | strncpy | (const char *,const char *,unsigned long) |  | __ngettext | 2 |
-| taint.cpp:707:8:707:14 | strncpy | (unsigned char *,int,unsigned long) |  | UTF8_putc | 2 |
-| taint.cpp:709:6:709:17 | test_strncpy | (ARGS *,char *) |  | chopup_args | 1 |
-| taint.cpp:709:6:709:17 | test_strncpy | (BIO *,char *) |  | BIO_set_callback_arg | 1 |
-| taint.cpp:709:6:709:17 | test_strncpy | (SRP_VBASE *,char *) |  | SRP_VBASE_get1_by_user | 1 |
-| taint.cpp:709:6:709:17 | test_strncpy | (SRP_VBASE *,char *) |  | SRP_VBASE_get_by_user | 1 |
-| taint.cpp:709:6:709:17 | test_strncpy | (SSL_CTX *,char *) |  | SSL_CTX_set_srp_password | 1 |
-| taint.cpp:709:6:709:17 | test_strncpy | (SSL_CTX *,char *) |  | SSL_CTX_set_srp_username | 1 |
-| taint.cpp:709:6:709:17 | test_strncpy | (XDR *,char *) |  | xdr_char | 1 |
-| taint.cpp:709:6:709:17 | test_strncpy | (char *,char *) |  | passwd2des_internal | 0 |
-| taint.cpp:709:6:709:17 | test_strncpy | (char *,char *) |  | passwd2des_internal | 1 |
-| taint.cpp:709:6:709:17 | test_strncpy | (char *,char *) |  | xdecrypt | 0 |
-| taint.cpp:709:6:709:17 | test_strncpy | (char *,char *) |  | xdecrypt | 1 |
-| taint.cpp:709:6:709:17 | test_strncpy | (char *,char *) |  | xencrypt | 0 |
-| taint.cpp:709:6:709:17 | test_strncpy | (char *,char *) |  | xencrypt | 1 |
-| taint.cpp:709:6:709:17 | test_strncpy | (const char *,char *) |  | __old_realpath | 1 |
-| taint.cpp:709:6:709:17 | test_strncpy | (const char *,char *) |  | __realpath | 1 |
-| taint.cpp:709:6:709:17 | test_strncpy | (const char *,char *) |  | sha1sum_file | 1 |
-| taint.cpp:709:6:709:17 | test_strncpy | (const char *,char *) |  | sha3sum_file | 1 |
-| taint.cpp:709:6:709:17 | test_strncpy | (const ether_addr *,char *) |  | ether_ntoa_r | 1 |
-| taint.cpp:709:6:709:17 | test_strncpy | (const tm *,char *) |  | __asctime_r | 1 |
-| taint.cpp:709:6:709:17 | test_strncpy | (curl_slist *,char *) |  | Curl_slist_append_nodup | 1 |
-| taint.cpp:709:6:709:17 | test_strncpy | (unsigned long,char *) |  | ERR_error_string | 1 |
-| taint.cpp:725:10:725:15 | strtol | (ASN1_BIT_STRING *,int,int) |  | ASN1_BIT_STRING_set_bit | 2 |
-| taint.cpp:725:10:725:15 | strtol | (ASN1_BIT_STRING *,unsigned char *,int) |  | ASN1_BIT_STRING_set | 2 |
-| taint.cpp:725:10:725:15 | strtol | (ASN1_OCTET_STRING **,const unsigned char *,int) |  | ossl_cmp_asn1_octet_string_set1_bytes | 2 |
-| taint.cpp:725:10:725:15 | strtol | (ASN1_OCTET_STRING *,const unsigned char *,int) |  | ASN1_OCTET_STRING_set | 2 |
-| taint.cpp:725:10:725:15 | strtol | (ASN1_STRING *,const void *,int) |  | ASN1_STRING_set | 2 |
-| taint.cpp:725:10:725:15 | strtol | (ASN1_STRING *,void *,int) |  | ASN1_STRING_set0 | 2 |
-| taint.cpp:725:10:725:15 | strtol | (ASN1_TIME *,tm *,int) |  | ossl_asn1_time_from_tm | 2 |
-| taint.cpp:725:10:725:15 | strtol | (ASN1_TYPE *,unsigned char *,int) |  | ASN1_TYPE_set_octetstring | 2 |
-| taint.cpp:725:10:725:15 | strtol | (ASN1_VALUE **,const ASN1_ITEM *,int) |  | ossl_asn1_item_embed_free | 2 |
-| taint.cpp:725:10:725:15 | strtol | (ASN1_VALUE **,const ASN1_ITEM *,int) |  | ossl_asn1_primitive_free | 2 |
-| taint.cpp:725:10:725:15 | strtol | (BIGNUM *,const BIGNUM *,int) |  | BN_lshift | 2 |
-| taint.cpp:725:10:725:15 | strtol | (BIGNUM *,const BIGNUM *,int) |  | BN_rshift | 2 |
-| taint.cpp:725:10:725:15 | strtol | (BIGNUM *,const BIGNUM *,int) |  | BN_with_flags | 2 |
-| taint.cpp:725:10:725:15 | strtol | (BIGNUM *,const BIGNUM *,int) |  | bn_lshift_fixed_top | 2 |
-| taint.cpp:725:10:725:15 | strtol | (BIGNUM *,const BIGNUM *,int) |  | bn_rshift_fixed_top | 2 |
-| taint.cpp:725:10:725:15 | strtol | (BIGNUM *,const unsigned long *,int) |  | bn_set_static_words | 2 |
-| taint.cpp:725:10:725:15 | strtol | (BIGNUM *,const unsigned long *,int) |  | bn_set_words | 2 |
-| taint.cpp:725:10:725:15 | strtol | (BIO *,BIO *,int) |  | OSSL_HTTP_REQ_CTX_new | 2 |
-| taint.cpp:725:10:725:15 | strtol | (BIO *,BIO *,int) |  | SMIME_crlf_copy | 2 |
-| taint.cpp:725:10:725:15 | strtol | (BIO *,GENERAL_NAMES *,int) |  | OSSL_GENERAL_NAMES_print | 2 |
-| taint.cpp:725:10:725:15 | strtol | (BIO *,char *,int) |  | BIO_get_line | 2 |
-| taint.cpp:725:10:725:15 | strtol | (BIO *,const DSA *,int) |  | DSA_print | 2 |
-| taint.cpp:725:10:725:15 | strtol | (BIO *,const RSA *,int) |  | RSA_print | 2 |
-| taint.cpp:725:10:725:15 | strtol | (CERT *,X509_STORE **,int) |  | ssl_cert_get_cert_store | 2 |
-| taint.cpp:725:10:725:15 | strtol | (CRYPTO_THREAD_ROUTINE,void *,int) |  | ossl_crypto_thread_native_start | 2 |
-| taint.cpp:725:10:725:15 | strtol | (Curl_easy *,connectdata *,int) |  | Curl_conn_cf_discard_all | 2 |
-| taint.cpp:725:10:725:15 | strtol | (Curl_easy *,connectdata *,int) |  | Curl_http2_may_switch | 2 |
-| taint.cpp:725:10:725:15 | strtol | (Curl_easy *,connectdata *,int) |  | Curl_http2_switch | 2 |
-| taint.cpp:725:10:725:15 | strtol | (Curl_easy *,connectdata *,int) |  | Curl_ssl_cfilter_add | 2 |
-| taint.cpp:725:10:725:15 | strtol | (Curl_sockaddr_ex *,const Curl_addrinfo *,int) |  | Curl_sock_assign_addr | 2 |
-| taint.cpp:725:10:725:15 | strtol | (DH *,const OSSL_PARAM[],int) |  | ossl_dh_key_fromdata | 2 |
-| taint.cpp:725:10:725:15 | strtol | (DSA *,const OSSL_PARAM[],int) |  | ossl_dsa_key_fromdata | 2 |
-| taint.cpp:725:10:725:15 | strtol | (ECX_KEY *,const OSSL_PARAM[],int) |  | ossl_ecx_key_fromdata | 2 |
-| taint.cpp:725:10:725:15 | strtol | (EC_KEY *,const OSSL_PARAM[],int) |  | ossl_ec_key_fromdata | 2 |
-| taint.cpp:725:10:725:15 | strtol | (ENGINE *,ENGINE_DYNAMIC_ID,int) |  | engine_add_dynamic_id | 2 |
-| taint.cpp:725:10:725:15 | strtol | (EVP_PKEY *,EVP_KEYMGMT *,int) |  | evp_keymgmt_util_export_to_provider | 2 |
-| taint.cpp:725:10:725:15 | strtol | (EVP_PKEY *,EVP_KEYMGMT *,int) |  | evp_keymgmt_util_find_operation_cache | 2 |
-| taint.cpp:725:10:725:15 | strtol | (EVP_PKEY *,EVP_PKEY *,int) |  | evp_keymgmt_util_copy | 2 |
-| taint.cpp:725:10:725:15 | strtol | (EVP_PKEY_CTX *,EVP_PKEY *,int) |  | EVP_PKEY_derive_set_peer_ex | 2 |
-| taint.cpp:725:10:725:15 | strtol | (EVP_PKEY_CTX *,const char *,int) |  | EVP_PKEY_CTX_set1_pbe_pass | 2 |
-| taint.cpp:725:10:725:15 | strtol | (EVP_PKEY_CTX *,const unsigned char *,int) |  | EVP_PKEY_CTX_add1_hkdf_info | 2 |
-| taint.cpp:725:10:725:15 | strtol | (EVP_PKEY_CTX *,const unsigned char *,int) |  | EVP_PKEY_CTX_add1_tls1_prf_seed | 2 |
-| taint.cpp:725:10:725:15 | strtol | (EVP_PKEY_CTX *,const unsigned char *,int) |  | EVP_PKEY_CTX_set1_hkdf_key | 2 |
-| taint.cpp:725:10:725:15 | strtol | (EVP_PKEY_CTX *,const unsigned char *,int) |  | EVP_PKEY_CTX_set1_hkdf_salt | 2 |
-| taint.cpp:725:10:725:15 | strtol | (EVP_PKEY_CTX *,const unsigned char *,int) |  | EVP_PKEY_CTX_set1_scrypt_salt | 2 |
-| taint.cpp:725:10:725:15 | strtol | (EVP_PKEY_CTX *,const unsigned char *,int) |  | EVP_PKEY_CTX_set1_tls1_prf_secret | 2 |
-| taint.cpp:725:10:725:15 | strtol | (EVP_PKEY_CTX *,const unsigned char *,int) |  | EVP_PKEY_CTX_set_mac_key | 2 |
-| taint.cpp:725:10:725:15 | strtol | (EVP_PKEY_CTX *,const void *,int) |  | EVP_PKEY_CTX_set1_id | 2 |
-| taint.cpp:725:10:725:15 | strtol | (EVP_PKEY_CTX *,int *,int) |  | EVP_PKEY_CTX_set0_keygen_info | 2 |
-| taint.cpp:725:10:725:15 | strtol | (FFC_PARAMS *,unsigned int,int) |  | ossl_ffc_params_enable_flags | 2 |
-| taint.cpp:725:10:725:15 | strtol | (FILE *,_IO_marker *,int) |  | _IO_seekmark | 2 |
-| taint.cpp:725:10:725:15 | strtol | (FILE *,_IO_marker *,int) |  | _IO_seekwmark | 2 |
-| taint.cpp:725:10:725:15 | strtol | (FILE *,__FILE *,int) |  | fwide | 2 |
-| taint.cpp:725:10:725:15 | strtol | (FILE *,const DSA *,int) |  | DSA_print_fp | 2 |
-| taint.cpp:725:10:725:15 | strtol | (FILE *,const RSA *,int) |  | RSA_print_fp | 2 |
-| taint.cpp:725:10:725:15 | strtol | (FILE *,off64_t,int) |  | _IO_cookie_seek | 2 |
-| taint.cpp:725:10:725:15 | strtol | (FILE *,rule *,int) |  | RulePrint | 2 |
-| taint.cpp:725:10:725:15 | strtol | (FTS *,FTSENT *,int) |  | fts_set | 2 |
-| taint.cpp:725:10:725:15 | strtol | (Jim_Interp *,Jim_Obj *,int) |  | Jim_GetCommand | 2 |
-| taint.cpp:725:10:725:15 | strtol | (Jim_Interp *,Jim_Obj *,int) |  | Jim_GetGlobalVariable | 2 |
-| taint.cpp:725:10:725:15 | strtol | (Jim_Interp *,Jim_Obj *,int) |  | Jim_GetVariable | 2 |
-| taint.cpp:725:10:725:15 | strtol | (Jim_Interp *,Jim_Obj *,int) |  | Jim_ListGetIndex | 2 |
-| taint.cpp:725:10:725:15 | strtol | (Jim_Interp *,Jim_Obj *,int) |  | Jim_UnsetVariable | 2 |
-| taint.cpp:725:10:725:15 | strtol | (Jim_Interp *,Jim_Obj *const *,int) |  | Jim_NewDictObj | 2 |
-| taint.cpp:725:10:725:15 | strtol | (Jim_Interp *,Jim_Obj *const *,int) |  | Jim_NewListObj | 2 |
-| taint.cpp:725:10:725:15 | strtol | (Jim_Interp *,char *,int) |  | Jim_NewStringObjNoAlloc | 2 |
-| taint.cpp:725:10:725:15 | strtol | (Jim_Interp *,const char *,int) |  | Jim_GetGlobalVariableStr | 2 |
-| taint.cpp:725:10:725:15 | strtol | (Jim_Interp *,const char *,int) |  | Jim_GetVariableStr | 2 |
-| taint.cpp:725:10:725:15 | strtol | (Jim_Interp *,const char *,int) |  | Jim_MakeTempFile | 2 |
-| taint.cpp:725:10:725:15 | strtol | (Jim_Interp *,const char *,int) |  | Jim_NewStringObj | 2 |
-| taint.cpp:725:10:725:15 | strtol | (Jim_Interp *,const char *,int) |  | Jim_NewStringObjUtf8 | 2 |
-| taint.cpp:725:10:725:15 | strtol | (LIBSSH2_SESSION *,int,int) |  | libssh2_session_flag | 2 |
-| taint.cpp:725:10:725:15 | strtol | (LIBSSH2_SFTP_HANDLE *,LIBSSH2_SFTP_ATTRIBUTES *,int) |  | libssh2_sftp_fstat_ex | 2 |
-| taint.cpp:725:10:725:15 | strtol | (OCSP_BASICRESP *,OCSP_CERTID *,int) |  | OCSP_resp_find | 2 |
-| taint.cpp:725:10:725:15 | strtol | (OCSP_BASICRESP *,X509_EXTENSION *,int) |  | OCSP_BASICRESP_add_ext | 2 |
-| taint.cpp:725:10:725:15 | strtol | (OCSP_BASICRESP *,const ASN1_OBJECT *,int) |  | OCSP_BASICRESP_get_ext_by_OBJ | 2 |
-| taint.cpp:725:10:725:15 | strtol | (OCSP_BASICRESP *,int,int) |  | OCSP_BASICRESP_get_ext_by_NID | 2 |
-| taint.cpp:725:10:725:15 | strtol | (OCSP_BASICRESP *,int,int) |  | OCSP_BASICRESP_get_ext_by_critical | 2 |
-| taint.cpp:725:10:725:15 | strtol | (OCSP_ONEREQ *,X509_EXTENSION *,int) |  | OCSP_ONEREQ_add_ext | 2 |
-| taint.cpp:725:10:725:15 | strtol | (OCSP_ONEREQ *,const ASN1_OBJECT *,int) |  | OCSP_ONEREQ_get_ext_by_OBJ | 2 |
-| taint.cpp:725:10:725:15 | strtol | (OCSP_ONEREQ *,int,int) |  | OCSP_ONEREQ_get_ext_by_NID | 2 |
-| taint.cpp:725:10:725:15 | strtol | (OCSP_ONEREQ *,int,int) |  | OCSP_ONEREQ_get_ext_by_critical | 2 |
-| taint.cpp:725:10:725:15 | strtol | (OCSP_REQUEST *,X509_EXTENSION *,int) |  | OCSP_REQUEST_add_ext | 2 |
-| taint.cpp:725:10:725:15 | strtol | (OCSP_REQUEST *,const ASN1_OBJECT *,int) |  | OCSP_REQUEST_get_ext_by_OBJ | 2 |
-| taint.cpp:725:10:725:15 | strtol | (OCSP_REQUEST *,int,int) |  | OCSP_REQUEST_get_ext_by_NID | 2 |
-| taint.cpp:725:10:725:15 | strtol | (OCSP_REQUEST *,int,int) |  | OCSP_REQUEST_get_ext_by_critical | 2 |
-| taint.cpp:725:10:725:15 | strtol | (OCSP_SINGLERESP *,X509_EXTENSION *,int) |  | OCSP_SINGLERESP_add_ext | 2 |
-| taint.cpp:725:10:725:15 | strtol | (OCSP_SINGLERESP *,const ASN1_OBJECT *,int) |  | OCSP_SINGLERESP_get_ext_by_OBJ | 2 |
-| taint.cpp:725:10:725:15 | strtol | (OCSP_SINGLERESP *,int,int) |  | OCSP_SINGLERESP_get_ext_by_NID | 2 |
-| taint.cpp:725:10:725:15 | strtol | (OCSP_SINGLERESP *,int,int) |  | OCSP_SINGLERESP_get_ext_by_critical | 2 |
-| taint.cpp:725:10:725:15 | strtol | (OPENSSL_STACK *,const void *,int) |  | OPENSSL_sk_insert | 2 |
-| taint.cpp:725:10:725:15 | strtol | (OSSL_CMP_CTX *,const unsigned char *,int) |  | OSSL_CMP_CTX_set1_referenceValue | 2 |
-| taint.cpp:725:10:725:15 | strtol | (OSSL_CMP_CTX *,const unsigned char *,int) |  | OSSL_CMP_CTX_set1_secretValue | 2 |
-| taint.cpp:725:10:725:15 | strtol | (OSSL_CMP_CTX *,int,int) |  | OSSL_CMP_CTX_set_option | 2 |
-| taint.cpp:725:10:725:15 | strtol | (OSSL_LIB_CTX *,const char *,int) |  | EC_GROUP_new_by_curve_name_ex | 2 |
-| taint.cpp:725:10:725:15 | strtol | (OSSL_LIB_CTX *,const char *,int) |  | EC_KEY_new_by_curve_name_ex | 2 |
-| taint.cpp:725:10:725:15 | strtol | (OSSL_LIB_CTX *,const char *,int) |  | OSSL_PROVIDER_try_load | 2 |
-| taint.cpp:725:10:725:15 | strtol | (OSSL_LIB_CTX *,const char *,int) |  | ossl_ml_dsa_key_new | 2 |
-| taint.cpp:725:10:725:15 | strtol | (OSSL_LIB_CTX *,const char *,int) |  | ossl_ml_kem_key_new | 2 |
-| taint.cpp:725:10:725:15 | strtol | (OSSL_LIB_CTX *,const char *,int) |  | ossl_parse_query | 2 |
-| taint.cpp:725:10:725:15 | strtol | (OSSL_LIB_CTX *,const char *,int) |  | ossl_property_name | 2 |
-| taint.cpp:725:10:725:15 | strtol | (OSSL_LIB_CTX *,const char *,int) |  | ossl_property_value | 2 |
-| taint.cpp:725:10:725:15 | strtol | (OSSL_PROVIDER *,OSSL_PROVIDER **,int) |  | ossl_provider_add_to_store | 2 |
-| taint.cpp:725:10:725:15 | strtol | (OSSL_QRL_ENC_LEVEL_SET *,uint32_t,int) |  | ossl_qrl_enc_level_set_get | 2 |
-| taint.cpp:725:10:725:15 | strtol | (PKCS7 *,stack_st_X509 *,int) |  | PKCS7_get0_signers | 2 |
-| taint.cpp:725:10:725:15 | strtol | (POLICYINFO *,const ASN1_OBJECT *,int) |  | ossl_policy_data_new | 2 |
-| taint.cpp:725:10:725:15 | strtol | (PROV_CTX *,const char *,int) |  | ossl_prov_ctx_get_bool_param | 2 |
-| taint.cpp:725:10:725:15 | strtol | (PROV_CTX *,const char *,int) |  | ossl_prov_ml_dsa_new | 2 |
-| taint.cpp:725:10:725:15 | strtol | (PROV_CTX *,const char *,int) |  | ossl_prov_ml_kem_new | 2 |
-| taint.cpp:725:10:725:15 | strtol | (QLOG *,uint32_t,int) |  | ossl_qlog_set_event_type_enabled | 2 |
-| taint.cpp:725:10:725:15 | strtol | (QUIC_RXFC *,uint64_t,int) |  | ossl_quic_rxfc_on_rx_stream_frame | 2 |
-| taint.cpp:725:10:725:15 | strtol | (QUIC_STREAM_ITER *,QUIC_STREAM_MAP *,int) |  | ossl_quic_stream_iter_init | 2 |
-| taint.cpp:725:10:725:15 | strtol | (QUIC_STREAM_MAP *,uint64_t,int) |  | ossl_quic_stream_map_alloc | 2 |
-| taint.cpp:725:10:725:15 | strtol | (RSA *,const OSSL_PARAM[],int) |  | ossl_rsa_fromdata | 2 |
-| taint.cpp:725:10:725:15 | strtol | (SSL *,const unsigned char *,int) |  | SSL_use_certificate_ASN1 | 2 |
-| taint.cpp:725:10:725:15 | strtol | (SSL *,const void *,int) |  | SSL_write | 2 |
-| taint.cpp:725:10:725:15 | strtol | (SSL *,void *,int) |  | SSL_peek | 2 |
-| taint.cpp:725:10:725:15 | strtol | (SSL *,void *,int) |  | SSL_read | 2 |
-| taint.cpp:725:10:725:15 | strtol | (SSL *,void *,int) |  | SSL_set_session_ticket_ext | 2 |
-| taint.cpp:725:10:725:15 | strtol | (SSL_CIPHER *,const SSL_CIPHER *,int) |  | OBJ_bsearch_ssl_cipher_id | 2 |
-| taint.cpp:725:10:725:15 | strtol | (SSL_CONNECTION *,PACKET *,int) |  | ssl_cache_cipherlist | 2 |
-| taint.cpp:725:10:725:15 | strtol | (SSL_CONNECTION *,WPACKET *,int) |  | dtls1_close_construct_packet | 2 |
-| taint.cpp:725:10:725:15 | strtol | (SSL_CONNECTION *,WPACKET *,int) |  | dtls1_set_handshake_header | 2 |
-| taint.cpp:725:10:725:15 | strtol | (SSL_CONNECTION *,WPACKET *,int) |  | tls_close_construct_packet | 2 |
-| taint.cpp:725:10:725:15 | strtol | (SSL_CONNECTION *,int,int) |  | ssl3_send_alert | 2 |
-| taint.cpp:725:10:725:15 | strtol | (TS_MSG_IMPRINT *,unsigned char *,int) |  | TS_MSG_IMPRINT_set_msg | 2 |
-| taint.cpp:725:10:725:15 | strtol | (TS_REQ *,X509_EXTENSION *,int) |  | TS_REQ_add_ext | 2 |
-| taint.cpp:725:10:725:15 | strtol | (TS_REQ *,const ASN1_OBJECT *,int) |  | TS_REQ_get_ext_by_OBJ | 2 |
-| taint.cpp:725:10:725:15 | strtol | (TS_REQ *,int,int) |  | TS_REQ_get_ext_by_NID | 2 |
-| taint.cpp:725:10:725:15 | strtol | (TS_REQ *,int,int) |  | TS_REQ_get_ext_by_critical | 2 |
-| taint.cpp:725:10:725:15 | strtol | (TS_TST_INFO *,X509_EXTENSION *,int) |  | TS_TST_INFO_add_ext | 2 |
-| taint.cpp:725:10:725:15 | strtol | (TS_TST_INFO *,const ASN1_OBJECT *,int) |  | TS_TST_INFO_get_ext_by_OBJ | 2 |
-| taint.cpp:725:10:725:15 | strtol | (TS_TST_INFO *,int,int) |  | TS_TST_INFO_get_ext_by_NID | 2 |
-| taint.cpp:725:10:725:15 | strtol | (TS_TST_INFO *,int,int) |  | TS_TST_INFO_get_ext_by_critical | 2 |
-| taint.cpp:725:10:725:15 | strtol | (X509 *,X509_EXTENSION *,int) |  | X509_add_ext | 2 |
-| taint.cpp:725:10:725:15 | strtol | (X509 *,int,int) |  | X509_check_purpose | 2 |
-| taint.cpp:725:10:725:15 | strtol | (X509 *,int,int) |  | X509_check_trust | 2 |
-| taint.cpp:725:10:725:15 | strtol | (X509_CRL *,X509_EXTENSION *,int) |  | X509_CRL_add_ext | 2 |
-| taint.cpp:725:10:725:15 | strtol | (X509_PUBKEY *,unsigned char *,int) |  | X509_PUBKEY_set0_public_key | 2 |
-| taint.cpp:725:10:725:15 | strtol | (X509_REVOKED *,X509_EXTENSION *,int) |  | X509_REVOKED_add_ext | 2 |
-| taint.cpp:725:10:725:15 | strtol | (X509_STORE_CTX *,X509 *,int) |  | ossl_x509_check_cert_time | 2 |
-| taint.cpp:725:10:725:15 | strtol | (XCHAR *,const XCHAR *,int) | CSimpleStringT | CopyChars | 2 |
-| taint.cpp:725:10:725:15 | strtol | (XCHAR *,const XCHAR *,int) | CSimpleStringT | CopyCharsOverlapped | 2 |
-| taint.cpp:725:10:725:15 | strtol | (_Float128,_Float128,int) |  | __kernel_sinf128 | 2 |
-| taint.cpp:725:10:725:15 | strtol | (_Float128,_Float128,int) |  | __kernel_tanf128 | 2 |
-| taint.cpp:725:10:725:15 | strtol | (_IO_strfile *,const char *,int) |  | _IO_str_init_readonly | 2 |
-| taint.cpp:725:10:725:15 | strtol | (action *,FILE *,int) |  | PrintAction | 2 |
-| taint.cpp:725:10:725:15 | strtol | (acttab *,int,int) |  | acttab_action | 2 |
-| taint.cpp:725:10:725:15 | strtol | (char *,size_t,int) |  | __argz_stringify | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const ASN1_VALUE *,const ASN1_TEMPLATE *,int) |  | ossl_asn1_do_adb | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const BIGNUM *,int[],int) |  | BN_GF2m_poly2arr | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const BIGNUM *,unsigned char *,int) |  | BN_bn2binpad | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const BIGNUM *,unsigned char *,int) |  | BN_bn2lebinpad | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const BIGNUM *,unsigned char *,int) |  | BN_bn2nativepad | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const BIGNUM *,unsigned char *,int) |  | BN_signed_bn2bin | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const BIGNUM *,unsigned char *,int) |  | BN_signed_bn2lebin | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const BIGNUM *,unsigned char *,int) |  | BN_signed_bn2native | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const CMS_ContentInfo *,BIO *,int) |  | ossl_cms_DigestedData_do_final | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const CMS_SignerInfo *,const ASN1_OBJECT *,int) |  | CMS_signed_get_attr_by_OBJ | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const CMS_SignerInfo *,const ASN1_OBJECT *,int) |  | CMS_unsigned_get_attr_by_OBJ | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const CMS_SignerInfo *,int,int) |  | CMS_signed_get_attr_by_NID | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const CMS_SignerInfo *,int,int) |  | CMS_unsigned_get_attr_by_NID | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const Curl_easy *,const connectdata *,int) |  | Curl_conn_is_http2 | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const EVP_MD *,const EVP_MD *,int) |  | ossl_rsa_pss_params_create | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const EVP_PKEY *,const ASN1_OBJECT *,int) |  | EVP_PKEY_get_attr_by_OBJ | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const EVP_PKEY *,int,int) |  | EVP_PKEY_get_attr_by_NID | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const OSSL_PARAM *,BIO *,int) |  | OSSL_PARAM_print_to_bio | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const OSSL_PROVIDER *,const char *,int) |  | OSSL_PROVIDER_conf_get_bool | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const SSL *,char *,int) |  | SSL_get_shared_ciphers | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const SSL *,int,int) |  | apps_ssl_info_callback | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const SSL_CIPHER *,char *,int) |  | SSL_CIPHER_description | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const X509 *,const ASN1_OBJECT *,int) |  | X509_get_ext_by_OBJ | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const X509 *,const stack_st_X509 *,int) |  | OSSL_ESS_signing_cert_new_init | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const X509 *,int,int) |  | X509_get_ext_by_NID | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const X509 *,int,int) |  | X509_get_ext_by_critical | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const X509_ACERT *,const ASN1_OBJECT *,int) |  | X509_ACERT_get_attr_by_OBJ | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const X509_ACERT *,int,int) |  | X509_ACERT_get_attr_by_NID | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const X509_CRL *,const ASN1_OBJECT *,int) |  | X509_CRL_get_ext_by_OBJ | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const X509_CRL *,const X509 *,int) |  | OSSL_CMP_CRLSTATUS_create | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const X509_CRL *,int,int) |  | X509_CRL_get_ext_by_NID | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const X509_CRL *,int,int) |  | X509_CRL_get_ext_by_critical | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const X509_NAME *,char *,int) |  | X509_NAME_oneline | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const X509_NAME *,const ASN1_OBJECT *,int) |  | X509_NAME_get_index_by_OBJ | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const X509_NAME *,int,int) |  | X509_NAME_get_index_by_NID | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const X509_REQ *,const ASN1_OBJECT *,int) |  | X509_REQ_get_attr_by_OBJ | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const X509_REQ *,int,int) |  | X509_REQ_get_attr_by_NID | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const X509_REVOKED *,const ASN1_OBJECT *,int) |  | X509_REVOKED_get_ext_by_OBJ | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const X509_REVOKED *,int,int) |  | X509_REVOKED_get_ext_by_NID | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const X509_REVOKED *,int,int) |  | X509_REVOKED_get_ext_by_critical | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const X509_SIG *,const char *,int) |  | PKCS8_decrypt | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const char *,char **,int) |  | __strtol | 0 |
-| taint.cpp:725:10:725:15 | strtol | (const char *,char **,int) |  | __strtol | 1 |
-| taint.cpp:725:10:725:15 | strtol | (const char *,char **,int) |  | __strtol | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const char *,char **,int) |  | __strtoul | 0 |
-| taint.cpp:725:10:725:15 | strtol | (const char *,char **,int) |  | __strtoul | 1 |
-| taint.cpp:725:10:725:15 | strtol | (const char *,char **,int) |  | __strtoul | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const char *,char **,int) |  | idn2_to_ascii_8z | 0 |
-| taint.cpp:725:10:725:15 | strtol | (const char *,char **,int) |  | idn2_to_ascii_8z | 1 |
-| taint.cpp:725:10:725:15 | strtol | (const char *,char **,int) |  | idn2_to_ascii_8z | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const char *,const OSSL_PARAM *,int) |  | print_param_types | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const char *,const char *,int) |  | CRYPTO_strdup | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const char *,const char *,int) |  | __dcgettext | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const char *,const char *,int) |  | sqlite3_strnicmp | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const char *,int,int) |  | __old_strpbrk_c2 | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const char *,long *,int) |  | Jim_StringToWide | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const char *,size_t *,int) |  | _dl_sysdep_read_whole_file | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const char *,sqlite3_filename,int) |  | sqlite3_uri_key | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const char *,void *,int) |  | support_readdir_check | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const char *,wordexp_t *,int) |  | wordexp | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const cmsghdr *,uint8_t **,int) |  | inet6_option_find | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const stack_st_X509_ATTRIBUTE *,const ASN1_OBJECT *,int) |  | X509at_get_attr_by_OBJ | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const stack_st_X509_ATTRIBUTE *,int,int) |  | X509at_get_attr_by_NID | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const stack_st_X509_EXTENSION *,const ASN1_OBJECT *,int) |  | X509v3_get_ext_by_OBJ | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const stack_st_X509_EXTENSION *,int,int) |  | X509v3_get_ext_by_NID | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const stack_st_X509_EXTENSION *,int,int) |  | X509v3_get_ext_by_critical | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const uint8_t *,uint8_t **,int) |  | idn2_lookup_u8 | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const unsigned char **,unsigned int,int) |  | ossl_b2i_DSA_after_header | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const unsigned char **,unsigned int,int) |  | ossl_b2i_RSA_after_header | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const void *,const void *,int) |  | ossl_is_partially_overlapping | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const void *,socklen_t,int) |  | res_gethostbyaddr | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const wchar_t *,wchar_t **,int) |  | __wcstol | 2 |
-| taint.cpp:725:10:725:15 | strtol | (const wchar_t *,wchar_t **,int) |  | __wcstoul | 2 |
-| taint.cpp:725:10:725:15 | strtol | (curl_mimepart *,curl_mime *,int) |  | Curl_mime_set_subparts | 2 |
-| taint.cpp:725:10:725:15 | strtol | (curl_mimepart *,curl_slist *,int) |  | curl_mime_headers | 2 |
-| taint.cpp:725:10:725:15 | strtol | (database_dyn *,size_t,int) |  | mempool_alloc | 2 |
-| taint.cpp:725:10:725:15 | strtol | (database_dyn *,time_t,int) |  | prune_cache | 2 |
-| taint.cpp:725:10:725:15 | strtol | (double,double,int) |  | __kernel_standard | 2 |
-| taint.cpp:725:10:725:15 | strtol | (float,float,int) |  | __kernel_standard_f | 2 |
-| taint.cpp:725:10:725:15 | strtol | (gconv_spec *,__gconv_t *,int) |  | __gconv_open | 2 |
-| taint.cpp:725:10:725:15 | strtol | (gzFile,char *,int) |  | gzgets | 2 |
-| taint.cpp:725:10:725:15 | strtol | (gzFile,int,int) |  | gzsetparams | 2 |
-| taint.cpp:725:10:725:15 | strtol | (gzFile,off64_t,int) |  | gzseek64 | 2 |
-| taint.cpp:725:10:725:15 | strtol | (gzFile,off_t,int) |  | gzseek | 2 |
-| taint.cpp:725:10:725:15 | strtol | (int *,short *,int) |  | __lll_lock_elision | 2 |
-| taint.cpp:725:10:725:15 | strtol | (int,BIO_ADDR *,int) |  | BIO_accept_ex | 2 |
-| taint.cpp:725:10:725:15 | strtol | (int,int,int) |  | ASN1_object_size | 2 |
-| taint.cpp:725:10:725:15 | strtol | (int,int,int) |  | EVP_CIPHER_meth_new | 2 |
-| taint.cpp:725:10:725:15 | strtol | (long double,long double,int) |  | __kernel_sinl | 2 |
-| taint.cpp:725:10:725:15 | strtol | (long double,long double,int) |  | __kernel_standard_l | 2 |
-| taint.cpp:725:10:725:15 | strtol | (long double,long double,int) |  | __kernel_tanl | 2 |
-| taint.cpp:725:10:725:15 | strtol | (mp_srcptr,int,int) |  | __mpn_construct_double | 2 |
-| taint.cpp:725:10:725:15 | strtol | (mp_srcptr,int,int) |  | __mpn_construct_float | 2 |
-| taint.cpp:725:10:725:15 | strtol | (mp_srcptr,int,int) |  | __mpn_construct_float128 | 2 |
-| taint.cpp:725:10:725:15 | strtol | (regex_t *,const char *,int) |  | jim_regcomp | 2 |
-| taint.cpp:725:10:725:15 | strtol | (requestlist *,requestlist *,int) |  | __aio_remove_request | 2 |
-| taint.cpp:725:10:725:15 | strtol | (sqlite3 *,const char *,int) |  | sqlite3_overload_function | 2 |
-| taint.cpp:725:10:725:15 | strtol | (sqlite3 *,int,int) |  | sqlite3_limit | 2 |
-| taint.cpp:725:10:725:15 | strtol | (sqlite3_context *,const char *,int) |  | sqlite3_result_error | 2 |
-| taint.cpp:725:10:725:15 | strtol | (sqlite3_context *,const void *,int) |  | sqlite3_result_error16 | 2 |
-| taint.cpp:725:10:725:15 | strtol | (sqlite3_index_info *,int,int) |  | sqlite3_vtab_in | 2 |
-| taint.cpp:725:10:725:15 | strtol | (sqlite3_stmt *,int,int) |  | sqlite3_bind_int | 2 |
-| taint.cpp:725:10:725:15 | strtol | (sqlite3_stmt *,int,int) |  | sqlite3_bind_zeroblob | 2 |
-| taint.cpp:725:10:725:15 | strtol | (sqlite3_stmt *,int,int) |  | sqlite3_stmt_status | 2 |
-| taint.cpp:725:10:725:15 | strtol | (sqlite3_str *,const char *,int) |  | sqlite3_str_append | 2 |
-| taint.cpp:725:10:725:15 | strtol | (sqlite3expert *,int,int) |  | sqlite3_expert_report | 2 |
-| taint.cpp:725:10:725:15 | strtol | (stack_st_ASN1_UTF8STRING *,const char *,int) |  | ossl_cmp_sk_ASN1_UTF8STRING_push_str | 2 |
-| taint.cpp:725:10:725:15 | strtol | (stack_st_X509 **,X509 *,int) |  | ossl_x509_add_cert_new | 2 |
-| taint.cpp:725:10:725:15 | strtol | (stack_st_X509 **,stack_st_X509 *,int) |  | ossl_x509_add_certs_new | 2 |
-| taint.cpp:725:10:725:15 | strtol | (stack_st_X509 *,ASIdentifiers *,int) |  | X509v3_asid_validate_resource_set | 2 |
-| taint.cpp:725:10:725:15 | strtol | (stack_st_X509 *,IPAddrBlocks *,int) |  | X509v3_addr_validate_resource_set | 2 |
-| taint.cpp:725:10:725:15 | strtol | (stack_st_X509 *,X509 *,int) |  | X509_add_cert | 2 |
-| taint.cpp:725:10:725:15 | strtol | (stack_st_X509 *,stack_st_X509 *,int) |  | X509_add_certs | 2 |
-| taint.cpp:725:10:725:15 | strtol | (stack_st_X509_ALGOR **,int,int) |  | CMS_add_simple_smimecap | 2 |
-| taint.cpp:725:10:725:15 | strtol | (stack_st_X509_ALGOR *,int,int) |  | PKCS7_simple_smimecap | 2 |
-| taint.cpp:725:10:725:15 | strtol | (stack_st_X509_EXTENSION **,X509_EXTENSION *,int) |  | X509v3_add_ext | 2 |
-| taint.cpp:725:10:725:15 | strtol | (td_thragent_t *,uint32_t *,int) |  | _td_check_sizeof | 2 |
-| taint.cpp:725:10:725:15 | strtol | (uint8_t[56],const gf,int) |  | gf_serialize | 2 |
-| taint.cpp:725:10:725:15 | strtol | (uint32_t *,SSL_CONNECTION *,int) |  | ssl_set_sig_mask | 2 |
-| taint.cpp:725:10:725:15 | strtol | (unsigned char *,const char *,int) |  | data_string | 2 |
-| taint.cpp:725:10:725:15 | strtol | (unsigned char *,const unsigned char *,int) |  | EVP_DecodeBlock | 2 |
-| taint.cpp:725:10:725:15 | strtol | (unsigned char *,const unsigned char *,int) |  | EVP_EncodeBlock | 2 |
-| taint.cpp:725:10:725:15 | strtol | (unsigned char *,uint64_t,int) |  | ossl_i2c_uint64_int | 2 |
-| taint.cpp:725:10:725:15 | strtol | (unsigned int,const char *,int) |  | _IO_adjust_column | 2 |
-| taint.cpp:725:10:725:15 | strtol | (unsigned int,const wchar_t *,int) |  | _IO_adjust_wcolumn | 2 |
-| taint.cpp:725:10:725:15 | strtol | (unsigned int,int,int) |  | ossl_blob_length | 2 |
-| taint.cpp:725:10:725:15 | strtol | (unsigned long *,const BIGNUM *,int) |  | bn_copy_words | 2 |
-| taint.cpp:725:10:725:15 | strtol | (unsigned long *,const unsigned long *,int) |  | bn_sqr_words | 2 |
-| taint.cpp:725:10:725:15 | strtol | (uv__io_t *,uv__io_cb,int) |  | uv__io_init | 2 |
-| taint.cpp:725:10:725:15 | strtol | (uv_loop_t *,uv_fs_t *,int) |  | uv__iou_fs_read_or_write | 2 |
-| taint.cpp:725:10:725:15 | strtol | (uv_loop_t *,uv_pipe_t *,int) |  | uv_pipe_init | 2 |
-| taint.cpp:725:10:725:15 | strtol | (uv_loop_t *,uv_poll_t *,int) |  | uv_poll_init | 2 |
-| taint.cpp:725:10:725:15 | strtol | (uv_signal_t *,uv_signal_cb,int) |  | uv_signal_start | 2 |
-| taint.cpp:725:10:725:15 | strtol | (uv_signal_t *,uv_signal_cb,int) |  | uv_signal_start_oneshot | 2 |
-| taint.cpp:725:10:725:15 | strtol | (uv_stream_t *,int,int) |  | uv__stream_open | 2 |
-| taint.cpp:725:10:725:15 | strtol | (void *,cmsghdr **,int) |  | inet6_option_init | 2 |
-| taint.cpp:725:10:725:15 | strtol | (void *,const char *,int) |  | CRYPTO_secure_free | 2 |
-| taint.cpp:725:10:725:15 | strtol | (void *,curl_off_t,int) |  | tool_mime_stdin_seek | 2 |
-| taint.cpp:725:10:725:15 | strtol | (void *,socklen_t,int) |  | inet6_opt_finish | 2 |
-| taint.cpp:727:6:727:16 | test_strtol | (char *) |  | SRP_VBASE_new | 0 |
-| taint.cpp:727:6:727:16 | test_strtol | (char *) |  | _IO_gets | 0 |
-| taint.cpp:727:6:727:16 | test_strtol | (char *) |  | __mktemp | 0 |
-| taint.cpp:727:6:727:16 | test_strtol | (char *) |  | __nis_default_group | 0 |
-| taint.cpp:727:6:727:16 | test_strtol | (char *) |  | __nis_default_owner | 0 |
-| taint.cpp:727:6:727:16 | test_strtol | (char *) |  | __nis_default_ttl | 0 |
-| taint.cpp:727:6:727:16 | test_strtol | (char *) |  | __xpg_basename | 0 |
-| taint.cpp:727:6:727:16 | test_strtol | (char *) |  | ctermid | 0 |
-| taint.cpp:727:6:727:16 | test_strtol | (char *) |  | cuserid | 0 |
-| taint.cpp:727:6:727:16 | test_strtol | (char *) |  | defossilize | 0 |
-| taint.cpp:727:6:727:16 | test_strtol | (char *) |  | des_setparity | 0 |
-| taint.cpp:727:6:727:16 | test_strtol | (char *) |  | dirname | 0 |
-| taint.cpp:727:6:727:16 | test_strtol | (char *) |  | getwd | 0 |
-| taint.cpp:727:6:727:16 | test_strtol | (char *) |  | make_uppercase | 0 |
-| taint.cpp:727:6:727:16 | test_strtol | (char *) |  | mkdtemp | 0 |
-| taint.cpp:727:6:727:16 | test_strtol | (char *) |  | next_item | 0 |
-| taint.cpp:727:6:727:16 | test_strtol | (char *) |  | strfry | 0 |
-| taint.cpp:727:6:727:16 | test_strtol | (char *) | CStringT | CStringT | 0 |
-| taint.cpp:735:7:735:12 | malloc | (size_t) |  | BrotliEncoderMaxCompressedSize | 0 |
-| taint.cpp:735:7:735:12 | malloc | (size_t) |  | EVP_PKEY_meth_get0 | 0 |
-| taint.cpp:735:7:735:12 | malloc | (size_t) |  | __libc_malloc | 0 |
-| taint.cpp:735:7:735:12 | malloc | (size_t) |  | __libc_valloc | 0 |
-| taint.cpp:735:7:735:12 | malloc | (size_t) |  | _dl_early_allocate | 0 |
-| taint.cpp:735:7:735:12 | malloc | (size_t) |  | curlx_uztosi | 0 |
-| taint.cpp:735:7:735:12 | malloc | (size_t) |  | curlx_uztosz | 0 |
-| taint.cpp:735:7:735:12 | malloc | (size_t) |  | curlx_uztoui | 0 |
-| taint.cpp:735:7:735:12 | malloc | (size_t) |  | curlx_uztoul | 0 |
-| taint.cpp:735:7:735:12 | malloc | (size_t) |  | malloc | 0 |
-| taint.cpp:735:7:735:12 | malloc | (size_t) |  | ossl_get_extension_type | 0 |
-| taint.cpp:735:7:735:12 | malloc | (size_t) |  | ossl_param_bytes_to_blocks | 0 |
-| taint.cpp:735:7:735:12 | malloc | (size_t) |  | ossl_quic_sstream_new | 0 |
-| taint.cpp:735:7:735:12 | malloc | (size_t) |  | ssl_cert_new | 0 |
-| taint.cpp:735:7:735:12 | malloc | (size_t) |  | support_next_to_fault_allocate | 0 |
-| taint.cpp:735:7:735:12 | malloc | (size_t) |  | support_next_to_fault_allocate_before | 0 |
-| taint.cpp:735:7:735:12 | malloc | (size_t) |  | support_stack_alloc | 0 |
-| taint.cpp:735:7:735:12 | malloc | (size_t) |  | xalloc_sigstack | 0 |
-| taint.cpp:735:7:735:12 | malloc | (unsigned long) |  | BN_num_bits_word | 0 |
-| taint.cpp:735:7:735:12 | malloc | (unsigned long) |  | BUF_MEM_new_ex | 0 |
-| taint.cpp:735:7:735:12 | malloc | (unsigned long) |  | curlx_ultouc | 0 |
-| taint.cpp:735:7:735:12 | malloc | (unsigned long) |  | curlx_ultous | 0 |
-| taint.cpp:735:7:735:12 | malloc | (unsigned long) |  | next_prime | 0 |
-| taint.cpp:736:7:736:13 | realloc | (ASN1_PCTX *,unsigned long) |  | ASN1_PCTX_set_cert_flags | 1 |
-| taint.cpp:736:7:736:13 | realloc | (ASN1_PCTX *,unsigned long) |  | ASN1_PCTX_set_flags | 1 |
-| taint.cpp:736:7:736:13 | realloc | (ASN1_PCTX *,unsigned long) |  | ASN1_PCTX_set_nm_flags | 1 |
-| taint.cpp:736:7:736:13 | realloc | (ASN1_PCTX *,unsigned long) |  | ASN1_PCTX_set_oid_flags | 1 |
-| taint.cpp:736:7:736:13 | realloc | (ASN1_PCTX *,unsigned long) |  | ASN1_PCTX_set_str_flags | 1 |
-| taint.cpp:736:7:736:13 | realloc | (BIGNUM *,unsigned long) |  | BN_add_word | 1 |
-| taint.cpp:736:7:736:13 | realloc | (BIGNUM *,unsigned long) |  | BN_div_word | 1 |
-| taint.cpp:736:7:736:13 | realloc | (BIGNUM *,unsigned long) |  | BN_set_word | 1 |
-| taint.cpp:736:7:736:13 | realloc | (BIGNUM *,unsigned long) |  | BN_sub_word | 1 |
-| taint.cpp:736:7:736:13 | realloc | (BN_BLINDING *,unsigned long) |  | BN_BLINDING_set_flags | 1 |
-| taint.cpp:736:7:736:13 | realloc | (BUF_MEM *,size_t) |  | BUF_MEM_grow | 1 |
-| taint.cpp:736:7:736:13 | realloc | (BUF_MEM *,size_t) |  | BUF_MEM_grow_clean | 1 |
-| taint.cpp:736:7:736:13 | realloc | (CONF_IMODULE *,unsigned long) |  | CONF_imodule_set_flags | 1 |
-| taint.cpp:736:7:736:13 | realloc | (Curl_hash *,size_t) |  | Curl_init_dnscache | 1 |
-| taint.cpp:736:7:736:13 | realloc | (EVP_CIPHER *,unsigned long) |  | EVP_CIPHER_meth_set_flags | 1 |
-| taint.cpp:736:7:736:13 | realloc | (EVP_MD *,unsigned long) |  | EVP_MD_meth_set_flags | 1 |
-| taint.cpp:736:7:736:13 | realloc | (HMAC_CTX *,unsigned long) |  | HMAC_CTX_set_flags | 1 |
-| taint.cpp:736:7:736:13 | realloc | (OPENSSL_INIT_SETTINGS *,unsigned long) |  | OPENSSL_INIT_set_config_file_flags | 1 |
-| taint.cpp:736:7:736:13 | realloc | (OPENSSL_LHASH *,unsigned long) |  | OPENSSL_LH_set_down_load | 1 |
-| taint.cpp:736:7:736:13 | realloc | (OSSL_HPKE_SUITE,size_t) |  | OSSL_HPKE_get_ciphertext_size | 1 |
-| taint.cpp:736:7:736:13 | realloc | (OSSL_HTTP_REQ_CTX *,size_t) |  | OSSL_HTTP_REQ_CTX_set_max_response_hdr_lines | 1 |
-| taint.cpp:736:7:736:13 | realloc | (OSSL_HTTP_REQ_CTX *,unsigned long) |  | OSSL_HTTP_REQ_CTX_set_max_response_length | 1 |
-| taint.cpp:736:7:736:13 | realloc | (OSSL_LIB_CTX *,size_t) |  | ossl_quic_lcidm_new | 1 |
-| taint.cpp:736:7:736:13 | realloc | (OSSL_PARAM *,size_t) |  | OSSL_PARAM_set_size_t | 1 |
-| taint.cpp:736:7:736:13 | realloc | (OSSL_PARAM *,unsigned long) |  | OSSL_PARAM_set_ulong | 1 |
-| taint.cpp:736:7:736:13 | realloc | (OSSL_PQUEUE *,size_t) |  | ossl_pqueue_remove | 1 |
-| taint.cpp:736:7:736:13 | realloc | (OSSL_PROVIDER *,size_t) |  | ossl_provider_set_operation_bit | 1 |
-| taint.cpp:736:7:736:13 | realloc | (OSSL_QTX *,size_t) |  | ossl_qtx_set_mdpl | 1 |
-| taint.cpp:736:7:736:13 | realloc | (OSSL_QUIC_TX_PACKETISER *,size_t) |  | ossl_quic_tx_packetiser_add_unvalidated_credit | 1 |
-| taint.cpp:736:7:736:13 | realloc | (OSSL_QUIC_TX_PACKETISER *,size_t) |  | ossl_quic_tx_packetiser_consume_unvalidated_credit | 1 |
-| taint.cpp:736:7:736:13 | realloc | (OSSL_QUIC_TX_PACKETISER *,size_t) |  | ossl_quic_tx_packetiser_record_received_closing_bytes | 1 |
-| taint.cpp:736:7:736:13 | realloc | (OSSL_RECORD_LAYER *,size_t) |  | tls_set_max_frag_len | 1 |
-| taint.cpp:736:7:736:13 | realloc | (OSSL_RECORD_LAYER *,size_t) |  | tls_set_max_pipelines | 1 |
-| taint.cpp:736:7:736:13 | realloc | (QUIC_RSTREAM *,size_t) |  | ossl_quic_rstream_release_record | 1 |
-| taint.cpp:736:7:736:13 | realloc | (QUIC_RSTREAM *,size_t) |  | ossl_quic_rstream_resize_rbuf | 1 |
-| taint.cpp:736:7:736:13 | realloc | (QUIC_RXFC *,size_t) |  | ossl_quic_rxfc_set_max_window_size | 1 |
-| taint.cpp:736:7:736:13 | realloc | (QUIC_SSTREAM *,size_t) |  | ossl_quic_sstream_set_buffer_size | 1 |
-| taint.cpp:736:7:736:13 | realloc | (QUIC_STREAM_MAP *,size_t) |  | ossl_quic_stream_map_set_rr_stepping | 1 |
-| taint.cpp:736:7:736:13 | realloc | (RAND_POOL *,size_t) |  | ossl_rand_pool_add_begin | 1 |
-| taint.cpp:736:7:736:13 | realloc | (SIPHASH *,size_t) |  | SipHash_set_hash_size | 1 |
-| taint.cpp:736:7:736:13 | realloc | (SSL *,size_t) |  | SSL_set_block_padding | 1 |
-| taint.cpp:736:7:736:13 | realloc | (SSL *,size_t) |  | SSL_set_default_read_buffer_len | 1 |
-| taint.cpp:736:7:736:13 | realloc | (SSL *,size_t) |  | SSL_set_num_tickets | 1 |
-| taint.cpp:736:7:736:13 | realloc | (SSL *,unsigned long) |  | SSL_dane_clear_flags | 1 |
-| taint.cpp:736:7:736:13 | realloc | (SSL *,unsigned long) |  | SSL_dane_set_flags | 1 |
-| taint.cpp:736:7:736:13 | realloc | (SSL_CONNECTION *,unsigned long) |  | tls1_check_ec_tmp_key | 1 |
-| taint.cpp:736:7:736:13 | realloc | (SSL_CTX *,size_t) |  | SSL_CTX_set_block_padding | 1 |
-| taint.cpp:736:7:736:13 | realloc | (SSL_CTX *,size_t) |  | SSL_CTX_set_default_read_buffer_len | 1 |
-| taint.cpp:736:7:736:13 | realloc | (SSL_CTX *,size_t) |  | SSL_CTX_set_num_tickets | 1 |
-| taint.cpp:736:7:736:13 | realloc | (SSL_CTX *,unsigned long) |  | SSL_CTX_dane_clear_flags | 1 |
-| taint.cpp:736:7:736:13 | realloc | (SSL_CTX *,unsigned long) |  | SSL_CTX_dane_set_flags | 1 |
-| taint.cpp:736:7:736:13 | realloc | (WPACKET *,size_t) |  | WPACKET_init_null | 1 |
-| taint.cpp:736:7:736:13 | realloc | (WPACKET *,size_t) |  | WPACKET_set_max_size | 1 |
-| taint.cpp:736:7:736:13 | realloc | (WPACKET *,size_t) |  | WPACKET_start_sub_packet_len__ | 1 |
-| taint.cpp:736:7:736:13 | realloc | (WPACKET *,size_t) |  | ossl_quic_wire_encode_padding | 1 |
-| taint.cpp:736:7:736:13 | realloc | (X509_STORE *,unsigned long) |  | X509_STORE_set_flags | 1 |
-| taint.cpp:736:7:736:13 | realloc | (X509_STORE_CTX *,unsigned long) |  | X509_STORE_CTX_set_flags | 1 |
-| taint.cpp:736:7:736:13 | realloc | (X509_VERIFY_PARAM *,unsigned long) |  | X509_VERIFY_PARAM_clear_flags | 1 |
-| taint.cpp:736:7:736:13 | realloc | (X509_VERIFY_PARAM *,unsigned long) |  | X509_VERIFY_PARAM_set_flags | 1 |
-| taint.cpp:736:7:736:13 | realloc | (__gconv_step *,size_t) |  | __gconv_close_transform | 1 |
-| taint.cpp:736:7:736:13 | realloc | (argp_fmtstream_t,size_t) |  | __argp_fmtstream_set_lmargin | 1 |
-| taint.cpp:736:7:736:13 | realloc | (argp_fmtstream_t,size_t) |  | __argp_fmtstream_set_rmargin | 1 |
-| taint.cpp:736:7:736:13 | realloc | (argp_fmtstream_t,size_t) |  | __argp_fmtstream_set_wmargin | 1 |
-| taint.cpp:736:7:736:13 | realloc | (bufq *,size_t) |  | Curl_bufq_skip | 1 |
-| taint.cpp:736:7:736:13 | realloc | (bufq *,size_t) |  | Curl_bufq_unwrite | 1 |
-| taint.cpp:736:7:736:13 | realloc | (char *,size_t) |  | RAND_file_name | 1 |
-| taint.cpp:736:7:736:13 | realloc | (char *,size_t) |  | __getcwd | 1 |
-| taint.cpp:736:7:736:13 | realloc | (char *,size_t) |  | __gets_chk | 1 |
-| taint.cpp:736:7:736:13 | realloc | (char *,size_t) |  | __getwd_chk | 1 |
-| taint.cpp:736:7:736:13 | realloc | (char *,size_t) |  | plain_method | 1 |
-| taint.cpp:736:7:736:13 | realloc | (const BIGNUM *,unsigned long) |  | BN_mod_word | 1 |
-| taint.cpp:736:7:736:13 | realloc | (const char *,size_t) |  | Curl_getn_scheme_handler | 1 |
-| taint.cpp:736:7:736:13 | realloc | (const char *,size_t) |  | Curl_memdup0 | 1 |
-| taint.cpp:736:7:736:13 | realloc | (const char *,size_t) |  | OPENSSL_strnlen | 1 |
-| taint.cpp:736:7:736:13 | realloc | (const char *,size_t) |  | __nss_module_allocate | 1 |
-| taint.cpp:736:7:736:13 | realloc | (const char *,size_t) |  | __strndup | 1 |
-| taint.cpp:736:7:736:13 | realloc | (const char *,size_t) |  | charmap_hash | 1 |
-| taint.cpp:736:7:736:13 | realloc | (const char *,size_t) |  | locfile_hash | 1 |
-| taint.cpp:736:7:736:13 | realloc | (const char *,size_t) |  | mblen | 1 |
-| taint.cpp:736:7:736:13 | realloc | (const char *,size_t) |  | uv__strndup | 1 |
-| taint.cpp:736:7:736:13 | realloc | (const char *,size_t) |  | xstrndup | 1 |
-| taint.cpp:736:7:736:13 | realloc | (const uint8_t *,size_t) |  | FuzzerTestOneInput | 1 |
-| taint.cpp:736:7:736:13 | realloc | (const uint8_t *,size_t) |  | nghttp2_hd_huff_encode_count | 1 |
-| taint.cpp:736:7:736:13 | realloc | (const uint8_t *,size_t) |  | ossl_ed448_pubkey_verify | 1 |
-| taint.cpp:736:7:736:13 | realloc | (const void *,size_t) |  | Curl_memdup | 1 |
-| taint.cpp:736:7:736:13 | realloc | (const void *,size_t) |  | __nis_hash | 1 |
-| taint.cpp:736:7:736:13 | realloc | (const void *,size_t) |  | __nss_hash | 1 |
-| taint.cpp:736:7:736:13 | realloc | (const void *,size_t) |  | compute_hashval | 1 |
-| taint.cpp:736:7:736:13 | realloc | (const wchar_t *,size_t) |  | __wcsnlen_generic | 1 |
-| taint.cpp:736:7:736:13 | realloc | (const wchar_t *,size_t) |  | wcswidth | 1 |
-| taint.cpp:736:7:736:13 | realloc | (curl_pushheaders *,size_t) |  | curl_pushheader_bynum | 1 |
-| taint.cpp:736:7:736:13 | realloc | (dl_find_object_internal *,size_t) |  | _dlfo_sort_mappings | 1 |
-| taint.cpp:736:7:736:13 | realloc | (dynbuf *,size_t) |  | Curl_dyn_init | 1 |
-| taint.cpp:736:7:736:13 | realloc | (dynbuf *,size_t) |  | Curl_dyn_setlen | 1 |
-| taint.cpp:736:7:736:13 | realloc | (dynbuf *,size_t) |  | Curl_dyn_tail | 1 |
-| taint.cpp:736:7:736:13 | realloc | (dynbuf *,size_t) |  | curlx_dyn_init | 1 |
-| taint.cpp:736:7:736:13 | realloc | (dynbuf *,size_t) |  | curlx_dyn_setlen | 1 |
-| taint.cpp:736:7:736:13 | realloc | (dynbuf *,size_t) |  | curlx_dyn_tail | 1 |
-| taint.cpp:736:7:736:13 | realloc | (dynhds *,size_t) |  | Curl_dynhds_getn | 1 |
-| taint.cpp:736:7:736:13 | realloc | (h1_req_parser *,size_t) |  | Curl_h1_req_parse_init | 1 |
-| taint.cpp:736:7:736:13 | realloc | (hash_table *,unsigned long) |  | init_hash | 1 |
-| taint.cpp:736:7:736:13 | realloc | (int,size_t) |  | ossl_calculate_comp_expansion | 1 |
-| taint.cpp:736:7:736:13 | realloc | (link_map *,size_t) |  | _dl_make_tlsdesc_dynamic | 1 |
-| taint.cpp:736:7:736:13 | realloc | (locale_file *,size_t) |  | init_locale_data | 1 |
-| taint.cpp:736:7:736:13 | realloc | (nghttp2_bufs *,size_t) |  | nghttp2_bufs_realloc | 1 |
-| taint.cpp:736:7:736:13 | realloc | (nghttp2_frame *,size_t) |  | nghttp2_frame_trail_padlen | 1 |
-| taint.cpp:736:7:736:13 | realloc | (nghttp2_hd_context *,size_t) |  | nghttp2_hd_table_get | 1 |
-| taint.cpp:736:7:736:13 | realloc | (nghttp2_hd_deflater **,size_t) |  | nghttp2_hd_deflate_new | 1 |
-| taint.cpp:736:7:736:13 | realloc | (nghttp2_hd_deflater *,size_t) |  | nghttp2_hd_deflate_change_table_size | 1 |
-| taint.cpp:736:7:736:13 | realloc | (nghttp2_hd_deflater *,size_t) |  | nghttp2_hd_deflate_get_table_entry | 1 |
-| taint.cpp:736:7:736:13 | realloc | (nghttp2_hd_inflater *,size_t) |  | nghttp2_hd_inflate_change_table_size | 1 |
-| taint.cpp:736:7:736:13 | realloc | (nghttp2_hd_inflater *,size_t) |  | nghttp2_hd_inflate_get_table_entry | 1 |
-| taint.cpp:736:7:736:13 | realloc | (nghttp2_option *,size_t) |  | nghttp2_option_set_max_continuations | 1 |
-| taint.cpp:736:7:736:13 | realloc | (nghttp2_option *,size_t) |  | nghttp2_option_set_max_deflate_dynamic_table_size | 1 |
-| taint.cpp:736:7:736:13 | realloc | (nghttp2_option *,size_t) |  | nghttp2_option_set_max_outbound_ack | 1 |
-| taint.cpp:736:7:736:13 | realloc | (nghttp2_option *,size_t) |  | nghttp2_option_set_max_send_header_block_length | 1 |
-| taint.cpp:736:7:736:13 | realloc | (nghttp2_option *,size_t) |  | nghttp2_option_set_max_settings | 1 |
-| taint.cpp:736:7:736:13 | realloc | (nghttp2_session *,size_t) |  | nghttp2_session_consume_connection | 1 |
-| taint.cpp:736:7:736:13 | realloc | (nghttp2_session *,size_t) |  | nghttp2_session_update_recv_connection_window_size | 1 |
-| taint.cpp:736:7:736:13 | realloc | (nghttp2_stream *,size_t) |  | nghttp2_http_on_data_chunk | 1 |
-| taint.cpp:736:7:736:13 | realloc | (nss_action *,size_t) |  | __nss_action_allocate | 1 |
-| taint.cpp:736:7:736:13 | realloc | (pthread_attr_t *,size_t) |  | __pthread_attr_setguardsize | 1 |
-| taint.cpp:736:7:736:13 | realloc | (pthread_attr_t *,size_t) |  | __pthread_attr_setstacksize | 1 |
-| taint.cpp:736:7:736:13 | realloc | (size_t,size_t) |  | __libc_memalign | 1 |
-| taint.cpp:736:7:736:13 | realloc | (size_t,size_t) |  | aligned_alloc | 1 |
-| taint.cpp:736:7:736:13 | realloc | (u_long,unsigned long) |  | __p_option | 1 |
-| taint.cpp:736:7:736:13 | realloc | (uint8_t *,size_t) |  | nghttp2_downcase | 1 |
-| taint.cpp:736:7:736:13 | realloc | (uint8_t *,size_t) |  | ossl_fnv1a_hash | 1 |
-| taint.cpp:736:7:736:13 | realloc | (void *,size_t) |  | JimDefaultAllocator | 0 |
-| taint.cpp:736:7:736:13 | realloc | (void *,size_t) |  | JimDefaultAllocator | 1 |
-| taint.cpp:736:7:736:13 | realloc | (void *,size_t) |  | __arc4random_buf | 0 |
-| taint.cpp:736:7:736:13 | realloc | (void *,size_t) |  | __arc4random_buf | 1 |
-| taint.cpp:736:7:736:13 | realloc | (void *,size_t) |  | __libc_realloc | 0 |
-| taint.cpp:736:7:736:13 | realloc | (void *,size_t) |  | __libc_realloc | 1 |
-| taint.cpp:736:7:736:13 | realloc | (void *,size_t) |  | __minimal_realloc | 0 |
-| taint.cpp:736:7:736:13 | realloc | (void *,size_t) |  | __minimal_realloc | 1 |
-| taint.cpp:736:7:736:13 | realloc | (void *,size_t) |  | getentropy | 0 |
-| taint.cpp:736:7:736:13 | realloc | (void *,size_t) |  | getentropy | 1 |
-| taint.cpp:736:7:736:13 | realloc | (void *,size_t) |  | uv__random_devurandom | 0 |
-| taint.cpp:736:7:736:13 | realloc | (void *,size_t) |  | uv__random_devurandom | 1 |
-| taint.cpp:736:7:736:13 | realloc | (void *,size_t) |  | uv__random_getrandom | 0 |
-| taint.cpp:736:7:736:13 | realloc | (void *,size_t) |  | uv__random_getrandom | 1 |
-| taint.cpp:736:7:736:13 | realloc | (void *,size_t) |  | xrealloc | 0 |
-| taint.cpp:736:7:736:13 | realloc | (void *,size_t) |  | xrealloc | 1 |
-| taint.cpp:758:5:758:11 | sprintf | (CURLSH *,CURLSHoption,...) |  | curl_share_setopt | 2 |
-| taint.cpp:758:5:758:11 | sprintf | (Jim_Interp *,const char *,...) |  | Jim_SetResultFormatted | 1 |
-| taint.cpp:758:5:758:11 | sprintf | (Jim_Interp *,const char *,...) |  | Jim_SetResultFormatted | 2 |
-| taint.cpp:758:5:758:11 | sprintf | (char **,const char *,...) |  | ___asprintf | 1 |
-| taint.cpp:758:5:758:11 | sprintf | (char **,const char *,...) |  | ___asprintf | 2 |
-| taint.cpp:758:5:758:11 | sprintf | (curl_httppost **,curl_httppost **,...) |  | curl_formadd | 2 |
-| taint.cpp:760:6:760:23 | call_sprintf_twice | (ARGS *,char *) |  | chopup_args | 1 |
-| taint.cpp:760:6:760:23 | call_sprintf_twice | (BIO *,char *) |  | BIO_set_callback_arg | 1 |
-| taint.cpp:760:6:760:23 | call_sprintf_twice | (SRP_VBASE *,char *) |  | SRP_VBASE_get1_by_user | 1 |
-| taint.cpp:760:6:760:23 | call_sprintf_twice | (SRP_VBASE *,char *) |  | SRP_VBASE_get_by_user | 1 |
-| taint.cpp:760:6:760:23 | call_sprintf_twice | (SSL_CTX *,char *) |  | SSL_CTX_set_srp_password | 1 |
-| taint.cpp:760:6:760:23 | call_sprintf_twice | (SSL_CTX *,char *) |  | SSL_CTX_set_srp_username | 1 |
-| taint.cpp:760:6:760:23 | call_sprintf_twice | (XDR *,char *) |  | xdr_char | 1 |
-| taint.cpp:760:6:760:23 | call_sprintf_twice | (char *,char *) |  | passwd2des_internal | 0 |
-| taint.cpp:760:6:760:23 | call_sprintf_twice | (char *,char *) |  | passwd2des_internal | 1 |
-| taint.cpp:760:6:760:23 | call_sprintf_twice | (char *,char *) |  | xdecrypt | 0 |
-| taint.cpp:760:6:760:23 | call_sprintf_twice | (char *,char *) |  | xdecrypt | 1 |
-| taint.cpp:760:6:760:23 | call_sprintf_twice | (char *,char *) |  | xencrypt | 0 |
-| taint.cpp:760:6:760:23 | call_sprintf_twice | (char *,char *) |  | xencrypt | 1 |
-| taint.cpp:760:6:760:23 | call_sprintf_twice | (const char *,char *) |  | __old_realpath | 1 |
-| taint.cpp:760:6:760:23 | call_sprintf_twice | (const char *,char *) |  | __realpath | 1 |
-| taint.cpp:760:6:760:23 | call_sprintf_twice | (const char *,char *) |  | sha1sum_file | 1 |
-| taint.cpp:760:6:760:23 | call_sprintf_twice | (const char *,char *) |  | sha3sum_file | 1 |
-| taint.cpp:760:6:760:23 | call_sprintf_twice | (const ether_addr *,char *) |  | ether_ntoa_r | 1 |
-| taint.cpp:760:6:760:23 | call_sprintf_twice | (const tm *,char *) |  | __asctime_r | 1 |
-| taint.cpp:760:6:760:23 | call_sprintf_twice | (curl_slist *,char *) |  | Curl_slist_append_nodup | 1 |
-| taint.cpp:760:6:760:23 | call_sprintf_twice | (unsigned long,char *) |  | ERR_error_string | 1 |
-| taint.cpp:782:7:782:11 | fopen | (ASN1_GENERALIZEDTIME *,const char *) |  | ASN1_GENERALIZEDTIME_set_string | 1 |
-| taint.cpp:782:7:782:11 | fopen | (ASN1_TIME *,const char *) |  | ASN1_TIME_set_string | 1 |
-| taint.cpp:782:7:782:11 | fopen | (ASN1_TIME *,const char *) |  | ASN1_TIME_set_string_X509 | 1 |
-| taint.cpp:782:7:782:11 | fopen | (ASN1_UTCTIME *,const char *) |  | ASN1_UTCTIME_set_string | 1 |
-| taint.cpp:782:7:782:11 | fopen | (BIGNUM **,const char *) |  | BN_asc2bn | 1 |
-| taint.cpp:782:7:782:11 | fopen | (BIGNUM **,const char *) |  | BN_dec2bn | 1 |
-| taint.cpp:782:7:782:11 | fopen | (BIGNUM **,const char *) |  | BN_hex2bn | 1 |
-| taint.cpp:782:7:782:11 | fopen | (CONF *,const char *) |  | TS_CONF_get_tsa_section | 1 |
-| taint.cpp:782:7:782:11 | fopen | (CONF *,const char *) |  | _CONF_new_section | 1 |
-| taint.cpp:782:7:782:11 | fopen | (CURLU *,const char *) |  | Curl_url_set_authority | 1 |
-| taint.cpp:782:7:782:11 | fopen | (Curl_easy *,const char *) |  | Curl_cwriter_get_by_name | 1 |
-| taint.cpp:782:7:782:11 | fopen | (Curl_easy *,const char *) |  | Curl_rtsp_parseheader | 1 |
-| taint.cpp:782:7:782:11 | fopen | (DH_METHOD *,const char *) |  | DH_meth_set1_name | 1 |
-| taint.cpp:782:7:782:11 | fopen | (DSA_METHOD *,const char *) |  | DSA_meth_set1_name | 1 |
-| taint.cpp:782:7:782:11 | fopen | (DSO *,const char *) |  | DSO_convert_filename | 1 |
-| taint.cpp:782:7:782:11 | fopen | (DSO *,const char *) |  | DSO_set_filename | 1 |
-| taint.cpp:782:7:782:11 | fopen | (ENGINE *,const char *) |  | ENGINE_set_id | 1 |
-| taint.cpp:782:7:782:11 | fopen | (ENGINE *,const char *) |  | ENGINE_set_name | 1 |
-| taint.cpp:782:7:782:11 | fopen | (ENGINE *,const char *) |  | OSSL_STORE_LOADER_new | 1 |
-| taint.cpp:782:7:782:11 | fopen | (EVP_PKEY *,const char *) |  | CTLOG_new | 1 |
-| taint.cpp:782:7:782:11 | fopen | (EVP_PKEY_CTX *,const char *) |  | app_paramgen | 1 |
-| taint.cpp:782:7:782:11 | fopen | (EVP_PKEY_CTX *,const char *) |  | pkey_ctrl_string | 1 |
-| taint.cpp:782:7:782:11 | fopen | (GlobalConfig *,const char *) |  | setvariable | 1 |
-| taint.cpp:782:7:782:11 | fopen | (Jim_Interp *,const char *) |  | Jim_Eval | 1 |
-| taint.cpp:782:7:782:11 | fopen | (Jim_Interp *,const char *) |  | Jim_EvalFile | 1 |
-| taint.cpp:782:7:782:11 | fopen | (Jim_Interp *,const char *) |  | Jim_EvalFileGlobal | 1 |
-| taint.cpp:782:7:782:11 | fopen | (Jim_Interp *,const char *) |  | Jim_EvalGlobal | 1 |
-| taint.cpp:782:7:782:11 | fopen | (LIBSSH2_AGENT *,const char *) |  | libssh2_agent_set_identity_path | 1 |
-| taint.cpp:782:7:782:11 | fopen | (LIBSSH2_SESSION *,const char *) |  | libssh2_banner_set | 1 |
-| taint.cpp:782:7:782:11 | fopen | (LIBSSH2_SESSION *,const char *) |  | libssh2_session_banner_set | 1 |
-| taint.cpp:782:7:782:11 | fopen | (Lmid_t,const char *) |  | _dl_lookup_map | 1 |
-| taint.cpp:782:7:782:11 | fopen | (OPENSSL_DIR_CTX **,const char *) |  | OPENSSL_DIR_read | 1 |
-| taint.cpp:782:7:782:11 | fopen | (OPENSSL_INIT_SETTINGS *,const char *) |  | OPENSSL_INIT_set_config_appname | 1 |
-| taint.cpp:782:7:782:11 | fopen | (OPENSSL_INIT_SETTINGS *,const char *) |  | OPENSSL_INIT_set_config_filename | 1 |
-| taint.cpp:782:7:782:11 | fopen | (OSSL_CMP_CTX *,const char *) |  | OSSL_CMP_CTX_set1_no_proxy | 1 |
-| taint.cpp:782:7:782:11 | fopen | (OSSL_CMP_CTX *,const char *) |  | OSSL_CMP_CTX_set1_proxy | 1 |
-| taint.cpp:782:7:782:11 | fopen | (OSSL_CMP_CTX *,const char *) |  | OSSL_CMP_CTX_set1_server | 1 |
-| taint.cpp:782:7:782:11 | fopen | (OSSL_CMP_CTX *,const char *) |  | OSSL_CMP_CTX_set1_serverPath | 1 |
-| taint.cpp:782:7:782:11 | fopen | (OSSL_DECODER_CTX *,const char *) |  | OSSL_DECODER_CTX_set_input_structure | 1 |
-| taint.cpp:782:7:782:11 | fopen | (OSSL_DECODER_CTX *,const char *) |  | OSSL_DECODER_CTX_set_input_type | 1 |
-| taint.cpp:782:7:782:11 | fopen | (OSSL_ENCODER_CTX *,const char *) |  | OSSL_ENCODER_CTX_set_output_structure | 1 |
-| taint.cpp:782:7:782:11 | fopen | (OSSL_ENCODER_CTX *,const char *) |  | OSSL_ENCODER_CTX_set_output_type | 1 |
-| taint.cpp:782:7:782:11 | fopen | (OSSL_JSON_ENC *,const char *) |  | ossl_json_key | 1 |
-| taint.cpp:782:7:782:11 | fopen | (OSSL_JSON_ENC *,const char *) |  | ossl_json_str | 1 |
-| taint.cpp:782:7:782:11 | fopen | (OSSL_LIB_CTX *,const char *) |  | CMS_ContentInfo_new_ex | 1 |
-| taint.cpp:782:7:782:11 | fopen | (OSSL_LIB_CTX *,const char *) |  | CTLOG_STORE_new_ex | 1 |
-| taint.cpp:782:7:782:11 | fopen | (OSSL_LIB_CTX *,const char *) |  | CT_POLICY_EVAL_CTX_new_ex | 1 |
-| taint.cpp:782:7:782:11 | fopen | (OSSL_LIB_CTX *,const char *) |  | EC_KEY_new_ex | 1 |
-| taint.cpp:782:7:782:11 | fopen | (OSSL_LIB_CTX *,const char *) |  | OSSL_CMP_CTX_new | 1 |
-| taint.cpp:782:7:782:11 | fopen | (OSSL_LIB_CTX *,const char *) |  | OSSL_CMP_MSG_new | 1 |
-| taint.cpp:782:7:782:11 | fopen | (OSSL_LIB_CTX *,const char *) |  | OSSL_CMP_SRV_CTX_new | 1 |
-| taint.cpp:782:7:782:11 | fopen | (OSSL_LIB_CTX *,const char *) |  | OSSL_PROVIDER_load | 1 |
-| taint.cpp:782:7:782:11 | fopen | (OSSL_LIB_CTX *,const char *) |  | PKCS7_new_ex | 1 |
-| taint.cpp:782:7:782:11 | fopen | (OSSL_LIB_CTX *,const char *) |  | SCT_CTX_new | 1 |
-| taint.cpp:782:7:782:11 | fopen | (OSSL_LIB_CTX *,const char *) |  | TS_RESP_CTX_new_ex | 1 |
-| taint.cpp:782:7:782:11 | fopen | (OSSL_LIB_CTX *,const char *) |  | X509_CRL_new_ex | 1 |
-| taint.cpp:782:7:782:11 | fopen | (OSSL_LIB_CTX *,const char *) |  | X509_PUBKEY_new_ex | 1 |
-| taint.cpp:782:7:782:11 | fopen | (OSSL_LIB_CTX *,const char *) |  | X509_REQ_new_ex | 1 |
-| taint.cpp:782:7:782:11 | fopen | (OSSL_LIB_CTX *,const char *) |  | X509_STORE_CTX_new_ex | 1 |
-| taint.cpp:782:7:782:11 | fopen | (OSSL_LIB_CTX *,const char *) |  | X509_new_ex | 1 |
-| taint.cpp:782:7:782:11 | fopen | (OSSL_LIB_CTX *,const char *) |  | ossl_cmp_mock_srv_new | 1 |
-| taint.cpp:782:7:782:11 | fopen | (OSSL_LIB_CTX *,const char *) |  | ossl_cms_Data_create | 1 |
-| taint.cpp:782:7:782:11 | fopen | (OSSL_LIB_CTX *,const char *) |  | ossl_parse_property | 1 |
-| taint.cpp:782:7:782:11 | fopen | (OSSL_PARAM *,const char *) |  | OSSL_PARAM_locate | 1 |
-| taint.cpp:782:7:782:11 | fopen | (OSSL_PARAM *,const char *) |  | OSSL_PARAM_set_utf8_ptr | 1 |
-| taint.cpp:782:7:782:11 | fopen | (OSSL_PARAM *,const char *) |  | OSSL_PARAM_set_utf8_string | 1 |
-| taint.cpp:782:7:782:11 | fopen | (OSSL_PROVIDER *,const char *) |  | ossl_provider_set_module_path | 1 |
-| taint.cpp:782:7:782:11 | fopen | (PKCS7 *,const char *) |  | ossl_pkcs7_set1_propq | 1 |
-| taint.cpp:782:7:782:11 | fopen | (RSA_METHOD *,const char *) |  | RSA_meth_set1_name | 1 |
-| taint.cpp:782:7:782:11 | fopen | (SSL *,const char *) |  | SSL_add1_host | 1 |
-| taint.cpp:782:7:782:11 | fopen | (SSL *,const char *) |  | SSL_set1_host | 1 |
-| taint.cpp:782:7:782:11 | fopen | (SSL *,const char *) |  | SSL_set_cipher_list | 1 |
-| taint.cpp:782:7:782:11 | fopen | (SSL *,const char *) |  | SSL_use_psk_identity_hint | 1 |
-| taint.cpp:782:7:782:11 | fopen | (SSL_CONF_CTX *,const char *) |  | SSL_CONF_CTX_set1_prefix | 1 |
-| taint.cpp:782:7:782:11 | fopen | (SSL_CONF_CTX *,const char *) |  | SSL_CONF_cmd_value_type | 1 |
-| taint.cpp:782:7:782:11 | fopen | (SSL_CTX *,const char *) |  | SSL_CTX_set_cipher_list | 1 |
-| taint.cpp:782:7:782:11 | fopen | (SSL_CTX *,const char *) |  | SSL_CTX_use_psk_identity_hint | 1 |
-| taint.cpp:782:7:782:11 | fopen | (SSL_CTX *,const char *) |  | ossl_quic_set_diag_title | 1 |
-| taint.cpp:782:7:782:11 | fopen | (SSL_SESSION *,const char *) |  | SSL_SESSION_set1_hostname | 1 |
-| taint.cpp:782:7:782:11 | fopen | (UI *,const char *) |  | UI_add_error_string | 1 |
-| taint.cpp:782:7:782:11 | fopen | (UI *,const char *) |  | UI_add_info_string | 1 |
-| taint.cpp:782:7:782:11 | fopen | (UI *,const char *) |  | UI_dup_error_string | 1 |
-| taint.cpp:782:7:782:11 | fopen | (UI *,const char *) |  | UI_dup_info_string | 1 |
-| taint.cpp:782:7:782:11 | fopen | (X509 *,const char *) |  | x509_ctrl_string | 1 |
-| taint.cpp:782:7:782:11 | fopen | (X509_REQ *,const char *) |  | x509_req_ctrl_string | 1 |
-| taint.cpp:782:7:782:11 | fopen | (X509_VERIFY_PARAM *,const char *) |  | X509_VERIFY_PARAM_set1_ip_asc | 1 |
-| taint.cpp:782:7:782:11 | fopen | (X509_VERIFY_PARAM *,const char *) |  | X509_VERIFY_PARAM_set1_name | 1 |
-| taint.cpp:782:7:782:11 | fopen | (__printf_buffer *,const char *) |  | __printf_buffer_puts_1 | 1 |
-| taint.cpp:782:7:782:11 | fopen | (alloc_buffer,const char *) |  | __libc_alloc_buffer_copy_string | 1 |
-| taint.cpp:782:7:782:11 | fopen | (argp_fmtstream_t,const char *) |  | __argp_fmtstream_puts | 1 |
-| taint.cpp:782:7:782:11 | fopen | (char **,const char *) |  | Curl_setstropt | 1 |
-| taint.cpp:782:7:782:11 | fopen | (char **,const char *) |  | __strsep | 1 |
-| taint.cpp:782:7:782:11 | fopen | (char *,const char *) |  | xstrdup | 1 |
-| taint.cpp:782:7:782:11 | fopen | (const OSSL_PARAM *,const char *) |  | OSSL_PARAM_locate_const | 1 |
-| taint.cpp:782:7:782:11 | fopen | (const char **,const char *) |  | uv__utf8_decode1 | 1 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | Configcmp | 0 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | Configcmp | 1 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | Curl_timestrcmp | 0 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | Curl_timestrcmp | 1 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | DES_crypt | 0 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | DES_crypt | 1 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | OPENSSL_strcasecmp | 0 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | OPENSSL_strcasecmp | 1 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | __bind_textdomain_codeset | 0 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | __bind_textdomain_codeset | 1 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | __bindtextdomain | 0 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | __bindtextdomain | 1 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | __dgettext | 0 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | __dgettext | 1 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | __gconv_compare_alias | 0 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | __gconv_compare_alias | 1 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | __strcasestr | 0 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | __strcasestr | 1 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | __strcspn_generic | 0 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | __strcspn_generic | 1 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | __strcspn_sse42 | 0 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | __strcspn_sse42 | 1 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | __strpbrk_generic | 0 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | __strpbrk_generic | 1 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | __strpbrk_sse42 | 0 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | __strpbrk_sse42 | 1 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | __strspn_generic | 0 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | __strspn_generic | 1 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | __strspn_sse42 | 0 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | __strspn_sse42 | 1 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | __strstr_generic | 0 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | __strstr_generic | 1 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | __strverscmp | 0 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | __strverscmp | 1 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | _dl_cache_libcmp | 0 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | _dl_cache_libcmp | 1 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | advance | 0 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | advance | 1 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | c_strcasecmp | 0 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | c_strcasecmp | 1 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | charmap_aliases | 0 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | charmap_aliases | 1 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | charmap_open | 0 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | charmap_open | 1 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | chroot_canon | 0 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | chroot_canon | 1 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | get_passwd | 0 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | get_passwd | 1 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | gzopen | 0 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | gzopen | 1 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | gzopen64 | 0 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | gzopen64 | 1 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | iconv_open | 0 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | iconv_open | 1 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | openssl_fopen | 0 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | openssl_fopen | 1 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | ossl_pem_check_suffix | 0 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | ossl_pem_check_suffix | 1 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | ossl_v3_name_cmp | 0 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | ossl_v3_name_cmp | 1 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | sqlite3_strglob | 0 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | sqlite3_strglob | 1 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | sqlite3_stricmp | 0 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | sqlite3_stricmp | 1 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | step | 0 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | step | 1 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | tempnam | 0 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | tempnam | 1 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | xfopen | 0 |
-| taint.cpp:782:7:782:11 | fopen | (const char *,const char *) |  | xfopen | 1 |
-| taint.cpp:782:7:782:11 | fopen | (const mntent *,const char *) |  | __hasmntopt | 1 |
-| taint.cpp:782:7:782:11 | fopen | (const nis_error,const char *) |  | nis_sperror | 1 |
-| taint.cpp:782:7:782:11 | fopen | (curl_mimepart *,const char *) |  | curl_mime_filedata | 1 |
-| taint.cpp:782:7:782:11 | fopen | (curl_off_t *,const char *) |  | str2offset | 1 |
-| taint.cpp:782:7:782:11 | fopen | (curl_pushheaders *,const char *) |  | curl_pushheader_byname | 1 |
-| taint.cpp:782:7:782:11 | fopen | (curl_slist **,const char *) |  | add2list | 1 |
-| taint.cpp:782:7:782:11 | fopen | (curl_slist *,const char *) |  | curl_slist_append | 1 |
-| taint.cpp:782:7:782:11 | fopen | (dynbuf *,const char *) |  | Curl_dyn_add | 1 |
-| taint.cpp:782:7:782:11 | fopen | (dynbuf *,const char *) |  | curlx_dyn_add | 1 |
-| taint.cpp:782:7:782:11 | fopen | (dynhds *,const char *) |  | Curl_dynhds_cget | 1 |
-| taint.cpp:782:7:782:11 | fopen | (dynhds *,const char *) |  | Curl_dynhds_h1_cadd_line | 1 |
-| taint.cpp:782:7:782:11 | fopen | (gconv_fcts *,const char *) |  | __wcsmbs_named_conv | 1 |
-| taint.cpp:782:7:782:11 | fopen | (gzFile,const char *) |  | gzputs | 1 |
-| taint.cpp:782:7:782:11 | fopen | (int,const char *) |  | BIO_meth_new | 1 |
-| taint.cpp:782:7:782:11 | fopen | (int,const char *) |  | _IO_new_fdopen | 1 |
-| taint.cpp:782:7:782:11 | fopen | (int,const char *) |  | gzdopen | 1 |
-| taint.cpp:782:7:782:11 | fopen | (int,const char *) |  | setlocale | 1 |
-| taint.cpp:782:7:782:11 | fopen | (int,const char *) |  | xsetlocale | 1 |
-| taint.cpp:782:7:782:11 | fopen | (lemon *,const char *) |  | file_makename | 1 |
-| taint.cpp:782:7:782:11 | fopen | (long *,const char *) |  | secs2ms | 1 |
-| taint.cpp:782:7:782:11 | fopen | (long *,const char *) |  | str2num | 1 |
-| taint.cpp:782:7:782:11 | fopen | (long *,const char *) |  | str2unum | 1 |
-| taint.cpp:782:7:782:11 | fopen | (nss_module *,const char *) |  | __nss_module_get_function | 1 |
-| taint.cpp:782:7:782:11 | fopen | (size_t *,const char *) |  | next_protos_parse | 1 |
-| taint.cpp:782:7:782:11 | fopen | (slist_wc **,const char *) |  | easysrc_add | 1 |
-| taint.cpp:782:7:782:11 | fopen | (slist_wc *,const char *) |  | slist_wc_append | 1 |
-| taint.cpp:782:7:782:11 | fopen | (sockaddr_un *,const char *) |  | __sockaddr_un_set | 1 |
-| taint.cpp:782:7:782:11 | fopen | (sqlite3 *,const char *) |  | sqlite3_declare_vtab | 1 |
-| taint.cpp:782:7:782:11 | fopen | (sqlite3 *,const char *) |  | sqlite3_get_clientdata | 1 |
-| taint.cpp:782:7:782:11 | fopen | (sqlite3 *,const char *) |  | sqlite3_wal_checkpoint | 1 |
-| taint.cpp:782:7:782:11 | fopen | (sqlite3_intck *,const char *) |  | sqlite3_intck_test_sql | 1 |
-| taint.cpp:782:7:782:11 | fopen | (sqlite3_stmt *,const char *) |  | sqlite3_bind_parameter_index | 1 |
-| taint.cpp:782:7:782:11 | fopen | (sqlite3_str *,const char *) |  | sqlite3_str_appendall | 1 |
-| taint.cpp:782:7:782:11 | fopen | (sqlite3_value *,const char *) |  | sqlite3_value_pointer | 1 |
-| taint.cpp:782:7:782:11 | fopen | (stringtable *,const char *) |  | stringtable_add | 1 |
-| taint.cpp:782:7:782:11 | fopen | (unsigned char *,const char *) |  | ossl_a2i_ipadd | 1 |
-| taint.cpp:782:7:782:11 | fopen | (unsigned long *,const char *) |  | set_cert_ex | 1 |
-| taint.cpp:782:7:782:11 | fopen | (unsigned long *,const char *) |  | set_name_ex | 1 |
-| taint.cpp:782:7:782:11 | fopen | (uv_pipe_t *,const char *) |  | uv_pipe_bind | 1 |
-| taint.cpp:783:5:783:11 | fopen_s | (CTLOG **,const char *,const char *) |  | CTLOG_new_from_base64 | 1 |
-| taint.cpp:783:5:783:11 | fopen_s | (CTLOG **,const char *,const char *) |  | CTLOG_new_from_base64 | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (CURL *,char **,const char *) |  | add_file_name_to_url | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (ENGINE *,const char *,const char *) |  | make_engine_uri | 1 |
-| taint.cpp:783:5:783:11 | fopen_s | (ENGINE *,const char *,const char *) |  | make_engine_uri | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (EVP_PKEY_CTX *,const char *,const char *) |  | EVP_PKEY_CTX_ctrl_str | 1 |
-| taint.cpp:783:5:783:11 | fopen_s | (EVP_PKEY_CTX *,const char *,const char *) |  | EVP_PKEY_CTX_ctrl_str | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (FFC_PARAMS *,const char *,const char *) |  | ossl_ffc_set_digest | 1 |
-| taint.cpp:783:5:783:11 | fopen_s | (FFC_PARAMS *,const char *,const char *) |  | ossl_ffc_set_digest | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (FILE *,const char *,const char *) |  | _IO_new_proc_open | 1 |
-| taint.cpp:783:5:783:11 | fopen_s | (FILE *,const char *,const char *) |  | _IO_new_proc_open | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (GlobalConfig *,char **,const char *) |  | get_url_file_name | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (Jim_Interp *,Jim_Obj *,const char *) |  | Jim_CompareStringImmediate | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (Jim_Interp *,const char *,const char *) |  | Jim_SetVariableStrWithStr | 1 |
-| taint.cpp:783:5:783:11 | fopen_s | (Jim_Interp *,const char *,const char *) |  | Jim_SetVariableStrWithStr | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (LIBSSH2_SESSION *,int,const char *) |  | _libssh2_error | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (LIBSSH2_SESSION *,int,const char *) |  | libssh2_session_set_last_error | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (OSSL_CMP_MSG *,OSSL_LIB_CTX *,const char *) |  | ossl_cmp_msg_set0_libctx | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (OSSL_DECODER *,void *,const char *) |  | ossl_decoder_instance_new_forprov | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (OSSL_LIB_CTX *,EVP_PKEY *,const char *) |  | EVP_PKEY_CTX_new_from_pkey | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (OSSL_LIB_CTX *,const char *,const char *) |  | EVP_PKEY_CTX_new_from_name | 1 |
-| taint.cpp:783:5:783:11 | fopen_s | (OSSL_LIB_CTX *,const char *,const char *) |  | EVP_PKEY_CTX_new_from_name | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (OSSL_LIB_CTX *,const char *,const char *) |  | ossl_slh_dsa_key_new | 1 |
-| taint.cpp:783:5:783:11 | fopen_s | (OSSL_LIB_CTX *,const char *,const char *) |  | ossl_slh_dsa_key_new | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (OSSL_NAMEMAP *,int,const char *) |  | ossl_namemap_add_name | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (PROV_CTX *,const char *,const char *) |  | ossl_prov_ctx_get_param | 1 |
-| taint.cpp:783:5:783:11 | fopen_s | (PROV_CTX *,const char *,const char *) |  | ossl_prov_ctx_get_param | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (SRP_user_pwd *,const char *,const char *) |  | SRP_user_pwd_set1_ids | 1 |
-| taint.cpp:783:5:783:11 | fopen_s | (SRP_user_pwd *,const char *,const char *) |  | SRP_user_pwd_set1_ids | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (SSL_CONF_CTX *,const char *,const char *) |  | SSL_CONF_cmd | 1 |
-| taint.cpp:783:5:783:11 | fopen_s | (SSL_CONF_CTX *,const char *,const char *) |  | SSL_CONF_cmd | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (UI *,UI_STRING *,const char *) |  | UI_set_result | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (UI *,const char *,const char *) |  | UI_construct_prompt | 1 |
-| taint.cpp:783:5:783:11 | fopen_s | (UI *,const char *,const char *) |  | UI_construct_prompt | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (X509 *,OSSL_LIB_CTX *,const char *) |  | ossl_x509_set0_libctx | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (X509V3_EXT_METHOD *,X509V3_CTX *,const char *) |  | s2i_ASN1_IA5STRING | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (X509V3_EXT_METHOD *,X509V3_CTX *,const char *) |  | s2i_ASN1_UTF8STRING | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (X509_CRL *,OSSL_LIB_CTX *,const char *) |  | ossl_x509_crl_set0_libctx | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (X509_REQ *,OSSL_LIB_CTX *,const char *) |  | ossl_x509_req_set0_libctx | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (char **,size_t *,const char *) |  | envz_remove | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (char[256],const char *,const char *) |  | host2netname | 1 |
-| taint.cpp:783:5:783:11 | fopen_s | (char[256],const char *,const char *) |  | host2netname | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (char[256],const uid_t,const char *) |  | user2netname | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (const ASN1_ITEM *,OSSL_LIB_CTX *,const char *) |  | ASN1_item_new_ex | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (const EVP_CIPHER *,OSSL_LIB_CTX *,const char *) |  | CMS_AuthEnvelopedData_create_ex | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (const EVP_CIPHER *,OSSL_LIB_CTX *,const char *) |  | CMS_EnvelopedData_create_ex | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (const EVP_MD *,OSSL_LIB_CTX *,const char *) |  | ossl_cms_DigestedData_create | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (const OSSL_PARAM[],OSSL_LIB_CTX *,const char *) |  | EC_GROUP_new_from_params | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (const OSSL_PROPERTY_LIST *,OSSL_LIB_CTX *,const char *) |  | ossl_property_find_property | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (const PKCS8_PRIV_KEY_INFO *,OSSL_LIB_CTX *,const char *) |  | EVP_PKCS82PKEY_ex | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (const PKCS8_PRIV_KEY_INFO *,OSSL_LIB_CTX *,const char *) |  | ossl_ec_key_from_pkcs8 | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (const PKCS8_PRIV_KEY_INFO *,OSSL_LIB_CTX *,const char *) |  | ossl_ecx_key_from_pkcs8 | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (const PKCS8_PRIV_KEY_INFO *,OSSL_LIB_CTX *,const char *) |  | ossl_rsa_key_from_pkcs8 | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (const PKCS12_SAFEBAG *,OSSL_LIB_CTX *,const char *) |  | PKCS12_SAFEBAG_get1_cert_ex | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (const PKCS12_SAFEBAG *,OSSL_LIB_CTX *,const char *) |  | PKCS12_SAFEBAG_get1_crl_ex | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (const QUIC_TSERVER_ARGS *,const char *,const char *) |  | ossl_quic_tserver_new | 1 |
-| taint.cpp:783:5:783:11 | fopen_s | (const QUIC_TSERVER_ARGS *,const char *,const char *) |  | ossl_quic_tserver_new | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (const X509_ALGOR *,OSSL_LIB_CTX *,const char *) |  | ossl_ec_key_param_from_x509_algor | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (const char **,char **,const char *) |  | Curl_get_pathname | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (const char *,OSSL_LIB_CTX *,const char *) |  | OSSL_CMP_MSG_read | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (const char *,size_t,const char *) |  | __argz_next | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (const char *,size_t,const char *) |  | argz_next | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (const char *,size_t,const char *) |  | envz_entry | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (const char *,size_t,const char *) |  | envz_get | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (const char *,sqlite3_filename,const char *) |  | sqlite3_uri_parameter | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (dl_exception *,const char *,const char *) |  | _dl_exception_create | 1 |
-| taint.cpp:783:5:783:11 | fopen_s | (dl_exception *,const char *,const char *) |  | _dl_exception_create | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (dynhds *,const char *,const char *) |  | Curl_dynhds_cadd | 1 |
-| taint.cpp:783:5:783:11 | fopen_s | (dynhds *,const char *,const char *) |  | Curl_dynhds_cadd | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (gconv_spec *,const char *,const char *) |  | __gconv_create_spec | 1 |
-| taint.cpp:783:5:783:11 | fopen_s | (gconv_spec *,const char *,const char *) |  | __gconv_create_spec | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (gz_statep,int,const char *) |  | gz_error | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (http_resp **,int,const char *) |  | Curl_http_resp_make | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (int,OSSL_LIB_CTX *,const char *) |  | PKCS12_init_ex | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (int,char *const *,const char *) |  | __posix_getopt | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (int,char *const *,const char *) |  | getopt | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (int,dl_exception *,const char *) |  | _dl_signal_cexception | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (int,dl_exception *,const char *) |  | _dl_signal_exception | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (int,int,const char *) |  | OSSL_CMP_STATUSINFO_new | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (lemon *,const char *,const char *) |  | file_open | 1 |
-| taint.cpp:783:5:783:11 | fopen_s | (lemon *,const char *,const char *) |  | file_open | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (locale_t,const char *,const char *) |  | __translated_number_width | 1 |
-| taint.cpp:783:5:783:11 | fopen_s | (locale_t,const char *,const char *) |  | __translated_number_width | 2 |
-| taint.cpp:783:5:783:11 | fopen_s | (sqlite3 *,const char *,const char *) |  | sqlite3_recover_init | 1 |
-| taint.cpp:783:5:783:11 | fopen_s | (sqlite3 *,const char *,const char *) |  | sqlite3_recover_init | 2 |
-| taint.cpp:785:6:785:15 | fopen_test | (char *) |  | SRP_VBASE_new | 0 |
-| taint.cpp:785:6:785:15 | fopen_test | (char *) |  | _IO_gets | 0 |
-| taint.cpp:785:6:785:15 | fopen_test | (char *) |  | __mktemp | 0 |
-| taint.cpp:785:6:785:15 | fopen_test | (char *) |  | __nis_default_group | 0 |
-| taint.cpp:785:6:785:15 | fopen_test | (char *) |  | __nis_default_owner | 0 |
-| taint.cpp:785:6:785:15 | fopen_test | (char *) |  | __nis_default_ttl | 0 |
-| taint.cpp:785:6:785:15 | fopen_test | (char *) |  | __xpg_basename | 0 |
-| taint.cpp:785:6:785:15 | fopen_test | (char *) |  | ctermid | 0 |
-| taint.cpp:785:6:785:15 | fopen_test | (char *) |  | cuserid | 0 |
-| taint.cpp:785:6:785:15 | fopen_test | (char *) |  | defossilize | 0 |
-| taint.cpp:785:6:785:15 | fopen_test | (char *) |  | des_setparity | 0 |
-| taint.cpp:785:6:785:15 | fopen_test | (char *) |  | dirname | 0 |
-| taint.cpp:785:6:785:15 | fopen_test | (char *) |  | getwd | 0 |
-| taint.cpp:785:6:785:15 | fopen_test | (char *) |  | make_uppercase | 0 |
-| taint.cpp:785:6:785:15 | fopen_test | (char *) |  | mkdtemp | 0 |
-| taint.cpp:785:6:785:15 | fopen_test | (char *) |  | next_item | 0 |
-| taint.cpp:785:6:785:15 | fopen_test | (char *) |  | strfry | 0 |
-| taint.cpp:785:6:785:15 | fopen_test | (char *) | CStringT | CStringT | 0 |
-| taint.cpp:801:6:801:26 | SysAllocStringByteLen | (ASN1_STRING *,unsigned int) |  | ossl_asn1_string_set_bits_left | 1 |
-| taint.cpp:801:6:801:26 | SysAllocStringByteLen | (Curl_easy *,unsigned int) |  | Curl_ssl_supports | 1 |
-| taint.cpp:801:6:801:26 | SysAllocStringByteLen | (EC_KEY *,unsigned int) |  | EC_KEY_set_enc_flags | 1 |
-| taint.cpp:801:6:801:26 | SysAllocStringByteLen | (EVP_ENCODE_CTX *,unsigned int) |  | evp_encode_ctx_set_flags | 1 |
-| taint.cpp:801:6:801:26 | SysAllocStringByteLen | (FFC_PARAMS *,unsigned int) |  | ossl_ffc_params_set_flags | 1 |
-| taint.cpp:801:6:801:26 | SysAllocStringByteLen | (OSSL_PARAM *,unsigned int) |  | OSSL_PARAM_set_uint | 1 |
-| taint.cpp:801:6:801:26 | SysAllocStringByteLen | (QUIC_DEMUX *,unsigned int) |  | ossl_quic_demux_set_mtu | 1 |
-| taint.cpp:801:6:801:26 | SysAllocStringByteLen | (QUIC_OBJ *,unsigned int) |  | ossl_quic_obj_set_blocking_mode | 1 |
-| taint.cpp:801:6:801:26 | SysAllocStringByteLen | (RAND_POOL *,unsigned int) |  | ossl_rand_pool_bytes_needed | 1 |
-| taint.cpp:801:6:801:26 | SysAllocStringByteLen | (SSL *,unsigned int) |  | SSL_set_hostflags | 1 |
-| taint.cpp:801:6:801:26 | SysAllocStringByteLen | (SSL_CONF_CTX *,unsigned int) |  | SSL_CONF_CTX_clear_flags | 1 |
-| taint.cpp:801:6:801:26 | SysAllocStringByteLen | (SSL_CONF_CTX *,unsigned int) |  | SSL_CONF_CTX_set_flags | 1 |
-| taint.cpp:801:6:801:26 | SysAllocStringByteLen | (TS_RESP_CTX *,unsigned int) |  | TS_RESP_CTX_set_clock_precision_digits | 1 |
-| taint.cpp:801:6:801:26 | SysAllocStringByteLen | (WPACKET *,unsigned int) |  | WPACKET_set_flags | 1 |
-| taint.cpp:801:6:801:26 | SysAllocStringByteLen | (X509_STORE_CTX *,unsigned int) |  | X509_STORE_CTX_set_current_reasons | 1 |
-| taint.cpp:801:6:801:26 | SysAllocStringByteLen | (X509_VERIFY_PARAM *,unsigned int) |  | X509_VERIFY_PARAM_set_hostflags | 1 |
-| taint.cpp:801:6:801:26 | SysAllocStringByteLen | (char *,unsigned int) |  | __nis_default_access | 1 |
-| taint.cpp:801:6:801:26 | SysAllocStringByteLen | (char *,unsigned int) |  | utf8_fromunicode | 1 |
-| taint.cpp:801:6:801:26 | SysAllocStringByteLen | (char *,unsigned int) |  | uv_buf_init | 1 |
-| taint.cpp:801:6:801:26 | SysAllocStringByteLen | (const uv__io_t *,unsigned int) |  | uv__io_active | 1 |
-| taint.cpp:801:6:801:26 | SysAllocStringByteLen | (const uv_buf_t[],unsigned int) |  | uv__count_bufs | 1 |
-| taint.cpp:801:6:801:26 | SysAllocStringByteLen | (const_nis_name,unsigned int) |  | __create_ib_request | 1 |
-| taint.cpp:801:6:801:26 | SysAllocStringByteLen | (grouping_iterator *,unsigned int) |  | __grouping_iterator_init_none | 1 |
-| taint.cpp:801:6:801:26 | SysAllocStringByteLen | (gzFile,unsigned int) |  | gzbuffer | 1 |
-| taint.cpp:801:6:801:26 | SysAllocStringByteLen | (res_state,unsigned int) |  | __res_get_nsaddr | 1 |
-| taint.cpp:801:6:801:26 | SysAllocStringByteLen | (unsigned int,unsigned int) |  | __gnu_dev_makedev | 1 |
-| taint.cpp:801:6:801:26 | SysAllocStringByteLen | (unsigned int,unsigned int) |  | gnu_dev_makedev | 1 |
-| taint.cpp:801:6:801:26 | SysAllocStringByteLen | (z_streamp,unsigned int) |  | inflate_fast | 1 |
-| taint.cpp:802:6:802:22 | SysAllocStringLen | (ASN1_STRING *,unsigned int) |  | ossl_asn1_string_set_bits_left | 1 |
-| taint.cpp:802:6:802:22 | SysAllocStringLen | (Curl_easy *,unsigned int) |  | Curl_ssl_supports | 1 |
-| taint.cpp:802:6:802:22 | SysAllocStringLen | (EC_KEY *,unsigned int) |  | EC_KEY_set_enc_flags | 1 |
-| taint.cpp:802:6:802:22 | SysAllocStringLen | (EVP_ENCODE_CTX *,unsigned int) |  | evp_encode_ctx_set_flags | 1 |
-| taint.cpp:802:6:802:22 | SysAllocStringLen | (FFC_PARAMS *,unsigned int) |  | ossl_ffc_params_set_flags | 1 |
-| taint.cpp:802:6:802:22 | SysAllocStringLen | (OSSL_PARAM *,unsigned int) |  | OSSL_PARAM_set_uint | 1 |
-| taint.cpp:802:6:802:22 | SysAllocStringLen | (QUIC_DEMUX *,unsigned int) |  | ossl_quic_demux_set_mtu | 1 |
-| taint.cpp:802:6:802:22 | SysAllocStringLen | (QUIC_OBJ *,unsigned int) |  | ossl_quic_obj_set_blocking_mode | 1 |
-| taint.cpp:802:6:802:22 | SysAllocStringLen | (RAND_POOL *,unsigned int) |  | ossl_rand_pool_bytes_needed | 1 |
-| taint.cpp:802:6:802:22 | SysAllocStringLen | (SSL *,unsigned int) |  | SSL_set_hostflags | 1 |
-| taint.cpp:802:6:802:22 | SysAllocStringLen | (SSL_CONF_CTX *,unsigned int) |  | SSL_CONF_CTX_clear_flags | 1 |
-| taint.cpp:802:6:802:22 | SysAllocStringLen | (SSL_CONF_CTX *,unsigned int) |  | SSL_CONF_CTX_set_flags | 1 |
-| taint.cpp:802:6:802:22 | SysAllocStringLen | (TS_RESP_CTX *,unsigned int) |  | TS_RESP_CTX_set_clock_precision_digits | 1 |
-| taint.cpp:802:6:802:22 | SysAllocStringLen | (WPACKET *,unsigned int) |  | WPACKET_set_flags | 1 |
-| taint.cpp:802:6:802:22 | SysAllocStringLen | (X509_STORE_CTX *,unsigned int) |  | X509_STORE_CTX_set_current_reasons | 1 |
-| taint.cpp:802:6:802:22 | SysAllocStringLen | (X509_VERIFY_PARAM *,unsigned int) |  | X509_VERIFY_PARAM_set_hostflags | 1 |
-| taint.cpp:802:6:802:22 | SysAllocStringLen | (char *,unsigned int) |  | __nis_default_access | 1 |
-| taint.cpp:802:6:802:22 | SysAllocStringLen | (char *,unsigned int) |  | utf8_fromunicode | 1 |
-| taint.cpp:802:6:802:22 | SysAllocStringLen | (char *,unsigned int) |  | uv_buf_init | 1 |
-| taint.cpp:802:6:802:22 | SysAllocStringLen | (const uv__io_t *,unsigned int) |  | uv__io_active | 1 |
-| taint.cpp:802:6:802:22 | SysAllocStringLen | (const uv_buf_t[],unsigned int) |  | uv__count_bufs | 1 |
-| taint.cpp:802:6:802:22 | SysAllocStringLen | (const_nis_name,unsigned int) |  | __create_ib_request | 1 |
-| taint.cpp:802:6:802:22 | SysAllocStringLen | (grouping_iterator *,unsigned int) |  | __grouping_iterator_init_none | 1 |
-| taint.cpp:802:6:802:22 | SysAllocStringLen | (gzFile,unsigned int) |  | gzbuffer | 1 |
-| taint.cpp:802:6:802:22 | SysAllocStringLen | (res_state,unsigned int) |  | __res_get_nsaddr | 1 |
-| taint.cpp:802:6:802:22 | SysAllocStringLen | (unsigned int,unsigned int) |  | __gnu_dev_makedev | 1 |
-| taint.cpp:802:6:802:22 | SysAllocStringLen | (unsigned int,unsigned int) |  | gnu_dev_makedev | 1 |
-| taint.cpp:802:6:802:22 | SysAllocStringLen | (z_streamp,unsigned int) |  | inflate_fast | 1 |
-| taint.cpp:815:7:815:12 | strchr | (ASN1_STRING *,int) |  | ASN1_STRING_length_set | 1 |
-| taint.cpp:815:7:815:12 | strchr | (ASYNC_WAIT_CTX *,int) |  | ASYNC_WAIT_CTX_set_status | 1 |
-| taint.cpp:815:7:815:12 | strchr | (BIGNUM *,int) |  | BN_clear_bit | 1 |
-| taint.cpp:815:7:815:12 | strchr | (BIGNUM *,int) |  | BN_mask_bits | 1 |
-| taint.cpp:815:7:815:12 | strchr | (BIGNUM *,int) |  | BN_set_bit | 1 |
-| taint.cpp:815:7:815:12 | strchr | (BIGNUM *,int) |  | BN_set_flags | 1 |
-| taint.cpp:815:7:815:12 | strchr | (BIGNUM *,int) |  | bn_expand2 | 1 |
-| taint.cpp:815:7:815:12 | strchr | (BIGNUM *,int) |  | bn_wexpand | 1 |
-| taint.cpp:815:7:815:12 | strchr | (BIGNUM *,int) |  | ossl_bn_mask_bits_fixed_top | 1 |
-| taint.cpp:815:7:815:12 | strchr | (BIO *,int) |  | BIO_clear_flags | 1 |
-| taint.cpp:815:7:815:12 | strchr | (BIO *,int) |  | BIO_find_type | 1 |
-| taint.cpp:815:7:815:12 | strchr | (BIO *,int) |  | BIO_set_flags | 1 |
-| taint.cpp:815:7:815:12 | strchr | (BIO *,int) |  | BIO_set_init | 1 |
-| taint.cpp:815:7:815:12 | strchr | (BIO *,int) |  | BIO_set_retry_reason | 1 |
-| taint.cpp:815:7:815:12 | strchr | (BIO *,int) |  | BIO_set_shutdown | 1 |
-| taint.cpp:815:7:815:12 | strchr | (BIO *,int) |  | TXT_DB_read | 1 |
-| taint.cpp:815:7:815:12 | strchr | (CMS_SignerInfo *,int) |  | CMS_signed_delete_attr | 1 |
-| taint.cpp:815:7:815:12 | strchr | (CMS_SignerInfo *,int) |  | CMS_unsigned_delete_attr | 1 |
-| taint.cpp:815:7:815:12 | strchr | (CURL *,int) |  | curl_easy_pause | 1 |
-| taint.cpp:815:7:815:12 | strchr | (Curl_easy *,int) |  | Curl_conn_get_socket | 1 |
-| taint.cpp:815:7:815:12 | strchr | (DH *,int) |  | DH_clear_flags | 1 |
-| taint.cpp:815:7:815:12 | strchr | (DH *,int) |  | DH_set_flags | 1 |
-| taint.cpp:815:7:815:12 | strchr | (DH_METHOD *,int) |  | DH_meth_set_flags | 1 |
-| taint.cpp:815:7:815:12 | strchr | (DSA *,int) |  | DSA_clear_flags | 1 |
-| taint.cpp:815:7:815:12 | strchr | (DSA *,int) |  | DSA_set_flags | 1 |
-| taint.cpp:815:7:815:12 | strchr | (DSA_METHOD *,int) |  | DSA_meth_set_flags | 1 |
-| taint.cpp:815:7:815:12 | strchr | (EC_GROUP *,int) |  | EC_GROUP_set_asn1_flag | 1 |
-| taint.cpp:815:7:815:12 | strchr | (EC_GROUP *,int) |  | EC_GROUP_set_curve_name | 1 |
-| taint.cpp:815:7:815:12 | strchr | (EC_KEY *,int) |  | EC_KEY_clear_flags | 1 |
-| taint.cpp:815:7:815:12 | strchr | (EC_KEY *,int) |  | EC_KEY_set_asn1_flag | 1 |
-| taint.cpp:815:7:815:12 | strchr | (EC_KEY *,int) |  | EC_KEY_set_flags | 1 |
-| taint.cpp:815:7:815:12 | strchr | (ENGINE *,int) |  | ENGINE_cmd_is_executable | 1 |
-| taint.cpp:815:7:815:12 | strchr | (ENGINE *,int) |  | ENGINE_set_flags | 1 |
-| taint.cpp:815:7:815:12 | strchr | (EVP_CIPHER *,int) |  | EVP_CIPHER_meth_set_impl_ctx_size | 1 |
-| taint.cpp:815:7:815:12 | strchr | (EVP_CIPHER *,int) |  | EVP_CIPHER_meth_set_iv_length | 1 |
-| taint.cpp:815:7:815:12 | strchr | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_clear_flags | 1 |
-| taint.cpp:815:7:815:12 | strchr | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_flags | 1 |
-| taint.cpp:815:7:815:12 | strchr | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_key_length | 1 |
-| taint.cpp:815:7:815:12 | strchr | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_num | 1 |
-| taint.cpp:815:7:815:12 | strchr | (EVP_KEYMGMT *,int) |  | evp_keymgmt_util_query_operation_name | 1 |
-| taint.cpp:815:7:815:12 | strchr | (EVP_MD *,int) |  | EVP_MD_meth_set_app_datasize | 1 |
-| taint.cpp:815:7:815:12 | strchr | (EVP_MD *,int) |  | EVP_MD_meth_set_input_blocksize | 1 |
-| taint.cpp:815:7:815:12 | strchr | (EVP_MD *,int) |  | EVP_MD_meth_set_result_size | 1 |
-| taint.cpp:815:7:815:12 | strchr | (EVP_MD_CTX *,int) |  | EVP_MD_CTX_clear_flags | 1 |
-| taint.cpp:815:7:815:12 | strchr | (EVP_MD_CTX *,int) |  | EVP_MD_CTX_set_flags | 1 |
-| taint.cpp:815:7:815:12 | strchr | (EVP_PKEY *,int) |  | EVP_PKEY_delete_attr | 1 |
-| taint.cpp:815:7:815:12 | strchr | (EVP_PKEY *,int) |  | EVP_PKEY_save_parameters | 1 |
-| taint.cpp:815:7:815:12 | strchr | (EVP_PKEY *,int) |  | EVP_PKEY_set_type | 1 |
-| taint.cpp:815:7:815:12 | strchr | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_get_keygen_info | 1 |
-| taint.cpp:815:7:815:12 | strchr | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_kdf_type | 1 |
-| taint.cpp:815:7:815:12 | strchr | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_nid | 1 |
-| taint.cpp:815:7:815:12 | strchr | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_paramgen_type | 1 |
-| taint.cpp:815:7:815:12 | strchr | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_rfc5114 | 1 |
-| taint.cpp:815:7:815:12 | strchr | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dhx_rfc5114 | 1 |
-| taint.cpp:815:7:815:12 | strchr | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ec_param_enc | 1 |
-| taint.cpp:815:7:815:12 | strchr | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ec_paramgen_curve_nid | 1 |
-| taint.cpp:815:7:815:12 | strchr | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ecdh_kdf_type | 1 |
-| taint.cpp:815:7:815:12 | strchr | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_hkdf_mode | 1 |
-| taint.cpp:815:7:815:12 | strchr | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_rsa_padding | 1 |
-| taint.cpp:815:7:815:12 | strchr | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_rsa_pss_saltlen | 1 |
-| taint.cpp:815:7:815:12 | strchr | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_gindex | 1 |
-| taint.cpp:815:7:815:12 | strchr | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_h | 1 |
-| taint.cpp:815:7:815:12 | strchr | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_pcounter | 1 |
-| taint.cpp:815:7:815:12 | strchr | (FILE *,int) |  | _IO_default_pbackfail | 1 |
-| taint.cpp:815:7:815:12 | strchr | (FILE *,int) |  | _IO_fwide | 1 |
-| taint.cpp:815:7:815:12 | strchr | (FILE *,int) |  | _IO_init | 1 |
-| taint.cpp:815:7:815:12 | strchr | (FILE *,int) |  | _IO_init_internal | 1 |
-| taint.cpp:815:7:815:12 | strchr | (FILE *,int) |  | _IO_new_file_attach | 1 |
-| taint.cpp:815:7:815:12 | strchr | (FILE *,int) |  | _IO_new_file_overflow | 1 |
-| taint.cpp:815:7:815:12 | strchr | (FILE *,int) |  | _IO_old_init | 1 |
-| taint.cpp:815:7:815:12 | strchr | (FILE *,int) |  | _IO_sputbackc | 1 |
-| taint.cpp:815:7:815:12 | strchr | (FILE *,int) |  | _IO_str_overflow | 1 |
-| taint.cpp:815:7:815:12 | strchr | (FILE *,int) |  | _IO_str_pbackfail | 1 |
-| taint.cpp:815:7:815:12 | strchr | (FILE *,int) |  | __printf_buffer_as_file_overflow | 1 |
-| taint.cpp:815:7:815:12 | strchr | (FILE *,int) |  | __wprintf_buffer_as_file_overflow | 1 |
-| taint.cpp:815:7:815:12 | strchr | (FTS *,int) |  | fts_children | 1 |
-| taint.cpp:815:7:815:12 | strchr | (LIBSSH2_CHANNEL *,int) |  | _libssh2_channel_extended_data | 1 |
-| taint.cpp:815:7:815:12 | strchr | (LIBSSH2_CHANNEL *,int) |  | _libssh2_channel_flush | 1 |
-| taint.cpp:815:7:815:12 | strchr | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_flush_ex | 1 |
-| taint.cpp:815:7:815:12 | strchr | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_handle_extended_data | 1 |
-| taint.cpp:815:7:815:12 | strchr | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_handle_extended_data2 | 1 |
-| taint.cpp:815:7:815:12 | strchr | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_set_blocking | 1 |
-| taint.cpp:815:7:815:12 | strchr | (LIBSSH2_SESSION *,int) |  | _libssh2_session_set_blocking | 1 |
-| taint.cpp:815:7:815:12 | strchr | (LIBSSH2_SESSION *,int) |  | libssh2_hostkey_hash | 1 |
-| taint.cpp:815:7:815:12 | strchr | (LIBSSH2_SESSION *,int) |  | libssh2_session_methods | 1 |
-| taint.cpp:815:7:815:12 | strchr | (LIBSSH2_SESSION *,int) |  | libssh2_session_set_blocking | 1 |
-| taint.cpp:815:7:815:12 | strchr | (LIBSSH2_SESSION *,int) |  | libssh2_session_startup | 1 |
-| taint.cpp:815:7:815:12 | strchr | (LPCOLESTR,int) | CComBSTR | Append | 1 |
-| taint.cpp:815:7:815:12 | strchr | (OCSP_BASICRESP *,int) |  | OCSP_BASICRESP_delete_ext | 1 |
-| taint.cpp:815:7:815:12 | strchr | (OCSP_BASICRESP *,int) |  | OCSP_BASICRESP_get_ext | 1 |
-| taint.cpp:815:7:815:12 | strchr | (OCSP_BASICRESP *,int) |  | OCSP_resp_get0 | 1 |
-| taint.cpp:815:7:815:12 | strchr | (OCSP_ONEREQ *,int) |  | OCSP_ONEREQ_delete_ext | 1 |
-| taint.cpp:815:7:815:12 | strchr | (OCSP_ONEREQ *,int) |  | OCSP_ONEREQ_get_ext | 1 |
-| taint.cpp:815:7:815:12 | strchr | (OCSP_REQUEST *,int) |  | OCSP_REQUEST_delete_ext | 1 |
-| taint.cpp:815:7:815:12 | strchr | (OCSP_REQUEST *,int) |  | OCSP_REQUEST_get_ext | 1 |
-| taint.cpp:815:7:815:12 | strchr | (OCSP_REQUEST *,int) |  | OCSP_request_onereq_get0 | 1 |
-| taint.cpp:815:7:815:12 | strchr | (OCSP_SINGLERESP *,int) |  | OCSP_SINGLERESP_delete_ext | 1 |
-| taint.cpp:815:7:815:12 | strchr | (OCSP_SINGLERESP *,int) |  | OCSP_SINGLERESP_get_ext | 1 |
-| taint.cpp:815:7:815:12 | strchr | (OPENSSL_STACK *,int) |  | OPENSSL_sk_delete | 1 |
-| taint.cpp:815:7:815:12 | strchr | (OPENSSL_STACK *,int) |  | OPENSSL_sk_reserve | 1 |
-| taint.cpp:815:7:815:12 | strchr | (OPENSSL_sk_compfunc,int) |  | OPENSSL_sk_new_reserve | 1 |
-| taint.cpp:815:7:815:12 | strchr | (OSSL_ACKM *,int) |  | ossl_ackm_get_ack_deadline | 1 |
-| taint.cpp:815:7:815:12 | strchr | (OSSL_ACKM *,int) |  | ossl_ackm_get_ack_frame | 1 |
-| taint.cpp:815:7:815:12 | strchr | (OSSL_ACKM *,int) |  | ossl_ackm_get_largest_acked | 1 |
-| taint.cpp:815:7:815:12 | strchr | (OSSL_ACKM *,int) |  | ossl_ackm_on_pkt_space_discarded | 1 |
-| taint.cpp:815:7:815:12 | strchr | (OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_set_serverPort | 1 |
-| taint.cpp:815:7:815:12 | strchr | (OSSL_CMP_CTX *,int) |  | ossl_cmp_ctx_set_failInfoCode | 1 |
-| taint.cpp:815:7:815:12 | strchr | (OSSL_CMP_CTX *,int) |  | ossl_cmp_ctx_set_status | 1 |
-| taint.cpp:815:7:815:12 | strchr | (OSSL_CMP_CTX *,int) |  | ossl_cmp_msg_create | 1 |
-| taint.cpp:815:7:815:12 | strchr | (OSSL_CMP_CTX *,int) |  | ossl_cmp_pollReq_new | 1 |
-| taint.cpp:815:7:815:12 | strchr | (OSSL_CMP_MSG *,int) |  | ossl_cmp_msg_set_bodytype | 1 |
-| taint.cpp:815:7:815:12 | strchr | (OSSL_CMP_PKIHEADER *,int) |  | ossl_cmp_hdr_set_pvno | 1 |
-| taint.cpp:815:7:815:12 | strchr | (OSSL_CMP_REVREPCONTENT *,int) |  | ossl_cmp_revrepcontent_get_CertId | 1 |
-| taint.cpp:815:7:815:12 | strchr | (OSSL_CMP_REVREPCONTENT *,int) |  | ossl_cmp_revrepcontent_get_pkisi | 1 |
-| taint.cpp:815:7:815:12 | strchr | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_accept_raverified | 1 |
-| taint.cpp:815:7:815:12 | strchr | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_accept_unprotected | 1 |
-| taint.cpp:815:7:815:12 | strchr | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_grant_implicit_confirm | 1 |
-| taint.cpp:815:7:815:12 | strchr | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_send_unprotected_errors | 1 |
-| taint.cpp:815:7:815:12 | strchr | (OSSL_CRMF_PKIPUBLICATIONINFO *,int) |  | OSSL_CRMF_MSG_set_PKIPublicationInfo_action | 1 |
-| taint.cpp:815:7:815:12 | strchr | (OSSL_DECODER_CTX *,int) |  | OSSL_DECODER_CTX_set_selection | 1 |
-| taint.cpp:815:7:815:12 | strchr | (OSSL_ENCODER_CTX *,int) |  | OSSL_ENCODER_CTX_set_selection | 1 |
-| taint.cpp:815:7:815:12 | strchr | (OSSL_LIB_CTX *,int) |  | OSSL_LIB_CTX_get_data | 1 |
-| taint.cpp:815:7:815:12 | strchr | (OSSL_LIB_CTX *,int) |  | OSSL_LIB_CTX_set_conf_diagnostics | 1 |
-| taint.cpp:815:7:815:12 | strchr | (OSSL_LIB_CTX *,int) |  | ossl_ctx_global_properties | 1 |
-| taint.cpp:815:7:815:12 | strchr | (OSSL_LIB_CTX *,int) |  | ossl_dh_new_by_nid_ex | 1 |
-| taint.cpp:815:7:815:12 | strchr | (OSSL_LIB_CTX *,int) |  | ossl_lib_ctx_get_data | 1 |
-| taint.cpp:815:7:815:12 | strchr | (OSSL_LIB_CTX *,int) |  | ossl_mac_key_new | 1 |
-| taint.cpp:815:7:815:12 | strchr | (OSSL_PARAM *,int) |  | OSSL_PARAM_set_int | 1 |
-| taint.cpp:815:7:815:12 | strchr | (OSSL_QRX *,int) |  | ossl_qrx_get_bytes_received | 1 |
-| taint.cpp:815:7:815:12 | strchr | (OSSL_RECORD_LAYER *,int) |  | tls_set_first_handshake | 1 |
-| taint.cpp:815:7:815:12 | strchr | (OSSL_RECORD_LAYER *,int) |  | tls_set_plain_alerts | 1 |
-| taint.cpp:815:7:815:12 | strchr | (OSSL_STORE_CTX *,int) |  | OSSL_STORE_expect | 1 |
-| taint.cpp:815:7:815:12 | strchr | (PKCS7 *,int) |  | PKCS7_set_type | 1 |
-| taint.cpp:815:7:815:12 | strchr | (QUIC_CHANNEL *,int) |  | ossl_quic_channel_new_stream_local | 1 |
-| taint.cpp:815:7:815:12 | strchr | (QUIC_ENGINE *,int) |  | ossl_quic_engine_set_inhibit_tick | 1 |
-| taint.cpp:815:7:815:12 | strchr | (QUIC_PORT *,int) |  | ossl_quic_port_set_allow_incoming | 1 |
-| taint.cpp:815:7:815:12 | strchr | (QUIC_RCIDM *,int) |  | ossl_quic_rcidm_get_preferred_tx_dcid_changed | 1 |
-| taint.cpp:815:7:815:12 | strchr | (QUIC_RSTREAM *,int) |  | ossl_quic_rstream_set_cleanse | 1 |
-| taint.cpp:815:7:815:12 | strchr | (QUIC_RXFC *,int) |  | ossl_quic_rxfc_get_error | 1 |
-| taint.cpp:815:7:815:12 | strchr | (QUIC_RXFC *,int) |  | ossl_quic_rxfc_has_cwm_changed | 1 |
-| taint.cpp:815:7:815:12 | strchr | (QUIC_SSTREAM *,int) |  | ossl_quic_sstream_set_cleanse | 1 |
-| taint.cpp:815:7:815:12 | strchr | (QUIC_STREAM_MAP *,int) |  | ossl_quic_stream_map_get_accept_queue_len | 1 |
-| taint.cpp:815:7:815:12 | strchr | (QUIC_TXFC *,int) |  | ossl_quic_txfc_has_become_blocked | 1 |
-| taint.cpp:815:7:815:12 | strchr | (RSA *,int) |  | RSA_clear_flags | 1 |
-| taint.cpp:815:7:815:12 | strchr | (RSA *,int) |  | RSA_set_flags | 1 |
-| taint.cpp:815:7:815:12 | strchr | (RSA_METHOD *,int) |  | RSA_meth_set_flags | 1 |
-| taint.cpp:815:7:815:12 | strchr | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_hashalg | 1 |
-| taint.cpp:815:7:815:12 | strchr | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_maskgenhashalg | 1 |
-| taint.cpp:815:7:815:12 | strchr | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_saltlen | 1 |
-| taint.cpp:815:7:815:12 | strchr | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_trailerfield | 1 |
-| taint.cpp:815:7:815:12 | strchr | (SSL *,int) |  | SSL_key_update | 1 |
-| taint.cpp:815:7:815:12 | strchr | (SSL *,int) |  | SSL_set_post_handshake_auth | 1 |
-| taint.cpp:815:7:815:12 | strchr | (SSL *,int) |  | SSL_set_purpose | 1 |
-| taint.cpp:815:7:815:12 | strchr | (SSL *,int) |  | SSL_set_quic_tls_early_data_enabled | 1 |
-| taint.cpp:815:7:815:12 | strchr | (SSL *,int) |  | SSL_set_quiet_shutdown | 1 |
-| taint.cpp:815:7:815:12 | strchr | (SSL *,int) |  | SSL_set_read_ahead | 1 |
-| taint.cpp:815:7:815:12 | strchr | (SSL *,int) |  | SSL_set_security_level | 1 |
-| taint.cpp:815:7:815:12 | strchr | (SSL *,int) |  | SSL_set_shutdown | 1 |
-| taint.cpp:815:7:815:12 | strchr | (SSL *,int) |  | SSL_set_trust | 1 |
-| taint.cpp:815:7:815:12 | strchr | (SSL *,int) |  | SSL_set_verify_depth | 1 |
-| taint.cpp:815:7:815:12 | strchr | (SSL_CONNECTION *,int) |  | dtls1_read_failed | 1 |
-| taint.cpp:815:7:815:12 | strchr | (SSL_CONNECTION *,int) |  | ossl_statem_send_fatal | 1 |
-| taint.cpp:815:7:815:12 | strchr | (SSL_CONNECTION *,int) |  | ossl_statem_set_in_init | 1 |
-| taint.cpp:815:7:815:12 | strchr | (SSL_CONNECTION *,int) |  | tls1_shared_group | 1 |
-| taint.cpp:815:7:815:12 | strchr | (SSL_CTX *,int) |  | SSL_CTX_set_post_handshake_auth | 1 |
-| taint.cpp:815:7:815:12 | strchr | (SSL_CTX *,int) |  | SSL_CTX_set_purpose | 1 |
-| taint.cpp:815:7:815:12 | strchr | (SSL_CTX *,int) |  | SSL_CTX_set_quiet_shutdown | 1 |
-| taint.cpp:815:7:815:12 | strchr | (SSL_CTX *,int) |  | SSL_CTX_set_security_level | 1 |
-| taint.cpp:815:7:815:12 | strchr | (SSL_CTX *,int) |  | SSL_CTX_set_srp_strength | 1 |
-| taint.cpp:815:7:815:12 | strchr | (SSL_CTX *,int) |  | SSL_CTX_set_trust | 1 |
-| taint.cpp:815:7:815:12 | strchr | (SSL_CTX *,int) |  | SSL_CTX_set_verify_depth | 1 |
-| taint.cpp:815:7:815:12 | strchr | (SSL_CTX *,int) |  | ssl_md | 1 |
-| taint.cpp:815:7:815:12 | strchr | (SSL_SESSION *,int) |  | SSL_SESSION_set_protocol_version | 1 |
-| taint.cpp:815:7:815:12 | strchr | (TS_REQ *,int) |  | TS_REQ_delete_ext | 1 |
-| taint.cpp:815:7:815:12 | strchr | (TS_REQ *,int) |  | TS_REQ_get_ext | 1 |
-| taint.cpp:815:7:815:12 | strchr | (TS_RESP_CTX *,int) |  | TS_RESP_CTX_add_flags | 1 |
-| taint.cpp:815:7:815:12 | strchr | (TS_STATUS_INFO *,int) |  | TS_STATUS_INFO_set_status | 1 |
-| taint.cpp:815:7:815:12 | strchr | (TS_TST_INFO *,int) |  | TS_TST_INFO_delete_ext | 1 |
-| taint.cpp:815:7:815:12 | strchr | (TS_TST_INFO *,int) |  | TS_TST_INFO_get_ext | 1 |
-| taint.cpp:815:7:815:12 | strchr | (TS_VERIFY_CTX *,int) |  | TS_VERIFY_CTX_add_flags | 1 |
-| taint.cpp:815:7:815:12 | strchr | (TS_VERIFY_CTX *,int) |  | TS_VERIFY_CTX_set_flags | 1 |
-| taint.cpp:815:7:815:12 | strchr | (WPACKET *,int) |  | ossl_DER_w_begin_sequence | 1 |
-| taint.cpp:815:7:815:12 | strchr | (X509 *,int) |  | X509_delete_ext | 1 |
-| taint.cpp:815:7:815:12 | strchr | (X509 *,int) |  | X509_self_signed | 1 |
-| taint.cpp:815:7:815:12 | strchr | (X509_ACERT *,int) |  | X509_ACERT_delete_attr | 1 |
-| taint.cpp:815:7:815:12 | strchr | (X509_ATTRIBUTE *,int) |  | X509_ATTRIBUTE_get0_type | 1 |
-| taint.cpp:815:7:815:12 | strchr | (X509_CRL *,int) |  | X509_CRL_delete_ext | 1 |
-| taint.cpp:815:7:815:12 | strchr | (X509_NAME *,int) |  | X509_NAME_delete_entry | 1 |
-| taint.cpp:815:7:815:12 | strchr | (X509_REQ *,int) |  | X509_REQ_delete_attr | 1 |
-| taint.cpp:815:7:815:12 | strchr | (X509_REVOKED *,int) |  | X509_REVOKED_delete_ext | 1 |
-| taint.cpp:815:7:815:12 | strchr | (X509_STORE *,int) |  | X509_STORE_set_depth | 1 |
-| taint.cpp:815:7:815:12 | strchr | (X509_STORE *,int) |  | X509_STORE_set_purpose | 1 |
-| taint.cpp:815:7:815:12 | strchr | (X509_STORE *,int) |  | X509_STORE_set_trust | 1 |
-| taint.cpp:815:7:815:12 | strchr | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_depth | 1 |
-| taint.cpp:815:7:815:12 | strchr | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_error | 1 |
-| taint.cpp:815:7:815:12 | strchr | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_error_depth | 1 |
-| taint.cpp:815:7:815:12 | strchr | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_purpose | 1 |
-| taint.cpp:815:7:815:12 | strchr | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_trust | 1 |
-| taint.cpp:815:7:815:12 | strchr | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_get0_host | 1 |
-| taint.cpp:815:7:815:12 | strchr | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_auth_level | 1 |
-| taint.cpp:815:7:815:12 | strchr | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_depth | 1 |
-| taint.cpp:815:7:815:12 | strchr | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_purpose | 1 |
-| taint.cpp:815:7:815:12 | strchr | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_trust | 1 |
-| taint.cpp:815:7:815:12 | strchr | (_Float128,int) |  | __ldexpf128 | 1 |
-| taint.cpp:815:7:815:12 | strchr | (_Float128,int) |  | __scalbnf128 | 1 |
-| taint.cpp:815:7:815:12 | strchr | (__sigset_t *,int) |  | __sigaddset_compat | 1 |
-| taint.cpp:815:7:815:12 | strchr | (__sigset_t *,int) |  | __sigdelset_compat | 1 |
-| taint.cpp:815:7:815:12 | strchr | (acttab *,int) |  | acttab_insert | 1 |
-| taint.cpp:815:7:815:12 | strchr | (addrinfo *,int) |  | support_format_addrinfo | 1 |
-| taint.cpp:815:7:815:12 | strchr | (aiocb_union *,int) |  | __aio_enqueue_request | 1 |
-| taint.cpp:815:7:815:12 | strchr | (argp_fmtstream_t,int) |  | __argp_fmtstream_putc | 1 |
-| taint.cpp:815:7:815:12 | strchr | (char **,int) |  | addrsort | 1 |
-| taint.cpp:815:7:815:12 | strchr | (char *,int) |  | Curl_str2addr | 1 |
-| taint.cpp:815:7:815:12 | strchr | (char *,int) |  | PEM_proc_type | 1 |
-| taint.cpp:815:7:815:12 | strchr | (char,int) | CStringT | CStringT | 1 |
-| taint.cpp:815:7:815:12 | strchr | (connectdata *,int) |  | Curl_conn_is_ssl | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const ASN1_BIT_STRING *,int) |  | ASN1_BIT_STRING_get_bit | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const BIGNUM *,int) |  | BN_get_flags | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const BIGNUM *,int) |  | BN_is_bit_set | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const BIO *,int) |  | BIO_get_ex_data | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const BIO *,int) |  | BIO_test_flags | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const CMS_SignerInfo *,int) |  | CMS_signed_get_attr | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const CMS_SignerInfo *,int) |  | CMS_unsigned_get_attr | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const CRYPTO_EX_DATA *,int) |  | CRYPTO_get_ex_data | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const DH *,int) |  | DH_get_ex_data | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const DH *,int) |  | DH_test_flags | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const DH *,int) |  | ossl_dh_dup | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const DSA *,int) |  | DSA_get_ex_data | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const DSA *,int) |  | DSA_test_flags | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const DSA *,int) |  | ossl_dsa_dup | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const ECX_KEY *,int) |  | ossl_ecx_key_dup | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const EC_KEY *,int) |  | EC_KEY_get_ex_data | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const EC_KEY *,int) |  | ossl_ec_key_dup | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const ENGINE *,int) |  | ENGINE_get_ex_data | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_test_flags | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const EVP_MD_CTX *,int) |  | EVP_MD_CTX_test_flags | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const EVP_PKEY *,int) |  | EVP_PKEY_get_attr | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const EVP_PKEY *,int) |  | EVP_PKEY_get_ex_data | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const ML_DSA_KEY *,int) |  | ossl_ml_dsa_key_dup | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const ML_KEM_KEY *,int) |  | ossl_ml_kem_key_dup | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const OPENSSL_STACK *,int) |  | OPENSSL_sk_value | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const OSSL_CMP_CERTREPMESSAGE *,int) |  | ossl_cmp_certrepmessage_get0_certresponse | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_get0_newPkey | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_get_option | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const OSSL_CMP_PKISI *,int) |  | ossl_cmp_pkisi_check_pkifailureinfo | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const OSSL_CMP_POLLREPCONTENT *,int) |  | ossl_cmp_pollrepcontent_get0_pollrep | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const QUIC_CHANNEL *,int) |  | ossl_quic_channel_get_local_stream_count_avail | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const QUIC_CHANNEL *,int) |  | ossl_quic_channel_get_remote_stream_count_avail | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const RSA *,int) |  | RSA_get_ex_data | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const RSA *,int) |  | RSA_test_flags | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const RSA *,int) |  | ossl_rsa_dup | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const SLH_DSA_KEY *,int) |  | ossl_slh_dsa_key_dup | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const SSL *,int) |  | SSL_get_ex_data | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const SSL_CTX *,int) |  | SSL_CTX_get_ex_data | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const SSL_SESSION *,int) |  | SSL_SESSION_get_ex_data | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const SSL_SESSION *,int) |  | ssl_session_dup | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const UI *,int) |  | UI_get_ex_data | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const UI_METHOD *,int) |  | UI_method_get_ex_data | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const X509 *,int) |  | X509_get_ex_data | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const X509 *,int) |  | X509_get_ext | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const X509_ACERT *,int) |  | X509_ACERT_get_attr | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const X509_CRL *,int) |  | X509_CRL_get_ext | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const X509_NAME *,int) |  | X509_NAME_get_entry | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const X509_POLICY_LEVEL *,int) |  | X509_policy_level_get0_node | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const X509_POLICY_TREE *,int) |  | X509_policy_tree_get0_level | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const X509_REQ *,int) |  | X509_REQ_get_attr | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const X509_REVOKED *,int) |  | X509_REVOKED_get_ext | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const X509_STORE *,int) |  | X509_STORE_get_ex_data | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const X509_STORE_CTX *,int) |  | X509_STORE_CTX_get_ex_data | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const XCHAR *,int) | CStringT | CStringT | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const YCHAR *,int) | CStringT | CStringT | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const char *,int) |  | DH_meth_new | 0 |
-| taint.cpp:815:7:815:12 | strchr | (const char *,int) |  | DH_meth_new | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const char *,int) |  | DSA_meth_new | 0 |
-| taint.cpp:815:7:815:12 | strchr | (const char *,int) |  | DSA_meth_new | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const char *,int) |  | Jim_StrDupLen | 0 |
-| taint.cpp:815:7:815:12 | strchr | (const char *,int) |  | Jim_StrDupLen | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const char *,int) |  | NETSCAPE_SPKI_b64_decode | 0 |
-| taint.cpp:815:7:815:12 | strchr | (const char *,int) |  | NETSCAPE_SPKI_b64_decode | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const char *,int) |  | RSA_meth_new | 0 |
-| taint.cpp:815:7:815:12 | strchr | (const char *,int) |  | RSA_meth_new | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const char *,int) |  | ftok | 0 |
-| taint.cpp:815:7:815:12 | strchr | (const char *,int) |  | ftok | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const char *,int) |  | gethostbyname2 | 0 |
-| taint.cpp:815:7:815:12 | strchr | (const char *,int) |  | gethostbyname2 | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const char *,int) |  | parse_yesno | 0 |
-| taint.cpp:815:7:815:12 | strchr | (const char *,int) |  | parse_yesno | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const char *,int) |  | res_gethostbyname2 | 0 |
-| taint.cpp:815:7:815:12 | strchr | (const char *,int) |  | res_gethostbyname2 | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const stack_st_X509_ATTRIBUTE *,int) |  | X509at_get_attr | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const stack_st_X509_EXTENSION *,int) |  | X509v3_get_ext | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const unsigned char *,int) |  | Jim_GenHashFunction | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const unsigned char *,int) |  | OPENSSL_uni2asc | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const unsigned char *,int) |  | OPENSSL_uni2utf8 | 1 |
-| taint.cpp:815:7:815:12 | strchr | (const void *,int) |  | inet6_rth_getaddr | 1 |
-| taint.cpp:815:7:815:12 | strchr | (double,int) |  | __ldexp | 1 |
-| taint.cpp:815:7:815:12 | strchr | (double,int) |  | __scalbn | 1 |
-| taint.cpp:815:7:815:12 | strchr | (double[],int) |  | getloadavg | 1 |
-| taint.cpp:815:7:815:12 | strchr | (dynhds *,int) |  | Curl_dynhds_set_opts | 1 |
-| taint.cpp:815:7:815:12 | strchr | (fexcept_t *,int) |  | fegetexceptflag | 1 |
-| taint.cpp:815:7:815:12 | strchr | (float,int) |  | __ldexpf | 1 |
-| taint.cpp:815:7:815:12 | strchr | (float,int) |  | __scalbnf | 1 |
-| taint.cpp:815:7:815:12 | strchr | (gzFile,int) |  | gzflush | 1 |
-| taint.cpp:815:7:815:12 | strchr | (gzFile,int) |  | gzputc | 1 |
-| taint.cpp:815:7:815:12 | strchr | (int *,int) |  | X509_PURPOSE_set | 1 |
-| taint.cpp:815:7:815:12 | strchr | (int *,int) |  | X509_TRUST_set | 1 |
-| taint.cpp:815:7:815:12 | strchr | (int *,int) |  | __lll_unlock_elision | 1 |
-| taint.cpp:815:7:815:12 | strchr | (int,int) |  | BN_security_bits | 1 |
-| taint.cpp:815:7:815:12 | strchr | (int,int) |  | EVP_MD_meth_new | 1 |
-| taint.cpp:815:7:815:12 | strchr | (int,int) |  | EVP_PKEY_meth_new | 1 |
-| taint.cpp:815:7:815:12 | strchr | (int,int) |  | __isctype | 1 |
-| taint.cpp:815:7:815:12 | strchr | (int,int) |  | acttab_alloc | 1 |
-| taint.cpp:815:7:815:12 | strchr | (int,int) |  | div | 1 |
-| taint.cpp:815:7:815:12 | strchr | (int,int) |  | inet6_rth_space | 1 |
-| taint.cpp:815:7:815:12 | strchr | (long double,int) |  | __ldexpl | 1 |
-| taint.cpp:815:7:815:12 | strchr | (netlink_handle *,int) |  | __netlink_request | 1 |
-| taint.cpp:815:7:815:12 | strchr | (nghttp2_option *,int) |  | nghttp2_option_set_no_auto_ping_ack | 1 |
-| taint.cpp:815:7:815:12 | strchr | (nghttp2_option *,int) |  | nghttp2_option_set_no_auto_window_update | 1 |
-| taint.cpp:815:7:815:12 | strchr | (nghttp2_option *,int) |  | nghttp2_option_set_no_closed_streams | 1 |
-| taint.cpp:815:7:815:12 | strchr | (nghttp2_option *,int) |  | nghttp2_option_set_no_http_messaging | 1 |
-| taint.cpp:815:7:815:12 | strchr | (nghttp2_option *,int) |  | nghttp2_option_set_no_recv_client_magic | 1 |
-| taint.cpp:815:7:815:12 | strchr | (nghttp2_option *,int) |  | nghttp2_option_set_no_rfc9113_leading_and_trailing_ws_validation | 1 |
-| taint.cpp:815:7:815:12 | strchr | (nghttp2_option *,int) |  | nghttp2_option_set_server_fallback_rfc7540_priorities | 1 |
-| taint.cpp:815:7:815:12 | strchr | (ns_msg,int) |  | ns_msg_getflag | 1 |
-| taint.cpp:815:7:815:12 | strchr | (obstack *,int) |  | _obstack_newchunk | 1 |
-| taint.cpp:815:7:815:12 | strchr | (posix_spawnattr_t *,int) |  | posix_spawnattr_setcgroup_np | 1 |
-| taint.cpp:815:7:815:12 | strchr | (posix_spawnattr_t *,int) |  | posix_spawnattr_setschedpolicy | 1 |
-| taint.cpp:815:7:815:12 | strchr | (pthread_attr_t *,int) |  | __pthread_attr_setschedpolicy | 1 |
-| taint.cpp:815:7:815:12 | strchr | (pthread_barrierattr_t *,int) |  | __pthread_barrierattr_setpshared | 1 |
-| taint.cpp:815:7:815:12 | strchr | (pthread_mutexattr_t *,int) |  | ___pthread_mutexattr_settype | 1 |
-| taint.cpp:815:7:815:12 | strchr | (pthread_mutexattr_t *,int) |  | __pthread_mutexattr_setprioceiling | 1 |
-| taint.cpp:815:7:815:12 | strchr | (pthread_mutexattr_t *,int) |  | __pthread_mutexattr_setprotocol | 1 |
-| taint.cpp:815:7:815:12 | strchr | (pthread_rwlockattr_t *,int) |  | __pthread_rwlockattr_setkind_np | 1 |
-| taint.cpp:815:7:815:12 | strchr | (pthread_rwlockattr_t *,int) |  | __pthread_rwlockattr_setpshared | 1 |
-| taint.cpp:815:7:815:12 | strchr | (rule *,int) |  | Configlist_add | 1 |
-| taint.cpp:815:7:815:12 | strchr | (rule *,int) |  | Configlist_addbasis | 1 |
-| taint.cpp:815:7:815:12 | strchr | (sigset_t *,int) |  | sigaddset | 1 |
-| taint.cpp:815:7:815:12 | strchr | (sigset_t *,int) |  | sigdelset | 1 |
-| taint.cpp:815:7:815:12 | strchr | (sqlite3 *,int) |  | sqlite3_busy_timeout | 1 |
-| taint.cpp:815:7:815:12 | strchr | (sqlite3 *,int) |  | sqlite3_db_name | 1 |
-| taint.cpp:815:7:815:12 | strchr | (sqlite3 *,int) |  | sqlite3_wal_autocheckpoint | 1 |
-| taint.cpp:815:7:815:12 | strchr | (sqlite3_backup *,int) |  | sqlite3_backup_step | 1 |
-| taint.cpp:815:7:815:12 | strchr | (sqlite3_context *,int) |  | sqlite3_aggregate_context | 1 |
-| taint.cpp:815:7:815:12 | strchr | (sqlite3_context *,int) |  | sqlite3_result_error_code | 1 |
-| taint.cpp:815:7:815:12 | strchr | (sqlite3_index_info *,int) |  | sqlite3_vtab_collation | 1 |
-| taint.cpp:815:7:815:12 | strchr | (sqlite3_stmt *,int) |  | sqlite3_bind_parameter_name | 1 |
-| taint.cpp:815:7:815:12 | strchr | (sqlite3_stmt *,int) |  | sqlite3_column_blob | 1 |
-| taint.cpp:815:7:815:12 | strchr | (sqlite3_stmt *,int) |  | sqlite3_column_bytes | 1 |
-| taint.cpp:815:7:815:12 | strchr | (sqlite3_stmt *,int) |  | sqlite3_column_bytes16 | 1 |
-| taint.cpp:815:7:815:12 | strchr | (sqlite3_stmt *,int) |  | sqlite3_column_decltype | 1 |
-| taint.cpp:815:7:815:12 | strchr | (sqlite3_stmt *,int) |  | sqlite3_column_decltype16 | 1 |
-| taint.cpp:815:7:815:12 | strchr | (sqlite3_stmt *,int) |  | sqlite3_column_double | 1 |
-| taint.cpp:815:7:815:12 | strchr | (sqlite3_stmt *,int) |  | sqlite3_column_int | 1 |
-| taint.cpp:815:7:815:12 | strchr | (sqlite3_stmt *,int) |  | sqlite3_column_int64 | 1 |
-| taint.cpp:815:7:815:12 | strchr | (sqlite3_stmt *,int) |  | sqlite3_column_name | 1 |
-| taint.cpp:815:7:815:12 | strchr | (sqlite3_stmt *,int) |  | sqlite3_column_name16 | 1 |
-| taint.cpp:815:7:815:12 | strchr | (sqlite3_stmt *,int) |  | sqlite3_column_text | 1 |
-| taint.cpp:815:7:815:12 | strchr | (sqlite3_stmt *,int) |  | sqlite3_column_text16 | 1 |
-| taint.cpp:815:7:815:12 | strchr | (sqlite3_stmt *,int) |  | sqlite3_column_type | 1 |
-| taint.cpp:815:7:815:12 | strchr | (sqlite3_stmt *,int) |  | sqlite3_column_value | 1 |
-| taint.cpp:815:7:815:12 | strchr | (sqlite3_stmt *,int) |  | sqlite3_stmt_explain | 1 |
-| taint.cpp:815:7:815:12 | strchr | (stack_st_PKCS7 *,int) |  | PKCS12_add_safes | 1 |
-| taint.cpp:815:7:815:12 | strchr | (stack_st_SSL_COMP *,int) |  | ssl3_comp_find | 1 |
-| taint.cpp:815:7:815:12 | strchr | (stack_st_X509_ATTRIBUTE *,int) |  | X509at_delete_attr | 1 |
-| taint.cpp:815:7:815:12 | strchr | (stack_st_X509_EXTENSION *,int) |  | X509v3_delete_ext | 1 |
-| taint.cpp:815:7:815:12 | strchr | (timespec *,int) |  | __timespec_get | 1 |
-| taint.cpp:815:7:815:12 | strchr | (timespec *,int) |  | __timespec_getres | 1 |
-| taint.cpp:815:7:815:12 | strchr | (uint16_t,int) |  | tls1_group_id2nid | 1 |
-| taint.cpp:815:7:815:12 | strchr | (unsigned char *,int) |  | RAND_bytes | 1 |
-| taint.cpp:815:7:815:12 | strchr | (unsigned char *,int) |  | RAND_priv_bytes | 1 |
-| taint.cpp:815:7:815:12 | strchr | (unsigned char *,int) |  | ossl_ipaddr_to_asc | 1 |
-| taint.cpp:815:7:815:12 | strchr | (unsigned short,int) |  | dtls1_get_queue_priority | 1 |
-| taint.cpp:815:7:815:12 | strchr | (uv_env_item_t *,int) |  | uv_os_free_environ | 1 |
-| taint.cpp:815:7:815:12 | strchr | (void *,int) |  | DSO_dsobyaddr | 1 |
-| taint.cpp:815:7:815:12 | strchr | (void *,int) |  | sqlite3_realloc | 1 |
-| taint.cpp:815:7:815:12 | strchr | (void *const *,int) |  | __backtrace_symbols | 1 |
-| taint.cpp:815:7:815:12 | strchr | (wchar_t,int) | CStringT | CStringT | 1 |
-| taint.cpp:817:6:817:27 | write_to_const_ptr_ptr | (const OSSL_PARAM *,const char **) |  | OSSL_PARAM_get_utf8_ptr | 1 |
-| taint.cpp:817:6:817:27 | write_to_const_ptr_ptr | (const OSSL_PARAM *,const char **) |  | OSSL_PARAM_get_utf8_string_ptr | 1 |
-| taint.cpp:817:6:817:27 | write_to_const_ptr_ptr | (const X509_NAME *,const char **) |  | OCSP_url_svcloc_new | 1 |
-| taint.cpp:817:6:817:27 | write_to_const_ptr_ptr | (int,const char **) |  | _nl_load_locale_from_archive | 1 |
-| taint.cpp:817:6:817:27 | write_to_const_ptr_ptr | (sqlite3_intck *,const char **) |  | sqlite3_intck_error | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (ASN1_GENERALIZEDTIME *,const char *) |  | ASN1_GENERALIZEDTIME_set_string | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (ASN1_TIME *,const char *) |  | ASN1_TIME_set_string | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (ASN1_TIME *,const char *) |  | ASN1_TIME_set_string_X509 | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (ASN1_UTCTIME *,const char *) |  | ASN1_UTCTIME_set_string | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (BIGNUM **,const char *) |  | BN_asc2bn | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (BIGNUM **,const char *) |  | BN_dec2bn | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (BIGNUM **,const char *) |  | BN_hex2bn | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (CONF *,const char *) |  | TS_CONF_get_tsa_section | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (CONF *,const char *) |  | _CONF_new_section | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (CURLU *,const char *) |  | Curl_url_set_authority | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (Curl_easy *,const char *) |  | Curl_cwriter_get_by_name | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (Curl_easy *,const char *) |  | Curl_rtsp_parseheader | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (DH_METHOD *,const char *) |  | DH_meth_set1_name | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (DSA_METHOD *,const char *) |  | DSA_meth_set1_name | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (DSO *,const char *) |  | DSO_convert_filename | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (DSO *,const char *) |  | DSO_set_filename | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (ENGINE *,const char *) |  | ENGINE_set_id | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (ENGINE *,const char *) |  | ENGINE_set_name | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (ENGINE *,const char *) |  | OSSL_STORE_LOADER_new | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (EVP_PKEY *,const char *) |  | CTLOG_new | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (EVP_PKEY_CTX *,const char *) |  | app_paramgen | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (EVP_PKEY_CTX *,const char *) |  | pkey_ctrl_string | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (GlobalConfig *,const char *) |  | setvariable | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (Jim_Interp *,const char *) |  | Jim_Eval | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (Jim_Interp *,const char *) |  | Jim_EvalFile | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (Jim_Interp *,const char *) |  | Jim_EvalFileGlobal | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (Jim_Interp *,const char *) |  | Jim_EvalGlobal | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (LIBSSH2_AGENT *,const char *) |  | libssh2_agent_set_identity_path | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (LIBSSH2_SESSION *,const char *) |  | libssh2_banner_set | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (LIBSSH2_SESSION *,const char *) |  | libssh2_session_banner_set | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (Lmid_t,const char *) |  | _dl_lookup_map | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (OPENSSL_DIR_CTX **,const char *) |  | OPENSSL_DIR_read | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (OPENSSL_INIT_SETTINGS *,const char *) |  | OPENSSL_INIT_set_config_appname | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (OPENSSL_INIT_SETTINGS *,const char *) |  | OPENSSL_INIT_set_config_filename | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (OSSL_CMP_CTX *,const char *) |  | OSSL_CMP_CTX_set1_no_proxy | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (OSSL_CMP_CTX *,const char *) |  | OSSL_CMP_CTX_set1_proxy | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (OSSL_CMP_CTX *,const char *) |  | OSSL_CMP_CTX_set1_server | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (OSSL_CMP_CTX *,const char *) |  | OSSL_CMP_CTX_set1_serverPath | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (OSSL_DECODER_CTX *,const char *) |  | OSSL_DECODER_CTX_set_input_structure | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (OSSL_DECODER_CTX *,const char *) |  | OSSL_DECODER_CTX_set_input_type | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (OSSL_ENCODER_CTX *,const char *) |  | OSSL_ENCODER_CTX_set_output_structure | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (OSSL_ENCODER_CTX *,const char *) |  | OSSL_ENCODER_CTX_set_output_type | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (OSSL_JSON_ENC *,const char *) |  | ossl_json_key | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (OSSL_JSON_ENC *,const char *) |  | ossl_json_str | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (OSSL_LIB_CTX *,const char *) |  | CMS_ContentInfo_new_ex | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (OSSL_LIB_CTX *,const char *) |  | CTLOG_STORE_new_ex | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (OSSL_LIB_CTX *,const char *) |  | CT_POLICY_EVAL_CTX_new_ex | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (OSSL_LIB_CTX *,const char *) |  | EC_KEY_new_ex | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (OSSL_LIB_CTX *,const char *) |  | OSSL_CMP_CTX_new | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (OSSL_LIB_CTX *,const char *) |  | OSSL_CMP_MSG_new | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (OSSL_LIB_CTX *,const char *) |  | OSSL_CMP_SRV_CTX_new | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (OSSL_LIB_CTX *,const char *) |  | OSSL_PROVIDER_load | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (OSSL_LIB_CTX *,const char *) |  | PKCS7_new_ex | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (OSSL_LIB_CTX *,const char *) |  | SCT_CTX_new | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (OSSL_LIB_CTX *,const char *) |  | TS_RESP_CTX_new_ex | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (OSSL_LIB_CTX *,const char *) |  | X509_CRL_new_ex | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (OSSL_LIB_CTX *,const char *) |  | X509_PUBKEY_new_ex | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (OSSL_LIB_CTX *,const char *) |  | X509_REQ_new_ex | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (OSSL_LIB_CTX *,const char *) |  | X509_STORE_CTX_new_ex | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (OSSL_LIB_CTX *,const char *) |  | X509_new_ex | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (OSSL_LIB_CTX *,const char *) |  | ossl_cmp_mock_srv_new | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (OSSL_LIB_CTX *,const char *) |  | ossl_cms_Data_create | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (OSSL_LIB_CTX *,const char *) |  | ossl_parse_property | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (OSSL_PARAM *,const char *) |  | OSSL_PARAM_locate | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (OSSL_PARAM *,const char *) |  | OSSL_PARAM_set_utf8_ptr | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (OSSL_PARAM *,const char *) |  | OSSL_PARAM_set_utf8_string | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (OSSL_PROVIDER *,const char *) |  | ossl_provider_set_module_path | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (PKCS7 *,const char *) |  | ossl_pkcs7_set1_propq | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (RSA_METHOD *,const char *) |  | RSA_meth_set1_name | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (SSL *,const char *) |  | SSL_add1_host | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (SSL *,const char *) |  | SSL_set1_host | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (SSL *,const char *) |  | SSL_set_cipher_list | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (SSL *,const char *) |  | SSL_use_psk_identity_hint | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (SSL_CONF_CTX *,const char *) |  | SSL_CONF_CTX_set1_prefix | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (SSL_CONF_CTX *,const char *) |  | SSL_CONF_cmd_value_type | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (SSL_CTX *,const char *) |  | SSL_CTX_set_cipher_list | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (SSL_CTX *,const char *) |  | SSL_CTX_use_psk_identity_hint | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (SSL_CTX *,const char *) |  | ossl_quic_set_diag_title | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (SSL_SESSION *,const char *) |  | SSL_SESSION_set1_hostname | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (UI *,const char *) |  | UI_add_error_string | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (UI *,const char *) |  | UI_add_info_string | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (UI *,const char *) |  | UI_dup_error_string | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (UI *,const char *) |  | UI_dup_info_string | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (X509 *,const char *) |  | x509_ctrl_string | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (X509_REQ *,const char *) |  | x509_req_ctrl_string | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (X509_VERIFY_PARAM *,const char *) |  | X509_VERIFY_PARAM_set1_ip_asc | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (X509_VERIFY_PARAM *,const char *) |  | X509_VERIFY_PARAM_set1_name | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (__printf_buffer *,const char *) |  | __printf_buffer_puts_1 | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (alloc_buffer,const char *) |  | __libc_alloc_buffer_copy_string | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (argp_fmtstream_t,const char *) |  | __argp_fmtstream_puts | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (char **,const char *) |  | Curl_setstropt | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (char **,const char *) |  | __strsep | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (char *,const char *) |  | xstrdup | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const OSSL_PARAM *,const char *) |  | OSSL_PARAM_locate_const | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char **,const char *) |  | uv__utf8_decode1 | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | Configcmp | 0 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | Configcmp | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | Curl_timestrcmp | 0 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | Curl_timestrcmp | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | DES_crypt | 0 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | DES_crypt | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | OPENSSL_strcasecmp | 0 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | OPENSSL_strcasecmp | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | __bind_textdomain_codeset | 0 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | __bind_textdomain_codeset | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | __bindtextdomain | 0 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | __bindtextdomain | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | __dgettext | 0 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | __dgettext | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | __gconv_compare_alias | 0 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | __gconv_compare_alias | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | __strcasestr | 0 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | __strcasestr | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | __strcspn_generic | 0 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | __strcspn_generic | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | __strcspn_sse42 | 0 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | __strcspn_sse42 | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | __strpbrk_generic | 0 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | __strpbrk_generic | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | __strpbrk_sse42 | 0 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | __strpbrk_sse42 | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | __strspn_generic | 0 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | __strspn_generic | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | __strspn_sse42 | 0 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | __strspn_sse42 | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | __strstr_generic | 0 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | __strstr_generic | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | __strverscmp | 0 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | __strverscmp | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | _dl_cache_libcmp | 0 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | _dl_cache_libcmp | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | advance | 0 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | advance | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | c_strcasecmp | 0 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | c_strcasecmp | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | charmap_aliases | 0 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | charmap_aliases | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | charmap_open | 0 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | charmap_open | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | chroot_canon | 0 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | chroot_canon | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | get_passwd | 0 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | get_passwd | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | gzopen | 0 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | gzopen | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | gzopen64 | 0 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | gzopen64 | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | iconv_open | 0 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | iconv_open | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | openssl_fopen | 0 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | openssl_fopen | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | ossl_pem_check_suffix | 0 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | ossl_pem_check_suffix | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | ossl_v3_name_cmp | 0 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | ossl_v3_name_cmp | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | sqlite3_strglob | 0 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | sqlite3_strglob | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | sqlite3_stricmp | 0 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | sqlite3_stricmp | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | step | 0 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | step | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | tempnam | 0 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | tempnam | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | xfopen | 0 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const char *,const char *) |  | xfopen | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const mntent *,const char *) |  | __hasmntopt | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (const nis_error,const char *) |  | nis_sperror | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (curl_mimepart *,const char *) |  | curl_mime_filedata | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (curl_off_t *,const char *) |  | str2offset | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (curl_pushheaders *,const char *) |  | curl_pushheader_byname | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (curl_slist **,const char *) |  | add2list | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (curl_slist *,const char *) |  | curl_slist_append | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (dynbuf *,const char *) |  | Curl_dyn_add | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (dynbuf *,const char *) |  | curlx_dyn_add | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (dynhds *,const char *) |  | Curl_dynhds_cget | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (dynhds *,const char *) |  | Curl_dynhds_h1_cadd_line | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (gconv_fcts *,const char *) |  | __wcsmbs_named_conv | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (gzFile,const char *) |  | gzputs | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (int,const char *) |  | BIO_meth_new | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (int,const char *) |  | _IO_new_fdopen | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (int,const char *) |  | gzdopen | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (int,const char *) |  | setlocale | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (int,const char *) |  | xsetlocale | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (lemon *,const char *) |  | file_makename | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (long *,const char *) |  | secs2ms | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (long *,const char *) |  | str2num | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (long *,const char *) |  | str2unum | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (nss_module *,const char *) |  | __nss_module_get_function | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (size_t *,const char *) |  | next_protos_parse | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (slist_wc **,const char *) |  | easysrc_add | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (slist_wc *,const char *) |  | slist_wc_append | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (sockaddr_un *,const char *) |  | __sockaddr_un_set | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (sqlite3 *,const char *) |  | sqlite3_declare_vtab | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (sqlite3 *,const char *) |  | sqlite3_get_clientdata | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (sqlite3 *,const char *) |  | sqlite3_wal_checkpoint | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (sqlite3_intck *,const char *) |  | sqlite3_intck_test_sql | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (sqlite3_stmt *,const char *) |  | sqlite3_bind_parameter_index | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (sqlite3_str *,const char *) |  | sqlite3_str_appendall | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (sqlite3_value *,const char *) |  | sqlite3_value_pointer | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (stringtable *,const char *) |  | stringtable_add | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (unsigned char *,const char *) |  | ossl_a2i_ipadd | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (unsigned long *,const char *) |  | set_cert_ex | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (unsigned long *,const char *) |  | set_name_ex | 1 |
-| taint.cpp:822:6:822:19 | take_const_ptr | (uv_pipe_t *,const char *) |  | uv_pipe_bind | 1 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | ASN1_STRING_type_new | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | ASN1_tag2bit | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | ASN1_tag2str | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | Jim_ReturnCode | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | Jim_SignalId | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | OBJ_nid2ln | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | OBJ_nid2obj | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | OBJ_nid2sn | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | OSSL_trace_get_category_name | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | PKCS12_init | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | Symbol_Nth | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | X509_PURPOSE_get0 | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | X509_TRUST_get0 | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | X509_TRUST_get_by_id | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | __btowc | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | __current_locale_name | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | __fdopendir | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | __get_errlist | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | __get_errname | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | __math_invalid_i | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | __math_invalidf_i | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | __p_class | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | __p_rcode | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | __p_type | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | __pkey_get | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | __sigdescr_np | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | __strerrordesc_np | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | _tolower | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | _toupper | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | btowc | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | c_tolower | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | c_toupper | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | curlx_sitouz | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | evp_pkey_type2name | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | inet6_option_space | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | isalnum | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | isalpha | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | isblank | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | iscntrl | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | isdigit | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | isgraph | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | islower | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | isprint | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | ispunct | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | isspace | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | isupper | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | isxdigit | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | ossl_tolower | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | ossl_toupper | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | sigabbrev_np | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | sqlite3_compileoption_get | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | sqlite3_errstr | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | strerrorname_np | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | support_report_failure | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | svcudp_create | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | tls13_alert_code | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | toascii | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | tolower | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | toupper | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | uabs | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | uv__accept | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | uv_err_name | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | uv_get_osfhandle | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | uv_strerror | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | uv_translate_sys_error | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) |  | zError | 0 |
-| thread.cpp:4:6:4:9 | sink | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (ASN1_STRING *,int) |  | ASN1_STRING_length_set | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (ASYNC_WAIT_CTX *,int) |  | ASYNC_WAIT_CTX_set_status | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (BIGNUM *,int) |  | BN_clear_bit | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (BIGNUM *,int) |  | BN_mask_bits | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (BIGNUM *,int) |  | BN_set_bit | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (BIGNUM *,int) |  | BN_set_flags | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (BIGNUM *,int) |  | bn_expand2 | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (BIGNUM *,int) |  | bn_wexpand | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (BIGNUM *,int) |  | ossl_bn_mask_bits_fixed_top | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (BIO *,int) |  | BIO_clear_flags | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (BIO *,int) |  | BIO_find_type | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (BIO *,int) |  | BIO_set_flags | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (BIO *,int) |  | BIO_set_init | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (BIO *,int) |  | BIO_set_retry_reason | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (BIO *,int) |  | BIO_set_shutdown | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (BIO *,int) |  | TXT_DB_read | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (CMS_SignerInfo *,int) |  | CMS_signed_delete_attr | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (CMS_SignerInfo *,int) |  | CMS_unsigned_delete_attr | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (CURL *,int) |  | curl_easy_pause | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (Curl_easy *,int) |  | Curl_conn_get_socket | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (DH *,int) |  | DH_clear_flags | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (DH *,int) |  | DH_set_flags | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (DH_METHOD *,int) |  | DH_meth_set_flags | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (DSA *,int) |  | DSA_clear_flags | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (DSA *,int) |  | DSA_set_flags | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (DSA_METHOD *,int) |  | DSA_meth_set_flags | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (EC_GROUP *,int) |  | EC_GROUP_set_asn1_flag | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (EC_GROUP *,int) |  | EC_GROUP_set_curve_name | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (EC_KEY *,int) |  | EC_KEY_clear_flags | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (EC_KEY *,int) |  | EC_KEY_set_asn1_flag | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (EC_KEY *,int) |  | EC_KEY_set_flags | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (ENGINE *,int) |  | ENGINE_cmd_is_executable | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (ENGINE *,int) |  | ENGINE_set_flags | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (EVP_CIPHER *,int) |  | EVP_CIPHER_meth_set_impl_ctx_size | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (EVP_CIPHER *,int) |  | EVP_CIPHER_meth_set_iv_length | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_clear_flags | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_flags | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_key_length | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_num | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (EVP_KEYMGMT *,int) |  | evp_keymgmt_util_query_operation_name | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (EVP_MD *,int) |  | EVP_MD_meth_set_app_datasize | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (EVP_MD *,int) |  | EVP_MD_meth_set_input_blocksize | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (EVP_MD *,int) |  | EVP_MD_meth_set_result_size | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (EVP_MD_CTX *,int) |  | EVP_MD_CTX_clear_flags | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (EVP_MD_CTX *,int) |  | EVP_MD_CTX_set_flags | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (EVP_PKEY *,int) |  | EVP_PKEY_delete_attr | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (EVP_PKEY *,int) |  | EVP_PKEY_save_parameters | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (EVP_PKEY *,int) |  | EVP_PKEY_set_type | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_get_keygen_info | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_kdf_type | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_nid | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_paramgen_type | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_rfc5114 | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dhx_rfc5114 | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ec_param_enc | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ec_paramgen_curve_nid | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ecdh_kdf_type | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_hkdf_mode | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_rsa_padding | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_rsa_pss_saltlen | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_gindex | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_h | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_pcounter | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (FILE *,int) |  | _IO_default_pbackfail | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (FILE *,int) |  | _IO_fwide | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (FILE *,int) |  | _IO_init | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (FILE *,int) |  | _IO_init_internal | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (FILE *,int) |  | _IO_new_file_attach | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (FILE *,int) |  | _IO_new_file_overflow | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (FILE *,int) |  | _IO_old_init | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (FILE *,int) |  | _IO_sputbackc | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (FILE *,int) |  | _IO_str_overflow | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (FILE *,int) |  | _IO_str_pbackfail | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (FILE *,int) |  | __printf_buffer_as_file_overflow | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (FILE *,int) |  | __wprintf_buffer_as_file_overflow | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (FTS *,int) |  | fts_children | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (LIBSSH2_CHANNEL *,int) |  | _libssh2_channel_extended_data | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (LIBSSH2_CHANNEL *,int) |  | _libssh2_channel_flush | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_flush_ex | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_handle_extended_data | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_handle_extended_data2 | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_set_blocking | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (LIBSSH2_SESSION *,int) |  | _libssh2_session_set_blocking | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (LIBSSH2_SESSION *,int) |  | libssh2_hostkey_hash | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (LIBSSH2_SESSION *,int) |  | libssh2_session_methods | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (LIBSSH2_SESSION *,int) |  | libssh2_session_set_blocking | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (LIBSSH2_SESSION *,int) |  | libssh2_session_startup | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (LPCOLESTR,int) | CComBSTR | Append | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (OCSP_BASICRESP *,int) |  | OCSP_BASICRESP_delete_ext | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (OCSP_BASICRESP *,int) |  | OCSP_BASICRESP_get_ext | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (OCSP_BASICRESP *,int) |  | OCSP_resp_get0 | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (OCSP_ONEREQ *,int) |  | OCSP_ONEREQ_delete_ext | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (OCSP_ONEREQ *,int) |  | OCSP_ONEREQ_get_ext | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (OCSP_REQUEST *,int) |  | OCSP_REQUEST_delete_ext | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (OCSP_REQUEST *,int) |  | OCSP_REQUEST_get_ext | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (OCSP_REQUEST *,int) |  | OCSP_request_onereq_get0 | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (OCSP_SINGLERESP *,int) |  | OCSP_SINGLERESP_delete_ext | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (OCSP_SINGLERESP *,int) |  | OCSP_SINGLERESP_get_ext | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (OPENSSL_STACK *,int) |  | OPENSSL_sk_delete | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (OPENSSL_STACK *,int) |  | OPENSSL_sk_reserve | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (OPENSSL_sk_compfunc,int) |  | OPENSSL_sk_new_reserve | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (OSSL_ACKM *,int) |  | ossl_ackm_get_ack_deadline | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (OSSL_ACKM *,int) |  | ossl_ackm_get_ack_frame | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (OSSL_ACKM *,int) |  | ossl_ackm_get_largest_acked | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (OSSL_ACKM *,int) |  | ossl_ackm_on_pkt_space_discarded | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_set_serverPort | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (OSSL_CMP_CTX *,int) |  | ossl_cmp_ctx_set_failInfoCode | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (OSSL_CMP_CTX *,int) |  | ossl_cmp_ctx_set_status | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (OSSL_CMP_CTX *,int) |  | ossl_cmp_msg_create | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (OSSL_CMP_CTX *,int) |  | ossl_cmp_pollReq_new | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (OSSL_CMP_MSG *,int) |  | ossl_cmp_msg_set_bodytype | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (OSSL_CMP_PKIHEADER *,int) |  | ossl_cmp_hdr_set_pvno | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (OSSL_CMP_REVREPCONTENT *,int) |  | ossl_cmp_revrepcontent_get_CertId | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (OSSL_CMP_REVREPCONTENT *,int) |  | ossl_cmp_revrepcontent_get_pkisi | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_accept_raverified | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_accept_unprotected | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_grant_implicit_confirm | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_send_unprotected_errors | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (OSSL_CRMF_PKIPUBLICATIONINFO *,int) |  | OSSL_CRMF_MSG_set_PKIPublicationInfo_action | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (OSSL_DECODER_CTX *,int) |  | OSSL_DECODER_CTX_set_selection | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (OSSL_ENCODER_CTX *,int) |  | OSSL_ENCODER_CTX_set_selection | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (OSSL_LIB_CTX *,int) |  | OSSL_LIB_CTX_get_data | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (OSSL_LIB_CTX *,int) |  | OSSL_LIB_CTX_set_conf_diagnostics | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (OSSL_LIB_CTX *,int) |  | ossl_ctx_global_properties | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (OSSL_LIB_CTX *,int) |  | ossl_dh_new_by_nid_ex | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (OSSL_LIB_CTX *,int) |  | ossl_lib_ctx_get_data | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (OSSL_LIB_CTX *,int) |  | ossl_mac_key_new | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (OSSL_PARAM *,int) |  | OSSL_PARAM_set_int | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (OSSL_QRX *,int) |  | ossl_qrx_get_bytes_received | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (OSSL_RECORD_LAYER *,int) |  | tls_set_first_handshake | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (OSSL_RECORD_LAYER *,int) |  | tls_set_plain_alerts | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (OSSL_STORE_CTX *,int) |  | OSSL_STORE_expect | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (PKCS7 *,int) |  | PKCS7_set_type | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (QUIC_CHANNEL *,int) |  | ossl_quic_channel_new_stream_local | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (QUIC_ENGINE *,int) |  | ossl_quic_engine_set_inhibit_tick | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (QUIC_PORT *,int) |  | ossl_quic_port_set_allow_incoming | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (QUIC_RCIDM *,int) |  | ossl_quic_rcidm_get_preferred_tx_dcid_changed | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (QUIC_RSTREAM *,int) |  | ossl_quic_rstream_set_cleanse | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (QUIC_RXFC *,int) |  | ossl_quic_rxfc_get_error | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (QUIC_RXFC *,int) |  | ossl_quic_rxfc_has_cwm_changed | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (QUIC_SSTREAM *,int) |  | ossl_quic_sstream_set_cleanse | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (QUIC_STREAM_MAP *,int) |  | ossl_quic_stream_map_get_accept_queue_len | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (QUIC_TXFC *,int) |  | ossl_quic_txfc_has_become_blocked | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (RSA *,int) |  | RSA_clear_flags | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (RSA *,int) |  | RSA_set_flags | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (RSA_METHOD *,int) |  | RSA_meth_set_flags | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_hashalg | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_maskgenhashalg | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_saltlen | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_trailerfield | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (SSL *,int) |  | SSL_key_update | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (SSL *,int) |  | SSL_set_post_handshake_auth | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (SSL *,int) |  | SSL_set_purpose | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (SSL *,int) |  | SSL_set_quic_tls_early_data_enabled | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (SSL *,int) |  | SSL_set_quiet_shutdown | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (SSL *,int) |  | SSL_set_read_ahead | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (SSL *,int) |  | SSL_set_security_level | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (SSL *,int) |  | SSL_set_shutdown | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (SSL *,int) |  | SSL_set_trust | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (SSL *,int) |  | SSL_set_verify_depth | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (SSL_CONNECTION *,int) |  | dtls1_read_failed | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (SSL_CONNECTION *,int) |  | ossl_statem_send_fatal | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (SSL_CONNECTION *,int) |  | ossl_statem_set_in_init | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (SSL_CONNECTION *,int) |  | tls1_shared_group | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (SSL_CTX *,int) |  | SSL_CTX_set_post_handshake_auth | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (SSL_CTX *,int) |  | SSL_CTX_set_purpose | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (SSL_CTX *,int) |  | SSL_CTX_set_quiet_shutdown | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (SSL_CTX *,int) |  | SSL_CTX_set_security_level | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (SSL_CTX *,int) |  | SSL_CTX_set_srp_strength | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (SSL_CTX *,int) |  | SSL_CTX_set_trust | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (SSL_CTX *,int) |  | SSL_CTX_set_verify_depth | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (SSL_CTX *,int) |  | ssl_md | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (SSL_SESSION *,int) |  | SSL_SESSION_set_protocol_version | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (TS_REQ *,int) |  | TS_REQ_delete_ext | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (TS_REQ *,int) |  | TS_REQ_get_ext | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (TS_RESP_CTX *,int) |  | TS_RESP_CTX_add_flags | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (TS_STATUS_INFO *,int) |  | TS_STATUS_INFO_set_status | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (TS_TST_INFO *,int) |  | TS_TST_INFO_delete_ext | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (TS_TST_INFO *,int) |  | TS_TST_INFO_get_ext | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (TS_VERIFY_CTX *,int) |  | TS_VERIFY_CTX_add_flags | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (TS_VERIFY_CTX *,int) |  | TS_VERIFY_CTX_set_flags | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (WPACKET *,int) |  | ossl_DER_w_begin_sequence | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (X509 *,int) |  | X509_delete_ext | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (X509 *,int) |  | X509_self_signed | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (X509_ACERT *,int) |  | X509_ACERT_delete_attr | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (X509_ATTRIBUTE *,int) |  | X509_ATTRIBUTE_get0_type | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (X509_CRL *,int) |  | X509_CRL_delete_ext | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (X509_NAME *,int) |  | X509_NAME_delete_entry | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (X509_REQ *,int) |  | X509_REQ_delete_attr | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (X509_REVOKED *,int) |  | X509_REVOKED_delete_ext | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (X509_STORE *,int) |  | X509_STORE_set_depth | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (X509_STORE *,int) |  | X509_STORE_set_purpose | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (X509_STORE *,int) |  | X509_STORE_set_trust | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_depth | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_error | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_error_depth | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_purpose | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_trust | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_get0_host | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_auth_level | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_depth | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_purpose | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_trust | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (_Float128,int) |  | __ldexpf128 | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (_Float128,int) |  | __scalbnf128 | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (__sigset_t *,int) |  | __sigaddset_compat | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (__sigset_t *,int) |  | __sigdelset_compat | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (acttab *,int) |  | acttab_insert | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (addrinfo *,int) |  | support_format_addrinfo | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (aiocb_union *,int) |  | __aio_enqueue_request | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (argp_fmtstream_t,int) |  | __argp_fmtstream_putc | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (char **,int) |  | addrsort | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (char *,int) |  | Curl_str2addr | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (char *,int) |  | PEM_proc_type | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (char,int) | CStringT | CStringT | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (connectdata *,int) |  | Curl_conn_is_ssl | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const ASN1_BIT_STRING *,int) |  | ASN1_BIT_STRING_get_bit | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const BIGNUM *,int) |  | BN_get_flags | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const BIGNUM *,int) |  | BN_is_bit_set | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const BIO *,int) |  | BIO_get_ex_data | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const BIO *,int) |  | BIO_test_flags | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const CMS_SignerInfo *,int) |  | CMS_signed_get_attr | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const CMS_SignerInfo *,int) |  | CMS_unsigned_get_attr | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const CRYPTO_EX_DATA *,int) |  | CRYPTO_get_ex_data | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const DH *,int) |  | DH_get_ex_data | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const DH *,int) |  | DH_test_flags | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const DH *,int) |  | ossl_dh_dup | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const DSA *,int) |  | DSA_get_ex_data | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const DSA *,int) |  | DSA_test_flags | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const DSA *,int) |  | ossl_dsa_dup | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const ECX_KEY *,int) |  | ossl_ecx_key_dup | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const EC_KEY *,int) |  | EC_KEY_get_ex_data | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const EC_KEY *,int) |  | ossl_ec_key_dup | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const ENGINE *,int) |  | ENGINE_get_ex_data | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_test_flags | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const EVP_MD_CTX *,int) |  | EVP_MD_CTX_test_flags | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const EVP_PKEY *,int) |  | EVP_PKEY_get_attr | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const EVP_PKEY *,int) |  | EVP_PKEY_get_ex_data | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const ML_DSA_KEY *,int) |  | ossl_ml_dsa_key_dup | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const ML_KEM_KEY *,int) |  | ossl_ml_kem_key_dup | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const OPENSSL_STACK *,int) |  | OPENSSL_sk_value | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const OSSL_CMP_CERTREPMESSAGE *,int) |  | ossl_cmp_certrepmessage_get0_certresponse | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_get0_newPkey | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_get_option | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const OSSL_CMP_PKISI *,int) |  | ossl_cmp_pkisi_check_pkifailureinfo | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const OSSL_CMP_POLLREPCONTENT *,int) |  | ossl_cmp_pollrepcontent_get0_pollrep | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const QUIC_CHANNEL *,int) |  | ossl_quic_channel_get_local_stream_count_avail | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const QUIC_CHANNEL *,int) |  | ossl_quic_channel_get_remote_stream_count_avail | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const RSA *,int) |  | RSA_get_ex_data | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const RSA *,int) |  | RSA_test_flags | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const RSA *,int) |  | ossl_rsa_dup | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const SLH_DSA_KEY *,int) |  | ossl_slh_dsa_key_dup | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const SSL *,int) |  | SSL_get_ex_data | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const SSL_CTX *,int) |  | SSL_CTX_get_ex_data | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const SSL_SESSION *,int) |  | SSL_SESSION_get_ex_data | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const SSL_SESSION *,int) |  | ssl_session_dup | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const UI *,int) |  | UI_get_ex_data | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const UI_METHOD *,int) |  | UI_method_get_ex_data | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const X509 *,int) |  | X509_get_ex_data | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const X509 *,int) |  | X509_get_ext | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const X509_ACERT *,int) |  | X509_ACERT_get_attr | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const X509_CRL *,int) |  | X509_CRL_get_ext | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const X509_NAME *,int) |  | X509_NAME_get_entry | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const X509_POLICY_LEVEL *,int) |  | X509_policy_level_get0_node | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const X509_POLICY_TREE *,int) |  | X509_policy_tree_get0_level | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const X509_REQ *,int) |  | X509_REQ_get_attr | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const X509_REVOKED *,int) |  | X509_REVOKED_get_ext | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const X509_STORE *,int) |  | X509_STORE_get_ex_data | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const X509_STORE_CTX *,int) |  | X509_STORE_CTX_get_ex_data | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const XCHAR *,int) | CStringT | CStringT | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const YCHAR *,int) | CStringT | CStringT | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const char *,int) |  | DH_meth_new | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const char *,int) |  | DSA_meth_new | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const char *,int) |  | Jim_StrDupLen | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const char *,int) |  | NETSCAPE_SPKI_b64_decode | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const char *,int) |  | RSA_meth_new | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const char *,int) |  | ftok | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const char *,int) |  | gethostbyname2 | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const char *,int) |  | parse_yesno | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const char *,int) |  | res_gethostbyname2 | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const stack_st_X509_ATTRIBUTE *,int) |  | X509at_get_attr | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const stack_st_X509_EXTENSION *,int) |  | X509v3_get_ext | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const unsigned char *,int) |  | Jim_GenHashFunction | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const unsigned char *,int) |  | OPENSSL_uni2asc | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const unsigned char *,int) |  | OPENSSL_uni2utf8 | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (const void *,int) |  | inet6_rth_getaddr | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (double,int) |  | __ldexp | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (double,int) |  | __scalbn | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (double[],int) |  | getloadavg | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (dynhds *,int) |  | Curl_dynhds_set_opts | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (fexcept_t *,int) |  | fegetexceptflag | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (float,int) |  | __ldexpf | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (float,int) |  | __scalbnf | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (gzFile,int) |  | gzflush | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (gzFile,int) |  | gzputc | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (int *,int) |  | X509_PURPOSE_set | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (int *,int) |  | X509_TRUST_set | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (int *,int) |  | __lll_unlock_elision | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (int,int) |  | BN_security_bits | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (int,int) |  | EVP_MD_meth_new | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (int,int) |  | EVP_PKEY_meth_new | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (int,int) |  | __isctype | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (int,int) |  | acttab_alloc | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (int,int) |  | div | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (int,int) |  | inet6_rth_space | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (long double,int) |  | __ldexpl | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (netlink_handle *,int) |  | __netlink_request | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (nghttp2_option *,int) |  | nghttp2_option_set_no_auto_ping_ack | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (nghttp2_option *,int) |  | nghttp2_option_set_no_auto_window_update | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (nghttp2_option *,int) |  | nghttp2_option_set_no_closed_streams | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (nghttp2_option *,int) |  | nghttp2_option_set_no_http_messaging | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (nghttp2_option *,int) |  | nghttp2_option_set_no_recv_client_magic | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (nghttp2_option *,int) |  | nghttp2_option_set_no_rfc9113_leading_and_trailing_ws_validation | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (nghttp2_option *,int) |  | nghttp2_option_set_server_fallback_rfc7540_priorities | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (ns_msg,int) |  | ns_msg_getflag | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (obstack *,int) |  | _obstack_newchunk | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (posix_spawnattr_t *,int) |  | posix_spawnattr_setcgroup_np | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (posix_spawnattr_t *,int) |  | posix_spawnattr_setschedpolicy | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (pthread_attr_t *,int) |  | __pthread_attr_setschedpolicy | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (pthread_barrierattr_t *,int) |  | __pthread_barrierattr_setpshared | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (pthread_mutexattr_t *,int) |  | ___pthread_mutexattr_settype | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (pthread_mutexattr_t *,int) |  | __pthread_mutexattr_setprioceiling | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (pthread_mutexattr_t *,int) |  | __pthread_mutexattr_setprotocol | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (pthread_rwlockattr_t *,int) |  | __pthread_rwlockattr_setkind_np | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (pthread_rwlockattr_t *,int) |  | __pthread_rwlockattr_setpshared | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (rule *,int) |  | Configlist_add | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (rule *,int) |  | Configlist_addbasis | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (sigset_t *,int) |  | sigaddset | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (sigset_t *,int) |  | sigdelset | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (sqlite3 *,int) |  | sqlite3_busy_timeout | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (sqlite3 *,int) |  | sqlite3_db_name | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (sqlite3 *,int) |  | sqlite3_wal_autocheckpoint | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (sqlite3_backup *,int) |  | sqlite3_backup_step | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (sqlite3_context *,int) |  | sqlite3_aggregate_context | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (sqlite3_context *,int) |  | sqlite3_result_error_code | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (sqlite3_index_info *,int) |  | sqlite3_vtab_collation | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (sqlite3_stmt *,int) |  | sqlite3_bind_parameter_name | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (sqlite3_stmt *,int) |  | sqlite3_column_blob | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (sqlite3_stmt *,int) |  | sqlite3_column_bytes | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (sqlite3_stmt *,int) |  | sqlite3_column_bytes16 | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (sqlite3_stmt *,int) |  | sqlite3_column_decltype | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (sqlite3_stmt *,int) |  | sqlite3_column_decltype16 | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (sqlite3_stmt *,int) |  | sqlite3_column_double | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (sqlite3_stmt *,int) |  | sqlite3_column_int | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (sqlite3_stmt *,int) |  | sqlite3_column_int64 | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (sqlite3_stmt *,int) |  | sqlite3_column_name | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (sqlite3_stmt *,int) |  | sqlite3_column_name16 | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (sqlite3_stmt *,int) |  | sqlite3_column_text | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (sqlite3_stmt *,int) |  | sqlite3_column_text16 | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (sqlite3_stmt *,int) |  | sqlite3_column_type | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (sqlite3_stmt *,int) |  | sqlite3_column_value | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (sqlite3_stmt *,int) |  | sqlite3_stmt_explain | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (stack_st_PKCS7 *,int) |  | PKCS12_add_safes | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (stack_st_SSL_COMP *,int) |  | ssl3_comp_find | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (stack_st_X509_ATTRIBUTE *,int) |  | X509at_delete_attr | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (stack_st_X509_EXTENSION *,int) |  | X509v3_delete_ext | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (timespec *,int) |  | __timespec_get | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (timespec *,int) |  | __timespec_getres | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (uint16_t,int) |  | tls1_group_id2nid | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (unsigned char *,int) |  | RAND_bytes | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (unsigned char *,int) |  | RAND_priv_bytes | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (unsigned char *,int) |  | ossl_ipaddr_to_asc | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (unsigned short,int) |  | dtls1_get_queue_priority | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (uv_env_item_t *,int) |  | uv_os_free_environ | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (void *,int) |  | DSO_dsobyaddr | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (void *,int) |  | sqlite3_realloc | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (void *const *,int) |  | __backtrace_symbols | 1 |
-| thread.cpp:18:6:18:22 | thread_function_3 | (wchar_t,int) | CStringT | CStringT | 1 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | ASN1_STRING_type_new | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | ASN1_tag2bit | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | ASN1_tag2str | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | Jim_ReturnCode | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | Jim_SignalId | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | OBJ_nid2ln | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | OBJ_nid2obj | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | OBJ_nid2sn | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | OSSL_trace_get_category_name | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | PKCS12_init | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | Symbol_Nth | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | X509_PURPOSE_get0 | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | X509_TRUST_get0 | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | X509_TRUST_get_by_id | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | __btowc | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | __current_locale_name | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | __fdopendir | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | __get_errlist | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | __get_errname | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | __math_invalid_i | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | __math_invalidf_i | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | __p_class | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | __p_rcode | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | __p_type | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | __pkey_get | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | __sigdescr_np | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | __strerrordesc_np | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | _tolower | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | _toupper | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | btowc | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | c_tolower | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | c_toupper | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | curlx_sitouz | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | evp_pkey_type2name | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | inet6_option_space | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | isalnum | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | isalpha | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | isblank | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | iscntrl | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | isdigit | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | isgraph | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | islower | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | isprint | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | ispunct | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | isspace | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | isupper | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | isxdigit | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | ossl_tolower | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | ossl_toupper | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | sigabbrev_np | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | sqlite3_compileoption_get | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | sqlite3_errstr | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | strerrorname_np | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | support_report_failure | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | svcudp_create | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | tls13_alert_code | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | toascii | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | tolower | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | toupper | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | uabs | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | uv__accept | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | uv_err_name | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | uv_get_osfhandle | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | uv_strerror | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | uv_translate_sys_error | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) |  | zError | 0 |
-| vector.cpp:13:6:13:9 | sink | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | ASN1_STRING_type_new | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | ASN1_tag2bit | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | ASN1_tag2str | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | Jim_ReturnCode | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | Jim_SignalId | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | OBJ_nid2ln | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | OBJ_nid2obj | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | OBJ_nid2sn | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | OSSL_trace_get_category_name | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | PKCS12_init | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | Symbol_Nth | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | X509_PURPOSE_get0 | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | X509_TRUST_get0 | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | X509_TRUST_get_by_id | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | __btowc | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | __current_locale_name | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | __fdopendir | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | __get_errlist | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | __get_errname | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | __math_invalid_i | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | __math_invalidf_i | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | __p_class | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | __p_rcode | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | __p_type | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | __pkey_get | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | __sigdescr_np | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | __strerrordesc_np | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | _tolower | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | _toupper | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | btowc | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | c_tolower | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | c_toupper | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | curlx_sitouz | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | evp_pkey_type2name | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | inet6_option_space | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | isalnum | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | isalpha | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | isblank | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | iscntrl | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | isdigit | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | isgraph | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | islower | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | isprint | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | ispunct | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | isspace | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | isupper | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | isxdigit | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | ossl_tolower | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | ossl_toupper | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | sigabbrev_np | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | sqlite3_compileoption_get | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | sqlite3_errstr | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | strerrorname_np | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | support_report_failure | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | svcudp_create | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | tls13_alert_code | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | toascii | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | tolower | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | toupper | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | uabs | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | uv__accept | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | uv_err_name | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | uv_get_osfhandle | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | uv_strerror | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | uv_translate_sys_error | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) |  | zError | 0 |
-| vector.cpp:16:6:16:37 | test_range_based_for_loop_vector | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | ASN1_STRING_type_new | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | ASN1_tag2bit | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | ASN1_tag2str | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | Jim_ReturnCode | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | Jim_SignalId | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | OBJ_nid2ln | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | OBJ_nid2obj | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | OBJ_nid2sn | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | OSSL_trace_get_category_name | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | PKCS12_init | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | Symbol_Nth | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | X509_PURPOSE_get0 | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | X509_TRUST_get0 | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | X509_TRUST_get_by_id | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | __btowc | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | __current_locale_name | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | __fdopendir | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | __get_errlist | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | __get_errname | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | __math_invalid_i | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | __math_invalidf_i | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | __p_class | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | __p_rcode | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | __p_type | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | __pkey_get | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | __sigdescr_np | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | __strerrordesc_np | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | _tolower | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | _toupper | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | btowc | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | c_tolower | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | c_toupper | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | curlx_sitouz | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | evp_pkey_type2name | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | inet6_option_space | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | isalnum | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | isalpha | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | isblank | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | iscntrl | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | isdigit | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | isgraph | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | islower | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | isprint | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | ispunct | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | isspace | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | isupper | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | isxdigit | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | ossl_tolower | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | ossl_toupper | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | sigabbrev_np | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | sqlite3_compileoption_get | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | sqlite3_errstr | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | strerrorname_np | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | support_report_failure | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | svcudp_create | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | tls13_alert_code | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | toascii | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | tolower | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | toupper | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | uabs | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | uv__accept | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | uv_err_name | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | uv_get_osfhandle | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | uv_strerror | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | uv_translate_sys_error | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) |  | zError | 0 |
-| vector.cpp:37:6:37:23 | test_element_taint | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| vector.cpp:279:6:279:9 | sink | (int *) |  | rresvport | 0 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (ASN1_STRING *,int) |  | ASN1_STRING_length_set | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (ASYNC_WAIT_CTX *,int) |  | ASYNC_WAIT_CTX_set_status | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (BIGNUM *,int) |  | BN_clear_bit | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (BIGNUM *,int) |  | BN_mask_bits | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (BIGNUM *,int) |  | BN_set_bit | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (BIGNUM *,int) |  | BN_set_flags | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (BIGNUM *,int) |  | bn_expand2 | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (BIGNUM *,int) |  | bn_wexpand | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (BIGNUM *,int) |  | ossl_bn_mask_bits_fixed_top | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (BIO *,int) |  | BIO_clear_flags | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (BIO *,int) |  | BIO_find_type | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (BIO *,int) |  | BIO_set_flags | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (BIO *,int) |  | BIO_set_init | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (BIO *,int) |  | BIO_set_retry_reason | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (BIO *,int) |  | BIO_set_shutdown | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (BIO *,int) |  | TXT_DB_read | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (CMS_SignerInfo *,int) |  | CMS_signed_delete_attr | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (CMS_SignerInfo *,int) |  | CMS_unsigned_delete_attr | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (CURL *,int) |  | curl_easy_pause | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (Curl_easy *,int) |  | Curl_conn_get_socket | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (DH *,int) |  | DH_clear_flags | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (DH *,int) |  | DH_set_flags | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (DH_METHOD *,int) |  | DH_meth_set_flags | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (DSA *,int) |  | DSA_clear_flags | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (DSA *,int) |  | DSA_set_flags | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (DSA_METHOD *,int) |  | DSA_meth_set_flags | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (EC_GROUP *,int) |  | EC_GROUP_set_asn1_flag | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (EC_GROUP *,int) |  | EC_GROUP_set_curve_name | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (EC_KEY *,int) |  | EC_KEY_clear_flags | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (EC_KEY *,int) |  | EC_KEY_set_asn1_flag | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (EC_KEY *,int) |  | EC_KEY_set_flags | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (ENGINE *,int) |  | ENGINE_cmd_is_executable | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (ENGINE *,int) |  | ENGINE_set_flags | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (EVP_CIPHER *,int) |  | EVP_CIPHER_meth_set_impl_ctx_size | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (EVP_CIPHER *,int) |  | EVP_CIPHER_meth_set_iv_length | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_clear_flags | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_flags | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_key_length | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_set_num | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (EVP_KEYMGMT *,int) |  | evp_keymgmt_util_query_operation_name | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (EVP_MD *,int) |  | EVP_MD_meth_set_app_datasize | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (EVP_MD *,int) |  | EVP_MD_meth_set_input_blocksize | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (EVP_MD *,int) |  | EVP_MD_meth_set_result_size | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (EVP_MD_CTX *,int) |  | EVP_MD_CTX_clear_flags | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (EVP_MD_CTX *,int) |  | EVP_MD_CTX_set_flags | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (EVP_PKEY *,int) |  | EVP_PKEY_delete_attr | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (EVP_PKEY *,int) |  | EVP_PKEY_save_parameters | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (EVP_PKEY *,int) |  | EVP_PKEY_set_type | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_get_keygen_info | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_kdf_type | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_nid | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_paramgen_type | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dh_rfc5114 | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_dhx_rfc5114 | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ec_param_enc | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ec_paramgen_curve_nid | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_ecdh_kdf_type | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_hkdf_mode | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_rsa_padding | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (EVP_PKEY_CTX *,int) |  | EVP_PKEY_CTX_set_rsa_pss_saltlen | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_gindex | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_h | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (FFC_PARAMS *,int) |  | ossl_ffc_params_set_pcounter | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (FILE *,int) |  | _IO_default_pbackfail | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (FILE *,int) |  | _IO_fwide | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (FILE *,int) |  | _IO_init | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (FILE *,int) |  | _IO_init_internal | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (FILE *,int) |  | _IO_new_file_attach | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (FILE *,int) |  | _IO_new_file_overflow | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (FILE *,int) |  | _IO_old_init | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (FILE *,int) |  | _IO_sputbackc | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (FILE *,int) |  | _IO_str_overflow | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (FILE *,int) |  | _IO_str_pbackfail | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (FILE *,int) |  | __printf_buffer_as_file_overflow | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (FILE *,int) |  | __wprintf_buffer_as_file_overflow | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (FTS *,int) |  | fts_children | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (LIBSSH2_CHANNEL *,int) |  | _libssh2_channel_extended_data | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (LIBSSH2_CHANNEL *,int) |  | _libssh2_channel_flush | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_flush_ex | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_handle_extended_data | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_handle_extended_data2 | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (LIBSSH2_CHANNEL *,int) |  | libssh2_channel_set_blocking | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (LIBSSH2_SESSION *,int) |  | _libssh2_session_set_blocking | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (LIBSSH2_SESSION *,int) |  | libssh2_hostkey_hash | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (LIBSSH2_SESSION *,int) |  | libssh2_session_methods | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (LIBSSH2_SESSION *,int) |  | libssh2_session_set_blocking | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (LIBSSH2_SESSION *,int) |  | libssh2_session_startup | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (LPCOLESTR,int) | CComBSTR | Append | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (OCSP_BASICRESP *,int) |  | OCSP_BASICRESP_delete_ext | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (OCSP_BASICRESP *,int) |  | OCSP_BASICRESP_get_ext | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (OCSP_BASICRESP *,int) |  | OCSP_resp_get0 | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (OCSP_ONEREQ *,int) |  | OCSP_ONEREQ_delete_ext | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (OCSP_ONEREQ *,int) |  | OCSP_ONEREQ_get_ext | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (OCSP_REQUEST *,int) |  | OCSP_REQUEST_delete_ext | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (OCSP_REQUEST *,int) |  | OCSP_REQUEST_get_ext | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (OCSP_REQUEST *,int) |  | OCSP_request_onereq_get0 | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (OCSP_SINGLERESP *,int) |  | OCSP_SINGLERESP_delete_ext | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (OCSP_SINGLERESP *,int) |  | OCSP_SINGLERESP_get_ext | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (OPENSSL_STACK *,int) |  | OPENSSL_sk_delete | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (OPENSSL_STACK *,int) |  | OPENSSL_sk_reserve | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (OPENSSL_sk_compfunc,int) |  | OPENSSL_sk_new_reserve | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (OSSL_ACKM *,int) |  | ossl_ackm_get_ack_deadline | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (OSSL_ACKM *,int) |  | ossl_ackm_get_ack_frame | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (OSSL_ACKM *,int) |  | ossl_ackm_get_largest_acked | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (OSSL_ACKM *,int) |  | ossl_ackm_on_pkt_space_discarded | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_set_serverPort | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (OSSL_CMP_CTX *,int) |  | ossl_cmp_ctx_set_failInfoCode | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (OSSL_CMP_CTX *,int) |  | ossl_cmp_ctx_set_status | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (OSSL_CMP_CTX *,int) |  | ossl_cmp_msg_create | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (OSSL_CMP_CTX *,int) |  | ossl_cmp_pollReq_new | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (OSSL_CMP_MSG *,int) |  | ossl_cmp_msg_set_bodytype | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (OSSL_CMP_PKIHEADER *,int) |  | ossl_cmp_hdr_set_pvno | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (OSSL_CMP_REVREPCONTENT *,int) |  | ossl_cmp_revrepcontent_get_CertId | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (OSSL_CMP_REVREPCONTENT *,int) |  | ossl_cmp_revrepcontent_get_pkisi | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_accept_raverified | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_accept_unprotected | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_grant_implicit_confirm | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (OSSL_CMP_SRV_CTX *,int) |  | OSSL_CMP_SRV_CTX_set_send_unprotected_errors | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (OSSL_CRMF_PKIPUBLICATIONINFO *,int) |  | OSSL_CRMF_MSG_set_PKIPublicationInfo_action | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (OSSL_DECODER_CTX *,int) |  | OSSL_DECODER_CTX_set_selection | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (OSSL_ENCODER_CTX *,int) |  | OSSL_ENCODER_CTX_set_selection | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (OSSL_LIB_CTX *,int) |  | OSSL_LIB_CTX_get_data | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (OSSL_LIB_CTX *,int) |  | OSSL_LIB_CTX_set_conf_diagnostics | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (OSSL_LIB_CTX *,int) |  | ossl_ctx_global_properties | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (OSSL_LIB_CTX *,int) |  | ossl_dh_new_by_nid_ex | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (OSSL_LIB_CTX *,int) |  | ossl_lib_ctx_get_data | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (OSSL_LIB_CTX *,int) |  | ossl_mac_key_new | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (OSSL_PARAM *,int) |  | OSSL_PARAM_set_int | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (OSSL_QRX *,int) |  | ossl_qrx_get_bytes_received | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (OSSL_RECORD_LAYER *,int) |  | tls_set_first_handshake | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (OSSL_RECORD_LAYER *,int) |  | tls_set_plain_alerts | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (OSSL_STORE_CTX *,int) |  | OSSL_STORE_expect | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (PKCS7 *,int) |  | PKCS7_set_type | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (QUIC_CHANNEL *,int) |  | ossl_quic_channel_new_stream_local | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (QUIC_ENGINE *,int) |  | ossl_quic_engine_set_inhibit_tick | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (QUIC_PORT *,int) |  | ossl_quic_port_set_allow_incoming | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (QUIC_RCIDM *,int) |  | ossl_quic_rcidm_get_preferred_tx_dcid_changed | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (QUIC_RSTREAM *,int) |  | ossl_quic_rstream_set_cleanse | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (QUIC_RXFC *,int) |  | ossl_quic_rxfc_get_error | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (QUIC_RXFC *,int) |  | ossl_quic_rxfc_has_cwm_changed | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (QUIC_SSTREAM *,int) |  | ossl_quic_sstream_set_cleanse | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (QUIC_STREAM_MAP *,int) |  | ossl_quic_stream_map_get_accept_queue_len | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (QUIC_TXFC *,int) |  | ossl_quic_txfc_has_become_blocked | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (RSA *,int) |  | RSA_clear_flags | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (RSA *,int) |  | RSA_set_flags | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (RSA_METHOD *,int) |  | RSA_meth_set_flags | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_hashalg | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_maskgenhashalg | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_saltlen | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (RSA_PSS_PARAMS_30 *,int) |  | ossl_rsa_pss_params_30_set_trailerfield | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (SSL *,int) |  | SSL_key_update | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (SSL *,int) |  | SSL_set_post_handshake_auth | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (SSL *,int) |  | SSL_set_purpose | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (SSL *,int) |  | SSL_set_quic_tls_early_data_enabled | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (SSL *,int) |  | SSL_set_quiet_shutdown | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (SSL *,int) |  | SSL_set_read_ahead | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (SSL *,int) |  | SSL_set_security_level | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (SSL *,int) |  | SSL_set_shutdown | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (SSL *,int) |  | SSL_set_trust | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (SSL *,int) |  | SSL_set_verify_depth | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (SSL_CONNECTION *,int) |  | dtls1_read_failed | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (SSL_CONNECTION *,int) |  | ossl_statem_send_fatal | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (SSL_CONNECTION *,int) |  | ossl_statem_set_in_init | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (SSL_CONNECTION *,int) |  | tls1_shared_group | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (SSL_CTX *,int) |  | SSL_CTX_set_post_handshake_auth | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (SSL_CTX *,int) |  | SSL_CTX_set_purpose | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (SSL_CTX *,int) |  | SSL_CTX_set_quiet_shutdown | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (SSL_CTX *,int) |  | SSL_CTX_set_security_level | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (SSL_CTX *,int) |  | SSL_CTX_set_srp_strength | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (SSL_CTX *,int) |  | SSL_CTX_set_trust | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (SSL_CTX *,int) |  | SSL_CTX_set_verify_depth | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (SSL_CTX *,int) |  | ssl_md | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (SSL_SESSION *,int) |  | SSL_SESSION_set_protocol_version | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (TS_REQ *,int) |  | TS_REQ_delete_ext | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (TS_REQ *,int) |  | TS_REQ_get_ext | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (TS_RESP_CTX *,int) |  | TS_RESP_CTX_add_flags | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (TS_STATUS_INFO *,int) |  | TS_STATUS_INFO_set_status | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (TS_TST_INFO *,int) |  | TS_TST_INFO_delete_ext | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (TS_TST_INFO *,int) |  | TS_TST_INFO_get_ext | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (TS_VERIFY_CTX *,int) |  | TS_VERIFY_CTX_add_flags | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (TS_VERIFY_CTX *,int) |  | TS_VERIFY_CTX_set_flags | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (WPACKET *,int) |  | ossl_DER_w_begin_sequence | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (X509 *,int) |  | X509_delete_ext | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (X509 *,int) |  | X509_self_signed | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (X509_ACERT *,int) |  | X509_ACERT_delete_attr | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (X509_ATTRIBUTE *,int) |  | X509_ATTRIBUTE_get0_type | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (X509_CRL *,int) |  | X509_CRL_delete_ext | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (X509_NAME *,int) |  | X509_NAME_delete_entry | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (X509_REQ *,int) |  | X509_REQ_delete_attr | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (X509_REVOKED *,int) |  | X509_REVOKED_delete_ext | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (X509_STORE *,int) |  | X509_STORE_set_depth | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (X509_STORE *,int) |  | X509_STORE_set_purpose | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (X509_STORE *,int) |  | X509_STORE_set_trust | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_depth | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_error | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_error_depth | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_purpose | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (X509_STORE_CTX *,int) |  | X509_STORE_CTX_set_trust | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_get0_host | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_auth_level | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_depth | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_purpose | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (X509_VERIFY_PARAM *,int) |  | X509_VERIFY_PARAM_set_trust | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (_Float128,int) |  | __ldexpf128 | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (_Float128,int) |  | __scalbnf128 | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (__sigset_t *,int) |  | __sigaddset_compat | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (__sigset_t *,int) |  | __sigdelset_compat | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (acttab *,int) |  | acttab_insert | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (addrinfo *,int) |  | support_format_addrinfo | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (aiocb_union *,int) |  | __aio_enqueue_request | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (argp_fmtstream_t,int) |  | __argp_fmtstream_putc | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (char **,int) |  | addrsort | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (char *,int) |  | Curl_str2addr | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (char *,int) |  | PEM_proc_type | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (char,int) | CStringT | CStringT | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (connectdata *,int) |  | Curl_conn_is_ssl | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const ASN1_BIT_STRING *,int) |  | ASN1_BIT_STRING_get_bit | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const BIGNUM *,int) |  | BN_get_flags | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const BIGNUM *,int) |  | BN_is_bit_set | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const BIO *,int) |  | BIO_get_ex_data | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const BIO *,int) |  | BIO_test_flags | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const CMS_SignerInfo *,int) |  | CMS_signed_get_attr | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const CMS_SignerInfo *,int) |  | CMS_unsigned_get_attr | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const CRYPTO_EX_DATA *,int) |  | CRYPTO_get_ex_data | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const DH *,int) |  | DH_get_ex_data | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const DH *,int) |  | DH_test_flags | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const DH *,int) |  | ossl_dh_dup | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const DSA *,int) |  | DSA_get_ex_data | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const DSA *,int) |  | DSA_test_flags | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const DSA *,int) |  | ossl_dsa_dup | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const ECX_KEY *,int) |  | ossl_ecx_key_dup | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const EC_KEY *,int) |  | EC_KEY_get_ex_data | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const EC_KEY *,int) |  | ossl_ec_key_dup | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const ENGINE *,int) |  | ENGINE_get_ex_data | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const EVP_CIPHER_CTX *,int) |  | EVP_CIPHER_CTX_test_flags | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const EVP_MD_CTX *,int) |  | EVP_MD_CTX_test_flags | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const EVP_PKEY *,int) |  | EVP_PKEY_get_attr | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const EVP_PKEY *,int) |  | EVP_PKEY_get_ex_data | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const ML_DSA_KEY *,int) |  | ossl_ml_dsa_key_dup | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const ML_KEM_KEY *,int) |  | ossl_ml_kem_key_dup | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const OPENSSL_STACK *,int) |  | OPENSSL_sk_value | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const OSSL_CMP_CERTREPMESSAGE *,int) |  | ossl_cmp_certrepmessage_get0_certresponse | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_get0_newPkey | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const OSSL_CMP_CTX *,int) |  | OSSL_CMP_CTX_get_option | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const OSSL_CMP_PKISI *,int) |  | ossl_cmp_pkisi_check_pkifailureinfo | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const OSSL_CMP_POLLREPCONTENT *,int) |  | ossl_cmp_pollrepcontent_get0_pollrep | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const QUIC_CHANNEL *,int) |  | ossl_quic_channel_get_local_stream_count_avail | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const QUIC_CHANNEL *,int) |  | ossl_quic_channel_get_remote_stream_count_avail | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const RSA *,int) |  | RSA_get_ex_data | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const RSA *,int) |  | RSA_test_flags | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const RSA *,int) |  | ossl_rsa_dup | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const SLH_DSA_KEY *,int) |  | ossl_slh_dsa_key_dup | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const SSL *,int) |  | SSL_get_ex_data | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const SSL_CTX *,int) |  | SSL_CTX_get_ex_data | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const SSL_SESSION *,int) |  | SSL_SESSION_get_ex_data | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const SSL_SESSION *,int) |  | ssl_session_dup | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const UI *,int) |  | UI_get_ex_data | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const UI_METHOD *,int) |  | UI_method_get_ex_data | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const X509 *,int) |  | X509_get_ex_data | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const X509 *,int) |  | X509_get_ext | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const X509_ACERT *,int) |  | X509_ACERT_get_attr | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const X509_CRL *,int) |  | X509_CRL_get_ext | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const X509_NAME *,int) |  | X509_NAME_get_entry | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const X509_POLICY_LEVEL *,int) |  | X509_policy_level_get0_node | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const X509_POLICY_TREE *,int) |  | X509_policy_tree_get0_level | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const X509_REQ *,int) |  | X509_REQ_get_attr | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const X509_REVOKED *,int) |  | X509_REVOKED_get_ext | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const X509_STORE *,int) |  | X509_STORE_get_ex_data | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const X509_STORE_CTX *,int) |  | X509_STORE_CTX_get_ex_data | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const XCHAR *,int) | CStringT | CStringT | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const YCHAR *,int) | CStringT | CStringT | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const char *,int) |  | DH_meth_new | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const char *,int) |  | DSA_meth_new | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const char *,int) |  | Jim_StrDupLen | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const char *,int) |  | NETSCAPE_SPKI_b64_decode | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const char *,int) |  | RSA_meth_new | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const char *,int) |  | ftok | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const char *,int) |  | gethostbyname2 | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const char *,int) |  | parse_yesno | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const char *,int) |  | res_gethostbyname2 | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const stack_st_X509_ATTRIBUTE *,int) |  | X509at_get_attr | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const stack_st_X509_EXTENSION *,int) |  | X509v3_get_ext | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const unsigned char *,int) |  | Jim_GenHashFunction | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const unsigned char *,int) |  | OPENSSL_uni2asc | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const unsigned char *,int) |  | OPENSSL_uni2utf8 | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (const void *,int) |  | inet6_rth_getaddr | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (double,int) |  | __ldexp | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (double,int) |  | __scalbn | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (double[],int) |  | getloadavg | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (dynhds *,int) |  | Curl_dynhds_set_opts | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (fexcept_t *,int) |  | fegetexceptflag | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (float,int) |  | __ldexpf | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (float,int) |  | __scalbnf | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (gzFile,int) |  | gzflush | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (gzFile,int) |  | gzputc | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (int *,int) |  | X509_PURPOSE_set | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (int *,int) |  | X509_TRUST_set | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (int *,int) |  | __lll_unlock_elision | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (int,int) |  | BN_security_bits | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (int,int) |  | EVP_MD_meth_new | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (int,int) |  | EVP_PKEY_meth_new | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (int,int) |  | __isctype | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (int,int) |  | acttab_alloc | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (int,int) |  | div | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (int,int) |  | inet6_rth_space | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (long double,int) |  | __ldexpl | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (netlink_handle *,int) |  | __netlink_request | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (nghttp2_option *,int) |  | nghttp2_option_set_no_auto_ping_ack | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (nghttp2_option *,int) |  | nghttp2_option_set_no_auto_window_update | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (nghttp2_option *,int) |  | nghttp2_option_set_no_closed_streams | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (nghttp2_option *,int) |  | nghttp2_option_set_no_http_messaging | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (nghttp2_option *,int) |  | nghttp2_option_set_no_recv_client_magic | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (nghttp2_option *,int) |  | nghttp2_option_set_no_rfc9113_leading_and_trailing_ws_validation | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (nghttp2_option *,int) |  | nghttp2_option_set_server_fallback_rfc7540_priorities | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (ns_msg,int) |  | ns_msg_getflag | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (obstack *,int) |  | _obstack_newchunk | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (posix_spawnattr_t *,int) |  | posix_spawnattr_setcgroup_np | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (posix_spawnattr_t *,int) |  | posix_spawnattr_setschedpolicy | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (pthread_attr_t *,int) |  | __pthread_attr_setschedpolicy | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (pthread_barrierattr_t *,int) |  | __pthread_barrierattr_setpshared | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (pthread_mutexattr_t *,int) |  | ___pthread_mutexattr_settype | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (pthread_mutexattr_t *,int) |  | __pthread_mutexattr_setprioceiling | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (pthread_mutexattr_t *,int) |  | __pthread_mutexattr_setprotocol | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (pthread_rwlockattr_t *,int) |  | __pthread_rwlockattr_setkind_np | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (pthread_rwlockattr_t *,int) |  | __pthread_rwlockattr_setpshared | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (rule *,int) |  | Configlist_add | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (rule *,int) |  | Configlist_addbasis | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (sigset_t *,int) |  | sigaddset | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (sigset_t *,int) |  | sigdelset | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (sqlite3 *,int) |  | sqlite3_busy_timeout | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (sqlite3 *,int) |  | sqlite3_db_name | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (sqlite3 *,int) |  | sqlite3_wal_autocheckpoint | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (sqlite3_backup *,int) |  | sqlite3_backup_step | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (sqlite3_context *,int) |  | sqlite3_aggregate_context | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (sqlite3_context *,int) |  | sqlite3_result_error_code | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (sqlite3_index_info *,int) |  | sqlite3_vtab_collation | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (sqlite3_stmt *,int) |  | sqlite3_bind_parameter_name | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (sqlite3_stmt *,int) |  | sqlite3_column_blob | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (sqlite3_stmt *,int) |  | sqlite3_column_bytes | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (sqlite3_stmt *,int) |  | sqlite3_column_bytes16 | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (sqlite3_stmt *,int) |  | sqlite3_column_decltype | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (sqlite3_stmt *,int) |  | sqlite3_column_decltype16 | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (sqlite3_stmt *,int) |  | sqlite3_column_double | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (sqlite3_stmt *,int) |  | sqlite3_column_int | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (sqlite3_stmt *,int) |  | sqlite3_column_int64 | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (sqlite3_stmt *,int) |  | sqlite3_column_name | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (sqlite3_stmt *,int) |  | sqlite3_column_name16 | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (sqlite3_stmt *,int) |  | sqlite3_column_text | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (sqlite3_stmt *,int) |  | sqlite3_column_text16 | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (sqlite3_stmt *,int) |  | sqlite3_column_type | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (sqlite3_stmt *,int) |  | sqlite3_column_value | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (sqlite3_stmt *,int) |  | sqlite3_stmt_explain | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (stack_st_PKCS7 *,int) |  | PKCS12_add_safes | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (stack_st_SSL_COMP *,int) |  | ssl3_comp_find | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (stack_st_X509_ATTRIBUTE *,int) |  | X509at_delete_attr | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (stack_st_X509_EXTENSION *,int) |  | X509v3_delete_ext | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (timespec *,int) |  | __timespec_get | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (timespec *,int) |  | __timespec_getres | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (uint16_t,int) |  | tls1_group_id2nid | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (unsigned char *,int) |  | RAND_bytes | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (unsigned char *,int) |  | RAND_priv_bytes | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (unsigned char *,int) |  | ossl_ipaddr_to_asc | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (unsigned short,int) |  | dtls1_get_queue_priority | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (uv_env_item_t *,int) |  | uv_os_free_environ | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (void *,int) |  | DSO_dsobyaddr | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (void *,int) |  | sqlite3_realloc | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (void *const *,int) |  | __backtrace_symbols | 1 |
-| vector.cpp:333:6:333:35 | vector_iterator_assign_wrapper | (wchar_t,int) | CStringT | CStringT | 1 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | ASN1_STRING_type_new | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | ASN1_tag2bit | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | ASN1_tag2str | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | EVP_PKEY_asn1_get0 | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | Jim_ReturnCode | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | Jim_SignalId | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | OBJ_nid2ln | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | OBJ_nid2obj | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | OBJ_nid2sn | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | OSSL_STORE_INFO_type_string | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | OSSL_trace_get_category_name | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | PKCS12_init | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | Symbol_Nth | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | X509_PURPOSE_get0 | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | X509_PURPOSE_get_by_id | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | X509_TRUST_get0 | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | X509_TRUST_get_by_id | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | X509_VERIFY_PARAM_get0 | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | __btowc | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | __current_locale_name | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | __fdopendir | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | __get_errlist | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | __get_errname | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | __math_invalid_i | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | __math_invalidf_i | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | __p_class | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | __p_rcode | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | __p_type | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | __pkey_get | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | __sigdescr_np | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | __strerrordesc_np | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | _tolower | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | _toupper | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | btowc | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | c_tolower | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | c_toupper | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | curlx_sitouz | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | evp_pkey_type2name | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | inet6_option_space | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | isalnum | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | isalpha | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | isblank | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | iscntrl | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | isdigit | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | isgraph | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | islower | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | isprint | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | ispunct | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | isspace | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | isupper | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | isxdigit | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | ossl_cmp_bodytype_to_string | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | ossl_tolower | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | ossl_toupper | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | sigabbrev_np | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | sqlite3_compileoption_get | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | sqlite3_errstr | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | strerrorname_np | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | support_report_failure | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | svcudp_create | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | tls13_alert_code | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | toascii | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | tolower | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | toupper | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | uabs | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | uv__accept | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | uv_err_name | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | uv_get_osfhandle | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | uv_strerror | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | uv_translate_sys_error | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) |  | zError | 0 |
-| vector.cpp:337:6:337:32 | test_vector_output_iterator | (int) | __pthread_cleanup_class | __setdoit | 0 |
-| vector.cpp:417:6:417:25 | test_vector_inserter | (char *) |  | SRP_VBASE_new | 0 |
-| vector.cpp:417:6:417:25 | test_vector_inserter | (char *) |  | _IO_gets | 0 |
-| vector.cpp:417:6:417:25 | test_vector_inserter | (char *) |  | __mktemp | 0 |
-| vector.cpp:417:6:417:25 | test_vector_inserter | (char *) |  | __nis_default_group | 0 |
-| vector.cpp:417:6:417:25 | test_vector_inserter | (char *) |  | __nis_default_owner | 0 |
-| vector.cpp:417:6:417:25 | test_vector_inserter | (char *) |  | __nis_default_ttl | 0 |
-| vector.cpp:417:6:417:25 | test_vector_inserter | (char *) |  | __xpg_basename | 0 |
-| vector.cpp:417:6:417:25 | test_vector_inserter | (char *) |  | ctermid | 0 |
-| vector.cpp:417:6:417:25 | test_vector_inserter | (char *) |  | cuserid | 0 |
-| vector.cpp:417:6:417:25 | test_vector_inserter | (char *) |  | defossilize | 0 |
-| vector.cpp:417:6:417:25 | test_vector_inserter | (char *) |  | des_setparity | 0 |
-| vector.cpp:417:6:417:25 | test_vector_inserter | (char *) |  | dirname | 0 |
-| vector.cpp:417:6:417:25 | test_vector_inserter | (char *) |  | getwd | 0 |
-| vector.cpp:417:6:417:25 | test_vector_inserter | (char *) |  | make_uppercase | 0 |
-| vector.cpp:417:6:417:25 | test_vector_inserter | (char *) |  | mkdtemp | 0 |
-| vector.cpp:417:6:417:25 | test_vector_inserter | (char *) |  | next_item | 0 |
-| vector.cpp:417:6:417:25 | test_vector_inserter | (char *) |  | strfry | 0 |
-| vector.cpp:417:6:417:25 | test_vector_inserter | (char *) | CStringT | CStringT | 0 |
-| vector.cpp:454:7:454:12 | memcpy | (BIO *,OCSP_REQUEST *,unsigned long) |  | OCSP_REQUEST_print | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (BIO *,OCSP_RESPONSE *,unsigned long) |  | OCSP_RESPONSE_print | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (BIO *,X509 *,unsigned long) |  | ossl_x509_print_ex_brief | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (BIO *,X509_CRL *,unsigned long) |  | X509_CRL_print_ex | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (BIO *,const ASN1_STRING *,unsigned long) |  | ASN1_STRING_print_ex | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (BLAKE2B_CTX *,const void *,size_t) |  | ossl_blake2b_update | 1 |
-| vector.cpp:454:7:454:12 | memcpy | (BLAKE2B_CTX *,const void *,size_t) |  | ossl_blake2b_update | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (BLAKE2B_PARAM *,const uint8_t *,size_t) |  | ossl_blake2b_param_set_personal | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (BLAKE2B_PARAM *,const uint8_t *,size_t) |  | ossl_blake2b_param_set_salt | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (BLAKE2S_CTX *,const void *,size_t) |  | ossl_blake2s_update | 1 |
-| vector.cpp:454:7:454:12 | memcpy | (BLAKE2S_CTX *,const void *,size_t) |  | ossl_blake2s_update | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (BLAKE2S_PARAM *,const uint8_t *,size_t) |  | ossl_blake2s_param_set_personal | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (BLAKE2S_PARAM *,const uint8_t *,size_t) |  | ossl_blake2s_param_set_salt | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (CCM128_CONTEXT *,const unsigned char *,size_t) |  | CRYPTO_ccm128_aad | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (CCM128_CONTEXT *,unsigned char *,size_t) |  | CRYPTO_ccm128_tag | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (CMAC_CTX *,const void *,size_t) |  | CMAC_Update | 1 |
-| vector.cpp:454:7:454:12 | memcpy | (CMAC_CTX *,const void *,size_t) |  | CMAC_Update | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (CMS_RecipientInfo *,const unsigned char *,size_t) |  | CMS_RecipientInfo_kekri_id_cmp | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (Curl_easy *,unsigned char *,size_t) |  | Curl_rand_alnum | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (Curl_easy *,unsigned char *,size_t) |  | Curl_rand_bytes | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (Curl_easy *,unsigned char *,size_t) |  | Curl_rand_hex | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (DH *,const unsigned char *,size_t) |  | ossl_dh_buf2key | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (EC_GROUP *,const unsigned char *,size_t) |  | EC_GROUP_set_seed | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (EC_KEY *,const unsigned char *,size_t) |  | ossl_ec_key_simple_oct2priv | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (EVP_MAC_CTX **,const void *,size_t) |  | _libssh2_hmac_update | 1 |
-| vector.cpp:454:7:454:12 | memcpy | (EVP_MAC_CTX **,const void *,size_t) |  | _libssh2_hmac_update | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (EVP_MAC_CTX **,void *,size_t) |  | _libssh2_hmac_sha1_init | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (EVP_MAC_CTX **,void *,size_t) |  | _libssh2_hmac_sha256_init | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (EVP_MAC_CTX **,void *,size_t) |  | _libssh2_hmac_sha512_init | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (EVP_MD_CTX **,const void *,size_t) |  | _libssh2_sha1_update | 1 |
-| vector.cpp:454:7:454:12 | memcpy | (EVP_MD_CTX **,const void *,size_t) |  | _libssh2_sha1_update | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (EVP_MD_CTX **,const void *,size_t) |  | _libssh2_sha256_update | 1 |
-| vector.cpp:454:7:454:12 | memcpy | (EVP_MD_CTX **,const void *,size_t) |  | _libssh2_sha256_update | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (EVP_MD_CTX **,const void *,size_t) |  | _libssh2_sha384_update | 1 |
-| vector.cpp:454:7:454:12 | memcpy | (EVP_MD_CTX **,const void *,size_t) |  | _libssh2_sha384_update | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (EVP_MD_CTX **,const void *,size_t) |  | _libssh2_sha512_update | 1 |
-| vector.cpp:454:7:454:12 | memcpy | (EVP_MD_CTX **,const void *,size_t) |  | _libssh2_sha512_update | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (EVP_MD_CTX *,const unsigned char *,size_t) |  | EVP_DigestVerifyFinal | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (EVP_PKEY *,char *,size_t) |  | EVP_PKEY_get_default_digest_name | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (EVP_RAND_CTX *,unsigned char *,size_t) |  | EVP_RAND_nonce | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (FFC_PARAMS *,const unsigned char *,size_t) |  | ossl_ffc_params_set_seed | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (FILE *,const ASN1_STRING *,unsigned long) |  | ASN1_STRING_print_ex_fp | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (FILE *,const char *,size_t) |  | _IO_new_do_write | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (FILE *,const void *,size_t) |  | _IO_default_xsputn | 1 |
-| vector.cpp:454:7:454:12 | memcpy | (FILE *,const void *,size_t) |  | _IO_default_xsputn | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (FILE *,const void *,size_t) |  | _IO_new_file_xsputn | 1 |
-| vector.cpp:454:7:454:12 | memcpy | (FILE *,const void *,size_t) |  | _IO_new_file_xsputn | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (FILE *,const void *,size_t) |  | _IO_wdefault_xsputn | 1 |
-| vector.cpp:454:7:454:12 | memcpy | (FILE *,const void *,size_t) |  | _IO_wdefault_xsputn | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (FILE *,const void *,size_t) |  | _IO_wfile_xsputn | 1 |
-| vector.cpp:454:7:454:12 | memcpy | (FILE *,const void *,size_t) |  | _IO_wfile_xsputn | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (FILE *,const void *,size_t) |  | __printf_buffer_as_file_xsputn | 1 |
-| vector.cpp:454:7:454:12 | memcpy | (FILE *,const void *,size_t) |  | __printf_buffer_as_file_xsputn | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (FILE *,const void *,size_t) |  | __wprintf_buffer_as_file_xsputn | 1 |
-| vector.cpp:454:7:454:12 | memcpy | (FILE *,const void *,size_t) |  | __wprintf_buffer_as_file_xsputn | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (FILE *,void *,size_t) |  | _IO_default_xsgetn | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (FILE *,void *,size_t) |  | _IO_file_xsgetn | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (FILE *,void *,size_t) |  | _IO_file_xsgetn_mmap | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (FILE *,void *,size_t) |  | _IO_wdefault_xsgetn | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (GCM128_CONTEXT *,const unsigned char *,size_t) |  | CRYPTO_gcm128_aad | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (GCM128_CONTEXT *,const unsigned char *,size_t) |  | CRYPTO_gcm128_setiv | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (GCM128_CONTEXT *,unsigned char *,size_t) |  | CRYPTO_gcm128_tag | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (KECCAK1600_CTX *,const void *,size_t) |  | ossl_sha3_update | 1 |
-| vector.cpp:454:7:454:12 | memcpy | (KECCAK1600_CTX *,const void *,size_t) |  | ossl_sha3_update | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (KECCAK1600_CTX *,unsigned char *,size_t) |  | ossl_sha3_squeeze | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (KECCAK1600_CTX *,unsigned char,size_t) |  | ossl_sha3_init | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (LIBSSH2_CHANNEL *,const char *,size_t) |  | libssh2_channel_signal_ex | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (LIBSSH2_SFTP_HANDLE *,char *,size_t) |  | libssh2_sftp_read | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (LIBSSH2_SFTP_HANDLE *,const char *,size_t) |  | libssh2_sftp_write | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (MD4_CTX *,const void *,size_t) |  | MD4_Update | 1 |
-| vector.cpp:454:7:454:12 | memcpy | (MD4_CTX *,const void *,size_t) |  | MD4_Update | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (MD4_CTX *,const void *,size_t) |  | md4_block_data_order | 1 |
-| vector.cpp:454:7:454:12 | memcpy | (MD4_CTX *,const void *,size_t) |  | md4_block_data_order | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (MD5_CTX *,const void *,size_t) |  | MD5_Update | 1 |
-| vector.cpp:454:7:454:12 | memcpy | (MD5_CTX *,const void *,size_t) |  | MD5_Update | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (MD5_SHA1_CTX *,const void *,size_t) |  | ossl_md5_sha1_update | 1 |
-| vector.cpp:454:7:454:12 | memcpy | (MD5_SHA1_CTX *,const void *,size_t) |  | ossl_md5_sha1_update | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (MDC2_CTX *,const unsigned char *,size_t) |  | MDC2_Update | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (ML_DSA_KEY *,const uint8_t *,size_t) |  | ossl_ml_dsa_pk_decode | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (ML_DSA_KEY *,const uint8_t *,size_t) |  | ossl_ml_dsa_sk_decode | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (MemoryManager *,const uint8_t *,size_t) |  | CreatePreparedDictionary | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (OCB128_CONTEXT *,const unsigned char *,size_t) |  | CRYPTO_ocb128_aad | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (OCB128_CONTEXT *,unsigned char *,size_t) |  | CRYPTO_ocb128_tag | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (OSSL_HPKE_CTX *,const unsigned char *,size_t) |  | OSSL_HPKE_CTX_set1_ikme | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (OSSL_JSON_ENC *,const char *,size_t) |  | ossl_json_str_len | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (OSSL_JSON_ENC *,const void *,size_t) |  | ossl_json_str_hex | 1 |
-| vector.cpp:454:7:454:12 | memcpy | (OSSL_JSON_ENC *,const void *,size_t) |  | ossl_json_str_hex | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (OSSL_LIB_CTX *,unsigned char *,size_t) |  | ossl_rand_cleanup_entropy | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (OSSL_LIB_CTX *,unsigned char *,size_t) |  | ossl_rand_cleanup_user_entropy | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (OSSL_PARAM *,const void *,size_t) |  | OSSL_PARAM_set_octet_ptr | 1 |
-| vector.cpp:454:7:454:12 | memcpy | (OSSL_PARAM *,const void *,size_t) |  | OSSL_PARAM_set_octet_ptr | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (OSSL_PARAM *,const void *,size_t) |  | OSSL_PARAM_set_octet_string | 1 |
-| vector.cpp:454:7:454:12 | memcpy | (OSSL_PARAM *,const void *,size_t) |  | OSSL_PARAM_set_octet_string | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (OSSL_PARAM *,const void *,size_t) |  | OSSL_PARAM_set_octet_string_or_ptr | 1 |
-| vector.cpp:454:7:454:12 | memcpy | (OSSL_PARAM *,const void *,size_t) |  | OSSL_PARAM_set_octet_string_or_ptr | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (OSSL_PARAM *,void *,size_t) |  | ossl_param_set_secure_block | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (OSSL_RECORD_LAYER *,OSSL_RECORD_TEMPLATE *,size_t) |  | tls_write_records_default | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (OSSL_RECORD_LAYER *,OSSL_RECORD_TEMPLATE *,size_t) |  | tls_write_records_multiblock | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (POLY1305 *,const unsigned char *,size_t) |  | Poly1305_Update | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (PROV_CIPHER_CTX *,const unsigned char *,size_t) |  | ossl_cipher_generic_initiv | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (PROV_CIPHER_CTX *,const unsigned char *,size_t) |  | ossl_cipher_hw_tdes_ede3_initkey | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (PROV_GCM_CTX *,const unsigned char *,size_t) |  | ossl_gcm_aad_update | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (QUIC_PN,unsigned char *,size_t) |  | ossl_quic_wire_encode_pkt_hdr_pn | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (QUIC_RXFC *,OSSL_STATM *,size_t) |  | ossl_quic_rstream_new | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (QUIC_TLS *,const unsigned char *,size_t) |  | ossl_quic_tls_set_transport_params | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (RAND_POOL *,const unsigned char *,size_t) |  | ossl_rand_pool_adin_mix_in | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (RAND_POOL *,size_t,size_t) |  | ossl_rand_pool_add_end | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (RIPEMD160_CTX *,const void *,size_t) |  | RIPEMD160_Update | 1 |
-| vector.cpp:454:7:454:12 | memcpy | (RIPEMD160_CTX *,const void *,size_t) |  | RIPEMD160_Update | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (RIPEMD160_CTX *,const void *,size_t) |  | ripemd160_block_data_order | 1 |
-| vector.cpp:454:7:454:12 | memcpy | (RIPEMD160_CTX *,const void *,size_t) |  | ripemd160_block_data_order | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (SCT **,const unsigned char **,size_t) |  | o2i_SCT | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (SCT *,const unsigned char **,size_t) |  | o2i_SCT_signature | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (SCT *,const unsigned char *,size_t) |  | SCT_set1_extensions | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (SCT *,const unsigned char *,size_t) |  | SCT_set1_log_id | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (SCT *,const unsigned char *,size_t) |  | SCT_set1_signature | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (SCT *,unsigned char *,size_t) |  | SCT_set0_extensions | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (SCT *,unsigned char *,size_t) |  | SCT_set0_log_id | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (SCT *,unsigned char *,size_t) |  | SCT_set0_signature | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (SHA256_CTX *,const void *,size_t) |  | SHA224_Update | 1 |
-| vector.cpp:454:7:454:12 | memcpy | (SHA256_CTX *,const void *,size_t) |  | SHA224_Update | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (SHA256_CTX *,const void *,size_t) |  | SHA256_Update | 1 |
-| vector.cpp:454:7:454:12 | memcpy | (SHA256_CTX *,const void *,size_t) |  | SHA256_Update | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (SHA512_CTX *,const void *,size_t) |  | SHA384_Update | 1 |
-| vector.cpp:454:7:454:12 | memcpy | (SHA512_CTX *,const void *,size_t) |  | SHA384_Update | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (SHA512_CTX *,const void *,size_t) |  | SHA512_Update | 1 |
-| vector.cpp:454:7:454:12 | memcpy | (SHA512_CTX *,const void *,size_t) |  | SHA512_Update | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (SHA_CTX *,const void *,size_t) |  | SHA1_Update | 1 |
-| vector.cpp:454:7:454:12 | memcpy | (SHA_CTX *,const void *,size_t) |  | SHA1_Update | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (SIPHASH *,const unsigned char *,size_t) |  | SipHash_Update | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (SIPHASH *,unsigned char *,size_t) |  | SipHash_Final | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (SIV128_CONTEXT *,const unsigned char *,size_t) |  | ossl_siv128_set_tag | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (SIV128_CONTEXT *,unsigned char *,size_t) |  | ossl_siv128_get_tag | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (SLH_DSA_KEY *,const uint8_t *,size_t) |  | ossl_slh_dsa_set_priv | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (SLH_DSA_KEY *,const uint8_t *,size_t) |  | ossl_slh_dsa_set_pub | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (SM3_CTX *,const void *,size_t) |  | ossl_sm3_block_data_order | 1 |
-| vector.cpp:454:7:454:12 | memcpy | (SM3_CTX *,const void *,size_t) |  | ossl_sm3_block_data_order | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (SM3_CTX *,const void *,size_t) |  | ossl_sm3_update | 1 |
-| vector.cpp:454:7:454:12 | memcpy | (SM3_CTX *,const void *,size_t) |  | ossl_sm3_update | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (SSL *,const unsigned char *,size_t) |  | SSL_set1_client_cert_type | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (SSL *,const unsigned char *,size_t) |  | SSL_set1_server_cert_type | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (SSL *,const unsigned char *,size_t) |  | SSL_set_quic_tls_transport_params | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (SSL *,size_t,size_t) |  | SSL_set_block_padding_ex | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (SSL_CONNECTION *,TLS_RECORD *,size_t) |  | ssl_release_record | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (SSL_CONNECTION *,const unsigned char *,size_t) |  | lookup_sess_in_cache | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (SSL_CTX *,const unsigned char *,size_t) |  | SSL_CTX_set1_client_cert_type | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (SSL_CTX *,const unsigned char *,size_t) |  | SSL_CTX_set1_server_cert_type | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (SSL_CTX *,size_t,size_t) |  | SSL_CTX_set_block_padding_ex | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (SSL_SESSION *,const unsigned char *,size_t) |  | SSL_SESSION_set1_alpn_selected | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (SSL_SESSION *,const unsigned char *,size_t) |  | SSL_SESSION_set1_master_key | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (SSL_SESSION *,const void *,size_t) |  | SSL_SESSION_set1_ticket_appdata | 1 |
-| vector.cpp:454:7:454:12 | memcpy | (SSL_SESSION *,const void *,size_t) |  | SSL_SESSION_set1_ticket_appdata | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (Strtab *,const char *,size_t) |  | strtabadd | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (WHIRLPOOL_CTX *,const void *,size_t) |  | WHIRLPOOL_BitUpdate | 1 |
-| vector.cpp:454:7:454:12 | memcpy | (WHIRLPOOL_CTX *,const void *,size_t) |  | WHIRLPOOL_BitUpdate | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (WHIRLPOOL_CTX *,const void *,size_t) |  | WHIRLPOOL_Update | 1 |
-| vector.cpp:454:7:454:12 | memcpy | (WHIRLPOOL_CTX *,const void *,size_t) |  | WHIRLPOOL_Update | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (WPACKET *,BUF_MEM *,size_t) |  | WPACKET_init_len | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (WPACKET *,const unsigned char *,size_t) |  | ossl_quic_wire_encode_frame_new_token | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (WPACKET *,const void *,size_t) |  | WPACKET_memcpy | 1 |
-| vector.cpp:454:7:454:12 | memcpy | (WPACKET *,const void *,size_t) |  | WPACKET_memcpy | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (WPACKET *,int,size_t) |  | WPACKET_memset | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (WPACKET *,uint64_t,size_t) |  | WPACKET_put_bytes__ | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (WPACKET *,unsigned char *,size_t) |  | WPACKET_init_der | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (WPACKET *,unsigned char *,size_t) |  | dtls_raw_hello_verify_request | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (X509_VERIFY_PARAM *,const char *,size_t) |  | X509_VERIFY_PARAM_add1_host | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (X509_VERIFY_PARAM *,const char *,size_t) |  | X509_VERIFY_PARAM_set1_email | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (X509_VERIFY_PARAM *,const char *,size_t) |  | X509_VERIFY_PARAM_set1_host | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (X509_VERIFY_PARAM *,const unsigned char *,size_t) |  | X509_VERIFY_PARAM_set1_ip | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (__printf_buffer *,char,size_t) |  | __printf_buffer_pad_1 | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (__printf_buffer *,const char *,size_t) |  | __printf_buffer_write | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (__printf_buffer_snprintf *,char *,size_t) |  | __printf_buffer_snprintf_init | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (__wprintf_buffer *,const wchar_t *,size_t) |  | __wprintf_buffer_write | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (__wprintf_buffer *,wchar_t,size_t) |  | __wprintf_buffer_pad_1 | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (alloc_buffer,const void *,size_t) |  | __libc_alloc_buffer_copy_bytes | 1 |
-| vector.cpp:454:7:454:12 | memcpy | (alloc_buffer,const void *,size_t) |  | __libc_alloc_buffer_copy_bytes | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (argp_fmtstream *,argp_fmtstream_t,size_t) |  | __argp_fmtstream_ensure | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (argp_fmtstream_t,const char *,size_t) |  | __argp_fmtstream_write | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (bufc_pool *,size_t,size_t) |  | Curl_bufcp_init | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (bufq *,size_t,size_t) |  | Curl_bufq_init | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (bufref *,const void *,size_t) |  | Curl_bufref_memdup | 1 |
-| vector.cpp:454:7:454:12 | memcpy | (bufref *,const void *,size_t) |  | Curl_bufref_memdup | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (char **,size_t *,size_t) |  | Curl_str_number | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (char *,const char *,size_t) |  | Curl_strntolower | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (char *,const char *,size_t) |  | Curl_strntoupper | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (char *,const char *,size_t) |  | OPENSSL_strlcat | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (char *,const char *,size_t) |  | OPENSSL_strlcpy | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (char *,const char *,size_t) |  | uv__strscpy | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (char *,size_t,size_t) |  | __getcwd_chk | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (char *__restrict__,const char *__restrict__,size_t) |  | __strlcat | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (char *__restrict__,const char *__restrict__,size_t) |  | __strlcpy | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (const CTLOG_STORE *,const uint8_t *,size_t) |  | CTLOG_STORE_get0_log_by_id | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (const EC_KEY *,unsigned char *,size_t) |  | ossl_ec_key_simple_priv2oct | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (const EVP_MD *,const OSSL_ITEM *,size_t) |  | ossl_digest_md_to_nid | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (const EVP_MD *,const unsigned char *,size_t) |  | OSSL_STORE_SEARCH_by_key_fingerprint | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (const OSSL_CMP_CTX *,char *,size_t) |  | OSSL_CMP_CTX_snprint_PKIStatus | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (const OSSL_CMP_PKISI *,char *,size_t) |  | OSSL_CMP_snprint_PKIStatusInfo | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (const OSSL_NAMEMAP *,int,size_t) |  | ossl_namemap_num2name | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (const OSSL_PARAM *,char **,size_t) |  | OSSL_PARAM_get_utf8_string | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (const SSL *,unsigned char *,size_t) |  | SSL_get_client_random | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (const SSL *,unsigned char *,size_t) |  | SSL_get_server_random | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (const SSL_SESSION *,unsigned char *,size_t) |  | SSL_SESSION_get_master_key | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (const char *,char **,size_t) |  | OSSL_PARAM_construct_utf8_ptr | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (const char *,char *,size_t) |  | OSSL_PARAM_construct_utf8_string | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (const char *,char *,size_t) |  | __libc_ns_makecanon | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (const char *,char *,size_t) |  | __realpath_chk | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (const char *,char *,size_t) |  | getpass_r | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (const char *,char *,size_t) |  | ns_makecanon | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (const char *,const char *,size_t) |  | OPENSSL_strncasecmp | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (const char *,const char *,size_t) |  | c_strncasecmp | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (const char *,const char *,unsigned long) |  | __ngettext | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (const char *,uint16_t *,size_t) |  | uv_wtf8_to_utf16 | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (const char *,unsigned char *,size_t) |  | OSSL_PARAM_construct_BN | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (const char *,void **,size_t) |  | OSSL_PARAM_construct_octet_ptr | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (const char *,void *,size_t) |  | OSSL_PARAM_construct_octet_string | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (const char *,void *,size_t) |  | uv__random_readpath | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (const charmap_t *,const char *,size_t) |  | charmap_find_symbol | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (const charmap_t *,const char *,size_t) |  | charmap_find_value | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (const repertoire_t *,const char *,size_t) |  | repertoire_find_value | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (const sockaddr *,char *,size_t) |  | uv_ip_name | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (const sockaddr_in6 *,char *,size_t) |  | uv_ip6_name | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (const sockaddr_in *,char *,size_t) |  | uv_ip4_name | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (const unsigned char *,char *,size_t) |  | ___ns_name_ntop | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (const unsigned char *,size_t,size_t) |  | ossl_rand_pool_attach | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (const void *,const void *,size_t) |  | chachapoly_timingsafe_bcmp | 1 |
-| vector.cpp:454:7:454:12 | memcpy | (const void *,const void *,size_t) |  | chachapoly_timingsafe_bcmp | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (const void *,size_t,size_t) |  | support_blob_repeat_allocate | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (const void *,size_t,size_t) |  | support_blob_repeat_allocate_shared | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (const_nis_name,char *,size_t) |  | nis_domain_of_r | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (const_nis_name,char *,size_t) |  | nis_leaf_of_r | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (const_nis_name,char *,size_t) |  | nis_name_of_r | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (curl_mimepart *,const char *,size_t) |  | curl_mime_data | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (curve448_scalar_t,const unsigned char *,size_t) |  | ossl_curve448_scalar_decode_long | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (dynbuf *,const void *,size_t) |  | Curl_dyn_addn | 1 |
-| vector.cpp:454:7:454:12 | memcpy | (dynbuf *,const void *,size_t) |  | Curl_dyn_addn | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (dynbuf *,const void *,size_t) |  | curlx_dyn_addn | 1 |
-| vector.cpp:454:7:454:12 | memcpy | (dynbuf *,const void *,size_t) |  | curlx_dyn_addn | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (dynhds *,const char *,size_t) |  | Curl_dynhds_get | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (dynhds *,const char *,size_t) |  | Curl_dynhds_h1_add_line | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (dynhds *,size_t,size_t) |  | Curl_dynhds_init | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (int *,const char *,size_t) |  | Curl_http_decode_status | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (int *,int *,size_t) |  | EVP_PBE_get | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (int,char *,size_t) |  | Curl_strerror | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (int,char *,size_t) |  | __strerror_r | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (int,char *,size_t) |  | __ttyname_r | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (int,char *,size_t) |  | uv_err_name_r | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (int,char *,size_t) |  | uv_strerror_r | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (int,const void *,size_t) |  | _nl_intern_locale_data | 1 |
-| vector.cpp:454:7:454:12 | memcpy | (int,const void *,size_t) |  | _nl_intern_locale_data | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (int,const void *,size_t) |  | writeall | 1 |
-| vector.cpp:454:7:454:12 | memcpy | (int,const void *,size_t) |  | writeall | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (int,int,size_t) |  | BrotliEncoderEstimatePeakMemoryUsage | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (int,void *,size_t) |  | __readall | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (locale_file *,const uint32_t *,size_t) |  | add_locale_uint32_array | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (nghttp2_buf *,uint8_t *,size_t) |  | nghttp2_buf_wrap_init | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (nghttp2_extension *,nghttp2_origin_entry *,size_t) |  | nghttp2_frame_origin_init | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (nghttp2_extpri *,const uint8_t *,size_t) |  | nghttp2_extpri_parse_priority | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (nghttp2_extpri *,const uint8_t *,size_t) |  | nghttp2_http_parse_priority | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (nghttp2_hd_deflater *,const nghttp2_nv *,size_t) |  | nghttp2_hd_deflate_bound | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (nghttp2_session *,const uint8_t *,size_t) |  | nghttp2_session_mem_recv | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (nghttp2_session *,const uint8_t *,size_t) |  | nghttp2_session_mem_recv2 | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (nghttp2_session *,int32_t,size_t) |  | nghttp2_session_consume | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (nghttp2_session *,nghttp2_settings_entry *,size_t) |  | nghttp2_session_update_local_settings | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (nghttp2_settings *,nghttp2_settings_entry *,size_t) |  | nghttp2_frame_unpack_settings_payload | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (ns_rr_cursor *,const unsigned char *,size_t) |  | __ns_rr_cursor_init | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (pthread_attr_t *,void *,size_t) |  | __pthread_attr_setstack | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (scratch_buffer *,size_t,size_t) |  | __libc_scratch_buffer_set_array_size | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (sfparse_parser *,const uint8_t *,size_t) |  | sfparse_parser_init | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (size_t,OSSL_QTX_IOVEC *,size_t) |  | ossl_quic_sstream_adjust_iov | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (stack_st_SCT **,const unsigned char **,size_t) |  | o2i_SCT_LIST | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (ucs4_t *,const uint8_t *,size_t) |  | u8_mbtouc_aux | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (uint8_t *,const nghttp2_settings_entry *,size_t) |  | nghttp2_frame_pack_settings_payload | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (uint8_t *,const void *,size_t) |  | nghttp2_cpymem | 1 |
-| vector.cpp:454:7:454:12 | memcpy | (uint8_t *,const void *,size_t) |  | nghttp2_cpymem | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (unsigned char **,const char *,size_t) |  | _libssh2_store_str | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (unsigned char **,const unsigned char *,size_t) |  | _libssh2_store_bignum2_bytes | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (unsigned char *,const unsigned char *,size_t) |  | BUF_reverse | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (unsigned char *,int,unsigned long) |  | UTF8_putc | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (unsigned char *,size_t *,size_t) |  | ossl_cipher_padblock | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (unsigned char *,size_t *,size_t) |  | ossl_cipher_unpadblock | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (unsigned int,char *,size_t) |  | __initstate | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (uv_thread_t *,char *,size_t) |  | uv__thread_getname | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (uv_thread_t *,char *,size_t) |  | uv_thread_getaffinity | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (uv_thread_t *,char *,size_t) |  | uv_thread_getname | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (void **,size_t,size_t) |  | __posix_memalign | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (void *,size_t,size_t) |  | Curl_hash_str | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (void *,size_t,size_t) |  | __libc_reallocarray | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (void *,unsigned char *,size_t) |  | ossl_drbg_clear_seed | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (wchar_t *,const wchar_t *,size_t) |  | __wmemcpy | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (wchar_t *,const wchar_t *,size_t) |  | __wmemmove | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (wchar_t *__restrict__,const wchar_t *__restrict__,size_t) |  | __wcslcat | 2 |
-| vector.cpp:454:7:454:12 | memcpy | (wchar_t *__restrict__,const wchar_t *__restrict__,size_t) |  | __wcslcpy | 2 |
-| zmq.cpp:14:5:14:21 | zmq_msg_init_data | (BIO *,const EVP_PKEY *,int,pem_password_cb *,void *) |  | i2b_PVK_bio | 4 |
-| zmq.cpp:14:5:14:21 | zmq_msg_init_data | (BrotliDecoderState *,BrotliDecoderStateInternal *,brotli_decoder_metadata_start_func,brotli_decoder_metadata_chunk_func,void *) |  | BrotliDecoderSetMetadataCallbacks | 4 |
-| zmq.cpp:14:5:14:21 | zmq_msg_init_data | (EVP_CIPHER_INFO *,unsigned char *,long *,pem_password_cb *,void *) |  | PEM_do_header | 4 |
-| zmq.cpp:14:5:14:21 | zmq_msg_init_data | (EVP_PKEY *,EVP_KEYMGMT *,void *,OSSL_CALLBACK *,void *) |  | evp_keymgmt_util_gen | 4 |
-| zmq.cpp:14:5:14:21 | zmq_msg_init_data | (EVP_PKEY_CTX *,int,int,int,void *) |  | RSA_pkey_ctx_ctrl | 4 |
-| zmq.cpp:14:5:14:21 | zmq_msg_init_data | (OSSL_QUIC_TX_PACKETISER *,const unsigned char *,size_t,ossl_quic_initial_token_free_fn *,void *) |  | ossl_quic_tx_packetiser_set_initial_token | 4 |
-| zmq.cpp:14:5:14:21 | zmq_msg_init_data | (char *,size_t,size_t *,const OSSL_PARAM[],void *) |  | ossl_pw_passphrase_callback_dec | 4 |
-| zmq.cpp:14:5:14:21 | zmq_msg_init_data | (char *,size_t,size_t *,const OSSL_PARAM[],void *) |  | ossl_pw_passphrase_callback_enc | 4 |
-| zmq.cpp:14:5:14:21 | zmq_msg_init_data | (const BIGNUM *,int,..(*)(..),BN_CTX *,void *) |  | BN_is_prime | 4 |
-| zmq.cpp:14:5:14:21 | zmq_msg_init_data | (const char **,const char **,bool *,..(*)(..),void *) |  | _dl_catch_error | 4 |
-| zmq.cpp:14:5:14:21 | zmq_msg_init_data | (const char *,const UI_METHOD *,void *,OSSL_STORE_post_process_info_fn,void *) |  | OSSL_STORE_open | 4 |
-| zmq.cpp:14:5:14:21 | zmq_msg_init_data | (const char *,int,int,..(*)(..),void *) |  | CONF_parse_list | 4 |
-| zmq.cpp:14:5:14:21 | zmq_msg_init_data | (nghttp2_extension *,uint8_t,uint8_t,int32_t,void *) |  | nghttp2_frame_extension_init | 4 |
-| zmq.cpp:14:5:14:21 | zmq_msg_init_data | (nghttp2_session *,const uint8_t *,size_t,int,void *) |  | nghttp2_session_upgrade2 | 4 |
-| zmq.cpp:14:5:14:21 | zmq_msg_init_data | (nghttp2_session *,int32_t,uint8_t,nghttp2_stream_state,void *) |  | nghttp2_session_open_stream | 4 |
-| zmq.cpp:14:5:14:21 | zmq_msg_init_data | (sqlite3 *,const char *,const char *,..(*)(..),void *) |  | recoverInit | 4 |
-| zmq.cpp:17:6:17:13 | test_zmc | (BIO *,OCSP_REQUEST *,unsigned long) |  | OCSP_REQUEST_print | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (BIO *,OCSP_RESPONSE *,unsigned long) |  | OCSP_RESPONSE_print | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (BIO *,X509 *,unsigned long) |  | ossl_x509_print_ex_brief | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (BIO *,X509_CRL *,unsigned long) |  | X509_CRL_print_ex | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (BIO *,const ASN1_STRING *,unsigned long) |  | ASN1_STRING_print_ex | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (BLAKE2B_CTX *,const void *,size_t) |  | ossl_blake2b_update | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (BLAKE2B_PARAM *,const uint8_t *,size_t) |  | ossl_blake2b_param_set_personal | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (BLAKE2B_PARAM *,const uint8_t *,size_t) |  | ossl_blake2b_param_set_salt | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (BLAKE2S_CTX *,const void *,size_t) |  | ossl_blake2s_update | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (BLAKE2S_PARAM *,const uint8_t *,size_t) |  | ossl_blake2s_param_set_personal | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (BLAKE2S_PARAM *,const uint8_t *,size_t) |  | ossl_blake2s_param_set_salt | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (CCM128_CONTEXT *,const unsigned char *,size_t) |  | CRYPTO_ccm128_aad | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (CCM128_CONTEXT *,unsigned char *,size_t) |  | CRYPTO_ccm128_tag | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (CMAC_CTX *,const void *,size_t) |  | CMAC_Update | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (CMS_RecipientInfo *,const unsigned char *,size_t) |  | CMS_RecipientInfo_kekri_id_cmp | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (Curl_easy *,unsigned char *,size_t) |  | Curl_rand_alnum | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (Curl_easy *,unsigned char *,size_t) |  | Curl_rand_bytes | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (Curl_easy *,unsigned char *,size_t) |  | Curl_rand_hex | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (DH *,const unsigned char *,size_t) |  | ossl_dh_buf2key | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (EC_GROUP *,const unsigned char *,size_t) |  | EC_GROUP_set_seed | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (EC_KEY *,const unsigned char *,size_t) |  | ossl_ec_key_simple_oct2priv | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (EVP_MAC_CTX **,const void *,size_t) |  | _libssh2_hmac_update | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (EVP_MAC_CTX **,void *,size_t) |  | _libssh2_hmac_sha1_init | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (EVP_MAC_CTX **,void *,size_t) |  | _libssh2_hmac_sha256_init | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (EVP_MAC_CTX **,void *,size_t) |  | _libssh2_hmac_sha512_init | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (EVP_MD_CTX **,const void *,size_t) |  | _libssh2_sha1_update | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (EVP_MD_CTX **,const void *,size_t) |  | _libssh2_sha256_update | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (EVP_MD_CTX **,const void *,size_t) |  | _libssh2_sha384_update | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (EVP_MD_CTX **,const void *,size_t) |  | _libssh2_sha512_update | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (EVP_MD_CTX *,const unsigned char *,size_t) |  | EVP_DigestVerifyFinal | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (EVP_PKEY *,char *,size_t) |  | EVP_PKEY_get_default_digest_name | 1 |
-| zmq.cpp:17:6:17:13 | test_zmc | (EVP_PKEY *,char *,size_t) |  | EVP_PKEY_get_default_digest_name | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (EVP_RAND_CTX *,unsigned char *,size_t) |  | EVP_RAND_nonce | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (FFC_PARAMS *,const unsigned char *,size_t) |  | ossl_ffc_params_set_seed | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (FILE *,const ASN1_STRING *,unsigned long) |  | ASN1_STRING_print_ex_fp | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (FILE *,const char *,size_t) |  | _IO_new_do_write | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (FILE *,const void *,size_t) |  | _IO_default_xsputn | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (FILE *,const void *,size_t) |  | _IO_new_file_xsputn | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (FILE *,const void *,size_t) |  | _IO_wdefault_xsputn | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (FILE *,const void *,size_t) |  | _IO_wfile_xsputn | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (FILE *,const void *,size_t) |  | __printf_buffer_as_file_xsputn | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (FILE *,const void *,size_t) |  | __wprintf_buffer_as_file_xsputn | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (FILE *,void *,size_t) |  | _IO_default_xsgetn | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (FILE *,void *,size_t) |  | _IO_file_xsgetn | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (FILE *,void *,size_t) |  | _IO_file_xsgetn_mmap | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (FILE *,void *,size_t) |  | _IO_wdefault_xsgetn | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (GCM128_CONTEXT *,const unsigned char *,size_t) |  | CRYPTO_gcm128_aad | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (GCM128_CONTEXT *,const unsigned char *,size_t) |  | CRYPTO_gcm128_setiv | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (GCM128_CONTEXT *,unsigned char *,size_t) |  | CRYPTO_gcm128_tag | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (KECCAK1600_CTX *,const void *,size_t) |  | ossl_sha3_update | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (KECCAK1600_CTX *,unsigned char *,size_t) |  | ossl_sha3_squeeze | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (KECCAK1600_CTX *,unsigned char,size_t) |  | ossl_sha3_init | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (LIBSSH2_CHANNEL *,const char *,size_t) |  | libssh2_channel_signal_ex | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (LIBSSH2_SFTP_HANDLE *,char *,size_t) |  | libssh2_sftp_read | 1 |
-| zmq.cpp:17:6:17:13 | test_zmc | (LIBSSH2_SFTP_HANDLE *,char *,size_t) |  | libssh2_sftp_read | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (LIBSSH2_SFTP_HANDLE *,const char *,size_t) |  | libssh2_sftp_write | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (MD4_CTX *,const void *,size_t) |  | MD4_Update | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (MD4_CTX *,const void *,size_t) |  | md4_block_data_order | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (MD5_CTX *,const void *,size_t) |  | MD5_Update | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (MD5_SHA1_CTX *,const void *,size_t) |  | ossl_md5_sha1_update | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (MDC2_CTX *,const unsigned char *,size_t) |  | MDC2_Update | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (ML_DSA_KEY *,const uint8_t *,size_t) |  | ossl_ml_dsa_pk_decode | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (ML_DSA_KEY *,const uint8_t *,size_t) |  | ossl_ml_dsa_sk_decode | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (MemoryManager *,const uint8_t *,size_t) |  | CreatePreparedDictionary | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (OCB128_CONTEXT *,const unsigned char *,size_t) |  | CRYPTO_ocb128_aad | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (OCB128_CONTEXT *,unsigned char *,size_t) |  | CRYPTO_ocb128_tag | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (OSSL_HPKE_CTX *,const unsigned char *,size_t) |  | OSSL_HPKE_CTX_set1_ikme | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (OSSL_JSON_ENC *,const char *,size_t) |  | ossl_json_str_len | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (OSSL_JSON_ENC *,const void *,size_t) |  | ossl_json_str_hex | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (OSSL_LIB_CTX *,unsigned char *,size_t) |  | ossl_rand_cleanup_entropy | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (OSSL_LIB_CTX *,unsigned char *,size_t) |  | ossl_rand_cleanup_user_entropy | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (OSSL_PARAM *,const void *,size_t) |  | OSSL_PARAM_set_octet_ptr | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (OSSL_PARAM *,const void *,size_t) |  | OSSL_PARAM_set_octet_string | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (OSSL_PARAM *,const void *,size_t) |  | OSSL_PARAM_set_octet_string_or_ptr | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (OSSL_PARAM *,void *,size_t) |  | ossl_param_set_secure_block | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (OSSL_RECORD_LAYER *,OSSL_RECORD_TEMPLATE *,size_t) |  | tls_write_records_default | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (OSSL_RECORD_LAYER *,OSSL_RECORD_TEMPLATE *,size_t) |  | tls_write_records_multiblock | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (POLY1305 *,const unsigned char *,size_t) |  | Poly1305_Update | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (PROV_CIPHER_CTX *,const unsigned char *,size_t) |  | ossl_cipher_generic_initiv | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (PROV_CIPHER_CTX *,const unsigned char *,size_t) |  | ossl_cipher_hw_tdes_ede3_initkey | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (PROV_GCM_CTX *,const unsigned char *,size_t) |  | ossl_gcm_aad_update | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (QUIC_PN,unsigned char *,size_t) |  | ossl_quic_wire_encode_pkt_hdr_pn | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (QUIC_RXFC *,OSSL_STATM *,size_t) |  | ossl_quic_rstream_new | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (QUIC_TLS *,const unsigned char *,size_t) |  | ossl_quic_tls_set_transport_params | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (RAND_POOL *,const unsigned char *,size_t) |  | ossl_rand_pool_adin_mix_in | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (RAND_POOL *,size_t,size_t) |  | ossl_rand_pool_add_end | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (RIPEMD160_CTX *,const void *,size_t) |  | RIPEMD160_Update | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (RIPEMD160_CTX *,const void *,size_t) |  | ripemd160_block_data_order | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (SCT **,const unsigned char **,size_t) |  | o2i_SCT | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (SCT *,const unsigned char **,size_t) |  | o2i_SCT_signature | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (SCT *,const unsigned char *,size_t) |  | SCT_set1_extensions | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (SCT *,const unsigned char *,size_t) |  | SCT_set1_log_id | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (SCT *,const unsigned char *,size_t) |  | SCT_set1_signature | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (SCT *,unsigned char *,size_t) |  | SCT_set0_extensions | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (SCT *,unsigned char *,size_t) |  | SCT_set0_log_id | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (SCT *,unsigned char *,size_t) |  | SCT_set0_signature | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (SHA256_CTX *,const void *,size_t) |  | SHA224_Update | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (SHA256_CTX *,const void *,size_t) |  | SHA256_Update | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (SHA512_CTX *,const void *,size_t) |  | SHA384_Update | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (SHA512_CTX *,const void *,size_t) |  | SHA512_Update | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (SHA_CTX *,const void *,size_t) |  | SHA1_Update | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (SIPHASH *,const unsigned char *,size_t) |  | SipHash_Update | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (SIPHASH *,unsigned char *,size_t) |  | SipHash_Final | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (SIV128_CONTEXT *,const unsigned char *,size_t) |  | ossl_siv128_set_tag | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (SIV128_CONTEXT *,unsigned char *,size_t) |  | ossl_siv128_get_tag | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (SLH_DSA_KEY *,const uint8_t *,size_t) |  | ossl_slh_dsa_set_priv | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (SLH_DSA_KEY *,const uint8_t *,size_t) |  | ossl_slh_dsa_set_pub | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (SM3_CTX *,const void *,size_t) |  | ossl_sm3_block_data_order | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (SM3_CTX *,const void *,size_t) |  | ossl_sm3_update | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (SSL *,const unsigned char *,size_t) |  | SSL_set1_client_cert_type | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (SSL *,const unsigned char *,size_t) |  | SSL_set1_server_cert_type | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (SSL *,const unsigned char *,size_t) |  | SSL_set_quic_tls_transport_params | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (SSL *,size_t,size_t) |  | SSL_set_block_padding_ex | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (SSL_CONNECTION *,TLS_RECORD *,size_t) |  | ssl_release_record | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (SSL_CONNECTION *,const unsigned char *,size_t) |  | lookup_sess_in_cache | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (SSL_CTX *,const unsigned char *,size_t) |  | SSL_CTX_set1_client_cert_type | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (SSL_CTX *,const unsigned char *,size_t) |  | SSL_CTX_set1_server_cert_type | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (SSL_CTX *,size_t,size_t) |  | SSL_CTX_set_block_padding_ex | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (SSL_SESSION *,const unsigned char *,size_t) |  | SSL_SESSION_set1_alpn_selected | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (SSL_SESSION *,const unsigned char *,size_t) |  | SSL_SESSION_set1_master_key | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (SSL_SESSION *,const void *,size_t) |  | SSL_SESSION_set1_ticket_appdata | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (Strtab *,const char *,size_t) |  | strtabadd | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (WHIRLPOOL_CTX *,const void *,size_t) |  | WHIRLPOOL_BitUpdate | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (WHIRLPOOL_CTX *,const void *,size_t) |  | WHIRLPOOL_Update | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (WPACKET *,BUF_MEM *,size_t) |  | WPACKET_init_len | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (WPACKET *,const unsigned char *,size_t) |  | ossl_quic_wire_encode_frame_new_token | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (WPACKET *,const void *,size_t) |  | WPACKET_memcpy | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (WPACKET *,int,size_t) |  | WPACKET_memset | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (WPACKET *,uint64_t,size_t) |  | WPACKET_put_bytes__ | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (WPACKET *,unsigned char *,size_t) |  | WPACKET_init_der | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (WPACKET *,unsigned char *,size_t) |  | dtls_raw_hello_verify_request | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (X509_VERIFY_PARAM *,const char *,size_t) |  | X509_VERIFY_PARAM_add1_host | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (X509_VERIFY_PARAM *,const char *,size_t) |  | X509_VERIFY_PARAM_set1_email | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (X509_VERIFY_PARAM *,const char *,size_t) |  | X509_VERIFY_PARAM_set1_host | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (X509_VERIFY_PARAM *,const unsigned char *,size_t) |  | X509_VERIFY_PARAM_set1_ip | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (__printf_buffer *,char,size_t) |  | __printf_buffer_pad_1 | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (__printf_buffer *,const char *,size_t) |  | __printf_buffer_write | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (__printf_buffer_snprintf *,char *,size_t) |  | __printf_buffer_snprintf_init | 1 |
-| zmq.cpp:17:6:17:13 | test_zmc | (__printf_buffer_snprintf *,char *,size_t) |  | __printf_buffer_snprintf_init | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (__wprintf_buffer *,const wchar_t *,size_t) |  | __wprintf_buffer_write | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (__wprintf_buffer *,wchar_t,size_t) |  | __wprintf_buffer_pad_1 | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (alloc_buffer,const void *,size_t) |  | __libc_alloc_buffer_copy_bytes | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (argp_fmtstream *,argp_fmtstream_t,size_t) |  | __argp_fmtstream_ensure | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (argp_fmtstream_t,const char *,size_t) |  | __argp_fmtstream_write | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (bufc_pool *,size_t,size_t) |  | Curl_bufcp_init | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (bufq *,size_t,size_t) |  | Curl_bufq_init | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (bufref *,const void *,size_t) |  | Curl_bufref_memdup | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (char **,size_t *,size_t) |  | Curl_str_number | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (char *,const char *,size_t) |  | Curl_strntolower | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (char *,const char *,size_t) |  | Curl_strntoupper | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (char *,const char *,size_t) |  | OPENSSL_strlcat | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (char *,const char *,size_t) |  | OPENSSL_strlcpy | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (char *,const char *,size_t) |  | uv__strscpy | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (char *,size_t,size_t) |  | __getcwd_chk | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (char *__restrict__,const char *__restrict__,size_t) |  | __strlcat | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (char *__restrict__,const char *__restrict__,size_t) |  | __strlcpy | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (const CTLOG_STORE *,const uint8_t *,size_t) |  | CTLOG_STORE_get0_log_by_id | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (const EC_KEY *,unsigned char *,size_t) |  | ossl_ec_key_simple_priv2oct | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (const EVP_MD *,const OSSL_ITEM *,size_t) |  | ossl_digest_md_to_nid | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (const EVP_MD *,const unsigned char *,size_t) |  | OSSL_STORE_SEARCH_by_key_fingerprint | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (const OSSL_CMP_CTX *,char *,size_t) |  | OSSL_CMP_CTX_snprint_PKIStatus | 1 |
-| zmq.cpp:17:6:17:13 | test_zmc | (const OSSL_CMP_CTX *,char *,size_t) |  | OSSL_CMP_CTX_snprint_PKIStatus | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (const OSSL_CMP_PKISI *,char *,size_t) |  | OSSL_CMP_snprint_PKIStatusInfo | 1 |
-| zmq.cpp:17:6:17:13 | test_zmc | (const OSSL_CMP_PKISI *,char *,size_t) |  | OSSL_CMP_snprint_PKIStatusInfo | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (const OSSL_NAMEMAP *,int,size_t) |  | ossl_namemap_num2name | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (const OSSL_PARAM *,char **,size_t) |  | OSSL_PARAM_get_utf8_string | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (const SSL *,unsigned char *,size_t) |  | SSL_get_client_random | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (const SSL *,unsigned char *,size_t) |  | SSL_get_server_random | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (const SSL_SESSION *,unsigned char *,size_t) |  | SSL_SESSION_get_master_key | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (const char *,char **,size_t) |  | OSSL_PARAM_construct_utf8_ptr | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (const char *,char *,size_t) |  | OSSL_PARAM_construct_utf8_string | 1 |
-| zmq.cpp:17:6:17:13 | test_zmc | (const char *,char *,size_t) |  | OSSL_PARAM_construct_utf8_string | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (const char *,char *,size_t) |  | __libc_ns_makecanon | 1 |
-| zmq.cpp:17:6:17:13 | test_zmc | (const char *,char *,size_t) |  | __libc_ns_makecanon | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (const char *,char *,size_t) |  | __realpath_chk | 1 |
-| zmq.cpp:17:6:17:13 | test_zmc | (const char *,char *,size_t) |  | __realpath_chk | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (const char *,char *,size_t) |  | getpass_r | 1 |
-| zmq.cpp:17:6:17:13 | test_zmc | (const char *,char *,size_t) |  | getpass_r | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (const char *,char *,size_t) |  | ns_makecanon | 1 |
-| zmq.cpp:17:6:17:13 | test_zmc | (const char *,char *,size_t) |  | ns_makecanon | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (const char *,const char *,size_t) |  | OPENSSL_strncasecmp | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (const char *,const char *,size_t) |  | c_strncasecmp | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (const char *,const char *,unsigned long) |  | __ngettext | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (const char *,uint16_t *,size_t) |  | uv_wtf8_to_utf16 | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (const char *,unsigned char *,size_t) |  | OSSL_PARAM_construct_BN | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (const char *,void **,size_t) |  | OSSL_PARAM_construct_octet_ptr | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (const char *,void *,size_t) |  | OSSL_PARAM_construct_octet_string | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (const char *,void *,size_t) |  | uv__random_readpath | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (const charmap_t *,const char *,size_t) |  | charmap_find_symbol | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (const charmap_t *,const char *,size_t) |  | charmap_find_value | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (const repertoire_t *,const char *,size_t) |  | repertoire_find_value | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (const sockaddr *,char *,size_t) |  | uv_ip_name | 1 |
-| zmq.cpp:17:6:17:13 | test_zmc | (const sockaddr *,char *,size_t) |  | uv_ip_name | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (const sockaddr_in6 *,char *,size_t) |  | uv_ip6_name | 1 |
-| zmq.cpp:17:6:17:13 | test_zmc | (const sockaddr_in6 *,char *,size_t) |  | uv_ip6_name | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (const sockaddr_in *,char *,size_t) |  | uv_ip4_name | 1 |
-| zmq.cpp:17:6:17:13 | test_zmc | (const sockaddr_in *,char *,size_t) |  | uv_ip4_name | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (const unsigned char *,char *,size_t) |  | ___ns_name_ntop | 1 |
-| zmq.cpp:17:6:17:13 | test_zmc | (const unsigned char *,char *,size_t) |  | ___ns_name_ntop | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (const unsigned char *,size_t,size_t) |  | ossl_rand_pool_attach | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (const void *,const void *,size_t) |  | chachapoly_timingsafe_bcmp | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (const void *,size_t,size_t) |  | support_blob_repeat_allocate | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (const void *,size_t,size_t) |  | support_blob_repeat_allocate_shared | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (const_nis_name,char *,size_t) |  | nis_domain_of_r | 1 |
-| zmq.cpp:17:6:17:13 | test_zmc | (const_nis_name,char *,size_t) |  | nis_domain_of_r | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (const_nis_name,char *,size_t) |  | nis_leaf_of_r | 1 |
-| zmq.cpp:17:6:17:13 | test_zmc | (const_nis_name,char *,size_t) |  | nis_leaf_of_r | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (const_nis_name,char *,size_t) |  | nis_name_of_r | 1 |
-| zmq.cpp:17:6:17:13 | test_zmc | (const_nis_name,char *,size_t) |  | nis_name_of_r | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (curl_mimepart *,const char *,size_t) |  | curl_mime_data | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (curve448_scalar_t,const unsigned char *,size_t) |  | ossl_curve448_scalar_decode_long | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (dynbuf *,const void *,size_t) |  | Curl_dyn_addn | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (dynbuf *,const void *,size_t) |  | curlx_dyn_addn | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (dynhds *,const char *,size_t) |  | Curl_dynhds_get | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (dynhds *,const char *,size_t) |  | Curl_dynhds_h1_add_line | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (dynhds *,size_t,size_t) |  | Curl_dynhds_init | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (int *,const char *,size_t) |  | Curl_http_decode_status | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (int *,int *,size_t) |  | EVP_PBE_get | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (int,char *,size_t) |  | Curl_strerror | 1 |
-| zmq.cpp:17:6:17:13 | test_zmc | (int,char *,size_t) |  | Curl_strerror | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (int,char *,size_t) |  | __strerror_r | 1 |
-| zmq.cpp:17:6:17:13 | test_zmc | (int,char *,size_t) |  | __strerror_r | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (int,char *,size_t) |  | __ttyname_r | 1 |
-| zmq.cpp:17:6:17:13 | test_zmc | (int,char *,size_t) |  | __ttyname_r | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (int,char *,size_t) |  | uv_err_name_r | 1 |
-| zmq.cpp:17:6:17:13 | test_zmc | (int,char *,size_t) |  | uv_err_name_r | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (int,char *,size_t) |  | uv_strerror_r | 1 |
-| zmq.cpp:17:6:17:13 | test_zmc | (int,char *,size_t) |  | uv_strerror_r | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (int,const void *,size_t) |  | _nl_intern_locale_data | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (int,const void *,size_t) |  | writeall | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (int,int,size_t) |  | BrotliEncoderEstimatePeakMemoryUsage | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (int,void *,size_t) |  | __readall | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (locale_file *,const uint32_t *,size_t) |  | add_locale_uint32_array | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (nghttp2_buf *,uint8_t *,size_t) |  | nghttp2_buf_wrap_init | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (nghttp2_extension *,nghttp2_origin_entry *,size_t) |  | nghttp2_frame_origin_init | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (nghttp2_extpri *,const uint8_t *,size_t) |  | nghttp2_extpri_parse_priority | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (nghttp2_extpri *,const uint8_t *,size_t) |  | nghttp2_http_parse_priority | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (nghttp2_hd_deflater *,const nghttp2_nv *,size_t) |  | nghttp2_hd_deflate_bound | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (nghttp2_session *,const uint8_t *,size_t) |  | nghttp2_session_mem_recv | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (nghttp2_session *,const uint8_t *,size_t) |  | nghttp2_session_mem_recv2 | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (nghttp2_session *,int32_t,size_t) |  | nghttp2_session_consume | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (nghttp2_session *,nghttp2_settings_entry *,size_t) |  | nghttp2_session_update_local_settings | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (nghttp2_settings *,nghttp2_settings_entry *,size_t) |  | nghttp2_frame_unpack_settings_payload | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (ns_rr_cursor *,const unsigned char *,size_t) |  | __ns_rr_cursor_init | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (pthread_attr_t *,void *,size_t) |  | __pthread_attr_setstack | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (scratch_buffer *,size_t,size_t) |  | __libc_scratch_buffer_set_array_size | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (sfparse_parser *,const uint8_t *,size_t) |  | sfparse_parser_init | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (size_t,OSSL_QTX_IOVEC *,size_t) |  | ossl_quic_sstream_adjust_iov | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (stack_st_SCT **,const unsigned char **,size_t) |  | o2i_SCT_LIST | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (ucs4_t *,const uint8_t *,size_t) |  | u8_mbtouc_aux | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (uint8_t *,const nghttp2_settings_entry *,size_t) |  | nghttp2_frame_pack_settings_payload | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (uint8_t *,const void *,size_t) |  | nghttp2_cpymem | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (unsigned char **,const char *,size_t) |  | _libssh2_store_str | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (unsigned char **,const unsigned char *,size_t) |  | _libssh2_store_bignum2_bytes | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (unsigned char *,const unsigned char *,size_t) |  | BUF_reverse | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (unsigned char *,int,unsigned long) |  | UTF8_putc | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (unsigned char *,size_t *,size_t) |  | ossl_cipher_padblock | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (unsigned char *,size_t *,size_t) |  | ossl_cipher_unpadblock | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (unsigned int,char *,size_t) |  | __initstate | 1 |
-| zmq.cpp:17:6:17:13 | test_zmc | (unsigned int,char *,size_t) |  | __initstate | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (uv_thread_t *,char *,size_t) |  | uv__thread_getname | 1 |
-| zmq.cpp:17:6:17:13 | test_zmc | (uv_thread_t *,char *,size_t) |  | uv__thread_getname | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (uv_thread_t *,char *,size_t) |  | uv_thread_getaffinity | 1 |
-| zmq.cpp:17:6:17:13 | test_zmc | (uv_thread_t *,char *,size_t) |  | uv_thread_getaffinity | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (uv_thread_t *,char *,size_t) |  | uv_thread_getname | 1 |
-| zmq.cpp:17:6:17:13 | test_zmc | (uv_thread_t *,char *,size_t) |  | uv_thread_getname | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (void **,size_t,size_t) |  | __posix_memalign | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (void *,size_t,size_t) |  | Curl_hash_str | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (void *,size_t,size_t) |  | __libc_reallocarray | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (void *,unsigned char *,size_t) |  | ossl_drbg_clear_seed | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (wchar_t *,const wchar_t *,size_t) |  | __wmemcpy | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (wchar_t *,const wchar_t *,size_t) |  | __wmemmove | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (wchar_t *__restrict__,const wchar_t *__restrict__,size_t) |  | __wcslcat | 2 |
-| zmq.cpp:17:6:17:13 | test_zmc | (wchar_t *__restrict__,const wchar_t *__restrict__,size_t) |  | __wcslcpy | 2 |
+| atl.cpp:71:5:71:17 | _U_STRINGorID | ATL | (UINT) | _U_STRINGorID | _U_STRINGorID | 0 |
+| atl.cpp:72:5:72:17 | _U_STRINGorID | ATL | (LPCTSTR) | _U_STRINGorID | _U_STRINGorID | 0 |
+| atl.cpp:411:5:411:12 | CComBSTR | ATL | (const CComBSTR &) | CComBSTR | CComBSTR | 0 |
+| atl.cpp:413:5:413:12 | CComBSTR | ATL | (int,LPCOLESTR) | CComBSTR | CComBSTR | 0 |
+| atl.cpp:413:5:413:12 | CComBSTR | ATL | (int,LPCOLESTR) | CComBSTR | CComBSTR | 1 |
+| atl.cpp:414:5:414:12 | CComBSTR | ATL | (int,LPCSTR) | CComBSTR | CComBSTR | 0 |
+| atl.cpp:414:5:414:12 | CComBSTR | ATL | (int,LPCSTR) | CComBSTR | CComBSTR | 1 |
+| atl.cpp:415:5:415:12 | CComBSTR | ATL | (LPCOLESTR) | CComBSTR | CComBSTR | 0 |
+| atl.cpp:416:5:416:12 | CComBSTR | ATL | (LPCSTR) | CComBSTR | CComBSTR | 0 |
+| atl.cpp:417:5:417:12 | CComBSTR | ATL | (CComBSTR &&) | CComBSTR | CComBSTR | 0 |
+| atl.cpp:420:13:420:18 | Append | ATL | (const CComBSTR &) | CComBSTR | Append | 0 |
+| atl.cpp:421:13:421:18 | Append | ATL | (wchar_t) | CComBSTR | Append | 0 |
+| atl.cpp:422:13:422:18 | Append | ATL | (char) | CComBSTR | Append | 0 |
+| atl.cpp:423:13:423:18 | Append | ATL | (LPCOLESTR) | CComBSTR | Append | 0 |
+| atl.cpp:424:13:424:18 | Append | ATL | (LPCSTR) | CComBSTR | Append | 0 |
+| atl.cpp:425:13:425:18 | Append | ATL | (LPCOLESTR,int) | CComBSTR | Append | 0 |
+| atl.cpp:425:13:425:18 | Append | ATL | (LPCOLESTR,int) | CComBSTR | Append | 1 |
+| atl.cpp:440:10:440:19 | LoadString | ATL | (HINSTANCE,UINT) | CComBSTR | LoadString | 0 |
+| atl.cpp:440:10:440:19 | LoadString | ATL | (HINSTANCE,UINT) | CComBSTR | LoadString | 1 |
+| atl.cpp:441:10:441:19 | LoadString | ATL | (UINT) | CComBSTR | LoadString | 0 |
+| atl.cpp:540:5:540:17 | CComSafeArray | ATL | (const SAFEARRAY *) | CComSafeArray | CComSafeArray | 0 |
+| atl.cpp:544:13:544:15 | Add | ATL | (const SAFEARRAY *) | CComSafeArray | Add | 0 |
+| atl.cpp:546:13:546:15 | Add | ATL | (const T &,BOOL) | CComSafeArray<T> | Add | 0 |
+| atl.cpp:546:13:546:15 | Add | ATL | (const T &,BOOL) | CComSafeArray<T> | Add | 1 |
+| atl.cpp:915:5:915:18 | CSimpleStringT | ATL | (const XCHAR *,int,IAtlStringMgr *) | CSimpleStringT | CSimpleStringT | 0 |
+| atl.cpp:915:5:915:18 | CSimpleStringT | ATL | (const XCHAR *,int,IAtlStringMgr *) | CSimpleStringT | CSimpleStringT | 1 |
+| atl.cpp:915:5:915:18 | CSimpleStringT | ATL | (const XCHAR *,int,IAtlStringMgr *) | CSimpleStringT | CSimpleStringT | 2 |
+| atl.cpp:916:5:916:18 | CSimpleStringT | ATL | (PCXSTR,IAtlStringMgr *) | CSimpleStringT | CSimpleStringT | 0 |
+| atl.cpp:916:5:916:18 | CSimpleStringT | ATL | (PCXSTR,IAtlStringMgr *) | CSimpleStringT | CSimpleStringT | 1 |
+| atl.cpp:917:5:917:18 | CSimpleStringT | ATL | (const CSimpleStringT &) | CSimpleStringT | CSimpleStringT | 0 |
+| atl.cpp:927:17:927:25 | CopyChars | ATL | (XCHAR *,const XCHAR *,int) | CSimpleStringT | CopyChars | 0 |
+| atl.cpp:927:17:927:25 | CopyChars | ATL | (XCHAR *,const XCHAR *,int) | CSimpleStringT | CopyChars | 1 |
+| atl.cpp:927:17:927:25 | CopyChars | ATL | (XCHAR *,const XCHAR *,int) | CSimpleStringT | CopyChars | 2 |
+| atl.cpp:928:17:928:25 | CopyChars | ATL | (XCHAR *,size_t,const XCHAR *,int) | CSimpleStringT | CopyChars | 0 |
+| atl.cpp:928:17:928:25 | CopyChars | ATL | (XCHAR *,size_t,const XCHAR *,int) | CSimpleStringT | CopyChars | 1 |
+| atl.cpp:928:17:928:25 | CopyChars | ATL | (XCHAR *,size_t,const XCHAR *,int) | CSimpleStringT | CopyChars | 2 |
+| atl.cpp:928:17:928:25 | CopyChars | ATL | (XCHAR *,size_t,const XCHAR *,int) | CSimpleStringT | CopyChars | 3 |
+| atl.cpp:929:17:929:35 | CopyCharsOverlapped | ATL | (XCHAR *,const XCHAR *,int) | CSimpleStringT | CopyCharsOverlapped | 0 |
+| atl.cpp:929:17:929:35 | CopyCharsOverlapped | ATL | (XCHAR *,const XCHAR *,int) | CSimpleStringT | CopyCharsOverlapped | 1 |
+| atl.cpp:929:17:929:35 | CopyCharsOverlapped | ATL | (XCHAR *,const XCHAR *,int) | CSimpleStringT | CopyCharsOverlapped | 2 |
+| atl.cpp:1036:5:1036:12 | CStringT | ATL | (const VARIANT &) | CStringT | CStringT | 0 |
+| atl.cpp:1037:5:1037:12 | CStringT | ATL | (LPCSTR,IAtlStringMgr *) | CStringT | CStringT | 1 |
+| atl.cpp:1037:5:1037:12 | CStringT | ATL | (LPCWSTR,IAtlStringMgr *) | CStringT | CStringT | 1 |
+| atl.cpp:1037:5:1037:12 | CStringT | ATL | (const VARIANT &,IAtlStringMgr *) | CStringT | CStringT | 0 |
+| atl.cpp:1037:5:1037:12 | CStringT | ATL | (const VARIANT &,IAtlStringMgr *) | CStringT | CStringT | 1 |
+| atl.cpp:1037:5:1037:12 | CStringT | ATL | (const unsigned char *,IAtlStringMgr *) | CStringT | CStringT | 1 |
+| atl.cpp:1038:5:1038:12 | CStringT | ATL | (const CStringT &) | CStringT | CStringT | 0 |
+| atl.cpp:1042:5:1042:12 | CStringT | ATL | (LPCSTR,IAtlStringMgr *) | CStringT | CStringT | 0 |
+| atl.cpp:1042:5:1042:12 | CStringT | ATL | (LPCSTR,IAtlStringMgr *) | CStringT | CStringT | 1 |
+| atl.cpp:1042:5:1042:12 | CStringT | ATL | (LPCWSTR,IAtlStringMgr *) | CStringT | CStringT | 1 |
+| atl.cpp:1042:5:1042:12 | CStringT | ATL | (const VARIANT &,IAtlStringMgr *) | CStringT | CStringT | 1 |
+| atl.cpp:1042:5:1042:12 | CStringT | ATL | (const unsigned char *,IAtlStringMgr *) | CStringT | CStringT | 1 |
+| atl.cpp:1043:5:1043:12 | CStringT | ATL | (LPCSTR,IAtlStringMgr *) | CStringT | CStringT | 1 |
+| atl.cpp:1043:5:1043:12 | CStringT | ATL | (LPCWSTR,IAtlStringMgr *) | CStringT | CStringT | 0 |
+| atl.cpp:1043:5:1043:12 | CStringT | ATL | (LPCWSTR,IAtlStringMgr *) | CStringT | CStringT | 1 |
+| atl.cpp:1043:5:1043:12 | CStringT | ATL | (const VARIANT &,IAtlStringMgr *) | CStringT | CStringT | 1 |
+| atl.cpp:1043:5:1043:12 | CStringT | ATL | (const unsigned char *,IAtlStringMgr *) | CStringT | CStringT | 1 |
+| atl.cpp:1045:5:1045:12 | CStringT | ATL | (char *) | CStringT | CStringT | 0 |
+| atl.cpp:1046:5:1046:12 | CStringT | ATL | (unsigned char *) | CStringT | CStringT | 0 |
+| atl.cpp:1047:5:1047:12 | CStringT | ATL | (wchar_t *) | CStringT | CStringT | 0 |
+| atl.cpp:1049:5:1049:12 | CStringT | ATL | (char,int) | CStringT | CStringT | 0 |
+| atl.cpp:1049:5:1049:12 | CStringT | ATL | (char,int) | CStringT | CStringT | 1 |
+| atl.cpp:1049:5:1049:12 | CStringT | ATL | (const XCHAR *,int) | CStringT | CStringT | 1 |
+| atl.cpp:1049:5:1049:12 | CStringT | ATL | (const YCHAR *,int) | CStringT | CStringT | 1 |
+| atl.cpp:1049:5:1049:12 | CStringT | ATL | (wchar_t,int) | CStringT | CStringT | 1 |
+| atl.cpp:1050:5:1050:12 | CStringT | ATL | (char,int) | CStringT | CStringT | 1 |
+| atl.cpp:1050:5:1050:12 | CStringT | ATL | (const XCHAR *,int) | CStringT | CStringT | 1 |
+| atl.cpp:1050:5:1050:12 | CStringT | ATL | (const YCHAR *,int) | CStringT | CStringT | 1 |
+| atl.cpp:1050:5:1050:12 | CStringT | ATL | (wchar_t,int) | CStringT | CStringT | 0 |
+| atl.cpp:1050:5:1050:12 | CStringT | ATL | (wchar_t,int) | CStringT | CStringT | 1 |
+| atl.cpp:1061:10:1061:21 | AppendFormat | ATL | (PCXSTR,...) | CStringT | AppendFormat | 0 |
+| atl.cpp:1061:10:1061:21 | AppendFormat | ATL | (PCXSTR,...) | CStringT | AppendFormat | 1 |
+| atl.cpp:1061:10:1061:21 | AppendFormat | ATL | (UINT,...) | CStringT | AppendFormat | 1 |
+| atl.cpp:1062:10:1062:21 | AppendFormat | ATL | (PCXSTR,...) | CStringT | AppendFormat | 1 |
+| atl.cpp:1062:10:1062:21 | AppendFormat | ATL | (UINT,...) | CStringT | AppendFormat | 0 |
+| atl.cpp:1062:10:1062:21 | AppendFormat | ATL | (UINT,...) | CStringT | AppendFormat | 1 |
+| atl.cpp:1070:9:1070:14 | Insert | ATL | (int,PCXSTR) | CStringT | Insert | 0 |
+| atl.cpp:1070:9:1070:14 | Insert | ATL | (int,PCXSTR) | CStringT | Insert | 1 |
+| atl.cpp:1071:9:1071:14 | Insert | ATL | (int,XCHAR) | CStringT | Insert | 0 |
+| atl.cpp:1071:9:1071:14 | Insert | ATL | (int,XCHAR) | CStringT | Insert | 1 |
+| atl.cpp:1081:9:1081:15 | Replace | ATL | (PCXSTR,PCXSTR) | CStringT | Replace | 0 |
+| atl.cpp:1081:9:1081:15 | Replace | ATL | (PCXSTR,PCXSTR) | CStringT | Replace | 1 |
+| atl.cpp:1082:9:1082:15 | Replace | ATL | (XCHAR,XCHAR) | CStringT | Replace | 0 |
+| atl.cpp:1082:9:1082:15 | Replace | ATL | (XCHAR,XCHAR) | CStringT | Replace | 1 |
+| atl.cpp:1286:5:1286:10 | ComPtr | Microsoft::WRL | (const ComPtr &) | ComPtr | ComPtr | 0 |
+| atl.cpp:1287:5:1287:10 | ComPtr | Microsoft::WRL | (ComPtr &&) | ComPtr | ComPtr | 0 |
+| atl.cpp:1290:5:1290:10 | ComPtr | Microsoft::WRL | (T *) | ComPtr | ComPtr<T> | 0 |
+| atl.cpp:1290:5:1290:10 | ComPtr | Microsoft::WRL | (T *) | ComPtr | ComPtr<T> | 0 |
+| atl.cpp:1301:13:1301:18 | CopyTo | Microsoft::WRL | (T **) | ComPtr<T> | CopyTo | 0 |
+| atl.cpp:1303:13:1303:18 | CopyTo | Microsoft::WRL | (REFIID,void **) | ComPtr | CopyTo | 0 |
+| atl.cpp:1303:13:1303:18 | CopyTo | Microsoft::WRL | (REFIID,void **) | ComPtr | CopyTo | 1 |
+| atl.cpp:1306:13:1306:18 | CopyTo | Microsoft::WRL | (T **) | ComPtr | CopyTo<T> | 0 |
+| atl.cpp:1328:13:1328:21 | operator= | Microsoft::WRL | (T *) | ComPtr<T> | operator= | 0 |
+| atl.cpp:1330:13:1330:21 | operator= | Microsoft::WRL | (U *) | ComPtr | operator=<U> | 0 |
+| atl.cpp:1331:13:1331:21 | operator= | Microsoft::WRL | (const ComPtr &) | ComPtr | operator= | 0 |
+| atl.cpp:1333:13:1333:21 | operator= | Microsoft::WRL | (const ComPtr &) | ComPtr | operator= | 0 |
+| atl.cpp:1334:13:1334:21 | operator= | Microsoft::WRL | (ComPtr &&) | ComPtr | operator= | 0 |
+| atl.cpp:1336:13:1336:21 | operator= | Microsoft::WRL | (ComPtr &&) | ComPtr | operator= | 0 |
+| stl.h:294:12:294:17 | vector | std | (const vector &,const Allocator &) | vector<T,Allocator> | vector | 1 |
+| stl.h:294:12:294:17 | vector | std | (const vector &,const Allocator &) | vector<T,Allocator> | vector | 1 |
+| stl.h:294:12:294:17 | vector | std | (const vector &,const Allocator &) | vector<T,Allocator> | vector | 1 |
+| stl.h:294:12:294:17 | vector | std | (vector &&,const Allocator &) | vector<T,Allocator> | vector | 1 |
+| stl.h:294:12:294:17 | vector | std | (vector &&,const Allocator &) | vector<T,Allocator> | vector | 1 |
+| stl.h:294:12:294:17 | vector | std | (vector &&,const Allocator &) | vector<T,Allocator> | vector | 1 |
+| stl.h:295:3:295:8 | vector | std | (InputIterator,InputIterator,const Allocator &) | vector<T,Allocator> | vector<InputIterator> | 2 |
+| stl.h:295:3:295:8 | vector | std | (InputIterator,InputIterator,const Allocator &) | vector<T,Allocator> | vector<InputIterator> | 2 |
+| stl.h:295:3:295:8 | vector | std | (size_type,const T &,const Allocator &) | vector<T,Allocator> | vector | 0 |
+| stl.h:295:3:295:8 | vector | std | (size_type,const T &,const Allocator &) | vector<T,Allocator> | vector | 0 |
+| stl.h:295:3:295:8 | vector | std | (size_type,const T &,const Allocator &) | vector<T,Allocator> | vector | 1 |
+| stl.h:295:3:295:8 | vector | std | (size_type,const T &,const Allocator &) | vector<T,Allocator> | vector | 1 |
+| stl.h:295:3:295:8 | vector | std | (size_type,const T &,const Allocator &) | vector<T,Allocator> | vector | 2 |
+| stl.h:295:3:295:8 | vector | std | (size_type,const T &,const Allocator &) | vector<T,Allocator> | vector | 2 |
+| stl.h:296:101:296:106 | vector | std | (InputIterator,InputIterator,const Allocator &) | vector<T,Allocator> | vector<InputIterator> | 0 |
+| stl.h:296:101:296:106 | vector | std | (InputIterator,InputIterator,const Allocator &) | vector<T,Allocator> | vector<InputIterator> | 1 |
+| stl.h:296:101:296:106 | vector | std | (InputIterator,InputIterator,const Allocator &) | vector<T,Allocator> | vector<InputIterator> | 2 |
+| stl.h:296:101:296:106 | vector | std | (size_type,const T &,const Allocator &) | vector<T,Allocator> | vector | 2 |
+| stl.h:303:106:303:111 | assign | std | (InputIt,InputIt) | vector | assign<InputIt> | 0 |
+| stl.h:303:106:303:111 | assign | std | (InputIt,InputIt) | vector | assign<InputIt> | 1 |
+| stl.h:306:8:306:13 | assign | std | (size_type,const T &) | vector<T,Allocator> | assign | 0 |
+| stl.h:306:8:306:13 | assign | std | (size_type,const T &) | vector<T,Allocator> | assign | 0 |
+| stl.h:306:8:306:13 | assign | std | (size_type,const T &) | vector<T,Allocator> | assign | 0 |
+| stl.h:306:8:306:13 | assign | std | (size_type,const T &) | vector<T,Allocator> | assign | 1 |
+| stl.h:306:8:306:13 | assign | std | (size_type,const T &) | vector<T,Allocator> | assign | 1 |
+| stl.h:306:8:306:13 | assign | std | (size_type,const T &) | vector<T,Allocator> | assign | 1 |
+| stl.h:331:12:331:17 | insert | std | (const_iterator,T &&) | vector<T> | insert | 0 |
+| stl.h:331:12:331:17 | insert | std | (const_iterator,T &&) | vector<T> | insert | 1 |
+| stl.h:333:42:333:47 | insert | std | (const_iterator,InputIt,InputIt) | vector | insert<InputIt> | 0 |
+| stl.h:333:42:333:47 | insert | std | (const_iterator,InputIt,InputIt) | vector | insert<InputIt> | 0 |
+| stl.h:333:42:333:47 | insert | std | (const_iterator,InputIt,InputIt) | vector | insert<InputIt> | 1 |
+| stl.h:333:42:333:47 | insert | std | (const_iterator,InputIt,InputIt) | vector | insert<InputIt> | 1 |
+| stl.h:333:42:333:47 | insert | std | (const_iterator,InputIt,InputIt) | vector | insert<InputIt> | 2 |
+| stl.h:333:42:333:47 | insert | std | (const_iterator,InputIt,InputIt) | vector | insert<InputIt> | 2 |
+| stl.h:678:33:678:38 | format | std | (format_string,Args &&) |  | format<Args> | 0 |
+| stl.h:678:33:678:38 | format | std | (format_string,Args &&) |  | format<Args> | 0 |
+| stl.h:678:33:678:38 | format | std | (format_string,Args &&) |  | format<Args> | 1 |
+| stl.h:678:33:678:38 | format | std | (format_string,Args &&) |  | format<Args> | 1 |
+| taint.cpp:847:5:847:11 | toupper |  | (int) |  | toupper | 0 |
+| taint.cpp:848:5:848:11 | tolower |  | (int) |  | tolower | 0 |
 getSignatureParameterName
 | (..(*)(..)) |  | ASN1_SCTX_new | 0 | ..(*)(..) |
 | (..(*)(..)) |  | ossl_pqueue_new | 0 | ..(*)(..) |
@@ -21701,6 +2471,8 @@ getSignatureParameterName
 | (CURLU *,const char *,char **,OperationConfig *) |  | ipfs_url_rewrite | 1 | const char * |
 | (CURLU *,const char *,char **,OperationConfig *) |  | ipfs_url_rewrite | 2 | char ** |
 | (CURLU *,const char *,char **,OperationConfig *) |  | ipfs_url_rewrite | 3 | OperationConfig * |
+| (ComPtr &&) | ComPtr | ComPtr | 0 | ComPtr && |
+| (ComPtr &&) | ComPtr | operator= | 0 | ComPtr && |
 | (CompoundDictionary *,const PreparedDictionary *) |  | AttachPreparedDictionary | 0 | CompoundDictionary * |
 | (CompoundDictionary *,const PreparedDictionary *) |  | AttachPreparedDictionary | 1 | const PreparedDictionary * |
 | (Curl_cfilter *) |  | Curl_conn_cf_is_ssl | 0 | Curl_cfilter * |
@@ -28531,6 +9303,8 @@ getSignatureParameterName
 | (RAND_POOL *,unsigned int) |  | ossl_rand_pool_bytes_needed | 1 | unsigned int |
 | (RECORD_LAYER *,SSL_CONNECTION *) |  | RECORD_LAYER_init | 0 | RECORD_LAYER * |
 | (RECORD_LAYER *,SSL_CONNECTION *) |  | RECORD_LAYER_init | 1 | SSL_CONNECTION * |
+| (REFIID,void **) | ComPtr | CopyTo | 0 | REFIID |
+| (REFIID,void **) | ComPtr | CopyTo | 1 | void ** |
 | (RIO_NOTIFIER *) |  | ossl_rio_notifier_cleanup | 0 | RIO_NOTIFIER * |
 | (RIPEMD160_CTX *,const unsigned char *) |  | RIPEMD160_Transform | 0 | RIPEMD160_CTX * |
 | (RIPEMD160_CTX *,const unsigned char *) |  | RIPEMD160_Transform | 1 | const unsigned char * |
@@ -30114,6 +10888,10 @@ getSignatureParameterName
 | (Strtab *,const char *,size_t) |  | strtabadd | 2 | size_t |
 | (Strtab *,size_t *) |  | strtabfinalize | 0 | Strtab * |
 | (Strtab *,size_t *) |  | strtabfinalize | 1 | size_t * |
+| (T *) | ComPtr | ComPtr<T> | 0 | func:0 * |
+| (T *) | ComPtr<T> | operator= | 0 | class:0 * |
+| (T **) | ComPtr | CopyTo<T> | 0 | func:0 ** |
+| (T **) | ComPtr<T> | CopyTo | 0 | class:0 ** |
 | (TLS_FEATURE *) |  | TLS_FEATURE_free | 0 | TLS_FEATURE * |
 | (TLS_RL_RECORD *,const unsigned char *) |  | ossl_tls_rl_record_set_seq_num | 0 | TLS_RL_RECORD * |
 | (TLS_RL_RECORD *,const unsigned char *) |  | ossl_tls_rl_record_set_seq_num | 1 | const unsigned char * |
@@ -30306,6 +11084,7 @@ getSignatureParameterName
 | (TXT_DB *,int,..(*)(..),OPENSSL_LH_HASHFUNC,OPENSSL_LH_COMPFUNC) |  | TXT_DB_create_index | 2 | ..(*)(..) |
 | (TXT_DB *,int,..(*)(..),OPENSSL_LH_HASHFUNC,OPENSSL_LH_COMPFUNC) |  | TXT_DB_create_index | 3 | OPENSSL_LH_HASHFUNC |
 | (TXT_DB *,int,..(*)(..),OPENSSL_LH_HASHFUNC,OPENSSL_LH_COMPFUNC) |  | TXT_DB_create_index | 4 | OPENSSL_LH_COMPFUNC |
+| (U *) | ComPtr | operator=<U> | 0 | func:0 * |
 | (UI *) |  | UI_get0_user_data | 0 | UI * |
 | (UI *) |  | UI_get_method | 0 | UI * |
 | (UI *,UI_STRING *,const char *) |  | UI_set_result | 0 | UI * |
@@ -33256,6 +14035,8 @@ getSignatureParameterName
 | (const CURLU *,CURLUPart,char **,unsigned int) |  | curl_url_get | 1 | CURLUPart |
 | (const CURLU *,CURLUPart,char **,unsigned int) |  | curl_url_get | 2 | char ** |
 | (const CURLU *,CURLUPart,char **,unsigned int) |  | curl_url_get | 3 | unsigned int |
+| (const ComPtr &) | ComPtr | ComPtr | 0 | const ComPtr & |
+| (const ComPtr &) | ComPtr | operator= | 0 | const ComPtr & |
 | (const Command *,const size_t,const BlockSplit *,const BlockSplit *,const BlockSplit *,const uint8_t *,size_t,size_t,uint8_t,uint8_t,const ContextType *,HistogramLiteral *,HistogramCommand *,HistogramDistance *) |  | BrotliBuildHistogramsWithContext | 0 | const Command * |
 | (const Command *,const size_t,const BlockSplit *,const BlockSplit *,const BlockSplit *,const uint8_t *,size_t,size_t,uint8_t,uint8_t,const ContextType *,HistogramLiteral *,HistogramCommand *,HistogramDistance *) |  | BrotliBuildHistogramsWithContext | 1 | const size_t |
 | (const Command *,const size_t,const BlockSplit *,const BlockSplit *,const BlockSplit *,const uint8_t *,size_t,size_t,uint8_t,uint8_t,const ContextType *,HistogramLiteral *,HistogramCommand *,HistogramDistance *) |  | BrotliBuildHistogramsWithContext | 2 | const BlockSplit * |
@@ -46065,14 +26846,20 @@ getParameterTypeName
 | atl.cpp:196:12:196:14 | Add | 0 | INARGTYPclass:0 |
 | atl.cpp:198:12:198:17 | Append | 0 | const CAtlArray & |
 | atl.cpp:199:10:199:13 | Copy | 0 | const CAtlArray & |
+| atl.cpp:201:8:201:12 | GetAt | 0 | decltype(...) |
 | atl.cpp:201:8:201:12 | GetAt | 0 | size_t |
+| atl.cpp:205:10:205:22 | InsertArrayAt | 0 | decltype(...) |
 | atl.cpp:205:10:205:22 | InsertArrayAt | 0 | size_t |
 | atl.cpp:205:10:205:22 | InsertArrayAt | 1 | const CAtlArray * |
+| atl.cpp:206:10:206:17 | InsertAt | 0 | decltype(...) |
 | atl.cpp:206:10:206:17 | InsertAt | 0 | size_t |
 | atl.cpp:206:10:206:17 | InsertAt | 1 | INARGTYPclass:0 |
+| atl.cpp:206:10:206:17 | InsertAt | 2 | decltype(...) |
 | atl.cpp:206:10:206:17 | InsertAt | 2 | size_t |
+| atl.cpp:211:10:211:18 | SetAtGrow | 0 | decltype(...) |
 | atl.cpp:211:10:211:18 | SetAtGrow | 0 | size_t |
 | atl.cpp:211:10:211:18 | SetAtGrow | 1 | INARGTYPclass:0 |
+| atl.cpp:213:8:213:17 | operator[] | 0 | decltype(...) |
 | atl.cpp:213:8:213:17 | operator[] | 0 | size_t |
 | atl.cpp:259:5:259:12 | CAtlList | 0 | UINT |
 | atl.cpp:259:5:259:12 | CAtlList | 0 | UINT |
@@ -46092,6 +26879,8 @@ getParameterTypeName
 | atl.cpp:267:14:267:17 | Find | 1 | POSITION |
 | atl.cpp:267:14:267:17 | Find | 1 | __POSITION * |
 | atl.cpp:267:14:267:17 | Find | 1 | __POSITION * |
+| atl.cpp:268:14:268:22 | FindIndex | 0 | decltype(...) |
+| atl.cpp:268:14:268:22 | FindIndex | 0 | decltype(...) |
 | atl.cpp:268:14:268:22 | FindIndex | 0 | size_t |
 | atl.cpp:268:14:268:22 | FindIndex | 0 | size_t |
 | atl.cpp:269:8:269:12 | GetAt | 0 | POSITION |
@@ -46272,6 +27061,7 @@ getParameterTypeName
 | atl.cpp:927:17:927:25 | CopyChars | 2 | int |
 | atl.cpp:928:17:928:25 | CopyChars | 0 | XCHAR * |
 | atl.cpp:928:17:928:25 | CopyChars | 0 | char * |
+| atl.cpp:928:17:928:25 | CopyChars | 1 | decltype(...) |
 | atl.cpp:928:17:928:25 | CopyChars | 1 | size_t |
 | atl.cpp:928:17:928:25 | CopyChars | 2 | const XCHAR * |
 | atl.cpp:928:17:928:25 | CopyChars | 2 | const char * |
@@ -46355,6 +27145,27 @@ getParameterTypeName
 | atl.cpp:1231:5:1231:12 | CStrBufT | 1 | int |
 | atl.cpp:1231:5:1231:12 | CStrBufT | 2 | DWORD |
 | atl.cpp:1231:5:1231:12 | CStrBufT | 2 | unsigned long |
+| atl.cpp:1286:5:1286:10 | ComPtr | 0 | const ComPtr & |
+| atl.cpp:1287:5:1287:10 | ComPtr | 0 | ComPtr && |
+| atl.cpp:1290:5:1290:10 | ComPtr | 0 | func:0 * |
+| atl.cpp:1290:5:1290:10 | ComPtr | 0 | func:0 * |
+| atl.cpp:1295:13:1295:14 | As | 0 | ComPtr * |
+| atl.cpp:1301:13:1301:18 | CopyTo | 0 | Interfaceclass:0ype ** |
+| atl.cpp:1301:13:1301:18 | CopyTo | 0 | class:0 ** |
+| atl.cpp:1303:13:1303:18 | CopyTo | 0 | GUID * |
+| atl.cpp:1303:13:1303:18 | CopyTo | 0 | REFIID |
+| atl.cpp:1303:13:1303:18 | CopyTo | 1 | void ** |
+| atl.cpp:1306:13:1306:18 | CopyTo | 0 | func:0 ** |
+| atl.cpp:1321:10:1321:13 | Swap | 0 | ComPtr & |
+| atl.cpp:1328:13:1328:21 | operator= | 0 | class:0 * |
+| atl.cpp:1330:13:1330:21 | operator= | 0 | func:0 * |
+| atl.cpp:1331:13:1331:21 | operator= | 0 | const ComPtr & |
+| atl.cpp:1333:13:1333:21 | operator= | 0 | const ComPtr & |
+| atl.cpp:1334:13:1334:21 | operator= | 0 | ComPtr && |
+| atl.cpp:1336:13:1336:21 | operator= | 0 | ComPtr && |
+| atl.cpp:1343:25:1343:28 | move | 0 | func:0 & |
+| atl.cpp:1415:8:1415:8 | operator= | 0 | S && |
+| atl.cpp:1415:8:1415:8 | operator= | 0 | const S & |
 | bsd.cpp:6:8:6:8 | operator= | 0 | const sockaddr & |
 | bsd.cpp:6:8:6:8 | operator= | 0 | sockaddr && |
 | bsd.cpp:12:5:12:10 | accept | 0 | int |
@@ -47191,6 +28002,22 @@ getParameterTypeName
 | taint.cpp:817:6:817:27 | write_to_const_ptr_ptr | 1 | const char ** |
 | taint.cpp:822:6:822:19 | take_const_ptr | 0 | const char * |
 | taint.cpp:822:6:822:19 | take_const_ptr | 1 | const char * |
+| taint.cpp:836:6:836:18 | indirect_sink | 0 | FILE * |
+| taint.cpp:837:5:837:11 | fprintf | 0 | FILE * |
+| taint.cpp:837:5:837:11 | fprintf | 1 | const char * |
+| taint.cpp:837:5:837:11 | fprintf | 2 | ... |
+| taint.cpp:847:5:847:11 | toupper | 0 | int |
+| taint.cpp:848:5:848:11 | tolower | 0 | int |
+| taint.cpp:859:8:859:12 | iconv | 0 | iconv_t |
+| taint.cpp:859:8:859:12 | iconv | 0 | int |
+| taint.cpp:859:8:859:12 | iconv | 1 | char ** |
+| taint.cpp:859:8:859:12 | iconv | 2 | size_t * |
+| taint.cpp:859:8:859:12 | iconv | 2 | unsigned long * |
+| taint.cpp:859:8:859:12 | iconv | 3 | char ** |
+| taint.cpp:859:8:859:12 | iconv | 4 | size_t * |
+| taint.cpp:859:8:859:12 | iconv | 4 | unsigned long * |
+| taint.cpp:861:6:861:15 | test_iconv | 0 | size_t |
+| taint.cpp:861:6:861:15 | test_iconv | 0 | unsigned long |
 | thread.cpp:4:6:4:9 | sink | 0 | int |
 | thread.cpp:6:8:6:8 | operator= | 0 | S && |
 | thread.cpp:6:8:6:8 | operator= | 0 | const S & |
diff --git a/cpp/ql/test/library-tests/dataflow/taint-tests/test_mad-signatures.ql b/cpp/ql/test/library-tests/dataflow/taint-tests/test_mad-signatures.ql
index 32c0e59c158..dc0027fcc6f 100644
--- a/cpp/ql/test/library-tests/dataflow/taint-tests/test_mad-signatures.ql
+++ b/cpp/ql/test/library-tests/dataflow/taint-tests/test_mad-signatures.ql
@@ -2,7 +2,7 @@ import cpp
 import semmle.code.cpp.dataflow.ExternalFlow
 import ExternalFlowDebug
 
-query predicate signatureMatches = signatureMatches_debug/5;
+query predicate signatureMatches = signatureMatches_debug/6;
 
 query predicate getSignatureParameterName = getSignatureParameterName_debug/4;
 
diff --git a/cpp/ql/test/library-tests/files/Files.expected b/cpp/ql/test/library-tests/files/Files.expected
index 13f3a6b2da1..f94c07badcf 100644
--- a/cpp/ql/test/library-tests/files/Files.expected
+++ b/cpp/ql/test/library-tests/files/Files.expected
@@ -1,4 +1,4 @@
-| c.c | c.c | CFile, MetricFile | C |  |  |
-| files1.cpp | files1.cpp | CppFile, MetricFile | C++ | swap | t |
-| files1.h | files1.h | HeaderFile, MetricFile |  | swap |  |
-| files2.cpp | files2.cpp | CppFile, MetricFile | C++ | g | x, y |
+| c.c | c.c | CFile, GuardConditionImpl, MetricFile | C |  |  |
+| files1.cpp | files1.cpp | CppFile, GuardConditionImpl, MetricFile | C++ | swap | t |
+| files1.h | files1.h | GuardConditionImpl, HeaderFile, MetricFile |  | swap |  |
+| files2.cpp | files2.cpp | CppFile, GuardConditionImpl, MetricFile | C++ | g | x, y |
diff --git a/cpp/ql/test/library-tests/functions/routinetype/types.expected b/cpp/ql/test/library-tests/functions/routinetype/types.expected
index d620bea517e..87d51330d76 100644
--- a/cpp/ql/test/library-tests/functions/routinetype/types.expected
+++ b/cpp/ql/test/library-tests/functions/routinetype/types.expected
@@ -1 +1 @@
-| routinetype.cpp:2:7:2:19 | myRoutineType | file://:0:0:0:0 | ..()(..) | RoutineType |
+| routinetype.cpp:2:7:2:19 | myRoutineType | file://:0:0:0:0 | ..()(..) | GuardConditionImpl, RoutineType |
diff --git a/cpp/ql/test/library-tests/ir/ir/PrintAST.expected b/cpp/ql/test/library-tests/ir/ir/PrintAST.expected
index 6e62071e7d9..630a4ca5ceb 100644
--- a/cpp/ql/test/library-tests/ir/ir/PrintAST.expected
+++ b/cpp/ql/test/library-tests/ir/ir/PrintAST.expected
@@ -24550,6 +24550,547 @@ ir.cpp:
 # 2771|                 Type = [LValueReferenceType] ThreeWay &
 # 2771|                 ValueCategory = prvalue
 # 2772|     getStmt(2): [ReturnStmt] return ...
+# 2774| [TopLevelFunction] void test_allocation_with_initializer()
+# 2774|   <params>: 
+# 2774|   getEntryPoint(): [BlockStmt] { ... }
+# 2775|     getStmt(0): [DeclStmt] declaration
+# 2775|       getDeclarationEntry(0): [VariableDeclarationEntry] definition of p1
+# 2775|           Type = [IntPointerType] int *
+# 2775|         getVariable().getInitializer(): [Initializer] initializer for p1
+# 2775|           getExpr(): [NewExpr] new
+# 2775|               Type = [IntPointerType] int *
+# 2775|               ValueCategory = prvalue
+# 2775|             getInitializer(): [Literal] 42
+# 2775|                 Type = [IntType] int
+# 2775|                 Value = [Literal] 42
+# 2775|                 ValueCategory = prvalue
+# 2776|     getStmt(1): [DeclStmt] declaration
+# 2776|       getDeclarationEntry(0): [VariableDeclarationEntry] definition of p2
+# 2776|           Type = [PointerType] long *
+# 2776|         getVariable().getInitializer(): [Initializer] initializer for p2
+# 2776|           getExpr(): [NewExpr] new
+# 2776|               Type = [PointerType] long *
+# 2776|               ValueCategory = prvalue
+# 2776|             getInitializer(): [Literal] 42
+# 2776|                 Type = [IntType] int
+# 2776|                 Value = [Literal] 42
+# 2776|                 ValueCategory = prvalue
+# 2776|             getInitializer().getFullyConverted(): [CStyleCast] (long)...
+# 2776|                 Conversion = [IntegralConversion] integral conversion
+# 2776|                 Type = [LongType] long
+# 2776|                 Value = [CStyleCast] 42
+# 2776|                 ValueCategory = prvalue
+# 2777|     getStmt(2): [ReturnStmt] return ...
+# 2779| [TopLevelFunction] void vla_sizeof_test(int, size_t, char)
+# 2779|   <params>: 
+# 2779|     getParameter(0): [Parameter] len1
+# 2779|         Type = [IntType] int
+# 2779|     getParameter(1): [Parameter] len2
+# 2779|         Type = [CTypedefType,Size_t] size_t
+# 2779|     getParameter(2): [Parameter] len3
+# 2779|         Type = [PlainCharType] char
+# 2779|   getEntryPoint(): [BlockStmt] { ... }
+# 2780|     getStmt(0): [DeclStmt] declaration
+# 2780|       getDeclarationEntry(0): [VariableDeclarationEntry] definition of tmp1
+# 2780|           Type = [ArrayType] char[]
+# 2780|     getStmt(1): [VlaDimensionStmt] VLA dimension size
+# 2780|       getDimensionExpr(): [VariableAccess] len1
+# 2780|           Type = [IntType] int
+# 2780|           ValueCategory = prvalue(load)
+# 2780|     getStmt(2): [VlaDeclStmt] VLA declaration
+# 2781|     getStmt(3): [DeclStmt] declaration
+# 2781|       getDeclarationEntry(0): [VariableDeclarationEntry] definition of x
+# 2781|           Type = [CTypedefType,Size_t] size_t
+# 2781|         getVariable().getInitializer(): [Initializer] initializer for x
+# 2781|           getExpr(): [SizeofExprOperator] sizeof(<expr>)
+# 2781|               Type = [LongType] unsigned long
+# 2781|               ValueCategory = prvalue
+# 2781|             getExprOperand(): [VariableAccess] tmp1
+# 2781|                 Type = [ArrayType] char[]
+# 2781|                 ValueCategory = lvalue
+# 2781|             getExprOperand().getFullyConverted(): [ParenthesisExpr] (...)
+# 2781|                 Type = [ArrayType] char[]
+# 2781|                 ValueCategory = lvalue
+# 2782|     getStmt(4): [DeclStmt] declaration
+# 2782|       getDeclarationEntry(0): [VariableDeclarationEntry] definition of tmp2
+# 2782|           Type = [ArrayType] int[][]
+# 2782|     getStmt(5): [VlaDimensionStmt] VLA dimension size
+# 2782|       getDimensionExpr(): [VariableAccess] len1
+# 2782|           Type = [IntType] int
+# 2782|           ValueCategory = prvalue(load)
+# 2782|     getStmt(6): [VlaDimensionStmt] VLA dimension size
+# 2782|       getDimensionExpr(): [VariableAccess] len2
+# 2782|           Type = [CTypedefType,Size_t] size_t
+# 2782|           ValueCategory = prvalue(load)
+# 2782|     getStmt(7): [VlaDeclStmt] VLA declaration
+# 2783|     getStmt(8): [DeclStmt] declaration
+# 2783|       getDeclarationEntry(0): [VariableDeclarationEntry] definition of y
+# 2783|           Type = [CTypedefType,Size_t] size_t
+# 2783|         getVariable().getInitializer(): [Initializer] initializer for y
+# 2783|           getExpr(): [SizeofExprOperator] sizeof(<expr>)
+# 2783|               Type = [LongType] unsigned long
+# 2783|               ValueCategory = prvalue
+# 2783|             getExprOperand(): [VariableAccess] tmp2
+# 2783|                 Type = [ArrayType] int[][]
+# 2783|                 ValueCategory = lvalue
+# 2783|             getExprOperand().getFullyConverted(): [ParenthesisExpr] (...)
+# 2783|                 Type = [ArrayType] int[][]
+# 2783|                 ValueCategory = lvalue
+# 2784|     getStmt(9): [DeclStmt] declaration
+# 2784|       getDeclarationEntry(0): [VariableDeclarationEntry] definition of z
+# 2784|           Type = [CTypedefType,Size_t] size_t
+# 2784|         getVariable().getInitializer(): [Initializer] initializer for z
+# 2784|           getExpr(): [SizeofExprOperator] sizeof(<expr>)
+# 2784|               Type = [LongType] unsigned long
+# 2784|               ValueCategory = prvalue
+# 2784|             getExprOperand(): [PointerDereferenceExpr] * ...
+# 2784|                 Type = [ArrayType] int[]
+# 2784|                 ValueCategory = lvalue
+# 2784|               getOperand(): [VariableAccess] tmp2
+# 2784|                   Type = [ArrayType] int[][]
+# 2784|                   ValueCategory = lvalue
+# 2784|               getOperand().getFullyConverted(): [ArrayToPointerConversion] array to pointer conversion
+# 2784|                   Type = [PointerType] int(*)[]
+# 2784|                   ValueCategory = prvalue
+# 2784|             getExprOperand().getFullyConverted(): [ParenthesisExpr] (...)
+# 2784|                 Type = [ArrayType] int[]
+# 2784|                 ValueCategory = lvalue
+# 2785|     getStmt(10): [DeclStmt] declaration
+# 2785|       getDeclarationEntry(0): [VariableDeclarationEntry] definition of tmp3
+# 2785|           Type = [ArrayType] int[][][]
+# 2785|     getStmt(11): [VlaDimensionStmt] VLA dimension size
+# 2785|       getDimensionExpr(): [VariableAccess] len1
+# 2785|           Type = [IntType] int
+# 2785|           ValueCategory = prvalue(load)
+# 2785|     getStmt(12): [VlaDimensionStmt] VLA dimension size
+# 2785|       getDimensionExpr(): [VariableAccess] len2
+# 2785|           Type = [CTypedefType,Size_t] size_t
+# 2785|           ValueCategory = prvalue(load)
+# 2785|     getStmt(13): [VlaDimensionStmt] VLA dimension size
+# 2785|       getDimensionExpr(): [VariableAccess] len3
+# 2785|           Type = [PlainCharType] char
+# 2785|           ValueCategory = prvalue(load)
+# 2785|     getStmt(14): [VlaDeclStmt] VLA declaration
+# 2786|     getStmt(15): [DeclStmt] declaration
+# 2786|       getDeclarationEntry(0): [VariableDeclarationEntry] definition of w
+# 2786|           Type = [CTypedefType,Size_t] size_t
+# 2786|         getVariable().getInitializer(): [Initializer] initializer for w
+# 2786|           getExpr(): [SizeofExprOperator] sizeof(<expr>)
+# 2786|               Type = [LongType] unsigned long
+# 2786|               ValueCategory = prvalue
+# 2786|             getExprOperand(): [VariableAccess] tmp3
+# 2786|                 Type = [ArrayType] int[][][]
+# 2786|                 ValueCategory = lvalue
+# 2786|             getExprOperand().getFullyConverted(): [ParenthesisExpr] (...)
+# 2786|                 Type = [ArrayType] int[][][]
+# 2786|                 ValueCategory = lvalue
+# 2787|     getStmt(16): [DeclStmt] declaration
+# 2787|       getDeclarationEntry(0): [VariableDeclarationEntry] definition of v
+# 2787|           Type = [CTypedefType,Size_t] size_t
+# 2787|         getVariable().getInitializer(): [Initializer] initializer for v
+# 2787|           getExpr(): [SizeofExprOperator] sizeof(<expr>)
+# 2787|               Type = [LongType] unsigned long
+# 2787|               ValueCategory = prvalue
+# 2787|             getExprOperand(): [PointerDereferenceExpr] * ...
+# 2787|                 Type = [ArrayType] int[][]
+# 2787|                 ValueCategory = lvalue
+# 2787|               getOperand(): [VariableAccess] tmp3
+# 2787|                   Type = [ArrayType] int[][][]
+# 2787|                   ValueCategory = lvalue
+# 2787|               getOperand().getFullyConverted(): [ArrayToPointerConversion] array to pointer conversion
+# 2787|                   Type = [PointerType] int(*)[][]
+# 2787|                   ValueCategory = prvalue
+# 2787|             getExprOperand().getFullyConverted(): [ParenthesisExpr] (...)
+# 2787|                 Type = [ArrayType] int[][]
+# 2787|                 ValueCategory = lvalue
+# 2788|     getStmt(17): [DeclStmt] declaration
+# 2788|       getDeclarationEntry(0): [VariableDeclarationEntry] definition of u
+# 2788|           Type = [CTypedefType,Size_t] size_t
+# 2788|         getVariable().getInitializer(): [Initializer] initializer for u
+# 2788|           getExpr(): [SizeofExprOperator] sizeof(<expr>)
+# 2788|               Type = [LongType] unsigned long
+# 2788|               ValueCategory = prvalue
+# 2788|             getExprOperand(): [PointerDereferenceExpr] * ...
+# 2788|                 Type = [ArrayType] int[]
+# 2788|                 ValueCategory = lvalue
+# 2788|               getOperand(): [PointerDereferenceExpr] * ...
+# 2788|                   Type = [ArrayType] int[][]
+# 2788|                   ValueCategory = lvalue
+# 2788|                 getOperand(): [VariableAccess] tmp3
+# 2788|                     Type = [ArrayType] int[][][]
+# 2788|                     ValueCategory = lvalue
+# 2788|                 getOperand().getFullyConverted(): [ArrayToPointerConversion] array to pointer conversion
+# 2788|                     Type = [PointerType] int(*)[][]
+# 2788|                     ValueCategory = prvalue
+# 2788|               getOperand().getFullyConverted(): [ArrayToPointerConversion] array to pointer conversion
+# 2788|                   Type = [PointerType] int(*)[]
+# 2788|                   ValueCategory = prvalue
+# 2788|             getExprOperand().getFullyConverted(): [ParenthesisExpr] (...)
+# 2788|                 Type = [ArrayType] int[]
+# 2788|                 ValueCategory = lvalue
+# 2789|     getStmt(18): [DeclStmt] declaration
+# 2789|       getDeclarationEntry(0): [VariableDeclarationEntry] definition of t
+# 2789|           Type = [CTypedefType,Size_t] size_t
+# 2789|         getVariable().getInitializer(): [Initializer] initializer for t
+# 2789|           getExpr(): [SizeofExprOperator] sizeof(<expr>)
+# 2789|               Type = [LongType] unsigned long
+# 2789|               Value = [SizeofExprOperator] 4
+# 2789|               ValueCategory = prvalue
+# 2789|             getExprOperand(): [PointerDereferenceExpr] * ...
+# 2789|                 Type = [IntType] int
+# 2789|                 ValueCategory = lvalue
+# 2789|               getOperand(): [PointerDereferenceExpr] * ...
+# 2789|                   Type = [ArrayType] int[]
+# 2789|                   ValueCategory = lvalue
+# 2789|                 getOperand(): [PointerDereferenceExpr] * ...
+# 2789|                     Type = [ArrayType] int[][]
+# 2789|                     ValueCategory = lvalue
+# 2789|                   getOperand(): [VariableAccess] tmp3
+# 2789|                       Type = [ArrayType] int[][][]
+# 2789|                       ValueCategory = lvalue
+# 2789|                   getOperand().getFullyConverted(): [ArrayToPointerConversion] array to pointer conversion
+# 2789|                       Type = [PointerType] int(*)[][]
+# 2789|                       ValueCategory = prvalue
+# 2789|                 getOperand().getFullyConverted(): [ArrayToPointerConversion] array to pointer conversion
+# 2789|                     Type = [PointerType] int(*)[]
+# 2789|                     ValueCategory = prvalue
+# 2789|               getOperand().getFullyConverted(): [ArrayToPointerConversion] array to pointer conversion
+# 2789|                   Type = [IntPointerType] int *
+# 2789|                   ValueCategory = prvalue
+# 2789|             getExprOperand().getFullyConverted(): [ParenthesisExpr] (...)
+# 2789|                 Type = [IntType] int
+# 2789|                 ValueCategory = lvalue
+# 2790|     getStmt(19): [ReturnStmt] return ...
+# 2792| [TopLevelFunction] void vla_sizeof_test2(int, size_t, char)
+# 2792|   <params>: 
+# 2792|     getParameter(0): [Parameter] len1
+# 2792|         Type = [IntType] int
+# 2792|     getParameter(1): [Parameter] len2
+# 2792|         Type = [CTypedefType,Size_t] size_t
+# 2792|     getParameter(2): [Parameter] len3
+# 2792|         Type = [PlainCharType] char
+# 2792|   getEntryPoint(): [BlockStmt] { ... }
+# 2793|     getStmt(0): [DeclStmt] declaration
+# 2793|       getDeclarationEntry(0): [VariableDeclarationEntry] definition of tmp1
+# 2793|           Type = [ArrayType] int[][]
+# 2793|     getStmt(1): [VlaDimensionStmt] VLA dimension size
+# 2793|       getDimensionExpr(): [VariableAccess] len1
+# 2793|           Type = [IntType] int
+# 2793|           ValueCategory = prvalue(load)
+# 2793|     getStmt(2): [VlaDimensionStmt] VLA dimension size
+# 2793|       getDimensionExpr(): [VariableAccess] len2
+# 2793|           Type = [CTypedefType,Size_t] size_t
+# 2793|           ValueCategory = prvalue(load)
+# 2793|     getStmt(3): [VlaDeclStmt] VLA declaration
+# 2794|     getStmt(4): [DeclStmt] declaration
+# 2794|       getDeclarationEntry(0): [VariableDeclarationEntry] definition of z
+# 2794|           Type = [CTypedefType,Size_t] size_t
+# 2794|         getVariable().getInitializer(): [Initializer] initializer for z
+# 2794|           getExpr(): [SizeofExprOperator] sizeof(<expr>)
+# 2794|               Type = [LongType] unsigned long
+# 2794|               ValueCategory = prvalue
+# 2794|             getExprOperand(): [ArrayExpr] access to array
+# 2794|                 Type = [ArrayType] int[]
+# 2794|                 ValueCategory = lvalue
+# 2794|               getArrayBase(): [VariableAccess] tmp1
+# 2794|                   Type = [ArrayType] int[][]
+# 2794|                   ValueCategory = lvalue
+# 2794|               getArrayOffset(): [Literal] 1
+# 2794|                   Type = [IntType] int
+# 2794|                   Value = [Literal] 1
+# 2794|                   ValueCategory = prvalue
+# 2794|               getArrayBase().getFullyConverted(): [ArrayToPointerConversion] array to pointer conversion
+# 2794|                   Type = [PointerType] int(*)[]
+# 2794|                   ValueCategory = prvalue
+# 2794|             getExprOperand().getFullyConverted(): [ParenthesisExpr] (...)
+# 2794|                 Type = [ArrayType] int[]
+# 2794|                 ValueCategory = lvalue
+# 2795|     getStmt(5): [DeclStmt] declaration
+# 2795|       getDeclarationEntry(0): [VariableDeclarationEntry] definition of tmp2
+# 2795|           Type = [ArrayType] int[][][]
+# 2795|     getStmt(6): [VlaDimensionStmt] VLA dimension size
+# 2795|       getDimensionExpr(): [VariableAccess] len1
+# 2795|           Type = [IntType] int
+# 2795|           ValueCategory = prvalue(load)
+# 2795|     getStmt(7): [VlaDimensionStmt] VLA dimension size
+# 2795|       getDimensionExpr(): [VariableAccess] len2
+# 2795|           Type = [CTypedefType,Size_t] size_t
+# 2795|           ValueCategory = prvalue(load)
+# 2795|     getStmt(8): [VlaDimensionStmt] VLA dimension size
+# 2795|       getDimensionExpr(): [VariableAccess] len3
+# 2795|           Type = [PlainCharType] char
+# 2795|           ValueCategory = prvalue(load)
+# 2795|     getStmt(9): [VlaDeclStmt] VLA declaration
+# 2796|     getStmt(10): [DeclStmt] declaration
+# 2796|       getDeclarationEntry(0): [VariableDeclarationEntry] definition of v
+# 2796|           Type = [CTypedefType,Size_t] size_t
+# 2796|         getVariable().getInitializer(): [Initializer] initializer for v
+# 2796|           getExpr(): [SizeofExprOperator] sizeof(<expr>)
+# 2796|               Type = [LongType] unsigned long
+# 2796|               ValueCategory = prvalue
+# 2796|             getExprOperand(): [ArrayExpr] access to array
+# 2796|                 Type = [ArrayType] int[][]
+# 2796|                 ValueCategory = lvalue
+# 2796|               getArrayBase(): [VariableAccess] tmp2
+# 2796|                   Type = [ArrayType] int[][][]
+# 2796|                   ValueCategory = lvalue
+# 2796|               getArrayOffset(): [Literal] 1
+# 2796|                   Type = [IntType] int
+# 2796|                   Value = [Literal] 1
+# 2796|                   ValueCategory = prvalue
+# 2796|               getArrayBase().getFullyConverted(): [ArrayToPointerConversion] array to pointer conversion
+# 2796|                   Type = [PointerType] int(*)[][]
+# 2796|                   ValueCategory = prvalue
+# 2796|             getExprOperand().getFullyConverted(): [ParenthesisExpr] (...)
+# 2796|                 Type = [ArrayType] int[][]
+# 2796|                 ValueCategory = lvalue
+# 2797|     getStmt(11): [DeclStmt] declaration
+# 2797|       getDeclarationEntry(0): [VariableDeclarationEntry] definition of u
+# 2797|           Type = [CTypedefType,Size_t] size_t
+# 2797|         getVariable().getInitializer(): [Initializer] initializer for u
+# 2797|           getExpr(): [SizeofExprOperator] sizeof(<expr>)
+# 2797|               Type = [LongType] unsigned long
+# 2797|               ValueCategory = prvalue
+# 2797|             getExprOperand(): [ArrayExpr] access to array
+# 2797|                 Type = [ArrayType] int[]
+# 2797|                 ValueCategory = lvalue
+# 2797|               getArrayBase(): [ArrayExpr] access to array
+# 2797|                   Type = [ArrayType] int[][]
+# 2797|                   ValueCategory = lvalue
+# 2797|                 getArrayBase(): [VariableAccess] tmp2
+# 2797|                     Type = [ArrayType] int[][][]
+# 2797|                     ValueCategory = lvalue
+# 2797|                 getArrayOffset(): [Literal] 1
+# 2797|                     Type = [IntType] int
+# 2797|                     Value = [Literal] 1
+# 2797|                     ValueCategory = prvalue
+# 2797|                 getArrayBase().getFullyConverted(): [ArrayToPointerConversion] array to pointer conversion
+# 2797|                     Type = [PointerType] int(*)[][]
+# 2797|                     ValueCategory = prvalue
+# 2797|               getArrayOffset(): [Literal] 2
+# 2797|                   Type = [IntType] int
+# 2797|                   Value = [Literal] 2
+# 2797|                   ValueCategory = prvalue
+# 2797|               getArrayBase().getFullyConverted(): [ArrayToPointerConversion] array to pointer conversion
+# 2797|                   Type = [PointerType] int(*)[]
+# 2797|                   ValueCategory = prvalue
+# 2797|             getExprOperand().getFullyConverted(): [ParenthesisExpr] (...)
+# 2797|                 Type = [ArrayType] int[]
+# 2797|                 ValueCategory = lvalue
+# 2798|     getStmt(12): [DeclStmt] declaration
+# 2798|       getDeclarationEntry(0): [VariableDeclarationEntry] definition of t
+# 2798|           Type = [CTypedefType,Size_t] size_t
+# 2798|         getVariable().getInitializer(): [Initializer] initializer for t
+# 2798|           getExpr(): [SizeofExprOperator] sizeof(<expr>)
+# 2798|               Type = [LongType] unsigned long
+# 2798|               Value = [SizeofExprOperator] 4
+# 2798|               ValueCategory = prvalue
+# 2798|             getExprOperand(): [ArrayExpr] access to array
+# 2798|                 Type = [IntType] int
+# 2798|                 ValueCategory = lvalue
+# 2798|               getArrayBase(): [ArrayExpr] access to array
+# 2798|                   Type = [ArrayType] int[]
+# 2798|                   ValueCategory = lvalue
+# 2798|                 getArrayBase(): [ArrayExpr] access to array
+# 2798|                     Type = [ArrayType] int[][]
+# 2798|                     ValueCategory = lvalue
+# 2798|                   getArrayBase(): [VariableAccess] tmp2
+# 2798|                       Type = [ArrayType] int[][][]
+# 2798|                       ValueCategory = lvalue
+# 2798|                   getArrayOffset(): [Literal] 1
+# 2798|                       Type = [IntType] int
+# 2798|                       Value = [Literal] 1
+# 2798|                       ValueCategory = prvalue
+# 2798|                   getArrayBase().getFullyConverted(): [ArrayToPointerConversion] array to pointer conversion
+# 2798|                       Type = [PointerType] int(*)[][]
+# 2798|                       ValueCategory = prvalue
+# 2798|                 getArrayOffset(): [Literal] 2
+# 2798|                     Type = [IntType] int
+# 2798|                     Value = [Literal] 2
+# 2798|                     ValueCategory = prvalue
+# 2798|                 getArrayBase().getFullyConverted(): [ArrayToPointerConversion] array to pointer conversion
+# 2798|                     Type = [PointerType] int(*)[]
+# 2798|                     ValueCategory = prvalue
+# 2798|               getArrayOffset(): [Literal] 3
+# 2798|                   Type = [IntType] int
+# 2798|                   Value = [Literal] 3
+# 2798|                   ValueCategory = prvalue
+# 2798|               getArrayBase().getFullyConverted(): [ArrayToPointerConversion] array to pointer conversion
+# 2798|                   Type = [IntPointerType] int *
+# 2798|                   ValueCategory = prvalue
+# 2798|             getExprOperand().getFullyConverted(): [ParenthesisExpr] (...)
+# 2798|                 Type = [IntType] int
+# 2798|                 ValueCategory = lvalue
+# 2799|     getStmt(13): [ReturnStmt] return ...
+# 2801| [TopLevelFunction] size_t vla_sizeof_test3(int, size_t, char, bool)
+# 2801|   <params>: 
+# 2801|     getParameter(0): [Parameter] len1
+# 2801|         Type = [IntType] int
+# 2801|     getParameter(1): [Parameter] len2
+# 2801|         Type = [CTypedefType,Size_t] size_t
+# 2801|     getParameter(2): [Parameter] len3
+# 2801|         Type = [PlainCharType] char
+# 2801|     getParameter(3): [Parameter] b
+# 2801|         Type = [BoolType] bool
+# 2801|   getEntryPoint(): [BlockStmt] { ... }
+# 2802|     getStmt(0): [DeclStmt] declaration
+# 2802|       getDeclarationEntry(0): [TypeDeclarationEntry] declaration of arr
+# 2802|           Type = [CTypedefType,LocalTypedefType] arr
+# 2802|     getStmt(1): [VlaDimensionStmt] VLA dimension size
+# 2802|       getDimensionExpr(): [VariableAccess] len1
+# 2802|           Type = [IntType] int
+# 2802|           ValueCategory = prvalue(load)
+# 2802|     getStmt(2): [VlaDimensionStmt] VLA dimension size
+# 2802|       getDimensionExpr(): [VariableAccess] len2
+# 2802|           Type = [CTypedefType,Size_t] size_t
+# 2802|           ValueCategory = prvalue(load)
+# 2802|     getStmt(3): [VlaDeclStmt] VLA declaration
+# 2803|     getStmt(4): [DeclStmt] declaration
+# 2803|       getDeclarationEntry(0): [TypeDeclarationEntry] declaration of arr2
+# 2803|           Type = [CTypedefType,LocalTypedefType] arr2
+# 2803|     getStmt(5): [VlaDeclStmt] VLA declaration
+# 2804|     getStmt(6): [DeclStmt] declaration
+# 2804|       getDeclarationEntry(0): [TypeDeclarationEntry] declaration of arr3
+# 2804|           Type = [CTypedefType,LocalTypedefType] arr3
+# 2804|     getStmt(7): [VlaDimensionStmt] VLA dimension size
+# 2804|       getDimensionExpr(): [VariableAccess] len3
+# 2804|           Type = [PlainCharType] char
+# 2804|           ValueCategory = prvalue(load)
+# 2804|     getStmt(8): [VlaDeclStmt] VLA declaration
+# 2806|     getStmt(9): [IfStmt] if (...) ... 
+# 2806|       getCondition(): [VariableAccess] b
+# 2806|           Type = [BoolType] bool
+# 2806|           ValueCategory = prvalue(load)
+# 2806|       getThen(): [BlockStmt] { ... }
+# 2807|         getStmt(0): [DeclStmt] declaration
+# 2807|           getDeclarationEntry(0): [VariableDeclarationEntry] definition of tmp
+# 2807|               Type = [CTypedefType,LocalTypedefType] arr3
+# 2807|         getStmt(1): [VlaDeclStmt] VLA declaration
+# 2808|         getStmt(2): [ReturnStmt] return ...
+# 2808|           getExpr(): [SizeofExprOperator] sizeof(<expr>)
+# 2808|               Type = [LongType] unsigned long
+# 2808|               ValueCategory = prvalue
+# 2808|             getExprOperand(): [ArrayExpr] access to array
+# 2808|                 Type = [CTypedefType,LocalTypedefType] arr2
+# 2808|                 ValueCategory = lvalue
+# 2808|               getArrayBase(): [VariableAccess] tmp
+# 2808|                   Type = [CTypedefType,LocalTypedefType] arr3
+# 2808|                   ValueCategory = lvalue
+# 2808|               getArrayOffset(): [Literal] 1
+# 2808|                   Type = [IntType] int
+# 2808|                   Value = [Literal] 1
+# 2808|                   ValueCategory = prvalue
+# 2808|               getArrayBase().getFullyConverted(): [ArrayToPointerConversion] array to pointer conversion
+# 2808|                   Type = [PointerType] arr2 *
+# 2808|                   ValueCategory = prvalue
+# 2808|             getExprOperand().getFullyConverted(): [ParenthesisExpr] (...)
+# 2808|                 Type = [CTypedefType,LocalTypedefType] arr2
+# 2808|                 ValueCategory = lvalue
+# 2811|     getStmt(10): [ReturnStmt] return ...
+# 2811|       getExpr(): [Literal] 0
+# 2811|           Type = [IntType] int
+# 2811|           Value = [Literal] 0
+# 2811|           ValueCategory = prvalue
+# 2811|       getExpr().getFullyConverted(): [CStyleCast] (size_t)...
+# 2811|           Conversion = [IntegralConversion] integral conversion
+# 2811|           Type = [CTypedefType,Size_t] size_t
+# 2811|           Value = [CStyleCast] 0
+# 2811|           ValueCategory = prvalue
+# 2814| [TopLevelFunction] void vla_sizeof_test4(int, size_t)
+# 2814|   <params>: 
+# 2814|     getParameter(0): [Parameter] len1
+# 2814|         Type = [IntType] int
+# 2814|     getParameter(1): [Parameter] len2
+# 2814|         Type = [CTypedefType,Size_t] size_t
+# 2814|   getEntryPoint(): [BlockStmt] { ... }
+# 2815|     getStmt(0): [DeclStmt] declaration
+# 2815|       getDeclarationEntry(0): [VariableDeclarationEntry] definition of tmp1
+# 2815|           Type = [ArrayType] int[][]
+# 2815|     getStmt(1): [VlaDimensionStmt] VLA dimension size
+# 2815|       getDimensionExpr(): [VariableAccess] len1
+# 2815|           Type = [IntType] int
+# 2815|           ValueCategory = prvalue(load)
+# 2815|     getStmt(2): [VlaDimensionStmt] VLA dimension size
+# 2815|       getDimensionExpr(): [VariableAccess] len2
+# 2815|           Type = [CTypedefType,Size_t] size_t
+# 2815|           ValueCategory = prvalue(load)
+# 2815|     getStmt(3): [VlaDeclStmt] VLA declaration
+# 2816|     getStmt(4): [DeclStmt] declaration
+# 2816|       getDeclarationEntry(0): [VariableDeclarationEntry] definition of z
+# 2816|           Type = [CTypedefType,Size_t] size_t
+# 2816|         getVariable().getInitializer(): [Initializer] initializer for z
+# 2816|           getExpr(): [SizeofExprOperator] sizeof(<expr>)
+# 2816|               Type = [LongType] unsigned long
+# 2816|               ValueCategory = prvalue
+# 2816|             getExprOperand(): [ArrayExpr] access to array
+# 2816|                 Type = [ArrayType] int[]
+# 2816|                 ValueCategory = lvalue
+# 2816|               getArrayBase(): [VariableAccess] tmp1
+# 2816|                   Type = [ArrayType] int[][]
+# 2816|                   ValueCategory = lvalue
+# 2816|               getArrayOffset(): [Literal] 1
+# 2816|                   Type = [IntType] int
+# 2816|                   Value = [Literal] 1
+# 2816|                   ValueCategory = prvalue
+# 2816|               getArrayBase().getFullyConverted(): [ArrayToPointerConversion] array to pointer conversion
+# 2816|                   Type = [PointerType] int(*)[]
+# 2816|                   ValueCategory = prvalue
+# 2816|             getExprOperand().getFullyConverted(): [ParenthesisExpr] (...)
+# 2816|                 Type = [ArrayType] int[]
+# 2816|                 ValueCategory = lvalue
+# 2817|     getStmt(5): [ReturnStmt] return ...
+# 2819| [TopLevelFunction] void vla_sizeof_test5(int, size_t)
+# 2819|   <params>: 
+# 2819|     getParameter(0): [Parameter] len1
+# 2819|         Type = [IntType] int
+# 2819|     getParameter(1): [Parameter] len2
+# 2819|         Type = [CTypedefType,Size_t] size_t
+# 2819|   getEntryPoint(): [BlockStmt] { ... }
+# 2820|     getStmt(0): [DeclStmt] declaration
+# 2820|       getDeclarationEntry(0): [VariableDeclarationEntry] definition of tmp1
+# 2820|           Type = [ArrayType] int[][]
+# 2820|     getStmt(1): [VlaDimensionStmt] VLA dimension size
+# 2820|       getDimensionExpr(): [VariableAccess] len1
+# 2820|           Type = [IntType] int
+# 2820|           ValueCategory = prvalue(load)
+# 2820|     getStmt(2): [VlaDimensionStmt] VLA dimension size
+# 2820|       getDimensionExpr(): [VariableAccess] len2
+# 2820|           Type = [CTypedefType,Size_t] size_t
+# 2820|           ValueCategory = prvalue(load)
+# 2820|     getStmt(3): [VlaDeclStmt] VLA declaration
+# 2821|     getStmt(4): [DeclStmt] declaration
+# 2821|       getDeclarationEntry(0): [VariableDeclarationEntry] definition of z
+# 2821|           Type = [CTypedefType,Size_t] size_t
+# 2821|         getVariable().getInitializer(): [Initializer] initializer for z
+# 2821|           getExpr(): [SizeofExprOperator] sizeof(<expr>)
+# 2821|               Type = [LongType] unsigned long
+# 2821|               ValueCategory = prvalue
+# 2821|             getExprOperand(): [ArrayExpr] access to array
+# 2821|                 Type = [ArrayType] int[]
+# 2821|                 ValueCategory = lvalue
+# 2821|               getArrayBase(): [PointerDereferenceExpr] * ...
+# 2821|                   Type = [ArrayType] int[][]
+# 2821|                   ValueCategory = lvalue
+# 2821|                 getOperand(): [AddressOfExpr] & ...
+# 2821|                     Type = [PointerType] int(*)[][]
+# 2821|                     ValueCategory = prvalue
+# 2821|                   getOperand(): [VariableAccess] tmp1
+# 2821|                       Type = [ArrayType] int[][]
+# 2821|                       ValueCategory = lvalue
+# 2821|               getArrayOffset(): [Literal] 1
+# 2821|                   Type = [IntType] int
+# 2821|                   Value = [Literal] 1
+# 2821|                   ValueCategory = prvalue
+# 2821|               getArrayBase().getFullyConverted(): [ParenthesisExpr] (...)
+# 2821|                   Type = [PointerType] int(*)[]
+# 2821|                   ValueCategory = prvalue
+# 2821|                 getExpr(): [ArrayToPointerConversion] array to pointer conversion
+# 2821|                     Type = [PointerType] int(*)[]
+# 2821|                     ValueCategory = prvalue
+# 2821|             getExprOperand().getFullyConverted(): [ParenthesisExpr] (...)
+# 2821|                 Type = [ArrayType] int[]
+# 2821|                 ValueCategory = lvalue
+# 2822|     getStmt(5): [ReturnStmt] return ...
 ir23.cpp:
 #    1| [TopLevelFunction] bool consteval_1()
 #    1|   <params>: 
diff --git a/cpp/ql/test/library-tests/ir/ir/aliased_ir.expected b/cpp/ql/test/library-tests/ir/ir/aliased_ir.expected
index 6bf6801a48b..566cf07423b 100644
--- a/cpp/ql/test/library-tests/ir/ir/aliased_ir.expected
+++ b/cpp/ql/test/library-tests/ir/ir/aliased_ir.expected
@@ -20395,6 +20395,282 @@ ir.cpp:
 # 2769|     v2769_14(void)                  = AliasedUse                      : ~m2771_8
 # 2769|     v2769_15(void)                  = ExitFunction                    : 
 
+# 2774| void test_allocation_with_initializer()
+# 2774|   Block 0
+# 2774|     v2774_1(void)           = EnterFunction                 : 
+# 2774|     m2774_2(unknown)        = AliasedDefinition             : 
+# 2774|     m2774_3(unknown)        = InitializeNonLocal            : 
+# 2774|     m2774_4(unknown)        = Chi                           : total:m2774_2, partial:m2774_3
+# 2775|     r2775_1(glval<int *>)   = VariableAddress[p1]           : 
+# 2775|     r2775_2(glval<unknown>) = FunctionAddress[operator new] : 
+# 2775|     r2775_3(unsigned long)  = Constant[4]                   : 
+# 2775|     r2775_4(void *)         = Call[operator new]            : func:r2775_2, 0:r2775_3
+# 2775|     m2775_5(unknown)        = ^CallSideEffect               : ~m2774_4
+# 2775|     m2775_6(unknown)        = Chi                           : total:m2774_4, partial:m2775_5
+# 2775|     m2775_7(unknown)        = ^InitializeDynamicAllocation  : &:r2775_4
+# 2775|     r2775_8(int *)          = Convert                       : r2775_4
+# 2775|     r2775_9(int)            = Constant[42]                  : 
+# 2775|     m2775_10(int)           = Store[?]                      : &:r2775_8, r2775_9
+# 2775|     m2775_11(unknown)       = Chi                           : total:m2775_7, partial:m2775_10
+# 2775|     m2775_12(int *)         = Store[p1]                     : &:r2775_1, r2775_8
+# 2776|     r2776_1(glval<long *>)  = VariableAddress[p2]           : 
+# 2776|     r2776_2(glval<unknown>) = FunctionAddress[operator new] : 
+# 2776|     r2776_3(unsigned long)  = Constant[8]                   : 
+# 2776|     r2776_4(void *)         = Call[operator new]            : func:r2776_2, 0:r2776_3
+# 2776|     m2776_5(unknown)        = ^CallSideEffect               : ~m2775_6
+# 2776|     m2776_6(unknown)        = Chi                           : total:m2775_6, partial:m2776_5
+# 2776|     m2776_7(unknown)        = ^InitializeDynamicAllocation  : &:r2776_4
+# 2776|     r2776_8(long *)         = Convert                       : r2776_4
+# 2776|     r2776_9(long)           = Constant[42]                  : 
+# 2776|     m2776_10(long)          = Store[?]                      : &:r2776_8, r2776_9
+# 2776|     m2776_11(unknown)       = Chi                           : total:m2776_7, partial:m2776_10
+# 2776|     m2776_12(long *)        = Store[p2]                     : &:r2776_1, r2776_8
+# 2777|     v2777_1(void)           = NoOp                          : 
+# 2774|     v2774_5(void)           = ReturnVoid                    : 
+# 2774|     v2774_6(void)           = AliasedUse                    : ~m2776_6
+# 2774|     v2774_7(void)           = ExitFunction                  : 
+
+# 2779| void vla_sizeof_test(int, size_t, char)
+# 2779|   Block 0
+# 2779|     v2779_1(void)                 = EnterFunction             : 
+# 2779|     m2779_2(unknown)              = AliasedDefinition         : 
+# 2779|     m2779_3(unknown)              = InitializeNonLocal        : 
+# 2779|     m2779_4(unknown)              = Chi                       : total:m2779_2, partial:m2779_3
+# 2779|     r2779_5(glval<int>)           = VariableAddress[len1]     : 
+# 2779|     m2779_6(int)                  = InitializeParameter[len1] : &:r2779_5
+# 2779|     r2779_7(glval<unsigned long>) = VariableAddress[len2]     : 
+# 2779|     m2779_8(unsigned long)        = InitializeParameter[len2] : &:r2779_7
+# 2779|     r2779_9(glval<char>)          = VariableAddress[len3]     : 
+# 2779|     m2779_10(char)                = InitializeParameter[len3] : &:r2779_9
+# 2780|     r2780_1(glval<char[]>)        = VariableAddress[tmp1]     : 
+# 2780|     m2780_2(char[])               = Uninitialized[tmp1]       : &:r2780_1
+# 2780|     r2780_3(glval<int>)           = VariableAddress[len1]     : 
+# 2780|     r2780_4(int)                  = Load[len1]                : &:r2780_3, m2779_6
+# 2780|     v2780_5(void)                 = NoOp                      : 
+# 2781|     r2781_1(glval<unsigned long>) = VariableAddress[x]        : 
+# 2781|     r2781_2(unsigned long)        = Constant[1]               : 
+# 2781|     r2781_3(unsigned long)        = Convert                   : r2780_4
+# 2781|     r2781_4(unsigned long)        = Mul                       : r2781_2, r2781_3
+# 2781|     m2781_5(unsigned long)        = Store[x]                  : &:r2781_1, r2781_4
+# 2782|     r2782_1(glval<int[][]>)       = VariableAddress[tmp2]     : 
+# 2782|     m2782_2(int[][])              = Uninitialized[tmp2]       : &:r2782_1
+# 2782|     r2782_3(glval<int>)           = VariableAddress[len1]     : 
+# 2782|     r2782_4(int)                  = Load[len1]                : &:r2782_3, m2779_6
+# 2782|     r2782_5(glval<unsigned long>) = VariableAddress[len2]     : 
+# 2782|     r2782_6(unsigned long)        = Load[len2]                : &:r2782_5, m2779_8
+# 2782|     v2782_7(void)                 = NoOp                      : 
+# 2783|     r2783_1(glval<unsigned long>) = VariableAddress[y]        : 
+# 2783|     r2783_2(unsigned long)        = Constant[4]               : 
+# 2783|     r2783_3(unsigned long)        = Convert                   : r2782_4
+# 2783|     r2783_4(unsigned long)        = Mul                       : r2783_2, r2783_3
+# 2783|     r2783_5(unsigned long)        = CopyValue                 : r2782_6
+# 2783|     r2783_6(unsigned long)        = Mul                       : r2783_4, r2783_5
+# 2783|     m2783_7(unsigned long)        = Store[y]                  : &:r2783_1, r2783_6
+# 2784|     r2784_1(glval<unsigned long>) = VariableAddress[z]        : 
+# 2784|     r2784_2(unsigned long)        = Constant[4]               : 
+# 2784|     r2784_3(unsigned long)        = CopyValue                 : r2782_6
+# 2784|     r2784_4(unsigned long)        = Mul                       : r2784_2, r2784_3
+# 2784|     m2784_5(unsigned long)        = Store[z]                  : &:r2784_1, r2784_4
+# 2785|     r2785_1(glval<int[][][]>)     = VariableAddress[tmp3]     : 
+# 2785|     m2785_2(int[][][])            = Uninitialized[tmp3]       : &:r2785_1
+# 2785|     r2785_3(glval<int>)           = VariableAddress[len1]     : 
+# 2785|     r2785_4(int)                  = Load[len1]                : &:r2785_3, m2779_6
+# 2785|     r2785_5(glval<unsigned long>) = VariableAddress[len2]     : 
+# 2785|     r2785_6(unsigned long)        = Load[len2]                : &:r2785_5, m2779_8
+# 2785|     r2785_7(glval<char>)          = VariableAddress[len3]     : 
+# 2785|     r2785_8(char)                 = Load[len3]                : &:r2785_7, m2779_10
+# 2785|     v2785_9(void)                 = NoOp                      : 
+# 2786|     r2786_1(glval<unsigned long>) = VariableAddress[w]        : 
+# 2786|     r2786_2(unsigned long)        = Constant[4]               : 
+# 2786|     r2786_3(unsigned long)        = Convert                   : r2785_4
+# 2786|     r2786_4(unsigned long)        = Mul                       : r2786_2, r2786_3
+# 2786|     r2786_5(unsigned long)        = CopyValue                 : r2785_6
+# 2786|     r2786_6(unsigned long)        = Mul                       : r2786_4, r2786_5
+# 2786|     r2786_7(unsigned long)        = Convert                   : r2785_8
+# 2786|     r2786_8(unsigned long)        = Mul                       : r2786_6, r2786_7
+# 2786|     m2786_9(unsigned long)        = Store[w]                  : &:r2786_1, r2786_8
+# 2787|     r2787_1(glval<unsigned long>) = VariableAddress[v]        : 
+# 2787|     r2787_2(unsigned long)        = Constant[4]               : 
+# 2787|     r2787_3(unsigned long)        = CopyValue                 : r2785_6
+# 2787|     r2787_4(unsigned long)        = Mul                       : r2787_2, r2787_3
+# 2787|     r2787_5(unsigned long)        = Convert                   : r2785_8
+# 2787|     r2787_6(unsigned long)        = Mul                       : r2787_4, r2787_5
+# 2787|     m2787_7(unsigned long)        = Store[v]                  : &:r2787_1, r2787_6
+# 2788|     r2788_1(glval<unsigned long>) = VariableAddress[u]        : 
+# 2788|     r2788_2(unsigned long)        = Constant[4]               : 
+# 2788|     r2788_3(unsigned long)        = Convert                   : r2785_8
+# 2788|     r2788_4(unsigned long)        = Mul                       : r2788_2, r2788_3
+# 2788|     m2788_5(unsigned long)        = Store[u]                  : &:r2788_1, r2788_4
+# 2789|     r2789_1(glval<unsigned long>) = VariableAddress[t]        : 
+# 2789|     r2789_2(unsigned long)        = Constant[4]               : 
+# 2789|     m2789_3(unsigned long)        = Store[t]                  : &:r2789_1, r2789_2
+# 2790|     v2790_1(void)                 = NoOp                      : 
+# 2779|     v2779_11(void)                = ReturnVoid                : 
+# 2779|     v2779_12(void)                = AliasedUse                : m2779_3
+# 2779|     v2779_13(void)                = ExitFunction              : 
+
+# 2792| void vla_sizeof_test2(int, size_t, char)
+# 2792|   Block 0
+# 2792|     v2792_1(void)                 = EnterFunction             : 
+# 2792|     m2792_2(unknown)              = AliasedDefinition         : 
+# 2792|     m2792_3(unknown)              = InitializeNonLocal        : 
+# 2792|     m2792_4(unknown)              = Chi                       : total:m2792_2, partial:m2792_3
+# 2792|     r2792_5(glval<int>)           = VariableAddress[len1]     : 
+# 2792|     m2792_6(int)                  = InitializeParameter[len1] : &:r2792_5
+# 2792|     r2792_7(glval<unsigned long>) = VariableAddress[len2]     : 
+# 2792|     m2792_8(unsigned long)        = InitializeParameter[len2] : &:r2792_7
+# 2792|     r2792_9(glval<char>)          = VariableAddress[len3]     : 
+# 2792|     m2792_10(char)                = InitializeParameter[len3] : &:r2792_9
+# 2793|     r2793_1(glval<int[][]>)       = VariableAddress[tmp1]     : 
+# 2793|     m2793_2(int[][])              = Uninitialized[tmp1]       : &:r2793_1
+# 2793|     r2793_3(glval<int>)           = VariableAddress[len1]     : 
+# 2793|     r2793_4(int)                  = Load[len1]                : &:r2793_3, m2792_6
+# 2793|     r2793_5(glval<unsigned long>) = VariableAddress[len2]     : 
+# 2793|     r2793_6(unsigned long)        = Load[len2]                : &:r2793_5, m2792_8
+# 2793|     v2793_7(void)                 = NoOp                      : 
+# 2794|     r2794_1(glval<unsigned long>) = VariableAddress[z]        : 
+# 2794|     r2794_2(unsigned long)        = Constant[4]               : 
+# 2794|     r2794_3(unsigned long)        = CopyValue                 : r2793_6
+# 2794|     r2794_4(unsigned long)        = Mul                       : r2794_2, r2794_3
+# 2794|     m2794_5(unsigned long)        = Store[z]                  : &:r2794_1, r2794_4
+# 2795|     r2795_1(glval<int[][][]>)     = VariableAddress[tmp2]     : 
+# 2795|     m2795_2(int[][][])            = Uninitialized[tmp2]       : &:r2795_1
+# 2795|     r2795_3(glval<int>)           = VariableAddress[len1]     : 
+# 2795|     r2795_4(int)                  = Load[len1]                : &:r2795_3, m2792_6
+# 2795|     r2795_5(glval<unsigned long>) = VariableAddress[len2]     : 
+# 2795|     r2795_6(unsigned long)        = Load[len2]                : &:r2795_5, m2792_8
+# 2795|     r2795_7(glval<char>)          = VariableAddress[len3]     : 
+# 2795|     r2795_8(char)                 = Load[len3]                : &:r2795_7, m2792_10
+# 2795|     v2795_9(void)                 = NoOp                      : 
+# 2796|     r2796_1(glval<unsigned long>) = VariableAddress[v]        : 
+# 2796|     r2796_2(unsigned long)        = Constant[4]               : 
+# 2796|     r2796_3(unsigned long)        = CopyValue                 : r2795_6
+# 2796|     r2796_4(unsigned long)        = Mul                       : r2796_2, r2796_3
+# 2796|     r2796_5(unsigned long)        = Convert                   : r2795_8
+# 2796|     r2796_6(unsigned long)        = Mul                       : r2796_4, r2796_5
+# 2796|     m2796_7(unsigned long)        = Store[v]                  : &:r2796_1, r2796_6
+# 2797|     r2797_1(glval<unsigned long>) = VariableAddress[u]        : 
+# 2797|     r2797_2(unsigned long)        = Constant[4]               : 
+# 2797|     r2797_3(unsigned long)        = Convert                   : r2795_8
+# 2797|     r2797_4(unsigned long)        = Mul                       : r2797_2, r2797_3
+# 2797|     m2797_5(unsigned long)        = Store[u]                  : &:r2797_1, r2797_4
+# 2798|     r2798_1(glval<unsigned long>) = VariableAddress[t]        : 
+# 2798|     r2798_2(unsigned long)        = Constant[4]               : 
+# 2798|     m2798_3(unsigned long)        = Store[t]                  : &:r2798_1, r2798_2
+# 2799|     v2799_1(void)                 = NoOp                      : 
+# 2792|     v2792_11(void)                = ReturnVoid                : 
+# 2792|     v2792_12(void)                = AliasedUse                : m2792_3
+# 2792|     v2792_13(void)                = ExitFunction              : 
+
+# 2801| size_t vla_sizeof_test3(int, size_t, char, bool)
+# 2801|   Block 0
+# 2801|     v2801_1(void)                 = EnterFunction             : 
+# 2801|     m2801_2(unknown)              = AliasedDefinition         : 
+# 2801|     m2801_3(unknown)              = InitializeNonLocal        : 
+# 2801|     m2801_4(unknown)              = Chi                       : total:m2801_2, partial:m2801_3
+# 2801|     r2801_5(glval<int>)           = VariableAddress[len1]     : 
+# 2801|     m2801_6(int)                  = InitializeParameter[len1] : &:r2801_5
+# 2801|     r2801_7(glval<unsigned long>) = VariableAddress[len2]     : 
+# 2801|     m2801_8(unsigned long)        = InitializeParameter[len2] : &:r2801_7
+# 2801|     r2801_9(glval<char>)          = VariableAddress[len3]     : 
+# 2801|     m2801_10(char)                = InitializeParameter[len3] : &:r2801_9
+# 2801|     r2801_11(glval<bool>)         = VariableAddress[b]        : 
+# 2801|     m2801_12(bool)                = InitializeParameter[b]    : &:r2801_11
+# 2802|     r2802_1(glval<int>)           = VariableAddress[len1]     : 
+# 2802|     r2802_2(int)                  = Load[len1]                : &:r2802_1, m2801_6
+# 2802|     r2802_3(glval<unsigned long>) = VariableAddress[len2]     : 
+# 2802|     r2802_4(unsigned long)        = Load[len2]                : &:r2802_3, m2801_8
+# 2802|     v2802_5(void)                 = NoOp                      : 
+# 2803|     v2803_1(void)                 = NoOp                      : 
+# 2804|     r2804_1(glval<char>)          = VariableAddress[len3]     : 
+# 2804|     r2804_2(char)                 = Load[len3]                : &:r2804_1, m2801_10
+# 2804|     v2804_3(void)                 = NoOp                      : 
+# 2806|     r2806_1(glval<bool>)          = VariableAddress[b]        : 
+# 2806|     r2806_2(bool)                 = Load[b]                   : &:r2806_1, m2801_12
+# 2806|     v2806_3(void)                 = ConditionalBranch         : r2806_2
+#-----|   False -> Block 3
+#-----|   True -> Block 2
+
+# 2801|   Block 1
+# 2801|     m2801_13(unsigned long)        = Phi                      : from 2:m2808_7, from 3:m2811_3
+# 2801|     r2801_14(glval<unsigned long>) = VariableAddress[#return] : 
+# 2801|     v2801_15(void)                 = ReturnValue              : &:r2801_14, m2801_13
+# 2801|     v2801_16(void)                 = AliasedUse               : m2801_3
+# 2801|     v2801_17(void)                 = ExitFunction             : 
+
+# 2807|   Block 2
+# 2807|     r2807_1(glval<long[][][]>)    = VariableAddress[tmp]     : 
+# 2807|     m2807_2(long[][][])           = Uninitialized[tmp]       : &:r2807_1
+# 2807|     v2807_3(void)                 = NoOp                     : 
+# 2808|     r2808_1(glval<unsigned long>) = VariableAddress[#return] : 
+# 2808|     r2808_2(unsigned long)        = Constant[8]              : 
+# 2808|     r2808_3(unsigned long)        = Convert                  : r2802_2
+# 2808|     r2808_4(unsigned long)        = Mul                      : r2808_2, r2808_3
+# 2808|     r2808_5(unsigned long)        = CopyValue                : r2802_4
+# 2808|     r2808_6(unsigned long)        = Mul                      : r2808_4, r2808_5
+# 2808|     m2808_7(unsigned long)        = Store[#return]           : &:r2808_1, r2808_6
+#-----|   Goto -> Block 1
+
+# 2811|   Block 3
+# 2811|     r2811_1(glval<unsigned long>) = VariableAddress[#return] : 
+# 2811|     r2811_2(unsigned long)        = Constant[0]              : 
+# 2811|     m2811_3(unsigned long)        = Store[#return]           : &:r2811_1, r2811_2
+#-----|   Goto -> Block 1
+
+# 2814| void vla_sizeof_test4(int, size_t)
+# 2814|   Block 0
+# 2814|     v2814_1(void)                 = EnterFunction             : 
+# 2814|     m2814_2(unknown)              = AliasedDefinition         : 
+# 2814|     m2814_3(unknown)              = InitializeNonLocal        : 
+# 2814|     m2814_4(unknown)              = Chi                       : total:m2814_2, partial:m2814_3
+# 2814|     r2814_5(glval<int>)           = VariableAddress[len1]     : 
+# 2814|     m2814_6(int)                  = InitializeParameter[len1] : &:r2814_5
+# 2814|     r2814_7(glval<unsigned long>) = VariableAddress[len2]     : 
+# 2814|     m2814_8(unsigned long)        = InitializeParameter[len2] : &:r2814_7
+# 2815|     r2815_1(glval<int[][]>)       = VariableAddress[tmp1]     : 
+# 2815|     m2815_2(int[][])              = Uninitialized[tmp1]       : &:r2815_1
+# 2815|     r2815_3(glval<int>)           = VariableAddress[len1]     : 
+# 2815|     r2815_4(int)                  = Load[len1]                : &:r2815_3, m2814_6
+# 2815|     r2815_5(glval<unsigned long>) = VariableAddress[len2]     : 
+# 2815|     r2815_6(unsigned long)        = Load[len2]                : &:r2815_5, m2814_8
+# 2815|     v2815_7(void)                 = NoOp                      : 
+# 2816|     r2816_1(glval<unsigned long>) = VariableAddress[z]        : 
+# 2816|     r2816_2(unsigned long)        = Constant[4]               : 
+# 2816|     r2816_3(unsigned long)        = CopyValue                 : r2815_6
+# 2816|     r2816_4(unsigned long)        = Mul                       : r2816_2, r2816_3
+# 2816|     m2816_5(unsigned long)        = Store[z]                  : &:r2816_1, r2816_4
+# 2817|     v2817_1(void)                 = NoOp                      : 
+# 2814|     v2814_9(void)                 = ReturnVoid                : 
+# 2814|     v2814_10(void)                = AliasedUse                : m2814_3
+# 2814|     v2814_11(void)                = ExitFunction              : 
+
+# 2819| void vla_sizeof_test5(int, size_t)
+# 2819|   Block 0
+# 2819|     v2819_1(void)                 = EnterFunction             : 
+# 2819|     m2819_2(unknown)              = AliasedDefinition         : 
+# 2819|     m2819_3(unknown)              = InitializeNonLocal        : 
+# 2819|     m2819_4(unknown)              = Chi                       : total:m2819_2, partial:m2819_3
+# 2819|     r2819_5(glval<int>)           = VariableAddress[len1]     : 
+# 2819|     m2819_6(int)                  = InitializeParameter[len1] : &:r2819_5
+# 2819|     r2819_7(glval<unsigned long>) = VariableAddress[len2]     : 
+# 2819|     m2819_8(unsigned long)        = InitializeParameter[len2] : &:r2819_7
+# 2820|     r2820_1(glval<int[][]>)       = VariableAddress[tmp1]     : 
+# 2820|     m2820_2(int[][])              = Uninitialized[tmp1]       : &:r2820_1
+# 2820|     r2820_3(glval<int>)           = VariableAddress[len1]     : 
+# 2820|     r2820_4(int)                  = Load[len1]                : &:r2820_3, m2819_6
+# 2820|     r2820_5(glval<unsigned long>) = VariableAddress[len2]     : 
+# 2820|     r2820_6(unsigned long)        = Load[len2]                : &:r2820_5, m2819_8
+# 2820|     v2820_7(void)                 = NoOp                      : 
+# 2821|     r2821_1(glval<unsigned long>) = VariableAddress[z]        : 
+# 2821|     r2821_2(unsigned long)        = Constant[4]               : 
+# 2821|     r2821_3(unsigned long)        = CopyValue                 : r2820_6
+# 2821|     r2821_4(unsigned long)        = Mul                       : r2821_2, r2821_3
+# 2821|     m2821_5(unsigned long)        = Store[z]                  : &:r2821_1, r2821_4
+# 2822|     v2822_1(void)                 = NoOp                      : 
+# 2819|     v2819_9(void)                 = ReturnVoid                : 
+# 2819|     v2819_10(void)                = AliasedUse                : m2819_3
+# 2819|     v2819_11(void)                = ExitFunction              : 
+
 ir23.cpp:
 #    1| bool consteval_1()
 #    1|   Block 0
diff --git a/cpp/ql/test/library-tests/ir/ir/ir.cpp b/cpp/ql/test/library-tests/ir/ir/ir.cpp
index 74c41c7e916..3dce0a0e1ea 100644
--- a/cpp/ql/test/library-tests/ir/ir/ir.cpp
+++ b/cpp/ql/test/library-tests/ir/ir/ir.cpp
@@ -2771,4 +2771,54 @@ void test_three_way(int a, int b, ThreeWay c, ThreeWay d) {
   auto y = c <=> d;
 }
 
+void test_allocation_with_initializer() {
+    int* p1 = new int(42);
+    long* p2 = new long(42);
+}
+
+void vla_sizeof_test(int len1, size_t len2, char len3) {
+  char tmp1[len1];
+  size_t x = sizeof(tmp1);
+  int tmp2[len1][len2];
+  size_t y = sizeof(tmp2);
+  size_t z = sizeof(*tmp2);
+  int tmp3[len1][len2][len3];
+  size_t w = sizeof(tmp3);
+  size_t v = sizeof(*tmp3);
+  size_t u = sizeof(**tmp3);
+  size_t t = sizeof(***tmp3);
+}
+
+void vla_sizeof_test2(int len1, size_t len2, char len3) {
+  int tmp1[len1][len2];
+  size_t z = sizeof(tmp1[1]);
+  int tmp2[len1][len2][len3];
+  size_t v = sizeof(tmp2[1]);
+  size_t u = sizeof(tmp2[1][2]);
+  size_t t = sizeof(tmp2[1][2][3]);
+}
+
+size_t vla_sizeof_test3(int len1, size_t len2, char len3, bool b) {
+  typedef long arr[len1][len2];
+  typedef arr arr2;
+  typedef arr2 arr3[len3];
+
+  if (b) {
+    arr3 tmp;
+    return sizeof(tmp[1]);
+  } 
+
+  return 0;
+}
+
+void vla_sizeof_test4(int len1, size_t len2) {
+  int tmp1[len1][len2];
+  size_t z = sizeof(1[tmp1]);
+}
+
+void vla_sizeof_test5(int len1, size_t len2) {
+  int tmp1[len1][len2];
+  size_t z = sizeof((*&tmp1)[1]);
+}
+
 // semmle-extractor-options: -std=c++20 --clang
diff --git a/cpp/ql/test/library-tests/ir/ir/raw_ir.expected b/cpp/ql/test/library-tests/ir/ir/raw_ir.expected
index bf4cef8c3f4..1d8f885cd15 100644
--- a/cpp/ql/test/library-tests/ir/ir/raw_ir.expected
+++ b/cpp/ql/test/library-tests/ir/ir/raw_ir.expected
@@ -18547,6 +18547,271 @@ ir.cpp:
 # 2769|     v2769_13(void)                  = AliasedUse                      : ~m?
 # 2769|     v2769_14(void)                  = ExitFunction                    : 
 
+# 2774| void test_allocation_with_initializer()
+# 2774|   Block 0
+# 2774|     v2774_1(void)           = EnterFunction                 : 
+# 2774|     mu2774_2(unknown)       = AliasedDefinition             : 
+# 2774|     mu2774_3(unknown)       = InitializeNonLocal            : 
+# 2775|     r2775_1(glval<int *>)   = VariableAddress[p1]           : 
+# 2775|     r2775_2(glval<unknown>) = FunctionAddress[operator new] : 
+# 2775|     r2775_3(unsigned long)  = Constant[4]                   : 
+# 2775|     r2775_4(void *)         = Call[operator new]            : func:r2775_2, 0:r2775_3
+# 2775|     mu2775_5(unknown)       = ^CallSideEffect               : ~m?
+# 2775|     mu2775_6(unknown)       = ^InitializeDynamicAllocation  : &:r2775_4
+# 2775|     r2775_7(int *)          = Convert                       : r2775_4
+# 2775|     r2775_8(int)            = Constant[42]                  : 
+# 2775|     mu2775_9(int)           = Store[?]                      : &:r2775_7, r2775_8
+# 2775|     mu2775_10(int *)        = Store[p1]                     : &:r2775_1, r2775_7
+# 2776|     r2776_1(glval<long *>)  = VariableAddress[p2]           : 
+# 2776|     r2776_2(glval<unknown>) = FunctionAddress[operator new] : 
+# 2776|     r2776_3(unsigned long)  = Constant[8]                   : 
+# 2776|     r2776_4(void *)         = Call[operator new]            : func:r2776_2, 0:r2776_3
+# 2776|     mu2776_5(unknown)       = ^CallSideEffect               : ~m?
+# 2776|     mu2776_6(unknown)       = ^InitializeDynamicAllocation  : &:r2776_4
+# 2776|     r2776_7(long *)         = Convert                       : r2776_4
+# 2776|     r2776_8(long)           = Constant[42]                  : 
+# 2776|     mu2776_9(long)          = Store[?]                      : &:r2776_7, r2776_8
+# 2776|     mu2776_10(long *)       = Store[p2]                     : &:r2776_1, r2776_7
+# 2777|     v2777_1(void)           = NoOp                          : 
+# 2774|     v2774_4(void)           = ReturnVoid                    : 
+# 2774|     v2774_5(void)           = AliasedUse                    : ~m?
+# 2774|     v2774_6(void)           = ExitFunction                  : 
+
+# 2779| void vla_sizeof_test(int, size_t, char)
+# 2779|   Block 0
+# 2779|     v2779_1(void)                 = EnterFunction             : 
+# 2779|     mu2779_2(unknown)             = AliasedDefinition         : 
+# 2779|     mu2779_3(unknown)             = InitializeNonLocal        : 
+# 2779|     r2779_4(glval<int>)           = VariableAddress[len1]     : 
+# 2779|     mu2779_5(int)                 = InitializeParameter[len1] : &:r2779_4
+# 2779|     r2779_6(glval<unsigned long>) = VariableAddress[len2]     : 
+# 2779|     mu2779_7(unsigned long)       = InitializeParameter[len2] : &:r2779_6
+# 2779|     r2779_8(glval<char>)          = VariableAddress[len3]     : 
+# 2779|     mu2779_9(char)                = InitializeParameter[len3] : &:r2779_8
+# 2780|     r2780_1(glval<char[]>)        = VariableAddress[tmp1]     : 
+# 2780|     mu2780_2(char[])              = Uninitialized[tmp1]       : &:r2780_1
+# 2780|     r2780_3(glval<int>)           = VariableAddress[len1]     : 
+# 2780|     r2780_4(int)                  = Load[len1]                : &:r2780_3, ~m?
+# 2780|     v2780_5(void)                 = NoOp                      : 
+# 2781|     r2781_1(glval<unsigned long>) = VariableAddress[x]        : 
+# 2781|     r2781_2(unsigned long)        = Constant[1]               : 
+# 2781|     r2781_3(unsigned long)        = Convert                   : r2780_4
+# 2781|     r2781_4(unsigned long)        = Mul                       : r2781_2, r2781_3
+# 2781|     mu2781_5(unsigned long)       = Store[x]                  : &:r2781_1, r2781_4
+# 2782|     r2782_1(glval<int[][]>)       = VariableAddress[tmp2]     : 
+# 2782|     mu2782_2(int[][])             = Uninitialized[tmp2]       : &:r2782_1
+# 2782|     r2782_3(glval<int>)           = VariableAddress[len1]     : 
+# 2782|     r2782_4(int)                  = Load[len1]                : &:r2782_3, ~m?
+# 2782|     r2782_5(glval<unsigned long>) = VariableAddress[len2]     : 
+# 2782|     r2782_6(unsigned long)        = Load[len2]                : &:r2782_5, ~m?
+# 2782|     v2782_7(void)                 = NoOp                      : 
+# 2783|     r2783_1(glval<unsigned long>) = VariableAddress[y]        : 
+# 2783|     r2783_2(unsigned long)        = Constant[4]               : 
+# 2783|     r2783_3(unsigned long)        = Convert                   : r2782_4
+# 2783|     r2783_4(unsigned long)        = Mul                       : r2783_2, r2783_3
+# 2783|     r2783_5(unsigned long)        = CopyValue                 : r2782_6
+# 2783|     r2783_6(unsigned long)        = Mul                       : r2783_4, r2783_5
+# 2783|     mu2783_7(unsigned long)       = Store[y]                  : &:r2783_1, r2783_6
+# 2784|     r2784_1(glval<unsigned long>) = VariableAddress[z]        : 
+# 2784|     r2784_2(unsigned long)        = Constant[4]               : 
+# 2784|     r2784_3(unsigned long)        = CopyValue                 : r2782_6
+# 2784|     r2784_4(unsigned long)        = Mul                       : r2784_2, r2784_3
+# 2784|     mu2784_5(unsigned long)       = Store[z]                  : &:r2784_1, r2784_4
+# 2785|     r2785_1(glval<int[][][]>)     = VariableAddress[tmp3]     : 
+# 2785|     mu2785_2(int[][][])           = Uninitialized[tmp3]       : &:r2785_1
+# 2785|     r2785_3(glval<int>)           = VariableAddress[len1]     : 
+# 2785|     r2785_4(int)                  = Load[len1]                : &:r2785_3, ~m?
+# 2785|     r2785_5(glval<unsigned long>) = VariableAddress[len2]     : 
+# 2785|     r2785_6(unsigned long)        = Load[len2]                : &:r2785_5, ~m?
+# 2785|     r2785_7(glval<char>)          = VariableAddress[len3]     : 
+# 2785|     r2785_8(char)                 = Load[len3]                : &:r2785_7, ~m?
+# 2785|     v2785_9(void)                 = NoOp                      : 
+# 2786|     r2786_1(glval<unsigned long>) = VariableAddress[w]        : 
+# 2786|     r2786_2(unsigned long)        = Constant[4]               : 
+# 2786|     r2786_3(unsigned long)        = Convert                   : r2785_4
+# 2786|     r2786_4(unsigned long)        = Mul                       : r2786_2, r2786_3
+# 2786|     r2786_5(unsigned long)        = CopyValue                 : r2785_6
+# 2786|     r2786_6(unsigned long)        = Mul                       : r2786_4, r2786_5
+# 2786|     r2786_7(unsigned long)        = Convert                   : r2785_8
+# 2786|     r2786_8(unsigned long)        = Mul                       : r2786_6, r2786_7
+# 2786|     mu2786_9(unsigned long)       = Store[w]                  : &:r2786_1, r2786_8
+# 2787|     r2787_1(glval<unsigned long>) = VariableAddress[v]        : 
+# 2787|     r2787_2(unsigned long)        = Constant[4]               : 
+# 2787|     r2787_3(unsigned long)        = CopyValue                 : r2785_6
+# 2787|     r2787_4(unsigned long)        = Mul                       : r2787_2, r2787_3
+# 2787|     r2787_5(unsigned long)        = Convert                   : r2785_8
+# 2787|     r2787_6(unsigned long)        = Mul                       : r2787_4, r2787_5
+# 2787|     mu2787_7(unsigned long)       = Store[v]                  : &:r2787_1, r2787_6
+# 2788|     r2788_1(glval<unsigned long>) = VariableAddress[u]        : 
+# 2788|     r2788_2(unsigned long)        = Constant[4]               : 
+# 2788|     r2788_3(unsigned long)        = Convert                   : r2785_8
+# 2788|     r2788_4(unsigned long)        = Mul                       : r2788_2, r2788_3
+# 2788|     mu2788_5(unsigned long)       = Store[u]                  : &:r2788_1, r2788_4
+# 2789|     r2789_1(glval<unsigned long>) = VariableAddress[t]        : 
+# 2789|     r2789_2(unsigned long)        = Constant[4]               : 
+# 2789|     mu2789_3(unsigned long)       = Store[t]                  : &:r2789_1, r2789_2
+# 2790|     v2790_1(void)                 = NoOp                      : 
+# 2779|     v2779_10(void)                = ReturnVoid                : 
+# 2779|     v2779_11(void)                = AliasedUse                : ~m?
+# 2779|     v2779_12(void)                = ExitFunction              : 
+
+# 2792| void vla_sizeof_test2(int, size_t, char)
+# 2792|   Block 0
+# 2792|     v2792_1(void)                 = EnterFunction             : 
+# 2792|     mu2792_2(unknown)             = AliasedDefinition         : 
+# 2792|     mu2792_3(unknown)             = InitializeNonLocal        : 
+# 2792|     r2792_4(glval<int>)           = VariableAddress[len1]     : 
+# 2792|     mu2792_5(int)                 = InitializeParameter[len1] : &:r2792_4
+# 2792|     r2792_6(glval<unsigned long>) = VariableAddress[len2]     : 
+# 2792|     mu2792_7(unsigned long)       = InitializeParameter[len2] : &:r2792_6
+# 2792|     r2792_8(glval<char>)          = VariableAddress[len3]     : 
+# 2792|     mu2792_9(char)                = InitializeParameter[len3] : &:r2792_8
+# 2793|     r2793_1(glval<int[][]>)       = VariableAddress[tmp1]     : 
+# 2793|     mu2793_2(int[][])             = Uninitialized[tmp1]       : &:r2793_1
+# 2793|     r2793_3(glval<int>)           = VariableAddress[len1]     : 
+# 2793|     r2793_4(int)                  = Load[len1]                : &:r2793_3, ~m?
+# 2793|     r2793_5(glval<unsigned long>) = VariableAddress[len2]     : 
+# 2793|     r2793_6(unsigned long)        = Load[len2]                : &:r2793_5, ~m?
+# 2793|     v2793_7(void)                 = NoOp                      : 
+# 2794|     r2794_1(glval<unsigned long>) = VariableAddress[z]        : 
+# 2794|     r2794_2(unsigned long)        = Constant[4]               : 
+# 2794|     r2794_3(unsigned long)        = CopyValue                 : r2793_6
+# 2794|     r2794_4(unsigned long)        = Mul                       : r2794_2, r2794_3
+# 2794|     mu2794_5(unsigned long)       = Store[z]                  : &:r2794_1, r2794_4
+# 2795|     r2795_1(glval<int[][][]>)     = VariableAddress[tmp2]     : 
+# 2795|     mu2795_2(int[][][])           = Uninitialized[tmp2]       : &:r2795_1
+# 2795|     r2795_3(glval<int>)           = VariableAddress[len1]     : 
+# 2795|     r2795_4(int)                  = Load[len1]                : &:r2795_3, ~m?
+# 2795|     r2795_5(glval<unsigned long>) = VariableAddress[len2]     : 
+# 2795|     r2795_6(unsigned long)        = Load[len2]                : &:r2795_5, ~m?
+# 2795|     r2795_7(glval<char>)          = VariableAddress[len3]     : 
+# 2795|     r2795_8(char)                 = Load[len3]                : &:r2795_7, ~m?
+# 2795|     v2795_9(void)                 = NoOp                      : 
+# 2796|     r2796_1(glval<unsigned long>) = VariableAddress[v]        : 
+# 2796|     r2796_2(unsigned long)        = Constant[4]               : 
+# 2796|     r2796_3(unsigned long)        = CopyValue                 : r2795_6
+# 2796|     r2796_4(unsigned long)        = Mul                       : r2796_2, r2796_3
+# 2796|     r2796_5(unsigned long)        = Convert                   : r2795_8
+# 2796|     r2796_6(unsigned long)        = Mul                       : r2796_4, r2796_5
+# 2796|     mu2796_7(unsigned long)       = Store[v]                  : &:r2796_1, r2796_6
+# 2797|     r2797_1(glval<unsigned long>) = VariableAddress[u]        : 
+# 2797|     r2797_2(unsigned long)        = Constant[4]               : 
+# 2797|     r2797_3(unsigned long)        = Convert                   : r2795_8
+# 2797|     r2797_4(unsigned long)        = Mul                       : r2797_2, r2797_3
+# 2797|     mu2797_5(unsigned long)       = Store[u]                  : &:r2797_1, r2797_4
+# 2798|     r2798_1(glval<unsigned long>) = VariableAddress[t]        : 
+# 2798|     r2798_2(unsigned long)        = Constant[4]               : 
+# 2798|     mu2798_3(unsigned long)       = Store[t]                  : &:r2798_1, r2798_2
+# 2799|     v2799_1(void)                 = NoOp                      : 
+# 2792|     v2792_10(void)                = ReturnVoid                : 
+# 2792|     v2792_11(void)                = AliasedUse                : ~m?
+# 2792|     v2792_12(void)                = ExitFunction              : 
+
+# 2801| size_t vla_sizeof_test3(int, size_t, char, bool)
+# 2801|   Block 0
+# 2801|     v2801_1(void)                 = EnterFunction             : 
+# 2801|     mu2801_2(unknown)             = AliasedDefinition         : 
+# 2801|     mu2801_3(unknown)             = InitializeNonLocal        : 
+# 2801|     r2801_4(glval<int>)           = VariableAddress[len1]     : 
+# 2801|     mu2801_5(int)                 = InitializeParameter[len1] : &:r2801_4
+# 2801|     r2801_6(glval<unsigned long>) = VariableAddress[len2]     : 
+# 2801|     mu2801_7(unsigned long)       = InitializeParameter[len2] : &:r2801_6
+# 2801|     r2801_8(glval<char>)          = VariableAddress[len3]     : 
+# 2801|     mu2801_9(char)                = InitializeParameter[len3] : &:r2801_8
+# 2801|     r2801_10(glval<bool>)         = VariableAddress[b]        : 
+# 2801|     mu2801_11(bool)               = InitializeParameter[b]    : &:r2801_10
+# 2802|     r2802_1(glval<int>)           = VariableAddress[len1]     : 
+# 2802|     r2802_2(int)                  = Load[len1]                : &:r2802_1, ~m?
+# 2802|     r2802_3(glval<unsigned long>) = VariableAddress[len2]     : 
+# 2802|     r2802_4(unsigned long)        = Load[len2]                : &:r2802_3, ~m?
+# 2802|     v2802_5(void)                 = NoOp                      : 
+# 2803|     v2803_1(void)                 = NoOp                      : 
+# 2804|     r2804_1(glval<char>)          = VariableAddress[len3]     : 
+# 2804|     r2804_2(char)                 = Load[len3]                : &:r2804_1, ~m?
+# 2804|     v2804_3(void)                 = NoOp                      : 
+# 2806|     r2806_1(glval<bool>)          = VariableAddress[b]        : 
+# 2806|     r2806_2(bool)                 = Load[b]                   : &:r2806_1, ~m?
+# 2806|     v2806_3(void)                 = ConditionalBranch         : r2806_2
+#-----|   False -> Block 3
+#-----|   True -> Block 2
+
+# 2801|   Block 1
+# 2801|     r2801_12(glval<unsigned long>) = VariableAddress[#return] : 
+# 2801|     v2801_13(void)                 = ReturnValue              : &:r2801_12, ~m?
+# 2801|     v2801_14(void)                 = AliasedUse               : ~m?
+# 2801|     v2801_15(void)                 = ExitFunction             : 
+
+# 2807|   Block 2
+# 2807|     r2807_1(glval<long[][][]>)    = VariableAddress[tmp]     : 
+# 2807|     mu2807_2(long[][][])          = Uninitialized[tmp]       : &:r2807_1
+# 2807|     v2807_3(void)                 = NoOp                     : 
+# 2808|     r2808_1(glval<unsigned long>) = VariableAddress[#return] : 
+# 2808|     r2808_2(unsigned long)        = Constant[8]              : 
+# 2808|     r2808_3(unsigned long)        = Convert                  : r2802_2
+# 2808|     r2808_4(unsigned long)        = Mul                      : r2808_2, r2808_3
+# 2808|     r2808_5(unsigned long)        = CopyValue                : r2802_4
+# 2808|     r2808_6(unsigned long)        = Mul                      : r2808_4, r2808_5
+# 2808|     mu2808_7(unsigned long)       = Store[#return]           : &:r2808_1, r2808_6
+#-----|   Goto -> Block 1
+
+# 2811|   Block 3
+# 2811|     r2811_1(glval<unsigned long>) = VariableAddress[#return] : 
+# 2811|     r2811_2(unsigned long)        = Constant[0]              : 
+# 2811|     mu2811_3(unsigned long)       = Store[#return]           : &:r2811_1, r2811_2
+#-----|   Goto -> Block 1
+
+# 2814| void vla_sizeof_test4(int, size_t)
+# 2814|   Block 0
+# 2814|     v2814_1(void)                 = EnterFunction             : 
+# 2814|     mu2814_2(unknown)             = AliasedDefinition         : 
+# 2814|     mu2814_3(unknown)             = InitializeNonLocal        : 
+# 2814|     r2814_4(glval<int>)           = VariableAddress[len1]     : 
+# 2814|     mu2814_5(int)                 = InitializeParameter[len1] : &:r2814_4
+# 2814|     r2814_6(glval<unsigned long>) = VariableAddress[len2]     : 
+# 2814|     mu2814_7(unsigned long)       = InitializeParameter[len2] : &:r2814_6
+# 2815|     r2815_1(glval<int[][]>)       = VariableAddress[tmp1]     : 
+# 2815|     mu2815_2(int[][])             = Uninitialized[tmp1]       : &:r2815_1
+# 2815|     r2815_3(glval<int>)           = VariableAddress[len1]     : 
+# 2815|     r2815_4(int)                  = Load[len1]                : &:r2815_3, ~m?
+# 2815|     r2815_5(glval<unsigned long>) = VariableAddress[len2]     : 
+# 2815|     r2815_6(unsigned long)        = Load[len2]                : &:r2815_5, ~m?
+# 2815|     v2815_7(void)                 = NoOp                      : 
+# 2816|     r2816_1(glval<unsigned long>) = VariableAddress[z]        : 
+# 2816|     r2816_2(unsigned long)        = Constant[4]               : 
+# 2816|     r2816_3(unsigned long)        = CopyValue                 : r2815_6
+# 2816|     r2816_4(unsigned long)        = Mul                       : r2816_2, r2816_3
+# 2816|     mu2816_5(unsigned long)       = Store[z]                  : &:r2816_1, r2816_4
+# 2817|     v2817_1(void)                 = NoOp                      : 
+# 2814|     v2814_8(void)                 = ReturnVoid                : 
+# 2814|     v2814_9(void)                 = AliasedUse                : ~m?
+# 2814|     v2814_10(void)                = ExitFunction              : 
+
+# 2819| void vla_sizeof_test5(int, size_t)
+# 2819|   Block 0
+# 2819|     v2819_1(void)                 = EnterFunction             : 
+# 2819|     mu2819_2(unknown)             = AliasedDefinition         : 
+# 2819|     mu2819_3(unknown)             = InitializeNonLocal        : 
+# 2819|     r2819_4(glval<int>)           = VariableAddress[len1]     : 
+# 2819|     mu2819_5(int)                 = InitializeParameter[len1] : &:r2819_4
+# 2819|     r2819_6(glval<unsigned long>) = VariableAddress[len2]     : 
+# 2819|     mu2819_7(unsigned long)       = InitializeParameter[len2] : &:r2819_6
+# 2820|     r2820_1(glval<int[][]>)       = VariableAddress[tmp1]     : 
+# 2820|     mu2820_2(int[][])             = Uninitialized[tmp1]       : &:r2820_1
+# 2820|     r2820_3(glval<int>)           = VariableAddress[len1]     : 
+# 2820|     r2820_4(int)                  = Load[len1]                : &:r2820_3, ~m?
+# 2820|     r2820_5(glval<unsigned long>) = VariableAddress[len2]     : 
+# 2820|     r2820_6(unsigned long)        = Load[len2]                : &:r2820_5, ~m?
+# 2820|     v2820_7(void)                 = NoOp                      : 
+# 2821|     r2821_1(glval<unsigned long>) = VariableAddress[z]        : 
+# 2821|     r2821_2(unsigned long)        = Constant[4]               : 
+# 2821|     r2821_3(unsigned long)        = CopyValue                 : r2820_6
+# 2821|     r2821_4(unsigned long)        = Mul                       : r2821_2, r2821_3
+# 2821|     mu2821_5(unsigned long)       = Store[z]                  : &:r2821_1, r2821_4
+# 2822|     v2822_1(void)                 = NoOp                      : 
+# 2819|     v2819_8(void)                 = ReturnVoid                : 
+# 2819|     v2819_9(void)                 = AliasedUse                : ~m?
+# 2819|     v2819_10(void)                = ExitFunction              : 
+
 ir23.cpp:
 #    1| bool consteval_1()
 #    1|   Block 0
diff --git a/cpp/ql/test/library-tests/ir/range-analysis/test.cpp b/cpp/ql/test/library-tests/ir/range-analysis/test.cpp
index 7234449a4ed..0c1a98b06bb 100644
--- a/cpp/ql/test/library-tests/ir/range-analysis/test.cpp
+++ b/cpp/ql/test/library-tests/ir/range-analysis/test.cpp
@@ -145,4 +145,15 @@ void nonterminating_without_operands_as_ssa(X *x) {
   while (x->n) {
     x->n--;
   }
+}
+
+void test_with_irreduble_cfg(int i, int x) {
+  if (x < i) {
+  } else {
+    goto inLoop;
+  }
+  for(; i < x; i++) {
+    inLoop:
+    range(i); // $ range="<=InitializeParameter: x+0"
+  }
 }
\ No newline at end of file
diff --git a/cpp/ql/test/library-tests/macros/arguments/macro_arguments.expected b/cpp/ql/test/library-tests/macros/arguments/macro_arguments.expected
index 0ddac7d27a6..5a18945cc0f 100644
--- a/cpp/ql/test/library-tests/macros/arguments/macro_arguments.expected
+++ b/cpp/ql/test/library-tests/macros/arguments/macro_arguments.expected
@@ -23,7 +23,7 @@
 | test.c:27:17:33:1 | test.c:27:17:33:1 | CONCAT | 1 | "Semmle" | "Semmle" |
 | test.c:42:1:42:13 | test.c:42:1:42:13 | APPLY | 0 | top | top |
 | test.c:42:1:42:13 | test.c:42:1:42:13 | APPLY | 1 | 3 | 3 |
-| test.c:42:1:42:13 | test.c:42:7:41:24 | APPLY -> top | 0 | 3 | 3 |
+| test.c:42:1:42:13 | test.c:42:7:42:7 | APPLY -> top | 0 | 3 | 3 |
 | test.c:42:1:42:13 | top_and_nested.h:2:16:2:24 | APPLY -> top -> nested | 0 | 3 |  |
 | test.c:42:1:42:13 | top_and_nested.h:3:16:3:30 | APPLY -> top -> nested | 0 | 2 + (3) |  |
 | test.c:47:1:47:23 | test.c:45:15:45:22 | DECLARE_STRING -> ID | 0 | string1 | string1 |
@@ -49,7 +49,7 @@
 | test.c:82:1:82:4 | test.c:82:1:82:4 | ID | 0 |  |  |
 | test.c:84:5:84:20 | test.c:84:5:84:20 | APPLY | 0 | ID | ID |
 | test.c:84:5:84:20 | test.c:84:5:84:20 | APPLY | 1 | ID(1) | 1 |
-| test.c:84:5:84:20 | test.c:84:11:41:24 | APPLY -> ID | 0 | 1 | 1 |
+| test.c:84:5:84:20 | test.c:84:11:84:11 | APPLY -> ID | 0 | 1 | 1 |
 | test.c:84:5:84:20 | test.c:84:15:84:19 | APPLY -> ID | 0 | 1 | 1 |
 | test.c:85:21:85:40 | test.c:85:21:85:40 | CMD_LINE_MACRO | 0 | 5 | 5 |
 | test.c:85:21:85:40 | test.c:85:21:85:40 | CMD_LINE_MACRO | 1 | 6 | 6 |
diff --git a/cpp/ql/test/library-tests/permissive/accesses.expected b/cpp/ql/test/library-tests/permissive/accesses.expected
index f3e66dcedaf..e69de29bb2d 100644
--- a/cpp/ql/test/library-tests/permissive/accesses.expected
+++ b/cpp/ql/test/library-tests/permissive/accesses.expected
@@ -1 +0,0 @@
-| permissive.cpp:6:5:6:7 | str |
diff --git a/cpp/ql/test/library-tests/permissive/calls.expected b/cpp/ql/test/library-tests/permissive/calls.expected
index 9d780e76405..e69de29bb2d 100644
--- a/cpp/ql/test/library-tests/permissive/calls.expected
+++ b/cpp/ql/test/library-tests/permissive/calls.expected
@@ -1 +0,0 @@
-| permissive.cpp:6:3:6:3 | call to f | permissive.cpp:2:13:2:13 | f |
diff --git a/cpp/ql/test/library-tests/permissive/permissive.cpp b/cpp/ql/test/library-tests/permissive/permissive.cpp
deleted file mode 100644
index 15f5b94ef61..00000000000
--- a/cpp/ql/test/library-tests/permissive/permissive.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// semmle-extractor-options: --edg --permissive
-static void f(char* foo) {}
-
-static void g(void) {
-  const char* str = "foo";
-  f(str);
-}
-
diff --git a/cpp/ql/test/library-tests/preprocessor/preprocessor/preproc.expected b/cpp/ql/test/library-tests/preprocessor/preprocessor/preproc.expected
index 7c448ba6550..e9198ba5ea0 100644
--- a/cpp/ql/test/library-tests/preprocessor/preprocessor/preproc.expected
+++ b/cpp/ql/test/library-tests/preprocessor/preprocessor/preproc.expected
@@ -1,101 +1,101 @@
-| a.h:0:0:0:0 | a.h | 1 | 1 | 1 | 19 | IncludeNext | "a.h" | N/A |
-| pp23.cpp:0:0:0:0 | pp23.cpp | 3 | 1 | 3 | 11 | Macro | BAR |  |
-| pp23.cpp:0:0:0:0 | pp23.cpp | 5 | 1 | 5 | 10 | PreprocessorIfdef | FOO | N/A |
-| pp23.cpp:0:0:0:0 | pp23.cpp | 7 | 1 | 7 | 12 | PreprocessorElifdef | BAR | N/A |
-| pp23.cpp:0:0:0:0 | pp23.cpp | 8 | 1 | 8 | 16 | PreprocessorWarning | C++23 2 | N/A |
-| pp23.cpp:0:0:0:0 | pp23.cpp | 9 | 1 | 9 | 6 | PreprocessorEndif | N/A | N/A |
-| pp23.cpp:0:0:0:0 | pp23.cpp | 11 | 1 | 11 | 10 | PreprocessorIfdef | FOO | N/A |
-| pp23.cpp:0:0:0:0 | pp23.cpp | 13 | 1 | 13 | 13 | PreprocessorElifndef | FOO | N/A |
-| pp23.cpp:0:0:0:0 | pp23.cpp | 14 | 1 | 14 | 16 | PreprocessorWarning | C++23 3 | N/A |
-| pp23.cpp:0:0:0:0 | pp23.cpp | 15 | 1 | 15 | 6 | PreprocessorEndif | N/A | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 1 | 1 | 1 | 16 | PreprocessorIf | defined(FOO) | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 3 | 1 | 3 | 19 | PreprocessorElif | !defined(BAR) | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 4 | 1 | 4 | 11 | Macro | BAR |  |
-| pp.cpp:0:0:0:0 | pp.cpp | 5 | 1 | 5 | 17 | Macro | BAR_val | 1 |
-| pp.cpp:0:0:0:0 | pp.cpp | 6 | 1 | 6 | 24 | Macro | BAR_fn() | BAR_val |
-| pp.cpp:0:0:0:0 | pp.cpp | 7 | 1 | 7 | 5 | PreprocessorElse | N/A | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 9 | 1 | 9 | 6 | PreprocessorEndif | N/A | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 11 | 1 | 11 | 10 | PreprocessorUndef | BAR | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 12 | 1 | 12 | 68 | Macro | SCARY(a,aa,aaah) | (aa ) |
-| pp.cpp:0:0:0:0 | pp.cpp | 13 | 1 | 13 | 63 | Macro | LOG(fmt,__VA_ARGS__...) | printf("Warning: %s", fmt, __VA__ARGS__) |
-| pp.cpp:0:0:0:0 | pp.cpp | 14 | 1 | 14 | 15 | Include | "pp.h" | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 16 | 1 | 16 | 5 | PreprocessorIf | 0 | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 17 | 1 | 17 | 5 | PreprocessorElse | N/A | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 18 | 1 | 18 | 6 | PreprocessorEndif | N/A | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 20 | 1 | 20 | 5 | PreprocessorIf | 1 | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 21 | 1 | 21 | 5 | PreprocessorElse | N/A | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 22 | 1 | 22 | 6 | PreprocessorEndif | N/A | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 24 | 1 | 24 | 13 | Import | "a.h" | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 30 | 2 | 30 | 32 | Macro | MACRO_FUNCTIONCONTEXT | 1 |
-| pp.cpp:0:0:0:0 | pp.cpp | 36 | 2 | 36 | 29 | Macro | MACRO_CLASSCONTEXT | 2 |
-| pp.cpp:0:0:0:0 | pp.cpp | 42 | 2 | 42 | 40 | Macro | MACRO_TEMPLATEFUNCTIONCONTEXT | 3 |
-| pp.cpp:0:0:0:0 | pp.cpp | 49 | 2 | 49 | 37 | Macro | MACRO_TEMPLATECLASSCONTEXT | 4 |
-| pp.cpp:0:0:0:0 | pp.cpp | 50 | 2 | 50 | 48 | Macro | MACRO_TEMPLATECLASSCONTEXT_REFERENCED | 5 |
-| pp.cpp:0:0:0:0 | pp.cpp | 54 | 3 | 54 | 39 | Macro | MACRO_TEMPLATEMETHODCONTEXT | 6 |
-| pp.cpp:0:0:0:0 | pp.cpp | 57 | 1 | 57 | 21 | PreprocessorIfdef | INSTANTIATION | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 59 | 1 | 59 | 6 | PreprocessorElse |  | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 60 | 3 | 60 | 21 | Macro | IN_TEMPLATE |  |
-| pp.cpp:0:0:0:0 | pp.cpp | 61 | 1 | 61 | 7 | PreprocessorEndif |  | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 69 | 1 | 69 | 21 | Macro | INSTANTIATION |  |
-| pp.cpp:0:0:0:0 | pp.cpp | 72 | 1 | 72 | 11 | Macro | BAR |  |
-| pp.cpp:0:0:0:0 | pp.cpp | 74 | 1 | 75 | 14 | PreprocessorIf | defined(BAR) && defined(BAR) | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 76 | 1 | 76 | 20 | PreprocessorWarning | BAR defined | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 77 | 1 | 77 | 6 | PreprocessorEndif | N/A | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 79 | 1 | 80 | 26 | PreprocessorIf | defined MACROTHREE && (defined(MACROONE)) | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 81 | 1 | 81 | 6 | PreprocessorEndif | N/A | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 83 | 1 | 83 | 26 | PreprocessorIf | defined SIMPLE_COMMENT | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 85 | 1 | 85 | 6 | PreprocessorEndif | N/A | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 87 | 1 | 88 | 16 | PreprocessorIf | defined(FOO) && defined(BAR) | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 90 | 1 | 90 | 6 | PreprocessorEndif | N/A | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 92 | 1 | 94 | 17 | PreprocessorIf | defined(FOO) && defined(BAR) && !defined(BAZ) | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 96 | 1 | 96 | 6 | PreprocessorEndif | N/A | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 98 | 1 | 98 | 13 | Macro | FOO | 8 |
-| pp.cpp:0:0:0:0 | pp.cpp | 99 | 1 | 99 | 13 | Macro | BAR | 2 |
-| pp.cpp:0:0:0:0 | pp.cpp | 100 | 1 | 100 | 13 | Macro | BAZ | 4 |
-| pp.cpp:0:0:0:0 | pp.cpp | 101 | 1 | 104 | 8 | PreprocessorIf | ((FOO / BAR) == 4) && ((BAZ * QUX) > 10) | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 106 | 1 | 106 | 6 | PreprocessorEndif | N/A | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 109 | 1 | 111 | 13 | PreprocessorIf | defined(FOO) && defined(BAR) && defined(BAZ) | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 112 | 1 | 112 | 29 | Macro | CONDITIONAL_MACRO_4 | 4 |
-| pp.cpp:0:0:0:0 | pp.cpp | 113 | 1 | 113 | 6 | PreprocessorEndif | N/A | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 116 | 1 | 116 | 39 | PreprocessorIf | defined SIMPLE_COMMENT | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 118 | 1 | 118 | 6 | PreprocessorEndif | N/A | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 120 | 1 | 120 | 12 | PreprocessorWarning | foo | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 122 | 1 | 122 | 12 | PreprocessorWarning | foo | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 126 | 1 | 126 | 12 | PreprocessorWarning | foo | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 129 | 1 | 129 | 12 | PreprocessorWarning | foo | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 134 | 1 | 134 | 13 | Macro | FOO | 8 |
-| pp.cpp:0:0:0:0 | pp.cpp | 135 | 1 | 135 | 13 | Macro | BAR | 2 |
-| pp.cpp:0:0:0:0 | pp.cpp | 136 | 1 | 136 | 13 | Macro | BAZ | 4 |
-| pp.cpp:0:0:0:0 | pp.cpp | 137 | 1 | 142 | 8 | PreprocessorIf | ((FOO / BAR) == 4) && ((BAZ * QUX) > 10) | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 144 | 1 | 144 | 6 | PreprocessorEndif | N/A | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 146 | 1 | 146 | 11 | Macro | X | 1 |
-| pp.cpp:0:0:0:0 | pp.cpp | 147 | 1 | 147 | 11 | Macro | Y | 2 |
-| pp.cpp:0:0:0:0 | pp.cpp | 148 | 1 | 149 | 36 | PreprocessorIf | defined(X) && defined(Y) | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 151 | 1 | 151 | 6 | PreprocessorEndif | N/A | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 153 | 1 | 157 | 3 | PreprocessorWarning | FOO BAR | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 160 | 1 | 160 | 12 | PreprocessorWarning | foo | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 166 | 1 | 166 | 22 | PreprocessorIf | A &&B | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 167 | 1 | 167 | 6 | PreprocessorEndif | N/A | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 170 | 1 | 170 | 20 | PreprocessorIf | A | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 171 | 1 | 171 | 6 | PreprocessorEndif | N/A | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 173 | 1 | 175 | 6 | PreprocessorIf | A && B | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 176 | 1 | 176 | 6 | PreprocessorEndif | N/A | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 179 | 1 | 183 | 9 | PreprocessorIfdef | FOOBAR | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 185 | 1 | 185 | 5 | PreprocessorElse | N/A | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 186 | 1 | 186 | 10 | PreprocessorWarning | b | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 187 | 1 | 187 | 6 | PreprocessorEndif | N/A | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 190 | 1 | 194 | 9 | PreprocessorIf | FOOBAR | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 195 | 1 | 195 | 6 | PreprocessorEndif | N/A | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 197 | 1 | 197 | 18 | PreprocessorIf | A | N/A |
-| pp.cpp:0:0:0:0 | pp.cpp | 198 | 1 | 198 | 6 | PreprocessorEndif | N/A | N/A |
-| pp.h:0:0:0:0 | pp.h | 1 | 1 | 1 | 12 | PreprocessorPragma | once | N/A |
-| pp.h:0:0:0:0 | pp.h | 2 | 1 | 2 | 29 | PreprocessorWarning | "This should happen" | N/A |
-| pp.h:0:0:0:0 | pp.h | 3 | 1 | 3 | 27 | PreprocessorLine | 33 "emerald_city.h" | N/A |
-| pp.h:0:0:0:0 | pp.h | 4 | 1 | 4 | 30 | PreprocessorPragma | byte_order(big_endian) | N/A |
-| pp.h:0:0:0:0 | pp.h | 5 | 1 | 5 | 33 | PreprocessorWarning | "Not in Kansas any more" | N/A |
-| pp.h:0:0:0:0 | pp.h | 7 | 1 | 11 | 8 | Macro | MULTILINE | world a long |
-| pp.h:0:0:0:0 | pp.h | 13 | 1 | 14 | 11 | PreprocessorUndef | MULTILINE | N/A |
-| pp.h:0:0:0:0 | pp.h | 16 | 1 | 17 | 8 | Include | "pp.h" | N/A |
-| ppms.cpp:0:0:0:0 | ppms.cpp | 3 | 1 | 3 | 18 | TypeLibraryImport | "test.tlb" | N/A |
-| test.tlh:0:0:0:0 | test.tlh | 1 | 1 | 1 | 12 | PreprocessorPragma | once | N/A |
-| test.tlh:0:0:0:0 | test.tlh | 3 | 1 | 3 | 21 | PreprocessorWarning | type library | N/A |
+| a.h:0:0:0:0 | a.h | 1 | 1 | 1 | 19 | GuardConditionImpl, IncludeNext | "a.h" | N/A |
+| pp23.cpp:0:0:0:0 | pp23.cpp | 3 | 1 | 3 | 11 | GuardConditionImpl, Macro | BAR |  |
+| pp23.cpp:0:0:0:0 | pp23.cpp | 5 | 1 | 5 | 10 | GuardConditionImpl, PreprocessorIfdef | FOO | N/A |
+| pp23.cpp:0:0:0:0 | pp23.cpp | 7 | 1 | 7 | 12 | GuardConditionImpl, PreprocessorElifdef | BAR | N/A |
+| pp23.cpp:0:0:0:0 | pp23.cpp | 8 | 1 | 8 | 16 | GuardConditionImpl, PreprocessorWarning | C++23 2 | N/A |
+| pp23.cpp:0:0:0:0 | pp23.cpp | 9 | 1 | 9 | 6 | GuardConditionImpl, PreprocessorEndif | N/A | N/A |
+| pp23.cpp:0:0:0:0 | pp23.cpp | 11 | 1 | 11 | 10 | GuardConditionImpl, PreprocessorIfdef | FOO | N/A |
+| pp23.cpp:0:0:0:0 | pp23.cpp | 13 | 1 | 13 | 13 | GuardConditionImpl, PreprocessorElifndef | FOO | N/A |
+| pp23.cpp:0:0:0:0 | pp23.cpp | 14 | 1 | 14 | 16 | GuardConditionImpl, PreprocessorWarning | C++23 3 | N/A |
+| pp23.cpp:0:0:0:0 | pp23.cpp | 15 | 1 | 15 | 6 | GuardConditionImpl, PreprocessorEndif | N/A | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 1 | 1 | 1 | 16 | GuardConditionImpl, PreprocessorIf | defined(FOO) | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 3 | 1 | 3 | 19 | GuardConditionImpl, PreprocessorElif | !defined(BAR) | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 4 | 1 | 4 | 11 | GuardConditionImpl, Macro | BAR |  |
+| pp.cpp:0:0:0:0 | pp.cpp | 5 | 1 | 5 | 17 | GuardConditionImpl, Macro | BAR_val | 1 |
+| pp.cpp:0:0:0:0 | pp.cpp | 6 | 1 | 6 | 24 | GuardConditionImpl, Macro | BAR_fn() | BAR_val |
+| pp.cpp:0:0:0:0 | pp.cpp | 7 | 1 | 7 | 5 | GuardConditionImpl, PreprocessorElse | N/A | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 9 | 1 | 9 | 6 | GuardConditionImpl, PreprocessorEndif | N/A | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 11 | 1 | 11 | 10 | GuardConditionImpl, PreprocessorUndef | BAR | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 12 | 1 | 12 | 68 | GuardConditionImpl, Macro | SCARY(a,aa,aaah) | (aa ) |
+| pp.cpp:0:0:0:0 | pp.cpp | 13 | 1 | 13 | 63 | GuardConditionImpl, Macro | LOG(fmt,__VA_ARGS__...) | printf("Warning: %s", fmt, __VA__ARGS__) |
+| pp.cpp:0:0:0:0 | pp.cpp | 14 | 1 | 14 | 15 | GuardConditionImpl, Include | "pp.h" | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 16 | 1 | 16 | 5 | GuardConditionImpl, PreprocessorIf | 0 | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 17 | 1 | 17 | 5 | GuardConditionImpl, PreprocessorElse | N/A | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 18 | 1 | 18 | 6 | GuardConditionImpl, PreprocessorEndif | N/A | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 20 | 1 | 20 | 5 | GuardConditionImpl, PreprocessorIf | 1 | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 21 | 1 | 21 | 5 | GuardConditionImpl, PreprocessorElse | N/A | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 22 | 1 | 22 | 6 | GuardConditionImpl, PreprocessorEndif | N/A | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 24 | 1 | 24 | 13 | GuardConditionImpl, Import | "a.h" | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 30 | 2 | 30 | 32 | GuardConditionImpl, Macro | MACRO_FUNCTIONCONTEXT | 1 |
+| pp.cpp:0:0:0:0 | pp.cpp | 36 | 2 | 36 | 29 | GuardConditionImpl, Macro | MACRO_CLASSCONTEXT | 2 |
+| pp.cpp:0:0:0:0 | pp.cpp | 42 | 2 | 42 | 40 | GuardConditionImpl, Macro | MACRO_TEMPLATEFUNCTIONCONTEXT | 3 |
+| pp.cpp:0:0:0:0 | pp.cpp | 49 | 2 | 49 | 37 | GuardConditionImpl, Macro | MACRO_TEMPLATECLASSCONTEXT | 4 |
+| pp.cpp:0:0:0:0 | pp.cpp | 50 | 2 | 50 | 48 | GuardConditionImpl, Macro | MACRO_TEMPLATECLASSCONTEXT_REFERENCED | 5 |
+| pp.cpp:0:0:0:0 | pp.cpp | 54 | 3 | 54 | 39 | GuardConditionImpl, Macro | MACRO_TEMPLATEMETHODCONTEXT | 6 |
+| pp.cpp:0:0:0:0 | pp.cpp | 57 | 1 | 57 | 21 | GuardConditionImpl, PreprocessorIfdef | INSTANTIATION | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 59 | 1 | 59 | 6 | GuardConditionImpl, PreprocessorElse |  | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 60 | 3 | 60 | 21 | GuardConditionImpl, Macro | IN_TEMPLATE |  |
+| pp.cpp:0:0:0:0 | pp.cpp | 61 | 1 | 61 | 7 | GuardConditionImpl, PreprocessorEndif |  | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 69 | 1 | 69 | 21 | GuardConditionImpl, Macro | INSTANTIATION |  |
+| pp.cpp:0:0:0:0 | pp.cpp | 72 | 1 | 72 | 11 | GuardConditionImpl, Macro | BAR |  |
+| pp.cpp:0:0:0:0 | pp.cpp | 74 | 1 | 75 | 14 | GuardConditionImpl, PreprocessorIf | defined(BAR) && defined(BAR) | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 76 | 1 | 76 | 20 | GuardConditionImpl, PreprocessorWarning | BAR defined | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 77 | 1 | 77 | 6 | GuardConditionImpl, PreprocessorEndif | N/A | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 79 | 1 | 80 | 26 | GuardConditionImpl, PreprocessorIf | defined MACROTHREE && (defined(MACROONE)) | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 81 | 1 | 81 | 6 | GuardConditionImpl, PreprocessorEndif | N/A | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 83 | 1 | 83 | 26 | GuardConditionImpl, PreprocessorIf | defined SIMPLE_COMMENT | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 85 | 1 | 85 | 6 | GuardConditionImpl, PreprocessorEndif | N/A | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 87 | 1 | 88 | 16 | GuardConditionImpl, PreprocessorIf | defined(FOO) && defined(BAR) | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 90 | 1 | 90 | 6 | GuardConditionImpl, PreprocessorEndif | N/A | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 92 | 1 | 94 | 17 | GuardConditionImpl, PreprocessorIf | defined(FOO) && defined(BAR) && !defined(BAZ) | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 96 | 1 | 96 | 6 | GuardConditionImpl, PreprocessorEndif | N/A | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 98 | 1 | 98 | 13 | GuardConditionImpl, Macro | FOO | 8 |
+| pp.cpp:0:0:0:0 | pp.cpp | 99 | 1 | 99 | 13 | GuardConditionImpl, Macro | BAR | 2 |
+| pp.cpp:0:0:0:0 | pp.cpp | 100 | 1 | 100 | 13 | GuardConditionImpl, Macro | BAZ | 4 |
+| pp.cpp:0:0:0:0 | pp.cpp | 101 | 1 | 104 | 8 | GuardConditionImpl, PreprocessorIf | ((FOO / BAR) == 4) && ((BAZ * QUX) > 10) | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 106 | 1 | 106 | 6 | GuardConditionImpl, PreprocessorEndif | N/A | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 109 | 1 | 111 | 13 | GuardConditionImpl, PreprocessorIf | defined(FOO) && defined(BAR) && defined(BAZ) | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 112 | 1 | 112 | 29 | GuardConditionImpl, Macro | CONDITIONAL_MACRO_4 | 4 |
+| pp.cpp:0:0:0:0 | pp.cpp | 113 | 1 | 113 | 6 | GuardConditionImpl, PreprocessorEndif | N/A | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 116 | 1 | 116 | 39 | GuardConditionImpl, PreprocessorIf | defined SIMPLE_COMMENT | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 118 | 1 | 118 | 6 | GuardConditionImpl, PreprocessorEndif | N/A | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 120 | 1 | 120 | 12 | GuardConditionImpl, PreprocessorWarning | foo | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 122 | 1 | 122 | 12 | GuardConditionImpl, PreprocessorWarning | foo | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 126 | 1 | 126 | 12 | GuardConditionImpl, PreprocessorWarning | foo | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 129 | 1 | 129 | 12 | GuardConditionImpl, PreprocessorWarning | foo | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 134 | 1 | 134 | 13 | GuardConditionImpl, Macro | FOO | 8 |
+| pp.cpp:0:0:0:0 | pp.cpp | 135 | 1 | 135 | 13 | GuardConditionImpl, Macro | BAR | 2 |
+| pp.cpp:0:0:0:0 | pp.cpp | 136 | 1 | 136 | 13 | GuardConditionImpl, Macro | BAZ | 4 |
+| pp.cpp:0:0:0:0 | pp.cpp | 137 | 1 | 142 | 8 | GuardConditionImpl, PreprocessorIf | ((FOO / BAR) == 4) && ((BAZ * QUX) > 10) | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 144 | 1 | 144 | 6 | GuardConditionImpl, PreprocessorEndif | N/A | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 146 | 1 | 146 | 11 | GuardConditionImpl, Macro | X | 1 |
+| pp.cpp:0:0:0:0 | pp.cpp | 147 | 1 | 147 | 11 | GuardConditionImpl, Macro | Y | 2 |
+| pp.cpp:0:0:0:0 | pp.cpp | 148 | 1 | 149 | 36 | GuardConditionImpl, PreprocessorIf | defined(X) && defined(Y) | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 151 | 1 | 151 | 6 | GuardConditionImpl, PreprocessorEndif | N/A | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 153 | 1 | 157 | 3 | GuardConditionImpl, PreprocessorWarning | FOO BAR | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 160 | 1 | 160 | 12 | GuardConditionImpl, PreprocessorWarning | foo | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 166 | 1 | 166 | 22 | GuardConditionImpl, PreprocessorIf | A &&B | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 167 | 1 | 167 | 6 | GuardConditionImpl, PreprocessorEndif | N/A | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 170 | 1 | 170 | 20 | GuardConditionImpl, PreprocessorIf | A | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 171 | 1 | 171 | 6 | GuardConditionImpl, PreprocessorEndif | N/A | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 173 | 1 | 175 | 6 | GuardConditionImpl, PreprocessorIf | A && B | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 176 | 1 | 176 | 6 | GuardConditionImpl, PreprocessorEndif | N/A | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 179 | 1 | 183 | 9 | GuardConditionImpl, PreprocessorIfdef | FOOBAR | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 185 | 1 | 185 | 5 | GuardConditionImpl, PreprocessorElse | N/A | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 186 | 1 | 186 | 10 | GuardConditionImpl, PreprocessorWarning | b | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 187 | 1 | 187 | 6 | GuardConditionImpl, PreprocessorEndif | N/A | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 190 | 1 | 194 | 9 | GuardConditionImpl, PreprocessorIf | FOOBAR | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 195 | 1 | 195 | 6 | GuardConditionImpl, PreprocessorEndif | N/A | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 197 | 1 | 197 | 18 | GuardConditionImpl, PreprocessorIf | A | N/A |
+| pp.cpp:0:0:0:0 | pp.cpp | 198 | 1 | 198 | 6 | GuardConditionImpl, PreprocessorEndif | N/A | N/A |
+| pp.h:0:0:0:0 | pp.h | 1 | 1 | 1 | 12 | GuardConditionImpl, PreprocessorPragma | once | N/A |
+| pp.h:0:0:0:0 | pp.h | 2 | 1 | 2 | 29 | GuardConditionImpl, PreprocessorWarning | "This should happen" | N/A |
+| pp.h:0:0:0:0 | pp.h | 3 | 1 | 3 | 27 | GuardConditionImpl, PreprocessorLine | 33 "emerald_city.h" | N/A |
+| pp.h:0:0:0:0 | pp.h | 4 | 1 | 4 | 30 | GuardConditionImpl, PreprocessorPragma | byte_order(big_endian) | N/A |
+| pp.h:0:0:0:0 | pp.h | 5 | 1 | 5 | 33 | GuardConditionImpl, PreprocessorWarning | "Not in Kansas any more" | N/A |
+| pp.h:0:0:0:0 | pp.h | 7 | 1 | 11 | 8 | GuardConditionImpl, Macro | MULTILINE | world a long |
+| pp.h:0:0:0:0 | pp.h | 13 | 1 | 14 | 11 | GuardConditionImpl, PreprocessorUndef | MULTILINE | N/A |
+| pp.h:0:0:0:0 | pp.h | 16 | 1 | 17 | 8 | GuardConditionImpl, Include | "pp.h" | N/A |
+| ppms.cpp:0:0:0:0 | ppms.cpp | 3 | 1 | 3 | 18 | GuardConditionImpl, TypeLibraryImport | "test.tlb" | N/A |
+| test.tlh:0:0:0:0 | test.tlh | 1 | 1 | 1 | 12 | GuardConditionImpl, PreprocessorPragma | once | N/A |
+| test.tlh:0:0:0:0 | test.tlh | 3 | 1 | 3 | 21 | GuardConditionImpl, PreprocessorWarning | type library | N/A |
diff --git a/cpp/ql/test/library-tests/rangeanalysis/SimpleRangeAnalysis/test.c b/cpp/ql/test/library-tests/rangeanalysis/SimpleRangeAnalysis/test.c
index db7c71e0050..26e6a49e6f6 100644
--- a/cpp/ql/test/library-tests/rangeanalysis/SimpleRangeAnalysis/test.c
+++ b/cpp/ql/test/library-tests/rangeanalysis/SimpleRangeAnalysis/test.c
@@ -700,7 +700,7 @@ void guard_with_exit(int x, int y) {
 
   // This test ensures that we correctly identify
   // that the upper bound for y is max_int when calling `out(y)`.
-  // The RangeSsa will place guardPhy on `out(y)`, and consequently there is no
+  // The RangeSsa will place guardPhi on `out(y)`, and consequently there is no
   // frontier phi node at out(y).
 }
 
@@ -708,7 +708,7 @@ void test(int x) {
   if (x >= 10) {
     return;
   }
-  // The basic below has two predecessors.
+  // The basic block below has two predecessors.
 label:
   out(x);
   goto label;
diff --git a/cpp/ql/test/library-tests/syntax-zoo/dataflow-consistency.expected b/cpp/ql/test/library-tests/syntax-zoo/dataflow-consistency.expected
index b516aa0ce87..76adedb8f05 100644
--- a/cpp/ql/test/library-tests/syntax-zoo/dataflow-consistency.expected
+++ b/cpp/ql/test/library-tests/syntax-zoo/dataflow-consistency.expected
@@ -48,21 +48,10 @@ argHasPostUpdate
 | ir.cpp:623:5:623:5 | r | ArgumentNode is missing PostUpdateNode. |
 | ir.cpp:625:5:625:5 | s | ArgumentNode is missing PostUpdateNode. |
 postWithInFlow
-| VacuousDestructorCall.cpp:10:22:10:22 | i [inner post update] | PostUpdateNode should not be the target of local flow. |
 | allocators.cpp:4:18:4:20 | m_x [post update] | PostUpdateNode should not be the target of local flow. |
 | allocators.cpp:4:24:4:26 | m_y [post update] | PostUpdateNode should not be the target of local flow. |
 | assignexpr.cpp:11:4:11:4 | i [post update] | PostUpdateNode should not be the target of local flow. |
-| builtin.c:34:23:34:31 | staticint [inner post update] | PostUpdateNode should not be the target of local flow. |
-| builtin.c:39:37:39:45 | carry_out [inner post update] | PostUpdateNode should not be the target of local flow. |
-| builtin.c:43:41:43:49 | staticint [inner post update] | PostUpdateNode should not be the target of local flow. |
-| builtin.c:51:30:51:38 | staticint [inner post update] | PostUpdateNode should not be the target of local flow. |
-| builtin.c:54:29:54:38 | atomic_int [inner post update] | PostUpdateNode should not be the target of local flow. |
 | condition_decls.cpp:3:5:3:9 | m_ptr [post update] | PostUpdateNode should not be the target of local flow. |
-| condition_decls.cpp:17:11:17:15 | m_ptr [inner post update] | PostUpdateNode should not be the target of local flow. |
-| condition_decls.cpp:20:11:20:15 | m_ptr [inner post update] | PostUpdateNode should not be the target of local flow. |
-| condition_decls.cpp:28:11:28:15 | m_ptr [inner post update] | PostUpdateNode should not be the target of local flow. |
-| condition_decls.cpp:31:11:31:15 | m_ptr [inner post update] | PostUpdateNode should not be the target of local flow. |
-| condition_decls.cpp:34:9:34:13 | m_ptr [inner post update] | PostUpdateNode should not be the target of local flow. |
 | conditional_destructors.cpp:6:13:6:15 | val [post update] | PostUpdateNode should not be the target of local flow. |
 | conditional_destructors.cpp:18:13:18:15 | val [post update] | PostUpdateNode should not be the target of local flow. |
 | cpp11.cpp:7:7:7:8 | el [post update] | PostUpdateNode should not be the target of local flow. |
@@ -70,26 +59,16 @@ postWithInFlow
 | cpp11.cpp:82:11:82:14 | call to Val | PostUpdateNode should not be the target of local flow. |
 | cpp11.cpp:82:45:82:48 | call to Val | PostUpdateNode should not be the target of local flow. |
 | cpp11.cpp:82:51:82:51 | call to Val | PostUpdateNode should not be the target of local flow. |
-| ir.cpp:177:5:177:5 | p [inner post update] | PostUpdateNode should not be the target of local flow. |
 | ir.cpp:177:5:177:8 | access to array [post update] | PostUpdateNode should not be the target of local flow. |
 | ir.cpp:178:5:178:8 | access to array [post update] | PostUpdateNode should not be the target of local flow. |
-| ir.cpp:178:7:178:7 | p [inner post update] | PostUpdateNode should not be the target of local flow. |
-| ir.cpp:183:5:183:5 | a [inner post update] | PostUpdateNode should not be the target of local flow. |
 | ir.cpp:183:5:183:8 | access to array [post update] | PostUpdateNode should not be the target of local flow. |
 | ir.cpp:184:5:184:8 | access to array [post update] | PostUpdateNode should not be the target of local flow. |
-| ir.cpp:184:7:184:7 | a [inner post update] | PostUpdateNode should not be the target of local flow. |
 | ir.cpp:342:5:342:6 | * ... [post update] | PostUpdateNode should not be the target of local flow. |
-| ir.cpp:342:6:342:6 | p [inner post update] | PostUpdateNode should not be the target of local flow. |
 | ir.cpp:428:8:428:8 | x [post update] | PostUpdateNode should not be the target of local flow. |
 | ir.cpp:429:8:429:8 | y [post update] | PostUpdateNode should not be the target of local flow. |
 | ir.cpp:644:15:644:17 | m_a [post update] | PostUpdateNode should not be the target of local flow. |
-| ir.cpp:645:11:645:14 | this [inner post update] | PostUpdateNode should not be the target of local flow. |
 | ir.cpp:645:17:645:19 | m_a [post update] | PostUpdateNode should not be the target of local flow. |
 | ir.cpp:646:9:646:11 | m_a [post update] | PostUpdateNode should not be the target of local flow. |
-| ir.cpp:655:11:655:14 | this [inner post update] | PostUpdateNode should not be the target of local flow. |
-| ir.cpp:747:8:747:8 | base_s [inner post update] | PostUpdateNode should not be the target of local flow. |
-| ir.cpp:756:8:756:8 | middle_s [inner post update] | PostUpdateNode should not be the target of local flow. |
-| ir.cpp:765:8:765:8 | derived_s [inner post update] | PostUpdateNode should not be the target of local flow. |
 | ir.cpp:811:7:811:13 | call to Base | PostUpdateNode should not be the target of local flow. |
 | ir.cpp:812:7:812:26 | call to Base | PostUpdateNode should not be the target of local flow. |
 | ir.cpp:825:7:825:13 | call to Base | PostUpdateNode should not be the target of local flow. |
@@ -97,7 +76,6 @@ postWithInFlow
 | misc.c:130:7:130:7 | i [post update] | PostUpdateNode should not be the target of local flow. |
 | misc.c:131:9:131:9 | i [post update] | PostUpdateNode should not be the target of local flow. |
 | misc.c:220:3:220:5 | * ... [post update] | PostUpdateNode should not be the target of local flow. |
-| misc.c:220:4:220:5 | sp [inner post update] | PostUpdateNode should not be the target of local flow. |
 | static_init_templates.cpp:3:2:3:4 | ref [post update] | PostUpdateNode should not be the target of local flow. |
 | static_init_templates.cpp:21:2:21:4 | val [post update] | PostUpdateNode should not be the target of local flow. |
 | try_catch.cpp:7:8:7:8 | call to exception | PostUpdateNode should not be the target of local flow. |
diff --git a/cpp/ql/test/library-tests/typedefs/Typedefs2.expected b/cpp/ql/test/library-tests/typedefs/Typedefs2.expected
index 8645ce97fcd..d83c74bb55e 100644
--- a/cpp/ql/test/library-tests/typedefs/Typedefs2.expected
+++ b/cpp/ql/test/library-tests/typedefs/Typedefs2.expected
@@ -1,2 +1,2 @@
-| typedefs.cpp:6:6:6:7 | f1 | typedefs.cpp:8:15:8:18 | TYPE | CTypedefType, LocalTypedefType |
-| typedefs.cpp:6:6:6:7 | f1 | typedefs.cpp:9:9:9:9 | D | DirectAccessHolder, LocalClass, MetricClass, StructLikeClass |
+| typedefs.cpp:6:6:6:7 | f1 | typedefs.cpp:8:15:8:18 | TYPE | CTypedefType, GuardConditionImpl, LocalTypedefType |
+| typedefs.cpp:6:6:6:7 | f1 | typedefs.cpp:9:9:9:9 | D | DirectAccessHolder, GuardConditionImpl, LocalClass, MetricClass, StructLikeClass |
diff --git a/cpp/ql/test/library-tests/types/__wchar_t/wchar_t.expected b/cpp/ql/test/library-tests/types/__wchar_t/wchar_t.expected
index d4c429faf17..d7faa82d924 100644
--- a/cpp/ql/test/library-tests/types/__wchar_t/wchar_t.expected
+++ b/cpp/ql/test/library-tests/types/__wchar_t/wchar_t.expected
@@ -1,3 +1,3 @@
-| file://:0:0:0:0 | __wchar_t * | IteratorByPointer, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection, PointerType | Wchar_t, WideCharType |
-| file://:0:0:0:0 | const __wchar_t | SpecifiedType | Wchar_t, WideCharType |
-| file://:0:0:0:0 | wchar_t | Wchar_t, WideCharType |  |
+| file://:0:0:0:0 | __wchar_t * | GuardConditionImpl, IteratorByPointer, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection, PointerType | GuardConditionImpl, Wchar_t, WideCharType |
+| file://:0:0:0:0 | const __wchar_t | GuardConditionImpl, SpecifiedType | GuardConditionImpl, Wchar_t, WideCharType |
+| file://:0:0:0:0 | wchar_t | GuardConditionImpl, Wchar_t, WideCharType |  |
diff --git a/cpp/ql/test/library-tests/types/cstd_types/cstd_types_fastestminimumwidth.expected b/cpp/ql/test/library-tests/types/cstd_types/cstd_types_fastestminimumwidth.expected
index 13fe25a4819..5eb5868fd8b 100644
--- a/cpp/ql/test/library-tests/types/cstd_types/cstd_types_fastestminimumwidth.expected
+++ b/cpp/ql/test/library-tests/types/cstd_types/cstd_types_fastestminimumwidth.expected
@@ -1,8 +1,8 @@
-| cstd_types.cpp:47:13:47:15 | if8 | CTypedefType, FastestMinimumWidthIntegralType, Int_fast8_t |
-| cstd_types.cpp:48:14:48:17 | if16 | CTypedefType, FastestMinimumWidthIntegralType, Int_fast16_t |
-| cstd_types.cpp:49:14:49:17 | if32 | CTypedefType, FastestMinimumWidthIntegralType, Int_fast32_t |
-| cstd_types.cpp:50:14:50:17 | if64 | CTypedefType, FastestMinimumWidthIntegralType, Int_fast64_t |
-| cstd_types.cpp:51:14:51:16 | uf8 | CTypedefType, FastestMinimumWidthIntegralType, UInt_fast8_t |
-| cstd_types.cpp:52:15:52:18 | uf16 | CTypedefType, FastestMinimumWidthIntegralType, UInt_fast16_t |
-| cstd_types.cpp:53:15:53:18 | uf32 | CTypedefType, FastestMinimumWidthIntegralType, UInt_fast32_t |
-| cstd_types.cpp:54:15:54:18 | uf64 | CTypedefType, FastestMinimumWidthIntegralType, UInt_fast64_t |
\ No newline at end of file
+| cstd_types.cpp:47:13:47:15 | if8 | CTypedefType, FastestMinimumWidthIntegralType, GuardConditionImpl, Int_fast8_t |
+| cstd_types.cpp:48:14:48:17 | if16 | CTypedefType, FastestMinimumWidthIntegralType, GuardConditionImpl, Int_fast16_t |
+| cstd_types.cpp:49:14:49:17 | if32 | CTypedefType, FastestMinimumWidthIntegralType, GuardConditionImpl, Int_fast32_t |
+| cstd_types.cpp:50:14:50:17 | if64 | CTypedefType, FastestMinimumWidthIntegralType, GuardConditionImpl, Int_fast64_t |
+| cstd_types.cpp:51:14:51:16 | uf8 | CTypedefType, FastestMinimumWidthIntegralType, GuardConditionImpl, UInt_fast8_t |
+| cstd_types.cpp:52:15:52:18 | uf16 | CTypedefType, FastestMinimumWidthIntegralType, GuardConditionImpl, UInt_fast16_t |
+| cstd_types.cpp:53:15:53:18 | uf32 | CTypedefType, FastestMinimumWidthIntegralType, GuardConditionImpl, UInt_fast32_t |
+| cstd_types.cpp:54:15:54:18 | uf64 | CTypedefType, FastestMinimumWidthIntegralType, GuardConditionImpl, UInt_fast64_t |
diff --git a/cpp/ql/test/library-tests/types/cstd_types/cstd_types_fixedwidth.expected b/cpp/ql/test/library-tests/types/cstd_types/cstd_types_fixedwidth.expected
index d1c64343636..efa8890d820 100644
--- a/cpp/ql/test/library-tests/types/cstd_types/cstd_types_fixedwidth.expected
+++ b/cpp/ql/test/library-tests/types/cstd_types/cstd_types_fixedwidth.expected
@@ -1,8 +1,8 @@
-| cstd_types.cpp:31:8:31:9 | i8 | CTypedefType, FixedWidthIntegralType, Int8_t |
-| cstd_types.cpp:32:9:32:11 | i16 | CTypedefType, FixedWidthIntegralType, Int16_t |
-| cstd_types.cpp:33:9:33:11 | i32 | CTypedefType, FixedWidthIntegralType, Int32_t |
-| cstd_types.cpp:34:9:34:11 | i64 | CTypedefType, FixedWidthIntegralType, Int64_t |
-| cstd_types.cpp:35:9:35:11 | ui8 | CTypedefType, FixedWidthIntegralType, UInt8_t |
-| cstd_types.cpp:36:10:36:13 | ui16 | CTypedefType, FixedWidthIntegralType, UInt16_t |
-| cstd_types.cpp:37:10:37:13 | ui32 | CTypedefType, FixedWidthIntegralType, UInt32_t |
-| cstd_types.cpp:38:10:38:13 | ui64 | CTypedefType, FixedWidthIntegralType, UInt64_t |
+| cstd_types.cpp:31:8:31:9 | i8 | CTypedefType, FixedWidthIntegralType, GuardConditionImpl, Int8_t |
+| cstd_types.cpp:32:9:32:11 | i16 | CTypedefType, FixedWidthIntegralType, GuardConditionImpl, Int16_t |
+| cstd_types.cpp:33:9:33:11 | i32 | CTypedefType, FixedWidthIntegralType, GuardConditionImpl, Int32_t |
+| cstd_types.cpp:34:9:34:11 | i64 | CTypedefType, FixedWidthIntegralType, GuardConditionImpl, Int64_t |
+| cstd_types.cpp:35:9:35:11 | ui8 | CTypedefType, FixedWidthIntegralType, GuardConditionImpl, UInt8_t |
+| cstd_types.cpp:36:10:36:13 | ui16 | CTypedefType, FixedWidthIntegralType, GuardConditionImpl, UInt16_t |
+| cstd_types.cpp:37:10:37:13 | ui32 | CTypedefType, FixedWidthIntegralType, GuardConditionImpl, UInt32_t |
+| cstd_types.cpp:38:10:38:13 | ui64 | CTypedefType, FixedWidthIntegralType, GuardConditionImpl, UInt64_t |
diff --git a/cpp/ql/test/library-tests/types/cstd_types/cstd_types_fixedwidthenum.expected b/cpp/ql/test/library-tests/types/cstd_types/cstd_types_fixedwidthenum.expected
index d9884b22b00..89428e7a6ec 100644
--- a/cpp/ql/test/library-tests/types/cstd_types/cstd_types_fixedwidthenum.expected
+++ b/cpp/ql/test/library-tests/types/cstd_types/cstd_types_fixedwidthenum.expected
@@ -1,2 +1,2 @@
-| cstd_types.cpp:74:4:74:6 | _e0 | Enum, FixedWidthEnumType |
-| cstd_types.cpp:75:4:75:6 | _e1 | FixedWidthEnumType, ScopedEnum |
+| cstd_types.cpp:74:4:74:6 | _e0 | Enum, FixedWidthEnumType, GuardConditionImpl |
+| cstd_types.cpp:75:4:75:6 | _e1 | FixedWidthEnumType, GuardConditionImpl, ScopedEnum |
diff --git a/cpp/ql/test/library-tests/types/cstd_types/cstd_types_maximumwidth.expected b/cpp/ql/test/library-tests/types/cstd_types/cstd_types_maximumwidth.expected
index 0bf7779fcaf..b57ca4fb936 100644
--- a/cpp/ql/test/library-tests/types/cstd_types/cstd_types_maximumwidth.expected
+++ b/cpp/ql/test/library-tests/types/cstd_types/cstd_types_maximumwidth.expected
@@ -1,2 +1,2 @@
-| cstd_types.cpp:55:10:55:11 | im | CTypedefType, Intmax_t, MaximumWidthIntegralType |
-| cstd_types.cpp:56:11:56:13 | uim | CTypedefType, MaximumWidthIntegralType, Uintmax_t |
+| cstd_types.cpp:55:10:55:11 | im | CTypedefType, GuardConditionImpl, Intmax_t, MaximumWidthIntegralType |
+| cstd_types.cpp:56:11:56:13 | uim | CTypedefType, GuardConditionImpl, MaximumWidthIntegralType, Uintmax_t |
diff --git a/cpp/ql/test/library-tests/types/cstd_types/cstd_types_minimumwidth.expected b/cpp/ql/test/library-tests/types/cstd_types/cstd_types_minimumwidth.expected
index 2984f07be8c..6aea5947473 100644
--- a/cpp/ql/test/library-tests/types/cstd_types/cstd_types_minimumwidth.expected
+++ b/cpp/ql/test/library-tests/types/cstd_types/cstd_types_minimumwidth.expected
@@ -1,8 +1,8 @@
-| cstd_types.cpp:39:15:39:16 | l8 | CTypedefType, Int_least8_t, MinimumWidthIntegralType |
-| cstd_types.cpp:40:15:40:17 | l16 | CTypedefType, Int_least16_t, MinimumWidthIntegralType |
-| cstd_types.cpp:41:15:41:17 | l32 | CTypedefType, Int_least32_t, MinimumWidthIntegralType |
-| cstd_types.cpp:42:15:42:17 | l64 | CTypedefType, Int_least64_t, MinimumWidthIntegralType |
-| cstd_types.cpp:43:15:43:17 | ul8 | CTypedefType, MinimumWidthIntegralType, UInt_least8_t |
-| cstd_types.cpp:44:16:44:19 | ul16 | CTypedefType, MinimumWidthIntegralType, UInt_least16_t |
-| cstd_types.cpp:45:16:45:19 | ul32 | CTypedefType, MinimumWidthIntegralType, UInt_least32_t |
-| cstd_types.cpp:46:16:46:19 | ul64 | CTypedefType, MinimumWidthIntegralType, UInt_least64_t |
+| cstd_types.cpp:39:15:39:16 | l8 | CTypedefType, GuardConditionImpl, Int_least8_t, MinimumWidthIntegralType |
+| cstd_types.cpp:40:15:40:17 | l16 | CTypedefType, GuardConditionImpl, Int_least16_t, MinimumWidthIntegralType |
+| cstd_types.cpp:41:15:41:17 | l32 | CTypedefType, GuardConditionImpl, Int_least32_t, MinimumWidthIntegralType |
+| cstd_types.cpp:42:15:42:17 | l64 | CTypedefType, GuardConditionImpl, Int_least64_t, MinimumWidthIntegralType |
+| cstd_types.cpp:43:15:43:17 | ul8 | CTypedefType, GuardConditionImpl, MinimumWidthIntegralType, UInt_least8_t |
+| cstd_types.cpp:44:16:44:19 | ul16 | CTypedefType, GuardConditionImpl, MinimumWidthIntegralType, UInt_least16_t |
+| cstd_types.cpp:45:16:45:19 | ul32 | CTypedefType, GuardConditionImpl, MinimumWidthIntegralType, UInt_least32_t |
+| cstd_types.cpp:46:16:46:19 | ul64 | CTypedefType, GuardConditionImpl, MinimumWidthIntegralType, UInt_least64_t |
diff --git a/cpp/ql/test/library-tests/types/integral_types_ms/vars.expected b/cpp/ql/test/library-tests/types/integral_types_ms/vars.expected
index d2aac7454fd..1f168f7f942 100644
--- a/cpp/ql/test/library-tests/types/integral_types_ms/vars.expected
+++ b/cpp/ql/test/library-tests/types/integral_types_ms/vars.expected
@@ -1,4 +1,4 @@
-| integral_types.cpp:2:8:2:9 | i8 | file://:0:0:0:0 | char | MicrosoftInt8Type, PlainCharType |
-| integral_types.cpp:3:9:3:11 | i16 | file://:0:0:0:0 | short | MicrosoftInt16Type, ShortType |
-| integral_types.cpp:4:9:4:11 | i32 | file://:0:0:0:0 | int | IntType, MicrosoftInt32Type |
-| integral_types.cpp:5:9:5:11 | i64 | file://:0:0:0:0 | long long | LongLongType, MicrosoftInt64Type |
+| integral_types.cpp:2:8:2:9 | i8 | file://:0:0:0:0 | char | GuardConditionImpl, MicrosoftInt8Type, PlainCharType |
+| integral_types.cpp:3:9:3:11 | i16 | file://:0:0:0:0 | short | GuardConditionImpl, MicrosoftInt16Type, ShortType |
+| integral_types.cpp:4:9:4:11 | i32 | file://:0:0:0:0 | int | GuardConditionImpl, IntType, MicrosoftInt32Type |
+| integral_types.cpp:5:9:5:11 | i64 | file://:0:0:0:0 | long long | GuardConditionImpl, LongLongType, MicrosoftInt64Type |
diff --git a/cpp/ql/test/library-tests/types/wchar_t_typedef/wchar_t.expected b/cpp/ql/test/library-tests/types/wchar_t_typedef/wchar_t.expected
index cebaff30994..c823ed839d3 100644
--- a/cpp/ql/test/library-tests/types/wchar_t_typedef/wchar_t.expected
+++ b/cpp/ql/test/library-tests/types/wchar_t_typedef/wchar_t.expected
@@ -1,3 +1,3 @@
-| file://:0:0:0:0 | wchar_t | Wchar_t, WideCharType |  |
-| file://:0:0:0:0 | wchar_t * | IteratorByPointer, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection, PointerType | CTypedefType, Wchar_t |
-| ms.c:2:24:2:30 | wchar_t | CTypedefType, Wchar_t |  |
+| file://:0:0:0:0 | wchar_t | GuardConditionImpl, Wchar_t, WideCharType |  |
+| file://:0:0:0:0 | wchar_t * | GuardConditionImpl, IteratorByPointer, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection, PointerType | CTypedefType, GuardConditionImpl, Wchar_t |
+| ms.c:2:24:2:30 | wchar_t | CTypedefType, GuardConditionImpl, Wchar_t |  |
diff --git a/cpp/ql/test/library-tests/variables/variables/types.expected b/cpp/ql/test/library-tests/variables/variables/types.expected
index c2ea5f7cfe3..5d8cec1cff8 100644
--- a/cpp/ql/test/library-tests/variables/variables/types.expected
+++ b/cpp/ql/test/library-tests/variables/variables/types.expected
@@ -1,108 +1,108 @@
-| ..()(..) | RoutineType |  |  |  |  |
-| ..(*)(..) | FunctionPointerType |  | ..()(..) |  |  |
-| _Complex _Float16 | BinaryFloatingPointType, ComplexNumberType |  |  |  |  |
-| _Complex _Float32 | BinaryFloatingPointType, ComplexNumberType |  |  |  |  |
-| _Complex _Float32x | BinaryFloatingPointType, ComplexNumberType |  |  |  |  |
-| _Complex _Float64 | BinaryFloatingPointType, ComplexNumberType |  |  |  |  |
-| _Complex _Float64x | BinaryFloatingPointType, ComplexNumberType |  |  |  |  |
-| _Complex _Float128 | BinaryFloatingPointType, ComplexNumberType |  |  |  |  |
-| _Complex __bf16 | BinaryFloatingPointType, ComplexNumberType |  |  |  |  |
-| _Complex __float128 | BinaryFloatingPointType, ComplexNumberType |  |  |  |  |
-| _Complex __fp16 | BinaryFloatingPointType, ComplexNumberType |  |  |  |  |
-| _Complex double | BinaryFloatingPointType, ComplexNumberType |  |  |  |  |
-| _Complex float | BinaryFloatingPointType, ComplexNumberType |  |  |  |  |
-| _Complex long double | BinaryFloatingPointType, ComplexNumberType |  |  |  |  |
-| _Complex std::float16_t | BinaryFloatingPointType, ComplexNumberType |  |  |  |  |
-| _Decimal32 | Decimal32Type |  |  |  |  |
-| _Decimal64 | Decimal64Type |  |  |  |  |
-| _Decimal128 | Decimal128Type |  |  |  |  |
-| _Float16 | BinaryFloatingPointType, RealNumberType |  |  |  |  |
-| _Float32 | BinaryFloatingPointType, RealNumberType |  |  |  |  |
-| _Float32x | BinaryFloatingPointType, RealNumberType |  |  |  |  |
-| _Float64 | BinaryFloatingPointType, RealNumberType |  |  |  |  |
-| _Float64x | BinaryFloatingPointType, RealNumberType |  |  |  |  |
-| _Float128 | BinaryFloatingPointType, RealNumberType |  |  |  |  |
-| _Imaginary double | BinaryFloatingPointType, ImaginaryNumberType |  |  |  |  |
-| _Imaginary float | BinaryFloatingPointType, ImaginaryNumberType |  |  |  |  |
-| _Imaginary long double | BinaryFloatingPointType, ImaginaryNumberType |  |  |  |  |
-| __SVCount_t | ScalableVectorCount |  |  |  |  |
-| __bf16 | BinaryFloatingPointType, RealNumberType |  |  |  |  |
-| __float128 | Float128Type |  |  |  |  |
-| __fp16 | BinaryFloatingPointType, RealNumberType |  |  |  |  |
-| __int128 | Int128Type |  |  |  |  |
-| __mfp8 | BinaryFloatingPointType, RealNumberType |  |  |  |  |
-| __va_list_tag | DirectAccessHolder, MetricClass, Struct, StructLikeClass |  |  |  |  |
-| __va_list_tag & | LValueReferenceType, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection |  | __va_list_tag |  |  |
-| __va_list_tag && | PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection, RValueReferenceType |  | __va_list_tag |  |  |
-| address | DirectAccessHolder, MetricClass, Struct, StructLikeClass |  |  |  |  |
-| address & | LValueReferenceType, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection |  | address |  |  |
-| address && | PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection, RValueReferenceType |  | address |  |  |
-| auto | AutoType |  |  |  |  |
-| bool | BoolType |  |  |  |  |
-| char | MicrosoftInt8Type, PlainCharType |  |  |  |  |
-| char8_t | Char8Type |  |  |  |  |
-| char16_t | Char16Type |  |  |  |  |
-| char32_t | Char32Type |  |  |  |  |
-| char * | CharPointerType, IteratorByPointer, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection |  | char |  |  |
-| char *[3] | ArrayType, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection | char * | char * |  |  |
-| char *[32] | ArrayType, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection | char * | char * |  |  |
-| char *[] | ArrayType, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection | char * | char * |  |  |
-| char[2] | ArrayType, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection | char | char |  |  |
-| char[3] | ArrayType, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection | char | char |  |  |
-| char[5] | ArrayType, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection | char | char |  |  |
-| char[6] | ArrayType, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection | char | char |  |  |
-| char[8] | ArrayType, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection | char | char |  |  |
-| char[9] | ArrayType, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection | char | char |  |  |
-| char[10] | ArrayType, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection | char | char |  |  |
-| char[53] | ArrayType, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection | char | char |  |  |
-| char[] | ArrayType, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection | char | char |  |  |
-| const __va_list_tag | SpecifiedType |  | __va_list_tag |  |  |
-| const __va_list_tag & | LValueReferenceType, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection |  | const __va_list_tag |  |  |
-| const address | SpecifiedType |  | address |  |  |
-| const address & | LValueReferenceType, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection |  | const address |  |  |
-| const char | SpecifiedType |  | char |  |  |
-| const char * | IteratorByPointer, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection, PointerType |  | const char |  |  |
-| const char *[3] | ArrayType, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection | const char * | const char * |  |  |
-| const char *[] | ArrayType, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection | const char * | const char * |  |  |
-| const char[5] | ArrayType, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection | const char | const char |  |  |
-| const char[6] | ArrayType, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection | const char | const char |  |  |
-| const char[8] | ArrayType, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection | const char | const char |  |  |
-| const char[9] | ArrayType, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection | const char | const char |  |  |
-| const char[10] | ArrayType, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection | const char | const char |  |  |
-| const char[53] | ArrayType, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection | const char | const char |  |  |
-| const double | SpecifiedType |  | double |  |  |
-| const int | SpecifiedType |  | int |  |  |
-| decltype(nullptr) | NullPointerType |  |  |  |  |
-| double | DoubleType |  |  |  |  |
-| error | ErroneousType |  |  |  |  |
-| float | FloatType |  |  |  |  |
-| float[3] | ArrayType, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection | float | float |  |  |
-| int | IntType, MicrosoftInt32Type |  |  |  |  |
-| int * | IntPointerType, IteratorByPointer, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection |  | int |  |  |
-| int[4] | ArrayType, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection | int | int |  |  |
-| int[8] | ArrayType, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection | int | int |  |  |
-| int[10] | ArrayType, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection | int | int |  |  |
-| int[10][20] | ArrayType, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection | int[20] | int[20] |  |  |
-| int[20] | ArrayType, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection | int | int |  |  |
-| int[] | ArrayType, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection | int | int |  |  |
-| long | LongType |  |  |  |  |
-| long double | LongDoubleType |  |  |  |  |
-| long long | LongLongType, MicrosoftInt64Type |  |  |  |  |
-| short | MicrosoftInt16Type, ShortType |  |  |  |  |
-| signed __int128 | Int128Type |  |  |  |  |
-| signed char | SignedCharType |  |  |  |  |
-| signed int | IntType |  |  |  |  |
-| signed long | LongType |  |  |  |  |
-| signed long long | LongLongType |  |  |  |  |
-| signed short | ShortType |  |  |  |  |
-| std::float16_t | BinaryFloatingPointType, RealNumberType |  |  |  |  |
-| unknown | UnknownType |  |  |  |  |
-| unsigned __int128 | Int128Type |  |  |  | unsigned integral |
-| unsigned char | UnsignedCharType |  |  |  | unsigned integral |
-| unsigned int | IntType |  |  | unsigned int | unsigned integral |
-| unsigned long | LongType |  |  |  | unsigned integral |
-| unsigned long long | LongLongType |  |  |  | unsigned integral |
-| unsigned short | ShortType |  |  |  | unsigned integral |
-| void | VoidType |  |  |  |  |
-| void * | IteratorByPointer, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection, VoidPointerType |  | void |  |  |
-| wchar_t | Wchar_t, WideCharType |  |  |  |  |
+| ..()(..) | GuardConditionImpl, RoutineType |  |  |  |  |
+| ..(*)(..) | FunctionPointerType, GuardConditionImpl |  | ..()(..) |  |  |
+| _Complex _Float16 | BinaryFloatingPointType, ComplexNumberType, GuardConditionImpl |  |  |  |  |
+| _Complex _Float32 | BinaryFloatingPointType, ComplexNumberType, GuardConditionImpl |  |  |  |  |
+| _Complex _Float32x | BinaryFloatingPointType, ComplexNumberType, GuardConditionImpl |  |  |  |  |
+| _Complex _Float64 | BinaryFloatingPointType, ComplexNumberType, GuardConditionImpl |  |  |  |  |
+| _Complex _Float64x | BinaryFloatingPointType, ComplexNumberType, GuardConditionImpl |  |  |  |  |
+| _Complex _Float128 | BinaryFloatingPointType, ComplexNumberType, GuardConditionImpl |  |  |  |  |
+| _Complex __bf16 | BinaryFloatingPointType, ComplexNumberType, GuardConditionImpl |  |  |  |  |
+| _Complex __float128 | BinaryFloatingPointType, ComplexNumberType, GuardConditionImpl |  |  |  |  |
+| _Complex __fp16 | BinaryFloatingPointType, ComplexNumberType, GuardConditionImpl |  |  |  |  |
+| _Complex double | BinaryFloatingPointType, ComplexNumberType, GuardConditionImpl |  |  |  |  |
+| _Complex float | BinaryFloatingPointType, ComplexNumberType, GuardConditionImpl |  |  |  |  |
+| _Complex long double | BinaryFloatingPointType, ComplexNumberType, GuardConditionImpl |  |  |  |  |
+| _Complex std::float16_t | BinaryFloatingPointType, ComplexNumberType, GuardConditionImpl |  |  |  |  |
+| _Decimal32 | Decimal32Type, GuardConditionImpl |  |  |  |  |
+| _Decimal64 | Decimal64Type, GuardConditionImpl |  |  |  |  |
+| _Decimal128 | Decimal128Type, GuardConditionImpl |  |  |  |  |
+| _Float16 | BinaryFloatingPointType, GuardConditionImpl, RealNumberType |  |  |  |  |
+| _Float32 | BinaryFloatingPointType, GuardConditionImpl, RealNumberType |  |  |  |  |
+| _Float32x | BinaryFloatingPointType, GuardConditionImpl, RealNumberType |  |  |  |  |
+| _Float64 | BinaryFloatingPointType, GuardConditionImpl, RealNumberType |  |  |  |  |
+| _Float64x | BinaryFloatingPointType, GuardConditionImpl, RealNumberType |  |  |  |  |
+| _Float128 | BinaryFloatingPointType, GuardConditionImpl, RealNumberType |  |  |  |  |
+| _Imaginary double | BinaryFloatingPointType, GuardConditionImpl, ImaginaryNumberType |  |  |  |  |
+| _Imaginary float | BinaryFloatingPointType, GuardConditionImpl, ImaginaryNumberType |  |  |  |  |
+| _Imaginary long double | BinaryFloatingPointType, GuardConditionImpl, ImaginaryNumberType |  |  |  |  |
+| __SVCount_t | GuardConditionImpl, ScalableVectorCount |  |  |  |  |
+| __bf16 | BinaryFloatingPointType, GuardConditionImpl, RealNumberType |  |  |  |  |
+| __float128 | Float128Type, GuardConditionImpl |  |  |  |  |
+| __fp16 | BinaryFloatingPointType, GuardConditionImpl, RealNumberType |  |  |  |  |
+| __int128 | GuardConditionImpl, Int128Type |  |  |  |  |
+| __mfp8 | BinaryFloatingPointType, GuardConditionImpl, RealNumberType |  |  |  |  |
+| __va_list_tag | DirectAccessHolder, GuardConditionImpl, MetricClass, Struct, StructLikeClass |  |  |  |  |
+| __va_list_tag & | GuardConditionImpl, LValueReferenceType, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection |  | __va_list_tag |  |  |
+| __va_list_tag && | GuardConditionImpl, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection, RValueReferenceType |  | __va_list_tag |  |  |
+| address | DirectAccessHolder, GuardConditionImpl, MetricClass, Struct, StructLikeClass |  |  |  |  |
+| address & | GuardConditionImpl, LValueReferenceType, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection |  | address |  |  |
+| address && | GuardConditionImpl, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection, RValueReferenceType |  | address |  |  |
+| auto | AutoType, GuardConditionImpl |  |  |  |  |
+| bool | BoolType, GuardConditionImpl |  |  |  |  |
+| char | GuardConditionImpl, MicrosoftInt8Type, PlainCharType |  |  |  |  |
+| char8_t | Char8Type, GuardConditionImpl |  |  |  |  |
+| char16_t | Char16Type, GuardConditionImpl |  |  |  |  |
+| char32_t | Char32Type, GuardConditionImpl |  |  |  |  |
+| char * | CharPointerType, GuardConditionImpl, IteratorByPointer, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection |  | char |  |  |
+| char *[3] | ArrayType, GuardConditionImpl, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection | char * | char * |  |  |
+| char *[32] | ArrayType, GuardConditionImpl, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection | char * | char * |  |  |
+| char *[] | ArrayType, GuardConditionImpl, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection | char * | char * |  |  |
+| char[2] | ArrayType, GuardConditionImpl, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection | char | char |  |  |
+| char[3] | ArrayType, GuardConditionImpl, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection | char | char |  |  |
+| char[5] | ArrayType, GuardConditionImpl, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection | char | char |  |  |
+| char[6] | ArrayType, GuardConditionImpl, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection | char | char |  |  |
+| char[8] | ArrayType, GuardConditionImpl, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection | char | char |  |  |
+| char[9] | ArrayType, GuardConditionImpl, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection | char | char |  |  |
+| char[10] | ArrayType, GuardConditionImpl, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection | char | char |  |  |
+| char[53] | ArrayType, GuardConditionImpl, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection | char | char |  |  |
+| char[] | ArrayType, GuardConditionImpl, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection | char | char |  |  |
+| const __va_list_tag | GuardConditionImpl, SpecifiedType |  | __va_list_tag |  |  |
+| const __va_list_tag & | GuardConditionImpl, LValueReferenceType, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection |  | const __va_list_tag |  |  |
+| const address | GuardConditionImpl, SpecifiedType |  | address |  |  |
+| const address & | GuardConditionImpl, LValueReferenceType, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection |  | const address |  |  |
+| const char | GuardConditionImpl, SpecifiedType |  | char |  |  |
+| const char * | GuardConditionImpl, IteratorByPointer, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection, PointerType |  | const char |  |  |
+| const char *[3] | ArrayType, GuardConditionImpl, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection | const char * | const char * |  |  |
+| const char *[] | ArrayType, GuardConditionImpl, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection | const char * | const char * |  |  |
+| const char[5] | ArrayType, GuardConditionImpl, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection | const char | const char |  |  |
+| const char[6] | ArrayType, GuardConditionImpl, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection | const char | const char |  |  |
+| const char[8] | ArrayType, GuardConditionImpl, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection | const char | const char |  |  |
+| const char[9] | ArrayType, GuardConditionImpl, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection | const char | const char |  |  |
+| const char[10] | ArrayType, GuardConditionImpl, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection | const char | const char |  |  |
+| const char[53] | ArrayType, GuardConditionImpl, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection | const char | const char |  |  |
+| const double | GuardConditionImpl, SpecifiedType |  | double |  |  |
+| const int | GuardConditionImpl, SpecifiedType |  | int |  |  |
+| decltype(nullptr) | GuardConditionImpl, NullPointerType |  |  |  |  |
+| double | DoubleType, GuardConditionImpl |  |  |  |  |
+| error | ErroneousType, GuardConditionImpl |  |  |  |  |
+| float | FloatType, GuardConditionImpl |  |  |  |  |
+| float[3] | ArrayType, GuardConditionImpl, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection | float | float |  |  |
+| int | GuardConditionImpl, IntType, MicrosoftInt32Type |  |  |  |  |
+| int * | GuardConditionImpl, IntPointerType, IteratorByPointer, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection |  | int |  |  |
+| int[4] | ArrayType, GuardConditionImpl, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection | int | int |  |  |
+| int[8] | ArrayType, GuardConditionImpl, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection | int | int |  |  |
+| int[10] | ArrayType, GuardConditionImpl, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection | int | int |  |  |
+| int[10][20] | ArrayType, GuardConditionImpl, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection | int[20] | int[20] |  |  |
+| int[20] | ArrayType, GuardConditionImpl, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection | int | int |  |  |
+| int[] | ArrayType, GuardConditionImpl, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection | int | int |  |  |
+| long | GuardConditionImpl, LongType |  |  |  |  |
+| long double | GuardConditionImpl, LongDoubleType |  |  |  |  |
+| long long | GuardConditionImpl, LongLongType, MicrosoftInt64Type |  |  |  |  |
+| short | GuardConditionImpl, MicrosoftInt16Type, ShortType |  |  |  |  |
+| signed __int128 | GuardConditionImpl, Int128Type |  |  |  |  |
+| signed char | GuardConditionImpl, SignedCharType |  |  |  |  |
+| signed int | GuardConditionImpl, IntType |  |  |  |  |
+| signed long | GuardConditionImpl, LongType |  |  |  |  |
+| signed long long | GuardConditionImpl, LongLongType |  |  |  |  |
+| signed short | GuardConditionImpl, ShortType |  |  |  |  |
+| std::float16_t | BinaryFloatingPointType, GuardConditionImpl, RealNumberType |  |  |  |  |
+| unknown | GuardConditionImpl, UnknownType |  |  |  |  |
+| unsigned __int128 | GuardConditionImpl, Int128Type |  |  |  | unsigned integral |
+| unsigned char | GuardConditionImpl, UnsignedCharType |  |  |  | unsigned integral |
+| unsigned int | GuardConditionImpl, IntType |  |  | unsigned int | unsigned integral |
+| unsigned long | GuardConditionImpl, LongType |  |  |  | unsigned integral |
+| unsigned long long | GuardConditionImpl, LongLongType |  |  |  | unsigned integral |
+| unsigned short | GuardConditionImpl, ShortType |  |  |  | unsigned integral |
+| void | GuardConditionImpl, VoidType |  |  |  |  |
+| void * | GuardConditionImpl, IteratorByPointer, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection, VoidPointerType |  | void |  |  |
+| wchar_t | GuardConditionImpl, Wchar_t, WideCharType |  |  |  |  |
diff --git a/cpp/ql/test/query-tests/Best Practices/SloppyGlobal/SloppyGlobal.expected b/cpp/ql/test/query-tests/Best Practices/SloppyGlobal/SloppyGlobal.expected
index 692f7d81cd6..ceccd95ea3c 100644
--- a/cpp/ql/test/query-tests/Best Practices/SloppyGlobal/SloppyGlobal.expected	
+++ b/cpp/ql/test/query-tests/Best Practices/SloppyGlobal/SloppyGlobal.expected	
@@ -1,2 +1,7 @@
 | main.cpp:3:5:3:5 | x | Poor global variable name 'x'. Prefer longer, descriptive names for globals (eg. kMyGlobalConstant, not foo). |
 | main.cpp:4:5:4:6 | ys | Poor global variable name 'ys'. Prefer longer, descriptive names for globals (eg. kMyGlobalConstant, not foo). |
+| main.cpp:9:5:9:6 | v1 | Poor global variable name 'v1'. Prefer longer, descriptive names for globals (eg. kMyGlobalConstant, not foo). |
+| main.cpp:10:5:10:6 | v2 | Poor global variable name 'v2'. Prefer longer, descriptive names for globals (eg. kMyGlobalConstant, not foo). |
+| main.cpp:12:5:12:5 | v3 | Poor global variable name 'v3'. Prefer longer, descriptive names for globals (eg. kMyGlobalConstant, not foo). |
+| main.cpp:14:5:14:5 | v4 | Poor global variable name 'v4'. Prefer longer, descriptive names for globals (eg. kMyGlobalConstant, not foo). |
+| main.cpp:16:5:16:5 | v5 | Poor global variable name 'v5'. Prefer longer, descriptive names for globals (eg. kMyGlobalConstant, not foo). |
diff --git a/cpp/ql/test/query-tests/Best Practices/SloppyGlobal/main.cpp b/cpp/ql/test/query-tests/Best Practices/SloppyGlobal/main.cpp
index 1b1b7ee0280..e279fbf0257 100644
--- a/cpp/ql/test/query-tests/Best Practices/SloppyGlobal/main.cpp	
+++ b/cpp/ql/test/query-tests/Best Practices/SloppyGlobal/main.cpp	
@@ -5,3 +5,19 @@ int ys[1000000]; // BAD: too short
 int descriptive_name; // GOOD: sufficient
 
 static int z; // GOOD: not a global
+
+int v1; // BAD: too short
+int v2; // BAD: too short
+template <typename T>
+T v3; // BAD: too short
+template <typename T>
+T v4; // BAD: too short
+template <typename T>
+T v5; // BAD: too short
+
+void use_some_fs() {
+    v2 = 100;
+    v4<int> = 200;
+    v5<int> = 300;
+    v5<const char *> = "string";
+}
diff --git a/cpp/ql/test/query-tests/Critical/MissingCheckScanf/IncorrectCheckScanf.expected b/cpp/ql/test/query-tests/Critical/MissingCheckScanf/IncorrectCheckScanf.expected
index c0ed43fee9b..1591a287d9f 100644
--- a/cpp/ql/test/query-tests/Critical/MissingCheckScanf/IncorrectCheckScanf.expected
+++ b/cpp/ql/test/query-tests/Critical/MissingCheckScanf/IncorrectCheckScanf.expected
@@ -1,5 +1,6 @@
 | test.cpp:162:7:162:11 | call to scanf | The result of scanf is only checked against 0, but it can also return EOF. |
 | test.cpp:171:7:171:11 | call to scanf | The result of scanf is only checked against 0, but it can also return EOF. |
+| test.cpp:193:7:193:11 | call to scanf | The result of scanf is only checked against 0, but it can also return EOF. |
 | test.cpp:204:7:204:11 | call to scanf | The result of scanf is only checked against 0, but it can also return EOF. |
 | test.cpp:436:7:436:11 | call to scanf | The result of scanf is only checked against 0, but it can also return EOF. |
 | test.cpp:443:11:443:15 | call to scanf | The result of scanf is only checked against 0, but it can also return EOF. |
diff --git a/cpp/ql/test/query-tests/Critical/MissingCheckScanf/MissingCheckScanf.expected b/cpp/ql/test/query-tests/Critical/MissingCheckScanf/MissingCheckScanf.expected
index 6dfe60dcb8c..9b7564b9123 100644
--- a/cpp/ql/test/query-tests/Critical/MissingCheckScanf/MissingCheckScanf.expected
+++ b/cpp/ql/test/query-tests/Critical/MissingCheckScanf/MissingCheckScanf.expected
@@ -15,7 +15,6 @@ edges
 | test.cpp:141:19:141:20 | scanf output argument | test.cpp:143:8:143:8 | i | provenance |  |
 | test.cpp:150:23:150:24 | scanf output argument | test.cpp:154:9:154:9 | i | provenance |  |
 | test.cpp:181:19:181:20 | scanf output argument | test.cpp:185:8:185:8 | i | provenance |  |
-| test.cpp:193:19:193:20 | scanf output argument | test.cpp:197:8:197:8 | i | provenance |  |
 | test.cpp:211:22:211:23 | scanf output argument | test.cpp:213:8:213:8 | i | provenance |  |
 | test.cpp:221:22:221:23 | scanf output argument | test.cpp:223:8:223:8 | i | provenance |  |
 | test.cpp:221:26:221:27 | scanf output argument | test.cpp:224:8:224:8 | j | provenance |  |
@@ -89,8 +88,6 @@ nodes
 | test.cpp:154:9:154:9 | i | semmle.label | i |
 | test.cpp:181:19:181:20 | scanf output argument | semmle.label | scanf output argument |
 | test.cpp:185:8:185:8 | i | semmle.label | i |
-| test.cpp:193:19:193:20 | scanf output argument | semmle.label | scanf output argument |
-| test.cpp:197:8:197:8 | i | semmle.label | i |
 | test.cpp:211:22:211:23 | scanf output argument | semmle.label | scanf output argument |
 | test.cpp:213:8:213:8 | i | semmle.label | i |
 | test.cpp:221:22:221:23 | scanf output argument | semmle.label | scanf output argument |
diff --git a/cpp/ql/test/query-tests/Critical/MissingCheckScanf/test.cpp b/cpp/ql/test/query-tests/Critical/MissingCheckScanf/test.cpp
index 92f5d10ddd9..346cf607977 100644
--- a/cpp/ql/test/query-tests/Critical/MissingCheckScanf/test.cpp
+++ b/cpp/ql/test/query-tests/Critical/MissingCheckScanf/test.cpp
@@ -194,7 +194,7 @@ int main()
 
 		if (b >= 1)
 		{
-			use(i); // BAD [NOT DETECTED]: scanf can return EOF (boolifies true)
+			use(i); // BAD: scanf can return EOF (boolifies true)
 		}
 	}
 
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-313/CleartextSqliteDatabase.cpp b/cpp/ql/test/query-tests/Security/CWE/CWE-313/CleartextSqliteDatabase.cpp
new file mode 100644
index 00000000000..57298515793
--- /dev/null
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-313/CleartextSqliteDatabase.cpp
@@ -0,0 +1,121 @@
+typedef unsigned long size_t;
+typedef struct sqlite3 sqlite3;
+typedef struct sqlite3_stmt sqlite3_stmt;
+typedef struct sqlite3_str sqlite3_str;
+
+int snprintf(char *str, size_t size, const char *format, ...);
+int sqlite3_open(const char *filename, sqlite3 **ppDb);
+int sqlite3_close(sqlite3*);
+int sqlite3_exec(sqlite3*, const char *sql, int (*callback)(void*,int,char**,char**), void *, char **errmsg);
+int sqlite3_prepare_v2(sqlite3 *db, const char *zSql, int nByte, sqlite3_stmt **ppStmt, const char **pzTail);
+int sqlite3_step(sqlite3_stmt*);
+int sqlite3_finalize(sqlite3_stmt*);
+int sqlite3_bind_text(sqlite3_stmt*, int, const char*, int n, void(*)(void*));
+sqlite3_str* sqlite3_str_new(sqlite3*);
+void sqlite3_str_appendf(sqlite3_str*, const char *zFormat, ...);
+char* sqlite3_str_finish(sqlite3_str*);
+
+#define SQLITE_TRANSIENT ((void(*)(void*))-1)
+
+// Simulate a sensitive value
+const char* getSensitivePassword() {
+    return "super_secret_password";
+}
+
+void storePasswordCleartext(sqlite3* db, const char* password) {
+    // BAD: Storing sensitive data in cleartext
+    char sql[256];
+    // Unsafe: no escaping, for test purposes only
+    snprintf(sql, sizeof(sql), "INSERT INTO users(password) VALUES('%s');", password); // $ Source
+    char* errMsg = 0;
+    sqlite3_exec(db, sql, 0, 0, &errMsg); // $ Alert
+}
+
+void storePasswordWithPrepare(sqlite3* db, const char* password) {
+    // BAD: Storing sensitive data in cleartext using sqlite3_prepare
+    char sql[256];
+    snprintf(sql, sizeof(sql), "INSERT INTO users(password) VALUES('%s');", password); // $ Source
+    sqlite3_stmt* stmt = 0;
+    sqlite3_prepare_v2(db, sql, -1, &stmt, 0); // $ Alert
+    sqlite3_step(stmt);
+    sqlite3_finalize(stmt);
+}
+
+void storePasswordWithBind(sqlite3* db, const char* password) {
+    // BAD: Storing sensitive data in cleartext using sqlite3_bind_text
+    const char* sql = "INSERT INTO users(password) VALUES(?);";
+    sqlite3_stmt* stmt = 0;
+    sqlite3_prepare_v2(db, sql, -1, &stmt, 0);
+    sqlite3_bind_text(stmt, 1, password, -1, SQLITE_TRANSIENT); // $ Alert
+    sqlite3_step(stmt);
+    sqlite3_finalize(stmt);
+}
+
+void storePasswordWithAppendf(sqlite3_str* pStr, const char* password) {
+    // BAD: Storing sensitive data in cleartext using sqlite3_str_appendf
+    sqlite3_str_appendf(pStr, "INSERT INTO users(password) VALUES('%s');", password); // $ Alert
+}
+
+// Example sanitizer: hashes the sensitive value before storage
+void hashSensitiveValue(const char* input, char* output, size_t outSize) {
+    // Dummy hash for illustration (not cryptographically secure)
+    unsigned int hash = 5381;
+    for (const char* p = input; *p; ++p)
+        hash = ((hash << 5) + hash) + (unsigned char)(*p);
+    snprintf(output, outSize, "%u", hash);
+}
+
+void storeSanitizedPasswordCleartext(sqlite3* db, const char* password) {
+    // GOOD: Sanitizing sensitive data before storage
+    char hashed[64];
+    hashSensitiveValue(password, hashed, sizeof(hashed));
+    char sql[256];
+    snprintf(sql, sizeof(sql), "INSERT INTO users(password) VALUES('%s');", hashed);
+    char* errMsg = 0;
+    sqlite3_exec(db, sql, 0, 0, &errMsg);
+}
+
+void storeSanitizedPasswordWithBind(sqlite3* db, const char* password) {
+    // GOOD: Sanitizing sensitive data before storage with bind
+    char hashed[64];
+    hashSensitiveValue(password, hashed, sizeof(hashed));
+    const char* sql = "INSERT INTO users(password) VALUES(?);";
+    sqlite3_stmt* stmt = 0;
+    sqlite3_prepare_v2(db, sql, -1, &stmt, 0);
+    sqlite3_bind_text(stmt, 1, hashed, -1, SQLITE_TRANSIENT);
+    sqlite3_step(stmt);
+    sqlite3_finalize(stmt);
+}
+
+void storeSanitizedPasswordWithAppendf(sqlite3_str* pStr, const char* password) {
+    // GOOD: Sanitizing sensitive data before storage with appendf
+    char hashed[64];
+    hashSensitiveValue(password, hashed, sizeof(hashed));
+    sqlite3_str_appendf(pStr, "INSERT INTO users(password) VALUES('%s');", hashed);
+}
+
+int main() {
+    sqlite3* db = 0;
+    sqlite3_open(":memory:", &db);
+
+    // Create table
+    const char* createTableSQL = "CREATE TABLE users(id INTEGER PRIMARY KEY, password TEXT);";
+    sqlite3_exec(db, createTableSQL, 0, 0, 0);
+
+    const char* sensitive = getSensitivePassword();
+
+    storePasswordCleartext(db, sensitive);
+    storePasswordWithPrepare(db, sensitive);
+    storePasswordWithBind(db, sensitive);
+    storeSanitizedPasswordCleartext(db, sensitive);
+    storeSanitizedPasswordWithBind(db, sensitive);
+
+    // If sqlite3_str is available
+    sqlite3_str* pStr = sqlite3_str_new(db);
+    storePasswordWithAppendf(pStr, sensitive);
+    storeSanitizedPasswordWithAppendf(pStr, sensitive);
+    sqlite3_str_finish(pStr);
+
+    sqlite3_close(db);
+    return 0;
+}
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-313/CleartextSqliteDatabase.expected b/cpp/ql/test/query-tests/Security/CWE/CWE-313/CleartextSqliteDatabase.expected
new file mode 100644
index 00000000000..89a7a2c5826
--- /dev/null
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-313/CleartextSqliteDatabase.expected
@@ -0,0 +1,16 @@
+#select
+| CleartextSqliteDatabase.cpp:31:5:31:16 | call to sqlite3_exec | CleartextSqliteDatabase.cpp:29:77:29:84 | password | CleartextSqliteDatabase.cpp:31:22:31:24 | *sql | This SQLite call may store $@ in a non-encrypted SQLite database. | CleartextSqliteDatabase.cpp:29:77:29:84 | password | sensitive information |
+| CleartextSqliteDatabase.cpp:39:5:39:22 | call to sqlite3_prepare_v2 | CleartextSqliteDatabase.cpp:37:77:37:84 | password | CleartextSqliteDatabase.cpp:39:28:39:30 | *sql | This SQLite call may store $@ in a non-encrypted SQLite database. | CleartextSqliteDatabase.cpp:37:77:37:84 | password | sensitive information |
+| CleartextSqliteDatabase.cpp:49:5:49:21 | call to sqlite3_bind_text | CleartextSqliteDatabase.cpp:49:32:49:39 | password | CleartextSqliteDatabase.cpp:49:32:49:39 | password | This SQLite call may store $@ in a non-encrypted SQLite database. | CleartextSqliteDatabase.cpp:49:32:49:39 | password | sensitive information |
+| CleartextSqliteDatabase.cpp:56:5:56:23 | call to sqlite3_str_appendf | CleartextSqliteDatabase.cpp:56:76:56:83 | password | CleartextSqliteDatabase.cpp:56:76:56:83 | password | This SQLite call may store $@ in a non-encrypted SQLite database. | CleartextSqliteDatabase.cpp:56:76:56:83 | password | sensitive information |
+edges
+| CleartextSqliteDatabase.cpp:29:77:29:84 | password | CleartextSqliteDatabase.cpp:31:22:31:24 | *sql | provenance | TaintFunction |
+| CleartextSqliteDatabase.cpp:37:77:37:84 | password | CleartextSqliteDatabase.cpp:39:28:39:30 | *sql | provenance | TaintFunction |
+nodes
+| CleartextSqliteDatabase.cpp:29:77:29:84 | password | semmle.label | password |
+| CleartextSqliteDatabase.cpp:31:22:31:24 | *sql | semmle.label | *sql |
+| CleartextSqliteDatabase.cpp:37:77:37:84 | password | semmle.label | password |
+| CleartextSqliteDatabase.cpp:39:28:39:30 | *sql | semmle.label | *sql |
+| CleartextSqliteDatabase.cpp:49:32:49:39 | password | semmle.label | password |
+| CleartextSqliteDatabase.cpp:56:76:56:83 | password | semmle.label | password |
+subpaths
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-313/CleartextSqliteDatabase.qlref b/cpp/ql/test/query-tests/Security/CWE/CWE-313/CleartextSqliteDatabase.qlref
new file mode 100644
index 00000000000..d5adb06122d
--- /dev/null
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-313/CleartextSqliteDatabase.qlref
@@ -0,0 +1,4 @@
+query: Security/CWE/CWE-313/CleartextSqliteDatabase.ql
+postprocess:
+ - utils/test/PrettyPrintModels.ql
+ - utils/test/InlineExpectationsTestQuery.ql
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-457/semmle/tests/ms_vacopy.c b/cpp/ql/test/query-tests/Security/CWE/CWE-457/semmle/tests/ms_vacopy.c
new file mode 100644
index 00000000000..4aef7d79eb5
--- /dev/null
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-457/semmle/tests/ms_vacopy.c
@@ -0,0 +1,8 @@
+#include <stdarg.h>
+
+int va_copy_test(va_list va) {
+    va_list va2;
+    va_copy(va2, va);
+    return 0;
+}
+// semmle-extractor-options: --microsoft
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-457/semmle/tests/too_many_constants.cpp b/cpp/ql/test/query-tests/Security/CWE/CWE-457/semmle/tests/too_many_constants.cpp
new file mode 100644
index 00000000000..2e794f387ce
--- /dev/null
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-457/semmle/tests/too_many_constants.cpp
@@ -0,0 +1,42 @@
+struct S {
+  int a;
+  int b;
+  int c;
+  unsigned long *d;
+
+  union {
+    struct {
+      const char *e;
+      int f;
+      S *g;
+      const char *h;
+      int i;
+      bool j;
+      bool k;
+      const char *l;
+      char **m;
+    } n;
+
+    struct {
+      bool o;
+      bool p;
+    } q;
+  } r;
+};
+
+int too_many_constants_init(S *s);
+
+char *too_many_constants(const char *h, bool k, int i) {
+  const char *e = "";
+  char l[64] = "";
+  char *m;
+
+  S s[] = {
+      {.a = 0, .c = 0, .d = nullptr, .r = {.n = {.e = e, .f = 1, .g = nullptr, .h = h, .i = i, .j = false, .k = k, .l = l, .m = &m}}},
+      {.a = 0, .c = 0, .d = nullptr, .r = {.q = {.o = true, .p = true}}}
+  };
+
+  too_many_constants_init(s);
+
+  return m; // GOOD - initialized by too_many_constants_init
+}
diff --git a/csharp/actions/create-extractor-pack/action.yml b/csharp/actions/create-extractor-pack/action.yml
index 2386fe15101..b6737b45ad6 100644
--- a/csharp/actions/create-extractor-pack/action.yml
+++ b/csharp/actions/create-extractor-pack/action.yml
@@ -7,7 +7,7 @@ runs:
     - name: Setup dotnet
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 9.0.100
+        dotnet-version: 9.0.300
     - name: Build Extractor
       shell: bash
       run: scripts/create-extractor-pack.sh
@@ -17,7 +17,7 @@ runs:
       run: |
         CODEQL_PATH=$(gh codeql version --format=json | jq -r .unpackedLocation)
         # The legacy ASP extractor is not in this repo, so take the one from the nightly build
-        mv "$CODEQL_PATH/csharp/tools/extractor-asp.jar" "${{ github.workspace }}/csharp/extractor-pack/tools"
+        mv "$CODEQL_PATH/csharp/tools/extractor-asp.jar" "$GITHUB_WORKSPACE/csharp/extractor-pack/tools"
         # Safe guard against using the bundled extractor
         rm -rf "$CODEQL_PATH/csharp"
       env:
diff --git a/csharp/codeql-extractor.yml b/csharp/codeql-extractor.yml
index c4d7352cc43..da7d665f7a7 100644
--- a/csharp/codeql-extractor.yml
+++ b/csharp/codeql-extractor.yml
@@ -4,12 +4,15 @@ aliases:
 display_name: "C#"
 version: 1.22.1
 column_kind: "utf16"
+overlay_support_version: 20250626
 extra_env_vars:
   DOTNET_GENERATE_ASPNET_CERTIFICATE: "false"
 build_modes:
   - autobuild
   - manual
   - none
+default_queries:
+  - codeql/csharp-queries
 github_api_languages:
   - C#
 scc_languages:
diff --git a/csharp/documentation/library-coverage/coverage.csv b/csharp/documentation/library-coverage/coverage.csv
index 72c46c89934..4713679cd23 100644
--- a/csharp/documentation/library-coverage/coverage.csv
+++ b/csharp/documentation/library-coverage/coverage.csv
@@ -43,5 +43,5 @@ MySql.Data.MySqlClient,48,,,,,,,,,,,,48,,,,,,,,,,
 Newtonsoft.Json,,,91,,,,,,,,,,,,,,,,,,,73,18
 ServiceStack,194,,7,27,,,,,75,,,,92,,,,,,,,,7,
 SourceGenerators,,,5,,,,,,,,,,,,,,,,,,,,5
-System,54,47,12165,,6,5,5,,,4,1,,33,2,,6,15,17,4,3,,5929,6236
+System,54,47,12241,,6,5,5,,,4,1,,33,2,,6,15,17,4,3,,6003,6238
 Windows.Security.Cryptography.Core,1,,,,,,,1,,,,,,,,,,,,,,,
diff --git a/csharp/documentation/library-coverage/coverage.rst b/csharp/documentation/library-coverage/coverage.rst
index c1c3f927fd7..061662f9714 100644
--- a/csharp/documentation/library-coverage/coverage.rst
+++ b/csharp/documentation/library-coverage/coverage.rst
@@ -8,7 +8,7 @@ C# framework & library support
 
    Framework / library,Package,Flow sources,Taint & value steps,Sinks (total),`CWE-079` :sub:`Cross-site scripting`
    `ServiceStack <https://servicestack.net/>`_,"``ServiceStack.*``, ``ServiceStack``",,7,194,
-   System,"``System.*``, ``System``",47,12165,54,5
+   System,"``System.*``, ``System``",47,12241,54,5
    Others,"``Amazon.Lambda.APIGatewayEvents``, ``Amazon.Lambda.Core``, ``Dapper``, ``ILCompiler``, ``ILLink.RoslynAnalyzer``, ``ILLink.Shared``, ``ILLink.Tasks``, ``Internal.IL``, ``Internal.Pgo``, ``Internal.TypeSystem``, ``Microsoft.ApplicationBlocks.Data``, ``Microsoft.AspNetCore.Components``, ``Microsoft.AspNetCore.Http``, ``Microsoft.AspNetCore.Mvc``, ``Microsoft.AspNetCore.WebUtilities``, ``Microsoft.CSharp``, ``Microsoft.Data.SqlClient``, ``Microsoft.Diagnostics.Tools.Pgo``, ``Microsoft.DotNet.Build.Tasks``, ``Microsoft.DotNet.PlatformAbstractions``, ``Microsoft.EntityFrameworkCore``, ``Microsoft.Extensions.Caching.Distributed``, ``Microsoft.Extensions.Caching.Memory``, ``Microsoft.Extensions.Configuration``, ``Microsoft.Extensions.DependencyInjection``, ``Microsoft.Extensions.DependencyModel``, ``Microsoft.Extensions.Diagnostics.Metrics``, ``Microsoft.Extensions.FileProviders``, ``Microsoft.Extensions.FileSystemGlobbing``, ``Microsoft.Extensions.Hosting``, ``Microsoft.Extensions.Http``, ``Microsoft.Extensions.Logging``, ``Microsoft.Extensions.Options``, ``Microsoft.Extensions.Primitives``, ``Microsoft.Interop``, ``Microsoft.JSInterop``, ``Microsoft.NET.Build.Tasks``, ``Microsoft.VisualBasic``, ``Microsoft.Win32``, ``Mono.Linker``, ``MySql.Data.MySqlClient``, ``Newtonsoft.Json``, ``SourceGenerators``, ``Windows.Security.Cryptography.Core``",60,2257,159,4
-   Totals,,107,14429,407,9
+   Totals,,107,14505,407,9
 
diff --git a/csharp/downgrades/605f85053409cd72b4904df3f198ddc8324f3a83/old.dbscheme b/csharp/downgrades/605f85053409cd72b4904df3f198ddc8324f3a83/old.dbscheme
new file mode 100644
index 00000000000..605f8505340
--- /dev/null
+++ b/csharp/downgrades/605f85053409cd72b4904df3f198ddc8324f3a83/old.dbscheme
@@ -0,0 +1,1478 @@
+/* This is a dummy line to alter the dbscheme, so we can make a database upgrade
+ * without actually changing any of the dbscheme predicates. It contains a date
+ * to allow for such updates in the future as well.
+ *
+ * 2021-07-14
+ *
+ * DO NOT remove this comment carelessly, since it can revert the dbscheme back to a
+ * previously seen state (matching a previously seen SHA), which would make the upgrade
+ * mechanism not work properly.
+ */
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+compilation_info(
+  int id : @compilation ref,
+  string info_key: string ref,
+  string info_value: string ref
+)
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | --compiler
+ * 1   | *path to compiler*
+ * 2   | f1.cs
+ * 3   | f2.cs
+ * 4   | f3.cs
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@someFile.rsp` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.cs
+ * 1   | f2.cs
+ * 2   | f3.cs
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The references used by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs /r:ref1.dll /r:ref2.dll /r:ref3.dll
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | ref1.dll
+ * 1   | ref2.dll
+ * 2   | ref3.dll
+ */
+#keyset[id, num]
+compilation_referencing_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    unique int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location ref
+);
+
+extractor_messages(
+    unique int id: @extractor_message,
+    int severity: int ref,
+    string origin : string ref,
+    string text : string ref,
+    string entity : string ref,
+    int location: @location ref,
+    string stack_trace : string ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+compilation_assembly(
+  unique int id : @compilation ref,
+  int assembly: @assembly ref
+)
+
+// Populated by the CSV extractor
+externalData(
+   int id: @externalDataElement,
+   string path: string ref,
+   int column: int ref,
+   string value: string ref);
+
+sourceLocationPrefix(
+  string prefix: string ref);
+
+/*
+ * Overlay support
+ */
+
+/**
+ * The CLI will automatically emit the tuple `databaseMetadata("isOverlay", "true")`,
+ * along with an `overlayChangedFiles` tuple for each new/modified/deleted file,
+ * when building an overlay database, and these can be used by the discard predicates.
+ */
+databaseMetadata(
+  string metadataKey : string ref,
+  string value : string ref
+);
+
+overlayChangedFiles(
+  string path : string ref
+);
+
+/*
+ * C# dbscheme
+ */
+
+/** ELEMENTS **/
+
+@element = @declaration | @stmt | @expr | @modifier | @attribute | @namespace_declaration
+         | @using_directive | @type_parameter_constraints | @externalDataElement
+         | @xmllocatable | @asp_element | @namespace | @preprocessor_directive;
+
+@declaration = @callable | @generic | @assignable | @namespace;
+
+@named_element = @namespace | @declaration;
+
+@declaration_with_accessors = @property | @indexer | @event;
+
+@assignable = @variable | @assignable_with_accessors | @event;
+
+@assignable_with_accessors = @property | @indexer;
+
+@attributable = @assembly | @field | @parameter | @operator | @method | @constructor
+              | @destructor | @callable_accessor | @value_or_ref_type | @declaration_with_accessors
+              | @local_function | @lambda_expr;
+
+/** LOCATIONS, ASEMMBLIES, MODULES, FILES and FOLDERS **/
+
+@location = @location_default | @assembly;
+
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref);
+
+locations_mapped(
+  unique int id: @location_default ref,
+  int mapped_to: @location_default ref);
+
+@sourceline = @file | @callable | @xmllocatable;
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref);
+
+assemblies(
+  unique int id: @assembly,
+  int file: @file ref,
+  string fullname: string ref,
+  string name: string ref,
+  string version: string ref);
+
+files(
+  unique int id: @file,
+  string name: string ref);
+
+folders(
+  unique int id: @folder,
+  string name: string ref);
+
+@container = @folder | @file ;
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref);
+
+file_extraction_mode(
+  unique int file: @file ref,
+  int mode: int ref
+  /* 0 = normal, 1 = standalone extractor */
+  );
+
+/** NAMESPACES **/
+
+@type_container = @namespace | @type;
+
+namespaces(
+  unique int id: @namespace,
+  string name: string ref);
+
+namespace_declarations(
+  unique int id: @namespace_declaration,
+  int namespace_id: @namespace ref);
+
+namespace_declaration_location(
+  unique int id: @namespace_declaration ref,
+  int loc: @location ref);
+
+parent_namespace(
+  unique int child_id: @type_container ref,
+  int namespace_id: @namespace ref);
+
+@declaration_or_directive = @namespace_declaration | @type | @using_directive;
+
+parent_namespace_declaration(
+  int child_id: @declaration_or_directive ref, // cannot be unique because of partial classes
+  int namespace_id: @namespace_declaration ref);
+
+@using_directive = @using_namespace_directive | @using_static_directive;
+
+using_global(
+  unique int id: @using_directive ref
+);
+
+using_namespace_directives(
+  unique int id: @using_namespace_directive,
+  int namespace_id: @namespace ref);
+
+using_static_directives(
+  unique int id: @using_static_directive,
+  int type_id: @type_or_ref ref);
+
+using_directive_location(
+  unique int id: @using_directive ref,
+  int loc: @location ref);
+
+@preprocessor_directive = @pragma_warning | @pragma_checksum | @directive_define | @directive_undefine | @directive_warning
+  | @directive_error | @directive_nullable | @directive_line | @directive_region | @directive_endregion | @directive_if
+  | @directive_elif | @directive_else | @directive_endif;
+
+@conditional_directive = @directive_if | @directive_elif;
+@branch_directive = @directive_if | @directive_elif | @directive_else;
+
+directive_ifs(
+  unique int id: @directive_if,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref); /* 0: false, 1: true */
+
+directive_elifs(
+  unique int id: @directive_elif,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref,  /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+directive_elses(
+  unique int id: @directive_else,
+  int branchTaken: int ref,   /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+#keyset[id, start]
+directive_endifs(
+  unique int id: @directive_endif,
+  unique int start: @directive_if ref);
+
+directive_define_symbols(
+  unique int id: @define_symbol_expr ref,
+  string name: string ref);
+
+directive_regions(
+  unique int id: @directive_region,
+  string name: string ref);
+
+#keyset[id, start]
+directive_endregions(
+  unique int id: @directive_endregion,
+  unique int start: @directive_region ref);
+
+directive_lines(
+  unique int id: @directive_line,
+  int kind: int ref); /* 0: default, 1: hidden, 2: numeric, 3: span */
+
+directive_line_value(
+  unique int id: @directive_line ref,
+  int line: int ref);
+
+directive_line_file(
+  unique int id: @directive_line ref,
+  int file: @file ref);
+
+directive_line_offset(
+  unique int id: @directive_line ref,
+  int offset: int ref);
+
+directive_line_span(
+  unique int id: @directive_line ref,
+  int startLine: int ref,
+  int startColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref);
+
+directive_nullables(
+  unique int id: @directive_nullable,
+  int setting: int ref, /* 0: disable, 1: enable, 2: restore */
+  int target: int ref); /* 0: none, 1: annotations, 2: warnings */
+
+directive_warnings(
+  unique int id: @directive_warning,
+  string message: string ref);
+
+directive_errors(
+  unique int id: @directive_error,
+  string message: string ref);
+
+directive_undefines(
+  unique int id: @directive_undefine,
+  string name: string ref);
+
+directive_defines(
+  unique int id: @directive_define,
+  string name: string ref);
+
+pragma_checksums(
+  unique int id: @pragma_checksum,
+  int file: @file ref,
+  string guid: string ref,
+  string bytes: string ref);
+
+pragma_warnings(
+  unique int id: @pragma_warning,
+  int kind: int ref /* 0 = disable, 1 = restore */);
+
+#keyset[id, index]
+pragma_warning_error_codes(
+  int id: @pragma_warning ref,
+  string errorCode: string ref,
+  int index: int ref);
+
+preprocessor_directive_location(
+  unique int id: @preprocessor_directive ref,
+  int loc: @location ref);
+
+preprocessor_directive_compilation(
+  int id: @preprocessor_directive ref,
+  int compilation: @compilation ref);
+
+preprocessor_directive_active(
+  unique int id: @preprocessor_directive ref,
+  int active: int ref);  /* 0: false, 1: true */
+
+/** TYPES **/
+
+types(
+  unique int id: @type,
+  int kind: int ref,
+  string name: string ref);
+
+case @type.kind of
+   1 = @bool_type
+|  2 = @char_type
+|  3 = @decimal_type
+|  4 = @sbyte_type
+|  5 = @short_type
+|  6 = @int_type
+|  7 = @long_type
+|  8 = @byte_type
+|  9 = @ushort_type
+| 10 = @uint_type
+| 11 = @ulong_type
+| 12 = @float_type
+| 13 = @double_type
+| 14 = @enum_type
+| 15 = @struct_type
+| 17 = @class_type
+| 19 = @interface_type
+| 20 = @delegate_type
+| 21 = @null_type
+| 22 = @type_parameter
+| 23 = @pointer_type
+| 24 = @nullable_type
+| 25 = @array_type
+| 26 = @void_type
+| 27 = @int_ptr_type
+| 28 = @uint_ptr_type
+| 29 = @dynamic_type
+| 30 = @arglist_type
+| 31 = @unknown_type
+| 32 = @tuple_type
+| 33 = @function_pointer_type
+| 34 = @inline_array_type
+  ;
+
+@simple_type = @bool_type | @char_type | @integral_type | @floating_point_type | @decimal_type;
+@integral_type = @signed_integral_type | @unsigned_integral_type;
+@signed_integral_type = @sbyte_type | @short_type | @int_type | @long_type;
+@unsigned_integral_type = @byte_type  | @ushort_type | @uint_type | @ulong_type;
+@floating_point_type = @float_type | @double_type;
+@value_type = @simple_type | @enum_type | @struct_type | @nullable_type | @int_ptr_type
+            | @uint_ptr_type | @tuple_type | @void_type | @inline_array_type;
+@ref_type = @class_type | @interface_type | @array_type | @delegate_type | @null_type
+          | @dynamic_type;
+@value_or_ref_type = @value_type | @ref_type;
+
+typerefs(
+  unique int id: @typeref,
+  string name: string ref);
+
+typeref_type(
+  int id: @typeref ref,
+  unique int typeId: @type ref);
+
+@type_or_ref = @type | @typeref;
+
+array_element_type(
+  unique int array: @array_type ref,
+  int dimension: int ref,
+  int rank: int ref,
+  int element: @type_or_ref ref);
+
+nullable_underlying_type(
+  unique int nullable: @nullable_type ref,
+  int underlying: @type_or_ref ref);
+
+pointer_referent_type(
+  unique int pointer: @pointer_type ref,
+  int referent: @type_or_ref ref);
+
+enum_underlying_type(
+  unique int enum_id: @enum_type ref,
+  int underlying_type_id: @type_or_ref ref);
+
+delegate_return_type(
+  unique int delegate_id: @delegate_type ref,
+  int return_type_id: @type_or_ref ref);
+
+function_pointer_return_type(
+    unique int function_pointer_id: @function_pointer_type ref,
+    int return_type_id: @type_or_ref ref);
+
+extend(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+anonymous_types(
+  unique int id: @type ref);
+
+@interface_or_ref = @interface_type | @typeref;
+
+implement(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+type_location(
+  int id: @type ref,
+  int loc: @location ref);
+
+tuple_underlying_type(
+  unique int tuple: @tuple_type ref,
+  int struct: @type_or_ref ref);
+
+#keyset[tuple, index]
+tuple_element(
+  int tuple: @tuple_type ref,
+  int index: int ref,
+  unique int field: @field ref);
+
+attributes(
+  unique int id: @attribute,
+  int kind: int ref,
+  int type_id: @type_or_ref ref,
+  int target:  @attributable ref);
+
+case @attribute.kind of
+  0 = @attribute_default
+| 1 = @attribute_return
+| 2 = @attribute_assembly
+| 3 = @attribute_module
+;
+
+attribute_location(
+  int id: @attribute ref,
+  int loc: @location ref);
+
+@type_mention_parent = @element | @type_mention;
+
+type_mention(
+  unique int id: @type_mention,
+  int type_id: @type_or_ref ref,
+  int parent: @type_mention_parent ref);
+
+type_mention_location(
+  unique int id: @type_mention ref,
+  int loc: @location ref);
+
+@has_type_annotation = @assignable | @type_parameter | @callable | @expr | @delegate_type | @generic | @function_pointer_type;
+
+/**
+ * A direct annotation on an entity, for example `string? x;`.
+ *
+ * Annotations:
+ * 2 = reftype is not annotated "!"
+ * 3 = reftype is annotated "?"
+ * 4 = readonly ref type / in parameter
+ * 5 = ref type parameter, return or local variable
+ * 6 = out parameter
+ *
+ * Note that the annotation depends on the element it annotates.
+ * @assignable: The annotation is on the type of the assignable, for example the variable type.
+ * @type_parameter: The annotation is on the reftype constraint
+ * @callable: The annotation is on the return type
+ * @array_type: The annotation is on the element type
+ */
+type_annotation(int id: @has_type_annotation ref, int annotation: int ref);
+
+nullability(unique int nullability: @nullability, int kind: int ref);
+
+case @nullability.kind of
+  0 = @oblivious
+| 1 = @not_annotated
+| 2 = @annotated
+;
+
+#keyset[parent, index]
+nullability_parent(int nullability: @nullability ref, int index: int ref, int parent: @nullability ref)
+
+type_nullability(int id: @has_type_annotation ref, int nullability: @nullability ref);
+
+/**
+ * The nullable flow state of an expression, as determined by Roslyn.
+ *   0 = none (default, not populated)
+ *   1 = not null
+ *   2 = maybe null
+ */
+expr_flowstate(unique int id: @expr ref, int state: int ref);
+
+/** GENERICS **/
+
+@generic = @type | @method | @local_function;
+
+type_parameters(
+  unique int id: @type_parameter ref,
+  int index: int ref,
+  int generic_id: @generic ref,
+  int variance: int ref /* none = 0, out = 1, in = 2 */);
+
+#keyset[constructed_id, index]
+type_arguments(
+  int id: @type_or_ref ref,
+  int index: int ref,
+  int constructed_id: @generic_or_ref ref);
+
+@generic_or_ref = @generic | @typeref;
+
+constructed_generic(
+  unique int constructed: @generic ref,
+  int generic: @generic_or_ref ref);
+
+type_parameter_constraints(
+  unique int id: @type_parameter_constraints,
+  int param_id: @type_parameter ref);
+
+type_parameter_constraints_location(
+  int id: @type_parameter_constraints ref,
+  int loc: @location ref);
+
+general_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int kind: int ref /* class = 1, struct = 2, new = 3 */);
+
+specific_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref);
+
+specific_type_parameter_nullability(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref,
+  int nullability: @nullability ref);
+
+/** FUNCTION POINTERS */
+
+function_pointer_calling_conventions(
+  int id: @function_pointer_type ref,
+  int kind: int ref);
+
+#keyset[id, index]
+has_unmanaged_calling_conventions(
+  int id: @function_pointer_type ref,
+  int index: int ref,
+  int conv_id: @type_or_ref ref);
+
+/** MODIFIERS */
+
+@modifiable = @modifiable_direct | @event_accessor;
+
+@modifiable_direct = @member | @accessor | @local_function | @anonymous_function_expr;
+
+modifiers(
+  unique int id: @modifier,
+  string name: string ref);
+
+has_modifiers(
+  int id: @modifiable_direct ref,
+  int mod_id: @modifier ref);
+
+/** MEMBERS **/
+
+@member = @method | @constructor | @destructor | @field | @property | @event | @operator | @indexer | @type;
+
+@named_exprorstmt = @goto_stmt | @labeled_stmt | @expr;
+
+@virtualizable = @method | @property | @indexer | @event | @operator;
+
+exprorstmt_name(
+  unique int parent_id: @named_exprorstmt ref,
+  string name: string ref);
+
+nested_types(
+  unique int id: @type ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @type ref);
+
+properties(
+  unique int id: @property,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @property ref);
+
+property_location(
+  int id: @property ref,
+  int loc: @location ref);
+
+indexers(
+  unique int id: @indexer,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @indexer ref);
+
+indexer_location(
+  int id: @indexer ref,
+  int loc: @location ref);
+
+accessors(
+  unique int id: @accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_member_id: @member ref,
+  int unbound_id: @accessor ref);
+
+case @accessor.kind of
+  1 = @getter
+| 2 = @setter
+  ;
+
+init_only_accessors(
+  unique int id: @accessor ref);
+
+accessor_location(
+  int id: @accessor ref,
+  int loc: @location ref);
+
+events(
+  unique int id: @event,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @event ref);
+
+event_location(
+  int id: @event ref,
+  int loc: @location ref);
+
+event_accessors(
+  unique int id: @event_accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_event_id: @event ref,
+  int unbound_id: @event_accessor ref);
+
+case @event_accessor.kind of
+  1 = @add_event_accessor
+| 2 = @remove_event_accessor
+  ;
+
+event_accessor_location(
+  int id: @event_accessor ref,
+  int loc: @location ref);
+
+operators(
+  unique int id: @operator,
+  string name: string ref,
+  string symbol: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @operator ref);
+
+operator_location(
+  int id: @operator ref,
+  int loc: @location ref);
+
+constant_value(
+  int id: @variable ref,
+  string value: string ref);
+
+/** CALLABLES **/
+
+@callable = @method | @constructor | @destructor | @operator | @callable_accessor | @anonymous_function_expr | @local_function;
+
+@callable_accessor = @accessor | @event_accessor;
+
+methods(
+  unique int id: @method,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @method ref);
+
+method_location(
+  int id: @method ref,
+  int loc: @location ref);
+
+constructors(
+  unique int id: @constructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @constructor ref);
+
+constructor_location(
+  int id: @constructor ref,
+  int loc: @location ref);
+
+destructors(
+  unique int id: @destructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @destructor ref);
+
+destructor_location(
+  int id: @destructor ref,
+  int loc: @location ref);
+
+overrides(
+  int id: @callable ref,
+  int base_id: @callable ref);
+
+explicitly_implements(
+  int id: @member ref,
+  int interface_id: @interface_or_ref ref);
+
+local_functions(
+    unique int id: @local_function,
+    string name: string ref,
+    int return_type: @type ref,
+    int unbound_id: @local_function ref);
+
+local_function_stmts(
+    unique int fn: @local_function_stmt ref,
+    int stmt: @local_function ref);
+
+/** VARIABLES **/
+
+@variable = @local_scope_variable | @field;
+
+@local_scope_variable = @local_variable | @parameter;
+
+fields(
+  unique int id: @field,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @field ref);
+
+case @field.kind of
+  1 = @addressable_field
+| 2 = @constant
+  ;
+
+field_location(
+  int id: @field ref,
+  int loc: @location ref);
+
+localvars(
+  unique int id: @local_variable,
+  int kind: int ref,
+  string name: string ref,
+  int implicitly_typed: int ref /* 0 = no, 1 = yes */,
+  int type_id: @type_or_ref ref,
+  int parent_id: @local_var_decl_expr ref);
+
+case @local_variable.kind of
+  1 = @addressable_local_variable
+| 2 = @local_constant
+| 3 = @local_variable_ref
+  ;
+
+localvar_location(
+  unique int id: @local_variable ref,
+  int loc: @location ref);
+
+@parameterizable = @callable | @delegate_type | @indexer | @function_pointer_type;
+
+#keyset[name, parent_id]
+#keyset[index, parent_id]
+params(
+  unique int id: @parameter,
+  string name: string ref,
+  int type_id: @type_or_ref ref,
+  int index: int ref,
+  int mode: int ref, /* value = 0, ref = 1, out = 2, params/array = 3, this = 4, in = 5, ref readonly = 6 */
+  int parent_id: @parameterizable ref,
+  int unbound_id: @parameter ref);
+
+param_location(
+  int id: @parameter ref,
+  int loc: @location ref);
+
+@has_scoped_annotation = @local_scope_variable
+
+scoped_annotation(
+  int id: @has_scoped_annotation ref,
+  int kind: int ref // scoped ref = 1, scoped value = 2
+  );
+
+/** STATEMENTS **/
+
+@exprorstmt_parent = @control_flow_element | @top_level_exprorstmt_parent;
+
+statements(
+  unique int id: @stmt,
+  int kind: int ref);
+
+#keyset[index, parent]
+stmt_parent(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_stmt_parent = @callable;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+stmt_parent_top_level(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @top_level_stmt_parent ref);
+
+case @stmt.kind of
+   1 = @block_stmt
+|  2 = @expr_stmt
+|  3 = @if_stmt
+|  4 = @switch_stmt
+|  5 = @while_stmt
+|  6 = @do_stmt
+|  7 = @for_stmt
+|  8 = @foreach_stmt
+|  9 = @break_stmt
+| 10 = @continue_stmt
+| 11 = @goto_stmt
+| 12 = @goto_case_stmt
+| 13 = @goto_default_stmt
+| 14 = @throw_stmt
+| 15 = @return_stmt
+| 16 = @yield_stmt
+| 17 = @try_stmt
+| 18 = @checked_stmt
+| 19 = @unchecked_stmt
+| 20 = @lock_stmt
+| 21 = @using_block_stmt
+| 22 = @var_decl_stmt
+| 23 = @const_decl_stmt
+| 24 = @empty_stmt
+| 25 = @unsafe_stmt
+| 26 = @fixed_stmt
+| 27 = @label_stmt
+| 28 = @catch
+| 29 = @case_stmt
+| 30 = @local_function_stmt
+| 31 = @using_decl_stmt
+  ;
+
+@using_stmt = @using_block_stmt | @using_decl_stmt;
+
+@labeled_stmt = @label_stmt | @case;
+
+@decl_stmt = @var_decl_stmt | @const_decl_stmt | @using_decl_stmt;
+
+@cond_stmt = @if_stmt | @switch_stmt;
+
+@loop_stmt = @while_stmt | @do_stmt | @for_stmt | @foreach_stmt;
+
+@jump_stmt = @break_stmt | @goto_any_stmt | @continue_stmt | @throw_stmt | @return_stmt
+           | @yield_stmt;
+
+@goto_any_stmt = @goto_default_stmt | @goto_case_stmt | @goto_stmt;
+
+
+stmt_location(
+  unique int id: @stmt ref,
+  int loc: @location ref);
+
+catch_type(
+  unique int catch_id: @catch ref,
+  int type_id: @type_or_ref ref,
+  int kind: int ref /* explicit = 1, implicit = 2 */);
+
+foreach_stmt_info(
+  unique int id: @foreach_stmt ref,
+  int kind: int ref /* non-async = 1, async = 2 */);
+
+@foreach_symbol =  @method | @property | @type_or_ref;
+
+#keyset[id, kind]
+foreach_stmt_desugar(
+  int id: @foreach_stmt ref,
+  int symbol: @foreach_symbol ref,
+  int kind: int ref /* GetEnumeratorMethod = 1, CurrentProperty = 2, MoveNextMethod = 3, DisposeMethod = 4, ElementType = 5 */);
+
+/** EXPRESSIONS **/
+
+expressions(
+  unique int id: @expr,
+  int kind: int ref,
+  int type_id: @type_or_ref ref);
+
+#keyset[index, parent]
+expr_parent(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_expr_parent = @attribute | @field | @property | @indexer | @parameter | @directive_if | @directive_elif;
+
+@top_level_exprorstmt_parent = @top_level_expr_parent | @top_level_stmt_parent;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+expr_parent_top_level(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @top_level_exprorstmt_parent ref);
+
+case @expr.kind of
+/* literal */
+   1 = @bool_literal_expr
+|  2 = @char_literal_expr
+|  3 = @decimal_literal_expr
+|  4 = @int_literal_expr
+|  5 = @long_literal_expr
+|  6 = @uint_literal_expr
+|  7 = @ulong_literal_expr
+|  8 = @float_literal_expr
+|  9 = @double_literal_expr
+| 10 = @utf16_string_literal_expr
+| 11 = @null_literal_expr
+/* primary & unary */
+| 12 = @this_access_expr
+| 13 = @base_access_expr
+| 14 = @local_variable_access_expr
+| 15 = @parameter_access_expr
+| 16 = @field_access_expr
+| 17 = @property_access_expr
+| 18 = @method_access_expr
+| 19 = @event_access_expr
+| 20 = @indexer_access_expr
+| 21 = @array_access_expr
+| 22 = @type_access_expr
+| 23 = @typeof_expr
+| 24 = @method_invocation_expr
+| 25 = @delegate_invocation_expr
+| 26 = @operator_invocation_expr
+| 27 = @cast_expr
+| 28 = @object_creation_expr
+| 29 = @explicit_delegate_creation_expr
+| 30 = @implicit_delegate_creation_expr
+| 31 = @array_creation_expr
+| 32 = @default_expr
+| 33 = @plus_expr
+| 34 = @minus_expr
+| 35 = @bit_not_expr
+| 36 = @log_not_expr
+| 37 = @post_incr_expr
+| 38 = @post_decr_expr
+| 39 = @pre_incr_expr
+| 40 = @pre_decr_expr
+/* multiplicative */
+| 41 = @mul_expr
+| 42 = @div_expr
+| 43 = @rem_expr
+/* additive */
+| 44 = @add_expr
+| 45 = @sub_expr
+/* shift */
+| 46 = @lshift_expr
+| 47 = @rshift_expr
+/* relational */
+| 48 = @lt_expr
+| 49 = @gt_expr
+| 50 = @le_expr
+| 51 = @ge_expr
+/* equality */
+| 52 = @eq_expr
+| 53 = @ne_expr
+/* logical */
+| 54 = @bit_and_expr
+| 55 = @bit_xor_expr
+| 56 = @bit_or_expr
+| 57 = @log_and_expr
+| 58 = @log_or_expr
+/* type testing */
+| 59 = @is_expr
+| 60 = @as_expr
+/* null coalescing */
+| 61 = @null_coalescing_expr
+/* conditional */
+| 62 = @conditional_expr
+/* assignment */
+| 63 = @simple_assign_expr
+| 64 = @assign_add_expr
+| 65 = @assign_sub_expr
+| 66 = @assign_mul_expr
+| 67 = @assign_div_expr
+| 68 = @assign_rem_expr
+| 69 = @assign_and_expr
+| 70 = @assign_xor_expr
+| 71 = @assign_or_expr
+| 72 = @assign_lshift_expr
+| 73 = @assign_rshift_expr
+/* more */
+| 74 = @object_init_expr
+| 75 = @collection_init_expr
+| 76 = @array_init_expr
+| 77 = @checked_expr
+| 78 = @unchecked_expr
+| 79 = @constructor_init_expr
+| 80 = @add_event_expr
+| 81 = @remove_event_expr
+| 82 = @par_expr
+| 83 = @local_var_decl_expr
+| 84 = @lambda_expr
+| 85 = @anonymous_method_expr
+| 86 = @namespace_expr
+/* dynamic */
+| 92 = @dynamic_element_access_expr
+| 93 = @dynamic_member_access_expr
+/* unsafe */
+| 100 = @pointer_indirection_expr
+| 101 = @address_of_expr
+| 102 = @sizeof_expr
+/* async */
+| 103 = @await_expr
+/* C# 6.0 */
+| 104 = @nameof_expr
+| 105 = @interpolated_string_expr
+| 106 = @unknown_expr
+/* C# 7.0 */
+| 107 = @throw_expr
+| 108 = @tuple_expr
+| 109 = @local_function_invocation_expr
+| 110 = @ref_expr
+| 111 = @discard_expr
+/* C# 8.0 */
+| 112 = @range_expr
+| 113 = @index_expr
+| 114 = @switch_expr
+| 115 = @recursive_pattern_expr
+| 116 = @property_pattern_expr
+| 117 = @positional_pattern_expr
+| 118 = @switch_case_expr
+| 119 = @assign_coalesce_expr
+| 120 = @suppress_nullable_warning_expr
+| 121 = @namespace_access_expr
+/* C# 9.0 */
+| 122 = @lt_pattern_expr
+| 123 = @gt_pattern_expr
+| 124 = @le_pattern_expr
+| 125 = @ge_pattern_expr
+| 126 = @not_pattern_expr
+| 127 = @and_pattern_expr
+| 128 = @or_pattern_expr
+| 129 = @function_pointer_invocation_expr
+| 130 = @with_expr
+/* C# 11.0 */
+| 131 = @list_pattern_expr
+| 132 = @slice_pattern_expr
+| 133 = @urshift_expr
+| 134 = @assign_urshift_expr
+| 135 = @utf8_string_literal_expr
+/* C# 12.0 */
+| 136 = @collection_expr
+| 137 = @spread_element_expr
+| 138 = @interpolated_string_insert_expr
+/* Preprocessor */
+| 999 = @define_symbol_expr
+;
+
+@switch = @switch_stmt | @switch_expr;
+@case = @case_stmt | @switch_case_expr;
+@pattern_match = @case | @is_expr;
+@unary_pattern_expr = @not_pattern_expr;
+@relational_pattern_expr = @gt_pattern_expr | @lt_pattern_expr | @ge_pattern_expr | @le_pattern_expr;
+@binary_pattern_expr = @and_pattern_expr | @or_pattern_expr;
+
+@integer_literal_expr = @int_literal_expr | @long_literal_expr | @uint_literal_expr | @ulong_literal_expr;
+@real_literal_expr = @float_literal_expr | @double_literal_expr | @decimal_literal_expr;
+@string_literal_expr = @utf16_string_literal_expr | @utf8_string_literal_expr;
+@literal_expr = @bool_literal_expr | @char_literal_expr | @integer_literal_expr | @real_literal_expr
+              | @string_literal_expr | @null_literal_expr;
+
+@assign_expr = @simple_assign_expr | @assign_op_expr | @local_var_decl_expr;
+@assign_op_expr =  @assign_arith_expr | @assign_bitwise_expr | @assign_event_expr | @assign_coalesce_expr;
+@assign_event_expr = @add_event_expr | @remove_event_expr;
+
+@assign_arith_expr = @assign_add_expr | @assign_sub_expr | @assign_mul_expr | @assign_div_expr
+                   | @assign_rem_expr
+@assign_bitwise_expr = @assign_and_expr | @assign_or_expr | @assign_xor_expr
+                   | @assign_lshift_expr | @assign_rshift_expr | @assign_urshift_expr;
+
+@member_access_expr = @field_access_expr | @property_access_expr | @indexer_access_expr | @event_access_expr
+                    | @method_access_expr | @type_access_expr | @dynamic_member_access_expr;
+@access_expr = @member_access_expr | @this_access_expr | @base_access_expr | @assignable_access_expr | @namespace_access_expr;
+@element_access_expr = @indexer_access_expr | @array_access_expr | @dynamic_element_access_expr;
+
+@local_variable_access = @local_variable_access_expr | @local_var_decl_expr;
+@local_scope_variable_access_expr = @parameter_access_expr | @local_variable_access;
+@variable_access_expr = @local_scope_variable_access_expr | @field_access_expr;
+
+@assignable_access_expr = @variable_access_expr | @property_access_expr | @element_access_expr
+                        | @event_access_expr | @dynamic_member_access_expr;
+
+@objectorcollection_init_expr = @object_init_expr | @collection_init_expr;
+
+@delegate_creation_expr = @explicit_delegate_creation_expr | @implicit_delegate_creation_expr;
+
+@bin_arith_op_expr = @mul_expr | @div_expr | @rem_expr | @add_expr | @sub_expr;
+@incr_op_expr =  @pre_incr_expr | @post_incr_expr;
+@decr_op_expr =  @pre_decr_expr | @post_decr_expr;
+@mut_op_expr = @incr_op_expr | @decr_op_expr;
+@un_arith_op_expr = @plus_expr | @minus_expr | @mut_op_expr;
+@arith_op_expr = @bin_arith_op_expr | @un_arith_op_expr;
+
+@ternary_log_op_expr = @conditional_expr;
+@bin_log_op_expr = @log_and_expr | @log_or_expr | @null_coalescing_expr;
+@un_log_op_expr = @log_not_expr;
+@log_expr = @un_log_op_expr | @bin_log_op_expr | @ternary_log_op_expr;
+
+@bin_bit_op_expr =  @bit_and_expr | @bit_or_expr | @bit_xor_expr | @lshift_expr
+                 | @rshift_expr | @urshift_expr;
+@un_bit_op_expr = @bit_not_expr;
+@bit_expr = @un_bit_op_expr | @bin_bit_op_expr;
+
+@equality_op_expr =  @eq_expr | @ne_expr;
+@rel_op_expr = @gt_expr | @lt_expr| @ge_expr | @le_expr;
+@comp_expr = @equality_op_expr | @rel_op_expr;
+
+@op_expr = @assign_expr | @un_op | @bin_op | @ternary_op;
+
+@ternary_op = @ternary_log_op_expr;
+@bin_op = @bin_arith_op_expr | @bin_log_op_expr | @bin_bit_op_expr | @comp_expr;
+@un_op = @un_arith_op_expr | @un_log_op_expr | @un_bit_op_expr | @sizeof_expr
+       | @pointer_indirection_expr | @address_of_expr;
+
+@anonymous_function_expr = @lambda_expr | @anonymous_method_expr;
+
+@call = @method_invocation_expr | @constructor_init_expr | @operator_invocation_expr
+      | @delegate_invocation_expr | @object_creation_expr | @call_access_expr
+      | @local_function_invocation_expr | @function_pointer_invocation_expr;
+
+@call_access_expr = @property_access_expr | @event_access_expr | @indexer_access_expr;
+
+@late_bindable_expr = @dynamic_element_access_expr | @dynamic_member_access_expr
+                    | @object_creation_expr | @method_invocation_expr | @operator_invocation_expr;
+
+@throw_element = @throw_expr | @throw_stmt;
+
+@implicitly_typeable_object_creation_expr = @object_creation_expr | @explicit_delegate_creation_expr;
+
+implicitly_typed_array_creation(
+  unique int id: @array_creation_expr ref);
+
+explicitly_sized_array_creation(
+  unique int id: @array_creation_expr ref);
+
+stackalloc_array_creation(
+  unique int id: @array_creation_expr ref);
+
+implicitly_typed_object_creation(
+  unique int id: @implicitly_typeable_object_creation_expr ref);
+
+mutator_invocation_mode(
+  unique int id: @operator_invocation_expr ref,
+  int mode: int ref /* prefix = 1, postfix = 2*/);
+
+expr_value(
+  unique int id: @expr ref,
+  string value: string ref);
+
+expr_call(
+  unique int caller_id: @expr ref,
+  int target_id: @callable ref);
+
+expr_access(
+  unique int accesser_id: @access_expr ref,
+  int target_id: @accessible ref);
+
+@accessible = @method | @assignable | @local_function | @namespace;
+
+expr_location(
+  unique int id: @expr ref,
+  int loc: @location ref);
+
+dynamic_member_name(
+  unique int id: @late_bindable_expr ref,
+  string name: string ref);
+
+@qualifiable_expr = @member_access_expr
+                  | @method_invocation_expr
+                  | @element_access_expr;
+
+conditional_access(
+  unique int id: @qualifiable_expr ref);
+
+expr_argument(
+  unique int id: @expr ref,
+  int mode: int ref);
+  /* mode is the same as params: value = 0, ref = 1, out = 2 */
+
+expr_argument_name(
+  unique int id: @expr ref,
+  string name: string ref);
+
+lambda_expr_return_type(
+  unique int id: @lambda_expr ref,
+  int type_id: @type_or_ref ref);
+
+/* Compiler generated */
+
+compiler_generated(unique int id: @element ref);
+
+/** CONTROL/DATA FLOW **/
+
+@control_flow_element = @stmt | @expr;
+
+/* XML Files */
+
+xmlEncoding  (
+  unique int id: @file ref,
+  string encoding: string ref);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+/* Comments */
+
+commentline(
+  unique int id: @commentline,
+  int kind: int ref,
+  string text: string ref,
+  string rawtext: string ref);
+
+case @commentline.kind of
+  0 = @singlelinecomment
+| 1 = @xmldoccomment
+| 2 = @multilinecomment;
+
+commentline_location(
+  unique int id: @commentline ref,
+  int loc: @location ref);
+
+commentblock(
+  unique int id : @commentblock);
+
+commentblock_location(
+  unique int id: @commentblock ref,
+  int loc: @location ref);
+
+commentblock_binding(
+  int id: @commentblock ref,
+  int entity: @element ref,
+  int bindtype: int ref);    /* 0: Parent, 1: Best, 2: Before, 3: After */
+
+commentblock_child(
+  int id: @commentblock ref,
+  int commentline: @commentline ref,
+  int index: int ref);
+
+/* ASP.NET */
+
+case @asp_element.kind of
+  0=@asp_close_tag
+| 1=@asp_code
+| 2=@asp_comment
+| 3=@asp_data_binding
+| 4=@asp_directive
+| 5=@asp_open_tag
+| 6=@asp_quoted_string
+| 7=@asp_text
+| 8=@asp_xml_directive;
+
+@asp_attribute = @asp_code | @asp_data_binding | @asp_quoted_string;
+
+asp_elements(
+  unique int id: @asp_element,
+  int kind: int ref,
+  int loc: @location ref);
+
+asp_comment_server(unique int comment: @asp_comment ref);
+asp_code_inline(unique int code: @asp_code ref);
+asp_directive_attribute(
+  int directive: @asp_directive ref,
+  int index: int ref,
+  string name: string ref,
+  int value: @asp_quoted_string ref);
+asp_directive_name(
+  unique int directive: @asp_directive ref,
+  string name: string ref);
+asp_element_body(
+  unique int element: @asp_element ref,
+  string body: string ref);
+asp_tag_attribute(
+  int tag: @asp_open_tag ref,
+  int index: int ref,
+  string name: string ref,
+  int attribute: @asp_attribute ref);
+asp_tag_name(
+  unique int tag: @asp_open_tag ref,
+  string name: string ref);
+asp_tag_isempty(int tag: @asp_open_tag ref);
diff --git a/csharp/downgrades/605f85053409cd72b4904df3f198ddc8324f3a83/semmlecode.csharp.dbscheme b/csharp/downgrades/605f85053409cd72b4904df3f198ddc8324f3a83/semmlecode.csharp.dbscheme
new file mode 100644
index 00000000000..66044cfa5bb
--- /dev/null
+++ b/csharp/downgrades/605f85053409cd72b4904df3f198ddc8324f3a83/semmlecode.csharp.dbscheme
@@ -0,0 +1,1460 @@
+/* This is a dummy line to alter the dbscheme, so we can make a database upgrade
+ * without actually changing any of the dbscheme predicates. It contains a date
+ * to allow for such updates in the future as well.
+ *
+ * 2021-07-14
+ *
+ * DO NOT remove this comment carelessly, since it can revert the dbscheme back to a
+ * previously seen state (matching a previously seen SHA), which would make the upgrade
+ * mechanism not work properly.
+ */
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+compilation_info(
+  int id : @compilation ref,
+  string info_key: string ref,
+  string info_value: string ref
+)
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | --compiler
+ * 1   | *path to compiler*
+ * 2   | f1.cs
+ * 3   | f2.cs
+ * 4   | f3.cs
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@someFile.rsp` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.cs
+ * 1   | f2.cs
+ * 2   | f3.cs
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The references used by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs /r:ref1.dll /r:ref2.dll /r:ref3.dll
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | ref1.dll
+ * 1   | ref2.dll
+ * 2   | ref3.dll
+ */
+#keyset[id, num]
+compilation_referencing_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    unique int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location ref
+);
+
+extractor_messages(
+    unique int id: @extractor_message,
+    int severity: int ref,
+    string origin : string ref,
+    string text : string ref,
+    string entity : string ref,
+    int location: @location ref,
+    string stack_trace : string ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+compilation_assembly(
+  unique int id : @compilation ref,
+  int assembly: @assembly ref
+)
+
+// Populated by the CSV extractor
+externalData(
+   int id: @externalDataElement,
+   string path: string ref,
+   int column: int ref,
+   string value: string ref);
+
+sourceLocationPrefix(
+  string prefix: string ref);
+
+/*
+ * C# dbscheme
+ */
+
+/** ELEMENTS **/
+
+@element = @declaration | @stmt | @expr | @modifier | @attribute | @namespace_declaration
+         | @using_directive | @type_parameter_constraints | @externalDataElement
+         | @xmllocatable | @asp_element | @namespace | @preprocessor_directive;
+
+@declaration = @callable | @generic | @assignable | @namespace;
+
+@named_element = @namespace | @declaration;
+
+@declaration_with_accessors = @property | @indexer | @event;
+
+@assignable = @variable | @assignable_with_accessors | @event;
+
+@assignable_with_accessors = @property | @indexer;
+
+@attributable = @assembly | @field | @parameter | @operator | @method | @constructor
+              | @destructor | @callable_accessor | @value_or_ref_type | @declaration_with_accessors
+              | @local_function | @lambda_expr;
+
+/** LOCATIONS, ASEMMBLIES, MODULES, FILES and FOLDERS **/
+
+@location = @location_default | @assembly;
+
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref);
+
+locations_mapped(
+  unique int id: @location_default ref,
+  int mapped_to: @location_default ref);
+
+@sourceline = @file | @callable | @xmllocatable;
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref);
+
+assemblies(
+  unique int id: @assembly,
+  int file: @file ref,
+  string fullname: string ref,
+  string name: string ref,
+  string version: string ref);
+
+files(
+  unique int id: @file,
+  string name: string ref);
+
+folders(
+  unique int id: @folder,
+  string name: string ref);
+
+@container = @folder | @file ;
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref);
+
+file_extraction_mode(
+  unique int file: @file ref,
+  int mode: int ref
+  /* 0 = normal, 1 = standalone extractor */
+  );
+
+/** NAMESPACES **/
+
+@type_container = @namespace | @type;
+
+namespaces(
+  unique int id: @namespace,
+  string name: string ref);
+
+namespace_declarations(
+  unique int id: @namespace_declaration,
+  int namespace_id: @namespace ref);
+
+namespace_declaration_location(
+  unique int id: @namespace_declaration ref,
+  int loc: @location ref);
+
+parent_namespace(
+  unique int child_id: @type_container ref,
+  int namespace_id: @namespace ref);
+
+@declaration_or_directive = @namespace_declaration | @type | @using_directive;
+
+parent_namespace_declaration(
+  int child_id: @declaration_or_directive ref, // cannot be unique because of partial classes
+  int namespace_id: @namespace_declaration ref);
+
+@using_directive = @using_namespace_directive | @using_static_directive;
+
+using_global(
+  unique int id: @using_directive ref
+);
+
+using_namespace_directives(
+  unique int id: @using_namespace_directive,
+  int namespace_id: @namespace ref);
+
+using_static_directives(
+  unique int id: @using_static_directive,
+  int type_id: @type_or_ref ref);
+
+using_directive_location(
+  unique int id: @using_directive ref,
+  int loc: @location ref);
+
+@preprocessor_directive = @pragma_warning | @pragma_checksum | @directive_define | @directive_undefine | @directive_warning
+  | @directive_error | @directive_nullable | @directive_line | @directive_region | @directive_endregion | @directive_if
+  | @directive_elif | @directive_else | @directive_endif;
+
+@conditional_directive = @directive_if | @directive_elif;
+@branch_directive = @directive_if | @directive_elif | @directive_else;
+
+directive_ifs(
+  unique int id: @directive_if,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref); /* 0: false, 1: true */
+
+directive_elifs(
+  unique int id: @directive_elif,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref,  /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+directive_elses(
+  unique int id: @directive_else,
+  int branchTaken: int ref,   /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+#keyset[id, start]
+directive_endifs(
+  unique int id: @directive_endif,
+  unique int start: @directive_if ref);
+
+directive_define_symbols(
+  unique int id: @define_symbol_expr ref,
+  string name: string ref);
+
+directive_regions(
+  unique int id: @directive_region,
+  string name: string ref);
+
+#keyset[id, start]
+directive_endregions(
+  unique int id: @directive_endregion,
+  unique int start: @directive_region ref);
+
+directive_lines(
+  unique int id: @directive_line,
+  int kind: int ref); /* 0: default, 1: hidden, 2: numeric, 3: span */
+
+directive_line_value(
+  unique int id: @directive_line ref,
+  int line: int ref);
+
+directive_line_file(
+  unique int id: @directive_line ref,
+  int file: @file ref);
+
+directive_line_offset(
+  unique int id: @directive_line ref,
+  int offset: int ref);
+
+directive_line_span(
+  unique int id: @directive_line ref,
+  int startLine: int ref,
+  int startColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref);
+
+directive_nullables(
+  unique int id: @directive_nullable,
+  int setting: int ref, /* 0: disable, 1: enable, 2: restore */
+  int target: int ref); /* 0: none, 1: annotations, 2: warnings */
+
+directive_warnings(
+  unique int id: @directive_warning,
+  string message: string ref);
+
+directive_errors(
+  unique int id: @directive_error,
+  string message: string ref);
+
+directive_undefines(
+  unique int id: @directive_undefine,
+  string name: string ref);
+
+directive_defines(
+  unique int id: @directive_define,
+  string name: string ref);
+
+pragma_checksums(
+  unique int id: @pragma_checksum,
+  int file: @file ref,
+  string guid: string ref,
+  string bytes: string ref);
+
+pragma_warnings(
+  unique int id: @pragma_warning,
+  int kind: int ref /* 0 = disable, 1 = restore */);
+
+#keyset[id, index]
+pragma_warning_error_codes(
+  int id: @pragma_warning ref,
+  string errorCode: string ref,
+  int index: int ref);
+
+preprocessor_directive_location(
+  unique int id: @preprocessor_directive ref,
+  int loc: @location ref);
+
+preprocessor_directive_compilation(
+  int id: @preprocessor_directive ref,
+  int compilation: @compilation ref);
+
+preprocessor_directive_active(
+  unique int id: @preprocessor_directive ref,
+  int active: int ref);  /* 0: false, 1: true */
+
+/** TYPES **/
+
+types(
+  unique int id: @type,
+  int kind: int ref,
+  string name: string ref);
+
+case @type.kind of
+   1 = @bool_type
+|  2 = @char_type
+|  3 = @decimal_type
+|  4 = @sbyte_type
+|  5 = @short_type
+|  6 = @int_type
+|  7 = @long_type
+|  8 = @byte_type
+|  9 = @ushort_type
+| 10 = @uint_type
+| 11 = @ulong_type
+| 12 = @float_type
+| 13 = @double_type
+| 14 = @enum_type
+| 15 = @struct_type
+| 17 = @class_type
+| 19 = @interface_type
+| 20 = @delegate_type
+| 21 = @null_type
+| 22 = @type_parameter
+| 23 = @pointer_type
+| 24 = @nullable_type
+| 25 = @array_type
+| 26 = @void_type
+| 27 = @int_ptr_type
+| 28 = @uint_ptr_type
+| 29 = @dynamic_type
+| 30 = @arglist_type
+| 31 = @unknown_type
+| 32 = @tuple_type
+| 33 = @function_pointer_type
+| 34 = @inline_array_type
+  ;
+
+@simple_type = @bool_type | @char_type | @integral_type | @floating_point_type | @decimal_type;
+@integral_type = @signed_integral_type | @unsigned_integral_type;
+@signed_integral_type = @sbyte_type | @short_type | @int_type | @long_type;
+@unsigned_integral_type = @byte_type  | @ushort_type | @uint_type | @ulong_type;
+@floating_point_type = @float_type | @double_type;
+@value_type = @simple_type | @enum_type | @struct_type | @nullable_type | @int_ptr_type
+            | @uint_ptr_type | @tuple_type | @void_type | @inline_array_type;
+@ref_type = @class_type | @interface_type | @array_type | @delegate_type | @null_type
+          | @dynamic_type;
+@value_or_ref_type = @value_type | @ref_type;
+
+typerefs(
+  unique int id: @typeref,
+  string name: string ref);
+
+typeref_type(
+  int id: @typeref ref,
+  unique int typeId: @type ref);
+
+@type_or_ref = @type | @typeref;
+
+array_element_type(
+  unique int array: @array_type ref,
+  int dimension: int ref,
+  int rank: int ref,
+  int element: @type_or_ref ref);
+
+nullable_underlying_type(
+  unique int nullable: @nullable_type ref,
+  int underlying: @type_or_ref ref);
+
+pointer_referent_type(
+  unique int pointer: @pointer_type ref,
+  int referent: @type_or_ref ref);
+
+enum_underlying_type(
+  unique int enum_id: @enum_type ref,
+  int underlying_type_id: @type_or_ref ref);
+
+delegate_return_type(
+  unique int delegate_id: @delegate_type ref,
+  int return_type_id: @type_or_ref ref);
+
+function_pointer_return_type(
+    unique int function_pointer_id: @function_pointer_type ref,
+    int return_type_id: @type_or_ref ref);
+
+extend(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+anonymous_types(
+  unique int id: @type ref);
+
+@interface_or_ref = @interface_type | @typeref;
+
+implement(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+type_location(
+  int id: @type ref,
+  int loc: @location ref);
+
+tuple_underlying_type(
+  unique int tuple: @tuple_type ref,
+  int struct: @type_or_ref ref);
+
+#keyset[tuple, index]
+tuple_element(
+  int tuple: @tuple_type ref,
+  int index: int ref,
+  unique int field: @field ref);
+
+attributes(
+  unique int id: @attribute,
+  int kind: int ref,
+  int type_id: @type_or_ref ref,
+  int target:  @attributable ref);
+
+case @attribute.kind of
+  0 = @attribute_default
+| 1 = @attribute_return
+| 2 = @attribute_assembly
+| 3 = @attribute_module
+;
+
+attribute_location(
+  int id: @attribute ref,
+  int loc: @location ref);
+
+@type_mention_parent = @element | @type_mention;
+
+type_mention(
+  unique int id: @type_mention,
+  int type_id: @type_or_ref ref,
+  int parent: @type_mention_parent ref);
+
+type_mention_location(
+  unique int id: @type_mention ref,
+  int loc: @location ref);
+
+@has_type_annotation = @assignable | @type_parameter | @callable | @expr | @delegate_type | @generic | @function_pointer_type;
+
+/**
+ * A direct annotation on an entity, for example `string? x;`.
+ *
+ * Annotations:
+ * 2 = reftype is not annotated "!"
+ * 3 = reftype is annotated "?"
+ * 4 = readonly ref type / in parameter
+ * 5 = ref type parameter, return or local variable
+ * 6 = out parameter
+ *
+ * Note that the annotation depends on the element it annotates.
+ * @assignable: The annotation is on the type of the assignable, for example the variable type.
+ * @type_parameter: The annotation is on the reftype constraint
+ * @callable: The annotation is on the return type
+ * @array_type: The annotation is on the element type
+ */
+type_annotation(int id: @has_type_annotation ref, int annotation: int ref);
+
+nullability(unique int nullability: @nullability, int kind: int ref);
+
+case @nullability.kind of
+  0 = @oblivious
+| 1 = @not_annotated
+| 2 = @annotated
+;
+
+#keyset[parent, index]
+nullability_parent(int nullability: @nullability ref, int index: int ref, int parent: @nullability ref)
+
+type_nullability(int id: @has_type_annotation ref, int nullability: @nullability ref);
+
+/**
+ * The nullable flow state of an expression, as determined by Roslyn.
+ *   0 = none (default, not populated)
+ *   1 = not null
+ *   2 = maybe null
+ */
+expr_flowstate(unique int id: @expr ref, int state: int ref);
+
+/** GENERICS **/
+
+@generic = @type | @method | @local_function;
+
+type_parameters(
+  unique int id: @type_parameter ref,
+  int index: int ref,
+  int generic_id: @generic ref,
+  int variance: int ref /* none = 0, out = 1, in = 2 */);
+
+#keyset[constructed_id, index]
+type_arguments(
+  int id: @type_or_ref ref,
+  int index: int ref,
+  int constructed_id: @generic_or_ref ref);
+
+@generic_or_ref = @generic | @typeref;
+
+constructed_generic(
+  unique int constructed: @generic ref,
+  int generic: @generic_or_ref ref);
+
+type_parameter_constraints(
+  unique int id: @type_parameter_constraints,
+  int param_id: @type_parameter ref);
+
+type_parameter_constraints_location(
+  int id: @type_parameter_constraints ref,
+  int loc: @location ref);
+
+general_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int kind: int ref /* class = 1, struct = 2, new = 3 */);
+
+specific_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref);
+
+specific_type_parameter_nullability(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref,
+  int nullability: @nullability ref);
+
+/** FUNCTION POINTERS */
+
+function_pointer_calling_conventions(
+  int id: @function_pointer_type ref,
+  int kind: int ref);
+
+#keyset[id, index]
+has_unmanaged_calling_conventions(
+  int id: @function_pointer_type ref,
+  int index: int ref,
+  int conv_id: @type_or_ref ref);
+
+/** MODIFIERS */
+
+@modifiable = @modifiable_direct | @event_accessor;
+
+@modifiable_direct = @member | @accessor | @local_function | @anonymous_function_expr;
+
+modifiers(
+  unique int id: @modifier,
+  string name: string ref);
+
+has_modifiers(
+  int id: @modifiable_direct ref,
+  int mod_id: @modifier ref);
+
+/** MEMBERS **/
+
+@member = @method | @constructor | @destructor | @field | @property | @event | @operator | @indexer | @type;
+
+@named_exprorstmt = @goto_stmt | @labeled_stmt | @expr;
+
+@virtualizable = @method | @property | @indexer | @event | @operator;
+
+exprorstmt_name(
+  unique int parent_id: @named_exprorstmt ref,
+  string name: string ref);
+
+nested_types(
+  unique int id: @type ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @type ref);
+
+properties(
+  unique int id: @property,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @property ref);
+
+property_location(
+  int id: @property ref,
+  int loc: @location ref);
+
+indexers(
+  unique int id: @indexer,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @indexer ref);
+
+indexer_location(
+  int id: @indexer ref,
+  int loc: @location ref);
+
+accessors(
+  unique int id: @accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_member_id: @member ref,
+  int unbound_id: @accessor ref);
+
+case @accessor.kind of
+  1 = @getter
+| 2 = @setter
+  ;
+
+init_only_accessors(
+  unique int id: @accessor ref);
+
+accessor_location(
+  int id: @accessor ref,
+  int loc: @location ref);
+
+events(
+  unique int id: @event,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @event ref);
+
+event_location(
+  int id: @event ref,
+  int loc: @location ref);
+
+event_accessors(
+  unique int id: @event_accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_event_id: @event ref,
+  int unbound_id: @event_accessor ref);
+
+case @event_accessor.kind of
+  1 = @add_event_accessor
+| 2 = @remove_event_accessor
+  ;
+
+event_accessor_location(
+  int id: @event_accessor ref,
+  int loc: @location ref);
+
+operators(
+  unique int id: @operator,
+  string name: string ref,
+  string symbol: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @operator ref);
+
+operator_location(
+  int id: @operator ref,
+  int loc: @location ref);
+
+constant_value(
+  int id: @variable ref,
+  string value: string ref);
+
+/** CALLABLES **/
+
+@callable = @method | @constructor | @destructor | @operator | @callable_accessor | @anonymous_function_expr | @local_function;
+
+@callable_accessor = @accessor | @event_accessor;
+
+methods(
+  unique int id: @method,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @method ref);
+
+method_location(
+  int id: @method ref,
+  int loc: @location ref);
+
+constructors(
+  unique int id: @constructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @constructor ref);
+
+constructor_location(
+  int id: @constructor ref,
+  int loc: @location ref);
+
+destructors(
+  unique int id: @destructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @destructor ref);
+
+destructor_location(
+  int id: @destructor ref,
+  int loc: @location ref);
+
+overrides(
+  int id: @callable ref,
+  int base_id: @callable ref);
+
+explicitly_implements(
+  int id: @member ref,
+  int interface_id: @interface_or_ref ref);
+
+local_functions(
+    unique int id: @local_function,
+    string name: string ref,
+    int return_type: @type ref,
+    int unbound_id: @local_function ref);
+
+local_function_stmts(
+    unique int fn: @local_function_stmt ref,
+    int stmt: @local_function ref);
+
+/** VARIABLES **/
+
+@variable = @local_scope_variable | @field;
+
+@local_scope_variable = @local_variable | @parameter;
+
+fields(
+  unique int id: @field,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @field ref);
+
+case @field.kind of
+  1 = @addressable_field
+| 2 = @constant
+  ;
+
+field_location(
+  int id: @field ref,
+  int loc: @location ref);
+
+localvars(
+  unique int id: @local_variable,
+  int kind: int ref,
+  string name: string ref,
+  int implicitly_typed: int ref /* 0 = no, 1 = yes */,
+  int type_id: @type_or_ref ref,
+  int parent_id: @local_var_decl_expr ref);
+
+case @local_variable.kind of
+  1 = @addressable_local_variable
+| 2 = @local_constant
+| 3 = @local_variable_ref
+  ;
+
+localvar_location(
+  unique int id: @local_variable ref,
+  int loc: @location ref);
+
+@parameterizable = @callable | @delegate_type | @indexer | @function_pointer_type;
+
+#keyset[name, parent_id]
+#keyset[index, parent_id]
+params(
+  unique int id: @parameter,
+  string name: string ref,
+  int type_id: @type_or_ref ref,
+  int index: int ref,
+  int mode: int ref, /* value = 0, ref = 1, out = 2, params/array = 3, this = 4, in = 5, ref readonly = 6 */
+  int parent_id: @parameterizable ref,
+  int unbound_id: @parameter ref);
+
+param_location(
+  int id: @parameter ref,
+  int loc: @location ref);
+
+@has_scoped_annotation = @local_scope_variable
+
+scoped_annotation(
+  int id: @has_scoped_annotation ref,
+  int kind: int ref // scoped ref = 1, scoped value = 2
+  );
+
+/** STATEMENTS **/
+
+@exprorstmt_parent = @control_flow_element | @top_level_exprorstmt_parent;
+
+statements(
+  unique int id: @stmt,
+  int kind: int ref);
+
+#keyset[index, parent]
+stmt_parent(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_stmt_parent = @callable;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+stmt_parent_top_level(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @top_level_stmt_parent ref);
+
+case @stmt.kind of
+   1 = @block_stmt
+|  2 = @expr_stmt
+|  3 = @if_stmt
+|  4 = @switch_stmt
+|  5 = @while_stmt
+|  6 = @do_stmt
+|  7 = @for_stmt
+|  8 = @foreach_stmt
+|  9 = @break_stmt
+| 10 = @continue_stmt
+| 11 = @goto_stmt
+| 12 = @goto_case_stmt
+| 13 = @goto_default_stmt
+| 14 = @throw_stmt
+| 15 = @return_stmt
+| 16 = @yield_stmt
+| 17 = @try_stmt
+| 18 = @checked_stmt
+| 19 = @unchecked_stmt
+| 20 = @lock_stmt
+| 21 = @using_block_stmt
+| 22 = @var_decl_stmt
+| 23 = @const_decl_stmt
+| 24 = @empty_stmt
+| 25 = @unsafe_stmt
+| 26 = @fixed_stmt
+| 27 = @label_stmt
+| 28 = @catch
+| 29 = @case_stmt
+| 30 = @local_function_stmt
+| 31 = @using_decl_stmt
+  ;
+
+@using_stmt = @using_block_stmt | @using_decl_stmt;
+
+@labeled_stmt = @label_stmt | @case;
+
+@decl_stmt = @var_decl_stmt | @const_decl_stmt | @using_decl_stmt;
+
+@cond_stmt = @if_stmt | @switch_stmt;
+
+@loop_stmt = @while_stmt | @do_stmt | @for_stmt | @foreach_stmt;
+
+@jump_stmt = @break_stmt | @goto_any_stmt | @continue_stmt | @throw_stmt | @return_stmt
+           | @yield_stmt;
+
+@goto_any_stmt = @goto_default_stmt | @goto_case_stmt | @goto_stmt;
+
+
+stmt_location(
+  unique int id: @stmt ref,
+  int loc: @location ref);
+
+catch_type(
+  unique int catch_id: @catch ref,
+  int type_id: @type_or_ref ref,
+  int kind: int ref /* explicit = 1, implicit = 2 */);
+
+foreach_stmt_info(
+  unique int id: @foreach_stmt ref,
+  int kind: int ref /* non-async = 1, async = 2 */);
+
+@foreach_symbol =  @method | @property | @type_or_ref;
+
+#keyset[id, kind]
+foreach_stmt_desugar(
+  int id: @foreach_stmt ref,
+  int symbol: @foreach_symbol ref,
+  int kind: int ref /* GetEnumeratorMethod = 1, CurrentProperty = 2, MoveNextMethod = 3, DisposeMethod = 4, ElementType = 5 */);
+
+/** EXPRESSIONS **/
+
+expressions(
+  unique int id: @expr,
+  int kind: int ref,
+  int type_id: @type_or_ref ref);
+
+#keyset[index, parent]
+expr_parent(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_expr_parent = @attribute | @field | @property | @indexer | @parameter | @directive_if | @directive_elif;
+
+@top_level_exprorstmt_parent = @top_level_expr_parent | @top_level_stmt_parent;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+expr_parent_top_level(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @top_level_exprorstmt_parent ref);
+
+case @expr.kind of
+/* literal */
+   1 = @bool_literal_expr
+|  2 = @char_literal_expr
+|  3 = @decimal_literal_expr
+|  4 = @int_literal_expr
+|  5 = @long_literal_expr
+|  6 = @uint_literal_expr
+|  7 = @ulong_literal_expr
+|  8 = @float_literal_expr
+|  9 = @double_literal_expr
+| 10 = @utf16_string_literal_expr
+| 11 = @null_literal_expr
+/* primary & unary */
+| 12 = @this_access_expr
+| 13 = @base_access_expr
+| 14 = @local_variable_access_expr
+| 15 = @parameter_access_expr
+| 16 = @field_access_expr
+| 17 = @property_access_expr
+| 18 = @method_access_expr
+| 19 = @event_access_expr
+| 20 = @indexer_access_expr
+| 21 = @array_access_expr
+| 22 = @type_access_expr
+| 23 = @typeof_expr
+| 24 = @method_invocation_expr
+| 25 = @delegate_invocation_expr
+| 26 = @operator_invocation_expr
+| 27 = @cast_expr
+| 28 = @object_creation_expr
+| 29 = @explicit_delegate_creation_expr
+| 30 = @implicit_delegate_creation_expr
+| 31 = @array_creation_expr
+| 32 = @default_expr
+| 33 = @plus_expr
+| 34 = @minus_expr
+| 35 = @bit_not_expr
+| 36 = @log_not_expr
+| 37 = @post_incr_expr
+| 38 = @post_decr_expr
+| 39 = @pre_incr_expr
+| 40 = @pre_decr_expr
+/* multiplicative */
+| 41 = @mul_expr
+| 42 = @div_expr
+| 43 = @rem_expr
+/* additive */
+| 44 = @add_expr
+| 45 = @sub_expr
+/* shift */
+| 46 = @lshift_expr
+| 47 = @rshift_expr
+/* relational */
+| 48 = @lt_expr
+| 49 = @gt_expr
+| 50 = @le_expr
+| 51 = @ge_expr
+/* equality */
+| 52 = @eq_expr
+| 53 = @ne_expr
+/* logical */
+| 54 = @bit_and_expr
+| 55 = @bit_xor_expr
+| 56 = @bit_or_expr
+| 57 = @log_and_expr
+| 58 = @log_or_expr
+/* type testing */
+| 59 = @is_expr
+| 60 = @as_expr
+/* null coalescing */
+| 61 = @null_coalescing_expr
+/* conditional */
+| 62 = @conditional_expr
+/* assignment */
+| 63 = @simple_assign_expr
+| 64 = @assign_add_expr
+| 65 = @assign_sub_expr
+| 66 = @assign_mul_expr
+| 67 = @assign_div_expr
+| 68 = @assign_rem_expr
+| 69 = @assign_and_expr
+| 70 = @assign_xor_expr
+| 71 = @assign_or_expr
+| 72 = @assign_lshift_expr
+| 73 = @assign_rshift_expr
+/* more */
+| 74 = @object_init_expr
+| 75 = @collection_init_expr
+| 76 = @array_init_expr
+| 77 = @checked_expr
+| 78 = @unchecked_expr
+| 79 = @constructor_init_expr
+| 80 = @add_event_expr
+| 81 = @remove_event_expr
+| 82 = @par_expr
+| 83 = @local_var_decl_expr
+| 84 = @lambda_expr
+| 85 = @anonymous_method_expr
+| 86 = @namespace_expr
+/* dynamic */
+| 92 = @dynamic_element_access_expr
+| 93 = @dynamic_member_access_expr
+/* unsafe */
+| 100 = @pointer_indirection_expr
+| 101 = @address_of_expr
+| 102 = @sizeof_expr
+/* async */
+| 103 = @await_expr
+/* C# 6.0 */
+| 104 = @nameof_expr
+| 105 = @interpolated_string_expr
+| 106 = @unknown_expr
+/* C# 7.0 */
+| 107 = @throw_expr
+| 108 = @tuple_expr
+| 109 = @local_function_invocation_expr
+| 110 = @ref_expr
+| 111 = @discard_expr
+/* C# 8.0 */
+| 112 = @range_expr
+| 113 = @index_expr
+| 114 = @switch_expr
+| 115 = @recursive_pattern_expr
+| 116 = @property_pattern_expr
+| 117 = @positional_pattern_expr
+| 118 = @switch_case_expr
+| 119 = @assign_coalesce_expr
+| 120 = @suppress_nullable_warning_expr
+| 121 = @namespace_access_expr
+/* C# 9.0 */
+| 122 = @lt_pattern_expr
+| 123 = @gt_pattern_expr
+| 124 = @le_pattern_expr
+| 125 = @ge_pattern_expr
+| 126 = @not_pattern_expr
+| 127 = @and_pattern_expr
+| 128 = @or_pattern_expr
+| 129 = @function_pointer_invocation_expr
+| 130 = @with_expr
+/* C# 11.0 */
+| 131 = @list_pattern_expr
+| 132 = @slice_pattern_expr
+| 133 = @urshift_expr
+| 134 = @assign_urshift_expr
+| 135 = @utf8_string_literal_expr
+/* C# 12.0 */
+| 136 = @collection_expr
+| 137 = @spread_element_expr
+| 138 = @interpolated_string_insert_expr
+/* Preprocessor */
+| 999 = @define_symbol_expr
+;
+
+@switch = @switch_stmt | @switch_expr;
+@case = @case_stmt | @switch_case_expr;
+@pattern_match = @case | @is_expr;
+@unary_pattern_expr = @not_pattern_expr;
+@relational_pattern_expr = @gt_pattern_expr | @lt_pattern_expr | @ge_pattern_expr | @le_pattern_expr;
+@binary_pattern_expr = @and_pattern_expr | @or_pattern_expr;
+
+@integer_literal_expr = @int_literal_expr | @long_literal_expr | @uint_literal_expr | @ulong_literal_expr;
+@real_literal_expr = @float_literal_expr | @double_literal_expr | @decimal_literal_expr;
+@string_literal_expr = @utf16_string_literal_expr | @utf8_string_literal_expr;
+@literal_expr = @bool_literal_expr | @char_literal_expr | @integer_literal_expr | @real_literal_expr
+              | @string_literal_expr | @null_literal_expr;
+
+@assign_expr = @simple_assign_expr | @assign_op_expr | @local_var_decl_expr;
+@assign_op_expr =  @assign_arith_expr | @assign_bitwise_expr | @assign_event_expr | @assign_coalesce_expr;
+@assign_event_expr = @add_event_expr | @remove_event_expr;
+
+@assign_arith_expr = @assign_add_expr | @assign_sub_expr | @assign_mul_expr | @assign_div_expr
+                   | @assign_rem_expr
+@assign_bitwise_expr = @assign_and_expr | @assign_or_expr | @assign_xor_expr
+                   | @assign_lshift_expr | @assign_rshift_expr | @assign_urshift_expr;
+
+@member_access_expr = @field_access_expr | @property_access_expr | @indexer_access_expr | @event_access_expr
+                    | @method_access_expr | @type_access_expr | @dynamic_member_access_expr;
+@access_expr = @member_access_expr | @this_access_expr | @base_access_expr | @assignable_access_expr | @namespace_access_expr;
+@element_access_expr = @indexer_access_expr | @array_access_expr | @dynamic_element_access_expr;
+
+@local_variable_access = @local_variable_access_expr | @local_var_decl_expr;
+@local_scope_variable_access_expr = @parameter_access_expr | @local_variable_access;
+@variable_access_expr = @local_scope_variable_access_expr | @field_access_expr;
+
+@assignable_access_expr = @variable_access_expr | @property_access_expr | @element_access_expr
+                        | @event_access_expr | @dynamic_member_access_expr;
+
+@objectorcollection_init_expr = @object_init_expr | @collection_init_expr;
+
+@delegate_creation_expr = @explicit_delegate_creation_expr | @implicit_delegate_creation_expr;
+
+@bin_arith_op_expr = @mul_expr | @div_expr | @rem_expr | @add_expr | @sub_expr;
+@incr_op_expr =  @pre_incr_expr | @post_incr_expr;
+@decr_op_expr =  @pre_decr_expr | @post_decr_expr;
+@mut_op_expr = @incr_op_expr | @decr_op_expr;
+@un_arith_op_expr = @plus_expr | @minus_expr | @mut_op_expr;
+@arith_op_expr = @bin_arith_op_expr | @un_arith_op_expr;
+
+@ternary_log_op_expr = @conditional_expr;
+@bin_log_op_expr = @log_and_expr | @log_or_expr | @null_coalescing_expr;
+@un_log_op_expr = @log_not_expr;
+@log_expr = @un_log_op_expr | @bin_log_op_expr | @ternary_log_op_expr;
+
+@bin_bit_op_expr =  @bit_and_expr | @bit_or_expr | @bit_xor_expr | @lshift_expr
+                 | @rshift_expr | @urshift_expr;
+@un_bit_op_expr = @bit_not_expr;
+@bit_expr = @un_bit_op_expr | @bin_bit_op_expr;
+
+@equality_op_expr =  @eq_expr | @ne_expr;
+@rel_op_expr = @gt_expr | @lt_expr| @ge_expr | @le_expr;
+@comp_expr = @equality_op_expr | @rel_op_expr;
+
+@op_expr = @assign_expr | @un_op | @bin_op | @ternary_op;
+
+@ternary_op = @ternary_log_op_expr;
+@bin_op = @bin_arith_op_expr | @bin_log_op_expr | @bin_bit_op_expr | @comp_expr;
+@un_op = @un_arith_op_expr | @un_log_op_expr | @un_bit_op_expr | @sizeof_expr
+       | @pointer_indirection_expr | @address_of_expr;
+
+@anonymous_function_expr = @lambda_expr | @anonymous_method_expr;
+
+@call = @method_invocation_expr | @constructor_init_expr | @operator_invocation_expr
+      | @delegate_invocation_expr | @object_creation_expr | @call_access_expr
+      | @local_function_invocation_expr | @function_pointer_invocation_expr;
+
+@call_access_expr = @property_access_expr | @event_access_expr | @indexer_access_expr;
+
+@late_bindable_expr = @dynamic_element_access_expr | @dynamic_member_access_expr
+                    | @object_creation_expr | @method_invocation_expr | @operator_invocation_expr;
+
+@throw_element = @throw_expr | @throw_stmt;
+
+@implicitly_typeable_object_creation_expr = @object_creation_expr | @explicit_delegate_creation_expr;
+
+implicitly_typed_array_creation(
+  unique int id: @array_creation_expr ref);
+
+explicitly_sized_array_creation(
+  unique int id: @array_creation_expr ref);
+
+stackalloc_array_creation(
+  unique int id: @array_creation_expr ref);
+
+implicitly_typed_object_creation(
+  unique int id: @implicitly_typeable_object_creation_expr ref);
+
+mutator_invocation_mode(
+  unique int id: @operator_invocation_expr ref,
+  int mode: int ref /* prefix = 1, postfix = 2*/);
+
+expr_value(
+  unique int id: @expr ref,
+  string value: string ref);
+
+expr_call(
+  unique int caller_id: @expr ref,
+  int target_id: @callable ref);
+
+expr_access(
+  unique int accesser_id: @access_expr ref,
+  int target_id: @accessible ref);
+
+@accessible = @method | @assignable | @local_function | @namespace;
+
+expr_location(
+  unique int id: @expr ref,
+  int loc: @location ref);
+
+dynamic_member_name(
+  unique int id: @late_bindable_expr ref,
+  string name: string ref);
+
+@qualifiable_expr = @member_access_expr
+                  | @method_invocation_expr
+                  | @element_access_expr;
+
+conditional_access(
+  unique int id: @qualifiable_expr ref);
+
+expr_argument(
+  unique int id: @expr ref,
+  int mode: int ref);
+  /* mode is the same as params: value = 0, ref = 1, out = 2 */
+
+expr_argument_name(
+  unique int id: @expr ref,
+  string name: string ref);
+
+lambda_expr_return_type(
+  unique int id: @lambda_expr ref,
+  int type_id: @type_or_ref ref);
+
+/* Compiler generated */
+
+compiler_generated(unique int id: @element ref);
+
+/** CONTROL/DATA FLOW **/
+
+@control_flow_element = @stmt | @expr;
+
+/* XML Files */
+
+xmlEncoding  (
+  unique int id: @file ref,
+  string encoding: string ref);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+/* Comments */
+
+commentline(
+  unique int id: @commentline,
+  int kind: int ref,
+  string text: string ref,
+  string rawtext: string ref);
+
+case @commentline.kind of
+  0 = @singlelinecomment
+| 1 = @xmldoccomment
+| 2 = @multilinecomment;
+
+commentline_location(
+  unique int id: @commentline ref,
+  int loc: @location ref);
+
+commentblock(
+  unique int id : @commentblock);
+
+commentblock_location(
+  unique int id: @commentblock ref,
+  int loc: @location ref);
+
+commentblock_binding(
+  int id: @commentblock ref,
+  int entity: @element ref,
+  int bindtype: int ref);    /* 0: Parent, 1: Best, 2: Before, 3: After */
+
+commentblock_child(
+  int id: @commentblock ref,
+  int commentline: @commentline ref,
+  int index: int ref);
+
+/* ASP.NET */
+
+case @asp_element.kind of
+  0=@asp_close_tag
+| 1=@asp_code
+| 2=@asp_comment
+| 3=@asp_data_binding
+| 4=@asp_directive
+| 5=@asp_open_tag
+| 6=@asp_quoted_string
+| 7=@asp_text
+| 8=@asp_xml_directive;
+
+@asp_attribute = @asp_code | @asp_data_binding | @asp_quoted_string;
+
+asp_elements(
+  unique int id: @asp_element,
+  int kind: int ref,
+  int loc: @location ref);
+
+asp_comment_server(unique int comment: @asp_comment ref);
+asp_code_inline(unique int code: @asp_code ref);
+asp_directive_attribute(
+  int directive: @asp_directive ref,
+  int index: int ref,
+  string name: string ref,
+  int value: @asp_quoted_string ref);
+asp_directive_name(
+  unique int directive: @asp_directive ref,
+  string name: string ref);
+asp_element_body(
+  unique int element: @asp_element ref,
+  string body: string ref);
+asp_tag_attribute(
+  int tag: @asp_open_tag ref,
+  int index: int ref,
+  string name: string ref,
+  int attribute: @asp_attribute ref);
+asp_tag_name(
+  unique int tag: @asp_open_tag ref,
+  string name: string ref);
+asp_tag_isempty(int tag: @asp_open_tag ref);
diff --git a/csharp/downgrades/605f85053409cd72b4904df3f198ddc8324f3a83/upgrade.properties b/csharp/downgrades/605f85053409cd72b4904df3f198ddc8324f3a83/upgrade.properties
new file mode 100644
index 00000000000..f9e0669d521
--- /dev/null
+++ b/csharp/downgrades/605f85053409cd72b4904df3f198ddc8324f3a83/upgrade.properties
@@ -0,0 +1,4 @@
+description: Delete databaseMetadata and overlayChangedFiles relations
+compatibility: full
+databaseMetadata.rel: delete
+overlayChangedFiles.rel: delete
diff --git a/csharp/downgrades/68b5aec54e50fe7e375df3777b756a746ca3a37c/old.dbscheme b/csharp/downgrades/68b5aec54e50fe7e375df3777b756a746ca3a37c/old.dbscheme
new file mode 100644
index 00000000000..68b5aec54e5
--- /dev/null
+++ b/csharp/downgrades/68b5aec54e50fe7e375df3777b756a746ca3a37c/old.dbscheme
@@ -0,0 +1,1484 @@
+/* This is a dummy line to alter the dbscheme, so we can make a database upgrade
+ * without actually changing any of the dbscheme predicates. It contains a date
+ * to allow for such updates in the future as well.
+ *
+ * 2021-07-14
+ *
+ * DO NOT remove this comment carelessly, since it can revert the dbscheme back to a
+ * previously seen state (matching a previously seen SHA), which would make the upgrade
+ * mechanism not work properly.
+ */
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+compilation_info(
+  int id : @compilation ref,
+  string info_key: string ref,
+  string info_value: string ref
+)
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | --compiler
+ * 1   | *path to compiler*
+ * 2   | f1.cs
+ * 3   | f2.cs
+ * 4   | f3.cs
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@someFile.rsp` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.cs
+ * 1   | f2.cs
+ * 2   | f3.cs
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The references used by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs /r:ref1.dll /r:ref2.dll /r:ref3.dll
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | ref1.dll
+ * 1   | ref2.dll
+ * 2   | ref3.dll
+ */
+#keyset[id, num]
+compilation_referencing_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    unique int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location ref
+);
+
+extractor_messages(
+    unique int id: @extractor_message,
+    int severity: int ref,
+    string origin : string ref,
+    string text : string ref,
+    string entity : string ref,
+    int location: @location ref,
+    string stack_trace : string ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+compilation_assembly(
+  unique int id : @compilation ref,
+  int assembly: @assembly ref
+)
+
+// Populated by the CSV extractor
+externalData(
+   int id: @externalDataElement,
+   string path: string ref,
+   int column: int ref,
+   string value: string ref);
+
+sourceLocationPrefix(
+  string prefix: string ref);
+
+/*
+ * Overlay support
+ */
+
+/**
+ * The CLI will automatically emit the tuple `databaseMetadata("isOverlay", "true")`,
+ * along with an `overlayChangedFiles` tuple for each new/modified/deleted file,
+ * when building an overlay database, and these can be used by the discard predicates.
+ */
+databaseMetadata(
+  string metadataKey : string ref,
+  string value : string ref
+);
+
+overlayChangedFiles(
+  string path : string ref
+);
+
+/*
+ * C# dbscheme
+ */
+
+/** ELEMENTS **/
+
+@element = @declaration | @stmt | @expr | @modifier | @attribute | @namespace_declaration
+         | @using_directive | @type_parameter_constraints | @externalDataElement
+         | @xmllocatable | @asp_element | @namespace | @preprocessor_directive;
+
+@declaration = @callable | @generic | @assignable | @namespace;
+
+@named_element = @namespace | @declaration;
+
+@declaration_with_accessors = @property | @indexer | @event;
+
+@assignable = @variable | @assignable_with_accessors | @event;
+
+@assignable_with_accessors = @property | @indexer;
+
+@attributable = @assembly | @field | @parameter | @operator | @method | @constructor
+              | @destructor | @callable_accessor | @value_or_ref_type | @declaration_with_accessors
+              | @local_function | @lambda_expr;
+
+/** LOCATIONS, ASEMMBLIES, MODULES, FILES and FOLDERS **/
+
+@location = @location_default | @assembly;
+
+@locatable = @declaration_with_accessors | @callable_accessor | @declaration_or_directive
+           | @diagnostic | @extractor_message | @preprocessor_directive | @attribute | @type_mention | @type_parameter_constraints
+           | @declaration_with_accessors | @callable_accessor | @operator | @method
+           | @constructor | @destructor | @field | @local_variable | @parameter | @stmt | @expr
+           | @xmllocatable | @commentline | @commentblock | @asp_element
+
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref);
+
+locations_mapped(
+  unique int id: @location_default ref,
+  int mapped_to: @location_default ref);
+
+@sourceline = @file | @callable | @xmllocatable;
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref);
+
+assemblies(
+  unique int id: @assembly,
+  int file: @file ref,
+  string fullname: string ref,
+  string name: string ref,
+  string version: string ref);
+
+files(
+  unique int id: @file,
+  string name: string ref);
+
+folders(
+  unique int id: @folder,
+  string name: string ref);
+
+@container = @folder | @file ;
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref);
+
+file_extraction_mode(
+  unique int file: @file ref,
+  int mode: int ref
+  /* 0 = normal, 1 = standalone extractor */
+  );
+
+/** NAMESPACES **/
+
+@type_container = @namespace | @type;
+
+namespaces(
+  unique int id: @namespace,
+  string name: string ref);
+
+namespace_declarations(
+  unique int id: @namespace_declaration,
+  int namespace_id: @namespace ref);
+
+namespace_declaration_location(
+  unique int id: @namespace_declaration ref,
+  int loc: @location ref);
+
+parent_namespace(
+  unique int child_id: @type_container ref,
+  int namespace_id: @namespace ref);
+
+@declaration_or_directive = @namespace_declaration | @type | @using_directive;
+
+parent_namespace_declaration(
+  int child_id: @declaration_or_directive ref, // cannot be unique because of partial classes
+  int namespace_id: @namespace_declaration ref);
+
+@using_directive = @using_namespace_directive | @using_static_directive;
+
+using_global(
+  unique int id: @using_directive ref
+);
+
+using_namespace_directives(
+  unique int id: @using_namespace_directive,
+  int namespace_id: @namespace ref);
+
+using_static_directives(
+  unique int id: @using_static_directive,
+  int type_id: @type_or_ref ref);
+
+using_directive_location(
+  unique int id: @using_directive ref,
+  int loc: @location ref);
+
+@preprocessor_directive = @pragma_warning | @pragma_checksum | @directive_define | @directive_undefine | @directive_warning
+  | @directive_error | @directive_nullable | @directive_line | @directive_region | @directive_endregion | @directive_if
+  | @directive_elif | @directive_else | @directive_endif;
+
+@conditional_directive = @directive_if | @directive_elif;
+@branch_directive = @directive_if | @directive_elif | @directive_else;
+
+directive_ifs(
+  unique int id: @directive_if,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref); /* 0: false, 1: true */
+
+directive_elifs(
+  unique int id: @directive_elif,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref,  /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+directive_elses(
+  unique int id: @directive_else,
+  int branchTaken: int ref,   /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+#keyset[id, start]
+directive_endifs(
+  unique int id: @directive_endif,
+  unique int start: @directive_if ref);
+
+directive_define_symbols(
+  unique int id: @define_symbol_expr ref,
+  string name: string ref);
+
+directive_regions(
+  unique int id: @directive_region,
+  string name: string ref);
+
+#keyset[id, start]
+directive_endregions(
+  unique int id: @directive_endregion,
+  unique int start: @directive_region ref);
+
+directive_lines(
+  unique int id: @directive_line,
+  int kind: int ref); /* 0: default, 1: hidden, 2: numeric, 3: span */
+
+directive_line_value(
+  unique int id: @directive_line ref,
+  int line: int ref);
+
+directive_line_file(
+  unique int id: @directive_line ref,
+  int file: @file ref);
+
+directive_line_offset(
+  unique int id: @directive_line ref,
+  int offset: int ref);
+
+directive_line_span(
+  unique int id: @directive_line ref,
+  int startLine: int ref,
+  int startColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref);
+
+directive_nullables(
+  unique int id: @directive_nullable,
+  int setting: int ref, /* 0: disable, 1: enable, 2: restore */
+  int target: int ref); /* 0: none, 1: annotations, 2: warnings */
+
+directive_warnings(
+  unique int id: @directive_warning,
+  string message: string ref);
+
+directive_errors(
+  unique int id: @directive_error,
+  string message: string ref);
+
+directive_undefines(
+  unique int id: @directive_undefine,
+  string name: string ref);
+
+directive_defines(
+  unique int id: @directive_define,
+  string name: string ref);
+
+pragma_checksums(
+  unique int id: @pragma_checksum,
+  int file: @file ref,
+  string guid: string ref,
+  string bytes: string ref);
+
+pragma_warnings(
+  unique int id: @pragma_warning,
+  int kind: int ref /* 0 = disable, 1 = restore */);
+
+#keyset[id, index]
+pragma_warning_error_codes(
+  int id: @pragma_warning ref,
+  string errorCode: string ref,
+  int index: int ref);
+
+preprocessor_directive_location(
+  unique int id: @preprocessor_directive ref,
+  int loc: @location ref);
+
+preprocessor_directive_compilation(
+  int id: @preprocessor_directive ref,
+  int compilation: @compilation ref);
+
+preprocessor_directive_active(
+  unique int id: @preprocessor_directive ref,
+  int active: int ref);  /* 0: false, 1: true */
+
+/** TYPES **/
+
+types(
+  unique int id: @type,
+  int kind: int ref,
+  string name: string ref);
+
+case @type.kind of
+   1 = @bool_type
+|  2 = @char_type
+|  3 = @decimal_type
+|  4 = @sbyte_type
+|  5 = @short_type
+|  6 = @int_type
+|  7 = @long_type
+|  8 = @byte_type
+|  9 = @ushort_type
+| 10 = @uint_type
+| 11 = @ulong_type
+| 12 = @float_type
+| 13 = @double_type
+| 14 = @enum_type
+| 15 = @struct_type
+| 17 = @class_type
+| 19 = @interface_type
+| 20 = @delegate_type
+| 21 = @null_type
+| 22 = @type_parameter
+| 23 = @pointer_type
+| 24 = @nullable_type
+| 25 = @array_type
+| 26 = @void_type
+| 27 = @int_ptr_type
+| 28 = @uint_ptr_type
+| 29 = @dynamic_type
+| 30 = @arglist_type
+| 31 = @unknown_type
+| 32 = @tuple_type
+| 33 = @function_pointer_type
+| 34 = @inline_array_type
+  ;
+
+@simple_type = @bool_type | @char_type | @integral_type | @floating_point_type | @decimal_type;
+@integral_type = @signed_integral_type | @unsigned_integral_type;
+@signed_integral_type = @sbyte_type | @short_type | @int_type | @long_type;
+@unsigned_integral_type = @byte_type  | @ushort_type | @uint_type | @ulong_type;
+@floating_point_type = @float_type | @double_type;
+@value_type = @simple_type | @enum_type | @struct_type | @nullable_type | @int_ptr_type
+            | @uint_ptr_type | @tuple_type | @void_type | @inline_array_type;
+@ref_type = @class_type | @interface_type | @array_type | @delegate_type | @null_type
+          | @dynamic_type;
+@value_or_ref_type = @value_type | @ref_type;
+
+typerefs(
+  unique int id: @typeref,
+  string name: string ref);
+
+typeref_type(
+  int id: @typeref ref,
+  unique int typeId: @type ref);
+
+@type_or_ref = @type | @typeref;
+
+array_element_type(
+  unique int array: @array_type ref,
+  int dimension: int ref,
+  int rank: int ref,
+  int element: @type_or_ref ref);
+
+nullable_underlying_type(
+  unique int nullable: @nullable_type ref,
+  int underlying: @type_or_ref ref);
+
+pointer_referent_type(
+  unique int pointer: @pointer_type ref,
+  int referent: @type_or_ref ref);
+
+enum_underlying_type(
+  unique int enum_id: @enum_type ref,
+  int underlying_type_id: @type_or_ref ref);
+
+delegate_return_type(
+  unique int delegate_id: @delegate_type ref,
+  int return_type_id: @type_or_ref ref);
+
+function_pointer_return_type(
+    unique int function_pointer_id: @function_pointer_type ref,
+    int return_type_id: @type_or_ref ref);
+
+extend(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+anonymous_types(
+  unique int id: @type ref);
+
+@interface_or_ref = @interface_type | @typeref;
+
+implement(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+type_location(
+  int id: @type ref,
+  int loc: @location ref);
+
+tuple_underlying_type(
+  unique int tuple: @tuple_type ref,
+  int struct: @type_or_ref ref);
+
+#keyset[tuple, index]
+tuple_element(
+  int tuple: @tuple_type ref,
+  int index: int ref,
+  unique int field: @field ref);
+
+attributes(
+  unique int id: @attribute,
+  int kind: int ref,
+  int type_id: @type_or_ref ref,
+  int target:  @attributable ref);
+
+case @attribute.kind of
+  0 = @attribute_default
+| 1 = @attribute_return
+| 2 = @attribute_assembly
+| 3 = @attribute_module
+;
+
+attribute_location(
+  int id: @attribute ref,
+  int loc: @location ref);
+
+@type_mention_parent = @element | @type_mention;
+
+type_mention(
+  unique int id: @type_mention,
+  int type_id: @type_or_ref ref,
+  int parent: @type_mention_parent ref);
+
+type_mention_location(
+  unique int id: @type_mention ref,
+  int loc: @location ref);
+
+@has_type_annotation = @assignable | @type_parameter | @callable | @expr | @delegate_type | @generic | @function_pointer_type;
+
+/**
+ * A direct annotation on an entity, for example `string? x;`.
+ *
+ * Annotations:
+ * 2 = reftype is not annotated "!"
+ * 3 = reftype is annotated "?"
+ * 4 = readonly ref type / in parameter
+ * 5 = ref type parameter, return or local variable
+ * 6 = out parameter
+ *
+ * Note that the annotation depends on the element it annotates.
+ * @assignable: The annotation is on the type of the assignable, for example the variable type.
+ * @type_parameter: The annotation is on the reftype constraint
+ * @callable: The annotation is on the return type
+ * @array_type: The annotation is on the element type
+ */
+type_annotation(int id: @has_type_annotation ref, int annotation: int ref);
+
+nullability(unique int nullability: @nullability, int kind: int ref);
+
+case @nullability.kind of
+  0 = @oblivious
+| 1 = @not_annotated
+| 2 = @annotated
+;
+
+#keyset[parent, index]
+nullability_parent(int nullability: @nullability ref, int index: int ref, int parent: @nullability ref)
+
+type_nullability(int id: @has_type_annotation ref, int nullability: @nullability ref);
+
+/**
+ * The nullable flow state of an expression, as determined by Roslyn.
+ *   0 = none (default, not populated)
+ *   1 = not null
+ *   2 = maybe null
+ */
+expr_flowstate(unique int id: @expr ref, int state: int ref);
+
+/** GENERICS **/
+
+@generic = @type | @method | @local_function;
+
+type_parameters(
+  unique int id: @type_parameter ref,
+  int index: int ref,
+  int generic_id: @generic ref,
+  int variance: int ref /* none = 0, out = 1, in = 2 */);
+
+#keyset[constructed_id, index]
+type_arguments(
+  int id: @type_or_ref ref,
+  int index: int ref,
+  int constructed_id: @generic_or_ref ref);
+
+@generic_or_ref = @generic | @typeref;
+
+constructed_generic(
+  unique int constructed: @generic ref,
+  int generic: @generic_or_ref ref);
+
+type_parameter_constraints(
+  unique int id: @type_parameter_constraints,
+  int param_id: @type_parameter ref);
+
+type_parameter_constraints_location(
+  int id: @type_parameter_constraints ref,
+  int loc: @location ref);
+
+general_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int kind: int ref /* class = 1, struct = 2, new = 3 */);
+
+specific_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref);
+
+specific_type_parameter_nullability(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref,
+  int nullability: @nullability ref);
+
+/** FUNCTION POINTERS */
+
+function_pointer_calling_conventions(
+  int id: @function_pointer_type ref,
+  int kind: int ref);
+
+#keyset[id, index]
+has_unmanaged_calling_conventions(
+  int id: @function_pointer_type ref,
+  int index: int ref,
+  int conv_id: @type_or_ref ref);
+
+/** MODIFIERS */
+
+@modifiable = @modifiable_direct | @event_accessor;
+
+@modifiable_direct = @member | @accessor | @local_function | @anonymous_function_expr;
+
+modifiers(
+  unique int id: @modifier,
+  string name: string ref);
+
+has_modifiers(
+  int id: @modifiable_direct ref,
+  int mod_id: @modifier ref);
+
+/** MEMBERS **/
+
+@member = @method | @constructor | @destructor | @field | @property | @event | @operator | @indexer | @type;
+
+@named_exprorstmt = @goto_stmt | @labeled_stmt | @expr;
+
+@virtualizable = @method | @property | @indexer | @event | @operator;
+
+exprorstmt_name(
+  unique int parent_id: @named_exprorstmt ref,
+  string name: string ref);
+
+nested_types(
+  unique int id: @type ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @type ref);
+
+properties(
+  unique int id: @property,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @property ref);
+
+property_location(
+  int id: @property ref,
+  int loc: @location ref);
+
+indexers(
+  unique int id: @indexer,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @indexer ref);
+
+indexer_location(
+  int id: @indexer ref,
+  int loc: @location ref);
+
+accessors(
+  unique int id: @accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_member_id: @member ref,
+  int unbound_id: @accessor ref);
+
+case @accessor.kind of
+  1 = @getter
+| 2 = @setter
+  ;
+
+init_only_accessors(
+  unique int id: @accessor ref);
+
+accessor_location(
+  int id: @accessor ref,
+  int loc: @location ref);
+
+events(
+  unique int id: @event,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @event ref);
+
+event_location(
+  int id: @event ref,
+  int loc: @location ref);
+
+event_accessors(
+  unique int id: @event_accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_event_id: @event ref,
+  int unbound_id: @event_accessor ref);
+
+case @event_accessor.kind of
+  1 = @add_event_accessor
+| 2 = @remove_event_accessor
+  ;
+
+event_accessor_location(
+  int id: @event_accessor ref,
+  int loc: @location ref);
+
+operators(
+  unique int id: @operator,
+  string name: string ref,
+  string symbol: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @operator ref);
+
+operator_location(
+  int id: @operator ref,
+  int loc: @location ref);
+
+constant_value(
+  int id: @variable ref,
+  string value: string ref);
+
+/** CALLABLES **/
+
+@callable = @method | @constructor | @destructor | @operator | @callable_accessor | @anonymous_function_expr | @local_function;
+
+@callable_accessor = @accessor | @event_accessor;
+
+methods(
+  unique int id: @method,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @method ref);
+
+method_location(
+  int id: @method ref,
+  int loc: @location ref);
+
+constructors(
+  unique int id: @constructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @constructor ref);
+
+constructor_location(
+  int id: @constructor ref,
+  int loc: @location ref);
+
+destructors(
+  unique int id: @destructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @destructor ref);
+
+destructor_location(
+  int id: @destructor ref,
+  int loc: @location ref);
+
+overrides(
+  int id: @callable ref,
+  int base_id: @callable ref);
+
+explicitly_implements(
+  int id: @member ref,
+  int interface_id: @interface_or_ref ref);
+
+local_functions(
+    unique int id: @local_function,
+    string name: string ref,
+    int return_type: @type ref,
+    int unbound_id: @local_function ref);
+
+local_function_stmts(
+    unique int fn: @local_function_stmt ref,
+    int stmt: @local_function ref);
+
+/** VARIABLES **/
+
+@variable = @local_scope_variable | @field;
+
+@local_scope_variable = @local_variable | @parameter;
+
+fields(
+  unique int id: @field,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @field ref);
+
+case @field.kind of
+  1 = @addressable_field
+| 2 = @constant
+  ;
+
+field_location(
+  int id: @field ref,
+  int loc: @location ref);
+
+localvars(
+  unique int id: @local_variable,
+  int kind: int ref,
+  string name: string ref,
+  int implicitly_typed: int ref /* 0 = no, 1 = yes */,
+  int type_id: @type_or_ref ref,
+  int parent_id: @local_var_decl_expr ref);
+
+case @local_variable.kind of
+  1 = @addressable_local_variable
+| 2 = @local_constant
+| 3 = @local_variable_ref
+  ;
+
+localvar_location(
+  unique int id: @local_variable ref,
+  int loc: @location ref);
+
+@parameterizable = @callable | @delegate_type | @indexer | @function_pointer_type;
+
+#keyset[name, parent_id]
+#keyset[index, parent_id]
+params(
+  unique int id: @parameter,
+  string name: string ref,
+  int type_id: @type_or_ref ref,
+  int index: int ref,
+  int mode: int ref, /* value = 0, ref = 1, out = 2, params/array = 3, this = 4, in = 5, ref readonly = 6 */
+  int parent_id: @parameterizable ref,
+  int unbound_id: @parameter ref);
+
+param_location(
+  int id: @parameter ref,
+  int loc: @location ref);
+
+@has_scoped_annotation = @local_scope_variable
+
+scoped_annotation(
+  int id: @has_scoped_annotation ref,
+  int kind: int ref // scoped ref = 1, scoped value = 2
+  );
+
+/** STATEMENTS **/
+
+@exprorstmt_parent = @control_flow_element | @top_level_exprorstmt_parent;
+
+statements(
+  unique int id: @stmt,
+  int kind: int ref);
+
+#keyset[index, parent]
+stmt_parent(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_stmt_parent = @callable;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+stmt_parent_top_level(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @top_level_stmt_parent ref);
+
+case @stmt.kind of
+   1 = @block_stmt
+|  2 = @expr_stmt
+|  3 = @if_stmt
+|  4 = @switch_stmt
+|  5 = @while_stmt
+|  6 = @do_stmt
+|  7 = @for_stmt
+|  8 = @foreach_stmt
+|  9 = @break_stmt
+| 10 = @continue_stmt
+| 11 = @goto_stmt
+| 12 = @goto_case_stmt
+| 13 = @goto_default_stmt
+| 14 = @throw_stmt
+| 15 = @return_stmt
+| 16 = @yield_stmt
+| 17 = @try_stmt
+| 18 = @checked_stmt
+| 19 = @unchecked_stmt
+| 20 = @lock_stmt
+| 21 = @using_block_stmt
+| 22 = @var_decl_stmt
+| 23 = @const_decl_stmt
+| 24 = @empty_stmt
+| 25 = @unsafe_stmt
+| 26 = @fixed_stmt
+| 27 = @label_stmt
+| 28 = @catch
+| 29 = @case_stmt
+| 30 = @local_function_stmt
+| 31 = @using_decl_stmt
+  ;
+
+@using_stmt = @using_block_stmt | @using_decl_stmt;
+
+@labeled_stmt = @label_stmt | @case;
+
+@decl_stmt = @var_decl_stmt | @const_decl_stmt | @using_decl_stmt;
+
+@cond_stmt = @if_stmt | @switch_stmt;
+
+@loop_stmt = @while_stmt | @do_stmt | @for_stmt | @foreach_stmt;
+
+@jump_stmt = @break_stmt | @goto_any_stmt | @continue_stmt | @throw_stmt | @return_stmt
+           | @yield_stmt;
+
+@goto_any_stmt = @goto_default_stmt | @goto_case_stmt | @goto_stmt;
+
+
+stmt_location(
+  unique int id: @stmt ref,
+  int loc: @location ref);
+
+catch_type(
+  unique int catch_id: @catch ref,
+  int type_id: @type_or_ref ref,
+  int kind: int ref /* explicit = 1, implicit = 2 */);
+
+foreach_stmt_info(
+  unique int id: @foreach_stmt ref,
+  int kind: int ref /* non-async = 1, async = 2 */);
+
+@foreach_symbol =  @method | @property | @type_or_ref;
+
+#keyset[id, kind]
+foreach_stmt_desugar(
+  int id: @foreach_stmt ref,
+  int symbol: @foreach_symbol ref,
+  int kind: int ref /* GetEnumeratorMethod = 1, CurrentProperty = 2, MoveNextMethod = 3, DisposeMethod = 4, ElementType = 5 */);
+
+/** EXPRESSIONS **/
+
+expressions(
+  unique int id: @expr,
+  int kind: int ref,
+  int type_id: @type_or_ref ref);
+
+#keyset[index, parent]
+expr_parent(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_expr_parent = @attribute | @field | @property | @indexer | @parameter | @directive_if | @directive_elif;
+
+@top_level_exprorstmt_parent = @top_level_expr_parent | @top_level_stmt_parent;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+expr_parent_top_level(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @top_level_exprorstmt_parent ref);
+
+case @expr.kind of
+/* literal */
+   1 = @bool_literal_expr
+|  2 = @char_literal_expr
+|  3 = @decimal_literal_expr
+|  4 = @int_literal_expr
+|  5 = @long_literal_expr
+|  6 = @uint_literal_expr
+|  7 = @ulong_literal_expr
+|  8 = @float_literal_expr
+|  9 = @double_literal_expr
+| 10 = @utf16_string_literal_expr
+| 11 = @null_literal_expr
+/* primary & unary */
+| 12 = @this_access_expr
+| 13 = @base_access_expr
+| 14 = @local_variable_access_expr
+| 15 = @parameter_access_expr
+| 16 = @field_access_expr
+| 17 = @property_access_expr
+| 18 = @method_access_expr
+| 19 = @event_access_expr
+| 20 = @indexer_access_expr
+| 21 = @array_access_expr
+| 22 = @type_access_expr
+| 23 = @typeof_expr
+| 24 = @method_invocation_expr
+| 25 = @delegate_invocation_expr
+| 26 = @operator_invocation_expr
+| 27 = @cast_expr
+| 28 = @object_creation_expr
+| 29 = @explicit_delegate_creation_expr
+| 30 = @implicit_delegate_creation_expr
+| 31 = @array_creation_expr
+| 32 = @default_expr
+| 33 = @plus_expr
+| 34 = @minus_expr
+| 35 = @bit_not_expr
+| 36 = @log_not_expr
+| 37 = @post_incr_expr
+| 38 = @post_decr_expr
+| 39 = @pre_incr_expr
+| 40 = @pre_decr_expr
+/* multiplicative */
+| 41 = @mul_expr
+| 42 = @div_expr
+| 43 = @rem_expr
+/* additive */
+| 44 = @add_expr
+| 45 = @sub_expr
+/* shift */
+| 46 = @lshift_expr
+| 47 = @rshift_expr
+/* relational */
+| 48 = @lt_expr
+| 49 = @gt_expr
+| 50 = @le_expr
+| 51 = @ge_expr
+/* equality */
+| 52 = @eq_expr
+| 53 = @ne_expr
+/* logical */
+| 54 = @bit_and_expr
+| 55 = @bit_xor_expr
+| 56 = @bit_or_expr
+| 57 = @log_and_expr
+| 58 = @log_or_expr
+/* type testing */
+| 59 = @is_expr
+| 60 = @as_expr
+/* null coalescing */
+| 61 = @null_coalescing_expr
+/* conditional */
+| 62 = @conditional_expr
+/* assignment */
+| 63 = @simple_assign_expr
+| 64 = @assign_add_expr
+| 65 = @assign_sub_expr
+| 66 = @assign_mul_expr
+| 67 = @assign_div_expr
+| 68 = @assign_rem_expr
+| 69 = @assign_and_expr
+| 70 = @assign_xor_expr
+| 71 = @assign_or_expr
+| 72 = @assign_lshift_expr
+| 73 = @assign_rshift_expr
+/* more */
+| 74 = @object_init_expr
+| 75 = @collection_init_expr
+| 76 = @array_init_expr
+| 77 = @checked_expr
+| 78 = @unchecked_expr
+| 79 = @constructor_init_expr
+| 80 = @add_event_expr
+| 81 = @remove_event_expr
+| 82 = @par_expr
+| 83 = @local_var_decl_expr
+| 84 = @lambda_expr
+| 85 = @anonymous_method_expr
+| 86 = @namespace_expr
+/* dynamic */
+| 92 = @dynamic_element_access_expr
+| 93 = @dynamic_member_access_expr
+/* unsafe */
+| 100 = @pointer_indirection_expr
+| 101 = @address_of_expr
+| 102 = @sizeof_expr
+/* async */
+| 103 = @await_expr
+/* C# 6.0 */
+| 104 = @nameof_expr
+| 105 = @interpolated_string_expr
+| 106 = @unknown_expr
+/* C# 7.0 */
+| 107 = @throw_expr
+| 108 = @tuple_expr
+| 109 = @local_function_invocation_expr
+| 110 = @ref_expr
+| 111 = @discard_expr
+/* C# 8.0 */
+| 112 = @range_expr
+| 113 = @index_expr
+| 114 = @switch_expr
+| 115 = @recursive_pattern_expr
+| 116 = @property_pattern_expr
+| 117 = @positional_pattern_expr
+| 118 = @switch_case_expr
+| 119 = @assign_coalesce_expr
+| 120 = @suppress_nullable_warning_expr
+| 121 = @namespace_access_expr
+/* C# 9.0 */
+| 122 = @lt_pattern_expr
+| 123 = @gt_pattern_expr
+| 124 = @le_pattern_expr
+| 125 = @ge_pattern_expr
+| 126 = @not_pattern_expr
+| 127 = @and_pattern_expr
+| 128 = @or_pattern_expr
+| 129 = @function_pointer_invocation_expr
+| 130 = @with_expr
+/* C# 11.0 */
+| 131 = @list_pattern_expr
+| 132 = @slice_pattern_expr
+| 133 = @urshift_expr
+| 134 = @assign_urshift_expr
+| 135 = @utf8_string_literal_expr
+/* C# 12.0 */
+| 136 = @collection_expr
+| 137 = @spread_element_expr
+| 138 = @interpolated_string_insert_expr
+/* Preprocessor */
+| 999 = @define_symbol_expr
+;
+
+@switch = @switch_stmt | @switch_expr;
+@case = @case_stmt | @switch_case_expr;
+@pattern_match = @case | @is_expr;
+@unary_pattern_expr = @not_pattern_expr;
+@relational_pattern_expr = @gt_pattern_expr | @lt_pattern_expr | @ge_pattern_expr | @le_pattern_expr;
+@binary_pattern_expr = @and_pattern_expr | @or_pattern_expr;
+
+@integer_literal_expr = @int_literal_expr | @long_literal_expr | @uint_literal_expr | @ulong_literal_expr;
+@real_literal_expr = @float_literal_expr | @double_literal_expr | @decimal_literal_expr;
+@string_literal_expr = @utf16_string_literal_expr | @utf8_string_literal_expr;
+@literal_expr = @bool_literal_expr | @char_literal_expr | @integer_literal_expr | @real_literal_expr
+              | @string_literal_expr | @null_literal_expr;
+
+@assign_expr = @simple_assign_expr | @assign_op_expr | @local_var_decl_expr;
+@assign_op_expr =  @assign_arith_expr | @assign_bitwise_expr | @assign_event_expr | @assign_coalesce_expr;
+@assign_event_expr = @add_event_expr | @remove_event_expr;
+
+@assign_arith_expr = @assign_add_expr | @assign_sub_expr | @assign_mul_expr | @assign_div_expr
+                   | @assign_rem_expr
+@assign_bitwise_expr = @assign_and_expr | @assign_or_expr | @assign_xor_expr
+                   | @assign_lshift_expr | @assign_rshift_expr | @assign_urshift_expr;
+
+@member_access_expr = @field_access_expr | @property_access_expr | @indexer_access_expr | @event_access_expr
+                    | @method_access_expr | @type_access_expr | @dynamic_member_access_expr;
+@access_expr = @member_access_expr | @this_access_expr | @base_access_expr | @assignable_access_expr | @namespace_access_expr;
+@element_access_expr = @indexer_access_expr | @array_access_expr | @dynamic_element_access_expr;
+
+@local_variable_access = @local_variable_access_expr | @local_var_decl_expr;
+@local_scope_variable_access_expr = @parameter_access_expr | @local_variable_access;
+@variable_access_expr = @local_scope_variable_access_expr | @field_access_expr;
+
+@assignable_access_expr = @variable_access_expr | @property_access_expr | @element_access_expr
+                        | @event_access_expr | @dynamic_member_access_expr;
+
+@objectorcollection_init_expr = @object_init_expr | @collection_init_expr;
+
+@delegate_creation_expr = @explicit_delegate_creation_expr | @implicit_delegate_creation_expr;
+
+@bin_arith_op_expr = @mul_expr | @div_expr | @rem_expr | @add_expr | @sub_expr;
+@incr_op_expr =  @pre_incr_expr | @post_incr_expr;
+@decr_op_expr =  @pre_decr_expr | @post_decr_expr;
+@mut_op_expr = @incr_op_expr | @decr_op_expr;
+@un_arith_op_expr = @plus_expr | @minus_expr | @mut_op_expr;
+@arith_op_expr = @bin_arith_op_expr | @un_arith_op_expr;
+
+@ternary_log_op_expr = @conditional_expr;
+@bin_log_op_expr = @log_and_expr | @log_or_expr | @null_coalescing_expr;
+@un_log_op_expr = @log_not_expr;
+@log_expr = @un_log_op_expr | @bin_log_op_expr | @ternary_log_op_expr;
+
+@bin_bit_op_expr =  @bit_and_expr | @bit_or_expr | @bit_xor_expr | @lshift_expr
+                 | @rshift_expr | @urshift_expr;
+@un_bit_op_expr = @bit_not_expr;
+@bit_expr = @un_bit_op_expr | @bin_bit_op_expr;
+
+@equality_op_expr =  @eq_expr | @ne_expr;
+@rel_op_expr = @gt_expr | @lt_expr| @ge_expr | @le_expr;
+@comp_expr = @equality_op_expr | @rel_op_expr;
+
+@op_expr = @assign_expr | @un_op | @bin_op | @ternary_op;
+
+@ternary_op = @ternary_log_op_expr;
+@bin_op = @bin_arith_op_expr | @bin_log_op_expr | @bin_bit_op_expr | @comp_expr;
+@un_op = @un_arith_op_expr | @un_log_op_expr | @un_bit_op_expr | @sizeof_expr
+       | @pointer_indirection_expr | @address_of_expr;
+
+@anonymous_function_expr = @lambda_expr | @anonymous_method_expr;
+
+@call = @method_invocation_expr | @constructor_init_expr | @operator_invocation_expr
+      | @delegate_invocation_expr | @object_creation_expr | @call_access_expr
+      | @local_function_invocation_expr | @function_pointer_invocation_expr;
+
+@call_access_expr = @property_access_expr | @event_access_expr | @indexer_access_expr;
+
+@late_bindable_expr = @dynamic_element_access_expr | @dynamic_member_access_expr
+                    | @object_creation_expr | @method_invocation_expr | @operator_invocation_expr;
+
+@throw_element = @throw_expr | @throw_stmt;
+
+@implicitly_typeable_object_creation_expr = @object_creation_expr | @explicit_delegate_creation_expr;
+
+implicitly_typed_array_creation(
+  unique int id: @array_creation_expr ref);
+
+explicitly_sized_array_creation(
+  unique int id: @array_creation_expr ref);
+
+stackalloc_array_creation(
+  unique int id: @array_creation_expr ref);
+
+implicitly_typed_object_creation(
+  unique int id: @implicitly_typeable_object_creation_expr ref);
+
+mutator_invocation_mode(
+  unique int id: @operator_invocation_expr ref,
+  int mode: int ref /* prefix = 1, postfix = 2*/);
+
+expr_value(
+  unique int id: @expr ref,
+  string value: string ref);
+
+expr_call(
+  unique int caller_id: @expr ref,
+  int target_id: @callable ref);
+
+expr_access(
+  unique int accesser_id: @access_expr ref,
+  int target_id: @accessible ref);
+
+@accessible = @method | @assignable | @local_function | @namespace;
+
+expr_location(
+  unique int id: @expr ref,
+  int loc: @location ref);
+
+dynamic_member_name(
+  unique int id: @late_bindable_expr ref,
+  string name: string ref);
+
+@qualifiable_expr = @member_access_expr
+                  | @method_invocation_expr
+                  | @element_access_expr;
+
+conditional_access(
+  unique int id: @qualifiable_expr ref);
+
+expr_argument(
+  unique int id: @expr ref,
+  int mode: int ref);
+  /* mode is the same as params: value = 0, ref = 1, out = 2 */
+
+expr_argument_name(
+  unique int id: @expr ref,
+  string name: string ref);
+
+lambda_expr_return_type(
+  unique int id: @lambda_expr ref,
+  int type_id: @type_or_ref ref);
+
+/* Compiler generated */
+
+compiler_generated(unique int id: @element ref);
+
+/** CONTROL/DATA FLOW **/
+
+@control_flow_element = @stmt | @expr;
+
+/* XML Files */
+
+xmlEncoding  (
+  unique int id: @file ref,
+  string encoding: string ref);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+/* Comments */
+
+commentline(
+  unique int id: @commentline,
+  int kind: int ref,
+  string text: string ref,
+  string rawtext: string ref);
+
+case @commentline.kind of
+  0 = @singlelinecomment
+| 1 = @xmldoccomment
+| 2 = @multilinecomment;
+
+commentline_location(
+  unique int id: @commentline ref,
+  int loc: @location ref);
+
+commentblock(
+  unique int id : @commentblock);
+
+commentblock_location(
+  unique int id: @commentblock ref,
+  int loc: @location ref);
+
+commentblock_binding(
+  int id: @commentblock ref,
+  int entity: @element ref,
+  int bindtype: int ref);    /* 0: Parent, 1: Best, 2: Before, 3: After */
+
+commentblock_child(
+  int id: @commentblock ref,
+  int commentline: @commentline ref,
+  int index: int ref);
+
+/* ASP.NET */
+
+case @asp_element.kind of
+  0=@asp_close_tag
+| 1=@asp_code
+| 2=@asp_comment
+| 3=@asp_data_binding
+| 4=@asp_directive
+| 5=@asp_open_tag
+| 6=@asp_quoted_string
+| 7=@asp_text
+| 8=@asp_xml_directive;
+
+@asp_attribute = @asp_code | @asp_data_binding | @asp_quoted_string;
+
+asp_elements(
+  unique int id: @asp_element,
+  int kind: int ref,
+  int loc: @location ref);
+
+asp_comment_server(unique int comment: @asp_comment ref);
+asp_code_inline(unique int code: @asp_code ref);
+asp_directive_attribute(
+  int directive: @asp_directive ref,
+  int index: int ref,
+  string name: string ref,
+  int value: @asp_quoted_string ref);
+asp_directive_name(
+  unique int directive: @asp_directive ref,
+  string name: string ref);
+asp_element_body(
+  unique int element: @asp_element ref,
+  string body: string ref);
+asp_tag_attribute(
+  int tag: @asp_open_tag ref,
+  int index: int ref,
+  string name: string ref,
+  int attribute: @asp_attribute ref);
+asp_tag_name(
+  unique int tag: @asp_open_tag ref,
+  string name: string ref);
+asp_tag_isempty(int tag: @asp_open_tag ref);
diff --git a/csharp/downgrades/68b5aec54e50fe7e375df3777b756a746ca3a37c/semmlecode.csharp.dbscheme b/csharp/downgrades/68b5aec54e50fe7e375df3777b756a746ca3a37c/semmlecode.csharp.dbscheme
new file mode 100644
index 00000000000..605f8505340
--- /dev/null
+++ b/csharp/downgrades/68b5aec54e50fe7e375df3777b756a746ca3a37c/semmlecode.csharp.dbscheme
@@ -0,0 +1,1478 @@
+/* This is a dummy line to alter the dbscheme, so we can make a database upgrade
+ * without actually changing any of the dbscheme predicates. It contains a date
+ * to allow for such updates in the future as well.
+ *
+ * 2021-07-14
+ *
+ * DO NOT remove this comment carelessly, since it can revert the dbscheme back to a
+ * previously seen state (matching a previously seen SHA), which would make the upgrade
+ * mechanism not work properly.
+ */
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+compilation_info(
+  int id : @compilation ref,
+  string info_key: string ref,
+  string info_value: string ref
+)
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | --compiler
+ * 1   | *path to compiler*
+ * 2   | f1.cs
+ * 3   | f2.cs
+ * 4   | f3.cs
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@someFile.rsp` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.cs
+ * 1   | f2.cs
+ * 2   | f3.cs
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The references used by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs /r:ref1.dll /r:ref2.dll /r:ref3.dll
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | ref1.dll
+ * 1   | ref2.dll
+ * 2   | ref3.dll
+ */
+#keyset[id, num]
+compilation_referencing_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    unique int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location ref
+);
+
+extractor_messages(
+    unique int id: @extractor_message,
+    int severity: int ref,
+    string origin : string ref,
+    string text : string ref,
+    string entity : string ref,
+    int location: @location ref,
+    string stack_trace : string ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+compilation_assembly(
+  unique int id : @compilation ref,
+  int assembly: @assembly ref
+)
+
+// Populated by the CSV extractor
+externalData(
+   int id: @externalDataElement,
+   string path: string ref,
+   int column: int ref,
+   string value: string ref);
+
+sourceLocationPrefix(
+  string prefix: string ref);
+
+/*
+ * Overlay support
+ */
+
+/**
+ * The CLI will automatically emit the tuple `databaseMetadata("isOverlay", "true")`,
+ * along with an `overlayChangedFiles` tuple for each new/modified/deleted file,
+ * when building an overlay database, and these can be used by the discard predicates.
+ */
+databaseMetadata(
+  string metadataKey : string ref,
+  string value : string ref
+);
+
+overlayChangedFiles(
+  string path : string ref
+);
+
+/*
+ * C# dbscheme
+ */
+
+/** ELEMENTS **/
+
+@element = @declaration | @stmt | @expr | @modifier | @attribute | @namespace_declaration
+         | @using_directive | @type_parameter_constraints | @externalDataElement
+         | @xmllocatable | @asp_element | @namespace | @preprocessor_directive;
+
+@declaration = @callable | @generic | @assignable | @namespace;
+
+@named_element = @namespace | @declaration;
+
+@declaration_with_accessors = @property | @indexer | @event;
+
+@assignable = @variable | @assignable_with_accessors | @event;
+
+@assignable_with_accessors = @property | @indexer;
+
+@attributable = @assembly | @field | @parameter | @operator | @method | @constructor
+              | @destructor | @callable_accessor | @value_or_ref_type | @declaration_with_accessors
+              | @local_function | @lambda_expr;
+
+/** LOCATIONS, ASEMMBLIES, MODULES, FILES and FOLDERS **/
+
+@location = @location_default | @assembly;
+
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref);
+
+locations_mapped(
+  unique int id: @location_default ref,
+  int mapped_to: @location_default ref);
+
+@sourceline = @file | @callable | @xmllocatable;
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref);
+
+assemblies(
+  unique int id: @assembly,
+  int file: @file ref,
+  string fullname: string ref,
+  string name: string ref,
+  string version: string ref);
+
+files(
+  unique int id: @file,
+  string name: string ref);
+
+folders(
+  unique int id: @folder,
+  string name: string ref);
+
+@container = @folder | @file ;
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref);
+
+file_extraction_mode(
+  unique int file: @file ref,
+  int mode: int ref
+  /* 0 = normal, 1 = standalone extractor */
+  );
+
+/** NAMESPACES **/
+
+@type_container = @namespace | @type;
+
+namespaces(
+  unique int id: @namespace,
+  string name: string ref);
+
+namespace_declarations(
+  unique int id: @namespace_declaration,
+  int namespace_id: @namespace ref);
+
+namespace_declaration_location(
+  unique int id: @namespace_declaration ref,
+  int loc: @location ref);
+
+parent_namespace(
+  unique int child_id: @type_container ref,
+  int namespace_id: @namespace ref);
+
+@declaration_or_directive = @namespace_declaration | @type | @using_directive;
+
+parent_namespace_declaration(
+  int child_id: @declaration_or_directive ref, // cannot be unique because of partial classes
+  int namespace_id: @namespace_declaration ref);
+
+@using_directive = @using_namespace_directive | @using_static_directive;
+
+using_global(
+  unique int id: @using_directive ref
+);
+
+using_namespace_directives(
+  unique int id: @using_namespace_directive,
+  int namespace_id: @namespace ref);
+
+using_static_directives(
+  unique int id: @using_static_directive,
+  int type_id: @type_or_ref ref);
+
+using_directive_location(
+  unique int id: @using_directive ref,
+  int loc: @location ref);
+
+@preprocessor_directive = @pragma_warning | @pragma_checksum | @directive_define | @directive_undefine | @directive_warning
+  | @directive_error | @directive_nullable | @directive_line | @directive_region | @directive_endregion | @directive_if
+  | @directive_elif | @directive_else | @directive_endif;
+
+@conditional_directive = @directive_if | @directive_elif;
+@branch_directive = @directive_if | @directive_elif | @directive_else;
+
+directive_ifs(
+  unique int id: @directive_if,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref); /* 0: false, 1: true */
+
+directive_elifs(
+  unique int id: @directive_elif,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref,  /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+directive_elses(
+  unique int id: @directive_else,
+  int branchTaken: int ref,   /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+#keyset[id, start]
+directive_endifs(
+  unique int id: @directive_endif,
+  unique int start: @directive_if ref);
+
+directive_define_symbols(
+  unique int id: @define_symbol_expr ref,
+  string name: string ref);
+
+directive_regions(
+  unique int id: @directive_region,
+  string name: string ref);
+
+#keyset[id, start]
+directive_endregions(
+  unique int id: @directive_endregion,
+  unique int start: @directive_region ref);
+
+directive_lines(
+  unique int id: @directive_line,
+  int kind: int ref); /* 0: default, 1: hidden, 2: numeric, 3: span */
+
+directive_line_value(
+  unique int id: @directive_line ref,
+  int line: int ref);
+
+directive_line_file(
+  unique int id: @directive_line ref,
+  int file: @file ref);
+
+directive_line_offset(
+  unique int id: @directive_line ref,
+  int offset: int ref);
+
+directive_line_span(
+  unique int id: @directive_line ref,
+  int startLine: int ref,
+  int startColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref);
+
+directive_nullables(
+  unique int id: @directive_nullable,
+  int setting: int ref, /* 0: disable, 1: enable, 2: restore */
+  int target: int ref); /* 0: none, 1: annotations, 2: warnings */
+
+directive_warnings(
+  unique int id: @directive_warning,
+  string message: string ref);
+
+directive_errors(
+  unique int id: @directive_error,
+  string message: string ref);
+
+directive_undefines(
+  unique int id: @directive_undefine,
+  string name: string ref);
+
+directive_defines(
+  unique int id: @directive_define,
+  string name: string ref);
+
+pragma_checksums(
+  unique int id: @pragma_checksum,
+  int file: @file ref,
+  string guid: string ref,
+  string bytes: string ref);
+
+pragma_warnings(
+  unique int id: @pragma_warning,
+  int kind: int ref /* 0 = disable, 1 = restore */);
+
+#keyset[id, index]
+pragma_warning_error_codes(
+  int id: @pragma_warning ref,
+  string errorCode: string ref,
+  int index: int ref);
+
+preprocessor_directive_location(
+  unique int id: @preprocessor_directive ref,
+  int loc: @location ref);
+
+preprocessor_directive_compilation(
+  int id: @preprocessor_directive ref,
+  int compilation: @compilation ref);
+
+preprocessor_directive_active(
+  unique int id: @preprocessor_directive ref,
+  int active: int ref);  /* 0: false, 1: true */
+
+/** TYPES **/
+
+types(
+  unique int id: @type,
+  int kind: int ref,
+  string name: string ref);
+
+case @type.kind of
+   1 = @bool_type
+|  2 = @char_type
+|  3 = @decimal_type
+|  4 = @sbyte_type
+|  5 = @short_type
+|  6 = @int_type
+|  7 = @long_type
+|  8 = @byte_type
+|  9 = @ushort_type
+| 10 = @uint_type
+| 11 = @ulong_type
+| 12 = @float_type
+| 13 = @double_type
+| 14 = @enum_type
+| 15 = @struct_type
+| 17 = @class_type
+| 19 = @interface_type
+| 20 = @delegate_type
+| 21 = @null_type
+| 22 = @type_parameter
+| 23 = @pointer_type
+| 24 = @nullable_type
+| 25 = @array_type
+| 26 = @void_type
+| 27 = @int_ptr_type
+| 28 = @uint_ptr_type
+| 29 = @dynamic_type
+| 30 = @arglist_type
+| 31 = @unknown_type
+| 32 = @tuple_type
+| 33 = @function_pointer_type
+| 34 = @inline_array_type
+  ;
+
+@simple_type = @bool_type | @char_type | @integral_type | @floating_point_type | @decimal_type;
+@integral_type = @signed_integral_type | @unsigned_integral_type;
+@signed_integral_type = @sbyte_type | @short_type | @int_type | @long_type;
+@unsigned_integral_type = @byte_type  | @ushort_type | @uint_type | @ulong_type;
+@floating_point_type = @float_type | @double_type;
+@value_type = @simple_type | @enum_type | @struct_type | @nullable_type | @int_ptr_type
+            | @uint_ptr_type | @tuple_type | @void_type | @inline_array_type;
+@ref_type = @class_type | @interface_type | @array_type | @delegate_type | @null_type
+          | @dynamic_type;
+@value_or_ref_type = @value_type | @ref_type;
+
+typerefs(
+  unique int id: @typeref,
+  string name: string ref);
+
+typeref_type(
+  int id: @typeref ref,
+  unique int typeId: @type ref);
+
+@type_or_ref = @type | @typeref;
+
+array_element_type(
+  unique int array: @array_type ref,
+  int dimension: int ref,
+  int rank: int ref,
+  int element: @type_or_ref ref);
+
+nullable_underlying_type(
+  unique int nullable: @nullable_type ref,
+  int underlying: @type_or_ref ref);
+
+pointer_referent_type(
+  unique int pointer: @pointer_type ref,
+  int referent: @type_or_ref ref);
+
+enum_underlying_type(
+  unique int enum_id: @enum_type ref,
+  int underlying_type_id: @type_or_ref ref);
+
+delegate_return_type(
+  unique int delegate_id: @delegate_type ref,
+  int return_type_id: @type_or_ref ref);
+
+function_pointer_return_type(
+    unique int function_pointer_id: @function_pointer_type ref,
+    int return_type_id: @type_or_ref ref);
+
+extend(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+anonymous_types(
+  unique int id: @type ref);
+
+@interface_or_ref = @interface_type | @typeref;
+
+implement(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+type_location(
+  int id: @type ref,
+  int loc: @location ref);
+
+tuple_underlying_type(
+  unique int tuple: @tuple_type ref,
+  int struct: @type_or_ref ref);
+
+#keyset[tuple, index]
+tuple_element(
+  int tuple: @tuple_type ref,
+  int index: int ref,
+  unique int field: @field ref);
+
+attributes(
+  unique int id: @attribute,
+  int kind: int ref,
+  int type_id: @type_or_ref ref,
+  int target:  @attributable ref);
+
+case @attribute.kind of
+  0 = @attribute_default
+| 1 = @attribute_return
+| 2 = @attribute_assembly
+| 3 = @attribute_module
+;
+
+attribute_location(
+  int id: @attribute ref,
+  int loc: @location ref);
+
+@type_mention_parent = @element | @type_mention;
+
+type_mention(
+  unique int id: @type_mention,
+  int type_id: @type_or_ref ref,
+  int parent: @type_mention_parent ref);
+
+type_mention_location(
+  unique int id: @type_mention ref,
+  int loc: @location ref);
+
+@has_type_annotation = @assignable | @type_parameter | @callable | @expr | @delegate_type | @generic | @function_pointer_type;
+
+/**
+ * A direct annotation on an entity, for example `string? x;`.
+ *
+ * Annotations:
+ * 2 = reftype is not annotated "!"
+ * 3 = reftype is annotated "?"
+ * 4 = readonly ref type / in parameter
+ * 5 = ref type parameter, return or local variable
+ * 6 = out parameter
+ *
+ * Note that the annotation depends on the element it annotates.
+ * @assignable: The annotation is on the type of the assignable, for example the variable type.
+ * @type_parameter: The annotation is on the reftype constraint
+ * @callable: The annotation is on the return type
+ * @array_type: The annotation is on the element type
+ */
+type_annotation(int id: @has_type_annotation ref, int annotation: int ref);
+
+nullability(unique int nullability: @nullability, int kind: int ref);
+
+case @nullability.kind of
+  0 = @oblivious
+| 1 = @not_annotated
+| 2 = @annotated
+;
+
+#keyset[parent, index]
+nullability_parent(int nullability: @nullability ref, int index: int ref, int parent: @nullability ref)
+
+type_nullability(int id: @has_type_annotation ref, int nullability: @nullability ref);
+
+/**
+ * The nullable flow state of an expression, as determined by Roslyn.
+ *   0 = none (default, not populated)
+ *   1 = not null
+ *   2 = maybe null
+ */
+expr_flowstate(unique int id: @expr ref, int state: int ref);
+
+/** GENERICS **/
+
+@generic = @type | @method | @local_function;
+
+type_parameters(
+  unique int id: @type_parameter ref,
+  int index: int ref,
+  int generic_id: @generic ref,
+  int variance: int ref /* none = 0, out = 1, in = 2 */);
+
+#keyset[constructed_id, index]
+type_arguments(
+  int id: @type_or_ref ref,
+  int index: int ref,
+  int constructed_id: @generic_or_ref ref);
+
+@generic_or_ref = @generic | @typeref;
+
+constructed_generic(
+  unique int constructed: @generic ref,
+  int generic: @generic_or_ref ref);
+
+type_parameter_constraints(
+  unique int id: @type_parameter_constraints,
+  int param_id: @type_parameter ref);
+
+type_parameter_constraints_location(
+  int id: @type_parameter_constraints ref,
+  int loc: @location ref);
+
+general_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int kind: int ref /* class = 1, struct = 2, new = 3 */);
+
+specific_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref);
+
+specific_type_parameter_nullability(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref,
+  int nullability: @nullability ref);
+
+/** FUNCTION POINTERS */
+
+function_pointer_calling_conventions(
+  int id: @function_pointer_type ref,
+  int kind: int ref);
+
+#keyset[id, index]
+has_unmanaged_calling_conventions(
+  int id: @function_pointer_type ref,
+  int index: int ref,
+  int conv_id: @type_or_ref ref);
+
+/** MODIFIERS */
+
+@modifiable = @modifiable_direct | @event_accessor;
+
+@modifiable_direct = @member | @accessor | @local_function | @anonymous_function_expr;
+
+modifiers(
+  unique int id: @modifier,
+  string name: string ref);
+
+has_modifiers(
+  int id: @modifiable_direct ref,
+  int mod_id: @modifier ref);
+
+/** MEMBERS **/
+
+@member = @method | @constructor | @destructor | @field | @property | @event | @operator | @indexer | @type;
+
+@named_exprorstmt = @goto_stmt | @labeled_stmt | @expr;
+
+@virtualizable = @method | @property | @indexer | @event | @operator;
+
+exprorstmt_name(
+  unique int parent_id: @named_exprorstmt ref,
+  string name: string ref);
+
+nested_types(
+  unique int id: @type ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @type ref);
+
+properties(
+  unique int id: @property,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @property ref);
+
+property_location(
+  int id: @property ref,
+  int loc: @location ref);
+
+indexers(
+  unique int id: @indexer,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @indexer ref);
+
+indexer_location(
+  int id: @indexer ref,
+  int loc: @location ref);
+
+accessors(
+  unique int id: @accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_member_id: @member ref,
+  int unbound_id: @accessor ref);
+
+case @accessor.kind of
+  1 = @getter
+| 2 = @setter
+  ;
+
+init_only_accessors(
+  unique int id: @accessor ref);
+
+accessor_location(
+  int id: @accessor ref,
+  int loc: @location ref);
+
+events(
+  unique int id: @event,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @event ref);
+
+event_location(
+  int id: @event ref,
+  int loc: @location ref);
+
+event_accessors(
+  unique int id: @event_accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_event_id: @event ref,
+  int unbound_id: @event_accessor ref);
+
+case @event_accessor.kind of
+  1 = @add_event_accessor
+| 2 = @remove_event_accessor
+  ;
+
+event_accessor_location(
+  int id: @event_accessor ref,
+  int loc: @location ref);
+
+operators(
+  unique int id: @operator,
+  string name: string ref,
+  string symbol: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @operator ref);
+
+operator_location(
+  int id: @operator ref,
+  int loc: @location ref);
+
+constant_value(
+  int id: @variable ref,
+  string value: string ref);
+
+/** CALLABLES **/
+
+@callable = @method | @constructor | @destructor | @operator | @callable_accessor | @anonymous_function_expr | @local_function;
+
+@callable_accessor = @accessor | @event_accessor;
+
+methods(
+  unique int id: @method,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @method ref);
+
+method_location(
+  int id: @method ref,
+  int loc: @location ref);
+
+constructors(
+  unique int id: @constructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @constructor ref);
+
+constructor_location(
+  int id: @constructor ref,
+  int loc: @location ref);
+
+destructors(
+  unique int id: @destructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @destructor ref);
+
+destructor_location(
+  int id: @destructor ref,
+  int loc: @location ref);
+
+overrides(
+  int id: @callable ref,
+  int base_id: @callable ref);
+
+explicitly_implements(
+  int id: @member ref,
+  int interface_id: @interface_or_ref ref);
+
+local_functions(
+    unique int id: @local_function,
+    string name: string ref,
+    int return_type: @type ref,
+    int unbound_id: @local_function ref);
+
+local_function_stmts(
+    unique int fn: @local_function_stmt ref,
+    int stmt: @local_function ref);
+
+/** VARIABLES **/
+
+@variable = @local_scope_variable | @field;
+
+@local_scope_variable = @local_variable | @parameter;
+
+fields(
+  unique int id: @field,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @field ref);
+
+case @field.kind of
+  1 = @addressable_field
+| 2 = @constant
+  ;
+
+field_location(
+  int id: @field ref,
+  int loc: @location ref);
+
+localvars(
+  unique int id: @local_variable,
+  int kind: int ref,
+  string name: string ref,
+  int implicitly_typed: int ref /* 0 = no, 1 = yes */,
+  int type_id: @type_or_ref ref,
+  int parent_id: @local_var_decl_expr ref);
+
+case @local_variable.kind of
+  1 = @addressable_local_variable
+| 2 = @local_constant
+| 3 = @local_variable_ref
+  ;
+
+localvar_location(
+  unique int id: @local_variable ref,
+  int loc: @location ref);
+
+@parameterizable = @callable | @delegate_type | @indexer | @function_pointer_type;
+
+#keyset[name, parent_id]
+#keyset[index, parent_id]
+params(
+  unique int id: @parameter,
+  string name: string ref,
+  int type_id: @type_or_ref ref,
+  int index: int ref,
+  int mode: int ref, /* value = 0, ref = 1, out = 2, params/array = 3, this = 4, in = 5, ref readonly = 6 */
+  int parent_id: @parameterizable ref,
+  int unbound_id: @parameter ref);
+
+param_location(
+  int id: @parameter ref,
+  int loc: @location ref);
+
+@has_scoped_annotation = @local_scope_variable
+
+scoped_annotation(
+  int id: @has_scoped_annotation ref,
+  int kind: int ref // scoped ref = 1, scoped value = 2
+  );
+
+/** STATEMENTS **/
+
+@exprorstmt_parent = @control_flow_element | @top_level_exprorstmt_parent;
+
+statements(
+  unique int id: @stmt,
+  int kind: int ref);
+
+#keyset[index, parent]
+stmt_parent(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_stmt_parent = @callable;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+stmt_parent_top_level(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @top_level_stmt_parent ref);
+
+case @stmt.kind of
+   1 = @block_stmt
+|  2 = @expr_stmt
+|  3 = @if_stmt
+|  4 = @switch_stmt
+|  5 = @while_stmt
+|  6 = @do_stmt
+|  7 = @for_stmt
+|  8 = @foreach_stmt
+|  9 = @break_stmt
+| 10 = @continue_stmt
+| 11 = @goto_stmt
+| 12 = @goto_case_stmt
+| 13 = @goto_default_stmt
+| 14 = @throw_stmt
+| 15 = @return_stmt
+| 16 = @yield_stmt
+| 17 = @try_stmt
+| 18 = @checked_stmt
+| 19 = @unchecked_stmt
+| 20 = @lock_stmt
+| 21 = @using_block_stmt
+| 22 = @var_decl_stmt
+| 23 = @const_decl_stmt
+| 24 = @empty_stmt
+| 25 = @unsafe_stmt
+| 26 = @fixed_stmt
+| 27 = @label_stmt
+| 28 = @catch
+| 29 = @case_stmt
+| 30 = @local_function_stmt
+| 31 = @using_decl_stmt
+  ;
+
+@using_stmt = @using_block_stmt | @using_decl_stmt;
+
+@labeled_stmt = @label_stmt | @case;
+
+@decl_stmt = @var_decl_stmt | @const_decl_stmt | @using_decl_stmt;
+
+@cond_stmt = @if_stmt | @switch_stmt;
+
+@loop_stmt = @while_stmt | @do_stmt | @for_stmt | @foreach_stmt;
+
+@jump_stmt = @break_stmt | @goto_any_stmt | @continue_stmt | @throw_stmt | @return_stmt
+           | @yield_stmt;
+
+@goto_any_stmt = @goto_default_stmt | @goto_case_stmt | @goto_stmt;
+
+
+stmt_location(
+  unique int id: @stmt ref,
+  int loc: @location ref);
+
+catch_type(
+  unique int catch_id: @catch ref,
+  int type_id: @type_or_ref ref,
+  int kind: int ref /* explicit = 1, implicit = 2 */);
+
+foreach_stmt_info(
+  unique int id: @foreach_stmt ref,
+  int kind: int ref /* non-async = 1, async = 2 */);
+
+@foreach_symbol =  @method | @property | @type_or_ref;
+
+#keyset[id, kind]
+foreach_stmt_desugar(
+  int id: @foreach_stmt ref,
+  int symbol: @foreach_symbol ref,
+  int kind: int ref /* GetEnumeratorMethod = 1, CurrentProperty = 2, MoveNextMethod = 3, DisposeMethod = 4, ElementType = 5 */);
+
+/** EXPRESSIONS **/
+
+expressions(
+  unique int id: @expr,
+  int kind: int ref,
+  int type_id: @type_or_ref ref);
+
+#keyset[index, parent]
+expr_parent(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_expr_parent = @attribute | @field | @property | @indexer | @parameter | @directive_if | @directive_elif;
+
+@top_level_exprorstmt_parent = @top_level_expr_parent | @top_level_stmt_parent;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+expr_parent_top_level(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @top_level_exprorstmt_parent ref);
+
+case @expr.kind of
+/* literal */
+   1 = @bool_literal_expr
+|  2 = @char_literal_expr
+|  3 = @decimal_literal_expr
+|  4 = @int_literal_expr
+|  5 = @long_literal_expr
+|  6 = @uint_literal_expr
+|  7 = @ulong_literal_expr
+|  8 = @float_literal_expr
+|  9 = @double_literal_expr
+| 10 = @utf16_string_literal_expr
+| 11 = @null_literal_expr
+/* primary & unary */
+| 12 = @this_access_expr
+| 13 = @base_access_expr
+| 14 = @local_variable_access_expr
+| 15 = @parameter_access_expr
+| 16 = @field_access_expr
+| 17 = @property_access_expr
+| 18 = @method_access_expr
+| 19 = @event_access_expr
+| 20 = @indexer_access_expr
+| 21 = @array_access_expr
+| 22 = @type_access_expr
+| 23 = @typeof_expr
+| 24 = @method_invocation_expr
+| 25 = @delegate_invocation_expr
+| 26 = @operator_invocation_expr
+| 27 = @cast_expr
+| 28 = @object_creation_expr
+| 29 = @explicit_delegate_creation_expr
+| 30 = @implicit_delegate_creation_expr
+| 31 = @array_creation_expr
+| 32 = @default_expr
+| 33 = @plus_expr
+| 34 = @minus_expr
+| 35 = @bit_not_expr
+| 36 = @log_not_expr
+| 37 = @post_incr_expr
+| 38 = @post_decr_expr
+| 39 = @pre_incr_expr
+| 40 = @pre_decr_expr
+/* multiplicative */
+| 41 = @mul_expr
+| 42 = @div_expr
+| 43 = @rem_expr
+/* additive */
+| 44 = @add_expr
+| 45 = @sub_expr
+/* shift */
+| 46 = @lshift_expr
+| 47 = @rshift_expr
+/* relational */
+| 48 = @lt_expr
+| 49 = @gt_expr
+| 50 = @le_expr
+| 51 = @ge_expr
+/* equality */
+| 52 = @eq_expr
+| 53 = @ne_expr
+/* logical */
+| 54 = @bit_and_expr
+| 55 = @bit_xor_expr
+| 56 = @bit_or_expr
+| 57 = @log_and_expr
+| 58 = @log_or_expr
+/* type testing */
+| 59 = @is_expr
+| 60 = @as_expr
+/* null coalescing */
+| 61 = @null_coalescing_expr
+/* conditional */
+| 62 = @conditional_expr
+/* assignment */
+| 63 = @simple_assign_expr
+| 64 = @assign_add_expr
+| 65 = @assign_sub_expr
+| 66 = @assign_mul_expr
+| 67 = @assign_div_expr
+| 68 = @assign_rem_expr
+| 69 = @assign_and_expr
+| 70 = @assign_xor_expr
+| 71 = @assign_or_expr
+| 72 = @assign_lshift_expr
+| 73 = @assign_rshift_expr
+/* more */
+| 74 = @object_init_expr
+| 75 = @collection_init_expr
+| 76 = @array_init_expr
+| 77 = @checked_expr
+| 78 = @unchecked_expr
+| 79 = @constructor_init_expr
+| 80 = @add_event_expr
+| 81 = @remove_event_expr
+| 82 = @par_expr
+| 83 = @local_var_decl_expr
+| 84 = @lambda_expr
+| 85 = @anonymous_method_expr
+| 86 = @namespace_expr
+/* dynamic */
+| 92 = @dynamic_element_access_expr
+| 93 = @dynamic_member_access_expr
+/* unsafe */
+| 100 = @pointer_indirection_expr
+| 101 = @address_of_expr
+| 102 = @sizeof_expr
+/* async */
+| 103 = @await_expr
+/* C# 6.0 */
+| 104 = @nameof_expr
+| 105 = @interpolated_string_expr
+| 106 = @unknown_expr
+/* C# 7.0 */
+| 107 = @throw_expr
+| 108 = @tuple_expr
+| 109 = @local_function_invocation_expr
+| 110 = @ref_expr
+| 111 = @discard_expr
+/* C# 8.0 */
+| 112 = @range_expr
+| 113 = @index_expr
+| 114 = @switch_expr
+| 115 = @recursive_pattern_expr
+| 116 = @property_pattern_expr
+| 117 = @positional_pattern_expr
+| 118 = @switch_case_expr
+| 119 = @assign_coalesce_expr
+| 120 = @suppress_nullable_warning_expr
+| 121 = @namespace_access_expr
+/* C# 9.0 */
+| 122 = @lt_pattern_expr
+| 123 = @gt_pattern_expr
+| 124 = @le_pattern_expr
+| 125 = @ge_pattern_expr
+| 126 = @not_pattern_expr
+| 127 = @and_pattern_expr
+| 128 = @or_pattern_expr
+| 129 = @function_pointer_invocation_expr
+| 130 = @with_expr
+/* C# 11.0 */
+| 131 = @list_pattern_expr
+| 132 = @slice_pattern_expr
+| 133 = @urshift_expr
+| 134 = @assign_urshift_expr
+| 135 = @utf8_string_literal_expr
+/* C# 12.0 */
+| 136 = @collection_expr
+| 137 = @spread_element_expr
+| 138 = @interpolated_string_insert_expr
+/* Preprocessor */
+| 999 = @define_symbol_expr
+;
+
+@switch = @switch_stmt | @switch_expr;
+@case = @case_stmt | @switch_case_expr;
+@pattern_match = @case | @is_expr;
+@unary_pattern_expr = @not_pattern_expr;
+@relational_pattern_expr = @gt_pattern_expr | @lt_pattern_expr | @ge_pattern_expr | @le_pattern_expr;
+@binary_pattern_expr = @and_pattern_expr | @or_pattern_expr;
+
+@integer_literal_expr = @int_literal_expr | @long_literal_expr | @uint_literal_expr | @ulong_literal_expr;
+@real_literal_expr = @float_literal_expr | @double_literal_expr | @decimal_literal_expr;
+@string_literal_expr = @utf16_string_literal_expr | @utf8_string_literal_expr;
+@literal_expr = @bool_literal_expr | @char_literal_expr | @integer_literal_expr | @real_literal_expr
+              | @string_literal_expr | @null_literal_expr;
+
+@assign_expr = @simple_assign_expr | @assign_op_expr | @local_var_decl_expr;
+@assign_op_expr =  @assign_arith_expr | @assign_bitwise_expr | @assign_event_expr | @assign_coalesce_expr;
+@assign_event_expr = @add_event_expr | @remove_event_expr;
+
+@assign_arith_expr = @assign_add_expr | @assign_sub_expr | @assign_mul_expr | @assign_div_expr
+                   | @assign_rem_expr
+@assign_bitwise_expr = @assign_and_expr | @assign_or_expr | @assign_xor_expr
+                   | @assign_lshift_expr | @assign_rshift_expr | @assign_urshift_expr;
+
+@member_access_expr = @field_access_expr | @property_access_expr | @indexer_access_expr | @event_access_expr
+                    | @method_access_expr | @type_access_expr | @dynamic_member_access_expr;
+@access_expr = @member_access_expr | @this_access_expr | @base_access_expr | @assignable_access_expr | @namespace_access_expr;
+@element_access_expr = @indexer_access_expr | @array_access_expr | @dynamic_element_access_expr;
+
+@local_variable_access = @local_variable_access_expr | @local_var_decl_expr;
+@local_scope_variable_access_expr = @parameter_access_expr | @local_variable_access;
+@variable_access_expr = @local_scope_variable_access_expr | @field_access_expr;
+
+@assignable_access_expr = @variable_access_expr | @property_access_expr | @element_access_expr
+                        | @event_access_expr | @dynamic_member_access_expr;
+
+@objectorcollection_init_expr = @object_init_expr | @collection_init_expr;
+
+@delegate_creation_expr = @explicit_delegate_creation_expr | @implicit_delegate_creation_expr;
+
+@bin_arith_op_expr = @mul_expr | @div_expr | @rem_expr | @add_expr | @sub_expr;
+@incr_op_expr =  @pre_incr_expr | @post_incr_expr;
+@decr_op_expr =  @pre_decr_expr | @post_decr_expr;
+@mut_op_expr = @incr_op_expr | @decr_op_expr;
+@un_arith_op_expr = @plus_expr | @minus_expr | @mut_op_expr;
+@arith_op_expr = @bin_arith_op_expr | @un_arith_op_expr;
+
+@ternary_log_op_expr = @conditional_expr;
+@bin_log_op_expr = @log_and_expr | @log_or_expr | @null_coalescing_expr;
+@un_log_op_expr = @log_not_expr;
+@log_expr = @un_log_op_expr | @bin_log_op_expr | @ternary_log_op_expr;
+
+@bin_bit_op_expr =  @bit_and_expr | @bit_or_expr | @bit_xor_expr | @lshift_expr
+                 | @rshift_expr | @urshift_expr;
+@un_bit_op_expr = @bit_not_expr;
+@bit_expr = @un_bit_op_expr | @bin_bit_op_expr;
+
+@equality_op_expr =  @eq_expr | @ne_expr;
+@rel_op_expr = @gt_expr | @lt_expr| @ge_expr | @le_expr;
+@comp_expr = @equality_op_expr | @rel_op_expr;
+
+@op_expr = @assign_expr | @un_op | @bin_op | @ternary_op;
+
+@ternary_op = @ternary_log_op_expr;
+@bin_op = @bin_arith_op_expr | @bin_log_op_expr | @bin_bit_op_expr | @comp_expr;
+@un_op = @un_arith_op_expr | @un_log_op_expr | @un_bit_op_expr | @sizeof_expr
+       | @pointer_indirection_expr | @address_of_expr;
+
+@anonymous_function_expr = @lambda_expr | @anonymous_method_expr;
+
+@call = @method_invocation_expr | @constructor_init_expr | @operator_invocation_expr
+      | @delegate_invocation_expr | @object_creation_expr | @call_access_expr
+      | @local_function_invocation_expr | @function_pointer_invocation_expr;
+
+@call_access_expr = @property_access_expr | @event_access_expr | @indexer_access_expr;
+
+@late_bindable_expr = @dynamic_element_access_expr | @dynamic_member_access_expr
+                    | @object_creation_expr | @method_invocation_expr | @operator_invocation_expr;
+
+@throw_element = @throw_expr | @throw_stmt;
+
+@implicitly_typeable_object_creation_expr = @object_creation_expr | @explicit_delegate_creation_expr;
+
+implicitly_typed_array_creation(
+  unique int id: @array_creation_expr ref);
+
+explicitly_sized_array_creation(
+  unique int id: @array_creation_expr ref);
+
+stackalloc_array_creation(
+  unique int id: @array_creation_expr ref);
+
+implicitly_typed_object_creation(
+  unique int id: @implicitly_typeable_object_creation_expr ref);
+
+mutator_invocation_mode(
+  unique int id: @operator_invocation_expr ref,
+  int mode: int ref /* prefix = 1, postfix = 2*/);
+
+expr_value(
+  unique int id: @expr ref,
+  string value: string ref);
+
+expr_call(
+  unique int caller_id: @expr ref,
+  int target_id: @callable ref);
+
+expr_access(
+  unique int accesser_id: @access_expr ref,
+  int target_id: @accessible ref);
+
+@accessible = @method | @assignable | @local_function | @namespace;
+
+expr_location(
+  unique int id: @expr ref,
+  int loc: @location ref);
+
+dynamic_member_name(
+  unique int id: @late_bindable_expr ref,
+  string name: string ref);
+
+@qualifiable_expr = @member_access_expr
+                  | @method_invocation_expr
+                  | @element_access_expr;
+
+conditional_access(
+  unique int id: @qualifiable_expr ref);
+
+expr_argument(
+  unique int id: @expr ref,
+  int mode: int ref);
+  /* mode is the same as params: value = 0, ref = 1, out = 2 */
+
+expr_argument_name(
+  unique int id: @expr ref,
+  string name: string ref);
+
+lambda_expr_return_type(
+  unique int id: @lambda_expr ref,
+  int type_id: @type_or_ref ref);
+
+/* Compiler generated */
+
+compiler_generated(unique int id: @element ref);
+
+/** CONTROL/DATA FLOW **/
+
+@control_flow_element = @stmt | @expr;
+
+/* XML Files */
+
+xmlEncoding  (
+  unique int id: @file ref,
+  string encoding: string ref);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+/* Comments */
+
+commentline(
+  unique int id: @commentline,
+  int kind: int ref,
+  string text: string ref,
+  string rawtext: string ref);
+
+case @commentline.kind of
+  0 = @singlelinecomment
+| 1 = @xmldoccomment
+| 2 = @multilinecomment;
+
+commentline_location(
+  unique int id: @commentline ref,
+  int loc: @location ref);
+
+commentblock(
+  unique int id : @commentblock);
+
+commentblock_location(
+  unique int id: @commentblock ref,
+  int loc: @location ref);
+
+commentblock_binding(
+  int id: @commentblock ref,
+  int entity: @element ref,
+  int bindtype: int ref);    /* 0: Parent, 1: Best, 2: Before, 3: After */
+
+commentblock_child(
+  int id: @commentblock ref,
+  int commentline: @commentline ref,
+  int index: int ref);
+
+/* ASP.NET */
+
+case @asp_element.kind of
+  0=@asp_close_tag
+| 1=@asp_code
+| 2=@asp_comment
+| 3=@asp_data_binding
+| 4=@asp_directive
+| 5=@asp_open_tag
+| 6=@asp_quoted_string
+| 7=@asp_text
+| 8=@asp_xml_directive;
+
+@asp_attribute = @asp_code | @asp_data_binding | @asp_quoted_string;
+
+asp_elements(
+  unique int id: @asp_element,
+  int kind: int ref,
+  int loc: @location ref);
+
+asp_comment_server(unique int comment: @asp_comment ref);
+asp_code_inline(unique int code: @asp_code ref);
+asp_directive_attribute(
+  int directive: @asp_directive ref,
+  int index: int ref,
+  string name: string ref,
+  int value: @asp_quoted_string ref);
+asp_directive_name(
+  unique int directive: @asp_directive ref,
+  string name: string ref);
+asp_element_body(
+  unique int element: @asp_element ref,
+  string body: string ref);
+asp_tag_attribute(
+  int tag: @asp_open_tag ref,
+  int index: int ref,
+  string name: string ref,
+  int attribute: @asp_attribute ref);
+asp_tag_name(
+  unique int tag: @asp_open_tag ref,
+  string name: string ref);
+asp_tag_isempty(int tag: @asp_open_tag ref);
diff --git a/csharp/downgrades/68b5aec54e50fe7e375df3777b756a746ca3a37c/upgrade.properties b/csharp/downgrades/68b5aec54e50fe7e375df3777b756a746ca3a37c/upgrade.properties
new file mode 100644
index 00000000000..950235727fe
--- /dev/null
+++ b/csharp/downgrades/68b5aec54e50fe7e375df3777b756a746ca3a37c/upgrade.properties
@@ -0,0 +1,2 @@
+description: Remove @locatable type
+compatibility: full
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNet.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNet.cs
index c71013bf7a0..4a4fd651a5b 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNet.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNet.cs
@@ -138,7 +138,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
         }
 
         // The version number should be kept in sync with the version .NET version used for building the application.
-        public const string LatestDotNetSdkVersion = "9.0.100";
+        public const string LatestDotNetSdkVersion = "9.0.300";
 
         /// <summary>
         /// Returns a script for downloading relevant versions of the
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNetCliInvoker.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNetCliInvoker.cs
index a690e3f880f..e3efce09481 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNetCliInvoker.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNetCliInvoker.cs
@@ -44,7 +44,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
             // Configure the proxy settings, if applicable.
             if (this.proxy != null)
             {
-                logger.LogInfo($"Setting up Dependabot proxy at {this.proxy.Address}");
+                logger.LogDebug($"Configuring environment variables for the Dependabot proxy at {this.proxy.Address}");
 
                 startInfo.EnvironmentVariables["HTTP_PROXY"] = this.proxy.Address;
                 startInfo.EnvironmentVariables["HTTPS_PROXY"] = this.proxy.Address;
@@ -57,11 +57,11 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
         private bool RunCommandAux(string args, string? workingDirectory, out IList<string> output, bool silent)
         {
             var dirLog = string.IsNullOrWhiteSpace(workingDirectory) ? "" : $" in {workingDirectory}";
-            logger.LogInfo($"Running '{Exec} {args}'{dirLog}");
             var pi = MakeDotnetStartInfo(args, workingDirectory);
             var threadId = Environment.CurrentManagedThreadId;
             void onOut(string s) => logger.Log(silent ? Severity.Debug : Severity.Info, s, threadId);
             void onError(string s) => logger.LogError(s, threadId);
+            logger.LogInfo($"Running '{Exec} {args}'{dirLog}");
             var exitCode = pi.ReadOutput(out output, onOut, onError);
             if (exitCode != 0)
             {
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.Standalone/Extractor.cs b/csharp/extractor/Semmle.Extraction.CSharp.Standalone/Extractor.cs
index 9ddf7686bad..573c8954bf4 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.Standalone/Extractor.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.Standalone/Extractor.cs
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.IO;
 using System.Linq;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
@@ -53,6 +54,20 @@ namespace Semmle.Extraction.CSharp.Standalone
                         }
 
                         progressMonitor.MissingSummary(analyser.ExtractionContext!.MissingTypes.Count(), analyser.ExtractionContext!.MissingNamespaces.Count());
+
+                        // If extracting a base database, we need to create an empty metadata file.
+                        if (EnvironmentVariables.GetBaseMetaDataOutPath() is string baseMetaDataOutPath)
+                        {
+                            try
+                            {
+                                analyser.Logger.LogInfo($"Creating base metadata file at {baseMetaDataOutPath}");
+                                File.WriteAllText(baseMetaDataOutPath, string.Empty);
+                            }
+                            catch (Exception ex)
+                            {
+                                analyser.Logger.LogError($"Failed to create base metadata file: {ex.Message}");
+                            }
+                        }
                     });
             }
             finally
@@ -143,7 +158,8 @@ namespace Semmle.Extraction.CSharp.Standalone
             var pathTransformer = new PathTransformer(canonicalPathCache);
 
             var progressMonitor = new ExtractionProgress(logger);
-            using var analyser = new StandaloneAnalyser(progressMonitor, fileLogger, pathTransformer, canonicalPathCache, false);
+            var overlayInfo = OverlayInfoFactory.Make(logger, options.SrcDir);
+            using var analyser = new StandaloneAnalyser(progressMonitor, fileLogger, pathTransformer, canonicalPathCache, overlayInfo, false);
             try
             {
                 var extractionInput = new ExtractionInput(dependencyManager.AllSourceFiles, dependencyManager.ReferenceFiles, dependencyManager.CompilationInfos);
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Accessor.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Accessor.cs
index 66e45387d87..fe01e0f9b58 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Accessor.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Accessor.cs
@@ -63,8 +63,10 @@ namespace Semmle.Extraction.CSharp.Entities
 
             trapFile.accessors(this, kind, Symbol.Name, parent, unboundAccessor);
 
-            foreach (var l in Locations)
-                trapFile.accessor_location(this, l);
+            if (Context.ExtractLocation(Symbol))
+            {
+                WriteLocationsToTrap(trapFile.accessor_location, this, Locations);
+            }
 
             Overrides(trapFile);
 
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Attribute.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Attribute.cs
index e4799c05507..ded4320cba8 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Attribute.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Attribute.cs
@@ -57,13 +57,26 @@ namespace Semmle.Extraction.CSharp.Entities
 
         public override void Populate(TextWriter trapFile)
         {
+            // In this case, we don't extract the attribute again, as it was extracted using * ID
+            // originally and we re-use that.
+            if (Context.OnlyScaffold && (ReportingLocation is null || !ReportingLocation.IsInSource))
+            {
+                return;
+            }
+
             var type = Type.Create(Context, Symbol.AttributeClass);
             trapFile.attributes(this, kind, type.TypeRef, entity);
-            trapFile.attribute_location(this, Location);
+
+            if (Context.OnlyScaffold)
+            {
+                return;
+            }
+
+            WriteLocationToTrap(trapFile.attribute_location, this, Location);
 
             if (attributeSyntax is not null)
             {
-                trapFile.attribute_location(this, Assembly.CreateOutputAssembly(Context));
+                WriteLocationToTrap(trapFile.attribute_location, this, Assembly.CreateOutputAssembly(Context));
 
                 TypeMention.Create(Context, attributeSyntax.Name, this, type);
             }
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Base/CachedEntity.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Base/CachedEntity.cs
index 96bef973211..2002fe0f1d7 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Base/CachedEntity.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Base/CachedEntity.cs
@@ -1,3 +1,5 @@
+using System;
+using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using Microsoft.CodeAnalysis;
@@ -52,6 +54,22 @@ namespace Semmle.Extraction.CSharp.Entities
             }
         }
 
+        protected static void WriteLocationToTrap<T1>(Action<T1, Location> writeAction, T1 entity, Location l)
+        {
+            if (l is not EmptyLocation)
+            {
+                writeAction(entity, l);
+            }
+        }
+
+        protected static void WriteLocationsToTrap<T1>(Action<T1, Location> writeAction, T1 entity, IEnumerable<Location> locations)
+        {
+            foreach (var loc in locations)
+            {
+                WriteLocationToTrap(writeAction, entity, loc);
+            }
+        }
+
         public override bool NeedsPopulation { get; }
 
         public override int GetHashCode() => Symbol is null ? 0 : Symbol.GetHashCode();
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Base/CachedSymbol.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Base/CachedSymbol.cs
index c39eb6076b5..92861e97fdd 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Base/CachedSymbol.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Base/CachedSymbol.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/CommentBlock.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/CommentBlock.cs
index 3c4cdcffc0e..af579a47dc5 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/CommentBlock.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/CommentBlock.cs
@@ -10,9 +10,13 @@ namespace Semmle.Extraction.CSharp.Entities
 
         public override void Populate(TextWriter trapFile)
         {
+            if (Context.OnlyScaffold)
+            {
+                return;
+            }
             trapFile.commentblock(this);
-            trapFile.commentblock_location(this, Context.CreateLocation(Symbol.Location));
             Symbol.CommentLines.ForEach((l, child) => trapFile.commentblock_child(this, l, child));
+            WriteLocationToTrap(trapFile.commentblock_location, this, Context.CreateLocation(Symbol.Location));
         }
 
         public override bool NeedsPopulation => true;
@@ -27,6 +31,10 @@ namespace Semmle.Extraction.CSharp.Entities
 
         public void BindTo(Label entity, CommentBinding binding)
         {
+            if (Context.OnlyScaffold)
+            {
+                return;
+            }
             Context.TrapWriter.Writer.commentblock_binding(this, entity, binding);
         }
 
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/CommentLine.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/CommentLine.cs
index 7638eefce12..f7db5dbe294 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/CommentLine.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/CommentLine.cs
@@ -21,9 +21,14 @@ namespace Semmle.Extraction.CSharp.Entities
 
         public override void Populate(TextWriter trapFile)
         {
-            location = Context.CreateLocation(Location);
+            if (Context.OnlyScaffold)
+            {
+                return;
+            }
             trapFile.commentline(this, Type == CommentLineType.MultilineContinuation ? CommentLineType.Multiline : Type, Text, RawText);
-            trapFile.commentline_location(this, location);
+            location = Context.CreateLocation(Location);
+            WriteLocationToTrap(trapFile.commentline_location, this, location);
+
         }
 
         public override Microsoft.CodeAnalysis.Location? ReportingLocation => location?.Symbol;
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Compilations/CompilerDiagnostic.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Compilations/CompilerDiagnostic.cs
index b4c0cdca730..667ed8f4301 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Compilations/CompilerDiagnostic.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Compilations/CompilerDiagnostic.cs
@@ -21,6 +21,11 @@ namespace Semmle.Extraction.CSharp.Entities
 
         protected override void Populate(TextWriter trapFile)
         {
+            if (Context.OnlyScaffold)
+            {
+                return;
+            }
+
             var key = diagnostic.Id;
             var messageCount = compilation.messageCounts.AddOrUpdate(key, 1, (_, c) => c + 1);
             if (messageCount > limit)
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Constructor.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Constructor.cs
index c3ce2bb6d29..2c3b25b2e1c 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Constructor.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Constructor.cs
@@ -29,13 +29,6 @@ namespace Semmle.Extraction.CSharp.Entities
             ContainingType!.PopulateGenerics();
 
             trapFile.constructors(this, Symbol.ContainingType.Name, ContainingType, (Constructor)OriginalDefinition);
-            trapFile.constructor_location(this, Location);
-
-            if (MakeSynthetic)
-            {
-                // Create a synthetic empty body for primary and default constructors.
-                Statements.SyntheticEmptyBlock.Create(Context, this, 0, Location);
-            }
 
             if (Symbol.IsImplicitlyDeclared)
             {
@@ -43,6 +36,23 @@ namespace Semmle.Extraction.CSharp.Entities
                 trapFile.numlines(this, lineCounts);
             }
             ExtractCompilerGenerated(trapFile);
+
+            if (Context.OnlyScaffold)
+            {
+                return;
+            }
+
+            if (MakeSynthetic)
+            {
+                // Create a synthetic empty body for primary and default constructors.
+                Statements.SyntheticEmptyBlock.Create(Context, this, 0, Location);
+            }
+
+            if (Context.ExtractLocation(Symbol) && (!IsDefault || IsBestSourceLocation))
+            {
+                WriteLocationToTrap(trapFile.constructor_location, this, Location);
+            }
+
         }
 
         protected override void ExtractInitializers(TextWriter trapFile)
@@ -50,7 +60,7 @@ namespace Semmle.Extraction.CSharp.Entities
             // Do not extract initializers for constructed types.
             // Extract initializers for constructors with a body, primary constructors
             // and default constructors for classes and structs declared in source code.
-            if (Block is null && ExpressionBody is null && !MakeSynthetic)
+            if (Block is null && ExpressionBody is null && !MakeSynthetic || Context.OnlyScaffold)
             {
                 return;
             }
@@ -103,6 +113,7 @@ namespace Semmle.Extraction.CSharp.Entities
                 }
 
                 var baseConstructorTarget = Create(Context, baseConstructor);
+
                 var info = new ExpressionInfo(Context,
                     AnnotatedTypeSymbol.CreateNotAnnotated(baseType),
                     Location,
@@ -168,7 +179,15 @@ namespace Semmle.Extraction.CSharp.Entities
             Symbol.ContainingType.IsSourceDeclaration() &&
             !Symbol.ContainingType.IsAnonymousType;
 
-        private bool MakeSynthetic => IsPrimary || IsDefault;
+        /// <summary>
+        /// Returns true if we consider the reporting location of this constructor entity the best
+        /// location of the constructor.
+        /// For partial classes with default constructors, Roslyn consider each partial class declaration
+        /// as the possible location for the implicit default constructor.
+        /// </summary>
+        private bool IsBestSourceLocation => ReportingLocation is not null && Context.IsLocationInContext(ReportingLocation);
+
+        private bool MakeSynthetic => (IsPrimary || (IsDefault && IsBestSourceLocation)) && !Context.OnlyScaffold;
 
         [return: NotNullIfNotNull(nameof(constructor))]
         public static new Constructor? Create(Context cx, IMethodSymbol? constructor)
@@ -222,7 +241,8 @@ namespace Semmle.Extraction.CSharp.Entities
 
                 if (Symbol.IsImplicitlyDeclared)
                 {
-                    return ContainingType!.ReportingLocation;
+                    var best = Symbol.Locations.Where(l => l.IsInSource).BestOrDefault();
+                    return best ?? ContainingType!.ReportingLocation;
                 }
 
                 return Symbol.ContainingType.Locations.FirstOrDefault();
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Destructor.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Destructor.cs
index b6a9c8e8f1b..0681d55377a 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Destructor.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Destructor.cs
@@ -15,7 +15,11 @@ namespace Semmle.Extraction.CSharp.Entities
             ContainingType!.PopulateGenerics();
 
             trapFile.destructors(this, $"~{Symbol.ContainingType.Name}", ContainingType, OriginalDefinition(Context, this, Symbol));
-            trapFile.destructor_location(this, Location);
+
+            if (Context.ExtractLocation(Symbol))
+            {
+                WriteLocationToTrap(trapFile.destructor_location, this, Location);
+            }
         }
 
         private static new Destructor OriginalDefinition(Context cx, Destructor original, IMethodSymbol symbol)
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Event.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Event.cs
index 888e1ba7304..bbd90989617 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Event.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Event.cs
@@ -37,7 +37,6 @@ namespace Semmle.Extraction.CSharp.Entities
                 Method.Create(Context, remover);
 
             PopulateModifiers(trapFile);
-            BindComments();
 
             var declSyntaxReferences = IsSourceDeclaration
                 ? Symbol.DeclaringSyntaxReferences.Select(d => d.GetSyntax()).ToArray()
@@ -51,8 +50,17 @@ namespace Semmle.Extraction.CSharp.Entities
                     TypeMention.Create(Context, syntax.ExplicitInterfaceSpecifier!.Name, this, explicitInterface);
             }
 
-            foreach (var l in Locations)
-                trapFile.event_location(this, l);
+            if (Context.OnlyScaffold)
+            {
+                return;
+            }
+
+            BindComments();
+
+            if (Context.ExtractLocation(Symbol))
+            {
+                WriteLocationsToTrap(trapFile.event_location, this, Locations);
+            }
 
             foreach (var syntaxType in declSyntaxReferences
                 .OfType<VariableDeclaratorSyntax>()
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/EventAccessor.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/EventAccessor.cs
index 1df6be7a273..254e7c76956 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/EventAccessor.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/EventAccessor.cs
@@ -48,8 +48,10 @@ namespace Semmle.Extraction.CSharp.Entities
 
             trapFile.event_accessors(this, kind, Symbol.Name, parent, unboundAccessor);
 
-            foreach (var l in Locations)
-                trapFile.event_accessor_location(this, l);
+            if (Context.ExtractLocation(Symbol))
+            {
+                WriteLocationsToTrap(trapFile.event_accessor_location, this, Locations);
+            }
 
             Overrides(trapFile);
 
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expression.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expression.cs
index a5cb6e316f4..93107fc6dab 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expression.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expression.cs
@@ -40,6 +40,7 @@ namespace Semmle.Extraction.CSharp.Entities
                 trapFile.expr_parent_top_level(this, info.Child, info.Parent);
             else
                 trapFile.expr_parent(this, info.Child, info.Parent);
+
             trapFile.expr_location(this, Location);
 
             if (Type.HasValue && !Type.Value.HasObliviousNullability())
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/ExtractionMessage.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/ExtractionMessage.cs
index f8a771ae6d0..922094529b0 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/ExtractionMessage.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/ExtractionMessage.cs
@@ -28,6 +28,11 @@ namespace Semmle.Extraction.CSharp.Entities
 
         protected override void Populate(TextWriter trapFile)
         {
+            if (Context.OnlyScaffold)
+            {
+                return;
+            }
+
             // For the time being we're counting the number of messages per severity, we could introduce other groupings in the future
             var key = msg.Severity.ToString();
             groupedMessageCounts.AddOrUpdate(key, 1, (_, c) => c + 1);
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Field.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Field.cs
index 0a91eb57ecd..9a010aad376 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Field.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Field.cs
@@ -49,8 +49,15 @@ namespace Semmle.Extraction.CSharp.Entities
                 }
             }
 
-            foreach (var l in Locations)
-                trapFile.field_location(this, l);
+            if (Context.OnlyScaffold)
+            {
+                return;
+            }
+
+            if (Context.ExtractLocation(Symbol))
+            {
+                WriteLocationsToTrap(trapFile.field_location, this, Locations);
+            }
 
             if (!IsSourceDeclaration || !Symbol.FromSource())
                 return;
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Indexer.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Indexer.cs
index 1235b120253..870c2eb7650 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Indexer.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Indexer.cs
@@ -19,8 +19,6 @@ namespace Semmle.Extraction.CSharp.Entities
 
             var type = Type.Create(Context, Symbol.Type);
             trapFile.indexers(this, Symbol.GetName(useMetadataName: true), ContainingType!, type.TypeRef, OriginalDefinition);
-            foreach (var l in Locations)
-                trapFile.indexer_location(this, l);
 
             var getter = BodyDeclaringSymbol.GetMethod;
             var setter = BodyDeclaringSymbol.SetMethod;
@@ -40,20 +38,8 @@ namespace Semmle.Extraction.CSharp.Entities
                 Parameter.Create(Context, Symbol.Parameters[i], this, original);
             }
 
-            if (IsSourceDeclaration)
-            {
-                var expressionBody = ExpressionBody;
-                if (expressionBody is not null)
-                {
-                    // The expression may need to reference parameters in the getter.
-                    // So we need to arrange that the expression is populated after the getter.
-                    Context.PopulateLater(() => Expression.CreateFromNode(new ExpressionNodeInfo(Context, expressionBody, this, 0).SetType(Symbol.GetAnnotatedType())));
-                }
-            }
-
             PopulateAttributes();
             PopulateModifiers(trapFile);
-            BindComments();
 
             var declSyntaxReferences = IsSourceDeclaration
                 ? Symbol.DeclaringSyntaxReferences.
@@ -68,6 +54,28 @@ namespace Semmle.Extraction.CSharp.Entities
                     TypeMention.Create(Context, syntax.ExplicitInterfaceSpecifier!.Name, this, explicitInterface);
             }
 
+            if (Context.OnlyScaffold)
+            {
+                return;
+            }
+
+            if (Context.ExtractLocation(Symbol))
+            {
+                WriteLocationsToTrap(trapFile.indexer_location, this, Locations);
+            }
+
+            if (IsSourceDeclaration)
+            {
+                var expressionBody = ExpressionBody;
+                if (expressionBody is not null)
+                {
+                    // The expression may need to reference parameters in the getter.
+                    // So we need to arrange that the expression is populated after the getter.
+                    Context.PopulateLater(() => Expression.CreateFromNode(new ExpressionNodeInfo(Context, expressionBody, this, 0).SetType(Symbol.GetAnnotatedType())));
+                }
+            }
+
+            BindComments();
 
             foreach (var syntax in declSyntaxReferences)
                 TypeMention.Create(Context, syntax.Type, this, type);
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/LocalVariable.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/LocalVariable.cs
index f1c6813a66d..22174f7e945 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/LocalVariable.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/LocalVariable.cs
@@ -41,7 +41,12 @@ namespace Semmle.Extraction.CSharp.Entities
                 trapFile.localvars(this, Kinds.VariableKind.None, Symbol.Name, @var, Type.Create(Context, parent.Type).TypeRef, parent);
             }
 
-            trapFile.localvar_location(this, Location);
+            if (Context.OnlyScaffold)
+            {
+                return;
+            }
+
+            WriteLocationToTrap(trapFile.localvar_location, this, Location);
 
             DefineConstantValue(trapFile);
         }
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Locations/GeneratedLocation.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Locations/EmptyLocation.cs
similarity index 54%
rename from csharp/extractor/Semmle.Extraction.CSharp/Entities/Locations/GeneratedLocation.cs
rename to csharp/extractor/Semmle.Extraction.CSharp/Entities/Locations/EmptyLocation.cs
index d12f1ca51e0..f81db35fdbc 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Locations/GeneratedLocation.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Locations/EmptyLocation.cs
@@ -2,11 +2,11 @@ using System.IO;
 
 namespace Semmle.Extraction.CSharp.Entities
 {
-    public class GeneratedLocation : SourceLocation
+    public class EmptyLocation : SourceLocation
     {
         private readonly File generatedFile;
 
-        private GeneratedLocation(Context cx)
+        private EmptyLocation(Context cx)
             : base(cx, null)
         {
             generatedFile = GeneratedFile.Create(cx);
@@ -26,15 +26,16 @@ namespace Semmle.Extraction.CSharp.Entities
 
         public override int GetHashCode() => 98732567;
 
-        public override bool Equals(object? obj) => obj is not null && obj.GetType() == typeof(GeneratedLocation);
+        public override bool Equals(object? obj) => obj is not null && obj.GetType() == typeof(EmptyLocation);
 
-        public static GeneratedLocation Create(Context cx) => GeneratedLocationFactory.Instance.CreateEntity(cx, typeof(GeneratedLocation), null);
+        public static EmptyLocation Create(Context cx)
+            => EmptyLocationFactory.Instance.CreateEntity(cx, typeof(EmptyLocation), null);
 
-        private class GeneratedLocationFactory : CachedEntityFactory<string?, GeneratedLocation>
+        private class EmptyLocationFactory : CachedEntityFactory<string?, EmptyLocation>
         {
-            public static GeneratedLocationFactory Instance { get; } = new GeneratedLocationFactory();
+            public static EmptyLocationFactory Instance { get; } = new EmptyLocationFactory();
 
-            public override GeneratedLocation Create(Context cx, string? init) => new GeneratedLocation(cx);
+            public override EmptyLocation Create(Context cx, string? init) => new EmptyLocation(cx);
         }
     }
 }
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Locations/NonGeneratedSourceLocation.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Locations/NonGeneratedSourceLocation.cs
index 69e9ea4e9dc..7a13138ff6a 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Locations/NonGeneratedSourceLocation.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Locations/NonGeneratedSourceLocation.cs
@@ -40,8 +40,29 @@ namespace Semmle.Extraction.CSharp.Entities
             get;
         }
 
+        private static void WriteStarId(EscapingTextWriter writer)
+        {
+            writer.Write('*');
+        }
+
+        public sealed override void WriteQuotedId(EscapingTextWriter writer)
+        {
+            if (Context.ExtractionContext.IsStandalone)
+            {
+                WriteStarId(writer);
+                return;
+            }
+            base.WriteQuotedId(writer);
+        }
+
         public override void WriteId(EscapingTextWriter trapFile)
         {
+            if (Context.ExtractionContext.IsStandalone)
+            {
+                WriteStarId(trapFile);
+                return;
+            }
+
             trapFile.Write("loc,");
             trapFile.WriteSubId(FileEntity);
             trapFile.Write(',');
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Method.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Method.cs
index 6ba5cca01cf..c1b0f1a65bc 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Method.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Method.cs
@@ -48,7 +48,7 @@ namespace Semmle.Extraction.CSharp.Entities
 
         protected virtual void PopulateMethodBody(TextWriter trapFile)
         {
-            if (!IsSourceDeclaration)
+            if (!IsSourceDeclaration || Context.OnlyScaffold)
                 return;
 
             var block = Block;
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/NamespaceDeclaration.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/NamespaceDeclaration.cs
index 12684c304a4..3eaafdca23b 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/NamespaceDeclaration.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/NamespaceDeclaration.cs
@@ -35,7 +35,6 @@ namespace Semmle.Extraction.CSharp.Entities
 
             var ns = Namespace.Create(Context, @namespace);
             trapFile.namespace_declarations(this, ns);
-            trapFile.namespace_declaration_location(this, Context.CreateLocation(node.Name.GetLocation()));
 
             var visitor = new Populators.TypeOrNamespaceVisitor(Context, trapFile, this);
 
@@ -48,6 +47,12 @@ namespace Semmle.Extraction.CSharp.Entities
             {
                 trapFile.parent_namespace_declaration(this, parent);
             }
+
+            if (Context.OnlyScaffold)
+            {
+                return;
+            }
+            WriteLocationToTrap(trapFile.namespace_declaration_location, this, Context.CreateLocation(node.Name.GetLocation()));
         }
 
         public static NamespaceDeclaration Create(Context cx, BaseNamespaceDeclarationSyntax decl, NamespaceDeclaration parent)
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/OrdinaryMethod.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/OrdinaryMethod.cs
index bd3a637a624..22bcd1dce2c 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/OrdinaryMethod.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/OrdinaryMethod.cs
@@ -34,6 +34,16 @@ namespace Semmle.Extraction.CSharp.Entities
             var returnType = Type.Create(Context, Symbol.ReturnType);
             trapFile.methods(this, Name, ContainingType, returnType.TypeRef, OriginalDefinition);
 
+            PopulateGenerics(trapFile);
+            Overrides(trapFile);
+            ExtractRefReturn(trapFile, Symbol, this);
+            ExtractCompilerGenerated(trapFile);
+
+            if (Context.OnlyScaffold)
+            {
+                return;
+            }
+
             if (IsSourceDeclaration)
             {
                 foreach (var declaration in Symbol.DeclaringSyntaxReferences.Select(s => s.GetSyntax()).OfType<MethodDeclarationSyntax>())
@@ -43,13 +53,10 @@ namespace Semmle.Extraction.CSharp.Entities
                 }
             }
 
-            foreach (var l in Locations)
-                trapFile.method_location(this, l);
-
-            PopulateGenerics(trapFile);
-            Overrides(trapFile);
-            ExtractRefReturn(trapFile, Symbol, this);
-            ExtractCompilerGenerated(trapFile);
+            if (Context.ExtractLocation(Symbol))
+            {
+                WriteLocationsToTrap(trapFile.method_location, this, Locations);
+            }
         }
 
         private bool IsCompilerGeneratedDelegate() =>
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Parameter.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Parameter.cs
index 76d518776ca..49ef9a4a6e9 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Parameter.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Parameter.cs
@@ -115,15 +115,23 @@ namespace Semmle.Extraction.CSharp.Entities
             var type = Type.Create(Context, Symbol.Type);
             trapFile.@params(this, Name, type.TypeRef, Ordinal, ParamKind, Parent!, Original);
 
-            foreach (var l in Symbol.Locations)
-                trapFile.param_location(this, Context.CreateLocation(l));
+            if (Context.OnlyScaffold)
+            {
+                return;
+            }
+
+            if (Context.ExtractLocation(Symbol))
+            {
+                var locations = Context.GetLocations(Symbol);
+                WriteLocationsToTrap(trapFile.param_location, this, locations);
+            }
 
             if (!Symbol.Locations.Any() &&
                 Symbol.ContainingSymbol is IMethodSymbol ms &&
                 ms.Name == WellKnownMemberNames.TopLevelStatementsEntryPointMethodName &&
                 ms.ContainingType.Name == WellKnownMemberNames.TopLevelStatementsEntryPointTypeName)
             {
-                trapFile.param_location(this, Context.CreateLocation());
+                WriteLocationToTrap(trapFile.param_location, this, Context.CreateLocation());
             }
 
             if (Symbol.HasExplicitDefaultValue && Context.Defines(Symbol))
@@ -247,7 +255,6 @@ namespace Semmle.Extraction.CSharp.Entities
             var typeKey = VarargsType.Create(Context);
             // !! Maybe originaldefinition is wrong
             trapFile.@params(this, "", typeKey, Ordinal, Kind.None, Parent!, this);
-            trapFile.param_location(this, GeneratedLocation.Create(Context));
         }
 
         protected override int Ordinal => ((Method)Parent!).OriginalDefinition.Symbol.Parameters.Length;
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/PreprocessorDirectives/PreprocessorDirective.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/PreprocessorDirectives/PreprocessorDirective.cs
index da39613e124..4b0da499b80 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/PreprocessorDirectives/PreprocessorDirective.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/PreprocessorDirectives/PreprocessorDirective.cs
@@ -13,10 +13,15 @@ namespace Semmle.Extraction.CSharp.Entities
             PopulatePreprocessor(trapFile);
 
             trapFile.preprocessor_directive_active(this, Symbol.IsActive);
-            trapFile.preprocessor_directive_location(this, Context.CreateLocation(ReportingLocation));
 
             var compilation = Compilation.Create(Context);
             trapFile.preprocessor_directive_compilation(this, compilation);
+
+            if (Context.OnlyScaffold)
+            {
+                return;
+            }
+            WriteLocationToTrap(trapFile.preprocessor_directive_location, this, Context.CreateLocation(ReportingLocation));
         }
 
         protected abstract void PopulatePreprocessor(TextWriter trapFile);
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Property.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Property.cs
index f8845a667cc..d48d778cb75 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Property.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Property.cs
@@ -40,7 +40,6 @@ namespace Semmle.Extraction.CSharp.Entities
         {
             PopulateAttributes();
             PopulateModifiers(trapFile);
-            BindComments();
             PopulateNullability(trapFile, Symbol.GetAnnotatedType());
             PopulateRefKind(trapFile, Symbol.RefKind);
 
@@ -69,8 +68,17 @@ namespace Semmle.Extraction.CSharp.Entities
                     TypeMention.Create(Context, syntax.ExplicitInterfaceSpecifier!.Name, this, explicitInterface);
             }
 
-            foreach (var l in Locations)
-                trapFile.property_location(this, l);
+            if (Context.OnlyScaffold)
+            {
+                return;
+            }
+
+            BindComments();
+
+            if (Context.ExtractLocation(Symbol))
+            {
+                WriteLocationsToTrap(trapFile.property_location, this, Locations);
+            }
 
             if (IsSourceDeclaration && Symbol.FromSource())
             {
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/TypeMention.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/TypeMention.cs
index d41ba5dc195..aac4c5f5b3f 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/TypeMention.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/TypeMention.cs
@@ -59,6 +59,11 @@ namespace Semmle.Extraction.CSharp.Entities
 
         protected override void Populate(TextWriter trapFile)
         {
+            if (Context.OnlyScaffold)
+            {
+                return;
+            }
+
             switch (syntax.Kind())
             {
                 case SyntaxKind.ArrayType:
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/DynamicType.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/DynamicType.cs
index 5a840e3b9ef..b1413b206ae 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/DynamicType.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/DynamicType.cs
@@ -16,10 +16,14 @@ namespace Semmle.Extraction.CSharp.Entities
         public override void Populate(TextWriter trapFile)
         {
             trapFile.types(this, Kinds.TypeKind.DYNAMIC, "dynamic");
-            trapFile.type_location(this, Location);
 
             trapFile.has_modifiers(this, Modifier.Create(Context, "public"));
             trapFile.parent_namespace(this, Namespace.Create(Context, Context.Compilation.GlobalNamespace));
+            if (Context.OnlyScaffold)
+            {
+                return;
+            }
+            WriteLocationToTrap(trapFile.type_location, this, Location);
         }
 
         public override void WriteId(EscapingTextWriter trapFile)
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/NamedType.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/NamedType.cs
index 96c523d5bbd..dcf2bffe095 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/NamedType.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/NamedType.cs
@@ -81,10 +81,9 @@ namespace Semmle.Extraction.CSharp.Entities
             }
 
             // Class location
-            if (!Symbol.IsGenericType || Symbol.IsReallyUnbound())
+            if ((!Symbol.IsGenericType || Symbol.IsReallyUnbound()) && !Context.OnlyScaffold)
             {
-                foreach (var l in Locations)
-                    trapFile.type_location(this, l);
+                WriteLocationsToTrap(trapFile.type_location, this, Locations);
             }
 
             if (Symbol.IsAnonymousType)
@@ -112,15 +111,18 @@ namespace Semmle.Extraction.CSharp.Entities
             }
         }
 
-        private static IEnumerable<Microsoft.CodeAnalysis.Location> GetLocations(INamedTypeSymbol type)
+        private IEnumerable<Microsoft.CodeAnalysis.Location> GetLocations(INamedTypeSymbol type)
         {
-            return type.Locations
-                .Where(l => l.IsInMetadata)
-                .Concat(type.DeclaringSyntaxReferences
+            var metadataLocations = type.Locations
+                .Where(l => l.IsInMetadata);
+            var sourceLocations = type.DeclaringSyntaxReferences
                     .Select(loc => loc.GetSyntax())
                     .OfType<CSharpSyntaxNode>()
                     .Select(l => l.FixedLocation())
-                );
+                    .Where(Context.IsLocationInContext);
+
+            return metadataLocations
+                .Concat(sourceLocations);
         }
 
         public override Microsoft.CodeAnalysis.Location? ReportingLocation => GetLocations(Symbol).BestOrDefault();
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/TupleType.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/TupleType.cs
index d97e4b9dad5..f20be262e30 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/TupleType.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/TupleType.cs
@@ -51,11 +51,15 @@ namespace Semmle.Extraction.CSharp.Entities
                     trapFile.tuple_element(this, index++, element);
             }
 
+            if (Context.OnlyScaffold)
+            {
+                return;
+            }
             // Note: symbol.Locations seems to be very inconsistent
             // about what locations are available for a tuple type.
             // Sometimes it's the source code, and sometimes it's empty.
-            foreach (var l in Symbol.Locations)
-                trapFile.type_location(this, Context.CreateLocation(l));
+            var locations = Context.GetLocations(Symbol);
+            WriteLocationsToTrap(trapFile.type_location, this, locations);
         }
 
         private readonly Lazy<Field?[]> tupleElementsLazy;
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/Type.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/Type.cs
index 266fbfa5d60..3e79a8f8101 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/Type.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/Type.cs
@@ -222,7 +222,7 @@ namespace Semmle.Extraction.CSharp.Entities
 
         private IEnumerable<BaseTypeSyntax> GetBaseTypeDeclarations()
         {
-            if (!IsSourceDeclaration || !Symbol.FromSource())
+            if (!IsSourceDeclaration || !Symbol.FromSource() || Context.OnlyScaffold)
             {
                 return Enumerable.Empty<BaseTypeSyntax>();
             }
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/TypeParameter.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/TypeParameter.cs
index 25fda9eabe9..7d117dcd427 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/TypeParameter.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/TypeParameter.cs
@@ -26,9 +26,15 @@ namespace Semmle.Extraction.CSharp.Entities
             var parentNs = Namespace.Create(Context, Symbol.TypeParameterKind == TypeParameterKind.Method ? Context.Compilation.GlobalNamespace : Symbol.ContainingNamespace);
             trapFile.parent_namespace(this, parentNs);
 
-            foreach (var l in Symbol.Locations)
+            if (Context.OnlyScaffold)
             {
-                trapFile.type_location(this, Context.CreateLocation(l));
+                return;
+            }
+
+            if (Context.ExtractLocation(Symbol))
+            {
+                var locations = Context.GetLocations(Symbol);
+                WriteLocationsToTrap(trapFile.type_location, this, locations);
             }
 
             if (IsSourceDeclaration)
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/UserOperator.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/UserOperator.cs
index 141bded87ac..fc9358ffc2d 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/UserOperator.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/UserOperator.cs
@@ -26,8 +26,18 @@ namespace Semmle.Extraction.CSharp.Entities
                 returnType.TypeRef,
                 (UserOperator)OriginalDefinition);
 
-            foreach (var l in Locations)
-                trapFile.operator_location(this, l);
+            ContainingType.PopulateGenerics();
+            Overrides(trapFile);
+
+            if (Context.OnlyScaffold)
+            {
+                return;
+            }
+
+            if (Context.ExtractLocation(Symbol))
+            {
+                WriteLocationsToTrap(trapFile.operator_location, this, Locations);
+            }
 
             if (IsSourceDeclaration)
             {
@@ -37,9 +47,6 @@ namespace Semmle.Extraction.CSharp.Entities
                 foreach (var declaration in declSyntaxReferences.OfType<ConversionOperatorDeclarationSyntax>())
                     TypeMention.Create(Context, declaration.Type, this, returnType);
             }
-
-            ContainingType.PopulateGenerics();
-            Overrides(trapFile);
         }
 
         public override bool NeedsPopulation => Context.Defines(Symbol) || IsImplicitOperator(out _);
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/UsingDirective.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/UsingDirective.cs
index 04fe80dbcde..f1de4a1d699 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/UsingDirective.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/UsingDirective.cs
@@ -20,6 +20,11 @@ namespace Semmle.Extraction.CSharp.Entities
 
         protected override void Populate(TextWriter trapFile)
         {
+            if (Context.OnlyScaffold)
+            {
+                return;
+            }
+
             // This is guaranteed to be non-null as we only deal with "using namespace" not "using X = Y"
             var name = node.Name!;
 
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Analyser.cs b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Analyser.cs
index 3ea99a0d772..1ba8827c9d2 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Analyser.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Analyser.cs
@@ -41,16 +41,20 @@ namespace Semmle.Extraction.CSharp
 
         public IPathCache PathCache { get; }
 
+        public IOverlayInfo OverlayInfo { get; }
+
         protected Analyser(
             IProgressMonitor pm,
             ILogger logger,
             PathTransformer pathTransformer,
             IPathCache pathCache,
+            IOverlayInfo overlayInfo,
             bool addAssemblyTrapPrefix)
         {
             Logger = logger;
             PathTransformer = pathTransformer;
             PathCache = pathCache;
+            OverlayInfo = overlayInfo;
             this.addAssemblyTrapPrefix = addAssemblyTrapPrefix;
             this.progressMonitor = pm;
 
@@ -158,7 +162,7 @@ namespace Semmle.Extraction.CSharp
 
                     if (compilation.GetAssemblyOrModuleSymbol(r) is IAssemblySymbol assembly)
                     {
-                        var cx = new Context(ExtractionContext, compilation, trapWriter, new AssemblyScope(assembly, assemblyPath), addAssemblyTrapPrefix);
+                        var cx = new Context(ExtractionContext, compilation, trapWriter, new AssemblyScope(assembly, assemblyPath), OverlayInfo, addAssemblyTrapPrefix);
 
                         foreach (var module in assembly.Modules)
                         {
@@ -195,7 +199,7 @@ namespace Semmle.Extraction.CSharp
                 var currentTaskId = IncrementTaskCount();
                 ReportProgressTaskStarted(currentTaskId, sourcePath);
 
-                var cx = new Context(ExtractionContext, compilation, trapWriter, new SourceScope(tree), addAssemblyTrapPrefix);
+                var cx = new Context(ExtractionContext, compilation, trapWriter, new SourceScope(tree), OverlayInfo, addAssemblyTrapPrefix);
                 // Ensure that the file itself is populated in case the source file is totally empty
                 var root = tree.GetRoot();
                 Entities.File.Create(cx, root.SyntaxTree.FilePath);
@@ -234,10 +238,13 @@ namespace Semmle.Extraction.CSharp
                 var assembly = compilation.Assembly;
                 var trapWriter = transformedAssemblyPath.CreateTrapWriter(Logger, options.TrapCompression, discardDuplicates: false);
                 compilationTrapFile = trapWriter;  // Dispose later
-                var cx = new Context(ExtractionContext, compilation, trapWriter, new AssemblyScope(assembly, assemblyPath), addAssemblyTrapPrefix);
+                var cx = new Context(ExtractionContext, compilation, trapWriter, new AssemblyScope(assembly, assemblyPath), OverlayInfo, addAssemblyTrapPrefix);
 
                 compilationEntity = Entities.Compilation.Create(cx);
 
+                // Ensure that the empty location is always created.
+                Entities.EmptyLocation.Create(cx);
+
                 ExtractionContext.CompilationInfos.ForEach(ci => trapWriter.Writer.compilation_info(compilationEntity, ci.key, ci.value));
 
                 ReportProgressTaskDone(currentTaskId, assemblyPath, trapWriter.TrapFile, stopwatch.Elapsed, AnalysisAction.Extracted);
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/BinaryLogAnalyser.cs b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/BinaryLogAnalyser.cs
index 6026778f2f7..7e457e24837 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/BinaryLogAnalyser.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/BinaryLogAnalyser.cs
@@ -8,7 +8,7 @@ namespace Semmle.Extraction.CSharp
     public class BinaryLogAnalyser : Analyser
     {
         public BinaryLogAnalyser(IProgressMonitor pm, ILogger logger, PathTransformer pathTransformer, IPathCache pathCache, bool addAssemblyTrapPrefix)
-            : base(pm, logger, pathTransformer, pathCache, addAssemblyTrapPrefix)
+            : base(pm, logger, pathTransformer, pathCache, new TrivialOverlayInfo(), addAssemblyTrapPrefix)
         {
         }
 
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/CompilerVersion.cs b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/CompilerVersion.cs
index e52c79a17e1..5429f2bba07 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/CompilerVersion.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/CompilerVersion.cs
@@ -74,7 +74,9 @@ namespace Semmle.Extraction.CSharp
                     specifiedFramework = compilerDir;
                 }
 
-                var versionInfo = FileVersionInfo.GetVersionInfo(SpecifiedCompiler);
+                // If csc is specified as compiler name, then attempt to read the version information from csc.dll
+                var compilerBinaryName = Path.GetFileName(SpecifiedCompiler) == "csc" ? $"{SpecifiedCompiler}.dll" : SpecifiedCompiler;
+                var versionInfo = FileVersionInfo.GetVersionInfo(File.Exists(compilerBinaryName) ? compilerBinaryName : SpecifiedCompiler);
                 if (!knownCompilerNames.TryGetValue(versionInfo.OriginalFilename ?? string.Empty, out var vendor))
                 {
                     SkipExtractionBecause("the compiler name is not recognised");
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Context.cs b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Context.cs
index f231c8238a9..c3752165204 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Context.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Context.cs
@@ -29,6 +29,12 @@ namespace Semmle.Extraction.CSharp
         /// </summary>
         public bool ShouldAddAssemblyTrapPrefix { get; }
 
+        /// <summary>
+        /// Holds if trap only should be created for types and member signatures (and not for expressions and statements).
+        /// This is the case for all unchanged files, when running in overlay mode.
+        /// </summary>
+        public bool OnlyScaffold { get; }
+
         public IList<object> TrapStackSuffix { get; } = new List<object>();
 
         private int GetNewId() => TrapWriter.IdCounter++;
@@ -523,13 +529,16 @@ namespace Semmle.Extraction.CSharp
 
         internal CommentProcessor CommentGenerator { get; } = new CommentProcessor();
 
-        public Context(ExtractionContext extractionContext, Compilation c, TrapWriter trapWriter, IExtractionScope scope, bool shouldAddAssemblyTrapPrefix = false)
+        public Context(ExtractionContext extractionContext, Compilation c, TrapWriter trapWriter, IExtractionScope scope, IOverlayInfo overlayInfo, bool shouldAddAssemblyTrapPrefix = false)
         {
             ExtractionContext = extractionContext;
             TrapWriter = trapWriter;
             ShouldAddAssemblyTrapPrefix = shouldAddAssemblyTrapPrefix;
             Compilation = c;
             this.scope = scope;
+            OnlyScaffold = overlayInfo.IsOverlayMode && (
+                IsAssemblyScope
+                || (scope is SourceScope ss && overlayInfo.OnlyMakeScaffold(ss.SourceTree.FilePath)));
         }
 
         public bool FromSource => scope is SourceScope;
@@ -550,6 +559,26 @@ namespace Semmle.Extraction.CSharp
             !SymbolEqualityComparer.Default.Equals(symbol, symbol.OriginalDefinition) ||
             scope.InScope(symbol);
 
+        public bool ExtractLocation(ISymbol symbol) =>
+            SymbolEqualityComparer.Default.Equals(symbol, symbol.OriginalDefinition) &&
+            scope.InScope(symbol) &&
+            !OnlyScaffold;
+
+        /// <summary>
+        /// Gets the locations of the symbol that are either
+        /// (1) In assemblies.
+        /// (2) In the current context.
+        /// </summary>
+        /// <param name="symbol">The symbol</param>
+        /// <returns>List of locations</returns>
+        public IEnumerable<Entities.Location> GetLocations(ISymbol symbol) =>
+            symbol.Locations
+                .Where(l => !l.IsInSource || IsLocationInContext(l))
+                .Select(CreateLocation);
+
+        public bool IsLocationInContext(Location location) =>
+            location.SourceTree == SourceTree;
+
         /// <summary>
         /// Runs the given action <paramref name="a"/>, guarding for trap duplication
         /// based on key <paramref name="key"/>.
@@ -582,14 +611,14 @@ namespace Semmle.Extraction.CSharp
         public Entities.Location CreateLocation()
         {
             return SourceTree is null
-                ? Entities.GeneratedLocation.Create(this)
+                ? Entities.EmptyLocation.Create(this)
                 : CreateLocation(Microsoft.CodeAnalysis.Location.Create(SourceTree, Microsoft.CodeAnalysis.Text.TextSpan.FromBounds(0, 0)));
         }
 
         public Entities.Location CreateLocation(Microsoft.CodeAnalysis.Location? location)
         {
             return (location is null || location.Kind == LocationKind.None)
-                ? Entities.GeneratedLocation.Create(this)
+                ? Entities.EmptyLocation.Create(this)
                 : location.IsInSource
                     ? Entities.NonGeneratedSourceLocation.Create(this, location)
                     : Entities.Assembly.Create(this, location);
@@ -602,6 +631,10 @@ namespace Semmle.Extraction.CSharp
         /// <param name="l">Location of the entity.</param>
         public void BindComments(Entity entity, Microsoft.CodeAnalysis.Location? l)
         {
+            if (OnlyScaffold)
+            {
+                return;
+            }
             var duplicationGuardKey = GetCurrentTagStackKey();
             CommentGenerator.AddElement(entity.Label, duplicationGuardKey, l);
         }
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Extractor.cs b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Extractor.cs
index 3c01893dd89..69aa7c47909 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Extractor.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Extractor.cs
@@ -182,7 +182,7 @@ namespace Semmle.Extraction.CSharp
                     var compilerCall = compilationData.CompilerCall;
                     var diagnosticName = compilerCall.GetDiagnosticName();
                     logger.LogInfo($"  Processing compilation {diagnosticName} at {compilerCall.ProjectDirectory}");
-                    var compilerArgs = compilerCall.GetArguments();
+                    var compilerArgs = reader.ReadArguments(compilerCall);
 
                     var compilationIdentifierPath = string.Empty;
                     try
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/OverlayInfo.cs b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/OverlayInfo.cs
new file mode 100644
index 00000000000..9ff5d88b439
--- /dev/null
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/OverlayInfo.cs
@@ -0,0 +1,124 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text.Json;
+using Semmle.Util;
+using Semmle.Util.Logging;
+
+namespace Semmle.Extraction.CSharp
+{
+    public interface IOverlayInfo
+    {
+        /// <summary>
+        /// True, if the extractor is running in overlay mode.
+        /// </summary>
+        bool IsOverlayMode { get; }
+
+        /// <summary>
+        /// Returns true, if the given file is not in the set of changed files.
+        /// </summary>
+        /// <param name="filePath">A source file path</param>
+        bool OnlyMakeScaffold(string filePath);
+    }
+
+
+    /// <summary>
+    /// An instance of this class is used when overlay is not enabled.
+    /// </summary>
+    public class TrivialOverlayInfo : IOverlayInfo
+    {
+        public TrivialOverlayInfo() { }
+
+        public bool IsOverlayMode { get; } = false;
+
+        public bool OnlyMakeScaffold(string filePath) => false;
+    }
+
+    /// <summary>
+    /// An instance of this class is used for detecting
+    /// (1) Whether overlay is enabled.
+    /// (2) Fetch the changed files that should be fully extracted as a part
+    /// of the overlay extraction.
+    /// </summary>
+    public class OverlayInfo : IOverlayInfo
+    {
+        private readonly ILogger logger;
+        private readonly HashSet<string> changedFiles;
+        private readonly string srcDir;
+
+        public OverlayInfo(ILogger logger, string srcDir, string json)
+        {
+            this.logger = logger;
+            this.srcDir = srcDir;
+            changedFiles = ParseJson(json);
+        }
+
+        public bool IsOverlayMode { get; } = true;
+
+        public bool OnlyMakeScaffold(string filePath) => !changedFiles.Contains(filePath);
+
+        /// <summary>
+        /// Private type only used to parse overlay changes JSON files.
+        /// 
+        /// The content of such a file has the format
+        /// {
+        ///  "changes": [
+        ///    "app/controllers/about_controller.xyz",
+        ///    "app/models/about.xyz"
+        ///  ]
+        /// }
+        /// </summary>
+        private record ChangedFiles
+        {
+            public string[]? Changes { get; set; }
+        }
+
+        private HashSet<string> ParseJson(string json)
+        {
+            try
+            {
+                var options = new JsonSerializerOptions { PropertyNameCaseInsensitive = true };
+                var obj = JsonSerializer.Deserialize<ChangedFiles>(json, options);
+                return obj?.Changes is string[] changes
+                    ? changes.Select(change => Path.Join(srcDir, change)).ToHashSet()
+                    : [];
+            }
+            catch (JsonException)
+            {
+                logger.LogError("Overlay: Unable to parse the JSON content from the overlay changes file.");
+                return [];
+            }
+        }
+    }
+
+    public static class OverlayInfoFactory
+    {
+        /// <summary>
+        /// The returned object is used to decide, whether
+        /// (1) The extractor is running in overlay mode.
+        /// (2) Which files to only extract scaffolds for (unchanged files)
+        /// </summary>
+        /// <param name="logger">A logger</param>
+        /// <param name="srcDir">The (overlay) source directory</param>
+        /// <returns>An overlay information object.</returns>
+        public static IOverlayInfo Make(ILogger logger, string srcDir)
+        {
+            if (EnvironmentVariables.GetOverlayChangesFilePath() is string path)
+            {
+                logger.LogInfo($"Overlay: Reading overlay changes from file '{path}'.");
+                try
+                {
+                    var json = File.ReadAllText(path);
+                    return new OverlayInfo(logger, srcDir, json);
+                }
+                catch
+                {
+                    logger.LogError("Overlay: Unexpected error while reading the overlay changes file.");
+                }
+            }
+
+            logger.LogInfo("Overlay: Overlay mode not enabled.");
+            return new TrivialOverlayInfo();
+        }
+    }
+}
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/StandaloneAnalyser.cs b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/StandaloneAnalyser.cs
index 3ce315b372f..ff3c2889bc9 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/StandaloneAnalyser.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/StandaloneAnalyser.cs
@@ -8,8 +8,8 @@ namespace Semmle.Extraction.CSharp
 {
     public class StandaloneAnalyser : Analyser
     {
-        public StandaloneAnalyser(IProgressMonitor pm, ILogger logger, PathTransformer pathTransformer, IPathCache pathCache, bool addAssemblyTrapPrefix)
-            : base(pm, logger, pathTransformer, pathCache, addAssemblyTrapPrefix)
+        public StandaloneAnalyser(IProgressMonitor pm, ILogger logger, PathTransformer pathTransformer, IPathCache pathCache, IOverlayInfo overlayInfo, bool addAssemblyTrapPrefix)
+            : base(pm, logger, pathTransformer, pathCache, overlayInfo, addAssemblyTrapPrefix)
         {
         }
 
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/TracingAnalyser.cs b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/TracingAnalyser.cs
index 1139d7cdd9a..8a9856f1d31 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/TracingAnalyser.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/TracingAnalyser.cs
@@ -14,7 +14,7 @@ namespace Semmle.Extraction.CSharp
         private bool init;
 
         public TracingAnalyser(IProgressMonitor pm, ILogger logger, PathTransformer pathTransformer, IPathCache pathCache, bool addAssemblyTrapPrefix)
-            : base(pm, logger, pathTransformer, pathCache, addAssemblyTrapPrefix)
+            : base(pm, logger, pathTransformer, pathCache, new TrivialOverlayInfo(), addAssemblyTrapPrefix)
         {
         }
 
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Populators/CommentPopulator.cs b/csharp/extractor/Semmle.Extraction.CSharp/Populators/CommentPopulator.cs
index 24e23ff4abf..5f7b16bba43 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Populators/CommentPopulator.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Populators/CommentPopulator.cs
@@ -12,6 +12,10 @@ namespace Semmle.Extraction.CSharp.Populators
     {
         public static void ExtractCommentBlocks(Context cx, CommentProcessor gen)
         {
+            if (cx.OnlyScaffold)
+            {
+                return;
+            }
             cx.Try(null, null, () =>
             {
                 gen.GenerateBindings((entity, duplicationGuardKey, block, binding) =>
@@ -34,6 +38,10 @@ namespace Semmle.Extraction.CSharp.Populators
 
         public static void ExtractComment(Context cx, SyntaxTrivia trivia)
         {
+            if (cx.OnlyScaffold)
+            {
+                return;
+            }
             switch (trivia.Kind())
             {
                 case SyntaxKind.SingleLineDocumentationCommentTrivia:
diff --git a/csharp/extractor/Semmle.Extraction.Tests/OverlayInfo.cs b/csharp/extractor/Semmle.Extraction.Tests/OverlayInfo.cs
new file mode 100644
index 00000000000..6fde82541c1
--- /dev/null
+++ b/csharp/extractor/Semmle.Extraction.Tests/OverlayInfo.cs
@@ -0,0 +1,31 @@
+using Xunit;
+using Semmle.Extraction.CSharp;
+using System.IO;
+
+namespace Semmle.Extraction.Tests
+{
+    public class OverlayTests
+    {
+        [Fact]
+        public void TestOverlay()
+        {
+            var logger = new LoggerStub();
+            var json =
+                """
+                {
+                    "changes": [
+                        "app/controllers/about_controller.xyz",
+                        "app/models/about.xyz"
+                    ]
+                }
+                """;
+
+            var overlay = new OverlayInfo(logger, "overlay/source/path", json);
+
+            Assert.True(overlay.IsOverlayMode);
+            Assert.False(overlay.OnlyMakeScaffold("overlay/source/path" + Path.DirectorySeparatorChar + "app/controllers/about_controller.xyz"));
+            Assert.False(overlay.OnlyMakeScaffold("overlay/source/path" + Path.DirectorySeparatorChar + "app/models/about.xyz"));
+            Assert.True(overlay.OnlyMakeScaffold("overlay/source/path" + Path.DirectorySeparatorChar + "app/models/unchanged.xyz"));
+        }
+    }
+}
diff --git a/csharp/extractor/Semmle.Util/EnvironmentVariables.cs b/csharp/extractor/Semmle.Util/EnvironmentVariables.cs
index 1b0e40790ff..edce64a53fe 100644
--- a/csharp/extractor/Semmle.Util/EnvironmentVariables.cs
+++ b/csharp/extractor/Semmle.Util/EnvironmentVariables.cs
@@ -53,5 +53,28 @@ namespace Semmle.Util
         {
             return Environment.GetEnvironmentVariable(name)?.Split(" ", StringSplitOptions.RemoveEmptyEntries) ?? [];
         }
+
+        /// <summary>
+        /// Used to
+        /// (1) Detect whether the extractor should run in overlay mode.
+        /// (2) Returns the path to the file containing a list of changed files
+        /// in JSON format.
+        ///
+        /// The environment variable is only set in case the extraction is supposed to be
+        /// performed in overlay mode. Furthermore, this only applies to buildless extraction.
+        /// </summary>
+        public static string? GetOverlayChangesFilePath()
+        {
+            return Environment.GetEnvironmentVariable("CODEQL_EXTRACTOR_CSHARP_OVERLAY_CHANGES");
+        }
+
+        /// <summary>
+        /// If the environment variable is set, the extractor is being called to extract a base database.
+        /// Its value will be a path, and the extractor must create either a file or directory at that location.
+        /// </summary>
+        public static string? GetBaseMetaDataOutPath()
+        {
+            return Environment.GetEnvironmentVariable("CODEQL_EXTRACTOR_CSHARP_OVERLAY_BASE_METADATA_OUT");
+        }
     }
 }
diff --git a/csharp/paket.dependencies b/csharp/paket.dependencies
index 9413de7b1fe..cd2ac36422b 100644
--- a/csharp/paket.dependencies
+++ b/csharp/paket.dependencies
@@ -4,16 +4,16 @@ source https://api.nuget.org/v3/index.json
 # behave like nuget in choosing transitive dependency versions
 strategy: max
 
-nuget Basic.CompilerLog.Util 0.9.8
+nuget Basic.CompilerLog.Util 0.9.21
 nuget Mono.Posix.NETStandard
 nuget Newtonsoft.Json
 nuget xunit
 nuget xunit.runner.visualstudio
 nuget xunit.runner.utility
 nuget Microsoft.NET.Test.Sdk
-nuget Microsoft.CodeAnalysis.CSharp 4.12.0
-nuget Microsoft.CodeAnalysis 4.12.0
-nuget Microsoft.Build 17.12.6
+nuget Microsoft.CodeAnalysis.CSharp 4.14.0
+nuget Microsoft.CodeAnalysis 4.14.0
+nuget Microsoft.Build 17.14.28
 nuget Microsoft.Win32.Primitives
 nuget System.Net.Primitives
 nuget System.Security.Principal
diff --git a/csharp/paket.lock b/csharp/paket.lock
index 8120aadb5bd..d503e19d87d 100644
--- a/csharp/paket.lock
+++ b/csharp/paket.lock
@@ -3,143 +3,148 @@ STRATEGY: MAX
 RESTRICTION: == net9.0
 NUGET
   remote: https://api.nuget.org/v3/index.json
-    Basic.CompilerLog.Util (0.9.8)
-      MessagePack (>= 2.5.187)
-      Microsoft.CodeAnalysis (>= 4.12)
-      Microsoft.CodeAnalysis.CSharp (>= 4.12)
-      Microsoft.CodeAnalysis.VisualBasic (>= 4.12)
-      Microsoft.Extensions.ObjectPool (>= 9.0.2)
-      MSBuild.StructuredLogger (>= 2.2.243)
-      System.Buffers (>= 4.6)
+    Basic.CompilerLog.Util (0.9.21)
+      MessagePack (>= 3.1.4)
+      Microsoft.Bcl.Memory (>= 9.0.10)
+      Microsoft.CodeAnalysis (>= 4.8)
+      Microsoft.CodeAnalysis.CSharp (>= 4.8)
+      Microsoft.CodeAnalysis.VisualBasic (>= 4.8)
+      Microsoft.Extensions.ObjectPool (>= 9.0.10)
+      MSBuild.StructuredLogger (>= 2.3.71)
+      NaturalSort.Extension (>= 4.4)
     Humanizer.Core (2.14.1)
-    MessagePack (3.0.300)
-      MessagePack.Annotations (>= 3.0.300)
-      MessagePackAnalyzer (>= 3.0.300)
+    MessagePack (3.1.4)
+      MessagePack.Annotations (>= 3.1.4)
+      MessagePackAnalyzer (>= 3.1.4)
       Microsoft.NET.StringTools (>= 17.11.4)
-    MessagePack.Annotations (3.0.300)
-    MessagePackAnalyzer (3.0.300)
-    Microsoft.Bcl.AsyncInterfaces (9.0)
-    Microsoft.Build (17.12.6)
-      Microsoft.Build.Framework (>= 17.12.6)
-      Microsoft.NET.StringTools (>= 17.12.6)
-      System.Collections.Immutable (>= 8.0)
-      System.Configuration.ConfigurationManager (>= 8.0)
-      System.Reflection.Metadata (>= 8.0)
-      System.Reflection.MetadataLoadContext (>= 8.0)
-    Microsoft.Build.Framework (17.12.6)
-    Microsoft.Build.Utilities.Core (17.12.6)
-      Microsoft.Build.Framework (>= 17.12.6)
-      Microsoft.NET.StringTools (>= 17.12.6)
-      System.Collections.Immutable (>= 8.0)
-      System.Configuration.ConfigurationManager (>= 8.0)
-    Microsoft.CodeAnalysis (4.12)
+    MessagePack.Annotations (3.1.4)
+    MessagePackAnalyzer (3.1.4)
+    Microsoft.Bcl.AsyncInterfaces (9.0.10)
+    Microsoft.Bcl.Memory (9.0.10)
+    Microsoft.Build (17.14.28)
+      Microsoft.Build.Framework (>= 17.14.28)
+      Microsoft.NET.StringTools (>= 17.14.28)
+      System.Configuration.ConfigurationManager (>= 9.0)
+      System.Diagnostics.EventLog (>= 9.0)
+      System.Reflection.MetadataLoadContext (>= 9.0)
+      System.Security.Cryptography.ProtectedData (>= 9.0)
+    Microsoft.Build.Framework (17.14.28)
+    Microsoft.Build.Utilities.Core (17.14.28)
+      Microsoft.Build.Framework (>= 17.14.28)
+      Microsoft.NET.StringTools (>= 17.14.28)
+      System.Collections.Immutable (>= 9.0)
+      System.Configuration.ConfigurationManager (>= 9.0)
+      System.Diagnostics.EventLog (>= 9.0)
+      System.Security.Cryptography.ProtectedData (>= 9.0)
+    Microsoft.CodeAnalysis (4.14)
       Humanizer.Core (>= 2.14.1)
-      Microsoft.Bcl.AsyncInterfaces (>= 8.0)
-      Microsoft.CodeAnalysis.Analyzers (>= 3.3.4)
-      Microsoft.CodeAnalysis.CSharp.Workspaces (4.12)
-      Microsoft.CodeAnalysis.VisualBasic.Workspaces (4.12)
+      Microsoft.Bcl.AsyncInterfaces (>= 9.0)
+      Microsoft.CodeAnalysis.Analyzers (>= 3.11)
+      Microsoft.CodeAnalysis.CSharp.Workspaces (4.14)
+      Microsoft.CodeAnalysis.VisualBasic.Workspaces (4.14)
       System.Buffers (>= 4.5.1)
-      System.Collections.Immutable (>= 8.0)
-      System.Composition (>= 8.0)
-      System.IO.Pipelines (>= 8.0)
+      System.Collections.Immutable (>= 9.0)
+      System.Composition (>= 9.0)
+      System.IO.Pipelines (>= 9.0)
       System.Memory (>= 4.5.5)
       System.Numerics.Vectors (>= 4.5)
-      System.Reflection.Metadata (>= 8.0)
+      System.Reflection.Metadata (>= 9.0)
       System.Runtime.CompilerServices.Unsafe (>= 6.0)
       System.Text.Encoding.CodePages (>= 7.0)
       System.Threading.Channels (>= 7.0)
       System.Threading.Tasks.Extensions (>= 4.5.4)
     Microsoft.CodeAnalysis.Analyzers (3.11)
-    Microsoft.CodeAnalysis.Common (4.12)
-      Microsoft.CodeAnalysis.Analyzers (>= 3.3.4)
-      System.Collections.Immutable (>= 8.0)
-      System.Reflection.Metadata (>= 8.0)
-    Microsoft.CodeAnalysis.CSharp (4.12)
-      Microsoft.CodeAnalysis.Analyzers (>= 3.3.4)
-      Microsoft.CodeAnalysis.Common (4.12)
-      System.Collections.Immutable (>= 8.0)
-      System.Reflection.Metadata (>= 8.0)
-    Microsoft.CodeAnalysis.CSharp.Workspaces (4.12)
+    Microsoft.CodeAnalysis.Common (4.14)
+      Microsoft.CodeAnalysis.Analyzers (>= 3.11)
+      System.Collections.Immutable (>= 9.0)
+      System.Reflection.Metadata (>= 9.0)
+    Microsoft.CodeAnalysis.CSharp (4.14)
+      Microsoft.CodeAnalysis.Analyzers (>= 3.11)
+      Microsoft.CodeAnalysis.Common (4.14)
+      System.Collections.Immutable (>= 9.0)
+      System.Reflection.Metadata (>= 9.0)
+    Microsoft.CodeAnalysis.CSharp.Workspaces (4.14)
       Humanizer.Core (>= 2.14.1)
-      Microsoft.CodeAnalysis.Analyzers (>= 3.3.4)
-      Microsoft.CodeAnalysis.Common (4.12)
-      Microsoft.CodeAnalysis.CSharp (4.12)
-      Microsoft.CodeAnalysis.Workspaces.Common (4.12)
-      System.Collections.Immutable (>= 8.0)
-      System.Composition (>= 8.0)
-      System.IO.Pipelines (>= 8.0)
-      System.Reflection.Metadata (>= 8.0)
+      Microsoft.CodeAnalysis.Analyzers (>= 3.11)
+      Microsoft.CodeAnalysis.Common (4.14)
+      Microsoft.CodeAnalysis.CSharp (4.14)
+      Microsoft.CodeAnalysis.Workspaces.Common (4.14)
+      System.Collections.Immutable (>= 9.0)
+      System.Composition (>= 9.0)
+      System.IO.Pipelines (>= 9.0)
+      System.Reflection.Metadata (>= 9.0)
       System.Threading.Channels (>= 7.0)
-    Microsoft.CodeAnalysis.VisualBasic (4.12)
-      Microsoft.CodeAnalysis.Analyzers (>= 3.3.4)
-      Microsoft.CodeAnalysis.Common (4.12)
-      System.Collections.Immutable (>= 8.0)
-      System.Reflection.Metadata (>= 8.0)
-    Microsoft.CodeAnalysis.VisualBasic.Workspaces (4.12)
+    Microsoft.CodeAnalysis.VisualBasic (4.14)
+      Microsoft.CodeAnalysis.Analyzers (>= 3.11)
+      Microsoft.CodeAnalysis.Common (4.14)
+      System.Collections.Immutable (>= 9.0)
+      System.Reflection.Metadata (>= 9.0)
+    Microsoft.CodeAnalysis.VisualBasic.Workspaces (4.14)
       Humanizer.Core (>= 2.14.1)
-      Microsoft.CodeAnalysis.Analyzers (>= 3.3.4)
-      Microsoft.CodeAnalysis.Common (4.12)
-      Microsoft.CodeAnalysis.VisualBasic (4.12)
-      Microsoft.CodeAnalysis.Workspaces.Common (4.12)
-      System.Collections.Immutable (>= 8.0)
-      System.Composition (>= 8.0)
-      System.IO.Pipelines (>= 8.0)
-      System.Reflection.Metadata (>= 8.0)
+      Microsoft.CodeAnalysis.Analyzers (>= 3.11)
+      Microsoft.CodeAnalysis.Common (4.14)
+      Microsoft.CodeAnalysis.VisualBasic (4.14)
+      Microsoft.CodeAnalysis.Workspaces.Common (4.14)
+      System.Collections.Immutable (>= 9.0)
+      System.Composition (>= 9.0)
+      System.IO.Pipelines (>= 9.0)
+      System.Reflection.Metadata (>= 9.0)
       System.Threading.Channels (>= 7.0)
-    Microsoft.CodeAnalysis.Workspaces.Common (4.12)
+    Microsoft.CodeAnalysis.Workspaces.Common (4.14)
       Humanizer.Core (>= 2.14.1)
-      Microsoft.CodeAnalysis.Analyzers (>= 3.3.4)
-      Microsoft.CodeAnalysis.Common (4.12)
-      System.Collections.Immutable (>= 8.0)
-      System.Composition (>= 8.0)
-      System.IO.Pipelines (>= 8.0)
-      System.Reflection.Metadata (>= 8.0)
+      Microsoft.CodeAnalysis.Analyzers (>= 3.11)
+      Microsoft.CodeAnalysis.Common (4.14)
+      System.Collections.Immutable (>= 9.0)
+      System.Composition (>= 9.0)
+      System.IO.Pipelines (>= 9.0)
+      System.Reflection.Metadata (>= 9.0)
       System.Threading.Channels (>= 7.0)
-    Microsoft.CodeCoverage (17.12)
-    Microsoft.Extensions.ObjectPool (9.0.3)
-    Microsoft.NET.StringTools (17.12.6)
-    Microsoft.NET.Test.Sdk (17.12)
-      Microsoft.CodeCoverage (>= 17.12)
-      Microsoft.TestPlatform.TestHost (>= 17.12)
+    Microsoft.CodeCoverage (18.0)
+    Microsoft.Extensions.ObjectPool (9.0.10)
+    Microsoft.NET.StringTools (17.14.28)
+    Microsoft.NET.Test.Sdk (18.0)
+      Microsoft.CodeCoverage (>= 18.0)
+      Microsoft.TestPlatform.TestHost (>= 18.0)
     Microsoft.NETCore.Platforms (7.0.4)
     Microsoft.NETCore.Targets (5.0)
-    Microsoft.TestPlatform.ObjectModel (17.12)
-      System.Reflection.Metadata (>= 1.6)
-    Microsoft.TestPlatform.TestHost (17.12)
-      Microsoft.TestPlatform.ObjectModel (>= 17.12)
-      Newtonsoft.Json (>= 13.0.1)
+    Microsoft.TestPlatform.ObjectModel (18.0)
+      System.Reflection.Metadata (>= 8.0)
+    Microsoft.TestPlatform.TestHost (18.0)
+      Microsoft.TestPlatform.ObjectModel (>= 18.0)
+      Newtonsoft.Json (>= 13.0.3)
     Microsoft.Win32.Primitives (4.3)
       Microsoft.NETCore.Platforms (>= 1.1)
       Microsoft.NETCore.Targets (>= 1.1)
       System.Runtime (>= 4.3)
     Mono.Posix.NETStandard (1.0)
-    MSBuild.StructuredLogger (2.2.386)
+    MSBuild.StructuredLogger (2.3.71)
       Microsoft.Build.Framework (>= 17.5)
       Microsoft.Build.Utilities.Core (>= 17.5)
       System.Collections.Immutable (>= 8.0)
-    Newtonsoft.Json (13.0.3)
-    System.Buffers (4.6)
-    System.Collections.Immutable (9.0)
-    System.Composition (9.0)
-      System.Composition.AttributedModel (>= 9.0)
-      System.Composition.Convention (>= 9.0)
-      System.Composition.Hosting (>= 9.0)
-      System.Composition.Runtime (>= 9.0)
-      System.Composition.TypedParts (>= 9.0)
-    System.Composition.AttributedModel (9.0)
-    System.Composition.Convention (9.0)
-      System.Composition.AttributedModel (>= 9.0)
-    System.Composition.Hosting (9.0)
-      System.Composition.Runtime (>= 9.0)
-    System.Composition.Runtime (9.0)
-    System.Composition.TypedParts (9.0)
-      System.Composition.AttributedModel (>= 9.0)
-      System.Composition.Hosting (>= 9.0)
-      System.Composition.Runtime (>= 9.0)
-    System.Configuration.ConfigurationManager (9.0)
-      System.Diagnostics.EventLog (>= 9.0)
-      System.Security.Cryptography.ProtectedData (>= 9.0)
-    System.Diagnostics.EventLog (9.0)
+    NaturalSort.Extension (4.4)
+    Newtonsoft.Json (13.0.4)
+    System.Buffers (4.6.1)
+    System.Collections.Immutable (9.0.10)
+    System.Composition (9.0.10)
+      System.Composition.AttributedModel (>= 9.0.10)
+      System.Composition.Convention (>= 9.0.10)
+      System.Composition.Hosting (>= 9.0.10)
+      System.Composition.Runtime (>= 9.0.10)
+      System.Composition.TypedParts (>= 9.0.10)
+    System.Composition.AttributedModel (9.0.10)
+    System.Composition.Convention (9.0.10)
+      System.Composition.AttributedModel (>= 9.0.10)
+    System.Composition.Hosting (9.0.10)
+      System.Composition.Runtime (>= 9.0.10)
+    System.Composition.Runtime (9.0.10)
+    System.Composition.TypedParts (9.0.10)
+      System.Composition.AttributedModel (>= 9.0.10)
+      System.Composition.Hosting (>= 9.0.10)
+      System.Composition.Runtime (>= 9.0.10)
+    System.Configuration.ConfigurationManager (9.0.10)
+      System.Diagnostics.EventLog (>= 9.0.10)
+      System.Security.Cryptography.ProtectedData (>= 9.0.10)
+    System.Diagnostics.EventLog (9.0.10)
     System.IO (4.3)
       Microsoft.NETCore.Platforms (>= 1.1)
       Microsoft.NETCore.Targets (>= 1.1)
@@ -157,55 +162,55 @@ NUGET
       System.Threading.Tasks (>= 4.3)
     System.IO.FileSystem.Primitives (4.3)
       System.Runtime (>= 4.3)
-    System.IO.Pipelines (9.0)
-    System.Memory (4.6)
+    System.IO.Pipelines (9.0.10)
+    System.Memory (4.6.3)
     System.Net.Primitives (4.3.1)
       Microsoft.NETCore.Platforms (>= 1.1.1)
       Microsoft.NETCore.Targets (>= 1.1.3)
       System.Runtime (>= 4.3.1)
       System.Runtime.Handles (>= 4.3)
-    System.Numerics.Vectors (4.6)
-    System.Reflection.Metadata (9.0)
-    System.Reflection.MetadataLoadContext (9.0)
+    System.Numerics.Vectors (4.6.1)
+    System.Reflection.Metadata (9.0.10)
+    System.Reflection.MetadataLoadContext (9.0.10)
     System.Runtime (4.3.1)
       Microsoft.NETCore.Platforms (>= 1.1.1)
       Microsoft.NETCore.Targets (>= 1.1.3)
-    System.Runtime.CompilerServices.Unsafe (6.1)
+    System.Runtime.CompilerServices.Unsafe (6.1.2)
     System.Runtime.Handles (4.3)
       Microsoft.NETCore.Platforms (>= 1.1)
       Microsoft.NETCore.Targets (>= 1.1)
       System.Runtime (>= 4.3)
-    System.Security.Cryptography.ProtectedData (9.0)
+    System.Security.Cryptography.ProtectedData (9.0.10)
     System.Security.Principal (4.3)
       System.Runtime (>= 4.3)
     System.Text.Encoding (4.3)
       Microsoft.NETCore.Platforms (>= 1.1)
       Microsoft.NETCore.Targets (>= 1.1)
       System.Runtime (>= 4.3)
-    System.Text.Encoding.CodePages (9.0)
-    System.Threading.Channels (9.0)
+    System.Text.Encoding.CodePages (9.0.10)
+    System.Threading.Channels (9.0.10)
     System.Threading.Tasks (4.3)
       Microsoft.NETCore.Platforms (>= 1.1)
       Microsoft.NETCore.Targets (>= 1.1)
       System.Runtime (>= 4.3)
-    System.Threading.Tasks.Extensions (4.6)
+    System.Threading.Tasks.Extensions (4.6.3)
     System.Threading.ThreadPool (4.3)
       System.Runtime (>= 4.3)
       System.Runtime.Handles (>= 4.3)
-    xunit (2.9.2)
-      xunit.analyzers (>= 1.16)
-      xunit.assert (>= 2.9.2)
-      xunit.core (2.9.2)
+    xunit (2.9.3)
+      xunit.analyzers (>= 1.18)
+      xunit.assert (>= 2.9.3)
+      xunit.core (2.9.3)
     xunit.abstractions (2.0.3)
-    xunit.analyzers (1.17)
-    xunit.assert (2.9.2)
-    xunit.core (2.9.2)
-      xunit.extensibility.core (2.9.2)
-      xunit.extensibility.execution (2.9.2)
-    xunit.extensibility.core (2.9.2)
+    xunit.analyzers (1.24)
+    xunit.assert (2.9.3)
+    xunit.core (2.9.3)
+      xunit.extensibility.core (2.9.3)
+      xunit.extensibility.execution (2.9.3)
+    xunit.extensibility.core (2.9.3)
       xunit.abstractions (>= 2.0.3)
-    xunit.extensibility.execution (2.9.2)
-      xunit.extensibility.core (2.9.2)
-    xunit.runner.utility (2.9.2)
+    xunit.extensibility.execution (2.9.3)
+      xunit.extensibility.core (2.9.3)
+    xunit.runner.utility (2.9.3)
       xunit.abstractions (>= 2.0.3)
-    xunit.runner.visualstudio (2.8.2)
+    xunit.runner.visualstudio (3.1.5)
diff --git a/csharp/paket.main.bzl b/csharp/paket.main.bzl
index 90d568ba3a8..1ef6f63df8f 100644
--- a/csharp/paket.main.bzl
+++ b/csharp/paket.main.bzl
@@ -7,73 +7,75 @@ def main():
     nuget_repo(
         name = "paket.main",
         packages = [
-            {"name": "Basic.CompilerLog.Util", "id": "Basic.CompilerLog.Util", "version": "0.9.8", "sha512": "sha512-bBlxHTdPRrmaw4AqoNwtx3jyAP63RVp2kwCn+UegxrimDYVCmhdgCkFjzlAc2Bo1LbO7HrsFhfh6lFijugOX3A==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "net462": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "net47": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "net471": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "net472": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "net48": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "net5.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "net6.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "net7.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "net8.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "net9.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "netcoreapp2.1": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "netcoreapp2.2": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "netcoreapp3.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "netcoreapp3.1": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"], "netstandard2.1": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "System.Buffers"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "Basic.CompilerLog.Util", "id": "Basic.CompilerLog.Util", "version": "0.9.21", "sha512": "sha512-l+Qbzh3nVaLLwZYgv/v5zIEdprseLgxcprHBvbNBzOyer7m6XD/N5GJC+FPChnSP48kK1/p7Nj7mvQH8d5NOtA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "NaturalSort.Extension", "System.Buffers"], "net462": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "NaturalSort.Extension", "System.Buffers"], "net47": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "NaturalSort.Extension", "System.Buffers"], "net471": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "NaturalSort.Extension", "System.Buffers"], "net472": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "NaturalSort.Extension", "System.Buffers"], "net48": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "NaturalSort.Extension", "System.Buffers"], "net5.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "NaturalSort.Extension", "System.Buffers"], "net6.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "NaturalSort.Extension", "System.Buffers"], "net7.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "NaturalSort.Extension", "System.Buffers"], "net8.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "NaturalSort.Extension"], "net9.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "NaturalSort.Extension"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "NaturalSort.Extension", "System.Buffers"], "netcoreapp2.1": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "NaturalSort.Extension", "System.Buffers"], "netcoreapp2.2": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "NaturalSort.Extension", "System.Buffers"], "netcoreapp3.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "NaturalSort.Extension", "System.Buffers"], "netcoreapp3.1": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "NaturalSort.Extension", "System.Buffers"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "NaturalSort.Extension", "System.Buffers"], "netstandard2.1": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.Bcl.Memory", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool", "NaturalSort.Extension", "System.Buffers"]}, "targeting_pack_overrides": [], "framework_list": []},
             {"name": "Humanizer.Core", "id": "Humanizer.Core", "version": "2.14.1", "sha512": "sha512-yzqGU/HKNLZ9Uvr6kvSc3wYV/S5O/IvklIUW5WF7MuivGLY8wS5IZnLPkt7D1KW8Et2Enl0I3Lzg2vGWM24Xsw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "MessagePack", "id": "MessagePack", "version": "3.0.300", "sha512": "sha512-5Mdl6CrQcxVVLawvqebPLALFdIMgWOnEGxxFvXWjJ/8KGyyhbfKMusj34Wv1AwE+uE9VAb+McVxtR9HDZIUwuA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net462": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net47": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net471": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net472": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe", "System.Threading.Tasks.Extensions"], "net48": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe", "System.Threading.Tasks.Extensions"], "net5.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable"], "net6.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable"], "net7.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable"], "net8.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools"], "net9.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable"], "netcoreapp3.1": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "MessagePack.Annotations", "id": "MessagePack.Annotations", "version": "3.0.300", "sha512": "sha512-Jh9+7EsDtDSEciX8RfXHWxtRlC94wvCmmv+sFzGdzPF4fAp7OAGFktzViPBHMkCxrSh3hmM7jGUB7yMyUmzRCA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "MessagePackAnalyzer", "id": "MessagePackAnalyzer", "version": "3.0.300", "sha512": "sha512-Ad0UHGpotoXZYkBjJgO5Z1aTJz5YIsFGVrxc75OiHO/fNKSRKFiM1X2E1WTB5h7pk3uDzqXfh0M5fEEQVZ8FiQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "Microsoft.Bcl.AsyncInterfaces", "id": "Microsoft.Bcl.AsyncInterfaces", "version": "9.0.0", "sha512": "sha512-bYp2ksSR5uB6xqOa4NyD2gBOeFrc2n8FAWoh781MNMDcPjk1ysD7DNpv7r7sQOXfdFJT6F/syX7fN4lmUsn+RQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Threading.Tasks.Extensions"], "net462": ["System.Threading.Tasks.Extensions"], "net47": ["System.Threading.Tasks.Extensions"], "net471": ["System.Threading.Tasks.Extensions"], "net472": ["System.Threading.Tasks.Extensions"], "net48": ["System.Threading.Tasks.Extensions"], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Threading.Tasks.Extensions"], "netcoreapp2.1": ["System.Threading.Tasks.Extensions"], "netcoreapp2.2": ["System.Threading.Tasks.Extensions"], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Threading.Tasks.Extensions"], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "Microsoft.Build", "id": "Microsoft.Build", "version": "17.12.6", "sha512": "sha512-YEiL5xKowbwnr52YroALNHg8YurjLyFTlhv3USrswhubuxN2ldY1TmQpBKQ4K28UgWJV9BxTVXY9/CecMNDeOA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Memory", "System.Reflection.MetadataLoadContext", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe"], "net48": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Memory", "System.Reflection.MetadataLoadContext", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe"], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Configuration.ConfigurationManager", "System.Reflection.MetadataLoadContext", "System.Collections.Immutable", "System.Reflection.Metadata"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "Microsoft.Build.Framework", "id": "Microsoft.Build.Framework", "version": "17.12.6", "sha512": "sha512-UjfxnrQN9BPVtO0Kvv2FB5dpN2CX5snc7coq5vVQdbCV6kdSpI/r+GZTLvU/5BTT8y8bvIUqoocxRR674N6bWg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net462": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net47": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net471": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net472": ["System.Runtime.CompilerServices.Unsafe"], "net48": ["System.Runtime.CompilerServices.Unsafe"], "net5.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net6.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net7.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net8.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "Microsoft.Build.Utilities.Core", "id": "Microsoft.Build.Utilities.Core", "version": "17.12.6", "sha512": "sha512-YPtNsiLEPn3g3EcO+Kyr7fIdufg6wdzibzufclQYZjIDS80krFsYi2rTpeTmHtlCK0PhyLvxJAQZ3NecgJHTkg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Text.Encoding.CodePages", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net462": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Text.Encoding.CodePages", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net47": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Text.Encoding.CodePages", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net471": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Text.Encoding.CodePages", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net472": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net48": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net5.0": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Text.Encoding.CodePages", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net6.0": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Text.Encoding.CodePages", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net7.0": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Text.Encoding.CodePages", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net8.0": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Text.Encoding.CodePages", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net9.0": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Text.Encoding.CodePages", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Text.Encoding.CodePages", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Text.Encoding.CodePages", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Text.Encoding.CodePages", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.1": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Text.Encoding.CodePages", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Text.Encoding.CodePages", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Text.Encoding.CodePages", "System.Memory", "System.Runtime.CompilerServices.Unsafe"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "Microsoft.CodeAnalysis", "id": "Microsoft.CodeAnalysis", "version": "4.12.0", "sha512": "sha512-saGSG86irNb5MX0/7j0Lx2T0jSGQuqa6QlohBHBcTzObPyMunQZIuIWVXlEiKwcrcEQm4rtUg/5FW43s0dqH7Q==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net462": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net47": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net471": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net472": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net48": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net5.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net6.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net7.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net8.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net9.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp2.1": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp2.2": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp3.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp3.1": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netstandard2.1": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "MessagePack", "id": "MessagePack", "version": "3.1.4", "sha512": "sha512-O0JoklM97ru+Rqr1hGnlCbSAxi8MOk48pwoaT458RzboCHuAkQWTh+Of9MUoN3LE0Cb2tapku0FRPt2hnk+o0g==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net462": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net47": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net471": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net472": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe", "System.Threading.Tasks.Extensions"], "net48": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe", "System.Threading.Tasks.Extensions"], "net5.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable"], "net6.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable"], "net7.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable"], "net8.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools"], "net9.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable"], "netcoreapp3.1": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Threading.Tasks.Extensions", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["MessagePackAnalyzer", "MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "MessagePack.Annotations", "id": "MessagePack.Annotations", "version": "3.1.4", "sha512": "sha512-kIgD3A0OHs8+VUabMhIJT9ZF4oGHqjCocaRDmERI/Ds2hzJ5q3kcvzn5zI7V3CJ2NlQ4HDI80uh6zCqglwgQCQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "MessagePackAnalyzer", "id": "MessagePackAnalyzer", "version": "3.1.4", "sha512": "sha512-DFlhiA5fia4iK6i0S+L7sYMYmo5XRgWydKxiaxwz7tfcbvIhU7nmG4JzN1D9Y2XCEmLNExvNwTzXVEgURu4GnA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "Microsoft.Bcl.AsyncInterfaces", "id": "Microsoft.Bcl.AsyncInterfaces", "version": "9.0.10", "sha512": "sha512-Di823U3L+0A2YQGU1HqJC7Gh8o/nuSXle5u6QDgho9s920QbVk6BS5fKJ0s+pzW+WbqM9+aPUQ2DJsfP6tLdKg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Threading.Tasks.Extensions"], "net462": ["System.Threading.Tasks.Extensions"], "net47": ["System.Threading.Tasks.Extensions"], "net471": ["System.Threading.Tasks.Extensions"], "net472": ["System.Threading.Tasks.Extensions"], "net48": ["System.Threading.Tasks.Extensions"], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Threading.Tasks.Extensions"], "netcoreapp2.1": ["System.Threading.Tasks.Extensions"], "netcoreapp2.2": ["System.Threading.Tasks.Extensions"], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Threading.Tasks.Extensions"], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "Microsoft.Bcl.Memory", "id": "Microsoft.Bcl.Memory", "version": "9.0.10", "sha512": "sha512-BZV+TVnrDf9O+Ak5gN47uOkECCtpiVq6MpEYX5lQcG1WFD6/Bnx5eyfueX9giDQPEk6azzhSPTGmJcWNXRBc+Q==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net462": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net47": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net471": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net472": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net48": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net5.0": ["System.Runtime.CompilerServices.Unsafe"], "net6.0": ["System.Runtime.CompilerServices.Unsafe"], "net7.0": ["System.Runtime.CompilerServices.Unsafe"], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.1": ["System.Runtime.CompilerServices.Unsafe"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["System.Runtime.CompilerServices.Unsafe"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "Microsoft.Build", "id": "Microsoft.Build", "version": "17.14.28", "sha512": "sha512-/J3DY36eYjSi/NYf/m4fS4HlxN8Zy+bCsopJUN0j4NNnrws4NR9ueWd0HKyhWEYYUa29Q1kjG1uKSGN1jBWg4g==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Memory", "System.Reflection.MetadataLoadContext", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Threading.Tasks.Extensions"], "net48": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Memory", "System.Reflection.MetadataLoadContext", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Threading.Tasks.Extensions"], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Configuration.ConfigurationManager", "System.Reflection.MetadataLoadContext", "System.Diagnostics.EventLog", "System.Security.Cryptography.ProtectedData"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "Microsoft.Build.Framework", "id": "Microsoft.Build.Framework", "version": "17.14.28", "sha512": "sha512-Gj4C8LNilfH6u6xu7QI/y0tkJCp3yQQpde/3qeK8E2FOfrZ4ENOoG/r2eKZws15bN6HPj09PhaJoqBhdbJdLpA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net462": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net47": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net471": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net472": ["System.Runtime.CompilerServices.Unsafe", "System.Memory", "System.Threading.Tasks.Extensions"], "net48": ["System.Runtime.CompilerServices.Unsafe", "System.Memory", "System.Threading.Tasks.Extensions"], "net5.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net6.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net7.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net8.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "Microsoft.Build.Utilities.Core", "id": "Microsoft.Build.Utilities.Core", "version": "17.14.28", "sha512": "sha512-A5uyO5HysGJRFR3IjjVKJ0Y69USn3E5Vlt/h51yID5Ynts4zHdh5ZELeU1gCoeF8i3tE21gO2u+QQLqQlb/iUg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Text.Encoding.CodePages", "System.Memory", "System.Runtime.CompilerServices.Unsafe", "System.Security.Cryptography.ProtectedData"], "net462": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Text.Encoding.CodePages", "System.Memory", "System.Runtime.CompilerServices.Unsafe", "System.Security.Cryptography.ProtectedData"], "net47": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Text.Encoding.CodePages", "System.Memory", "System.Runtime.CompilerServices.Unsafe", "System.Security.Cryptography.ProtectedData"], "net471": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Text.Encoding.CodePages", "System.Memory", "System.Runtime.CompilerServices.Unsafe", "System.Security.Cryptography.ProtectedData"], "net472": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Memory", "System.Runtime.CompilerServices.Unsafe", "System.Threading.Tasks.Extensions"], "net48": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Memory", "System.Runtime.CompilerServices.Unsafe", "System.Threading.Tasks.Extensions"], "net5.0": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Text.Encoding.CodePages", "System.Memory", "System.Runtime.CompilerServices.Unsafe", "System.Security.Cryptography.ProtectedData"], "net6.0": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Text.Encoding.CodePages", "System.Memory", "System.Runtime.CompilerServices.Unsafe", "System.Security.Cryptography.ProtectedData"], "net7.0": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Text.Encoding.CodePages", "System.Memory", "System.Runtime.CompilerServices.Unsafe", "System.Security.Cryptography.ProtectedData"], "net8.0": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Text.Encoding.CodePages", "System.Memory", "System.Runtime.CompilerServices.Unsafe", "System.Security.Cryptography.ProtectedData"], "net9.0": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Diagnostics.EventLog", "System.Security.Cryptography.ProtectedData"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Text.Encoding.CodePages", "System.Memory", "System.Runtime.CompilerServices.Unsafe", "System.Security.Cryptography.ProtectedData"], "netcoreapp2.1": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Text.Encoding.CodePages", "System.Memory", "System.Runtime.CompilerServices.Unsafe", "System.Security.Cryptography.ProtectedData"], "netcoreapp2.2": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Text.Encoding.CodePages", "System.Memory", "System.Runtime.CompilerServices.Unsafe", "System.Security.Cryptography.ProtectedData"], "netcoreapp3.0": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Text.Encoding.CodePages", "System.Memory", "System.Runtime.CompilerServices.Unsafe", "System.Security.Cryptography.ProtectedData"], "netcoreapp3.1": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Text.Encoding.CodePages", "System.Memory", "System.Runtime.CompilerServices.Unsafe", "System.Security.Cryptography.ProtectedData"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Text.Encoding.CodePages", "System.Memory", "System.Runtime.CompilerServices.Unsafe", "System.Security.Cryptography.ProtectedData"], "netstandard2.1": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Text.Encoding.CodePages", "System.Memory", "System.Runtime.CompilerServices.Unsafe", "System.Security.Cryptography.ProtectedData"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "Microsoft.CodeAnalysis", "id": "Microsoft.CodeAnalysis", "version": "4.14.0", "sha512": "sha512-eNBbL927Lc1Nh24ElWJmlGA928O9tu4mgWGOqmMFe6sskqQWCdnronCrrzwUdhBsBIjfx898MOCMOXuZQMtqOg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net462": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net47": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net471": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net472": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net48": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net5.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net6.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net7.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net8.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net9.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp2.1": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp2.2": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp3.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp3.1": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netstandard2.1": ["Microsoft.CodeAnalysis.CSharp.Workspaces", "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"]}, "targeting_pack_overrides": [], "framework_list": []},
             {"name": "Microsoft.CodeAnalysis.Analyzers", "id": "Microsoft.CodeAnalysis.Analyzers", "version": "3.11.0", "sha512": "sha512-tP9SLzLK72XCExlh8KXfrKbU6ycmZL3ExGl/a3Ml7LNy2Uaam7gFjjUmdzyTYkMXTyckCHHpzx7bD6BMumh8Bg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "Microsoft.CodeAnalysis.Common", "id": "Microsoft.CodeAnalysis.Common", "version": "4.12.0", "sha512": "sha512-83sYPF0SekVhecApCFXsLCsQL9qFzAl5ieCEqVb8Uo08nV34YD3cfq7FLv6EkhnAwPbP7ky19sAEEqYLDUrxWA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "net462": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "net47": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "net471": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "net472": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "net48": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "net5.0": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "net6.0": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "net7.0": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata"], "net8.0": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata"], "net9.0": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "netcoreapp2.1": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "netcoreapp2.2": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "netcoreapp3.0": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "netcoreapp3.1": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "netstandard2.1": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "Microsoft.CodeAnalysis.CSharp", "id": "Microsoft.CodeAnalysis.CSharp", "version": "4.12.0", "sha512": "sha512-Dbb/taxFill9/+2HRJufXW3udAtJaQw3+LzbWTDyYx7Z02HVdU5ydMXXTqg5lFgSmLDNBe+B8jRuI2eYw8OBOA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net462": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net47": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net471": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net472": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net48": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net5.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net6.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net7.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata"], "net8.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata"], "net9.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp2.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp2.2": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp3.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp3.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netstandard2.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "Microsoft.CodeAnalysis.CSharp.Workspaces", "id": "Microsoft.CodeAnalysis.CSharp.Workspaces", "version": "4.12.0", "sha512": "sha512-YwFqDAYHJrf02FyGU8nQnaWNryZXuDV0r8pVgWjRtxAFDWfaU5CZxvU/4NsS6GSnEsWp6W/e49QMHsDXTJW/KA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net462": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net47": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net471": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net472": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net48": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net5.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net6.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net7.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Reflection.Metadata", "System.Threading.Channels"], "net8.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Reflection.Metadata", "System.Threading.Channels"], "net9.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Reflection.Metadata", "System.Threading.Channels"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp2.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp2.2": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp3.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp3.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netstandard2.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "Microsoft.CodeAnalysis.VisualBasic", "id": "Microsoft.CodeAnalysis.VisualBasic", "version": "4.12.0", "sha512": "sha512-le1vRWFDjf9mYrVwhxw+rNZpRg/AvBi9aK+4zfn47qN2S7XPXtDwdz/dvxVg8bKJMfkwK1WPi2Bvlc7naPdaYg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net462": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net47": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net471": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net472": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net48": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net5.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net6.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net7.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata"], "net8.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata"], "net9.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp2.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp2.2": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp3.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp3.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netstandard2.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "id": "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "version": "4.12.0", "sha512": "sha512-j/XDFfNu38FSTJOIhkB8pvLWNVNqNhaZTRtLuH/WsHUsnYfIztaDW9seR7OsUBF5LuZIKQ9uaCrj7p+0/BgPkw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net462": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net47": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net471": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net472": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net48": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net5.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net6.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net7.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Reflection.Metadata", "System.Threading.Channels"], "net8.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Reflection.Metadata", "System.Threading.Channels"], "net9.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Reflection.Metadata", "System.Threading.Channels"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp2.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp2.2": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp3.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp3.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netstandard2.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "Microsoft.CodeAnalysis.Workspaces.Common", "id": "Microsoft.CodeAnalysis.Workspaces.Common", "version": "4.12.0", "sha512": "sha512-bzZOMF3kAtQhc5kcUILy0GyhgePksk/j9DJtlvFex1UYNgXJUoEkA6IUGootH1Z6GH4Z5BuLNXiFzsz9oJwbcQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net462": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net47": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net471": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net472": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net48": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net5.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net6.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net7.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata"], "net8.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata"], "net9.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp2.1": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp2.2": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp3.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp3.1": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netstandard2.1": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "Microsoft.CodeCoverage", "id": "Microsoft.CodeCoverage", "version": "17.12.0", "sha512": "sha512-POBqg788rrLApvncy8rvtyJ3ynsBdU0/SGUXD+vPqyRDM/aUJbPZWx01qalGJRK1GcArSku8QDd9AVMa0TkCkA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "Microsoft.Extensions.ObjectPool", "id": "Microsoft.Extensions.ObjectPool", "version": "9.0.3", "sha512": "sha512-0s2vnkWqUSPhhe+Llybuli0LMon5Mf7Mx9NSO9ErGFGU+dSZqwz1Ixa7mXJo2W+Y74BXYE+yfU0HIsPUMOkwZQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "Microsoft.NET.StringTools", "id": "Microsoft.NET.StringTools", "version": "17.12.6", "sha512": "sha512-uCT/G0W1wUteqfrriWHfLfFmArka8ISo6nUkC5gQzYZYm2PSTuqfS14DEsY0gqDuQpcLLLaYTDcEM0SA2Za5vA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net48": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net5.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net6.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net7.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net8.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "Microsoft.NET.Test.Sdk", "id": "Microsoft.NET.Test.Sdk", "version": "17.12.0", "sha512": "sha512-hGf8I8+yo15etavoMd+7OXcOG6/G7HYPDEJg5aQnhMzsxaUpq+udNZzSxmEN9rGTWMZOAVFcyNXNL7YBsN6chw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": ["Microsoft.CodeCoverage"], "net47": ["Microsoft.CodeCoverage"], "net471": ["Microsoft.CodeCoverage"], "net472": ["Microsoft.CodeCoverage"], "net48": ["Microsoft.CodeCoverage"], "net5.0": ["Microsoft.TestPlatform.TestHost", "Microsoft.CodeCoverage"], "net6.0": ["Microsoft.TestPlatform.TestHost", "Microsoft.CodeCoverage"], "net7.0": ["Microsoft.TestPlatform.TestHost", "Microsoft.CodeCoverage"], "net8.0": ["Microsoft.TestPlatform.TestHost", "Microsoft.CodeCoverage"], "net9.0": ["Microsoft.TestPlatform.TestHost", "Microsoft.CodeCoverage"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": ["Microsoft.TestPlatform.TestHost", "Microsoft.CodeCoverage"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "Microsoft.CodeAnalysis.Common", "id": "Microsoft.CodeAnalysis.Common", "version": "4.14.0", "sha512": "sha512-k9AIzOrtcZVqr9+lmcEW0vY80emyXx5JB/757K0HUF96GeUeiTD+djOlFF2y7k4XPZo20Lru4tDgQos+VKBr0w==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "net462": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "net47": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "net471": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "net472": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "net48": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "net5.0": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "net6.0": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "net7.0": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "net8.0": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata"], "net9.0": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "netcoreapp2.1": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "netcoreapp2.2": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "netcoreapp3.0": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "netcoreapp3.1": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"], "netstandard2.1": ["Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Memory", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions", "System.Buffers", "System.Numerics.Vectors"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "Microsoft.CodeAnalysis.CSharp", "id": "Microsoft.CodeAnalysis.CSharp", "version": "4.14.0", "sha512": "sha512-kqS2NihVvNQHxzLePtyYiiJmFzoYO9Wm46O9DhfUgIIf5NwTbvSy66kV9EM+qAHmGpi7zQy4w8JU6DFnPlAyTA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net462": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net47": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net471": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net472": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net48": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net5.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net6.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net7.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net8.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata"], "net9.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp2.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp2.2": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp3.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp3.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netstandard2.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "Microsoft.CodeAnalysis.CSharp.Workspaces", "id": "Microsoft.CodeAnalysis.CSharp.Workspaces", "version": "4.14.0", "sha512": "sha512-q9VD/wqMEGW0S5WIKuTZ4Wr9EpsZJQrQxqCodxjlsfW0bWl7mOQ4zA7k0Nf80ZrEe7Edaz6+3SBvrALiUcaHzA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net462": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net47": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net471": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net472": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net48": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net5.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net6.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net7.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net8.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Reflection.Metadata", "System.Threading.Channels"], "net9.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Reflection.Metadata", "System.Threading.Channels"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp2.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp2.2": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp3.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp3.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netstandard2.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "Microsoft.CodeAnalysis.VisualBasic", "id": "Microsoft.CodeAnalysis.VisualBasic", "version": "4.14.0", "sha512": "sha512-vXhNyQk07THoSHzsu/fM48tFFHYAZQumfT7uDJuL/5ZO4CRgJK9Zr6UOJOwX1Df8N//lRMeymYyT+qiAmnWiYA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net462": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net47": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net471": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net472": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net48": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net5.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net6.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net7.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net8.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata"], "net9.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp2.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp2.2": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp3.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp3.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netstandard2.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "id": "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "version": "4.14.0", "sha512": "sha512-LZMVjjbRTcKOtgVDz/sZn+AXBNGL4iKYnWwu5eOvvRcdXaLNlOA7bYtTZOnSMlqig7b/3gMzkoaLqcJ+7hgddg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net462": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net47": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net471": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net472": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net48": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net5.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net6.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net7.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "net8.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Reflection.Metadata", "System.Threading.Channels"], "net9.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Reflection.Metadata", "System.Threading.Channels"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp2.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp2.2": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp3.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netcoreapp3.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"], "netstandard2.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Composition", "System.IO.Pipelines", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Channels", "System.Threading.Tasks.Extensions"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "Microsoft.CodeAnalysis.Workspaces.Common", "id": "Microsoft.CodeAnalysis.Workspaces.Common", "version": "4.14.0", "sha512": "sha512-m/c+FWBNr/JgCYRJ/jh14U9oAtPxHTgDiujb+19QG1AA3KMNZed+UQ51PRSaOt9CbIoMubZp2AkUMSeioz4EHQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net462": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net47": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net471": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net472": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net48": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net5.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net6.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net7.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "net8.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata"], "net9.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Collections.Immutable", "System.Reflection.Metadata"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp2.1": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp2.2": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp3.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netcoreapp3.1": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"], "netstandard2.1": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "Microsoft.Bcl.AsyncInterfaces", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels", "Microsoft.CodeAnalysis.Analyzers", "System.Buffers", "System.Collections.Immutable", "System.Memory", "System.Numerics.Vectors", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe", "System.Text.Encoding.CodePages", "System.Threading.Tasks.Extensions"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "Microsoft.CodeCoverage", "id": "Microsoft.CodeCoverage", "version": "18.0.0", "sha512": "sha512-HT0zpIWW9Q0Csllqo7lefZ27HE6dl5gfh7NA4FPZjEURenH2GsvpRSZ63b1d3klDphxiX8bpxKwVSzyURhhgkQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "Microsoft.Extensions.ObjectPool", "id": "Microsoft.Extensions.ObjectPool", "version": "9.0.10", "sha512": "sha512-mx7sdMdkCBJuJQkSEaV9wQaB39+ciVUX0VCB7YrqAGvxyBkLRR0mgl9v7j4c6lVMeRZH79FgKOy1WaQbSyhVKA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "Microsoft.NET.StringTools", "id": "Microsoft.NET.StringTools", "version": "17.14.28", "sha512": "sha512-oJDGPNoVuWOmKTPpFK0lJnVwbLMRsm2oxgxBFOMKBYzSZtmiS0kcoednhArAeAicV2aSUFiuor1pw7JK/p2LwQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net48": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net5.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net6.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net7.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net8.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "Microsoft.NET.Test.Sdk", "id": "Microsoft.NET.Test.Sdk", "version": "18.0.0", "sha512": "sha512-+0iHCuP77nxZLLfEhCNDMOcy8+qC7IFtsLrSwSzp0qc7pUs2J28Stu2c+m9AEKkKdvhsMKB/AhlFOSyeOpdKVg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": ["Microsoft.CodeCoverage"], "net47": ["Microsoft.CodeCoverage"], "net471": ["Microsoft.CodeCoverage"], "net472": ["Microsoft.CodeCoverage"], "net48": ["Microsoft.CodeCoverage"], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": ["Microsoft.TestPlatform.TestHost", "Microsoft.CodeCoverage"], "net9.0": ["Microsoft.TestPlatform.TestHost", "Microsoft.CodeCoverage"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
             {"name": "Microsoft.NETCore.Platforms", "id": "Microsoft.NETCore.Platforms", "version": "7.0.4", "sha512": "sha512-mcQWjuDBh4WHGG4WcBI0k025WAdA2afMm6fs42sm1f+3gRyNQUiuMVT5gAWNUGSHmlu6qn/TCnAQpfl4Gm6cBw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
             {"name": "Microsoft.NETCore.Targets", "id": "Microsoft.NETCore.Targets", "version": "5.0.0", "sha512": "sha512-hYHm3JAjQO/nySxcl1EpZhYEW+2P3H1eLZNr+QxgO5TnLS6hqtfi5WchjQzjid45MYmhy2X7IOmcWtDP4fpMGw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "Microsoft.TestPlatform.ObjectModel", "id": "Microsoft.TestPlatform.ObjectModel", "version": "17.12.0", "sha512": "sha512-klsXMgAPNWYo3ceakLkod4wYrk4lAV2Ehi676zUKgiVpQ5Yj6q3vsMhk/3pm97Ltk/hdcSW0rJKJvcQvTzPgYA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Reflection.Metadata"], "net462": ["System.Reflection.Metadata"], "net47": ["System.Reflection.Metadata"], "net471": ["System.Reflection.Metadata"], "net472": ["System.Reflection.Metadata"], "net48": ["System.Reflection.Metadata"], "net5.0": ["System.Reflection.Metadata"], "net6.0": ["System.Reflection.Metadata"], "net7.0": ["System.Reflection.Metadata"], "net8.0": ["System.Reflection.Metadata"], "net9.0": ["System.Reflection.Metadata"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Reflection.Metadata"], "netcoreapp2.1": ["System.Reflection.Metadata"], "netcoreapp2.2": ["System.Reflection.Metadata"], "netcoreapp3.0": ["System.Reflection.Metadata"], "netcoreapp3.1": ["System.Reflection.Metadata"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Reflection.Metadata"], "netstandard2.1": ["System.Reflection.Metadata"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "Microsoft.TestPlatform.TestHost", "id": "Microsoft.TestPlatform.TestHost", "version": "17.12.0", "sha512": "sha512-gYM2BOGQvFEP2fZt61f3f5Gu+imL1G1bvGUrbJjpYcl66R6uzs5yESg0XMn8IgUgldz8RldOOaYmjk2KcSeG1Q==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": ["Microsoft.TestPlatform.ObjectModel", "Newtonsoft.Json"], "net6.0": ["Microsoft.TestPlatform.ObjectModel", "Newtonsoft.Json"], "net7.0": ["Microsoft.TestPlatform.ObjectModel", "Newtonsoft.Json"], "net8.0": ["Microsoft.TestPlatform.ObjectModel", "Newtonsoft.Json"], "net9.0": ["Microsoft.TestPlatform.ObjectModel", "Newtonsoft.Json"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": ["Microsoft.TestPlatform.ObjectModel", "Newtonsoft.Json"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "Microsoft.TestPlatform.ObjectModel", "id": "Microsoft.TestPlatform.ObjectModel", "version": "18.0.0", "sha512": "sha512-/ShCZQuIxaxzGjRQqCYTLD/KnG1yQKsNZXDUtjO2d55IOB8FEyhXleLw2hw8QlK/1gkblyJsp4BfQ8BQFaEAlg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Reflection.Metadata"], "net462": ["System.Reflection.Metadata"], "net47": ["System.Reflection.Metadata"], "net471": ["System.Reflection.Metadata"], "net472": ["System.Reflection.Metadata"], "net48": ["System.Reflection.Metadata"], "net5.0": ["System.Reflection.Metadata"], "net6.0": ["System.Reflection.Metadata"], "net7.0": ["System.Reflection.Metadata"], "net8.0": ["System.Reflection.Metadata"], "net9.0": ["System.Reflection.Metadata"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Reflection.Metadata"], "netcoreapp2.1": ["System.Reflection.Metadata"], "netcoreapp2.2": ["System.Reflection.Metadata"], "netcoreapp3.0": ["System.Reflection.Metadata"], "netcoreapp3.1": ["System.Reflection.Metadata"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Reflection.Metadata"], "netstandard2.1": ["System.Reflection.Metadata"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "Microsoft.TestPlatform.TestHost", "id": "Microsoft.TestPlatform.TestHost", "version": "18.0.0", "sha512": "sha512-9IZUooXUUnh+z04QtWCu5iku4D4FAfJajP1su+I6741AxXa0bnXPo2125vqjvK0Khfsk16zskgDpG6vf2Mjubg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": ["Microsoft.TestPlatform.ObjectModel", "Newtonsoft.Json"], "net9.0": ["Microsoft.TestPlatform.ObjectModel", "Newtonsoft.Json"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
             {"name": "Microsoft.Win32.Primitives", "id": "Microsoft.Win32.Primitives", "version": "4.3.0", "sha512": "sha512-Nm8Hp51y9tYcK3xD6qk43Wjftrg1mdH24CCJsTb6gr7HS21U1uA+CKPGEtUcVZbjU1y8Kynzm5eoJ7Pnx5gm8A==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "net6.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "net7.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "net8.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "net9.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp1.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp1.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp2.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp2.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp2.2": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp3.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp3.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.4": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.5": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.6": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard2.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard2.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"]}, "targeting_pack_overrides": [], "framework_list": []},
             {"name": "Mono.Posix.NETStandard", "id": "Mono.Posix.NETStandard", "version": "1.0.0", "sha512": "sha512-RtGiutQZJAmajvQ0QvBvh73VJye85iW9f9tjZlzF88idLxNMo4lAktP/4Y9ilCpais0LDO0tpoICt9Hdv6wooA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "MSBuild.StructuredLogger", "id": "MSBuild.StructuredLogger", "version": "2.2.386", "sha512": "sha512-m8ErawcbeDJ+nWtN62vh2OPHARvLpSqhOBCedtYniPGB059wSs2vuGPxfBcVGqVcjpZgntEY4vDOzGyAVB7atA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net462": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net47": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net471": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net472": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net48": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net5.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net6.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net7.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net8.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable"], "net9.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.1": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "Newtonsoft.Json", "id": "Newtonsoft.Json", "version": "13.0.3", "sha512": "sha512-mbJSvHfRxfX3tR/U6n1WU+mWHXswYc+SB/hkOpx8yZZe68hNZGfymJu0cjsaJEkVzCMqePiU6LdIyogqfIn7kg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "System.Buffers", "id": "System.Buffers", "version": "4.6.0", "sha512": "sha512-iRbJyTSX9bJVpURLGLiW8Fgk5Vfm5iGCztw4IG4IJYcxJy+BXTCEgEWFeJtO6c+kPnUmQu87KK5m188+qbErcQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "System.Collections.Immutable", "id": "System.Collections.Immutable", "version": "9.0.0", "sha512": "sha512-z/Oo7nxWmZ0Y578vj8EUVrFJZ3DX6OMuUGlgeYgeeUZOFGT89XfaM8fDFMvJy6+mOIqW6ux5NdNzEnlTnQGJ7A==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net462": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net47": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net471": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net472": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net48": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net5.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net6.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net7.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "System.Composition", "id": "System.Composition", "version": "9.0.0", "sha512": "sha512-aWcyK90nIChHyxq7rpQ83Bbvt/t9l1X6yQtkvODaZ+rJlYHUMVpSji0YXIZTX5VlcWRCVRFdeEY767BCOzueaw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net462": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net47": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net471": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net472": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net48": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net5.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net6.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net7.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net8.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net9.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netcoreapp2.1": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netcoreapp2.2": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netcoreapp3.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netcoreapp3.1": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netstandard2.1": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "System.Composition.AttributedModel", "id": "System.Composition.AttributedModel", "version": "9.0.0", "sha512": "sha512-oYuQzlIvO31GxSlTo6NCU+RnK9dVb1m154BNE7VGm9PUyJM+RrOQss8cNbMj+iIWVcp6VRnyJlBJ3MfzYo14AA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "System.Composition.Convention", "id": "System.Composition.Convention", "version": "9.0.0", "sha512": "sha512-3efhxn/7hQI9kNy6M6UUwWrMJCzdBZZ4hkYS3MUxqXyGdQ2sLCWToX1nLnnrRYafcdRSMOY2naMPNlRAEKDAGA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Composition.AttributedModel"], "net462": ["System.Composition.AttributedModel"], "net47": ["System.Composition.AttributedModel"], "net471": ["System.Composition.AttributedModel"], "net472": ["System.Composition.AttributedModel"], "net48": ["System.Composition.AttributedModel"], "net5.0": ["System.Composition.AttributedModel"], "net6.0": ["System.Composition.AttributedModel"], "net7.0": ["System.Composition.AttributedModel"], "net8.0": ["System.Composition.AttributedModel"], "net9.0": ["System.Composition.AttributedModel"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Composition.AttributedModel"], "netcoreapp2.1": ["System.Composition.AttributedModel"], "netcoreapp2.2": ["System.Composition.AttributedModel"], "netcoreapp3.0": ["System.Composition.AttributedModel"], "netcoreapp3.1": ["System.Composition.AttributedModel"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Composition.AttributedModel"], "netstandard2.1": ["System.Composition.AttributedModel"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "System.Composition.Hosting", "id": "System.Composition.Hosting", "version": "9.0.0", "sha512": "sha512-zLPGbMYw6y2GoNBjcoPnvXt7wSJM/qIG1fU2Do8kDObDTYWHG6fFOhulSViX0Ip2j+qGeuCESqEswCRG+xDvwA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Composition.Runtime"], "net462": ["System.Composition.Runtime"], "net47": ["System.Composition.Runtime"], "net471": ["System.Composition.Runtime"], "net472": ["System.Composition.Runtime"], "net48": ["System.Composition.Runtime"], "net5.0": ["System.Composition.Runtime"], "net6.0": ["System.Composition.Runtime"], "net7.0": ["System.Composition.Runtime"], "net8.0": ["System.Composition.Runtime"], "net9.0": ["System.Composition.Runtime"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Composition.Runtime"], "netcoreapp2.1": ["System.Composition.Runtime"], "netcoreapp2.2": ["System.Composition.Runtime"], "netcoreapp3.0": ["System.Composition.Runtime"], "netcoreapp3.1": ["System.Composition.Runtime"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Composition.Runtime"], "netstandard2.1": ["System.Composition.Runtime"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "System.Composition.Runtime", "id": "System.Composition.Runtime", "version": "9.0.0", "sha512": "sha512-P777aBPIwmLvL0Q8mPA7RiiomfjqLTbpX/xzKpk7YTJLcvPDMTvRIfNFognEpfJYRLadBymaBIU81vW3MzZYnA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "System.Composition.TypedParts", "id": "System.Composition.TypedParts", "version": "9.0.0", "sha512": "sha512-7b7mkn4H0149jNKD1tZRUG2gmkszNzO6YAGV+xEsxdfIU+5SLhxWRYJpqm1zKzKNdzpKUW93oyEFGcTuoNvqGg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net462": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net47": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net471": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net472": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net48": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net5.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net6.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net7.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net8.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net9.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netcoreapp2.1": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netcoreapp2.2": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netcoreapp3.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netcoreapp3.1": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netstandard2.1": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "System.Configuration.ConfigurationManager", "id": "System.Configuration.ConfigurationManager", "version": "9.0.0", "sha512": "sha512-RMASWXcds+sKAl/W6itFM8hvq9aha8CRqSv2nrjb8TUTSMLjjn80h1Lrob7km+v/1UfpUU/Nr67egAjZjsCgIw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Security.Cryptography.ProtectedData"], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": ["System.Security.Cryptography.ProtectedData"], "net6.0": ["System.Security.Cryptography.ProtectedData"], "net7.0": ["System.Security.Cryptography.ProtectedData"], "net8.0": ["System.Diagnostics.EventLog", "System.Security.Cryptography.ProtectedData"], "net9.0": ["System.Diagnostics.EventLog", "System.Security.Cryptography.ProtectedData"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Security.Cryptography.ProtectedData"], "netcoreapp2.1": ["System.Security.Cryptography.ProtectedData"], "netcoreapp2.2": ["System.Security.Cryptography.ProtectedData"], "netcoreapp3.0": ["System.Security.Cryptography.ProtectedData"], "netcoreapp3.1": ["System.Security.Cryptography.ProtectedData"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Security.Cryptography.ProtectedData"], "netstandard2.1": ["System.Security.Cryptography.ProtectedData"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "System.Diagnostics.EventLog", "id": "System.Diagnostics.EventLog", "version": "9.0.0", "sha512": "sha512-ouyDUtZFOgkAPYmYUzioIjMxmgdI/E3j1sIuAbkXv4cTFOisf5FvQrbwi0KC84GUJMjkImXbaZqlTH9M5dJz2Q==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "MSBuild.StructuredLogger", "id": "MSBuild.StructuredLogger", "version": "2.3.71", "sha512": "sha512-u2Tw1WLYy+2VdccrQWyN3AY8zcFj4evfwqWMd7aBiicX3eGfkWkME7lsh9K2XS/+S8KVkjGNPI/g78E2A7Zx0g==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net462": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net47": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net471": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net472": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net48": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net5.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net6.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net7.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net8.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable"], "net9.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.1": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core", "System.Collections.Immutable", "System.Memory", "System.Runtime.CompilerServices.Unsafe"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "NaturalSort.Extension", "id": "NaturalSort.Extension", "version": "4.4.0", "sha512": "sha512-lcwYGJO2xZylcLW6B64tp6wE9UAt6fSn6el8MSAly5+6QG1vc/9uXQz+dsi69q1DxFv2TOaWrrheHNzg4yvy3Q==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "Newtonsoft.Json", "id": "Newtonsoft.Json", "version": "13.0.4", "sha512": "sha512-bR+v+E/yJ6g7GV2uXw2OrUSjYYfjLkOLC8JD4kCS23msLapnKtdJPBJA75fwHH++ErIffeIqzYITLxAur4KAXA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "System.Buffers", "id": "System.Buffers", "version": "4.6.1", "sha512": "sha512-qve/dFwECwehSWlZmpkrrlIeATCvo/Hw2koyMrUVcDBy5gXAQrnwX8pHEoqgj8DgkrWuWW1DrQbFqoMbo+Fvrg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "System.Collections.Immutable", "id": "System.Collections.Immutable", "version": "9.0.10", "sha512": "sha512-00LI4a7blU063Z0lCdRVLlh0Mzl1yYLZaxlOZe0MiNH+TELklX0Mne/XKU7UuCZQQh6FHrcEUPDjxIsy2jZUxg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net462": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net47": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net471": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net472": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net48": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net5.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net6.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net7.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "System.Composition", "id": "System.Composition", "version": "9.0.10", "sha512": "sha512-PyUH0f6tdjlQBntP/73cqaR53fjAZkaqGRatIi1BgZIfQH/Z0k1rPHaklBZqFV5+wKUkL74+49TrFPnB/zw+2Q==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net462": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net47": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net471": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net472": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net48": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net5.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net6.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net7.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net8.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "net9.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netcoreapp2.1": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netcoreapp2.2": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netcoreapp3.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netcoreapp3.1": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"], "netstandard2.1": ["System.Composition.AttributedModel", "System.Composition.Convention", "System.Composition.Hosting", "System.Composition.Runtime", "System.Composition.TypedParts"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "System.Composition.AttributedModel", "id": "System.Composition.AttributedModel", "version": "9.0.10", "sha512": "sha512-9Gx8SRD1DJcQLca7ZaeMjU+qUd4EdxDj6urKR4TizWx+NM7L+beoAn07XCKkdJsweqF6gUK7el93DhUbpssSqA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "System.Composition.Convention", "id": "System.Composition.Convention", "version": "9.0.10", "sha512": "sha512-hzvwytBYpKoDX+OJpHXKoupR+BYy+QCUY5vSWOTvJLagAm3zYJKxAUR3l8OyPy46tnQ+3lK/6f5DeLHiTfbIIw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Composition.AttributedModel"], "net462": ["System.Composition.AttributedModel"], "net47": ["System.Composition.AttributedModel"], "net471": ["System.Composition.AttributedModel"], "net472": ["System.Composition.AttributedModel"], "net48": ["System.Composition.AttributedModel"], "net5.0": ["System.Composition.AttributedModel"], "net6.0": ["System.Composition.AttributedModel"], "net7.0": ["System.Composition.AttributedModel"], "net8.0": ["System.Composition.AttributedModel"], "net9.0": ["System.Composition.AttributedModel"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Composition.AttributedModel"], "netcoreapp2.1": ["System.Composition.AttributedModel"], "netcoreapp2.2": ["System.Composition.AttributedModel"], "netcoreapp3.0": ["System.Composition.AttributedModel"], "netcoreapp3.1": ["System.Composition.AttributedModel"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Composition.AttributedModel"], "netstandard2.1": ["System.Composition.AttributedModel"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "System.Composition.Hosting", "id": "System.Composition.Hosting", "version": "9.0.10", "sha512": "sha512-fPTM06IdvHrFIRJyYEpVKl5W7UTT4U3E+iiAVg3DFfuQ4Abe4XVhkoHn3DB4pUTOU2RpVc2+PxQ6y9hULPta1A==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Composition.Runtime"], "net462": ["System.Composition.Runtime"], "net47": ["System.Composition.Runtime"], "net471": ["System.Composition.Runtime"], "net472": ["System.Composition.Runtime"], "net48": ["System.Composition.Runtime"], "net5.0": ["System.Composition.Runtime"], "net6.0": ["System.Composition.Runtime"], "net7.0": ["System.Composition.Runtime"], "net8.0": ["System.Composition.Runtime"], "net9.0": ["System.Composition.Runtime"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Composition.Runtime"], "netcoreapp2.1": ["System.Composition.Runtime"], "netcoreapp2.2": ["System.Composition.Runtime"], "netcoreapp3.0": ["System.Composition.Runtime"], "netcoreapp3.1": ["System.Composition.Runtime"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Composition.Runtime"], "netstandard2.1": ["System.Composition.Runtime"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "System.Composition.Runtime", "id": "System.Composition.Runtime", "version": "9.0.10", "sha512": "sha512-8iDtNLXkjiFwir6Ocrm4XCC19Jzj06OHTvDeL6BZ4guWhCCGRCl6nWJVPonq6G2kZmNiDfraOwC8RgV5qPAAjg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "System.Composition.TypedParts", "id": "System.Composition.TypedParts", "version": "9.0.10", "sha512": "sha512-7OUDlDYszrhjJ8/r5na3N07XzBWl8e6/87dyGoDraDHlkl+APL4dbZ8TfniaXLJxZabDHVaaMLpViiIf+Fb9Ng==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net462": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net47": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net471": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net472": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net48": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net5.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net6.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net7.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net8.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "net9.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netcoreapp2.1": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netcoreapp2.2": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netcoreapp3.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netcoreapp3.1": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"], "netstandard2.1": ["System.Composition.AttributedModel", "System.Composition.Hosting", "System.Composition.Runtime"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "System.Configuration.ConfigurationManager", "id": "System.Configuration.ConfigurationManager", "version": "9.0.10", "sha512": "sha512-/LM2cc6vZulHDcDsd+9vntVD9j953k8WCCzB4Fea6YxOoIexpGP8iJhC7v13hKN5V66MDprjCJRjHHhDaDuOXw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Security.Cryptography.ProtectedData"], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": ["System.Security.Cryptography.ProtectedData"], "net6.0": ["System.Security.Cryptography.ProtectedData"], "net7.0": ["System.Security.Cryptography.ProtectedData"], "net8.0": ["System.Diagnostics.EventLog", "System.Security.Cryptography.ProtectedData"], "net9.0": ["System.Diagnostics.EventLog", "System.Security.Cryptography.ProtectedData"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Security.Cryptography.ProtectedData"], "netcoreapp2.1": ["System.Security.Cryptography.ProtectedData"], "netcoreapp2.2": ["System.Security.Cryptography.ProtectedData"], "netcoreapp3.0": ["System.Security.Cryptography.ProtectedData"], "netcoreapp3.1": ["System.Security.Cryptography.ProtectedData"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Security.Cryptography.ProtectedData"], "netstandard2.1": ["System.Security.Cryptography.ProtectedData"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "System.Diagnostics.EventLog", "id": "System.Diagnostics.EventLog", "version": "9.0.10", "sha512": "sha512-3rC2TD7/ikgwu5Z7BzViMVDDp7RGyaej8pvVDzhy6rI7QZ9+x6DPiOPD5y4FjePxTLh/rFjMNcP7nG9IHWsB2Q==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
             {"name": "System.IO", "id": "System.IO", "version": "4.3.0", "sha512": "sha512-v8paIePhmGuXZbE9xvvNb4uJ5ME4OFXR1+8la/G/L1GIl2nbU2WFnddgb79kVK3U2us7q1aZT/uY/R0D/ovB5g==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "net6.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "net7.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "net8.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "net9.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "netcoreapp1.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "netcoreapp1.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "netcoreapp2.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "netcoreapp2.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "netcoreapp2.2": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "netcoreapp3.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "netcoreapp3.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "netstandard": [], "netstandard1.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "netstandard1.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "netstandard1.2": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "netstandard1.3": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "netstandard1.4": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "netstandard1.5": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "netstandard1.6": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "netstandard2.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"], "netstandard2.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Text.Encoding", "System.Threading.Tasks"]}, "targeting_pack_overrides": [], "framework_list": []},
             {"name": "System.IO.FileSystem", "id": "System.IO.FileSystem", "version": "4.3.0", "sha512": "sha512-T7WB1vhblSmgkaDpdGM3Uqo55Qsr5sip5eyowrwiXOoHBkzOx3ePd9+Zh97r9NzOwFCxqX7awO6RBxQuao7n7g==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": ["System.IO.FileSystem.Primitives"], "net461": ["System.IO.FileSystem.Primitives"], "net462": ["System.IO.FileSystem.Primitives"], "net47": ["System.IO.FileSystem.Primitives"], "net471": ["System.IO.FileSystem.Primitives"], "net472": ["System.IO.FileSystem.Primitives"], "net48": ["System.IO.FileSystem.Primitives"], "net5.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.IO", "System.IO.FileSystem.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Text.Encoding", "System.Threading.Tasks"], "net6.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.IO", "System.IO.FileSystem.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Text.Encoding", "System.Threading.Tasks"], "net7.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.IO", "System.IO.FileSystem.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Text.Encoding", "System.Threading.Tasks"], "net8.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.IO", "System.IO.FileSystem.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Text.Encoding", "System.Threading.Tasks"], "net9.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.IO", "System.IO.FileSystem.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Text.Encoding", "System.Threading.Tasks"], "netcoreapp1.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.IO", "System.IO.FileSystem.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Text.Encoding", "System.Threading.Tasks"], "netcoreapp1.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.IO", "System.IO.FileSystem.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Text.Encoding", "System.Threading.Tasks"], "netcoreapp2.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.IO", "System.IO.FileSystem.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Text.Encoding", "System.Threading.Tasks"], "netcoreapp2.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.IO", "System.IO.FileSystem.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Text.Encoding", "System.Threading.Tasks"], "netcoreapp2.2": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.IO", "System.IO.FileSystem.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Text.Encoding", "System.Threading.Tasks"], "netcoreapp3.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.IO", "System.IO.FileSystem.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Text.Encoding", "System.Threading.Tasks"], "netcoreapp3.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.IO", "System.IO.FileSystem.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Text.Encoding", "System.Threading.Tasks"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.IO", "System.IO.FileSystem.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Text.Encoding", "System.Threading.Tasks"], "netstandard1.4": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.IO", "System.IO.FileSystem.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Text.Encoding", "System.Threading.Tasks"], "netstandard1.5": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.IO", "System.IO.FileSystem.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Text.Encoding", "System.Threading.Tasks"], "netstandard1.6": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.IO", "System.IO.FileSystem.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Text.Encoding", "System.Threading.Tasks"], "netstandard2.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.IO", "System.IO.FileSystem.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Text.Encoding", "System.Threading.Tasks"], "netstandard2.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.IO", "System.IO.FileSystem.Primitives", "System.Runtime", "System.Runtime.Handles", "System.Text.Encoding", "System.Threading.Tasks"]}, "targeting_pack_overrides": [], "framework_list": []},
             {"name": "System.IO.FileSystem.Primitives", "id": "System.IO.FileSystem.Primitives", "version": "4.3.0", "sha512": "sha512-WIWVPQlYLP/Zc9I6IakpBk1y8ryVGK83MtZx//zGKKi2hvHQWKAB7moRQCOz5Is/wNDksiYpocf3FeA3le6e5Q==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": ["System.Runtime"], "net6.0": ["System.Runtime"], "net7.0": ["System.Runtime"], "net8.0": ["System.Runtime"], "net9.0": ["System.Runtime"], "netcoreapp1.0": ["System.Runtime"], "netcoreapp1.1": ["System.Runtime"], "netcoreapp2.0": ["System.Runtime"], "netcoreapp2.1": ["System.Runtime"], "netcoreapp2.2": ["System.Runtime"], "netcoreapp3.0": ["System.Runtime"], "netcoreapp3.1": ["System.Runtime"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": ["System.Runtime"], "netstandard1.4": ["System.Runtime"], "netstandard1.5": ["System.Runtime"], "netstandard1.6": ["System.Runtime"], "netstandard2.0": ["System.Runtime"], "netstandard2.1": ["System.Runtime"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "System.IO.Pipelines", "id": "System.IO.Pipelines", "version": "9.0.0", "sha512": "sha512-XIeVKR80wuDl05DI4Hufye7TT4D1Ca1Bm4zJPc7mgnodrCy0OfcQ1C00A7se56dMvg48cI64TMD+YKcZl+qOaA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "net462": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "net47": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "net471": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "net472": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "net48": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "net5.0": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "net6.0": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "net7.0": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "netcoreapp2.1": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "netcoreapp2.2": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "netcoreapp3.0": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "netcoreapp3.1": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "netstandard2.1": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "System.Memory", "id": "System.Memory", "version": "4.6.0", "sha512": "sha512-TY7NpV4Vv0vwanZ6J8vrLGfybbPKhAvL3oTx7EndsZ/J/71sm01JPCHImtvYtwh1vmFat/GPS/id9htqIPK+6g==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Buffers", "System.Numerics.Vectors", "System.Runtime.CompilerServices.Unsafe"], "net462": ["System.Buffers", "System.Numerics.Vectors", "System.Runtime.CompilerServices.Unsafe"], "net47": ["System.Buffers", "System.Numerics.Vectors", "System.Runtime.CompilerServices.Unsafe"], "net471": ["System.Buffers", "System.Numerics.Vectors", "System.Runtime.CompilerServices.Unsafe"], "net472": ["System.Buffers", "System.Numerics.Vectors", "System.Runtime.CompilerServices.Unsafe"], "net48": ["System.Buffers", "System.Numerics.Vectors", "System.Runtime.CompilerServices.Unsafe"], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Buffers", "System.Numerics.Vectors", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Buffers", "System.Numerics.Vectors", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["System.Buffers", "System.Numerics.Vectors", "System.Runtime.CompilerServices.Unsafe"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "System.IO.Pipelines", "id": "System.IO.Pipelines", "version": "9.0.10", "sha512": "sha512-kQg8x+mbt8Xi1mwm32DVEz6DtfqKn9XUGziGQvdNJ2QEGWvufcZfRWtxAf9nB+/B1FT1x7W4Wh2Fr9lcKlVWPA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "net462": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "net47": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "net471": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "net472": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "net48": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "net5.0": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "net6.0": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "net7.0": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "netcoreapp2.1": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "netcoreapp2.2": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "netcoreapp3.0": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "netcoreapp3.1": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"], "netstandard2.1": ["System.Buffers", "System.Memory", "System.Threading.Tasks.Extensions"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "System.Memory", "id": "System.Memory", "version": "4.6.3", "sha512": "sha512-NXcNYlWoXe5cz9sb8Huo6x2dCZVYkhwKtgE00n/MoI8V4ZI/7/t+EI5bOhQFlZfFjjqM8+U6prjU/aARt7H/tA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Buffers", "System.Numerics.Vectors", "System.Runtime.CompilerServices.Unsafe"], "net462": ["System.Buffers", "System.Numerics.Vectors", "System.Runtime.CompilerServices.Unsafe"], "net47": ["System.Buffers", "System.Numerics.Vectors", "System.Runtime.CompilerServices.Unsafe"], "net471": ["System.Buffers", "System.Numerics.Vectors", "System.Runtime.CompilerServices.Unsafe"], "net472": ["System.Buffers", "System.Numerics.Vectors", "System.Runtime.CompilerServices.Unsafe"], "net48": ["System.Buffers", "System.Numerics.Vectors", "System.Runtime.CompilerServices.Unsafe"], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Buffers", "System.Numerics.Vectors", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Buffers", "System.Numerics.Vectors", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
             {"name": "System.Net.Primitives", "id": "System.Net.Primitives", "version": "4.3.1", "sha512": "sha512-BgdlyYCI7rrdh36p3lMTqbkvaafPETpB1bk9iQlFdQxYE692kiXvmseXs8ghL+gEgQF2xgDc8GH4QLkSgUUs+Q==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Runtime.Handles"], "net6.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Runtime.Handles"], "net7.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Runtime.Handles"], "net8.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Runtime.Handles"], "net9.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Runtime.Handles"], "netcoreapp1.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Runtime.Handles"], "netcoreapp1.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Runtime.Handles"], "netcoreapp2.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Runtime.Handles"], "netcoreapp2.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Runtime.Handles"], "netcoreapp2.2": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Runtime.Handles"], "netcoreapp3.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Runtime.Handles"], "netcoreapp3.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Runtime.Handles"], "netstandard": [], "netstandard1.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.2": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.3": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Runtime.Handles"], "netstandard1.4": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Runtime.Handles"], "netstandard1.5": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Runtime.Handles"], "netstandard1.6": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Runtime.Handles"], "netstandard2.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Runtime.Handles"], "netstandard2.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime", "System.Runtime.Handles"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "System.Numerics.Vectors", "id": "System.Numerics.Vectors", "version": "4.6.0", "sha512": "sha512-dxZWbnnb21+5QuKAiUEntJirh5KiU1nqlLWtBu4v9/Fx1RnsgNn8T4XbmQhvCq/T94201P6EsGG2z2Y5ded1yA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "System.Reflection.Metadata", "id": "System.Reflection.Metadata", "version": "9.0.0", "sha512": "sha512-jz+Y2m/CpdPvdjCNRigiWJYKFusdkfJlxDx4V5cWX2TubAMaz5CZpODBD/P2+20SpWvmZG6J3UYjl+R2Yg7yFw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Collections.Immutable", "System.Memory"], "net462": ["System.Collections.Immutable", "System.Memory"], "net47": ["System.Collections.Immutable", "System.Memory"], "net471": ["System.Collections.Immutable", "System.Memory"], "net472": ["System.Collections.Immutable", "System.Memory"], "net48": ["System.Collections.Immutable", "System.Memory"], "net5.0": ["System.Collections.Immutable", "System.Memory"], "net6.0": ["System.Collections.Immutable", "System.Memory"], "net7.0": ["System.Collections.Immutable", "System.Memory"], "net8.0": ["System.Collections.Immutable"], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Collections.Immutable", "System.Memory"], "netcoreapp2.1": ["System.Collections.Immutable", "System.Memory"], "netcoreapp2.2": ["System.Collections.Immutable", "System.Memory"], "netcoreapp3.0": ["System.Collections.Immutable", "System.Memory"], "netcoreapp3.1": ["System.Collections.Immutable", "System.Memory"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Collections.Immutable", "System.Memory"], "netstandard2.1": ["System.Collections.Immutable", "System.Memory"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "System.Reflection.MetadataLoadContext", "id": "System.Reflection.MetadataLoadContext", "version": "9.0.0", "sha512": "sha512-or1DAn2dl2SjxPA4tuDG9RxTxeERdHIU7gUJjNf8WhT6D08ZsHbmSZpP2rKpgGOXHMhmXf3CTDNmfa4cSD2DtA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "net462": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "net47": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "net471": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "net472": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "net48": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "net5.0": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "net6.0": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "net7.0": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "net8.0": ["System.Collections.Immutable", "System.Reflection.Metadata"], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "netcoreapp2.1": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "netcoreapp2.2": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "netcoreapp3.0": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "netcoreapp3.1": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "netstandard2.1": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "System.Numerics.Vectors", "id": "System.Numerics.Vectors", "version": "4.6.1", "sha512": "sha512-/rkvpUeUPlCY/2qYVQKiUsj5IKaXZcy2+SQAGAfemAdyEF5AgIgYOFNSTMWDXo09JWFX9HB+wV1yCyi2Mwi3TA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "System.Reflection.Metadata", "id": "System.Reflection.Metadata", "version": "9.0.10", "sha512": "sha512-3ZztNrfQJww1qZ9UgdB5aTAYlAIWd5dMyyBagAC8jth6iG5vxawtaGbZJMh4xkL9A5v6Ng48YL+hAjt08GBWKQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Collections.Immutable", "System.Memory"], "net462": ["System.Collections.Immutable", "System.Memory"], "net47": ["System.Collections.Immutable", "System.Memory"], "net471": ["System.Collections.Immutable", "System.Memory"], "net472": ["System.Collections.Immutable", "System.Memory"], "net48": ["System.Collections.Immutable", "System.Memory"], "net5.0": ["System.Collections.Immutable", "System.Memory"], "net6.0": ["System.Collections.Immutable", "System.Memory"], "net7.0": ["System.Collections.Immutable", "System.Memory"], "net8.0": ["System.Collections.Immutable"], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Collections.Immutable", "System.Memory"], "netcoreapp2.1": ["System.Collections.Immutable", "System.Memory"], "netcoreapp2.2": ["System.Collections.Immutable", "System.Memory"], "netcoreapp3.0": ["System.Collections.Immutable", "System.Memory"], "netcoreapp3.1": ["System.Collections.Immutable", "System.Memory"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Collections.Immutable", "System.Memory"], "netstandard2.1": ["System.Collections.Immutable", "System.Memory"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "System.Reflection.MetadataLoadContext", "id": "System.Reflection.MetadataLoadContext", "version": "9.0.10", "sha512": "sha512-qf9IjoUO2XfK4BTPhCIFDYAsiWtFCTpyiklmxoNK2Ys1wZdoVe5C3j5BH2ajSDWy2mAQcN1n+Eh/3uhd3oUcEA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "net462": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "net47": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "net471": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "net472": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "net48": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "net5.0": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "net6.0": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "net7.0": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "net8.0": ["System.Collections.Immutable", "System.Reflection.Metadata"], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "netcoreapp2.1": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "netcoreapp2.2": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "netcoreapp3.0": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "netcoreapp3.1": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"], "netstandard2.1": ["System.Collections.Immutable", "System.Reflection.Metadata", "System.Memory"]}, "targeting_pack_overrides": [], "framework_list": []},
             {"name": "System.Runtime", "id": "System.Runtime", "version": "4.3.1", "sha512": "sha512-Al69mPDfzdD+bKGK2HAfB+lNFOHFqnkqzNnUJmmvUe1/qEPK9M7EiTT4zuycKDPy7ev11xz8XVgJWKP0hm7NIA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "net6.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "net7.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "net8.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "net9.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "netcoreapp1.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "netcoreapp1.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "netcoreapp2.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "netcoreapp2.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "netcoreapp2.2": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "netcoreapp3.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "netcoreapp3.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "netstandard": [], "netstandard1.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "netstandard1.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "netstandard1.2": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "netstandard1.3": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "netstandard1.4": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "netstandard1.5": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "netstandard1.6": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "netstandard2.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"], "netstandard2.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "System.Runtime.CompilerServices.Unsafe", "id": "System.Runtime.CompilerServices.Unsafe", "version": "6.1.0", "sha512": "sha512-iY0upfdQeiaCfoxT+m4XJyb0IJNk4B9TLQFanOCOrU9X5x1x2TjKx0OFbLmg1VG2dOyL5nHMn198SBQ91Yy1kQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "System.Runtime.CompilerServices.Unsafe", "id": "System.Runtime.CompilerServices.Unsafe", "version": "6.1.2", "sha512": "sha512-t2aXWJZBkAkRrTOnw31OBELKEVSDD5YvC3O5dXaHFsR66/nRTKm1y3Iq6NwFI5u5IlKrWYfdan66V+GKKkY8hQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
             {"name": "System.Runtime.Handles", "id": "System.Runtime.Handles", "version": "4.3.0", "sha512": "sha512-CluvHdVUv54BvLTOCCyybugreDNk/rR8unMPruzXDtxSjvrQOU3M4R831/lQf4YI8VYp668FGQa/01E+Rq8PEQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "net6.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "net7.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "net8.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "net9.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp1.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp1.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp2.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp2.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp2.2": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp3.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp3.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.4": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.5": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.6": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard2.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard2.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "System.Security.Cryptography.ProtectedData", "id": "System.Security.Cryptography.ProtectedData", "version": "9.0.0", "sha512": "sha512-Mbc5s1XBLje0N1idqILQUqWnG8RVj9p7uK110yxZXTzZq3CN7jaCFEySK52kA+dPYtByzcRtA/FUnK4o/sinSw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Memory"], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": ["System.Memory"], "net6.0": ["System.Memory"], "net7.0": ["System.Memory"], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Memory"], "netcoreapp2.1": ["System.Memory"], "netcoreapp2.2": ["System.Memory"], "netcoreapp3.0": ["System.Memory"], "netcoreapp3.1": ["System.Memory"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Memory"], "netstandard2.1": ["System.Memory"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "System.Security.Cryptography.ProtectedData", "id": "System.Security.Cryptography.ProtectedData", "version": "9.0.10", "sha512": "sha512-yR8dvnme5ndA3L6Q6F/2N+4QBCi8sdfGWg9lmRVNBZO+evqIt323UdXMu8b8MnMYoyxXaml+vTEl74t5Nu7ABQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Memory"], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": ["System.Memory"], "net6.0": ["System.Memory"], "net7.0": ["System.Memory"], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Memory"], "netcoreapp2.1": ["System.Memory"], "netcoreapp2.2": ["System.Memory"], "netcoreapp3.0": ["System.Memory"], "netcoreapp3.1": ["System.Memory"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Memory"], "netstandard2.1": ["System.Memory"]}, "targeting_pack_overrides": [], "framework_list": []},
             {"name": "System.Security.Principal", "id": "System.Security.Principal", "version": "4.3.0", "sha512": "sha512-24oe0NGJY32e+DFHVQzl2okM9uwYmn0Aa6nehqtVZ55/Al4Yva7S3BN934Kn5qATH7TVTUJkgxhisdfF7mKDfg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": ["System.Runtime"], "net6.0": ["System.Runtime"], "net7.0": ["System.Runtime"], "net8.0": ["System.Runtime"], "net9.0": ["System.Runtime"], "netcoreapp1.0": ["System.Runtime"], "netcoreapp1.1": ["System.Runtime"], "netcoreapp2.0": ["System.Runtime"], "netcoreapp2.1": ["System.Runtime"], "netcoreapp2.2": ["System.Runtime"], "netcoreapp3.0": ["System.Runtime"], "netcoreapp3.1": ["System.Runtime"], "netstandard": [], "netstandard1.0": ["System.Runtime"], "netstandard1.1": ["System.Runtime"], "netstandard1.2": ["System.Runtime"], "netstandard1.3": ["System.Runtime"], "netstandard1.4": ["System.Runtime"], "netstandard1.5": ["System.Runtime"], "netstandard1.6": ["System.Runtime"], "netstandard2.0": ["System.Runtime"], "netstandard2.1": ["System.Runtime"]}, "targeting_pack_overrides": [], "framework_list": []},
             {"name": "System.Text.Encoding", "id": "System.Text.Encoding", "version": "4.3.0", "sha512": "sha512-b/f+7HMTpxIfeV7H03bkuHKMFylCGfr9/U6gePnfFFW0aF8LOWLDgQCY6V1oWUqDksC3mdNuyChM1vy9TP4sZw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "net6.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "net7.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "net8.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "net9.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp1.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp1.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp2.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp2.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp2.2": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp3.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp3.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard": [], "netstandard1.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.2": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.3": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.4": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.5": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.6": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard2.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard2.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "System.Text.Encoding.CodePages", "id": "System.Text.Encoding.CodePages", "version": "9.0.0", "sha512": "sha512-rMAcE2cpS8RvPR5iK6WkYdZKJLsUw5BRqG3d/LR0dl8x17ezOj43AWRhp4LRIFgydWjOOn/Z4w//l8wcowngvQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net462": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net47": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net471": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net472": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net48": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net5.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net6.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net7.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "System.Threading.Channels", "id": "System.Threading.Channels", "version": "9.0.0", "sha512": "sha512-6q+SC/qL5eeX9t3zUjmtsccStVusUvYXdJFYGf3ihM/8TionV+iZxi3mxDPPFXOiepRe7WgrIOuoaCi4+bwZ0g==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "net462": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "net47": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "net471": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "net472": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "net48": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "netcoreapp2.1": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "netcoreapp2.2": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "System.Text.Encoding.CodePages", "id": "System.Text.Encoding.CodePages", "version": "9.0.10", "sha512": "sha512-LPoLnlvwb3D12yjwva2nvfzDqm4XNUBrAf/zQ5ad2IOqhTWqRm4GIXxlH4lSr3W/ET31aLtM4C4vHbr8sGEzWA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net462": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net47": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net471": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net472": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net48": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net5.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net6.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net7.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["System.Memory", "System.Runtime.CompilerServices.Unsafe"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "System.Threading.Channels", "id": "System.Threading.Channels", "version": "9.0.10", "sha512": "sha512-wMh3VX2qbwFg8rZllC1QsiXl4NjLkamNVT+O6bJG5V3sN6cwRZRza2v7f2ohFNGdGlViwUAO/PKSZgJfuJNXTg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "net462": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "net47": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "net471": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "net472": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "net48": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "netcoreapp2.1": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "netcoreapp2.2": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.Bcl.AsyncInterfaces", "System.Threading.Tasks.Extensions"], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
             {"name": "System.Threading.Tasks", "id": "System.Threading.Tasks", "version": "4.3.0", "sha512": "sha512-fUiP+CyyCjs872OA8trl6p97qma/da1xGq3h4zAbJZk8zyaU4zyEfqW5vbkP80xG/Nimun1vlWBboMEk7XxdEw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "net6.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "net7.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "net8.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "net9.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp1.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp1.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp2.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp2.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp2.2": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp3.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp3.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard": [], "netstandard1.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.2": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.3": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.4": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.5": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.6": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard2.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard2.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "System.Threading.Tasks.Extensions", "id": "System.Threading.Tasks.Extensions", "version": "4.6.0", "sha512": "sha512-ph8eP2gKhA6mNhj/teYwn9xCrHMc7+nBMlSMKX7BUXcZn33RVLe45TWABkcgyS6TJWYx1v1WwtylHmF3Fvg0qQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Runtime.CompilerServices.Unsafe"], "net462": ["System.Runtime.CompilerServices.Unsafe"], "net47": ["System.Runtime.CompilerServices.Unsafe"], "net471": ["System.Runtime.CompilerServices.Unsafe"], "net472": ["System.Runtime.CompilerServices.Unsafe"], "net48": ["System.Runtime.CompilerServices.Unsafe"], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["System.Runtime.CompilerServices.Unsafe"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "System.Threading.Tasks.Extensions", "id": "System.Threading.Tasks.Extensions", "version": "4.6.3", "sha512": "sha512-zWRHXIBnbfzQE1SamNoW9X5NjEcW/JNAtvVxGKd3bcg71wQVmoI3pDq+WUa2A+temXSNCm7707hmAFwwcYlK0A==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Runtime.CompilerServices.Unsafe"], "net462": ["System.Runtime.CompilerServices.Unsafe"], "net47": ["System.Runtime.CompilerServices.Unsafe"], "net471": ["System.Runtime.CompilerServices.Unsafe"], "net472": ["System.Runtime.CompilerServices.Unsafe"], "net48": ["System.Runtime.CompilerServices.Unsafe"], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
             {"name": "System.Threading.ThreadPool", "id": "System.Threading.ThreadPool", "version": "4.3.0", "sha512": "sha512-RQpA+UpI6Tlpeedk5JStYk2DM/M3i5HqabI/yDbfj1xDu9bIz9kdoquVpHbh/wQjOJaOCbcgRH8iQcAUv8dRWQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": ["System.Runtime", "System.Runtime.Handles"], "net6.0": ["System.Runtime", "System.Runtime.Handles"], "net7.0": ["System.Runtime", "System.Runtime.Handles"], "net8.0": ["System.Runtime", "System.Runtime.Handles"], "net9.0": ["System.Runtime", "System.Runtime.Handles"], "netcoreapp1.0": ["System.Runtime", "System.Runtime.Handles"], "netcoreapp1.1": ["System.Runtime", "System.Runtime.Handles"], "netcoreapp2.0": ["System.Runtime", "System.Runtime.Handles"], "netcoreapp2.1": ["System.Runtime", "System.Runtime.Handles"], "netcoreapp2.2": ["System.Runtime", "System.Runtime.Handles"], "netcoreapp3.0": ["System.Runtime", "System.Runtime.Handles"], "netcoreapp3.1": ["System.Runtime", "System.Runtime.Handles"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": ["System.Runtime", "System.Runtime.Handles"], "netstandard1.4": ["System.Runtime", "System.Runtime.Handles"], "netstandard1.5": ["System.Runtime", "System.Runtime.Handles"], "netstandard1.6": ["System.Runtime", "System.Runtime.Handles"], "netstandard2.0": ["System.Runtime", "System.Runtime.Handles"], "netstandard2.1": ["System.Runtime", "System.Runtime.Handles"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "xunit", "id": "xunit", "version": "2.9.2", "sha512": "sha512-bs4ccplaqCT7+jdAJhtt75uKq9qA3Jeld1ugiOgGEGSnzq8gkoa0VUqNEKkMPkBwV5COlAllNJGtGBfgxoZDrA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net20": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net30": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net35": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net40": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net403": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net45": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net451": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net452": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net46": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net461": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net462": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net47": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net471": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net472": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net48": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net5.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net6.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net7.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net8.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net9.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netcoreapp1.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netcoreapp1.1": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netcoreapp2.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netcoreapp2.1": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netcoreapp2.2": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netcoreapp3.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netcoreapp3.1": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard1.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard1.1": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard1.2": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard1.3": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard1.4": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard1.5": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard1.6": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard2.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard2.1": ["xunit.core", "xunit.assert", "xunit.analyzers"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "xunit", "id": "xunit", "version": "2.9.3", "sha512": "sha512-3/ayVPC7NQWQENR5REbOgXYsbhoJsmpnxQa5pO4lxbjGbckOs62nsm4kLErzc8ng7V5Xz08uwVjMqaZGJiXCrg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net20": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net30": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net35": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net40": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net403": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net45": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net451": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net452": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net46": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net461": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net462": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net47": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net471": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net472": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net48": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net5.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net6.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net7.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net8.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "net9.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netcoreapp1.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netcoreapp1.1": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netcoreapp2.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netcoreapp2.1": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netcoreapp2.2": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netcoreapp3.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netcoreapp3.1": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard1.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard1.1": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard1.2": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard1.3": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard1.4": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard1.5": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard1.6": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard2.0": ["xunit.core", "xunit.assert", "xunit.analyzers"], "netstandard2.1": ["xunit.core", "xunit.assert", "xunit.analyzers"]}, "targeting_pack_overrides": [], "framework_list": []},
             {"name": "xunit.abstractions", "id": "xunit.abstractions", "version": "2.0.3", "sha512": "sha512-PKJri5f0qEQPFvgY6CZR9XG8JROlWSdC/ZYLkkDQuID++Egn+yWjB+Yf57AZ8U6GRlP7z33uDQ4/r5BZPer2JA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "xunit.analyzers", "id": "xunit.analyzers", "version": "1.17.0", "sha512": "sha512-36BC2a5gEL5TDXjkzhD8dK4toNcPGdwFb4tbIODwTp4eXhRS6BURiTclfZD2vFNTq4obCzPOdwnayhppP4qtUg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "xunit.assert", "id": "xunit.assert", "version": "2.9.2", "sha512": "sha512-huNfINLH5HnyiPImimKv7liIJJ2MgRdJYT7ky3464zR62SH7o9JjsgMiSZRXha46kgTCNjKSNN1VvctC+USp7w==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "xunit.core", "id": "xunit.core", "version": "2.9.2", "sha512": "sha512-kW48d7YL7ryT4zuWTjJN491cJwY8aYiIAxDaXJRebgMIw40PmlREiiaIz33QUFmglcfLlaoRyZcI4sl70kARiw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net20": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net30": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net35": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net40": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net403": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net45": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net451": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net452": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net46": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net461": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net462": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net47": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net471": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net472": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net48": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net5.0": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net6.0": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net7.0": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net8.0": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net9.0": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netcoreapp1.0": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netcoreapp1.1": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netcoreapp2.0": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netcoreapp2.1": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netcoreapp2.2": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netcoreapp3.0": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netcoreapp3.1": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netstandard": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netstandard1.0": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netstandard1.1": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netstandard1.2": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netstandard1.3": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netstandard1.4": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netstandard1.5": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netstandard1.6": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netstandard2.0": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netstandard2.1": ["xunit.extensibility.core", "xunit.extensibility.execution"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "xunit.extensibility.core", "id": "xunit.extensibility.core", "version": "2.9.2", "sha512": "sha512-sosk+dg5Cn4N9MKOjQ1wFTvfgduqiX1DLRZHEYXIaLOuTJbCJeXfn7XhAVDGY+zeB8aX3jCKL8BcDp4EJCdZXw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": ["xunit.abstractions"], "net451": ["xunit.abstractions"], "net452": ["xunit.abstractions"], "net46": ["xunit.abstractions"], "net461": ["xunit.abstractions"], "net462": ["xunit.abstractions"], "net47": ["xunit.abstractions"], "net471": ["xunit.abstractions"], "net472": ["xunit.abstractions"], "net48": ["xunit.abstractions"], "net5.0": ["xunit.abstractions"], "net6.0": ["xunit.abstractions"], "net7.0": ["xunit.abstractions"], "net8.0": ["xunit.abstractions"], "net9.0": ["xunit.abstractions"], "netcoreapp1.0": ["xunit.abstractions"], "netcoreapp1.1": ["xunit.abstractions"], "netcoreapp2.0": ["xunit.abstractions"], "netcoreapp2.1": ["xunit.abstractions"], "netcoreapp2.2": ["xunit.abstractions"], "netcoreapp3.0": ["xunit.abstractions"], "netcoreapp3.1": ["xunit.abstractions"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": ["xunit.abstractions"], "netstandard1.2": ["xunit.abstractions"], "netstandard1.3": ["xunit.abstractions"], "netstandard1.4": ["xunit.abstractions"], "netstandard1.5": ["xunit.abstractions"], "netstandard1.6": ["xunit.abstractions"], "netstandard2.0": ["xunit.abstractions"], "netstandard2.1": ["xunit.abstractions"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "xunit.extensibility.execution", "id": "xunit.extensibility.execution", "version": "2.9.2", "sha512": "sha512-oOnG3GsmntYZqZleKMHFlAxxCxn+ZQrcY7GEKDFP0Zpjx/sTE61cEblJk4Dkl4He0t02DN4gmJ4hsQDoLTdo7g==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": ["xunit.extensibility.core"], "net451": ["xunit.extensibility.core"], "net452": ["xunit.extensibility.core"], "net46": ["xunit.extensibility.core"], "net461": ["xunit.extensibility.core"], "net462": ["xunit.extensibility.core"], "net47": ["xunit.extensibility.core"], "net471": ["xunit.extensibility.core"], "net472": ["xunit.extensibility.core"], "net48": ["xunit.extensibility.core"], "net5.0": ["xunit.extensibility.core"], "net6.0": ["xunit.extensibility.core"], "net7.0": ["xunit.extensibility.core"], "net8.0": ["xunit.extensibility.core"], "net9.0": ["xunit.extensibility.core"], "netcoreapp1.0": ["xunit.extensibility.core"], "netcoreapp1.1": ["xunit.extensibility.core"], "netcoreapp2.0": ["xunit.extensibility.core"], "netcoreapp2.1": ["xunit.extensibility.core"], "netcoreapp2.2": ["xunit.extensibility.core"], "netcoreapp3.0": ["xunit.extensibility.core"], "netcoreapp3.1": ["xunit.extensibility.core"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": ["xunit.extensibility.core"], "netstandard1.2": ["xunit.extensibility.core"], "netstandard1.3": ["xunit.extensibility.core"], "netstandard1.4": ["xunit.extensibility.core"], "netstandard1.5": ["xunit.extensibility.core"], "netstandard1.6": ["xunit.extensibility.core"], "netstandard2.0": ["xunit.extensibility.core"], "netstandard2.1": ["xunit.extensibility.core"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "xunit.runner.utility", "id": "xunit.runner.utility", "version": "2.9.2", "sha512": "sha512-uXH4JqD2cHxrS6L/NXbaKPa+i0/RarJp68Fu+9NMVKJuDjVXDQFtnzgaP9gB+77GbjsJ14SWdJEDkh+D+UX7jw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": ["xunit.abstractions"], "net40": ["xunit.abstractions"], "net403": ["xunit.abstractions"], "net45": ["xunit.abstractions"], "net451": ["xunit.abstractions"], "net452": ["xunit.abstractions"], "net46": ["xunit.abstractions"], "net461": ["xunit.abstractions"], "net462": ["xunit.abstractions"], "net47": ["xunit.abstractions"], "net471": ["xunit.abstractions"], "net472": ["xunit.abstractions"], "net48": ["xunit.abstractions"], "net5.0": ["xunit.abstractions"], "net6.0": ["xunit.abstractions"], "net7.0": ["xunit.abstractions"], "net8.0": ["xunit.abstractions"], "net9.0": ["xunit.abstractions"], "netcoreapp1.0": ["xunit.abstractions"], "netcoreapp1.1": ["xunit.abstractions"], "netcoreapp2.0": ["xunit.abstractions"], "netcoreapp2.1": ["xunit.abstractions"], "netcoreapp2.2": ["xunit.abstractions"], "netcoreapp3.0": ["xunit.abstractions"], "netcoreapp3.1": ["xunit.abstractions"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": ["xunit.abstractions"], "netstandard1.2": ["xunit.abstractions"], "netstandard1.3": ["xunit.abstractions"], "netstandard1.4": ["xunit.abstractions"], "netstandard1.5": ["xunit.abstractions"], "netstandard1.6": ["xunit.abstractions"], "netstandard2.0": ["xunit.abstractions"], "netstandard2.1": ["xunit.abstractions"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "xunit.runner.visualstudio", "id": "xunit.runner.visualstudio", "version": "2.8.2", "sha512": "sha512-z+EzhXxLlgn/n7FQ5J0DJxbGns/1vx1kPJh4Uq+OPChRpdSy3x/MCqQ/jtkboc7BRMthz14k7pL0D3iq/e4d0A==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": ["Microsoft.TestPlatform.ObjectModel"], "net47": ["Microsoft.TestPlatform.ObjectModel"], "net471": ["Microsoft.TestPlatform.ObjectModel"], "net472": ["Microsoft.TestPlatform.ObjectModel"], "net48": ["Microsoft.TestPlatform.ObjectModel"], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "xunit.analyzers", "id": "xunit.analyzers", "version": "1.24.0", "sha512": "sha512-LiogS9RX6I4MHFN8V3dNgEQ4QJrtvtKq49h9k5NAOvmwcrbR1IeNMZvyuez3YITKAeF+ka9yVG3+OH6vApPB/A==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "xunit.assert", "id": "xunit.assert", "version": "2.9.3", "sha512": "sha512-wfqwCKAhSWGy9P/dPqDGSIBnPW3sUJ49MEfcTqNF+5BgJwjwtHb9SE7ajYZuR8ymTd8dwxoEGnlJHiejbgDv9w==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "xunit.core", "id": "xunit.core", "version": "2.9.3", "sha512": "sha512-cv2sO37qJkIbBL3fXDIn3EPQ2zK8LQ6FkMJNnn1xc9n8mo3ik0URA4MfUNCmwDDCx83ZiJeRrJ0y1ykasojNJg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net20": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net30": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net35": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net40": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net403": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net45": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net451": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net452": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net46": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net461": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net462": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net47": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net471": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net472": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net48": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net5.0": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net6.0": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net7.0": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net8.0": ["xunit.extensibility.core", "xunit.extensibility.execution"], "net9.0": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netcoreapp1.0": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netcoreapp1.1": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netcoreapp2.0": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netcoreapp2.1": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netcoreapp2.2": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netcoreapp3.0": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netcoreapp3.1": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netstandard": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netstandard1.0": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netstandard1.1": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netstandard1.2": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netstandard1.3": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netstandard1.4": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netstandard1.5": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netstandard1.6": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netstandard2.0": ["xunit.extensibility.core", "xunit.extensibility.execution"], "netstandard2.1": ["xunit.extensibility.core", "xunit.extensibility.execution"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "xunit.extensibility.core", "id": "xunit.extensibility.core", "version": "2.9.3", "sha512": "sha512-S0a+jmIF/DraKuJ+FfWbqXMwvpcKxjP3GdrQzz5pr3GYtgII2XfDdAhkU/5VIWqWon2R6Q31X/9sTGaU+koDaQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": ["xunit.abstractions"], "net451": ["xunit.abstractions"], "net452": ["xunit.abstractions"], "net46": ["xunit.abstractions"], "net461": ["xunit.abstractions"], "net462": ["xunit.abstractions"], "net47": ["xunit.abstractions"], "net471": ["xunit.abstractions"], "net472": ["xunit.abstractions"], "net48": ["xunit.abstractions"], "net5.0": ["xunit.abstractions"], "net6.0": ["xunit.abstractions"], "net7.0": ["xunit.abstractions"], "net8.0": ["xunit.abstractions"], "net9.0": ["xunit.abstractions"], "netcoreapp1.0": ["xunit.abstractions"], "netcoreapp1.1": ["xunit.abstractions"], "netcoreapp2.0": ["xunit.abstractions"], "netcoreapp2.1": ["xunit.abstractions"], "netcoreapp2.2": ["xunit.abstractions"], "netcoreapp3.0": ["xunit.abstractions"], "netcoreapp3.1": ["xunit.abstractions"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": ["xunit.abstractions"], "netstandard1.2": ["xunit.abstractions"], "netstandard1.3": ["xunit.abstractions"], "netstandard1.4": ["xunit.abstractions"], "netstandard1.5": ["xunit.abstractions"], "netstandard1.6": ["xunit.abstractions"], "netstandard2.0": ["xunit.abstractions"], "netstandard2.1": ["xunit.abstractions"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "xunit.extensibility.execution", "id": "xunit.extensibility.execution", "version": "2.9.3", "sha512": "sha512-IidoBSrGw/KhWzZsKXIcStohj/oRFZizbWeUv+0hOFLeMJMegSW5QoGNzmjQuF8BuRtCyPQQukWSYdNnnfPAkA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": ["xunit.extensibility.core"], "net451": ["xunit.extensibility.core"], "net452": ["xunit.extensibility.core"], "net46": ["xunit.extensibility.core"], "net461": ["xunit.extensibility.core"], "net462": ["xunit.extensibility.core"], "net47": ["xunit.extensibility.core"], "net471": ["xunit.extensibility.core"], "net472": ["xunit.extensibility.core"], "net48": ["xunit.extensibility.core"], "net5.0": ["xunit.extensibility.core"], "net6.0": ["xunit.extensibility.core"], "net7.0": ["xunit.extensibility.core"], "net8.0": ["xunit.extensibility.core"], "net9.0": ["xunit.extensibility.core"], "netcoreapp1.0": ["xunit.extensibility.core"], "netcoreapp1.1": ["xunit.extensibility.core"], "netcoreapp2.0": ["xunit.extensibility.core"], "netcoreapp2.1": ["xunit.extensibility.core"], "netcoreapp2.2": ["xunit.extensibility.core"], "netcoreapp3.0": ["xunit.extensibility.core"], "netcoreapp3.1": ["xunit.extensibility.core"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": ["xunit.extensibility.core"], "netstandard1.2": ["xunit.extensibility.core"], "netstandard1.3": ["xunit.extensibility.core"], "netstandard1.4": ["xunit.extensibility.core"], "netstandard1.5": ["xunit.extensibility.core"], "netstandard1.6": ["xunit.extensibility.core"], "netstandard2.0": ["xunit.extensibility.core"], "netstandard2.1": ["xunit.extensibility.core"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "xunit.runner.utility", "id": "xunit.runner.utility", "version": "2.9.3", "sha512": "sha512-L2zlPa7Ci/Awf5LdeTOvKOanev1bB6xV2Gxbrc+EDDN1hO/j0AIbu5PM8lXgkX69/8xaaex7zrxHZd8gcz2ilQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": ["xunit.abstractions"], "net40": ["xunit.abstractions"], "net403": ["xunit.abstractions"], "net45": ["xunit.abstractions"], "net451": ["xunit.abstractions"], "net452": ["xunit.abstractions"], "net46": ["xunit.abstractions"], "net461": ["xunit.abstractions"], "net462": ["xunit.abstractions"], "net47": ["xunit.abstractions"], "net471": ["xunit.abstractions"], "net472": ["xunit.abstractions"], "net48": ["xunit.abstractions"], "net5.0": ["xunit.abstractions"], "net6.0": ["xunit.abstractions"], "net7.0": ["xunit.abstractions"], "net8.0": ["xunit.abstractions"], "net9.0": ["xunit.abstractions"], "netcoreapp1.0": ["xunit.abstractions"], "netcoreapp1.1": ["xunit.abstractions"], "netcoreapp2.0": ["xunit.abstractions"], "netcoreapp2.1": ["xunit.abstractions"], "netcoreapp2.2": ["xunit.abstractions"], "netcoreapp3.0": ["xunit.abstractions"], "netcoreapp3.1": ["xunit.abstractions"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": ["xunit.abstractions"], "netstandard1.2": ["xunit.abstractions"], "netstandard1.3": ["xunit.abstractions"], "netstandard1.4": ["xunit.abstractions"], "netstandard1.5": ["xunit.abstractions"], "netstandard1.6": ["xunit.abstractions"], "netstandard2.0": ["xunit.abstractions"], "netstandard2.1": ["xunit.abstractions"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "xunit.runner.visualstudio", "id": "xunit.runner.visualstudio", "version": "3.1.5", "sha512": "sha512-b/tvN9kXtUd3wSSYbC80Ic6y/dYlYbNSvatYiv71iozPhXqM4EaOuHujkIJh85b+wY6dgf25k9ENSy8jN6mlvQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": ["Microsoft.TestPlatform.ObjectModel"], "net48": ["Microsoft.TestPlatform.ObjectModel"], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
         ],
     )
diff --git a/csharp/paket.main_extension.bzl b/csharp/paket.main_extension.bzl
index 6d356fb47cd..91f53cc20e3 100644
--- a/csharp/paket.main_extension.bzl
+++ b/csharp/paket.main_extension.bzl
@@ -2,8 +2,9 @@
 
 load(":paket.main.bzl", _main = "main")
 
-def _main_impl(_ctx):
+def _main_impl(module_ctx):
     _main()
+    return module_ctx.extension_metadata(reproducible = True)
 
 main_extension = module_extension(
     implementation = _main_impl,
diff --git a/csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md b/csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md
index 1b3c69fd4d0..a25c349e35e 100644
--- a/csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md
+++ b/csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md
@@ -1,3 +1,27 @@
+## 1.7.51
+
+No user-facing changes.
+
+## 1.7.50
+
+No user-facing changes.
+
+## 1.7.49
+
+No user-facing changes.
+
+## 1.7.48
+
+No user-facing changes.
+
+## 1.7.47
+
+No user-facing changes.
+
+## 1.7.46
+
+No user-facing changes.
+
 ## 1.7.45
 
 No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.46.md b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.46.md
new file mode 100644
index 00000000000..b6482a9a030
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.46.md
@@ -0,0 +1,3 @@
+## 1.7.46
+
+No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.47.md b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.47.md
new file mode 100644
index 00000000000..afc26600b73
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.47.md
@@ -0,0 +1,3 @@
+## 1.7.47
+
+No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.48.md b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.48.md
new file mode 100644
index 00000000000..5f90b4d6419
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.48.md
@@ -0,0 +1,3 @@
+## 1.7.48
+
+No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.49.md b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.49.md
new file mode 100644
index 00000000000..431bff76c0b
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.49.md
@@ -0,0 +1,3 @@
+## 1.7.49
+
+No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.50.md b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.50.md
new file mode 100644
index 00000000000..187bfe4d01f
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.50.md
@@ -0,0 +1,3 @@
+## 1.7.50
+
+No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.51.md b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.51.md
new file mode 100644
index 00000000000..ec2d4e2bdcc
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.51.md
@@ -0,0 +1,3 @@
+## 1.7.51
+
+No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/lib/codeql-pack.release.yml b/csharp/ql/campaigns/Solorigate/lib/codeql-pack.release.yml
index 5a84df10183..26376c0cebb 100644
--- a/csharp/ql/campaigns/Solorigate/lib/codeql-pack.release.yml
+++ b/csharp/ql/campaigns/Solorigate/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.7.45
+lastReleaseVersion: 1.7.51
diff --git a/csharp/ql/campaigns/Solorigate/lib/qlpack.yml b/csharp/ql/campaigns/Solorigate/lib/qlpack.yml
index c6e17a64adc..7877ad717e2 100644
--- a/csharp/ql/campaigns/Solorigate/lib/qlpack.yml
+++ b/csharp/ql/campaigns/Solorigate/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-solorigate-all
-version: 1.7.46-dev
+version: 1.7.52-dev
 groups:
   - csharp
   - solorigate
diff --git a/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md b/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md
index 1b3c69fd4d0..a25c349e35e 100644
--- a/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md
+++ b/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md
@@ -1,3 +1,27 @@
+## 1.7.51
+
+No user-facing changes.
+
+## 1.7.50
+
+No user-facing changes.
+
+## 1.7.49
+
+No user-facing changes.
+
+## 1.7.48
+
+No user-facing changes.
+
+## 1.7.47
+
+No user-facing changes.
+
+## 1.7.46
+
+No user-facing changes.
+
 ## 1.7.45
 
 No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.46.md b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.46.md
new file mode 100644
index 00000000000..b6482a9a030
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.46.md
@@ -0,0 +1,3 @@
+## 1.7.46
+
+No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.47.md b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.47.md
new file mode 100644
index 00000000000..afc26600b73
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.47.md
@@ -0,0 +1,3 @@
+## 1.7.47
+
+No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.48.md b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.48.md
new file mode 100644
index 00000000000..5f90b4d6419
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.48.md
@@ -0,0 +1,3 @@
+## 1.7.48
+
+No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.49.md b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.49.md
new file mode 100644
index 00000000000..431bff76c0b
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.49.md
@@ -0,0 +1,3 @@
+## 1.7.49
+
+No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.50.md b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.50.md
new file mode 100644
index 00000000000..187bfe4d01f
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.50.md
@@ -0,0 +1,3 @@
+## 1.7.50
+
+No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.51.md b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.51.md
new file mode 100644
index 00000000000..ec2d4e2bdcc
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.51.md
@@ -0,0 +1,3 @@
+## 1.7.51
+
+No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/src/codeql-pack.release.yml b/csharp/ql/campaigns/Solorigate/src/codeql-pack.release.yml
index 5a84df10183..26376c0cebb 100644
--- a/csharp/ql/campaigns/Solorigate/src/codeql-pack.release.yml
+++ b/csharp/ql/campaigns/Solorigate/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.7.45
+lastReleaseVersion: 1.7.51
diff --git a/csharp/ql/campaigns/Solorigate/src/qlpack.yml b/csharp/ql/campaigns/Solorigate/src/qlpack.yml
index 529cd400b6c..6427ecbb935 100644
--- a/csharp/ql/campaigns/Solorigate/src/qlpack.yml
+++ b/csharp/ql/campaigns/Solorigate/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-solorigate-queries
-version: 1.7.46-dev
+version: 1.7.52-dev
 groups:
   - csharp
   - solorigate
diff --git a/csharp/ql/consistency-queries/CfgConsistency.ql b/csharp/ql/consistency-queries/CfgConsistency.ql
index 3caf64f9aec..d7f0c091538 100644
--- a/csharp/ql/consistency-queries/CfgConsistency.ql
+++ b/csharp/ql/consistency-queries/CfgConsistency.ql
@@ -29,7 +29,7 @@ predicate bbSuccInconsistency(ControlFlowElement pred, ControlFlowElement succ)
     succBB.getFirstNode() = succ.getAControlFlowNode()
   ) and
   not exists(PreBasicBlock predBB, PreBasicBlock succBB |
-    predBB.getLastElement() = pred and
+    predBB.getLastNode() = pred and
     succBB = predBB.getASuccessor() and
     succBB.getFirstElement() = succ
   )
@@ -41,12 +41,12 @@ predicate bbIntraSuccInconsistency(ControlFlowElement pred, ControlFlowElement s
     succ.getAControlFlowNode() = bb.getNode(i + 1)
   ) and
   not exists(PreBasicBlock bb |
-    bb.getLastElement() = pred and
+    bb.getLastNode() = pred and
     bb.getASuccessor().getFirstElement() = succ
   ) and
   not exists(PreBasicBlock bb, int i |
-    bb.getElement(i) = pred and
-    bb.getElement(i + 1) = succ
+    bb.getNode(i) = pred and
+    bb.getNode(i + 1) = succ
   )
 }
 
diff --git a/csharp/ql/integration-tests/all-platforms/autobuild/global.json b/csharp/ql/integration-tests/all-platforms/autobuild/global.json
index 7a0e39d71fa..d488208a2a7 100644
--- a/csharp/ql/integration-tests/all-platforms/autobuild/global.json
+++ b/csharp/ql/integration-tests/all-platforms/autobuild/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "9.0.100"
+        "version": "9.0.304"
     }
-}
\ No newline at end of file
+}
diff --git a/csharp/ql/integration-tests/all-platforms/binlog/global.json b/csharp/ql/integration-tests/all-platforms/binlog/global.json
index 76474f06d04..d488208a2a7 100644
--- a/csharp/ql/integration-tests/all-platforms/binlog/global.json
+++ b/csharp/ql/integration-tests/all-platforms/binlog/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "9.0.100"
+        "version": "9.0.304"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/binlog_multiple/global.json b/csharp/ql/integration-tests/all-platforms/binlog_multiple/global.json
index 76474f06d04..d488208a2a7 100644
--- a/csharp/ql/integration-tests/all-platforms/binlog_multiple/global.json
+++ b/csharp/ql/integration-tests/all-platforms/binlog_multiple/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "9.0.100"
+        "version": "9.0.304"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/blazor/BlazorTest/global.json b/csharp/ql/integration-tests/all-platforms/blazor/BlazorTest/global.json
index 7a0e39d71fa..d488208a2a7 100644
--- a/csharp/ql/integration-tests/all-platforms/blazor/BlazorTest/global.json
+++ b/csharp/ql/integration-tests/all-platforms/blazor/BlazorTest/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "9.0.100"
+        "version": "9.0.304"
     }
-}
\ No newline at end of file
+}
diff --git a/csharp/ql/integration-tests/all-platforms/blazor/XSS.expected b/csharp/ql/integration-tests/all-platforms/blazor/XSS.expected
index 795e9ad7de0..2129be6da47 100644
--- a/csharp/ql/integration-tests/all-platforms/blazor/XSS.expected
+++ b/csharp/ql/integration-tests/all-platforms/blazor/XSS.expected
@@ -3,8 +3,8 @@
 | BlazorTest/Components/Pages/TestPage.razor:11:48:11:55 | access to property UrlParam | BlazorTest/Components/Pages/TestPage.razor:11:48:11:55 | access to property UrlParam | BlazorTest/Components/Pages/TestPage.razor:11:48:11:55 | access to property UrlParam | $@ flows to here and is written to HTML or JavaScript. | BlazorTest/Components/Pages/TestPage.razor:11:48:11:55 | access to property UrlParam | User-provided value |
 | BlazorTest/Components/Pages/TestPage.razor:20:60:20:69 | access to property QueryParam | BlazorTest/Components/Pages/TestPage.razor:20:60:20:69 | access to property QueryParam | BlazorTest/Components/Pages/TestPage.razor:20:60:20:69 | access to property QueryParam | $@ flows to here and is written to HTML or JavaScript. | BlazorTest/Components/Pages/TestPage.razor:20:60:20:69 | access to property QueryParam | User-provided value |
 edges
-| BlazorTest/Components/Pages/TestPage.razor:85:23:85:32 | access to property QueryParam : String | BlazorTest/obj/Debug/net9.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components_Pages_TestPage_razor.g.cs:569:16:577:13 | call to method TypeCheck<String> : String | provenance | Src:MaD:2 MaD:3 |
-| BlazorTest/obj/Debug/net9.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components_Pages_TestPage_razor.g.cs:569:16:577:13 | call to method TypeCheck<String> : String | BlazorTest/Components/MyOutput.razor:5:53:5:57 | access to property Value | provenance | Sink:MaD:1 |
+| BlazorTest/Components/Pages/TestPage.razor:85:23:85:32 | access to property QueryParam : String | BlazorTest/obj/Debug/net9.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components_Pages_TestPage_razor.g.cs:553:16:561:13 | call to method TypeCheck<String> : String | provenance | Src:MaD:2 MaD:3 |
+| BlazorTest/obj/Debug/net9.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components_Pages_TestPage_razor.g.cs:553:16:561:13 | call to method TypeCheck<String> : String | BlazorTest/Components/MyOutput.razor:5:53:5:57 | access to property Value | provenance | Sink:MaD:1 |
 models
 | 1 | Sink: Microsoft.AspNetCore.Components; MarkupString; false; MarkupString; (System.String); ; Argument[0]; html-injection; manual |
 | 2 | Source: Microsoft.AspNetCore.Components; SupplyParameterFromQueryAttribute; false; ; ; Attribute.Getter; ReturnValue; remote; manual |
@@ -14,5 +14,5 @@ nodes
 | BlazorTest/Components/Pages/TestPage.razor:11:48:11:55 | access to property UrlParam | semmle.label | access to property UrlParam |
 | BlazorTest/Components/Pages/TestPage.razor:20:60:20:69 | access to property QueryParam | semmle.label | access to property QueryParam |
 | BlazorTest/Components/Pages/TestPage.razor:85:23:85:32 | access to property QueryParam : String | semmle.label | access to property QueryParam : String |
-| BlazorTest/obj/Debug/net9.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components_Pages_TestPage_razor.g.cs:569:16:577:13 | call to method TypeCheck<String> : String | semmle.label | call to method TypeCheck<String> : String |
+| BlazorTest/obj/Debug/net9.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components_Pages_TestPage_razor.g.cs:553:16:561:13 | call to method TypeCheck<String> : String | semmle.label | call to method TypeCheck<String> : String |
 subpaths
diff --git a/csharp/ql/integration-tests/all-platforms/blazor_build_mode_none/BlazorTest/global.json b/csharp/ql/integration-tests/all-platforms/blazor_build_mode_none/BlazorTest/global.json
index 548d37935ed..d488208a2a7 100644
--- a/csharp/ql/integration-tests/all-platforms/blazor_build_mode_none/BlazorTest/global.json
+++ b/csharp/ql/integration-tests/all-platforms/blazor_build_mode_none/BlazorTest/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "9.0.300"
+        "version": "9.0.304"
     }
-}
\ No newline at end of file
+}
diff --git a/csharp/ql/integration-tests/all-platforms/conditional_compilation/global.json b/csharp/ql/integration-tests/all-platforms/conditional_compilation/global.json
index 76474f06d04..d488208a2a7 100644
--- a/csharp/ql/integration-tests/all-platforms/conditional_compilation/global.json
+++ b/csharp/ql/integration-tests/all-platforms/conditional_compilation/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "9.0.100"
+        "version": "9.0.304"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/cshtml/global.json b/csharp/ql/integration-tests/all-platforms/cshtml/global.json
index 76474f06d04..d488208a2a7 100644
--- a/csharp/ql/integration-tests/all-platforms/cshtml/global.json
+++ b/csharp/ql/integration-tests/all-platforms/cshtml/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "9.0.100"
+        "version": "9.0.304"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/cshtml_standalone/global.json b/csharp/ql/integration-tests/all-platforms/cshtml_standalone/global.json
index 76474f06d04..d488208a2a7 100644
--- a/csharp/ql/integration-tests/all-platforms/cshtml_standalone/global.json
+++ b/csharp/ql/integration-tests/all-platforms/cshtml_standalone/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "9.0.100"
+        "version": "9.0.304"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/cshtml_standalone_disabled/global.json b/csharp/ql/integration-tests/all-platforms/cshtml_standalone_disabled/global.json
index 76474f06d04..d488208a2a7 100644
--- a/csharp/ql/integration-tests/all-platforms/cshtml_standalone_disabled/global.json
+++ b/csharp/ql/integration-tests/all-platforms/cshtml_standalone_disabled/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "9.0.100"
+        "version": "9.0.304"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/cshtml_standalone_flowsteps/global.json b/csharp/ql/integration-tests/all-platforms/cshtml_standalone_flowsteps/global.json
index 76474f06d04..d488208a2a7 100644
--- a/csharp/ql/integration-tests/all-platforms/cshtml_standalone_flowsteps/global.json
+++ b/csharp/ql/integration-tests/all-platforms/cshtml_standalone_flowsteps/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "9.0.100"
+        "version": "9.0.304"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/diag_dotnet_incompatible/global.json b/csharp/ql/integration-tests/all-platforms/diag_dotnet_incompatible/global.json
index 76474f06d04..d488208a2a7 100644
--- a/csharp/ql/integration-tests/all-platforms/diag_dotnet_incompatible/global.json
+++ b/csharp/ql/integration-tests/all-platforms/diag_dotnet_incompatible/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "9.0.100"
+        "version": "9.0.304"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/diag_missing_project_files/global.json b/csharp/ql/integration-tests/all-platforms/diag_missing_project_files/global.json
index 76474f06d04..d488208a2a7 100644
--- a/csharp/ql/integration-tests/all-platforms/diag_missing_project_files/global.json
+++ b/csharp/ql/integration-tests/all-platforms/diag_missing_project_files/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "9.0.100"
+        "version": "9.0.304"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/diag_missing_xamarin_sdk/global.json b/csharp/ql/integration-tests/all-platforms/diag_missing_xamarin_sdk/global.json
index 76474f06d04..d488208a2a7 100644
--- a/csharp/ql/integration-tests/all-platforms/diag_missing_xamarin_sdk/global.json
+++ b/csharp/ql/integration-tests/all-platforms/diag_missing_xamarin_sdk/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "9.0.100"
+        "version": "9.0.304"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/diag_recursive_generics/global.json b/csharp/ql/integration-tests/all-platforms/diag_recursive_generics/global.json
index 76474f06d04..d488208a2a7 100644
--- a/csharp/ql/integration-tests/all-platforms/diag_recursive_generics/global.json
+++ b/csharp/ql/integration-tests/all-platforms/diag_recursive_generics/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "9.0.100"
+        "version": "9.0.304"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/dotnet_build/global.json b/csharp/ql/integration-tests/all-platforms/dotnet_build/global.json
index 76474f06d04..d488208a2a7 100644
--- a/csharp/ql/integration-tests/all-platforms/dotnet_build/global.json
+++ b/csharp/ql/integration-tests/all-platforms/dotnet_build/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "9.0.100"
+        "version": "9.0.304"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/dotnet_no_args_inject/global.json b/csharp/ql/integration-tests/all-platforms/dotnet_no_args_inject/global.json
index 76474f06d04..d488208a2a7 100644
--- a/csharp/ql/integration-tests/all-platforms/dotnet_no_args_inject/global.json
+++ b/csharp/ql/integration-tests/all-platforms/dotnet_no_args_inject/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "9.0.100"
+        "version": "9.0.304"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/dotnet_pack/global.json b/csharp/ql/integration-tests/all-platforms/dotnet_pack/global.json
index 76474f06d04..d488208a2a7 100644
--- a/csharp/ql/integration-tests/all-platforms/dotnet_pack/global.json
+++ b/csharp/ql/integration-tests/all-platforms/dotnet_pack/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "9.0.100"
+        "version": "9.0.304"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/dotnet_publish/global.json b/csharp/ql/integration-tests/all-platforms/dotnet_publish/global.json
index 76474f06d04..d488208a2a7 100644
--- a/csharp/ql/integration-tests/all-platforms/dotnet_publish/global.json
+++ b/csharp/ql/integration-tests/all-platforms/dotnet_publish/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "9.0.100"
+        "version": "9.0.304"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/dotnet_run/global.json b/csharp/ql/integration-tests/all-platforms/dotnet_run/global.json
index 76474f06d04..d488208a2a7 100644
--- a/csharp/ql/integration-tests/all-platforms/dotnet_run/global.json
+++ b/csharp/ql/integration-tests/all-platforms/dotnet_run/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "9.0.100"
+        "version": "9.0.304"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/source_generator/global.json b/csharp/ql/integration-tests/all-platforms/source_generator/global.json
index 76474f06d04..d488208a2a7 100644
--- a/csharp/ql/integration-tests/all-platforms/source_generator/global.json
+++ b/csharp/ql/integration-tests/all-platforms/source_generator/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "9.0.100"
+        "version": "9.0.304"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/standalone/DatabaseQualityDiagnostics.expected b/csharp/ql/integration-tests/all-platforms/standalone/DatabaseQualityDiagnostics.expected
index b26e2207946..e9b4f2e2428 100644
--- a/csharp/ql/integration-tests/all-platforms/standalone/DatabaseQualityDiagnostics.expected
+++ b/csharp/ql/integration-tests/all-platforms/standalone/DatabaseQualityDiagnostics.expected
@@ -1,6 +1,6 @@
 diagnosticAttributes
-| Scanning C# code completed successfully, but the scan encountered issues. This may be caused by problems identifying dependencies or use of generated source code, among other reasons -- see other CodeQL diagnostics reported on the CodeQL status page for more details of possible causes. Addressing these warnings is advisable to avoid false-positive or missing results. If they cannot be addressed, consider scanning C# using either the `autobuild` or `manual` [build modes](https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages#comparison-of-the-build-modes). | visibilityCliSummaryTable | true |
-| Scanning C# code completed successfully, but the scan encountered issues. This may be caused by problems identifying dependencies or use of generated source code, among other reasons -- see other CodeQL diagnostics reported on the CodeQL status page for more details of possible causes. Addressing these warnings is advisable to avoid false-positive or missing results. If they cannot be addressed, consider scanning C# using either the `autobuild` or `manual` [build modes](https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages#comparison-of-the-build-modes). | visibilityStatusPage | true |
-| Scanning C# code completed successfully, but the scan encountered issues. This may be caused by problems identifying dependencies or use of generated source code, among other reasons -- see other CodeQL diagnostics reported on the CodeQL status page for more details of possible causes. Addressing these warnings is advisable to avoid false-positive or missing results. If they cannot be addressed, consider scanning C# using either the `autobuild` or `manual` [build modes](https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages#comparison-of-the-build-modes). | visibilityTelemetry | true |
+| Scanning C# code completed successfully, but the scan encountered issues. This may be caused by problems identifying dependencies or use of generated source code. Some metrics of the database quality are: Percentage of calls with call target: 25 % (threshold 85 %). Percentage of expressions with known type: 58 % (threshold 85 %). Ideally these metrics should be above their thresholds. Addressing these issues is advisable to avoid false-positives or missing results. If they cannot be addressed, consider scanning C# using either the `autobuild` or `manual` [build modes](https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages#comparison-of-the-build-modes). | visibilityCliSummaryTable | true |
+| Scanning C# code completed successfully, but the scan encountered issues. This may be caused by problems identifying dependencies or use of generated source code. Some metrics of the database quality are: Percentage of calls with call target: 25 % (threshold 85 %). Percentage of expressions with known type: 58 % (threshold 85 %). Ideally these metrics should be above their thresholds. Addressing these issues is advisable to avoid false-positives or missing results. If they cannot be addressed, consider scanning C# using either the `autobuild` or `manual` [build modes](https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages#comparison-of-the-build-modes). | visibilityStatusPage | true |
+| Scanning C# code completed successfully, but the scan encountered issues. This may be caused by problems identifying dependencies or use of generated source code. Some metrics of the database quality are: Percentage of calls with call target: 25 % (threshold 85 %). Percentage of expressions with known type: 58 % (threshold 85 %). Ideally these metrics should be above their thresholds. Addressing these issues is advisable to avoid false-positives or missing results. If they cannot be addressed, consider scanning C# using either the `autobuild` or `manual` [build modes](https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages#comparison-of-the-build-modes). | visibilityTelemetry | true |
 #select
-| Scanning C# code completed successfully, but the scan encountered issues. This may be caused by problems identifying dependencies or use of generated source code, among other reasons -- see other CodeQL diagnostics reported on the CodeQL status page for more details of possible causes. Addressing these warnings is advisable to avoid false-positive or missing results. If they cannot be addressed, consider scanning C# using either the `autobuild` or `manual` [build modes](https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages#comparison-of-the-build-modes). | Scanning C# code completed successfully, but the scan encountered issues. This may be caused by problems identifying dependencies or use of generated source code, among other reasons -- see other CodeQL diagnostics reported on the CodeQL status page for more details of possible causes. Addressing these warnings is advisable to avoid false-positive or missing results. If they cannot be addressed, consider scanning C# using either the `autobuild` or `manual` [build modes](https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages#comparison-of-the-build-modes). | 1 |
+| Scanning C# code completed successfully, but the scan encountered issues. This may be caused by problems identifying dependencies or use of generated source code. Some metrics of the database quality are: Percentage of calls with call target: 25 % (threshold 85 %). Percentage of expressions with known type: 58 % (threshold 85 %). Ideally these metrics should be above their thresholds. Addressing these issues is advisable to avoid false-positives or missing results. If they cannot be addressed, consider scanning C# using either the `autobuild` or `manual` [build modes](https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages#comparison-of-the-build-modes). | Scanning C# code completed successfully, but the scan encountered issues. This may be caused by problems identifying dependencies or use of generated source code. Some metrics of the database quality are: Percentage of calls with call target: 25 % (threshold 85 %). Percentage of expressions with known type: 58 % (threshold 85 %). Ideally these metrics should be above their thresholds. Addressing these issues is advisable to avoid false-positives or missing results. If they cannot be addressed, consider scanning C# using either the `autobuild` or `manual` [build modes](https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages#comparison-of-the-build-modes). | 1 |
diff --git a/csharp/ql/integration-tests/all-platforms/standalone/global.json b/csharp/ql/integration-tests/all-platforms/standalone/global.json
index 76474f06d04..d488208a2a7 100644
--- a/csharp/ql/integration-tests/all-platforms/standalone/global.json
+++ b/csharp/ql/integration-tests/all-platforms/standalone/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "9.0.100"
+        "version": "9.0.304"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/standalone_buildless_option/global.json b/csharp/ql/integration-tests/all-platforms/standalone_buildless_option/global.json
index 76474f06d04..d488208a2a7 100644
--- a/csharp/ql/integration-tests/all-platforms/standalone_buildless_option/global.json
+++ b/csharp/ql/integration-tests/all-platforms/standalone_buildless_option/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "9.0.100"
+        "version": "9.0.304"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/standalone_dependencies_net48/global.json b/csharp/ql/integration-tests/all-platforms/standalone_dependencies_net48/global.json
index 65324522984..4c6e2601f69 100644
--- a/csharp/ql/integration-tests/all-platforms/standalone_dependencies_net48/global.json
+++ b/csharp/ql/integration-tests/all-platforms/standalone_dependencies_net48/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "9.0.100"
+    "version": "9.0.304"
   }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/standalone_resx/global.json b/csharp/ql/integration-tests/all-platforms/standalone_resx/global.json
index 76474f06d04..d488208a2a7 100644
--- a/csharp/ql/integration-tests/all-platforms/standalone_resx/global.json
+++ b/csharp/ql/integration-tests/all-platforms/standalone_resx/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "9.0.100"
+        "version": "9.0.304"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/standalone_resx/test.py b/csharp/ql/integration-tests/all-platforms/standalone_resx/test.py
index ef1399f4cb2..d799c830dd9 100644
--- a/csharp/ql/integration-tests/all-platforms/standalone_resx/test.py
+++ b/csharp/ql/integration-tests/all-platforms/standalone_resx/test.py
@@ -2,5 +2,9 @@ import os
 
 
 def test(codeql, csharp):
+    # Making sure the reachability test of `nuget.org` succeeds:
+    os.environ["CODEQL_EXTRACTOR_CSHARP_BUILDLESS_NUGET_FEEDS_CHECK_FALLBACK_TIMEOUT"] = "1000"
+    os.environ["CODEQL_EXTRACTOR_CSHARP_BUILDLESS_NUGET_FEEDS_CHECK_FALLBACK_LIMIT"] = "5"
+
     os.environ["CODEQL_EXTRACTOR_CSHARP_BUILDLESS_EXTRACT_RESOURCES"] = "true"
     codeql.database.create(build_mode="none")
diff --git a/csharp/ql/integration-tests/all-platforms/standalone_winforms/Assemblies.expected b/csharp/ql/integration-tests/all-platforms/standalone_winforms/Assemblies.expected
index cee8db1f756..d973f6d8be4 100644
--- a/csharp/ql/integration-tests/all-platforms/standalone_winforms/Assemblies.expected
+++ b/csharp/ql/integration-tests/all-platforms/standalone_winforms/Assemblies.expected
@@ -1,49 +1,49 @@
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/Accessibility.dll:0:0:0:0 | Accessibility, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/Microsoft.VisualBasic.Forms.dll:0:0:0:0 | Microsoft.VisualBasic.Forms, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/Microsoft.VisualBasic.dll:0:0:0:0 | Microsoft.VisualBasic, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/Microsoft.Win32.Registry.AccessControl.dll:0:0:0:0 | Microsoft.Win32.Registry.AccessControl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/Microsoft.Win32.SystemEvents.dll:0:0:0:0 | Microsoft.Win32.SystemEvents, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/PresentationCore.dll:0:0:0:0 | PresentationCore, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/PresentationFramework.Aero2.dll:0:0:0:0 | PresentationFramework.Aero2, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/PresentationFramework.Aero.dll:0:0:0:0 | PresentationFramework.Aero, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/PresentationFramework.AeroLite.dll:0:0:0:0 | PresentationFramework.AeroLite, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/PresentationFramework.Classic.dll:0:0:0:0 | PresentationFramework.Classic, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/PresentationFramework.Luna.dll:0:0:0:0 | PresentationFramework.Luna, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/PresentationFramework.Royale.dll:0:0:0:0 | PresentationFramework.Royale, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/PresentationFramework.dll:0:0:0:0 | PresentationFramework, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/PresentationUI.dll:0:0:0:0 | PresentationUI, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/ReachFramework.dll:0:0:0:0 | ReachFramework, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.CodeDom.dll:0:0:0:0 | System.CodeDom, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Configuration.ConfigurationManager.dll:0:0:0:0 | System.Configuration.ConfigurationManager, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Design.dll:0:0:0:0 | System.Design, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Diagnostics.EventLog.dll:0:0:0:0 | System.Diagnostics.EventLog, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Diagnostics.PerformanceCounter.dll:0:0:0:0 | System.Diagnostics.PerformanceCounter, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.DirectoryServices.dll:0:0:0:0 | System.DirectoryServices, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Drawing.Common.dll:0:0:0:0 | System.Drawing.Common, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Drawing.Design.dll:0:0:0:0 | System.Drawing.Design, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Drawing.dll:0:0:0:0 | System.Drawing, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Formats.Nrbf.dll:0:0:0:0 | System.Formats.Nrbf, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.IO.Packaging.dll:0:0:0:0 | System.IO.Packaging, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Printing.dll:0:0:0:0 | System.Printing, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Private.Windows.Core.dll:0:0:0:0 | System.Private.Windows.Core, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Resources.Extensions.dll:0:0:0:0 | System.Resources.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.Pkcs.dll:0:0:0:0 | System.Security.Cryptography.Pkcs, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.ProtectedData.dll:0:0:0:0 | System.Security.Cryptography.ProtectedData, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.Xml.dll:0:0:0:0 | System.Security.Cryptography.Xml, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Security.Permissions.dll:0:0:0:0 | System.Security.Permissions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Threading.AccessControl.dll:0:0:0:0 | System.Threading.AccessControl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Windows.Controls.Ribbon.dll:0:0:0:0 | System.Windows.Controls.Ribbon, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Windows.Extensions.dll:0:0:0:0 | System.Windows.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Windows.Forms.Design.Editors.dll:0:0:0:0 | System.Windows.Forms.Design.Editors, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Windows.Forms.Design.dll:0:0:0:0 | System.Windows.Forms.Design, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Windows.Forms.Primitives.dll:0:0:0:0 | System.Windows.Forms.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Windows.Forms.dll:0:0:0:0 | System.Windows.Forms, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Windows.Input.Manipulations.dll:0:0:0:0 | System.Windows.Input.Manipulations, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Windows.Presentation.dll:0:0:0:0 | System.Windows.Presentation, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Xaml.dll:0:0:0:0 | System.Xaml, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/UIAutomationClient.dll:0:0:0:0 | UIAutomationClient, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/UIAutomationClientSideProviders.dll:0:0:0:0 | UIAutomationClientSideProviders, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/UIAutomationProvider.dll:0:0:0:0 | UIAutomationProvider, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/UIAutomationTypes.dll:0:0:0:0 | UIAutomationTypes, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/WindowsBase.dll:0:0:0:0 | WindowsBase, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/WindowsFormsIntegration.dll:0:0:0:0 | WindowsFormsIntegration, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/Accessibility.dll:0:0:0:0 | Accessibility, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/Microsoft.VisualBasic.Forms.dll:0:0:0:0 | Microsoft.VisualBasic.Forms, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/Microsoft.VisualBasic.dll:0:0:0:0 | Microsoft.VisualBasic, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/Microsoft.Win32.Registry.AccessControl.dll:0:0:0:0 | Microsoft.Win32.Registry.AccessControl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/Microsoft.Win32.SystemEvents.dll:0:0:0:0 | Microsoft.Win32.SystemEvents, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/PresentationCore.dll:0:0:0:0 | PresentationCore, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/PresentationFramework.Aero2.dll:0:0:0:0 | PresentationFramework.Aero2, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/PresentationFramework.Aero.dll:0:0:0:0 | PresentationFramework.Aero, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/PresentationFramework.AeroLite.dll:0:0:0:0 | PresentationFramework.AeroLite, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/PresentationFramework.Classic.dll:0:0:0:0 | PresentationFramework.Classic, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/PresentationFramework.Luna.dll:0:0:0:0 | PresentationFramework.Luna, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/PresentationFramework.Royale.dll:0:0:0:0 | PresentationFramework.Royale, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/PresentationFramework.dll:0:0:0:0 | PresentationFramework, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/PresentationUI.dll:0:0:0:0 | PresentationUI, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/ReachFramework.dll:0:0:0:0 | ReachFramework, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.CodeDom.dll:0:0:0:0 | System.CodeDom, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.Configuration.ConfigurationManager.dll:0:0:0:0 | System.Configuration.ConfigurationManager, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.Design.dll:0:0:0:0 | System.Design, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.Diagnostics.EventLog.dll:0:0:0:0 | System.Diagnostics.EventLog, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.Diagnostics.PerformanceCounter.dll:0:0:0:0 | System.Diagnostics.PerformanceCounter, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.DirectoryServices.dll:0:0:0:0 | System.DirectoryServices, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.Drawing.Common.dll:0:0:0:0 | System.Drawing.Common, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.Drawing.Design.dll:0:0:0:0 | System.Drawing.Design, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.Drawing.dll:0:0:0:0 | System.Drawing, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.Formats.Nrbf.dll:0:0:0:0 | System.Formats.Nrbf, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.IO.Packaging.dll:0:0:0:0 | System.IO.Packaging, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.Printing.dll:0:0:0:0 | System.Printing, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.Private.Windows.Core.dll:0:0:0:0 | System.Private.Windows.Core, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.Resources.Extensions.dll:0:0:0:0 | System.Resources.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.Security.Cryptography.Pkcs.dll:0:0:0:0 | System.Security.Cryptography.Pkcs, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.Security.Cryptography.ProtectedData.dll:0:0:0:0 | System.Security.Cryptography.ProtectedData, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.Security.Cryptography.Xml.dll:0:0:0:0 | System.Security.Cryptography.Xml, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.Security.Permissions.dll:0:0:0:0 | System.Security.Permissions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.Threading.AccessControl.dll:0:0:0:0 | System.Threading.AccessControl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.Windows.Controls.Ribbon.dll:0:0:0:0 | System.Windows.Controls.Ribbon, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.Windows.Extensions.dll:0:0:0:0 | System.Windows.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.Windows.Forms.Design.Editors.dll:0:0:0:0 | System.Windows.Forms.Design.Editors, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.Windows.Forms.Design.dll:0:0:0:0 | System.Windows.Forms.Design, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.Windows.Forms.Primitives.dll:0:0:0:0 | System.Windows.Forms.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.Windows.Forms.dll:0:0:0:0 | System.Windows.Forms, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.Windows.Input.Manipulations.dll:0:0:0:0 | System.Windows.Input.Manipulations, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.Windows.Presentation.dll:0:0:0:0 | System.Windows.Presentation, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.Xaml.dll:0:0:0:0 | System.Xaml, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/UIAutomationClient.dll:0:0:0:0 | UIAutomationClient, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/UIAutomationClientSideProviders.dll:0:0:0:0 | UIAutomationClientSideProviders, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/UIAutomationProvider.dll:0:0:0:0 | UIAutomationProvider, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/UIAutomationTypes.dll:0:0:0:0 | UIAutomationTypes, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/WindowsBase.dll:0:0:0:0 | WindowsBase, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/WindowsFormsIntegration.dll:0:0:0:0 | WindowsFormsIntegration, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
diff --git a/csharp/ql/integration-tests/all-platforms/standalone_winforms/global.json b/csharp/ql/integration-tests/all-platforms/standalone_winforms/global.json
index 76474f06d04..d488208a2a7 100644
--- a/csharp/ql/integration-tests/all-platforms/standalone_winforms/global.json
+++ b/csharp/ql/integration-tests/all-platforms/standalone_winforms/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "9.0.100"
+        "version": "9.0.304"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/standalone_winforms/test.py b/csharp/ql/integration-tests/all-platforms/standalone_winforms/test.py
index 237174a46c6..c4f98dd3629 100644
--- a/csharp/ql/integration-tests/all-platforms/standalone_winforms/test.py
+++ b/csharp/ql/integration-tests/all-platforms/standalone_winforms/test.py
@@ -1,2 +1,9 @@
+import os
+
+
 def test(codeql, csharp):
+    # Making sure the reachability test of `nuget.org` succeeds:
+    os.environ["CODEQL_EXTRACTOR_CSHARP_BUILDLESS_NUGET_FEEDS_CHECK_FALLBACK_TIMEOUT"] = "1000"
+    os.environ["CODEQL_EXTRACTOR_CSHARP_BUILDLESS_NUGET_FEEDS_CHECK_FALLBACK_LIMIT"] = "5"
+
     codeql.database.create(build_mode="none")
diff --git a/csharp/ql/integration-tests/linux/compiler_args/CompilerArgs.expected b/csharp/ql/integration-tests/linux/compiler_args/CompilerArgs.expected
index 17e51d0b76f..cb1f6163d71 100644
--- a/csharp/ql/integration-tests/linux/compiler_args/CompilerArgs.expected
+++ b/csharp/ql/integration-tests/linux/compiler_args/CompilerArgs.expected
@@ -9,170 +9,170 @@
 | 8 | /define:TRACE;DEBUG;NET;NET9_0;NETCOREAPP;NET5_0_OR_GREATER;NET6_0_OR_GREATER;NET7_0_OR_GREATER;NET8_0_OR_GREATER;NET9_0_OR_GREATER;NETCOREAPP1_0_OR_GREATER;NETCOREAPP1_1_OR_GREATER;NETCOREAPP2_0_OR_GREATER;NETCOREAPP2_1_OR_GREATER;NETCOREAPP2_2_OR_GREATER;NETCOREAPP3_0_OR_GREATER;NETCOREAPP3_1_OR_GREATER |
 | 9 | /highentropyva+ |
 | 10 | /nullable:enable |
-| 11 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/Microsoft.CSharp.dll |
-| 12 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/Microsoft.VisualBasic.Core.dll |
-| 13 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/Microsoft.VisualBasic.dll |
-| 14 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/Microsoft.Win32.Primitives.dll |
-| 15 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/Microsoft.Win32.Registry.dll |
-| 16 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/mscorlib.dll |
-| 17 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/netstandard.dll |
-| 18 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.AppContext.dll |
-| 19 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Buffers.dll |
-| 20 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Collections.Concurrent.dll |
-| 21 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Collections.dll |
-| 22 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Collections.Immutable.dll |
-| 23 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Collections.NonGeneric.dll |
-| 24 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Collections.Specialized.dll |
-| 25 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.ComponentModel.Annotations.dll |
-| 26 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.ComponentModel.DataAnnotations.dll |
-| 27 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.ComponentModel.dll |
-| 28 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.ComponentModel.EventBasedAsync.dll |
-| 29 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.ComponentModel.Primitives.dll |
-| 30 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.ComponentModel.TypeConverter.dll |
-| 31 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Configuration.dll |
-| 32 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Console.dll |
-| 33 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Core.dll |
-| 34 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Data.Common.dll |
-| 35 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Data.DataSetExtensions.dll |
-| 36 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Data.dll |
-| 37 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Diagnostics.Contracts.dll |
-| 38 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Diagnostics.Debug.dll |
-| 39 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Diagnostics.DiagnosticSource.dll |
-| 40 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Diagnostics.FileVersionInfo.dll |
-| 41 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Diagnostics.Process.dll |
-| 42 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Diagnostics.StackTrace.dll |
-| 43 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Diagnostics.TextWriterTraceListener.dll |
-| 44 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Diagnostics.Tools.dll |
-| 45 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Diagnostics.TraceSource.dll |
-| 46 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Diagnostics.Tracing.dll |
-| 47 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.dll |
-| 48 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Drawing.dll |
-| 49 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Drawing.Primitives.dll |
-| 50 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Dynamic.Runtime.dll |
-| 51 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Formats.Asn1.dll |
-| 52 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Formats.Tar.dll |
-| 53 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Globalization.Calendars.dll |
-| 54 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Globalization.dll |
-| 55 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Globalization.Extensions.dll |
-| 56 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.IO.Compression.Brotli.dll |
-| 57 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.IO.Compression.dll |
-| 58 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.IO.Compression.FileSystem.dll |
-| 59 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.IO.Compression.ZipFile.dll |
-| 60 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.IO.dll |
-| 61 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.IO.FileSystem.AccessControl.dll |
-| 62 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.IO.FileSystem.dll |
-| 63 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.IO.FileSystem.DriveInfo.dll |
-| 64 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.IO.FileSystem.Primitives.dll |
-| 65 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.IO.FileSystem.Watcher.dll |
-| 66 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.IO.IsolatedStorage.dll |
-| 67 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.IO.MemoryMappedFiles.dll |
-| 68 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.IO.Pipelines.dll |
-| 69 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.IO.Pipes.AccessControl.dll |
-| 70 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.IO.Pipes.dll |
-| 71 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.IO.UnmanagedMemoryStream.dll |
-| 72 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Linq.dll |
-| 73 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Linq.Expressions.dll |
-| 74 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Linq.Parallel.dll |
-| 75 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Linq.Queryable.dll |
-| 76 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Memory.dll |
-| 77 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Net.dll |
-| 78 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Net.Http.dll |
-| 79 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Net.Http.Json.dll |
-| 80 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Net.HttpListener.dll |
-| 81 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Net.Mail.dll |
-| 82 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Net.NameResolution.dll |
-| 83 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Net.NetworkInformation.dll |
-| 84 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Net.Ping.dll |
-| 85 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Net.Primitives.dll |
-| 86 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Net.Quic.dll |
-| 87 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Net.Requests.dll |
-| 88 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Net.Security.dll |
-| 89 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Net.ServicePoint.dll |
-| 90 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Net.Sockets.dll |
-| 91 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Net.WebClient.dll |
-| 92 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Net.WebHeaderCollection.dll |
-| 93 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Net.WebProxy.dll |
-| 94 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Net.WebSockets.Client.dll |
-| 95 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Net.WebSockets.dll |
-| 96 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Numerics.dll |
-| 97 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Numerics.Vectors.dll |
-| 98 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.ObjectModel.dll |
-| 99 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Reflection.DispatchProxy.dll |
-| 100 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Reflection.dll |
-| 101 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Reflection.Emit.dll |
-| 102 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Reflection.Emit.ILGeneration.dll |
-| 103 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Reflection.Emit.Lightweight.dll |
-| 104 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Reflection.Extensions.dll |
-| 105 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Reflection.Metadata.dll |
-| 106 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Reflection.Primitives.dll |
-| 107 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Reflection.TypeExtensions.dll |
-| 108 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Resources.Reader.dll |
-| 109 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Resources.ResourceManager.dll |
-| 110 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Resources.Writer.dll |
-| 111 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Runtime.CompilerServices.Unsafe.dll |
-| 112 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Runtime.CompilerServices.VisualC.dll |
-| 113 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Runtime.dll |
-| 114 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Runtime.Extensions.dll |
-| 115 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Runtime.Handles.dll |
-| 116 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Runtime.InteropServices.dll |
-| 117 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Runtime.InteropServices.JavaScript.dll |
-| 118 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Runtime.InteropServices.RuntimeInformation.dll |
-| 119 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Runtime.Intrinsics.dll |
-| 120 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Runtime.Loader.dll |
-| 121 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Runtime.Numerics.dll |
-| 122 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Runtime.Serialization.dll |
-| 123 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Runtime.Serialization.Formatters.dll |
-| 124 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Runtime.Serialization.Json.dll |
-| 125 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Runtime.Serialization.Primitives.dll |
-| 126 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Runtime.Serialization.Xml.dll |
-| 127 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Security.AccessControl.dll |
-| 128 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Security.Claims.dll |
-| 129 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Security.Cryptography.Algorithms.dll |
-| 130 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Security.Cryptography.Cng.dll |
-| 131 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Security.Cryptography.Csp.dll |
-| 132 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Security.Cryptography.dll |
-| 133 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Security.Cryptography.Encoding.dll |
-| 134 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Security.Cryptography.OpenSsl.dll |
-| 135 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Security.Cryptography.Primitives.dll |
-| 136 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Security.Cryptography.X509Certificates.dll |
-| 137 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Security.dll |
-| 138 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Security.Principal.dll |
-| 139 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Security.Principal.Windows.dll |
-| 140 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Security.SecureString.dll |
-| 141 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.ServiceModel.Web.dll |
-| 142 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.ServiceProcess.dll |
-| 143 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Text.Encoding.CodePages.dll |
-| 144 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Text.Encoding.dll |
-| 145 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Text.Encoding.Extensions.dll |
-| 146 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Text.Encodings.Web.dll |
-| 147 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Text.Json.dll |
-| 148 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Text.RegularExpressions.dll |
-| 149 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Threading.Channels.dll |
-| 150 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Threading.dll |
-| 151 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Threading.Overlapped.dll |
-| 152 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Threading.Tasks.Dataflow.dll |
-| 153 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Threading.Tasks.dll |
-| 154 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Threading.Tasks.Extensions.dll |
-| 155 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Threading.Tasks.Parallel.dll |
-| 156 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Threading.Thread.dll |
-| 157 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Threading.ThreadPool.dll |
-| 158 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Threading.Timer.dll |
-| 159 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Transactions.dll |
-| 160 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Transactions.Local.dll |
-| 161 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.ValueTuple.dll |
-| 162 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Web.dll |
-| 163 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Web.HttpUtility.dll |
-| 164 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Windows.dll |
-| 165 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Xml.dll |
-| 166 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Xml.Linq.dll |
-| 167 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Xml.ReaderWriter.dll |
-| 168 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Xml.Serialization.dll |
-| 169 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Xml.XDocument.dll |
-| 170 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Xml.XmlDocument.dll |
-| 171 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Xml.XmlSerializer.dll |
-| 172 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Xml.XPath.dll |
-| 173 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/System.Xml.XPath.XDocument.dll |
-| 174 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/WindowsBase.dll |
+| 11 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/Microsoft.CSharp.dll |
+| 12 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/Microsoft.VisualBasic.Core.dll |
+| 13 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/Microsoft.VisualBasic.dll |
+| 14 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/Microsoft.Win32.Primitives.dll |
+| 15 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/Microsoft.Win32.Registry.dll |
+| 16 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/mscorlib.dll |
+| 17 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/netstandard.dll |
+| 18 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.AppContext.dll |
+| 19 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Buffers.dll |
+| 20 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Collections.Concurrent.dll |
+| 21 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Collections.dll |
+| 22 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Collections.Immutable.dll |
+| 23 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Collections.NonGeneric.dll |
+| 24 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Collections.Specialized.dll |
+| 25 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.ComponentModel.Annotations.dll |
+| 26 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.ComponentModel.DataAnnotations.dll |
+| 27 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.ComponentModel.dll |
+| 28 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.ComponentModel.EventBasedAsync.dll |
+| 29 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.ComponentModel.Primitives.dll |
+| 30 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.ComponentModel.TypeConverter.dll |
+| 31 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Configuration.dll |
+| 32 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Console.dll |
+| 33 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Core.dll |
+| 34 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Data.Common.dll |
+| 35 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Data.DataSetExtensions.dll |
+| 36 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Data.dll |
+| 37 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Diagnostics.Contracts.dll |
+| 38 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Diagnostics.Debug.dll |
+| 39 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Diagnostics.DiagnosticSource.dll |
+| 40 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Diagnostics.FileVersionInfo.dll |
+| 41 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Diagnostics.Process.dll |
+| 42 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Diagnostics.StackTrace.dll |
+| 43 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Diagnostics.TextWriterTraceListener.dll |
+| 44 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Diagnostics.Tools.dll |
+| 45 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Diagnostics.TraceSource.dll |
+| 46 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Diagnostics.Tracing.dll |
+| 47 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.dll |
+| 48 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Drawing.dll |
+| 49 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Drawing.Primitives.dll |
+| 50 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Dynamic.Runtime.dll |
+| 51 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Formats.Asn1.dll |
+| 52 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Formats.Tar.dll |
+| 53 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Globalization.Calendars.dll |
+| 54 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Globalization.dll |
+| 55 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Globalization.Extensions.dll |
+| 56 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.IO.Compression.Brotli.dll |
+| 57 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.IO.Compression.dll |
+| 58 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.IO.Compression.FileSystem.dll |
+| 59 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.IO.Compression.ZipFile.dll |
+| 60 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.IO.dll |
+| 61 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.IO.FileSystem.AccessControl.dll |
+| 62 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.IO.FileSystem.dll |
+| 63 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.IO.FileSystem.DriveInfo.dll |
+| 64 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.IO.FileSystem.Primitives.dll |
+| 65 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.IO.FileSystem.Watcher.dll |
+| 66 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.IO.IsolatedStorage.dll |
+| 67 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.IO.MemoryMappedFiles.dll |
+| 68 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.IO.Pipelines.dll |
+| 69 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.IO.Pipes.AccessControl.dll |
+| 70 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.IO.Pipes.dll |
+| 71 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.IO.UnmanagedMemoryStream.dll |
+| 72 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Linq.dll |
+| 73 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Linq.Expressions.dll |
+| 74 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Linq.Parallel.dll |
+| 75 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Linq.Queryable.dll |
+| 76 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Memory.dll |
+| 77 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Net.dll |
+| 78 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Net.Http.dll |
+| 79 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Net.Http.Json.dll |
+| 80 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Net.HttpListener.dll |
+| 81 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Net.Mail.dll |
+| 82 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Net.NameResolution.dll |
+| 83 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Net.NetworkInformation.dll |
+| 84 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Net.Ping.dll |
+| 85 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Net.Primitives.dll |
+| 86 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Net.Quic.dll |
+| 87 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Net.Requests.dll |
+| 88 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Net.Security.dll |
+| 89 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Net.ServicePoint.dll |
+| 90 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Net.Sockets.dll |
+| 91 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Net.WebClient.dll |
+| 92 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Net.WebHeaderCollection.dll |
+| 93 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Net.WebProxy.dll |
+| 94 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Net.WebSockets.Client.dll |
+| 95 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Net.WebSockets.dll |
+| 96 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Numerics.dll |
+| 97 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Numerics.Vectors.dll |
+| 98 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.ObjectModel.dll |
+| 99 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Reflection.DispatchProxy.dll |
+| 100 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Reflection.dll |
+| 101 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Reflection.Emit.dll |
+| 102 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Reflection.Emit.ILGeneration.dll |
+| 103 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Reflection.Emit.Lightweight.dll |
+| 104 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Reflection.Extensions.dll |
+| 105 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Reflection.Metadata.dll |
+| 106 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Reflection.Primitives.dll |
+| 107 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Reflection.TypeExtensions.dll |
+| 108 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Resources.Reader.dll |
+| 109 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Resources.ResourceManager.dll |
+| 110 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Resources.Writer.dll |
+| 111 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Runtime.CompilerServices.Unsafe.dll |
+| 112 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Runtime.CompilerServices.VisualC.dll |
+| 113 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Runtime.dll |
+| 114 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Runtime.Extensions.dll |
+| 115 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Runtime.Handles.dll |
+| 116 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Runtime.InteropServices.dll |
+| 117 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Runtime.InteropServices.JavaScript.dll |
+| 118 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Runtime.InteropServices.RuntimeInformation.dll |
+| 119 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Runtime.Intrinsics.dll |
+| 120 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Runtime.Loader.dll |
+| 121 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Runtime.Numerics.dll |
+| 122 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Runtime.Serialization.dll |
+| 123 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Runtime.Serialization.Formatters.dll |
+| 124 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Runtime.Serialization.Json.dll |
+| 125 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Runtime.Serialization.Primitives.dll |
+| 126 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Runtime.Serialization.Xml.dll |
+| 127 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Security.AccessControl.dll |
+| 128 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Security.Claims.dll |
+| 129 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Security.Cryptography.Algorithms.dll |
+| 130 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Security.Cryptography.Cng.dll |
+| 131 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Security.Cryptography.Csp.dll |
+| 132 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Security.Cryptography.dll |
+| 133 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Security.Cryptography.Encoding.dll |
+| 134 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Security.Cryptography.OpenSsl.dll |
+| 135 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Security.Cryptography.Primitives.dll |
+| 136 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Security.Cryptography.X509Certificates.dll |
+| 137 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Security.dll |
+| 138 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Security.Principal.dll |
+| 139 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Security.Principal.Windows.dll |
+| 140 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Security.SecureString.dll |
+| 141 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.ServiceModel.Web.dll |
+| 142 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.ServiceProcess.dll |
+| 143 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Text.Encoding.CodePages.dll |
+| 144 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Text.Encoding.dll |
+| 145 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Text.Encoding.Extensions.dll |
+| 146 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Text.Encodings.Web.dll |
+| 147 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Text.Json.dll |
+| 148 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Text.RegularExpressions.dll |
+| 149 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Threading.Channels.dll |
+| 150 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Threading.dll |
+| 151 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Threading.Overlapped.dll |
+| 152 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Threading.Tasks.Dataflow.dll |
+| 153 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Threading.Tasks.dll |
+| 154 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Threading.Tasks.Extensions.dll |
+| 155 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Threading.Tasks.Parallel.dll |
+| 156 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Threading.Thread.dll |
+| 157 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Threading.ThreadPool.dll |
+| 158 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Threading.Timer.dll |
+| 159 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Transactions.dll |
+| 160 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Transactions.Local.dll |
+| 161 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.ValueTuple.dll |
+| 162 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Web.dll |
+| 163 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Web.HttpUtility.dll |
+| 164 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Windows.dll |
+| 165 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Xml.dll |
+| 166 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Xml.Linq.dll |
+| 167 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Xml.ReaderWriter.dll |
+| 168 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Xml.Serialization.dll |
+| 169 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Xml.XDocument.dll |
+| 170 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Xml.XmlDocument.dll |
+| 171 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Xml.XmlSerializer.dll |
+| 172 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Xml.XPath.dll |
+| 173 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/System.Xml.XPath.XDocument.dll |
+| 174 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/ref/net9.0/WindowsBase.dll |
 | 175 | /debug+ |
 | 176 | /debug:portable |
 | 177 | /filealign:512 |
@@ -185,19 +185,18 @@
 | 184 | /utf8output |
 | 185 | /deterministic+ |
 | 186 | /langversion:13.0 |
-| 187 | /analyzerconfig:/usr/share/dotnet/sdk/9.0.100/Sdks/Microsoft.NET.Sdk/codestyle/cs/build/config/analysislevelstyle_default.globalconfig |
-| 188 | /analyzerconfig:obj/Debug/net9.0/test.GeneratedMSBuildEditorConfig.editorconfig |
-| 189 | /analyzerconfig:/usr/share/dotnet/sdk/9.0.100/Sdks/Microsoft.NET.Sdk/analyzers/build/config/analysislevel_9_default.globalconfig |
-| 190 | /analyzer:/usr/share/dotnet/sdk/9.0.100/Sdks/Microsoft.NET.Sdk/targets/../analyzers/Microsoft.CodeAnalysis.CSharp.NetAnalyzers.dll |
-| 191 | /analyzer:/usr/share/dotnet/sdk/9.0.100/Sdks/Microsoft.NET.Sdk/targets/../analyzers/Microsoft.CodeAnalysis.NetAnalyzers.dll |
-| 192 | /analyzer:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/analyzers/dotnet/cs/Microsoft.Interop.ComInterfaceGenerator.dll |
-| 193 | /analyzer:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/analyzers/dotnet/cs/Microsoft.Interop.JavaScript.JSImportGenerator.dll |
-| 194 | /analyzer:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/analyzers/dotnet/cs/Microsoft.Interop.LibraryImportGenerator.dll |
-| 195 | /analyzer:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/analyzers/dotnet/cs/Microsoft.Interop.SourceGeneration.dll |
-| 196 | /analyzer:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/analyzers/dotnet/cs/System.Text.Json.SourceGeneration.dll |
-| 197 | /analyzer:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/analyzers/dotnet/cs/System.Text.RegularExpressions.Generator.dll |
-| 198 | Program.cs |
-| 199 | obj/Debug/net9.0/test.GlobalUsings.g.cs |
-| 200 | obj/Debug/net9.0/.NETCoreApp,Version=v9.0.AssemblyAttributes.cs |
-| 201 | obj/Debug/net9.0/test.AssemblyInfo.cs |
-| 202 | /warnaserror+:NU1605,SYSLIB0011 |
\ No newline at end of file
+| 187 | /analyzerconfig:obj/Debug/net9.0/test.GeneratedMSBuildEditorConfig.editorconfig |
+| 188 | /analyzerconfig:/usr/share/dotnet/sdk/9.0.304/Sdks/Microsoft.NET.Sdk/analyzers/build/config/analysislevel_9_default.globalconfig |
+| 189 | /analyzer:/usr/share/dotnet/sdk/9.0.304/Sdks/Microsoft.NET.Sdk/targets/../analyzers/Microsoft.CodeAnalysis.CSharp.NetAnalyzers.dll |
+| 190 | /analyzer:/usr/share/dotnet/sdk/9.0.304/Sdks/Microsoft.NET.Sdk/targets/../analyzers/Microsoft.CodeAnalysis.NetAnalyzers.dll |
+| 191 | /analyzer:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/analyzers/dotnet/cs/Microsoft.Interop.ComInterfaceGenerator.dll |
+| 192 | /analyzer:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/analyzers/dotnet/cs/Microsoft.Interop.JavaScript.JSImportGenerator.dll |
+| 193 | /analyzer:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/analyzers/dotnet/cs/Microsoft.Interop.LibraryImportGenerator.dll |
+| 194 | /analyzer:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/analyzers/dotnet/cs/Microsoft.Interop.SourceGeneration.dll |
+| 195 | /analyzer:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/analyzers/dotnet/cs/System.Text.Json.SourceGeneration.dll |
+| 196 | /analyzer:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.8/analyzers/dotnet/cs/System.Text.RegularExpressions.Generator.dll |
+| 197 | Program.cs |
+| 198 | obj/Debug/net9.0/test.GlobalUsings.g.cs |
+| 199 | obj/Debug/net9.0/.NETCoreApp,Version=v9.0.AssemblyAttributes.cs |
+| 200 | obj/Debug/net9.0/test.AssemblyInfo.cs |
+| 201 | /warnaserror+:NU1605,SYSLIB0011 |
diff --git a/csharp/ql/integration-tests/linux/compiler_args/global.json b/csharp/ql/integration-tests/linux/compiler_args/global.json
index 76474f06d04..d488208a2a7 100644
--- a/csharp/ql/integration-tests/linux/compiler_args/global.json
+++ b/csharp/ql/integration-tests/linux/compiler_args/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "9.0.100"
+        "version": "9.0.304"
     }
 }
diff --git a/csharp/ql/integration-tests/linux/dotnet_10_rc2/Program.cs b/csharp/ql/integration-tests/linux/dotnet_10_rc2/Program.cs
new file mode 100644
index 00000000000..bd44629f7e2
--- /dev/null
+++ b/csharp/ql/integration-tests/linux/dotnet_10_rc2/Program.cs
@@ -0,0 +1 @@
+Console.WriteLine($"<arguments>{string.Join(",", args)}</arguments>");
diff --git a/csharp/ql/integration-tests/linux/dotnet_10_rc2/dotnet_build.csproj b/csharp/ql/integration-tests/linux/dotnet_10_rc2/dotnet_build.csproj
new file mode 100644
index 00000000000..dfb40caafcf
--- /dev/null
+++ b/csharp/ql/integration-tests/linux/dotnet_10_rc2/dotnet_build.csproj
@@ -0,0 +1,10 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net10.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>
diff --git a/csharp/ql/integration-tests/linux/dotnet_10_rc2/global.json b/csharp/ql/integration-tests/linux/dotnet_10_rc2/global.json
new file mode 100644
index 00000000000..e870e2cf7bd
--- /dev/null
+++ b/csharp/ql/integration-tests/linux/dotnet_10_rc2/global.json
@@ -0,0 +1,5 @@
+{
+    "sdk": {
+        "version": "10.0.100-rc.2.25502.107"
+    }
+}
diff --git a/csharp/ql/integration-tests/linux/dotnet_10_rc2/test.py b/csharp/ql/integration-tests/linux/dotnet_10_rc2/test.py
new file mode 100644
index 00000000000..148626b1cb8
--- /dev/null
+++ b/csharp/ql/integration-tests/linux/dotnet_10_rc2/test.py
@@ -0,0 +1,6 @@
+import os
+import runs_on
+
+@runs_on.linux
+def test(codeql, csharp):
+    codeql.database.create()
diff --git a/csharp/ql/integration-tests/linux/standalone_dependencies_non_utf8_filename/global.json b/csharp/ql/integration-tests/linux/standalone_dependencies_non_utf8_filename/global.json
index 76474f06d04..d488208a2a7 100644
--- a/csharp/ql/integration-tests/linux/standalone_dependencies_non_utf8_filename/global.json
+++ b/csharp/ql/integration-tests/linux/standalone_dependencies_non_utf8_filename/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "9.0.100"
+        "version": "9.0.304"
     }
 }
diff --git a/csharp/ql/integration-tests/posix/dotnet_test/global.json b/csharp/ql/integration-tests/posix/dotnet_test/global.json
index 76474f06d04..d488208a2a7 100644
--- a/csharp/ql/integration-tests/posix/dotnet_test/global.json
+++ b/csharp/ql/integration-tests/posix/dotnet_test/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "9.0.100"
+        "version": "9.0.304"
     }
 }
diff --git a/csharp/ql/integration-tests/posix/dotnet_test_mstest/global.json b/csharp/ql/integration-tests/posix/dotnet_test_mstest/global.json
index 76474f06d04..d488208a2a7 100644
--- a/csharp/ql/integration-tests/posix/dotnet_test_mstest/global.json
+++ b/csharp/ql/integration-tests/posix/dotnet_test_mstest/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "9.0.100"
+        "version": "9.0.304"
     }
 }
diff --git a/csharp/ql/integration-tests/posix/inherit-env-vars/global.json b/csharp/ql/integration-tests/posix/inherit-env-vars/global.json
index 76474f06d04..d488208a2a7 100644
--- a/csharp/ql/integration-tests/posix/inherit-env-vars/global.json
+++ b/csharp/ql/integration-tests/posix/inherit-env-vars/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "9.0.100"
+        "version": "9.0.304"
     }
 }
diff --git a/csharp/ql/integration-tests/posix/query-suite/csharp-code-quality-extended.qls.expected b/csharp/ql/integration-tests/posix/query-suite/csharp-code-quality-extended.qls.expected
index 53810418624..fdc5e6eae9d 100644
--- a/csharp/ql/integration-tests/posix/query-suite/csharp-code-quality-extended.qls.expected
+++ b/csharp/ql/integration-tests/posix/query-suite/csharp-code-quality-extended.qls.expected
@@ -1,20 +1,39 @@
 ql/csharp/ql/src/API Abuse/CallToGCCollect.ql
 ql/csharp/ql/src/API Abuse/CallToObsoleteMethod.ql
+ql/csharp/ql/src/API Abuse/ClassDoesNotImplementEquals.ql
 ql/csharp/ql/src/API Abuse/ClassImplementsICloneable.ql
+ql/csharp/ql/src/API Abuse/DisposeNotCalledOnException.ql
 ql/csharp/ql/src/API Abuse/FormatInvalid.ql
+ql/csharp/ql/src/API Abuse/InconsistentEqualsGetHashCode.ql
+ql/csharp/ql/src/API Abuse/IncorrectCompareToSignature.ql
+ql/csharp/ql/src/API Abuse/IncorrectEqualsSignature.ql
 ql/csharp/ql/src/API Abuse/NoDisposeCallOnLocalIDisposable.ql
+ql/csharp/ql/src/API Abuse/NonOverridingMethod.ql
 ql/csharp/ql/src/API Abuse/NullArgumentToEquals.ql
 ql/csharp/ql/src/ASP/BlockCodeResponseWrite.ql
+ql/csharp/ql/src/ASP/SplitControlStructure.ql
 ql/csharp/ql/src/Bad Practices/CallsUnmanagedCode.ql
 ql/csharp/ql/src/Bad Practices/CatchOfNullReferenceException.ql
+ql/csharp/ql/src/Bad Practices/Comments/CommentedOutCode.ql
+ql/csharp/ql/src/Bad Practices/Comments/TodoComments.ql
 ql/csharp/ql/src/Bad Practices/Control-Flow/ConstantCondition.ql
 ql/csharp/ql/src/Bad Practices/Declarations/LocalScopeVariableShadowsMember.ql
+ql/csharp/ql/src/Bad Practices/Declarations/NoConstantsOnly.ql
 ql/csharp/ql/src/Bad Practices/EmptyCatchBlock.ql
+ql/csharp/ql/src/Bad Practices/ErroneousClassCompare.ql
+ql/csharp/ql/src/Bad Practices/Implementation Hiding/AbstractToConcreteCollection.ql
 ql/csharp/ql/src/Bad Practices/Implementation Hiding/ExposeRepresentation.ql
+ql/csharp/ql/src/Bad Practices/Implementation Hiding/StaticArray.ql
+ql/csharp/ql/src/Bad Practices/Naming Conventions/ConfusingMethodNames.ql
+ql/csharp/ql/src/Bad Practices/Naming Conventions/ConfusingOverridesNames.ql
+ql/csharp/ql/src/Bad Practices/Naming Conventions/ControlNamePrefixes.ql
+ql/csharp/ql/src/Bad Practices/Naming Conventions/DefaultControlNames.ql
 ql/csharp/ql/src/Bad Practices/Naming Conventions/FieldMasksSuperField.ql
 ql/csharp/ql/src/Bad Practices/Naming Conventions/SameNameAsSuper.ql
 ql/csharp/ql/src/Bad Practices/PathCombine.ql
 ql/csharp/ql/src/Bad Practices/UnmanagedCodeCheck.ql
+ql/csharp/ql/src/Bad Practices/UseOfSystemOutputStream.ql
+ql/csharp/ql/src/Bad Practices/VirtualCallInConstructorOrDestructor.ql
 ql/csharp/ql/src/CSI/CompareIdenticalValues.ql
 ql/csharp/ql/src/CSI/NullAlways.ql
 ql/csharp/ql/src/CSI/NullMaybe.ql
@@ -22,8 +41,10 @@ ql/csharp/ql/src/Concurrency/FutileSyncOnField.ql
 ql/csharp/ql/src/Concurrency/LockOrder.ql
 ql/csharp/ql/src/Concurrency/LockThis.ql
 ql/csharp/ql/src/Concurrency/LockedWait.ql
+ql/csharp/ql/src/Concurrency/SynchSetUnsynchGet.ql
+ql/csharp/ql/src/Concurrency/UnsafeLazyInitialization.ql
+ql/csharp/ql/src/Concurrency/UnsynchronizedStaticAccess.ql
 ql/csharp/ql/src/Dead Code/DeadStoreOfLocal.ql
-ql/csharp/ql/src/Documentation/XmldocMissingSummary.ql
 ql/csharp/ql/src/Language Abuse/CastThisToTypeParameter.ql
 ql/csharp/ql/src/Language Abuse/CatchOfGenericException.ql
 ql/csharp/ql/src/Language Abuse/DubiousDowncastOfThis.ql
@@ -35,27 +56,42 @@ ql/csharp/ql/src/Language Abuse/NestedIf.ql
 ql/csharp/ql/src/Language Abuse/RethrowException.ql
 ql/csharp/ql/src/Language Abuse/SimplifyBoolExpr.ql
 ql/csharp/ql/src/Language Abuse/UnusedPropertyValue.ql
+ql/csharp/ql/src/Language Abuse/UselessCastToSelf.ql
+ql/csharp/ql/src/Language Abuse/UselessIsBeforeAs.ql
+ql/csharp/ql/src/Language Abuse/UselessNullCoalescingExpression.ql
+ql/csharp/ql/src/Language Abuse/UselessTypeTest.ql
+ql/csharp/ql/src/Language Abuse/UselessUpcast.ql
 ql/csharp/ql/src/Likely Bugs/Collections/ContainerLengthCmpOffByOne.ql
 ql/csharp/ql/src/Likely Bugs/Collections/ContainerSizeCmpZero.ql
 ql/csharp/ql/src/Likely Bugs/Collections/ReadOnlyContainer.ql
 ql/csharp/ql/src/Likely Bugs/Collections/WriteOnlyContainer.ql
 ql/csharp/ql/src/Likely Bugs/ConstantComparison.ql
 ql/csharp/ql/src/Likely Bugs/DangerousNonShortCircuitLogic.ql
+ql/csharp/ql/src/Likely Bugs/Dynamic/BadDynamicCall.ql
 ql/csharp/ql/src/Likely Bugs/EqualityCheckOnFloats.ql
 ql/csharp/ql/src/Likely Bugs/EqualsArray.ql
+ql/csharp/ql/src/Likely Bugs/EqualsUsesAs.ql
+ql/csharp/ql/src/Likely Bugs/EqualsUsesIs.ql
 ql/csharp/ql/src/Likely Bugs/HashedButNoHash.ql
 ql/csharp/ql/src/Likely Bugs/ImpossibleArrayCast.ql
 ql/csharp/ql/src/Likely Bugs/IncomparableEquals.ql
+ql/csharp/ql/src/Likely Bugs/InconsistentCompareTo.ql
+ql/csharp/ql/src/Likely Bugs/LeapYear/UnsafeYearConstruction.ql
+ql/csharp/ql/src/Likely Bugs/MishandlingJapaneseEra.ql
 ql/csharp/ql/src/Likely Bugs/NestedLoopsSameVariable.ql
+ql/csharp/ql/src/Likely Bugs/ObjectComparison.ql
 ql/csharp/ql/src/Likely Bugs/PossibleLossOfPrecision.ql
 ql/csharp/ql/src/Likely Bugs/RecursiveEquals.ql
+ql/csharp/ql/src/Likely Bugs/RecursiveOperatorEquals.ql
 ql/csharp/ql/src/Likely Bugs/ReferenceEqualsOnValueTypes.ql
 ql/csharp/ql/src/Likely Bugs/SelfAssignment.ql
 ql/csharp/ql/src/Likely Bugs/Statements/EmptyBlock.ql
 ql/csharp/ql/src/Likely Bugs/Statements/EmptyLockStatement.ql
+ql/csharp/ql/src/Likely Bugs/Statements/UseBraces.ql
 ql/csharp/ql/src/Likely Bugs/StaticFieldWrittenByInstance.ql
 ql/csharp/ql/src/Likely Bugs/StringBuilderCharInit.ql
 ql/csharp/ql/src/Likely Bugs/UncheckedCastInEquals.ql
+ql/csharp/ql/src/Linq/BadMultipleIteration.ql
 ql/csharp/ql/src/Linq/MissedAllOpportunity.ql
 ql/csharp/ql/src/Linq/MissedCastOpportunity.ql
 ql/csharp/ql/src/Linq/MissedOfTypeOpportunity.ql
@@ -68,5 +104,6 @@ ql/csharp/ql/src/Performance/UseTryGetValue.ql
 ql/csharp/ql/src/Useless code/DefaultToString.ql
 ql/csharp/ql/src/Useless code/FutileConditional.ql
 ql/csharp/ql/src/Useless code/IntGetHashCode.ql
+ql/csharp/ql/src/Useless code/PointlessForwardingMethod.ql
 ql/csharp/ql/src/Useless code/RedundantToStringCall.ql
 ql/csharp/ql/src/Useless code/UnusedLabel.ql
diff --git a/csharp/ql/integration-tests/posix/query-suite/csharp-code-quality.qls.expected b/csharp/ql/integration-tests/posix/query-suite/csharp-code-quality.qls.expected
index 53810418624..6694cc8461b 100644
--- a/csharp/ql/integration-tests/posix/query-suite/csharp-code-quality.qls.expected
+++ b/csharp/ql/integration-tests/posix/query-suite/csharp-code-quality.qls.expected
@@ -23,7 +23,6 @@ ql/csharp/ql/src/Concurrency/LockOrder.ql
 ql/csharp/ql/src/Concurrency/LockThis.ql
 ql/csharp/ql/src/Concurrency/LockedWait.ql
 ql/csharp/ql/src/Dead Code/DeadStoreOfLocal.ql
-ql/csharp/ql/src/Documentation/XmldocMissingSummary.ql
 ql/csharp/ql/src/Language Abuse/CastThisToTypeParameter.ql
 ql/csharp/ql/src/Language Abuse/CatchOfGenericException.ql
 ql/csharp/ql/src/Language Abuse/DubiousDowncastOfThis.ql
diff --git a/csharp/ql/integration-tests/posix/query-suite/csharp-code-scanning.qls.expected b/csharp/ql/integration-tests/posix/query-suite/csharp-code-scanning.qls.expected
index c0ff79af1c1..4ffd875fda3 100644
--- a/csharp/ql/integration-tests/posix/query-suite/csharp-code-scanning.qls.expected
+++ b/csharp/ql/integration-tests/posix/query-suite/csharp-code-scanning.qls.expected
@@ -16,6 +16,7 @@ ql/csharp/ql/src/Security Features/CWE-090/LDAPInjection.ql
 ql/csharp/ql/src/Security Features/CWE-091/XMLInjection.ql
 ql/csharp/ql/src/Security Features/CWE-094/CodeInjection.ql
 ql/csharp/ql/src/Security Features/CWE-099/ResourceInjection.ql
+ql/csharp/ql/src/Security Features/CWE-1004/CookieWithoutHttpOnly.ql
 ql/csharp/ql/src/Security Features/CWE-114/AssemblyPathInjection.ql
 ql/csharp/ql/src/Security Features/CWE-117/LogForging.ql
 ql/csharp/ql/src/Security Features/CWE-119/LocalUnvalidatedArithmetic.ql
@@ -33,6 +34,7 @@ ql/csharp/ql/src/Security Features/CWE-502/UnsafeDeserializationUntrustedInput.q
 ql/csharp/ql/src/Security Features/CWE-548/ASPNetDirectoryListing.ql
 ql/csharp/ql/src/Security Features/CWE-601/UrlRedirect.ql
 ql/csharp/ql/src/Security Features/CWE-611/UntrustedDataInsecureXml.ql
+ql/csharp/ql/src/Security Features/CWE-614/CookieWithoutSecure.ql
 ql/csharp/ql/src/Security Features/CWE-614/RequireSSL.ql
 ql/csharp/ql/src/Security Features/CWE-643/XPathInjection.ql
 ql/csharp/ql/src/Security Features/CWE-730/ReDoS.ql
diff --git a/csharp/ql/integration-tests/posix/query-suite/csharp-security-and-quality.qls.expected b/csharp/ql/integration-tests/posix/query-suite/csharp-security-and-quality.qls.expected
index d4d145986c1..b520a571fc8 100644
--- a/csharp/ql/integration-tests/posix/query-suite/csharp-security-and-quality.qls.expected
+++ b/csharp/ql/integration-tests/posix/query-suite/csharp-security-and-quality.qls.expected
@@ -120,6 +120,7 @@ ql/csharp/ql/src/Security Features/CWE-090/LDAPInjection.ql
 ql/csharp/ql/src/Security Features/CWE-091/XMLInjection.ql
 ql/csharp/ql/src/Security Features/CWE-094/CodeInjection.ql
 ql/csharp/ql/src/Security Features/CWE-099/ResourceInjection.ql
+ql/csharp/ql/src/Security Features/CWE-1004/CookieWithoutHttpOnly.ql
 ql/csharp/ql/src/Security Features/CWE-112/MissingXMLValidation.ql
 ql/csharp/ql/src/Security Features/CWE-114/AssemblyPathInjection.ql
 ql/csharp/ql/src/Security Features/CWE-117/LogForging.ql
@@ -140,6 +141,7 @@ ql/csharp/ql/src/Security Features/CWE-502/UnsafeDeserializationUntrustedInput.q
 ql/csharp/ql/src/Security Features/CWE-548/ASPNetDirectoryListing.ql
 ql/csharp/ql/src/Security Features/CWE-601/UrlRedirect.ql
 ql/csharp/ql/src/Security Features/CWE-611/UntrustedDataInsecureXml.ql
+ql/csharp/ql/src/Security Features/CWE-614/CookieWithoutSecure.ql
 ql/csharp/ql/src/Security Features/CWE-614/RequireSSL.ql
 ql/csharp/ql/src/Security Features/CWE-639/InsecureDirectObjectReference.ql
 ql/csharp/ql/src/Security Features/CWE-643/XPathInjection.ql
diff --git a/csharp/ql/integration-tests/posix/query-suite/csharp-security-extended.qls.expected b/csharp/ql/integration-tests/posix/query-suite/csharp-security-extended.qls.expected
index 48f7ad304a0..13b578d7b52 100644
--- a/csharp/ql/integration-tests/posix/query-suite/csharp-security-extended.qls.expected
+++ b/csharp/ql/integration-tests/posix/query-suite/csharp-security-extended.qls.expected
@@ -23,6 +23,7 @@ ql/csharp/ql/src/Security Features/CWE-090/LDAPInjection.ql
 ql/csharp/ql/src/Security Features/CWE-091/XMLInjection.ql
 ql/csharp/ql/src/Security Features/CWE-094/CodeInjection.ql
 ql/csharp/ql/src/Security Features/CWE-099/ResourceInjection.ql
+ql/csharp/ql/src/Security Features/CWE-1004/CookieWithoutHttpOnly.ql
 ql/csharp/ql/src/Security Features/CWE-112/MissingXMLValidation.ql
 ql/csharp/ql/src/Security Features/CWE-114/AssemblyPathInjection.ql
 ql/csharp/ql/src/Security Features/CWE-117/LogForging.ql
@@ -43,6 +44,7 @@ ql/csharp/ql/src/Security Features/CWE-502/UnsafeDeserializationUntrustedInput.q
 ql/csharp/ql/src/Security Features/CWE-548/ASPNetDirectoryListing.ql
 ql/csharp/ql/src/Security Features/CWE-601/UrlRedirect.ql
 ql/csharp/ql/src/Security Features/CWE-611/UntrustedDataInsecureXml.ql
+ql/csharp/ql/src/Security Features/CWE-614/CookieWithoutSecure.ql
 ql/csharp/ql/src/Security Features/CWE-614/RequireSSL.ql
 ql/csharp/ql/src/Security Features/CWE-639/InsecureDirectObjectReference.ql
 ql/csharp/ql/src/Security Features/CWE-643/XPathInjection.ql
diff --git a/csharp/ql/integration-tests/posix/query-suite/not_included_in_qls.expected b/csharp/ql/integration-tests/posix/query-suite/not_included_in_qls.expected
index dff6574dddd..4776a36a6a9 100644
--- a/csharp/ql/integration-tests/posix/query-suite/not_included_in_qls.expected
+++ b/csharp/ql/integration-tests/posix/query-suite/not_included_in_qls.expected
@@ -1,31 +1,20 @@
 ql/csharp/ql/src/API Abuse/MissingDisposeCall.ql
 ql/csharp/ql/src/API Abuse/MissingDisposeMethod.ql
-ql/csharp/ql/src/API Abuse/NonOverridingMethod.ql
 ql/csharp/ql/src/API Abuse/UncheckedReturnValue.ql
 ql/csharp/ql/src/ASP/ComplexInlineCode.ql
 ql/csharp/ql/src/ASP/NonInternationalizedText.ql
-ql/csharp/ql/src/ASP/SplitControlStructure.ql
 ql/csharp/ql/src/AlertSuppression.ql
 ql/csharp/ql/src/Architecture/Dependencies/MutualDependency.ql
 ql/csharp/ql/src/Architecture/Refactoring Opportunities/FeatureEnvy.ql
-ql/csharp/ql/src/Bad Practices/Comments/CommentedOutCode.ql
-ql/csharp/ql/src/Bad Practices/Comments/TodoComments.ql
 ql/csharp/ql/src/Bad Practices/Declarations/EmptyInterface.ql
-ql/csharp/ql/src/Bad Practices/Declarations/NoConstantsOnly.ql
-ql/csharp/ql/src/Bad Practices/Implementation Hiding/StaticArray.ql
 ql/csharp/ql/src/Bad Practices/LeftoverDebugCode.ql
 ql/csharp/ql/src/Bad Practices/Magic Constants/MagicConstantsNumbers.ql
 ql/csharp/ql/src/Bad Practices/Magic Constants/MagicConstantsString.ql
 ql/csharp/ql/src/Bad Practices/Magic Constants/MagicNumbersUseConstant.ql
 ql/csharp/ql/src/Bad Practices/Magic Constants/MagicStringsUseConstant.ql
-ql/csharp/ql/src/Bad Practices/Naming Conventions/ConfusingMethodNames.ql
-ql/csharp/ql/src/Bad Practices/Naming Conventions/ConfusingOverridesNames.ql
 ql/csharp/ql/src/Bad Practices/Naming Conventions/ConstantNaming.ql
-ql/csharp/ql/src/Bad Practices/Naming Conventions/ControlNamePrefixes.ql
-ql/csharp/ql/src/Bad Practices/Naming Conventions/DefaultControlNames.ql
 ql/csharp/ql/src/Bad Practices/Naming Conventions/VariableNameTooShort.ql
 ql/csharp/ql/src/Bad Practices/UseOfHtmlInputHidden.ql
-ql/csharp/ql/src/Bad Practices/UseOfSystemOutputStream.ql
 ql/csharp/ql/src/Configuration/PasswordInConfigurationFile.ql
 ql/csharp/ql/src/Dead Code/DeadRefTypes.ql
 ql/csharp/ql/src/Dead Code/NonAssignedFields.ql
@@ -39,7 +28,6 @@ ql/csharp/ql/src/Documentation/XmldocMissingParam.ql
 ql/csharp/ql/src/Documentation/XmldocMissingReturn.ql
 ql/csharp/ql/src/Documentation/XmldocMissingTypeParam.ql
 ql/csharp/ql/src/Language Abuse/ForeachCapture.ql
-ql/csharp/ql/src/Language Abuse/UselessIsBeforeAs.ql
 ql/csharp/ql/src/Likely Bugs/BadCheckOdd.ql
 ql/csharp/ql/src/Likely Bugs/RandomUsedOnce.ql
 ql/csharp/ql/src/Metrics/Callables/CCyclomaticComplexity.ql
@@ -93,13 +81,10 @@ ql/csharp/ql/src/Security Features/CWE-611/UseXmlSecureResolver.ql
 ql/csharp/ql/src/Security Features/CWE-798/HardcodedConnectionString.ql
 ql/csharp/ql/src/Security Features/CWE-798/HardcodedCredentials.ql
 ql/csharp/ql/src/Security Features/CWE-838/InappropriateEncoding.ql
-ql/csharp/ql/src/Useless code/PointlessForwardingMethod.ql
 ql/csharp/ql/src/definitions.ql
 ql/csharp/ql/src/experimental/CWE-099/TaintedWebClient.ql
 ql/csharp/ql/src/experimental/CWE-918/RequestForgery.ql
-ql/csharp/ql/src/experimental/Security Features/CWE-1004/CookieWithoutHttpOnly.ql
 ql/csharp/ql/src/experimental/Security Features/CWE-327/Azure/UnsafeUsageOfClientSideEncryptionVersion.ql
-ql/csharp/ql/src/experimental/Security Features/CWE-614/CookieWithoutSecure.ql
 ql/csharp/ql/src/experimental/Security Features/CWE-759/HashWithoutSalt.ql
 ql/csharp/ql/src/experimental/Security Features/JsonWebTokenHandler/delegated-security-validations-always-return-true.ql
 ql/csharp/ql/src/experimental/Security Features/JsonWebTokenHandler/security-validation-disabled.ql
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies/Assemblies.expected b/csharp/ql/integration-tests/posix/standalone_dependencies/Assemblies.expected
index 3e9c8fa753b..05b3826c73c 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies/Assemblies.expected
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies/Assemblies.expected
@@ -1,167 +1,167 @@
 | test-db/working/packages/avalara.avatax/23.11.0/lib/netstandard2.0/Avalara.AvaTax.RestClient.dll:0:0:0:0 | Avalara.AvaTax.RestClient, Version=0.0.0.0, Culture=neutral, PublicKeyToken=be94eb8ba37fd33c |
 | test-db/working/packages/microsoft.bcl.asyncinterfaces/8.0.0/lib/netstandard2.1/Microsoft.Bcl.AsyncInterfaces.dll:0:0:0:0 | Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/Microsoft.CSharp.dll:0:0:0:0 | Microsoft.CSharp, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/Microsoft.VisualBasic.Core.dll:0:0:0:0 | Microsoft.VisualBasic.Core, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/Microsoft.VisualBasic.dll:0:0:0:0 | Microsoft.VisualBasic, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/Microsoft.Win32.Primitives.dll:0:0:0:0 | Microsoft.Win32.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/Microsoft.Win32.Registry.dll:0:0:0:0 | Microsoft.Win32.Registry, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.AppContext.dll:0:0:0:0 | System.AppContext, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Buffers.dll:0:0:0:0 | System.Buffers, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Collections.Concurrent.dll:0:0:0:0 | System.Collections.Concurrent, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Collections.Immutable.dll:0:0:0:0 | System.Collections.Immutable, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Collections.NonGeneric.dll:0:0:0:0 | System.Collections.NonGeneric, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Collections.Specialized.dll:0:0:0:0 | System.Collections.Specialized, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Collections.dll:0:0:0:0 | System.Collections, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ComponentModel.Annotations.dll:0:0:0:0 | System.ComponentModel.Annotations, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ComponentModel.DataAnnotations.dll:0:0:0:0 | System.ComponentModel.DataAnnotations, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ComponentModel.EventBasedAsync.dll:0:0:0:0 | System.ComponentModel.EventBasedAsync, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ComponentModel.Primitives.dll:0:0:0:0 | System.ComponentModel.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ComponentModel.TypeConverter.dll:0:0:0:0 | System.ComponentModel.TypeConverter, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ComponentModel.dll:0:0:0:0 | System.ComponentModel, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Configuration.dll:0:0:0:0 | System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Console.dll:0:0:0:0 | System.Console, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Core.dll:0:0:0:0 | System.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Data.Common.dll:0:0:0:0 | System.Data.Common, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Data.DataSetExtensions.dll:0:0:0:0 | System.Data.DataSetExtensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Data.dll:0:0:0:0 | System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.Contracts.dll:0:0:0:0 | System.Diagnostics.Contracts, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.Debug.dll:0:0:0:0 | System.Diagnostics.Debug, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.DiagnosticSource.dll:0:0:0:0 | System.Diagnostics.DiagnosticSource, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.FileVersionInfo.dll:0:0:0:0 | System.Diagnostics.FileVersionInfo, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.Process.dll:0:0:0:0 | System.Diagnostics.Process, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.StackTrace.dll:0:0:0:0 | System.Diagnostics.StackTrace, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.TextWriterTraceListener.dll:0:0:0:0 | System.Diagnostics.TextWriterTraceListener, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.Tools.dll:0:0:0:0 | System.Diagnostics.Tools, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.TraceSource.dll:0:0:0:0 | System.Diagnostics.TraceSource, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.Tracing.dll:0:0:0:0 | System.Diagnostics.Tracing, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Drawing.Primitives.dll:0:0:0:0 | System.Drawing.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Drawing.dll:0:0:0:0 | System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Dynamic.Runtime.dll:0:0:0:0 | System.Dynamic.Runtime, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Formats.Asn1.dll:0:0:0:0 | System.Formats.Asn1, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Formats.Tar.dll:0:0:0:0 | System.Formats.Tar, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Globalization.Calendars.dll:0:0:0:0 | System.Globalization.Calendars, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Globalization.Extensions.dll:0:0:0:0 | System.Globalization.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Globalization.dll:0:0:0:0 | System.Globalization, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.Compression.Brotli.dll:0:0:0:0 | System.IO.Compression.Brotli, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.Compression.FileSystem.dll:0:0:0:0 | System.IO.Compression.FileSystem, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.Compression.ZipFile.dll:0:0:0:0 | System.IO.Compression.ZipFile, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.Compression.dll:0:0:0:0 | System.IO.Compression, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.FileSystem.AccessControl.dll:0:0:0:0 | System.IO.FileSystem.AccessControl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.FileSystem.DriveInfo.dll:0:0:0:0 | System.IO.FileSystem.DriveInfo, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.FileSystem.Primitives.dll:0:0:0:0 | System.IO.FileSystem.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.FileSystem.Watcher.dll:0:0:0:0 | System.IO.FileSystem.Watcher, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.FileSystem.dll:0:0:0:0 | System.IO.FileSystem, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.IsolatedStorage.dll:0:0:0:0 | System.IO.IsolatedStorage, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.MemoryMappedFiles.dll:0:0:0:0 | System.IO.MemoryMappedFiles, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.Pipelines.dll:0:0:0:0 | System.IO.Pipelines, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.Pipes.AccessControl.dll:0:0:0:0 | System.IO.Pipes.AccessControl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.Pipes.dll:0:0:0:0 | System.IO.Pipes, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.UnmanagedMemoryStream.dll:0:0:0:0 | System.IO.UnmanagedMemoryStream, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.dll:0:0:0:0 | System.IO, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Linq.Expressions.dll:0:0:0:0 | System.Linq.Expressions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Linq.Parallel.dll:0:0:0:0 | System.Linq.Parallel, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Linq.Queryable.dll:0:0:0:0 | System.Linq.Queryable, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Linq.dll:0:0:0:0 | System.Linq, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Memory.dll:0:0:0:0 | System.Memory, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Http.Json.dll:0:0:0:0 | System.Net.Http.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Http.dll:0:0:0:0 | System.Net.Http, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.HttpListener.dll:0:0:0:0 | System.Net.HttpListener, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Mail.dll:0:0:0:0 | System.Net.Mail, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.NameResolution.dll:0:0:0:0 | System.Net.NameResolution, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.NetworkInformation.dll:0:0:0:0 | System.Net.NetworkInformation, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Ping.dll:0:0:0:0 | System.Net.Ping, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Primitives.dll:0:0:0:0 | System.Net.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Quic.dll:0:0:0:0 | System.Net.Quic, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Requests.dll:0:0:0:0 | System.Net.Requests, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Security.dll:0:0:0:0 | System.Net.Security, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.ServicePoint.dll:0:0:0:0 | System.Net.ServicePoint, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Sockets.dll:0:0:0:0 | System.Net.Sockets, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.WebClient.dll:0:0:0:0 | System.Net.WebClient, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.WebHeaderCollection.dll:0:0:0:0 | System.Net.WebHeaderCollection, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.WebProxy.dll:0:0:0:0 | System.Net.WebProxy, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.WebSockets.Client.dll:0:0:0:0 | System.Net.WebSockets.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.WebSockets.dll:0:0:0:0 | System.Net.WebSockets, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.dll:0:0:0:0 | System.Net, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Numerics.Vectors.dll:0:0:0:0 | System.Numerics.Vectors, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Numerics.dll:0:0:0:0 | System.Numerics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ObjectModel.dll:0:0:0:0 | System.ObjectModel, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.DispatchProxy.dll:0:0:0:0 | System.Reflection.DispatchProxy, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.Emit.ILGeneration.dll:0:0:0:0 | System.Reflection.Emit.ILGeneration, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.Emit.Lightweight.dll:0:0:0:0 | System.Reflection.Emit.Lightweight, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.Emit.dll:0:0:0:0 | System.Reflection.Emit, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.Extensions.dll:0:0:0:0 | System.Reflection.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.Metadata.dll:0:0:0:0 | System.Reflection.Metadata, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.Primitives.dll:0:0:0:0 | System.Reflection.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.TypeExtensions.dll:0:0:0:0 | System.Reflection.TypeExtensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.dll:0:0:0:0 | System.Reflection, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Resources.Reader.dll:0:0:0:0 | System.Resources.Reader, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Resources.ResourceManager.dll:0:0:0:0 | System.Resources.ResourceManager, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Resources.Writer.dll:0:0:0:0 | System.Resources.Writer, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.CompilerServices.Unsafe.dll:0:0:0:0 | System.Runtime.CompilerServices.Unsafe, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.CompilerServices.VisualC.dll:0:0:0:0 | System.Runtime.CompilerServices.VisualC, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Extensions.dll:0:0:0:0 | System.Runtime.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Handles.dll:0:0:0:0 | System.Runtime.Handles, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.InteropServices.JavaScript.dll:0:0:0:0 | System.Runtime.InteropServices.JavaScript, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.InteropServices.RuntimeInformation.dll:0:0:0:0 | System.Runtime.InteropServices.RuntimeInformation, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.InteropServices.dll:0:0:0:0 | System.Runtime.InteropServices, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Intrinsics.dll:0:0:0:0 | System.Runtime.Intrinsics, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Loader.dll:0:0:0:0 | System.Runtime.Loader, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Numerics.dll:0:0:0:0 | System.Runtime.Numerics, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Serialization.Formatters.dll:0:0:0:0 | System.Runtime.Serialization.Formatters, Version=8.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Serialization.Json.dll:0:0:0:0 | System.Runtime.Serialization.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Serialization.Primitives.dll:0:0:0:0 | System.Runtime.Serialization.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Serialization.Xml.dll:0:0:0:0 | System.Runtime.Serialization.Xml, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Serialization.dll:0:0:0:0 | System.Runtime.Serialization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.dll:0:0:0:0 | System.Runtime, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.AccessControl.dll:0:0:0:0 | System.Security.AccessControl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Claims.dll:0:0:0:0 | System.Security.Claims, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.Algorithms.dll:0:0:0:0 | System.Security.Cryptography.Algorithms, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.Cng.dll:0:0:0:0 | System.Security.Cryptography.Cng, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.Csp.dll:0:0:0:0 | System.Security.Cryptography.Csp, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.Encoding.dll:0:0:0:0 | System.Security.Cryptography.Encoding, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.OpenSsl.dll:0:0:0:0 | System.Security.Cryptography.OpenSsl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.Primitives.dll:0:0:0:0 | System.Security.Cryptography.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.X509Certificates.dll:0:0:0:0 | System.Security.Cryptography.X509Certificates, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.dll:0:0:0:0 | System.Security.Cryptography, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Principal.Windows.dll:0:0:0:0 | System.Security.Principal.Windows, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Principal.dll:0:0:0:0 | System.Security.Principal, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.SecureString.dll:0:0:0:0 | System.Security.SecureString, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.dll:0:0:0:0 | System.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ServiceModel.Web.dll:0:0:0:0 | System.ServiceModel.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ServiceProcess.dll:0:0:0:0 | System.ServiceProcess, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Text.Encoding.CodePages.dll:0:0:0:0 | System.Text.Encoding.CodePages, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Text.Encoding.Extensions.dll:0:0:0:0 | System.Text.Encoding.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Text.Encoding.dll:0:0:0:0 | System.Text.Encoding, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Text.Encodings.Web.dll:0:0:0:0 | System.Text.Encodings.Web, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Text.Json.dll:0:0:0:0 | System.Text.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Text.RegularExpressions.dll:0:0:0:0 | System.Text.RegularExpressions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Channels.dll:0:0:0:0 | System.Threading.Channels, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Overlapped.dll:0:0:0:0 | System.Threading.Overlapped, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Tasks.Dataflow.dll:0:0:0:0 | System.Threading.Tasks.Dataflow, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Tasks.Extensions.dll:0:0:0:0 | System.Threading.Tasks.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Tasks.Parallel.dll:0:0:0:0 | System.Threading.Tasks.Parallel, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Tasks.dll:0:0:0:0 | System.Threading.Tasks, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Thread.dll:0:0:0:0 | System.Threading.Thread, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.ThreadPool.dll:0:0:0:0 | System.Threading.ThreadPool, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Timer.dll:0:0:0:0 | System.Threading.Timer, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.dll:0:0:0:0 | System.Threading, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Transactions.Local.dll:0:0:0:0 | System.Transactions.Local, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Transactions.dll:0:0:0:0 | System.Transactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ValueTuple.dll:0:0:0:0 | System.ValueTuple, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Web.HttpUtility.dll:0:0:0:0 | System.Web.HttpUtility, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Web.dll:0:0:0:0 | System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Windows.dll:0:0:0:0 | System.Windows, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Xml.Linq.dll:0:0:0:0 | System.Xml.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Xml.ReaderWriter.dll:0:0:0:0 | System.Xml.ReaderWriter, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Xml.Serialization.dll:0:0:0:0 | System.Xml.Serialization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Xml.XDocument.dll:0:0:0:0 | System.Xml.XDocument, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Xml.XPath.XDocument.dll:0:0:0:0 | System.Xml.XPath.XDocument, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Xml.XPath.dll:0:0:0:0 | System.Xml.XPath, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Xml.XmlDocument.dll:0:0:0:0 | System.Xml.XmlDocument, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Xml.XmlSerializer.dll:0:0:0:0 | System.Xml.XmlSerializer, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Xml.dll:0:0:0:0 | System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.dll:0:0:0:0 | System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/WindowsBase.dll:0:0:0:0 | WindowsBase, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/mscorlib.dll:0:0:0:0 | mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/netstandard.dll:0:0:0:0 | netstandard, Version=2.1.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/Microsoft.CSharp.dll:0:0:0:0 | Microsoft.CSharp, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/Microsoft.VisualBasic.Core.dll:0:0:0:0 | Microsoft.VisualBasic.Core, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/Microsoft.VisualBasic.dll:0:0:0:0 | Microsoft.VisualBasic, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/Microsoft.Win32.Primitives.dll:0:0:0:0 | Microsoft.Win32.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/Microsoft.Win32.Registry.dll:0:0:0:0 | Microsoft.Win32.Registry, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.AppContext.dll:0:0:0:0 | System.AppContext, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Buffers.dll:0:0:0:0 | System.Buffers, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Collections.Concurrent.dll:0:0:0:0 | System.Collections.Concurrent, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Collections.Immutable.dll:0:0:0:0 | System.Collections.Immutable, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Collections.NonGeneric.dll:0:0:0:0 | System.Collections.NonGeneric, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Collections.Specialized.dll:0:0:0:0 | System.Collections.Specialized, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Collections.dll:0:0:0:0 | System.Collections, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.ComponentModel.Annotations.dll:0:0:0:0 | System.ComponentModel.Annotations, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.ComponentModel.DataAnnotations.dll:0:0:0:0 | System.ComponentModel.DataAnnotations, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.ComponentModel.EventBasedAsync.dll:0:0:0:0 | System.ComponentModel.EventBasedAsync, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.ComponentModel.Primitives.dll:0:0:0:0 | System.ComponentModel.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.ComponentModel.TypeConverter.dll:0:0:0:0 | System.ComponentModel.TypeConverter, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.ComponentModel.dll:0:0:0:0 | System.ComponentModel, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Configuration.dll:0:0:0:0 | System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Console.dll:0:0:0:0 | System.Console, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Core.dll:0:0:0:0 | System.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Data.Common.dll:0:0:0:0 | System.Data.Common, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Data.DataSetExtensions.dll:0:0:0:0 | System.Data.DataSetExtensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Data.dll:0:0:0:0 | System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Diagnostics.Contracts.dll:0:0:0:0 | System.Diagnostics.Contracts, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Diagnostics.Debug.dll:0:0:0:0 | System.Diagnostics.Debug, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Diagnostics.DiagnosticSource.dll:0:0:0:0 | System.Diagnostics.DiagnosticSource, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Diagnostics.FileVersionInfo.dll:0:0:0:0 | System.Diagnostics.FileVersionInfo, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Diagnostics.Process.dll:0:0:0:0 | System.Diagnostics.Process, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Diagnostics.StackTrace.dll:0:0:0:0 | System.Diagnostics.StackTrace, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Diagnostics.TextWriterTraceListener.dll:0:0:0:0 | System.Diagnostics.TextWriterTraceListener, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Diagnostics.Tools.dll:0:0:0:0 | System.Diagnostics.Tools, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Diagnostics.TraceSource.dll:0:0:0:0 | System.Diagnostics.TraceSource, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Diagnostics.Tracing.dll:0:0:0:0 | System.Diagnostics.Tracing, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Drawing.Primitives.dll:0:0:0:0 | System.Drawing.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Drawing.dll:0:0:0:0 | System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Dynamic.Runtime.dll:0:0:0:0 | System.Dynamic.Runtime, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Formats.Asn1.dll:0:0:0:0 | System.Formats.Asn1, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Formats.Tar.dll:0:0:0:0 | System.Formats.Tar, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Globalization.Calendars.dll:0:0:0:0 | System.Globalization.Calendars, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Globalization.Extensions.dll:0:0:0:0 | System.Globalization.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Globalization.dll:0:0:0:0 | System.Globalization, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.Compression.Brotli.dll:0:0:0:0 | System.IO.Compression.Brotli, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.Compression.FileSystem.dll:0:0:0:0 | System.IO.Compression.FileSystem, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.Compression.ZipFile.dll:0:0:0:0 | System.IO.Compression.ZipFile, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.Compression.dll:0:0:0:0 | System.IO.Compression, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.FileSystem.AccessControl.dll:0:0:0:0 | System.IO.FileSystem.AccessControl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.FileSystem.DriveInfo.dll:0:0:0:0 | System.IO.FileSystem.DriveInfo, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.FileSystem.Primitives.dll:0:0:0:0 | System.IO.FileSystem.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.FileSystem.Watcher.dll:0:0:0:0 | System.IO.FileSystem.Watcher, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.FileSystem.dll:0:0:0:0 | System.IO.FileSystem, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.IsolatedStorage.dll:0:0:0:0 | System.IO.IsolatedStorage, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.MemoryMappedFiles.dll:0:0:0:0 | System.IO.MemoryMappedFiles, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.Pipelines.dll:0:0:0:0 | System.IO.Pipelines, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.Pipes.AccessControl.dll:0:0:0:0 | System.IO.Pipes.AccessControl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.Pipes.dll:0:0:0:0 | System.IO.Pipes, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.UnmanagedMemoryStream.dll:0:0:0:0 | System.IO.UnmanagedMemoryStream, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.dll:0:0:0:0 | System.IO, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Linq.Expressions.dll:0:0:0:0 | System.Linq.Expressions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Linq.Parallel.dll:0:0:0:0 | System.Linq.Parallel, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Linq.Queryable.dll:0:0:0:0 | System.Linq.Queryable, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Linq.dll:0:0:0:0 | System.Linq, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Memory.dll:0:0:0:0 | System.Memory, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.Http.Json.dll:0:0:0:0 | System.Net.Http.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.Http.dll:0:0:0:0 | System.Net.Http, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.HttpListener.dll:0:0:0:0 | System.Net.HttpListener, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.Mail.dll:0:0:0:0 | System.Net.Mail, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.NameResolution.dll:0:0:0:0 | System.Net.NameResolution, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.NetworkInformation.dll:0:0:0:0 | System.Net.NetworkInformation, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.Ping.dll:0:0:0:0 | System.Net.Ping, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.Primitives.dll:0:0:0:0 | System.Net.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.Quic.dll:0:0:0:0 | System.Net.Quic, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.Requests.dll:0:0:0:0 | System.Net.Requests, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.Security.dll:0:0:0:0 | System.Net.Security, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.ServicePoint.dll:0:0:0:0 | System.Net.ServicePoint, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.Sockets.dll:0:0:0:0 | System.Net.Sockets, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.WebClient.dll:0:0:0:0 | System.Net.WebClient, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.WebHeaderCollection.dll:0:0:0:0 | System.Net.WebHeaderCollection, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.WebProxy.dll:0:0:0:0 | System.Net.WebProxy, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.WebSockets.Client.dll:0:0:0:0 | System.Net.WebSockets.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.WebSockets.dll:0:0:0:0 | System.Net.WebSockets, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.dll:0:0:0:0 | System.Net, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Numerics.Vectors.dll:0:0:0:0 | System.Numerics.Vectors, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Numerics.dll:0:0:0:0 | System.Numerics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.ObjectModel.dll:0:0:0:0 | System.ObjectModel, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Reflection.DispatchProxy.dll:0:0:0:0 | System.Reflection.DispatchProxy, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Reflection.Emit.ILGeneration.dll:0:0:0:0 | System.Reflection.Emit.ILGeneration, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Reflection.Emit.Lightweight.dll:0:0:0:0 | System.Reflection.Emit.Lightweight, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Reflection.Emit.dll:0:0:0:0 | System.Reflection.Emit, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Reflection.Extensions.dll:0:0:0:0 | System.Reflection.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Reflection.Metadata.dll:0:0:0:0 | System.Reflection.Metadata, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Reflection.Primitives.dll:0:0:0:0 | System.Reflection.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Reflection.TypeExtensions.dll:0:0:0:0 | System.Reflection.TypeExtensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Reflection.dll:0:0:0:0 | System.Reflection, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Resources.Reader.dll:0:0:0:0 | System.Resources.Reader, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Resources.ResourceManager.dll:0:0:0:0 | System.Resources.ResourceManager, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Resources.Writer.dll:0:0:0:0 | System.Resources.Writer, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.CompilerServices.Unsafe.dll:0:0:0:0 | System.Runtime.CompilerServices.Unsafe, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.CompilerServices.VisualC.dll:0:0:0:0 | System.Runtime.CompilerServices.VisualC, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.Extensions.dll:0:0:0:0 | System.Runtime.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.Handles.dll:0:0:0:0 | System.Runtime.Handles, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.InteropServices.JavaScript.dll:0:0:0:0 | System.Runtime.InteropServices.JavaScript, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.InteropServices.RuntimeInformation.dll:0:0:0:0 | System.Runtime.InteropServices.RuntimeInformation, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.InteropServices.dll:0:0:0:0 | System.Runtime.InteropServices, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.Intrinsics.dll:0:0:0:0 | System.Runtime.Intrinsics, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.Loader.dll:0:0:0:0 | System.Runtime.Loader, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.Numerics.dll:0:0:0:0 | System.Runtime.Numerics, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.Serialization.Formatters.dll:0:0:0:0 | System.Runtime.Serialization.Formatters, Version=8.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.Serialization.Json.dll:0:0:0:0 | System.Runtime.Serialization.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.Serialization.Primitives.dll:0:0:0:0 | System.Runtime.Serialization.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.Serialization.Xml.dll:0:0:0:0 | System.Runtime.Serialization.Xml, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.Serialization.dll:0:0:0:0 | System.Runtime.Serialization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.dll:0:0:0:0 | System.Runtime, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.AccessControl.dll:0:0:0:0 | System.Security.AccessControl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.Claims.dll:0:0:0:0 | System.Security.Claims, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.Cryptography.Algorithms.dll:0:0:0:0 | System.Security.Cryptography.Algorithms, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.Cryptography.Cng.dll:0:0:0:0 | System.Security.Cryptography.Cng, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.Cryptography.Csp.dll:0:0:0:0 | System.Security.Cryptography.Csp, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.Cryptography.Encoding.dll:0:0:0:0 | System.Security.Cryptography.Encoding, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.Cryptography.OpenSsl.dll:0:0:0:0 | System.Security.Cryptography.OpenSsl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.Cryptography.Primitives.dll:0:0:0:0 | System.Security.Cryptography.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.Cryptography.X509Certificates.dll:0:0:0:0 | System.Security.Cryptography.X509Certificates, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.Cryptography.dll:0:0:0:0 | System.Security.Cryptography, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.Principal.Windows.dll:0:0:0:0 | System.Security.Principal.Windows, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.Principal.dll:0:0:0:0 | System.Security.Principal, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.SecureString.dll:0:0:0:0 | System.Security.SecureString, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.dll:0:0:0:0 | System.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.ServiceModel.Web.dll:0:0:0:0 | System.ServiceModel.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.ServiceProcess.dll:0:0:0:0 | System.ServiceProcess, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Text.Encoding.CodePages.dll:0:0:0:0 | System.Text.Encoding.CodePages, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Text.Encoding.Extensions.dll:0:0:0:0 | System.Text.Encoding.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Text.Encoding.dll:0:0:0:0 | System.Text.Encoding, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Text.Encodings.Web.dll:0:0:0:0 | System.Text.Encodings.Web, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Text.Json.dll:0:0:0:0 | System.Text.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Text.RegularExpressions.dll:0:0:0:0 | System.Text.RegularExpressions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Threading.Channels.dll:0:0:0:0 | System.Threading.Channels, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Threading.Overlapped.dll:0:0:0:0 | System.Threading.Overlapped, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Threading.Tasks.Dataflow.dll:0:0:0:0 | System.Threading.Tasks.Dataflow, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Threading.Tasks.Extensions.dll:0:0:0:0 | System.Threading.Tasks.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Threading.Tasks.Parallel.dll:0:0:0:0 | System.Threading.Tasks.Parallel, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Threading.Tasks.dll:0:0:0:0 | System.Threading.Tasks, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Threading.Thread.dll:0:0:0:0 | System.Threading.Thread, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Threading.ThreadPool.dll:0:0:0:0 | System.Threading.ThreadPool, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Threading.Timer.dll:0:0:0:0 | System.Threading.Timer, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Threading.dll:0:0:0:0 | System.Threading, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Transactions.Local.dll:0:0:0:0 | System.Transactions.Local, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Transactions.dll:0:0:0:0 | System.Transactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.ValueTuple.dll:0:0:0:0 | System.ValueTuple, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Web.HttpUtility.dll:0:0:0:0 | System.Web.HttpUtility, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Web.dll:0:0:0:0 | System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Windows.dll:0:0:0:0 | System.Windows, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Xml.Linq.dll:0:0:0:0 | System.Xml.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Xml.ReaderWriter.dll:0:0:0:0 | System.Xml.ReaderWriter, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Xml.Serialization.dll:0:0:0:0 | System.Xml.Serialization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Xml.XDocument.dll:0:0:0:0 | System.Xml.XDocument, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Xml.XPath.XDocument.dll:0:0:0:0 | System.Xml.XPath.XDocument, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Xml.XPath.dll:0:0:0:0 | System.Xml.XPath, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Xml.XmlDocument.dll:0:0:0:0 | System.Xml.XmlDocument, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Xml.XmlSerializer.dll:0:0:0:0 | System.Xml.XmlSerializer, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Xml.dll:0:0:0:0 | System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.dll:0:0:0:0 | System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/WindowsBase.dll:0:0:0:0 | WindowsBase, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/mscorlib.dll:0:0:0:0 | mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/netstandard.dll:0:0:0:0 | netstandard, Version=2.1.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
 | test-db/working/packages/newtonsoft.json/12.0.1/lib/netstandard2.0/Newtonsoft.Json.dll:0:0:0:0 | Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed |
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies/global.json b/csharp/ql/integration-tests/posix/standalone_dependencies/global.json
index 65324522984..4c6e2601f69 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies/global.json
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "9.0.100"
+    "version": "9.0.304"
   }
 }
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_executing_runtime/Assemblies.expected b/csharp/ql/integration-tests/posix/standalone_dependencies_executing_runtime/Assemblies.expected
index a706f914cd9..bbfd3417df3 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies_executing_runtime/Assemblies.expected
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies_executing_runtime/Assemblies.expected
@@ -3,6 +3,7 @@
 | [...]/csharp/tools/[...]/MessagePack.Annotations.dll |
 | [...]/csharp/tools/[...]/MessagePack.dll |
 | [...]/csharp/tools/[...]/Microsoft.Bcl.AsyncInterfaces.dll |
+| [...]/csharp/tools/[...]/Microsoft.Bcl.Memory.dll |
 | [...]/csharp/tools/[...]/Microsoft.Build.Framework.dll |
 | [...]/csharp/tools/[...]/Microsoft.Build.Utilities.Core.dll |
 | [...]/csharp/tools/[...]/Microsoft.Build.dll |
@@ -20,6 +21,7 @@
 | [...]/csharp/tools/[...]/Microsoft.Win32.Primitives.dll |
 | [...]/csharp/tools/[...]/Microsoft.Win32.Registry.dll |
 | [...]/csharp/tools/[...]/Mono.Posix.NETStandard.dll |
+| [...]/csharp/tools/[...]/NaturalSort.Extension.dll |
 | [...]/csharp/tools/[...]/Newtonsoft.Json.dll |
 | [...]/csharp/tools/[...]/StructuredLogger.dll |
 | [...]/csharp/tools/[...]/System.AppContext.dll |
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_multi_project/Assemblies.expected b/csharp/ql/integration-tests/posix/standalone_dependencies_multi_project/Assemblies.expected
index 3e9c8fa753b..05b3826c73c 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies_multi_project/Assemblies.expected
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies_multi_project/Assemblies.expected
@@ -1,167 +1,167 @@
 | test-db/working/packages/avalara.avatax/23.11.0/lib/netstandard2.0/Avalara.AvaTax.RestClient.dll:0:0:0:0 | Avalara.AvaTax.RestClient, Version=0.0.0.0, Culture=neutral, PublicKeyToken=be94eb8ba37fd33c |
 | test-db/working/packages/microsoft.bcl.asyncinterfaces/8.0.0/lib/netstandard2.1/Microsoft.Bcl.AsyncInterfaces.dll:0:0:0:0 | Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/Microsoft.CSharp.dll:0:0:0:0 | Microsoft.CSharp, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/Microsoft.VisualBasic.Core.dll:0:0:0:0 | Microsoft.VisualBasic.Core, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/Microsoft.VisualBasic.dll:0:0:0:0 | Microsoft.VisualBasic, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/Microsoft.Win32.Primitives.dll:0:0:0:0 | Microsoft.Win32.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/Microsoft.Win32.Registry.dll:0:0:0:0 | Microsoft.Win32.Registry, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.AppContext.dll:0:0:0:0 | System.AppContext, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Buffers.dll:0:0:0:0 | System.Buffers, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Collections.Concurrent.dll:0:0:0:0 | System.Collections.Concurrent, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Collections.Immutable.dll:0:0:0:0 | System.Collections.Immutable, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Collections.NonGeneric.dll:0:0:0:0 | System.Collections.NonGeneric, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Collections.Specialized.dll:0:0:0:0 | System.Collections.Specialized, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Collections.dll:0:0:0:0 | System.Collections, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ComponentModel.Annotations.dll:0:0:0:0 | System.ComponentModel.Annotations, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ComponentModel.DataAnnotations.dll:0:0:0:0 | System.ComponentModel.DataAnnotations, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ComponentModel.EventBasedAsync.dll:0:0:0:0 | System.ComponentModel.EventBasedAsync, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ComponentModel.Primitives.dll:0:0:0:0 | System.ComponentModel.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ComponentModel.TypeConverter.dll:0:0:0:0 | System.ComponentModel.TypeConverter, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ComponentModel.dll:0:0:0:0 | System.ComponentModel, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Configuration.dll:0:0:0:0 | System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Console.dll:0:0:0:0 | System.Console, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Core.dll:0:0:0:0 | System.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Data.Common.dll:0:0:0:0 | System.Data.Common, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Data.DataSetExtensions.dll:0:0:0:0 | System.Data.DataSetExtensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Data.dll:0:0:0:0 | System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.Contracts.dll:0:0:0:0 | System.Diagnostics.Contracts, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.Debug.dll:0:0:0:0 | System.Diagnostics.Debug, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.DiagnosticSource.dll:0:0:0:0 | System.Diagnostics.DiagnosticSource, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.FileVersionInfo.dll:0:0:0:0 | System.Diagnostics.FileVersionInfo, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.Process.dll:0:0:0:0 | System.Diagnostics.Process, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.StackTrace.dll:0:0:0:0 | System.Diagnostics.StackTrace, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.TextWriterTraceListener.dll:0:0:0:0 | System.Diagnostics.TextWriterTraceListener, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.Tools.dll:0:0:0:0 | System.Diagnostics.Tools, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.TraceSource.dll:0:0:0:0 | System.Diagnostics.TraceSource, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.Tracing.dll:0:0:0:0 | System.Diagnostics.Tracing, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Drawing.Primitives.dll:0:0:0:0 | System.Drawing.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Drawing.dll:0:0:0:0 | System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Dynamic.Runtime.dll:0:0:0:0 | System.Dynamic.Runtime, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Formats.Asn1.dll:0:0:0:0 | System.Formats.Asn1, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Formats.Tar.dll:0:0:0:0 | System.Formats.Tar, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Globalization.Calendars.dll:0:0:0:0 | System.Globalization.Calendars, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Globalization.Extensions.dll:0:0:0:0 | System.Globalization.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Globalization.dll:0:0:0:0 | System.Globalization, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.Compression.Brotli.dll:0:0:0:0 | System.IO.Compression.Brotli, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.Compression.FileSystem.dll:0:0:0:0 | System.IO.Compression.FileSystem, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.Compression.ZipFile.dll:0:0:0:0 | System.IO.Compression.ZipFile, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.Compression.dll:0:0:0:0 | System.IO.Compression, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.FileSystem.AccessControl.dll:0:0:0:0 | System.IO.FileSystem.AccessControl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.FileSystem.DriveInfo.dll:0:0:0:0 | System.IO.FileSystem.DriveInfo, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.FileSystem.Primitives.dll:0:0:0:0 | System.IO.FileSystem.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.FileSystem.Watcher.dll:0:0:0:0 | System.IO.FileSystem.Watcher, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.FileSystem.dll:0:0:0:0 | System.IO.FileSystem, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.IsolatedStorage.dll:0:0:0:0 | System.IO.IsolatedStorage, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.MemoryMappedFiles.dll:0:0:0:0 | System.IO.MemoryMappedFiles, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.Pipelines.dll:0:0:0:0 | System.IO.Pipelines, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.Pipes.AccessControl.dll:0:0:0:0 | System.IO.Pipes.AccessControl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.Pipes.dll:0:0:0:0 | System.IO.Pipes, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.UnmanagedMemoryStream.dll:0:0:0:0 | System.IO.UnmanagedMemoryStream, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.dll:0:0:0:0 | System.IO, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Linq.Expressions.dll:0:0:0:0 | System.Linq.Expressions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Linq.Parallel.dll:0:0:0:0 | System.Linq.Parallel, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Linq.Queryable.dll:0:0:0:0 | System.Linq.Queryable, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Linq.dll:0:0:0:0 | System.Linq, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Memory.dll:0:0:0:0 | System.Memory, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Http.Json.dll:0:0:0:0 | System.Net.Http.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Http.dll:0:0:0:0 | System.Net.Http, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.HttpListener.dll:0:0:0:0 | System.Net.HttpListener, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Mail.dll:0:0:0:0 | System.Net.Mail, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.NameResolution.dll:0:0:0:0 | System.Net.NameResolution, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.NetworkInformation.dll:0:0:0:0 | System.Net.NetworkInformation, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Ping.dll:0:0:0:0 | System.Net.Ping, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Primitives.dll:0:0:0:0 | System.Net.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Quic.dll:0:0:0:0 | System.Net.Quic, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Requests.dll:0:0:0:0 | System.Net.Requests, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Security.dll:0:0:0:0 | System.Net.Security, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.ServicePoint.dll:0:0:0:0 | System.Net.ServicePoint, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Sockets.dll:0:0:0:0 | System.Net.Sockets, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.WebClient.dll:0:0:0:0 | System.Net.WebClient, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.WebHeaderCollection.dll:0:0:0:0 | System.Net.WebHeaderCollection, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.WebProxy.dll:0:0:0:0 | System.Net.WebProxy, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.WebSockets.Client.dll:0:0:0:0 | System.Net.WebSockets.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.WebSockets.dll:0:0:0:0 | System.Net.WebSockets, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.dll:0:0:0:0 | System.Net, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Numerics.Vectors.dll:0:0:0:0 | System.Numerics.Vectors, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Numerics.dll:0:0:0:0 | System.Numerics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ObjectModel.dll:0:0:0:0 | System.ObjectModel, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.DispatchProxy.dll:0:0:0:0 | System.Reflection.DispatchProxy, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.Emit.ILGeneration.dll:0:0:0:0 | System.Reflection.Emit.ILGeneration, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.Emit.Lightweight.dll:0:0:0:0 | System.Reflection.Emit.Lightweight, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.Emit.dll:0:0:0:0 | System.Reflection.Emit, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.Extensions.dll:0:0:0:0 | System.Reflection.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.Metadata.dll:0:0:0:0 | System.Reflection.Metadata, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.Primitives.dll:0:0:0:0 | System.Reflection.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.TypeExtensions.dll:0:0:0:0 | System.Reflection.TypeExtensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.dll:0:0:0:0 | System.Reflection, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Resources.Reader.dll:0:0:0:0 | System.Resources.Reader, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Resources.ResourceManager.dll:0:0:0:0 | System.Resources.ResourceManager, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Resources.Writer.dll:0:0:0:0 | System.Resources.Writer, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.CompilerServices.Unsafe.dll:0:0:0:0 | System.Runtime.CompilerServices.Unsafe, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.CompilerServices.VisualC.dll:0:0:0:0 | System.Runtime.CompilerServices.VisualC, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Extensions.dll:0:0:0:0 | System.Runtime.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Handles.dll:0:0:0:0 | System.Runtime.Handles, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.InteropServices.JavaScript.dll:0:0:0:0 | System.Runtime.InteropServices.JavaScript, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.InteropServices.RuntimeInformation.dll:0:0:0:0 | System.Runtime.InteropServices.RuntimeInformation, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.InteropServices.dll:0:0:0:0 | System.Runtime.InteropServices, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Intrinsics.dll:0:0:0:0 | System.Runtime.Intrinsics, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Loader.dll:0:0:0:0 | System.Runtime.Loader, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Numerics.dll:0:0:0:0 | System.Runtime.Numerics, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Serialization.Formatters.dll:0:0:0:0 | System.Runtime.Serialization.Formatters, Version=8.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Serialization.Json.dll:0:0:0:0 | System.Runtime.Serialization.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Serialization.Primitives.dll:0:0:0:0 | System.Runtime.Serialization.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Serialization.Xml.dll:0:0:0:0 | System.Runtime.Serialization.Xml, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Serialization.dll:0:0:0:0 | System.Runtime.Serialization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.dll:0:0:0:0 | System.Runtime, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.AccessControl.dll:0:0:0:0 | System.Security.AccessControl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Claims.dll:0:0:0:0 | System.Security.Claims, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.Algorithms.dll:0:0:0:0 | System.Security.Cryptography.Algorithms, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.Cng.dll:0:0:0:0 | System.Security.Cryptography.Cng, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.Csp.dll:0:0:0:0 | System.Security.Cryptography.Csp, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.Encoding.dll:0:0:0:0 | System.Security.Cryptography.Encoding, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.OpenSsl.dll:0:0:0:0 | System.Security.Cryptography.OpenSsl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.Primitives.dll:0:0:0:0 | System.Security.Cryptography.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.X509Certificates.dll:0:0:0:0 | System.Security.Cryptography.X509Certificates, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.dll:0:0:0:0 | System.Security.Cryptography, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Principal.Windows.dll:0:0:0:0 | System.Security.Principal.Windows, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Principal.dll:0:0:0:0 | System.Security.Principal, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.SecureString.dll:0:0:0:0 | System.Security.SecureString, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.dll:0:0:0:0 | System.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ServiceModel.Web.dll:0:0:0:0 | System.ServiceModel.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ServiceProcess.dll:0:0:0:0 | System.ServiceProcess, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Text.Encoding.CodePages.dll:0:0:0:0 | System.Text.Encoding.CodePages, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Text.Encoding.Extensions.dll:0:0:0:0 | System.Text.Encoding.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Text.Encoding.dll:0:0:0:0 | System.Text.Encoding, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Text.Encodings.Web.dll:0:0:0:0 | System.Text.Encodings.Web, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Text.Json.dll:0:0:0:0 | System.Text.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Text.RegularExpressions.dll:0:0:0:0 | System.Text.RegularExpressions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Channels.dll:0:0:0:0 | System.Threading.Channels, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Overlapped.dll:0:0:0:0 | System.Threading.Overlapped, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Tasks.Dataflow.dll:0:0:0:0 | System.Threading.Tasks.Dataflow, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Tasks.Extensions.dll:0:0:0:0 | System.Threading.Tasks.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Tasks.Parallel.dll:0:0:0:0 | System.Threading.Tasks.Parallel, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Tasks.dll:0:0:0:0 | System.Threading.Tasks, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Thread.dll:0:0:0:0 | System.Threading.Thread, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.ThreadPool.dll:0:0:0:0 | System.Threading.ThreadPool, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Timer.dll:0:0:0:0 | System.Threading.Timer, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.dll:0:0:0:0 | System.Threading, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Transactions.Local.dll:0:0:0:0 | System.Transactions.Local, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Transactions.dll:0:0:0:0 | System.Transactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ValueTuple.dll:0:0:0:0 | System.ValueTuple, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Web.HttpUtility.dll:0:0:0:0 | System.Web.HttpUtility, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Web.dll:0:0:0:0 | System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Windows.dll:0:0:0:0 | System.Windows, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Xml.Linq.dll:0:0:0:0 | System.Xml.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Xml.ReaderWriter.dll:0:0:0:0 | System.Xml.ReaderWriter, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Xml.Serialization.dll:0:0:0:0 | System.Xml.Serialization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Xml.XDocument.dll:0:0:0:0 | System.Xml.XDocument, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Xml.XPath.XDocument.dll:0:0:0:0 | System.Xml.XPath.XDocument, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Xml.XPath.dll:0:0:0:0 | System.Xml.XPath, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Xml.XmlDocument.dll:0:0:0:0 | System.Xml.XmlDocument, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Xml.XmlSerializer.dll:0:0:0:0 | System.Xml.XmlSerializer, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Xml.dll:0:0:0:0 | System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.dll:0:0:0:0 | System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/WindowsBase.dll:0:0:0:0 | WindowsBase, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/mscorlib.dll:0:0:0:0 | mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/netstandard.dll:0:0:0:0 | netstandard, Version=2.1.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/Microsoft.CSharp.dll:0:0:0:0 | Microsoft.CSharp, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/Microsoft.VisualBasic.Core.dll:0:0:0:0 | Microsoft.VisualBasic.Core, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/Microsoft.VisualBasic.dll:0:0:0:0 | Microsoft.VisualBasic, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/Microsoft.Win32.Primitives.dll:0:0:0:0 | Microsoft.Win32.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/Microsoft.Win32.Registry.dll:0:0:0:0 | Microsoft.Win32.Registry, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.AppContext.dll:0:0:0:0 | System.AppContext, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Buffers.dll:0:0:0:0 | System.Buffers, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Collections.Concurrent.dll:0:0:0:0 | System.Collections.Concurrent, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Collections.Immutable.dll:0:0:0:0 | System.Collections.Immutable, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Collections.NonGeneric.dll:0:0:0:0 | System.Collections.NonGeneric, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Collections.Specialized.dll:0:0:0:0 | System.Collections.Specialized, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Collections.dll:0:0:0:0 | System.Collections, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.ComponentModel.Annotations.dll:0:0:0:0 | System.ComponentModel.Annotations, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.ComponentModel.DataAnnotations.dll:0:0:0:0 | System.ComponentModel.DataAnnotations, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.ComponentModel.EventBasedAsync.dll:0:0:0:0 | System.ComponentModel.EventBasedAsync, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.ComponentModel.Primitives.dll:0:0:0:0 | System.ComponentModel.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.ComponentModel.TypeConverter.dll:0:0:0:0 | System.ComponentModel.TypeConverter, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.ComponentModel.dll:0:0:0:0 | System.ComponentModel, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Configuration.dll:0:0:0:0 | System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Console.dll:0:0:0:0 | System.Console, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Core.dll:0:0:0:0 | System.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Data.Common.dll:0:0:0:0 | System.Data.Common, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Data.DataSetExtensions.dll:0:0:0:0 | System.Data.DataSetExtensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Data.dll:0:0:0:0 | System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Diagnostics.Contracts.dll:0:0:0:0 | System.Diagnostics.Contracts, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Diagnostics.Debug.dll:0:0:0:0 | System.Diagnostics.Debug, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Diagnostics.DiagnosticSource.dll:0:0:0:0 | System.Diagnostics.DiagnosticSource, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Diagnostics.FileVersionInfo.dll:0:0:0:0 | System.Diagnostics.FileVersionInfo, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Diagnostics.Process.dll:0:0:0:0 | System.Diagnostics.Process, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Diagnostics.StackTrace.dll:0:0:0:0 | System.Diagnostics.StackTrace, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Diagnostics.TextWriterTraceListener.dll:0:0:0:0 | System.Diagnostics.TextWriterTraceListener, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Diagnostics.Tools.dll:0:0:0:0 | System.Diagnostics.Tools, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Diagnostics.TraceSource.dll:0:0:0:0 | System.Diagnostics.TraceSource, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Diagnostics.Tracing.dll:0:0:0:0 | System.Diagnostics.Tracing, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Drawing.Primitives.dll:0:0:0:0 | System.Drawing.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Drawing.dll:0:0:0:0 | System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Dynamic.Runtime.dll:0:0:0:0 | System.Dynamic.Runtime, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Formats.Asn1.dll:0:0:0:0 | System.Formats.Asn1, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Formats.Tar.dll:0:0:0:0 | System.Formats.Tar, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Globalization.Calendars.dll:0:0:0:0 | System.Globalization.Calendars, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Globalization.Extensions.dll:0:0:0:0 | System.Globalization.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Globalization.dll:0:0:0:0 | System.Globalization, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.Compression.Brotli.dll:0:0:0:0 | System.IO.Compression.Brotli, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.Compression.FileSystem.dll:0:0:0:0 | System.IO.Compression.FileSystem, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.Compression.ZipFile.dll:0:0:0:0 | System.IO.Compression.ZipFile, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.Compression.dll:0:0:0:0 | System.IO.Compression, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.FileSystem.AccessControl.dll:0:0:0:0 | System.IO.FileSystem.AccessControl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.FileSystem.DriveInfo.dll:0:0:0:0 | System.IO.FileSystem.DriveInfo, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.FileSystem.Primitives.dll:0:0:0:0 | System.IO.FileSystem.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.FileSystem.Watcher.dll:0:0:0:0 | System.IO.FileSystem.Watcher, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.FileSystem.dll:0:0:0:0 | System.IO.FileSystem, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.IsolatedStorage.dll:0:0:0:0 | System.IO.IsolatedStorage, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.MemoryMappedFiles.dll:0:0:0:0 | System.IO.MemoryMappedFiles, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.Pipelines.dll:0:0:0:0 | System.IO.Pipelines, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.Pipes.AccessControl.dll:0:0:0:0 | System.IO.Pipes.AccessControl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.Pipes.dll:0:0:0:0 | System.IO.Pipes, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.UnmanagedMemoryStream.dll:0:0:0:0 | System.IO.UnmanagedMemoryStream, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.dll:0:0:0:0 | System.IO, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Linq.Expressions.dll:0:0:0:0 | System.Linq.Expressions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Linq.Parallel.dll:0:0:0:0 | System.Linq.Parallel, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Linq.Queryable.dll:0:0:0:0 | System.Linq.Queryable, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Linq.dll:0:0:0:0 | System.Linq, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Memory.dll:0:0:0:0 | System.Memory, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.Http.Json.dll:0:0:0:0 | System.Net.Http.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.Http.dll:0:0:0:0 | System.Net.Http, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.HttpListener.dll:0:0:0:0 | System.Net.HttpListener, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.Mail.dll:0:0:0:0 | System.Net.Mail, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.NameResolution.dll:0:0:0:0 | System.Net.NameResolution, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.NetworkInformation.dll:0:0:0:0 | System.Net.NetworkInformation, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.Ping.dll:0:0:0:0 | System.Net.Ping, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.Primitives.dll:0:0:0:0 | System.Net.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.Quic.dll:0:0:0:0 | System.Net.Quic, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.Requests.dll:0:0:0:0 | System.Net.Requests, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.Security.dll:0:0:0:0 | System.Net.Security, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.ServicePoint.dll:0:0:0:0 | System.Net.ServicePoint, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.Sockets.dll:0:0:0:0 | System.Net.Sockets, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.WebClient.dll:0:0:0:0 | System.Net.WebClient, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.WebHeaderCollection.dll:0:0:0:0 | System.Net.WebHeaderCollection, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.WebProxy.dll:0:0:0:0 | System.Net.WebProxy, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.WebSockets.Client.dll:0:0:0:0 | System.Net.WebSockets.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.WebSockets.dll:0:0:0:0 | System.Net.WebSockets, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.dll:0:0:0:0 | System.Net, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Numerics.Vectors.dll:0:0:0:0 | System.Numerics.Vectors, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Numerics.dll:0:0:0:0 | System.Numerics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.ObjectModel.dll:0:0:0:0 | System.ObjectModel, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Reflection.DispatchProxy.dll:0:0:0:0 | System.Reflection.DispatchProxy, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Reflection.Emit.ILGeneration.dll:0:0:0:0 | System.Reflection.Emit.ILGeneration, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Reflection.Emit.Lightweight.dll:0:0:0:0 | System.Reflection.Emit.Lightweight, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Reflection.Emit.dll:0:0:0:0 | System.Reflection.Emit, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Reflection.Extensions.dll:0:0:0:0 | System.Reflection.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Reflection.Metadata.dll:0:0:0:0 | System.Reflection.Metadata, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Reflection.Primitives.dll:0:0:0:0 | System.Reflection.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Reflection.TypeExtensions.dll:0:0:0:0 | System.Reflection.TypeExtensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Reflection.dll:0:0:0:0 | System.Reflection, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Resources.Reader.dll:0:0:0:0 | System.Resources.Reader, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Resources.ResourceManager.dll:0:0:0:0 | System.Resources.ResourceManager, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Resources.Writer.dll:0:0:0:0 | System.Resources.Writer, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.CompilerServices.Unsafe.dll:0:0:0:0 | System.Runtime.CompilerServices.Unsafe, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.CompilerServices.VisualC.dll:0:0:0:0 | System.Runtime.CompilerServices.VisualC, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.Extensions.dll:0:0:0:0 | System.Runtime.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.Handles.dll:0:0:0:0 | System.Runtime.Handles, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.InteropServices.JavaScript.dll:0:0:0:0 | System.Runtime.InteropServices.JavaScript, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.InteropServices.RuntimeInformation.dll:0:0:0:0 | System.Runtime.InteropServices.RuntimeInformation, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.InteropServices.dll:0:0:0:0 | System.Runtime.InteropServices, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.Intrinsics.dll:0:0:0:0 | System.Runtime.Intrinsics, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.Loader.dll:0:0:0:0 | System.Runtime.Loader, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.Numerics.dll:0:0:0:0 | System.Runtime.Numerics, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.Serialization.Formatters.dll:0:0:0:0 | System.Runtime.Serialization.Formatters, Version=8.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.Serialization.Json.dll:0:0:0:0 | System.Runtime.Serialization.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.Serialization.Primitives.dll:0:0:0:0 | System.Runtime.Serialization.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.Serialization.Xml.dll:0:0:0:0 | System.Runtime.Serialization.Xml, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.Serialization.dll:0:0:0:0 | System.Runtime.Serialization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.dll:0:0:0:0 | System.Runtime, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.AccessControl.dll:0:0:0:0 | System.Security.AccessControl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.Claims.dll:0:0:0:0 | System.Security.Claims, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.Cryptography.Algorithms.dll:0:0:0:0 | System.Security.Cryptography.Algorithms, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.Cryptography.Cng.dll:0:0:0:0 | System.Security.Cryptography.Cng, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.Cryptography.Csp.dll:0:0:0:0 | System.Security.Cryptography.Csp, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.Cryptography.Encoding.dll:0:0:0:0 | System.Security.Cryptography.Encoding, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.Cryptography.OpenSsl.dll:0:0:0:0 | System.Security.Cryptography.OpenSsl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.Cryptography.Primitives.dll:0:0:0:0 | System.Security.Cryptography.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.Cryptography.X509Certificates.dll:0:0:0:0 | System.Security.Cryptography.X509Certificates, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.Cryptography.dll:0:0:0:0 | System.Security.Cryptography, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.Principal.Windows.dll:0:0:0:0 | System.Security.Principal.Windows, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.Principal.dll:0:0:0:0 | System.Security.Principal, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.SecureString.dll:0:0:0:0 | System.Security.SecureString, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.dll:0:0:0:0 | System.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.ServiceModel.Web.dll:0:0:0:0 | System.ServiceModel.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.ServiceProcess.dll:0:0:0:0 | System.ServiceProcess, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Text.Encoding.CodePages.dll:0:0:0:0 | System.Text.Encoding.CodePages, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Text.Encoding.Extensions.dll:0:0:0:0 | System.Text.Encoding.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Text.Encoding.dll:0:0:0:0 | System.Text.Encoding, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Text.Encodings.Web.dll:0:0:0:0 | System.Text.Encodings.Web, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Text.Json.dll:0:0:0:0 | System.Text.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Text.RegularExpressions.dll:0:0:0:0 | System.Text.RegularExpressions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Threading.Channels.dll:0:0:0:0 | System.Threading.Channels, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Threading.Overlapped.dll:0:0:0:0 | System.Threading.Overlapped, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Threading.Tasks.Dataflow.dll:0:0:0:0 | System.Threading.Tasks.Dataflow, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Threading.Tasks.Extensions.dll:0:0:0:0 | System.Threading.Tasks.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Threading.Tasks.Parallel.dll:0:0:0:0 | System.Threading.Tasks.Parallel, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Threading.Tasks.dll:0:0:0:0 | System.Threading.Tasks, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Threading.Thread.dll:0:0:0:0 | System.Threading.Thread, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Threading.ThreadPool.dll:0:0:0:0 | System.Threading.ThreadPool, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Threading.Timer.dll:0:0:0:0 | System.Threading.Timer, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Threading.dll:0:0:0:0 | System.Threading, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Transactions.Local.dll:0:0:0:0 | System.Transactions.Local, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Transactions.dll:0:0:0:0 | System.Transactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.ValueTuple.dll:0:0:0:0 | System.ValueTuple, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Web.HttpUtility.dll:0:0:0:0 | System.Web.HttpUtility, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Web.dll:0:0:0:0 | System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Windows.dll:0:0:0:0 | System.Windows, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Xml.Linq.dll:0:0:0:0 | System.Xml.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Xml.ReaderWriter.dll:0:0:0:0 | System.Xml.ReaderWriter, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Xml.Serialization.dll:0:0:0:0 | System.Xml.Serialization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Xml.XDocument.dll:0:0:0:0 | System.Xml.XDocument, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Xml.XPath.XDocument.dll:0:0:0:0 | System.Xml.XPath.XDocument, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Xml.XPath.dll:0:0:0:0 | System.Xml.XPath, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Xml.XmlDocument.dll:0:0:0:0 | System.Xml.XmlDocument, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Xml.XmlSerializer.dll:0:0:0:0 | System.Xml.XmlSerializer, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Xml.dll:0:0:0:0 | System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.dll:0:0:0:0 | System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/WindowsBase.dll:0:0:0:0 | WindowsBase, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/mscorlib.dll:0:0:0:0 | mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/netstandard.dll:0:0:0:0 | netstandard, Version=2.1.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
 | test-db/working/packages/newtonsoft.json/12.0.1/lib/netstandard2.0/Newtonsoft.Json.dll:0:0:0:0 | Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed |
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_multi_project/global.json b/csharp/ql/integration-tests/posix/standalone_dependencies_multi_project/global.json
index 65324522984..4c6e2601f69 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies_multi_project/global.json
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies_multi_project/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "9.0.100"
+    "version": "9.0.304"
   }
 }
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_multi_target/Assemblies.expected b/csharp/ql/integration-tests/posix/standalone_dependencies_multi_target/Assemblies.expected
index eb5ca93485b..1e4df659ded 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies_multi_target/Assemblies.expected
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies_multi_target/Assemblies.expected
@@ -1,164 +1,164 @@
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/Microsoft.CSharp.dll:0:0:0:0 | Microsoft.CSharp, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/Microsoft.VisualBasic.Core.dll:0:0:0:0 | Microsoft.VisualBasic.Core, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/Microsoft.VisualBasic.dll:0:0:0:0 | Microsoft.VisualBasic, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/Microsoft.Win32.Primitives.dll:0:0:0:0 | Microsoft.Win32.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/Microsoft.Win32.Registry.dll:0:0:0:0 | Microsoft.Win32.Registry, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.AppContext.dll:0:0:0:0 | System.AppContext, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Buffers.dll:0:0:0:0 | System.Buffers, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Collections.Concurrent.dll:0:0:0:0 | System.Collections.Concurrent, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Collections.Immutable.dll:0:0:0:0 | System.Collections.Immutable, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Collections.NonGeneric.dll:0:0:0:0 | System.Collections.NonGeneric, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Collections.Specialized.dll:0:0:0:0 | System.Collections.Specialized, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Collections.dll:0:0:0:0 | System.Collections, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ComponentModel.Annotations.dll:0:0:0:0 | System.ComponentModel.Annotations, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ComponentModel.DataAnnotations.dll:0:0:0:0 | System.ComponentModel.DataAnnotations, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ComponentModel.EventBasedAsync.dll:0:0:0:0 | System.ComponentModel.EventBasedAsync, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ComponentModel.Primitives.dll:0:0:0:0 | System.ComponentModel.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ComponentModel.TypeConverter.dll:0:0:0:0 | System.ComponentModel.TypeConverter, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ComponentModel.dll:0:0:0:0 | System.ComponentModel, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Configuration.dll:0:0:0:0 | System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Console.dll:0:0:0:0 | System.Console, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Core.dll:0:0:0:0 | System.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Data.Common.dll:0:0:0:0 | System.Data.Common, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Data.DataSetExtensions.dll:0:0:0:0 | System.Data.DataSetExtensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Data.dll:0:0:0:0 | System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.Contracts.dll:0:0:0:0 | System.Diagnostics.Contracts, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.Debug.dll:0:0:0:0 | System.Diagnostics.Debug, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.DiagnosticSource.dll:0:0:0:0 | System.Diagnostics.DiagnosticSource, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.FileVersionInfo.dll:0:0:0:0 | System.Diagnostics.FileVersionInfo, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.Process.dll:0:0:0:0 | System.Diagnostics.Process, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.StackTrace.dll:0:0:0:0 | System.Diagnostics.StackTrace, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.TextWriterTraceListener.dll:0:0:0:0 | System.Diagnostics.TextWriterTraceListener, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.Tools.dll:0:0:0:0 | System.Diagnostics.Tools, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.TraceSource.dll:0:0:0:0 | System.Diagnostics.TraceSource, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.Tracing.dll:0:0:0:0 | System.Diagnostics.Tracing, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Drawing.Primitives.dll:0:0:0:0 | System.Drawing.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Drawing.dll:0:0:0:0 | System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Dynamic.Runtime.dll:0:0:0:0 | System.Dynamic.Runtime, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Formats.Asn1.dll:0:0:0:0 | System.Formats.Asn1, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Formats.Tar.dll:0:0:0:0 | System.Formats.Tar, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Globalization.Calendars.dll:0:0:0:0 | System.Globalization.Calendars, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Globalization.Extensions.dll:0:0:0:0 | System.Globalization.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Globalization.dll:0:0:0:0 | System.Globalization, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.Compression.Brotli.dll:0:0:0:0 | System.IO.Compression.Brotli, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.Compression.FileSystem.dll:0:0:0:0 | System.IO.Compression.FileSystem, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.Compression.ZipFile.dll:0:0:0:0 | System.IO.Compression.ZipFile, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.Compression.dll:0:0:0:0 | System.IO.Compression, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.FileSystem.AccessControl.dll:0:0:0:0 | System.IO.FileSystem.AccessControl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.FileSystem.DriveInfo.dll:0:0:0:0 | System.IO.FileSystem.DriveInfo, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.FileSystem.Primitives.dll:0:0:0:0 | System.IO.FileSystem.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.FileSystem.Watcher.dll:0:0:0:0 | System.IO.FileSystem.Watcher, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.FileSystem.dll:0:0:0:0 | System.IO.FileSystem, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.IsolatedStorage.dll:0:0:0:0 | System.IO.IsolatedStorage, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.MemoryMappedFiles.dll:0:0:0:0 | System.IO.MemoryMappedFiles, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.Pipelines.dll:0:0:0:0 | System.IO.Pipelines, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.Pipes.AccessControl.dll:0:0:0:0 | System.IO.Pipes.AccessControl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.Pipes.dll:0:0:0:0 | System.IO.Pipes, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.UnmanagedMemoryStream.dll:0:0:0:0 | System.IO.UnmanagedMemoryStream, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.dll:0:0:0:0 | System.IO, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Linq.Expressions.dll:0:0:0:0 | System.Linq.Expressions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Linq.Parallel.dll:0:0:0:0 | System.Linq.Parallel, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Linq.Queryable.dll:0:0:0:0 | System.Linq.Queryable, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Linq.dll:0:0:0:0 | System.Linq, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Memory.dll:0:0:0:0 | System.Memory, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Http.Json.dll:0:0:0:0 | System.Net.Http.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Http.dll:0:0:0:0 | System.Net.Http, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.HttpListener.dll:0:0:0:0 | System.Net.HttpListener, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Mail.dll:0:0:0:0 | System.Net.Mail, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.NameResolution.dll:0:0:0:0 | System.Net.NameResolution, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.NetworkInformation.dll:0:0:0:0 | System.Net.NetworkInformation, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Ping.dll:0:0:0:0 | System.Net.Ping, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Primitives.dll:0:0:0:0 | System.Net.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Quic.dll:0:0:0:0 | System.Net.Quic, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Requests.dll:0:0:0:0 | System.Net.Requests, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Security.dll:0:0:0:0 | System.Net.Security, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.ServicePoint.dll:0:0:0:0 | System.Net.ServicePoint, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Sockets.dll:0:0:0:0 | System.Net.Sockets, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.WebClient.dll:0:0:0:0 | System.Net.WebClient, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.WebHeaderCollection.dll:0:0:0:0 | System.Net.WebHeaderCollection, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.WebProxy.dll:0:0:0:0 | System.Net.WebProxy, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.WebSockets.Client.dll:0:0:0:0 | System.Net.WebSockets.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.WebSockets.dll:0:0:0:0 | System.Net.WebSockets, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.dll:0:0:0:0 | System.Net, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Numerics.Vectors.dll:0:0:0:0 | System.Numerics.Vectors, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Numerics.dll:0:0:0:0 | System.Numerics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ObjectModel.dll:0:0:0:0 | System.ObjectModel, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.DispatchProxy.dll:0:0:0:0 | System.Reflection.DispatchProxy, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.Emit.ILGeneration.dll:0:0:0:0 | System.Reflection.Emit.ILGeneration, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.Emit.Lightweight.dll:0:0:0:0 | System.Reflection.Emit.Lightweight, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.Emit.dll:0:0:0:0 | System.Reflection.Emit, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.Extensions.dll:0:0:0:0 | System.Reflection.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.Metadata.dll:0:0:0:0 | System.Reflection.Metadata, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.Primitives.dll:0:0:0:0 | System.Reflection.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.TypeExtensions.dll:0:0:0:0 | System.Reflection.TypeExtensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.dll:0:0:0:0 | System.Reflection, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Resources.Reader.dll:0:0:0:0 | System.Resources.Reader, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Resources.ResourceManager.dll:0:0:0:0 | System.Resources.ResourceManager, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Resources.Writer.dll:0:0:0:0 | System.Resources.Writer, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.CompilerServices.Unsafe.dll:0:0:0:0 | System.Runtime.CompilerServices.Unsafe, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.CompilerServices.VisualC.dll:0:0:0:0 | System.Runtime.CompilerServices.VisualC, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Extensions.dll:0:0:0:0 | System.Runtime.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Handles.dll:0:0:0:0 | System.Runtime.Handles, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.InteropServices.JavaScript.dll:0:0:0:0 | System.Runtime.InteropServices.JavaScript, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.InteropServices.RuntimeInformation.dll:0:0:0:0 | System.Runtime.InteropServices.RuntimeInformation, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.InteropServices.dll:0:0:0:0 | System.Runtime.InteropServices, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Intrinsics.dll:0:0:0:0 | System.Runtime.Intrinsics, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Loader.dll:0:0:0:0 | System.Runtime.Loader, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Numerics.dll:0:0:0:0 | System.Runtime.Numerics, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Serialization.Formatters.dll:0:0:0:0 | System.Runtime.Serialization.Formatters, Version=8.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Serialization.Json.dll:0:0:0:0 | System.Runtime.Serialization.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Serialization.Primitives.dll:0:0:0:0 | System.Runtime.Serialization.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Serialization.Xml.dll:0:0:0:0 | System.Runtime.Serialization.Xml, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Serialization.dll:0:0:0:0 | System.Runtime.Serialization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.dll:0:0:0:0 | System.Runtime, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.AccessControl.dll:0:0:0:0 | System.Security.AccessControl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Claims.dll:0:0:0:0 | System.Security.Claims, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.Algorithms.dll:0:0:0:0 | System.Security.Cryptography.Algorithms, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.Cng.dll:0:0:0:0 | System.Security.Cryptography.Cng, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.Csp.dll:0:0:0:0 | System.Security.Cryptography.Csp, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.Encoding.dll:0:0:0:0 | System.Security.Cryptography.Encoding, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.OpenSsl.dll:0:0:0:0 | System.Security.Cryptography.OpenSsl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.Primitives.dll:0:0:0:0 | System.Security.Cryptography.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.X509Certificates.dll:0:0:0:0 | System.Security.Cryptography.X509Certificates, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.dll:0:0:0:0 | System.Security.Cryptography, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Principal.Windows.dll:0:0:0:0 | System.Security.Principal.Windows, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Principal.dll:0:0:0:0 | System.Security.Principal, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.SecureString.dll:0:0:0:0 | System.Security.SecureString, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.dll:0:0:0:0 | System.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ServiceModel.Web.dll:0:0:0:0 | System.ServiceModel.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ServiceProcess.dll:0:0:0:0 | System.ServiceProcess, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Text.Encoding.CodePages.dll:0:0:0:0 | System.Text.Encoding.CodePages, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Text.Encoding.Extensions.dll:0:0:0:0 | System.Text.Encoding.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Text.Encoding.dll:0:0:0:0 | System.Text.Encoding, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Text.Encodings.Web.dll:0:0:0:0 | System.Text.Encodings.Web, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Text.Json.dll:0:0:0:0 | System.Text.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Text.RegularExpressions.dll:0:0:0:0 | System.Text.RegularExpressions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Channels.dll:0:0:0:0 | System.Threading.Channels, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Overlapped.dll:0:0:0:0 | System.Threading.Overlapped, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Tasks.Dataflow.dll:0:0:0:0 | System.Threading.Tasks.Dataflow, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Tasks.Extensions.dll:0:0:0:0 | System.Threading.Tasks.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Tasks.Parallel.dll:0:0:0:0 | System.Threading.Tasks.Parallel, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Tasks.dll:0:0:0:0 | System.Threading.Tasks, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Thread.dll:0:0:0:0 | System.Threading.Thread, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.ThreadPool.dll:0:0:0:0 | System.Threading.ThreadPool, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Timer.dll:0:0:0:0 | System.Threading.Timer, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.dll:0:0:0:0 | System.Threading, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Transactions.Local.dll:0:0:0:0 | System.Transactions.Local, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Transactions.dll:0:0:0:0 | System.Transactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ValueTuple.dll:0:0:0:0 | System.ValueTuple, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Web.HttpUtility.dll:0:0:0:0 | System.Web.HttpUtility, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Web.dll:0:0:0:0 | System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Windows.dll:0:0:0:0 | System.Windows, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Xml.Linq.dll:0:0:0:0 | System.Xml.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Xml.ReaderWriter.dll:0:0:0:0 | System.Xml.ReaderWriter, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Xml.Serialization.dll:0:0:0:0 | System.Xml.Serialization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Xml.XDocument.dll:0:0:0:0 | System.Xml.XDocument, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Xml.XPath.XDocument.dll:0:0:0:0 | System.Xml.XPath.XDocument, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Xml.XPath.dll:0:0:0:0 | System.Xml.XPath, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Xml.XmlDocument.dll:0:0:0:0 | System.Xml.XmlDocument, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Xml.XmlSerializer.dll:0:0:0:0 | System.Xml.XmlSerializer, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Xml.dll:0:0:0:0 | System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.dll:0:0:0:0 | System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/WindowsBase.dll:0:0:0:0 | WindowsBase, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/mscorlib.dll:0:0:0:0 | mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/netstandard.dll:0:0:0:0 | netstandard, Version=2.1.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/Microsoft.CSharp.dll:0:0:0:0 | Microsoft.CSharp, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/Microsoft.VisualBasic.Core.dll:0:0:0:0 | Microsoft.VisualBasic.Core, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/Microsoft.VisualBasic.dll:0:0:0:0 | Microsoft.VisualBasic, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/Microsoft.Win32.Primitives.dll:0:0:0:0 | Microsoft.Win32.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/Microsoft.Win32.Registry.dll:0:0:0:0 | Microsoft.Win32.Registry, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.AppContext.dll:0:0:0:0 | System.AppContext, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Buffers.dll:0:0:0:0 | System.Buffers, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Collections.Concurrent.dll:0:0:0:0 | System.Collections.Concurrent, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Collections.Immutable.dll:0:0:0:0 | System.Collections.Immutable, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Collections.NonGeneric.dll:0:0:0:0 | System.Collections.NonGeneric, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Collections.Specialized.dll:0:0:0:0 | System.Collections.Specialized, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Collections.dll:0:0:0:0 | System.Collections, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.ComponentModel.Annotations.dll:0:0:0:0 | System.ComponentModel.Annotations, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.ComponentModel.DataAnnotations.dll:0:0:0:0 | System.ComponentModel.DataAnnotations, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.ComponentModel.EventBasedAsync.dll:0:0:0:0 | System.ComponentModel.EventBasedAsync, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.ComponentModel.Primitives.dll:0:0:0:0 | System.ComponentModel.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.ComponentModel.TypeConverter.dll:0:0:0:0 | System.ComponentModel.TypeConverter, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.ComponentModel.dll:0:0:0:0 | System.ComponentModel, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Configuration.dll:0:0:0:0 | System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Console.dll:0:0:0:0 | System.Console, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Core.dll:0:0:0:0 | System.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Data.Common.dll:0:0:0:0 | System.Data.Common, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Data.DataSetExtensions.dll:0:0:0:0 | System.Data.DataSetExtensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Data.dll:0:0:0:0 | System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Diagnostics.Contracts.dll:0:0:0:0 | System.Diagnostics.Contracts, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Diagnostics.Debug.dll:0:0:0:0 | System.Diagnostics.Debug, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Diagnostics.DiagnosticSource.dll:0:0:0:0 | System.Diagnostics.DiagnosticSource, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Diagnostics.FileVersionInfo.dll:0:0:0:0 | System.Diagnostics.FileVersionInfo, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Diagnostics.Process.dll:0:0:0:0 | System.Diagnostics.Process, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Diagnostics.StackTrace.dll:0:0:0:0 | System.Diagnostics.StackTrace, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Diagnostics.TextWriterTraceListener.dll:0:0:0:0 | System.Diagnostics.TextWriterTraceListener, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Diagnostics.Tools.dll:0:0:0:0 | System.Diagnostics.Tools, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Diagnostics.TraceSource.dll:0:0:0:0 | System.Diagnostics.TraceSource, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Diagnostics.Tracing.dll:0:0:0:0 | System.Diagnostics.Tracing, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Drawing.Primitives.dll:0:0:0:0 | System.Drawing.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Drawing.dll:0:0:0:0 | System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Dynamic.Runtime.dll:0:0:0:0 | System.Dynamic.Runtime, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Formats.Asn1.dll:0:0:0:0 | System.Formats.Asn1, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Formats.Tar.dll:0:0:0:0 | System.Formats.Tar, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Globalization.Calendars.dll:0:0:0:0 | System.Globalization.Calendars, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Globalization.Extensions.dll:0:0:0:0 | System.Globalization.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Globalization.dll:0:0:0:0 | System.Globalization, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.Compression.Brotli.dll:0:0:0:0 | System.IO.Compression.Brotli, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.Compression.FileSystem.dll:0:0:0:0 | System.IO.Compression.FileSystem, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.Compression.ZipFile.dll:0:0:0:0 | System.IO.Compression.ZipFile, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.Compression.dll:0:0:0:0 | System.IO.Compression, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.FileSystem.AccessControl.dll:0:0:0:0 | System.IO.FileSystem.AccessControl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.FileSystem.DriveInfo.dll:0:0:0:0 | System.IO.FileSystem.DriveInfo, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.FileSystem.Primitives.dll:0:0:0:0 | System.IO.FileSystem.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.FileSystem.Watcher.dll:0:0:0:0 | System.IO.FileSystem.Watcher, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.FileSystem.dll:0:0:0:0 | System.IO.FileSystem, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.IsolatedStorage.dll:0:0:0:0 | System.IO.IsolatedStorage, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.MemoryMappedFiles.dll:0:0:0:0 | System.IO.MemoryMappedFiles, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.Pipelines.dll:0:0:0:0 | System.IO.Pipelines, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.Pipes.AccessControl.dll:0:0:0:0 | System.IO.Pipes.AccessControl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.Pipes.dll:0:0:0:0 | System.IO.Pipes, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.UnmanagedMemoryStream.dll:0:0:0:0 | System.IO.UnmanagedMemoryStream, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.dll:0:0:0:0 | System.IO, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Linq.Expressions.dll:0:0:0:0 | System.Linq.Expressions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Linq.Parallel.dll:0:0:0:0 | System.Linq.Parallel, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Linq.Queryable.dll:0:0:0:0 | System.Linq.Queryable, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Linq.dll:0:0:0:0 | System.Linq, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Memory.dll:0:0:0:0 | System.Memory, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.Http.Json.dll:0:0:0:0 | System.Net.Http.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.Http.dll:0:0:0:0 | System.Net.Http, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.HttpListener.dll:0:0:0:0 | System.Net.HttpListener, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.Mail.dll:0:0:0:0 | System.Net.Mail, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.NameResolution.dll:0:0:0:0 | System.Net.NameResolution, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.NetworkInformation.dll:0:0:0:0 | System.Net.NetworkInformation, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.Ping.dll:0:0:0:0 | System.Net.Ping, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.Primitives.dll:0:0:0:0 | System.Net.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.Quic.dll:0:0:0:0 | System.Net.Quic, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.Requests.dll:0:0:0:0 | System.Net.Requests, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.Security.dll:0:0:0:0 | System.Net.Security, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.ServicePoint.dll:0:0:0:0 | System.Net.ServicePoint, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.Sockets.dll:0:0:0:0 | System.Net.Sockets, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.WebClient.dll:0:0:0:0 | System.Net.WebClient, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.WebHeaderCollection.dll:0:0:0:0 | System.Net.WebHeaderCollection, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.WebProxy.dll:0:0:0:0 | System.Net.WebProxy, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.WebSockets.Client.dll:0:0:0:0 | System.Net.WebSockets.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.WebSockets.dll:0:0:0:0 | System.Net.WebSockets, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.dll:0:0:0:0 | System.Net, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Numerics.Vectors.dll:0:0:0:0 | System.Numerics.Vectors, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Numerics.dll:0:0:0:0 | System.Numerics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.ObjectModel.dll:0:0:0:0 | System.ObjectModel, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Reflection.DispatchProxy.dll:0:0:0:0 | System.Reflection.DispatchProxy, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Reflection.Emit.ILGeneration.dll:0:0:0:0 | System.Reflection.Emit.ILGeneration, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Reflection.Emit.Lightweight.dll:0:0:0:0 | System.Reflection.Emit.Lightweight, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Reflection.Emit.dll:0:0:0:0 | System.Reflection.Emit, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Reflection.Extensions.dll:0:0:0:0 | System.Reflection.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Reflection.Metadata.dll:0:0:0:0 | System.Reflection.Metadata, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Reflection.Primitives.dll:0:0:0:0 | System.Reflection.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Reflection.TypeExtensions.dll:0:0:0:0 | System.Reflection.TypeExtensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Reflection.dll:0:0:0:0 | System.Reflection, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Resources.Reader.dll:0:0:0:0 | System.Resources.Reader, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Resources.ResourceManager.dll:0:0:0:0 | System.Resources.ResourceManager, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Resources.Writer.dll:0:0:0:0 | System.Resources.Writer, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.CompilerServices.Unsafe.dll:0:0:0:0 | System.Runtime.CompilerServices.Unsafe, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.CompilerServices.VisualC.dll:0:0:0:0 | System.Runtime.CompilerServices.VisualC, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.Extensions.dll:0:0:0:0 | System.Runtime.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.Handles.dll:0:0:0:0 | System.Runtime.Handles, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.InteropServices.JavaScript.dll:0:0:0:0 | System.Runtime.InteropServices.JavaScript, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.InteropServices.RuntimeInformation.dll:0:0:0:0 | System.Runtime.InteropServices.RuntimeInformation, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.InteropServices.dll:0:0:0:0 | System.Runtime.InteropServices, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.Intrinsics.dll:0:0:0:0 | System.Runtime.Intrinsics, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.Loader.dll:0:0:0:0 | System.Runtime.Loader, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.Numerics.dll:0:0:0:0 | System.Runtime.Numerics, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.Serialization.Formatters.dll:0:0:0:0 | System.Runtime.Serialization.Formatters, Version=8.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.Serialization.Json.dll:0:0:0:0 | System.Runtime.Serialization.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.Serialization.Primitives.dll:0:0:0:0 | System.Runtime.Serialization.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.Serialization.Xml.dll:0:0:0:0 | System.Runtime.Serialization.Xml, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.Serialization.dll:0:0:0:0 | System.Runtime.Serialization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.dll:0:0:0:0 | System.Runtime, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.AccessControl.dll:0:0:0:0 | System.Security.AccessControl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.Claims.dll:0:0:0:0 | System.Security.Claims, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.Cryptography.Algorithms.dll:0:0:0:0 | System.Security.Cryptography.Algorithms, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.Cryptography.Cng.dll:0:0:0:0 | System.Security.Cryptography.Cng, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.Cryptography.Csp.dll:0:0:0:0 | System.Security.Cryptography.Csp, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.Cryptography.Encoding.dll:0:0:0:0 | System.Security.Cryptography.Encoding, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.Cryptography.OpenSsl.dll:0:0:0:0 | System.Security.Cryptography.OpenSsl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.Cryptography.Primitives.dll:0:0:0:0 | System.Security.Cryptography.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.Cryptography.X509Certificates.dll:0:0:0:0 | System.Security.Cryptography.X509Certificates, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.Cryptography.dll:0:0:0:0 | System.Security.Cryptography, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.Principal.Windows.dll:0:0:0:0 | System.Security.Principal.Windows, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.Principal.dll:0:0:0:0 | System.Security.Principal, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.SecureString.dll:0:0:0:0 | System.Security.SecureString, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.dll:0:0:0:0 | System.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.ServiceModel.Web.dll:0:0:0:0 | System.ServiceModel.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.ServiceProcess.dll:0:0:0:0 | System.ServiceProcess, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Text.Encoding.CodePages.dll:0:0:0:0 | System.Text.Encoding.CodePages, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Text.Encoding.Extensions.dll:0:0:0:0 | System.Text.Encoding.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Text.Encoding.dll:0:0:0:0 | System.Text.Encoding, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Text.Encodings.Web.dll:0:0:0:0 | System.Text.Encodings.Web, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Text.Json.dll:0:0:0:0 | System.Text.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Text.RegularExpressions.dll:0:0:0:0 | System.Text.RegularExpressions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Threading.Channels.dll:0:0:0:0 | System.Threading.Channels, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Threading.Overlapped.dll:0:0:0:0 | System.Threading.Overlapped, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Threading.Tasks.Dataflow.dll:0:0:0:0 | System.Threading.Tasks.Dataflow, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Threading.Tasks.Extensions.dll:0:0:0:0 | System.Threading.Tasks.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Threading.Tasks.Parallel.dll:0:0:0:0 | System.Threading.Tasks.Parallel, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Threading.Tasks.dll:0:0:0:0 | System.Threading.Tasks, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Threading.Thread.dll:0:0:0:0 | System.Threading.Thread, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Threading.ThreadPool.dll:0:0:0:0 | System.Threading.ThreadPool, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Threading.Timer.dll:0:0:0:0 | System.Threading.Timer, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Threading.dll:0:0:0:0 | System.Threading, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Transactions.Local.dll:0:0:0:0 | System.Transactions.Local, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Transactions.dll:0:0:0:0 | System.Transactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.ValueTuple.dll:0:0:0:0 | System.ValueTuple, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Web.HttpUtility.dll:0:0:0:0 | System.Web.HttpUtility, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Web.dll:0:0:0:0 | System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Windows.dll:0:0:0:0 | System.Windows, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Xml.Linq.dll:0:0:0:0 | System.Xml.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Xml.ReaderWriter.dll:0:0:0:0 | System.Xml.ReaderWriter, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Xml.Serialization.dll:0:0:0:0 | System.Xml.Serialization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Xml.XDocument.dll:0:0:0:0 | System.Xml.XDocument, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Xml.XPath.XDocument.dll:0:0:0:0 | System.Xml.XPath.XDocument, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Xml.XPath.dll:0:0:0:0 | System.Xml.XPath, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Xml.XmlDocument.dll:0:0:0:0 | System.Xml.XmlDocument, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Xml.XmlSerializer.dll:0:0:0:0 | System.Xml.XmlSerializer, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Xml.dll:0:0:0:0 | System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.dll:0:0:0:0 | System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/WindowsBase.dll:0:0:0:0 | WindowsBase, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/mscorlib.dll:0:0:0:0 | mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/netstandard.dll:0:0:0:0 | netstandard, Version=2.1.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_multi_target/global.json b/csharp/ql/integration-tests/posix/standalone_dependencies_multi_target/global.json
index 65324522984..4c6e2601f69 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies_multi_target/global.json
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies_multi_target/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "9.0.100"
+    "version": "9.0.304"
   }
 }
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_no_framework/global.json b/csharp/ql/integration-tests/posix/standalone_dependencies_no_framework/global.json
index 76474f06d04..d488208a2a7 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies_no_framework/global.json
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies_no_framework/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "9.0.100"
+        "version": "9.0.304"
     }
 }
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget with_space/global.json b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget with_space/global.json
index 76474f06d04..d488208a2a7 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget with_space/global.json	
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget with_space/global.json	
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "9.0.100"
+        "version": "9.0.304"
     }
 }
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget/global.json b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget/global.json
index 76474f06d04..d488208a2a7 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget/global.json
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "9.0.100"
+        "version": "9.0.304"
     }
 }
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error/Assemblies.expected b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error/Assemblies.expected
index 4b2df5c2e32..539f3992b9e 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error/Assemblies.expected
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error/Assemblies.expected
@@ -1 +1 @@
-| test-db/working/missingpackages/newtonsoft.json/13.0.3/lib/net6.0/Newtonsoft.Json.dll:0:0:0:0 | Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed |
+| test-db/working/missingpackages/newtonsoft.json/13.0.4/lib/net6.0/Newtonsoft.Json.dll:0:0:0:0 | Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed |
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error/global.json b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error/global.json
index 76474f06d04..d488208a2a7 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error/global.json
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "9.0.100"
+        "version": "9.0.304"
     }
 }
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error/proj/proj.csproj b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error/proj/proj.csproj
index b73f743f95c..e16e4f4b6a6 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error/proj/proj.csproj
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error/proj/proj.csproj
@@ -11,6 +11,6 @@
   </Target>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
   </ItemGroup>
 </Project>
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error/test.py b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error/test.py
index 5aaafca6a46..42405ca54d4 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error/test.py
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error/test.py
@@ -1,6 +1,11 @@
+import os
 import runs_on
 
 
 @runs_on.posix
 def test(codeql, csharp):
+    # Making sure the reachability test of `nuget.org` succeeds:
+    os.environ["CODEQL_EXTRACTOR_CSHARP_BUILDLESS_NUGET_FEEDS_CHECK_FALLBACK_TIMEOUT"] = "1000"
+    os.environ["CODEQL_EXTRACTOR_CSHARP_BUILDLESS_NUGET_FEEDS_CHECK_FALLBACK_LIMIT"] = "5"
+
     codeql.database.create(build_mode="none")
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error_timeout/Assemblies.expected b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error_timeout/Assemblies.expected
index 4b2df5c2e32..539f3992b9e 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error_timeout/Assemblies.expected
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error_timeout/Assemblies.expected
@@ -1 +1 @@
-| test-db/working/missingpackages/newtonsoft.json/13.0.3/lib/net6.0/Newtonsoft.Json.dll:0:0:0:0 | Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed |
+| test-db/working/missingpackages/newtonsoft.json/13.0.4/lib/net6.0/Newtonsoft.Json.dll:0:0:0:0 | Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed |
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error_timeout/proj/proj.csproj b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error_timeout/proj/proj.csproj
index b73f743f95c..e16e4f4b6a6 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error_timeout/proj/proj.csproj
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error_timeout/proj/proj.csproj
@@ -11,6 +11,6 @@
   </Target>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
   </ItemGroup>
 </Project>
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_fallback/Assemblies.expected b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_fallback/Assemblies.expected
index 4b2df5c2e32..539f3992b9e 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_fallback/Assemblies.expected
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_fallback/Assemblies.expected
@@ -1 +1 @@
-| test-db/working/missingpackages/newtonsoft.json/13.0.3/lib/net6.0/Newtonsoft.Json.dll:0:0:0:0 | Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed |
+| test-db/working/missingpackages/newtonsoft.json/13.0.4/lib/net6.0/Newtonsoft.Json.dll:0:0:0:0 | Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed |
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_fallback/proj/proj.csproj b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_fallback/proj/proj.csproj
index b73f743f95c..e16e4f4b6a6 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_fallback/proj/proj.csproj
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_fallback/proj/proj.csproj
@@ -11,6 +11,6 @@
   </Target>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
   </ItemGroup>
 </Project>
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_no_sources/proj/global.json b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_no_sources/proj/global.json
index 76474f06d04..d488208a2a7 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_no_sources/proj/global.json
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_no_sources/proj/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "9.0.100"
+        "version": "9.0.304"
     }
 }
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_versions/global.json b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_versions/global.json
index 76474f06d04..d488208a2a7 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_versions/global.json
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_versions/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "9.0.100"
+        "version": "9.0.304"
     }
 }
diff --git a/csharp/ql/integration-tests/posix/warn_as_error/global.json b/csharp/ql/integration-tests/posix/warn_as_error/global.json
index 76474f06d04..d488208a2a7 100644
--- a/csharp/ql/integration-tests/posix/warn_as_error/global.json
+++ b/csharp/ql/integration-tests/posix/warn_as_error/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "9.0.100"
+        "version": "9.0.304"
     }
 }
diff --git a/csharp/ql/integration-tests/windows/dotnet_10_rc2/Program.cs b/csharp/ql/integration-tests/windows/dotnet_10_rc2/Program.cs
new file mode 100644
index 00000000000..bd44629f7e2
--- /dev/null
+++ b/csharp/ql/integration-tests/windows/dotnet_10_rc2/Program.cs
@@ -0,0 +1 @@
+Console.WriteLine($"<arguments>{string.Join(",", args)}</arguments>");
diff --git a/csharp/ql/integration-tests/windows/dotnet_10_rc2/dotnet_build.csproj b/csharp/ql/integration-tests/windows/dotnet_10_rc2/dotnet_build.csproj
new file mode 100644
index 00000000000..dfb40caafcf
--- /dev/null
+++ b/csharp/ql/integration-tests/windows/dotnet_10_rc2/dotnet_build.csproj
@@ -0,0 +1,10 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net10.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>
diff --git a/csharp/ql/integration-tests/windows/dotnet_10_rc2/global.json b/csharp/ql/integration-tests/windows/dotnet_10_rc2/global.json
new file mode 100644
index 00000000000..e870e2cf7bd
--- /dev/null
+++ b/csharp/ql/integration-tests/windows/dotnet_10_rc2/global.json
@@ -0,0 +1,5 @@
+{
+    "sdk": {
+        "version": "10.0.100-rc.2.25502.107"
+    }
+}
diff --git a/csharp/ql/integration-tests/windows/dotnet_10_rc2/test.py b/csharp/ql/integration-tests/windows/dotnet_10_rc2/test.py
new file mode 100644
index 00000000000..00905b67cd4
--- /dev/null
+++ b/csharp/ql/integration-tests/windows/dotnet_10_rc2/test.py
@@ -0,0 +1,6 @@
+import os
+import runs_on
+
+@runs_on.windows
+def test(codeql, csharp):
+    codeql.database.create()
diff --git a/csharp/ql/integration-tests/windows/standalone_dependencies/Assemblies.expected b/csharp/ql/integration-tests/windows/standalone_dependencies/Assemblies.expected
index a001f7f23d7..0b4ea613c8e 100644
--- a/csharp/ql/integration-tests/windows/standalone_dependencies/Assemblies.expected
+++ b/csharp/ql/integration-tests/windows/standalone_dependencies/Assemblies.expected
@@ -1,213 +1,213 @@
 | test-db/working/packages/avalara.avatax/23.11.0/lib/netstandard2.0/Avalara.AvaTax.RestClient.dll:0:0:0:0 | Avalara.AvaTax.RestClient, Version=0.0.0.0, Culture=neutral, PublicKeyToken=be94eb8ba37fd33c |
 | test-db/working/packages/microsoft.bcl.asyncinterfaces/8.0.0/lib/netstandard2.1/Microsoft.Bcl.AsyncInterfaces.dll:0:0:0:0 | Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/Microsoft.CSharp.dll:0:0:0:0 | Microsoft.CSharp, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/Microsoft.VisualBasic.Core.dll:0:0:0:0 | Microsoft.VisualBasic.Core, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/Microsoft.Win32.Primitives.dll:0:0:0:0 | Microsoft.Win32.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/Microsoft.Win32.Registry.dll:0:0:0:0 | Microsoft.Win32.Registry, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.AppContext.dll:0:0:0:0 | System.AppContext, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Buffers.dll:0:0:0:0 | System.Buffers, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Collections.Concurrent.dll:0:0:0:0 | System.Collections.Concurrent, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Collections.Immutable.dll:0:0:0:0 | System.Collections.Immutable, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Collections.NonGeneric.dll:0:0:0:0 | System.Collections.NonGeneric, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Collections.Specialized.dll:0:0:0:0 | System.Collections.Specialized, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Collections.dll:0:0:0:0 | System.Collections, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ComponentModel.Annotations.dll:0:0:0:0 | System.ComponentModel.Annotations, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ComponentModel.DataAnnotations.dll:0:0:0:0 | System.ComponentModel.DataAnnotations, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ComponentModel.EventBasedAsync.dll:0:0:0:0 | System.ComponentModel.EventBasedAsync, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ComponentModel.Primitives.dll:0:0:0:0 | System.ComponentModel.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ComponentModel.TypeConverter.dll:0:0:0:0 | System.ComponentModel.TypeConverter, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ComponentModel.dll:0:0:0:0 | System.ComponentModel, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Configuration.dll:0:0:0:0 | System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Console.dll:0:0:0:0 | System.Console, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Core.dll:0:0:0:0 | System.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Data.Common.dll:0:0:0:0 | System.Data.Common, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Data.DataSetExtensions.dll:0:0:0:0 | System.Data.DataSetExtensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Data.dll:0:0:0:0 | System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.Contracts.dll:0:0:0:0 | System.Diagnostics.Contracts, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.Debug.dll:0:0:0:0 | System.Diagnostics.Debug, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.DiagnosticSource.dll:0:0:0:0 | System.Diagnostics.DiagnosticSource, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.FileVersionInfo.dll:0:0:0:0 | System.Diagnostics.FileVersionInfo, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.Process.dll:0:0:0:0 | System.Diagnostics.Process, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.StackTrace.dll:0:0:0:0 | System.Diagnostics.StackTrace, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.TextWriterTraceListener.dll:0:0:0:0 | System.Diagnostics.TextWriterTraceListener, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.Tools.dll:0:0:0:0 | System.Diagnostics.Tools, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.TraceSource.dll:0:0:0:0 | System.Diagnostics.TraceSource, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Diagnostics.Tracing.dll:0:0:0:0 | System.Diagnostics.Tracing, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Drawing.Primitives.dll:0:0:0:0 | System.Drawing.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Dynamic.Runtime.dll:0:0:0:0 | System.Dynamic.Runtime, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Formats.Asn1.dll:0:0:0:0 | System.Formats.Asn1, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Formats.Tar.dll:0:0:0:0 | System.Formats.Tar, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Globalization.Calendars.dll:0:0:0:0 | System.Globalization.Calendars, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Globalization.Extensions.dll:0:0:0:0 | System.Globalization.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Globalization.dll:0:0:0:0 | System.Globalization, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.Compression.Brotli.dll:0:0:0:0 | System.IO.Compression.Brotli, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.Compression.FileSystem.dll:0:0:0:0 | System.IO.Compression.FileSystem, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.Compression.ZipFile.dll:0:0:0:0 | System.IO.Compression.ZipFile, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.Compression.dll:0:0:0:0 | System.IO.Compression, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.FileSystem.AccessControl.dll:0:0:0:0 | System.IO.FileSystem.AccessControl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.FileSystem.DriveInfo.dll:0:0:0:0 | System.IO.FileSystem.DriveInfo, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.FileSystem.Primitives.dll:0:0:0:0 | System.IO.FileSystem.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.FileSystem.Watcher.dll:0:0:0:0 | System.IO.FileSystem.Watcher, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.FileSystem.dll:0:0:0:0 | System.IO.FileSystem, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.IsolatedStorage.dll:0:0:0:0 | System.IO.IsolatedStorage, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.MemoryMappedFiles.dll:0:0:0:0 | System.IO.MemoryMappedFiles, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.Pipelines.dll:0:0:0:0 | System.IO.Pipelines, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.Pipes.AccessControl.dll:0:0:0:0 | System.IO.Pipes.AccessControl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.Pipes.dll:0:0:0:0 | System.IO.Pipes, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.UnmanagedMemoryStream.dll:0:0:0:0 | System.IO.UnmanagedMemoryStream, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.IO.dll:0:0:0:0 | System.IO, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Linq.Expressions.dll:0:0:0:0 | System.Linq.Expressions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Linq.Parallel.dll:0:0:0:0 | System.Linq.Parallel, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Linq.Queryable.dll:0:0:0:0 | System.Linq.Queryable, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Linq.dll:0:0:0:0 | System.Linq, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Memory.dll:0:0:0:0 | System.Memory, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Http.Json.dll:0:0:0:0 | System.Net.Http.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Http.dll:0:0:0:0 | System.Net.Http, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.HttpListener.dll:0:0:0:0 | System.Net.HttpListener, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Mail.dll:0:0:0:0 | System.Net.Mail, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.NameResolution.dll:0:0:0:0 | System.Net.NameResolution, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.NetworkInformation.dll:0:0:0:0 | System.Net.NetworkInformation, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Ping.dll:0:0:0:0 | System.Net.Ping, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Primitives.dll:0:0:0:0 | System.Net.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Quic.dll:0:0:0:0 | System.Net.Quic, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Requests.dll:0:0:0:0 | System.Net.Requests, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Security.dll:0:0:0:0 | System.Net.Security, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.ServicePoint.dll:0:0:0:0 | System.Net.ServicePoint, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.Sockets.dll:0:0:0:0 | System.Net.Sockets, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.WebClient.dll:0:0:0:0 | System.Net.WebClient, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.WebHeaderCollection.dll:0:0:0:0 | System.Net.WebHeaderCollection, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.WebProxy.dll:0:0:0:0 | System.Net.WebProxy, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.WebSockets.Client.dll:0:0:0:0 | System.Net.WebSockets.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.WebSockets.dll:0:0:0:0 | System.Net.WebSockets, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Net.dll:0:0:0:0 | System.Net, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Numerics.Vectors.dll:0:0:0:0 | System.Numerics.Vectors, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Numerics.dll:0:0:0:0 | System.Numerics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ObjectModel.dll:0:0:0:0 | System.ObjectModel, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.DispatchProxy.dll:0:0:0:0 | System.Reflection.DispatchProxy, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.Emit.ILGeneration.dll:0:0:0:0 | System.Reflection.Emit.ILGeneration, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.Emit.Lightweight.dll:0:0:0:0 | System.Reflection.Emit.Lightweight, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.Emit.dll:0:0:0:0 | System.Reflection.Emit, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.Extensions.dll:0:0:0:0 | System.Reflection.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.Metadata.dll:0:0:0:0 | System.Reflection.Metadata, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.Primitives.dll:0:0:0:0 | System.Reflection.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.TypeExtensions.dll:0:0:0:0 | System.Reflection.TypeExtensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Reflection.dll:0:0:0:0 | System.Reflection, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Resources.Reader.dll:0:0:0:0 | System.Resources.Reader, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Resources.ResourceManager.dll:0:0:0:0 | System.Resources.ResourceManager, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Resources.Writer.dll:0:0:0:0 | System.Resources.Writer, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.CompilerServices.Unsafe.dll:0:0:0:0 | System.Runtime.CompilerServices.Unsafe, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.CompilerServices.VisualC.dll:0:0:0:0 | System.Runtime.CompilerServices.VisualC, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Extensions.dll:0:0:0:0 | System.Runtime.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Handles.dll:0:0:0:0 | System.Runtime.Handles, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.InteropServices.JavaScript.dll:0:0:0:0 | System.Runtime.InteropServices.JavaScript, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.InteropServices.RuntimeInformation.dll:0:0:0:0 | System.Runtime.InteropServices.RuntimeInformation, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.InteropServices.dll:0:0:0:0 | System.Runtime.InteropServices, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Intrinsics.dll:0:0:0:0 | System.Runtime.Intrinsics, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Loader.dll:0:0:0:0 | System.Runtime.Loader, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Numerics.dll:0:0:0:0 | System.Runtime.Numerics, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Serialization.Formatters.dll:0:0:0:0 | System.Runtime.Serialization.Formatters, Version=8.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Serialization.Json.dll:0:0:0:0 | System.Runtime.Serialization.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Serialization.Primitives.dll:0:0:0:0 | System.Runtime.Serialization.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Serialization.Xml.dll:0:0:0:0 | System.Runtime.Serialization.Xml, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.Serialization.dll:0:0:0:0 | System.Runtime.Serialization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Runtime.dll:0:0:0:0 | System.Runtime, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.AccessControl.dll:0:0:0:0 | System.Security.AccessControl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Claims.dll:0:0:0:0 | System.Security.Claims, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.Algorithms.dll:0:0:0:0 | System.Security.Cryptography.Algorithms, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.Cng.dll:0:0:0:0 | System.Security.Cryptography.Cng, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.Csp.dll:0:0:0:0 | System.Security.Cryptography.Csp, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.Encoding.dll:0:0:0:0 | System.Security.Cryptography.Encoding, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.OpenSsl.dll:0:0:0:0 | System.Security.Cryptography.OpenSsl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.Primitives.dll:0:0:0:0 | System.Security.Cryptography.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.X509Certificates.dll:0:0:0:0 | System.Security.Cryptography.X509Certificates, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.dll:0:0:0:0 | System.Security.Cryptography, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Principal.Windows.dll:0:0:0:0 | System.Security.Principal.Windows, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.Principal.dll:0:0:0:0 | System.Security.Principal, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.SecureString.dll:0:0:0:0 | System.Security.SecureString, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Security.dll:0:0:0:0 | System.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ServiceModel.Web.dll:0:0:0:0 | System.ServiceModel.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ServiceProcess.dll:0:0:0:0 | System.ServiceProcess, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Text.Encoding.CodePages.dll:0:0:0:0 | System.Text.Encoding.CodePages, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Text.Encoding.Extensions.dll:0:0:0:0 | System.Text.Encoding.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Text.Encoding.dll:0:0:0:0 | System.Text.Encoding, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Text.Encodings.Web.dll:0:0:0:0 | System.Text.Encodings.Web, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Text.Json.dll:0:0:0:0 | System.Text.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Text.RegularExpressions.dll:0:0:0:0 | System.Text.RegularExpressions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Channels.dll:0:0:0:0 | System.Threading.Channels, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Overlapped.dll:0:0:0:0 | System.Threading.Overlapped, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Tasks.Dataflow.dll:0:0:0:0 | System.Threading.Tasks.Dataflow, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Tasks.Extensions.dll:0:0:0:0 | System.Threading.Tasks.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Tasks.Parallel.dll:0:0:0:0 | System.Threading.Tasks.Parallel, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Tasks.dll:0:0:0:0 | System.Threading.Tasks, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Thread.dll:0:0:0:0 | System.Threading.Thread, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.ThreadPool.dll:0:0:0:0 | System.Threading.ThreadPool, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.Timer.dll:0:0:0:0 | System.Threading.Timer, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Threading.dll:0:0:0:0 | System.Threading, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Transactions.Local.dll:0:0:0:0 | System.Transactions.Local, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Transactions.dll:0:0:0:0 | System.Transactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.ValueTuple.dll:0:0:0:0 | System.ValueTuple, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Web.HttpUtility.dll:0:0:0:0 | System.Web.HttpUtility, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Web.dll:0:0:0:0 | System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Windows.dll:0:0:0:0 | System.Windows, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Xml.Linq.dll:0:0:0:0 | System.Xml.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Xml.ReaderWriter.dll:0:0:0:0 | System.Xml.ReaderWriter, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Xml.Serialization.dll:0:0:0:0 | System.Xml.Serialization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Xml.XDocument.dll:0:0:0:0 | System.Xml.XDocument, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Xml.XPath.XDocument.dll:0:0:0:0 | System.Xml.XPath.XDocument, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Xml.XPath.dll:0:0:0:0 | System.Xml.XPath, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Xml.XmlDocument.dll:0:0:0:0 | System.Xml.XmlDocument, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Xml.XmlSerializer.dll:0:0:0:0 | System.Xml.XmlSerializer, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.Xml.dll:0:0:0:0 | System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/System.dll:0:0:0:0 | System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/mscorlib.dll:0:0:0:0 | mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/9.0.0/ref/net9.0/netstandard.dll:0:0:0:0 | netstandard, Version=2.1.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/Accessibility.dll:0:0:0:0 | Accessibility, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/Microsoft.VisualBasic.Forms.dll:0:0:0:0 | Microsoft.VisualBasic.Forms, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/Microsoft.VisualBasic.dll:0:0:0:0 | Microsoft.VisualBasic, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/Microsoft.Win32.Registry.AccessControl.dll:0:0:0:0 | Microsoft.Win32.Registry.AccessControl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/Microsoft.Win32.SystemEvents.dll:0:0:0:0 | Microsoft.Win32.SystemEvents, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/PresentationCore.dll:0:0:0:0 | PresentationCore, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/PresentationFramework.Aero2.dll:0:0:0:0 | PresentationFramework.Aero2, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/PresentationFramework.Aero.dll:0:0:0:0 | PresentationFramework.Aero, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/PresentationFramework.AeroLite.dll:0:0:0:0 | PresentationFramework.AeroLite, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/PresentationFramework.Classic.dll:0:0:0:0 | PresentationFramework.Classic, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/PresentationFramework.Luna.dll:0:0:0:0 | PresentationFramework.Luna, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/PresentationFramework.Royale.dll:0:0:0:0 | PresentationFramework.Royale, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/PresentationFramework.dll:0:0:0:0 | PresentationFramework, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/PresentationUI.dll:0:0:0:0 | PresentationUI, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/ReachFramework.dll:0:0:0:0 | ReachFramework, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.CodeDom.dll:0:0:0:0 | System.CodeDom, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Configuration.ConfigurationManager.dll:0:0:0:0 | System.Configuration.ConfigurationManager, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Design.dll:0:0:0:0 | System.Design, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Diagnostics.EventLog.dll:0:0:0:0 | System.Diagnostics.EventLog, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Diagnostics.PerformanceCounter.dll:0:0:0:0 | System.Diagnostics.PerformanceCounter, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.DirectoryServices.dll:0:0:0:0 | System.DirectoryServices, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Drawing.Common.dll:0:0:0:0 | System.Drawing.Common, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Drawing.Design.dll:0:0:0:0 | System.Drawing.Design, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Drawing.dll:0:0:0:0 | System.Drawing, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Formats.Nrbf.dll:0:0:0:0 | System.Formats.Nrbf, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.IO.Packaging.dll:0:0:0:0 | System.IO.Packaging, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Printing.dll:0:0:0:0 | System.Printing, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Private.Windows.Core.dll:0:0:0:0 | System.Private.Windows.Core, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Resources.Extensions.dll:0:0:0:0 | System.Resources.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.Pkcs.dll:0:0:0:0 | System.Security.Cryptography.Pkcs, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.ProtectedData.dll:0:0:0:0 | System.Security.Cryptography.ProtectedData, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Security.Cryptography.Xml.dll:0:0:0:0 | System.Security.Cryptography.Xml, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Security.Permissions.dll:0:0:0:0 | System.Security.Permissions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Threading.AccessControl.dll:0:0:0:0 | System.Threading.AccessControl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Windows.Controls.Ribbon.dll:0:0:0:0 | System.Windows.Controls.Ribbon, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Windows.Extensions.dll:0:0:0:0 | System.Windows.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Windows.Forms.Design.Editors.dll:0:0:0:0 | System.Windows.Forms.Design.Editors, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Windows.Forms.Design.dll:0:0:0:0 | System.Windows.Forms.Design, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Windows.Forms.Primitives.dll:0:0:0:0 | System.Windows.Forms.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Windows.Forms.dll:0:0:0:0 | System.Windows.Forms, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Windows.Input.Manipulations.dll:0:0:0:0 | System.Windows.Input.Manipulations, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Windows.Presentation.dll:0:0:0:0 | System.Windows.Presentation, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/System.Xaml.dll:0:0:0:0 | System.Xaml, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/UIAutomationClient.dll:0:0:0:0 | UIAutomationClient, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/UIAutomationClientSideProviders.dll:0:0:0:0 | UIAutomationClientSideProviders, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/UIAutomationProvider.dll:0:0:0:0 | UIAutomationProvider, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/UIAutomationTypes.dll:0:0:0:0 | UIAutomationTypes, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/WindowsBase.dll:0:0:0:0 | WindowsBase, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.0/ref/net9.0/WindowsFormsIntegration.dll:0:0:0:0 | WindowsFormsIntegration, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/Microsoft.CSharp.dll:0:0:0:0 | Microsoft.CSharp, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/Microsoft.VisualBasic.Core.dll:0:0:0:0 | Microsoft.VisualBasic.Core, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/Microsoft.Win32.Primitives.dll:0:0:0:0 | Microsoft.Win32.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/Microsoft.Win32.Registry.dll:0:0:0:0 | Microsoft.Win32.Registry, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.AppContext.dll:0:0:0:0 | System.AppContext, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Buffers.dll:0:0:0:0 | System.Buffers, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Collections.Concurrent.dll:0:0:0:0 | System.Collections.Concurrent, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Collections.Immutable.dll:0:0:0:0 | System.Collections.Immutable, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Collections.NonGeneric.dll:0:0:0:0 | System.Collections.NonGeneric, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Collections.Specialized.dll:0:0:0:0 | System.Collections.Specialized, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Collections.dll:0:0:0:0 | System.Collections, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.ComponentModel.Annotations.dll:0:0:0:0 | System.ComponentModel.Annotations, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.ComponentModel.DataAnnotations.dll:0:0:0:0 | System.ComponentModel.DataAnnotations, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.ComponentModel.EventBasedAsync.dll:0:0:0:0 | System.ComponentModel.EventBasedAsync, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.ComponentModel.Primitives.dll:0:0:0:0 | System.ComponentModel.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.ComponentModel.TypeConverter.dll:0:0:0:0 | System.ComponentModel.TypeConverter, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.ComponentModel.dll:0:0:0:0 | System.ComponentModel, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Configuration.dll:0:0:0:0 | System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Console.dll:0:0:0:0 | System.Console, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Core.dll:0:0:0:0 | System.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Data.Common.dll:0:0:0:0 | System.Data.Common, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Data.DataSetExtensions.dll:0:0:0:0 | System.Data.DataSetExtensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Data.dll:0:0:0:0 | System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Diagnostics.Contracts.dll:0:0:0:0 | System.Diagnostics.Contracts, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Diagnostics.Debug.dll:0:0:0:0 | System.Diagnostics.Debug, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Diagnostics.DiagnosticSource.dll:0:0:0:0 | System.Diagnostics.DiagnosticSource, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Diagnostics.FileVersionInfo.dll:0:0:0:0 | System.Diagnostics.FileVersionInfo, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Diagnostics.Process.dll:0:0:0:0 | System.Diagnostics.Process, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Diagnostics.StackTrace.dll:0:0:0:0 | System.Diagnostics.StackTrace, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Diagnostics.TextWriterTraceListener.dll:0:0:0:0 | System.Diagnostics.TextWriterTraceListener, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Diagnostics.Tools.dll:0:0:0:0 | System.Diagnostics.Tools, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Diagnostics.TraceSource.dll:0:0:0:0 | System.Diagnostics.TraceSource, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Diagnostics.Tracing.dll:0:0:0:0 | System.Diagnostics.Tracing, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Drawing.Primitives.dll:0:0:0:0 | System.Drawing.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Dynamic.Runtime.dll:0:0:0:0 | System.Dynamic.Runtime, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Formats.Asn1.dll:0:0:0:0 | System.Formats.Asn1, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Formats.Tar.dll:0:0:0:0 | System.Formats.Tar, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Globalization.Calendars.dll:0:0:0:0 | System.Globalization.Calendars, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Globalization.Extensions.dll:0:0:0:0 | System.Globalization.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Globalization.dll:0:0:0:0 | System.Globalization, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.Compression.Brotli.dll:0:0:0:0 | System.IO.Compression.Brotli, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.Compression.FileSystem.dll:0:0:0:0 | System.IO.Compression.FileSystem, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.Compression.ZipFile.dll:0:0:0:0 | System.IO.Compression.ZipFile, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.Compression.dll:0:0:0:0 | System.IO.Compression, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.FileSystem.AccessControl.dll:0:0:0:0 | System.IO.FileSystem.AccessControl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.FileSystem.DriveInfo.dll:0:0:0:0 | System.IO.FileSystem.DriveInfo, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.FileSystem.Primitives.dll:0:0:0:0 | System.IO.FileSystem.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.FileSystem.Watcher.dll:0:0:0:0 | System.IO.FileSystem.Watcher, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.FileSystem.dll:0:0:0:0 | System.IO.FileSystem, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.IsolatedStorage.dll:0:0:0:0 | System.IO.IsolatedStorage, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.MemoryMappedFiles.dll:0:0:0:0 | System.IO.MemoryMappedFiles, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.Pipelines.dll:0:0:0:0 | System.IO.Pipelines, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.Pipes.AccessControl.dll:0:0:0:0 | System.IO.Pipes.AccessControl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.Pipes.dll:0:0:0:0 | System.IO.Pipes, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.UnmanagedMemoryStream.dll:0:0:0:0 | System.IO.UnmanagedMemoryStream, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.IO.dll:0:0:0:0 | System.IO, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Linq.Expressions.dll:0:0:0:0 | System.Linq.Expressions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Linq.Parallel.dll:0:0:0:0 | System.Linq.Parallel, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Linq.Queryable.dll:0:0:0:0 | System.Linq.Queryable, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Linq.dll:0:0:0:0 | System.Linq, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Memory.dll:0:0:0:0 | System.Memory, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.Http.Json.dll:0:0:0:0 | System.Net.Http.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.Http.dll:0:0:0:0 | System.Net.Http, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.HttpListener.dll:0:0:0:0 | System.Net.HttpListener, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.Mail.dll:0:0:0:0 | System.Net.Mail, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.NameResolution.dll:0:0:0:0 | System.Net.NameResolution, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.NetworkInformation.dll:0:0:0:0 | System.Net.NetworkInformation, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.Ping.dll:0:0:0:0 | System.Net.Ping, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.Primitives.dll:0:0:0:0 | System.Net.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.Quic.dll:0:0:0:0 | System.Net.Quic, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.Requests.dll:0:0:0:0 | System.Net.Requests, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.Security.dll:0:0:0:0 | System.Net.Security, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.ServicePoint.dll:0:0:0:0 | System.Net.ServicePoint, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.Sockets.dll:0:0:0:0 | System.Net.Sockets, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.WebClient.dll:0:0:0:0 | System.Net.WebClient, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.WebHeaderCollection.dll:0:0:0:0 | System.Net.WebHeaderCollection, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.WebProxy.dll:0:0:0:0 | System.Net.WebProxy, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.WebSockets.Client.dll:0:0:0:0 | System.Net.WebSockets.Client, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.WebSockets.dll:0:0:0:0 | System.Net.WebSockets, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Net.dll:0:0:0:0 | System.Net, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Numerics.Vectors.dll:0:0:0:0 | System.Numerics.Vectors, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Numerics.dll:0:0:0:0 | System.Numerics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.ObjectModel.dll:0:0:0:0 | System.ObjectModel, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Reflection.DispatchProxy.dll:0:0:0:0 | System.Reflection.DispatchProxy, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Reflection.Emit.ILGeneration.dll:0:0:0:0 | System.Reflection.Emit.ILGeneration, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Reflection.Emit.Lightweight.dll:0:0:0:0 | System.Reflection.Emit.Lightweight, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Reflection.Emit.dll:0:0:0:0 | System.Reflection.Emit, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Reflection.Extensions.dll:0:0:0:0 | System.Reflection.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Reflection.Metadata.dll:0:0:0:0 | System.Reflection.Metadata, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Reflection.Primitives.dll:0:0:0:0 | System.Reflection.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Reflection.TypeExtensions.dll:0:0:0:0 | System.Reflection.TypeExtensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Reflection.dll:0:0:0:0 | System.Reflection, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Resources.Reader.dll:0:0:0:0 | System.Resources.Reader, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Resources.ResourceManager.dll:0:0:0:0 | System.Resources.ResourceManager, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Resources.Writer.dll:0:0:0:0 | System.Resources.Writer, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.CompilerServices.Unsafe.dll:0:0:0:0 | System.Runtime.CompilerServices.Unsafe, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.CompilerServices.VisualC.dll:0:0:0:0 | System.Runtime.CompilerServices.VisualC, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.Extensions.dll:0:0:0:0 | System.Runtime.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.Handles.dll:0:0:0:0 | System.Runtime.Handles, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.InteropServices.JavaScript.dll:0:0:0:0 | System.Runtime.InteropServices.JavaScript, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.InteropServices.RuntimeInformation.dll:0:0:0:0 | System.Runtime.InteropServices.RuntimeInformation, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.InteropServices.dll:0:0:0:0 | System.Runtime.InteropServices, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.Intrinsics.dll:0:0:0:0 | System.Runtime.Intrinsics, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.Loader.dll:0:0:0:0 | System.Runtime.Loader, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.Numerics.dll:0:0:0:0 | System.Runtime.Numerics, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.Serialization.Formatters.dll:0:0:0:0 | System.Runtime.Serialization.Formatters, Version=8.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.Serialization.Json.dll:0:0:0:0 | System.Runtime.Serialization.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.Serialization.Primitives.dll:0:0:0:0 | System.Runtime.Serialization.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.Serialization.Xml.dll:0:0:0:0 | System.Runtime.Serialization.Xml, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.Serialization.dll:0:0:0:0 | System.Runtime.Serialization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Runtime.dll:0:0:0:0 | System.Runtime, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.AccessControl.dll:0:0:0:0 | System.Security.AccessControl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.Claims.dll:0:0:0:0 | System.Security.Claims, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.Cryptography.Algorithms.dll:0:0:0:0 | System.Security.Cryptography.Algorithms, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.Cryptography.Cng.dll:0:0:0:0 | System.Security.Cryptography.Cng, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.Cryptography.Csp.dll:0:0:0:0 | System.Security.Cryptography.Csp, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.Cryptography.Encoding.dll:0:0:0:0 | System.Security.Cryptography.Encoding, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.Cryptography.OpenSsl.dll:0:0:0:0 | System.Security.Cryptography.OpenSsl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.Cryptography.Primitives.dll:0:0:0:0 | System.Security.Cryptography.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.Cryptography.X509Certificates.dll:0:0:0:0 | System.Security.Cryptography.X509Certificates, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.Cryptography.dll:0:0:0:0 | System.Security.Cryptography, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.Principal.Windows.dll:0:0:0:0 | System.Security.Principal.Windows, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.Principal.dll:0:0:0:0 | System.Security.Principal, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.SecureString.dll:0:0:0:0 | System.Security.SecureString, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Security.dll:0:0:0:0 | System.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.ServiceModel.Web.dll:0:0:0:0 | System.ServiceModel.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.ServiceProcess.dll:0:0:0:0 | System.ServiceProcess, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Text.Encoding.CodePages.dll:0:0:0:0 | System.Text.Encoding.CodePages, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Text.Encoding.Extensions.dll:0:0:0:0 | System.Text.Encoding.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Text.Encoding.dll:0:0:0:0 | System.Text.Encoding, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Text.Encodings.Web.dll:0:0:0:0 | System.Text.Encodings.Web, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Text.Json.dll:0:0:0:0 | System.Text.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Text.RegularExpressions.dll:0:0:0:0 | System.Text.RegularExpressions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Threading.Channels.dll:0:0:0:0 | System.Threading.Channels, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Threading.Overlapped.dll:0:0:0:0 | System.Threading.Overlapped, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Threading.Tasks.Dataflow.dll:0:0:0:0 | System.Threading.Tasks.Dataflow, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Threading.Tasks.Extensions.dll:0:0:0:0 | System.Threading.Tasks.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Threading.Tasks.Parallel.dll:0:0:0:0 | System.Threading.Tasks.Parallel, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Threading.Tasks.dll:0:0:0:0 | System.Threading.Tasks, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Threading.Thread.dll:0:0:0:0 | System.Threading.Thread, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Threading.ThreadPool.dll:0:0:0:0 | System.Threading.ThreadPool, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Threading.Timer.dll:0:0:0:0 | System.Threading.Timer, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Threading.dll:0:0:0:0 | System.Threading, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Transactions.Local.dll:0:0:0:0 | System.Transactions.Local, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Transactions.dll:0:0:0:0 | System.Transactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.ValueTuple.dll:0:0:0:0 | System.ValueTuple, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Web.HttpUtility.dll:0:0:0:0 | System.Web.HttpUtility, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Web.dll:0:0:0:0 | System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Windows.dll:0:0:0:0 | System.Windows, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Xml.Linq.dll:0:0:0:0 | System.Xml.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Xml.ReaderWriter.dll:0:0:0:0 | System.Xml.ReaderWriter, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Xml.Serialization.dll:0:0:0:0 | System.Xml.Serialization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Xml.XDocument.dll:0:0:0:0 | System.Xml.XDocument, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Xml.XPath.XDocument.dll:0:0:0:0 | System.Xml.XPath.XDocument, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Xml.XPath.dll:0:0:0:0 | System.Xml.XPath, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Xml.XmlDocument.dll:0:0:0:0 | System.Xml.XmlDocument, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Xml.XmlSerializer.dll:0:0:0:0 | System.Xml.XmlSerializer, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.Xml.dll:0:0:0:0 | System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/System.dll:0:0:0:0 | System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/mscorlib.dll:0:0:0:0 | mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/9.0.8/ref/net9.0/netstandard.dll:0:0:0:0 | netstandard, Version=2.1.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/Accessibility.dll:0:0:0:0 | Accessibility, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/Microsoft.VisualBasic.Forms.dll:0:0:0:0 | Microsoft.VisualBasic.Forms, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/Microsoft.VisualBasic.dll:0:0:0:0 | Microsoft.VisualBasic, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/Microsoft.Win32.Registry.AccessControl.dll:0:0:0:0 | Microsoft.Win32.Registry.AccessControl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/Microsoft.Win32.SystemEvents.dll:0:0:0:0 | Microsoft.Win32.SystemEvents, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/PresentationCore.dll:0:0:0:0 | PresentationCore, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/PresentationFramework.Aero2.dll:0:0:0:0 | PresentationFramework.Aero2, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/PresentationFramework.Aero.dll:0:0:0:0 | PresentationFramework.Aero, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/PresentationFramework.AeroLite.dll:0:0:0:0 | PresentationFramework.AeroLite, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/PresentationFramework.Classic.dll:0:0:0:0 | PresentationFramework.Classic, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/PresentationFramework.Luna.dll:0:0:0:0 | PresentationFramework.Luna, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/PresentationFramework.Royale.dll:0:0:0:0 | PresentationFramework.Royale, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/PresentationFramework.dll:0:0:0:0 | PresentationFramework, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/PresentationUI.dll:0:0:0:0 | PresentationUI, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/ReachFramework.dll:0:0:0:0 | ReachFramework, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.CodeDom.dll:0:0:0:0 | System.CodeDom, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.Configuration.ConfigurationManager.dll:0:0:0:0 | System.Configuration.ConfigurationManager, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.Design.dll:0:0:0:0 | System.Design, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.Diagnostics.EventLog.dll:0:0:0:0 | System.Diagnostics.EventLog, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.Diagnostics.PerformanceCounter.dll:0:0:0:0 | System.Diagnostics.PerformanceCounter, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.DirectoryServices.dll:0:0:0:0 | System.DirectoryServices, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.Drawing.Common.dll:0:0:0:0 | System.Drawing.Common, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.Drawing.Design.dll:0:0:0:0 | System.Drawing.Design, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.Drawing.dll:0:0:0:0 | System.Drawing, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.Formats.Nrbf.dll:0:0:0:0 | System.Formats.Nrbf, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.IO.Packaging.dll:0:0:0:0 | System.IO.Packaging, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.Printing.dll:0:0:0:0 | System.Printing, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.Private.Windows.Core.dll:0:0:0:0 | System.Private.Windows.Core, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.Resources.Extensions.dll:0:0:0:0 | System.Resources.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.Security.Cryptography.Pkcs.dll:0:0:0:0 | System.Security.Cryptography.Pkcs, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.Security.Cryptography.ProtectedData.dll:0:0:0:0 | System.Security.Cryptography.ProtectedData, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.Security.Cryptography.Xml.dll:0:0:0:0 | System.Security.Cryptography.Xml, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.Security.Permissions.dll:0:0:0:0 | System.Security.Permissions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.Threading.AccessControl.dll:0:0:0:0 | System.Threading.AccessControl, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.Windows.Controls.Ribbon.dll:0:0:0:0 | System.Windows.Controls.Ribbon, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.Windows.Extensions.dll:0:0:0:0 | System.Windows.Extensions, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.Windows.Forms.Design.Editors.dll:0:0:0:0 | System.Windows.Forms.Design.Editors, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.Windows.Forms.Design.dll:0:0:0:0 | System.Windows.Forms.Design, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.Windows.Forms.Primitives.dll:0:0:0:0 | System.Windows.Forms.Primitives, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.Windows.Forms.dll:0:0:0:0 | System.Windows.Forms, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.Windows.Input.Manipulations.dll:0:0:0:0 | System.Windows.Input.Manipulations, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.Windows.Presentation.dll:0:0:0:0 | System.Windows.Presentation, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/System.Xaml.dll:0:0:0:0 | System.Xaml, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/UIAutomationClient.dll:0:0:0:0 | UIAutomationClient, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/UIAutomationClientSideProviders.dll:0:0:0:0 | UIAutomationClientSideProviders, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/UIAutomationProvider.dll:0:0:0:0 | UIAutomationProvider, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/UIAutomationTypes.dll:0:0:0:0 | UIAutomationTypes, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/WindowsBase.dll:0:0:0:0 | WindowsBase, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/9.0.8/ref/net9.0/WindowsFormsIntegration.dll:0:0:0:0 | WindowsFormsIntegration, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
 | test-db/working/packages/newtonsoft.json/12.0.1/lib/netstandard2.0/Newtonsoft.Json.dll:0:0:0:0 | Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed |
diff --git a/csharp/ql/integration-tests/windows/standalone_dependencies/global.json b/csharp/ql/integration-tests/windows/standalone_dependencies/global.json
index 65324522984..4c6e2601f69 100644
--- a/csharp/ql/integration-tests/windows/standalone_dependencies/global.json
+++ b/csharp/ql/integration-tests/windows/standalone_dependencies/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "9.0.100"
+    "version": "9.0.304"
   }
 }
diff --git a/csharp/ql/lib/CHANGELOG.md b/csharp/ql/lib/CHANGELOG.md
index 1bce7a7f803..20b1c03d722 100644
--- a/csharp/ql/lib/CHANGELOG.md
+++ b/csharp/ql/lib/CHANGELOG.md
@@ -1,3 +1,48 @@
+## 5.3.0
+
+### Deprecated APIs
+
+* The class `AbstractValue` in the `Guards` library has been deprecated and replaced with the class `GuardValue`.
+
+### Major Analysis Improvements
+
+* The representation of the C# control-flow graph has been significantly changed. This has minor effects on a wide range of queries including both minor improvements and minor regressions. For example, improved precision has been observed for `cs/inefficient-containskey` and `cs/stringbuilder-creation-in-loop`. Two queries stand out as being significantly affected with great improvements: `cs/dereferenced-value-may-be-null` has been completely rewritten which removes a very significant number of false positives. Furthermore, `cs/constant-condition` has been updated to report many new results - these new results are primarily expected to be true positives, but a few new false positives are expected as well. As part of these changes, `cs/dereferenced-value-may-be-null` has been changed from a `path-problem` query to a `problem` query, so paths are no longer reported for this query.
+
+### Minor Analysis Improvements
+
+* Added tracer support for macOS and Linux when the .NET CLI (`dotnet`) directly invokes the C# compiler (`csc`). This enhancement provides basic tracing and extraction capabilities for .NET 10 RC2 on these platforms.
+* The extraction of location information for source code entities has been updated to use star IDs (`*` IDs). This change should be transparent to end-users but may improve extraction performance in some cases by reducing TRAP file size and eliminating overhead from location de-duplication.
+
+## 5.2.6
+
+### Minor Analysis Improvements
+
+* The extraction of location information for parameters, fields, constructors, destructors and user operators has been optimized. Previously, location information was extracted multiple times for each bound generic. Now, only the location of the unbound generic declaration is extracted during the extraction phase, and the QL library explicitly reuses this location for all bound instances of the same generic.
+* The extraction of location information for type parameters and tuples types has been optimized. Previously, location information was extracted multiple times for each type when it was declared across multiple files. Now, the extraction context is respected during the extraction phase, ensuring locations are only extracted within the appropriate context. This change should be transparent to end-users but may improve extraction performance in some cases.
+* The extraction of location information for named types (classes, structs, etc.) has been optimized. Previously, location information was extracted multiple times for each type when it was declared across multiple files. Now, the extraction context is respected during the extraction phase, ensuring locations are only extracted within the appropriate context. This change should be transparent to end-users but may improve extraction performance in some cases.
+* The extraction of the location for bound generic entities (methods, accessors, indexers, properties, and events) has been optimized. Previously, location information was extracted multiple times for each bound generic. Now, only the location of the unbound generic declaration is extracted during the extraction phase, and the QL library explicitly reuses this location for all bound instances of the same generic.
+
+## 5.2.5
+
+No user-facing changes.
+
+## 5.2.4
+
+No user-facing changes.
+
+## 5.2.3
+
+### Minor Analysis Improvements
+
+* A bug has been fixed in the data flow analysis, which means that flow through calls using the `base` qualifier may now be tracked more accurately.
+* Added summary models for `System.Xml.XmlReader`, `System.Xml.XmlTextReader` and `System.Xml.XmlDictionaryReader`.
+* Models-as-data summaries for byte and char arrays and pointers now treat the entire collection as tainted, reflecting their common use as string alternatives.
+* The default taint tracking configuration now allows implicit reads from collections at sinks and in additional flow steps. This increases flow coverage for many taint tracking queries and helps reduce false negatives.
+
+## 5.2.2
+
+No user-facing changes.
+
 ## 5.2.1
 
 No user-facing changes.
@@ -98,7 +143,7 @@ No user-facing changes.
 * Added `remote` flow source models for properties of Blazor components annotated with any of the following attributes from `Microsoft.AspNetCore.Components`:
   - `[SupplyParameterFromForm]`
   - `[SupplyParameterFromQuery]`
-* Added the constructor and explicit cast operator of `Microsoft.AspNetCore.Components.MarkupString` as an `html-injection` sink. This will help catch cross-site scripting resulting from using `MarkupString`. 
+* Added the constructor and explicit cast operator of `Microsoft.AspNetCore.Components.MarkupString` as an `html-injection` sink. This will help catch cross-site scripting resulting from using `MarkupString`.
 * Added flow summaries for the `Microsoft.AspNetCore.Mvc.Controller::View` method.
 * The data flow library has been updated to track types in a slightly different way: The type of the tainted data (which may be stored into fields, etc.) is tracked more precisely, while the types of intermediate containers for nested contents is tracked less precisely. This may have a slight effect on false positives for complex flow paths.
 * The C# extractor now supports *basic* extraction of .NET 9 projects. There might be limited support for extraction of code using the new C# 13 language features.
@@ -118,7 +163,7 @@ No user-facing changes.
   - `System.Web.HttpUtility::ParseQueryString`
   - `Microsoft.AspNetCore.WebUtilities.QueryHelpers::ParseQuery`
   - `Microsoft.AspNetCore.WebUtilities.QueryHelpers::ParseNullableQuery`
-* Added `js-interop` sinks for the `InvokeAsync` and `InvokeVoidAsync` methods of `Microsoft.JSInterop.IJSRuntime`, which can run arbitrary JavaScript. 
+* Added `js-interop` sinks for the `InvokeAsync` and `InvokeVoidAsync` methods of `Microsoft.JSInterop.IJSRuntime`, which can run arbitrary JavaScript.
 
 ## 3.1.1
 
@@ -156,8 +201,8 @@ No user-facing changes.
 
 ### Breaking Changes
 
-* Deleted many deprecated taint-tracking configurations based on `TaintTracking::Configuration`. 
-* Deleted many deprecated dataflow configurations based on `DataFlow::Configuration`. 
+* Deleted many deprecated taint-tracking configurations based on `TaintTracking::Configuration`.
+* Deleted many deprecated dataflow configurations based on `DataFlow::Configuration`.
 * Deleted the deprecated `explorationLimit` predicate from `DataFlow::Configuration`, use `FlowExploration<explorationLimit>` instead.
 
 ### Minor Analysis Improvements
@@ -406,7 +451,7 @@ No user-facing changes.
 
 ### New Features
 
-* The `DataFlow::StateConfigSig` signature module has gained default implementations for `isBarrier/2` and `isAdditionalFlowStep/4`. 
+* The `DataFlow::StateConfigSig` signature module has gained default implementations for `isBarrier/2` and `isAdditionalFlowStep/4`.
   Hence it is no longer needed to provide `none()` implementations of these predicates if they are not needed.
 
 ### Minor Analysis Improvements
@@ -541,7 +586,7 @@ No user-facing changes.
 
 * Attributes on methods in CIL are now extracted (Bugfix).
 * Support for `static virtual` and `static abstract` interface members.
-* Support for *operators* in interface definitions. 
+* Support for *operators* in interface definitions.
 * C# 11: Added support for the unsigned right shift `>>>` and unsigned right shift assignment `>>>=` operators.
 * Query id's have been aligned such that they are prefixed with `cs` instead of `csharp`.
 
@@ -581,13 +626,13 @@ No user-facing changes.
 ### Minor Analysis Improvements
 
 * `DateTime` expressions are now considered simple type sanitizers. This affects a wide range of security queries.
-* ASP.NET Core controller definition has been made more precise. The amount of introduced taint sources or eliminated false positives should be low though, since the most common pattern is to derive all user defined ASP.NET Core controllers from the standard Controller class, which is not affected. 
+* ASP.NET Core controller definition has been made more precise. The amount of introduced taint sources or eliminated false positives should be low though, since the most common pattern is to derive all user defined ASP.NET Core controllers from the standard Controller class, which is not affected.
 
 ## 0.4.0
 
 ### Deprecated APIs
 
-* Some classes/modules with upper-case acronyms in their name have been renamed to follow our style-guide. 
+* Some classes/modules with upper-case acronyms in their name have been renamed to follow our style-guide.
   The old name still exists as a deprecated alias.
 
 ### Bug Fixes
@@ -600,7 +645,7 @@ No user-facing changes.
 
 ### Deprecated APIs
 
-* Many classes/predicates/modules with upper-case acronyms in their name have been renamed to follow our style-guide. 
+* Many classes/predicates/modules with upper-case acronyms in their name have been renamed to follow our style-guide.
   The old name still exists as a deprecated alias.
 
 ### Minor Analysis Improvements
@@ -647,7 +692,7 @@ No user-facing changes.
 
 ### Deprecated APIs
 
-* Many classes/predicates/modules that had upper-case acronyms have been renamed to follow our style-guide. 
+* Many classes/predicates/modules that had upper-case acronyms have been renamed to follow our style-guide.
   The old name still exists as a deprecated alias.
 
 ### New Features
diff --git a/csharp/ql/lib/change-notes/2025-10-04-deprecate-controlsblock.md b/csharp/ql/lib/change-notes/2025-10-04-deprecate-controlsblock.md
new file mode 100644
index 00000000000..a3c69932917
--- /dev/null
+++ b/csharp/ql/lib/change-notes/2025-10-04-deprecate-controlsblock.md
@@ -0,0 +1,4 @@
+---
+category: deprecated
+---
+* `ControlFlowElement.controlsBlock` has been deprecated in favor of the Guards library.
diff --git a/csharp/ql/lib/change-notes/2025-10-30-overlay-compilation-and-extraction.md b/csharp/ql/lib/change-notes/2025-10-30-overlay-compilation-and-extraction.md
new file mode 100644
index 00000000000..0f5005a22a2
--- /dev/null
+++ b/csharp/ql/lib/change-notes/2025-10-30-overlay-compilation-and-extraction.md
@@ -0,0 +1,5 @@
+---
+category: feature
+---
+
+* Initial support for incremental C# databases via `codeql database create --overlay-base`/`--overlay-changes`.
diff --git a/csharp/ql/lib/change-notes/2025-11-03-roslyn-and-binlog.md b/csharp/ql/lib/change-notes/2025-11-03-roslyn-and-binlog.md
new file mode 100644
index 00000000000..92231d3be2f
--- /dev/null
+++ b/csharp/ql/lib/change-notes/2025-11-03-roslyn-and-binlog.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* Updated *roslyn* and *binlog* dependencies in the extractor, which may improve database and analysis quality.
diff --git a/csharp/ql/lib/change-notes/released/5.2.2.md b/csharp/ql/lib/change-notes/released/5.2.2.md
new file mode 100644
index 00000000000..22402d6e8fa
--- /dev/null
+++ b/csharp/ql/lib/change-notes/released/5.2.2.md
@@ -0,0 +1,3 @@
+## 5.2.2
+
+No user-facing changes.
diff --git a/csharp/ql/lib/change-notes/released/5.2.3.md b/csharp/ql/lib/change-notes/released/5.2.3.md
new file mode 100644
index 00000000000..b9891310419
--- /dev/null
+++ b/csharp/ql/lib/change-notes/released/5.2.3.md
@@ -0,0 +1,8 @@
+## 5.2.3
+
+### Minor Analysis Improvements
+
+* A bug has been fixed in the data flow analysis, which means that flow through calls using the `base` qualifier may now be tracked more accurately.
+* Added summary models for `System.Xml.XmlReader`, `System.Xml.XmlTextReader` and `System.Xml.XmlDictionaryReader`.
+* Models-as-data summaries for byte and char arrays and pointers now treat the entire collection as tainted, reflecting their common use as string alternatives.
+* The default taint tracking configuration now allows implicit reads from collections at sinks and in additional flow steps. This increases flow coverage for many taint tracking queries and helps reduce false negatives.
diff --git a/csharp/ql/lib/change-notes/released/5.2.4.md b/csharp/ql/lib/change-notes/released/5.2.4.md
new file mode 100644
index 00000000000..18f54ba122d
--- /dev/null
+++ b/csharp/ql/lib/change-notes/released/5.2.4.md
@@ -0,0 +1,3 @@
+## 5.2.4
+
+No user-facing changes.
diff --git a/csharp/ql/lib/change-notes/released/5.2.5.md b/csharp/ql/lib/change-notes/released/5.2.5.md
new file mode 100644
index 00000000000..bd0e1157099
--- /dev/null
+++ b/csharp/ql/lib/change-notes/released/5.2.5.md
@@ -0,0 +1,3 @@
+## 5.2.5
+
+No user-facing changes.
diff --git a/csharp/ql/lib/change-notes/released/5.2.6.md b/csharp/ql/lib/change-notes/released/5.2.6.md
new file mode 100644
index 00000000000..54ef01bfbf8
--- /dev/null
+++ b/csharp/ql/lib/change-notes/released/5.2.6.md
@@ -0,0 +1,8 @@
+## 5.2.6
+
+### Minor Analysis Improvements
+
+* The extraction of location information for parameters, fields, constructors, destructors and user operators has been optimized. Previously, location information was extracted multiple times for each bound generic. Now, only the location of the unbound generic declaration is extracted during the extraction phase, and the QL library explicitly reuses this location for all bound instances of the same generic.
+* The extraction of location information for type parameters and tuples types has been optimized. Previously, location information was extracted multiple times for each type when it was declared across multiple files. Now, the extraction context is respected during the extraction phase, ensuring locations are only extracted within the appropriate context. This change should be transparent to end-users but may improve extraction performance in some cases.
+* The extraction of location information for named types (classes, structs, etc.) has been optimized. Previously, location information was extracted multiple times for each type when it was declared across multiple files. Now, the extraction context is respected during the extraction phase, ensuring locations are only extracted within the appropriate context. This change should be transparent to end-users but may improve extraction performance in some cases.
+* The extraction of the location for bound generic entities (methods, accessors, indexers, properties, and events) has been optimized. Previously, location information was extracted multiple times for each bound generic. Now, only the location of the unbound generic declaration is extracted during the extraction phase, and the QL library explicitly reuses this location for all bound instances of the same generic.
diff --git a/csharp/ql/lib/change-notes/released/5.3.0.md b/csharp/ql/lib/change-notes/released/5.3.0.md
new file mode 100644
index 00000000000..144f8bf2633
--- /dev/null
+++ b/csharp/ql/lib/change-notes/released/5.3.0.md
@@ -0,0 +1,14 @@
+## 5.3.0
+
+### Deprecated APIs
+
+* The class `AbstractValue` in the `Guards` library has been deprecated and replaced with the class `GuardValue`.
+
+### Major Analysis Improvements
+
+* The representation of the C# control-flow graph has been significantly changed. This has minor effects on a wide range of queries including both minor improvements and minor regressions, for example, improved precision has been observed for `cs/inefficient-containskey` and `cs/stringbuilder-creation-in-loop`. Two queries stand out as being significantly affected with great improvements: `cs/dereferenced-value-may-be-null` has been completely rewritten which removes a very significant number of false positives. Furthermore, `cs/constant-condition` has been updated to report many new results - these new results are primarily expected to be true positives, but a few new false positives are expected as well. As part of these changes, `cs/dereferenced-value-may-be-null` has been changed from a `path-problem` query to a `problem` query, so paths are no longer reported for this query.
+
+### Minor Analysis Improvements
+
+* Added tracer support for macOS and Linux when the .NET CLI (`dotnet`) directly invokes the C# compiler (`csc`). This enhancement provides basic tracing and extraction capabilities for .NET 10 RC2 on these platforms.
+* The extraction of location information for source code entities has been updated to use star IDs (`*` IDs). This change should be transparent to end-users but may improve extraction performance in some cases by reducing TRAP file size and eliminating overhead from location de-duplication.
diff --git a/csharp/ql/lib/codeql-pack.release.yml b/csharp/ql/lib/codeql-pack.release.yml
index 1684d0e72a2..b0a1c83e5bc 100644
--- a/csharp/ql/lib/codeql-pack.release.yml
+++ b/csharp/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 5.2.1
+lastReleaseVersion: 5.3.0
diff --git a/csharp/ql/lib/csharp.qll b/csharp/ql/lib/csharp.qll
index dc187fc8d92..cab24d12dcd 100644
--- a/csharp/ql/lib/csharp.qll
+++ b/csharp/ql/lib/csharp.qll
@@ -36,6 +36,7 @@ import semmle.code.csharp.controlflow.ControlFlowGraph
 import semmle.code.csharp.dataflow.DataFlow
 import semmle.code.csharp.dataflow.TaintTracking
 import semmle.code.csharp.dataflow.SSA
+private import semmle.code.csharp.internal.Overlay
 
 /** Whether the source was extracted without a build command. */
 predicate extractionIsStandalone() { exists(SourceFile f | f.extractedStandalone()) }
diff --git a/csharp/ql/lib/ext/System.ComponentModel.model.yml b/csharp/ql/lib/ext/System.ComponentModel.model.yml
index d98c97727fb..a3b561583e3 100644
--- a/csharp/ql/lib/ext/System.ComponentModel.model.yml
+++ b/csharp/ql/lib/ext/System.ComponentModel.model.yml
@@ -36,3 +36,8 @@ extensions:
       - ["System.ComponentModel", "PropertyDescriptorCollection", False, "set_Item", "(System.Int32,System.Object)", "", "Argument[0]", "Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key]", "value", "manual"]
       - ["System.ComponentModel", "PropertyDescriptorCollection", False, "set_Item", "(System.Int32,System.Object)", "", "Argument[1]", "Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value]", "value", "manual"]
       - ["System.ComponentModel", "PropertyDescriptorCollection", False, "set_Item", "(System.Object,System.Object)", "", "Argument[1]", "Argument[this].Element", "value", "manual"]
+  - addsTo:
+      pack: codeql/csharp-all
+      extensible: neutralModel
+    data:
+       - ["System.ComponentModel", "PropertyDescriptor", "GetValue", "(System.Object)", "summary", "manual"]
\ No newline at end of file
diff --git a/csharp/ql/lib/ext/System.IO.model.yml b/csharp/ql/lib/ext/System.IO.model.yml
index 0b8b52d9e8a..549c324d66e 100644
--- a/csharp/ql/lib/ext/System.IO.model.yml
+++ b/csharp/ql/lib/ext/System.IO.model.yml
@@ -77,7 +77,7 @@ extensions:
       - ["System.IO", "Path", False, "GetPathRoot", "(System.ReadOnlySpan<System.Char>)", "", "Argument[0].Element", "ReturnValue", "taint", "manual"]
       - ["System.IO", "Path", False, "GetPathRoot", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
       - ["System.IO", "Path", False, "GetRelativePath", "(System.String,System.String)", "", "Argument[1]", "ReturnValue", "taint", "manual"]
-      - ["System.IO", "Stream", True, "BeginRead", "(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object)", "", "Argument[this]", "Argument[0].Element", "taint", "manual"]
+      - ["System.IO", "Stream", True, "BeginRead", "(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
       - ["System.IO", "Stream", True, "BeginWrite", "(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object)", "", "Argument[0].Element", "Argument[this]", "taint", "manual"]
       - ["System.IO", "Stream", False, "CopyTo", "(System.IO.Stream)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
       - ["System.IO", "Stream", True, "CopyTo", "(System.IO.Stream,System.Int32)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
@@ -85,17 +85,17 @@ extensions:
       - ["System.IO", "Stream", False, "CopyToAsync", "(System.IO.Stream,System.Int32)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
       - ["System.IO", "Stream", True, "CopyToAsync", "(System.IO.Stream,System.Int32,System.Threading.CancellationToken)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
       - ["System.IO", "Stream", False, "CopyToAsync", "(System.IO.Stream,System.Threading.CancellationToken)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
-      - ["System.IO", "Stream", True, "Read", "(System.Byte[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "manual"]
-      - ["System.IO", "Stream", True, "Read", "(System.Span<System.Byte>)", "", "Argument[this]", "Argument[0].Element", "taint", "manual"]
-      - ["System.IO", "Stream", False, "ReadAsync", "(System.Byte[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "manual"]
-      - ["System.IO", "Stream", True, "ReadAsync", "(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken)", "", "Argument[this]", "Argument[0].Element", "taint", "manual"]
+      - ["System.IO", "Stream", True, "Read", "(System.Byte[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["System.IO", "Stream", True, "Read", "(System.Span<System.Byte>)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["System.IO", "Stream", False, "ReadAsync", "(System.Byte[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["System.IO", "Stream", True, "ReadAsync", "(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
       # Post-update nodes for `Memory<T>` are currently unsupported. This model is provided for completeness
-      - ["System.IO", "Stream", True, "ReadAsync", "(System.Memory<System.Byte>,System.Threading.CancellationToken)", "", "Argument[this]", "Argument[0].Element", "taint", "manual"]
-      - ["System.IO", "Stream", True, "ReadAtLeast", "(System.Span<System.Byte>,System.Int32,System.Boolean)", "", "Argument[this]", "Argument[0].Element", "taint", "manual"]
+      - ["System.IO", "Stream", True, "ReadAsync", "(System.Memory<System.Byte>,System.Threading.CancellationToken)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["System.IO", "Stream", True, "ReadAtLeast", "(System.Span<System.Byte>,System.Int32,System.Boolean)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
       # Post-update nodes for `Memory<T>` are currently unsupported. This model is provided for completeness
       - ["System.IO", "Stream", True, "ReadAtLeastAsync", "(System.Memory<System.Byte>,System.Int32,System.Boolean,System.Threading.CancellationToken)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
-      - ["System.IO", "Stream", True, "ReadExactly", "(System.Span<System.Byte>)", "", "Argument[this]", "Argument[0].Element", "taint", "manual"]
-      - ["System.IO", "Stream", True, "ReadExactly", "(System.Byte[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "manual"]
+      - ["System.IO", "Stream", True, "ReadExactly", "(System.Span<System.Byte>)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["System.IO", "Stream", True, "ReadExactly", "(System.Byte[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
       - ["System.IO", "Stream", True, "Write", "(System.Byte[],System.Int32,System.Int32)", "", "Argument[0].Element", "Argument[this]", "taint", "manual"]
       - ["System.IO", "Stream", True, "Write", "(System.ReadOnlySpan<System.Byte>)", "", "Argument[0].Element", "Argument[this]", "taint", "manual"]
       - ["System.IO", "Stream", False, "WriteAsync", "(System.Byte[],System.Int32,System.Int32)", "", "Argument[0].Element", "Argument[this]", "taint", "manual"]
@@ -128,16 +128,16 @@ extensions:
       - ["System.IO", "StringWriter", True, "WriteLineAsync", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
       - ["System.IO", "StringWriter", True, "WriteLineAsync", "(System.Text.StringBuilder,System.Threading.CancellationToken)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
       - ["System.IO", "TextReader", True, "Read", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
-      - ["System.IO", "TextReader", True, "Read", "(System.Char[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "manual"]
-      - ["System.IO", "TextReader", True, "Read", "(System.Span<System.Char>)", "", "Argument[this]", "Argument[0].Element", "taint", "manual"]
-      - ["System.IO", "TextReader", True, "ReadAsync", "(System.Char[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "manual"]
+      - ["System.IO", "TextReader", True, "Read", "(System.Char[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["System.IO", "TextReader", True, "Read", "(System.Span<System.Char>)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["System.IO", "TextReader", True, "ReadAsync", "(System.Char[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
       # Post-update nodes for `Memory<T>` are currently unsupported. This model is provided for completeness
-      - ["System.IO", "TextReader", True, "ReadAsync", "(System.Memory<System.Char>,System.Threading.CancellationToken)", "", "Argument[this]", "Argument[0].Element", "taint", "manual"]
-      - ["System.IO", "TextReader", True, "ReadBlock", "(System.Char[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "manual"]
-      - ["System.IO", "TextReader", True, "ReadBlock", "(System.Span<System.Char>)", "", "Argument[this]", "Argument[0].Element", "taint", "manual"]
-      - ["System.IO", "TextReader", True, "ReadBlockAsync", "(System.Char[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "manual"]
+      - ["System.IO", "TextReader", True, "ReadAsync", "(System.Memory<System.Char>,System.Threading.CancellationToken)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["System.IO", "TextReader", True, "ReadBlock", "(System.Char[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["System.IO", "TextReader", True, "ReadBlock", "(System.Span<System.Char>)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["System.IO", "TextReader", True, "ReadBlockAsync", "(System.Char[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
       # Post-update nodes for `Memory<T>` are currently unsupported. This model is provided for completeness
-      - ["System.IO", "TextReader", True, "ReadBlockAsync", "(System.Memory<System.Char>,System.Threading.CancellationToken)", "", "Argument[this]", "Argument[0].Element", "taint", "manual"]
+      - ["System.IO", "TextReader", True, "ReadBlockAsync", "(System.Memory<System.Char>,System.Threading.CancellationToken)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
       - ["System.IO", "TextReader", True, "ReadLine", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
       - ["System.IO", "TextReader", True, "ReadLineAsync", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
       - ["System.IO", "TextReader", True, "ReadToEnd", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
diff --git a/csharp/ql/lib/ext/System.Xml.model.yml b/csharp/ql/lib/ext/System.Xml.model.yml
index efea34b40db..a6ed8dd465d 100644
--- a/csharp/ql/lib/ext/System.Xml.model.yml
+++ b/csharp/ql/lib/ext/System.Xml.model.yml
@@ -23,6 +23,17 @@ extensions:
       - ["System.Xml", "XmlDictionaryReader", False, "CreateBinaryReader", "(System.IO.Stream,System.Xml.IXmlDictionary,System.Xml.XmlDictionaryReaderQuotas,System.Xml.XmlBinaryReaderSession,System.Xml.OnXmlDictionaryReaderClose)", "", "Argument[1]", "ReturnValue", "taint", "manual"]
       - ["System.Xml", "XmlDictionaryReader", False, "CreateBinaryReader", "(System.IO.Stream,System.Xml.IXmlDictionary,System.Xml.XmlDictionaryReaderQuotas,System.Xml.XmlBinaryReaderSession,System.Xml.OnXmlDictionaryReaderClose)", "", "Argument[3]", "ReturnValue", "taint", "manual"]
       - ["System.Xml", "XmlDictionaryReader", False, "CreateBinaryReader", "(System.IO.Stream,System.Xml.XmlDictionaryReaderQuotas)", "", "Argument[0]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlDictionaryReader", False, "CreateTextReader", "(System.Byte[],System.Int32,System.Int32,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose)", "", "Argument[0].Element", "ReturnValue", "taint", "manual"]
+      - ["System.Xml", "XmlDictionaryReader", False, "CreateTextReader", "(System.Byte[],System.Int32,System.Int32,System.Xml.XmlDictionaryReaderQuotas)", "", "Argument[0].Element", "ReturnValue", "taint", "manual"]
+      - ["System.Xml", "XmlDictionaryReader", False, "CreateTextReader", "(System.Byte[],System.Xml.XmlDictionaryReaderQuotas)", "", "Argument[0].Element", "ReturnValue", "taint", "manual"]
+      - ["System.Xml", "XmlDictionaryReader", False, "CreateTextReader", "(System.IO.Stream,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["System.Xml", "XmlDictionaryReader", False, "CreateTextReader", "(System.IO.Stream,System.Xml.XmlDictionaryReaderQuotas)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["System.Xml", "XmlDictionaryReader", True, "ReadContentAsBase64", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["System.Xml", "XmlDictionaryReader", True, "ReadContentAsBinHex", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["System.Xml", "XmlDictionaryReader", True, "ReadContentAsBinHex", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["System.Xml", "XmlDictionaryReader", True, "ReadContentAsChars", "(System.Char[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["System.Xml", "XmlDictionaryReader", True, "ReadElementContentAsBase64", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["System.Xml", "XmlDictionaryReader", True, "ReadElementContentAsBinHex", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
       - ["System.Xml", "XmlDocument", False, "Load", "(System.IO.Stream)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
       - ["System.Xml", "XmlDocument", False, "Load", "(System.IO.TextReader)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
       - ["System.Xml", "XmlDocument", False, "Load", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
@@ -68,3 +79,68 @@ extensions:
       - ["System.Xml", "XmlReader", False, "Create", "(System.String,System.Xml.XmlReaderSettings)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
       - ["System.Xml", "XmlReader", False, "Create", "(System.String,System.Xml.XmlReaderSettings,System.Xml.XmlParserContext)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
       - ["System.Xml", "XmlReader", False, "Create", "(System.Xml.XmlReader,System.Xml.XmlReaderSettings)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["System.Xml", "XmlReader", True, "GetAttribute", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "GetAttribute", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "GetAttribute", "(System.String,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "GetValueAsync", "()", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "LookupNamespace", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-manual"]
+      - ["System.Xml", "XmlReader", True, "ReadContentAs", "(System.Type,System.Xml.IXmlNamespaceResolver)", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "ReadContentAsAsync", "(System.Type,System.Xml.IXmlNamespaceResolver)", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "ReadContentAsBase64", "(System.Byte[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["System.Xml", "XmlReader", True, "ReadContentAsBase64Async", "(System.Byte[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["System.Xml", "XmlReader", True, "ReadContentAsBinHex", "(System.Byte[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["System.Xml", "XmlReader", True, "ReadContentAsBinHexAsync", "(System.Byte[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["System.Xml", "XmlReader", True, "ReadContentAsObject", "()", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "ReadContentAsObjectAsync", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["System.Xml", "XmlReader", True, "ReadContentAsString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "ReadContentAsStringAsync", "()", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "ReadElementContentAs", "(System.Type,System.Xml.IXmlNamespaceResolver,System.String,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "ReadElementContentAsAsync", "(System.Type,System.Xml.IXmlNamespaceResolver)", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["System.Xml", "XmlReader", True, "ReadElementContentAsBase64", "(System.Byte[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["System.Xml", "XmlReader", True, "ReadElementContentAsBase64Async", "(System.Byte[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["System.Xml", "XmlReader", True, "ReadElementContentAsBinHex", "(System.Byte[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["System.Xml", "XmlReader", True, "ReadElementContentAsBinHexAsync", "(System.Byte[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["System.Xml", "XmlReader", True, "ReadElementContentAsObject", "()", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "ReadElementContentAsObject", "(System.String,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "ReadElementContentAsString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "ReadElementContentAsString", "(System.String,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "ReadElementString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "ReadElementString", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "ReadElementString", "(System.String,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "ReadInnerXml", "()", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "ReadInnerXmlAsync", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["System.Xml", "XmlReader", True, "ReadOuterXml", "()", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "ReadOuterXmlAsync", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["System.Xml", "XmlReader", True, "ReadString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "ReadSubtree", "()", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "ReadValueChunk", "(System.Char[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["System.Xml", "XmlReader", True, "ReadValueChunkAsync", "(System.Char[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["System.Xml", "XmlReader", True, "get_BaseURI", "()", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "get_Item", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "get_Item", "(System.String,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "get_LocalName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "get_Name", "()", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "get_NameTable", "()", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "get_NamespaceURI", "()", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "get_Prefix", "()", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "get_SchemaInfo", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-manual"]
+      - ["System.Xml", "XmlReader", True, "get_Value", "()", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlTextReader", True, "GetNamespacesInScope", "(System.Xml.XmlNamespaceScope)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["System.Xml", "XmlTextReader", True, "GetRemainder", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["System.Xml", "XmlTextReader", True, "ReadBase64", "(System.Byte[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["System.Xml", "XmlTextReader", True, "ReadBinHex", "(System.Byte[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["System.Xml", "XmlTextReader", True, "ReadChars", "(System.Char[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["System.Xml", "XmlTextReader", False, "XmlTextReader", "(System.IO.Stream)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["System.Xml", "XmlTextReader", False, "XmlTextReader", "(System.IO.Stream,System.Xml.XmlNameTable)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["System.Xml", "XmlTextReader", False, "XmlTextReader", "(System.IO.Stream,System.Xml.XmlNodeType,System.Xml.XmlParserContext)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["System.Xml", "XmlTextReader", False, "XmlTextReader", "(System.IO.TextReader)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["System.Xml", "XmlTextReader", False, "XmlTextReader", "(System.IO.TextReader,System.Xml.XmlNameTable)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["System.Xml", "XmlTextReader", False, "XmlTextReader", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["System.Xml", "XmlTextReader", False, "XmlTextReader", "(System.String,System.IO.Stream)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["System.Xml", "XmlTextReader", False, "XmlTextReader", "(System.String,System.IO.Stream,System.Xml.XmlNameTable)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["System.Xml", "XmlTextReader", False, "XmlTextReader", "(System.String,System.IO.TextReader)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["System.Xml", "XmlTextReader", False, "XmlTextReader", "(System.String,System.IO.TextReader,System.Xml.XmlNameTable)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["System.Xml", "XmlTextReader", False, "XmlTextReader", "(System.String,System.Xml.XmlNameTable)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["System.Xml", "XmlTextReader", False, "XmlTextReader", "(System.String,System.Xml.XmlNodeType,System.Xml.XmlParserContext)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["System.Xml", "XmlTextReader", False, "XmlTextReader", "(System.Xml.XmlNameTable)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
diff --git a/csharp/ql/lib/ext/System.model.yml b/csharp/ql/lib/ext/System.model.yml
index 3853f03dc2f..870413e7569 100644
--- a/csharp/ql/lib/ext/System.model.yml
+++ b/csharp/ql/lib/ext/System.model.yml
@@ -39,15 +39,15 @@ extensions:
       - ["System", "Convert", False, "ChangeType", "(System.Object,System.Type,System.IFormatProvider)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
       - ["System", "Convert", False, "ChangeType", "(System.Object,System.TypeCode)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
       - ["System", "Convert", False, "ChangeType", "(System.Object,System.TypeCode,System.IFormatProvider)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
-      - ["System", "Convert", False, "FromBase64CharArray", "(System.Char[],System.Int32,System.Int32)", "", "Argument[0].Element", "ReturnValue.Element", "taint", "manual"]
-      - ["System", "Convert", False, "FromBase64String", "(System.String)", "", "Argument[0]", "ReturnValue.Element", "taint", "manual"]
-      - ["System", "Convert", False, "FromHexString", "(System.ReadOnlySpan<System.Char>)", "", "Argument[0].Element", "ReturnValue.Element", "taint", "manual"]
-      - ["System", "Convert", False, "FromHexString", "(System.String)", "", "Argument[0]", "ReturnValue.Element", "taint", "manual"]
+      - ["System", "Convert", False, "FromBase64CharArray", "(System.Char[],System.Int32,System.Int32)", "", "Argument[0].Element", "ReturnValue", "taint", "manual"]
+      - ["System", "Convert", False, "FromBase64String", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["System", "Convert", False, "FromHexString", "(System.ReadOnlySpan<System.Char>)", "", "Argument[0].Element", "ReturnValue", "taint", "manual"]
+      - ["System", "Convert", False, "FromHexString", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
       - ["System", "Convert", False, "GetTypeCode", "(System.Object)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
       - ["System", "Convert", False, "IsDBNull", "(System.Object)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
-      - ["System", "Convert", False, "ToBase64CharArray", "(System.Byte[],System.Int32,System.Int32,System.Char[],System.Int32)", "", "Argument[0].Element", "Argument[3].Element", "taint", "manual"]
+      - ["System", "Convert", False, "ToBase64CharArray", "(System.Byte[],System.Int32,System.Int32,System.Char[],System.Int32)", "", "Argument[0].Element", "Argument[3]", "taint", "manual"]
       - ["System", "Convert", False, "ToBase64CharArray", "(System.Byte[],System.Int32,System.Int32,System.Char[],System.Int32)", "", "Argument[0].Element", "ReturnValue", "taint", "manual"]
-      - ["System", "Convert", False, "ToBase64CharArray", "(System.Byte[],System.Int32,System.Int32,System.Char[],System.Int32,System.Base64FormattingOptions)", "", "Argument[0].Element", "Argument[3].Element", "taint", "manual"]
+      - ["System", "Convert", False, "ToBase64CharArray", "(System.Byte[],System.Int32,System.Int32,System.Char[],System.Int32,System.Base64FormattingOptions)", "", "Argument[0].Element", "Argument[3]", "taint", "manual"]
       - ["System", "Convert", False, "ToBase64CharArray", "(System.Byte[],System.Int32,System.Int32,System.Char[],System.Int32,System.Base64FormattingOptions)", "", "Argument[0].Element", "ReturnValue", "taint", "manual"]
       - ["System", "Convert", False, "ToBase64String", "(System.Byte[])", "", "Argument[0].Element", "ReturnValue", "taint", "manual"]
       - ["System", "Convert", False, "ToBase64String", "(System.Byte[],System.Base64FormattingOptions)", "", "Argument[0].Element", "ReturnValue", "taint", "manual"]
@@ -353,13 +353,13 @@ extensions:
       - ["System", "Convert", False, "ToUInt64", "(System.UInt16)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
       - ["System", "Convert", False, "ToUInt64", "(System.UInt32)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
       - ["System", "Convert", False, "ToUInt64", "(System.UInt64)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
-      - ["System", "Convert", False, "TryFromBase64Chars", "(System.ReadOnlySpan<System.Char>,System.Span<System.Byte>,System.Int32)", "", "Argument[0].Element", "Argument[1].Element", "taint", "manual"]
+      - ["System", "Convert", False, "TryFromBase64Chars", "(System.ReadOnlySpan<System.Char>,System.Span<System.Byte>,System.Int32)", "", "Argument[0].Element", "Argument[1]", "taint", "manual"]
       - ["System", "Convert", False, "TryFromBase64Chars", "(System.ReadOnlySpan<System.Char>,System.Span<System.Byte>,System.Int32)", "", "Argument[0].Element", "Argument[2]", "taint", "manual"]
       - ["System", "Convert", False, "TryFromBase64Chars", "(System.ReadOnlySpan<System.Char>,System.Span<System.Byte>,System.Int32)", "", "Argument[0].Element", "ReturnValue", "taint", "manual"]
-      - ["System", "Convert", False, "TryFromBase64String", "(System.String,System.Span<System.Byte>,System.Int32)", "", "Argument[0]", "Argument[1].Element", "taint", "manual"]
+      - ["System", "Convert", False, "TryFromBase64String", "(System.String,System.Span<System.Byte>,System.Int32)", "", "Argument[0]", "Argument[1]", "taint", "manual"]
       - ["System", "Convert", False, "TryFromBase64String", "(System.String,System.Span<System.Byte>,System.Int32)", "", "Argument[0]", "Argument[2]", "taint", "manual"]
       - ["System", "Convert", False, "TryFromBase64String", "(System.String,System.Span<System.Byte>,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
-      - ["System", "Convert", False, "TryToBase64Chars", "(System.ReadOnlySpan<System.Byte>,System.Span<System.Char>,System.Int32,System.Base64FormattingOptions)", "", "Argument[0].Element", "Argument[1].Element", "taint", "manual"]
+      - ["System", "Convert", False, "TryToBase64Chars", "(System.ReadOnlySpan<System.Byte>,System.Span<System.Char>,System.Int32,System.Base64FormattingOptions)", "", "Argument[0].Element", "Argument[1]", "taint", "manual"]
       - ["System", "Convert", False, "TryToBase64Chars", "(System.ReadOnlySpan<System.Byte>,System.Span<System.Char>,System.Int32,System.Base64FormattingOptions)", "", "Argument[0].Element", "Argument[2]", "taint", "manual"]
       - ["System", "Convert", False, "TryToBase64Chars", "(System.ReadOnlySpan<System.Byte>,System.Span<System.Char>,System.Int32,System.Base64FormattingOptions)", "", "Argument[0].Element", "ReturnValue", "taint", "manual"]
       - ["System", "Int32", False, "Parse", "(System.ReadOnlySpan<System.Char>,System.Globalization.NumberStyles,System.IFormatProvider)", "", "Argument[0].Element", "ReturnValue", "taint", "manual"]
diff --git a/csharp/ql/lib/printAst.ql b/csharp/ql/lib/printAst.ql
index 380f4b4024b..85820796a88 100644
--- a/csharp/ql/lib/printAst.ql
+++ b/csharp/ql/lib/printAst.ql
@@ -18,8 +18,8 @@ external string selectedSourceFile();
 
 class PrintAstConfigurationOverride extends PrintAstConfiguration {
   /**
-   * Holds if the location matches the selected file in the VS Code extension and
-   * the element is `fromSource`.
+   * Holds if the location `l` matches the selected file in the VS Code extension and
+   * the element is `e` is `fromSource`.
    */
   override predicate shouldPrint(Element e, Location l) {
     super.shouldPrint(e, l) and
diff --git a/csharp/ql/lib/qlpack.yml b/csharp/ql/lib/qlpack.yml
index b99e5b5be64..3ecdad08291 100644
--- a/csharp/ql/lib/qlpack.yml
+++ b/csharp/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-all
-version: 5.2.2-dev
+version: 5.3.1-dev
 groups: csharp
 dbscheme: semmlecode.csharp.dbscheme
 extractor: csharp
@@ -18,3 +18,4 @@ dataExtensions:
   - ext/*.model.yml
   - ext/generated/*.model.yml
 warnOnImplicitThis: true
+compileForOverlayEval: true
diff --git a/csharp/ql/lib/semmle/code/csharp/Assignable.qll b/csharp/ql/lib/semmle/code/csharp/Assignable.qll
index d4f8d9974f0..3c7170a6f84 100644
--- a/csharp/ql/lib/semmle/code/csharp/Assignable.qll
+++ b/csharp/ql/lib/semmle/code/csharp/Assignable.qll
@@ -583,7 +583,7 @@ module AssignableDefinitions {
   }
 
   /**
-   * Holds if the `ref` assignment to `aa` via call `c` is uncertain.
+   * Holds if the `ref` assignment to `arg` via call `c` is uncertain.
    */
   // Not in the cached module `Cached`, as that would introduce a dependency
   // on the CFG construction, and effectively collapse too many stages into one
diff --git a/csharp/ql/lib/semmle/code/csharp/Caching.qll b/csharp/ql/lib/semmle/code/csharp/Caching.qll
index 6a58edef63f..bbe310fe69e 100644
--- a/csharp/ql/lib/semmle/code/csharp/Caching.qll
+++ b/csharp/ql/lib/semmle/code/csharp/Caching.qll
@@ -10,8 +10,6 @@ module Stages {
   cached
   module ControlFlowStage {
     private import semmle.code.csharp.controlflow.internal.Splitting
-    private import semmle.code.csharp.controlflow.internal.SuccessorType
-    private import semmle.code.csharp.controlflow.Guards as Guards
 
     cached
     predicate forceCachingInSameStage() { any() }
@@ -20,12 +18,8 @@ module Stages {
     private predicate forceCachingInSameStageRev() {
       exists(Split s)
       or
-      exists(SuccessorType st)
-      or
       exists(ControlFlow::Node n)
       or
-      Guards::Internal::isCustomNullCheck(_, _, _, _)
-      or
       forceCachingInSameStageRev()
     }
   }
@@ -39,8 +33,6 @@ module Stages {
 
     cached
     private predicate forceCachingInSameStageRev() {
-      any(ControlFlowElement cfe).controlsBlock(_, _, _)
-      or
       exists(GuardedExpr ge)
       or
       forceCachingInSameStageRev()
diff --git a/csharp/ql/lib/semmle/code/csharp/Callable.qll b/csharp/ql/lib/semmle/code/csharp/Callable.qll
index 6384f458276..44e7c3cf4ca 100644
--- a/csharp/ql/lib/semmle/code/csharp/Callable.qll
+++ b/csharp/ql/lib/semmle/code/csharp/Callable.qll
@@ -265,7 +265,7 @@ class Method extends Callable, Virtualizable, Attributable, @method {
     result = Virtualizable.super.getAnUltimateImplementor()
   }
 
-  override Location getALocation() { method_location(this, result) }
+  override Location getALocation() { method_location(this.getUnboundDeclaration(), result) }
 
   /** Holds if this method is an extension method. */
   predicate isExtensionMethod() { this.getParameter(0).hasExtensionMethodModifier() }
@@ -357,7 +357,7 @@ class Constructor extends Callable, Member, Attributable, @constructor {
 
   override Constructor getUnboundDeclaration() { constructors(this, _, _, result) }
 
-  override Location getALocation() { constructor_location(this, result) }
+  override Location getALocation() { constructor_location(this.getUnboundDeclaration(), result) }
 
   override predicate fromSource() { Member.super.fromSource() and not this.isCompilerGenerated() }
 
@@ -450,7 +450,7 @@ class Destructor extends Callable, Member, Attributable, @destructor {
 
   override Destructor getUnboundDeclaration() { destructors(this, _, _, result) }
 
-  override Location getALocation() { destructor_location(this, result) }
+  override Location getALocation() { destructor_location(this.getUnboundDeclaration(), result) }
 
   override string toString() { result = Callable.super.toString() }
 
@@ -484,7 +484,7 @@ class Operator extends Callable, Member, Attributable, Overridable, @operator {
 
   override Operator getUnboundDeclaration() { operators(this, _, _, _, _, result) }
 
-  override Location getALocation() { operator_location(this, result) }
+  override Location getALocation() { operator_location(this.getUnboundDeclaration(), result) }
 
   override string toString() { result = Callable.super.toString() }
 
@@ -708,7 +708,7 @@ class TrueOperator extends UnaryOperator {
  *
  * Either an addition operator (`AddOperator`), a checked addition operator
  * (`CheckedAddOperator`) a subtraction operator (`SubOperator`), a checked
- * substraction operator (`CheckedSubOperator`), a multiplication operator
+ * subtraction operator (`CheckedSubOperator`), a multiplication operator
  * (`MulOperator`), a checked multiplication operator (`CheckedMulOperator`),
  * a division operator (`DivOperator`), a checked division operator
  * (`CheckedDivOperator`), a remainder operator (`RemOperator`), an and
diff --git a/csharp/ql/lib/semmle/code/csharp/Conversion.qll b/csharp/ql/lib/semmle/code/csharp/Conversion.qll
index 7a1314abe16..99c58ee51c6 100644
--- a/csharp/ql/lib/semmle/code/csharp/Conversion.qll
+++ b/csharp/ql/lib/semmle/code/csharp/Conversion.qll
@@ -719,6 +719,15 @@ private Type convTypeParameterBase(TypeParameter tp) {
   result = getATypeParameterFromConstraints+(tp)
 }
 
+pragma[noinline]
+private Class typeConstraintToBaseType(TypeParameterConstraints tpc) {
+  tpc.hasValueTypeConstraint() and result instanceof SystemValueTypeClass
+  or
+  result = tpc.getATypeConstraint()
+  or
+  tpc.hasRefTypeConstraint() and result instanceof ObjectType
+}
+
 /**
  * 10.1.5: Candidates for the effective base class of type parameter `tp`.
  *
@@ -731,13 +740,9 @@ private Class effectiveBaseClassCandidate(TypeParameter tp) {
   not hasPrimaryConstraints(tp) and result instanceof ObjectType
   or
   exists(TypeParameterConstraints tpc | tpc = tp.getConstraints() |
-    tpc.hasValueTypeConstraint() and result instanceof SystemValueTypeClass
-    or
-    result = tpc.getATypeConstraint()
+    result = typeConstraintToBaseType(tpc)
     or
     result = effectiveBaseClassCandidate(tpc.getATypeConstraint())
-    or
-    tpc.hasRefTypeConstraint() and result instanceof ObjectType
   )
 }
 
diff --git a/csharp/ql/lib/semmle/code/csharp/Event.qll b/csharp/ql/lib/semmle/code/csharp/Event.qll
index a7079952478..39e2fdb7894 100644
--- a/csharp/ql/lib/semmle/code/csharp/Event.qll
+++ b/csharp/ql/lib/semmle/code/csharp/Event.qll
@@ -68,7 +68,7 @@ class Event extends DeclarationWithAccessors, @event {
     result = DeclarationWithAccessors.super.getAnUltimateImplementor()
   }
 
-  override Location getALocation() { event_location(this, result) }
+  override Location getALocation() { event_location(this.getUnboundDeclaration(), result) }
 
   override string getAPrimaryQlClass() { result = "Event" }
 }
@@ -99,7 +99,7 @@ class EventAccessor extends Accessor, @event_accessor {
 
   override Event getDeclaration() { event_accessors(this, _, _, result, _) }
 
-  override Location getALocation() { event_accessor_location(this, result) }
+  override Location getALocation() { event_accessor_location(this.getUnboundDeclaration(), result) }
 }
 
 /**
diff --git a/csharp/ql/lib/semmle/code/csharp/Member.qll b/csharp/ql/lib/semmle/code/csharp/Member.qll
index 3427d4ea089..a196d3b3fc7 100644
--- a/csharp/ql/lib/semmle/code/csharp/Member.qll
+++ b/csharp/ql/lib/semmle/code/csharp/Member.qll
@@ -491,7 +491,7 @@ class Parameterizable extends Declaration, @parameterizable {
   final Parameter getARawParameter() { result = this.getRawParameter(_) }
 
   /**
-   * Gets the type of the parameter, possibly prefixed
+   * Gets the type of the `i`th parameter, possibly prefixed
    * with `out`, `ref`, or `params`, where appropriate.
    */
   private string parameterTypeToString(int i) {
diff --git a/csharp/ql/lib/semmle/code/csharp/PrintAst.qll b/csharp/ql/lib/semmle/code/csharp/PrintAst.qll
index fd4bf1cb86b..1ac96c85e78 100644
--- a/csharp/ql/lib/semmle/code/csharp/PrintAst.qll
+++ b/csharp/ql/lib/semmle/code/csharp/PrintAst.qll
@@ -523,11 +523,9 @@ final class AttributeNode extends ElementNode {
  * A node representing a `TypeParameter`.
  */
 final class TypeParameterNode extends ElementNode {
-  TypeParameter typeParameter;
-
   TypeParameterNode() {
-    typeParameter = element and
-    not isNotNeeded(typeParameter.getDeclaringGeneric())
+    element =
+      any(TypeParameter typeParameter | not isNotNeeded(typeParameter.getDeclaringGeneric()))
   }
 
   override ElementNode getChild(int childIndex) { none() }
diff --git a/csharp/ql/lib/semmle/code/csharp/Property.qll b/csharp/ql/lib/semmle/code/csharp/Property.qll
index 60ea83c3011..e651639b631 100644
--- a/csharp/ql/lib/semmle/code/csharp/Property.qll
+++ b/csharp/ql/lib/semmle/code/csharp/Property.qll
@@ -196,7 +196,7 @@ class Property extends DeclarationWithGetSetAccessors, @property {
 
   override PropertyAccess getAnAccess() { result.getTarget() = this }
 
-  override Location getALocation() { property_location(this, result) }
+  override Location getALocation() { property_location(this.getUnboundDeclaration(), result) }
 
   override Expr getAnAssignedValue() {
     result = DeclarationWithGetSetAccessors.super.getAnAssignedValue()
@@ -328,7 +328,7 @@ class Indexer extends DeclarationWithGetSetAccessors, Parameterizable, @indexer
     result = DeclarationWithGetSetAccessors.super.getAnUltimateImplementor()
   }
 
-  override Location getALocation() { indexer_location(this, result) }
+  override Location getALocation() { indexer_location(this.getUnboundDeclaration(), result) }
 
   override string toStringWithTypes() {
     result = this.getName() + "[" + this.parameterTypesToString() + "]"
@@ -408,7 +408,7 @@ class Accessor extends Callable, Modifiable, Attributable, Overridable, @callabl
 
   override Accessor getUnboundDeclaration() { accessors(this, _, _, _, result) }
 
-  override Location getALocation() { accessor_location(this, result) }
+  override Location getALocation() { accessor_location(this.getUnboundDeclaration(), result) }
 
   override string toString() { result = this.getName() }
 }
diff --git a/csharp/ql/lib/semmle/code/csharp/Type.qll b/csharp/ql/lib/semmle/code/csharp/Type.qll
index e417f393b94..1efb1aa93bf 100644
--- a/csharp/ql/lib/semmle/code/csharp/Type.qll
+++ b/csharp/ql/lib/semmle/code/csharp/Type.qll
@@ -394,6 +394,8 @@ class NestedType extends ValueOrRefType {
   NestedType() { nested_types(this, _, _) }
 
   override ValueOrRefType getDeclaringType() { nested_types(this, result, _) }
+
+  override Location getALocation() { type_location(this.getUnboundDeclaration(), result) }
 }
 
 /**
diff --git a/csharp/ql/lib/semmle/code/csharp/Variable.qll b/csharp/ql/lib/semmle/code/csharp/Variable.qll
index 02018c260a6..746ea6acd2f 100644
--- a/csharp/ql/lib/semmle/code/csharp/Variable.qll
+++ b/csharp/ql/lib/semmle/code/csharp/Variable.qll
@@ -213,7 +213,7 @@ class Parameter extends LocalScopeVariable, Attributable, TopLevelExprParent, @p
     params(this, _, getTypeRef(result), _, _, _, _)
   }
 
-  override Location getALocation() { param_location(this, result) }
+  override Location getALocation() { param_location(this.getUnboundDeclaration(), result) }
 
   override string toString() { result = this.getName() }
 
@@ -449,7 +449,7 @@ class Field extends Variable, AssignableMember, Attributable, TopLevelExprParent
     fields(this, _, _, _, getTypeRef(result), _)
   }
 
-  override Location getALocation() { field_location(this, result) }
+  override Location getALocation() { field_location(this.getUnboundDeclaration(), result) }
 
   override string toString() { result = Variable.super.toString() }
 
diff --git a/csharp/ql/lib/semmle/code/csharp/commons/Constants.qll b/csharp/ql/lib/semmle/code/csharp/commons/Constants.qll
index 508ba0e5e87..ab2d9e0eef7 100644
--- a/csharp/ql/lib/semmle/code/csharp/commons/Constants.qll
+++ b/csharp/ql/lib/semmle/code/csharp/commons/Constants.qll
@@ -6,9 +6,7 @@ private import semmle.code.csharp.commons.StructuralComparison as StructuralComp
 
 pragma[noinline]
 private predicate isConstantCondition0(ControlFlow::Node cfn, boolean b) {
-  exists(
-    cfn.getASuccessorByType(any(ControlFlow::SuccessorTypes::BooleanSuccessor t | t.getValue() = b))
-  ) and
+  exists(cfn.getASuccessorByType(any(ControlFlow::BooleanSuccessor t | t.getValue() = b))) and
   strictcount(ControlFlow::SuccessorType t | exists(cfn.getASuccessorByType(t))) = 1
 }
 
diff --git a/csharp/ql/lib/semmle/code/csharp/controlflow/BasicBlocks.qll b/csharp/ql/lib/semmle/code/csharp/controlflow/BasicBlocks.qll
index 9e548838ade..bf6a9772857 100644
--- a/csharp/ql/lib/semmle/code/csharp/controlflow/BasicBlocks.qll
+++ b/csharp/ql/lib/semmle/code/csharp/controlflow/BasicBlocks.qll
@@ -3,9 +3,10 @@
  */
 
 import csharp
-private import ControlFlow::SuccessorTypes
+private import ControlFlow
 private import semmle.code.csharp.controlflow.internal.ControlFlowGraphImpl as CfgImpl
 private import CfgImpl::BasicBlocks as BasicBlocksImpl
+private import codeql.controlflow.BasicBlock as BB
 
 /**
  * A basic block, that is, a maximal straight-line sequence of control flow nodes
@@ -13,7 +14,12 @@ private import CfgImpl::BasicBlocks as BasicBlocksImpl
  */
 final class BasicBlock extends BasicBlocksImpl::BasicBlock {
   /** Gets an immediate successor of this basic block of a given type, if any. */
-  BasicBlock getASuccessorByType(ControlFlow::SuccessorType t) { result = this.getASuccessor(t) }
+  BasicBlock getASuccessor(ControlFlow::SuccessorType t) { result = super.getASuccessor(t) }
+
+  /** DEPRECATED: Use `getASuccessor` instead. */
+  deprecated BasicBlock getASuccessorByType(ControlFlow::SuccessorType t) {
+    result = this.getASuccessor(t)
+  }
 
   /** Gets an immediate predecessor of this basic block of a given type, if any. */
   BasicBlock getAPredecessorByType(ControlFlow::SuccessorType t) {
@@ -58,6 +64,8 @@ final class BasicBlock extends BasicBlocksImpl::BasicBlock {
     result.getFirstNode() = this.getLastNode().getAFalseSuccessor()
   }
 
+  BasicBlock getASuccessor() { result = super.getASuccessor() }
+
   /** Gets the control flow node at a specific (zero-indexed) position in this basic block. */
   ControlFlow::Node getNode(int pos) { result = super.getNode(pos) }
 
@@ -330,3 +338,19 @@ final class ConditionBlock extends BasicBlock, BasicBlocksImpl::ConditionBasicBl
     super.edgeDominates(controlled, s)
   }
 }
+
+private class BasicBlockAlias = BasicBlock;
+
+private class EntryBasicBlockAlias = EntryBasicBlock;
+
+module Cfg implements BB::CfgSig<Location> {
+  class ControlFlowNode = ControlFlow::Node;
+
+  class BasicBlock = BasicBlockAlias;
+
+  class EntryBasicBlock = EntryBasicBlockAlias;
+
+  predicate dominatingEdge(BasicBlock bb1, BasicBlock bb2) {
+    BasicBlocksImpl::dominatingEdge(bb1, bb2)
+  }
+}
diff --git a/csharp/ql/lib/semmle/code/csharp/controlflow/ControlFlowElement.qll b/csharp/ql/lib/semmle/code/csharp/controlflow/ControlFlowElement.qll
index 5649f43b881..0d0ed681969 100644
--- a/csharp/ql/lib/semmle/code/csharp/controlflow/ControlFlowElement.qll
+++ b/csharp/ql/lib/semmle/code/csharp/controlflow/ControlFlowElement.qll
@@ -5,7 +5,6 @@ private import semmle.code.csharp.ExprOrStmtParent
 private import semmle.code.csharp.commons.Compilation
 private import ControlFlow
 private import ControlFlow::BasicBlocks
-private import SuccessorTypes
 private import semmle.code.csharp.Caching
 private import internal.ControlFlowGraphImpl as Impl
 
@@ -41,6 +40,12 @@ class ControlFlowElement extends ExprOrStmtParent, @control_flow_element {
    */
   Nodes::ElementNode getAControlFlowNode() { result.getAstNode() = this }
 
+  /** Gets the control flow node for this element. */
+  ControlFlow::Node getControlFlowNode() { result.getAstNode() = this }
+
+  /** Gets the basic block in which this element occurs. */
+  BasicBlock getBasicBlock() { result = this.getAControlFlowNode().getBasicBlock() }
+
   /**
    * Gets a first control flow node executed within this element.
    */
@@ -82,148 +87,20 @@ class ControlFlowElement extends ExprOrStmtParent, @control_flow_element {
       result.getAControlFlowNode()
   }
 
-  pragma[noinline]
-  private predicate immediatelyControlsBlockSplit0(
-    ConditionBlock cb, BasicBlock succ, ConditionalSuccessor s
-  ) {
-    // Only calculate dominance by explicit recursion for split nodes;
-    // all other nodes can use regular CFG dominance
-    this instanceof Impl::SplitAstNode and
-    cb.getLastNode() = this.getAControlFlowNode() and
-    succ = cb.getASuccessorByType(s)
-  }
-
-  pragma[noinline]
-  private predicate immediatelyControlsBlockSplit1(
-    ConditionBlock cb, BasicBlock succ, ConditionalSuccessor s, BasicBlock pred, SuccessorType t
-  ) {
-    this.immediatelyControlsBlockSplit0(cb, succ, s) and
-    pred = succ.getAPredecessorByType(t) and
-    pred != cb
-  }
-
-  pragma[noinline]
-  private predicate immediatelyControlsBlockSplit2(
-    ConditionBlock cb, BasicBlock succ, ConditionalSuccessor s, BasicBlock pred, SuccessorType t
-  ) {
-    this.immediatelyControlsBlockSplit1(cb, succ, s, pred, t) and
-    (
-      succ.dominates(pred)
-      or
-      // `pred` might be another split of this element
-      pred.getLastNode().getAstNode() = this and
-      t = s
-    )
-  }
-
   /**
-   * Holds if basic block `succ` is immediately controlled by this control flow
-   * element with conditional value `s`. That is, `succ` can only be reached from
-   * the callable entry point by going via the `s` edge out of *some* basic block
-   * `pred` ending with this element, and `pred` is an immediate predecessor
-   * of `succ`.
+   * DEPRECATED: Use `Guard` class instead.
    *
-   * Moreover, this control flow element corresponds to multiple control flow nodes,
-   * which is why
-   *
-   * ```ql
-   * exists(ConditionBlock cb |
-   *   cb.getLastNode() = this.getAControlFlowNode() |
-   *   cb.immediatelyControls(succ, s)
-   * )
-   * ```
-   *
-   * does not work.
-   *
-   * `cb` records all of the possible condition blocks for this control flow element
-   * that a path from the callable entry point to `succ` may go through.
-   */
-  pragma[nomagic]
-  private predicate immediatelyControlsBlockSplit(
-    BasicBlock succ, ConditionalSuccessor s, ConditionBlock cb
-  ) {
-    this.immediatelyControlsBlockSplit0(cb, succ, s) and
-    forall(BasicBlock pred, SuccessorType t |
-      this.immediatelyControlsBlockSplit1(cb, succ, s, pred, t)
-    |
-      this.immediatelyControlsBlockSplit2(cb, succ, s, pred, t)
-    )
-  }
-
-  pragma[noinline]
-  private predicate controlsJoinBlockPredecessor(
-    JoinBlock controlled, ConditionalSuccessor s, int i, ConditionBlock cb
-  ) {
-    this.controlsBlockSplit(controlled.getJoinBlockPredecessor(i), s, cb)
-  }
-
-  private predicate controlsJoinBlockSplit(JoinBlock controlled, ConditionalSuccessor s, int i) {
-    i = -1 and
-    this.controlsJoinBlockPredecessor(controlled, s, _, _)
-    or
-    this.controlsJoinBlockSplit(controlled, s, i - 1) and
-    (
-      this.controlsJoinBlockPredecessor(controlled, s, i, _)
-      or
-      controlled.dominates(controlled.getJoinBlockPredecessor(i))
-    )
-  }
-
-  cached
-  private predicate controlsBlockSplit(
-    BasicBlock controlled, ConditionalSuccessor s, ConditionBlock cb
-  ) {
-    Stages::GuardsStage::forceCachingInSameStage() and
-    this.immediatelyControlsBlockSplit(controlled, s, cb)
-    or
-    // Equivalent with
-    //
-    // ```ql
-    // exists(JoinBlockPredecessor pred | pred = controlled.getAPredecessor() |
-    //   this.controlsBlockSplit(pred, s)
-    // ) and
-    // forall(JoinBlockPredecessor pred | pred = controlled.getAPredecessor() |
-    //   this.controlsBlockSplit(pred, s)
-    //   or
-    //   controlled.dominates(pred)
-    // )
-    // ```
-    //
-    // but uses no universal recursion for better performance.
-    exists(int last |
-      last = max(int i | exists(controlled.(JoinBlock).getJoinBlockPredecessor(i)))
-    |
-      this.controlsJoinBlockSplit(controlled, s, last)
-    ) and
-    this.controlsJoinBlockPredecessor(controlled, s, _, cb)
-    or
-    not controlled instanceof JoinBlock and
-    this.controlsBlockSplit(controlled.getAPredecessor(), s, cb)
-  }
-
-  /**
    * Holds if basic block `controlled` is controlled by this control flow element
    * with conditional value `s`. That is, `controlled` can only be reached from
    * the callable entry point by going via the `s` edge out of *some* basic block
    * ending with this element.
    *
-   * This predicate is different from
-   *
-   * ```ql
-   * exists(ConditionBlock cb |
-   *   cb.getLastNode() = this.getAControlFlowNode() |
-   *   cb.controls(controlled, s)
-   * )
-   * ```
-   *
-   * as control flow splitting is taken into account.
-   *
    * `cb` records all of the possible condition blocks for this control flow element
    * that a path from the callable entry point to `controlled` may go through.
    */
-  predicate controlsBlock(BasicBlock controlled, ConditionalSuccessor s, ConditionBlock cb) {
-    this.controlsBlockSplit(controlled, s, cb)
-    or
+  deprecated predicate controlsBlock(
+    BasicBlock controlled, ConditionalSuccessor s, ConditionBlock cb
+  ) {
     cb.getLastNode() = this.getAControlFlowNode() and
     cb.edgeDominates(controlled, s)
   }
diff --git a/csharp/ql/lib/semmle/code/csharp/controlflow/ControlFlowGraph.qll b/csharp/ql/lib/semmle/code/csharp/controlflow/ControlFlowGraph.qll
index 2334d240935..438174fe297 100644
--- a/csharp/ql/lib/semmle/code/csharp/controlflow/ControlFlowGraph.qll
+++ b/csharp/ql/lib/semmle/code/csharp/controlflow/ControlFlowGraph.qll
@@ -6,7 +6,6 @@ import csharp
 module ControlFlow {
   private import semmle.code.csharp.controlflow.BasicBlocks as BBs
   import semmle.code.csharp.controlflow.internal.SuccessorType
-  private import SuccessorTypes
   private import internal.ControlFlowGraphImpl as Impl
   private import internal.Splitting as Splitting
 
@@ -252,6 +251,9 @@ module ControlFlow {
       }
     }
 
+    /** A control flow node indicating normal termination of a callable. */
+    class NormalExitNode extends AnnotatedExitNode instanceof Impl::NormalExitNode { }
+
     /** A node for a callable exit point. */
     class ExitNode extends Node instanceof Impl::ExitNode {
       /** Gets the callable that this exit applies to. */
@@ -292,14 +294,6 @@ module ControlFlow {
     }
 
     class Split = Splitting::Split;
-
-    class FinallySplit = Splitting::FinallySplitting::FinallySplit;
-
-    class ExceptionHandlerSplit = Splitting::ExceptionHandlerSplitting::ExceptionHandlerSplit;
-
-    class BooleanSplit = Splitting::BooleanSplitting::BooleanSplit;
-
-    class LoopSplit = Splitting::LoopSplitting::LoopSplit;
   }
 
   class BasicBlock = BBs::BasicBlock;
diff --git a/csharp/ql/lib/semmle/code/csharp/controlflow/ControlFlowReachability.qll b/csharp/ql/lib/semmle/code/csharp/controlflow/ControlFlowReachability.qll
new file mode 100644
index 00000000000..aafe14402c7
--- /dev/null
+++ b/csharp/ql/lib/semmle/code/csharp/controlflow/ControlFlowReachability.qll
@@ -0,0 +1,57 @@
+/**
+ * Provides an implementation of local (intraprocedural) control flow reachability.
+ */
+
+import csharp
+private import codeql.controlflow.ControlFlowReachability
+private import semmle.code.csharp.controlflow.BasicBlocks
+private import semmle.code.csharp.controlflow.Guards as Guards
+private import semmle.code.csharp.ExprOrStmtParent
+
+private module ControlFlowInput implements
+  InputSig<Location, ControlFlow::Node, ControlFlow::BasicBlock>
+{
+  private import csharp as CS
+
+  AstNode getEnclosingAstNode(ControlFlow::Node node) {
+    node.getAstNode() = result
+    or
+    not exists(node.getAstNode()) and result = node.getEnclosingCallable()
+  }
+
+  class AstNode = ExprOrStmtParent;
+
+  AstNode getParent(AstNode node) { result = node.getParent() }
+
+  class FinallyBlock extends AstNode {
+    FinallyBlock() { any(TryStmt try).getFinally() = this }
+  }
+
+  class Expr = CS::Expr;
+
+  class SourceVariable = Ssa::SourceVariable;
+
+  class SsaDefinition = Ssa::Definition;
+
+  class SsaExplicitWrite extends SsaDefinition instanceof Ssa::ExplicitDefinition {
+    Expr getValue() { result = super.getADefinition().getSource() }
+  }
+
+  class SsaPhiDefinition = Ssa::PhiNode;
+
+  class SsaUncertainWrite = Ssa::UncertainDefinition;
+
+  class GuardValue = Guards::GuardValue;
+
+  predicate ssaControlsBranchEdge(SsaDefinition def, BasicBlock bb1, BasicBlock bb2, GuardValue v) {
+    Guards::Guards::ssaControlsBranchEdge(def, bb1, bb2, v)
+  }
+
+  predicate ssaControls(SsaDefinition def, BasicBlock bb, GuardValue v) {
+    Guards::Guards::ssaControls(def, bb, v)
+  }
+
+  import Guards::Guards::InternalUtil
+}
+
+module ControlFlowReachability = Make<Location, Cfg, ControlFlowInput>;
diff --git a/csharp/ql/lib/semmle/code/csharp/controlflow/Guards.qll b/csharp/ql/lib/semmle/code/csharp/controlflow/Guards.qll
index 313fabc0235..f61d7f9c3a7 100644
--- a/csharp/ql/lib/semmle/code/csharp/controlflow/Guards.qll
+++ b/csharp/ql/lib/semmle/code/csharp/controlflow/Guards.qll
@@ -3,7 +3,7 @@
  */
 
 import csharp
-private import ControlFlow::SuccessorTypes
+private import ControlFlow
 private import semmle.code.csharp.commons.Assertions
 private import semmle.code.csharp.commons.ComparisonTest
 private import semmle.code.csharp.commons.StructuralComparison as SC
@@ -13,11 +13,306 @@ private import semmle.code.csharp.frameworks.System
 private import semmle.code.csharp.frameworks.system.Linq
 private import semmle.code.csharp.frameworks.system.Collections
 private import semmle.code.csharp.frameworks.system.collections.Generic
+private import codeql.controlflow.Guards as SharedGuards
+
+private module GuardsInput implements
+  SharedGuards::InputSig<Location, ControlFlow::Node, ControlFlow::BasicBlock>
+{
+  private import csharp as CS
+
+  class NormalExitNode = ControlFlow::Nodes::NormalExitNode;
+
+  class AstNode = ControlFlowElement;
+
+  class Expr = CS::Expr;
+
+  private newtype TConstantValue =
+    TStringValue(string value) { any(StringLiteral s).getValue() = value }
+
+  class ConstantValue extends TConstantValue {
+    string toString() { this = TStringValue(result) }
+  }
+
+  abstract class ConstantExpr extends Expr {
+    predicate isNull() { none() }
+
+    boolean asBooleanValue() { none() }
+
+    int asIntegerValue() { none() }
+
+    ConstantValue asConstantValue() { none() }
+  }
+
+  private class NullConstant extends ConstantExpr {
+    NullConstant() { nullValueImplied(this) }
+
+    override predicate isNull() { any() }
+  }
+
+  private predicate boolConst(Expr e, boolean b) {
+    e.getType() instanceof BoolType and
+    e.getValue() = b.toString()
+  }
+
+  private class BooleanConstant extends ConstantExpr {
+    BooleanConstant() { boolConst(this, _) }
+
+    override boolean asBooleanValue() { boolConst(this, result) }
+  }
+
+  private predicate intConst(Expr e, int i) {
+    e.getValue().toInt() = i and
+    (
+      e.getType() instanceof Enum
+      or
+      e.getType() instanceof IntegralType
+    )
+  }
+
+  private class IntegerConstant extends ConstantExpr {
+    IntegerConstant() { intConst(this, _) }
+
+    override int asIntegerValue() { intConst(this, result) }
+  }
+
+  private class EnumConst extends ConstantExpr {
+    EnumConst() { this.getType() instanceof Enum and this.hasValue() }
+
+    override int asIntegerValue() { result = this.getValue().toInt() }
+  }
+
+  private class StringConstant extends ConstantExpr instanceof StringLiteral {
+    override ConstantValue asConstantValue() { result = TStringValue(this.getValue()) }
+  }
+
+  class NonNullExpr extends Expr {
+    NonNullExpr() { nonNullValueImplied(this) }
+  }
+
+  class Case extends AstNode instanceof CS::Case {
+    Expr getSwitchExpr() { super.getExpr() = result }
+
+    predicate isDefaultCase() { this instanceof DefaultCase }
+
+    ConstantExpr asConstantCase() { super.getPattern() = result }
+
+    private predicate hasEdge(BasicBlock bb1, BasicBlock bb2, MatchingCompletion c) {
+      exists(PatternExpr pe |
+        super.getPattern() = pe and
+        c.isValidFor(pe) and
+        bb1.getLastNode() = pe.getAControlFlowNode() and
+        bb1.getASuccessor(c.getAMatchingSuccessorType()) = bb2
+      )
+    }
+
+    predicate matchEdge(BasicBlock bb1, BasicBlock bb2) {
+      exists(MatchingCompletion c | this.hasEdge(bb1, bb2, c) and c.isMatch())
+    }
+
+    predicate nonMatchEdge(BasicBlock bb1, BasicBlock bb2) {
+      exists(MatchingCompletion c | this.hasEdge(bb1, bb2, c) and c.isNonMatch())
+    }
+  }
+
+  abstract private class BinExpr extends BinaryOperation { }
+
+  class AndExpr extends BinExpr {
+    AndExpr() {
+      this instanceof LogicalAndExpr or
+      this instanceof BitwiseAndExpr
+    }
+  }
+
+  class OrExpr extends BinExpr {
+    OrExpr() {
+      this instanceof LogicalOrExpr or
+      this instanceof BitwiseOrExpr
+    }
+  }
+
+  class NotExpr = LogicalNotExpr;
+
+  class IdExpr extends Expr {
+    IdExpr() { this instanceof AssignExpr or this instanceof CastExpr }
+
+    Expr getEqualChildExpr() {
+      result = this.(AssignExpr).getRValue()
+      or
+      result = this.(CastExpr).getExpr()
+    }
+  }
+
+  predicate equalityTest(Expr eqtest, Expr left, Expr right, boolean polarity) {
+    exists(ComparisonTest ct |
+      ct.getExpr() = eqtest and
+      ct.getFirstArgument() = left and
+      ct.getSecondArgument() = right
+    |
+      ct.getComparisonKind().isEquality() and polarity = true
+      or
+      ct.getComparisonKind().isInequality() and polarity = false
+    )
+    or
+    exists(IsExpr ie, PatternExpr pat |
+      ie = eqtest and
+      ie.getExpr() = left and
+      ie.getPattern() = pat
+    |
+      right = pat.(ConstantPatternExpr) and
+      polarity = true
+      or
+      right = pat.(NotPatternExpr).getPattern().(ConstantPatternExpr) and
+      polarity = false
+    )
+  }
+
+  class ConditionalExpr = CS::ConditionalExpr;
+
+  class Parameter = CS::Parameter;
+
+  private int parameterPosition() { result in [-1, any(Parameter p).getPosition()] }
+
+  class ParameterPosition extends int {
+    ParameterPosition() { this = parameterPosition() }
+  }
+
+  class ArgumentPosition extends int {
+    ArgumentPosition() { this = parameterPosition() }
+  }
+
+  pragma[inline]
+  predicate parameterMatch(ParameterPosition ppos, ArgumentPosition apos) { ppos = apos }
+
+  final private class FinalCallable = Callable;
+
+  class NonOverridableMethod extends FinalCallable {
+    NonOverridableMethod() { not this.(Overridable).isOverridableOrImplementable() }
+
+    Parameter getParameter(ParameterPosition ppos) {
+      super.getParameter(ppos) = result and
+      not result.isParams()
+    }
+
+    Expr getAReturnExpr() { this.canReturn(result) }
+  }
+
+  class NonOverridableMethodCall extends Expr instanceof Call {
+    NonOverridableMethod getMethod() { super.getTarget().getUnboundDeclaration() = result }
+
+    Expr getArgument(ArgumentPosition apos) {
+      result = super.getArgumentForParameter(any(Parameter p | p.getPosition() = apos))
+    }
+  }
+}
+
+private module GuardsImpl = SharedGuards::Make<Location, Cfg, GuardsInput>;
+
+class GuardValue = GuardsImpl::GuardValue;
+
+private module LogicInput implements GuardsImpl::LogicInputSig {
+  class SsaDefinition extends Ssa::Definition {
+    Expr getARead() { super.getARead() = result }
+  }
+
+  class SsaExplicitWrite extends SsaDefinition instanceof Ssa::ExplicitDefinition {
+    Expr getValue() { result = super.getADefinition().getSource() }
+  }
+
+  class SsaPhiDefinition extends SsaDefinition instanceof Ssa::PhiNode {
+    predicate hasInputFromBlock(SsaDefinition inp, BasicBlock bb) {
+      super.hasInputFromBlock(inp, bb)
+    }
+  }
+
+  class SsaParameterInit extends SsaDefinition instanceof Ssa::ImplicitParameterDefinition {
+    Parameter getParameter() { result = super.getParameter() }
+  }
+
+  predicate additionalNullCheck(GuardsImpl::PreGuard guard, GuardValue val, Expr e, boolean isNull) {
+    // Comparison with a non-`null` value, for example `x?.Length > 0`
+    exists(ComparisonTest ct, ComparisonKind ck, Expr arg | ct.getExpr() = guard |
+      e instanceof DereferenceableExpr and
+      ct.getAnArgument() = e and
+      ct.getAnArgument() = arg and
+      nonNullValueImplied(arg) and
+      ck = ct.getComparisonKind() and
+      e != arg and
+      isNull = false and
+      not ck.isEquality() and
+      not ck.isInequality() and
+      val.asBooleanValue() = true
+    )
+    or
+    // Call to `string.IsNullOrEmpty()` or `string.IsNullOrWhiteSpace()`
+    exists(MethodCall mc, string name | guard = mc |
+      mc.getTarget() = any(SystemStringClass c).getAMethod(name) and
+      name.regexpMatch("IsNullOr(Empty|WhiteSpace)") and
+      mc.getArgument(0) = e and
+      val.asBooleanValue() = false and
+      isNull = false
+    )
+    or
+    guard =
+      any(PatternMatch pm |
+        e instanceof DereferenceableExpr and
+        e = pm.getExpr() and
+        (
+          val.asBooleanValue().booleanNot() = patternMatchesNull(pm.getPattern()) and
+          isNull = false
+          or
+          exists(TypePatternExpr tpe |
+            // E.g. `x is string` where `x` has type `string`
+            typePattern(guard, tpe, tpe.getCheckedType()) and
+            val.asBooleanValue() = false and
+            isNull = true
+          )
+        )
+      )
+    or
+    e.(DereferenceableExpr).hasNullableType() and
+    guard =
+      any(PropertyAccess pa |
+        pa.getQualifier() = e and
+        pa.getTarget().hasName("HasValue") and
+        val.asBooleanValue().booleanNot() = isNull
+      )
+  }
+
+  predicate additionalImpliesStep(
+    GuardsImpl::PreGuard g1, GuardValue v1, GuardsImpl::PreGuard g2, GuardValue v2
+  ) {
+    g1 instanceof DereferenceableExpr and
+    g1 = getNullEquivParent(g2) and
+    v1.isNullness(_) and
+    v2 = v1
+    or
+    g1 instanceof DereferenceableExpr and
+    g2 = getANullImplyingChild(g1) and
+    v1.isNonNullValue() and
+    v2 = v1
+    or
+    g2 = g1.(NullCoalescingExpr).getAnOperand() and
+    v1.isNullValue() and
+    v2 = v1
+    or
+    exists(Assertion assert, AssertMethod target, int i |
+      assert.getAssertMethod() = target and
+      g1 = assert and
+      v1.getDualValue().isThrowsException() and
+      g2 = assert.getExpr(i)
+    |
+      target.(BooleanAssertMethod).getAnAssertionIndex(v2.asBooleanValue()) = i
+      or
+      target.(NullnessAssertMethod).getAnAssertionIndex(any(boolean isNull | v2.isNullness(isNull))) =
+        i
+    )
+  }
+}
+
+module Guards = GuardsImpl::Logic<LogicInput>;
 
 /** An expression whose value may control the execution of another element. */
-class Guard extends Expr {
-  Guard() { isGuard(this, _) }
-
+class Guard extends Guards::Guard {
   /**
    * Holds if `cfn` is guarded by this expression having value `v`, where `sub` is
    * a sub expression of this expression that is structurally equal to the expression
@@ -26,7 +321,7 @@ class Guard extends Expr {
    * In case `cfn` or `sub` access an SSA variable in their left-most qualifier, then
    * so must the other (accessing the same SSA variable).
    */
-  predicate controlsNode(ControlFlow::Nodes::ElementNode cfn, AccessOrCallExpr sub, AbstractValue v) {
+  predicate controlsNode(ControlFlow::Nodes::ElementNode cfn, AccessOrCallExpr sub, GuardValue v) {
     isGuardedByNode(cfn, this, sub, v)
   }
 
@@ -36,242 +331,78 @@ class Guard extends Expr {
    * Note: This predicate is inlined.
    */
   pragma[inline]
-  predicate controlsNode(ControlFlow::Nodes::ElementNode cfn, AbstractValue v) {
+  predicate controlsNode(ControlFlow::Nodes::ElementNode cfn, GuardValue v) {
     guardControls(this, cfn.getBasicBlock(), v)
   }
 
   /**
    * Holds if basic block `bb` is guarded by this expression having value `v`.
    */
-  predicate controlsBasicBlock(BasicBlock bb, AbstractValue v) { guardControls(this, bb, v) }
-
-  /**
-   * Holds if this guard is an equality test between `e1` and `e2`. If the test is
-   * negated, that is `!=`, then `polarity` is false, otherwise `polarity` is
-   * true.
-   */
-  predicate isEquality(Expr e1, Expr e2, boolean polarity) {
-    exists(BooleanValue v |
-      this = getAnEqualityCheck(e1, v, e2) and
-      polarity = v.getValue()
-    )
-  }
+  predicate controlsBasicBlock(BasicBlock bb, GuardValue v) { guardControls(this, bb, v) }
 
   /**
    * Gets a valid value for this guard. For example, if this guard is a test, then
    * it can have Boolean values `true` and `false`.
    */
-  AbstractValue getAValue() { isGuard(this, result) }
+  deprecated GuardValue getAValue() { isGuard(this, result) }
 }
 
-/** An abstract value. */
-abstract class AbstractValue extends TAbstractValue {
-  /** Holds if the `s` branch out of `cfe` is taken iff `e` has this value. */
-  abstract predicate branch(ControlFlowElement cfe, ConditionalSuccessor s, Expr e);
+/** DEPRECATED: Use `GuardValue` instead. */
+deprecated class AbstractValue = GuardValue;
 
-  /** Gets an abstract value that represents the dual of this value, if any. */
-  abstract AbstractValue getDualValue();
+/**
+ * DEPRECATED: Use `GuardValue` member predicates instead.
+ *
+ * Provides different types of `AbstractValues`s.
+ */
+deprecated module AbstractValues {
+  class BooleanValue extends AbstractValue {
+    BooleanValue() { exists(this.asBooleanValue()) }
 
-  /**
-   * Gets an expression that has this abstract value. Two expressions that have the
-   * same concrete value also have the same abstract value, but not necessarily the
-   * other way around.
-   *
-   * Moreover, `e = this.getAnExpr() implies not e = this.getDualValue().getAnExpr()`.
-   */
-  abstract Expr getAnExpr();
-
-  /**
-   * Holds if this is a singleton abstract value. That is, two expressions that have
-   * this abstract value also have the same concrete value.
-   */
-  abstract predicate isSingleton();
-
-  /**
-   * Holds if this value describes a referential property. For example, emptiness
-   * of a collection is a referential property.
-   *
-   * Such values only propagate through adjacent reads, for example, in
-   *
-   * ```csharp
-   * int M()
-   * {
-   *     var x = new string[]{ "a", "b", "c" }.ToList();
-   *     x.Clear();
-   *     return x.Count;
-   * }
-   * ```
-   *
-   * the non-emptiness of `new string[]{ "a", "b", "c" }.ToList()` only propagates
-   * to the read of `x` in `x.Clear()` and not in `x.Count`.
-   *
-   * Aliasing is not taken into account in the analyses.
-   */
-  predicate isReferentialProperty() { none() }
-
-  /** Gets a textual representation of this abstract value. */
-  abstract string toString();
-}
-
-/** Provides different types of `AbstractValues`s. */
-module AbstractValues {
-  /** A Boolean value. */
-  class BooleanValue extends AbstractValue, TBooleanValue {
-    /** Gets the underlying Boolean value. */
-    boolean getValue() { this = TBooleanValue(result) }
-
-    override predicate branch(ControlFlowElement cfe, ConditionalSuccessor s, Expr e) {
-      s.(BooleanSuccessor).getValue() = this.getValue() and
-      exists(BooleanCompletion c | s = c.getAMatchingSuccessorType() |
-        c.isValidFor(cfe) and
-        e = cfe
-      )
-    }
-
-    override BooleanValue getDualValue() { result.getValue() = this.getValue().booleanNot() }
-
-    override Expr getAnExpr() {
-      result.getType() instanceof BoolType and
-      result.getValue() = this.getValue().toString()
-    }
-
-    override predicate isSingleton() { any() }
-
-    override string toString() { result = this.getValue().toString() }
+    boolean getValue() { this.asBooleanValue() = result }
   }
 
-  /** An integer value. */
-  class IntegerValue extends AbstractValue, TIntegerValue {
-    /** Gets the underlying integer value. */
-    int getValue() { this = TIntegerValue(result) }
+  class IntegerValue extends AbstractValue {
+    IntegerValue() { exists(this.asIntValue()) }
 
-    override predicate branch(ControlFlowElement cfe, ConditionalSuccessor s, Expr e) { none() }
-
-    override IntegerValue getDualValue() { none() }
-
-    override Expr getAnExpr() {
-      result.getValue().toInt() = this.getValue() and
-      (
-        result.getType() instanceof Enum
-        or
-        result.getType() instanceof IntegralType
-      )
-    }
-
-    override predicate isSingleton() { any() }
-
-    override string toString() { result = this.getValue().toString() }
+    int getValue() { this.asIntValue() = result }
   }
 
-  /** A value that is either `null` or non-`null`. */
-  class NullValue extends AbstractValue, TNullValue {
-    /** Holds if this value represents `null`. */
-    predicate isNull() { this = TNullValue(true) }
+  class NullValue extends AbstractValue {
+    NullValue() { this.isNullness(_) }
 
-    /** Holds if this value represents non-`null`. */
-    predicate isNonNull() { this = TNullValue(false) }
+    predicate isNull() { this.isNullValue() }
 
-    override predicate branch(ControlFlowElement cfe, ConditionalSuccessor s, Expr e) {
-      this = TNullValue(s.(NullnessSuccessor).getValue()) and
-      exists(NullnessCompletion c | s = c.getAMatchingSuccessorType() |
-        c.isValidFor(cfe) and
-        e = cfe
-      )
-    }
+    predicate isNonNull() { this.isNonNullValue() }
 
-    override NullValue getDualValue() {
-      if this.isNull() then result.isNonNull() else result.isNull()
-    }
-
-    override DereferenceableExpr getAnExpr() {
+    DereferenceableExpr getAnExpr() {
       if this.isNull() then nullValueImplied(result) else nonNullValueImplied(result)
     }
-
-    override predicate isSingleton() { this.isNull() }
-
-    override string toString() { if this.isNull() then result = "null" else result = "non-null" }
-  }
-
-  /** A value that represents match or non-match against a specific pattern. */
-  class MatchValue extends AbstractValue, TMatchValue {
-    /** Gets the case. */
-    Case getCase() { this = TMatchValue(result, _) }
-
-    /** Holds if this value represents a match. */
-    predicate isMatch() { this = TMatchValue(_, true) }
-
-    override predicate branch(ControlFlowElement cfe, ConditionalSuccessor s, Expr e) {
-      this = TMatchValue(_, s.(MatchingSuccessor).getValue()) and
-      exists(MatchingCompletion c, Switch switch, Case case | s = c.getAMatchingSuccessorType() |
-        c.isValidFor(cfe) and
-        switchMatching(switch, case, cfe) and
-        e = switch.getExpr() and
-        case = this.getCase()
-      )
-    }
-
-    override MatchValue getDualValue() {
-      result =
-        any(MatchValue mv |
-          mv.getCase() = this.getCase() and
-          if this.isMatch() then not mv.isMatch() else mv.isMatch()
-        )
-    }
-
-    override Expr getAnExpr() { none() }
-
-    override predicate isSingleton() { none() }
-
-    override string toString() {
-      exists(string s | s = this.getCase().getPattern().toString() |
-        if this.isMatch() then result = "match " + s else result = "non-match " + s
-      )
-    }
-  }
-
-  /** A value that represents an empty or non-empty collection. */
-  class EmptyCollectionValue extends AbstractValue, TEmptyCollectionValue {
-    /** Holds if this value represents an empty collection. */
-    predicate isEmpty() { this = TEmptyCollectionValue(true) }
-
-    /** Holds if this value represents a non-empty collection. */
-    predicate isNonEmpty() { this = TEmptyCollectionValue(false) }
-
-    override predicate branch(ControlFlowElement cfe, ConditionalSuccessor s, Expr e) {
-      this = TEmptyCollectionValue(s.(EmptinessSuccessor).getValue()) and
-      exists(EmptinessCompletion c, ForeachStmt fs | s = c.getAMatchingSuccessorType() |
-        c.isValidFor(cfe) and
-        foreachEmptiness(fs, cfe) and
-        e = fs.getIterableExpr()
-      ) and
-      // Only when taking the non-empty successor do we know that the original iterator
-      // expression was non-empty. When taking the empty successor, we may have already
-      // iterated through the `foreach` loop zero or more times, hence the iterator
-      // expression can be both empty and non-empty
-      this.isNonEmpty()
-    }
-
-    override EmptyCollectionValue getDualValue() {
-      if this.isEmpty() then result.isNonEmpty() else result.isEmpty()
-    }
-
-    override Expr getAnExpr() {
-      this.isEmpty() and
-      emptyValue(result)
-      or
-      this.isNonEmpty() and
-      nonEmptyValue(result)
-    }
-
-    override predicate isSingleton() { none() }
-
-    override predicate isReferentialProperty() { any() }
-
-    override string toString() { if this.isEmpty() then result = "empty" else result = "non-empty" }
   }
 }
 
-private import AbstractValues
+/** Gets the value resulting from matching `null` against `pat`. */
+private boolean patternMatchesNull(PatternExpr pat) {
+  pat instanceof NullLiteral and result = true
+  or
+  not pat instanceof NullLiteral and
+  not pat instanceof NotPatternExpr and
+  not pat instanceof OrPatternExpr and
+  not pat instanceof AndPatternExpr and
+  result = false
+  or
+  result = patternMatchesNull(pat.(NotPatternExpr).getPattern()).booleanNot()
+  or
+  exists(OrPatternExpr ope | pat = ope |
+    result =
+      patternMatchesNull(ope.getLeftOperand()).booleanOr(patternMatchesNull(ope.getRightOperand()))
+  )
+  or
+  exists(AndPatternExpr ape | pat = ape |
+    result =
+      patternMatchesNull(ape.getLeftOperand()).booleanAnd(patternMatchesNull(ape.getRightOperand()))
+  )
+}
 
 pragma[nomagic]
 private predicate typePattern(PatternMatch pm, TypePatternExpr tpe, Type t) {
@@ -307,175 +438,19 @@ class DereferenceableExpr extends Expr {
   /** Holds if this expression has a nullable type `T?`. */
   predicate hasNullableType() { isNullableType = true }
 
-  /**
-   * Gets an expression that directly tests whether this expression is `null`.
-   *
-   * If the returned expression evaluates to `v`, then this expression is
-   * guaranteed to be `null` if `isNull` is true, and non-`null` if `isNull` is
-   * false.
-   *
-   * For example, if the expression `x != null` evaluates to `true` then the
-   * expression `x` is guaranteed to be non-`null`.
-   */
-  private Expr getABooleanNullCheck(BooleanValue v, boolean isNull) {
-    exists(boolean branch | branch = v.getValue() |
-      // Comparison with `null`, for example `x != null`
-      exists(ComparisonTest ct, ComparisonKind ck, Expr e |
-        ct.getExpr() = result and
-        ct.getAnArgument() = this and
-        ct.getAnArgument() = e and
-        e = any(NullValue nv | nv.isNull()).getAnExpr() and
-        this != e and
-        ck = ct.getComparisonKind()
-      |
-        ck.isEquality() and isNull = branch
-        or
-        ck.isInequality() and isNull = branch.booleanNot()
-      )
+  /** Holds if `guard` suggests that this expression may be `null`. */
+  predicate guardSuggestsMaybeNull(Guards::Guard guard) {
+    not nonNullValueImplied(this) and
+    (
+      exists(NullnessCompletion c | c.isValidFor(this) and c.isNull() and guard = this)
       or
-      // Comparison with a non-`null` value, for example `x?.Length > 0`
-      exists(ComparisonTest ct, ComparisonKind ck, Expr e | ct.getExpr() = result |
-        ct.getAnArgument() = this and
-        ct.getAnArgument() = e and
-        e = any(NullValue nv | nv.isNonNull()).getAnExpr() and
-        ck = ct.getComparisonKind() and
-        this != e and
-        isNull = false and
-        if ck.isInequality() then branch = false else branch = true
-      )
+      LogicInput::additionalNullCheck(guard, _, this, true)
       or
-      // Call to `string.IsNullOrEmpty()` or `string.IsNullOrWhiteSpace()`
-      exists(MethodCall mc, string name | result = mc |
-        mc.getTarget() = any(SystemStringClass c).getAMethod(name) and
-        name.regexpMatch("IsNullOr(Empty|WhiteSpace)") and
-        mc.getArgument(0) = this and
-        branch = false and
-        isNull = false
-      )
+      guard.isEquality(this, any(Expr n | nullValueImplied(n)), _)
       or
-      result =
-        any(PatternMatch pm |
-          this = pm.getExpr() and
-          (
-            // E.g. `x is null`
-            pm.getPattern() instanceof NullLiteral and
-            isNull = branch
-            or
-            // E.g. `x is string` or `x is ""`
-            not pm.getPattern() instanceof NullLiteral and
-            branch = true and
-            isNull = false
-            or
-            exists(TypePatternExpr tpe |
-              // E.g. `x is string` where `x` has type `string`
-              typePattern(result, tpe, tpe.getCheckedType()) and
-              branch = false and
-              isNull = true
-            )
-          )
-        )
-      or
-      this.hasNullableType() and
-      result =
-        any(PropertyAccess pa |
-          pa.getQualifier() = this and
-          pa.getTarget().hasName("HasValue") and
-          if branch = true then isNull = false else isNull = true
-        )
-      or
-      isCustomNullCheck(result, this, v, isNull)
+      Guards::nullGuard(guard, any(GuardValue v | exists(v.asBooleanValue())), this, true)
     )
   }
-
-  /**
-   * Gets an expression that tests via matching whether this expression is `null`.
-   *
-   * If the returned expression matches (`v.isMatch()`) or non-matches
-   * (`not v.isMatch()`), then this expression is guaranteed to be `null`
-   * if `isNull` is true, and non-`null` if `isNull` is false.
-   *
-   * For example, if the case statement `case string s` matches in
-   *
-   * ```csharp
-   * switch (o)
-   * {
-   *     case string s:
-   *         return s;
-   *     default:
-   *         return "";
-   * }
-   * ```
-   *
-   * then `o` is guaranteed to be non-`null`.
-   */
-  private Expr getAMatchingNullCheck(MatchValue v, boolean isNull) {
-    exists(Switch s, Case case |
-      case = v.getCase() and
-      this = s.getExpr() and
-      result = this and
-      case = s.getACase()
-    |
-      // E.g. `case string`
-      case.getPattern() instanceof TypePatternExpr and
-      v.isMatch() and
-      isNull = false
-      or
-      case.getPattern() =
-        any(ConstantPatternExpr cpe |
-          if cpe instanceof NullLiteral
-          then
-            // `case null`
-            if v.isMatch() then isNull = true else isNull = false
-          else (
-            // E.g. `case ""`
-            v.isMatch() and
-            isNull = false
-          )
-        )
-    )
-  }
-
-  /**
-   * Gets an expression that tests via nullness whether this expression is `null`.
-   *
-   * If the returned expression evaluates to `null` (`v.isNull()`) or evaluates to
-   * non-`null` (`not v.isNull()`), then this expression is guaranteed to be `null`
-   * if `isNull` is true, and non-`null` if `isNull` is false.
-   *
-   * For example, if `x` evaluates to `null` in `x ?? y` then `y` is evaluated, and
-   * `x` is guaranteed to be `null`.
-   */
-  private Expr getANullnessNullCheck(NullValue v, boolean isNull) {
-    exists(NullnessCompletion c | c.isValidFor(this) |
-      result = this and
-      if c.isNull()
-      then (
-        v.isNull() and
-        isNull = true
-      ) else (
-        v.isNonNull() and
-        isNull = false
-      )
-    )
-  }
-
-  /**
-   * Gets an expression that tests whether this expression is `null`.
-   *
-   * If the returned expression has abstract value `v`, then this expression is
-   * guaranteed to be `null` if `isNull` is true, and non-`null` if `isNull` is
-   * false.
-   *
-   * For example, if the expression `x != null` evaluates to `true` then the
-   * expression `x` is guaranteed to be non-`null`.
-   */
-  Expr getANullCheck(AbstractValue v, boolean isNull) {
-    result = this.getABooleanNullCheck(v, isNull)
-    or
-    result = this.getAMatchingNullCheck(v, isNull)
-    or
-    result = this.getANullnessNullCheck(v, isNull)
-  }
 }
 
 /**
@@ -524,8 +499,8 @@ class EnumerableCollectionExpr extends Expr {
       )
   }
 
-  private Expr getABooleanEmptinessCheck(BooleanValue v, boolean isEmpty) {
-    exists(boolean branch | branch = v.getValue() |
+  private Expr getABooleanEmptinessCheck(GuardValue v, boolean isEmpty) {
+    exists(boolean branch | branch = v.asBooleanValue() |
       result =
         any(ComparisonTest ct |
           exists(boolean lowerBound |
@@ -589,7 +564,7 @@ class EnumerableCollectionExpr extends Expr {
    * For example, if the expression `x.Length != 0` evaluates to `true` then the
    * expression `x` is guaranteed to be non-empty.
    */
-  Expr getAnEmptinessCheck(AbstractValue v, boolean isEmpty) {
+  Expr getAnEmptinessCheck(GuardValue v, boolean isEmpty) {
     result = this.getABooleanEmptinessCheck(v, isEmpty)
   }
 }
@@ -644,6 +619,14 @@ private AssignableAccess getATrackedAccess(Ssa::Definition def, ControlFlow::Nod
   cfn = def.getControlFlowNode()
 }
 
+private predicate ssaMustHaveValue(Expr e, GuardValue v) {
+  exists(Ssa::Definition def, BasicBlock bb |
+    e = def.getARead() and
+    e.getBasicBlock() = bb and
+    Guards::ssaControls(def, bb, v)
+  )
+}
+
 /**
  * A guarded expression.
  *
@@ -682,11 +665,7 @@ private AssignableAccess getATrackedAccess(Ssa::Definition def, ControlFlow::Nod
  * definition).
  */
 class GuardedExpr extends AccessOrCallExpr {
-  private Guard g;
-  private AccessOrCallExpr sub0;
-  private AbstractValue v0;
-
-  GuardedExpr() { isGuardedByExpr(this, g, sub0, v0) }
+  GuardedExpr() { isGuardedByExpr(this, _, _, _) or ssaMustHaveValue(this, _) }
 
   /**
    * Gets an expression that guards this expression. That is, this expression is
@@ -699,18 +678,16 @@ class GuardedExpr extends AccessOrCallExpr {
    * left-most qualifier, then so must the other (accessing the same SSA
    * variable).
    */
-  Guard getAGuard(Expr sub, AbstractValue v) {
-    result = g and
-    sub = sub0 and
-    v = v0
-  }
+  Guard getAGuard(Expr sub, GuardValue v) { isGuardedByExpr(this, result, sub, v) }
 
   /**
    * Holds if this expression must have abstract value `v`. That is, this
    * expression is guarded by a structurally equal expression having abstract
    * value `v`.
    */
-  predicate mustHaveValue(AbstractValue v) { g = this.getAGuard(g, v) }
+  predicate mustHaveValue(GuardValue v) {
+    exists(Guard g | g = this.getAGuard(g, v)) or ssaMustHaveValue(this, v)
+  }
 
   /**
    * Holds if this expression is guarded by expression `cond`, which must
@@ -722,7 +699,7 @@ class GuardedExpr extends AccessOrCallExpr {
    * variable).
    */
   predicate isGuardedBy(Expr cond, Expr sub, boolean b) {
-    cond = this.getAGuard(sub, any(BooleanValue v | v.getValue() = b))
+    cond = this.getAGuard(sub, any(GuardValue v | v.asBooleanValue() = b))
   }
 }
 
@@ -747,7 +724,7 @@ class GuardedExpr extends AccessOrCallExpr {
 class GuardedControlFlowNode extends ControlFlow::Nodes::ElementNode {
   private Guard g;
   private AccessOrCallExpr sub0;
-  private AbstractValue v0;
+  private GuardValue v0;
 
   GuardedControlFlowNode() { g.controlsNode(this, sub0, v0) }
 
@@ -762,7 +739,7 @@ class GuardedControlFlowNode extends ControlFlow::Nodes::ElementNode {
    * left-most qualifier, then so must the other (accessing the same SSA
    * variable).
    */
-  Guard getAGuard(Expr sub, AbstractValue v) {
+  Guard getAGuard(Expr sub, GuardValue v) {
     result = g and
     sub = sub0 and
     v = v0
@@ -773,7 +750,7 @@ class GuardedControlFlowNode extends ControlFlow::Nodes::ElementNode {
    * control flow node is guarded by a structurally equal expression having
    * abstract value `v`.
    */
-  predicate mustHaveValue(AbstractValue v) { g = this.getAGuard(g, v) }
+  predicate mustHaveValue(GuardValue v) { g = this.getAGuard(g, v) }
 }
 
 /**
@@ -797,7 +774,7 @@ class GuardedControlFlowNode extends ControlFlow::Nodes::ElementNode {
 class GuardedDataFlowNode extends DataFlow::ExprNode {
   private Guard g;
   private AccessOrCallExpr sub0;
-  private AbstractValue v0;
+  private GuardValue v0;
 
   GuardedDataFlowNode() {
     exists(ControlFlow::Nodes::ElementNode cfn | exists(this.getExprAtNode(cfn)) |
@@ -816,7 +793,7 @@ class GuardedDataFlowNode extends DataFlow::ExprNode {
    * left-most qualifier, then so must the other (accessing the same SSA
    * variable).
    */
-  Guard getAGuard(Expr sub, AbstractValue v) {
+  Guard getAGuard(Expr sub, GuardValue v) {
     result = g and
     sub = sub0 and
     v = v0
@@ -827,31 +804,21 @@ class GuardedDataFlowNode extends DataFlow::ExprNode {
    * data flow node is guarded by a structurally equal expression having
    * abstract value `v`.
    */
-  predicate mustHaveValue(AbstractValue v) { g = this.getAGuard(g, v) }
+  predicate mustHaveValue(GuardValue v) { g = this.getAGuard(g, v) }
 }
 
 /** An expression guarded by a `null` check. */
 class NullGuardedExpr extends GuardedExpr {
-  NullGuardedExpr() { this.mustHaveValue(any(NullValue v | v.isNonNull())) }
+  NullGuardedExpr() { this.mustHaveValue(any(GuardValue v | v.isNonNullValue())) }
 }
 
 /** A data flow node guarded by a `null` check. */
 class NullGuardedDataFlowNode extends GuardedDataFlowNode {
-  NullGuardedDataFlowNode() { this.mustHaveValue(any(NullValue v | v.isNonNull())) }
+  NullGuardedDataFlowNode() { this.mustHaveValue(any(GuardValue v | v.isNonNullValue())) }
 }
 
 /** INTERNAL: Do not use. */
 module Internal {
-  newtype TAbstractValue =
-    TBooleanValue(boolean b) { b = true or b = false } or
-    TIntegerValue(int i) { i = any(Expr e).getValue().toInt() } or
-    TNullValue(boolean b) { b = true or b = false } or
-    TMatchValue(Case c, boolean b) {
-      exists(c.getPattern()) and
-      (b = true or b = false)
-    } or
-    TEmptyCollectionValue(boolean b) { b = true or b = false }
-
   /** Holds if expression `e` is a `null` value. */
   predicate nullValue(Expr e) {
     e instanceof NullLiteral
@@ -950,7 +917,7 @@ module Internal {
       bao.getAnOperand() = o and
       // The other operand must be provably non-null in order
       // for `only if` to hold
-      o = any(NullValue nv | nv.isNonNull()).getAnExpr() and
+      nonNullValueImplied(o) and
       e != o
     )
   }
@@ -969,22 +936,6 @@ module Internal {
     e = any(BinaryArithmeticOperation bao | result = bao.getAnOperand())
   }
 
-  private Expr stripConditionalExpr(Expr e) {
-    e =
-      any(ConditionalExpr ce |
-        result = stripConditionalExpr(ce.getThen())
-        or
-        result = stripConditionalExpr(ce.getElse())
-      )
-    or
-    not e instanceof ConditionalExpr and
-    result = e
-  }
-
-  private predicate canReturn(Callable c, Expr ret) {
-    exists(Expr e | c.canReturn(e) | ret = stripConditionalExpr(e))
-  }
-
   // The predicates in this module should be evaluated in the same stage as the CFG
   // construction stage. This is to avoid recomputation of pre-basic-blocks and
   // pre-SSA predicates
@@ -992,416 +943,6 @@ module Internal {
     private import semmle.code.csharp.controlflow.internal.PreBasicBlocks as PreBasicBlocks
     private import semmle.code.csharp.controlflow.internal.PreSsa
 
-    /**
-     * Holds if pre-basic-block `bb` only is reached when guard `g` has abstract value `v`,
-     * not taking implications into account.
-     */
-    pragma[nomagic]
-    private predicate preControlsDirect(Guard g, PreBasicBlocks::PreBasicBlock bb, AbstractValue v) {
-      exists(PreBasicBlocks::ConditionBlock cb, ConditionalSuccessor s | cb.controls(bb, s) |
-        v.branch(cb.getLastElement(), s, g)
-      )
-    }
-
-    pragma[nomagic]
-    private predicate preControlsDefDirect(Guard g, PreSsa::Definition def, AbstractValue v) {
-      preControlsDirect(g, def.getBasicBlock(), v)
-    }
-
-    /** Holds if pre-basic-block `bb` only is reached when guard `g` has abstract value `v`. */
-    predicate preControls(Guard g, PreBasicBlocks::PreBasicBlock bb, AbstractValue v) {
-      preControlsDirect(g, bb, v)
-      or
-      exists(AbstractValue v0, Guard g0 |
-        preControls(g0, bb, v0) and
-        preImpliesStep(g0, v0, g, v)
-      )
-    }
-
-    private class PreSsaImplicitParameterDefinition extends PreSsa::Definition {
-      private Parameter p;
-
-      PreSsaImplicitParameterDefinition() {
-        p = this.getDefinition().(AssignableDefinitions::ImplicitParameterDefinition).getParameter()
-      }
-
-      Parameter getParameter() { result = p }
-
-      /**
-       * Holds if the callable that this parameter belongs to can return `ret`, but
-       * only if this parameter is `null` or non-`null`, as specified by `isNull`.
-       */
-      predicate nullGuardedReturn(Expr ret, boolean isNull) {
-        canReturn(p.getCallable(), ret) and
-        exists(PreBasicBlocks::PreBasicBlock bb, NullValue nv |
-          preControls(this.getARead(), bb, nv)
-        |
-          ret = bb.getAnElement() and
-          if nv.isNull() then isNull = true else isNull = false
-        )
-      }
-    }
-
-    private predicate canReturnBool(Callable c, Expr ret) {
-      canReturn(c, ret) and
-      c.getReturnType() instanceof BoolType
-    }
-
-    private predicate boolReturnImplies(Expr ret, BooleanValue retVal, Guard g, AbstractValue v) {
-      canReturnBool(_, ret) and
-      isGuard(ret, retVal) and
-      g = ret and
-      v = retVal
-      or
-      exists(Guard g0, AbstractValue v0 |
-        boolReturnImplies(ret, retVal, g0, v0) and
-        preImpliesStep(g0, v0, g, v)
-      )
-    }
-
-    /**
-     * Holds if `ret` is an expression returned by the callable to which parameter
-     * `p` belongs, and `ret` having Boolean value `retVal` allows the conclusion
-     * that the parameter `p` either is `null` or non-`null`, as specified by `isNull`.
-     */
-    private predicate validReturnInCustomNullCheck(
-      Expr ret, Parameter p, BooleanValue retVal, boolean isNull
-    ) {
-      exists(Callable c |
-        canReturnBool(c, ret) and
-        p.getCallable() = c
-      ) and
-      exists(PreSsaImplicitParameterDefinition def | p = def.getParameter() |
-        def.nullGuardedReturn(ret, isNull)
-        or
-        exists(NullValue nv | boolReturnImplies(ret, retVal, def.getARead(), nv) |
-          if nv.isNull() then isNull = true else isNull = false
-        )
-      )
-    }
-
-    /**
-     * Gets a non-overridable callable with a Boolean return value that performs a
-     * `null`-check on parameter `p`. A return value having Boolean value `retVal`
-     * allows us to conclude that the argument either is `null` or non-`null`, as
-     * specified by `isNull`.
-     */
-    private Callable customNullCheck(Parameter p, BooleanValue retVal, boolean isNull) {
-      result.getReturnType() instanceof BoolType and
-      not result.(Overridable).isOverridableOrImplementable() and
-      p.getCallable() = result and
-      not p.isParams() and
-      p.getType() = any(Type t | t instanceof RefType or t instanceof NullableType) and
-      forex(Expr ret |
-        canReturn(result, ret) and
-        not ret.(BoolLiteral).getBoolValue() = retVal.getValue().booleanNot()
-      |
-        validReturnInCustomNullCheck(ret, p, retVal, isNull)
-      )
-    }
-
-    pragma[nomagic]
-    private predicate conditionalAssign0(
-      Guard guard, AbstractValue vGuard, PreSsa::PhiNode phi, Expr e, PreSsa::Definition upd,
-      PreBasicBlocks::PreBasicBlock bbGuard, PreBasicBlocks::PreBasicBlock bbPhi
-    ) {
-      e = upd.getDefinition().getSource() and
-      upd = phi.getAnInput() and
-      preControlsDefDirect(guard, upd, vGuard) and
-      bbGuard.getAnElement() = guard and
-      bbPhi = phi.getBasicBlock()
-    }
-
-    pragma[noinline]
-    private predicate conditionalAssign1(
-      Guard guard, AbstractValue vGuard, PreSsa::PhiNode phi, Expr e, PreSsa::Definition upd,
-      PreBasicBlocks::PreBasicBlock bbGuard
-    ) {
-      exists(PreBasicBlocks::PreBasicBlock bbPhi |
-        conditionalAssign0(guard, vGuard, phi, e, upd, bbGuard, bbPhi) and
-        bbGuard.strictlyDominates(bbPhi) and
-        not preControlsDefDirect(guard, phi, vGuard)
-      )
-    }
-
-    pragma[noinline]
-    private predicate conditionalAssign2(
-      Guard guard, AbstractValue vGuard, PreSsa::PhiNode phi, Expr e, PreSsa::Definition upd,
-      PreBasicBlocks::PreBasicBlock bbGuard, PreSsa::Definition other
-    ) {
-      conditionalAssign1(guard, vGuard, phi, e, upd, bbGuard) and
-      other != upd and
-      other = phi.getAnInput()
-    }
-
-    pragma[noinline]
-    private predicate conditionalAssign3(
-      Guard guard, AbstractValue vGuard, PreSsa::Definition def, Expr e, PreSsa::Definition upd,
-      PreBasicBlocks::PreBasicBlock bbGuard, PreSsa::Definition other
-    ) {
-      conditionalAssign2(guard, vGuard, def, e, upd, bbGuard, other) and
-      preControlsDefDirect(guard, other, vGuard.getDualValue())
-    }
-
-    /** Gets the successor block that is reached when guard `g` has abstract value `v`. */
-    private PreBasicBlocks::PreBasicBlock getConditionalSuccessor(Guard g, AbstractValue v) {
-      exists(PreBasicBlocks::ConditionBlock pred, ConditionalSuccessor s |
-        v.branch(pred.getLastElement(), s, g)
-      |
-        result = pred.getASuccessorByType(s)
-      )
-    }
-
-    pragma[noinline]
-    private predicate conditionalAssign4(
-      Guard guard, AbstractValue vGuard, PreSsa::Definition def, Expr e, PreSsa::Definition upd,
-      PreBasicBlocks::PreBasicBlock bbGuard, PreSsa::Definition other
-    ) {
-      conditionalAssign2(guard, vGuard, def, e, upd, bbGuard, other) and
-      other.getBasicBlock().dominates(bbGuard) and
-      not other.isLiveAtEndOfBlock(getConditionalSuccessor(guard, vGuard))
-    }
-
-    /**
-     * Holds if the evaluation of `guard` to `vGuard` implies that `def` is assigned
-     * expression `e`.
-     */
-    private predicate conditionalAssign(
-      Guard guard, AbstractValue vGuard, PreSsa::Definition def, Expr e
-    ) {
-      // For example:
-      //   v = guard ? e : x;
-      exists(ConditionalExpr c | c = def.getDefinition().getSource() |
-        guard = c.getCondition() and
-        vGuard =
-          any(BooleanValue bv |
-            bv.getValue() = true and
-            e = c.getThen()
-            or
-            bv.getValue() = false and
-            e = c.getElse()
-          )
-      )
-      or
-      exists(PreSsa::Definition upd, PreBasicBlocks::PreBasicBlock bbGuard |
-        conditionalAssign1(guard, vGuard, def, e, upd, bbGuard)
-      |
-        forall(PreSsa::Definition other |
-          conditionalAssign2(guard, vGuard, def, e, upd, bbGuard, other)
-        |
-          // For example:
-          //   if (guard)
-          //     upd = a;
-          //   else
-          //     other = b;
-          //   def = phi(upd, other)
-          conditionalAssign3(guard, vGuard, def, e, upd, bbGuard, other)
-          or
-          // For example:
-          //   other = a;
-          //   if (guard)
-          //       upd = b;
-          //   def = phi(other, upd)
-          conditionalAssign4(guard, vGuard, def, e, upd, bbGuard, other)
-        )
-      )
-    }
-
-    /**
-     * Holds if the evaluation of `guard` to `vGuard` implies that `def` is assigned
-     * an expression with abstract value `vDef`.
-     */
-    private predicate conditionalAssignVal(
-      Expr guard, AbstractValue vGuard, PreSsa::Definition def, AbstractValue vDef
-    ) {
-      conditionalAssign(guard, vGuard, def, vDef.getAnExpr())
-    }
-
-    pragma[noinline]
-    private predicate relevantEq(PreSsa::Definition def, AbstractValue v, AssignableRead ar) {
-      conditionalAssignVal(_, _, def, v) and
-      ar = def.getARead()
-    }
-
-    /**
-     * Gets an expression that directly tests whether expression `e1` is equal
-     * to expression `e2`.
-     *
-     * If the returned expression evaluates to `v`, then expression `e1` is
-     * guaranteed to be equal to `e2`, otherwise it is guaranteed to not be
-     * equal to `e2`.
-     *
-     * For example, if the expression `x != ""` evaluates to `false` then the
-     * expression `x` is guaranteed to be equal to `""`.
-     */
-    private Expr getABooleanEqualityCheck(Expr e1, BooleanValue v, Expr e2) {
-      exists(boolean branch | branch = v.getValue() |
-        exists(ComparisonTest ct, ComparisonKind ck |
-          ct.getExpr() = result and
-          ct.getAnArgument() = e1 and
-          ct.getAnArgument() = e2 and
-          e2 != e1 and
-          ck = ct.getComparisonKind()
-        |
-          ck.isEquality() and branch = true
-          or
-          ck.isInequality() and branch = false
-        )
-        or
-        result =
-          any(IsExpr ie |
-            ie.getExpr() = e1 and
-            e2 = ie.getPattern().(ConstantPatternExpr) and
-            branch = true
-          )
-      )
-    }
-
-    /**
-     * Gets an expression that tests via matching whether expression `e1` is equal
-     * to expression `e2`.
-     *
-     * If the returned expression matches (`v.isMatch()`), then expression `e1` is
-     * guaranteed to be equal to `e2`. If the returned expression non-matches
-     * (`not v.isMatch()`), then this expression is guaranteed to not be equal to `e2`.
-     *
-     * For example, if the case statement `case ""` matches in
-     *
-     * ```csharp
-     * switch (o)
-     * {
-     *     case "":
-     *         return s;
-     *     default:
-     *         return "";
-     * }
-     * ```
-     *
-     * then `o` is guaranteed to be equal to `""`.
-     */
-    private Expr getAMatchingEqualityCheck(Expr e1, MatchValue v, Expr e2) {
-      exists(Switch s, Case case | case = v.getCase() |
-        e1 = s.getExpr() and
-        result = e1 and
-        case = s.getACase() and
-        e2 = case.getPattern().(ConstantPatternExpr) and
-        v.isMatch()
-      )
-    }
-
-    pragma[nomagic]
-    private Expr getAnEqualityCheckVal(Expr e, AbstractValue v, AbstractValue vExpr) {
-      result = getAnEqualityCheck(e, v, vExpr.getAnExpr())
-    }
-
-    /**
-     * Holds if the evaluation of `guard` to `vGuard` implies that `def` does not
-     * have the value `vDef`.
-     */
-    private predicate guardImpliesNotEqual(
-      Expr guard, AbstractValue vGuard, PreSsa::Definition def, AbstractValue vDef
-    ) {
-      exists(AssignableRead ar | relevantEq(def, vDef, ar) |
-        // For example:
-        //   if (de == null); vGuard = TBooleanValue(false); vDef = TNullValue(true)
-        // but not
-        //   if (de == "abc"); vGuard = TBooleanValue(false); vDef = TNullValue(false)
-        guard = getAnEqualityCheckVal(ar, vGuard.getDualValue(), vDef) and
-        vDef.isSingleton()
-        or
-        // For example:
-        //   if (de != null); vGuard = TBooleanValue(true); vDef = TNullValue(true)
-        // or
-        //   if (de == null); vGuard = TBooleanValue(true); vDef = TNullValue(false)
-        exists(NullValue nv |
-          guard =
-            ar.(DereferenceableExpr).getANullCheck(vGuard, any(boolean b | nv = TNullValue(b)))
-        |
-          vDef = nv.getDualValue()
-        )
-        or
-        // For example:
-        //   if (de == false); vGuard = TBooleanValue(true); vDef = TBooleanValue(true)
-        guard = getAnEqualityCheckVal(ar, vGuard, vDef.getDualValue())
-      )
-    }
-
-    /**
-     * Holds if `def` can have a value that is not representable as an
-     * abstract value.
-     */
-    private predicate hasPossibleUnknownValue(PreSsa::Definition def) {
-      exists(PreSsa::Definition input | input = def.getAnUltimateDefinition() |
-        not exists(input.getDefinition().getSource())
-        or
-        exists(Expr e | e = stripConditionalExpr(input.getDefinition().getSource()) |
-          not e = any(AbstractValue v).getAnExpr()
-        )
-      )
-    }
-
-    /**
-     * Gets an ultimate definition of `def` that is not itself a phi node. The
-     * boolean `fromBackEdge` indicates whether the flow from `result` to `def`
-     * goes through a back edge.
-     */
-    private PreSsa::Definition getADefinition(PreSsa::Definition def, boolean fromBackEdge) {
-      result = def and
-      not def instanceof PreSsa::PhiNode and
-      fromBackEdge = false
-      or
-      exists(PreSsa::Definition input, PreBasicBlocks::PreBasicBlock pred, boolean fbe |
-        input = def.(PreSsa::PhiNode).getAnInput()
-      |
-        pred = def.getBasicBlock().getAPredecessor() and
-        input.isLiveAtEndOfBlock(pred) and
-        result = getADefinition(input, fbe) and
-        (if def.getBasicBlock().dominates(pred) then fromBackEdge = true else fromBackEdge = fbe)
-      )
-    }
-
-    /**
-     * Holds if `e` has abstract value `v` and may be assigned to `def`. The Boolean
-     * `fromBackEdge` indicates whether the flow from `e` to `def` goes through a
-     * back edge.
-     */
-    private predicate possibleValue(
-      PreSsa::Definition def, boolean fromBackEdge, Expr e, AbstractValue v
-    ) {
-      not hasPossibleUnknownValue(def) and
-      exists(PreSsa::Definition input | input = getADefinition(def, fromBackEdge) |
-        e = stripConditionalExpr(input.getDefinition().getSource()) and
-        v.getAnExpr() = e
-      )
-    }
-
-    private predicate nonUniqueValue(PreSsa::Definition def, Expr e, AbstractValue v) {
-      possibleValue(def, false, e, v) and
-      possibleValue(def, _, any(Expr other | other != e), v)
-    }
-
-    /**
-     * Holds if `e` has abstract value `v` and may be assigned to `def` without going
-     * through back edges, and all other possible ultimate definitions of `def` do not
-     * have abstract value `v`. The trivial case where `def` is an explicit update with
-     * source `e` is excluded.
-     */
-    private predicate uniqueValue(PreSsa::Definition def, Expr e, AbstractValue v) {
-      possibleValue(def, false, e, v) and
-      not nonUniqueValue(def, e, v) and
-      exists(Expr other | possibleValue(def, _, other, _) and other != e)
-    }
-
-    /**
-     * Holds if `guard` having abstract value `vGuard` implies that `def` has
-     * abstract value `vDef`.
-     */
-    private predicate guardImpliesEqual(
-      Guard guard, AbstractValue vGuard, PreSsa::Definition def, AbstractValue vDef
-    ) {
-      guard = getAnEqualityCheck(def.getARead(), vGuard, vDef.getAnExpr())
-    }
-
     private predicate nullDef(PreSsa::Definition def) {
       nullValueImplied(def.getDefinition().getSource())
     }
@@ -1418,63 +959,25 @@ module Internal {
       nonEmptyValue(def.getDefinition().getSource())
     }
 
+    deprecated predicate isGuard(Expr e, GuardValue val) {
+      (
+        e.getType() instanceof BoolType and
+        not e instanceof BoolLiteral and
+        not e instanceof SwitchCaseExpr and
+        not e instanceof PatternExpr and
+        exists(val.asBooleanValue())
+        or
+        e instanceof DereferenceableExpr and
+        val.isNullness(_)
+      ) and
+      not e = any(ExprStmt es).getExpr() and
+      not e = any(LocalVariableDeclStmt s).getAVariableDeclExpr()
+    }
+
     cached
     private module CachedWithCfg {
       private import semmle.code.csharp.Caching
 
-      cached
-      predicate isGuard(Expr e, AbstractValue val) {
-        (
-          e.getType() instanceof BoolType and
-          not e instanceof BoolLiteral and
-          not e instanceof SwitchCaseExpr and
-          not e instanceof PatternExpr and
-          val = TBooleanValue(_)
-          or
-          e instanceof DereferenceableExpr and
-          val = TNullValue(_)
-          or
-          val.branch(_, _, e)
-          or
-          e instanceof EnumerableCollectionExpr and
-          val = TEmptyCollectionValue(_)
-        ) and
-        not e = any(ExprStmt es).getExpr() and
-        not e = any(LocalVariableDeclStmt s).getAVariableDeclExpr()
-      }
-
-      /**
-       * Gets an expression that tests whether expression `e1` is equal to
-       * expression `e2`.
-       *
-       * If the returned expression has abstract value `v`, then expression `e1` is
-       * guaranteed to be equal to `e2`, and if the returned expression has abstract
-       * value `v.getDualValue()`, then this expression is guaranteed to be
-       * non-equal to `e`.
-       *
-       * For example, if the expression `x != ""` evaluates to `false` then the
-       * expression `x` is guaranteed to be equal to `""`.
-       */
-      cached
-      Expr getAnEqualityCheck(Expr e1, AbstractValue v, Expr e2) {
-        result = getABooleanEqualityCheck(e1, v, e2)
-        or
-        result = getABooleanEqualityCheck(e2, v, e1)
-        or
-        result = getAMatchingEqualityCheck(e1, v, e2)
-        or
-        result = getAMatchingEqualityCheck(e2, v, e1)
-      }
-
-      cached
-      predicate isCustomNullCheck(Call call, Expr arg, BooleanValue v, boolean isNull) {
-        exists(Callable callable, Parameter p |
-          arg = call.getArgumentForParameter(any(Parameter p0 | p0.getUnboundDeclaration() = p)) and
-          call.getTarget().getUnboundDeclaration() = callable and
-          callable = customNullCheck(p, v, isNull)
-        )
-      }
-
       private predicate firstReadSameVarUniquePredecessor(
         PreSsa::Definition def, AssignableRead read
       ) {
@@ -1486,156 +989,6 @@ module Internal {
         )
       }
 
-      /**
-       * Holds if the assumption that `g1` has abstract value `v1` implies that
-       * `g2` has abstract value `v2`, using one step of reasoning. That is, the
-       * evaluation of `g2` to `v2` dominates the evaluation of `g1` to `v1`.
-       *
-       * This predicate does not rely on the control flow graph.
-       */
-      cached
-      predicate preImpliesStep(Guard g1, AbstractValue v1, Guard g2, AbstractValue v2) {
-        g1 =
-          any(BinaryOperation bo |
-            (
-              bo instanceof BitwiseAndExpr or
-              bo instanceof LogicalAndExpr
-            ) and
-            g2 = bo.getAnOperand() and
-            v1 = TBooleanValue(true) and
-            v2 = v1
-          )
-        or
-        g1 =
-          any(BinaryOperation bo |
-            (
-              bo instanceof BitwiseOrExpr or
-              bo instanceof LogicalOrExpr
-            ) and
-            g2 = bo.getAnOperand() and
-            v1 = TBooleanValue(false) and
-            v2 = v1
-          )
-        or
-        g2 = g1.(LogicalNotExpr).getOperand() and
-        v2 = TBooleanValue(v1.(BooleanValue).getValue().booleanNot())
-        or
-        exists(ComparisonTest ct, boolean polarity, BoolLiteral boolLit, boolean b |
-          ct.getAnArgument() = boolLit and
-          b = boolLit.getBoolValue() and
-          g2 = ct.getAnArgument() and
-          g1 = ct.getExpr() and
-          v2 = TBooleanValue(v1.(BooleanValue).getValue().booleanXor(polarity).booleanXor(b))
-        |
-          ct.getComparisonKind().isEquality() and
-          polarity = true
-          or
-          ct.getComparisonKind().isInequality() and
-          polarity = false
-        )
-        or
-        exists(ConditionalExpr cond, boolean branch, Expr e, AbstractValue v |
-          e = v.getAnExpr() and
-          (
-            cond.getThen() = e and branch = true
-            or
-            cond.getElse() = e and branch = false
-          )
-        |
-          g1 = cond and
-          v1 = v.getDualValue() and
-          (
-            // g1 === g2 ? e : ...;
-            g2 = cond.getCondition() and
-            v2 = TBooleanValue(branch.booleanNot())
-            or
-            // g1 === ... ? g2 : e
-            g2 = cond.getThen() and
-            branch = false and
-            v2 = v1
-            or
-            // g1 === g2 ? ... : e
-            g2 = cond.getElse() and
-            branch = true and
-            v2 = v1
-          )
-        )
-        or
-        isGuard(g1, v1) and
-        v1 =
-          any(MatchValue mv |
-            mv.isMatch() and
-            g2 = g1 and
-            v2.getAnExpr() = mv.getCase().getPattern().(ConstantPatternExpr) and
-            v1 != v2
-          )
-        or
-        exists(boolean isNull | g1 = g2.(DereferenceableExpr).getANullCheck(v1, isNull) |
-          v2 = any(NullValue nv | if nv.isNull() then isNull = true else isNull = false) and
-          (g1 != g2 or v1 != v2)
-        )
-        or
-        exists(boolean isEmpty |
-          g1 = g2.(EnumerableCollectionExpr).getAnEmptinessCheck(v1, isEmpty)
-        |
-          v2 =
-            any(EmptyCollectionValue ecv | if ecv.isEmpty() then isEmpty = true else isEmpty = false) and
-          g1 != g2
-        )
-        or
-        g1 instanceof DereferenceableExpr and
-        g1 = getNullEquivParent(g2) and
-        v1 instanceof NullValue and
-        v2 = v1
-        or
-        g1 instanceof DereferenceableExpr and
-        g2 = getANullImplyingChild(g1) and
-        v1.(NullValue).isNonNull() and
-        v2 = v1
-        or
-        g2 = g1.(AssignExpr).getRValue() and
-        isGuard(g1, v1) and
-        v2 = v1
-        or
-        g2 = g1.(Assignment).getLValue() and
-        isGuard(g1, v1) and
-        v2 = v1
-        or
-        g2 = g1.(CastExpr).getExpr() and
-        isGuard(g1, v1) and
-        v2 = v1.(NullValue)
-        or
-        exists(PreSsa::Definition def |
-          def.getDefinition().getSource() = g2 and
-          g1 = def.getARead() and
-          isGuard(g1, v1) and
-          v2 = v1 and
-          if v1.isReferentialProperty() then firstReadSameVarUniquePredecessor(def, g1) else any()
-        )
-        or
-        exists(PreSsa::Definition def, AbstractValue v |
-          // If for example `def = g2 ? v : ...`, then a guard `g1` proving `def != v`
-          // ensures that `g2` evaluates to `false`.
-          conditionalAssignVal(g2, v2.getDualValue(), def, v) and
-          guardImpliesNotEqual(g1, v1, def, v)
-        )
-        or
-        exists(PreSsa::Definition def, Expr e, AbstractValue v |
-          // If for example `def = g2 ? v : ...` and all other assignments to `def` are
-          // different from `v`, then a guard proving `def == v` ensures that `g2`
-          // evaluates to `true`.
-          uniqueValue(def, e, v) and
-          guardImpliesEqual(g1, v1, def, v) and
-          preControlsDirect(g2, any(PreBasicBlocks::PreBasicBlock bb | e = bb.getAnElement()), v2) and
-          not preControlsDirect(g2, any(PreBasicBlocks::PreBasicBlock bb | g1 = bb.getAnElement()),
-            v2)
-        )
-        or
-        g2 = g1.(NullCoalescingExpr).getAnOperand() and
-        v1.(NullValue).isNull() and
-        v2 = v1
-      }
-
       cached
       predicate nullValueImplied(Expr e) {
         nullValue(e)
@@ -1840,15 +1193,8 @@ module Internal {
      * Holds if basic block `bb` only is reached when guard `g` has abstract value `v`.
      */
     cached
-    predicate guardControls(Guard g, BasicBlock bb, AbstractValue v) {
-      exists(ControlFlowElement cfe, ConditionalSuccessor cs |
-        v.branch(cfe, cs, g) and cfe.controlsBlock(bb, cs, _)
-      )
-      or
-      exists(AbstractValue v0, Guard g0 |
-        guardControls(g0, bb, v0) and
-        impliesStep(g0, v0, g, v)
-      )
+    predicate guardControls(Guard g, BasicBlock bb, GuardValue v) {
+      g.(Guards::Guard).valueControls(bb, v)
     }
 
     pragma[nomagic]
@@ -1860,7 +1206,7 @@ module Internal {
     pragma[nomagic]
     private predicate nodeIsGuardedBySameSubExpr0(
       ControlFlow::Node guardedCfn, BasicBlock guardedBB, AccessOrCallExpr guarded, Guard g,
-      AccessOrCallExpr sub, AbstractValue v
+      AccessOrCallExpr sub, GuardValue v
     ) {
       Stages::GuardsStage::forceCachingInSameStage() and
       guardedCfn = guarded.getAControlFlowNode() and
@@ -1873,7 +1219,7 @@ module Internal {
     pragma[nomagic]
     private predicate nodeIsGuardedBySameSubExpr(
       ControlFlow::Node guardedCfn, BasicBlock guardedBB, AccessOrCallExpr guarded, Guard g,
-      AccessOrCallExpr sub, AbstractValue v
+      AccessOrCallExpr sub, GuardValue v
     ) {
       nodeIsGuardedBySameSubExpr0(guardedCfn, guardedBB, guarded, g, sub, v) and
       guardControlsSub(g, guardedBB, sub)
@@ -1882,7 +1228,7 @@ module Internal {
     pragma[nomagic]
     private predicate nodeIsGuardedBySameSubExprSsaDef0(
       ControlFlow::Node cfn, BasicBlock guardedBB, AccessOrCallExpr guarded, Guard g,
-      ControlFlow::Node subCfn, BasicBlock subCfnBB, AccessOrCallExpr sub, AbstractValue v,
+      ControlFlow::Node subCfn, BasicBlock subCfnBB, AccessOrCallExpr sub, GuardValue v,
       Ssa::Definition def
     ) {
       nodeIsGuardedBySameSubExpr(cfn, guardedBB, guarded, g, sub, v) and
@@ -1893,7 +1239,7 @@ module Internal {
     pragma[nomagic]
     private predicate nodeIsGuardedBySameSubExprSsaDef(
       ControlFlow::Node guardedCfn, AccessOrCallExpr guarded, Guard g, ControlFlow::Node subCfn,
-      AccessOrCallExpr sub, AbstractValue v, Ssa::Definition def
+      AccessOrCallExpr sub, GuardValue v, Ssa::Definition def
     ) {
       exists(BasicBlock guardedBB, BasicBlock subCfnBB |
         nodeIsGuardedBySameSubExprSsaDef0(guardedCfn, guardedBB, guarded, g, subCfn, subCfnBB, sub,
@@ -1902,24 +1248,9 @@ module Internal {
       )
     }
 
-    private predicate adjacentReadPairSameVarUniquePredecessor(
-      Ssa::Definition def, ControlFlow::Node cfn1, ControlFlow::Node cfn2
-    ) {
-      SsaImpl::adjacentReadPairSameVar(def, cfn1, cfn2) and
-      (
-        cfn1 = cfn2 and
-        cfn1 = unique(ControlFlow::Node other | SsaImpl::adjacentReadPairSameVar(def, other, cfn2))
-        or
-        cfn1 =
-          unique(ControlFlow::Node other |
-            SsaImpl::adjacentReadPairSameVar(def, other, cfn2) and other != cfn2
-          )
-      )
-    }
-
     pragma[noinline]
     private predicate isGuardedByExpr0(
-      AccessOrCallExpr guarded, Guard g, AccessOrCallExpr sub, AbstractValue v
+      AccessOrCallExpr guarded, Guard g, AccessOrCallExpr sub, GuardValue v
     ) {
       forex(ControlFlow::Node cfn | cfn = guarded.getAControlFlowNode() |
         nodeIsGuardedBySameSubExpr(cfn, _, guarded, g, sub, v)
@@ -1927,25 +1258,18 @@ module Internal {
     }
 
     cached
-    predicate isGuardedByExpr(
-      AccessOrCallExpr guarded, Guard g, AccessOrCallExpr sub, AbstractValue v
-    ) {
+    predicate isGuardedByExpr(AccessOrCallExpr guarded, Guard g, AccessOrCallExpr sub, GuardValue v) {
       isGuardedByExpr0(guarded, g, sub, v) and
       forall(ControlFlow::Node subCfn, Ssa::Definition def |
         nodeIsGuardedBySameSubExprSsaDef(_, guarded, g, subCfn, sub, v, def)
       |
-        exists(ControlFlow::Node guardedCfn |
-          def = guarded.getAnSsaQualifier(guardedCfn) and
-          if v.isReferentialProperty()
-          then adjacentReadPairSameVarUniquePredecessor(def, subCfn, guardedCfn)
-          else any()
-        )
+        def = guarded.getAnSsaQualifier(_)
       )
     }
 
     cached
     predicate isGuardedByNode(
-      ControlFlow::Nodes::ElementNode guarded, Guard g, AccessOrCallExpr sub, AbstractValue v
+      ControlFlow::Nodes::ElementNode guarded, Guard g, AccessOrCallExpr sub, GuardValue v
     ) {
       nodeIsGuardedBySameSubExpr(guarded, _, _, g, sub, v) and
       forall(ControlFlow::Node subCfn, Ssa::Definition def |
@@ -1955,39 +1279,7 @@ module Internal {
           guarded
               .getAstNode()
               .(AccessOrCallExpr)
-              .getAnSsaQualifier(guarded.getBasicBlock().getANode()) and
-        if v.isReferentialProperty()
-        then adjacentReadPairSameVarUniquePredecessor(def, subCfn, guarded)
-        else any()
-      )
-    }
-
-    private predicate firstReadUniquePredecessor(Ssa::ExplicitDefinition def, ControlFlow::Node cfn) {
-      exists(def.getAFirstReadAtNode(cfn)) and
-      not exists(ControlFlow::Node other |
-        SsaImpl::adjacentReadPairSameVar(def, other, cfn) and
-        other != cfn
-      )
-    }
-
-    /**
-     * Holds if the assumption that `g1` has abstract value `v1` implies that
-     * `g2` has abstract value `v2`, using one step of reasoning. That is, the
-     * evaluation of `g2` to `v2` dominates the evaluation of `g1` to `v1`.
-     *
-     * This predicate relies on the control flow graph.
-     */
-    cached
-    predicate impliesStep(Guard g1, AbstractValue v1, Guard g2, AbstractValue v2) {
-      preImpliesStep(g1, v1, g2, v2)
-      or
-      forex(ControlFlow::Node cfn1 | cfn1 = g1.getAControlFlowNode() |
-        exists(Ssa::ExplicitDefinition def | def.getADefinition().getSource() = g2 |
-          g1 = def.getAReadAtNode(cfn1) and
-          isGuard(g1, v1) and
-          v2 = v1 and
-          if v1.isReferentialProperty() then firstReadUniquePredecessor(def, cfn1) else any()
-        )
+              .getAnSsaQualifier(guarded.getBasicBlock().getANode())
       )
     }
   }
diff --git a/csharp/ql/lib/semmle/code/csharp/controlflow/internal/Completion.qll b/csharp/ql/lib/semmle/code/csharp/controlflow/internal/Completion.qll
index 6fed45cdf84..ab8bb233e2c 100644
--- a/csharp/ql/lib/semmle/code/csharp/controlflow/internal/Completion.qll
+++ b/csharp/ql/lib/semmle/code/csharp/controlflow/internal/Completion.qll
@@ -26,7 +26,6 @@ private import semmle.code.csharp.frameworks.System
 private import ControlFlowGraphImpl
 private import NonReturning
 private import SuccessorType
-private import SuccessorTypes
 
 private newtype TCompletion =
   TSimpleCompletion() or
@@ -310,10 +309,8 @@ private class Overflowable extends UnaryOperation {
 
 /** A control flow element that is inside a `try` block. */
 private class TriedControlFlowElement extends ControlFlowElement {
-  TryStmt try;
-
   TriedControlFlowElement() {
-    this = try.getATriedElement() and
+    this = any(TryStmt try).getATriedElement() and
     not this instanceof NonReturningCall
   }
 
@@ -393,11 +390,6 @@ private predicate invalidCastCandidate(CastExpr ce) {
   ce.getExpr().getType() = getACastExprBaseType(ce)
 }
 
-private predicate assertion(Assertion a, int i, AssertMethod am, Expr e) {
-  e = a.getExpr(i) and
-  am = a.getAssertMethod()
-}
-
 /** Gets a valid completion when argument `i` fails in assertion `a`. */
 Completion assertionCompletion(Assertion a, int i) {
   exists(AssertMethod am | am = a.getAssertMethod() |
@@ -432,11 +424,6 @@ private predicate inBooleanContext(Expr e) {
   or
   e = any(SpecificCatchClause scc).getFilterClause()
   or
-  exists(BooleanAssertMethod m, int i |
-    assertion(_, i, m, e) and
-    i = m.getAnAssertionIndex(_)
-  )
-  or
   e = any(LogicalNotExpr lne | inBooleanContext(lne)).getAnOperand()
   or
   exists(LogicalAndExpr lae |
@@ -484,11 +471,6 @@ private predicate inNullnessContext(Expr e) {
   or
   exists(QualifiableExpr qe | qe.isConditional() | e = qe.getChildExpr(-1))
   or
-  exists(NullnessAssertMethod m, int i |
-    assertion(_, i, m, e) and
-    i = m.getAnAssertionIndex(_)
-  )
-  or
   exists(ConditionalExpr ce | inNullnessContext(ce) | (e = ce.getThen() or e = ce.getElse()))
   or
   exists(NullCoalescingExpr nce | inNullnessContext(nce) | e = nce.getRightOperand())
@@ -575,7 +557,7 @@ abstract private class NonNestedNormalCompletion extends NormalCompletion { }
 
 /** A simple (normal) completion. */
 class SimpleCompletion extends NonNestedNormalCompletion, TSimpleCompletion {
-  override NormalSuccessor getAMatchingSuccessorType() { any() }
+  override DirectSuccessor getAMatchingSuccessorType() { any() }
 
   override string toString() { result = "normal" }
 }
@@ -859,7 +841,7 @@ class GotoCompletion extends Completion {
   /** Gets the label of the `goto` completion. */
   string getLabel() { result = label }
 
-  override GotoSuccessor getAMatchingSuccessorType() { result.getLabel() = label }
+  override GotoSuccessor getAMatchingSuccessorType() { any() }
 
   override string toString() {
     // `NestedCompletion` defines `toString()` for the other case
@@ -882,7 +864,7 @@ class ThrowCompletion extends Completion {
   /** Gets the type of the exception being thrown. */
   ExceptionClass getExceptionClass() { result = ec }
 
-  override ExceptionSuccessor getAMatchingSuccessorType() { result.getExceptionClass() = ec }
+  override ExceptionSuccessor getAMatchingSuccessorType() { any() }
 
   override string toString() {
     // `NestedCompletion` defines `toString()` for the other case
diff --git a/csharp/ql/lib/semmle/code/csharp/controlflow/internal/ControlFlowGraphImpl.qll b/csharp/ql/lib/semmle/code/csharp/controlflow/internal/ControlFlowGraphImpl.qll
index 74cb070635b..5f62d6d21df 100644
--- a/csharp/ql/lib/semmle/code/csharp/controlflow/internal/ControlFlowGraphImpl.qll
+++ b/csharp/ql/lib/semmle/code/csharp/controlflow/internal/ControlFlowGraphImpl.qll
@@ -79,23 +79,10 @@ private module CfgInput implements CfgShared::InputSig<Location> {
     Impl::scopeLast(scope, last, c)
   }
 
-  class SuccessorType = ST::SuccessorType;
+  private class SuccessorType = ST::SuccessorType;
 
   SuccessorType getAMatchingSuccessorType(Completion c) { result = c.getAMatchingSuccessorType() }
 
-  predicate successorTypeIsSimple(SuccessorType t) {
-    t instanceof ST::SuccessorTypes::NormalSuccessor
-  }
-
-  predicate successorTypeIsCondition(SuccessorType t) {
-    t instanceof ST::SuccessorTypes::ConditionalSuccessor
-  }
-
-  predicate isAbnormalExitType(SuccessorType t) {
-    t instanceof ST::SuccessorTypes::ExceptionSuccessor or
-    t instanceof ST::SuccessorTypes::ExitSuccessor
-  }
-
   int idOfAstNode(AstNode node) { result = node.getId() }
 
   int idOfCfgScope(CfgScope node) { result = idOfAstNode(node) }
diff --git a/csharp/ql/lib/semmle/code/csharp/controlflow/internal/PreBasicBlocks.qll b/csharp/ql/lib/semmle/code/csharp/controlflow/internal/PreBasicBlocks.qll
index 08debc21c0d..38eca378edf 100644
--- a/csharp/ql/lib/semmle/code/csharp/controlflow/internal/PreBasicBlocks.qll
+++ b/csharp/ql/lib/semmle/code/csharp/controlflow/internal/PreBasicBlocks.qll
@@ -13,6 +13,7 @@ import csharp
 private import Completion
 private import ControlFlowGraphImpl
 private import semmle.code.csharp.controlflow.ControlFlowGraph::ControlFlow as Cfg
+private import codeql.controlflow.BasicBlock as BB
 
 private predicate startsBB(ControlFlowElement cfe) {
   not succ(_, cfe, _) and
@@ -55,24 +56,34 @@ private predicate bbIDominates(PreBasicBlock dom, PreBasicBlock bb) =
 class PreBasicBlock extends ControlFlowElement {
   PreBasicBlock() { startsBB(this) }
 
-  PreBasicBlock getASuccessorByType(Cfg::SuccessorType t) {
-    succ(this.getLastElement(), result, any(Completion c | t = c.getAMatchingSuccessorType()))
+  PreBasicBlock getASuccessor(Cfg::SuccessorType t) {
+    succ(this.getLastNode(), result, any(Completion c | t = c.getAMatchingSuccessorType()))
   }
 
-  PreBasicBlock getASuccessor() { result = this.getASuccessorByType(_) }
+  deprecated PreBasicBlock getASuccessorByType(Cfg::SuccessorType t) {
+    result = this.getASuccessor(t)
+  }
+
+  PreBasicBlock getASuccessor() { result = this.getASuccessor(_) }
 
   PreBasicBlock getAPredecessor() { result.getASuccessor() = this }
 
-  ControlFlowElement getElement(int pos) { bbIndex(this, result, pos) }
+  ControlFlowElement getNode(int pos) { bbIndex(this, result, pos) }
 
-  ControlFlowElement getAnElement() { result = this.getElement(_) }
+  deprecated ControlFlowElement getElement(int pos) { result = this.getNode(pos) }
+
+  ControlFlowElement getAnElement() { result = this.getNode(_) }
 
   ControlFlowElement getFirstElement() { result = this }
 
-  ControlFlowElement getLastElement() { result = this.getElement(this.length() - 1) }
+  ControlFlowElement getLastNode() { result = this.getNode(this.length() - 1) }
+
+  deprecated ControlFlowElement getLastElement() { result = this.getLastNode() }
 
   int length() { result = strictcount(this.getAnElement()) }
 
+  PreBasicBlock getImmediateDominator() { bbIDominates(result, this) }
+
   predicate immediatelyDominates(PreBasicBlock bb) { bbIDominates(this, bb) }
 
   pragma[inline]
@@ -84,45 +95,81 @@ class PreBasicBlock extends ControlFlowElement {
     or
     this.strictlyDominates(bb)
   }
+
+  predicate inDominanceFrontier(PreBasicBlock df) {
+    this = df.getAPredecessor() and not bbIDominates(this, df)
+    or
+    exists(PreBasicBlock prev | prev.inDominanceFrontier(df) |
+      bbIDominates(this, prev) and
+      not bbIDominates(this, df)
+    )
+  }
+
+  /** Unsupported. Do not use. */
+  predicate strictlyPostDominates(PreBasicBlock bb) { none() }
+
+  /** Unsupported. Do not use. */
+  predicate postDominates(PreBasicBlock bb) {
+    this.strictlyPostDominates(bb) or
+    this = bb
+  }
 }
 
 private Completion getConditionalCompletion(ConditionalCompletion cc) {
   result.getInnerCompletion() = cc
 }
 
+pragma[nomagic]
+private predicate conditionBlockImmediatelyControls(
+  ConditionBlock cond, PreBasicBlock succ, ConditionalCompletion cc
+) {
+  exists(ControlFlowElement last, Completion c |
+    last = cond.getLastNode() and
+    c = getConditionalCompletion(cc) and
+    succ(last, succ, c) and
+    // In the pre-CFG, we need to account for case where one predecessor node has
+    // two edges to the same successor node. Assertion expressions are examples of
+    // such nodes.
+    not exists(Completion other |
+      succ(last, succ, other) and
+      other != c
+    ) and
+    forall(PreBasicBlock pred | pred = succ.getAPredecessor() and pred != cond |
+      succ.dominates(pred)
+    )
+  )
+}
+
 class ConditionBlock extends PreBasicBlock {
   ConditionBlock() {
     exists(Completion c | c = getConditionalCompletion(_) |
-      succ(this.getLastElement(), _, c)
+      succ(this.getLastNode(), _, c)
       or
-      scopeLast(_, this.getLastElement(), c)
+      scopeLast(_, this.getLastNode(), c)
     )
   }
 
   pragma[nomagic]
-  private predicate immediatelyControls(PreBasicBlock succ, ConditionalCompletion cc) {
-    exists(ControlFlowElement last, Completion c |
-      last = this.getLastElement() and
-      c = getConditionalCompletion(cc) and
-      succ(last, succ, c) and
-      // In the pre-CFG, we need to account for case where one predecessor node has
-      // two edges to the same successor node. Assertion expressions are examples of
-      // such nodes.
-      not exists(Completion other |
-        succ(last, succ, other) and
-        other != c
-      ) and
-      forall(PreBasicBlock pred | pred = succ.getAPredecessor() and pred != this |
-        succ.dominates(pred)
-      )
-    )
-  }
-
-  pragma[nomagic]
-  predicate controls(PreBasicBlock controlled, Cfg::SuccessorTypes::ConditionalSuccessor s) {
-    exists(PreBasicBlock succ, ConditionalCompletion c | this.immediatelyControls(succ, c) |
+  predicate controls(PreBasicBlock controlled, Cfg::ConditionalSuccessor s) {
+    exists(PreBasicBlock succ, ConditionalCompletion c |
+      conditionBlockImmediatelyControls(this, succ, c)
+    |
       succ.dominates(controlled) and
       s = c.getAMatchingSuccessorType()
     )
   }
 }
+
+module PreCfg implements BB::CfgSig<Location> {
+  class ControlFlowNode = ControlFlowElement;
+
+  class BasicBlock = PreBasicBlock;
+
+  class EntryBasicBlock extends BasicBlock {
+    EntryBasicBlock() { entryBB(this) }
+  }
+
+  predicate dominatingEdge(BasicBlock bb1, BasicBlock bb2) {
+    conditionBlockImmediatelyControls(bb1, bb2, _)
+  }
+}
diff --git a/csharp/ql/lib/semmle/code/csharp/controlflow/internal/PreSsa.qll b/csharp/ql/lib/semmle/code/csharp/controlflow/internal/PreSsa.qll
index 6507bbbe04b..4921e692623 100644
--- a/csharp/ql/lib/semmle/code/csharp/controlflow/internal/PreSsa.qll
+++ b/csharp/ql/lib/semmle/code/csharp/controlflow/internal/PreSsa.qll
@@ -12,9 +12,9 @@ module PreSsa {
   private import codeql.ssa.Ssa as SsaImplCommon
 
   private predicate definitionAt(
-    AssignableDefinition def, SsaInput::BasicBlock bb, int i, SsaInput::SourceVariable v
+    AssignableDefinition def, PreBasicBlocks::PreBasicBlock bb, int i, SsaInput::SourceVariable v
   ) {
-    bb.getElement(i) = def.getExpr() and
+    bb.getNode(i) = def.getExpr() and
     v = def.getTarget() and
     // In cases like `(x, x) = (0, 1)`, we discard the first (dead) definition of `x`
     not exists(TupleAssignmentDefinition first, TupleAssignmentDefinition second | first = def |
@@ -30,7 +30,9 @@ module PreSsa {
     )
   }
 
-  predicate implicitEntryDef(Callable c, SsaInput::BasicBlock bb, SsaInput::SourceVariable v) {
+  predicate implicitEntryDef(
+    Callable c, PreBasicBlocks::PreBasicBlock bb, SsaInput::SourceVariable v
+  ) {
     c = v.getACallable() and
     scopeFirst(c, bb) and
     (
@@ -79,19 +81,11 @@ module PreSsa {
     }
   }
 
-  module SsaInput implements SsaImplCommon::InputSig<Location> {
-    class BasicBlock extends PreBasicBlocks::PreBasicBlock {
-      ControlFlowNode getNode(int i) { result = this.getElement(i) }
-    }
+  module SsaInput implements SsaImplCommon::InputSig<Location, PreBasicBlocks::PreBasicBlock> {
+    private import semmle.code.csharp.Caching
 
-    class ControlFlowNode = ControlFlowElement;
-
-    BasicBlock getImmediateBasicBlockDominator(BasicBlock bb) { result.immediatelyDominates(bb) }
-
-    BasicBlock getABasicBlockSuccessor(BasicBlock bb) { result = bb.getASuccessor() }
-
-    private class ExitBasicBlock extends BasicBlock {
-      ExitBasicBlock() { scopeLast(_, this.getLastElement(), _) }
+    private class ExitBasicBlock extends PreBasicBlocks::PreBasicBlock {
+      ExitBasicBlock() { scopeLast(_, this.getLastNode(), _) }
     }
 
     pragma[noinline]
@@ -129,7 +123,10 @@ module PreSsa {
       Callable getACallable() { result = c }
     }
 
-    predicate variableWrite(BasicBlock bb, int i, SourceVariable v, boolean certain) {
+    predicate variableWrite(
+      PreBasicBlocks::PreBasicBlock bb, int i, SourceVariable v, boolean certain
+    ) {
+      Stages::ControlFlowStage::forceCachingInSameStage() and
       exists(AssignableDefinition def |
         definitionAt(def, bb, i, v) and
         if def.getTargetAccess().isRefArgument() then certain = false else certain = true
@@ -140,9 +137,11 @@ module PreSsa {
       certain = true
     }
 
-    predicate variableRead(BasicBlock bb, int i, SourceVariable v, boolean certain) {
+    predicate variableRead(
+      PreBasicBlocks::PreBasicBlock bb, int i, SourceVariable v, boolean certain
+    ) {
       exists(AssignableRead read |
-        read = bb.getElement(i) and
+        read = bb.getNode(i) and
         read.getTarget() = v and
         certain = true
       )
@@ -157,27 +156,27 @@ module PreSsa {
     }
   }
 
-  private module SsaImpl = SsaImplCommon::Make<Location, SsaInput>;
+  private module SsaImpl = SsaImplCommon::Make<Location, PreBasicBlocks::PreCfg, SsaInput>;
 
   class Definition extends SsaImpl::Definition {
     final AssignableRead getARead() {
-      exists(SsaInput::BasicBlock bb, int i |
+      exists(PreBasicBlocks::PreBasicBlock bb, int i |
         SsaImpl::ssaDefReachesRead(_, this, bb, i) and
-        result = bb.getElement(i)
+        result = bb.getNode(i)
       )
     }
 
     final AssignableDefinition getDefinition() {
-      exists(SsaInput::BasicBlock bb, int i, SsaInput::SourceVariable v |
+      exists(PreBasicBlocks::PreBasicBlock bb, int i, SsaInput::SourceVariable v |
         this.definesAt(v, bb, i) and
         definitionAt(result, bb, i, v)
       )
     }
 
     final AssignableRead getAFirstRead() {
-      exists(SsaInput::BasicBlock bb, int i |
+      exists(PreBasicBlocks::PreBasicBlock bb, int i |
         SsaImpl::firstUse(this, bb, i, true) and
-        result = bb.getElement(i)
+        result = bb.getNode(i)
       )
     }
 
@@ -191,14 +190,14 @@ module PreSsa {
       not result instanceof PhiNode
     }
 
-    final predicate isLiveAtEndOfBlock(SsaInput::BasicBlock bb) {
+    final predicate isLiveAtEndOfBlock(PreBasicBlocks::PreBasicBlock bb) {
       SsaImpl::ssaDefReachesEndOfBlock(bb, this, _)
     }
 
     override Location getLocation() {
       result = this.getDefinition().getLocation()
       or
-      exists(Callable c, SsaInput::BasicBlock bb, SsaInput::SourceVariable v |
+      exists(Callable c, PreBasicBlocks::PreBasicBlock bb, SsaInput::SourceVariable v |
         this.definesAt(v, bb, -1) and
         implicitEntryDef(c, bb, v) and
         result = c.getLocation()
@@ -213,10 +212,10 @@ module PreSsa {
   }
 
   predicate adjacentReadPairSameVar(AssignableRead read1, AssignableRead read2) {
-    exists(SsaInput::BasicBlock bb1, int i1, SsaInput::BasicBlock bb2, int i2 |
-      read1 = bb1.getElement(i1) and
+    exists(PreBasicBlocks::PreBasicBlock bb1, int i1, PreBasicBlocks::PreBasicBlock bb2, int i2 |
+      read1 = bb1.getNode(i1) and
       SsaImpl::adjacentUseUse(bb1, i1, bb2, i2, _, true) and
-      read2 = bb2.getElement(i2)
+      read2 = bb2.getNode(i2)
     )
   }
 }
diff --git a/csharp/ql/lib/semmle/code/csharp/controlflow/internal/Splitting.qll b/csharp/ql/lib/semmle/code/csharp/controlflow/internal/Splitting.qll
index b6efdfcf1ea..63d2c181da4 100644
--- a/csharp/ql/lib/semmle/code/csharp/controlflow/internal/Splitting.qll
+++ b/csharp/ql/lib/semmle/code/csharp/controlflow/internal/Splitting.qll
@@ -24,30 +24,12 @@ private module Cached {
   cached
   newtype TSplitKind =
     TInitializerSplitKind() or
-    TConditionalCompletionSplitKind() or
-    TAssertionSplitKind() or
-    TFinallySplitKind(int nestLevel) { nestLevel = any(Statements::TryStmtTree t).nestLevel() } or
-    TExceptionHandlerSplitKind() or
-    TBooleanSplitKind(BooleanSplitting::BooleanSplitSubKind kind) { kind.startsSplit(_) } or
-    TLoopSplitKind(LoopSplitting::AnalyzableLoopStmt loop)
+    TConditionalCompletionSplitKind()
 
   cached
   newtype TSplit =
     TInitializerSplit(Constructor c) { InitializerSplitting::constructorInitializes(c, _) } or
-    TConditionalCompletionSplit(ConditionalCompletion c) or
-    TAssertionSplit(AssertionSplitting::Assertion a, int i, boolean success) {
-      exists(a.getExpr(i)) and
-      success in [false, true]
-    } or
-    TFinallySplit(FinallySplitting::FinallySplitType type, int nestLevel) {
-      nestLevel = any(Statements::TryStmtTree t).nestLevel()
-    } or
-    TExceptionHandlerSplit(ExceptionClass ec) or
-    TBooleanSplit(BooleanSplitting::BooleanSplitSubKind kind, boolean branch) {
-      kind.startsSplit(_) and
-      branch in [false, true]
-    } or
-    TLoopSplit(LoopSplitting::AnalyzableLoopStmt loop)
+    TConditionalCompletionSplit(ConditionalCompletion c)
 }
 
 import Cached
@@ -333,990 +315,3 @@ module ConditionalCompletionSplitting {
 
   int getNextListOrder() { result = InitializerSplitting::getNextListOrder() + 1 }
 }
-
-module AssertionSplitting {
-  import semmle.code.csharp.commons.Assertions
-  private import semmle.code.csharp.ExprOrStmtParent
-
-  private AstNode getAnAssertionDescendant(Assertion a) {
-    result = a
-    or
-    result = getAnAssertionDescendant(a).getAChild()
-  }
-
-  /**
-   * A split for assertions. For example, in
-   *
-   * ```csharp
-   * void M(int i)
-   * {
-   *     Debug.Assert(i >= 0);
-   *     System.Console.WriteLine("i is positive")
-   * }
-   * ```
-   *
-   * we record whether `i >= 0` evaluates to `true` or `false`, and restrict the
-   * edges out of the assertion accordingly.
-   */
-  class AssertionSplit extends Split, TAssertionSplit {
-    Assertion a;
-    boolean success;
-    int i;
-
-    AssertionSplit() { this = TAssertionSplit(a, i, success) }
-
-    /** Gets the assertion. */
-    Assertion getAssertion() { result = a }
-
-    /** Holds if this split represents a successful assertion. */
-    predicate isSuccess() { success = true }
-
-    override string toString() {
-      success = true and result = "assertion success"
-      or
-      success = false and result = "assertion failure"
-    }
-  }
-
-  private class AssertionSplitKind extends SplitKind, TAssertionSplitKind {
-    override int getListOrder() { result = ConditionalCompletionSplitting::getNextListOrder() }
-
-    override predicate isEnabled(AstNode cfe) { this.appliesTo(cfe) }
-
-    override string toString() { result = "Assertion" }
-  }
-
-  int getNextListOrder() { result = ConditionalCompletionSplitting::getNextListOrder() + 1 }
-
-  private class AssertionSplitImpl extends SplitImpl instanceof AssertionSplit {
-    Assertion a;
-    boolean success;
-    int i;
-
-    AssertionSplitImpl() { this = TAssertionSplit(a, i, success) }
-
-    override AssertionSplitKind getKind() { any() }
-
-    override predicate hasEntry(AstNode pred, AstNode succ, Completion c) {
-      exists(AssertMethod m |
-        last(a.getExpr(i), pred, c) and
-        succ(pred, succ, c) and
-        m = a.getAssertMethod() and
-        // The assertion only succeeds when all asserted arguments succeeded, so
-        // we only enter a "success" state after the last argument has succeeded.
-        //
-        // The split is only entered if we are not already in a "failing" state
-        // for one of the previous arguments, which ensures that the "success"
-        // state is only entered when all arguments succeed. This also means
-        // that if multiple arguments fail, then the first failing argument
-        // will determine the exception being thrown by the assertion.
-        if success = true then i = max(int j | exists(a.getExpr(j))) else any()
-      |
-        exists(boolean b | i = m.(BooleanAssertMethod).getAnAssertionIndex(b) |
-          c instanceof TrueCompletion and success = b
-          or
-          c instanceof FalseCompletion and success = b.booleanNot()
-        )
-        or
-        exists(boolean b | i = m.(NullnessAssertMethod).getAnAssertionIndex(b) |
-          c.(NullnessCompletion).isNull() and success = b
-          or
-          c.(NullnessCompletion).isNonNull() and success = b.booleanNot()
-        )
-      )
-    }
-
-    override predicate hasEntryScope(CfgScope scope, AstNode first) { none() }
-
-    override predicate hasExit(AstNode pred, AstNode succ, Completion c) {
-      this.appliesTo(pred) and
-      pred = a and
-      succ(pred, succ, c) and
-      (
-        success = true and
-        c instanceof NormalCompletion
-        or
-        success = false and
-        c = assertionCompletion(a, i)
-      )
-    }
-
-    override predicate hasExitScope(CfgScope scope, AstNode last, Completion c) {
-      this.appliesTo(last) and
-      last = a and
-      scopeLast(scope, last, c) and
-      (
-        success = true and
-        c instanceof NormalCompletion
-        or
-        success = false and
-        c = assertionCompletion(a, i)
-      )
-    }
-
-    override predicate hasSuccessor(AstNode pred, AstNode succ, Completion c) {
-      this.appliesSucc(pred, succ, c) and
-      succ = getAnAssertionDescendant(a)
-    }
-  }
-}
-
-module FinallySplitting {
-  /**
-   * The type of a split `finally` node.
-   *
-   * The type represents one of the possible ways of entering a `finally`
-   * block. For example, if a `try` statement ends with a `return` statement,
-   * then the `finally` block must end with a `return` as well (provided that
-   * the `finally` block exits normally).
-   */
-  class FinallySplitType extends Cfg::SuccessorType {
-    FinallySplitType() { not this instanceof Cfg::SuccessorTypes::ConditionalSuccessor }
-
-    /** Holds if this split type matches entry into a `finally` block with completion `c`. */
-    predicate isSplitForEntryCompletion(Completion c) {
-      if c instanceof NormalCompletion
-      then
-        // If the entry into the `finally` block completes with any normal completion,
-        // it simply means normal execution after the `finally` block
-        this instanceof Cfg::SuccessorTypes::NormalSuccessor
-      else this = c.getAMatchingSuccessorType()
-    }
-  }
-
-  /** A control flow element that belongs to a `finally` block. */
-  private class FinallyAstNode extends AstNode {
-    private Statements::TryStmtTree try;
-
-    FinallyAstNode() { this = try.getAFinallyDescendant() }
-
-    /** Gets the immediate `try` block that this node belongs to. */
-    Statements::TryStmtTree getTryStmt() { result = try }
-
-    /** Holds if this node is the entry node in the `finally` block it belongs to. */
-    predicate isEntryNode() { first(try.(TryStmt).getFinally(), this) }
-  }
-
-  /**
-   * A split for elements belonging to a `finally` block, which determines how to
-   * continue execution after leaving the `finally` block. For example, in
-   *
-   * ```csharp
-   * try
-   * {
-   *     if (!M())
-   *         throw new Exception();
-   * }
-   * finally
-   * {
-   *     Log.Write("M failed");
-   * }
-   * ```
-   *
-   * all control flow nodes in the `finally` block have two splits: one representing
-   * normal execution of the `try` block (when `M()` returns `true`), and one
-   * representing exceptional execution of the `try` block (when `M()` returns `false`).
-   */
-  class FinallySplit extends Split, TFinallySplit {
-    private FinallySplitType type;
-    private int nestLevel;
-
-    FinallySplit() { this = TFinallySplit(type, nestLevel) }
-
-    /**
-     * Gets the type of this `finally` split, that is, how to continue execution after the
-     * `finally` block.
-     */
-    FinallySplitType getType() { result = type }
-
-    /** Gets the `finally` nesting level. */
-    int getNestLevel() { result = nestLevel }
-
-    override string toString() {
-      if type instanceof Cfg::SuccessorTypes::NormalSuccessor
-      then result = ""
-      else
-        if nestLevel > 0
-        then result = "finally(" + nestLevel + "): " + type.toString()
-        else result = "finally: " + type.toString()
-    }
-  }
-
-  private int getListOrder(FinallySplitKind kind) {
-    result = AssertionSplitting::getNextListOrder() + kind.getNestLevel()
-  }
-
-  int getNextListOrder() {
-    result = max([getListOrder(_) + 1, AssertionSplitting::getNextListOrder()])
-  }
-
-  private class FinallySplitKind extends SplitKind, TFinallySplitKind {
-    private int nestLevel;
-
-    FinallySplitKind() { this = TFinallySplitKind(nestLevel) }
-
-    /** Gets the `finally` nesting level. */
-    int getNestLevel() { result = nestLevel }
-
-    override int getListOrder() { result = getListOrder(this) }
-
-    override string toString() { result = "Finally (" + nestLevel + ")" }
-  }
-
-  pragma[nomagic]
-  private predicate hasEntry0(AstNode pred, FinallyAstNode succ, int nestLevel, Completion c) {
-    succ.isEntryNode() and
-    nestLevel = succ.getTryStmt().nestLevel() and
-    succ(pred, succ, c)
-  }
-
-  private class FinallySplitImpl extends SplitImpl instanceof FinallySplit {
-    override FinallySplitKind getKind() { result.getNestLevel() = super.getNestLevel() }
-
-    override predicate hasEntry(AstNode pred, AstNode succ, Completion c) {
-      hasEntry0(pred, succ, super.getNestLevel(), c) and
-      super.getType().isSplitForEntryCompletion(c)
-    }
-
-    override predicate hasEntryScope(CfgScope scope, AstNode first) { none() }
-
-    /**
-     * Holds if this split applies to control flow element `pred`, where `pred`
-     * is a valid predecessor.
-     */
-    private predicate appliesToPredecessor(AstNode pred) {
-      this.appliesTo(pred) and
-      (succ(pred, _, _) or scopeLast(_, pred, _))
-    }
-
-    pragma[noinline]
-    private predicate exit0(AstNode pred, Statements::TryStmtTree try, int nestLevel, Completion c) {
-      this.appliesToPredecessor(pred) and
-      nestLevel = try.nestLevel() and
-      last(try, pred, c)
-    }
-
-    /**
-     * Holds if `pred` may exit this split with completion `c`. The Boolean
-     * `inherited` indicates whether `c` is an inherited completion from a `try`/
-     * `catch` block.
-     */
-    private predicate exit(AstNode pred, Completion c, boolean inherited) {
-      exists(TryStmt try, FinallySplitType type |
-        this.exit0(pred, try, super.getNestLevel(), c) and
-        type = super.getType()
-      |
-        if last(try.getFinally(), pred, c)
-        then
-          // Finally block can itself exit with completion `c`: either `c` must
-          // match this split, `c` must be an abnormal completion, or this split
-          // does not require another completion to be recovered
-          inherited = false and
-          (
-            type = c.getAMatchingSuccessorType()
-            or
-            not c instanceof NormalCompletion
-            or
-            type instanceof Cfg::SuccessorTypes::NormalSuccessor
-          )
-        else (
-          // Finally block can exit with completion `c` inherited from try/catch
-          // block: must match this split
-          inherited = true and
-          type = c.getAMatchingSuccessorType() and
-          not type instanceof Cfg::SuccessorTypes::NormalSuccessor
-        )
-      )
-      or
-      // If this split is normal, and an outer split can exit based on an inherited
-      // completion, we need to exit this split as well. For example, in
-      //
-      // ```csharp
-      // bool done;
-      // try
-      // {
-      //     if (b1) throw new ExceptionA();
-      // }
-      // finally
-      // {
-      //     try
-      //     {
-      //         if (b2) throw new ExceptionB();
-      //     }
-      //     finally
-      //     {
-      //         done = true;
-      //     }
-      // }
-      // ```
-      //
-      // if the outer split for `done = true` is `ExceptionA` and the inner split
-      // is "normal" (corresponding to `b1 = true` and `b2 = false`), then the inner
-      // split must be able to exit with an `ExceptionA` completion.
-      this.appliesToPredecessor(pred) and
-      exists(FinallySplit outer |
-        outer.getNestLevel() = super.getNestLevel() - 1 and
-        outer.(FinallySplitImpl).exit(pred, c, inherited) and
-        super.getType() instanceof Cfg::SuccessorTypes::NormalSuccessor and
-        inherited = true
-      )
-    }
-
-    override predicate hasExit(AstNode pred, AstNode succ, Completion c) {
-      succ(pred, succ, c) and
-      (
-        this.exit(pred, c, _)
-        or
-        this.exit(pred, c.(NestedBreakCompletion).getAnInnerCompatibleCompletion(), _)
-      )
-    }
-
-    override predicate hasExitScope(CfgScope scope, AstNode last, Completion c) {
-      scopeLast(scope, last, c) and
-      (
-        this.exit(last, c, _)
-        or
-        this.exit(last, c.(NestedBreakCompletion).getAnInnerCompatibleCompletion(), _)
-      )
-    }
-
-    override predicate hasSuccessor(AstNode pred, AstNode succ, Completion c) {
-      this.appliesSucc(pred, succ, c) and
-      succ =
-        any(FinallyAstNode fcfe |
-          if fcfe.isEntryNode()
-          then
-            // entering a nested `finally` block
-            fcfe.getTryStmt().nestLevel() > super.getNestLevel()
-          else
-            // staying in the same (possibly nested) `finally` block as `pred`
-            fcfe.getTryStmt().nestLevel() >= super.getNestLevel()
-        )
-    }
-  }
-}
-
-module ExceptionHandlerSplitting {
-  private newtype TMatch =
-    TAlways() or
-    TMaybe() or
-    TNever()
-
-  /**
-   * A split for elements belonging to a `catch` clause, which determines the type of
-   * exception to handle. For example, in
-   *
-   * ```csharp
-   * try
-   * {
-   *     if (M() > 0)
-   *         throw new ArgumentException();
-   *     else if (M() < 0)
-   *         throw new ArithmeticException("negative");
-   *     else
-   *         return;
-   * }
-   * catch (ArgumentException e)
-   * {
-   *     Log.Write("M() positive");
-   * }
-   * catch (ArithmeticException e) when (e.Message != null)
-   * {
-   *     Log.Write($"M() {e.Message}");
-   * }
-   * ```
-   *
-   * all control flow nodes in
-   * ```csharp
-   * catch (ArgumentException e)
-   * ```
-   * and
-   * ```csharp
-   * catch (ArithmeticException e) when (e.Message != null)
-   * ```
-   * have two splits: one representing the `try` block throwing an `ArgumentException`,
-   * and one representing the `try` block throwing an `ArithmeticException`.
-   */
-  class ExceptionHandlerSplit extends Split, TExceptionHandlerSplit {
-    private ExceptionClass ec;
-
-    ExceptionHandlerSplit() { this = TExceptionHandlerSplit(ec) }
-
-    /** Gets the exception type that this split represents. */
-    ExceptionClass getExceptionClass() { result = ec }
-
-    override string toString() { result = "exception: " + ec.toString() }
-  }
-
-  private class ExceptionHandlerSplitKind extends SplitKind, TExceptionHandlerSplitKind {
-    override int getListOrder() { result = FinallySplitting::getNextListOrder() }
-
-    override string toString() { result = "ExceptionHandler" }
-  }
-
-  int getNextListOrder() { result = FinallySplitting::getNextListOrder() + 1 }
-
-  private class ExceptionHandlerSplitImpl extends SplitImpl instanceof ExceptionHandlerSplit {
-    override ExceptionHandlerSplitKind getKind() { any() }
-
-    override predicate hasEntry(AstNode pred, AstNode succ, Completion c) {
-      // Entry into first catch clause
-      exists(Statements::TryStmtTree ts |
-        super.getExceptionClass() = ts.getAThrownException(pred, c)
-      |
-        succ(pred, succ, c) and
-        succ = ts.(TryStmt).getCatchClause(0).(SpecificCatchClause)
-      )
-    }
-
-    override predicate hasEntryScope(CfgScope scope, AstNode first) { none() }
-
-    /**
-     * Holds if this split applies to catch clause `scc`. The parameter `match`
-     * indicates whether the catch clause `scc` may match the exception type of
-     * this split.
-     */
-    private predicate appliesToCatchClause(SpecificCatchClause scc, TMatch match) {
-      exists(Statements::TryStmtTree ts, ExceptionClass ec |
-        ec = super.getExceptionClass() and
-        ec = ts.getAThrownException(_, _) and
-        scc = ts.(TryStmt).getACatchClause()
-      |
-        if scc.getCaughtExceptionType() = ec.getABaseType*()
-        then match = TAlways()
-        else
-          if scc.getCaughtExceptionType() = ec.getASubType+()
-          then match = TMaybe()
-          else match = TNever()
-      )
-    }
-
-    /**
-     * Holds if this split applies to control flow element `pred`, where `pred`
-     * is a valid predecessor with completion `c`.
-     */
-    private predicate appliesToPredecessor(AstNode pred, Completion c) {
-      this.appliesTo(pred) and
-      (succ(pred, _, c) or scopeLast(_, pred, c)) and
-      (
-        pred instanceof SpecificCatchClause
-        implies
-        pred =
-          any(SpecificCatchClause scc |
-            if c instanceof MatchingCompletion
-            then
-              exists(TMatch match | this.appliesToCatchClause(scc, match) |
-                c =
-                  any(MatchingCompletion mc |
-                    if mc.isMatch() then match != TNever() else match != TAlways()
-                  )
-              )
-            else (
-              (scc.isLast() and c instanceof ThrowCompletion)
-              implies
-              exists(TMatch match | this.appliesToCatchClause(scc, match) | match != TAlways())
-            )
-          )
-      )
-    }
-
-    /**
-     * Holds if this split applies to `pred`, and `pred` may exit this split
-     * with throw completion `c`, because it belongs to the last `catch` clause
-     * in a `try` statement.
-     */
-    private predicate hasLastExit(AstNode pred, ThrowCompletion c) {
-      this.appliesToPredecessor(pred, c) and
-      exists(TryStmt ts, SpecificCatchClause scc, int last |
-        last(ts.getCatchClause(last), pred, c)
-      |
-        ts.getCatchClause(last) = scc and
-        scc.isLast() and
-        c.getExceptionClass() = super.getExceptionClass()
-      )
-    }
-
-    override predicate hasExit(AstNode pred, AstNode succ, Completion c) {
-      this.appliesToPredecessor(pred, c) and
-      succ(pred, succ, c) and
-      (
-        // Exit out to `catch` clause block
-        first(any(SpecificCatchClause scc).getBlock(), succ)
-        or
-        // Exit out to a general `catch` clause
-        succ instanceof GeneralCatchClause
-        or
-        // Exit out from last `catch` clause (no catch clauses match)
-        this.hasLastExit(pred, c)
-      )
-    }
-
-    override predicate hasExitScope(CfgScope scope, AstNode last, Completion c) {
-      // Exit out from last `catch` clause (no catch clauses match)
-      this.hasLastExit(last, c) and
-      scopeLast(scope, last, c)
-    }
-
-    override predicate hasSuccessor(AstNode pred, AstNode succ, Completion c) {
-      this.appliesToPredecessor(pred, c) and
-      this.appliesSucc(pred, succ, c) and
-      not first(any(SpecificCatchClause scc).getBlock(), succ) and
-      not succ instanceof GeneralCatchClause and
-      not exists(TryStmt ts, SpecificCatchClause scc, int last |
-        last(ts.getCatchClause(last), pred, c)
-      |
-        ts.getCatchClause(last) = scc and
-        scc.isLast()
-      )
-    }
-  }
-}
-
-module BooleanSplitting {
-  private import semmle.code.csharp.controlflow.internal.PreBasicBlocks
-
-  /** A sub-classification of Boolean splits. */
-  abstract class BooleanSplitSubKind extends TBooleanSplitSubKind {
-    /**
-     * Holds if the branch taken by condition `cb1` should be recorded in
-     * this split, and the recorded value determines the branch taken by a
-     * later condition `cb2`, possibly inverted.
-     *
-     * For example, in
-     *
-     * ```csharp
-     * var b = GetB();
-     * if (b)
-     *     Console.WriteLine("b is true");
-     * if (!b)
-     *     Console.WriteLine("b is false");
-     * ```
-     *
-     * the branch taken in the condition on line 2 can be recorded, and the
-     * recorded value will determine the branch taken in the condition on line 4.
-     */
-    abstract predicate correlatesConditions(ConditionBlock cb1, ConditionBlock cb2, boolean inverted);
-
-    /** Holds if control flow element `cfe` starts a split of this kind. */
-    predicate startsSplit(AstNode cfe) {
-      this.correlatesConditions(any(ConditionBlock cb | cb.getLastElement() = cfe), _, _)
-    }
-
-    /**
-     * Holds if basic block `bb` can reach a condition correlated with a
-     * split of this kind.
-     */
-    abstract predicate canReachCorrelatedCondition(PreBasicBlock bb);
-
-    /** Gets the callable that this Boolean split kind belongs to. */
-    abstract Callable getEnclosingCallable();
-
-    /** Gets a textual representation of this Boolean split kind. */
-    abstract string toString();
-
-    /** Gets the location of this Boolean split kind. */
-    abstract Location getLocation();
-  }
-
-  /**
-   * A Boolean split that records the value of a Boolean SSA variable.
-   *
-   * For example, in
-   *
-   * ```csharp
-   * var b = GetB();
-   * if (b)
-   *     Console.WriteLine("b is true");
-   * if (!b)
-   *     Console.WriteLine("b is false");
-   * ```
-   *
-   * there is a Boolean split on the SSA variable for `b` at line 1.
-   */
-  class SsaBooleanSplitSubKind extends BooleanSplitSubKind, TSsaBooleanSplitSubKind {
-    private PreSsa::Definition def;
-
-    SsaBooleanSplitSubKind() { this = TSsaBooleanSplitSubKind(def) }
-
-    /**
-     * Holds if condition `cb` is a read of the SSA variable in this split.
-     */
-    private predicate defCondition(ConditionBlock cb) { cb.getLastElement() = def.getARead() }
-
-    /**
-     * Holds if condition `cb` is a read of the SSA variable in this split,
-     * and `cb` can be reached from `read` without passing through another
-     * condition that reads the same SSA variable.
-     */
-    private predicate defConditionReachableFromRead(ConditionBlock cb, AssignableRead read) {
-      this.defCondition(cb) and
-      read = cb.getLastElement()
-      or
-      exists(AssignableRead mid | this.defConditionReachableFromRead(cb, mid) |
-        PreSsa::adjacentReadPairSameVar(read, mid) and
-        not this.defCondition(read)
-      )
-    }
-
-    /**
-     * Holds if condition `cb` is a read of the SSA variable in this split,
-     * and `cb` can be reached from the SSA definition without passing through
-     * another condition that reads the same SSA variable.
-     */
-    private predicate firstDefCondition(ConditionBlock cb) {
-      this.defConditionReachableFromRead(cb, def.getAFirstRead())
-    }
-
-    override predicate correlatesConditions(ConditionBlock cb1, ConditionBlock cb2, boolean inverted) {
-      this.firstDefCondition(cb1) and
-      exists(AssignableRead read1, AssignableRead read2 |
-        read1 = cb1.getLastElement() and
-        PreSsa::adjacentReadPairSameVar+(read1, read2) and
-        read2 = cb2.getLastElement() and
-        inverted = false
-      )
-    }
-
-    override predicate canReachCorrelatedCondition(PreBasicBlock bb) {
-      this.correlatesConditions(_, bb, _) and
-      not def.getBasicBlock() = bb
-      or
-      exists(PreBasicBlock mid | this.canReachCorrelatedCondition(mid) |
-        bb = mid.getAPredecessor() and
-        not def.getBasicBlock() = bb
-      )
-    }
-
-    override Callable getEnclosingCallable() { result = def.getBasicBlock().getEnclosingCallable() }
-
-    override string toString() { result = def.getSourceVariable().toString() }
-
-    override Location getLocation() { result = def.getLocation() }
-  }
-
-  /**
-   * A split for elements that can reach a condition where this split determines
-   * the Boolean value that the condition evaluates to. For example, in
-   *
-   * ```csharp
-   * if (b)
-   *     Console.WriteLine("b is true");
-   * if (!b)
-   *     Console.WriteLine("b is false");
-   * ```
-   *
-   * all control flow nodes on line 2 and line 3 have two splits: one representing
-   * that the condition on line 1 took the `true` branch, and one representing that
-   * the condition on line 1 took the `false` branch.
-   */
-  class BooleanSplit extends Split, TBooleanSplit {
-    private BooleanSplitSubKind kind;
-    private boolean branch;
-
-    BooleanSplit() { this = TBooleanSplit(kind, branch) }
-
-    /** Gets the kind of this Boolean split. */
-    BooleanSplitSubKind getSubKind() { result = kind }
-
-    /** Gets the branch taken in this split. */
-    boolean getBranch() { result = branch }
-
-    override string toString() {
-      exists(int line |
-        line = kind.getLocation().getStartLine() and
-        result = kind.toString() + " (line " + line + "): " + branch.toString()
-      )
-    }
-  }
-
-  private int getListOrder(BooleanSplitSubKind kind) {
-    exists(Callable c, int r | c = kind.getEnclosingCallable() |
-      result = r + ExceptionHandlerSplitting::getNextListOrder() - 1 and
-      kind =
-        rank[r](BooleanSplitSubKind kind0, Location l |
-          kind0.getEnclosingCallable() = c and
-          kind0.startsSplit(_) and
-          l = kind0.getLocation()
-        |
-          kind0 order by l.getStartLine(), l.getStartColumn(), kind0.toString()
-        )
-    )
-  }
-
-  int getNextListOrder() {
-    result = max([getListOrder(_) + 1, ExceptionHandlerSplitting::getNextListOrder()])
-  }
-
-  private class BooleanSplitKind extends SplitKind, TBooleanSplitKind {
-    private BooleanSplitSubKind kind;
-
-    BooleanSplitKind() { this = TBooleanSplitKind(kind) }
-
-    /** Gets the sub kind of this Boolean split kind. */
-    BooleanSplitSubKind getSubKind() { result = kind }
-
-    override int getListOrder() { result = getListOrder(kind) }
-
-    override string toString() { result = kind.toString() }
-  }
-
-  pragma[nomagic]
-  private predicate hasEntry0(
-    AstNode pred, AstNode succ, BooleanSplitSubKind kind, boolean b, Completion c
-  ) {
-    kind.startsSplit(pred) and
-    succ(pred, succ, c) and
-    b = c.getInnerCompletion().(BooleanCompletion).getValue()
-  }
-
-  private class BooleanSplitImpl extends SplitImpl instanceof BooleanSplit {
-    override BooleanSplitKind getKind() { result.getSubKind() = super.getSubKind() }
-
-    override predicate hasEntry(AstNode pred, AstNode succ, Completion c) {
-      hasEntry0(pred, succ, super.getSubKind(), super.getBranch(), c)
-    }
-
-    override predicate hasEntryScope(CfgScope scope, AstNode first) { none() }
-
-    private ConditionBlock getACorrelatedCondition(boolean inverted) {
-      super.getSubKind().correlatesConditions(_, result, inverted)
-    }
-
-    /**
-     * Holds if this split applies to basic block `bb`, where the the last
-     * element of `bb` can have completion `c`.
-     */
-    private predicate appliesToBlock(PreBasicBlock bb, Completion c) {
-      this.appliesTo(bb) and
-      exists(AstNode last | last = bb.getLastElement() |
-        (succ(last, _, c) or scopeLast(_, last, c)) and
-        // Respect the value recorded in this split for all correlated conditions
-        forall(boolean inverted | bb = this.getACorrelatedCondition(inverted) |
-          c.getInnerCompletion() instanceof BooleanCompletion
-          implies
-          c.getInnerCompletion().(BooleanCompletion).getValue() =
-            super.getBranch().booleanXor(inverted)
-        )
-      )
-    }
-
-    override predicate hasExit(AstNode pred, AstNode succ, Completion c) {
-      exists(PreBasicBlock bb | this.appliesToBlock(bb, c) |
-        pred = bb.getLastElement() and
-        succ(pred, succ, c) and
-        // Exit this split if we can no longer reach a correlated condition
-        not super.getSubKind().canReachCorrelatedCondition(succ)
-      )
-    }
-
-    override predicate hasExitScope(CfgScope scope, AstNode last, Completion c) {
-      exists(PreBasicBlock bb | this.appliesToBlock(bb, c) |
-        last = bb.getLastElement() and
-        scopeLast(scope, last, c)
-      )
-    }
-
-    override predicate hasSuccessor(AstNode pred, AstNode succ, Completion c) {
-      exists(PreBasicBlock bb, Completion c0 | this.appliesToBlock(bb, c0) |
-        pred = bb.getAnElement() and
-        this.appliesSucc(pred, succ, c) and
-        (
-          pred = bb.getLastElement()
-          implies
-          (
-            // We must still be able to reach a correlated condition to stay in this split
-            super.getSubKind().canReachCorrelatedCondition(succ) and
-            c = c0
-          )
-        )
-      )
-    }
-  }
-}
-
-module LoopSplitting {
-  private import semmle.code.csharp.controlflow.Guards as Guards
-  private import PreBasicBlocks
-
-  /** Holds if `ce` is guarded by a (non-)empty check, as specified by `v`. */
-  private predicate emptinessGuarded(
-    Guards::Guard g, Guards::EnumerableCollectionExpr ce,
-    Guards::AbstractValues::EmptyCollectionValue v
-  ) {
-    exists(PreBasicBlock bb | Guards::Internal::preControls(g, bb, v) |
-      PreSsa::adjacentReadPairSameVar(g, ce) and
-      bb.getAnElement() = ce
-    )
-  }
-
-  /**
-   * A loop where the body is guaranteed to be executed at least once, and hence
-   * can be unrolled in the control flow graph, or where the body is guaranteed
-   * to never be executed, and hence can be removed from the control flow graph.
-   */
-  abstract class AnalyzableLoopStmt extends LoopStmt {
-    /** Holds if the step `pred --c--> succ` should start the split. */
-    abstract predicate start(AstNode pred, AstNode succ, Completion c);
-
-    /** Holds if the step `pred --c--> succ` should stop the split. */
-    abstract predicate stop(AstNode pred, AstNode succ, Completion c);
-
-    /**
-     * Holds if any step `pred --c--> _` should be pruned from the control flow graph.
-     */
-    abstract predicate pruneLoopCondition(AstNode pred, ConditionalCompletion c);
-
-    /**
-     * Holds if the body is guaranteed to be executed at least once. If not, the
-     * body is guaranteed to never be executed.
-     */
-    abstract predicate isUnroll();
-  }
-
-  private class AnalyzableForeachStmt extends AnalyzableLoopStmt, ForeachStmt {
-    Guards::AbstractValues::EmptyCollectionValue v;
-
-    AnalyzableForeachStmt() {
-      /*
-       * We use `unique` to avoid degenerate cases like
-       * ```csharp
-       * if (xs.Length == 0)
-       *     return;
-       * if (xs.Length > 0)
-       *     return;
-       * foreach (var x in xs)
-       *     ....
-       * ```
-       * where the iterator expression `xs` is guarded by both an emptiness check
-       * and a non-emptiness check.
-       */
-
-      v =
-        unique(Guards::AbstractValues::EmptyCollectionValue v0 |
-          emptinessGuarded(_, this.getIterableExpr(), v0)
-          or
-          this.getIterableExpr() = v0.getAnExpr()
-        |
-          v0
-        )
-    }
-
-    override predicate start(AstNode pred, AstNode succ, Completion c) {
-      last(this.getIterableExpr(), pred, c) and
-      succ = this
-    }
-
-    override predicate stop(AstNode pred, AstNode succ, Completion c) {
-      pred = this and
-      succ(pred, succ, c)
-    }
-
-    override predicate pruneLoopCondition(AstNode pred, ConditionalCompletion c) {
-      pred = this and
-      c = any(EmptinessCompletion ec | if v.isEmpty() then not ec.isEmpty() else ec.isEmpty())
-    }
-
-    override predicate isUnroll() { v.isNonEmpty() }
-  }
-
-  /**
-   * A split for loops where the body is guaranteed to be executed at least once, or
-   * guaranteed to never be executed. For example, in
-   *
-   * ```csharp
-   * void M(string[] args)
-   * {
-   *     if (args.Length == 0)
-   *         return;
-   *     foreach (var arg in args)
-   *         System.Console.WriteLine(args);
-   * }
-   * ```
-   *
-   * the `foreach` loop is guaranteed to be executed at least once, as a result of the
-   * `args.Length == 0` check.
-   */
-  class LoopSplit extends Split, TLoopSplit {
-    AnalyzableLoopStmt loop;
-
-    LoopSplit() { this = TLoopSplit(loop) }
-
-    override string toString() {
-      if loop.isUnroll()
-      then result = "unroll (line " + loop.getLocation().getStartLine() + ")"
-      else result = "skip (line " + loop.getLocation().getStartLine() + ")"
-    }
-  }
-
-  pragma[noinline]
-  private Callable enclosingCallable(AnalyzableLoopStmt loop) {
-    result = loop.getEnclosingCallable()
-  }
-
-  private int getListOrder(AnalyzableLoopStmt loop) {
-    exists(Callable c, int r | c = enclosingCallable(loop) |
-      result = r + BooleanSplitting::getNextListOrder() - 1 and
-      loop =
-        rank[r](AnalyzableLoopStmt loop0, Location l |
-          enclosingCallable(loop0) = c and
-          l = loop0.getLocation()
-        |
-          loop0 order by l.getStartLine(), l.getStartColumn()
-        )
-    )
-  }
-
-  int getNextListOrder() {
-    result = max([getListOrder(_) + 1, BooleanSplitting::getNextListOrder()])
-  }
-
-  private class LoopSplitKind extends SplitKind, TLoopSplitKind {
-    private AnalyzableLoopStmt loop;
-
-    LoopSplitKind() { this = TLoopSplitKind(loop) }
-
-    override int getListOrder() { result = getListOrder(loop) }
-
-    override string toString() { result = "Unroll" }
-  }
-
-  private class LoopUnrollingSplitImpl extends SplitImpl instanceof LoopSplit {
-    AnalyzableLoopStmt loop;
-
-    LoopUnrollingSplitImpl() { this = TLoopSplit(loop) }
-
-    override LoopSplitKind getKind() { result = TLoopSplitKind(loop) }
-
-    override predicate hasEntry(AstNode pred, AstNode succ, Completion c) {
-      loop.start(pred, succ, c)
-    }
-
-    override predicate hasEntryScope(CfgScope scope, AstNode first) { none() }
-
-    /**
-     * Holds if this split applies to control flow element `pred`, where `pred`
-     * is a valid predecessor.
-     */
-    private predicate appliesToPredecessor(AstNode pred, Completion c) {
-      this.appliesTo(pred) and
-      (succ(pred, _, c) or scopeLast(_, pred, c)) and
-      not loop.pruneLoopCondition(pred, c)
-    }
-
-    override predicate hasExit(AstNode pred, AstNode succ, Completion c) {
-      this.appliesToPredecessor(pred, c) and
-      loop.stop(pred, succ, c)
-    }
-
-    override predicate hasExitScope(CfgScope scope, AstNode last, Completion c) {
-      this.appliesToPredecessor(last, c) and
-      scopeLast(scope, last, c)
-    }
-
-    override predicate hasSuccessor(AstNode pred, AstNode succ, Completion c) {
-      this.appliesToPredecessor(pred, c) and
-      this.appliesSucc(pred, succ, c) and
-      not loop.stop(pred, succ, c)
-    }
-  }
-}
diff --git a/csharp/ql/lib/semmle/code/csharp/controlflow/internal/SuccessorType.qll b/csharp/ql/lib/semmle/code/csharp/controlflow/internal/SuccessorType.qll
index d6ea2161bbb..c0dae26b30e 100644
--- a/csharp/ql/lib/semmle/code/csharp/controlflow/internal/SuccessorType.qll
+++ b/csharp/ql/lib/semmle/code/csharp/controlflow/internal/SuccessorType.qll
@@ -4,329 +4,4 @@
  * Provides different types of control flow successor types.
  */
 
-import csharp
-private import Completion
-private import semmle.code.csharp.Caching
-
-cached
-private newtype TSuccessorType =
-  TSuccessorSuccessor() { Stages::ControlFlowStage::forceCachingInSameStage() } or
-  TBooleanSuccessor(boolean b) { b = true or b = false } or
-  TNullnessSuccessor(boolean isNull) { isNull = true or isNull = false } or
-  TMatchingSuccessor(boolean isMatch) { isMatch = true or isMatch = false } or
-  TEmptinessSuccessor(boolean isEmpty) { isEmpty = true or isEmpty = false } or
-  TReturnSuccessor() or
-  TBreakSuccessor() or
-  TContinueSuccessor() or
-  TGotoSuccessor(string label) { label = any(GotoStmt gs).getLabel() } or
-  TExceptionSuccessor(ExceptionClass ec) { exists(ThrowCompletion c | c.getExceptionClass() = ec) } or
-  TExitSuccessor()
-
-/** The type of a control flow successor. */
-class SuccessorType extends TSuccessorType {
-  /** Gets a textual representation of successor type. */
-  string toString() { none() }
-}
-
-/** Provides different types of control flow successor types. */
-module SuccessorTypes {
-  /** A normal control flow successor. */
-  class NormalSuccessor extends SuccessorType, TSuccessorSuccessor {
-    override string toString() { result = "successor" }
-  }
-
-  /**
-   * A conditional control flow successor. Either a Boolean successor (`BooleanSuccessor`),
-   * a nullness successor (`NullnessSuccessor`), a matching successor (`MatchingSuccessor`),
-   * or an emptiness successor (`EmptinessSuccessor`).
-   */
-  abstract class ConditionalSuccessor extends SuccessorType {
-    /** Gets the Boolean value of this successor. */
-    abstract boolean getValue();
-  }
-
-  /**
-   * A Boolean control flow successor.
-   *
-   * For example, this program fragment:
-   *
-   * ```csharp
-   * if (x < 0)
-   *     return 0;
-   * else
-   *     return 1;
-   * ```
-   *
-   * has a control flow graph containing Boolean successors:
-   *
-   * ```
-   *        if
-   *        |
-   *      x < 0
-   *       / \
-   *      /   \
-   *     /     \
-   *  true    false
-   *    |        \
-   * return 0   return 1
-   * ```
-   */
-  class BooleanSuccessor extends ConditionalSuccessor, TBooleanSuccessor {
-    override boolean getValue() { this = TBooleanSuccessor(result) }
-
-    override string toString() { result = this.getValue().toString() }
-  }
-
-  /**
-   * A nullness control flow successor.
-   *
-   * For example, this program fragment:
-   *
-   * ```csharp
-   * int? M(string s) => s?.Length;
-   * ```
-   *
-   * has a control flow graph containing nullness successors:
-   *
-   * ```
-   *      enter M
-   *        |
-   *        s
-   *       / \
-   *      /   \
-   *     /     \
-   *  null   non-null
-   *     \      |
-   *      \   Length
-   *       \   /
-   *        \ /
-   *      exit M
-   * ```
-   */
-  class NullnessSuccessor extends ConditionalSuccessor, TNullnessSuccessor {
-    /** Holds if this is a `null` successor. */
-    predicate isNull() { this = TNullnessSuccessor(true) }
-
-    override boolean getValue() { this = TNullnessSuccessor(result) }
-
-    override string toString() { if this.isNull() then result = "null" else result = "non-null" }
-  }
-
-  /**
-   * A matching control flow successor.
-   *
-   * For example, this program fragment:
-   *
-   * ```csharp
-   * switch (x) {
-   *     case 0 :
-   *         return 0;
-   *     default :
-   *         return 1;
-   * }
-   * ```
-   *
-   * has a control flow graph containing matching successors:
-   *
-   * ```
-   *      switch
-   *        |
-   *        x
-   *        |
-   *      case 0
-   *       / \
-   *      /   \
-   *     /     \
-   *  match   no-match
-   *    |        \
-   * return 0   default
-   *              |
-   *           return 1
-   * ```
-   */
-  class MatchingSuccessor extends ConditionalSuccessor, TMatchingSuccessor {
-    /** Holds if this is a match successor. */
-    predicate isMatch() { this = TMatchingSuccessor(true) }
-
-    override boolean getValue() { this = TMatchingSuccessor(result) }
-
-    override string toString() { if this.isMatch() then result = "match" else result = "no-match" }
-  }
-
-  /**
-   * An emptiness control flow successor.
-   *
-   * For example, this program fragment:
-   *
-   * ```csharp
-   * foreach (var arg in args)
-   * {
-   *     yield return arg;
-   * }
-   * yield return "";
-   * ```
-   *
-   * has a control flow graph containing emptiness successors:
-   *
-   * ```
-   *           args
-   *            |
-   *          foreach------<-------
-   *           / \                 \
-   *          /   \                |
-   *         /     \               |
-   *        /       \              |
-   *     empty    non-empty        |
-   *       |          \            |
-   * yield return ""   \           |
-   *                 var arg       |
-   *                    |          |
-   *             yield return arg  |
-   *                     \_________/
-   * ```
-   */
-  class EmptinessSuccessor extends ConditionalSuccessor, TEmptinessSuccessor {
-    /** Holds if this is an empty successor. */
-    predicate isEmpty() { this = TEmptinessSuccessor(true) }
-
-    override boolean getValue() { this = TEmptinessSuccessor(result) }
-
-    override string toString() { if this.isEmpty() then result = "empty" else result = "non-empty" }
-  }
-
-  /**
-   * A `return` control flow successor.
-   *
-   * Example:
-   *
-   * ```csharp
-   * void M()
-   * {
-   *     return;
-   * }
-   * ```
-   *
-   * The callable exit node of `M` is a `return` successor of the `return;`
-   * statement.
-   */
-  class ReturnSuccessor extends SuccessorType, TReturnSuccessor {
-    override string toString() { result = "return" }
-  }
-
-  /**
-   * A `break` control flow successor.
-   *
-   * Example:
-   *
-   * ```csharp
-   * int M(int x)
-   * {
-   *     while (true)
-   *     {
-   *         if (x++ > 10)
-   *             break;
-   *     }
-   *     return x;
-   * }
-   * ```
-   *
-   * The node `return x;` is a `break` successor of the node `break;`.
-   */
-  class BreakSuccessor extends SuccessorType, TBreakSuccessor {
-    override string toString() { result = "break" }
-  }
-
-  /**
-   * A `continue` control flow successor.
-   *
-   * Example:
-   *
-   * ```csharp
-   * int M(int x)
-   * {
-   *     while (true) {
-   *         if (x++ < 10)
-   *             continue;
-   *     }
-   *     return x;
-   * }
-   * ```
-   *
-   * The node `while (true) { ... }` is a `continue` successor of the node
-   * `continue;`.
-   */
-  class ContinueSuccessor extends SuccessorType, TContinueSuccessor {
-    override string toString() { result = "continue" }
-  }
-
-  /**
-   * A `goto` control flow successor.
-   *
-   * Example:
-   *
-   * ```csharp
-   * int M(int x)
-   * {
-   *     while (true)
-   *     {
-   *         if (x++ > 10)
-   *             goto Return;
-   *     }
-   *     Return: return x;
-   * }
-   * ```
-   *
-   * The node `Return: return x` is a `goto label` successor of the node
-   * `goto Return;`.
-   */
-  class GotoSuccessor extends SuccessorType, TGotoSuccessor {
-    /** Gets the `goto` label. */
-    string getLabel() { this = TGotoSuccessor(result) }
-
-    override string toString() { result = "goto(" + this.getLabel() + ")" }
-  }
-
-  /**
-   * An exceptional control flow successor.
-   *
-   * Example:
-   *
-   * ```csharp
-   * int M(string s)
-   * {
-   *     if (s == null)
-   *         throw new ArgumentNullException(nameof(s));
-   *     return s.Length;
-   * }
-   * ```
-   *
-   * The callable exit node of `M` is an exceptional successor (of type
-   * `ArgumentNullException`) of the node `throw new ArgumentNullException(nameof(s));`.
-   */
-  class ExceptionSuccessor extends SuccessorType, TExceptionSuccessor {
-    /** Gets the type of exception. */
-    ExceptionClass getExceptionClass() { this = TExceptionSuccessor(result) }
-
-    override string toString() { result = "exception(" + this.getExceptionClass().getName() + ")" }
-  }
-
-  /**
-   * An exit control flow successor.
-   *
-   * Example:
-   *
-   * ```csharp
-   * int M(string s)
-   * {
-   *     if (s == null)
-   *         System.Environment.Exit(0);
-   *     return s.Length;
-   * }
-   * ```
-   *
-   * The callable exit node of `M` is an exit successor of the node on line 4.
-   */
-  class ExitSuccessor extends SuccessorType, TExitSuccessor {
-    override string toString() { result = "exit" }
-  }
-}
+import codeql.controlflow.SuccessorType
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/Nullness.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/Nullness.qll
index 7e8ed0aadc0..6a211e71f45 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/Nullness.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/Nullness.qll
@@ -20,33 +20,34 @@
 import csharp
 private import ControlFlow
 private import internal.CallableReturns
-private import semmle.code.csharp.commons.Assertions
 private import semmle.code.csharp.controlflow.Guards as G
-private import semmle.code.csharp.controlflow.Guards::AbstractValues
 private import semmle.code.csharp.dataflow.internal.SsaImpl as SsaImpl
 private import semmle.code.csharp.frameworks.System
 private import semmle.code.csharp.frameworks.Test
+private import semmle.code.csharp.controlflow.ControlFlowReachability
+
+private Expr maybeNullExpr(Expr reason) {
+  G::Internal::nullValue(result) and reason = result
+  or
+  result instanceof AsExpr and reason = result
+  or
+  result.(AssignExpr).getRValue() = maybeNullExpr(reason)
+  or
+  result.(CastExpr).getExpr() = maybeNullExpr(reason)
+  or
+  result =
+    any(ConditionalExpr ce |
+      ce.getThen() = maybeNullExpr(reason)
+      or
+      ce.getElse() = maybeNullExpr(reason)
+    )
+  or
+  result.(NullCoalescingExpr).getRightOperand() = maybeNullExpr(reason)
+}
 
 /** An expression that may be `null`. */
 class MaybeNullExpr extends Expr {
-  MaybeNullExpr() {
-    G::Internal::nullValue(this)
-    or
-    this instanceof AsExpr
-    or
-    this.(AssignExpr).getRValue() instanceof MaybeNullExpr
-    or
-    this.(Cast).getExpr() instanceof MaybeNullExpr
-    or
-    this =
-      any(ConditionalExpr ce |
-        ce.getThen() instanceof MaybeNullExpr
-        or
-        ce.getElse() instanceof MaybeNullExpr
-      )
-    or
-    this.(NullCoalescingExpr).getRightOperand() instanceof MaybeNullExpr
-  }
+  MaybeNullExpr() { this = maybeNullExpr(_) }
 }
 
 /** An expression that is always `null`. */
@@ -116,45 +117,10 @@ private predicate nonNullDef(Ssa::ExplicitDefinition def) {
 }
 
 /**
- * Holds if the `i`th node of basic block `bb` is a dereference `d` of SSA
- * definition `def`.
+ * Holds if `node` is a dereference `d` of SSA definition `def`.
  */
-private predicate dereferenceAt(BasicBlock bb, int i, Ssa::Definition def, Dereference d) {
-  d = def.getAReadAtNode(bb.getNode(i))
-}
-
-/**
- * Holds if `e` having abstract value `vExpr` implies that SSA definition `def`
- * has abstract value `vDef`.
- */
-private predicate exprImpliesSsaDef(
-  G::Guard e, G::AbstractValue vExpr, Ssa::Definition def, G::AbstractValue vDef
-) {
-  vExpr = e.getAValue() and
-  vExpr = vDef and
-  (
-    e = def.getARead()
-    or
-    e = def.(Ssa::ExplicitDefinition).getADefinition().getTargetAccess()
-  )
-  or
-  exists(Expr e0, G::AbstractValue vExpr0 |
-    exprImpliesSsaDef(e0, vExpr0, def, vDef) and
-    G::Internal::impliesStep(e, vExpr, e0, vExpr0)
-  )
-}
-
-/**
- * Gets an element that tests whether a given SSA definition, `def`, is
- * `null` or not.
- *
- * If the returned element takes the `s` branch, then `def` is guaranteed to be
- * `null` if `nv.isNull()` holds, and non-`null` otherwise.
- */
-private ControlFlowElement getANullCheck(
-  Ssa::Definition def, SuccessorTypes::ConditionalSuccessor s, NullValue nv
-) {
-  exists(Expr e, G::AbstractValue v | v.branch(result, s, e) | exprImpliesSsaDef(e, v, def, nv))
+private predicate dereferenceAt(ControlFlow::Node node, Ssa::Definition def, Dereference d) {
+  d = def.getAReadAtNode(node)
 }
 
 private predicate isMaybeNullArgument(Ssa::ImplicitParameterDefinition def, MaybeNullExpr arg) {
@@ -219,15 +185,17 @@ private predicate isNullDefaultArgument(Ssa::ImplicitParameterDefinition def, Al
 }
 
 /** Holds if `def` is an SSA definition that may be `null`. */
-private predicate defMaybeNull(Ssa::Definition def, string msg, Element reason) {
+private predicate defMaybeNull(
+  Ssa::Definition def, ControlFlow::Node node, string msg, Element reason
+) {
   not nonNullDef(def) and
   (
     // A variable compared to `null` might be `null`
     exists(G::DereferenceableExpr de | de = def.getARead() |
-      reason = de.getANullCheck(_, true) and
+      de.guardSuggestsMaybeNull(reason) and
       msg = "as suggested by $@ null check" and
+      node = def.getControlFlowNode() and
       not de = any(Ssa::PhiNode phi).getARead() and
-      strictcount(Element e | e = any(Ssa::Definition def0 | de = def0.getARead()).getElement()) = 1 and
       // Don't use a check as reason if there is a `null` assignment
       // or argument
       not def.(Ssa::ExplicitDefinition).getADefinition().getSource() instanceof MaybeNullExpr and
@@ -236,23 +204,27 @@ private predicate defMaybeNull(Ssa::Definition def, string msg, Element reason)
     or
     // A parameter might be `null` if there is a `null` argument somewhere
     isMaybeNullArgument(def, reason) and
+    node = def.getControlFlowNode() and
     (
       if reason instanceof AlwaysNullExpr
       then msg = "because of $@ null argument"
       else msg = "because of $@ potential null argument"
     )
     or
-    isNullDefaultArgument(def, reason) and msg = "because the parameter has a null default value"
+    isNullDefaultArgument(def, reason) and
+    node = def.getControlFlowNode() and
+    msg = "because the parameter has a null default value"
     or
     // If the source of a variable is `null` then the variable may be `null`
     exists(AssignableDefinition adef | adef = def.(Ssa::ExplicitDefinition).getADefinition() |
-      adef.getSource() instanceof MaybeNullExpr and
+      adef.getSource() = maybeNullExpr(node.getAstNode()) and
       reason = adef.getExpr() and
       msg = "because of $@ assignment"
     )
     or
     // A variable of nullable type may be null
-    exists(Dereference d | dereferenceAt(_, _, def, d) |
+    exists(Dereference d | dereferenceAt(_, def, d) |
+      node = def.getControlFlowNode() and
       d.hasNullableType() and
       not def instanceof Ssa::PhiNode and
       reason = def.getSourceVariable().getAssignable() and
@@ -261,219 +233,6 @@ private predicate defMaybeNull(Ssa::Definition def, string msg, Element reason)
   )
 }
 
-pragma[noinline]
-private predicate sourceVariableMaybeNull(Ssa::SourceVariable v) {
-  defMaybeNull(v.getAnSsaDefinition(), _, _)
-}
-
-pragma[noinline]
-private predicate defNullImpliesStep0(
-  Ssa::SourceVariable v, Ssa::Definition def1, BasicBlock bb1, BasicBlock bb2
-) {
-  sourceVariableMaybeNull(v) and
-  def1.getSourceVariable() = v and
-  def1.isLiveAtEndOfBlock(bb1) and
-  bb2 = bb1.getASuccessor()
-}
-
-/**
- * Holds if `def1` being `null` in basic block `bb1` implies that `def2` might
- * be `null` in basic block `bb2`. The SSA definitions share the same source
- * variable.
- */
-private predicate defNullImpliesStep(
-  Ssa::Definition def1, BasicBlock bb1, Ssa::Definition def2, BasicBlock bb2
-) {
-  exists(Ssa::SourceVariable v | defNullImpliesStep0(v, def1, bb1, bb2) |
-    def2.(Ssa::PhiNode).getAnInput() = def1 and
-    bb2 = def2.getBasicBlock()
-    or
-    def2 = def1 and
-    not exists(Ssa::PhiNode phi |
-      phi.getSourceVariable() = v and
-      bb2 = phi.getBasicBlock()
-    )
-  ) and
-  not exists(SuccessorTypes::ConditionalSuccessor s, NullValue nv |
-    bb1.getLastNode() = getANullCheck(def1, s, nv).getAControlFlowNode()
-  |
-    bb2 = bb1.getASuccessorByType(s) and
-    nv.isNonNull()
-  )
-}
-
-/**
- * The transitive closure of `defNullImpliesStep()` originating from `defMaybeNull()`.
- * That is, those basic blocks for which the SSA definition is suspected of being `null`.
- */
-private predicate defMaybeNullInBlock(Ssa::Definition def, BasicBlock bb) {
-  defMaybeNull(def, _, _) and
-  bb = def.getBasicBlock()
-  or
-  exists(BasicBlock mid, Ssa::Definition midDef | defMaybeNullInBlock(midDef, mid) |
-    defNullImpliesStep(midDef, mid, def, bb)
-  )
-}
-
-/**
- * Holds if `v` is a source variable that might reach a potential `null`
- * dereference.
- */
-private predicate nullDerefCandidateVariable(Ssa::SourceVariable v) {
-  exists(Ssa::Definition def, BasicBlock bb | dereferenceAt(bb, _, def, _) |
-    defMaybeNullInBlock(def, bb) and
-    v = def.getSourceVariable()
-  )
-}
-
-private predicate succStep(PathNode pred, Ssa::Definition def, BasicBlock bb) {
-  defNullImpliesStep(pred.getSsaDefinition(), pred.getBasicBlock(), def, bb)
-}
-
-private predicate succNullArgument(SourcePathNode pred, Ssa::Definition def, BasicBlock bb) {
-  pred = TSourcePathNode(def, _, _, true) and
-  bb = def.getBasicBlock()
-}
-
-private predicate succSourceSink(SourcePathNode source, Ssa::Definition def, BasicBlock bb) {
-  source = TSourcePathNode(def, _, _, false) and
-  bb = def.getBasicBlock()
-}
-
-private newtype TPathNode =
-  TSourcePathNode(Ssa::Definition def, string msg, Element reason, boolean isNullArgument) {
-    nullDerefCandidateVariable(def.getSourceVariable()) and
-    defMaybeNull(def, msg, reason) and
-    if isMaybeNullArgument(def, reason) then isNullArgument = true else isNullArgument = false
-  } or
-  TInternalPathNode(Ssa::Definition def, BasicBlock bb) {
-    succStep(_, def, bb)
-    or
-    succNullArgument(_, def, bb)
-  } or
-  TSinkPathNode(Ssa::Definition def, BasicBlock bb, int i, Dereference d) {
-    dereferenceAt(bb, i, def, d) and
-    (
-      succStep(_, def, bb)
-      or
-      succNullArgument(_, def, bb)
-      or
-      succSourceSink(_, def, bb)
-    )
-  }
-
-/**
- * An SSA definition, which may be `null`, augmented with at basic block which can
- * be reached without passing through a `null` check.
- */
-abstract class PathNode extends TPathNode {
-  /** Gets the SSA definition. */
-  abstract Ssa::Definition getSsaDefinition();
-
-  /** Gets the basic block that can be reached without passing through a `null` check. */
-  abstract BasicBlock getBasicBlock();
-
-  /** Gets another node that can be reached from this node. */
-  abstract PathNode getASuccessor();
-
-  /** Gets a textual representation of this node. */
-  abstract string toString();
-
-  /** Gets the location of this node. */
-  abstract Location getLocation();
-}
-
-private class SourcePathNode extends PathNode, TSourcePathNode {
-  private Ssa::Definition def;
-  private string msg;
-  private Element reason;
-  private boolean isNullArgument;
-
-  SourcePathNode() { this = TSourcePathNode(def, msg, reason, isNullArgument) }
-
-  override Ssa::Definition getSsaDefinition() { result = def }
-
-  override BasicBlock getBasicBlock() {
-    isNullArgument = false and
-    result = def.getBasicBlock()
-  }
-
-  string getMessage() { result = msg }
-
-  Element getReason() { result = reason }
-
-  override PathNode getASuccessor() {
-    succStep(this, result.getSsaDefinition(), result.getBasicBlock())
-    or
-    succNullArgument(this, result.getSsaDefinition(), result.getBasicBlock())
-    or
-    result instanceof SinkPathNode and
-    succSourceSink(this, result.getSsaDefinition(), result.getBasicBlock())
-  }
-
-  override string toString() {
-    if isNullArgument = true then result = reason.toString() else result = def.toString()
-  }
-
-  override Location getLocation() {
-    if isNullArgument = true then result = reason.getLocation() else result = def.getLocation()
-  }
-}
-
-private class InternalPathNode extends PathNode, TInternalPathNode {
-  private Ssa::Definition def;
-  private BasicBlock bb;
-
-  InternalPathNode() { this = TInternalPathNode(def, bb) }
-
-  override Ssa::Definition getSsaDefinition() { result = def }
-
-  override BasicBlock getBasicBlock() { result = bb }
-
-  override PathNode getASuccessor() {
-    succStep(this, result.getSsaDefinition(), result.getBasicBlock())
-  }
-
-  override string toString() { result = bb.getFirstNode().toString() }
-
-  override Location getLocation() { result = bb.getFirstNode().getLocation() }
-}
-
-private class SinkPathNode extends PathNode, TSinkPathNode {
-  private Ssa::Definition def;
-  private BasicBlock bb;
-  private int i;
-  private Dereference d;
-
-  SinkPathNode() { this = TSinkPathNode(def, bb, i, d) }
-
-  override Ssa::Definition getSsaDefinition() { result = def }
-
-  override BasicBlock getBasicBlock() { result = bb }
-
-  override PathNode getASuccessor() { none() }
-
-  Dereference getDereference() { result = d }
-
-  override string toString() { result = d.toString() }
-
-  override Location getLocation() { result = d.getLocation() }
-}
-
-/**
- * Provides the query predicates needed to include a graph in a path-problem query
- * for `Dereference::is[First]MaybeNull()`.
- */
-module PathGraph {
-  query predicate nodes(PathNode n) { n.getASuccessor*() instanceof SinkPathNode }
-
-  query predicate edges(PathNode pred, PathNode succ) {
-    nodes(pred) and
-    nodes(succ) and
-    succ = pred.getASuccessor()
-  }
-}
-
 private Ssa::Definition getAPseudoInput(Ssa::Definition def) {
   result = def.(Ssa::PhiNode).getAnInput()
 }
@@ -487,21 +246,44 @@ private Ssa::Definition getAnUltimateDefinition(Ssa::Definition def) {
 
 /**
  * Holds if SSA definition `def` can reach a read at `cfn`, without passing
- * through an intermediate dereference that always (`always = true`) or
- * maybe (`always = false`) throws a null reference exception.
+ * through an intermediate dereference that always throws a null reference
+ * exception.
  */
-private predicate defReaches(Ssa::Definition def, ControlFlow::Node cfn, boolean always) {
-  exists(def.getAFirstReadAtNode(cfn)) and
-  (always = true or always = false)
+private predicate defReaches(Ssa::Definition def, ControlFlow::Node cfn) {
+  exists(def.getAFirstReadAtNode(cfn))
   or
-  exists(ControlFlow::Node mid | defReaches(def, mid, always) |
+  exists(ControlFlow::Node mid | defReaches(def, mid) |
     SsaImpl::adjacentReadPairSameVar(_, mid, cfn) and
-    not mid =
-      any(Dereference d |
-        if always = true
-        then d.isAlwaysNull(def.getSourceVariable())
-        else d.isMaybeNull(def, _, _, _, _)
-      ).getAControlFlowNode()
+    not mid = any(Dereference d | d.isAlwaysNull(def.getSourceVariable())).getAControlFlowNode()
+  )
+}
+
+private module NullnessConfig implements ControlFlowReachability::ConfigSig {
+  predicate source(ControlFlow::Node node, Ssa::Definition def) { defMaybeNull(def, node, _, _) }
+
+  predicate sink(ControlFlow::Node node, Ssa::Definition def) {
+    exists(Dereference d |
+      dereferenceAt(node, def, d) and
+      not d instanceof NonNullExpr
+    )
+  }
+
+  predicate barrierValue(G::GuardValue gv) { gv.isNullness(false) }
+
+  predicate uncertainFlow() { none() }
+}
+
+private module NullnessFlow = ControlFlowReachability::Flow<NullnessConfig>;
+
+predicate maybeNullDeref(Dereference d, Ssa::SourceVariable v, string msg, Element reason) {
+  exists(
+    Ssa::Definition origin, Ssa::Definition ssa, ControlFlow::Node src, ControlFlow::Node sink
+  |
+    defMaybeNull(origin, src, msg, reason) and
+    NullnessFlow::flow(src, origin, sink, ssa) and
+    ssa.getSourceVariable() = v and
+    dereferenceAt(sink, ssa, d) and
+    not d.isAlwaysNull(v)
   )
 }
 
@@ -584,9 +366,9 @@ class Dereference extends G::DereferenceableExpr {
     (
       forex(Ssa::Definition def0 | this = def0.getARead() | this.isAlwaysNull0(def0))
       or
-      exists(NullValue nv |
+      exists(G::GuardValue nv |
         this.(G::GuardedExpr).mustHaveValue(nv) and
-        nv.isNull()
+        nv.isNullValue()
       )
     ) and
     not this instanceof G::NullGuardedExpr
@@ -599,33 +381,6 @@ class Dereference extends G::DereferenceableExpr {
    */
   predicate isFirstAlwaysNull(Ssa::SourceVariable v) {
     this.isAlwaysNull(v) and
-    defReaches(v.getAnSsaDefinition(), this.getAControlFlowNode(), true)
-  }
-
-  /**
-   * Holds if this expression dereferences SSA definition `def`, which may
-   * be `null`.
-   */
-  predicate isMaybeNull(
-    Ssa::Definition def, SourcePathNode source, SinkPathNode sink, string msg, Element reason
-  ) {
-    source.getASuccessor*() = sink and
-    msg = source.getMessage() and
-    reason = source.getReason() and
-    def = sink.getSsaDefinition() and
-    this = sink.getDereference() and
-    not this.isAlwaysNull(def.getSourceVariable())
-  }
-
-  /**
-   * Holds if this expression dereferences SSA definition `def`, which may
-   * be `null`, and this expression can be reached from `def` without passing
-   * through another such dereference.
-   */
-  predicate isFirstMaybeNull(
-    Ssa::Definition def, SourcePathNode source, SinkPathNode sink, string msg, Element reason
-  ) {
-    this.isMaybeNull(def, source, sink, msg, reason) and
-    defReaches(def, this.getAControlFlowNode(), false)
+    defReaches(v.getAnSsaDefinition(), this.getAControlFlowNode())
   }
 }
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/SSA.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/SSA.qll
index f17317af83b..e8180201b9a 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/SSA.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/SSA.qll
@@ -163,13 +163,11 @@ module Ssa {
    * (`ImplicitDefinition`), or a phi node (`PhiNode`).
    */
   class Definition extends SsaImpl::Definition {
-    /**
-     * Gets the control flow node of this SSA definition, if any. Phi nodes are
-     * examples of SSA definitions without a control flow node, as they are
-     * modeled at index `-1` in the relevant basic block.
-     */
+    /** Gets the control flow node of this SSA definition. */
     final ControlFlow::Node getControlFlowNode() {
-      exists(ControlFlow::BasicBlock bb, int i | this.definesAt(_, bb, i) | result = bb.getNode(i))
+      exists(ControlFlow::BasicBlock bb, int i | this.definesAt(_, bb, i) |
+        result = bb.getNode(0.maximum(i))
+      )
     }
 
     /**
@@ -451,10 +449,9 @@ module Ssa {
    * An SSA definition that corresponds to an explicit assignable definition.
    */
   class ExplicitDefinition extends Definition, SsaImpl::WriteDefinition {
-    SourceVariable sv;
     AssignableDefinition ad;
 
-    ExplicitDefinition() { SsaImpl::explicitDefinition(this, sv, ad) }
+    ExplicitDefinition() { SsaImpl::explicitDefinition(this, _, ad) }
 
     /**
      * Gets an underlying assignable definition. The result is always unique,
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/BaseSSA.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/BaseSSA.qll
index ec1b5a0188e..747cf790d91 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/BaseSSA.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/BaseSSA.qll
@@ -5,6 +5,7 @@ import csharp
  */
 module BaseSsa {
   private import AssignableDefinitions
+  private import semmle.code.csharp.controlflow.BasicBlocks as BasicBlocks
   private import codeql.ssa.Ssa as SsaImplCommon
 
   /**
@@ -27,7 +28,7 @@ module BaseSsa {
   private predicate implicitEntryDef(
     Callable c, ControlFlow::BasicBlocks::EntryBlock bb, SsaInput::SourceVariable v
   ) {
-    exists(ControlFlow::ControlFlow::BasicBlocks::EntryBlock entry |
+    exists(ControlFlow::BasicBlocks::EntryBlock entry |
       c = entry.getCallable() and
       // In case `c` has multiple bodies, we want each body to get its own implicit
       // entry definition. In case `c` doesn't have multiple bodies, the line below
@@ -42,22 +43,12 @@ module BaseSsa {
     )
   }
 
-  private module SsaInput implements SsaImplCommon::InputSig<Location> {
+  private module SsaInput implements SsaImplCommon::InputSig<Location, ControlFlow::BasicBlock> {
     private import semmle.code.csharp.controlflow.internal.PreSsa
 
-    class BasicBlock = ControlFlow::BasicBlock;
-
-    class ControlFlowNode = ControlFlow::Node;
-
-    BasicBlock getImmediateBasicBlockDominator(BasicBlock bb) {
-      result = bb.getImmediateDominator()
-    }
-
-    BasicBlock getABasicBlockSuccessor(BasicBlock bb) { result = bb.getASuccessor() }
-
     class SourceVariable = PreSsa::SimpleLocalScopeVariable;
 
-    predicate variableWrite(BasicBlock bb, int i, SourceVariable v, boolean certain) {
+    predicate variableWrite(ControlFlow::BasicBlock bb, int i, SourceVariable v, boolean certain) {
       exists(AssignableDefinition def |
         definitionAt(def, bb, i, v) and
         if def.isCertain() then certain = true else certain = false
@@ -68,7 +59,7 @@ module BaseSsa {
       certain = true
     }
 
-    predicate variableRead(BasicBlock bb, int i, SourceVariable v, boolean certain) {
+    predicate variableRead(ControlFlow::BasicBlock bb, int i, SourceVariable v, boolean certain) {
       exists(AssignableRead read |
         read.getAControlFlowNode() = bb.getNode(i) and
         read.getTarget() = v and
@@ -77,7 +68,7 @@ module BaseSsa {
     }
   }
 
-  private module SsaImpl = SsaImplCommon::Make<Location, SsaInput>;
+  private module SsaImpl = SsaImplCommon::Make<Location, BasicBlocks::Cfg, SsaInput>;
 
   class Definition extends SsaImpl::Definition {
     final AssignableRead getARead() {
@@ -114,7 +105,7 @@ module BaseSsa {
     override Location getLocation() {
       result = this.getDefinition().getLocation()
       or
-      exists(Callable c, SsaInput::BasicBlock bb, SsaInput::SourceVariable v |
+      exists(Callable c, ControlFlow::BasicBlock bb, SsaInput::SourceVariable v |
         this.definesAt(v, bb, -1) and
         implicitEntryDef(c, bb, v) and
         result = c.getLocation()
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPrivate.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPrivate.qll
index ff2bf709251..4f7f0141da2 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPrivate.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPrivate.qll
@@ -264,6 +264,7 @@ predicate hasNodePath(ControlFlowReachabilityConfiguration conf, ExprNode n1, No
 /** Provides logic related to captured variables. */
 module VariableCapture {
   private import codeql.dataflow.VariableCapture as Shared
+  private import semmle.code.csharp.controlflow.BasicBlocks as BasicBlocks
 
   private predicate closureFlowStep(ControlFlow::Nodes::ExprNode e1, ControlFlow::Nodes::ExprNode e2) {
     e1 = LocalFlow::getALastEvalNode(e2)
@@ -275,24 +276,15 @@ module VariableCapture {
     )
   }
 
-  private module CaptureInput implements Shared::InputSig<Location> {
+  private module CaptureInput implements Shared::InputSig<Location, BasicBlocks::BasicBlock> {
     private import csharp as Cs
     private import semmle.code.csharp.controlflow.ControlFlowGraph as Cfg
-    private import semmle.code.csharp.controlflow.BasicBlocks as BasicBlocks
     private import TaintTrackingPrivate as TaintTrackingPrivate
 
-    class BasicBlock extends BasicBlocks::BasicBlock {
-      Callable getEnclosingCallable() { result = super.getCallable() }
+    Callable basicBlockGetEnclosingCallable(BasicBlocks::BasicBlock bb) {
+      result = bb.getCallable()
     }
 
-    class ControlFlowNode = Cfg::ControlFlow::Node;
-
-    BasicBlock getImmediateBasicBlockDominator(BasicBlock bb) {
-      result = bb.getImmediateDominator()
-    }
-
-    BasicBlock getABasicBlockSuccessor(BasicBlock bb) { result = bb.getASuccessor() }
-
     private predicate thisAccess(ControlFlow::Node cfn, InstanceCallable c) {
       ThisFlow::thisAccessExpr(cfn.getAstNode()) and
       cfn.getEnclosingCallable().getEnclosingCallable*() = c
@@ -359,7 +351,7 @@ module VariableCapture {
     }
 
     class Expr extends ControlFlow::Node {
-      predicate hasCfgNode(BasicBlock bb, int i) { this = bb.getNode(i) }
+      predicate hasCfgNode(BasicBlocks::BasicBlock bb, int i) { this = bb.getNode(i) }
     }
 
     class VariableWrite extends Expr {
@@ -411,7 +403,7 @@ module VariableCapture {
 
   class ClosureExpr = CaptureInput::ClosureExpr;
 
-  module Flow = Shared::Flow<Location, CaptureInput>;
+  module Flow = Shared::Flow<Location, BasicBlocks::Cfg, CaptureInput>;
 
   private Flow::ClosureNode asClosureNode(Node n) {
     result = n.(CaptureNode).getSynthesizedCaptureNode()
@@ -2591,12 +2583,10 @@ class NodeRegion instanceof ControlFlow::BasicBlock {
  * Holds if the nodes in `nr` are unreachable when the call context is `call`.
  */
 predicate isUnreachableInCall(NodeRegion nr, DataFlowCall call) {
-  exists(
-    ExplicitParameterNode paramNode, Guard guard, ControlFlow::SuccessorTypes::BooleanSuccessor bs
-  |
-    viableConstantBooleanParamArg(paramNode, bs.getValue().booleanNot(), call) and
+  exists(ExplicitParameterNode paramNode, Guard guard, GuardValue val |
+    viableConstantParamArg(paramNode, val.getDualValue(), call) and
     paramNode.getSsaDefinition().getARead() = guard and
-    guard.controlsBlock(nr, bs, _)
+    guard.valueControls(nr, val)
   )
 }
 
@@ -2914,32 +2904,19 @@ class CastNode extends Node {
 
 class DataFlowExpr = Expr;
 
-/** Holds if `e` is an expression that always has the same Boolean value `val`. */
-private predicate constantBooleanExpr(Expr e, boolean val) {
-  e = any(AbstractValues::BooleanValue bv | val = bv.getValue()).getAnExpr()
-  or
-  exists(Ssa::ExplicitDefinition def, Expr src |
-    e = def.getARead() and
-    src = def.getADefinition().getSource() and
-    constantBooleanExpr(src, val)
-  )
-}
+/** An argument that always has the same value. */
+private class ConstantArgumentNode extends ExprNode {
+  ConstantArgumentNode() { Guards::InternalUtil::exprHasValue(this.(ArgumentNode).asExpr(), _) }
 
-/** An argument that always has the same Boolean value. */
-private class ConstantBooleanArgumentNode extends ExprNode {
-  ConstantBooleanArgumentNode() { constantBooleanExpr(this.(ArgumentNode).asExpr(), _) }
-
-  /** Gets the Boolean value of this expression. */
-  boolean getBooleanValue() { constantBooleanExpr(this.getExpr(), result) }
+  /** Gets the value of this expression. */
+  GuardValue getValue() { Guards::InternalUtil::exprHasValue(this.getExpr(), result) }
 }
 
 pragma[noinline]
-private predicate viableConstantBooleanParamArg(
-  ParameterNode paramNode, boolean b, DataFlowCall call
-) {
-  exists(ConstantBooleanArgumentNode arg |
+private predicate viableConstantParamArg(ParameterNode paramNode, GuardValue val, DataFlowCall call) {
+  exists(ConstantArgumentNode arg |
     viableParamArg(call, paramNode, arg) and
-    b = arg.getBooleanValue()
+    val = arg.getValue()
   )
 }
 
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPublic.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPublic.qll
index b21d5e2c3ef..4023d6c4597 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPublic.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPublic.qll
@@ -173,7 +173,7 @@ abstract class NonLocalJumpNode extends Node {
  * For example, the guard `g` might be a call `isSafe(x)` and the expression `e`
  * the argument `x`.
  */
-signature predicate guardChecksSig(Guard g, Expr e, AbstractValue v);
+signature predicate guardChecksSig(Guard g, Expr e, GuardValue v);
 
 /**
  * Provides a set of barrier nodes for a guard that validates an expression.
@@ -190,7 +190,7 @@ module BarrierGuard<guardChecksSig/3 guardChecks> {
     SsaFlow::asNode(result) =
       SsaImpl::DataFlowIntegration::BarrierGuard<guardChecks/3>::getABarrierNode()
     or
-    exists(Guard g, Expr e, AbstractValue v |
+    exists(Guard g, Expr e, GuardValue v |
       guardChecks(g, e, v) and
       g.controlsNode(result.getControlFlowNode(), e, v)
     )
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/FlowSummaryImpl.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/FlowSummaryImpl.qll
index 90db68f7c93..3ee16f21489 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/FlowSummaryImpl.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/FlowSummaryImpl.qll
@@ -183,7 +183,7 @@ private module TypesInput implements Impl::Private::TypesInputSig {
     )
   }
 
-  DataFlowType getSourceType(Input::SourceBase source, Impl::Private::SummaryComponent sc) {
+  DataFlowType getSourceType(Input::SourceBase source, Impl::Private::SummaryComponentStack s) {
     none()
   }
 
@@ -195,7 +195,9 @@ private module StepsInput implements Impl::Private::StepsInputSig {
     sc = viableCallable(result).asSummarizedCallable()
   }
 
-  Node getSourceNode(Input::SourceBase source, Impl::Private::SummaryComponent sc) { none() }
+  DataFlowCallable getSourceNodeEnclosingCallable(Input::SourceBase source) { none() }
+
+  Node getSourceNode(Input::SourceBase source, Impl::Private::SummaryComponentStack s) { none() }
 
   Node getSinkNode(Input::SinkBase sink, Impl::Private::SummaryComponent sc) { none() }
 }
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/SsaImpl.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/SsaImpl.qll
index d1490c84916..70fda2b1296 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/SsaImpl.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/SsaImpl.qll
@@ -6,17 +6,10 @@ import csharp
 private import codeql.ssa.Ssa as SsaImplCommon
 private import AssignableDefinitions
 private import semmle.code.csharp.controlflow.internal.PreSsa
+private import semmle.code.csharp.controlflow.BasicBlocks as BasicBlocks
 private import semmle.code.csharp.controlflow.Guards as Guards
 
-private module SsaInput implements SsaImplCommon::InputSig<Location> {
-  class BasicBlock = ControlFlow::BasicBlock;
-
-  class ControlFlowNode = ControlFlow::Node;
-
-  BasicBlock getImmediateBasicBlockDominator(BasicBlock bb) { result = bb.getImmediateDominator() }
-
-  BasicBlock getABasicBlockSuccessor(BasicBlock bb) { result = bb.getASuccessor() }
-
+private module SsaInput implements SsaImplCommon::InputSig<Location, ControlFlow::BasicBlock> {
   class SourceVariable = Ssa::SourceVariable;
 
   /**
@@ -25,7 +18,7 @@ private module SsaInput implements SsaImplCommon::InputSig<Location> {
    *
    * This includes implicit writes via calls.
    */
-  predicate variableWrite(BasicBlock bb, int i, Ssa::SourceVariable v, boolean certain) {
+  predicate variableWrite(ControlFlow::BasicBlock bb, int i, Ssa::SourceVariable v, boolean certain) {
     variableWriteDirect(bb, i, v, certain)
     or
     variableWriteQualifier(bb, i, v, certain)
@@ -39,7 +32,7 @@ private module SsaInput implements SsaImplCommon::InputSig<Location> {
    *
    * This includes implicit reads via calls.
    */
-  predicate variableRead(BasicBlock bb, int i, Ssa::SourceVariable v, boolean certain) {
+  predicate variableRead(ControlFlow::BasicBlock bb, int i, Ssa::SourceVariable v, boolean certain) {
     variableReadActual(bb, i, v) and
     certain = true
     or
@@ -48,7 +41,7 @@ private module SsaInput implements SsaImplCommon::InputSig<Location> {
   }
 }
 
-import SsaImplCommon::Make<Location, SsaInput> as Impl
+import SsaImplCommon::Make<Location, BasicBlocks::Cfg, SsaInput> as Impl
 
 class Definition = Impl::Definition;
 
@@ -150,7 +143,7 @@ private module SourceVariableImpl {
   }
 
   /**
-   * Gets an `out`/`ref` definition of the same source variable as the `out`/`ref`
+   * Gets an `out`/`ref` definition of the same source variable `v` as the `out`/`ref`
    * definition `def`, belonging to the same call, at a position after `def`.
    */
   OutRefDefinition getASameOutRefDefAfter(Ssa::SourceVariable v, OutRefDefinition def) {
@@ -729,7 +722,7 @@ private predicate variableReadPseudo(ControlFlow::BasicBlock bb, int i, Ssa::Sou
 
 pragma[noinline]
 deprecated private predicate adjacentDefRead(
-  Definition def, SsaInput::BasicBlock bb1, int i1, SsaInput::BasicBlock bb2, int i2,
+  Definition def, ControlFlow::BasicBlock bb1, int i1, ControlFlow::BasicBlock bb2, int i2,
   SsaInput::SourceVariable v
 ) {
   Impl::adjacentDefRead(def, bb1, i1, bb2, i2) and
@@ -737,8 +730,8 @@ deprecated private predicate adjacentDefRead(
 }
 
 deprecated private predicate adjacentDefReachesRead(
-  Definition def, SsaInput::SourceVariable v, SsaInput::BasicBlock bb1, int i1,
-  SsaInput::BasicBlock bb2, int i2
+  Definition def, SsaInput::SourceVariable v, ControlFlow::BasicBlock bb1, int i1,
+  ControlFlow::BasicBlock bb2, int i2
 ) {
   adjacentDefRead(def, bb1, i1, bb2, i2, v) and
   (
@@ -747,7 +740,7 @@ deprecated private predicate adjacentDefReachesRead(
     SsaInput::variableRead(bb1, i1, v, true)
   )
   or
-  exists(SsaInput::BasicBlock bb3, int i3 |
+  exists(ControlFlow::BasicBlock bb3, int i3 |
     adjacentDefReachesRead(def, v, bb1, i1, bb3, i3) and
     SsaInput::variableRead(bb3, i3, _, false) and
     Impl::adjacentDefRead(def, bb3, i3, bb2, i2)
@@ -755,7 +748,7 @@ deprecated private predicate adjacentDefReachesRead(
 }
 
 deprecated private predicate adjacentDefReachesUncertainRead(
-  Definition def, SsaInput::BasicBlock bb1, int i1, SsaInput::BasicBlock bb2, int i2
+  Definition def, ControlFlow::BasicBlock bb1, int i1, ControlFlow::BasicBlock bb2, int i2
 ) {
   exists(SsaInput::SourceVariable v |
     adjacentDefReachesRead(def, v, bb1, i1, bb2, i2) and
@@ -766,12 +759,12 @@ deprecated private predicate adjacentDefReachesUncertainRead(
 /** Same as `lastRefRedef`, but skips uncertain reads. */
 pragma[nomagic]
 deprecated private predicate lastRefSkipUncertainReads(
-  Definition def, SsaInput::BasicBlock bb, int i
+  Definition def, ControlFlow::BasicBlock bb, int i
 ) {
   Impl::lastRef(def, bb, i) and
   not SsaInput::variableRead(bb, i, def.getSourceVariable(), false)
   or
-  exists(SsaInput::BasicBlock bb0, int i0 |
+  exists(ControlFlow::BasicBlock bb0, int i0 |
     Impl::lastRef(def, bb0, i0) and
     adjacentDefReachesUncertainRead(def, bb, i, bb0, i0)
   )
@@ -825,8 +818,8 @@ private module Cached {
   }
 
   cached
-  predicate implicitEntryDefinition(ControlFlow::ControlFlow::BasicBlock bb, Ssa::SourceVariable v) {
-    exists(ControlFlow::ControlFlow::BasicBlocks::EntryBlock entry, Callable c |
+  predicate implicitEntryDefinition(ControlFlow::BasicBlock bb, Ssa::SourceVariable v) {
+    exists(ControlFlow::BasicBlocks::EntryBlock entry, Callable c |
       c = entry.getCallable() and
       // In case `c` has multiple bodies, we want each body to get its own implicit
       // entry definition. In case `c` doesn't have multiple bodies, the line below
@@ -970,7 +963,7 @@ private module Cached {
       DataFlowIntegrationImpl::localMustFlowStep(v, nodeFrom, nodeTo)
     }
 
-    signature predicate guardChecksSig(Guards::Guard g, Expr e, Guards::AbstractValue v);
+    signature predicate guardChecksSig(Guards::Guard g, Expr e, Guards::GuardValue v);
 
     cached // nothing is actually cached
     module BarrierGuard<guardChecksSig/3 guardChecks> {
@@ -978,9 +971,9 @@ private module Cached {
         DataFlowIntegrationInput::Guard g, DataFlowIntegrationInput::Expr e,
         DataFlowIntegrationInput::GuardValue branch
       ) {
-        exists(Guards::AbstractValues::BooleanValue v |
+        exists(Guards::GuardValue v |
           guardChecks(g, e.getAstNode(), v) and
-          branch = v.getValue()
+          branch = v.asBooleanValue()
         )
       }
 
@@ -1052,9 +1045,9 @@ private module DataFlowIntegrationInput implements Impl::DataFlowIntegrationInpu
      * from `bb1` to `bb2`.
      */
     predicate hasValueBranchEdge(BasicBlock bb1, BasicBlock bb2, GuardValue branch) {
-      exists(ControlFlow::SuccessorTypes::ConditionalSuccessor s |
+      exists(ControlFlow::ConditionalSuccessor s |
         this.getAControlFlowNode() = bb1.getLastNode() and
-        bb2 = bb1.getASuccessorByType(s) and
+        bb2 = bb1.getASuccessor(s) and
         s.getValue() = branch
       )
     }
@@ -1071,7 +1064,7 @@ private module DataFlowIntegrationInput implements Impl::DataFlowIntegrationInpu
 
   /** Holds if the guard `guard` controls block `bb` upon evaluating to `branch`. */
   predicate guardDirectlyControlsBlock(Guard guard, ControlFlow::BasicBlock bb, GuardValue branch) {
-    exists(ConditionBlock conditionBlock, ControlFlow::SuccessorTypes::ConditionalSuccessor s |
+    exists(ConditionBlock conditionBlock, ControlFlow::ConditionalSuccessor s |
       guard.getAControlFlowNode() = conditionBlock.getLastNode() and
       s.getValue() = branch and
       conditionBlock.edgeDominates(bb, s)
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/TaintTrackingPrivate.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/TaintTrackingPrivate.qll
index b7681994e2c..3146720efe8 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/TaintTrackingPrivate.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/TaintTrackingPrivate.qll
@@ -29,7 +29,10 @@ predicate defaultTaintSanitizer(DataFlow::Node node) {
  * of `c` at sinks and inputs to additional taint steps.
  */
 bindingset[node]
-predicate defaultImplicitTaintRead(DataFlow::Node node, DataFlow::ContentSet c) { none() }
+predicate defaultImplicitTaintRead(DataFlow::Node node, DataFlow::ContentSet c) {
+  exists(node) and
+  c.isElement()
+}
 
 private class LocalTaintExprStepConfiguration extends ControlFlowReachabilityConfiguration {
   LocalTaintExprStepConfiguration() { this = "LocalTaintExprStepConfiguration" }
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/RangeUtils.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/RangeUtils.qll
index 1be94669951..71d177a48bb 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/RangeUtils.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/RangeUtils.qll
@@ -10,8 +10,6 @@ private module Impl {
   private import semmle.code.csharp.controlflow.Guards as G
   private import ControlFlowReachability
 
-  private class BooleanValue = G::AbstractValues::BooleanValue;
-
   private class ExprNode = ControlFlow::Nodes::ExprNode;
 
   private class ExprChildReachability extends ControlFlowReachabilityConfiguration {
@@ -93,7 +91,7 @@ private module Impl {
     /**
      * Holds if basic block `bb` is guarded by this guard having value `v`.
      */
-    predicate controlsBasicBlock(ControlFlow::BasicBlock bb, G::AbstractValue v) {
+    predicate controlsBasicBlock(ControlFlow::BasicBlock bb, G::GuardValue v) {
       super.controlsBasicBlock(bb, v)
     }
 
@@ -111,19 +109,6 @@ private module Impl {
     }
   }
 
-  private Guard eqFlowCondAbs(
-    Definition def, ExprNode e, int delta, boolean isEq, G::AbstractValue v
-  ) {
-    exists(boolean eqpolarity |
-      result.isEquality(ssaRead(def, delta), e, eqpolarity) and
-      eqpolarity.booleanXor(v.(BooleanValue).getValue()).booleanNot() = isEq
-    )
-    or
-    exists(G::AbstractValue v0 |
-      G::Internal::impliesStep(result, v, eqFlowCondAbs(def, e, delta, isEq, v0), v0)
-    )
-  }
-
   /**
    * Gets a condition that tests whether `def` equals `e + delta`.
    *
@@ -132,9 +117,10 @@ private module Impl {
    * - `isEq = false` : `def != e + delta`
    */
   Guard eqFlowCond(Definition def, ExprNode e, int delta, boolean isEq, boolean testIsTrue) {
-    exists(BooleanValue v |
-      result = eqFlowCondAbs(def, e, delta, isEq, v) and
-      testIsTrue = v.getValue()
+    exists(boolean eqpolarity |
+      result.isEquality(ssaRead(def, delta), e, eqpolarity) and
+      testIsTrue = [false, true] and
+      eqpolarity.booleanXor(testIsTrue).booleanNot() = isEq
     )
   }
 
@@ -142,7 +128,7 @@ private module Impl {
    * Holds if `guard` controls the position `controlled` with the value `testIsTrue`.
    */
   predicate guardControlsSsaRead(Guard guard, SsaReadPosition controlled, boolean testIsTrue) {
-    exists(BooleanValue b | b.getValue() = testIsTrue |
+    exists(G::GuardValue b | b.asBooleanValue() = testIsTrue |
       guard.controlsBasicBlock(controlled.(SsaReadPositionBlock).getBlock(), b)
     )
   }
diff --git a/csharp/ql/lib/semmle/code/csharp/dispatch/Dispatch.qll b/csharp/ql/lib/semmle/code/csharp/dispatch/Dispatch.qll
index 7de6c30eb13..c61ad0f2a2a 100644
--- a/csharp/ql/lib/semmle/code/csharp/dispatch/Dispatch.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dispatch/Dispatch.qll
@@ -270,6 +270,14 @@ private module Internal {
     hasOverrider(t, c)
   }
 
+  /**
+   * For `base` expressions, the extractor provides the type of the base
+   * class instead of the derived class; this predicate provides the latter.
+   */
+  private Type getBaseAdjustedType(BaseAccess base) {
+    result = base.getEnclosingCallable().getDeclaringType()
+  }
+
   abstract private class DispatchOverridableCall extends DispatchCallImpl {
     pragma[noinline]
     OverridableCallable getAStaticTargetExt() {
@@ -360,7 +368,12 @@ private module Internal {
     private predicate contextArgHasType(DispatchCall ctx, Type t, boolean isExact) {
       exists(Expr arg, int i |
         this.relevantContext(ctx, i) and
-        t = getAPossibleType(arg, isExact)
+        (
+          t = getBaseAdjustedType(arg) and isExact = false
+          or
+          not exists(getBaseAdjustedType(arg)) and
+          t = getAPossibleType(arg, isExact)
+        )
       |
         ctx.getArgument(i) = arg
         or
@@ -725,9 +738,7 @@ private module Internal {
 
       Type getType(boolean isExact) {
         result = this.getType() and
-        if
-          this instanceof ObjectCreation or
-          this instanceof BaseAccess
+        if this instanceof ObjectCreation or this instanceof BaseAccess
         then isExact = true
         else isExact = false
       }
diff --git a/csharp/ql/lib/semmle/code/csharp/internal/Overlay.qll b/csharp/ql/lib/semmle/code/csharp/internal/Overlay.qll
new file mode 100644
index 00000000000..a44d82c92ad
--- /dev/null
+++ b/csharp/ql/lib/semmle/code/csharp/internal/Overlay.qll
@@ -0,0 +1,166 @@
+/**
+ * Defines entity discard predicates for C# overlay analysis.
+ */
+
+/**
+ * Holds always for the overlay variant and never for the base variant.
+ * This local predicate is used to define local predicates that behave
+ * differently for the base and overlay variant.
+ */
+overlay[local]
+predicate isOverlay() { databaseMetadata("isOverlay", "true") }
+
+overlay[local]
+private string getLocationFilePath(@location_default loc) {
+  exists(@file file | locations_default(loc, file, _, _, _, _) | files(file, result))
+}
+
+overlay[local]
+private class DiscardableEntityBase extends @locatable {
+  /** Gets the path to the file in which this element occurs. */
+  abstract string getFilePath();
+
+  /** Holds if this element exists in the base variant. */
+  predicate existsInBase() { not isOverlay() }
+
+  /** Holds if this element exists in the overlay variant. */
+  predicate existsInOverlay() { isOverlay() }
+
+  /** Gets a textual representation of this discardable element. */
+  string toString() { none() }
+}
+
+/**
+ * A class of elements that can be discarded from the base.
+ */
+overlay[local]
+private class DiscardableEntity extends DiscardableEntityBase {
+  /** Gets the path to the file in which this element occurs. */
+  override string getFilePath() {
+    exists(@location_default loc | result = getLocationFilePath(loc) |
+      expr_location(this, loc) or
+      stmt_location(this, loc) or
+      using_directive_location(this, loc) or
+      namespace_declaration_location(this, loc) or
+      preprocessor_directive_location(this, loc) or
+      type_location(this, loc) or
+      attribute_location(this, loc) or
+      type_parameter_constraints_location(this, loc) or
+      property_location(this, loc) or
+      indexer_location(this, loc) or
+      accessor_location(this, loc) or
+      event_location(this, loc) or
+      event_accessor_location(this, loc) or
+      operator_location(this, loc) or
+      method_location(this, loc) or
+      constructor_location(this, loc) or
+      destructor_location(this, loc) or
+      field_location(this, loc) or
+      localvar_location(this, loc) or
+      param_location(this, loc) or
+      type_mention_location(this, loc) or
+      commentline_location(this, loc) or
+      commentblock_location(this, loc) or
+      diagnostics(this, _, _, _, _, loc) or
+      extractor_messages(this, _, _, _, _, loc, _)
+    )
+  }
+}
+
+/**
+ * A class of C# database entities that use `*` IDs.
+ * The rest use named TRAP IDs.
+ */
+overlay[local]
+private class StarEntity =
+  @expr or @stmt or @diagnostic or @extractor_message or @using_directive or @type_mention or
+      @local_variable;
+
+overlay[discard_entity]
+private predicate discardStarEntity(@locatable e) {
+  e instanceof StarEntity and
+  // Entities with *-ids can exist either in base or overlay, but not both.
+  e =
+    any(DiscardableEntity de |
+      overlayChangedFiles(de.getFilePath()) and
+      de.existsInBase()
+    )
+}
+
+overlay[discard_entity]
+private predicate discardNamedEntity(@locatable e) {
+  not e instanceof StarEntity and
+  // Entities with named IDs can exist both in base, overlay, or both.
+  e =
+    any(DiscardableEntity de |
+      overlayChangedFiles(de.getFilePath()) and
+      not de.existsInOverlay()
+    )
+}
+
+overlay[local]
+private predicate discardableLocation(@location_default loc, string path) {
+  not isOverlay() and
+  path = getLocationFilePath(loc)
+}
+
+// Discard locations that are in changed files from the base variant.
+overlay[discard_entity]
+private predicate discardLocation(@location_default loc) {
+  exists(string path | discardableLocation(loc, path) | overlayChangedFiles(path))
+}
+
+/**
+ * A class of Xml locatables that can be discarded from the base.
+ */
+overlay[local]
+private class DiscardableXmlEntity extends DiscardableEntityBase instanceof @xmllocatable {
+  /** Gets the path to the file in which this element occurs. */
+  override string getFilePath() {
+    exists(@location_default loc | result = getLocationFilePath(loc) | xmllocations(this, loc))
+  }
+}
+
+overlay[local]
+private predicate overlayXmlExtracted(string file) {
+  exists(DiscardableXmlEntity dxe |
+    dxe.existsInOverlay() and
+    file = dxe.getFilePath() and
+    not files(dxe, _) and
+    not xmlNs(dxe, _, _, _)
+  )
+}
+
+overlay[discard_entity]
+private predicate discardXmlEntity(@xmllocatable xml) {
+  overlayChangedFiles(xml.(DiscardableXmlEntity).getFilePath())
+  or
+  // The XML extractor is not incremental and may extract more
+  // XML files than those included in overlayChangedFiles.
+  overlayXmlExtracted(xml.(DiscardableXmlEntity).getFilePath())
+}
+
+overlay[local]
+private class DiscardableAspEntity extends DiscardableEntityBase instanceof @asp_element {
+  /** Gets the path to the file in which this element occurs. */
+  override string getFilePath() {
+    exists(@location_default loc | result = getLocationFilePath(loc) | asp_elements(this, _, loc))
+  }
+}
+
+overlay[local]
+private predicate overlayAspExtracted(string file) {
+  exists(DiscardableAspEntity dae |
+    dae.existsInOverlay() and
+    file = dae.getFilePath()
+  )
+}
+
+overlay[discard_entity]
+private predicate discardAspEntity(@asp_element asp) {
+  overlayChangedFiles(asp.(DiscardableAspEntity).getFilePath())
+  or
+  // The ASP extractor is not incremental and may extract more
+  // ASP files than those included in overlayChangedFiles.
+  overlayAspExtracted(asp.(DiscardableAspEntity).getFilePath())
+}
diff --git a/csharp/ql/src/experimental/dataflow/flowsources/AuthCookie.qll b/csharp/ql/lib/semmle/code/csharp/security/auth/SecureCookies.qll
similarity index 85%
rename from csharp/ql/src/experimental/dataflow/flowsources/AuthCookie.qll
rename to csharp/ql/lib/semmle/code/csharp/security/auth/SecureCookies.qll
index e91ae9de538..56b6294949b 100644
--- a/csharp/ql/src/experimental/dataflow/flowsources/AuthCookie.qll
+++ b/csharp/ql/lib/semmle/code/csharp/security/auth/SecureCookies.qll
@@ -1,13 +1,13 @@
 /**
- * Provides classes and predicates for detecting insecure cookies.
+ * Definitions for detecting insecure and non-HttpOnly cookies.
  */
-deprecated module;
 
 import csharp
-import semmle.code.csharp.frameworks.microsoft.AspNetCore
+private import semmle.code.csharp.frameworks.system.Web
+private import semmle.code.csharp.frameworks.microsoft.AspNetCore
 
 /**
- * Holds if the expression is a variable with a sensitive name.
+ * Holds if the expression is a sensitive string literal or a variable with a sensitive name.
  */
 predicate isCookieWithSensitiveName(Expr cookieExpr) {
   exists(DataFlow::Node sink |
@@ -17,7 +17,7 @@ predicate isCookieWithSensitiveName(Expr cookieExpr) {
 }
 
 /**
- * Configuration for tracking if a variable with a sensitive name is used as an argument.
+ * Configuration for tracking if a sensitive string literal or a variable with a sensitive name is used as an argument.
  */
 private module AuthCookieNameConfig implements DataFlow::ConfigSig {
   private predicate isAuthVariable(Expr expr) {
@@ -33,7 +33,15 @@ private module AuthCookieNameConfig implements DataFlow::ConfigSig {
 
   predicate isSource(DataFlow::Node source) { isAuthVariable(source.asExpr()) }
 
-  predicate isSink(DataFlow::Node sink) { exists(Call c | sink.asExpr() = c.getAnArgument()) }
+  predicate isSink(DataFlow::Node sink) {
+    exists(Call c |
+      sink.asExpr() = c.getAnArgument() and
+      (
+        c.getTarget() = any(MicrosoftAspNetCoreHttpResponseCookies cls).getAppendMethod() or
+        c.(ObjectCreation).getType() instanceof SystemWebHttpCookie
+      )
+    )
+  }
 }
 
 /**
@@ -119,13 +127,13 @@ private signature string propertyName();
 
 /**
  * Configuration for tracking if a callback used in `OnAppendCookie` sets a cookie property to `true`.
+ *
+ * ` getPropertyName` specifies the cookie property name to track.
  */
 private module OnAppendCookieTrackingConfig<propertyName/0 getPropertyName> implements
   DataFlow::ConfigSig
 {
-  /**
-   * Specifies the cookie property name to track.
-   */
+  /** Source is the parameter of a callback passed to `OnAppendCookie` */
   predicate isSource(DataFlow::Node source) {
     exists(PropertyWrite pw, Assignment delegateAssign, Callable c |
       pw.getProperty().getName() = "OnAppendCookie" and
@@ -146,6 +154,7 @@ private module OnAppendCookieTrackingConfig<propertyName/0 getPropertyName> impl
     )
   }
 
+  /** Sink is a property write that sets the given property to `true`. */
   predicate isSink(DataFlow::Node sink) {
     exists(PropertyWrite pw, Assignment a |
       pw.getProperty().getDeclaringType() instanceof MicrosoftAspNetCoreHttpCookieOptions and
@@ -178,7 +187,7 @@ private module OnAppendCookieSecureTrackingConfig =
   OnAppendCookieTrackingConfig<getPropertyNameSecure/0>;
 
 /**
- * Tracks if a callback used in `OnAppendCookie` sets `Secure` to `true`.
+ * Tracks if a callback used in `OnAppendCookie` sets `Secure` to `true`, and thus cookies appended to responses are secure by default.
  */
 module OnAppendCookieSecureTracking = DataFlow::Global<OnAppendCookieSecureTrackingConfig>;
 
@@ -191,6 +200,6 @@ private module OnAppendCookieHttpOnlyTrackingConfig =
   OnAppendCookieTrackingConfig<getPropertyNameHttpOnly/0>;
 
 /**
- * Tracks if a callback used in `OnAppendCookie` sets `HttpOnly` to `true`.
+ * Tracks if a callback used in `OnAppendCookie` sets `HttpOnly` to `true`, and thus cookies appended to responses are httponly by default.
  */
 module OnAppendCookieHttpOnlyTracking = DataFlow::Global<OnAppendCookieHttpOnlyTrackingConfig>;
diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/ConditionalBypassQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/ConditionalBypassQuery.qll
index f92bb0d2f44..53b44f873a6 100644
--- a/csharp/ql/lib/semmle/code/csharp/security/dataflow/ConditionalBypassQuery.qll
+++ b/csharp/ql/lib/semmle/code/csharp/security/dataflow/ConditionalBypassQuery.qll
@@ -39,6 +39,15 @@ private module ConditionalBypassConfig implements DataFlow::ConfigSig {
   predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
 
   predicate isBarrier(DataFlow::Node node) { node instanceof Sanitizer }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
+
+  Location getASelectedSinkLocation(DataFlow::Node sink) {
+    result = sink.getLocation()
+    or
+    // from ConditionalBypass.ql
+    result = sink.(Sink).getSensitiveMethodCall().getLocation()
+  }
 }
 
 /**
@@ -63,19 +72,10 @@ class ReverseDnsSource extends Source {
   }
 }
 
-pragma[noinline]
-private predicate conditionControlsCall0(
-  SensitiveExecutionMethodCall call, Expr e, ControlFlow::SuccessorTypes::BooleanSuccessor s
-) {
-  forex(BasicBlock bb | bb = call.getAControlFlowNode().getBasicBlock() | e.controlsBlock(bb, s, _))
-}
-
 private predicate conditionControlsCall(
   SensitiveExecutionMethodCall call, SensitiveExecutionMethod def, Expr e, boolean cond
 ) {
-  exists(ControlFlow::SuccessorTypes::BooleanSuccessor s | cond = s.getValue() |
-    conditionControlsCall0(call, e, s)
-  ) and
+  e.(Guard).directlyControls(call.getBasicBlock(), cond) and
   def = call.getTarget().getUnboundDeclaration()
 }
 
diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/TaintedPathQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/TaintedPathQuery.qll
index 2f20eb6e342..668e3ddcb20 100644
--- a/csharp/ql/lib/semmle/code/csharp/security/dataflow/TaintedPathQuery.qll
+++ b/csharp/ql/lib/semmle/code/csharp/security/dataflow/TaintedPathQuery.qll
@@ -116,7 +116,7 @@ private class WeakGuard extends Guard {
     )
     or
     // Checking against `null` has no bearing on path traversal.
-    this.controlsNode(_, _, any(AbstractValues::NullValue nv))
+    this.controlsNode(_, _, any(GuardValue nv | nv.isNullness(_)))
     or
     this.(LogicalOperation).getAnOperand() instanceof WeakGuard
   }
@@ -130,8 +130,9 @@ private class WeakGuard extends Guard {
 class PathCheck extends Sanitizer {
   PathCheck() {
     // This expression is structurally replicated in a dominating guard which is not a "weak" check
-    exists(Guard g, AbstractValues::BooleanValue v |
+    exists(Guard g, GuardValue v |
       g = this.(GuardedDataFlowNode).getAGuard(_, v) and
+      exists(v.asBooleanValue()) and
       not g instanceof WeakGuard
     )
   }
diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/UnsafeDeserializationQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/UnsafeDeserializationQuery.qll
index 5d9d18dcbac..5b2bd407a5c 100644
--- a/csharp/ql/lib/semmle/code/csharp/security/dataflow/UnsafeDeserializationQuery.qll
+++ b/csharp/ql/lib/semmle/code/csharp/security/dataflow/UnsafeDeserializationQuery.qll
@@ -59,6 +59,10 @@ private module TaintToObjectMethodTrackingConfig implements DataFlow::ConfigSig
   predicate isSink(DataFlow::Node sink) { sink instanceof InstanceMethodSink }
 
   predicate isBarrier(DataFlow::Node node) { node instanceof Sanitizer }
+
+  predicate observeDiffInformedIncrementalMode() {
+    any() // used in one of the disjuncts in UnsafeDeserializationUntrustedInput.ql
+  }
 }
 
 /**
@@ -77,6 +81,10 @@ private module JsonConvertTrackingConfig implements DataFlow::ConfigSig {
   }
 
   predicate isBarrier(DataFlow::Node node) { node instanceof Sanitizer }
+
+  predicate observeDiffInformedIncrementalMode() {
+    any() // used in one of the disjuncts in UnsafeDeserializationUntrustedInput.ql
+  }
 }
 
 /**
@@ -133,6 +141,10 @@ private module TypeNameTrackingConfig implements DataFlow::ConfigSig {
       )
     )
   }
+
+  predicate observeDiffInformedIncrementalMode() {
+    none() // Only used as secondary config in UnsafeDeserializationUntrustedInput.ql
+  }
 }
 
 /**
@@ -149,6 +161,10 @@ private module TaintToConstructorOrStaticMethodTrackingConfig implements DataFlo
   predicate isSink(DataFlow::Node sink) { sink instanceof ConstructorOrStaticMethodSink }
 
   predicate isBarrier(DataFlow::Node node) { node instanceof Sanitizer }
+
+  predicate observeDiffInformedIncrementalMode() {
+    any() // used in one of the disjuncts in UnsafeDeserializationUntrustedInput.ql
+  }
 }
 
 /**
@@ -186,6 +202,10 @@ private module TaintToObjectTypeTrackingConfig implements DataFlow::ConfigSig {
       oc.getObjectType() instanceof StrongTypeDeserializer
     )
   }
+
+  predicate observeDiffInformedIncrementalMode() {
+    none() // only used as secondary config in UnsafeDeserializationUntrustedInput.ql
+  }
 }
 
 /**
@@ -210,6 +230,10 @@ private module WeakTypeCreationToUsageTrackingConfig implements DataFlow::Config
       sink.asExpr() = mc.getQualifier()
     )
   }
+
+  predicate observeDiffInformedIncrementalMode() {
+    none() // only used as secondary config in UnsafeDeserializationUntrustedInput.ql
+  }
 }
 
 /**
@@ -850,7 +874,7 @@ private predicate isStrongTypeFsPicklerCall(MethodCall mc, Method m) {
   (
     m instanceof FsPicklerSerializerClassDeserializeMethod or
     m instanceof FsPicklerSerializerClassDeserializeSequenceMethod or
-    m instanceof FsPicklerSerializerClasDeserializeSiftedMethod or
+    m instanceof FsPicklerSerializerClassDeserializeSiftedMethod or
     m instanceof FsPicklerSerializerClassUnPickleMethod or
     m instanceof FsPicklerSerializerClassUnPickleSiftedMethod or
     m instanceof CsPicklerSerializerClassDeserializeMethod or
diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/UrlRedirectQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/UrlRedirectQuery.qll
index b095305742d..15ba99aedf0 100644
--- a/csharp/ql/lib/semmle/code/csharp/security/dataflow/UrlRedirectQuery.qll
+++ b/csharp/ql/lib/semmle/code/csharp/security/dataflow/UrlRedirectQuery.qll
@@ -111,7 +111,7 @@ class HttpServerTransferSink extends Sink {
   }
 }
 
-private predicate isLocalUrlSanitizerMethodCall(MethodCall guard, Expr e, AbstractValue v) {
+private predicate isLocalUrlSanitizerMethodCall(MethodCall guard, Expr e, GuardValue v) {
   exists(Method m | m = guard.getTarget() |
     m.hasName("IsLocalUrl") and
     e = guard.getArgument(0)
@@ -119,10 +119,10 @@ private predicate isLocalUrlSanitizerMethodCall(MethodCall guard, Expr e, Abstra
     m.hasName("IsUrlLocalToHost") and
     e = guard.getArgument(1)
   ) and
-  v.(AbstractValues::BooleanValue).getValue() = true
+  v.asBooleanValue() = true
 }
 
-private predicate isLocalUrlSanitizer(Guard g, Expr e, AbstractValue v) {
+private predicate isLocalUrlSanitizer(Guard g, Expr e, GuardValue v) {
   isLocalUrlSanitizerMethodCall(g, e, v)
 }
 
@@ -137,14 +137,14 @@ class LocalUrlSanitizer extends Sanitizer {
 /**
  * An argument to a call to `List.Contains()` that is a sanitizer for URL redirects.
  */
-private predicate isContainsUrlSanitizer(Guard guard, Expr e, AbstractValue v) {
+private predicate isContainsUrlSanitizer(Guard guard, Expr e, GuardValue v) {
   guard =
     any(MethodCall method |
       exists(Method m | m = method.getTarget() |
         m.hasName("Contains") and
         e = method.getArgument(0)
       ) and
-      v.(AbstractValues::BooleanValue).getValue() = true
+      v.asBooleanValue() = true
     )
 }
 
@@ -163,12 +163,12 @@ class ContainsUrlSanitizer extends Sanitizer {
 /**
  * A check that the URL is relative, and therefore safe for URL redirects.
  */
-private predicate isRelativeUrlSanitizer(Guard guard, Expr e, AbstractValue v) {
+private predicate isRelativeUrlSanitizer(Guard guard, Expr e, GuardValue v) {
   guard =
     any(PropertyAccess access |
       access.getProperty().hasFullyQualifiedName("System", "Uri", "IsAbsoluteUri") and
       e = access.getQualifier() and
-      v.(AbstractValues::BooleanValue).getValue() = false
+      v.asBooleanValue() = false
     )
 }
 
@@ -185,16 +185,14 @@ class RelativeUrlSanitizer extends Sanitizer {
  * A comparison on the `Host` property of a url, that is a sanitizer for URL redirects.
  * E.g. `url.Host == "example.org"`
  */
-private predicate isHostComparisonSanitizer(Guard guard, Expr e, AbstractValue v) {
+private predicate isHostComparisonSanitizer(Guard guard, Expr e, GuardValue v) {
   guard =
     any(EqualityOperation comparison |
       exists(PropertyAccess access | access = comparison.getAnOperand() |
         access.getProperty().hasFullyQualifiedName("System", "Uri", "Host") and
         e = access.getQualifier()
       ) and
-      if comparison instanceof EQExpr
-      then v.(AbstractValues::BooleanValue).getValue() = true
-      else v.(AbstractValues::BooleanValue).getValue() = false
+      if comparison instanceof EQExpr then v.asBooleanValue() = true else v.asBooleanValue() = false
     )
 }
 
diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/ZipSlipQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/ZipSlipQuery.qll
index 1639563e964..4a2b2759143 100644
--- a/csharp/ql/lib/semmle/code/csharp/security/dataflow/ZipSlipQuery.qll
+++ b/csharp/ql/lib/semmle/code/csharp/security/dataflow/ZipSlipQuery.qll
@@ -130,7 +130,7 @@ class SubstringSanitizer extends Sanitizer {
   }
 }
 
-private predicate stringCheckGuard(Guard g, Expr e, AbstractValue v) {
+private predicate stringCheckGuard(Guard g, Expr e, GuardValue v) {
   g.(MethodCall).getTarget().hasFullyQualifiedName("System", "String", "StartsWith") and
   g.(MethodCall).getQualifier() = e and
   // A StartsWith check against Path.Combine is not sufficient, because the ".." elements have
@@ -139,7 +139,7 @@ private predicate stringCheckGuard(Guard g, Expr e, AbstractValue v) {
     combineCall.getTarget().hasFullyQualifiedName("System.IO", "Path", "Combine") and
     DataFlow::localExprFlow(combineCall, e)
   ) and
-  v.(AbstractValues::BooleanValue).getValue() = true
+  v.asBooleanValue() = true
 }
 
 /**
diff --git a/csharp/ql/lib/semmle/code/csharp/serialization/Deserializers.qll b/csharp/ql/lib/semmle/code/csharp/serialization/Deserializers.qll
index aeb34122284..f7c6ade96ea 100644
--- a/csharp/ql/lib/semmle/code/csharp/serialization/Deserializers.qll
+++ b/csharp/ql/lib/semmle/code/csharp/serialization/Deserializers.qll
@@ -560,9 +560,15 @@ class FsPicklerSerializerClassDeserializeSequenceMethod extends Method, UnsafeDe
   }
 }
 
+/**
+ * DEPRECATED: Use `FsPicklerSerializerClassDeserializeSiftedMethod` instead.
+ */
+deprecated class FsPicklerSerializerClasDeserializeSiftedMethod =
+  FsPicklerSerializerClassDeserializeSiftedMethod;
+
 /** `MBrace.FsPickler.FsPicklerSerializer.DeserializeSifted` method */
-class FsPicklerSerializerClasDeserializeSiftedMethod extends Method, UnsafeDeserializer {
-  FsPicklerSerializerClasDeserializeSiftedMethod() {
+class FsPicklerSerializerClassDeserializeSiftedMethod extends Method, UnsafeDeserializer {
+  FsPicklerSerializerClassDeserializeSiftedMethod() {
     this.getDeclaringType().getBaseClass*() instanceof FsPicklerSerializerClass and
     this.hasUndecoratedName("DeserializeSifted")
   }
diff --git a/csharp/ql/lib/semmlecode.csharp.dbscheme b/csharp/ql/lib/semmlecode.csharp.dbscheme
index 66044cfa5bb..68b5aec54e5 100644
--- a/csharp/ql/lib/semmlecode.csharp.dbscheme
+++ b/csharp/ql/lib/semmlecode.csharp.dbscheme
@@ -194,6 +194,24 @@ externalData(
 sourceLocationPrefix(
   string prefix: string ref);
 
+/*
+ * Overlay support
+ */
+
+/**
+ * The CLI will automatically emit the tuple `databaseMetadata("isOverlay", "true")`,
+ * along with an `overlayChangedFiles` tuple for each new/modified/deleted file,
+ * when building an overlay database, and these can be used by the discard predicates.
+ */
+databaseMetadata(
+  string metadataKey : string ref,
+  string value : string ref
+);
+
+overlayChangedFiles(
+  string path : string ref
+);
+
 /*
  * C# dbscheme
  */
@@ -222,6 +240,12 @@ sourceLocationPrefix(
 
 @location = @location_default | @assembly;
 
+@locatable = @declaration_with_accessors | @callable_accessor | @declaration_or_directive
+           | @diagnostic | @extractor_message | @preprocessor_directive | @attribute | @type_mention | @type_parameter_constraints
+           | @declaration_with_accessors | @callable_accessor | @operator | @method
+           | @constructor | @destructor | @field | @local_variable | @parameter | @stmt | @expr
+           | @xmllocatable | @commentline | @commentblock | @asp_element
+
 locations_default(
   unique int id: @location_default,
   int file: @file ref,
diff --git a/csharp/ql/lib/upgrades/605f85053409cd72b4904df3f198ddc8324f3a83/old.dbscheme b/csharp/ql/lib/upgrades/605f85053409cd72b4904df3f198ddc8324f3a83/old.dbscheme
new file mode 100644
index 00000000000..605f8505340
--- /dev/null
+++ b/csharp/ql/lib/upgrades/605f85053409cd72b4904df3f198ddc8324f3a83/old.dbscheme
@@ -0,0 +1,1478 @@
+/* This is a dummy line to alter the dbscheme, so we can make a database upgrade
+ * without actually changing any of the dbscheme predicates. It contains a date
+ * to allow for such updates in the future as well.
+ *
+ * 2021-07-14
+ *
+ * DO NOT remove this comment carelessly, since it can revert the dbscheme back to a
+ * previously seen state (matching a previously seen SHA), which would make the upgrade
+ * mechanism not work properly.
+ */
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+compilation_info(
+  int id : @compilation ref,
+  string info_key: string ref,
+  string info_value: string ref
+)
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | --compiler
+ * 1   | *path to compiler*
+ * 2   | f1.cs
+ * 3   | f2.cs
+ * 4   | f3.cs
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@someFile.rsp` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.cs
+ * 1   | f2.cs
+ * 2   | f3.cs
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The references used by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs /r:ref1.dll /r:ref2.dll /r:ref3.dll
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | ref1.dll
+ * 1   | ref2.dll
+ * 2   | ref3.dll
+ */
+#keyset[id, num]
+compilation_referencing_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    unique int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location ref
+);
+
+extractor_messages(
+    unique int id: @extractor_message,
+    int severity: int ref,
+    string origin : string ref,
+    string text : string ref,
+    string entity : string ref,
+    int location: @location ref,
+    string stack_trace : string ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+compilation_assembly(
+  unique int id : @compilation ref,
+  int assembly: @assembly ref
+)
+
+// Populated by the CSV extractor
+externalData(
+   int id: @externalDataElement,
+   string path: string ref,
+   int column: int ref,
+   string value: string ref);
+
+sourceLocationPrefix(
+  string prefix: string ref);
+
+/*
+ * Overlay support
+ */
+
+/**
+ * The CLI will automatically emit the tuple `databaseMetadata("isOverlay", "true")`,
+ * along with an `overlayChangedFiles` tuple for each new/modified/deleted file,
+ * when building an overlay database, and these can be used by the discard predicates.
+ */
+databaseMetadata(
+  string metadataKey : string ref,
+  string value : string ref
+);
+
+overlayChangedFiles(
+  string path : string ref
+);
+
+/*
+ * C# dbscheme
+ */
+
+/** ELEMENTS **/
+
+@element = @declaration | @stmt | @expr | @modifier | @attribute | @namespace_declaration
+         | @using_directive | @type_parameter_constraints | @externalDataElement
+         | @xmllocatable | @asp_element | @namespace | @preprocessor_directive;
+
+@declaration = @callable | @generic | @assignable | @namespace;
+
+@named_element = @namespace | @declaration;
+
+@declaration_with_accessors = @property | @indexer | @event;
+
+@assignable = @variable | @assignable_with_accessors | @event;
+
+@assignable_with_accessors = @property | @indexer;
+
+@attributable = @assembly | @field | @parameter | @operator | @method | @constructor
+              | @destructor | @callable_accessor | @value_or_ref_type | @declaration_with_accessors
+              | @local_function | @lambda_expr;
+
+/** LOCATIONS, ASEMMBLIES, MODULES, FILES and FOLDERS **/
+
+@location = @location_default | @assembly;
+
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref);
+
+locations_mapped(
+  unique int id: @location_default ref,
+  int mapped_to: @location_default ref);
+
+@sourceline = @file | @callable | @xmllocatable;
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref);
+
+assemblies(
+  unique int id: @assembly,
+  int file: @file ref,
+  string fullname: string ref,
+  string name: string ref,
+  string version: string ref);
+
+files(
+  unique int id: @file,
+  string name: string ref);
+
+folders(
+  unique int id: @folder,
+  string name: string ref);
+
+@container = @folder | @file ;
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref);
+
+file_extraction_mode(
+  unique int file: @file ref,
+  int mode: int ref
+  /* 0 = normal, 1 = standalone extractor */
+  );
+
+/** NAMESPACES **/
+
+@type_container = @namespace | @type;
+
+namespaces(
+  unique int id: @namespace,
+  string name: string ref);
+
+namespace_declarations(
+  unique int id: @namespace_declaration,
+  int namespace_id: @namespace ref);
+
+namespace_declaration_location(
+  unique int id: @namespace_declaration ref,
+  int loc: @location ref);
+
+parent_namespace(
+  unique int child_id: @type_container ref,
+  int namespace_id: @namespace ref);
+
+@declaration_or_directive = @namespace_declaration | @type | @using_directive;
+
+parent_namespace_declaration(
+  int child_id: @declaration_or_directive ref, // cannot be unique because of partial classes
+  int namespace_id: @namespace_declaration ref);
+
+@using_directive = @using_namespace_directive | @using_static_directive;
+
+using_global(
+  unique int id: @using_directive ref
+);
+
+using_namespace_directives(
+  unique int id: @using_namespace_directive,
+  int namespace_id: @namespace ref);
+
+using_static_directives(
+  unique int id: @using_static_directive,
+  int type_id: @type_or_ref ref);
+
+using_directive_location(
+  unique int id: @using_directive ref,
+  int loc: @location ref);
+
+@preprocessor_directive = @pragma_warning | @pragma_checksum | @directive_define | @directive_undefine | @directive_warning
+  | @directive_error | @directive_nullable | @directive_line | @directive_region | @directive_endregion | @directive_if
+  | @directive_elif | @directive_else | @directive_endif;
+
+@conditional_directive = @directive_if | @directive_elif;
+@branch_directive = @directive_if | @directive_elif | @directive_else;
+
+directive_ifs(
+  unique int id: @directive_if,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref); /* 0: false, 1: true */
+
+directive_elifs(
+  unique int id: @directive_elif,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref,  /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+directive_elses(
+  unique int id: @directive_else,
+  int branchTaken: int ref,   /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+#keyset[id, start]
+directive_endifs(
+  unique int id: @directive_endif,
+  unique int start: @directive_if ref);
+
+directive_define_symbols(
+  unique int id: @define_symbol_expr ref,
+  string name: string ref);
+
+directive_regions(
+  unique int id: @directive_region,
+  string name: string ref);
+
+#keyset[id, start]
+directive_endregions(
+  unique int id: @directive_endregion,
+  unique int start: @directive_region ref);
+
+directive_lines(
+  unique int id: @directive_line,
+  int kind: int ref); /* 0: default, 1: hidden, 2: numeric, 3: span */
+
+directive_line_value(
+  unique int id: @directive_line ref,
+  int line: int ref);
+
+directive_line_file(
+  unique int id: @directive_line ref,
+  int file: @file ref);
+
+directive_line_offset(
+  unique int id: @directive_line ref,
+  int offset: int ref);
+
+directive_line_span(
+  unique int id: @directive_line ref,
+  int startLine: int ref,
+  int startColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref);
+
+directive_nullables(
+  unique int id: @directive_nullable,
+  int setting: int ref, /* 0: disable, 1: enable, 2: restore */
+  int target: int ref); /* 0: none, 1: annotations, 2: warnings */
+
+directive_warnings(
+  unique int id: @directive_warning,
+  string message: string ref);
+
+directive_errors(
+  unique int id: @directive_error,
+  string message: string ref);
+
+directive_undefines(
+  unique int id: @directive_undefine,
+  string name: string ref);
+
+directive_defines(
+  unique int id: @directive_define,
+  string name: string ref);
+
+pragma_checksums(
+  unique int id: @pragma_checksum,
+  int file: @file ref,
+  string guid: string ref,
+  string bytes: string ref);
+
+pragma_warnings(
+  unique int id: @pragma_warning,
+  int kind: int ref /* 0 = disable, 1 = restore */);
+
+#keyset[id, index]
+pragma_warning_error_codes(
+  int id: @pragma_warning ref,
+  string errorCode: string ref,
+  int index: int ref);
+
+preprocessor_directive_location(
+  unique int id: @preprocessor_directive ref,
+  int loc: @location ref);
+
+preprocessor_directive_compilation(
+  int id: @preprocessor_directive ref,
+  int compilation: @compilation ref);
+
+preprocessor_directive_active(
+  unique int id: @preprocessor_directive ref,
+  int active: int ref);  /* 0: false, 1: true */
+
+/** TYPES **/
+
+types(
+  unique int id: @type,
+  int kind: int ref,
+  string name: string ref);
+
+case @type.kind of
+   1 = @bool_type
+|  2 = @char_type
+|  3 = @decimal_type
+|  4 = @sbyte_type
+|  5 = @short_type
+|  6 = @int_type
+|  7 = @long_type
+|  8 = @byte_type
+|  9 = @ushort_type
+| 10 = @uint_type
+| 11 = @ulong_type
+| 12 = @float_type
+| 13 = @double_type
+| 14 = @enum_type
+| 15 = @struct_type
+| 17 = @class_type
+| 19 = @interface_type
+| 20 = @delegate_type
+| 21 = @null_type
+| 22 = @type_parameter
+| 23 = @pointer_type
+| 24 = @nullable_type
+| 25 = @array_type
+| 26 = @void_type
+| 27 = @int_ptr_type
+| 28 = @uint_ptr_type
+| 29 = @dynamic_type
+| 30 = @arglist_type
+| 31 = @unknown_type
+| 32 = @tuple_type
+| 33 = @function_pointer_type
+| 34 = @inline_array_type
+  ;
+
+@simple_type = @bool_type | @char_type | @integral_type | @floating_point_type | @decimal_type;
+@integral_type = @signed_integral_type | @unsigned_integral_type;
+@signed_integral_type = @sbyte_type | @short_type | @int_type | @long_type;
+@unsigned_integral_type = @byte_type  | @ushort_type | @uint_type | @ulong_type;
+@floating_point_type = @float_type | @double_type;
+@value_type = @simple_type | @enum_type | @struct_type | @nullable_type | @int_ptr_type
+            | @uint_ptr_type | @tuple_type | @void_type | @inline_array_type;
+@ref_type = @class_type | @interface_type | @array_type | @delegate_type | @null_type
+          | @dynamic_type;
+@value_or_ref_type = @value_type | @ref_type;
+
+typerefs(
+  unique int id: @typeref,
+  string name: string ref);
+
+typeref_type(
+  int id: @typeref ref,
+  unique int typeId: @type ref);
+
+@type_or_ref = @type | @typeref;
+
+array_element_type(
+  unique int array: @array_type ref,
+  int dimension: int ref,
+  int rank: int ref,
+  int element: @type_or_ref ref);
+
+nullable_underlying_type(
+  unique int nullable: @nullable_type ref,
+  int underlying: @type_or_ref ref);
+
+pointer_referent_type(
+  unique int pointer: @pointer_type ref,
+  int referent: @type_or_ref ref);
+
+enum_underlying_type(
+  unique int enum_id: @enum_type ref,
+  int underlying_type_id: @type_or_ref ref);
+
+delegate_return_type(
+  unique int delegate_id: @delegate_type ref,
+  int return_type_id: @type_or_ref ref);
+
+function_pointer_return_type(
+    unique int function_pointer_id: @function_pointer_type ref,
+    int return_type_id: @type_or_ref ref);
+
+extend(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+anonymous_types(
+  unique int id: @type ref);
+
+@interface_or_ref = @interface_type | @typeref;
+
+implement(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+type_location(
+  int id: @type ref,
+  int loc: @location ref);
+
+tuple_underlying_type(
+  unique int tuple: @tuple_type ref,
+  int struct: @type_or_ref ref);
+
+#keyset[tuple, index]
+tuple_element(
+  int tuple: @tuple_type ref,
+  int index: int ref,
+  unique int field: @field ref);
+
+attributes(
+  unique int id: @attribute,
+  int kind: int ref,
+  int type_id: @type_or_ref ref,
+  int target:  @attributable ref);
+
+case @attribute.kind of
+  0 = @attribute_default
+| 1 = @attribute_return
+| 2 = @attribute_assembly
+| 3 = @attribute_module
+;
+
+attribute_location(
+  int id: @attribute ref,
+  int loc: @location ref);
+
+@type_mention_parent = @element | @type_mention;
+
+type_mention(
+  unique int id: @type_mention,
+  int type_id: @type_or_ref ref,
+  int parent: @type_mention_parent ref);
+
+type_mention_location(
+  unique int id: @type_mention ref,
+  int loc: @location ref);
+
+@has_type_annotation = @assignable | @type_parameter | @callable | @expr | @delegate_type | @generic | @function_pointer_type;
+
+/**
+ * A direct annotation on an entity, for example `string? x;`.
+ *
+ * Annotations:
+ * 2 = reftype is not annotated "!"
+ * 3 = reftype is annotated "?"
+ * 4 = readonly ref type / in parameter
+ * 5 = ref type parameter, return or local variable
+ * 6 = out parameter
+ *
+ * Note that the annotation depends on the element it annotates.
+ * @assignable: The annotation is on the type of the assignable, for example the variable type.
+ * @type_parameter: The annotation is on the reftype constraint
+ * @callable: The annotation is on the return type
+ * @array_type: The annotation is on the element type
+ */
+type_annotation(int id: @has_type_annotation ref, int annotation: int ref);
+
+nullability(unique int nullability: @nullability, int kind: int ref);
+
+case @nullability.kind of
+  0 = @oblivious
+| 1 = @not_annotated
+| 2 = @annotated
+;
+
+#keyset[parent, index]
+nullability_parent(int nullability: @nullability ref, int index: int ref, int parent: @nullability ref)
+
+type_nullability(int id: @has_type_annotation ref, int nullability: @nullability ref);
+
+/**
+ * The nullable flow state of an expression, as determined by Roslyn.
+ *   0 = none (default, not populated)
+ *   1 = not null
+ *   2 = maybe null
+ */
+expr_flowstate(unique int id: @expr ref, int state: int ref);
+
+/** GENERICS **/
+
+@generic = @type | @method | @local_function;
+
+type_parameters(
+  unique int id: @type_parameter ref,
+  int index: int ref,
+  int generic_id: @generic ref,
+  int variance: int ref /* none = 0, out = 1, in = 2 */);
+
+#keyset[constructed_id, index]
+type_arguments(
+  int id: @type_or_ref ref,
+  int index: int ref,
+  int constructed_id: @generic_or_ref ref);
+
+@generic_or_ref = @generic | @typeref;
+
+constructed_generic(
+  unique int constructed: @generic ref,
+  int generic: @generic_or_ref ref);
+
+type_parameter_constraints(
+  unique int id: @type_parameter_constraints,
+  int param_id: @type_parameter ref);
+
+type_parameter_constraints_location(
+  int id: @type_parameter_constraints ref,
+  int loc: @location ref);
+
+general_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int kind: int ref /* class = 1, struct = 2, new = 3 */);
+
+specific_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref);
+
+specific_type_parameter_nullability(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref,
+  int nullability: @nullability ref);
+
+/** FUNCTION POINTERS */
+
+function_pointer_calling_conventions(
+  int id: @function_pointer_type ref,
+  int kind: int ref);
+
+#keyset[id, index]
+has_unmanaged_calling_conventions(
+  int id: @function_pointer_type ref,
+  int index: int ref,
+  int conv_id: @type_or_ref ref);
+
+/** MODIFIERS */
+
+@modifiable = @modifiable_direct | @event_accessor;
+
+@modifiable_direct = @member | @accessor | @local_function | @anonymous_function_expr;
+
+modifiers(
+  unique int id: @modifier,
+  string name: string ref);
+
+has_modifiers(
+  int id: @modifiable_direct ref,
+  int mod_id: @modifier ref);
+
+/** MEMBERS **/
+
+@member = @method | @constructor | @destructor | @field | @property | @event | @operator | @indexer | @type;
+
+@named_exprorstmt = @goto_stmt | @labeled_stmt | @expr;
+
+@virtualizable = @method | @property | @indexer | @event | @operator;
+
+exprorstmt_name(
+  unique int parent_id: @named_exprorstmt ref,
+  string name: string ref);
+
+nested_types(
+  unique int id: @type ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @type ref);
+
+properties(
+  unique int id: @property,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @property ref);
+
+property_location(
+  int id: @property ref,
+  int loc: @location ref);
+
+indexers(
+  unique int id: @indexer,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @indexer ref);
+
+indexer_location(
+  int id: @indexer ref,
+  int loc: @location ref);
+
+accessors(
+  unique int id: @accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_member_id: @member ref,
+  int unbound_id: @accessor ref);
+
+case @accessor.kind of
+  1 = @getter
+| 2 = @setter
+  ;
+
+init_only_accessors(
+  unique int id: @accessor ref);
+
+accessor_location(
+  int id: @accessor ref,
+  int loc: @location ref);
+
+events(
+  unique int id: @event,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @event ref);
+
+event_location(
+  int id: @event ref,
+  int loc: @location ref);
+
+event_accessors(
+  unique int id: @event_accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_event_id: @event ref,
+  int unbound_id: @event_accessor ref);
+
+case @event_accessor.kind of
+  1 = @add_event_accessor
+| 2 = @remove_event_accessor
+  ;
+
+event_accessor_location(
+  int id: @event_accessor ref,
+  int loc: @location ref);
+
+operators(
+  unique int id: @operator,
+  string name: string ref,
+  string symbol: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @operator ref);
+
+operator_location(
+  int id: @operator ref,
+  int loc: @location ref);
+
+constant_value(
+  int id: @variable ref,
+  string value: string ref);
+
+/** CALLABLES **/
+
+@callable = @method | @constructor | @destructor | @operator | @callable_accessor | @anonymous_function_expr | @local_function;
+
+@callable_accessor = @accessor | @event_accessor;
+
+methods(
+  unique int id: @method,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @method ref);
+
+method_location(
+  int id: @method ref,
+  int loc: @location ref);
+
+constructors(
+  unique int id: @constructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @constructor ref);
+
+constructor_location(
+  int id: @constructor ref,
+  int loc: @location ref);
+
+destructors(
+  unique int id: @destructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @destructor ref);
+
+destructor_location(
+  int id: @destructor ref,
+  int loc: @location ref);
+
+overrides(
+  int id: @callable ref,
+  int base_id: @callable ref);
+
+explicitly_implements(
+  int id: @member ref,
+  int interface_id: @interface_or_ref ref);
+
+local_functions(
+    unique int id: @local_function,
+    string name: string ref,
+    int return_type: @type ref,
+    int unbound_id: @local_function ref);
+
+local_function_stmts(
+    unique int fn: @local_function_stmt ref,
+    int stmt: @local_function ref);
+
+/** VARIABLES **/
+
+@variable = @local_scope_variable | @field;
+
+@local_scope_variable = @local_variable | @parameter;
+
+fields(
+  unique int id: @field,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @field ref);
+
+case @field.kind of
+  1 = @addressable_field
+| 2 = @constant
+  ;
+
+field_location(
+  int id: @field ref,
+  int loc: @location ref);
+
+localvars(
+  unique int id: @local_variable,
+  int kind: int ref,
+  string name: string ref,
+  int implicitly_typed: int ref /* 0 = no, 1 = yes */,
+  int type_id: @type_or_ref ref,
+  int parent_id: @local_var_decl_expr ref);
+
+case @local_variable.kind of
+  1 = @addressable_local_variable
+| 2 = @local_constant
+| 3 = @local_variable_ref
+  ;
+
+localvar_location(
+  unique int id: @local_variable ref,
+  int loc: @location ref);
+
+@parameterizable = @callable | @delegate_type | @indexer | @function_pointer_type;
+
+#keyset[name, parent_id]
+#keyset[index, parent_id]
+params(
+  unique int id: @parameter,
+  string name: string ref,
+  int type_id: @type_or_ref ref,
+  int index: int ref,
+  int mode: int ref, /* value = 0, ref = 1, out = 2, params/array = 3, this = 4, in = 5, ref readonly = 6 */
+  int parent_id: @parameterizable ref,
+  int unbound_id: @parameter ref);
+
+param_location(
+  int id: @parameter ref,
+  int loc: @location ref);
+
+@has_scoped_annotation = @local_scope_variable
+
+scoped_annotation(
+  int id: @has_scoped_annotation ref,
+  int kind: int ref // scoped ref = 1, scoped value = 2
+  );
+
+/** STATEMENTS **/
+
+@exprorstmt_parent = @control_flow_element | @top_level_exprorstmt_parent;
+
+statements(
+  unique int id: @stmt,
+  int kind: int ref);
+
+#keyset[index, parent]
+stmt_parent(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_stmt_parent = @callable;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+stmt_parent_top_level(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @top_level_stmt_parent ref);
+
+case @stmt.kind of
+   1 = @block_stmt
+|  2 = @expr_stmt
+|  3 = @if_stmt
+|  4 = @switch_stmt
+|  5 = @while_stmt
+|  6 = @do_stmt
+|  7 = @for_stmt
+|  8 = @foreach_stmt
+|  9 = @break_stmt
+| 10 = @continue_stmt
+| 11 = @goto_stmt
+| 12 = @goto_case_stmt
+| 13 = @goto_default_stmt
+| 14 = @throw_stmt
+| 15 = @return_stmt
+| 16 = @yield_stmt
+| 17 = @try_stmt
+| 18 = @checked_stmt
+| 19 = @unchecked_stmt
+| 20 = @lock_stmt
+| 21 = @using_block_stmt
+| 22 = @var_decl_stmt
+| 23 = @const_decl_stmt
+| 24 = @empty_stmt
+| 25 = @unsafe_stmt
+| 26 = @fixed_stmt
+| 27 = @label_stmt
+| 28 = @catch
+| 29 = @case_stmt
+| 30 = @local_function_stmt
+| 31 = @using_decl_stmt
+  ;
+
+@using_stmt = @using_block_stmt | @using_decl_stmt;
+
+@labeled_stmt = @label_stmt | @case;
+
+@decl_stmt = @var_decl_stmt | @const_decl_stmt | @using_decl_stmt;
+
+@cond_stmt = @if_stmt | @switch_stmt;
+
+@loop_stmt = @while_stmt | @do_stmt | @for_stmt | @foreach_stmt;
+
+@jump_stmt = @break_stmt | @goto_any_stmt | @continue_stmt | @throw_stmt | @return_stmt
+           | @yield_stmt;
+
+@goto_any_stmt = @goto_default_stmt | @goto_case_stmt | @goto_stmt;
+
+
+stmt_location(
+  unique int id: @stmt ref,
+  int loc: @location ref);
+
+catch_type(
+  unique int catch_id: @catch ref,
+  int type_id: @type_or_ref ref,
+  int kind: int ref /* explicit = 1, implicit = 2 */);
+
+foreach_stmt_info(
+  unique int id: @foreach_stmt ref,
+  int kind: int ref /* non-async = 1, async = 2 */);
+
+@foreach_symbol =  @method | @property | @type_or_ref;
+
+#keyset[id, kind]
+foreach_stmt_desugar(
+  int id: @foreach_stmt ref,
+  int symbol: @foreach_symbol ref,
+  int kind: int ref /* GetEnumeratorMethod = 1, CurrentProperty = 2, MoveNextMethod = 3, DisposeMethod = 4, ElementType = 5 */);
+
+/** EXPRESSIONS **/
+
+expressions(
+  unique int id: @expr,
+  int kind: int ref,
+  int type_id: @type_or_ref ref);
+
+#keyset[index, parent]
+expr_parent(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_expr_parent = @attribute | @field | @property | @indexer | @parameter | @directive_if | @directive_elif;
+
+@top_level_exprorstmt_parent = @top_level_expr_parent | @top_level_stmt_parent;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+expr_parent_top_level(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @top_level_exprorstmt_parent ref);
+
+case @expr.kind of
+/* literal */
+   1 = @bool_literal_expr
+|  2 = @char_literal_expr
+|  3 = @decimal_literal_expr
+|  4 = @int_literal_expr
+|  5 = @long_literal_expr
+|  6 = @uint_literal_expr
+|  7 = @ulong_literal_expr
+|  8 = @float_literal_expr
+|  9 = @double_literal_expr
+| 10 = @utf16_string_literal_expr
+| 11 = @null_literal_expr
+/* primary & unary */
+| 12 = @this_access_expr
+| 13 = @base_access_expr
+| 14 = @local_variable_access_expr
+| 15 = @parameter_access_expr
+| 16 = @field_access_expr
+| 17 = @property_access_expr
+| 18 = @method_access_expr
+| 19 = @event_access_expr
+| 20 = @indexer_access_expr
+| 21 = @array_access_expr
+| 22 = @type_access_expr
+| 23 = @typeof_expr
+| 24 = @method_invocation_expr
+| 25 = @delegate_invocation_expr
+| 26 = @operator_invocation_expr
+| 27 = @cast_expr
+| 28 = @object_creation_expr
+| 29 = @explicit_delegate_creation_expr
+| 30 = @implicit_delegate_creation_expr
+| 31 = @array_creation_expr
+| 32 = @default_expr
+| 33 = @plus_expr
+| 34 = @minus_expr
+| 35 = @bit_not_expr
+| 36 = @log_not_expr
+| 37 = @post_incr_expr
+| 38 = @post_decr_expr
+| 39 = @pre_incr_expr
+| 40 = @pre_decr_expr
+/* multiplicative */
+| 41 = @mul_expr
+| 42 = @div_expr
+| 43 = @rem_expr
+/* additive */
+| 44 = @add_expr
+| 45 = @sub_expr
+/* shift */
+| 46 = @lshift_expr
+| 47 = @rshift_expr
+/* relational */
+| 48 = @lt_expr
+| 49 = @gt_expr
+| 50 = @le_expr
+| 51 = @ge_expr
+/* equality */
+| 52 = @eq_expr
+| 53 = @ne_expr
+/* logical */
+| 54 = @bit_and_expr
+| 55 = @bit_xor_expr
+| 56 = @bit_or_expr
+| 57 = @log_and_expr
+| 58 = @log_or_expr
+/* type testing */
+| 59 = @is_expr
+| 60 = @as_expr
+/* null coalescing */
+| 61 = @null_coalescing_expr
+/* conditional */
+| 62 = @conditional_expr
+/* assignment */
+| 63 = @simple_assign_expr
+| 64 = @assign_add_expr
+| 65 = @assign_sub_expr
+| 66 = @assign_mul_expr
+| 67 = @assign_div_expr
+| 68 = @assign_rem_expr
+| 69 = @assign_and_expr
+| 70 = @assign_xor_expr
+| 71 = @assign_or_expr
+| 72 = @assign_lshift_expr
+| 73 = @assign_rshift_expr
+/* more */
+| 74 = @object_init_expr
+| 75 = @collection_init_expr
+| 76 = @array_init_expr
+| 77 = @checked_expr
+| 78 = @unchecked_expr
+| 79 = @constructor_init_expr
+| 80 = @add_event_expr
+| 81 = @remove_event_expr
+| 82 = @par_expr
+| 83 = @local_var_decl_expr
+| 84 = @lambda_expr
+| 85 = @anonymous_method_expr
+| 86 = @namespace_expr
+/* dynamic */
+| 92 = @dynamic_element_access_expr
+| 93 = @dynamic_member_access_expr
+/* unsafe */
+| 100 = @pointer_indirection_expr
+| 101 = @address_of_expr
+| 102 = @sizeof_expr
+/* async */
+| 103 = @await_expr
+/* C# 6.0 */
+| 104 = @nameof_expr
+| 105 = @interpolated_string_expr
+| 106 = @unknown_expr
+/* C# 7.0 */
+| 107 = @throw_expr
+| 108 = @tuple_expr
+| 109 = @local_function_invocation_expr
+| 110 = @ref_expr
+| 111 = @discard_expr
+/* C# 8.0 */
+| 112 = @range_expr
+| 113 = @index_expr
+| 114 = @switch_expr
+| 115 = @recursive_pattern_expr
+| 116 = @property_pattern_expr
+| 117 = @positional_pattern_expr
+| 118 = @switch_case_expr
+| 119 = @assign_coalesce_expr
+| 120 = @suppress_nullable_warning_expr
+| 121 = @namespace_access_expr
+/* C# 9.0 */
+| 122 = @lt_pattern_expr
+| 123 = @gt_pattern_expr
+| 124 = @le_pattern_expr
+| 125 = @ge_pattern_expr
+| 126 = @not_pattern_expr
+| 127 = @and_pattern_expr
+| 128 = @or_pattern_expr
+| 129 = @function_pointer_invocation_expr
+| 130 = @with_expr
+/* C# 11.0 */
+| 131 = @list_pattern_expr
+| 132 = @slice_pattern_expr
+| 133 = @urshift_expr
+| 134 = @assign_urshift_expr
+| 135 = @utf8_string_literal_expr
+/* C# 12.0 */
+| 136 = @collection_expr
+| 137 = @spread_element_expr
+| 138 = @interpolated_string_insert_expr
+/* Preprocessor */
+| 999 = @define_symbol_expr
+;
+
+@switch = @switch_stmt | @switch_expr;
+@case = @case_stmt | @switch_case_expr;
+@pattern_match = @case | @is_expr;
+@unary_pattern_expr = @not_pattern_expr;
+@relational_pattern_expr = @gt_pattern_expr | @lt_pattern_expr | @ge_pattern_expr | @le_pattern_expr;
+@binary_pattern_expr = @and_pattern_expr | @or_pattern_expr;
+
+@integer_literal_expr = @int_literal_expr | @long_literal_expr | @uint_literal_expr | @ulong_literal_expr;
+@real_literal_expr = @float_literal_expr | @double_literal_expr | @decimal_literal_expr;
+@string_literal_expr = @utf16_string_literal_expr | @utf8_string_literal_expr;
+@literal_expr = @bool_literal_expr | @char_literal_expr | @integer_literal_expr | @real_literal_expr
+              | @string_literal_expr | @null_literal_expr;
+
+@assign_expr = @simple_assign_expr | @assign_op_expr | @local_var_decl_expr;
+@assign_op_expr =  @assign_arith_expr | @assign_bitwise_expr | @assign_event_expr | @assign_coalesce_expr;
+@assign_event_expr = @add_event_expr | @remove_event_expr;
+
+@assign_arith_expr = @assign_add_expr | @assign_sub_expr | @assign_mul_expr | @assign_div_expr
+                   | @assign_rem_expr
+@assign_bitwise_expr = @assign_and_expr | @assign_or_expr | @assign_xor_expr
+                   | @assign_lshift_expr | @assign_rshift_expr | @assign_urshift_expr;
+
+@member_access_expr = @field_access_expr | @property_access_expr | @indexer_access_expr | @event_access_expr
+                    | @method_access_expr | @type_access_expr | @dynamic_member_access_expr;
+@access_expr = @member_access_expr | @this_access_expr | @base_access_expr | @assignable_access_expr | @namespace_access_expr;
+@element_access_expr = @indexer_access_expr | @array_access_expr | @dynamic_element_access_expr;
+
+@local_variable_access = @local_variable_access_expr | @local_var_decl_expr;
+@local_scope_variable_access_expr = @parameter_access_expr | @local_variable_access;
+@variable_access_expr = @local_scope_variable_access_expr | @field_access_expr;
+
+@assignable_access_expr = @variable_access_expr | @property_access_expr | @element_access_expr
+                        | @event_access_expr | @dynamic_member_access_expr;
+
+@objectorcollection_init_expr = @object_init_expr | @collection_init_expr;
+
+@delegate_creation_expr = @explicit_delegate_creation_expr | @implicit_delegate_creation_expr;
+
+@bin_arith_op_expr = @mul_expr | @div_expr | @rem_expr | @add_expr | @sub_expr;
+@incr_op_expr =  @pre_incr_expr | @post_incr_expr;
+@decr_op_expr =  @pre_decr_expr | @post_decr_expr;
+@mut_op_expr = @incr_op_expr | @decr_op_expr;
+@un_arith_op_expr = @plus_expr | @minus_expr | @mut_op_expr;
+@arith_op_expr = @bin_arith_op_expr | @un_arith_op_expr;
+
+@ternary_log_op_expr = @conditional_expr;
+@bin_log_op_expr = @log_and_expr | @log_or_expr | @null_coalescing_expr;
+@un_log_op_expr = @log_not_expr;
+@log_expr = @un_log_op_expr | @bin_log_op_expr | @ternary_log_op_expr;
+
+@bin_bit_op_expr =  @bit_and_expr | @bit_or_expr | @bit_xor_expr | @lshift_expr
+                 | @rshift_expr | @urshift_expr;
+@un_bit_op_expr = @bit_not_expr;
+@bit_expr = @un_bit_op_expr | @bin_bit_op_expr;
+
+@equality_op_expr =  @eq_expr | @ne_expr;
+@rel_op_expr = @gt_expr | @lt_expr| @ge_expr | @le_expr;
+@comp_expr = @equality_op_expr | @rel_op_expr;
+
+@op_expr = @assign_expr | @un_op | @bin_op | @ternary_op;
+
+@ternary_op = @ternary_log_op_expr;
+@bin_op = @bin_arith_op_expr | @bin_log_op_expr | @bin_bit_op_expr | @comp_expr;
+@un_op = @un_arith_op_expr | @un_log_op_expr | @un_bit_op_expr | @sizeof_expr
+       | @pointer_indirection_expr | @address_of_expr;
+
+@anonymous_function_expr = @lambda_expr | @anonymous_method_expr;
+
+@call = @method_invocation_expr | @constructor_init_expr | @operator_invocation_expr
+      | @delegate_invocation_expr | @object_creation_expr | @call_access_expr
+      | @local_function_invocation_expr | @function_pointer_invocation_expr;
+
+@call_access_expr = @property_access_expr | @event_access_expr | @indexer_access_expr;
+
+@late_bindable_expr = @dynamic_element_access_expr | @dynamic_member_access_expr
+                    | @object_creation_expr | @method_invocation_expr | @operator_invocation_expr;
+
+@throw_element = @throw_expr | @throw_stmt;
+
+@implicitly_typeable_object_creation_expr = @object_creation_expr | @explicit_delegate_creation_expr;
+
+implicitly_typed_array_creation(
+  unique int id: @array_creation_expr ref);
+
+explicitly_sized_array_creation(
+  unique int id: @array_creation_expr ref);
+
+stackalloc_array_creation(
+  unique int id: @array_creation_expr ref);
+
+implicitly_typed_object_creation(
+  unique int id: @implicitly_typeable_object_creation_expr ref);
+
+mutator_invocation_mode(
+  unique int id: @operator_invocation_expr ref,
+  int mode: int ref /* prefix = 1, postfix = 2*/);
+
+expr_value(
+  unique int id: @expr ref,
+  string value: string ref);
+
+expr_call(
+  unique int caller_id: @expr ref,
+  int target_id: @callable ref);
+
+expr_access(
+  unique int accesser_id: @access_expr ref,
+  int target_id: @accessible ref);
+
+@accessible = @method | @assignable | @local_function | @namespace;
+
+expr_location(
+  unique int id: @expr ref,
+  int loc: @location ref);
+
+dynamic_member_name(
+  unique int id: @late_bindable_expr ref,
+  string name: string ref);
+
+@qualifiable_expr = @member_access_expr
+                  | @method_invocation_expr
+                  | @element_access_expr;
+
+conditional_access(
+  unique int id: @qualifiable_expr ref);
+
+expr_argument(
+  unique int id: @expr ref,
+  int mode: int ref);
+  /* mode is the same as params: value = 0, ref = 1, out = 2 */
+
+expr_argument_name(
+  unique int id: @expr ref,
+  string name: string ref);
+
+lambda_expr_return_type(
+  unique int id: @lambda_expr ref,
+  int type_id: @type_or_ref ref);
+
+/* Compiler generated */
+
+compiler_generated(unique int id: @element ref);
+
+/** CONTROL/DATA FLOW **/
+
+@control_flow_element = @stmt | @expr;
+
+/* XML Files */
+
+xmlEncoding  (
+  unique int id: @file ref,
+  string encoding: string ref);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+/* Comments */
+
+commentline(
+  unique int id: @commentline,
+  int kind: int ref,
+  string text: string ref,
+  string rawtext: string ref);
+
+case @commentline.kind of
+  0 = @singlelinecomment
+| 1 = @xmldoccomment
+| 2 = @multilinecomment;
+
+commentline_location(
+  unique int id: @commentline ref,
+  int loc: @location ref);
+
+commentblock(
+  unique int id : @commentblock);
+
+commentblock_location(
+  unique int id: @commentblock ref,
+  int loc: @location ref);
+
+commentblock_binding(
+  int id: @commentblock ref,
+  int entity: @element ref,
+  int bindtype: int ref);    /* 0: Parent, 1: Best, 2: Before, 3: After */
+
+commentblock_child(
+  int id: @commentblock ref,
+  int commentline: @commentline ref,
+  int index: int ref);
+
+/* ASP.NET */
+
+case @asp_element.kind of
+  0=@asp_close_tag
+| 1=@asp_code
+| 2=@asp_comment
+| 3=@asp_data_binding
+| 4=@asp_directive
+| 5=@asp_open_tag
+| 6=@asp_quoted_string
+| 7=@asp_text
+| 8=@asp_xml_directive;
+
+@asp_attribute = @asp_code | @asp_data_binding | @asp_quoted_string;
+
+asp_elements(
+  unique int id: @asp_element,
+  int kind: int ref,
+  int loc: @location ref);
+
+asp_comment_server(unique int comment: @asp_comment ref);
+asp_code_inline(unique int code: @asp_code ref);
+asp_directive_attribute(
+  int directive: @asp_directive ref,
+  int index: int ref,
+  string name: string ref,
+  int value: @asp_quoted_string ref);
+asp_directive_name(
+  unique int directive: @asp_directive ref,
+  string name: string ref);
+asp_element_body(
+  unique int element: @asp_element ref,
+  string body: string ref);
+asp_tag_attribute(
+  int tag: @asp_open_tag ref,
+  int index: int ref,
+  string name: string ref,
+  int attribute: @asp_attribute ref);
+asp_tag_name(
+  unique int tag: @asp_open_tag ref,
+  string name: string ref);
+asp_tag_isempty(int tag: @asp_open_tag ref);
diff --git a/csharp/ql/lib/upgrades/605f85053409cd72b4904df3f198ddc8324f3a83/semmlecode.csharp.dbscheme b/csharp/ql/lib/upgrades/605f85053409cd72b4904df3f198ddc8324f3a83/semmlecode.csharp.dbscheme
new file mode 100644
index 00000000000..68b5aec54e5
--- /dev/null
+++ b/csharp/ql/lib/upgrades/605f85053409cd72b4904df3f198ddc8324f3a83/semmlecode.csharp.dbscheme
@@ -0,0 +1,1484 @@
+/* This is a dummy line to alter the dbscheme, so we can make a database upgrade
+ * without actually changing any of the dbscheme predicates. It contains a date
+ * to allow for such updates in the future as well.
+ *
+ * 2021-07-14
+ *
+ * DO NOT remove this comment carelessly, since it can revert the dbscheme back to a
+ * previously seen state (matching a previously seen SHA), which would make the upgrade
+ * mechanism not work properly.
+ */
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+compilation_info(
+  int id : @compilation ref,
+  string info_key: string ref,
+  string info_value: string ref
+)
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | --compiler
+ * 1   | *path to compiler*
+ * 2   | f1.cs
+ * 3   | f2.cs
+ * 4   | f3.cs
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@someFile.rsp` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.cs
+ * 1   | f2.cs
+ * 2   | f3.cs
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The references used by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs /r:ref1.dll /r:ref2.dll /r:ref3.dll
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | ref1.dll
+ * 1   | ref2.dll
+ * 2   | ref3.dll
+ */
+#keyset[id, num]
+compilation_referencing_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    unique int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location ref
+);
+
+extractor_messages(
+    unique int id: @extractor_message,
+    int severity: int ref,
+    string origin : string ref,
+    string text : string ref,
+    string entity : string ref,
+    int location: @location ref,
+    string stack_trace : string ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+compilation_assembly(
+  unique int id : @compilation ref,
+  int assembly: @assembly ref
+)
+
+// Populated by the CSV extractor
+externalData(
+   int id: @externalDataElement,
+   string path: string ref,
+   int column: int ref,
+   string value: string ref);
+
+sourceLocationPrefix(
+  string prefix: string ref);
+
+/*
+ * Overlay support
+ */
+
+/**
+ * The CLI will automatically emit the tuple `databaseMetadata("isOverlay", "true")`,
+ * along with an `overlayChangedFiles` tuple for each new/modified/deleted file,
+ * when building an overlay database, and these can be used by the discard predicates.
+ */
+databaseMetadata(
+  string metadataKey : string ref,
+  string value : string ref
+);
+
+overlayChangedFiles(
+  string path : string ref
+);
+
+/*
+ * C# dbscheme
+ */
+
+/** ELEMENTS **/
+
+@element = @declaration | @stmt | @expr | @modifier | @attribute | @namespace_declaration
+         | @using_directive | @type_parameter_constraints | @externalDataElement
+         | @xmllocatable | @asp_element | @namespace | @preprocessor_directive;
+
+@declaration = @callable | @generic | @assignable | @namespace;
+
+@named_element = @namespace | @declaration;
+
+@declaration_with_accessors = @property | @indexer | @event;
+
+@assignable = @variable | @assignable_with_accessors | @event;
+
+@assignable_with_accessors = @property | @indexer;
+
+@attributable = @assembly | @field | @parameter | @operator | @method | @constructor
+              | @destructor | @callable_accessor | @value_or_ref_type | @declaration_with_accessors
+              | @local_function | @lambda_expr;
+
+/** LOCATIONS, ASEMMBLIES, MODULES, FILES and FOLDERS **/
+
+@location = @location_default | @assembly;
+
+@locatable = @declaration_with_accessors | @callable_accessor | @declaration_or_directive
+           | @diagnostic | @extractor_message | @preprocessor_directive | @attribute | @type_mention | @type_parameter_constraints
+           | @declaration_with_accessors | @callable_accessor | @operator | @method
+           | @constructor | @destructor | @field | @local_variable | @parameter | @stmt | @expr
+           | @xmllocatable | @commentline | @commentblock | @asp_element
+
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref);
+
+locations_mapped(
+  unique int id: @location_default ref,
+  int mapped_to: @location_default ref);
+
+@sourceline = @file | @callable | @xmllocatable;
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref);
+
+assemblies(
+  unique int id: @assembly,
+  int file: @file ref,
+  string fullname: string ref,
+  string name: string ref,
+  string version: string ref);
+
+files(
+  unique int id: @file,
+  string name: string ref);
+
+folders(
+  unique int id: @folder,
+  string name: string ref);
+
+@container = @folder | @file ;
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref);
+
+file_extraction_mode(
+  unique int file: @file ref,
+  int mode: int ref
+  /* 0 = normal, 1 = standalone extractor */
+  );
+
+/** NAMESPACES **/
+
+@type_container = @namespace | @type;
+
+namespaces(
+  unique int id: @namespace,
+  string name: string ref);
+
+namespace_declarations(
+  unique int id: @namespace_declaration,
+  int namespace_id: @namespace ref);
+
+namespace_declaration_location(
+  unique int id: @namespace_declaration ref,
+  int loc: @location ref);
+
+parent_namespace(
+  unique int child_id: @type_container ref,
+  int namespace_id: @namespace ref);
+
+@declaration_or_directive = @namespace_declaration | @type | @using_directive;
+
+parent_namespace_declaration(
+  int child_id: @declaration_or_directive ref, // cannot be unique because of partial classes
+  int namespace_id: @namespace_declaration ref);
+
+@using_directive = @using_namespace_directive | @using_static_directive;
+
+using_global(
+  unique int id: @using_directive ref
+);
+
+using_namespace_directives(
+  unique int id: @using_namespace_directive,
+  int namespace_id: @namespace ref);
+
+using_static_directives(
+  unique int id: @using_static_directive,
+  int type_id: @type_or_ref ref);
+
+using_directive_location(
+  unique int id: @using_directive ref,
+  int loc: @location ref);
+
+@preprocessor_directive = @pragma_warning | @pragma_checksum | @directive_define | @directive_undefine | @directive_warning
+  | @directive_error | @directive_nullable | @directive_line | @directive_region | @directive_endregion | @directive_if
+  | @directive_elif | @directive_else | @directive_endif;
+
+@conditional_directive = @directive_if | @directive_elif;
+@branch_directive = @directive_if | @directive_elif | @directive_else;
+
+directive_ifs(
+  unique int id: @directive_if,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref); /* 0: false, 1: true */
+
+directive_elifs(
+  unique int id: @directive_elif,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref,  /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+directive_elses(
+  unique int id: @directive_else,
+  int branchTaken: int ref,   /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+#keyset[id, start]
+directive_endifs(
+  unique int id: @directive_endif,
+  unique int start: @directive_if ref);
+
+directive_define_symbols(
+  unique int id: @define_symbol_expr ref,
+  string name: string ref);
+
+directive_regions(
+  unique int id: @directive_region,
+  string name: string ref);
+
+#keyset[id, start]
+directive_endregions(
+  unique int id: @directive_endregion,
+  unique int start: @directive_region ref);
+
+directive_lines(
+  unique int id: @directive_line,
+  int kind: int ref); /* 0: default, 1: hidden, 2: numeric, 3: span */
+
+directive_line_value(
+  unique int id: @directive_line ref,
+  int line: int ref);
+
+directive_line_file(
+  unique int id: @directive_line ref,
+  int file: @file ref);
+
+directive_line_offset(
+  unique int id: @directive_line ref,
+  int offset: int ref);
+
+directive_line_span(
+  unique int id: @directive_line ref,
+  int startLine: int ref,
+  int startColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref);
+
+directive_nullables(
+  unique int id: @directive_nullable,
+  int setting: int ref, /* 0: disable, 1: enable, 2: restore */
+  int target: int ref); /* 0: none, 1: annotations, 2: warnings */
+
+directive_warnings(
+  unique int id: @directive_warning,
+  string message: string ref);
+
+directive_errors(
+  unique int id: @directive_error,
+  string message: string ref);
+
+directive_undefines(
+  unique int id: @directive_undefine,
+  string name: string ref);
+
+directive_defines(
+  unique int id: @directive_define,
+  string name: string ref);
+
+pragma_checksums(
+  unique int id: @pragma_checksum,
+  int file: @file ref,
+  string guid: string ref,
+  string bytes: string ref);
+
+pragma_warnings(
+  unique int id: @pragma_warning,
+  int kind: int ref /* 0 = disable, 1 = restore */);
+
+#keyset[id, index]
+pragma_warning_error_codes(
+  int id: @pragma_warning ref,
+  string errorCode: string ref,
+  int index: int ref);
+
+preprocessor_directive_location(
+  unique int id: @preprocessor_directive ref,
+  int loc: @location ref);
+
+preprocessor_directive_compilation(
+  int id: @preprocessor_directive ref,
+  int compilation: @compilation ref);
+
+preprocessor_directive_active(
+  unique int id: @preprocessor_directive ref,
+  int active: int ref);  /* 0: false, 1: true */
+
+/** TYPES **/
+
+types(
+  unique int id: @type,
+  int kind: int ref,
+  string name: string ref);
+
+case @type.kind of
+   1 = @bool_type
+|  2 = @char_type
+|  3 = @decimal_type
+|  4 = @sbyte_type
+|  5 = @short_type
+|  6 = @int_type
+|  7 = @long_type
+|  8 = @byte_type
+|  9 = @ushort_type
+| 10 = @uint_type
+| 11 = @ulong_type
+| 12 = @float_type
+| 13 = @double_type
+| 14 = @enum_type
+| 15 = @struct_type
+| 17 = @class_type
+| 19 = @interface_type
+| 20 = @delegate_type
+| 21 = @null_type
+| 22 = @type_parameter
+| 23 = @pointer_type
+| 24 = @nullable_type
+| 25 = @array_type
+| 26 = @void_type
+| 27 = @int_ptr_type
+| 28 = @uint_ptr_type
+| 29 = @dynamic_type
+| 30 = @arglist_type
+| 31 = @unknown_type
+| 32 = @tuple_type
+| 33 = @function_pointer_type
+| 34 = @inline_array_type
+  ;
+
+@simple_type = @bool_type | @char_type | @integral_type | @floating_point_type | @decimal_type;
+@integral_type = @signed_integral_type | @unsigned_integral_type;
+@signed_integral_type = @sbyte_type | @short_type | @int_type | @long_type;
+@unsigned_integral_type = @byte_type  | @ushort_type | @uint_type | @ulong_type;
+@floating_point_type = @float_type | @double_type;
+@value_type = @simple_type | @enum_type | @struct_type | @nullable_type | @int_ptr_type
+            | @uint_ptr_type | @tuple_type | @void_type | @inline_array_type;
+@ref_type = @class_type | @interface_type | @array_type | @delegate_type | @null_type
+          | @dynamic_type;
+@value_or_ref_type = @value_type | @ref_type;
+
+typerefs(
+  unique int id: @typeref,
+  string name: string ref);
+
+typeref_type(
+  int id: @typeref ref,
+  unique int typeId: @type ref);
+
+@type_or_ref = @type | @typeref;
+
+array_element_type(
+  unique int array: @array_type ref,
+  int dimension: int ref,
+  int rank: int ref,
+  int element: @type_or_ref ref);
+
+nullable_underlying_type(
+  unique int nullable: @nullable_type ref,
+  int underlying: @type_or_ref ref);
+
+pointer_referent_type(
+  unique int pointer: @pointer_type ref,
+  int referent: @type_or_ref ref);
+
+enum_underlying_type(
+  unique int enum_id: @enum_type ref,
+  int underlying_type_id: @type_or_ref ref);
+
+delegate_return_type(
+  unique int delegate_id: @delegate_type ref,
+  int return_type_id: @type_or_ref ref);
+
+function_pointer_return_type(
+    unique int function_pointer_id: @function_pointer_type ref,
+    int return_type_id: @type_or_ref ref);
+
+extend(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+anonymous_types(
+  unique int id: @type ref);
+
+@interface_or_ref = @interface_type | @typeref;
+
+implement(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+type_location(
+  int id: @type ref,
+  int loc: @location ref);
+
+tuple_underlying_type(
+  unique int tuple: @tuple_type ref,
+  int struct: @type_or_ref ref);
+
+#keyset[tuple, index]
+tuple_element(
+  int tuple: @tuple_type ref,
+  int index: int ref,
+  unique int field: @field ref);
+
+attributes(
+  unique int id: @attribute,
+  int kind: int ref,
+  int type_id: @type_or_ref ref,
+  int target:  @attributable ref);
+
+case @attribute.kind of
+  0 = @attribute_default
+| 1 = @attribute_return
+| 2 = @attribute_assembly
+| 3 = @attribute_module
+;
+
+attribute_location(
+  int id: @attribute ref,
+  int loc: @location ref);
+
+@type_mention_parent = @element | @type_mention;
+
+type_mention(
+  unique int id: @type_mention,
+  int type_id: @type_or_ref ref,
+  int parent: @type_mention_parent ref);
+
+type_mention_location(
+  unique int id: @type_mention ref,
+  int loc: @location ref);
+
+@has_type_annotation = @assignable | @type_parameter | @callable | @expr | @delegate_type | @generic | @function_pointer_type;
+
+/**
+ * A direct annotation on an entity, for example `string? x;`.
+ *
+ * Annotations:
+ * 2 = reftype is not annotated "!"
+ * 3 = reftype is annotated "?"
+ * 4 = readonly ref type / in parameter
+ * 5 = ref type parameter, return or local variable
+ * 6 = out parameter
+ *
+ * Note that the annotation depends on the element it annotates.
+ * @assignable: The annotation is on the type of the assignable, for example the variable type.
+ * @type_parameter: The annotation is on the reftype constraint
+ * @callable: The annotation is on the return type
+ * @array_type: The annotation is on the element type
+ */
+type_annotation(int id: @has_type_annotation ref, int annotation: int ref);
+
+nullability(unique int nullability: @nullability, int kind: int ref);
+
+case @nullability.kind of
+  0 = @oblivious
+| 1 = @not_annotated
+| 2 = @annotated
+;
+
+#keyset[parent, index]
+nullability_parent(int nullability: @nullability ref, int index: int ref, int parent: @nullability ref)
+
+type_nullability(int id: @has_type_annotation ref, int nullability: @nullability ref);
+
+/**
+ * The nullable flow state of an expression, as determined by Roslyn.
+ *   0 = none (default, not populated)
+ *   1 = not null
+ *   2 = maybe null
+ */
+expr_flowstate(unique int id: @expr ref, int state: int ref);
+
+/** GENERICS **/
+
+@generic = @type | @method | @local_function;
+
+type_parameters(
+  unique int id: @type_parameter ref,
+  int index: int ref,
+  int generic_id: @generic ref,
+  int variance: int ref /* none = 0, out = 1, in = 2 */);
+
+#keyset[constructed_id, index]
+type_arguments(
+  int id: @type_or_ref ref,
+  int index: int ref,
+  int constructed_id: @generic_or_ref ref);
+
+@generic_or_ref = @generic | @typeref;
+
+constructed_generic(
+  unique int constructed: @generic ref,
+  int generic: @generic_or_ref ref);
+
+type_parameter_constraints(
+  unique int id: @type_parameter_constraints,
+  int param_id: @type_parameter ref);
+
+type_parameter_constraints_location(
+  int id: @type_parameter_constraints ref,
+  int loc: @location ref);
+
+general_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int kind: int ref /* class = 1, struct = 2, new = 3 */);
+
+specific_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref);
+
+specific_type_parameter_nullability(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref,
+  int nullability: @nullability ref);
+
+/** FUNCTION POINTERS */
+
+function_pointer_calling_conventions(
+  int id: @function_pointer_type ref,
+  int kind: int ref);
+
+#keyset[id, index]
+has_unmanaged_calling_conventions(
+  int id: @function_pointer_type ref,
+  int index: int ref,
+  int conv_id: @type_or_ref ref);
+
+/** MODIFIERS */
+
+@modifiable = @modifiable_direct | @event_accessor;
+
+@modifiable_direct = @member | @accessor | @local_function | @anonymous_function_expr;
+
+modifiers(
+  unique int id: @modifier,
+  string name: string ref);
+
+has_modifiers(
+  int id: @modifiable_direct ref,
+  int mod_id: @modifier ref);
+
+/** MEMBERS **/
+
+@member = @method | @constructor | @destructor | @field | @property | @event | @operator | @indexer | @type;
+
+@named_exprorstmt = @goto_stmt | @labeled_stmt | @expr;
+
+@virtualizable = @method | @property | @indexer | @event | @operator;
+
+exprorstmt_name(
+  unique int parent_id: @named_exprorstmt ref,
+  string name: string ref);
+
+nested_types(
+  unique int id: @type ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @type ref);
+
+properties(
+  unique int id: @property,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @property ref);
+
+property_location(
+  int id: @property ref,
+  int loc: @location ref);
+
+indexers(
+  unique int id: @indexer,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @indexer ref);
+
+indexer_location(
+  int id: @indexer ref,
+  int loc: @location ref);
+
+accessors(
+  unique int id: @accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_member_id: @member ref,
+  int unbound_id: @accessor ref);
+
+case @accessor.kind of
+  1 = @getter
+| 2 = @setter
+  ;
+
+init_only_accessors(
+  unique int id: @accessor ref);
+
+accessor_location(
+  int id: @accessor ref,
+  int loc: @location ref);
+
+events(
+  unique int id: @event,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @event ref);
+
+event_location(
+  int id: @event ref,
+  int loc: @location ref);
+
+event_accessors(
+  unique int id: @event_accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_event_id: @event ref,
+  int unbound_id: @event_accessor ref);
+
+case @event_accessor.kind of
+  1 = @add_event_accessor
+| 2 = @remove_event_accessor
+  ;
+
+event_accessor_location(
+  int id: @event_accessor ref,
+  int loc: @location ref);
+
+operators(
+  unique int id: @operator,
+  string name: string ref,
+  string symbol: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @operator ref);
+
+operator_location(
+  int id: @operator ref,
+  int loc: @location ref);
+
+constant_value(
+  int id: @variable ref,
+  string value: string ref);
+
+/** CALLABLES **/
+
+@callable = @method | @constructor | @destructor | @operator | @callable_accessor | @anonymous_function_expr | @local_function;
+
+@callable_accessor = @accessor | @event_accessor;
+
+methods(
+  unique int id: @method,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @method ref);
+
+method_location(
+  int id: @method ref,
+  int loc: @location ref);
+
+constructors(
+  unique int id: @constructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @constructor ref);
+
+constructor_location(
+  int id: @constructor ref,
+  int loc: @location ref);
+
+destructors(
+  unique int id: @destructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @destructor ref);
+
+destructor_location(
+  int id: @destructor ref,
+  int loc: @location ref);
+
+overrides(
+  int id: @callable ref,
+  int base_id: @callable ref);
+
+explicitly_implements(
+  int id: @member ref,
+  int interface_id: @interface_or_ref ref);
+
+local_functions(
+    unique int id: @local_function,
+    string name: string ref,
+    int return_type: @type ref,
+    int unbound_id: @local_function ref);
+
+local_function_stmts(
+    unique int fn: @local_function_stmt ref,
+    int stmt: @local_function ref);
+
+/** VARIABLES **/
+
+@variable = @local_scope_variable | @field;
+
+@local_scope_variable = @local_variable | @parameter;
+
+fields(
+  unique int id: @field,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @field ref);
+
+case @field.kind of
+  1 = @addressable_field
+| 2 = @constant
+  ;
+
+field_location(
+  int id: @field ref,
+  int loc: @location ref);
+
+localvars(
+  unique int id: @local_variable,
+  int kind: int ref,
+  string name: string ref,
+  int implicitly_typed: int ref /* 0 = no, 1 = yes */,
+  int type_id: @type_or_ref ref,
+  int parent_id: @local_var_decl_expr ref);
+
+case @local_variable.kind of
+  1 = @addressable_local_variable
+| 2 = @local_constant
+| 3 = @local_variable_ref
+  ;
+
+localvar_location(
+  unique int id: @local_variable ref,
+  int loc: @location ref);
+
+@parameterizable = @callable | @delegate_type | @indexer | @function_pointer_type;
+
+#keyset[name, parent_id]
+#keyset[index, parent_id]
+params(
+  unique int id: @parameter,
+  string name: string ref,
+  int type_id: @type_or_ref ref,
+  int index: int ref,
+  int mode: int ref, /* value = 0, ref = 1, out = 2, params/array = 3, this = 4, in = 5, ref readonly = 6 */
+  int parent_id: @parameterizable ref,
+  int unbound_id: @parameter ref);
+
+param_location(
+  int id: @parameter ref,
+  int loc: @location ref);
+
+@has_scoped_annotation = @local_scope_variable
+
+scoped_annotation(
+  int id: @has_scoped_annotation ref,
+  int kind: int ref // scoped ref = 1, scoped value = 2
+  );
+
+/** STATEMENTS **/
+
+@exprorstmt_parent = @control_flow_element | @top_level_exprorstmt_parent;
+
+statements(
+  unique int id: @stmt,
+  int kind: int ref);
+
+#keyset[index, parent]
+stmt_parent(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_stmt_parent = @callable;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+stmt_parent_top_level(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @top_level_stmt_parent ref);
+
+case @stmt.kind of
+   1 = @block_stmt
+|  2 = @expr_stmt
+|  3 = @if_stmt
+|  4 = @switch_stmt
+|  5 = @while_stmt
+|  6 = @do_stmt
+|  7 = @for_stmt
+|  8 = @foreach_stmt
+|  9 = @break_stmt
+| 10 = @continue_stmt
+| 11 = @goto_stmt
+| 12 = @goto_case_stmt
+| 13 = @goto_default_stmt
+| 14 = @throw_stmt
+| 15 = @return_stmt
+| 16 = @yield_stmt
+| 17 = @try_stmt
+| 18 = @checked_stmt
+| 19 = @unchecked_stmt
+| 20 = @lock_stmt
+| 21 = @using_block_stmt
+| 22 = @var_decl_stmt
+| 23 = @const_decl_stmt
+| 24 = @empty_stmt
+| 25 = @unsafe_stmt
+| 26 = @fixed_stmt
+| 27 = @label_stmt
+| 28 = @catch
+| 29 = @case_stmt
+| 30 = @local_function_stmt
+| 31 = @using_decl_stmt
+  ;
+
+@using_stmt = @using_block_stmt | @using_decl_stmt;
+
+@labeled_stmt = @label_stmt | @case;
+
+@decl_stmt = @var_decl_stmt | @const_decl_stmt | @using_decl_stmt;
+
+@cond_stmt = @if_stmt | @switch_stmt;
+
+@loop_stmt = @while_stmt | @do_stmt | @for_stmt | @foreach_stmt;
+
+@jump_stmt = @break_stmt | @goto_any_stmt | @continue_stmt | @throw_stmt | @return_stmt
+           | @yield_stmt;
+
+@goto_any_stmt = @goto_default_stmt | @goto_case_stmt | @goto_stmt;
+
+
+stmt_location(
+  unique int id: @stmt ref,
+  int loc: @location ref);
+
+catch_type(
+  unique int catch_id: @catch ref,
+  int type_id: @type_or_ref ref,
+  int kind: int ref /* explicit = 1, implicit = 2 */);
+
+foreach_stmt_info(
+  unique int id: @foreach_stmt ref,
+  int kind: int ref /* non-async = 1, async = 2 */);
+
+@foreach_symbol =  @method | @property | @type_or_ref;
+
+#keyset[id, kind]
+foreach_stmt_desugar(
+  int id: @foreach_stmt ref,
+  int symbol: @foreach_symbol ref,
+  int kind: int ref /* GetEnumeratorMethod = 1, CurrentProperty = 2, MoveNextMethod = 3, DisposeMethod = 4, ElementType = 5 */);
+
+/** EXPRESSIONS **/
+
+expressions(
+  unique int id: @expr,
+  int kind: int ref,
+  int type_id: @type_or_ref ref);
+
+#keyset[index, parent]
+expr_parent(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_expr_parent = @attribute | @field | @property | @indexer | @parameter | @directive_if | @directive_elif;
+
+@top_level_exprorstmt_parent = @top_level_expr_parent | @top_level_stmt_parent;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+expr_parent_top_level(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @top_level_exprorstmt_parent ref);
+
+case @expr.kind of
+/* literal */
+   1 = @bool_literal_expr
+|  2 = @char_literal_expr
+|  3 = @decimal_literal_expr
+|  4 = @int_literal_expr
+|  5 = @long_literal_expr
+|  6 = @uint_literal_expr
+|  7 = @ulong_literal_expr
+|  8 = @float_literal_expr
+|  9 = @double_literal_expr
+| 10 = @utf16_string_literal_expr
+| 11 = @null_literal_expr
+/* primary & unary */
+| 12 = @this_access_expr
+| 13 = @base_access_expr
+| 14 = @local_variable_access_expr
+| 15 = @parameter_access_expr
+| 16 = @field_access_expr
+| 17 = @property_access_expr
+| 18 = @method_access_expr
+| 19 = @event_access_expr
+| 20 = @indexer_access_expr
+| 21 = @array_access_expr
+| 22 = @type_access_expr
+| 23 = @typeof_expr
+| 24 = @method_invocation_expr
+| 25 = @delegate_invocation_expr
+| 26 = @operator_invocation_expr
+| 27 = @cast_expr
+| 28 = @object_creation_expr
+| 29 = @explicit_delegate_creation_expr
+| 30 = @implicit_delegate_creation_expr
+| 31 = @array_creation_expr
+| 32 = @default_expr
+| 33 = @plus_expr
+| 34 = @minus_expr
+| 35 = @bit_not_expr
+| 36 = @log_not_expr
+| 37 = @post_incr_expr
+| 38 = @post_decr_expr
+| 39 = @pre_incr_expr
+| 40 = @pre_decr_expr
+/* multiplicative */
+| 41 = @mul_expr
+| 42 = @div_expr
+| 43 = @rem_expr
+/* additive */
+| 44 = @add_expr
+| 45 = @sub_expr
+/* shift */
+| 46 = @lshift_expr
+| 47 = @rshift_expr
+/* relational */
+| 48 = @lt_expr
+| 49 = @gt_expr
+| 50 = @le_expr
+| 51 = @ge_expr
+/* equality */
+| 52 = @eq_expr
+| 53 = @ne_expr
+/* logical */
+| 54 = @bit_and_expr
+| 55 = @bit_xor_expr
+| 56 = @bit_or_expr
+| 57 = @log_and_expr
+| 58 = @log_or_expr
+/* type testing */
+| 59 = @is_expr
+| 60 = @as_expr
+/* null coalescing */
+| 61 = @null_coalescing_expr
+/* conditional */
+| 62 = @conditional_expr
+/* assignment */
+| 63 = @simple_assign_expr
+| 64 = @assign_add_expr
+| 65 = @assign_sub_expr
+| 66 = @assign_mul_expr
+| 67 = @assign_div_expr
+| 68 = @assign_rem_expr
+| 69 = @assign_and_expr
+| 70 = @assign_xor_expr
+| 71 = @assign_or_expr
+| 72 = @assign_lshift_expr
+| 73 = @assign_rshift_expr
+/* more */
+| 74 = @object_init_expr
+| 75 = @collection_init_expr
+| 76 = @array_init_expr
+| 77 = @checked_expr
+| 78 = @unchecked_expr
+| 79 = @constructor_init_expr
+| 80 = @add_event_expr
+| 81 = @remove_event_expr
+| 82 = @par_expr
+| 83 = @local_var_decl_expr
+| 84 = @lambda_expr
+| 85 = @anonymous_method_expr
+| 86 = @namespace_expr
+/* dynamic */
+| 92 = @dynamic_element_access_expr
+| 93 = @dynamic_member_access_expr
+/* unsafe */
+| 100 = @pointer_indirection_expr
+| 101 = @address_of_expr
+| 102 = @sizeof_expr
+/* async */
+| 103 = @await_expr
+/* C# 6.0 */
+| 104 = @nameof_expr
+| 105 = @interpolated_string_expr
+| 106 = @unknown_expr
+/* C# 7.0 */
+| 107 = @throw_expr
+| 108 = @tuple_expr
+| 109 = @local_function_invocation_expr
+| 110 = @ref_expr
+| 111 = @discard_expr
+/* C# 8.0 */
+| 112 = @range_expr
+| 113 = @index_expr
+| 114 = @switch_expr
+| 115 = @recursive_pattern_expr
+| 116 = @property_pattern_expr
+| 117 = @positional_pattern_expr
+| 118 = @switch_case_expr
+| 119 = @assign_coalesce_expr
+| 120 = @suppress_nullable_warning_expr
+| 121 = @namespace_access_expr
+/* C# 9.0 */
+| 122 = @lt_pattern_expr
+| 123 = @gt_pattern_expr
+| 124 = @le_pattern_expr
+| 125 = @ge_pattern_expr
+| 126 = @not_pattern_expr
+| 127 = @and_pattern_expr
+| 128 = @or_pattern_expr
+| 129 = @function_pointer_invocation_expr
+| 130 = @with_expr
+/* C# 11.0 */
+| 131 = @list_pattern_expr
+| 132 = @slice_pattern_expr
+| 133 = @urshift_expr
+| 134 = @assign_urshift_expr
+| 135 = @utf8_string_literal_expr
+/* C# 12.0 */
+| 136 = @collection_expr
+| 137 = @spread_element_expr
+| 138 = @interpolated_string_insert_expr
+/* Preprocessor */
+| 999 = @define_symbol_expr
+;
+
+@switch = @switch_stmt | @switch_expr;
+@case = @case_stmt | @switch_case_expr;
+@pattern_match = @case | @is_expr;
+@unary_pattern_expr = @not_pattern_expr;
+@relational_pattern_expr = @gt_pattern_expr | @lt_pattern_expr | @ge_pattern_expr | @le_pattern_expr;
+@binary_pattern_expr = @and_pattern_expr | @or_pattern_expr;
+
+@integer_literal_expr = @int_literal_expr | @long_literal_expr | @uint_literal_expr | @ulong_literal_expr;
+@real_literal_expr = @float_literal_expr | @double_literal_expr | @decimal_literal_expr;
+@string_literal_expr = @utf16_string_literal_expr | @utf8_string_literal_expr;
+@literal_expr = @bool_literal_expr | @char_literal_expr | @integer_literal_expr | @real_literal_expr
+              | @string_literal_expr | @null_literal_expr;
+
+@assign_expr = @simple_assign_expr | @assign_op_expr | @local_var_decl_expr;
+@assign_op_expr =  @assign_arith_expr | @assign_bitwise_expr | @assign_event_expr | @assign_coalesce_expr;
+@assign_event_expr = @add_event_expr | @remove_event_expr;
+
+@assign_arith_expr = @assign_add_expr | @assign_sub_expr | @assign_mul_expr | @assign_div_expr
+                   | @assign_rem_expr
+@assign_bitwise_expr = @assign_and_expr | @assign_or_expr | @assign_xor_expr
+                   | @assign_lshift_expr | @assign_rshift_expr | @assign_urshift_expr;
+
+@member_access_expr = @field_access_expr | @property_access_expr | @indexer_access_expr | @event_access_expr
+                    | @method_access_expr | @type_access_expr | @dynamic_member_access_expr;
+@access_expr = @member_access_expr | @this_access_expr | @base_access_expr | @assignable_access_expr | @namespace_access_expr;
+@element_access_expr = @indexer_access_expr | @array_access_expr | @dynamic_element_access_expr;
+
+@local_variable_access = @local_variable_access_expr | @local_var_decl_expr;
+@local_scope_variable_access_expr = @parameter_access_expr | @local_variable_access;
+@variable_access_expr = @local_scope_variable_access_expr | @field_access_expr;
+
+@assignable_access_expr = @variable_access_expr | @property_access_expr | @element_access_expr
+                        | @event_access_expr | @dynamic_member_access_expr;
+
+@objectorcollection_init_expr = @object_init_expr | @collection_init_expr;
+
+@delegate_creation_expr = @explicit_delegate_creation_expr | @implicit_delegate_creation_expr;
+
+@bin_arith_op_expr = @mul_expr | @div_expr | @rem_expr | @add_expr | @sub_expr;
+@incr_op_expr =  @pre_incr_expr | @post_incr_expr;
+@decr_op_expr =  @pre_decr_expr | @post_decr_expr;
+@mut_op_expr = @incr_op_expr | @decr_op_expr;
+@un_arith_op_expr = @plus_expr | @minus_expr | @mut_op_expr;
+@arith_op_expr = @bin_arith_op_expr | @un_arith_op_expr;
+
+@ternary_log_op_expr = @conditional_expr;
+@bin_log_op_expr = @log_and_expr | @log_or_expr | @null_coalescing_expr;
+@un_log_op_expr = @log_not_expr;
+@log_expr = @un_log_op_expr | @bin_log_op_expr | @ternary_log_op_expr;
+
+@bin_bit_op_expr =  @bit_and_expr | @bit_or_expr | @bit_xor_expr | @lshift_expr
+                 | @rshift_expr | @urshift_expr;
+@un_bit_op_expr = @bit_not_expr;
+@bit_expr = @un_bit_op_expr | @bin_bit_op_expr;
+
+@equality_op_expr =  @eq_expr | @ne_expr;
+@rel_op_expr = @gt_expr | @lt_expr| @ge_expr | @le_expr;
+@comp_expr = @equality_op_expr | @rel_op_expr;
+
+@op_expr = @assign_expr | @un_op | @bin_op | @ternary_op;
+
+@ternary_op = @ternary_log_op_expr;
+@bin_op = @bin_arith_op_expr | @bin_log_op_expr | @bin_bit_op_expr | @comp_expr;
+@un_op = @un_arith_op_expr | @un_log_op_expr | @un_bit_op_expr | @sizeof_expr
+       | @pointer_indirection_expr | @address_of_expr;
+
+@anonymous_function_expr = @lambda_expr | @anonymous_method_expr;
+
+@call = @method_invocation_expr | @constructor_init_expr | @operator_invocation_expr
+      | @delegate_invocation_expr | @object_creation_expr | @call_access_expr
+      | @local_function_invocation_expr | @function_pointer_invocation_expr;
+
+@call_access_expr = @property_access_expr | @event_access_expr | @indexer_access_expr;
+
+@late_bindable_expr = @dynamic_element_access_expr | @dynamic_member_access_expr
+                    | @object_creation_expr | @method_invocation_expr | @operator_invocation_expr;
+
+@throw_element = @throw_expr | @throw_stmt;
+
+@implicitly_typeable_object_creation_expr = @object_creation_expr | @explicit_delegate_creation_expr;
+
+implicitly_typed_array_creation(
+  unique int id: @array_creation_expr ref);
+
+explicitly_sized_array_creation(
+  unique int id: @array_creation_expr ref);
+
+stackalloc_array_creation(
+  unique int id: @array_creation_expr ref);
+
+implicitly_typed_object_creation(
+  unique int id: @implicitly_typeable_object_creation_expr ref);
+
+mutator_invocation_mode(
+  unique int id: @operator_invocation_expr ref,
+  int mode: int ref /* prefix = 1, postfix = 2*/);
+
+expr_value(
+  unique int id: @expr ref,
+  string value: string ref);
+
+expr_call(
+  unique int caller_id: @expr ref,
+  int target_id: @callable ref);
+
+expr_access(
+  unique int accesser_id: @access_expr ref,
+  int target_id: @accessible ref);
+
+@accessible = @method | @assignable | @local_function | @namespace;
+
+expr_location(
+  unique int id: @expr ref,
+  int loc: @location ref);
+
+dynamic_member_name(
+  unique int id: @late_bindable_expr ref,
+  string name: string ref);
+
+@qualifiable_expr = @member_access_expr
+                  | @method_invocation_expr
+                  | @element_access_expr;
+
+conditional_access(
+  unique int id: @qualifiable_expr ref);
+
+expr_argument(
+  unique int id: @expr ref,
+  int mode: int ref);
+  /* mode is the same as params: value = 0, ref = 1, out = 2 */
+
+expr_argument_name(
+  unique int id: @expr ref,
+  string name: string ref);
+
+lambda_expr_return_type(
+  unique int id: @lambda_expr ref,
+  int type_id: @type_or_ref ref);
+
+/* Compiler generated */
+
+compiler_generated(unique int id: @element ref);
+
+/** CONTROL/DATA FLOW **/
+
+@control_flow_element = @stmt | @expr;
+
+/* XML Files */
+
+xmlEncoding  (
+  unique int id: @file ref,
+  string encoding: string ref);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+/* Comments */
+
+commentline(
+  unique int id: @commentline,
+  int kind: int ref,
+  string text: string ref,
+  string rawtext: string ref);
+
+case @commentline.kind of
+  0 = @singlelinecomment
+| 1 = @xmldoccomment
+| 2 = @multilinecomment;
+
+commentline_location(
+  unique int id: @commentline ref,
+  int loc: @location ref);
+
+commentblock(
+  unique int id : @commentblock);
+
+commentblock_location(
+  unique int id: @commentblock ref,
+  int loc: @location ref);
+
+commentblock_binding(
+  int id: @commentblock ref,
+  int entity: @element ref,
+  int bindtype: int ref);    /* 0: Parent, 1: Best, 2: Before, 3: After */
+
+commentblock_child(
+  int id: @commentblock ref,
+  int commentline: @commentline ref,
+  int index: int ref);
+
+/* ASP.NET */
+
+case @asp_element.kind of
+  0=@asp_close_tag
+| 1=@asp_code
+| 2=@asp_comment
+| 3=@asp_data_binding
+| 4=@asp_directive
+| 5=@asp_open_tag
+| 6=@asp_quoted_string
+| 7=@asp_text
+| 8=@asp_xml_directive;
+
+@asp_attribute = @asp_code | @asp_data_binding | @asp_quoted_string;
+
+asp_elements(
+  unique int id: @asp_element,
+  int kind: int ref,
+  int loc: @location ref);
+
+asp_comment_server(unique int comment: @asp_comment ref);
+asp_code_inline(unique int code: @asp_code ref);
+asp_directive_attribute(
+  int directive: @asp_directive ref,
+  int index: int ref,
+  string name: string ref,
+  int value: @asp_quoted_string ref);
+asp_directive_name(
+  unique int directive: @asp_directive ref,
+  string name: string ref);
+asp_element_body(
+  unique int element: @asp_element ref,
+  string body: string ref);
+asp_tag_attribute(
+  int tag: @asp_open_tag ref,
+  int index: int ref,
+  string name: string ref,
+  int attribute: @asp_attribute ref);
+asp_tag_name(
+  unique int tag: @asp_open_tag ref,
+  string name: string ref);
+asp_tag_isempty(int tag: @asp_open_tag ref);
diff --git a/csharp/ql/lib/upgrades/605f85053409cd72b4904df3f198ddc8324f3a83/upgrade.properties b/csharp/ql/lib/upgrades/605f85053409cd72b4904df3f198ddc8324f3a83/upgrade.properties
new file mode 100644
index 00000000000..81395885edd
--- /dev/null
+++ b/csharp/ql/lib/upgrades/605f85053409cd72b4904df3f198ddc8324f3a83/upgrade.properties
@@ -0,0 +1,2 @@
+description: Add @locatable type
+compatibility: full
diff --git a/csharp/ql/lib/upgrades/66044cfa5bbf2ecfabd06ead25e91db2bdd79764/old.dbscheme b/csharp/ql/lib/upgrades/66044cfa5bbf2ecfabd06ead25e91db2bdd79764/old.dbscheme
new file mode 100644
index 00000000000..66044cfa5bb
--- /dev/null
+++ b/csharp/ql/lib/upgrades/66044cfa5bbf2ecfabd06ead25e91db2bdd79764/old.dbscheme
@@ -0,0 +1,1460 @@
+/* This is a dummy line to alter the dbscheme, so we can make a database upgrade
+ * without actually changing any of the dbscheme predicates. It contains a date
+ * to allow for such updates in the future as well.
+ *
+ * 2021-07-14
+ *
+ * DO NOT remove this comment carelessly, since it can revert the dbscheme back to a
+ * previously seen state (matching a previously seen SHA), which would make the upgrade
+ * mechanism not work properly.
+ */
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+compilation_info(
+  int id : @compilation ref,
+  string info_key: string ref,
+  string info_value: string ref
+)
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | --compiler
+ * 1   | *path to compiler*
+ * 2   | f1.cs
+ * 3   | f2.cs
+ * 4   | f3.cs
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@someFile.rsp` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.cs
+ * 1   | f2.cs
+ * 2   | f3.cs
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The references used by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs /r:ref1.dll /r:ref2.dll /r:ref3.dll
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | ref1.dll
+ * 1   | ref2.dll
+ * 2   | ref3.dll
+ */
+#keyset[id, num]
+compilation_referencing_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    unique int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location ref
+);
+
+extractor_messages(
+    unique int id: @extractor_message,
+    int severity: int ref,
+    string origin : string ref,
+    string text : string ref,
+    string entity : string ref,
+    int location: @location ref,
+    string stack_trace : string ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+compilation_assembly(
+  unique int id : @compilation ref,
+  int assembly: @assembly ref
+)
+
+// Populated by the CSV extractor
+externalData(
+   int id: @externalDataElement,
+   string path: string ref,
+   int column: int ref,
+   string value: string ref);
+
+sourceLocationPrefix(
+  string prefix: string ref);
+
+/*
+ * C# dbscheme
+ */
+
+/** ELEMENTS **/
+
+@element = @declaration | @stmt | @expr | @modifier | @attribute | @namespace_declaration
+         | @using_directive | @type_parameter_constraints | @externalDataElement
+         | @xmllocatable | @asp_element | @namespace | @preprocessor_directive;
+
+@declaration = @callable | @generic | @assignable | @namespace;
+
+@named_element = @namespace | @declaration;
+
+@declaration_with_accessors = @property | @indexer | @event;
+
+@assignable = @variable | @assignable_with_accessors | @event;
+
+@assignable_with_accessors = @property | @indexer;
+
+@attributable = @assembly | @field | @parameter | @operator | @method | @constructor
+              | @destructor | @callable_accessor | @value_or_ref_type | @declaration_with_accessors
+              | @local_function | @lambda_expr;
+
+/** LOCATIONS, ASEMMBLIES, MODULES, FILES and FOLDERS **/
+
+@location = @location_default | @assembly;
+
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref);
+
+locations_mapped(
+  unique int id: @location_default ref,
+  int mapped_to: @location_default ref);
+
+@sourceline = @file | @callable | @xmllocatable;
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref);
+
+assemblies(
+  unique int id: @assembly,
+  int file: @file ref,
+  string fullname: string ref,
+  string name: string ref,
+  string version: string ref);
+
+files(
+  unique int id: @file,
+  string name: string ref);
+
+folders(
+  unique int id: @folder,
+  string name: string ref);
+
+@container = @folder | @file ;
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref);
+
+file_extraction_mode(
+  unique int file: @file ref,
+  int mode: int ref
+  /* 0 = normal, 1 = standalone extractor */
+  );
+
+/** NAMESPACES **/
+
+@type_container = @namespace | @type;
+
+namespaces(
+  unique int id: @namespace,
+  string name: string ref);
+
+namespace_declarations(
+  unique int id: @namespace_declaration,
+  int namespace_id: @namespace ref);
+
+namespace_declaration_location(
+  unique int id: @namespace_declaration ref,
+  int loc: @location ref);
+
+parent_namespace(
+  unique int child_id: @type_container ref,
+  int namespace_id: @namespace ref);
+
+@declaration_or_directive = @namespace_declaration | @type | @using_directive;
+
+parent_namespace_declaration(
+  int child_id: @declaration_or_directive ref, // cannot be unique because of partial classes
+  int namespace_id: @namespace_declaration ref);
+
+@using_directive = @using_namespace_directive | @using_static_directive;
+
+using_global(
+  unique int id: @using_directive ref
+);
+
+using_namespace_directives(
+  unique int id: @using_namespace_directive,
+  int namespace_id: @namespace ref);
+
+using_static_directives(
+  unique int id: @using_static_directive,
+  int type_id: @type_or_ref ref);
+
+using_directive_location(
+  unique int id: @using_directive ref,
+  int loc: @location ref);
+
+@preprocessor_directive = @pragma_warning | @pragma_checksum | @directive_define | @directive_undefine | @directive_warning
+  | @directive_error | @directive_nullable | @directive_line | @directive_region | @directive_endregion | @directive_if
+  | @directive_elif | @directive_else | @directive_endif;
+
+@conditional_directive = @directive_if | @directive_elif;
+@branch_directive = @directive_if | @directive_elif | @directive_else;
+
+directive_ifs(
+  unique int id: @directive_if,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref); /* 0: false, 1: true */
+
+directive_elifs(
+  unique int id: @directive_elif,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref,  /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+directive_elses(
+  unique int id: @directive_else,
+  int branchTaken: int ref,   /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+#keyset[id, start]
+directive_endifs(
+  unique int id: @directive_endif,
+  unique int start: @directive_if ref);
+
+directive_define_symbols(
+  unique int id: @define_symbol_expr ref,
+  string name: string ref);
+
+directive_regions(
+  unique int id: @directive_region,
+  string name: string ref);
+
+#keyset[id, start]
+directive_endregions(
+  unique int id: @directive_endregion,
+  unique int start: @directive_region ref);
+
+directive_lines(
+  unique int id: @directive_line,
+  int kind: int ref); /* 0: default, 1: hidden, 2: numeric, 3: span */
+
+directive_line_value(
+  unique int id: @directive_line ref,
+  int line: int ref);
+
+directive_line_file(
+  unique int id: @directive_line ref,
+  int file: @file ref);
+
+directive_line_offset(
+  unique int id: @directive_line ref,
+  int offset: int ref);
+
+directive_line_span(
+  unique int id: @directive_line ref,
+  int startLine: int ref,
+  int startColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref);
+
+directive_nullables(
+  unique int id: @directive_nullable,
+  int setting: int ref, /* 0: disable, 1: enable, 2: restore */
+  int target: int ref); /* 0: none, 1: annotations, 2: warnings */
+
+directive_warnings(
+  unique int id: @directive_warning,
+  string message: string ref);
+
+directive_errors(
+  unique int id: @directive_error,
+  string message: string ref);
+
+directive_undefines(
+  unique int id: @directive_undefine,
+  string name: string ref);
+
+directive_defines(
+  unique int id: @directive_define,
+  string name: string ref);
+
+pragma_checksums(
+  unique int id: @pragma_checksum,
+  int file: @file ref,
+  string guid: string ref,
+  string bytes: string ref);
+
+pragma_warnings(
+  unique int id: @pragma_warning,
+  int kind: int ref /* 0 = disable, 1 = restore */);
+
+#keyset[id, index]
+pragma_warning_error_codes(
+  int id: @pragma_warning ref,
+  string errorCode: string ref,
+  int index: int ref);
+
+preprocessor_directive_location(
+  unique int id: @preprocessor_directive ref,
+  int loc: @location ref);
+
+preprocessor_directive_compilation(
+  int id: @preprocessor_directive ref,
+  int compilation: @compilation ref);
+
+preprocessor_directive_active(
+  unique int id: @preprocessor_directive ref,
+  int active: int ref);  /* 0: false, 1: true */
+
+/** TYPES **/
+
+types(
+  unique int id: @type,
+  int kind: int ref,
+  string name: string ref);
+
+case @type.kind of
+   1 = @bool_type
+|  2 = @char_type
+|  3 = @decimal_type
+|  4 = @sbyte_type
+|  5 = @short_type
+|  6 = @int_type
+|  7 = @long_type
+|  8 = @byte_type
+|  9 = @ushort_type
+| 10 = @uint_type
+| 11 = @ulong_type
+| 12 = @float_type
+| 13 = @double_type
+| 14 = @enum_type
+| 15 = @struct_type
+| 17 = @class_type
+| 19 = @interface_type
+| 20 = @delegate_type
+| 21 = @null_type
+| 22 = @type_parameter
+| 23 = @pointer_type
+| 24 = @nullable_type
+| 25 = @array_type
+| 26 = @void_type
+| 27 = @int_ptr_type
+| 28 = @uint_ptr_type
+| 29 = @dynamic_type
+| 30 = @arglist_type
+| 31 = @unknown_type
+| 32 = @tuple_type
+| 33 = @function_pointer_type
+| 34 = @inline_array_type
+  ;
+
+@simple_type = @bool_type | @char_type | @integral_type | @floating_point_type | @decimal_type;
+@integral_type = @signed_integral_type | @unsigned_integral_type;
+@signed_integral_type = @sbyte_type | @short_type | @int_type | @long_type;
+@unsigned_integral_type = @byte_type  | @ushort_type | @uint_type | @ulong_type;
+@floating_point_type = @float_type | @double_type;
+@value_type = @simple_type | @enum_type | @struct_type | @nullable_type | @int_ptr_type
+            | @uint_ptr_type | @tuple_type | @void_type | @inline_array_type;
+@ref_type = @class_type | @interface_type | @array_type | @delegate_type | @null_type
+          | @dynamic_type;
+@value_or_ref_type = @value_type | @ref_type;
+
+typerefs(
+  unique int id: @typeref,
+  string name: string ref);
+
+typeref_type(
+  int id: @typeref ref,
+  unique int typeId: @type ref);
+
+@type_or_ref = @type | @typeref;
+
+array_element_type(
+  unique int array: @array_type ref,
+  int dimension: int ref,
+  int rank: int ref,
+  int element: @type_or_ref ref);
+
+nullable_underlying_type(
+  unique int nullable: @nullable_type ref,
+  int underlying: @type_or_ref ref);
+
+pointer_referent_type(
+  unique int pointer: @pointer_type ref,
+  int referent: @type_or_ref ref);
+
+enum_underlying_type(
+  unique int enum_id: @enum_type ref,
+  int underlying_type_id: @type_or_ref ref);
+
+delegate_return_type(
+  unique int delegate_id: @delegate_type ref,
+  int return_type_id: @type_or_ref ref);
+
+function_pointer_return_type(
+    unique int function_pointer_id: @function_pointer_type ref,
+    int return_type_id: @type_or_ref ref);
+
+extend(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+anonymous_types(
+  unique int id: @type ref);
+
+@interface_or_ref = @interface_type | @typeref;
+
+implement(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+type_location(
+  int id: @type ref,
+  int loc: @location ref);
+
+tuple_underlying_type(
+  unique int tuple: @tuple_type ref,
+  int struct: @type_or_ref ref);
+
+#keyset[tuple, index]
+tuple_element(
+  int tuple: @tuple_type ref,
+  int index: int ref,
+  unique int field: @field ref);
+
+attributes(
+  unique int id: @attribute,
+  int kind: int ref,
+  int type_id: @type_or_ref ref,
+  int target:  @attributable ref);
+
+case @attribute.kind of
+  0 = @attribute_default
+| 1 = @attribute_return
+| 2 = @attribute_assembly
+| 3 = @attribute_module
+;
+
+attribute_location(
+  int id: @attribute ref,
+  int loc: @location ref);
+
+@type_mention_parent = @element | @type_mention;
+
+type_mention(
+  unique int id: @type_mention,
+  int type_id: @type_or_ref ref,
+  int parent: @type_mention_parent ref);
+
+type_mention_location(
+  unique int id: @type_mention ref,
+  int loc: @location ref);
+
+@has_type_annotation = @assignable | @type_parameter | @callable | @expr | @delegate_type | @generic | @function_pointer_type;
+
+/**
+ * A direct annotation on an entity, for example `string? x;`.
+ *
+ * Annotations:
+ * 2 = reftype is not annotated "!"
+ * 3 = reftype is annotated "?"
+ * 4 = readonly ref type / in parameter
+ * 5 = ref type parameter, return or local variable
+ * 6 = out parameter
+ *
+ * Note that the annotation depends on the element it annotates.
+ * @assignable: The annotation is on the type of the assignable, for example the variable type.
+ * @type_parameter: The annotation is on the reftype constraint
+ * @callable: The annotation is on the return type
+ * @array_type: The annotation is on the element type
+ */
+type_annotation(int id: @has_type_annotation ref, int annotation: int ref);
+
+nullability(unique int nullability: @nullability, int kind: int ref);
+
+case @nullability.kind of
+  0 = @oblivious
+| 1 = @not_annotated
+| 2 = @annotated
+;
+
+#keyset[parent, index]
+nullability_parent(int nullability: @nullability ref, int index: int ref, int parent: @nullability ref)
+
+type_nullability(int id: @has_type_annotation ref, int nullability: @nullability ref);
+
+/**
+ * The nullable flow state of an expression, as determined by Roslyn.
+ *   0 = none (default, not populated)
+ *   1 = not null
+ *   2 = maybe null
+ */
+expr_flowstate(unique int id: @expr ref, int state: int ref);
+
+/** GENERICS **/
+
+@generic = @type | @method | @local_function;
+
+type_parameters(
+  unique int id: @type_parameter ref,
+  int index: int ref,
+  int generic_id: @generic ref,
+  int variance: int ref /* none = 0, out = 1, in = 2 */);
+
+#keyset[constructed_id, index]
+type_arguments(
+  int id: @type_or_ref ref,
+  int index: int ref,
+  int constructed_id: @generic_or_ref ref);
+
+@generic_or_ref = @generic | @typeref;
+
+constructed_generic(
+  unique int constructed: @generic ref,
+  int generic: @generic_or_ref ref);
+
+type_parameter_constraints(
+  unique int id: @type_parameter_constraints,
+  int param_id: @type_parameter ref);
+
+type_parameter_constraints_location(
+  int id: @type_parameter_constraints ref,
+  int loc: @location ref);
+
+general_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int kind: int ref /* class = 1, struct = 2, new = 3 */);
+
+specific_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref);
+
+specific_type_parameter_nullability(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref,
+  int nullability: @nullability ref);
+
+/** FUNCTION POINTERS */
+
+function_pointer_calling_conventions(
+  int id: @function_pointer_type ref,
+  int kind: int ref);
+
+#keyset[id, index]
+has_unmanaged_calling_conventions(
+  int id: @function_pointer_type ref,
+  int index: int ref,
+  int conv_id: @type_or_ref ref);
+
+/** MODIFIERS */
+
+@modifiable = @modifiable_direct | @event_accessor;
+
+@modifiable_direct = @member | @accessor | @local_function | @anonymous_function_expr;
+
+modifiers(
+  unique int id: @modifier,
+  string name: string ref);
+
+has_modifiers(
+  int id: @modifiable_direct ref,
+  int mod_id: @modifier ref);
+
+/** MEMBERS **/
+
+@member = @method | @constructor | @destructor | @field | @property | @event | @operator | @indexer | @type;
+
+@named_exprorstmt = @goto_stmt | @labeled_stmt | @expr;
+
+@virtualizable = @method | @property | @indexer | @event | @operator;
+
+exprorstmt_name(
+  unique int parent_id: @named_exprorstmt ref,
+  string name: string ref);
+
+nested_types(
+  unique int id: @type ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @type ref);
+
+properties(
+  unique int id: @property,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @property ref);
+
+property_location(
+  int id: @property ref,
+  int loc: @location ref);
+
+indexers(
+  unique int id: @indexer,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @indexer ref);
+
+indexer_location(
+  int id: @indexer ref,
+  int loc: @location ref);
+
+accessors(
+  unique int id: @accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_member_id: @member ref,
+  int unbound_id: @accessor ref);
+
+case @accessor.kind of
+  1 = @getter
+| 2 = @setter
+  ;
+
+init_only_accessors(
+  unique int id: @accessor ref);
+
+accessor_location(
+  int id: @accessor ref,
+  int loc: @location ref);
+
+events(
+  unique int id: @event,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @event ref);
+
+event_location(
+  int id: @event ref,
+  int loc: @location ref);
+
+event_accessors(
+  unique int id: @event_accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_event_id: @event ref,
+  int unbound_id: @event_accessor ref);
+
+case @event_accessor.kind of
+  1 = @add_event_accessor
+| 2 = @remove_event_accessor
+  ;
+
+event_accessor_location(
+  int id: @event_accessor ref,
+  int loc: @location ref);
+
+operators(
+  unique int id: @operator,
+  string name: string ref,
+  string symbol: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @operator ref);
+
+operator_location(
+  int id: @operator ref,
+  int loc: @location ref);
+
+constant_value(
+  int id: @variable ref,
+  string value: string ref);
+
+/** CALLABLES **/
+
+@callable = @method | @constructor | @destructor | @operator | @callable_accessor | @anonymous_function_expr | @local_function;
+
+@callable_accessor = @accessor | @event_accessor;
+
+methods(
+  unique int id: @method,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @method ref);
+
+method_location(
+  int id: @method ref,
+  int loc: @location ref);
+
+constructors(
+  unique int id: @constructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @constructor ref);
+
+constructor_location(
+  int id: @constructor ref,
+  int loc: @location ref);
+
+destructors(
+  unique int id: @destructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @destructor ref);
+
+destructor_location(
+  int id: @destructor ref,
+  int loc: @location ref);
+
+overrides(
+  int id: @callable ref,
+  int base_id: @callable ref);
+
+explicitly_implements(
+  int id: @member ref,
+  int interface_id: @interface_or_ref ref);
+
+local_functions(
+    unique int id: @local_function,
+    string name: string ref,
+    int return_type: @type ref,
+    int unbound_id: @local_function ref);
+
+local_function_stmts(
+    unique int fn: @local_function_stmt ref,
+    int stmt: @local_function ref);
+
+/** VARIABLES **/
+
+@variable = @local_scope_variable | @field;
+
+@local_scope_variable = @local_variable | @parameter;
+
+fields(
+  unique int id: @field,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @field ref);
+
+case @field.kind of
+  1 = @addressable_field
+| 2 = @constant
+  ;
+
+field_location(
+  int id: @field ref,
+  int loc: @location ref);
+
+localvars(
+  unique int id: @local_variable,
+  int kind: int ref,
+  string name: string ref,
+  int implicitly_typed: int ref /* 0 = no, 1 = yes */,
+  int type_id: @type_or_ref ref,
+  int parent_id: @local_var_decl_expr ref);
+
+case @local_variable.kind of
+  1 = @addressable_local_variable
+| 2 = @local_constant
+| 3 = @local_variable_ref
+  ;
+
+localvar_location(
+  unique int id: @local_variable ref,
+  int loc: @location ref);
+
+@parameterizable = @callable | @delegate_type | @indexer | @function_pointer_type;
+
+#keyset[name, parent_id]
+#keyset[index, parent_id]
+params(
+  unique int id: @parameter,
+  string name: string ref,
+  int type_id: @type_or_ref ref,
+  int index: int ref,
+  int mode: int ref, /* value = 0, ref = 1, out = 2, params/array = 3, this = 4, in = 5, ref readonly = 6 */
+  int parent_id: @parameterizable ref,
+  int unbound_id: @parameter ref);
+
+param_location(
+  int id: @parameter ref,
+  int loc: @location ref);
+
+@has_scoped_annotation = @local_scope_variable
+
+scoped_annotation(
+  int id: @has_scoped_annotation ref,
+  int kind: int ref // scoped ref = 1, scoped value = 2
+  );
+
+/** STATEMENTS **/
+
+@exprorstmt_parent = @control_flow_element | @top_level_exprorstmt_parent;
+
+statements(
+  unique int id: @stmt,
+  int kind: int ref);
+
+#keyset[index, parent]
+stmt_parent(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_stmt_parent = @callable;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+stmt_parent_top_level(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @top_level_stmt_parent ref);
+
+case @stmt.kind of
+   1 = @block_stmt
+|  2 = @expr_stmt
+|  3 = @if_stmt
+|  4 = @switch_stmt
+|  5 = @while_stmt
+|  6 = @do_stmt
+|  7 = @for_stmt
+|  8 = @foreach_stmt
+|  9 = @break_stmt
+| 10 = @continue_stmt
+| 11 = @goto_stmt
+| 12 = @goto_case_stmt
+| 13 = @goto_default_stmt
+| 14 = @throw_stmt
+| 15 = @return_stmt
+| 16 = @yield_stmt
+| 17 = @try_stmt
+| 18 = @checked_stmt
+| 19 = @unchecked_stmt
+| 20 = @lock_stmt
+| 21 = @using_block_stmt
+| 22 = @var_decl_stmt
+| 23 = @const_decl_stmt
+| 24 = @empty_stmt
+| 25 = @unsafe_stmt
+| 26 = @fixed_stmt
+| 27 = @label_stmt
+| 28 = @catch
+| 29 = @case_stmt
+| 30 = @local_function_stmt
+| 31 = @using_decl_stmt
+  ;
+
+@using_stmt = @using_block_stmt | @using_decl_stmt;
+
+@labeled_stmt = @label_stmt | @case;
+
+@decl_stmt = @var_decl_stmt | @const_decl_stmt | @using_decl_stmt;
+
+@cond_stmt = @if_stmt | @switch_stmt;
+
+@loop_stmt = @while_stmt | @do_stmt | @for_stmt | @foreach_stmt;
+
+@jump_stmt = @break_stmt | @goto_any_stmt | @continue_stmt | @throw_stmt | @return_stmt
+           | @yield_stmt;
+
+@goto_any_stmt = @goto_default_stmt | @goto_case_stmt | @goto_stmt;
+
+
+stmt_location(
+  unique int id: @stmt ref,
+  int loc: @location ref);
+
+catch_type(
+  unique int catch_id: @catch ref,
+  int type_id: @type_or_ref ref,
+  int kind: int ref /* explicit = 1, implicit = 2 */);
+
+foreach_stmt_info(
+  unique int id: @foreach_stmt ref,
+  int kind: int ref /* non-async = 1, async = 2 */);
+
+@foreach_symbol =  @method | @property | @type_or_ref;
+
+#keyset[id, kind]
+foreach_stmt_desugar(
+  int id: @foreach_stmt ref,
+  int symbol: @foreach_symbol ref,
+  int kind: int ref /* GetEnumeratorMethod = 1, CurrentProperty = 2, MoveNextMethod = 3, DisposeMethod = 4, ElementType = 5 */);
+
+/** EXPRESSIONS **/
+
+expressions(
+  unique int id: @expr,
+  int kind: int ref,
+  int type_id: @type_or_ref ref);
+
+#keyset[index, parent]
+expr_parent(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_expr_parent = @attribute | @field | @property | @indexer | @parameter | @directive_if | @directive_elif;
+
+@top_level_exprorstmt_parent = @top_level_expr_parent | @top_level_stmt_parent;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+expr_parent_top_level(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @top_level_exprorstmt_parent ref);
+
+case @expr.kind of
+/* literal */
+   1 = @bool_literal_expr
+|  2 = @char_literal_expr
+|  3 = @decimal_literal_expr
+|  4 = @int_literal_expr
+|  5 = @long_literal_expr
+|  6 = @uint_literal_expr
+|  7 = @ulong_literal_expr
+|  8 = @float_literal_expr
+|  9 = @double_literal_expr
+| 10 = @utf16_string_literal_expr
+| 11 = @null_literal_expr
+/* primary & unary */
+| 12 = @this_access_expr
+| 13 = @base_access_expr
+| 14 = @local_variable_access_expr
+| 15 = @parameter_access_expr
+| 16 = @field_access_expr
+| 17 = @property_access_expr
+| 18 = @method_access_expr
+| 19 = @event_access_expr
+| 20 = @indexer_access_expr
+| 21 = @array_access_expr
+| 22 = @type_access_expr
+| 23 = @typeof_expr
+| 24 = @method_invocation_expr
+| 25 = @delegate_invocation_expr
+| 26 = @operator_invocation_expr
+| 27 = @cast_expr
+| 28 = @object_creation_expr
+| 29 = @explicit_delegate_creation_expr
+| 30 = @implicit_delegate_creation_expr
+| 31 = @array_creation_expr
+| 32 = @default_expr
+| 33 = @plus_expr
+| 34 = @minus_expr
+| 35 = @bit_not_expr
+| 36 = @log_not_expr
+| 37 = @post_incr_expr
+| 38 = @post_decr_expr
+| 39 = @pre_incr_expr
+| 40 = @pre_decr_expr
+/* multiplicative */
+| 41 = @mul_expr
+| 42 = @div_expr
+| 43 = @rem_expr
+/* additive */
+| 44 = @add_expr
+| 45 = @sub_expr
+/* shift */
+| 46 = @lshift_expr
+| 47 = @rshift_expr
+/* relational */
+| 48 = @lt_expr
+| 49 = @gt_expr
+| 50 = @le_expr
+| 51 = @ge_expr
+/* equality */
+| 52 = @eq_expr
+| 53 = @ne_expr
+/* logical */
+| 54 = @bit_and_expr
+| 55 = @bit_xor_expr
+| 56 = @bit_or_expr
+| 57 = @log_and_expr
+| 58 = @log_or_expr
+/* type testing */
+| 59 = @is_expr
+| 60 = @as_expr
+/* null coalescing */
+| 61 = @null_coalescing_expr
+/* conditional */
+| 62 = @conditional_expr
+/* assignment */
+| 63 = @simple_assign_expr
+| 64 = @assign_add_expr
+| 65 = @assign_sub_expr
+| 66 = @assign_mul_expr
+| 67 = @assign_div_expr
+| 68 = @assign_rem_expr
+| 69 = @assign_and_expr
+| 70 = @assign_xor_expr
+| 71 = @assign_or_expr
+| 72 = @assign_lshift_expr
+| 73 = @assign_rshift_expr
+/* more */
+| 74 = @object_init_expr
+| 75 = @collection_init_expr
+| 76 = @array_init_expr
+| 77 = @checked_expr
+| 78 = @unchecked_expr
+| 79 = @constructor_init_expr
+| 80 = @add_event_expr
+| 81 = @remove_event_expr
+| 82 = @par_expr
+| 83 = @local_var_decl_expr
+| 84 = @lambda_expr
+| 85 = @anonymous_method_expr
+| 86 = @namespace_expr
+/* dynamic */
+| 92 = @dynamic_element_access_expr
+| 93 = @dynamic_member_access_expr
+/* unsafe */
+| 100 = @pointer_indirection_expr
+| 101 = @address_of_expr
+| 102 = @sizeof_expr
+/* async */
+| 103 = @await_expr
+/* C# 6.0 */
+| 104 = @nameof_expr
+| 105 = @interpolated_string_expr
+| 106 = @unknown_expr
+/* C# 7.0 */
+| 107 = @throw_expr
+| 108 = @tuple_expr
+| 109 = @local_function_invocation_expr
+| 110 = @ref_expr
+| 111 = @discard_expr
+/* C# 8.0 */
+| 112 = @range_expr
+| 113 = @index_expr
+| 114 = @switch_expr
+| 115 = @recursive_pattern_expr
+| 116 = @property_pattern_expr
+| 117 = @positional_pattern_expr
+| 118 = @switch_case_expr
+| 119 = @assign_coalesce_expr
+| 120 = @suppress_nullable_warning_expr
+| 121 = @namespace_access_expr
+/* C# 9.0 */
+| 122 = @lt_pattern_expr
+| 123 = @gt_pattern_expr
+| 124 = @le_pattern_expr
+| 125 = @ge_pattern_expr
+| 126 = @not_pattern_expr
+| 127 = @and_pattern_expr
+| 128 = @or_pattern_expr
+| 129 = @function_pointer_invocation_expr
+| 130 = @with_expr
+/* C# 11.0 */
+| 131 = @list_pattern_expr
+| 132 = @slice_pattern_expr
+| 133 = @urshift_expr
+| 134 = @assign_urshift_expr
+| 135 = @utf8_string_literal_expr
+/* C# 12.0 */
+| 136 = @collection_expr
+| 137 = @spread_element_expr
+| 138 = @interpolated_string_insert_expr
+/* Preprocessor */
+| 999 = @define_symbol_expr
+;
+
+@switch = @switch_stmt | @switch_expr;
+@case = @case_stmt | @switch_case_expr;
+@pattern_match = @case | @is_expr;
+@unary_pattern_expr = @not_pattern_expr;
+@relational_pattern_expr = @gt_pattern_expr | @lt_pattern_expr | @ge_pattern_expr | @le_pattern_expr;
+@binary_pattern_expr = @and_pattern_expr | @or_pattern_expr;
+
+@integer_literal_expr = @int_literal_expr | @long_literal_expr | @uint_literal_expr | @ulong_literal_expr;
+@real_literal_expr = @float_literal_expr | @double_literal_expr | @decimal_literal_expr;
+@string_literal_expr = @utf16_string_literal_expr | @utf8_string_literal_expr;
+@literal_expr = @bool_literal_expr | @char_literal_expr | @integer_literal_expr | @real_literal_expr
+              | @string_literal_expr | @null_literal_expr;
+
+@assign_expr = @simple_assign_expr | @assign_op_expr | @local_var_decl_expr;
+@assign_op_expr =  @assign_arith_expr | @assign_bitwise_expr | @assign_event_expr | @assign_coalesce_expr;
+@assign_event_expr = @add_event_expr | @remove_event_expr;
+
+@assign_arith_expr = @assign_add_expr | @assign_sub_expr | @assign_mul_expr | @assign_div_expr
+                   | @assign_rem_expr
+@assign_bitwise_expr = @assign_and_expr | @assign_or_expr | @assign_xor_expr
+                   | @assign_lshift_expr | @assign_rshift_expr | @assign_urshift_expr;
+
+@member_access_expr = @field_access_expr | @property_access_expr | @indexer_access_expr | @event_access_expr
+                    | @method_access_expr | @type_access_expr | @dynamic_member_access_expr;
+@access_expr = @member_access_expr | @this_access_expr | @base_access_expr | @assignable_access_expr | @namespace_access_expr;
+@element_access_expr = @indexer_access_expr | @array_access_expr | @dynamic_element_access_expr;
+
+@local_variable_access = @local_variable_access_expr | @local_var_decl_expr;
+@local_scope_variable_access_expr = @parameter_access_expr | @local_variable_access;
+@variable_access_expr = @local_scope_variable_access_expr | @field_access_expr;
+
+@assignable_access_expr = @variable_access_expr | @property_access_expr | @element_access_expr
+                        | @event_access_expr | @dynamic_member_access_expr;
+
+@objectorcollection_init_expr = @object_init_expr | @collection_init_expr;
+
+@delegate_creation_expr = @explicit_delegate_creation_expr | @implicit_delegate_creation_expr;
+
+@bin_arith_op_expr = @mul_expr | @div_expr | @rem_expr | @add_expr | @sub_expr;
+@incr_op_expr =  @pre_incr_expr | @post_incr_expr;
+@decr_op_expr =  @pre_decr_expr | @post_decr_expr;
+@mut_op_expr = @incr_op_expr | @decr_op_expr;
+@un_arith_op_expr = @plus_expr | @minus_expr | @mut_op_expr;
+@arith_op_expr = @bin_arith_op_expr | @un_arith_op_expr;
+
+@ternary_log_op_expr = @conditional_expr;
+@bin_log_op_expr = @log_and_expr | @log_or_expr | @null_coalescing_expr;
+@un_log_op_expr = @log_not_expr;
+@log_expr = @un_log_op_expr | @bin_log_op_expr | @ternary_log_op_expr;
+
+@bin_bit_op_expr =  @bit_and_expr | @bit_or_expr | @bit_xor_expr | @lshift_expr
+                 | @rshift_expr | @urshift_expr;
+@un_bit_op_expr = @bit_not_expr;
+@bit_expr = @un_bit_op_expr | @bin_bit_op_expr;
+
+@equality_op_expr =  @eq_expr | @ne_expr;
+@rel_op_expr = @gt_expr | @lt_expr| @ge_expr | @le_expr;
+@comp_expr = @equality_op_expr | @rel_op_expr;
+
+@op_expr = @assign_expr | @un_op | @bin_op | @ternary_op;
+
+@ternary_op = @ternary_log_op_expr;
+@bin_op = @bin_arith_op_expr | @bin_log_op_expr | @bin_bit_op_expr | @comp_expr;
+@un_op = @un_arith_op_expr | @un_log_op_expr | @un_bit_op_expr | @sizeof_expr
+       | @pointer_indirection_expr | @address_of_expr;
+
+@anonymous_function_expr = @lambda_expr | @anonymous_method_expr;
+
+@call = @method_invocation_expr | @constructor_init_expr | @operator_invocation_expr
+      | @delegate_invocation_expr | @object_creation_expr | @call_access_expr
+      | @local_function_invocation_expr | @function_pointer_invocation_expr;
+
+@call_access_expr = @property_access_expr | @event_access_expr | @indexer_access_expr;
+
+@late_bindable_expr = @dynamic_element_access_expr | @dynamic_member_access_expr
+                    | @object_creation_expr | @method_invocation_expr | @operator_invocation_expr;
+
+@throw_element = @throw_expr | @throw_stmt;
+
+@implicitly_typeable_object_creation_expr = @object_creation_expr | @explicit_delegate_creation_expr;
+
+implicitly_typed_array_creation(
+  unique int id: @array_creation_expr ref);
+
+explicitly_sized_array_creation(
+  unique int id: @array_creation_expr ref);
+
+stackalloc_array_creation(
+  unique int id: @array_creation_expr ref);
+
+implicitly_typed_object_creation(
+  unique int id: @implicitly_typeable_object_creation_expr ref);
+
+mutator_invocation_mode(
+  unique int id: @operator_invocation_expr ref,
+  int mode: int ref /* prefix = 1, postfix = 2*/);
+
+expr_value(
+  unique int id: @expr ref,
+  string value: string ref);
+
+expr_call(
+  unique int caller_id: @expr ref,
+  int target_id: @callable ref);
+
+expr_access(
+  unique int accesser_id: @access_expr ref,
+  int target_id: @accessible ref);
+
+@accessible = @method | @assignable | @local_function | @namespace;
+
+expr_location(
+  unique int id: @expr ref,
+  int loc: @location ref);
+
+dynamic_member_name(
+  unique int id: @late_bindable_expr ref,
+  string name: string ref);
+
+@qualifiable_expr = @member_access_expr
+                  | @method_invocation_expr
+                  | @element_access_expr;
+
+conditional_access(
+  unique int id: @qualifiable_expr ref);
+
+expr_argument(
+  unique int id: @expr ref,
+  int mode: int ref);
+  /* mode is the same as params: value = 0, ref = 1, out = 2 */
+
+expr_argument_name(
+  unique int id: @expr ref,
+  string name: string ref);
+
+lambda_expr_return_type(
+  unique int id: @lambda_expr ref,
+  int type_id: @type_or_ref ref);
+
+/* Compiler generated */
+
+compiler_generated(unique int id: @element ref);
+
+/** CONTROL/DATA FLOW **/
+
+@control_flow_element = @stmt | @expr;
+
+/* XML Files */
+
+xmlEncoding  (
+  unique int id: @file ref,
+  string encoding: string ref);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+/* Comments */
+
+commentline(
+  unique int id: @commentline,
+  int kind: int ref,
+  string text: string ref,
+  string rawtext: string ref);
+
+case @commentline.kind of
+  0 = @singlelinecomment
+| 1 = @xmldoccomment
+| 2 = @multilinecomment;
+
+commentline_location(
+  unique int id: @commentline ref,
+  int loc: @location ref);
+
+commentblock(
+  unique int id : @commentblock);
+
+commentblock_location(
+  unique int id: @commentblock ref,
+  int loc: @location ref);
+
+commentblock_binding(
+  int id: @commentblock ref,
+  int entity: @element ref,
+  int bindtype: int ref);    /* 0: Parent, 1: Best, 2: Before, 3: After */
+
+commentblock_child(
+  int id: @commentblock ref,
+  int commentline: @commentline ref,
+  int index: int ref);
+
+/* ASP.NET */
+
+case @asp_element.kind of
+  0=@asp_close_tag
+| 1=@asp_code
+| 2=@asp_comment
+| 3=@asp_data_binding
+| 4=@asp_directive
+| 5=@asp_open_tag
+| 6=@asp_quoted_string
+| 7=@asp_text
+| 8=@asp_xml_directive;
+
+@asp_attribute = @asp_code | @asp_data_binding | @asp_quoted_string;
+
+asp_elements(
+  unique int id: @asp_element,
+  int kind: int ref,
+  int loc: @location ref);
+
+asp_comment_server(unique int comment: @asp_comment ref);
+asp_code_inline(unique int code: @asp_code ref);
+asp_directive_attribute(
+  int directive: @asp_directive ref,
+  int index: int ref,
+  string name: string ref,
+  int value: @asp_quoted_string ref);
+asp_directive_name(
+  unique int directive: @asp_directive ref,
+  string name: string ref);
+asp_element_body(
+  unique int element: @asp_element ref,
+  string body: string ref);
+asp_tag_attribute(
+  int tag: @asp_open_tag ref,
+  int index: int ref,
+  string name: string ref,
+  int attribute: @asp_attribute ref);
+asp_tag_name(
+  unique int tag: @asp_open_tag ref,
+  string name: string ref);
+asp_tag_isempty(int tag: @asp_open_tag ref);
diff --git a/csharp/ql/lib/upgrades/66044cfa5bbf2ecfabd06ead25e91db2bdd79764/semmlecode.csharp.dbscheme b/csharp/ql/lib/upgrades/66044cfa5bbf2ecfabd06ead25e91db2bdd79764/semmlecode.csharp.dbscheme
new file mode 100644
index 00000000000..605f8505340
--- /dev/null
+++ b/csharp/ql/lib/upgrades/66044cfa5bbf2ecfabd06ead25e91db2bdd79764/semmlecode.csharp.dbscheme
@@ -0,0 +1,1478 @@
+/* This is a dummy line to alter the dbscheme, so we can make a database upgrade
+ * without actually changing any of the dbscheme predicates. It contains a date
+ * to allow for such updates in the future as well.
+ *
+ * 2021-07-14
+ *
+ * DO NOT remove this comment carelessly, since it can revert the dbscheme back to a
+ * previously seen state (matching a previously seen SHA), which would make the upgrade
+ * mechanism not work properly.
+ */
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+compilation_info(
+  int id : @compilation ref,
+  string info_key: string ref,
+  string info_value: string ref
+)
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | --compiler
+ * 1   | *path to compiler*
+ * 2   | f1.cs
+ * 3   | f2.cs
+ * 4   | f3.cs
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@someFile.rsp` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.cs
+ * 1   | f2.cs
+ * 2   | f3.cs
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The references used by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs /r:ref1.dll /r:ref2.dll /r:ref3.dll
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | ref1.dll
+ * 1   | ref2.dll
+ * 2   | ref3.dll
+ */
+#keyset[id, num]
+compilation_referencing_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    unique int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location ref
+);
+
+extractor_messages(
+    unique int id: @extractor_message,
+    int severity: int ref,
+    string origin : string ref,
+    string text : string ref,
+    string entity : string ref,
+    int location: @location ref,
+    string stack_trace : string ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+compilation_assembly(
+  unique int id : @compilation ref,
+  int assembly: @assembly ref
+)
+
+// Populated by the CSV extractor
+externalData(
+   int id: @externalDataElement,
+   string path: string ref,
+   int column: int ref,
+   string value: string ref);
+
+sourceLocationPrefix(
+  string prefix: string ref);
+
+/*
+ * Overlay support
+ */
+
+/**
+ * The CLI will automatically emit the tuple `databaseMetadata("isOverlay", "true")`,
+ * along with an `overlayChangedFiles` tuple for each new/modified/deleted file,
+ * when building an overlay database, and these can be used by the discard predicates.
+ */
+databaseMetadata(
+  string metadataKey : string ref,
+  string value : string ref
+);
+
+overlayChangedFiles(
+  string path : string ref
+);
+
+/*
+ * C# dbscheme
+ */
+
+/** ELEMENTS **/
+
+@element = @declaration | @stmt | @expr | @modifier | @attribute | @namespace_declaration
+         | @using_directive | @type_parameter_constraints | @externalDataElement
+         | @xmllocatable | @asp_element | @namespace | @preprocessor_directive;
+
+@declaration = @callable | @generic | @assignable | @namespace;
+
+@named_element = @namespace | @declaration;
+
+@declaration_with_accessors = @property | @indexer | @event;
+
+@assignable = @variable | @assignable_with_accessors | @event;
+
+@assignable_with_accessors = @property | @indexer;
+
+@attributable = @assembly | @field | @parameter | @operator | @method | @constructor
+              | @destructor | @callable_accessor | @value_or_ref_type | @declaration_with_accessors
+              | @local_function | @lambda_expr;
+
+/** LOCATIONS, ASEMMBLIES, MODULES, FILES and FOLDERS **/
+
+@location = @location_default | @assembly;
+
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref);
+
+locations_mapped(
+  unique int id: @location_default ref,
+  int mapped_to: @location_default ref);
+
+@sourceline = @file | @callable | @xmllocatable;
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref);
+
+assemblies(
+  unique int id: @assembly,
+  int file: @file ref,
+  string fullname: string ref,
+  string name: string ref,
+  string version: string ref);
+
+files(
+  unique int id: @file,
+  string name: string ref);
+
+folders(
+  unique int id: @folder,
+  string name: string ref);
+
+@container = @folder | @file ;
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref);
+
+file_extraction_mode(
+  unique int file: @file ref,
+  int mode: int ref
+  /* 0 = normal, 1 = standalone extractor */
+  );
+
+/** NAMESPACES **/
+
+@type_container = @namespace | @type;
+
+namespaces(
+  unique int id: @namespace,
+  string name: string ref);
+
+namespace_declarations(
+  unique int id: @namespace_declaration,
+  int namespace_id: @namespace ref);
+
+namespace_declaration_location(
+  unique int id: @namespace_declaration ref,
+  int loc: @location ref);
+
+parent_namespace(
+  unique int child_id: @type_container ref,
+  int namespace_id: @namespace ref);
+
+@declaration_or_directive = @namespace_declaration | @type | @using_directive;
+
+parent_namespace_declaration(
+  int child_id: @declaration_or_directive ref, // cannot be unique because of partial classes
+  int namespace_id: @namespace_declaration ref);
+
+@using_directive = @using_namespace_directive | @using_static_directive;
+
+using_global(
+  unique int id: @using_directive ref
+);
+
+using_namespace_directives(
+  unique int id: @using_namespace_directive,
+  int namespace_id: @namespace ref);
+
+using_static_directives(
+  unique int id: @using_static_directive,
+  int type_id: @type_or_ref ref);
+
+using_directive_location(
+  unique int id: @using_directive ref,
+  int loc: @location ref);
+
+@preprocessor_directive = @pragma_warning | @pragma_checksum | @directive_define | @directive_undefine | @directive_warning
+  | @directive_error | @directive_nullable | @directive_line | @directive_region | @directive_endregion | @directive_if
+  | @directive_elif | @directive_else | @directive_endif;
+
+@conditional_directive = @directive_if | @directive_elif;
+@branch_directive = @directive_if | @directive_elif | @directive_else;
+
+directive_ifs(
+  unique int id: @directive_if,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref); /* 0: false, 1: true */
+
+directive_elifs(
+  unique int id: @directive_elif,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref,  /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+directive_elses(
+  unique int id: @directive_else,
+  int branchTaken: int ref,   /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+#keyset[id, start]
+directive_endifs(
+  unique int id: @directive_endif,
+  unique int start: @directive_if ref);
+
+directive_define_symbols(
+  unique int id: @define_symbol_expr ref,
+  string name: string ref);
+
+directive_regions(
+  unique int id: @directive_region,
+  string name: string ref);
+
+#keyset[id, start]
+directive_endregions(
+  unique int id: @directive_endregion,
+  unique int start: @directive_region ref);
+
+directive_lines(
+  unique int id: @directive_line,
+  int kind: int ref); /* 0: default, 1: hidden, 2: numeric, 3: span */
+
+directive_line_value(
+  unique int id: @directive_line ref,
+  int line: int ref);
+
+directive_line_file(
+  unique int id: @directive_line ref,
+  int file: @file ref);
+
+directive_line_offset(
+  unique int id: @directive_line ref,
+  int offset: int ref);
+
+directive_line_span(
+  unique int id: @directive_line ref,
+  int startLine: int ref,
+  int startColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref);
+
+directive_nullables(
+  unique int id: @directive_nullable,
+  int setting: int ref, /* 0: disable, 1: enable, 2: restore */
+  int target: int ref); /* 0: none, 1: annotations, 2: warnings */
+
+directive_warnings(
+  unique int id: @directive_warning,
+  string message: string ref);
+
+directive_errors(
+  unique int id: @directive_error,
+  string message: string ref);
+
+directive_undefines(
+  unique int id: @directive_undefine,
+  string name: string ref);
+
+directive_defines(
+  unique int id: @directive_define,
+  string name: string ref);
+
+pragma_checksums(
+  unique int id: @pragma_checksum,
+  int file: @file ref,
+  string guid: string ref,
+  string bytes: string ref);
+
+pragma_warnings(
+  unique int id: @pragma_warning,
+  int kind: int ref /* 0 = disable, 1 = restore */);
+
+#keyset[id, index]
+pragma_warning_error_codes(
+  int id: @pragma_warning ref,
+  string errorCode: string ref,
+  int index: int ref);
+
+preprocessor_directive_location(
+  unique int id: @preprocessor_directive ref,
+  int loc: @location ref);
+
+preprocessor_directive_compilation(
+  int id: @preprocessor_directive ref,
+  int compilation: @compilation ref);
+
+preprocessor_directive_active(
+  unique int id: @preprocessor_directive ref,
+  int active: int ref);  /* 0: false, 1: true */
+
+/** TYPES **/
+
+types(
+  unique int id: @type,
+  int kind: int ref,
+  string name: string ref);
+
+case @type.kind of
+   1 = @bool_type
+|  2 = @char_type
+|  3 = @decimal_type
+|  4 = @sbyte_type
+|  5 = @short_type
+|  6 = @int_type
+|  7 = @long_type
+|  8 = @byte_type
+|  9 = @ushort_type
+| 10 = @uint_type
+| 11 = @ulong_type
+| 12 = @float_type
+| 13 = @double_type
+| 14 = @enum_type
+| 15 = @struct_type
+| 17 = @class_type
+| 19 = @interface_type
+| 20 = @delegate_type
+| 21 = @null_type
+| 22 = @type_parameter
+| 23 = @pointer_type
+| 24 = @nullable_type
+| 25 = @array_type
+| 26 = @void_type
+| 27 = @int_ptr_type
+| 28 = @uint_ptr_type
+| 29 = @dynamic_type
+| 30 = @arglist_type
+| 31 = @unknown_type
+| 32 = @tuple_type
+| 33 = @function_pointer_type
+| 34 = @inline_array_type
+  ;
+
+@simple_type = @bool_type | @char_type | @integral_type | @floating_point_type | @decimal_type;
+@integral_type = @signed_integral_type | @unsigned_integral_type;
+@signed_integral_type = @sbyte_type | @short_type | @int_type | @long_type;
+@unsigned_integral_type = @byte_type  | @ushort_type | @uint_type | @ulong_type;
+@floating_point_type = @float_type | @double_type;
+@value_type = @simple_type | @enum_type | @struct_type | @nullable_type | @int_ptr_type
+            | @uint_ptr_type | @tuple_type | @void_type | @inline_array_type;
+@ref_type = @class_type | @interface_type | @array_type | @delegate_type | @null_type
+          | @dynamic_type;
+@value_or_ref_type = @value_type | @ref_type;
+
+typerefs(
+  unique int id: @typeref,
+  string name: string ref);
+
+typeref_type(
+  int id: @typeref ref,
+  unique int typeId: @type ref);
+
+@type_or_ref = @type | @typeref;
+
+array_element_type(
+  unique int array: @array_type ref,
+  int dimension: int ref,
+  int rank: int ref,
+  int element: @type_or_ref ref);
+
+nullable_underlying_type(
+  unique int nullable: @nullable_type ref,
+  int underlying: @type_or_ref ref);
+
+pointer_referent_type(
+  unique int pointer: @pointer_type ref,
+  int referent: @type_or_ref ref);
+
+enum_underlying_type(
+  unique int enum_id: @enum_type ref,
+  int underlying_type_id: @type_or_ref ref);
+
+delegate_return_type(
+  unique int delegate_id: @delegate_type ref,
+  int return_type_id: @type_or_ref ref);
+
+function_pointer_return_type(
+    unique int function_pointer_id: @function_pointer_type ref,
+    int return_type_id: @type_or_ref ref);
+
+extend(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+anonymous_types(
+  unique int id: @type ref);
+
+@interface_or_ref = @interface_type | @typeref;
+
+implement(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+type_location(
+  int id: @type ref,
+  int loc: @location ref);
+
+tuple_underlying_type(
+  unique int tuple: @tuple_type ref,
+  int struct: @type_or_ref ref);
+
+#keyset[tuple, index]
+tuple_element(
+  int tuple: @tuple_type ref,
+  int index: int ref,
+  unique int field: @field ref);
+
+attributes(
+  unique int id: @attribute,
+  int kind: int ref,
+  int type_id: @type_or_ref ref,
+  int target:  @attributable ref);
+
+case @attribute.kind of
+  0 = @attribute_default
+| 1 = @attribute_return
+| 2 = @attribute_assembly
+| 3 = @attribute_module
+;
+
+attribute_location(
+  int id: @attribute ref,
+  int loc: @location ref);
+
+@type_mention_parent = @element | @type_mention;
+
+type_mention(
+  unique int id: @type_mention,
+  int type_id: @type_or_ref ref,
+  int parent: @type_mention_parent ref);
+
+type_mention_location(
+  unique int id: @type_mention ref,
+  int loc: @location ref);
+
+@has_type_annotation = @assignable | @type_parameter | @callable | @expr | @delegate_type | @generic | @function_pointer_type;
+
+/**
+ * A direct annotation on an entity, for example `string? x;`.
+ *
+ * Annotations:
+ * 2 = reftype is not annotated "!"
+ * 3 = reftype is annotated "?"
+ * 4 = readonly ref type / in parameter
+ * 5 = ref type parameter, return or local variable
+ * 6 = out parameter
+ *
+ * Note that the annotation depends on the element it annotates.
+ * @assignable: The annotation is on the type of the assignable, for example the variable type.
+ * @type_parameter: The annotation is on the reftype constraint
+ * @callable: The annotation is on the return type
+ * @array_type: The annotation is on the element type
+ */
+type_annotation(int id: @has_type_annotation ref, int annotation: int ref);
+
+nullability(unique int nullability: @nullability, int kind: int ref);
+
+case @nullability.kind of
+  0 = @oblivious
+| 1 = @not_annotated
+| 2 = @annotated
+;
+
+#keyset[parent, index]
+nullability_parent(int nullability: @nullability ref, int index: int ref, int parent: @nullability ref)
+
+type_nullability(int id: @has_type_annotation ref, int nullability: @nullability ref);
+
+/**
+ * The nullable flow state of an expression, as determined by Roslyn.
+ *   0 = none (default, not populated)
+ *   1 = not null
+ *   2 = maybe null
+ */
+expr_flowstate(unique int id: @expr ref, int state: int ref);
+
+/** GENERICS **/
+
+@generic = @type | @method | @local_function;
+
+type_parameters(
+  unique int id: @type_parameter ref,
+  int index: int ref,
+  int generic_id: @generic ref,
+  int variance: int ref /* none = 0, out = 1, in = 2 */);
+
+#keyset[constructed_id, index]
+type_arguments(
+  int id: @type_or_ref ref,
+  int index: int ref,
+  int constructed_id: @generic_or_ref ref);
+
+@generic_or_ref = @generic | @typeref;
+
+constructed_generic(
+  unique int constructed: @generic ref,
+  int generic: @generic_or_ref ref);
+
+type_parameter_constraints(
+  unique int id: @type_parameter_constraints,
+  int param_id: @type_parameter ref);
+
+type_parameter_constraints_location(
+  int id: @type_parameter_constraints ref,
+  int loc: @location ref);
+
+general_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int kind: int ref /* class = 1, struct = 2, new = 3 */);
+
+specific_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref);
+
+specific_type_parameter_nullability(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref,
+  int nullability: @nullability ref);
+
+/** FUNCTION POINTERS */
+
+function_pointer_calling_conventions(
+  int id: @function_pointer_type ref,
+  int kind: int ref);
+
+#keyset[id, index]
+has_unmanaged_calling_conventions(
+  int id: @function_pointer_type ref,
+  int index: int ref,
+  int conv_id: @type_or_ref ref);
+
+/** MODIFIERS */
+
+@modifiable = @modifiable_direct | @event_accessor;
+
+@modifiable_direct = @member | @accessor | @local_function | @anonymous_function_expr;
+
+modifiers(
+  unique int id: @modifier,
+  string name: string ref);
+
+has_modifiers(
+  int id: @modifiable_direct ref,
+  int mod_id: @modifier ref);
+
+/** MEMBERS **/
+
+@member = @method | @constructor | @destructor | @field | @property | @event | @operator | @indexer | @type;
+
+@named_exprorstmt = @goto_stmt | @labeled_stmt | @expr;
+
+@virtualizable = @method | @property | @indexer | @event | @operator;
+
+exprorstmt_name(
+  unique int parent_id: @named_exprorstmt ref,
+  string name: string ref);
+
+nested_types(
+  unique int id: @type ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @type ref);
+
+properties(
+  unique int id: @property,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @property ref);
+
+property_location(
+  int id: @property ref,
+  int loc: @location ref);
+
+indexers(
+  unique int id: @indexer,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @indexer ref);
+
+indexer_location(
+  int id: @indexer ref,
+  int loc: @location ref);
+
+accessors(
+  unique int id: @accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_member_id: @member ref,
+  int unbound_id: @accessor ref);
+
+case @accessor.kind of
+  1 = @getter
+| 2 = @setter
+  ;
+
+init_only_accessors(
+  unique int id: @accessor ref);
+
+accessor_location(
+  int id: @accessor ref,
+  int loc: @location ref);
+
+events(
+  unique int id: @event,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @event ref);
+
+event_location(
+  int id: @event ref,
+  int loc: @location ref);
+
+event_accessors(
+  unique int id: @event_accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_event_id: @event ref,
+  int unbound_id: @event_accessor ref);
+
+case @event_accessor.kind of
+  1 = @add_event_accessor
+| 2 = @remove_event_accessor
+  ;
+
+event_accessor_location(
+  int id: @event_accessor ref,
+  int loc: @location ref);
+
+operators(
+  unique int id: @operator,
+  string name: string ref,
+  string symbol: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @operator ref);
+
+operator_location(
+  int id: @operator ref,
+  int loc: @location ref);
+
+constant_value(
+  int id: @variable ref,
+  string value: string ref);
+
+/** CALLABLES **/
+
+@callable = @method | @constructor | @destructor | @operator | @callable_accessor | @anonymous_function_expr | @local_function;
+
+@callable_accessor = @accessor | @event_accessor;
+
+methods(
+  unique int id: @method,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @method ref);
+
+method_location(
+  int id: @method ref,
+  int loc: @location ref);
+
+constructors(
+  unique int id: @constructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @constructor ref);
+
+constructor_location(
+  int id: @constructor ref,
+  int loc: @location ref);
+
+destructors(
+  unique int id: @destructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @destructor ref);
+
+destructor_location(
+  int id: @destructor ref,
+  int loc: @location ref);
+
+overrides(
+  int id: @callable ref,
+  int base_id: @callable ref);
+
+explicitly_implements(
+  int id: @member ref,
+  int interface_id: @interface_or_ref ref);
+
+local_functions(
+    unique int id: @local_function,
+    string name: string ref,
+    int return_type: @type ref,
+    int unbound_id: @local_function ref);
+
+local_function_stmts(
+    unique int fn: @local_function_stmt ref,
+    int stmt: @local_function ref);
+
+/** VARIABLES **/
+
+@variable = @local_scope_variable | @field;
+
+@local_scope_variable = @local_variable | @parameter;
+
+fields(
+  unique int id: @field,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @field ref);
+
+case @field.kind of
+  1 = @addressable_field
+| 2 = @constant
+  ;
+
+field_location(
+  int id: @field ref,
+  int loc: @location ref);
+
+localvars(
+  unique int id: @local_variable,
+  int kind: int ref,
+  string name: string ref,
+  int implicitly_typed: int ref /* 0 = no, 1 = yes */,
+  int type_id: @type_or_ref ref,
+  int parent_id: @local_var_decl_expr ref);
+
+case @local_variable.kind of
+  1 = @addressable_local_variable
+| 2 = @local_constant
+| 3 = @local_variable_ref
+  ;
+
+localvar_location(
+  unique int id: @local_variable ref,
+  int loc: @location ref);
+
+@parameterizable = @callable | @delegate_type | @indexer | @function_pointer_type;
+
+#keyset[name, parent_id]
+#keyset[index, parent_id]
+params(
+  unique int id: @parameter,
+  string name: string ref,
+  int type_id: @type_or_ref ref,
+  int index: int ref,
+  int mode: int ref, /* value = 0, ref = 1, out = 2, params/array = 3, this = 4, in = 5, ref readonly = 6 */
+  int parent_id: @parameterizable ref,
+  int unbound_id: @parameter ref);
+
+param_location(
+  int id: @parameter ref,
+  int loc: @location ref);
+
+@has_scoped_annotation = @local_scope_variable
+
+scoped_annotation(
+  int id: @has_scoped_annotation ref,
+  int kind: int ref // scoped ref = 1, scoped value = 2
+  );
+
+/** STATEMENTS **/
+
+@exprorstmt_parent = @control_flow_element | @top_level_exprorstmt_parent;
+
+statements(
+  unique int id: @stmt,
+  int kind: int ref);
+
+#keyset[index, parent]
+stmt_parent(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_stmt_parent = @callable;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+stmt_parent_top_level(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @top_level_stmt_parent ref);
+
+case @stmt.kind of
+   1 = @block_stmt
+|  2 = @expr_stmt
+|  3 = @if_stmt
+|  4 = @switch_stmt
+|  5 = @while_stmt
+|  6 = @do_stmt
+|  7 = @for_stmt
+|  8 = @foreach_stmt
+|  9 = @break_stmt
+| 10 = @continue_stmt
+| 11 = @goto_stmt
+| 12 = @goto_case_stmt
+| 13 = @goto_default_stmt
+| 14 = @throw_stmt
+| 15 = @return_stmt
+| 16 = @yield_stmt
+| 17 = @try_stmt
+| 18 = @checked_stmt
+| 19 = @unchecked_stmt
+| 20 = @lock_stmt
+| 21 = @using_block_stmt
+| 22 = @var_decl_stmt
+| 23 = @const_decl_stmt
+| 24 = @empty_stmt
+| 25 = @unsafe_stmt
+| 26 = @fixed_stmt
+| 27 = @label_stmt
+| 28 = @catch
+| 29 = @case_stmt
+| 30 = @local_function_stmt
+| 31 = @using_decl_stmt
+  ;
+
+@using_stmt = @using_block_stmt | @using_decl_stmt;
+
+@labeled_stmt = @label_stmt | @case;
+
+@decl_stmt = @var_decl_stmt | @const_decl_stmt | @using_decl_stmt;
+
+@cond_stmt = @if_stmt | @switch_stmt;
+
+@loop_stmt = @while_stmt | @do_stmt | @for_stmt | @foreach_stmt;
+
+@jump_stmt = @break_stmt | @goto_any_stmt | @continue_stmt | @throw_stmt | @return_stmt
+           | @yield_stmt;
+
+@goto_any_stmt = @goto_default_stmt | @goto_case_stmt | @goto_stmt;
+
+
+stmt_location(
+  unique int id: @stmt ref,
+  int loc: @location ref);
+
+catch_type(
+  unique int catch_id: @catch ref,
+  int type_id: @type_or_ref ref,
+  int kind: int ref /* explicit = 1, implicit = 2 */);
+
+foreach_stmt_info(
+  unique int id: @foreach_stmt ref,
+  int kind: int ref /* non-async = 1, async = 2 */);
+
+@foreach_symbol =  @method | @property | @type_or_ref;
+
+#keyset[id, kind]
+foreach_stmt_desugar(
+  int id: @foreach_stmt ref,
+  int symbol: @foreach_symbol ref,
+  int kind: int ref /* GetEnumeratorMethod = 1, CurrentProperty = 2, MoveNextMethod = 3, DisposeMethod = 4, ElementType = 5 */);
+
+/** EXPRESSIONS **/
+
+expressions(
+  unique int id: @expr,
+  int kind: int ref,
+  int type_id: @type_or_ref ref);
+
+#keyset[index, parent]
+expr_parent(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_expr_parent = @attribute | @field | @property | @indexer | @parameter | @directive_if | @directive_elif;
+
+@top_level_exprorstmt_parent = @top_level_expr_parent | @top_level_stmt_parent;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+expr_parent_top_level(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @top_level_exprorstmt_parent ref);
+
+case @expr.kind of
+/* literal */
+   1 = @bool_literal_expr
+|  2 = @char_literal_expr
+|  3 = @decimal_literal_expr
+|  4 = @int_literal_expr
+|  5 = @long_literal_expr
+|  6 = @uint_literal_expr
+|  7 = @ulong_literal_expr
+|  8 = @float_literal_expr
+|  9 = @double_literal_expr
+| 10 = @utf16_string_literal_expr
+| 11 = @null_literal_expr
+/* primary & unary */
+| 12 = @this_access_expr
+| 13 = @base_access_expr
+| 14 = @local_variable_access_expr
+| 15 = @parameter_access_expr
+| 16 = @field_access_expr
+| 17 = @property_access_expr
+| 18 = @method_access_expr
+| 19 = @event_access_expr
+| 20 = @indexer_access_expr
+| 21 = @array_access_expr
+| 22 = @type_access_expr
+| 23 = @typeof_expr
+| 24 = @method_invocation_expr
+| 25 = @delegate_invocation_expr
+| 26 = @operator_invocation_expr
+| 27 = @cast_expr
+| 28 = @object_creation_expr
+| 29 = @explicit_delegate_creation_expr
+| 30 = @implicit_delegate_creation_expr
+| 31 = @array_creation_expr
+| 32 = @default_expr
+| 33 = @plus_expr
+| 34 = @minus_expr
+| 35 = @bit_not_expr
+| 36 = @log_not_expr
+| 37 = @post_incr_expr
+| 38 = @post_decr_expr
+| 39 = @pre_incr_expr
+| 40 = @pre_decr_expr
+/* multiplicative */
+| 41 = @mul_expr
+| 42 = @div_expr
+| 43 = @rem_expr
+/* additive */
+| 44 = @add_expr
+| 45 = @sub_expr
+/* shift */
+| 46 = @lshift_expr
+| 47 = @rshift_expr
+/* relational */
+| 48 = @lt_expr
+| 49 = @gt_expr
+| 50 = @le_expr
+| 51 = @ge_expr
+/* equality */
+| 52 = @eq_expr
+| 53 = @ne_expr
+/* logical */
+| 54 = @bit_and_expr
+| 55 = @bit_xor_expr
+| 56 = @bit_or_expr
+| 57 = @log_and_expr
+| 58 = @log_or_expr
+/* type testing */
+| 59 = @is_expr
+| 60 = @as_expr
+/* null coalescing */
+| 61 = @null_coalescing_expr
+/* conditional */
+| 62 = @conditional_expr
+/* assignment */
+| 63 = @simple_assign_expr
+| 64 = @assign_add_expr
+| 65 = @assign_sub_expr
+| 66 = @assign_mul_expr
+| 67 = @assign_div_expr
+| 68 = @assign_rem_expr
+| 69 = @assign_and_expr
+| 70 = @assign_xor_expr
+| 71 = @assign_or_expr
+| 72 = @assign_lshift_expr
+| 73 = @assign_rshift_expr
+/* more */
+| 74 = @object_init_expr
+| 75 = @collection_init_expr
+| 76 = @array_init_expr
+| 77 = @checked_expr
+| 78 = @unchecked_expr
+| 79 = @constructor_init_expr
+| 80 = @add_event_expr
+| 81 = @remove_event_expr
+| 82 = @par_expr
+| 83 = @local_var_decl_expr
+| 84 = @lambda_expr
+| 85 = @anonymous_method_expr
+| 86 = @namespace_expr
+/* dynamic */
+| 92 = @dynamic_element_access_expr
+| 93 = @dynamic_member_access_expr
+/* unsafe */
+| 100 = @pointer_indirection_expr
+| 101 = @address_of_expr
+| 102 = @sizeof_expr
+/* async */
+| 103 = @await_expr
+/* C# 6.0 */
+| 104 = @nameof_expr
+| 105 = @interpolated_string_expr
+| 106 = @unknown_expr
+/* C# 7.0 */
+| 107 = @throw_expr
+| 108 = @tuple_expr
+| 109 = @local_function_invocation_expr
+| 110 = @ref_expr
+| 111 = @discard_expr
+/* C# 8.0 */
+| 112 = @range_expr
+| 113 = @index_expr
+| 114 = @switch_expr
+| 115 = @recursive_pattern_expr
+| 116 = @property_pattern_expr
+| 117 = @positional_pattern_expr
+| 118 = @switch_case_expr
+| 119 = @assign_coalesce_expr
+| 120 = @suppress_nullable_warning_expr
+| 121 = @namespace_access_expr
+/* C# 9.0 */
+| 122 = @lt_pattern_expr
+| 123 = @gt_pattern_expr
+| 124 = @le_pattern_expr
+| 125 = @ge_pattern_expr
+| 126 = @not_pattern_expr
+| 127 = @and_pattern_expr
+| 128 = @or_pattern_expr
+| 129 = @function_pointer_invocation_expr
+| 130 = @with_expr
+/* C# 11.0 */
+| 131 = @list_pattern_expr
+| 132 = @slice_pattern_expr
+| 133 = @urshift_expr
+| 134 = @assign_urshift_expr
+| 135 = @utf8_string_literal_expr
+/* C# 12.0 */
+| 136 = @collection_expr
+| 137 = @spread_element_expr
+| 138 = @interpolated_string_insert_expr
+/* Preprocessor */
+| 999 = @define_symbol_expr
+;
+
+@switch = @switch_stmt | @switch_expr;
+@case = @case_stmt | @switch_case_expr;
+@pattern_match = @case | @is_expr;
+@unary_pattern_expr = @not_pattern_expr;
+@relational_pattern_expr = @gt_pattern_expr | @lt_pattern_expr | @ge_pattern_expr | @le_pattern_expr;
+@binary_pattern_expr = @and_pattern_expr | @or_pattern_expr;
+
+@integer_literal_expr = @int_literal_expr | @long_literal_expr | @uint_literal_expr | @ulong_literal_expr;
+@real_literal_expr = @float_literal_expr | @double_literal_expr | @decimal_literal_expr;
+@string_literal_expr = @utf16_string_literal_expr | @utf8_string_literal_expr;
+@literal_expr = @bool_literal_expr | @char_literal_expr | @integer_literal_expr | @real_literal_expr
+              | @string_literal_expr | @null_literal_expr;
+
+@assign_expr = @simple_assign_expr | @assign_op_expr | @local_var_decl_expr;
+@assign_op_expr =  @assign_arith_expr | @assign_bitwise_expr | @assign_event_expr | @assign_coalesce_expr;
+@assign_event_expr = @add_event_expr | @remove_event_expr;
+
+@assign_arith_expr = @assign_add_expr | @assign_sub_expr | @assign_mul_expr | @assign_div_expr
+                   | @assign_rem_expr
+@assign_bitwise_expr = @assign_and_expr | @assign_or_expr | @assign_xor_expr
+                   | @assign_lshift_expr | @assign_rshift_expr | @assign_urshift_expr;
+
+@member_access_expr = @field_access_expr | @property_access_expr | @indexer_access_expr | @event_access_expr
+                    | @method_access_expr | @type_access_expr | @dynamic_member_access_expr;
+@access_expr = @member_access_expr | @this_access_expr | @base_access_expr | @assignable_access_expr | @namespace_access_expr;
+@element_access_expr = @indexer_access_expr | @array_access_expr | @dynamic_element_access_expr;
+
+@local_variable_access = @local_variable_access_expr | @local_var_decl_expr;
+@local_scope_variable_access_expr = @parameter_access_expr | @local_variable_access;
+@variable_access_expr = @local_scope_variable_access_expr | @field_access_expr;
+
+@assignable_access_expr = @variable_access_expr | @property_access_expr | @element_access_expr
+                        | @event_access_expr | @dynamic_member_access_expr;
+
+@objectorcollection_init_expr = @object_init_expr | @collection_init_expr;
+
+@delegate_creation_expr = @explicit_delegate_creation_expr | @implicit_delegate_creation_expr;
+
+@bin_arith_op_expr = @mul_expr | @div_expr | @rem_expr | @add_expr | @sub_expr;
+@incr_op_expr =  @pre_incr_expr | @post_incr_expr;
+@decr_op_expr =  @pre_decr_expr | @post_decr_expr;
+@mut_op_expr = @incr_op_expr | @decr_op_expr;
+@un_arith_op_expr = @plus_expr | @minus_expr | @mut_op_expr;
+@arith_op_expr = @bin_arith_op_expr | @un_arith_op_expr;
+
+@ternary_log_op_expr = @conditional_expr;
+@bin_log_op_expr = @log_and_expr | @log_or_expr | @null_coalescing_expr;
+@un_log_op_expr = @log_not_expr;
+@log_expr = @un_log_op_expr | @bin_log_op_expr | @ternary_log_op_expr;
+
+@bin_bit_op_expr =  @bit_and_expr | @bit_or_expr | @bit_xor_expr | @lshift_expr
+                 | @rshift_expr | @urshift_expr;
+@un_bit_op_expr = @bit_not_expr;
+@bit_expr = @un_bit_op_expr | @bin_bit_op_expr;
+
+@equality_op_expr =  @eq_expr | @ne_expr;
+@rel_op_expr = @gt_expr | @lt_expr| @ge_expr | @le_expr;
+@comp_expr = @equality_op_expr | @rel_op_expr;
+
+@op_expr = @assign_expr | @un_op | @bin_op | @ternary_op;
+
+@ternary_op = @ternary_log_op_expr;
+@bin_op = @bin_arith_op_expr | @bin_log_op_expr | @bin_bit_op_expr | @comp_expr;
+@un_op = @un_arith_op_expr | @un_log_op_expr | @un_bit_op_expr | @sizeof_expr
+       | @pointer_indirection_expr | @address_of_expr;
+
+@anonymous_function_expr = @lambda_expr | @anonymous_method_expr;
+
+@call = @method_invocation_expr | @constructor_init_expr | @operator_invocation_expr
+      | @delegate_invocation_expr | @object_creation_expr | @call_access_expr
+      | @local_function_invocation_expr | @function_pointer_invocation_expr;
+
+@call_access_expr = @property_access_expr | @event_access_expr | @indexer_access_expr;
+
+@late_bindable_expr = @dynamic_element_access_expr | @dynamic_member_access_expr
+                    | @object_creation_expr | @method_invocation_expr | @operator_invocation_expr;
+
+@throw_element = @throw_expr | @throw_stmt;
+
+@implicitly_typeable_object_creation_expr = @object_creation_expr | @explicit_delegate_creation_expr;
+
+implicitly_typed_array_creation(
+  unique int id: @array_creation_expr ref);
+
+explicitly_sized_array_creation(
+  unique int id: @array_creation_expr ref);
+
+stackalloc_array_creation(
+  unique int id: @array_creation_expr ref);
+
+implicitly_typed_object_creation(
+  unique int id: @implicitly_typeable_object_creation_expr ref);
+
+mutator_invocation_mode(
+  unique int id: @operator_invocation_expr ref,
+  int mode: int ref /* prefix = 1, postfix = 2*/);
+
+expr_value(
+  unique int id: @expr ref,
+  string value: string ref);
+
+expr_call(
+  unique int caller_id: @expr ref,
+  int target_id: @callable ref);
+
+expr_access(
+  unique int accesser_id: @access_expr ref,
+  int target_id: @accessible ref);
+
+@accessible = @method | @assignable | @local_function | @namespace;
+
+expr_location(
+  unique int id: @expr ref,
+  int loc: @location ref);
+
+dynamic_member_name(
+  unique int id: @late_bindable_expr ref,
+  string name: string ref);
+
+@qualifiable_expr = @member_access_expr
+                  | @method_invocation_expr
+                  | @element_access_expr;
+
+conditional_access(
+  unique int id: @qualifiable_expr ref);
+
+expr_argument(
+  unique int id: @expr ref,
+  int mode: int ref);
+  /* mode is the same as params: value = 0, ref = 1, out = 2 */
+
+expr_argument_name(
+  unique int id: @expr ref,
+  string name: string ref);
+
+lambda_expr_return_type(
+  unique int id: @lambda_expr ref,
+  int type_id: @type_or_ref ref);
+
+/* Compiler generated */
+
+compiler_generated(unique int id: @element ref);
+
+/** CONTROL/DATA FLOW **/
+
+@control_flow_element = @stmt | @expr;
+
+/* XML Files */
+
+xmlEncoding  (
+  unique int id: @file ref,
+  string encoding: string ref);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+/* Comments */
+
+commentline(
+  unique int id: @commentline,
+  int kind: int ref,
+  string text: string ref,
+  string rawtext: string ref);
+
+case @commentline.kind of
+  0 = @singlelinecomment
+| 1 = @xmldoccomment
+| 2 = @multilinecomment;
+
+commentline_location(
+  unique int id: @commentline ref,
+  int loc: @location ref);
+
+commentblock(
+  unique int id : @commentblock);
+
+commentblock_location(
+  unique int id: @commentblock ref,
+  int loc: @location ref);
+
+commentblock_binding(
+  int id: @commentblock ref,
+  int entity: @element ref,
+  int bindtype: int ref);    /* 0: Parent, 1: Best, 2: Before, 3: After */
+
+commentblock_child(
+  int id: @commentblock ref,
+  int commentline: @commentline ref,
+  int index: int ref);
+
+/* ASP.NET */
+
+case @asp_element.kind of
+  0=@asp_close_tag
+| 1=@asp_code
+| 2=@asp_comment
+| 3=@asp_data_binding
+| 4=@asp_directive
+| 5=@asp_open_tag
+| 6=@asp_quoted_string
+| 7=@asp_text
+| 8=@asp_xml_directive;
+
+@asp_attribute = @asp_code | @asp_data_binding | @asp_quoted_string;
+
+asp_elements(
+  unique int id: @asp_element,
+  int kind: int ref,
+  int loc: @location ref);
+
+asp_comment_server(unique int comment: @asp_comment ref);
+asp_code_inline(unique int code: @asp_code ref);
+asp_directive_attribute(
+  int directive: @asp_directive ref,
+  int index: int ref,
+  string name: string ref,
+  int value: @asp_quoted_string ref);
+asp_directive_name(
+  unique int directive: @asp_directive ref,
+  string name: string ref);
+asp_element_body(
+  unique int element: @asp_element ref,
+  string body: string ref);
+asp_tag_attribute(
+  int tag: @asp_open_tag ref,
+  int index: int ref,
+  string name: string ref,
+  int attribute: @asp_attribute ref);
+asp_tag_name(
+  unique int tag: @asp_open_tag ref,
+  string name: string ref);
+asp_tag_isempty(int tag: @asp_open_tag ref);
diff --git a/csharp/ql/lib/upgrades/66044cfa5bbf2ecfabd06ead25e91db2bdd79764/upgrade.properties b/csharp/ql/lib/upgrades/66044cfa5bbf2ecfabd06ead25e91db2bdd79764/upgrade.properties
new file mode 100644
index 00000000000..52b67d65af7
--- /dev/null
+++ b/csharp/ql/lib/upgrades/66044cfa5bbf2ecfabd06ead25e91db2bdd79764/upgrade.properties
@@ -0,0 +1,2 @@
+description: Add databaseMetadata and overlayChangedFiles relations
+compatibility: full
diff --git a/csharp/ql/src/API Abuse/ClassDoesNotImplementEquals.ql b/csharp/ql/src/API Abuse/ClassDoesNotImplementEquals.ql
index 0539cd27a66..dc6ce132c9a 100644
--- a/csharp/ql/src/API Abuse/ClassDoesNotImplementEquals.ql	
+++ b/csharp/ql/src/API Abuse/ClassDoesNotImplementEquals.ql	
@@ -7,8 +7,9 @@
  * @problem.severity error
  * @precision medium
  * @id cs/class-missing-equals
- * @tags reliability
- *       maintainability
+ * @tags quality
+ *       reliability
+ *       correctness
  */
 
 import csharp
diff --git a/csharp/ql/src/API Abuse/DisposeNotCalledOnException.ql b/csharp/ql/src/API Abuse/DisposeNotCalledOnException.ql
index 3349ee93251..989d2ecd499 100644
--- a/csharp/ql/src/API Abuse/DisposeNotCalledOnException.ql	
+++ b/csharp/ql/src/API Abuse/DisposeNotCalledOnException.ql	
@@ -7,8 +7,10 @@
  * @problem.severity warning
  * @precision medium
  * @id cs/dispose-not-called-on-throw
- * @tags efficiency
- *       maintainability
+ * @tags quality
+ *       reliability
+ *       error-handling
+ *       performance
  *       external/cwe/cwe-404
  *       external/cwe/cwe-459
  *       external/cwe/cwe-460
diff --git a/csharp/ql/src/API Abuse/InconsistentEqualsGetHashCode.ql b/csharp/ql/src/API Abuse/InconsistentEqualsGetHashCode.ql
index 569716b3bc0..6ad43aad3a1 100644
--- a/csharp/ql/src/API Abuse/InconsistentEqualsGetHashCode.ql	
+++ b/csharp/ql/src/API Abuse/InconsistentEqualsGetHashCode.ql	
@@ -6,8 +6,9 @@
  * @problem.severity warning
  * @precision medium
  * @id cs/inconsistent-equals-and-gethashcode
- * @tags reliability
- *       maintainability
+ * @tags quality
+ *       reliability
+ *       correctness
  *       external/cwe/cwe-581
  */
 
diff --git a/csharp/ql/src/API Abuse/IncorrectCompareToSignature.ql b/csharp/ql/src/API Abuse/IncorrectCompareToSignature.ql
index 6f6c17566bf..63d947e02c7 100644
--- a/csharp/ql/src/API Abuse/IncorrectCompareToSignature.ql	
+++ b/csharp/ql/src/API Abuse/IncorrectCompareToSignature.ql	
@@ -5,8 +5,9 @@
  * @problem.severity warning
  * @precision medium
  * @id cs/wrong-compareto-signature
- * @tags reliability
- *       maintainability
+ * @tags quality
+ *       reliability
+ *       correctness
  */
 
 import csharp
diff --git a/csharp/ql/src/API Abuse/IncorrectEqualsSignature.ql b/csharp/ql/src/API Abuse/IncorrectEqualsSignature.ql
index 7103cae4906..5367b0ac604 100644
--- a/csharp/ql/src/API Abuse/IncorrectEqualsSignature.ql	
+++ b/csharp/ql/src/API Abuse/IncorrectEqualsSignature.ql	
@@ -5,8 +5,9 @@
  * @problem.severity warning
  * @precision medium
  * @id cs/wrong-equals-signature
- * @tags reliability
- *       maintainability
+ * @tags quality
+ *       reliability
+ *       correctness
  */
 
 import csharp
diff --git a/csharp/ql/src/API Abuse/NonOverridingMethod.ql b/csharp/ql/src/API Abuse/NonOverridingMethod.ql
index 598ce670d9f..bff2c17b306 100644
--- a/csharp/ql/src/API Abuse/NonOverridingMethod.ql	
+++ b/csharp/ql/src/API Abuse/NonOverridingMethod.ql	
@@ -5,9 +5,10 @@
  * @problem.severity recommendation
  * @precision medium
  * @id cs/nonoverriding-method
- * @tags reliability
+ * @tags quality
+ *       reliability
+ *       correctness
  *       readability
- *       naming
  */
 
 import csharp
diff --git a/csharp/ql/src/ASP/SplitControlStructure.ql b/csharp/ql/src/ASP/SplitControlStructure.ql
index de7d44ccc1e..701433c0560 100644
--- a/csharp/ql/src/ASP/SplitControlStructure.ql
+++ b/csharp/ql/src/ASP/SplitControlStructure.ql
@@ -5,8 +5,9 @@
  * @problem.severity recommendation
  * @precision medium
  * @id cs/asp/split-control-structure
- * @tags maintainability
- *       frameworks/asp.net
+ * @tags quality
+ *       maintainability
+ *       readability
  */
 
 import semmle.code.asp.AspNet
diff --git a/csharp/ql/src/Bad Practices/Comments/CommentedOutCode.ql b/csharp/ql/src/Bad Practices/Comments/CommentedOutCode.ql
index c079cc16a2a..9da9e789e0c 100644
--- a/csharp/ql/src/Bad Practices/Comments/CommentedOutCode.ql	
+++ b/csharp/ql/src/Bad Practices/Comments/CommentedOutCode.ql	
@@ -5,9 +5,9 @@
  * @problem.severity recommendation
  * @precision medium
  * @id cs/commented-out-code
- * @tags maintainability
- *       statistical
- *       non-attributable
+ * @tags quality
+ *       maintainability
+ *       readability
  */
 
 import csharp
diff --git a/csharp/ql/src/Bad Practices/Comments/TodoComments.ql b/csharp/ql/src/Bad Practices/Comments/TodoComments.ql
index 751c064bccf..50104f55eb7 100644
--- a/csharp/ql/src/Bad Practices/Comments/TodoComments.ql	
+++ b/csharp/ql/src/Bad Practices/Comments/TodoComments.ql	
@@ -6,7 +6,8 @@
  * @problem.severity recommendation
  * @precision medium
  * @id cs/todo-comment
- * @tags maintainability
+ * @tags quality
+ *       maintainability
  *       external/cwe/cwe-546
  */
 
diff --git a/csharp/ql/src/Bad Practices/Control-Flow/ConstantCondition.ql b/csharp/ql/src/Bad Practices/Control-Flow/ConstantCondition.ql
index 5ec702f77e0..386b238e049 100644
--- a/csharp/ql/src/Bad Practices/Control-Flow/ConstantCondition.ql	
+++ b/csharp/ql/src/Bad Practices/Control-Flow/ConstantCondition.ql	
@@ -16,16 +16,94 @@
 import csharp
 import semmle.code.csharp.commons.Assertions
 import semmle.code.csharp.commons.Constants
+import semmle.code.csharp.controlflow.BasicBlocks
+import semmle.code.csharp.controlflow.Guards as Guards
+import codeql.controlflow.queries.ConstantCondition as ConstCond
+
+module ConstCondInput implements ConstCond::InputSig<ControlFlow::BasicBlock> {
+  class SsaDefinition = Ssa::Definition;
+
+  class GuardValue = Guards::GuardValue;
+
+  class Guard = Guards::Guards::Guard;
+
+  predicate ssaControlsBranchEdge(SsaDefinition def, BasicBlock bb1, BasicBlock bb2, GuardValue v) {
+    Guards::Guards::ssaControlsBranchEdge(def, bb1, bb2, v)
+  }
+
+  predicate ssaControls(SsaDefinition def, BasicBlock bb, GuardValue v) {
+    Guards::Guards::ssaControls(def, bb, v)
+  }
+
+  import Guards::Guards::InternalUtil
+}
+
+module ConstCondImpl = ConstCond::Make<Location, Cfg, ConstCondInput>;
+
+predicate nullCheck(Expr e, boolean direct) {
+  exists(QualifiableExpr qe | qe.isConditional() and qe.getQualifier() = e and direct = true)
+  or
+  exists(NullCoalescingExpr nce | nce.getLeftOperand() = e and direct = true)
+  or
+  exists(ConditionalExpr ce | ce.getThen() = e or ce.getElse() = e |
+    nullCheck(ce, _) and direct = false
+  )
+}
+
+predicate constantGuard(
+  Guards::Guards::Guard g, string msg, Guards::Guards::Guard reason, string reasonMsg
+) {
+  ConstCondImpl::problems(g, msg, reason, reasonMsg) and
+  // conditional qualified expressions sit at an akward place in the CFG, which
+  // leads to FPs
+  not g.(QualifiableExpr).getQualifier() = reason and
+  // and if they're extension method calls, the syntactic qualifier is actually argument 0
+  not g.(ExtensionMethodCall).getArgument(0) = reason and
+  // if a logical connective is constant, one of its operands is constant, so
+  // we report that instead
+  not g instanceof LogicalNotExpr and
+  not g instanceof LogicalAndExpr and
+  not g instanceof LogicalOrExpr and
+  // if a logical connective is a reason for another condition to be constant,
+  // then one of its operands is a more precise reason
+  not reason instanceof LogicalNotExpr and
+  not reason instanceof LogicalAndExpr and
+  not reason instanceof LogicalOrExpr and
+  // don't report double-checked locking
+  not exists(LockStmt ls, BasicBlock bb |
+    bb = ls.getBasicBlock() and
+    reason.getBasicBlock().strictlyDominates(bb) and
+    bb.dominates(g.getBasicBlock())
+  ) and
+  // exclude indirect null checks like `x` in `(b ? x : null)?.Foo()`
+  not nullCheck(g, false)
+}
 
 /** A constant condition. */
-abstract class ConstantCondition extends Expr {
+abstract class ConstantCondition extends Guards::Guards::Guard {
   /** Gets the alert message for this constant condition. */
   abstract string getMessage();
 
+  predicate hasReason(Guards::Guards::Guard reason, string reasonMsg) {
+    // dummy value, overridden when message has a placeholder
+    reason = this and reasonMsg = "dummy"
+  }
+
   /** Holds if this constant condition is white-listed. */
   predicate isWhiteListed() { none() }
 }
 
+/** A constant guard. */
+class ConstantGuard extends ConstantCondition {
+  ConstantGuard() { constantGuard(this, _, _, _) }
+
+  override string getMessage() { constantGuard(this, result, _, _) }
+
+  override predicate hasReason(Guards::Guards::Guard reason, string reasonMsg) {
+    constantGuard(this, _, reason, reasonMsg)
+  }
+}
+
 /** A constant Boolean condition. */
 class ConstantBooleanCondition extends ConstantCondition {
   boolean b;
@@ -89,7 +167,7 @@ class ConstantNullnessCondition extends ConstantCondition {
 
   ConstantNullnessCondition() {
     forex(ControlFlow::Node cfn | cfn = this.getAControlFlowNode() |
-      exists(ControlFlow::SuccessorTypes::NullnessSuccessor t, ControlFlow::Node s |
+      exists(ControlFlow::NullnessSuccessor t, ControlFlow::Node s |
         s = cfn.getASuccessorByType(t)
       |
         b = t.getValue() and
@@ -111,8 +189,9 @@ class ConstantMatchingCondition extends ConstantCondition {
   boolean b;
 
   ConstantMatchingCondition() {
+    this instanceof Expr and
     forex(ControlFlow::Node cfn | cfn = this.getAControlFlowNode() |
-      exists(ControlFlow::SuccessorTypes::MatchingSuccessor t | exists(cfn.getASuccessorByType(t)) |
+      exists(ControlFlow::MatchingSuccessor t | exists(cfn.getASuccessorByType(t)) |
         b = t.getValue()
       ) and
       strictcount(ControlFlow::SuccessorType t | exists(cfn.getASuccessorByType(t))) = 1
@@ -138,9 +217,10 @@ class ConstantMatchingCondition extends ConstantCondition {
   }
 }
 
-from ConstantCondition c, string msg
+from ConstantCondition c, string msg, Guards::Guards::Guard reason, string reasonMsg
 where
   msg = c.getMessage() and
+  c.hasReason(reason, reasonMsg) and
   not c.isWhiteListed() and
   not isExprInAssertion(c)
-select c, msg
+select c, msg, reason, reasonMsg
diff --git a/csharp/ql/src/Bad Practices/Declarations/NoConstantsOnly.ql b/csharp/ql/src/Bad Practices/Declarations/NoConstantsOnly.ql
index 896b7804662..8ae848feaeb 100644
--- a/csharp/ql/src/Bad Practices/Declarations/NoConstantsOnly.ql	
+++ b/csharp/ql/src/Bad Practices/Declarations/NoConstantsOnly.ql	
@@ -6,8 +6,9 @@
  * @problem.severity recommendation
  * @precision medium
  * @id cs/constants-only-interface
- * @tags maintainability
- *       modularity
+ * @tags quality
+ *       maintainability
+ *       readability
  */
 
 import csharp
diff --git a/csharp/ql/src/Bad Practices/ErroneousClassCompare.ql b/csharp/ql/src/Bad Practices/ErroneousClassCompare.ql
index 134d612979b..658484c2ba7 100644
--- a/csharp/ql/src/Bad Practices/ErroneousClassCompare.ql	
+++ b/csharp/ql/src/Bad Practices/ErroneousClassCompare.ql	
@@ -5,7 +5,8 @@
  * @problem.severity warning
  * @precision medium
  * @id cs/class-name-comparison
- * @tags reliability
+ * @tags quality
+ *       reliability
  *       correctness
  *       external/cwe/cwe-486
  */
diff --git a/csharp/ql/src/Bad Practices/Implementation Hiding/AbstractToConcreteCollection.ql b/csharp/ql/src/Bad Practices/Implementation Hiding/AbstractToConcreteCollection.ql
index 4becd8b58c3..80b108d2736 100644
--- a/csharp/ql/src/Bad Practices/Implementation Hiding/AbstractToConcreteCollection.ql	
+++ b/csharp/ql/src/Bad Practices/Implementation Hiding/AbstractToConcreteCollection.ql	
@@ -7,9 +7,9 @@
  * @problem.severity warning
  * @precision medium
  * @id cs/cast-from-abstract-to-concrete-collection
- * @tags reliability
- *       maintainability
- *       modularity
+ * @tags quality
+ *       reliability
+ *       correctness
  *       external/cwe/cwe-485
  */
 
diff --git a/csharp/ql/src/Bad Practices/Implementation Hiding/StaticArray.ql b/csharp/ql/src/Bad Practices/Implementation Hiding/StaticArray.ql
index 0d00adb5051..086182b697c 100644
--- a/csharp/ql/src/Bad Practices/Implementation Hiding/StaticArray.ql	
+++ b/csharp/ql/src/Bad Practices/Implementation Hiding/StaticArray.ql	
@@ -5,9 +5,9 @@
  * @problem.severity recommendation
  * @precision medium
  * @id cs/static-array
- * @tags reliability
- *       maintainability
- *       modularity
+ * @tags quality
+ *       reliability
+ *       correctness
  *       external/cwe/cwe-582
  */
 
diff --git a/csharp/ql/src/Bad Practices/Magic Constants/MagicConstants.qll b/csharp/ql/src/Bad Practices/Magic Constants/MagicConstants.qll
index 73b82c14700..8c3e0562d39 100644
--- a/csharp/ql/src/Bad Practices/Magic Constants/MagicConstants.qll	
+++ b/csharp/ql/src/Bad Practices/Magic Constants/MagicConstants.qll	
@@ -113,7 +113,7 @@ private predicate valueOccurrenceCount(string value, int n) {
   n > 20
 }
 
-private predicate occurenceCount(Literal lit, string value, int n) {
+private predicate occurrenceCount(Literal lit, string value, int n) {
   valueOccurrenceCount(value, n) and
   value = lit.getValue() and
   relevantLiteral(lit, value)
@@ -127,7 +127,7 @@ private predicate check(Literal lit, string value, int n, File f) {
   // Check that the literal is nontrivial
   not trivial(lit) and
   // Check that it is repeated a number of times
-  occurenceCount(lit, value, n) and
+  occurrenceCount(lit, value, n) and
   n > 20 and
   f = lit.getFile()
 }
diff --git a/csharp/ql/src/Bad Practices/Naming Conventions/ConfusingMethodNames.ql b/csharp/ql/src/Bad Practices/Naming Conventions/ConfusingMethodNames.ql
index 5e3f39d7a87..199647b5f1f 100644
--- a/csharp/ql/src/Bad Practices/Naming Conventions/ConfusingMethodNames.ql	
+++ b/csharp/ql/src/Bad Practices/Naming Conventions/ConfusingMethodNames.ql	
@@ -5,9 +5,9 @@
  * @problem.severity recommendation
  * @precision medium
  * @id cs/confusing-method-name
- * @tags maintainability
+ * @tags quality
+ *       maintainability
  *       readability
- *       naming
  */
 
 import csharp
diff --git a/csharp/ql/src/Bad Practices/Naming Conventions/ConfusingOverridesNames.ql b/csharp/ql/src/Bad Practices/Naming Conventions/ConfusingOverridesNames.ql
index ae085389729..1ef0ccad22a 100644
--- a/csharp/ql/src/Bad Practices/Naming Conventions/ConfusingOverridesNames.ql	
+++ b/csharp/ql/src/Bad Practices/Naming Conventions/ConfusingOverridesNames.ql	
@@ -6,9 +6,10 @@
  * @problem.severity recommendation
  * @precision medium
  * @id cs/confusing-override-name
- * @tags reliability
+ * @tags quality
+ *       maintainability
  *       readability
- *       naming
+ *       correctness
  */
 
 import csharp
diff --git a/csharp/ql/src/Bad Practices/Naming Conventions/ControlNamePrefixes.ql b/csharp/ql/src/Bad Practices/Naming Conventions/ControlNamePrefixes.ql
index 550385d6828..7e80d4334bd 100644
--- a/csharp/ql/src/Bad Practices/Naming Conventions/ControlNamePrefixes.ql	
+++ b/csharp/ql/src/Bad Practices/Naming Conventions/ControlNamePrefixes.ql	
@@ -6,7 +6,9 @@
  * @problem.severity recommendation
  * @precision medium
  * @id cs/web/unprefixed-control-name
- * @tags maintainability
+ * @tags quality
+ *       maintainability
+ *       readability
  */
 
 import csharp
diff --git a/csharp/ql/src/Bad Practices/Naming Conventions/DefaultControlNames.ql b/csharp/ql/src/Bad Practices/Naming Conventions/DefaultControlNames.ql
index 92aa5e9e0c2..e12bd2e6af3 100644
--- a/csharp/ql/src/Bad Practices/Naming Conventions/DefaultControlNames.ql	
+++ b/csharp/ql/src/Bad Practices/Naming Conventions/DefaultControlNames.ql	
@@ -6,8 +6,9 @@
  * @problem.severity recommendation
  * @precision medium
  * @id cs/forms/default-control-name
- * @tags readability
- *       naming
+ * @tags quality
+ *       maintainability
+ *       readability
  */
 
 import csharp
diff --git a/csharp/ql/src/Bad Practices/UseOfSystemOutputStream.ql b/csharp/ql/src/Bad Practices/UseOfSystemOutputStream.ql
index a5a9418bb15..b9a45126d3c 100644
--- a/csharp/ql/src/Bad Practices/UseOfSystemOutputStream.ql	
+++ b/csharp/ql/src/Bad Practices/UseOfSystemOutputStream.ql	
@@ -5,7 +5,9 @@
  * @problem.severity recommendation
  * @precision medium
  * @id cs/console-output
- * @tags maintainability
+ * @tags quality
+ *       reliability
+ *       error-handling
  */
 
 import csharp
diff --git a/csharp/ql/src/Bad Practices/VirtualCallInConstructorOrDestructor.ql b/csharp/ql/src/Bad Practices/VirtualCallInConstructorOrDestructor.ql
index d754f1a03c5..a29b39d33a1 100644
--- a/csharp/ql/src/Bad Practices/VirtualCallInConstructorOrDestructor.ql	
+++ b/csharp/ql/src/Bad Practices/VirtualCallInConstructorOrDestructor.ql	
@@ -6,9 +6,9 @@
  * @precision medium
  * @id cs/virtual-call-in-constructor
  * @alternate-ids cs/virtual-call-in-constructor-or-destructor
- * @tags reliability
- *       maintainability
- *       modularity
+ * @tags quality
+ *       reliability
+ *       correctness
  */
 
 import csharp
diff --git a/csharp/ql/src/CHANGELOG.md b/csharp/ql/src/CHANGELOG.md
index 7209d4cfb81..8993b453543 100644
--- a/csharp/ql/src/CHANGELOG.md
+++ b/csharp/ql/src/CHANGELOG.md
@@ -1,3 +1,42 @@
+## 1.4.3
+
+### Minor Analysis Improvements
+
+* The `cs/web/missing-x-frame-options` query now correctly handles configuration nested in root `<location>` elements.
+
+## 1.4.2
+
+No user-facing changes.
+
+## 1.4.1
+
+### Minor Analysis Improvements
+
+* The modeling of null guards based on complex pattern expressions has been improved, which in turn improves the query `cs/dereferenced-value-may-be-null` by removing false positives.
+* The query `cs/xmldoc/missing-summary` has been removed from the `code-quality` suite, to align with other languages.
+
+## 1.4.0
+
+### Deprecated Queries
+
+* The query `cs/captured-foreach-variable` has been deprecated as the semantics of capturing a 'foreach' variable and using it outside the loop has been stable since C# version 5.
+
+### Minor Analysis Improvements
+
+* The query `cs/call-to-object-tostring` has been improved to remove false positives for enum types.
+
+### Bug Fixes
+
+* The message for `csharp/diagnostic/database-quality` has been updated to include detailed database health metrics. Additionally, the threshold for reporting database health issues has been lowered from 95% to 85% (if any metric falls below this percentage). These changes are visible on the tool status page.
+
+## 1.3.4
+
+No user-facing changes.
+
+## 1.3.3
+
+No user-facing changes.
+
 ## 1.3.2
 
 No user-facing changes.
@@ -131,7 +170,7 @@ No user-facing changes.
 
 ### Minor Analysis Improvements
 
-* C#: The method `string.ReplaceLineEndings(string)` is now considered a sanitizer for the `cs/log-forging` query. 
+* C#: The method `string.ReplaceLineEndings(string)` is now considered a sanitizer for the `cs/log-forging` query.
 
 ## 1.0.10
 
@@ -245,7 +284,7 @@ No user-facing changes.
 
 ### Minor Analysis Improvements
 
-* Fixed a Log forging false positive when using `String.Replace` to sanitize the input.    
+* Fixed a Log forging false positive when using `String.Replace` to sanitize the input.
 * Fixed a URL redirection from remote source false positive when guarding a redirect with `HttpRequestBase.IsUrlLocalToHost()`
 
 ## 0.8.5
diff --git a/csharp/ql/src/CSI/NullMaybe.ql b/csharp/ql/src/CSI/NullMaybe.ql
index 67873ebb291..f78a8d89bcf 100644
--- a/csharp/ql/src/CSI/NullMaybe.ql
+++ b/csharp/ql/src/CSI/NullMaybe.ql
@@ -2,7 +2,7 @@
  * @name Dereferenced variable may be null
  * @description Dereferencing a variable whose value may be 'null' may cause a
  *              'NullReferenceException'.
- * @kind path-problem
+ * @kind problem
  * @problem.severity warning
  * @precision high
  * @id cs/dereferenced-value-may-be-null
@@ -15,10 +15,7 @@
 
 import csharp
 import semmle.code.csharp.dataflow.Nullness
-import PathGraph
 
-from
-  Dereference d, PathNode source, PathNode sink, Ssa::SourceVariable v, string msg, Element reason
-where d.isFirstMaybeNull(v.getAnSsaDefinition(), source, sink, msg, reason)
-select d, source, sink, "Variable $@ may be null at this access " + msg + ".", v, v.toString(),
-  reason, "this"
+from Dereference d, Ssa::SourceVariable v, string msg, Element reason
+where maybeNullDeref(d, v, msg, reason)
+select d, "Variable $@ may be null at this access " + msg + ".", v, v.toString(), reason, "this"
diff --git a/csharp/ql/src/Concurrency/SynchSetUnsynchGet.ql b/csharp/ql/src/Concurrency/SynchSetUnsynchGet.ql
index 9c8bb72708c..569aa1e5366 100644
--- a/csharp/ql/src/Concurrency/SynchSetUnsynchGet.ql
+++ b/csharp/ql/src/Concurrency/SynchSetUnsynchGet.ql
@@ -6,8 +6,10 @@
  * @problem.severity error
  * @precision medium
  * @id cs/unsynchronized-getter
- * @tags correctness
+ * @tags quality
+ *       reliability
  *       concurrency
+ *       correctness
  *       external/cwe/cwe-662
  */
 
diff --git a/csharp/ql/src/Concurrency/UnsafeLazyInitialization.ql b/csharp/ql/src/Concurrency/UnsafeLazyInitialization.ql
index 97b4fbdba8e..db674d9c5c3 100644
--- a/csharp/ql/src/Concurrency/UnsafeLazyInitialization.ql
+++ b/csharp/ql/src/Concurrency/UnsafeLazyInitialization.ql
@@ -6,7 +6,8 @@
  * @problem.severity error
  * @precision medium
  * @id cs/unsafe-double-checked-lock
- * @tags correctness
+ * @tags quality
+ *       reliability
  *       concurrency
  *       external/cwe/cwe-609
  */
diff --git a/csharp/ql/src/Concurrency/UnsynchronizedStaticAccess.ql b/csharp/ql/src/Concurrency/UnsynchronizedStaticAccess.ql
index 1ce94edee3d..150ae78ae09 100644
--- a/csharp/ql/src/Concurrency/UnsynchronizedStaticAccess.ql
+++ b/csharp/ql/src/Concurrency/UnsynchronizedStaticAccess.ql
@@ -6,7 +6,9 @@
  * @problem.severity error
  * @precision medium
  * @id cs/unsynchronized-static-access
- * @tags concurrency
+ * @tags quality
+ *       reliability
+ *       concurrency
  *       external/cwe/cwe-362
  *       external/cwe/cwe-567
  */
diff --git a/csharp/ql/src/Documentation/XmldocExtraParam.ql b/csharp/ql/src/Documentation/XmldocExtraParam.ql
index a745edfb6d8..a7ff7eaec70 100644
--- a/csharp/ql/src/Documentation/XmldocExtraParam.ql
+++ b/csharp/ql/src/Documentation/XmldocExtraParam.ql
@@ -7,6 +7,7 @@
  * @precision medium
  * @id cs/xmldoc/unknown-parameter
  * @tags maintainability
+ *       readability
  */
 
 import Documentation
diff --git a/csharp/ql/src/Documentation/XmldocExtraTypeParam.ql b/csharp/ql/src/Documentation/XmldocExtraTypeParam.ql
index 76c2039920d..60ea1dd5a96 100644
--- a/csharp/ql/src/Documentation/XmldocExtraTypeParam.ql
+++ b/csharp/ql/src/Documentation/XmldocExtraTypeParam.ql
@@ -7,6 +7,7 @@
  * @precision medium
  * @id cs/xmldoc/unknown-type-parameter
  * @tags maintainability
+ *       readability
  */
 
 import Documentation
diff --git a/csharp/ql/src/Documentation/XmldocMissing.ql b/csharp/ql/src/Documentation/XmldocMissing.ql
index e0e05c4893b..237e5224120 100644
--- a/csharp/ql/src/Documentation/XmldocMissing.ql
+++ b/csharp/ql/src/Documentation/XmldocMissing.ql
@@ -7,6 +7,7 @@
  * @precision medium
  * @id cs/xmldoc/missing-xmldoc
  * @tags maintainability
+ *       readability
  */
 
 import Documentation
diff --git a/csharp/ql/src/Documentation/XmldocMissingSummary.ql b/csharp/ql/src/Documentation/XmldocMissingSummary.ql
index 43b76d38017..5d7d9c931ad 100644
--- a/csharp/ql/src/Documentation/XmldocMissingSummary.ql
+++ b/csharp/ql/src/Documentation/XmldocMissingSummary.ql
@@ -5,8 +5,7 @@
  * @problem.severity recommendation
  * @precision high
  * @id cs/xmldoc/missing-summary
- * @tags quality
- *       maintainability
+ * @tags maintainability
  *       readability
  */
 
diff --git a/csharp/ql/src/Language Abuse/ForeachCapture.ql b/csharp/ql/src/Language Abuse/ForeachCapture.ql
index 0148796a2e7..03f1f99a044 100644
--- a/csharp/ql/src/Language Abuse/ForeachCapture.ql	
+++ b/csharp/ql/src/Language Abuse/ForeachCapture.ql	
@@ -1,13 +1,14 @@
 /**
+ * @deprecated This query is no longer relevant as the semantics of capturing a 'foreach' variable
+ *             and using it outside the loop has been stable since C# version 5.
  * @name Capturing a foreach variable
  * @description Code that captures a 'foreach' variable and uses it outside the loop behaves differently in C# version 4 and C# version 5
  * @kind problem
  * @problem.severity recommendation
  * @precision medium
  * @id cs/captured-foreach-variable
- * @tags portability
- *       maintainability
- *       language-features
+ * @tags reliability
+ *       correctness
  *       external/cwe/cwe-758
  */
 
diff --git a/csharp/ql/src/Language Abuse/UselessCastToSelf.ql b/csharp/ql/src/Language Abuse/UselessCastToSelf.ql
index a182009dfc2..d1a08e1db1c 100644
--- a/csharp/ql/src/Language Abuse/UselessCastToSelf.ql	
+++ b/csharp/ql/src/Language Abuse/UselessCastToSelf.ql	
@@ -5,8 +5,9 @@
  * @problem.severity warning
  * @precision medium
  * @id cs/useless-cast-to-self
- * @tags maintainability
- *       language-features
+ * @tags quality
+ *       maintainability
+ *       useless-code
  *       external/cwe/cwe-561
  */
 
diff --git a/csharp/ql/src/Language Abuse/UselessIsBeforeAs.ql b/csharp/ql/src/Language Abuse/UselessIsBeforeAs.ql
index 6a82c40d840..6b6d710bdf0 100644
--- a/csharp/ql/src/Language Abuse/UselessIsBeforeAs.ql	
+++ b/csharp/ql/src/Language Abuse/UselessIsBeforeAs.ql	
@@ -5,8 +5,9 @@
  * @problem.severity recommendation
  * @precision medium
  * @id cs/useless-is-before-as
- * @tags maintainability
- *       language-features
+ * @tags quality
+ *       maintainability
+ *       useless-code
  *       external/cwe/cwe-561
  */
 
diff --git a/csharp/ql/src/Language Abuse/UselessNullCoalescingExpression.ql b/csharp/ql/src/Language Abuse/UselessNullCoalescingExpression.ql
index ec73df23741..7790fc5ba4a 100644
--- a/csharp/ql/src/Language Abuse/UselessNullCoalescingExpression.ql	
+++ b/csharp/ql/src/Language Abuse/UselessNullCoalescingExpression.ql	
@@ -6,8 +6,9 @@
  * @problem.severity error
  * @precision medium
  * @id cs/coalesce-of-identical-expressions
- * @tags maintainability
- *       language-features
+ * @tags quality
+ *       maintainability
+ *       useless-code
  *       external/cwe/cwe-561
  */
 
diff --git a/csharp/ql/src/Language Abuse/UselessTypeTest.ql b/csharp/ql/src/Language Abuse/UselessTypeTest.ql
index 11e7df05047..f89ffbdd637 100644
--- a/csharp/ql/src/Language Abuse/UselessTypeTest.ql	
+++ b/csharp/ql/src/Language Abuse/UselessTypeTest.ql	
@@ -5,8 +5,9 @@
  * @problem.severity warning
  * @precision medium
  * @id cs/useless-type-test
- * @tags maintainability
- *       language-features
+ * @tags quality
+ *       maintainability
+ *       useless-code
  *       external/cwe/cwe-561
  */
 
diff --git a/csharp/ql/src/Language Abuse/UselessUpcast.ql b/csharp/ql/src/Language Abuse/UselessUpcast.ql
index 827d16038b2..81ff2cfe253 100644
--- a/csharp/ql/src/Language Abuse/UselessUpcast.ql	
+++ b/csharp/ql/src/Language Abuse/UselessUpcast.ql	
@@ -5,8 +5,9 @@
  * @problem.severity warning
  * @precision medium
  * @id cs/useless-upcast
- * @tags maintainability
- *       language-features
+ * @tags quality
+ *       maintainability
+ *       useless-code
  *       external/cwe/cwe-561
  */
 
@@ -75,15 +76,16 @@ private class ConstructorCall extends Call {
 
 /** An explicit upcast. */
 class ExplicitUpcast extends ExplicitCast {
-  ValueOrRefType src;
   ValueOrRefType dest;
 
   ExplicitUpcast() {
-    src = this.getSourceType() and
-    dest = this.getTargetType() and
-    (src instanceof RefType or src instanceof Struct) and
-    src.isImplicitlyConvertibleTo(dest) and
-    src != dest // Handled by `cs/useless-cast-to-self`
+    exists(ValueOrRefType src |
+      src = this.getSourceType() and
+      dest = this.getTargetType() and
+      (src instanceof RefType or src instanceof Struct) and
+      src.isImplicitlyConvertibleTo(dest) and
+      src != dest // Handled by `cs/useless-cast-to-self`
+    )
   }
 
   pragma[nomagic]
diff --git a/csharp/ql/src/Likely Bugs/Dynamic/BadDynamicCall.ql b/csharp/ql/src/Likely Bugs/Dynamic/BadDynamicCall.ql
index 2efac6773f7..75f152b38de 100644
--- a/csharp/ql/src/Likely Bugs/Dynamic/BadDynamicCall.ql	
+++ b/csharp/ql/src/Likely Bugs/Dynamic/BadDynamicCall.ql	
@@ -5,9 +5,9 @@
  * @problem.severity error
  * @precision medium
  * @id cs/invalid-dynamic-call
- * @tags reliability
+ * @tags quality
+ *       reliability
  *       correctness
- *       logic
  *       external/cwe/cwe-628
  */
 
diff --git a/csharp/ql/src/Likely Bugs/EqualsUsesAs.ql b/csharp/ql/src/Likely Bugs/EqualsUsesAs.ql
index 5c11e10c36b..12a0802aa9f 100644
--- a/csharp/ql/src/Likely Bugs/EqualsUsesAs.ql	
+++ b/csharp/ql/src/Likely Bugs/EqualsUsesAs.ql	
@@ -5,8 +5,9 @@
  * @problem.severity warning
  * @precision medium
  * @id cs/equals-uses-as
- * @tags reliability
- *       maintainability
+ * @tags quality
+ *       reliability
+ *       correctness
  */
 
 import csharp
diff --git a/csharp/ql/src/Likely Bugs/EqualsUsesIs.ql b/csharp/ql/src/Likely Bugs/EqualsUsesIs.ql
index 775a295a6cb..1c209af4dfb 100644
--- a/csharp/ql/src/Likely Bugs/EqualsUsesIs.ql	
+++ b/csharp/ql/src/Likely Bugs/EqualsUsesIs.ql	
@@ -5,8 +5,9 @@
  * @problem.severity warning
  * @precision medium
  * @id cs/equals-uses-is
- * @tags reliability
- *       maintainability
+ * @tags quality
+ *       reliability
+ *       correctness
  */
 
 import csharp
diff --git a/csharp/ql/src/Likely Bugs/InconsistentCompareTo.ql b/csharp/ql/src/Likely Bugs/InconsistentCompareTo.ql
index 2c4e69cb206..5209cf6438b 100644
--- a/csharp/ql/src/Likely Bugs/InconsistentCompareTo.ql	
+++ b/csharp/ql/src/Likely Bugs/InconsistentCompareTo.ql	
@@ -5,8 +5,9 @@
  * @problem.severity warning
  * @precision medium
  * @id cs/inconsistent-compareto-and-equals
- * @tags reliability
- *       maintainability
+ * @tags quality
+ *       reliability
+ *       correctness
  */
 
 import semmle.code.csharp.frameworks.System
diff --git a/csharp/ql/src/Likely Bugs/LeapYear/UnsafeYearConstruction.qhelp b/csharp/ql/src/Likely Bugs/LeapYear/UnsafeYearConstruction.qhelp
index 7483af84a1f..ae50a05b18a 100644
--- a/csharp/ql/src/Likely Bugs/LeapYear/UnsafeYearConstruction.qhelp	
+++ b/csharp/ql/src/Likely Bugs/LeapYear/UnsafeYearConstruction.qhelp	
@@ -12,7 +12,7 @@
 <example>
   <p>In this example, we are incrementing/decrementing the current date by one year when creating a new <code>System.DateTime</code> object. This may work most of the time, but on any given February 29th, the resulting value will be invalid.</p>
   <sample src="UnsafeYearConstructionBad.cs" />
-  <p>To fix this bug, we add/substract years to the current date by calling <code>AddYears</code> method on it.</p>
+  <p>To fix this bug, we add/subtract years to the current date by calling <code>AddYears</code> method on it.</p>
   <sample src="UnsafeYearConstructionGood.cs" />
 </example>
 <references>
diff --git a/csharp/ql/src/Likely Bugs/LeapYear/UnsafeYearConstruction.ql b/csharp/ql/src/Likely Bugs/LeapYear/UnsafeYearConstruction.ql
index 8da3a910b0d..72cc9b1908a 100644
--- a/csharp/ql/src/Likely Bugs/LeapYear/UnsafeYearConstruction.ql	
+++ b/csharp/ql/src/Likely Bugs/LeapYear/UnsafeYearConstruction.ql	
@@ -5,8 +5,9 @@
  * @problem.severity warning
  * @precision medium
  * @id cs/unsafe-year-construction
- * @tags date-time
+ * @tags quality
  *       reliability
+ *       correctness
  */
 
 import csharp
diff --git a/csharp/ql/src/Likely Bugs/MishandlingJapaneseEra.ql b/csharp/ql/src/Likely Bugs/MishandlingJapaneseEra.ql
index a188fbe1b8e..c8df36bf7bf 100644
--- a/csharp/ql/src/Likely Bugs/MishandlingJapaneseEra.ql	
+++ b/csharp/ql/src/Likely Bugs/MishandlingJapaneseEra.ql	
@@ -5,8 +5,9 @@
  * @kind problem
  * @problem.severity warning
  * @precision medium
- * @tags reliability
- *       date-time
+ * @tags quality
+ *       reliability
+ *       correctness
  */
 
 import csharp
diff --git a/csharp/ql/src/Likely Bugs/ObjectComparison.ql b/csharp/ql/src/Likely Bugs/ObjectComparison.ql
index eec1961fbf5..5479ff69b34 100644
--- a/csharp/ql/src/Likely Bugs/ObjectComparison.ql	
+++ b/csharp/ql/src/Likely Bugs/ObjectComparison.ql	
@@ -6,7 +6,8 @@
  * @problem.severity warning
  * @precision medium
  * @id cs/reference-equality-with-object
- * @tags reliability
+ * @tags quality
+ *       reliability
  *       correctness
  *       external/cwe/cwe-595
  */
diff --git a/csharp/ql/src/Likely Bugs/RecursiveOperatorEquals.ql b/csharp/ql/src/Likely Bugs/RecursiveOperatorEquals.ql
index fe01683578f..2e4764965c9 100644
--- a/csharp/ql/src/Likely Bugs/RecursiveOperatorEquals.ql	
+++ b/csharp/ql/src/Likely Bugs/RecursiveOperatorEquals.ql	
@@ -5,8 +5,9 @@
  * @problem.severity error
  * @precision medium
  * @id cs/recursive-operator-equals-call
- * @tags reliability
- *       maintainability
+ * @tags quality
+ *       reliability
+ *       correctness
  */
 
 import csharp
diff --git a/csharp/ql/src/Likely Bugs/Statements/UseBraces.ql b/csharp/ql/src/Likely Bugs/Statements/UseBraces.ql
index ba64dc1bf94..f639b060ac1 100644
--- a/csharp/ql/src/Likely Bugs/Statements/UseBraces.ql	
+++ b/csharp/ql/src/Likely Bugs/Statements/UseBraces.ql	
@@ -6,9 +6,10 @@
  * @problem.severity warning
  * @precision medium
  * @id cs/misleading-indentation
- * @tags changeability
+ * @tags quality
+ *       maintainability
+ *       readability
  *       correctness
- *       logic
  */
 
 import csharp
diff --git a/csharp/ql/src/Likely Bugs/ThreadUnsafeICryptoTransformLambda.ql b/csharp/ql/src/Likely Bugs/ThreadUnsafeICryptoTransformLambda.ql
index 9f70760ba60..8fcef4d4744 100644
--- a/csharp/ql/src/Likely Bugs/ThreadUnsafeICryptoTransformLambda.ql	
+++ b/csharp/ql/src/Likely Bugs/ThreadUnsafeICryptoTransformLambda.ql	
@@ -24,6 +24,8 @@ module NotThreadSafeCryptoUsageIntoParallelInvokeConfig implements DataFlow::Con
   }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof ParallelSink }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
 }
 
 module NotThreadSafeCryptoUsageIntoParallelInvoke =
diff --git a/csharp/ql/src/Linq/BadMultipleIteration.ql b/csharp/ql/src/Linq/BadMultipleIteration.ql
index e07de273e63..8146bbf167d 100644
--- a/csharp/ql/src/Linq/BadMultipleIteration.ql
+++ b/csharp/ql/src/Linq/BadMultipleIteration.ql
@@ -5,9 +5,9 @@
  * @problem.severity warning
  * @precision medium
  * @id cs/linq/inconsistent-enumeration
- * @tags reliability
- *       maintainability
- *       language-features
+ * @tags quality
+ *       reliability
+ *       correctness
  *       external/cwe/cwe-834
  */
 
diff --git a/csharp/ql/src/Security Features/CWE-090/LDAPInjection.qhelp b/csharp/ql/src/Security Features/CWE-090/LDAPInjection.qhelp
index 04f01720ce6..4af37eadfd7 100644
--- a/csharp/ql/src/Security Features/CWE-090/LDAPInjection.qhelp	
+++ b/csharp/ql/src/Security Features/CWE-090/LDAPInjection.qhelp	
@@ -12,7 +12,7 @@ is likely to be able to run malicious LDAP queries.</p>
 <p>If user input must be included in an LDAP query, it should be escaped to
 avoid a malicious user providing special characters that change the meaning
 of the query. If possible, use an existing library, such as the AntiXSS
-library.</p>
+library. One may also make their own encoder filter <code>`LdapEncode`</code> following RFC 4515 standards.</p>
 </recommendation>
 
 <example>
@@ -35,7 +35,6 @@ the query cannot be changed by a malicious user.</p>
 <references>
 <li>OWASP: <a href="https://cheatsheetseries.owasp.org/cheatsheets/LDAP_Injection_Prevention_Cheat_Sheet.html">LDAP Injection Prevention Cheat Sheet</a>.</li>
 <li>OWASP: <a href="https://www.owasp.org/index.php/Preventing_LDAP_Injection_in_Java">Preventing LDAP Injection in Java</a>.</li>
-<li>AntiXSS doc: <a href="http://www.nudoq.org/#!/Packages/AntiXSS/AntiXssLibrary/Encoder/M/LdapFilterEncode">LdapFilterEncode</a>.</li>
-<li>AntiXSS doc: <a href="http://www.nudoq.org/#!/Packages/AntiXSS/AntiXssLibrary/Encoder/M/LdapDistinguishedNameEncode">LdapDistinguishedNameEncode</a>.</li>
+<li>RFC 4515: <a href="https://datatracker.ietf.org/doc/html/rfc4515#section-3">String Search Filter Definition</a>.</li>
 </references>
 </qhelp>
diff --git a/csharp/ql/src/Security Features/CWE-1004/CookieWithoutHttpOnly.qhelp b/csharp/ql/src/Security Features/CWE-1004/CookieWithoutHttpOnly.qhelp
new file mode 100644
index 00000000000..01bcc8c81da
--- /dev/null
+++ b/csharp/ql/src/Security Features/CWE-1004/CookieWithoutHttpOnly.qhelp	
@@ -0,0 +1,60 @@
+<!DOCTYPE qhelp PUBLIC
+  "-//Semmle//qhelp//EN"
+  "qhelp.dtd">
+<qhelp>
+
+<overview>
+<p>Cookies without the <code>HttpOnly</code> flag set are accessible to client-side scripts such as JavaScript running in the same origin. 
+In case of a Cross-Site Scripting (XSS) vulnerability, the cookie can be stolen by a malicious script.
+If a sensitive cookie does not need to be accessed directly by client-side JS, the <code>HttpOnly</code> flag should be set.</p>
+</overview>
+
+<recommendation>
+<p>
+Set the <code>HttpOnly</code> flag to <code>true</code> for authentication cookies to ensure they are not accessible to client-side scripts.
+</p> 
+<p>
+When using ASP.NET Core, <code>CookiePolicyOptions</code> can be used to set a default policy for cookies.
+
+When using ASP.NET Web Forms, a default may also be configured in the <code>Web.config</code> file, using the <code>httpOnlyCookies</code> attribute of the 
+the <code>&lt;httpCookies&gt;</code> element.
+</p>
+</recommendation>
+
+<example>
+
+<p>
+In the example below, <code>Microsoft.AspNetCore.Http.CookieOptions.HttpOnly</code> is set to <code>true</code>.
+</p>
+
+<sample src="httponlyflagcore.cs" />
+
+<p>
+In the following example, <code>CookiePolicyOptions</code> are set programmatically to configure defaults.
+</p>
+
+<sample src="cookiepolicyoptions.cs" />
+
+<p>
+In the example below, <code>System.Web.HttpCookie.HttpOnly</code> is set to <code>true</code>.
+</p>
+
+<sample src="httponlyflag.cs" />
+
+<p>
+In the example below, the <code>httpOnlyCookies</code> attribute is set to <code>true</code> in the <code>Web.config</code> file.
+</p>
+<sample src="Web.config"/>
+
+</example>
+
+<references>
+
+<li>ASP.Net Core docs: <a href="https://docs.microsoft.com/en-us/dotnet/api/microsoft.aspnetcore.http.cookieoptions.httponly">CookieOptions.HttpOnly Property</a>.</li>
+<li>MDN: <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie">Set-Cookie</a> Header.</li>
+<li>Web Forms docs: <a href="https://msdn.microsoft.com/en-us/library/system.web.httpcookie.httponly(v=vs.110).aspx">HttpCookie.HttpOnly Property</a>.</li>
+<li>Web Forms docs: <a href="https://msdn.microsoft.com/library/ms228262%28v=vs.100%29.aspx">httpCookies Element</a>.</li>
+<li>PortSwigger: <a href="https://portswigger.net/kb/issues/00500600_cookie-without-httponly-flag-set">Cookie without HttpOnly flag set</a></li>
+
+</references>
+</qhelp>
diff --git a/csharp/ql/src/Security Features/CWE-1004/CookieWithoutHttpOnly.ql b/csharp/ql/src/Security Features/CWE-1004/CookieWithoutHttpOnly.ql
new file mode 100644
index 00000000000..dcc520540bb
--- /dev/null
+++ b/csharp/ql/src/Security Features/CWE-1004/CookieWithoutHttpOnly.ql	
@@ -0,0 +1,118 @@
+/**
+ * @name Cookie 'HttpOnly' attribute is not set to true
+ * @description Sensitive cookies without the `HttpOnly` property set are accessible by client-side scripts such as JavaScript.
+ *              This makes them more vulnerable to being stolen by an XSS attack.
+ * @kind problem
+ * @problem.severity warning
+ * @security-severity 5.0
+ * @precision high
+ * @id cs/web/cookie-httponly-not-set
+ * @tags security
+ *       external/cwe/cwe-1004
+ */
+
+import csharp
+import semmle.code.asp.WebConfig
+import semmle.code.csharp.frameworks.system.Web
+import semmle.code.csharp.frameworks.microsoft.AspNetCore
+import semmle.code.csharp.security.auth.SecureCookies
+
+predicate cookieAppendHttpOnlyByDefault() {
+  // default is set to `Always`
+  getAValueForCookiePolicyProp("HttpOnly").getValue() = "1"
+  or
+  // there is an `OnAppendCookie` callback that sets `HttpOnly` to true
+  OnAppendCookieHttpOnlyTracking::flowTo(_)
+}
+
+predicate httpOnlyFalse(ObjectCreation oc) {
+  exists(Assignment a |
+    getAValueForProp(oc, a, "HttpOnly") = a.getRValue() and
+    a.getRValue().getValue() = "false"
+  )
+}
+
+predicate httpOnlyFalseOrNotSet(ObjectCreation oc) {
+  httpOnlyFalse(oc)
+  or
+  not isPropertySet(oc, "HttpOnly")
+}
+
+predicate nonHttpOnlyCookieOptionsCreation(ObjectCreation oc, MethodCall append) {
+  // `HttpOnly` property in `CookieOptions` passed to IResponseCookies.Append(...) wasn't set
+  oc.getType() instanceof MicrosoftAspNetCoreHttpCookieOptions and
+  httpOnlyFalseOrNotSet(oc) and
+  exists(DataFlow::Node creation, DataFlow::Node sink |
+    CookieOptionsTracking::flow(creation, sink) and
+    creation.asExpr() = oc and
+    sink.asExpr() = append.getArgument(2)
+  )
+}
+
+predicate nonHttpOnlySystemWebSensitiveCookieCreation(ObjectCreation oc) {
+  oc.getType() instanceof SystemWebHttpCookie and
+  isCookieWithSensitiveName(oc.getArgument(0)) and
+  (
+    httpOnlyFalse(oc)
+    or
+    // the property wasn't explicitly set, so a default value from config is used
+    not isPropertySet(oc, "HttpOnly") and
+    // the default in config is not set to `true`
+    not exists(XmlElement element |
+      element instanceof HttpCookiesElement and
+      element.(HttpCookiesElement).isHttpOnlyCookies()
+    )
+  )
+}
+
+predicate sensitiveCookieAppend(MethodCall mc) {
+  exists(MicrosoftAspNetCoreHttpResponseCookies iResponse |
+    iResponse.getAppendMethod() = mc.getTarget() and
+    isCookieWithSensitiveName(mc.getArgument(0))
+  )
+}
+
+predicate nonHttpOnlyCookieCall(Call c) {
+  (
+    not cookieAppendHttpOnlyByDefault() and
+    exists(MethodCall mc |
+      sensitiveCookieAppend(mc) and
+      (
+        nonHttpOnlyCookieOptionsCreation(c, mc)
+        or
+        // IResponseCookies.Append(String, String) was called, `HttpOnly` is set to `false` by default
+        mc = c and
+        mc.getNumberOfArguments() < 3 and
+        mc.getTarget().getParameter(0).getType() instanceof StringType
+      )
+    )
+    or
+    nonHttpOnlySystemWebSensitiveCookieCreation(c)
+  )
+}
+
+predicate nonHttpOnlyCookieBuilderAssignment(Assignment a, Expr val) {
+  val.getValue() = "false" and
+  exists(PropertyWrite pw |
+    (
+      pw.getProperty().getDeclaringType() instanceof MicrosoftAspNetCoreHttpCookieBuilder or
+      pw.getProperty().getDeclaringType() instanceof
+        MicrosoftAspNetCoreAuthenticationCookiesCookieAuthenticationOptions
+    ) and
+    pw.getProperty().getName() = "HttpOnly" and
+    a.getLValue() = pw and
+    DataFlow::localExprFlow(val, a.getRValue())
+  )
+}
+
+from Expr httpOnlySink
+where
+  (
+    nonHttpOnlyCookieCall(httpOnlySink)
+    or
+    exists(Assignment a |
+      httpOnlySink = a.getRValue() and
+      nonHttpOnlyCookieBuilderAssignment(a, _)
+    )
+  )
+select httpOnlySink, "Cookie attribute 'HttpOnly' is not set to true."
diff --git a/csharp/ql/src/Security Features/CWE-1004/Web.config b/csharp/ql/src/Security Features/CWE-1004/Web.config
new file mode 100644
index 00000000000..8f4cf5ba777
--- /dev/null
+++ b/csharp/ql/src/Security Features/CWE-1004/Web.config	
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <system.web>
+    <httpCookies httpOnlyCookies="true"/>
+  </system.web>
+</configuration>
\ No newline at end of file
diff --git a/csharp/ql/src/experimental/Security Features/CWE-1004/cookiepolicyoptions.cs b/csharp/ql/src/Security Features/CWE-1004/cookiepolicyoptions.cs
similarity index 100%
rename from csharp/ql/src/experimental/Security Features/CWE-1004/cookiepolicyoptions.cs
rename to csharp/ql/src/Security Features/CWE-1004/cookiepolicyoptions.cs
diff --git a/csharp/ql/src/experimental/Security Features/CWE-1004/httponlyflag.cs b/csharp/ql/src/Security Features/CWE-1004/httponlyflag.cs
similarity index 100%
rename from csharp/ql/src/experimental/Security Features/CWE-1004/httponlyflag.cs
rename to csharp/ql/src/Security Features/CWE-1004/httponlyflag.cs
diff --git a/csharp/ql/src/experimental/Security Features/CWE-1004/httponlyflagcore.cs b/csharp/ql/src/Security Features/CWE-1004/httponlyflagcore.cs
similarity index 100%
rename from csharp/ql/src/experimental/Security Features/CWE-1004/httponlyflagcore.cs
rename to csharp/ql/src/Security Features/CWE-1004/httponlyflagcore.cs
diff --git a/csharp/ql/src/Security Features/CWE-327/DontInstallRootCert.ql b/csharp/ql/src/Security Features/CWE-327/DontInstallRootCert.ql
index d2d22671677..b48ddbf0f35 100644
--- a/csharp/ql/src/Security Features/CWE-327/DontInstallRootCert.ql	
+++ b/csharp/ql/src/Security Features/CWE-327/DontInstallRootCert.ql	
@@ -39,8 +39,6 @@ module AddCertToRootStoreConfig implements DataFlow::ConfigSig {
   }
 
   predicate observeDiffInformedIncrementalMode() { any() }
-
-  Location getASelectedSourceLocation(DataFlow::Node sink) { none() }
 }
 
 module AddCertToRootStore = DataFlow::Global<AddCertToRootStoreConfig>;
diff --git a/csharp/ql/src/Security Features/CWE-384/AbandonSession.ql b/csharp/ql/src/Security Features/CWE-384/AbandonSession.ql
index 5258d6a4cd2..c350c8f3755 100644
--- a/csharp/ql/src/Security Features/CWE-384/AbandonSession.ql	
+++ b/csharp/ql/src/Security Features/CWE-384/AbandonSession.ql	
@@ -21,10 +21,10 @@ predicate loginMethod(Method m, ControlFlow::SuccessorType flowFrom) {
     or
     m = any(SystemWebSecurityFormsAuthenticationClass c).getAuthenticateMethod()
   ) and
-  flowFrom.(ControlFlow::SuccessorTypes::BooleanSuccessor).getValue() = true
+  flowFrom.(ControlFlow::BooleanSuccessor).getValue() = true
   or
   m = any(SystemWebSecurityFormsAuthenticationClass c).getSignOutMethod() and
-  flowFrom instanceof ControlFlow::SuccessorTypes::NormalSuccessor
+  flowFrom instanceof ControlFlow::DirectSuccessor
 }
 
 /** The `System.Web.SessionState.HttpSessionState` class. */
diff --git a/csharp/ql/src/Security Features/CWE-451/MissingXFrameOptions.ql b/csharp/ql/src/Security Features/CWE-451/MissingXFrameOptions.ql
index 9e51b663038..1b647457e7c 100644
--- a/csharp/ql/src/Security Features/CWE-451/MissingXFrameOptions.ql	
+++ b/csharp/ql/src/Security Features/CWE-451/MissingXFrameOptions.ql	
@@ -16,6 +16,17 @@ import csharp
 import semmle.code.asp.WebConfig
 import semmle.code.csharp.frameworks.system.Web
 
+XmlElement getAWebConfigRoot(WebConfigXml webConfig) {
+  result = webConfig.getARootElement()
+  or
+  result = webConfig.getARootElement().getAChild("location") and
+  (
+    not result.hasAttribute("path") // equivalent to path="."
+    or
+    result.getAttributeValue("path") = ["", "."]
+  )
+}
+
 /**
  * Holds if the `Web.config` file `webConfig` adds an `X-Frame-Options` header.
  */
@@ -30,8 +41,8 @@ predicate hasWebConfigXFrameOptions(WebConfigXml webConfig) {
   //   </httpProtocol>
   // </system.webServer>
   // ```
-  webConfig
-      .getARootElement()
+  // This can also be in a `location`
+  getAWebConfigRoot(webConfig)
       .getAChild("system.webServer")
       .getAChild("httpProtocol")
       .getAChild("customHeaders")
diff --git a/csharp/ql/src/Security Features/CWE-614/CookieWithoutSecure.qhelp b/csharp/ql/src/Security Features/CWE-614/CookieWithoutSecure.qhelp
new file mode 100644
index 00000000000..f122c4d881b
--- /dev/null
+++ b/csharp/ql/src/Security Features/CWE-614/CookieWithoutSecure.qhelp	
@@ -0,0 +1,61 @@
+<!DOCTYPE qhelp PUBLIC
+  "-//Semmle//qhelp//EN"
+  "qhelp.dtd">
+<qhelp>
+
+<overview>
+<p>Cookies without the <code>Secure</code> flag set may be transmitted using HTTP instead of HTTPS.
+This leaves them vulnerable to being read by a third party attacker. If a sensitive cookie such as a session
+key is intercepted this way, it would allow the attacker to perform actions on a user's behalf.</p>
+</overview>
+
+<recommendation>
+<p>
+When using ASP.NET Core, ensure cookies have the secure flag set by setting <code>Microsoft.AspNetCore.Http.CookieOptions.Secure</code> to <code>true</code>, or 
+using <code>CookiePolicyOptions</code> to set a default security policy.
+</p>
+<p>
+When using ASP.NET Web Forms, cookies can be configured as secure by default in the <code>Web.config</code> file, setting the <code>requireSSL</code> attribute to <code>true</code> in the  <code>forms</code> or <code>httpCookies</code> element. 
+Cookies may also be set to be secure programmatically by setting the <code>System.Web.HttpCookie.Secure</code> attribute to <code>true</code>.
+</p>
+</recommendation>
+
+<example>
+
+<p>
+In the example below, <code>Microsoft.AspNetCore.Http.CookieOptions.Secure</code> is set to <code>true</code>.
+</p>
+
+<sample src="secureflagcore.cs" />
+
+<p>
+In the following example, <code>CookiePolicyOptions</code> are set programmatically to configure defaults.
+</p>
+
+<sample src="cookiepolicyoptions.cs" />
+
+<p>
+In the example below <code>System.Web.HttpCookie.Secure</code> is set to <code>true</code> programmatically.
+</p>
+
+<sample src="secureflag.cs" />
+
+<p>
+In the example below, the <code>requireSSL</code> attribute is set to <code>true</code> in the <code>forms</code> element of the <code>Web.config</code> file.
+</p>
+<sample src="Web.config" />
+
+</example>
+
+<references>
+
+<li>ASP.NET Core docs: <a href="https://docs.microsoft.com/en-us/dotnet/api/microsoft.aspnetcore.http.cookieoptions.secure">CookieOptions.Secure Property</a>.</li>
+<li>MDN: <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie">Set-Cookie</a> Header.</li>
+<li>Web Forms docs: <a href="https://msdn.microsoft.com/en-us/library/system.web.security.formsauthentication.requiressl(v=vs.110).aspx">FormsAuthentication.RequireSSL Property</a>.</li>
+<li>Web Forms docs: <a href="https://msdn.microsoft.com/en-us/library/1d3t3c61(v=vs.100).aspx">forms Element for authentication</a>.</li>
+<li>Web Forms docs: <a href="https://msdn.microsoft.com/library/ms228262%28v=vs.100%29.aspx">httpCookies Element</a>.</li>
+<li>Detectify: <a href="https://support.detectify.com/support/solutions/articles/48001048982-cookie-lack-secure-flag">Cookie lack Secure flag</a>.</li>
+<li>PortSwigger: <a href="https://portswigger.net/kb/issues/00500200_tls-cookie-without-secure-flag-set">TLS cookie without secure flag set</a>.</li>
+
+</references>
+</qhelp>
diff --git a/csharp/ql/src/Security Features/CWE-614/CookieWithoutSecure.ql b/csharp/ql/src/Security Features/CWE-614/CookieWithoutSecure.ql
new file mode 100644
index 00000000000..2a90698ed27
--- /dev/null
+++ b/csharp/ql/src/Security Features/CWE-614/CookieWithoutSecure.ql	
@@ -0,0 +1,116 @@
+/**
+ * @name Cookie 'Secure' attribute is not set to true
+ * @description Cookies without the `Secure` flag may be sent in cleartext.
+ *              This makes them vulnerable to be intercepted by an attacker.
+ * @kind problem
+ * @problem.severity error
+ * @security-severity 5.0
+ * @precision high
+ * @id cs/web/cookie-secure-not-set
+ * @tags security
+ *       external/cwe/cwe-319
+ *       external/cwe/cwe-614
+ */
+
+import csharp
+import semmle.code.asp.WebConfig
+import semmle.code.csharp.frameworks.system.Web
+import semmle.code.csharp.frameworks.microsoft.AspNetCore
+import semmle.code.csharp.security.auth.SecureCookies
+
+predicate cookieAppendSecureByDefault() {
+  // default is set to `Always` or `SameAsRequest`
+  (
+    getAValueForCookiePolicyProp("Secure").getValue() = "0" or
+    getAValueForCookiePolicyProp("Secure").getValue() = "1"
+  )
+  or
+  //callback `OnAppendCookie` that sets `Secure` to true
+  OnAppendCookieSecureTracking::flowTo(_)
+}
+
+predicate secureFalse(ObjectCreation oc) {
+  exists(Assignment a |
+    getAValueForProp(oc, a, "Secure") = a.getRValue() and
+    a.getRValue().getValue() = "false"
+  )
+}
+
+predicate secureFalseOrNotSet(ObjectCreation oc) {
+  secureFalse(oc)
+  or
+  not isPropertySet(oc, "Secure")
+}
+
+predicate insecureCookieOptionsCreation(ObjectCreation oc) {
+  // `Secure` property in `CookieOptions` passed to IResponseCookies.Append(...) wasn't set
+  oc.getType() instanceof MicrosoftAspNetCoreHttpCookieOptions and
+  secureFalseOrNotSet(oc) and
+  exists(DataFlow::Node creation |
+    CookieOptionsTracking::flow(creation, _) and
+    creation.asExpr() = oc
+  )
+}
+
+predicate insecureCookieAppend(Expr sink) {
+  // IResponseCookies.Append(String, String) was called, `Secure` is set to `false` by default
+  exists(MethodCall mc, MicrosoftAspNetCoreHttpResponseCookies iResponse |
+    mc = sink and
+    iResponse.getAppendMethod() = mc.getTarget() and
+    mc.getNumberOfArguments() < 3 and
+    mc.getTarget().getParameter(0).getType() instanceof StringType
+  )
+}
+
+predicate insecureSystemWebCookieCreation(ObjectCreation oc) {
+  oc.getType() instanceof SystemWebHttpCookie and
+  (
+    secureFalse(oc)
+    or
+    // `Secure` property in `System.Web.HttpCookie` wasn't set, so a default value from config is used
+    not isPropertySet(oc, "Secure") and
+    // the default in config is not set to `true`
+    not exists(XmlElement element |
+      element instanceof FormsElement and
+      element.(FormsElement).isRequireSsl()
+      or
+      element instanceof HttpCookiesElement and
+      element.(HttpCookiesElement).isRequireSsl()
+    )
+  )
+}
+
+predicate insecureCookieCall(Call c) {
+  not cookieAppendSecureByDefault() and
+  (
+    insecureCookieOptionsCreation(c)
+    or
+    insecureCookieAppend(c)
+  )
+  or
+  insecureSystemWebCookieCreation(c)
+}
+
+predicate insecureSecurePolicyAssignment(Assignment a, Expr val) {
+  exists(PropertyWrite pw |
+    (
+      pw.getProperty().getDeclaringType() instanceof MicrosoftAspNetCoreHttpCookieBuilder or
+      pw.getProperty().getDeclaringType() instanceof
+        MicrosoftAspNetCoreAuthenticationCookiesCookieAuthenticationOptions
+    ) and
+    pw.getProperty().getName() = "SecurePolicy" and
+    a.getLValue() = pw and
+    DataFlow::localExprFlow(val, a.getRValue()) and
+    val.getValue() = "2" // None
+  )
+}
+
+from Expr secureSink
+where
+  insecureCookieCall(secureSink)
+  or
+  exists(Assignment a |
+    secureSink = a.getRValue() and
+    insecureSecurePolicyAssignment(a, _)
+  )
+select secureSink, "Cookie attribute 'Secure' is not set to true."
diff --git a/csharp/ql/src/experimental/Security Features/CWE-614/cookiepolicyoptions.cs b/csharp/ql/src/Security Features/CWE-614/cookiepolicyoptions.cs
similarity index 100%
rename from csharp/ql/src/experimental/Security Features/CWE-614/cookiepolicyoptions.cs
rename to csharp/ql/src/Security Features/CWE-614/cookiepolicyoptions.cs
diff --git a/csharp/ql/src/experimental/Security Features/CWE-614/secureflag.cs b/csharp/ql/src/Security Features/CWE-614/secureflag.cs
similarity index 100%
rename from csharp/ql/src/experimental/Security Features/CWE-614/secureflag.cs
rename to csharp/ql/src/Security Features/CWE-614/secureflag.cs
diff --git a/csharp/ql/src/experimental/Security Features/CWE-614/secureflagcore.cs b/csharp/ql/src/Security Features/CWE-614/secureflagcore.cs
similarity index 100%
rename from csharp/ql/src/experimental/Security Features/CWE-614/secureflagcore.cs
rename to csharp/ql/src/Security Features/CWE-614/secureflagcore.cs
diff --git a/csharp/ql/src/Security Features/CWE-798/HardcodedConnectionString.ql b/csharp/ql/src/Security Features/CWE-798/HardcodedConnectionString.ql
index 32508fa9d3f..1e33ed6a1fd 100644
--- a/csharp/ql/src/Security Features/CWE-798/HardcodedConnectionString.ql	
+++ b/csharp/ql/src/Security Features/CWE-798/HardcodedConnectionString.ql	
@@ -38,6 +38,12 @@ module ConnectionStringConfig implements DataFlow::ConfigSig {
   }
 
   predicate isBarrier(DataFlow::Node node) { node instanceof StringFormatSanitizer }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
+
+  Location getASelectedSinkLocation(DataFlow::Node sink) {
+    any(Call call | call.getAnArgument() = sink.asExpr()).getLocation() = result
+  }
 }
 
 /**
diff --git a/csharp/ql/src/Telemetry/DatabaseQuality.qll b/csharp/ql/src/Telemetry/DatabaseQuality.qll
index fa6c70dbc51..ca2ab3e7e16 100644
--- a/csharp/ql/src/Telemetry/DatabaseQuality.qll
+++ b/csharp/ql/src/Telemetry/DatabaseQuality.qll
@@ -12,7 +12,7 @@ module CallTargetStats implements StatsSig {
   private predicate isNoSetterPropertyCallInConstructor(PropertyCall c) {
     exists(Property p, Constructor ctor |
       p = c.getProperty() and
-      not exists(Setter a | a = p.getAnAccessor()) and
+      not p.getAnAccessor() instanceof Setter and
       c.getEnclosingCallable() = ctor and
       (
         c.hasThisQualifier()
@@ -25,7 +25,7 @@ module CallTargetStats implements StatsSig {
   private predicate isNoSetterPropertyInitialization(PropertyCall c) {
     exists(Property p, AssignExpr assign |
       p = c.getProperty() and
-      not exists(Setter a | a = p.getAnAccessor()) and
+      not p.getAnAccessor() instanceof Setter and
       assign = c.getParent() and
       assign.getLValue() = c and
       assign.getParent() instanceof Property
diff --git a/csharp/ql/src/Telemetry/DatabaseQualityDiagnostics.ql b/csharp/ql/src/Telemetry/DatabaseQualityDiagnostics.ql
index bde07633d94..207a25081a2 100644
--- a/csharp/ql/src/Telemetry/DatabaseQualityDiagnostics.ql
+++ b/csharp/ql/src/Telemetry/DatabaseQualityDiagnostics.ql
@@ -8,26 +8,39 @@
 import csharp
 import DatabaseQuality
 
+private predicate diagnostic(string msg, float value, float threshold) {
+  CallTargetStatsReport::percentageOfOk(msg, value) and
+  threshold = 85
+  or
+  ExprTypeStatsReport::percentageOfOk(msg, value) and
+  threshold = 85
+}
+
 private newtype TDbQualityDiagnostic =
   TTheDbQualityDiagnostic() {
-    exists(float percentageGood |
-      CallTargetStatsReport::percentageOfOk(_, percentageGood)
-      or
-      ExprTypeStatsReport::percentageOfOk(_, percentageGood)
-    |
-      percentageGood < 95
+    exists(float percentageGood, float threshold |
+      diagnostic(_, percentageGood, threshold) and
+      percentageGood < threshold
     )
   }
 
+private string getDbHealth() {
+  result =
+    strictconcat(string msg, float value, float threshold |
+      diagnostic(msg, value, threshold)
+    |
+      msg + ": " + value.floor() + " % (threshold " + threshold.floor() + " %)", ". "
+    )
+}
+
 class DbQualityDiagnostic extends TDbQualityDiagnostic {
   string toString() {
     result =
       "Scanning C# code completed successfully, but the scan encountered issues. " +
-        "This may be caused by problems identifying dependencies or use of generated source code, among other reasons -- "
-        +
-        "see other CodeQL diagnostics reported on the CodeQL status page for more details of possible causes. "
-        +
-        "Addressing these warnings is advisable to avoid false-positive or missing results. If they cannot be addressed, consider scanning C# "
+        "This may be caused by problems identifying dependencies or use of generated source code. " +
+        "Some metrics of the database quality are: " + getDbHealth() + ". " +
+        "Ideally these metrics should be above their thresholds. " +
+        "Addressing these issues is advisable to avoid false-positives or missing results. If they cannot be addressed, consider scanning C# "
         +
         "using either the `autobuild` or `manual` [build modes](https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages#comparison-of-the-build-modes)."
   }
diff --git a/csharp/ql/src/Useless code/DefaultToStringQuery.qll b/csharp/ql/src/Useless code/DefaultToStringQuery.qll
index f11b5a9cd32..411ca47b5e6 100644
--- a/csharp/ql/src/Useless code/DefaultToStringQuery.qll	
+++ b/csharp/ql/src/Useless code/DefaultToStringQuery.qll	
@@ -47,6 +47,7 @@ private predicate alwaysInvokesToString(ParameterRead pr) {
  */
 predicate alwaysDefaultToString(ValueOrRefType t) {
   not t instanceof TupleType and
+  not t instanceof Enum and
   exists(ToStringMethod m | t.hasMethod(m) |
     m.getDeclaringType() instanceof SystemObjectClass or
     m.getDeclaringType() instanceof SystemValueTypeClass
diff --git a/csharp/ql/src/Useless code/PointlessForwardingMethod.ql b/csharp/ql/src/Useless code/PointlessForwardingMethod.ql
index 723c5b190a5..24a184b3274 100644
--- a/csharp/ql/src/Useless code/PointlessForwardingMethod.ql	
+++ b/csharp/ql/src/Useless code/PointlessForwardingMethod.ql	
@@ -5,7 +5,8 @@
  * @problem.severity recommendation
  * @precision medium
  * @id cs/useless-forwarding-method
- * @tags maintainability
+ * @tags quality
+ *       maintainability
  *       useless-code
  */
 
diff --git a/csharp/ql/src/change-notes/2025-10-24-insecure-cookie-query-promote.md b/csharp/ql/src/change-notes/2025-10-24-insecure-cookie-query-promote.md
new file mode 100644
index 00000000000..1a15c0494bd
--- /dev/null
+++ b/csharp/ql/src/change-notes/2025-10-24-insecure-cookie-query-promote.md
@@ -0,0 +1,4 @@
+---
+category: newQuery
+---
+The `cs/web/cookie-secure-not-set` and `cs/web/cookie-httponly-not-set` queries have been promoted from experimental to the main query pack.
\ No newline at end of file
diff --git a/csharp/ql/src/change-notes/released/1.3.3.md b/csharp/ql/src/change-notes/released/1.3.3.md
new file mode 100644
index 00000000000..27a88ea0061
--- /dev/null
+++ b/csharp/ql/src/change-notes/released/1.3.3.md
@@ -0,0 +1,3 @@
+## 1.3.3
+
+No user-facing changes.
diff --git a/csharp/ql/src/change-notes/released/1.3.4.md b/csharp/ql/src/change-notes/released/1.3.4.md
new file mode 100644
index 00000000000..5073aca7222
--- /dev/null
+++ b/csharp/ql/src/change-notes/released/1.3.4.md
@@ -0,0 +1,3 @@
+## 1.3.4
+
+No user-facing changes.
diff --git a/csharp/ql/src/change-notes/released/1.4.0.md b/csharp/ql/src/change-notes/released/1.4.0.md
new file mode 100644
index 00000000000..43d887f928a
--- /dev/null
+++ b/csharp/ql/src/change-notes/released/1.4.0.md
@@ -0,0 +1,13 @@
+## 1.4.0
+
+### Deprecated Queries
+
+* The query `cs/captured-foreach-variable` has been deprecated as the semantics of capturing a 'foreach' variable and using it outside the loop has been stable since C# version 5.
+
+### Minor Analysis Improvements
+
+* The query `cs/call-to-object-tostring` has been improved to remove false positives for enum types.
+
+### Bug Fixes
+
+* The message for `csharp/diagnostic/database-quality` has been updated to include detailed database health metrics. Additionally, the threshold for reporting database health issues has been lowered from 95% to 85% (if any metric falls below this percentage). These changes are visible on the tool status page.
diff --git a/csharp/ql/src/change-notes/released/1.4.1.md b/csharp/ql/src/change-notes/released/1.4.1.md
new file mode 100644
index 00000000000..f161787a108
--- /dev/null
+++ b/csharp/ql/src/change-notes/released/1.4.1.md
@@ -0,0 +1,6 @@
+## 1.4.1
+
+### Minor Analysis Improvements
+
+* The modeling of null guards based on complex pattern expressions has been improved, which in turn improves the query `cs/dereferenced-value-may-be-null` by removing false positives.
+* The query `cs/xmldoc/missing-summary` has been removed from the `code-quality` suite, to align with other languages.
diff --git a/csharp/ql/src/change-notes/released/1.4.2.md b/csharp/ql/src/change-notes/released/1.4.2.md
new file mode 100644
index 00000000000..37be01f40d9
--- /dev/null
+++ b/csharp/ql/src/change-notes/released/1.4.2.md
@@ -0,0 +1,3 @@
+## 1.4.2
+
+No user-facing changes.
diff --git a/csharp/ql/src/change-notes/released/1.4.3.md b/csharp/ql/src/change-notes/released/1.4.3.md
new file mode 100644
index 00000000000..1a022f2462d
--- /dev/null
+++ b/csharp/ql/src/change-notes/released/1.4.3.md
@@ -0,0 +1,5 @@
+## 1.4.3
+
+### Minor Analysis Improvements
+
+* the `cs/web/missing-x-frame-options` query now correctly handles configuration nested in root `<location>` elements.
diff --git a/csharp/ql/src/codeql-pack.release.yml b/csharp/ql/src/codeql-pack.release.yml
index 86a9cb32d86..08f88b689fb 100644
--- a/csharp/ql/src/codeql-pack.release.yml
+++ b/csharp/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.3.2
+lastReleaseVersion: 1.4.3
diff --git a/csharp/ql/src/experimental/CWE-918/RequestForgery.qll b/csharp/ql/src/experimental/CWE-918/RequestForgery.qll
index 9ab1351f414..84ea534a50f 100644
--- a/csharp/ql/src/experimental/CWE-918/RequestForgery.qll
+++ b/csharp/ql/src/experimental/CWE-918/RequestForgery.qll
@@ -133,14 +133,14 @@ module RequestForgery {
    * to be a guard for Server Side Request Forgery(SSRF) Vulnerabilities.
    * This guard considers all checks as valid.
    */
-  private predicate baseUriGuard(Guard g, Expr e, AbstractValue v) {
+  private predicate baseUriGuard(Guard g, Expr e, GuardValue v) {
     g.(MethodCall).getTarget().hasFullyQualifiedName("System", "Uri", "IsBaseOf") and
     // we consider any checks against the tainted value to sainitize the taint.
     // This implies any check such as shown below block the taint flow.
     // Uri url = new Uri("whitelist.com")
     // if (url.isBaseOf(`taint1))
     (e = g.(MethodCall).getArgument(0) or e = g.(MethodCall).getQualifier()) and
-    v.(AbstractValues::BooleanValue).getValue() = true
+    v.asBooleanValue() = true
   }
 
   private class BaseUriBarrier extends Barrier {
@@ -152,14 +152,14 @@ module RequestForgery {
    * to be a guard for Server Side Request Forgery(SSRF) Vulnerabilities.
    * This guard considers all checks as valid.
    */
-  private predicate stringStartsWithGuard(Guard g, Expr e, AbstractValue v) {
+  private predicate stringStartsWithGuard(Guard g, Expr e, GuardValue v) {
     g.(MethodCall).getTarget().hasFullyQualifiedName("System", "String", "StartsWith") and
     // Any check such as the ones shown below
     // "https://myurl.com/".startsWith(`taint`)
     // `taint`.startsWith("https://myurl.com/")
     // are assumed to sainitize the taint
     (e = g.(MethodCall).getQualifier() or g.(MethodCall).getArgument(0) = e) and
-    v.(AbstractValues::BooleanValue).getValue() = true
+    v.asBooleanValue() = true
   }
 
   private class StringStartsWithBarrier extends Barrier {
diff --git a/csharp/ql/src/experimental/Security Features/CWE-1004/CookieWithoutHttpOnly.qhelp b/csharp/ql/src/experimental/Security Features/CWE-1004/CookieWithoutHttpOnly.qhelp
deleted file mode 100644
index c7c10a3af9e..00000000000
--- a/csharp/ql/src/experimental/Security Features/CWE-1004/CookieWithoutHttpOnly.qhelp	
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE qhelp PUBLIC
-  "-//Semmle//qhelp//EN"
-  "qhelp.dtd">
-<qhelp>
-
-<overview>
-<p>
-Cookies without <code>HttpOnly</code> flag are accessible to JavaScript running in the same origin. In case of
-Cross-Site Scripting (XSS) vulnerability the cookie can be stolen by malicious script.
-</p>
-</overview>
-
-<recommendation>
-<p>
-Protect sensitive cookies, such as related to authentication, by setting <code>HttpOnly</code> to <code>true</code> to make
-them not accessible to JavaScript. In ASP.NET case it is also possible to set the attribute via <code>&lt;httpCookies&gt;</code> element
-of <code>web.config</code> with the attribute <code>httpOnlyCookies="true"</code>.
-</p>
-</recommendation>
-
-<example>
-
-<p>
-In the example below <code>Microsoft.AspNetCore.Http.CookieOptions.HttpOnly</code> is set to <code>true</code>.
-</p>
-
-<sample src="httponlyflagcore.cs" />
-
-<p>
-In the following example <code>CookiePolicyOptions</code> are set programmatically to configure defaults.
-</p>
-
-<sample src="cookiepolicyoptions.cs" />
-
-<p>
-In the example below <code>System.Web.HttpCookie.HttpOnly</code> is set to <code>true</code>.
-</p>
-
-<sample src="httponlyflag.cs" />
-
-</example>
-
-<references>
-
-<li><a href="https://docs.microsoft.com/en-us/dotnet/api/microsoft.aspnetcore.http.cookieoptions.httponly">CookieOptions.HttpOnly Property,</a></li>
-<li><a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie">Set-Cookie</a> Header,</li>
-<li><a href="https://msdn.microsoft.com/en-us/library/system.web.httpcookie.httponly(v=vs.110).aspx">HttpCookie.HttpOnly Property,</a></li>
-<li><a href="https://msdn.microsoft.com/library/ms228262%28v=vs.100%29.aspx">httpCookies Element,</a></li>
-
-</references>
-</qhelp>
diff --git a/csharp/ql/src/experimental/Security Features/CWE-1004/CookieWithoutHttpOnly.ql b/csharp/ql/src/experimental/Security Features/CWE-1004/CookieWithoutHttpOnly.ql
deleted file mode 100644
index 359ffbcd2f3..00000000000
--- a/csharp/ql/src/experimental/Security Features/CWE-1004/CookieWithoutHttpOnly.ql	
+++ /dev/null
@@ -1,107 +0,0 @@
-/**
- * @name 'HttpOnly' attribute is not set to true
- * @description Omitting the 'HttpOnly' attribute for security sensitive data allows
- *              malicious JavaScript to steal it in case of XSS vulnerability. Always set
- *              'HttpOnly' to 'true' to authentication related cookie to make it
- *              not accessible by JavaScript.
- * @kind problem
- * @problem.severity warning
- * @precision high
- * @id cs/web/cookie-httponly-not-set
- * @tags security
- *       experimental
- *       external/cwe/cwe-1004
- */
-
-import csharp
-import semmle.code.asp.WebConfig
-import semmle.code.csharp.frameworks.system.Web
-import semmle.code.csharp.frameworks.microsoft.AspNetCore
-deprecated import experimental.dataflow.flowsources.AuthCookie
-
-deprecated query predicate problems(Expr httpOnlySink, string message) {
-  (
-    exists(Assignment a, Expr val |
-      httpOnlySink = a.getRValue() and
-      val.getValue() = "false" and
-      (
-        exists(ObjectCreation oc |
-          getAValueForProp(oc, a, "HttpOnly") = val and
-          (
-            oc.getType() instanceof SystemWebHttpCookie and
-            isCookieWithSensitiveName(oc.getArgument(0))
-            or
-            exists(MethodCall mc, MicrosoftAspNetCoreHttpResponseCookies iResponse |
-              oc.getType() instanceof MicrosoftAspNetCoreHttpCookieOptions and
-              iResponse.getAppendMethod() = mc.getTarget() and
-              isCookieWithSensitiveName(mc.getArgument(0)) and
-              // there is no callback `OnAppendCookie` that sets `HttpOnly` to true
-              not OnAppendCookieHttpOnlyTracking::flowTo(_) and
-              // Passed as third argument to `IResponseCookies.Append`
-              exists(DataFlow::Node creation, DataFlow::Node append |
-                CookieOptionsTracking::flow(creation, append) and
-                creation.asExpr() = oc and
-                append.asExpr() = mc.getArgument(2)
-              )
-            )
-          )
-        )
-        or
-        exists(PropertyWrite pw |
-          (
-            pw.getProperty().getDeclaringType() instanceof MicrosoftAspNetCoreHttpCookieBuilder or
-            pw.getProperty().getDeclaringType() instanceof
-              MicrosoftAspNetCoreAuthenticationCookiesCookieAuthenticationOptions
-          ) and
-          pw.getProperty().getName() = "HttpOnly" and
-          a.getLValue() = pw and
-          DataFlow::localExprFlow(val, a.getRValue())
-        )
-      )
-    )
-    or
-    exists(Call c |
-      httpOnlySink = c and
-      (
-        exists(MicrosoftAspNetCoreHttpResponseCookies iResponse, MethodCall mc |
-          // default is not configured or is not set to `Always`
-          not getAValueForCookiePolicyProp("HttpOnly").getValue() = "1" and
-          // there is no callback `OnAppendCookie` that sets `HttpOnly` to true
-          not OnAppendCookieHttpOnlyTracking::flowTo(_) and
-          iResponse.getAppendMethod() = mc.getTarget() and
-          isCookieWithSensitiveName(mc.getArgument(0)) and
-          (
-            // `HttpOnly` property in `CookieOptions` passed to IResponseCookies.Append(...) wasn't set
-            exists(ObjectCreation oc |
-              oc = c and
-              oc.getType() instanceof MicrosoftAspNetCoreHttpCookieOptions and
-              not isPropertySet(oc, "HttpOnly") and
-              exists(DataFlow::Node creation |
-                CookieOptionsTracking::flow(creation, _) and
-                creation.asExpr() = oc
-              )
-            )
-            or
-            // IResponseCookies.Append(String, String) was called, `HttpOnly` is set to `false` by default
-            mc = c and
-            mc.getNumberOfArguments() < 3
-          )
-        )
-        or
-        exists(ObjectCreation oc |
-          oc = c and
-          oc.getType() instanceof SystemWebHttpCookie and
-          isCookieWithSensitiveName(oc.getArgument(0)) and
-          // the property wasn't explicitly set, so a default value from config is used
-          not isPropertySet(oc, "HttpOnly") and
-          // the default in config is not set to `true`
-          not exists(XmlElement element |
-            element instanceof HttpCookiesElement and
-            element.(HttpCookiesElement).isHttpOnlyCookies()
-          )
-        )
-      )
-    )
-  ) and
-  message = "Cookie attribute 'HttpOnly' is not set to true."
-}
diff --git a/csharp/ql/src/experimental/Security Features/CWE-614/CookieWithoutSecure.qhelp b/csharp/ql/src/experimental/Security Features/CWE-614/CookieWithoutSecure.qhelp
deleted file mode 100644
index ddf825aed26..00000000000
--- a/csharp/ql/src/experimental/Security Features/CWE-614/CookieWithoutSecure.qhelp	
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE qhelp PUBLIC
-  "-//Semmle//qhelp//EN"
-  "qhelp.dtd">
-<qhelp>
-
-<overview>
-<p>
-Sensitive data that is transmitted using HTTP is vulnerable to being read by a third party. By default,
-cookies are sent via HTTP, not HTTPS.
-</p>
-</overview>
-
-<recommendation>
-<p>
-In ASP.NET case when using cookies ensure that HTTPS is used by setting the property <code>Microsoft.AspNetCore.Http.CookieOptions.Secure</code> to <code>true</code>.
-</p>
-<p>
-In ASP.NET Core case when using cookies, ensure that HTTPS is used, either via the <code>&lt;forms&gt;</code> attribute above, or
-the <code>&lt;httpCookies&gt;</code> element, with the attribute <code>requireSSL="true"</code>. It is also possible to require cookies
-to use HTTPS programmatically, by setting the property <code>System.Web.HttpCookie.Secure</code> to <code>true</code>.
-</p>
-</recommendation>
-
-<example>
-
-<p>
-In the example below <code>Microsoft.AspNetCore.Http.CookieOptions.Secure</code> is set to <code>true</code> programmatically.
-</p>
-
-<sample src="secureflagcore.cs" />
-
-<p>
-In the following example <code>CookiePolicyOptions</code> are set programmatically to configure defaults.
-</p>
-
-<sample src="cookiepolicyoptions.cs" />
-
-<p>
-In the example below <code>System.Web.HttpCookie.Secure</code> is set to <code>true</code> programmatically.
-</p>
-
-<sample src="secureflag.cs" />
-
-</example>
-
-<references>
-
-<li><a href="https://docs.microsoft.com/en-us/dotnet/api/microsoft.aspnetcore.http.cookieoptions.secure">CookieOptions.Secure Property,</a></li>
-<li><a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie">Set-Cookie</a> Header,</li>
-<li><a href="https://msdn.microsoft.com/en-us/library/system.web.security.formsauthentication.requiressl(v=vs.110).aspx">FormsAuthentication.RequireSSL Property,</a></li>
-<li><a href="https://msdn.microsoft.com/en-us/library/1d3t3c61(v=vs.100).aspx">forms Element for authentication,</a></li>
-<li><a href="https://msdn.microsoft.com/library/ms228262%28v=vs.100%29.aspx">httpCookies Element,</a></li>
-
-</references>
-</qhelp>
diff --git a/csharp/ql/src/experimental/Security Features/CWE-614/CookieWithoutSecure.ql b/csharp/ql/src/experimental/Security Features/CWE-614/CookieWithoutSecure.ql
deleted file mode 100644
index d7628f7b2c7..00000000000
--- a/csharp/ql/src/experimental/Security Features/CWE-614/CookieWithoutSecure.ql	
+++ /dev/null
@@ -1,107 +0,0 @@
-/**
- * @name 'Secure' attribute is not set to true
- * @description Omitting the 'Secure' attribute allows data to be transmitted insecurely
- *              using HTTP. Always set 'Secure' to 'true' to ensure that HTTPS
- *              is used at all times.
- * @kind problem
- * @problem.severity error
- * @precision high
- * @id cs/web/cookie-secure-not-set
- * @tags security
- *       experimental
- *       external/cwe/cwe-319
- *       external/cwe/cwe-614
- */
-
-import csharp
-import semmle.code.asp.WebConfig
-import semmle.code.csharp.frameworks.system.Web
-import semmle.code.csharp.frameworks.microsoft.AspNetCore
-deprecated import experimental.dataflow.flowsources.AuthCookie
-
-deprecated query predicate problems(Expr secureSink, string message) {
-  (
-    exists(Call c |
-      secureSink = c and
-      (
-        // default is not configured or is not set to `Always` or `SameAsRequest`
-        not (
-          getAValueForCookiePolicyProp("Secure").getValue() = "0" or
-          getAValueForCookiePolicyProp("Secure").getValue() = "1"
-        ) and
-        // there is no callback `OnAppendCookie` that sets `Secure` to true
-        not OnAppendCookieSecureTracking::flowTo(_) and
-        (
-          // `Secure` property in `CookieOptions` passed to IResponseCookies.Append(...) wasn't set
-          exists(ObjectCreation oc |
-            oc = c and
-            oc.getType() instanceof MicrosoftAspNetCoreHttpCookieOptions and
-            not isPropertySet(oc, "Secure") and
-            exists(DataFlow::Node creation |
-              CookieOptionsTracking::flow(creation, _) and
-              creation.asExpr() = oc
-            )
-          )
-          or
-          // IResponseCookies.Append(String, String) was called, `Secure` is set to `false` by default
-          exists(MethodCall mc, MicrosoftAspNetCoreHttpResponseCookies iResponse |
-            mc = c and
-            iResponse.getAppendMethod() = mc.getTarget() and
-            mc.getNumberOfArguments() < 3
-          )
-        )
-        or
-        exists(ObjectCreation oc |
-          oc = c and
-          oc.getType() instanceof SystemWebHttpCookie and
-          // the property wasn't explicitly set, so a default value from config is used
-          not isPropertySet(oc, "Secure") and
-          // the default in config is not set to `true`
-          // the `exists` below covers the `cs/web/requiressl-not-set`
-          not exists(XmlElement element |
-            element instanceof FormsElement and
-            element.(FormsElement).isRequireSsl()
-            or
-            element instanceof HttpCookiesElement and
-            element.(HttpCookiesElement).isRequireSsl()
-          )
-        )
-      )
-    )
-    or
-    exists(Assignment a, Expr val |
-      secureSink = a.getRValue() and
-      (
-        exists(ObjectCreation oc |
-          getAValueForProp(oc, a, "Secure") = val and
-          val.getValue() = "false" and
-          (
-            oc.getType() instanceof SystemWebHttpCookie
-            or
-            oc.getType() instanceof MicrosoftAspNetCoreHttpCookieOptions and
-            // there is no callback `OnAppendCookie` that sets `Secure` to true
-            not OnAppendCookieSecureTracking::flowTo(_) and
-            // the cookie option is passed to `Append`
-            exists(DataFlow::Node creation |
-              CookieOptionsTracking::flow(creation, _) and
-              creation.asExpr() = oc
-            )
-          )
-        )
-        or
-        exists(PropertyWrite pw |
-          (
-            pw.getProperty().getDeclaringType() instanceof MicrosoftAspNetCoreHttpCookieBuilder or
-            pw.getProperty().getDeclaringType() instanceof
-              MicrosoftAspNetCoreAuthenticationCookiesCookieAuthenticationOptions
-          ) and
-          pw.getProperty().getName() = "SecurePolicy" and
-          a.getLValue() = pw and
-          DataFlow::localExprFlow(val, a.getRValue()) and
-          val.getValue() = "2" // None
-        )
-      )
-    )
-  ) and
-  message = "Cookie attribute 'Secure' is not set to true."
-}
diff --git a/csharp/ql/src/experimental/Security Features/CWE-614/Web.config b/csharp/ql/src/experimental/Security Features/CWE-614/Web.config
deleted file mode 100644
index 89d4561cd62..00000000000
--- a/csharp/ql/src/experimental/Security Features/CWE-614/Web.config	
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-  <system.web>
-    <authentication>
-      <forms
-        requireSSL="true"
-        ... />
-    </authentication>
-    <httpCookies
-        requireSSL="true"
-        ... />
-  </system.web>
-</configuration>
diff --git a/csharp/ql/src/experimental/Security Features/CWE-759/HashWithoutSalt.ql b/csharp/ql/src/experimental/Security Features/CWE-759/HashWithoutSalt.ql
index f18798c8b08..f175723c099 100644
--- a/csharp/ql/src/experimental/Security Features/CWE-759/HashWithoutSalt.ql	
+++ b/csharp/ql/src/experimental/Security Features/CWE-759/HashWithoutSalt.ql	
@@ -10,6 +10,7 @@
  */
 
 import csharp
+import semmle.code.csharp.frameworks.system.Collections
 import HashWithoutSalt::PathGraph
 
 /** The C# class `Windows.Security.Cryptography.Core.HashAlgorithmProvider`. */
@@ -93,12 +94,17 @@ predicate hasAnotherHashCall(MethodCall mc) {
 
 /** Holds if a password hash without salt is further processed in another method call. */
 predicate hasFurtherProcessing(MethodCall mc) {
-  mc.getTarget().fromLibrary() and
-  (
-    mc.getTarget().hasFullyQualifiedName("System", "Array", "Copy") or // Array.Copy(passwordHash, 0, password.Length), 0, key, 0, keyLen);
-    mc.getTarget().hasFullyQualifiedName("System", "String", "Concat") or // string.Concat(passwordHash, saltkey)
-    mc.getTarget().hasFullyQualifiedName("System", "Buffer", "BlockCopy") or // Buffer.BlockCopy(passwordHash, 0, allBytes, 0, 20)
-    mc.getTarget().hasFullyQualifiedName("System", "String", "Format") // String.Format("{0}:{1}:{2}", username, salt, password)
+  exists(Method m | m = mc.getTarget() and m.fromLibrary() |
+    m.hasFullyQualifiedName("System", "Array", "Copy") // Array.Copy(passwordHash, 0, password.Length), 0, key, 0, keyLen);
+    or
+    m.hasFullyQualifiedName("System", "String", "Concat") // string.Concat(passwordHash, saltkey)
+    or
+    m.hasFullyQualifiedName("System", "Buffer", "BlockCopy") // Buffer.BlockCopy(passwordHash, 0, allBytes, 0, 20)
+    or
+    m.hasFullyQualifiedName("System", "String", "Format") // String.Format("{0}:{1}:{2}", username, salt, password)
+    or
+    m.getName() = "CopyTo" and
+    m.getDeclaringType().getABaseType*() instanceof SystemCollectionsICollectionInterface // passBytes.CopyTo(rawSalted, 0);
   )
 }
 
diff --git a/csharp/ql/src/qlpack.yml b/csharp/ql/src/qlpack.yml
index ec0fab1f111..2597e99f55b 100644
--- a/csharp/ql/src/qlpack.yml
+++ b/csharp/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-queries
-version: 1.3.3-dev
+version: 1.4.4-dev
 groups:
   - csharp
   - queries
diff --git a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieHttpOnlyFalseAspNetCore/CookieBuilder/HttpOnly.qlref b/csharp/ql/test/experimental/Security Features/CWE-1004/CookieHttpOnlyFalseAspNetCore/CookieBuilder/HttpOnly.qlref
deleted file mode 100644
index 91ce226003c..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieHttpOnlyFalseAspNetCore/CookieBuilder/HttpOnly.qlref	
+++ /dev/null
@@ -1 +0,0 @@
-experimental/Security Features/CWE-1004/CookieWithoutHttpOnly.ql
\ No newline at end of file
diff --git a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieHttpOnlyFalseAspNetCore/NoPolicy/HttpOnly.expected b/csharp/ql/test/experimental/Security Features/CWE-1004/CookieHttpOnlyFalseAspNetCore/NoPolicy/HttpOnly.expected
deleted file mode 100644
index 968e28976a8..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieHttpOnlyFalseAspNetCore/NoPolicy/HttpOnly.expected	
+++ /dev/null
@@ -1,4 +0,0 @@
-| Program.cs:25:34:25:38 | false | Cookie attribute 'HttpOnly' is not set to true. |
-| Program.cs:38:88:38:92 | false | Cookie attribute 'HttpOnly' is not set to true. |
-| Program.cs:61:34:61:34 | access to local variable v | Cookie attribute 'HttpOnly' is not set to true. |
-| Program.cs:68:88:68:88 | access to local variable v | Cookie attribute 'HttpOnly' is not set to true. |
diff --git a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieHttpOnlyFalseAspNetCore/NoPolicy/HttpOnly.qlref b/csharp/ql/test/experimental/Security Features/CWE-1004/CookieHttpOnlyFalseAspNetCore/NoPolicy/HttpOnly.qlref
deleted file mode 100644
index 91ce226003c..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieHttpOnlyFalseAspNetCore/NoPolicy/HttpOnly.qlref	
+++ /dev/null
@@ -1 +0,0 @@
-experimental/Security Features/CWE-1004/CookieWithoutHttpOnly.ql
\ No newline at end of file
diff --git a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieHttpOnlyFalseAspNetCore/UseCookiePolicyCallback/HttpOnly.qlref b/csharp/ql/test/experimental/Security Features/CWE-1004/CookieHttpOnlyFalseAspNetCore/UseCookiePolicyCallback/HttpOnly.qlref
deleted file mode 100644
index 91ce226003c..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieHttpOnlyFalseAspNetCore/UseCookiePolicyCallback/HttpOnly.qlref	
+++ /dev/null
@@ -1 +0,0 @@
-experimental/Security Features/CWE-1004/CookieWithoutHttpOnly.ql
\ No newline at end of file
diff --git a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieHttpOnlyFalseAspNetCore/UseCookiePolicyCallback/Program.cs b/csharp/ql/test/experimental/Security Features/CWE-1004/CookieHttpOnlyFalseAspNetCore/UseCookiePolicyCallback/Program.cs
deleted file mode 100644
index 60f217eff20..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieHttpOnlyFalseAspNetCore/UseCookiePolicyCallback/Program.cs	
+++ /dev/null
@@ -1,37 +0,0 @@
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.AspNetCore.Http;
-
-public class MyController : Microsoft.AspNetCore.Mvc.Controller
-{
-    public void CookieDefault()
-    {
-        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions();
-        cookieOptions.HttpOnly = false;
-        Response.Cookies.Append("auth", "secret", cookieOptions); // GOOD: HttpOnly is set in callback
-    }
-}
-
-public class Startup
-{
-    // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-    public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
-    {
-        app.UseCookiePolicy();
-    }
-
-    public void ConfigureServices(IServiceCollection services)
-    {
-        services.Configure<CookiePolicyOptions>(options =>
-        {
-            options.OnAppendCookie = cookieContext => SetCookies(cookieContext.CookieOptions);
-        });
-    }
-
-    private void SetCookies(CookieOptions options)
-    {
-        options.Secure = true;
-        options.HttpOnly = true;
-    }
-}
diff --git a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieHttpOnlyFalseAspNetCore/options b/csharp/ql/test/experimental/Security Features/CWE-1004/CookieHttpOnlyFalseAspNetCore/options
deleted file mode 100644
index ce3f295ed11..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieHttpOnlyFalseAspNetCore/options	
+++ /dev/null
@@ -1,3 +0,0 @@
-semmle-extractor-options: /nostdlib /noconfig
-semmle-extractor-options: --load-sources-from-project:${testdir}/../../../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj
-semmle-extractor-options: --load-sources-from-project:${testdir}/../../../../../resources/stubs/_frameworks/Microsoft.AspNetCore.App/Microsoft.AspNetCore.App.csproj
diff --git a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieHttpOnlyFalseSystemWeb/HttpOnly.expected b/csharp/ql/test/experimental/Security Features/CWE-1004/CookieHttpOnlyFalseSystemWeb/HttpOnly.expected
deleted file mode 100644
index 28844595859..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieHttpOnlyFalseSystemWeb/HttpOnly.expected	
+++ /dev/null
@@ -1,4 +0,0 @@
-| Program.cs:23:27:23:31 | false | Cookie attribute 'HttpOnly' is not set to true. |
-| Program.cs:28:74:28:78 | false | Cookie attribute 'HttpOnly' is not set to true. |
-| Program.cs:48:27:48:27 | access to local variable v | Cookie attribute 'HttpOnly' is not set to true. |
-| Program.cs:54:74:54:74 | access to local variable v | Cookie attribute 'HttpOnly' is not set to true. |
diff --git a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieHttpOnlyFalseSystemWeb/HttpOnly.qlref b/csharp/ql/test/experimental/Security Features/CWE-1004/CookieHttpOnlyFalseSystemWeb/HttpOnly.qlref
deleted file mode 100644
index 91ce226003c..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieHttpOnlyFalseSystemWeb/HttpOnly.qlref	
+++ /dev/null
@@ -1 +0,0 @@
-experimental/Security Features/CWE-1004/CookieWithoutHttpOnly.ql
\ No newline at end of file
diff --git a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieHttpOnlyFalseSystemWeb/options b/csharp/ql/test/experimental/Security Features/CWE-1004/CookieHttpOnlyFalseSystemWeb/options
deleted file mode 100644
index 9290f65d5b2..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieHttpOnlyFalseSystemWeb/options	
+++ /dev/null
@@ -1,3 +0,0 @@
-semmle-extractor-options: /nostdlib /noconfig
-semmle-extractor-options: --load-sources-from-project:${testdir}/../../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj
-semmle-extractor-options: ${testdir}/../../../../resources/stubs/System.Web.cs
diff --git a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlyAspNetCore/NoPolicy/HttpOnly.expected b/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlyAspNetCore/NoPolicy/HttpOnly.expected
deleted file mode 100644
index aac50988302..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlyAspNetCore/NoPolicy/HttpOnly.expected	
+++ /dev/null
@@ -1,2 +0,0 @@
-| Program.cs:5:9:5:49 | call to method Append | Cookie attribute 'HttpOnly' is not set to true. |
-| Program.cs:15:29:15:73 | object creation of type CookieOptions | Cookie attribute 'HttpOnly' is not set to true. |
diff --git a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlyAspNetCore/NoPolicy/HttpOnly.qlref b/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlyAspNetCore/NoPolicy/HttpOnly.qlref
deleted file mode 100644
index 91ce226003c..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlyAspNetCore/NoPolicy/HttpOnly.qlref	
+++ /dev/null
@@ -1 +0,0 @@
-experimental/Security Features/CWE-1004/CookieWithoutHttpOnly.ql
\ No newline at end of file
diff --git a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlyAspNetCore/NoPolicy/Program.cs b/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlyAspNetCore/NoPolicy/Program.cs
deleted file mode 100644
index 945c5be55db..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlyAspNetCore/NoPolicy/Program.cs	
+++ /dev/null
@@ -1,52 +0,0 @@
-public class MyController : Microsoft.AspNetCore.Mvc.Controller
-{
-    public void CookieDefault()
-    {
-        Response.Cookies.Append("auth", "secret"); // BAD: HttpOnly is set to false by default
-    }
-
-    public void CookieDefaultForgery()
-    {
-        Response.Cookies.Append("antiforgerytoken", "secret"); // GOOD: not an auth cookie
-    }
-
-    public void CookieDefault2()
-    {
-        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions();
-        Response.Cookies.Append("auth", "secret", cookieOptions); // BAD: HttpOnly is set to false by default
-    }
-
-    public void CookieDelete()
-    {
-        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions();
-        Response.Cookies.Delete("auth", cookieOptions); // GOOD: Delete call
-    }
-
-    void CookieDirectTrue()
-    {
-        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions();
-        cookieOptions.HttpOnly = true;
-        Response.Cookies.Append("auth", "secret", cookieOptions); // GOOD
-    }
-
-    void CookieDirectTrueInitializer()
-    {
-        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions() { HttpOnly = true };
-        Response.Cookies.Append("auth", "secret", cookieOptions); // GOOD
-    }
-
-    void CookieIntermediateTrue()
-    {
-        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions();
-        bool v = true;
-        cookieOptions.HttpOnly = v;
-        Response.Cookies.Append("auth", "secret", cookieOptions); // GOOD: should track local data flow
-    }
-
-    void CookieIntermediateTrueInitializer()
-    {
-        bool v = true;
-        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions() { HttpOnly = v };
-        Response.Cookies.Append("auth", "secret", cookieOptions); // GOOD: should track local data flow
-    }
-}
diff --git a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlyAspNetCore/UseCookiePolicyAlways/HttpOnly.qlref b/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlyAspNetCore/UseCookiePolicyAlways/HttpOnly.qlref
deleted file mode 100644
index 91ce226003c..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlyAspNetCore/UseCookiePolicyAlways/HttpOnly.qlref	
+++ /dev/null
@@ -1 +0,0 @@
-experimental/Security Features/CWE-1004/CookieWithoutHttpOnly.ql
\ No newline at end of file
diff --git a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlyAspNetCore/UseCookiePolicyCallback/HttpOnly.qlref b/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlyAspNetCore/UseCookiePolicyCallback/HttpOnly.qlref
deleted file mode 100644
index 91ce226003c..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlyAspNetCore/UseCookiePolicyCallback/HttpOnly.qlref	
+++ /dev/null
@@ -1 +0,0 @@
-experimental/Security Features/CWE-1004/CookieWithoutHttpOnly.ql
\ No newline at end of file
diff --git a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlyAspNetCore/UseCookiePolicyNone/HttpOnly.qlref b/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlyAspNetCore/UseCookiePolicyNone/HttpOnly.qlref
deleted file mode 100644
index 91ce226003c..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlyAspNetCore/UseCookiePolicyNone/HttpOnly.qlref	
+++ /dev/null
@@ -1 +0,0 @@
-experimental/Security Features/CWE-1004/CookieWithoutHttpOnly.ql
\ No newline at end of file
diff --git a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlyAspNetCore/options b/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlyAspNetCore/options
deleted file mode 100644
index ce3f295ed11..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlyAspNetCore/options	
+++ /dev/null
@@ -1,3 +0,0 @@
-semmle-extractor-options: /nostdlib /noconfig
-semmle-extractor-options: --load-sources-from-project:${testdir}/../../../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj
-semmle-extractor-options: --load-sources-from-project:${testdir}/../../../../../resources/stubs/_frameworks/Microsoft.AspNetCore.App/Microsoft.AspNetCore.App.csproj
diff --git a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlySystemWeb/ConfigEmpty/HttpOnly.expected b/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlySystemWeb/ConfigEmpty/HttpOnly.expected
deleted file mode 100644
index 85b07c94e9e..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlySystemWeb/ConfigEmpty/HttpOnly.expected	
+++ /dev/null
@@ -1 +0,0 @@
-| Program.cs:5:22:5:59 | object creation of type HttpCookie | Cookie attribute 'HttpOnly' is not set to true. |
diff --git a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlySystemWeb/ConfigEmpty/HttpOnly.qlref b/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlySystemWeb/ConfigEmpty/HttpOnly.qlref
deleted file mode 100644
index 91ce226003c..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlySystemWeb/ConfigEmpty/HttpOnly.qlref	
+++ /dev/null
@@ -1 +0,0 @@
-experimental/Security Features/CWE-1004/CookieWithoutHttpOnly.ql
\ No newline at end of file
diff --git a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlySystemWeb/ConfigEmpty/Program.cs b/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlySystemWeb/ConfigEmpty/Program.cs
deleted file mode 100644
index bc66b526fa5..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlySystemWeb/ConfigEmpty/Program.cs	
+++ /dev/null
@@ -1,36 +0,0 @@
-class Program
-{
-    void CookieDefault()
-    {
-        var cookie = new System.Web.HttpCookie("sessionID"); // BAD: httpOnlyCookies is set to false by default
-    }
-
-    void CookieDefaultForgery()
-    {
-        var cookie = new System.Web.HttpCookie("anticsrftoken"); // GOOD: not an auth cookie
-    }
-
-    void CookieDirectTrue()
-    {
-        var cookie = new System.Web.HttpCookie("sessionID");
-        cookie.HttpOnly = true;  // GOOD
-    }
-
-    void CookieDirectTrueInitializer()
-    {
-        var cookie = new System.Web.HttpCookie("sessionID") { HttpOnly = true }; // GOOD
-    }
-
-    void CookieIntermediateTrue()
-    {
-        var cookie = new System.Web.HttpCookie("sessionID");
-        bool v = true;
-        cookie.HttpOnly = v; // GOOD: should track local data flow
-    }
-
-    void CookieIntermediateTrueInitializer()
-    {
-        bool v = true;
-        var cookie = new System.Web.HttpCookie("sessionID") { HttpOnly = v }; // GOOD: should track local data flow
-    }
-}
diff --git a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlySystemWeb/ConfigFalse/HttpOnly.expected b/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlySystemWeb/ConfigFalse/HttpOnly.expected
deleted file mode 100644
index 85b07c94e9e..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlySystemWeb/ConfigFalse/HttpOnly.expected	
+++ /dev/null
@@ -1 +0,0 @@
-| Program.cs:5:22:5:59 | object creation of type HttpCookie | Cookie attribute 'HttpOnly' is not set to true. |
diff --git a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlySystemWeb/ConfigFalse/HttpOnly.qlref b/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlySystemWeb/ConfigFalse/HttpOnly.qlref
deleted file mode 100644
index 91ce226003c..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlySystemWeb/ConfigFalse/HttpOnly.qlref	
+++ /dev/null
@@ -1 +0,0 @@
-experimental/Security Features/CWE-1004/CookieWithoutHttpOnly.ql
\ No newline at end of file
diff --git a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlySystemWeb/ConfigFalse/Program.cs b/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlySystemWeb/ConfigFalse/Program.cs
deleted file mode 100644
index 52ef13373f7..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlySystemWeb/ConfigFalse/Program.cs	
+++ /dev/null
@@ -1,36 +0,0 @@
-class Program
-{
-    void CookieDefault()
-    {
-        var cookie = new System.Web.HttpCookie("sessionID"); // BAD: httpOnlyCookies is set to false in config
-    }
-
-    void CookieDefaultForgery()
-    {
-        var cookie = new System.Web.HttpCookie("anticsrftoken"); // GOOD: not an auth cookie
-    }
-
-    void CookieDirectTrue()
-    {
-        var cookie = new System.Web.HttpCookie("sessionID");
-        cookie.HttpOnly = true;  // GOOD
-    }
-
-    void CookieDirectTrueInitializer()
-    {
-        var cookie = new System.Web.HttpCookie("sessionID") { HttpOnly = true }; // GOOD
-    }
-
-    void CookieIntermediateTrue()
-    {
-        var cookie = new System.Web.HttpCookie("sessionID");
-        bool v = true;
-        cookie.HttpOnly = v; // GOOD: should track local data flow
-    }
-
-    void CookieIntermediateTrueInitializer()
-    {
-        bool v = true;
-        var cookie = new System.Web.HttpCookie("sessionID") { HttpOnly = v }; // GOOD: should track local data flow
-    }
-}
diff --git a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlySystemWeb/ConfigFalse/Web.config b/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlySystemWeb/ConfigFalse/Web.config
deleted file mode 100644
index d6202a55188..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlySystemWeb/ConfigFalse/Web.config	
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-  <system.web>
-    <httpCookies httpOnlyCookies="false" />
-  </system.web>
-</configuration>
diff --git a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlySystemWeb/ConfigFalse/options b/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlySystemWeb/ConfigFalse/options
deleted file mode 100644
index 9d05f9bf06d..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlySystemWeb/ConfigFalse/options	
+++ /dev/null
@@ -1,3 +0,0 @@
-semmle-extractor-options: /nostdlib /noconfig
-semmle-extractor-options: --load-sources-from-project:${testdir}/../../../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj
-semmle-extractor-options: ${testdir}/../../../../../resources/stubs/System.Web.cs
diff --git a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlySystemWeb/HttpCookiesTrue/HttpOnly.qlref b/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlySystemWeb/HttpCookiesTrue/HttpOnly.qlref
deleted file mode 100644
index 91ce226003c..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlySystemWeb/HttpCookiesTrue/HttpOnly.qlref	
+++ /dev/null
@@ -1 +0,0 @@
-experimental/Security Features/CWE-1004/CookieWithoutHttpOnly.ql
\ No newline at end of file
diff --git a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlySystemWeb/HttpCookiesTrue/Program.cs b/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlySystemWeb/HttpCookiesTrue/Program.cs
deleted file mode 100644
index 6eeb4f6d334..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlySystemWeb/HttpCookiesTrue/Program.cs	
+++ /dev/null
@@ -1,36 +0,0 @@
-class Program
-{
-    void CookieDefault()
-    {
-        var cookie = new System.Web.HttpCookie("sessionID"); // GOOD: httpOnlyCookies is set to true in config
-    }
-
-    void CookieDefaultForgery()
-    {
-        var cookie = new System.Web.HttpCookie("anticsrftoken"); // GOOD: not an auth cookie
-    }
-
-    void CookieDirectTrue()
-    {
-        var cookie = new System.Web.HttpCookie("sessionID");
-        cookie.HttpOnly = true;  // GOOD
-    }
-
-    void CookieDirectTrueInitializer()
-    {
-        var cookie = new System.Web.HttpCookie("sessionID") { HttpOnly = true }; // GOOD
-    }
-
-    void CookieIntermediateTrue()
-    {
-        var cookie = new System.Web.HttpCookie("sessionID");
-        bool v = true;
-        cookie.HttpOnly = v; // GOOD: should track local data flow
-    }
-
-    void CookieIntermediateTrueInitializer()
-    {
-        bool v = true;
-        var cookie = new System.Web.HttpCookie("sessionID") { HttpOnly = v }; // GOOD: should track local data flow
-    }
-}
diff --git a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlySystemWeb/HttpCookiesTrue/options b/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlySystemWeb/HttpCookiesTrue/options
deleted file mode 100644
index 9d05f9bf06d..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlySystemWeb/HttpCookiesTrue/options	
+++ /dev/null
@@ -1,3 +0,0 @@
-semmle-extractor-options: /nostdlib /noconfig
-semmle-extractor-options: --load-sources-from-project:${testdir}/../../../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj
-semmle-extractor-options: ${testdir}/../../../../../resources/stubs/System.Web.cs
diff --git a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLAspNetCore/NoPolicy/Program.cs b/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLAspNetCore/NoPolicy/Program.cs
deleted file mode 100644
index 9c21416940b..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLAspNetCore/NoPolicy/Program.cs	
+++ /dev/null
@@ -1,47 +0,0 @@
-public class MyController : Microsoft.AspNetCore.Mvc.Controller
-{
-    public void CookieDefault()
-    {
-        Response.Cookies.Append("name", "value"); // BAD: requireSSL is set to false by default
-    }
-
-    public void CookieDefault2()
-    {
-        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions();
-        Response.Cookies.Append("name", "value", cookieOptions); // BAD: requireSSL is set to false by default
-    }
-
-    public void CookieDelete()
-    {
-        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions();
-        Response.Cookies.Delete("name", cookieOptions); // GOOD: Delete call
-    }
-
-    void CookieDirectTrue()
-    {
-        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions();
-        cookieOptions.Secure = true;
-        Response.Cookies.Append("auth", "secret", cookieOptions); // GOOD
-    }
-
-    void CookieDirectTrueInitializer()
-    {
-        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions() { Secure = true };
-        Response.Cookies.Append("auth", "secret", cookieOptions); // GOOD
-    }
-
-    void CookieIntermediateTrue()
-    {
-        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions();
-        bool v = true;
-        cookieOptions.Secure = v;
-        Response.Cookies.Append("auth", "secret", cookieOptions); // GOOD: should track local data flow
-    }
-
-    void CookieIntermediateTrueInitializer()
-    {
-        bool v = true;
-        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions() { Secure = v };
-        Response.Cookies.Append("auth", "secret", cookieOptions); // GOOD: should track local data flow
-    }
-}
diff --git a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLAspNetCore/NoPolicy/RequireSSL.expected b/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLAspNetCore/NoPolicy/RequireSSL.expected
deleted file mode 100644
index f96df31ad21..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLAspNetCore/NoPolicy/RequireSSL.expected	
+++ /dev/null
@@ -1,2 +0,0 @@
-| Program.cs:5:9:5:48 | call to method Append | Cookie attribute 'Secure' is not set to true. |
-| Program.cs:10:29:10:73 | object creation of type CookieOptions | Cookie attribute 'Secure' is not set to true. |
diff --git a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLAspNetCore/NoPolicy/RequireSSL.qlref b/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLAspNetCore/NoPolicy/RequireSSL.qlref
deleted file mode 100644
index f76146a862b..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLAspNetCore/NoPolicy/RequireSSL.qlref	
+++ /dev/null
@@ -1 +0,0 @@
-experimental/Security Features/CWE-614/CookieWithoutSecure.ql
\ No newline at end of file
diff --git a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLAspNetCore/UseCookiePolicyAlways/RequireSSL.qlref b/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLAspNetCore/UseCookiePolicyAlways/RequireSSL.qlref
deleted file mode 100644
index f76146a862b..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLAspNetCore/UseCookiePolicyAlways/RequireSSL.qlref	
+++ /dev/null
@@ -1 +0,0 @@
-experimental/Security Features/CWE-614/CookieWithoutSecure.ql
\ No newline at end of file
diff --git a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLAspNetCore/UseCookiePolicyCallback/RequireSSL.qlref b/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLAspNetCore/UseCookiePolicyCallback/RequireSSL.qlref
deleted file mode 100644
index f76146a862b..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLAspNetCore/UseCookiePolicyCallback/RequireSSL.qlref	
+++ /dev/null
@@ -1 +0,0 @@
-experimental/Security Features/CWE-614/CookieWithoutSecure.ql
\ No newline at end of file
diff --git a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLAspNetCore/UseCookiePolicyNone/RequireSSL.qlref b/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLAspNetCore/UseCookiePolicyNone/RequireSSL.qlref
deleted file mode 100644
index f76146a862b..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLAspNetCore/UseCookiePolicyNone/RequireSSL.qlref	
+++ /dev/null
@@ -1 +0,0 @@
-experimental/Security Features/CWE-614/CookieWithoutSecure.ql
\ No newline at end of file
diff --git a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLAspNetCore/options b/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLAspNetCore/options
deleted file mode 100644
index ce3f295ed11..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLAspNetCore/options	
+++ /dev/null
@@ -1,3 +0,0 @@
-semmle-extractor-options: /nostdlib /noconfig
-semmle-extractor-options: --load-sources-from-project:${testdir}/../../../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj
-semmle-extractor-options: --load-sources-from-project:${testdir}/../../../../../resources/stubs/_frameworks/Microsoft.AspNetCore.App/Microsoft.AspNetCore.App.csproj
diff --git a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLFalseAspNetCore/CookieBuilder/RequireSSL.qlref b/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLFalseAspNetCore/CookieBuilder/RequireSSL.qlref
deleted file mode 100644
index f76146a862b..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLFalseAspNetCore/CookieBuilder/RequireSSL.qlref	
+++ /dev/null
@@ -1 +0,0 @@
-experimental/Security Features/CWE-614/CookieWithoutSecure.ql
\ No newline at end of file
diff --git a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLFalseAspNetCore/NoPolicy/RequireSSL.expected b/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLFalseAspNetCore/NoPolicy/RequireSSL.expected
deleted file mode 100644
index 7b7bc343942..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLFalseAspNetCore/NoPolicy/RequireSSL.expected	
+++ /dev/null
@@ -1,4 +0,0 @@
-| Program.cs:25:32:25:36 | false | Cookie attribute 'Secure' is not set to true. |
-| Program.cs:31:86:31:90 | false | Cookie attribute 'Secure' is not set to true. |
-| Program.cs:54:32:54:32 | access to local variable v | Cookie attribute 'Secure' is not set to true. |
-| Program.cs:61:86:61:86 | access to local variable v | Cookie attribute 'Secure' is not set to true. |
diff --git a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLFalseAspNetCore/NoPolicy/RequireSSL.qlref b/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLFalseAspNetCore/NoPolicy/RequireSSL.qlref
deleted file mode 100644
index f76146a862b..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLFalseAspNetCore/NoPolicy/RequireSSL.qlref	
+++ /dev/null
@@ -1 +0,0 @@
-experimental/Security Features/CWE-614/CookieWithoutSecure.ql
\ No newline at end of file
diff --git a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLFalseAspNetCore/UseCookiePolicyCallback/Program.cs b/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLFalseAspNetCore/UseCookiePolicyCallback/Program.cs
deleted file mode 100644
index 542b1a298fa..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLFalseAspNetCore/UseCookiePolicyCallback/Program.cs	
+++ /dev/null
@@ -1,37 +0,0 @@
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.AspNetCore.Http;
-
-public class MyController : Microsoft.AspNetCore.Mvc.Controller
-{
-    public void CookieDefault()
-    {
-        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions();
-        cookieOptions.Secure = false;
-        Response.Cookies.Append("auth", "secret", cookieOptions); // GOOD: Secure is set in callback
-    }
-}
-
-public class Startup
-{
-    // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-    public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
-    {
-        app.UseCookiePolicy();
-    }
-
-    public void ConfigureServices(IServiceCollection services)
-    {
-        services.Configure<CookiePolicyOptions>(options =>
-        {
-            options.OnAppendCookie = cookieContext => SetCookies(cookieContext.CookieOptions);
-        });
-    }
-
-    private void SetCookies(CookieOptions options)
-    {
-        options.Secure = true;
-        options.HttpOnly = true;
-    }
-}
diff --git a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLFalseAspNetCore/UseCookiePolicyCallback/RequireSSL.qlref b/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLFalseAspNetCore/UseCookiePolicyCallback/RequireSSL.qlref
deleted file mode 100644
index f76146a862b..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLFalseAspNetCore/UseCookiePolicyCallback/RequireSSL.qlref	
+++ /dev/null
@@ -1 +0,0 @@
-experimental/Security Features/CWE-614/CookieWithoutSecure.ql
\ No newline at end of file
diff --git a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLFalseAspNetCore/options b/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLFalseAspNetCore/options
deleted file mode 100644
index ce3f295ed11..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLFalseAspNetCore/options	
+++ /dev/null
@@ -1,3 +0,0 @@
-semmle-extractor-options: /nostdlib /noconfig
-semmle-extractor-options: --load-sources-from-project:${testdir}/../../../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj
-semmle-extractor-options: --load-sources-from-project:${testdir}/../../../../../resources/stubs/_frameworks/Microsoft.AspNetCore.App/Microsoft.AspNetCore.App.csproj
diff --git a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLFalseSystemWeb/RequireSSL.expected b/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLFalseSystemWeb/RequireSSL.expected
deleted file mode 100644
index fb6b5e842e2..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLFalseSystemWeb/RequireSSL.expected	
+++ /dev/null
@@ -1,4 +0,0 @@
-| Program.cs:17:25:17:29 | false | Cookie attribute 'Secure' is not set to true. |
-| Program.cs:22:73:22:77 | false | Cookie attribute 'Secure' is not set to true. |
-| Program.cs:42:25:42:25 | access to local variable v | Cookie attribute 'Secure' is not set to true. |
-| Program.cs:48:73:48:73 | access to local variable v | Cookie attribute 'Secure' is not set to true. |
diff --git a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLFalseSystemWeb/RequireSSL.qlref b/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLFalseSystemWeb/RequireSSL.qlref
deleted file mode 100644
index f76146a862b..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLFalseSystemWeb/RequireSSL.qlref	
+++ /dev/null
@@ -1 +0,0 @@
-experimental/Security Features/CWE-614/CookieWithoutSecure.ql
\ No newline at end of file
diff --git a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLFalseSystemWeb/options b/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLFalseSystemWeb/options
deleted file mode 100644
index 9290f65d5b2..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLFalseSystemWeb/options	
+++ /dev/null
@@ -1,3 +0,0 @@
-semmle-extractor-options: /nostdlib /noconfig
-semmle-extractor-options: --load-sources-from-project:${testdir}/../../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj
-semmle-extractor-options: ${testdir}/../../../../resources/stubs/System.Web.cs
diff --git a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/ConfigEmpty/Program.cs b/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/ConfigEmpty/Program.cs
deleted file mode 100644
index 4011a7d1a63..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/ConfigEmpty/Program.cs	
+++ /dev/null
@@ -1,31 +0,0 @@
-class Program
-{
-    void CookieDefault()
-    {
-        var cookie = new System.Web.HttpCookie("cookieName"); // BAD: requireSSL is set to false by default
-    }
-
-    void CookieDirectTrue()
-    {
-        var cookie = new System.Web.HttpCookie("cookieName");
-        cookie.Secure = true;  // GOOD
-    }
-
-    void CookieDirectTrueInitializer()
-    {
-        var cookie = new System.Web.HttpCookie("cookieName") { Secure = true }; // GOOD
-    }
-
-    void CookieIntermediateTrue()
-    {
-        var cookie = new System.Web.HttpCookie("cookieName");
-        bool v = true;
-        cookie.Secure = v; // GOOD: should track local data flow
-    }
-
-    void CookieIntermediateTrueInitializer()
-    {
-        bool v = true;
-        var cookie = new System.Web.HttpCookie("cookieName") { Secure = v }; // GOOD: should track local data flow
-    }
-}
diff --git a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/ConfigEmpty/RequireSSL.expected b/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/ConfigEmpty/RequireSSL.expected
deleted file mode 100644
index 6c224aab89d..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/ConfigEmpty/RequireSSL.expected	
+++ /dev/null
@@ -1 +0,0 @@
-| Program.cs:5:22:5:60 | object creation of type HttpCookie | Cookie attribute 'Secure' is not set to true. |
diff --git a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/ConfigEmpty/RequireSSL.qlref b/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/ConfigEmpty/RequireSSL.qlref
deleted file mode 100644
index f76146a862b..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/ConfigEmpty/RequireSSL.qlref	
+++ /dev/null
@@ -1 +0,0 @@
-experimental/Security Features/CWE-614/CookieWithoutSecure.ql
\ No newline at end of file
diff --git a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/ConfigEmpty/options b/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/ConfigEmpty/options
deleted file mode 100644
index 9d05f9bf06d..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/ConfigEmpty/options	
+++ /dev/null
@@ -1,3 +0,0 @@
-semmle-extractor-options: /nostdlib /noconfig
-semmle-extractor-options: --load-sources-from-project:${testdir}/../../../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj
-semmle-extractor-options: ${testdir}/../../../../../resources/stubs/System.Web.cs
diff --git a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/ConfigFalse/Program.cs b/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/ConfigFalse/Program.cs
deleted file mode 100644
index 392366a72d2..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/ConfigFalse/Program.cs	
+++ /dev/null
@@ -1,31 +0,0 @@
-class Program
-{
-    void CookieDefault()
-    {
-        var cookie = new System.Web.HttpCookie("cookieName"); // BAD: requireSSL is set to false in config
-    }
-
-    void CookieDirectTrue()
-    {
-        var cookie = new System.Web.HttpCookie("cookieName");
-        cookie.Secure = true;  // GOOD
-    }
-
-    void CookieDirectTrueInitializer()
-    {
-        var cookie = new System.Web.HttpCookie("cookieName") { Secure = true }; // GOOD
-    }
-
-    void CookieIntermediateTrue()
-    {
-        var cookie = new System.Web.HttpCookie("cookieName");
-        bool v = true;
-        cookie.Secure = v; // GOOD: should track local data flow
-    }
-
-    void CookieIntermediateTrueInitializer()
-    {
-        bool v = true;
-        var cookie = new System.Web.HttpCookie("cookieName") { Secure = v }; // GOOD: should track local data flow
-    }
-}
diff --git a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/ConfigFalse/RequireSSL.expected b/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/ConfigFalse/RequireSSL.expected
deleted file mode 100644
index 6c224aab89d..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/ConfigFalse/RequireSSL.expected	
+++ /dev/null
@@ -1 +0,0 @@
-| Program.cs:5:22:5:60 | object creation of type HttpCookie | Cookie attribute 'Secure' is not set to true. |
diff --git a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/ConfigFalse/RequireSSL.qlref b/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/ConfigFalse/RequireSSL.qlref
deleted file mode 100644
index f76146a862b..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/ConfigFalse/RequireSSL.qlref	
+++ /dev/null
@@ -1 +0,0 @@
-experimental/Security Features/CWE-614/CookieWithoutSecure.ql
\ No newline at end of file
diff --git a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/ConfigFalse/options b/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/ConfigFalse/options
deleted file mode 100644
index 9d05f9bf06d..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/ConfigFalse/options	
+++ /dev/null
@@ -1,3 +0,0 @@
-semmle-extractor-options: /nostdlib /noconfig
-semmle-extractor-options: --load-sources-from-project:${testdir}/../../../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj
-semmle-extractor-options: ${testdir}/../../../../../resources/stubs/System.Web.cs
diff --git a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/FormsTrue/Program.cs b/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/FormsTrue/Program.cs
deleted file mode 100644
index be53a64ae6e..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/FormsTrue/Program.cs	
+++ /dev/null
@@ -1,31 +0,0 @@
-class Program
-{
-    void CookieDefault()
-    {
-        var cookie = new System.Web.HttpCookie("cookieName"); // GOOD: requireSSL is set to true in config
-    }
-
-    void CookieDirectTrue()
-    {
-        var cookie = new System.Web.HttpCookie("cookieName");
-        cookie.Secure = true;  // GOOD
-    }
-
-    void CookieDirectTrueInitializer()
-    {
-        var cookie = new System.Web.HttpCookie("cookieName") { Secure = true }; // GOOD
-    }
-
-    void CookieIntermediateTrue()
-    {
-        var cookie = new System.Web.HttpCookie("cookieName");
-        bool v = true;
-        cookie.Secure = v; // GOOD: should track local data flow
-    }
-
-    void CookieIntermediateTrueInitializer()
-    {
-        bool v = true;
-        var cookie = new System.Web.HttpCookie("cookieName") { Secure = v }; // GOOD: should track local data flow
-    }
-}
diff --git a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/FormsTrue/RequireSSL.qlref b/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/FormsTrue/RequireSSL.qlref
deleted file mode 100644
index f76146a862b..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/FormsTrue/RequireSSL.qlref	
+++ /dev/null
@@ -1 +0,0 @@
-experimental/Security Features/CWE-614/CookieWithoutSecure.ql
\ No newline at end of file
diff --git a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/FormsTrue/options b/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/FormsTrue/options
deleted file mode 100644
index 9d05f9bf06d..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/FormsTrue/options	
+++ /dev/null
@@ -1,3 +0,0 @@
-semmle-extractor-options: /nostdlib /noconfig
-semmle-extractor-options: --load-sources-from-project:${testdir}/../../../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj
-semmle-extractor-options: ${testdir}/../../../../../resources/stubs/System.Web.cs
diff --git a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/HttpCookiesTrue/Program.cs b/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/HttpCookiesTrue/Program.cs
deleted file mode 100644
index be53a64ae6e..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/HttpCookiesTrue/Program.cs	
+++ /dev/null
@@ -1,31 +0,0 @@
-class Program
-{
-    void CookieDefault()
-    {
-        var cookie = new System.Web.HttpCookie("cookieName"); // GOOD: requireSSL is set to true in config
-    }
-
-    void CookieDirectTrue()
-    {
-        var cookie = new System.Web.HttpCookie("cookieName");
-        cookie.Secure = true;  // GOOD
-    }
-
-    void CookieDirectTrueInitializer()
-    {
-        var cookie = new System.Web.HttpCookie("cookieName") { Secure = true }; // GOOD
-    }
-
-    void CookieIntermediateTrue()
-    {
-        var cookie = new System.Web.HttpCookie("cookieName");
-        bool v = true;
-        cookie.Secure = v; // GOOD: should track local data flow
-    }
-
-    void CookieIntermediateTrueInitializer()
-    {
-        bool v = true;
-        var cookie = new System.Web.HttpCookie("cookieName") { Secure = v }; // GOOD: should track local data flow
-    }
-}
diff --git a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/HttpCookiesTrue/RequireSSL.qlref b/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/HttpCookiesTrue/RequireSSL.qlref
deleted file mode 100644
index f76146a862b..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/HttpCookiesTrue/RequireSSL.qlref	
+++ /dev/null
@@ -1 +0,0 @@
-experimental/Security Features/CWE-614/CookieWithoutSecure.ql
\ No newline at end of file
diff --git a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/HttpCookiesTrue/options b/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/HttpCookiesTrue/options
deleted file mode 100644
index 9d05f9bf06d..00000000000
--- a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/HttpCookiesTrue/options	
+++ /dev/null
@@ -1,3 +0,0 @@
-semmle-extractor-options: /nostdlib /noconfig
-semmle-extractor-options: --load-sources-from-project:${testdir}/../../../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj
-semmle-extractor-options: ${testdir}/../../../../../resources/stubs/System.Web.cs
diff --git a/csharp/ql/test/library-tests/assignables/AssignableDefinitionNode.expected b/csharp/ql/test/library-tests/assignables/AssignableDefinitionNode.expected
index 7d1d5bf5af2..a877dc5a99c 100644
--- a/csharp/ql/test/library-tests/assignables/AssignableDefinitionNode.expected
+++ b/csharp/ql/test/library-tests/assignables/AssignableDefinitionNode.expected
@@ -31,7 +31,7 @@
 | Assignables.cs:69:13:69:17 | ... = ... | Assignables.cs:69:13:69:17 | ... = ... |
 | Assignables.cs:78:22:78:22 | String s | Assignables.cs:78:22:78:22 | String s |
 | Assignables.cs:82:21:82:33 | String temp = ... | Assignables.cs:82:21:82:33 | String temp = ... |
-| Assignables.cs:84:30:84:30 | Exception e | Assignables.cs:84:30:84:30 | [exception: OutOfMemoryException] Exception e |
+| Assignables.cs:84:30:84:30 | Exception e | Assignables.cs:84:30:84:30 | Exception e |
 | Assignables.cs:92:9:92:54 | ... = ... | Assignables.cs:92:9:92:54 | ... = ... |
 | Assignables.cs:92:9:92:54 | ... = ... | Assignables.cs:92:9:92:54 | ... = ... |
 | Assignables.cs:92:9:92:54 | ... = ... | Assignables.cs:92:9:92:54 | ... = ... |
@@ -81,7 +81,6 @@
 | Discards.cs:25:22:25:22 | String _ | Discards.cs:25:22:25:22 | String _ |
 | Finally.cs:7:13:7:17 | Int32 i = ... | Finally.cs:7:13:7:17 | Int32 i = ... |
 | Finally.cs:15:13:15:17 | ... = ... | Finally.cs:15:13:15:17 | ... = ... |
-| Finally.cs:15:13:15:17 | ... = ... | Finally.cs:15:13:15:17 | [finally: exception(Exception)] ... = ... |
 | Patterns.cs:7:16:7:23 | Object o = ... | Patterns.cs:7:16:7:23 | Object o = ... |
 | Patterns.cs:8:18:8:23 | Int32 i1 | Patterns.cs:8:18:8:23 | Int32 i1 |
 | Patterns.cs:12:23:12:31 | String s1 | Patterns.cs:12:23:12:31 | String s1 |
diff --git a/csharp/ql/test/library-tests/assignables/Assignables.expected b/csharp/ql/test/library-tests/assignables/Assignables.expected
index 6c11ac4869a..97c22cd9127 100644
--- a/csharp/ql/test/library-tests/assignables/Assignables.expected
+++ b/csharp/ql/test/library-tests/assignables/Assignables.expected
@@ -43,12 +43,6 @@
 | Assignables.cs:92:23:92:23 | b |
 | Assignables.cs:92:33:92:33 | s |
 | Assignables.cs:95:40:95:44 | tuple |
-| Assignables.cs:97:24:97:24 | Item1 |
-| Assignables.cs:97:27:97:36 | Item2 |
-| Assignables.cs:101:6:101:8 | Item1 |
-| Assignables.cs:101:11:101:24 | Item2 |
-| Assignables.cs:101:12:101:15 | Item1 |
-| Assignables.cs:101:18:101:23 | Item2 |
 | Assignables.cs:108:13:108:13 | i |
 | Assignables.cs:109:14:109:14 | p |
 | Assignables.cs:113:25:113:25 | i |
@@ -69,8 +63,6 @@
 | Assignables.cs:132:13:132:13 | x |
 | Assignables.cs:133:29:133:29 | s |
 | Assignables.cs:138:19:138:19 | x |
-| Discards.cs:5:6:5:8 | Item1 |
-| Discards.cs:5:11:5:16 | Item2 |
 | Discards.cs:5:30:5:30 | x |
 | Discards.cs:19:14:19:14 | x |
 | Discards.cs:20:17:20:17 | y |
diff --git a/csharp/ql/test/library-tests/controlflow/graph/BasicBlock.expected b/csharp/ql/test/library-tests/controlflow/graph/BasicBlock.expected
index 6177eb7e335..c9f7d2ab35c 100644
--- a/csharp/ql/test/library-tests/controlflow/graph/BasicBlock.expected
+++ b/csharp/ql/test/library-tests/controlflow/graph/BasicBlock.expected
@@ -20,177 +20,149 @@
 | Assert.cs:5:7:5:17 | enter AssertTests | Assert.cs:5:7:5:17 | exit AssertTests | 5 |
 | Assert.cs:7:10:7:11 | enter M1 | Assert.cs:9:20:9:20 | access to parameter b | 4 |
 | Assert.cs:7:10:7:11 | exit M1 | Assert.cs:7:10:7:11 | exit M1 | 1 |
-| Assert.cs:9:20:9:32 | ... ? ... : ... | Assert.cs:10:22:10:30 | ... != ... | 6 |
+| Assert.cs:7:10:7:11 | exit M1 (abnormal) | Assert.cs:7:10:7:11 | exit M1 (abnormal) | 1 |
+| Assert.cs:9:20:9:32 | ... ? ... : ... | Assert.cs:10:9:10:31 | call to method Assert | 7 |
 | Assert.cs:9:24:9:27 | null | Assert.cs:9:24:9:27 | null | 1 |
 | Assert.cs:9:31:9:32 | "" | Assert.cs:9:31:9:32 | "" | 1 |
-| Assert.cs:10:9:10:31 | [assertion failure] call to method Assert | Assert.cs:7:10:7:11 | exit M1 (abnormal) | 2 |
-| Assert.cs:10:9:10:31 | [assertion success] call to method Assert | Assert.cs:7:10:7:11 | exit M1 (normal) | 6 |
+| Assert.cs:11:9:11:36 | ...; | Assert.cs:7:10:7:11 | exit M1 (normal) | 5 |
 | Assert.cs:14:10:14:11 | enter M2 | Assert.cs:16:20:16:20 | access to parameter b | 4 |
 | Assert.cs:14:10:14:11 | exit M2 | Assert.cs:14:10:14:11 | exit M2 | 1 |
-| Assert.cs:16:20:16:32 | ... ? ... : ... | Assert.cs:17:23:17:23 | access to local variable s | 4 |
+| Assert.cs:14:10:14:11 | exit M2 (abnormal) | Assert.cs:14:10:14:11 | exit M2 (abnormal) | 1 |
+| Assert.cs:16:20:16:32 | ... ? ... : ... | Assert.cs:17:9:17:24 | call to method IsNull | 5 |
 | Assert.cs:16:24:16:27 | null | Assert.cs:16:24:16:27 | null | 1 |
 | Assert.cs:16:31:16:32 | "" | Assert.cs:16:31:16:32 | "" | 1 |
-| Assert.cs:17:9:17:24 | [assertion failure] call to method IsNull | Assert.cs:14:10:14:11 | exit M2 (abnormal) | 2 |
-| Assert.cs:17:9:17:24 | [assertion success] call to method IsNull | Assert.cs:14:10:14:11 | exit M2 (normal) | 6 |
+| Assert.cs:18:9:18:36 | ...; | Assert.cs:14:10:14:11 | exit M2 (normal) | 5 |
 | Assert.cs:21:10:21:11 | enter M3 | Assert.cs:23:20:23:20 | access to parameter b | 4 |
 | Assert.cs:21:10:21:11 | exit M3 | Assert.cs:21:10:21:11 | exit M3 | 1 |
-| Assert.cs:23:20:23:32 | ... ? ... : ... | Assert.cs:24:26:24:26 | access to local variable s | 4 |
+| Assert.cs:21:10:21:11 | exit M3 (abnormal) | Assert.cs:21:10:21:11 | exit M3 (abnormal) | 1 |
+| Assert.cs:23:20:23:32 | ... ? ... : ... | Assert.cs:24:9:24:27 | call to method IsNotNull | 5 |
 | Assert.cs:23:24:23:27 | null | Assert.cs:23:24:23:27 | null | 1 |
 | Assert.cs:23:31:23:32 | "" | Assert.cs:23:31:23:32 | "" | 1 |
-| Assert.cs:24:9:24:27 | [assertion failure] call to method IsNotNull | Assert.cs:21:10:21:11 | exit M3 (abnormal) | 2 |
-| Assert.cs:24:9:24:27 | [assertion success] call to method IsNotNull | Assert.cs:21:10:21:11 | exit M3 (normal) | 6 |
+| Assert.cs:25:9:25:36 | ...; | Assert.cs:21:10:21:11 | exit M3 (normal) | 5 |
 | Assert.cs:28:10:28:11 | enter M4 | Assert.cs:30:20:30:20 | access to parameter b | 4 |
 | Assert.cs:28:10:28:11 | exit M4 | Assert.cs:28:10:28:11 | exit M4 | 1 |
-| Assert.cs:30:20:30:32 | ... ? ... : ... | Assert.cs:31:23:31:31 | ... == ... | 6 |
+| Assert.cs:28:10:28:11 | exit M4 (abnormal) | Assert.cs:28:10:28:11 | exit M4 (abnormal) | 1 |
+| Assert.cs:30:20:30:32 | ... ? ... : ... | Assert.cs:31:9:31:32 | call to method IsTrue | 7 |
 | Assert.cs:30:24:30:27 | null | Assert.cs:30:24:30:27 | null | 1 |
 | Assert.cs:30:31:30:32 | "" | Assert.cs:30:31:30:32 | "" | 1 |
-| Assert.cs:31:9:31:32 | [assertion failure] call to method IsTrue | Assert.cs:28:10:28:11 | exit M4 (abnormal) | 2 |
-| Assert.cs:31:9:31:32 | [assertion success] call to method IsTrue | Assert.cs:28:10:28:11 | exit M4 (normal) | 6 |
+| Assert.cs:32:9:32:36 | ...; | Assert.cs:28:10:28:11 | exit M4 (normal) | 5 |
 | Assert.cs:35:10:35:11 | enter M5 | Assert.cs:37:20:37:20 | access to parameter b | 4 |
 | Assert.cs:35:10:35:11 | exit M5 | Assert.cs:35:10:35:11 | exit M5 | 1 |
-| Assert.cs:37:20:37:32 | ... ? ... : ... | Assert.cs:38:23:38:31 | ... != ... | 6 |
+| Assert.cs:35:10:35:11 | exit M5 (abnormal) | Assert.cs:35:10:35:11 | exit M5 (abnormal) | 1 |
+| Assert.cs:37:20:37:32 | ... ? ... : ... | Assert.cs:38:9:38:32 | call to method IsTrue | 7 |
 | Assert.cs:37:24:37:27 | null | Assert.cs:37:24:37:27 | null | 1 |
 | Assert.cs:37:31:37:32 | "" | Assert.cs:37:31:37:32 | "" | 1 |
-| Assert.cs:38:9:38:32 | [assertion failure] call to method IsTrue | Assert.cs:35:10:35:11 | exit M5 (abnormal) | 2 |
-| Assert.cs:38:9:38:32 | [assertion success] call to method IsTrue | Assert.cs:35:10:35:11 | exit M5 (normal) | 6 |
+| Assert.cs:39:9:39:36 | ...; | Assert.cs:35:10:35:11 | exit M5 (normal) | 5 |
 | Assert.cs:42:10:42:11 | enter M6 | Assert.cs:44:20:44:20 | access to parameter b | 4 |
 | Assert.cs:42:10:42:11 | exit M6 | Assert.cs:42:10:42:11 | exit M6 | 1 |
-| Assert.cs:44:20:44:32 | ... ? ... : ... | Assert.cs:45:24:45:32 | ... != ... | 6 |
+| Assert.cs:42:10:42:11 | exit M6 (abnormal) | Assert.cs:42:10:42:11 | exit M6 (abnormal) | 1 |
+| Assert.cs:44:20:44:32 | ... ? ... : ... | Assert.cs:45:9:45:33 | call to method IsFalse | 7 |
 | Assert.cs:44:24:44:27 | null | Assert.cs:44:24:44:27 | null | 1 |
 | Assert.cs:44:31:44:32 | "" | Assert.cs:44:31:44:32 | "" | 1 |
-| Assert.cs:45:9:45:33 | [assertion failure] call to method IsFalse | Assert.cs:42:10:42:11 | exit M6 (abnormal) | 2 |
-| Assert.cs:45:9:45:33 | [assertion success] call to method IsFalse | Assert.cs:42:10:42:11 | exit M6 (normal) | 6 |
+| Assert.cs:46:9:46:36 | ...; | Assert.cs:42:10:42:11 | exit M6 (normal) | 5 |
 | Assert.cs:49:10:49:11 | enter M7 | Assert.cs:51:20:51:20 | access to parameter b | 4 |
 | Assert.cs:49:10:49:11 | exit M7 | Assert.cs:49:10:49:11 | exit M7 | 1 |
-| Assert.cs:51:20:51:32 | ... ? ... : ... | Assert.cs:52:24:52:32 | ... == ... | 6 |
+| Assert.cs:49:10:49:11 | exit M7 (abnormal) | Assert.cs:49:10:49:11 | exit M7 (abnormal) | 1 |
+| Assert.cs:51:20:51:32 | ... ? ... : ... | Assert.cs:52:9:52:33 | call to method IsFalse | 7 |
 | Assert.cs:51:24:51:27 | null | Assert.cs:51:24:51:27 | null | 1 |
 | Assert.cs:51:31:51:32 | "" | Assert.cs:51:31:51:32 | "" | 1 |
-| Assert.cs:52:9:52:33 | [assertion failure] call to method IsFalse | Assert.cs:49:10:49:11 | exit M7 (abnormal) | 2 |
-| Assert.cs:52:9:52:33 | [assertion success] call to method IsFalse | Assert.cs:49:10:49:11 | exit M7 (normal) | 6 |
+| Assert.cs:53:9:53:36 | ...; | Assert.cs:49:10:49:11 | exit M7 (normal) | 5 |
 | Assert.cs:56:10:56:11 | enter M8 | Assert.cs:58:20:58:20 | access to parameter b | 4 |
 | Assert.cs:56:10:56:11 | exit M8 | Assert.cs:56:10:56:11 | exit M8 | 1 |
-| Assert.cs:58:24:58:27 | [b (line 56): true] null | Assert.cs:59:23:59:31 | [b (line 56): true] ... != ... | 7 |
-| Assert.cs:58:31:58:32 | [b (line 56): false] "" | Assert.cs:59:23:59:31 | [b (line 56): false] ... != ... | 7 |
-| Assert.cs:59:9:59:37 | [assertion failure] call to method IsTrue | Assert.cs:56:10:56:11 | exit M8 (abnormal) | 2 |
-| Assert.cs:59:9:59:37 | [assertion success] call to method IsTrue | Assert.cs:56:10:56:11 | exit M8 (normal) | 6 |
-| Assert.cs:59:23:59:36 | [false] ... && ... | Assert.cs:59:23:59:36 | [false] ... && ... | 1 |
-| Assert.cs:59:23:59:36 | [true] ... && ... | Assert.cs:59:23:59:36 | [true] ... && ... | 1 |
-| Assert.cs:59:36:59:36 | [b (line 56): false] access to parameter b | Assert.cs:59:36:59:36 | [b (line 56): false] access to parameter b | 1 |
-| Assert.cs:59:36:59:36 | [b (line 56): true] access to parameter b | Assert.cs:59:36:59:36 | [b (line 56): true] access to parameter b | 1 |
+| Assert.cs:56:10:56:11 | exit M8 (abnormal) | Assert.cs:56:10:56:11 | exit M8 (abnormal) | 1 |
+| Assert.cs:58:20:58:32 | ... ? ... : ... | Assert.cs:59:23:59:31 | ... != ... | 6 |
+| Assert.cs:58:24:58:27 | null | Assert.cs:58:24:58:27 | null | 1 |
+| Assert.cs:58:31:58:32 | "" | Assert.cs:58:31:58:32 | "" | 1 |
+| Assert.cs:59:23:59:36 | ... && ... | Assert.cs:59:9:59:37 | call to method IsTrue | 2 |
+| Assert.cs:59:36:59:36 | access to parameter b | Assert.cs:59:36:59:36 | access to parameter b | 1 |
+| Assert.cs:60:9:60:36 | ...; | Assert.cs:56:10:56:11 | exit M8 (normal) | 5 |
 | Assert.cs:63:10:63:11 | enter M9 | Assert.cs:65:20:65:20 | access to parameter b | 4 |
 | Assert.cs:63:10:63:11 | exit M9 | Assert.cs:63:10:63:11 | exit M9 | 1 |
-| Assert.cs:65:24:65:27 | [b (line 63): true] null | Assert.cs:66:24:66:32 | [b (line 63): true] ... == ... | 7 |
-| Assert.cs:65:31:65:32 | [b (line 63): false] "" | Assert.cs:66:24:66:32 | [b (line 63): false] ... == ... | 7 |
-| Assert.cs:66:9:66:38 | [assertion failure] call to method IsFalse | Assert.cs:63:10:63:11 | exit M9 (abnormal) | 2 |
-| Assert.cs:66:9:66:38 | [assertion success] call to method IsFalse | Assert.cs:63:10:63:11 | exit M9 (normal) | 6 |
-| Assert.cs:66:24:66:37 | [false] ... \|\| ... | Assert.cs:66:24:66:37 | [false] ... \|\| ... | 1 |
-| Assert.cs:66:24:66:37 | [true] ... \|\| ... | Assert.cs:66:24:66:37 | [true] ... \|\| ... | 1 |
-| Assert.cs:66:37:66:37 | [b (line 63): false] access to parameter b | Assert.cs:66:37:66:37 | [b (line 63): false] access to parameter b | 1 |
-| Assert.cs:66:37:66:37 | [b (line 63): true] access to parameter b | Assert.cs:66:37:66:37 | [b (line 63): true] access to parameter b | 1 |
+| Assert.cs:63:10:63:11 | exit M9 (abnormal) | Assert.cs:63:10:63:11 | exit M9 (abnormal) | 1 |
+| Assert.cs:65:20:65:32 | ... ? ... : ... | Assert.cs:66:24:66:32 | ... == ... | 6 |
+| Assert.cs:65:24:65:27 | null | Assert.cs:65:24:65:27 | null | 1 |
+| Assert.cs:65:31:65:32 | "" | Assert.cs:65:31:65:32 | "" | 1 |
+| Assert.cs:66:24:66:37 | ... \|\| ... | Assert.cs:66:9:66:38 | call to method IsFalse | 2 |
+| Assert.cs:66:37:66:37 | access to parameter b | Assert.cs:66:37:66:37 | access to parameter b | 1 |
+| Assert.cs:67:9:67:36 | ...; | Assert.cs:63:10:63:11 | exit M9 (normal) | 5 |
 | Assert.cs:70:10:70:12 | enter M10 | Assert.cs:72:20:72:20 | access to parameter b | 4 |
 | Assert.cs:70:10:70:12 | exit M10 | Assert.cs:70:10:70:12 | exit M10 | 1 |
-| Assert.cs:72:24:72:27 | [b (line 70): true] null | Assert.cs:73:23:73:31 | [b (line 70): true] ... == ... | 7 |
-| Assert.cs:72:31:72:32 | [b (line 70): false] "" | Assert.cs:73:23:73:31 | [b (line 70): false] ... == ... | 7 |
-| Assert.cs:73:9:73:37 | [assertion failure] call to method IsTrue | Assert.cs:70:10:70:12 | exit M10 (abnormal) | 2 |
-| Assert.cs:73:9:73:37 | [assertion success] call to method IsTrue | Assert.cs:70:10:70:12 | exit M10 (normal) | 6 |
-| Assert.cs:73:23:73:36 | [false] ... && ... | Assert.cs:73:23:73:36 | [false] ... && ... | 1 |
-| Assert.cs:73:23:73:36 | [true] ... && ... | Assert.cs:73:23:73:36 | [true] ... && ... | 1 |
-| Assert.cs:73:36:73:36 | [b (line 70): false] access to parameter b | Assert.cs:73:36:73:36 | [b (line 70): false] access to parameter b | 1 |
-| Assert.cs:73:36:73:36 | [b (line 70): true] access to parameter b | Assert.cs:73:36:73:36 | [b (line 70): true] access to parameter b | 1 |
+| Assert.cs:70:10:70:12 | exit M10 (abnormal) | Assert.cs:70:10:70:12 | exit M10 (abnormal) | 1 |
+| Assert.cs:72:20:72:32 | ... ? ... : ... | Assert.cs:73:23:73:31 | ... == ... | 6 |
+| Assert.cs:72:24:72:27 | null | Assert.cs:72:24:72:27 | null | 1 |
+| Assert.cs:72:31:72:32 | "" | Assert.cs:72:31:72:32 | "" | 1 |
+| Assert.cs:73:23:73:36 | ... && ... | Assert.cs:73:9:73:37 | call to method IsTrue | 2 |
+| Assert.cs:73:36:73:36 | access to parameter b | Assert.cs:73:36:73:36 | access to parameter b | 1 |
+| Assert.cs:74:9:74:36 | ...; | Assert.cs:70:10:70:12 | exit M10 (normal) | 5 |
 | Assert.cs:77:10:77:12 | enter M11 | Assert.cs:79:20:79:20 | access to parameter b | 4 |
 | Assert.cs:77:10:77:12 | exit M11 | Assert.cs:77:10:77:12 | exit M11 | 1 |
-| Assert.cs:79:24:79:27 | [b (line 77): true] null | Assert.cs:80:24:80:32 | [b (line 77): true] ... != ... | 7 |
-| Assert.cs:79:31:79:32 | [b (line 77): false] "" | Assert.cs:80:24:80:32 | [b (line 77): false] ... != ... | 7 |
-| Assert.cs:80:9:80:38 | [assertion failure] call to method IsFalse | Assert.cs:77:10:77:12 | exit M11 (abnormal) | 2 |
-| Assert.cs:80:9:80:38 | [assertion success] call to method IsFalse | Assert.cs:77:10:77:12 | exit M11 (normal) | 6 |
-| Assert.cs:80:24:80:37 | [false] ... \|\| ... | Assert.cs:80:24:80:37 | [false] ... \|\| ... | 1 |
-| Assert.cs:80:24:80:37 | [true] ... \|\| ... | Assert.cs:80:24:80:37 | [true] ... \|\| ... | 1 |
-| Assert.cs:80:37:80:37 | [b (line 77): false] access to parameter b | Assert.cs:80:37:80:37 | [b (line 77): false] access to parameter b | 1 |
-| Assert.cs:80:37:80:37 | [b (line 77): true] access to parameter b | Assert.cs:80:37:80:37 | [b (line 77): true] access to parameter b | 1 |
+| Assert.cs:77:10:77:12 | exit M11 (abnormal) | Assert.cs:77:10:77:12 | exit M11 (abnormal) | 1 |
+| Assert.cs:79:20:79:32 | ... ? ... : ... | Assert.cs:80:24:80:32 | ... != ... | 6 |
+| Assert.cs:79:24:79:27 | null | Assert.cs:79:24:79:27 | null | 1 |
+| Assert.cs:79:31:79:32 | "" | Assert.cs:79:31:79:32 | "" | 1 |
+| Assert.cs:80:24:80:37 | ... \|\| ... | Assert.cs:80:9:80:38 | call to method IsFalse | 2 |
+| Assert.cs:80:37:80:37 | access to parameter b | Assert.cs:80:37:80:37 | access to parameter b | 1 |
+| Assert.cs:81:9:81:36 | ...; | Assert.cs:77:10:77:12 | exit M11 (normal) | 5 |
 | Assert.cs:84:10:84:12 | enter M12 | Assert.cs:86:20:86:20 | access to parameter b | 4 |
 | Assert.cs:84:10:84:12 | exit M12 | Assert.cs:84:10:84:12 | exit M12 | 1 |
 | Assert.cs:84:10:84:12 | exit M12 (abnormal) | Assert.cs:84:10:84:12 | exit M12 (abnormal) | 1 |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:87:22:87:30 | [b (line 84): true] ... != ... | 7 |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:87:22:87:30 | [b (line 84): false] ... != ... | 7 |
-| Assert.cs:87:9:87:31 | [assertion failure, b (line 84): false] call to method Assert | Assert.cs:87:9:87:31 | [assertion failure, b (line 84): false] call to method Assert | 1 |
-| Assert.cs:87:9:87:31 | [assertion failure, b (line 84): true] call to method Assert | Assert.cs:87:9:87:31 | [assertion failure, b (line 84): true] call to method Assert | 1 |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | Assert.cs:90:13:90:13 | [b (line 84): false] access to parameter b | 7 |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:90:13:90:13 | [b (line 84): true] access to parameter b | 7 |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:91:23:91:23 | [b (line 84): true] access to local variable s | 5 |
-| Assert.cs:90:24:90:25 | [b (line 84): false] "" | Assert.cs:91:23:91:23 | [b (line 84): false] access to local variable s | 5 |
-| Assert.cs:91:9:91:24 | [assertion failure, b (line 84): false] call to method IsNull | Assert.cs:91:9:91:24 | [assertion failure, b (line 84): false] call to method IsNull | 1 |
-| Assert.cs:91:9:91:24 | [assertion failure, b (line 84): true] call to method IsNull | Assert.cs:91:9:91:24 | [assertion failure, b (line 84): true] call to method IsNull | 1 |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull | Assert.cs:94:13:94:13 | [b (line 84): false] access to parameter b | 7 |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:94:13:94:13 | [b (line 84): true] access to parameter b | 7 |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:95:26:95:26 | [b (line 84): true] access to local variable s | 5 |
-| Assert.cs:94:24:94:25 | [b (line 84): false] "" | Assert.cs:95:26:95:26 | [b (line 84): false] access to local variable s | 5 |
-| Assert.cs:95:9:95:27 | [assertion failure, b (line 84): false] call to method IsNotNull | Assert.cs:95:9:95:27 | [assertion failure, b (line 84): false] call to method IsNotNull | 1 |
-| Assert.cs:95:9:95:27 | [assertion failure, b (line 84): true] call to method IsNotNull | Assert.cs:95:9:95:27 | [assertion failure, b (line 84): true] call to method IsNotNull | 1 |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull | Assert.cs:98:13:98:13 | [b (line 84): false] access to parameter b | 7 |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:98:13:98:13 | [b (line 84): true] access to parameter b | 7 |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:99:23:99:31 | [b (line 84): true] ... == ... | 7 |
-| Assert.cs:98:24:98:25 | [b (line 84): false] "" | Assert.cs:99:23:99:31 | [b (line 84): false] ... == ... | 7 |
-| Assert.cs:99:9:99:32 | [assertion failure, b (line 84): false] call to method IsTrue | Assert.cs:99:9:99:32 | [assertion failure, b (line 84): false] call to method IsTrue | 1 |
-| Assert.cs:99:9:99:32 | [assertion failure, b (line 84): true] call to method IsTrue | Assert.cs:99:9:99:32 | [assertion failure, b (line 84): true] call to method IsTrue | 1 |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:102:13:102:13 | [b (line 84): false] access to parameter b | 7 |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:102:13:102:13 | [b (line 84): true] access to parameter b | 7 |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:103:23:103:31 | [b (line 84): true] ... != ... | 7 |
-| Assert.cs:102:24:102:25 | [b (line 84): false] "" | Assert.cs:103:23:103:31 | [b (line 84): false] ... != ... | 7 |
-| Assert.cs:103:9:103:32 | [assertion failure, b (line 84): false] call to method IsTrue | Assert.cs:103:9:103:32 | [assertion failure, b (line 84): false] call to method IsTrue | 1 |
-| Assert.cs:103:9:103:32 | [assertion failure, b (line 84): true] call to method IsTrue | Assert.cs:103:9:103:32 | [assertion failure, b (line 84): true] call to method IsTrue | 1 |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:106:13:106:13 | [b (line 84): false] access to parameter b | 7 |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:106:13:106:13 | [b (line 84): true] access to parameter b | 7 |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:107:24:107:32 | [b (line 84): true] ... != ... | 7 |
-| Assert.cs:106:24:106:25 | [b (line 84): false] "" | Assert.cs:107:24:107:32 | [b (line 84): false] ... != ... | 7 |
-| Assert.cs:107:9:107:33 | [assertion failure, b (line 84): false] call to method IsFalse | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): false] call to method IsFalse | 1 |
-| Assert.cs:107:9:107:33 | [assertion failure, b (line 84): true] call to method IsFalse | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): true] call to method IsFalse | 1 |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): false] call to method IsFalse | Assert.cs:110:13:110:13 | [b (line 84): false] access to parameter b | 7 |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:110:13:110:13 | [b (line 84): true] access to parameter b | 7 |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:111:24:111:32 | [b (line 84): true] ... == ... | 7 |
-| Assert.cs:110:24:110:25 | [b (line 84): false] "" | Assert.cs:111:24:111:32 | [b (line 84): false] ... == ... | 7 |
-| Assert.cs:111:9:111:33 | [assertion failure, b (line 84): false] call to method IsFalse | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): false] call to method IsFalse | 1 |
-| Assert.cs:111:9:111:33 | [assertion failure, b (line 84): true] call to method IsFalse | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): true] call to method IsFalse | 1 |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): false] call to method IsFalse | Assert.cs:114:13:114:13 | [b (line 84): false] access to parameter b | 7 |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:114:13:114:13 | [b (line 84): true] access to parameter b | 7 |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:115:23:115:31 | [b (line 84): true] ... != ... | 7 |
-| Assert.cs:114:24:114:25 | [b (line 84): false] "" | Assert.cs:115:23:115:31 | [b (line 84): false] ... != ... | 7 |
-| Assert.cs:115:9:115:37 | [assertion failure, b (line 84): false] call to method IsTrue | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): false] call to method IsTrue | 1 |
-| Assert.cs:115:9:115:37 | [assertion failure, b (line 84): true] call to method IsTrue | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): true] call to method IsTrue | 1 |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:118:13:118:13 | [b (line 84): true] access to parameter b | 7 |
-| Assert.cs:115:23:115:36 | [false, b (line 84): false] ... && ... | Assert.cs:115:23:115:36 | [false, b (line 84): false] ... && ... | 1 |
-| Assert.cs:115:23:115:36 | [false, b (line 84): true] ... && ... | Assert.cs:115:23:115:36 | [false, b (line 84): true] ... && ... | 1 |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | 1 |
-| Assert.cs:115:36:115:36 | [b (line 84): false] access to parameter b | Assert.cs:115:36:115:36 | [b (line 84): false] access to parameter b | 1 |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | 1 |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:119:24:119:32 | [b (line 84): true] ... == ... | 7 |
-| Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse | Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse | 1 |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:122:13:122:13 | [b (line 84): true] access to parameter b | 7 |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | 1 |
-| Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... | Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... | 1 |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | 1 |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | 1 |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:123:23:123:31 | [b (line 84): true] ... == ... | 7 |
-| Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue | 1 |
-| Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:126:13:126:13 | [b (line 84): true] access to parameter b | 7 |
-| Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... | 1 |
-| Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | 1 |
-| Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | 1 |
-| Assert.cs:126:17:126:20 | [b (line 84): true] null | Assert.cs:127:24:127:32 | [b (line 84): true] ... != ... | 7 |
-| Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse | 1 |
-| Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | Assert.cs:84:10:84:12 | exit M12 (normal) | 6 |
-| Assert.cs:127:24:127:38 | [false] ... \|\| ... | Assert.cs:127:24:127:38 | [false] ... \|\| ... | 1 |
-| Assert.cs:127:24:127:38 | [true] ... \|\| ... | Assert.cs:127:24:127:38 | [true] ... \|\| ... | 1 |
-| Assert.cs:127:37:127:38 | [false] !... | Assert.cs:127:37:127:38 | [false] !... | 1 |
-| Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | 1 |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:87:9:87:31 | call to method Assert | 7 |
+| Assert.cs:86:24:86:27 | null | Assert.cs:86:24:86:27 | null | 1 |
+| Assert.cs:86:31:86:32 | "" | Assert.cs:86:31:86:32 | "" | 1 |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:90:13:90:13 | access to parameter b | 6 |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:91:9:91:24 | call to method IsNull | 5 |
+| Assert.cs:90:17:90:20 | null | Assert.cs:90:17:90:20 | null | 1 |
+| Assert.cs:90:24:90:25 | "" | Assert.cs:90:24:90:25 | "" | 1 |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:94:13:94:13 | access to parameter b | 6 |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:95:9:95:27 | call to method IsNotNull | 5 |
+| Assert.cs:94:17:94:20 | null | Assert.cs:94:17:94:20 | null | 1 |
+| Assert.cs:94:24:94:25 | "" | Assert.cs:94:24:94:25 | "" | 1 |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:98:13:98:13 | access to parameter b | 6 |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:99:9:99:32 | call to method IsTrue | 7 |
+| Assert.cs:98:17:98:20 | null | Assert.cs:98:17:98:20 | null | 1 |
+| Assert.cs:98:24:98:25 | "" | Assert.cs:98:24:98:25 | "" | 1 |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:102:13:102:13 | access to parameter b | 6 |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:103:9:103:32 | call to method IsTrue | 7 |
+| Assert.cs:102:17:102:20 | null | Assert.cs:102:17:102:20 | null | 1 |
+| Assert.cs:102:24:102:25 | "" | Assert.cs:102:24:102:25 | "" | 1 |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:106:13:106:13 | access to parameter b | 6 |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:107:9:107:33 | call to method IsFalse | 7 |
+| Assert.cs:106:17:106:20 | null | Assert.cs:106:17:106:20 | null | 1 |
+| Assert.cs:106:24:106:25 | "" | Assert.cs:106:24:106:25 | "" | 1 |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:110:13:110:13 | access to parameter b | 6 |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:111:9:111:33 | call to method IsFalse | 7 |
+| Assert.cs:110:17:110:20 | null | Assert.cs:110:17:110:20 | null | 1 |
+| Assert.cs:110:24:110:25 | "" | Assert.cs:110:24:110:25 | "" | 1 |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:114:13:114:13 | access to parameter b | 6 |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:115:23:115:31 | ... != ... | 6 |
+| Assert.cs:114:17:114:20 | null | Assert.cs:114:17:114:20 | null | 1 |
+| Assert.cs:114:24:114:25 | "" | Assert.cs:114:24:114:25 | "" | 1 |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:115:9:115:37 | call to method IsTrue | 2 |
+| Assert.cs:115:36:115:36 | access to parameter b | Assert.cs:115:36:115:36 | access to parameter b | 1 |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:118:13:118:13 | access to parameter b | 6 |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:119:24:119:32 | ... == ... | 6 |
+| Assert.cs:118:17:118:20 | null | Assert.cs:118:17:118:20 | null | 1 |
+| Assert.cs:118:24:118:25 | "" | Assert.cs:118:24:118:25 | "" | 1 |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:119:9:119:39 | call to method IsFalse | 2 |
+| Assert.cs:119:38:119:38 | access to parameter b | Assert.cs:119:37:119:38 | !... | 2 |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:122:13:122:13 | access to parameter b | 6 |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:123:23:123:31 | ... == ... | 6 |
+| Assert.cs:122:17:122:20 | null | Assert.cs:122:17:122:20 | null | 1 |
+| Assert.cs:122:24:122:25 | "" | Assert.cs:122:24:122:25 | "" | 1 |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:123:9:123:37 | call to method IsTrue | 2 |
+| Assert.cs:123:36:123:36 | access to parameter b | Assert.cs:123:36:123:36 | access to parameter b | 1 |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:126:13:126:13 | access to parameter b | 6 |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:127:24:127:32 | ... != ... | 6 |
+| Assert.cs:126:17:126:20 | null | Assert.cs:126:17:126:20 | null | 1 |
+| Assert.cs:126:24:126:25 | "" | Assert.cs:126:24:126:25 | "" | 1 |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:127:9:127:39 | call to method IsFalse | 2 |
+| Assert.cs:127:38:127:38 | access to parameter b | Assert.cs:127:37:127:38 | !... | 2 |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:84:10:84:12 | exit M12 (normal) | 5 |
 | Assert.cs:131:18:131:32 | enter AssertTrueFalse | Assert.cs:131:18:131:32 | exit AssertTrueFalse | 4 |
-| Assert.cs:138:10:138:12 | enter M13 | Assert.cs:140:25:140:26 | access to parameter b1 | 5 |
+| Assert.cs:138:10:138:12 | enter M13 | Assert.cs:140:9:140:35 | call to method AssertTrueFalse | 8 |
 | Assert.cs:138:10:138:12 | exit M13 | Assert.cs:138:10:138:12 | exit M13 | 1 |
 | Assert.cs:138:10:138:12 | exit M13 (abnormal) | Assert.cs:138:10:138:12 | exit M13 (abnormal) | 1 |
-| Assert.cs:140:29:140:30 | [assertion failure] access to parameter b2 | Assert.cs:140:29:140:30 | [assertion failure] access to parameter b2 | 1 |
-| Assert.cs:140:29:140:30 | access to parameter b2 | Assert.cs:140:29:140:30 | access to parameter b2 | 1 |
-| Assert.cs:140:33:140:34 | [assertion failure] access to parameter b3 | Assert.cs:140:9:140:35 | [assertion failure] call to method AssertTrueFalse | 2 |
-| Assert.cs:140:33:140:34 | [assertion failure] access to parameter b3 | Assert.cs:140:9:140:35 | [assertion failure] call to method AssertTrueFalse | 2 |
-| Assert.cs:140:33:140:34 | [assertion success] access to parameter b3 | Assert.cs:138:10:138:12 | exit M13 (normal) | 4 |
+| Assert.cs:141:9:141:15 | return ...; | Assert.cs:138:10:138:12 | exit M13 (normal) | 2 |
 | Assignments.cs:1:7:1:17 | enter Assignments | Assignments.cs:1:7:1:17 | exit Assignments | 5 |
 | Assignments.cs:3:10:3:10 | enter M | Assignments.cs:3:10:3:10 | exit M | 34 |
 | Assignments.cs:14:18:14:35 | enter (...) => ... | Assignments.cs:14:18:14:35 | exit (...) => ... | 4 |
@@ -206,31 +178,24 @@
 | BreakInTry.cs:20:10:20:11 | enter M2 | BreakInTry.cs:22:29:22:32 | access to parameter args | 3 |
 | BreakInTry.cs:22:9:34:9 | foreach (... ... in ...) ... | BreakInTry.cs:22:9:34:9 | foreach (... ... in ...) ... | 1 |
 | BreakInTry.cs:22:22:22:24 | String arg | BreakInTry.cs:26:21:26:31 | ... == ... | 8 |
-| BreakInTry.cs:27:21:27:26 | break; | BreakInTry.cs:31:21:31:32 | [finally: break] ... == ... | 6 |
+| BreakInTry.cs:27:21:27:26 | break; | BreakInTry.cs:27:21:27:26 | break; | 1 |
 | BreakInTry.cs:30:13:33:13 | {...} | BreakInTry.cs:31:21:31:32 | ... == ... | 5 |
 | BreakInTry.cs:32:21:32:21 | ; | BreakInTry.cs:32:21:32:21 | ; | 1 |
-| BreakInTry.cs:32:21:32:21 | [finally: break] ; | BreakInTry.cs:32:21:32:21 | [finally: break] ; | 1 |
 | BreakInTry.cs:35:7:35:7 | ; | BreakInTry.cs:20:10:20:11 | exit M2 | 3 |
 | BreakInTry.cs:38:10:38:11 | enter M3 | BreakInTry.cs:42:17:42:28 | ... == ... | 8 |
 | BreakInTry.cs:38:10:38:11 | exit M3 (normal) | BreakInTry.cs:38:10:38:11 | exit M3 | 2 |
-| BreakInTry.cs:43:17:43:23 | return ...; | BreakInTry.cs:47:33:47:36 | [finally: return] access to parameter args | 3 |
+| BreakInTry.cs:43:17:43:23 | return ...; | BreakInTry.cs:43:17:43:23 | return ...; | 1 |
 | BreakInTry.cs:46:9:52:9 | {...} | BreakInTry.cs:47:33:47:36 | access to parameter args | 2 |
-| BreakInTry.cs:47:13:51:13 | [finally: return] foreach (... ... in ...) ... | BreakInTry.cs:47:13:51:13 | [finally: return] foreach (... ... in ...) ... | 1 |
 | BreakInTry.cs:47:13:51:13 | foreach (... ... in ...) ... | BreakInTry.cs:47:13:51:13 | foreach (... ... in ...) ... | 1 |
 | BreakInTry.cs:47:26:47:28 | String arg | BreakInTry.cs:49:21:49:31 | ... == ... | 6 |
-| BreakInTry.cs:47:26:47:28 | [finally: return] String arg | BreakInTry.cs:49:21:49:31 | [finally: return] ... == ... | 6 |
-| BreakInTry.cs:50:21:50:26 | [finally: return] break; | BreakInTry.cs:50:21:50:26 | [finally: return] break; | 1 |
 | BreakInTry.cs:50:21:50:26 | break; | BreakInTry.cs:50:21:50:26 | break; | 1 |
 | BreakInTry.cs:53:7:53:7 | ; | BreakInTry.cs:53:7:53:7 | ; | 1 |
 | BreakInTry.cs:56:10:56:11 | enter M4 | BreakInTry.cs:60:17:60:28 | ... == ... | 8 |
 | BreakInTry.cs:56:10:56:11 | exit M4 (normal) | BreakInTry.cs:56:10:56:11 | exit M4 | 2 |
-| BreakInTry.cs:61:17:61:23 | return ...; | BreakInTry.cs:65:33:65:36 | [finally: return] access to parameter args | 3 |
+| BreakInTry.cs:61:17:61:23 | return ...; | BreakInTry.cs:61:17:61:23 | return ...; | 1 |
 | BreakInTry.cs:64:9:70:9 | {...} | BreakInTry.cs:65:33:65:36 | access to parameter args | 2 |
-| BreakInTry.cs:65:13:69:13 | [finally: return] foreach (... ... in ...) ... | BreakInTry.cs:65:13:69:13 | [finally: return] foreach (... ... in ...) ... | 1 |
 | BreakInTry.cs:65:13:69:13 | foreach (... ... in ...) ... | BreakInTry.cs:65:13:69:13 | foreach (... ... in ...) ... | 1 |
 | BreakInTry.cs:65:26:65:28 | String arg | BreakInTry.cs:67:21:67:31 | ... == ... | 6 |
-| BreakInTry.cs:65:26:65:28 | [finally: return] String arg | BreakInTry.cs:67:21:67:31 | [finally: return] ... == ... | 6 |
-| BreakInTry.cs:68:21:68:26 | [finally: return] break; | BreakInTry.cs:68:21:68:26 | [finally: return] break; | 1 |
 | BreakInTry.cs:68:21:68:26 | break; | BreakInTry.cs:68:21:68:26 | break; | 1 |
 | CompileTimeOperators.cs:3:7:3:26 | enter CompileTimeOperators | CompileTimeOperators.cs:3:7:3:26 | exit CompileTimeOperators | 5 |
 | CompileTimeOperators.cs:5:9:5:15 | enter Default | CompileTimeOperators.cs:5:9:5:15 | exit Default | 6 |
@@ -238,7 +203,11 @@
 | CompileTimeOperators.cs:15:10:15:15 | enter Typeof | CompileTimeOperators.cs:15:10:15:15 | exit Typeof | 6 |
 | CompileTimeOperators.cs:20:12:20:17 | enter Nameof | CompileTimeOperators.cs:20:12:20:17 | exit Nameof | 6 |
 | CompileTimeOperators.cs:26:7:26:22 | enter GotoInTryFinally | CompileTimeOperators.cs:26:7:26:22 | exit GotoInTryFinally | 5 |
-| CompileTimeOperators.cs:28:10:28:10 | enter M | CompileTimeOperators.cs:28:10:28:10 | exit M | 15 |
+| CompileTimeOperators.cs:28:10:28:10 | enter M | CompileTimeOperators.cs:37:13:37:40 | call to method WriteLine | 9 |
+| CompileTimeOperators.cs:28:10:28:10 | exit M | CompileTimeOperators.cs:28:10:28:10 | exit M | 1 |
+| CompileTimeOperators.cs:28:10:28:10 | exit M (abnormal) | CompileTimeOperators.cs:28:10:28:10 | exit M (abnormal) | 1 |
+| CompileTimeOperators.cs:39:9:39:34 | ...; | CompileTimeOperators.cs:39:9:39:33 | call to method WriteLine | 3 |
+| CompileTimeOperators.cs:40:9:40:11 | End: | CompileTimeOperators.cs:28:10:28:10 | exit M (normal) | 5 |
 | ConditionalAccess.cs:1:7:1:23 | enter ConditionalAccess | ConditionalAccess.cs:1:7:1:23 | exit ConditionalAccess | 5 |
 | ConditionalAccess.cs:3:12:3:13 | enter M1 | ConditionalAccess.cs:3:26:3:26 | access to parameter i | 2 |
 | ConditionalAccess.cs:3:12:3:13 | exit M1 (normal) | ConditionalAccess.cs:3:12:3:13 | exit M1 | 2 |
@@ -279,49 +248,41 @@
 | Conditions.cs:1:7:1:16 | enter Conditions | Conditions.cs:1:7:1:16 | exit Conditions | 5 |
 | Conditions.cs:3:10:3:19 | enter IncrOrDecr | Conditions.cs:5:13:5:15 | access to parameter inc | 4 |
 | Conditions.cs:3:10:3:19 | exit IncrOrDecr (normal) | Conditions.cs:3:10:3:19 | exit IncrOrDecr | 2 |
-| Conditions.cs:6:13:6:16 | [inc (line 3): true] ...; | Conditions.cs:7:14:7:16 | [inc (line 3): true] access to parameter inc | 5 |
-| Conditions.cs:7:9:8:16 | [inc (line 3): false] if (...) ... | Conditions.cs:7:14:7:16 | [inc (line 3): false] access to parameter inc | 2 |
+| Conditions.cs:6:13:6:16 | ...; | Conditions.cs:6:13:6:15 | ...++ | 3 |
+| Conditions.cs:7:9:8:16 | if (...) ... | Conditions.cs:7:14:7:16 | access to parameter inc | 2 |
 | Conditions.cs:7:13:7:16 | [false] !... | Conditions.cs:7:13:7:16 | [false] !... | 1 |
 | Conditions.cs:7:13:7:16 | [true] !... | Conditions.cs:7:13:7:16 | [true] !... | 1 |
 | Conditions.cs:8:13:8:16 | ...; | Conditions.cs:8:13:8:15 | ...-- | 3 |
 | Conditions.cs:11:9:11:10 | enter M1 | Conditions.cs:14:13:14:13 | access to parameter b | 7 |
-| Conditions.cs:15:13:15:16 | [b (line 11): true] ...; | Conditions.cs:16:13:16:17 | [b (line 11): true] ... > ... | 7 |
-| Conditions.cs:16:9:18:20 | [b (line 11): false] if (...) ... | Conditions.cs:16:13:16:17 | [b (line 11): false] ... > ... | 4 |
-| Conditions.cs:17:13:18:20 | [b (line 11): false] if (...) ... | Conditions.cs:17:18:17:18 | [b (line 11): false] access to parameter b | 2 |
-| Conditions.cs:17:13:18:20 | [b (line 11): true] if (...) ... | Conditions.cs:17:18:17:18 | [b (line 11): true] access to parameter b | 2 |
+| Conditions.cs:15:13:15:16 | ...; | Conditions.cs:15:13:15:15 | ...++ | 3 |
+| Conditions.cs:16:9:18:20 | if (...) ... | Conditions.cs:16:13:16:17 | ... > ... | 4 |
+| Conditions.cs:17:13:18:20 | if (...) ... | Conditions.cs:17:18:17:18 | access to parameter b | 2 |
 | Conditions.cs:17:17:17:18 | [false] !... | Conditions.cs:17:17:17:18 | [false] !... | 1 |
 | Conditions.cs:17:17:17:18 | [true] !... | Conditions.cs:17:17:17:18 | [true] !... | 1 |
 | Conditions.cs:18:17:18:20 | ...; | Conditions.cs:18:17:18:19 | ...-- | 3 |
 | Conditions.cs:19:16:19:16 | access to local variable x | Conditions.cs:11:9:11:10 | exit M1 | 4 |
 | Conditions.cs:22:9:22:10 | enter M2 | Conditions.cs:25:13:25:14 | access to parameter b1 | 7 |
 | Conditions.cs:26:13:27:20 | if (...) ... | Conditions.cs:26:17:26:18 | access to parameter b2 | 2 |
-| Conditions.cs:27:17:27:20 | [b2 (line 22): true] ...; | Conditions.cs:28:13:28:14 | [b2 (line 22): true] access to parameter b2 | 5 |
-| Conditions.cs:28:9:29:16 | [b2 (line 22): false] if (...) ... | Conditions.cs:28:13:28:14 | [b2 (line 22): false] access to parameter b2 | 2 |
+| Conditions.cs:27:17:27:20 | ...; | Conditions.cs:27:17:27:19 | ...++ | 3 |
 | Conditions.cs:28:9:29:16 | if (...) ... | Conditions.cs:28:13:28:14 | access to parameter b2 | 2 |
 | Conditions.cs:29:13:29:16 | ...; | Conditions.cs:29:13:29:15 | ...++ | 3 |
 | Conditions.cs:30:16:30:16 | access to local variable x | Conditions.cs:22:9:22:10 | exit M2 | 4 |
 | Conditions.cs:33:9:33:10 | enter M3 | Conditions.cs:37:13:37:14 | access to parameter b1 | 10 |
 | Conditions.cs:38:13:38:20 | ...; | Conditions.cs:38:13:38:19 | ... = ... | 3 |
 | Conditions.cs:39:9:40:16 | if (...) ... | Conditions.cs:39:13:39:14 | access to local variable b2 | 2 |
-| Conditions.cs:40:13:40:16 | [b2 (line 39): true] ...; | Conditions.cs:41:13:41:14 | [b2 (line 39): true] access to local variable b2 | 5 |
-| Conditions.cs:41:9:42:16 | [b2 (line 39): false] if (...) ... | Conditions.cs:41:13:41:14 | [b2 (line 39): false] access to local variable b2 | 2 |
+| Conditions.cs:40:13:40:16 | ...; | Conditions.cs:40:13:40:15 | ...++ | 3 |
+| Conditions.cs:41:9:42:16 | if (...) ... | Conditions.cs:41:13:41:14 | access to local variable b2 | 2 |
 | Conditions.cs:42:13:42:16 | ...; | Conditions.cs:42:13:42:15 | ...++ | 3 |
 | Conditions.cs:43:16:43:16 | access to local variable x | Conditions.cs:33:9:33:10 | exit M3 | 4 |
-| Conditions.cs:46:9:46:10 | enter M4 | Conditions.cs:49:16:49:22 | ... > ... | 10 |
-| Conditions.cs:49:16:49:16 | [b (line 46): false] access to parameter x | Conditions.cs:49:16:49:22 | [b (line 46): false] ... > ... | 4 |
-| Conditions.cs:50:9:53:9 | [b (line 46): false] {...} | Conditions.cs:51:17:51:17 | [b (line 46): false] access to parameter b | 3 |
-| Conditions.cs:50:9:53:9 | [b (line 46): true] {...} | Conditions.cs:51:17:51:17 | [b (line 46): true] access to parameter b | 3 |
+| Conditions.cs:46:9:46:10 | enter M4 | Conditions.cs:49:9:53:9 | while (...) ... | 6 |
+| Conditions.cs:49:16:49:16 | access to parameter x | Conditions.cs:49:16:49:22 | ... > ... | 4 |
 | Conditions.cs:50:9:53:9 | {...} | Conditions.cs:51:17:51:17 | access to parameter b | 3 |
-| Conditions.cs:52:17:52:20 | [b (line 46): true] ...; | Conditions.cs:49:16:49:22 | [b (line 46): true] ... > ... | 7 |
+| Conditions.cs:52:17:52:20 | ...; | Conditions.cs:52:17:52:19 | ...++ | 3 |
 | Conditions.cs:54:16:54:16 | access to local variable y | Conditions.cs:46:9:46:10 | exit M4 | 4 |
-| Conditions.cs:57:9:57:10 | enter M5 | Conditions.cs:60:16:60:22 | ... > ... | 10 |
-| Conditions.cs:60:16:60:16 | [b (line 57): false] access to parameter x | Conditions.cs:60:16:60:22 | [b (line 57): false] ... > ... | 4 |
-| Conditions.cs:61:9:64:9 | [b (line 57): false] {...} | Conditions.cs:62:17:62:17 | [b (line 57): false] access to parameter b | 3 |
-| Conditions.cs:61:9:64:9 | [b (line 57): true] {...} | Conditions.cs:62:17:62:17 | [b (line 57): true] access to parameter b | 3 |
+| Conditions.cs:57:9:57:10 | enter M5 | Conditions.cs:60:9:64:9 | while (...) ... | 6 |
+| Conditions.cs:60:16:60:16 | access to parameter x | Conditions.cs:60:16:60:22 | ... > ... | 4 |
 | Conditions.cs:61:9:64:9 | {...} | Conditions.cs:62:17:62:17 | access to parameter b | 3 |
-| Conditions.cs:63:17:63:20 | [b (line 57): true] ...; | Conditions.cs:60:16:60:22 | [b (line 57): true] ... > ... | 7 |
-| Conditions.cs:65:9:66:16 | [b (line 57): false] if (...) ... | Conditions.cs:65:13:65:13 | [b (line 57): false] access to parameter b | 2 |
-| Conditions.cs:65:9:66:16 | [b (line 57): true] if (...) ... | Conditions.cs:65:13:65:13 | [b (line 57): true] access to parameter b | 2 |
+| Conditions.cs:63:17:63:20 | ...; | Conditions.cs:63:17:63:19 | ...++ | 3 |
 | Conditions.cs:65:9:66:16 | if (...) ... | Conditions.cs:65:13:65:13 | access to parameter b | 2 |
 | Conditions.cs:66:13:66:16 | ...; | Conditions.cs:66:13:66:15 | ...++ | 3 |
 | Conditions.cs:67:16:67:16 | access to local variable y | Conditions.cs:57:9:57:10 | exit M5 | 4 |
@@ -344,10 +305,9 @@
 | Conditions.cs:97:17:97:20 | ...; | Conditions.cs:97:17:97:19 | ...++ | 3 |
 | Conditions.cs:99:16:99:16 | access to local variable x | Conditions.cs:86:9:86:10 | exit M7 | 4 |
 | Conditions.cs:102:12:102:13 | enter M8 | Conditions.cs:105:13:105:13 | access to parameter b | 8 |
-| Conditions.cs:106:13:106:20 | [b (line 102): true] ...; | Conditions.cs:107:13:107:24 | [b (line 102): true] ... > ... | 10 |
-| Conditions.cs:107:9:109:24 | [b (line 102): false] if (...) ... | Conditions.cs:107:13:107:24 | [b (line 102): false] ... > ... | 5 |
-| Conditions.cs:108:13:109:24 | [b (line 102): false] if (...) ... | Conditions.cs:108:18:108:18 | [b (line 102): false] access to parameter b | 2 |
-| Conditions.cs:108:13:109:24 | [b (line 102): true] if (...) ... | Conditions.cs:108:18:108:18 | [b (line 102): true] access to parameter b | 2 |
+| Conditions.cs:106:13:106:20 | ...; | Conditions.cs:106:13:106:19 | ... = ... | 5 |
+| Conditions.cs:107:9:109:24 | if (...) ... | Conditions.cs:107:13:107:24 | ... > ... | 5 |
+| Conditions.cs:108:13:109:24 | if (...) ... | Conditions.cs:108:18:108:18 | access to parameter b | 2 |
 | Conditions.cs:108:17:108:18 | [false] !... | Conditions.cs:108:17:108:18 | [false] !... | 1 |
 | Conditions.cs:108:17:108:18 | [true] !... | Conditions.cs:108:17:108:18 | [true] !... | 1 |
 | Conditions.cs:109:17:109:24 | ...; | Conditions.cs:109:17:109:23 | ... = ... | 5 |
@@ -357,26 +317,21 @@
 | Conditions.cs:116:25:116:25 | access to local variable i | Conditions.cs:116:25:116:39 | ... < ... | 4 |
 | Conditions.cs:116:42:116:42 | access to local variable i | Conditions.cs:116:42:116:44 | ...++ | 2 |
 | Conditions.cs:117:9:123:9 | {...} | Conditions.cs:119:18:119:21 | access to local variable last | 11 |
-| Conditions.cs:119:17:119:21 | [false, last (line 118): true] !... | Conditions.cs:119:17:119:21 | [false, last (line 118): true] !... | 1 |
-| Conditions.cs:119:17:119:21 | [true, last (line 118): false] !... | Conditions.cs:119:17:119:21 | [true, last (line 118): false] !... | 1 |
-| Conditions.cs:120:17:120:23 | [last (line 118): false] ...; | Conditions.cs:121:17:121:20 | [last (line 118): false] access to local variable last | 5 |
-| Conditions.cs:121:13:122:25 | [last (line 118): true] if (...) ... | Conditions.cs:121:17:121:20 | [last (line 118): true] access to local variable last | 2 |
+| Conditions.cs:119:17:119:21 | [false] !... | Conditions.cs:119:17:119:21 | [false] !... | 1 |
+| Conditions.cs:119:17:119:21 | [true] !... | Conditions.cs:119:17:119:21 | [true] !... | 1 |
+| Conditions.cs:120:17:120:23 | ...; | Conditions.cs:120:17:120:22 | ... = ... | 3 |
+| Conditions.cs:121:13:122:25 | if (...) ... | Conditions.cs:121:17:121:20 | access to local variable last | 2 |
 | Conditions.cs:122:17:122:25 | ...; | Conditions.cs:122:17:122:24 | ... = ... | 3 |
-| Conditions.cs:129:10:129:12 | enter M10 | Conditions.cs:131:16:131:19 | true | 4 |
-| Conditions.cs:131:16:131:19 | [Field1 (line 129): false] true | Conditions.cs:131:16:131:19 | [Field1 (line 129): false] true | 1 |
-| Conditions.cs:131:16:131:19 | [Field1 (line 129): true, Field2 (line 129): false] true | Conditions.cs:131:16:131:19 | [Field1 (line 129): true, Field2 (line 129): false] true | 1 |
-| Conditions.cs:132:9:140:9 | [Field1 (line 129): false] {...} | Conditions.cs:133:17:133:22 | [Field1 (line 129): false] access to field Field1 | 4 |
-| Conditions.cs:132:9:140:9 | [Field1 (line 129): true, Field2 (line 129): false] {...} | Conditions.cs:133:17:133:22 | [Field1 (line 129): true, Field2 (line 129): false] access to field Field1 | 4 |
-| Conditions.cs:132:9:140:9 | [Field1 (line 129): true, Field2 (line 129): true] {...} | Conditions.cs:133:17:133:22 | [Field1 (line 129): true, Field2 (line 129): true] access to field Field1 | 4 |
+| Conditions.cs:129:10:129:12 | enter M10 | Conditions.cs:131:9:140:9 | while (...) ... | 3 |
+| Conditions.cs:131:16:131:19 | true | Conditions.cs:131:16:131:19 | true | 1 |
 | Conditions.cs:132:9:140:9 | {...} | Conditions.cs:133:17:133:22 | access to field Field1 | 4 |
-| Conditions.cs:134:13:139:13 | [Field1 (line 129): true, Field2 (line 129): false] {...} | Conditions.cs:135:21:135:26 | [Field1 (line 129): true, Field2 (line 129): false] access to field Field2 | 4 |
-| Conditions.cs:134:13:139:13 | [Field1 (line 129): true, Field2 (line 129): true] {...} | Conditions.cs:135:21:135:26 | [Field1 (line 129): true, Field2 (line 129): true] access to field Field2 | 4 |
-| Conditions.cs:134:13:139:13 | [Field1 (line 129): true] {...} | Conditions.cs:135:21:135:26 | [Field1 (line 129): true] access to field Field2 | 4 |
-| Conditions.cs:136:17:138:17 | [Field1 (line 129): true, Field2 (line 129): true] {...} | Conditions.cs:131:16:131:19 | [Field1 (line 129): true, Field2 (line 129): true] true | 6 |
+| Conditions.cs:134:13:139:13 | {...} | Conditions.cs:135:21:135:26 | access to field Field2 | 4 |
+| Conditions.cs:136:17:138:17 | {...} | Conditions.cs:137:21:137:37 | call to method ToString | 5 |
 | Conditions.cs:143:10:143:12 | enter M11 | Conditions.cs:145:17:145:17 | access to parameter b | 4 |
 | Conditions.cs:143:10:143:12 | exit M11 (normal) | Conditions.cs:143:10:143:12 | exit M11 | 2 |
-| Conditions.cs:145:21:145:23 | [b (line 143): true] "a" | Conditions.cs:146:13:146:13 | [b (line 143): true] access to parameter b | 5 |
-| Conditions.cs:145:27:145:29 | [b (line 143): false] "b" | Conditions.cs:146:13:146:13 | [b (line 143): false] access to parameter b | 5 |
+| Conditions.cs:145:17:145:29 | ... ? ... : ... | Conditions.cs:146:13:146:13 | access to parameter b | 4 |
+| Conditions.cs:145:21:145:23 | "a" | Conditions.cs:145:21:145:23 | "a" | 1 |
+| Conditions.cs:145:27:145:29 | "b" | Conditions.cs:145:27:145:29 | "b" | 1 |
 | Conditions.cs:147:13:147:49 | ...; | Conditions.cs:147:13:147:48 | call to method WriteLine | 6 |
 | Conditions.cs:149:13:149:49 | ...; | Conditions.cs:149:13:149:48 | call to method WriteLine | 6 |
 | ExitMethods.cs:6:7:6:17 | enter ExitMethods | ExitMethods.cs:6:7:6:17 | exit ExitMethods | 5 |
@@ -385,12 +340,10 @@
 | ExitMethods.cs:20:10:20:11 | enter M3 | ExitMethods.cs:20:10:20:11 | exit M3 | 7 |
 | ExitMethods.cs:26:10:26:11 | enter M4 | ExitMethods.cs:26:10:26:11 | exit M4 | 7 |
 | ExitMethods.cs:32:10:32:11 | enter M5 | ExitMethods.cs:32:10:32:11 | exit M5 | 7 |
-| ExitMethods.cs:38:10:38:11 | enter M6 | ExitMethods.cs:42:13:42:30 | call to method ErrorAlways | 7 |
+| ExitMethods.cs:38:10:38:11 | enter M6 | ExitMethods.cs:44:9:47:9 | catch (...) {...} | 8 |
 | ExitMethods.cs:38:10:38:11 | exit M6 (normal) | ExitMethods.cs:38:10:38:11 | exit M6 | 2 |
-| ExitMethods.cs:44:9:47:9 | [exception: ArgumentException] catch (...) {...} | ExitMethods.cs:44:9:47:9 | [exception: ArgumentException] catch (...) {...} | 1 |
-| ExitMethods.cs:44:9:47:9 | [exception: Exception] catch (...) {...} | ExitMethods.cs:44:9:47:9 | [exception: Exception] catch (...) {...} | 1 |
 | ExitMethods.cs:45:9:47:9 | {...} | ExitMethods.cs:46:13:46:19 | return ...; | 2 |
-| ExitMethods.cs:48:9:51:9 | [exception: Exception] catch (...) {...} | ExitMethods.cs:48:9:51:9 | [exception: Exception] catch (...) {...} | 1 |
+| ExitMethods.cs:48:9:51:9 | catch (...) {...} | ExitMethods.cs:48:9:51:9 | catch (...) {...} | 1 |
 | ExitMethods.cs:49:9:51:9 | {...} | ExitMethods.cs:50:13:50:19 | return ...; | 2 |
 | ExitMethods.cs:54:10:54:11 | enter M7 | ExitMethods.cs:54:10:54:11 | exit M7 | 6 |
 | ExitMethods.cs:60:10:60:11 | enter M8 | ExitMethods.cs:60:10:60:11 | exit M8 | 6 |
@@ -415,15 +368,13 @@
 | ExitMethods.cs:117:16:117:38 | ... ? ... : ... | ExitMethods.cs:115:16:115:34 | exit ExtensionMethodCall | 4 |
 | ExitMethods.cs:117:34:117:34 | 0 | ExitMethods.cs:117:34:117:34 | 0 | 1 |
 | ExitMethods.cs:117:38:117:38 | 1 | ExitMethods.cs:117:38:117:38 | 1 | 1 |
-| ExitMethods.cs:120:17:120:32 | enter FailingAssertion | ExitMethods.cs:122:23:122:27 | false | 4 |
-| ExitMethods.cs:122:9:122:28 | [assertion failure] call to method IsTrue | ExitMethods.cs:120:17:120:32 | exit FailingAssertion | 3 |
+| ExitMethods.cs:120:17:120:32 | enter FailingAssertion | ExitMethods.cs:120:17:120:32 | exit FailingAssertion | 7 |
 | ExitMethods.cs:126:17:126:33 | enter FailingAssertion2 | ExitMethods.cs:126:17:126:33 | exit FailingAssertion2 | 7 |
-| ExitMethods.cs:132:10:132:20 | enter AssertFalse | ExitMethods.cs:132:48:132:48 | access to parameter b | 2 |
+| ExitMethods.cs:132:10:132:20 | enter AssertFalse | ExitMethods.cs:132:33:132:49 | call to method IsFalse | 3 |
 | ExitMethods.cs:132:10:132:20 | exit AssertFalse | ExitMethods.cs:132:10:132:20 | exit AssertFalse | 1 |
-| ExitMethods.cs:132:33:132:49 | [assertion failure] call to method IsFalse | ExitMethods.cs:132:10:132:20 | exit AssertFalse (abnormal) | 2 |
-| ExitMethods.cs:132:33:132:49 | [assertion success] call to method IsFalse | ExitMethods.cs:132:10:132:20 | exit AssertFalse (normal) | 2 |
-| ExitMethods.cs:134:17:134:33 | enter FailingAssertion3 | ExitMethods.cs:136:21:136:24 | true | 5 |
-| ExitMethods.cs:136:9:136:25 | [assertion failure] call to method AssertFalse | ExitMethods.cs:134:17:134:33 | exit FailingAssertion3 | 3 |
+| ExitMethods.cs:132:10:132:20 | exit AssertFalse (abnormal) | ExitMethods.cs:132:10:132:20 | exit AssertFalse (abnormal) | 1 |
+| ExitMethods.cs:132:10:132:20 | exit AssertFalse (normal) | ExitMethods.cs:132:10:132:20 | exit AssertFalse (normal) | 1 |
+| ExitMethods.cs:134:17:134:33 | enter FailingAssertion3 | ExitMethods.cs:134:17:134:33 | exit FailingAssertion3 | 8 |
 | ExitMethods.cs:140:17:140:42 | enter ExceptionDispatchInfoThrow | ExitMethods.cs:142:13:142:13 | access to parameter b | 4 |
 | ExitMethods.cs:140:17:140:42 | exit ExceptionDispatchInfoThrow (abnormal) | ExitMethods.cs:140:17:140:42 | exit ExceptionDispatchInfoThrow | 2 |
 | ExitMethods.cs:143:13:143:43 | ...; | ExitMethods.cs:143:13:143:42 | call to method Throw | 3 |
@@ -433,62 +384,51 @@
 | Extensions.cs:15:23:15:33 | enter CallToInt32 | Extensions.cs:15:23:15:33 | exit CallToInt32 | 5 |
 | Extensions.cs:20:17:20:20 | enter Main | Extensions.cs:20:17:20:20 | exit Main | 20 |
 | Finally.cs:3:14:3:20 | enter Finally | Finally.cs:3:14:3:20 | exit Finally | 5 |
-| Finally.cs:7:10:7:11 | enter M1 | Finally.cs:11:13:11:37 | call to method WriteLine | 7 |
+| Finally.cs:7:10:7:11 | enter M1 | Finally.cs:15:13:15:40 | call to method WriteLine | 11 |
 | Finally.cs:7:10:7:11 | exit M1 | Finally.cs:7:10:7:11 | exit M1 | 1 |
-| Finally.cs:14:9:16:9 | [finally: exception(Exception)] {...} | Finally.cs:7:10:7:11 | exit M1 (abnormal) | 5 |
-| Finally.cs:14:9:16:9 | {...} | Finally.cs:7:10:7:11 | exit M1 (normal) | 5 |
+| Finally.cs:7:10:7:11 | exit M1 (abnormal) | Finally.cs:7:10:7:11 | exit M1 (abnormal) | 1 |
+| Finally.cs:7:10:7:11 | exit M1 (normal) | Finally.cs:7:10:7:11 | exit M1 (normal) | 1 |
 | Finally.cs:19:10:19:11 | enter M2 | Finally.cs:23:13:23:37 | call to method WriteLine | 7 |
 | Finally.cs:19:10:19:11 | exit M2 | Finally.cs:19:10:19:11 | exit M2 | 1 |
 | Finally.cs:19:10:19:11 | exit M2 (abnormal) | Finally.cs:19:10:19:11 | exit M2 (abnormal) | 1 |
 | Finally.cs:19:10:19:11 | exit M2 (normal) | Finally.cs:19:10:19:11 | exit M2 (normal) | 1 |
-| Finally.cs:24:13:24:19 | return ...; | Finally.cs:50:13:50:40 | [finally: return] call to method WriteLine | 5 |
-| Finally.cs:26:9:29:9 | [exception: Exception] catch (...) {...} | Finally.cs:26:9:29:9 | [exception: Exception] catch (...) {...} | 1 |
-| Finally.cs:26:38:26:39 | [exception: Exception] IOException ex | Finally.cs:26:48:26:51 | [exception: Exception] true | 2 |
-| Finally.cs:27:9:29:9 | {...} | Finally.cs:50:13:50:40 | [finally: exception(IOException)] call to method WriteLine | 6 |
-| Finally.cs:30:9:40:9 | [exception: Exception] catch (...) {...} | Finally.cs:30:9:40:9 | [exception: Exception] catch (...) {...} | 1 |
-| Finally.cs:30:41:30:42 | [exception: Exception] ArgumentException ex | Finally.cs:34:21:34:24 | true | 6 |
-| Finally.cs:34:27:34:32 | throw ...; | Finally.cs:50:13:50:40 | [finally: exception(Exception)] call to method WriteLine | 9 |
-| Finally.cs:41:9:43:9 | [exception: Exception] catch (...) {...} | Finally.cs:41:9:43:9 | [exception: Exception] catch (...) {...} | 1 |
-| Finally.cs:42:9:43:9 | {...} | Finally.cs:50:13:50:40 | call to method WriteLine | 5 |
+| Finally.cs:24:13:24:19 | return ...; | Finally.cs:24:13:24:19 | return ...; | 1 |
+| Finally.cs:26:9:29:9 | catch (...) {...} | Finally.cs:26:9:29:9 | catch (...) {...} | 1 |
+| Finally.cs:26:38:26:39 | IOException ex | Finally.cs:26:48:26:51 | true | 2 |
+| Finally.cs:27:9:29:9 | {...} | Finally.cs:28:13:28:18 | throw ...; | 2 |
+| Finally.cs:30:9:40:9 | catch (...) {...} | Finally.cs:30:9:40:9 | catch (...) {...} | 1 |
+| Finally.cs:30:41:30:42 | ArgumentException ex | Finally.cs:34:21:34:24 | true | 6 |
+| Finally.cs:34:27:34:32 | throw ...; | Finally.cs:38:17:38:44 | throw ...; | 5 |
+| Finally.cs:41:9:43:9 | catch (...) {...} | Finally.cs:41:9:43:9 | catch (...) {...} | 1 |
+| Finally.cs:42:9:43:9 | {...} | Finally.cs:42:9:43:9 | {...} | 1 |
+| Finally.cs:44:9:47:9 | catch {...} | Finally.cs:46:13:46:19 | return ...; | 3 |
+| Finally.cs:49:9:51:9 | {...} | Finally.cs:50:13:50:40 | call to method WriteLine | 4 |
 | Finally.cs:54:10:54:11 | enter M3 | Finally.cs:58:13:58:37 | call to method WriteLine | 7 |
 | Finally.cs:54:10:54:11 | exit M3 | Finally.cs:54:10:54:11 | exit M3 | 1 |
 | Finally.cs:54:10:54:11 | exit M3 (abnormal) | Finally.cs:54:10:54:11 | exit M3 (abnormal) | 1 |
 | Finally.cs:54:10:54:11 | exit M3 (normal) | Finally.cs:54:10:54:11 | exit M3 (normal) | 1 |
-| Finally.cs:59:13:59:19 | return ...; | Finally.cs:70:13:70:40 | [finally: return] call to method WriteLine | 5 |
-| Finally.cs:61:9:64:9 | [exception: Exception] catch (...) {...} | Finally.cs:61:9:64:9 | [exception: Exception] catch (...) {...} | 1 |
-| Finally.cs:61:38:61:39 | [exception: Exception] IOException ex | Finally.cs:61:48:61:51 | [exception: Exception] true | 2 |
-| Finally.cs:62:9:64:9 | {...} | Finally.cs:70:13:70:40 | [finally: exception(IOException)] call to method WriteLine | 6 |
-| Finally.cs:65:9:67:9 | [exception: Exception] catch (...) {...} | Finally.cs:65:9:67:9 | [exception: Exception] catch (...) {...} | 1 |
-| Finally.cs:65:26:65:26 | [exception: Exception] Exception e | Finally.cs:65:35:65:51 | [exception: Exception] ... != ... | 5 |
-| Finally.cs:66:9:67:9 | {...} | Finally.cs:70:13:70:40 | call to method WriteLine | 5 |
-| Finally.cs:69:9:71:9 | [finally: exception(Exception)] {...} | Finally.cs:70:13:70:40 | [finally: exception(Exception)] call to method WriteLine | 4 |
+| Finally.cs:59:13:59:19 | return ...; | Finally.cs:59:13:59:19 | return ...; | 1 |
+| Finally.cs:61:9:64:9 | catch (...) {...} | Finally.cs:61:9:64:9 | catch (...) {...} | 1 |
+| Finally.cs:61:38:61:39 | IOException ex | Finally.cs:61:48:61:51 | true | 2 |
+| Finally.cs:62:9:64:9 | {...} | Finally.cs:63:13:63:18 | throw ...; | 2 |
+| Finally.cs:65:9:67:9 | catch (...) {...} | Finally.cs:65:9:67:9 | catch (...) {...} | 1 |
+| Finally.cs:65:26:65:26 | Exception e | Finally.cs:65:35:65:51 | ... != ... | 5 |
+| Finally.cs:66:9:67:9 | {...} | Finally.cs:66:9:67:9 | {...} | 1 |
+| Finally.cs:69:9:71:9 | {...} | Finally.cs:70:13:70:40 | call to method WriteLine | 4 |
 | Finally.cs:74:10:74:11 | enter M4 | Finally.cs:77:9:100:9 | while (...) ... | 6 |
 | Finally.cs:74:10:74:11 | exit M4 | Finally.cs:74:10:74:11 | exit M4 | 1 |
 | Finally.cs:74:10:74:11 | exit M4 (abnormal) | Finally.cs:74:10:74:11 | exit M4 (abnormal) | 1 |
 | Finally.cs:74:10:74:11 | exit M4 (normal) | Finally.cs:74:10:74:11 | exit M4 (normal) | 1 |
 | Finally.cs:77:16:77:16 | access to local variable i | Finally.cs:77:16:77:20 | ... > ... | 3 |
 | Finally.cs:78:9:100:9 | {...} | Finally.cs:81:21:81:26 | ... == ... | 7 |
-| Finally.cs:82:21:82:27 | return ...; | Finally.cs:92:25:92:30 | [finally: return] ... == ... | 8 |
+| Finally.cs:82:21:82:27 | return ...; | Finally.cs:82:21:82:27 | return ...; | 1 |
 | Finally.cs:83:17:84:29 | if (...) ... | Finally.cs:83:21:83:26 | ... == ... | 4 |
-| Finally.cs:84:21:84:29 | continue; | Finally.cs:92:25:92:30 | [finally: continue] ... == ... | 8 |
+| Finally.cs:84:21:84:29 | continue; | Finally.cs:84:21:84:29 | continue; | 1 |
 | Finally.cs:85:17:86:26 | if (...) ... | Finally.cs:85:21:85:26 | ... == ... | 4 |
-| Finally.cs:86:21:86:26 | break; | Finally.cs:92:25:92:30 | [finally: break] ... == ... | 8 |
+| Finally.cs:86:21:86:26 | break; | Finally.cs:86:21:86:26 | break; | 1 |
 | Finally.cs:89:13:99:13 | {...} | Finally.cs:92:25:92:30 | ... == ... | 7 |
-| Finally.cs:93:25:93:46 | [finally: break] throw ...; | Finally.cs:93:25:93:46 | [finally: break] throw ...; | 1 |
-| Finally.cs:93:25:93:46 | [finally: continue] throw ...; | Finally.cs:93:25:93:46 | [finally: continue] throw ...; | 1 |
-| Finally.cs:93:25:93:46 | [finally: return] throw ...; | Finally.cs:93:25:93:46 | [finally: return] throw ...; | 1 |
 | Finally.cs:93:25:93:46 | throw ...; | Finally.cs:93:25:93:46 | throw ...; | 1 |
-| Finally.cs:93:31:93:45 | [finally: break] object creation of type Exception | Finally.cs:93:31:93:45 | [finally: break] object creation of type Exception | 1 |
-| Finally.cs:93:31:93:45 | [finally: continue] object creation of type Exception | Finally.cs:93:31:93:45 | [finally: continue] object creation of type Exception | 1 |
-| Finally.cs:93:31:93:45 | [finally: return] object creation of type Exception | Finally.cs:93:31:93:45 | [finally: return] object creation of type Exception | 1 |
 | Finally.cs:93:31:93:45 | object creation of type Exception | Finally.cs:93:31:93:45 | object creation of type Exception | 1 |
-| Finally.cs:96:17:98:17 | [finally(1): exception(Exception)] {...} | Finally.cs:97:21:97:23 | [finally(1): exception(Exception)] ...-- | 4 |
-| Finally.cs:96:17:98:17 | [finally: break, finally(1): exception(Exception)] {...} | Finally.cs:97:21:97:23 | [finally: break, finally(1): exception(Exception)] ...-- | 4 |
-| Finally.cs:96:17:98:17 | [finally: break] {...} | Finally.cs:97:21:97:23 | [finally: break] ...-- | 4 |
-| Finally.cs:96:17:98:17 | [finally: continue, finally(1): exception(Exception)] {...} | Finally.cs:97:21:97:23 | [finally: continue, finally(1): exception(Exception)] ...-- | 4 |
-| Finally.cs:96:17:98:17 | [finally: continue] {...} | Finally.cs:97:21:97:23 | [finally: continue] ...-- | 4 |
-| Finally.cs:96:17:98:17 | [finally: return, finally(1): exception(Exception)] {...} | Finally.cs:97:21:97:23 | [finally: return, finally(1): exception(Exception)] ...-- | 4 |
-| Finally.cs:96:17:98:17 | [finally: return] {...} | Finally.cs:97:21:97:23 | [finally: return] ...-- | 4 |
 | Finally.cs:96:17:98:17 | {...} | Finally.cs:97:21:97:23 | ...-- | 4 |
 | Finally.cs:103:10:103:11 | enter M5 | Finally.cs:107:17:107:21 | access to field Field | 7 |
 | Finally.cs:103:10:103:11 | exit M5 | Finally.cs:103:10:103:11 | exit M5 | 1 |
@@ -496,79 +436,33 @@
 | Finally.cs:103:10:103:11 | exit M5 (normal) | Finally.cs:103:10:103:11 | exit M5 (normal) | 1 |
 | Finally.cs:107:17:107:28 | access to property Length | Finally.cs:107:17:107:28 | access to property Length | 1 |
 | Finally.cs:107:33:107:33 | 0 | Finally.cs:107:17:107:33 | ... == ... | 2 |
-| Finally.cs:108:17:108:23 | return ...; | Finally.cs:114:19:114:35 | [finally: return] ... == ... | 8 |
+| Finally.cs:108:17:108:23 | return ...; | Finally.cs:108:17:108:23 | return ...; | 1 |
 | Finally.cs:109:13:110:49 | if (...) ... | Finally.cs:109:17:109:21 | access to field Field | 3 |
 | Finally.cs:109:17:109:28 | access to property Length | Finally.cs:109:17:109:28 | access to property Length | 1 |
 | Finally.cs:109:33:109:33 | 1 | Finally.cs:109:17:109:33 | ... == ... | 2 |
-| Finally.cs:110:17:110:49 | throw ...; | Finally.cs:114:19:114:35 | [finally: exception(OutOfMemoryException)] ... == ... | 8 |
+| Finally.cs:110:17:110:49 | throw ...; | Finally.cs:110:17:110:49 | throw ...; | 1 |
 | Finally.cs:110:23:110:48 | object creation of type OutOfMemoryException | Finally.cs:110:23:110:48 | object creation of type OutOfMemoryException | 1 |
-| Finally.cs:113:9:118:9 | [finally: exception(Exception)] {...} | Finally.cs:114:19:114:35 | [finally: exception(Exception)] ... == ... | 7 |
-| Finally.cs:113:9:118:9 | [finally: exception(NullReferenceException)] {...} | Finally.cs:114:19:114:35 | [finally: exception(NullReferenceException)] ... == ... | 7 |
 | Finally.cs:113:9:118:9 | {...} | Finally.cs:114:19:114:35 | ... == ... | 7 |
-| Finally.cs:114:17:114:36 | [false, finally: exception(Exception)] !... | Finally.cs:114:17:114:36 | [false, finally: exception(Exception)] !... | 1 |
-| Finally.cs:114:17:114:36 | [false, finally: exception(NullReferenceException)] !... | Finally.cs:114:17:114:36 | [false, finally: exception(NullReferenceException)] !... | 1 |
-| Finally.cs:114:17:114:36 | [false, finally: exception(OutOfMemoryException)] !... | Finally.cs:114:17:114:36 | [false, finally: exception(OutOfMemoryException)] !... | 1 |
-| Finally.cs:114:17:114:36 | [false, finally: return] !... | Finally.cs:114:17:114:36 | [false, finally: return] !... | 1 |
 | Finally.cs:114:17:114:36 | [false] !... | Finally.cs:114:17:114:36 | [false] !... | 1 |
-| Finally.cs:114:17:114:36 | [true, finally: exception(Exception)] !... | Finally.cs:114:17:114:36 | [true, finally: exception(Exception)] !... | 1 |
-| Finally.cs:114:17:114:36 | [true, finally: exception(NullReferenceException)] !... | Finally.cs:114:17:114:36 | [true, finally: exception(NullReferenceException)] !... | 1 |
-| Finally.cs:114:17:114:36 | [true, finally: exception(OutOfMemoryException)] !... | Finally.cs:114:17:114:36 | [true, finally: exception(OutOfMemoryException)] !... | 1 |
-| Finally.cs:114:17:114:36 | [true, finally: return] !... | Finally.cs:114:17:114:36 | [true, finally: return] !... | 1 |
 | Finally.cs:114:17:114:36 | [true] !... | Finally.cs:114:17:114:36 | [true] !... | 1 |
 | Finally.cs:115:17:115:41 | ...; | Finally.cs:115:17:115:40 | call to method WriteLine | 4 |
-| Finally.cs:115:17:115:41 | [finally: exception(Exception)] ...; | Finally.cs:115:17:115:40 | [finally: exception(Exception)] call to method WriteLine | 4 |
-| Finally.cs:115:17:115:41 | [finally: exception(NullReferenceException)] ...; | Finally.cs:115:17:115:40 | [finally: exception(NullReferenceException)] call to method WriteLine | 4 |
-| Finally.cs:115:17:115:41 | [finally: exception(OutOfMemoryException)] ...; | Finally.cs:115:17:115:40 | [finally: exception(OutOfMemoryException)] call to method WriteLine | 4 |
-| Finally.cs:115:17:115:41 | [finally: return] ...; | Finally.cs:115:17:115:40 | [finally: return] call to method WriteLine | 4 |
-| Finally.cs:116:13:117:37 | [finally: exception(Exception)] if (...) ... | Finally.cs:116:17:116:32 | [finally: exception(Exception)] ... > ... | 6 |
-| Finally.cs:116:13:117:37 | [finally: exception(NullReferenceException)] if (...) ... | Finally.cs:116:17:116:32 | [finally: exception(NullReferenceException)] ... > ... | 6 |
-| Finally.cs:116:13:117:37 | [finally: exception(OutOfMemoryException)] if (...) ... | Finally.cs:116:17:116:32 | [finally: exception(OutOfMemoryException)] ... > ... | 6 |
-| Finally.cs:116:13:117:37 | [finally: return] if (...) ... | Finally.cs:116:17:116:32 | [finally: return] ... > ... | 6 |
 | Finally.cs:116:13:117:37 | if (...) ... | Finally.cs:116:17:116:32 | ... > ... | 6 |
 | Finally.cs:117:17:117:37 | ...; | Finally.cs:117:17:117:36 | call to method WriteLine | 3 |
-| Finally.cs:117:17:117:37 | [finally: exception(Exception)] ...; | Finally.cs:117:17:117:36 | [finally: exception(Exception)] call to method WriteLine | 3 |
-| Finally.cs:117:17:117:37 | [finally: exception(NullReferenceException)] ...; | Finally.cs:117:17:117:36 | [finally: exception(NullReferenceException)] call to method WriteLine | 3 |
-| Finally.cs:117:17:117:37 | [finally: exception(OutOfMemoryException)] ...; | Finally.cs:117:17:117:36 | [finally: exception(OutOfMemoryException)] call to method WriteLine | 3 |
-| Finally.cs:117:17:117:37 | [finally: return] ...; | Finally.cs:117:17:117:36 | [finally: return] call to method WriteLine | 3 |
 | Finally.cs:121:10:121:11 | enter M6 | Finally.cs:121:10:121:11 | exit M6 | 12 |
-| Finally.cs:133:10:133:11 | enter M7 | Finally.cs:137:13:137:36 | call to method WriteLine | 7 |
-| Finally.cs:133:10:133:11 | exit M7 (abnormal) | Finally.cs:133:10:133:11 | exit M7 | 2 |
-| Finally.cs:140:9:143:9 | [finally: exception(Exception)] {...} | Finally.cs:141:13:141:44 | [finally: exception(Exception)] throw ...; | 4 |
-| Finally.cs:140:9:143:9 | {...} | Finally.cs:141:13:141:44 | throw ...; | 4 |
+| Finally.cs:133:10:133:11 | enter M7 | Finally.cs:133:10:133:11 | exit M7 | 13 |
 | Finally.cs:147:10:147:11 | enter M8 | Finally.cs:151:17:151:28 | ... == ... | 8 |
 | Finally.cs:147:10:147:11 | exit M8 | Finally.cs:147:10:147:11 | exit M8 | 1 |
 | Finally.cs:147:10:147:11 | exit M8 (abnormal) | Finally.cs:147:10:147:11 | exit M8 (abnormal) | 1 |
 | Finally.cs:147:10:147:11 | exit M8 (normal) | Finally.cs:147:10:147:11 | exit M8 (normal) | 1 |
-| Finally.cs:152:17:152:50 | throw ...; | Finally.cs:158:21:158:31 | [finally: exception(ArgumentNullException)] access to property Length | 7 |
+| Finally.cs:152:17:152:50 | throw ...; | Finally.cs:152:17:152:50 | throw ...; | 1 |
 | Finally.cs:152:23:152:49 | object creation of type ArgumentNullException | Finally.cs:152:23:152:49 | object creation of type ArgumentNullException | 1 |
-| Finally.cs:155:9:169:9 | [finally: exception(Exception)] {...} | Finally.cs:158:21:158:31 | [finally: exception(Exception)] access to property Length | 6 |
 | Finally.cs:155:9:169:9 | {...} | Finally.cs:158:21:158:31 | access to property Length | 6 |
 | Finally.cs:158:36:158:36 | 1 | Finally.cs:158:21:158:36 | ... == ... | 2 |
-| Finally.cs:158:36:158:36 | [finally: exception(ArgumentNullException)] 1 | Finally.cs:158:21:158:36 | [finally: exception(ArgumentNullException)] ... == ... | 2 |
-| Finally.cs:158:36:158:36 | [finally: exception(Exception)] 1 | Finally.cs:158:21:158:36 | [finally: exception(Exception)] ... == ... | 2 |
-| Finally.cs:159:21:159:45 | [finally: exception(ArgumentNullException)] throw ...; | Finally.cs:159:21:159:45 | [finally: exception(ArgumentNullException)] throw ...; | 1 |
-| Finally.cs:159:21:159:45 | [finally: exception(Exception)] throw ...; | Finally.cs:159:21:159:45 | [finally: exception(Exception)] throw ...; | 1 |
 | Finally.cs:159:21:159:45 | throw ...; | Finally.cs:159:21:159:45 | throw ...; | 1 |
 | Finally.cs:159:41:159:43 | "1" | Finally.cs:159:27:159:44 | object creation of type Exception | 2 |
-| Finally.cs:159:41:159:43 | [finally: exception(ArgumentNullException)] "1" | Finally.cs:159:27:159:44 | [finally: exception(ArgumentNullException)] object creation of type Exception | 2 |
-| Finally.cs:159:41:159:43 | [finally: exception(Exception)] "1" | Finally.cs:159:27:159:44 | [finally: exception(Exception)] object creation of type Exception | 2 |
-| Finally.cs:161:13:164:13 | [exception: Exception] catch (...) {...} | Finally.cs:161:13:164:13 | [exception: Exception] catch (...) {...} | 1 |
-| Finally.cs:161:13:164:13 | [exception: NullReferenceException] catch (...) {...} | Finally.cs:161:13:164:13 | [exception: NullReferenceException] catch (...) {...} | 1 |
-| Finally.cs:161:13:164:13 | [finally: exception(ArgumentNullException), exception: Exception] catch (...) {...} | Finally.cs:161:13:164:13 | [finally: exception(ArgumentNullException), exception: Exception] catch (...) {...} | 1 |
-| Finally.cs:161:13:164:13 | [finally: exception(ArgumentNullException), exception: NullReferenceException] catch (...) {...} | Finally.cs:161:13:164:13 | [finally: exception(ArgumentNullException), exception: NullReferenceException] catch (...) {...} | 1 |
-| Finally.cs:161:13:164:13 | [finally: exception(Exception), exception: Exception] catch (...) {...} | Finally.cs:161:13:164:13 | [finally: exception(Exception), exception: Exception] catch (...) {...} | 1 |
-| Finally.cs:161:13:164:13 | [finally: exception(Exception), exception: NullReferenceException] catch (...) {...} | Finally.cs:161:13:164:13 | [finally: exception(Exception), exception: NullReferenceException] catch (...) {...} | 1 |
-| Finally.cs:161:30:161:30 | [exception: Exception] Exception e | Finally.cs:161:39:161:54 | [exception: Exception] ... == ... | 5 |
-| Finally.cs:161:30:161:30 | [exception: NullReferenceException] Exception e | Finally.cs:161:39:161:54 | [exception: NullReferenceException] ... == ... | 5 |
-| Finally.cs:161:30:161:30 | [finally: exception(ArgumentNullException), exception: Exception] Exception e | Finally.cs:161:39:161:54 | [finally: exception(ArgumentNullException), exception: Exception] ... == ... | 5 |
-| Finally.cs:161:30:161:30 | [finally: exception(ArgumentNullException), exception: NullReferenceException] Exception e | Finally.cs:161:39:161:54 | [finally: exception(ArgumentNullException), exception: NullReferenceException] ... == ... | 5 |
-| Finally.cs:161:30:161:30 | [finally: exception(Exception), exception: Exception] Exception e | Finally.cs:161:39:161:54 | [finally: exception(Exception), exception: Exception] ... == ... | 5 |
-| Finally.cs:161:30:161:30 | [finally: exception(Exception), exception: NullReferenceException] Exception e | Finally.cs:161:39:161:54 | [finally: exception(Exception), exception: NullReferenceException] ... == ... | 5 |
-| Finally.cs:162:13:164:13 | [finally: exception(ArgumentNullException)] {...} | Finally.cs:163:17:163:42 | [finally: exception(ArgumentNullException)] call to method WriteLine | 6 |
-| Finally.cs:162:13:164:13 | [finally: exception(Exception)] {...} | Finally.cs:163:17:163:42 | [finally: exception(Exception)] call to method WriteLine | 6 |
+| Finally.cs:161:13:164:13 | catch (...) {...} | Finally.cs:161:13:164:13 | catch (...) {...} | 1 |
+| Finally.cs:161:30:161:30 | Exception e | Finally.cs:161:39:161:54 | ... == ... | 5 |
 | Finally.cs:162:13:164:13 | {...} | Finally.cs:163:17:163:42 | call to method WriteLine | 6 |
-| Finally.cs:165:13:168:13 | [finally: exception(ArgumentNullException)] catch {...} | Finally.cs:167:17:167:37 | [finally: exception(ArgumentNullException)] call to method WriteLine | 5 |
-| Finally.cs:165:13:168:13 | [finally: exception(Exception)] catch {...} | Finally.cs:167:17:167:37 | [finally: exception(Exception)] call to method WriteLine | 5 |
 | Finally.cs:165:13:168:13 | catch {...} | Finally.cs:167:17:167:37 | call to method WriteLine | 5 |
 | Finally.cs:172:11:172:20 | enter ExceptionA | Finally.cs:172:11:172:20 | exit ExceptionA | 5 |
 | Finally.cs:173:11:173:20 | enter ExceptionB | Finally.cs:173:11:173:20 | exit ExceptionB | 5 |
@@ -577,90 +471,46 @@
 | Finally.cs:176:10:176:11 | exit M9 | Finally.cs:176:10:176:11 | exit M9 | 1 |
 | Finally.cs:176:10:176:11 | exit M9 (abnormal) | Finally.cs:176:10:176:11 | exit M9 (abnormal) | 1 |
 | Finally.cs:176:10:176:11 | exit M9 (normal) | Finally.cs:176:10:176:11 | exit M9 (normal) | 1 |
-| Finally.cs:180:21:180:43 | [b1 (line 176): true] throw ...; | Finally.cs:186:21:186:22 | [finally: exception(ExceptionA), b1 (line 176): true] access to parameter b2 | 6 |
-| Finally.cs:180:27:180:42 | [b1 (line 176): true] object creation of type ExceptionA | Finally.cs:180:27:180:42 | [b1 (line 176): true] object creation of type ExceptionA | 1 |
-| Finally.cs:183:9:192:9 | [b1 (line 176): false] {...} | Finally.cs:186:21:186:22 | [b1 (line 176): false] access to parameter b2 | 5 |
-| Finally.cs:183:9:192:9 | [finally: exception(Exception), b1 (line 176): true] {...} | Finally.cs:186:21:186:22 | [finally: exception(Exception), b1 (line 176): true] access to parameter b2 | 5 |
-| Finally.cs:186:25:186:47 | [b1 (line 176): false, b2 (line 176): true] throw ...; | Finally.cs:188:13:191:13 | [exception: ExceptionB, b1 (line 176): false, b2 (line 176): true] catch (...) {...} | 2 |
-| Finally.cs:186:25:186:47 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] throw ...; | Finally.cs:188:13:191:13 | [finally: exception(Exception), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | 2 |
-| Finally.cs:186:25:186:47 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] throw ...; | Finally.cs:188:13:191:13 | [finally: exception(ExceptionA), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | 2 |
-| Finally.cs:186:31:186:46 | [b1 (line 176): false, b2 (line 176): true] object creation of type ExceptionB | Finally.cs:186:31:186:46 | [b1 (line 176): false, b2 (line 176): true] object creation of type ExceptionB | 1 |
-| Finally.cs:186:31:186:46 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB | Finally.cs:186:31:186:46 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB | 1 |
-| Finally.cs:186:31:186:46 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB | Finally.cs:186:31:186:46 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB | 1 |
-| Finally.cs:188:13:191:13 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] catch (...) {...} | Finally.cs:188:13:191:13 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] catch (...) {...} | 1 |
-| Finally.cs:188:13:191:13 | [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | Finally.cs:188:13:191:13 | [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | 1 |
-| Finally.cs:188:13:191:13 | [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | Finally.cs:188:13:191:13 | [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | 1 |
-| Finally.cs:188:38:188:39 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] access to parameter b2 | Finally.cs:188:38:188:39 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] access to parameter b2 | 1 |
-| Finally.cs:188:38:188:39 | [exception: ExceptionB, b1 (line 176): false, b2 (line 176): true] access to parameter b2 | Finally.cs:188:38:188:39 | [exception: ExceptionB, b1 (line 176): false, b2 (line 176): true] access to parameter b2 | 1 |
-| Finally.cs:188:38:188:39 | [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | Finally.cs:188:38:188:39 | [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | 1 |
-| Finally.cs:188:38:188:39 | [finally: exception(Exception), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | Finally.cs:188:38:188:39 | [finally: exception(Exception), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | 1 |
-| Finally.cs:188:38:188:39 | [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | Finally.cs:188:38:188:39 | [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | 1 |
-| Finally.cs:188:38:188:39 | [finally: exception(ExceptionA), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | Finally.cs:188:38:188:39 | [finally: exception(ExceptionA), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | 1 |
-| Finally.cs:189:13:191:13 | [b1 (line 176): false] {...} | Finally.cs:190:21:190:22 | [b1 (line 176): false] access to parameter b1 | 3 |
-| Finally.cs:189:13:191:13 | [finally: exception(Exception), b1 (line 176): true] {...} | Finally.cs:190:21:190:22 | [finally: exception(Exception), b1 (line 176): true] access to parameter b1 | 3 |
-| Finally.cs:189:13:191:13 | [finally: exception(ExceptionA), b1 (line 176): true] {...} | Finally.cs:190:21:190:22 | [finally: exception(ExceptionA), b1 (line 176): true] access to parameter b1 | 3 |
-| Finally.cs:190:31:190:46 | [finally: exception(Exception)] object creation of type ExceptionC | Finally.cs:190:25:190:47 | [finally: exception(Exception)] throw ...; | 2 |
-| Finally.cs:190:31:190:46 | [finally: exception(ExceptionA)] object creation of type ExceptionC | Finally.cs:190:25:190:47 | [finally: exception(ExceptionA)] throw ...; | 2 |
+| Finally.cs:180:21:180:43 | throw ...; | Finally.cs:180:21:180:43 | throw ...; | 1 |
+| Finally.cs:180:27:180:42 | object creation of type ExceptionA | Finally.cs:180:27:180:42 | object creation of type ExceptionA | 1 |
+| Finally.cs:183:9:192:9 | {...} | Finally.cs:186:21:186:22 | access to parameter b2 | 5 |
+| Finally.cs:186:25:186:47 | throw ...; | Finally.cs:186:25:186:47 | throw ...; | 1 |
+| Finally.cs:186:31:186:46 | object creation of type ExceptionB | Finally.cs:186:31:186:46 | object creation of type ExceptionB | 1 |
+| Finally.cs:188:13:191:13 | catch (...) {...} | Finally.cs:188:13:191:13 | catch (...) {...} | 1 |
+| Finally.cs:188:38:188:39 | access to parameter b2 | Finally.cs:188:38:188:39 | access to parameter b2 | 1 |
+| Finally.cs:189:13:191:13 | {...} | Finally.cs:190:21:190:22 | access to parameter b1 | 3 |
+| Finally.cs:190:31:190:46 | object creation of type ExceptionC | Finally.cs:190:25:190:47 | throw ...; | 2 |
 | Finally.cs:195:10:195:12 | enter M10 | Finally.cs:199:17:199:18 | access to parameter b1 | 6 |
 | Finally.cs:195:10:195:12 | exit M10 | Finally.cs:195:10:195:12 | exit M10 | 1 |
 | Finally.cs:195:10:195:12 | exit M10 (abnormal) | Finally.cs:195:10:195:12 | exit M10 (abnormal) | 1 |
-| Finally.cs:199:21:199:43 | throw ...; | Finally.cs:205:21:205:22 | [finally: exception(ExceptionA)] access to parameter b2 | 6 |
+| Finally.cs:199:21:199:43 | throw ...; | Finally.cs:199:21:199:43 | throw ...; | 1 |
 | Finally.cs:199:27:199:42 | object creation of type ExceptionA | Finally.cs:199:27:199:42 | object creation of type ExceptionA | 1 |
-| Finally.cs:202:9:212:9 | [finally: exception(Exception)] {...} | Finally.cs:205:21:205:22 | [finally: exception(Exception)] access to parameter b2 | 5 |
 | Finally.cs:202:9:212:9 | {...} | Finally.cs:205:21:205:22 | access to parameter b2 | 5 |
-| Finally.cs:205:25:205:47 | [finally: exception(Exception)] throw ...; | Finally.cs:209:21:209:22 | [finally: exception(Exception), finally(1): exception(ExceptionB)] access to parameter b3 | 4 |
-| Finally.cs:205:25:205:47 | [finally: exception(ExceptionA)] throw ...; | Finally.cs:209:21:209:22 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] access to parameter b3 | 4 |
-| Finally.cs:205:25:205:47 | throw ...; | Finally.cs:209:21:209:22 | [finally(1): exception(ExceptionB)] access to parameter b3 | 4 |
-| Finally.cs:205:31:205:46 | [finally: exception(Exception)] object creation of type ExceptionB | Finally.cs:205:31:205:46 | [finally: exception(Exception)] object creation of type ExceptionB | 1 |
-| Finally.cs:205:31:205:46 | [finally: exception(ExceptionA)] object creation of type ExceptionB | Finally.cs:205:31:205:46 | [finally: exception(ExceptionA)] object creation of type ExceptionB | 1 |
+| Finally.cs:205:25:205:47 | throw ...; | Finally.cs:205:25:205:47 | throw ...; | 1 |
 | Finally.cs:205:31:205:46 | object creation of type ExceptionB | Finally.cs:205:31:205:46 | object creation of type ExceptionB | 1 |
-| Finally.cs:208:13:210:13 | [finally(1): exception(Exception)] {...} | Finally.cs:209:21:209:22 | [finally(1): exception(Exception)] access to parameter b3 | 3 |
-| Finally.cs:208:13:210:13 | [finally: exception(Exception), finally(1): exception(Exception)] {...} | Finally.cs:209:21:209:22 | [finally: exception(Exception), finally(1): exception(Exception)] access to parameter b3 | 3 |
-| Finally.cs:208:13:210:13 | [finally: exception(Exception)] {...} | Finally.cs:209:21:209:22 | [finally: exception(Exception)] access to parameter b3 | 3 |
-| Finally.cs:208:13:210:13 | [finally: exception(ExceptionA), finally(1): exception(Exception)] {...} | Finally.cs:209:21:209:22 | [finally: exception(ExceptionA), finally(1): exception(Exception)] access to parameter b3 | 3 |
-| Finally.cs:208:13:210:13 | [finally: exception(ExceptionA)] {...} | Finally.cs:209:21:209:22 | [finally: exception(ExceptionA)] access to parameter b3 | 3 |
 | Finally.cs:208:13:210:13 | {...} | Finally.cs:209:21:209:22 | access to parameter b3 | 3 |
-| Finally.cs:209:31:209:46 | [finally(1): exception(Exception)] object creation of type ExceptionC | Finally.cs:209:25:209:47 | [finally(1): exception(Exception)] throw ...; | 2 |
-| Finally.cs:209:31:209:46 | [finally(1): exception(ExceptionB)] object creation of type ExceptionC | Finally.cs:209:25:209:47 | [finally(1): exception(ExceptionB)] throw ...; | 2 |
-| Finally.cs:209:31:209:46 | [finally: exception(Exception), finally(1): exception(Exception)] object creation of type ExceptionC | Finally.cs:209:25:209:47 | [finally: exception(Exception), finally(1): exception(Exception)] throw ...; | 2 |
-| Finally.cs:209:31:209:46 | [finally: exception(Exception), finally(1): exception(ExceptionB)] object creation of type ExceptionC | Finally.cs:209:25:209:47 | [finally: exception(Exception), finally(1): exception(ExceptionB)] throw ...; | 2 |
-| Finally.cs:209:31:209:46 | [finally: exception(Exception)] object creation of type ExceptionC | Finally.cs:209:25:209:47 | [finally: exception(Exception)] throw ...; | 2 |
-| Finally.cs:209:31:209:46 | [finally: exception(ExceptionA), finally(1): exception(Exception)] object creation of type ExceptionC | Finally.cs:209:25:209:47 | [finally: exception(ExceptionA), finally(1): exception(Exception)] throw ...; | 2 |
-| Finally.cs:209:31:209:46 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] object creation of type ExceptionC | Finally.cs:209:25:209:47 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] throw ...; | 2 |
-| Finally.cs:209:31:209:46 | [finally: exception(ExceptionA)] object creation of type ExceptionC | Finally.cs:209:25:209:47 | [finally: exception(ExceptionA)] throw ...; | 2 |
 | Finally.cs:209:31:209:46 | object creation of type ExceptionC | Finally.cs:209:25:209:47 | throw ...; | 2 |
-| Finally.cs:211:13:211:29 | ...; | Finally.cs:195:10:195:12 | exit M10 (normal) | 9 |
-| Finally.cs:211:13:211:29 | [finally: exception(Exception)] ...; | Finally.cs:211:13:211:28 | [finally: exception(Exception)] ... = ... | 4 |
-| Finally.cs:211:13:211:29 | [finally: exception(ExceptionA)] ...; | Finally.cs:211:13:211:28 | [finally: exception(ExceptionA)] ... = ... | 4 |
+| Finally.cs:211:13:211:29 | ...; | Finally.cs:211:13:211:28 | ... = ... | 4 |
+| Finally.cs:213:9:213:25 | ...; | Finally.cs:195:10:195:12 | exit M10 (normal) | 5 |
 | Finally.cs:216:10:216:12 | enter M11 | Finally.cs:220:13:220:36 | call to method WriteLine | 7 |
 | Finally.cs:222:9:225:9 | catch {...} | Finally.cs:224:13:224:38 | call to method WriteLine | 5 |
 | Finally.cs:227:9:229:9 | {...} | Finally.cs:216:10:216:12 | exit M11 | 9 |
 | Finally.cs:233:10:233:12 | enter M12 | Finally.cs:239:21:239:22 | access to parameter b1 | 8 |
 | Finally.cs:233:10:233:12 | exit M12 | Finally.cs:233:10:233:12 | exit M12 | 1 |
 | Finally.cs:233:10:233:12 | exit M12 (abnormal) | Finally.cs:233:10:233:12 | exit M12 (abnormal) | 1 |
-| Finally.cs:240:21:240:43 | throw ...; | Finally.cs:246:25:246:26 | [finally: exception(ExceptionA)] access to parameter b2 | 6 |
+| Finally.cs:240:21:240:43 | throw ...; | Finally.cs:240:21:240:43 | throw ...; | 1 |
 | Finally.cs:240:27:240:42 | object creation of type ExceptionA | Finally.cs:240:27:240:42 | object creation of type ExceptionA | 1 |
-| Finally.cs:243:13:253:13 | [finally: exception(Exception)] {...} | Finally.cs:246:25:246:26 | [finally: exception(Exception)] access to parameter b2 | 5 |
 | Finally.cs:243:13:253:13 | {...} | Finally.cs:246:25:246:26 | access to parameter b2 | 5 |
-| Finally.cs:247:25:247:47 | [finally: exception(Exception)] throw ...; | Finally.cs:251:21:251:54 | [finally: exception(Exception), finally(1): exception(ExceptionA)] call to method WriteLine | 5 |
-| Finally.cs:247:25:247:47 | [finally: exception(ExceptionA)] throw ...; | Finally.cs:251:21:251:54 | [finally: exception(ExceptionA), finally(1): exception(ExceptionA)] call to method WriteLine | 5 |
-| Finally.cs:247:25:247:47 | throw ...; | Finally.cs:251:21:251:54 | [finally(1): exception(ExceptionA)] call to method WriteLine | 5 |
-| Finally.cs:247:31:247:46 | [finally: exception(Exception)] object creation of type ExceptionA | Finally.cs:247:31:247:46 | [finally: exception(Exception)] object creation of type ExceptionA | 1 |
-| Finally.cs:247:31:247:46 | [finally: exception(ExceptionA)] object creation of type ExceptionA | Finally.cs:247:31:247:46 | [finally: exception(ExceptionA)] object creation of type ExceptionA | 1 |
+| Finally.cs:247:25:247:47 | throw ...; | Finally.cs:247:25:247:47 | throw ...; | 1 |
 | Finally.cs:247:31:247:46 | object creation of type ExceptionA | Finally.cs:247:31:247:46 | object creation of type ExceptionA | 1 |
-| Finally.cs:250:17:252:17 | [finally(1): exception(Exception)] {...} | Finally.cs:251:21:251:54 | [finally(1): exception(Exception)] call to method WriteLine | 4 |
-| Finally.cs:250:17:252:17 | [finally: exception(Exception), finally(1): exception(Exception)] {...} | Finally.cs:251:21:251:54 | [finally: exception(Exception), finally(1): exception(Exception)] call to method WriteLine | 4 |
-| Finally.cs:250:17:252:17 | [finally: exception(Exception)] {...} | Finally.cs:251:21:251:54 | [finally: exception(Exception)] call to method WriteLine | 4 |
-| Finally.cs:250:17:252:17 | [finally: exception(ExceptionA), finally(1): exception(Exception)] {...} | Finally.cs:251:21:251:54 | [finally: exception(ExceptionA), finally(1): exception(Exception)] call to method WriteLine | 4 |
-| Finally.cs:250:17:252:17 | [finally: exception(ExceptionA)] {...} | Finally.cs:251:21:251:54 | [finally: exception(ExceptionA)] call to method WriteLine | 4 |
-| Finally.cs:250:17:252:17 | {...} | Finally.cs:254:13:254:44 | call to method WriteLine | 7 |
-| Finally.cs:257:9:259:9 | [finally: exception(Exception)] {...} | Finally.cs:258:13:258:46 | [finally: exception(Exception)] call to method WriteLine | 4 |
-| Finally.cs:257:9:259:9 | [finally: exception(ExceptionA)] {...} | Finally.cs:258:13:258:46 | [finally: exception(ExceptionA)] call to method WriteLine | 4 |
-| Finally.cs:257:9:259:9 | {...} | Finally.cs:233:10:233:12 | exit M12 (normal) | 8 |
-| Finally.cs:263:10:263:12 | enter M13 | Finally.cs:267:13:267:34 | call to method WriteLine | 7 |
+| Finally.cs:250:17:252:17 | {...} | Finally.cs:251:21:251:54 | call to method WriteLine | 4 |
+| Finally.cs:254:13:254:45 | ...; | Finally.cs:254:13:254:44 | call to method WriteLine | 3 |
+| Finally.cs:257:9:259:9 | {...} | Finally.cs:258:13:258:46 | call to method WriteLine | 4 |
+| Finally.cs:260:9:260:34 | ...; | Finally.cs:233:10:233:12 | exit M12 (normal) | 4 |
+| Finally.cs:263:10:263:12 | enter M13 | Finally.cs:272:13:272:18 | ... = ... | 16 |
 | Finally.cs:263:10:263:12 | exit M13 | Finally.cs:263:10:263:12 | exit M13 | 1 |
-| Finally.cs:270:9:273:9 | [finally: exception(Exception)] {...} | Finally.cs:263:10:263:12 | exit M13 (abnormal) | 10 |
-| Finally.cs:270:9:273:9 | {...} | Finally.cs:263:10:263:12 | exit M13 (normal) | 10 |
+| Finally.cs:263:10:263:12 | exit M13 (abnormal) | Finally.cs:263:10:263:12 | exit M13 (abnormal) | 1 |
+| Finally.cs:263:10:263:12 | exit M13 (normal) | Finally.cs:263:10:263:12 | exit M13 (normal) | 1 |
 | Foreach.cs:4:7:4:13 | enter Foreach | Foreach.cs:4:7:4:13 | exit Foreach | 5 |
 | Foreach.cs:6:10:6:11 | enter M1 | Foreach.cs:8:29:8:32 | access to parameter args | 3 |
 | Foreach.cs:6:10:6:11 | exit M1 (normal) | Foreach.cs:6:10:6:11 | exit M1 | 2 |
@@ -705,48 +555,60 @@
 | LoopUnrolling.cs:7:10:7:11 | enter M1 | LoopUnrolling.cs:9:13:9:28 | ... == ... | 7 |
 | LoopUnrolling.cs:7:10:7:11 | exit M1 (normal) | LoopUnrolling.cs:7:10:7:11 | exit M1 | 2 |
 | LoopUnrolling.cs:10:13:10:19 | return ...; | LoopUnrolling.cs:10:13:10:19 | return ...; | 1 |
-| LoopUnrolling.cs:11:22:11:24 | String arg | LoopUnrolling.cs:11:9:12:35 | foreach (... ... in ...) ... | 5 |
-| LoopUnrolling.cs:11:29:11:32 | access to parameter args | LoopUnrolling.cs:11:9:12:35 | [unroll (line 11)] foreach (... ... in ...) ... | 2 |
-| LoopUnrolling.cs:15:10:15:11 | enter M2 | LoopUnrolling.cs:18:9:19:33 | [unroll (line 18)] foreach (... ... in ...) ... | 12 |
+| LoopUnrolling.cs:11:9:12:35 | foreach (... ... in ...) ... | LoopUnrolling.cs:11:9:12:35 | foreach (... ... in ...) ... | 1 |
+| LoopUnrolling.cs:11:22:11:24 | String arg | LoopUnrolling.cs:12:13:12:34 | call to method WriteLine | 4 |
+| LoopUnrolling.cs:11:29:11:32 | access to parameter args | LoopUnrolling.cs:11:29:11:32 | access to parameter args | 1 |
+| LoopUnrolling.cs:15:10:15:11 | enter M2 | LoopUnrolling.cs:18:27:18:28 | access to local variable xs | 11 |
 | LoopUnrolling.cs:15:10:15:11 | exit M2 (normal) | LoopUnrolling.cs:15:10:15:11 | exit M2 | 2 |
-| LoopUnrolling.cs:18:22:18:22 | String x | LoopUnrolling.cs:18:9:19:33 | foreach (... ... in ...) ... | 5 |
+| LoopUnrolling.cs:18:9:19:33 | foreach (... ... in ...) ... | LoopUnrolling.cs:18:9:19:33 | foreach (... ... in ...) ... | 1 |
+| LoopUnrolling.cs:18:22:18:22 | String x | LoopUnrolling.cs:19:13:19:32 | call to method WriteLine | 4 |
 | LoopUnrolling.cs:22:10:22:11 | enter M3 | LoopUnrolling.cs:24:29:24:32 | access to parameter args | 3 |
 | LoopUnrolling.cs:22:10:22:11 | exit M3 (normal) | LoopUnrolling.cs:22:10:22:11 | exit M3 | 2 |
 | LoopUnrolling.cs:24:9:26:40 | foreach (... ... in ...) ... | LoopUnrolling.cs:24:9:26:40 | foreach (... ... in ...) ... | 1 |
-| LoopUnrolling.cs:24:22:24:24 | Char arg | LoopUnrolling.cs:25:13:26:40 | [unroll (line 25)] foreach (... ... in ...) ... | 3 |
-| LoopUnrolling.cs:25:26:25:29 | Char arg0 | LoopUnrolling.cs:25:13:26:40 | foreach (... ... in ...) ... | 5 |
-| LoopUnrolling.cs:29:10:29:11 | enter M4 | LoopUnrolling.cs:32:9:33:33 | [skip (line 32)] foreach (... ... in ...) ... | 8 |
+| LoopUnrolling.cs:24:22:24:24 | Char arg | LoopUnrolling.cs:25:34:25:37 | access to parameter args | 2 |
+| LoopUnrolling.cs:25:13:26:40 | foreach (... ... in ...) ... | LoopUnrolling.cs:25:13:26:40 | foreach (... ... in ...) ... | 1 |
+| LoopUnrolling.cs:25:26:25:29 | Char arg0 | LoopUnrolling.cs:26:17:26:39 | call to method WriteLine | 4 |
+| LoopUnrolling.cs:29:10:29:11 | enter M4 | LoopUnrolling.cs:32:27:32:28 | access to local variable xs | 7 |
 | LoopUnrolling.cs:29:10:29:11 | exit M4 (normal) | LoopUnrolling.cs:29:10:29:11 | exit M4 | 2 |
-| LoopUnrolling.cs:36:10:36:11 | enter M5 | LoopUnrolling.cs:40:9:42:41 | [unroll (line 40)] foreach (... ... in ...) ... | 20 |
+| LoopUnrolling.cs:32:9:33:33 | foreach (... ... in ...) ... | LoopUnrolling.cs:32:9:33:33 | foreach (... ... in ...) ... | 1 |
+| LoopUnrolling.cs:32:22:32:22 | String x | LoopUnrolling.cs:33:13:33:32 | call to method WriteLine | 4 |
+| LoopUnrolling.cs:36:10:36:11 | enter M5 | LoopUnrolling.cs:40:27:40:28 | access to local variable xs | 19 |
 | LoopUnrolling.cs:36:10:36:11 | exit M5 (normal) | LoopUnrolling.cs:36:10:36:11 | exit M5 | 2 |
 | LoopUnrolling.cs:40:9:42:41 | foreach (... ... in ...) ... | LoopUnrolling.cs:40:9:42:41 | foreach (... ... in ...) ... | 1 |
-| LoopUnrolling.cs:40:22:40:22 | String x | LoopUnrolling.cs:41:13:42:41 | [unroll (line 41)] foreach (... ... in ...) ... | 3 |
-| LoopUnrolling.cs:41:26:41:26 | String y | LoopUnrolling.cs:41:13:42:41 | foreach (... ... in ...) ... | 7 |
-| LoopUnrolling.cs:45:10:45:11 | enter M6 | LoopUnrolling.cs:48:9:52:9 | [unroll (line 48)] foreach (... ... in ...) ... | 12 |
+| LoopUnrolling.cs:40:22:40:22 | String x | LoopUnrolling.cs:41:31:41:32 | access to local variable ys | 2 |
+| LoopUnrolling.cs:41:13:42:41 | foreach (... ... in ...) ... | LoopUnrolling.cs:41:13:42:41 | foreach (... ... in ...) ... | 1 |
+| LoopUnrolling.cs:41:26:41:26 | String y | LoopUnrolling.cs:42:17:42:40 | call to method WriteLine | 6 |
+| LoopUnrolling.cs:45:10:45:11 | enter M6 | LoopUnrolling.cs:48:9:52:9 | foreach (... ... in ...) ... | 12 |
+| LoopUnrolling.cs:45:10:45:11 | exit M6 (normal) | LoopUnrolling.cs:45:10:45:11 | exit M6 | 2 |
 | LoopUnrolling.cs:48:22:48:22 | String x | LoopUnrolling.cs:49:9:52:9 | {...} | 2 |
 | LoopUnrolling.cs:50:9:50:13 | Label: | LoopUnrolling.cs:51:13:51:23 | goto ...; | 5 |
-| LoopUnrolling.cs:55:10:55:11 | enter M7 | LoopUnrolling.cs:58:9:64:9 | [unroll (line 58)] foreach (... ... in ...) ... | 12 |
+| LoopUnrolling.cs:55:10:55:11 | enter M7 | LoopUnrolling.cs:58:27:58:28 | access to local variable xs | 11 |
 | LoopUnrolling.cs:55:10:55:11 | exit M7 (normal) | LoopUnrolling.cs:55:10:55:11 | exit M7 | 2 |
-| LoopUnrolling.cs:58:9:64:9 | [b (line 55): false] foreach (... ... in ...) ... | LoopUnrolling.cs:58:9:64:9 | [b (line 55): false] foreach (... ... in ...) ... | 1 |
+| LoopUnrolling.cs:58:9:64:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:58:9:64:9 | foreach (... ... in ...) ... | 1 |
 | LoopUnrolling.cs:58:22:58:22 | String x | LoopUnrolling.cs:60:17:60:17 | access to parameter b | 4 |
-| LoopUnrolling.cs:58:22:58:22 | [b (line 55): false] String x | LoopUnrolling.cs:60:17:60:17 | [b (line 55): false] access to parameter b | 4 |
-| LoopUnrolling.cs:58:22:58:22 | [b (line 55): true] String x | LoopUnrolling.cs:60:17:60:17 | [b (line 55): true] access to parameter b | 4 |
-| LoopUnrolling.cs:61:17:61:37 | [b (line 55): true] ...; | LoopUnrolling.cs:62:17:62:17 | [b (line 55): true] access to parameter b | 5 |
-| LoopUnrolling.cs:62:13:63:37 | [b (line 55): false] if (...) ... | LoopUnrolling.cs:62:17:62:17 | [b (line 55): false] access to parameter b | 2 |
-| LoopUnrolling.cs:63:17:63:37 | [b (line 55): true] ...; | LoopUnrolling.cs:58:9:64:9 | [b (line 55): true] foreach (... ... in ...) ... | 4 |
+| LoopUnrolling.cs:61:17:61:37 | ...; | LoopUnrolling.cs:61:17:61:36 | call to method WriteLine | 3 |
+| LoopUnrolling.cs:62:13:63:37 | if (...) ... | LoopUnrolling.cs:62:17:62:17 | access to parameter b | 2 |
+| LoopUnrolling.cs:63:17:63:37 | ...; | LoopUnrolling.cs:63:17:63:36 | call to method WriteLine | 3 |
 | LoopUnrolling.cs:67:10:67:11 | enter M8 | LoopUnrolling.cs:69:14:69:23 | call to method Any<String> | 5 |
 | LoopUnrolling.cs:67:10:67:11 | exit M8 (normal) | LoopUnrolling.cs:67:10:67:11 | exit M8 | 2 |
 | LoopUnrolling.cs:69:13:69:23 | [false] !... | LoopUnrolling.cs:69:13:69:23 | [false] !... | 1 |
 | LoopUnrolling.cs:69:13:69:23 | [true] !... | LoopUnrolling.cs:69:13:69:23 | [true] !... | 1 |
 | LoopUnrolling.cs:70:13:70:19 | return ...; | LoopUnrolling.cs:70:13:70:19 | return ...; | 1 |
-| LoopUnrolling.cs:71:9:71:21 | ...; | LoopUnrolling.cs:72:9:73:35 | [skip (line 72)] foreach (... ... in ...) ... | 5 |
-| LoopUnrolling.cs:76:10:76:11 | enter M9 | LoopUnrolling.cs:79:9:82:9 | [skip (line 79)] foreach (... ... in ...) ... | 9 |
+| LoopUnrolling.cs:71:9:71:21 | ...; | LoopUnrolling.cs:72:29:72:32 | access to parameter args | 4 |
+| LoopUnrolling.cs:72:9:73:35 | foreach (... ... in ...) ... | LoopUnrolling.cs:72:9:73:35 | foreach (... ... in ...) ... | 1 |
+| LoopUnrolling.cs:72:22:72:24 | String arg | LoopUnrolling.cs:73:13:73:34 | call to method WriteLine | 4 |
+| LoopUnrolling.cs:76:10:76:11 | enter M9 | LoopUnrolling.cs:79:27:79:28 | access to local variable xs | 8 |
 | LoopUnrolling.cs:76:10:76:11 | exit M9 (normal) | LoopUnrolling.cs:76:10:76:11 | exit M9 | 2 |
-| LoopUnrolling.cs:85:10:85:12 | enter M10 | LoopUnrolling.cs:88:9:91:9 | [skip (line 88)] foreach (... ... in ...) ... | 9 |
+| LoopUnrolling.cs:79:9:82:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:79:9:82:9 | foreach (... ... in ...) ... | 1 |
+| LoopUnrolling.cs:79:22:79:22 | String x | LoopUnrolling.cs:81:13:81:32 | call to method WriteLine | 5 |
+| LoopUnrolling.cs:85:10:85:12 | enter M10 | LoopUnrolling.cs:88:27:88:28 | access to local variable xs | 8 |
 | LoopUnrolling.cs:85:10:85:12 | exit M10 (normal) | LoopUnrolling.cs:85:10:85:12 | exit M10 | 2 |
-| LoopUnrolling.cs:94:10:94:12 | enter M11 | LoopUnrolling.cs:97:9:100:9 | [unroll (line 97)] foreach (... ... in ...) ... | 9 |
+| LoopUnrolling.cs:88:9:91:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:88:9:91:9 | foreach (... ... in ...) ... | 1 |
+| LoopUnrolling.cs:88:22:88:22 | String x | LoopUnrolling.cs:90:13:90:32 | call to method WriteLine | 5 |
+| LoopUnrolling.cs:94:10:94:12 | enter M11 | LoopUnrolling.cs:97:27:97:28 | access to local variable xs | 8 |
 | LoopUnrolling.cs:94:10:94:12 | exit M11 (normal) | LoopUnrolling.cs:94:10:94:12 | exit M11 | 2 |
-| LoopUnrolling.cs:97:22:97:22 | String x | LoopUnrolling.cs:97:9:100:9 | foreach (... ... in ...) ... | 6 |
+| LoopUnrolling.cs:97:9:100:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:97:9:100:9 | foreach (... ... in ...) ... | 1 |
+| LoopUnrolling.cs:97:22:97:22 | String x | LoopUnrolling.cs:99:13:99:32 | call to method WriteLine | 5 |
 | MultiImplementationA.cs:4:7:4:8 | call to constructor Object | MultiImplementationA.cs:4:7:4:8 | {...} | 2 |
 | MultiImplementationA.cs:4:7:4:8 | enter C1 | MultiImplementationA.cs:4:7:4:8 | enter C1 | 1 |
 | MultiImplementationA.cs:4:7:4:8 | exit C1 (normal) | MultiImplementationA.cs:4:7:4:8 | exit C1 | 2 |
@@ -1264,9 +1126,12 @@
 | cflow.cs:254:17:254:27 | goto ...; | cflow.cs:254:17:254:27 | goto ...; | 1 |
 | cflow.cs:255:13:255:20 | default: | cflow.cs:257:17:257:22 | break; | 5 |
 | cflow.cs:261:49:261:53 | enter Yield | cflow.cs:264:18:264:22 | Int32 i = ... | 7 |
+| cflow.cs:261:49:261:53 | exit Yield | cflow.cs:261:49:261:53 | exit Yield | 1 |
+| cflow.cs:261:49:261:53 | exit Yield (abnormal) | cflow.cs:261:49:261:53 | exit Yield (abnormal) | 1 |
+| cflow.cs:261:49:261:53 | exit Yield (normal) | cflow.cs:261:49:261:53 | exit Yield (normal) | 1 |
 | cflow.cs:264:25:264:25 | access to local variable i | cflow.cs:264:25:264:30 | ... < ... | 3 |
 | cflow.cs:265:9:267:9 | {...} | cflow.cs:264:33:264:35 | ...++ | 5 |
-| cflow.cs:268:9:276:9 | try {...} ... | cflow.cs:261:49:261:53 | exit Yield | 9 |
+| cflow.cs:268:9:276:9 | try {...} ... | cflow.cs:275:13:275:41 | call to method WriteLine | 7 |
 | cflow.cs:282:5:282:18 | enter ControlFlowSub | cflow.cs:282:5:282:18 | exit ControlFlowSub | 5 |
 | cflow.cs:284:5:284:18 | enter ControlFlowSub | cflow.cs:284:5:284:18 | exit ControlFlowSub | 5 |
 | cflow.cs:286:5:286:18 | enter ControlFlowSub | cflow.cs:286:5:286:18 | exit ControlFlowSub | 7 |
diff --git a/csharp/ql/test/library-tests/controlflow/graph/CONSISTENCY/CfgConsistency.expected b/csharp/ql/test/library-tests/controlflow/graph/CONSISTENCY/CfgConsistency.expected
new file mode 100644
index 00000000000..ff3ec45f5ce
--- /dev/null
+++ b/csharp/ql/test/library-tests/controlflow/graph/CONSISTENCY/CfgConsistency.expected
@@ -0,0 +1,6 @@
+multipleSuccessors
+| BreakInTry.cs:31:21:31:32 | ... == ... | false | BreakInTry.cs:22:9:34:9 | foreach (... ... in ...) ... |
+| BreakInTry.cs:31:21:31:32 | ... == ... | false | BreakInTry.cs:35:7:35:7 | ; |
+simpleAndNormalSuccessors
+| BreakInTry.cs:32:21:32:21 | ; | break | successor | BreakInTry.cs:35:7:35:7 | ; | BreakInTry.cs:22:9:34:9 | foreach (... ... in ...) ... |
+| Finally.cs:97:21:97:23 | ...-- | break | successor | Finally.cs:74:10:74:11 | exit M4 (normal) | Finally.cs:77:16:77:16 | access to local variable i |
diff --git a/csharp/ql/test/library-tests/controlflow/graph/Condition.expected b/csharp/ql/test/library-tests/controlflow/graph/Condition.expected
index a59100474ea..2c2f3dbb018 100644
--- a/csharp/ql/test/library-tests/controlflow/graph/Condition.expected
+++ b/csharp/ql/test/library-tests/controlflow/graph/Condition.expected
@@ -1,1088 +1,56 @@
 conditionBlock
 | Assert.cs:7:10:7:11 | enter M1 | Assert.cs:9:24:9:27 | null | true |
 | Assert.cs:7:10:7:11 | enter M1 | Assert.cs:9:31:9:32 | "" | false |
-| Assert.cs:9:20:9:32 | ... ? ... : ... | Assert.cs:10:9:10:31 | [assertion failure] call to method Assert | false |
-| Assert.cs:9:20:9:32 | ... ? ... : ... | Assert.cs:10:9:10:31 | [assertion success] call to method Assert | true |
 | Assert.cs:14:10:14:11 | enter M2 | Assert.cs:16:24:16:27 | null | true |
 | Assert.cs:14:10:14:11 | enter M2 | Assert.cs:16:31:16:32 | "" | false |
-| Assert.cs:16:20:16:32 | ... ? ... : ... | Assert.cs:17:9:17:24 | [assertion failure] call to method IsNull | false |
-| Assert.cs:16:20:16:32 | ... ? ... : ... | Assert.cs:17:9:17:24 | [assertion success] call to method IsNull | true |
 | Assert.cs:21:10:21:11 | enter M3 | Assert.cs:23:24:23:27 | null | true |
 | Assert.cs:21:10:21:11 | enter M3 | Assert.cs:23:31:23:32 | "" | false |
-| Assert.cs:23:20:23:32 | ... ? ... : ... | Assert.cs:24:9:24:27 | [assertion failure] call to method IsNotNull | true |
-| Assert.cs:23:20:23:32 | ... ? ... : ... | Assert.cs:24:9:24:27 | [assertion success] call to method IsNotNull | false |
 | Assert.cs:28:10:28:11 | enter M4 | Assert.cs:30:24:30:27 | null | true |
 | Assert.cs:28:10:28:11 | enter M4 | Assert.cs:30:31:30:32 | "" | false |
-| Assert.cs:30:20:30:32 | ... ? ... : ... | Assert.cs:31:9:31:32 | [assertion failure] call to method IsTrue | false |
-| Assert.cs:30:20:30:32 | ... ? ... : ... | Assert.cs:31:9:31:32 | [assertion success] call to method IsTrue | true |
 | Assert.cs:35:10:35:11 | enter M5 | Assert.cs:37:24:37:27 | null | true |
 | Assert.cs:35:10:35:11 | enter M5 | Assert.cs:37:31:37:32 | "" | false |
-| Assert.cs:37:20:37:32 | ... ? ... : ... | Assert.cs:38:9:38:32 | [assertion failure] call to method IsTrue | false |
-| Assert.cs:37:20:37:32 | ... ? ... : ... | Assert.cs:38:9:38:32 | [assertion success] call to method IsTrue | true |
 | Assert.cs:42:10:42:11 | enter M6 | Assert.cs:44:24:44:27 | null | true |
 | Assert.cs:42:10:42:11 | enter M6 | Assert.cs:44:31:44:32 | "" | false |
-| Assert.cs:44:20:44:32 | ... ? ... : ... | Assert.cs:45:9:45:33 | [assertion failure] call to method IsFalse | true |
-| Assert.cs:44:20:44:32 | ... ? ... : ... | Assert.cs:45:9:45:33 | [assertion success] call to method IsFalse | false |
 | Assert.cs:49:10:49:11 | enter M7 | Assert.cs:51:24:51:27 | null | true |
 | Assert.cs:49:10:49:11 | enter M7 | Assert.cs:51:31:51:32 | "" | false |
-| Assert.cs:51:20:51:32 | ... ? ... : ... | Assert.cs:52:9:52:33 | [assertion failure] call to method IsFalse | true |
-| Assert.cs:51:20:51:32 | ... ? ... : ... | Assert.cs:52:9:52:33 | [assertion success] call to method IsFalse | false |
-| Assert.cs:56:10:56:11 | enter M8 | Assert.cs:58:24:58:27 | [b (line 56): true] null | true |
-| Assert.cs:56:10:56:11 | enter M8 | Assert.cs:58:31:58:32 | [b (line 56): false] "" | false |
-| Assert.cs:56:10:56:11 | enter M8 | Assert.cs:59:9:59:37 | [assertion success] call to method IsTrue | true |
-| Assert.cs:56:10:56:11 | enter M8 | Assert.cs:59:23:59:36 | [true] ... && ... | true |
-| Assert.cs:56:10:56:11 | enter M8 | Assert.cs:59:36:59:36 | [b (line 56): false] access to parameter b | false |
-| Assert.cs:56:10:56:11 | enter M8 | Assert.cs:59:36:59:36 | [b (line 56): true] access to parameter b | true |
-| Assert.cs:58:24:58:27 | [b (line 56): true] null | Assert.cs:59:9:59:37 | [assertion success] call to method IsTrue | true |
-| Assert.cs:58:24:58:27 | [b (line 56): true] null | Assert.cs:59:23:59:36 | [true] ... && ... | true |
-| Assert.cs:58:24:58:27 | [b (line 56): true] null | Assert.cs:59:36:59:36 | [b (line 56): true] access to parameter b | true |
-| Assert.cs:58:31:58:32 | [b (line 56): false] "" | Assert.cs:59:36:59:36 | [b (line 56): false] access to parameter b | true |
-| Assert.cs:59:23:59:36 | [false] ... && ... | Assert.cs:59:9:59:37 | [assertion failure] call to method IsTrue | false |
-| Assert.cs:59:23:59:36 | [true] ... && ... | Assert.cs:59:9:59:37 | [assertion success] call to method IsTrue | true |
-| Assert.cs:59:36:59:36 | [b (line 56): true] access to parameter b | Assert.cs:59:9:59:37 | [assertion success] call to method IsTrue | true |
-| Assert.cs:59:36:59:36 | [b (line 56): true] access to parameter b | Assert.cs:59:23:59:36 | [true] ... && ... | true |
-| Assert.cs:63:10:63:11 | enter M9 | Assert.cs:65:24:65:27 | [b (line 63): true] null | true |
-| Assert.cs:63:10:63:11 | enter M9 | Assert.cs:65:31:65:32 | [b (line 63): false] "" | false |
-| Assert.cs:63:10:63:11 | enter M9 | Assert.cs:66:9:66:38 | [assertion success] call to method IsFalse | false |
-| Assert.cs:63:10:63:11 | enter M9 | Assert.cs:66:24:66:37 | [false] ... \|\| ... | false |
-| Assert.cs:63:10:63:11 | enter M9 | Assert.cs:66:37:66:37 | [b (line 63): false] access to parameter b | false |
-| Assert.cs:63:10:63:11 | enter M9 | Assert.cs:66:37:66:37 | [b (line 63): true] access to parameter b | true |
-| Assert.cs:65:24:65:27 | [b (line 63): true] null | Assert.cs:66:37:66:37 | [b (line 63): true] access to parameter b | false |
-| Assert.cs:65:31:65:32 | [b (line 63): false] "" | Assert.cs:66:9:66:38 | [assertion success] call to method IsFalse | false |
-| Assert.cs:65:31:65:32 | [b (line 63): false] "" | Assert.cs:66:24:66:37 | [false] ... \|\| ... | false |
-| Assert.cs:65:31:65:32 | [b (line 63): false] "" | Assert.cs:66:37:66:37 | [b (line 63): false] access to parameter b | false |
-| Assert.cs:66:24:66:37 | [false] ... \|\| ... | Assert.cs:66:9:66:38 | [assertion success] call to method IsFalse | false |
-| Assert.cs:66:24:66:37 | [true] ... \|\| ... | Assert.cs:66:9:66:38 | [assertion failure] call to method IsFalse | true |
-| Assert.cs:66:37:66:37 | [b (line 63): false] access to parameter b | Assert.cs:66:9:66:38 | [assertion success] call to method IsFalse | false |
-| Assert.cs:66:37:66:37 | [b (line 63): false] access to parameter b | Assert.cs:66:24:66:37 | [false] ... \|\| ... | false |
-| Assert.cs:70:10:70:12 | enter M10 | Assert.cs:72:24:72:27 | [b (line 70): true] null | true |
-| Assert.cs:70:10:70:12 | enter M10 | Assert.cs:72:31:72:32 | [b (line 70): false] "" | false |
-| Assert.cs:70:10:70:12 | enter M10 | Assert.cs:73:9:73:37 | [assertion success] call to method IsTrue | true |
-| Assert.cs:70:10:70:12 | enter M10 | Assert.cs:73:23:73:36 | [true] ... && ... | true |
-| Assert.cs:70:10:70:12 | enter M10 | Assert.cs:73:36:73:36 | [b (line 70): false] access to parameter b | false |
-| Assert.cs:70:10:70:12 | enter M10 | Assert.cs:73:36:73:36 | [b (line 70): true] access to parameter b | true |
-| Assert.cs:72:24:72:27 | [b (line 70): true] null | Assert.cs:73:9:73:37 | [assertion success] call to method IsTrue | true |
-| Assert.cs:72:24:72:27 | [b (line 70): true] null | Assert.cs:73:23:73:36 | [true] ... && ... | true |
-| Assert.cs:72:24:72:27 | [b (line 70): true] null | Assert.cs:73:36:73:36 | [b (line 70): true] access to parameter b | true |
-| Assert.cs:72:31:72:32 | [b (line 70): false] "" | Assert.cs:73:36:73:36 | [b (line 70): false] access to parameter b | true |
-| Assert.cs:73:23:73:36 | [false] ... && ... | Assert.cs:73:9:73:37 | [assertion failure] call to method IsTrue | false |
-| Assert.cs:73:23:73:36 | [true] ... && ... | Assert.cs:73:9:73:37 | [assertion success] call to method IsTrue | true |
-| Assert.cs:73:36:73:36 | [b (line 70): true] access to parameter b | Assert.cs:73:9:73:37 | [assertion success] call to method IsTrue | true |
-| Assert.cs:73:36:73:36 | [b (line 70): true] access to parameter b | Assert.cs:73:23:73:36 | [true] ... && ... | true |
-| Assert.cs:77:10:77:12 | enter M11 | Assert.cs:79:24:79:27 | [b (line 77): true] null | true |
-| Assert.cs:77:10:77:12 | enter M11 | Assert.cs:79:31:79:32 | [b (line 77): false] "" | false |
-| Assert.cs:77:10:77:12 | enter M11 | Assert.cs:80:9:80:38 | [assertion success] call to method IsFalse | false |
-| Assert.cs:77:10:77:12 | enter M11 | Assert.cs:80:24:80:37 | [false] ... \|\| ... | false |
-| Assert.cs:77:10:77:12 | enter M11 | Assert.cs:80:37:80:37 | [b (line 77): false] access to parameter b | false |
-| Assert.cs:77:10:77:12 | enter M11 | Assert.cs:80:37:80:37 | [b (line 77): true] access to parameter b | true |
-| Assert.cs:79:24:79:27 | [b (line 77): true] null | Assert.cs:80:37:80:37 | [b (line 77): true] access to parameter b | false |
-| Assert.cs:79:31:79:32 | [b (line 77): false] "" | Assert.cs:80:9:80:38 | [assertion success] call to method IsFalse | false |
-| Assert.cs:79:31:79:32 | [b (line 77): false] "" | Assert.cs:80:24:80:37 | [false] ... \|\| ... | false |
-| Assert.cs:79:31:79:32 | [b (line 77): false] "" | Assert.cs:80:37:80:37 | [b (line 77): false] access to parameter b | false |
-| Assert.cs:80:24:80:37 | [false] ... \|\| ... | Assert.cs:80:9:80:38 | [assertion success] call to method IsFalse | false |
-| Assert.cs:80:24:80:37 | [true] ... \|\| ... | Assert.cs:80:9:80:38 | [assertion failure] call to method IsFalse | true |
-| Assert.cs:80:37:80:37 | [b (line 77): false] access to parameter b | Assert.cs:80:9:80:38 | [assertion success] call to method IsFalse | false |
-| Assert.cs:80:37:80:37 | [b (line 77): false] access to parameter b | Assert.cs:80:24:80:37 | [false] ... \|\| ... | false |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:86:24:86:27 | [b (line 84): true] null | true |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:86:31:86:32 | [b (line 84): false] "" | false |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:87:9:87:31 | [assertion failure, b (line 84): false] call to method Assert | false |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:87:9:87:31 | [assertion failure, b (line 84): true] call to method Assert | true |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | false |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | true |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:90:17:90:20 | [b (line 84): true] null | true |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:90:24:90:25 | [b (line 84): false] "" | false |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:91:9:91:24 | [assertion failure, b (line 84): false] call to method IsNull | false |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:91:9:91:24 | [assertion failure, b (line 84): true] call to method IsNull | true |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull | false |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | true |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:94:17:94:20 | [b (line 84): true] null | true |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:94:24:94:25 | [b (line 84): false] "" | false |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:95:9:95:27 | [assertion failure, b (line 84): false] call to method IsNotNull | false |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:95:9:95:27 | [assertion failure, b (line 84): true] call to method IsNotNull | true |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull | false |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | true |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:98:17:98:20 | [b (line 84): true] null | true |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:98:24:98:25 | [b (line 84): false] "" | false |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:99:9:99:32 | [assertion failure, b (line 84): false] call to method IsTrue | false |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:99:9:99:32 | [assertion failure, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue | false |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:102:17:102:20 | [b (line 84): true] null | true |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:102:24:102:25 | [b (line 84): false] "" | false |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:103:9:103:32 | [assertion failure, b (line 84): false] call to method IsTrue | false |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:103:9:103:32 | [assertion failure, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue | false |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:106:17:106:20 | [b (line 84): true] null | true |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:106:24:106:25 | [b (line 84): false] "" | false |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): false] call to method IsFalse | false |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:107:9:107:33 | [assertion success, b (line 84): false] call to method IsFalse | false |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:110:17:110:20 | [b (line 84): true] null | true |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:110:24:110:25 | [b (line 84): false] "" | false |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): false] call to method IsFalse | false |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:111:9:111:33 | [assertion success, b (line 84): false] call to method IsFalse | false |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:114:17:114:20 | [b (line 84): true] null | true |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:114:24:114:25 | [b (line 84): false] "" | false |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): false] call to method IsTrue | false |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:115:23:115:36 | [false, b (line 84): false] ... && ... | false |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:115:23:115:36 | [false, b (line 84): true] ... && ... | true |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | true |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:115:36:115:36 | [b (line 84): false] access to parameter b | false |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:118:17:118:20 | [b (line 84): true] null | true |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | true |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... | true |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | true |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:122:17:122:20 | [b (line 84): true] null | true |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... | true |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | true |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:126:17:126:20 | [b (line 84): true] null | true |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse | true |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | true |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:127:24:127:38 | [false] ... \|\| ... | true |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:127:24:127:38 | [true] ... \|\| ... | true |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:127:37:127:38 | [false] !... | true |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:87:9:87:31 | [assertion failure, b (line 84): true] call to method Assert | false |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | true |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:90:17:90:20 | [b (line 84): true] null | true |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:91:9:91:24 | [assertion failure, b (line 84): true] call to method IsNull | true |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | true |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:94:17:94:20 | [b (line 84): true] null | true |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:95:9:95:27 | [assertion failure, b (line 84): true] call to method IsNotNull | true |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | true |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:98:17:98:20 | [b (line 84): true] null | true |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:99:9:99:32 | [assertion failure, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:102:17:102:20 | [b (line 84): true] null | true |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:103:9:103:32 | [assertion failure, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:106:17:106:20 | [b (line 84): true] null | true |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:110:17:110:20 | [b (line 84): true] null | true |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:114:17:114:20 | [b (line 84): true] null | true |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:115:23:115:36 | [false, b (line 84): true] ... && ... | true |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | true |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:118:17:118:20 | [b (line 84): true] null | true |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | true |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... | true |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | true |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:122:17:122:20 | [b (line 84): true] null | true |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... | true |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | true |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:126:17:126:20 | [b (line 84): true] null | true |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse | true |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | true |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:127:24:127:38 | [false] ... \|\| ... | true |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:127:24:127:38 | [true] ... \|\| ... | true |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:127:37:127:38 | [false] !... | true |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:87:9:87:31 | [assertion failure, b (line 84): false] call to method Assert | false |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | true |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:90:24:90:25 | [b (line 84): false] "" | true |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:91:9:91:24 | [assertion failure, b (line 84): false] call to method IsNull | true |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull | true |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:94:24:94:25 | [b (line 84): false] "" | true |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:95:9:95:27 | [assertion failure, b (line 84): false] call to method IsNotNull | true |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull | true |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:98:24:98:25 | [b (line 84): false] "" | true |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:99:9:99:32 | [assertion failure, b (line 84): false] call to method IsTrue | true |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue | true |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:102:24:102:25 | [b (line 84): false] "" | true |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:103:9:103:32 | [assertion failure, b (line 84): false] call to method IsTrue | true |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue | true |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:106:24:106:25 | [b (line 84): false] "" | true |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): false] call to method IsFalse | true |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:107:9:107:33 | [assertion success, b (line 84): false] call to method IsFalse | true |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:110:24:110:25 | [b (line 84): false] "" | true |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): false] call to method IsFalse | true |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:111:9:111:33 | [assertion success, b (line 84): false] call to method IsFalse | true |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:114:24:114:25 | [b (line 84): false] "" | true |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): false] call to method IsTrue | true |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:115:23:115:36 | [false, b (line 84): false] ... && ... | true |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:115:36:115:36 | [b (line 84): false] access to parameter b | true |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | Assert.cs:90:24:90:25 | [b (line 84): false] "" | false |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | Assert.cs:91:9:91:24 | [assertion failure, b (line 84): false] call to method IsNull | false |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull | false |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | Assert.cs:94:24:94:25 | [b (line 84): false] "" | false |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | Assert.cs:95:9:95:27 | [assertion failure, b (line 84): false] call to method IsNotNull | false |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull | false |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | Assert.cs:98:24:98:25 | [b (line 84): false] "" | false |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | Assert.cs:99:9:99:32 | [assertion failure, b (line 84): false] call to method IsTrue | false |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue | false |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | Assert.cs:102:24:102:25 | [b (line 84): false] "" | false |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | Assert.cs:103:9:103:32 | [assertion failure, b (line 84): false] call to method IsTrue | false |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue | false |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | Assert.cs:106:24:106:25 | [b (line 84): false] "" | false |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): false] call to method IsFalse | false |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | Assert.cs:107:9:107:33 | [assertion success, b (line 84): false] call to method IsFalse | false |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | Assert.cs:110:24:110:25 | [b (line 84): false] "" | false |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): false] call to method IsFalse | false |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | Assert.cs:111:9:111:33 | [assertion success, b (line 84): false] call to method IsFalse | false |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | Assert.cs:114:24:114:25 | [b (line 84): false] "" | false |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): false] call to method IsTrue | false |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | Assert.cs:115:23:115:36 | [false, b (line 84): false] ... && ... | false |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | Assert.cs:115:36:115:36 | [b (line 84): false] access to parameter b | false |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:90:17:90:20 | [b (line 84): true] null | true |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:91:9:91:24 | [assertion failure, b (line 84): true] call to method IsNull | true |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | true |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:94:17:94:20 | [b (line 84): true] null | true |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:95:9:95:27 | [assertion failure, b (line 84): true] call to method IsNotNull | true |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | true |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:98:17:98:20 | [b (line 84): true] null | true |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:99:9:99:32 | [assertion failure, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:102:17:102:20 | [b (line 84): true] null | true |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:103:9:103:32 | [assertion failure, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:106:17:106:20 | [b (line 84): true] null | true |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:110:17:110:20 | [b (line 84): true] null | true |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:114:17:114:20 | [b (line 84): true] null | true |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:115:23:115:36 | [false, b (line 84): true] ... && ... | true |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | true |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:118:17:118:20 | [b (line 84): true] null | true |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | true |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... | true |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | true |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:122:17:122:20 | [b (line 84): true] null | true |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... | true |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | true |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:126:17:126:20 | [b (line 84): true] null | true |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse | true |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | true |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:127:24:127:38 | [false] ... \|\| ... | true |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:127:24:127:38 | [true] ... \|\| ... | true |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:127:37:127:38 | [false] !... | true |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:91:9:91:24 | [assertion failure, b (line 84): true] call to method IsNull | false |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | true |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:94:17:94:20 | [b (line 84): true] null | true |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:95:9:95:27 | [assertion failure, b (line 84): true] call to method IsNotNull | true |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | true |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:98:17:98:20 | [b (line 84): true] null | true |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:99:9:99:32 | [assertion failure, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:102:17:102:20 | [b (line 84): true] null | true |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:103:9:103:32 | [assertion failure, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:106:17:106:20 | [b (line 84): true] null | true |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:110:17:110:20 | [b (line 84): true] null | true |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:114:17:114:20 | [b (line 84): true] null | true |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:115:23:115:36 | [false, b (line 84): true] ... && ... | true |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | true |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:118:17:118:20 | [b (line 84): true] null | true |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | true |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... | true |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | true |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:122:17:122:20 | [b (line 84): true] null | true |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... | true |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | true |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:126:17:126:20 | [b (line 84): true] null | true |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse | true |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | true |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:127:24:127:38 | [false] ... \|\| ... | true |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:127:24:127:38 | [true] ... \|\| ... | true |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:127:37:127:38 | [false] !... | true |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:90:24:90:25 | [b (line 84): false] "" | Assert.cs:91:9:91:24 | [assertion failure, b (line 84): false] call to method IsNull | false |
-| Assert.cs:90:24:90:25 | [b (line 84): false] "" | Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull | true |
-| Assert.cs:90:24:90:25 | [b (line 84): false] "" | Assert.cs:94:24:94:25 | [b (line 84): false] "" | true |
-| Assert.cs:90:24:90:25 | [b (line 84): false] "" | Assert.cs:95:9:95:27 | [assertion failure, b (line 84): false] call to method IsNotNull | true |
-| Assert.cs:90:24:90:25 | [b (line 84): false] "" | Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull | true |
-| Assert.cs:90:24:90:25 | [b (line 84): false] "" | Assert.cs:98:24:98:25 | [b (line 84): false] "" | true |
-| Assert.cs:90:24:90:25 | [b (line 84): false] "" | Assert.cs:99:9:99:32 | [assertion failure, b (line 84): false] call to method IsTrue | true |
-| Assert.cs:90:24:90:25 | [b (line 84): false] "" | Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue | true |
-| Assert.cs:90:24:90:25 | [b (line 84): false] "" | Assert.cs:102:24:102:25 | [b (line 84): false] "" | true |
-| Assert.cs:90:24:90:25 | [b (line 84): false] "" | Assert.cs:103:9:103:32 | [assertion failure, b (line 84): false] call to method IsTrue | true |
-| Assert.cs:90:24:90:25 | [b (line 84): false] "" | Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue | true |
-| Assert.cs:90:24:90:25 | [b (line 84): false] "" | Assert.cs:106:24:106:25 | [b (line 84): false] "" | true |
-| Assert.cs:90:24:90:25 | [b (line 84): false] "" | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): false] call to method IsFalse | true |
-| Assert.cs:90:24:90:25 | [b (line 84): false] "" | Assert.cs:107:9:107:33 | [assertion success, b (line 84): false] call to method IsFalse | true |
-| Assert.cs:90:24:90:25 | [b (line 84): false] "" | Assert.cs:110:24:110:25 | [b (line 84): false] "" | true |
-| Assert.cs:90:24:90:25 | [b (line 84): false] "" | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): false] call to method IsFalse | true |
-| Assert.cs:90:24:90:25 | [b (line 84): false] "" | Assert.cs:111:9:111:33 | [assertion success, b (line 84): false] call to method IsFalse | true |
-| Assert.cs:90:24:90:25 | [b (line 84): false] "" | Assert.cs:114:24:114:25 | [b (line 84): false] "" | true |
-| Assert.cs:90:24:90:25 | [b (line 84): false] "" | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): false] call to method IsTrue | true |
-| Assert.cs:90:24:90:25 | [b (line 84): false] "" | Assert.cs:115:23:115:36 | [false, b (line 84): false] ... && ... | true |
-| Assert.cs:90:24:90:25 | [b (line 84): false] "" | Assert.cs:115:36:115:36 | [b (line 84): false] access to parameter b | true |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull | Assert.cs:94:24:94:25 | [b (line 84): false] "" | false |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull | Assert.cs:95:9:95:27 | [assertion failure, b (line 84): false] call to method IsNotNull | false |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull | Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull | false |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull | Assert.cs:98:24:98:25 | [b (line 84): false] "" | false |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull | Assert.cs:99:9:99:32 | [assertion failure, b (line 84): false] call to method IsTrue | false |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull | Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue | false |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull | Assert.cs:102:24:102:25 | [b (line 84): false] "" | false |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull | Assert.cs:103:9:103:32 | [assertion failure, b (line 84): false] call to method IsTrue | false |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull | Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue | false |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull | Assert.cs:106:24:106:25 | [b (line 84): false] "" | false |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): false] call to method IsFalse | false |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull | Assert.cs:107:9:107:33 | [assertion success, b (line 84): false] call to method IsFalse | false |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull | Assert.cs:110:24:110:25 | [b (line 84): false] "" | false |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): false] call to method IsFalse | false |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull | Assert.cs:111:9:111:33 | [assertion success, b (line 84): false] call to method IsFalse | false |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull | Assert.cs:114:24:114:25 | [b (line 84): false] "" | false |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): false] call to method IsTrue | false |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull | Assert.cs:115:23:115:36 | [false, b (line 84): false] ... && ... | false |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull | Assert.cs:115:36:115:36 | [b (line 84): false] access to parameter b | false |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:94:17:94:20 | [b (line 84): true] null | true |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:95:9:95:27 | [assertion failure, b (line 84): true] call to method IsNotNull | true |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | true |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:98:17:98:20 | [b (line 84): true] null | true |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:99:9:99:32 | [assertion failure, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:102:17:102:20 | [b (line 84): true] null | true |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:103:9:103:32 | [assertion failure, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:106:17:106:20 | [b (line 84): true] null | true |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:110:17:110:20 | [b (line 84): true] null | true |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:114:17:114:20 | [b (line 84): true] null | true |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:115:23:115:36 | [false, b (line 84): true] ... && ... | true |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | true |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:118:17:118:20 | [b (line 84): true] null | true |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | true |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... | true |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | true |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:122:17:122:20 | [b (line 84): true] null | true |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... | true |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | true |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:126:17:126:20 | [b (line 84): true] null | true |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse | true |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | true |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:127:24:127:38 | [false] ... \|\| ... | true |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:127:24:127:38 | [true] ... \|\| ... | true |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:127:37:127:38 | [false] !... | true |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:95:9:95:27 | [assertion failure, b (line 84): true] call to method IsNotNull | true |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | false |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:98:17:98:20 | [b (line 84): true] null | false |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:99:9:99:32 | [assertion failure, b (line 84): true] call to method IsTrue | false |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | false |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:102:17:102:20 | [b (line 84): true] null | false |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:103:9:103:32 | [assertion failure, b (line 84): true] call to method IsTrue | false |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | false |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:106:17:106:20 | [b (line 84): true] null | false |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): true] call to method IsFalse | false |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | false |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:110:17:110:20 | [b (line 84): true] null | false |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): true] call to method IsFalse | false |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | false |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:114:17:114:20 | [b (line 84): true] null | false |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): true] call to method IsTrue | false |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | false |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:115:23:115:36 | [false, b (line 84): true] ... && ... | false |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | false |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | false |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:118:17:118:20 | [b (line 84): true] null | false |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse | false |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | false |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | false |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... | false |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | false |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | false |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:122:17:122:20 | [b (line 84): true] null | false |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue | false |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | false |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... | false |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | false |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | false |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:126:17:126:20 | [b (line 84): true] null | false |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse | false |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | false |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:127:24:127:38 | [false] ... \|\| ... | false |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:127:24:127:38 | [true] ... \|\| ... | false |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:127:37:127:38 | [false] !... | false |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | false |
-| Assert.cs:94:24:94:25 | [b (line 84): false] "" | Assert.cs:95:9:95:27 | [assertion failure, b (line 84): false] call to method IsNotNull | true |
-| Assert.cs:94:24:94:25 | [b (line 84): false] "" | Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull | false |
-| Assert.cs:94:24:94:25 | [b (line 84): false] "" | Assert.cs:98:24:98:25 | [b (line 84): false] "" | false |
-| Assert.cs:94:24:94:25 | [b (line 84): false] "" | Assert.cs:99:9:99:32 | [assertion failure, b (line 84): false] call to method IsTrue | false |
-| Assert.cs:94:24:94:25 | [b (line 84): false] "" | Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue | false |
-| Assert.cs:94:24:94:25 | [b (line 84): false] "" | Assert.cs:102:24:102:25 | [b (line 84): false] "" | false |
-| Assert.cs:94:24:94:25 | [b (line 84): false] "" | Assert.cs:103:9:103:32 | [assertion failure, b (line 84): false] call to method IsTrue | false |
-| Assert.cs:94:24:94:25 | [b (line 84): false] "" | Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue | false |
-| Assert.cs:94:24:94:25 | [b (line 84): false] "" | Assert.cs:106:24:106:25 | [b (line 84): false] "" | false |
-| Assert.cs:94:24:94:25 | [b (line 84): false] "" | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): false] call to method IsFalse | false |
-| Assert.cs:94:24:94:25 | [b (line 84): false] "" | Assert.cs:107:9:107:33 | [assertion success, b (line 84): false] call to method IsFalse | false |
-| Assert.cs:94:24:94:25 | [b (line 84): false] "" | Assert.cs:110:24:110:25 | [b (line 84): false] "" | false |
-| Assert.cs:94:24:94:25 | [b (line 84): false] "" | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): false] call to method IsFalse | false |
-| Assert.cs:94:24:94:25 | [b (line 84): false] "" | Assert.cs:111:9:111:33 | [assertion success, b (line 84): false] call to method IsFalse | false |
-| Assert.cs:94:24:94:25 | [b (line 84): false] "" | Assert.cs:114:24:114:25 | [b (line 84): false] "" | false |
-| Assert.cs:94:24:94:25 | [b (line 84): false] "" | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): false] call to method IsTrue | false |
-| Assert.cs:94:24:94:25 | [b (line 84): false] "" | Assert.cs:115:23:115:36 | [false, b (line 84): false] ... && ... | false |
-| Assert.cs:94:24:94:25 | [b (line 84): false] "" | Assert.cs:115:36:115:36 | [b (line 84): false] access to parameter b | false |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull | Assert.cs:98:24:98:25 | [b (line 84): false] "" | false |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull | Assert.cs:99:9:99:32 | [assertion failure, b (line 84): false] call to method IsTrue | false |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull | Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue | false |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull | Assert.cs:102:24:102:25 | [b (line 84): false] "" | false |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull | Assert.cs:103:9:103:32 | [assertion failure, b (line 84): false] call to method IsTrue | false |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull | Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue | false |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull | Assert.cs:106:24:106:25 | [b (line 84): false] "" | false |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): false] call to method IsFalse | false |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull | Assert.cs:107:9:107:33 | [assertion success, b (line 84): false] call to method IsFalse | false |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull | Assert.cs:110:24:110:25 | [b (line 84): false] "" | false |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): false] call to method IsFalse | false |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull | Assert.cs:111:9:111:33 | [assertion success, b (line 84): false] call to method IsFalse | false |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull | Assert.cs:114:24:114:25 | [b (line 84): false] "" | false |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): false] call to method IsTrue | false |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull | Assert.cs:115:23:115:36 | [false, b (line 84): false] ... && ... | false |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull | Assert.cs:115:36:115:36 | [b (line 84): false] access to parameter b | false |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:98:17:98:20 | [b (line 84): true] null | true |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:99:9:99:32 | [assertion failure, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:102:17:102:20 | [b (line 84): true] null | true |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:103:9:103:32 | [assertion failure, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:106:17:106:20 | [b (line 84): true] null | true |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:110:17:110:20 | [b (line 84): true] null | true |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:114:17:114:20 | [b (line 84): true] null | true |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:115:23:115:36 | [false, b (line 84): true] ... && ... | true |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | true |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:118:17:118:20 | [b (line 84): true] null | true |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | true |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... | true |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | true |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:122:17:122:20 | [b (line 84): true] null | true |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... | true |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | true |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:126:17:126:20 | [b (line 84): true] null | true |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse | true |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | true |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:127:24:127:38 | [false] ... \|\| ... | true |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:127:24:127:38 | [true] ... \|\| ... | true |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:127:37:127:38 | [false] !... | true |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:99:9:99:32 | [assertion failure, b (line 84): true] call to method IsTrue | false |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:102:17:102:20 | [b (line 84): true] null | true |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:103:9:103:32 | [assertion failure, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:106:17:106:20 | [b (line 84): true] null | true |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:110:17:110:20 | [b (line 84): true] null | true |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:114:17:114:20 | [b (line 84): true] null | true |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:115:23:115:36 | [false, b (line 84): true] ... && ... | true |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | true |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:118:17:118:20 | [b (line 84): true] null | true |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | true |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... | true |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | true |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:122:17:122:20 | [b (line 84): true] null | true |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... | true |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | true |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:126:17:126:20 | [b (line 84): true] null | true |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse | true |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | true |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:127:24:127:38 | [false] ... \|\| ... | true |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:127:24:127:38 | [true] ... \|\| ... | true |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:127:37:127:38 | [false] !... | true |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:98:24:98:25 | [b (line 84): false] "" | Assert.cs:99:9:99:32 | [assertion failure, b (line 84): false] call to method IsTrue | false |
-| Assert.cs:98:24:98:25 | [b (line 84): false] "" | Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue | true |
-| Assert.cs:98:24:98:25 | [b (line 84): false] "" | Assert.cs:102:24:102:25 | [b (line 84): false] "" | true |
-| Assert.cs:98:24:98:25 | [b (line 84): false] "" | Assert.cs:103:9:103:32 | [assertion failure, b (line 84): false] call to method IsTrue | true |
-| Assert.cs:98:24:98:25 | [b (line 84): false] "" | Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue | true |
-| Assert.cs:98:24:98:25 | [b (line 84): false] "" | Assert.cs:106:24:106:25 | [b (line 84): false] "" | true |
-| Assert.cs:98:24:98:25 | [b (line 84): false] "" | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): false] call to method IsFalse | true |
-| Assert.cs:98:24:98:25 | [b (line 84): false] "" | Assert.cs:107:9:107:33 | [assertion success, b (line 84): false] call to method IsFalse | true |
-| Assert.cs:98:24:98:25 | [b (line 84): false] "" | Assert.cs:110:24:110:25 | [b (line 84): false] "" | true |
-| Assert.cs:98:24:98:25 | [b (line 84): false] "" | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): false] call to method IsFalse | true |
-| Assert.cs:98:24:98:25 | [b (line 84): false] "" | Assert.cs:111:9:111:33 | [assertion success, b (line 84): false] call to method IsFalse | true |
-| Assert.cs:98:24:98:25 | [b (line 84): false] "" | Assert.cs:114:24:114:25 | [b (line 84): false] "" | true |
-| Assert.cs:98:24:98:25 | [b (line 84): false] "" | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): false] call to method IsTrue | true |
-| Assert.cs:98:24:98:25 | [b (line 84): false] "" | Assert.cs:115:23:115:36 | [false, b (line 84): false] ... && ... | true |
-| Assert.cs:98:24:98:25 | [b (line 84): false] "" | Assert.cs:115:36:115:36 | [b (line 84): false] access to parameter b | true |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:102:24:102:25 | [b (line 84): false] "" | false |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:103:9:103:32 | [assertion failure, b (line 84): false] call to method IsTrue | false |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue | false |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:106:24:106:25 | [b (line 84): false] "" | false |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): false] call to method IsFalse | false |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:107:9:107:33 | [assertion success, b (line 84): false] call to method IsFalse | false |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:110:24:110:25 | [b (line 84): false] "" | false |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): false] call to method IsFalse | false |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:111:9:111:33 | [assertion success, b (line 84): false] call to method IsFalse | false |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:114:24:114:25 | [b (line 84): false] "" | false |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): false] call to method IsTrue | false |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:115:23:115:36 | [false, b (line 84): false] ... && ... | false |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:115:36:115:36 | [b (line 84): false] access to parameter b | false |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:102:17:102:20 | [b (line 84): true] null | true |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:103:9:103:32 | [assertion failure, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:106:17:106:20 | [b (line 84): true] null | true |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:110:17:110:20 | [b (line 84): true] null | true |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:114:17:114:20 | [b (line 84): true] null | true |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:115:23:115:36 | [false, b (line 84): true] ... && ... | true |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | true |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:118:17:118:20 | [b (line 84): true] null | true |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | true |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... | true |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | true |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:122:17:122:20 | [b (line 84): true] null | true |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... | true |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | true |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:126:17:126:20 | [b (line 84): true] null | true |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse | true |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | true |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:127:24:127:38 | [false] ... \|\| ... | true |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:127:24:127:38 | [true] ... \|\| ... | true |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:127:37:127:38 | [false] !... | true |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:103:9:103:32 | [assertion failure, b (line 84): true] call to method IsTrue | false |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:106:17:106:20 | [b (line 84): true] null | true |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:110:17:110:20 | [b (line 84): true] null | true |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:114:17:114:20 | [b (line 84): true] null | true |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:115:23:115:36 | [false, b (line 84): true] ... && ... | true |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | true |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:118:17:118:20 | [b (line 84): true] null | true |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | true |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... | true |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | true |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:122:17:122:20 | [b (line 84): true] null | true |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... | true |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | true |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:126:17:126:20 | [b (line 84): true] null | true |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse | true |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | true |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:127:24:127:38 | [false] ... \|\| ... | true |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:127:24:127:38 | [true] ... \|\| ... | true |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:127:37:127:38 | [false] !... | true |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:102:24:102:25 | [b (line 84): false] "" | Assert.cs:103:9:103:32 | [assertion failure, b (line 84): false] call to method IsTrue | false |
-| Assert.cs:102:24:102:25 | [b (line 84): false] "" | Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue | true |
-| Assert.cs:102:24:102:25 | [b (line 84): false] "" | Assert.cs:106:24:106:25 | [b (line 84): false] "" | true |
-| Assert.cs:102:24:102:25 | [b (line 84): false] "" | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): false] call to method IsFalse | true |
-| Assert.cs:102:24:102:25 | [b (line 84): false] "" | Assert.cs:107:9:107:33 | [assertion success, b (line 84): false] call to method IsFalse | true |
-| Assert.cs:102:24:102:25 | [b (line 84): false] "" | Assert.cs:110:24:110:25 | [b (line 84): false] "" | true |
-| Assert.cs:102:24:102:25 | [b (line 84): false] "" | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): false] call to method IsFalse | true |
-| Assert.cs:102:24:102:25 | [b (line 84): false] "" | Assert.cs:111:9:111:33 | [assertion success, b (line 84): false] call to method IsFalse | true |
-| Assert.cs:102:24:102:25 | [b (line 84): false] "" | Assert.cs:114:24:114:25 | [b (line 84): false] "" | true |
-| Assert.cs:102:24:102:25 | [b (line 84): false] "" | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): false] call to method IsTrue | true |
-| Assert.cs:102:24:102:25 | [b (line 84): false] "" | Assert.cs:115:23:115:36 | [false, b (line 84): false] ... && ... | true |
-| Assert.cs:102:24:102:25 | [b (line 84): false] "" | Assert.cs:115:36:115:36 | [b (line 84): false] access to parameter b | true |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:106:24:106:25 | [b (line 84): false] "" | false |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): false] call to method IsFalse | false |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:107:9:107:33 | [assertion success, b (line 84): false] call to method IsFalse | false |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:110:24:110:25 | [b (line 84): false] "" | false |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): false] call to method IsFalse | false |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:111:9:111:33 | [assertion success, b (line 84): false] call to method IsFalse | false |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:114:24:114:25 | [b (line 84): false] "" | false |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): false] call to method IsTrue | false |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:115:23:115:36 | [false, b (line 84): false] ... && ... | false |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:115:36:115:36 | [b (line 84): false] access to parameter b | false |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:106:17:106:20 | [b (line 84): true] null | true |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:110:17:110:20 | [b (line 84): true] null | true |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:114:17:114:20 | [b (line 84): true] null | true |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:115:23:115:36 | [false, b (line 84): true] ... && ... | true |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | true |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:118:17:118:20 | [b (line 84): true] null | true |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | true |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... | true |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | true |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:122:17:122:20 | [b (line 84): true] null | true |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... | true |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | true |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:126:17:126:20 | [b (line 84): true] null | true |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse | true |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | true |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:127:24:127:38 | [false] ... \|\| ... | true |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:127:24:127:38 | [true] ... \|\| ... | true |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:127:37:127:38 | [false] !... | true |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | false |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:110:17:110:20 | [b (line 84): true] null | false |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): true] call to method IsFalse | false |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | false |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:114:17:114:20 | [b (line 84): true] null | false |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): true] call to method IsTrue | false |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | false |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:115:23:115:36 | [false, b (line 84): true] ... && ... | false |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | false |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | false |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:118:17:118:20 | [b (line 84): true] null | false |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse | false |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | false |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | false |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... | false |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | false |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | false |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:122:17:122:20 | [b (line 84): true] null | false |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue | false |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | false |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... | false |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | false |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | false |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:126:17:126:20 | [b (line 84): true] null | false |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse | false |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | false |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:127:24:127:38 | [false] ... \|\| ... | false |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:127:24:127:38 | [true] ... \|\| ... | false |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:127:37:127:38 | [false] !... | false |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | false |
-| Assert.cs:106:24:106:25 | [b (line 84): false] "" | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): false] call to method IsFalse | true |
-| Assert.cs:106:24:106:25 | [b (line 84): false] "" | Assert.cs:107:9:107:33 | [assertion success, b (line 84): false] call to method IsFalse | false |
-| Assert.cs:106:24:106:25 | [b (line 84): false] "" | Assert.cs:110:24:110:25 | [b (line 84): false] "" | false |
-| Assert.cs:106:24:106:25 | [b (line 84): false] "" | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): false] call to method IsFalse | false |
-| Assert.cs:106:24:106:25 | [b (line 84): false] "" | Assert.cs:111:9:111:33 | [assertion success, b (line 84): false] call to method IsFalse | false |
-| Assert.cs:106:24:106:25 | [b (line 84): false] "" | Assert.cs:114:24:114:25 | [b (line 84): false] "" | false |
-| Assert.cs:106:24:106:25 | [b (line 84): false] "" | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): false] call to method IsTrue | false |
-| Assert.cs:106:24:106:25 | [b (line 84): false] "" | Assert.cs:115:23:115:36 | [false, b (line 84): false] ... && ... | false |
-| Assert.cs:106:24:106:25 | [b (line 84): false] "" | Assert.cs:115:36:115:36 | [b (line 84): false] access to parameter b | false |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): false] call to method IsFalse | Assert.cs:110:24:110:25 | [b (line 84): false] "" | false |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): false] call to method IsFalse | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): false] call to method IsFalse | false |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): false] call to method IsFalse | Assert.cs:111:9:111:33 | [assertion success, b (line 84): false] call to method IsFalse | false |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): false] call to method IsFalse | Assert.cs:114:24:114:25 | [b (line 84): false] "" | false |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): false] call to method IsFalse | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): false] call to method IsTrue | false |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): false] call to method IsFalse | Assert.cs:115:23:115:36 | [false, b (line 84): false] ... && ... | false |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): false] call to method IsFalse | Assert.cs:115:36:115:36 | [b (line 84): false] access to parameter b | false |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:110:17:110:20 | [b (line 84): true] null | true |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:114:17:114:20 | [b (line 84): true] null | true |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:115:23:115:36 | [false, b (line 84): true] ... && ... | true |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | true |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:118:17:118:20 | [b (line 84): true] null | true |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | true |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... | true |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | true |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:122:17:122:20 | [b (line 84): true] null | true |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... | true |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | true |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:126:17:126:20 | [b (line 84): true] null | true |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse | true |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | true |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:127:24:127:38 | [false] ... \|\| ... | true |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:127:24:127:38 | [true] ... \|\| ... | true |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:127:37:127:38 | [false] !... | true |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | false |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:114:17:114:20 | [b (line 84): true] null | false |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): true] call to method IsTrue | false |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | false |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:115:23:115:36 | [false, b (line 84): true] ... && ... | false |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | false |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | false |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:118:17:118:20 | [b (line 84): true] null | false |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse | false |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | false |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | false |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... | false |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | false |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | false |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:122:17:122:20 | [b (line 84): true] null | false |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue | false |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | false |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... | false |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | false |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | false |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:126:17:126:20 | [b (line 84): true] null | false |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse | false |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | false |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:127:24:127:38 | [false] ... \|\| ... | false |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:127:24:127:38 | [true] ... \|\| ... | false |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:127:37:127:38 | [false] !... | false |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | false |
-| Assert.cs:110:24:110:25 | [b (line 84): false] "" | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): false] call to method IsFalse | true |
-| Assert.cs:110:24:110:25 | [b (line 84): false] "" | Assert.cs:111:9:111:33 | [assertion success, b (line 84): false] call to method IsFalse | false |
-| Assert.cs:110:24:110:25 | [b (line 84): false] "" | Assert.cs:114:24:114:25 | [b (line 84): false] "" | false |
-| Assert.cs:110:24:110:25 | [b (line 84): false] "" | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): false] call to method IsTrue | false |
-| Assert.cs:110:24:110:25 | [b (line 84): false] "" | Assert.cs:115:23:115:36 | [false, b (line 84): false] ... && ... | false |
-| Assert.cs:110:24:110:25 | [b (line 84): false] "" | Assert.cs:115:36:115:36 | [b (line 84): false] access to parameter b | false |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): false] call to method IsFalse | Assert.cs:114:24:114:25 | [b (line 84): false] "" | false |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): false] call to method IsFalse | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): false] call to method IsTrue | false |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): false] call to method IsFalse | Assert.cs:115:23:115:36 | [false, b (line 84): false] ... && ... | false |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): false] call to method IsFalse | Assert.cs:115:36:115:36 | [b (line 84): false] access to parameter b | false |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:114:17:114:20 | [b (line 84): true] null | true |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:115:23:115:36 | [false, b (line 84): true] ... && ... | true |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | true |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:118:17:118:20 | [b (line 84): true] null | true |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | true |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... | true |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | true |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:122:17:122:20 | [b (line 84): true] null | true |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... | true |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | true |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:126:17:126:20 | [b (line 84): true] null | true |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse | true |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | true |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:127:24:127:38 | [false] ... \|\| ... | true |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:127:24:127:38 | [true] ... \|\| ... | true |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:127:37:127:38 | [false] !... | true |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): true] call to method IsTrue | false |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:115:23:115:36 | [false, b (line 84): true] ... && ... | false |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | true |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:118:17:118:20 | [b (line 84): true] null | true |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | true |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... | true |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | true |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:122:17:122:20 | [b (line 84): true] null | true |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... | true |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | true |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:126:17:126:20 | [b (line 84): true] null | true |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse | true |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | true |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:127:24:127:38 | [false] ... \|\| ... | true |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:127:24:127:38 | [true] ... \|\| ... | true |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:127:37:127:38 | [false] !... | true |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:114:24:114:25 | [b (line 84): false] "" | Assert.cs:115:36:115:36 | [b (line 84): false] access to parameter b | true |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:118:17:118:20 | [b (line 84): true] null | true |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | true |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... | true |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | true |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:122:17:122:20 | [b (line 84): true] null | true |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... | true |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | true |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:126:17:126:20 | [b (line 84): true] null | true |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse | true |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | true |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:127:24:127:38 | [false] ... \|\| ... | true |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:127:24:127:38 | [true] ... \|\| ... | true |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:127:37:127:38 | [false] !... | true |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:115:23:115:36 | [false, b (line 84): false] ... && ... | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): false] call to method IsTrue | false |
-| Assert.cs:115:23:115:36 | [false, b (line 84): true] ... && ... | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): true] call to method IsTrue | false |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:118:17:118:20 | [b (line 84): true] null | true |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | true |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... | true |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | true |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:122:17:122:20 | [b (line 84): true] null | true |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... | true |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | true |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:126:17:126:20 | [b (line 84): true] null | true |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse | true |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | true |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:127:24:127:38 | [false] ... \|\| ... | true |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:127:24:127:38 | [true] ... \|\| ... | true |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:127:37:127:38 | [false] !... | true |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | true |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:118:17:118:20 | [b (line 84): true] null | true |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | true |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... | true |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | true |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:122:17:122:20 | [b (line 84): true] null | true |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... | true |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | true |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:126:17:126:20 | [b (line 84): true] null | true |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse | true |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | true |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:127:24:127:38 | [false] ... \|\| ... | true |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:127:24:127:38 | [true] ... \|\| ... | true |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:127:37:127:38 | [false] !... | true |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | false |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | false |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... | true |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | false |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | false |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:122:17:122:20 | [b (line 84): true] null | false |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue | false |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | false |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... | false |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | false |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | false |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:126:17:126:20 | [b (line 84): true] null | false |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse | false |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | false |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:127:24:127:38 | [false] ... \|\| ... | false |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:127:24:127:38 | [true] ... \|\| ... | false |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:127:37:127:38 | [false] !... | false |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | false |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:122:17:122:20 | [b (line 84): true] null | true |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... | true |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | true |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:126:17:126:20 | [b (line 84): true] null | true |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse | true |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | true |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:127:24:127:38 | [false] ... \|\| ... | true |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:127:24:127:38 | [true] ... \|\| ... | true |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:127:37:127:38 | [false] !... | true |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | false |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:122:17:122:20 | [b (line 84): true] null | false |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue | false |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | false |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... | false |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | false |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | false |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:126:17:126:20 | [b (line 84): true] null | false |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse | false |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | false |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:127:24:127:38 | [false] ... \|\| ... | false |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:127:24:127:38 | [true] ... \|\| ... | false |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:127:37:127:38 | [false] !... | false |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | false |
-| Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... | Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | false |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | false |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:122:17:122:20 | [b (line 84): true] null | false |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue | false |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | false |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... | false |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | false |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | false |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:126:17:126:20 | [b (line 84): true] null | false |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse | false |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | false |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:127:24:127:38 | [false] ... \|\| ... | false |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:127:24:127:38 | [true] ... \|\| ... | false |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:127:37:127:38 | [false] !... | false |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | false |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | true |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | true |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:122:17:122:20 | [b (line 84): true] null | true |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... | true |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | true |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:126:17:126:20 | [b (line 84): true] null | true |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse | true |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | true |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:127:24:127:38 | [false] ... \|\| ... | true |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:127:24:127:38 | [true] ... \|\| ... | true |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:127:37:127:38 | [false] !... | true |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue | false |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... | false |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | true |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:126:17:126:20 | [b (line 84): true] null | true |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse | true |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | true |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:127:24:127:38 | [false] ... \|\| ... | true |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:127:24:127:38 | [true] ... \|\| ... | true |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:127:37:127:38 | [false] !... | true |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:126:17:126:20 | [b (line 84): true] null | true |
-| Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse | true |
-| Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | true |
-| Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:127:24:127:38 | [false] ... \|\| ... | true |
-| Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:127:24:127:38 | [true] ... \|\| ... | true |
-| Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:127:37:127:38 | [false] !... | true |
-| Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue | false |
-| Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | Assert.cs:126:17:126:20 | [b (line 84): true] null | true |
-| Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse | true |
-| Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | true |
-| Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | Assert.cs:127:24:127:38 | [false] ... \|\| ... | true |
-| Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | Assert.cs:127:24:127:38 | [true] ... \|\| ... | true |
-| Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | Assert.cs:127:37:127:38 | [false] !... | true |
-| Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | true |
-| Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | Assert.cs:126:17:126:20 | [b (line 84): true] null | true |
-| Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse | true |
-| Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | true |
-| Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | Assert.cs:127:24:127:38 | [false] ... \|\| ... | true |
-| Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | Assert.cs:127:24:127:38 | [true] ... \|\| ... | true |
-| Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | Assert.cs:127:37:127:38 | [false] !... | true |
-| Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:126:17:126:20 | [b (line 84): true] null | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse | true |
-| Assert.cs:126:17:126:20 | [b (line 84): true] null | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | false |
-| Assert.cs:126:17:126:20 | [b (line 84): true] null | Assert.cs:127:24:127:38 | [false] ... \|\| ... | false |
-| Assert.cs:126:17:126:20 | [b (line 84): true] null | Assert.cs:127:24:127:38 | [true] ... \|\| ... | true |
-| Assert.cs:126:17:126:20 | [b (line 84): true] null | Assert.cs:127:37:127:38 | [false] !... | false |
-| Assert.cs:126:17:126:20 | [b (line 84): true] null | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | false |
-| Assert.cs:127:24:127:38 | [false] ... \|\| ... | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | false |
-| Assert.cs:127:24:127:38 | [true] ... \|\| ... | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse | true |
-| Assert.cs:127:37:127:38 | [false] !... | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | false |
-| Assert.cs:127:37:127:38 | [false] !... | Assert.cs:127:24:127:38 | [false] ... \|\| ... | false |
-| Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | true |
-| Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | Assert.cs:127:24:127:38 | [false] ... \|\| ... | true |
-| Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | Assert.cs:127:37:127:38 | [false] !... | true |
-| Assert.cs:138:10:138:12 | enter M13 | Assert.cs:140:29:140:30 | [assertion failure] access to parameter b2 | false |
-| Assert.cs:138:10:138:12 | enter M13 | Assert.cs:140:29:140:30 | access to parameter b2 | true |
-| Assert.cs:138:10:138:12 | enter M13 | Assert.cs:140:33:140:34 | [assertion failure] access to parameter b3 | false |
-| Assert.cs:138:10:138:12 | enter M13 | Assert.cs:140:33:140:34 | [assertion failure] access to parameter b3 | true |
-| Assert.cs:138:10:138:12 | enter M13 | Assert.cs:140:33:140:34 | [assertion success] access to parameter b3 | true |
-| Assert.cs:140:29:140:30 | [assertion failure] access to parameter b2 | Assert.cs:140:33:140:34 | [assertion failure] access to parameter b3 | false |
-| Assert.cs:140:29:140:30 | [assertion failure] access to parameter b2 | Assert.cs:140:33:140:34 | [assertion failure] access to parameter b3 | true |
-| Assert.cs:140:29:140:30 | access to parameter b2 | Assert.cs:140:33:140:34 | [assertion failure] access to parameter b3 | true |
-| Assert.cs:140:29:140:30 | access to parameter b2 | Assert.cs:140:33:140:34 | [assertion success] access to parameter b3 | false |
+| Assert.cs:56:10:56:11 | enter M8 | Assert.cs:58:24:58:27 | null | true |
+| Assert.cs:56:10:56:11 | enter M8 | Assert.cs:58:31:58:32 | "" | false |
+| Assert.cs:58:20:58:32 | ... ? ... : ... | Assert.cs:59:36:59:36 | access to parameter b | true |
+| Assert.cs:63:10:63:11 | enter M9 | Assert.cs:65:24:65:27 | null | true |
+| Assert.cs:63:10:63:11 | enter M9 | Assert.cs:65:31:65:32 | "" | false |
+| Assert.cs:65:20:65:32 | ... ? ... : ... | Assert.cs:66:37:66:37 | access to parameter b | false |
+| Assert.cs:70:10:70:12 | enter M10 | Assert.cs:72:24:72:27 | null | true |
+| Assert.cs:70:10:70:12 | enter M10 | Assert.cs:72:31:72:32 | "" | false |
+| Assert.cs:72:20:72:32 | ... ? ... : ... | Assert.cs:73:36:73:36 | access to parameter b | true |
+| Assert.cs:77:10:77:12 | enter M11 | Assert.cs:79:24:79:27 | null | true |
+| Assert.cs:77:10:77:12 | enter M11 | Assert.cs:79:31:79:32 | "" | false |
+| Assert.cs:79:20:79:32 | ... ? ... : ... | Assert.cs:80:37:80:37 | access to parameter b | false |
+| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:86:24:86:27 | null | true |
+| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:86:31:86:32 | "" | false |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:90:17:90:20 | null | true |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:90:24:90:25 | "" | false |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:94:17:94:20 | null | true |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:94:24:94:25 | "" | false |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:98:17:98:20 | null | true |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:98:24:98:25 | "" | false |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:102:17:102:20 | null | true |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:102:24:102:25 | "" | false |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:106:17:106:20 | null | true |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:106:24:106:25 | "" | false |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:110:17:110:20 | null | true |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:110:24:110:25 | "" | false |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:114:17:114:20 | null | true |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:114:24:114:25 | "" | false |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:115:36:115:36 | access to parameter b | true |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:118:17:118:20 | null | true |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:118:24:118:25 | "" | false |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:119:38:119:38 | access to parameter b | false |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:122:17:122:20 | null | true |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:122:24:122:25 | "" | false |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:123:36:123:36 | access to parameter b | true |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:126:17:126:20 | null | true |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:126:24:126:25 | "" | false |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:127:38:127:38 | access to parameter b | false |
 | BreakInTry.cs:7:13:11:13 | foreach (... ... in ...) ... | BreakInTry.cs:7:26:7:28 | String arg | false |
 | BreakInTry.cs:7:13:11:13 | foreach (... ... in ...) ... | BreakInTry.cs:10:21:10:26 | break; | false |
 | BreakInTry.cs:7:26:7:28 | String arg | BreakInTry.cs:10:21:10:26 | break; | true |
@@ -1091,42 +59,16 @@ conditionBlock
 | BreakInTry.cs:22:9:34:9 | foreach (... ... in ...) ... | BreakInTry.cs:27:21:27:26 | break; | false |
 | BreakInTry.cs:22:9:34:9 | foreach (... ... in ...) ... | BreakInTry.cs:30:13:33:13 | {...} | false |
 | BreakInTry.cs:22:9:34:9 | foreach (... ... in ...) ... | BreakInTry.cs:32:21:32:21 | ; | false |
-| BreakInTry.cs:22:9:34:9 | foreach (... ... in ...) ... | BreakInTry.cs:32:21:32:21 | [finally: break] ; | false |
 | BreakInTry.cs:22:22:22:24 | String arg | BreakInTry.cs:27:21:27:26 | break; | true |
-| BreakInTry.cs:22:22:22:24 | String arg | BreakInTry.cs:30:13:33:13 | {...} | false |
-| BreakInTry.cs:22:22:22:24 | String arg | BreakInTry.cs:32:21:32:21 | ; | false |
-| BreakInTry.cs:22:22:22:24 | String arg | BreakInTry.cs:32:21:32:21 | [finally: break] ; | true |
-| BreakInTry.cs:27:21:27:26 | break; | BreakInTry.cs:32:21:32:21 | [finally: break] ; | true |
 | BreakInTry.cs:30:13:33:13 | {...} | BreakInTry.cs:32:21:32:21 | ; | true |
 | BreakInTry.cs:38:10:38:11 | enter M3 | BreakInTry.cs:43:17:43:23 | return ...; | true |
-| BreakInTry.cs:38:10:38:11 | enter M3 | BreakInTry.cs:46:9:52:9 | {...} | false |
-| BreakInTry.cs:38:10:38:11 | enter M3 | BreakInTry.cs:47:13:51:13 | [finally: return] foreach (... ... in ...) ... | true |
-| BreakInTry.cs:38:10:38:11 | enter M3 | BreakInTry.cs:47:13:51:13 | foreach (... ... in ...) ... | false |
-| BreakInTry.cs:38:10:38:11 | enter M3 | BreakInTry.cs:47:26:47:28 | String arg | false |
-| BreakInTry.cs:38:10:38:11 | enter M3 | BreakInTry.cs:47:26:47:28 | [finally: return] String arg | true |
-| BreakInTry.cs:38:10:38:11 | enter M3 | BreakInTry.cs:50:21:50:26 | [finally: return] break; | true |
-| BreakInTry.cs:38:10:38:11 | enter M3 | BreakInTry.cs:50:21:50:26 | break; | false |
-| BreakInTry.cs:38:10:38:11 | enter M3 | BreakInTry.cs:53:7:53:7 | ; | false |
-| BreakInTry.cs:47:13:51:13 | [finally: return] foreach (... ... in ...) ... | BreakInTry.cs:47:26:47:28 | [finally: return] String arg | false |
-| BreakInTry.cs:47:13:51:13 | [finally: return] foreach (... ... in ...) ... | BreakInTry.cs:50:21:50:26 | [finally: return] break; | false |
 | BreakInTry.cs:47:13:51:13 | foreach (... ... in ...) ... | BreakInTry.cs:47:26:47:28 | String arg | false |
 | BreakInTry.cs:47:13:51:13 | foreach (... ... in ...) ... | BreakInTry.cs:50:21:50:26 | break; | false |
 | BreakInTry.cs:47:26:47:28 | String arg | BreakInTry.cs:50:21:50:26 | break; | true |
-| BreakInTry.cs:47:26:47:28 | [finally: return] String arg | BreakInTry.cs:50:21:50:26 | [finally: return] break; | true |
 | BreakInTry.cs:56:10:56:11 | enter M4 | BreakInTry.cs:61:17:61:23 | return ...; | true |
-| BreakInTry.cs:56:10:56:11 | enter M4 | BreakInTry.cs:64:9:70:9 | {...} | false |
-| BreakInTry.cs:56:10:56:11 | enter M4 | BreakInTry.cs:65:13:69:13 | [finally: return] foreach (... ... in ...) ... | true |
-| BreakInTry.cs:56:10:56:11 | enter M4 | BreakInTry.cs:65:13:69:13 | foreach (... ... in ...) ... | false |
-| BreakInTry.cs:56:10:56:11 | enter M4 | BreakInTry.cs:65:26:65:28 | String arg | false |
-| BreakInTry.cs:56:10:56:11 | enter M4 | BreakInTry.cs:65:26:65:28 | [finally: return] String arg | true |
-| BreakInTry.cs:56:10:56:11 | enter M4 | BreakInTry.cs:68:21:68:26 | [finally: return] break; | true |
-| BreakInTry.cs:56:10:56:11 | enter M4 | BreakInTry.cs:68:21:68:26 | break; | false |
-| BreakInTry.cs:65:13:69:13 | [finally: return] foreach (... ... in ...) ... | BreakInTry.cs:65:26:65:28 | [finally: return] String arg | false |
-| BreakInTry.cs:65:13:69:13 | [finally: return] foreach (... ... in ...) ... | BreakInTry.cs:68:21:68:26 | [finally: return] break; | false |
 | BreakInTry.cs:65:13:69:13 | foreach (... ... in ...) ... | BreakInTry.cs:65:26:65:28 | String arg | false |
 | BreakInTry.cs:65:13:69:13 | foreach (... ... in ...) ... | BreakInTry.cs:68:21:68:26 | break; | false |
 | BreakInTry.cs:65:26:65:28 | String arg | BreakInTry.cs:68:21:68:26 | break; | true |
-| BreakInTry.cs:65:26:65:28 | [finally: return] String arg | BreakInTry.cs:68:21:68:26 | [finally: return] break; | true |
 | ConditionalAccess.cs:3:12:3:13 | enter M1 | ConditionalAccess.cs:3:26:3:38 | call to method ToString | false |
 | ConditionalAccess.cs:3:12:3:13 | enter M1 | ConditionalAccess.cs:3:26:3:49 | call to method ToLower | false |
 | ConditionalAccess.cs:3:26:3:38 | call to method ToString | ConditionalAccess.cs:3:26:3:49 | call to method ToLower | false |
@@ -1149,71 +91,38 @@ conditionBlock
 | ConditionalAccess.cs:23:13:23:38 | Nullable<Int32> j = ... | ConditionalAccess.cs:25:31:25:31 | access to local variable s | false |
 | ConditionalAccess.cs:24:17:24:37 | call to method ToString | ConditionalAccess.cs:25:31:25:31 | access to local variable s | false |
 | ConditionalAccess.cs:32:10:32:11 | enter M8 | ConditionalAccess.cs:35:9:35:24 | call to method Out | false |
-| Conditions.cs:3:10:3:19 | enter IncrOrDecr | Conditions.cs:6:13:6:16 | [inc (line 3): true] ...; | true |
-| Conditions.cs:3:10:3:19 | enter IncrOrDecr | Conditions.cs:7:9:8:16 | [inc (line 3): false] if (...) ... | false |
-| Conditions.cs:3:10:3:19 | enter IncrOrDecr | Conditions.cs:7:13:7:16 | [false] !... | true |
-| Conditions.cs:3:10:3:19 | enter IncrOrDecr | Conditions.cs:7:13:7:16 | [true] !... | false |
-| Conditions.cs:3:10:3:19 | enter IncrOrDecr | Conditions.cs:8:13:8:16 | ...; | false |
-| Conditions.cs:6:13:6:16 | [inc (line 3): true] ...; | Conditions.cs:7:13:7:16 | [false] !... | true |
-| Conditions.cs:7:9:8:16 | [inc (line 3): false] if (...) ... | Conditions.cs:7:13:7:16 | [true] !... | false |
-| Conditions.cs:7:9:8:16 | [inc (line 3): false] if (...) ... | Conditions.cs:8:13:8:16 | ...; | false |
+| Conditions.cs:3:10:3:19 | enter IncrOrDecr | Conditions.cs:6:13:6:16 | ...; | true |
+| Conditions.cs:7:9:8:16 | if (...) ... | Conditions.cs:7:13:7:16 | [false] !... | true |
+| Conditions.cs:7:9:8:16 | if (...) ... | Conditions.cs:7:13:7:16 | [true] !... | false |
+| Conditions.cs:7:9:8:16 | if (...) ... | Conditions.cs:8:13:8:16 | ...; | false |
 | Conditions.cs:7:13:7:16 | [true] !... | Conditions.cs:8:13:8:16 | ...; | true |
-| Conditions.cs:11:9:11:10 | enter M1 | Conditions.cs:15:13:15:16 | [b (line 11): true] ...; | true |
-| Conditions.cs:11:9:11:10 | enter M1 | Conditions.cs:16:9:18:20 | [b (line 11): false] if (...) ... | false |
-| Conditions.cs:11:9:11:10 | enter M1 | Conditions.cs:17:13:18:20 | [b (line 11): false] if (...) ... | false |
-| Conditions.cs:11:9:11:10 | enter M1 | Conditions.cs:17:13:18:20 | [b (line 11): true] if (...) ... | true |
-| Conditions.cs:11:9:11:10 | enter M1 | Conditions.cs:17:17:17:18 | [false] !... | true |
-| Conditions.cs:11:9:11:10 | enter M1 | Conditions.cs:17:17:17:18 | [true] !... | false |
-| Conditions.cs:11:9:11:10 | enter M1 | Conditions.cs:18:17:18:20 | ...; | false |
-| Conditions.cs:15:13:15:16 | [b (line 11): true] ...; | Conditions.cs:17:13:18:20 | [b (line 11): true] if (...) ... | true |
-| Conditions.cs:15:13:15:16 | [b (line 11): true] ...; | Conditions.cs:17:17:17:18 | [false] !... | true |
-| Conditions.cs:16:9:18:20 | [b (line 11): false] if (...) ... | Conditions.cs:17:13:18:20 | [b (line 11): false] if (...) ... | true |
-| Conditions.cs:16:9:18:20 | [b (line 11): false] if (...) ... | Conditions.cs:17:17:17:18 | [true] !... | true |
-| Conditions.cs:16:9:18:20 | [b (line 11): false] if (...) ... | Conditions.cs:18:17:18:20 | ...; | true |
-| Conditions.cs:17:13:18:20 | [b (line 11): false] if (...) ... | Conditions.cs:17:17:17:18 | [true] !... | false |
-| Conditions.cs:17:13:18:20 | [b (line 11): false] if (...) ... | Conditions.cs:18:17:18:20 | ...; | false |
-| Conditions.cs:17:13:18:20 | [b (line 11): true] if (...) ... | Conditions.cs:17:17:17:18 | [false] !... | true |
+| Conditions.cs:11:9:11:10 | enter M1 | Conditions.cs:15:13:15:16 | ...; | true |
+| Conditions.cs:16:9:18:20 | if (...) ... | Conditions.cs:17:13:18:20 | if (...) ... | true |
+| Conditions.cs:16:9:18:20 | if (...) ... | Conditions.cs:17:17:17:18 | [false] !... | true |
+| Conditions.cs:16:9:18:20 | if (...) ... | Conditions.cs:17:17:17:18 | [true] !... | true |
+| Conditions.cs:16:9:18:20 | if (...) ... | Conditions.cs:18:17:18:20 | ...; | true |
+| Conditions.cs:17:13:18:20 | if (...) ... | Conditions.cs:17:17:17:18 | [false] !... | true |
+| Conditions.cs:17:13:18:20 | if (...) ... | Conditions.cs:17:17:17:18 | [true] !... | false |
+| Conditions.cs:17:13:18:20 | if (...) ... | Conditions.cs:18:17:18:20 | ...; | false |
 | Conditions.cs:17:17:17:18 | [true] !... | Conditions.cs:18:17:18:20 | ...; | true |
 | Conditions.cs:22:9:22:10 | enter M2 | Conditions.cs:26:13:27:20 | if (...) ... | true |
-| Conditions.cs:22:9:22:10 | enter M2 | Conditions.cs:27:17:27:20 | [b2 (line 22): true] ...; | true |
-| Conditions.cs:22:9:22:10 | enter M2 | Conditions.cs:28:9:29:16 | [b2 (line 22): false] if (...) ... | true |
-| Conditions.cs:22:9:22:10 | enter M2 | Conditions.cs:28:9:29:16 | if (...) ... | false |
-| Conditions.cs:26:13:27:20 | if (...) ... | Conditions.cs:27:17:27:20 | [b2 (line 22): true] ...; | true |
-| Conditions.cs:26:13:27:20 | if (...) ... | Conditions.cs:28:9:29:16 | [b2 (line 22): false] if (...) ... | false |
+| Conditions.cs:22:9:22:10 | enter M2 | Conditions.cs:27:17:27:20 | ...; | true |
+| Conditions.cs:26:13:27:20 | if (...) ... | Conditions.cs:27:17:27:20 | ...; | true |
+| Conditions.cs:28:9:29:16 | if (...) ... | Conditions.cs:29:13:29:16 | ...; | true |
 | Conditions.cs:33:9:33:10 | enter M3 | Conditions.cs:38:13:38:20 | ...; | true |
-| Conditions.cs:39:9:40:16 | if (...) ... | Conditions.cs:40:13:40:16 | [b2 (line 39): true] ...; | true |
-| Conditions.cs:39:9:40:16 | if (...) ... | Conditions.cs:41:9:42:16 | [b2 (line 39): false] if (...) ... | false |
-| Conditions.cs:39:9:40:16 | if (...) ... | Conditions.cs:42:13:42:16 | ...; | true |
-| Conditions.cs:40:13:40:16 | [b2 (line 39): true] ...; | Conditions.cs:42:13:42:16 | ...; | true |
-| Conditions.cs:46:9:46:10 | enter M4 | Conditions.cs:49:16:49:16 | [b (line 46): false] access to parameter x | true |
-| Conditions.cs:46:9:46:10 | enter M4 | Conditions.cs:50:9:53:9 | [b (line 46): false] {...} | true |
-| Conditions.cs:46:9:46:10 | enter M4 | Conditions.cs:50:9:53:9 | [b (line 46): true] {...} | true |
-| Conditions.cs:46:9:46:10 | enter M4 | Conditions.cs:50:9:53:9 | {...} | true |
-| Conditions.cs:46:9:46:10 | enter M4 | Conditions.cs:52:17:52:20 | [b (line 46): true] ...; | true |
-| Conditions.cs:49:16:49:16 | [b (line 46): false] access to parameter x | Conditions.cs:50:9:53:9 | [b (line 46): false] {...} | true |
-| Conditions.cs:50:9:53:9 | {...} | Conditions.cs:49:16:49:16 | [b (line 46): false] access to parameter x | false |
-| Conditions.cs:50:9:53:9 | {...} | Conditions.cs:50:9:53:9 | [b (line 46): false] {...} | false |
-| Conditions.cs:50:9:53:9 | {...} | Conditions.cs:50:9:53:9 | [b (line 46): true] {...} | true |
-| Conditions.cs:50:9:53:9 | {...} | Conditions.cs:52:17:52:20 | [b (line 46): true] ...; | true |
-| Conditions.cs:52:17:52:20 | [b (line 46): true] ...; | Conditions.cs:50:9:53:9 | [b (line 46): true] {...} | true |
-| Conditions.cs:57:9:57:10 | enter M5 | Conditions.cs:60:16:60:16 | [b (line 57): false] access to parameter x | true |
-| Conditions.cs:57:9:57:10 | enter M5 | Conditions.cs:61:9:64:9 | [b (line 57): false] {...} | true |
-| Conditions.cs:57:9:57:10 | enter M5 | Conditions.cs:61:9:64:9 | [b (line 57): true] {...} | true |
-| Conditions.cs:57:9:57:10 | enter M5 | Conditions.cs:61:9:64:9 | {...} | true |
-| Conditions.cs:57:9:57:10 | enter M5 | Conditions.cs:63:17:63:20 | [b (line 57): true] ...; | true |
-| Conditions.cs:57:9:57:10 | enter M5 | Conditions.cs:65:9:66:16 | [b (line 57): false] if (...) ... | true |
-| Conditions.cs:57:9:57:10 | enter M5 | Conditions.cs:65:9:66:16 | [b (line 57): true] if (...) ... | true |
-| Conditions.cs:57:9:57:10 | enter M5 | Conditions.cs:65:9:66:16 | if (...) ... | false |
-| Conditions.cs:60:16:60:16 | [b (line 57): false] access to parameter x | Conditions.cs:61:9:64:9 | [b (line 57): false] {...} | true |
-| Conditions.cs:60:16:60:16 | [b (line 57): false] access to parameter x | Conditions.cs:65:9:66:16 | [b (line 57): false] if (...) ... | false |
-| Conditions.cs:61:9:64:9 | {...} | Conditions.cs:60:16:60:16 | [b (line 57): false] access to parameter x | false |
-| Conditions.cs:61:9:64:9 | {...} | Conditions.cs:61:9:64:9 | [b (line 57): false] {...} | false |
-| Conditions.cs:61:9:64:9 | {...} | Conditions.cs:61:9:64:9 | [b (line 57): true] {...} | true |
-| Conditions.cs:61:9:64:9 | {...} | Conditions.cs:63:17:63:20 | [b (line 57): true] ...; | true |
-| Conditions.cs:61:9:64:9 | {...} | Conditions.cs:65:9:66:16 | [b (line 57): false] if (...) ... | false |
-| Conditions.cs:61:9:64:9 | {...} | Conditions.cs:65:9:66:16 | [b (line 57): true] if (...) ... | true |
-| Conditions.cs:63:17:63:20 | [b (line 57): true] ...; | Conditions.cs:61:9:64:9 | [b (line 57): true] {...} | true |
-| Conditions.cs:63:17:63:20 | [b (line 57): true] ...; | Conditions.cs:65:9:66:16 | [b (line 57): true] if (...) ... | false |
+| Conditions.cs:39:9:40:16 | if (...) ... | Conditions.cs:40:13:40:16 | ...; | true |
+| Conditions.cs:41:9:42:16 | if (...) ... | Conditions.cs:42:13:42:16 | ...; | true |
+| Conditions.cs:49:16:49:16 | access to parameter x | Conditions.cs:50:9:53:9 | {...} | true |
+| Conditions.cs:49:16:49:16 | access to parameter x | Conditions.cs:52:17:52:20 | ...; | true |
+| Conditions.cs:49:16:49:16 | access to parameter x | Conditions.cs:54:16:54:16 | access to local variable y | false |
+| Conditions.cs:50:9:53:9 | {...} | Conditions.cs:52:17:52:20 | ...; | true |
+| Conditions.cs:60:16:60:16 | access to parameter x | Conditions.cs:61:9:64:9 | {...} | true |
+| Conditions.cs:60:16:60:16 | access to parameter x | Conditions.cs:63:17:63:20 | ...; | true |
+| Conditions.cs:60:16:60:16 | access to parameter x | Conditions.cs:65:9:66:16 | if (...) ... | false |
+| Conditions.cs:60:16:60:16 | access to parameter x | Conditions.cs:66:13:66:16 | ...; | false |
+| Conditions.cs:60:16:60:16 | access to parameter x | Conditions.cs:67:16:67:16 | access to local variable y | false |
+| Conditions.cs:61:9:64:9 | {...} | Conditions.cs:63:17:63:20 | ...; | true |
+| Conditions.cs:65:9:66:16 | if (...) ... | Conditions.cs:66:13:66:16 | ...; | true |
 | Conditions.cs:74:9:80:9 | foreach (... ... in ...) ... | Conditions.cs:74:22:74:22 | String _ | false |
 | Conditions.cs:74:9:80:9 | foreach (... ... in ...) ... | Conditions.cs:77:17:77:20 | ...; | false |
 | Conditions.cs:74:9:80:9 | foreach (... ... in ...) ... | Conditions.cs:78:13:79:26 | if (...) ... | false |
@@ -1234,80 +143,42 @@ conditionBlock
 | Conditions.cs:90:22:90:22 | String _ | Conditions.cs:93:17:93:20 | ...; | true |
 | Conditions.cs:94:13:95:26 | if (...) ... | Conditions.cs:95:17:95:26 | ...; | true |
 | Conditions.cs:96:13:97:20 | if (...) ... | Conditions.cs:97:17:97:20 | ...; | true |
-| Conditions.cs:102:12:102:13 | enter M8 | Conditions.cs:106:13:106:20 | [b (line 102): true] ...; | true |
-| Conditions.cs:102:12:102:13 | enter M8 | Conditions.cs:107:9:109:24 | [b (line 102): false] if (...) ... | false |
-| Conditions.cs:102:12:102:13 | enter M8 | Conditions.cs:108:13:109:24 | [b (line 102): false] if (...) ... | false |
-| Conditions.cs:102:12:102:13 | enter M8 | Conditions.cs:108:13:109:24 | [b (line 102): true] if (...) ... | true |
-| Conditions.cs:102:12:102:13 | enter M8 | Conditions.cs:108:17:108:18 | [false] !... | true |
-| Conditions.cs:102:12:102:13 | enter M8 | Conditions.cs:108:17:108:18 | [true] !... | false |
-| Conditions.cs:102:12:102:13 | enter M8 | Conditions.cs:109:17:109:24 | ...; | false |
-| Conditions.cs:106:13:106:20 | [b (line 102): true] ...; | Conditions.cs:108:13:109:24 | [b (line 102): true] if (...) ... | true |
-| Conditions.cs:106:13:106:20 | [b (line 102): true] ...; | Conditions.cs:108:17:108:18 | [false] !... | true |
-| Conditions.cs:107:9:109:24 | [b (line 102): false] if (...) ... | Conditions.cs:108:13:109:24 | [b (line 102): false] if (...) ... | true |
-| Conditions.cs:107:9:109:24 | [b (line 102): false] if (...) ... | Conditions.cs:108:17:108:18 | [true] !... | true |
-| Conditions.cs:107:9:109:24 | [b (line 102): false] if (...) ... | Conditions.cs:109:17:109:24 | ...; | true |
-| Conditions.cs:108:13:109:24 | [b (line 102): false] if (...) ... | Conditions.cs:108:17:108:18 | [true] !... | false |
-| Conditions.cs:108:13:109:24 | [b (line 102): false] if (...) ... | Conditions.cs:109:17:109:24 | ...; | false |
-| Conditions.cs:108:13:109:24 | [b (line 102): true] if (...) ... | Conditions.cs:108:17:108:18 | [false] !... | true |
+| Conditions.cs:102:12:102:13 | enter M8 | Conditions.cs:106:13:106:20 | ...; | true |
+| Conditions.cs:107:9:109:24 | if (...) ... | Conditions.cs:108:13:109:24 | if (...) ... | true |
+| Conditions.cs:107:9:109:24 | if (...) ... | Conditions.cs:108:17:108:18 | [false] !... | true |
+| Conditions.cs:107:9:109:24 | if (...) ... | Conditions.cs:108:17:108:18 | [true] !... | true |
+| Conditions.cs:107:9:109:24 | if (...) ... | Conditions.cs:109:17:109:24 | ...; | true |
+| Conditions.cs:108:13:109:24 | if (...) ... | Conditions.cs:108:17:108:18 | [false] !... | true |
+| Conditions.cs:108:13:109:24 | if (...) ... | Conditions.cs:108:17:108:18 | [true] !... | false |
+| Conditions.cs:108:13:109:24 | if (...) ... | Conditions.cs:109:17:109:24 | ...; | false |
 | Conditions.cs:108:17:108:18 | [true] !... | Conditions.cs:109:17:109:24 | ...; | true |
 | Conditions.cs:116:25:116:25 | access to local variable i | Conditions.cs:113:10:113:11 | exit M9 (normal) | false |
 | Conditions.cs:116:25:116:25 | access to local variable i | Conditions.cs:116:42:116:42 | access to local variable i | true |
 | Conditions.cs:116:25:116:25 | access to local variable i | Conditions.cs:117:9:123:9 | {...} | true |
-| Conditions.cs:116:25:116:25 | access to local variable i | Conditions.cs:119:17:119:21 | [false, last (line 118): true] !... | true |
-| Conditions.cs:116:25:116:25 | access to local variable i | Conditions.cs:119:17:119:21 | [true, last (line 118): false] !... | true |
-| Conditions.cs:116:25:116:25 | access to local variable i | Conditions.cs:120:17:120:23 | [last (line 118): false] ...; | true |
-| Conditions.cs:116:25:116:25 | access to local variable i | Conditions.cs:121:13:122:25 | [last (line 118): true] if (...) ... | true |
+| Conditions.cs:116:25:116:25 | access to local variable i | Conditions.cs:119:17:119:21 | [false] !... | true |
+| Conditions.cs:116:25:116:25 | access to local variable i | Conditions.cs:119:17:119:21 | [true] !... | true |
+| Conditions.cs:116:25:116:25 | access to local variable i | Conditions.cs:120:17:120:23 | ...; | true |
+| Conditions.cs:116:25:116:25 | access to local variable i | Conditions.cs:121:13:122:25 | if (...) ... | true |
 | Conditions.cs:116:25:116:25 | access to local variable i | Conditions.cs:122:17:122:25 | ...; | true |
-| Conditions.cs:117:9:123:9 | {...} | Conditions.cs:119:17:119:21 | [false, last (line 118): true] !... | true |
-| Conditions.cs:117:9:123:9 | {...} | Conditions.cs:119:17:119:21 | [true, last (line 118): false] !... | false |
-| Conditions.cs:117:9:123:9 | {...} | Conditions.cs:120:17:120:23 | [last (line 118): false] ...; | false |
-| Conditions.cs:117:9:123:9 | {...} | Conditions.cs:121:13:122:25 | [last (line 118): true] if (...) ... | true |
-| Conditions.cs:117:9:123:9 | {...} | Conditions.cs:122:17:122:25 | ...; | true |
-| Conditions.cs:119:17:119:21 | [false, last (line 118): true] !... | Conditions.cs:121:13:122:25 | [last (line 118): true] if (...) ... | false |
-| Conditions.cs:119:17:119:21 | [false, last (line 118): true] !... | Conditions.cs:122:17:122:25 | ...; | false |
-| Conditions.cs:119:17:119:21 | [true, last (line 118): false] !... | Conditions.cs:120:17:120:23 | [last (line 118): false] ...; | true |
-| Conditions.cs:121:13:122:25 | [last (line 118): true] if (...) ... | Conditions.cs:122:17:122:25 | ...; | true |
-| Conditions.cs:129:10:129:12 | enter M10 | Conditions.cs:131:16:131:19 | [Field1 (line 129): false] true | true |
-| Conditions.cs:129:10:129:12 | enter M10 | Conditions.cs:131:16:131:19 | [Field1 (line 129): true, Field2 (line 129): false] true | true |
-| Conditions.cs:129:10:129:12 | enter M10 | Conditions.cs:132:9:140:9 | [Field1 (line 129): false] {...} | true |
-| Conditions.cs:129:10:129:12 | enter M10 | Conditions.cs:132:9:140:9 | [Field1 (line 129): true, Field2 (line 129): false] {...} | true |
-| Conditions.cs:129:10:129:12 | enter M10 | Conditions.cs:132:9:140:9 | [Field1 (line 129): true, Field2 (line 129): true] {...} | true |
-| Conditions.cs:129:10:129:12 | enter M10 | Conditions.cs:132:9:140:9 | {...} | true |
-| Conditions.cs:129:10:129:12 | enter M10 | Conditions.cs:134:13:139:13 | [Field1 (line 129): true, Field2 (line 129): false] {...} | true |
-| Conditions.cs:129:10:129:12 | enter M10 | Conditions.cs:134:13:139:13 | [Field1 (line 129): true, Field2 (line 129): true] {...} | true |
-| Conditions.cs:129:10:129:12 | enter M10 | Conditions.cs:134:13:139:13 | [Field1 (line 129): true] {...} | true |
-| Conditions.cs:129:10:129:12 | enter M10 | Conditions.cs:136:17:138:17 | [Field1 (line 129): true, Field2 (line 129): true] {...} | true |
-| Conditions.cs:131:16:131:19 | [Field1 (line 129): false] true | Conditions.cs:132:9:140:9 | [Field1 (line 129): false] {...} | true |
-| Conditions.cs:131:16:131:19 | [Field1 (line 129): true, Field2 (line 129): false] true | Conditions.cs:132:9:140:9 | [Field1 (line 129): true, Field2 (line 129): false] {...} | true |
-| Conditions.cs:131:16:131:19 | [Field1 (line 129): true, Field2 (line 129): false] true | Conditions.cs:134:13:139:13 | [Field1 (line 129): true, Field2 (line 129): false] {...} | true |
-| Conditions.cs:132:9:140:9 | [Field1 (line 129): true, Field2 (line 129): false] {...} | Conditions.cs:134:13:139:13 | [Field1 (line 129): true, Field2 (line 129): false] {...} | true |
-| Conditions.cs:132:9:140:9 | [Field1 (line 129): true, Field2 (line 129): true] {...} | Conditions.cs:134:13:139:13 | [Field1 (line 129): true, Field2 (line 129): true] {...} | true |
-| Conditions.cs:132:9:140:9 | {...} | Conditions.cs:131:16:131:19 | [Field1 (line 129): false] true | false |
-| Conditions.cs:132:9:140:9 | {...} | Conditions.cs:131:16:131:19 | [Field1 (line 129): true, Field2 (line 129): false] true | true |
-| Conditions.cs:132:9:140:9 | {...} | Conditions.cs:132:9:140:9 | [Field1 (line 129): false] {...} | false |
-| Conditions.cs:132:9:140:9 | {...} | Conditions.cs:132:9:140:9 | [Field1 (line 129): true, Field2 (line 129): false] {...} | true |
-| Conditions.cs:132:9:140:9 | {...} | Conditions.cs:132:9:140:9 | [Field1 (line 129): true, Field2 (line 129): true] {...} | true |
-| Conditions.cs:132:9:140:9 | {...} | Conditions.cs:134:13:139:13 | [Field1 (line 129): true, Field2 (line 129): false] {...} | true |
-| Conditions.cs:132:9:140:9 | {...} | Conditions.cs:134:13:139:13 | [Field1 (line 129): true, Field2 (line 129): true] {...} | true |
-| Conditions.cs:132:9:140:9 | {...} | Conditions.cs:134:13:139:13 | [Field1 (line 129): true] {...} | true |
-| Conditions.cs:132:9:140:9 | {...} | Conditions.cs:136:17:138:17 | [Field1 (line 129): true, Field2 (line 129): true] {...} | true |
-| Conditions.cs:134:13:139:13 | [Field1 (line 129): true] {...} | Conditions.cs:131:16:131:19 | [Field1 (line 129): true, Field2 (line 129): false] true | false |
-| Conditions.cs:134:13:139:13 | [Field1 (line 129): true] {...} | Conditions.cs:132:9:140:9 | [Field1 (line 129): true, Field2 (line 129): false] {...} | false |
-| Conditions.cs:134:13:139:13 | [Field1 (line 129): true] {...} | Conditions.cs:132:9:140:9 | [Field1 (line 129): true, Field2 (line 129): true] {...} | true |
-| Conditions.cs:134:13:139:13 | [Field1 (line 129): true] {...} | Conditions.cs:134:13:139:13 | [Field1 (line 129): true, Field2 (line 129): false] {...} | false |
-| Conditions.cs:134:13:139:13 | [Field1 (line 129): true] {...} | Conditions.cs:134:13:139:13 | [Field1 (line 129): true, Field2 (line 129): true] {...} | true |
-| Conditions.cs:134:13:139:13 | [Field1 (line 129): true] {...} | Conditions.cs:136:17:138:17 | [Field1 (line 129): true, Field2 (line 129): true] {...} | true |
-| Conditions.cs:136:17:138:17 | [Field1 (line 129): true, Field2 (line 129): true] {...} | Conditions.cs:132:9:140:9 | [Field1 (line 129): true, Field2 (line 129): true] {...} | true |
-| Conditions.cs:136:17:138:17 | [Field1 (line 129): true, Field2 (line 129): true] {...} | Conditions.cs:134:13:139:13 | [Field1 (line 129): true, Field2 (line 129): true] {...} | true |
-| Conditions.cs:143:10:143:12 | enter M11 | Conditions.cs:145:21:145:23 | [b (line 143): true] "a" | true |
-| Conditions.cs:143:10:143:12 | enter M11 | Conditions.cs:145:27:145:29 | [b (line 143): false] "b" | false |
-| Conditions.cs:143:10:143:12 | enter M11 | Conditions.cs:147:13:147:49 | ...; | true |
-| Conditions.cs:143:10:143:12 | enter M11 | Conditions.cs:149:13:149:49 | ...; | false |
-| Conditions.cs:145:21:145:23 | [b (line 143): true] "a" | Conditions.cs:147:13:147:49 | ...; | true |
-| Conditions.cs:145:27:145:29 | [b (line 143): false] "b" | Conditions.cs:149:13:149:49 | ...; | false |
-| ExitMethods.cs:44:9:47:9 | [exception: Exception] catch (...) {...} | ExitMethods.cs:48:9:51:9 | [exception: Exception] catch (...) {...} | false |
-| ExitMethods.cs:44:9:47:9 | [exception: Exception] catch (...) {...} | ExitMethods.cs:49:9:51:9 | {...} | false |
-| ExitMethods.cs:48:9:51:9 | [exception: Exception] catch (...) {...} | ExitMethods.cs:49:9:51:9 | {...} | true |
+| Conditions.cs:117:9:123:9 | {...} | Conditions.cs:119:17:119:21 | [false] !... | true |
+| Conditions.cs:117:9:123:9 | {...} | Conditions.cs:119:17:119:21 | [true] !... | false |
+| Conditions.cs:117:9:123:9 | {...} | Conditions.cs:120:17:120:23 | ...; | false |
+| Conditions.cs:119:17:119:21 | [true] !... | Conditions.cs:120:17:120:23 | ...; | true |
+| Conditions.cs:121:13:122:25 | if (...) ... | Conditions.cs:122:17:122:25 | ...; | true |
+| Conditions.cs:131:16:131:19 | true | Conditions.cs:132:9:140:9 | {...} | true |
+| Conditions.cs:131:16:131:19 | true | Conditions.cs:134:13:139:13 | {...} | true |
+| Conditions.cs:131:16:131:19 | true | Conditions.cs:136:17:138:17 | {...} | true |
+| Conditions.cs:132:9:140:9 | {...} | Conditions.cs:134:13:139:13 | {...} | true |
+| Conditions.cs:132:9:140:9 | {...} | Conditions.cs:136:17:138:17 | {...} | true |
+| Conditions.cs:134:13:139:13 | {...} | Conditions.cs:136:17:138:17 | {...} | true |
+| Conditions.cs:143:10:143:12 | enter M11 | Conditions.cs:145:21:145:23 | "a" | true |
+| Conditions.cs:143:10:143:12 | enter M11 | Conditions.cs:145:27:145:29 | "b" | false |
+| Conditions.cs:145:17:145:29 | ... ? ... : ... | Conditions.cs:147:13:147:49 | ...; | true |
+| Conditions.cs:145:17:145:29 | ... ? ... : ... | Conditions.cs:149:13:149:49 | ...; | false |
+| ExitMethods.cs:38:10:38:11 | enter M6 | ExitMethods.cs:45:9:47:9 | {...} | true |
+| ExitMethods.cs:38:10:38:11 | enter M6 | ExitMethods.cs:48:9:51:9 | catch (...) {...} | false |
+| ExitMethods.cs:38:10:38:11 | enter M6 | ExitMethods.cs:49:9:51:9 | {...} | false |
+| ExitMethods.cs:48:9:51:9 | catch (...) {...} | ExitMethods.cs:49:9:51:9 | {...} | true |
 | ExitMethods.cs:66:17:66:26 | enter ErrorMaybe | ExitMethods.cs:66:17:66:26 | exit ErrorMaybe (normal) | false |
 | ExitMethods.cs:66:17:66:26 | enter ErrorMaybe | ExitMethods.cs:69:19:69:33 | object creation of type Exception | true |
 | ExitMethods.cs:72:17:72:27 | enter ErrorAlways | ExitMethods.cs:75:19:75:33 | object creation of type Exception | true |
@@ -1316,37 +187,34 @@ conditionBlock
 | ExitMethods.cs:110:13:110:21 | enter ThrowExpr | ExitMethods.cs:112:69:112:75 | "input" | false |
 | ExitMethods.cs:115:16:115:34 | enter ExtensionMethodCall | ExitMethods.cs:117:34:117:34 | 0 | true |
 | ExitMethods.cs:115:16:115:34 | enter ExtensionMethodCall | ExitMethods.cs:117:38:117:38 | 1 | false |
-| ExitMethods.cs:120:17:120:32 | enter FailingAssertion | ExitMethods.cs:122:9:122:28 | [assertion failure] call to method IsTrue | false |
-| ExitMethods.cs:132:10:132:20 | enter AssertFalse | ExitMethods.cs:132:33:132:49 | [assertion failure] call to method IsFalse | true |
-| ExitMethods.cs:132:10:132:20 | enter AssertFalse | ExitMethods.cs:132:33:132:49 | [assertion success] call to method IsFalse | false |
-| ExitMethods.cs:134:17:134:33 | enter FailingAssertion3 | ExitMethods.cs:136:9:136:25 | [assertion failure] call to method AssertFalse | true |
 | ExitMethods.cs:140:17:140:42 | enter ExceptionDispatchInfoThrow | ExitMethods.cs:143:13:143:43 | ...; | true |
 | ExitMethods.cs:140:17:140:42 | enter ExceptionDispatchInfoThrow | ExitMethods.cs:145:13:145:53 | ...; | false |
-| Finally.cs:26:9:29:9 | [exception: Exception] catch (...) {...} | Finally.cs:26:38:26:39 | [exception: Exception] IOException ex | true |
-| Finally.cs:26:9:29:9 | [exception: Exception] catch (...) {...} | Finally.cs:27:9:29:9 | {...} | true |
-| Finally.cs:26:9:29:9 | [exception: Exception] catch (...) {...} | Finally.cs:30:9:40:9 | [exception: Exception] catch (...) {...} | false |
-| Finally.cs:26:9:29:9 | [exception: Exception] catch (...) {...} | Finally.cs:30:41:30:42 | [exception: Exception] ArgumentException ex | false |
-| Finally.cs:26:9:29:9 | [exception: Exception] catch (...) {...} | Finally.cs:34:27:34:32 | throw ...; | false |
-| Finally.cs:26:9:29:9 | [exception: Exception] catch (...) {...} | Finally.cs:41:9:43:9 | [exception: Exception] catch (...) {...} | false |
-| Finally.cs:26:9:29:9 | [exception: Exception] catch (...) {...} | Finally.cs:42:9:43:9 | {...} | false |
-| Finally.cs:26:38:26:39 | [exception: Exception] IOException ex | Finally.cs:27:9:29:9 | {...} | true |
-| Finally.cs:30:9:40:9 | [exception: Exception] catch (...) {...} | Finally.cs:30:41:30:42 | [exception: Exception] ArgumentException ex | true |
-| Finally.cs:30:9:40:9 | [exception: Exception] catch (...) {...} | Finally.cs:34:27:34:32 | throw ...; | true |
-| Finally.cs:30:9:40:9 | [exception: Exception] catch (...) {...} | Finally.cs:41:9:43:9 | [exception: Exception] catch (...) {...} | false |
-| Finally.cs:30:9:40:9 | [exception: Exception] catch (...) {...} | Finally.cs:42:9:43:9 | {...} | false |
-| Finally.cs:30:41:30:42 | [exception: Exception] ArgumentException ex | Finally.cs:34:27:34:32 | throw ...; | true |
-| Finally.cs:41:9:43:9 | [exception: Exception] catch (...) {...} | Finally.cs:42:9:43:9 | {...} | true |
-| Finally.cs:61:9:64:9 | [exception: Exception] catch (...) {...} | Finally.cs:61:38:61:39 | [exception: Exception] IOException ex | true |
-| Finally.cs:61:9:64:9 | [exception: Exception] catch (...) {...} | Finally.cs:62:9:64:9 | {...} | true |
-| Finally.cs:61:9:64:9 | [exception: Exception] catch (...) {...} | Finally.cs:65:9:67:9 | [exception: Exception] catch (...) {...} | false |
-| Finally.cs:61:9:64:9 | [exception: Exception] catch (...) {...} | Finally.cs:65:26:65:26 | [exception: Exception] Exception e | false |
-| Finally.cs:61:9:64:9 | [exception: Exception] catch (...) {...} | Finally.cs:66:9:67:9 | {...} | false |
-| Finally.cs:61:9:64:9 | [exception: Exception] catch (...) {...} | Finally.cs:69:9:71:9 | [finally: exception(Exception)] {...} | false |
-| Finally.cs:61:38:61:39 | [exception: Exception] IOException ex | Finally.cs:62:9:64:9 | {...} | true |
-| Finally.cs:65:9:67:9 | [exception: Exception] catch (...) {...} | Finally.cs:65:26:65:26 | [exception: Exception] Exception e | true |
-| Finally.cs:65:9:67:9 | [exception: Exception] catch (...) {...} | Finally.cs:66:9:67:9 | {...} | true |
-| Finally.cs:65:9:67:9 | [exception: Exception] catch (...) {...} | Finally.cs:69:9:71:9 | [finally: exception(Exception)] {...} | true |
-| Finally.cs:65:26:65:26 | [exception: Exception] Exception e | Finally.cs:66:9:67:9 | {...} | true |
+| Finally.cs:26:9:29:9 | catch (...) {...} | Finally.cs:26:38:26:39 | IOException ex | true |
+| Finally.cs:26:9:29:9 | catch (...) {...} | Finally.cs:27:9:29:9 | {...} | true |
+| Finally.cs:26:9:29:9 | catch (...) {...} | Finally.cs:30:9:40:9 | catch (...) {...} | false |
+| Finally.cs:26:9:29:9 | catch (...) {...} | Finally.cs:30:41:30:42 | ArgumentException ex | false |
+| Finally.cs:26:9:29:9 | catch (...) {...} | Finally.cs:34:27:34:32 | throw ...; | false |
+| Finally.cs:26:9:29:9 | catch (...) {...} | Finally.cs:41:9:43:9 | catch (...) {...} | false |
+| Finally.cs:26:9:29:9 | catch (...) {...} | Finally.cs:42:9:43:9 | {...} | false |
+| Finally.cs:26:9:29:9 | catch (...) {...} | Finally.cs:44:9:47:9 | catch {...} | false |
+| Finally.cs:26:38:26:39 | IOException ex | Finally.cs:27:9:29:9 | {...} | true |
+| Finally.cs:30:9:40:9 | catch (...) {...} | Finally.cs:30:41:30:42 | ArgumentException ex | true |
+| Finally.cs:30:9:40:9 | catch (...) {...} | Finally.cs:34:27:34:32 | throw ...; | true |
+| Finally.cs:30:9:40:9 | catch (...) {...} | Finally.cs:41:9:43:9 | catch (...) {...} | false |
+| Finally.cs:30:9:40:9 | catch (...) {...} | Finally.cs:42:9:43:9 | {...} | false |
+| Finally.cs:30:9:40:9 | catch (...) {...} | Finally.cs:44:9:47:9 | catch {...} | false |
+| Finally.cs:30:41:30:42 | ArgumentException ex | Finally.cs:34:27:34:32 | throw ...; | true |
+| Finally.cs:41:9:43:9 | catch (...) {...} | Finally.cs:42:9:43:9 | {...} | true |
+| Finally.cs:41:9:43:9 | catch (...) {...} | Finally.cs:44:9:47:9 | catch {...} | false |
+| Finally.cs:61:9:64:9 | catch (...) {...} | Finally.cs:61:38:61:39 | IOException ex | true |
+| Finally.cs:61:9:64:9 | catch (...) {...} | Finally.cs:62:9:64:9 | {...} | true |
+| Finally.cs:61:9:64:9 | catch (...) {...} | Finally.cs:65:9:67:9 | catch (...) {...} | false |
+| Finally.cs:61:9:64:9 | catch (...) {...} | Finally.cs:65:26:65:26 | Exception e | false |
+| Finally.cs:61:9:64:9 | catch (...) {...} | Finally.cs:66:9:67:9 | {...} | false |
+| Finally.cs:61:38:61:39 | IOException ex | Finally.cs:62:9:64:9 | {...} | true |
+| Finally.cs:65:9:67:9 | catch (...) {...} | Finally.cs:65:26:65:26 | Exception e | true |
+| Finally.cs:65:9:67:9 | catch (...) {...} | Finally.cs:66:9:67:9 | {...} | true |
+| Finally.cs:65:26:65:26 | Exception e | Finally.cs:66:9:67:9 | {...} | true |
 | Finally.cs:77:16:77:16 | access to local variable i | Finally.cs:74:10:74:11 | exit M4 (abnormal) | true |
 | Finally.cs:77:16:77:16 | access to local variable i | Finally.cs:78:9:100:9 | {...} | true |
 | Finally.cs:77:16:77:16 | access to local variable i | Finally.cs:82:21:82:27 | return ...; | true |
@@ -1355,338 +223,65 @@ conditionBlock
 | Finally.cs:77:16:77:16 | access to local variable i | Finally.cs:85:17:86:26 | if (...) ... | true |
 | Finally.cs:77:16:77:16 | access to local variable i | Finally.cs:86:21:86:26 | break; | true |
 | Finally.cs:77:16:77:16 | access to local variable i | Finally.cs:89:13:99:13 | {...} | true |
-| Finally.cs:77:16:77:16 | access to local variable i | Finally.cs:93:25:93:46 | [finally: break] throw ...; | true |
-| Finally.cs:77:16:77:16 | access to local variable i | Finally.cs:93:25:93:46 | [finally: continue] throw ...; | true |
-| Finally.cs:77:16:77:16 | access to local variable i | Finally.cs:93:25:93:46 | [finally: return] throw ...; | true |
 | Finally.cs:77:16:77:16 | access to local variable i | Finally.cs:93:25:93:46 | throw ...; | true |
-| Finally.cs:77:16:77:16 | access to local variable i | Finally.cs:93:31:93:45 | [finally: break] object creation of type Exception | true |
-| Finally.cs:77:16:77:16 | access to local variable i | Finally.cs:93:31:93:45 | [finally: continue] object creation of type Exception | true |
-| Finally.cs:77:16:77:16 | access to local variable i | Finally.cs:93:31:93:45 | [finally: return] object creation of type Exception | true |
 | Finally.cs:77:16:77:16 | access to local variable i | Finally.cs:93:31:93:45 | object creation of type Exception | true |
-| Finally.cs:77:16:77:16 | access to local variable i | Finally.cs:96:17:98:17 | [finally(1): exception(Exception)] {...} | true |
-| Finally.cs:77:16:77:16 | access to local variable i | Finally.cs:96:17:98:17 | [finally: break, finally(1): exception(Exception)] {...} | true |
-| Finally.cs:77:16:77:16 | access to local variable i | Finally.cs:96:17:98:17 | [finally: break] {...} | true |
-| Finally.cs:77:16:77:16 | access to local variable i | Finally.cs:96:17:98:17 | [finally: continue, finally(1): exception(Exception)] {...} | true |
-| Finally.cs:77:16:77:16 | access to local variable i | Finally.cs:96:17:98:17 | [finally: continue] {...} | true |
-| Finally.cs:77:16:77:16 | access to local variable i | Finally.cs:96:17:98:17 | [finally: return, finally(1): exception(Exception)] {...} | true |
-| Finally.cs:77:16:77:16 | access to local variable i | Finally.cs:96:17:98:17 | [finally: return] {...} | true |
 | Finally.cs:77:16:77:16 | access to local variable i | Finally.cs:96:17:98:17 | {...} | true |
 | Finally.cs:78:9:100:9 | {...} | Finally.cs:82:21:82:27 | return ...; | true |
 | Finally.cs:78:9:100:9 | {...} | Finally.cs:83:17:84:29 | if (...) ... | false |
 | Finally.cs:78:9:100:9 | {...} | Finally.cs:84:21:84:29 | continue; | false |
 | Finally.cs:78:9:100:9 | {...} | Finally.cs:85:17:86:26 | if (...) ... | false |
 | Finally.cs:78:9:100:9 | {...} | Finally.cs:86:21:86:26 | break; | false |
-| Finally.cs:78:9:100:9 | {...} | Finally.cs:89:13:99:13 | {...} | false |
-| Finally.cs:78:9:100:9 | {...} | Finally.cs:93:25:93:46 | [finally: break] throw ...; | false |
-| Finally.cs:78:9:100:9 | {...} | Finally.cs:93:25:93:46 | [finally: continue] throw ...; | false |
-| Finally.cs:78:9:100:9 | {...} | Finally.cs:93:25:93:46 | [finally: return] throw ...; | true |
-| Finally.cs:78:9:100:9 | {...} | Finally.cs:93:25:93:46 | throw ...; | false |
-| Finally.cs:78:9:100:9 | {...} | Finally.cs:93:31:93:45 | [finally: break] object creation of type Exception | false |
-| Finally.cs:78:9:100:9 | {...} | Finally.cs:93:31:93:45 | [finally: continue] object creation of type Exception | false |
-| Finally.cs:78:9:100:9 | {...} | Finally.cs:93:31:93:45 | [finally: return] object creation of type Exception | true |
-| Finally.cs:78:9:100:9 | {...} | Finally.cs:93:31:93:45 | object creation of type Exception | false |
-| Finally.cs:78:9:100:9 | {...} | Finally.cs:96:17:98:17 | [finally(1): exception(Exception)] {...} | false |
-| Finally.cs:78:9:100:9 | {...} | Finally.cs:96:17:98:17 | [finally: break, finally(1): exception(Exception)] {...} | false |
-| Finally.cs:78:9:100:9 | {...} | Finally.cs:96:17:98:17 | [finally: break] {...} | false |
-| Finally.cs:78:9:100:9 | {...} | Finally.cs:96:17:98:17 | [finally: continue, finally(1): exception(Exception)] {...} | false |
-| Finally.cs:78:9:100:9 | {...} | Finally.cs:96:17:98:17 | [finally: continue] {...} | false |
-| Finally.cs:78:9:100:9 | {...} | Finally.cs:96:17:98:17 | [finally: return, finally(1): exception(Exception)] {...} | true |
-| Finally.cs:78:9:100:9 | {...} | Finally.cs:96:17:98:17 | [finally: return] {...} | true |
-| Finally.cs:78:9:100:9 | {...} | Finally.cs:96:17:98:17 | {...} | false |
-| Finally.cs:82:21:82:27 | return ...; | Finally.cs:93:25:93:46 | [finally: return] throw ...; | true |
-| Finally.cs:82:21:82:27 | return ...; | Finally.cs:93:31:93:45 | [finally: return] object creation of type Exception | true |
-| Finally.cs:82:21:82:27 | return ...; | Finally.cs:96:17:98:17 | [finally: return, finally(1): exception(Exception)] {...} | true |
-| Finally.cs:82:21:82:27 | return ...; | Finally.cs:96:17:98:17 | [finally: return] {...} | false |
 | Finally.cs:83:17:84:29 | if (...) ... | Finally.cs:84:21:84:29 | continue; | true |
 | Finally.cs:83:17:84:29 | if (...) ... | Finally.cs:85:17:86:26 | if (...) ... | false |
 | Finally.cs:83:17:84:29 | if (...) ... | Finally.cs:86:21:86:26 | break; | false |
-| Finally.cs:83:17:84:29 | if (...) ... | Finally.cs:89:13:99:13 | {...} | false |
-| Finally.cs:83:17:84:29 | if (...) ... | Finally.cs:93:25:93:46 | [finally: break] throw ...; | false |
-| Finally.cs:83:17:84:29 | if (...) ... | Finally.cs:93:25:93:46 | [finally: continue] throw ...; | true |
-| Finally.cs:83:17:84:29 | if (...) ... | Finally.cs:93:25:93:46 | throw ...; | false |
-| Finally.cs:83:17:84:29 | if (...) ... | Finally.cs:93:31:93:45 | [finally: break] object creation of type Exception | false |
-| Finally.cs:83:17:84:29 | if (...) ... | Finally.cs:93:31:93:45 | [finally: continue] object creation of type Exception | true |
-| Finally.cs:83:17:84:29 | if (...) ... | Finally.cs:93:31:93:45 | object creation of type Exception | false |
-| Finally.cs:83:17:84:29 | if (...) ... | Finally.cs:96:17:98:17 | [finally(1): exception(Exception)] {...} | false |
-| Finally.cs:83:17:84:29 | if (...) ... | Finally.cs:96:17:98:17 | [finally: break, finally(1): exception(Exception)] {...} | false |
-| Finally.cs:83:17:84:29 | if (...) ... | Finally.cs:96:17:98:17 | [finally: break] {...} | false |
-| Finally.cs:83:17:84:29 | if (...) ... | Finally.cs:96:17:98:17 | [finally: continue, finally(1): exception(Exception)] {...} | true |
-| Finally.cs:83:17:84:29 | if (...) ... | Finally.cs:96:17:98:17 | [finally: continue] {...} | true |
-| Finally.cs:83:17:84:29 | if (...) ... | Finally.cs:96:17:98:17 | {...} | false |
-| Finally.cs:84:21:84:29 | continue; | Finally.cs:93:25:93:46 | [finally: continue] throw ...; | true |
-| Finally.cs:84:21:84:29 | continue; | Finally.cs:93:31:93:45 | [finally: continue] object creation of type Exception | true |
-| Finally.cs:84:21:84:29 | continue; | Finally.cs:96:17:98:17 | [finally: continue, finally(1): exception(Exception)] {...} | true |
-| Finally.cs:84:21:84:29 | continue; | Finally.cs:96:17:98:17 | [finally: continue] {...} | false |
 | Finally.cs:85:17:86:26 | if (...) ... | Finally.cs:86:21:86:26 | break; | true |
-| Finally.cs:85:17:86:26 | if (...) ... | Finally.cs:89:13:99:13 | {...} | false |
-| Finally.cs:85:17:86:26 | if (...) ... | Finally.cs:93:25:93:46 | [finally: break] throw ...; | true |
-| Finally.cs:85:17:86:26 | if (...) ... | Finally.cs:93:25:93:46 | throw ...; | false |
-| Finally.cs:85:17:86:26 | if (...) ... | Finally.cs:93:31:93:45 | [finally: break] object creation of type Exception | true |
-| Finally.cs:85:17:86:26 | if (...) ... | Finally.cs:93:31:93:45 | object creation of type Exception | false |
-| Finally.cs:85:17:86:26 | if (...) ... | Finally.cs:96:17:98:17 | [finally(1): exception(Exception)] {...} | false |
-| Finally.cs:85:17:86:26 | if (...) ... | Finally.cs:96:17:98:17 | [finally: break, finally(1): exception(Exception)] {...} | true |
-| Finally.cs:85:17:86:26 | if (...) ... | Finally.cs:96:17:98:17 | [finally: break] {...} | true |
-| Finally.cs:85:17:86:26 | if (...) ... | Finally.cs:96:17:98:17 | {...} | false |
-| Finally.cs:86:21:86:26 | break; | Finally.cs:93:25:93:46 | [finally: break] throw ...; | true |
-| Finally.cs:86:21:86:26 | break; | Finally.cs:93:31:93:45 | [finally: break] object creation of type Exception | true |
-| Finally.cs:86:21:86:26 | break; | Finally.cs:96:17:98:17 | [finally: break, finally(1): exception(Exception)] {...} | true |
-| Finally.cs:86:21:86:26 | break; | Finally.cs:96:17:98:17 | [finally: break] {...} | false |
 | Finally.cs:89:13:99:13 | {...} | Finally.cs:93:25:93:46 | throw ...; | true |
 | Finally.cs:89:13:99:13 | {...} | Finally.cs:93:31:93:45 | object creation of type Exception | true |
-| Finally.cs:89:13:99:13 | {...} | Finally.cs:96:17:98:17 | [finally(1): exception(Exception)] {...} | true |
-| Finally.cs:89:13:99:13 | {...} | Finally.cs:96:17:98:17 | {...} | false |
 | Finally.cs:107:33:107:33 | 0 | Finally.cs:108:17:108:23 | return ...; | true |
 | Finally.cs:107:33:107:33 | 0 | Finally.cs:109:13:110:49 | if (...) ... | false |
 | Finally.cs:107:33:107:33 | 0 | Finally.cs:109:17:109:28 | access to property Length | false |
 | Finally.cs:107:33:107:33 | 0 | Finally.cs:109:33:109:33 | 1 | false |
 | Finally.cs:107:33:107:33 | 0 | Finally.cs:110:17:110:49 | throw ...; | false |
 | Finally.cs:107:33:107:33 | 0 | Finally.cs:110:23:110:48 | object creation of type OutOfMemoryException | false |
-| Finally.cs:107:33:107:33 | 0 | Finally.cs:113:9:118:9 | {...} | false |
-| Finally.cs:107:33:107:33 | 0 | Finally.cs:114:17:114:36 | [false, finally: exception(OutOfMemoryException)] !... | false |
-| Finally.cs:107:33:107:33 | 0 | Finally.cs:114:17:114:36 | [false, finally: return] !... | true |
-| Finally.cs:107:33:107:33 | 0 | Finally.cs:114:17:114:36 | [false] !... | false |
-| Finally.cs:107:33:107:33 | 0 | Finally.cs:114:17:114:36 | [true, finally: exception(OutOfMemoryException)] !... | false |
-| Finally.cs:107:33:107:33 | 0 | Finally.cs:114:17:114:36 | [true, finally: return] !... | true |
-| Finally.cs:107:33:107:33 | 0 | Finally.cs:114:17:114:36 | [true] !... | false |
-| Finally.cs:107:33:107:33 | 0 | Finally.cs:115:17:115:41 | ...; | false |
-| Finally.cs:107:33:107:33 | 0 | Finally.cs:115:17:115:41 | [finally: exception(OutOfMemoryException)] ...; | false |
-| Finally.cs:107:33:107:33 | 0 | Finally.cs:115:17:115:41 | [finally: return] ...; | true |
-| Finally.cs:107:33:107:33 | 0 | Finally.cs:116:13:117:37 | [finally: exception(OutOfMemoryException)] if (...) ... | false |
-| Finally.cs:107:33:107:33 | 0 | Finally.cs:116:13:117:37 | [finally: return] if (...) ... | true |
-| Finally.cs:107:33:107:33 | 0 | Finally.cs:116:13:117:37 | if (...) ... | false |
-| Finally.cs:107:33:107:33 | 0 | Finally.cs:117:17:117:37 | ...; | false |
-| Finally.cs:107:33:107:33 | 0 | Finally.cs:117:17:117:37 | [finally: exception(OutOfMemoryException)] ...; | false |
-| Finally.cs:107:33:107:33 | 0 | Finally.cs:117:17:117:37 | [finally: return] ...; | true |
-| Finally.cs:108:17:108:23 | return ...; | Finally.cs:114:17:114:36 | [false, finally: return] !... | true |
-| Finally.cs:108:17:108:23 | return ...; | Finally.cs:114:17:114:36 | [true, finally: return] !... | false |
-| Finally.cs:108:17:108:23 | return ...; | Finally.cs:115:17:115:41 | [finally: return] ...; | false |
 | Finally.cs:109:33:109:33 | 1 | Finally.cs:110:17:110:49 | throw ...; | true |
 | Finally.cs:109:33:109:33 | 1 | Finally.cs:110:23:110:48 | object creation of type OutOfMemoryException | true |
-| Finally.cs:109:33:109:33 | 1 | Finally.cs:113:9:118:9 | {...} | false |
-| Finally.cs:109:33:109:33 | 1 | Finally.cs:114:17:114:36 | [false, finally: exception(OutOfMemoryException)] !... | true |
-| Finally.cs:109:33:109:33 | 1 | Finally.cs:114:17:114:36 | [false] !... | false |
-| Finally.cs:109:33:109:33 | 1 | Finally.cs:114:17:114:36 | [true, finally: exception(OutOfMemoryException)] !... | true |
-| Finally.cs:109:33:109:33 | 1 | Finally.cs:114:17:114:36 | [true] !... | false |
-| Finally.cs:109:33:109:33 | 1 | Finally.cs:115:17:115:41 | ...; | false |
-| Finally.cs:109:33:109:33 | 1 | Finally.cs:115:17:115:41 | [finally: exception(OutOfMemoryException)] ...; | true |
-| Finally.cs:109:33:109:33 | 1 | Finally.cs:116:13:117:37 | [finally: exception(OutOfMemoryException)] if (...) ... | true |
-| Finally.cs:109:33:109:33 | 1 | Finally.cs:116:13:117:37 | if (...) ... | false |
-| Finally.cs:109:33:109:33 | 1 | Finally.cs:117:17:117:37 | ...; | false |
-| Finally.cs:109:33:109:33 | 1 | Finally.cs:117:17:117:37 | [finally: exception(OutOfMemoryException)] ...; | true |
-| Finally.cs:110:17:110:49 | throw ...; | Finally.cs:114:17:114:36 | [false, finally: exception(OutOfMemoryException)] !... | true |
-| Finally.cs:110:17:110:49 | throw ...; | Finally.cs:114:17:114:36 | [true, finally: exception(OutOfMemoryException)] !... | false |
-| Finally.cs:110:17:110:49 | throw ...; | Finally.cs:115:17:115:41 | [finally: exception(OutOfMemoryException)] ...; | false |
-| Finally.cs:113:9:118:9 | [finally: exception(Exception)] {...} | Finally.cs:114:17:114:36 | [false, finally: exception(Exception)] !... | true |
-| Finally.cs:113:9:118:9 | [finally: exception(Exception)] {...} | Finally.cs:114:17:114:36 | [true, finally: exception(Exception)] !... | false |
-| Finally.cs:113:9:118:9 | [finally: exception(Exception)] {...} | Finally.cs:115:17:115:41 | [finally: exception(Exception)] ...; | false |
-| Finally.cs:113:9:118:9 | [finally: exception(NullReferenceException)] {...} | Finally.cs:114:17:114:36 | [false, finally: exception(NullReferenceException)] !... | true |
-| Finally.cs:113:9:118:9 | [finally: exception(NullReferenceException)] {...} | Finally.cs:114:17:114:36 | [true, finally: exception(NullReferenceException)] !... | false |
-| Finally.cs:113:9:118:9 | [finally: exception(NullReferenceException)] {...} | Finally.cs:115:17:115:41 | [finally: exception(NullReferenceException)] ...; | false |
 | Finally.cs:113:9:118:9 | {...} | Finally.cs:114:17:114:36 | [false] !... | true |
 | Finally.cs:113:9:118:9 | {...} | Finally.cs:114:17:114:36 | [true] !... | false |
 | Finally.cs:113:9:118:9 | {...} | Finally.cs:115:17:115:41 | ...; | false |
-| Finally.cs:114:17:114:36 | [true, finally: exception(Exception)] !... | Finally.cs:115:17:115:41 | [finally: exception(Exception)] ...; | true |
-| Finally.cs:114:17:114:36 | [true, finally: exception(NullReferenceException)] !... | Finally.cs:115:17:115:41 | [finally: exception(NullReferenceException)] ...; | true |
-| Finally.cs:114:17:114:36 | [true, finally: exception(OutOfMemoryException)] !... | Finally.cs:115:17:115:41 | [finally: exception(OutOfMemoryException)] ...; | true |
-| Finally.cs:114:17:114:36 | [true, finally: return] !... | Finally.cs:115:17:115:41 | [finally: return] ...; | true |
 | Finally.cs:114:17:114:36 | [true] !... | Finally.cs:115:17:115:41 | ...; | true |
-| Finally.cs:116:13:117:37 | [finally: exception(Exception)] if (...) ... | Finally.cs:117:17:117:37 | [finally: exception(Exception)] ...; | true |
-| Finally.cs:116:13:117:37 | [finally: exception(NullReferenceException)] if (...) ... | Finally.cs:117:17:117:37 | [finally: exception(NullReferenceException)] ...; | true |
-| Finally.cs:116:13:117:37 | [finally: exception(OutOfMemoryException)] if (...) ... | Finally.cs:117:17:117:37 | [finally: exception(OutOfMemoryException)] ...; | true |
-| Finally.cs:116:13:117:37 | [finally: return] if (...) ... | Finally.cs:117:17:117:37 | [finally: return] ...; | true |
 | Finally.cs:116:13:117:37 | if (...) ... | Finally.cs:117:17:117:37 | ...; | true |
-| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:147:10:147:11 | exit M8 (abnormal) | true |
-| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:147:10:147:11 | exit M8 (normal) | false |
 | Finally.cs:147:10:147:11 | enter M8 | Finally.cs:152:17:152:50 | throw ...; | true |
 | Finally.cs:147:10:147:11 | enter M8 | Finally.cs:152:23:152:49 | object creation of type ArgumentNullException | true |
-| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:155:9:169:9 | [finally: exception(Exception)] {...} | true |
-| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:155:9:169:9 | {...} | false |
-| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:158:36:158:36 | 1 | false |
-| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:158:36:158:36 | [finally: exception(ArgumentNullException)] 1 | true |
-| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:158:36:158:36 | [finally: exception(Exception)] 1 | true |
-| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:159:21:159:45 | [finally: exception(ArgumentNullException)] throw ...; | true |
-| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:159:21:159:45 | [finally: exception(Exception)] throw ...; | true |
-| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:159:21:159:45 | throw ...; | false |
-| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:159:41:159:43 | "1" | false |
-| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:159:41:159:43 | [finally: exception(ArgumentNullException)] "1" | true |
-| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:159:41:159:43 | [finally: exception(Exception)] "1" | true |
-| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:161:13:164:13 | [exception: Exception] catch (...) {...} | false |
-| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:161:13:164:13 | [exception: NullReferenceException] catch (...) {...} | false |
-| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:161:13:164:13 | [finally: exception(ArgumentNullException), exception: Exception] catch (...) {...} | true |
-| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:161:13:164:13 | [finally: exception(ArgumentNullException), exception: NullReferenceException] catch (...) {...} | true |
-| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:161:13:164:13 | [finally: exception(Exception), exception: Exception] catch (...) {...} | true |
-| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:161:13:164:13 | [finally: exception(Exception), exception: NullReferenceException] catch (...) {...} | true |
-| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:161:30:161:30 | [exception: Exception] Exception e | false |
-| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:161:30:161:30 | [exception: NullReferenceException] Exception e | false |
-| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:161:30:161:30 | [finally: exception(ArgumentNullException), exception: Exception] Exception e | true |
-| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:161:30:161:30 | [finally: exception(ArgumentNullException), exception: NullReferenceException] Exception e | true |
-| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:161:30:161:30 | [finally: exception(Exception), exception: Exception] Exception e | true |
-| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:161:30:161:30 | [finally: exception(Exception), exception: NullReferenceException] Exception e | true |
-| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:162:13:164:13 | [finally: exception(ArgumentNullException)] {...} | true |
-| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:162:13:164:13 | [finally: exception(Exception)] {...} | true |
-| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:162:13:164:13 | {...} | false |
-| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:165:13:168:13 | [finally: exception(ArgumentNullException)] catch {...} | true |
-| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:165:13:168:13 | [finally: exception(Exception)] catch {...} | true |
-| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:165:13:168:13 | catch {...} | false |
 | Finally.cs:158:36:158:36 | 1 | Finally.cs:159:21:159:45 | throw ...; | true |
 | Finally.cs:158:36:158:36 | 1 | Finally.cs:159:41:159:43 | "1" | true |
-| Finally.cs:158:36:158:36 | [finally: exception(ArgumentNullException)] 1 | Finally.cs:159:21:159:45 | [finally: exception(ArgumentNullException)] throw ...; | true |
-| Finally.cs:158:36:158:36 | [finally: exception(ArgumentNullException)] 1 | Finally.cs:159:41:159:43 | [finally: exception(ArgumentNullException)] "1" | true |
-| Finally.cs:158:36:158:36 | [finally: exception(Exception)] 1 | Finally.cs:159:21:159:45 | [finally: exception(Exception)] throw ...; | true |
-| Finally.cs:158:36:158:36 | [finally: exception(Exception)] 1 | Finally.cs:159:41:159:43 | [finally: exception(Exception)] "1" | true |
-| Finally.cs:161:13:164:13 | [exception: Exception] catch (...) {...} | Finally.cs:161:30:161:30 | [exception: Exception] Exception e | true |
-| Finally.cs:161:13:164:13 | [exception: NullReferenceException] catch (...) {...} | Finally.cs:161:30:161:30 | [exception: NullReferenceException] Exception e | true |
-| Finally.cs:161:13:164:13 | [finally: exception(ArgumentNullException), exception: Exception] catch (...) {...} | Finally.cs:161:30:161:30 | [finally: exception(ArgumentNullException), exception: Exception] Exception e | true |
-| Finally.cs:161:13:164:13 | [finally: exception(ArgumentNullException), exception: NullReferenceException] catch (...) {...} | Finally.cs:161:30:161:30 | [finally: exception(ArgumentNullException), exception: NullReferenceException] Exception e | true |
-| Finally.cs:161:13:164:13 | [finally: exception(Exception), exception: Exception] catch (...) {...} | Finally.cs:161:30:161:30 | [finally: exception(Exception), exception: Exception] Exception e | true |
-| Finally.cs:161:13:164:13 | [finally: exception(Exception), exception: NullReferenceException] catch (...) {...} | Finally.cs:161:30:161:30 | [finally: exception(Exception), exception: NullReferenceException] Exception e | true |
-| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:176:10:176:11 | exit M9 (normal) | false |
-| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:180:21:180:43 | [b1 (line 176): true] throw ...; | true |
-| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:180:27:180:42 | [b1 (line 176): true] object creation of type ExceptionA | true |
-| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:183:9:192:9 | [b1 (line 176): false] {...} | false |
-| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:183:9:192:9 | [finally: exception(Exception), b1 (line 176): true] {...} | true |
-| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:186:25:186:47 | [b1 (line 176): false, b2 (line 176): true] throw ...; | false |
-| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:186:25:186:47 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] throw ...; | true |
-| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:186:25:186:47 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] throw ...; | true |
-| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:186:31:186:46 | [b1 (line 176): false, b2 (line 176): true] object creation of type ExceptionB | false |
-| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:186:31:186:46 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB | true |
-| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:186:31:186:46 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB | true |
-| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:188:13:191:13 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] catch (...) {...} | false |
-| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:188:13:191:13 | [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | true |
-| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:188:13:191:13 | [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | true |
-| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:188:38:188:39 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] access to parameter b2 | false |
-| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:188:38:188:39 | [exception: ExceptionB, b1 (line 176): false, b2 (line 176): true] access to parameter b2 | false |
-| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:188:38:188:39 | [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | true |
-| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:188:38:188:39 | [finally: exception(Exception), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | true |
-| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:188:38:188:39 | [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | true |
-| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:188:38:188:39 | [finally: exception(ExceptionA), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | true |
-| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:189:13:191:13 | [b1 (line 176): false] {...} | false |
-| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:189:13:191:13 | [finally: exception(Exception), b1 (line 176): true] {...} | true |
-| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:189:13:191:13 | [finally: exception(ExceptionA), b1 (line 176): true] {...} | true |
-| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:190:31:190:46 | [finally: exception(Exception)] object creation of type ExceptionC | true |
-| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:190:31:190:46 | [finally: exception(ExceptionA)] object creation of type ExceptionC | true |
-| Finally.cs:180:21:180:43 | [b1 (line 176): true] throw ...; | Finally.cs:186:25:186:47 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] throw ...; | true |
-| Finally.cs:180:21:180:43 | [b1 (line 176): true] throw ...; | Finally.cs:186:31:186:46 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB | true |
-| Finally.cs:180:21:180:43 | [b1 (line 176): true] throw ...; | Finally.cs:188:13:191:13 | [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | true |
-| Finally.cs:180:21:180:43 | [b1 (line 176): true] throw ...; | Finally.cs:188:38:188:39 | [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | true |
-| Finally.cs:180:21:180:43 | [b1 (line 176): true] throw ...; | Finally.cs:188:38:188:39 | [finally: exception(ExceptionA), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | true |
-| Finally.cs:180:21:180:43 | [b1 (line 176): true] throw ...; | Finally.cs:189:13:191:13 | [finally: exception(ExceptionA), b1 (line 176): true] {...} | true |
-| Finally.cs:180:21:180:43 | [b1 (line 176): true] throw ...; | Finally.cs:190:31:190:46 | [finally: exception(ExceptionA)] object creation of type ExceptionC | true |
-| Finally.cs:183:9:192:9 | [b1 (line 176): false] {...} | Finally.cs:186:25:186:47 | [b1 (line 176): false, b2 (line 176): true] throw ...; | true |
-| Finally.cs:183:9:192:9 | [b1 (line 176): false] {...} | Finally.cs:186:31:186:46 | [b1 (line 176): false, b2 (line 176): true] object creation of type ExceptionB | true |
-| Finally.cs:183:9:192:9 | [b1 (line 176): false] {...} | Finally.cs:188:13:191:13 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] catch (...) {...} | true |
-| Finally.cs:183:9:192:9 | [b1 (line 176): false] {...} | Finally.cs:188:38:188:39 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] access to parameter b2 | true |
-| Finally.cs:183:9:192:9 | [b1 (line 176): false] {...} | Finally.cs:188:38:188:39 | [exception: ExceptionB, b1 (line 176): false, b2 (line 176): true] access to parameter b2 | true |
-| Finally.cs:183:9:192:9 | [b1 (line 176): false] {...} | Finally.cs:189:13:191:13 | [b1 (line 176): false] {...} | true |
-| Finally.cs:183:9:192:9 | [finally: exception(Exception), b1 (line 176): true] {...} | Finally.cs:186:25:186:47 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] throw ...; | true |
-| Finally.cs:183:9:192:9 | [finally: exception(Exception), b1 (line 176): true] {...} | Finally.cs:186:31:186:46 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB | true |
-| Finally.cs:183:9:192:9 | [finally: exception(Exception), b1 (line 176): true] {...} | Finally.cs:188:13:191:13 | [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | true |
-| Finally.cs:183:9:192:9 | [finally: exception(Exception), b1 (line 176): true] {...} | Finally.cs:188:38:188:39 | [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | true |
-| Finally.cs:183:9:192:9 | [finally: exception(Exception), b1 (line 176): true] {...} | Finally.cs:188:38:188:39 | [finally: exception(Exception), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | true |
-| Finally.cs:183:9:192:9 | [finally: exception(Exception), b1 (line 176): true] {...} | Finally.cs:189:13:191:13 | [finally: exception(Exception), b1 (line 176): true] {...} | true |
-| Finally.cs:183:9:192:9 | [finally: exception(Exception), b1 (line 176): true] {...} | Finally.cs:190:31:190:46 | [finally: exception(Exception)] object creation of type ExceptionC | true |
-| Finally.cs:186:25:186:47 | [b1 (line 176): false, b2 (line 176): true] throw ...; | Finally.cs:188:38:188:39 | [exception: ExceptionB, b1 (line 176): false, b2 (line 176): true] access to parameter b2 | true |
-| Finally.cs:186:25:186:47 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] throw ...; | Finally.cs:188:38:188:39 | [finally: exception(Exception), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | true |
-| Finally.cs:186:25:186:47 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] throw ...; | Finally.cs:188:38:188:39 | [finally: exception(ExceptionA), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | true |
-| Finally.cs:188:13:191:13 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] catch (...) {...} | Finally.cs:188:38:188:39 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] access to parameter b2 | true |
-| Finally.cs:188:13:191:13 | [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | Finally.cs:188:38:188:39 | [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | true |
-| Finally.cs:188:13:191:13 | [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | Finally.cs:188:38:188:39 | [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | true |
-| Finally.cs:189:13:191:13 | [finally: exception(Exception), b1 (line 176): true] {...} | Finally.cs:190:31:190:46 | [finally: exception(Exception)] object creation of type ExceptionC | true |
-| Finally.cs:189:13:191:13 | [finally: exception(ExceptionA), b1 (line 176): true] {...} | Finally.cs:190:31:190:46 | [finally: exception(ExceptionA)] object creation of type ExceptionC | true |
+| Finally.cs:161:13:164:13 | catch (...) {...} | Finally.cs:161:30:161:30 | Exception e | true |
+| Finally.cs:161:13:164:13 | catch (...) {...} | Finally.cs:162:13:164:13 | {...} | true |
+| Finally.cs:161:30:161:30 | Exception e | Finally.cs:162:13:164:13 | {...} | true |
+| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:180:21:180:43 | throw ...; | true |
+| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:180:27:180:42 | object creation of type ExceptionA | true |
+| Finally.cs:183:9:192:9 | {...} | Finally.cs:186:25:186:47 | throw ...; | true |
+| Finally.cs:183:9:192:9 | {...} | Finally.cs:186:31:186:46 | object creation of type ExceptionB | true |
+| Finally.cs:183:9:192:9 | {...} | Finally.cs:188:13:191:13 | catch (...) {...} | true |
+| Finally.cs:183:9:192:9 | {...} | Finally.cs:188:38:188:39 | access to parameter b2 | true |
+| Finally.cs:183:9:192:9 | {...} | Finally.cs:189:13:191:13 | {...} | true |
+| Finally.cs:183:9:192:9 | {...} | Finally.cs:190:31:190:46 | object creation of type ExceptionC | true |
+| Finally.cs:188:13:191:13 | catch (...) {...} | Finally.cs:188:38:188:39 | access to parameter b2 | true |
+| Finally.cs:188:13:191:13 | catch (...) {...} | Finally.cs:189:13:191:13 | {...} | true |
+| Finally.cs:188:13:191:13 | catch (...) {...} | Finally.cs:190:31:190:46 | object creation of type ExceptionC | true |
+| Finally.cs:188:38:188:39 | access to parameter b2 | Finally.cs:189:13:191:13 | {...} | true |
+| Finally.cs:188:38:188:39 | access to parameter b2 | Finally.cs:190:31:190:46 | object creation of type ExceptionC | true |
+| Finally.cs:189:13:191:13 | {...} | Finally.cs:190:31:190:46 | object creation of type ExceptionC | true |
 | Finally.cs:195:10:195:12 | enter M10 | Finally.cs:199:21:199:43 | throw ...; | true |
 | Finally.cs:195:10:195:12 | enter M10 | Finally.cs:199:27:199:42 | object creation of type ExceptionA | true |
-| Finally.cs:195:10:195:12 | enter M10 | Finally.cs:202:9:212:9 | [finally: exception(Exception)] {...} | true |
-| Finally.cs:195:10:195:12 | enter M10 | Finally.cs:202:9:212:9 | {...} | false |
-| Finally.cs:195:10:195:12 | enter M10 | Finally.cs:205:25:205:47 | [finally: exception(Exception)] throw ...; | true |
-| Finally.cs:195:10:195:12 | enter M10 | Finally.cs:205:25:205:47 | [finally: exception(ExceptionA)] throw ...; | true |
-| Finally.cs:195:10:195:12 | enter M10 | Finally.cs:205:25:205:47 | throw ...; | false |
-| Finally.cs:195:10:195:12 | enter M10 | Finally.cs:205:31:205:46 | [finally: exception(Exception)] object creation of type ExceptionB | true |
-| Finally.cs:195:10:195:12 | enter M10 | Finally.cs:205:31:205:46 | [finally: exception(ExceptionA)] object creation of type ExceptionB | true |
-| Finally.cs:195:10:195:12 | enter M10 | Finally.cs:205:31:205:46 | object creation of type ExceptionB | false |
-| Finally.cs:195:10:195:12 | enter M10 | Finally.cs:208:13:210:13 | [finally(1): exception(Exception)] {...} | false |
-| Finally.cs:195:10:195:12 | enter M10 | Finally.cs:208:13:210:13 | [finally: exception(Exception), finally(1): exception(Exception)] {...} | true |
-| Finally.cs:195:10:195:12 | enter M10 | Finally.cs:208:13:210:13 | [finally: exception(Exception)] {...} | true |
-| Finally.cs:195:10:195:12 | enter M10 | Finally.cs:208:13:210:13 | [finally: exception(ExceptionA), finally(1): exception(Exception)] {...} | true |
-| Finally.cs:195:10:195:12 | enter M10 | Finally.cs:208:13:210:13 | [finally: exception(ExceptionA)] {...} | true |
-| Finally.cs:195:10:195:12 | enter M10 | Finally.cs:208:13:210:13 | {...} | false |
-| Finally.cs:195:10:195:12 | enter M10 | Finally.cs:209:31:209:46 | [finally(1): exception(Exception)] object creation of type ExceptionC | false |
-| Finally.cs:195:10:195:12 | enter M10 | Finally.cs:209:31:209:46 | [finally(1): exception(ExceptionB)] object creation of type ExceptionC | false |
-| Finally.cs:195:10:195:12 | enter M10 | Finally.cs:209:31:209:46 | [finally: exception(Exception), finally(1): exception(Exception)] object creation of type ExceptionC | true |
-| Finally.cs:195:10:195:12 | enter M10 | Finally.cs:209:31:209:46 | [finally: exception(Exception), finally(1): exception(ExceptionB)] object creation of type ExceptionC | true |
-| Finally.cs:195:10:195:12 | enter M10 | Finally.cs:209:31:209:46 | [finally: exception(Exception)] object creation of type ExceptionC | true |
-| Finally.cs:195:10:195:12 | enter M10 | Finally.cs:209:31:209:46 | [finally: exception(ExceptionA), finally(1): exception(Exception)] object creation of type ExceptionC | true |
-| Finally.cs:195:10:195:12 | enter M10 | Finally.cs:209:31:209:46 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] object creation of type ExceptionC | true |
-| Finally.cs:195:10:195:12 | enter M10 | Finally.cs:209:31:209:46 | [finally: exception(ExceptionA)] object creation of type ExceptionC | true |
-| Finally.cs:195:10:195:12 | enter M10 | Finally.cs:209:31:209:46 | object creation of type ExceptionC | false |
-| Finally.cs:195:10:195:12 | enter M10 | Finally.cs:211:13:211:29 | ...; | false |
-| Finally.cs:195:10:195:12 | enter M10 | Finally.cs:211:13:211:29 | [finally: exception(Exception)] ...; | true |
-| Finally.cs:195:10:195:12 | enter M10 | Finally.cs:211:13:211:29 | [finally: exception(ExceptionA)] ...; | true |
-| Finally.cs:199:21:199:43 | throw ...; | Finally.cs:205:25:205:47 | [finally: exception(ExceptionA)] throw ...; | true |
-| Finally.cs:199:21:199:43 | throw ...; | Finally.cs:205:31:205:46 | [finally: exception(ExceptionA)] object creation of type ExceptionB | true |
-| Finally.cs:199:21:199:43 | throw ...; | Finally.cs:208:13:210:13 | [finally: exception(ExceptionA), finally(1): exception(Exception)] {...} | true |
-| Finally.cs:199:21:199:43 | throw ...; | Finally.cs:208:13:210:13 | [finally: exception(ExceptionA)] {...} | false |
-| Finally.cs:199:21:199:43 | throw ...; | Finally.cs:209:31:209:46 | [finally: exception(ExceptionA), finally(1): exception(Exception)] object creation of type ExceptionC | true |
-| Finally.cs:199:21:199:43 | throw ...; | Finally.cs:209:31:209:46 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] object creation of type ExceptionC | true |
-| Finally.cs:199:21:199:43 | throw ...; | Finally.cs:209:31:209:46 | [finally: exception(ExceptionA)] object creation of type ExceptionC | false |
-| Finally.cs:199:21:199:43 | throw ...; | Finally.cs:211:13:211:29 | [finally: exception(ExceptionA)] ...; | false |
-| Finally.cs:202:9:212:9 | [finally: exception(Exception)] {...} | Finally.cs:205:25:205:47 | [finally: exception(Exception)] throw ...; | true |
-| Finally.cs:202:9:212:9 | [finally: exception(Exception)] {...} | Finally.cs:205:31:205:46 | [finally: exception(Exception)] object creation of type ExceptionB | true |
-| Finally.cs:202:9:212:9 | [finally: exception(Exception)] {...} | Finally.cs:208:13:210:13 | [finally: exception(Exception), finally(1): exception(Exception)] {...} | true |
-| Finally.cs:202:9:212:9 | [finally: exception(Exception)] {...} | Finally.cs:208:13:210:13 | [finally: exception(Exception)] {...} | false |
-| Finally.cs:202:9:212:9 | [finally: exception(Exception)] {...} | Finally.cs:209:31:209:46 | [finally: exception(Exception), finally(1): exception(Exception)] object creation of type ExceptionC | true |
-| Finally.cs:202:9:212:9 | [finally: exception(Exception)] {...} | Finally.cs:209:31:209:46 | [finally: exception(Exception), finally(1): exception(ExceptionB)] object creation of type ExceptionC | true |
-| Finally.cs:202:9:212:9 | [finally: exception(Exception)] {...} | Finally.cs:209:31:209:46 | [finally: exception(Exception)] object creation of type ExceptionC | false |
-| Finally.cs:202:9:212:9 | [finally: exception(Exception)] {...} | Finally.cs:211:13:211:29 | [finally: exception(Exception)] ...; | false |
 | Finally.cs:202:9:212:9 | {...} | Finally.cs:205:25:205:47 | throw ...; | true |
 | Finally.cs:202:9:212:9 | {...} | Finally.cs:205:31:205:46 | object creation of type ExceptionB | true |
-| Finally.cs:202:9:212:9 | {...} | Finally.cs:208:13:210:13 | [finally(1): exception(Exception)] {...} | true |
-| Finally.cs:202:9:212:9 | {...} | Finally.cs:208:13:210:13 | {...} | false |
-| Finally.cs:202:9:212:9 | {...} | Finally.cs:209:31:209:46 | [finally(1): exception(Exception)] object creation of type ExceptionC | true |
-| Finally.cs:202:9:212:9 | {...} | Finally.cs:209:31:209:46 | [finally(1): exception(ExceptionB)] object creation of type ExceptionC | true |
-| Finally.cs:202:9:212:9 | {...} | Finally.cs:209:31:209:46 | object creation of type ExceptionC | false |
-| Finally.cs:202:9:212:9 | {...} | Finally.cs:211:13:211:29 | ...; | false |
-| Finally.cs:205:25:205:47 | [finally: exception(Exception)] throw ...; | Finally.cs:209:31:209:46 | [finally: exception(Exception), finally(1): exception(ExceptionB)] object creation of type ExceptionC | true |
-| Finally.cs:205:25:205:47 | [finally: exception(ExceptionA)] throw ...; | Finally.cs:209:31:209:46 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] object creation of type ExceptionC | true |
-| Finally.cs:205:25:205:47 | throw ...; | Finally.cs:209:31:209:46 | [finally(1): exception(ExceptionB)] object creation of type ExceptionC | true |
-| Finally.cs:208:13:210:13 | [finally(1): exception(Exception)] {...} | Finally.cs:209:31:209:46 | [finally(1): exception(Exception)] object creation of type ExceptionC | true |
-| Finally.cs:208:13:210:13 | [finally: exception(Exception), finally(1): exception(Exception)] {...} | Finally.cs:209:31:209:46 | [finally: exception(Exception), finally(1): exception(Exception)] object creation of type ExceptionC | true |
-| Finally.cs:208:13:210:13 | [finally: exception(Exception)] {...} | Finally.cs:209:31:209:46 | [finally: exception(Exception)] object creation of type ExceptionC | true |
-| Finally.cs:208:13:210:13 | [finally: exception(Exception)] {...} | Finally.cs:211:13:211:29 | [finally: exception(Exception)] ...; | false |
-| Finally.cs:208:13:210:13 | [finally: exception(ExceptionA), finally(1): exception(Exception)] {...} | Finally.cs:209:31:209:46 | [finally: exception(ExceptionA), finally(1): exception(Exception)] object creation of type ExceptionC | true |
-| Finally.cs:208:13:210:13 | [finally: exception(ExceptionA)] {...} | Finally.cs:209:31:209:46 | [finally: exception(ExceptionA)] object creation of type ExceptionC | true |
-| Finally.cs:208:13:210:13 | [finally: exception(ExceptionA)] {...} | Finally.cs:211:13:211:29 | [finally: exception(ExceptionA)] ...; | false |
 | Finally.cs:208:13:210:13 | {...} | Finally.cs:209:31:209:46 | object creation of type ExceptionC | true |
 | Finally.cs:208:13:210:13 | {...} | Finally.cs:211:13:211:29 | ...; | false |
+| Finally.cs:208:13:210:13 | {...} | Finally.cs:213:9:213:25 | ...; | false |
 | Finally.cs:233:10:233:12 | enter M12 | Finally.cs:240:21:240:43 | throw ...; | true |
 | Finally.cs:233:10:233:12 | enter M12 | Finally.cs:240:27:240:42 | object creation of type ExceptionA | true |
-| Finally.cs:233:10:233:12 | enter M12 | Finally.cs:243:13:253:13 | [finally: exception(Exception)] {...} | true |
-| Finally.cs:233:10:233:12 | enter M12 | Finally.cs:243:13:253:13 | {...} | false |
-| Finally.cs:233:10:233:12 | enter M12 | Finally.cs:247:25:247:47 | [finally: exception(Exception)] throw ...; | true |
-| Finally.cs:233:10:233:12 | enter M12 | Finally.cs:247:25:247:47 | [finally: exception(ExceptionA)] throw ...; | true |
-| Finally.cs:233:10:233:12 | enter M12 | Finally.cs:247:25:247:47 | throw ...; | false |
-| Finally.cs:233:10:233:12 | enter M12 | Finally.cs:247:31:247:46 | [finally: exception(Exception)] object creation of type ExceptionA | true |
-| Finally.cs:233:10:233:12 | enter M12 | Finally.cs:247:31:247:46 | [finally: exception(ExceptionA)] object creation of type ExceptionA | true |
-| Finally.cs:233:10:233:12 | enter M12 | Finally.cs:247:31:247:46 | object creation of type ExceptionA | false |
-| Finally.cs:233:10:233:12 | enter M12 | Finally.cs:250:17:252:17 | [finally(1): exception(Exception)] {...} | false |
-| Finally.cs:233:10:233:12 | enter M12 | Finally.cs:250:17:252:17 | [finally: exception(Exception), finally(1): exception(Exception)] {...} | true |
-| Finally.cs:233:10:233:12 | enter M12 | Finally.cs:250:17:252:17 | [finally: exception(Exception)] {...} | true |
-| Finally.cs:233:10:233:12 | enter M12 | Finally.cs:250:17:252:17 | [finally: exception(ExceptionA), finally(1): exception(Exception)] {...} | true |
-| Finally.cs:233:10:233:12 | enter M12 | Finally.cs:250:17:252:17 | [finally: exception(ExceptionA)] {...} | true |
-| Finally.cs:233:10:233:12 | enter M12 | Finally.cs:250:17:252:17 | {...} | false |
-| Finally.cs:233:10:233:12 | enter M12 | Finally.cs:257:9:259:9 | {...} | false |
-| Finally.cs:240:21:240:43 | throw ...; | Finally.cs:247:25:247:47 | [finally: exception(ExceptionA)] throw ...; | true |
-| Finally.cs:240:21:240:43 | throw ...; | Finally.cs:247:31:247:46 | [finally: exception(ExceptionA)] object creation of type ExceptionA | true |
-| Finally.cs:240:21:240:43 | throw ...; | Finally.cs:250:17:252:17 | [finally: exception(ExceptionA), finally(1): exception(Exception)] {...} | true |
-| Finally.cs:240:21:240:43 | throw ...; | Finally.cs:250:17:252:17 | [finally: exception(ExceptionA)] {...} | false |
-| Finally.cs:243:13:253:13 | [finally: exception(Exception)] {...} | Finally.cs:247:25:247:47 | [finally: exception(Exception)] throw ...; | true |
-| Finally.cs:243:13:253:13 | [finally: exception(Exception)] {...} | Finally.cs:247:31:247:46 | [finally: exception(Exception)] object creation of type ExceptionA | true |
-| Finally.cs:243:13:253:13 | [finally: exception(Exception)] {...} | Finally.cs:250:17:252:17 | [finally: exception(Exception), finally(1): exception(Exception)] {...} | true |
-| Finally.cs:243:13:253:13 | [finally: exception(Exception)] {...} | Finally.cs:250:17:252:17 | [finally: exception(Exception)] {...} | false |
 | Finally.cs:243:13:253:13 | {...} | Finally.cs:247:25:247:47 | throw ...; | true |
 | Finally.cs:243:13:253:13 | {...} | Finally.cs:247:31:247:46 | object creation of type ExceptionA | true |
-| Finally.cs:243:13:253:13 | {...} | Finally.cs:250:17:252:17 | [finally(1): exception(Exception)] {...} | true |
-| Finally.cs:243:13:253:13 | {...} | Finally.cs:250:17:252:17 | {...} | false |
-| Finally.cs:243:13:253:13 | {...} | Finally.cs:257:9:259:9 | {...} | false |
 | Foreach.cs:8:9:9:13 | foreach (... ... in ...) ... | Foreach.cs:6:10:6:11 | exit M1 (normal) | true |
 | Foreach.cs:8:9:9:13 | foreach (... ... in ...) ... | Foreach.cs:8:22:8:24 | String arg | false |
 | Foreach.cs:14:9:15:13 | foreach (... ... in ...) ... | Foreach.cs:12:10:12:11 | exit M2 (normal) | true |
@@ -1701,60 +296,51 @@ conditionBlock
 | Foreach.cs:38:9:39:11 | foreach (... ... in ...) ... | Foreach.cs:36:10:36:11 | exit M6 (normal) | true |
 | Foreach.cs:38:9:39:11 | foreach (... ... in ...) ... | Foreach.cs:38:26:38:26 | String x | false |
 | LoopUnrolling.cs:7:10:7:11 | enter M1 | LoopUnrolling.cs:10:13:10:19 | return ...; | true |
+| LoopUnrolling.cs:7:10:7:11 | enter M1 | LoopUnrolling.cs:11:9:12:35 | foreach (... ... in ...) ... | false |
 | LoopUnrolling.cs:7:10:7:11 | enter M1 | LoopUnrolling.cs:11:22:11:24 | String arg | false |
 | LoopUnrolling.cs:7:10:7:11 | enter M1 | LoopUnrolling.cs:11:29:11:32 | access to parameter args | false |
-| LoopUnrolling.cs:11:29:11:32 | access to parameter args | LoopUnrolling.cs:11:22:11:24 | String arg | false |
-| LoopUnrolling.cs:15:10:15:11 | enter M2 | LoopUnrolling.cs:15:10:15:11 | exit M2 (normal) | false |
-| LoopUnrolling.cs:15:10:15:11 | enter M2 | LoopUnrolling.cs:18:22:18:22 | String x | false |
-| LoopUnrolling.cs:18:22:18:22 | String x | LoopUnrolling.cs:15:10:15:11 | exit M2 (normal) | true |
+| LoopUnrolling.cs:11:9:12:35 | foreach (... ... in ...) ... | LoopUnrolling.cs:11:22:11:24 | String arg | false |
+| LoopUnrolling.cs:18:9:19:33 | foreach (... ... in ...) ... | LoopUnrolling.cs:15:10:15:11 | exit M2 (normal) | true |
+| LoopUnrolling.cs:18:9:19:33 | foreach (... ... in ...) ... | LoopUnrolling.cs:18:22:18:22 | String x | false |
 | LoopUnrolling.cs:24:9:26:40 | foreach (... ... in ...) ... | LoopUnrolling.cs:22:10:22:11 | exit M3 (normal) | true |
 | LoopUnrolling.cs:24:9:26:40 | foreach (... ... in ...) ... | LoopUnrolling.cs:24:22:24:24 | Char arg | false |
+| LoopUnrolling.cs:24:9:26:40 | foreach (... ... in ...) ... | LoopUnrolling.cs:25:13:26:40 | foreach (... ... in ...) ... | false |
 | LoopUnrolling.cs:24:9:26:40 | foreach (... ... in ...) ... | LoopUnrolling.cs:25:26:25:29 | Char arg0 | false |
-| LoopUnrolling.cs:24:22:24:24 | Char arg | LoopUnrolling.cs:25:26:25:29 | Char arg0 | false |
-| LoopUnrolling.cs:29:10:29:11 | enter M4 | LoopUnrolling.cs:29:10:29:11 | exit M4 (normal) | true |
-| LoopUnrolling.cs:36:10:36:11 | enter M5 | LoopUnrolling.cs:36:10:36:11 | exit M5 (normal) | false |
-| LoopUnrolling.cs:36:10:36:11 | enter M5 | LoopUnrolling.cs:40:9:42:41 | foreach (... ... in ...) ... | false |
-| LoopUnrolling.cs:36:10:36:11 | enter M5 | LoopUnrolling.cs:40:22:40:22 | String x | false |
-| LoopUnrolling.cs:36:10:36:11 | enter M5 | LoopUnrolling.cs:41:26:41:26 | String y | false |
+| LoopUnrolling.cs:25:13:26:40 | foreach (... ... in ...) ... | LoopUnrolling.cs:25:26:25:29 | Char arg0 | false |
+| LoopUnrolling.cs:32:9:33:33 | foreach (... ... in ...) ... | LoopUnrolling.cs:29:10:29:11 | exit M4 (normal) | true |
+| LoopUnrolling.cs:32:9:33:33 | foreach (... ... in ...) ... | LoopUnrolling.cs:32:22:32:22 | String x | false |
 | LoopUnrolling.cs:40:9:42:41 | foreach (... ... in ...) ... | LoopUnrolling.cs:36:10:36:11 | exit M5 (normal) | true |
-| LoopUnrolling.cs:40:22:40:22 | String x | LoopUnrolling.cs:36:10:36:11 | exit M5 (normal) | false |
-| LoopUnrolling.cs:40:22:40:22 | String x | LoopUnrolling.cs:40:9:42:41 | foreach (... ... in ...) ... | false |
-| LoopUnrolling.cs:40:22:40:22 | String x | LoopUnrolling.cs:41:26:41:26 | String y | false |
-| LoopUnrolling.cs:41:26:41:26 | String y | LoopUnrolling.cs:36:10:36:11 | exit M5 (normal) | true |
-| LoopUnrolling.cs:41:26:41:26 | String y | LoopUnrolling.cs:40:9:42:41 | foreach (... ... in ...) ... | true |
+| LoopUnrolling.cs:40:9:42:41 | foreach (... ... in ...) ... | LoopUnrolling.cs:40:22:40:22 | String x | false |
+| LoopUnrolling.cs:40:9:42:41 | foreach (... ... in ...) ... | LoopUnrolling.cs:41:13:42:41 | foreach (... ... in ...) ... | false |
+| LoopUnrolling.cs:40:9:42:41 | foreach (... ... in ...) ... | LoopUnrolling.cs:41:26:41:26 | String y | false |
+| LoopUnrolling.cs:41:13:42:41 | foreach (... ... in ...) ... | LoopUnrolling.cs:41:26:41:26 | String y | false |
+| LoopUnrolling.cs:45:10:45:11 | enter M6 | LoopUnrolling.cs:45:10:45:11 | exit M6 (normal) | true |
 | LoopUnrolling.cs:45:10:45:11 | enter M6 | LoopUnrolling.cs:48:22:48:22 | String x | false |
 | LoopUnrolling.cs:45:10:45:11 | enter M6 | LoopUnrolling.cs:50:9:50:13 | Label: | false |
-| LoopUnrolling.cs:55:10:55:11 | enter M7 | LoopUnrolling.cs:55:10:55:11 | exit M7 (normal) | false |
-| LoopUnrolling.cs:55:10:55:11 | enter M7 | LoopUnrolling.cs:58:9:64:9 | [b (line 55): false] foreach (... ... in ...) ... | false |
-| LoopUnrolling.cs:55:10:55:11 | enter M7 | LoopUnrolling.cs:58:22:58:22 | String x | false |
-| LoopUnrolling.cs:55:10:55:11 | enter M7 | LoopUnrolling.cs:58:22:58:22 | [b (line 55): false] String x | false |
-| LoopUnrolling.cs:55:10:55:11 | enter M7 | LoopUnrolling.cs:58:22:58:22 | [b (line 55): true] String x | false |
-| LoopUnrolling.cs:55:10:55:11 | enter M7 | LoopUnrolling.cs:61:17:61:37 | [b (line 55): true] ...; | false |
-| LoopUnrolling.cs:55:10:55:11 | enter M7 | LoopUnrolling.cs:62:13:63:37 | [b (line 55): false] if (...) ... | false |
-| LoopUnrolling.cs:55:10:55:11 | enter M7 | LoopUnrolling.cs:63:17:63:37 | [b (line 55): true] ...; | false |
-| LoopUnrolling.cs:58:9:64:9 | [b (line 55): false] foreach (... ... in ...) ... | LoopUnrolling.cs:58:22:58:22 | [b (line 55): false] String x | false |
-| LoopUnrolling.cs:58:22:58:22 | String x | LoopUnrolling.cs:58:9:64:9 | [b (line 55): false] foreach (... ... in ...) ... | false |
-| LoopUnrolling.cs:58:22:58:22 | String x | LoopUnrolling.cs:58:22:58:22 | [b (line 55): false] String x | false |
-| LoopUnrolling.cs:58:22:58:22 | String x | LoopUnrolling.cs:58:22:58:22 | [b (line 55): true] String x | true |
-| LoopUnrolling.cs:58:22:58:22 | String x | LoopUnrolling.cs:61:17:61:37 | [b (line 55): true] ...; | true |
-| LoopUnrolling.cs:58:22:58:22 | String x | LoopUnrolling.cs:62:13:63:37 | [b (line 55): false] if (...) ... | false |
-| LoopUnrolling.cs:58:22:58:22 | String x | LoopUnrolling.cs:63:17:63:37 | [b (line 55): true] ...; | true |
-| LoopUnrolling.cs:61:17:61:37 | [b (line 55): true] ...; | LoopUnrolling.cs:58:22:58:22 | [b (line 55): true] String x | true |
-| LoopUnrolling.cs:61:17:61:37 | [b (line 55): true] ...; | LoopUnrolling.cs:63:17:63:37 | [b (line 55): true] ...; | true |
-| LoopUnrolling.cs:62:13:63:37 | [b (line 55): false] if (...) ... | LoopUnrolling.cs:58:9:64:9 | [b (line 55): false] foreach (... ... in ...) ... | false |
-| LoopUnrolling.cs:62:13:63:37 | [b (line 55): false] if (...) ... | LoopUnrolling.cs:58:22:58:22 | [b (line 55): false] String x | false |
-| LoopUnrolling.cs:63:17:63:37 | [b (line 55): true] ...; | LoopUnrolling.cs:58:22:58:22 | [b (line 55): true] String x | false |
+| LoopUnrolling.cs:58:9:64:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:55:10:55:11 | exit M7 (normal) | true |
+| LoopUnrolling.cs:58:9:64:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:58:22:58:22 | String x | false |
+| LoopUnrolling.cs:58:9:64:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:61:17:61:37 | ...; | false |
+| LoopUnrolling.cs:58:9:64:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:62:13:63:37 | if (...) ... | false |
+| LoopUnrolling.cs:58:9:64:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:63:17:63:37 | ...; | false |
+| LoopUnrolling.cs:58:22:58:22 | String x | LoopUnrolling.cs:61:17:61:37 | ...; | true |
+| LoopUnrolling.cs:62:13:63:37 | if (...) ... | LoopUnrolling.cs:63:17:63:37 | ...; | true |
 | LoopUnrolling.cs:67:10:67:11 | enter M8 | LoopUnrolling.cs:69:13:69:23 | [false] !... | true |
 | LoopUnrolling.cs:67:10:67:11 | enter M8 | LoopUnrolling.cs:69:13:69:23 | [true] !... | false |
 | LoopUnrolling.cs:67:10:67:11 | enter M8 | LoopUnrolling.cs:70:13:70:19 | return ...; | false |
 | LoopUnrolling.cs:67:10:67:11 | enter M8 | LoopUnrolling.cs:71:9:71:21 | ...; | true |
+| LoopUnrolling.cs:67:10:67:11 | enter M8 | LoopUnrolling.cs:72:9:73:35 | foreach (... ... in ...) ... | true |
+| LoopUnrolling.cs:67:10:67:11 | enter M8 | LoopUnrolling.cs:72:22:72:24 | String arg | true |
 | LoopUnrolling.cs:69:13:69:23 | [false] !... | LoopUnrolling.cs:71:9:71:21 | ...; | false |
+| LoopUnrolling.cs:69:13:69:23 | [false] !... | LoopUnrolling.cs:72:9:73:35 | foreach (... ... in ...) ... | false |
+| LoopUnrolling.cs:69:13:69:23 | [false] !... | LoopUnrolling.cs:72:22:72:24 | String arg | false |
 | LoopUnrolling.cs:69:13:69:23 | [true] !... | LoopUnrolling.cs:70:13:70:19 | return ...; | true |
-| LoopUnrolling.cs:76:10:76:11 | enter M9 | LoopUnrolling.cs:76:10:76:11 | exit M9 (normal) | true |
-| LoopUnrolling.cs:85:10:85:12 | enter M10 | LoopUnrolling.cs:85:10:85:12 | exit M10 (normal) | true |
-| LoopUnrolling.cs:94:10:94:12 | enter M11 | LoopUnrolling.cs:94:10:94:12 | exit M11 (normal) | false |
-| LoopUnrolling.cs:94:10:94:12 | enter M11 | LoopUnrolling.cs:97:22:97:22 | String x | false |
-| LoopUnrolling.cs:97:22:97:22 | String x | LoopUnrolling.cs:94:10:94:12 | exit M11 (normal) | true |
+| LoopUnrolling.cs:72:9:73:35 | foreach (... ... in ...) ... | LoopUnrolling.cs:72:22:72:24 | String arg | false |
+| LoopUnrolling.cs:79:9:82:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:76:10:76:11 | exit M9 (normal) | true |
+| LoopUnrolling.cs:79:9:82:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:79:22:79:22 | String x | false |
+| LoopUnrolling.cs:88:9:91:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:85:10:85:12 | exit M10 (normal) | true |
+| LoopUnrolling.cs:88:9:91:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:88:22:88:22 | String x | false |
+| LoopUnrolling.cs:97:9:100:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:94:10:94:12 | exit M11 (normal) | true |
+| LoopUnrolling.cs:97:9:100:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:97:22:97:22 | String x | false |
 | NullCoalescing.cs:3:9:3:10 | enter M1 | NullCoalescing.cs:3:28:3:28 | 0 | true |
 | NullCoalescing.cs:5:9:5:10 | enter M2 | NullCoalescing.cs:5:25:5:34 | [true] ... ?? ... | true |
 | NullCoalescing.cs:5:9:5:10 | enter M2 | NullCoalescing.cs:5:30:5:34 | false | true |
@@ -2446,6 +1032,9 @@ conditionBlock
 | cflow.cs:250:13:250:19 | case ...: | cflow.cs:253:13:253:19 | case ...: | false |
 | cflow.cs:250:13:250:19 | case ...: | cflow.cs:254:17:254:27 | goto ...; | false |
 | cflow.cs:253:13:253:19 | case ...: | cflow.cs:254:17:254:27 | goto ...; | true |
+| cflow.cs:264:25:264:25 | access to local variable i | cflow.cs:261:49:261:53 | exit Yield | false |
+| cflow.cs:264:25:264:25 | access to local variable i | cflow.cs:261:49:261:53 | exit Yield (abnormal) | false |
+| cflow.cs:264:25:264:25 | access to local variable i | cflow.cs:261:49:261:53 | exit Yield (normal) | false |
 | cflow.cs:264:25:264:25 | access to local variable i | cflow.cs:265:9:267:9 | {...} | true |
 | cflow.cs:264:25:264:25 | access to local variable i | cflow.cs:268:9:276:9 | try {...} ... | false |
 | cflow.cs:298:10:298:10 | enter M | cflow.cs:300:44:300:51 | [false] !... | true |
@@ -2455,139 +1044,64 @@ conditionBlock
 conditionFlow
 | Assert.cs:9:20:9:20 | access to parameter b | Assert.cs:9:24:9:27 | null | true |
 | Assert.cs:9:20:9:20 | access to parameter b | Assert.cs:9:31:9:32 | "" | false |
-| Assert.cs:10:22:10:30 | ... != ... | Assert.cs:10:9:10:31 | [assertion failure] call to method Assert | false |
-| Assert.cs:10:22:10:30 | ... != ... | Assert.cs:10:9:10:31 | [assertion success] call to method Assert | true |
 | Assert.cs:16:20:16:20 | access to parameter b | Assert.cs:16:24:16:27 | null | true |
 | Assert.cs:16:20:16:20 | access to parameter b | Assert.cs:16:31:16:32 | "" | false |
 | Assert.cs:23:20:23:20 | access to parameter b | Assert.cs:23:24:23:27 | null | true |
 | Assert.cs:23:20:23:20 | access to parameter b | Assert.cs:23:31:23:32 | "" | false |
 | Assert.cs:30:20:30:20 | access to parameter b | Assert.cs:30:24:30:27 | null | true |
 | Assert.cs:30:20:30:20 | access to parameter b | Assert.cs:30:31:30:32 | "" | false |
-| Assert.cs:31:23:31:31 | ... == ... | Assert.cs:31:9:31:32 | [assertion failure] call to method IsTrue | false |
-| Assert.cs:31:23:31:31 | ... == ... | Assert.cs:31:9:31:32 | [assertion success] call to method IsTrue | true |
 | Assert.cs:37:20:37:20 | access to parameter b | Assert.cs:37:24:37:27 | null | true |
 | Assert.cs:37:20:37:20 | access to parameter b | Assert.cs:37:31:37:32 | "" | false |
-| Assert.cs:38:23:38:31 | ... != ... | Assert.cs:38:9:38:32 | [assertion failure] call to method IsTrue | false |
-| Assert.cs:38:23:38:31 | ... != ... | Assert.cs:38:9:38:32 | [assertion success] call to method IsTrue | true |
 | Assert.cs:44:20:44:20 | access to parameter b | Assert.cs:44:24:44:27 | null | true |
 | Assert.cs:44:20:44:20 | access to parameter b | Assert.cs:44:31:44:32 | "" | false |
-| Assert.cs:45:24:45:32 | ... != ... | Assert.cs:45:9:45:33 | [assertion failure] call to method IsFalse | true |
-| Assert.cs:45:24:45:32 | ... != ... | Assert.cs:45:9:45:33 | [assertion success] call to method IsFalse | false |
 | Assert.cs:51:20:51:20 | access to parameter b | Assert.cs:51:24:51:27 | null | true |
 | Assert.cs:51:20:51:20 | access to parameter b | Assert.cs:51:31:51:32 | "" | false |
-| Assert.cs:52:24:52:32 | ... == ... | Assert.cs:52:9:52:33 | [assertion failure] call to method IsFalse | true |
-| Assert.cs:52:24:52:32 | ... == ... | Assert.cs:52:9:52:33 | [assertion success] call to method IsFalse | false |
-| Assert.cs:58:20:58:20 | access to parameter b | Assert.cs:58:24:58:27 | [b (line 56): true] null | true |
-| Assert.cs:58:20:58:20 | access to parameter b | Assert.cs:58:31:58:32 | [b (line 56): false] "" | false |
-| Assert.cs:59:23:59:31 | [b (line 56): false] ... != ... | Assert.cs:59:23:59:36 | [false] ... && ... | false |
-| Assert.cs:59:23:59:31 | [b (line 56): false] ... != ... | Assert.cs:59:36:59:36 | [b (line 56): false] access to parameter b | true |
-| Assert.cs:59:23:59:31 | [b (line 56): true] ... != ... | Assert.cs:59:23:59:36 | [false] ... && ... | false |
-| Assert.cs:59:23:59:31 | [b (line 56): true] ... != ... | Assert.cs:59:36:59:36 | [b (line 56): true] access to parameter b | true |
-| Assert.cs:59:23:59:36 | [false] ... && ... | Assert.cs:59:9:59:37 | [assertion failure] call to method IsTrue | false |
-| Assert.cs:59:23:59:36 | [true] ... && ... | Assert.cs:59:9:59:37 | [assertion success] call to method IsTrue | true |
-| Assert.cs:59:36:59:36 | [b (line 56): false] access to parameter b | Assert.cs:59:23:59:36 | [false] ... && ... | false |
-| Assert.cs:59:36:59:36 | [b (line 56): true] access to parameter b | Assert.cs:59:23:59:36 | [true] ... && ... | true |
-| Assert.cs:65:20:65:20 | access to parameter b | Assert.cs:65:24:65:27 | [b (line 63): true] null | true |
-| Assert.cs:65:20:65:20 | access to parameter b | Assert.cs:65:31:65:32 | [b (line 63): false] "" | false |
-| Assert.cs:66:24:66:32 | [b (line 63): false] ... == ... | Assert.cs:66:24:66:37 | [true] ... \|\| ... | true |
-| Assert.cs:66:24:66:32 | [b (line 63): false] ... == ... | Assert.cs:66:37:66:37 | [b (line 63): false] access to parameter b | false |
-| Assert.cs:66:24:66:32 | [b (line 63): true] ... == ... | Assert.cs:66:24:66:37 | [true] ... \|\| ... | true |
-| Assert.cs:66:24:66:32 | [b (line 63): true] ... == ... | Assert.cs:66:37:66:37 | [b (line 63): true] access to parameter b | false |
-| Assert.cs:66:24:66:37 | [false] ... \|\| ... | Assert.cs:66:9:66:38 | [assertion success] call to method IsFalse | false |
-| Assert.cs:66:24:66:37 | [true] ... \|\| ... | Assert.cs:66:9:66:38 | [assertion failure] call to method IsFalse | true |
-| Assert.cs:66:37:66:37 | [b (line 63): false] access to parameter b | Assert.cs:66:24:66:37 | [false] ... \|\| ... | false |
-| Assert.cs:66:37:66:37 | [b (line 63): true] access to parameter b | Assert.cs:66:24:66:37 | [true] ... \|\| ... | true |
-| Assert.cs:72:20:72:20 | access to parameter b | Assert.cs:72:24:72:27 | [b (line 70): true] null | true |
-| Assert.cs:72:20:72:20 | access to parameter b | Assert.cs:72:31:72:32 | [b (line 70): false] "" | false |
-| Assert.cs:73:23:73:31 | [b (line 70): false] ... == ... | Assert.cs:73:23:73:36 | [false] ... && ... | false |
-| Assert.cs:73:23:73:31 | [b (line 70): false] ... == ... | Assert.cs:73:36:73:36 | [b (line 70): false] access to parameter b | true |
-| Assert.cs:73:23:73:31 | [b (line 70): true] ... == ... | Assert.cs:73:23:73:36 | [false] ... && ... | false |
-| Assert.cs:73:23:73:31 | [b (line 70): true] ... == ... | Assert.cs:73:36:73:36 | [b (line 70): true] access to parameter b | true |
-| Assert.cs:73:23:73:36 | [false] ... && ... | Assert.cs:73:9:73:37 | [assertion failure] call to method IsTrue | false |
-| Assert.cs:73:23:73:36 | [true] ... && ... | Assert.cs:73:9:73:37 | [assertion success] call to method IsTrue | true |
-| Assert.cs:73:36:73:36 | [b (line 70): false] access to parameter b | Assert.cs:73:23:73:36 | [false] ... && ... | false |
-| Assert.cs:73:36:73:36 | [b (line 70): true] access to parameter b | Assert.cs:73:23:73:36 | [true] ... && ... | true |
-| Assert.cs:79:20:79:20 | access to parameter b | Assert.cs:79:24:79:27 | [b (line 77): true] null | true |
-| Assert.cs:79:20:79:20 | access to parameter b | Assert.cs:79:31:79:32 | [b (line 77): false] "" | false |
-| Assert.cs:80:24:80:32 | [b (line 77): false] ... != ... | Assert.cs:80:24:80:37 | [true] ... \|\| ... | true |
-| Assert.cs:80:24:80:32 | [b (line 77): false] ... != ... | Assert.cs:80:37:80:37 | [b (line 77): false] access to parameter b | false |
-| Assert.cs:80:24:80:32 | [b (line 77): true] ... != ... | Assert.cs:80:24:80:37 | [true] ... \|\| ... | true |
-| Assert.cs:80:24:80:32 | [b (line 77): true] ... != ... | Assert.cs:80:37:80:37 | [b (line 77): true] access to parameter b | false |
-| Assert.cs:80:24:80:37 | [false] ... \|\| ... | Assert.cs:80:9:80:38 | [assertion success] call to method IsFalse | false |
-| Assert.cs:80:24:80:37 | [true] ... \|\| ... | Assert.cs:80:9:80:38 | [assertion failure] call to method IsFalse | true |
-| Assert.cs:80:37:80:37 | [b (line 77): false] access to parameter b | Assert.cs:80:24:80:37 | [false] ... \|\| ... | false |
-| Assert.cs:80:37:80:37 | [b (line 77): true] access to parameter b | Assert.cs:80:24:80:37 | [true] ... \|\| ... | true |
-| Assert.cs:86:20:86:20 | access to parameter b | Assert.cs:86:24:86:27 | [b (line 84): true] null | true |
-| Assert.cs:86:20:86:20 | access to parameter b | Assert.cs:86:31:86:32 | [b (line 84): false] "" | false |
-| Assert.cs:87:22:87:30 | [b (line 84): false] ... != ... | Assert.cs:87:9:87:31 | [assertion failure, b (line 84): false] call to method Assert | false |
-| Assert.cs:87:22:87:30 | [b (line 84): false] ... != ... | Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | true |
-| Assert.cs:87:22:87:30 | [b (line 84): true] ... != ... | Assert.cs:87:9:87:31 | [assertion failure, b (line 84): true] call to method Assert | false |
-| Assert.cs:87:22:87:30 | [b (line 84): true] ... != ... | Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | true |
-| Assert.cs:90:13:90:13 | [b (line 84): false] access to parameter b | Assert.cs:90:24:90:25 | [b (line 84): false] "" | false |
-| Assert.cs:90:13:90:13 | [b (line 84): true] access to parameter b | Assert.cs:90:17:90:20 | [b (line 84): true] null | true |
-| Assert.cs:94:13:94:13 | [b (line 84): false] access to parameter b | Assert.cs:94:24:94:25 | [b (line 84): false] "" | false |
-| Assert.cs:94:13:94:13 | [b (line 84): true] access to parameter b | Assert.cs:94:17:94:20 | [b (line 84): true] null | true |
-| Assert.cs:98:13:98:13 | [b (line 84): false] access to parameter b | Assert.cs:98:24:98:25 | [b (line 84): false] "" | false |
-| Assert.cs:98:13:98:13 | [b (line 84): true] access to parameter b | Assert.cs:98:17:98:20 | [b (line 84): true] null | true |
-| Assert.cs:99:23:99:31 | [b (line 84): false] ... == ... | Assert.cs:99:9:99:32 | [assertion failure, b (line 84): false] call to method IsTrue | false |
-| Assert.cs:99:23:99:31 | [b (line 84): false] ... == ... | Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue | true |
-| Assert.cs:99:23:99:31 | [b (line 84): true] ... == ... | Assert.cs:99:9:99:32 | [assertion failure, b (line 84): true] call to method IsTrue | false |
-| Assert.cs:99:23:99:31 | [b (line 84): true] ... == ... | Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:102:13:102:13 | [b (line 84): false] access to parameter b | Assert.cs:102:24:102:25 | [b (line 84): false] "" | false |
-| Assert.cs:102:13:102:13 | [b (line 84): true] access to parameter b | Assert.cs:102:17:102:20 | [b (line 84): true] null | true |
-| Assert.cs:103:23:103:31 | [b (line 84): false] ... != ... | Assert.cs:103:9:103:32 | [assertion failure, b (line 84): false] call to method IsTrue | false |
-| Assert.cs:103:23:103:31 | [b (line 84): false] ... != ... | Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue | true |
-| Assert.cs:103:23:103:31 | [b (line 84): true] ... != ... | Assert.cs:103:9:103:32 | [assertion failure, b (line 84): true] call to method IsTrue | false |
-| Assert.cs:103:23:103:31 | [b (line 84): true] ... != ... | Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:106:13:106:13 | [b (line 84): false] access to parameter b | Assert.cs:106:24:106:25 | [b (line 84): false] "" | false |
-| Assert.cs:106:13:106:13 | [b (line 84): true] access to parameter b | Assert.cs:106:17:106:20 | [b (line 84): true] null | true |
-| Assert.cs:107:24:107:32 | [b (line 84): false] ... != ... | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): false] call to method IsFalse | true |
-| Assert.cs:107:24:107:32 | [b (line 84): false] ... != ... | Assert.cs:107:9:107:33 | [assertion success, b (line 84): false] call to method IsFalse | false |
-| Assert.cs:107:24:107:32 | [b (line 84): true] ... != ... | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:107:24:107:32 | [b (line 84): true] ... != ... | Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | false |
-| Assert.cs:110:13:110:13 | [b (line 84): false] access to parameter b | Assert.cs:110:24:110:25 | [b (line 84): false] "" | false |
-| Assert.cs:110:13:110:13 | [b (line 84): true] access to parameter b | Assert.cs:110:17:110:20 | [b (line 84): true] null | true |
-| Assert.cs:111:24:111:32 | [b (line 84): false] ... == ... | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): false] call to method IsFalse | true |
-| Assert.cs:111:24:111:32 | [b (line 84): false] ... == ... | Assert.cs:111:9:111:33 | [assertion success, b (line 84): false] call to method IsFalse | false |
-| Assert.cs:111:24:111:32 | [b (line 84): true] ... == ... | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:111:24:111:32 | [b (line 84): true] ... == ... | Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | false |
-| Assert.cs:114:13:114:13 | [b (line 84): false] access to parameter b | Assert.cs:114:24:114:25 | [b (line 84): false] "" | false |
-| Assert.cs:114:13:114:13 | [b (line 84): true] access to parameter b | Assert.cs:114:17:114:20 | [b (line 84): true] null | true |
-| Assert.cs:115:23:115:31 | [b (line 84): false] ... != ... | Assert.cs:115:23:115:36 | [false, b (line 84): false] ... && ... | false |
-| Assert.cs:115:23:115:31 | [b (line 84): false] ... != ... | Assert.cs:115:36:115:36 | [b (line 84): false] access to parameter b | true |
-| Assert.cs:115:23:115:31 | [b (line 84): true] ... != ... | Assert.cs:115:23:115:36 | [false, b (line 84): true] ... && ... | false |
-| Assert.cs:115:23:115:31 | [b (line 84): true] ... != ... | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:115:23:115:36 | [false, b (line 84): false] ... && ... | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): false] call to method IsTrue | false |
-| Assert.cs:115:23:115:36 | [false, b (line 84): true] ... && ... | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): true] call to method IsTrue | false |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:115:36:115:36 | [b (line 84): false] access to parameter b | Assert.cs:115:23:115:36 | [false, b (line 84): false] ... && ... | false |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | true |
-| Assert.cs:118:13:118:13 | [b (line 84): true] access to parameter b | Assert.cs:118:17:118:20 | [b (line 84): true] null | true |
-| Assert.cs:119:24:119:32 | [b (line 84): true] ... == ... | Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... | true |
-| Assert.cs:119:24:119:32 | [b (line 84): true] ... == ... | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | false |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | false |
-| Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... | Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | false |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | true |
-| Assert.cs:122:13:122:13 | [b (line 84): true] access to parameter b | Assert.cs:122:17:122:20 | [b (line 84): true] null | true |
-| Assert.cs:123:23:123:31 | [b (line 84): true] ... == ... | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... | false |
-| Assert.cs:123:23:123:31 | [b (line 84): true] ... == ... | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue | false |
-| Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | true |
-| Assert.cs:126:13:126:13 | [b (line 84): true] access to parameter b | Assert.cs:126:17:126:20 | [b (line 84): true] null | true |
-| Assert.cs:127:24:127:32 | [b (line 84): true] ... != ... | Assert.cs:127:24:127:38 | [true] ... \|\| ... | true |
-| Assert.cs:127:24:127:32 | [b (line 84): true] ... != ... | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | false |
-| Assert.cs:127:24:127:38 | [false] ... \|\| ... | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | false |
-| Assert.cs:127:24:127:38 | [true] ... \|\| ... | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse | true |
-| Assert.cs:127:37:127:38 | [false] !... | Assert.cs:127:24:127:38 | [false] ... \|\| ... | false |
-| Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | Assert.cs:127:37:127:38 | [false] !... | true |
-| Assert.cs:140:25:140:26 | access to parameter b1 | Assert.cs:140:29:140:30 | [assertion failure] access to parameter b2 | false |
-| Assert.cs:140:25:140:26 | access to parameter b1 | Assert.cs:140:29:140:30 | access to parameter b2 | true |
-| Assert.cs:140:29:140:30 | [assertion failure] access to parameter b2 | Assert.cs:140:33:140:34 | [assertion failure] access to parameter b3 | false |
-| Assert.cs:140:29:140:30 | [assertion failure] access to parameter b2 | Assert.cs:140:33:140:34 | [assertion failure] access to parameter b3 | true |
-| Assert.cs:140:29:140:30 | access to parameter b2 | Assert.cs:140:33:140:34 | [assertion failure] access to parameter b3 | true |
-| Assert.cs:140:29:140:30 | access to parameter b2 | Assert.cs:140:33:140:34 | [assertion success] access to parameter b3 | false |
+| Assert.cs:58:20:58:20 | access to parameter b | Assert.cs:58:24:58:27 | null | true |
+| Assert.cs:58:20:58:20 | access to parameter b | Assert.cs:58:31:58:32 | "" | false |
+| Assert.cs:59:23:59:31 | ... != ... | Assert.cs:59:23:59:36 | ... && ... | false |
+| Assert.cs:59:23:59:31 | ... != ... | Assert.cs:59:36:59:36 | access to parameter b | true |
+| Assert.cs:65:20:65:20 | access to parameter b | Assert.cs:65:24:65:27 | null | true |
+| Assert.cs:65:20:65:20 | access to parameter b | Assert.cs:65:31:65:32 | "" | false |
+| Assert.cs:66:24:66:32 | ... == ... | Assert.cs:66:24:66:37 | ... \|\| ... | true |
+| Assert.cs:66:24:66:32 | ... == ... | Assert.cs:66:37:66:37 | access to parameter b | false |
+| Assert.cs:72:20:72:20 | access to parameter b | Assert.cs:72:24:72:27 | null | true |
+| Assert.cs:72:20:72:20 | access to parameter b | Assert.cs:72:31:72:32 | "" | false |
+| Assert.cs:73:23:73:31 | ... == ... | Assert.cs:73:23:73:36 | ... && ... | false |
+| Assert.cs:73:23:73:31 | ... == ... | Assert.cs:73:36:73:36 | access to parameter b | true |
+| Assert.cs:79:20:79:20 | access to parameter b | Assert.cs:79:24:79:27 | null | true |
+| Assert.cs:79:20:79:20 | access to parameter b | Assert.cs:79:31:79:32 | "" | false |
+| Assert.cs:80:24:80:32 | ... != ... | Assert.cs:80:24:80:37 | ... \|\| ... | true |
+| Assert.cs:80:24:80:32 | ... != ... | Assert.cs:80:37:80:37 | access to parameter b | false |
+| Assert.cs:86:20:86:20 | access to parameter b | Assert.cs:86:24:86:27 | null | true |
+| Assert.cs:86:20:86:20 | access to parameter b | Assert.cs:86:31:86:32 | "" | false |
+| Assert.cs:90:13:90:13 | access to parameter b | Assert.cs:90:17:90:20 | null | true |
+| Assert.cs:90:13:90:13 | access to parameter b | Assert.cs:90:24:90:25 | "" | false |
+| Assert.cs:94:13:94:13 | access to parameter b | Assert.cs:94:17:94:20 | null | true |
+| Assert.cs:94:13:94:13 | access to parameter b | Assert.cs:94:24:94:25 | "" | false |
+| Assert.cs:98:13:98:13 | access to parameter b | Assert.cs:98:17:98:20 | null | true |
+| Assert.cs:98:13:98:13 | access to parameter b | Assert.cs:98:24:98:25 | "" | false |
+| Assert.cs:102:13:102:13 | access to parameter b | Assert.cs:102:17:102:20 | null | true |
+| Assert.cs:102:13:102:13 | access to parameter b | Assert.cs:102:24:102:25 | "" | false |
+| Assert.cs:106:13:106:13 | access to parameter b | Assert.cs:106:17:106:20 | null | true |
+| Assert.cs:106:13:106:13 | access to parameter b | Assert.cs:106:24:106:25 | "" | false |
+| Assert.cs:110:13:110:13 | access to parameter b | Assert.cs:110:17:110:20 | null | true |
+| Assert.cs:110:13:110:13 | access to parameter b | Assert.cs:110:24:110:25 | "" | false |
+| Assert.cs:114:13:114:13 | access to parameter b | Assert.cs:114:17:114:20 | null | true |
+| Assert.cs:114:13:114:13 | access to parameter b | Assert.cs:114:24:114:25 | "" | false |
+| Assert.cs:115:23:115:31 | ... != ... | Assert.cs:115:23:115:36 | ... && ... | false |
+| Assert.cs:115:23:115:31 | ... != ... | Assert.cs:115:36:115:36 | access to parameter b | true |
+| Assert.cs:118:13:118:13 | access to parameter b | Assert.cs:118:17:118:20 | null | true |
+| Assert.cs:118:13:118:13 | access to parameter b | Assert.cs:118:24:118:25 | "" | false |
+| Assert.cs:119:24:119:32 | ... == ... | Assert.cs:119:24:119:38 | ... \|\| ... | true |
+| Assert.cs:119:24:119:32 | ... == ... | Assert.cs:119:38:119:38 | access to parameter b | false |
+| Assert.cs:122:13:122:13 | access to parameter b | Assert.cs:122:17:122:20 | null | true |
+| Assert.cs:122:13:122:13 | access to parameter b | Assert.cs:122:24:122:25 | "" | false |
+| Assert.cs:123:23:123:31 | ... == ... | Assert.cs:123:23:123:36 | ... && ... | false |
+| Assert.cs:123:23:123:31 | ... == ... | Assert.cs:123:36:123:36 | access to parameter b | true |
+| Assert.cs:126:13:126:13 | access to parameter b | Assert.cs:126:17:126:20 | null | true |
+| Assert.cs:126:13:126:13 | access to parameter b | Assert.cs:126:24:126:25 | "" | false |
+| Assert.cs:127:24:127:32 | ... != ... | Assert.cs:127:24:127:38 | ... \|\| ... | true |
+| Assert.cs:127:24:127:32 | ... != ... | Assert.cs:127:38:127:38 | access to parameter b | false |
 | BreakInTry.cs:9:21:9:31 | ... == ... | BreakInTry.cs:7:13:11:13 | foreach (... ... in ...) ... | false |
 | BreakInTry.cs:9:21:9:31 | ... == ... | BreakInTry.cs:10:21:10:26 | break; | true |
 | BreakInTry.cs:15:17:15:28 | ... == ... | BreakInTry.cs:3:10:3:11 | exit M1 (normal) | false |
@@ -2596,74 +1110,51 @@ conditionFlow
 | BreakInTry.cs:26:21:26:31 | ... == ... | BreakInTry.cs:30:13:33:13 | {...} | false |
 | BreakInTry.cs:31:21:31:32 | ... == ... | BreakInTry.cs:22:9:34:9 | foreach (... ... in ...) ... | false |
 | BreakInTry.cs:31:21:31:32 | ... == ... | BreakInTry.cs:32:21:32:21 | ; | true |
-| BreakInTry.cs:31:21:31:32 | [finally: break] ... == ... | BreakInTry.cs:32:21:32:21 | [finally: break] ; | true |
-| BreakInTry.cs:31:21:31:32 | [finally: break] ... == ... | BreakInTry.cs:35:7:35:7 | ; | false |
+| BreakInTry.cs:31:21:31:32 | ... == ... | BreakInTry.cs:35:7:35:7 | ; | false |
 | BreakInTry.cs:42:17:42:28 | ... == ... | BreakInTry.cs:43:17:43:23 | return ...; | true |
 | BreakInTry.cs:42:17:42:28 | ... == ... | BreakInTry.cs:46:9:52:9 | {...} | false |
 | BreakInTry.cs:49:21:49:31 | ... == ... | BreakInTry.cs:47:13:51:13 | foreach (... ... in ...) ... | false |
 | BreakInTry.cs:49:21:49:31 | ... == ... | BreakInTry.cs:50:21:50:26 | break; | true |
-| BreakInTry.cs:49:21:49:31 | [finally: return] ... == ... | BreakInTry.cs:47:13:51:13 | [finally: return] foreach (... ... in ...) ... | false |
-| BreakInTry.cs:49:21:49:31 | [finally: return] ... == ... | BreakInTry.cs:50:21:50:26 | [finally: return] break; | true |
 | BreakInTry.cs:60:17:60:28 | ... == ... | BreakInTry.cs:61:17:61:23 | return ...; | true |
 | BreakInTry.cs:60:17:60:28 | ... == ... | BreakInTry.cs:64:9:70:9 | {...} | false |
 | BreakInTry.cs:67:21:67:31 | ... == ... | BreakInTry.cs:65:13:69:13 | foreach (... ... in ...) ... | false |
 | BreakInTry.cs:67:21:67:31 | ... == ... | BreakInTry.cs:68:21:68:26 | break; | true |
-| BreakInTry.cs:67:21:67:31 | [finally: return] ... == ... | BreakInTry.cs:65:13:69:13 | [finally: return] foreach (... ... in ...) ... | false |
-| BreakInTry.cs:67:21:67:31 | [finally: return] ... == ... | BreakInTry.cs:68:21:68:26 | [finally: return] break; | true |
 | ConditionalAccess.cs:13:13:13:25 | ... > ... | ConditionalAccess.cs:14:20:14:20 | 0 | true |
 | ConditionalAccess.cs:13:13:13:25 | ... > ... | ConditionalAccess.cs:16:20:16:20 | 1 | false |
-| Conditions.cs:5:13:5:15 | access to parameter inc | Conditions.cs:6:13:6:16 | [inc (line 3): true] ...; | true |
-| Conditions.cs:5:13:5:15 | access to parameter inc | Conditions.cs:7:9:8:16 | [inc (line 3): false] if (...) ... | false |
+| Conditions.cs:5:13:5:15 | access to parameter inc | Conditions.cs:6:13:6:16 | ...; | true |
+| Conditions.cs:5:13:5:15 | access to parameter inc | Conditions.cs:7:9:8:16 | if (...) ... | false |
 | Conditions.cs:7:13:7:16 | [false] !... | Conditions.cs:3:10:3:19 | exit IncrOrDecr (normal) | false |
 | Conditions.cs:7:13:7:16 | [true] !... | Conditions.cs:8:13:8:16 | ...; | true |
-| Conditions.cs:7:14:7:16 | [inc (line 3): false] access to parameter inc | Conditions.cs:7:13:7:16 | [true] !... | false |
-| Conditions.cs:7:14:7:16 | [inc (line 3): true] access to parameter inc | Conditions.cs:7:13:7:16 | [false] !... | true |
-| Conditions.cs:14:13:14:13 | access to parameter b | Conditions.cs:15:13:15:16 | [b (line 11): true] ...; | true |
-| Conditions.cs:14:13:14:13 | access to parameter b | Conditions.cs:16:9:18:20 | [b (line 11): false] if (...) ... | false |
-| Conditions.cs:16:13:16:17 | [b (line 11): false] ... > ... | Conditions.cs:17:13:18:20 | [b (line 11): false] if (...) ... | true |
-| Conditions.cs:16:13:16:17 | [b (line 11): false] ... > ... | Conditions.cs:19:16:19:16 | access to local variable x | false |
-| Conditions.cs:16:13:16:17 | [b (line 11): true] ... > ... | Conditions.cs:17:13:18:20 | [b (line 11): true] if (...) ... | true |
-| Conditions.cs:16:13:16:17 | [b (line 11): true] ... > ... | Conditions.cs:19:16:19:16 | access to local variable x | false |
+| Conditions.cs:7:14:7:16 | access to parameter inc | Conditions.cs:7:13:7:16 | [false] !... | true |
+| Conditions.cs:7:14:7:16 | access to parameter inc | Conditions.cs:7:13:7:16 | [true] !... | false |
+| Conditions.cs:14:13:14:13 | access to parameter b | Conditions.cs:15:13:15:16 | ...; | true |
+| Conditions.cs:14:13:14:13 | access to parameter b | Conditions.cs:16:9:18:20 | if (...) ... | false |
+| Conditions.cs:16:13:16:17 | ... > ... | Conditions.cs:17:13:18:20 | if (...) ... | true |
+| Conditions.cs:16:13:16:17 | ... > ... | Conditions.cs:19:16:19:16 | access to local variable x | false |
 | Conditions.cs:17:17:17:18 | [false] !... | Conditions.cs:19:16:19:16 | access to local variable x | false |
 | Conditions.cs:17:17:17:18 | [true] !... | Conditions.cs:18:17:18:20 | ...; | true |
-| Conditions.cs:17:18:17:18 | [b (line 11): false] access to parameter b | Conditions.cs:17:17:17:18 | [true] !... | false |
-| Conditions.cs:17:18:17:18 | [b (line 11): true] access to parameter b | Conditions.cs:17:17:17:18 | [false] !... | true |
+| Conditions.cs:17:18:17:18 | access to parameter b | Conditions.cs:17:17:17:18 | [false] !... | true |
+| Conditions.cs:17:18:17:18 | access to parameter b | Conditions.cs:17:17:17:18 | [true] !... | false |
 | Conditions.cs:25:13:25:14 | access to parameter b1 | Conditions.cs:26:13:27:20 | if (...) ... | true |
 | Conditions.cs:25:13:25:14 | access to parameter b1 | Conditions.cs:28:9:29:16 | if (...) ... | false |
-| Conditions.cs:26:17:26:18 | access to parameter b2 | Conditions.cs:27:17:27:20 | [b2 (line 22): true] ...; | true |
-| Conditions.cs:26:17:26:18 | access to parameter b2 | Conditions.cs:28:9:29:16 | [b2 (line 22): false] if (...) ... | false |
-| Conditions.cs:28:13:28:14 | [b2 (line 22): false] access to parameter b2 | Conditions.cs:30:16:30:16 | access to local variable x | false |
-| Conditions.cs:28:13:28:14 | [b2 (line 22): true] access to parameter b2 | Conditions.cs:29:13:29:16 | ...; | true |
+| Conditions.cs:26:17:26:18 | access to parameter b2 | Conditions.cs:27:17:27:20 | ...; | true |
+| Conditions.cs:26:17:26:18 | access to parameter b2 | Conditions.cs:28:9:29:16 | if (...) ... | false |
 | Conditions.cs:28:13:28:14 | access to parameter b2 | Conditions.cs:29:13:29:16 | ...; | true |
 | Conditions.cs:28:13:28:14 | access to parameter b2 | Conditions.cs:30:16:30:16 | access to local variable x | false |
 | Conditions.cs:37:13:37:14 | access to parameter b1 | Conditions.cs:38:13:38:20 | ...; | true |
 | Conditions.cs:37:13:37:14 | access to parameter b1 | Conditions.cs:39:9:40:16 | if (...) ... | false |
-| Conditions.cs:39:13:39:14 | access to local variable b2 | Conditions.cs:40:13:40:16 | [b2 (line 39): true] ...; | true |
-| Conditions.cs:39:13:39:14 | access to local variable b2 | Conditions.cs:41:9:42:16 | [b2 (line 39): false] if (...) ... | false |
-| Conditions.cs:41:13:41:14 | [b2 (line 39): false] access to local variable b2 | Conditions.cs:43:16:43:16 | access to local variable x | false |
-| Conditions.cs:41:13:41:14 | [b2 (line 39): true] access to local variable b2 | Conditions.cs:42:13:42:16 | ...; | true |
+| Conditions.cs:39:13:39:14 | access to local variable b2 | Conditions.cs:40:13:40:16 | ...; | true |
+| Conditions.cs:39:13:39:14 | access to local variable b2 | Conditions.cs:41:9:42:16 | if (...) ... | false |
+| Conditions.cs:41:13:41:14 | access to local variable b2 | Conditions.cs:42:13:42:16 | ...; | true |
+| Conditions.cs:41:13:41:14 | access to local variable b2 | Conditions.cs:43:16:43:16 | access to local variable x | false |
 | Conditions.cs:49:16:49:22 | ... > ... | Conditions.cs:50:9:53:9 | {...} | true |
 | Conditions.cs:49:16:49:22 | ... > ... | Conditions.cs:54:16:54:16 | access to local variable y | false |
-| Conditions.cs:49:16:49:22 | [b (line 46): false] ... > ... | Conditions.cs:50:9:53:9 | [b (line 46): false] {...} | true |
-| Conditions.cs:49:16:49:22 | [b (line 46): false] ... > ... | Conditions.cs:54:16:54:16 | access to local variable y | false |
-| Conditions.cs:49:16:49:22 | [b (line 46): true] ... > ... | Conditions.cs:50:9:53:9 | [b (line 46): true] {...} | true |
-| Conditions.cs:49:16:49:22 | [b (line 46): true] ... > ... | Conditions.cs:54:16:54:16 | access to local variable y | false |
-| Conditions.cs:51:17:51:17 | [b (line 46): false] access to parameter b | Conditions.cs:49:16:49:16 | [b (line 46): false] access to parameter x | false |
-| Conditions.cs:51:17:51:17 | [b (line 46): true] access to parameter b | Conditions.cs:52:17:52:20 | [b (line 46): true] ...; | true |
-| Conditions.cs:51:17:51:17 | access to parameter b | Conditions.cs:49:16:49:16 | [b (line 46): false] access to parameter x | false |
-| Conditions.cs:51:17:51:17 | access to parameter b | Conditions.cs:52:17:52:20 | [b (line 46): true] ...; | true |
+| Conditions.cs:51:17:51:17 | access to parameter b | Conditions.cs:49:16:49:16 | access to parameter x | false |
+| Conditions.cs:51:17:51:17 | access to parameter b | Conditions.cs:52:17:52:20 | ...; | true |
 | Conditions.cs:60:16:60:22 | ... > ... | Conditions.cs:61:9:64:9 | {...} | true |
 | Conditions.cs:60:16:60:22 | ... > ... | Conditions.cs:65:9:66:16 | if (...) ... | false |
-| Conditions.cs:60:16:60:22 | [b (line 57): false] ... > ... | Conditions.cs:61:9:64:9 | [b (line 57): false] {...} | true |
-| Conditions.cs:60:16:60:22 | [b (line 57): false] ... > ... | Conditions.cs:65:9:66:16 | [b (line 57): false] if (...) ... | false |
-| Conditions.cs:60:16:60:22 | [b (line 57): true] ... > ... | Conditions.cs:61:9:64:9 | [b (line 57): true] {...} | true |
-| Conditions.cs:60:16:60:22 | [b (line 57): true] ... > ... | Conditions.cs:65:9:66:16 | [b (line 57): true] if (...) ... | false |
-| Conditions.cs:62:17:62:17 | [b (line 57): false] access to parameter b | Conditions.cs:60:16:60:16 | [b (line 57): false] access to parameter x | false |
-| Conditions.cs:62:17:62:17 | [b (line 57): true] access to parameter b | Conditions.cs:63:17:63:20 | [b (line 57): true] ...; | true |
-| Conditions.cs:62:17:62:17 | access to parameter b | Conditions.cs:60:16:60:16 | [b (line 57): false] access to parameter x | false |
-| Conditions.cs:62:17:62:17 | access to parameter b | Conditions.cs:63:17:63:20 | [b (line 57): true] ...; | true |
-| Conditions.cs:65:13:65:13 | [b (line 57): false] access to parameter b | Conditions.cs:67:16:67:16 | access to local variable y | false |
-| Conditions.cs:65:13:65:13 | [b (line 57): true] access to parameter b | Conditions.cs:66:13:66:16 | ...; | true |
+| Conditions.cs:62:17:62:17 | access to parameter b | Conditions.cs:60:16:60:16 | access to parameter x | false |
+| Conditions.cs:62:17:62:17 | access to parameter b | Conditions.cs:63:17:63:20 | ...; | true |
 | Conditions.cs:65:13:65:13 | access to parameter b | Conditions.cs:66:13:66:16 | ...; | true |
 | Conditions.cs:65:13:65:13 | access to parameter b | Conditions.cs:67:16:67:16 | access to local variable y | false |
 | Conditions.cs:76:17:76:17 | access to local variable b | Conditions.cs:77:17:77:20 | ...; | true |
@@ -2678,41 +1169,31 @@ conditionFlow
 | Conditions.cs:94:17:94:21 | ... > ... | Conditions.cs:96:13:97:20 | if (...) ... | false |
 | Conditions.cs:96:17:96:17 | access to local variable b | Conditions.cs:90:9:98:9 | foreach (... ... in ...) ... | false |
 | Conditions.cs:96:17:96:17 | access to local variable b | Conditions.cs:97:17:97:20 | ...; | true |
-| Conditions.cs:105:13:105:13 | access to parameter b | Conditions.cs:106:13:106:20 | [b (line 102): true] ...; | true |
-| Conditions.cs:105:13:105:13 | access to parameter b | Conditions.cs:107:9:109:24 | [b (line 102): false] if (...) ... | false |
-| Conditions.cs:107:13:107:24 | [b (line 102): false] ... > ... | Conditions.cs:108:13:109:24 | [b (line 102): false] if (...) ... | true |
-| Conditions.cs:107:13:107:24 | [b (line 102): false] ... > ... | Conditions.cs:110:16:110:16 | access to local variable x | false |
-| Conditions.cs:107:13:107:24 | [b (line 102): true] ... > ... | Conditions.cs:108:13:109:24 | [b (line 102): true] if (...) ... | true |
-| Conditions.cs:107:13:107:24 | [b (line 102): true] ... > ... | Conditions.cs:110:16:110:16 | access to local variable x | false |
+| Conditions.cs:105:13:105:13 | access to parameter b | Conditions.cs:106:13:106:20 | ...; | true |
+| Conditions.cs:105:13:105:13 | access to parameter b | Conditions.cs:107:9:109:24 | if (...) ... | false |
+| Conditions.cs:107:13:107:24 | ... > ... | Conditions.cs:108:13:109:24 | if (...) ... | true |
+| Conditions.cs:107:13:107:24 | ... > ... | Conditions.cs:110:16:110:16 | access to local variable x | false |
 | Conditions.cs:108:17:108:18 | [false] !... | Conditions.cs:110:16:110:16 | access to local variable x | false |
 | Conditions.cs:108:17:108:18 | [true] !... | Conditions.cs:109:17:109:24 | ...; | true |
-| Conditions.cs:108:18:108:18 | [b (line 102): false] access to parameter b | Conditions.cs:108:17:108:18 | [true] !... | false |
-| Conditions.cs:108:18:108:18 | [b (line 102): true] access to parameter b | Conditions.cs:108:17:108:18 | [false] !... | true |
+| Conditions.cs:108:18:108:18 | access to parameter b | Conditions.cs:108:17:108:18 | [false] !... | true |
+| Conditions.cs:108:18:108:18 | access to parameter b | Conditions.cs:108:17:108:18 | [true] !... | false |
 | Conditions.cs:116:25:116:39 | ... < ... | Conditions.cs:113:10:113:11 | exit M9 (normal) | false |
 | Conditions.cs:116:25:116:39 | ... < ... | Conditions.cs:117:9:123:9 | {...} | true |
-| Conditions.cs:119:17:119:21 | [false, last (line 118): true] !... | Conditions.cs:121:13:122:25 | [last (line 118): true] if (...) ... | false |
-| Conditions.cs:119:17:119:21 | [true, last (line 118): false] !... | Conditions.cs:120:17:120:23 | [last (line 118): false] ...; | true |
-| Conditions.cs:119:18:119:21 | access to local variable last | Conditions.cs:119:17:119:21 | [false, last (line 118): true] !... | true |
-| Conditions.cs:119:18:119:21 | access to local variable last | Conditions.cs:119:17:119:21 | [true, last (line 118): false] !... | false |
-| Conditions.cs:121:17:121:20 | [last (line 118): false] access to local variable last | Conditions.cs:116:42:116:42 | access to local variable i | false |
-| Conditions.cs:121:17:121:20 | [last (line 118): true] access to local variable last | Conditions.cs:122:17:122:25 | ...; | true |
-| Conditions.cs:131:16:131:19 | [Field1 (line 129): false] true | Conditions.cs:132:9:140:9 | [Field1 (line 129): false] {...} | true |
-| Conditions.cs:131:16:131:19 | [Field1 (line 129): true, Field2 (line 129): false] true | Conditions.cs:132:9:140:9 | [Field1 (line 129): true, Field2 (line 129): false] {...} | true |
-| Conditions.cs:131:16:131:19 | [Field1 (line 129): true, Field2 (line 129): true] true | Conditions.cs:132:9:140:9 | [Field1 (line 129): true, Field2 (line 129): true] {...} | true |
+| Conditions.cs:119:17:119:21 | [false] !... | Conditions.cs:121:13:122:25 | if (...) ... | false |
+| Conditions.cs:119:17:119:21 | [true] !... | Conditions.cs:120:17:120:23 | ...; | true |
+| Conditions.cs:119:18:119:21 | access to local variable last | Conditions.cs:119:17:119:21 | [false] !... | true |
+| Conditions.cs:119:18:119:21 | access to local variable last | Conditions.cs:119:17:119:21 | [true] !... | false |
+| Conditions.cs:121:17:121:20 | access to local variable last | Conditions.cs:116:42:116:42 | access to local variable i | false |
+| Conditions.cs:121:17:121:20 | access to local variable last | Conditions.cs:122:17:122:25 | ...; | true |
 | Conditions.cs:131:16:131:19 | true | Conditions.cs:132:9:140:9 | {...} | true |
-| Conditions.cs:133:17:133:22 | [Field1 (line 129): false] access to field Field1 | Conditions.cs:131:16:131:19 | [Field1 (line 129): false] true | false |
-| Conditions.cs:133:17:133:22 | [Field1 (line 129): true, Field2 (line 129): false] access to field Field1 | Conditions.cs:134:13:139:13 | [Field1 (line 129): true, Field2 (line 129): false] {...} | true |
-| Conditions.cs:133:17:133:22 | [Field1 (line 129): true, Field2 (line 129): true] access to field Field1 | Conditions.cs:134:13:139:13 | [Field1 (line 129): true, Field2 (line 129): true] {...} | true |
-| Conditions.cs:133:17:133:22 | access to field Field1 | Conditions.cs:131:16:131:19 | [Field1 (line 129): false] true | false |
-| Conditions.cs:133:17:133:22 | access to field Field1 | Conditions.cs:134:13:139:13 | [Field1 (line 129): true] {...} | true |
-| Conditions.cs:135:21:135:26 | [Field1 (line 129): true, Field2 (line 129): false] access to field Field2 | Conditions.cs:131:16:131:19 | [Field1 (line 129): true, Field2 (line 129): false] true | false |
-| Conditions.cs:135:21:135:26 | [Field1 (line 129): true, Field2 (line 129): true] access to field Field2 | Conditions.cs:136:17:138:17 | [Field1 (line 129): true, Field2 (line 129): true] {...} | true |
-| Conditions.cs:135:21:135:26 | [Field1 (line 129): true] access to field Field2 | Conditions.cs:131:16:131:19 | [Field1 (line 129): true, Field2 (line 129): false] true | false |
-| Conditions.cs:135:21:135:26 | [Field1 (line 129): true] access to field Field2 | Conditions.cs:136:17:138:17 | [Field1 (line 129): true, Field2 (line 129): true] {...} | true |
-| Conditions.cs:145:17:145:17 | access to parameter b | Conditions.cs:145:21:145:23 | [b (line 143): true] "a" | true |
-| Conditions.cs:145:17:145:17 | access to parameter b | Conditions.cs:145:27:145:29 | [b (line 143): false] "b" | false |
-| Conditions.cs:146:13:146:13 | [b (line 143): false] access to parameter b | Conditions.cs:149:13:149:49 | ...; | false |
-| Conditions.cs:146:13:146:13 | [b (line 143): true] access to parameter b | Conditions.cs:147:13:147:49 | ...; | true |
+| Conditions.cs:133:17:133:22 | access to field Field1 | Conditions.cs:131:16:131:19 | true | false |
+| Conditions.cs:133:17:133:22 | access to field Field1 | Conditions.cs:134:13:139:13 | {...} | true |
+| Conditions.cs:135:21:135:26 | access to field Field2 | Conditions.cs:131:16:131:19 | true | false |
+| Conditions.cs:135:21:135:26 | access to field Field2 | Conditions.cs:136:17:138:17 | {...} | true |
+| Conditions.cs:145:17:145:17 | access to parameter b | Conditions.cs:145:21:145:23 | "a" | true |
+| Conditions.cs:145:17:145:17 | access to parameter b | Conditions.cs:145:27:145:29 | "b" | false |
+| Conditions.cs:146:13:146:13 | access to parameter b | Conditions.cs:147:13:147:49 | ...; | true |
+| Conditions.cs:146:13:146:13 | access to parameter b | Conditions.cs:149:13:149:49 | ...; | false |
 | ExitMethods.cs:68:13:68:13 | access to parameter b | ExitMethods.cs:66:17:66:26 | exit ErrorMaybe (normal) | false |
 | ExitMethods.cs:68:13:68:13 | access to parameter b | ExitMethods.cs:69:19:69:33 | object creation of type Exception | true |
 | ExitMethods.cs:74:13:74:13 | access to parameter b | ExitMethods.cs:75:19:75:33 | object creation of type Exception | true |
@@ -2721,16 +1202,12 @@ conditionFlow
 | ExitMethods.cs:112:16:112:25 | ... != ... | ExitMethods.cs:112:69:112:75 | "input" | false |
 | ExitMethods.cs:117:16:117:30 | call to method Contains | ExitMethods.cs:117:34:117:34 | 0 | true |
 | ExitMethods.cs:117:16:117:30 | call to method Contains | ExitMethods.cs:117:38:117:38 | 1 | false |
-| ExitMethods.cs:122:23:122:27 | false | ExitMethods.cs:122:9:122:28 | [assertion failure] call to method IsTrue | false |
-| ExitMethods.cs:132:48:132:48 | access to parameter b | ExitMethods.cs:132:33:132:49 | [assertion failure] call to method IsFalse | true |
-| ExitMethods.cs:132:48:132:48 | access to parameter b | ExitMethods.cs:132:33:132:49 | [assertion success] call to method IsFalse | false |
-| ExitMethods.cs:136:21:136:24 | true | ExitMethods.cs:136:9:136:25 | [assertion failure] call to method AssertFalse | true |
 | ExitMethods.cs:142:13:142:13 | access to parameter b | ExitMethods.cs:143:13:143:43 | ...; | true |
 | ExitMethods.cs:142:13:142:13 | access to parameter b | ExitMethods.cs:145:13:145:53 | ...; | false |
-| Finally.cs:26:48:26:51 | [exception: Exception] true | Finally.cs:27:9:29:9 | {...} | true |
+| Finally.cs:26:48:26:51 | true | Finally.cs:27:9:29:9 | {...} | true |
 | Finally.cs:34:21:34:24 | true | Finally.cs:34:27:34:32 | throw ...; | true |
-| Finally.cs:61:48:61:51 | [exception: Exception] true | Finally.cs:62:9:64:9 | {...} | true |
-| Finally.cs:65:35:65:51 | [exception: Exception] ... != ... | Finally.cs:66:9:67:9 | {...} | true |
+| Finally.cs:61:48:61:51 | true | Finally.cs:62:9:64:9 | {...} | true |
+| Finally.cs:65:35:65:51 | ... != ... | Finally.cs:66:9:67:9 | {...} | true |
 | Finally.cs:77:16:77:20 | ... > ... | Finally.cs:74:10:74:11 | exit M4 (normal) | false |
 | Finally.cs:77:16:77:20 | ... > ... | Finally.cs:78:9:100:9 | {...} | true |
 | Finally.cs:81:21:81:26 | ... == ... | Finally.cs:82:21:82:27 | return ...; | true |
@@ -2741,111 +1218,45 @@ conditionFlow
 | Finally.cs:85:21:85:26 | ... == ... | Finally.cs:89:13:99:13 | {...} | false |
 | Finally.cs:92:25:92:30 | ... == ... | Finally.cs:93:31:93:45 | object creation of type Exception | true |
 | Finally.cs:92:25:92:30 | ... == ... | Finally.cs:96:17:98:17 | {...} | false |
-| Finally.cs:92:25:92:30 | [finally: break] ... == ... | Finally.cs:93:31:93:45 | [finally: break] object creation of type Exception | true |
-| Finally.cs:92:25:92:30 | [finally: break] ... == ... | Finally.cs:96:17:98:17 | [finally: break] {...} | false |
-| Finally.cs:92:25:92:30 | [finally: continue] ... == ... | Finally.cs:93:31:93:45 | [finally: continue] object creation of type Exception | true |
-| Finally.cs:92:25:92:30 | [finally: continue] ... == ... | Finally.cs:96:17:98:17 | [finally: continue] {...} | false |
-| Finally.cs:92:25:92:30 | [finally: return] ... == ... | Finally.cs:93:31:93:45 | [finally: return] object creation of type Exception | true |
-| Finally.cs:92:25:92:30 | [finally: return] ... == ... | Finally.cs:96:17:98:17 | [finally: return] {...} | false |
 | Finally.cs:107:17:107:33 | ... == ... | Finally.cs:108:17:108:23 | return ...; | true |
 | Finally.cs:107:17:107:33 | ... == ... | Finally.cs:109:13:110:49 | if (...) ... | false |
 | Finally.cs:109:17:109:33 | ... == ... | Finally.cs:110:23:110:48 | object creation of type OutOfMemoryException | true |
 | Finally.cs:109:17:109:33 | ... == ... | Finally.cs:113:9:118:9 | {...} | false |
-| Finally.cs:114:17:114:36 | [false, finally: exception(Exception)] !... | Finally.cs:116:13:117:37 | [finally: exception(Exception)] if (...) ... | false |
-| Finally.cs:114:17:114:36 | [false, finally: exception(NullReferenceException)] !... | Finally.cs:116:13:117:37 | [finally: exception(NullReferenceException)] if (...) ... | false |
-| Finally.cs:114:17:114:36 | [false, finally: exception(OutOfMemoryException)] !... | Finally.cs:116:13:117:37 | [finally: exception(OutOfMemoryException)] if (...) ... | false |
-| Finally.cs:114:17:114:36 | [false, finally: return] !... | Finally.cs:116:13:117:37 | [finally: return] if (...) ... | false |
 | Finally.cs:114:17:114:36 | [false] !... | Finally.cs:116:13:117:37 | if (...) ... | false |
-| Finally.cs:114:17:114:36 | [true, finally: exception(Exception)] !... | Finally.cs:115:17:115:41 | [finally: exception(Exception)] ...; | true |
-| Finally.cs:114:17:114:36 | [true, finally: exception(NullReferenceException)] !... | Finally.cs:115:17:115:41 | [finally: exception(NullReferenceException)] ...; | true |
-| Finally.cs:114:17:114:36 | [true, finally: exception(OutOfMemoryException)] !... | Finally.cs:115:17:115:41 | [finally: exception(OutOfMemoryException)] ...; | true |
-| Finally.cs:114:17:114:36 | [true, finally: return] !... | Finally.cs:115:17:115:41 | [finally: return] ...; | true |
 | Finally.cs:114:17:114:36 | [true] !... | Finally.cs:115:17:115:41 | ...; | true |
 | Finally.cs:114:19:114:35 | ... == ... | Finally.cs:114:17:114:36 | [false] !... | true |
 | Finally.cs:114:19:114:35 | ... == ... | Finally.cs:114:17:114:36 | [true] !... | false |
-| Finally.cs:114:19:114:35 | [finally: exception(Exception)] ... == ... | Finally.cs:114:17:114:36 | [false, finally: exception(Exception)] !... | true |
-| Finally.cs:114:19:114:35 | [finally: exception(Exception)] ... == ... | Finally.cs:114:17:114:36 | [true, finally: exception(Exception)] !... | false |
-| Finally.cs:114:19:114:35 | [finally: exception(NullReferenceException)] ... == ... | Finally.cs:114:17:114:36 | [false, finally: exception(NullReferenceException)] !... | true |
-| Finally.cs:114:19:114:35 | [finally: exception(NullReferenceException)] ... == ... | Finally.cs:114:17:114:36 | [true, finally: exception(NullReferenceException)] !... | false |
-| Finally.cs:114:19:114:35 | [finally: exception(OutOfMemoryException)] ... == ... | Finally.cs:114:17:114:36 | [false, finally: exception(OutOfMemoryException)] !... | true |
-| Finally.cs:114:19:114:35 | [finally: exception(OutOfMemoryException)] ... == ... | Finally.cs:114:17:114:36 | [true, finally: exception(OutOfMemoryException)] !... | false |
-| Finally.cs:114:19:114:35 | [finally: return] ... == ... | Finally.cs:114:17:114:36 | [false, finally: return] !... | true |
-| Finally.cs:114:19:114:35 | [finally: return] ... == ... | Finally.cs:114:17:114:36 | [true, finally: return] !... | false |
 | Finally.cs:116:17:116:32 | ... > ... | Finally.cs:103:10:103:11 | exit M5 (normal) | false |
 | Finally.cs:116:17:116:32 | ... > ... | Finally.cs:117:17:117:37 | ...; | true |
-| Finally.cs:116:17:116:32 | [finally: exception(Exception)] ... > ... | Finally.cs:117:17:117:37 | [finally: exception(Exception)] ...; | true |
-| Finally.cs:116:17:116:32 | [finally: exception(NullReferenceException)] ... > ... | Finally.cs:117:17:117:37 | [finally: exception(NullReferenceException)] ...; | true |
-| Finally.cs:116:17:116:32 | [finally: exception(OutOfMemoryException)] ... > ... | Finally.cs:117:17:117:37 | [finally: exception(OutOfMemoryException)] ...; | true |
-| Finally.cs:116:17:116:32 | [finally: return] ... > ... | Finally.cs:117:17:117:37 | [finally: return] ...; | true |
 | Finally.cs:151:17:151:28 | ... == ... | Finally.cs:152:23:152:49 | object creation of type ArgumentNullException | true |
 | Finally.cs:151:17:151:28 | ... == ... | Finally.cs:155:9:169:9 | {...} | false |
 | Finally.cs:158:21:158:36 | ... == ... | Finally.cs:147:10:147:11 | exit M8 (normal) | false |
 | Finally.cs:158:21:158:36 | ... == ... | Finally.cs:159:41:159:43 | "1" | true |
-| Finally.cs:158:21:158:36 | [finally: exception(ArgumentNullException)] ... == ... | Finally.cs:159:41:159:43 | [finally: exception(ArgumentNullException)] "1" | true |
-| Finally.cs:158:21:158:36 | [finally: exception(Exception)] ... == ... | Finally.cs:159:41:159:43 | [finally: exception(Exception)] "1" | true |
-| Finally.cs:161:39:161:54 | [exception: Exception] ... == ... | Finally.cs:162:13:164:13 | {...} | true |
-| Finally.cs:161:39:161:54 | [exception: Exception] ... == ... | Finally.cs:165:13:168:13 | catch {...} | false |
-| Finally.cs:161:39:161:54 | [exception: NullReferenceException] ... == ... | Finally.cs:162:13:164:13 | {...} | true |
-| Finally.cs:161:39:161:54 | [exception: NullReferenceException] ... == ... | Finally.cs:165:13:168:13 | catch {...} | false |
-| Finally.cs:161:39:161:54 | [finally: exception(ArgumentNullException), exception: Exception] ... == ... | Finally.cs:162:13:164:13 | [finally: exception(ArgumentNullException)] {...} | true |
-| Finally.cs:161:39:161:54 | [finally: exception(ArgumentNullException), exception: Exception] ... == ... | Finally.cs:165:13:168:13 | [finally: exception(ArgumentNullException)] catch {...} | false |
-| Finally.cs:161:39:161:54 | [finally: exception(ArgumentNullException), exception: NullReferenceException] ... == ... | Finally.cs:162:13:164:13 | [finally: exception(ArgumentNullException)] {...} | true |
-| Finally.cs:161:39:161:54 | [finally: exception(ArgumentNullException), exception: NullReferenceException] ... == ... | Finally.cs:165:13:168:13 | [finally: exception(ArgumentNullException)] catch {...} | false |
-| Finally.cs:161:39:161:54 | [finally: exception(Exception), exception: Exception] ... == ... | Finally.cs:162:13:164:13 | [finally: exception(Exception)] {...} | true |
-| Finally.cs:161:39:161:54 | [finally: exception(Exception), exception: Exception] ... == ... | Finally.cs:165:13:168:13 | [finally: exception(Exception)] catch {...} | false |
-| Finally.cs:161:39:161:54 | [finally: exception(Exception), exception: NullReferenceException] ... == ... | Finally.cs:162:13:164:13 | [finally: exception(Exception)] {...} | true |
-| Finally.cs:161:39:161:54 | [finally: exception(Exception), exception: NullReferenceException] ... == ... | Finally.cs:165:13:168:13 | [finally: exception(Exception)] catch {...} | false |
-| Finally.cs:180:17:180:18 | access to parameter b1 | Finally.cs:180:27:180:42 | [b1 (line 176): true] object creation of type ExceptionA | true |
-| Finally.cs:180:17:180:18 | access to parameter b1 | Finally.cs:183:9:192:9 | [b1 (line 176): false] {...} | false |
-| Finally.cs:186:21:186:22 | [b1 (line 176): false] access to parameter b2 | Finally.cs:176:10:176:11 | exit M9 (normal) | false |
-| Finally.cs:186:21:186:22 | [b1 (line 176): false] access to parameter b2 | Finally.cs:186:31:186:46 | [b1 (line 176): false, b2 (line 176): true] object creation of type ExceptionB | true |
-| Finally.cs:186:21:186:22 | [finally: exception(Exception), b1 (line 176): true] access to parameter b2 | Finally.cs:186:31:186:46 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB | true |
-| Finally.cs:186:21:186:22 | [finally: exception(ExceptionA), b1 (line 176): true] access to parameter b2 | Finally.cs:186:31:186:46 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB | true |
-| Finally.cs:188:38:188:39 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] access to parameter b2 | Finally.cs:189:13:191:13 | [b1 (line 176): false] {...} | true |
-| Finally.cs:188:38:188:39 | [exception: ExceptionB, b1 (line 176): false, b2 (line 176): true] access to parameter b2 | Finally.cs:189:13:191:13 | [b1 (line 176): false] {...} | true |
-| Finally.cs:188:38:188:39 | [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | Finally.cs:189:13:191:13 | [finally: exception(Exception), b1 (line 176): true] {...} | true |
-| Finally.cs:188:38:188:39 | [finally: exception(Exception), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | Finally.cs:189:13:191:13 | [finally: exception(Exception), b1 (line 176): true] {...} | true |
-| Finally.cs:188:38:188:39 | [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | Finally.cs:189:13:191:13 | [finally: exception(ExceptionA), b1 (line 176): true] {...} | true |
-| Finally.cs:188:38:188:39 | [finally: exception(ExceptionA), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | Finally.cs:189:13:191:13 | [finally: exception(ExceptionA), b1 (line 176): true] {...} | true |
-| Finally.cs:190:21:190:22 | [b1 (line 176): false] access to parameter b1 | Finally.cs:176:10:176:11 | exit M9 (normal) | false |
-| Finally.cs:190:21:190:22 | [finally: exception(Exception), b1 (line 176): true] access to parameter b1 | Finally.cs:190:31:190:46 | [finally: exception(Exception)] object creation of type ExceptionC | true |
-| Finally.cs:190:21:190:22 | [finally: exception(ExceptionA), b1 (line 176): true] access to parameter b1 | Finally.cs:190:31:190:46 | [finally: exception(ExceptionA)] object creation of type ExceptionC | true |
+| Finally.cs:161:39:161:54 | ... == ... | Finally.cs:162:13:164:13 | {...} | true |
+| Finally.cs:161:39:161:54 | ... == ... | Finally.cs:165:13:168:13 | catch {...} | false |
+| Finally.cs:180:17:180:18 | access to parameter b1 | Finally.cs:180:27:180:42 | object creation of type ExceptionA | true |
+| Finally.cs:180:17:180:18 | access to parameter b1 | Finally.cs:183:9:192:9 | {...} | false |
+| Finally.cs:186:21:186:22 | access to parameter b2 | Finally.cs:176:10:176:11 | exit M9 (normal) | false |
+| Finally.cs:186:21:186:22 | access to parameter b2 | Finally.cs:186:31:186:46 | object creation of type ExceptionB | true |
+| Finally.cs:188:38:188:39 | access to parameter b2 | Finally.cs:189:13:191:13 | {...} | true |
+| Finally.cs:190:21:190:22 | access to parameter b1 | Finally.cs:176:10:176:11 | exit M9 (normal) | false |
+| Finally.cs:190:21:190:22 | access to parameter b1 | Finally.cs:190:31:190:46 | object creation of type ExceptionC | true |
 | Finally.cs:199:17:199:18 | access to parameter b1 | Finally.cs:199:27:199:42 | object creation of type ExceptionA | true |
 | Finally.cs:199:17:199:18 | access to parameter b1 | Finally.cs:202:9:212:9 | {...} | false |
-| Finally.cs:205:21:205:22 | [finally: exception(Exception)] access to parameter b2 | Finally.cs:205:31:205:46 | [finally: exception(Exception)] object creation of type ExceptionB | true |
-| Finally.cs:205:21:205:22 | [finally: exception(Exception)] access to parameter b2 | Finally.cs:208:13:210:13 | [finally: exception(Exception)] {...} | false |
-| Finally.cs:205:21:205:22 | [finally: exception(ExceptionA)] access to parameter b2 | Finally.cs:205:31:205:46 | [finally: exception(ExceptionA)] object creation of type ExceptionB | true |
-| Finally.cs:205:21:205:22 | [finally: exception(ExceptionA)] access to parameter b2 | Finally.cs:208:13:210:13 | [finally: exception(ExceptionA)] {...} | false |
 | Finally.cs:205:21:205:22 | access to parameter b2 | Finally.cs:205:31:205:46 | object creation of type ExceptionB | true |
 | Finally.cs:205:21:205:22 | access to parameter b2 | Finally.cs:208:13:210:13 | {...} | false |
-| Finally.cs:209:21:209:22 | [finally(1): exception(Exception)] access to parameter b3 | Finally.cs:209:31:209:46 | [finally(1): exception(Exception)] object creation of type ExceptionC | true |
-| Finally.cs:209:21:209:22 | [finally(1): exception(ExceptionB)] access to parameter b3 | Finally.cs:209:31:209:46 | [finally(1): exception(ExceptionB)] object creation of type ExceptionC | true |
-| Finally.cs:209:21:209:22 | [finally: exception(Exception), finally(1): exception(Exception)] access to parameter b3 | Finally.cs:209:31:209:46 | [finally: exception(Exception), finally(1): exception(Exception)] object creation of type ExceptionC | true |
-| Finally.cs:209:21:209:22 | [finally: exception(Exception), finally(1): exception(ExceptionB)] access to parameter b3 | Finally.cs:209:31:209:46 | [finally: exception(Exception), finally(1): exception(ExceptionB)] object creation of type ExceptionC | true |
-| Finally.cs:209:21:209:22 | [finally: exception(Exception)] access to parameter b3 | Finally.cs:209:31:209:46 | [finally: exception(Exception)] object creation of type ExceptionC | true |
-| Finally.cs:209:21:209:22 | [finally: exception(Exception)] access to parameter b3 | Finally.cs:211:13:211:29 | [finally: exception(Exception)] ...; | false |
-| Finally.cs:209:21:209:22 | [finally: exception(ExceptionA), finally(1): exception(Exception)] access to parameter b3 | Finally.cs:209:31:209:46 | [finally: exception(ExceptionA), finally(1): exception(Exception)] object creation of type ExceptionC | true |
-| Finally.cs:209:21:209:22 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] access to parameter b3 | Finally.cs:209:31:209:46 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] object creation of type ExceptionC | true |
-| Finally.cs:209:21:209:22 | [finally: exception(ExceptionA)] access to parameter b3 | Finally.cs:209:31:209:46 | [finally: exception(ExceptionA)] object creation of type ExceptionC | true |
-| Finally.cs:209:21:209:22 | [finally: exception(ExceptionA)] access to parameter b3 | Finally.cs:211:13:211:29 | [finally: exception(ExceptionA)] ...; | false |
 | Finally.cs:209:21:209:22 | access to parameter b3 | Finally.cs:209:31:209:46 | object creation of type ExceptionC | true |
 | Finally.cs:209:21:209:22 | access to parameter b3 | Finally.cs:211:13:211:29 | ...; | false |
 | Finally.cs:239:21:239:22 | access to parameter b1 | Finally.cs:240:27:240:42 | object creation of type ExceptionA | true |
 | Finally.cs:239:21:239:22 | access to parameter b1 | Finally.cs:243:13:253:13 | {...} | false |
-| Finally.cs:246:25:246:26 | [finally: exception(Exception)] access to parameter b2 | Finally.cs:247:31:247:46 | [finally: exception(Exception)] object creation of type ExceptionA | true |
-| Finally.cs:246:25:246:26 | [finally: exception(Exception)] access to parameter b2 | Finally.cs:250:17:252:17 | [finally: exception(Exception)] {...} | false |
-| Finally.cs:246:25:246:26 | [finally: exception(ExceptionA)] access to parameter b2 | Finally.cs:247:31:247:46 | [finally: exception(ExceptionA)] object creation of type ExceptionA | true |
-| Finally.cs:246:25:246:26 | [finally: exception(ExceptionA)] access to parameter b2 | Finally.cs:250:17:252:17 | [finally: exception(ExceptionA)] {...} | false |
 | Finally.cs:246:25:246:26 | access to parameter b2 | Finally.cs:247:31:247:46 | object creation of type ExceptionA | true |
 | Finally.cs:246:25:246:26 | access to parameter b2 | Finally.cs:250:17:252:17 | {...} | false |
 | LoopUnrolling.cs:9:13:9:28 | ... == ... | LoopUnrolling.cs:10:13:10:19 | return ...; | true |
 | LoopUnrolling.cs:9:13:9:28 | ... == ... | LoopUnrolling.cs:11:29:11:32 | access to parameter args | false |
-| LoopUnrolling.cs:60:17:60:17 | [b (line 55): false] access to parameter b | LoopUnrolling.cs:62:13:63:37 | [b (line 55): false] if (...) ... | false |
-| LoopUnrolling.cs:60:17:60:17 | [b (line 55): true] access to parameter b | LoopUnrolling.cs:61:17:61:37 | [b (line 55): true] ...; | true |
-| LoopUnrolling.cs:60:17:60:17 | access to parameter b | LoopUnrolling.cs:61:17:61:37 | [b (line 55): true] ...; | true |
-| LoopUnrolling.cs:60:17:60:17 | access to parameter b | LoopUnrolling.cs:62:13:63:37 | [b (line 55): false] if (...) ... | false |
-| LoopUnrolling.cs:62:17:62:17 | [b (line 55): false] access to parameter b | LoopUnrolling.cs:58:9:64:9 | [b (line 55): false] foreach (... ... in ...) ... | false |
-| LoopUnrolling.cs:62:17:62:17 | [b (line 55): true] access to parameter b | LoopUnrolling.cs:63:17:63:37 | [b (line 55): true] ...; | true |
+| LoopUnrolling.cs:60:17:60:17 | access to parameter b | LoopUnrolling.cs:61:17:61:37 | ...; | true |
+| LoopUnrolling.cs:60:17:60:17 | access to parameter b | LoopUnrolling.cs:62:13:63:37 | if (...) ... | false |
+| LoopUnrolling.cs:62:17:62:17 | access to parameter b | LoopUnrolling.cs:58:9:64:9 | foreach (... ... in ...) ... | false |
+| LoopUnrolling.cs:62:17:62:17 | access to parameter b | LoopUnrolling.cs:63:17:63:37 | ...; | true |
 | LoopUnrolling.cs:69:13:69:23 | [false] !... | LoopUnrolling.cs:71:9:71:21 | ...; | false |
 | LoopUnrolling.cs:69:13:69:23 | [true] !... | LoopUnrolling.cs:70:13:70:19 | return ...; | true |
 | LoopUnrolling.cs:69:14:69:23 | call to method Any<String> | LoopUnrolling.cs:69:13:69:23 | [false] !... | true |
diff --git a/csharp/ql/test/library-tests/controlflow/graph/Condition.ql b/csharp/ql/test/library-tests/controlflow/graph/Condition.ql
index 25de07e9d5b..61c80181924 100644
--- a/csharp/ql/test/library-tests/controlflow/graph/Condition.ql
+++ b/csharp/ql/test/library-tests/controlflow/graph/Condition.ql
@@ -4,8 +4,7 @@ import ControlFlow
 query predicate conditionBlock(
   BasicBlocks::ConditionBlock cb, BasicBlock controlled, boolean testIsTrue
 ) {
-  cb.edgeDominates(controlled,
-    any(SuccessorTypes::ConditionalSuccessor s | testIsTrue = s.getValue()))
+  cb.edgeDominates(controlled, any(ConditionalSuccessor s | testIsTrue = s.getValue()))
 }
 
 ControlFlow::Node successor(ControlFlow::Node node, boolean kind) {
diff --git a/csharp/ql/test/library-tests/controlflow/graph/Dominance.expected b/csharp/ql/test/library-tests/controlflow/graph/Dominance.expected
index f0a0c6459cb..f5368b5c7e9 100644
--- a/csharp/ql/test/library-tests/controlflow/graph/Dominance.expected
+++ b/csharp/ql/test/library-tests/controlflow/graph/Dominance.expected
@@ -347,12 +347,11 @@ dominance
 | Assert.cs:9:20:9:20 | access to parameter b | Assert.cs:9:24:9:27 | null |
 | Assert.cs:9:20:9:20 | access to parameter b | Assert.cs:9:31:9:32 | "" |
 | Assert.cs:9:20:9:32 | ... ? ... : ... | Assert.cs:9:16:9:32 | String s = ... |
-| Assert.cs:10:9:10:31 | [assertion failure] call to method Assert | Assert.cs:7:10:7:11 | exit M1 (abnormal) |
-| Assert.cs:10:9:10:31 | [assertion success] call to method Assert | Assert.cs:11:9:11:36 | ...; |
+| Assert.cs:10:9:10:31 | call to method Assert | Assert.cs:7:10:7:11 | exit M1 (abnormal) |
+| Assert.cs:10:9:10:31 | call to method Assert | Assert.cs:11:9:11:36 | ...; |
 | Assert.cs:10:9:10:32 | ...; | Assert.cs:10:22:10:22 | access to local variable s |
 | Assert.cs:10:22:10:22 | access to local variable s | Assert.cs:10:27:10:30 | null |
-| Assert.cs:10:22:10:30 | ... != ... | Assert.cs:10:9:10:31 | [assertion failure] call to method Assert |
-| Assert.cs:10:22:10:30 | ... != ... | Assert.cs:10:9:10:31 | [assertion success] call to method Assert |
+| Assert.cs:10:22:10:30 | ... != ... | Assert.cs:10:9:10:31 | call to method Assert |
 | Assert.cs:10:27:10:30 | null | Assert.cs:10:22:10:30 | ... != ... |
 | Assert.cs:11:9:11:35 | call to method WriteLine | Assert.cs:7:10:7:11 | exit M1 (normal) |
 | Assert.cs:11:9:11:36 | ...; | Assert.cs:11:27:11:27 | access to local variable s |
@@ -365,11 +364,10 @@ dominance
 | Assert.cs:16:20:16:20 | access to parameter b | Assert.cs:16:24:16:27 | null |
 | Assert.cs:16:20:16:20 | access to parameter b | Assert.cs:16:31:16:32 | "" |
 | Assert.cs:16:20:16:32 | ... ? ... : ... | Assert.cs:16:16:16:32 | String s = ... |
-| Assert.cs:17:9:17:24 | [assertion failure] call to method IsNull | Assert.cs:14:10:14:11 | exit M2 (abnormal) |
-| Assert.cs:17:9:17:24 | [assertion success] call to method IsNull | Assert.cs:18:9:18:36 | ...; |
+| Assert.cs:17:9:17:24 | call to method IsNull | Assert.cs:14:10:14:11 | exit M2 (abnormal) |
+| Assert.cs:17:9:17:24 | call to method IsNull | Assert.cs:18:9:18:36 | ...; |
 | Assert.cs:17:9:17:25 | ...; | Assert.cs:17:23:17:23 | access to local variable s |
-| Assert.cs:17:23:17:23 | access to local variable s | Assert.cs:17:9:17:24 | [assertion failure] call to method IsNull |
-| Assert.cs:17:23:17:23 | access to local variable s | Assert.cs:17:9:17:24 | [assertion success] call to method IsNull |
+| Assert.cs:17:23:17:23 | access to local variable s | Assert.cs:17:9:17:24 | call to method IsNull |
 | Assert.cs:18:9:18:35 | call to method WriteLine | Assert.cs:14:10:14:11 | exit M2 (normal) |
 | Assert.cs:18:9:18:36 | ...; | Assert.cs:18:27:18:27 | access to local variable s |
 | Assert.cs:18:27:18:27 | access to local variable s | Assert.cs:18:27:18:34 | access to property Length |
@@ -381,11 +379,10 @@ dominance
 | Assert.cs:23:20:23:20 | access to parameter b | Assert.cs:23:24:23:27 | null |
 | Assert.cs:23:20:23:20 | access to parameter b | Assert.cs:23:31:23:32 | "" |
 | Assert.cs:23:20:23:32 | ... ? ... : ... | Assert.cs:23:16:23:32 | String s = ... |
-| Assert.cs:24:9:24:27 | [assertion failure] call to method IsNotNull | Assert.cs:21:10:21:11 | exit M3 (abnormal) |
-| Assert.cs:24:9:24:27 | [assertion success] call to method IsNotNull | Assert.cs:25:9:25:36 | ...; |
+| Assert.cs:24:9:24:27 | call to method IsNotNull | Assert.cs:21:10:21:11 | exit M3 (abnormal) |
+| Assert.cs:24:9:24:27 | call to method IsNotNull | Assert.cs:25:9:25:36 | ...; |
 | Assert.cs:24:9:24:28 | ...; | Assert.cs:24:26:24:26 | access to local variable s |
-| Assert.cs:24:26:24:26 | access to local variable s | Assert.cs:24:9:24:27 | [assertion failure] call to method IsNotNull |
-| Assert.cs:24:26:24:26 | access to local variable s | Assert.cs:24:9:24:27 | [assertion success] call to method IsNotNull |
+| Assert.cs:24:26:24:26 | access to local variable s | Assert.cs:24:9:24:27 | call to method IsNotNull |
 | Assert.cs:25:9:25:35 | call to method WriteLine | Assert.cs:21:10:21:11 | exit M3 (normal) |
 | Assert.cs:25:9:25:36 | ...; | Assert.cs:25:27:25:27 | access to local variable s |
 | Assert.cs:25:27:25:27 | access to local variable s | Assert.cs:25:27:25:34 | access to property Length |
@@ -397,12 +394,11 @@ dominance
 | Assert.cs:30:20:30:20 | access to parameter b | Assert.cs:30:24:30:27 | null |
 | Assert.cs:30:20:30:20 | access to parameter b | Assert.cs:30:31:30:32 | "" |
 | Assert.cs:30:20:30:32 | ... ? ... : ... | Assert.cs:30:16:30:32 | String s = ... |
-| Assert.cs:31:9:31:32 | [assertion failure] call to method IsTrue | Assert.cs:28:10:28:11 | exit M4 (abnormal) |
-| Assert.cs:31:9:31:32 | [assertion success] call to method IsTrue | Assert.cs:32:9:32:36 | ...; |
+| Assert.cs:31:9:31:32 | call to method IsTrue | Assert.cs:28:10:28:11 | exit M4 (abnormal) |
+| Assert.cs:31:9:31:32 | call to method IsTrue | Assert.cs:32:9:32:36 | ...; |
 | Assert.cs:31:9:31:33 | ...; | Assert.cs:31:23:31:23 | access to local variable s |
 | Assert.cs:31:23:31:23 | access to local variable s | Assert.cs:31:28:31:31 | null |
-| Assert.cs:31:23:31:31 | ... == ... | Assert.cs:31:9:31:32 | [assertion failure] call to method IsTrue |
-| Assert.cs:31:23:31:31 | ... == ... | Assert.cs:31:9:31:32 | [assertion success] call to method IsTrue |
+| Assert.cs:31:23:31:31 | ... == ... | Assert.cs:31:9:31:32 | call to method IsTrue |
 | Assert.cs:31:28:31:31 | null | Assert.cs:31:23:31:31 | ... == ... |
 | Assert.cs:32:9:32:35 | call to method WriteLine | Assert.cs:28:10:28:11 | exit M4 (normal) |
 | Assert.cs:32:9:32:36 | ...; | Assert.cs:32:27:32:27 | access to local variable s |
@@ -415,12 +411,11 @@ dominance
 | Assert.cs:37:20:37:20 | access to parameter b | Assert.cs:37:24:37:27 | null |
 | Assert.cs:37:20:37:20 | access to parameter b | Assert.cs:37:31:37:32 | "" |
 | Assert.cs:37:20:37:32 | ... ? ... : ... | Assert.cs:37:16:37:32 | String s = ... |
-| Assert.cs:38:9:38:32 | [assertion failure] call to method IsTrue | Assert.cs:35:10:35:11 | exit M5 (abnormal) |
-| Assert.cs:38:9:38:32 | [assertion success] call to method IsTrue | Assert.cs:39:9:39:36 | ...; |
+| Assert.cs:38:9:38:32 | call to method IsTrue | Assert.cs:35:10:35:11 | exit M5 (abnormal) |
+| Assert.cs:38:9:38:32 | call to method IsTrue | Assert.cs:39:9:39:36 | ...; |
 | Assert.cs:38:9:38:33 | ...; | Assert.cs:38:23:38:23 | access to local variable s |
 | Assert.cs:38:23:38:23 | access to local variable s | Assert.cs:38:28:38:31 | null |
-| Assert.cs:38:23:38:31 | ... != ... | Assert.cs:38:9:38:32 | [assertion failure] call to method IsTrue |
-| Assert.cs:38:23:38:31 | ... != ... | Assert.cs:38:9:38:32 | [assertion success] call to method IsTrue |
+| Assert.cs:38:23:38:31 | ... != ... | Assert.cs:38:9:38:32 | call to method IsTrue |
 | Assert.cs:38:28:38:31 | null | Assert.cs:38:23:38:31 | ... != ... |
 | Assert.cs:39:9:39:35 | call to method WriteLine | Assert.cs:35:10:35:11 | exit M5 (normal) |
 | Assert.cs:39:9:39:36 | ...; | Assert.cs:39:27:39:27 | access to local variable s |
@@ -433,12 +428,11 @@ dominance
 | Assert.cs:44:20:44:20 | access to parameter b | Assert.cs:44:24:44:27 | null |
 | Assert.cs:44:20:44:20 | access to parameter b | Assert.cs:44:31:44:32 | "" |
 | Assert.cs:44:20:44:32 | ... ? ... : ... | Assert.cs:44:16:44:32 | String s = ... |
-| Assert.cs:45:9:45:33 | [assertion failure] call to method IsFalse | Assert.cs:42:10:42:11 | exit M6 (abnormal) |
-| Assert.cs:45:9:45:33 | [assertion success] call to method IsFalse | Assert.cs:46:9:46:36 | ...; |
+| Assert.cs:45:9:45:33 | call to method IsFalse | Assert.cs:42:10:42:11 | exit M6 (abnormal) |
+| Assert.cs:45:9:45:33 | call to method IsFalse | Assert.cs:46:9:46:36 | ...; |
 | Assert.cs:45:9:45:34 | ...; | Assert.cs:45:24:45:24 | access to local variable s |
 | Assert.cs:45:24:45:24 | access to local variable s | Assert.cs:45:29:45:32 | null |
-| Assert.cs:45:24:45:32 | ... != ... | Assert.cs:45:9:45:33 | [assertion failure] call to method IsFalse |
-| Assert.cs:45:24:45:32 | ... != ... | Assert.cs:45:9:45:33 | [assertion success] call to method IsFalse |
+| Assert.cs:45:24:45:32 | ... != ... | Assert.cs:45:9:45:33 | call to method IsFalse |
 | Assert.cs:45:29:45:32 | null | Assert.cs:45:24:45:32 | ... != ... |
 | Assert.cs:46:9:46:35 | call to method WriteLine | Assert.cs:42:10:42:11 | exit M6 (normal) |
 | Assert.cs:46:9:46:36 | ...; | Assert.cs:46:27:46:27 | access to local variable s |
@@ -451,12 +445,11 @@ dominance
 | Assert.cs:51:20:51:20 | access to parameter b | Assert.cs:51:24:51:27 | null |
 | Assert.cs:51:20:51:20 | access to parameter b | Assert.cs:51:31:51:32 | "" |
 | Assert.cs:51:20:51:32 | ... ? ... : ... | Assert.cs:51:16:51:32 | String s = ... |
-| Assert.cs:52:9:52:33 | [assertion failure] call to method IsFalse | Assert.cs:49:10:49:11 | exit M7 (abnormal) |
-| Assert.cs:52:9:52:33 | [assertion success] call to method IsFalse | Assert.cs:53:9:53:36 | ...; |
+| Assert.cs:52:9:52:33 | call to method IsFalse | Assert.cs:49:10:49:11 | exit M7 (abnormal) |
+| Assert.cs:52:9:52:33 | call to method IsFalse | Assert.cs:53:9:53:36 | ...; |
 | Assert.cs:52:9:52:34 | ...; | Assert.cs:52:24:52:24 | access to local variable s |
 | Assert.cs:52:24:52:24 | access to local variable s | Assert.cs:52:29:52:32 | null |
-| Assert.cs:52:24:52:32 | ... == ... | Assert.cs:52:9:52:33 | [assertion failure] call to method IsFalse |
-| Assert.cs:52:24:52:32 | ... == ... | Assert.cs:52:9:52:33 | [assertion success] call to method IsFalse |
+| Assert.cs:52:24:52:32 | ... == ... | Assert.cs:52:9:52:33 | call to method IsFalse |
 | Assert.cs:52:29:52:32 | null | Assert.cs:52:24:52:32 | ... == ... |
 | Assert.cs:53:9:53:35 | call to method WriteLine | Assert.cs:49:10:49:11 | exit M7 (normal) |
 | Assert.cs:53:9:53:36 | ...; | Assert.cs:53:27:53:27 | access to local variable s |
@@ -465,27 +458,18 @@ dominance
 | Assert.cs:56:10:56:11 | enter M8 | Assert.cs:57:5:61:5 | {...} |
 | Assert.cs:57:5:61:5 | {...} | Assert.cs:58:9:58:33 | ... ...; |
 | Assert.cs:58:9:58:33 | ... ...; | Assert.cs:58:20:58:20 | access to parameter b |
-| Assert.cs:58:16:58:32 | [b (line 56): false] String s = ... | Assert.cs:59:9:59:38 | [b (line 56): false] ...; |
-| Assert.cs:58:16:58:32 | [b (line 56): true] String s = ... | Assert.cs:59:9:59:38 | [b (line 56): true] ...; |
-| Assert.cs:58:20:58:20 | access to parameter b | Assert.cs:58:24:58:27 | [b (line 56): true] null |
-| Assert.cs:58:20:58:20 | access to parameter b | Assert.cs:58:31:58:32 | [b (line 56): false] "" |
-| Assert.cs:58:20:58:32 | [b (line 56): false] ... ? ... : ... | Assert.cs:58:16:58:32 | [b (line 56): false] String s = ... |
-| Assert.cs:58:20:58:32 | [b (line 56): true] ... ? ... : ... | Assert.cs:58:16:58:32 | [b (line 56): true] String s = ... |
-| Assert.cs:58:24:58:27 | [b (line 56): true] null | Assert.cs:58:20:58:32 | [b (line 56): true] ... ? ... : ... |
-| Assert.cs:58:31:58:32 | [b (line 56): false] "" | Assert.cs:58:20:58:32 | [b (line 56): false] ... ? ... : ... |
-| Assert.cs:59:9:59:37 | [assertion failure] call to method IsTrue | Assert.cs:56:10:56:11 | exit M8 (abnormal) |
-| Assert.cs:59:9:59:37 | [assertion success] call to method IsTrue | Assert.cs:60:9:60:36 | ...; |
-| Assert.cs:59:9:59:38 | [b (line 56): false] ...; | Assert.cs:59:23:59:23 | [b (line 56): false] access to local variable s |
-| Assert.cs:59:9:59:38 | [b (line 56): true] ...; | Assert.cs:59:23:59:23 | [b (line 56): true] access to local variable s |
-| Assert.cs:59:23:59:23 | [b (line 56): false] access to local variable s | Assert.cs:59:28:59:31 | [b (line 56): false] null |
-| Assert.cs:59:23:59:23 | [b (line 56): true] access to local variable s | Assert.cs:59:28:59:31 | [b (line 56): true] null |
-| Assert.cs:59:23:59:31 | [b (line 56): false] ... != ... | Assert.cs:59:36:59:36 | [b (line 56): false] access to parameter b |
-| Assert.cs:59:23:59:31 | [b (line 56): true] ... != ... | Assert.cs:59:36:59:36 | [b (line 56): true] access to parameter b |
-| Assert.cs:59:23:59:36 | [false] ... && ... | Assert.cs:59:9:59:37 | [assertion failure] call to method IsTrue |
-| Assert.cs:59:23:59:36 | [true] ... && ... | Assert.cs:59:9:59:37 | [assertion success] call to method IsTrue |
-| Assert.cs:59:28:59:31 | [b (line 56): false] null | Assert.cs:59:23:59:31 | [b (line 56): false] ... != ... |
-| Assert.cs:59:28:59:31 | [b (line 56): true] null | Assert.cs:59:23:59:31 | [b (line 56): true] ... != ... |
-| Assert.cs:59:36:59:36 | [b (line 56): true] access to parameter b | Assert.cs:59:23:59:36 | [true] ... && ... |
+| Assert.cs:58:16:58:32 | String s = ... | Assert.cs:59:9:59:38 | ...; |
+| Assert.cs:58:20:58:20 | access to parameter b | Assert.cs:58:24:58:27 | null |
+| Assert.cs:58:20:58:20 | access to parameter b | Assert.cs:58:31:58:32 | "" |
+| Assert.cs:58:20:58:32 | ... ? ... : ... | Assert.cs:58:16:58:32 | String s = ... |
+| Assert.cs:59:9:59:37 | call to method IsTrue | Assert.cs:56:10:56:11 | exit M8 (abnormal) |
+| Assert.cs:59:9:59:37 | call to method IsTrue | Assert.cs:60:9:60:36 | ...; |
+| Assert.cs:59:9:59:38 | ...; | Assert.cs:59:23:59:23 | access to local variable s |
+| Assert.cs:59:23:59:23 | access to local variable s | Assert.cs:59:28:59:31 | null |
+| Assert.cs:59:23:59:31 | ... != ... | Assert.cs:59:23:59:36 | ... && ... |
+| Assert.cs:59:23:59:31 | ... != ... | Assert.cs:59:36:59:36 | access to parameter b |
+| Assert.cs:59:23:59:36 | ... && ... | Assert.cs:59:9:59:37 | call to method IsTrue |
+| Assert.cs:59:28:59:31 | null | Assert.cs:59:23:59:31 | ... != ... |
 | Assert.cs:60:9:60:35 | call to method WriteLine | Assert.cs:56:10:56:11 | exit M8 (normal) |
 | Assert.cs:60:9:60:36 | ...; | Assert.cs:60:27:60:27 | access to local variable s |
 | Assert.cs:60:27:60:27 | access to local variable s | Assert.cs:60:27:60:34 | access to property Length |
@@ -493,27 +477,18 @@ dominance
 | Assert.cs:63:10:63:11 | enter M9 | Assert.cs:64:5:68:5 | {...} |
 | Assert.cs:64:5:68:5 | {...} | Assert.cs:65:9:65:33 | ... ...; |
 | Assert.cs:65:9:65:33 | ... ...; | Assert.cs:65:20:65:20 | access to parameter b |
-| Assert.cs:65:16:65:32 | [b (line 63): false] String s = ... | Assert.cs:66:9:66:39 | [b (line 63): false] ...; |
-| Assert.cs:65:16:65:32 | [b (line 63): true] String s = ... | Assert.cs:66:9:66:39 | [b (line 63): true] ...; |
-| Assert.cs:65:20:65:20 | access to parameter b | Assert.cs:65:24:65:27 | [b (line 63): true] null |
-| Assert.cs:65:20:65:20 | access to parameter b | Assert.cs:65:31:65:32 | [b (line 63): false] "" |
-| Assert.cs:65:20:65:32 | [b (line 63): false] ... ? ... : ... | Assert.cs:65:16:65:32 | [b (line 63): false] String s = ... |
-| Assert.cs:65:20:65:32 | [b (line 63): true] ... ? ... : ... | Assert.cs:65:16:65:32 | [b (line 63): true] String s = ... |
-| Assert.cs:65:24:65:27 | [b (line 63): true] null | Assert.cs:65:20:65:32 | [b (line 63): true] ... ? ... : ... |
-| Assert.cs:65:31:65:32 | [b (line 63): false] "" | Assert.cs:65:20:65:32 | [b (line 63): false] ... ? ... : ... |
-| Assert.cs:66:9:66:38 | [assertion failure] call to method IsFalse | Assert.cs:63:10:63:11 | exit M9 (abnormal) |
-| Assert.cs:66:9:66:38 | [assertion success] call to method IsFalse | Assert.cs:67:9:67:36 | ...; |
-| Assert.cs:66:9:66:39 | [b (line 63): false] ...; | Assert.cs:66:24:66:24 | [b (line 63): false] access to local variable s |
-| Assert.cs:66:9:66:39 | [b (line 63): true] ...; | Assert.cs:66:24:66:24 | [b (line 63): true] access to local variable s |
-| Assert.cs:66:24:66:24 | [b (line 63): false] access to local variable s | Assert.cs:66:29:66:32 | [b (line 63): false] null |
-| Assert.cs:66:24:66:24 | [b (line 63): true] access to local variable s | Assert.cs:66:29:66:32 | [b (line 63): true] null |
-| Assert.cs:66:24:66:32 | [b (line 63): false] ... == ... | Assert.cs:66:37:66:37 | [b (line 63): false] access to parameter b |
-| Assert.cs:66:24:66:32 | [b (line 63): true] ... == ... | Assert.cs:66:37:66:37 | [b (line 63): true] access to parameter b |
-| Assert.cs:66:24:66:37 | [false] ... \|\| ... | Assert.cs:66:9:66:38 | [assertion success] call to method IsFalse |
-| Assert.cs:66:24:66:37 | [true] ... \|\| ... | Assert.cs:66:9:66:38 | [assertion failure] call to method IsFalse |
-| Assert.cs:66:29:66:32 | [b (line 63): false] null | Assert.cs:66:24:66:32 | [b (line 63): false] ... == ... |
-| Assert.cs:66:29:66:32 | [b (line 63): true] null | Assert.cs:66:24:66:32 | [b (line 63): true] ... == ... |
-| Assert.cs:66:37:66:37 | [b (line 63): false] access to parameter b | Assert.cs:66:24:66:37 | [false] ... \|\| ... |
+| Assert.cs:65:16:65:32 | String s = ... | Assert.cs:66:9:66:39 | ...; |
+| Assert.cs:65:20:65:20 | access to parameter b | Assert.cs:65:24:65:27 | null |
+| Assert.cs:65:20:65:20 | access to parameter b | Assert.cs:65:31:65:32 | "" |
+| Assert.cs:65:20:65:32 | ... ? ... : ... | Assert.cs:65:16:65:32 | String s = ... |
+| Assert.cs:66:9:66:38 | call to method IsFalse | Assert.cs:63:10:63:11 | exit M9 (abnormal) |
+| Assert.cs:66:9:66:38 | call to method IsFalse | Assert.cs:67:9:67:36 | ...; |
+| Assert.cs:66:9:66:39 | ...; | Assert.cs:66:24:66:24 | access to local variable s |
+| Assert.cs:66:24:66:24 | access to local variable s | Assert.cs:66:29:66:32 | null |
+| Assert.cs:66:24:66:32 | ... == ... | Assert.cs:66:24:66:37 | ... \|\| ... |
+| Assert.cs:66:24:66:32 | ... == ... | Assert.cs:66:37:66:37 | access to parameter b |
+| Assert.cs:66:24:66:37 | ... \|\| ... | Assert.cs:66:9:66:38 | call to method IsFalse |
+| Assert.cs:66:29:66:32 | null | Assert.cs:66:24:66:32 | ... == ... |
 | Assert.cs:67:9:67:35 | call to method WriteLine | Assert.cs:63:10:63:11 | exit M9 (normal) |
 | Assert.cs:67:9:67:36 | ...; | Assert.cs:67:27:67:27 | access to local variable s |
 | Assert.cs:67:27:67:27 | access to local variable s | Assert.cs:67:27:67:34 | access to property Length |
@@ -521,27 +496,18 @@ dominance
 | Assert.cs:70:10:70:12 | enter M10 | Assert.cs:71:5:75:5 | {...} |
 | Assert.cs:71:5:75:5 | {...} | Assert.cs:72:9:72:33 | ... ...; |
 | Assert.cs:72:9:72:33 | ... ...; | Assert.cs:72:20:72:20 | access to parameter b |
-| Assert.cs:72:16:72:32 | [b (line 70): false] String s = ... | Assert.cs:73:9:73:38 | [b (line 70): false] ...; |
-| Assert.cs:72:16:72:32 | [b (line 70): true] String s = ... | Assert.cs:73:9:73:38 | [b (line 70): true] ...; |
-| Assert.cs:72:20:72:20 | access to parameter b | Assert.cs:72:24:72:27 | [b (line 70): true] null |
-| Assert.cs:72:20:72:20 | access to parameter b | Assert.cs:72:31:72:32 | [b (line 70): false] "" |
-| Assert.cs:72:20:72:32 | [b (line 70): false] ... ? ... : ... | Assert.cs:72:16:72:32 | [b (line 70): false] String s = ... |
-| Assert.cs:72:20:72:32 | [b (line 70): true] ... ? ... : ... | Assert.cs:72:16:72:32 | [b (line 70): true] String s = ... |
-| Assert.cs:72:24:72:27 | [b (line 70): true] null | Assert.cs:72:20:72:32 | [b (line 70): true] ... ? ... : ... |
-| Assert.cs:72:31:72:32 | [b (line 70): false] "" | Assert.cs:72:20:72:32 | [b (line 70): false] ... ? ... : ... |
-| Assert.cs:73:9:73:37 | [assertion failure] call to method IsTrue | Assert.cs:70:10:70:12 | exit M10 (abnormal) |
-| Assert.cs:73:9:73:37 | [assertion success] call to method IsTrue | Assert.cs:74:9:74:36 | ...; |
-| Assert.cs:73:9:73:38 | [b (line 70): false] ...; | Assert.cs:73:23:73:23 | [b (line 70): false] access to local variable s |
-| Assert.cs:73:9:73:38 | [b (line 70): true] ...; | Assert.cs:73:23:73:23 | [b (line 70): true] access to local variable s |
-| Assert.cs:73:23:73:23 | [b (line 70): false] access to local variable s | Assert.cs:73:28:73:31 | [b (line 70): false] null |
-| Assert.cs:73:23:73:23 | [b (line 70): true] access to local variable s | Assert.cs:73:28:73:31 | [b (line 70): true] null |
-| Assert.cs:73:23:73:31 | [b (line 70): false] ... == ... | Assert.cs:73:36:73:36 | [b (line 70): false] access to parameter b |
-| Assert.cs:73:23:73:31 | [b (line 70): true] ... == ... | Assert.cs:73:36:73:36 | [b (line 70): true] access to parameter b |
-| Assert.cs:73:23:73:36 | [false] ... && ... | Assert.cs:73:9:73:37 | [assertion failure] call to method IsTrue |
-| Assert.cs:73:23:73:36 | [true] ... && ... | Assert.cs:73:9:73:37 | [assertion success] call to method IsTrue |
-| Assert.cs:73:28:73:31 | [b (line 70): false] null | Assert.cs:73:23:73:31 | [b (line 70): false] ... == ... |
-| Assert.cs:73:28:73:31 | [b (line 70): true] null | Assert.cs:73:23:73:31 | [b (line 70): true] ... == ... |
-| Assert.cs:73:36:73:36 | [b (line 70): true] access to parameter b | Assert.cs:73:23:73:36 | [true] ... && ... |
+| Assert.cs:72:16:72:32 | String s = ... | Assert.cs:73:9:73:38 | ...; |
+| Assert.cs:72:20:72:20 | access to parameter b | Assert.cs:72:24:72:27 | null |
+| Assert.cs:72:20:72:20 | access to parameter b | Assert.cs:72:31:72:32 | "" |
+| Assert.cs:72:20:72:32 | ... ? ... : ... | Assert.cs:72:16:72:32 | String s = ... |
+| Assert.cs:73:9:73:37 | call to method IsTrue | Assert.cs:70:10:70:12 | exit M10 (abnormal) |
+| Assert.cs:73:9:73:37 | call to method IsTrue | Assert.cs:74:9:74:36 | ...; |
+| Assert.cs:73:9:73:38 | ...; | Assert.cs:73:23:73:23 | access to local variable s |
+| Assert.cs:73:23:73:23 | access to local variable s | Assert.cs:73:28:73:31 | null |
+| Assert.cs:73:23:73:31 | ... == ... | Assert.cs:73:23:73:36 | ... && ... |
+| Assert.cs:73:23:73:31 | ... == ... | Assert.cs:73:36:73:36 | access to parameter b |
+| Assert.cs:73:23:73:36 | ... && ... | Assert.cs:73:9:73:37 | call to method IsTrue |
+| Assert.cs:73:28:73:31 | null | Assert.cs:73:23:73:31 | ... == ... |
 | Assert.cs:74:9:74:35 | call to method WriteLine | Assert.cs:70:10:70:12 | exit M10 (normal) |
 | Assert.cs:74:9:74:36 | ...; | Assert.cs:74:27:74:27 | access to local variable s |
 | Assert.cs:74:27:74:27 | access to local variable s | Assert.cs:74:27:74:34 | access to property Length |
@@ -549,27 +515,18 @@ dominance
 | Assert.cs:77:10:77:12 | enter M11 | Assert.cs:78:5:82:5 | {...} |
 | Assert.cs:78:5:82:5 | {...} | Assert.cs:79:9:79:33 | ... ...; |
 | Assert.cs:79:9:79:33 | ... ...; | Assert.cs:79:20:79:20 | access to parameter b |
-| Assert.cs:79:16:79:32 | [b (line 77): false] String s = ... | Assert.cs:80:9:80:39 | [b (line 77): false] ...; |
-| Assert.cs:79:16:79:32 | [b (line 77): true] String s = ... | Assert.cs:80:9:80:39 | [b (line 77): true] ...; |
-| Assert.cs:79:20:79:20 | access to parameter b | Assert.cs:79:24:79:27 | [b (line 77): true] null |
-| Assert.cs:79:20:79:20 | access to parameter b | Assert.cs:79:31:79:32 | [b (line 77): false] "" |
-| Assert.cs:79:20:79:32 | [b (line 77): false] ... ? ... : ... | Assert.cs:79:16:79:32 | [b (line 77): false] String s = ... |
-| Assert.cs:79:20:79:32 | [b (line 77): true] ... ? ... : ... | Assert.cs:79:16:79:32 | [b (line 77): true] String s = ... |
-| Assert.cs:79:24:79:27 | [b (line 77): true] null | Assert.cs:79:20:79:32 | [b (line 77): true] ... ? ... : ... |
-| Assert.cs:79:31:79:32 | [b (line 77): false] "" | Assert.cs:79:20:79:32 | [b (line 77): false] ... ? ... : ... |
-| Assert.cs:80:9:80:38 | [assertion failure] call to method IsFalse | Assert.cs:77:10:77:12 | exit M11 (abnormal) |
-| Assert.cs:80:9:80:38 | [assertion success] call to method IsFalse | Assert.cs:81:9:81:36 | ...; |
-| Assert.cs:80:9:80:39 | [b (line 77): false] ...; | Assert.cs:80:24:80:24 | [b (line 77): false] access to local variable s |
-| Assert.cs:80:9:80:39 | [b (line 77): true] ...; | Assert.cs:80:24:80:24 | [b (line 77): true] access to local variable s |
-| Assert.cs:80:24:80:24 | [b (line 77): false] access to local variable s | Assert.cs:80:29:80:32 | [b (line 77): false] null |
-| Assert.cs:80:24:80:24 | [b (line 77): true] access to local variable s | Assert.cs:80:29:80:32 | [b (line 77): true] null |
-| Assert.cs:80:24:80:32 | [b (line 77): false] ... != ... | Assert.cs:80:37:80:37 | [b (line 77): false] access to parameter b |
-| Assert.cs:80:24:80:32 | [b (line 77): true] ... != ... | Assert.cs:80:37:80:37 | [b (line 77): true] access to parameter b |
-| Assert.cs:80:24:80:37 | [false] ... \|\| ... | Assert.cs:80:9:80:38 | [assertion success] call to method IsFalse |
-| Assert.cs:80:24:80:37 | [true] ... \|\| ... | Assert.cs:80:9:80:38 | [assertion failure] call to method IsFalse |
-| Assert.cs:80:29:80:32 | [b (line 77): false] null | Assert.cs:80:24:80:32 | [b (line 77): false] ... != ... |
-| Assert.cs:80:29:80:32 | [b (line 77): true] null | Assert.cs:80:24:80:32 | [b (line 77): true] ... != ... |
-| Assert.cs:80:37:80:37 | [b (line 77): false] access to parameter b | Assert.cs:80:24:80:37 | [false] ... \|\| ... |
+| Assert.cs:79:16:79:32 | String s = ... | Assert.cs:80:9:80:39 | ...; |
+| Assert.cs:79:20:79:20 | access to parameter b | Assert.cs:79:24:79:27 | null |
+| Assert.cs:79:20:79:20 | access to parameter b | Assert.cs:79:31:79:32 | "" |
+| Assert.cs:79:20:79:32 | ... ? ... : ... | Assert.cs:79:16:79:32 | String s = ... |
+| Assert.cs:80:9:80:38 | call to method IsFalse | Assert.cs:77:10:77:12 | exit M11 (abnormal) |
+| Assert.cs:80:9:80:38 | call to method IsFalse | Assert.cs:81:9:81:36 | ...; |
+| Assert.cs:80:9:80:39 | ...; | Assert.cs:80:24:80:24 | access to local variable s |
+| Assert.cs:80:24:80:24 | access to local variable s | Assert.cs:80:29:80:32 | null |
+| Assert.cs:80:24:80:32 | ... != ... | Assert.cs:80:24:80:37 | ... \|\| ... |
+| Assert.cs:80:24:80:32 | ... != ... | Assert.cs:80:37:80:37 | access to parameter b |
+| Assert.cs:80:24:80:37 | ... \|\| ... | Assert.cs:80:9:80:38 | call to method IsFalse |
+| Assert.cs:80:29:80:32 | null | Assert.cs:80:24:80:32 | ... != ... |
 | Assert.cs:81:9:81:35 | call to method WriteLine | Assert.cs:77:10:77:12 | exit M11 (normal) |
 | Assert.cs:81:9:81:36 | ...; | Assert.cs:81:27:81:27 | access to local variable s |
 | Assert.cs:81:27:81:27 | access to local variable s | Assert.cs:81:27:81:34 | access to property Length |
@@ -577,287 +534,162 @@ dominance
 | Assert.cs:84:10:84:12 | enter M12 | Assert.cs:85:5:129:5 | {...} |
 | Assert.cs:85:5:129:5 | {...} | Assert.cs:86:9:86:33 | ... ...; |
 | Assert.cs:86:9:86:33 | ... ...; | Assert.cs:86:20:86:20 | access to parameter b |
-| Assert.cs:86:16:86:32 | [b (line 84): false] String s = ... | Assert.cs:87:9:87:32 | [b (line 84): false] ...; |
-| Assert.cs:86:16:86:32 | [b (line 84): true] String s = ... | Assert.cs:87:9:87:32 | [b (line 84): true] ...; |
-| Assert.cs:86:20:86:20 | access to parameter b | Assert.cs:86:24:86:27 | [b (line 84): true] null |
-| Assert.cs:86:20:86:20 | access to parameter b | Assert.cs:86:31:86:32 | [b (line 84): false] "" |
-| Assert.cs:86:20:86:32 | [b (line 84): false] ... ? ... : ... | Assert.cs:86:16:86:32 | [b (line 84): false] String s = ... |
-| Assert.cs:86:20:86:32 | [b (line 84): true] ... ? ... : ... | Assert.cs:86:16:86:32 | [b (line 84): true] String s = ... |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:86:20:86:32 | [b (line 84): true] ... ? ... : ... |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:86:20:86:32 | [b (line 84): false] ... ? ... : ... |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | Assert.cs:88:9:88:36 | [b (line 84): false] ...; |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:88:9:88:36 | [b (line 84): true] ...; |
-| Assert.cs:87:9:87:32 | [b (line 84): false] ...; | Assert.cs:87:22:87:22 | [b (line 84): false] access to local variable s |
-| Assert.cs:87:9:87:32 | [b (line 84): true] ...; | Assert.cs:87:22:87:22 | [b (line 84): true] access to local variable s |
-| Assert.cs:87:22:87:22 | [b (line 84): false] access to local variable s | Assert.cs:87:27:87:30 | [b (line 84): false] null |
-| Assert.cs:87:22:87:22 | [b (line 84): true] access to local variable s | Assert.cs:87:27:87:30 | [b (line 84): true] null |
-| Assert.cs:87:22:87:30 | [b (line 84): false] ... != ... | Assert.cs:87:9:87:31 | [assertion failure, b (line 84): false] call to method Assert |
-| Assert.cs:87:22:87:30 | [b (line 84): false] ... != ... | Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert |
-| Assert.cs:87:22:87:30 | [b (line 84): true] ... != ... | Assert.cs:87:9:87:31 | [assertion failure, b (line 84): true] call to method Assert |
-| Assert.cs:87:22:87:30 | [b (line 84): true] ... != ... | Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert |
-| Assert.cs:87:27:87:30 | [b (line 84): false] null | Assert.cs:87:22:87:30 | [b (line 84): false] ... != ... |
-| Assert.cs:87:27:87:30 | [b (line 84): true] null | Assert.cs:87:22:87:30 | [b (line 84): true] ... != ... |
-| Assert.cs:88:9:88:35 | [b (line 84): false] call to method WriteLine | Assert.cs:90:9:90:26 | [b (line 84): false] ...; |
-| Assert.cs:88:9:88:35 | [b (line 84): true] call to method WriteLine | Assert.cs:90:9:90:26 | [b (line 84): true] ...; |
-| Assert.cs:88:9:88:36 | [b (line 84): false] ...; | Assert.cs:88:27:88:27 | [b (line 84): false] access to local variable s |
-| Assert.cs:88:9:88:36 | [b (line 84): true] ...; | Assert.cs:88:27:88:27 | [b (line 84): true] access to local variable s |
-| Assert.cs:88:27:88:27 | [b (line 84): false] access to local variable s | Assert.cs:88:27:88:34 | [b (line 84): false] access to property Length |
-| Assert.cs:88:27:88:27 | [b (line 84): true] access to local variable s | Assert.cs:88:27:88:34 | [b (line 84): true] access to property Length |
-| Assert.cs:88:27:88:34 | [b (line 84): false] access to property Length | Assert.cs:88:9:88:35 | [b (line 84): false] call to method WriteLine |
-| Assert.cs:88:27:88:34 | [b (line 84): true] access to property Length | Assert.cs:88:9:88:35 | [b (line 84): true] call to method WriteLine |
-| Assert.cs:90:9:90:25 | [b (line 84): false] ... = ... | Assert.cs:91:9:91:25 | [b (line 84): false] ...; |
-| Assert.cs:90:9:90:25 | [b (line 84): true] ... = ... | Assert.cs:91:9:91:25 | [b (line 84): true] ...; |
-| Assert.cs:90:9:90:26 | [b (line 84): false] ...; | Assert.cs:90:13:90:13 | [b (line 84): false] access to parameter b |
-| Assert.cs:90:9:90:26 | [b (line 84): true] ...; | Assert.cs:90:13:90:13 | [b (line 84): true] access to parameter b |
-| Assert.cs:90:13:90:13 | [b (line 84): false] access to parameter b | Assert.cs:90:24:90:25 | [b (line 84): false] "" |
-| Assert.cs:90:13:90:13 | [b (line 84): true] access to parameter b | Assert.cs:90:17:90:20 | [b (line 84): true] null |
-| Assert.cs:90:13:90:25 | [b (line 84): false] ... ? ... : ... | Assert.cs:90:9:90:25 | [b (line 84): false] ... = ... |
-| Assert.cs:90:13:90:25 | [b (line 84): true] ... ? ... : ... | Assert.cs:90:9:90:25 | [b (line 84): true] ... = ... |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:90:13:90:25 | [b (line 84): true] ... ? ... : ... |
-| Assert.cs:90:24:90:25 | [b (line 84): false] "" | Assert.cs:90:13:90:25 | [b (line 84): false] ... ? ... : ... |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull | Assert.cs:92:9:92:36 | [b (line 84): false] ...; |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:92:9:92:36 | [b (line 84): true] ...; |
-| Assert.cs:91:9:91:25 | [b (line 84): false] ...; | Assert.cs:91:23:91:23 | [b (line 84): false] access to local variable s |
-| Assert.cs:91:9:91:25 | [b (line 84): true] ...; | Assert.cs:91:23:91:23 | [b (line 84): true] access to local variable s |
-| Assert.cs:91:23:91:23 | [b (line 84): false] access to local variable s | Assert.cs:91:9:91:24 | [assertion failure, b (line 84): false] call to method IsNull |
-| Assert.cs:91:23:91:23 | [b (line 84): false] access to local variable s | Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull |
-| Assert.cs:91:23:91:23 | [b (line 84): true] access to local variable s | Assert.cs:91:9:91:24 | [assertion failure, b (line 84): true] call to method IsNull |
-| Assert.cs:91:23:91:23 | [b (line 84): true] access to local variable s | Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull |
-| Assert.cs:92:9:92:35 | [b (line 84): false] call to method WriteLine | Assert.cs:94:9:94:26 | [b (line 84): false] ...; |
-| Assert.cs:92:9:92:35 | [b (line 84): true] call to method WriteLine | Assert.cs:94:9:94:26 | [b (line 84): true] ...; |
-| Assert.cs:92:9:92:36 | [b (line 84): false] ...; | Assert.cs:92:27:92:27 | [b (line 84): false] access to local variable s |
-| Assert.cs:92:9:92:36 | [b (line 84): true] ...; | Assert.cs:92:27:92:27 | [b (line 84): true] access to local variable s |
-| Assert.cs:92:27:92:27 | [b (line 84): false] access to local variable s | Assert.cs:92:27:92:34 | [b (line 84): false] access to property Length |
-| Assert.cs:92:27:92:27 | [b (line 84): true] access to local variable s | Assert.cs:92:27:92:34 | [b (line 84): true] access to property Length |
-| Assert.cs:92:27:92:34 | [b (line 84): false] access to property Length | Assert.cs:92:9:92:35 | [b (line 84): false] call to method WriteLine |
-| Assert.cs:92:27:92:34 | [b (line 84): true] access to property Length | Assert.cs:92:9:92:35 | [b (line 84): true] call to method WriteLine |
-| Assert.cs:94:9:94:25 | [b (line 84): false] ... = ... | Assert.cs:95:9:95:28 | [b (line 84): false] ...; |
-| Assert.cs:94:9:94:25 | [b (line 84): true] ... = ... | Assert.cs:95:9:95:28 | [b (line 84): true] ...; |
-| Assert.cs:94:9:94:26 | [b (line 84): false] ...; | Assert.cs:94:13:94:13 | [b (line 84): false] access to parameter b |
-| Assert.cs:94:9:94:26 | [b (line 84): true] ...; | Assert.cs:94:13:94:13 | [b (line 84): true] access to parameter b |
-| Assert.cs:94:13:94:13 | [b (line 84): false] access to parameter b | Assert.cs:94:24:94:25 | [b (line 84): false] "" |
-| Assert.cs:94:13:94:13 | [b (line 84): true] access to parameter b | Assert.cs:94:17:94:20 | [b (line 84): true] null |
-| Assert.cs:94:13:94:25 | [b (line 84): false] ... ? ... : ... | Assert.cs:94:9:94:25 | [b (line 84): false] ... = ... |
-| Assert.cs:94:13:94:25 | [b (line 84): true] ... ? ... : ... | Assert.cs:94:9:94:25 | [b (line 84): true] ... = ... |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:94:13:94:25 | [b (line 84): true] ... ? ... : ... |
-| Assert.cs:94:24:94:25 | [b (line 84): false] "" | Assert.cs:94:13:94:25 | [b (line 84): false] ... ? ... : ... |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull | Assert.cs:96:9:96:36 | [b (line 84): false] ...; |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:96:9:96:36 | [b (line 84): true] ...; |
-| Assert.cs:95:9:95:28 | [b (line 84): false] ...; | Assert.cs:95:26:95:26 | [b (line 84): false] access to local variable s |
-| Assert.cs:95:9:95:28 | [b (line 84): true] ...; | Assert.cs:95:26:95:26 | [b (line 84): true] access to local variable s |
-| Assert.cs:95:26:95:26 | [b (line 84): false] access to local variable s | Assert.cs:95:9:95:27 | [assertion failure, b (line 84): false] call to method IsNotNull |
-| Assert.cs:95:26:95:26 | [b (line 84): false] access to local variable s | Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull |
-| Assert.cs:95:26:95:26 | [b (line 84): true] access to local variable s | Assert.cs:95:9:95:27 | [assertion failure, b (line 84): true] call to method IsNotNull |
-| Assert.cs:95:26:95:26 | [b (line 84): true] access to local variable s | Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull |
-| Assert.cs:96:9:96:35 | [b (line 84): false] call to method WriteLine | Assert.cs:98:9:98:26 | [b (line 84): false] ...; |
-| Assert.cs:96:9:96:35 | [b (line 84): true] call to method WriteLine | Assert.cs:98:9:98:26 | [b (line 84): true] ...; |
-| Assert.cs:96:9:96:36 | [b (line 84): false] ...; | Assert.cs:96:27:96:27 | [b (line 84): false] access to local variable s |
-| Assert.cs:96:9:96:36 | [b (line 84): true] ...; | Assert.cs:96:27:96:27 | [b (line 84): true] access to local variable s |
-| Assert.cs:96:27:96:27 | [b (line 84): false] access to local variable s | Assert.cs:96:27:96:34 | [b (line 84): false] access to property Length |
-| Assert.cs:96:27:96:27 | [b (line 84): true] access to local variable s | Assert.cs:96:27:96:34 | [b (line 84): true] access to property Length |
-| Assert.cs:96:27:96:34 | [b (line 84): false] access to property Length | Assert.cs:96:9:96:35 | [b (line 84): false] call to method WriteLine |
-| Assert.cs:96:27:96:34 | [b (line 84): true] access to property Length | Assert.cs:96:9:96:35 | [b (line 84): true] call to method WriteLine |
-| Assert.cs:98:9:98:25 | [b (line 84): false] ... = ... | Assert.cs:99:9:99:33 | [b (line 84): false] ...; |
-| Assert.cs:98:9:98:25 | [b (line 84): true] ... = ... | Assert.cs:99:9:99:33 | [b (line 84): true] ...; |
-| Assert.cs:98:9:98:26 | [b (line 84): false] ...; | Assert.cs:98:13:98:13 | [b (line 84): false] access to parameter b |
-| Assert.cs:98:9:98:26 | [b (line 84): true] ...; | Assert.cs:98:13:98:13 | [b (line 84): true] access to parameter b |
-| Assert.cs:98:13:98:13 | [b (line 84): false] access to parameter b | Assert.cs:98:24:98:25 | [b (line 84): false] "" |
-| Assert.cs:98:13:98:13 | [b (line 84): true] access to parameter b | Assert.cs:98:17:98:20 | [b (line 84): true] null |
-| Assert.cs:98:13:98:25 | [b (line 84): false] ... ? ... : ... | Assert.cs:98:9:98:25 | [b (line 84): false] ... = ... |
-| Assert.cs:98:13:98:25 | [b (line 84): true] ... ? ... : ... | Assert.cs:98:9:98:25 | [b (line 84): true] ... = ... |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:98:13:98:25 | [b (line 84): true] ... ? ... : ... |
-| Assert.cs:98:24:98:25 | [b (line 84): false] "" | Assert.cs:98:13:98:25 | [b (line 84): false] ... ? ... : ... |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:100:9:100:36 | [b (line 84): false] ...; |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:100:9:100:36 | [b (line 84): true] ...; |
-| Assert.cs:99:9:99:33 | [b (line 84): false] ...; | Assert.cs:99:23:99:23 | [b (line 84): false] access to local variable s |
-| Assert.cs:99:9:99:33 | [b (line 84): true] ...; | Assert.cs:99:23:99:23 | [b (line 84): true] access to local variable s |
-| Assert.cs:99:23:99:23 | [b (line 84): false] access to local variable s | Assert.cs:99:28:99:31 | [b (line 84): false] null |
-| Assert.cs:99:23:99:23 | [b (line 84): true] access to local variable s | Assert.cs:99:28:99:31 | [b (line 84): true] null |
-| Assert.cs:99:23:99:31 | [b (line 84): false] ... == ... | Assert.cs:99:9:99:32 | [assertion failure, b (line 84): false] call to method IsTrue |
-| Assert.cs:99:23:99:31 | [b (line 84): false] ... == ... | Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue |
-| Assert.cs:99:23:99:31 | [b (line 84): true] ... == ... | Assert.cs:99:9:99:32 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:99:23:99:31 | [b (line 84): true] ... == ... | Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:99:28:99:31 | [b (line 84): false] null | Assert.cs:99:23:99:31 | [b (line 84): false] ... == ... |
-| Assert.cs:99:28:99:31 | [b (line 84): true] null | Assert.cs:99:23:99:31 | [b (line 84): true] ... == ... |
-| Assert.cs:100:9:100:35 | [b (line 84): false] call to method WriteLine | Assert.cs:102:9:102:26 | [b (line 84): false] ...; |
-| Assert.cs:100:9:100:35 | [b (line 84): true] call to method WriteLine | Assert.cs:102:9:102:26 | [b (line 84): true] ...; |
-| Assert.cs:100:9:100:36 | [b (line 84): false] ...; | Assert.cs:100:27:100:27 | [b (line 84): false] access to local variable s |
-| Assert.cs:100:9:100:36 | [b (line 84): true] ...; | Assert.cs:100:27:100:27 | [b (line 84): true] access to local variable s |
-| Assert.cs:100:27:100:27 | [b (line 84): false] access to local variable s | Assert.cs:100:27:100:34 | [b (line 84): false] access to property Length |
-| Assert.cs:100:27:100:27 | [b (line 84): true] access to local variable s | Assert.cs:100:27:100:34 | [b (line 84): true] access to property Length |
-| Assert.cs:100:27:100:34 | [b (line 84): false] access to property Length | Assert.cs:100:9:100:35 | [b (line 84): false] call to method WriteLine |
-| Assert.cs:100:27:100:34 | [b (line 84): true] access to property Length | Assert.cs:100:9:100:35 | [b (line 84): true] call to method WriteLine |
-| Assert.cs:102:9:102:25 | [b (line 84): false] ... = ... | Assert.cs:103:9:103:33 | [b (line 84): false] ...; |
-| Assert.cs:102:9:102:25 | [b (line 84): true] ... = ... | Assert.cs:103:9:103:33 | [b (line 84): true] ...; |
-| Assert.cs:102:9:102:26 | [b (line 84): false] ...; | Assert.cs:102:13:102:13 | [b (line 84): false] access to parameter b |
-| Assert.cs:102:9:102:26 | [b (line 84): true] ...; | Assert.cs:102:13:102:13 | [b (line 84): true] access to parameter b |
-| Assert.cs:102:13:102:13 | [b (line 84): false] access to parameter b | Assert.cs:102:24:102:25 | [b (line 84): false] "" |
-| Assert.cs:102:13:102:13 | [b (line 84): true] access to parameter b | Assert.cs:102:17:102:20 | [b (line 84): true] null |
-| Assert.cs:102:13:102:25 | [b (line 84): false] ... ? ... : ... | Assert.cs:102:9:102:25 | [b (line 84): false] ... = ... |
-| Assert.cs:102:13:102:25 | [b (line 84): true] ... ? ... : ... | Assert.cs:102:9:102:25 | [b (line 84): true] ... = ... |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:102:13:102:25 | [b (line 84): true] ... ? ... : ... |
-| Assert.cs:102:24:102:25 | [b (line 84): false] "" | Assert.cs:102:13:102:25 | [b (line 84): false] ... ? ... : ... |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:104:9:104:36 | [b (line 84): false] ...; |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:104:9:104:36 | [b (line 84): true] ...; |
-| Assert.cs:103:9:103:33 | [b (line 84): false] ...; | Assert.cs:103:23:103:23 | [b (line 84): false] access to local variable s |
-| Assert.cs:103:9:103:33 | [b (line 84): true] ...; | Assert.cs:103:23:103:23 | [b (line 84): true] access to local variable s |
-| Assert.cs:103:23:103:23 | [b (line 84): false] access to local variable s | Assert.cs:103:28:103:31 | [b (line 84): false] null |
-| Assert.cs:103:23:103:23 | [b (line 84): true] access to local variable s | Assert.cs:103:28:103:31 | [b (line 84): true] null |
-| Assert.cs:103:23:103:31 | [b (line 84): false] ... != ... | Assert.cs:103:9:103:32 | [assertion failure, b (line 84): false] call to method IsTrue |
-| Assert.cs:103:23:103:31 | [b (line 84): false] ... != ... | Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue |
-| Assert.cs:103:23:103:31 | [b (line 84): true] ... != ... | Assert.cs:103:9:103:32 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:103:23:103:31 | [b (line 84): true] ... != ... | Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:103:28:103:31 | [b (line 84): false] null | Assert.cs:103:23:103:31 | [b (line 84): false] ... != ... |
-| Assert.cs:103:28:103:31 | [b (line 84): true] null | Assert.cs:103:23:103:31 | [b (line 84): true] ... != ... |
-| Assert.cs:104:9:104:35 | [b (line 84): false] call to method WriteLine | Assert.cs:106:9:106:26 | [b (line 84): false] ...; |
-| Assert.cs:104:9:104:35 | [b (line 84): true] call to method WriteLine | Assert.cs:106:9:106:26 | [b (line 84): true] ...; |
-| Assert.cs:104:9:104:36 | [b (line 84): false] ...; | Assert.cs:104:27:104:27 | [b (line 84): false] access to local variable s |
-| Assert.cs:104:9:104:36 | [b (line 84): true] ...; | Assert.cs:104:27:104:27 | [b (line 84): true] access to local variable s |
-| Assert.cs:104:27:104:27 | [b (line 84): false] access to local variable s | Assert.cs:104:27:104:34 | [b (line 84): false] access to property Length |
-| Assert.cs:104:27:104:27 | [b (line 84): true] access to local variable s | Assert.cs:104:27:104:34 | [b (line 84): true] access to property Length |
-| Assert.cs:104:27:104:34 | [b (line 84): false] access to property Length | Assert.cs:104:9:104:35 | [b (line 84): false] call to method WriteLine |
-| Assert.cs:104:27:104:34 | [b (line 84): true] access to property Length | Assert.cs:104:9:104:35 | [b (line 84): true] call to method WriteLine |
-| Assert.cs:106:9:106:25 | [b (line 84): false] ... = ... | Assert.cs:107:9:107:34 | [b (line 84): false] ...; |
-| Assert.cs:106:9:106:25 | [b (line 84): true] ... = ... | Assert.cs:107:9:107:34 | [b (line 84): true] ...; |
-| Assert.cs:106:9:106:26 | [b (line 84): false] ...; | Assert.cs:106:13:106:13 | [b (line 84): false] access to parameter b |
-| Assert.cs:106:9:106:26 | [b (line 84): true] ...; | Assert.cs:106:13:106:13 | [b (line 84): true] access to parameter b |
-| Assert.cs:106:13:106:13 | [b (line 84): false] access to parameter b | Assert.cs:106:24:106:25 | [b (line 84): false] "" |
-| Assert.cs:106:13:106:13 | [b (line 84): true] access to parameter b | Assert.cs:106:17:106:20 | [b (line 84): true] null |
-| Assert.cs:106:13:106:25 | [b (line 84): false] ... ? ... : ... | Assert.cs:106:9:106:25 | [b (line 84): false] ... = ... |
-| Assert.cs:106:13:106:25 | [b (line 84): true] ... ? ... : ... | Assert.cs:106:9:106:25 | [b (line 84): true] ... = ... |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:106:13:106:25 | [b (line 84): true] ... ? ... : ... |
-| Assert.cs:106:24:106:25 | [b (line 84): false] "" | Assert.cs:106:13:106:25 | [b (line 84): false] ... ? ... : ... |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): false] call to method IsFalse | Assert.cs:108:9:108:36 | [b (line 84): false] ...; |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:108:9:108:36 | [b (line 84): true] ...; |
-| Assert.cs:107:9:107:34 | [b (line 84): false] ...; | Assert.cs:107:24:107:24 | [b (line 84): false] access to local variable s |
-| Assert.cs:107:9:107:34 | [b (line 84): true] ...; | Assert.cs:107:24:107:24 | [b (line 84): true] access to local variable s |
-| Assert.cs:107:24:107:24 | [b (line 84): false] access to local variable s | Assert.cs:107:29:107:32 | [b (line 84): false] null |
-| Assert.cs:107:24:107:24 | [b (line 84): true] access to local variable s | Assert.cs:107:29:107:32 | [b (line 84): true] null |
-| Assert.cs:107:24:107:32 | [b (line 84): false] ... != ... | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): false] call to method IsFalse |
-| Assert.cs:107:24:107:32 | [b (line 84): false] ... != ... | Assert.cs:107:9:107:33 | [assertion success, b (line 84): false] call to method IsFalse |
-| Assert.cs:107:24:107:32 | [b (line 84): true] ... != ... | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:107:24:107:32 | [b (line 84): true] ... != ... | Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:107:29:107:32 | [b (line 84): false] null | Assert.cs:107:24:107:32 | [b (line 84): false] ... != ... |
-| Assert.cs:107:29:107:32 | [b (line 84): true] null | Assert.cs:107:24:107:32 | [b (line 84): true] ... != ... |
-| Assert.cs:108:9:108:35 | [b (line 84): false] call to method WriteLine | Assert.cs:110:9:110:26 | [b (line 84): false] ...; |
-| Assert.cs:108:9:108:35 | [b (line 84): true] call to method WriteLine | Assert.cs:110:9:110:26 | [b (line 84): true] ...; |
-| Assert.cs:108:9:108:36 | [b (line 84): false] ...; | Assert.cs:108:27:108:27 | [b (line 84): false] access to local variable s |
-| Assert.cs:108:9:108:36 | [b (line 84): true] ...; | Assert.cs:108:27:108:27 | [b (line 84): true] access to local variable s |
-| Assert.cs:108:27:108:27 | [b (line 84): false] access to local variable s | Assert.cs:108:27:108:34 | [b (line 84): false] access to property Length |
-| Assert.cs:108:27:108:27 | [b (line 84): true] access to local variable s | Assert.cs:108:27:108:34 | [b (line 84): true] access to property Length |
-| Assert.cs:108:27:108:34 | [b (line 84): false] access to property Length | Assert.cs:108:9:108:35 | [b (line 84): false] call to method WriteLine |
-| Assert.cs:108:27:108:34 | [b (line 84): true] access to property Length | Assert.cs:108:9:108:35 | [b (line 84): true] call to method WriteLine |
-| Assert.cs:110:9:110:25 | [b (line 84): false] ... = ... | Assert.cs:111:9:111:34 | [b (line 84): false] ...; |
-| Assert.cs:110:9:110:25 | [b (line 84): true] ... = ... | Assert.cs:111:9:111:34 | [b (line 84): true] ...; |
-| Assert.cs:110:9:110:26 | [b (line 84): false] ...; | Assert.cs:110:13:110:13 | [b (line 84): false] access to parameter b |
-| Assert.cs:110:9:110:26 | [b (line 84): true] ...; | Assert.cs:110:13:110:13 | [b (line 84): true] access to parameter b |
-| Assert.cs:110:13:110:13 | [b (line 84): false] access to parameter b | Assert.cs:110:24:110:25 | [b (line 84): false] "" |
-| Assert.cs:110:13:110:13 | [b (line 84): true] access to parameter b | Assert.cs:110:17:110:20 | [b (line 84): true] null |
-| Assert.cs:110:13:110:25 | [b (line 84): false] ... ? ... : ... | Assert.cs:110:9:110:25 | [b (line 84): false] ... = ... |
-| Assert.cs:110:13:110:25 | [b (line 84): true] ... ? ... : ... | Assert.cs:110:9:110:25 | [b (line 84): true] ... = ... |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:110:13:110:25 | [b (line 84): true] ... ? ... : ... |
-| Assert.cs:110:24:110:25 | [b (line 84): false] "" | Assert.cs:110:13:110:25 | [b (line 84): false] ... ? ... : ... |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): false] call to method IsFalse | Assert.cs:112:9:112:36 | [b (line 84): false] ...; |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:112:9:112:36 | [b (line 84): true] ...; |
-| Assert.cs:111:9:111:34 | [b (line 84): false] ...; | Assert.cs:111:24:111:24 | [b (line 84): false] access to local variable s |
-| Assert.cs:111:9:111:34 | [b (line 84): true] ...; | Assert.cs:111:24:111:24 | [b (line 84): true] access to local variable s |
-| Assert.cs:111:24:111:24 | [b (line 84): false] access to local variable s | Assert.cs:111:29:111:32 | [b (line 84): false] null |
-| Assert.cs:111:24:111:24 | [b (line 84): true] access to local variable s | Assert.cs:111:29:111:32 | [b (line 84): true] null |
-| Assert.cs:111:24:111:32 | [b (line 84): false] ... == ... | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): false] call to method IsFalse |
-| Assert.cs:111:24:111:32 | [b (line 84): false] ... == ... | Assert.cs:111:9:111:33 | [assertion success, b (line 84): false] call to method IsFalse |
-| Assert.cs:111:24:111:32 | [b (line 84): true] ... == ... | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:111:24:111:32 | [b (line 84): true] ... == ... | Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:111:29:111:32 | [b (line 84): false] null | Assert.cs:111:24:111:32 | [b (line 84): false] ... == ... |
-| Assert.cs:111:29:111:32 | [b (line 84): true] null | Assert.cs:111:24:111:32 | [b (line 84): true] ... == ... |
-| Assert.cs:112:9:112:35 | [b (line 84): false] call to method WriteLine | Assert.cs:114:9:114:26 | [b (line 84): false] ...; |
-| Assert.cs:112:9:112:35 | [b (line 84): true] call to method WriteLine | Assert.cs:114:9:114:26 | [b (line 84): true] ...; |
-| Assert.cs:112:9:112:36 | [b (line 84): false] ...; | Assert.cs:112:27:112:27 | [b (line 84): false] access to local variable s |
-| Assert.cs:112:9:112:36 | [b (line 84): true] ...; | Assert.cs:112:27:112:27 | [b (line 84): true] access to local variable s |
-| Assert.cs:112:27:112:27 | [b (line 84): false] access to local variable s | Assert.cs:112:27:112:34 | [b (line 84): false] access to property Length |
-| Assert.cs:112:27:112:27 | [b (line 84): true] access to local variable s | Assert.cs:112:27:112:34 | [b (line 84): true] access to property Length |
-| Assert.cs:112:27:112:34 | [b (line 84): false] access to property Length | Assert.cs:112:9:112:35 | [b (line 84): false] call to method WriteLine |
-| Assert.cs:112:27:112:34 | [b (line 84): true] access to property Length | Assert.cs:112:9:112:35 | [b (line 84): true] call to method WriteLine |
-| Assert.cs:114:9:114:25 | [b (line 84): false] ... = ... | Assert.cs:115:9:115:38 | [b (line 84): false] ...; |
-| Assert.cs:114:9:114:25 | [b (line 84): true] ... = ... | Assert.cs:115:9:115:38 | [b (line 84): true] ...; |
-| Assert.cs:114:9:114:26 | [b (line 84): false] ...; | Assert.cs:114:13:114:13 | [b (line 84): false] access to parameter b |
-| Assert.cs:114:9:114:26 | [b (line 84): true] ...; | Assert.cs:114:13:114:13 | [b (line 84): true] access to parameter b |
-| Assert.cs:114:13:114:13 | [b (line 84): false] access to parameter b | Assert.cs:114:24:114:25 | [b (line 84): false] "" |
-| Assert.cs:114:13:114:13 | [b (line 84): true] access to parameter b | Assert.cs:114:17:114:20 | [b (line 84): true] null |
-| Assert.cs:114:13:114:25 | [b (line 84): false] ... ? ... : ... | Assert.cs:114:9:114:25 | [b (line 84): false] ... = ... |
-| Assert.cs:114:13:114:25 | [b (line 84): true] ... ? ... : ... | Assert.cs:114:9:114:25 | [b (line 84): true] ... = ... |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:114:13:114:25 | [b (line 84): true] ... ? ... : ... |
-| Assert.cs:114:24:114:25 | [b (line 84): false] "" | Assert.cs:114:13:114:25 | [b (line 84): false] ... ? ... : ... |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:116:9:116:36 | [b (line 84): true] ...; |
-| Assert.cs:115:9:115:38 | [b (line 84): false] ...; | Assert.cs:115:23:115:23 | [b (line 84): false] access to local variable s |
-| Assert.cs:115:9:115:38 | [b (line 84): true] ...; | Assert.cs:115:23:115:23 | [b (line 84): true] access to local variable s |
-| Assert.cs:115:23:115:23 | [b (line 84): false] access to local variable s | Assert.cs:115:28:115:31 | [b (line 84): false] null |
-| Assert.cs:115:23:115:23 | [b (line 84): true] access to local variable s | Assert.cs:115:28:115:31 | [b (line 84): true] null |
-| Assert.cs:115:23:115:31 | [b (line 84): false] ... != ... | Assert.cs:115:23:115:36 | [false, b (line 84): false] ... && ... |
-| Assert.cs:115:23:115:31 | [b (line 84): false] ... != ... | Assert.cs:115:36:115:36 | [b (line 84): false] access to parameter b |
-| Assert.cs:115:23:115:31 | [b (line 84): true] ... != ... | Assert.cs:115:23:115:36 | [false, b (line 84): true] ... && ... |
-| Assert.cs:115:23:115:31 | [b (line 84): true] ... != ... | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:115:23:115:36 | [false, b (line 84): false] ... && ... | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): false] call to method IsTrue |
-| Assert.cs:115:23:115:36 | [false, b (line 84): true] ... && ... | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:115:28:115:31 | [b (line 84): false] null | Assert.cs:115:23:115:31 | [b (line 84): false] ... != ... |
-| Assert.cs:115:28:115:31 | [b (line 84): true] null | Assert.cs:115:23:115:31 | [b (line 84): true] ... != ... |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:116:9:116:35 | [b (line 84): true] call to method WriteLine | Assert.cs:118:9:118:26 | [b (line 84): true] ...; |
-| Assert.cs:116:9:116:36 | [b (line 84): true] ...; | Assert.cs:116:27:116:27 | [b (line 84): true] access to local variable s |
-| Assert.cs:116:27:116:27 | [b (line 84): true] access to local variable s | Assert.cs:116:27:116:34 | [b (line 84): true] access to property Length |
-| Assert.cs:116:27:116:34 | [b (line 84): true] access to property Length | Assert.cs:116:9:116:35 | [b (line 84): true] call to method WriteLine |
-| Assert.cs:118:9:118:25 | [b (line 84): true] ... = ... | Assert.cs:119:9:119:40 | [b (line 84): true] ...; |
-| Assert.cs:118:9:118:26 | [b (line 84): true] ...; | Assert.cs:118:13:118:13 | [b (line 84): true] access to parameter b |
-| Assert.cs:118:13:118:13 | [b (line 84): true] access to parameter b | Assert.cs:118:17:118:20 | [b (line 84): true] null |
-| Assert.cs:118:13:118:25 | [b (line 84): true] ... ? ... : ... | Assert.cs:118:9:118:25 | [b (line 84): true] ... = ... |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:118:13:118:25 | [b (line 84): true] ... ? ... : ... |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:120:9:120:36 | [b (line 84): true] ...; |
-| Assert.cs:119:9:119:40 | [b (line 84): true] ...; | Assert.cs:119:24:119:24 | [b (line 84): true] access to local variable s |
-| Assert.cs:119:24:119:24 | [b (line 84): true] access to local variable s | Assert.cs:119:29:119:32 | [b (line 84): true] null |
-| Assert.cs:119:24:119:32 | [b (line 84): true] ... == ... | Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... |
-| Assert.cs:119:24:119:32 | [b (line 84): true] ... == ... | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... | Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:119:29:119:32 | [b (line 84): true] null | Assert.cs:119:24:119:32 | [b (line 84): true] ... == ... |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... |
-| Assert.cs:120:9:120:35 | [b (line 84): true] call to method WriteLine | Assert.cs:122:9:122:26 | [b (line 84): true] ...; |
-| Assert.cs:120:9:120:36 | [b (line 84): true] ...; | Assert.cs:120:27:120:27 | [b (line 84): true] access to local variable s |
-| Assert.cs:120:27:120:27 | [b (line 84): true] access to local variable s | Assert.cs:120:27:120:34 | [b (line 84): true] access to property Length |
-| Assert.cs:120:27:120:34 | [b (line 84): true] access to property Length | Assert.cs:120:9:120:35 | [b (line 84): true] call to method WriteLine |
-| Assert.cs:122:9:122:25 | [b (line 84): true] ... = ... | Assert.cs:123:9:123:38 | [b (line 84): true] ...; |
-| Assert.cs:122:9:122:26 | [b (line 84): true] ...; | Assert.cs:122:13:122:13 | [b (line 84): true] access to parameter b |
-| Assert.cs:122:13:122:13 | [b (line 84): true] access to parameter b | Assert.cs:122:17:122:20 | [b (line 84): true] null |
-| Assert.cs:122:13:122:25 | [b (line 84): true] ... ? ... : ... | Assert.cs:122:9:122:25 | [b (line 84): true] ... = ... |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:122:13:122:25 | [b (line 84): true] ... ? ... : ... |
-| Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:124:9:124:36 | [b (line 84): true] ...; |
-| Assert.cs:123:9:123:38 | [b (line 84): true] ...; | Assert.cs:123:23:123:23 | [b (line 84): true] access to local variable s |
-| Assert.cs:123:23:123:23 | [b (line 84): true] access to local variable s | Assert.cs:123:28:123:31 | [b (line 84): true] null |
-| Assert.cs:123:23:123:31 | [b (line 84): true] ... == ... | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... |
-| Assert.cs:123:23:123:31 | [b (line 84): true] ... == ... | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:123:28:123:31 | [b (line 84): true] null | Assert.cs:123:23:123:31 | [b (line 84): true] ... == ... |
-| Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:124:9:124:35 | [b (line 84): true] call to method WriteLine | Assert.cs:126:9:126:26 | [b (line 84): true] ...; |
-| Assert.cs:124:9:124:36 | [b (line 84): true] ...; | Assert.cs:124:27:124:27 | [b (line 84): true] access to local variable s |
-| Assert.cs:124:27:124:27 | [b (line 84): true] access to local variable s | Assert.cs:124:27:124:34 | [b (line 84): true] access to property Length |
-| Assert.cs:124:27:124:34 | [b (line 84): true] access to property Length | Assert.cs:124:9:124:35 | [b (line 84): true] call to method WriteLine |
-| Assert.cs:126:9:126:25 | [b (line 84): true] ... = ... | Assert.cs:127:9:127:40 | [b (line 84): true] ...; |
-| Assert.cs:126:9:126:26 | [b (line 84): true] ...; | Assert.cs:126:13:126:13 | [b (line 84): true] access to parameter b |
-| Assert.cs:126:13:126:13 | [b (line 84): true] access to parameter b | Assert.cs:126:17:126:20 | [b (line 84): true] null |
-| Assert.cs:126:13:126:25 | [b (line 84): true] ... ? ... : ... | Assert.cs:126:9:126:25 | [b (line 84): true] ... = ... |
-| Assert.cs:126:17:126:20 | [b (line 84): true] null | Assert.cs:126:13:126:25 | [b (line 84): true] ... ? ... : ... |
-| Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | Assert.cs:128:9:128:36 | ...; |
-| Assert.cs:127:9:127:40 | [b (line 84): true] ...; | Assert.cs:127:24:127:24 | [b (line 84): true] access to local variable s |
-| Assert.cs:127:24:127:24 | [b (line 84): true] access to local variable s | Assert.cs:127:29:127:32 | [b (line 84): true] null |
-| Assert.cs:127:24:127:32 | [b (line 84): true] ... != ... | Assert.cs:127:24:127:38 | [true] ... \|\| ... |
-| Assert.cs:127:24:127:32 | [b (line 84): true] ... != ... | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:127:24:127:38 | [false] ... \|\| ... | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse |
-| Assert.cs:127:24:127:38 | [true] ... \|\| ... | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse |
-| Assert.cs:127:29:127:32 | [b (line 84): true] null | Assert.cs:127:24:127:32 | [b (line 84): true] ... != ... |
-| Assert.cs:127:37:127:38 | [false] !... | Assert.cs:127:24:127:38 | [false] ... \|\| ... |
-| Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | Assert.cs:127:37:127:38 | [false] !... |
+| Assert.cs:86:16:86:32 | String s = ... | Assert.cs:87:9:87:32 | ...; |
+| Assert.cs:86:20:86:20 | access to parameter b | Assert.cs:86:24:86:27 | null |
+| Assert.cs:86:20:86:20 | access to parameter b | Assert.cs:86:31:86:32 | "" |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:86:16:86:32 | String s = ... |
+| Assert.cs:87:9:87:31 | call to method Assert | Assert.cs:84:10:84:12 | exit M12 (abnormal) |
+| Assert.cs:87:9:87:31 | call to method Assert | Assert.cs:88:9:88:36 | ...; |
+| Assert.cs:87:9:87:32 | ...; | Assert.cs:87:22:87:22 | access to local variable s |
+| Assert.cs:87:22:87:22 | access to local variable s | Assert.cs:87:27:87:30 | null |
+| Assert.cs:87:22:87:30 | ... != ... | Assert.cs:87:9:87:31 | call to method Assert |
+| Assert.cs:87:27:87:30 | null | Assert.cs:87:22:87:30 | ... != ... |
+| Assert.cs:88:9:88:35 | call to method WriteLine | Assert.cs:90:9:90:26 | ...; |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:88:27:88:27 | access to local variable s |
+| Assert.cs:88:27:88:27 | access to local variable s | Assert.cs:88:27:88:34 | access to property Length |
+| Assert.cs:88:27:88:34 | access to property Length | Assert.cs:88:9:88:35 | call to method WriteLine |
+| Assert.cs:90:9:90:25 | ... = ... | Assert.cs:91:9:91:25 | ...; |
+| Assert.cs:90:9:90:26 | ...; | Assert.cs:90:13:90:13 | access to parameter b |
+| Assert.cs:90:13:90:13 | access to parameter b | Assert.cs:90:17:90:20 | null |
+| Assert.cs:90:13:90:13 | access to parameter b | Assert.cs:90:24:90:25 | "" |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:90:9:90:25 | ... = ... |
+| Assert.cs:91:9:91:24 | call to method IsNull | Assert.cs:92:9:92:36 | ...; |
+| Assert.cs:91:9:91:25 | ...; | Assert.cs:91:23:91:23 | access to local variable s |
+| Assert.cs:91:23:91:23 | access to local variable s | Assert.cs:91:9:91:24 | call to method IsNull |
+| Assert.cs:92:9:92:35 | call to method WriteLine | Assert.cs:94:9:94:26 | ...; |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:92:27:92:27 | access to local variable s |
+| Assert.cs:92:27:92:27 | access to local variable s | Assert.cs:92:27:92:34 | access to property Length |
+| Assert.cs:92:27:92:34 | access to property Length | Assert.cs:92:9:92:35 | call to method WriteLine |
+| Assert.cs:94:9:94:25 | ... = ... | Assert.cs:95:9:95:28 | ...; |
+| Assert.cs:94:9:94:26 | ...; | Assert.cs:94:13:94:13 | access to parameter b |
+| Assert.cs:94:13:94:13 | access to parameter b | Assert.cs:94:17:94:20 | null |
+| Assert.cs:94:13:94:13 | access to parameter b | Assert.cs:94:24:94:25 | "" |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:94:9:94:25 | ... = ... |
+| Assert.cs:95:9:95:27 | call to method IsNotNull | Assert.cs:96:9:96:36 | ...; |
+| Assert.cs:95:9:95:28 | ...; | Assert.cs:95:26:95:26 | access to local variable s |
+| Assert.cs:95:26:95:26 | access to local variable s | Assert.cs:95:9:95:27 | call to method IsNotNull |
+| Assert.cs:96:9:96:35 | call to method WriteLine | Assert.cs:98:9:98:26 | ...; |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:96:27:96:27 | access to local variable s |
+| Assert.cs:96:27:96:27 | access to local variable s | Assert.cs:96:27:96:34 | access to property Length |
+| Assert.cs:96:27:96:34 | access to property Length | Assert.cs:96:9:96:35 | call to method WriteLine |
+| Assert.cs:98:9:98:25 | ... = ... | Assert.cs:99:9:99:33 | ...; |
+| Assert.cs:98:9:98:26 | ...; | Assert.cs:98:13:98:13 | access to parameter b |
+| Assert.cs:98:13:98:13 | access to parameter b | Assert.cs:98:17:98:20 | null |
+| Assert.cs:98:13:98:13 | access to parameter b | Assert.cs:98:24:98:25 | "" |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:98:9:98:25 | ... = ... |
+| Assert.cs:99:9:99:32 | call to method IsTrue | Assert.cs:100:9:100:36 | ...; |
+| Assert.cs:99:9:99:33 | ...; | Assert.cs:99:23:99:23 | access to local variable s |
+| Assert.cs:99:23:99:23 | access to local variable s | Assert.cs:99:28:99:31 | null |
+| Assert.cs:99:23:99:31 | ... == ... | Assert.cs:99:9:99:32 | call to method IsTrue |
+| Assert.cs:99:28:99:31 | null | Assert.cs:99:23:99:31 | ... == ... |
+| Assert.cs:100:9:100:35 | call to method WriteLine | Assert.cs:102:9:102:26 | ...; |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:100:27:100:27 | access to local variable s |
+| Assert.cs:100:27:100:27 | access to local variable s | Assert.cs:100:27:100:34 | access to property Length |
+| Assert.cs:100:27:100:34 | access to property Length | Assert.cs:100:9:100:35 | call to method WriteLine |
+| Assert.cs:102:9:102:25 | ... = ... | Assert.cs:103:9:103:33 | ...; |
+| Assert.cs:102:9:102:26 | ...; | Assert.cs:102:13:102:13 | access to parameter b |
+| Assert.cs:102:13:102:13 | access to parameter b | Assert.cs:102:17:102:20 | null |
+| Assert.cs:102:13:102:13 | access to parameter b | Assert.cs:102:24:102:25 | "" |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:102:9:102:25 | ... = ... |
+| Assert.cs:103:9:103:32 | call to method IsTrue | Assert.cs:104:9:104:36 | ...; |
+| Assert.cs:103:9:103:33 | ...; | Assert.cs:103:23:103:23 | access to local variable s |
+| Assert.cs:103:23:103:23 | access to local variable s | Assert.cs:103:28:103:31 | null |
+| Assert.cs:103:23:103:31 | ... != ... | Assert.cs:103:9:103:32 | call to method IsTrue |
+| Assert.cs:103:28:103:31 | null | Assert.cs:103:23:103:31 | ... != ... |
+| Assert.cs:104:9:104:35 | call to method WriteLine | Assert.cs:106:9:106:26 | ...; |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:104:27:104:27 | access to local variable s |
+| Assert.cs:104:27:104:27 | access to local variable s | Assert.cs:104:27:104:34 | access to property Length |
+| Assert.cs:104:27:104:34 | access to property Length | Assert.cs:104:9:104:35 | call to method WriteLine |
+| Assert.cs:106:9:106:25 | ... = ... | Assert.cs:107:9:107:34 | ...; |
+| Assert.cs:106:9:106:26 | ...; | Assert.cs:106:13:106:13 | access to parameter b |
+| Assert.cs:106:13:106:13 | access to parameter b | Assert.cs:106:17:106:20 | null |
+| Assert.cs:106:13:106:13 | access to parameter b | Assert.cs:106:24:106:25 | "" |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:106:9:106:25 | ... = ... |
+| Assert.cs:107:9:107:33 | call to method IsFalse | Assert.cs:108:9:108:36 | ...; |
+| Assert.cs:107:9:107:34 | ...; | Assert.cs:107:24:107:24 | access to local variable s |
+| Assert.cs:107:24:107:24 | access to local variable s | Assert.cs:107:29:107:32 | null |
+| Assert.cs:107:24:107:32 | ... != ... | Assert.cs:107:9:107:33 | call to method IsFalse |
+| Assert.cs:107:29:107:32 | null | Assert.cs:107:24:107:32 | ... != ... |
+| Assert.cs:108:9:108:35 | call to method WriteLine | Assert.cs:110:9:110:26 | ...; |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:108:27:108:27 | access to local variable s |
+| Assert.cs:108:27:108:27 | access to local variable s | Assert.cs:108:27:108:34 | access to property Length |
+| Assert.cs:108:27:108:34 | access to property Length | Assert.cs:108:9:108:35 | call to method WriteLine |
+| Assert.cs:110:9:110:25 | ... = ... | Assert.cs:111:9:111:34 | ...; |
+| Assert.cs:110:9:110:26 | ...; | Assert.cs:110:13:110:13 | access to parameter b |
+| Assert.cs:110:13:110:13 | access to parameter b | Assert.cs:110:17:110:20 | null |
+| Assert.cs:110:13:110:13 | access to parameter b | Assert.cs:110:24:110:25 | "" |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:110:9:110:25 | ... = ... |
+| Assert.cs:111:9:111:33 | call to method IsFalse | Assert.cs:112:9:112:36 | ...; |
+| Assert.cs:111:9:111:34 | ...; | Assert.cs:111:24:111:24 | access to local variable s |
+| Assert.cs:111:24:111:24 | access to local variable s | Assert.cs:111:29:111:32 | null |
+| Assert.cs:111:24:111:32 | ... == ... | Assert.cs:111:9:111:33 | call to method IsFalse |
+| Assert.cs:111:29:111:32 | null | Assert.cs:111:24:111:32 | ... == ... |
+| Assert.cs:112:9:112:35 | call to method WriteLine | Assert.cs:114:9:114:26 | ...; |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:112:27:112:27 | access to local variable s |
+| Assert.cs:112:27:112:27 | access to local variable s | Assert.cs:112:27:112:34 | access to property Length |
+| Assert.cs:112:27:112:34 | access to property Length | Assert.cs:112:9:112:35 | call to method WriteLine |
+| Assert.cs:114:9:114:25 | ... = ... | Assert.cs:115:9:115:38 | ...; |
+| Assert.cs:114:9:114:26 | ...; | Assert.cs:114:13:114:13 | access to parameter b |
+| Assert.cs:114:13:114:13 | access to parameter b | Assert.cs:114:17:114:20 | null |
+| Assert.cs:114:13:114:13 | access to parameter b | Assert.cs:114:24:114:25 | "" |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:114:9:114:25 | ... = ... |
+| Assert.cs:115:9:115:37 | call to method IsTrue | Assert.cs:116:9:116:36 | ...; |
+| Assert.cs:115:9:115:38 | ...; | Assert.cs:115:23:115:23 | access to local variable s |
+| Assert.cs:115:23:115:23 | access to local variable s | Assert.cs:115:28:115:31 | null |
+| Assert.cs:115:23:115:31 | ... != ... | Assert.cs:115:23:115:36 | ... && ... |
+| Assert.cs:115:23:115:31 | ... != ... | Assert.cs:115:36:115:36 | access to parameter b |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:115:9:115:37 | call to method IsTrue |
+| Assert.cs:115:28:115:31 | null | Assert.cs:115:23:115:31 | ... != ... |
+| Assert.cs:116:9:116:35 | call to method WriteLine | Assert.cs:118:9:118:26 | ...; |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:116:27:116:27 | access to local variable s |
+| Assert.cs:116:27:116:27 | access to local variable s | Assert.cs:116:27:116:34 | access to property Length |
+| Assert.cs:116:27:116:34 | access to property Length | Assert.cs:116:9:116:35 | call to method WriteLine |
+| Assert.cs:118:9:118:25 | ... = ... | Assert.cs:119:9:119:40 | ...; |
+| Assert.cs:118:9:118:26 | ...; | Assert.cs:118:13:118:13 | access to parameter b |
+| Assert.cs:118:13:118:13 | access to parameter b | Assert.cs:118:17:118:20 | null |
+| Assert.cs:118:13:118:13 | access to parameter b | Assert.cs:118:24:118:25 | "" |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:118:9:118:25 | ... = ... |
+| Assert.cs:119:9:119:39 | call to method IsFalse | Assert.cs:120:9:120:36 | ...; |
+| Assert.cs:119:9:119:40 | ...; | Assert.cs:119:24:119:24 | access to local variable s |
+| Assert.cs:119:24:119:24 | access to local variable s | Assert.cs:119:29:119:32 | null |
+| Assert.cs:119:24:119:32 | ... == ... | Assert.cs:119:24:119:38 | ... \|\| ... |
+| Assert.cs:119:24:119:32 | ... == ... | Assert.cs:119:38:119:38 | access to parameter b |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:119:9:119:39 | call to method IsFalse |
+| Assert.cs:119:29:119:32 | null | Assert.cs:119:24:119:32 | ... == ... |
+| Assert.cs:119:38:119:38 | access to parameter b | Assert.cs:119:37:119:38 | !... |
+| Assert.cs:120:9:120:35 | call to method WriteLine | Assert.cs:122:9:122:26 | ...; |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:120:27:120:27 | access to local variable s |
+| Assert.cs:120:27:120:27 | access to local variable s | Assert.cs:120:27:120:34 | access to property Length |
+| Assert.cs:120:27:120:34 | access to property Length | Assert.cs:120:9:120:35 | call to method WriteLine |
+| Assert.cs:122:9:122:25 | ... = ... | Assert.cs:123:9:123:38 | ...; |
+| Assert.cs:122:9:122:26 | ...; | Assert.cs:122:13:122:13 | access to parameter b |
+| Assert.cs:122:13:122:13 | access to parameter b | Assert.cs:122:17:122:20 | null |
+| Assert.cs:122:13:122:13 | access to parameter b | Assert.cs:122:24:122:25 | "" |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:122:9:122:25 | ... = ... |
+| Assert.cs:123:9:123:37 | call to method IsTrue | Assert.cs:124:9:124:36 | ...; |
+| Assert.cs:123:9:123:38 | ...; | Assert.cs:123:23:123:23 | access to local variable s |
+| Assert.cs:123:23:123:23 | access to local variable s | Assert.cs:123:28:123:31 | null |
+| Assert.cs:123:23:123:31 | ... == ... | Assert.cs:123:23:123:36 | ... && ... |
+| Assert.cs:123:23:123:31 | ... == ... | Assert.cs:123:36:123:36 | access to parameter b |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:123:9:123:37 | call to method IsTrue |
+| Assert.cs:123:28:123:31 | null | Assert.cs:123:23:123:31 | ... == ... |
+| Assert.cs:124:9:124:35 | call to method WriteLine | Assert.cs:126:9:126:26 | ...; |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:124:27:124:27 | access to local variable s |
+| Assert.cs:124:27:124:27 | access to local variable s | Assert.cs:124:27:124:34 | access to property Length |
+| Assert.cs:124:27:124:34 | access to property Length | Assert.cs:124:9:124:35 | call to method WriteLine |
+| Assert.cs:126:9:126:25 | ... = ... | Assert.cs:127:9:127:40 | ...; |
+| Assert.cs:126:9:126:26 | ...; | Assert.cs:126:13:126:13 | access to parameter b |
+| Assert.cs:126:13:126:13 | access to parameter b | Assert.cs:126:17:126:20 | null |
+| Assert.cs:126:13:126:13 | access to parameter b | Assert.cs:126:24:126:25 | "" |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:126:9:126:25 | ... = ... |
+| Assert.cs:127:9:127:39 | call to method IsFalse | Assert.cs:128:9:128:36 | ...; |
+| Assert.cs:127:9:127:40 | ...; | Assert.cs:127:24:127:24 | access to local variable s |
+| Assert.cs:127:24:127:24 | access to local variable s | Assert.cs:127:29:127:32 | null |
+| Assert.cs:127:24:127:32 | ... != ... | Assert.cs:127:24:127:38 | ... \|\| ... |
+| Assert.cs:127:24:127:32 | ... != ... | Assert.cs:127:38:127:38 | access to parameter b |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:127:9:127:39 | call to method IsFalse |
+| Assert.cs:127:29:127:32 | null | Assert.cs:127:24:127:32 | ... != ... |
+| Assert.cs:127:38:127:38 | access to parameter b | Assert.cs:127:37:127:38 | !... |
 | Assert.cs:128:9:128:35 | call to method WriteLine | Assert.cs:84:10:84:12 | exit M12 (normal) |
 | Assert.cs:128:9:128:36 | ...; | Assert.cs:128:27:128:27 | access to local variable s |
 | Assert.cs:128:27:128:27 | access to local variable s | Assert.cs:128:27:128:34 | access to property Length |
@@ -867,17 +699,13 @@ dominance
 | Assert.cs:135:5:136:5 | {...} | Assert.cs:131:18:131:32 | exit AssertTrueFalse (normal) |
 | Assert.cs:138:10:138:12 | enter M13 | Assert.cs:139:5:142:5 | {...} |
 | Assert.cs:139:5:142:5 | {...} | Assert.cs:140:9:140:36 | ...; |
-| Assert.cs:140:9:140:35 | [assertion success] call to method AssertTrueFalse | Assert.cs:141:9:141:15 | return ...; |
+| Assert.cs:140:9:140:35 | call to method AssertTrueFalse | Assert.cs:138:10:138:12 | exit M13 (abnormal) |
+| Assert.cs:140:9:140:35 | call to method AssertTrueFalse | Assert.cs:141:9:141:15 | return ...; |
 | Assert.cs:140:9:140:35 | this access | Assert.cs:140:25:140:26 | access to parameter b1 |
 | Assert.cs:140:9:140:36 | ...; | Assert.cs:140:9:140:35 | this access |
-| Assert.cs:140:25:140:26 | access to parameter b1 | Assert.cs:140:29:140:30 | [assertion failure] access to parameter b2 |
 | Assert.cs:140:25:140:26 | access to parameter b1 | Assert.cs:140:29:140:30 | access to parameter b2 |
-| Assert.cs:140:29:140:30 | [assertion failure] access to parameter b2 | Assert.cs:140:33:140:34 | [assertion failure] access to parameter b3 |
-| Assert.cs:140:29:140:30 | access to parameter b2 | Assert.cs:140:33:140:34 | [assertion failure] access to parameter b3 |
-| Assert.cs:140:29:140:30 | access to parameter b2 | Assert.cs:140:33:140:34 | [assertion success] access to parameter b3 |
-| Assert.cs:140:33:140:34 | [assertion failure] access to parameter b3 | Assert.cs:140:9:140:35 | [assertion failure] call to method AssertTrueFalse |
-| Assert.cs:140:33:140:34 | [assertion failure] access to parameter b3 | Assert.cs:140:9:140:35 | [assertion failure] call to method AssertTrueFalse |
-| Assert.cs:140:33:140:34 | [assertion success] access to parameter b3 | Assert.cs:140:9:140:35 | [assertion success] call to method AssertTrueFalse |
+| Assert.cs:140:29:140:30 | access to parameter b2 | Assert.cs:140:33:140:34 | access to parameter b3 |
+| Assert.cs:140:33:140:34 | access to parameter b3 | Assert.cs:140:9:140:35 | call to method AssertTrueFalse |
 | Assert.cs:141:9:141:15 | return ...; | Assert.cs:138:10:138:12 | exit M13 (normal) |
 | Assignments.cs:1:7:1:17 | call to constructor Object | Assignments.cs:1:7:1:17 | {...} |
 | Assignments.cs:1:7:1:17 | enter Assignments | Assignments.cs:1:7:1:17 | call to constructor Object |
@@ -963,16 +791,10 @@ dominance
 | BreakInTry.cs:26:21:26:31 | ... == ... | BreakInTry.cs:27:21:27:26 | break; |
 | BreakInTry.cs:26:21:26:31 | ... == ... | BreakInTry.cs:30:13:33:13 | {...} |
 | BreakInTry.cs:26:28:26:31 | null | BreakInTry.cs:26:21:26:31 | ... == ... |
-| BreakInTry.cs:27:21:27:26 | break; | BreakInTry.cs:30:13:33:13 | [finally: break] {...} |
-| BreakInTry.cs:30:13:33:13 | [finally: break] {...} | BreakInTry.cs:31:17:32:21 | [finally: break] if (...) ... |
 | BreakInTry.cs:30:13:33:13 | {...} | BreakInTry.cs:31:17:32:21 | if (...) ... |
-| BreakInTry.cs:31:17:32:21 | [finally: break] if (...) ... | BreakInTry.cs:31:21:31:24 | [finally: break] access to parameter args |
 | BreakInTry.cs:31:17:32:21 | if (...) ... | BreakInTry.cs:31:21:31:24 | access to parameter args |
-| BreakInTry.cs:31:21:31:24 | [finally: break] access to parameter args | BreakInTry.cs:31:29:31:32 | [finally: break] null |
 | BreakInTry.cs:31:21:31:24 | access to parameter args | BreakInTry.cs:31:29:31:32 | null |
 | BreakInTry.cs:31:21:31:32 | ... == ... | BreakInTry.cs:32:21:32:21 | ; |
-| BreakInTry.cs:31:21:31:32 | [finally: break] ... == ... | BreakInTry.cs:32:21:32:21 | [finally: break] ; |
-| BreakInTry.cs:31:29:31:32 | [finally: break] null | BreakInTry.cs:31:21:31:32 | [finally: break] ... == ... |
 | BreakInTry.cs:31:29:31:32 | null | BreakInTry.cs:31:21:31:32 | ... == ... |
 | BreakInTry.cs:35:7:35:7 | ; | BreakInTry.cs:20:10:20:11 | exit M2 (normal) |
 | BreakInTry.cs:38:10:38:11 | enter M3 | BreakInTry.cs:39:5:54:5 | {...} |
@@ -985,25 +807,16 @@ dominance
 | BreakInTry.cs:42:17:42:28 | ... == ... | BreakInTry.cs:43:17:43:23 | return ...; |
 | BreakInTry.cs:42:17:42:28 | ... == ... | BreakInTry.cs:46:9:52:9 | {...} |
 | BreakInTry.cs:42:25:42:28 | null | BreakInTry.cs:42:17:42:28 | ... == ... |
-| BreakInTry.cs:43:17:43:23 | return ...; | BreakInTry.cs:46:9:52:9 | [finally: return] {...} |
-| BreakInTry.cs:46:9:52:9 | [finally: return] {...} | BreakInTry.cs:47:33:47:36 | [finally: return] access to parameter args |
 | BreakInTry.cs:46:9:52:9 | {...} | BreakInTry.cs:47:33:47:36 | access to parameter args |
-| BreakInTry.cs:47:13:51:13 | [finally: return] foreach (... ... in ...) ... | BreakInTry.cs:47:26:47:28 | [finally: return] String arg |
+| BreakInTry.cs:47:13:51:13 | foreach (... ... in ...) ... | BreakInTry.cs:38:10:38:11 | exit M3 (normal) |
 | BreakInTry.cs:47:13:51:13 | foreach (... ... in ...) ... | BreakInTry.cs:47:26:47:28 | String arg |
 | BreakInTry.cs:47:13:51:13 | foreach (... ... in ...) ... | BreakInTry.cs:53:7:53:7 | ; |
 | BreakInTry.cs:47:26:47:28 | String arg | BreakInTry.cs:48:13:51:13 | {...} |
-| BreakInTry.cs:47:26:47:28 | [finally: return] String arg | BreakInTry.cs:48:13:51:13 | [finally: return] {...} |
-| BreakInTry.cs:47:33:47:36 | [finally: return] access to parameter args | BreakInTry.cs:47:13:51:13 | [finally: return] foreach (... ... in ...) ... |
 | BreakInTry.cs:47:33:47:36 | access to parameter args | BreakInTry.cs:47:13:51:13 | foreach (... ... in ...) ... |
-| BreakInTry.cs:48:13:51:13 | [finally: return] {...} | BreakInTry.cs:49:17:50:26 | [finally: return] if (...) ... |
 | BreakInTry.cs:48:13:51:13 | {...} | BreakInTry.cs:49:17:50:26 | if (...) ... |
-| BreakInTry.cs:49:17:50:26 | [finally: return] if (...) ... | BreakInTry.cs:49:21:49:23 | [finally: return] access to local variable arg |
 | BreakInTry.cs:49:17:50:26 | if (...) ... | BreakInTry.cs:49:21:49:23 | access to local variable arg |
-| BreakInTry.cs:49:21:49:23 | [finally: return] access to local variable arg | BreakInTry.cs:49:28:49:31 | [finally: return] null |
 | BreakInTry.cs:49:21:49:23 | access to local variable arg | BreakInTry.cs:49:28:49:31 | null |
 | BreakInTry.cs:49:21:49:31 | ... == ... | BreakInTry.cs:50:21:50:26 | break; |
-| BreakInTry.cs:49:21:49:31 | [finally: return] ... == ... | BreakInTry.cs:50:21:50:26 | [finally: return] break; |
-| BreakInTry.cs:49:28:49:31 | [finally: return] null | BreakInTry.cs:49:21:49:31 | [finally: return] ... == ... |
 | BreakInTry.cs:49:28:49:31 | null | BreakInTry.cs:49:21:49:31 | ... == ... |
 | BreakInTry.cs:56:10:56:11 | enter M4 | BreakInTry.cs:57:5:71:5 | {...} |
 | BreakInTry.cs:56:10:56:11 | exit M4 (normal) | BreakInTry.cs:56:10:56:11 | exit M4 |
@@ -1015,24 +828,15 @@ dominance
 | BreakInTry.cs:60:17:60:28 | ... == ... | BreakInTry.cs:61:17:61:23 | return ...; |
 | BreakInTry.cs:60:17:60:28 | ... == ... | BreakInTry.cs:64:9:70:9 | {...} |
 | BreakInTry.cs:60:25:60:28 | null | BreakInTry.cs:60:17:60:28 | ... == ... |
-| BreakInTry.cs:61:17:61:23 | return ...; | BreakInTry.cs:64:9:70:9 | [finally: return] {...} |
-| BreakInTry.cs:64:9:70:9 | [finally: return] {...} | BreakInTry.cs:65:33:65:36 | [finally: return] access to parameter args |
 | BreakInTry.cs:64:9:70:9 | {...} | BreakInTry.cs:65:33:65:36 | access to parameter args |
-| BreakInTry.cs:65:13:69:13 | [finally: return] foreach (... ... in ...) ... | BreakInTry.cs:65:26:65:28 | [finally: return] String arg |
+| BreakInTry.cs:65:13:69:13 | foreach (... ... in ...) ... | BreakInTry.cs:56:10:56:11 | exit M4 (normal) |
 | BreakInTry.cs:65:13:69:13 | foreach (... ... in ...) ... | BreakInTry.cs:65:26:65:28 | String arg |
 | BreakInTry.cs:65:26:65:28 | String arg | BreakInTry.cs:66:13:69:13 | {...} |
-| BreakInTry.cs:65:26:65:28 | [finally: return] String arg | BreakInTry.cs:66:13:69:13 | [finally: return] {...} |
-| BreakInTry.cs:65:33:65:36 | [finally: return] access to parameter args | BreakInTry.cs:65:13:69:13 | [finally: return] foreach (... ... in ...) ... |
 | BreakInTry.cs:65:33:65:36 | access to parameter args | BreakInTry.cs:65:13:69:13 | foreach (... ... in ...) ... |
-| BreakInTry.cs:66:13:69:13 | [finally: return] {...} | BreakInTry.cs:67:17:68:26 | [finally: return] if (...) ... |
 | BreakInTry.cs:66:13:69:13 | {...} | BreakInTry.cs:67:17:68:26 | if (...) ... |
-| BreakInTry.cs:67:17:68:26 | [finally: return] if (...) ... | BreakInTry.cs:67:21:67:23 | [finally: return] access to local variable arg |
 | BreakInTry.cs:67:17:68:26 | if (...) ... | BreakInTry.cs:67:21:67:23 | access to local variable arg |
-| BreakInTry.cs:67:21:67:23 | [finally: return] access to local variable arg | BreakInTry.cs:67:28:67:31 | [finally: return] null |
 | BreakInTry.cs:67:21:67:23 | access to local variable arg | BreakInTry.cs:67:28:67:31 | null |
 | BreakInTry.cs:67:21:67:31 | ... == ... | BreakInTry.cs:68:21:68:26 | break; |
-| BreakInTry.cs:67:21:67:31 | [finally: return] ... == ... | BreakInTry.cs:68:21:68:26 | [finally: return] break; |
-| BreakInTry.cs:67:28:67:31 | [finally: return] null | BreakInTry.cs:67:21:67:31 | [finally: return] ... == ... |
 | BreakInTry.cs:67:28:67:31 | null | BreakInTry.cs:67:21:67:31 | ... == ... |
 | CompileTimeOperators.cs:3:7:3:26 | call to constructor Object | CompileTimeOperators.cs:3:7:3:26 | {...} |
 | CompileTimeOperators.cs:3:7:3:26 | enter CompileTimeOperators | CompileTimeOperators.cs:3:7:3:26 | call to constructor Object |
@@ -1063,15 +867,18 @@ dominance
 | CompileTimeOperators.cs:26:7:26:22 | exit GotoInTryFinally (normal) | CompileTimeOperators.cs:26:7:26:22 | exit GotoInTryFinally |
 | CompileTimeOperators.cs:26:7:26:22 | {...} | CompileTimeOperators.cs:26:7:26:22 | exit GotoInTryFinally (normal) |
 | CompileTimeOperators.cs:28:10:28:10 | enter M | CompileTimeOperators.cs:29:5:41:5 | {...} |
-| CompileTimeOperators.cs:28:10:28:10 | exit M (normal) | CompileTimeOperators.cs:28:10:28:10 | exit M |
 | CompileTimeOperators.cs:29:5:41:5 | {...} | CompileTimeOperators.cs:30:9:38:9 | try {...} ... |
 | CompileTimeOperators.cs:30:9:38:9 | try {...} ... | CompileTimeOperators.cs:31:9:34:9 | {...} |
 | CompileTimeOperators.cs:31:9:34:9 | {...} | CompileTimeOperators.cs:32:13:32:21 | goto ...; |
-| CompileTimeOperators.cs:32:13:32:21 | goto ...; | CompileTimeOperators.cs:36:9:38:9 | [finally: goto(End)] {...} |
-| CompileTimeOperators.cs:36:9:38:9 | [finally: goto(End)] {...} | CompileTimeOperators.cs:37:13:37:41 | [finally: goto(End)] ...; |
-| CompileTimeOperators.cs:37:13:37:40 | [finally: goto(End)] call to method WriteLine | CompileTimeOperators.cs:40:9:40:11 | End: |
-| CompileTimeOperators.cs:37:13:37:41 | [finally: goto(End)] ...; | CompileTimeOperators.cs:37:31:37:39 | [finally: goto(End)] "Finally" |
-| CompileTimeOperators.cs:37:31:37:39 | [finally: goto(End)] "Finally" | CompileTimeOperators.cs:37:13:37:40 | [finally: goto(End)] call to method WriteLine |
+| CompileTimeOperators.cs:32:13:32:21 | goto ...; | CompileTimeOperators.cs:36:9:38:9 | {...} |
+| CompileTimeOperators.cs:36:9:38:9 | {...} | CompileTimeOperators.cs:37:13:37:41 | ...; |
+| CompileTimeOperators.cs:37:13:37:40 | call to method WriteLine | CompileTimeOperators.cs:28:10:28:10 | exit M (abnormal) |
+| CompileTimeOperators.cs:37:13:37:40 | call to method WriteLine | CompileTimeOperators.cs:39:9:39:34 | ...; |
+| CompileTimeOperators.cs:37:13:37:40 | call to method WriteLine | CompileTimeOperators.cs:40:9:40:11 | End: |
+| CompileTimeOperators.cs:37:13:37:41 | ...; | CompileTimeOperators.cs:37:31:37:39 | "Finally" |
+| CompileTimeOperators.cs:37:31:37:39 | "Finally" | CompileTimeOperators.cs:37:13:37:40 | call to method WriteLine |
+| CompileTimeOperators.cs:39:9:39:34 | ...; | CompileTimeOperators.cs:39:27:39:32 | "Dead" |
+| CompileTimeOperators.cs:39:27:39:32 | "Dead" | CompileTimeOperators.cs:39:9:39:33 | call to method WriteLine |
 | CompileTimeOperators.cs:40:9:40:11 | End: | CompileTimeOperators.cs:40:14:40:38 | ...; |
 | CompileTimeOperators.cs:40:14:40:37 | call to method WriteLine | CompileTimeOperators.cs:28:10:28:10 | exit M (normal) |
 | CompileTimeOperators.cs:40:14:40:38 | ...; | CompileTimeOperators.cs:40:32:40:36 | "End" |
@@ -1163,16 +970,14 @@ dominance
 | Conditions.cs:3:10:3:19 | exit IncrOrDecr (normal) | Conditions.cs:3:10:3:19 | exit IncrOrDecr |
 | Conditions.cs:4:5:9:5 | {...} | Conditions.cs:5:9:6:16 | if (...) ... |
 | Conditions.cs:5:9:6:16 | if (...) ... | Conditions.cs:5:13:5:15 | access to parameter inc |
-| Conditions.cs:5:13:5:15 | access to parameter inc | Conditions.cs:6:13:6:16 | [inc (line 3): true] ...; |
-| Conditions.cs:5:13:5:15 | access to parameter inc | Conditions.cs:7:9:8:16 | [inc (line 3): false] if (...) ... |
-| Conditions.cs:6:13:6:13 | [inc (line 3): true] access to parameter x | Conditions.cs:6:13:6:15 | [inc (line 3): true] ...++ |
-| Conditions.cs:6:13:6:15 | [inc (line 3): true] ...++ | Conditions.cs:7:9:8:16 | [inc (line 3): true] if (...) ... |
-| Conditions.cs:6:13:6:16 | [inc (line 3): true] ...; | Conditions.cs:6:13:6:13 | [inc (line 3): true] access to parameter x |
-| Conditions.cs:7:9:8:16 | [inc (line 3): false] if (...) ... | Conditions.cs:7:14:7:16 | [inc (line 3): false] access to parameter inc |
-| Conditions.cs:7:9:8:16 | [inc (line 3): true] if (...) ... | Conditions.cs:7:14:7:16 | [inc (line 3): true] access to parameter inc |
+| Conditions.cs:5:13:5:15 | access to parameter inc | Conditions.cs:6:13:6:16 | ...; |
+| Conditions.cs:5:13:5:15 | access to parameter inc | Conditions.cs:7:9:8:16 | if (...) ... |
+| Conditions.cs:6:13:6:13 | access to parameter x | Conditions.cs:6:13:6:15 | ...++ |
+| Conditions.cs:6:13:6:16 | ...; | Conditions.cs:6:13:6:13 | access to parameter x |
+| Conditions.cs:7:9:8:16 | if (...) ... | Conditions.cs:7:14:7:16 | access to parameter inc |
 | Conditions.cs:7:13:7:16 | [true] !... | Conditions.cs:8:13:8:16 | ...; |
-| Conditions.cs:7:14:7:16 | [inc (line 3): false] access to parameter inc | Conditions.cs:7:13:7:16 | [true] !... |
-| Conditions.cs:7:14:7:16 | [inc (line 3): true] access to parameter inc | Conditions.cs:7:13:7:16 | [false] !... |
+| Conditions.cs:7:14:7:16 | access to parameter inc | Conditions.cs:7:13:7:16 | [false] !... |
+| Conditions.cs:7:14:7:16 | access to parameter inc | Conditions.cs:7:13:7:16 | [true] !... |
 | Conditions.cs:8:13:8:13 | access to parameter x | Conditions.cs:8:13:8:15 | ...-- |
 | Conditions.cs:8:13:8:16 | ...; | Conditions.cs:8:13:8:13 | access to parameter x |
 | Conditions.cs:11:9:11:10 | enter M1 | Conditions.cs:12:5:20:5 | {...} |
@@ -1182,24 +987,19 @@ dominance
 | Conditions.cs:13:13:13:17 | Int32 x = ... | Conditions.cs:14:9:15:16 | if (...) ... |
 | Conditions.cs:13:17:13:17 | 0 | Conditions.cs:13:13:13:17 | Int32 x = ... |
 | Conditions.cs:14:9:15:16 | if (...) ... | Conditions.cs:14:13:14:13 | access to parameter b |
-| Conditions.cs:14:13:14:13 | access to parameter b | Conditions.cs:15:13:15:16 | [b (line 11): true] ...; |
-| Conditions.cs:14:13:14:13 | access to parameter b | Conditions.cs:16:9:18:20 | [b (line 11): false] if (...) ... |
-| Conditions.cs:15:13:15:13 | [b (line 11): true] access to local variable x | Conditions.cs:15:13:15:15 | [b (line 11): true] ...++ |
-| Conditions.cs:15:13:15:15 | [b (line 11): true] ...++ | Conditions.cs:16:9:18:20 | [b (line 11): true] if (...) ... |
-| Conditions.cs:15:13:15:16 | [b (line 11): true] ...; | Conditions.cs:15:13:15:13 | [b (line 11): true] access to local variable x |
-| Conditions.cs:16:9:18:20 | [b (line 11): false] if (...) ... | Conditions.cs:16:13:16:13 | [b (line 11): false] access to local variable x |
-| Conditions.cs:16:9:18:20 | [b (line 11): true] if (...) ... | Conditions.cs:16:13:16:13 | [b (line 11): true] access to local variable x |
-| Conditions.cs:16:13:16:13 | [b (line 11): false] access to local variable x | Conditions.cs:16:17:16:17 | [b (line 11): false] 0 |
-| Conditions.cs:16:13:16:13 | [b (line 11): true] access to local variable x | Conditions.cs:16:17:16:17 | [b (line 11): true] 0 |
-| Conditions.cs:16:13:16:17 | [b (line 11): false] ... > ... | Conditions.cs:17:13:18:20 | [b (line 11): false] if (...) ... |
-| Conditions.cs:16:13:16:17 | [b (line 11): true] ... > ... | Conditions.cs:17:13:18:20 | [b (line 11): true] if (...) ... |
-| Conditions.cs:16:17:16:17 | [b (line 11): false] 0 | Conditions.cs:16:13:16:17 | [b (line 11): false] ... > ... |
-| Conditions.cs:16:17:16:17 | [b (line 11): true] 0 | Conditions.cs:16:13:16:17 | [b (line 11): true] ... > ... |
-| Conditions.cs:17:13:18:20 | [b (line 11): false] if (...) ... | Conditions.cs:17:18:17:18 | [b (line 11): false] access to parameter b |
-| Conditions.cs:17:13:18:20 | [b (line 11): true] if (...) ... | Conditions.cs:17:18:17:18 | [b (line 11): true] access to parameter b |
+| Conditions.cs:14:13:14:13 | access to parameter b | Conditions.cs:15:13:15:16 | ...; |
+| Conditions.cs:14:13:14:13 | access to parameter b | Conditions.cs:16:9:18:20 | if (...) ... |
+| Conditions.cs:15:13:15:13 | access to local variable x | Conditions.cs:15:13:15:15 | ...++ |
+| Conditions.cs:15:13:15:16 | ...; | Conditions.cs:15:13:15:13 | access to local variable x |
+| Conditions.cs:16:9:18:20 | if (...) ... | Conditions.cs:16:13:16:13 | access to local variable x |
+| Conditions.cs:16:13:16:13 | access to local variable x | Conditions.cs:16:17:16:17 | 0 |
+| Conditions.cs:16:13:16:17 | ... > ... | Conditions.cs:17:13:18:20 | if (...) ... |
+| Conditions.cs:16:13:16:17 | ... > ... | Conditions.cs:19:16:19:16 | access to local variable x |
+| Conditions.cs:16:17:16:17 | 0 | Conditions.cs:16:13:16:17 | ... > ... |
+| Conditions.cs:17:13:18:20 | if (...) ... | Conditions.cs:17:18:17:18 | access to parameter b |
 | Conditions.cs:17:17:17:18 | [true] !... | Conditions.cs:18:17:18:20 | ...; |
-| Conditions.cs:17:18:17:18 | [b (line 11): false] access to parameter b | Conditions.cs:17:17:17:18 | [true] !... |
-| Conditions.cs:17:18:17:18 | [b (line 11): true] access to parameter b | Conditions.cs:17:17:17:18 | [false] !... |
+| Conditions.cs:17:18:17:18 | access to parameter b | Conditions.cs:17:17:17:18 | [false] !... |
+| Conditions.cs:17:18:17:18 | access to parameter b | Conditions.cs:17:17:17:18 | [true] !... |
 | Conditions.cs:18:17:18:17 | access to local variable x | Conditions.cs:18:17:18:19 | ...-- |
 | Conditions.cs:18:17:18:20 | ...; | Conditions.cs:18:17:18:17 | access to local variable x |
 | Conditions.cs:19:9:19:17 | return ...; | Conditions.cs:11:9:11:10 | exit M1 (normal) |
@@ -1214,14 +1014,12 @@ dominance
 | Conditions.cs:25:13:25:14 | access to parameter b1 | Conditions.cs:26:13:27:20 | if (...) ... |
 | Conditions.cs:25:13:25:14 | access to parameter b1 | Conditions.cs:28:9:29:16 | if (...) ... |
 | Conditions.cs:26:13:27:20 | if (...) ... | Conditions.cs:26:17:26:18 | access to parameter b2 |
-| Conditions.cs:26:17:26:18 | access to parameter b2 | Conditions.cs:27:17:27:20 | [b2 (line 22): true] ...; |
-| Conditions.cs:26:17:26:18 | access to parameter b2 | Conditions.cs:28:9:29:16 | [b2 (line 22): false] if (...) ... |
-| Conditions.cs:27:17:27:17 | [b2 (line 22): true] access to local variable x | Conditions.cs:27:17:27:19 | [b2 (line 22): true] ...++ |
-| Conditions.cs:27:17:27:19 | [b2 (line 22): true] ...++ | Conditions.cs:28:9:29:16 | [b2 (line 22): true] if (...) ... |
-| Conditions.cs:27:17:27:20 | [b2 (line 22): true] ...; | Conditions.cs:27:17:27:17 | [b2 (line 22): true] access to local variable x |
-| Conditions.cs:28:9:29:16 | [b2 (line 22): false] if (...) ... | Conditions.cs:28:13:28:14 | [b2 (line 22): false] access to parameter b2 |
-| Conditions.cs:28:9:29:16 | [b2 (line 22): true] if (...) ... | Conditions.cs:28:13:28:14 | [b2 (line 22): true] access to parameter b2 |
+| Conditions.cs:26:17:26:18 | access to parameter b2 | Conditions.cs:27:17:27:20 | ...; |
+| Conditions.cs:27:17:27:17 | access to local variable x | Conditions.cs:27:17:27:19 | ...++ |
+| Conditions.cs:27:17:27:20 | ...; | Conditions.cs:27:17:27:17 | access to local variable x |
 | Conditions.cs:28:9:29:16 | if (...) ... | Conditions.cs:28:13:28:14 | access to parameter b2 |
+| Conditions.cs:28:13:28:14 | access to parameter b2 | Conditions.cs:29:13:29:16 | ...; |
+| Conditions.cs:28:13:28:14 | access to parameter b2 | Conditions.cs:30:16:30:16 | access to local variable x |
 | Conditions.cs:29:13:29:13 | access to local variable x | Conditions.cs:29:13:29:15 | ...++ |
 | Conditions.cs:29:13:29:16 | ...; | Conditions.cs:29:13:29:13 | access to local variable x |
 | Conditions.cs:30:9:30:17 | return ...; | Conditions.cs:22:9:22:10 | exit M2 (normal) |
@@ -1241,14 +1039,13 @@ dominance
 | Conditions.cs:38:13:38:20 | ...; | Conditions.cs:38:18:38:19 | access to parameter b1 |
 | Conditions.cs:38:18:38:19 | access to parameter b1 | Conditions.cs:38:13:38:19 | ... = ... |
 | Conditions.cs:39:9:40:16 | if (...) ... | Conditions.cs:39:13:39:14 | access to local variable b2 |
-| Conditions.cs:39:13:39:14 | access to local variable b2 | Conditions.cs:40:13:40:16 | [b2 (line 39): true] ...; |
-| Conditions.cs:39:13:39:14 | access to local variable b2 | Conditions.cs:41:9:42:16 | [b2 (line 39): false] if (...) ... |
-| Conditions.cs:40:13:40:13 | [b2 (line 39): true] access to local variable x | Conditions.cs:40:13:40:15 | [b2 (line 39): true] ...++ |
-| Conditions.cs:40:13:40:15 | [b2 (line 39): true] ...++ | Conditions.cs:41:9:42:16 | [b2 (line 39): true] if (...) ... |
-| Conditions.cs:40:13:40:16 | [b2 (line 39): true] ...; | Conditions.cs:40:13:40:13 | [b2 (line 39): true] access to local variable x |
-| Conditions.cs:41:9:42:16 | [b2 (line 39): false] if (...) ... | Conditions.cs:41:13:41:14 | [b2 (line 39): false] access to local variable b2 |
-| Conditions.cs:41:9:42:16 | [b2 (line 39): true] if (...) ... | Conditions.cs:41:13:41:14 | [b2 (line 39): true] access to local variable b2 |
-| Conditions.cs:41:13:41:14 | [b2 (line 39): true] access to local variable b2 | Conditions.cs:42:13:42:16 | ...; |
+| Conditions.cs:39:13:39:14 | access to local variable b2 | Conditions.cs:40:13:40:16 | ...; |
+| Conditions.cs:39:13:39:14 | access to local variable b2 | Conditions.cs:41:9:42:16 | if (...) ... |
+| Conditions.cs:40:13:40:13 | access to local variable x | Conditions.cs:40:13:40:15 | ...++ |
+| Conditions.cs:40:13:40:16 | ...; | Conditions.cs:40:13:40:13 | access to local variable x |
+| Conditions.cs:41:9:42:16 | if (...) ... | Conditions.cs:41:13:41:14 | access to local variable b2 |
+| Conditions.cs:41:13:41:14 | access to local variable b2 | Conditions.cs:42:13:42:16 | ...; |
+| Conditions.cs:41:13:41:14 | access to local variable b2 | Conditions.cs:43:16:43:16 | access to local variable x |
 | Conditions.cs:42:13:42:13 | access to local variable x | Conditions.cs:42:13:42:15 | ...++ |
 | Conditions.cs:42:13:42:16 | ...; | Conditions.cs:42:13:42:13 | access to local variable x |
 | Conditions.cs:43:9:43:17 | return ...; | Conditions.cs:33:9:33:10 | exit M3 (normal) |
@@ -1260,30 +1057,16 @@ dominance
 | Conditions.cs:48:13:48:17 | Int32 y = ... | Conditions.cs:49:9:53:9 | while (...) ... |
 | Conditions.cs:48:17:48:17 | 0 | Conditions.cs:48:13:48:17 | Int32 y = ... |
 | Conditions.cs:49:9:53:9 | while (...) ... | Conditions.cs:49:16:49:16 | access to parameter x |
-| Conditions.cs:49:16:49:16 | [b (line 46): false] access to parameter x | Conditions.cs:49:16:49:18 | [b (line 46): false] ...-- |
-| Conditions.cs:49:16:49:16 | [b (line 46): true] access to parameter x | Conditions.cs:49:16:49:18 | [b (line 46): true] ...-- |
 | Conditions.cs:49:16:49:16 | access to parameter x | Conditions.cs:49:16:49:18 | ...-- |
 | Conditions.cs:49:16:49:18 | ...-- | Conditions.cs:49:22:49:22 | 0 |
-| Conditions.cs:49:16:49:18 | [b (line 46): false] ...-- | Conditions.cs:49:22:49:22 | [b (line 46): false] 0 |
-| Conditions.cs:49:16:49:18 | [b (line 46): true] ...-- | Conditions.cs:49:22:49:22 | [b (line 46): true] 0 |
 | Conditions.cs:49:16:49:22 | ... > ... | Conditions.cs:50:9:53:9 | {...} |
 | Conditions.cs:49:16:49:22 | ... > ... | Conditions.cs:54:16:54:16 | access to local variable y |
-| Conditions.cs:49:16:49:22 | [b (line 46): false] ... > ... | Conditions.cs:50:9:53:9 | [b (line 46): false] {...} |
-| Conditions.cs:49:16:49:22 | [b (line 46): true] ... > ... | Conditions.cs:50:9:53:9 | [b (line 46): true] {...} |
 | Conditions.cs:49:22:49:22 | 0 | Conditions.cs:49:16:49:22 | ... > ... |
-| Conditions.cs:49:22:49:22 | [b (line 46): false] 0 | Conditions.cs:49:16:49:22 | [b (line 46): false] ... > ... |
-| Conditions.cs:49:22:49:22 | [b (line 46): true] 0 | Conditions.cs:49:16:49:22 | [b (line 46): true] ... > ... |
-| Conditions.cs:50:9:53:9 | [b (line 46): false] {...} | Conditions.cs:51:13:52:20 | [b (line 46): false] if (...) ... |
-| Conditions.cs:50:9:53:9 | [b (line 46): true] {...} | Conditions.cs:51:13:52:20 | [b (line 46): true] if (...) ... |
 | Conditions.cs:50:9:53:9 | {...} | Conditions.cs:51:13:52:20 | if (...) ... |
-| Conditions.cs:51:13:52:20 | [b (line 46): false] if (...) ... | Conditions.cs:51:17:51:17 | [b (line 46): false] access to parameter b |
-| Conditions.cs:51:13:52:20 | [b (line 46): true] if (...) ... | Conditions.cs:51:17:51:17 | [b (line 46): true] access to parameter b |
 | Conditions.cs:51:13:52:20 | if (...) ... | Conditions.cs:51:17:51:17 | access to parameter b |
-| Conditions.cs:51:17:51:17 | access to parameter b | Conditions.cs:49:16:49:16 | [b (line 46): false] access to parameter x |
-| Conditions.cs:51:17:51:17 | access to parameter b | Conditions.cs:52:17:52:20 | [b (line 46): true] ...; |
-| Conditions.cs:52:17:52:17 | [b (line 46): true] access to local variable y | Conditions.cs:52:17:52:19 | [b (line 46): true] ...++ |
-| Conditions.cs:52:17:52:19 | [b (line 46): true] ...++ | Conditions.cs:49:16:49:16 | [b (line 46): true] access to parameter x |
-| Conditions.cs:52:17:52:20 | [b (line 46): true] ...; | Conditions.cs:52:17:52:17 | [b (line 46): true] access to local variable y |
+| Conditions.cs:51:17:51:17 | access to parameter b | Conditions.cs:52:17:52:20 | ...; |
+| Conditions.cs:52:17:52:17 | access to local variable y | Conditions.cs:52:17:52:19 | ...++ |
+| Conditions.cs:52:17:52:20 | ...; | Conditions.cs:52:17:52:17 | access to local variable y |
 | Conditions.cs:54:9:54:17 | return ...; | Conditions.cs:46:9:46:10 | exit M4 (normal) |
 | Conditions.cs:54:16:54:16 | access to local variable y | Conditions.cs:54:9:54:17 | return ...; |
 | Conditions.cs:57:9:57:10 | enter M5 | Conditions.cs:58:5:68:5 | {...} |
@@ -1293,35 +1076,19 @@ dominance
 | Conditions.cs:59:13:59:17 | Int32 y = ... | Conditions.cs:60:9:64:9 | while (...) ... |
 | Conditions.cs:59:17:59:17 | 0 | Conditions.cs:59:13:59:17 | Int32 y = ... |
 | Conditions.cs:60:9:64:9 | while (...) ... | Conditions.cs:60:16:60:16 | access to parameter x |
-| Conditions.cs:60:16:60:16 | [b (line 57): false] access to parameter x | Conditions.cs:60:16:60:18 | [b (line 57): false] ...-- |
-| Conditions.cs:60:16:60:16 | [b (line 57): true] access to parameter x | Conditions.cs:60:16:60:18 | [b (line 57): true] ...-- |
 | Conditions.cs:60:16:60:16 | access to parameter x | Conditions.cs:60:16:60:18 | ...-- |
 | Conditions.cs:60:16:60:18 | ...-- | Conditions.cs:60:22:60:22 | 0 |
-| Conditions.cs:60:16:60:18 | [b (line 57): false] ...-- | Conditions.cs:60:22:60:22 | [b (line 57): false] 0 |
-| Conditions.cs:60:16:60:18 | [b (line 57): true] ...-- | Conditions.cs:60:22:60:22 | [b (line 57): true] 0 |
 | Conditions.cs:60:16:60:22 | ... > ... | Conditions.cs:61:9:64:9 | {...} |
 | Conditions.cs:60:16:60:22 | ... > ... | Conditions.cs:65:9:66:16 | if (...) ... |
-| Conditions.cs:60:16:60:22 | [b (line 57): false] ... > ... | Conditions.cs:61:9:64:9 | [b (line 57): false] {...} |
-| Conditions.cs:60:16:60:22 | [b (line 57): false] ... > ... | Conditions.cs:65:9:66:16 | [b (line 57): false] if (...) ... |
-| Conditions.cs:60:16:60:22 | [b (line 57): true] ... > ... | Conditions.cs:61:9:64:9 | [b (line 57): true] {...} |
-| Conditions.cs:60:16:60:22 | [b (line 57): true] ... > ... | Conditions.cs:65:9:66:16 | [b (line 57): true] if (...) ... |
 | Conditions.cs:60:22:60:22 | 0 | Conditions.cs:60:16:60:22 | ... > ... |
-| Conditions.cs:60:22:60:22 | [b (line 57): false] 0 | Conditions.cs:60:16:60:22 | [b (line 57): false] ... > ... |
-| Conditions.cs:60:22:60:22 | [b (line 57): true] 0 | Conditions.cs:60:16:60:22 | [b (line 57): true] ... > ... |
-| Conditions.cs:61:9:64:9 | [b (line 57): false] {...} | Conditions.cs:62:13:63:20 | [b (line 57): false] if (...) ... |
-| Conditions.cs:61:9:64:9 | [b (line 57): true] {...} | Conditions.cs:62:13:63:20 | [b (line 57): true] if (...) ... |
 | Conditions.cs:61:9:64:9 | {...} | Conditions.cs:62:13:63:20 | if (...) ... |
-| Conditions.cs:62:13:63:20 | [b (line 57): false] if (...) ... | Conditions.cs:62:17:62:17 | [b (line 57): false] access to parameter b |
-| Conditions.cs:62:13:63:20 | [b (line 57): true] if (...) ... | Conditions.cs:62:17:62:17 | [b (line 57): true] access to parameter b |
 | Conditions.cs:62:13:63:20 | if (...) ... | Conditions.cs:62:17:62:17 | access to parameter b |
-| Conditions.cs:62:17:62:17 | access to parameter b | Conditions.cs:60:16:60:16 | [b (line 57): false] access to parameter x |
-| Conditions.cs:62:17:62:17 | access to parameter b | Conditions.cs:63:17:63:20 | [b (line 57): true] ...; |
-| Conditions.cs:63:17:63:17 | [b (line 57): true] access to local variable y | Conditions.cs:63:17:63:19 | [b (line 57): true] ...++ |
-| Conditions.cs:63:17:63:19 | [b (line 57): true] ...++ | Conditions.cs:60:16:60:16 | [b (line 57): true] access to parameter x |
-| Conditions.cs:63:17:63:20 | [b (line 57): true] ...; | Conditions.cs:63:17:63:17 | [b (line 57): true] access to local variable y |
-| Conditions.cs:65:9:66:16 | [b (line 57): false] if (...) ... | Conditions.cs:65:13:65:13 | [b (line 57): false] access to parameter b |
-| Conditions.cs:65:9:66:16 | [b (line 57): true] if (...) ... | Conditions.cs:65:13:65:13 | [b (line 57): true] access to parameter b |
+| Conditions.cs:62:17:62:17 | access to parameter b | Conditions.cs:63:17:63:20 | ...; |
+| Conditions.cs:63:17:63:17 | access to local variable y | Conditions.cs:63:17:63:19 | ...++ |
+| Conditions.cs:63:17:63:20 | ...; | Conditions.cs:63:17:63:17 | access to local variable y |
 | Conditions.cs:65:9:66:16 | if (...) ... | Conditions.cs:65:13:65:13 | access to parameter b |
+| Conditions.cs:65:13:65:13 | access to parameter b | Conditions.cs:66:13:66:16 | ...; |
+| Conditions.cs:65:13:65:13 | access to parameter b | Conditions.cs:67:16:67:16 | access to local variable y |
 | Conditions.cs:66:13:66:13 | access to local variable y | Conditions.cs:66:13:66:15 | ...++ |
 | Conditions.cs:66:13:66:16 | ...; | Conditions.cs:66:13:66:13 | access to local variable y |
 | Conditions.cs:67:9:67:17 | return ...; | Conditions.cs:57:9:57:10 | exit M5 (normal) |
@@ -1404,28 +1171,22 @@ dominance
 | Conditions.cs:104:17:104:17 | access to parameter b | Conditions.cs:104:17:104:28 | call to method ToString |
 | Conditions.cs:104:17:104:28 | call to method ToString | Conditions.cs:104:13:104:28 | String x = ... |
 | Conditions.cs:105:9:106:20 | if (...) ... | Conditions.cs:105:13:105:13 | access to parameter b |
-| Conditions.cs:105:13:105:13 | access to parameter b | Conditions.cs:106:13:106:20 | [b (line 102): true] ...; |
-| Conditions.cs:105:13:105:13 | access to parameter b | Conditions.cs:107:9:109:24 | [b (line 102): false] if (...) ... |
-| Conditions.cs:106:13:106:13 | [b (line 102): true] access to local variable x | Conditions.cs:106:18:106:19 | [b (line 102): true] "" |
-| Conditions.cs:106:13:106:19 | [b (line 102): true] ... + ... | Conditions.cs:106:13:106:19 | [b (line 102): true] ... = ... |
-| Conditions.cs:106:13:106:19 | [b (line 102): true] ... = ... | Conditions.cs:107:9:109:24 | [b (line 102): true] if (...) ... |
-| Conditions.cs:106:13:106:20 | [b (line 102): true] ...; | Conditions.cs:106:13:106:13 | [b (line 102): true] access to local variable x |
-| Conditions.cs:106:18:106:19 | [b (line 102): true] "" | Conditions.cs:106:13:106:19 | [b (line 102): true] ... + ... |
-| Conditions.cs:107:9:109:24 | [b (line 102): false] if (...) ... | Conditions.cs:107:13:107:13 | [b (line 102): false] access to local variable x |
-| Conditions.cs:107:9:109:24 | [b (line 102): true] if (...) ... | Conditions.cs:107:13:107:13 | [b (line 102): true] access to local variable x |
-| Conditions.cs:107:13:107:13 | [b (line 102): false] access to local variable x | Conditions.cs:107:13:107:20 | [b (line 102): false] access to property Length |
-| Conditions.cs:107:13:107:13 | [b (line 102): true] access to local variable x | Conditions.cs:107:13:107:20 | [b (line 102): true] access to property Length |
-| Conditions.cs:107:13:107:20 | [b (line 102): false] access to property Length | Conditions.cs:107:24:107:24 | [b (line 102): false] 0 |
-| Conditions.cs:107:13:107:20 | [b (line 102): true] access to property Length | Conditions.cs:107:24:107:24 | [b (line 102): true] 0 |
-| Conditions.cs:107:13:107:24 | [b (line 102): false] ... > ... | Conditions.cs:108:13:109:24 | [b (line 102): false] if (...) ... |
-| Conditions.cs:107:13:107:24 | [b (line 102): true] ... > ... | Conditions.cs:108:13:109:24 | [b (line 102): true] if (...) ... |
-| Conditions.cs:107:24:107:24 | [b (line 102): false] 0 | Conditions.cs:107:13:107:24 | [b (line 102): false] ... > ... |
-| Conditions.cs:107:24:107:24 | [b (line 102): true] 0 | Conditions.cs:107:13:107:24 | [b (line 102): true] ... > ... |
-| Conditions.cs:108:13:109:24 | [b (line 102): false] if (...) ... | Conditions.cs:108:18:108:18 | [b (line 102): false] access to parameter b |
-| Conditions.cs:108:13:109:24 | [b (line 102): true] if (...) ... | Conditions.cs:108:18:108:18 | [b (line 102): true] access to parameter b |
+| Conditions.cs:105:13:105:13 | access to parameter b | Conditions.cs:106:13:106:20 | ...; |
+| Conditions.cs:105:13:105:13 | access to parameter b | Conditions.cs:107:9:109:24 | if (...) ... |
+| Conditions.cs:106:13:106:13 | access to local variable x | Conditions.cs:106:18:106:19 | "" |
+| Conditions.cs:106:13:106:19 | ... + ... | Conditions.cs:106:13:106:19 | ... = ... |
+| Conditions.cs:106:13:106:20 | ...; | Conditions.cs:106:13:106:13 | access to local variable x |
+| Conditions.cs:106:18:106:19 | "" | Conditions.cs:106:13:106:19 | ... + ... |
+| Conditions.cs:107:9:109:24 | if (...) ... | Conditions.cs:107:13:107:13 | access to local variable x |
+| Conditions.cs:107:13:107:13 | access to local variable x | Conditions.cs:107:13:107:20 | access to property Length |
+| Conditions.cs:107:13:107:20 | access to property Length | Conditions.cs:107:24:107:24 | 0 |
+| Conditions.cs:107:13:107:24 | ... > ... | Conditions.cs:108:13:109:24 | if (...) ... |
+| Conditions.cs:107:13:107:24 | ... > ... | Conditions.cs:110:16:110:16 | access to local variable x |
+| Conditions.cs:107:24:107:24 | 0 | Conditions.cs:107:13:107:24 | ... > ... |
+| Conditions.cs:108:13:109:24 | if (...) ... | Conditions.cs:108:18:108:18 | access to parameter b |
 | Conditions.cs:108:17:108:18 | [true] !... | Conditions.cs:109:17:109:24 | ...; |
-| Conditions.cs:108:18:108:18 | [b (line 102): false] access to parameter b | Conditions.cs:108:17:108:18 | [true] !... |
-| Conditions.cs:108:18:108:18 | [b (line 102): true] access to parameter b | Conditions.cs:108:17:108:18 | [false] !... |
+| Conditions.cs:108:18:108:18 | access to parameter b | Conditions.cs:108:17:108:18 | [false] !... |
+| Conditions.cs:108:18:108:18 | access to parameter b | Conditions.cs:108:17:108:18 | [true] !... |
 | Conditions.cs:109:17:109:17 | access to local variable x | Conditions.cs:109:22:109:23 | "" |
 | Conditions.cs:109:17:109:23 | ... + ... | Conditions.cs:109:17:109:23 | ... = ... |
 | Conditions.cs:109:17:109:24 | ...; | Conditions.cs:109:17:109:17 | access to local variable x |
@@ -1457,73 +1218,43 @@ dominance
 | Conditions.cs:118:29:118:43 | ... - ... | Conditions.cs:118:24:118:43 | ... == ... |
 | Conditions.cs:118:43:118:43 | 1 | Conditions.cs:118:29:118:43 | ... - ... |
 | Conditions.cs:119:13:120:23 | if (...) ... | Conditions.cs:119:18:119:21 | access to local variable last |
-| Conditions.cs:119:17:119:21 | [false, last (line 118): true] !... | Conditions.cs:121:13:122:25 | [last (line 118): true] if (...) ... |
-| Conditions.cs:119:17:119:21 | [true, last (line 118): false] !... | Conditions.cs:120:17:120:23 | [last (line 118): false] ...; |
-| Conditions.cs:119:18:119:21 | access to local variable last | Conditions.cs:119:17:119:21 | [false, last (line 118): true] !... |
-| Conditions.cs:119:18:119:21 | access to local variable last | Conditions.cs:119:17:119:21 | [true, last (line 118): false] !... |
-| Conditions.cs:120:17:120:22 | [last (line 118): false] ... = ... | Conditions.cs:121:13:122:25 | [last (line 118): false] if (...) ... |
-| Conditions.cs:120:17:120:23 | [last (line 118): false] ...; | Conditions.cs:120:21:120:22 | [last (line 118): false] "" |
-| Conditions.cs:120:21:120:22 | [last (line 118): false] "" | Conditions.cs:120:17:120:22 | [last (line 118): false] ... = ... |
-| Conditions.cs:121:13:122:25 | [last (line 118): false] if (...) ... | Conditions.cs:121:17:121:20 | [last (line 118): false] access to local variable last |
-| Conditions.cs:121:13:122:25 | [last (line 118): true] if (...) ... | Conditions.cs:121:17:121:20 | [last (line 118): true] access to local variable last |
-| Conditions.cs:121:17:121:20 | [last (line 118): true] access to local variable last | Conditions.cs:122:17:122:25 | ...; |
+| Conditions.cs:119:17:119:21 | [true] !... | Conditions.cs:120:17:120:23 | ...; |
+| Conditions.cs:119:18:119:21 | access to local variable last | Conditions.cs:119:17:119:21 | [false] !... |
+| Conditions.cs:119:18:119:21 | access to local variable last | Conditions.cs:119:17:119:21 | [true] !... |
+| Conditions.cs:120:17:120:23 | ...; | Conditions.cs:120:21:120:22 | "" |
+| Conditions.cs:120:21:120:22 | "" | Conditions.cs:120:17:120:22 | ... = ... |
+| Conditions.cs:121:13:122:25 | if (...) ... | Conditions.cs:121:17:121:20 | access to local variable last |
+| Conditions.cs:121:17:121:20 | access to local variable last | Conditions.cs:116:42:116:42 | access to local variable i |
+| Conditions.cs:121:17:121:20 | access to local variable last | Conditions.cs:122:17:122:25 | ...; |
 | Conditions.cs:122:17:122:25 | ...; | Conditions.cs:122:21:122:24 | null |
 | Conditions.cs:122:21:122:24 | null | Conditions.cs:122:17:122:24 | ... = ... |
 | Conditions.cs:129:10:129:12 | enter M10 | Conditions.cs:130:5:141:5 | {...} |
 | Conditions.cs:130:5:141:5 | {...} | Conditions.cs:131:9:140:9 | while (...) ... |
 | Conditions.cs:131:9:140:9 | while (...) ... | Conditions.cs:131:16:131:19 | true |
-| Conditions.cs:131:16:131:19 | [Field1 (line 129): false] true | Conditions.cs:132:9:140:9 | [Field1 (line 129): false] {...} |
-| Conditions.cs:131:16:131:19 | [Field1 (line 129): true, Field2 (line 129): false] true | Conditions.cs:132:9:140:9 | [Field1 (line 129): true, Field2 (line 129): false] {...} |
-| Conditions.cs:131:16:131:19 | [Field1 (line 129): true, Field2 (line 129): true] true | Conditions.cs:132:9:140:9 | [Field1 (line 129): true, Field2 (line 129): true] {...} |
 | Conditions.cs:131:16:131:19 | true | Conditions.cs:132:9:140:9 | {...} |
-| Conditions.cs:132:9:140:9 | [Field1 (line 129): false] {...} | Conditions.cs:133:13:139:13 | [Field1 (line 129): false] if (...) ... |
-| Conditions.cs:132:9:140:9 | [Field1 (line 129): true, Field2 (line 129): false] {...} | Conditions.cs:133:13:139:13 | [Field1 (line 129): true, Field2 (line 129): false] if (...) ... |
-| Conditions.cs:132:9:140:9 | [Field1 (line 129): true, Field2 (line 129): true] {...} | Conditions.cs:133:13:139:13 | [Field1 (line 129): true, Field2 (line 129): true] if (...) ... |
 | Conditions.cs:132:9:140:9 | {...} | Conditions.cs:133:13:139:13 | if (...) ... |
-| Conditions.cs:133:13:139:13 | [Field1 (line 129): false] if (...) ... | Conditions.cs:133:17:133:22 | [Field1 (line 129): false] this access |
-| Conditions.cs:133:13:139:13 | [Field1 (line 129): true, Field2 (line 129): false] if (...) ... | Conditions.cs:133:17:133:22 | [Field1 (line 129): true, Field2 (line 129): false] this access |
-| Conditions.cs:133:13:139:13 | [Field1 (line 129): true, Field2 (line 129): true] if (...) ... | Conditions.cs:133:17:133:22 | [Field1 (line 129): true, Field2 (line 129): true] this access |
 | Conditions.cs:133:13:139:13 | if (...) ... | Conditions.cs:133:17:133:22 | this access |
-| Conditions.cs:133:17:133:22 | [Field1 (line 129): false] this access | Conditions.cs:133:17:133:22 | [Field1 (line 129): false] access to field Field1 |
-| Conditions.cs:133:17:133:22 | [Field1 (line 129): true, Field2 (line 129): false] access to field Field1 | Conditions.cs:134:13:139:13 | [Field1 (line 129): true, Field2 (line 129): false] {...} |
-| Conditions.cs:133:17:133:22 | [Field1 (line 129): true, Field2 (line 129): false] this access | Conditions.cs:133:17:133:22 | [Field1 (line 129): true, Field2 (line 129): false] access to field Field1 |
-| Conditions.cs:133:17:133:22 | [Field1 (line 129): true, Field2 (line 129): true] access to field Field1 | Conditions.cs:134:13:139:13 | [Field1 (line 129): true, Field2 (line 129): true] {...} |
-| Conditions.cs:133:17:133:22 | [Field1 (line 129): true, Field2 (line 129): true] this access | Conditions.cs:133:17:133:22 | [Field1 (line 129): true, Field2 (line 129): true] access to field Field1 |
-| Conditions.cs:133:17:133:22 | access to field Field1 | Conditions.cs:131:16:131:19 | [Field1 (line 129): false] true |
-| Conditions.cs:133:17:133:22 | access to field Field1 | Conditions.cs:134:13:139:13 | [Field1 (line 129): true] {...} |
+| Conditions.cs:133:17:133:22 | access to field Field1 | Conditions.cs:134:13:139:13 | {...} |
 | Conditions.cs:133:17:133:22 | this access | Conditions.cs:133:17:133:22 | access to field Field1 |
-| Conditions.cs:134:13:139:13 | [Field1 (line 129): true, Field2 (line 129): false] {...} | Conditions.cs:135:17:138:17 | [Field1 (line 129): true, Field2 (line 129): false] if (...) ... |
-| Conditions.cs:134:13:139:13 | [Field1 (line 129): true, Field2 (line 129): true] {...} | Conditions.cs:135:17:138:17 | [Field1 (line 129): true, Field2 (line 129): true] if (...) ... |
-| Conditions.cs:134:13:139:13 | [Field1 (line 129): true] {...} | Conditions.cs:135:17:138:17 | [Field1 (line 129): true] if (...) ... |
-| Conditions.cs:135:17:138:17 | [Field1 (line 129): true, Field2 (line 129): false] if (...) ... | Conditions.cs:135:21:135:26 | [Field1 (line 129): true, Field2 (line 129): false] this access |
-| Conditions.cs:135:17:138:17 | [Field1 (line 129): true, Field2 (line 129): true] if (...) ... | Conditions.cs:135:21:135:26 | [Field1 (line 129): true, Field2 (line 129): true] this access |
-| Conditions.cs:135:17:138:17 | [Field1 (line 129): true] if (...) ... | Conditions.cs:135:21:135:26 | [Field1 (line 129): true] this access |
-| Conditions.cs:135:21:135:26 | [Field1 (line 129): true, Field2 (line 129): false] this access | Conditions.cs:135:21:135:26 | [Field1 (line 129): true, Field2 (line 129): false] access to field Field2 |
-| Conditions.cs:135:21:135:26 | [Field1 (line 129): true, Field2 (line 129): true] this access | Conditions.cs:135:21:135:26 | [Field1 (line 129): true, Field2 (line 129): true] access to field Field2 |
-| Conditions.cs:135:21:135:26 | [Field1 (line 129): true] access to field Field2 | Conditions.cs:131:16:131:19 | [Field1 (line 129): true, Field2 (line 129): false] true |
-| Conditions.cs:135:21:135:26 | [Field1 (line 129): true] access to field Field2 | Conditions.cs:136:17:138:17 | [Field1 (line 129): true, Field2 (line 129): true] {...} |
-| Conditions.cs:135:21:135:26 | [Field1 (line 129): true] this access | Conditions.cs:135:21:135:26 | [Field1 (line 129): true] access to field Field2 |
-| Conditions.cs:136:17:138:17 | [Field1 (line 129): true, Field2 (line 129): true] {...} | Conditions.cs:137:21:137:38 | [Field1 (line 129): true, Field2 (line 129): true] ...; |
-| Conditions.cs:137:21:137:26 | [Field1 (line 129): true, Field2 (line 129): true] access to field Field1 | Conditions.cs:137:21:137:37 | [Field1 (line 129): true, Field2 (line 129): true] call to method ToString |
-| Conditions.cs:137:21:137:26 | [Field1 (line 129): true, Field2 (line 129): true] this access | Conditions.cs:137:21:137:26 | [Field1 (line 129): true, Field2 (line 129): true] access to field Field1 |
-| Conditions.cs:137:21:137:37 | [Field1 (line 129): true, Field2 (line 129): true] call to method ToString | Conditions.cs:131:16:131:19 | [Field1 (line 129): true, Field2 (line 129): true] true |
-| Conditions.cs:137:21:137:38 | [Field1 (line 129): true, Field2 (line 129): true] ...; | Conditions.cs:137:21:137:26 | [Field1 (line 129): true, Field2 (line 129): true] this access |
+| Conditions.cs:134:13:139:13 | {...} | Conditions.cs:135:17:138:17 | if (...) ... |
+| Conditions.cs:135:17:138:17 | if (...) ... | Conditions.cs:135:21:135:26 | this access |
+| Conditions.cs:135:21:135:26 | access to field Field2 | Conditions.cs:136:17:138:17 | {...} |
+| Conditions.cs:135:21:135:26 | this access | Conditions.cs:135:21:135:26 | access to field Field2 |
+| Conditions.cs:136:17:138:17 | {...} | Conditions.cs:137:21:137:38 | ...; |
+| Conditions.cs:137:21:137:26 | access to field Field1 | Conditions.cs:137:21:137:37 | call to method ToString |
+| Conditions.cs:137:21:137:26 | this access | Conditions.cs:137:21:137:26 | access to field Field1 |
+| Conditions.cs:137:21:137:38 | ...; | Conditions.cs:137:21:137:26 | this access |
 | Conditions.cs:143:10:143:12 | enter M11 | Conditions.cs:144:5:150:5 | {...} |
 | Conditions.cs:143:10:143:12 | exit M11 (normal) | Conditions.cs:143:10:143:12 | exit M11 |
 | Conditions.cs:144:5:150:5 | {...} | Conditions.cs:145:9:145:30 | ... ...; |
 | Conditions.cs:145:9:145:30 | ... ...; | Conditions.cs:145:17:145:17 | access to parameter b |
-| Conditions.cs:145:13:145:29 | [b (line 143): false] String s = ... | Conditions.cs:146:9:149:49 | [b (line 143): false] if (...) ... |
-| Conditions.cs:145:13:145:29 | [b (line 143): true] String s = ... | Conditions.cs:146:9:149:49 | [b (line 143): true] if (...) ... |
-| Conditions.cs:145:17:145:17 | access to parameter b | Conditions.cs:145:21:145:23 | [b (line 143): true] "a" |
-| Conditions.cs:145:17:145:17 | access to parameter b | Conditions.cs:145:27:145:29 | [b (line 143): false] "b" |
-| Conditions.cs:145:17:145:29 | [b (line 143): false] ... ? ... : ... | Conditions.cs:145:13:145:29 | [b (line 143): false] String s = ... |
-| Conditions.cs:145:17:145:29 | [b (line 143): true] ... ? ... : ... | Conditions.cs:145:13:145:29 | [b (line 143): true] String s = ... |
-| Conditions.cs:145:21:145:23 | [b (line 143): true] "a" | Conditions.cs:145:17:145:29 | [b (line 143): true] ... ? ... : ... |
-| Conditions.cs:145:27:145:29 | [b (line 143): false] "b" | Conditions.cs:145:17:145:29 | [b (line 143): false] ... ? ... : ... |
-| Conditions.cs:146:9:149:49 | [b (line 143): false] if (...) ... | Conditions.cs:146:13:146:13 | [b (line 143): false] access to parameter b |
-| Conditions.cs:146:9:149:49 | [b (line 143): true] if (...) ... | Conditions.cs:146:13:146:13 | [b (line 143): true] access to parameter b |
-| Conditions.cs:146:13:146:13 | [b (line 143): false] access to parameter b | Conditions.cs:149:13:149:49 | ...; |
-| Conditions.cs:146:13:146:13 | [b (line 143): true] access to parameter b | Conditions.cs:147:13:147:49 | ...; |
+| Conditions.cs:145:13:145:29 | String s = ... | Conditions.cs:146:9:149:49 | if (...) ... |
+| Conditions.cs:145:17:145:17 | access to parameter b | Conditions.cs:145:21:145:23 | "a" |
+| Conditions.cs:145:17:145:17 | access to parameter b | Conditions.cs:145:27:145:29 | "b" |
+| Conditions.cs:145:17:145:29 | ... ? ... : ... | Conditions.cs:145:13:145:29 | String s = ... |
+| Conditions.cs:146:9:149:49 | if (...) ... | Conditions.cs:146:13:146:13 | access to parameter b |
+| Conditions.cs:146:13:146:13 | access to parameter b | Conditions.cs:147:13:147:49 | ...; |
+| Conditions.cs:146:13:146:13 | access to parameter b | Conditions.cs:149:13:149:49 | ...; |
 | Conditions.cs:147:13:147:49 | ...; | Conditions.cs:147:40:147:43 | "a = " |
 | Conditions.cs:147:38:147:47 | $"..." | Conditions.cs:147:13:147:48 | call to method WriteLine |
 | Conditions.cs:147:40:147:43 | "a = " | Conditions.cs:147:45:147:45 | access to local variable s |
@@ -1575,13 +1306,13 @@ dominance
 | ExitMethods.cs:39:5:52:5 | {...} | ExitMethods.cs:40:9:51:9 | try {...} ... |
 | ExitMethods.cs:40:9:51:9 | try {...} ... | ExitMethods.cs:41:9:43:9 | {...} |
 | ExitMethods.cs:41:9:43:9 | {...} | ExitMethods.cs:42:13:42:31 | ...; |
-| ExitMethods.cs:42:13:42:30 | call to method ErrorAlways | ExitMethods.cs:44:9:47:9 | [exception: ArgumentException] catch (...) {...} |
-| ExitMethods.cs:42:13:42:30 | call to method ErrorAlways | ExitMethods.cs:44:9:47:9 | [exception: Exception] catch (...) {...} |
+| ExitMethods.cs:42:13:42:30 | call to method ErrorAlways | ExitMethods.cs:44:9:47:9 | catch (...) {...} |
 | ExitMethods.cs:42:13:42:31 | ...; | ExitMethods.cs:42:25:42:29 | false |
 | ExitMethods.cs:42:25:42:29 | false | ExitMethods.cs:42:13:42:30 | call to method ErrorAlways |
-| ExitMethods.cs:44:9:47:9 | [exception: Exception] catch (...) {...} | ExitMethods.cs:48:9:51:9 | [exception: Exception] catch (...) {...} |
+| ExitMethods.cs:44:9:47:9 | catch (...) {...} | ExitMethods.cs:45:9:47:9 | {...} |
+| ExitMethods.cs:44:9:47:9 | catch (...) {...} | ExitMethods.cs:48:9:51:9 | catch (...) {...} |
 | ExitMethods.cs:45:9:47:9 | {...} | ExitMethods.cs:46:13:46:19 | return ...; |
-| ExitMethods.cs:48:9:51:9 | [exception: Exception] catch (...) {...} | ExitMethods.cs:49:9:51:9 | {...} |
+| ExitMethods.cs:48:9:51:9 | catch (...) {...} | ExitMethods.cs:49:9:51:9 | {...} |
 | ExitMethods.cs:49:9:51:9 | {...} | ExitMethods.cs:50:13:50:19 | return ...; |
 | ExitMethods.cs:54:10:54:11 | enter M7 | ExitMethods.cs:55:5:58:5 | {...} |
 | ExitMethods.cs:54:10:54:11 | exit M7 (abnormal) | ExitMethods.cs:54:10:54:11 | exit M7 |
@@ -1665,9 +1396,9 @@ dominance
 | ExitMethods.cs:120:17:120:32 | enter FailingAssertion | ExitMethods.cs:121:5:124:5 | {...} |
 | ExitMethods.cs:120:17:120:32 | exit FailingAssertion (abnormal) | ExitMethods.cs:120:17:120:32 | exit FailingAssertion |
 | ExitMethods.cs:121:5:124:5 | {...} | ExitMethods.cs:122:9:122:29 | ...; |
-| ExitMethods.cs:122:9:122:28 | [assertion failure] call to method IsTrue | ExitMethods.cs:120:17:120:32 | exit FailingAssertion (abnormal) |
+| ExitMethods.cs:122:9:122:28 | call to method IsTrue | ExitMethods.cs:120:17:120:32 | exit FailingAssertion (abnormal) |
 | ExitMethods.cs:122:9:122:29 | ...; | ExitMethods.cs:122:23:122:27 | false |
-| ExitMethods.cs:122:23:122:27 | false | ExitMethods.cs:122:9:122:28 | [assertion failure] call to method IsTrue |
+| ExitMethods.cs:122:23:122:27 | false | ExitMethods.cs:122:9:122:28 | call to method IsTrue |
 | ExitMethods.cs:126:17:126:33 | enter FailingAssertion2 | ExitMethods.cs:127:5:130:5 | {...} |
 | ExitMethods.cs:126:17:126:33 | exit FailingAssertion2 (abnormal) | ExitMethods.cs:126:17:126:33 | exit FailingAssertion2 |
 | ExitMethods.cs:127:5:130:5 | {...} | ExitMethods.cs:128:9:128:27 | ...; |
@@ -1675,17 +1406,16 @@ dominance
 | ExitMethods.cs:128:9:128:26 | this access | ExitMethods.cs:128:9:128:26 | call to method FailingAssertion |
 | ExitMethods.cs:128:9:128:27 | ...; | ExitMethods.cs:128:9:128:26 | this access |
 | ExitMethods.cs:132:10:132:20 | enter AssertFalse | ExitMethods.cs:132:48:132:48 | access to parameter b |
-| ExitMethods.cs:132:33:132:49 | [assertion failure] call to method IsFalse | ExitMethods.cs:132:10:132:20 | exit AssertFalse (abnormal) |
-| ExitMethods.cs:132:33:132:49 | [assertion success] call to method IsFalse | ExitMethods.cs:132:10:132:20 | exit AssertFalse (normal) |
-| ExitMethods.cs:132:48:132:48 | access to parameter b | ExitMethods.cs:132:33:132:49 | [assertion failure] call to method IsFalse |
-| ExitMethods.cs:132:48:132:48 | access to parameter b | ExitMethods.cs:132:33:132:49 | [assertion success] call to method IsFalse |
+| ExitMethods.cs:132:33:132:49 | call to method IsFalse | ExitMethods.cs:132:10:132:20 | exit AssertFalse (abnormal) |
+| ExitMethods.cs:132:33:132:49 | call to method IsFalse | ExitMethods.cs:132:10:132:20 | exit AssertFalse (normal) |
+| ExitMethods.cs:132:48:132:48 | access to parameter b | ExitMethods.cs:132:33:132:49 | call to method IsFalse |
 | ExitMethods.cs:134:17:134:33 | enter FailingAssertion3 | ExitMethods.cs:135:5:138:5 | {...} |
 | ExitMethods.cs:134:17:134:33 | exit FailingAssertion3 (abnormal) | ExitMethods.cs:134:17:134:33 | exit FailingAssertion3 |
 | ExitMethods.cs:135:5:138:5 | {...} | ExitMethods.cs:136:9:136:26 | ...; |
-| ExitMethods.cs:136:9:136:25 | [assertion failure] call to method AssertFalse | ExitMethods.cs:134:17:134:33 | exit FailingAssertion3 (abnormal) |
+| ExitMethods.cs:136:9:136:25 | call to method AssertFalse | ExitMethods.cs:134:17:134:33 | exit FailingAssertion3 (abnormal) |
 | ExitMethods.cs:136:9:136:25 | this access | ExitMethods.cs:136:21:136:24 | true |
 | ExitMethods.cs:136:9:136:26 | ...; | ExitMethods.cs:136:9:136:25 | this access |
-| ExitMethods.cs:136:21:136:24 | true | ExitMethods.cs:136:9:136:25 | [assertion failure] call to method AssertFalse |
+| ExitMethods.cs:136:21:136:24 | true | ExitMethods.cs:136:9:136:25 | call to method AssertFalse |
 | ExitMethods.cs:140:17:140:42 | enter ExceptionDispatchInfoThrow | ExitMethods.cs:141:5:147:5 | {...} |
 | ExitMethods.cs:140:17:140:42 | exit ExceptionDispatchInfoThrow (abnormal) | ExitMethods.cs:140:17:140:42 | exit ExceptionDispatchInfoThrow |
 | ExitMethods.cs:141:5:147:5 | {...} | ExitMethods.cs:142:9:145:53 | if (...) ... |
@@ -1741,95 +1471,72 @@ dominance
 | Finally.cs:8:5:17:5 | {...} | Finally.cs:9:9:16:9 | try {...} ... |
 | Finally.cs:9:9:16:9 | try {...} ... | Finally.cs:10:9:12:9 | {...} |
 | Finally.cs:10:9:12:9 | {...} | Finally.cs:11:13:11:38 | ...; |
-| Finally.cs:11:13:11:37 | call to method WriteLine | Finally.cs:14:9:16:9 | [finally: exception(Exception)] {...} |
 | Finally.cs:11:13:11:37 | call to method WriteLine | Finally.cs:14:9:16:9 | {...} |
 | Finally.cs:11:13:11:38 | ...; | Finally.cs:11:31:11:36 | "Try1" |
 | Finally.cs:11:31:11:36 | "Try1" | Finally.cs:11:13:11:37 | call to method WriteLine |
-| Finally.cs:14:9:16:9 | [finally: exception(Exception)] {...} | Finally.cs:15:13:15:41 | [finally: exception(Exception)] ...; |
 | Finally.cs:14:9:16:9 | {...} | Finally.cs:15:13:15:41 | ...; |
-| Finally.cs:15:13:15:40 | [finally: exception(Exception)] call to method WriteLine | Finally.cs:7:10:7:11 | exit M1 (abnormal) |
+| Finally.cs:15:13:15:40 | call to method WriteLine | Finally.cs:7:10:7:11 | exit M1 (abnormal) |
 | Finally.cs:15:13:15:40 | call to method WriteLine | Finally.cs:7:10:7:11 | exit M1 (normal) |
 | Finally.cs:15:13:15:41 | ...; | Finally.cs:15:31:15:39 | "Finally" |
-| Finally.cs:15:13:15:41 | [finally: exception(Exception)] ...; | Finally.cs:15:31:15:39 | [finally: exception(Exception)] "Finally" |
 | Finally.cs:15:31:15:39 | "Finally" | Finally.cs:15:13:15:40 | call to method WriteLine |
-| Finally.cs:15:31:15:39 | [finally: exception(Exception)] "Finally" | Finally.cs:15:13:15:40 | [finally: exception(Exception)] call to method WriteLine |
 | Finally.cs:19:10:19:11 | enter M2 | Finally.cs:20:5:52:5 | {...} |
 | Finally.cs:20:5:52:5 | {...} | Finally.cs:21:9:51:9 | try {...} ... |
 | Finally.cs:21:9:51:9 | try {...} ... | Finally.cs:22:9:25:9 | {...} |
 | Finally.cs:22:9:25:9 | {...} | Finally.cs:23:13:23:38 | ...; |
 | Finally.cs:23:13:23:37 | call to method WriteLine | Finally.cs:24:13:24:19 | return ...; |
-| Finally.cs:23:13:23:37 | call to method WriteLine | Finally.cs:26:9:29:9 | [exception: Exception] catch (...) {...} |
+| Finally.cs:23:13:23:37 | call to method WriteLine | Finally.cs:26:9:29:9 | catch (...) {...} |
 | Finally.cs:23:13:23:38 | ...; | Finally.cs:23:31:23:36 | "Try2" |
 | Finally.cs:23:31:23:36 | "Try2" | Finally.cs:23:13:23:37 | call to method WriteLine |
-| Finally.cs:24:13:24:19 | return ...; | Finally.cs:49:9:51:9 | [finally: return] {...} |
-| Finally.cs:26:9:29:9 | [exception: Exception] catch (...) {...} | Finally.cs:26:38:26:39 | [exception: Exception] IOException ex |
-| Finally.cs:26:9:29:9 | [exception: Exception] catch (...) {...} | Finally.cs:30:9:40:9 | [exception: Exception] catch (...) {...} |
-| Finally.cs:26:38:26:39 | [exception: Exception] IOException ex | Finally.cs:26:48:26:51 | [exception: Exception] true |
-| Finally.cs:26:48:26:51 | [exception: Exception] true | Finally.cs:27:9:29:9 | {...} |
+| Finally.cs:26:9:29:9 | catch (...) {...} | Finally.cs:26:38:26:39 | IOException ex |
+| Finally.cs:26:9:29:9 | catch (...) {...} | Finally.cs:30:9:40:9 | catch (...) {...} |
+| Finally.cs:26:38:26:39 | IOException ex | Finally.cs:26:48:26:51 | true |
+| Finally.cs:26:48:26:51 | true | Finally.cs:27:9:29:9 | {...} |
 | Finally.cs:27:9:29:9 | {...} | Finally.cs:28:13:28:18 | throw ...; |
-| Finally.cs:28:13:28:18 | throw ...; | Finally.cs:49:9:51:9 | [finally: exception(IOException)] {...} |
-| Finally.cs:30:9:40:9 | [exception: Exception] catch (...) {...} | Finally.cs:30:41:30:42 | [exception: Exception] ArgumentException ex |
-| Finally.cs:30:9:40:9 | [exception: Exception] catch (...) {...} | Finally.cs:41:9:43:9 | [exception: Exception] catch (...) {...} |
-| Finally.cs:30:41:30:42 | [exception: Exception] ArgumentException ex | Finally.cs:31:9:40:9 | {...} |
+| Finally.cs:30:9:40:9 | catch (...) {...} | Finally.cs:30:41:30:42 | ArgumentException ex |
+| Finally.cs:30:9:40:9 | catch (...) {...} | Finally.cs:41:9:43:9 | catch (...) {...} |
+| Finally.cs:30:41:30:42 | ArgumentException ex | Finally.cs:31:9:40:9 | {...} |
 | Finally.cs:31:9:40:9 | {...} | Finally.cs:32:13:39:13 | try {...} ... |
 | Finally.cs:32:13:39:13 | try {...} ... | Finally.cs:33:13:35:13 | {...} |
 | Finally.cs:33:13:35:13 | {...} | Finally.cs:34:17:34:32 | if (...) ... |
 | Finally.cs:34:17:34:32 | if (...) ... | Finally.cs:34:21:34:24 | true |
 | Finally.cs:34:21:34:24 | true | Finally.cs:34:27:34:32 | throw ...; |
-| Finally.cs:34:27:34:32 | throw ...; | Finally.cs:37:13:39:13 | [finally: exception(ArgumentException)] {...} |
-| Finally.cs:37:13:39:13 | [finally: exception(ArgumentException)] {...} | Finally.cs:38:37:38:42 | [finally: exception(ArgumentException)] "Boo!" |
-| Finally.cs:38:17:38:44 | [finally: exception(ArgumentException)] throw ...; | Finally.cs:49:9:51:9 | [finally: exception(Exception)] {...} |
-| Finally.cs:38:23:38:43 | [finally: exception(ArgumentException)] object creation of type Exception | Finally.cs:38:17:38:44 | [finally: exception(ArgumentException)] throw ...; |
-| Finally.cs:38:37:38:42 | [finally: exception(ArgumentException)] "Boo!" | Finally.cs:38:23:38:43 | [finally: exception(ArgumentException)] object creation of type Exception |
-| Finally.cs:41:9:43:9 | [exception: Exception] catch (...) {...} | Finally.cs:42:9:43:9 | {...} |
-| Finally.cs:42:9:43:9 | {...} | Finally.cs:49:9:51:9 | {...} |
-| Finally.cs:49:9:51:9 | [finally: exception(Exception)] {...} | Finally.cs:50:13:50:41 | [finally: exception(Exception)] ...; |
-| Finally.cs:49:9:51:9 | [finally: exception(IOException)] {...} | Finally.cs:50:13:50:41 | [finally: exception(IOException)] ...; |
-| Finally.cs:49:9:51:9 | [finally: return] {...} | Finally.cs:50:13:50:41 | [finally: return] ...; |
+| Finally.cs:34:27:34:32 | throw ...; | Finally.cs:37:13:39:13 | {...} |
+| Finally.cs:37:13:39:13 | {...} | Finally.cs:38:37:38:42 | "Boo!" |
+| Finally.cs:38:23:38:43 | object creation of type Exception | Finally.cs:38:17:38:44 | throw ...; |
+| Finally.cs:38:37:38:42 | "Boo!" | Finally.cs:38:23:38:43 | object creation of type Exception |
+| Finally.cs:41:9:43:9 | catch (...) {...} | Finally.cs:42:9:43:9 | {...} |
+| Finally.cs:41:9:43:9 | catch (...) {...} | Finally.cs:44:9:47:9 | catch {...} |
+| Finally.cs:44:9:47:9 | catch {...} | Finally.cs:45:9:47:9 | {...} |
+| Finally.cs:45:9:47:9 | {...} | Finally.cs:46:13:46:19 | return ...; |
 | Finally.cs:49:9:51:9 | {...} | Finally.cs:50:13:50:41 | ...; |
+| Finally.cs:50:13:50:40 | call to method WriteLine | Finally.cs:19:10:19:11 | exit M2 (abnormal) |
+| Finally.cs:50:13:50:40 | call to method WriteLine | Finally.cs:19:10:19:11 | exit M2 (normal) |
 | Finally.cs:50:13:50:41 | ...; | Finally.cs:50:31:50:39 | "Finally" |
-| Finally.cs:50:13:50:41 | [finally: exception(Exception)] ...; | Finally.cs:50:31:50:39 | [finally: exception(Exception)] "Finally" |
-| Finally.cs:50:13:50:41 | [finally: exception(IOException)] ...; | Finally.cs:50:31:50:39 | [finally: exception(IOException)] "Finally" |
-| Finally.cs:50:13:50:41 | [finally: return] ...; | Finally.cs:50:31:50:39 | [finally: return] "Finally" |
 | Finally.cs:50:31:50:39 | "Finally" | Finally.cs:50:13:50:40 | call to method WriteLine |
-| Finally.cs:50:31:50:39 | [finally: exception(Exception)] "Finally" | Finally.cs:50:13:50:40 | [finally: exception(Exception)] call to method WriteLine |
-| Finally.cs:50:31:50:39 | [finally: exception(IOException)] "Finally" | Finally.cs:50:13:50:40 | [finally: exception(IOException)] call to method WriteLine |
-| Finally.cs:50:31:50:39 | [finally: return] "Finally" | Finally.cs:50:13:50:40 | [finally: return] call to method WriteLine |
 | Finally.cs:54:10:54:11 | enter M3 | Finally.cs:55:5:72:5 | {...} |
 | Finally.cs:55:5:72:5 | {...} | Finally.cs:56:9:71:9 | try {...} ... |
 | Finally.cs:56:9:71:9 | try {...} ... | Finally.cs:57:9:60:9 | {...} |
 | Finally.cs:57:9:60:9 | {...} | Finally.cs:58:13:58:38 | ...; |
 | Finally.cs:58:13:58:37 | call to method WriteLine | Finally.cs:59:13:59:19 | return ...; |
-| Finally.cs:58:13:58:37 | call to method WriteLine | Finally.cs:61:9:64:9 | [exception: Exception] catch (...) {...} |
+| Finally.cs:58:13:58:37 | call to method WriteLine | Finally.cs:61:9:64:9 | catch (...) {...} |
 | Finally.cs:58:13:58:38 | ...; | Finally.cs:58:31:58:36 | "Try3" |
 | Finally.cs:58:31:58:36 | "Try3" | Finally.cs:58:13:58:37 | call to method WriteLine |
-| Finally.cs:59:13:59:19 | return ...; | Finally.cs:69:9:71:9 | [finally: return] {...} |
-| Finally.cs:61:9:64:9 | [exception: Exception] catch (...) {...} | Finally.cs:61:38:61:39 | [exception: Exception] IOException ex |
-| Finally.cs:61:9:64:9 | [exception: Exception] catch (...) {...} | Finally.cs:65:9:67:9 | [exception: Exception] catch (...) {...} |
-| Finally.cs:61:38:61:39 | [exception: Exception] IOException ex | Finally.cs:61:48:61:51 | [exception: Exception] true |
-| Finally.cs:61:48:61:51 | [exception: Exception] true | Finally.cs:62:9:64:9 | {...} |
+| Finally.cs:61:9:64:9 | catch (...) {...} | Finally.cs:61:38:61:39 | IOException ex |
+| Finally.cs:61:9:64:9 | catch (...) {...} | Finally.cs:65:9:67:9 | catch (...) {...} |
+| Finally.cs:61:38:61:39 | IOException ex | Finally.cs:61:48:61:51 | true |
+| Finally.cs:61:48:61:51 | true | Finally.cs:62:9:64:9 | {...} |
 | Finally.cs:62:9:64:9 | {...} | Finally.cs:63:13:63:18 | throw ...; |
-| Finally.cs:63:13:63:18 | throw ...; | Finally.cs:69:9:71:9 | [finally: exception(IOException)] {...} |
-| Finally.cs:65:9:67:9 | [exception: Exception] catch (...) {...} | Finally.cs:65:26:65:26 | [exception: Exception] Exception e |
-| Finally.cs:65:26:65:26 | [exception: Exception] Exception e | Finally.cs:65:35:65:35 | [exception: Exception] access to local variable e |
-| Finally.cs:65:35:65:35 | [exception: Exception] access to local variable e | Finally.cs:65:35:65:43 | [exception: Exception] access to property Message |
-| Finally.cs:65:35:65:43 | [exception: Exception] access to property Message | Finally.cs:65:48:65:51 | [exception: Exception] null |
-| Finally.cs:65:35:65:51 | [exception: Exception] ... != ... | Finally.cs:66:9:67:9 | {...} |
-| Finally.cs:65:35:65:51 | [exception: Exception] ... != ... | Finally.cs:69:9:71:9 | [finally: exception(Exception)] {...} |
-| Finally.cs:65:48:65:51 | [exception: Exception] null | Finally.cs:65:35:65:51 | [exception: Exception] ... != ... |
-| Finally.cs:66:9:67:9 | {...} | Finally.cs:69:9:71:9 | {...} |
-| Finally.cs:69:9:71:9 | [finally: exception(Exception)] {...} | Finally.cs:70:13:70:41 | [finally: exception(Exception)] ...; |
-| Finally.cs:69:9:71:9 | [finally: exception(IOException)] {...} | Finally.cs:70:13:70:41 | [finally: exception(IOException)] ...; |
-| Finally.cs:69:9:71:9 | [finally: return] {...} | Finally.cs:70:13:70:41 | [finally: return] ...; |
+| Finally.cs:65:9:67:9 | catch (...) {...} | Finally.cs:65:26:65:26 | Exception e |
+| Finally.cs:65:26:65:26 | Exception e | Finally.cs:65:35:65:35 | access to local variable e |
+| Finally.cs:65:35:65:35 | access to local variable e | Finally.cs:65:35:65:43 | access to property Message |
+| Finally.cs:65:35:65:43 | access to property Message | Finally.cs:65:48:65:51 | null |
+| Finally.cs:65:35:65:51 | ... != ... | Finally.cs:66:9:67:9 | {...} |
+| Finally.cs:65:48:65:51 | null | Finally.cs:65:35:65:51 | ... != ... |
 | Finally.cs:69:9:71:9 | {...} | Finally.cs:70:13:70:41 | ...; |
+| Finally.cs:70:13:70:40 | call to method WriteLine | Finally.cs:54:10:54:11 | exit M3 (abnormal) |
+| Finally.cs:70:13:70:40 | call to method WriteLine | Finally.cs:54:10:54:11 | exit M3 (normal) |
 | Finally.cs:70:13:70:41 | ...; | Finally.cs:70:31:70:39 | "Finally" |
-| Finally.cs:70:13:70:41 | [finally: exception(Exception)] ...; | Finally.cs:70:31:70:39 | [finally: exception(Exception)] "Finally" |
-| Finally.cs:70:13:70:41 | [finally: exception(IOException)] ...; | Finally.cs:70:31:70:39 | [finally: exception(IOException)] "Finally" |
-| Finally.cs:70:13:70:41 | [finally: return] ...; | Finally.cs:70:31:70:39 | [finally: return] "Finally" |
 | Finally.cs:70:31:70:39 | "Finally" | Finally.cs:70:13:70:40 | call to method WriteLine |
-| Finally.cs:70:31:70:39 | [finally: exception(Exception)] "Finally" | Finally.cs:70:13:70:40 | [finally: exception(Exception)] call to method WriteLine |
-| Finally.cs:70:31:70:39 | [finally: exception(IOException)] "Finally" | Finally.cs:70:13:70:40 | [finally: exception(IOException)] call to method WriteLine |
-| Finally.cs:70:31:70:39 | [finally: return] "Finally" | Finally.cs:70:13:70:40 | [finally: return] call to method WriteLine |
 | Finally.cs:74:10:74:11 | enter M4 | Finally.cs:75:5:101:5 | {...} |
 | Finally.cs:75:5:101:5 | {...} | Finally.cs:76:9:76:19 | ... ...; |
 | Finally.cs:76:9:76:19 | ... ...; | Finally.cs:76:17:76:18 | 10 |
@@ -1848,206 +1555,69 @@ dominance
 | Finally.cs:81:21:81:26 | ... == ... | Finally.cs:82:21:82:27 | return ...; |
 | Finally.cs:81:21:81:26 | ... == ... | Finally.cs:83:17:84:29 | if (...) ... |
 | Finally.cs:81:26:81:26 | 0 | Finally.cs:81:21:81:26 | ... == ... |
-| Finally.cs:82:21:82:27 | return ...; | Finally.cs:89:13:99:13 | [finally: return] {...} |
 | Finally.cs:83:17:84:29 | if (...) ... | Finally.cs:83:21:83:21 | access to local variable i |
 | Finally.cs:83:21:83:21 | access to local variable i | Finally.cs:83:26:83:26 | 1 |
 | Finally.cs:83:21:83:26 | ... == ... | Finally.cs:84:21:84:29 | continue; |
 | Finally.cs:83:21:83:26 | ... == ... | Finally.cs:85:17:86:26 | if (...) ... |
 | Finally.cs:83:26:83:26 | 1 | Finally.cs:83:21:83:26 | ... == ... |
-| Finally.cs:84:21:84:29 | continue; | Finally.cs:89:13:99:13 | [finally: continue] {...} |
 | Finally.cs:85:17:86:26 | if (...) ... | Finally.cs:85:21:85:21 | access to local variable i |
 | Finally.cs:85:21:85:21 | access to local variable i | Finally.cs:85:26:85:26 | 2 |
 | Finally.cs:85:21:85:26 | ... == ... | Finally.cs:86:21:86:26 | break; |
-| Finally.cs:85:21:85:26 | ... == ... | Finally.cs:89:13:99:13 | {...} |
 | Finally.cs:85:26:85:26 | 2 | Finally.cs:85:21:85:26 | ... == ... |
-| Finally.cs:86:21:86:26 | break; | Finally.cs:89:13:99:13 | [finally: break] {...} |
-| Finally.cs:89:13:99:13 | [finally: break] {...} | Finally.cs:90:17:98:17 | [finally: break] try {...} ... |
-| Finally.cs:89:13:99:13 | [finally: continue] {...} | Finally.cs:90:17:98:17 | [finally: continue] try {...} ... |
-| Finally.cs:89:13:99:13 | [finally: return] {...} | Finally.cs:90:17:98:17 | [finally: return] try {...} ... |
 | Finally.cs:89:13:99:13 | {...} | Finally.cs:90:17:98:17 | try {...} ... |
-| Finally.cs:90:17:98:17 | [finally: break] try {...} ... | Finally.cs:91:17:94:17 | [finally: break] {...} |
-| Finally.cs:90:17:98:17 | [finally: continue] try {...} ... | Finally.cs:91:17:94:17 | [finally: continue] {...} |
-| Finally.cs:90:17:98:17 | [finally: return] try {...} ... | Finally.cs:91:17:94:17 | [finally: return] {...} |
 | Finally.cs:90:17:98:17 | try {...} ... | Finally.cs:91:17:94:17 | {...} |
-| Finally.cs:91:17:94:17 | [finally: break] {...} | Finally.cs:92:21:93:46 | [finally: break] if (...) ... |
-| Finally.cs:91:17:94:17 | [finally: continue] {...} | Finally.cs:92:21:93:46 | [finally: continue] if (...) ... |
-| Finally.cs:91:17:94:17 | [finally: return] {...} | Finally.cs:92:21:93:46 | [finally: return] if (...) ... |
 | Finally.cs:91:17:94:17 | {...} | Finally.cs:92:21:93:46 | if (...) ... |
-| Finally.cs:92:21:93:46 | [finally: break] if (...) ... | Finally.cs:92:25:92:25 | [finally: break] access to local variable i |
-| Finally.cs:92:21:93:46 | [finally: continue] if (...) ... | Finally.cs:92:25:92:25 | [finally: continue] access to local variable i |
-| Finally.cs:92:21:93:46 | [finally: return] if (...) ... | Finally.cs:92:25:92:25 | [finally: return] access to local variable i |
 | Finally.cs:92:21:93:46 | if (...) ... | Finally.cs:92:25:92:25 | access to local variable i |
-| Finally.cs:92:25:92:25 | [finally: break] access to local variable i | Finally.cs:92:30:92:30 | [finally: break] 3 |
-| Finally.cs:92:25:92:25 | [finally: continue] access to local variable i | Finally.cs:92:30:92:30 | [finally: continue] 3 |
-| Finally.cs:92:25:92:25 | [finally: return] access to local variable i | Finally.cs:92:30:92:30 | [finally: return] 3 |
 | Finally.cs:92:25:92:25 | access to local variable i | Finally.cs:92:30:92:30 | 3 |
 | Finally.cs:92:25:92:30 | ... == ... | Finally.cs:93:31:93:45 | object creation of type Exception |
 | Finally.cs:92:25:92:30 | ... == ... | Finally.cs:96:17:98:17 | {...} |
-| Finally.cs:92:25:92:30 | [finally: break] ... == ... | Finally.cs:93:31:93:45 | [finally: break] object creation of type Exception |
-| Finally.cs:92:25:92:30 | [finally: break] ... == ... | Finally.cs:96:17:98:17 | [finally: break] {...} |
-| Finally.cs:92:25:92:30 | [finally: continue] ... == ... | Finally.cs:93:31:93:45 | [finally: continue] object creation of type Exception |
-| Finally.cs:92:25:92:30 | [finally: continue] ... == ... | Finally.cs:96:17:98:17 | [finally: continue] {...} |
-| Finally.cs:92:25:92:30 | [finally: return] ... == ... | Finally.cs:93:31:93:45 | [finally: return] object creation of type Exception |
-| Finally.cs:92:25:92:30 | [finally: return] ... == ... | Finally.cs:96:17:98:17 | [finally: return] {...} |
 | Finally.cs:92:30:92:30 | 3 | Finally.cs:92:25:92:30 | ... == ... |
-| Finally.cs:92:30:92:30 | [finally: break] 3 | Finally.cs:92:25:92:30 | [finally: break] ... == ... |
-| Finally.cs:92:30:92:30 | [finally: continue] 3 | Finally.cs:92:25:92:30 | [finally: continue] ... == ... |
-| Finally.cs:92:30:92:30 | [finally: return] 3 | Finally.cs:92:25:92:30 | [finally: return] ... == ... |
-| Finally.cs:93:31:93:45 | [finally: break] object creation of type Exception | Finally.cs:93:25:93:46 | [finally: break] throw ...; |
-| Finally.cs:93:31:93:45 | [finally: break] object creation of type Exception | Finally.cs:96:17:98:17 | [finally: break, finally(1): exception(Exception)] {...} |
-| Finally.cs:93:31:93:45 | [finally: continue] object creation of type Exception | Finally.cs:93:25:93:46 | [finally: continue] throw ...; |
-| Finally.cs:93:31:93:45 | [finally: continue] object creation of type Exception | Finally.cs:96:17:98:17 | [finally: continue, finally(1): exception(Exception)] {...} |
-| Finally.cs:93:31:93:45 | [finally: return] object creation of type Exception | Finally.cs:93:25:93:46 | [finally: return] throw ...; |
-| Finally.cs:93:31:93:45 | [finally: return] object creation of type Exception | Finally.cs:96:17:98:17 | [finally: return, finally(1): exception(Exception)] {...} |
 | Finally.cs:93:31:93:45 | object creation of type Exception | Finally.cs:93:25:93:46 | throw ...; |
-| Finally.cs:93:31:93:45 | object creation of type Exception | Finally.cs:96:17:98:17 | [finally(1): exception(Exception)] {...} |
-| Finally.cs:96:17:98:17 | [finally(1): exception(Exception)] {...} | Finally.cs:97:21:97:24 | [finally(1): exception(Exception)] ...; |
-| Finally.cs:96:17:98:17 | [finally: break, finally(1): exception(Exception)] {...} | Finally.cs:97:21:97:24 | [finally: break, finally(1): exception(Exception)] ...; |
-| Finally.cs:96:17:98:17 | [finally: break] {...} | Finally.cs:97:21:97:24 | [finally: break] ...; |
-| Finally.cs:96:17:98:17 | [finally: continue, finally(1): exception(Exception)] {...} | Finally.cs:97:21:97:24 | [finally: continue, finally(1): exception(Exception)] ...; |
-| Finally.cs:96:17:98:17 | [finally: continue] {...} | Finally.cs:97:21:97:24 | [finally: continue] ...; |
-| Finally.cs:96:17:98:17 | [finally: return, finally(1): exception(Exception)] {...} | Finally.cs:97:21:97:24 | [finally: return, finally(1): exception(Exception)] ...; |
-| Finally.cs:96:17:98:17 | [finally: return] {...} | Finally.cs:97:21:97:24 | [finally: return] ...; |
 | Finally.cs:96:17:98:17 | {...} | Finally.cs:97:21:97:24 | ...; |
-| Finally.cs:97:21:97:21 | [finally(1): exception(Exception)] access to local variable i | Finally.cs:97:21:97:23 | [finally(1): exception(Exception)] ...-- |
-| Finally.cs:97:21:97:21 | [finally: break, finally(1): exception(Exception)] access to local variable i | Finally.cs:97:21:97:23 | [finally: break, finally(1): exception(Exception)] ...-- |
-| Finally.cs:97:21:97:21 | [finally: break] access to local variable i | Finally.cs:97:21:97:23 | [finally: break] ...-- |
-| Finally.cs:97:21:97:21 | [finally: continue, finally(1): exception(Exception)] access to local variable i | Finally.cs:97:21:97:23 | [finally: continue, finally(1): exception(Exception)] ...-- |
-| Finally.cs:97:21:97:21 | [finally: continue] access to local variable i | Finally.cs:97:21:97:23 | [finally: continue] ...-- |
-| Finally.cs:97:21:97:21 | [finally: return, finally(1): exception(Exception)] access to local variable i | Finally.cs:97:21:97:23 | [finally: return, finally(1): exception(Exception)] ...-- |
-| Finally.cs:97:21:97:21 | [finally: return] access to local variable i | Finally.cs:97:21:97:23 | [finally: return] ...-- |
 | Finally.cs:97:21:97:21 | access to local variable i | Finally.cs:97:21:97:23 | ...-- |
+| Finally.cs:97:21:97:23 | ...-- | Finally.cs:74:10:74:11 | exit M4 (abnormal) |
 | Finally.cs:97:21:97:24 | ...; | Finally.cs:97:21:97:21 | access to local variable i |
-| Finally.cs:97:21:97:24 | [finally(1): exception(Exception)] ...; | Finally.cs:97:21:97:21 | [finally(1): exception(Exception)] access to local variable i |
-| Finally.cs:97:21:97:24 | [finally: break, finally(1): exception(Exception)] ...; | Finally.cs:97:21:97:21 | [finally: break, finally(1): exception(Exception)] access to local variable i |
-| Finally.cs:97:21:97:24 | [finally: break] ...; | Finally.cs:97:21:97:21 | [finally: break] access to local variable i |
-| Finally.cs:97:21:97:24 | [finally: continue, finally(1): exception(Exception)] ...; | Finally.cs:97:21:97:21 | [finally: continue, finally(1): exception(Exception)] access to local variable i |
-| Finally.cs:97:21:97:24 | [finally: continue] ...; | Finally.cs:97:21:97:21 | [finally: continue] access to local variable i |
-| Finally.cs:97:21:97:24 | [finally: return, finally(1): exception(Exception)] ...; | Finally.cs:97:21:97:21 | [finally: return, finally(1): exception(Exception)] access to local variable i |
-| Finally.cs:97:21:97:24 | [finally: return] ...; | Finally.cs:97:21:97:21 | [finally: return] access to local variable i |
 | Finally.cs:103:10:103:11 | enter M5 | Finally.cs:104:5:119:5 | {...} |
 | Finally.cs:104:5:119:5 | {...} | Finally.cs:105:9:118:9 | try {...} ... |
 | Finally.cs:105:9:118:9 | try {...} ... | Finally.cs:106:9:111:9 | {...} |
 | Finally.cs:106:9:111:9 | {...} | Finally.cs:107:13:108:23 | if (...) ... |
 | Finally.cs:107:13:108:23 | if (...) ... | Finally.cs:107:17:107:21 | this access |
 | Finally.cs:107:17:107:21 | access to field Field | Finally.cs:107:17:107:28 | access to property Length |
-| Finally.cs:107:17:107:21 | access to field Field | Finally.cs:113:9:118:9 | [finally: exception(NullReferenceException)] {...} |
+| Finally.cs:107:17:107:21 | access to field Field | Finally.cs:113:9:118:9 | {...} |
 | Finally.cs:107:17:107:21 | this access | Finally.cs:107:17:107:21 | access to field Field |
 | Finally.cs:107:17:107:28 | access to property Length | Finally.cs:107:33:107:33 | 0 |
-| Finally.cs:107:17:107:28 | access to property Length | Finally.cs:113:9:118:9 | [finally: exception(Exception)] {...} |
 | Finally.cs:107:17:107:33 | ... == ... | Finally.cs:108:17:108:23 | return ...; |
 | Finally.cs:107:17:107:33 | ... == ... | Finally.cs:109:13:110:49 | if (...) ... |
 | Finally.cs:107:33:107:33 | 0 | Finally.cs:107:17:107:33 | ... == ... |
-| Finally.cs:108:17:108:23 | return ...; | Finally.cs:113:9:118:9 | [finally: return] {...} |
 | Finally.cs:109:13:110:49 | if (...) ... | Finally.cs:109:17:109:21 | this access |
 | Finally.cs:109:17:109:21 | access to field Field | Finally.cs:109:17:109:28 | access to property Length |
 | Finally.cs:109:17:109:21 | this access | Finally.cs:109:17:109:21 | access to field Field |
 | Finally.cs:109:17:109:28 | access to property Length | Finally.cs:109:33:109:33 | 1 |
 | Finally.cs:109:17:109:33 | ... == ... | Finally.cs:110:23:110:48 | object creation of type OutOfMemoryException |
-| Finally.cs:109:17:109:33 | ... == ... | Finally.cs:113:9:118:9 | {...} |
 | Finally.cs:109:33:109:33 | 1 | Finally.cs:109:17:109:33 | ... == ... |
-| Finally.cs:110:17:110:49 | throw ...; | Finally.cs:113:9:118:9 | [finally: exception(OutOfMemoryException)] {...} |
 | Finally.cs:110:23:110:48 | object creation of type OutOfMemoryException | Finally.cs:110:17:110:49 | throw ...; |
-| Finally.cs:113:9:118:9 | [finally: exception(Exception)] {...} | Finally.cs:114:13:115:41 | [finally: exception(Exception)] if (...) ... |
-| Finally.cs:113:9:118:9 | [finally: exception(NullReferenceException)] {...} | Finally.cs:114:13:115:41 | [finally: exception(NullReferenceException)] if (...) ... |
-| Finally.cs:113:9:118:9 | [finally: exception(OutOfMemoryException)] {...} | Finally.cs:114:13:115:41 | [finally: exception(OutOfMemoryException)] if (...) ... |
-| Finally.cs:113:9:118:9 | [finally: return] {...} | Finally.cs:114:13:115:41 | [finally: return] if (...) ... |
 | Finally.cs:113:9:118:9 | {...} | Finally.cs:114:13:115:41 | if (...) ... |
-| Finally.cs:114:13:115:41 | [finally: exception(Exception)] if (...) ... | Finally.cs:114:19:114:23 | [finally: exception(Exception)] this access |
-| Finally.cs:114:13:115:41 | [finally: exception(NullReferenceException)] if (...) ... | Finally.cs:114:19:114:23 | [finally: exception(NullReferenceException)] this access |
-| Finally.cs:114:13:115:41 | [finally: exception(OutOfMemoryException)] if (...) ... | Finally.cs:114:19:114:23 | [finally: exception(OutOfMemoryException)] this access |
-| Finally.cs:114:13:115:41 | [finally: return] if (...) ... | Finally.cs:114:19:114:23 | [finally: return] this access |
 | Finally.cs:114:13:115:41 | if (...) ... | Finally.cs:114:19:114:23 | this access |
-| Finally.cs:114:17:114:36 | [true, finally: exception(Exception)] !... | Finally.cs:115:17:115:41 | [finally: exception(Exception)] ...; |
-| Finally.cs:114:17:114:36 | [true, finally: exception(NullReferenceException)] !... | Finally.cs:115:17:115:41 | [finally: exception(NullReferenceException)] ...; |
-| Finally.cs:114:17:114:36 | [true, finally: exception(OutOfMemoryException)] !... | Finally.cs:115:17:115:41 | [finally: exception(OutOfMemoryException)] ...; |
-| Finally.cs:114:17:114:36 | [true, finally: return] !... | Finally.cs:115:17:115:41 | [finally: return] ...; |
 | Finally.cs:114:17:114:36 | [true] !... | Finally.cs:115:17:115:41 | ...; |
-| Finally.cs:114:19:114:23 | [finally: exception(Exception)] access to field Field | Finally.cs:114:19:114:30 | [finally: exception(Exception)] access to property Length |
-| Finally.cs:114:19:114:23 | [finally: exception(Exception)] this access | Finally.cs:114:19:114:23 | [finally: exception(Exception)] access to field Field |
-| Finally.cs:114:19:114:23 | [finally: exception(NullReferenceException)] access to field Field | Finally.cs:114:19:114:30 | [finally: exception(NullReferenceException)] access to property Length |
-| Finally.cs:114:19:114:23 | [finally: exception(NullReferenceException)] this access | Finally.cs:114:19:114:23 | [finally: exception(NullReferenceException)] access to field Field |
-| Finally.cs:114:19:114:23 | [finally: exception(OutOfMemoryException)] access to field Field | Finally.cs:114:19:114:30 | [finally: exception(OutOfMemoryException)] access to property Length |
-| Finally.cs:114:19:114:23 | [finally: exception(OutOfMemoryException)] this access | Finally.cs:114:19:114:23 | [finally: exception(OutOfMemoryException)] access to field Field |
-| Finally.cs:114:19:114:23 | [finally: return] access to field Field | Finally.cs:114:19:114:30 | [finally: return] access to property Length |
-| Finally.cs:114:19:114:23 | [finally: return] this access | Finally.cs:114:19:114:23 | [finally: return] access to field Field |
 | Finally.cs:114:19:114:23 | access to field Field | Finally.cs:114:19:114:30 | access to property Length |
 | Finally.cs:114:19:114:23 | this access | Finally.cs:114:19:114:23 | access to field Field |
-| Finally.cs:114:19:114:30 | [finally: exception(Exception)] access to property Length | Finally.cs:114:35:114:35 | [finally: exception(Exception)] 0 |
-| Finally.cs:114:19:114:30 | [finally: exception(NullReferenceException)] access to property Length | Finally.cs:114:35:114:35 | [finally: exception(NullReferenceException)] 0 |
-| Finally.cs:114:19:114:30 | [finally: exception(OutOfMemoryException)] access to property Length | Finally.cs:114:35:114:35 | [finally: exception(OutOfMemoryException)] 0 |
-| Finally.cs:114:19:114:30 | [finally: return] access to property Length | Finally.cs:114:35:114:35 | [finally: return] 0 |
 | Finally.cs:114:19:114:30 | access to property Length | Finally.cs:114:35:114:35 | 0 |
 | Finally.cs:114:19:114:35 | ... == ... | Finally.cs:114:17:114:36 | [false] !... |
 | Finally.cs:114:19:114:35 | ... == ... | Finally.cs:114:17:114:36 | [true] !... |
-| Finally.cs:114:19:114:35 | [finally: exception(Exception)] ... == ... | Finally.cs:114:17:114:36 | [false, finally: exception(Exception)] !... |
-| Finally.cs:114:19:114:35 | [finally: exception(Exception)] ... == ... | Finally.cs:114:17:114:36 | [true, finally: exception(Exception)] !... |
-| Finally.cs:114:19:114:35 | [finally: exception(NullReferenceException)] ... == ... | Finally.cs:114:17:114:36 | [false, finally: exception(NullReferenceException)] !... |
-| Finally.cs:114:19:114:35 | [finally: exception(NullReferenceException)] ... == ... | Finally.cs:114:17:114:36 | [true, finally: exception(NullReferenceException)] !... |
-| Finally.cs:114:19:114:35 | [finally: exception(OutOfMemoryException)] ... == ... | Finally.cs:114:17:114:36 | [false, finally: exception(OutOfMemoryException)] !... |
-| Finally.cs:114:19:114:35 | [finally: exception(OutOfMemoryException)] ... == ... | Finally.cs:114:17:114:36 | [true, finally: exception(OutOfMemoryException)] !... |
-| Finally.cs:114:19:114:35 | [finally: return] ... == ... | Finally.cs:114:17:114:36 | [false, finally: return] !... |
-| Finally.cs:114:19:114:35 | [finally: return] ... == ... | Finally.cs:114:17:114:36 | [true, finally: return] !... |
 | Finally.cs:114:35:114:35 | 0 | Finally.cs:114:19:114:35 | ... == ... |
-| Finally.cs:114:35:114:35 | [finally: exception(Exception)] 0 | Finally.cs:114:19:114:35 | [finally: exception(Exception)] ... == ... |
-| Finally.cs:114:35:114:35 | [finally: exception(NullReferenceException)] 0 | Finally.cs:114:19:114:35 | [finally: exception(NullReferenceException)] ... == ... |
-| Finally.cs:114:35:114:35 | [finally: exception(OutOfMemoryException)] 0 | Finally.cs:114:19:114:35 | [finally: exception(OutOfMemoryException)] ... == ... |
-| Finally.cs:114:35:114:35 | [finally: return] 0 | Finally.cs:114:19:114:35 | [finally: return] ... == ... |
 | Finally.cs:115:17:115:41 | ...; | Finally.cs:115:35:115:39 | this access |
-| Finally.cs:115:17:115:41 | [finally: exception(Exception)] ...; | Finally.cs:115:35:115:39 | [finally: exception(Exception)] this access |
-| Finally.cs:115:17:115:41 | [finally: exception(NullReferenceException)] ...; | Finally.cs:115:35:115:39 | [finally: exception(NullReferenceException)] this access |
-| Finally.cs:115:17:115:41 | [finally: exception(OutOfMemoryException)] ...; | Finally.cs:115:35:115:39 | [finally: exception(OutOfMemoryException)] this access |
-| Finally.cs:115:17:115:41 | [finally: return] ...; | Finally.cs:115:35:115:39 | [finally: return] this access |
-| Finally.cs:115:35:115:39 | [finally: exception(Exception)] access to field Field | Finally.cs:115:17:115:40 | [finally: exception(Exception)] call to method WriteLine |
-| Finally.cs:115:35:115:39 | [finally: exception(Exception)] this access | Finally.cs:115:35:115:39 | [finally: exception(Exception)] access to field Field |
-| Finally.cs:115:35:115:39 | [finally: exception(NullReferenceException)] access to field Field | Finally.cs:115:17:115:40 | [finally: exception(NullReferenceException)] call to method WriteLine |
-| Finally.cs:115:35:115:39 | [finally: exception(NullReferenceException)] this access | Finally.cs:115:35:115:39 | [finally: exception(NullReferenceException)] access to field Field |
-| Finally.cs:115:35:115:39 | [finally: exception(OutOfMemoryException)] access to field Field | Finally.cs:115:17:115:40 | [finally: exception(OutOfMemoryException)] call to method WriteLine |
-| Finally.cs:115:35:115:39 | [finally: exception(OutOfMemoryException)] this access | Finally.cs:115:35:115:39 | [finally: exception(OutOfMemoryException)] access to field Field |
-| Finally.cs:115:35:115:39 | [finally: return] access to field Field | Finally.cs:115:17:115:40 | [finally: return] call to method WriteLine |
-| Finally.cs:115:35:115:39 | [finally: return] this access | Finally.cs:115:35:115:39 | [finally: return] access to field Field |
 | Finally.cs:115:35:115:39 | access to field Field | Finally.cs:115:17:115:40 | call to method WriteLine |
 | Finally.cs:115:35:115:39 | this access | Finally.cs:115:35:115:39 | access to field Field |
-| Finally.cs:116:13:117:37 | [finally: exception(Exception)] if (...) ... | Finally.cs:116:17:116:21 | [finally: exception(Exception)] this access |
-| Finally.cs:116:13:117:37 | [finally: exception(NullReferenceException)] if (...) ... | Finally.cs:116:17:116:21 | [finally: exception(NullReferenceException)] this access |
-| Finally.cs:116:13:117:37 | [finally: exception(OutOfMemoryException)] if (...) ... | Finally.cs:116:17:116:21 | [finally: exception(OutOfMemoryException)] this access |
-| Finally.cs:116:13:117:37 | [finally: return] if (...) ... | Finally.cs:116:17:116:21 | [finally: return] this access |
 | Finally.cs:116:13:117:37 | if (...) ... | Finally.cs:116:17:116:21 | this access |
-| Finally.cs:116:17:116:21 | [finally: exception(Exception)] access to field Field | Finally.cs:116:17:116:28 | [finally: exception(Exception)] access to property Length |
-| Finally.cs:116:17:116:21 | [finally: exception(Exception)] this access | Finally.cs:116:17:116:21 | [finally: exception(Exception)] access to field Field |
-| Finally.cs:116:17:116:21 | [finally: exception(NullReferenceException)] access to field Field | Finally.cs:116:17:116:28 | [finally: exception(NullReferenceException)] access to property Length |
-| Finally.cs:116:17:116:21 | [finally: exception(NullReferenceException)] this access | Finally.cs:116:17:116:21 | [finally: exception(NullReferenceException)] access to field Field |
-| Finally.cs:116:17:116:21 | [finally: exception(OutOfMemoryException)] access to field Field | Finally.cs:116:17:116:28 | [finally: exception(OutOfMemoryException)] access to property Length |
-| Finally.cs:116:17:116:21 | [finally: exception(OutOfMemoryException)] this access | Finally.cs:116:17:116:21 | [finally: exception(OutOfMemoryException)] access to field Field |
-| Finally.cs:116:17:116:21 | [finally: return] access to field Field | Finally.cs:116:17:116:28 | [finally: return] access to property Length |
-| Finally.cs:116:17:116:21 | [finally: return] this access | Finally.cs:116:17:116:21 | [finally: return] access to field Field |
 | Finally.cs:116:17:116:21 | access to field Field | Finally.cs:116:17:116:28 | access to property Length |
 | Finally.cs:116:17:116:21 | this access | Finally.cs:116:17:116:21 | access to field Field |
-| Finally.cs:116:17:116:28 | [finally: exception(Exception)] access to property Length | Finally.cs:116:32:116:32 | [finally: exception(Exception)] 0 |
-| Finally.cs:116:17:116:28 | [finally: exception(NullReferenceException)] access to property Length | Finally.cs:116:32:116:32 | [finally: exception(NullReferenceException)] 0 |
-| Finally.cs:116:17:116:28 | [finally: exception(OutOfMemoryException)] access to property Length | Finally.cs:116:32:116:32 | [finally: exception(OutOfMemoryException)] 0 |
-| Finally.cs:116:17:116:28 | [finally: return] access to property Length | Finally.cs:116:32:116:32 | [finally: return] 0 |
 | Finally.cs:116:17:116:28 | access to property Length | Finally.cs:116:32:116:32 | 0 |
+| Finally.cs:116:17:116:32 | ... > ... | Finally.cs:103:10:103:11 | exit M5 (abnormal) |
+| Finally.cs:116:17:116:32 | ... > ... | Finally.cs:103:10:103:11 | exit M5 (normal) |
 | Finally.cs:116:17:116:32 | ... > ... | Finally.cs:117:17:117:37 | ...; |
-| Finally.cs:116:17:116:32 | [finally: exception(Exception)] ... > ... | Finally.cs:117:17:117:37 | [finally: exception(Exception)] ...; |
-| Finally.cs:116:17:116:32 | [finally: exception(NullReferenceException)] ... > ... | Finally.cs:117:17:117:37 | [finally: exception(NullReferenceException)] ...; |
-| Finally.cs:116:17:116:32 | [finally: exception(OutOfMemoryException)] ... > ... | Finally.cs:117:17:117:37 | [finally: exception(OutOfMemoryException)] ...; |
-| Finally.cs:116:17:116:32 | [finally: return] ... > ... | Finally.cs:117:17:117:37 | [finally: return] ...; |
 | Finally.cs:116:32:116:32 | 0 | Finally.cs:116:17:116:32 | ... > ... |
-| Finally.cs:116:32:116:32 | [finally: exception(Exception)] 0 | Finally.cs:116:17:116:32 | [finally: exception(Exception)] ... > ... |
-| Finally.cs:116:32:116:32 | [finally: exception(NullReferenceException)] 0 | Finally.cs:116:17:116:32 | [finally: exception(NullReferenceException)] ... > ... |
-| Finally.cs:116:32:116:32 | [finally: exception(OutOfMemoryException)] 0 | Finally.cs:116:17:116:32 | [finally: exception(OutOfMemoryException)] ... > ... |
-| Finally.cs:116:32:116:32 | [finally: return] 0 | Finally.cs:116:17:116:32 | [finally: return] ... > ... |
 | Finally.cs:117:17:117:37 | ...; | Finally.cs:117:35:117:35 | 1 |
-| Finally.cs:117:17:117:37 | [finally: exception(Exception)] ...; | Finally.cs:117:35:117:35 | [finally: exception(Exception)] 1 |
-| Finally.cs:117:17:117:37 | [finally: exception(NullReferenceException)] ...; | Finally.cs:117:35:117:35 | [finally: exception(NullReferenceException)] 1 |
-| Finally.cs:117:17:117:37 | [finally: exception(OutOfMemoryException)] ...; | Finally.cs:117:35:117:35 | [finally: exception(OutOfMemoryException)] 1 |
-| Finally.cs:117:17:117:37 | [finally: return] ...; | Finally.cs:117:35:117:35 | [finally: return] 1 |
 | Finally.cs:117:35:117:35 | 1 | Finally.cs:117:17:117:36 | call to method WriteLine |
-| Finally.cs:117:35:117:35 | [finally: exception(Exception)] 1 | Finally.cs:117:17:117:36 | [finally: exception(Exception)] call to method WriteLine |
-| Finally.cs:117:35:117:35 | [finally: exception(NullReferenceException)] 1 | Finally.cs:117:17:117:36 | [finally: exception(NullReferenceException)] call to method WriteLine |
-| Finally.cs:117:35:117:35 | [finally: exception(OutOfMemoryException)] 1 | Finally.cs:117:17:117:36 | [finally: exception(OutOfMemoryException)] call to method WriteLine |
-| Finally.cs:117:35:117:35 | [finally: return] 1 | Finally.cs:117:17:117:36 | [finally: return] call to method WriteLine |
 | Finally.cs:121:10:121:11 | enter M6 | Finally.cs:122:5:131:5 | {...} |
 | Finally.cs:121:10:121:11 | exit M6 (normal) | Finally.cs:121:10:121:11 | exit M6 |
 | Finally.cs:122:5:131:5 | {...} | Finally.cs:123:9:130:9 | try {...} ... |
@@ -2064,16 +1634,13 @@ dominance
 | Finally.cs:134:5:145:5 | {...} | Finally.cs:135:9:143:9 | try {...} ... |
 | Finally.cs:135:9:143:9 | try {...} ... | Finally.cs:136:9:138:9 | {...} |
 | Finally.cs:136:9:138:9 | {...} | Finally.cs:137:13:137:37 | ...; |
-| Finally.cs:137:13:137:36 | call to method WriteLine | Finally.cs:140:9:143:9 | [finally: exception(Exception)] {...} |
 | Finally.cs:137:13:137:36 | call to method WriteLine | Finally.cs:140:9:143:9 | {...} |
 | Finally.cs:137:13:137:37 | ...; | Finally.cs:137:31:137:35 | "Try" |
 | Finally.cs:137:31:137:35 | "Try" | Finally.cs:137:13:137:36 | call to method WriteLine |
-| Finally.cs:140:9:143:9 | [finally: exception(Exception)] {...} | Finally.cs:141:41:141:42 | [finally: exception(Exception)] "" |
 | Finally.cs:140:9:143:9 | {...} | Finally.cs:141:41:141:42 | "" |
-| Finally.cs:141:19:141:43 | [finally: exception(Exception)] object creation of type ArgumentException | Finally.cs:141:13:141:44 | [finally: exception(Exception)] throw ...; |
+| Finally.cs:141:13:141:44 | throw ...; | Finally.cs:133:10:133:11 | exit M7 (abnormal) |
 | Finally.cs:141:19:141:43 | object creation of type ArgumentException | Finally.cs:141:13:141:44 | throw ...; |
 | Finally.cs:141:41:141:42 | "" | Finally.cs:141:19:141:43 | object creation of type ArgumentException |
-| Finally.cs:141:41:141:42 | [finally: exception(Exception)] "" | Finally.cs:141:19:141:43 | [finally: exception(Exception)] object creation of type ArgumentException |
 | Finally.cs:147:10:147:11 | enter M8 | Finally.cs:148:5:170:5 | {...} |
 | Finally.cs:148:5:170:5 | {...} | Finally.cs:149:9:169:9 | try {...} ... |
 | Finally.cs:149:9:169:9 | try {...} ... | Finally.cs:150:9:153:9 | {...} |
@@ -2083,102 +1650,34 @@ dominance
 | Finally.cs:151:17:151:28 | ... == ... | Finally.cs:152:23:152:49 | object creation of type ArgumentNullException |
 | Finally.cs:151:17:151:28 | ... == ... | Finally.cs:155:9:169:9 | {...} |
 | Finally.cs:151:25:151:28 | null | Finally.cs:151:17:151:28 | ... == ... |
-| Finally.cs:152:17:152:50 | throw ...; | Finally.cs:155:9:169:9 | [finally: exception(ArgumentNullException)] {...} |
 | Finally.cs:152:23:152:49 | object creation of type ArgumentNullException | Finally.cs:152:17:152:50 | throw ...; |
-| Finally.cs:152:23:152:49 | object creation of type ArgumentNullException | Finally.cs:155:9:169:9 | [finally: exception(Exception)] {...} |
-| Finally.cs:155:9:169:9 | [finally: exception(ArgumentNullException)] {...} | Finally.cs:156:13:168:13 | [finally: exception(ArgumentNullException)] try {...} ... |
-| Finally.cs:155:9:169:9 | [finally: exception(Exception)] {...} | Finally.cs:156:13:168:13 | [finally: exception(Exception)] try {...} ... |
 | Finally.cs:155:9:169:9 | {...} | Finally.cs:156:13:168:13 | try {...} ... |
-| Finally.cs:156:13:168:13 | [finally: exception(ArgumentNullException)] try {...} ... | Finally.cs:157:13:160:13 | [finally: exception(ArgumentNullException)] {...} |
-| Finally.cs:156:13:168:13 | [finally: exception(Exception)] try {...} ... | Finally.cs:157:13:160:13 | [finally: exception(Exception)] {...} |
 | Finally.cs:156:13:168:13 | try {...} ... | Finally.cs:157:13:160:13 | {...} |
-| Finally.cs:157:13:160:13 | [finally: exception(ArgumentNullException)] {...} | Finally.cs:158:17:159:45 | [finally: exception(ArgumentNullException)] if (...) ... |
-| Finally.cs:157:13:160:13 | [finally: exception(Exception)] {...} | Finally.cs:158:17:159:45 | [finally: exception(Exception)] if (...) ... |
 | Finally.cs:157:13:160:13 | {...} | Finally.cs:158:17:159:45 | if (...) ... |
-| Finally.cs:158:17:159:45 | [finally: exception(ArgumentNullException)] if (...) ... | Finally.cs:158:21:158:24 | [finally: exception(ArgumentNullException)] access to parameter args |
-| Finally.cs:158:17:159:45 | [finally: exception(Exception)] if (...) ... | Finally.cs:158:21:158:24 | [finally: exception(Exception)] access to parameter args |
 | Finally.cs:158:17:159:45 | if (...) ... | Finally.cs:158:21:158:24 | access to parameter args |
-| Finally.cs:158:21:158:24 | [finally: exception(ArgumentNullException)] access to parameter args | Finally.cs:158:21:158:31 | [finally: exception(ArgumentNullException)] access to property Length |
-| Finally.cs:158:21:158:24 | [finally: exception(Exception)] access to parameter args | Finally.cs:158:21:158:31 | [finally: exception(Exception)] access to property Length |
 | Finally.cs:158:21:158:24 | access to parameter args | Finally.cs:158:21:158:31 | access to property Length |
-| Finally.cs:158:21:158:31 | [finally: exception(ArgumentNullException)] access to property Length | Finally.cs:158:36:158:36 | [finally: exception(ArgumentNullException)] 1 |
-| Finally.cs:158:21:158:31 | [finally: exception(ArgumentNullException)] access to property Length | Finally.cs:161:13:164:13 | [finally: exception(ArgumentNullException), exception: Exception] catch (...) {...} |
-| Finally.cs:158:21:158:31 | [finally: exception(ArgumentNullException)] access to property Length | Finally.cs:161:13:164:13 | [finally: exception(ArgumentNullException), exception: NullReferenceException] catch (...) {...} |
-| Finally.cs:158:21:158:31 | [finally: exception(Exception)] access to property Length | Finally.cs:158:36:158:36 | [finally: exception(Exception)] 1 |
-| Finally.cs:158:21:158:31 | [finally: exception(Exception)] access to property Length | Finally.cs:161:13:164:13 | [finally: exception(Exception), exception: Exception] catch (...) {...} |
-| Finally.cs:158:21:158:31 | [finally: exception(Exception)] access to property Length | Finally.cs:161:13:164:13 | [finally: exception(Exception), exception: NullReferenceException] catch (...) {...} |
 | Finally.cs:158:21:158:31 | access to property Length | Finally.cs:158:36:158:36 | 1 |
-| Finally.cs:158:21:158:31 | access to property Length | Finally.cs:161:13:164:13 | [exception: Exception] catch (...) {...} |
-| Finally.cs:158:21:158:31 | access to property Length | Finally.cs:161:13:164:13 | [exception: NullReferenceException] catch (...) {...} |
+| Finally.cs:158:21:158:31 | access to property Length | Finally.cs:161:13:164:13 | catch (...) {...} |
 | Finally.cs:158:21:158:36 | ... == ... | Finally.cs:159:41:159:43 | "1" |
-| Finally.cs:158:21:158:36 | [finally: exception(ArgumentNullException)] ... == ... | Finally.cs:159:41:159:43 | [finally: exception(ArgumentNullException)] "1" |
-| Finally.cs:158:21:158:36 | [finally: exception(Exception)] ... == ... | Finally.cs:159:41:159:43 | [finally: exception(Exception)] "1" |
 | Finally.cs:158:36:158:36 | 1 | Finally.cs:158:21:158:36 | ... == ... |
-| Finally.cs:158:36:158:36 | [finally: exception(ArgumentNullException)] 1 | Finally.cs:158:21:158:36 | [finally: exception(ArgumentNullException)] ... == ... |
-| Finally.cs:158:36:158:36 | [finally: exception(Exception)] 1 | Finally.cs:158:21:158:36 | [finally: exception(Exception)] ... == ... |
-| Finally.cs:159:27:159:44 | [finally: exception(ArgumentNullException)] object creation of type Exception | Finally.cs:159:21:159:45 | [finally: exception(ArgumentNullException)] throw ...; |
-| Finally.cs:159:27:159:44 | [finally: exception(Exception)] object creation of type Exception | Finally.cs:159:21:159:45 | [finally: exception(Exception)] throw ...; |
 | Finally.cs:159:27:159:44 | object creation of type Exception | Finally.cs:159:21:159:45 | throw ...; |
 | Finally.cs:159:41:159:43 | "1" | Finally.cs:159:27:159:44 | object creation of type Exception |
-| Finally.cs:159:41:159:43 | [finally: exception(ArgumentNullException)] "1" | Finally.cs:159:27:159:44 | [finally: exception(ArgumentNullException)] object creation of type Exception |
-| Finally.cs:159:41:159:43 | [finally: exception(Exception)] "1" | Finally.cs:159:27:159:44 | [finally: exception(Exception)] object creation of type Exception |
-| Finally.cs:161:13:164:13 | [exception: Exception] catch (...) {...} | Finally.cs:161:30:161:30 | [exception: Exception] Exception e |
-| Finally.cs:161:13:164:13 | [exception: NullReferenceException] catch (...) {...} | Finally.cs:161:30:161:30 | [exception: NullReferenceException] Exception e |
-| Finally.cs:161:13:164:13 | [finally: exception(ArgumentNullException), exception: Exception] catch (...) {...} | Finally.cs:161:30:161:30 | [finally: exception(ArgumentNullException), exception: Exception] Exception e |
-| Finally.cs:161:13:164:13 | [finally: exception(ArgumentNullException), exception: NullReferenceException] catch (...) {...} | Finally.cs:161:30:161:30 | [finally: exception(ArgumentNullException), exception: NullReferenceException] Exception e |
-| Finally.cs:161:13:164:13 | [finally: exception(Exception), exception: Exception] catch (...) {...} | Finally.cs:161:30:161:30 | [finally: exception(Exception), exception: Exception] Exception e |
-| Finally.cs:161:13:164:13 | [finally: exception(Exception), exception: NullReferenceException] catch (...) {...} | Finally.cs:161:30:161:30 | [finally: exception(Exception), exception: NullReferenceException] Exception e |
-| Finally.cs:161:30:161:30 | [exception: Exception] Exception e | Finally.cs:161:39:161:39 | [exception: Exception] access to local variable e |
-| Finally.cs:161:30:161:30 | [exception: NullReferenceException] Exception e | Finally.cs:161:39:161:39 | [exception: NullReferenceException] access to local variable e |
-| Finally.cs:161:30:161:30 | [finally: exception(ArgumentNullException), exception: Exception] Exception e | Finally.cs:161:39:161:39 | [finally: exception(ArgumentNullException), exception: Exception] access to local variable e |
-| Finally.cs:161:30:161:30 | [finally: exception(ArgumentNullException), exception: NullReferenceException] Exception e | Finally.cs:161:39:161:39 | [finally: exception(ArgumentNullException), exception: NullReferenceException] access to local variable e |
-| Finally.cs:161:30:161:30 | [finally: exception(Exception), exception: Exception] Exception e | Finally.cs:161:39:161:39 | [finally: exception(Exception), exception: Exception] access to local variable e |
-| Finally.cs:161:30:161:30 | [finally: exception(Exception), exception: NullReferenceException] Exception e | Finally.cs:161:39:161:39 | [finally: exception(Exception), exception: NullReferenceException] access to local variable e |
-| Finally.cs:161:39:161:39 | [exception: Exception] access to local variable e | Finally.cs:161:39:161:47 | [exception: Exception] access to property Message |
-| Finally.cs:161:39:161:39 | [exception: NullReferenceException] access to local variable e | Finally.cs:161:39:161:47 | [exception: NullReferenceException] access to property Message |
-| Finally.cs:161:39:161:39 | [finally: exception(ArgumentNullException), exception: Exception] access to local variable e | Finally.cs:161:39:161:47 | [finally: exception(ArgumentNullException), exception: Exception] access to property Message |
-| Finally.cs:161:39:161:39 | [finally: exception(ArgumentNullException), exception: NullReferenceException] access to local variable e | Finally.cs:161:39:161:47 | [finally: exception(ArgumentNullException), exception: NullReferenceException] access to property Message |
-| Finally.cs:161:39:161:39 | [finally: exception(Exception), exception: Exception] access to local variable e | Finally.cs:161:39:161:47 | [finally: exception(Exception), exception: Exception] access to property Message |
-| Finally.cs:161:39:161:39 | [finally: exception(Exception), exception: NullReferenceException] access to local variable e | Finally.cs:161:39:161:47 | [finally: exception(Exception), exception: NullReferenceException] access to property Message |
-| Finally.cs:161:39:161:47 | [exception: Exception] access to property Message | Finally.cs:161:52:161:54 | [exception: Exception] "1" |
-| Finally.cs:161:39:161:47 | [exception: NullReferenceException] access to property Message | Finally.cs:161:52:161:54 | [exception: NullReferenceException] "1" |
-| Finally.cs:161:39:161:47 | [finally: exception(ArgumentNullException), exception: Exception] access to property Message | Finally.cs:161:52:161:54 | [finally: exception(ArgumentNullException), exception: Exception] "1" |
-| Finally.cs:161:39:161:47 | [finally: exception(ArgumentNullException), exception: NullReferenceException] access to property Message | Finally.cs:161:52:161:54 | [finally: exception(ArgumentNullException), exception: NullReferenceException] "1" |
-| Finally.cs:161:39:161:47 | [finally: exception(Exception), exception: Exception] access to property Message | Finally.cs:161:52:161:54 | [finally: exception(Exception), exception: Exception] "1" |
-| Finally.cs:161:39:161:47 | [finally: exception(Exception), exception: NullReferenceException] access to property Message | Finally.cs:161:52:161:54 | [finally: exception(Exception), exception: NullReferenceException] "1" |
-| Finally.cs:161:52:161:54 | [exception: Exception] "1" | Finally.cs:161:39:161:54 | [exception: Exception] ... == ... |
-| Finally.cs:161:52:161:54 | [exception: NullReferenceException] "1" | Finally.cs:161:39:161:54 | [exception: NullReferenceException] ... == ... |
-| Finally.cs:161:52:161:54 | [finally: exception(ArgumentNullException), exception: Exception] "1" | Finally.cs:161:39:161:54 | [finally: exception(ArgumentNullException), exception: Exception] ... == ... |
-| Finally.cs:161:52:161:54 | [finally: exception(ArgumentNullException), exception: NullReferenceException] "1" | Finally.cs:161:39:161:54 | [finally: exception(ArgumentNullException), exception: NullReferenceException] ... == ... |
-| Finally.cs:161:52:161:54 | [finally: exception(Exception), exception: Exception] "1" | Finally.cs:161:39:161:54 | [finally: exception(Exception), exception: Exception] ... == ... |
-| Finally.cs:161:52:161:54 | [finally: exception(Exception), exception: NullReferenceException] "1" | Finally.cs:161:39:161:54 | [finally: exception(Exception), exception: NullReferenceException] ... == ... |
-| Finally.cs:162:13:164:13 | [finally: exception(ArgumentNullException)] {...} | Finally.cs:163:17:163:43 | [finally: exception(ArgumentNullException)] ...; |
-| Finally.cs:162:13:164:13 | [finally: exception(Exception)] {...} | Finally.cs:163:17:163:43 | [finally: exception(Exception)] ...; |
+| Finally.cs:161:13:164:13 | catch (...) {...} | Finally.cs:161:30:161:30 | Exception e |
+| Finally.cs:161:13:164:13 | catch (...) {...} | Finally.cs:165:13:168:13 | catch {...} |
+| Finally.cs:161:30:161:30 | Exception e | Finally.cs:161:39:161:39 | access to local variable e |
+| Finally.cs:161:39:161:39 | access to local variable e | Finally.cs:161:39:161:47 | access to property Message |
+| Finally.cs:161:39:161:47 | access to property Message | Finally.cs:161:52:161:54 | "1" |
+| Finally.cs:161:39:161:54 | ... == ... | Finally.cs:162:13:164:13 | {...} |
+| Finally.cs:161:52:161:54 | "1" | Finally.cs:161:39:161:54 | ... == ... |
 | Finally.cs:162:13:164:13 | {...} | Finally.cs:163:17:163:43 | ...; |
 | Finally.cs:163:17:163:43 | ...; | Finally.cs:163:35:163:38 | access to parameter args |
-| Finally.cs:163:17:163:43 | [finally: exception(ArgumentNullException)] ...; | Finally.cs:163:35:163:38 | [finally: exception(ArgumentNullException)] access to parameter args |
-| Finally.cs:163:17:163:43 | [finally: exception(Exception)] ...; | Finally.cs:163:35:163:38 | [finally: exception(Exception)] access to parameter args |
-| Finally.cs:163:35:163:38 | [finally: exception(ArgumentNullException)] access to parameter args | Finally.cs:163:40:163:40 | [finally: exception(ArgumentNullException)] 0 |
-| Finally.cs:163:35:163:38 | [finally: exception(Exception)] access to parameter args | Finally.cs:163:40:163:40 | [finally: exception(Exception)] 0 |
 | Finally.cs:163:35:163:38 | access to parameter args | Finally.cs:163:40:163:40 | 0 |
-| Finally.cs:163:35:163:41 | [finally: exception(ArgumentNullException)] access to array element | Finally.cs:163:17:163:42 | [finally: exception(ArgumentNullException)] call to method WriteLine |
-| Finally.cs:163:35:163:41 | [finally: exception(Exception)] access to array element | Finally.cs:163:17:163:42 | [finally: exception(Exception)] call to method WriteLine |
 | Finally.cs:163:35:163:41 | access to array element | Finally.cs:163:17:163:42 | call to method WriteLine |
 | Finally.cs:163:40:163:40 | 0 | Finally.cs:163:35:163:41 | access to array element |
-| Finally.cs:163:40:163:40 | [finally: exception(ArgumentNullException)] 0 | Finally.cs:163:35:163:41 | [finally: exception(ArgumentNullException)] access to array element |
-| Finally.cs:163:40:163:40 | [finally: exception(Exception)] 0 | Finally.cs:163:35:163:41 | [finally: exception(Exception)] access to array element |
-| Finally.cs:165:13:168:13 | [finally: exception(ArgumentNullException)] catch {...} | Finally.cs:166:13:168:13 | [finally: exception(ArgumentNullException)] {...} |
-| Finally.cs:165:13:168:13 | [finally: exception(Exception)] catch {...} | Finally.cs:166:13:168:13 | [finally: exception(Exception)] {...} |
 | Finally.cs:165:13:168:13 | catch {...} | Finally.cs:166:13:168:13 | {...} |
-| Finally.cs:166:13:168:13 | [finally: exception(ArgumentNullException)] {...} | Finally.cs:167:17:167:38 | [finally: exception(ArgumentNullException)] ...; |
-| Finally.cs:166:13:168:13 | [finally: exception(Exception)] {...} | Finally.cs:167:17:167:38 | [finally: exception(Exception)] ...; |
 | Finally.cs:166:13:168:13 | {...} | Finally.cs:167:17:167:38 | ...; |
 | Finally.cs:167:17:167:38 | ...; | Finally.cs:167:35:167:36 | "" |
-| Finally.cs:167:17:167:38 | [finally: exception(ArgumentNullException)] ...; | Finally.cs:167:35:167:36 | [finally: exception(ArgumentNullException)] "" |
-| Finally.cs:167:17:167:38 | [finally: exception(Exception)] ...; | Finally.cs:167:35:167:36 | [finally: exception(Exception)] "" |
 | Finally.cs:167:35:167:36 | "" | Finally.cs:167:17:167:37 | call to method WriteLine |
-| Finally.cs:167:35:167:36 | [finally: exception(ArgumentNullException)] "" | Finally.cs:167:17:167:37 | [finally: exception(ArgumentNullException)] call to method WriteLine |
-| Finally.cs:167:35:167:36 | [finally: exception(Exception)] "" | Finally.cs:167:17:167:37 | [finally: exception(Exception)] call to method WriteLine |
 | Finally.cs:172:11:172:20 | call to constructor Exception | Finally.cs:172:11:172:20 | {...} |
 | Finally.cs:172:11:172:20 | enter ExceptionA | Finally.cs:172:11:172:20 | call to constructor Exception |
 | Finally.cs:172:11:172:20 | exit ExceptionA (normal) | Finally.cs:172:11:172:20 | exit ExceptionA |
@@ -2196,52 +1695,24 @@ dominance
 | Finally.cs:178:9:192:9 | try {...} ... | Finally.cs:179:9:181:9 | {...} |
 | Finally.cs:179:9:181:9 | {...} | Finally.cs:180:13:180:43 | if (...) ... |
 | Finally.cs:180:13:180:43 | if (...) ... | Finally.cs:180:17:180:18 | access to parameter b1 |
-| Finally.cs:180:17:180:18 | access to parameter b1 | Finally.cs:180:27:180:42 | [b1 (line 176): true] object creation of type ExceptionA |
-| Finally.cs:180:17:180:18 | access to parameter b1 | Finally.cs:183:9:192:9 | [b1 (line 176): false] {...} |
-| Finally.cs:180:21:180:43 | [b1 (line 176): true] throw ...; | Finally.cs:183:9:192:9 | [finally: exception(ExceptionA), b1 (line 176): true] {...} |
-| Finally.cs:180:27:180:42 | [b1 (line 176): true] object creation of type ExceptionA | Finally.cs:180:21:180:43 | [b1 (line 176): true] throw ...; |
-| Finally.cs:180:27:180:42 | [b1 (line 176): true] object creation of type ExceptionA | Finally.cs:183:9:192:9 | [finally: exception(Exception), b1 (line 176): true] {...} |
-| Finally.cs:183:9:192:9 | [b1 (line 176): false] {...} | Finally.cs:184:13:191:13 | [b1 (line 176): false] try {...} ... |
-| Finally.cs:183:9:192:9 | [finally: exception(Exception), b1 (line 176): true] {...} | Finally.cs:184:13:191:13 | [finally: exception(Exception), b1 (line 176): true] try {...} ... |
-| Finally.cs:183:9:192:9 | [finally: exception(ExceptionA), b1 (line 176): true] {...} | Finally.cs:184:13:191:13 | [finally: exception(ExceptionA), b1 (line 176): true] try {...} ... |
-| Finally.cs:184:13:191:13 | [b1 (line 176): false] try {...} ... | Finally.cs:185:13:187:13 | [b1 (line 176): false] {...} |
-| Finally.cs:184:13:191:13 | [finally: exception(Exception), b1 (line 176): true] try {...} ... | Finally.cs:185:13:187:13 | [finally: exception(Exception), b1 (line 176): true] {...} |
-| Finally.cs:184:13:191:13 | [finally: exception(ExceptionA), b1 (line 176): true] try {...} ... | Finally.cs:185:13:187:13 | [finally: exception(ExceptionA), b1 (line 176): true] {...} |
-| Finally.cs:185:13:187:13 | [b1 (line 176): false] {...} | Finally.cs:186:17:186:47 | [b1 (line 176): false] if (...) ... |
-| Finally.cs:185:13:187:13 | [finally: exception(Exception), b1 (line 176): true] {...} | Finally.cs:186:17:186:47 | [finally: exception(Exception), b1 (line 176): true] if (...) ... |
-| Finally.cs:185:13:187:13 | [finally: exception(ExceptionA), b1 (line 176): true] {...} | Finally.cs:186:17:186:47 | [finally: exception(ExceptionA), b1 (line 176): true] if (...) ... |
-| Finally.cs:186:17:186:47 | [b1 (line 176): false] if (...) ... | Finally.cs:186:21:186:22 | [b1 (line 176): false] access to parameter b2 |
-| Finally.cs:186:17:186:47 | [finally: exception(Exception), b1 (line 176): true] if (...) ... | Finally.cs:186:21:186:22 | [finally: exception(Exception), b1 (line 176): true] access to parameter b2 |
-| Finally.cs:186:17:186:47 | [finally: exception(ExceptionA), b1 (line 176): true] if (...) ... | Finally.cs:186:21:186:22 | [finally: exception(ExceptionA), b1 (line 176): true] access to parameter b2 |
-| Finally.cs:186:21:186:22 | [b1 (line 176): false] access to parameter b2 | Finally.cs:176:10:176:11 | exit M9 (normal) |
-| Finally.cs:186:21:186:22 | [b1 (line 176): false] access to parameter b2 | Finally.cs:186:31:186:46 | [b1 (line 176): false, b2 (line 176): true] object creation of type ExceptionB |
-| Finally.cs:186:21:186:22 | [finally: exception(Exception), b1 (line 176): true] access to parameter b2 | Finally.cs:186:31:186:46 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB |
-| Finally.cs:186:21:186:22 | [finally: exception(ExceptionA), b1 (line 176): true] access to parameter b2 | Finally.cs:186:31:186:46 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB |
-| Finally.cs:186:25:186:47 | [b1 (line 176): false, b2 (line 176): true] throw ...; | Finally.cs:188:13:191:13 | [exception: ExceptionB, b1 (line 176): false, b2 (line 176): true] catch (...) {...} |
-| Finally.cs:186:25:186:47 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] throw ...; | Finally.cs:188:13:191:13 | [finally: exception(Exception), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] catch (...) {...} |
-| Finally.cs:186:25:186:47 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] throw ...; | Finally.cs:188:13:191:13 | [finally: exception(ExceptionA), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] catch (...) {...} |
-| Finally.cs:186:31:186:46 | [b1 (line 176): false, b2 (line 176): true] object creation of type ExceptionB | Finally.cs:186:25:186:47 | [b1 (line 176): false, b2 (line 176): true] throw ...; |
-| Finally.cs:186:31:186:46 | [b1 (line 176): false, b2 (line 176): true] object creation of type ExceptionB | Finally.cs:188:13:191:13 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] catch (...) {...} |
-| Finally.cs:186:31:186:46 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB | Finally.cs:186:25:186:47 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] throw ...; |
-| Finally.cs:186:31:186:46 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB | Finally.cs:188:13:191:13 | [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...} |
-| Finally.cs:186:31:186:46 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB | Finally.cs:186:25:186:47 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] throw ...; |
-| Finally.cs:186:31:186:46 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB | Finally.cs:188:13:191:13 | [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...} |
-| Finally.cs:188:13:191:13 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] catch (...) {...} | Finally.cs:188:38:188:39 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] access to parameter b2 |
-| Finally.cs:188:13:191:13 | [exception: ExceptionB, b1 (line 176): false, b2 (line 176): true] catch (...) {...} | Finally.cs:188:38:188:39 | [exception: ExceptionB, b1 (line 176): false, b2 (line 176): true] access to parameter b2 |
-| Finally.cs:188:13:191:13 | [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | Finally.cs:188:38:188:39 | [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] access to parameter b2 |
-| Finally.cs:188:13:191:13 | [finally: exception(Exception), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | Finally.cs:188:38:188:39 | [finally: exception(Exception), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] access to parameter b2 |
-| Finally.cs:188:13:191:13 | [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | Finally.cs:188:38:188:39 | [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] access to parameter b2 |
-| Finally.cs:188:13:191:13 | [finally: exception(ExceptionA), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | Finally.cs:188:38:188:39 | [finally: exception(ExceptionA), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] access to parameter b2 |
-| Finally.cs:189:13:191:13 | [b1 (line 176): false] {...} | Finally.cs:190:17:190:47 | [b1 (line 176): false] if (...) ... |
-| Finally.cs:189:13:191:13 | [finally: exception(Exception), b1 (line 176): true] {...} | Finally.cs:190:17:190:47 | [finally: exception(Exception), b1 (line 176): true] if (...) ... |
-| Finally.cs:189:13:191:13 | [finally: exception(ExceptionA), b1 (line 176): true] {...} | Finally.cs:190:17:190:47 | [finally: exception(ExceptionA), b1 (line 176): true] if (...) ... |
-| Finally.cs:190:17:190:47 | [b1 (line 176): false] if (...) ... | Finally.cs:190:21:190:22 | [b1 (line 176): false] access to parameter b1 |
-| Finally.cs:190:17:190:47 | [finally: exception(Exception), b1 (line 176): true] if (...) ... | Finally.cs:190:21:190:22 | [finally: exception(Exception), b1 (line 176): true] access to parameter b1 |
-| Finally.cs:190:17:190:47 | [finally: exception(ExceptionA), b1 (line 176): true] if (...) ... | Finally.cs:190:21:190:22 | [finally: exception(ExceptionA), b1 (line 176): true] access to parameter b1 |
-| Finally.cs:190:21:190:22 | [finally: exception(Exception), b1 (line 176): true] access to parameter b1 | Finally.cs:190:31:190:46 | [finally: exception(Exception)] object creation of type ExceptionC |
-| Finally.cs:190:21:190:22 | [finally: exception(ExceptionA), b1 (line 176): true] access to parameter b1 | Finally.cs:190:31:190:46 | [finally: exception(ExceptionA)] object creation of type ExceptionC |
-| Finally.cs:190:31:190:46 | [finally: exception(Exception)] object creation of type ExceptionC | Finally.cs:190:25:190:47 | [finally: exception(Exception)] throw ...; |
-| Finally.cs:190:31:190:46 | [finally: exception(ExceptionA)] object creation of type ExceptionC | Finally.cs:190:25:190:47 | [finally: exception(ExceptionA)] throw ...; |
+| Finally.cs:180:17:180:18 | access to parameter b1 | Finally.cs:180:27:180:42 | object creation of type ExceptionA |
+| Finally.cs:180:17:180:18 | access to parameter b1 | Finally.cs:183:9:192:9 | {...} |
+| Finally.cs:180:27:180:42 | object creation of type ExceptionA | Finally.cs:180:21:180:43 | throw ...; |
+| Finally.cs:183:9:192:9 | {...} | Finally.cs:184:13:191:13 | try {...} ... |
+| Finally.cs:184:13:191:13 | try {...} ... | Finally.cs:185:13:187:13 | {...} |
+| Finally.cs:185:13:187:13 | {...} | Finally.cs:186:17:186:47 | if (...) ... |
+| Finally.cs:186:17:186:47 | if (...) ... | Finally.cs:186:21:186:22 | access to parameter b2 |
+| Finally.cs:186:21:186:22 | access to parameter b2 | Finally.cs:176:10:176:11 | exit M9 (abnormal) |
+| Finally.cs:186:21:186:22 | access to parameter b2 | Finally.cs:176:10:176:11 | exit M9 (normal) |
+| Finally.cs:186:21:186:22 | access to parameter b2 | Finally.cs:186:31:186:46 | object creation of type ExceptionB |
+| Finally.cs:186:31:186:46 | object creation of type ExceptionB | Finally.cs:186:25:186:47 | throw ...; |
+| Finally.cs:186:31:186:46 | object creation of type ExceptionB | Finally.cs:188:13:191:13 | catch (...) {...} |
+| Finally.cs:188:13:191:13 | catch (...) {...} | Finally.cs:188:38:188:39 | access to parameter b2 |
+| Finally.cs:188:38:188:39 | access to parameter b2 | Finally.cs:189:13:191:13 | {...} |
+| Finally.cs:189:13:191:13 | {...} | Finally.cs:190:17:190:47 | if (...) ... |
+| Finally.cs:190:17:190:47 | if (...) ... | Finally.cs:190:21:190:22 | access to parameter b1 |
+| Finally.cs:190:21:190:22 | access to parameter b1 | Finally.cs:190:31:190:46 | object creation of type ExceptionC |
+| Finally.cs:190:31:190:46 | object creation of type ExceptionC | Finally.cs:190:25:190:47 | throw ...; |
 | Finally.cs:195:10:195:12 | enter M10 | Finally.cs:196:5:214:5 | {...} |
 | Finally.cs:196:5:214:5 | {...} | Finally.cs:197:9:212:9 | try {...} ... |
 | Finally.cs:197:9:212:9 | try {...} ... | Finally.cs:198:9:200:9 | {...} |
@@ -2249,85 +1720,24 @@ dominance
 | Finally.cs:199:13:199:43 | if (...) ... | Finally.cs:199:17:199:18 | access to parameter b1 |
 | Finally.cs:199:17:199:18 | access to parameter b1 | Finally.cs:199:27:199:42 | object creation of type ExceptionA |
 | Finally.cs:199:17:199:18 | access to parameter b1 | Finally.cs:202:9:212:9 | {...} |
-| Finally.cs:199:21:199:43 | throw ...; | Finally.cs:202:9:212:9 | [finally: exception(ExceptionA)] {...} |
 | Finally.cs:199:27:199:42 | object creation of type ExceptionA | Finally.cs:199:21:199:43 | throw ...; |
-| Finally.cs:199:27:199:42 | object creation of type ExceptionA | Finally.cs:202:9:212:9 | [finally: exception(Exception)] {...} |
-| Finally.cs:202:9:212:9 | [finally: exception(Exception)] {...} | Finally.cs:203:13:210:13 | [finally: exception(Exception)] try {...} ... |
-| Finally.cs:202:9:212:9 | [finally: exception(ExceptionA)] {...} | Finally.cs:203:13:210:13 | [finally: exception(ExceptionA)] try {...} ... |
 | Finally.cs:202:9:212:9 | {...} | Finally.cs:203:13:210:13 | try {...} ... |
-| Finally.cs:203:13:210:13 | [finally: exception(Exception)] try {...} ... | Finally.cs:204:13:206:13 | [finally: exception(Exception)] {...} |
-| Finally.cs:203:13:210:13 | [finally: exception(ExceptionA)] try {...} ... | Finally.cs:204:13:206:13 | [finally: exception(ExceptionA)] {...} |
 | Finally.cs:203:13:210:13 | try {...} ... | Finally.cs:204:13:206:13 | {...} |
-| Finally.cs:204:13:206:13 | [finally: exception(Exception)] {...} | Finally.cs:205:17:205:47 | [finally: exception(Exception)] if (...) ... |
-| Finally.cs:204:13:206:13 | [finally: exception(ExceptionA)] {...} | Finally.cs:205:17:205:47 | [finally: exception(ExceptionA)] if (...) ... |
 | Finally.cs:204:13:206:13 | {...} | Finally.cs:205:17:205:47 | if (...) ... |
-| Finally.cs:205:17:205:47 | [finally: exception(Exception)] if (...) ... | Finally.cs:205:21:205:22 | [finally: exception(Exception)] access to parameter b2 |
-| Finally.cs:205:17:205:47 | [finally: exception(ExceptionA)] if (...) ... | Finally.cs:205:21:205:22 | [finally: exception(ExceptionA)] access to parameter b2 |
 | Finally.cs:205:17:205:47 | if (...) ... | Finally.cs:205:21:205:22 | access to parameter b2 |
-| Finally.cs:205:21:205:22 | [finally: exception(Exception)] access to parameter b2 | Finally.cs:205:31:205:46 | [finally: exception(Exception)] object creation of type ExceptionB |
-| Finally.cs:205:21:205:22 | [finally: exception(Exception)] access to parameter b2 | Finally.cs:208:13:210:13 | [finally: exception(Exception)] {...} |
-| Finally.cs:205:21:205:22 | [finally: exception(ExceptionA)] access to parameter b2 | Finally.cs:205:31:205:46 | [finally: exception(ExceptionA)] object creation of type ExceptionB |
-| Finally.cs:205:21:205:22 | [finally: exception(ExceptionA)] access to parameter b2 | Finally.cs:208:13:210:13 | [finally: exception(ExceptionA)] {...} |
 | Finally.cs:205:21:205:22 | access to parameter b2 | Finally.cs:205:31:205:46 | object creation of type ExceptionB |
 | Finally.cs:205:21:205:22 | access to parameter b2 | Finally.cs:208:13:210:13 | {...} |
-| Finally.cs:205:25:205:47 | [finally: exception(Exception)] throw ...; | Finally.cs:208:13:210:13 | [finally: exception(Exception), finally(1): exception(ExceptionB)] {...} |
-| Finally.cs:205:25:205:47 | [finally: exception(ExceptionA)] throw ...; | Finally.cs:208:13:210:13 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] {...} |
-| Finally.cs:205:25:205:47 | throw ...; | Finally.cs:208:13:210:13 | [finally(1): exception(ExceptionB)] {...} |
-| Finally.cs:205:31:205:46 | [finally: exception(Exception)] object creation of type ExceptionB | Finally.cs:205:25:205:47 | [finally: exception(Exception)] throw ...; |
-| Finally.cs:205:31:205:46 | [finally: exception(Exception)] object creation of type ExceptionB | Finally.cs:208:13:210:13 | [finally: exception(Exception), finally(1): exception(Exception)] {...} |
-| Finally.cs:205:31:205:46 | [finally: exception(ExceptionA)] object creation of type ExceptionB | Finally.cs:205:25:205:47 | [finally: exception(ExceptionA)] throw ...; |
-| Finally.cs:205:31:205:46 | [finally: exception(ExceptionA)] object creation of type ExceptionB | Finally.cs:208:13:210:13 | [finally: exception(ExceptionA), finally(1): exception(Exception)] {...} |
 | Finally.cs:205:31:205:46 | object creation of type ExceptionB | Finally.cs:205:25:205:47 | throw ...; |
-| Finally.cs:205:31:205:46 | object creation of type ExceptionB | Finally.cs:208:13:210:13 | [finally(1): exception(Exception)] {...} |
-| Finally.cs:208:13:210:13 | [finally(1): exception(Exception)] {...} | Finally.cs:209:17:209:47 | [finally(1): exception(Exception)] if (...) ... |
-| Finally.cs:208:13:210:13 | [finally(1): exception(ExceptionB)] {...} | Finally.cs:209:17:209:47 | [finally(1): exception(ExceptionB)] if (...) ... |
-| Finally.cs:208:13:210:13 | [finally: exception(Exception), finally(1): exception(Exception)] {...} | Finally.cs:209:17:209:47 | [finally: exception(Exception), finally(1): exception(Exception)] if (...) ... |
-| Finally.cs:208:13:210:13 | [finally: exception(Exception), finally(1): exception(ExceptionB)] {...} | Finally.cs:209:17:209:47 | [finally: exception(Exception), finally(1): exception(ExceptionB)] if (...) ... |
-| Finally.cs:208:13:210:13 | [finally: exception(Exception)] {...} | Finally.cs:209:17:209:47 | [finally: exception(Exception)] if (...) ... |
-| Finally.cs:208:13:210:13 | [finally: exception(ExceptionA), finally(1): exception(Exception)] {...} | Finally.cs:209:17:209:47 | [finally: exception(ExceptionA), finally(1): exception(Exception)] if (...) ... |
-| Finally.cs:208:13:210:13 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] {...} | Finally.cs:209:17:209:47 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] if (...) ... |
-| Finally.cs:208:13:210:13 | [finally: exception(ExceptionA)] {...} | Finally.cs:209:17:209:47 | [finally: exception(ExceptionA)] if (...) ... |
 | Finally.cs:208:13:210:13 | {...} | Finally.cs:209:17:209:47 | if (...) ... |
-| Finally.cs:209:17:209:47 | [finally(1): exception(Exception)] if (...) ... | Finally.cs:209:21:209:22 | [finally(1): exception(Exception)] access to parameter b3 |
-| Finally.cs:209:17:209:47 | [finally(1): exception(ExceptionB)] if (...) ... | Finally.cs:209:21:209:22 | [finally(1): exception(ExceptionB)] access to parameter b3 |
-| Finally.cs:209:17:209:47 | [finally: exception(Exception), finally(1): exception(Exception)] if (...) ... | Finally.cs:209:21:209:22 | [finally: exception(Exception), finally(1): exception(Exception)] access to parameter b3 |
-| Finally.cs:209:17:209:47 | [finally: exception(Exception), finally(1): exception(ExceptionB)] if (...) ... | Finally.cs:209:21:209:22 | [finally: exception(Exception), finally(1): exception(ExceptionB)] access to parameter b3 |
-| Finally.cs:209:17:209:47 | [finally: exception(Exception)] if (...) ... | Finally.cs:209:21:209:22 | [finally: exception(Exception)] access to parameter b3 |
-| Finally.cs:209:17:209:47 | [finally: exception(ExceptionA), finally(1): exception(Exception)] if (...) ... | Finally.cs:209:21:209:22 | [finally: exception(ExceptionA), finally(1): exception(Exception)] access to parameter b3 |
-| Finally.cs:209:17:209:47 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] if (...) ... | Finally.cs:209:21:209:22 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] access to parameter b3 |
-| Finally.cs:209:17:209:47 | [finally: exception(ExceptionA)] if (...) ... | Finally.cs:209:21:209:22 | [finally: exception(ExceptionA)] access to parameter b3 |
 | Finally.cs:209:17:209:47 | if (...) ... | Finally.cs:209:21:209:22 | access to parameter b3 |
-| Finally.cs:209:21:209:22 | [finally(1): exception(Exception)] access to parameter b3 | Finally.cs:209:31:209:46 | [finally(1): exception(Exception)] object creation of type ExceptionC |
-| Finally.cs:209:21:209:22 | [finally(1): exception(ExceptionB)] access to parameter b3 | Finally.cs:209:31:209:46 | [finally(1): exception(ExceptionB)] object creation of type ExceptionC |
-| Finally.cs:209:21:209:22 | [finally: exception(Exception), finally(1): exception(Exception)] access to parameter b3 | Finally.cs:209:31:209:46 | [finally: exception(Exception), finally(1): exception(Exception)] object creation of type ExceptionC |
-| Finally.cs:209:21:209:22 | [finally: exception(Exception), finally(1): exception(ExceptionB)] access to parameter b3 | Finally.cs:209:31:209:46 | [finally: exception(Exception), finally(1): exception(ExceptionB)] object creation of type ExceptionC |
-| Finally.cs:209:21:209:22 | [finally: exception(Exception)] access to parameter b3 | Finally.cs:209:31:209:46 | [finally: exception(Exception)] object creation of type ExceptionC |
-| Finally.cs:209:21:209:22 | [finally: exception(Exception)] access to parameter b3 | Finally.cs:211:13:211:29 | [finally: exception(Exception)] ...; |
-| Finally.cs:209:21:209:22 | [finally: exception(ExceptionA), finally(1): exception(Exception)] access to parameter b3 | Finally.cs:209:31:209:46 | [finally: exception(ExceptionA), finally(1): exception(Exception)] object creation of type ExceptionC |
-| Finally.cs:209:21:209:22 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] access to parameter b3 | Finally.cs:209:31:209:46 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] object creation of type ExceptionC |
-| Finally.cs:209:21:209:22 | [finally: exception(ExceptionA)] access to parameter b3 | Finally.cs:209:31:209:46 | [finally: exception(ExceptionA)] object creation of type ExceptionC |
-| Finally.cs:209:21:209:22 | [finally: exception(ExceptionA)] access to parameter b3 | Finally.cs:211:13:211:29 | [finally: exception(ExceptionA)] ...; |
+| Finally.cs:209:21:209:22 | access to parameter b3 | Finally.cs:195:10:195:12 | exit M10 (abnormal) |
 | Finally.cs:209:21:209:22 | access to parameter b3 | Finally.cs:209:31:209:46 | object creation of type ExceptionC |
 | Finally.cs:209:21:209:22 | access to parameter b3 | Finally.cs:211:13:211:29 | ...; |
-| Finally.cs:209:31:209:46 | [finally(1): exception(Exception)] object creation of type ExceptionC | Finally.cs:209:25:209:47 | [finally(1): exception(Exception)] throw ...; |
-| Finally.cs:209:31:209:46 | [finally(1): exception(ExceptionB)] object creation of type ExceptionC | Finally.cs:209:25:209:47 | [finally(1): exception(ExceptionB)] throw ...; |
-| Finally.cs:209:31:209:46 | [finally: exception(Exception), finally(1): exception(Exception)] object creation of type ExceptionC | Finally.cs:209:25:209:47 | [finally: exception(Exception), finally(1): exception(Exception)] throw ...; |
-| Finally.cs:209:31:209:46 | [finally: exception(Exception), finally(1): exception(ExceptionB)] object creation of type ExceptionC | Finally.cs:209:25:209:47 | [finally: exception(Exception), finally(1): exception(ExceptionB)] throw ...; |
-| Finally.cs:209:31:209:46 | [finally: exception(Exception)] object creation of type ExceptionC | Finally.cs:209:25:209:47 | [finally: exception(Exception)] throw ...; |
-| Finally.cs:209:31:209:46 | [finally: exception(ExceptionA), finally(1): exception(Exception)] object creation of type ExceptionC | Finally.cs:209:25:209:47 | [finally: exception(ExceptionA), finally(1): exception(Exception)] throw ...; |
-| Finally.cs:209:31:209:46 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] object creation of type ExceptionC | Finally.cs:209:25:209:47 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] throw ...; |
-| Finally.cs:209:31:209:46 | [finally: exception(ExceptionA)] object creation of type ExceptionC | Finally.cs:209:25:209:47 | [finally: exception(ExceptionA)] throw ...; |
 | Finally.cs:209:31:209:46 | object creation of type ExceptionC | Finally.cs:209:25:209:47 | throw ...; |
-| Finally.cs:211:13:211:16 | [finally: exception(Exception)] this access | Finally.cs:211:26:211:28 | [finally: exception(Exception)] "0" |
-| Finally.cs:211:13:211:16 | [finally: exception(ExceptionA)] this access | Finally.cs:211:26:211:28 | [finally: exception(ExceptionA)] "0" |
 | Finally.cs:211:13:211:16 | this access | Finally.cs:211:26:211:28 | "0" |
 | Finally.cs:211:13:211:28 | ... = ... | Finally.cs:213:9:213:25 | ...; |
 | Finally.cs:211:13:211:29 | ...; | Finally.cs:211:13:211:16 | this access |
-| Finally.cs:211:13:211:29 | [finally: exception(Exception)] ...; | Finally.cs:211:13:211:16 | [finally: exception(Exception)] this access |
-| Finally.cs:211:13:211:29 | [finally: exception(ExceptionA)] ...; | Finally.cs:211:13:211:16 | [finally: exception(ExceptionA)] this access |
 | Finally.cs:211:26:211:28 | "0" | Finally.cs:211:13:211:28 | ... = ... |
-| Finally.cs:211:26:211:28 | [finally: exception(Exception)] "0" | Finally.cs:211:13:211:28 | [finally: exception(Exception)] ... = ... |
-| Finally.cs:211:26:211:28 | [finally: exception(ExceptionA)] "0" | Finally.cs:211:13:211:28 | [finally: exception(ExceptionA)] ... = ... |
 | Finally.cs:213:9:213:12 | this access | Finally.cs:213:22:213:24 | "1" |
 | Finally.cs:213:9:213:24 | ... = ... | Finally.cs:195:10:195:12 | exit M10 (normal) |
 | Finally.cs:213:9:213:25 | ...; | Finally.cs:213:9:213:12 | this access |
@@ -2361,77 +1771,26 @@ dominance
 | Finally.cs:239:17:240:43 | if (...) ... | Finally.cs:239:21:239:22 | access to parameter b1 |
 | Finally.cs:239:21:239:22 | access to parameter b1 | Finally.cs:240:27:240:42 | object creation of type ExceptionA |
 | Finally.cs:239:21:239:22 | access to parameter b1 | Finally.cs:243:13:253:13 | {...} |
-| Finally.cs:240:21:240:43 | throw ...; | Finally.cs:243:13:253:13 | [finally: exception(ExceptionA)] {...} |
 | Finally.cs:240:27:240:42 | object creation of type ExceptionA | Finally.cs:240:21:240:43 | throw ...; |
-| Finally.cs:240:27:240:42 | object creation of type ExceptionA | Finally.cs:243:13:253:13 | [finally: exception(Exception)] {...} |
-| Finally.cs:243:13:253:13 | [finally: exception(Exception)] {...} | Finally.cs:244:17:252:17 | [finally: exception(Exception)] try {...} ... |
-| Finally.cs:243:13:253:13 | [finally: exception(ExceptionA)] {...} | Finally.cs:244:17:252:17 | [finally: exception(ExceptionA)] try {...} ... |
 | Finally.cs:243:13:253:13 | {...} | Finally.cs:244:17:252:17 | try {...} ... |
-| Finally.cs:244:17:252:17 | [finally: exception(Exception)] try {...} ... | Finally.cs:245:17:248:17 | [finally: exception(Exception)] {...} |
-| Finally.cs:244:17:252:17 | [finally: exception(ExceptionA)] try {...} ... | Finally.cs:245:17:248:17 | [finally: exception(ExceptionA)] {...} |
 | Finally.cs:244:17:252:17 | try {...} ... | Finally.cs:245:17:248:17 | {...} |
-| Finally.cs:245:17:248:17 | [finally: exception(Exception)] {...} | Finally.cs:246:21:247:47 | [finally: exception(Exception)] if (...) ... |
-| Finally.cs:245:17:248:17 | [finally: exception(ExceptionA)] {...} | Finally.cs:246:21:247:47 | [finally: exception(ExceptionA)] if (...) ... |
 | Finally.cs:245:17:248:17 | {...} | Finally.cs:246:21:247:47 | if (...) ... |
-| Finally.cs:246:21:247:47 | [finally: exception(Exception)] if (...) ... | Finally.cs:246:25:246:26 | [finally: exception(Exception)] access to parameter b2 |
-| Finally.cs:246:21:247:47 | [finally: exception(ExceptionA)] if (...) ... | Finally.cs:246:25:246:26 | [finally: exception(ExceptionA)] access to parameter b2 |
 | Finally.cs:246:21:247:47 | if (...) ... | Finally.cs:246:25:246:26 | access to parameter b2 |
-| Finally.cs:246:25:246:26 | [finally: exception(Exception)] access to parameter b2 | Finally.cs:247:31:247:46 | [finally: exception(Exception)] object creation of type ExceptionA |
-| Finally.cs:246:25:246:26 | [finally: exception(Exception)] access to parameter b2 | Finally.cs:250:17:252:17 | [finally: exception(Exception)] {...} |
-| Finally.cs:246:25:246:26 | [finally: exception(ExceptionA)] access to parameter b2 | Finally.cs:247:31:247:46 | [finally: exception(ExceptionA)] object creation of type ExceptionA |
-| Finally.cs:246:25:246:26 | [finally: exception(ExceptionA)] access to parameter b2 | Finally.cs:250:17:252:17 | [finally: exception(ExceptionA)] {...} |
 | Finally.cs:246:25:246:26 | access to parameter b2 | Finally.cs:247:31:247:46 | object creation of type ExceptionA |
 | Finally.cs:246:25:246:26 | access to parameter b2 | Finally.cs:250:17:252:17 | {...} |
-| Finally.cs:247:25:247:47 | [finally: exception(Exception)] throw ...; | Finally.cs:250:17:252:17 | [finally: exception(Exception), finally(1): exception(ExceptionA)] {...} |
-| Finally.cs:247:25:247:47 | [finally: exception(ExceptionA)] throw ...; | Finally.cs:250:17:252:17 | [finally: exception(ExceptionA), finally(1): exception(ExceptionA)] {...} |
-| Finally.cs:247:25:247:47 | throw ...; | Finally.cs:250:17:252:17 | [finally(1): exception(ExceptionA)] {...} |
-| Finally.cs:247:31:247:46 | [finally: exception(Exception)] object creation of type ExceptionA | Finally.cs:247:25:247:47 | [finally: exception(Exception)] throw ...; |
-| Finally.cs:247:31:247:46 | [finally: exception(Exception)] object creation of type ExceptionA | Finally.cs:250:17:252:17 | [finally: exception(Exception), finally(1): exception(Exception)] {...} |
-| Finally.cs:247:31:247:46 | [finally: exception(ExceptionA)] object creation of type ExceptionA | Finally.cs:247:25:247:47 | [finally: exception(ExceptionA)] throw ...; |
-| Finally.cs:247:31:247:46 | [finally: exception(ExceptionA)] object creation of type ExceptionA | Finally.cs:250:17:252:17 | [finally: exception(ExceptionA), finally(1): exception(Exception)] {...} |
 | Finally.cs:247:31:247:46 | object creation of type ExceptionA | Finally.cs:247:25:247:47 | throw ...; |
-| Finally.cs:247:31:247:46 | object creation of type ExceptionA | Finally.cs:250:17:252:17 | [finally(1): exception(Exception)] {...} |
-| Finally.cs:250:17:252:17 | [finally(1): exception(Exception)] {...} | Finally.cs:251:21:251:55 | [finally(1): exception(Exception)] ...; |
-| Finally.cs:250:17:252:17 | [finally(1): exception(ExceptionA)] {...} | Finally.cs:251:21:251:55 | [finally(1): exception(ExceptionA)] ...; |
-| Finally.cs:250:17:252:17 | [finally: exception(Exception), finally(1): exception(Exception)] {...} | Finally.cs:251:21:251:55 | [finally: exception(Exception), finally(1): exception(Exception)] ...; |
-| Finally.cs:250:17:252:17 | [finally: exception(Exception), finally(1): exception(ExceptionA)] {...} | Finally.cs:251:21:251:55 | [finally: exception(Exception), finally(1): exception(ExceptionA)] ...; |
-| Finally.cs:250:17:252:17 | [finally: exception(Exception)] {...} | Finally.cs:251:21:251:55 | [finally: exception(Exception)] ...; |
-| Finally.cs:250:17:252:17 | [finally: exception(ExceptionA), finally(1): exception(Exception)] {...} | Finally.cs:251:21:251:55 | [finally: exception(ExceptionA), finally(1): exception(Exception)] ...; |
-| Finally.cs:250:17:252:17 | [finally: exception(ExceptionA), finally(1): exception(ExceptionA)] {...} | Finally.cs:251:21:251:55 | [finally: exception(ExceptionA), finally(1): exception(ExceptionA)] ...; |
-| Finally.cs:250:17:252:17 | [finally: exception(ExceptionA)] {...} | Finally.cs:251:21:251:55 | [finally: exception(ExceptionA)] ...; |
 | Finally.cs:250:17:252:17 | {...} | Finally.cs:251:21:251:55 | ...; |
 | Finally.cs:251:21:251:54 | call to method WriteLine | Finally.cs:254:13:254:45 | ...; |
+| Finally.cs:251:21:251:54 | call to method WriteLine | Finally.cs:257:9:259:9 | {...} |
 | Finally.cs:251:21:251:55 | ...; | Finally.cs:251:39:251:53 | "Inner finally" |
-| Finally.cs:251:21:251:55 | [finally(1): exception(Exception)] ...; | Finally.cs:251:39:251:53 | [finally(1): exception(Exception)] "Inner finally" |
-| Finally.cs:251:21:251:55 | [finally(1): exception(ExceptionA)] ...; | Finally.cs:251:39:251:53 | [finally(1): exception(ExceptionA)] "Inner finally" |
-| Finally.cs:251:21:251:55 | [finally: exception(Exception), finally(1): exception(Exception)] ...; | Finally.cs:251:39:251:53 | [finally: exception(Exception), finally(1): exception(Exception)] "Inner finally" |
-| Finally.cs:251:21:251:55 | [finally: exception(Exception), finally(1): exception(ExceptionA)] ...; | Finally.cs:251:39:251:53 | [finally: exception(Exception), finally(1): exception(ExceptionA)] "Inner finally" |
-| Finally.cs:251:21:251:55 | [finally: exception(Exception)] ...; | Finally.cs:251:39:251:53 | [finally: exception(Exception)] "Inner finally" |
-| Finally.cs:251:21:251:55 | [finally: exception(ExceptionA), finally(1): exception(Exception)] ...; | Finally.cs:251:39:251:53 | [finally: exception(ExceptionA), finally(1): exception(Exception)] "Inner finally" |
-| Finally.cs:251:21:251:55 | [finally: exception(ExceptionA), finally(1): exception(ExceptionA)] ...; | Finally.cs:251:39:251:53 | [finally: exception(ExceptionA), finally(1): exception(ExceptionA)] "Inner finally" |
-| Finally.cs:251:21:251:55 | [finally: exception(ExceptionA)] ...; | Finally.cs:251:39:251:53 | [finally: exception(ExceptionA)] "Inner finally" |
 | Finally.cs:251:39:251:53 | "Inner finally" | Finally.cs:251:21:251:54 | call to method WriteLine |
-| Finally.cs:251:39:251:53 | [finally(1): exception(Exception)] "Inner finally" | Finally.cs:251:21:251:54 | [finally(1): exception(Exception)] call to method WriteLine |
-| Finally.cs:251:39:251:53 | [finally(1): exception(ExceptionA)] "Inner finally" | Finally.cs:251:21:251:54 | [finally(1): exception(ExceptionA)] call to method WriteLine |
-| Finally.cs:251:39:251:53 | [finally: exception(Exception), finally(1): exception(Exception)] "Inner finally" | Finally.cs:251:21:251:54 | [finally: exception(Exception), finally(1): exception(Exception)] call to method WriteLine |
-| Finally.cs:251:39:251:53 | [finally: exception(Exception), finally(1): exception(ExceptionA)] "Inner finally" | Finally.cs:251:21:251:54 | [finally: exception(Exception), finally(1): exception(ExceptionA)] call to method WriteLine |
-| Finally.cs:251:39:251:53 | [finally: exception(Exception)] "Inner finally" | Finally.cs:251:21:251:54 | [finally: exception(Exception)] call to method WriteLine |
-| Finally.cs:251:39:251:53 | [finally: exception(ExceptionA), finally(1): exception(Exception)] "Inner finally" | Finally.cs:251:21:251:54 | [finally: exception(ExceptionA), finally(1): exception(Exception)] call to method WriteLine |
-| Finally.cs:251:39:251:53 | [finally: exception(ExceptionA), finally(1): exception(ExceptionA)] "Inner finally" | Finally.cs:251:21:251:54 | [finally: exception(ExceptionA), finally(1): exception(ExceptionA)] call to method WriteLine |
-| Finally.cs:251:39:251:53 | [finally: exception(ExceptionA)] "Inner finally" | Finally.cs:251:21:251:54 | [finally: exception(ExceptionA)] call to method WriteLine |
-| Finally.cs:254:13:254:44 | call to method WriteLine | Finally.cs:257:9:259:9 | {...} |
 | Finally.cs:254:13:254:45 | ...; | Finally.cs:254:31:254:43 | "Mid finally" |
 | Finally.cs:254:31:254:43 | "Mid finally" | Finally.cs:254:13:254:44 | call to method WriteLine |
-| Finally.cs:257:9:259:9 | [finally: exception(Exception)] {...} | Finally.cs:258:13:258:47 | [finally: exception(Exception)] ...; |
-| Finally.cs:257:9:259:9 | [finally: exception(ExceptionA)] {...} | Finally.cs:258:13:258:47 | [finally: exception(ExceptionA)] ...; |
 | Finally.cs:257:9:259:9 | {...} | Finally.cs:258:13:258:47 | ...; |
+| Finally.cs:258:13:258:46 | call to method WriteLine | Finally.cs:233:10:233:12 | exit M12 (abnormal) |
 | Finally.cs:258:13:258:46 | call to method WriteLine | Finally.cs:260:9:260:34 | ...; |
 | Finally.cs:258:13:258:47 | ...; | Finally.cs:258:31:258:45 | "Outer finally" |
-| Finally.cs:258:13:258:47 | [finally: exception(Exception)] ...; | Finally.cs:258:31:258:45 | [finally: exception(Exception)] "Outer finally" |
-| Finally.cs:258:13:258:47 | [finally: exception(ExceptionA)] ...; | Finally.cs:258:31:258:45 | [finally: exception(ExceptionA)] "Outer finally" |
 | Finally.cs:258:31:258:45 | "Outer finally" | Finally.cs:258:13:258:46 | call to method WriteLine |
-| Finally.cs:258:31:258:45 | [finally: exception(Exception)] "Outer finally" | Finally.cs:258:13:258:46 | [finally: exception(Exception)] call to method WriteLine |
-| Finally.cs:258:31:258:45 | [finally: exception(ExceptionA)] "Outer finally" | Finally.cs:258:13:258:46 | [finally: exception(ExceptionA)] call to method WriteLine |
 | Finally.cs:260:9:260:33 | call to method WriteLine | Finally.cs:233:10:233:12 | exit M12 (normal) |
 | Finally.cs:260:9:260:34 | ...; | Finally.cs:260:27:260:32 | "Done" |
 | Finally.cs:260:27:260:32 | "Done" | Finally.cs:260:9:260:33 | call to method WriteLine |
@@ -2439,28 +1798,19 @@ dominance
 | Finally.cs:264:5:274:5 | {...} | Finally.cs:265:9:273:9 | try {...} ... |
 | Finally.cs:265:9:273:9 | try {...} ... | Finally.cs:266:9:268:9 | {...} |
 | Finally.cs:266:9:268:9 | {...} | Finally.cs:267:13:267:35 | ...; |
-| Finally.cs:267:13:267:34 | call to method WriteLine | Finally.cs:270:9:273:9 | [finally: exception(Exception)] {...} |
 | Finally.cs:267:13:267:34 | call to method WriteLine | Finally.cs:270:9:273:9 | {...} |
 | Finally.cs:267:13:267:35 | ...; | Finally.cs:267:31:267:33 | "1" |
 | Finally.cs:267:31:267:33 | "1" | Finally.cs:267:13:267:34 | call to method WriteLine |
-| Finally.cs:270:9:273:9 | [finally: exception(Exception)] {...} | Finally.cs:271:13:271:35 | [finally: exception(Exception)] ...; |
 | Finally.cs:270:9:273:9 | {...} | Finally.cs:271:13:271:35 | ...; |
-| Finally.cs:271:13:271:34 | [finally: exception(Exception)] call to method WriteLine | Finally.cs:272:13:272:19 | [finally: exception(Exception)] ...; |
 | Finally.cs:271:13:271:34 | call to method WriteLine | Finally.cs:272:13:272:19 | ...; |
 | Finally.cs:271:13:271:35 | ...; | Finally.cs:271:31:271:33 | "3" |
-| Finally.cs:271:13:271:35 | [finally: exception(Exception)] ...; | Finally.cs:271:31:271:33 | [finally: exception(Exception)] "3" |
 | Finally.cs:271:31:271:33 | "3" | Finally.cs:271:13:271:34 | call to method WriteLine |
-| Finally.cs:271:31:271:33 | [finally: exception(Exception)] "3" | Finally.cs:271:13:271:34 | [finally: exception(Exception)] call to method WriteLine |
-| Finally.cs:272:13:272:13 | [finally: exception(Exception)] access to parameter i | Finally.cs:272:18:272:18 | [finally: exception(Exception)] 3 |
 | Finally.cs:272:13:272:13 | access to parameter i | Finally.cs:272:18:272:18 | 3 |
 | Finally.cs:272:13:272:18 | ... + ... | Finally.cs:272:13:272:18 | ... = ... |
+| Finally.cs:272:13:272:18 | ... = ... | Finally.cs:263:10:263:12 | exit M13 (abnormal) |
 | Finally.cs:272:13:272:18 | ... = ... | Finally.cs:263:10:263:12 | exit M13 (normal) |
-| Finally.cs:272:13:272:18 | [finally: exception(Exception)] ... + ... | Finally.cs:272:13:272:18 | [finally: exception(Exception)] ... = ... |
-| Finally.cs:272:13:272:18 | [finally: exception(Exception)] ... = ... | Finally.cs:263:10:263:12 | exit M13 (abnormal) |
 | Finally.cs:272:13:272:19 | ...; | Finally.cs:272:13:272:13 | access to parameter i |
-| Finally.cs:272:13:272:19 | [finally: exception(Exception)] ...; | Finally.cs:272:13:272:13 | [finally: exception(Exception)] access to parameter i |
 | Finally.cs:272:18:272:18 | 3 | Finally.cs:272:13:272:18 | ... + ... |
-| Finally.cs:272:18:272:18 | [finally: exception(Exception)] 3 | Finally.cs:272:13:272:18 | [finally: exception(Exception)] ... + ... |
 | Foreach.cs:4:7:4:13 | call to constructor Object | Foreach.cs:4:7:4:13 | {...} |
 | Foreach.cs:4:7:4:13 | enter Foreach | Foreach.cs:4:7:4:13 | call to constructor Object |
 | Foreach.cs:4:7:4:13 | exit Foreach (normal) | Foreach.cs:4:7:4:13 | exit Foreach |
@@ -2740,10 +2090,9 @@ dominance
 | LoopUnrolling.cs:9:13:9:28 | ... == ... | LoopUnrolling.cs:10:13:10:19 | return ...; |
 | LoopUnrolling.cs:9:13:9:28 | ... == ... | LoopUnrolling.cs:11:29:11:32 | access to parameter args |
 | LoopUnrolling.cs:9:28:9:28 | 0 | LoopUnrolling.cs:9:13:9:28 | ... == ... |
-| LoopUnrolling.cs:11:9:12:35 | [unroll (line 11)] foreach (... ... in ...) ... | LoopUnrolling.cs:11:22:11:24 | String arg |
+| LoopUnrolling.cs:11:9:12:35 | foreach (... ... in ...) ... | LoopUnrolling.cs:11:22:11:24 | String arg |
 | LoopUnrolling.cs:11:22:11:24 | String arg | LoopUnrolling.cs:12:13:12:35 | ...; |
-| LoopUnrolling.cs:11:29:11:32 | access to parameter args | LoopUnrolling.cs:11:9:12:35 | [unroll (line 11)] foreach (... ... in ...) ... |
-| LoopUnrolling.cs:12:13:12:34 | call to method WriteLine | LoopUnrolling.cs:11:9:12:35 | foreach (... ... in ...) ... |
+| LoopUnrolling.cs:11:29:11:32 | access to parameter args | LoopUnrolling.cs:11:9:12:35 | foreach (... ... in ...) ... |
 | LoopUnrolling.cs:12:13:12:35 | ...; | LoopUnrolling.cs:12:31:12:33 | access to local variable arg |
 | LoopUnrolling.cs:12:31:12:33 | access to local variable arg | LoopUnrolling.cs:12:13:12:34 | call to method WriteLine |
 | LoopUnrolling.cs:15:10:15:11 | enter M2 | LoopUnrolling.cs:16:5:20:5 | {...} |
@@ -2757,11 +2106,10 @@ dominance
 | LoopUnrolling.cs:17:33:17:35 | "a" | LoopUnrolling.cs:17:38:17:40 | "b" |
 | LoopUnrolling.cs:17:38:17:40 | "b" | LoopUnrolling.cs:17:43:17:45 | "c" |
 | LoopUnrolling.cs:17:43:17:45 | "c" | LoopUnrolling.cs:17:31:17:47 | { ..., ... } |
-| LoopUnrolling.cs:18:9:19:33 | [unroll (line 18)] foreach (... ... in ...) ... | LoopUnrolling.cs:18:22:18:22 | String x |
 | LoopUnrolling.cs:18:9:19:33 | foreach (... ... in ...) ... | LoopUnrolling.cs:15:10:15:11 | exit M2 (normal) |
+| LoopUnrolling.cs:18:9:19:33 | foreach (... ... in ...) ... | LoopUnrolling.cs:18:22:18:22 | String x |
 | LoopUnrolling.cs:18:22:18:22 | String x | LoopUnrolling.cs:19:13:19:33 | ...; |
-| LoopUnrolling.cs:18:27:18:28 | access to local variable xs | LoopUnrolling.cs:18:9:19:33 | [unroll (line 18)] foreach (... ... in ...) ... |
-| LoopUnrolling.cs:19:13:19:32 | call to method WriteLine | LoopUnrolling.cs:18:9:19:33 | foreach (... ... in ...) ... |
+| LoopUnrolling.cs:18:27:18:28 | access to local variable xs | LoopUnrolling.cs:18:9:19:33 | foreach (... ... in ...) ... |
 | LoopUnrolling.cs:19:13:19:33 | ...; | LoopUnrolling.cs:19:31:19:31 | access to local variable x |
 | LoopUnrolling.cs:19:31:19:31 | access to local variable x | LoopUnrolling.cs:19:13:19:32 | call to method WriteLine |
 | LoopUnrolling.cs:22:10:22:11 | enter M3 | LoopUnrolling.cs:23:5:27:5 | {...} |
@@ -2771,10 +2119,9 @@ dominance
 | LoopUnrolling.cs:24:9:26:40 | foreach (... ... in ...) ... | LoopUnrolling.cs:24:22:24:24 | Char arg |
 | LoopUnrolling.cs:24:22:24:24 | Char arg | LoopUnrolling.cs:25:34:25:37 | access to parameter args |
 | LoopUnrolling.cs:24:29:24:32 | access to parameter args | LoopUnrolling.cs:24:9:26:40 | foreach (... ... in ...) ... |
-| LoopUnrolling.cs:25:13:26:40 | [unroll (line 25)] foreach (... ... in ...) ... | LoopUnrolling.cs:25:26:25:29 | Char arg0 |
+| LoopUnrolling.cs:25:13:26:40 | foreach (... ... in ...) ... | LoopUnrolling.cs:25:26:25:29 | Char arg0 |
 | LoopUnrolling.cs:25:26:25:29 | Char arg0 | LoopUnrolling.cs:26:17:26:40 | ...; |
-| LoopUnrolling.cs:25:34:25:37 | access to parameter args | LoopUnrolling.cs:25:13:26:40 | [unroll (line 25)] foreach (... ... in ...) ... |
-| LoopUnrolling.cs:26:17:26:39 | call to method WriteLine | LoopUnrolling.cs:25:13:26:40 | foreach (... ... in ...) ... |
+| LoopUnrolling.cs:25:34:25:37 | access to parameter args | LoopUnrolling.cs:25:13:26:40 | foreach (... ... in ...) ... |
 | LoopUnrolling.cs:26:17:26:40 | ...; | LoopUnrolling.cs:26:35:26:38 | access to local variable arg0 |
 | LoopUnrolling.cs:26:35:26:38 | access to local variable arg0 | LoopUnrolling.cs:26:17:26:39 | call to method WriteLine |
 | LoopUnrolling.cs:29:10:29:11 | enter M4 | LoopUnrolling.cs:30:5:34:5 | {...} |
@@ -2784,8 +2131,12 @@ dominance
 | LoopUnrolling.cs:31:13:31:30 | String[] xs = ... | LoopUnrolling.cs:32:27:32:28 | access to local variable xs |
 | LoopUnrolling.cs:31:18:31:30 | array creation of type String[] | LoopUnrolling.cs:31:13:31:30 | String[] xs = ... |
 | LoopUnrolling.cs:31:29:31:29 | 0 | LoopUnrolling.cs:31:18:31:30 | array creation of type String[] |
-| LoopUnrolling.cs:32:9:33:33 | [skip (line 32)] foreach (... ... in ...) ... | LoopUnrolling.cs:29:10:29:11 | exit M4 (normal) |
-| LoopUnrolling.cs:32:27:32:28 | access to local variable xs | LoopUnrolling.cs:32:9:33:33 | [skip (line 32)] foreach (... ... in ...) ... |
+| LoopUnrolling.cs:32:9:33:33 | foreach (... ... in ...) ... | LoopUnrolling.cs:29:10:29:11 | exit M4 (normal) |
+| LoopUnrolling.cs:32:9:33:33 | foreach (... ... in ...) ... | LoopUnrolling.cs:32:22:32:22 | String x |
+| LoopUnrolling.cs:32:22:32:22 | String x | LoopUnrolling.cs:33:13:33:33 | ...; |
+| LoopUnrolling.cs:32:27:32:28 | access to local variable xs | LoopUnrolling.cs:32:9:33:33 | foreach (... ... in ...) ... |
+| LoopUnrolling.cs:33:13:33:33 | ...; | LoopUnrolling.cs:33:31:33:31 | access to local variable x |
+| LoopUnrolling.cs:33:31:33:31 | access to local variable x | LoopUnrolling.cs:33:13:33:32 | call to method WriteLine |
 | LoopUnrolling.cs:36:10:36:11 | enter M5 | LoopUnrolling.cs:37:5:43:5 | {...} |
 | LoopUnrolling.cs:36:10:36:11 | exit M5 (normal) | LoopUnrolling.cs:36:10:36:11 | exit M5 |
 | LoopUnrolling.cs:37:5:43:5 | {...} | LoopUnrolling.cs:38:9:38:48 | ... ...; |
@@ -2805,20 +2156,19 @@ dominance
 | LoopUnrolling.cs:39:33:39:35 | "0" | LoopUnrolling.cs:39:38:39:40 | "1" |
 | LoopUnrolling.cs:39:38:39:40 | "1" | LoopUnrolling.cs:39:43:39:45 | "2" |
 | LoopUnrolling.cs:39:43:39:45 | "2" | LoopUnrolling.cs:39:31:39:47 | { ..., ... } |
-| LoopUnrolling.cs:40:9:42:41 | [unroll (line 40)] foreach (... ... in ...) ... | LoopUnrolling.cs:40:22:40:22 | String x |
 | LoopUnrolling.cs:40:9:42:41 | foreach (... ... in ...) ... | LoopUnrolling.cs:36:10:36:11 | exit M5 (normal) |
+| LoopUnrolling.cs:40:9:42:41 | foreach (... ... in ...) ... | LoopUnrolling.cs:40:22:40:22 | String x |
 | LoopUnrolling.cs:40:22:40:22 | String x | LoopUnrolling.cs:41:31:41:32 | access to local variable ys |
-| LoopUnrolling.cs:40:27:40:28 | access to local variable xs | LoopUnrolling.cs:40:9:42:41 | [unroll (line 40)] foreach (... ... in ...) ... |
-| LoopUnrolling.cs:41:13:42:41 | [unroll (line 41)] foreach (... ... in ...) ... | LoopUnrolling.cs:41:26:41:26 | String y |
-| LoopUnrolling.cs:41:13:42:41 | foreach (... ... in ...) ... | LoopUnrolling.cs:40:9:42:41 | foreach (... ... in ...) ... |
+| LoopUnrolling.cs:40:27:40:28 | access to local variable xs | LoopUnrolling.cs:40:9:42:41 | foreach (... ... in ...) ... |
+| LoopUnrolling.cs:41:13:42:41 | foreach (... ... in ...) ... | LoopUnrolling.cs:41:26:41:26 | String y |
 | LoopUnrolling.cs:41:26:41:26 | String y | LoopUnrolling.cs:42:17:42:41 | ...; |
-| LoopUnrolling.cs:41:31:41:32 | access to local variable ys | LoopUnrolling.cs:41:13:42:41 | [unroll (line 41)] foreach (... ... in ...) ... |
-| LoopUnrolling.cs:42:17:42:40 | call to method WriteLine | LoopUnrolling.cs:41:13:42:41 | foreach (... ... in ...) ... |
+| LoopUnrolling.cs:41:31:41:32 | access to local variable ys | LoopUnrolling.cs:41:13:42:41 | foreach (... ... in ...) ... |
 | LoopUnrolling.cs:42:17:42:41 | ...; | LoopUnrolling.cs:42:35:42:35 | access to local variable x |
 | LoopUnrolling.cs:42:35:42:35 | access to local variable x | LoopUnrolling.cs:42:39:42:39 | access to local variable y |
 | LoopUnrolling.cs:42:35:42:39 | ... + ... | LoopUnrolling.cs:42:17:42:40 | call to method WriteLine |
 | LoopUnrolling.cs:42:39:42:39 | access to local variable y | LoopUnrolling.cs:42:35:42:39 | ... + ... |
 | LoopUnrolling.cs:45:10:45:11 | enter M6 | LoopUnrolling.cs:46:5:53:5 | {...} |
+| LoopUnrolling.cs:45:10:45:11 | exit M6 (normal) | LoopUnrolling.cs:45:10:45:11 | exit M6 |
 | LoopUnrolling.cs:46:5:53:5 | {...} | LoopUnrolling.cs:47:9:47:48 | ... ...; |
 | LoopUnrolling.cs:47:9:47:48 | ... ...; | LoopUnrolling.cs:47:18:47:47 | 3 |
 | LoopUnrolling.cs:47:13:47:47 | String[] xs = ... | LoopUnrolling.cs:48:27:48:28 | access to local variable xs |
@@ -2828,9 +2178,10 @@ dominance
 | LoopUnrolling.cs:47:33:47:35 | "a" | LoopUnrolling.cs:47:38:47:40 | "b" |
 | LoopUnrolling.cs:47:38:47:40 | "b" | LoopUnrolling.cs:47:43:47:45 | "c" |
 | LoopUnrolling.cs:47:43:47:45 | "c" | LoopUnrolling.cs:47:31:47:47 | { ..., ... } |
-| LoopUnrolling.cs:48:9:52:9 | [unroll (line 48)] foreach (... ... in ...) ... | LoopUnrolling.cs:48:22:48:22 | String x |
+| LoopUnrolling.cs:48:9:52:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:45:10:45:11 | exit M6 (normal) |
+| LoopUnrolling.cs:48:9:52:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:48:22:48:22 | String x |
 | LoopUnrolling.cs:48:22:48:22 | String x | LoopUnrolling.cs:49:9:52:9 | {...} |
-| LoopUnrolling.cs:48:27:48:28 | access to local variable xs | LoopUnrolling.cs:48:9:52:9 | [unroll (line 48)] foreach (... ... in ...) ... |
+| LoopUnrolling.cs:48:27:48:28 | access to local variable xs | LoopUnrolling.cs:48:9:52:9 | foreach (... ... in ...) ... |
 | LoopUnrolling.cs:49:9:52:9 | {...} | LoopUnrolling.cs:50:9:50:13 | Label: |
 | LoopUnrolling.cs:50:9:50:13 | Label: | LoopUnrolling.cs:50:16:50:36 | ...; |
 | LoopUnrolling.cs:50:16:50:35 | call to method WriteLine | LoopUnrolling.cs:51:13:51:23 | goto ...; |
@@ -2847,31 +2198,20 @@ dominance
 | LoopUnrolling.cs:57:33:57:35 | "a" | LoopUnrolling.cs:57:38:57:40 | "b" |
 | LoopUnrolling.cs:57:38:57:40 | "b" | LoopUnrolling.cs:57:43:57:45 | "c" |
 | LoopUnrolling.cs:57:43:57:45 | "c" | LoopUnrolling.cs:57:31:57:47 | { ..., ... } |
-| LoopUnrolling.cs:58:9:64:9 | [b (line 55): false] foreach (... ... in ...) ... | LoopUnrolling.cs:58:22:58:22 | [b (line 55): false] String x |
-| LoopUnrolling.cs:58:9:64:9 | [b (line 55): true] foreach (... ... in ...) ... | LoopUnrolling.cs:58:22:58:22 | [b (line 55): true] String x |
-| LoopUnrolling.cs:58:9:64:9 | [unroll (line 58)] foreach (... ... in ...) ... | LoopUnrolling.cs:58:22:58:22 | String x |
+| LoopUnrolling.cs:58:9:64:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:55:10:55:11 | exit M7 (normal) |
+| LoopUnrolling.cs:58:9:64:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:58:22:58:22 | String x |
 | LoopUnrolling.cs:58:22:58:22 | String x | LoopUnrolling.cs:59:9:64:9 | {...} |
-| LoopUnrolling.cs:58:22:58:22 | [b (line 55): false] String x | LoopUnrolling.cs:59:9:64:9 | [b (line 55): false] {...} |
-| LoopUnrolling.cs:58:22:58:22 | [b (line 55): true] String x | LoopUnrolling.cs:59:9:64:9 | [b (line 55): true] {...} |
-| LoopUnrolling.cs:58:27:58:28 | access to local variable xs | LoopUnrolling.cs:58:9:64:9 | [unroll (line 58)] foreach (... ... in ...) ... |
-| LoopUnrolling.cs:59:9:64:9 | [b (line 55): false] {...} | LoopUnrolling.cs:60:13:61:37 | [b (line 55): false] if (...) ... |
-| LoopUnrolling.cs:59:9:64:9 | [b (line 55): true] {...} | LoopUnrolling.cs:60:13:61:37 | [b (line 55): true] if (...) ... |
+| LoopUnrolling.cs:58:27:58:28 | access to local variable xs | LoopUnrolling.cs:58:9:64:9 | foreach (... ... in ...) ... |
 | LoopUnrolling.cs:59:9:64:9 | {...} | LoopUnrolling.cs:60:13:61:37 | if (...) ... |
-| LoopUnrolling.cs:60:13:61:37 | [b (line 55): false] if (...) ... | LoopUnrolling.cs:60:17:60:17 | [b (line 55): false] access to parameter b |
-| LoopUnrolling.cs:60:13:61:37 | [b (line 55): true] if (...) ... | LoopUnrolling.cs:60:17:60:17 | [b (line 55): true] access to parameter b |
 | LoopUnrolling.cs:60:13:61:37 | if (...) ... | LoopUnrolling.cs:60:17:60:17 | access to parameter b |
-| LoopUnrolling.cs:60:17:60:17 | access to parameter b | LoopUnrolling.cs:61:17:61:37 | [b (line 55): true] ...; |
-| LoopUnrolling.cs:60:17:60:17 | access to parameter b | LoopUnrolling.cs:62:13:63:37 | [b (line 55): false] if (...) ... |
-| LoopUnrolling.cs:61:17:61:36 | [b (line 55): true] call to method WriteLine | LoopUnrolling.cs:62:13:63:37 | [b (line 55): true] if (...) ... |
-| LoopUnrolling.cs:61:17:61:37 | [b (line 55): true] ...; | LoopUnrolling.cs:61:35:61:35 | [b (line 55): true] access to local variable x |
-| LoopUnrolling.cs:61:35:61:35 | [b (line 55): true] access to local variable x | LoopUnrolling.cs:61:17:61:36 | [b (line 55): true] call to method WriteLine |
-| LoopUnrolling.cs:62:13:63:37 | [b (line 55): false] if (...) ... | LoopUnrolling.cs:62:17:62:17 | [b (line 55): false] access to parameter b |
-| LoopUnrolling.cs:62:13:63:37 | [b (line 55): true] if (...) ... | LoopUnrolling.cs:62:17:62:17 | [b (line 55): true] access to parameter b |
-| LoopUnrolling.cs:62:17:62:17 | [b (line 55): false] access to parameter b | LoopUnrolling.cs:58:9:64:9 | [b (line 55): false] foreach (... ... in ...) ... |
-| LoopUnrolling.cs:62:17:62:17 | [b (line 55): true] access to parameter b | LoopUnrolling.cs:63:17:63:37 | [b (line 55): true] ...; |
-| LoopUnrolling.cs:63:17:63:36 | [b (line 55): true] call to method WriteLine | LoopUnrolling.cs:58:9:64:9 | [b (line 55): true] foreach (... ... in ...) ... |
-| LoopUnrolling.cs:63:17:63:37 | [b (line 55): true] ...; | LoopUnrolling.cs:63:35:63:35 | [b (line 55): true] access to local variable x |
-| LoopUnrolling.cs:63:35:63:35 | [b (line 55): true] access to local variable x | LoopUnrolling.cs:63:17:63:36 | [b (line 55): true] call to method WriteLine |
+| LoopUnrolling.cs:60:17:60:17 | access to parameter b | LoopUnrolling.cs:61:17:61:37 | ...; |
+| LoopUnrolling.cs:60:17:60:17 | access to parameter b | LoopUnrolling.cs:62:13:63:37 | if (...) ... |
+| LoopUnrolling.cs:61:17:61:37 | ...; | LoopUnrolling.cs:61:35:61:35 | access to local variable x |
+| LoopUnrolling.cs:61:35:61:35 | access to local variable x | LoopUnrolling.cs:61:17:61:36 | call to method WriteLine |
+| LoopUnrolling.cs:62:13:63:37 | if (...) ... | LoopUnrolling.cs:62:17:62:17 | access to parameter b |
+| LoopUnrolling.cs:62:17:62:17 | access to parameter b | LoopUnrolling.cs:63:17:63:37 | ...; |
+| LoopUnrolling.cs:63:17:63:37 | ...; | LoopUnrolling.cs:63:35:63:35 | access to local variable x |
+| LoopUnrolling.cs:63:35:63:35 | access to local variable x | LoopUnrolling.cs:63:17:63:36 | call to method WriteLine |
 | LoopUnrolling.cs:67:10:67:11 | enter M8 | LoopUnrolling.cs:68:5:74:5 | {...} |
 | LoopUnrolling.cs:67:10:67:11 | exit M8 (normal) | LoopUnrolling.cs:67:10:67:11 | exit M8 |
 | LoopUnrolling.cs:68:5:74:5 | {...} | LoopUnrolling.cs:69:9:70:19 | if (...) ... |
@@ -2884,7 +2224,11 @@ dominance
 | LoopUnrolling.cs:71:9:71:12 | access to parameter args | LoopUnrolling.cs:71:9:71:20 | call to method Clear |
 | LoopUnrolling.cs:71:9:71:20 | call to method Clear | LoopUnrolling.cs:72:29:72:32 | access to parameter args |
 | LoopUnrolling.cs:71:9:71:21 | ...; | LoopUnrolling.cs:71:9:71:12 | access to parameter args |
-| LoopUnrolling.cs:72:29:72:32 | access to parameter args | LoopUnrolling.cs:72:9:73:35 | [skip (line 72)] foreach (... ... in ...) ... |
+| LoopUnrolling.cs:72:9:73:35 | foreach (... ... in ...) ... | LoopUnrolling.cs:72:22:72:24 | String arg |
+| LoopUnrolling.cs:72:22:72:24 | String arg | LoopUnrolling.cs:73:13:73:35 | ...; |
+| LoopUnrolling.cs:72:29:72:32 | access to parameter args | LoopUnrolling.cs:72:9:73:35 | foreach (... ... in ...) ... |
+| LoopUnrolling.cs:73:13:73:35 | ...; | LoopUnrolling.cs:73:31:73:33 | access to local variable arg |
+| LoopUnrolling.cs:73:31:73:33 | access to local variable arg | LoopUnrolling.cs:73:13:73:34 | call to method WriteLine |
 | LoopUnrolling.cs:76:10:76:11 | enter M9 | LoopUnrolling.cs:77:5:83:5 | {...} |
 | LoopUnrolling.cs:76:10:76:11 | exit M9 (normal) | LoopUnrolling.cs:76:10:76:11 | exit M9 |
 | LoopUnrolling.cs:77:5:83:5 | {...} | LoopUnrolling.cs:78:9:78:34 | ... ...; |
@@ -2893,8 +2237,13 @@ dominance
 | LoopUnrolling.cs:78:18:78:33 | array creation of type String[,] | LoopUnrolling.cs:78:13:78:33 | String[,] xs = ... |
 | LoopUnrolling.cs:78:29:78:29 | 2 | LoopUnrolling.cs:78:32:78:32 | 0 |
 | LoopUnrolling.cs:78:32:78:32 | 0 | LoopUnrolling.cs:78:18:78:33 | array creation of type String[,] |
-| LoopUnrolling.cs:79:9:82:9 | [skip (line 79)] foreach (... ... in ...) ... | LoopUnrolling.cs:76:10:76:11 | exit M9 (normal) |
-| LoopUnrolling.cs:79:27:79:28 | access to local variable xs | LoopUnrolling.cs:79:9:82:9 | [skip (line 79)] foreach (... ... in ...) ... |
+| LoopUnrolling.cs:79:9:82:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:76:10:76:11 | exit M9 (normal) |
+| LoopUnrolling.cs:79:9:82:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:79:22:79:22 | String x |
+| LoopUnrolling.cs:79:22:79:22 | String x | LoopUnrolling.cs:80:9:82:9 | {...} |
+| LoopUnrolling.cs:79:27:79:28 | access to local variable xs | LoopUnrolling.cs:79:9:82:9 | foreach (... ... in ...) ... |
+| LoopUnrolling.cs:80:9:82:9 | {...} | LoopUnrolling.cs:81:13:81:33 | ...; |
+| LoopUnrolling.cs:81:13:81:33 | ...; | LoopUnrolling.cs:81:31:81:31 | access to local variable x |
+| LoopUnrolling.cs:81:31:81:31 | access to local variable x | LoopUnrolling.cs:81:13:81:32 | call to method WriteLine |
 | LoopUnrolling.cs:85:10:85:12 | enter M10 | LoopUnrolling.cs:86:5:92:5 | {...} |
 | LoopUnrolling.cs:85:10:85:12 | exit M10 (normal) | LoopUnrolling.cs:85:10:85:12 | exit M10 |
 | LoopUnrolling.cs:86:5:92:5 | {...} | LoopUnrolling.cs:87:9:87:34 | ... ...; |
@@ -2903,8 +2252,13 @@ dominance
 | LoopUnrolling.cs:87:18:87:33 | array creation of type String[,] | LoopUnrolling.cs:87:13:87:33 | String[,] xs = ... |
 | LoopUnrolling.cs:87:29:87:29 | 0 | LoopUnrolling.cs:87:32:87:32 | 2 |
 | LoopUnrolling.cs:87:32:87:32 | 2 | LoopUnrolling.cs:87:18:87:33 | array creation of type String[,] |
-| LoopUnrolling.cs:88:9:91:9 | [skip (line 88)] foreach (... ... in ...) ... | LoopUnrolling.cs:85:10:85:12 | exit M10 (normal) |
-| LoopUnrolling.cs:88:27:88:28 | access to local variable xs | LoopUnrolling.cs:88:9:91:9 | [skip (line 88)] foreach (... ... in ...) ... |
+| LoopUnrolling.cs:88:9:91:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:85:10:85:12 | exit M10 (normal) |
+| LoopUnrolling.cs:88:9:91:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:88:22:88:22 | String x |
+| LoopUnrolling.cs:88:22:88:22 | String x | LoopUnrolling.cs:89:9:91:9 | {...} |
+| LoopUnrolling.cs:88:27:88:28 | access to local variable xs | LoopUnrolling.cs:88:9:91:9 | foreach (... ... in ...) ... |
+| LoopUnrolling.cs:89:9:91:9 | {...} | LoopUnrolling.cs:90:13:90:33 | ...; |
+| LoopUnrolling.cs:90:13:90:33 | ...; | LoopUnrolling.cs:90:31:90:31 | access to local variable x |
+| LoopUnrolling.cs:90:31:90:31 | access to local variable x | LoopUnrolling.cs:90:13:90:32 | call to method WriteLine |
 | LoopUnrolling.cs:94:10:94:12 | enter M11 | LoopUnrolling.cs:95:5:101:5 | {...} |
 | LoopUnrolling.cs:94:10:94:12 | exit M11 (normal) | LoopUnrolling.cs:94:10:94:12 | exit M11 |
 | LoopUnrolling.cs:95:5:101:5 | {...} | LoopUnrolling.cs:96:9:96:34 | ... ...; |
@@ -2913,12 +2267,11 @@ dominance
 | LoopUnrolling.cs:96:18:96:33 | array creation of type String[,] | LoopUnrolling.cs:96:13:96:33 | String[,] xs = ... |
 | LoopUnrolling.cs:96:29:96:29 | 2 | LoopUnrolling.cs:96:32:96:32 | 2 |
 | LoopUnrolling.cs:96:32:96:32 | 2 | LoopUnrolling.cs:96:18:96:33 | array creation of type String[,] |
-| LoopUnrolling.cs:97:9:100:9 | [unroll (line 97)] foreach (... ... in ...) ... | LoopUnrolling.cs:97:22:97:22 | String x |
 | LoopUnrolling.cs:97:9:100:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:94:10:94:12 | exit M11 (normal) |
+| LoopUnrolling.cs:97:9:100:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:97:22:97:22 | String x |
 | LoopUnrolling.cs:97:22:97:22 | String x | LoopUnrolling.cs:98:9:100:9 | {...} |
-| LoopUnrolling.cs:97:27:97:28 | access to local variable xs | LoopUnrolling.cs:97:9:100:9 | [unroll (line 97)] foreach (... ... in ...) ... |
+| LoopUnrolling.cs:97:27:97:28 | access to local variable xs | LoopUnrolling.cs:97:9:100:9 | foreach (... ... in ...) ... |
 | LoopUnrolling.cs:98:9:100:9 | {...} | LoopUnrolling.cs:99:13:99:33 | ...; |
-| LoopUnrolling.cs:99:13:99:32 | call to method WriteLine | LoopUnrolling.cs:97:9:100:9 | foreach (... ... in ...) ... |
 | LoopUnrolling.cs:99:13:99:33 | ...; | LoopUnrolling.cs:99:31:99:31 | access to local variable x |
 | LoopUnrolling.cs:99:31:99:31 | access to local variable x | LoopUnrolling.cs:99:13:99:32 | call to method WriteLine |
 | MultiImplementationA.cs:4:7:4:8 | call to constructor Object | MultiImplementationA.cs:4:7:4:8 | {...} |
@@ -4364,7 +3717,6 @@ dominance
 | cflow.cs:256:17:256:37 | ...; | cflow.cs:256:35:256:35 | 0 |
 | cflow.cs:256:35:256:35 | 0 | cflow.cs:256:17:256:36 | call to method WriteLine |
 | cflow.cs:261:49:261:53 | enter Yield | cflow.cs:262:5:277:5 | {...} |
-| cflow.cs:261:49:261:53 | exit Yield (normal) | cflow.cs:261:49:261:53 | exit Yield |
 | cflow.cs:262:5:277:5 | {...} | cflow.cs:263:22:263:22 | 0 |
 | cflow.cs:263:9:263:23 | yield return ...; | cflow.cs:264:9:267:9 | for (...;...;...) ... |
 | cflow.cs:263:22:263:22 | 0 | cflow.cs:263:9:263:23 | yield return ...; |
@@ -4381,11 +3733,12 @@ dominance
 | cflow.cs:266:26:266:26 | access to local variable i | cflow.cs:266:13:266:27 | yield return ...; |
 | cflow.cs:268:9:276:9 | try {...} ... | cflow.cs:269:9:272:9 | {...} |
 | cflow.cs:269:9:272:9 | {...} | cflow.cs:270:13:270:24 | yield break; |
-| cflow.cs:270:13:270:24 | yield break; | cflow.cs:274:9:276:9 | [finally: return] {...} |
-| cflow.cs:274:9:276:9 | [finally: return] {...} | cflow.cs:275:13:275:42 | [finally: return] ...; |
-| cflow.cs:275:13:275:41 | [finally: return] call to method WriteLine | cflow.cs:261:49:261:53 | exit Yield (normal) |
-| cflow.cs:275:13:275:42 | [finally: return] ...; | cflow.cs:275:31:275:40 | [finally: return] "not dead" |
-| cflow.cs:275:31:275:40 | [finally: return] "not dead" | cflow.cs:275:13:275:41 | [finally: return] call to method WriteLine |
+| cflow.cs:270:13:270:24 | yield break; | cflow.cs:274:9:276:9 | {...} |
+| cflow.cs:274:9:276:9 | {...} | cflow.cs:275:13:275:42 | ...; |
+| cflow.cs:275:13:275:41 | call to method WriteLine | cflow.cs:261:49:261:53 | exit Yield (abnormal) |
+| cflow.cs:275:13:275:41 | call to method WriteLine | cflow.cs:261:49:261:53 | exit Yield (normal) |
+| cflow.cs:275:13:275:42 | ...; | cflow.cs:275:31:275:40 | "not dead" |
+| cflow.cs:275:31:275:40 | "not dead" | cflow.cs:275:13:275:41 | call to method WriteLine |
 | cflow.cs:282:5:282:18 | enter ControlFlowSub | cflow.cs:282:24:282:27 | call to constructor ControlFlow |
 | cflow.cs:282:5:282:18 | exit ControlFlowSub (normal) | cflow.cs:282:5:282:18 | exit ControlFlowSub |
 | cflow.cs:282:24:282:27 | call to constructor ControlFlow | cflow.cs:282:31:282:33 | {...} |
@@ -4785,7 +4138,6 @@ postDominance
 | Assert.cs:5:7:5:17 | exit AssertTests | Assert.cs:5:7:5:17 | exit AssertTests (normal) |
 | Assert.cs:5:7:5:17 | exit AssertTests (normal) | Assert.cs:5:7:5:17 | {...} |
 | Assert.cs:5:7:5:17 | {...} | Assert.cs:5:7:5:17 | call to constructor Object |
-| Assert.cs:7:10:7:11 | exit M1 (abnormal) | Assert.cs:10:9:10:31 | [assertion failure] call to method Assert |
 | Assert.cs:7:10:7:11 | exit M1 (normal) | Assert.cs:11:9:11:35 | call to method WriteLine |
 | Assert.cs:8:5:12:5 | {...} | Assert.cs:7:10:7:11 | enter M1 |
 | Assert.cs:9:9:9:33 | ... ...; | Assert.cs:8:5:12:5 | {...} |
@@ -4793,16 +4145,15 @@ postDominance
 | Assert.cs:9:20:9:20 | access to parameter b | Assert.cs:9:9:9:33 | ... ...; |
 | Assert.cs:9:20:9:32 | ... ? ... : ... | Assert.cs:9:24:9:27 | null |
 | Assert.cs:9:20:9:32 | ... ? ... : ... | Assert.cs:9:31:9:32 | "" |
-| Assert.cs:10:9:10:31 | [assertion success] call to method Assert | Assert.cs:10:22:10:30 | ... != ... |
+| Assert.cs:10:9:10:31 | call to method Assert | Assert.cs:10:22:10:30 | ... != ... |
 | Assert.cs:10:9:10:32 | ...; | Assert.cs:9:16:9:32 | String s = ... |
 | Assert.cs:10:22:10:22 | access to local variable s | Assert.cs:10:9:10:32 | ...; |
 | Assert.cs:10:22:10:30 | ... != ... | Assert.cs:10:27:10:30 | null |
 | Assert.cs:10:27:10:30 | null | Assert.cs:10:22:10:22 | access to local variable s |
 | Assert.cs:11:9:11:35 | call to method WriteLine | Assert.cs:11:27:11:34 | access to property Length |
-| Assert.cs:11:9:11:36 | ...; | Assert.cs:10:9:10:31 | [assertion success] call to method Assert |
+| Assert.cs:11:9:11:36 | ...; | Assert.cs:10:9:10:31 | call to method Assert |
 | Assert.cs:11:27:11:27 | access to local variable s | Assert.cs:11:9:11:36 | ...; |
 | Assert.cs:11:27:11:34 | access to property Length | Assert.cs:11:27:11:27 | access to local variable s |
-| Assert.cs:14:10:14:11 | exit M2 (abnormal) | Assert.cs:17:9:17:24 | [assertion failure] call to method IsNull |
 | Assert.cs:14:10:14:11 | exit M2 (normal) | Assert.cs:18:9:18:35 | call to method WriteLine |
 | Assert.cs:15:5:19:5 | {...} | Assert.cs:14:10:14:11 | enter M2 |
 | Assert.cs:16:9:16:33 | ... ...; | Assert.cs:15:5:19:5 | {...} |
@@ -4810,14 +4161,13 @@ postDominance
 | Assert.cs:16:20:16:20 | access to parameter b | Assert.cs:16:9:16:33 | ... ...; |
 | Assert.cs:16:20:16:32 | ... ? ... : ... | Assert.cs:16:24:16:27 | null |
 | Assert.cs:16:20:16:32 | ... ? ... : ... | Assert.cs:16:31:16:32 | "" |
-| Assert.cs:17:9:17:24 | [assertion success] call to method IsNull | Assert.cs:17:23:17:23 | access to local variable s |
+| Assert.cs:17:9:17:24 | call to method IsNull | Assert.cs:17:23:17:23 | access to local variable s |
 | Assert.cs:17:9:17:25 | ...; | Assert.cs:16:16:16:32 | String s = ... |
 | Assert.cs:17:23:17:23 | access to local variable s | Assert.cs:17:9:17:25 | ...; |
 | Assert.cs:18:9:18:35 | call to method WriteLine | Assert.cs:18:27:18:34 | access to property Length |
-| Assert.cs:18:9:18:36 | ...; | Assert.cs:17:9:17:24 | [assertion success] call to method IsNull |
+| Assert.cs:18:9:18:36 | ...; | Assert.cs:17:9:17:24 | call to method IsNull |
 | Assert.cs:18:27:18:27 | access to local variable s | Assert.cs:18:9:18:36 | ...; |
 | Assert.cs:18:27:18:34 | access to property Length | Assert.cs:18:27:18:27 | access to local variable s |
-| Assert.cs:21:10:21:11 | exit M3 (abnormal) | Assert.cs:24:9:24:27 | [assertion failure] call to method IsNotNull |
 | Assert.cs:21:10:21:11 | exit M3 (normal) | Assert.cs:25:9:25:35 | call to method WriteLine |
 | Assert.cs:22:5:26:5 | {...} | Assert.cs:21:10:21:11 | enter M3 |
 | Assert.cs:23:9:23:33 | ... ...; | Assert.cs:22:5:26:5 | {...} |
@@ -4825,14 +4175,13 @@ postDominance
 | Assert.cs:23:20:23:20 | access to parameter b | Assert.cs:23:9:23:33 | ... ...; |
 | Assert.cs:23:20:23:32 | ... ? ... : ... | Assert.cs:23:24:23:27 | null |
 | Assert.cs:23:20:23:32 | ... ? ... : ... | Assert.cs:23:31:23:32 | "" |
-| Assert.cs:24:9:24:27 | [assertion success] call to method IsNotNull | Assert.cs:24:26:24:26 | access to local variable s |
+| Assert.cs:24:9:24:27 | call to method IsNotNull | Assert.cs:24:26:24:26 | access to local variable s |
 | Assert.cs:24:9:24:28 | ...; | Assert.cs:23:16:23:32 | String s = ... |
 | Assert.cs:24:26:24:26 | access to local variable s | Assert.cs:24:9:24:28 | ...; |
 | Assert.cs:25:9:25:35 | call to method WriteLine | Assert.cs:25:27:25:34 | access to property Length |
-| Assert.cs:25:9:25:36 | ...; | Assert.cs:24:9:24:27 | [assertion success] call to method IsNotNull |
+| Assert.cs:25:9:25:36 | ...; | Assert.cs:24:9:24:27 | call to method IsNotNull |
 | Assert.cs:25:27:25:27 | access to local variable s | Assert.cs:25:9:25:36 | ...; |
 | Assert.cs:25:27:25:34 | access to property Length | Assert.cs:25:27:25:27 | access to local variable s |
-| Assert.cs:28:10:28:11 | exit M4 (abnormal) | Assert.cs:31:9:31:32 | [assertion failure] call to method IsTrue |
 | Assert.cs:28:10:28:11 | exit M4 (normal) | Assert.cs:32:9:32:35 | call to method WriteLine |
 | Assert.cs:29:5:33:5 | {...} | Assert.cs:28:10:28:11 | enter M4 |
 | Assert.cs:30:9:30:33 | ... ...; | Assert.cs:29:5:33:5 | {...} |
@@ -4840,16 +4189,15 @@ postDominance
 | Assert.cs:30:20:30:20 | access to parameter b | Assert.cs:30:9:30:33 | ... ...; |
 | Assert.cs:30:20:30:32 | ... ? ... : ... | Assert.cs:30:24:30:27 | null |
 | Assert.cs:30:20:30:32 | ... ? ... : ... | Assert.cs:30:31:30:32 | "" |
-| Assert.cs:31:9:31:32 | [assertion success] call to method IsTrue | Assert.cs:31:23:31:31 | ... == ... |
+| Assert.cs:31:9:31:32 | call to method IsTrue | Assert.cs:31:23:31:31 | ... == ... |
 | Assert.cs:31:9:31:33 | ...; | Assert.cs:30:16:30:32 | String s = ... |
 | Assert.cs:31:23:31:23 | access to local variable s | Assert.cs:31:9:31:33 | ...; |
 | Assert.cs:31:23:31:31 | ... == ... | Assert.cs:31:28:31:31 | null |
 | Assert.cs:31:28:31:31 | null | Assert.cs:31:23:31:23 | access to local variable s |
 | Assert.cs:32:9:32:35 | call to method WriteLine | Assert.cs:32:27:32:34 | access to property Length |
-| Assert.cs:32:9:32:36 | ...; | Assert.cs:31:9:31:32 | [assertion success] call to method IsTrue |
+| Assert.cs:32:9:32:36 | ...; | Assert.cs:31:9:31:32 | call to method IsTrue |
 | Assert.cs:32:27:32:27 | access to local variable s | Assert.cs:32:9:32:36 | ...; |
 | Assert.cs:32:27:32:34 | access to property Length | Assert.cs:32:27:32:27 | access to local variable s |
-| Assert.cs:35:10:35:11 | exit M5 (abnormal) | Assert.cs:38:9:38:32 | [assertion failure] call to method IsTrue |
 | Assert.cs:35:10:35:11 | exit M5 (normal) | Assert.cs:39:9:39:35 | call to method WriteLine |
 | Assert.cs:36:5:40:5 | {...} | Assert.cs:35:10:35:11 | enter M5 |
 | Assert.cs:37:9:37:33 | ... ...; | Assert.cs:36:5:40:5 | {...} |
@@ -4857,16 +4205,15 @@ postDominance
 | Assert.cs:37:20:37:20 | access to parameter b | Assert.cs:37:9:37:33 | ... ...; |
 | Assert.cs:37:20:37:32 | ... ? ... : ... | Assert.cs:37:24:37:27 | null |
 | Assert.cs:37:20:37:32 | ... ? ... : ... | Assert.cs:37:31:37:32 | "" |
-| Assert.cs:38:9:38:32 | [assertion success] call to method IsTrue | Assert.cs:38:23:38:31 | ... != ... |
+| Assert.cs:38:9:38:32 | call to method IsTrue | Assert.cs:38:23:38:31 | ... != ... |
 | Assert.cs:38:9:38:33 | ...; | Assert.cs:37:16:37:32 | String s = ... |
 | Assert.cs:38:23:38:23 | access to local variable s | Assert.cs:38:9:38:33 | ...; |
 | Assert.cs:38:23:38:31 | ... != ... | Assert.cs:38:28:38:31 | null |
 | Assert.cs:38:28:38:31 | null | Assert.cs:38:23:38:23 | access to local variable s |
 | Assert.cs:39:9:39:35 | call to method WriteLine | Assert.cs:39:27:39:34 | access to property Length |
-| Assert.cs:39:9:39:36 | ...; | Assert.cs:38:9:38:32 | [assertion success] call to method IsTrue |
+| Assert.cs:39:9:39:36 | ...; | Assert.cs:38:9:38:32 | call to method IsTrue |
 | Assert.cs:39:27:39:27 | access to local variable s | Assert.cs:39:9:39:36 | ...; |
 | Assert.cs:39:27:39:34 | access to property Length | Assert.cs:39:27:39:27 | access to local variable s |
-| Assert.cs:42:10:42:11 | exit M6 (abnormal) | Assert.cs:45:9:45:33 | [assertion failure] call to method IsFalse |
 | Assert.cs:42:10:42:11 | exit M6 (normal) | Assert.cs:46:9:46:35 | call to method WriteLine |
 | Assert.cs:43:5:47:5 | {...} | Assert.cs:42:10:42:11 | enter M6 |
 | Assert.cs:44:9:44:33 | ... ...; | Assert.cs:43:5:47:5 | {...} |
@@ -4874,16 +4221,15 @@ postDominance
 | Assert.cs:44:20:44:20 | access to parameter b | Assert.cs:44:9:44:33 | ... ...; |
 | Assert.cs:44:20:44:32 | ... ? ... : ... | Assert.cs:44:24:44:27 | null |
 | Assert.cs:44:20:44:32 | ... ? ... : ... | Assert.cs:44:31:44:32 | "" |
-| Assert.cs:45:9:45:33 | [assertion success] call to method IsFalse | Assert.cs:45:24:45:32 | ... != ... |
+| Assert.cs:45:9:45:33 | call to method IsFalse | Assert.cs:45:24:45:32 | ... != ... |
 | Assert.cs:45:9:45:34 | ...; | Assert.cs:44:16:44:32 | String s = ... |
 | Assert.cs:45:24:45:24 | access to local variable s | Assert.cs:45:9:45:34 | ...; |
 | Assert.cs:45:24:45:32 | ... != ... | Assert.cs:45:29:45:32 | null |
 | Assert.cs:45:29:45:32 | null | Assert.cs:45:24:45:24 | access to local variable s |
 | Assert.cs:46:9:46:35 | call to method WriteLine | Assert.cs:46:27:46:34 | access to property Length |
-| Assert.cs:46:9:46:36 | ...; | Assert.cs:45:9:45:33 | [assertion success] call to method IsFalse |
+| Assert.cs:46:9:46:36 | ...; | Assert.cs:45:9:45:33 | call to method IsFalse |
 | Assert.cs:46:27:46:27 | access to local variable s | Assert.cs:46:9:46:36 | ...; |
 | Assert.cs:46:27:46:34 | access to property Length | Assert.cs:46:27:46:27 | access to local variable s |
-| Assert.cs:49:10:49:11 | exit M7 (abnormal) | Assert.cs:52:9:52:33 | [assertion failure] call to method IsFalse |
 | Assert.cs:49:10:49:11 | exit M7 (normal) | Assert.cs:53:9:53:35 | call to method WriteLine |
 | Assert.cs:50:5:54:5 | {...} | Assert.cs:49:10:49:11 | enter M7 |
 | Assert.cs:51:9:51:33 | ... ...; | Assert.cs:50:5:54:5 | {...} |
@@ -4891,361 +4237,247 @@ postDominance
 | Assert.cs:51:20:51:20 | access to parameter b | Assert.cs:51:9:51:33 | ... ...; |
 | Assert.cs:51:20:51:32 | ... ? ... : ... | Assert.cs:51:24:51:27 | null |
 | Assert.cs:51:20:51:32 | ... ? ... : ... | Assert.cs:51:31:51:32 | "" |
-| Assert.cs:52:9:52:33 | [assertion success] call to method IsFalse | Assert.cs:52:24:52:32 | ... == ... |
+| Assert.cs:52:9:52:33 | call to method IsFalse | Assert.cs:52:24:52:32 | ... == ... |
 | Assert.cs:52:9:52:34 | ...; | Assert.cs:51:16:51:32 | String s = ... |
 | Assert.cs:52:24:52:24 | access to local variable s | Assert.cs:52:9:52:34 | ...; |
 | Assert.cs:52:24:52:32 | ... == ... | Assert.cs:52:29:52:32 | null |
 | Assert.cs:52:29:52:32 | null | Assert.cs:52:24:52:24 | access to local variable s |
 | Assert.cs:53:9:53:35 | call to method WriteLine | Assert.cs:53:27:53:34 | access to property Length |
-| Assert.cs:53:9:53:36 | ...; | Assert.cs:52:9:52:33 | [assertion success] call to method IsFalse |
+| Assert.cs:53:9:53:36 | ...; | Assert.cs:52:9:52:33 | call to method IsFalse |
 | Assert.cs:53:27:53:27 | access to local variable s | Assert.cs:53:9:53:36 | ...; |
 | Assert.cs:53:27:53:34 | access to property Length | Assert.cs:53:27:53:27 | access to local variable s |
-| Assert.cs:56:10:56:11 | exit M8 (abnormal) | Assert.cs:59:9:59:37 | [assertion failure] call to method IsTrue |
 | Assert.cs:56:10:56:11 | exit M8 (normal) | Assert.cs:60:9:60:35 | call to method WriteLine |
 | Assert.cs:57:5:61:5 | {...} | Assert.cs:56:10:56:11 | enter M8 |
 | Assert.cs:58:9:58:33 | ... ...; | Assert.cs:57:5:61:5 | {...} |
-| Assert.cs:58:16:58:32 | [b (line 56): false] String s = ... | Assert.cs:58:20:58:32 | [b (line 56): false] ... ? ... : ... |
-| Assert.cs:58:16:58:32 | [b (line 56): true] String s = ... | Assert.cs:58:20:58:32 | [b (line 56): true] ... ? ... : ... |
+| Assert.cs:58:16:58:32 | String s = ... | Assert.cs:58:20:58:32 | ... ? ... : ... |
 | Assert.cs:58:20:58:20 | access to parameter b | Assert.cs:58:9:58:33 | ... ...; |
-| Assert.cs:58:20:58:32 | [b (line 56): false] ... ? ... : ... | Assert.cs:58:31:58:32 | [b (line 56): false] "" |
-| Assert.cs:58:20:58:32 | [b (line 56): true] ... ? ... : ... | Assert.cs:58:24:58:27 | [b (line 56): true] null |
-| Assert.cs:58:24:58:27 | [b (line 56): true] null | Assert.cs:58:20:58:20 | access to parameter b |
-| Assert.cs:59:9:59:37 | [assertion success] call to method IsTrue | Assert.cs:59:23:59:36 | [true] ... && ... |
-| Assert.cs:59:9:59:38 | [b (line 56): false] ...; | Assert.cs:58:16:58:32 | [b (line 56): false] String s = ... |
-| Assert.cs:59:9:59:38 | [b (line 56): true] ...; | Assert.cs:58:16:58:32 | [b (line 56): true] String s = ... |
-| Assert.cs:59:23:59:23 | [b (line 56): false] access to local variable s | Assert.cs:59:9:59:38 | [b (line 56): false] ...; |
-| Assert.cs:59:23:59:23 | [b (line 56): true] access to local variable s | Assert.cs:59:9:59:38 | [b (line 56): true] ...; |
-| Assert.cs:59:23:59:31 | [b (line 56): false] ... != ... | Assert.cs:59:28:59:31 | [b (line 56): false] null |
-| Assert.cs:59:23:59:31 | [b (line 56): true] ... != ... | Assert.cs:59:28:59:31 | [b (line 56): true] null |
-| Assert.cs:59:23:59:36 | [true] ... && ... | Assert.cs:59:36:59:36 | [b (line 56): true] access to parameter b |
-| Assert.cs:59:28:59:31 | [b (line 56): false] null | Assert.cs:59:23:59:23 | [b (line 56): false] access to local variable s |
-| Assert.cs:59:28:59:31 | [b (line 56): true] null | Assert.cs:59:23:59:23 | [b (line 56): true] access to local variable s |
-| Assert.cs:59:36:59:36 | [b (line 56): true] access to parameter b | Assert.cs:59:23:59:31 | [b (line 56): true] ... != ... |
+| Assert.cs:58:20:58:32 | ... ? ... : ... | Assert.cs:58:24:58:27 | null |
+| Assert.cs:58:20:58:32 | ... ? ... : ... | Assert.cs:58:31:58:32 | "" |
+| Assert.cs:59:9:59:37 | call to method IsTrue | Assert.cs:59:23:59:36 | ... && ... |
+| Assert.cs:59:9:59:38 | ...; | Assert.cs:58:16:58:32 | String s = ... |
+| Assert.cs:59:23:59:23 | access to local variable s | Assert.cs:59:9:59:38 | ...; |
+| Assert.cs:59:23:59:31 | ... != ... | Assert.cs:59:28:59:31 | null |
+| Assert.cs:59:23:59:36 | ... && ... | Assert.cs:59:23:59:31 | ... != ... |
+| Assert.cs:59:23:59:36 | ... && ... | Assert.cs:59:36:59:36 | access to parameter b |
+| Assert.cs:59:28:59:31 | null | Assert.cs:59:23:59:23 | access to local variable s |
 | Assert.cs:60:9:60:35 | call to method WriteLine | Assert.cs:60:27:60:34 | access to property Length |
-| Assert.cs:60:9:60:36 | ...; | Assert.cs:59:9:59:37 | [assertion success] call to method IsTrue |
+| Assert.cs:60:9:60:36 | ...; | Assert.cs:59:9:59:37 | call to method IsTrue |
 | Assert.cs:60:27:60:27 | access to local variable s | Assert.cs:60:9:60:36 | ...; |
 | Assert.cs:60:27:60:34 | access to property Length | Assert.cs:60:27:60:27 | access to local variable s |
-| Assert.cs:63:10:63:11 | exit M9 (abnormal) | Assert.cs:66:9:66:38 | [assertion failure] call to method IsFalse |
 | Assert.cs:63:10:63:11 | exit M9 (normal) | Assert.cs:67:9:67:35 | call to method WriteLine |
 | Assert.cs:64:5:68:5 | {...} | Assert.cs:63:10:63:11 | enter M9 |
 | Assert.cs:65:9:65:33 | ... ...; | Assert.cs:64:5:68:5 | {...} |
-| Assert.cs:65:16:65:32 | [b (line 63): false] String s = ... | Assert.cs:65:20:65:32 | [b (line 63): false] ... ? ... : ... |
-| Assert.cs:65:16:65:32 | [b (line 63): true] String s = ... | Assert.cs:65:20:65:32 | [b (line 63): true] ... ? ... : ... |
+| Assert.cs:65:16:65:32 | String s = ... | Assert.cs:65:20:65:32 | ... ? ... : ... |
 | Assert.cs:65:20:65:20 | access to parameter b | Assert.cs:65:9:65:33 | ... ...; |
-| Assert.cs:65:20:65:32 | [b (line 63): false] ... ? ... : ... | Assert.cs:65:31:65:32 | [b (line 63): false] "" |
-| Assert.cs:65:20:65:32 | [b (line 63): true] ... ? ... : ... | Assert.cs:65:24:65:27 | [b (line 63): true] null |
-| Assert.cs:65:31:65:32 | [b (line 63): false] "" | Assert.cs:65:20:65:20 | access to parameter b |
-| Assert.cs:66:9:66:38 | [assertion success] call to method IsFalse | Assert.cs:66:24:66:37 | [false] ... \|\| ... |
-| Assert.cs:66:9:66:39 | [b (line 63): false] ...; | Assert.cs:65:16:65:32 | [b (line 63): false] String s = ... |
-| Assert.cs:66:9:66:39 | [b (line 63): true] ...; | Assert.cs:65:16:65:32 | [b (line 63): true] String s = ... |
-| Assert.cs:66:24:66:24 | [b (line 63): false] access to local variable s | Assert.cs:66:9:66:39 | [b (line 63): false] ...; |
-| Assert.cs:66:24:66:24 | [b (line 63): true] access to local variable s | Assert.cs:66:9:66:39 | [b (line 63): true] ...; |
-| Assert.cs:66:24:66:32 | [b (line 63): false] ... == ... | Assert.cs:66:29:66:32 | [b (line 63): false] null |
-| Assert.cs:66:24:66:32 | [b (line 63): true] ... == ... | Assert.cs:66:29:66:32 | [b (line 63): true] null |
-| Assert.cs:66:24:66:37 | [false] ... \|\| ... | Assert.cs:66:37:66:37 | [b (line 63): false] access to parameter b |
-| Assert.cs:66:29:66:32 | [b (line 63): false] null | Assert.cs:66:24:66:24 | [b (line 63): false] access to local variable s |
-| Assert.cs:66:29:66:32 | [b (line 63): true] null | Assert.cs:66:24:66:24 | [b (line 63): true] access to local variable s |
-| Assert.cs:66:37:66:37 | [b (line 63): false] access to parameter b | Assert.cs:66:24:66:32 | [b (line 63): false] ... == ... |
+| Assert.cs:65:20:65:32 | ... ? ... : ... | Assert.cs:65:24:65:27 | null |
+| Assert.cs:65:20:65:32 | ... ? ... : ... | Assert.cs:65:31:65:32 | "" |
+| Assert.cs:66:9:66:38 | call to method IsFalse | Assert.cs:66:24:66:37 | ... \|\| ... |
+| Assert.cs:66:9:66:39 | ...; | Assert.cs:65:16:65:32 | String s = ... |
+| Assert.cs:66:24:66:24 | access to local variable s | Assert.cs:66:9:66:39 | ...; |
+| Assert.cs:66:24:66:32 | ... == ... | Assert.cs:66:29:66:32 | null |
+| Assert.cs:66:24:66:37 | ... \|\| ... | Assert.cs:66:24:66:32 | ... == ... |
+| Assert.cs:66:24:66:37 | ... \|\| ... | Assert.cs:66:37:66:37 | access to parameter b |
+| Assert.cs:66:29:66:32 | null | Assert.cs:66:24:66:24 | access to local variable s |
 | Assert.cs:67:9:67:35 | call to method WriteLine | Assert.cs:67:27:67:34 | access to property Length |
-| Assert.cs:67:9:67:36 | ...; | Assert.cs:66:9:66:38 | [assertion success] call to method IsFalse |
+| Assert.cs:67:9:67:36 | ...; | Assert.cs:66:9:66:38 | call to method IsFalse |
 | Assert.cs:67:27:67:27 | access to local variable s | Assert.cs:67:9:67:36 | ...; |
 | Assert.cs:67:27:67:34 | access to property Length | Assert.cs:67:27:67:27 | access to local variable s |
-| Assert.cs:70:10:70:12 | exit M10 (abnormal) | Assert.cs:73:9:73:37 | [assertion failure] call to method IsTrue |
 | Assert.cs:70:10:70:12 | exit M10 (normal) | Assert.cs:74:9:74:35 | call to method WriteLine |
 | Assert.cs:71:5:75:5 | {...} | Assert.cs:70:10:70:12 | enter M10 |
 | Assert.cs:72:9:72:33 | ... ...; | Assert.cs:71:5:75:5 | {...} |
-| Assert.cs:72:16:72:32 | [b (line 70): false] String s = ... | Assert.cs:72:20:72:32 | [b (line 70): false] ... ? ... : ... |
-| Assert.cs:72:16:72:32 | [b (line 70): true] String s = ... | Assert.cs:72:20:72:32 | [b (line 70): true] ... ? ... : ... |
+| Assert.cs:72:16:72:32 | String s = ... | Assert.cs:72:20:72:32 | ... ? ... : ... |
 | Assert.cs:72:20:72:20 | access to parameter b | Assert.cs:72:9:72:33 | ... ...; |
-| Assert.cs:72:20:72:32 | [b (line 70): false] ... ? ... : ... | Assert.cs:72:31:72:32 | [b (line 70): false] "" |
-| Assert.cs:72:20:72:32 | [b (line 70): true] ... ? ... : ... | Assert.cs:72:24:72:27 | [b (line 70): true] null |
-| Assert.cs:72:24:72:27 | [b (line 70): true] null | Assert.cs:72:20:72:20 | access to parameter b |
-| Assert.cs:73:9:73:37 | [assertion success] call to method IsTrue | Assert.cs:73:23:73:36 | [true] ... && ... |
-| Assert.cs:73:9:73:38 | [b (line 70): false] ...; | Assert.cs:72:16:72:32 | [b (line 70): false] String s = ... |
-| Assert.cs:73:9:73:38 | [b (line 70): true] ...; | Assert.cs:72:16:72:32 | [b (line 70): true] String s = ... |
-| Assert.cs:73:23:73:23 | [b (line 70): false] access to local variable s | Assert.cs:73:9:73:38 | [b (line 70): false] ...; |
-| Assert.cs:73:23:73:23 | [b (line 70): true] access to local variable s | Assert.cs:73:9:73:38 | [b (line 70): true] ...; |
-| Assert.cs:73:23:73:31 | [b (line 70): false] ... == ... | Assert.cs:73:28:73:31 | [b (line 70): false] null |
-| Assert.cs:73:23:73:31 | [b (line 70): true] ... == ... | Assert.cs:73:28:73:31 | [b (line 70): true] null |
-| Assert.cs:73:23:73:36 | [true] ... && ... | Assert.cs:73:36:73:36 | [b (line 70): true] access to parameter b |
-| Assert.cs:73:28:73:31 | [b (line 70): false] null | Assert.cs:73:23:73:23 | [b (line 70): false] access to local variable s |
-| Assert.cs:73:28:73:31 | [b (line 70): true] null | Assert.cs:73:23:73:23 | [b (line 70): true] access to local variable s |
-| Assert.cs:73:36:73:36 | [b (line 70): true] access to parameter b | Assert.cs:73:23:73:31 | [b (line 70): true] ... == ... |
+| Assert.cs:72:20:72:32 | ... ? ... : ... | Assert.cs:72:24:72:27 | null |
+| Assert.cs:72:20:72:32 | ... ? ... : ... | Assert.cs:72:31:72:32 | "" |
+| Assert.cs:73:9:73:37 | call to method IsTrue | Assert.cs:73:23:73:36 | ... && ... |
+| Assert.cs:73:9:73:38 | ...; | Assert.cs:72:16:72:32 | String s = ... |
+| Assert.cs:73:23:73:23 | access to local variable s | Assert.cs:73:9:73:38 | ...; |
+| Assert.cs:73:23:73:31 | ... == ... | Assert.cs:73:28:73:31 | null |
+| Assert.cs:73:23:73:36 | ... && ... | Assert.cs:73:23:73:31 | ... == ... |
+| Assert.cs:73:23:73:36 | ... && ... | Assert.cs:73:36:73:36 | access to parameter b |
+| Assert.cs:73:28:73:31 | null | Assert.cs:73:23:73:23 | access to local variable s |
 | Assert.cs:74:9:74:35 | call to method WriteLine | Assert.cs:74:27:74:34 | access to property Length |
-| Assert.cs:74:9:74:36 | ...; | Assert.cs:73:9:73:37 | [assertion success] call to method IsTrue |
+| Assert.cs:74:9:74:36 | ...; | Assert.cs:73:9:73:37 | call to method IsTrue |
 | Assert.cs:74:27:74:27 | access to local variable s | Assert.cs:74:9:74:36 | ...; |
 | Assert.cs:74:27:74:34 | access to property Length | Assert.cs:74:27:74:27 | access to local variable s |
-| Assert.cs:77:10:77:12 | exit M11 (abnormal) | Assert.cs:80:9:80:38 | [assertion failure] call to method IsFalse |
 | Assert.cs:77:10:77:12 | exit M11 (normal) | Assert.cs:81:9:81:35 | call to method WriteLine |
 | Assert.cs:78:5:82:5 | {...} | Assert.cs:77:10:77:12 | enter M11 |
 | Assert.cs:79:9:79:33 | ... ...; | Assert.cs:78:5:82:5 | {...} |
-| Assert.cs:79:16:79:32 | [b (line 77): false] String s = ... | Assert.cs:79:20:79:32 | [b (line 77): false] ... ? ... : ... |
-| Assert.cs:79:16:79:32 | [b (line 77): true] String s = ... | Assert.cs:79:20:79:32 | [b (line 77): true] ... ? ... : ... |
+| Assert.cs:79:16:79:32 | String s = ... | Assert.cs:79:20:79:32 | ... ? ... : ... |
 | Assert.cs:79:20:79:20 | access to parameter b | Assert.cs:79:9:79:33 | ... ...; |
-| Assert.cs:79:20:79:32 | [b (line 77): false] ... ? ... : ... | Assert.cs:79:31:79:32 | [b (line 77): false] "" |
-| Assert.cs:79:20:79:32 | [b (line 77): true] ... ? ... : ... | Assert.cs:79:24:79:27 | [b (line 77): true] null |
-| Assert.cs:79:31:79:32 | [b (line 77): false] "" | Assert.cs:79:20:79:20 | access to parameter b |
-| Assert.cs:80:9:80:38 | [assertion success] call to method IsFalse | Assert.cs:80:24:80:37 | [false] ... \|\| ... |
-| Assert.cs:80:9:80:39 | [b (line 77): false] ...; | Assert.cs:79:16:79:32 | [b (line 77): false] String s = ... |
-| Assert.cs:80:9:80:39 | [b (line 77): true] ...; | Assert.cs:79:16:79:32 | [b (line 77): true] String s = ... |
-| Assert.cs:80:24:80:24 | [b (line 77): false] access to local variable s | Assert.cs:80:9:80:39 | [b (line 77): false] ...; |
-| Assert.cs:80:24:80:24 | [b (line 77): true] access to local variable s | Assert.cs:80:9:80:39 | [b (line 77): true] ...; |
-| Assert.cs:80:24:80:32 | [b (line 77): false] ... != ... | Assert.cs:80:29:80:32 | [b (line 77): false] null |
-| Assert.cs:80:24:80:32 | [b (line 77): true] ... != ... | Assert.cs:80:29:80:32 | [b (line 77): true] null |
-| Assert.cs:80:24:80:37 | [false] ... \|\| ... | Assert.cs:80:37:80:37 | [b (line 77): false] access to parameter b |
-| Assert.cs:80:29:80:32 | [b (line 77): false] null | Assert.cs:80:24:80:24 | [b (line 77): false] access to local variable s |
-| Assert.cs:80:29:80:32 | [b (line 77): true] null | Assert.cs:80:24:80:24 | [b (line 77): true] access to local variable s |
-| Assert.cs:80:37:80:37 | [b (line 77): false] access to parameter b | Assert.cs:80:24:80:32 | [b (line 77): false] ... != ... |
+| Assert.cs:79:20:79:32 | ... ? ... : ... | Assert.cs:79:24:79:27 | null |
+| Assert.cs:79:20:79:32 | ... ? ... : ... | Assert.cs:79:31:79:32 | "" |
+| Assert.cs:80:9:80:38 | call to method IsFalse | Assert.cs:80:24:80:37 | ... \|\| ... |
+| Assert.cs:80:9:80:39 | ...; | Assert.cs:79:16:79:32 | String s = ... |
+| Assert.cs:80:24:80:24 | access to local variable s | Assert.cs:80:9:80:39 | ...; |
+| Assert.cs:80:24:80:32 | ... != ... | Assert.cs:80:29:80:32 | null |
+| Assert.cs:80:24:80:37 | ... \|\| ... | Assert.cs:80:24:80:32 | ... != ... |
+| Assert.cs:80:24:80:37 | ... \|\| ... | Assert.cs:80:37:80:37 | access to parameter b |
+| Assert.cs:80:29:80:32 | null | Assert.cs:80:24:80:24 | access to local variable s |
 | Assert.cs:81:9:81:35 | call to method WriteLine | Assert.cs:81:27:81:34 | access to property Length |
-| Assert.cs:81:9:81:36 | ...; | Assert.cs:80:9:80:38 | [assertion success] call to method IsFalse |
+| Assert.cs:81:9:81:36 | ...; | Assert.cs:80:9:80:38 | call to method IsFalse |
 | Assert.cs:81:27:81:27 | access to local variable s | Assert.cs:81:9:81:36 | ...; |
 | Assert.cs:81:27:81:34 | access to property Length | Assert.cs:81:27:81:27 | access to local variable s |
 | Assert.cs:84:10:84:12 | exit M12 (normal) | Assert.cs:128:9:128:35 | call to method WriteLine |
 | Assert.cs:85:5:129:5 | {...} | Assert.cs:84:10:84:12 | enter M12 |
 | Assert.cs:86:9:86:33 | ... ...; | Assert.cs:85:5:129:5 | {...} |
-| Assert.cs:86:16:86:32 | [b (line 84): false] String s = ... | Assert.cs:86:20:86:32 | [b (line 84): false] ... ? ... : ... |
-| Assert.cs:86:16:86:32 | [b (line 84): true] String s = ... | Assert.cs:86:20:86:32 | [b (line 84): true] ... ? ... : ... |
+| Assert.cs:86:16:86:32 | String s = ... | Assert.cs:86:20:86:32 | ... ? ... : ... |
 | Assert.cs:86:20:86:20 | access to parameter b | Assert.cs:86:9:86:33 | ... ...; |
-| Assert.cs:86:20:86:32 | [b (line 84): false] ... ? ... : ... | Assert.cs:86:31:86:32 | [b (line 84): false] "" |
-| Assert.cs:86:20:86:32 | [b (line 84): true] ... ? ... : ... | Assert.cs:86:24:86:27 | [b (line 84): true] null |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:86:20:86:20 | access to parameter b |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:87:22:87:30 | [b (line 84): true] ... != ... |
-| Assert.cs:87:9:87:32 | [b (line 84): false] ...; | Assert.cs:86:16:86:32 | [b (line 84): false] String s = ... |
-| Assert.cs:87:9:87:32 | [b (line 84): true] ...; | Assert.cs:86:16:86:32 | [b (line 84): true] String s = ... |
-| Assert.cs:87:22:87:22 | [b (line 84): false] access to local variable s | Assert.cs:87:9:87:32 | [b (line 84): false] ...; |
-| Assert.cs:87:22:87:22 | [b (line 84): true] access to local variable s | Assert.cs:87:9:87:32 | [b (line 84): true] ...; |
-| Assert.cs:87:22:87:30 | [b (line 84): false] ... != ... | Assert.cs:87:27:87:30 | [b (line 84): false] null |
-| Assert.cs:87:22:87:30 | [b (line 84): true] ... != ... | Assert.cs:87:27:87:30 | [b (line 84): true] null |
-| Assert.cs:87:27:87:30 | [b (line 84): false] null | Assert.cs:87:22:87:22 | [b (line 84): false] access to local variable s |
-| Assert.cs:87:27:87:30 | [b (line 84): true] null | Assert.cs:87:22:87:22 | [b (line 84): true] access to local variable s |
-| Assert.cs:88:9:88:35 | [b (line 84): false] call to method WriteLine | Assert.cs:88:27:88:34 | [b (line 84): false] access to property Length |
-| Assert.cs:88:9:88:35 | [b (line 84): true] call to method WriteLine | Assert.cs:88:27:88:34 | [b (line 84): true] access to property Length |
-| Assert.cs:88:9:88:36 | [b (line 84): false] ...; | Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert |
-| Assert.cs:88:9:88:36 | [b (line 84): true] ...; | Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert |
-| Assert.cs:88:27:88:27 | [b (line 84): false] access to local variable s | Assert.cs:88:9:88:36 | [b (line 84): false] ...; |
-| Assert.cs:88:27:88:27 | [b (line 84): true] access to local variable s | Assert.cs:88:9:88:36 | [b (line 84): true] ...; |
-| Assert.cs:88:27:88:34 | [b (line 84): false] access to property Length | Assert.cs:88:27:88:27 | [b (line 84): false] access to local variable s |
-| Assert.cs:88:27:88:34 | [b (line 84): true] access to property Length | Assert.cs:88:27:88:27 | [b (line 84): true] access to local variable s |
-| Assert.cs:90:9:90:25 | [b (line 84): false] ... = ... | Assert.cs:90:13:90:25 | [b (line 84): false] ... ? ... : ... |
-| Assert.cs:90:9:90:25 | [b (line 84): true] ... = ... | Assert.cs:90:13:90:25 | [b (line 84): true] ... ? ... : ... |
-| Assert.cs:90:9:90:26 | [b (line 84): false] ...; | Assert.cs:88:9:88:35 | [b (line 84): false] call to method WriteLine |
-| Assert.cs:90:9:90:26 | [b (line 84): true] ...; | Assert.cs:88:9:88:35 | [b (line 84): true] call to method WriteLine |
-| Assert.cs:90:13:90:13 | [b (line 84): false] access to parameter b | Assert.cs:90:9:90:26 | [b (line 84): false] ...; |
-| Assert.cs:90:13:90:13 | [b (line 84): true] access to parameter b | Assert.cs:90:9:90:26 | [b (line 84): true] ...; |
-| Assert.cs:90:13:90:25 | [b (line 84): false] ... ? ... : ... | Assert.cs:90:24:90:25 | [b (line 84): false] "" |
-| Assert.cs:90:13:90:25 | [b (line 84): true] ... ? ... : ... | Assert.cs:90:17:90:20 | [b (line 84): true] null |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:90:13:90:13 | [b (line 84): true] access to parameter b |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:91:23:91:23 | [b (line 84): true] access to local variable s |
-| Assert.cs:91:9:91:25 | [b (line 84): false] ...; | Assert.cs:90:9:90:25 | [b (line 84): false] ... = ... |
-| Assert.cs:91:9:91:25 | [b (line 84): true] ...; | Assert.cs:90:9:90:25 | [b (line 84): true] ... = ... |
-| Assert.cs:91:23:91:23 | [b (line 84): false] access to local variable s | Assert.cs:91:9:91:25 | [b (line 84): false] ...; |
-| Assert.cs:91:23:91:23 | [b (line 84): true] access to local variable s | Assert.cs:91:9:91:25 | [b (line 84): true] ...; |
-| Assert.cs:92:9:92:35 | [b (line 84): false] call to method WriteLine | Assert.cs:92:27:92:34 | [b (line 84): false] access to property Length |
-| Assert.cs:92:9:92:35 | [b (line 84): true] call to method WriteLine | Assert.cs:92:27:92:34 | [b (line 84): true] access to property Length |
-| Assert.cs:92:9:92:36 | [b (line 84): false] ...; | Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull |
-| Assert.cs:92:9:92:36 | [b (line 84): true] ...; | Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull |
-| Assert.cs:92:27:92:27 | [b (line 84): false] access to local variable s | Assert.cs:92:9:92:36 | [b (line 84): false] ...; |
-| Assert.cs:92:27:92:27 | [b (line 84): true] access to local variable s | Assert.cs:92:9:92:36 | [b (line 84): true] ...; |
-| Assert.cs:92:27:92:34 | [b (line 84): false] access to property Length | Assert.cs:92:27:92:27 | [b (line 84): false] access to local variable s |
-| Assert.cs:92:27:92:34 | [b (line 84): true] access to property Length | Assert.cs:92:27:92:27 | [b (line 84): true] access to local variable s |
-| Assert.cs:94:9:94:25 | [b (line 84): false] ... = ... | Assert.cs:94:13:94:25 | [b (line 84): false] ... ? ... : ... |
-| Assert.cs:94:9:94:25 | [b (line 84): true] ... = ... | Assert.cs:94:13:94:25 | [b (line 84): true] ... ? ... : ... |
-| Assert.cs:94:9:94:26 | [b (line 84): false] ...; | Assert.cs:92:9:92:35 | [b (line 84): false] call to method WriteLine |
-| Assert.cs:94:9:94:26 | [b (line 84): true] ...; | Assert.cs:92:9:92:35 | [b (line 84): true] call to method WriteLine |
-| Assert.cs:94:13:94:13 | [b (line 84): false] access to parameter b | Assert.cs:94:9:94:26 | [b (line 84): false] ...; |
-| Assert.cs:94:13:94:13 | [b (line 84): true] access to parameter b | Assert.cs:94:9:94:26 | [b (line 84): true] ...; |
-| Assert.cs:94:13:94:25 | [b (line 84): false] ... ? ... : ... | Assert.cs:94:24:94:25 | [b (line 84): false] "" |
-| Assert.cs:94:13:94:25 | [b (line 84): true] ... ? ... : ... | Assert.cs:94:17:94:20 | [b (line 84): true] null |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:94:13:94:13 | [b (line 84): true] access to parameter b |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:95:26:95:26 | [b (line 84): true] access to local variable s |
-| Assert.cs:95:9:95:28 | [b (line 84): false] ...; | Assert.cs:94:9:94:25 | [b (line 84): false] ... = ... |
-| Assert.cs:95:9:95:28 | [b (line 84): true] ...; | Assert.cs:94:9:94:25 | [b (line 84): true] ... = ... |
-| Assert.cs:95:26:95:26 | [b (line 84): false] access to local variable s | Assert.cs:95:9:95:28 | [b (line 84): false] ...; |
-| Assert.cs:95:26:95:26 | [b (line 84): true] access to local variable s | Assert.cs:95:9:95:28 | [b (line 84): true] ...; |
-| Assert.cs:96:9:96:35 | [b (line 84): false] call to method WriteLine | Assert.cs:96:27:96:34 | [b (line 84): false] access to property Length |
-| Assert.cs:96:9:96:35 | [b (line 84): true] call to method WriteLine | Assert.cs:96:27:96:34 | [b (line 84): true] access to property Length |
-| Assert.cs:96:9:96:36 | [b (line 84): false] ...; | Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull |
-| Assert.cs:96:9:96:36 | [b (line 84): true] ...; | Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull |
-| Assert.cs:96:27:96:27 | [b (line 84): false] access to local variable s | Assert.cs:96:9:96:36 | [b (line 84): false] ...; |
-| Assert.cs:96:27:96:27 | [b (line 84): true] access to local variable s | Assert.cs:96:9:96:36 | [b (line 84): true] ...; |
-| Assert.cs:96:27:96:34 | [b (line 84): false] access to property Length | Assert.cs:96:27:96:27 | [b (line 84): false] access to local variable s |
-| Assert.cs:96:27:96:34 | [b (line 84): true] access to property Length | Assert.cs:96:27:96:27 | [b (line 84): true] access to local variable s |
-| Assert.cs:98:9:98:25 | [b (line 84): false] ... = ... | Assert.cs:98:13:98:25 | [b (line 84): false] ... ? ... : ... |
-| Assert.cs:98:9:98:25 | [b (line 84): true] ... = ... | Assert.cs:98:13:98:25 | [b (line 84): true] ... ? ... : ... |
-| Assert.cs:98:9:98:26 | [b (line 84): false] ...; | Assert.cs:96:9:96:35 | [b (line 84): false] call to method WriteLine |
-| Assert.cs:98:9:98:26 | [b (line 84): true] ...; | Assert.cs:96:9:96:35 | [b (line 84): true] call to method WriteLine |
-| Assert.cs:98:13:98:13 | [b (line 84): false] access to parameter b | Assert.cs:98:9:98:26 | [b (line 84): false] ...; |
-| Assert.cs:98:13:98:13 | [b (line 84): true] access to parameter b | Assert.cs:98:9:98:26 | [b (line 84): true] ...; |
-| Assert.cs:98:13:98:25 | [b (line 84): false] ... ? ... : ... | Assert.cs:98:24:98:25 | [b (line 84): false] "" |
-| Assert.cs:98:13:98:25 | [b (line 84): true] ... ? ... : ... | Assert.cs:98:17:98:20 | [b (line 84): true] null |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:98:13:98:13 | [b (line 84): true] access to parameter b |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:99:23:99:31 | [b (line 84): true] ... == ... |
-| Assert.cs:99:9:99:33 | [b (line 84): false] ...; | Assert.cs:98:9:98:25 | [b (line 84): false] ... = ... |
-| Assert.cs:99:9:99:33 | [b (line 84): true] ...; | Assert.cs:98:9:98:25 | [b (line 84): true] ... = ... |
-| Assert.cs:99:23:99:23 | [b (line 84): false] access to local variable s | Assert.cs:99:9:99:33 | [b (line 84): false] ...; |
-| Assert.cs:99:23:99:23 | [b (line 84): true] access to local variable s | Assert.cs:99:9:99:33 | [b (line 84): true] ...; |
-| Assert.cs:99:23:99:31 | [b (line 84): false] ... == ... | Assert.cs:99:28:99:31 | [b (line 84): false] null |
-| Assert.cs:99:23:99:31 | [b (line 84): true] ... == ... | Assert.cs:99:28:99:31 | [b (line 84): true] null |
-| Assert.cs:99:28:99:31 | [b (line 84): false] null | Assert.cs:99:23:99:23 | [b (line 84): false] access to local variable s |
-| Assert.cs:99:28:99:31 | [b (line 84): true] null | Assert.cs:99:23:99:23 | [b (line 84): true] access to local variable s |
-| Assert.cs:100:9:100:35 | [b (line 84): false] call to method WriteLine | Assert.cs:100:27:100:34 | [b (line 84): false] access to property Length |
-| Assert.cs:100:9:100:35 | [b (line 84): true] call to method WriteLine | Assert.cs:100:27:100:34 | [b (line 84): true] access to property Length |
-| Assert.cs:100:9:100:36 | [b (line 84): false] ...; | Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue |
-| Assert.cs:100:9:100:36 | [b (line 84): true] ...; | Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:100:27:100:27 | [b (line 84): false] access to local variable s | Assert.cs:100:9:100:36 | [b (line 84): false] ...; |
-| Assert.cs:100:27:100:27 | [b (line 84): true] access to local variable s | Assert.cs:100:9:100:36 | [b (line 84): true] ...; |
-| Assert.cs:100:27:100:34 | [b (line 84): false] access to property Length | Assert.cs:100:27:100:27 | [b (line 84): false] access to local variable s |
-| Assert.cs:100:27:100:34 | [b (line 84): true] access to property Length | Assert.cs:100:27:100:27 | [b (line 84): true] access to local variable s |
-| Assert.cs:102:9:102:25 | [b (line 84): false] ... = ... | Assert.cs:102:13:102:25 | [b (line 84): false] ... ? ... : ... |
-| Assert.cs:102:9:102:25 | [b (line 84): true] ... = ... | Assert.cs:102:13:102:25 | [b (line 84): true] ... ? ... : ... |
-| Assert.cs:102:9:102:26 | [b (line 84): false] ...; | Assert.cs:100:9:100:35 | [b (line 84): false] call to method WriteLine |
-| Assert.cs:102:9:102:26 | [b (line 84): true] ...; | Assert.cs:100:9:100:35 | [b (line 84): true] call to method WriteLine |
-| Assert.cs:102:13:102:13 | [b (line 84): false] access to parameter b | Assert.cs:102:9:102:26 | [b (line 84): false] ...; |
-| Assert.cs:102:13:102:13 | [b (line 84): true] access to parameter b | Assert.cs:102:9:102:26 | [b (line 84): true] ...; |
-| Assert.cs:102:13:102:25 | [b (line 84): false] ... ? ... : ... | Assert.cs:102:24:102:25 | [b (line 84): false] "" |
-| Assert.cs:102:13:102:25 | [b (line 84): true] ... ? ... : ... | Assert.cs:102:17:102:20 | [b (line 84): true] null |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:102:13:102:13 | [b (line 84): true] access to parameter b |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:103:23:103:31 | [b (line 84): true] ... != ... |
-| Assert.cs:103:9:103:33 | [b (line 84): false] ...; | Assert.cs:102:9:102:25 | [b (line 84): false] ... = ... |
-| Assert.cs:103:9:103:33 | [b (line 84): true] ...; | Assert.cs:102:9:102:25 | [b (line 84): true] ... = ... |
-| Assert.cs:103:23:103:23 | [b (line 84): false] access to local variable s | Assert.cs:103:9:103:33 | [b (line 84): false] ...; |
-| Assert.cs:103:23:103:23 | [b (line 84): true] access to local variable s | Assert.cs:103:9:103:33 | [b (line 84): true] ...; |
-| Assert.cs:103:23:103:31 | [b (line 84): false] ... != ... | Assert.cs:103:28:103:31 | [b (line 84): false] null |
-| Assert.cs:103:23:103:31 | [b (line 84): true] ... != ... | Assert.cs:103:28:103:31 | [b (line 84): true] null |
-| Assert.cs:103:28:103:31 | [b (line 84): false] null | Assert.cs:103:23:103:23 | [b (line 84): false] access to local variable s |
-| Assert.cs:103:28:103:31 | [b (line 84): true] null | Assert.cs:103:23:103:23 | [b (line 84): true] access to local variable s |
-| Assert.cs:104:9:104:35 | [b (line 84): false] call to method WriteLine | Assert.cs:104:27:104:34 | [b (line 84): false] access to property Length |
-| Assert.cs:104:9:104:35 | [b (line 84): true] call to method WriteLine | Assert.cs:104:27:104:34 | [b (line 84): true] access to property Length |
-| Assert.cs:104:9:104:36 | [b (line 84): false] ...; | Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue |
-| Assert.cs:104:9:104:36 | [b (line 84): true] ...; | Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:104:27:104:27 | [b (line 84): false] access to local variable s | Assert.cs:104:9:104:36 | [b (line 84): false] ...; |
-| Assert.cs:104:27:104:27 | [b (line 84): true] access to local variable s | Assert.cs:104:9:104:36 | [b (line 84): true] ...; |
-| Assert.cs:104:27:104:34 | [b (line 84): false] access to property Length | Assert.cs:104:27:104:27 | [b (line 84): false] access to local variable s |
-| Assert.cs:104:27:104:34 | [b (line 84): true] access to property Length | Assert.cs:104:27:104:27 | [b (line 84): true] access to local variable s |
-| Assert.cs:106:9:106:25 | [b (line 84): false] ... = ... | Assert.cs:106:13:106:25 | [b (line 84): false] ... ? ... : ... |
-| Assert.cs:106:9:106:25 | [b (line 84): true] ... = ... | Assert.cs:106:13:106:25 | [b (line 84): true] ... ? ... : ... |
-| Assert.cs:106:9:106:26 | [b (line 84): false] ...; | Assert.cs:104:9:104:35 | [b (line 84): false] call to method WriteLine |
-| Assert.cs:106:9:106:26 | [b (line 84): true] ...; | Assert.cs:104:9:104:35 | [b (line 84): true] call to method WriteLine |
-| Assert.cs:106:13:106:13 | [b (line 84): false] access to parameter b | Assert.cs:106:9:106:26 | [b (line 84): false] ...; |
-| Assert.cs:106:13:106:13 | [b (line 84): true] access to parameter b | Assert.cs:106:9:106:26 | [b (line 84): true] ...; |
-| Assert.cs:106:13:106:25 | [b (line 84): false] ... ? ... : ... | Assert.cs:106:24:106:25 | [b (line 84): false] "" |
-| Assert.cs:106:13:106:25 | [b (line 84): true] ... ? ... : ... | Assert.cs:106:17:106:20 | [b (line 84): true] null |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:106:13:106:13 | [b (line 84): true] access to parameter b |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:107:24:107:32 | [b (line 84): true] ... != ... |
-| Assert.cs:107:9:107:34 | [b (line 84): false] ...; | Assert.cs:106:9:106:25 | [b (line 84): false] ... = ... |
-| Assert.cs:107:9:107:34 | [b (line 84): true] ...; | Assert.cs:106:9:106:25 | [b (line 84): true] ... = ... |
-| Assert.cs:107:24:107:24 | [b (line 84): false] access to local variable s | Assert.cs:107:9:107:34 | [b (line 84): false] ...; |
-| Assert.cs:107:24:107:24 | [b (line 84): true] access to local variable s | Assert.cs:107:9:107:34 | [b (line 84): true] ...; |
-| Assert.cs:107:24:107:32 | [b (line 84): false] ... != ... | Assert.cs:107:29:107:32 | [b (line 84): false] null |
-| Assert.cs:107:24:107:32 | [b (line 84): true] ... != ... | Assert.cs:107:29:107:32 | [b (line 84): true] null |
-| Assert.cs:107:29:107:32 | [b (line 84): false] null | Assert.cs:107:24:107:24 | [b (line 84): false] access to local variable s |
-| Assert.cs:107:29:107:32 | [b (line 84): true] null | Assert.cs:107:24:107:24 | [b (line 84): true] access to local variable s |
-| Assert.cs:108:9:108:35 | [b (line 84): false] call to method WriteLine | Assert.cs:108:27:108:34 | [b (line 84): false] access to property Length |
-| Assert.cs:108:9:108:35 | [b (line 84): true] call to method WriteLine | Assert.cs:108:27:108:34 | [b (line 84): true] access to property Length |
-| Assert.cs:108:9:108:36 | [b (line 84): false] ...; | Assert.cs:107:9:107:33 | [assertion success, b (line 84): false] call to method IsFalse |
-| Assert.cs:108:9:108:36 | [b (line 84): true] ...; | Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:108:27:108:27 | [b (line 84): false] access to local variable s | Assert.cs:108:9:108:36 | [b (line 84): false] ...; |
-| Assert.cs:108:27:108:27 | [b (line 84): true] access to local variable s | Assert.cs:108:9:108:36 | [b (line 84): true] ...; |
-| Assert.cs:108:27:108:34 | [b (line 84): false] access to property Length | Assert.cs:108:27:108:27 | [b (line 84): false] access to local variable s |
-| Assert.cs:108:27:108:34 | [b (line 84): true] access to property Length | Assert.cs:108:27:108:27 | [b (line 84): true] access to local variable s |
-| Assert.cs:110:9:110:25 | [b (line 84): false] ... = ... | Assert.cs:110:13:110:25 | [b (line 84): false] ... ? ... : ... |
-| Assert.cs:110:9:110:25 | [b (line 84): true] ... = ... | Assert.cs:110:13:110:25 | [b (line 84): true] ... ? ... : ... |
-| Assert.cs:110:9:110:26 | [b (line 84): false] ...; | Assert.cs:108:9:108:35 | [b (line 84): false] call to method WriteLine |
-| Assert.cs:110:9:110:26 | [b (line 84): true] ...; | Assert.cs:108:9:108:35 | [b (line 84): true] call to method WriteLine |
-| Assert.cs:110:13:110:13 | [b (line 84): false] access to parameter b | Assert.cs:110:9:110:26 | [b (line 84): false] ...; |
-| Assert.cs:110:13:110:13 | [b (line 84): true] access to parameter b | Assert.cs:110:9:110:26 | [b (line 84): true] ...; |
-| Assert.cs:110:13:110:25 | [b (line 84): false] ... ? ... : ... | Assert.cs:110:24:110:25 | [b (line 84): false] "" |
-| Assert.cs:110:13:110:25 | [b (line 84): true] ... ? ... : ... | Assert.cs:110:17:110:20 | [b (line 84): true] null |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:110:13:110:13 | [b (line 84): true] access to parameter b |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:111:24:111:32 | [b (line 84): true] ... == ... |
-| Assert.cs:111:9:111:34 | [b (line 84): false] ...; | Assert.cs:110:9:110:25 | [b (line 84): false] ... = ... |
-| Assert.cs:111:9:111:34 | [b (line 84): true] ...; | Assert.cs:110:9:110:25 | [b (line 84): true] ... = ... |
-| Assert.cs:111:24:111:24 | [b (line 84): false] access to local variable s | Assert.cs:111:9:111:34 | [b (line 84): false] ...; |
-| Assert.cs:111:24:111:24 | [b (line 84): true] access to local variable s | Assert.cs:111:9:111:34 | [b (line 84): true] ...; |
-| Assert.cs:111:24:111:32 | [b (line 84): false] ... == ... | Assert.cs:111:29:111:32 | [b (line 84): false] null |
-| Assert.cs:111:24:111:32 | [b (line 84): true] ... == ... | Assert.cs:111:29:111:32 | [b (line 84): true] null |
-| Assert.cs:111:29:111:32 | [b (line 84): false] null | Assert.cs:111:24:111:24 | [b (line 84): false] access to local variable s |
-| Assert.cs:111:29:111:32 | [b (line 84): true] null | Assert.cs:111:24:111:24 | [b (line 84): true] access to local variable s |
-| Assert.cs:112:9:112:35 | [b (line 84): false] call to method WriteLine | Assert.cs:112:27:112:34 | [b (line 84): false] access to property Length |
-| Assert.cs:112:9:112:35 | [b (line 84): true] call to method WriteLine | Assert.cs:112:27:112:34 | [b (line 84): true] access to property Length |
-| Assert.cs:112:9:112:36 | [b (line 84): false] ...; | Assert.cs:111:9:111:33 | [assertion success, b (line 84): false] call to method IsFalse |
-| Assert.cs:112:9:112:36 | [b (line 84): true] ...; | Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:112:27:112:27 | [b (line 84): false] access to local variable s | Assert.cs:112:9:112:36 | [b (line 84): false] ...; |
-| Assert.cs:112:27:112:27 | [b (line 84): true] access to local variable s | Assert.cs:112:9:112:36 | [b (line 84): true] ...; |
-| Assert.cs:112:27:112:34 | [b (line 84): false] access to property Length | Assert.cs:112:27:112:27 | [b (line 84): false] access to local variable s |
-| Assert.cs:112:27:112:34 | [b (line 84): true] access to property Length | Assert.cs:112:27:112:27 | [b (line 84): true] access to local variable s |
-| Assert.cs:114:9:114:25 | [b (line 84): false] ... = ... | Assert.cs:114:13:114:25 | [b (line 84): false] ... ? ... : ... |
-| Assert.cs:114:9:114:25 | [b (line 84): true] ... = ... | Assert.cs:114:13:114:25 | [b (line 84): true] ... ? ... : ... |
-| Assert.cs:114:9:114:26 | [b (line 84): false] ...; | Assert.cs:112:9:112:35 | [b (line 84): false] call to method WriteLine |
-| Assert.cs:114:9:114:26 | [b (line 84): true] ...; | Assert.cs:112:9:112:35 | [b (line 84): true] call to method WriteLine |
-| Assert.cs:114:13:114:13 | [b (line 84): false] access to parameter b | Assert.cs:114:9:114:26 | [b (line 84): false] ...; |
-| Assert.cs:114:13:114:13 | [b (line 84): true] access to parameter b | Assert.cs:114:9:114:26 | [b (line 84): true] ...; |
-| Assert.cs:114:13:114:25 | [b (line 84): false] ... ? ... : ... | Assert.cs:114:24:114:25 | [b (line 84): false] "" |
-| Assert.cs:114:13:114:25 | [b (line 84): true] ... ? ... : ... | Assert.cs:114:17:114:20 | [b (line 84): true] null |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:114:13:114:13 | [b (line 84): true] access to parameter b |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:115:9:115:38 | [b (line 84): false] ...; | Assert.cs:114:9:114:25 | [b (line 84): false] ... = ... |
-| Assert.cs:115:9:115:38 | [b (line 84): true] ...; | Assert.cs:114:9:114:25 | [b (line 84): true] ... = ... |
-| Assert.cs:115:23:115:23 | [b (line 84): false] access to local variable s | Assert.cs:115:9:115:38 | [b (line 84): false] ...; |
-| Assert.cs:115:23:115:23 | [b (line 84): true] access to local variable s | Assert.cs:115:9:115:38 | [b (line 84): true] ...; |
-| Assert.cs:115:23:115:31 | [b (line 84): false] ... != ... | Assert.cs:115:28:115:31 | [b (line 84): false] null |
-| Assert.cs:115:23:115:31 | [b (line 84): true] ... != ... | Assert.cs:115:28:115:31 | [b (line 84): true] null |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:115:28:115:31 | [b (line 84): false] null | Assert.cs:115:23:115:23 | [b (line 84): false] access to local variable s |
-| Assert.cs:115:28:115:31 | [b (line 84): true] null | Assert.cs:115:23:115:23 | [b (line 84): true] access to local variable s |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:115:23:115:31 | [b (line 84): true] ... != ... |
-| Assert.cs:116:9:116:35 | [b (line 84): true] call to method WriteLine | Assert.cs:116:27:116:34 | [b (line 84): true] access to property Length |
-| Assert.cs:116:9:116:36 | [b (line 84): true] ...; | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:116:27:116:27 | [b (line 84): true] access to local variable s | Assert.cs:116:9:116:36 | [b (line 84): true] ...; |
-| Assert.cs:116:27:116:34 | [b (line 84): true] access to property Length | Assert.cs:116:27:116:27 | [b (line 84): true] access to local variable s |
-| Assert.cs:118:9:118:25 | [b (line 84): true] ... = ... | Assert.cs:118:13:118:25 | [b (line 84): true] ... ? ... : ... |
-| Assert.cs:118:9:118:26 | [b (line 84): true] ...; | Assert.cs:116:9:116:35 | [b (line 84): true] call to method WriteLine |
-| Assert.cs:118:13:118:13 | [b (line 84): true] access to parameter b | Assert.cs:118:9:118:26 | [b (line 84): true] ...; |
-| Assert.cs:118:13:118:25 | [b (line 84): true] ... ? ... : ... | Assert.cs:118:17:118:20 | [b (line 84): true] null |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:118:13:118:13 | [b (line 84): true] access to parameter b |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... |
-| Assert.cs:119:9:119:40 | [b (line 84): true] ...; | Assert.cs:118:9:118:25 | [b (line 84): true] ... = ... |
-| Assert.cs:119:24:119:24 | [b (line 84): true] access to local variable s | Assert.cs:119:9:119:40 | [b (line 84): true] ...; |
-| Assert.cs:119:24:119:32 | [b (line 84): true] ... == ... | Assert.cs:119:29:119:32 | [b (line 84): true] null |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... |
-| Assert.cs:119:29:119:32 | [b (line 84): true] null | Assert.cs:119:24:119:24 | [b (line 84): true] access to local variable s |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:119:24:119:32 | [b (line 84): true] ... == ... |
-| Assert.cs:120:9:120:35 | [b (line 84): true] call to method WriteLine | Assert.cs:120:27:120:34 | [b (line 84): true] access to property Length |
-| Assert.cs:120:9:120:36 | [b (line 84): true] ...; | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:120:27:120:27 | [b (line 84): true] access to local variable s | Assert.cs:120:9:120:36 | [b (line 84): true] ...; |
-| Assert.cs:120:27:120:34 | [b (line 84): true] access to property Length | Assert.cs:120:27:120:27 | [b (line 84): true] access to local variable s |
-| Assert.cs:122:9:122:25 | [b (line 84): true] ... = ... | Assert.cs:122:13:122:25 | [b (line 84): true] ... ? ... : ... |
-| Assert.cs:122:9:122:26 | [b (line 84): true] ...; | Assert.cs:120:9:120:35 | [b (line 84): true] call to method WriteLine |
-| Assert.cs:122:13:122:13 | [b (line 84): true] access to parameter b | Assert.cs:122:9:122:26 | [b (line 84): true] ...; |
-| Assert.cs:122:13:122:25 | [b (line 84): true] ... ? ... : ... | Assert.cs:122:17:122:20 | [b (line 84): true] null |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:122:13:122:13 | [b (line 84): true] access to parameter b |
-| Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:123:9:123:38 | [b (line 84): true] ...; | Assert.cs:122:9:122:25 | [b (line 84): true] ... = ... |
-| Assert.cs:123:23:123:23 | [b (line 84): true] access to local variable s | Assert.cs:123:9:123:38 | [b (line 84): true] ...; |
-| Assert.cs:123:23:123:31 | [b (line 84): true] ... == ... | Assert.cs:123:28:123:31 | [b (line 84): true] null |
-| Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:123:28:123:31 | [b (line 84): true] null | Assert.cs:123:23:123:23 | [b (line 84): true] access to local variable s |
-| Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | Assert.cs:123:23:123:31 | [b (line 84): true] ... == ... |
-| Assert.cs:124:9:124:35 | [b (line 84): true] call to method WriteLine | Assert.cs:124:27:124:34 | [b (line 84): true] access to property Length |
-| Assert.cs:124:9:124:36 | [b (line 84): true] ...; | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:124:27:124:27 | [b (line 84): true] access to local variable s | Assert.cs:124:9:124:36 | [b (line 84): true] ...; |
-| Assert.cs:124:27:124:34 | [b (line 84): true] access to property Length | Assert.cs:124:27:124:27 | [b (line 84): true] access to local variable s |
-| Assert.cs:126:9:126:25 | [b (line 84): true] ... = ... | Assert.cs:126:13:126:25 | [b (line 84): true] ... ? ... : ... |
-| Assert.cs:126:9:126:26 | [b (line 84): true] ...; | Assert.cs:124:9:124:35 | [b (line 84): true] call to method WriteLine |
-| Assert.cs:126:13:126:13 | [b (line 84): true] access to parameter b | Assert.cs:126:9:126:26 | [b (line 84): true] ...; |
-| Assert.cs:126:13:126:25 | [b (line 84): true] ... ? ... : ... | Assert.cs:126:17:126:20 | [b (line 84): true] null |
-| Assert.cs:126:17:126:20 | [b (line 84): true] null | Assert.cs:126:13:126:13 | [b (line 84): true] access to parameter b |
-| Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | Assert.cs:127:24:127:38 | [false] ... \|\| ... |
-| Assert.cs:127:9:127:40 | [b (line 84): true] ...; | Assert.cs:126:9:126:25 | [b (line 84): true] ... = ... |
-| Assert.cs:127:24:127:24 | [b (line 84): true] access to local variable s | Assert.cs:127:9:127:40 | [b (line 84): true] ...; |
-| Assert.cs:127:24:127:32 | [b (line 84): true] ... != ... | Assert.cs:127:29:127:32 | [b (line 84): true] null |
-| Assert.cs:127:24:127:38 | [false] ... \|\| ... | Assert.cs:127:37:127:38 | [false] !... |
-| Assert.cs:127:29:127:32 | [b (line 84): true] null | Assert.cs:127:24:127:24 | [b (line 84): true] access to local variable s |
-| Assert.cs:127:37:127:38 | [false] !... | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | Assert.cs:127:24:127:32 | [b (line 84): true] ... != ... |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:86:24:86:27 | null |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:86:31:86:32 | "" |
+| Assert.cs:87:9:87:31 | call to method Assert | Assert.cs:87:22:87:30 | ... != ... |
+| Assert.cs:87:9:87:32 | ...; | Assert.cs:86:16:86:32 | String s = ... |
+| Assert.cs:87:22:87:22 | access to local variable s | Assert.cs:87:9:87:32 | ...; |
+| Assert.cs:87:22:87:30 | ... != ... | Assert.cs:87:27:87:30 | null |
+| Assert.cs:87:27:87:30 | null | Assert.cs:87:22:87:22 | access to local variable s |
+| Assert.cs:88:9:88:35 | call to method WriteLine | Assert.cs:88:27:88:34 | access to property Length |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:87:9:87:31 | call to method Assert |
+| Assert.cs:88:27:88:27 | access to local variable s | Assert.cs:88:9:88:36 | ...; |
+| Assert.cs:88:27:88:34 | access to property Length | Assert.cs:88:27:88:27 | access to local variable s |
+| Assert.cs:90:9:90:25 | ... = ... | Assert.cs:90:13:90:25 | ... ? ... : ... |
+| Assert.cs:90:9:90:26 | ...; | Assert.cs:88:9:88:35 | call to method WriteLine |
+| Assert.cs:90:13:90:13 | access to parameter b | Assert.cs:90:9:90:26 | ...; |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:90:17:90:20 | null |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:90:24:90:25 | "" |
+| Assert.cs:91:9:91:24 | call to method IsNull | Assert.cs:91:23:91:23 | access to local variable s |
+| Assert.cs:91:9:91:25 | ...; | Assert.cs:90:9:90:25 | ... = ... |
+| Assert.cs:91:23:91:23 | access to local variable s | Assert.cs:91:9:91:25 | ...; |
+| Assert.cs:92:9:92:35 | call to method WriteLine | Assert.cs:92:27:92:34 | access to property Length |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:91:9:91:24 | call to method IsNull |
+| Assert.cs:92:27:92:27 | access to local variable s | Assert.cs:92:9:92:36 | ...; |
+| Assert.cs:92:27:92:34 | access to property Length | Assert.cs:92:27:92:27 | access to local variable s |
+| Assert.cs:94:9:94:25 | ... = ... | Assert.cs:94:13:94:25 | ... ? ... : ... |
+| Assert.cs:94:9:94:26 | ...; | Assert.cs:92:9:92:35 | call to method WriteLine |
+| Assert.cs:94:13:94:13 | access to parameter b | Assert.cs:94:9:94:26 | ...; |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:94:17:94:20 | null |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:94:24:94:25 | "" |
+| Assert.cs:95:9:95:27 | call to method IsNotNull | Assert.cs:95:26:95:26 | access to local variable s |
+| Assert.cs:95:9:95:28 | ...; | Assert.cs:94:9:94:25 | ... = ... |
+| Assert.cs:95:26:95:26 | access to local variable s | Assert.cs:95:9:95:28 | ...; |
+| Assert.cs:96:9:96:35 | call to method WriteLine | Assert.cs:96:27:96:34 | access to property Length |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:95:9:95:27 | call to method IsNotNull |
+| Assert.cs:96:27:96:27 | access to local variable s | Assert.cs:96:9:96:36 | ...; |
+| Assert.cs:96:27:96:34 | access to property Length | Assert.cs:96:27:96:27 | access to local variable s |
+| Assert.cs:98:9:98:25 | ... = ... | Assert.cs:98:13:98:25 | ... ? ... : ... |
+| Assert.cs:98:9:98:26 | ...; | Assert.cs:96:9:96:35 | call to method WriteLine |
+| Assert.cs:98:13:98:13 | access to parameter b | Assert.cs:98:9:98:26 | ...; |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:98:17:98:20 | null |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:98:24:98:25 | "" |
+| Assert.cs:99:9:99:32 | call to method IsTrue | Assert.cs:99:23:99:31 | ... == ... |
+| Assert.cs:99:9:99:33 | ...; | Assert.cs:98:9:98:25 | ... = ... |
+| Assert.cs:99:23:99:23 | access to local variable s | Assert.cs:99:9:99:33 | ...; |
+| Assert.cs:99:23:99:31 | ... == ... | Assert.cs:99:28:99:31 | null |
+| Assert.cs:99:28:99:31 | null | Assert.cs:99:23:99:23 | access to local variable s |
+| Assert.cs:100:9:100:35 | call to method WriteLine | Assert.cs:100:27:100:34 | access to property Length |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:99:9:99:32 | call to method IsTrue |
+| Assert.cs:100:27:100:27 | access to local variable s | Assert.cs:100:9:100:36 | ...; |
+| Assert.cs:100:27:100:34 | access to property Length | Assert.cs:100:27:100:27 | access to local variable s |
+| Assert.cs:102:9:102:25 | ... = ... | Assert.cs:102:13:102:25 | ... ? ... : ... |
+| Assert.cs:102:9:102:26 | ...; | Assert.cs:100:9:100:35 | call to method WriteLine |
+| Assert.cs:102:13:102:13 | access to parameter b | Assert.cs:102:9:102:26 | ...; |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:102:17:102:20 | null |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:102:24:102:25 | "" |
+| Assert.cs:103:9:103:32 | call to method IsTrue | Assert.cs:103:23:103:31 | ... != ... |
+| Assert.cs:103:9:103:33 | ...; | Assert.cs:102:9:102:25 | ... = ... |
+| Assert.cs:103:23:103:23 | access to local variable s | Assert.cs:103:9:103:33 | ...; |
+| Assert.cs:103:23:103:31 | ... != ... | Assert.cs:103:28:103:31 | null |
+| Assert.cs:103:28:103:31 | null | Assert.cs:103:23:103:23 | access to local variable s |
+| Assert.cs:104:9:104:35 | call to method WriteLine | Assert.cs:104:27:104:34 | access to property Length |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:103:9:103:32 | call to method IsTrue |
+| Assert.cs:104:27:104:27 | access to local variable s | Assert.cs:104:9:104:36 | ...; |
+| Assert.cs:104:27:104:34 | access to property Length | Assert.cs:104:27:104:27 | access to local variable s |
+| Assert.cs:106:9:106:25 | ... = ... | Assert.cs:106:13:106:25 | ... ? ... : ... |
+| Assert.cs:106:9:106:26 | ...; | Assert.cs:104:9:104:35 | call to method WriteLine |
+| Assert.cs:106:13:106:13 | access to parameter b | Assert.cs:106:9:106:26 | ...; |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:106:17:106:20 | null |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:106:24:106:25 | "" |
+| Assert.cs:107:9:107:33 | call to method IsFalse | Assert.cs:107:24:107:32 | ... != ... |
+| Assert.cs:107:9:107:34 | ...; | Assert.cs:106:9:106:25 | ... = ... |
+| Assert.cs:107:24:107:24 | access to local variable s | Assert.cs:107:9:107:34 | ...; |
+| Assert.cs:107:24:107:32 | ... != ... | Assert.cs:107:29:107:32 | null |
+| Assert.cs:107:29:107:32 | null | Assert.cs:107:24:107:24 | access to local variable s |
+| Assert.cs:108:9:108:35 | call to method WriteLine | Assert.cs:108:27:108:34 | access to property Length |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:107:9:107:33 | call to method IsFalse |
+| Assert.cs:108:27:108:27 | access to local variable s | Assert.cs:108:9:108:36 | ...; |
+| Assert.cs:108:27:108:34 | access to property Length | Assert.cs:108:27:108:27 | access to local variable s |
+| Assert.cs:110:9:110:25 | ... = ... | Assert.cs:110:13:110:25 | ... ? ... : ... |
+| Assert.cs:110:9:110:26 | ...; | Assert.cs:108:9:108:35 | call to method WriteLine |
+| Assert.cs:110:13:110:13 | access to parameter b | Assert.cs:110:9:110:26 | ...; |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:110:17:110:20 | null |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:110:24:110:25 | "" |
+| Assert.cs:111:9:111:33 | call to method IsFalse | Assert.cs:111:24:111:32 | ... == ... |
+| Assert.cs:111:9:111:34 | ...; | Assert.cs:110:9:110:25 | ... = ... |
+| Assert.cs:111:24:111:24 | access to local variable s | Assert.cs:111:9:111:34 | ...; |
+| Assert.cs:111:24:111:32 | ... == ... | Assert.cs:111:29:111:32 | null |
+| Assert.cs:111:29:111:32 | null | Assert.cs:111:24:111:24 | access to local variable s |
+| Assert.cs:112:9:112:35 | call to method WriteLine | Assert.cs:112:27:112:34 | access to property Length |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:111:9:111:33 | call to method IsFalse |
+| Assert.cs:112:27:112:27 | access to local variable s | Assert.cs:112:9:112:36 | ...; |
+| Assert.cs:112:27:112:34 | access to property Length | Assert.cs:112:27:112:27 | access to local variable s |
+| Assert.cs:114:9:114:25 | ... = ... | Assert.cs:114:13:114:25 | ... ? ... : ... |
+| Assert.cs:114:9:114:26 | ...; | Assert.cs:112:9:112:35 | call to method WriteLine |
+| Assert.cs:114:13:114:13 | access to parameter b | Assert.cs:114:9:114:26 | ...; |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:114:17:114:20 | null |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:114:24:114:25 | "" |
+| Assert.cs:115:9:115:37 | call to method IsTrue | Assert.cs:115:23:115:36 | ... && ... |
+| Assert.cs:115:9:115:38 | ...; | Assert.cs:114:9:114:25 | ... = ... |
+| Assert.cs:115:23:115:23 | access to local variable s | Assert.cs:115:9:115:38 | ...; |
+| Assert.cs:115:23:115:31 | ... != ... | Assert.cs:115:28:115:31 | null |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:115:23:115:31 | ... != ... |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:115:36:115:36 | access to parameter b |
+| Assert.cs:115:28:115:31 | null | Assert.cs:115:23:115:23 | access to local variable s |
+| Assert.cs:116:9:116:35 | call to method WriteLine | Assert.cs:116:27:116:34 | access to property Length |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:115:9:115:37 | call to method IsTrue |
+| Assert.cs:116:27:116:27 | access to local variable s | Assert.cs:116:9:116:36 | ...; |
+| Assert.cs:116:27:116:34 | access to property Length | Assert.cs:116:27:116:27 | access to local variable s |
+| Assert.cs:118:9:118:25 | ... = ... | Assert.cs:118:13:118:25 | ... ? ... : ... |
+| Assert.cs:118:9:118:26 | ...; | Assert.cs:116:9:116:35 | call to method WriteLine |
+| Assert.cs:118:13:118:13 | access to parameter b | Assert.cs:118:9:118:26 | ...; |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:118:17:118:20 | null |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:118:24:118:25 | "" |
+| Assert.cs:119:9:119:39 | call to method IsFalse | Assert.cs:119:24:119:38 | ... \|\| ... |
+| Assert.cs:119:9:119:40 | ...; | Assert.cs:118:9:118:25 | ... = ... |
+| Assert.cs:119:24:119:24 | access to local variable s | Assert.cs:119:9:119:40 | ...; |
+| Assert.cs:119:24:119:32 | ... == ... | Assert.cs:119:29:119:32 | null |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:119:24:119:32 | ... == ... |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:119:37:119:38 | !... |
+| Assert.cs:119:29:119:32 | null | Assert.cs:119:24:119:24 | access to local variable s |
+| Assert.cs:119:37:119:38 | !... | Assert.cs:119:38:119:38 | access to parameter b |
+| Assert.cs:120:9:120:35 | call to method WriteLine | Assert.cs:120:27:120:34 | access to property Length |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:119:9:119:39 | call to method IsFalse |
+| Assert.cs:120:27:120:27 | access to local variable s | Assert.cs:120:9:120:36 | ...; |
+| Assert.cs:120:27:120:34 | access to property Length | Assert.cs:120:27:120:27 | access to local variable s |
+| Assert.cs:122:9:122:25 | ... = ... | Assert.cs:122:13:122:25 | ... ? ... : ... |
+| Assert.cs:122:9:122:26 | ...; | Assert.cs:120:9:120:35 | call to method WriteLine |
+| Assert.cs:122:13:122:13 | access to parameter b | Assert.cs:122:9:122:26 | ...; |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:122:17:122:20 | null |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:122:24:122:25 | "" |
+| Assert.cs:123:9:123:37 | call to method IsTrue | Assert.cs:123:23:123:36 | ... && ... |
+| Assert.cs:123:9:123:38 | ...; | Assert.cs:122:9:122:25 | ... = ... |
+| Assert.cs:123:23:123:23 | access to local variable s | Assert.cs:123:9:123:38 | ...; |
+| Assert.cs:123:23:123:31 | ... == ... | Assert.cs:123:28:123:31 | null |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:123:23:123:31 | ... == ... |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:123:36:123:36 | access to parameter b |
+| Assert.cs:123:28:123:31 | null | Assert.cs:123:23:123:23 | access to local variable s |
+| Assert.cs:124:9:124:35 | call to method WriteLine | Assert.cs:124:27:124:34 | access to property Length |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:123:9:123:37 | call to method IsTrue |
+| Assert.cs:124:27:124:27 | access to local variable s | Assert.cs:124:9:124:36 | ...; |
+| Assert.cs:124:27:124:34 | access to property Length | Assert.cs:124:27:124:27 | access to local variable s |
+| Assert.cs:126:9:126:25 | ... = ... | Assert.cs:126:13:126:25 | ... ? ... : ... |
+| Assert.cs:126:9:126:26 | ...; | Assert.cs:124:9:124:35 | call to method WriteLine |
+| Assert.cs:126:13:126:13 | access to parameter b | Assert.cs:126:9:126:26 | ...; |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:126:17:126:20 | null |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:126:24:126:25 | "" |
+| Assert.cs:127:9:127:39 | call to method IsFalse | Assert.cs:127:24:127:38 | ... \|\| ... |
+| Assert.cs:127:9:127:40 | ...; | Assert.cs:126:9:126:25 | ... = ... |
+| Assert.cs:127:24:127:24 | access to local variable s | Assert.cs:127:9:127:40 | ...; |
+| Assert.cs:127:24:127:32 | ... != ... | Assert.cs:127:29:127:32 | null |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:127:24:127:32 | ... != ... |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:127:37:127:38 | !... |
+| Assert.cs:127:29:127:32 | null | Assert.cs:127:24:127:24 | access to local variable s |
+| Assert.cs:127:37:127:38 | !... | Assert.cs:127:38:127:38 | access to parameter b |
 | Assert.cs:128:9:128:35 | call to method WriteLine | Assert.cs:128:27:128:34 | access to property Length |
-| Assert.cs:128:9:128:36 | ...; | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:127:9:127:39 | call to method IsFalse |
 | Assert.cs:128:27:128:27 | access to local variable s | Assert.cs:128:9:128:36 | ...; |
 | Assert.cs:128:27:128:34 | access to property Length | Assert.cs:128:27:128:27 | access to local variable s |
 | Assert.cs:131:18:131:32 | exit AssertTrueFalse | Assert.cs:131:18:131:32 | exit AssertTrueFalse (normal) |
@@ -5253,15 +4485,13 @@ postDominance
 | Assert.cs:135:5:136:5 | {...} | Assert.cs:131:18:131:32 | enter AssertTrueFalse |
 | Assert.cs:138:10:138:12 | exit M13 (normal) | Assert.cs:141:9:141:15 | return ...; |
 | Assert.cs:139:5:142:5 | {...} | Assert.cs:138:10:138:12 | enter M13 |
-| Assert.cs:140:9:140:35 | [assertion failure] call to method AssertTrueFalse | Assert.cs:140:33:140:34 | [assertion failure] access to parameter b3 |
-| Assert.cs:140:9:140:35 | [assertion failure] call to method AssertTrueFalse | Assert.cs:140:33:140:34 | [assertion failure] access to parameter b3 |
-| Assert.cs:140:9:140:35 | [assertion success] call to method AssertTrueFalse | Assert.cs:140:33:140:34 | [assertion success] access to parameter b3 |
+| Assert.cs:140:9:140:35 | call to method AssertTrueFalse | Assert.cs:140:33:140:34 | access to parameter b3 |
 | Assert.cs:140:9:140:35 | this access | Assert.cs:140:9:140:36 | ...; |
 | Assert.cs:140:9:140:36 | ...; | Assert.cs:139:5:142:5 | {...} |
 | Assert.cs:140:25:140:26 | access to parameter b1 | Assert.cs:140:9:140:35 | this access |
 | Assert.cs:140:29:140:30 | access to parameter b2 | Assert.cs:140:25:140:26 | access to parameter b1 |
-| Assert.cs:140:33:140:34 | [assertion success] access to parameter b3 | Assert.cs:140:29:140:30 | access to parameter b2 |
-| Assert.cs:141:9:141:15 | return ...; | Assert.cs:140:9:140:35 | [assertion success] call to method AssertTrueFalse |
+| Assert.cs:140:33:140:34 | access to parameter b3 | Assert.cs:140:29:140:30 | access to parameter b2 |
+| Assert.cs:141:9:141:15 | return ...; | Assert.cs:140:9:140:35 | call to method AssertTrueFalse |
 | Assignments.cs:1:7:1:17 | call to constructor Object | Assignments.cs:1:7:1:17 | enter Assignments |
 | Assignments.cs:1:7:1:17 | exit Assignments | Assignments.cs:1:7:1:17 | exit Assignments (normal) |
 | Assignments.cs:1:7:1:17 | exit Assignments (normal) | Assignments.cs:1:7:1:17 | {...} |
@@ -5334,8 +4564,6 @@ postDominance
 | BreakInTry.cs:20:10:20:11 | exit M2 (normal) | BreakInTry.cs:35:7:35:7 | ; |
 | BreakInTry.cs:21:5:36:5 | {...} | BreakInTry.cs:20:10:20:11 | enter M2 |
 | BreakInTry.cs:22:9:34:9 | foreach (... ... in ...) ... | BreakInTry.cs:22:29:22:32 | access to parameter args |
-| BreakInTry.cs:22:9:34:9 | foreach (... ... in ...) ... | BreakInTry.cs:31:21:31:32 | ... == ... |
-| BreakInTry.cs:22:9:34:9 | foreach (... ... in ...) ... | BreakInTry.cs:32:21:32:21 | ; |
 | BreakInTry.cs:22:29:22:32 | access to parameter args | BreakInTry.cs:21:5:36:5 | {...} |
 | BreakInTry.cs:23:9:34:9 | {...} | BreakInTry.cs:22:22:22:24 | String arg |
 | BreakInTry.cs:24:13:33:13 | try {...} ... | BreakInTry.cs:23:9:34:9 | {...} |
@@ -5344,21 +4572,18 @@ postDominance
 | BreakInTry.cs:26:21:26:23 | access to local variable arg | BreakInTry.cs:26:17:27:26 | if (...) ... |
 | BreakInTry.cs:26:21:26:31 | ... == ... | BreakInTry.cs:26:28:26:31 | null |
 | BreakInTry.cs:26:28:26:31 | null | BreakInTry.cs:26:21:26:23 | access to local variable arg |
-| BreakInTry.cs:30:13:33:13 | [finally: break] {...} | BreakInTry.cs:27:21:27:26 | break; |
-| BreakInTry.cs:31:17:32:21 | [finally: break] if (...) ... | BreakInTry.cs:30:13:33:13 | [finally: break] {...} |
+| BreakInTry.cs:30:13:33:13 | {...} | BreakInTry.cs:26:21:26:31 | ... == ... |
+| BreakInTry.cs:30:13:33:13 | {...} | BreakInTry.cs:27:21:27:26 | break; |
 | BreakInTry.cs:31:17:32:21 | if (...) ... | BreakInTry.cs:30:13:33:13 | {...} |
-| BreakInTry.cs:31:21:31:24 | [finally: break] access to parameter args | BreakInTry.cs:31:17:32:21 | [finally: break] if (...) ... |
 | BreakInTry.cs:31:21:31:24 | access to parameter args | BreakInTry.cs:31:17:32:21 | if (...) ... |
 | BreakInTry.cs:31:21:31:32 | ... == ... | BreakInTry.cs:31:29:31:32 | null |
-| BreakInTry.cs:31:21:31:32 | [finally: break] ... == ... | BreakInTry.cs:31:29:31:32 | [finally: break] null |
-| BreakInTry.cs:31:29:31:32 | [finally: break] null | BreakInTry.cs:31:21:31:24 | [finally: break] access to parameter args |
 | BreakInTry.cs:31:29:31:32 | null | BreakInTry.cs:31:21:31:24 | access to parameter args |
 | BreakInTry.cs:35:7:35:7 | ; | BreakInTry.cs:22:9:34:9 | foreach (... ... in ...) ... |
-| BreakInTry.cs:35:7:35:7 | ; | BreakInTry.cs:31:21:31:32 | [finally: break] ... == ... |
-| BreakInTry.cs:35:7:35:7 | ; | BreakInTry.cs:32:21:32:21 | [finally: break] ; |
+| BreakInTry.cs:35:7:35:7 | ; | BreakInTry.cs:31:21:31:32 | ... == ... |
+| BreakInTry.cs:35:7:35:7 | ; | BreakInTry.cs:32:21:32:21 | ; |
 | BreakInTry.cs:38:10:38:11 | exit M3 | BreakInTry.cs:38:10:38:11 | exit M3 (normal) |
-| BreakInTry.cs:38:10:38:11 | exit M3 (normal) | BreakInTry.cs:47:13:51:13 | [finally: return] foreach (... ... in ...) ... |
-| BreakInTry.cs:38:10:38:11 | exit M3 (normal) | BreakInTry.cs:50:21:50:26 | [finally: return] break; |
+| BreakInTry.cs:38:10:38:11 | exit M3 (normal) | BreakInTry.cs:47:13:51:13 | foreach (... ... in ...) ... |
+| BreakInTry.cs:38:10:38:11 | exit M3 (normal) | BreakInTry.cs:50:21:50:26 | break; |
 | BreakInTry.cs:38:10:38:11 | exit M3 (normal) | BreakInTry.cs:53:7:53:7 | ; |
 | BreakInTry.cs:39:5:54:5 | {...} | BreakInTry.cs:38:10:38:11 | enter M3 |
 | BreakInTry.cs:40:9:52:9 | try {...} ... | BreakInTry.cs:39:5:54:5 | {...} |
@@ -5367,27 +4592,17 @@ postDominance
 | BreakInTry.cs:42:17:42:20 | access to parameter args | BreakInTry.cs:42:13:43:23 | if (...) ... |
 | BreakInTry.cs:42:17:42:28 | ... == ... | BreakInTry.cs:42:25:42:28 | null |
 | BreakInTry.cs:42:25:42:28 | null | BreakInTry.cs:42:17:42:20 | access to parameter args |
-| BreakInTry.cs:46:9:52:9 | [finally: return] {...} | BreakInTry.cs:43:17:43:23 | return ...; |
-| BreakInTry.cs:47:13:51:13 | [finally: return] foreach (... ... in ...) ... | BreakInTry.cs:47:33:47:36 | [finally: return] access to parameter args |
+| BreakInTry.cs:46:9:52:9 | {...} | BreakInTry.cs:42:17:42:28 | ... == ... |
+| BreakInTry.cs:46:9:52:9 | {...} | BreakInTry.cs:43:17:43:23 | return ...; |
 | BreakInTry.cs:47:13:51:13 | foreach (... ... in ...) ... | BreakInTry.cs:47:33:47:36 | access to parameter args |
-| BreakInTry.cs:47:33:47:36 | [finally: return] access to parameter args | BreakInTry.cs:46:9:52:9 | [finally: return] {...} |
 | BreakInTry.cs:47:33:47:36 | access to parameter args | BreakInTry.cs:46:9:52:9 | {...} |
-| BreakInTry.cs:48:13:51:13 | [finally: return] {...} | BreakInTry.cs:47:26:47:28 | [finally: return] String arg |
 | BreakInTry.cs:48:13:51:13 | {...} | BreakInTry.cs:47:26:47:28 | String arg |
-| BreakInTry.cs:49:17:50:26 | [finally: return] if (...) ... | BreakInTry.cs:48:13:51:13 | [finally: return] {...} |
 | BreakInTry.cs:49:17:50:26 | if (...) ... | BreakInTry.cs:48:13:51:13 | {...} |
-| BreakInTry.cs:49:21:49:23 | [finally: return] access to local variable arg | BreakInTry.cs:49:17:50:26 | [finally: return] if (...) ... |
 | BreakInTry.cs:49:21:49:23 | access to local variable arg | BreakInTry.cs:49:17:50:26 | if (...) ... |
 | BreakInTry.cs:49:21:49:31 | ... == ... | BreakInTry.cs:49:28:49:31 | null |
-| BreakInTry.cs:49:21:49:31 | [finally: return] ... == ... | BreakInTry.cs:49:28:49:31 | [finally: return] null |
-| BreakInTry.cs:49:28:49:31 | [finally: return] null | BreakInTry.cs:49:21:49:23 | [finally: return] access to local variable arg |
 | BreakInTry.cs:49:28:49:31 | null | BreakInTry.cs:49:21:49:23 | access to local variable arg |
-| BreakInTry.cs:53:7:53:7 | ; | BreakInTry.cs:47:13:51:13 | foreach (... ... in ...) ... |
-| BreakInTry.cs:53:7:53:7 | ; | BreakInTry.cs:50:21:50:26 | break; |
 | BreakInTry.cs:56:10:56:11 | exit M4 | BreakInTry.cs:56:10:56:11 | exit M4 (normal) |
-| BreakInTry.cs:56:10:56:11 | exit M4 (normal) | BreakInTry.cs:65:13:69:13 | [finally: return] foreach (... ... in ...) ... |
 | BreakInTry.cs:56:10:56:11 | exit M4 (normal) | BreakInTry.cs:65:13:69:13 | foreach (... ... in ...) ... |
-| BreakInTry.cs:56:10:56:11 | exit M4 (normal) | BreakInTry.cs:68:21:68:26 | [finally: return] break; |
 | BreakInTry.cs:56:10:56:11 | exit M4 (normal) | BreakInTry.cs:68:21:68:26 | break; |
 | BreakInTry.cs:57:5:71:5 | {...} | BreakInTry.cs:56:10:56:11 | enter M4 |
 | BreakInTry.cs:58:9:70:9 | try {...} ... | BreakInTry.cs:57:5:71:5 | {...} |
@@ -5396,20 +4611,14 @@ postDominance
 | BreakInTry.cs:60:17:60:20 | access to parameter args | BreakInTry.cs:60:13:61:23 | if (...) ... |
 | BreakInTry.cs:60:17:60:28 | ... == ... | BreakInTry.cs:60:25:60:28 | null |
 | BreakInTry.cs:60:25:60:28 | null | BreakInTry.cs:60:17:60:20 | access to parameter args |
-| BreakInTry.cs:64:9:70:9 | [finally: return] {...} | BreakInTry.cs:61:17:61:23 | return ...; |
-| BreakInTry.cs:65:13:69:13 | [finally: return] foreach (... ... in ...) ... | BreakInTry.cs:65:33:65:36 | [finally: return] access to parameter args |
+| BreakInTry.cs:64:9:70:9 | {...} | BreakInTry.cs:60:17:60:28 | ... == ... |
+| BreakInTry.cs:64:9:70:9 | {...} | BreakInTry.cs:61:17:61:23 | return ...; |
 | BreakInTry.cs:65:13:69:13 | foreach (... ... in ...) ... | BreakInTry.cs:65:33:65:36 | access to parameter args |
-| BreakInTry.cs:65:33:65:36 | [finally: return] access to parameter args | BreakInTry.cs:64:9:70:9 | [finally: return] {...} |
 | BreakInTry.cs:65:33:65:36 | access to parameter args | BreakInTry.cs:64:9:70:9 | {...} |
-| BreakInTry.cs:66:13:69:13 | [finally: return] {...} | BreakInTry.cs:65:26:65:28 | [finally: return] String arg |
 | BreakInTry.cs:66:13:69:13 | {...} | BreakInTry.cs:65:26:65:28 | String arg |
-| BreakInTry.cs:67:17:68:26 | [finally: return] if (...) ... | BreakInTry.cs:66:13:69:13 | [finally: return] {...} |
 | BreakInTry.cs:67:17:68:26 | if (...) ... | BreakInTry.cs:66:13:69:13 | {...} |
-| BreakInTry.cs:67:21:67:23 | [finally: return] access to local variable arg | BreakInTry.cs:67:17:68:26 | [finally: return] if (...) ... |
 | BreakInTry.cs:67:21:67:23 | access to local variable arg | BreakInTry.cs:67:17:68:26 | if (...) ... |
 | BreakInTry.cs:67:21:67:31 | ... == ... | BreakInTry.cs:67:28:67:31 | null |
-| BreakInTry.cs:67:21:67:31 | [finally: return] ... == ... | BreakInTry.cs:67:28:67:31 | [finally: return] null |
-| BreakInTry.cs:67:28:67:31 | [finally: return] null | BreakInTry.cs:67:21:67:23 | [finally: return] access to local variable arg |
 | BreakInTry.cs:67:28:67:31 | null | BreakInTry.cs:67:21:67:23 | access to local variable arg |
 | CompileTimeOperators.cs:3:7:3:26 | call to constructor Object | CompileTimeOperators.cs:3:7:3:26 | enter CompileTimeOperators |
 | CompileTimeOperators.cs:3:7:3:26 | exit CompileTimeOperators | CompileTimeOperators.cs:3:7:3:26 | exit CompileTimeOperators (normal) |
@@ -5439,17 +4648,19 @@ postDominance
 | CompileTimeOperators.cs:26:7:26:22 | exit GotoInTryFinally | CompileTimeOperators.cs:26:7:26:22 | exit GotoInTryFinally (normal) |
 | CompileTimeOperators.cs:26:7:26:22 | exit GotoInTryFinally (normal) | CompileTimeOperators.cs:26:7:26:22 | {...} |
 | CompileTimeOperators.cs:26:7:26:22 | {...} | CompileTimeOperators.cs:26:7:26:22 | call to constructor Object |
-| CompileTimeOperators.cs:28:10:28:10 | exit M | CompileTimeOperators.cs:28:10:28:10 | exit M (normal) |
 | CompileTimeOperators.cs:28:10:28:10 | exit M (normal) | CompileTimeOperators.cs:40:14:40:37 | call to method WriteLine |
 | CompileTimeOperators.cs:29:5:41:5 | {...} | CompileTimeOperators.cs:28:10:28:10 | enter M |
 | CompileTimeOperators.cs:30:9:38:9 | try {...} ... | CompileTimeOperators.cs:29:5:41:5 | {...} |
 | CompileTimeOperators.cs:31:9:34:9 | {...} | CompileTimeOperators.cs:30:9:38:9 | try {...} ... |
 | CompileTimeOperators.cs:32:13:32:21 | goto ...; | CompileTimeOperators.cs:31:9:34:9 | {...} |
-| CompileTimeOperators.cs:36:9:38:9 | [finally: goto(End)] {...} | CompileTimeOperators.cs:32:13:32:21 | goto ...; |
-| CompileTimeOperators.cs:37:13:37:40 | [finally: goto(End)] call to method WriteLine | CompileTimeOperators.cs:37:31:37:39 | [finally: goto(End)] "Finally" |
-| CompileTimeOperators.cs:37:13:37:41 | [finally: goto(End)] ...; | CompileTimeOperators.cs:36:9:38:9 | [finally: goto(End)] {...} |
-| CompileTimeOperators.cs:37:31:37:39 | [finally: goto(End)] "Finally" | CompileTimeOperators.cs:37:13:37:41 | [finally: goto(End)] ...; |
-| CompileTimeOperators.cs:40:9:40:11 | End: | CompileTimeOperators.cs:37:13:37:40 | [finally: goto(End)] call to method WriteLine |
+| CompileTimeOperators.cs:36:9:38:9 | {...} | CompileTimeOperators.cs:32:13:32:21 | goto ...; |
+| CompileTimeOperators.cs:37:13:37:40 | call to method WriteLine | CompileTimeOperators.cs:37:31:37:39 | "Finally" |
+| CompileTimeOperators.cs:37:13:37:41 | ...; | CompileTimeOperators.cs:36:9:38:9 | {...} |
+| CompileTimeOperators.cs:37:31:37:39 | "Finally" | CompileTimeOperators.cs:37:13:37:41 | ...; |
+| CompileTimeOperators.cs:39:9:39:33 | call to method WriteLine | CompileTimeOperators.cs:39:27:39:32 | "Dead" |
+| CompileTimeOperators.cs:39:27:39:32 | "Dead" | CompileTimeOperators.cs:39:9:39:34 | ...; |
+| CompileTimeOperators.cs:40:9:40:11 | End: | CompileTimeOperators.cs:37:13:37:40 | call to method WriteLine |
+| CompileTimeOperators.cs:40:9:40:11 | End: | CompileTimeOperators.cs:39:9:39:33 | call to method WriteLine |
 | CompileTimeOperators.cs:40:14:40:37 | call to method WriteLine | CompileTimeOperators.cs:40:32:40:36 | "End" |
 | CompileTimeOperators.cs:40:14:40:38 | ...; | CompileTimeOperators.cs:40:9:40:11 | End: |
 | CompileTimeOperators.cs:40:32:40:36 | "End" | CompileTimeOperators.cs:40:14:40:38 | ...; |
@@ -5542,13 +4753,11 @@ postDominance
 | Conditions.cs:4:5:9:5 | {...} | Conditions.cs:3:10:3:19 | enter IncrOrDecr |
 | Conditions.cs:5:9:6:16 | if (...) ... | Conditions.cs:4:5:9:5 | {...} |
 | Conditions.cs:5:13:5:15 | access to parameter inc | Conditions.cs:5:9:6:16 | if (...) ... |
-| Conditions.cs:6:13:6:13 | [inc (line 3): true] access to parameter x | Conditions.cs:6:13:6:16 | [inc (line 3): true] ...; |
-| Conditions.cs:6:13:6:15 | [inc (line 3): true] ...++ | Conditions.cs:6:13:6:13 | [inc (line 3): true] access to parameter x |
-| Conditions.cs:7:9:8:16 | [inc (line 3): true] if (...) ... | Conditions.cs:6:13:6:15 | [inc (line 3): true] ...++ |
-| Conditions.cs:7:13:7:16 | [false] !... | Conditions.cs:7:14:7:16 | [inc (line 3): true] access to parameter inc |
-| Conditions.cs:7:13:7:16 | [true] !... | Conditions.cs:7:14:7:16 | [inc (line 3): false] access to parameter inc |
-| Conditions.cs:7:14:7:16 | [inc (line 3): false] access to parameter inc | Conditions.cs:7:9:8:16 | [inc (line 3): false] if (...) ... |
-| Conditions.cs:7:14:7:16 | [inc (line 3): true] access to parameter inc | Conditions.cs:7:9:8:16 | [inc (line 3): true] if (...) ... |
+| Conditions.cs:6:13:6:13 | access to parameter x | Conditions.cs:6:13:6:16 | ...; |
+| Conditions.cs:6:13:6:15 | ...++ | Conditions.cs:6:13:6:13 | access to parameter x |
+| Conditions.cs:7:9:8:16 | if (...) ... | Conditions.cs:5:13:5:15 | access to parameter inc |
+| Conditions.cs:7:9:8:16 | if (...) ... | Conditions.cs:6:13:6:15 | ...++ |
+| Conditions.cs:7:14:7:16 | access to parameter inc | Conditions.cs:7:9:8:16 | if (...) ... |
 | Conditions.cs:8:13:8:13 | access to parameter x | Conditions.cs:8:13:8:16 | ...; |
 | Conditions.cs:8:13:8:15 | ...-- | Conditions.cs:8:13:8:13 | access to parameter x |
 | Conditions.cs:8:13:8:16 | ...; | Conditions.cs:7:13:7:16 | [true] !... |
@@ -5560,25 +4769,19 @@ postDominance
 | Conditions.cs:13:17:13:17 | 0 | Conditions.cs:13:9:13:18 | ... ...; |
 | Conditions.cs:14:9:15:16 | if (...) ... | Conditions.cs:13:13:13:17 | Int32 x = ... |
 | Conditions.cs:14:13:14:13 | access to parameter b | Conditions.cs:14:9:15:16 | if (...) ... |
-| Conditions.cs:15:13:15:13 | [b (line 11): true] access to local variable x | Conditions.cs:15:13:15:16 | [b (line 11): true] ...; |
-| Conditions.cs:15:13:15:15 | [b (line 11): true] ...++ | Conditions.cs:15:13:15:13 | [b (line 11): true] access to local variable x |
-| Conditions.cs:16:9:18:20 | [b (line 11): true] if (...) ... | Conditions.cs:15:13:15:15 | [b (line 11): true] ...++ |
-| Conditions.cs:16:13:16:13 | [b (line 11): false] access to local variable x | Conditions.cs:16:9:18:20 | [b (line 11): false] if (...) ... |
-| Conditions.cs:16:13:16:13 | [b (line 11): true] access to local variable x | Conditions.cs:16:9:18:20 | [b (line 11): true] if (...) ... |
-| Conditions.cs:16:13:16:17 | [b (line 11): false] ... > ... | Conditions.cs:16:17:16:17 | [b (line 11): false] 0 |
-| Conditions.cs:16:13:16:17 | [b (line 11): true] ... > ... | Conditions.cs:16:17:16:17 | [b (line 11): true] 0 |
-| Conditions.cs:16:17:16:17 | [b (line 11): false] 0 | Conditions.cs:16:13:16:13 | [b (line 11): false] access to local variable x |
-| Conditions.cs:16:17:16:17 | [b (line 11): true] 0 | Conditions.cs:16:13:16:13 | [b (line 11): true] access to local variable x |
-| Conditions.cs:17:17:17:18 | [false] !... | Conditions.cs:17:18:17:18 | [b (line 11): true] access to parameter b |
-| Conditions.cs:17:17:17:18 | [true] !... | Conditions.cs:17:18:17:18 | [b (line 11): false] access to parameter b |
-| Conditions.cs:17:18:17:18 | [b (line 11): false] access to parameter b | Conditions.cs:17:13:18:20 | [b (line 11): false] if (...) ... |
-| Conditions.cs:17:18:17:18 | [b (line 11): true] access to parameter b | Conditions.cs:17:13:18:20 | [b (line 11): true] if (...) ... |
+| Conditions.cs:15:13:15:13 | access to local variable x | Conditions.cs:15:13:15:16 | ...; |
+| Conditions.cs:15:13:15:15 | ...++ | Conditions.cs:15:13:15:13 | access to local variable x |
+| Conditions.cs:16:9:18:20 | if (...) ... | Conditions.cs:14:13:14:13 | access to parameter b |
+| Conditions.cs:16:9:18:20 | if (...) ... | Conditions.cs:15:13:15:15 | ...++ |
+| Conditions.cs:16:13:16:13 | access to local variable x | Conditions.cs:16:9:18:20 | if (...) ... |
+| Conditions.cs:16:13:16:17 | ... > ... | Conditions.cs:16:17:16:17 | 0 |
+| Conditions.cs:16:17:16:17 | 0 | Conditions.cs:16:13:16:13 | access to local variable x |
+| Conditions.cs:17:18:17:18 | access to parameter b | Conditions.cs:17:13:18:20 | if (...) ... |
 | Conditions.cs:18:17:18:17 | access to local variable x | Conditions.cs:18:17:18:20 | ...; |
 | Conditions.cs:18:17:18:19 | ...-- | Conditions.cs:18:17:18:17 | access to local variable x |
 | Conditions.cs:18:17:18:20 | ...; | Conditions.cs:17:17:17:18 | [true] !... |
 | Conditions.cs:19:9:19:17 | return ...; | Conditions.cs:19:16:19:16 | access to local variable x |
-| Conditions.cs:19:16:19:16 | access to local variable x | Conditions.cs:16:13:16:17 | [b (line 11): false] ... > ... |
-| Conditions.cs:19:16:19:16 | access to local variable x | Conditions.cs:16:13:16:17 | [b (line 11): true] ... > ... |
+| Conditions.cs:19:16:19:16 | access to local variable x | Conditions.cs:16:13:16:17 | ... > ... |
 | Conditions.cs:19:16:19:16 | access to local variable x | Conditions.cs:17:17:17:18 | [false] !... |
 | Conditions.cs:19:16:19:16 | access to local variable x | Conditions.cs:18:17:18:19 | ...-- |
 | Conditions.cs:22:9:22:10 | exit M2 | Conditions.cs:22:9:22:10 | exit M2 (normal) |
@@ -5590,17 +4793,15 @@ postDominance
 | Conditions.cs:25:9:27:20 | if (...) ... | Conditions.cs:24:13:24:17 | Int32 x = ... |
 | Conditions.cs:25:13:25:14 | access to parameter b1 | Conditions.cs:25:9:27:20 | if (...) ... |
 | Conditions.cs:26:17:26:18 | access to parameter b2 | Conditions.cs:26:13:27:20 | if (...) ... |
-| Conditions.cs:27:17:27:17 | [b2 (line 22): true] access to local variable x | Conditions.cs:27:17:27:20 | [b2 (line 22): true] ...; |
-| Conditions.cs:27:17:27:19 | [b2 (line 22): true] ...++ | Conditions.cs:27:17:27:17 | [b2 (line 22): true] access to local variable x |
-| Conditions.cs:28:9:29:16 | [b2 (line 22): true] if (...) ... | Conditions.cs:27:17:27:19 | [b2 (line 22): true] ...++ |
-| Conditions.cs:28:13:28:14 | [b2 (line 22): false] access to parameter b2 | Conditions.cs:28:9:29:16 | [b2 (line 22): false] if (...) ... |
-| Conditions.cs:28:13:28:14 | [b2 (line 22): true] access to parameter b2 | Conditions.cs:28:9:29:16 | [b2 (line 22): true] if (...) ... |
+| Conditions.cs:27:17:27:17 | access to local variable x | Conditions.cs:27:17:27:20 | ...; |
+| Conditions.cs:27:17:27:19 | ...++ | Conditions.cs:27:17:27:17 | access to local variable x |
+| Conditions.cs:28:9:29:16 | if (...) ... | Conditions.cs:25:13:25:14 | access to parameter b1 |
+| Conditions.cs:28:9:29:16 | if (...) ... | Conditions.cs:26:17:26:18 | access to parameter b2 |
+| Conditions.cs:28:9:29:16 | if (...) ... | Conditions.cs:27:17:27:19 | ...++ |
 | Conditions.cs:28:13:28:14 | access to parameter b2 | Conditions.cs:28:9:29:16 | if (...) ... |
 | Conditions.cs:29:13:29:13 | access to local variable x | Conditions.cs:29:13:29:16 | ...; |
 | Conditions.cs:29:13:29:15 | ...++ | Conditions.cs:29:13:29:13 | access to local variable x |
-| Conditions.cs:29:13:29:16 | ...; | Conditions.cs:28:13:28:14 | [b2 (line 22): true] access to parameter b2 |
 | Conditions.cs:30:9:30:17 | return ...; | Conditions.cs:30:16:30:16 | access to local variable x |
-| Conditions.cs:30:16:30:16 | access to local variable x | Conditions.cs:28:13:28:14 | [b2 (line 22): false] access to parameter b2 |
 | Conditions.cs:30:16:30:16 | access to local variable x | Conditions.cs:28:13:28:14 | access to parameter b2 |
 | Conditions.cs:30:16:30:16 | access to local variable x | Conditions.cs:29:13:29:15 | ...++ |
 | Conditions.cs:33:9:33:10 | exit M3 | Conditions.cs:33:9:33:10 | exit M3 (normal) |
@@ -5619,16 +4820,15 @@ postDominance
 | Conditions.cs:39:9:40:16 | if (...) ... | Conditions.cs:37:13:37:14 | access to parameter b1 |
 | Conditions.cs:39:9:40:16 | if (...) ... | Conditions.cs:38:13:38:19 | ... = ... |
 | Conditions.cs:39:13:39:14 | access to local variable b2 | Conditions.cs:39:9:40:16 | if (...) ... |
-| Conditions.cs:40:13:40:13 | [b2 (line 39): true] access to local variable x | Conditions.cs:40:13:40:16 | [b2 (line 39): true] ...; |
-| Conditions.cs:40:13:40:15 | [b2 (line 39): true] ...++ | Conditions.cs:40:13:40:13 | [b2 (line 39): true] access to local variable x |
-| Conditions.cs:41:9:42:16 | [b2 (line 39): true] if (...) ... | Conditions.cs:40:13:40:15 | [b2 (line 39): true] ...++ |
-| Conditions.cs:41:13:41:14 | [b2 (line 39): false] access to local variable b2 | Conditions.cs:41:9:42:16 | [b2 (line 39): false] if (...) ... |
-| Conditions.cs:41:13:41:14 | [b2 (line 39): true] access to local variable b2 | Conditions.cs:41:9:42:16 | [b2 (line 39): true] if (...) ... |
+| Conditions.cs:40:13:40:13 | access to local variable x | Conditions.cs:40:13:40:16 | ...; |
+| Conditions.cs:40:13:40:15 | ...++ | Conditions.cs:40:13:40:13 | access to local variable x |
+| Conditions.cs:41:9:42:16 | if (...) ... | Conditions.cs:39:13:39:14 | access to local variable b2 |
+| Conditions.cs:41:9:42:16 | if (...) ... | Conditions.cs:40:13:40:15 | ...++ |
+| Conditions.cs:41:13:41:14 | access to local variable b2 | Conditions.cs:41:9:42:16 | if (...) ... |
 | Conditions.cs:42:13:42:13 | access to local variable x | Conditions.cs:42:13:42:16 | ...; |
 | Conditions.cs:42:13:42:15 | ...++ | Conditions.cs:42:13:42:13 | access to local variable x |
-| Conditions.cs:42:13:42:16 | ...; | Conditions.cs:41:13:41:14 | [b2 (line 39): true] access to local variable b2 |
 | Conditions.cs:43:9:43:17 | return ...; | Conditions.cs:43:16:43:16 | access to local variable x |
-| Conditions.cs:43:16:43:16 | access to local variable x | Conditions.cs:41:13:41:14 | [b2 (line 39): false] access to local variable b2 |
+| Conditions.cs:43:16:43:16 | access to local variable x | Conditions.cs:41:13:41:14 | access to local variable b2 |
 | Conditions.cs:43:16:43:16 | access to local variable x | Conditions.cs:42:13:42:15 | ...++ |
 | Conditions.cs:46:9:46:10 | exit M4 | Conditions.cs:46:9:46:10 | exit M4 (normal) |
 | Conditions.cs:46:9:46:10 | exit M4 (normal) | Conditions.cs:54:9:54:17 | return ...; |
@@ -5637,31 +4837,18 @@ postDominance
 | Conditions.cs:48:13:48:17 | Int32 y = ... | Conditions.cs:48:17:48:17 | 0 |
 | Conditions.cs:48:17:48:17 | 0 | Conditions.cs:48:9:48:18 | ... ...; |
 | Conditions.cs:49:9:53:9 | while (...) ... | Conditions.cs:48:13:48:17 | Int32 y = ... |
-| Conditions.cs:49:16:49:16 | [b (line 46): false] access to parameter x | Conditions.cs:51:17:51:17 | [b (line 46): false] access to parameter b |
-| Conditions.cs:49:16:49:16 | [b (line 46): true] access to parameter x | Conditions.cs:52:17:52:19 | [b (line 46): true] ...++ |
 | Conditions.cs:49:16:49:16 | access to parameter x | Conditions.cs:49:9:53:9 | while (...) ... |
+| Conditions.cs:49:16:49:16 | access to parameter x | Conditions.cs:51:17:51:17 | access to parameter b |
+| Conditions.cs:49:16:49:16 | access to parameter x | Conditions.cs:52:17:52:19 | ...++ |
 | Conditions.cs:49:16:49:18 | ...-- | Conditions.cs:49:16:49:16 | access to parameter x |
-| Conditions.cs:49:16:49:18 | [b (line 46): false] ...-- | Conditions.cs:49:16:49:16 | [b (line 46): false] access to parameter x |
-| Conditions.cs:49:16:49:18 | [b (line 46): true] ...-- | Conditions.cs:49:16:49:16 | [b (line 46): true] access to parameter x |
 | Conditions.cs:49:16:49:22 | ... > ... | Conditions.cs:49:22:49:22 | 0 |
-| Conditions.cs:49:16:49:22 | [b (line 46): false] ... > ... | Conditions.cs:49:22:49:22 | [b (line 46): false] 0 |
-| Conditions.cs:49:16:49:22 | [b (line 46): true] ... > ... | Conditions.cs:49:22:49:22 | [b (line 46): true] 0 |
 | Conditions.cs:49:22:49:22 | 0 | Conditions.cs:49:16:49:18 | ...-- |
-| Conditions.cs:49:22:49:22 | [b (line 46): false] 0 | Conditions.cs:49:16:49:18 | [b (line 46): false] ...-- |
-| Conditions.cs:49:22:49:22 | [b (line 46): true] 0 | Conditions.cs:49:16:49:18 | [b (line 46): true] ...-- |
-| Conditions.cs:51:13:52:20 | [b (line 46): false] if (...) ... | Conditions.cs:50:9:53:9 | [b (line 46): false] {...} |
-| Conditions.cs:51:13:52:20 | [b (line 46): true] if (...) ... | Conditions.cs:50:9:53:9 | [b (line 46): true] {...} |
 | Conditions.cs:51:13:52:20 | if (...) ... | Conditions.cs:50:9:53:9 | {...} |
-| Conditions.cs:51:17:51:17 | [b (line 46): false] access to parameter b | Conditions.cs:51:13:52:20 | [b (line 46): false] if (...) ... |
-| Conditions.cs:51:17:51:17 | [b (line 46): true] access to parameter b | Conditions.cs:51:13:52:20 | [b (line 46): true] if (...) ... |
 | Conditions.cs:51:17:51:17 | access to parameter b | Conditions.cs:51:13:52:20 | if (...) ... |
-| Conditions.cs:52:17:52:17 | [b (line 46): true] access to local variable y | Conditions.cs:52:17:52:20 | [b (line 46): true] ...; |
-| Conditions.cs:52:17:52:19 | [b (line 46): true] ...++ | Conditions.cs:52:17:52:17 | [b (line 46): true] access to local variable y |
-| Conditions.cs:52:17:52:20 | [b (line 46): true] ...; | Conditions.cs:51:17:51:17 | [b (line 46): true] access to parameter b |
+| Conditions.cs:52:17:52:17 | access to local variable y | Conditions.cs:52:17:52:20 | ...; |
+| Conditions.cs:52:17:52:19 | ...++ | Conditions.cs:52:17:52:17 | access to local variable y |
 | Conditions.cs:54:9:54:17 | return ...; | Conditions.cs:54:16:54:16 | access to local variable y |
 | Conditions.cs:54:16:54:16 | access to local variable y | Conditions.cs:49:16:49:22 | ... > ... |
-| Conditions.cs:54:16:54:16 | access to local variable y | Conditions.cs:49:16:49:22 | [b (line 46): false] ... > ... |
-| Conditions.cs:54:16:54:16 | access to local variable y | Conditions.cs:49:16:49:22 | [b (line 46): true] ... > ... |
 | Conditions.cs:57:9:57:10 | exit M5 | Conditions.cs:57:9:57:10 | exit M5 (normal) |
 | Conditions.cs:57:9:57:10 | exit M5 (normal) | Conditions.cs:67:9:67:17 | return ...; |
 | Conditions.cs:58:5:68:5 | {...} | Conditions.cs:57:9:57:10 | enter M5 |
@@ -5669,37 +4856,21 @@ postDominance
 | Conditions.cs:59:13:59:17 | Int32 y = ... | Conditions.cs:59:17:59:17 | 0 |
 | Conditions.cs:59:17:59:17 | 0 | Conditions.cs:59:9:59:18 | ... ...; |
 | Conditions.cs:60:9:64:9 | while (...) ... | Conditions.cs:59:13:59:17 | Int32 y = ... |
-| Conditions.cs:60:16:60:16 | [b (line 57): false] access to parameter x | Conditions.cs:62:17:62:17 | [b (line 57): false] access to parameter b |
-| Conditions.cs:60:16:60:16 | [b (line 57): true] access to parameter x | Conditions.cs:63:17:63:19 | [b (line 57): true] ...++ |
 | Conditions.cs:60:16:60:16 | access to parameter x | Conditions.cs:60:9:64:9 | while (...) ... |
+| Conditions.cs:60:16:60:16 | access to parameter x | Conditions.cs:62:17:62:17 | access to parameter b |
+| Conditions.cs:60:16:60:16 | access to parameter x | Conditions.cs:63:17:63:19 | ...++ |
 | Conditions.cs:60:16:60:18 | ...-- | Conditions.cs:60:16:60:16 | access to parameter x |
-| Conditions.cs:60:16:60:18 | [b (line 57): false] ...-- | Conditions.cs:60:16:60:16 | [b (line 57): false] access to parameter x |
-| Conditions.cs:60:16:60:18 | [b (line 57): true] ...-- | Conditions.cs:60:16:60:16 | [b (line 57): true] access to parameter x |
 | Conditions.cs:60:16:60:22 | ... > ... | Conditions.cs:60:22:60:22 | 0 |
-| Conditions.cs:60:16:60:22 | [b (line 57): false] ... > ... | Conditions.cs:60:22:60:22 | [b (line 57): false] 0 |
-| Conditions.cs:60:16:60:22 | [b (line 57): true] ... > ... | Conditions.cs:60:22:60:22 | [b (line 57): true] 0 |
 | Conditions.cs:60:22:60:22 | 0 | Conditions.cs:60:16:60:18 | ...-- |
-| Conditions.cs:60:22:60:22 | [b (line 57): false] 0 | Conditions.cs:60:16:60:18 | [b (line 57): false] ...-- |
-| Conditions.cs:60:22:60:22 | [b (line 57): true] 0 | Conditions.cs:60:16:60:18 | [b (line 57): true] ...-- |
-| Conditions.cs:62:13:63:20 | [b (line 57): false] if (...) ... | Conditions.cs:61:9:64:9 | [b (line 57): false] {...} |
-| Conditions.cs:62:13:63:20 | [b (line 57): true] if (...) ... | Conditions.cs:61:9:64:9 | [b (line 57): true] {...} |
 | Conditions.cs:62:13:63:20 | if (...) ... | Conditions.cs:61:9:64:9 | {...} |
-| Conditions.cs:62:17:62:17 | [b (line 57): false] access to parameter b | Conditions.cs:62:13:63:20 | [b (line 57): false] if (...) ... |
-| Conditions.cs:62:17:62:17 | [b (line 57): true] access to parameter b | Conditions.cs:62:13:63:20 | [b (line 57): true] if (...) ... |
 | Conditions.cs:62:17:62:17 | access to parameter b | Conditions.cs:62:13:63:20 | if (...) ... |
-| Conditions.cs:63:17:63:17 | [b (line 57): true] access to local variable y | Conditions.cs:63:17:63:20 | [b (line 57): true] ...; |
-| Conditions.cs:63:17:63:19 | [b (line 57): true] ...++ | Conditions.cs:63:17:63:17 | [b (line 57): true] access to local variable y |
-| Conditions.cs:63:17:63:20 | [b (line 57): true] ...; | Conditions.cs:62:17:62:17 | [b (line 57): true] access to parameter b |
-| Conditions.cs:65:9:66:16 | [b (line 57): false] if (...) ... | Conditions.cs:60:16:60:22 | [b (line 57): false] ... > ... |
-| Conditions.cs:65:9:66:16 | [b (line 57): true] if (...) ... | Conditions.cs:60:16:60:22 | [b (line 57): true] ... > ... |
-| Conditions.cs:65:13:65:13 | [b (line 57): false] access to parameter b | Conditions.cs:65:9:66:16 | [b (line 57): false] if (...) ... |
-| Conditions.cs:65:13:65:13 | [b (line 57): true] access to parameter b | Conditions.cs:65:9:66:16 | [b (line 57): true] if (...) ... |
+| Conditions.cs:63:17:63:17 | access to local variable y | Conditions.cs:63:17:63:20 | ...; |
+| Conditions.cs:63:17:63:19 | ...++ | Conditions.cs:63:17:63:17 | access to local variable y |
+| Conditions.cs:65:9:66:16 | if (...) ... | Conditions.cs:60:16:60:22 | ... > ... |
 | Conditions.cs:65:13:65:13 | access to parameter b | Conditions.cs:65:9:66:16 | if (...) ... |
 | Conditions.cs:66:13:66:13 | access to local variable y | Conditions.cs:66:13:66:16 | ...; |
 | Conditions.cs:66:13:66:15 | ...++ | Conditions.cs:66:13:66:13 | access to local variable y |
-| Conditions.cs:66:13:66:16 | ...; | Conditions.cs:65:13:65:13 | [b (line 57): true] access to parameter b |
 | Conditions.cs:67:9:67:17 | return ...; | Conditions.cs:67:16:67:16 | access to local variable y |
-| Conditions.cs:67:16:67:16 | access to local variable y | Conditions.cs:65:13:65:13 | [b (line 57): false] access to parameter b |
 | Conditions.cs:67:16:67:16 | access to local variable y | Conditions.cs:65:13:65:13 | access to parameter b |
 | Conditions.cs:67:16:67:16 | access to local variable y | Conditions.cs:66:13:66:15 | ...++ |
 | Conditions.cs:70:9:70:10 | exit M6 | Conditions.cs:70:9:70:10 | exit M6 (normal) |
@@ -5781,31 +4952,24 @@ postDominance
 | Conditions.cs:104:17:104:28 | call to method ToString | Conditions.cs:104:17:104:17 | access to parameter b |
 | Conditions.cs:105:9:106:20 | if (...) ... | Conditions.cs:104:13:104:28 | String x = ... |
 | Conditions.cs:105:13:105:13 | access to parameter b | Conditions.cs:105:9:106:20 | if (...) ... |
-| Conditions.cs:106:13:106:13 | [b (line 102): true] access to local variable x | Conditions.cs:106:13:106:20 | [b (line 102): true] ...; |
-| Conditions.cs:106:13:106:19 | [b (line 102): true] ... + ... | Conditions.cs:106:18:106:19 | [b (line 102): true] "" |
-| Conditions.cs:106:13:106:19 | [b (line 102): true] ... = ... | Conditions.cs:106:13:106:19 | [b (line 102): true] ... + ... |
-| Conditions.cs:106:18:106:19 | [b (line 102): true] "" | Conditions.cs:106:13:106:13 | [b (line 102): true] access to local variable x |
-| Conditions.cs:107:9:109:24 | [b (line 102): true] if (...) ... | Conditions.cs:106:13:106:19 | [b (line 102): true] ... = ... |
-| Conditions.cs:107:13:107:13 | [b (line 102): false] access to local variable x | Conditions.cs:107:9:109:24 | [b (line 102): false] if (...) ... |
-| Conditions.cs:107:13:107:13 | [b (line 102): true] access to local variable x | Conditions.cs:107:9:109:24 | [b (line 102): true] if (...) ... |
-| Conditions.cs:107:13:107:20 | [b (line 102): false] access to property Length | Conditions.cs:107:13:107:13 | [b (line 102): false] access to local variable x |
-| Conditions.cs:107:13:107:20 | [b (line 102): true] access to property Length | Conditions.cs:107:13:107:13 | [b (line 102): true] access to local variable x |
-| Conditions.cs:107:13:107:24 | [b (line 102): false] ... > ... | Conditions.cs:107:24:107:24 | [b (line 102): false] 0 |
-| Conditions.cs:107:13:107:24 | [b (line 102): true] ... > ... | Conditions.cs:107:24:107:24 | [b (line 102): true] 0 |
-| Conditions.cs:107:24:107:24 | [b (line 102): false] 0 | Conditions.cs:107:13:107:20 | [b (line 102): false] access to property Length |
-| Conditions.cs:107:24:107:24 | [b (line 102): true] 0 | Conditions.cs:107:13:107:20 | [b (line 102): true] access to property Length |
-| Conditions.cs:108:17:108:18 | [false] !... | Conditions.cs:108:18:108:18 | [b (line 102): true] access to parameter b |
-| Conditions.cs:108:17:108:18 | [true] !... | Conditions.cs:108:18:108:18 | [b (line 102): false] access to parameter b |
-| Conditions.cs:108:18:108:18 | [b (line 102): false] access to parameter b | Conditions.cs:108:13:109:24 | [b (line 102): false] if (...) ... |
-| Conditions.cs:108:18:108:18 | [b (line 102): true] access to parameter b | Conditions.cs:108:13:109:24 | [b (line 102): true] if (...) ... |
+| Conditions.cs:106:13:106:13 | access to local variable x | Conditions.cs:106:13:106:20 | ...; |
+| Conditions.cs:106:13:106:19 | ... + ... | Conditions.cs:106:18:106:19 | "" |
+| Conditions.cs:106:13:106:19 | ... = ... | Conditions.cs:106:13:106:19 | ... + ... |
+| Conditions.cs:106:18:106:19 | "" | Conditions.cs:106:13:106:13 | access to local variable x |
+| Conditions.cs:107:9:109:24 | if (...) ... | Conditions.cs:105:13:105:13 | access to parameter b |
+| Conditions.cs:107:9:109:24 | if (...) ... | Conditions.cs:106:13:106:19 | ... = ... |
+| Conditions.cs:107:13:107:13 | access to local variable x | Conditions.cs:107:9:109:24 | if (...) ... |
+| Conditions.cs:107:13:107:20 | access to property Length | Conditions.cs:107:13:107:13 | access to local variable x |
+| Conditions.cs:107:13:107:24 | ... > ... | Conditions.cs:107:24:107:24 | 0 |
+| Conditions.cs:107:24:107:24 | 0 | Conditions.cs:107:13:107:20 | access to property Length |
+| Conditions.cs:108:18:108:18 | access to parameter b | Conditions.cs:108:13:109:24 | if (...) ... |
 | Conditions.cs:109:17:109:17 | access to local variable x | Conditions.cs:109:17:109:24 | ...; |
 | Conditions.cs:109:17:109:23 | ... + ... | Conditions.cs:109:22:109:23 | "" |
 | Conditions.cs:109:17:109:23 | ... = ... | Conditions.cs:109:17:109:23 | ... + ... |
 | Conditions.cs:109:17:109:24 | ...; | Conditions.cs:108:17:108:18 | [true] !... |
 | Conditions.cs:109:22:109:23 | "" | Conditions.cs:109:17:109:17 | access to local variable x |
 | Conditions.cs:110:9:110:17 | return ...; | Conditions.cs:110:16:110:16 | access to local variable x |
-| Conditions.cs:110:16:110:16 | access to local variable x | Conditions.cs:107:13:107:24 | [b (line 102): false] ... > ... |
-| Conditions.cs:110:16:110:16 | access to local variable x | Conditions.cs:107:13:107:24 | [b (line 102): true] ... > ... |
+| Conditions.cs:110:16:110:16 | access to local variable x | Conditions.cs:107:13:107:24 | ... > ... |
 | Conditions.cs:110:16:110:16 | access to local variable x | Conditions.cs:108:17:108:18 | [false] !... |
 | Conditions.cs:110:16:110:16 | access to local variable x | Conditions.cs:109:17:109:23 | ... = ... |
 | Conditions.cs:113:10:113:11 | exit M9 | Conditions.cs:113:10:113:11 | exit M9 (normal) |
@@ -5822,7 +4986,7 @@ postDominance
 | Conditions.cs:116:25:116:39 | ... < ... | Conditions.cs:116:29:116:39 | access to property Length |
 | Conditions.cs:116:29:116:32 | access to parameter args | Conditions.cs:116:25:116:25 | access to local variable i |
 | Conditions.cs:116:29:116:39 | access to property Length | Conditions.cs:116:29:116:32 | access to parameter args |
-| Conditions.cs:116:42:116:42 | access to local variable i | Conditions.cs:121:17:121:20 | [last (line 118): false] access to local variable last |
+| Conditions.cs:116:42:116:42 | access to local variable i | Conditions.cs:121:17:121:20 | access to local variable last |
 | Conditions.cs:116:42:116:42 | access to local variable i | Conditions.cs:122:17:122:24 | ... = ... |
 | Conditions.cs:116:42:116:44 | ...++ | Conditions.cs:116:42:116:42 | access to local variable i |
 | Conditions.cs:118:13:118:44 | ... ...; | Conditions.cs:117:9:123:9 | {...} |
@@ -5835,67 +4999,43 @@ postDominance
 | Conditions.cs:118:43:118:43 | 1 | Conditions.cs:118:29:118:39 | access to property Length |
 | Conditions.cs:119:13:120:23 | if (...) ... | Conditions.cs:118:17:118:43 | Boolean last = ... |
 | Conditions.cs:119:18:119:21 | access to local variable last | Conditions.cs:119:13:120:23 | if (...) ... |
-| Conditions.cs:120:17:120:22 | [last (line 118): false] ... = ... | Conditions.cs:120:21:120:22 | [last (line 118): false] "" |
-| Conditions.cs:120:17:120:23 | [last (line 118): false] ...; | Conditions.cs:119:17:119:21 | [true, last (line 118): false] !... |
-| Conditions.cs:120:21:120:22 | [last (line 118): false] "" | Conditions.cs:120:17:120:23 | [last (line 118): false] ...; |
-| Conditions.cs:121:13:122:25 | [last (line 118): false] if (...) ... | Conditions.cs:120:17:120:22 | [last (line 118): false] ... = ... |
-| Conditions.cs:121:13:122:25 | [last (line 118): true] if (...) ... | Conditions.cs:119:17:119:21 | [false, last (line 118): true] !... |
-| Conditions.cs:121:17:121:20 | [last (line 118): false] access to local variable last | Conditions.cs:121:13:122:25 | [last (line 118): false] if (...) ... |
-| Conditions.cs:121:17:121:20 | [last (line 118): true] access to local variable last | Conditions.cs:121:13:122:25 | [last (line 118): true] if (...) ... |
+| Conditions.cs:120:17:120:22 | ... = ... | Conditions.cs:120:21:120:22 | "" |
+| Conditions.cs:120:17:120:23 | ...; | Conditions.cs:119:17:119:21 | [true] !... |
+| Conditions.cs:120:21:120:22 | "" | Conditions.cs:120:17:120:23 | ...; |
+| Conditions.cs:121:13:122:25 | if (...) ... | Conditions.cs:119:17:119:21 | [false] !... |
+| Conditions.cs:121:13:122:25 | if (...) ... | Conditions.cs:120:17:120:22 | ... = ... |
+| Conditions.cs:121:17:121:20 | access to local variable last | Conditions.cs:121:13:122:25 | if (...) ... |
 | Conditions.cs:122:17:122:24 | ... = ... | Conditions.cs:122:21:122:24 | null |
-| Conditions.cs:122:17:122:25 | ...; | Conditions.cs:121:17:121:20 | [last (line 118): true] access to local variable last |
 | Conditions.cs:122:21:122:24 | null | Conditions.cs:122:17:122:25 | ...; |
 | Conditions.cs:130:5:141:5 | {...} | Conditions.cs:129:10:129:12 | enter M10 |
 | Conditions.cs:131:9:140:9 | while (...) ... | Conditions.cs:130:5:141:5 | {...} |
-| Conditions.cs:131:16:131:19 | [Field1 (line 129): true, Field2 (line 129): true] true | Conditions.cs:137:21:137:37 | [Field1 (line 129): true, Field2 (line 129): true] call to method ToString |
-| Conditions.cs:131:16:131:19 | true | Conditions.cs:131:9:140:9 | while (...) ... |
-| Conditions.cs:133:13:139:13 | [Field1 (line 129): false] if (...) ... | Conditions.cs:132:9:140:9 | [Field1 (line 129): false] {...} |
-| Conditions.cs:133:13:139:13 | [Field1 (line 129): true, Field2 (line 129): false] if (...) ... | Conditions.cs:132:9:140:9 | [Field1 (line 129): true, Field2 (line 129): false] {...} |
-| Conditions.cs:133:13:139:13 | [Field1 (line 129): true, Field2 (line 129): true] if (...) ... | Conditions.cs:132:9:140:9 | [Field1 (line 129): true, Field2 (line 129): true] {...} |
 | Conditions.cs:133:13:139:13 | if (...) ... | Conditions.cs:132:9:140:9 | {...} |
-| Conditions.cs:133:17:133:22 | [Field1 (line 129): false] access to field Field1 | Conditions.cs:133:17:133:22 | [Field1 (line 129): false] this access |
-| Conditions.cs:133:17:133:22 | [Field1 (line 129): false] this access | Conditions.cs:133:13:139:13 | [Field1 (line 129): false] if (...) ... |
-| Conditions.cs:133:17:133:22 | [Field1 (line 129): true, Field2 (line 129): false] access to field Field1 | Conditions.cs:133:17:133:22 | [Field1 (line 129): true, Field2 (line 129): false] this access |
-| Conditions.cs:133:17:133:22 | [Field1 (line 129): true, Field2 (line 129): false] this access | Conditions.cs:133:13:139:13 | [Field1 (line 129): true, Field2 (line 129): false] if (...) ... |
-| Conditions.cs:133:17:133:22 | [Field1 (line 129): true, Field2 (line 129): true] access to field Field1 | Conditions.cs:133:17:133:22 | [Field1 (line 129): true, Field2 (line 129): true] this access |
-| Conditions.cs:133:17:133:22 | [Field1 (line 129): true, Field2 (line 129): true] this access | Conditions.cs:133:13:139:13 | [Field1 (line 129): true, Field2 (line 129): true] if (...) ... |
 | Conditions.cs:133:17:133:22 | access to field Field1 | Conditions.cs:133:17:133:22 | this access |
 | Conditions.cs:133:17:133:22 | this access | Conditions.cs:133:13:139:13 | if (...) ... |
-| Conditions.cs:135:17:138:17 | [Field1 (line 129): true, Field2 (line 129): false] if (...) ... | Conditions.cs:134:13:139:13 | [Field1 (line 129): true, Field2 (line 129): false] {...} |
-| Conditions.cs:135:17:138:17 | [Field1 (line 129): true, Field2 (line 129): true] if (...) ... | Conditions.cs:134:13:139:13 | [Field1 (line 129): true, Field2 (line 129): true] {...} |
-| Conditions.cs:135:17:138:17 | [Field1 (line 129): true] if (...) ... | Conditions.cs:134:13:139:13 | [Field1 (line 129): true] {...} |
-| Conditions.cs:135:21:135:26 | [Field1 (line 129): true, Field2 (line 129): false] access to field Field2 | Conditions.cs:135:21:135:26 | [Field1 (line 129): true, Field2 (line 129): false] this access |
-| Conditions.cs:135:21:135:26 | [Field1 (line 129): true, Field2 (line 129): false] this access | Conditions.cs:135:17:138:17 | [Field1 (line 129): true, Field2 (line 129): false] if (...) ... |
-| Conditions.cs:135:21:135:26 | [Field1 (line 129): true, Field2 (line 129): true] access to field Field2 | Conditions.cs:135:21:135:26 | [Field1 (line 129): true, Field2 (line 129): true] this access |
-| Conditions.cs:135:21:135:26 | [Field1 (line 129): true, Field2 (line 129): true] this access | Conditions.cs:135:17:138:17 | [Field1 (line 129): true, Field2 (line 129): true] if (...) ... |
-| Conditions.cs:135:21:135:26 | [Field1 (line 129): true] access to field Field2 | Conditions.cs:135:21:135:26 | [Field1 (line 129): true] this access |
-| Conditions.cs:135:21:135:26 | [Field1 (line 129): true] this access | Conditions.cs:135:17:138:17 | [Field1 (line 129): true] if (...) ... |
-| Conditions.cs:137:21:137:26 | [Field1 (line 129): true, Field2 (line 129): true] access to field Field1 | Conditions.cs:137:21:137:26 | [Field1 (line 129): true, Field2 (line 129): true] this access |
-| Conditions.cs:137:21:137:26 | [Field1 (line 129): true, Field2 (line 129): true] this access | Conditions.cs:137:21:137:38 | [Field1 (line 129): true, Field2 (line 129): true] ...; |
-| Conditions.cs:137:21:137:37 | [Field1 (line 129): true, Field2 (line 129): true] call to method ToString | Conditions.cs:137:21:137:26 | [Field1 (line 129): true, Field2 (line 129): true] access to field Field1 |
-| Conditions.cs:137:21:137:38 | [Field1 (line 129): true, Field2 (line 129): true] ...; | Conditions.cs:136:17:138:17 | [Field1 (line 129): true, Field2 (line 129): true] {...} |
+| Conditions.cs:135:17:138:17 | if (...) ... | Conditions.cs:134:13:139:13 | {...} |
+| Conditions.cs:135:21:135:26 | access to field Field2 | Conditions.cs:135:21:135:26 | this access |
+| Conditions.cs:135:21:135:26 | this access | Conditions.cs:135:17:138:17 | if (...) ... |
+| Conditions.cs:137:21:137:26 | access to field Field1 | Conditions.cs:137:21:137:26 | this access |
+| Conditions.cs:137:21:137:26 | this access | Conditions.cs:137:21:137:38 | ...; |
+| Conditions.cs:137:21:137:37 | call to method ToString | Conditions.cs:137:21:137:26 | access to field Field1 |
+| Conditions.cs:137:21:137:38 | ...; | Conditions.cs:136:17:138:17 | {...} |
 | Conditions.cs:143:10:143:12 | exit M11 | Conditions.cs:143:10:143:12 | exit M11 (normal) |
 | Conditions.cs:143:10:143:12 | exit M11 (normal) | Conditions.cs:147:13:147:48 | call to method WriteLine |
 | Conditions.cs:143:10:143:12 | exit M11 (normal) | Conditions.cs:149:13:149:48 | call to method WriteLine |
 | Conditions.cs:144:5:150:5 | {...} | Conditions.cs:143:10:143:12 | enter M11 |
 | Conditions.cs:145:9:145:30 | ... ...; | Conditions.cs:144:5:150:5 | {...} |
-| Conditions.cs:145:13:145:29 | [b (line 143): false] String s = ... | Conditions.cs:145:17:145:29 | [b (line 143): false] ... ? ... : ... |
-| Conditions.cs:145:13:145:29 | [b (line 143): true] String s = ... | Conditions.cs:145:17:145:29 | [b (line 143): true] ... ? ... : ... |
+| Conditions.cs:145:13:145:29 | String s = ... | Conditions.cs:145:17:145:29 | ... ? ... : ... |
 | Conditions.cs:145:17:145:17 | access to parameter b | Conditions.cs:145:9:145:30 | ... ...; |
-| Conditions.cs:145:17:145:29 | [b (line 143): false] ... ? ... : ... | Conditions.cs:145:27:145:29 | [b (line 143): false] "b" |
-| Conditions.cs:145:17:145:29 | [b (line 143): true] ... ? ... : ... | Conditions.cs:145:21:145:23 | [b (line 143): true] "a" |
-| Conditions.cs:146:9:149:49 | [b (line 143): false] if (...) ... | Conditions.cs:145:13:145:29 | [b (line 143): false] String s = ... |
-| Conditions.cs:146:9:149:49 | [b (line 143): true] if (...) ... | Conditions.cs:145:13:145:29 | [b (line 143): true] String s = ... |
-| Conditions.cs:146:13:146:13 | [b (line 143): false] access to parameter b | Conditions.cs:146:9:149:49 | [b (line 143): false] if (...) ... |
-| Conditions.cs:146:13:146:13 | [b (line 143): true] access to parameter b | Conditions.cs:146:9:149:49 | [b (line 143): true] if (...) ... |
+| Conditions.cs:145:17:145:29 | ... ? ... : ... | Conditions.cs:145:21:145:23 | "a" |
+| Conditions.cs:145:17:145:29 | ... ? ... : ... | Conditions.cs:145:27:145:29 | "b" |
+| Conditions.cs:146:9:149:49 | if (...) ... | Conditions.cs:145:13:145:29 | String s = ... |
+| Conditions.cs:146:13:146:13 | access to parameter b | Conditions.cs:146:9:149:49 | if (...) ... |
 | Conditions.cs:147:13:147:48 | call to method WriteLine | Conditions.cs:147:38:147:47 | $"..." |
-| Conditions.cs:147:13:147:49 | ...; | Conditions.cs:146:13:146:13 | [b (line 143): true] access to parameter b |
 | Conditions.cs:147:38:147:47 | $"..." | Conditions.cs:147:44:147:46 | {...} |
 | Conditions.cs:147:40:147:43 | "a = " | Conditions.cs:147:13:147:49 | ...; |
 | Conditions.cs:147:44:147:46 | {...} | Conditions.cs:147:45:147:45 | access to local variable s |
 | Conditions.cs:147:45:147:45 | access to local variable s | Conditions.cs:147:40:147:43 | "a = " |
 | Conditions.cs:149:13:149:48 | call to method WriteLine | Conditions.cs:149:38:149:47 | $"..." |
-| Conditions.cs:149:13:149:49 | ...; | Conditions.cs:146:13:146:13 | [b (line 143): false] access to parameter b |
 | Conditions.cs:149:38:149:47 | $"..." | Conditions.cs:149:44:149:46 | {...} |
 | Conditions.cs:149:40:149:43 | "b = " | Conditions.cs:149:13:149:49 | ...; |
 | Conditions.cs:149:44:149:46 | {...} | Conditions.cs:149:45:149:45 | access to local variable s |
@@ -5945,9 +5085,9 @@ postDominance
 | ExitMethods.cs:42:13:42:30 | call to method ErrorAlways | ExitMethods.cs:42:25:42:29 | false |
 | ExitMethods.cs:42:13:42:31 | ...; | ExitMethods.cs:41:9:43:9 | {...} |
 | ExitMethods.cs:42:25:42:29 | false | ExitMethods.cs:42:13:42:31 | ...; |
-| ExitMethods.cs:45:9:47:9 | {...} | ExitMethods.cs:44:9:47:9 | [exception: ArgumentException] catch (...) {...} |
+| ExitMethods.cs:44:9:47:9 | catch (...) {...} | ExitMethods.cs:42:13:42:30 | call to method ErrorAlways |
 | ExitMethods.cs:46:13:46:19 | return ...; | ExitMethods.cs:45:9:47:9 | {...} |
-| ExitMethods.cs:49:9:51:9 | {...} | ExitMethods.cs:48:9:51:9 | [exception: Exception] catch (...) {...} |
+| ExitMethods.cs:49:9:51:9 | {...} | ExitMethods.cs:48:9:51:9 | catch (...) {...} |
 | ExitMethods.cs:50:13:50:19 | return ...; | ExitMethods.cs:49:9:51:9 | {...} |
 | ExitMethods.cs:54:10:54:11 | exit M7 | ExitMethods.cs:54:10:54:11 | exit M7 (abnormal) |
 | ExitMethods.cs:54:10:54:11 | exit M7 (abnormal) | ExitMethods.cs:56:9:56:22 | call to method ErrorAlways2 |
@@ -6025,8 +5165,9 @@ postDominance
 | ExitMethods.cs:117:16:117:38 | ... ? ... : ... | ExitMethods.cs:117:38:117:38 | 1 |
 | ExitMethods.cs:117:27:117:29 | - | ExitMethods.cs:117:16:117:16 | access to parameter s |
 | ExitMethods.cs:120:17:120:32 | exit FailingAssertion | ExitMethods.cs:120:17:120:32 | exit FailingAssertion (abnormal) |
-| ExitMethods.cs:120:17:120:32 | exit FailingAssertion (abnormal) | ExitMethods.cs:122:9:122:28 | [assertion failure] call to method IsTrue |
+| ExitMethods.cs:120:17:120:32 | exit FailingAssertion (abnormal) | ExitMethods.cs:122:9:122:28 | call to method IsTrue |
 | ExitMethods.cs:121:5:124:5 | {...} | ExitMethods.cs:120:17:120:32 | enter FailingAssertion |
+| ExitMethods.cs:122:9:122:28 | call to method IsTrue | ExitMethods.cs:122:23:122:27 | false |
 | ExitMethods.cs:122:9:122:29 | ...; | ExitMethods.cs:121:5:124:5 | {...} |
 | ExitMethods.cs:122:23:122:27 | false | ExitMethods.cs:122:9:122:29 | ...; |
 | ExitMethods.cs:126:17:126:33 | exit FailingAssertion2 | ExitMethods.cs:126:17:126:33 | exit FailingAssertion2 (abnormal) |
@@ -6035,13 +5176,13 @@ postDominance
 | ExitMethods.cs:128:9:128:26 | call to method FailingAssertion | ExitMethods.cs:128:9:128:26 | this access |
 | ExitMethods.cs:128:9:128:26 | this access | ExitMethods.cs:128:9:128:27 | ...; |
 | ExitMethods.cs:128:9:128:27 | ...; | ExitMethods.cs:127:5:130:5 | {...} |
-| ExitMethods.cs:132:10:132:20 | exit AssertFalse (abnormal) | ExitMethods.cs:132:33:132:49 | [assertion failure] call to method IsFalse |
-| ExitMethods.cs:132:10:132:20 | exit AssertFalse (normal) | ExitMethods.cs:132:33:132:49 | [assertion success] call to method IsFalse |
-| ExitMethods.cs:132:33:132:49 | [assertion success] call to method IsFalse | ExitMethods.cs:132:48:132:48 | access to parameter b |
+| ExitMethods.cs:132:10:132:20 | exit AssertFalse (normal) | ExitMethods.cs:132:33:132:49 | call to method IsFalse |
+| ExitMethods.cs:132:33:132:49 | call to method IsFalse | ExitMethods.cs:132:48:132:48 | access to parameter b |
 | ExitMethods.cs:132:48:132:48 | access to parameter b | ExitMethods.cs:132:10:132:20 | enter AssertFalse |
 | ExitMethods.cs:134:17:134:33 | exit FailingAssertion3 | ExitMethods.cs:134:17:134:33 | exit FailingAssertion3 (abnormal) |
-| ExitMethods.cs:134:17:134:33 | exit FailingAssertion3 (abnormal) | ExitMethods.cs:136:9:136:25 | [assertion failure] call to method AssertFalse |
+| ExitMethods.cs:134:17:134:33 | exit FailingAssertion3 (abnormal) | ExitMethods.cs:136:9:136:25 | call to method AssertFalse |
 | ExitMethods.cs:135:5:138:5 | {...} | ExitMethods.cs:134:17:134:33 | enter FailingAssertion3 |
+| ExitMethods.cs:136:9:136:25 | call to method AssertFalse | ExitMethods.cs:136:21:136:24 | true |
 | ExitMethods.cs:136:9:136:25 | this access | ExitMethods.cs:136:9:136:26 | ...; |
 | ExitMethods.cs:136:9:136:26 | ...; | ExitMethods.cs:135:5:138:5 | {...} |
 | ExitMethods.cs:136:21:136:24 | true | ExitMethods.cs:136:9:136:25 | this access |
@@ -6094,7 +5235,6 @@ postDominance
 | Finally.cs:3:14:3:20 | exit Finally | Finally.cs:3:14:3:20 | exit Finally (normal) |
 | Finally.cs:3:14:3:20 | exit Finally (normal) | Finally.cs:3:14:3:20 | {...} |
 | Finally.cs:3:14:3:20 | {...} | Finally.cs:3:14:3:20 | call to constructor Object |
-| Finally.cs:7:10:7:11 | exit M1 (abnormal) | Finally.cs:15:13:15:40 | [finally: exception(Exception)] call to method WriteLine |
 | Finally.cs:7:10:7:11 | exit M1 (normal) | Finally.cs:15:13:15:40 | call to method WriteLine |
 | Finally.cs:8:5:17:5 | {...} | Finally.cs:7:10:7:11 | enter M1 |
 | Finally.cs:9:9:16:9 | try {...} ... | Finally.cs:8:5:17:5 | {...} |
@@ -6103,13 +5243,9 @@ postDominance
 | Finally.cs:11:13:11:38 | ...; | Finally.cs:10:9:12:9 | {...} |
 | Finally.cs:11:31:11:36 | "Try1" | Finally.cs:11:13:11:38 | ...; |
 | Finally.cs:14:9:16:9 | {...} | Finally.cs:11:13:11:37 | call to method WriteLine |
-| Finally.cs:15:13:15:40 | [finally: exception(Exception)] call to method WriteLine | Finally.cs:15:31:15:39 | [finally: exception(Exception)] "Finally" |
 | Finally.cs:15:13:15:40 | call to method WriteLine | Finally.cs:15:31:15:39 | "Finally" |
 | Finally.cs:15:13:15:41 | ...; | Finally.cs:14:9:16:9 | {...} |
-| Finally.cs:15:13:15:41 | [finally: exception(Exception)] ...; | Finally.cs:14:9:16:9 | [finally: exception(Exception)] {...} |
 | Finally.cs:15:31:15:39 | "Finally" | Finally.cs:15:13:15:41 | ...; |
-| Finally.cs:15:31:15:39 | [finally: exception(Exception)] "Finally" | Finally.cs:15:13:15:41 | [finally: exception(Exception)] ...; |
-| Finally.cs:19:10:19:11 | exit M2 (normal) | Finally.cs:50:13:50:40 | [finally: return] call to method WriteLine |
 | Finally.cs:19:10:19:11 | exit M2 (normal) | Finally.cs:50:13:50:40 | call to method WriteLine |
 | Finally.cs:20:5:52:5 | {...} | Finally.cs:19:10:19:11 | enter M2 |
 | Finally.cs:21:9:51:9 | try {...} ... | Finally.cs:20:5:52:5 | {...} |
@@ -6117,37 +5253,29 @@ postDominance
 | Finally.cs:23:13:23:37 | call to method WriteLine | Finally.cs:23:31:23:36 | "Try2" |
 | Finally.cs:23:13:23:38 | ...; | Finally.cs:22:9:25:9 | {...} |
 | Finally.cs:23:31:23:36 | "Try2" | Finally.cs:23:13:23:38 | ...; |
-| Finally.cs:26:48:26:51 | [exception: Exception] true | Finally.cs:26:38:26:39 | [exception: Exception] IOException ex |
+| Finally.cs:26:48:26:51 | true | Finally.cs:26:38:26:39 | IOException ex |
+| Finally.cs:27:9:29:9 | {...} | Finally.cs:26:48:26:51 | true |
 | Finally.cs:28:13:28:18 | throw ...; | Finally.cs:27:9:29:9 | {...} |
-| Finally.cs:30:9:40:9 | [exception: Exception] catch (...) {...} | Finally.cs:26:9:29:9 | [exception: Exception] catch (...) {...} |
-| Finally.cs:31:9:40:9 | {...} | Finally.cs:30:41:30:42 | [exception: Exception] ArgumentException ex |
+| Finally.cs:31:9:40:9 | {...} | Finally.cs:30:41:30:42 | ArgumentException ex |
 | Finally.cs:32:13:39:13 | try {...} ... | Finally.cs:31:9:40:9 | {...} |
 | Finally.cs:33:13:35:13 | {...} | Finally.cs:32:13:39:13 | try {...} ... |
 | Finally.cs:34:17:34:32 | if (...) ... | Finally.cs:33:13:35:13 | {...} |
 | Finally.cs:34:21:34:24 | true | Finally.cs:34:17:34:32 | if (...) ... |
-| Finally.cs:37:13:39:13 | [finally: exception(ArgumentException)] {...} | Finally.cs:34:27:34:32 | throw ...; |
-| Finally.cs:38:17:38:44 | [finally: exception(ArgumentException)] throw ...; | Finally.cs:38:23:38:43 | [finally: exception(ArgumentException)] object creation of type Exception |
-| Finally.cs:38:23:38:43 | [finally: exception(ArgumentException)] object creation of type Exception | Finally.cs:38:37:38:42 | [finally: exception(ArgumentException)] "Boo!" |
-| Finally.cs:38:37:38:42 | [finally: exception(ArgumentException)] "Boo!" | Finally.cs:37:13:39:13 | [finally: exception(ArgumentException)] {...} |
-| Finally.cs:41:9:43:9 | [exception: Exception] catch (...) {...} | Finally.cs:30:9:40:9 | [exception: Exception] catch (...) {...} |
-| Finally.cs:42:9:43:9 | {...} | Finally.cs:41:9:43:9 | [exception: Exception] catch (...) {...} |
-| Finally.cs:49:9:51:9 | [finally: exception(Exception)] {...} | Finally.cs:38:17:38:44 | [finally: exception(ArgumentException)] throw ...; |
-| Finally.cs:49:9:51:9 | [finally: exception(IOException)] {...} | Finally.cs:28:13:28:18 | throw ...; |
-| Finally.cs:49:9:51:9 | [finally: return] {...} | Finally.cs:24:13:24:19 | return ...; |
+| Finally.cs:34:27:34:32 | throw ...; | Finally.cs:34:21:34:24 | true |
+| Finally.cs:37:13:39:13 | {...} | Finally.cs:34:27:34:32 | throw ...; |
+| Finally.cs:38:17:38:44 | throw ...; | Finally.cs:38:23:38:43 | object creation of type Exception |
+| Finally.cs:38:23:38:43 | object creation of type Exception | Finally.cs:38:37:38:42 | "Boo!" |
+| Finally.cs:38:37:38:42 | "Boo!" | Finally.cs:37:13:39:13 | {...} |
+| Finally.cs:45:9:47:9 | {...} | Finally.cs:44:9:47:9 | catch {...} |
+| Finally.cs:46:13:46:19 | return ...; | Finally.cs:45:9:47:9 | {...} |
+| Finally.cs:49:9:51:9 | {...} | Finally.cs:24:13:24:19 | return ...; |
+| Finally.cs:49:9:51:9 | {...} | Finally.cs:28:13:28:18 | throw ...; |
+| Finally.cs:49:9:51:9 | {...} | Finally.cs:38:17:38:44 | throw ...; |
 | Finally.cs:49:9:51:9 | {...} | Finally.cs:42:9:43:9 | {...} |
-| Finally.cs:50:13:50:40 | [finally: exception(Exception)] call to method WriteLine | Finally.cs:50:31:50:39 | [finally: exception(Exception)] "Finally" |
-| Finally.cs:50:13:50:40 | [finally: exception(IOException)] call to method WriteLine | Finally.cs:50:31:50:39 | [finally: exception(IOException)] "Finally" |
-| Finally.cs:50:13:50:40 | [finally: return] call to method WriteLine | Finally.cs:50:31:50:39 | [finally: return] "Finally" |
+| Finally.cs:49:9:51:9 | {...} | Finally.cs:46:13:46:19 | return ...; |
 | Finally.cs:50:13:50:40 | call to method WriteLine | Finally.cs:50:31:50:39 | "Finally" |
 | Finally.cs:50:13:50:41 | ...; | Finally.cs:49:9:51:9 | {...} |
-| Finally.cs:50:13:50:41 | [finally: exception(Exception)] ...; | Finally.cs:49:9:51:9 | [finally: exception(Exception)] {...} |
-| Finally.cs:50:13:50:41 | [finally: exception(IOException)] ...; | Finally.cs:49:9:51:9 | [finally: exception(IOException)] {...} |
-| Finally.cs:50:13:50:41 | [finally: return] ...; | Finally.cs:49:9:51:9 | [finally: return] {...} |
 | Finally.cs:50:31:50:39 | "Finally" | Finally.cs:50:13:50:41 | ...; |
-| Finally.cs:50:31:50:39 | [finally: exception(Exception)] "Finally" | Finally.cs:50:13:50:41 | [finally: exception(Exception)] ...; |
-| Finally.cs:50:31:50:39 | [finally: exception(IOException)] "Finally" | Finally.cs:50:13:50:41 | [finally: exception(IOException)] ...; |
-| Finally.cs:50:31:50:39 | [finally: return] "Finally" | Finally.cs:50:13:50:41 | [finally: return] ...; |
-| Finally.cs:54:10:54:11 | exit M3 (normal) | Finally.cs:70:13:70:40 | [finally: return] call to method WriteLine |
 | Finally.cs:54:10:54:11 | exit M3 (normal) | Finally.cs:70:13:70:40 | call to method WriteLine |
 | Finally.cs:55:5:72:5 | {...} | Finally.cs:54:10:54:11 | enter M3 |
 | Finally.cs:56:9:71:9 | try {...} ... | Finally.cs:55:5:72:5 | {...} |
@@ -6155,41 +5283,29 @@ postDominance
 | Finally.cs:58:13:58:37 | call to method WriteLine | Finally.cs:58:31:58:36 | "Try3" |
 | Finally.cs:58:13:58:38 | ...; | Finally.cs:57:9:60:9 | {...} |
 | Finally.cs:58:31:58:36 | "Try3" | Finally.cs:58:13:58:38 | ...; |
-| Finally.cs:61:48:61:51 | [exception: Exception] true | Finally.cs:61:38:61:39 | [exception: Exception] IOException ex |
+| Finally.cs:61:48:61:51 | true | Finally.cs:61:38:61:39 | IOException ex |
+| Finally.cs:62:9:64:9 | {...} | Finally.cs:61:48:61:51 | true |
 | Finally.cs:63:13:63:18 | throw ...; | Finally.cs:62:9:64:9 | {...} |
-| Finally.cs:65:9:67:9 | [exception: Exception] catch (...) {...} | Finally.cs:61:9:64:9 | [exception: Exception] catch (...) {...} |
-| Finally.cs:65:26:65:26 | [exception: Exception] Exception e | Finally.cs:65:9:67:9 | [exception: Exception] catch (...) {...} |
-| Finally.cs:65:35:65:35 | [exception: Exception] access to local variable e | Finally.cs:65:26:65:26 | [exception: Exception] Exception e |
-| Finally.cs:65:35:65:43 | [exception: Exception] access to property Message | Finally.cs:65:35:65:35 | [exception: Exception] access to local variable e |
-| Finally.cs:65:35:65:51 | [exception: Exception] ... != ... | Finally.cs:65:48:65:51 | [exception: Exception] null |
-| Finally.cs:65:48:65:51 | [exception: Exception] null | Finally.cs:65:35:65:43 | [exception: Exception] access to property Message |
-| Finally.cs:66:9:67:9 | {...} | Finally.cs:65:35:65:51 | [exception: Exception] ... != ... |
-| Finally.cs:69:9:71:9 | [finally: exception(IOException)] {...} | Finally.cs:63:13:63:18 | throw ...; |
-| Finally.cs:69:9:71:9 | [finally: return] {...} | Finally.cs:59:13:59:19 | return ...; |
+| Finally.cs:65:35:65:35 | access to local variable e | Finally.cs:65:26:65:26 | Exception e |
+| Finally.cs:65:35:65:43 | access to property Message | Finally.cs:65:35:65:35 | access to local variable e |
+| Finally.cs:65:35:65:51 | ... != ... | Finally.cs:65:48:65:51 | null |
+| Finally.cs:65:48:65:51 | null | Finally.cs:65:35:65:43 | access to property Message |
+| Finally.cs:69:9:71:9 | {...} | Finally.cs:59:13:59:19 | return ...; |
+| Finally.cs:69:9:71:9 | {...} | Finally.cs:63:13:63:18 | throw ...; |
+| Finally.cs:69:9:71:9 | {...} | Finally.cs:65:9:67:9 | catch (...) {...} |
+| Finally.cs:69:9:71:9 | {...} | Finally.cs:65:35:65:51 | ... != ... |
 | Finally.cs:69:9:71:9 | {...} | Finally.cs:66:9:67:9 | {...} |
-| Finally.cs:70:13:70:40 | [finally: exception(Exception)] call to method WriteLine | Finally.cs:70:31:70:39 | [finally: exception(Exception)] "Finally" |
-| Finally.cs:70:13:70:40 | [finally: exception(IOException)] call to method WriteLine | Finally.cs:70:31:70:39 | [finally: exception(IOException)] "Finally" |
-| Finally.cs:70:13:70:40 | [finally: return] call to method WriteLine | Finally.cs:70:31:70:39 | [finally: return] "Finally" |
 | Finally.cs:70:13:70:40 | call to method WriteLine | Finally.cs:70:31:70:39 | "Finally" |
 | Finally.cs:70:13:70:41 | ...; | Finally.cs:69:9:71:9 | {...} |
-| Finally.cs:70:13:70:41 | [finally: exception(Exception)] ...; | Finally.cs:69:9:71:9 | [finally: exception(Exception)] {...} |
-| Finally.cs:70:13:70:41 | [finally: exception(IOException)] ...; | Finally.cs:69:9:71:9 | [finally: exception(IOException)] {...} |
-| Finally.cs:70:13:70:41 | [finally: return] ...; | Finally.cs:69:9:71:9 | [finally: return] {...} |
 | Finally.cs:70:31:70:39 | "Finally" | Finally.cs:70:13:70:41 | ...; |
-| Finally.cs:70:31:70:39 | [finally: exception(Exception)] "Finally" | Finally.cs:70:13:70:41 | [finally: exception(Exception)] ...; |
-| Finally.cs:70:31:70:39 | [finally: exception(IOException)] "Finally" | Finally.cs:70:13:70:41 | [finally: exception(IOException)] ...; |
-| Finally.cs:70:31:70:39 | [finally: return] "Finally" | Finally.cs:70:13:70:41 | [finally: return] ...; |
 | Finally.cs:74:10:74:11 | exit M4 (normal) | Finally.cs:77:16:77:20 | ... > ... |
-| Finally.cs:74:10:74:11 | exit M4 (normal) | Finally.cs:97:21:97:23 | [finally: break] ...-- |
-| Finally.cs:74:10:74:11 | exit M4 (normal) | Finally.cs:97:21:97:23 | [finally: return] ...-- |
+| Finally.cs:74:10:74:11 | exit M4 (normal) | Finally.cs:97:21:97:23 | ...-- |
 | Finally.cs:75:5:101:5 | {...} | Finally.cs:74:10:74:11 | enter M4 |
 | Finally.cs:76:9:76:19 | ... ...; | Finally.cs:75:5:101:5 | {...} |
 | Finally.cs:76:13:76:18 | Int32 i = ... | Finally.cs:76:17:76:18 | 10 |
 | Finally.cs:76:17:76:18 | 10 | Finally.cs:76:9:76:19 | ... ...; |
 | Finally.cs:77:9:100:9 | while (...) ... | Finally.cs:76:13:76:18 | Int32 i = ... |
 | Finally.cs:77:16:77:16 | access to local variable i | Finally.cs:77:9:100:9 | while (...) ... |
-| Finally.cs:77:16:77:16 | access to local variable i | Finally.cs:97:21:97:23 | ...-- |
-| Finally.cs:77:16:77:16 | access to local variable i | Finally.cs:97:21:97:23 | [finally: continue] ...-- |
 | Finally.cs:77:16:77:20 | ... > ... | Finally.cs:77:20:77:20 | 0 |
 | Finally.cs:77:20:77:20 | 0 | Finally.cs:77:16:77:16 | access to local variable i |
 | Finally.cs:79:13:99:13 | try {...} ... | Finally.cs:78:9:100:9 | {...} |
@@ -6204,64 +5320,23 @@ postDominance
 | Finally.cs:85:21:85:21 | access to local variable i | Finally.cs:85:17:86:26 | if (...) ... |
 | Finally.cs:85:21:85:26 | ... == ... | Finally.cs:85:26:85:26 | 2 |
 | Finally.cs:85:26:85:26 | 2 | Finally.cs:85:21:85:21 | access to local variable i |
-| Finally.cs:89:13:99:13 | [finally: break] {...} | Finally.cs:86:21:86:26 | break; |
-| Finally.cs:89:13:99:13 | [finally: continue] {...} | Finally.cs:84:21:84:29 | continue; |
-| Finally.cs:89:13:99:13 | [finally: return] {...} | Finally.cs:82:21:82:27 | return ...; |
-| Finally.cs:90:17:98:17 | [finally: break] try {...} ... | Finally.cs:89:13:99:13 | [finally: break] {...} |
-| Finally.cs:90:17:98:17 | [finally: continue] try {...} ... | Finally.cs:89:13:99:13 | [finally: continue] {...} |
-| Finally.cs:90:17:98:17 | [finally: return] try {...} ... | Finally.cs:89:13:99:13 | [finally: return] {...} |
+| Finally.cs:89:13:99:13 | {...} | Finally.cs:82:21:82:27 | return ...; |
+| Finally.cs:89:13:99:13 | {...} | Finally.cs:84:21:84:29 | continue; |
+| Finally.cs:89:13:99:13 | {...} | Finally.cs:85:21:85:26 | ... == ... |
+| Finally.cs:89:13:99:13 | {...} | Finally.cs:86:21:86:26 | break; |
 | Finally.cs:90:17:98:17 | try {...} ... | Finally.cs:89:13:99:13 | {...} |
-| Finally.cs:91:17:94:17 | [finally: break] {...} | Finally.cs:90:17:98:17 | [finally: break] try {...} ... |
-| Finally.cs:91:17:94:17 | [finally: continue] {...} | Finally.cs:90:17:98:17 | [finally: continue] try {...} ... |
-| Finally.cs:91:17:94:17 | [finally: return] {...} | Finally.cs:90:17:98:17 | [finally: return] try {...} ... |
 | Finally.cs:91:17:94:17 | {...} | Finally.cs:90:17:98:17 | try {...} ... |
-| Finally.cs:92:21:93:46 | [finally: break] if (...) ... | Finally.cs:91:17:94:17 | [finally: break] {...} |
-| Finally.cs:92:21:93:46 | [finally: continue] if (...) ... | Finally.cs:91:17:94:17 | [finally: continue] {...} |
-| Finally.cs:92:21:93:46 | [finally: return] if (...) ... | Finally.cs:91:17:94:17 | [finally: return] {...} |
 | Finally.cs:92:21:93:46 | if (...) ... | Finally.cs:91:17:94:17 | {...} |
-| Finally.cs:92:25:92:25 | [finally: break] access to local variable i | Finally.cs:92:21:93:46 | [finally: break] if (...) ... |
-| Finally.cs:92:25:92:25 | [finally: continue] access to local variable i | Finally.cs:92:21:93:46 | [finally: continue] if (...) ... |
-| Finally.cs:92:25:92:25 | [finally: return] access to local variable i | Finally.cs:92:21:93:46 | [finally: return] if (...) ... |
 | Finally.cs:92:25:92:25 | access to local variable i | Finally.cs:92:21:93:46 | if (...) ... |
 | Finally.cs:92:25:92:30 | ... == ... | Finally.cs:92:30:92:30 | 3 |
-| Finally.cs:92:25:92:30 | [finally: break] ... == ... | Finally.cs:92:30:92:30 | [finally: break] 3 |
-| Finally.cs:92:25:92:30 | [finally: continue] ... == ... | Finally.cs:92:30:92:30 | [finally: continue] 3 |
-| Finally.cs:92:25:92:30 | [finally: return] ... == ... | Finally.cs:92:30:92:30 | [finally: return] 3 |
 | Finally.cs:92:30:92:30 | 3 | Finally.cs:92:25:92:25 | access to local variable i |
-| Finally.cs:92:30:92:30 | [finally: break] 3 | Finally.cs:92:25:92:25 | [finally: break] access to local variable i |
-| Finally.cs:92:30:92:30 | [finally: continue] 3 | Finally.cs:92:25:92:25 | [finally: continue] access to local variable i |
-| Finally.cs:92:30:92:30 | [finally: return] 3 | Finally.cs:92:25:92:25 | [finally: return] access to local variable i |
-| Finally.cs:96:17:98:17 | [finally: break] {...} | Finally.cs:92:25:92:30 | [finally: break] ... == ... |
-| Finally.cs:96:17:98:17 | [finally: continue] {...} | Finally.cs:92:25:92:30 | [finally: continue] ... == ... |
-| Finally.cs:96:17:98:17 | [finally: return] {...} | Finally.cs:92:25:92:30 | [finally: return] ... == ... |
 | Finally.cs:96:17:98:17 | {...} | Finally.cs:92:25:92:30 | ... == ... |
-| Finally.cs:97:21:97:21 | [finally(1): exception(Exception)] access to local variable i | Finally.cs:97:21:97:24 | [finally(1): exception(Exception)] ...; |
-| Finally.cs:97:21:97:21 | [finally: break, finally(1): exception(Exception)] access to local variable i | Finally.cs:97:21:97:24 | [finally: break, finally(1): exception(Exception)] ...; |
-| Finally.cs:97:21:97:21 | [finally: break] access to local variable i | Finally.cs:97:21:97:24 | [finally: break] ...; |
-| Finally.cs:97:21:97:21 | [finally: continue, finally(1): exception(Exception)] access to local variable i | Finally.cs:97:21:97:24 | [finally: continue, finally(1): exception(Exception)] ...; |
-| Finally.cs:97:21:97:21 | [finally: continue] access to local variable i | Finally.cs:97:21:97:24 | [finally: continue] ...; |
-| Finally.cs:97:21:97:21 | [finally: return, finally(1): exception(Exception)] access to local variable i | Finally.cs:97:21:97:24 | [finally: return, finally(1): exception(Exception)] ...; |
-| Finally.cs:97:21:97:21 | [finally: return] access to local variable i | Finally.cs:97:21:97:24 | [finally: return] ...; |
+| Finally.cs:96:17:98:17 | {...} | Finally.cs:93:25:93:46 | throw ...; |
+| Finally.cs:96:17:98:17 | {...} | Finally.cs:93:31:93:45 | object creation of type Exception |
 | Finally.cs:97:21:97:21 | access to local variable i | Finally.cs:97:21:97:24 | ...; |
 | Finally.cs:97:21:97:23 | ...-- | Finally.cs:97:21:97:21 | access to local variable i |
-| Finally.cs:97:21:97:23 | [finally(1): exception(Exception)] ...-- | Finally.cs:97:21:97:21 | [finally(1): exception(Exception)] access to local variable i |
-| Finally.cs:97:21:97:23 | [finally: break, finally(1): exception(Exception)] ...-- | Finally.cs:97:21:97:21 | [finally: break, finally(1): exception(Exception)] access to local variable i |
-| Finally.cs:97:21:97:23 | [finally: break] ...-- | Finally.cs:97:21:97:21 | [finally: break] access to local variable i |
-| Finally.cs:97:21:97:23 | [finally: continue, finally(1): exception(Exception)] ...-- | Finally.cs:97:21:97:21 | [finally: continue, finally(1): exception(Exception)] access to local variable i |
-| Finally.cs:97:21:97:23 | [finally: continue] ...-- | Finally.cs:97:21:97:21 | [finally: continue] access to local variable i |
-| Finally.cs:97:21:97:23 | [finally: return, finally(1): exception(Exception)] ...-- | Finally.cs:97:21:97:21 | [finally: return, finally(1): exception(Exception)] access to local variable i |
-| Finally.cs:97:21:97:23 | [finally: return] ...-- | Finally.cs:97:21:97:21 | [finally: return] access to local variable i |
 | Finally.cs:97:21:97:24 | ...; | Finally.cs:96:17:98:17 | {...} |
-| Finally.cs:97:21:97:24 | [finally(1): exception(Exception)] ...; | Finally.cs:96:17:98:17 | [finally(1): exception(Exception)] {...} |
-| Finally.cs:97:21:97:24 | [finally: break, finally(1): exception(Exception)] ...; | Finally.cs:96:17:98:17 | [finally: break, finally(1): exception(Exception)] {...} |
-| Finally.cs:97:21:97:24 | [finally: break] ...; | Finally.cs:96:17:98:17 | [finally: break] {...} |
-| Finally.cs:97:21:97:24 | [finally: continue, finally(1): exception(Exception)] ...; | Finally.cs:96:17:98:17 | [finally: continue, finally(1): exception(Exception)] {...} |
-| Finally.cs:97:21:97:24 | [finally: continue] ...; | Finally.cs:96:17:98:17 | [finally: continue] {...} |
-| Finally.cs:97:21:97:24 | [finally: return, finally(1): exception(Exception)] ...; | Finally.cs:96:17:98:17 | [finally: return, finally(1): exception(Exception)] {...} |
-| Finally.cs:97:21:97:24 | [finally: return] ...; | Finally.cs:96:17:98:17 | [finally: return] {...} |
 | Finally.cs:103:10:103:11 | exit M5 (normal) | Finally.cs:116:17:116:32 | ... > ... |
-| Finally.cs:103:10:103:11 | exit M5 (normal) | Finally.cs:116:17:116:32 | [finally: return] ... > ... |
-| Finally.cs:103:10:103:11 | exit M5 (normal) | Finally.cs:117:17:117:36 | [finally: return] call to method WriteLine |
 | Finally.cs:103:10:103:11 | exit M5 (normal) | Finally.cs:117:17:117:36 | call to method WriteLine |
 | Finally.cs:104:5:119:5 | {...} | Finally.cs:103:10:103:11 | enter M5 |
 | Finally.cs:105:9:118:9 | try {...} ... | Finally.cs:104:5:119:5 | {...} |
@@ -6269,103 +5344,37 @@ postDominance
 | Finally.cs:107:13:108:23 | if (...) ... | Finally.cs:106:9:111:9 | {...} |
 | Finally.cs:107:17:107:21 | access to field Field | Finally.cs:107:17:107:21 | this access |
 | Finally.cs:107:17:107:21 | this access | Finally.cs:107:13:108:23 | if (...) ... |
-| Finally.cs:107:17:107:28 | access to property Length | Finally.cs:107:17:107:21 | access to field Field |
 | Finally.cs:107:17:107:33 | ... == ... | Finally.cs:107:33:107:33 | 0 |
-| Finally.cs:107:33:107:33 | 0 | Finally.cs:107:17:107:28 | access to property Length |
 | Finally.cs:109:17:109:21 | access to field Field | Finally.cs:109:17:109:21 | this access |
 | Finally.cs:109:17:109:21 | this access | Finally.cs:109:13:110:49 | if (...) ... |
-| Finally.cs:109:17:109:28 | access to property Length | Finally.cs:109:17:109:21 | access to field Field |
 | Finally.cs:109:17:109:33 | ... == ... | Finally.cs:109:33:109:33 | 1 |
-| Finally.cs:109:33:109:33 | 1 | Finally.cs:109:17:109:28 | access to property Length |
-| Finally.cs:113:9:118:9 | [finally: exception(OutOfMemoryException)] {...} | Finally.cs:110:17:110:49 | throw ...; |
-| Finally.cs:113:9:118:9 | [finally: return] {...} | Finally.cs:108:17:108:23 | return ...; |
+| Finally.cs:113:9:118:9 | {...} | Finally.cs:107:17:107:21 | access to field Field |
+| Finally.cs:113:9:118:9 | {...} | Finally.cs:107:17:107:28 | access to property Length |
+| Finally.cs:113:9:118:9 | {...} | Finally.cs:108:17:108:23 | return ...; |
+| Finally.cs:113:9:118:9 | {...} | Finally.cs:109:17:109:21 | access to field Field |
+| Finally.cs:113:9:118:9 | {...} | Finally.cs:109:17:109:28 | access to property Length |
 | Finally.cs:113:9:118:9 | {...} | Finally.cs:109:17:109:33 | ... == ... |
-| Finally.cs:114:13:115:41 | [finally: exception(Exception)] if (...) ... | Finally.cs:113:9:118:9 | [finally: exception(Exception)] {...} |
-| Finally.cs:114:13:115:41 | [finally: exception(NullReferenceException)] if (...) ... | Finally.cs:113:9:118:9 | [finally: exception(NullReferenceException)] {...} |
-| Finally.cs:114:13:115:41 | [finally: exception(OutOfMemoryException)] if (...) ... | Finally.cs:113:9:118:9 | [finally: exception(OutOfMemoryException)] {...} |
-| Finally.cs:114:13:115:41 | [finally: return] if (...) ... | Finally.cs:113:9:118:9 | [finally: return] {...} |
+| Finally.cs:113:9:118:9 | {...} | Finally.cs:110:17:110:49 | throw ...; |
+| Finally.cs:113:9:118:9 | {...} | Finally.cs:110:23:110:48 | object creation of type OutOfMemoryException |
 | Finally.cs:114:13:115:41 | if (...) ... | Finally.cs:113:9:118:9 | {...} |
-| Finally.cs:114:19:114:23 | [finally: exception(Exception)] access to field Field | Finally.cs:114:19:114:23 | [finally: exception(Exception)] this access |
-| Finally.cs:114:19:114:23 | [finally: exception(Exception)] this access | Finally.cs:114:13:115:41 | [finally: exception(Exception)] if (...) ... |
-| Finally.cs:114:19:114:23 | [finally: exception(NullReferenceException)] access to field Field | Finally.cs:114:19:114:23 | [finally: exception(NullReferenceException)] this access |
-| Finally.cs:114:19:114:23 | [finally: exception(NullReferenceException)] this access | Finally.cs:114:13:115:41 | [finally: exception(NullReferenceException)] if (...) ... |
-| Finally.cs:114:19:114:23 | [finally: exception(OutOfMemoryException)] access to field Field | Finally.cs:114:19:114:23 | [finally: exception(OutOfMemoryException)] this access |
-| Finally.cs:114:19:114:23 | [finally: exception(OutOfMemoryException)] this access | Finally.cs:114:13:115:41 | [finally: exception(OutOfMemoryException)] if (...) ... |
-| Finally.cs:114:19:114:23 | [finally: return] access to field Field | Finally.cs:114:19:114:23 | [finally: return] this access |
-| Finally.cs:114:19:114:23 | [finally: return] this access | Finally.cs:114:13:115:41 | [finally: return] if (...) ... |
 | Finally.cs:114:19:114:23 | access to field Field | Finally.cs:114:19:114:23 | this access |
 | Finally.cs:114:19:114:23 | this access | Finally.cs:114:13:115:41 | if (...) ... |
-| Finally.cs:114:19:114:30 | [finally: exception(Exception)] access to property Length | Finally.cs:114:19:114:23 | [finally: exception(Exception)] access to field Field |
-| Finally.cs:114:19:114:30 | [finally: exception(NullReferenceException)] access to property Length | Finally.cs:114:19:114:23 | [finally: exception(NullReferenceException)] access to field Field |
-| Finally.cs:114:19:114:30 | [finally: exception(OutOfMemoryException)] access to property Length | Finally.cs:114:19:114:23 | [finally: exception(OutOfMemoryException)] access to field Field |
-| Finally.cs:114:19:114:30 | [finally: return] access to property Length | Finally.cs:114:19:114:23 | [finally: return] access to field Field |
 | Finally.cs:114:19:114:30 | access to property Length | Finally.cs:114:19:114:23 | access to field Field |
 | Finally.cs:114:19:114:35 | ... == ... | Finally.cs:114:35:114:35 | 0 |
-| Finally.cs:114:19:114:35 | [finally: exception(Exception)] ... == ... | Finally.cs:114:35:114:35 | [finally: exception(Exception)] 0 |
-| Finally.cs:114:19:114:35 | [finally: exception(NullReferenceException)] ... == ... | Finally.cs:114:35:114:35 | [finally: exception(NullReferenceException)] 0 |
-| Finally.cs:114:19:114:35 | [finally: exception(OutOfMemoryException)] ... == ... | Finally.cs:114:35:114:35 | [finally: exception(OutOfMemoryException)] 0 |
-| Finally.cs:114:19:114:35 | [finally: return] ... == ... | Finally.cs:114:35:114:35 | [finally: return] 0 |
 | Finally.cs:114:35:114:35 | 0 | Finally.cs:114:19:114:30 | access to property Length |
-| Finally.cs:114:35:114:35 | [finally: exception(Exception)] 0 | Finally.cs:114:19:114:30 | [finally: exception(Exception)] access to property Length |
-| Finally.cs:114:35:114:35 | [finally: exception(NullReferenceException)] 0 | Finally.cs:114:19:114:30 | [finally: exception(NullReferenceException)] access to property Length |
-| Finally.cs:114:35:114:35 | [finally: exception(OutOfMemoryException)] 0 | Finally.cs:114:19:114:30 | [finally: exception(OutOfMemoryException)] access to property Length |
-| Finally.cs:114:35:114:35 | [finally: return] 0 | Finally.cs:114:19:114:30 | [finally: return] access to property Length |
-| Finally.cs:115:17:115:40 | [finally: exception(Exception)] call to method WriteLine | Finally.cs:115:35:115:39 | [finally: exception(Exception)] access to field Field |
-| Finally.cs:115:17:115:40 | [finally: exception(NullReferenceException)] call to method WriteLine | Finally.cs:115:35:115:39 | [finally: exception(NullReferenceException)] access to field Field |
-| Finally.cs:115:17:115:40 | [finally: exception(OutOfMemoryException)] call to method WriteLine | Finally.cs:115:35:115:39 | [finally: exception(OutOfMemoryException)] access to field Field |
-| Finally.cs:115:17:115:40 | [finally: return] call to method WriteLine | Finally.cs:115:35:115:39 | [finally: return] access to field Field |
 | Finally.cs:115:17:115:40 | call to method WriteLine | Finally.cs:115:35:115:39 | access to field Field |
 | Finally.cs:115:17:115:41 | ...; | Finally.cs:114:17:114:36 | [true] !... |
-| Finally.cs:115:17:115:41 | [finally: return] ...; | Finally.cs:114:17:114:36 | [true, finally: return] !... |
-| Finally.cs:115:35:115:39 | [finally: exception(Exception)] access to field Field | Finally.cs:115:35:115:39 | [finally: exception(Exception)] this access |
-| Finally.cs:115:35:115:39 | [finally: exception(Exception)] this access | Finally.cs:115:17:115:41 | [finally: exception(Exception)] ...; |
-| Finally.cs:115:35:115:39 | [finally: exception(NullReferenceException)] access to field Field | Finally.cs:115:35:115:39 | [finally: exception(NullReferenceException)] this access |
-| Finally.cs:115:35:115:39 | [finally: exception(NullReferenceException)] this access | Finally.cs:115:17:115:41 | [finally: exception(NullReferenceException)] ...; |
-| Finally.cs:115:35:115:39 | [finally: exception(OutOfMemoryException)] access to field Field | Finally.cs:115:35:115:39 | [finally: exception(OutOfMemoryException)] this access |
-| Finally.cs:115:35:115:39 | [finally: exception(OutOfMemoryException)] this access | Finally.cs:115:17:115:41 | [finally: exception(OutOfMemoryException)] ...; |
-| Finally.cs:115:35:115:39 | [finally: return] access to field Field | Finally.cs:115:35:115:39 | [finally: return] this access |
-| Finally.cs:115:35:115:39 | [finally: return] this access | Finally.cs:115:17:115:41 | [finally: return] ...; |
 | Finally.cs:115:35:115:39 | access to field Field | Finally.cs:115:35:115:39 | this access |
 | Finally.cs:115:35:115:39 | this access | Finally.cs:115:17:115:41 | ...; |
-| Finally.cs:116:13:117:37 | [finally: return] if (...) ... | Finally.cs:114:17:114:36 | [false, finally: return] !... |
-| Finally.cs:116:13:117:37 | [finally: return] if (...) ... | Finally.cs:115:17:115:40 | [finally: return] call to method WriteLine |
 | Finally.cs:116:13:117:37 | if (...) ... | Finally.cs:114:17:114:36 | [false] !... |
 | Finally.cs:116:13:117:37 | if (...) ... | Finally.cs:115:17:115:40 | call to method WriteLine |
-| Finally.cs:116:17:116:21 | [finally: exception(Exception)] access to field Field | Finally.cs:116:17:116:21 | [finally: exception(Exception)] this access |
-| Finally.cs:116:17:116:21 | [finally: exception(Exception)] this access | Finally.cs:116:13:117:37 | [finally: exception(Exception)] if (...) ... |
-| Finally.cs:116:17:116:21 | [finally: exception(NullReferenceException)] access to field Field | Finally.cs:116:17:116:21 | [finally: exception(NullReferenceException)] this access |
-| Finally.cs:116:17:116:21 | [finally: exception(NullReferenceException)] this access | Finally.cs:116:13:117:37 | [finally: exception(NullReferenceException)] if (...) ... |
-| Finally.cs:116:17:116:21 | [finally: exception(OutOfMemoryException)] access to field Field | Finally.cs:116:17:116:21 | [finally: exception(OutOfMemoryException)] this access |
-| Finally.cs:116:17:116:21 | [finally: exception(OutOfMemoryException)] this access | Finally.cs:116:13:117:37 | [finally: exception(OutOfMemoryException)] if (...) ... |
-| Finally.cs:116:17:116:21 | [finally: return] access to field Field | Finally.cs:116:17:116:21 | [finally: return] this access |
-| Finally.cs:116:17:116:21 | [finally: return] this access | Finally.cs:116:13:117:37 | [finally: return] if (...) ... |
 | Finally.cs:116:17:116:21 | access to field Field | Finally.cs:116:17:116:21 | this access |
 | Finally.cs:116:17:116:21 | this access | Finally.cs:116:13:117:37 | if (...) ... |
-| Finally.cs:116:17:116:28 | [finally: exception(Exception)] access to property Length | Finally.cs:116:17:116:21 | [finally: exception(Exception)] access to field Field |
-| Finally.cs:116:17:116:28 | [finally: exception(NullReferenceException)] access to property Length | Finally.cs:116:17:116:21 | [finally: exception(NullReferenceException)] access to field Field |
-| Finally.cs:116:17:116:28 | [finally: exception(OutOfMemoryException)] access to property Length | Finally.cs:116:17:116:21 | [finally: exception(OutOfMemoryException)] access to field Field |
-| Finally.cs:116:17:116:28 | [finally: return] access to property Length | Finally.cs:116:17:116:21 | [finally: return] access to field Field |
 | Finally.cs:116:17:116:28 | access to property Length | Finally.cs:116:17:116:21 | access to field Field |
 | Finally.cs:116:17:116:32 | ... > ... | Finally.cs:116:32:116:32 | 0 |
-| Finally.cs:116:17:116:32 | [finally: exception(Exception)] ... > ... | Finally.cs:116:32:116:32 | [finally: exception(Exception)] 0 |
-| Finally.cs:116:17:116:32 | [finally: exception(NullReferenceException)] ... > ... | Finally.cs:116:32:116:32 | [finally: exception(NullReferenceException)] 0 |
-| Finally.cs:116:17:116:32 | [finally: exception(OutOfMemoryException)] ... > ... | Finally.cs:116:32:116:32 | [finally: exception(OutOfMemoryException)] 0 |
-| Finally.cs:116:17:116:32 | [finally: return] ... > ... | Finally.cs:116:32:116:32 | [finally: return] 0 |
 | Finally.cs:116:32:116:32 | 0 | Finally.cs:116:17:116:28 | access to property Length |
-| Finally.cs:116:32:116:32 | [finally: exception(Exception)] 0 | Finally.cs:116:17:116:28 | [finally: exception(Exception)] access to property Length |
-| Finally.cs:116:32:116:32 | [finally: exception(NullReferenceException)] 0 | Finally.cs:116:17:116:28 | [finally: exception(NullReferenceException)] access to property Length |
-| Finally.cs:116:32:116:32 | [finally: exception(OutOfMemoryException)] 0 | Finally.cs:116:17:116:28 | [finally: exception(OutOfMemoryException)] access to property Length |
-| Finally.cs:116:32:116:32 | [finally: return] 0 | Finally.cs:116:17:116:28 | [finally: return] access to property Length |
-| Finally.cs:117:17:117:36 | [finally: exception(Exception)] call to method WriteLine | Finally.cs:117:35:117:35 | [finally: exception(Exception)] 1 |
-| Finally.cs:117:17:117:36 | [finally: exception(NullReferenceException)] call to method WriteLine | Finally.cs:117:35:117:35 | [finally: exception(NullReferenceException)] 1 |
-| Finally.cs:117:17:117:36 | [finally: exception(OutOfMemoryException)] call to method WriteLine | Finally.cs:117:35:117:35 | [finally: exception(OutOfMemoryException)] 1 |
-| Finally.cs:117:17:117:36 | [finally: return] call to method WriteLine | Finally.cs:117:35:117:35 | [finally: return] 1 |
 | Finally.cs:117:17:117:36 | call to method WriteLine | Finally.cs:117:35:117:35 | 1 |
 | Finally.cs:117:35:117:35 | 1 | Finally.cs:117:17:117:37 | ...; |
-| Finally.cs:117:35:117:35 | [finally: exception(Exception)] 1 | Finally.cs:117:17:117:37 | [finally: exception(Exception)] ...; |
-| Finally.cs:117:35:117:35 | [finally: exception(NullReferenceException)] 1 | Finally.cs:117:17:117:37 | [finally: exception(NullReferenceException)] ...; |
-| Finally.cs:117:35:117:35 | [finally: exception(OutOfMemoryException)] 1 | Finally.cs:117:17:117:37 | [finally: exception(OutOfMemoryException)] ...; |
-| Finally.cs:117:35:117:35 | [finally: return] 1 | Finally.cs:117:17:117:37 | [finally: return] ...; |
 | Finally.cs:121:10:121:11 | exit M6 | Finally.cs:121:10:121:11 | exit M6 (normal) |
 | Finally.cs:121:10:121:11 | exit M6 (normal) | Finally.cs:125:17:125:40 | Double temp = ... |
 | Finally.cs:122:5:131:5 | {...} | Finally.cs:121:10:121:11 | enter M6 |
@@ -6378,18 +5387,17 @@ postDominance
 | Finally.cs:125:24:125:40 | ... / ... | Finally.cs:125:28:125:40 | access to constant E |
 | Finally.cs:125:28:125:40 | access to constant E | Finally.cs:125:24:125:24 | (...) ... |
 | Finally.cs:133:10:133:11 | exit M7 | Finally.cs:133:10:133:11 | exit M7 (abnormal) |
+| Finally.cs:133:10:133:11 | exit M7 (abnormal) | Finally.cs:141:13:141:44 | throw ...; |
 | Finally.cs:134:5:145:5 | {...} | Finally.cs:133:10:133:11 | enter M7 |
 | Finally.cs:135:9:143:9 | try {...} ... | Finally.cs:134:5:145:5 | {...} |
 | Finally.cs:136:9:138:9 | {...} | Finally.cs:135:9:143:9 | try {...} ... |
 | Finally.cs:137:13:137:36 | call to method WriteLine | Finally.cs:137:31:137:35 | "Try" |
 | Finally.cs:137:13:137:37 | ...; | Finally.cs:136:9:138:9 | {...} |
 | Finally.cs:137:31:137:35 | "Try" | Finally.cs:137:13:137:37 | ...; |
-| Finally.cs:141:13:141:44 | [finally: exception(Exception)] throw ...; | Finally.cs:141:19:141:43 | [finally: exception(Exception)] object creation of type ArgumentException |
+| Finally.cs:140:9:143:9 | {...} | Finally.cs:137:13:137:36 | call to method WriteLine |
 | Finally.cs:141:13:141:44 | throw ...; | Finally.cs:141:19:141:43 | object creation of type ArgumentException |
-| Finally.cs:141:19:141:43 | [finally: exception(Exception)] object creation of type ArgumentException | Finally.cs:141:41:141:42 | [finally: exception(Exception)] "" |
 | Finally.cs:141:19:141:43 | object creation of type ArgumentException | Finally.cs:141:41:141:42 | "" |
 | Finally.cs:141:41:141:42 | "" | Finally.cs:140:9:143:9 | {...} |
-| Finally.cs:141:41:141:42 | [finally: exception(Exception)] "" | Finally.cs:140:9:143:9 | [finally: exception(Exception)] {...} |
 | Finally.cs:147:10:147:11 | exit M8 (normal) | Finally.cs:158:21:158:36 | ... == ... |
 | Finally.cs:147:10:147:11 | exit M8 (normal) | Finally.cs:163:17:163:42 | call to method WriteLine |
 | Finally.cs:147:10:147:11 | exit M8 (normal) | Finally.cs:167:17:167:37 | call to method WriteLine |
@@ -6400,84 +5408,31 @@ postDominance
 | Finally.cs:151:17:151:20 | access to parameter args | Finally.cs:151:13:152:50 | if (...) ... |
 | Finally.cs:151:17:151:28 | ... == ... | Finally.cs:151:25:151:28 | null |
 | Finally.cs:151:25:151:28 | null | Finally.cs:151:17:151:20 | access to parameter args |
-| Finally.cs:155:9:169:9 | [finally: exception(ArgumentNullException)] {...} | Finally.cs:152:17:152:50 | throw ...; |
 | Finally.cs:155:9:169:9 | {...} | Finally.cs:151:17:151:28 | ... == ... |
-| Finally.cs:156:13:168:13 | [finally: exception(ArgumentNullException)] try {...} ... | Finally.cs:155:9:169:9 | [finally: exception(ArgumentNullException)] {...} |
-| Finally.cs:156:13:168:13 | [finally: exception(Exception)] try {...} ... | Finally.cs:155:9:169:9 | [finally: exception(Exception)] {...} |
+| Finally.cs:155:9:169:9 | {...} | Finally.cs:152:17:152:50 | throw ...; |
+| Finally.cs:155:9:169:9 | {...} | Finally.cs:152:23:152:49 | object creation of type ArgumentNullException |
 | Finally.cs:156:13:168:13 | try {...} ... | Finally.cs:155:9:169:9 | {...} |
-| Finally.cs:157:13:160:13 | [finally: exception(ArgumentNullException)] {...} | Finally.cs:156:13:168:13 | [finally: exception(ArgumentNullException)] try {...} ... |
-| Finally.cs:157:13:160:13 | [finally: exception(Exception)] {...} | Finally.cs:156:13:168:13 | [finally: exception(Exception)] try {...} ... |
 | Finally.cs:157:13:160:13 | {...} | Finally.cs:156:13:168:13 | try {...} ... |
-| Finally.cs:158:17:159:45 | [finally: exception(ArgumentNullException)] if (...) ... | Finally.cs:157:13:160:13 | [finally: exception(ArgumentNullException)] {...} |
-| Finally.cs:158:17:159:45 | [finally: exception(Exception)] if (...) ... | Finally.cs:157:13:160:13 | [finally: exception(Exception)] {...} |
 | Finally.cs:158:17:159:45 | if (...) ... | Finally.cs:157:13:160:13 | {...} |
-| Finally.cs:158:21:158:24 | [finally: exception(ArgumentNullException)] access to parameter args | Finally.cs:158:17:159:45 | [finally: exception(ArgumentNullException)] if (...) ... |
-| Finally.cs:158:21:158:24 | [finally: exception(Exception)] access to parameter args | Finally.cs:158:17:159:45 | [finally: exception(Exception)] if (...) ... |
 | Finally.cs:158:21:158:24 | access to parameter args | Finally.cs:158:17:159:45 | if (...) ... |
-| Finally.cs:158:21:158:31 | [finally: exception(ArgumentNullException)] access to property Length | Finally.cs:158:21:158:24 | [finally: exception(ArgumentNullException)] access to parameter args |
-| Finally.cs:158:21:158:31 | [finally: exception(Exception)] access to property Length | Finally.cs:158:21:158:24 | [finally: exception(Exception)] access to parameter args |
 | Finally.cs:158:21:158:31 | access to property Length | Finally.cs:158:21:158:24 | access to parameter args |
 | Finally.cs:158:21:158:36 | ... == ... | Finally.cs:158:36:158:36 | 1 |
-| Finally.cs:158:21:158:36 | [finally: exception(ArgumentNullException)] ... == ... | Finally.cs:158:36:158:36 | [finally: exception(ArgumentNullException)] 1 |
-| Finally.cs:158:21:158:36 | [finally: exception(Exception)] ... == ... | Finally.cs:158:36:158:36 | [finally: exception(Exception)] 1 |
-| Finally.cs:159:27:159:44 | [finally: exception(ArgumentNullException)] object creation of type Exception | Finally.cs:159:41:159:43 | [finally: exception(ArgumentNullException)] "1" |
-| Finally.cs:159:27:159:44 | [finally: exception(Exception)] object creation of type Exception | Finally.cs:159:41:159:43 | [finally: exception(Exception)] "1" |
 | Finally.cs:159:27:159:44 | object creation of type Exception | Finally.cs:159:41:159:43 | "1" |
-| Finally.cs:161:13:164:13 | [exception: Exception] catch (...) {...} | Finally.cs:159:21:159:45 | throw ...; |
-| Finally.cs:161:13:164:13 | [exception: Exception] catch (...) {...} | Finally.cs:159:27:159:44 | object creation of type Exception |
-| Finally.cs:161:30:161:30 | [exception: Exception] Exception e | Finally.cs:161:13:164:13 | [exception: Exception] catch (...) {...} |
-| Finally.cs:161:30:161:30 | [exception: NullReferenceException] Exception e | Finally.cs:161:13:164:13 | [exception: NullReferenceException] catch (...) {...} |
-| Finally.cs:161:39:161:39 | [exception: Exception] access to local variable e | Finally.cs:161:30:161:30 | [exception: Exception] Exception e |
-| Finally.cs:161:39:161:39 | [exception: NullReferenceException] access to local variable e | Finally.cs:161:30:161:30 | [exception: NullReferenceException] Exception e |
-| Finally.cs:161:39:161:39 | [finally: exception(ArgumentNullException), exception: Exception] access to local variable e | Finally.cs:161:30:161:30 | [finally: exception(ArgumentNullException), exception: Exception] Exception e |
-| Finally.cs:161:39:161:39 | [finally: exception(ArgumentNullException), exception: NullReferenceException] access to local variable e | Finally.cs:161:30:161:30 | [finally: exception(ArgumentNullException), exception: NullReferenceException] Exception e |
-| Finally.cs:161:39:161:39 | [finally: exception(Exception), exception: Exception] access to local variable e | Finally.cs:161:30:161:30 | [finally: exception(Exception), exception: Exception] Exception e |
-| Finally.cs:161:39:161:39 | [finally: exception(Exception), exception: NullReferenceException] access to local variable e | Finally.cs:161:30:161:30 | [finally: exception(Exception), exception: NullReferenceException] Exception e |
-| Finally.cs:161:39:161:47 | [exception: Exception] access to property Message | Finally.cs:161:39:161:39 | [exception: Exception] access to local variable e |
-| Finally.cs:161:39:161:47 | [exception: NullReferenceException] access to property Message | Finally.cs:161:39:161:39 | [exception: NullReferenceException] access to local variable e |
-| Finally.cs:161:39:161:47 | [finally: exception(ArgumentNullException), exception: Exception] access to property Message | Finally.cs:161:39:161:39 | [finally: exception(ArgumentNullException), exception: Exception] access to local variable e |
-| Finally.cs:161:39:161:47 | [finally: exception(ArgumentNullException), exception: NullReferenceException] access to property Message | Finally.cs:161:39:161:39 | [finally: exception(ArgumentNullException), exception: NullReferenceException] access to local variable e |
-| Finally.cs:161:39:161:47 | [finally: exception(Exception), exception: Exception] access to property Message | Finally.cs:161:39:161:39 | [finally: exception(Exception), exception: Exception] access to local variable e |
-| Finally.cs:161:39:161:47 | [finally: exception(Exception), exception: NullReferenceException] access to property Message | Finally.cs:161:39:161:39 | [finally: exception(Exception), exception: NullReferenceException] access to local variable e |
-| Finally.cs:161:39:161:54 | [exception: Exception] ... == ... | Finally.cs:161:52:161:54 | [exception: Exception] "1" |
-| Finally.cs:161:39:161:54 | [exception: NullReferenceException] ... == ... | Finally.cs:161:52:161:54 | [exception: NullReferenceException] "1" |
-| Finally.cs:161:39:161:54 | [finally: exception(ArgumentNullException), exception: Exception] ... == ... | Finally.cs:161:52:161:54 | [finally: exception(ArgumentNullException), exception: Exception] "1" |
-| Finally.cs:161:39:161:54 | [finally: exception(ArgumentNullException), exception: NullReferenceException] ... == ... | Finally.cs:161:52:161:54 | [finally: exception(ArgumentNullException), exception: NullReferenceException] "1" |
-| Finally.cs:161:39:161:54 | [finally: exception(Exception), exception: Exception] ... == ... | Finally.cs:161:52:161:54 | [finally: exception(Exception), exception: Exception] "1" |
-| Finally.cs:161:39:161:54 | [finally: exception(Exception), exception: NullReferenceException] ... == ... | Finally.cs:161:52:161:54 | [finally: exception(Exception), exception: NullReferenceException] "1" |
-| Finally.cs:161:52:161:54 | [exception: Exception] "1" | Finally.cs:161:39:161:47 | [exception: Exception] access to property Message |
-| Finally.cs:161:52:161:54 | [exception: NullReferenceException] "1" | Finally.cs:161:39:161:47 | [exception: NullReferenceException] access to property Message |
-| Finally.cs:161:52:161:54 | [finally: exception(ArgumentNullException), exception: Exception] "1" | Finally.cs:161:39:161:47 | [finally: exception(ArgumentNullException), exception: Exception] access to property Message |
-| Finally.cs:161:52:161:54 | [finally: exception(ArgumentNullException), exception: NullReferenceException] "1" | Finally.cs:161:39:161:47 | [finally: exception(ArgumentNullException), exception: NullReferenceException] access to property Message |
-| Finally.cs:161:52:161:54 | [finally: exception(Exception), exception: Exception] "1" | Finally.cs:161:39:161:47 | [finally: exception(Exception), exception: Exception] access to property Message |
-| Finally.cs:161:52:161:54 | [finally: exception(Exception), exception: NullReferenceException] "1" | Finally.cs:161:39:161:47 | [finally: exception(Exception), exception: NullReferenceException] access to property Message |
-| Finally.cs:163:17:163:42 | [finally: exception(ArgumentNullException)] call to method WriteLine | Finally.cs:163:35:163:41 | [finally: exception(ArgumentNullException)] access to array element |
-| Finally.cs:163:17:163:42 | [finally: exception(Exception)] call to method WriteLine | Finally.cs:163:35:163:41 | [finally: exception(Exception)] access to array element |
+| Finally.cs:161:13:164:13 | catch (...) {...} | Finally.cs:159:21:159:45 | throw ...; |
+| Finally.cs:161:13:164:13 | catch (...) {...} | Finally.cs:159:27:159:44 | object creation of type Exception |
+| Finally.cs:161:39:161:39 | access to local variable e | Finally.cs:161:30:161:30 | Exception e |
+| Finally.cs:161:39:161:47 | access to property Message | Finally.cs:161:39:161:39 | access to local variable e |
+| Finally.cs:161:39:161:54 | ... == ... | Finally.cs:161:52:161:54 | "1" |
+| Finally.cs:161:52:161:54 | "1" | Finally.cs:161:39:161:47 | access to property Message |
 | Finally.cs:163:17:163:42 | call to method WriteLine | Finally.cs:163:35:163:41 | access to array element |
 | Finally.cs:163:17:163:43 | ...; | Finally.cs:162:13:164:13 | {...} |
-| Finally.cs:163:17:163:43 | [finally: exception(ArgumentNullException)] ...; | Finally.cs:162:13:164:13 | [finally: exception(ArgumentNullException)] {...} |
-| Finally.cs:163:17:163:43 | [finally: exception(Exception)] ...; | Finally.cs:162:13:164:13 | [finally: exception(Exception)] {...} |
-| Finally.cs:163:35:163:38 | [finally: exception(ArgumentNullException)] access to parameter args | Finally.cs:163:17:163:43 | [finally: exception(ArgumentNullException)] ...; |
-| Finally.cs:163:35:163:38 | [finally: exception(Exception)] access to parameter args | Finally.cs:163:17:163:43 | [finally: exception(Exception)] ...; |
 | Finally.cs:163:35:163:38 | access to parameter args | Finally.cs:163:17:163:43 | ...; |
-| Finally.cs:163:35:163:41 | [finally: exception(ArgumentNullException)] access to array element | Finally.cs:163:40:163:40 | [finally: exception(ArgumentNullException)] 0 |
-| Finally.cs:163:35:163:41 | [finally: exception(Exception)] access to array element | Finally.cs:163:40:163:40 | [finally: exception(Exception)] 0 |
 | Finally.cs:163:35:163:41 | access to array element | Finally.cs:163:40:163:40 | 0 |
 | Finally.cs:163:40:163:40 | 0 | Finally.cs:163:35:163:38 | access to parameter args |
-| Finally.cs:163:40:163:40 | [finally: exception(ArgumentNullException)] 0 | Finally.cs:163:35:163:38 | [finally: exception(ArgumentNullException)] access to parameter args |
-| Finally.cs:163:40:163:40 | [finally: exception(Exception)] 0 | Finally.cs:163:35:163:38 | [finally: exception(Exception)] access to parameter args |
-| Finally.cs:166:13:168:13 | [finally: exception(ArgumentNullException)] {...} | Finally.cs:165:13:168:13 | [finally: exception(ArgumentNullException)] catch {...} |
-| Finally.cs:166:13:168:13 | [finally: exception(Exception)] {...} | Finally.cs:165:13:168:13 | [finally: exception(Exception)] catch {...} |
 | Finally.cs:166:13:168:13 | {...} | Finally.cs:165:13:168:13 | catch {...} |
-| Finally.cs:167:17:167:37 | [finally: exception(ArgumentNullException)] call to method WriteLine | Finally.cs:167:35:167:36 | [finally: exception(ArgumentNullException)] "" |
-| Finally.cs:167:17:167:37 | [finally: exception(Exception)] call to method WriteLine | Finally.cs:167:35:167:36 | [finally: exception(Exception)] "" |
 | Finally.cs:167:17:167:37 | call to method WriteLine | Finally.cs:167:35:167:36 | "" |
 | Finally.cs:167:17:167:38 | ...; | Finally.cs:166:13:168:13 | {...} |
-| Finally.cs:167:17:167:38 | [finally: exception(ArgumentNullException)] ...; | Finally.cs:166:13:168:13 | [finally: exception(ArgumentNullException)] {...} |
-| Finally.cs:167:17:167:38 | [finally: exception(Exception)] ...; | Finally.cs:166:13:168:13 | [finally: exception(Exception)] {...} |
 | Finally.cs:167:35:167:36 | "" | Finally.cs:167:17:167:38 | ...; |
-| Finally.cs:167:35:167:36 | [finally: exception(ArgumentNullException)] "" | Finally.cs:167:17:167:38 | [finally: exception(ArgumentNullException)] ...; |
-| Finally.cs:167:35:167:36 | [finally: exception(Exception)] "" | Finally.cs:167:17:167:38 | [finally: exception(Exception)] ...; |
 | Finally.cs:172:11:172:20 | call to constructor Exception | Finally.cs:172:11:172:20 | enter ExceptionA |
 | Finally.cs:172:11:172:20 | exit ExceptionA | Finally.cs:172:11:172:20 | exit ExceptionA (normal) |
 | Finally.cs:172:11:172:20 | exit ExceptionA (normal) | Finally.cs:172:11:172:20 | {...} |
@@ -6490,103 +5445,50 @@ postDominance
 | Finally.cs:174:11:174:20 | exit ExceptionC | Finally.cs:174:11:174:20 | exit ExceptionC (normal) |
 | Finally.cs:174:11:174:20 | exit ExceptionC (normal) | Finally.cs:174:11:174:20 | {...} |
 | Finally.cs:174:11:174:20 | {...} | Finally.cs:174:11:174:20 | call to constructor Exception |
-| Finally.cs:176:10:176:11 | exit M9 (normal) | Finally.cs:186:21:186:22 | [b1 (line 176): false] access to parameter b2 |
-| Finally.cs:176:10:176:11 | exit M9 (normal) | Finally.cs:190:21:190:22 | [b1 (line 176): false] access to parameter b1 |
+| Finally.cs:176:10:176:11 | exit M9 (normal) | Finally.cs:186:21:186:22 | access to parameter b2 |
+| Finally.cs:176:10:176:11 | exit M9 (normal) | Finally.cs:190:21:190:22 | access to parameter b1 |
 | Finally.cs:177:5:193:5 | {...} | Finally.cs:176:10:176:11 | enter M9 |
 | Finally.cs:178:9:192:9 | try {...} ... | Finally.cs:177:5:193:5 | {...} |
 | Finally.cs:179:9:181:9 | {...} | Finally.cs:178:9:192:9 | try {...} ... |
 | Finally.cs:180:13:180:43 | if (...) ... | Finally.cs:179:9:181:9 | {...} |
 | Finally.cs:180:17:180:18 | access to parameter b1 | Finally.cs:180:13:180:43 | if (...) ... |
-| Finally.cs:183:9:192:9 | [b1 (line 176): false] {...} | Finally.cs:180:17:180:18 | access to parameter b1 |
-| Finally.cs:183:9:192:9 | [finally: exception(ExceptionA), b1 (line 176): true] {...} | Finally.cs:180:21:180:43 | [b1 (line 176): true] throw ...; |
-| Finally.cs:184:13:191:13 | [b1 (line 176): false] try {...} ... | Finally.cs:183:9:192:9 | [b1 (line 176): false] {...} |
-| Finally.cs:184:13:191:13 | [finally: exception(Exception), b1 (line 176): true] try {...} ... | Finally.cs:183:9:192:9 | [finally: exception(Exception), b1 (line 176): true] {...} |
-| Finally.cs:184:13:191:13 | [finally: exception(ExceptionA), b1 (line 176): true] try {...} ... | Finally.cs:183:9:192:9 | [finally: exception(ExceptionA), b1 (line 176): true] {...} |
-| Finally.cs:185:13:187:13 | [b1 (line 176): false] {...} | Finally.cs:184:13:191:13 | [b1 (line 176): false] try {...} ... |
-| Finally.cs:185:13:187:13 | [finally: exception(Exception), b1 (line 176): true] {...} | Finally.cs:184:13:191:13 | [finally: exception(Exception), b1 (line 176): true] try {...} ... |
-| Finally.cs:185:13:187:13 | [finally: exception(ExceptionA), b1 (line 176): true] {...} | Finally.cs:184:13:191:13 | [finally: exception(ExceptionA), b1 (line 176): true] try {...} ... |
-| Finally.cs:186:17:186:47 | [b1 (line 176): false] if (...) ... | Finally.cs:185:13:187:13 | [b1 (line 176): false] {...} |
-| Finally.cs:186:17:186:47 | [finally: exception(Exception), b1 (line 176): true] if (...) ... | Finally.cs:185:13:187:13 | [finally: exception(Exception), b1 (line 176): true] {...} |
-| Finally.cs:186:17:186:47 | [finally: exception(ExceptionA), b1 (line 176): true] if (...) ... | Finally.cs:185:13:187:13 | [finally: exception(ExceptionA), b1 (line 176): true] {...} |
-| Finally.cs:186:21:186:22 | [b1 (line 176): false] access to parameter b2 | Finally.cs:186:17:186:47 | [b1 (line 176): false] if (...) ... |
-| Finally.cs:186:21:186:22 | [finally: exception(Exception), b1 (line 176): true] access to parameter b2 | Finally.cs:186:17:186:47 | [finally: exception(Exception), b1 (line 176): true] if (...) ... |
-| Finally.cs:186:21:186:22 | [finally: exception(ExceptionA), b1 (line 176): true] access to parameter b2 | Finally.cs:186:17:186:47 | [finally: exception(ExceptionA), b1 (line 176): true] if (...) ... |
-| Finally.cs:188:13:191:13 | [exception: ExceptionB, b1 (line 176): false, b2 (line 176): true] catch (...) {...} | Finally.cs:186:25:186:47 | [b1 (line 176): false, b2 (line 176): true] throw ...; |
-| Finally.cs:188:13:191:13 | [finally: exception(Exception), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | Finally.cs:186:25:186:47 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] throw ...; |
-| Finally.cs:188:13:191:13 | [finally: exception(ExceptionA), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | Finally.cs:186:25:186:47 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] throw ...; |
-| Finally.cs:188:38:188:39 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] access to parameter b2 | Finally.cs:188:13:191:13 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] catch (...) {...} |
-| Finally.cs:188:38:188:39 | [exception: ExceptionB, b1 (line 176): false, b2 (line 176): true] access to parameter b2 | Finally.cs:188:13:191:13 | [exception: ExceptionB, b1 (line 176): false, b2 (line 176): true] catch (...) {...} |
-| Finally.cs:189:13:191:13 | [b1 (line 176): false] {...} | Finally.cs:188:38:188:39 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] access to parameter b2 |
-| Finally.cs:189:13:191:13 | [b1 (line 176): false] {...} | Finally.cs:188:38:188:39 | [exception: ExceptionB, b1 (line 176): false, b2 (line 176): true] access to parameter b2 |
-| Finally.cs:190:17:190:47 | [b1 (line 176): false] if (...) ... | Finally.cs:189:13:191:13 | [b1 (line 176): false] {...} |
-| Finally.cs:190:17:190:47 | [finally: exception(Exception), b1 (line 176): true] if (...) ... | Finally.cs:189:13:191:13 | [finally: exception(Exception), b1 (line 176): true] {...} |
-| Finally.cs:190:17:190:47 | [finally: exception(ExceptionA), b1 (line 176): true] if (...) ... | Finally.cs:189:13:191:13 | [finally: exception(ExceptionA), b1 (line 176): true] {...} |
-| Finally.cs:190:21:190:22 | [b1 (line 176): false] access to parameter b1 | Finally.cs:190:17:190:47 | [b1 (line 176): false] if (...) ... |
-| Finally.cs:190:21:190:22 | [finally: exception(Exception), b1 (line 176): true] access to parameter b1 | Finally.cs:190:17:190:47 | [finally: exception(Exception), b1 (line 176): true] if (...) ... |
-| Finally.cs:190:21:190:22 | [finally: exception(ExceptionA), b1 (line 176): true] access to parameter b1 | Finally.cs:190:17:190:47 | [finally: exception(ExceptionA), b1 (line 176): true] if (...) ... |
-| Finally.cs:190:25:190:47 | [finally: exception(Exception)] throw ...; | Finally.cs:190:31:190:46 | [finally: exception(Exception)] object creation of type ExceptionC |
-| Finally.cs:190:25:190:47 | [finally: exception(ExceptionA)] throw ...; | Finally.cs:190:31:190:46 | [finally: exception(ExceptionA)] object creation of type ExceptionC |
+| Finally.cs:183:9:192:9 | {...} | Finally.cs:180:17:180:18 | access to parameter b1 |
+| Finally.cs:183:9:192:9 | {...} | Finally.cs:180:21:180:43 | throw ...; |
+| Finally.cs:183:9:192:9 | {...} | Finally.cs:180:27:180:42 | object creation of type ExceptionA |
+| Finally.cs:184:13:191:13 | try {...} ... | Finally.cs:183:9:192:9 | {...} |
+| Finally.cs:185:13:187:13 | {...} | Finally.cs:184:13:191:13 | try {...} ... |
+| Finally.cs:186:17:186:47 | if (...) ... | Finally.cs:185:13:187:13 | {...} |
+| Finally.cs:186:21:186:22 | access to parameter b2 | Finally.cs:186:17:186:47 | if (...) ... |
+| Finally.cs:188:13:191:13 | catch (...) {...} | Finally.cs:186:25:186:47 | throw ...; |
+| Finally.cs:188:13:191:13 | catch (...) {...} | Finally.cs:186:31:186:46 | object creation of type ExceptionB |
+| Finally.cs:188:38:188:39 | access to parameter b2 | Finally.cs:188:13:191:13 | catch (...) {...} |
+| Finally.cs:189:13:191:13 | {...} | Finally.cs:188:38:188:39 | access to parameter b2 |
+| Finally.cs:190:17:190:47 | if (...) ... | Finally.cs:189:13:191:13 | {...} |
+| Finally.cs:190:21:190:22 | access to parameter b1 | Finally.cs:190:17:190:47 | if (...) ... |
+| Finally.cs:190:25:190:47 | throw ...; | Finally.cs:190:31:190:46 | object creation of type ExceptionC |
 | Finally.cs:195:10:195:12 | exit M10 (normal) | Finally.cs:213:9:213:24 | ... = ... |
 | Finally.cs:196:5:214:5 | {...} | Finally.cs:195:10:195:12 | enter M10 |
 | Finally.cs:197:9:212:9 | try {...} ... | Finally.cs:196:5:214:5 | {...} |
 | Finally.cs:198:9:200:9 | {...} | Finally.cs:197:9:212:9 | try {...} ... |
 | Finally.cs:199:13:199:43 | if (...) ... | Finally.cs:198:9:200:9 | {...} |
 | Finally.cs:199:17:199:18 | access to parameter b1 | Finally.cs:199:13:199:43 | if (...) ... |
-| Finally.cs:202:9:212:9 | [finally: exception(ExceptionA)] {...} | Finally.cs:199:21:199:43 | throw ...; |
 | Finally.cs:202:9:212:9 | {...} | Finally.cs:199:17:199:18 | access to parameter b1 |
-| Finally.cs:203:13:210:13 | [finally: exception(Exception)] try {...} ... | Finally.cs:202:9:212:9 | [finally: exception(Exception)] {...} |
-| Finally.cs:203:13:210:13 | [finally: exception(ExceptionA)] try {...} ... | Finally.cs:202:9:212:9 | [finally: exception(ExceptionA)] {...} |
+| Finally.cs:202:9:212:9 | {...} | Finally.cs:199:21:199:43 | throw ...; |
+| Finally.cs:202:9:212:9 | {...} | Finally.cs:199:27:199:42 | object creation of type ExceptionA |
 | Finally.cs:203:13:210:13 | try {...} ... | Finally.cs:202:9:212:9 | {...} |
-| Finally.cs:204:13:206:13 | [finally: exception(Exception)] {...} | Finally.cs:203:13:210:13 | [finally: exception(Exception)] try {...} ... |
-| Finally.cs:204:13:206:13 | [finally: exception(ExceptionA)] {...} | Finally.cs:203:13:210:13 | [finally: exception(ExceptionA)] try {...} ... |
 | Finally.cs:204:13:206:13 | {...} | Finally.cs:203:13:210:13 | try {...} ... |
-| Finally.cs:205:17:205:47 | [finally: exception(Exception)] if (...) ... | Finally.cs:204:13:206:13 | [finally: exception(Exception)] {...} |
-| Finally.cs:205:17:205:47 | [finally: exception(ExceptionA)] if (...) ... | Finally.cs:204:13:206:13 | [finally: exception(ExceptionA)] {...} |
 | Finally.cs:205:17:205:47 | if (...) ... | Finally.cs:204:13:206:13 | {...} |
-| Finally.cs:205:21:205:22 | [finally: exception(Exception)] access to parameter b2 | Finally.cs:205:17:205:47 | [finally: exception(Exception)] if (...) ... |
-| Finally.cs:205:21:205:22 | [finally: exception(ExceptionA)] access to parameter b2 | Finally.cs:205:17:205:47 | [finally: exception(ExceptionA)] if (...) ... |
 | Finally.cs:205:21:205:22 | access to parameter b2 | Finally.cs:205:17:205:47 | if (...) ... |
-| Finally.cs:208:13:210:13 | [finally(1): exception(ExceptionB)] {...} | Finally.cs:205:25:205:47 | throw ...; |
-| Finally.cs:208:13:210:13 | [finally: exception(Exception), finally(1): exception(ExceptionB)] {...} | Finally.cs:205:25:205:47 | [finally: exception(Exception)] throw ...; |
-| Finally.cs:208:13:210:13 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] {...} | Finally.cs:205:25:205:47 | [finally: exception(ExceptionA)] throw ...; |
 | Finally.cs:208:13:210:13 | {...} | Finally.cs:205:21:205:22 | access to parameter b2 |
-| Finally.cs:209:17:209:47 | [finally(1): exception(Exception)] if (...) ... | Finally.cs:208:13:210:13 | [finally(1): exception(Exception)] {...} |
-| Finally.cs:209:17:209:47 | [finally(1): exception(ExceptionB)] if (...) ... | Finally.cs:208:13:210:13 | [finally(1): exception(ExceptionB)] {...} |
-| Finally.cs:209:17:209:47 | [finally: exception(Exception), finally(1): exception(Exception)] if (...) ... | Finally.cs:208:13:210:13 | [finally: exception(Exception), finally(1): exception(Exception)] {...} |
-| Finally.cs:209:17:209:47 | [finally: exception(Exception), finally(1): exception(ExceptionB)] if (...) ... | Finally.cs:208:13:210:13 | [finally: exception(Exception), finally(1): exception(ExceptionB)] {...} |
-| Finally.cs:209:17:209:47 | [finally: exception(Exception)] if (...) ... | Finally.cs:208:13:210:13 | [finally: exception(Exception)] {...} |
-| Finally.cs:209:17:209:47 | [finally: exception(ExceptionA), finally(1): exception(Exception)] if (...) ... | Finally.cs:208:13:210:13 | [finally: exception(ExceptionA), finally(1): exception(Exception)] {...} |
-| Finally.cs:209:17:209:47 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] if (...) ... | Finally.cs:208:13:210:13 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] {...} |
-| Finally.cs:209:17:209:47 | [finally: exception(ExceptionA)] if (...) ... | Finally.cs:208:13:210:13 | [finally: exception(ExceptionA)] {...} |
+| Finally.cs:208:13:210:13 | {...} | Finally.cs:205:25:205:47 | throw ...; |
+| Finally.cs:208:13:210:13 | {...} | Finally.cs:205:31:205:46 | object creation of type ExceptionB |
 | Finally.cs:209:17:209:47 | if (...) ... | Finally.cs:208:13:210:13 | {...} |
-| Finally.cs:209:21:209:22 | [finally(1): exception(Exception)] access to parameter b3 | Finally.cs:209:17:209:47 | [finally(1): exception(Exception)] if (...) ... |
-| Finally.cs:209:21:209:22 | [finally(1): exception(ExceptionB)] access to parameter b3 | Finally.cs:209:17:209:47 | [finally(1): exception(ExceptionB)] if (...) ... |
-| Finally.cs:209:21:209:22 | [finally: exception(Exception), finally(1): exception(Exception)] access to parameter b3 | Finally.cs:209:17:209:47 | [finally: exception(Exception), finally(1): exception(Exception)] if (...) ... |
-| Finally.cs:209:21:209:22 | [finally: exception(Exception), finally(1): exception(ExceptionB)] access to parameter b3 | Finally.cs:209:17:209:47 | [finally: exception(Exception), finally(1): exception(ExceptionB)] if (...) ... |
-| Finally.cs:209:21:209:22 | [finally: exception(Exception)] access to parameter b3 | Finally.cs:209:17:209:47 | [finally: exception(Exception)] if (...) ... |
-| Finally.cs:209:21:209:22 | [finally: exception(ExceptionA), finally(1): exception(Exception)] access to parameter b3 | Finally.cs:209:17:209:47 | [finally: exception(ExceptionA), finally(1): exception(Exception)] if (...) ... |
-| Finally.cs:209:21:209:22 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] access to parameter b3 | Finally.cs:209:17:209:47 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] if (...) ... |
-| Finally.cs:209:21:209:22 | [finally: exception(ExceptionA)] access to parameter b3 | Finally.cs:209:17:209:47 | [finally: exception(ExceptionA)] if (...) ... |
 | Finally.cs:209:21:209:22 | access to parameter b3 | Finally.cs:209:17:209:47 | if (...) ... |
-| Finally.cs:209:25:209:47 | [finally(1): exception(Exception)] throw ...; | Finally.cs:209:31:209:46 | [finally(1): exception(Exception)] object creation of type ExceptionC |
-| Finally.cs:209:25:209:47 | [finally(1): exception(ExceptionB)] throw ...; | Finally.cs:209:31:209:46 | [finally(1): exception(ExceptionB)] object creation of type ExceptionC |
-| Finally.cs:209:25:209:47 | [finally: exception(Exception), finally(1): exception(Exception)] throw ...; | Finally.cs:209:31:209:46 | [finally: exception(Exception), finally(1): exception(Exception)] object creation of type ExceptionC |
-| Finally.cs:209:25:209:47 | [finally: exception(Exception), finally(1): exception(ExceptionB)] throw ...; | Finally.cs:209:31:209:46 | [finally: exception(Exception), finally(1): exception(ExceptionB)] object creation of type ExceptionC |
-| Finally.cs:209:25:209:47 | [finally: exception(Exception)] throw ...; | Finally.cs:209:31:209:46 | [finally: exception(Exception)] object creation of type ExceptionC |
-| Finally.cs:209:25:209:47 | [finally: exception(ExceptionA), finally(1): exception(Exception)] throw ...; | Finally.cs:209:31:209:46 | [finally: exception(ExceptionA), finally(1): exception(Exception)] object creation of type ExceptionC |
-| Finally.cs:209:25:209:47 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] throw ...; | Finally.cs:209:31:209:46 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] object creation of type ExceptionC |
-| Finally.cs:209:25:209:47 | [finally: exception(ExceptionA)] throw ...; | Finally.cs:209:31:209:46 | [finally: exception(ExceptionA)] object creation of type ExceptionC |
 | Finally.cs:209:25:209:47 | throw ...; | Finally.cs:209:31:209:46 | object creation of type ExceptionC |
-| Finally.cs:211:13:211:16 | [finally: exception(Exception)] this access | Finally.cs:211:13:211:29 | [finally: exception(Exception)] ...; |
-| Finally.cs:211:13:211:16 | [finally: exception(ExceptionA)] this access | Finally.cs:211:13:211:29 | [finally: exception(ExceptionA)] ...; |
 | Finally.cs:211:13:211:16 | this access | Finally.cs:211:13:211:29 | ...; |
 | Finally.cs:211:13:211:28 | ... = ... | Finally.cs:211:26:211:28 | "0" |
-| Finally.cs:211:13:211:28 | [finally: exception(Exception)] ... = ... | Finally.cs:211:26:211:28 | [finally: exception(Exception)] "0" |
-| Finally.cs:211:13:211:28 | [finally: exception(ExceptionA)] ... = ... | Finally.cs:211:26:211:28 | [finally: exception(ExceptionA)] "0" |
 | Finally.cs:211:13:211:29 | ...; | Finally.cs:209:21:209:22 | access to parameter b3 |
 | Finally.cs:211:26:211:28 | "0" | Finally.cs:211:13:211:16 | this access |
-| Finally.cs:211:26:211:28 | [finally: exception(Exception)] "0" | Finally.cs:211:13:211:16 | [finally: exception(Exception)] this access |
-| Finally.cs:211:26:211:28 | [finally: exception(ExceptionA)] "0" | Finally.cs:211:13:211:16 | [finally: exception(ExceptionA)] this access |
 | Finally.cs:213:9:213:12 | this access | Finally.cs:213:9:213:25 | ...; |
 | Finally.cs:213:9:213:24 | ... = ... | Finally.cs:213:22:213:24 | "1" |
 | Finally.cs:213:9:213:25 | ...; | Finally.cs:211:13:211:28 | ... = ... |
@@ -6619,68 +5521,29 @@ postDominance
 | Finally.cs:238:13:241:13 | {...} | Finally.cs:237:13:253:13 | try {...} ... |
 | Finally.cs:239:17:240:43 | if (...) ... | Finally.cs:238:13:241:13 | {...} |
 | Finally.cs:239:21:239:22 | access to parameter b1 | Finally.cs:239:17:240:43 | if (...) ... |
-| Finally.cs:243:13:253:13 | [finally: exception(ExceptionA)] {...} | Finally.cs:240:21:240:43 | throw ...; |
 | Finally.cs:243:13:253:13 | {...} | Finally.cs:239:21:239:22 | access to parameter b1 |
-| Finally.cs:244:17:252:17 | [finally: exception(Exception)] try {...} ... | Finally.cs:243:13:253:13 | [finally: exception(Exception)] {...} |
-| Finally.cs:244:17:252:17 | [finally: exception(ExceptionA)] try {...} ... | Finally.cs:243:13:253:13 | [finally: exception(ExceptionA)] {...} |
+| Finally.cs:243:13:253:13 | {...} | Finally.cs:240:21:240:43 | throw ...; |
+| Finally.cs:243:13:253:13 | {...} | Finally.cs:240:27:240:42 | object creation of type ExceptionA |
 | Finally.cs:244:17:252:17 | try {...} ... | Finally.cs:243:13:253:13 | {...} |
-| Finally.cs:245:17:248:17 | [finally: exception(Exception)] {...} | Finally.cs:244:17:252:17 | [finally: exception(Exception)] try {...} ... |
-| Finally.cs:245:17:248:17 | [finally: exception(ExceptionA)] {...} | Finally.cs:244:17:252:17 | [finally: exception(ExceptionA)] try {...} ... |
 | Finally.cs:245:17:248:17 | {...} | Finally.cs:244:17:252:17 | try {...} ... |
-| Finally.cs:246:21:247:47 | [finally: exception(Exception)] if (...) ... | Finally.cs:245:17:248:17 | [finally: exception(Exception)] {...} |
-| Finally.cs:246:21:247:47 | [finally: exception(ExceptionA)] if (...) ... | Finally.cs:245:17:248:17 | [finally: exception(ExceptionA)] {...} |
 | Finally.cs:246:21:247:47 | if (...) ... | Finally.cs:245:17:248:17 | {...} |
-| Finally.cs:246:25:246:26 | [finally: exception(Exception)] access to parameter b2 | Finally.cs:246:21:247:47 | [finally: exception(Exception)] if (...) ... |
-| Finally.cs:246:25:246:26 | [finally: exception(ExceptionA)] access to parameter b2 | Finally.cs:246:21:247:47 | [finally: exception(ExceptionA)] if (...) ... |
 | Finally.cs:246:25:246:26 | access to parameter b2 | Finally.cs:246:21:247:47 | if (...) ... |
-| Finally.cs:250:17:252:17 | [finally(1): exception(ExceptionA)] {...} | Finally.cs:247:25:247:47 | throw ...; |
-| Finally.cs:250:17:252:17 | [finally: exception(Exception), finally(1): exception(ExceptionA)] {...} | Finally.cs:247:25:247:47 | [finally: exception(Exception)] throw ...; |
-| Finally.cs:250:17:252:17 | [finally: exception(ExceptionA), finally(1): exception(ExceptionA)] {...} | Finally.cs:247:25:247:47 | [finally: exception(ExceptionA)] throw ...; |
 | Finally.cs:250:17:252:17 | {...} | Finally.cs:246:25:246:26 | access to parameter b2 |
-| Finally.cs:251:21:251:54 | [finally(1): exception(Exception)] call to method WriteLine | Finally.cs:251:39:251:53 | [finally(1): exception(Exception)] "Inner finally" |
-| Finally.cs:251:21:251:54 | [finally(1): exception(ExceptionA)] call to method WriteLine | Finally.cs:251:39:251:53 | [finally(1): exception(ExceptionA)] "Inner finally" |
-| Finally.cs:251:21:251:54 | [finally: exception(Exception), finally(1): exception(Exception)] call to method WriteLine | Finally.cs:251:39:251:53 | [finally: exception(Exception), finally(1): exception(Exception)] "Inner finally" |
-| Finally.cs:251:21:251:54 | [finally: exception(Exception), finally(1): exception(ExceptionA)] call to method WriteLine | Finally.cs:251:39:251:53 | [finally: exception(Exception), finally(1): exception(ExceptionA)] "Inner finally" |
-| Finally.cs:251:21:251:54 | [finally: exception(Exception)] call to method WriteLine | Finally.cs:251:39:251:53 | [finally: exception(Exception)] "Inner finally" |
-| Finally.cs:251:21:251:54 | [finally: exception(ExceptionA), finally(1): exception(Exception)] call to method WriteLine | Finally.cs:251:39:251:53 | [finally: exception(ExceptionA), finally(1): exception(Exception)] "Inner finally" |
-| Finally.cs:251:21:251:54 | [finally: exception(ExceptionA), finally(1): exception(ExceptionA)] call to method WriteLine | Finally.cs:251:39:251:53 | [finally: exception(ExceptionA), finally(1): exception(ExceptionA)] "Inner finally" |
-| Finally.cs:251:21:251:54 | [finally: exception(ExceptionA)] call to method WriteLine | Finally.cs:251:39:251:53 | [finally: exception(ExceptionA)] "Inner finally" |
+| Finally.cs:250:17:252:17 | {...} | Finally.cs:247:25:247:47 | throw ...; |
+| Finally.cs:250:17:252:17 | {...} | Finally.cs:247:31:247:46 | object creation of type ExceptionA |
 | Finally.cs:251:21:251:54 | call to method WriteLine | Finally.cs:251:39:251:53 | "Inner finally" |
 | Finally.cs:251:21:251:55 | ...; | Finally.cs:250:17:252:17 | {...} |
-| Finally.cs:251:21:251:55 | [finally(1): exception(Exception)] ...; | Finally.cs:250:17:252:17 | [finally(1): exception(Exception)] {...} |
-| Finally.cs:251:21:251:55 | [finally(1): exception(ExceptionA)] ...; | Finally.cs:250:17:252:17 | [finally(1): exception(ExceptionA)] {...} |
-| Finally.cs:251:21:251:55 | [finally: exception(Exception), finally(1): exception(Exception)] ...; | Finally.cs:250:17:252:17 | [finally: exception(Exception), finally(1): exception(Exception)] {...} |
-| Finally.cs:251:21:251:55 | [finally: exception(Exception), finally(1): exception(ExceptionA)] ...; | Finally.cs:250:17:252:17 | [finally: exception(Exception), finally(1): exception(ExceptionA)] {...} |
-| Finally.cs:251:21:251:55 | [finally: exception(Exception)] ...; | Finally.cs:250:17:252:17 | [finally: exception(Exception)] {...} |
-| Finally.cs:251:21:251:55 | [finally: exception(ExceptionA), finally(1): exception(Exception)] ...; | Finally.cs:250:17:252:17 | [finally: exception(ExceptionA), finally(1): exception(Exception)] {...} |
-| Finally.cs:251:21:251:55 | [finally: exception(ExceptionA), finally(1): exception(ExceptionA)] ...; | Finally.cs:250:17:252:17 | [finally: exception(ExceptionA), finally(1): exception(ExceptionA)] {...} |
-| Finally.cs:251:21:251:55 | [finally: exception(ExceptionA)] ...; | Finally.cs:250:17:252:17 | [finally: exception(ExceptionA)] {...} |
 | Finally.cs:251:39:251:53 | "Inner finally" | Finally.cs:251:21:251:55 | ...; |
-| Finally.cs:251:39:251:53 | [finally(1): exception(Exception)] "Inner finally" | Finally.cs:251:21:251:55 | [finally(1): exception(Exception)] ...; |
-| Finally.cs:251:39:251:53 | [finally(1): exception(ExceptionA)] "Inner finally" | Finally.cs:251:21:251:55 | [finally(1): exception(ExceptionA)] ...; |
-| Finally.cs:251:39:251:53 | [finally: exception(Exception), finally(1): exception(Exception)] "Inner finally" | Finally.cs:251:21:251:55 | [finally: exception(Exception), finally(1): exception(Exception)] ...; |
-| Finally.cs:251:39:251:53 | [finally: exception(Exception), finally(1): exception(ExceptionA)] "Inner finally" | Finally.cs:251:21:251:55 | [finally: exception(Exception), finally(1): exception(ExceptionA)] ...; |
-| Finally.cs:251:39:251:53 | [finally: exception(Exception)] "Inner finally" | Finally.cs:251:21:251:55 | [finally: exception(Exception)] ...; |
-| Finally.cs:251:39:251:53 | [finally: exception(ExceptionA), finally(1): exception(Exception)] "Inner finally" | Finally.cs:251:21:251:55 | [finally: exception(ExceptionA), finally(1): exception(Exception)] ...; |
-| Finally.cs:251:39:251:53 | [finally: exception(ExceptionA), finally(1): exception(ExceptionA)] "Inner finally" | Finally.cs:251:21:251:55 | [finally: exception(ExceptionA), finally(1): exception(ExceptionA)] ...; |
-| Finally.cs:251:39:251:53 | [finally: exception(ExceptionA)] "Inner finally" | Finally.cs:251:21:251:55 | [finally: exception(ExceptionA)] ...; |
 | Finally.cs:254:13:254:44 | call to method WriteLine | Finally.cs:254:31:254:43 | "Mid finally" |
-| Finally.cs:254:13:254:45 | ...; | Finally.cs:251:21:251:54 | call to method WriteLine |
 | Finally.cs:254:31:254:43 | "Mid finally" | Finally.cs:254:13:254:45 | ...; |
+| Finally.cs:257:9:259:9 | {...} | Finally.cs:251:21:251:54 | call to method WriteLine |
 | Finally.cs:257:9:259:9 | {...} | Finally.cs:254:13:254:44 | call to method WriteLine |
-| Finally.cs:258:13:258:46 | [finally: exception(Exception)] call to method WriteLine | Finally.cs:258:31:258:45 | [finally: exception(Exception)] "Outer finally" |
-| Finally.cs:258:13:258:46 | [finally: exception(ExceptionA)] call to method WriteLine | Finally.cs:258:31:258:45 | [finally: exception(ExceptionA)] "Outer finally" |
 | Finally.cs:258:13:258:46 | call to method WriteLine | Finally.cs:258:31:258:45 | "Outer finally" |
 | Finally.cs:258:13:258:47 | ...; | Finally.cs:257:9:259:9 | {...} |
-| Finally.cs:258:13:258:47 | [finally: exception(Exception)] ...; | Finally.cs:257:9:259:9 | [finally: exception(Exception)] {...} |
-| Finally.cs:258:13:258:47 | [finally: exception(ExceptionA)] ...; | Finally.cs:257:9:259:9 | [finally: exception(ExceptionA)] {...} |
 | Finally.cs:258:31:258:45 | "Outer finally" | Finally.cs:258:13:258:47 | ...; |
-| Finally.cs:258:31:258:45 | [finally: exception(Exception)] "Outer finally" | Finally.cs:258:13:258:47 | [finally: exception(Exception)] ...; |
-| Finally.cs:258:31:258:45 | [finally: exception(ExceptionA)] "Outer finally" | Finally.cs:258:13:258:47 | [finally: exception(ExceptionA)] ...; |
 | Finally.cs:260:9:260:33 | call to method WriteLine | Finally.cs:260:27:260:32 | "Done" |
 | Finally.cs:260:9:260:34 | ...; | Finally.cs:258:13:258:46 | call to method WriteLine |
 | Finally.cs:260:27:260:32 | "Done" | Finally.cs:260:9:260:34 | ...; |
-| Finally.cs:263:10:263:12 | exit M13 (abnormal) | Finally.cs:272:13:272:18 | [finally: exception(Exception)] ... = ... |
 | Finally.cs:263:10:263:12 | exit M13 (normal) | Finally.cs:272:13:272:18 | ... = ... |
 | Finally.cs:264:5:274:5 | {...} | Finally.cs:263:10:263:12 | enter M13 |
 | Finally.cs:265:9:273:9 | try {...} ... | Finally.cs:264:5:274:5 | {...} |
@@ -6689,22 +5552,14 @@ postDominance
 | Finally.cs:267:13:267:35 | ...; | Finally.cs:266:9:268:9 | {...} |
 | Finally.cs:267:31:267:33 | "1" | Finally.cs:267:13:267:35 | ...; |
 | Finally.cs:270:9:273:9 | {...} | Finally.cs:267:13:267:34 | call to method WriteLine |
-| Finally.cs:271:13:271:34 | [finally: exception(Exception)] call to method WriteLine | Finally.cs:271:31:271:33 | [finally: exception(Exception)] "3" |
 | Finally.cs:271:13:271:34 | call to method WriteLine | Finally.cs:271:31:271:33 | "3" |
 | Finally.cs:271:13:271:35 | ...; | Finally.cs:270:9:273:9 | {...} |
-| Finally.cs:271:13:271:35 | [finally: exception(Exception)] ...; | Finally.cs:270:9:273:9 | [finally: exception(Exception)] {...} |
 | Finally.cs:271:31:271:33 | "3" | Finally.cs:271:13:271:35 | ...; |
-| Finally.cs:271:31:271:33 | [finally: exception(Exception)] "3" | Finally.cs:271:13:271:35 | [finally: exception(Exception)] ...; |
-| Finally.cs:272:13:272:13 | [finally: exception(Exception)] access to parameter i | Finally.cs:272:13:272:19 | [finally: exception(Exception)] ...; |
 | Finally.cs:272:13:272:13 | access to parameter i | Finally.cs:272:13:272:19 | ...; |
 | Finally.cs:272:13:272:18 | ... + ... | Finally.cs:272:18:272:18 | 3 |
 | Finally.cs:272:13:272:18 | ... = ... | Finally.cs:272:13:272:18 | ... + ... |
-| Finally.cs:272:13:272:18 | [finally: exception(Exception)] ... + ... | Finally.cs:272:18:272:18 | [finally: exception(Exception)] 3 |
-| Finally.cs:272:13:272:18 | [finally: exception(Exception)] ... = ... | Finally.cs:272:13:272:18 | [finally: exception(Exception)] ... + ... |
 | Finally.cs:272:13:272:19 | ...; | Finally.cs:271:13:271:34 | call to method WriteLine |
-| Finally.cs:272:13:272:19 | [finally: exception(Exception)] ...; | Finally.cs:271:13:271:34 | [finally: exception(Exception)] call to method WriteLine |
 | Finally.cs:272:18:272:18 | 3 | Finally.cs:272:13:272:13 | access to parameter i |
-| Finally.cs:272:18:272:18 | [finally: exception(Exception)] 3 | Finally.cs:272:13:272:13 | [finally: exception(Exception)] access to parameter i |
 | Foreach.cs:4:7:4:13 | call to constructor Object | Foreach.cs:4:7:4:13 | enter Foreach |
 | Foreach.cs:4:7:4:13 | exit Foreach | Foreach.cs:4:7:4:13 | exit Foreach (normal) |
 | Foreach.cs:4:7:4:13 | exit Foreach (normal) | Foreach.cs:4:7:4:13 | {...} |
@@ -6984,9 +5839,8 @@ postDominance
 | LoopUnrolling.cs:9:13:9:23 | access to property Length | LoopUnrolling.cs:9:13:9:16 | access to parameter args |
 | LoopUnrolling.cs:9:13:9:28 | ... == ... | LoopUnrolling.cs:9:28:9:28 | 0 |
 | LoopUnrolling.cs:9:28:9:28 | 0 | LoopUnrolling.cs:9:13:9:23 | access to property Length |
-| LoopUnrolling.cs:11:9:12:35 | [unroll (line 11)] foreach (... ... in ...) ... | LoopUnrolling.cs:11:29:11:32 | access to parameter args |
+| LoopUnrolling.cs:11:9:12:35 | foreach (... ... in ...) ... | LoopUnrolling.cs:11:29:11:32 | access to parameter args |
 | LoopUnrolling.cs:11:9:12:35 | foreach (... ... in ...) ... | LoopUnrolling.cs:12:13:12:34 | call to method WriteLine |
-| LoopUnrolling.cs:11:22:11:24 | String arg | LoopUnrolling.cs:11:9:12:35 | [unroll (line 11)] foreach (... ... in ...) ... |
 | LoopUnrolling.cs:12:13:12:34 | call to method WriteLine | LoopUnrolling.cs:12:31:12:33 | access to local variable arg |
 | LoopUnrolling.cs:12:13:12:35 | ...; | LoopUnrolling.cs:11:22:11:24 | String arg |
 | LoopUnrolling.cs:12:31:12:33 | access to local variable arg | LoopUnrolling.cs:12:13:12:35 | ...; |
@@ -7001,9 +5855,8 @@ postDominance
 | LoopUnrolling.cs:17:33:17:35 | "a" | LoopUnrolling.cs:17:18:17:47 | array creation of type String[] |
 | LoopUnrolling.cs:17:38:17:40 | "b" | LoopUnrolling.cs:17:33:17:35 | "a" |
 | LoopUnrolling.cs:17:43:17:45 | "c" | LoopUnrolling.cs:17:38:17:40 | "b" |
-| LoopUnrolling.cs:18:9:19:33 | [unroll (line 18)] foreach (... ... in ...) ... | LoopUnrolling.cs:18:27:18:28 | access to local variable xs |
+| LoopUnrolling.cs:18:9:19:33 | foreach (... ... in ...) ... | LoopUnrolling.cs:18:27:18:28 | access to local variable xs |
 | LoopUnrolling.cs:18:9:19:33 | foreach (... ... in ...) ... | LoopUnrolling.cs:19:13:19:32 | call to method WriteLine |
-| LoopUnrolling.cs:18:22:18:22 | String x | LoopUnrolling.cs:18:9:19:33 | [unroll (line 18)] foreach (... ... in ...) ... |
 | LoopUnrolling.cs:18:27:18:28 | access to local variable xs | LoopUnrolling.cs:17:13:17:47 | String[] xs = ... |
 | LoopUnrolling.cs:19:13:19:32 | call to method WriteLine | LoopUnrolling.cs:19:31:19:31 | access to local variable x |
 | LoopUnrolling.cs:19:13:19:33 | ...; | LoopUnrolling.cs:18:22:18:22 | String x |
@@ -7014,22 +5867,25 @@ postDominance
 | LoopUnrolling.cs:24:9:26:40 | foreach (... ... in ...) ... | LoopUnrolling.cs:24:29:24:32 | access to parameter args |
 | LoopUnrolling.cs:24:9:26:40 | foreach (... ... in ...) ... | LoopUnrolling.cs:25:13:26:40 | foreach (... ... in ...) ... |
 | LoopUnrolling.cs:24:29:24:32 | access to parameter args | LoopUnrolling.cs:23:5:27:5 | {...} |
-| LoopUnrolling.cs:25:13:26:40 | [unroll (line 25)] foreach (... ... in ...) ... | LoopUnrolling.cs:25:34:25:37 | access to parameter args |
+| LoopUnrolling.cs:25:13:26:40 | foreach (... ... in ...) ... | LoopUnrolling.cs:25:34:25:37 | access to parameter args |
 | LoopUnrolling.cs:25:13:26:40 | foreach (... ... in ...) ... | LoopUnrolling.cs:26:17:26:39 | call to method WriteLine |
-| LoopUnrolling.cs:25:26:25:29 | Char arg0 | LoopUnrolling.cs:25:13:26:40 | [unroll (line 25)] foreach (... ... in ...) ... |
 | LoopUnrolling.cs:25:34:25:37 | access to parameter args | LoopUnrolling.cs:24:22:24:24 | Char arg |
 | LoopUnrolling.cs:26:17:26:39 | call to method WriteLine | LoopUnrolling.cs:26:35:26:38 | access to local variable arg0 |
 | LoopUnrolling.cs:26:17:26:40 | ...; | LoopUnrolling.cs:25:26:25:29 | Char arg0 |
 | LoopUnrolling.cs:26:35:26:38 | access to local variable arg0 | LoopUnrolling.cs:26:17:26:40 | ...; |
 | LoopUnrolling.cs:29:10:29:11 | exit M4 | LoopUnrolling.cs:29:10:29:11 | exit M4 (normal) |
-| LoopUnrolling.cs:29:10:29:11 | exit M4 (normal) | LoopUnrolling.cs:32:9:33:33 | [skip (line 32)] foreach (... ... in ...) ... |
+| LoopUnrolling.cs:29:10:29:11 | exit M4 (normal) | LoopUnrolling.cs:32:9:33:33 | foreach (... ... in ...) ... |
 | LoopUnrolling.cs:30:5:34:5 | {...} | LoopUnrolling.cs:29:10:29:11 | enter M4 |
 | LoopUnrolling.cs:31:9:31:31 | ... ...; | LoopUnrolling.cs:30:5:34:5 | {...} |
 | LoopUnrolling.cs:31:13:31:30 | String[] xs = ... | LoopUnrolling.cs:31:18:31:30 | array creation of type String[] |
 | LoopUnrolling.cs:31:18:31:30 | array creation of type String[] | LoopUnrolling.cs:31:29:31:29 | 0 |
 | LoopUnrolling.cs:31:29:31:29 | 0 | LoopUnrolling.cs:31:9:31:31 | ... ...; |
-| LoopUnrolling.cs:32:9:33:33 | [skip (line 32)] foreach (... ... in ...) ... | LoopUnrolling.cs:32:27:32:28 | access to local variable xs |
+| LoopUnrolling.cs:32:9:33:33 | foreach (... ... in ...) ... | LoopUnrolling.cs:32:27:32:28 | access to local variable xs |
+| LoopUnrolling.cs:32:9:33:33 | foreach (... ... in ...) ... | LoopUnrolling.cs:33:13:33:32 | call to method WriteLine |
 | LoopUnrolling.cs:32:27:32:28 | access to local variable xs | LoopUnrolling.cs:31:13:31:30 | String[] xs = ... |
+| LoopUnrolling.cs:33:13:33:32 | call to method WriteLine | LoopUnrolling.cs:33:31:33:31 | access to local variable x |
+| LoopUnrolling.cs:33:13:33:33 | ...; | LoopUnrolling.cs:32:22:32:22 | String x |
+| LoopUnrolling.cs:33:31:33:31 | access to local variable x | LoopUnrolling.cs:33:13:33:33 | ...; |
 | LoopUnrolling.cs:36:10:36:11 | exit M5 | LoopUnrolling.cs:36:10:36:11 | exit M5 (normal) |
 | LoopUnrolling.cs:36:10:36:11 | exit M5 (normal) | LoopUnrolling.cs:40:9:42:41 | foreach (... ... in ...) ... |
 | LoopUnrolling.cs:37:5:43:5 | {...} | LoopUnrolling.cs:36:10:36:11 | enter M5 |
@@ -7049,19 +5905,19 @@ postDominance
 | LoopUnrolling.cs:39:33:39:35 | "0" | LoopUnrolling.cs:39:18:39:47 | array creation of type String[] |
 | LoopUnrolling.cs:39:38:39:40 | "1" | LoopUnrolling.cs:39:33:39:35 | "0" |
 | LoopUnrolling.cs:39:43:39:45 | "2" | LoopUnrolling.cs:39:38:39:40 | "1" |
-| LoopUnrolling.cs:40:9:42:41 | [unroll (line 40)] foreach (... ... in ...) ... | LoopUnrolling.cs:40:27:40:28 | access to local variable xs |
+| LoopUnrolling.cs:40:9:42:41 | foreach (... ... in ...) ... | LoopUnrolling.cs:40:27:40:28 | access to local variable xs |
 | LoopUnrolling.cs:40:9:42:41 | foreach (... ... in ...) ... | LoopUnrolling.cs:41:13:42:41 | foreach (... ... in ...) ... |
-| LoopUnrolling.cs:40:22:40:22 | String x | LoopUnrolling.cs:40:9:42:41 | [unroll (line 40)] foreach (... ... in ...) ... |
 | LoopUnrolling.cs:40:27:40:28 | access to local variable xs | LoopUnrolling.cs:39:13:39:47 | String[] ys = ... |
-| LoopUnrolling.cs:41:13:42:41 | [unroll (line 41)] foreach (... ... in ...) ... | LoopUnrolling.cs:41:31:41:32 | access to local variable ys |
+| LoopUnrolling.cs:41:13:42:41 | foreach (... ... in ...) ... | LoopUnrolling.cs:41:31:41:32 | access to local variable ys |
 | LoopUnrolling.cs:41:13:42:41 | foreach (... ... in ...) ... | LoopUnrolling.cs:42:17:42:40 | call to method WriteLine |
-| LoopUnrolling.cs:41:26:41:26 | String y | LoopUnrolling.cs:41:13:42:41 | [unroll (line 41)] foreach (... ... in ...) ... |
 | LoopUnrolling.cs:41:31:41:32 | access to local variable ys | LoopUnrolling.cs:40:22:40:22 | String x |
 | LoopUnrolling.cs:42:17:42:40 | call to method WriteLine | LoopUnrolling.cs:42:35:42:39 | ... + ... |
 | LoopUnrolling.cs:42:17:42:41 | ...; | LoopUnrolling.cs:41:26:41:26 | String y |
 | LoopUnrolling.cs:42:35:42:35 | access to local variable x | LoopUnrolling.cs:42:17:42:41 | ...; |
 | LoopUnrolling.cs:42:35:42:39 | ... + ... | LoopUnrolling.cs:42:39:42:39 | access to local variable y |
 | LoopUnrolling.cs:42:39:42:39 | access to local variable y | LoopUnrolling.cs:42:35:42:35 | access to local variable x |
+| LoopUnrolling.cs:45:10:45:11 | exit M6 | LoopUnrolling.cs:45:10:45:11 | exit M6 (normal) |
+| LoopUnrolling.cs:45:10:45:11 | exit M6 (normal) | LoopUnrolling.cs:48:9:52:9 | foreach (... ... in ...) ... |
 | LoopUnrolling.cs:46:5:53:5 | {...} | LoopUnrolling.cs:45:10:45:11 | enter M6 |
 | LoopUnrolling.cs:47:9:47:48 | ... ...; | LoopUnrolling.cs:46:5:53:5 | {...} |
 | LoopUnrolling.cs:47:13:47:47 | String[] xs = ... | LoopUnrolling.cs:47:31:47:47 | { ..., ... } |
@@ -7071,7 +5927,7 @@ postDominance
 | LoopUnrolling.cs:47:33:47:35 | "a" | LoopUnrolling.cs:47:18:47:47 | array creation of type String[] |
 | LoopUnrolling.cs:47:38:47:40 | "b" | LoopUnrolling.cs:47:33:47:35 | "a" |
 | LoopUnrolling.cs:47:43:47:45 | "c" | LoopUnrolling.cs:47:38:47:40 | "b" |
-| LoopUnrolling.cs:48:9:52:9 | [unroll (line 48)] foreach (... ... in ...) ... | LoopUnrolling.cs:48:27:48:28 | access to local variable xs |
+| LoopUnrolling.cs:48:9:52:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:48:27:48:28 | access to local variable xs |
 | LoopUnrolling.cs:48:27:48:28 | access to local variable xs | LoopUnrolling.cs:47:13:47:47 | String[] xs = ... |
 | LoopUnrolling.cs:49:9:52:9 | {...} | LoopUnrolling.cs:48:22:48:22 | String x |
 | LoopUnrolling.cs:50:16:50:35 | call to method WriteLine | LoopUnrolling.cs:50:34:50:34 | access to local variable x |
@@ -7079,8 +5935,7 @@ postDominance
 | LoopUnrolling.cs:50:34:50:34 | access to local variable x | LoopUnrolling.cs:50:16:50:36 | ...; |
 | LoopUnrolling.cs:51:13:51:23 | goto ...; | LoopUnrolling.cs:50:16:50:35 | call to method WriteLine |
 | LoopUnrolling.cs:55:10:55:11 | exit M7 | LoopUnrolling.cs:55:10:55:11 | exit M7 (normal) |
-| LoopUnrolling.cs:55:10:55:11 | exit M7 (normal) | LoopUnrolling.cs:58:9:64:9 | [b (line 55): false] foreach (... ... in ...) ... |
-| LoopUnrolling.cs:55:10:55:11 | exit M7 (normal) | LoopUnrolling.cs:58:9:64:9 | [b (line 55): true] foreach (... ... in ...) ... |
+| LoopUnrolling.cs:55:10:55:11 | exit M7 (normal) | LoopUnrolling.cs:58:9:64:9 | foreach (... ... in ...) ... |
 | LoopUnrolling.cs:56:5:65:5 | {...} | LoopUnrolling.cs:55:10:55:11 | enter M7 |
 | LoopUnrolling.cs:57:9:57:48 | ... ...; | LoopUnrolling.cs:56:5:65:5 | {...} |
 | LoopUnrolling.cs:57:13:57:47 | String[] xs = ... | LoopUnrolling.cs:57:31:57:47 | { ..., ... } |
@@ -7090,33 +5945,23 @@ postDominance
 | LoopUnrolling.cs:57:33:57:35 | "a" | LoopUnrolling.cs:57:18:57:47 | array creation of type String[] |
 | LoopUnrolling.cs:57:38:57:40 | "b" | LoopUnrolling.cs:57:33:57:35 | "a" |
 | LoopUnrolling.cs:57:43:57:45 | "c" | LoopUnrolling.cs:57:38:57:40 | "b" |
-| LoopUnrolling.cs:58:9:64:9 | [b (line 55): false] foreach (... ... in ...) ... | LoopUnrolling.cs:62:17:62:17 | [b (line 55): false] access to parameter b |
-| LoopUnrolling.cs:58:9:64:9 | [b (line 55): true] foreach (... ... in ...) ... | LoopUnrolling.cs:63:17:63:36 | [b (line 55): true] call to method WriteLine |
-| LoopUnrolling.cs:58:9:64:9 | [unroll (line 58)] foreach (... ... in ...) ... | LoopUnrolling.cs:58:27:58:28 | access to local variable xs |
-| LoopUnrolling.cs:58:22:58:22 | String x | LoopUnrolling.cs:58:9:64:9 | [unroll (line 58)] foreach (... ... in ...) ... |
+| LoopUnrolling.cs:58:9:64:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:58:27:58:28 | access to local variable xs |
+| LoopUnrolling.cs:58:9:64:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:62:17:62:17 | access to parameter b |
+| LoopUnrolling.cs:58:9:64:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:63:17:63:36 | call to method WriteLine |
 | LoopUnrolling.cs:58:27:58:28 | access to local variable xs | LoopUnrolling.cs:57:13:57:47 | String[] xs = ... |
-| LoopUnrolling.cs:59:9:64:9 | [b (line 55): false] {...} | LoopUnrolling.cs:58:22:58:22 | [b (line 55): false] String x |
-| LoopUnrolling.cs:59:9:64:9 | [b (line 55): true] {...} | LoopUnrolling.cs:58:22:58:22 | [b (line 55): true] String x |
 | LoopUnrolling.cs:59:9:64:9 | {...} | LoopUnrolling.cs:58:22:58:22 | String x |
-| LoopUnrolling.cs:60:13:61:37 | [b (line 55): false] if (...) ... | LoopUnrolling.cs:59:9:64:9 | [b (line 55): false] {...} |
-| LoopUnrolling.cs:60:13:61:37 | [b (line 55): true] if (...) ... | LoopUnrolling.cs:59:9:64:9 | [b (line 55): true] {...} |
 | LoopUnrolling.cs:60:13:61:37 | if (...) ... | LoopUnrolling.cs:59:9:64:9 | {...} |
-| LoopUnrolling.cs:60:17:60:17 | [b (line 55): false] access to parameter b | LoopUnrolling.cs:60:13:61:37 | [b (line 55): false] if (...) ... |
-| LoopUnrolling.cs:60:17:60:17 | [b (line 55): true] access to parameter b | LoopUnrolling.cs:60:13:61:37 | [b (line 55): true] if (...) ... |
 | LoopUnrolling.cs:60:17:60:17 | access to parameter b | LoopUnrolling.cs:60:13:61:37 | if (...) ... |
-| LoopUnrolling.cs:61:17:61:36 | [b (line 55): true] call to method WriteLine | LoopUnrolling.cs:61:35:61:35 | [b (line 55): true] access to local variable x |
-| LoopUnrolling.cs:61:17:61:37 | [b (line 55): true] ...; | LoopUnrolling.cs:60:17:60:17 | [b (line 55): true] access to parameter b |
-| LoopUnrolling.cs:61:35:61:35 | [b (line 55): true] access to local variable x | LoopUnrolling.cs:61:17:61:37 | [b (line 55): true] ...; |
-| LoopUnrolling.cs:62:13:63:37 | [b (line 55): false] if (...) ... | LoopUnrolling.cs:60:17:60:17 | [b (line 55): false] access to parameter b |
-| LoopUnrolling.cs:62:13:63:37 | [b (line 55): true] if (...) ... | LoopUnrolling.cs:61:17:61:36 | [b (line 55): true] call to method WriteLine |
-| LoopUnrolling.cs:62:17:62:17 | [b (line 55): false] access to parameter b | LoopUnrolling.cs:62:13:63:37 | [b (line 55): false] if (...) ... |
-| LoopUnrolling.cs:62:17:62:17 | [b (line 55): true] access to parameter b | LoopUnrolling.cs:62:13:63:37 | [b (line 55): true] if (...) ... |
-| LoopUnrolling.cs:63:17:63:36 | [b (line 55): true] call to method WriteLine | LoopUnrolling.cs:63:35:63:35 | [b (line 55): true] access to local variable x |
-| LoopUnrolling.cs:63:17:63:37 | [b (line 55): true] ...; | LoopUnrolling.cs:62:17:62:17 | [b (line 55): true] access to parameter b |
-| LoopUnrolling.cs:63:35:63:35 | [b (line 55): true] access to local variable x | LoopUnrolling.cs:63:17:63:37 | [b (line 55): true] ...; |
+| LoopUnrolling.cs:61:17:61:36 | call to method WriteLine | LoopUnrolling.cs:61:35:61:35 | access to local variable x |
+| LoopUnrolling.cs:61:35:61:35 | access to local variable x | LoopUnrolling.cs:61:17:61:37 | ...; |
+| LoopUnrolling.cs:62:13:63:37 | if (...) ... | LoopUnrolling.cs:60:17:60:17 | access to parameter b |
+| LoopUnrolling.cs:62:13:63:37 | if (...) ... | LoopUnrolling.cs:61:17:61:36 | call to method WriteLine |
+| LoopUnrolling.cs:62:17:62:17 | access to parameter b | LoopUnrolling.cs:62:13:63:37 | if (...) ... |
+| LoopUnrolling.cs:63:17:63:36 | call to method WriteLine | LoopUnrolling.cs:63:35:63:35 | access to local variable x |
+| LoopUnrolling.cs:63:35:63:35 | access to local variable x | LoopUnrolling.cs:63:17:63:37 | ...; |
 | LoopUnrolling.cs:67:10:67:11 | exit M8 | LoopUnrolling.cs:67:10:67:11 | exit M8 (normal) |
 | LoopUnrolling.cs:67:10:67:11 | exit M8 (normal) | LoopUnrolling.cs:70:13:70:19 | return ...; |
-| LoopUnrolling.cs:67:10:67:11 | exit M8 (normal) | LoopUnrolling.cs:72:9:73:35 | [skip (line 72)] foreach (... ... in ...) ... |
+| LoopUnrolling.cs:67:10:67:11 | exit M8 (normal) | LoopUnrolling.cs:72:9:73:35 | foreach (... ... in ...) ... |
 | LoopUnrolling.cs:68:5:74:5 | {...} | LoopUnrolling.cs:67:10:67:11 | enter M8 |
 | LoopUnrolling.cs:69:9:70:19 | if (...) ... | LoopUnrolling.cs:68:5:74:5 | {...} |
 | LoopUnrolling.cs:69:14:69:17 | access to parameter args | LoopUnrolling.cs:69:9:70:19 | if (...) ... |
@@ -7125,28 +5970,42 @@ postDominance
 | LoopUnrolling.cs:71:9:71:12 | access to parameter args | LoopUnrolling.cs:71:9:71:21 | ...; |
 | LoopUnrolling.cs:71:9:71:20 | call to method Clear | LoopUnrolling.cs:71:9:71:12 | access to parameter args |
 | LoopUnrolling.cs:71:9:71:21 | ...; | LoopUnrolling.cs:69:13:69:23 | [false] !... |
-| LoopUnrolling.cs:72:9:73:35 | [skip (line 72)] foreach (... ... in ...) ... | LoopUnrolling.cs:72:29:72:32 | access to parameter args |
+| LoopUnrolling.cs:72:9:73:35 | foreach (... ... in ...) ... | LoopUnrolling.cs:72:29:72:32 | access to parameter args |
+| LoopUnrolling.cs:72:9:73:35 | foreach (... ... in ...) ... | LoopUnrolling.cs:73:13:73:34 | call to method WriteLine |
 | LoopUnrolling.cs:72:29:72:32 | access to parameter args | LoopUnrolling.cs:71:9:71:20 | call to method Clear |
+| LoopUnrolling.cs:73:13:73:34 | call to method WriteLine | LoopUnrolling.cs:73:31:73:33 | access to local variable arg |
+| LoopUnrolling.cs:73:13:73:35 | ...; | LoopUnrolling.cs:72:22:72:24 | String arg |
+| LoopUnrolling.cs:73:31:73:33 | access to local variable arg | LoopUnrolling.cs:73:13:73:35 | ...; |
 | LoopUnrolling.cs:76:10:76:11 | exit M9 | LoopUnrolling.cs:76:10:76:11 | exit M9 (normal) |
-| LoopUnrolling.cs:76:10:76:11 | exit M9 (normal) | LoopUnrolling.cs:79:9:82:9 | [skip (line 79)] foreach (... ... in ...) ... |
+| LoopUnrolling.cs:76:10:76:11 | exit M9 (normal) | LoopUnrolling.cs:79:9:82:9 | foreach (... ... in ...) ... |
 | LoopUnrolling.cs:77:5:83:5 | {...} | LoopUnrolling.cs:76:10:76:11 | enter M9 |
 | LoopUnrolling.cs:78:9:78:34 | ... ...; | LoopUnrolling.cs:77:5:83:5 | {...} |
 | LoopUnrolling.cs:78:13:78:33 | String[,] xs = ... | LoopUnrolling.cs:78:18:78:33 | array creation of type String[,] |
 | LoopUnrolling.cs:78:18:78:33 | array creation of type String[,] | LoopUnrolling.cs:78:32:78:32 | 0 |
 | LoopUnrolling.cs:78:29:78:29 | 2 | LoopUnrolling.cs:78:9:78:34 | ... ...; |
 | LoopUnrolling.cs:78:32:78:32 | 0 | LoopUnrolling.cs:78:29:78:29 | 2 |
-| LoopUnrolling.cs:79:9:82:9 | [skip (line 79)] foreach (... ... in ...) ... | LoopUnrolling.cs:79:27:79:28 | access to local variable xs |
+| LoopUnrolling.cs:79:9:82:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:79:27:79:28 | access to local variable xs |
+| LoopUnrolling.cs:79:9:82:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:81:13:81:32 | call to method WriteLine |
 | LoopUnrolling.cs:79:27:79:28 | access to local variable xs | LoopUnrolling.cs:78:13:78:33 | String[,] xs = ... |
+| LoopUnrolling.cs:80:9:82:9 | {...} | LoopUnrolling.cs:79:22:79:22 | String x |
+| LoopUnrolling.cs:81:13:81:32 | call to method WriteLine | LoopUnrolling.cs:81:31:81:31 | access to local variable x |
+| LoopUnrolling.cs:81:13:81:33 | ...; | LoopUnrolling.cs:80:9:82:9 | {...} |
+| LoopUnrolling.cs:81:31:81:31 | access to local variable x | LoopUnrolling.cs:81:13:81:33 | ...; |
 | LoopUnrolling.cs:85:10:85:12 | exit M10 | LoopUnrolling.cs:85:10:85:12 | exit M10 (normal) |
-| LoopUnrolling.cs:85:10:85:12 | exit M10 (normal) | LoopUnrolling.cs:88:9:91:9 | [skip (line 88)] foreach (... ... in ...) ... |
+| LoopUnrolling.cs:85:10:85:12 | exit M10 (normal) | LoopUnrolling.cs:88:9:91:9 | foreach (... ... in ...) ... |
 | LoopUnrolling.cs:86:5:92:5 | {...} | LoopUnrolling.cs:85:10:85:12 | enter M10 |
 | LoopUnrolling.cs:87:9:87:34 | ... ...; | LoopUnrolling.cs:86:5:92:5 | {...} |
 | LoopUnrolling.cs:87:13:87:33 | String[,] xs = ... | LoopUnrolling.cs:87:18:87:33 | array creation of type String[,] |
 | LoopUnrolling.cs:87:18:87:33 | array creation of type String[,] | LoopUnrolling.cs:87:32:87:32 | 2 |
 | LoopUnrolling.cs:87:29:87:29 | 0 | LoopUnrolling.cs:87:9:87:34 | ... ...; |
 | LoopUnrolling.cs:87:32:87:32 | 2 | LoopUnrolling.cs:87:29:87:29 | 0 |
-| LoopUnrolling.cs:88:9:91:9 | [skip (line 88)] foreach (... ... in ...) ... | LoopUnrolling.cs:88:27:88:28 | access to local variable xs |
+| LoopUnrolling.cs:88:9:91:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:88:27:88:28 | access to local variable xs |
+| LoopUnrolling.cs:88:9:91:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:90:13:90:32 | call to method WriteLine |
 | LoopUnrolling.cs:88:27:88:28 | access to local variable xs | LoopUnrolling.cs:87:13:87:33 | String[,] xs = ... |
+| LoopUnrolling.cs:89:9:91:9 | {...} | LoopUnrolling.cs:88:22:88:22 | String x |
+| LoopUnrolling.cs:90:13:90:32 | call to method WriteLine | LoopUnrolling.cs:90:31:90:31 | access to local variable x |
+| LoopUnrolling.cs:90:13:90:33 | ...; | LoopUnrolling.cs:89:9:91:9 | {...} |
+| LoopUnrolling.cs:90:31:90:31 | access to local variable x | LoopUnrolling.cs:90:13:90:33 | ...; |
 | LoopUnrolling.cs:94:10:94:12 | exit M11 | LoopUnrolling.cs:94:10:94:12 | exit M11 (normal) |
 | LoopUnrolling.cs:94:10:94:12 | exit M11 (normal) | LoopUnrolling.cs:97:9:100:9 | foreach (... ... in ...) ... |
 | LoopUnrolling.cs:95:5:101:5 | {...} | LoopUnrolling.cs:94:10:94:12 | enter M11 |
@@ -7155,9 +6014,8 @@ postDominance
 | LoopUnrolling.cs:96:18:96:33 | array creation of type String[,] | LoopUnrolling.cs:96:32:96:32 | 2 |
 | LoopUnrolling.cs:96:29:96:29 | 2 | LoopUnrolling.cs:96:9:96:34 | ... ...; |
 | LoopUnrolling.cs:96:32:96:32 | 2 | LoopUnrolling.cs:96:29:96:29 | 2 |
-| LoopUnrolling.cs:97:9:100:9 | [unroll (line 97)] foreach (... ... in ...) ... | LoopUnrolling.cs:97:27:97:28 | access to local variable xs |
+| LoopUnrolling.cs:97:9:100:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:97:27:97:28 | access to local variable xs |
 | LoopUnrolling.cs:97:9:100:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:99:13:99:32 | call to method WriteLine |
-| LoopUnrolling.cs:97:22:97:22 | String x | LoopUnrolling.cs:97:9:100:9 | [unroll (line 97)] foreach (... ... in ...) ... |
 | LoopUnrolling.cs:97:27:97:28 | access to local variable xs | LoopUnrolling.cs:96:13:96:33 | String[,] xs = ... |
 | LoopUnrolling.cs:98:9:100:9 | {...} | LoopUnrolling.cs:97:22:97:22 | String x |
 | LoopUnrolling.cs:99:13:99:32 | call to method WriteLine | LoopUnrolling.cs:99:31:99:31 | access to local variable x |
@@ -8541,8 +7399,7 @@ postDominance
 | cflow.cs:256:17:256:37 | ...; | cflow.cs:255:13:255:20 | default: |
 | cflow.cs:256:35:256:35 | 0 | cflow.cs:256:17:256:37 | ...; |
 | cflow.cs:257:17:257:22 | break; | cflow.cs:256:17:256:36 | call to method WriteLine |
-| cflow.cs:261:49:261:53 | exit Yield | cflow.cs:261:49:261:53 | exit Yield (normal) |
-| cflow.cs:261:49:261:53 | exit Yield (normal) | cflow.cs:275:13:275:41 | [finally: return] call to method WriteLine |
+| cflow.cs:261:49:261:53 | exit Yield (normal) | cflow.cs:275:13:275:41 | call to method WriteLine |
 | cflow.cs:262:5:277:5 | {...} | cflow.cs:261:49:261:53 | enter Yield |
 | cflow.cs:263:9:263:23 | yield return ...; | cflow.cs:263:22:263:22 | 0 |
 | cflow.cs:263:22:263:22 | 0 | cflow.cs:262:5:277:5 | {...} |
@@ -8560,10 +7417,10 @@ postDominance
 | cflow.cs:268:9:276:9 | try {...} ... | cflow.cs:264:25:264:30 | ... < ... |
 | cflow.cs:269:9:272:9 | {...} | cflow.cs:268:9:276:9 | try {...} ... |
 | cflow.cs:270:13:270:24 | yield break; | cflow.cs:269:9:272:9 | {...} |
-| cflow.cs:274:9:276:9 | [finally: return] {...} | cflow.cs:270:13:270:24 | yield break; |
-| cflow.cs:275:13:275:41 | [finally: return] call to method WriteLine | cflow.cs:275:31:275:40 | [finally: return] "not dead" |
-| cflow.cs:275:13:275:42 | [finally: return] ...; | cflow.cs:274:9:276:9 | [finally: return] {...} |
-| cflow.cs:275:31:275:40 | [finally: return] "not dead" | cflow.cs:275:13:275:42 | [finally: return] ...; |
+| cflow.cs:274:9:276:9 | {...} | cflow.cs:270:13:270:24 | yield break; |
+| cflow.cs:275:13:275:41 | call to method WriteLine | cflow.cs:275:31:275:40 | "not dead" |
+| cflow.cs:275:13:275:42 | ...; | cflow.cs:274:9:276:9 | {...} |
+| cflow.cs:275:31:275:40 | "not dead" | cflow.cs:275:13:275:42 | ...; |
 | cflow.cs:282:5:282:18 | exit ControlFlowSub | cflow.cs:282:5:282:18 | exit ControlFlowSub (normal) |
 | cflow.cs:282:5:282:18 | exit ControlFlowSub (normal) | cflow.cs:282:31:282:33 | {...} |
 | cflow.cs:282:24:282:27 | call to constructor ControlFlow | cflow.cs:282:5:282:18 | enter ControlFlowSub |
@@ -8644,1313 +7501,970 @@ blockDominance
 | Assert.cs:5:7:5:17 | enter AssertTests | Assert.cs:5:7:5:17 | enter AssertTests |
 | Assert.cs:7:10:7:11 | enter M1 | Assert.cs:7:10:7:11 | enter M1 |
 | Assert.cs:7:10:7:11 | enter M1 | Assert.cs:7:10:7:11 | exit M1 |
+| Assert.cs:7:10:7:11 | enter M1 | Assert.cs:7:10:7:11 | exit M1 (abnormal) |
 | Assert.cs:7:10:7:11 | enter M1 | Assert.cs:9:20:9:32 | ... ? ... : ... |
 | Assert.cs:7:10:7:11 | enter M1 | Assert.cs:9:24:9:27 | null |
 | Assert.cs:7:10:7:11 | enter M1 | Assert.cs:9:31:9:32 | "" |
-| Assert.cs:7:10:7:11 | enter M1 | Assert.cs:10:9:10:31 | [assertion failure] call to method Assert |
-| Assert.cs:7:10:7:11 | enter M1 | Assert.cs:10:9:10:31 | [assertion success] call to method Assert |
+| Assert.cs:7:10:7:11 | enter M1 | Assert.cs:11:9:11:36 | ...; |
 | Assert.cs:7:10:7:11 | exit M1 | Assert.cs:7:10:7:11 | exit M1 |
+| Assert.cs:7:10:7:11 | exit M1 (abnormal) | Assert.cs:7:10:7:11 | exit M1 (abnormal) |
 | Assert.cs:9:20:9:32 | ... ? ... : ... | Assert.cs:7:10:7:11 | exit M1 |
+| Assert.cs:9:20:9:32 | ... ? ... : ... | Assert.cs:7:10:7:11 | exit M1 (abnormal) |
 | Assert.cs:9:20:9:32 | ... ? ... : ... | Assert.cs:9:20:9:32 | ... ? ... : ... |
-| Assert.cs:9:20:9:32 | ... ? ... : ... | Assert.cs:10:9:10:31 | [assertion failure] call to method Assert |
-| Assert.cs:9:20:9:32 | ... ? ... : ... | Assert.cs:10:9:10:31 | [assertion success] call to method Assert |
+| Assert.cs:9:20:9:32 | ... ? ... : ... | Assert.cs:11:9:11:36 | ...; |
 | Assert.cs:9:24:9:27 | null | Assert.cs:9:24:9:27 | null |
 | Assert.cs:9:31:9:32 | "" | Assert.cs:9:31:9:32 | "" |
-| Assert.cs:10:9:10:31 | [assertion failure] call to method Assert | Assert.cs:10:9:10:31 | [assertion failure] call to method Assert |
-| Assert.cs:10:9:10:31 | [assertion success] call to method Assert | Assert.cs:10:9:10:31 | [assertion success] call to method Assert |
+| Assert.cs:11:9:11:36 | ...; | Assert.cs:11:9:11:36 | ...; |
 | Assert.cs:14:10:14:11 | enter M2 | Assert.cs:14:10:14:11 | enter M2 |
 | Assert.cs:14:10:14:11 | enter M2 | Assert.cs:14:10:14:11 | exit M2 |
+| Assert.cs:14:10:14:11 | enter M2 | Assert.cs:14:10:14:11 | exit M2 (abnormal) |
 | Assert.cs:14:10:14:11 | enter M2 | Assert.cs:16:20:16:32 | ... ? ... : ... |
 | Assert.cs:14:10:14:11 | enter M2 | Assert.cs:16:24:16:27 | null |
 | Assert.cs:14:10:14:11 | enter M2 | Assert.cs:16:31:16:32 | "" |
-| Assert.cs:14:10:14:11 | enter M2 | Assert.cs:17:9:17:24 | [assertion failure] call to method IsNull |
-| Assert.cs:14:10:14:11 | enter M2 | Assert.cs:17:9:17:24 | [assertion success] call to method IsNull |
+| Assert.cs:14:10:14:11 | enter M2 | Assert.cs:18:9:18:36 | ...; |
 | Assert.cs:14:10:14:11 | exit M2 | Assert.cs:14:10:14:11 | exit M2 |
+| Assert.cs:14:10:14:11 | exit M2 (abnormal) | Assert.cs:14:10:14:11 | exit M2 (abnormal) |
 | Assert.cs:16:20:16:32 | ... ? ... : ... | Assert.cs:14:10:14:11 | exit M2 |
+| Assert.cs:16:20:16:32 | ... ? ... : ... | Assert.cs:14:10:14:11 | exit M2 (abnormal) |
 | Assert.cs:16:20:16:32 | ... ? ... : ... | Assert.cs:16:20:16:32 | ... ? ... : ... |
-| Assert.cs:16:20:16:32 | ... ? ... : ... | Assert.cs:17:9:17:24 | [assertion failure] call to method IsNull |
-| Assert.cs:16:20:16:32 | ... ? ... : ... | Assert.cs:17:9:17:24 | [assertion success] call to method IsNull |
+| Assert.cs:16:20:16:32 | ... ? ... : ... | Assert.cs:18:9:18:36 | ...; |
 | Assert.cs:16:24:16:27 | null | Assert.cs:16:24:16:27 | null |
 | Assert.cs:16:31:16:32 | "" | Assert.cs:16:31:16:32 | "" |
-| Assert.cs:17:9:17:24 | [assertion failure] call to method IsNull | Assert.cs:17:9:17:24 | [assertion failure] call to method IsNull |
-| Assert.cs:17:9:17:24 | [assertion success] call to method IsNull | Assert.cs:17:9:17:24 | [assertion success] call to method IsNull |
+| Assert.cs:18:9:18:36 | ...; | Assert.cs:18:9:18:36 | ...; |
 | Assert.cs:21:10:21:11 | enter M3 | Assert.cs:21:10:21:11 | enter M3 |
 | Assert.cs:21:10:21:11 | enter M3 | Assert.cs:21:10:21:11 | exit M3 |
+| Assert.cs:21:10:21:11 | enter M3 | Assert.cs:21:10:21:11 | exit M3 (abnormal) |
 | Assert.cs:21:10:21:11 | enter M3 | Assert.cs:23:20:23:32 | ... ? ... : ... |
 | Assert.cs:21:10:21:11 | enter M3 | Assert.cs:23:24:23:27 | null |
 | Assert.cs:21:10:21:11 | enter M3 | Assert.cs:23:31:23:32 | "" |
-| Assert.cs:21:10:21:11 | enter M3 | Assert.cs:24:9:24:27 | [assertion failure] call to method IsNotNull |
-| Assert.cs:21:10:21:11 | enter M3 | Assert.cs:24:9:24:27 | [assertion success] call to method IsNotNull |
+| Assert.cs:21:10:21:11 | enter M3 | Assert.cs:25:9:25:36 | ...; |
 | Assert.cs:21:10:21:11 | exit M3 | Assert.cs:21:10:21:11 | exit M3 |
+| Assert.cs:21:10:21:11 | exit M3 (abnormal) | Assert.cs:21:10:21:11 | exit M3 (abnormal) |
 | Assert.cs:23:20:23:32 | ... ? ... : ... | Assert.cs:21:10:21:11 | exit M3 |
+| Assert.cs:23:20:23:32 | ... ? ... : ... | Assert.cs:21:10:21:11 | exit M3 (abnormal) |
 | Assert.cs:23:20:23:32 | ... ? ... : ... | Assert.cs:23:20:23:32 | ... ? ... : ... |
-| Assert.cs:23:20:23:32 | ... ? ... : ... | Assert.cs:24:9:24:27 | [assertion failure] call to method IsNotNull |
-| Assert.cs:23:20:23:32 | ... ? ... : ... | Assert.cs:24:9:24:27 | [assertion success] call to method IsNotNull |
+| Assert.cs:23:20:23:32 | ... ? ... : ... | Assert.cs:25:9:25:36 | ...; |
 | Assert.cs:23:24:23:27 | null | Assert.cs:23:24:23:27 | null |
 | Assert.cs:23:31:23:32 | "" | Assert.cs:23:31:23:32 | "" |
-| Assert.cs:24:9:24:27 | [assertion failure] call to method IsNotNull | Assert.cs:24:9:24:27 | [assertion failure] call to method IsNotNull |
-| Assert.cs:24:9:24:27 | [assertion success] call to method IsNotNull | Assert.cs:24:9:24:27 | [assertion success] call to method IsNotNull |
+| Assert.cs:25:9:25:36 | ...; | Assert.cs:25:9:25:36 | ...; |
 | Assert.cs:28:10:28:11 | enter M4 | Assert.cs:28:10:28:11 | enter M4 |
 | Assert.cs:28:10:28:11 | enter M4 | Assert.cs:28:10:28:11 | exit M4 |
+| Assert.cs:28:10:28:11 | enter M4 | Assert.cs:28:10:28:11 | exit M4 (abnormal) |
 | Assert.cs:28:10:28:11 | enter M4 | Assert.cs:30:20:30:32 | ... ? ... : ... |
 | Assert.cs:28:10:28:11 | enter M4 | Assert.cs:30:24:30:27 | null |
 | Assert.cs:28:10:28:11 | enter M4 | Assert.cs:30:31:30:32 | "" |
-| Assert.cs:28:10:28:11 | enter M4 | Assert.cs:31:9:31:32 | [assertion failure] call to method IsTrue |
-| Assert.cs:28:10:28:11 | enter M4 | Assert.cs:31:9:31:32 | [assertion success] call to method IsTrue |
+| Assert.cs:28:10:28:11 | enter M4 | Assert.cs:32:9:32:36 | ...; |
 | Assert.cs:28:10:28:11 | exit M4 | Assert.cs:28:10:28:11 | exit M4 |
+| Assert.cs:28:10:28:11 | exit M4 (abnormal) | Assert.cs:28:10:28:11 | exit M4 (abnormal) |
 | Assert.cs:30:20:30:32 | ... ? ... : ... | Assert.cs:28:10:28:11 | exit M4 |
+| Assert.cs:30:20:30:32 | ... ? ... : ... | Assert.cs:28:10:28:11 | exit M4 (abnormal) |
 | Assert.cs:30:20:30:32 | ... ? ... : ... | Assert.cs:30:20:30:32 | ... ? ... : ... |
-| Assert.cs:30:20:30:32 | ... ? ... : ... | Assert.cs:31:9:31:32 | [assertion failure] call to method IsTrue |
-| Assert.cs:30:20:30:32 | ... ? ... : ... | Assert.cs:31:9:31:32 | [assertion success] call to method IsTrue |
+| Assert.cs:30:20:30:32 | ... ? ... : ... | Assert.cs:32:9:32:36 | ...; |
 | Assert.cs:30:24:30:27 | null | Assert.cs:30:24:30:27 | null |
 | Assert.cs:30:31:30:32 | "" | Assert.cs:30:31:30:32 | "" |
-| Assert.cs:31:9:31:32 | [assertion failure] call to method IsTrue | Assert.cs:31:9:31:32 | [assertion failure] call to method IsTrue |
-| Assert.cs:31:9:31:32 | [assertion success] call to method IsTrue | Assert.cs:31:9:31:32 | [assertion success] call to method IsTrue |
+| Assert.cs:32:9:32:36 | ...; | Assert.cs:32:9:32:36 | ...; |
 | Assert.cs:35:10:35:11 | enter M5 | Assert.cs:35:10:35:11 | enter M5 |
 | Assert.cs:35:10:35:11 | enter M5 | Assert.cs:35:10:35:11 | exit M5 |
+| Assert.cs:35:10:35:11 | enter M5 | Assert.cs:35:10:35:11 | exit M5 (abnormal) |
 | Assert.cs:35:10:35:11 | enter M5 | Assert.cs:37:20:37:32 | ... ? ... : ... |
 | Assert.cs:35:10:35:11 | enter M5 | Assert.cs:37:24:37:27 | null |
 | Assert.cs:35:10:35:11 | enter M5 | Assert.cs:37:31:37:32 | "" |
-| Assert.cs:35:10:35:11 | enter M5 | Assert.cs:38:9:38:32 | [assertion failure] call to method IsTrue |
-| Assert.cs:35:10:35:11 | enter M5 | Assert.cs:38:9:38:32 | [assertion success] call to method IsTrue |
+| Assert.cs:35:10:35:11 | enter M5 | Assert.cs:39:9:39:36 | ...; |
 | Assert.cs:35:10:35:11 | exit M5 | Assert.cs:35:10:35:11 | exit M5 |
+| Assert.cs:35:10:35:11 | exit M5 (abnormal) | Assert.cs:35:10:35:11 | exit M5 (abnormal) |
 | Assert.cs:37:20:37:32 | ... ? ... : ... | Assert.cs:35:10:35:11 | exit M5 |
+| Assert.cs:37:20:37:32 | ... ? ... : ... | Assert.cs:35:10:35:11 | exit M5 (abnormal) |
 | Assert.cs:37:20:37:32 | ... ? ... : ... | Assert.cs:37:20:37:32 | ... ? ... : ... |
-| Assert.cs:37:20:37:32 | ... ? ... : ... | Assert.cs:38:9:38:32 | [assertion failure] call to method IsTrue |
-| Assert.cs:37:20:37:32 | ... ? ... : ... | Assert.cs:38:9:38:32 | [assertion success] call to method IsTrue |
+| Assert.cs:37:20:37:32 | ... ? ... : ... | Assert.cs:39:9:39:36 | ...; |
 | Assert.cs:37:24:37:27 | null | Assert.cs:37:24:37:27 | null |
 | Assert.cs:37:31:37:32 | "" | Assert.cs:37:31:37:32 | "" |
-| Assert.cs:38:9:38:32 | [assertion failure] call to method IsTrue | Assert.cs:38:9:38:32 | [assertion failure] call to method IsTrue |
-| Assert.cs:38:9:38:32 | [assertion success] call to method IsTrue | Assert.cs:38:9:38:32 | [assertion success] call to method IsTrue |
+| Assert.cs:39:9:39:36 | ...; | Assert.cs:39:9:39:36 | ...; |
 | Assert.cs:42:10:42:11 | enter M6 | Assert.cs:42:10:42:11 | enter M6 |
 | Assert.cs:42:10:42:11 | enter M6 | Assert.cs:42:10:42:11 | exit M6 |
+| Assert.cs:42:10:42:11 | enter M6 | Assert.cs:42:10:42:11 | exit M6 (abnormal) |
 | Assert.cs:42:10:42:11 | enter M6 | Assert.cs:44:20:44:32 | ... ? ... : ... |
 | Assert.cs:42:10:42:11 | enter M6 | Assert.cs:44:24:44:27 | null |
 | Assert.cs:42:10:42:11 | enter M6 | Assert.cs:44:31:44:32 | "" |
-| Assert.cs:42:10:42:11 | enter M6 | Assert.cs:45:9:45:33 | [assertion failure] call to method IsFalse |
-| Assert.cs:42:10:42:11 | enter M6 | Assert.cs:45:9:45:33 | [assertion success] call to method IsFalse |
+| Assert.cs:42:10:42:11 | enter M6 | Assert.cs:46:9:46:36 | ...; |
 | Assert.cs:42:10:42:11 | exit M6 | Assert.cs:42:10:42:11 | exit M6 |
+| Assert.cs:42:10:42:11 | exit M6 (abnormal) | Assert.cs:42:10:42:11 | exit M6 (abnormal) |
 | Assert.cs:44:20:44:32 | ... ? ... : ... | Assert.cs:42:10:42:11 | exit M6 |
+| Assert.cs:44:20:44:32 | ... ? ... : ... | Assert.cs:42:10:42:11 | exit M6 (abnormal) |
 | Assert.cs:44:20:44:32 | ... ? ... : ... | Assert.cs:44:20:44:32 | ... ? ... : ... |
-| Assert.cs:44:20:44:32 | ... ? ... : ... | Assert.cs:45:9:45:33 | [assertion failure] call to method IsFalse |
-| Assert.cs:44:20:44:32 | ... ? ... : ... | Assert.cs:45:9:45:33 | [assertion success] call to method IsFalse |
+| Assert.cs:44:20:44:32 | ... ? ... : ... | Assert.cs:46:9:46:36 | ...; |
 | Assert.cs:44:24:44:27 | null | Assert.cs:44:24:44:27 | null |
 | Assert.cs:44:31:44:32 | "" | Assert.cs:44:31:44:32 | "" |
-| Assert.cs:45:9:45:33 | [assertion failure] call to method IsFalse | Assert.cs:45:9:45:33 | [assertion failure] call to method IsFalse |
-| Assert.cs:45:9:45:33 | [assertion success] call to method IsFalse | Assert.cs:45:9:45:33 | [assertion success] call to method IsFalse |
+| Assert.cs:46:9:46:36 | ...; | Assert.cs:46:9:46:36 | ...; |
 | Assert.cs:49:10:49:11 | enter M7 | Assert.cs:49:10:49:11 | enter M7 |
 | Assert.cs:49:10:49:11 | enter M7 | Assert.cs:49:10:49:11 | exit M7 |
+| Assert.cs:49:10:49:11 | enter M7 | Assert.cs:49:10:49:11 | exit M7 (abnormal) |
 | Assert.cs:49:10:49:11 | enter M7 | Assert.cs:51:20:51:32 | ... ? ... : ... |
 | Assert.cs:49:10:49:11 | enter M7 | Assert.cs:51:24:51:27 | null |
 | Assert.cs:49:10:49:11 | enter M7 | Assert.cs:51:31:51:32 | "" |
-| Assert.cs:49:10:49:11 | enter M7 | Assert.cs:52:9:52:33 | [assertion failure] call to method IsFalse |
-| Assert.cs:49:10:49:11 | enter M7 | Assert.cs:52:9:52:33 | [assertion success] call to method IsFalse |
+| Assert.cs:49:10:49:11 | enter M7 | Assert.cs:53:9:53:36 | ...; |
 | Assert.cs:49:10:49:11 | exit M7 | Assert.cs:49:10:49:11 | exit M7 |
+| Assert.cs:49:10:49:11 | exit M7 (abnormal) | Assert.cs:49:10:49:11 | exit M7 (abnormal) |
 | Assert.cs:51:20:51:32 | ... ? ... : ... | Assert.cs:49:10:49:11 | exit M7 |
+| Assert.cs:51:20:51:32 | ... ? ... : ... | Assert.cs:49:10:49:11 | exit M7 (abnormal) |
 | Assert.cs:51:20:51:32 | ... ? ... : ... | Assert.cs:51:20:51:32 | ... ? ... : ... |
-| Assert.cs:51:20:51:32 | ... ? ... : ... | Assert.cs:52:9:52:33 | [assertion failure] call to method IsFalse |
-| Assert.cs:51:20:51:32 | ... ? ... : ... | Assert.cs:52:9:52:33 | [assertion success] call to method IsFalse |
+| Assert.cs:51:20:51:32 | ... ? ... : ... | Assert.cs:53:9:53:36 | ...; |
 | Assert.cs:51:24:51:27 | null | Assert.cs:51:24:51:27 | null |
 | Assert.cs:51:31:51:32 | "" | Assert.cs:51:31:51:32 | "" |
-| Assert.cs:52:9:52:33 | [assertion failure] call to method IsFalse | Assert.cs:52:9:52:33 | [assertion failure] call to method IsFalse |
-| Assert.cs:52:9:52:33 | [assertion success] call to method IsFalse | Assert.cs:52:9:52:33 | [assertion success] call to method IsFalse |
+| Assert.cs:53:9:53:36 | ...; | Assert.cs:53:9:53:36 | ...; |
 | Assert.cs:56:10:56:11 | enter M8 | Assert.cs:56:10:56:11 | enter M8 |
 | Assert.cs:56:10:56:11 | enter M8 | Assert.cs:56:10:56:11 | exit M8 |
-| Assert.cs:56:10:56:11 | enter M8 | Assert.cs:58:24:58:27 | [b (line 56): true] null |
-| Assert.cs:56:10:56:11 | enter M8 | Assert.cs:58:31:58:32 | [b (line 56): false] "" |
-| Assert.cs:56:10:56:11 | enter M8 | Assert.cs:59:9:59:37 | [assertion failure] call to method IsTrue |
-| Assert.cs:56:10:56:11 | enter M8 | Assert.cs:59:9:59:37 | [assertion success] call to method IsTrue |
-| Assert.cs:56:10:56:11 | enter M8 | Assert.cs:59:23:59:36 | [false] ... && ... |
-| Assert.cs:56:10:56:11 | enter M8 | Assert.cs:59:23:59:36 | [true] ... && ... |
-| Assert.cs:56:10:56:11 | enter M8 | Assert.cs:59:36:59:36 | [b (line 56): false] access to parameter b |
-| Assert.cs:56:10:56:11 | enter M8 | Assert.cs:59:36:59:36 | [b (line 56): true] access to parameter b |
+| Assert.cs:56:10:56:11 | enter M8 | Assert.cs:56:10:56:11 | exit M8 (abnormal) |
+| Assert.cs:56:10:56:11 | enter M8 | Assert.cs:58:20:58:32 | ... ? ... : ... |
+| Assert.cs:56:10:56:11 | enter M8 | Assert.cs:58:24:58:27 | null |
+| Assert.cs:56:10:56:11 | enter M8 | Assert.cs:58:31:58:32 | "" |
+| Assert.cs:56:10:56:11 | enter M8 | Assert.cs:59:23:59:36 | ... && ... |
+| Assert.cs:56:10:56:11 | enter M8 | Assert.cs:59:36:59:36 | access to parameter b |
+| Assert.cs:56:10:56:11 | enter M8 | Assert.cs:60:9:60:36 | ...; |
 | Assert.cs:56:10:56:11 | exit M8 | Assert.cs:56:10:56:11 | exit M8 |
-| Assert.cs:58:24:58:27 | [b (line 56): true] null | Assert.cs:58:24:58:27 | [b (line 56): true] null |
-| Assert.cs:58:24:58:27 | [b (line 56): true] null | Assert.cs:59:9:59:37 | [assertion success] call to method IsTrue |
-| Assert.cs:58:24:58:27 | [b (line 56): true] null | Assert.cs:59:23:59:36 | [true] ... && ... |
-| Assert.cs:58:24:58:27 | [b (line 56): true] null | Assert.cs:59:36:59:36 | [b (line 56): true] access to parameter b |
-| Assert.cs:58:31:58:32 | [b (line 56): false] "" | Assert.cs:58:31:58:32 | [b (line 56): false] "" |
-| Assert.cs:58:31:58:32 | [b (line 56): false] "" | Assert.cs:59:36:59:36 | [b (line 56): false] access to parameter b |
-| Assert.cs:59:9:59:37 | [assertion failure] call to method IsTrue | Assert.cs:59:9:59:37 | [assertion failure] call to method IsTrue |
-| Assert.cs:59:9:59:37 | [assertion success] call to method IsTrue | Assert.cs:59:9:59:37 | [assertion success] call to method IsTrue |
-| Assert.cs:59:23:59:36 | [false] ... && ... | Assert.cs:59:9:59:37 | [assertion failure] call to method IsTrue |
-| Assert.cs:59:23:59:36 | [false] ... && ... | Assert.cs:59:23:59:36 | [false] ... && ... |
-| Assert.cs:59:23:59:36 | [true] ... && ... | Assert.cs:59:9:59:37 | [assertion success] call to method IsTrue |
-| Assert.cs:59:23:59:36 | [true] ... && ... | Assert.cs:59:23:59:36 | [true] ... && ... |
-| Assert.cs:59:36:59:36 | [b (line 56): false] access to parameter b | Assert.cs:59:36:59:36 | [b (line 56): false] access to parameter b |
-| Assert.cs:59:36:59:36 | [b (line 56): true] access to parameter b | Assert.cs:59:9:59:37 | [assertion success] call to method IsTrue |
-| Assert.cs:59:36:59:36 | [b (line 56): true] access to parameter b | Assert.cs:59:23:59:36 | [true] ... && ... |
-| Assert.cs:59:36:59:36 | [b (line 56): true] access to parameter b | Assert.cs:59:36:59:36 | [b (line 56): true] access to parameter b |
+| Assert.cs:56:10:56:11 | exit M8 (abnormal) | Assert.cs:56:10:56:11 | exit M8 (abnormal) |
+| Assert.cs:58:20:58:32 | ... ? ... : ... | Assert.cs:56:10:56:11 | exit M8 |
+| Assert.cs:58:20:58:32 | ... ? ... : ... | Assert.cs:56:10:56:11 | exit M8 (abnormal) |
+| Assert.cs:58:20:58:32 | ... ? ... : ... | Assert.cs:58:20:58:32 | ... ? ... : ... |
+| Assert.cs:58:20:58:32 | ... ? ... : ... | Assert.cs:59:23:59:36 | ... && ... |
+| Assert.cs:58:20:58:32 | ... ? ... : ... | Assert.cs:59:36:59:36 | access to parameter b |
+| Assert.cs:58:20:58:32 | ... ? ... : ... | Assert.cs:60:9:60:36 | ...; |
+| Assert.cs:58:24:58:27 | null | Assert.cs:58:24:58:27 | null |
+| Assert.cs:58:31:58:32 | "" | Assert.cs:58:31:58:32 | "" |
+| Assert.cs:59:23:59:36 | ... && ... | Assert.cs:56:10:56:11 | exit M8 |
+| Assert.cs:59:23:59:36 | ... && ... | Assert.cs:56:10:56:11 | exit M8 (abnormal) |
+| Assert.cs:59:23:59:36 | ... && ... | Assert.cs:59:23:59:36 | ... && ... |
+| Assert.cs:59:23:59:36 | ... && ... | Assert.cs:60:9:60:36 | ...; |
+| Assert.cs:59:36:59:36 | access to parameter b | Assert.cs:59:36:59:36 | access to parameter b |
+| Assert.cs:60:9:60:36 | ...; | Assert.cs:60:9:60:36 | ...; |
 | Assert.cs:63:10:63:11 | enter M9 | Assert.cs:63:10:63:11 | enter M9 |
 | Assert.cs:63:10:63:11 | enter M9 | Assert.cs:63:10:63:11 | exit M9 |
-| Assert.cs:63:10:63:11 | enter M9 | Assert.cs:65:24:65:27 | [b (line 63): true] null |
-| Assert.cs:63:10:63:11 | enter M9 | Assert.cs:65:31:65:32 | [b (line 63): false] "" |
-| Assert.cs:63:10:63:11 | enter M9 | Assert.cs:66:9:66:38 | [assertion failure] call to method IsFalse |
-| Assert.cs:63:10:63:11 | enter M9 | Assert.cs:66:9:66:38 | [assertion success] call to method IsFalse |
-| Assert.cs:63:10:63:11 | enter M9 | Assert.cs:66:24:66:37 | [false] ... \|\| ... |
-| Assert.cs:63:10:63:11 | enter M9 | Assert.cs:66:24:66:37 | [true] ... \|\| ... |
-| Assert.cs:63:10:63:11 | enter M9 | Assert.cs:66:37:66:37 | [b (line 63): false] access to parameter b |
-| Assert.cs:63:10:63:11 | enter M9 | Assert.cs:66:37:66:37 | [b (line 63): true] access to parameter b |
+| Assert.cs:63:10:63:11 | enter M9 | Assert.cs:63:10:63:11 | exit M9 (abnormal) |
+| Assert.cs:63:10:63:11 | enter M9 | Assert.cs:65:20:65:32 | ... ? ... : ... |
+| Assert.cs:63:10:63:11 | enter M9 | Assert.cs:65:24:65:27 | null |
+| Assert.cs:63:10:63:11 | enter M9 | Assert.cs:65:31:65:32 | "" |
+| Assert.cs:63:10:63:11 | enter M9 | Assert.cs:66:24:66:37 | ... \|\| ... |
+| Assert.cs:63:10:63:11 | enter M9 | Assert.cs:66:37:66:37 | access to parameter b |
+| Assert.cs:63:10:63:11 | enter M9 | Assert.cs:67:9:67:36 | ...; |
 | Assert.cs:63:10:63:11 | exit M9 | Assert.cs:63:10:63:11 | exit M9 |
-| Assert.cs:65:24:65:27 | [b (line 63): true] null | Assert.cs:65:24:65:27 | [b (line 63): true] null |
-| Assert.cs:65:24:65:27 | [b (line 63): true] null | Assert.cs:66:37:66:37 | [b (line 63): true] access to parameter b |
-| Assert.cs:65:31:65:32 | [b (line 63): false] "" | Assert.cs:65:31:65:32 | [b (line 63): false] "" |
-| Assert.cs:65:31:65:32 | [b (line 63): false] "" | Assert.cs:66:9:66:38 | [assertion success] call to method IsFalse |
-| Assert.cs:65:31:65:32 | [b (line 63): false] "" | Assert.cs:66:24:66:37 | [false] ... \|\| ... |
-| Assert.cs:65:31:65:32 | [b (line 63): false] "" | Assert.cs:66:37:66:37 | [b (line 63): false] access to parameter b |
-| Assert.cs:66:9:66:38 | [assertion failure] call to method IsFalse | Assert.cs:66:9:66:38 | [assertion failure] call to method IsFalse |
-| Assert.cs:66:9:66:38 | [assertion success] call to method IsFalse | Assert.cs:66:9:66:38 | [assertion success] call to method IsFalse |
-| Assert.cs:66:24:66:37 | [false] ... \|\| ... | Assert.cs:66:9:66:38 | [assertion success] call to method IsFalse |
-| Assert.cs:66:24:66:37 | [false] ... \|\| ... | Assert.cs:66:24:66:37 | [false] ... \|\| ... |
-| Assert.cs:66:24:66:37 | [true] ... \|\| ... | Assert.cs:66:9:66:38 | [assertion failure] call to method IsFalse |
-| Assert.cs:66:24:66:37 | [true] ... \|\| ... | Assert.cs:66:24:66:37 | [true] ... \|\| ... |
-| Assert.cs:66:37:66:37 | [b (line 63): false] access to parameter b | Assert.cs:66:9:66:38 | [assertion success] call to method IsFalse |
-| Assert.cs:66:37:66:37 | [b (line 63): false] access to parameter b | Assert.cs:66:24:66:37 | [false] ... \|\| ... |
-| Assert.cs:66:37:66:37 | [b (line 63): false] access to parameter b | Assert.cs:66:37:66:37 | [b (line 63): false] access to parameter b |
-| Assert.cs:66:37:66:37 | [b (line 63): true] access to parameter b | Assert.cs:66:37:66:37 | [b (line 63): true] access to parameter b |
+| Assert.cs:63:10:63:11 | exit M9 (abnormal) | Assert.cs:63:10:63:11 | exit M9 (abnormal) |
+| Assert.cs:65:20:65:32 | ... ? ... : ... | Assert.cs:63:10:63:11 | exit M9 |
+| Assert.cs:65:20:65:32 | ... ? ... : ... | Assert.cs:63:10:63:11 | exit M9 (abnormal) |
+| Assert.cs:65:20:65:32 | ... ? ... : ... | Assert.cs:65:20:65:32 | ... ? ... : ... |
+| Assert.cs:65:20:65:32 | ... ? ... : ... | Assert.cs:66:24:66:37 | ... \|\| ... |
+| Assert.cs:65:20:65:32 | ... ? ... : ... | Assert.cs:66:37:66:37 | access to parameter b |
+| Assert.cs:65:20:65:32 | ... ? ... : ... | Assert.cs:67:9:67:36 | ...; |
+| Assert.cs:65:24:65:27 | null | Assert.cs:65:24:65:27 | null |
+| Assert.cs:65:31:65:32 | "" | Assert.cs:65:31:65:32 | "" |
+| Assert.cs:66:24:66:37 | ... \|\| ... | Assert.cs:63:10:63:11 | exit M9 |
+| Assert.cs:66:24:66:37 | ... \|\| ... | Assert.cs:63:10:63:11 | exit M9 (abnormal) |
+| Assert.cs:66:24:66:37 | ... \|\| ... | Assert.cs:66:24:66:37 | ... \|\| ... |
+| Assert.cs:66:24:66:37 | ... \|\| ... | Assert.cs:67:9:67:36 | ...; |
+| Assert.cs:66:37:66:37 | access to parameter b | Assert.cs:66:37:66:37 | access to parameter b |
+| Assert.cs:67:9:67:36 | ...; | Assert.cs:67:9:67:36 | ...; |
 | Assert.cs:70:10:70:12 | enter M10 | Assert.cs:70:10:70:12 | enter M10 |
 | Assert.cs:70:10:70:12 | enter M10 | Assert.cs:70:10:70:12 | exit M10 |
-| Assert.cs:70:10:70:12 | enter M10 | Assert.cs:72:24:72:27 | [b (line 70): true] null |
-| Assert.cs:70:10:70:12 | enter M10 | Assert.cs:72:31:72:32 | [b (line 70): false] "" |
-| Assert.cs:70:10:70:12 | enter M10 | Assert.cs:73:9:73:37 | [assertion failure] call to method IsTrue |
-| Assert.cs:70:10:70:12 | enter M10 | Assert.cs:73:9:73:37 | [assertion success] call to method IsTrue |
-| Assert.cs:70:10:70:12 | enter M10 | Assert.cs:73:23:73:36 | [false] ... && ... |
-| Assert.cs:70:10:70:12 | enter M10 | Assert.cs:73:23:73:36 | [true] ... && ... |
-| Assert.cs:70:10:70:12 | enter M10 | Assert.cs:73:36:73:36 | [b (line 70): false] access to parameter b |
-| Assert.cs:70:10:70:12 | enter M10 | Assert.cs:73:36:73:36 | [b (line 70): true] access to parameter b |
+| Assert.cs:70:10:70:12 | enter M10 | Assert.cs:70:10:70:12 | exit M10 (abnormal) |
+| Assert.cs:70:10:70:12 | enter M10 | Assert.cs:72:20:72:32 | ... ? ... : ... |
+| Assert.cs:70:10:70:12 | enter M10 | Assert.cs:72:24:72:27 | null |
+| Assert.cs:70:10:70:12 | enter M10 | Assert.cs:72:31:72:32 | "" |
+| Assert.cs:70:10:70:12 | enter M10 | Assert.cs:73:23:73:36 | ... && ... |
+| Assert.cs:70:10:70:12 | enter M10 | Assert.cs:73:36:73:36 | access to parameter b |
+| Assert.cs:70:10:70:12 | enter M10 | Assert.cs:74:9:74:36 | ...; |
 | Assert.cs:70:10:70:12 | exit M10 | Assert.cs:70:10:70:12 | exit M10 |
-| Assert.cs:72:24:72:27 | [b (line 70): true] null | Assert.cs:72:24:72:27 | [b (line 70): true] null |
-| Assert.cs:72:24:72:27 | [b (line 70): true] null | Assert.cs:73:9:73:37 | [assertion success] call to method IsTrue |
-| Assert.cs:72:24:72:27 | [b (line 70): true] null | Assert.cs:73:23:73:36 | [true] ... && ... |
-| Assert.cs:72:24:72:27 | [b (line 70): true] null | Assert.cs:73:36:73:36 | [b (line 70): true] access to parameter b |
-| Assert.cs:72:31:72:32 | [b (line 70): false] "" | Assert.cs:72:31:72:32 | [b (line 70): false] "" |
-| Assert.cs:72:31:72:32 | [b (line 70): false] "" | Assert.cs:73:36:73:36 | [b (line 70): false] access to parameter b |
-| Assert.cs:73:9:73:37 | [assertion failure] call to method IsTrue | Assert.cs:73:9:73:37 | [assertion failure] call to method IsTrue |
-| Assert.cs:73:9:73:37 | [assertion success] call to method IsTrue | Assert.cs:73:9:73:37 | [assertion success] call to method IsTrue |
-| Assert.cs:73:23:73:36 | [false] ... && ... | Assert.cs:73:9:73:37 | [assertion failure] call to method IsTrue |
-| Assert.cs:73:23:73:36 | [false] ... && ... | Assert.cs:73:23:73:36 | [false] ... && ... |
-| Assert.cs:73:23:73:36 | [true] ... && ... | Assert.cs:73:9:73:37 | [assertion success] call to method IsTrue |
-| Assert.cs:73:23:73:36 | [true] ... && ... | Assert.cs:73:23:73:36 | [true] ... && ... |
-| Assert.cs:73:36:73:36 | [b (line 70): false] access to parameter b | Assert.cs:73:36:73:36 | [b (line 70): false] access to parameter b |
-| Assert.cs:73:36:73:36 | [b (line 70): true] access to parameter b | Assert.cs:73:9:73:37 | [assertion success] call to method IsTrue |
-| Assert.cs:73:36:73:36 | [b (line 70): true] access to parameter b | Assert.cs:73:23:73:36 | [true] ... && ... |
-| Assert.cs:73:36:73:36 | [b (line 70): true] access to parameter b | Assert.cs:73:36:73:36 | [b (line 70): true] access to parameter b |
+| Assert.cs:70:10:70:12 | exit M10 (abnormal) | Assert.cs:70:10:70:12 | exit M10 (abnormal) |
+| Assert.cs:72:20:72:32 | ... ? ... : ... | Assert.cs:70:10:70:12 | exit M10 |
+| Assert.cs:72:20:72:32 | ... ? ... : ... | Assert.cs:70:10:70:12 | exit M10 (abnormal) |
+| Assert.cs:72:20:72:32 | ... ? ... : ... | Assert.cs:72:20:72:32 | ... ? ... : ... |
+| Assert.cs:72:20:72:32 | ... ? ... : ... | Assert.cs:73:23:73:36 | ... && ... |
+| Assert.cs:72:20:72:32 | ... ? ... : ... | Assert.cs:73:36:73:36 | access to parameter b |
+| Assert.cs:72:20:72:32 | ... ? ... : ... | Assert.cs:74:9:74:36 | ...; |
+| Assert.cs:72:24:72:27 | null | Assert.cs:72:24:72:27 | null |
+| Assert.cs:72:31:72:32 | "" | Assert.cs:72:31:72:32 | "" |
+| Assert.cs:73:23:73:36 | ... && ... | Assert.cs:70:10:70:12 | exit M10 |
+| Assert.cs:73:23:73:36 | ... && ... | Assert.cs:70:10:70:12 | exit M10 (abnormal) |
+| Assert.cs:73:23:73:36 | ... && ... | Assert.cs:73:23:73:36 | ... && ... |
+| Assert.cs:73:23:73:36 | ... && ... | Assert.cs:74:9:74:36 | ...; |
+| Assert.cs:73:36:73:36 | access to parameter b | Assert.cs:73:36:73:36 | access to parameter b |
+| Assert.cs:74:9:74:36 | ...; | Assert.cs:74:9:74:36 | ...; |
 | Assert.cs:77:10:77:12 | enter M11 | Assert.cs:77:10:77:12 | enter M11 |
 | Assert.cs:77:10:77:12 | enter M11 | Assert.cs:77:10:77:12 | exit M11 |
-| Assert.cs:77:10:77:12 | enter M11 | Assert.cs:79:24:79:27 | [b (line 77): true] null |
-| Assert.cs:77:10:77:12 | enter M11 | Assert.cs:79:31:79:32 | [b (line 77): false] "" |
-| Assert.cs:77:10:77:12 | enter M11 | Assert.cs:80:9:80:38 | [assertion failure] call to method IsFalse |
-| Assert.cs:77:10:77:12 | enter M11 | Assert.cs:80:9:80:38 | [assertion success] call to method IsFalse |
-| Assert.cs:77:10:77:12 | enter M11 | Assert.cs:80:24:80:37 | [false] ... \|\| ... |
-| Assert.cs:77:10:77:12 | enter M11 | Assert.cs:80:24:80:37 | [true] ... \|\| ... |
-| Assert.cs:77:10:77:12 | enter M11 | Assert.cs:80:37:80:37 | [b (line 77): false] access to parameter b |
-| Assert.cs:77:10:77:12 | enter M11 | Assert.cs:80:37:80:37 | [b (line 77): true] access to parameter b |
+| Assert.cs:77:10:77:12 | enter M11 | Assert.cs:77:10:77:12 | exit M11 (abnormal) |
+| Assert.cs:77:10:77:12 | enter M11 | Assert.cs:79:20:79:32 | ... ? ... : ... |
+| Assert.cs:77:10:77:12 | enter M11 | Assert.cs:79:24:79:27 | null |
+| Assert.cs:77:10:77:12 | enter M11 | Assert.cs:79:31:79:32 | "" |
+| Assert.cs:77:10:77:12 | enter M11 | Assert.cs:80:24:80:37 | ... \|\| ... |
+| Assert.cs:77:10:77:12 | enter M11 | Assert.cs:80:37:80:37 | access to parameter b |
+| Assert.cs:77:10:77:12 | enter M11 | Assert.cs:81:9:81:36 | ...; |
 | Assert.cs:77:10:77:12 | exit M11 | Assert.cs:77:10:77:12 | exit M11 |
-| Assert.cs:79:24:79:27 | [b (line 77): true] null | Assert.cs:79:24:79:27 | [b (line 77): true] null |
-| Assert.cs:79:24:79:27 | [b (line 77): true] null | Assert.cs:80:37:80:37 | [b (line 77): true] access to parameter b |
-| Assert.cs:79:31:79:32 | [b (line 77): false] "" | Assert.cs:79:31:79:32 | [b (line 77): false] "" |
-| Assert.cs:79:31:79:32 | [b (line 77): false] "" | Assert.cs:80:9:80:38 | [assertion success] call to method IsFalse |
-| Assert.cs:79:31:79:32 | [b (line 77): false] "" | Assert.cs:80:24:80:37 | [false] ... \|\| ... |
-| Assert.cs:79:31:79:32 | [b (line 77): false] "" | Assert.cs:80:37:80:37 | [b (line 77): false] access to parameter b |
-| Assert.cs:80:9:80:38 | [assertion failure] call to method IsFalse | Assert.cs:80:9:80:38 | [assertion failure] call to method IsFalse |
-| Assert.cs:80:9:80:38 | [assertion success] call to method IsFalse | Assert.cs:80:9:80:38 | [assertion success] call to method IsFalse |
-| Assert.cs:80:24:80:37 | [false] ... \|\| ... | Assert.cs:80:9:80:38 | [assertion success] call to method IsFalse |
-| Assert.cs:80:24:80:37 | [false] ... \|\| ... | Assert.cs:80:24:80:37 | [false] ... \|\| ... |
-| Assert.cs:80:24:80:37 | [true] ... \|\| ... | Assert.cs:80:9:80:38 | [assertion failure] call to method IsFalse |
-| Assert.cs:80:24:80:37 | [true] ... \|\| ... | Assert.cs:80:24:80:37 | [true] ... \|\| ... |
-| Assert.cs:80:37:80:37 | [b (line 77): false] access to parameter b | Assert.cs:80:9:80:38 | [assertion success] call to method IsFalse |
-| Assert.cs:80:37:80:37 | [b (line 77): false] access to parameter b | Assert.cs:80:24:80:37 | [false] ... \|\| ... |
-| Assert.cs:80:37:80:37 | [b (line 77): false] access to parameter b | Assert.cs:80:37:80:37 | [b (line 77): false] access to parameter b |
-| Assert.cs:80:37:80:37 | [b (line 77): true] access to parameter b | Assert.cs:80:37:80:37 | [b (line 77): true] access to parameter b |
+| Assert.cs:77:10:77:12 | exit M11 (abnormal) | Assert.cs:77:10:77:12 | exit M11 (abnormal) |
+| Assert.cs:79:20:79:32 | ... ? ... : ... | Assert.cs:77:10:77:12 | exit M11 |
+| Assert.cs:79:20:79:32 | ... ? ... : ... | Assert.cs:77:10:77:12 | exit M11 (abnormal) |
+| Assert.cs:79:20:79:32 | ... ? ... : ... | Assert.cs:79:20:79:32 | ... ? ... : ... |
+| Assert.cs:79:20:79:32 | ... ? ... : ... | Assert.cs:80:24:80:37 | ... \|\| ... |
+| Assert.cs:79:20:79:32 | ... ? ... : ... | Assert.cs:80:37:80:37 | access to parameter b |
+| Assert.cs:79:20:79:32 | ... ? ... : ... | Assert.cs:81:9:81:36 | ...; |
+| Assert.cs:79:24:79:27 | null | Assert.cs:79:24:79:27 | null |
+| Assert.cs:79:31:79:32 | "" | Assert.cs:79:31:79:32 | "" |
+| Assert.cs:80:24:80:37 | ... \|\| ... | Assert.cs:77:10:77:12 | exit M11 |
+| Assert.cs:80:24:80:37 | ... \|\| ... | Assert.cs:77:10:77:12 | exit M11 (abnormal) |
+| Assert.cs:80:24:80:37 | ... \|\| ... | Assert.cs:80:24:80:37 | ... \|\| ... |
+| Assert.cs:80:24:80:37 | ... \|\| ... | Assert.cs:81:9:81:36 | ...; |
+| Assert.cs:80:37:80:37 | access to parameter b | Assert.cs:80:37:80:37 | access to parameter b |
+| Assert.cs:81:9:81:36 | ...; | Assert.cs:81:9:81:36 | ...; |
 | Assert.cs:84:10:84:12 | enter M12 | Assert.cs:84:10:84:12 | enter M12 |
 | Assert.cs:84:10:84:12 | enter M12 | Assert.cs:84:10:84:12 | exit M12 |
 | Assert.cs:84:10:84:12 | enter M12 | Assert.cs:84:10:84:12 | exit M12 (abnormal) |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:86:24:86:27 | [b (line 84): true] null |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:86:31:86:32 | [b (line 84): false] "" |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:87:9:87:31 | [assertion failure, b (line 84): false] call to method Assert |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:87:9:87:31 | [assertion failure, b (line 84): true] call to method Assert |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:90:17:90:20 | [b (line 84): true] null |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:90:24:90:25 | [b (line 84): false] "" |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:91:9:91:24 | [assertion failure, b (line 84): false] call to method IsNull |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:91:9:91:24 | [assertion failure, b (line 84): true] call to method IsNull |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:94:17:94:20 | [b (line 84): true] null |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:94:24:94:25 | [b (line 84): false] "" |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:95:9:95:27 | [assertion failure, b (line 84): false] call to method IsNotNull |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:95:9:95:27 | [assertion failure, b (line 84): true] call to method IsNotNull |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:98:17:98:20 | [b (line 84): true] null |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:98:24:98:25 | [b (line 84): false] "" |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:99:9:99:32 | [assertion failure, b (line 84): false] call to method IsTrue |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:99:9:99:32 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:102:17:102:20 | [b (line 84): true] null |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:102:24:102:25 | [b (line 84): false] "" |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:103:9:103:32 | [assertion failure, b (line 84): false] call to method IsTrue |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:103:9:103:32 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:106:17:106:20 | [b (line 84): true] null |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:106:24:106:25 | [b (line 84): false] "" |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): false] call to method IsFalse |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:107:9:107:33 | [assertion success, b (line 84): false] call to method IsFalse |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:110:17:110:20 | [b (line 84): true] null |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:110:24:110:25 | [b (line 84): false] "" |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): false] call to method IsFalse |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:111:9:111:33 | [assertion success, b (line 84): false] call to method IsFalse |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:114:17:114:20 | [b (line 84): true] null |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:114:24:114:25 | [b (line 84): false] "" |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): false] call to method IsTrue |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:115:23:115:36 | [false, b (line 84): false] ... && ... |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:115:23:115:36 | [false, b (line 84): true] ... && ... |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:115:36:115:36 | [b (line 84): false] access to parameter b |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:118:17:118:20 | [b (line 84): true] null |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:122:17:122:20 | [b (line 84): true] null |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:126:17:126:20 | [b (line 84): true] null |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:127:24:127:38 | [false] ... \|\| ... |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:127:24:127:38 | [true] ... \|\| ... |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:127:37:127:38 | [false] !... |
-| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b |
+| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:86:20:86:32 | ... ? ... : ... |
+| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:86:24:86:27 | null |
+| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:86:31:86:32 | "" |
+| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:88:9:88:36 | ...; |
+| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:90:13:90:25 | ... ? ... : ... |
+| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:90:17:90:20 | null |
+| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:90:24:90:25 | "" |
+| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:92:9:92:36 | ...; |
+| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:94:13:94:25 | ... ? ... : ... |
+| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:94:17:94:20 | null |
+| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:94:24:94:25 | "" |
+| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:96:9:96:36 | ...; |
+| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:98:13:98:25 | ... ? ... : ... |
+| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:98:17:98:20 | null |
+| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:98:24:98:25 | "" |
+| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:100:9:100:36 | ...; |
+| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:102:13:102:25 | ... ? ... : ... |
+| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:102:17:102:20 | null |
+| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:102:24:102:25 | "" |
+| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:104:9:104:36 | ...; |
+| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:106:13:106:25 | ... ? ... : ... |
+| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:106:17:106:20 | null |
+| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:106:24:106:25 | "" |
+| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:108:9:108:36 | ...; |
+| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:110:13:110:25 | ... ? ... : ... |
+| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:110:17:110:20 | null |
+| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:110:24:110:25 | "" |
+| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:112:9:112:36 | ...; |
+| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:114:13:114:25 | ... ? ... : ... |
+| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:114:17:114:20 | null |
+| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:114:24:114:25 | "" |
+| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:115:23:115:36 | ... && ... |
+| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:115:36:115:36 | access to parameter b |
+| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:116:9:116:36 | ...; |
+| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:118:13:118:25 | ... ? ... : ... |
+| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:118:17:118:20 | null |
+| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:118:24:118:25 | "" |
+| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:119:24:119:38 | ... \|\| ... |
+| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:119:38:119:38 | access to parameter b |
+| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:120:9:120:36 | ...; |
+| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:122:13:122:25 | ... ? ... : ... |
+| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:122:17:122:20 | null |
+| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:122:24:122:25 | "" |
+| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:123:23:123:36 | ... && ... |
+| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:123:36:123:36 | access to parameter b |
+| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:124:9:124:36 | ...; |
+| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:126:13:126:25 | ... ? ... : ... |
+| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:126:17:126:20 | null |
+| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:126:24:126:25 | "" |
+| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:127:24:127:38 | ... \|\| ... |
+| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:127:38:127:38 | access to parameter b |
+| Assert.cs:84:10:84:12 | enter M12 | Assert.cs:128:9:128:36 | ...; |
 | Assert.cs:84:10:84:12 | exit M12 | Assert.cs:84:10:84:12 | exit M12 |
 | Assert.cs:84:10:84:12 | exit M12 (abnormal) | Assert.cs:84:10:84:12 | exit M12 (abnormal) |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:86:24:86:27 | [b (line 84): true] null |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:87:9:87:31 | [assertion failure, b (line 84): true] call to method Assert |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:90:17:90:20 | [b (line 84): true] null |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:91:9:91:24 | [assertion failure, b (line 84): true] call to method IsNull |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:94:17:94:20 | [b (line 84): true] null |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:95:9:95:27 | [assertion failure, b (line 84): true] call to method IsNotNull |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:98:17:98:20 | [b (line 84): true] null |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:99:9:99:32 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:102:17:102:20 | [b (line 84): true] null |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:103:9:103:32 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:106:17:106:20 | [b (line 84): true] null |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:110:17:110:20 | [b (line 84): true] null |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:114:17:114:20 | [b (line 84): true] null |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:115:23:115:36 | [false, b (line 84): true] ... && ... |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:118:17:118:20 | [b (line 84): true] null |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:122:17:122:20 | [b (line 84): true] null |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:126:17:126:20 | [b (line 84): true] null |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:127:24:127:38 | [false] ... \|\| ... |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:127:24:127:38 | [true] ... \|\| ... |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:127:37:127:38 | [false] !... |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:86:31:86:32 | [b (line 84): false] "" |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:87:9:87:31 | [assertion failure, b (line 84): false] call to method Assert |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:90:24:90:25 | [b (line 84): false] "" |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:91:9:91:24 | [assertion failure, b (line 84): false] call to method IsNull |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:94:24:94:25 | [b (line 84): false] "" |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:95:9:95:27 | [assertion failure, b (line 84): false] call to method IsNotNull |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:98:24:98:25 | [b (line 84): false] "" |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:99:9:99:32 | [assertion failure, b (line 84): false] call to method IsTrue |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:102:24:102:25 | [b (line 84): false] "" |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:103:9:103:32 | [assertion failure, b (line 84): false] call to method IsTrue |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:106:24:106:25 | [b (line 84): false] "" |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): false] call to method IsFalse |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:107:9:107:33 | [assertion success, b (line 84): false] call to method IsFalse |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:110:24:110:25 | [b (line 84): false] "" |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): false] call to method IsFalse |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:111:9:111:33 | [assertion success, b (line 84): false] call to method IsFalse |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:114:24:114:25 | [b (line 84): false] "" |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): false] call to method IsTrue |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:115:23:115:36 | [false, b (line 84): false] ... && ... |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:115:36:115:36 | [b (line 84): false] access to parameter b |
-| Assert.cs:87:9:87:31 | [assertion failure, b (line 84): false] call to method Assert | Assert.cs:87:9:87:31 | [assertion failure, b (line 84): false] call to method Assert |
-| Assert.cs:87:9:87:31 | [assertion failure, b (line 84): true] call to method Assert | Assert.cs:87:9:87:31 | [assertion failure, b (line 84): true] call to method Assert |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | Assert.cs:90:24:90:25 | [b (line 84): false] "" |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | Assert.cs:91:9:91:24 | [assertion failure, b (line 84): false] call to method IsNull |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | Assert.cs:94:24:94:25 | [b (line 84): false] "" |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | Assert.cs:95:9:95:27 | [assertion failure, b (line 84): false] call to method IsNotNull |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | Assert.cs:98:24:98:25 | [b (line 84): false] "" |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | Assert.cs:99:9:99:32 | [assertion failure, b (line 84): false] call to method IsTrue |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | Assert.cs:102:24:102:25 | [b (line 84): false] "" |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | Assert.cs:103:9:103:32 | [assertion failure, b (line 84): false] call to method IsTrue |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | Assert.cs:106:24:106:25 | [b (line 84): false] "" |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): false] call to method IsFalse |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | Assert.cs:107:9:107:33 | [assertion success, b (line 84): false] call to method IsFalse |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | Assert.cs:110:24:110:25 | [b (line 84): false] "" |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): false] call to method IsFalse |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | Assert.cs:111:9:111:33 | [assertion success, b (line 84): false] call to method IsFalse |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | Assert.cs:114:24:114:25 | [b (line 84): false] "" |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): false] call to method IsTrue |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | Assert.cs:115:23:115:36 | [false, b (line 84): false] ... && ... |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | Assert.cs:115:36:115:36 | [b (line 84): false] access to parameter b |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:90:17:90:20 | [b (line 84): true] null |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:91:9:91:24 | [assertion failure, b (line 84): true] call to method IsNull |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:94:17:94:20 | [b (line 84): true] null |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:95:9:95:27 | [assertion failure, b (line 84): true] call to method IsNotNull |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:98:17:98:20 | [b (line 84): true] null |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:99:9:99:32 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:102:17:102:20 | [b (line 84): true] null |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:103:9:103:32 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:106:17:106:20 | [b (line 84): true] null |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:110:17:110:20 | [b (line 84): true] null |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:114:17:114:20 | [b (line 84): true] null |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:115:23:115:36 | [false, b (line 84): true] ... && ... |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:118:17:118:20 | [b (line 84): true] null |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:122:17:122:20 | [b (line 84): true] null |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:126:17:126:20 | [b (line 84): true] null |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:127:24:127:38 | [false] ... \|\| ... |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:127:24:127:38 | [true] ... \|\| ... |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:127:37:127:38 | [false] !... |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:90:17:90:20 | [b (line 84): true] null |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:91:9:91:24 | [assertion failure, b (line 84): true] call to method IsNull |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:94:17:94:20 | [b (line 84): true] null |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:95:9:95:27 | [assertion failure, b (line 84): true] call to method IsNotNull |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:98:17:98:20 | [b (line 84): true] null |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:99:9:99:32 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:102:17:102:20 | [b (line 84): true] null |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:103:9:103:32 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:106:17:106:20 | [b (line 84): true] null |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:110:17:110:20 | [b (line 84): true] null |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:114:17:114:20 | [b (line 84): true] null |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:115:23:115:36 | [false, b (line 84): true] ... && ... |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:118:17:118:20 | [b (line 84): true] null |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:122:17:122:20 | [b (line 84): true] null |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:126:17:126:20 | [b (line 84): true] null |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:127:24:127:38 | [false] ... \|\| ... |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:127:24:127:38 | [true] ... \|\| ... |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:127:37:127:38 | [false] !... |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:90:24:90:25 | [b (line 84): false] "" | Assert.cs:90:24:90:25 | [b (line 84): false] "" |
-| Assert.cs:90:24:90:25 | [b (line 84): false] "" | Assert.cs:91:9:91:24 | [assertion failure, b (line 84): false] call to method IsNull |
-| Assert.cs:90:24:90:25 | [b (line 84): false] "" | Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull |
-| Assert.cs:90:24:90:25 | [b (line 84): false] "" | Assert.cs:94:24:94:25 | [b (line 84): false] "" |
-| Assert.cs:90:24:90:25 | [b (line 84): false] "" | Assert.cs:95:9:95:27 | [assertion failure, b (line 84): false] call to method IsNotNull |
-| Assert.cs:90:24:90:25 | [b (line 84): false] "" | Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull |
-| Assert.cs:90:24:90:25 | [b (line 84): false] "" | Assert.cs:98:24:98:25 | [b (line 84): false] "" |
-| Assert.cs:90:24:90:25 | [b (line 84): false] "" | Assert.cs:99:9:99:32 | [assertion failure, b (line 84): false] call to method IsTrue |
-| Assert.cs:90:24:90:25 | [b (line 84): false] "" | Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue |
-| Assert.cs:90:24:90:25 | [b (line 84): false] "" | Assert.cs:102:24:102:25 | [b (line 84): false] "" |
-| Assert.cs:90:24:90:25 | [b (line 84): false] "" | Assert.cs:103:9:103:32 | [assertion failure, b (line 84): false] call to method IsTrue |
-| Assert.cs:90:24:90:25 | [b (line 84): false] "" | Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue |
-| Assert.cs:90:24:90:25 | [b (line 84): false] "" | Assert.cs:106:24:106:25 | [b (line 84): false] "" |
-| Assert.cs:90:24:90:25 | [b (line 84): false] "" | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): false] call to method IsFalse |
-| Assert.cs:90:24:90:25 | [b (line 84): false] "" | Assert.cs:107:9:107:33 | [assertion success, b (line 84): false] call to method IsFalse |
-| Assert.cs:90:24:90:25 | [b (line 84): false] "" | Assert.cs:110:24:110:25 | [b (line 84): false] "" |
-| Assert.cs:90:24:90:25 | [b (line 84): false] "" | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): false] call to method IsFalse |
-| Assert.cs:90:24:90:25 | [b (line 84): false] "" | Assert.cs:111:9:111:33 | [assertion success, b (line 84): false] call to method IsFalse |
-| Assert.cs:90:24:90:25 | [b (line 84): false] "" | Assert.cs:114:24:114:25 | [b (line 84): false] "" |
-| Assert.cs:90:24:90:25 | [b (line 84): false] "" | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): false] call to method IsTrue |
-| Assert.cs:90:24:90:25 | [b (line 84): false] "" | Assert.cs:115:23:115:36 | [false, b (line 84): false] ... && ... |
-| Assert.cs:90:24:90:25 | [b (line 84): false] "" | Assert.cs:115:36:115:36 | [b (line 84): false] access to parameter b |
-| Assert.cs:91:9:91:24 | [assertion failure, b (line 84): false] call to method IsNull | Assert.cs:91:9:91:24 | [assertion failure, b (line 84): false] call to method IsNull |
-| Assert.cs:91:9:91:24 | [assertion failure, b (line 84): true] call to method IsNull | Assert.cs:91:9:91:24 | [assertion failure, b (line 84): true] call to method IsNull |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull | Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull | Assert.cs:94:24:94:25 | [b (line 84): false] "" |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull | Assert.cs:95:9:95:27 | [assertion failure, b (line 84): false] call to method IsNotNull |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull | Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull | Assert.cs:98:24:98:25 | [b (line 84): false] "" |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull | Assert.cs:99:9:99:32 | [assertion failure, b (line 84): false] call to method IsTrue |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull | Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull | Assert.cs:102:24:102:25 | [b (line 84): false] "" |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull | Assert.cs:103:9:103:32 | [assertion failure, b (line 84): false] call to method IsTrue |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull | Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull | Assert.cs:106:24:106:25 | [b (line 84): false] "" |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): false] call to method IsFalse |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull | Assert.cs:107:9:107:33 | [assertion success, b (line 84): false] call to method IsFalse |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull | Assert.cs:110:24:110:25 | [b (line 84): false] "" |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): false] call to method IsFalse |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull | Assert.cs:111:9:111:33 | [assertion success, b (line 84): false] call to method IsFalse |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull | Assert.cs:114:24:114:25 | [b (line 84): false] "" |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): false] call to method IsTrue |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull | Assert.cs:115:23:115:36 | [false, b (line 84): false] ... && ... |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull | Assert.cs:115:36:115:36 | [b (line 84): false] access to parameter b |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:94:17:94:20 | [b (line 84): true] null |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:95:9:95:27 | [assertion failure, b (line 84): true] call to method IsNotNull |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:98:17:98:20 | [b (line 84): true] null |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:99:9:99:32 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:102:17:102:20 | [b (line 84): true] null |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:103:9:103:32 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:106:17:106:20 | [b (line 84): true] null |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:110:17:110:20 | [b (line 84): true] null |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:114:17:114:20 | [b (line 84): true] null |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:115:23:115:36 | [false, b (line 84): true] ... && ... |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:118:17:118:20 | [b (line 84): true] null |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:122:17:122:20 | [b (line 84): true] null |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:126:17:126:20 | [b (line 84): true] null |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:127:24:127:38 | [false] ... \|\| ... |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:127:24:127:38 | [true] ... \|\| ... |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:127:37:127:38 | [false] !... |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:94:17:94:20 | [b (line 84): true] null |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:95:9:95:27 | [assertion failure, b (line 84): true] call to method IsNotNull |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:98:17:98:20 | [b (line 84): true] null |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:99:9:99:32 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:102:17:102:20 | [b (line 84): true] null |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:103:9:103:32 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:106:17:106:20 | [b (line 84): true] null |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:110:17:110:20 | [b (line 84): true] null |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:114:17:114:20 | [b (line 84): true] null |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:115:23:115:36 | [false, b (line 84): true] ... && ... |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:118:17:118:20 | [b (line 84): true] null |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:122:17:122:20 | [b (line 84): true] null |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:126:17:126:20 | [b (line 84): true] null |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:127:24:127:38 | [false] ... \|\| ... |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:127:24:127:38 | [true] ... \|\| ... |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:127:37:127:38 | [false] !... |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:94:24:94:25 | [b (line 84): false] "" | Assert.cs:94:24:94:25 | [b (line 84): false] "" |
-| Assert.cs:94:24:94:25 | [b (line 84): false] "" | Assert.cs:95:9:95:27 | [assertion failure, b (line 84): false] call to method IsNotNull |
-| Assert.cs:94:24:94:25 | [b (line 84): false] "" | Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull |
-| Assert.cs:94:24:94:25 | [b (line 84): false] "" | Assert.cs:98:24:98:25 | [b (line 84): false] "" |
-| Assert.cs:94:24:94:25 | [b (line 84): false] "" | Assert.cs:99:9:99:32 | [assertion failure, b (line 84): false] call to method IsTrue |
-| Assert.cs:94:24:94:25 | [b (line 84): false] "" | Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue |
-| Assert.cs:94:24:94:25 | [b (line 84): false] "" | Assert.cs:102:24:102:25 | [b (line 84): false] "" |
-| Assert.cs:94:24:94:25 | [b (line 84): false] "" | Assert.cs:103:9:103:32 | [assertion failure, b (line 84): false] call to method IsTrue |
-| Assert.cs:94:24:94:25 | [b (line 84): false] "" | Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue |
-| Assert.cs:94:24:94:25 | [b (line 84): false] "" | Assert.cs:106:24:106:25 | [b (line 84): false] "" |
-| Assert.cs:94:24:94:25 | [b (line 84): false] "" | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): false] call to method IsFalse |
-| Assert.cs:94:24:94:25 | [b (line 84): false] "" | Assert.cs:107:9:107:33 | [assertion success, b (line 84): false] call to method IsFalse |
-| Assert.cs:94:24:94:25 | [b (line 84): false] "" | Assert.cs:110:24:110:25 | [b (line 84): false] "" |
-| Assert.cs:94:24:94:25 | [b (line 84): false] "" | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): false] call to method IsFalse |
-| Assert.cs:94:24:94:25 | [b (line 84): false] "" | Assert.cs:111:9:111:33 | [assertion success, b (line 84): false] call to method IsFalse |
-| Assert.cs:94:24:94:25 | [b (line 84): false] "" | Assert.cs:114:24:114:25 | [b (line 84): false] "" |
-| Assert.cs:94:24:94:25 | [b (line 84): false] "" | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): false] call to method IsTrue |
-| Assert.cs:94:24:94:25 | [b (line 84): false] "" | Assert.cs:115:23:115:36 | [false, b (line 84): false] ... && ... |
-| Assert.cs:94:24:94:25 | [b (line 84): false] "" | Assert.cs:115:36:115:36 | [b (line 84): false] access to parameter b |
-| Assert.cs:95:9:95:27 | [assertion failure, b (line 84): false] call to method IsNotNull | Assert.cs:95:9:95:27 | [assertion failure, b (line 84): false] call to method IsNotNull |
-| Assert.cs:95:9:95:27 | [assertion failure, b (line 84): true] call to method IsNotNull | Assert.cs:95:9:95:27 | [assertion failure, b (line 84): true] call to method IsNotNull |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull | Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull | Assert.cs:98:24:98:25 | [b (line 84): false] "" |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull | Assert.cs:99:9:99:32 | [assertion failure, b (line 84): false] call to method IsTrue |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull | Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull | Assert.cs:102:24:102:25 | [b (line 84): false] "" |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull | Assert.cs:103:9:103:32 | [assertion failure, b (line 84): false] call to method IsTrue |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull | Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull | Assert.cs:106:24:106:25 | [b (line 84): false] "" |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): false] call to method IsFalse |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull | Assert.cs:107:9:107:33 | [assertion success, b (line 84): false] call to method IsFalse |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull | Assert.cs:110:24:110:25 | [b (line 84): false] "" |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): false] call to method IsFalse |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull | Assert.cs:111:9:111:33 | [assertion success, b (line 84): false] call to method IsFalse |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull | Assert.cs:114:24:114:25 | [b (line 84): false] "" |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): false] call to method IsTrue |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull | Assert.cs:115:23:115:36 | [false, b (line 84): false] ... && ... |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull | Assert.cs:115:36:115:36 | [b (line 84): false] access to parameter b |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:98:17:98:20 | [b (line 84): true] null |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:99:9:99:32 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:102:17:102:20 | [b (line 84): true] null |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:103:9:103:32 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:106:17:106:20 | [b (line 84): true] null |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:110:17:110:20 | [b (line 84): true] null |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:114:17:114:20 | [b (line 84): true] null |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:115:23:115:36 | [false, b (line 84): true] ... && ... |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:118:17:118:20 | [b (line 84): true] null |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:122:17:122:20 | [b (line 84): true] null |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:126:17:126:20 | [b (line 84): true] null |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:127:24:127:38 | [false] ... \|\| ... |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:127:24:127:38 | [true] ... \|\| ... |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:127:37:127:38 | [false] !... |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:98:17:98:20 | [b (line 84): true] null |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:99:9:99:32 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:102:17:102:20 | [b (line 84): true] null |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:103:9:103:32 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:106:17:106:20 | [b (line 84): true] null |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:110:17:110:20 | [b (line 84): true] null |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:114:17:114:20 | [b (line 84): true] null |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:115:23:115:36 | [false, b (line 84): true] ... && ... |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:118:17:118:20 | [b (line 84): true] null |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:122:17:122:20 | [b (line 84): true] null |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:126:17:126:20 | [b (line 84): true] null |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:127:24:127:38 | [false] ... \|\| ... |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:127:24:127:38 | [true] ... \|\| ... |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:127:37:127:38 | [false] !... |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:98:24:98:25 | [b (line 84): false] "" | Assert.cs:98:24:98:25 | [b (line 84): false] "" |
-| Assert.cs:98:24:98:25 | [b (line 84): false] "" | Assert.cs:99:9:99:32 | [assertion failure, b (line 84): false] call to method IsTrue |
-| Assert.cs:98:24:98:25 | [b (line 84): false] "" | Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue |
-| Assert.cs:98:24:98:25 | [b (line 84): false] "" | Assert.cs:102:24:102:25 | [b (line 84): false] "" |
-| Assert.cs:98:24:98:25 | [b (line 84): false] "" | Assert.cs:103:9:103:32 | [assertion failure, b (line 84): false] call to method IsTrue |
-| Assert.cs:98:24:98:25 | [b (line 84): false] "" | Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue |
-| Assert.cs:98:24:98:25 | [b (line 84): false] "" | Assert.cs:106:24:106:25 | [b (line 84): false] "" |
-| Assert.cs:98:24:98:25 | [b (line 84): false] "" | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): false] call to method IsFalse |
-| Assert.cs:98:24:98:25 | [b (line 84): false] "" | Assert.cs:107:9:107:33 | [assertion success, b (line 84): false] call to method IsFalse |
-| Assert.cs:98:24:98:25 | [b (line 84): false] "" | Assert.cs:110:24:110:25 | [b (line 84): false] "" |
-| Assert.cs:98:24:98:25 | [b (line 84): false] "" | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): false] call to method IsFalse |
-| Assert.cs:98:24:98:25 | [b (line 84): false] "" | Assert.cs:111:9:111:33 | [assertion success, b (line 84): false] call to method IsFalse |
-| Assert.cs:98:24:98:25 | [b (line 84): false] "" | Assert.cs:114:24:114:25 | [b (line 84): false] "" |
-| Assert.cs:98:24:98:25 | [b (line 84): false] "" | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): false] call to method IsTrue |
-| Assert.cs:98:24:98:25 | [b (line 84): false] "" | Assert.cs:115:23:115:36 | [false, b (line 84): false] ... && ... |
-| Assert.cs:98:24:98:25 | [b (line 84): false] "" | Assert.cs:115:36:115:36 | [b (line 84): false] access to parameter b |
-| Assert.cs:99:9:99:32 | [assertion failure, b (line 84): false] call to method IsTrue | Assert.cs:99:9:99:32 | [assertion failure, b (line 84): false] call to method IsTrue |
-| Assert.cs:99:9:99:32 | [assertion failure, b (line 84): true] call to method IsTrue | Assert.cs:99:9:99:32 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:102:24:102:25 | [b (line 84): false] "" |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:103:9:103:32 | [assertion failure, b (line 84): false] call to method IsTrue |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:106:24:106:25 | [b (line 84): false] "" |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): false] call to method IsFalse |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:107:9:107:33 | [assertion success, b (line 84): false] call to method IsFalse |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:110:24:110:25 | [b (line 84): false] "" |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): false] call to method IsFalse |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:111:9:111:33 | [assertion success, b (line 84): false] call to method IsFalse |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:114:24:114:25 | [b (line 84): false] "" |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): false] call to method IsTrue |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:115:23:115:36 | [false, b (line 84): false] ... && ... |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:115:36:115:36 | [b (line 84): false] access to parameter b |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:102:17:102:20 | [b (line 84): true] null |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:103:9:103:32 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:106:17:106:20 | [b (line 84): true] null |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:110:17:110:20 | [b (line 84): true] null |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:114:17:114:20 | [b (line 84): true] null |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:115:23:115:36 | [false, b (line 84): true] ... && ... |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:118:17:118:20 | [b (line 84): true] null |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:122:17:122:20 | [b (line 84): true] null |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:126:17:126:20 | [b (line 84): true] null |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:127:24:127:38 | [false] ... \|\| ... |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:127:24:127:38 | [true] ... \|\| ... |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:127:37:127:38 | [false] !... |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:102:17:102:20 | [b (line 84): true] null |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:103:9:103:32 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:106:17:106:20 | [b (line 84): true] null |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:110:17:110:20 | [b (line 84): true] null |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:114:17:114:20 | [b (line 84): true] null |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:115:23:115:36 | [false, b (line 84): true] ... && ... |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:118:17:118:20 | [b (line 84): true] null |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:122:17:122:20 | [b (line 84): true] null |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:126:17:126:20 | [b (line 84): true] null |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:127:24:127:38 | [false] ... \|\| ... |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:127:24:127:38 | [true] ... \|\| ... |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:127:37:127:38 | [false] !... |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:102:24:102:25 | [b (line 84): false] "" | Assert.cs:102:24:102:25 | [b (line 84): false] "" |
-| Assert.cs:102:24:102:25 | [b (line 84): false] "" | Assert.cs:103:9:103:32 | [assertion failure, b (line 84): false] call to method IsTrue |
-| Assert.cs:102:24:102:25 | [b (line 84): false] "" | Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue |
-| Assert.cs:102:24:102:25 | [b (line 84): false] "" | Assert.cs:106:24:106:25 | [b (line 84): false] "" |
-| Assert.cs:102:24:102:25 | [b (line 84): false] "" | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): false] call to method IsFalse |
-| Assert.cs:102:24:102:25 | [b (line 84): false] "" | Assert.cs:107:9:107:33 | [assertion success, b (line 84): false] call to method IsFalse |
-| Assert.cs:102:24:102:25 | [b (line 84): false] "" | Assert.cs:110:24:110:25 | [b (line 84): false] "" |
-| Assert.cs:102:24:102:25 | [b (line 84): false] "" | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): false] call to method IsFalse |
-| Assert.cs:102:24:102:25 | [b (line 84): false] "" | Assert.cs:111:9:111:33 | [assertion success, b (line 84): false] call to method IsFalse |
-| Assert.cs:102:24:102:25 | [b (line 84): false] "" | Assert.cs:114:24:114:25 | [b (line 84): false] "" |
-| Assert.cs:102:24:102:25 | [b (line 84): false] "" | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): false] call to method IsTrue |
-| Assert.cs:102:24:102:25 | [b (line 84): false] "" | Assert.cs:115:23:115:36 | [false, b (line 84): false] ... && ... |
-| Assert.cs:102:24:102:25 | [b (line 84): false] "" | Assert.cs:115:36:115:36 | [b (line 84): false] access to parameter b |
-| Assert.cs:103:9:103:32 | [assertion failure, b (line 84): false] call to method IsTrue | Assert.cs:103:9:103:32 | [assertion failure, b (line 84): false] call to method IsTrue |
-| Assert.cs:103:9:103:32 | [assertion failure, b (line 84): true] call to method IsTrue | Assert.cs:103:9:103:32 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:106:24:106:25 | [b (line 84): false] "" |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): false] call to method IsFalse |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:107:9:107:33 | [assertion success, b (line 84): false] call to method IsFalse |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:110:24:110:25 | [b (line 84): false] "" |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): false] call to method IsFalse |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:111:9:111:33 | [assertion success, b (line 84): false] call to method IsFalse |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:114:24:114:25 | [b (line 84): false] "" |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): false] call to method IsTrue |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:115:23:115:36 | [false, b (line 84): false] ... && ... |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:115:36:115:36 | [b (line 84): false] access to parameter b |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:106:17:106:20 | [b (line 84): true] null |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:110:17:110:20 | [b (line 84): true] null |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:114:17:114:20 | [b (line 84): true] null |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:115:23:115:36 | [false, b (line 84): true] ... && ... |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:118:17:118:20 | [b (line 84): true] null |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:122:17:122:20 | [b (line 84): true] null |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:126:17:126:20 | [b (line 84): true] null |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:127:24:127:38 | [false] ... \|\| ... |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:127:24:127:38 | [true] ... \|\| ... |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:127:37:127:38 | [false] !... |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:106:17:106:20 | [b (line 84): true] null |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:110:17:110:20 | [b (line 84): true] null |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:114:17:114:20 | [b (line 84): true] null |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:115:23:115:36 | [false, b (line 84): true] ... && ... |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:118:17:118:20 | [b (line 84): true] null |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:122:17:122:20 | [b (line 84): true] null |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:126:17:126:20 | [b (line 84): true] null |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:127:24:127:38 | [false] ... \|\| ... |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:127:24:127:38 | [true] ... \|\| ... |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:127:37:127:38 | [false] !... |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:106:24:106:25 | [b (line 84): false] "" | Assert.cs:106:24:106:25 | [b (line 84): false] "" |
-| Assert.cs:106:24:106:25 | [b (line 84): false] "" | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): false] call to method IsFalse |
-| Assert.cs:106:24:106:25 | [b (line 84): false] "" | Assert.cs:107:9:107:33 | [assertion success, b (line 84): false] call to method IsFalse |
-| Assert.cs:106:24:106:25 | [b (line 84): false] "" | Assert.cs:110:24:110:25 | [b (line 84): false] "" |
-| Assert.cs:106:24:106:25 | [b (line 84): false] "" | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): false] call to method IsFalse |
-| Assert.cs:106:24:106:25 | [b (line 84): false] "" | Assert.cs:111:9:111:33 | [assertion success, b (line 84): false] call to method IsFalse |
-| Assert.cs:106:24:106:25 | [b (line 84): false] "" | Assert.cs:114:24:114:25 | [b (line 84): false] "" |
-| Assert.cs:106:24:106:25 | [b (line 84): false] "" | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): false] call to method IsTrue |
-| Assert.cs:106:24:106:25 | [b (line 84): false] "" | Assert.cs:115:23:115:36 | [false, b (line 84): false] ... && ... |
-| Assert.cs:106:24:106:25 | [b (line 84): false] "" | Assert.cs:115:36:115:36 | [b (line 84): false] access to parameter b |
-| Assert.cs:107:9:107:33 | [assertion failure, b (line 84): false] call to method IsFalse | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): false] call to method IsFalse |
-| Assert.cs:107:9:107:33 | [assertion failure, b (line 84): true] call to method IsFalse | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): false] call to method IsFalse | Assert.cs:107:9:107:33 | [assertion success, b (line 84): false] call to method IsFalse |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): false] call to method IsFalse | Assert.cs:110:24:110:25 | [b (line 84): false] "" |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): false] call to method IsFalse | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): false] call to method IsFalse |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): false] call to method IsFalse | Assert.cs:111:9:111:33 | [assertion success, b (line 84): false] call to method IsFalse |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): false] call to method IsFalse | Assert.cs:114:24:114:25 | [b (line 84): false] "" |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): false] call to method IsFalse | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): false] call to method IsTrue |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): false] call to method IsFalse | Assert.cs:115:23:115:36 | [false, b (line 84): false] ... && ... |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): false] call to method IsFalse | Assert.cs:115:36:115:36 | [b (line 84): false] access to parameter b |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:110:17:110:20 | [b (line 84): true] null |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:114:17:114:20 | [b (line 84): true] null |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:115:23:115:36 | [false, b (line 84): true] ... && ... |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:118:17:118:20 | [b (line 84): true] null |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:122:17:122:20 | [b (line 84): true] null |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:126:17:126:20 | [b (line 84): true] null |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:127:24:127:38 | [false] ... \|\| ... |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:127:24:127:38 | [true] ... \|\| ... |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:127:37:127:38 | [false] !... |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:110:17:110:20 | [b (line 84): true] null |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:114:17:114:20 | [b (line 84): true] null |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:115:23:115:36 | [false, b (line 84): true] ... && ... |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:118:17:118:20 | [b (line 84): true] null |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:122:17:122:20 | [b (line 84): true] null |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:126:17:126:20 | [b (line 84): true] null |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:127:24:127:38 | [false] ... \|\| ... |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:127:24:127:38 | [true] ... \|\| ... |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:127:37:127:38 | [false] !... |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:110:24:110:25 | [b (line 84): false] "" | Assert.cs:110:24:110:25 | [b (line 84): false] "" |
-| Assert.cs:110:24:110:25 | [b (line 84): false] "" | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): false] call to method IsFalse |
-| Assert.cs:110:24:110:25 | [b (line 84): false] "" | Assert.cs:111:9:111:33 | [assertion success, b (line 84): false] call to method IsFalse |
-| Assert.cs:110:24:110:25 | [b (line 84): false] "" | Assert.cs:114:24:114:25 | [b (line 84): false] "" |
-| Assert.cs:110:24:110:25 | [b (line 84): false] "" | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): false] call to method IsTrue |
-| Assert.cs:110:24:110:25 | [b (line 84): false] "" | Assert.cs:115:23:115:36 | [false, b (line 84): false] ... && ... |
-| Assert.cs:110:24:110:25 | [b (line 84): false] "" | Assert.cs:115:36:115:36 | [b (line 84): false] access to parameter b |
-| Assert.cs:111:9:111:33 | [assertion failure, b (line 84): false] call to method IsFalse | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): false] call to method IsFalse |
-| Assert.cs:111:9:111:33 | [assertion failure, b (line 84): true] call to method IsFalse | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): false] call to method IsFalse | Assert.cs:111:9:111:33 | [assertion success, b (line 84): false] call to method IsFalse |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): false] call to method IsFalse | Assert.cs:114:24:114:25 | [b (line 84): false] "" |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): false] call to method IsFalse | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): false] call to method IsTrue |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): false] call to method IsFalse | Assert.cs:115:23:115:36 | [false, b (line 84): false] ... && ... |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): false] call to method IsFalse | Assert.cs:115:36:115:36 | [b (line 84): false] access to parameter b |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:114:17:114:20 | [b (line 84): true] null |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:115:23:115:36 | [false, b (line 84): true] ... && ... |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:118:17:118:20 | [b (line 84): true] null |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:122:17:122:20 | [b (line 84): true] null |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:126:17:126:20 | [b (line 84): true] null |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:127:24:127:38 | [false] ... \|\| ... |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:127:24:127:38 | [true] ... \|\| ... |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:127:37:127:38 | [false] !... |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:114:17:114:20 | [b (line 84): true] null |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:115:23:115:36 | [false, b (line 84): true] ... && ... |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:118:17:118:20 | [b (line 84): true] null |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:122:17:122:20 | [b (line 84): true] null |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:126:17:126:20 | [b (line 84): true] null |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:127:24:127:38 | [false] ... \|\| ... |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:127:24:127:38 | [true] ... \|\| ... |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:127:37:127:38 | [false] !... |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:114:24:114:25 | [b (line 84): false] "" | Assert.cs:114:24:114:25 | [b (line 84): false] "" |
-| Assert.cs:114:24:114:25 | [b (line 84): false] "" | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): false] call to method IsTrue |
-| Assert.cs:114:24:114:25 | [b (line 84): false] "" | Assert.cs:115:23:115:36 | [false, b (line 84): false] ... && ... |
-| Assert.cs:114:24:114:25 | [b (line 84): false] "" | Assert.cs:115:36:115:36 | [b (line 84): false] access to parameter b |
-| Assert.cs:115:9:115:37 | [assertion failure, b (line 84): false] call to method IsTrue | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): false] call to method IsTrue |
-| Assert.cs:115:9:115:37 | [assertion failure, b (line 84): true] call to method IsTrue | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:118:17:118:20 | [b (line 84): true] null |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:122:17:122:20 | [b (line 84): true] null |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:126:17:126:20 | [b (line 84): true] null |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:127:24:127:38 | [false] ... \|\| ... |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:127:24:127:38 | [true] ... \|\| ... |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:127:37:127:38 | [false] !... |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:115:23:115:36 | [false, b (line 84): false] ... && ... | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): false] call to method IsTrue |
-| Assert.cs:115:23:115:36 | [false, b (line 84): false] ... && ... | Assert.cs:115:23:115:36 | [false, b (line 84): false] ... && ... |
-| Assert.cs:115:23:115:36 | [false, b (line 84): true] ... && ... | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:115:23:115:36 | [false, b (line 84): true] ... && ... | Assert.cs:115:23:115:36 | [false, b (line 84): true] ... && ... |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:118:17:118:20 | [b (line 84): true] null |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:122:17:122:20 | [b (line 84): true] null |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:126:17:126:20 | [b (line 84): true] null |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:127:24:127:38 | [false] ... \|\| ... |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:127:24:127:38 | [true] ... \|\| ... |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:127:37:127:38 | [false] !... |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:115:36:115:36 | [b (line 84): false] access to parameter b | Assert.cs:115:36:115:36 | [b (line 84): false] access to parameter b |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:118:17:118:20 | [b (line 84): true] null |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:122:17:122:20 | [b (line 84): true] null |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:126:17:126:20 | [b (line 84): true] null |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:127:24:127:38 | [false] ... \|\| ... |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:127:24:127:38 | [true] ... \|\| ... |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:127:37:127:38 | [false] !... |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:118:17:118:20 | [b (line 84): true] null |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:122:17:122:20 | [b (line 84): true] null |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:126:17:126:20 | [b (line 84): true] null |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:127:24:127:38 | [false] ... \|\| ... |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:127:24:127:38 | [true] ... \|\| ... |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:127:37:127:38 | [false] !... |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse | Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:122:17:122:20 | [b (line 84): true] null |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:126:17:126:20 | [b (line 84): true] null |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:127:24:127:38 | [false] ... \|\| ... |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:127:24:127:38 | [true] ... \|\| ... |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:127:37:127:38 | [false] !... |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:122:17:122:20 | [b (line 84): true] null |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:126:17:126:20 | [b (line 84): true] null |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:127:24:127:38 | [false] ... \|\| ... |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:127:24:127:38 | [true] ... \|\| ... |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:127:37:127:38 | [false] !... |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... | Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... | Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:122:17:122:20 | [b (line 84): true] null |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:126:17:126:20 | [b (line 84): true] null |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:127:24:127:38 | [false] ... \|\| ... |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:127:24:127:38 | [true] ... \|\| ... |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:127:37:127:38 | [false] !... |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:122:17:122:20 | [b (line 84): true] null |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:126:17:126:20 | [b (line 84): true] null |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:127:24:127:38 | [false] ... \|\| ... |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:127:24:127:38 | [true] ... \|\| ... |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:127:37:127:38 | [false] !... |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:122:17:122:20 | [b (line 84): true] null |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:126:17:126:20 | [b (line 84): true] null |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:127:24:127:38 | [false] ... \|\| ... |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:127:24:127:38 | [true] ... \|\| ... |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:127:37:127:38 | [false] !... |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:126:17:126:20 | [b (line 84): true] null |
-| Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse |
-| Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse |
-| Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:127:24:127:38 | [false] ... \|\| ... |
-| Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:127:24:127:38 | [true] ... \|\| ... |
-| Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:127:37:127:38 | [false] !... |
-| Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... |
-| Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | Assert.cs:126:17:126:20 | [b (line 84): true] null |
-| Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse |
-| Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse |
-| Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | Assert.cs:127:24:127:38 | [false] ... \|\| ... |
-| Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | Assert.cs:127:24:127:38 | [true] ... \|\| ... |
-| Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | Assert.cs:127:37:127:38 | [false] !... |
-| Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | Assert.cs:126:17:126:20 | [b (line 84): true] null |
-| Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse |
-| Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse |
-| Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | Assert.cs:127:24:127:38 | [false] ... \|\| ... |
-| Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | Assert.cs:127:24:127:38 | [true] ... \|\| ... |
-| Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | Assert.cs:127:37:127:38 | [false] !... |
-| Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:126:17:126:20 | [b (line 84): true] null | Assert.cs:126:17:126:20 | [b (line 84): true] null |
-| Assert.cs:126:17:126:20 | [b (line 84): true] null | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse |
-| Assert.cs:126:17:126:20 | [b (line 84): true] null | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse |
-| Assert.cs:126:17:126:20 | [b (line 84): true] null | Assert.cs:127:24:127:38 | [false] ... \|\| ... |
-| Assert.cs:126:17:126:20 | [b (line 84): true] null | Assert.cs:127:24:127:38 | [true] ... \|\| ... |
-| Assert.cs:126:17:126:20 | [b (line 84): true] null | Assert.cs:127:37:127:38 | [false] !... |
-| Assert.cs:126:17:126:20 | [b (line 84): true] null | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse |
-| Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse |
-| Assert.cs:127:24:127:38 | [false] ... \|\| ... | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse |
-| Assert.cs:127:24:127:38 | [false] ... \|\| ... | Assert.cs:127:24:127:38 | [false] ... \|\| ... |
-| Assert.cs:127:24:127:38 | [true] ... \|\| ... | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse |
-| Assert.cs:127:24:127:38 | [true] ... \|\| ... | Assert.cs:127:24:127:38 | [true] ... \|\| ... |
-| Assert.cs:127:37:127:38 | [false] !... | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse |
-| Assert.cs:127:37:127:38 | [false] !... | Assert.cs:127:24:127:38 | [false] ... \|\| ... |
-| Assert.cs:127:37:127:38 | [false] !... | Assert.cs:127:37:127:38 | [false] !... |
-| Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse |
-| Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | Assert.cs:127:24:127:38 | [false] ... \|\| ... |
-| Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | Assert.cs:127:37:127:38 | [false] !... |
-| Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:84:10:84:12 | exit M12 |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:84:10:84:12 | exit M12 (abnormal) |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:86:20:86:32 | ... ? ... : ... |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:88:9:88:36 | ...; |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:90:13:90:25 | ... ? ... : ... |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:90:17:90:20 | null |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:90:24:90:25 | "" |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:92:9:92:36 | ...; |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:94:13:94:25 | ... ? ... : ... |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:94:17:94:20 | null |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:94:24:94:25 | "" |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:96:9:96:36 | ...; |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:98:13:98:25 | ... ? ... : ... |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:98:17:98:20 | null |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:98:24:98:25 | "" |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:100:9:100:36 | ...; |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:102:13:102:25 | ... ? ... : ... |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:102:17:102:20 | null |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:102:24:102:25 | "" |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:104:9:104:36 | ...; |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:106:13:106:25 | ... ? ... : ... |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:106:17:106:20 | null |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:106:24:106:25 | "" |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:108:9:108:36 | ...; |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:110:13:110:25 | ... ? ... : ... |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:110:17:110:20 | null |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:110:24:110:25 | "" |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:112:9:112:36 | ...; |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:114:13:114:25 | ... ? ... : ... |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:114:17:114:20 | null |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:114:24:114:25 | "" |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:115:23:115:36 | ... && ... |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:115:36:115:36 | access to parameter b |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:116:9:116:36 | ...; |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:118:13:118:25 | ... ? ... : ... |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:118:17:118:20 | null |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:118:24:118:25 | "" |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:119:24:119:38 | ... \|\| ... |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:119:38:119:38 | access to parameter b |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:120:9:120:36 | ...; |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:122:13:122:25 | ... ? ... : ... |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:122:17:122:20 | null |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:122:24:122:25 | "" |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:123:23:123:36 | ... && ... |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:123:36:123:36 | access to parameter b |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:124:9:124:36 | ...; |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:126:13:126:25 | ... ? ... : ... |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:126:17:126:20 | null |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:126:24:126:25 | "" |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:127:24:127:38 | ... \|\| ... |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:127:38:127:38 | access to parameter b |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:128:9:128:36 | ...; |
+| Assert.cs:86:24:86:27 | null | Assert.cs:86:24:86:27 | null |
+| Assert.cs:86:31:86:32 | "" | Assert.cs:86:31:86:32 | "" |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:88:9:88:36 | ...; |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:90:13:90:25 | ... ? ... : ... |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:90:17:90:20 | null |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:90:24:90:25 | "" |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:92:9:92:36 | ...; |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:94:13:94:25 | ... ? ... : ... |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:94:17:94:20 | null |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:94:24:94:25 | "" |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:96:9:96:36 | ...; |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:98:13:98:25 | ... ? ... : ... |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:98:17:98:20 | null |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:98:24:98:25 | "" |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:100:9:100:36 | ...; |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:102:13:102:25 | ... ? ... : ... |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:102:17:102:20 | null |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:102:24:102:25 | "" |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:104:9:104:36 | ...; |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:106:13:106:25 | ... ? ... : ... |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:106:17:106:20 | null |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:106:24:106:25 | "" |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:108:9:108:36 | ...; |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:110:13:110:25 | ... ? ... : ... |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:110:17:110:20 | null |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:110:24:110:25 | "" |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:112:9:112:36 | ...; |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:114:13:114:25 | ... ? ... : ... |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:114:17:114:20 | null |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:114:24:114:25 | "" |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:115:23:115:36 | ... && ... |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:115:36:115:36 | access to parameter b |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:116:9:116:36 | ...; |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:118:13:118:25 | ... ? ... : ... |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:118:17:118:20 | null |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:118:24:118:25 | "" |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:119:24:119:38 | ... \|\| ... |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:119:38:119:38 | access to parameter b |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:120:9:120:36 | ...; |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:122:13:122:25 | ... ? ... : ... |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:122:17:122:20 | null |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:122:24:122:25 | "" |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:123:23:123:36 | ... && ... |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:123:36:123:36 | access to parameter b |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:124:9:124:36 | ...; |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:126:13:126:25 | ... ? ... : ... |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:126:17:126:20 | null |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:126:24:126:25 | "" |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:127:24:127:38 | ... \|\| ... |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:127:38:127:38 | access to parameter b |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:128:9:128:36 | ...; |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:90:13:90:25 | ... ? ... : ... |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:92:9:92:36 | ...; |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:94:13:94:25 | ... ? ... : ... |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:94:17:94:20 | null |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:94:24:94:25 | "" |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:96:9:96:36 | ...; |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:98:13:98:25 | ... ? ... : ... |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:98:17:98:20 | null |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:98:24:98:25 | "" |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:100:9:100:36 | ...; |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:102:13:102:25 | ... ? ... : ... |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:102:17:102:20 | null |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:102:24:102:25 | "" |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:104:9:104:36 | ...; |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:106:13:106:25 | ... ? ... : ... |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:106:17:106:20 | null |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:106:24:106:25 | "" |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:108:9:108:36 | ...; |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:110:13:110:25 | ... ? ... : ... |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:110:17:110:20 | null |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:110:24:110:25 | "" |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:112:9:112:36 | ...; |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:114:13:114:25 | ... ? ... : ... |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:114:17:114:20 | null |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:114:24:114:25 | "" |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:115:23:115:36 | ... && ... |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:115:36:115:36 | access to parameter b |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:116:9:116:36 | ...; |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:118:13:118:25 | ... ? ... : ... |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:118:17:118:20 | null |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:118:24:118:25 | "" |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:119:24:119:38 | ... \|\| ... |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:119:38:119:38 | access to parameter b |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:120:9:120:36 | ...; |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:122:13:122:25 | ... ? ... : ... |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:122:17:122:20 | null |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:122:24:122:25 | "" |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:123:23:123:36 | ... && ... |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:123:36:123:36 | access to parameter b |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:124:9:124:36 | ...; |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:126:13:126:25 | ... ? ... : ... |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:126:17:126:20 | null |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:126:24:126:25 | "" |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:127:24:127:38 | ... \|\| ... |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:127:38:127:38 | access to parameter b |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:128:9:128:36 | ...; |
+| Assert.cs:90:17:90:20 | null | Assert.cs:90:17:90:20 | null |
+| Assert.cs:90:24:90:25 | "" | Assert.cs:90:24:90:25 | "" |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:92:9:92:36 | ...; |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:94:13:94:25 | ... ? ... : ... |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:94:17:94:20 | null |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:94:24:94:25 | "" |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:96:9:96:36 | ...; |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:98:13:98:25 | ... ? ... : ... |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:98:17:98:20 | null |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:98:24:98:25 | "" |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:100:9:100:36 | ...; |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:102:13:102:25 | ... ? ... : ... |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:102:17:102:20 | null |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:102:24:102:25 | "" |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:104:9:104:36 | ...; |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:106:13:106:25 | ... ? ... : ... |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:106:17:106:20 | null |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:106:24:106:25 | "" |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:108:9:108:36 | ...; |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:110:13:110:25 | ... ? ... : ... |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:110:17:110:20 | null |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:110:24:110:25 | "" |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:112:9:112:36 | ...; |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:114:13:114:25 | ... ? ... : ... |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:114:17:114:20 | null |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:114:24:114:25 | "" |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:115:23:115:36 | ... && ... |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:115:36:115:36 | access to parameter b |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:116:9:116:36 | ...; |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:118:13:118:25 | ... ? ... : ... |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:118:17:118:20 | null |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:118:24:118:25 | "" |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:119:24:119:38 | ... \|\| ... |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:119:38:119:38 | access to parameter b |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:120:9:120:36 | ...; |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:122:13:122:25 | ... ? ... : ... |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:122:17:122:20 | null |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:122:24:122:25 | "" |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:123:23:123:36 | ... && ... |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:123:36:123:36 | access to parameter b |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:124:9:124:36 | ...; |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:126:13:126:25 | ... ? ... : ... |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:126:17:126:20 | null |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:126:24:126:25 | "" |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:127:24:127:38 | ... \|\| ... |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:127:38:127:38 | access to parameter b |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:128:9:128:36 | ...; |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:94:13:94:25 | ... ? ... : ... |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:96:9:96:36 | ...; |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:98:13:98:25 | ... ? ... : ... |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:98:17:98:20 | null |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:98:24:98:25 | "" |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:100:9:100:36 | ...; |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:102:13:102:25 | ... ? ... : ... |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:102:17:102:20 | null |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:102:24:102:25 | "" |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:104:9:104:36 | ...; |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:106:13:106:25 | ... ? ... : ... |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:106:17:106:20 | null |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:106:24:106:25 | "" |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:108:9:108:36 | ...; |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:110:13:110:25 | ... ? ... : ... |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:110:17:110:20 | null |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:110:24:110:25 | "" |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:112:9:112:36 | ...; |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:114:13:114:25 | ... ? ... : ... |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:114:17:114:20 | null |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:114:24:114:25 | "" |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:115:23:115:36 | ... && ... |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:115:36:115:36 | access to parameter b |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:116:9:116:36 | ...; |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:118:13:118:25 | ... ? ... : ... |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:118:17:118:20 | null |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:118:24:118:25 | "" |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:119:24:119:38 | ... \|\| ... |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:119:38:119:38 | access to parameter b |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:120:9:120:36 | ...; |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:122:13:122:25 | ... ? ... : ... |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:122:17:122:20 | null |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:122:24:122:25 | "" |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:123:23:123:36 | ... && ... |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:123:36:123:36 | access to parameter b |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:124:9:124:36 | ...; |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:126:13:126:25 | ... ? ... : ... |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:126:17:126:20 | null |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:126:24:126:25 | "" |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:127:24:127:38 | ... \|\| ... |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:127:38:127:38 | access to parameter b |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:128:9:128:36 | ...; |
+| Assert.cs:94:17:94:20 | null | Assert.cs:94:17:94:20 | null |
+| Assert.cs:94:24:94:25 | "" | Assert.cs:94:24:94:25 | "" |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:96:9:96:36 | ...; |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:98:13:98:25 | ... ? ... : ... |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:98:17:98:20 | null |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:98:24:98:25 | "" |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:100:9:100:36 | ...; |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:102:13:102:25 | ... ? ... : ... |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:102:17:102:20 | null |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:102:24:102:25 | "" |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:104:9:104:36 | ...; |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:106:13:106:25 | ... ? ... : ... |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:106:17:106:20 | null |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:106:24:106:25 | "" |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:108:9:108:36 | ...; |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:110:13:110:25 | ... ? ... : ... |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:110:17:110:20 | null |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:110:24:110:25 | "" |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:112:9:112:36 | ...; |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:114:13:114:25 | ... ? ... : ... |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:114:17:114:20 | null |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:114:24:114:25 | "" |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:115:23:115:36 | ... && ... |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:115:36:115:36 | access to parameter b |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:116:9:116:36 | ...; |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:118:13:118:25 | ... ? ... : ... |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:118:17:118:20 | null |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:118:24:118:25 | "" |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:119:24:119:38 | ... \|\| ... |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:119:38:119:38 | access to parameter b |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:120:9:120:36 | ...; |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:122:13:122:25 | ... ? ... : ... |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:122:17:122:20 | null |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:122:24:122:25 | "" |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:123:23:123:36 | ... && ... |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:123:36:123:36 | access to parameter b |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:124:9:124:36 | ...; |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:126:13:126:25 | ... ? ... : ... |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:126:17:126:20 | null |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:126:24:126:25 | "" |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:127:24:127:38 | ... \|\| ... |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:127:38:127:38 | access to parameter b |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:128:9:128:36 | ...; |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:98:13:98:25 | ... ? ... : ... |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:100:9:100:36 | ...; |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:102:13:102:25 | ... ? ... : ... |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:102:17:102:20 | null |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:102:24:102:25 | "" |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:104:9:104:36 | ...; |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:106:13:106:25 | ... ? ... : ... |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:106:17:106:20 | null |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:106:24:106:25 | "" |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:108:9:108:36 | ...; |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:110:13:110:25 | ... ? ... : ... |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:110:17:110:20 | null |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:110:24:110:25 | "" |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:112:9:112:36 | ...; |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:114:13:114:25 | ... ? ... : ... |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:114:17:114:20 | null |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:114:24:114:25 | "" |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:115:23:115:36 | ... && ... |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:115:36:115:36 | access to parameter b |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:116:9:116:36 | ...; |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:118:13:118:25 | ... ? ... : ... |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:118:17:118:20 | null |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:118:24:118:25 | "" |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:119:24:119:38 | ... \|\| ... |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:119:38:119:38 | access to parameter b |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:120:9:120:36 | ...; |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:122:13:122:25 | ... ? ... : ... |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:122:17:122:20 | null |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:122:24:122:25 | "" |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:123:23:123:36 | ... && ... |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:123:36:123:36 | access to parameter b |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:124:9:124:36 | ...; |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:126:13:126:25 | ... ? ... : ... |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:126:17:126:20 | null |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:126:24:126:25 | "" |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:127:24:127:38 | ... \|\| ... |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:127:38:127:38 | access to parameter b |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:128:9:128:36 | ...; |
+| Assert.cs:98:17:98:20 | null | Assert.cs:98:17:98:20 | null |
+| Assert.cs:98:24:98:25 | "" | Assert.cs:98:24:98:25 | "" |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:100:9:100:36 | ...; |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:102:13:102:25 | ... ? ... : ... |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:102:17:102:20 | null |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:102:24:102:25 | "" |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:104:9:104:36 | ...; |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:106:13:106:25 | ... ? ... : ... |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:106:17:106:20 | null |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:106:24:106:25 | "" |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:108:9:108:36 | ...; |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:110:13:110:25 | ... ? ... : ... |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:110:17:110:20 | null |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:110:24:110:25 | "" |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:112:9:112:36 | ...; |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:114:13:114:25 | ... ? ... : ... |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:114:17:114:20 | null |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:114:24:114:25 | "" |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:115:23:115:36 | ... && ... |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:115:36:115:36 | access to parameter b |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:116:9:116:36 | ...; |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:118:13:118:25 | ... ? ... : ... |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:118:17:118:20 | null |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:118:24:118:25 | "" |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:119:24:119:38 | ... \|\| ... |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:119:38:119:38 | access to parameter b |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:120:9:120:36 | ...; |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:122:13:122:25 | ... ? ... : ... |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:122:17:122:20 | null |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:122:24:122:25 | "" |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:123:23:123:36 | ... && ... |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:123:36:123:36 | access to parameter b |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:124:9:124:36 | ...; |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:126:13:126:25 | ... ? ... : ... |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:126:17:126:20 | null |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:126:24:126:25 | "" |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:127:24:127:38 | ... \|\| ... |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:127:38:127:38 | access to parameter b |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:128:9:128:36 | ...; |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:102:13:102:25 | ... ? ... : ... |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:104:9:104:36 | ...; |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:106:13:106:25 | ... ? ... : ... |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:106:17:106:20 | null |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:106:24:106:25 | "" |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:108:9:108:36 | ...; |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:110:13:110:25 | ... ? ... : ... |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:110:17:110:20 | null |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:110:24:110:25 | "" |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:112:9:112:36 | ...; |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:114:13:114:25 | ... ? ... : ... |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:114:17:114:20 | null |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:114:24:114:25 | "" |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:115:23:115:36 | ... && ... |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:115:36:115:36 | access to parameter b |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:116:9:116:36 | ...; |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:118:13:118:25 | ... ? ... : ... |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:118:17:118:20 | null |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:118:24:118:25 | "" |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:119:24:119:38 | ... \|\| ... |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:119:38:119:38 | access to parameter b |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:120:9:120:36 | ...; |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:122:13:122:25 | ... ? ... : ... |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:122:17:122:20 | null |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:122:24:122:25 | "" |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:123:23:123:36 | ... && ... |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:123:36:123:36 | access to parameter b |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:124:9:124:36 | ...; |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:126:13:126:25 | ... ? ... : ... |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:126:17:126:20 | null |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:126:24:126:25 | "" |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:127:24:127:38 | ... \|\| ... |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:127:38:127:38 | access to parameter b |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:128:9:128:36 | ...; |
+| Assert.cs:102:17:102:20 | null | Assert.cs:102:17:102:20 | null |
+| Assert.cs:102:24:102:25 | "" | Assert.cs:102:24:102:25 | "" |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:104:9:104:36 | ...; |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:106:13:106:25 | ... ? ... : ... |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:106:17:106:20 | null |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:106:24:106:25 | "" |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:108:9:108:36 | ...; |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:110:13:110:25 | ... ? ... : ... |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:110:17:110:20 | null |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:110:24:110:25 | "" |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:112:9:112:36 | ...; |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:114:13:114:25 | ... ? ... : ... |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:114:17:114:20 | null |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:114:24:114:25 | "" |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:115:23:115:36 | ... && ... |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:115:36:115:36 | access to parameter b |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:116:9:116:36 | ...; |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:118:13:118:25 | ... ? ... : ... |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:118:17:118:20 | null |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:118:24:118:25 | "" |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:119:24:119:38 | ... \|\| ... |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:119:38:119:38 | access to parameter b |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:120:9:120:36 | ...; |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:122:13:122:25 | ... ? ... : ... |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:122:17:122:20 | null |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:122:24:122:25 | "" |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:123:23:123:36 | ... && ... |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:123:36:123:36 | access to parameter b |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:124:9:124:36 | ...; |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:126:13:126:25 | ... ? ... : ... |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:126:17:126:20 | null |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:126:24:126:25 | "" |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:127:24:127:38 | ... \|\| ... |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:127:38:127:38 | access to parameter b |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:128:9:128:36 | ...; |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:106:13:106:25 | ... ? ... : ... |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:108:9:108:36 | ...; |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:110:13:110:25 | ... ? ... : ... |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:110:17:110:20 | null |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:110:24:110:25 | "" |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:112:9:112:36 | ...; |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:114:13:114:25 | ... ? ... : ... |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:114:17:114:20 | null |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:114:24:114:25 | "" |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:115:23:115:36 | ... && ... |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:115:36:115:36 | access to parameter b |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:116:9:116:36 | ...; |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:118:13:118:25 | ... ? ... : ... |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:118:17:118:20 | null |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:118:24:118:25 | "" |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:119:24:119:38 | ... \|\| ... |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:119:38:119:38 | access to parameter b |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:120:9:120:36 | ...; |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:122:13:122:25 | ... ? ... : ... |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:122:17:122:20 | null |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:122:24:122:25 | "" |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:123:23:123:36 | ... && ... |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:123:36:123:36 | access to parameter b |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:124:9:124:36 | ...; |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:126:13:126:25 | ... ? ... : ... |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:126:17:126:20 | null |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:126:24:126:25 | "" |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:127:24:127:38 | ... \|\| ... |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:127:38:127:38 | access to parameter b |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:128:9:128:36 | ...; |
+| Assert.cs:106:17:106:20 | null | Assert.cs:106:17:106:20 | null |
+| Assert.cs:106:24:106:25 | "" | Assert.cs:106:24:106:25 | "" |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:108:9:108:36 | ...; |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:110:13:110:25 | ... ? ... : ... |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:110:17:110:20 | null |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:110:24:110:25 | "" |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:112:9:112:36 | ...; |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:114:13:114:25 | ... ? ... : ... |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:114:17:114:20 | null |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:114:24:114:25 | "" |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:115:23:115:36 | ... && ... |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:115:36:115:36 | access to parameter b |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:116:9:116:36 | ...; |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:118:13:118:25 | ... ? ... : ... |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:118:17:118:20 | null |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:118:24:118:25 | "" |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:119:24:119:38 | ... \|\| ... |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:119:38:119:38 | access to parameter b |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:120:9:120:36 | ...; |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:122:13:122:25 | ... ? ... : ... |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:122:17:122:20 | null |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:122:24:122:25 | "" |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:123:23:123:36 | ... && ... |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:123:36:123:36 | access to parameter b |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:124:9:124:36 | ...; |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:126:13:126:25 | ... ? ... : ... |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:126:17:126:20 | null |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:126:24:126:25 | "" |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:127:24:127:38 | ... \|\| ... |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:127:38:127:38 | access to parameter b |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:128:9:128:36 | ...; |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:110:13:110:25 | ... ? ... : ... |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:112:9:112:36 | ...; |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:114:13:114:25 | ... ? ... : ... |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:114:17:114:20 | null |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:114:24:114:25 | "" |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:115:23:115:36 | ... && ... |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:115:36:115:36 | access to parameter b |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:116:9:116:36 | ...; |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:118:13:118:25 | ... ? ... : ... |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:118:17:118:20 | null |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:118:24:118:25 | "" |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:119:24:119:38 | ... \|\| ... |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:119:38:119:38 | access to parameter b |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:120:9:120:36 | ...; |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:122:13:122:25 | ... ? ... : ... |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:122:17:122:20 | null |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:122:24:122:25 | "" |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:123:23:123:36 | ... && ... |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:123:36:123:36 | access to parameter b |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:124:9:124:36 | ...; |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:126:13:126:25 | ... ? ... : ... |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:126:17:126:20 | null |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:126:24:126:25 | "" |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:127:24:127:38 | ... \|\| ... |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:127:38:127:38 | access to parameter b |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:128:9:128:36 | ...; |
+| Assert.cs:110:17:110:20 | null | Assert.cs:110:17:110:20 | null |
+| Assert.cs:110:24:110:25 | "" | Assert.cs:110:24:110:25 | "" |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:112:9:112:36 | ...; |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:114:13:114:25 | ... ? ... : ... |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:114:17:114:20 | null |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:114:24:114:25 | "" |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:115:23:115:36 | ... && ... |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:115:36:115:36 | access to parameter b |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:116:9:116:36 | ...; |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:118:13:118:25 | ... ? ... : ... |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:118:17:118:20 | null |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:118:24:118:25 | "" |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:119:24:119:38 | ... \|\| ... |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:119:38:119:38 | access to parameter b |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:120:9:120:36 | ...; |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:122:13:122:25 | ... ? ... : ... |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:122:17:122:20 | null |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:122:24:122:25 | "" |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:123:23:123:36 | ... && ... |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:123:36:123:36 | access to parameter b |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:124:9:124:36 | ...; |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:126:13:126:25 | ... ? ... : ... |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:126:17:126:20 | null |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:126:24:126:25 | "" |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:127:24:127:38 | ... \|\| ... |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:127:38:127:38 | access to parameter b |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:128:9:128:36 | ...; |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:114:13:114:25 | ... ? ... : ... |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:115:23:115:36 | ... && ... |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:115:36:115:36 | access to parameter b |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:116:9:116:36 | ...; |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:118:13:118:25 | ... ? ... : ... |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:118:17:118:20 | null |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:118:24:118:25 | "" |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:119:24:119:38 | ... \|\| ... |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:119:38:119:38 | access to parameter b |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:120:9:120:36 | ...; |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:122:13:122:25 | ... ? ... : ... |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:122:17:122:20 | null |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:122:24:122:25 | "" |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:123:23:123:36 | ... && ... |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:123:36:123:36 | access to parameter b |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:124:9:124:36 | ...; |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:126:13:126:25 | ... ? ... : ... |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:126:17:126:20 | null |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:126:24:126:25 | "" |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:127:24:127:38 | ... \|\| ... |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:127:38:127:38 | access to parameter b |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:128:9:128:36 | ...; |
+| Assert.cs:114:17:114:20 | null | Assert.cs:114:17:114:20 | null |
+| Assert.cs:114:24:114:25 | "" | Assert.cs:114:24:114:25 | "" |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:115:23:115:36 | ... && ... |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:116:9:116:36 | ...; |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:118:13:118:25 | ... ? ... : ... |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:118:17:118:20 | null |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:118:24:118:25 | "" |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:119:24:119:38 | ... \|\| ... |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:119:38:119:38 | access to parameter b |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:120:9:120:36 | ...; |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:122:13:122:25 | ... ? ... : ... |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:122:17:122:20 | null |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:122:24:122:25 | "" |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:123:23:123:36 | ... && ... |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:123:36:123:36 | access to parameter b |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:124:9:124:36 | ...; |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:126:13:126:25 | ... ? ... : ... |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:126:17:126:20 | null |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:126:24:126:25 | "" |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:127:24:127:38 | ... \|\| ... |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:127:38:127:38 | access to parameter b |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:128:9:128:36 | ...; |
+| Assert.cs:115:36:115:36 | access to parameter b | Assert.cs:115:36:115:36 | access to parameter b |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:116:9:116:36 | ...; |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:118:13:118:25 | ... ? ... : ... |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:118:17:118:20 | null |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:118:24:118:25 | "" |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:119:24:119:38 | ... \|\| ... |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:119:38:119:38 | access to parameter b |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:120:9:120:36 | ...; |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:122:13:122:25 | ... ? ... : ... |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:122:17:122:20 | null |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:122:24:122:25 | "" |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:123:23:123:36 | ... && ... |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:123:36:123:36 | access to parameter b |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:124:9:124:36 | ...; |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:126:13:126:25 | ... ? ... : ... |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:126:17:126:20 | null |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:126:24:126:25 | "" |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:127:24:127:38 | ... \|\| ... |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:127:38:127:38 | access to parameter b |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:128:9:128:36 | ...; |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:118:13:118:25 | ... ? ... : ... |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:119:24:119:38 | ... \|\| ... |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:119:38:119:38 | access to parameter b |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:120:9:120:36 | ...; |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:122:13:122:25 | ... ? ... : ... |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:122:17:122:20 | null |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:122:24:122:25 | "" |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:123:23:123:36 | ... && ... |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:123:36:123:36 | access to parameter b |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:124:9:124:36 | ...; |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:126:13:126:25 | ... ? ... : ... |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:126:17:126:20 | null |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:126:24:126:25 | "" |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:127:24:127:38 | ... \|\| ... |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:127:38:127:38 | access to parameter b |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:128:9:128:36 | ...; |
+| Assert.cs:118:17:118:20 | null | Assert.cs:118:17:118:20 | null |
+| Assert.cs:118:24:118:25 | "" | Assert.cs:118:24:118:25 | "" |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:119:24:119:38 | ... \|\| ... |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:120:9:120:36 | ...; |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:122:13:122:25 | ... ? ... : ... |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:122:17:122:20 | null |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:122:24:122:25 | "" |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:123:23:123:36 | ... && ... |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:123:36:123:36 | access to parameter b |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:124:9:124:36 | ...; |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:126:13:126:25 | ... ? ... : ... |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:126:17:126:20 | null |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:126:24:126:25 | "" |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:127:24:127:38 | ... \|\| ... |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:127:38:127:38 | access to parameter b |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:128:9:128:36 | ...; |
+| Assert.cs:119:38:119:38 | access to parameter b | Assert.cs:119:38:119:38 | access to parameter b |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:120:9:120:36 | ...; |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:122:13:122:25 | ... ? ... : ... |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:122:17:122:20 | null |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:122:24:122:25 | "" |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:123:23:123:36 | ... && ... |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:123:36:123:36 | access to parameter b |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:124:9:124:36 | ...; |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:126:13:126:25 | ... ? ... : ... |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:126:17:126:20 | null |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:126:24:126:25 | "" |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:127:24:127:38 | ... \|\| ... |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:127:38:127:38 | access to parameter b |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:128:9:128:36 | ...; |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:122:13:122:25 | ... ? ... : ... |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:123:23:123:36 | ... && ... |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:123:36:123:36 | access to parameter b |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:124:9:124:36 | ...; |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:126:13:126:25 | ... ? ... : ... |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:126:17:126:20 | null |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:126:24:126:25 | "" |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:127:24:127:38 | ... \|\| ... |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:127:38:127:38 | access to parameter b |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:128:9:128:36 | ...; |
+| Assert.cs:122:17:122:20 | null | Assert.cs:122:17:122:20 | null |
+| Assert.cs:122:24:122:25 | "" | Assert.cs:122:24:122:25 | "" |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:123:23:123:36 | ... && ... |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:124:9:124:36 | ...; |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:126:13:126:25 | ... ? ... : ... |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:126:17:126:20 | null |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:126:24:126:25 | "" |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:127:24:127:38 | ... \|\| ... |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:127:38:127:38 | access to parameter b |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:128:9:128:36 | ...; |
+| Assert.cs:123:36:123:36 | access to parameter b | Assert.cs:123:36:123:36 | access to parameter b |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:124:9:124:36 | ...; |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:126:13:126:25 | ... ? ... : ... |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:126:17:126:20 | null |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:126:24:126:25 | "" |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:127:24:127:38 | ... \|\| ... |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:127:38:127:38 | access to parameter b |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:128:9:128:36 | ...; |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:126:13:126:25 | ... ? ... : ... |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:127:24:127:38 | ... \|\| ... |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:127:38:127:38 | access to parameter b |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:128:9:128:36 | ...; |
+| Assert.cs:126:17:126:20 | null | Assert.cs:126:17:126:20 | null |
+| Assert.cs:126:24:126:25 | "" | Assert.cs:126:24:126:25 | "" |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:127:24:127:38 | ... \|\| ... |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:128:9:128:36 | ...; |
+| Assert.cs:127:38:127:38 | access to parameter b | Assert.cs:127:38:127:38 | access to parameter b |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:128:9:128:36 | ...; |
 | Assert.cs:131:18:131:32 | enter AssertTrueFalse | Assert.cs:131:18:131:32 | enter AssertTrueFalse |
 | Assert.cs:138:10:138:12 | enter M13 | Assert.cs:138:10:138:12 | enter M13 |
 | Assert.cs:138:10:138:12 | enter M13 | Assert.cs:138:10:138:12 | exit M13 |
 | Assert.cs:138:10:138:12 | enter M13 | Assert.cs:138:10:138:12 | exit M13 (abnormal) |
-| Assert.cs:138:10:138:12 | enter M13 | Assert.cs:140:29:140:30 | [assertion failure] access to parameter b2 |
-| Assert.cs:138:10:138:12 | enter M13 | Assert.cs:140:29:140:30 | access to parameter b2 |
-| Assert.cs:138:10:138:12 | enter M13 | Assert.cs:140:33:140:34 | [assertion failure] access to parameter b3 |
-| Assert.cs:138:10:138:12 | enter M13 | Assert.cs:140:33:140:34 | [assertion failure] access to parameter b3 |
-| Assert.cs:138:10:138:12 | enter M13 | Assert.cs:140:33:140:34 | [assertion success] access to parameter b3 |
+| Assert.cs:138:10:138:12 | enter M13 | Assert.cs:141:9:141:15 | return ...; |
 | Assert.cs:138:10:138:12 | exit M13 | Assert.cs:138:10:138:12 | exit M13 |
 | Assert.cs:138:10:138:12 | exit M13 (abnormal) | Assert.cs:138:10:138:12 | exit M13 (abnormal) |
-| Assert.cs:140:29:140:30 | [assertion failure] access to parameter b2 | Assert.cs:140:29:140:30 | [assertion failure] access to parameter b2 |
-| Assert.cs:140:29:140:30 | [assertion failure] access to parameter b2 | Assert.cs:140:33:140:34 | [assertion failure] access to parameter b3 |
-| Assert.cs:140:29:140:30 | access to parameter b2 | Assert.cs:140:29:140:30 | access to parameter b2 |
-| Assert.cs:140:29:140:30 | access to parameter b2 | Assert.cs:140:33:140:34 | [assertion failure] access to parameter b3 |
-| Assert.cs:140:29:140:30 | access to parameter b2 | Assert.cs:140:33:140:34 | [assertion success] access to parameter b3 |
-| Assert.cs:140:33:140:34 | [assertion failure] access to parameter b3 | Assert.cs:140:33:140:34 | [assertion failure] access to parameter b3 |
-| Assert.cs:140:33:140:34 | [assertion failure] access to parameter b3 | Assert.cs:140:33:140:34 | [assertion failure] access to parameter b3 |
-| Assert.cs:140:33:140:34 | [assertion success] access to parameter b3 | Assert.cs:140:33:140:34 | [assertion success] access to parameter b3 |
+| Assert.cs:141:9:141:15 | return ...; | Assert.cs:141:9:141:15 | return ...; |
 | Assignments.cs:1:7:1:17 | enter Assignments | Assignments.cs:1:7:1:17 | enter Assignments |
 | Assignments.cs:3:10:3:10 | enter M | Assignments.cs:3:10:3:10 | enter M |
 | Assignments.cs:14:18:14:35 | enter (...) => ... | Assignments.cs:14:18:14:35 | enter (...) => ... |
@@ -9983,92 +8497,67 @@ blockDominance
 | BreakInTry.cs:20:10:20:11 | enter M2 | BreakInTry.cs:27:21:27:26 | break; |
 | BreakInTry.cs:20:10:20:11 | enter M2 | BreakInTry.cs:30:13:33:13 | {...} |
 | BreakInTry.cs:20:10:20:11 | enter M2 | BreakInTry.cs:32:21:32:21 | ; |
-| BreakInTry.cs:20:10:20:11 | enter M2 | BreakInTry.cs:32:21:32:21 | [finally: break] ; |
 | BreakInTry.cs:20:10:20:11 | enter M2 | BreakInTry.cs:35:7:35:7 | ; |
 | BreakInTry.cs:22:9:34:9 | foreach (... ... in ...) ... | BreakInTry.cs:22:9:34:9 | foreach (... ... in ...) ... |
 | BreakInTry.cs:22:9:34:9 | foreach (... ... in ...) ... | BreakInTry.cs:22:22:22:24 | String arg |
 | BreakInTry.cs:22:9:34:9 | foreach (... ... in ...) ... | BreakInTry.cs:27:21:27:26 | break; |
 | BreakInTry.cs:22:9:34:9 | foreach (... ... in ...) ... | BreakInTry.cs:30:13:33:13 | {...} |
 | BreakInTry.cs:22:9:34:9 | foreach (... ... in ...) ... | BreakInTry.cs:32:21:32:21 | ; |
-| BreakInTry.cs:22:9:34:9 | foreach (... ... in ...) ... | BreakInTry.cs:32:21:32:21 | [finally: break] ; |
 | BreakInTry.cs:22:9:34:9 | foreach (... ... in ...) ... | BreakInTry.cs:35:7:35:7 | ; |
 | BreakInTry.cs:22:22:22:24 | String arg | BreakInTry.cs:22:22:22:24 | String arg |
 | BreakInTry.cs:22:22:22:24 | String arg | BreakInTry.cs:27:21:27:26 | break; |
 | BreakInTry.cs:22:22:22:24 | String arg | BreakInTry.cs:30:13:33:13 | {...} |
 | BreakInTry.cs:22:22:22:24 | String arg | BreakInTry.cs:32:21:32:21 | ; |
-| BreakInTry.cs:22:22:22:24 | String arg | BreakInTry.cs:32:21:32:21 | [finally: break] ; |
 | BreakInTry.cs:27:21:27:26 | break; | BreakInTry.cs:27:21:27:26 | break; |
-| BreakInTry.cs:27:21:27:26 | break; | BreakInTry.cs:32:21:32:21 | [finally: break] ; |
 | BreakInTry.cs:30:13:33:13 | {...} | BreakInTry.cs:30:13:33:13 | {...} |
 | BreakInTry.cs:30:13:33:13 | {...} | BreakInTry.cs:32:21:32:21 | ; |
 | BreakInTry.cs:32:21:32:21 | ; | BreakInTry.cs:32:21:32:21 | ; |
-| BreakInTry.cs:32:21:32:21 | [finally: break] ; | BreakInTry.cs:32:21:32:21 | [finally: break] ; |
 | BreakInTry.cs:35:7:35:7 | ; | BreakInTry.cs:35:7:35:7 | ; |
 | BreakInTry.cs:38:10:38:11 | enter M3 | BreakInTry.cs:38:10:38:11 | enter M3 |
 | BreakInTry.cs:38:10:38:11 | enter M3 | BreakInTry.cs:38:10:38:11 | exit M3 (normal) |
 | BreakInTry.cs:38:10:38:11 | enter M3 | BreakInTry.cs:43:17:43:23 | return ...; |
 | BreakInTry.cs:38:10:38:11 | enter M3 | BreakInTry.cs:46:9:52:9 | {...} |
-| BreakInTry.cs:38:10:38:11 | enter M3 | BreakInTry.cs:47:13:51:13 | [finally: return] foreach (... ... in ...) ... |
 | BreakInTry.cs:38:10:38:11 | enter M3 | BreakInTry.cs:47:13:51:13 | foreach (... ... in ...) ... |
 | BreakInTry.cs:38:10:38:11 | enter M3 | BreakInTry.cs:47:26:47:28 | String arg |
-| BreakInTry.cs:38:10:38:11 | enter M3 | BreakInTry.cs:47:26:47:28 | [finally: return] String arg |
-| BreakInTry.cs:38:10:38:11 | enter M3 | BreakInTry.cs:50:21:50:26 | [finally: return] break; |
 | BreakInTry.cs:38:10:38:11 | enter M3 | BreakInTry.cs:50:21:50:26 | break; |
 | BreakInTry.cs:38:10:38:11 | enter M3 | BreakInTry.cs:53:7:53:7 | ; |
 | BreakInTry.cs:38:10:38:11 | exit M3 (normal) | BreakInTry.cs:38:10:38:11 | exit M3 (normal) |
 | BreakInTry.cs:43:17:43:23 | return ...; | BreakInTry.cs:43:17:43:23 | return ...; |
-| BreakInTry.cs:43:17:43:23 | return ...; | BreakInTry.cs:47:13:51:13 | [finally: return] foreach (... ... in ...) ... |
-| BreakInTry.cs:43:17:43:23 | return ...; | BreakInTry.cs:47:26:47:28 | [finally: return] String arg |
-| BreakInTry.cs:43:17:43:23 | return ...; | BreakInTry.cs:50:21:50:26 | [finally: return] break; |
+| BreakInTry.cs:46:9:52:9 | {...} | BreakInTry.cs:38:10:38:11 | exit M3 (normal) |
 | BreakInTry.cs:46:9:52:9 | {...} | BreakInTry.cs:46:9:52:9 | {...} |
 | BreakInTry.cs:46:9:52:9 | {...} | BreakInTry.cs:47:13:51:13 | foreach (... ... in ...) ... |
 | BreakInTry.cs:46:9:52:9 | {...} | BreakInTry.cs:47:26:47:28 | String arg |
 | BreakInTry.cs:46:9:52:9 | {...} | BreakInTry.cs:50:21:50:26 | break; |
 | BreakInTry.cs:46:9:52:9 | {...} | BreakInTry.cs:53:7:53:7 | ; |
-| BreakInTry.cs:47:13:51:13 | [finally: return] foreach (... ... in ...) ... | BreakInTry.cs:47:13:51:13 | [finally: return] foreach (... ... in ...) ... |
-| BreakInTry.cs:47:13:51:13 | [finally: return] foreach (... ... in ...) ... | BreakInTry.cs:47:26:47:28 | [finally: return] String arg |
-| BreakInTry.cs:47:13:51:13 | [finally: return] foreach (... ... in ...) ... | BreakInTry.cs:50:21:50:26 | [finally: return] break; |
+| BreakInTry.cs:47:13:51:13 | foreach (... ... in ...) ... | BreakInTry.cs:38:10:38:11 | exit M3 (normal) |
 | BreakInTry.cs:47:13:51:13 | foreach (... ... in ...) ... | BreakInTry.cs:47:13:51:13 | foreach (... ... in ...) ... |
 | BreakInTry.cs:47:13:51:13 | foreach (... ... in ...) ... | BreakInTry.cs:47:26:47:28 | String arg |
 | BreakInTry.cs:47:13:51:13 | foreach (... ... in ...) ... | BreakInTry.cs:50:21:50:26 | break; |
 | BreakInTry.cs:47:13:51:13 | foreach (... ... in ...) ... | BreakInTry.cs:53:7:53:7 | ; |
 | BreakInTry.cs:47:26:47:28 | String arg | BreakInTry.cs:47:26:47:28 | String arg |
 | BreakInTry.cs:47:26:47:28 | String arg | BreakInTry.cs:50:21:50:26 | break; |
-| BreakInTry.cs:47:26:47:28 | [finally: return] String arg | BreakInTry.cs:47:26:47:28 | [finally: return] String arg |
-| BreakInTry.cs:47:26:47:28 | [finally: return] String arg | BreakInTry.cs:50:21:50:26 | [finally: return] break; |
-| BreakInTry.cs:50:21:50:26 | [finally: return] break; | BreakInTry.cs:50:21:50:26 | [finally: return] break; |
 | BreakInTry.cs:50:21:50:26 | break; | BreakInTry.cs:50:21:50:26 | break; |
 | BreakInTry.cs:53:7:53:7 | ; | BreakInTry.cs:53:7:53:7 | ; |
 | BreakInTry.cs:56:10:56:11 | enter M4 | BreakInTry.cs:56:10:56:11 | enter M4 |
 | BreakInTry.cs:56:10:56:11 | enter M4 | BreakInTry.cs:56:10:56:11 | exit M4 (normal) |
 | BreakInTry.cs:56:10:56:11 | enter M4 | BreakInTry.cs:61:17:61:23 | return ...; |
 | BreakInTry.cs:56:10:56:11 | enter M4 | BreakInTry.cs:64:9:70:9 | {...} |
-| BreakInTry.cs:56:10:56:11 | enter M4 | BreakInTry.cs:65:13:69:13 | [finally: return] foreach (... ... in ...) ... |
 | BreakInTry.cs:56:10:56:11 | enter M4 | BreakInTry.cs:65:13:69:13 | foreach (... ... in ...) ... |
 | BreakInTry.cs:56:10:56:11 | enter M4 | BreakInTry.cs:65:26:65:28 | String arg |
-| BreakInTry.cs:56:10:56:11 | enter M4 | BreakInTry.cs:65:26:65:28 | [finally: return] String arg |
-| BreakInTry.cs:56:10:56:11 | enter M4 | BreakInTry.cs:68:21:68:26 | [finally: return] break; |
 | BreakInTry.cs:56:10:56:11 | enter M4 | BreakInTry.cs:68:21:68:26 | break; |
 | BreakInTry.cs:56:10:56:11 | exit M4 (normal) | BreakInTry.cs:56:10:56:11 | exit M4 (normal) |
 | BreakInTry.cs:61:17:61:23 | return ...; | BreakInTry.cs:61:17:61:23 | return ...; |
-| BreakInTry.cs:61:17:61:23 | return ...; | BreakInTry.cs:65:13:69:13 | [finally: return] foreach (... ... in ...) ... |
-| BreakInTry.cs:61:17:61:23 | return ...; | BreakInTry.cs:65:26:65:28 | [finally: return] String arg |
-| BreakInTry.cs:61:17:61:23 | return ...; | BreakInTry.cs:68:21:68:26 | [finally: return] break; |
+| BreakInTry.cs:64:9:70:9 | {...} | BreakInTry.cs:56:10:56:11 | exit M4 (normal) |
 | BreakInTry.cs:64:9:70:9 | {...} | BreakInTry.cs:64:9:70:9 | {...} |
 | BreakInTry.cs:64:9:70:9 | {...} | BreakInTry.cs:65:13:69:13 | foreach (... ... in ...) ... |
 | BreakInTry.cs:64:9:70:9 | {...} | BreakInTry.cs:65:26:65:28 | String arg |
 | BreakInTry.cs:64:9:70:9 | {...} | BreakInTry.cs:68:21:68:26 | break; |
-| BreakInTry.cs:65:13:69:13 | [finally: return] foreach (... ... in ...) ... | BreakInTry.cs:65:13:69:13 | [finally: return] foreach (... ... in ...) ... |
-| BreakInTry.cs:65:13:69:13 | [finally: return] foreach (... ... in ...) ... | BreakInTry.cs:65:26:65:28 | [finally: return] String arg |
-| BreakInTry.cs:65:13:69:13 | [finally: return] foreach (... ... in ...) ... | BreakInTry.cs:68:21:68:26 | [finally: return] break; |
+| BreakInTry.cs:65:13:69:13 | foreach (... ... in ...) ... | BreakInTry.cs:56:10:56:11 | exit M4 (normal) |
 | BreakInTry.cs:65:13:69:13 | foreach (... ... in ...) ... | BreakInTry.cs:65:13:69:13 | foreach (... ... in ...) ... |
 | BreakInTry.cs:65:13:69:13 | foreach (... ... in ...) ... | BreakInTry.cs:65:26:65:28 | String arg |
 | BreakInTry.cs:65:13:69:13 | foreach (... ... in ...) ... | BreakInTry.cs:68:21:68:26 | break; |
 | BreakInTry.cs:65:26:65:28 | String arg | BreakInTry.cs:65:26:65:28 | String arg |
 | BreakInTry.cs:65:26:65:28 | String arg | BreakInTry.cs:68:21:68:26 | break; |
-| BreakInTry.cs:65:26:65:28 | [finally: return] String arg | BreakInTry.cs:65:26:65:28 | [finally: return] String arg |
-| BreakInTry.cs:65:26:65:28 | [finally: return] String arg | BreakInTry.cs:68:21:68:26 | [finally: return] break; |
-| BreakInTry.cs:68:21:68:26 | [finally: return] break; | BreakInTry.cs:68:21:68:26 | [finally: return] break; |
 | BreakInTry.cs:68:21:68:26 | break; | BreakInTry.cs:68:21:68:26 | break; |
 | CompileTimeOperators.cs:3:7:3:26 | enter CompileTimeOperators | CompileTimeOperators.cs:3:7:3:26 | enter CompileTimeOperators |
 | CompileTimeOperators.cs:5:9:5:15 | enter Default | CompileTimeOperators.cs:5:9:5:15 | enter Default |
@@ -10077,6 +8566,14 @@ blockDominance
 | CompileTimeOperators.cs:20:12:20:17 | enter Nameof | CompileTimeOperators.cs:20:12:20:17 | enter Nameof |
 | CompileTimeOperators.cs:26:7:26:22 | enter GotoInTryFinally | CompileTimeOperators.cs:26:7:26:22 | enter GotoInTryFinally |
 | CompileTimeOperators.cs:28:10:28:10 | enter M | CompileTimeOperators.cs:28:10:28:10 | enter M |
+| CompileTimeOperators.cs:28:10:28:10 | enter M | CompileTimeOperators.cs:28:10:28:10 | exit M |
+| CompileTimeOperators.cs:28:10:28:10 | enter M | CompileTimeOperators.cs:28:10:28:10 | exit M (abnormal) |
+| CompileTimeOperators.cs:28:10:28:10 | enter M | CompileTimeOperators.cs:39:9:39:34 | ...; |
+| CompileTimeOperators.cs:28:10:28:10 | enter M | CompileTimeOperators.cs:40:9:40:11 | End: |
+| CompileTimeOperators.cs:28:10:28:10 | exit M | CompileTimeOperators.cs:28:10:28:10 | exit M |
+| CompileTimeOperators.cs:28:10:28:10 | exit M (abnormal) | CompileTimeOperators.cs:28:10:28:10 | exit M (abnormal) |
+| CompileTimeOperators.cs:39:9:39:34 | ...; | CompileTimeOperators.cs:39:9:39:34 | ...; |
+| CompileTimeOperators.cs:40:9:40:11 | End: | CompileTimeOperators.cs:40:9:40:11 | End: |
 | ConditionalAccess.cs:1:7:1:23 | enter ConditionalAccess | ConditionalAccess.cs:1:7:1:23 | enter ConditionalAccess |
 | ConditionalAccess.cs:3:12:3:13 | enter M1 | ConditionalAccess.cs:3:12:3:13 | enter M1 |
 | ConditionalAccess.cs:3:12:3:13 | enter M1 | ConditionalAccess.cs:3:12:3:13 | exit M1 (normal) |
@@ -10152,42 +8649,41 @@ blockDominance
 | Conditions.cs:1:7:1:16 | enter Conditions | Conditions.cs:1:7:1:16 | enter Conditions |
 | Conditions.cs:3:10:3:19 | enter IncrOrDecr | Conditions.cs:3:10:3:19 | enter IncrOrDecr |
 | Conditions.cs:3:10:3:19 | enter IncrOrDecr | Conditions.cs:3:10:3:19 | exit IncrOrDecr (normal) |
-| Conditions.cs:3:10:3:19 | enter IncrOrDecr | Conditions.cs:6:13:6:16 | [inc (line 3): true] ...; |
-| Conditions.cs:3:10:3:19 | enter IncrOrDecr | Conditions.cs:7:9:8:16 | [inc (line 3): false] if (...) ... |
+| Conditions.cs:3:10:3:19 | enter IncrOrDecr | Conditions.cs:6:13:6:16 | ...; |
+| Conditions.cs:3:10:3:19 | enter IncrOrDecr | Conditions.cs:7:9:8:16 | if (...) ... |
 | Conditions.cs:3:10:3:19 | enter IncrOrDecr | Conditions.cs:7:13:7:16 | [false] !... |
 | Conditions.cs:3:10:3:19 | enter IncrOrDecr | Conditions.cs:7:13:7:16 | [true] !... |
 | Conditions.cs:3:10:3:19 | enter IncrOrDecr | Conditions.cs:8:13:8:16 | ...; |
 | Conditions.cs:3:10:3:19 | exit IncrOrDecr (normal) | Conditions.cs:3:10:3:19 | exit IncrOrDecr (normal) |
-| Conditions.cs:6:13:6:16 | [inc (line 3): true] ...; | Conditions.cs:6:13:6:16 | [inc (line 3): true] ...; |
-| Conditions.cs:6:13:6:16 | [inc (line 3): true] ...; | Conditions.cs:7:13:7:16 | [false] !... |
-| Conditions.cs:7:9:8:16 | [inc (line 3): false] if (...) ... | Conditions.cs:7:9:8:16 | [inc (line 3): false] if (...) ... |
-| Conditions.cs:7:9:8:16 | [inc (line 3): false] if (...) ... | Conditions.cs:7:13:7:16 | [true] !... |
-| Conditions.cs:7:9:8:16 | [inc (line 3): false] if (...) ... | Conditions.cs:8:13:8:16 | ...; |
+| Conditions.cs:6:13:6:16 | ...; | Conditions.cs:6:13:6:16 | ...; |
+| Conditions.cs:7:9:8:16 | if (...) ... | Conditions.cs:3:10:3:19 | exit IncrOrDecr (normal) |
+| Conditions.cs:7:9:8:16 | if (...) ... | Conditions.cs:7:9:8:16 | if (...) ... |
+| Conditions.cs:7:9:8:16 | if (...) ... | Conditions.cs:7:13:7:16 | [false] !... |
+| Conditions.cs:7:9:8:16 | if (...) ... | Conditions.cs:7:13:7:16 | [true] !... |
+| Conditions.cs:7:9:8:16 | if (...) ... | Conditions.cs:8:13:8:16 | ...; |
 | Conditions.cs:7:13:7:16 | [false] !... | Conditions.cs:7:13:7:16 | [false] !... |
 | Conditions.cs:7:13:7:16 | [true] !... | Conditions.cs:7:13:7:16 | [true] !... |
 | Conditions.cs:7:13:7:16 | [true] !... | Conditions.cs:8:13:8:16 | ...; |
 | Conditions.cs:8:13:8:16 | ...; | Conditions.cs:8:13:8:16 | ...; |
 | Conditions.cs:11:9:11:10 | enter M1 | Conditions.cs:11:9:11:10 | enter M1 |
-| Conditions.cs:11:9:11:10 | enter M1 | Conditions.cs:15:13:15:16 | [b (line 11): true] ...; |
-| Conditions.cs:11:9:11:10 | enter M1 | Conditions.cs:16:9:18:20 | [b (line 11): false] if (...) ... |
-| Conditions.cs:11:9:11:10 | enter M1 | Conditions.cs:17:13:18:20 | [b (line 11): false] if (...) ... |
-| Conditions.cs:11:9:11:10 | enter M1 | Conditions.cs:17:13:18:20 | [b (line 11): true] if (...) ... |
+| Conditions.cs:11:9:11:10 | enter M1 | Conditions.cs:15:13:15:16 | ...; |
+| Conditions.cs:11:9:11:10 | enter M1 | Conditions.cs:16:9:18:20 | if (...) ... |
+| Conditions.cs:11:9:11:10 | enter M1 | Conditions.cs:17:13:18:20 | if (...) ... |
 | Conditions.cs:11:9:11:10 | enter M1 | Conditions.cs:17:17:17:18 | [false] !... |
 | Conditions.cs:11:9:11:10 | enter M1 | Conditions.cs:17:17:17:18 | [true] !... |
 | Conditions.cs:11:9:11:10 | enter M1 | Conditions.cs:18:17:18:20 | ...; |
 | Conditions.cs:11:9:11:10 | enter M1 | Conditions.cs:19:16:19:16 | access to local variable x |
-| Conditions.cs:15:13:15:16 | [b (line 11): true] ...; | Conditions.cs:15:13:15:16 | [b (line 11): true] ...; |
-| Conditions.cs:15:13:15:16 | [b (line 11): true] ...; | Conditions.cs:17:13:18:20 | [b (line 11): true] if (...) ... |
-| Conditions.cs:15:13:15:16 | [b (line 11): true] ...; | Conditions.cs:17:17:17:18 | [false] !... |
-| Conditions.cs:16:9:18:20 | [b (line 11): false] if (...) ... | Conditions.cs:16:9:18:20 | [b (line 11): false] if (...) ... |
-| Conditions.cs:16:9:18:20 | [b (line 11): false] if (...) ... | Conditions.cs:17:13:18:20 | [b (line 11): false] if (...) ... |
-| Conditions.cs:16:9:18:20 | [b (line 11): false] if (...) ... | Conditions.cs:17:17:17:18 | [true] !... |
-| Conditions.cs:16:9:18:20 | [b (line 11): false] if (...) ... | Conditions.cs:18:17:18:20 | ...; |
-| Conditions.cs:17:13:18:20 | [b (line 11): false] if (...) ... | Conditions.cs:17:13:18:20 | [b (line 11): false] if (...) ... |
-| Conditions.cs:17:13:18:20 | [b (line 11): false] if (...) ... | Conditions.cs:17:17:17:18 | [true] !... |
-| Conditions.cs:17:13:18:20 | [b (line 11): false] if (...) ... | Conditions.cs:18:17:18:20 | ...; |
-| Conditions.cs:17:13:18:20 | [b (line 11): true] if (...) ... | Conditions.cs:17:13:18:20 | [b (line 11): true] if (...) ... |
-| Conditions.cs:17:13:18:20 | [b (line 11): true] if (...) ... | Conditions.cs:17:17:17:18 | [false] !... |
+| Conditions.cs:15:13:15:16 | ...; | Conditions.cs:15:13:15:16 | ...; |
+| Conditions.cs:16:9:18:20 | if (...) ... | Conditions.cs:16:9:18:20 | if (...) ... |
+| Conditions.cs:16:9:18:20 | if (...) ... | Conditions.cs:17:13:18:20 | if (...) ... |
+| Conditions.cs:16:9:18:20 | if (...) ... | Conditions.cs:17:17:17:18 | [false] !... |
+| Conditions.cs:16:9:18:20 | if (...) ... | Conditions.cs:17:17:17:18 | [true] !... |
+| Conditions.cs:16:9:18:20 | if (...) ... | Conditions.cs:18:17:18:20 | ...; |
+| Conditions.cs:16:9:18:20 | if (...) ... | Conditions.cs:19:16:19:16 | access to local variable x |
+| Conditions.cs:17:13:18:20 | if (...) ... | Conditions.cs:17:13:18:20 | if (...) ... |
+| Conditions.cs:17:13:18:20 | if (...) ... | Conditions.cs:17:17:17:18 | [false] !... |
+| Conditions.cs:17:13:18:20 | if (...) ... | Conditions.cs:17:17:17:18 | [true] !... |
+| Conditions.cs:17:13:18:20 | if (...) ... | Conditions.cs:18:17:18:20 | ...; |
 | Conditions.cs:17:17:17:18 | [false] !... | Conditions.cs:17:17:17:18 | [false] !... |
 | Conditions.cs:17:17:17:18 | [true] !... | Conditions.cs:17:17:17:18 | [true] !... |
 | Conditions.cs:17:17:17:18 | [true] !... | Conditions.cs:18:17:18:20 | ...; |
@@ -10195,85 +8691,69 @@ blockDominance
 | Conditions.cs:19:16:19:16 | access to local variable x | Conditions.cs:19:16:19:16 | access to local variable x |
 | Conditions.cs:22:9:22:10 | enter M2 | Conditions.cs:22:9:22:10 | enter M2 |
 | Conditions.cs:22:9:22:10 | enter M2 | Conditions.cs:26:13:27:20 | if (...) ... |
-| Conditions.cs:22:9:22:10 | enter M2 | Conditions.cs:27:17:27:20 | [b2 (line 22): true] ...; |
-| Conditions.cs:22:9:22:10 | enter M2 | Conditions.cs:28:9:29:16 | [b2 (line 22): false] if (...) ... |
+| Conditions.cs:22:9:22:10 | enter M2 | Conditions.cs:27:17:27:20 | ...; |
 | Conditions.cs:22:9:22:10 | enter M2 | Conditions.cs:28:9:29:16 | if (...) ... |
 | Conditions.cs:22:9:22:10 | enter M2 | Conditions.cs:29:13:29:16 | ...; |
 | Conditions.cs:22:9:22:10 | enter M2 | Conditions.cs:30:16:30:16 | access to local variable x |
 | Conditions.cs:26:13:27:20 | if (...) ... | Conditions.cs:26:13:27:20 | if (...) ... |
-| Conditions.cs:26:13:27:20 | if (...) ... | Conditions.cs:27:17:27:20 | [b2 (line 22): true] ...; |
-| Conditions.cs:26:13:27:20 | if (...) ... | Conditions.cs:28:9:29:16 | [b2 (line 22): false] if (...) ... |
-| Conditions.cs:27:17:27:20 | [b2 (line 22): true] ...; | Conditions.cs:27:17:27:20 | [b2 (line 22): true] ...; |
-| Conditions.cs:28:9:29:16 | [b2 (line 22): false] if (...) ... | Conditions.cs:28:9:29:16 | [b2 (line 22): false] if (...) ... |
+| Conditions.cs:26:13:27:20 | if (...) ... | Conditions.cs:27:17:27:20 | ...; |
+| Conditions.cs:27:17:27:20 | ...; | Conditions.cs:27:17:27:20 | ...; |
 | Conditions.cs:28:9:29:16 | if (...) ... | Conditions.cs:28:9:29:16 | if (...) ... |
+| Conditions.cs:28:9:29:16 | if (...) ... | Conditions.cs:29:13:29:16 | ...; |
+| Conditions.cs:28:9:29:16 | if (...) ... | Conditions.cs:30:16:30:16 | access to local variable x |
 | Conditions.cs:29:13:29:16 | ...; | Conditions.cs:29:13:29:16 | ...; |
 | Conditions.cs:30:16:30:16 | access to local variable x | Conditions.cs:30:16:30:16 | access to local variable x |
 | Conditions.cs:33:9:33:10 | enter M3 | Conditions.cs:33:9:33:10 | enter M3 |
 | Conditions.cs:33:9:33:10 | enter M3 | Conditions.cs:38:13:38:20 | ...; |
 | Conditions.cs:33:9:33:10 | enter M3 | Conditions.cs:39:9:40:16 | if (...) ... |
-| Conditions.cs:33:9:33:10 | enter M3 | Conditions.cs:40:13:40:16 | [b2 (line 39): true] ...; |
-| Conditions.cs:33:9:33:10 | enter M3 | Conditions.cs:41:9:42:16 | [b2 (line 39): false] if (...) ... |
+| Conditions.cs:33:9:33:10 | enter M3 | Conditions.cs:40:13:40:16 | ...; |
+| Conditions.cs:33:9:33:10 | enter M3 | Conditions.cs:41:9:42:16 | if (...) ... |
 | Conditions.cs:33:9:33:10 | enter M3 | Conditions.cs:42:13:42:16 | ...; |
 | Conditions.cs:33:9:33:10 | enter M3 | Conditions.cs:43:16:43:16 | access to local variable x |
 | Conditions.cs:38:13:38:20 | ...; | Conditions.cs:38:13:38:20 | ...; |
 | Conditions.cs:39:9:40:16 | if (...) ... | Conditions.cs:39:9:40:16 | if (...) ... |
-| Conditions.cs:39:9:40:16 | if (...) ... | Conditions.cs:40:13:40:16 | [b2 (line 39): true] ...; |
-| Conditions.cs:39:9:40:16 | if (...) ... | Conditions.cs:41:9:42:16 | [b2 (line 39): false] if (...) ... |
+| Conditions.cs:39:9:40:16 | if (...) ... | Conditions.cs:40:13:40:16 | ...; |
+| Conditions.cs:39:9:40:16 | if (...) ... | Conditions.cs:41:9:42:16 | if (...) ... |
 | Conditions.cs:39:9:40:16 | if (...) ... | Conditions.cs:42:13:42:16 | ...; |
 | Conditions.cs:39:9:40:16 | if (...) ... | Conditions.cs:43:16:43:16 | access to local variable x |
-| Conditions.cs:40:13:40:16 | [b2 (line 39): true] ...; | Conditions.cs:40:13:40:16 | [b2 (line 39): true] ...; |
-| Conditions.cs:40:13:40:16 | [b2 (line 39): true] ...; | Conditions.cs:42:13:42:16 | ...; |
-| Conditions.cs:41:9:42:16 | [b2 (line 39): false] if (...) ... | Conditions.cs:41:9:42:16 | [b2 (line 39): false] if (...) ... |
+| Conditions.cs:40:13:40:16 | ...; | Conditions.cs:40:13:40:16 | ...; |
+| Conditions.cs:41:9:42:16 | if (...) ... | Conditions.cs:41:9:42:16 | if (...) ... |
+| Conditions.cs:41:9:42:16 | if (...) ... | Conditions.cs:42:13:42:16 | ...; |
+| Conditions.cs:41:9:42:16 | if (...) ... | Conditions.cs:43:16:43:16 | access to local variable x |
 | Conditions.cs:42:13:42:16 | ...; | Conditions.cs:42:13:42:16 | ...; |
 | Conditions.cs:43:16:43:16 | access to local variable x | Conditions.cs:43:16:43:16 | access to local variable x |
 | Conditions.cs:46:9:46:10 | enter M4 | Conditions.cs:46:9:46:10 | enter M4 |
-| Conditions.cs:46:9:46:10 | enter M4 | Conditions.cs:49:16:49:16 | [b (line 46): false] access to parameter x |
-| Conditions.cs:46:9:46:10 | enter M4 | Conditions.cs:50:9:53:9 | [b (line 46): false] {...} |
-| Conditions.cs:46:9:46:10 | enter M4 | Conditions.cs:50:9:53:9 | [b (line 46): true] {...} |
+| Conditions.cs:46:9:46:10 | enter M4 | Conditions.cs:49:16:49:16 | access to parameter x |
 | Conditions.cs:46:9:46:10 | enter M4 | Conditions.cs:50:9:53:9 | {...} |
-| Conditions.cs:46:9:46:10 | enter M4 | Conditions.cs:52:17:52:20 | [b (line 46): true] ...; |
+| Conditions.cs:46:9:46:10 | enter M4 | Conditions.cs:52:17:52:20 | ...; |
 | Conditions.cs:46:9:46:10 | enter M4 | Conditions.cs:54:16:54:16 | access to local variable y |
-| Conditions.cs:49:16:49:16 | [b (line 46): false] access to parameter x | Conditions.cs:49:16:49:16 | [b (line 46): false] access to parameter x |
-| Conditions.cs:49:16:49:16 | [b (line 46): false] access to parameter x | Conditions.cs:50:9:53:9 | [b (line 46): false] {...} |
-| Conditions.cs:50:9:53:9 | [b (line 46): false] {...} | Conditions.cs:50:9:53:9 | [b (line 46): false] {...} |
-| Conditions.cs:50:9:53:9 | [b (line 46): true] {...} | Conditions.cs:50:9:53:9 | [b (line 46): true] {...} |
-| Conditions.cs:50:9:53:9 | {...} | Conditions.cs:49:16:49:16 | [b (line 46): false] access to parameter x |
-| Conditions.cs:50:9:53:9 | {...} | Conditions.cs:50:9:53:9 | [b (line 46): false] {...} |
-| Conditions.cs:50:9:53:9 | {...} | Conditions.cs:50:9:53:9 | [b (line 46): true] {...} |
+| Conditions.cs:49:16:49:16 | access to parameter x | Conditions.cs:49:16:49:16 | access to parameter x |
+| Conditions.cs:49:16:49:16 | access to parameter x | Conditions.cs:50:9:53:9 | {...} |
+| Conditions.cs:49:16:49:16 | access to parameter x | Conditions.cs:52:17:52:20 | ...; |
+| Conditions.cs:49:16:49:16 | access to parameter x | Conditions.cs:54:16:54:16 | access to local variable y |
 | Conditions.cs:50:9:53:9 | {...} | Conditions.cs:50:9:53:9 | {...} |
-| Conditions.cs:50:9:53:9 | {...} | Conditions.cs:52:17:52:20 | [b (line 46): true] ...; |
-| Conditions.cs:52:17:52:20 | [b (line 46): true] ...; | Conditions.cs:50:9:53:9 | [b (line 46): true] {...} |
-| Conditions.cs:52:17:52:20 | [b (line 46): true] ...; | Conditions.cs:52:17:52:20 | [b (line 46): true] ...; |
+| Conditions.cs:50:9:53:9 | {...} | Conditions.cs:52:17:52:20 | ...; |
+| Conditions.cs:52:17:52:20 | ...; | Conditions.cs:52:17:52:20 | ...; |
 | Conditions.cs:54:16:54:16 | access to local variable y | Conditions.cs:54:16:54:16 | access to local variable y |
 | Conditions.cs:57:9:57:10 | enter M5 | Conditions.cs:57:9:57:10 | enter M5 |
-| Conditions.cs:57:9:57:10 | enter M5 | Conditions.cs:60:16:60:16 | [b (line 57): false] access to parameter x |
-| Conditions.cs:57:9:57:10 | enter M5 | Conditions.cs:61:9:64:9 | [b (line 57): false] {...} |
-| Conditions.cs:57:9:57:10 | enter M5 | Conditions.cs:61:9:64:9 | [b (line 57): true] {...} |
+| Conditions.cs:57:9:57:10 | enter M5 | Conditions.cs:60:16:60:16 | access to parameter x |
 | Conditions.cs:57:9:57:10 | enter M5 | Conditions.cs:61:9:64:9 | {...} |
-| Conditions.cs:57:9:57:10 | enter M5 | Conditions.cs:63:17:63:20 | [b (line 57): true] ...; |
-| Conditions.cs:57:9:57:10 | enter M5 | Conditions.cs:65:9:66:16 | [b (line 57): false] if (...) ... |
-| Conditions.cs:57:9:57:10 | enter M5 | Conditions.cs:65:9:66:16 | [b (line 57): true] if (...) ... |
+| Conditions.cs:57:9:57:10 | enter M5 | Conditions.cs:63:17:63:20 | ...; |
 | Conditions.cs:57:9:57:10 | enter M5 | Conditions.cs:65:9:66:16 | if (...) ... |
 | Conditions.cs:57:9:57:10 | enter M5 | Conditions.cs:66:13:66:16 | ...; |
 | Conditions.cs:57:9:57:10 | enter M5 | Conditions.cs:67:16:67:16 | access to local variable y |
-| Conditions.cs:60:16:60:16 | [b (line 57): false] access to parameter x | Conditions.cs:60:16:60:16 | [b (line 57): false] access to parameter x |
-| Conditions.cs:60:16:60:16 | [b (line 57): false] access to parameter x | Conditions.cs:61:9:64:9 | [b (line 57): false] {...} |
-| Conditions.cs:60:16:60:16 | [b (line 57): false] access to parameter x | Conditions.cs:65:9:66:16 | [b (line 57): false] if (...) ... |
-| Conditions.cs:61:9:64:9 | [b (line 57): false] {...} | Conditions.cs:61:9:64:9 | [b (line 57): false] {...} |
-| Conditions.cs:61:9:64:9 | [b (line 57): true] {...} | Conditions.cs:61:9:64:9 | [b (line 57): true] {...} |
-| Conditions.cs:61:9:64:9 | {...} | Conditions.cs:60:16:60:16 | [b (line 57): false] access to parameter x |
-| Conditions.cs:61:9:64:9 | {...} | Conditions.cs:61:9:64:9 | [b (line 57): false] {...} |
-| Conditions.cs:61:9:64:9 | {...} | Conditions.cs:61:9:64:9 | [b (line 57): true] {...} |
+| Conditions.cs:60:16:60:16 | access to parameter x | Conditions.cs:60:16:60:16 | access to parameter x |
+| Conditions.cs:60:16:60:16 | access to parameter x | Conditions.cs:61:9:64:9 | {...} |
+| Conditions.cs:60:16:60:16 | access to parameter x | Conditions.cs:63:17:63:20 | ...; |
+| Conditions.cs:60:16:60:16 | access to parameter x | Conditions.cs:65:9:66:16 | if (...) ... |
+| Conditions.cs:60:16:60:16 | access to parameter x | Conditions.cs:66:13:66:16 | ...; |
+| Conditions.cs:60:16:60:16 | access to parameter x | Conditions.cs:67:16:67:16 | access to local variable y |
 | Conditions.cs:61:9:64:9 | {...} | Conditions.cs:61:9:64:9 | {...} |
-| Conditions.cs:61:9:64:9 | {...} | Conditions.cs:63:17:63:20 | [b (line 57): true] ...; |
-| Conditions.cs:61:9:64:9 | {...} | Conditions.cs:65:9:66:16 | [b (line 57): false] if (...) ... |
-| Conditions.cs:61:9:64:9 | {...} | Conditions.cs:65:9:66:16 | [b (line 57): true] if (...) ... |
-| Conditions.cs:63:17:63:20 | [b (line 57): true] ...; | Conditions.cs:61:9:64:9 | [b (line 57): true] {...} |
-| Conditions.cs:63:17:63:20 | [b (line 57): true] ...; | Conditions.cs:63:17:63:20 | [b (line 57): true] ...; |
-| Conditions.cs:63:17:63:20 | [b (line 57): true] ...; | Conditions.cs:65:9:66:16 | [b (line 57): true] if (...) ... |
-| Conditions.cs:65:9:66:16 | [b (line 57): false] if (...) ... | Conditions.cs:65:9:66:16 | [b (line 57): false] if (...) ... |
-| Conditions.cs:65:9:66:16 | [b (line 57): true] if (...) ... | Conditions.cs:65:9:66:16 | [b (line 57): true] if (...) ... |
+| Conditions.cs:61:9:64:9 | {...} | Conditions.cs:63:17:63:20 | ...; |
+| Conditions.cs:63:17:63:20 | ...; | Conditions.cs:63:17:63:20 | ...; |
 | Conditions.cs:65:9:66:16 | if (...) ... | Conditions.cs:65:9:66:16 | if (...) ... |
+| Conditions.cs:65:9:66:16 | if (...) ... | Conditions.cs:66:13:66:16 | ...; |
+| Conditions.cs:65:9:66:16 | if (...) ... | Conditions.cs:67:16:67:16 | access to local variable y |
 | Conditions.cs:66:13:66:16 | ...; | Conditions.cs:66:13:66:16 | ...; |
 | Conditions.cs:67:16:67:16 | access to local variable y | Conditions.cs:67:16:67:16 | access to local variable y |
 | Conditions.cs:70:9:70:10 | enter M6 | Conditions.cs:70:9:70:10 | enter M6 |
@@ -10340,26 +8820,24 @@ blockDominance
 | Conditions.cs:97:17:97:20 | ...; | Conditions.cs:97:17:97:20 | ...; |
 | Conditions.cs:99:16:99:16 | access to local variable x | Conditions.cs:99:16:99:16 | access to local variable x |
 | Conditions.cs:102:12:102:13 | enter M8 | Conditions.cs:102:12:102:13 | enter M8 |
-| Conditions.cs:102:12:102:13 | enter M8 | Conditions.cs:106:13:106:20 | [b (line 102): true] ...; |
-| Conditions.cs:102:12:102:13 | enter M8 | Conditions.cs:107:9:109:24 | [b (line 102): false] if (...) ... |
-| Conditions.cs:102:12:102:13 | enter M8 | Conditions.cs:108:13:109:24 | [b (line 102): false] if (...) ... |
-| Conditions.cs:102:12:102:13 | enter M8 | Conditions.cs:108:13:109:24 | [b (line 102): true] if (...) ... |
+| Conditions.cs:102:12:102:13 | enter M8 | Conditions.cs:106:13:106:20 | ...; |
+| Conditions.cs:102:12:102:13 | enter M8 | Conditions.cs:107:9:109:24 | if (...) ... |
+| Conditions.cs:102:12:102:13 | enter M8 | Conditions.cs:108:13:109:24 | if (...) ... |
 | Conditions.cs:102:12:102:13 | enter M8 | Conditions.cs:108:17:108:18 | [false] !... |
 | Conditions.cs:102:12:102:13 | enter M8 | Conditions.cs:108:17:108:18 | [true] !... |
 | Conditions.cs:102:12:102:13 | enter M8 | Conditions.cs:109:17:109:24 | ...; |
 | Conditions.cs:102:12:102:13 | enter M8 | Conditions.cs:110:16:110:16 | access to local variable x |
-| Conditions.cs:106:13:106:20 | [b (line 102): true] ...; | Conditions.cs:106:13:106:20 | [b (line 102): true] ...; |
-| Conditions.cs:106:13:106:20 | [b (line 102): true] ...; | Conditions.cs:108:13:109:24 | [b (line 102): true] if (...) ... |
-| Conditions.cs:106:13:106:20 | [b (line 102): true] ...; | Conditions.cs:108:17:108:18 | [false] !... |
-| Conditions.cs:107:9:109:24 | [b (line 102): false] if (...) ... | Conditions.cs:107:9:109:24 | [b (line 102): false] if (...) ... |
-| Conditions.cs:107:9:109:24 | [b (line 102): false] if (...) ... | Conditions.cs:108:13:109:24 | [b (line 102): false] if (...) ... |
-| Conditions.cs:107:9:109:24 | [b (line 102): false] if (...) ... | Conditions.cs:108:17:108:18 | [true] !... |
-| Conditions.cs:107:9:109:24 | [b (line 102): false] if (...) ... | Conditions.cs:109:17:109:24 | ...; |
-| Conditions.cs:108:13:109:24 | [b (line 102): false] if (...) ... | Conditions.cs:108:13:109:24 | [b (line 102): false] if (...) ... |
-| Conditions.cs:108:13:109:24 | [b (line 102): false] if (...) ... | Conditions.cs:108:17:108:18 | [true] !... |
-| Conditions.cs:108:13:109:24 | [b (line 102): false] if (...) ... | Conditions.cs:109:17:109:24 | ...; |
-| Conditions.cs:108:13:109:24 | [b (line 102): true] if (...) ... | Conditions.cs:108:13:109:24 | [b (line 102): true] if (...) ... |
-| Conditions.cs:108:13:109:24 | [b (line 102): true] if (...) ... | Conditions.cs:108:17:108:18 | [false] !... |
+| Conditions.cs:106:13:106:20 | ...; | Conditions.cs:106:13:106:20 | ...; |
+| Conditions.cs:107:9:109:24 | if (...) ... | Conditions.cs:107:9:109:24 | if (...) ... |
+| Conditions.cs:107:9:109:24 | if (...) ... | Conditions.cs:108:13:109:24 | if (...) ... |
+| Conditions.cs:107:9:109:24 | if (...) ... | Conditions.cs:108:17:108:18 | [false] !... |
+| Conditions.cs:107:9:109:24 | if (...) ... | Conditions.cs:108:17:108:18 | [true] !... |
+| Conditions.cs:107:9:109:24 | if (...) ... | Conditions.cs:109:17:109:24 | ...; |
+| Conditions.cs:107:9:109:24 | if (...) ... | Conditions.cs:110:16:110:16 | access to local variable x |
+| Conditions.cs:108:13:109:24 | if (...) ... | Conditions.cs:108:13:109:24 | if (...) ... |
+| Conditions.cs:108:13:109:24 | if (...) ... | Conditions.cs:108:17:108:18 | [false] !... |
+| Conditions.cs:108:13:109:24 | if (...) ... | Conditions.cs:108:17:108:18 | [true] !... |
+| Conditions.cs:108:13:109:24 | if (...) ... | Conditions.cs:109:17:109:24 | ...; |
 | Conditions.cs:108:17:108:18 | [false] !... | Conditions.cs:108:17:108:18 | [false] !... |
 | Conditions.cs:108:17:108:18 | [true] !... | Conditions.cs:108:17:108:18 | [true] !... |
 | Conditions.cs:108:17:108:18 | [true] !... | Conditions.cs:109:17:109:24 | ...; |
@@ -10370,92 +8848,66 @@ blockDominance
 | Conditions.cs:113:10:113:11 | enter M9 | Conditions.cs:116:25:116:25 | access to local variable i |
 | Conditions.cs:113:10:113:11 | enter M9 | Conditions.cs:116:42:116:42 | access to local variable i |
 | Conditions.cs:113:10:113:11 | enter M9 | Conditions.cs:117:9:123:9 | {...} |
-| Conditions.cs:113:10:113:11 | enter M9 | Conditions.cs:119:17:119:21 | [false, last (line 118): true] !... |
-| Conditions.cs:113:10:113:11 | enter M9 | Conditions.cs:119:17:119:21 | [true, last (line 118): false] !... |
-| Conditions.cs:113:10:113:11 | enter M9 | Conditions.cs:120:17:120:23 | [last (line 118): false] ...; |
-| Conditions.cs:113:10:113:11 | enter M9 | Conditions.cs:121:13:122:25 | [last (line 118): true] if (...) ... |
+| Conditions.cs:113:10:113:11 | enter M9 | Conditions.cs:119:17:119:21 | [false] !... |
+| Conditions.cs:113:10:113:11 | enter M9 | Conditions.cs:119:17:119:21 | [true] !... |
+| Conditions.cs:113:10:113:11 | enter M9 | Conditions.cs:120:17:120:23 | ...; |
+| Conditions.cs:113:10:113:11 | enter M9 | Conditions.cs:121:13:122:25 | if (...) ... |
 | Conditions.cs:113:10:113:11 | enter M9 | Conditions.cs:122:17:122:25 | ...; |
 | Conditions.cs:113:10:113:11 | exit M9 (normal) | Conditions.cs:113:10:113:11 | exit M9 (normal) |
 | Conditions.cs:116:25:116:25 | access to local variable i | Conditions.cs:113:10:113:11 | exit M9 (normal) |
 | Conditions.cs:116:25:116:25 | access to local variable i | Conditions.cs:116:25:116:25 | access to local variable i |
 | Conditions.cs:116:25:116:25 | access to local variable i | Conditions.cs:116:42:116:42 | access to local variable i |
 | Conditions.cs:116:25:116:25 | access to local variable i | Conditions.cs:117:9:123:9 | {...} |
-| Conditions.cs:116:25:116:25 | access to local variable i | Conditions.cs:119:17:119:21 | [false, last (line 118): true] !... |
-| Conditions.cs:116:25:116:25 | access to local variable i | Conditions.cs:119:17:119:21 | [true, last (line 118): false] !... |
-| Conditions.cs:116:25:116:25 | access to local variable i | Conditions.cs:120:17:120:23 | [last (line 118): false] ...; |
-| Conditions.cs:116:25:116:25 | access to local variable i | Conditions.cs:121:13:122:25 | [last (line 118): true] if (...) ... |
+| Conditions.cs:116:25:116:25 | access to local variable i | Conditions.cs:119:17:119:21 | [false] !... |
+| Conditions.cs:116:25:116:25 | access to local variable i | Conditions.cs:119:17:119:21 | [true] !... |
+| Conditions.cs:116:25:116:25 | access to local variable i | Conditions.cs:120:17:120:23 | ...; |
+| Conditions.cs:116:25:116:25 | access to local variable i | Conditions.cs:121:13:122:25 | if (...) ... |
 | Conditions.cs:116:25:116:25 | access to local variable i | Conditions.cs:122:17:122:25 | ...; |
 | Conditions.cs:116:42:116:42 | access to local variable i | Conditions.cs:116:42:116:42 | access to local variable i |
 | Conditions.cs:117:9:123:9 | {...} | Conditions.cs:116:42:116:42 | access to local variable i |
 | Conditions.cs:117:9:123:9 | {...} | Conditions.cs:117:9:123:9 | {...} |
-| Conditions.cs:117:9:123:9 | {...} | Conditions.cs:119:17:119:21 | [false, last (line 118): true] !... |
-| Conditions.cs:117:9:123:9 | {...} | Conditions.cs:119:17:119:21 | [true, last (line 118): false] !... |
-| Conditions.cs:117:9:123:9 | {...} | Conditions.cs:120:17:120:23 | [last (line 118): false] ...; |
-| Conditions.cs:117:9:123:9 | {...} | Conditions.cs:121:13:122:25 | [last (line 118): true] if (...) ... |
+| Conditions.cs:117:9:123:9 | {...} | Conditions.cs:119:17:119:21 | [false] !... |
+| Conditions.cs:117:9:123:9 | {...} | Conditions.cs:119:17:119:21 | [true] !... |
+| Conditions.cs:117:9:123:9 | {...} | Conditions.cs:120:17:120:23 | ...; |
+| Conditions.cs:117:9:123:9 | {...} | Conditions.cs:121:13:122:25 | if (...) ... |
 | Conditions.cs:117:9:123:9 | {...} | Conditions.cs:122:17:122:25 | ...; |
-| Conditions.cs:119:17:119:21 | [false, last (line 118): true] !... | Conditions.cs:119:17:119:21 | [false, last (line 118): true] !... |
-| Conditions.cs:119:17:119:21 | [false, last (line 118): true] !... | Conditions.cs:121:13:122:25 | [last (line 118): true] if (...) ... |
-| Conditions.cs:119:17:119:21 | [false, last (line 118): true] !... | Conditions.cs:122:17:122:25 | ...; |
-| Conditions.cs:119:17:119:21 | [true, last (line 118): false] !... | Conditions.cs:119:17:119:21 | [true, last (line 118): false] !... |
-| Conditions.cs:119:17:119:21 | [true, last (line 118): false] !... | Conditions.cs:120:17:120:23 | [last (line 118): false] ...; |
-| Conditions.cs:120:17:120:23 | [last (line 118): false] ...; | Conditions.cs:120:17:120:23 | [last (line 118): false] ...; |
-| Conditions.cs:121:13:122:25 | [last (line 118): true] if (...) ... | Conditions.cs:121:13:122:25 | [last (line 118): true] if (...) ... |
-| Conditions.cs:121:13:122:25 | [last (line 118): true] if (...) ... | Conditions.cs:122:17:122:25 | ...; |
+| Conditions.cs:119:17:119:21 | [false] !... | Conditions.cs:119:17:119:21 | [false] !... |
+| Conditions.cs:119:17:119:21 | [true] !... | Conditions.cs:119:17:119:21 | [true] !... |
+| Conditions.cs:119:17:119:21 | [true] !... | Conditions.cs:120:17:120:23 | ...; |
+| Conditions.cs:120:17:120:23 | ...; | Conditions.cs:120:17:120:23 | ...; |
+| Conditions.cs:121:13:122:25 | if (...) ... | Conditions.cs:116:42:116:42 | access to local variable i |
+| Conditions.cs:121:13:122:25 | if (...) ... | Conditions.cs:121:13:122:25 | if (...) ... |
+| Conditions.cs:121:13:122:25 | if (...) ... | Conditions.cs:122:17:122:25 | ...; |
 | Conditions.cs:122:17:122:25 | ...; | Conditions.cs:122:17:122:25 | ...; |
 | Conditions.cs:129:10:129:12 | enter M10 | Conditions.cs:129:10:129:12 | enter M10 |
-| Conditions.cs:129:10:129:12 | enter M10 | Conditions.cs:131:16:131:19 | [Field1 (line 129): false] true |
-| Conditions.cs:129:10:129:12 | enter M10 | Conditions.cs:131:16:131:19 | [Field1 (line 129): true, Field2 (line 129): false] true |
-| Conditions.cs:129:10:129:12 | enter M10 | Conditions.cs:132:9:140:9 | [Field1 (line 129): false] {...} |
-| Conditions.cs:129:10:129:12 | enter M10 | Conditions.cs:132:9:140:9 | [Field1 (line 129): true, Field2 (line 129): false] {...} |
-| Conditions.cs:129:10:129:12 | enter M10 | Conditions.cs:132:9:140:9 | [Field1 (line 129): true, Field2 (line 129): true] {...} |
+| Conditions.cs:129:10:129:12 | enter M10 | Conditions.cs:131:16:131:19 | true |
 | Conditions.cs:129:10:129:12 | enter M10 | Conditions.cs:132:9:140:9 | {...} |
-| Conditions.cs:129:10:129:12 | enter M10 | Conditions.cs:134:13:139:13 | [Field1 (line 129): true, Field2 (line 129): false] {...} |
-| Conditions.cs:129:10:129:12 | enter M10 | Conditions.cs:134:13:139:13 | [Field1 (line 129): true, Field2 (line 129): true] {...} |
-| Conditions.cs:129:10:129:12 | enter M10 | Conditions.cs:134:13:139:13 | [Field1 (line 129): true] {...} |
-| Conditions.cs:129:10:129:12 | enter M10 | Conditions.cs:136:17:138:17 | [Field1 (line 129): true, Field2 (line 129): true] {...} |
-| Conditions.cs:131:16:131:19 | [Field1 (line 129): false] true | Conditions.cs:131:16:131:19 | [Field1 (line 129): false] true |
-| Conditions.cs:131:16:131:19 | [Field1 (line 129): false] true | Conditions.cs:132:9:140:9 | [Field1 (line 129): false] {...} |
-| Conditions.cs:131:16:131:19 | [Field1 (line 129): true, Field2 (line 129): false] true | Conditions.cs:131:16:131:19 | [Field1 (line 129): true, Field2 (line 129): false] true |
-| Conditions.cs:131:16:131:19 | [Field1 (line 129): true, Field2 (line 129): false] true | Conditions.cs:132:9:140:9 | [Field1 (line 129): true, Field2 (line 129): false] {...} |
-| Conditions.cs:131:16:131:19 | [Field1 (line 129): true, Field2 (line 129): false] true | Conditions.cs:134:13:139:13 | [Field1 (line 129): true, Field2 (line 129): false] {...} |
-| Conditions.cs:132:9:140:9 | [Field1 (line 129): false] {...} | Conditions.cs:132:9:140:9 | [Field1 (line 129): false] {...} |
-| Conditions.cs:132:9:140:9 | [Field1 (line 129): true, Field2 (line 129): false] {...} | Conditions.cs:132:9:140:9 | [Field1 (line 129): true, Field2 (line 129): false] {...} |
-| Conditions.cs:132:9:140:9 | [Field1 (line 129): true, Field2 (line 129): false] {...} | Conditions.cs:134:13:139:13 | [Field1 (line 129): true, Field2 (line 129): false] {...} |
-| Conditions.cs:132:9:140:9 | [Field1 (line 129): true, Field2 (line 129): true] {...} | Conditions.cs:132:9:140:9 | [Field1 (line 129): true, Field2 (line 129): true] {...} |
-| Conditions.cs:132:9:140:9 | [Field1 (line 129): true, Field2 (line 129): true] {...} | Conditions.cs:134:13:139:13 | [Field1 (line 129): true, Field2 (line 129): true] {...} |
-| Conditions.cs:132:9:140:9 | {...} | Conditions.cs:131:16:131:19 | [Field1 (line 129): false] true |
-| Conditions.cs:132:9:140:9 | {...} | Conditions.cs:131:16:131:19 | [Field1 (line 129): true, Field2 (line 129): false] true |
-| Conditions.cs:132:9:140:9 | {...} | Conditions.cs:132:9:140:9 | [Field1 (line 129): false] {...} |
-| Conditions.cs:132:9:140:9 | {...} | Conditions.cs:132:9:140:9 | [Field1 (line 129): true, Field2 (line 129): false] {...} |
-| Conditions.cs:132:9:140:9 | {...} | Conditions.cs:132:9:140:9 | [Field1 (line 129): true, Field2 (line 129): true] {...} |
+| Conditions.cs:129:10:129:12 | enter M10 | Conditions.cs:134:13:139:13 | {...} |
+| Conditions.cs:129:10:129:12 | enter M10 | Conditions.cs:136:17:138:17 | {...} |
+| Conditions.cs:131:16:131:19 | true | Conditions.cs:131:16:131:19 | true |
+| Conditions.cs:131:16:131:19 | true | Conditions.cs:132:9:140:9 | {...} |
+| Conditions.cs:131:16:131:19 | true | Conditions.cs:134:13:139:13 | {...} |
+| Conditions.cs:131:16:131:19 | true | Conditions.cs:136:17:138:17 | {...} |
 | Conditions.cs:132:9:140:9 | {...} | Conditions.cs:132:9:140:9 | {...} |
-| Conditions.cs:132:9:140:9 | {...} | Conditions.cs:134:13:139:13 | [Field1 (line 129): true, Field2 (line 129): false] {...} |
-| Conditions.cs:132:9:140:9 | {...} | Conditions.cs:134:13:139:13 | [Field1 (line 129): true, Field2 (line 129): true] {...} |
-| Conditions.cs:132:9:140:9 | {...} | Conditions.cs:134:13:139:13 | [Field1 (line 129): true] {...} |
-| Conditions.cs:132:9:140:9 | {...} | Conditions.cs:136:17:138:17 | [Field1 (line 129): true, Field2 (line 129): true] {...} |
-| Conditions.cs:134:13:139:13 | [Field1 (line 129): true, Field2 (line 129): false] {...} | Conditions.cs:134:13:139:13 | [Field1 (line 129): true, Field2 (line 129): false] {...} |
-| Conditions.cs:134:13:139:13 | [Field1 (line 129): true, Field2 (line 129): true] {...} | Conditions.cs:134:13:139:13 | [Field1 (line 129): true, Field2 (line 129): true] {...} |
-| Conditions.cs:134:13:139:13 | [Field1 (line 129): true] {...} | Conditions.cs:131:16:131:19 | [Field1 (line 129): true, Field2 (line 129): false] true |
-| Conditions.cs:134:13:139:13 | [Field1 (line 129): true] {...} | Conditions.cs:132:9:140:9 | [Field1 (line 129): true, Field2 (line 129): false] {...} |
-| Conditions.cs:134:13:139:13 | [Field1 (line 129): true] {...} | Conditions.cs:132:9:140:9 | [Field1 (line 129): true, Field2 (line 129): true] {...} |
-| Conditions.cs:134:13:139:13 | [Field1 (line 129): true] {...} | Conditions.cs:134:13:139:13 | [Field1 (line 129): true, Field2 (line 129): false] {...} |
-| Conditions.cs:134:13:139:13 | [Field1 (line 129): true] {...} | Conditions.cs:134:13:139:13 | [Field1 (line 129): true, Field2 (line 129): true] {...} |
-| Conditions.cs:134:13:139:13 | [Field1 (line 129): true] {...} | Conditions.cs:134:13:139:13 | [Field1 (line 129): true] {...} |
-| Conditions.cs:134:13:139:13 | [Field1 (line 129): true] {...} | Conditions.cs:136:17:138:17 | [Field1 (line 129): true, Field2 (line 129): true] {...} |
-| Conditions.cs:136:17:138:17 | [Field1 (line 129): true, Field2 (line 129): true] {...} | Conditions.cs:132:9:140:9 | [Field1 (line 129): true, Field2 (line 129): true] {...} |
-| Conditions.cs:136:17:138:17 | [Field1 (line 129): true, Field2 (line 129): true] {...} | Conditions.cs:134:13:139:13 | [Field1 (line 129): true, Field2 (line 129): true] {...} |
-| Conditions.cs:136:17:138:17 | [Field1 (line 129): true, Field2 (line 129): true] {...} | Conditions.cs:136:17:138:17 | [Field1 (line 129): true, Field2 (line 129): true] {...} |
+| Conditions.cs:132:9:140:9 | {...} | Conditions.cs:134:13:139:13 | {...} |
+| Conditions.cs:132:9:140:9 | {...} | Conditions.cs:136:17:138:17 | {...} |
+| Conditions.cs:134:13:139:13 | {...} | Conditions.cs:134:13:139:13 | {...} |
+| Conditions.cs:134:13:139:13 | {...} | Conditions.cs:136:17:138:17 | {...} |
+| Conditions.cs:136:17:138:17 | {...} | Conditions.cs:136:17:138:17 | {...} |
 | Conditions.cs:143:10:143:12 | enter M11 | Conditions.cs:143:10:143:12 | enter M11 |
 | Conditions.cs:143:10:143:12 | enter M11 | Conditions.cs:143:10:143:12 | exit M11 (normal) |
-| Conditions.cs:143:10:143:12 | enter M11 | Conditions.cs:145:21:145:23 | [b (line 143): true] "a" |
-| Conditions.cs:143:10:143:12 | enter M11 | Conditions.cs:145:27:145:29 | [b (line 143): false] "b" |
+| Conditions.cs:143:10:143:12 | enter M11 | Conditions.cs:145:17:145:29 | ... ? ... : ... |
+| Conditions.cs:143:10:143:12 | enter M11 | Conditions.cs:145:21:145:23 | "a" |
+| Conditions.cs:143:10:143:12 | enter M11 | Conditions.cs:145:27:145:29 | "b" |
 | Conditions.cs:143:10:143:12 | enter M11 | Conditions.cs:147:13:147:49 | ...; |
 | Conditions.cs:143:10:143:12 | enter M11 | Conditions.cs:149:13:149:49 | ...; |
 | Conditions.cs:143:10:143:12 | exit M11 (normal) | Conditions.cs:143:10:143:12 | exit M11 (normal) |
-| Conditions.cs:145:21:145:23 | [b (line 143): true] "a" | Conditions.cs:145:21:145:23 | [b (line 143): true] "a" |
-| Conditions.cs:145:21:145:23 | [b (line 143): true] "a" | Conditions.cs:147:13:147:49 | ...; |
-| Conditions.cs:145:27:145:29 | [b (line 143): false] "b" | Conditions.cs:145:27:145:29 | [b (line 143): false] "b" |
-| Conditions.cs:145:27:145:29 | [b (line 143): false] "b" | Conditions.cs:149:13:149:49 | ...; |
+| Conditions.cs:145:17:145:29 | ... ? ... : ... | Conditions.cs:143:10:143:12 | exit M11 (normal) |
+| Conditions.cs:145:17:145:29 | ... ? ... : ... | Conditions.cs:145:17:145:29 | ... ? ... : ... |
+| Conditions.cs:145:17:145:29 | ... ? ... : ... | Conditions.cs:147:13:147:49 | ...; |
+| Conditions.cs:145:17:145:29 | ... ? ... : ... | Conditions.cs:149:13:149:49 | ...; |
+| Conditions.cs:145:21:145:23 | "a" | Conditions.cs:145:21:145:23 | "a" |
+| Conditions.cs:145:27:145:29 | "b" | Conditions.cs:145:27:145:29 | "b" |
 | Conditions.cs:147:13:147:49 | ...; | Conditions.cs:147:13:147:49 | ...; |
 | Conditions.cs:149:13:149:49 | ...; | Conditions.cs:149:13:149:49 | ...; |
 | ExitMethods.cs:6:7:6:17 | enter ExitMethods | ExitMethods.cs:6:7:6:17 | enter ExitMethods |
@@ -10466,19 +8918,13 @@ blockDominance
 | ExitMethods.cs:32:10:32:11 | enter M5 | ExitMethods.cs:32:10:32:11 | enter M5 |
 | ExitMethods.cs:38:10:38:11 | enter M6 | ExitMethods.cs:38:10:38:11 | enter M6 |
 | ExitMethods.cs:38:10:38:11 | enter M6 | ExitMethods.cs:38:10:38:11 | exit M6 (normal) |
-| ExitMethods.cs:38:10:38:11 | enter M6 | ExitMethods.cs:44:9:47:9 | [exception: ArgumentException] catch (...) {...} |
-| ExitMethods.cs:38:10:38:11 | enter M6 | ExitMethods.cs:44:9:47:9 | [exception: Exception] catch (...) {...} |
 | ExitMethods.cs:38:10:38:11 | enter M6 | ExitMethods.cs:45:9:47:9 | {...} |
-| ExitMethods.cs:38:10:38:11 | enter M6 | ExitMethods.cs:48:9:51:9 | [exception: Exception] catch (...) {...} |
+| ExitMethods.cs:38:10:38:11 | enter M6 | ExitMethods.cs:48:9:51:9 | catch (...) {...} |
 | ExitMethods.cs:38:10:38:11 | enter M6 | ExitMethods.cs:49:9:51:9 | {...} |
 | ExitMethods.cs:38:10:38:11 | exit M6 (normal) | ExitMethods.cs:38:10:38:11 | exit M6 (normal) |
-| ExitMethods.cs:44:9:47:9 | [exception: ArgumentException] catch (...) {...} | ExitMethods.cs:44:9:47:9 | [exception: ArgumentException] catch (...) {...} |
-| ExitMethods.cs:44:9:47:9 | [exception: Exception] catch (...) {...} | ExitMethods.cs:44:9:47:9 | [exception: Exception] catch (...) {...} |
-| ExitMethods.cs:44:9:47:9 | [exception: Exception] catch (...) {...} | ExitMethods.cs:48:9:51:9 | [exception: Exception] catch (...) {...} |
-| ExitMethods.cs:44:9:47:9 | [exception: Exception] catch (...) {...} | ExitMethods.cs:49:9:51:9 | {...} |
 | ExitMethods.cs:45:9:47:9 | {...} | ExitMethods.cs:45:9:47:9 | {...} |
-| ExitMethods.cs:48:9:51:9 | [exception: Exception] catch (...) {...} | ExitMethods.cs:48:9:51:9 | [exception: Exception] catch (...) {...} |
-| ExitMethods.cs:48:9:51:9 | [exception: Exception] catch (...) {...} | ExitMethods.cs:49:9:51:9 | {...} |
+| ExitMethods.cs:48:9:51:9 | catch (...) {...} | ExitMethods.cs:48:9:51:9 | catch (...) {...} |
+| ExitMethods.cs:48:9:51:9 | catch (...) {...} | ExitMethods.cs:49:9:51:9 | {...} |
 | ExitMethods.cs:49:9:51:9 | {...} | ExitMethods.cs:49:9:51:9 | {...} |
 | ExitMethods.cs:54:10:54:11 | enter M7 | ExitMethods.cs:54:10:54:11 | enter M7 |
 | ExitMethods.cs:60:10:60:11 | enter M8 | ExitMethods.cs:60:10:60:11 | enter M8 |
@@ -10516,19 +8962,15 @@ blockDominance
 | ExitMethods.cs:117:34:117:34 | 0 | ExitMethods.cs:117:34:117:34 | 0 |
 | ExitMethods.cs:117:38:117:38 | 1 | ExitMethods.cs:117:38:117:38 | 1 |
 | ExitMethods.cs:120:17:120:32 | enter FailingAssertion | ExitMethods.cs:120:17:120:32 | enter FailingAssertion |
-| ExitMethods.cs:120:17:120:32 | enter FailingAssertion | ExitMethods.cs:122:9:122:28 | [assertion failure] call to method IsTrue |
-| ExitMethods.cs:122:9:122:28 | [assertion failure] call to method IsTrue | ExitMethods.cs:122:9:122:28 | [assertion failure] call to method IsTrue |
 | ExitMethods.cs:126:17:126:33 | enter FailingAssertion2 | ExitMethods.cs:126:17:126:33 | enter FailingAssertion2 |
 | ExitMethods.cs:132:10:132:20 | enter AssertFalse | ExitMethods.cs:132:10:132:20 | enter AssertFalse |
 | ExitMethods.cs:132:10:132:20 | enter AssertFalse | ExitMethods.cs:132:10:132:20 | exit AssertFalse |
-| ExitMethods.cs:132:10:132:20 | enter AssertFalse | ExitMethods.cs:132:33:132:49 | [assertion failure] call to method IsFalse |
-| ExitMethods.cs:132:10:132:20 | enter AssertFalse | ExitMethods.cs:132:33:132:49 | [assertion success] call to method IsFalse |
+| ExitMethods.cs:132:10:132:20 | enter AssertFalse | ExitMethods.cs:132:10:132:20 | exit AssertFalse (abnormal) |
+| ExitMethods.cs:132:10:132:20 | enter AssertFalse | ExitMethods.cs:132:10:132:20 | exit AssertFalse (normal) |
 | ExitMethods.cs:132:10:132:20 | exit AssertFalse | ExitMethods.cs:132:10:132:20 | exit AssertFalse |
-| ExitMethods.cs:132:33:132:49 | [assertion failure] call to method IsFalse | ExitMethods.cs:132:33:132:49 | [assertion failure] call to method IsFalse |
-| ExitMethods.cs:132:33:132:49 | [assertion success] call to method IsFalse | ExitMethods.cs:132:33:132:49 | [assertion success] call to method IsFalse |
+| ExitMethods.cs:132:10:132:20 | exit AssertFalse (abnormal) | ExitMethods.cs:132:10:132:20 | exit AssertFalse (abnormal) |
+| ExitMethods.cs:132:10:132:20 | exit AssertFalse (normal) | ExitMethods.cs:132:10:132:20 | exit AssertFalse (normal) |
 | ExitMethods.cs:134:17:134:33 | enter FailingAssertion3 | ExitMethods.cs:134:17:134:33 | enter FailingAssertion3 |
-| ExitMethods.cs:134:17:134:33 | enter FailingAssertion3 | ExitMethods.cs:136:9:136:25 | [assertion failure] call to method AssertFalse |
-| ExitMethods.cs:136:9:136:25 | [assertion failure] call to method AssertFalse | ExitMethods.cs:136:9:136:25 | [assertion failure] call to method AssertFalse |
 | ExitMethods.cs:140:17:140:42 | enter ExceptionDispatchInfoThrow | ExitMethods.cs:140:17:140:42 | enter ExceptionDispatchInfoThrow |
 | ExitMethods.cs:140:17:140:42 | enter ExceptionDispatchInfoThrow | ExitMethods.cs:140:17:140:42 | exit ExceptionDispatchInfoThrow (abnormal) |
 | ExitMethods.cs:140:17:140:42 | enter ExceptionDispatchInfoThrow | ExitMethods.cs:143:13:143:43 | ...; |
@@ -10543,87 +8985,95 @@ blockDominance
 | Finally.cs:3:14:3:20 | enter Finally | Finally.cs:3:14:3:20 | enter Finally |
 | Finally.cs:7:10:7:11 | enter M1 | Finally.cs:7:10:7:11 | enter M1 |
 | Finally.cs:7:10:7:11 | enter M1 | Finally.cs:7:10:7:11 | exit M1 |
-| Finally.cs:7:10:7:11 | enter M1 | Finally.cs:14:9:16:9 | [finally: exception(Exception)] {...} |
-| Finally.cs:7:10:7:11 | enter M1 | Finally.cs:14:9:16:9 | {...} |
+| Finally.cs:7:10:7:11 | enter M1 | Finally.cs:7:10:7:11 | exit M1 (abnormal) |
+| Finally.cs:7:10:7:11 | enter M1 | Finally.cs:7:10:7:11 | exit M1 (normal) |
 | Finally.cs:7:10:7:11 | exit M1 | Finally.cs:7:10:7:11 | exit M1 |
-| Finally.cs:14:9:16:9 | [finally: exception(Exception)] {...} | Finally.cs:14:9:16:9 | [finally: exception(Exception)] {...} |
-| Finally.cs:14:9:16:9 | {...} | Finally.cs:14:9:16:9 | {...} |
+| Finally.cs:7:10:7:11 | exit M1 (abnormal) | Finally.cs:7:10:7:11 | exit M1 (abnormal) |
+| Finally.cs:7:10:7:11 | exit M1 (normal) | Finally.cs:7:10:7:11 | exit M1 (normal) |
 | Finally.cs:19:10:19:11 | enter M2 | Finally.cs:19:10:19:11 | enter M2 |
 | Finally.cs:19:10:19:11 | enter M2 | Finally.cs:19:10:19:11 | exit M2 |
 | Finally.cs:19:10:19:11 | enter M2 | Finally.cs:19:10:19:11 | exit M2 (abnormal) |
 | Finally.cs:19:10:19:11 | enter M2 | Finally.cs:19:10:19:11 | exit M2 (normal) |
 | Finally.cs:19:10:19:11 | enter M2 | Finally.cs:24:13:24:19 | return ...; |
-| Finally.cs:19:10:19:11 | enter M2 | Finally.cs:26:9:29:9 | [exception: Exception] catch (...) {...} |
-| Finally.cs:19:10:19:11 | enter M2 | Finally.cs:26:38:26:39 | [exception: Exception] IOException ex |
+| Finally.cs:19:10:19:11 | enter M2 | Finally.cs:26:9:29:9 | catch (...) {...} |
+| Finally.cs:19:10:19:11 | enter M2 | Finally.cs:26:38:26:39 | IOException ex |
 | Finally.cs:19:10:19:11 | enter M2 | Finally.cs:27:9:29:9 | {...} |
-| Finally.cs:19:10:19:11 | enter M2 | Finally.cs:30:9:40:9 | [exception: Exception] catch (...) {...} |
-| Finally.cs:19:10:19:11 | enter M2 | Finally.cs:30:41:30:42 | [exception: Exception] ArgumentException ex |
+| Finally.cs:19:10:19:11 | enter M2 | Finally.cs:30:9:40:9 | catch (...) {...} |
+| Finally.cs:19:10:19:11 | enter M2 | Finally.cs:30:41:30:42 | ArgumentException ex |
 | Finally.cs:19:10:19:11 | enter M2 | Finally.cs:34:27:34:32 | throw ...; |
-| Finally.cs:19:10:19:11 | enter M2 | Finally.cs:41:9:43:9 | [exception: Exception] catch (...) {...} |
+| Finally.cs:19:10:19:11 | enter M2 | Finally.cs:41:9:43:9 | catch (...) {...} |
 | Finally.cs:19:10:19:11 | enter M2 | Finally.cs:42:9:43:9 | {...} |
+| Finally.cs:19:10:19:11 | enter M2 | Finally.cs:44:9:47:9 | catch {...} |
+| Finally.cs:19:10:19:11 | enter M2 | Finally.cs:49:9:51:9 | {...} |
 | Finally.cs:19:10:19:11 | exit M2 | Finally.cs:19:10:19:11 | exit M2 |
 | Finally.cs:19:10:19:11 | exit M2 (abnormal) | Finally.cs:19:10:19:11 | exit M2 (abnormal) |
 | Finally.cs:19:10:19:11 | exit M2 (normal) | Finally.cs:19:10:19:11 | exit M2 (normal) |
 | Finally.cs:24:13:24:19 | return ...; | Finally.cs:24:13:24:19 | return ...; |
-| Finally.cs:26:9:29:9 | [exception: Exception] catch (...) {...} | Finally.cs:19:10:19:11 | exit M2 (abnormal) |
-| Finally.cs:26:9:29:9 | [exception: Exception] catch (...) {...} | Finally.cs:26:9:29:9 | [exception: Exception] catch (...) {...} |
-| Finally.cs:26:9:29:9 | [exception: Exception] catch (...) {...} | Finally.cs:26:38:26:39 | [exception: Exception] IOException ex |
-| Finally.cs:26:9:29:9 | [exception: Exception] catch (...) {...} | Finally.cs:27:9:29:9 | {...} |
-| Finally.cs:26:9:29:9 | [exception: Exception] catch (...) {...} | Finally.cs:30:9:40:9 | [exception: Exception] catch (...) {...} |
-| Finally.cs:26:9:29:9 | [exception: Exception] catch (...) {...} | Finally.cs:30:41:30:42 | [exception: Exception] ArgumentException ex |
-| Finally.cs:26:9:29:9 | [exception: Exception] catch (...) {...} | Finally.cs:34:27:34:32 | throw ...; |
-| Finally.cs:26:9:29:9 | [exception: Exception] catch (...) {...} | Finally.cs:41:9:43:9 | [exception: Exception] catch (...) {...} |
-| Finally.cs:26:9:29:9 | [exception: Exception] catch (...) {...} | Finally.cs:42:9:43:9 | {...} |
-| Finally.cs:26:38:26:39 | [exception: Exception] IOException ex | Finally.cs:26:38:26:39 | [exception: Exception] IOException ex |
-| Finally.cs:26:38:26:39 | [exception: Exception] IOException ex | Finally.cs:27:9:29:9 | {...} |
+| Finally.cs:26:9:29:9 | catch (...) {...} | Finally.cs:26:9:29:9 | catch (...) {...} |
+| Finally.cs:26:9:29:9 | catch (...) {...} | Finally.cs:26:38:26:39 | IOException ex |
+| Finally.cs:26:9:29:9 | catch (...) {...} | Finally.cs:27:9:29:9 | {...} |
+| Finally.cs:26:9:29:9 | catch (...) {...} | Finally.cs:30:9:40:9 | catch (...) {...} |
+| Finally.cs:26:9:29:9 | catch (...) {...} | Finally.cs:30:41:30:42 | ArgumentException ex |
+| Finally.cs:26:9:29:9 | catch (...) {...} | Finally.cs:34:27:34:32 | throw ...; |
+| Finally.cs:26:9:29:9 | catch (...) {...} | Finally.cs:41:9:43:9 | catch (...) {...} |
+| Finally.cs:26:9:29:9 | catch (...) {...} | Finally.cs:42:9:43:9 | {...} |
+| Finally.cs:26:9:29:9 | catch (...) {...} | Finally.cs:44:9:47:9 | catch {...} |
+| Finally.cs:26:38:26:39 | IOException ex | Finally.cs:26:38:26:39 | IOException ex |
+| Finally.cs:26:38:26:39 | IOException ex | Finally.cs:27:9:29:9 | {...} |
 | Finally.cs:27:9:29:9 | {...} | Finally.cs:27:9:29:9 | {...} |
-| Finally.cs:30:9:40:9 | [exception: Exception] catch (...) {...} | Finally.cs:30:9:40:9 | [exception: Exception] catch (...) {...} |
-| Finally.cs:30:9:40:9 | [exception: Exception] catch (...) {...} | Finally.cs:30:41:30:42 | [exception: Exception] ArgumentException ex |
-| Finally.cs:30:9:40:9 | [exception: Exception] catch (...) {...} | Finally.cs:34:27:34:32 | throw ...; |
-| Finally.cs:30:9:40:9 | [exception: Exception] catch (...) {...} | Finally.cs:41:9:43:9 | [exception: Exception] catch (...) {...} |
-| Finally.cs:30:9:40:9 | [exception: Exception] catch (...) {...} | Finally.cs:42:9:43:9 | {...} |
-| Finally.cs:30:41:30:42 | [exception: Exception] ArgumentException ex | Finally.cs:30:41:30:42 | [exception: Exception] ArgumentException ex |
-| Finally.cs:30:41:30:42 | [exception: Exception] ArgumentException ex | Finally.cs:34:27:34:32 | throw ...; |
+| Finally.cs:30:9:40:9 | catch (...) {...} | Finally.cs:30:9:40:9 | catch (...) {...} |
+| Finally.cs:30:9:40:9 | catch (...) {...} | Finally.cs:30:41:30:42 | ArgumentException ex |
+| Finally.cs:30:9:40:9 | catch (...) {...} | Finally.cs:34:27:34:32 | throw ...; |
+| Finally.cs:30:9:40:9 | catch (...) {...} | Finally.cs:41:9:43:9 | catch (...) {...} |
+| Finally.cs:30:9:40:9 | catch (...) {...} | Finally.cs:42:9:43:9 | {...} |
+| Finally.cs:30:9:40:9 | catch (...) {...} | Finally.cs:44:9:47:9 | catch {...} |
+| Finally.cs:30:41:30:42 | ArgumentException ex | Finally.cs:30:41:30:42 | ArgumentException ex |
+| Finally.cs:30:41:30:42 | ArgumentException ex | Finally.cs:34:27:34:32 | throw ...; |
 | Finally.cs:34:27:34:32 | throw ...; | Finally.cs:34:27:34:32 | throw ...; |
-| Finally.cs:41:9:43:9 | [exception: Exception] catch (...) {...} | Finally.cs:41:9:43:9 | [exception: Exception] catch (...) {...} |
-| Finally.cs:41:9:43:9 | [exception: Exception] catch (...) {...} | Finally.cs:42:9:43:9 | {...} |
+| Finally.cs:41:9:43:9 | catch (...) {...} | Finally.cs:41:9:43:9 | catch (...) {...} |
+| Finally.cs:41:9:43:9 | catch (...) {...} | Finally.cs:42:9:43:9 | {...} |
+| Finally.cs:41:9:43:9 | catch (...) {...} | Finally.cs:44:9:47:9 | catch {...} |
 | Finally.cs:42:9:43:9 | {...} | Finally.cs:42:9:43:9 | {...} |
+| Finally.cs:44:9:47:9 | catch {...} | Finally.cs:44:9:47:9 | catch {...} |
+| Finally.cs:49:9:51:9 | {...} | Finally.cs:19:10:19:11 | exit M2 |
+| Finally.cs:49:9:51:9 | {...} | Finally.cs:19:10:19:11 | exit M2 (abnormal) |
+| Finally.cs:49:9:51:9 | {...} | Finally.cs:19:10:19:11 | exit M2 (normal) |
+| Finally.cs:49:9:51:9 | {...} | Finally.cs:49:9:51:9 | {...} |
 | Finally.cs:54:10:54:11 | enter M3 | Finally.cs:54:10:54:11 | enter M3 |
 | Finally.cs:54:10:54:11 | enter M3 | Finally.cs:54:10:54:11 | exit M3 |
 | Finally.cs:54:10:54:11 | enter M3 | Finally.cs:54:10:54:11 | exit M3 (abnormal) |
 | Finally.cs:54:10:54:11 | enter M3 | Finally.cs:54:10:54:11 | exit M3 (normal) |
 | Finally.cs:54:10:54:11 | enter M3 | Finally.cs:59:13:59:19 | return ...; |
-| Finally.cs:54:10:54:11 | enter M3 | Finally.cs:61:9:64:9 | [exception: Exception] catch (...) {...} |
-| Finally.cs:54:10:54:11 | enter M3 | Finally.cs:61:38:61:39 | [exception: Exception] IOException ex |
+| Finally.cs:54:10:54:11 | enter M3 | Finally.cs:61:9:64:9 | catch (...) {...} |
+| Finally.cs:54:10:54:11 | enter M3 | Finally.cs:61:38:61:39 | IOException ex |
 | Finally.cs:54:10:54:11 | enter M3 | Finally.cs:62:9:64:9 | {...} |
-| Finally.cs:54:10:54:11 | enter M3 | Finally.cs:65:9:67:9 | [exception: Exception] catch (...) {...} |
-| Finally.cs:54:10:54:11 | enter M3 | Finally.cs:65:26:65:26 | [exception: Exception] Exception e |
+| Finally.cs:54:10:54:11 | enter M3 | Finally.cs:65:9:67:9 | catch (...) {...} |
+| Finally.cs:54:10:54:11 | enter M3 | Finally.cs:65:26:65:26 | Exception e |
 | Finally.cs:54:10:54:11 | enter M3 | Finally.cs:66:9:67:9 | {...} |
-| Finally.cs:54:10:54:11 | enter M3 | Finally.cs:69:9:71:9 | [finally: exception(Exception)] {...} |
+| Finally.cs:54:10:54:11 | enter M3 | Finally.cs:69:9:71:9 | {...} |
 | Finally.cs:54:10:54:11 | exit M3 | Finally.cs:54:10:54:11 | exit M3 |
 | Finally.cs:54:10:54:11 | exit M3 (abnormal) | Finally.cs:54:10:54:11 | exit M3 (abnormal) |
 | Finally.cs:54:10:54:11 | exit M3 (normal) | Finally.cs:54:10:54:11 | exit M3 (normal) |
 | Finally.cs:59:13:59:19 | return ...; | Finally.cs:59:13:59:19 | return ...; |
-| Finally.cs:61:9:64:9 | [exception: Exception] catch (...) {...} | Finally.cs:54:10:54:11 | exit M3 (abnormal) |
-| Finally.cs:61:9:64:9 | [exception: Exception] catch (...) {...} | Finally.cs:61:9:64:9 | [exception: Exception] catch (...) {...} |
-| Finally.cs:61:9:64:9 | [exception: Exception] catch (...) {...} | Finally.cs:61:38:61:39 | [exception: Exception] IOException ex |
-| Finally.cs:61:9:64:9 | [exception: Exception] catch (...) {...} | Finally.cs:62:9:64:9 | {...} |
-| Finally.cs:61:9:64:9 | [exception: Exception] catch (...) {...} | Finally.cs:65:9:67:9 | [exception: Exception] catch (...) {...} |
-| Finally.cs:61:9:64:9 | [exception: Exception] catch (...) {...} | Finally.cs:65:26:65:26 | [exception: Exception] Exception e |
-| Finally.cs:61:9:64:9 | [exception: Exception] catch (...) {...} | Finally.cs:66:9:67:9 | {...} |
-| Finally.cs:61:9:64:9 | [exception: Exception] catch (...) {...} | Finally.cs:69:9:71:9 | [finally: exception(Exception)] {...} |
-| Finally.cs:61:38:61:39 | [exception: Exception] IOException ex | Finally.cs:61:38:61:39 | [exception: Exception] IOException ex |
-| Finally.cs:61:38:61:39 | [exception: Exception] IOException ex | Finally.cs:62:9:64:9 | {...} |
+| Finally.cs:61:9:64:9 | catch (...) {...} | Finally.cs:61:9:64:9 | catch (...) {...} |
+| Finally.cs:61:9:64:9 | catch (...) {...} | Finally.cs:61:38:61:39 | IOException ex |
+| Finally.cs:61:9:64:9 | catch (...) {...} | Finally.cs:62:9:64:9 | {...} |
+| Finally.cs:61:9:64:9 | catch (...) {...} | Finally.cs:65:9:67:9 | catch (...) {...} |
+| Finally.cs:61:9:64:9 | catch (...) {...} | Finally.cs:65:26:65:26 | Exception e |
+| Finally.cs:61:9:64:9 | catch (...) {...} | Finally.cs:66:9:67:9 | {...} |
+| Finally.cs:61:38:61:39 | IOException ex | Finally.cs:61:38:61:39 | IOException ex |
+| Finally.cs:61:38:61:39 | IOException ex | Finally.cs:62:9:64:9 | {...} |
 | Finally.cs:62:9:64:9 | {...} | Finally.cs:62:9:64:9 | {...} |
-| Finally.cs:65:9:67:9 | [exception: Exception] catch (...) {...} | Finally.cs:65:9:67:9 | [exception: Exception] catch (...) {...} |
-| Finally.cs:65:9:67:9 | [exception: Exception] catch (...) {...} | Finally.cs:65:26:65:26 | [exception: Exception] Exception e |
-| Finally.cs:65:9:67:9 | [exception: Exception] catch (...) {...} | Finally.cs:66:9:67:9 | {...} |
-| Finally.cs:65:9:67:9 | [exception: Exception] catch (...) {...} | Finally.cs:69:9:71:9 | [finally: exception(Exception)] {...} |
-| Finally.cs:65:26:65:26 | [exception: Exception] Exception e | Finally.cs:65:26:65:26 | [exception: Exception] Exception e |
-| Finally.cs:65:26:65:26 | [exception: Exception] Exception e | Finally.cs:66:9:67:9 | {...} |
-| Finally.cs:65:26:65:26 | [exception: Exception] Exception e | Finally.cs:69:9:71:9 | [finally: exception(Exception)] {...} |
+| Finally.cs:65:9:67:9 | catch (...) {...} | Finally.cs:65:9:67:9 | catch (...) {...} |
+| Finally.cs:65:9:67:9 | catch (...) {...} | Finally.cs:65:26:65:26 | Exception e |
+| Finally.cs:65:9:67:9 | catch (...) {...} | Finally.cs:66:9:67:9 | {...} |
+| Finally.cs:65:26:65:26 | Exception e | Finally.cs:65:26:65:26 | Exception e |
+| Finally.cs:65:26:65:26 | Exception e | Finally.cs:66:9:67:9 | {...} |
 | Finally.cs:66:9:67:9 | {...} | Finally.cs:66:9:67:9 | {...} |
-| Finally.cs:69:9:71:9 | [finally: exception(Exception)] {...} | Finally.cs:69:9:71:9 | [finally: exception(Exception)] {...} |
+| Finally.cs:69:9:71:9 | {...} | Finally.cs:54:10:54:11 | exit M3 |
+| Finally.cs:69:9:71:9 | {...} | Finally.cs:54:10:54:11 | exit M3 (abnormal) |
+| Finally.cs:69:9:71:9 | {...} | Finally.cs:54:10:54:11 | exit M3 (normal) |
+| Finally.cs:69:9:71:9 | {...} | Finally.cs:69:9:71:9 | {...} |
 | Finally.cs:74:10:74:11 | enter M4 | Finally.cs:74:10:74:11 | enter M4 |
 | Finally.cs:74:10:74:11 | enter M4 | Finally.cs:74:10:74:11 | exit M4 |
 | Finally.cs:74:10:74:11 | enter M4 | Finally.cs:74:10:74:11 | exit M4 (abnormal) |
@@ -10636,21 +9086,8 @@ blockDominance
 | Finally.cs:74:10:74:11 | enter M4 | Finally.cs:85:17:86:26 | if (...) ... |
 | Finally.cs:74:10:74:11 | enter M4 | Finally.cs:86:21:86:26 | break; |
 | Finally.cs:74:10:74:11 | enter M4 | Finally.cs:89:13:99:13 | {...} |
-| Finally.cs:74:10:74:11 | enter M4 | Finally.cs:93:25:93:46 | [finally: break] throw ...; |
-| Finally.cs:74:10:74:11 | enter M4 | Finally.cs:93:25:93:46 | [finally: continue] throw ...; |
-| Finally.cs:74:10:74:11 | enter M4 | Finally.cs:93:25:93:46 | [finally: return] throw ...; |
 | Finally.cs:74:10:74:11 | enter M4 | Finally.cs:93:25:93:46 | throw ...; |
-| Finally.cs:74:10:74:11 | enter M4 | Finally.cs:93:31:93:45 | [finally: break] object creation of type Exception |
-| Finally.cs:74:10:74:11 | enter M4 | Finally.cs:93:31:93:45 | [finally: continue] object creation of type Exception |
-| Finally.cs:74:10:74:11 | enter M4 | Finally.cs:93:31:93:45 | [finally: return] object creation of type Exception |
 | Finally.cs:74:10:74:11 | enter M4 | Finally.cs:93:31:93:45 | object creation of type Exception |
-| Finally.cs:74:10:74:11 | enter M4 | Finally.cs:96:17:98:17 | [finally(1): exception(Exception)] {...} |
-| Finally.cs:74:10:74:11 | enter M4 | Finally.cs:96:17:98:17 | [finally: break, finally(1): exception(Exception)] {...} |
-| Finally.cs:74:10:74:11 | enter M4 | Finally.cs:96:17:98:17 | [finally: break] {...} |
-| Finally.cs:74:10:74:11 | enter M4 | Finally.cs:96:17:98:17 | [finally: continue, finally(1): exception(Exception)] {...} |
-| Finally.cs:74:10:74:11 | enter M4 | Finally.cs:96:17:98:17 | [finally: continue] {...} |
-| Finally.cs:74:10:74:11 | enter M4 | Finally.cs:96:17:98:17 | [finally: return, finally(1): exception(Exception)] {...} |
-| Finally.cs:74:10:74:11 | enter M4 | Finally.cs:96:17:98:17 | [finally: return] {...} |
 | Finally.cs:74:10:74:11 | enter M4 | Finally.cs:96:17:98:17 | {...} |
 | Finally.cs:74:10:74:11 | exit M4 | Finally.cs:74:10:74:11 | exit M4 |
 | Finally.cs:74:10:74:11 | exit M4 (abnormal) | Finally.cs:74:10:74:11 | exit M4 (abnormal) |
@@ -10666,21 +9103,8 @@ blockDominance
 | Finally.cs:77:16:77:16 | access to local variable i | Finally.cs:85:17:86:26 | if (...) ... |
 | Finally.cs:77:16:77:16 | access to local variable i | Finally.cs:86:21:86:26 | break; |
 | Finally.cs:77:16:77:16 | access to local variable i | Finally.cs:89:13:99:13 | {...} |
-| Finally.cs:77:16:77:16 | access to local variable i | Finally.cs:93:25:93:46 | [finally: break] throw ...; |
-| Finally.cs:77:16:77:16 | access to local variable i | Finally.cs:93:25:93:46 | [finally: continue] throw ...; |
-| Finally.cs:77:16:77:16 | access to local variable i | Finally.cs:93:25:93:46 | [finally: return] throw ...; |
 | Finally.cs:77:16:77:16 | access to local variable i | Finally.cs:93:25:93:46 | throw ...; |
-| Finally.cs:77:16:77:16 | access to local variable i | Finally.cs:93:31:93:45 | [finally: break] object creation of type Exception |
-| Finally.cs:77:16:77:16 | access to local variable i | Finally.cs:93:31:93:45 | [finally: continue] object creation of type Exception |
-| Finally.cs:77:16:77:16 | access to local variable i | Finally.cs:93:31:93:45 | [finally: return] object creation of type Exception |
 | Finally.cs:77:16:77:16 | access to local variable i | Finally.cs:93:31:93:45 | object creation of type Exception |
-| Finally.cs:77:16:77:16 | access to local variable i | Finally.cs:96:17:98:17 | [finally(1): exception(Exception)] {...} |
-| Finally.cs:77:16:77:16 | access to local variable i | Finally.cs:96:17:98:17 | [finally: break, finally(1): exception(Exception)] {...} |
-| Finally.cs:77:16:77:16 | access to local variable i | Finally.cs:96:17:98:17 | [finally: break] {...} |
-| Finally.cs:77:16:77:16 | access to local variable i | Finally.cs:96:17:98:17 | [finally: continue, finally(1): exception(Exception)] {...} |
-| Finally.cs:77:16:77:16 | access to local variable i | Finally.cs:96:17:98:17 | [finally: continue] {...} |
-| Finally.cs:77:16:77:16 | access to local variable i | Finally.cs:96:17:98:17 | [finally: return, finally(1): exception(Exception)] {...} |
-| Finally.cs:77:16:77:16 | access to local variable i | Finally.cs:96:17:98:17 | [finally: return] {...} |
 | Finally.cs:77:16:77:16 | access to local variable i | Finally.cs:96:17:98:17 | {...} |
 | Finally.cs:78:9:100:9 | {...} | Finally.cs:74:10:74:11 | exit M4 (abnormal) |
 | Finally.cs:78:9:100:9 | {...} | Finally.cs:78:9:100:9 | {...} |
@@ -10690,93 +9114,27 @@ blockDominance
 | Finally.cs:78:9:100:9 | {...} | Finally.cs:85:17:86:26 | if (...) ... |
 | Finally.cs:78:9:100:9 | {...} | Finally.cs:86:21:86:26 | break; |
 | Finally.cs:78:9:100:9 | {...} | Finally.cs:89:13:99:13 | {...} |
-| Finally.cs:78:9:100:9 | {...} | Finally.cs:93:25:93:46 | [finally: break] throw ...; |
-| Finally.cs:78:9:100:9 | {...} | Finally.cs:93:25:93:46 | [finally: continue] throw ...; |
-| Finally.cs:78:9:100:9 | {...} | Finally.cs:93:25:93:46 | [finally: return] throw ...; |
 | Finally.cs:78:9:100:9 | {...} | Finally.cs:93:25:93:46 | throw ...; |
-| Finally.cs:78:9:100:9 | {...} | Finally.cs:93:31:93:45 | [finally: break] object creation of type Exception |
-| Finally.cs:78:9:100:9 | {...} | Finally.cs:93:31:93:45 | [finally: continue] object creation of type Exception |
-| Finally.cs:78:9:100:9 | {...} | Finally.cs:93:31:93:45 | [finally: return] object creation of type Exception |
 | Finally.cs:78:9:100:9 | {...} | Finally.cs:93:31:93:45 | object creation of type Exception |
-| Finally.cs:78:9:100:9 | {...} | Finally.cs:96:17:98:17 | [finally(1): exception(Exception)] {...} |
-| Finally.cs:78:9:100:9 | {...} | Finally.cs:96:17:98:17 | [finally: break, finally(1): exception(Exception)] {...} |
-| Finally.cs:78:9:100:9 | {...} | Finally.cs:96:17:98:17 | [finally: break] {...} |
-| Finally.cs:78:9:100:9 | {...} | Finally.cs:96:17:98:17 | [finally: continue, finally(1): exception(Exception)] {...} |
-| Finally.cs:78:9:100:9 | {...} | Finally.cs:96:17:98:17 | [finally: continue] {...} |
-| Finally.cs:78:9:100:9 | {...} | Finally.cs:96:17:98:17 | [finally: return, finally(1): exception(Exception)] {...} |
-| Finally.cs:78:9:100:9 | {...} | Finally.cs:96:17:98:17 | [finally: return] {...} |
 | Finally.cs:78:9:100:9 | {...} | Finally.cs:96:17:98:17 | {...} |
 | Finally.cs:82:21:82:27 | return ...; | Finally.cs:82:21:82:27 | return ...; |
-| Finally.cs:82:21:82:27 | return ...; | Finally.cs:93:25:93:46 | [finally: return] throw ...; |
-| Finally.cs:82:21:82:27 | return ...; | Finally.cs:93:31:93:45 | [finally: return] object creation of type Exception |
-| Finally.cs:82:21:82:27 | return ...; | Finally.cs:96:17:98:17 | [finally: return, finally(1): exception(Exception)] {...} |
-| Finally.cs:82:21:82:27 | return ...; | Finally.cs:96:17:98:17 | [finally: return] {...} |
 | Finally.cs:83:17:84:29 | if (...) ... | Finally.cs:83:17:84:29 | if (...) ... |
 | Finally.cs:83:17:84:29 | if (...) ... | Finally.cs:84:21:84:29 | continue; |
 | Finally.cs:83:17:84:29 | if (...) ... | Finally.cs:85:17:86:26 | if (...) ... |
 | Finally.cs:83:17:84:29 | if (...) ... | Finally.cs:86:21:86:26 | break; |
-| Finally.cs:83:17:84:29 | if (...) ... | Finally.cs:89:13:99:13 | {...} |
-| Finally.cs:83:17:84:29 | if (...) ... | Finally.cs:93:25:93:46 | [finally: break] throw ...; |
-| Finally.cs:83:17:84:29 | if (...) ... | Finally.cs:93:25:93:46 | [finally: continue] throw ...; |
-| Finally.cs:83:17:84:29 | if (...) ... | Finally.cs:93:25:93:46 | throw ...; |
-| Finally.cs:83:17:84:29 | if (...) ... | Finally.cs:93:31:93:45 | [finally: break] object creation of type Exception |
-| Finally.cs:83:17:84:29 | if (...) ... | Finally.cs:93:31:93:45 | [finally: continue] object creation of type Exception |
-| Finally.cs:83:17:84:29 | if (...) ... | Finally.cs:93:31:93:45 | object creation of type Exception |
-| Finally.cs:83:17:84:29 | if (...) ... | Finally.cs:96:17:98:17 | [finally(1): exception(Exception)] {...} |
-| Finally.cs:83:17:84:29 | if (...) ... | Finally.cs:96:17:98:17 | [finally: break, finally(1): exception(Exception)] {...} |
-| Finally.cs:83:17:84:29 | if (...) ... | Finally.cs:96:17:98:17 | [finally: break] {...} |
-| Finally.cs:83:17:84:29 | if (...) ... | Finally.cs:96:17:98:17 | [finally: continue, finally(1): exception(Exception)] {...} |
-| Finally.cs:83:17:84:29 | if (...) ... | Finally.cs:96:17:98:17 | [finally: continue] {...} |
-| Finally.cs:83:17:84:29 | if (...) ... | Finally.cs:96:17:98:17 | {...} |
 | Finally.cs:84:21:84:29 | continue; | Finally.cs:84:21:84:29 | continue; |
-| Finally.cs:84:21:84:29 | continue; | Finally.cs:93:25:93:46 | [finally: continue] throw ...; |
-| Finally.cs:84:21:84:29 | continue; | Finally.cs:93:31:93:45 | [finally: continue] object creation of type Exception |
-| Finally.cs:84:21:84:29 | continue; | Finally.cs:96:17:98:17 | [finally: continue, finally(1): exception(Exception)] {...} |
-| Finally.cs:84:21:84:29 | continue; | Finally.cs:96:17:98:17 | [finally: continue] {...} |
 | Finally.cs:85:17:86:26 | if (...) ... | Finally.cs:85:17:86:26 | if (...) ... |
 | Finally.cs:85:17:86:26 | if (...) ... | Finally.cs:86:21:86:26 | break; |
-| Finally.cs:85:17:86:26 | if (...) ... | Finally.cs:89:13:99:13 | {...} |
-| Finally.cs:85:17:86:26 | if (...) ... | Finally.cs:93:25:93:46 | [finally: break] throw ...; |
-| Finally.cs:85:17:86:26 | if (...) ... | Finally.cs:93:25:93:46 | throw ...; |
-| Finally.cs:85:17:86:26 | if (...) ... | Finally.cs:93:31:93:45 | [finally: break] object creation of type Exception |
-| Finally.cs:85:17:86:26 | if (...) ... | Finally.cs:93:31:93:45 | object creation of type Exception |
-| Finally.cs:85:17:86:26 | if (...) ... | Finally.cs:96:17:98:17 | [finally(1): exception(Exception)] {...} |
-| Finally.cs:85:17:86:26 | if (...) ... | Finally.cs:96:17:98:17 | [finally: break, finally(1): exception(Exception)] {...} |
-| Finally.cs:85:17:86:26 | if (...) ... | Finally.cs:96:17:98:17 | [finally: break] {...} |
-| Finally.cs:85:17:86:26 | if (...) ... | Finally.cs:96:17:98:17 | {...} |
 | Finally.cs:86:21:86:26 | break; | Finally.cs:86:21:86:26 | break; |
-| Finally.cs:86:21:86:26 | break; | Finally.cs:93:25:93:46 | [finally: break] throw ...; |
-| Finally.cs:86:21:86:26 | break; | Finally.cs:93:31:93:45 | [finally: break] object creation of type Exception |
-| Finally.cs:86:21:86:26 | break; | Finally.cs:96:17:98:17 | [finally: break, finally(1): exception(Exception)] {...} |
-| Finally.cs:86:21:86:26 | break; | Finally.cs:96:17:98:17 | [finally: break] {...} |
+| Finally.cs:89:13:99:13 | {...} | Finally.cs:74:10:74:11 | exit M4 (abnormal) |
 | Finally.cs:89:13:99:13 | {...} | Finally.cs:89:13:99:13 | {...} |
 | Finally.cs:89:13:99:13 | {...} | Finally.cs:93:25:93:46 | throw ...; |
 | Finally.cs:89:13:99:13 | {...} | Finally.cs:93:31:93:45 | object creation of type Exception |
-| Finally.cs:89:13:99:13 | {...} | Finally.cs:96:17:98:17 | [finally(1): exception(Exception)] {...} |
 | Finally.cs:89:13:99:13 | {...} | Finally.cs:96:17:98:17 | {...} |
-| Finally.cs:93:25:93:46 | [finally: break] throw ...; | Finally.cs:93:25:93:46 | [finally: break] throw ...; |
-| Finally.cs:93:25:93:46 | [finally: continue] throw ...; | Finally.cs:93:25:93:46 | [finally: continue] throw ...; |
-| Finally.cs:93:25:93:46 | [finally: return] throw ...; | Finally.cs:93:25:93:46 | [finally: return] throw ...; |
 | Finally.cs:93:25:93:46 | throw ...; | Finally.cs:93:25:93:46 | throw ...; |
-| Finally.cs:93:31:93:45 | [finally: break] object creation of type Exception | Finally.cs:93:25:93:46 | [finally: break] throw ...; |
-| Finally.cs:93:31:93:45 | [finally: break] object creation of type Exception | Finally.cs:93:31:93:45 | [finally: break] object creation of type Exception |
-| Finally.cs:93:31:93:45 | [finally: break] object creation of type Exception | Finally.cs:96:17:98:17 | [finally: break, finally(1): exception(Exception)] {...} |
-| Finally.cs:93:31:93:45 | [finally: continue] object creation of type Exception | Finally.cs:93:25:93:46 | [finally: continue] throw ...; |
-| Finally.cs:93:31:93:45 | [finally: continue] object creation of type Exception | Finally.cs:93:31:93:45 | [finally: continue] object creation of type Exception |
-| Finally.cs:93:31:93:45 | [finally: continue] object creation of type Exception | Finally.cs:96:17:98:17 | [finally: continue, finally(1): exception(Exception)] {...} |
-| Finally.cs:93:31:93:45 | [finally: return] object creation of type Exception | Finally.cs:93:25:93:46 | [finally: return] throw ...; |
-| Finally.cs:93:31:93:45 | [finally: return] object creation of type Exception | Finally.cs:93:31:93:45 | [finally: return] object creation of type Exception |
-| Finally.cs:93:31:93:45 | [finally: return] object creation of type Exception | Finally.cs:96:17:98:17 | [finally: return, finally(1): exception(Exception)] {...} |
 | Finally.cs:93:31:93:45 | object creation of type Exception | Finally.cs:93:25:93:46 | throw ...; |
 | Finally.cs:93:31:93:45 | object creation of type Exception | Finally.cs:93:31:93:45 | object creation of type Exception |
-| Finally.cs:93:31:93:45 | object creation of type Exception | Finally.cs:96:17:98:17 | [finally(1): exception(Exception)] {...} |
-| Finally.cs:96:17:98:17 | [finally(1): exception(Exception)] {...} | Finally.cs:96:17:98:17 | [finally(1): exception(Exception)] {...} |
-| Finally.cs:96:17:98:17 | [finally: break, finally(1): exception(Exception)] {...} | Finally.cs:96:17:98:17 | [finally: break, finally(1): exception(Exception)] {...} |
-| Finally.cs:96:17:98:17 | [finally: break] {...} | Finally.cs:96:17:98:17 | [finally: break] {...} |
-| Finally.cs:96:17:98:17 | [finally: continue, finally(1): exception(Exception)] {...} | Finally.cs:96:17:98:17 | [finally: continue, finally(1): exception(Exception)] {...} |
-| Finally.cs:96:17:98:17 | [finally: continue] {...} | Finally.cs:96:17:98:17 | [finally: continue] {...} |
-| Finally.cs:96:17:98:17 | [finally: return, finally(1): exception(Exception)] {...} | Finally.cs:96:17:98:17 | [finally: return, finally(1): exception(Exception)] {...} |
-| Finally.cs:96:17:98:17 | [finally: return] {...} | Finally.cs:96:17:98:17 | [finally: return] {...} |
+| Finally.cs:96:17:98:17 | {...} | Finally.cs:74:10:74:11 | exit M4 (abnormal) |
 | Finally.cs:96:17:98:17 | {...} | Finally.cs:96:17:98:17 | {...} |
 | Finally.cs:103:10:103:11 | enter M5 | Finally.cs:103:10:103:11 | enter M5 |
 | Finally.cs:103:10:103:11 | enter M5 | Finally.cs:103:10:103:11 | exit M5 |
@@ -10790,38 +9148,15 @@ blockDominance
 | Finally.cs:103:10:103:11 | enter M5 | Finally.cs:109:33:109:33 | 1 |
 | Finally.cs:103:10:103:11 | enter M5 | Finally.cs:110:17:110:49 | throw ...; |
 | Finally.cs:103:10:103:11 | enter M5 | Finally.cs:110:23:110:48 | object creation of type OutOfMemoryException |
-| Finally.cs:103:10:103:11 | enter M5 | Finally.cs:113:9:118:9 | [finally: exception(Exception)] {...} |
-| Finally.cs:103:10:103:11 | enter M5 | Finally.cs:113:9:118:9 | [finally: exception(NullReferenceException)] {...} |
 | Finally.cs:103:10:103:11 | enter M5 | Finally.cs:113:9:118:9 | {...} |
-| Finally.cs:103:10:103:11 | enter M5 | Finally.cs:114:17:114:36 | [false, finally: exception(Exception)] !... |
-| Finally.cs:103:10:103:11 | enter M5 | Finally.cs:114:17:114:36 | [false, finally: exception(NullReferenceException)] !... |
-| Finally.cs:103:10:103:11 | enter M5 | Finally.cs:114:17:114:36 | [false, finally: exception(OutOfMemoryException)] !... |
-| Finally.cs:103:10:103:11 | enter M5 | Finally.cs:114:17:114:36 | [false, finally: return] !... |
 | Finally.cs:103:10:103:11 | enter M5 | Finally.cs:114:17:114:36 | [false] !... |
-| Finally.cs:103:10:103:11 | enter M5 | Finally.cs:114:17:114:36 | [true, finally: exception(Exception)] !... |
-| Finally.cs:103:10:103:11 | enter M5 | Finally.cs:114:17:114:36 | [true, finally: exception(NullReferenceException)] !... |
-| Finally.cs:103:10:103:11 | enter M5 | Finally.cs:114:17:114:36 | [true, finally: exception(OutOfMemoryException)] !... |
-| Finally.cs:103:10:103:11 | enter M5 | Finally.cs:114:17:114:36 | [true, finally: return] !... |
 | Finally.cs:103:10:103:11 | enter M5 | Finally.cs:114:17:114:36 | [true] !... |
 | Finally.cs:103:10:103:11 | enter M5 | Finally.cs:115:17:115:41 | ...; |
-| Finally.cs:103:10:103:11 | enter M5 | Finally.cs:115:17:115:41 | [finally: exception(Exception)] ...; |
-| Finally.cs:103:10:103:11 | enter M5 | Finally.cs:115:17:115:41 | [finally: exception(NullReferenceException)] ...; |
-| Finally.cs:103:10:103:11 | enter M5 | Finally.cs:115:17:115:41 | [finally: exception(OutOfMemoryException)] ...; |
-| Finally.cs:103:10:103:11 | enter M5 | Finally.cs:115:17:115:41 | [finally: return] ...; |
-| Finally.cs:103:10:103:11 | enter M5 | Finally.cs:116:13:117:37 | [finally: exception(Exception)] if (...) ... |
-| Finally.cs:103:10:103:11 | enter M5 | Finally.cs:116:13:117:37 | [finally: exception(NullReferenceException)] if (...) ... |
-| Finally.cs:103:10:103:11 | enter M5 | Finally.cs:116:13:117:37 | [finally: exception(OutOfMemoryException)] if (...) ... |
-| Finally.cs:103:10:103:11 | enter M5 | Finally.cs:116:13:117:37 | [finally: return] if (...) ... |
 | Finally.cs:103:10:103:11 | enter M5 | Finally.cs:116:13:117:37 | if (...) ... |
 | Finally.cs:103:10:103:11 | enter M5 | Finally.cs:117:17:117:37 | ...; |
-| Finally.cs:103:10:103:11 | enter M5 | Finally.cs:117:17:117:37 | [finally: exception(Exception)] ...; |
-| Finally.cs:103:10:103:11 | enter M5 | Finally.cs:117:17:117:37 | [finally: exception(NullReferenceException)] ...; |
-| Finally.cs:103:10:103:11 | enter M5 | Finally.cs:117:17:117:37 | [finally: exception(OutOfMemoryException)] ...; |
-| Finally.cs:103:10:103:11 | enter M5 | Finally.cs:117:17:117:37 | [finally: return] ...; |
 | Finally.cs:103:10:103:11 | exit M5 | Finally.cs:103:10:103:11 | exit M5 |
 | Finally.cs:103:10:103:11 | exit M5 (abnormal) | Finally.cs:103:10:103:11 | exit M5 (abnormal) |
 | Finally.cs:103:10:103:11 | exit M5 (normal) | Finally.cs:103:10:103:11 | exit M5 (normal) |
-| Finally.cs:107:17:107:28 | access to property Length | Finally.cs:103:10:103:11 | exit M5 (normal) |
 | Finally.cs:107:17:107:28 | access to property Length | Finally.cs:107:17:107:28 | access to property Length |
 | Finally.cs:107:17:107:28 | access to property Length | Finally.cs:107:33:107:33 | 0 |
 | Finally.cs:107:17:107:28 | access to property Length | Finally.cs:108:17:108:23 | return ...; |
@@ -10830,29 +9165,6 @@ blockDominance
 | Finally.cs:107:17:107:28 | access to property Length | Finally.cs:109:33:109:33 | 1 |
 | Finally.cs:107:17:107:28 | access to property Length | Finally.cs:110:17:110:49 | throw ...; |
 | Finally.cs:107:17:107:28 | access to property Length | Finally.cs:110:23:110:48 | object creation of type OutOfMemoryException |
-| Finally.cs:107:17:107:28 | access to property Length | Finally.cs:113:9:118:9 | [finally: exception(Exception)] {...} |
-| Finally.cs:107:17:107:28 | access to property Length | Finally.cs:113:9:118:9 | {...} |
-| Finally.cs:107:17:107:28 | access to property Length | Finally.cs:114:17:114:36 | [false, finally: exception(Exception)] !... |
-| Finally.cs:107:17:107:28 | access to property Length | Finally.cs:114:17:114:36 | [false, finally: exception(OutOfMemoryException)] !... |
-| Finally.cs:107:17:107:28 | access to property Length | Finally.cs:114:17:114:36 | [false, finally: return] !... |
-| Finally.cs:107:17:107:28 | access to property Length | Finally.cs:114:17:114:36 | [false] !... |
-| Finally.cs:107:17:107:28 | access to property Length | Finally.cs:114:17:114:36 | [true, finally: exception(Exception)] !... |
-| Finally.cs:107:17:107:28 | access to property Length | Finally.cs:114:17:114:36 | [true, finally: exception(OutOfMemoryException)] !... |
-| Finally.cs:107:17:107:28 | access to property Length | Finally.cs:114:17:114:36 | [true, finally: return] !... |
-| Finally.cs:107:17:107:28 | access to property Length | Finally.cs:114:17:114:36 | [true] !... |
-| Finally.cs:107:17:107:28 | access to property Length | Finally.cs:115:17:115:41 | ...; |
-| Finally.cs:107:17:107:28 | access to property Length | Finally.cs:115:17:115:41 | [finally: exception(Exception)] ...; |
-| Finally.cs:107:17:107:28 | access to property Length | Finally.cs:115:17:115:41 | [finally: exception(OutOfMemoryException)] ...; |
-| Finally.cs:107:17:107:28 | access to property Length | Finally.cs:115:17:115:41 | [finally: return] ...; |
-| Finally.cs:107:17:107:28 | access to property Length | Finally.cs:116:13:117:37 | [finally: exception(Exception)] if (...) ... |
-| Finally.cs:107:17:107:28 | access to property Length | Finally.cs:116:13:117:37 | [finally: exception(OutOfMemoryException)] if (...) ... |
-| Finally.cs:107:17:107:28 | access to property Length | Finally.cs:116:13:117:37 | [finally: return] if (...) ... |
-| Finally.cs:107:17:107:28 | access to property Length | Finally.cs:116:13:117:37 | if (...) ... |
-| Finally.cs:107:17:107:28 | access to property Length | Finally.cs:117:17:117:37 | ...; |
-| Finally.cs:107:17:107:28 | access to property Length | Finally.cs:117:17:117:37 | [finally: exception(Exception)] ...; |
-| Finally.cs:107:17:107:28 | access to property Length | Finally.cs:117:17:117:37 | [finally: exception(OutOfMemoryException)] ...; |
-| Finally.cs:107:17:107:28 | access to property Length | Finally.cs:117:17:117:37 | [finally: return] ...; |
-| Finally.cs:107:33:107:33 | 0 | Finally.cs:103:10:103:11 | exit M5 (normal) |
 | Finally.cs:107:33:107:33 | 0 | Finally.cs:107:33:107:33 | 0 |
 | Finally.cs:107:33:107:33 | 0 | Finally.cs:108:17:108:23 | return ...; |
 | Finally.cs:107:33:107:33 | 0 | Finally.cs:109:13:110:49 | if (...) ... |
@@ -10860,279 +9172,87 @@ blockDominance
 | Finally.cs:107:33:107:33 | 0 | Finally.cs:109:33:109:33 | 1 |
 | Finally.cs:107:33:107:33 | 0 | Finally.cs:110:17:110:49 | throw ...; |
 | Finally.cs:107:33:107:33 | 0 | Finally.cs:110:23:110:48 | object creation of type OutOfMemoryException |
-| Finally.cs:107:33:107:33 | 0 | Finally.cs:113:9:118:9 | {...} |
-| Finally.cs:107:33:107:33 | 0 | Finally.cs:114:17:114:36 | [false, finally: exception(OutOfMemoryException)] !... |
-| Finally.cs:107:33:107:33 | 0 | Finally.cs:114:17:114:36 | [false, finally: return] !... |
-| Finally.cs:107:33:107:33 | 0 | Finally.cs:114:17:114:36 | [false] !... |
-| Finally.cs:107:33:107:33 | 0 | Finally.cs:114:17:114:36 | [true, finally: exception(OutOfMemoryException)] !... |
-| Finally.cs:107:33:107:33 | 0 | Finally.cs:114:17:114:36 | [true, finally: return] !... |
-| Finally.cs:107:33:107:33 | 0 | Finally.cs:114:17:114:36 | [true] !... |
-| Finally.cs:107:33:107:33 | 0 | Finally.cs:115:17:115:41 | ...; |
-| Finally.cs:107:33:107:33 | 0 | Finally.cs:115:17:115:41 | [finally: exception(OutOfMemoryException)] ...; |
-| Finally.cs:107:33:107:33 | 0 | Finally.cs:115:17:115:41 | [finally: return] ...; |
-| Finally.cs:107:33:107:33 | 0 | Finally.cs:116:13:117:37 | [finally: exception(OutOfMemoryException)] if (...) ... |
-| Finally.cs:107:33:107:33 | 0 | Finally.cs:116:13:117:37 | [finally: return] if (...) ... |
-| Finally.cs:107:33:107:33 | 0 | Finally.cs:116:13:117:37 | if (...) ... |
-| Finally.cs:107:33:107:33 | 0 | Finally.cs:117:17:117:37 | ...; |
-| Finally.cs:107:33:107:33 | 0 | Finally.cs:117:17:117:37 | [finally: exception(OutOfMemoryException)] ...; |
-| Finally.cs:107:33:107:33 | 0 | Finally.cs:117:17:117:37 | [finally: return] ...; |
 | Finally.cs:108:17:108:23 | return ...; | Finally.cs:108:17:108:23 | return ...; |
-| Finally.cs:108:17:108:23 | return ...; | Finally.cs:114:17:114:36 | [false, finally: return] !... |
-| Finally.cs:108:17:108:23 | return ...; | Finally.cs:114:17:114:36 | [true, finally: return] !... |
-| Finally.cs:108:17:108:23 | return ...; | Finally.cs:115:17:115:41 | [finally: return] ...; |
-| Finally.cs:108:17:108:23 | return ...; | Finally.cs:116:13:117:37 | [finally: return] if (...) ... |
-| Finally.cs:108:17:108:23 | return ...; | Finally.cs:117:17:117:37 | [finally: return] ...; |
 | Finally.cs:109:13:110:49 | if (...) ... | Finally.cs:109:13:110:49 | if (...) ... |
 | Finally.cs:109:13:110:49 | if (...) ... | Finally.cs:109:17:109:28 | access to property Length |
 | Finally.cs:109:13:110:49 | if (...) ... | Finally.cs:109:33:109:33 | 1 |
 | Finally.cs:109:13:110:49 | if (...) ... | Finally.cs:110:17:110:49 | throw ...; |
 | Finally.cs:109:13:110:49 | if (...) ... | Finally.cs:110:23:110:48 | object creation of type OutOfMemoryException |
-| Finally.cs:109:13:110:49 | if (...) ... | Finally.cs:113:9:118:9 | {...} |
-| Finally.cs:109:13:110:49 | if (...) ... | Finally.cs:114:17:114:36 | [false, finally: exception(OutOfMemoryException)] !... |
-| Finally.cs:109:13:110:49 | if (...) ... | Finally.cs:114:17:114:36 | [false] !... |
-| Finally.cs:109:13:110:49 | if (...) ... | Finally.cs:114:17:114:36 | [true, finally: exception(OutOfMemoryException)] !... |
-| Finally.cs:109:13:110:49 | if (...) ... | Finally.cs:114:17:114:36 | [true] !... |
-| Finally.cs:109:13:110:49 | if (...) ... | Finally.cs:115:17:115:41 | ...; |
-| Finally.cs:109:13:110:49 | if (...) ... | Finally.cs:115:17:115:41 | [finally: exception(OutOfMemoryException)] ...; |
-| Finally.cs:109:13:110:49 | if (...) ... | Finally.cs:116:13:117:37 | [finally: exception(OutOfMemoryException)] if (...) ... |
-| Finally.cs:109:13:110:49 | if (...) ... | Finally.cs:116:13:117:37 | if (...) ... |
-| Finally.cs:109:13:110:49 | if (...) ... | Finally.cs:117:17:117:37 | ...; |
-| Finally.cs:109:13:110:49 | if (...) ... | Finally.cs:117:17:117:37 | [finally: exception(OutOfMemoryException)] ...; |
 | Finally.cs:109:17:109:28 | access to property Length | Finally.cs:109:17:109:28 | access to property Length |
 | Finally.cs:109:17:109:28 | access to property Length | Finally.cs:109:33:109:33 | 1 |
 | Finally.cs:109:17:109:28 | access to property Length | Finally.cs:110:17:110:49 | throw ...; |
 | Finally.cs:109:17:109:28 | access to property Length | Finally.cs:110:23:110:48 | object creation of type OutOfMemoryException |
-| Finally.cs:109:17:109:28 | access to property Length | Finally.cs:113:9:118:9 | {...} |
-| Finally.cs:109:17:109:28 | access to property Length | Finally.cs:114:17:114:36 | [false, finally: exception(OutOfMemoryException)] !... |
-| Finally.cs:109:17:109:28 | access to property Length | Finally.cs:114:17:114:36 | [false] !... |
-| Finally.cs:109:17:109:28 | access to property Length | Finally.cs:114:17:114:36 | [true, finally: exception(OutOfMemoryException)] !... |
-| Finally.cs:109:17:109:28 | access to property Length | Finally.cs:114:17:114:36 | [true] !... |
-| Finally.cs:109:17:109:28 | access to property Length | Finally.cs:115:17:115:41 | ...; |
-| Finally.cs:109:17:109:28 | access to property Length | Finally.cs:115:17:115:41 | [finally: exception(OutOfMemoryException)] ...; |
-| Finally.cs:109:17:109:28 | access to property Length | Finally.cs:116:13:117:37 | [finally: exception(OutOfMemoryException)] if (...) ... |
-| Finally.cs:109:17:109:28 | access to property Length | Finally.cs:116:13:117:37 | if (...) ... |
-| Finally.cs:109:17:109:28 | access to property Length | Finally.cs:117:17:117:37 | ...; |
-| Finally.cs:109:17:109:28 | access to property Length | Finally.cs:117:17:117:37 | [finally: exception(OutOfMemoryException)] ...; |
 | Finally.cs:109:33:109:33 | 1 | Finally.cs:109:33:109:33 | 1 |
 | Finally.cs:109:33:109:33 | 1 | Finally.cs:110:17:110:49 | throw ...; |
 | Finally.cs:109:33:109:33 | 1 | Finally.cs:110:23:110:48 | object creation of type OutOfMemoryException |
-| Finally.cs:109:33:109:33 | 1 | Finally.cs:113:9:118:9 | {...} |
-| Finally.cs:109:33:109:33 | 1 | Finally.cs:114:17:114:36 | [false, finally: exception(OutOfMemoryException)] !... |
-| Finally.cs:109:33:109:33 | 1 | Finally.cs:114:17:114:36 | [false] !... |
-| Finally.cs:109:33:109:33 | 1 | Finally.cs:114:17:114:36 | [true, finally: exception(OutOfMemoryException)] !... |
-| Finally.cs:109:33:109:33 | 1 | Finally.cs:114:17:114:36 | [true] !... |
-| Finally.cs:109:33:109:33 | 1 | Finally.cs:115:17:115:41 | ...; |
-| Finally.cs:109:33:109:33 | 1 | Finally.cs:115:17:115:41 | [finally: exception(OutOfMemoryException)] ...; |
-| Finally.cs:109:33:109:33 | 1 | Finally.cs:116:13:117:37 | [finally: exception(OutOfMemoryException)] if (...) ... |
-| Finally.cs:109:33:109:33 | 1 | Finally.cs:116:13:117:37 | if (...) ... |
-| Finally.cs:109:33:109:33 | 1 | Finally.cs:117:17:117:37 | ...; |
-| Finally.cs:109:33:109:33 | 1 | Finally.cs:117:17:117:37 | [finally: exception(OutOfMemoryException)] ...; |
 | Finally.cs:110:17:110:49 | throw ...; | Finally.cs:110:17:110:49 | throw ...; |
-| Finally.cs:110:17:110:49 | throw ...; | Finally.cs:114:17:114:36 | [false, finally: exception(OutOfMemoryException)] !... |
-| Finally.cs:110:17:110:49 | throw ...; | Finally.cs:114:17:114:36 | [true, finally: exception(OutOfMemoryException)] !... |
-| Finally.cs:110:17:110:49 | throw ...; | Finally.cs:115:17:115:41 | [finally: exception(OutOfMemoryException)] ...; |
-| Finally.cs:110:17:110:49 | throw ...; | Finally.cs:116:13:117:37 | [finally: exception(OutOfMemoryException)] if (...) ... |
-| Finally.cs:110:17:110:49 | throw ...; | Finally.cs:117:17:117:37 | [finally: exception(OutOfMemoryException)] ...; |
 | Finally.cs:110:23:110:48 | object creation of type OutOfMemoryException | Finally.cs:110:17:110:49 | throw ...; |
 | Finally.cs:110:23:110:48 | object creation of type OutOfMemoryException | Finally.cs:110:23:110:48 | object creation of type OutOfMemoryException |
-| Finally.cs:110:23:110:48 | object creation of type OutOfMemoryException | Finally.cs:114:17:114:36 | [false, finally: exception(OutOfMemoryException)] !... |
-| Finally.cs:110:23:110:48 | object creation of type OutOfMemoryException | Finally.cs:114:17:114:36 | [true, finally: exception(OutOfMemoryException)] !... |
-| Finally.cs:110:23:110:48 | object creation of type OutOfMemoryException | Finally.cs:115:17:115:41 | [finally: exception(OutOfMemoryException)] ...; |
-| Finally.cs:110:23:110:48 | object creation of type OutOfMemoryException | Finally.cs:116:13:117:37 | [finally: exception(OutOfMemoryException)] if (...) ... |
-| Finally.cs:110:23:110:48 | object creation of type OutOfMemoryException | Finally.cs:117:17:117:37 | [finally: exception(OutOfMemoryException)] ...; |
-| Finally.cs:113:9:118:9 | [finally: exception(Exception)] {...} | Finally.cs:113:9:118:9 | [finally: exception(Exception)] {...} |
-| Finally.cs:113:9:118:9 | [finally: exception(Exception)] {...} | Finally.cs:114:17:114:36 | [false, finally: exception(Exception)] !... |
-| Finally.cs:113:9:118:9 | [finally: exception(Exception)] {...} | Finally.cs:114:17:114:36 | [true, finally: exception(Exception)] !... |
-| Finally.cs:113:9:118:9 | [finally: exception(Exception)] {...} | Finally.cs:115:17:115:41 | [finally: exception(Exception)] ...; |
-| Finally.cs:113:9:118:9 | [finally: exception(Exception)] {...} | Finally.cs:116:13:117:37 | [finally: exception(Exception)] if (...) ... |
-| Finally.cs:113:9:118:9 | [finally: exception(Exception)] {...} | Finally.cs:117:17:117:37 | [finally: exception(Exception)] ...; |
-| Finally.cs:113:9:118:9 | [finally: exception(NullReferenceException)] {...} | Finally.cs:113:9:118:9 | [finally: exception(NullReferenceException)] {...} |
-| Finally.cs:113:9:118:9 | [finally: exception(NullReferenceException)] {...} | Finally.cs:114:17:114:36 | [false, finally: exception(NullReferenceException)] !... |
-| Finally.cs:113:9:118:9 | [finally: exception(NullReferenceException)] {...} | Finally.cs:114:17:114:36 | [true, finally: exception(NullReferenceException)] !... |
-| Finally.cs:113:9:118:9 | [finally: exception(NullReferenceException)] {...} | Finally.cs:115:17:115:41 | [finally: exception(NullReferenceException)] ...; |
-| Finally.cs:113:9:118:9 | [finally: exception(NullReferenceException)] {...} | Finally.cs:116:13:117:37 | [finally: exception(NullReferenceException)] if (...) ... |
-| Finally.cs:113:9:118:9 | [finally: exception(NullReferenceException)] {...} | Finally.cs:117:17:117:37 | [finally: exception(NullReferenceException)] ...; |
+| Finally.cs:113:9:118:9 | {...} | Finally.cs:103:10:103:11 | exit M5 |
+| Finally.cs:113:9:118:9 | {...} | Finally.cs:103:10:103:11 | exit M5 (abnormal) |
+| Finally.cs:113:9:118:9 | {...} | Finally.cs:103:10:103:11 | exit M5 (normal) |
 | Finally.cs:113:9:118:9 | {...} | Finally.cs:113:9:118:9 | {...} |
 | Finally.cs:113:9:118:9 | {...} | Finally.cs:114:17:114:36 | [false] !... |
 | Finally.cs:113:9:118:9 | {...} | Finally.cs:114:17:114:36 | [true] !... |
 | Finally.cs:113:9:118:9 | {...} | Finally.cs:115:17:115:41 | ...; |
 | Finally.cs:113:9:118:9 | {...} | Finally.cs:116:13:117:37 | if (...) ... |
 | Finally.cs:113:9:118:9 | {...} | Finally.cs:117:17:117:37 | ...; |
-| Finally.cs:114:17:114:36 | [false, finally: exception(Exception)] !... | Finally.cs:114:17:114:36 | [false, finally: exception(Exception)] !... |
-| Finally.cs:114:17:114:36 | [false, finally: exception(NullReferenceException)] !... | Finally.cs:114:17:114:36 | [false, finally: exception(NullReferenceException)] !... |
-| Finally.cs:114:17:114:36 | [false, finally: exception(OutOfMemoryException)] !... | Finally.cs:114:17:114:36 | [false, finally: exception(OutOfMemoryException)] !... |
-| Finally.cs:114:17:114:36 | [false, finally: return] !... | Finally.cs:114:17:114:36 | [false, finally: return] !... |
 | Finally.cs:114:17:114:36 | [false] !... | Finally.cs:114:17:114:36 | [false] !... |
-| Finally.cs:114:17:114:36 | [true, finally: exception(Exception)] !... | Finally.cs:114:17:114:36 | [true, finally: exception(Exception)] !... |
-| Finally.cs:114:17:114:36 | [true, finally: exception(Exception)] !... | Finally.cs:115:17:115:41 | [finally: exception(Exception)] ...; |
-| Finally.cs:114:17:114:36 | [true, finally: exception(NullReferenceException)] !... | Finally.cs:114:17:114:36 | [true, finally: exception(NullReferenceException)] !... |
-| Finally.cs:114:17:114:36 | [true, finally: exception(NullReferenceException)] !... | Finally.cs:115:17:115:41 | [finally: exception(NullReferenceException)] ...; |
-| Finally.cs:114:17:114:36 | [true, finally: exception(OutOfMemoryException)] !... | Finally.cs:114:17:114:36 | [true, finally: exception(OutOfMemoryException)] !... |
-| Finally.cs:114:17:114:36 | [true, finally: exception(OutOfMemoryException)] !... | Finally.cs:115:17:115:41 | [finally: exception(OutOfMemoryException)] ...; |
-| Finally.cs:114:17:114:36 | [true, finally: return] !... | Finally.cs:114:17:114:36 | [true, finally: return] !... |
-| Finally.cs:114:17:114:36 | [true, finally: return] !... | Finally.cs:115:17:115:41 | [finally: return] ...; |
 | Finally.cs:114:17:114:36 | [true] !... | Finally.cs:114:17:114:36 | [true] !... |
 | Finally.cs:114:17:114:36 | [true] !... | Finally.cs:115:17:115:41 | ...; |
 | Finally.cs:115:17:115:41 | ...; | Finally.cs:115:17:115:41 | ...; |
-| Finally.cs:115:17:115:41 | [finally: exception(Exception)] ...; | Finally.cs:115:17:115:41 | [finally: exception(Exception)] ...; |
-| Finally.cs:115:17:115:41 | [finally: exception(NullReferenceException)] ...; | Finally.cs:115:17:115:41 | [finally: exception(NullReferenceException)] ...; |
-| Finally.cs:115:17:115:41 | [finally: exception(OutOfMemoryException)] ...; | Finally.cs:115:17:115:41 | [finally: exception(OutOfMemoryException)] ...; |
-| Finally.cs:115:17:115:41 | [finally: return] ...; | Finally.cs:115:17:115:41 | [finally: return] ...; |
-| Finally.cs:116:13:117:37 | [finally: exception(Exception)] if (...) ... | Finally.cs:116:13:117:37 | [finally: exception(Exception)] if (...) ... |
-| Finally.cs:116:13:117:37 | [finally: exception(Exception)] if (...) ... | Finally.cs:117:17:117:37 | [finally: exception(Exception)] ...; |
-| Finally.cs:116:13:117:37 | [finally: exception(NullReferenceException)] if (...) ... | Finally.cs:116:13:117:37 | [finally: exception(NullReferenceException)] if (...) ... |
-| Finally.cs:116:13:117:37 | [finally: exception(NullReferenceException)] if (...) ... | Finally.cs:117:17:117:37 | [finally: exception(NullReferenceException)] ...; |
-| Finally.cs:116:13:117:37 | [finally: exception(OutOfMemoryException)] if (...) ... | Finally.cs:116:13:117:37 | [finally: exception(OutOfMemoryException)] if (...) ... |
-| Finally.cs:116:13:117:37 | [finally: exception(OutOfMemoryException)] if (...) ... | Finally.cs:117:17:117:37 | [finally: exception(OutOfMemoryException)] ...; |
-| Finally.cs:116:13:117:37 | [finally: return] if (...) ... | Finally.cs:116:13:117:37 | [finally: return] if (...) ... |
-| Finally.cs:116:13:117:37 | [finally: return] if (...) ... | Finally.cs:117:17:117:37 | [finally: return] ...; |
+| Finally.cs:116:13:117:37 | if (...) ... | Finally.cs:103:10:103:11 | exit M5 |
+| Finally.cs:116:13:117:37 | if (...) ... | Finally.cs:103:10:103:11 | exit M5 (abnormal) |
+| Finally.cs:116:13:117:37 | if (...) ... | Finally.cs:103:10:103:11 | exit M5 (normal) |
 | Finally.cs:116:13:117:37 | if (...) ... | Finally.cs:116:13:117:37 | if (...) ... |
 | Finally.cs:116:13:117:37 | if (...) ... | Finally.cs:117:17:117:37 | ...; |
 | Finally.cs:117:17:117:37 | ...; | Finally.cs:117:17:117:37 | ...; |
-| Finally.cs:117:17:117:37 | [finally: exception(Exception)] ...; | Finally.cs:117:17:117:37 | [finally: exception(Exception)] ...; |
-| Finally.cs:117:17:117:37 | [finally: exception(NullReferenceException)] ...; | Finally.cs:117:17:117:37 | [finally: exception(NullReferenceException)] ...; |
-| Finally.cs:117:17:117:37 | [finally: exception(OutOfMemoryException)] ...; | Finally.cs:117:17:117:37 | [finally: exception(OutOfMemoryException)] ...; |
-| Finally.cs:117:17:117:37 | [finally: return] ...; | Finally.cs:117:17:117:37 | [finally: return] ...; |
 | Finally.cs:121:10:121:11 | enter M6 | Finally.cs:121:10:121:11 | enter M6 |
 | Finally.cs:133:10:133:11 | enter M7 | Finally.cs:133:10:133:11 | enter M7 |
-| Finally.cs:133:10:133:11 | enter M7 | Finally.cs:133:10:133:11 | exit M7 (abnormal) |
-| Finally.cs:133:10:133:11 | enter M7 | Finally.cs:140:9:143:9 | [finally: exception(Exception)] {...} |
-| Finally.cs:133:10:133:11 | enter M7 | Finally.cs:140:9:143:9 | {...} |
-| Finally.cs:133:10:133:11 | exit M7 (abnormal) | Finally.cs:133:10:133:11 | exit M7 (abnormal) |
-| Finally.cs:140:9:143:9 | [finally: exception(Exception)] {...} | Finally.cs:140:9:143:9 | [finally: exception(Exception)] {...} |
-| Finally.cs:140:9:143:9 | {...} | Finally.cs:140:9:143:9 | {...} |
 | Finally.cs:147:10:147:11 | enter M8 | Finally.cs:147:10:147:11 | enter M8 |
 | Finally.cs:147:10:147:11 | enter M8 | Finally.cs:147:10:147:11 | exit M8 |
 | Finally.cs:147:10:147:11 | enter M8 | Finally.cs:147:10:147:11 | exit M8 (abnormal) |
 | Finally.cs:147:10:147:11 | enter M8 | Finally.cs:147:10:147:11 | exit M8 (normal) |
 | Finally.cs:147:10:147:11 | enter M8 | Finally.cs:152:17:152:50 | throw ...; |
 | Finally.cs:147:10:147:11 | enter M8 | Finally.cs:152:23:152:49 | object creation of type ArgumentNullException |
-| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:155:9:169:9 | [finally: exception(Exception)] {...} |
 | Finally.cs:147:10:147:11 | enter M8 | Finally.cs:155:9:169:9 | {...} |
 | Finally.cs:147:10:147:11 | enter M8 | Finally.cs:158:36:158:36 | 1 |
-| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:158:36:158:36 | [finally: exception(ArgumentNullException)] 1 |
-| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:158:36:158:36 | [finally: exception(Exception)] 1 |
-| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:159:21:159:45 | [finally: exception(ArgumentNullException)] throw ...; |
-| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:159:21:159:45 | [finally: exception(Exception)] throw ...; |
 | Finally.cs:147:10:147:11 | enter M8 | Finally.cs:159:21:159:45 | throw ...; |
 | Finally.cs:147:10:147:11 | enter M8 | Finally.cs:159:41:159:43 | "1" |
-| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:159:41:159:43 | [finally: exception(ArgumentNullException)] "1" |
-| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:159:41:159:43 | [finally: exception(Exception)] "1" |
-| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:161:13:164:13 | [exception: Exception] catch (...) {...} |
-| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:161:13:164:13 | [exception: NullReferenceException] catch (...) {...} |
-| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:161:13:164:13 | [finally: exception(ArgumentNullException), exception: Exception] catch (...) {...} |
-| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:161:13:164:13 | [finally: exception(ArgumentNullException), exception: NullReferenceException] catch (...) {...} |
-| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:161:13:164:13 | [finally: exception(Exception), exception: Exception] catch (...) {...} |
-| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:161:13:164:13 | [finally: exception(Exception), exception: NullReferenceException] catch (...) {...} |
-| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:161:30:161:30 | [exception: Exception] Exception e |
-| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:161:30:161:30 | [exception: NullReferenceException] Exception e |
-| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:161:30:161:30 | [finally: exception(ArgumentNullException), exception: Exception] Exception e |
-| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:161:30:161:30 | [finally: exception(ArgumentNullException), exception: NullReferenceException] Exception e |
-| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:161:30:161:30 | [finally: exception(Exception), exception: Exception] Exception e |
-| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:161:30:161:30 | [finally: exception(Exception), exception: NullReferenceException] Exception e |
-| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:162:13:164:13 | [finally: exception(ArgumentNullException)] {...} |
-| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:162:13:164:13 | [finally: exception(Exception)] {...} |
+| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:161:13:164:13 | catch (...) {...} |
+| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:161:30:161:30 | Exception e |
 | Finally.cs:147:10:147:11 | enter M8 | Finally.cs:162:13:164:13 | {...} |
-| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:165:13:168:13 | [finally: exception(ArgumentNullException)] catch {...} |
-| Finally.cs:147:10:147:11 | enter M8 | Finally.cs:165:13:168:13 | [finally: exception(Exception)] catch {...} |
 | Finally.cs:147:10:147:11 | enter M8 | Finally.cs:165:13:168:13 | catch {...} |
 | Finally.cs:147:10:147:11 | exit M8 | Finally.cs:147:10:147:11 | exit M8 |
 | Finally.cs:147:10:147:11 | exit M8 (abnormal) | Finally.cs:147:10:147:11 | exit M8 (abnormal) |
 | Finally.cs:147:10:147:11 | exit M8 (normal) | Finally.cs:147:10:147:11 | exit M8 (normal) |
 | Finally.cs:152:17:152:50 | throw ...; | Finally.cs:152:17:152:50 | throw ...; |
-| Finally.cs:152:17:152:50 | throw ...; | Finally.cs:158:36:158:36 | [finally: exception(ArgumentNullException)] 1 |
-| Finally.cs:152:17:152:50 | throw ...; | Finally.cs:159:21:159:45 | [finally: exception(ArgumentNullException)] throw ...; |
-| Finally.cs:152:17:152:50 | throw ...; | Finally.cs:159:41:159:43 | [finally: exception(ArgumentNullException)] "1" |
-| Finally.cs:152:17:152:50 | throw ...; | Finally.cs:161:13:164:13 | [finally: exception(ArgumentNullException), exception: Exception] catch (...) {...} |
-| Finally.cs:152:17:152:50 | throw ...; | Finally.cs:161:13:164:13 | [finally: exception(ArgumentNullException), exception: NullReferenceException] catch (...) {...} |
-| Finally.cs:152:17:152:50 | throw ...; | Finally.cs:161:30:161:30 | [finally: exception(ArgumentNullException), exception: Exception] Exception e |
-| Finally.cs:152:17:152:50 | throw ...; | Finally.cs:161:30:161:30 | [finally: exception(ArgumentNullException), exception: NullReferenceException] Exception e |
-| Finally.cs:152:17:152:50 | throw ...; | Finally.cs:162:13:164:13 | [finally: exception(ArgumentNullException)] {...} |
-| Finally.cs:152:17:152:50 | throw ...; | Finally.cs:165:13:168:13 | [finally: exception(ArgumentNullException)] catch {...} |
-| Finally.cs:152:23:152:49 | object creation of type ArgumentNullException | Finally.cs:147:10:147:11 | exit M8 (abnormal) |
 | Finally.cs:152:23:152:49 | object creation of type ArgumentNullException | Finally.cs:152:17:152:50 | throw ...; |
 | Finally.cs:152:23:152:49 | object creation of type ArgumentNullException | Finally.cs:152:23:152:49 | object creation of type ArgumentNullException |
-| Finally.cs:152:23:152:49 | object creation of type ArgumentNullException | Finally.cs:155:9:169:9 | [finally: exception(Exception)] {...} |
-| Finally.cs:152:23:152:49 | object creation of type ArgumentNullException | Finally.cs:158:36:158:36 | [finally: exception(ArgumentNullException)] 1 |
-| Finally.cs:152:23:152:49 | object creation of type ArgumentNullException | Finally.cs:158:36:158:36 | [finally: exception(Exception)] 1 |
-| Finally.cs:152:23:152:49 | object creation of type ArgumentNullException | Finally.cs:159:21:159:45 | [finally: exception(ArgumentNullException)] throw ...; |
-| Finally.cs:152:23:152:49 | object creation of type ArgumentNullException | Finally.cs:159:21:159:45 | [finally: exception(Exception)] throw ...; |
-| Finally.cs:152:23:152:49 | object creation of type ArgumentNullException | Finally.cs:159:41:159:43 | [finally: exception(ArgumentNullException)] "1" |
-| Finally.cs:152:23:152:49 | object creation of type ArgumentNullException | Finally.cs:159:41:159:43 | [finally: exception(Exception)] "1" |
-| Finally.cs:152:23:152:49 | object creation of type ArgumentNullException | Finally.cs:161:13:164:13 | [finally: exception(ArgumentNullException), exception: Exception] catch (...) {...} |
-| Finally.cs:152:23:152:49 | object creation of type ArgumentNullException | Finally.cs:161:13:164:13 | [finally: exception(ArgumentNullException), exception: NullReferenceException] catch (...) {...} |
-| Finally.cs:152:23:152:49 | object creation of type ArgumentNullException | Finally.cs:161:13:164:13 | [finally: exception(Exception), exception: Exception] catch (...) {...} |
-| Finally.cs:152:23:152:49 | object creation of type ArgumentNullException | Finally.cs:161:13:164:13 | [finally: exception(Exception), exception: NullReferenceException] catch (...) {...} |
-| Finally.cs:152:23:152:49 | object creation of type ArgumentNullException | Finally.cs:161:30:161:30 | [finally: exception(ArgumentNullException), exception: Exception] Exception e |
-| Finally.cs:152:23:152:49 | object creation of type ArgumentNullException | Finally.cs:161:30:161:30 | [finally: exception(ArgumentNullException), exception: NullReferenceException] Exception e |
-| Finally.cs:152:23:152:49 | object creation of type ArgumentNullException | Finally.cs:161:30:161:30 | [finally: exception(Exception), exception: Exception] Exception e |
-| Finally.cs:152:23:152:49 | object creation of type ArgumentNullException | Finally.cs:161:30:161:30 | [finally: exception(Exception), exception: NullReferenceException] Exception e |
-| Finally.cs:152:23:152:49 | object creation of type ArgumentNullException | Finally.cs:162:13:164:13 | [finally: exception(ArgumentNullException)] {...} |
-| Finally.cs:152:23:152:49 | object creation of type ArgumentNullException | Finally.cs:162:13:164:13 | [finally: exception(Exception)] {...} |
-| Finally.cs:152:23:152:49 | object creation of type ArgumentNullException | Finally.cs:165:13:168:13 | [finally: exception(ArgumentNullException)] catch {...} |
-| Finally.cs:152:23:152:49 | object creation of type ArgumentNullException | Finally.cs:165:13:168:13 | [finally: exception(Exception)] catch {...} |
-| Finally.cs:155:9:169:9 | [finally: exception(Exception)] {...} | Finally.cs:155:9:169:9 | [finally: exception(Exception)] {...} |
-| Finally.cs:155:9:169:9 | [finally: exception(Exception)] {...} | Finally.cs:158:36:158:36 | [finally: exception(Exception)] 1 |
-| Finally.cs:155:9:169:9 | [finally: exception(Exception)] {...} | Finally.cs:159:21:159:45 | [finally: exception(Exception)] throw ...; |
-| Finally.cs:155:9:169:9 | [finally: exception(Exception)] {...} | Finally.cs:159:41:159:43 | [finally: exception(Exception)] "1" |
-| Finally.cs:155:9:169:9 | [finally: exception(Exception)] {...} | Finally.cs:161:13:164:13 | [finally: exception(Exception), exception: Exception] catch (...) {...} |
-| Finally.cs:155:9:169:9 | [finally: exception(Exception)] {...} | Finally.cs:161:13:164:13 | [finally: exception(Exception), exception: NullReferenceException] catch (...) {...} |
-| Finally.cs:155:9:169:9 | [finally: exception(Exception)] {...} | Finally.cs:161:30:161:30 | [finally: exception(Exception), exception: Exception] Exception e |
-| Finally.cs:155:9:169:9 | [finally: exception(Exception)] {...} | Finally.cs:161:30:161:30 | [finally: exception(Exception), exception: NullReferenceException] Exception e |
-| Finally.cs:155:9:169:9 | [finally: exception(Exception)] {...} | Finally.cs:162:13:164:13 | [finally: exception(Exception)] {...} |
-| Finally.cs:155:9:169:9 | [finally: exception(Exception)] {...} | Finally.cs:165:13:168:13 | [finally: exception(Exception)] catch {...} |
+| Finally.cs:155:9:169:9 | {...} | Finally.cs:147:10:147:11 | exit M8 |
+| Finally.cs:155:9:169:9 | {...} | Finally.cs:147:10:147:11 | exit M8 (abnormal) |
 | Finally.cs:155:9:169:9 | {...} | Finally.cs:147:10:147:11 | exit M8 (normal) |
 | Finally.cs:155:9:169:9 | {...} | Finally.cs:155:9:169:9 | {...} |
 | Finally.cs:155:9:169:9 | {...} | Finally.cs:158:36:158:36 | 1 |
 | Finally.cs:155:9:169:9 | {...} | Finally.cs:159:21:159:45 | throw ...; |
 | Finally.cs:155:9:169:9 | {...} | Finally.cs:159:41:159:43 | "1" |
-| Finally.cs:155:9:169:9 | {...} | Finally.cs:161:13:164:13 | [exception: Exception] catch (...) {...} |
-| Finally.cs:155:9:169:9 | {...} | Finally.cs:161:13:164:13 | [exception: NullReferenceException] catch (...) {...} |
-| Finally.cs:155:9:169:9 | {...} | Finally.cs:161:30:161:30 | [exception: Exception] Exception e |
-| Finally.cs:155:9:169:9 | {...} | Finally.cs:161:30:161:30 | [exception: NullReferenceException] Exception e |
+| Finally.cs:155:9:169:9 | {...} | Finally.cs:161:13:164:13 | catch (...) {...} |
+| Finally.cs:155:9:169:9 | {...} | Finally.cs:161:30:161:30 | Exception e |
 | Finally.cs:155:9:169:9 | {...} | Finally.cs:162:13:164:13 | {...} |
 | Finally.cs:155:9:169:9 | {...} | Finally.cs:165:13:168:13 | catch {...} |
 | Finally.cs:158:36:158:36 | 1 | Finally.cs:158:36:158:36 | 1 |
 | Finally.cs:158:36:158:36 | 1 | Finally.cs:159:21:159:45 | throw ...; |
 | Finally.cs:158:36:158:36 | 1 | Finally.cs:159:41:159:43 | "1" |
-| Finally.cs:158:36:158:36 | [finally: exception(ArgumentNullException)] 1 | Finally.cs:158:36:158:36 | [finally: exception(ArgumentNullException)] 1 |
-| Finally.cs:158:36:158:36 | [finally: exception(ArgumentNullException)] 1 | Finally.cs:159:21:159:45 | [finally: exception(ArgumentNullException)] throw ...; |
-| Finally.cs:158:36:158:36 | [finally: exception(ArgumentNullException)] 1 | Finally.cs:159:41:159:43 | [finally: exception(ArgumentNullException)] "1" |
-| Finally.cs:158:36:158:36 | [finally: exception(Exception)] 1 | Finally.cs:158:36:158:36 | [finally: exception(Exception)] 1 |
-| Finally.cs:158:36:158:36 | [finally: exception(Exception)] 1 | Finally.cs:159:21:159:45 | [finally: exception(Exception)] throw ...; |
-| Finally.cs:158:36:158:36 | [finally: exception(Exception)] 1 | Finally.cs:159:41:159:43 | [finally: exception(Exception)] "1" |
-| Finally.cs:159:21:159:45 | [finally: exception(ArgumentNullException)] throw ...; | Finally.cs:159:21:159:45 | [finally: exception(ArgumentNullException)] throw ...; |
-| Finally.cs:159:21:159:45 | [finally: exception(Exception)] throw ...; | Finally.cs:159:21:159:45 | [finally: exception(Exception)] throw ...; |
 | Finally.cs:159:21:159:45 | throw ...; | Finally.cs:159:21:159:45 | throw ...; |
 | Finally.cs:159:41:159:43 | "1" | Finally.cs:159:21:159:45 | throw ...; |
 | Finally.cs:159:41:159:43 | "1" | Finally.cs:159:41:159:43 | "1" |
-| Finally.cs:159:41:159:43 | [finally: exception(ArgumentNullException)] "1" | Finally.cs:159:21:159:45 | [finally: exception(ArgumentNullException)] throw ...; |
-| Finally.cs:159:41:159:43 | [finally: exception(ArgumentNullException)] "1" | Finally.cs:159:41:159:43 | [finally: exception(ArgumentNullException)] "1" |
-| Finally.cs:159:41:159:43 | [finally: exception(Exception)] "1" | Finally.cs:159:21:159:45 | [finally: exception(Exception)] throw ...; |
-| Finally.cs:159:41:159:43 | [finally: exception(Exception)] "1" | Finally.cs:159:41:159:43 | [finally: exception(Exception)] "1" |
-| Finally.cs:161:13:164:13 | [exception: Exception] catch (...) {...} | Finally.cs:161:13:164:13 | [exception: Exception] catch (...) {...} |
-| Finally.cs:161:13:164:13 | [exception: Exception] catch (...) {...} | Finally.cs:161:30:161:30 | [exception: Exception] Exception e |
-| Finally.cs:161:13:164:13 | [exception: NullReferenceException] catch (...) {...} | Finally.cs:161:13:164:13 | [exception: NullReferenceException] catch (...) {...} |
-| Finally.cs:161:13:164:13 | [exception: NullReferenceException] catch (...) {...} | Finally.cs:161:30:161:30 | [exception: NullReferenceException] Exception e |
-| Finally.cs:161:13:164:13 | [finally: exception(ArgumentNullException), exception: Exception] catch (...) {...} | Finally.cs:161:13:164:13 | [finally: exception(ArgumentNullException), exception: Exception] catch (...) {...} |
-| Finally.cs:161:13:164:13 | [finally: exception(ArgumentNullException), exception: Exception] catch (...) {...} | Finally.cs:161:30:161:30 | [finally: exception(ArgumentNullException), exception: Exception] Exception e |
-| Finally.cs:161:13:164:13 | [finally: exception(ArgumentNullException), exception: NullReferenceException] catch (...) {...} | Finally.cs:161:13:164:13 | [finally: exception(ArgumentNullException), exception: NullReferenceException] catch (...) {...} |
-| Finally.cs:161:13:164:13 | [finally: exception(ArgumentNullException), exception: NullReferenceException] catch (...) {...} | Finally.cs:161:30:161:30 | [finally: exception(ArgumentNullException), exception: NullReferenceException] Exception e |
-| Finally.cs:161:13:164:13 | [finally: exception(Exception), exception: Exception] catch (...) {...} | Finally.cs:161:13:164:13 | [finally: exception(Exception), exception: Exception] catch (...) {...} |
-| Finally.cs:161:13:164:13 | [finally: exception(Exception), exception: Exception] catch (...) {...} | Finally.cs:161:30:161:30 | [finally: exception(Exception), exception: Exception] Exception e |
-| Finally.cs:161:13:164:13 | [finally: exception(Exception), exception: NullReferenceException] catch (...) {...} | Finally.cs:161:13:164:13 | [finally: exception(Exception), exception: NullReferenceException] catch (...) {...} |
-| Finally.cs:161:13:164:13 | [finally: exception(Exception), exception: NullReferenceException] catch (...) {...} | Finally.cs:161:30:161:30 | [finally: exception(Exception), exception: NullReferenceException] Exception e |
-| Finally.cs:161:30:161:30 | [exception: Exception] Exception e | Finally.cs:161:30:161:30 | [exception: Exception] Exception e |
-| Finally.cs:161:30:161:30 | [exception: NullReferenceException] Exception e | Finally.cs:161:30:161:30 | [exception: NullReferenceException] Exception e |
-| Finally.cs:161:30:161:30 | [finally: exception(ArgumentNullException), exception: Exception] Exception e | Finally.cs:161:30:161:30 | [finally: exception(ArgumentNullException), exception: Exception] Exception e |
-| Finally.cs:161:30:161:30 | [finally: exception(ArgumentNullException), exception: NullReferenceException] Exception e | Finally.cs:161:30:161:30 | [finally: exception(ArgumentNullException), exception: NullReferenceException] Exception e |
-| Finally.cs:161:30:161:30 | [finally: exception(Exception), exception: Exception] Exception e | Finally.cs:161:30:161:30 | [finally: exception(Exception), exception: Exception] Exception e |
-| Finally.cs:161:30:161:30 | [finally: exception(Exception), exception: NullReferenceException] Exception e | Finally.cs:161:30:161:30 | [finally: exception(Exception), exception: NullReferenceException] Exception e |
-| Finally.cs:162:13:164:13 | [finally: exception(ArgumentNullException)] {...} | Finally.cs:162:13:164:13 | [finally: exception(ArgumentNullException)] {...} |
-| Finally.cs:162:13:164:13 | [finally: exception(Exception)] {...} | Finally.cs:162:13:164:13 | [finally: exception(Exception)] {...} |
+| Finally.cs:161:13:164:13 | catch (...) {...} | Finally.cs:161:13:164:13 | catch (...) {...} |
+| Finally.cs:161:13:164:13 | catch (...) {...} | Finally.cs:161:30:161:30 | Exception e |
+| Finally.cs:161:13:164:13 | catch (...) {...} | Finally.cs:162:13:164:13 | {...} |
+| Finally.cs:161:13:164:13 | catch (...) {...} | Finally.cs:165:13:168:13 | catch {...} |
+| Finally.cs:161:30:161:30 | Exception e | Finally.cs:161:30:161:30 | Exception e |
+| Finally.cs:161:30:161:30 | Exception e | Finally.cs:162:13:164:13 | {...} |
 | Finally.cs:162:13:164:13 | {...} | Finally.cs:162:13:164:13 | {...} |
-| Finally.cs:165:13:168:13 | [finally: exception(ArgumentNullException)] catch {...} | Finally.cs:165:13:168:13 | [finally: exception(ArgumentNullException)] catch {...} |
-| Finally.cs:165:13:168:13 | [finally: exception(Exception)] catch {...} | Finally.cs:165:13:168:13 | [finally: exception(Exception)] catch {...} |
 | Finally.cs:165:13:168:13 | catch {...} | Finally.cs:165:13:168:13 | catch {...} |
 | Finally.cs:172:11:172:20 | enter ExceptionA | Finally.cs:172:11:172:20 | enter ExceptionA |
 | Finally.cs:173:11:173:20 | enter ExceptionB | Finally.cs:173:11:173:20 | enter ExceptionB |
@@ -11141,246 +9261,87 @@ blockDominance
 | Finally.cs:176:10:176:11 | enter M9 | Finally.cs:176:10:176:11 | exit M9 |
 | Finally.cs:176:10:176:11 | enter M9 | Finally.cs:176:10:176:11 | exit M9 (abnormal) |
 | Finally.cs:176:10:176:11 | enter M9 | Finally.cs:176:10:176:11 | exit M9 (normal) |
-| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:180:21:180:43 | [b1 (line 176): true] throw ...; |
-| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:180:27:180:42 | [b1 (line 176): true] object creation of type ExceptionA |
-| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:183:9:192:9 | [b1 (line 176): false] {...} |
-| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:183:9:192:9 | [finally: exception(Exception), b1 (line 176): true] {...} |
-| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:186:25:186:47 | [b1 (line 176): false, b2 (line 176): true] throw ...; |
-| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:186:25:186:47 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] throw ...; |
-| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:186:25:186:47 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] throw ...; |
-| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:186:31:186:46 | [b1 (line 176): false, b2 (line 176): true] object creation of type ExceptionB |
-| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:186:31:186:46 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB |
-| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:186:31:186:46 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB |
-| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:188:13:191:13 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] catch (...) {...} |
-| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:188:13:191:13 | [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...} |
-| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:188:13:191:13 | [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...} |
-| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:188:38:188:39 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] access to parameter b2 |
-| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:188:38:188:39 | [exception: ExceptionB, b1 (line 176): false, b2 (line 176): true] access to parameter b2 |
-| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:188:38:188:39 | [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] access to parameter b2 |
-| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:188:38:188:39 | [finally: exception(Exception), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] access to parameter b2 |
-| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:188:38:188:39 | [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] access to parameter b2 |
-| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:188:38:188:39 | [finally: exception(ExceptionA), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] access to parameter b2 |
-| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:189:13:191:13 | [b1 (line 176): false] {...} |
-| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:189:13:191:13 | [finally: exception(Exception), b1 (line 176): true] {...} |
-| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:189:13:191:13 | [finally: exception(ExceptionA), b1 (line 176): true] {...} |
-| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:190:31:190:46 | [finally: exception(Exception)] object creation of type ExceptionC |
-| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:190:31:190:46 | [finally: exception(ExceptionA)] object creation of type ExceptionC |
+| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:180:21:180:43 | throw ...; |
+| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:180:27:180:42 | object creation of type ExceptionA |
+| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:183:9:192:9 | {...} |
+| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:186:25:186:47 | throw ...; |
+| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:186:31:186:46 | object creation of type ExceptionB |
+| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:188:13:191:13 | catch (...) {...} |
+| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:188:38:188:39 | access to parameter b2 |
+| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:189:13:191:13 | {...} |
+| Finally.cs:176:10:176:11 | enter M9 | Finally.cs:190:31:190:46 | object creation of type ExceptionC |
 | Finally.cs:176:10:176:11 | exit M9 | Finally.cs:176:10:176:11 | exit M9 |
 | Finally.cs:176:10:176:11 | exit M9 (abnormal) | Finally.cs:176:10:176:11 | exit M9 (abnormal) |
 | Finally.cs:176:10:176:11 | exit M9 (normal) | Finally.cs:176:10:176:11 | exit M9 (normal) |
-| Finally.cs:180:21:180:43 | [b1 (line 176): true] throw ...; | Finally.cs:180:21:180:43 | [b1 (line 176): true] throw ...; |
-| Finally.cs:180:21:180:43 | [b1 (line 176): true] throw ...; | Finally.cs:186:25:186:47 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] throw ...; |
-| Finally.cs:180:21:180:43 | [b1 (line 176): true] throw ...; | Finally.cs:186:31:186:46 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB |
-| Finally.cs:180:21:180:43 | [b1 (line 176): true] throw ...; | Finally.cs:188:13:191:13 | [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...} |
-| Finally.cs:180:21:180:43 | [b1 (line 176): true] throw ...; | Finally.cs:188:38:188:39 | [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] access to parameter b2 |
-| Finally.cs:180:21:180:43 | [b1 (line 176): true] throw ...; | Finally.cs:188:38:188:39 | [finally: exception(ExceptionA), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] access to parameter b2 |
-| Finally.cs:180:21:180:43 | [b1 (line 176): true] throw ...; | Finally.cs:189:13:191:13 | [finally: exception(ExceptionA), b1 (line 176): true] {...} |
-| Finally.cs:180:21:180:43 | [b1 (line 176): true] throw ...; | Finally.cs:190:31:190:46 | [finally: exception(ExceptionA)] object creation of type ExceptionC |
-| Finally.cs:180:27:180:42 | [b1 (line 176): true] object creation of type ExceptionA | Finally.cs:180:21:180:43 | [b1 (line 176): true] throw ...; |
-| Finally.cs:180:27:180:42 | [b1 (line 176): true] object creation of type ExceptionA | Finally.cs:180:27:180:42 | [b1 (line 176): true] object creation of type ExceptionA |
-| Finally.cs:180:27:180:42 | [b1 (line 176): true] object creation of type ExceptionA | Finally.cs:183:9:192:9 | [finally: exception(Exception), b1 (line 176): true] {...} |
-| Finally.cs:180:27:180:42 | [b1 (line 176): true] object creation of type ExceptionA | Finally.cs:186:25:186:47 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] throw ...; |
-| Finally.cs:180:27:180:42 | [b1 (line 176): true] object creation of type ExceptionA | Finally.cs:186:25:186:47 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] throw ...; |
-| Finally.cs:180:27:180:42 | [b1 (line 176): true] object creation of type ExceptionA | Finally.cs:186:31:186:46 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB |
-| Finally.cs:180:27:180:42 | [b1 (line 176): true] object creation of type ExceptionA | Finally.cs:186:31:186:46 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB |
-| Finally.cs:180:27:180:42 | [b1 (line 176): true] object creation of type ExceptionA | Finally.cs:188:13:191:13 | [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...} |
-| Finally.cs:180:27:180:42 | [b1 (line 176): true] object creation of type ExceptionA | Finally.cs:188:13:191:13 | [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...} |
-| Finally.cs:180:27:180:42 | [b1 (line 176): true] object creation of type ExceptionA | Finally.cs:188:38:188:39 | [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] access to parameter b2 |
-| Finally.cs:180:27:180:42 | [b1 (line 176): true] object creation of type ExceptionA | Finally.cs:188:38:188:39 | [finally: exception(Exception), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] access to parameter b2 |
-| Finally.cs:180:27:180:42 | [b1 (line 176): true] object creation of type ExceptionA | Finally.cs:188:38:188:39 | [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] access to parameter b2 |
-| Finally.cs:180:27:180:42 | [b1 (line 176): true] object creation of type ExceptionA | Finally.cs:188:38:188:39 | [finally: exception(ExceptionA), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] access to parameter b2 |
-| Finally.cs:180:27:180:42 | [b1 (line 176): true] object creation of type ExceptionA | Finally.cs:189:13:191:13 | [finally: exception(Exception), b1 (line 176): true] {...} |
-| Finally.cs:180:27:180:42 | [b1 (line 176): true] object creation of type ExceptionA | Finally.cs:189:13:191:13 | [finally: exception(ExceptionA), b1 (line 176): true] {...} |
-| Finally.cs:180:27:180:42 | [b1 (line 176): true] object creation of type ExceptionA | Finally.cs:190:31:190:46 | [finally: exception(Exception)] object creation of type ExceptionC |
-| Finally.cs:180:27:180:42 | [b1 (line 176): true] object creation of type ExceptionA | Finally.cs:190:31:190:46 | [finally: exception(ExceptionA)] object creation of type ExceptionC |
-| Finally.cs:183:9:192:9 | [b1 (line 176): false] {...} | Finally.cs:176:10:176:11 | exit M9 (normal) |
-| Finally.cs:183:9:192:9 | [b1 (line 176): false] {...} | Finally.cs:183:9:192:9 | [b1 (line 176): false] {...} |
-| Finally.cs:183:9:192:9 | [b1 (line 176): false] {...} | Finally.cs:186:25:186:47 | [b1 (line 176): false, b2 (line 176): true] throw ...; |
-| Finally.cs:183:9:192:9 | [b1 (line 176): false] {...} | Finally.cs:186:31:186:46 | [b1 (line 176): false, b2 (line 176): true] object creation of type ExceptionB |
-| Finally.cs:183:9:192:9 | [b1 (line 176): false] {...} | Finally.cs:188:13:191:13 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] catch (...) {...} |
-| Finally.cs:183:9:192:9 | [b1 (line 176): false] {...} | Finally.cs:188:38:188:39 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] access to parameter b2 |
-| Finally.cs:183:9:192:9 | [b1 (line 176): false] {...} | Finally.cs:188:38:188:39 | [exception: ExceptionB, b1 (line 176): false, b2 (line 176): true] access to parameter b2 |
-| Finally.cs:183:9:192:9 | [b1 (line 176): false] {...} | Finally.cs:189:13:191:13 | [b1 (line 176): false] {...} |
-| Finally.cs:183:9:192:9 | [finally: exception(Exception), b1 (line 176): true] {...} | Finally.cs:183:9:192:9 | [finally: exception(Exception), b1 (line 176): true] {...} |
-| Finally.cs:183:9:192:9 | [finally: exception(Exception), b1 (line 176): true] {...} | Finally.cs:186:25:186:47 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] throw ...; |
-| Finally.cs:183:9:192:9 | [finally: exception(Exception), b1 (line 176): true] {...} | Finally.cs:186:31:186:46 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB |
-| Finally.cs:183:9:192:9 | [finally: exception(Exception), b1 (line 176): true] {...} | Finally.cs:188:13:191:13 | [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...} |
-| Finally.cs:183:9:192:9 | [finally: exception(Exception), b1 (line 176): true] {...} | Finally.cs:188:38:188:39 | [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] access to parameter b2 |
-| Finally.cs:183:9:192:9 | [finally: exception(Exception), b1 (line 176): true] {...} | Finally.cs:188:38:188:39 | [finally: exception(Exception), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] access to parameter b2 |
-| Finally.cs:183:9:192:9 | [finally: exception(Exception), b1 (line 176): true] {...} | Finally.cs:189:13:191:13 | [finally: exception(Exception), b1 (line 176): true] {...} |
-| Finally.cs:183:9:192:9 | [finally: exception(Exception), b1 (line 176): true] {...} | Finally.cs:190:31:190:46 | [finally: exception(Exception)] object creation of type ExceptionC |
-| Finally.cs:186:25:186:47 | [b1 (line 176): false, b2 (line 176): true] throw ...; | Finally.cs:186:25:186:47 | [b1 (line 176): false, b2 (line 176): true] throw ...; |
-| Finally.cs:186:25:186:47 | [b1 (line 176): false, b2 (line 176): true] throw ...; | Finally.cs:188:38:188:39 | [exception: ExceptionB, b1 (line 176): false, b2 (line 176): true] access to parameter b2 |
-| Finally.cs:186:25:186:47 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] throw ...; | Finally.cs:186:25:186:47 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] throw ...; |
-| Finally.cs:186:25:186:47 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] throw ...; | Finally.cs:188:38:188:39 | [finally: exception(Exception), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] access to parameter b2 |
-| Finally.cs:186:25:186:47 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] throw ...; | Finally.cs:186:25:186:47 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] throw ...; |
-| Finally.cs:186:25:186:47 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] throw ...; | Finally.cs:188:38:188:39 | [finally: exception(ExceptionA), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] access to parameter b2 |
-| Finally.cs:186:31:186:46 | [b1 (line 176): false, b2 (line 176): true] object creation of type ExceptionB | Finally.cs:186:25:186:47 | [b1 (line 176): false, b2 (line 176): true] throw ...; |
-| Finally.cs:186:31:186:46 | [b1 (line 176): false, b2 (line 176): true] object creation of type ExceptionB | Finally.cs:186:31:186:46 | [b1 (line 176): false, b2 (line 176): true] object creation of type ExceptionB |
-| Finally.cs:186:31:186:46 | [b1 (line 176): false, b2 (line 176): true] object creation of type ExceptionB | Finally.cs:188:13:191:13 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] catch (...) {...} |
-| Finally.cs:186:31:186:46 | [b1 (line 176): false, b2 (line 176): true] object creation of type ExceptionB | Finally.cs:188:38:188:39 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] access to parameter b2 |
-| Finally.cs:186:31:186:46 | [b1 (line 176): false, b2 (line 176): true] object creation of type ExceptionB | Finally.cs:188:38:188:39 | [exception: ExceptionB, b1 (line 176): false, b2 (line 176): true] access to parameter b2 |
-| Finally.cs:186:31:186:46 | [b1 (line 176): false, b2 (line 176): true] object creation of type ExceptionB | Finally.cs:189:13:191:13 | [b1 (line 176): false] {...} |
-| Finally.cs:186:31:186:46 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB | Finally.cs:186:25:186:47 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] throw ...; |
-| Finally.cs:186:31:186:46 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB | Finally.cs:186:31:186:46 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB |
-| Finally.cs:186:31:186:46 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB | Finally.cs:188:13:191:13 | [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...} |
-| Finally.cs:186:31:186:46 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB | Finally.cs:188:38:188:39 | [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] access to parameter b2 |
-| Finally.cs:186:31:186:46 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB | Finally.cs:188:38:188:39 | [finally: exception(Exception), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] access to parameter b2 |
-| Finally.cs:186:31:186:46 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB | Finally.cs:189:13:191:13 | [finally: exception(Exception), b1 (line 176): true] {...} |
-| Finally.cs:186:31:186:46 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB | Finally.cs:190:31:190:46 | [finally: exception(Exception)] object creation of type ExceptionC |
-| Finally.cs:186:31:186:46 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB | Finally.cs:186:25:186:47 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] throw ...; |
-| Finally.cs:186:31:186:46 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB | Finally.cs:186:31:186:46 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB |
-| Finally.cs:186:31:186:46 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB | Finally.cs:188:13:191:13 | [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...} |
-| Finally.cs:186:31:186:46 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB | Finally.cs:188:38:188:39 | [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] access to parameter b2 |
-| Finally.cs:186:31:186:46 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB | Finally.cs:188:38:188:39 | [finally: exception(ExceptionA), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] access to parameter b2 |
-| Finally.cs:186:31:186:46 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB | Finally.cs:189:13:191:13 | [finally: exception(ExceptionA), b1 (line 176): true] {...} |
-| Finally.cs:186:31:186:46 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB | Finally.cs:190:31:190:46 | [finally: exception(ExceptionA)] object creation of type ExceptionC |
-| Finally.cs:188:13:191:13 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] catch (...) {...} | Finally.cs:188:13:191:13 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] catch (...) {...} |
-| Finally.cs:188:13:191:13 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] catch (...) {...} | Finally.cs:188:38:188:39 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] access to parameter b2 |
-| Finally.cs:188:13:191:13 | [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | Finally.cs:188:13:191:13 | [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...} |
-| Finally.cs:188:13:191:13 | [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | Finally.cs:188:38:188:39 | [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] access to parameter b2 |
-| Finally.cs:188:13:191:13 | [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | Finally.cs:188:13:191:13 | [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...} |
-| Finally.cs:188:13:191:13 | [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | Finally.cs:188:38:188:39 | [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] access to parameter b2 |
-| Finally.cs:188:38:188:39 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] access to parameter b2 | Finally.cs:188:38:188:39 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] access to parameter b2 |
-| Finally.cs:188:38:188:39 | [exception: ExceptionB, b1 (line 176): false, b2 (line 176): true] access to parameter b2 | Finally.cs:188:38:188:39 | [exception: ExceptionB, b1 (line 176): false, b2 (line 176): true] access to parameter b2 |
-| Finally.cs:188:38:188:39 | [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | Finally.cs:188:38:188:39 | [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] access to parameter b2 |
-| Finally.cs:188:38:188:39 | [finally: exception(Exception), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | Finally.cs:188:38:188:39 | [finally: exception(Exception), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] access to parameter b2 |
-| Finally.cs:188:38:188:39 | [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | Finally.cs:188:38:188:39 | [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] access to parameter b2 |
-| Finally.cs:188:38:188:39 | [finally: exception(ExceptionA), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | Finally.cs:188:38:188:39 | [finally: exception(ExceptionA), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] access to parameter b2 |
-| Finally.cs:189:13:191:13 | [b1 (line 176): false] {...} | Finally.cs:189:13:191:13 | [b1 (line 176): false] {...} |
-| Finally.cs:189:13:191:13 | [finally: exception(Exception), b1 (line 176): true] {...} | Finally.cs:189:13:191:13 | [finally: exception(Exception), b1 (line 176): true] {...} |
-| Finally.cs:189:13:191:13 | [finally: exception(Exception), b1 (line 176): true] {...} | Finally.cs:190:31:190:46 | [finally: exception(Exception)] object creation of type ExceptionC |
-| Finally.cs:189:13:191:13 | [finally: exception(ExceptionA), b1 (line 176): true] {...} | Finally.cs:189:13:191:13 | [finally: exception(ExceptionA), b1 (line 176): true] {...} |
-| Finally.cs:189:13:191:13 | [finally: exception(ExceptionA), b1 (line 176): true] {...} | Finally.cs:190:31:190:46 | [finally: exception(ExceptionA)] object creation of type ExceptionC |
-| Finally.cs:190:31:190:46 | [finally: exception(Exception)] object creation of type ExceptionC | Finally.cs:190:31:190:46 | [finally: exception(Exception)] object creation of type ExceptionC |
-| Finally.cs:190:31:190:46 | [finally: exception(ExceptionA)] object creation of type ExceptionC | Finally.cs:190:31:190:46 | [finally: exception(ExceptionA)] object creation of type ExceptionC |
+| Finally.cs:180:21:180:43 | throw ...; | Finally.cs:180:21:180:43 | throw ...; |
+| Finally.cs:180:27:180:42 | object creation of type ExceptionA | Finally.cs:180:21:180:43 | throw ...; |
+| Finally.cs:180:27:180:42 | object creation of type ExceptionA | Finally.cs:180:27:180:42 | object creation of type ExceptionA |
+| Finally.cs:183:9:192:9 | {...} | Finally.cs:176:10:176:11 | exit M9 |
+| Finally.cs:183:9:192:9 | {...} | Finally.cs:176:10:176:11 | exit M9 (abnormal) |
+| Finally.cs:183:9:192:9 | {...} | Finally.cs:176:10:176:11 | exit M9 (normal) |
+| Finally.cs:183:9:192:9 | {...} | Finally.cs:183:9:192:9 | {...} |
+| Finally.cs:183:9:192:9 | {...} | Finally.cs:186:25:186:47 | throw ...; |
+| Finally.cs:183:9:192:9 | {...} | Finally.cs:186:31:186:46 | object creation of type ExceptionB |
+| Finally.cs:183:9:192:9 | {...} | Finally.cs:188:13:191:13 | catch (...) {...} |
+| Finally.cs:183:9:192:9 | {...} | Finally.cs:188:38:188:39 | access to parameter b2 |
+| Finally.cs:183:9:192:9 | {...} | Finally.cs:189:13:191:13 | {...} |
+| Finally.cs:183:9:192:9 | {...} | Finally.cs:190:31:190:46 | object creation of type ExceptionC |
+| Finally.cs:186:25:186:47 | throw ...; | Finally.cs:186:25:186:47 | throw ...; |
+| Finally.cs:186:31:186:46 | object creation of type ExceptionB | Finally.cs:186:25:186:47 | throw ...; |
+| Finally.cs:186:31:186:46 | object creation of type ExceptionB | Finally.cs:186:31:186:46 | object creation of type ExceptionB |
+| Finally.cs:186:31:186:46 | object creation of type ExceptionB | Finally.cs:188:13:191:13 | catch (...) {...} |
+| Finally.cs:186:31:186:46 | object creation of type ExceptionB | Finally.cs:188:38:188:39 | access to parameter b2 |
+| Finally.cs:186:31:186:46 | object creation of type ExceptionB | Finally.cs:189:13:191:13 | {...} |
+| Finally.cs:186:31:186:46 | object creation of type ExceptionB | Finally.cs:190:31:190:46 | object creation of type ExceptionC |
+| Finally.cs:188:13:191:13 | catch (...) {...} | Finally.cs:188:13:191:13 | catch (...) {...} |
+| Finally.cs:188:13:191:13 | catch (...) {...} | Finally.cs:188:38:188:39 | access to parameter b2 |
+| Finally.cs:188:13:191:13 | catch (...) {...} | Finally.cs:189:13:191:13 | {...} |
+| Finally.cs:188:13:191:13 | catch (...) {...} | Finally.cs:190:31:190:46 | object creation of type ExceptionC |
+| Finally.cs:188:38:188:39 | access to parameter b2 | Finally.cs:188:38:188:39 | access to parameter b2 |
+| Finally.cs:188:38:188:39 | access to parameter b2 | Finally.cs:189:13:191:13 | {...} |
+| Finally.cs:188:38:188:39 | access to parameter b2 | Finally.cs:190:31:190:46 | object creation of type ExceptionC |
+| Finally.cs:189:13:191:13 | {...} | Finally.cs:189:13:191:13 | {...} |
+| Finally.cs:189:13:191:13 | {...} | Finally.cs:190:31:190:46 | object creation of type ExceptionC |
+| Finally.cs:190:31:190:46 | object creation of type ExceptionC | Finally.cs:190:31:190:46 | object creation of type ExceptionC |
 | Finally.cs:195:10:195:12 | enter M10 | Finally.cs:195:10:195:12 | enter M10 |
 | Finally.cs:195:10:195:12 | enter M10 | Finally.cs:195:10:195:12 | exit M10 |
 | Finally.cs:195:10:195:12 | enter M10 | Finally.cs:195:10:195:12 | exit M10 (abnormal) |
 | Finally.cs:195:10:195:12 | enter M10 | Finally.cs:199:21:199:43 | throw ...; |
 | Finally.cs:195:10:195:12 | enter M10 | Finally.cs:199:27:199:42 | object creation of type ExceptionA |
-| Finally.cs:195:10:195:12 | enter M10 | Finally.cs:202:9:212:9 | [finally: exception(Exception)] {...} |
 | Finally.cs:195:10:195:12 | enter M10 | Finally.cs:202:9:212:9 | {...} |
-| Finally.cs:195:10:195:12 | enter M10 | Finally.cs:205:25:205:47 | [finally: exception(Exception)] throw ...; |
-| Finally.cs:195:10:195:12 | enter M10 | Finally.cs:205:25:205:47 | [finally: exception(ExceptionA)] throw ...; |
 | Finally.cs:195:10:195:12 | enter M10 | Finally.cs:205:25:205:47 | throw ...; |
-| Finally.cs:195:10:195:12 | enter M10 | Finally.cs:205:31:205:46 | [finally: exception(Exception)] object creation of type ExceptionB |
-| Finally.cs:195:10:195:12 | enter M10 | Finally.cs:205:31:205:46 | [finally: exception(ExceptionA)] object creation of type ExceptionB |
 | Finally.cs:195:10:195:12 | enter M10 | Finally.cs:205:31:205:46 | object creation of type ExceptionB |
-| Finally.cs:195:10:195:12 | enter M10 | Finally.cs:208:13:210:13 | [finally(1): exception(Exception)] {...} |
-| Finally.cs:195:10:195:12 | enter M10 | Finally.cs:208:13:210:13 | [finally: exception(Exception), finally(1): exception(Exception)] {...} |
-| Finally.cs:195:10:195:12 | enter M10 | Finally.cs:208:13:210:13 | [finally: exception(Exception)] {...} |
-| Finally.cs:195:10:195:12 | enter M10 | Finally.cs:208:13:210:13 | [finally: exception(ExceptionA), finally(1): exception(Exception)] {...} |
-| Finally.cs:195:10:195:12 | enter M10 | Finally.cs:208:13:210:13 | [finally: exception(ExceptionA)] {...} |
 | Finally.cs:195:10:195:12 | enter M10 | Finally.cs:208:13:210:13 | {...} |
-| Finally.cs:195:10:195:12 | enter M10 | Finally.cs:209:31:209:46 | [finally(1): exception(Exception)] object creation of type ExceptionC |
-| Finally.cs:195:10:195:12 | enter M10 | Finally.cs:209:31:209:46 | [finally(1): exception(ExceptionB)] object creation of type ExceptionC |
-| Finally.cs:195:10:195:12 | enter M10 | Finally.cs:209:31:209:46 | [finally: exception(Exception), finally(1): exception(Exception)] object creation of type ExceptionC |
-| Finally.cs:195:10:195:12 | enter M10 | Finally.cs:209:31:209:46 | [finally: exception(Exception), finally(1): exception(ExceptionB)] object creation of type ExceptionC |
-| Finally.cs:195:10:195:12 | enter M10 | Finally.cs:209:31:209:46 | [finally: exception(Exception)] object creation of type ExceptionC |
-| Finally.cs:195:10:195:12 | enter M10 | Finally.cs:209:31:209:46 | [finally: exception(ExceptionA), finally(1): exception(Exception)] object creation of type ExceptionC |
-| Finally.cs:195:10:195:12 | enter M10 | Finally.cs:209:31:209:46 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] object creation of type ExceptionC |
-| Finally.cs:195:10:195:12 | enter M10 | Finally.cs:209:31:209:46 | [finally: exception(ExceptionA)] object creation of type ExceptionC |
 | Finally.cs:195:10:195:12 | enter M10 | Finally.cs:209:31:209:46 | object creation of type ExceptionC |
 | Finally.cs:195:10:195:12 | enter M10 | Finally.cs:211:13:211:29 | ...; |
-| Finally.cs:195:10:195:12 | enter M10 | Finally.cs:211:13:211:29 | [finally: exception(Exception)] ...; |
-| Finally.cs:195:10:195:12 | enter M10 | Finally.cs:211:13:211:29 | [finally: exception(ExceptionA)] ...; |
+| Finally.cs:195:10:195:12 | enter M10 | Finally.cs:213:9:213:25 | ...; |
 | Finally.cs:195:10:195:12 | exit M10 | Finally.cs:195:10:195:12 | exit M10 |
 | Finally.cs:195:10:195:12 | exit M10 (abnormal) | Finally.cs:195:10:195:12 | exit M10 (abnormal) |
 | Finally.cs:199:21:199:43 | throw ...; | Finally.cs:199:21:199:43 | throw ...; |
-| Finally.cs:199:21:199:43 | throw ...; | Finally.cs:205:25:205:47 | [finally: exception(ExceptionA)] throw ...; |
-| Finally.cs:199:21:199:43 | throw ...; | Finally.cs:205:31:205:46 | [finally: exception(ExceptionA)] object creation of type ExceptionB |
-| Finally.cs:199:21:199:43 | throw ...; | Finally.cs:208:13:210:13 | [finally: exception(ExceptionA), finally(1): exception(Exception)] {...} |
-| Finally.cs:199:21:199:43 | throw ...; | Finally.cs:208:13:210:13 | [finally: exception(ExceptionA)] {...} |
-| Finally.cs:199:21:199:43 | throw ...; | Finally.cs:209:31:209:46 | [finally: exception(ExceptionA), finally(1): exception(Exception)] object creation of type ExceptionC |
-| Finally.cs:199:21:199:43 | throw ...; | Finally.cs:209:31:209:46 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] object creation of type ExceptionC |
-| Finally.cs:199:21:199:43 | throw ...; | Finally.cs:209:31:209:46 | [finally: exception(ExceptionA)] object creation of type ExceptionC |
-| Finally.cs:199:21:199:43 | throw ...; | Finally.cs:211:13:211:29 | [finally: exception(ExceptionA)] ...; |
 | Finally.cs:199:27:199:42 | object creation of type ExceptionA | Finally.cs:199:21:199:43 | throw ...; |
 | Finally.cs:199:27:199:42 | object creation of type ExceptionA | Finally.cs:199:27:199:42 | object creation of type ExceptionA |
-| Finally.cs:199:27:199:42 | object creation of type ExceptionA | Finally.cs:202:9:212:9 | [finally: exception(Exception)] {...} |
-| Finally.cs:199:27:199:42 | object creation of type ExceptionA | Finally.cs:205:25:205:47 | [finally: exception(Exception)] throw ...; |
-| Finally.cs:199:27:199:42 | object creation of type ExceptionA | Finally.cs:205:25:205:47 | [finally: exception(ExceptionA)] throw ...; |
-| Finally.cs:199:27:199:42 | object creation of type ExceptionA | Finally.cs:205:31:205:46 | [finally: exception(Exception)] object creation of type ExceptionB |
-| Finally.cs:199:27:199:42 | object creation of type ExceptionA | Finally.cs:205:31:205:46 | [finally: exception(ExceptionA)] object creation of type ExceptionB |
-| Finally.cs:199:27:199:42 | object creation of type ExceptionA | Finally.cs:208:13:210:13 | [finally: exception(Exception), finally(1): exception(Exception)] {...} |
-| Finally.cs:199:27:199:42 | object creation of type ExceptionA | Finally.cs:208:13:210:13 | [finally: exception(Exception)] {...} |
-| Finally.cs:199:27:199:42 | object creation of type ExceptionA | Finally.cs:208:13:210:13 | [finally: exception(ExceptionA), finally(1): exception(Exception)] {...} |
-| Finally.cs:199:27:199:42 | object creation of type ExceptionA | Finally.cs:208:13:210:13 | [finally: exception(ExceptionA)] {...} |
-| Finally.cs:199:27:199:42 | object creation of type ExceptionA | Finally.cs:209:31:209:46 | [finally: exception(Exception), finally(1): exception(Exception)] object creation of type ExceptionC |
-| Finally.cs:199:27:199:42 | object creation of type ExceptionA | Finally.cs:209:31:209:46 | [finally: exception(Exception), finally(1): exception(ExceptionB)] object creation of type ExceptionC |
-| Finally.cs:199:27:199:42 | object creation of type ExceptionA | Finally.cs:209:31:209:46 | [finally: exception(Exception)] object creation of type ExceptionC |
-| Finally.cs:199:27:199:42 | object creation of type ExceptionA | Finally.cs:209:31:209:46 | [finally: exception(ExceptionA), finally(1): exception(Exception)] object creation of type ExceptionC |
-| Finally.cs:199:27:199:42 | object creation of type ExceptionA | Finally.cs:209:31:209:46 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] object creation of type ExceptionC |
-| Finally.cs:199:27:199:42 | object creation of type ExceptionA | Finally.cs:209:31:209:46 | [finally: exception(ExceptionA)] object creation of type ExceptionC |
-| Finally.cs:199:27:199:42 | object creation of type ExceptionA | Finally.cs:211:13:211:29 | [finally: exception(Exception)] ...; |
-| Finally.cs:199:27:199:42 | object creation of type ExceptionA | Finally.cs:211:13:211:29 | [finally: exception(ExceptionA)] ...; |
-| Finally.cs:202:9:212:9 | [finally: exception(Exception)] {...} | Finally.cs:202:9:212:9 | [finally: exception(Exception)] {...} |
-| Finally.cs:202:9:212:9 | [finally: exception(Exception)] {...} | Finally.cs:205:25:205:47 | [finally: exception(Exception)] throw ...; |
-| Finally.cs:202:9:212:9 | [finally: exception(Exception)] {...} | Finally.cs:205:31:205:46 | [finally: exception(Exception)] object creation of type ExceptionB |
-| Finally.cs:202:9:212:9 | [finally: exception(Exception)] {...} | Finally.cs:208:13:210:13 | [finally: exception(Exception), finally(1): exception(Exception)] {...} |
-| Finally.cs:202:9:212:9 | [finally: exception(Exception)] {...} | Finally.cs:208:13:210:13 | [finally: exception(Exception)] {...} |
-| Finally.cs:202:9:212:9 | [finally: exception(Exception)] {...} | Finally.cs:209:31:209:46 | [finally: exception(Exception), finally(1): exception(Exception)] object creation of type ExceptionC |
-| Finally.cs:202:9:212:9 | [finally: exception(Exception)] {...} | Finally.cs:209:31:209:46 | [finally: exception(Exception), finally(1): exception(ExceptionB)] object creation of type ExceptionC |
-| Finally.cs:202:9:212:9 | [finally: exception(Exception)] {...} | Finally.cs:209:31:209:46 | [finally: exception(Exception)] object creation of type ExceptionC |
-| Finally.cs:202:9:212:9 | [finally: exception(Exception)] {...} | Finally.cs:211:13:211:29 | [finally: exception(Exception)] ...; |
+| Finally.cs:202:9:212:9 | {...} | Finally.cs:195:10:195:12 | exit M10 |
+| Finally.cs:202:9:212:9 | {...} | Finally.cs:195:10:195:12 | exit M10 (abnormal) |
 | Finally.cs:202:9:212:9 | {...} | Finally.cs:202:9:212:9 | {...} |
 | Finally.cs:202:9:212:9 | {...} | Finally.cs:205:25:205:47 | throw ...; |
 | Finally.cs:202:9:212:9 | {...} | Finally.cs:205:31:205:46 | object creation of type ExceptionB |
-| Finally.cs:202:9:212:9 | {...} | Finally.cs:208:13:210:13 | [finally(1): exception(Exception)] {...} |
 | Finally.cs:202:9:212:9 | {...} | Finally.cs:208:13:210:13 | {...} |
-| Finally.cs:202:9:212:9 | {...} | Finally.cs:209:31:209:46 | [finally(1): exception(Exception)] object creation of type ExceptionC |
-| Finally.cs:202:9:212:9 | {...} | Finally.cs:209:31:209:46 | [finally(1): exception(ExceptionB)] object creation of type ExceptionC |
 | Finally.cs:202:9:212:9 | {...} | Finally.cs:209:31:209:46 | object creation of type ExceptionC |
 | Finally.cs:202:9:212:9 | {...} | Finally.cs:211:13:211:29 | ...; |
-| Finally.cs:205:25:205:47 | [finally: exception(Exception)] throw ...; | Finally.cs:205:25:205:47 | [finally: exception(Exception)] throw ...; |
-| Finally.cs:205:25:205:47 | [finally: exception(Exception)] throw ...; | Finally.cs:209:31:209:46 | [finally: exception(Exception), finally(1): exception(ExceptionB)] object creation of type ExceptionC |
-| Finally.cs:205:25:205:47 | [finally: exception(ExceptionA)] throw ...; | Finally.cs:205:25:205:47 | [finally: exception(ExceptionA)] throw ...; |
-| Finally.cs:205:25:205:47 | [finally: exception(ExceptionA)] throw ...; | Finally.cs:209:31:209:46 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] object creation of type ExceptionC |
+| Finally.cs:202:9:212:9 | {...} | Finally.cs:213:9:213:25 | ...; |
 | Finally.cs:205:25:205:47 | throw ...; | Finally.cs:205:25:205:47 | throw ...; |
-| Finally.cs:205:25:205:47 | throw ...; | Finally.cs:209:31:209:46 | [finally(1): exception(ExceptionB)] object creation of type ExceptionC |
-| Finally.cs:205:31:205:46 | [finally: exception(Exception)] object creation of type ExceptionB | Finally.cs:205:25:205:47 | [finally: exception(Exception)] throw ...; |
-| Finally.cs:205:31:205:46 | [finally: exception(Exception)] object creation of type ExceptionB | Finally.cs:205:31:205:46 | [finally: exception(Exception)] object creation of type ExceptionB |
-| Finally.cs:205:31:205:46 | [finally: exception(Exception)] object creation of type ExceptionB | Finally.cs:208:13:210:13 | [finally: exception(Exception), finally(1): exception(Exception)] {...} |
-| Finally.cs:205:31:205:46 | [finally: exception(Exception)] object creation of type ExceptionB | Finally.cs:209:31:209:46 | [finally: exception(Exception), finally(1): exception(Exception)] object creation of type ExceptionC |
-| Finally.cs:205:31:205:46 | [finally: exception(Exception)] object creation of type ExceptionB | Finally.cs:209:31:209:46 | [finally: exception(Exception), finally(1): exception(ExceptionB)] object creation of type ExceptionC |
-| Finally.cs:205:31:205:46 | [finally: exception(ExceptionA)] object creation of type ExceptionB | Finally.cs:205:25:205:47 | [finally: exception(ExceptionA)] throw ...; |
-| Finally.cs:205:31:205:46 | [finally: exception(ExceptionA)] object creation of type ExceptionB | Finally.cs:205:31:205:46 | [finally: exception(ExceptionA)] object creation of type ExceptionB |
-| Finally.cs:205:31:205:46 | [finally: exception(ExceptionA)] object creation of type ExceptionB | Finally.cs:208:13:210:13 | [finally: exception(ExceptionA), finally(1): exception(Exception)] {...} |
-| Finally.cs:205:31:205:46 | [finally: exception(ExceptionA)] object creation of type ExceptionB | Finally.cs:209:31:209:46 | [finally: exception(ExceptionA), finally(1): exception(Exception)] object creation of type ExceptionC |
-| Finally.cs:205:31:205:46 | [finally: exception(ExceptionA)] object creation of type ExceptionB | Finally.cs:209:31:209:46 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] object creation of type ExceptionC |
 | Finally.cs:205:31:205:46 | object creation of type ExceptionB | Finally.cs:205:25:205:47 | throw ...; |
 | Finally.cs:205:31:205:46 | object creation of type ExceptionB | Finally.cs:205:31:205:46 | object creation of type ExceptionB |
-| Finally.cs:205:31:205:46 | object creation of type ExceptionB | Finally.cs:208:13:210:13 | [finally(1): exception(Exception)] {...} |
-| Finally.cs:205:31:205:46 | object creation of type ExceptionB | Finally.cs:209:31:209:46 | [finally(1): exception(Exception)] object creation of type ExceptionC |
-| Finally.cs:205:31:205:46 | object creation of type ExceptionB | Finally.cs:209:31:209:46 | [finally(1): exception(ExceptionB)] object creation of type ExceptionC |
-| Finally.cs:208:13:210:13 | [finally(1): exception(Exception)] {...} | Finally.cs:208:13:210:13 | [finally(1): exception(Exception)] {...} |
-| Finally.cs:208:13:210:13 | [finally(1): exception(Exception)] {...} | Finally.cs:209:31:209:46 | [finally(1): exception(Exception)] object creation of type ExceptionC |
-| Finally.cs:208:13:210:13 | [finally: exception(Exception), finally(1): exception(Exception)] {...} | Finally.cs:208:13:210:13 | [finally: exception(Exception), finally(1): exception(Exception)] {...} |
-| Finally.cs:208:13:210:13 | [finally: exception(Exception), finally(1): exception(Exception)] {...} | Finally.cs:209:31:209:46 | [finally: exception(Exception), finally(1): exception(Exception)] object creation of type ExceptionC |
-| Finally.cs:208:13:210:13 | [finally: exception(Exception)] {...} | Finally.cs:208:13:210:13 | [finally: exception(Exception)] {...} |
-| Finally.cs:208:13:210:13 | [finally: exception(Exception)] {...} | Finally.cs:209:31:209:46 | [finally: exception(Exception)] object creation of type ExceptionC |
-| Finally.cs:208:13:210:13 | [finally: exception(Exception)] {...} | Finally.cs:211:13:211:29 | [finally: exception(Exception)] ...; |
-| Finally.cs:208:13:210:13 | [finally: exception(ExceptionA), finally(1): exception(Exception)] {...} | Finally.cs:208:13:210:13 | [finally: exception(ExceptionA), finally(1): exception(Exception)] {...} |
-| Finally.cs:208:13:210:13 | [finally: exception(ExceptionA), finally(1): exception(Exception)] {...} | Finally.cs:209:31:209:46 | [finally: exception(ExceptionA), finally(1): exception(Exception)] object creation of type ExceptionC |
-| Finally.cs:208:13:210:13 | [finally: exception(ExceptionA)] {...} | Finally.cs:208:13:210:13 | [finally: exception(ExceptionA)] {...} |
-| Finally.cs:208:13:210:13 | [finally: exception(ExceptionA)] {...} | Finally.cs:209:31:209:46 | [finally: exception(ExceptionA)] object creation of type ExceptionC |
-| Finally.cs:208:13:210:13 | [finally: exception(ExceptionA)] {...} | Finally.cs:211:13:211:29 | [finally: exception(ExceptionA)] ...; |
+| Finally.cs:208:13:210:13 | {...} | Finally.cs:195:10:195:12 | exit M10 |
+| Finally.cs:208:13:210:13 | {...} | Finally.cs:195:10:195:12 | exit M10 (abnormal) |
 | Finally.cs:208:13:210:13 | {...} | Finally.cs:208:13:210:13 | {...} |
 | Finally.cs:208:13:210:13 | {...} | Finally.cs:209:31:209:46 | object creation of type ExceptionC |
 | Finally.cs:208:13:210:13 | {...} | Finally.cs:211:13:211:29 | ...; |
-| Finally.cs:209:31:209:46 | [finally(1): exception(Exception)] object creation of type ExceptionC | Finally.cs:209:31:209:46 | [finally(1): exception(Exception)] object creation of type ExceptionC |
-| Finally.cs:209:31:209:46 | [finally(1): exception(ExceptionB)] object creation of type ExceptionC | Finally.cs:209:31:209:46 | [finally(1): exception(ExceptionB)] object creation of type ExceptionC |
-| Finally.cs:209:31:209:46 | [finally: exception(Exception), finally(1): exception(Exception)] object creation of type ExceptionC | Finally.cs:209:31:209:46 | [finally: exception(Exception), finally(1): exception(Exception)] object creation of type ExceptionC |
-| Finally.cs:209:31:209:46 | [finally: exception(Exception), finally(1): exception(ExceptionB)] object creation of type ExceptionC | Finally.cs:209:31:209:46 | [finally: exception(Exception), finally(1): exception(ExceptionB)] object creation of type ExceptionC |
-| Finally.cs:209:31:209:46 | [finally: exception(Exception)] object creation of type ExceptionC | Finally.cs:209:31:209:46 | [finally: exception(Exception)] object creation of type ExceptionC |
-| Finally.cs:209:31:209:46 | [finally: exception(ExceptionA), finally(1): exception(Exception)] object creation of type ExceptionC | Finally.cs:209:31:209:46 | [finally: exception(ExceptionA), finally(1): exception(Exception)] object creation of type ExceptionC |
-| Finally.cs:209:31:209:46 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] object creation of type ExceptionC | Finally.cs:209:31:209:46 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] object creation of type ExceptionC |
-| Finally.cs:209:31:209:46 | [finally: exception(ExceptionA)] object creation of type ExceptionC | Finally.cs:209:31:209:46 | [finally: exception(ExceptionA)] object creation of type ExceptionC |
+| Finally.cs:208:13:210:13 | {...} | Finally.cs:213:9:213:25 | ...; |
 | Finally.cs:209:31:209:46 | object creation of type ExceptionC | Finally.cs:209:31:209:46 | object creation of type ExceptionC |
 | Finally.cs:211:13:211:29 | ...; | Finally.cs:211:13:211:29 | ...; |
-| Finally.cs:211:13:211:29 | [finally: exception(Exception)] ...; | Finally.cs:211:13:211:29 | [finally: exception(Exception)] ...; |
-| Finally.cs:211:13:211:29 | [finally: exception(ExceptionA)] ...; | Finally.cs:211:13:211:29 | [finally: exception(ExceptionA)] ...; |
+| Finally.cs:211:13:211:29 | ...; | Finally.cs:213:9:213:25 | ...; |
+| Finally.cs:213:9:213:25 | ...; | Finally.cs:213:9:213:25 | ...; |
 | Finally.cs:216:10:216:12 | enter M11 | Finally.cs:216:10:216:12 | enter M11 |
 | Finally.cs:216:10:216:12 | enter M11 | Finally.cs:222:9:225:9 | catch {...} |
 | Finally.cs:216:10:216:12 | enter M11 | Finally.cs:227:9:229:9 | {...} |
@@ -11391,81 +9352,49 @@ blockDominance
 | Finally.cs:233:10:233:12 | enter M12 | Finally.cs:233:10:233:12 | exit M12 (abnormal) |
 | Finally.cs:233:10:233:12 | enter M12 | Finally.cs:240:21:240:43 | throw ...; |
 | Finally.cs:233:10:233:12 | enter M12 | Finally.cs:240:27:240:42 | object creation of type ExceptionA |
-| Finally.cs:233:10:233:12 | enter M12 | Finally.cs:243:13:253:13 | [finally: exception(Exception)] {...} |
 | Finally.cs:233:10:233:12 | enter M12 | Finally.cs:243:13:253:13 | {...} |
-| Finally.cs:233:10:233:12 | enter M12 | Finally.cs:247:25:247:47 | [finally: exception(Exception)] throw ...; |
-| Finally.cs:233:10:233:12 | enter M12 | Finally.cs:247:25:247:47 | [finally: exception(ExceptionA)] throw ...; |
 | Finally.cs:233:10:233:12 | enter M12 | Finally.cs:247:25:247:47 | throw ...; |
-| Finally.cs:233:10:233:12 | enter M12 | Finally.cs:247:31:247:46 | [finally: exception(Exception)] object creation of type ExceptionA |
-| Finally.cs:233:10:233:12 | enter M12 | Finally.cs:247:31:247:46 | [finally: exception(ExceptionA)] object creation of type ExceptionA |
 | Finally.cs:233:10:233:12 | enter M12 | Finally.cs:247:31:247:46 | object creation of type ExceptionA |
-| Finally.cs:233:10:233:12 | enter M12 | Finally.cs:250:17:252:17 | [finally(1): exception(Exception)] {...} |
-| Finally.cs:233:10:233:12 | enter M12 | Finally.cs:250:17:252:17 | [finally: exception(Exception), finally(1): exception(Exception)] {...} |
-| Finally.cs:233:10:233:12 | enter M12 | Finally.cs:250:17:252:17 | [finally: exception(Exception)] {...} |
-| Finally.cs:233:10:233:12 | enter M12 | Finally.cs:250:17:252:17 | [finally: exception(ExceptionA), finally(1): exception(Exception)] {...} |
-| Finally.cs:233:10:233:12 | enter M12 | Finally.cs:250:17:252:17 | [finally: exception(ExceptionA)] {...} |
 | Finally.cs:233:10:233:12 | enter M12 | Finally.cs:250:17:252:17 | {...} |
-| Finally.cs:233:10:233:12 | enter M12 | Finally.cs:257:9:259:9 | [finally: exception(Exception)] {...} |
-| Finally.cs:233:10:233:12 | enter M12 | Finally.cs:257:9:259:9 | [finally: exception(ExceptionA)] {...} |
+| Finally.cs:233:10:233:12 | enter M12 | Finally.cs:254:13:254:45 | ...; |
 | Finally.cs:233:10:233:12 | enter M12 | Finally.cs:257:9:259:9 | {...} |
+| Finally.cs:233:10:233:12 | enter M12 | Finally.cs:260:9:260:34 | ...; |
 | Finally.cs:233:10:233:12 | exit M12 | Finally.cs:233:10:233:12 | exit M12 |
 | Finally.cs:233:10:233:12 | exit M12 (abnormal) | Finally.cs:233:10:233:12 | exit M12 (abnormal) |
 | Finally.cs:240:21:240:43 | throw ...; | Finally.cs:240:21:240:43 | throw ...; |
-| Finally.cs:240:21:240:43 | throw ...; | Finally.cs:247:25:247:47 | [finally: exception(ExceptionA)] throw ...; |
-| Finally.cs:240:21:240:43 | throw ...; | Finally.cs:247:31:247:46 | [finally: exception(ExceptionA)] object creation of type ExceptionA |
-| Finally.cs:240:21:240:43 | throw ...; | Finally.cs:250:17:252:17 | [finally: exception(ExceptionA), finally(1): exception(Exception)] {...} |
-| Finally.cs:240:21:240:43 | throw ...; | Finally.cs:250:17:252:17 | [finally: exception(ExceptionA)] {...} |
 | Finally.cs:240:27:240:42 | object creation of type ExceptionA | Finally.cs:240:21:240:43 | throw ...; |
 | Finally.cs:240:27:240:42 | object creation of type ExceptionA | Finally.cs:240:27:240:42 | object creation of type ExceptionA |
-| Finally.cs:240:27:240:42 | object creation of type ExceptionA | Finally.cs:243:13:253:13 | [finally: exception(Exception)] {...} |
-| Finally.cs:240:27:240:42 | object creation of type ExceptionA | Finally.cs:247:25:247:47 | [finally: exception(Exception)] throw ...; |
-| Finally.cs:240:27:240:42 | object creation of type ExceptionA | Finally.cs:247:25:247:47 | [finally: exception(ExceptionA)] throw ...; |
-| Finally.cs:240:27:240:42 | object creation of type ExceptionA | Finally.cs:247:31:247:46 | [finally: exception(Exception)] object creation of type ExceptionA |
-| Finally.cs:240:27:240:42 | object creation of type ExceptionA | Finally.cs:247:31:247:46 | [finally: exception(ExceptionA)] object creation of type ExceptionA |
-| Finally.cs:240:27:240:42 | object creation of type ExceptionA | Finally.cs:250:17:252:17 | [finally: exception(Exception), finally(1): exception(Exception)] {...} |
-| Finally.cs:240:27:240:42 | object creation of type ExceptionA | Finally.cs:250:17:252:17 | [finally: exception(Exception)] {...} |
-| Finally.cs:240:27:240:42 | object creation of type ExceptionA | Finally.cs:250:17:252:17 | [finally: exception(ExceptionA), finally(1): exception(Exception)] {...} |
-| Finally.cs:240:27:240:42 | object creation of type ExceptionA | Finally.cs:250:17:252:17 | [finally: exception(ExceptionA)] {...} |
-| Finally.cs:243:13:253:13 | [finally: exception(Exception)] {...} | Finally.cs:243:13:253:13 | [finally: exception(Exception)] {...} |
-| Finally.cs:243:13:253:13 | [finally: exception(Exception)] {...} | Finally.cs:247:25:247:47 | [finally: exception(Exception)] throw ...; |
-| Finally.cs:243:13:253:13 | [finally: exception(Exception)] {...} | Finally.cs:247:31:247:46 | [finally: exception(Exception)] object creation of type ExceptionA |
-| Finally.cs:243:13:253:13 | [finally: exception(Exception)] {...} | Finally.cs:250:17:252:17 | [finally: exception(Exception), finally(1): exception(Exception)] {...} |
-| Finally.cs:243:13:253:13 | [finally: exception(Exception)] {...} | Finally.cs:250:17:252:17 | [finally: exception(Exception)] {...} |
+| Finally.cs:243:13:253:13 | {...} | Finally.cs:233:10:233:12 | exit M12 |
+| Finally.cs:243:13:253:13 | {...} | Finally.cs:233:10:233:12 | exit M12 (abnormal) |
 | Finally.cs:243:13:253:13 | {...} | Finally.cs:243:13:253:13 | {...} |
 | Finally.cs:243:13:253:13 | {...} | Finally.cs:247:25:247:47 | throw ...; |
 | Finally.cs:243:13:253:13 | {...} | Finally.cs:247:31:247:46 | object creation of type ExceptionA |
-| Finally.cs:243:13:253:13 | {...} | Finally.cs:250:17:252:17 | [finally(1): exception(Exception)] {...} |
 | Finally.cs:243:13:253:13 | {...} | Finally.cs:250:17:252:17 | {...} |
+| Finally.cs:243:13:253:13 | {...} | Finally.cs:254:13:254:45 | ...; |
 | Finally.cs:243:13:253:13 | {...} | Finally.cs:257:9:259:9 | {...} |
-| Finally.cs:247:25:247:47 | [finally: exception(Exception)] throw ...; | Finally.cs:247:25:247:47 | [finally: exception(Exception)] throw ...; |
-| Finally.cs:247:25:247:47 | [finally: exception(ExceptionA)] throw ...; | Finally.cs:247:25:247:47 | [finally: exception(ExceptionA)] throw ...; |
+| Finally.cs:243:13:253:13 | {...} | Finally.cs:260:9:260:34 | ...; |
 | Finally.cs:247:25:247:47 | throw ...; | Finally.cs:247:25:247:47 | throw ...; |
-| Finally.cs:247:31:247:46 | [finally: exception(Exception)] object creation of type ExceptionA | Finally.cs:247:25:247:47 | [finally: exception(Exception)] throw ...; |
-| Finally.cs:247:31:247:46 | [finally: exception(Exception)] object creation of type ExceptionA | Finally.cs:247:31:247:46 | [finally: exception(Exception)] object creation of type ExceptionA |
-| Finally.cs:247:31:247:46 | [finally: exception(Exception)] object creation of type ExceptionA | Finally.cs:250:17:252:17 | [finally: exception(Exception), finally(1): exception(Exception)] {...} |
-| Finally.cs:247:31:247:46 | [finally: exception(ExceptionA)] object creation of type ExceptionA | Finally.cs:247:25:247:47 | [finally: exception(ExceptionA)] throw ...; |
-| Finally.cs:247:31:247:46 | [finally: exception(ExceptionA)] object creation of type ExceptionA | Finally.cs:247:31:247:46 | [finally: exception(ExceptionA)] object creation of type ExceptionA |
-| Finally.cs:247:31:247:46 | [finally: exception(ExceptionA)] object creation of type ExceptionA | Finally.cs:250:17:252:17 | [finally: exception(ExceptionA), finally(1): exception(Exception)] {...} |
 | Finally.cs:247:31:247:46 | object creation of type ExceptionA | Finally.cs:247:25:247:47 | throw ...; |
 | Finally.cs:247:31:247:46 | object creation of type ExceptionA | Finally.cs:247:31:247:46 | object creation of type ExceptionA |
-| Finally.cs:247:31:247:46 | object creation of type ExceptionA | Finally.cs:250:17:252:17 | [finally(1): exception(Exception)] {...} |
-| Finally.cs:250:17:252:17 | [finally(1): exception(Exception)] {...} | Finally.cs:250:17:252:17 | [finally(1): exception(Exception)] {...} |
-| Finally.cs:250:17:252:17 | [finally: exception(Exception), finally(1): exception(Exception)] {...} | Finally.cs:250:17:252:17 | [finally: exception(Exception), finally(1): exception(Exception)] {...} |
-| Finally.cs:250:17:252:17 | [finally: exception(Exception)] {...} | Finally.cs:250:17:252:17 | [finally: exception(Exception)] {...} |
-| Finally.cs:250:17:252:17 | [finally: exception(ExceptionA), finally(1): exception(Exception)] {...} | Finally.cs:250:17:252:17 | [finally: exception(ExceptionA), finally(1): exception(Exception)] {...} |
-| Finally.cs:250:17:252:17 | [finally: exception(ExceptionA)] {...} | Finally.cs:250:17:252:17 | [finally: exception(ExceptionA)] {...} |
+| Finally.cs:250:17:252:17 | {...} | Finally.cs:233:10:233:12 | exit M12 |
+| Finally.cs:250:17:252:17 | {...} | Finally.cs:233:10:233:12 | exit M12 (abnormal) |
 | Finally.cs:250:17:252:17 | {...} | Finally.cs:250:17:252:17 | {...} |
+| Finally.cs:250:17:252:17 | {...} | Finally.cs:254:13:254:45 | ...; |
 | Finally.cs:250:17:252:17 | {...} | Finally.cs:257:9:259:9 | {...} |
-| Finally.cs:257:9:259:9 | [finally: exception(Exception)] {...} | Finally.cs:257:9:259:9 | [finally: exception(Exception)] {...} |
-| Finally.cs:257:9:259:9 | [finally: exception(ExceptionA)] {...} | Finally.cs:257:9:259:9 | [finally: exception(ExceptionA)] {...} |
+| Finally.cs:250:17:252:17 | {...} | Finally.cs:260:9:260:34 | ...; |
+| Finally.cs:254:13:254:45 | ...; | Finally.cs:254:13:254:45 | ...; |
+| Finally.cs:257:9:259:9 | {...} | Finally.cs:233:10:233:12 | exit M12 |
+| Finally.cs:257:9:259:9 | {...} | Finally.cs:233:10:233:12 | exit M12 (abnormal) |
 | Finally.cs:257:9:259:9 | {...} | Finally.cs:257:9:259:9 | {...} |
+| Finally.cs:257:9:259:9 | {...} | Finally.cs:260:9:260:34 | ...; |
+| Finally.cs:260:9:260:34 | ...; | Finally.cs:260:9:260:34 | ...; |
 | Finally.cs:263:10:263:12 | enter M13 | Finally.cs:263:10:263:12 | enter M13 |
 | Finally.cs:263:10:263:12 | enter M13 | Finally.cs:263:10:263:12 | exit M13 |
-| Finally.cs:263:10:263:12 | enter M13 | Finally.cs:270:9:273:9 | [finally: exception(Exception)] {...} |
-| Finally.cs:263:10:263:12 | enter M13 | Finally.cs:270:9:273:9 | {...} |
+| Finally.cs:263:10:263:12 | enter M13 | Finally.cs:263:10:263:12 | exit M13 (abnormal) |
+| Finally.cs:263:10:263:12 | enter M13 | Finally.cs:263:10:263:12 | exit M13 (normal) |
 | Finally.cs:263:10:263:12 | exit M13 | Finally.cs:263:10:263:12 | exit M13 |
-| Finally.cs:270:9:273:9 | [finally: exception(Exception)] {...} | Finally.cs:270:9:273:9 | [finally: exception(Exception)] {...} |
-| Finally.cs:270:9:273:9 | {...} | Finally.cs:270:9:273:9 | {...} |
+| Finally.cs:263:10:263:12 | exit M13 (abnormal) | Finally.cs:263:10:263:12 | exit M13 (abnormal) |
+| Finally.cs:263:10:263:12 | exit M13 (normal) | Finally.cs:263:10:263:12 | exit M13 (normal) |
 | Foreach.cs:4:7:4:13 | enter Foreach | Foreach.cs:4:7:4:13 | enter Foreach |
 | Foreach.cs:6:10:6:11 | enter M1 | Foreach.cs:6:10:6:11 | enter M1 |
 | Foreach.cs:6:10:6:11 | enter M1 | Foreach.cs:6:10:6:11 | exit M1 (normal) |
@@ -11546,110 +9475,149 @@ blockDominance
 | LoopUnrolling.cs:7:10:7:11 | enter M1 | LoopUnrolling.cs:7:10:7:11 | enter M1 |
 | LoopUnrolling.cs:7:10:7:11 | enter M1 | LoopUnrolling.cs:7:10:7:11 | exit M1 (normal) |
 | LoopUnrolling.cs:7:10:7:11 | enter M1 | LoopUnrolling.cs:10:13:10:19 | return ...; |
+| LoopUnrolling.cs:7:10:7:11 | enter M1 | LoopUnrolling.cs:11:9:12:35 | foreach (... ... in ...) ... |
 | LoopUnrolling.cs:7:10:7:11 | enter M1 | LoopUnrolling.cs:11:22:11:24 | String arg |
 | LoopUnrolling.cs:7:10:7:11 | enter M1 | LoopUnrolling.cs:11:29:11:32 | access to parameter args |
 | LoopUnrolling.cs:7:10:7:11 | exit M1 (normal) | LoopUnrolling.cs:7:10:7:11 | exit M1 (normal) |
 | LoopUnrolling.cs:10:13:10:19 | return ...; | LoopUnrolling.cs:10:13:10:19 | return ...; |
+| LoopUnrolling.cs:11:9:12:35 | foreach (... ... in ...) ... | LoopUnrolling.cs:11:9:12:35 | foreach (... ... in ...) ... |
+| LoopUnrolling.cs:11:9:12:35 | foreach (... ... in ...) ... | LoopUnrolling.cs:11:22:11:24 | String arg |
 | LoopUnrolling.cs:11:22:11:24 | String arg | LoopUnrolling.cs:11:22:11:24 | String arg |
+| LoopUnrolling.cs:11:29:11:32 | access to parameter args | LoopUnrolling.cs:11:9:12:35 | foreach (... ... in ...) ... |
 | LoopUnrolling.cs:11:29:11:32 | access to parameter args | LoopUnrolling.cs:11:22:11:24 | String arg |
 | LoopUnrolling.cs:11:29:11:32 | access to parameter args | LoopUnrolling.cs:11:29:11:32 | access to parameter args |
 | LoopUnrolling.cs:15:10:15:11 | enter M2 | LoopUnrolling.cs:15:10:15:11 | enter M2 |
 | LoopUnrolling.cs:15:10:15:11 | enter M2 | LoopUnrolling.cs:15:10:15:11 | exit M2 (normal) |
+| LoopUnrolling.cs:15:10:15:11 | enter M2 | LoopUnrolling.cs:18:9:19:33 | foreach (... ... in ...) ... |
 | LoopUnrolling.cs:15:10:15:11 | enter M2 | LoopUnrolling.cs:18:22:18:22 | String x |
 | LoopUnrolling.cs:15:10:15:11 | exit M2 (normal) | LoopUnrolling.cs:15:10:15:11 | exit M2 (normal) |
-| LoopUnrolling.cs:18:22:18:22 | String x | LoopUnrolling.cs:15:10:15:11 | exit M2 (normal) |
+| LoopUnrolling.cs:18:9:19:33 | foreach (... ... in ...) ... | LoopUnrolling.cs:15:10:15:11 | exit M2 (normal) |
+| LoopUnrolling.cs:18:9:19:33 | foreach (... ... in ...) ... | LoopUnrolling.cs:18:9:19:33 | foreach (... ... in ...) ... |
+| LoopUnrolling.cs:18:9:19:33 | foreach (... ... in ...) ... | LoopUnrolling.cs:18:22:18:22 | String x |
 | LoopUnrolling.cs:18:22:18:22 | String x | LoopUnrolling.cs:18:22:18:22 | String x |
 | LoopUnrolling.cs:22:10:22:11 | enter M3 | LoopUnrolling.cs:22:10:22:11 | enter M3 |
 | LoopUnrolling.cs:22:10:22:11 | enter M3 | LoopUnrolling.cs:22:10:22:11 | exit M3 (normal) |
 | LoopUnrolling.cs:22:10:22:11 | enter M3 | LoopUnrolling.cs:24:9:26:40 | foreach (... ... in ...) ... |
 | LoopUnrolling.cs:22:10:22:11 | enter M3 | LoopUnrolling.cs:24:22:24:24 | Char arg |
+| LoopUnrolling.cs:22:10:22:11 | enter M3 | LoopUnrolling.cs:25:13:26:40 | foreach (... ... in ...) ... |
 | LoopUnrolling.cs:22:10:22:11 | enter M3 | LoopUnrolling.cs:25:26:25:29 | Char arg0 |
 | LoopUnrolling.cs:22:10:22:11 | exit M3 (normal) | LoopUnrolling.cs:22:10:22:11 | exit M3 (normal) |
 | LoopUnrolling.cs:24:9:26:40 | foreach (... ... in ...) ... | LoopUnrolling.cs:22:10:22:11 | exit M3 (normal) |
 | LoopUnrolling.cs:24:9:26:40 | foreach (... ... in ...) ... | LoopUnrolling.cs:24:9:26:40 | foreach (... ... in ...) ... |
 | LoopUnrolling.cs:24:9:26:40 | foreach (... ... in ...) ... | LoopUnrolling.cs:24:22:24:24 | Char arg |
+| LoopUnrolling.cs:24:9:26:40 | foreach (... ... in ...) ... | LoopUnrolling.cs:25:13:26:40 | foreach (... ... in ...) ... |
 | LoopUnrolling.cs:24:9:26:40 | foreach (... ... in ...) ... | LoopUnrolling.cs:25:26:25:29 | Char arg0 |
 | LoopUnrolling.cs:24:22:24:24 | Char arg | LoopUnrolling.cs:24:22:24:24 | Char arg |
+| LoopUnrolling.cs:24:22:24:24 | Char arg | LoopUnrolling.cs:25:13:26:40 | foreach (... ... in ...) ... |
 | LoopUnrolling.cs:24:22:24:24 | Char arg | LoopUnrolling.cs:25:26:25:29 | Char arg0 |
+| LoopUnrolling.cs:25:13:26:40 | foreach (... ... in ...) ... | LoopUnrolling.cs:25:13:26:40 | foreach (... ... in ...) ... |
+| LoopUnrolling.cs:25:13:26:40 | foreach (... ... in ...) ... | LoopUnrolling.cs:25:26:25:29 | Char arg0 |
 | LoopUnrolling.cs:25:26:25:29 | Char arg0 | LoopUnrolling.cs:25:26:25:29 | Char arg0 |
 | LoopUnrolling.cs:29:10:29:11 | enter M4 | LoopUnrolling.cs:29:10:29:11 | enter M4 |
 | LoopUnrolling.cs:29:10:29:11 | enter M4 | LoopUnrolling.cs:29:10:29:11 | exit M4 (normal) |
+| LoopUnrolling.cs:29:10:29:11 | enter M4 | LoopUnrolling.cs:32:9:33:33 | foreach (... ... in ...) ... |
+| LoopUnrolling.cs:29:10:29:11 | enter M4 | LoopUnrolling.cs:32:22:32:22 | String x |
 | LoopUnrolling.cs:29:10:29:11 | exit M4 (normal) | LoopUnrolling.cs:29:10:29:11 | exit M4 (normal) |
+| LoopUnrolling.cs:32:9:33:33 | foreach (... ... in ...) ... | LoopUnrolling.cs:29:10:29:11 | exit M4 (normal) |
+| LoopUnrolling.cs:32:9:33:33 | foreach (... ... in ...) ... | LoopUnrolling.cs:32:9:33:33 | foreach (... ... in ...) ... |
+| LoopUnrolling.cs:32:9:33:33 | foreach (... ... in ...) ... | LoopUnrolling.cs:32:22:32:22 | String x |
+| LoopUnrolling.cs:32:22:32:22 | String x | LoopUnrolling.cs:32:22:32:22 | String x |
 | LoopUnrolling.cs:36:10:36:11 | enter M5 | LoopUnrolling.cs:36:10:36:11 | enter M5 |
 | LoopUnrolling.cs:36:10:36:11 | enter M5 | LoopUnrolling.cs:36:10:36:11 | exit M5 (normal) |
 | LoopUnrolling.cs:36:10:36:11 | enter M5 | LoopUnrolling.cs:40:9:42:41 | foreach (... ... in ...) ... |
 | LoopUnrolling.cs:36:10:36:11 | enter M5 | LoopUnrolling.cs:40:22:40:22 | String x |
+| LoopUnrolling.cs:36:10:36:11 | enter M5 | LoopUnrolling.cs:41:13:42:41 | foreach (... ... in ...) ... |
 | LoopUnrolling.cs:36:10:36:11 | enter M5 | LoopUnrolling.cs:41:26:41:26 | String y |
 | LoopUnrolling.cs:36:10:36:11 | exit M5 (normal) | LoopUnrolling.cs:36:10:36:11 | exit M5 (normal) |
 | LoopUnrolling.cs:40:9:42:41 | foreach (... ... in ...) ... | LoopUnrolling.cs:36:10:36:11 | exit M5 (normal) |
 | LoopUnrolling.cs:40:9:42:41 | foreach (... ... in ...) ... | LoopUnrolling.cs:40:9:42:41 | foreach (... ... in ...) ... |
-| LoopUnrolling.cs:40:22:40:22 | String x | LoopUnrolling.cs:36:10:36:11 | exit M5 (normal) |
-| LoopUnrolling.cs:40:22:40:22 | String x | LoopUnrolling.cs:40:9:42:41 | foreach (... ... in ...) ... |
+| LoopUnrolling.cs:40:9:42:41 | foreach (... ... in ...) ... | LoopUnrolling.cs:40:22:40:22 | String x |
+| LoopUnrolling.cs:40:9:42:41 | foreach (... ... in ...) ... | LoopUnrolling.cs:41:13:42:41 | foreach (... ... in ...) ... |
+| LoopUnrolling.cs:40:9:42:41 | foreach (... ... in ...) ... | LoopUnrolling.cs:41:26:41:26 | String y |
 | LoopUnrolling.cs:40:22:40:22 | String x | LoopUnrolling.cs:40:22:40:22 | String x |
+| LoopUnrolling.cs:40:22:40:22 | String x | LoopUnrolling.cs:41:13:42:41 | foreach (... ... in ...) ... |
 | LoopUnrolling.cs:40:22:40:22 | String x | LoopUnrolling.cs:41:26:41:26 | String y |
-| LoopUnrolling.cs:41:26:41:26 | String y | LoopUnrolling.cs:36:10:36:11 | exit M5 (normal) |
-| LoopUnrolling.cs:41:26:41:26 | String y | LoopUnrolling.cs:40:9:42:41 | foreach (... ... in ...) ... |
+| LoopUnrolling.cs:41:13:42:41 | foreach (... ... in ...) ... | LoopUnrolling.cs:41:13:42:41 | foreach (... ... in ...) ... |
+| LoopUnrolling.cs:41:13:42:41 | foreach (... ... in ...) ... | LoopUnrolling.cs:41:26:41:26 | String y |
 | LoopUnrolling.cs:41:26:41:26 | String y | LoopUnrolling.cs:41:26:41:26 | String y |
 | LoopUnrolling.cs:45:10:45:11 | enter M6 | LoopUnrolling.cs:45:10:45:11 | enter M6 |
+| LoopUnrolling.cs:45:10:45:11 | enter M6 | LoopUnrolling.cs:45:10:45:11 | exit M6 (normal) |
 | LoopUnrolling.cs:45:10:45:11 | enter M6 | LoopUnrolling.cs:48:22:48:22 | String x |
 | LoopUnrolling.cs:45:10:45:11 | enter M6 | LoopUnrolling.cs:50:9:50:13 | Label: |
+| LoopUnrolling.cs:45:10:45:11 | exit M6 (normal) | LoopUnrolling.cs:45:10:45:11 | exit M6 (normal) |
 | LoopUnrolling.cs:48:22:48:22 | String x | LoopUnrolling.cs:48:22:48:22 | String x |
 | LoopUnrolling.cs:48:22:48:22 | String x | LoopUnrolling.cs:50:9:50:13 | Label: |
 | LoopUnrolling.cs:50:9:50:13 | Label: | LoopUnrolling.cs:50:9:50:13 | Label: |
 | LoopUnrolling.cs:55:10:55:11 | enter M7 | LoopUnrolling.cs:55:10:55:11 | enter M7 |
 | LoopUnrolling.cs:55:10:55:11 | enter M7 | LoopUnrolling.cs:55:10:55:11 | exit M7 (normal) |
-| LoopUnrolling.cs:55:10:55:11 | enter M7 | LoopUnrolling.cs:58:9:64:9 | [b (line 55): false] foreach (... ... in ...) ... |
+| LoopUnrolling.cs:55:10:55:11 | enter M7 | LoopUnrolling.cs:58:9:64:9 | foreach (... ... in ...) ... |
 | LoopUnrolling.cs:55:10:55:11 | enter M7 | LoopUnrolling.cs:58:22:58:22 | String x |
-| LoopUnrolling.cs:55:10:55:11 | enter M7 | LoopUnrolling.cs:58:22:58:22 | [b (line 55): false] String x |
-| LoopUnrolling.cs:55:10:55:11 | enter M7 | LoopUnrolling.cs:58:22:58:22 | [b (line 55): true] String x |
-| LoopUnrolling.cs:55:10:55:11 | enter M7 | LoopUnrolling.cs:61:17:61:37 | [b (line 55): true] ...; |
-| LoopUnrolling.cs:55:10:55:11 | enter M7 | LoopUnrolling.cs:62:13:63:37 | [b (line 55): false] if (...) ... |
-| LoopUnrolling.cs:55:10:55:11 | enter M7 | LoopUnrolling.cs:63:17:63:37 | [b (line 55): true] ...; |
+| LoopUnrolling.cs:55:10:55:11 | enter M7 | LoopUnrolling.cs:61:17:61:37 | ...; |
+| LoopUnrolling.cs:55:10:55:11 | enter M7 | LoopUnrolling.cs:62:13:63:37 | if (...) ... |
+| LoopUnrolling.cs:55:10:55:11 | enter M7 | LoopUnrolling.cs:63:17:63:37 | ...; |
 | LoopUnrolling.cs:55:10:55:11 | exit M7 (normal) | LoopUnrolling.cs:55:10:55:11 | exit M7 (normal) |
-| LoopUnrolling.cs:58:9:64:9 | [b (line 55): false] foreach (... ... in ...) ... | LoopUnrolling.cs:58:9:64:9 | [b (line 55): false] foreach (... ... in ...) ... |
-| LoopUnrolling.cs:58:9:64:9 | [b (line 55): false] foreach (... ... in ...) ... | LoopUnrolling.cs:58:22:58:22 | [b (line 55): false] String x |
-| LoopUnrolling.cs:58:22:58:22 | String x | LoopUnrolling.cs:55:10:55:11 | exit M7 (normal) |
-| LoopUnrolling.cs:58:22:58:22 | String x | LoopUnrolling.cs:58:9:64:9 | [b (line 55): false] foreach (... ... in ...) ... |
+| LoopUnrolling.cs:58:9:64:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:55:10:55:11 | exit M7 (normal) |
+| LoopUnrolling.cs:58:9:64:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:58:9:64:9 | foreach (... ... in ...) ... |
+| LoopUnrolling.cs:58:9:64:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:58:22:58:22 | String x |
+| LoopUnrolling.cs:58:9:64:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:61:17:61:37 | ...; |
+| LoopUnrolling.cs:58:9:64:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:62:13:63:37 | if (...) ... |
+| LoopUnrolling.cs:58:9:64:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:63:17:63:37 | ...; |
 | LoopUnrolling.cs:58:22:58:22 | String x | LoopUnrolling.cs:58:22:58:22 | String x |
-| LoopUnrolling.cs:58:22:58:22 | String x | LoopUnrolling.cs:58:22:58:22 | [b (line 55): false] String x |
-| LoopUnrolling.cs:58:22:58:22 | String x | LoopUnrolling.cs:58:22:58:22 | [b (line 55): true] String x |
-| LoopUnrolling.cs:58:22:58:22 | String x | LoopUnrolling.cs:61:17:61:37 | [b (line 55): true] ...; |
-| LoopUnrolling.cs:58:22:58:22 | String x | LoopUnrolling.cs:62:13:63:37 | [b (line 55): false] if (...) ... |
-| LoopUnrolling.cs:58:22:58:22 | String x | LoopUnrolling.cs:63:17:63:37 | [b (line 55): true] ...; |
-| LoopUnrolling.cs:58:22:58:22 | [b (line 55): false] String x | LoopUnrolling.cs:58:22:58:22 | [b (line 55): false] String x |
-| LoopUnrolling.cs:58:22:58:22 | [b (line 55): true] String x | LoopUnrolling.cs:58:22:58:22 | [b (line 55): true] String x |
-| LoopUnrolling.cs:61:17:61:37 | [b (line 55): true] ...; | LoopUnrolling.cs:58:22:58:22 | [b (line 55): true] String x |
-| LoopUnrolling.cs:61:17:61:37 | [b (line 55): true] ...; | LoopUnrolling.cs:61:17:61:37 | [b (line 55): true] ...; |
-| LoopUnrolling.cs:61:17:61:37 | [b (line 55): true] ...; | LoopUnrolling.cs:63:17:63:37 | [b (line 55): true] ...; |
-| LoopUnrolling.cs:62:13:63:37 | [b (line 55): false] if (...) ... | LoopUnrolling.cs:58:9:64:9 | [b (line 55): false] foreach (... ... in ...) ... |
-| LoopUnrolling.cs:62:13:63:37 | [b (line 55): false] if (...) ... | LoopUnrolling.cs:58:22:58:22 | [b (line 55): false] String x |
-| LoopUnrolling.cs:62:13:63:37 | [b (line 55): false] if (...) ... | LoopUnrolling.cs:62:13:63:37 | [b (line 55): false] if (...) ... |
-| LoopUnrolling.cs:63:17:63:37 | [b (line 55): true] ...; | LoopUnrolling.cs:58:22:58:22 | [b (line 55): true] String x |
-| LoopUnrolling.cs:63:17:63:37 | [b (line 55): true] ...; | LoopUnrolling.cs:63:17:63:37 | [b (line 55): true] ...; |
+| LoopUnrolling.cs:58:22:58:22 | String x | LoopUnrolling.cs:61:17:61:37 | ...; |
+| LoopUnrolling.cs:58:22:58:22 | String x | LoopUnrolling.cs:62:13:63:37 | if (...) ... |
+| LoopUnrolling.cs:58:22:58:22 | String x | LoopUnrolling.cs:63:17:63:37 | ...; |
+| LoopUnrolling.cs:61:17:61:37 | ...; | LoopUnrolling.cs:61:17:61:37 | ...; |
+| LoopUnrolling.cs:62:13:63:37 | if (...) ... | LoopUnrolling.cs:62:13:63:37 | if (...) ... |
+| LoopUnrolling.cs:62:13:63:37 | if (...) ... | LoopUnrolling.cs:63:17:63:37 | ...; |
+| LoopUnrolling.cs:63:17:63:37 | ...; | LoopUnrolling.cs:63:17:63:37 | ...; |
 | LoopUnrolling.cs:67:10:67:11 | enter M8 | LoopUnrolling.cs:67:10:67:11 | enter M8 |
 | LoopUnrolling.cs:67:10:67:11 | enter M8 | LoopUnrolling.cs:67:10:67:11 | exit M8 (normal) |
 | LoopUnrolling.cs:67:10:67:11 | enter M8 | LoopUnrolling.cs:69:13:69:23 | [false] !... |
 | LoopUnrolling.cs:67:10:67:11 | enter M8 | LoopUnrolling.cs:69:13:69:23 | [true] !... |
 | LoopUnrolling.cs:67:10:67:11 | enter M8 | LoopUnrolling.cs:70:13:70:19 | return ...; |
 | LoopUnrolling.cs:67:10:67:11 | enter M8 | LoopUnrolling.cs:71:9:71:21 | ...; |
+| LoopUnrolling.cs:67:10:67:11 | enter M8 | LoopUnrolling.cs:72:9:73:35 | foreach (... ... in ...) ... |
+| LoopUnrolling.cs:67:10:67:11 | enter M8 | LoopUnrolling.cs:72:22:72:24 | String arg |
 | LoopUnrolling.cs:67:10:67:11 | exit M8 (normal) | LoopUnrolling.cs:67:10:67:11 | exit M8 (normal) |
 | LoopUnrolling.cs:69:13:69:23 | [false] !... | LoopUnrolling.cs:69:13:69:23 | [false] !... |
 | LoopUnrolling.cs:69:13:69:23 | [false] !... | LoopUnrolling.cs:71:9:71:21 | ...; |
+| LoopUnrolling.cs:69:13:69:23 | [false] !... | LoopUnrolling.cs:72:9:73:35 | foreach (... ... in ...) ... |
+| LoopUnrolling.cs:69:13:69:23 | [false] !... | LoopUnrolling.cs:72:22:72:24 | String arg |
 | LoopUnrolling.cs:69:13:69:23 | [true] !... | LoopUnrolling.cs:69:13:69:23 | [true] !... |
 | LoopUnrolling.cs:69:13:69:23 | [true] !... | LoopUnrolling.cs:70:13:70:19 | return ...; |
 | LoopUnrolling.cs:70:13:70:19 | return ...; | LoopUnrolling.cs:70:13:70:19 | return ...; |
 | LoopUnrolling.cs:71:9:71:21 | ...; | LoopUnrolling.cs:71:9:71:21 | ...; |
+| LoopUnrolling.cs:71:9:71:21 | ...; | LoopUnrolling.cs:72:9:73:35 | foreach (... ... in ...) ... |
+| LoopUnrolling.cs:71:9:71:21 | ...; | LoopUnrolling.cs:72:22:72:24 | String arg |
+| LoopUnrolling.cs:72:9:73:35 | foreach (... ... in ...) ... | LoopUnrolling.cs:72:9:73:35 | foreach (... ... in ...) ... |
+| LoopUnrolling.cs:72:9:73:35 | foreach (... ... in ...) ... | LoopUnrolling.cs:72:22:72:24 | String arg |
+| LoopUnrolling.cs:72:22:72:24 | String arg | LoopUnrolling.cs:72:22:72:24 | String arg |
 | LoopUnrolling.cs:76:10:76:11 | enter M9 | LoopUnrolling.cs:76:10:76:11 | enter M9 |
 | LoopUnrolling.cs:76:10:76:11 | enter M9 | LoopUnrolling.cs:76:10:76:11 | exit M9 (normal) |
+| LoopUnrolling.cs:76:10:76:11 | enter M9 | LoopUnrolling.cs:79:9:82:9 | foreach (... ... in ...) ... |
+| LoopUnrolling.cs:76:10:76:11 | enter M9 | LoopUnrolling.cs:79:22:79:22 | String x |
 | LoopUnrolling.cs:76:10:76:11 | exit M9 (normal) | LoopUnrolling.cs:76:10:76:11 | exit M9 (normal) |
+| LoopUnrolling.cs:79:9:82:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:76:10:76:11 | exit M9 (normal) |
+| LoopUnrolling.cs:79:9:82:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:79:9:82:9 | foreach (... ... in ...) ... |
+| LoopUnrolling.cs:79:9:82:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:79:22:79:22 | String x |
+| LoopUnrolling.cs:79:22:79:22 | String x | LoopUnrolling.cs:79:22:79:22 | String x |
 | LoopUnrolling.cs:85:10:85:12 | enter M10 | LoopUnrolling.cs:85:10:85:12 | enter M10 |
 | LoopUnrolling.cs:85:10:85:12 | enter M10 | LoopUnrolling.cs:85:10:85:12 | exit M10 (normal) |
+| LoopUnrolling.cs:85:10:85:12 | enter M10 | LoopUnrolling.cs:88:9:91:9 | foreach (... ... in ...) ... |
+| LoopUnrolling.cs:85:10:85:12 | enter M10 | LoopUnrolling.cs:88:22:88:22 | String x |
 | LoopUnrolling.cs:85:10:85:12 | exit M10 (normal) | LoopUnrolling.cs:85:10:85:12 | exit M10 (normal) |
+| LoopUnrolling.cs:88:9:91:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:85:10:85:12 | exit M10 (normal) |
+| LoopUnrolling.cs:88:9:91:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:88:9:91:9 | foreach (... ... in ...) ... |
+| LoopUnrolling.cs:88:9:91:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:88:22:88:22 | String x |
+| LoopUnrolling.cs:88:22:88:22 | String x | LoopUnrolling.cs:88:22:88:22 | String x |
 | LoopUnrolling.cs:94:10:94:12 | enter M11 | LoopUnrolling.cs:94:10:94:12 | enter M11 |
 | LoopUnrolling.cs:94:10:94:12 | enter M11 | LoopUnrolling.cs:94:10:94:12 | exit M11 (normal) |
+| LoopUnrolling.cs:94:10:94:12 | enter M11 | LoopUnrolling.cs:97:9:100:9 | foreach (... ... in ...) ... |
 | LoopUnrolling.cs:94:10:94:12 | enter M11 | LoopUnrolling.cs:97:22:97:22 | String x |
 | LoopUnrolling.cs:94:10:94:12 | exit M11 (normal) | LoopUnrolling.cs:94:10:94:12 | exit M11 (normal) |
-| LoopUnrolling.cs:97:22:97:22 | String x | LoopUnrolling.cs:94:10:94:12 | exit M11 (normal) |
+| LoopUnrolling.cs:97:9:100:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:94:10:94:12 | exit M11 (normal) |
+| LoopUnrolling.cs:97:9:100:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:97:9:100:9 | foreach (... ... in ...) ... |
+| LoopUnrolling.cs:97:9:100:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:97:22:97:22 | String x |
 | LoopUnrolling.cs:97:22:97:22 | String x | LoopUnrolling.cs:97:22:97:22 | String x |
 | MultiImplementationA.cs:4:7:4:8 | call to constructor Object | MultiImplementationA.cs:4:7:4:8 | call to constructor Object |
 | MultiImplementationA.cs:4:7:4:8 | enter C1 | MultiImplementationA.cs:4:7:4:8 | call to constructor Object |
@@ -13285,13 +11253,25 @@ blockDominance
 | cflow.cs:254:17:254:27 | goto ...; | cflow.cs:254:17:254:27 | goto ...; |
 | cflow.cs:255:13:255:20 | default: | cflow.cs:255:13:255:20 | default: |
 | cflow.cs:261:49:261:53 | enter Yield | cflow.cs:261:49:261:53 | enter Yield |
+| cflow.cs:261:49:261:53 | enter Yield | cflow.cs:261:49:261:53 | exit Yield |
+| cflow.cs:261:49:261:53 | enter Yield | cflow.cs:261:49:261:53 | exit Yield (abnormal) |
+| cflow.cs:261:49:261:53 | enter Yield | cflow.cs:261:49:261:53 | exit Yield (normal) |
 | cflow.cs:261:49:261:53 | enter Yield | cflow.cs:264:25:264:25 | access to local variable i |
 | cflow.cs:261:49:261:53 | enter Yield | cflow.cs:265:9:267:9 | {...} |
 | cflow.cs:261:49:261:53 | enter Yield | cflow.cs:268:9:276:9 | try {...} ... |
+| cflow.cs:261:49:261:53 | exit Yield | cflow.cs:261:49:261:53 | exit Yield |
+| cflow.cs:261:49:261:53 | exit Yield (abnormal) | cflow.cs:261:49:261:53 | exit Yield (abnormal) |
+| cflow.cs:261:49:261:53 | exit Yield (normal) | cflow.cs:261:49:261:53 | exit Yield (normal) |
+| cflow.cs:264:25:264:25 | access to local variable i | cflow.cs:261:49:261:53 | exit Yield |
+| cflow.cs:264:25:264:25 | access to local variable i | cflow.cs:261:49:261:53 | exit Yield (abnormal) |
+| cflow.cs:264:25:264:25 | access to local variable i | cflow.cs:261:49:261:53 | exit Yield (normal) |
 | cflow.cs:264:25:264:25 | access to local variable i | cflow.cs:264:25:264:25 | access to local variable i |
 | cflow.cs:264:25:264:25 | access to local variable i | cflow.cs:265:9:267:9 | {...} |
 | cflow.cs:264:25:264:25 | access to local variable i | cflow.cs:268:9:276:9 | try {...} ... |
 | cflow.cs:265:9:267:9 | {...} | cflow.cs:265:9:267:9 | {...} |
+| cflow.cs:268:9:276:9 | try {...} ... | cflow.cs:261:49:261:53 | exit Yield |
+| cflow.cs:268:9:276:9 | try {...} ... | cflow.cs:261:49:261:53 | exit Yield (abnormal) |
+| cflow.cs:268:9:276:9 | try {...} ... | cflow.cs:261:49:261:53 | exit Yield (normal) |
 | cflow.cs:268:9:276:9 | try {...} ... | cflow.cs:268:9:276:9 | try {...} ... |
 | cflow.cs:282:5:282:18 | enter ControlFlowSub | cflow.cs:282:5:282:18 | enter ControlFlowSub |
 | cflow.cs:284:5:284:18 | enter ControlFlowSub | cflow.cs:284:5:284:18 | enter ControlFlowSub |
@@ -13335,797 +11315,972 @@ postBlockDominance
 | Assert.cs:5:7:5:17 | enter AssertTests | Assert.cs:5:7:5:17 | enter AssertTests |
 | Assert.cs:7:10:7:11 | enter M1 | Assert.cs:7:10:7:11 | enter M1 |
 | Assert.cs:7:10:7:11 | exit M1 | Assert.cs:7:10:7:11 | exit M1 |
+| Assert.cs:7:10:7:11 | exit M1 (abnormal) | Assert.cs:7:10:7:11 | exit M1 (abnormal) |
 | Assert.cs:9:20:9:32 | ... ? ... : ... | Assert.cs:7:10:7:11 | enter M1 |
 | Assert.cs:9:20:9:32 | ... ? ... : ... | Assert.cs:9:20:9:32 | ... ? ... : ... |
 | Assert.cs:9:20:9:32 | ... ? ... : ... | Assert.cs:9:24:9:27 | null |
 | Assert.cs:9:20:9:32 | ... ? ... : ... | Assert.cs:9:31:9:32 | "" |
 | Assert.cs:9:24:9:27 | null | Assert.cs:9:24:9:27 | null |
 | Assert.cs:9:31:9:32 | "" | Assert.cs:9:31:9:32 | "" |
-| Assert.cs:10:9:10:31 | [assertion failure] call to method Assert | Assert.cs:10:9:10:31 | [assertion failure] call to method Assert |
-| Assert.cs:10:9:10:31 | [assertion success] call to method Assert | Assert.cs:7:10:7:11 | enter M1 |
-| Assert.cs:10:9:10:31 | [assertion success] call to method Assert | Assert.cs:9:20:9:32 | ... ? ... : ... |
-| Assert.cs:10:9:10:31 | [assertion success] call to method Assert | Assert.cs:9:24:9:27 | null |
-| Assert.cs:10:9:10:31 | [assertion success] call to method Assert | Assert.cs:9:31:9:32 | "" |
-| Assert.cs:10:9:10:31 | [assertion success] call to method Assert | Assert.cs:10:9:10:31 | [assertion success] call to method Assert |
+| Assert.cs:11:9:11:36 | ...; | Assert.cs:7:10:7:11 | enter M1 |
+| Assert.cs:11:9:11:36 | ...; | Assert.cs:9:20:9:32 | ... ? ... : ... |
+| Assert.cs:11:9:11:36 | ...; | Assert.cs:9:24:9:27 | null |
+| Assert.cs:11:9:11:36 | ...; | Assert.cs:9:31:9:32 | "" |
+| Assert.cs:11:9:11:36 | ...; | Assert.cs:11:9:11:36 | ...; |
 | Assert.cs:14:10:14:11 | enter M2 | Assert.cs:14:10:14:11 | enter M2 |
 | Assert.cs:14:10:14:11 | exit M2 | Assert.cs:14:10:14:11 | exit M2 |
+| Assert.cs:14:10:14:11 | exit M2 (abnormal) | Assert.cs:14:10:14:11 | exit M2 (abnormal) |
 | Assert.cs:16:20:16:32 | ... ? ... : ... | Assert.cs:14:10:14:11 | enter M2 |
 | Assert.cs:16:20:16:32 | ... ? ... : ... | Assert.cs:16:20:16:32 | ... ? ... : ... |
 | Assert.cs:16:20:16:32 | ... ? ... : ... | Assert.cs:16:24:16:27 | null |
 | Assert.cs:16:20:16:32 | ... ? ... : ... | Assert.cs:16:31:16:32 | "" |
 | Assert.cs:16:24:16:27 | null | Assert.cs:16:24:16:27 | null |
 | Assert.cs:16:31:16:32 | "" | Assert.cs:16:31:16:32 | "" |
-| Assert.cs:17:9:17:24 | [assertion failure] call to method IsNull | Assert.cs:17:9:17:24 | [assertion failure] call to method IsNull |
-| Assert.cs:17:9:17:24 | [assertion success] call to method IsNull | Assert.cs:14:10:14:11 | enter M2 |
-| Assert.cs:17:9:17:24 | [assertion success] call to method IsNull | Assert.cs:16:20:16:32 | ... ? ... : ... |
-| Assert.cs:17:9:17:24 | [assertion success] call to method IsNull | Assert.cs:16:24:16:27 | null |
-| Assert.cs:17:9:17:24 | [assertion success] call to method IsNull | Assert.cs:16:31:16:32 | "" |
-| Assert.cs:17:9:17:24 | [assertion success] call to method IsNull | Assert.cs:17:9:17:24 | [assertion success] call to method IsNull |
+| Assert.cs:18:9:18:36 | ...; | Assert.cs:14:10:14:11 | enter M2 |
+| Assert.cs:18:9:18:36 | ...; | Assert.cs:16:20:16:32 | ... ? ... : ... |
+| Assert.cs:18:9:18:36 | ...; | Assert.cs:16:24:16:27 | null |
+| Assert.cs:18:9:18:36 | ...; | Assert.cs:16:31:16:32 | "" |
+| Assert.cs:18:9:18:36 | ...; | Assert.cs:18:9:18:36 | ...; |
 | Assert.cs:21:10:21:11 | enter M3 | Assert.cs:21:10:21:11 | enter M3 |
 | Assert.cs:21:10:21:11 | exit M3 | Assert.cs:21:10:21:11 | exit M3 |
+| Assert.cs:21:10:21:11 | exit M3 (abnormal) | Assert.cs:21:10:21:11 | exit M3 (abnormal) |
 | Assert.cs:23:20:23:32 | ... ? ... : ... | Assert.cs:21:10:21:11 | enter M3 |
 | Assert.cs:23:20:23:32 | ... ? ... : ... | Assert.cs:23:20:23:32 | ... ? ... : ... |
 | Assert.cs:23:20:23:32 | ... ? ... : ... | Assert.cs:23:24:23:27 | null |
 | Assert.cs:23:20:23:32 | ... ? ... : ... | Assert.cs:23:31:23:32 | "" |
 | Assert.cs:23:24:23:27 | null | Assert.cs:23:24:23:27 | null |
 | Assert.cs:23:31:23:32 | "" | Assert.cs:23:31:23:32 | "" |
-| Assert.cs:24:9:24:27 | [assertion failure] call to method IsNotNull | Assert.cs:24:9:24:27 | [assertion failure] call to method IsNotNull |
-| Assert.cs:24:9:24:27 | [assertion success] call to method IsNotNull | Assert.cs:21:10:21:11 | enter M3 |
-| Assert.cs:24:9:24:27 | [assertion success] call to method IsNotNull | Assert.cs:23:20:23:32 | ... ? ... : ... |
-| Assert.cs:24:9:24:27 | [assertion success] call to method IsNotNull | Assert.cs:23:24:23:27 | null |
-| Assert.cs:24:9:24:27 | [assertion success] call to method IsNotNull | Assert.cs:23:31:23:32 | "" |
-| Assert.cs:24:9:24:27 | [assertion success] call to method IsNotNull | Assert.cs:24:9:24:27 | [assertion success] call to method IsNotNull |
+| Assert.cs:25:9:25:36 | ...; | Assert.cs:21:10:21:11 | enter M3 |
+| Assert.cs:25:9:25:36 | ...; | Assert.cs:23:20:23:32 | ... ? ... : ... |
+| Assert.cs:25:9:25:36 | ...; | Assert.cs:23:24:23:27 | null |
+| Assert.cs:25:9:25:36 | ...; | Assert.cs:23:31:23:32 | "" |
+| Assert.cs:25:9:25:36 | ...; | Assert.cs:25:9:25:36 | ...; |
 | Assert.cs:28:10:28:11 | enter M4 | Assert.cs:28:10:28:11 | enter M4 |
 | Assert.cs:28:10:28:11 | exit M4 | Assert.cs:28:10:28:11 | exit M4 |
+| Assert.cs:28:10:28:11 | exit M4 (abnormal) | Assert.cs:28:10:28:11 | exit M4 (abnormal) |
 | Assert.cs:30:20:30:32 | ... ? ... : ... | Assert.cs:28:10:28:11 | enter M4 |
 | Assert.cs:30:20:30:32 | ... ? ... : ... | Assert.cs:30:20:30:32 | ... ? ... : ... |
 | Assert.cs:30:20:30:32 | ... ? ... : ... | Assert.cs:30:24:30:27 | null |
 | Assert.cs:30:20:30:32 | ... ? ... : ... | Assert.cs:30:31:30:32 | "" |
 | Assert.cs:30:24:30:27 | null | Assert.cs:30:24:30:27 | null |
 | Assert.cs:30:31:30:32 | "" | Assert.cs:30:31:30:32 | "" |
-| Assert.cs:31:9:31:32 | [assertion failure] call to method IsTrue | Assert.cs:31:9:31:32 | [assertion failure] call to method IsTrue |
-| Assert.cs:31:9:31:32 | [assertion success] call to method IsTrue | Assert.cs:28:10:28:11 | enter M4 |
-| Assert.cs:31:9:31:32 | [assertion success] call to method IsTrue | Assert.cs:30:20:30:32 | ... ? ... : ... |
-| Assert.cs:31:9:31:32 | [assertion success] call to method IsTrue | Assert.cs:30:24:30:27 | null |
-| Assert.cs:31:9:31:32 | [assertion success] call to method IsTrue | Assert.cs:30:31:30:32 | "" |
-| Assert.cs:31:9:31:32 | [assertion success] call to method IsTrue | Assert.cs:31:9:31:32 | [assertion success] call to method IsTrue |
+| Assert.cs:32:9:32:36 | ...; | Assert.cs:28:10:28:11 | enter M4 |
+| Assert.cs:32:9:32:36 | ...; | Assert.cs:30:20:30:32 | ... ? ... : ... |
+| Assert.cs:32:9:32:36 | ...; | Assert.cs:30:24:30:27 | null |
+| Assert.cs:32:9:32:36 | ...; | Assert.cs:30:31:30:32 | "" |
+| Assert.cs:32:9:32:36 | ...; | Assert.cs:32:9:32:36 | ...; |
 | Assert.cs:35:10:35:11 | enter M5 | Assert.cs:35:10:35:11 | enter M5 |
 | Assert.cs:35:10:35:11 | exit M5 | Assert.cs:35:10:35:11 | exit M5 |
+| Assert.cs:35:10:35:11 | exit M5 (abnormal) | Assert.cs:35:10:35:11 | exit M5 (abnormal) |
 | Assert.cs:37:20:37:32 | ... ? ... : ... | Assert.cs:35:10:35:11 | enter M5 |
 | Assert.cs:37:20:37:32 | ... ? ... : ... | Assert.cs:37:20:37:32 | ... ? ... : ... |
 | Assert.cs:37:20:37:32 | ... ? ... : ... | Assert.cs:37:24:37:27 | null |
 | Assert.cs:37:20:37:32 | ... ? ... : ... | Assert.cs:37:31:37:32 | "" |
 | Assert.cs:37:24:37:27 | null | Assert.cs:37:24:37:27 | null |
 | Assert.cs:37:31:37:32 | "" | Assert.cs:37:31:37:32 | "" |
-| Assert.cs:38:9:38:32 | [assertion failure] call to method IsTrue | Assert.cs:38:9:38:32 | [assertion failure] call to method IsTrue |
-| Assert.cs:38:9:38:32 | [assertion success] call to method IsTrue | Assert.cs:35:10:35:11 | enter M5 |
-| Assert.cs:38:9:38:32 | [assertion success] call to method IsTrue | Assert.cs:37:20:37:32 | ... ? ... : ... |
-| Assert.cs:38:9:38:32 | [assertion success] call to method IsTrue | Assert.cs:37:24:37:27 | null |
-| Assert.cs:38:9:38:32 | [assertion success] call to method IsTrue | Assert.cs:37:31:37:32 | "" |
-| Assert.cs:38:9:38:32 | [assertion success] call to method IsTrue | Assert.cs:38:9:38:32 | [assertion success] call to method IsTrue |
+| Assert.cs:39:9:39:36 | ...; | Assert.cs:35:10:35:11 | enter M5 |
+| Assert.cs:39:9:39:36 | ...; | Assert.cs:37:20:37:32 | ... ? ... : ... |
+| Assert.cs:39:9:39:36 | ...; | Assert.cs:37:24:37:27 | null |
+| Assert.cs:39:9:39:36 | ...; | Assert.cs:37:31:37:32 | "" |
+| Assert.cs:39:9:39:36 | ...; | Assert.cs:39:9:39:36 | ...; |
 | Assert.cs:42:10:42:11 | enter M6 | Assert.cs:42:10:42:11 | enter M6 |
 | Assert.cs:42:10:42:11 | exit M6 | Assert.cs:42:10:42:11 | exit M6 |
+| Assert.cs:42:10:42:11 | exit M6 (abnormal) | Assert.cs:42:10:42:11 | exit M6 (abnormal) |
 | Assert.cs:44:20:44:32 | ... ? ... : ... | Assert.cs:42:10:42:11 | enter M6 |
 | Assert.cs:44:20:44:32 | ... ? ... : ... | Assert.cs:44:20:44:32 | ... ? ... : ... |
 | Assert.cs:44:20:44:32 | ... ? ... : ... | Assert.cs:44:24:44:27 | null |
 | Assert.cs:44:20:44:32 | ... ? ... : ... | Assert.cs:44:31:44:32 | "" |
 | Assert.cs:44:24:44:27 | null | Assert.cs:44:24:44:27 | null |
 | Assert.cs:44:31:44:32 | "" | Assert.cs:44:31:44:32 | "" |
-| Assert.cs:45:9:45:33 | [assertion failure] call to method IsFalse | Assert.cs:45:9:45:33 | [assertion failure] call to method IsFalse |
-| Assert.cs:45:9:45:33 | [assertion success] call to method IsFalse | Assert.cs:42:10:42:11 | enter M6 |
-| Assert.cs:45:9:45:33 | [assertion success] call to method IsFalse | Assert.cs:44:20:44:32 | ... ? ... : ... |
-| Assert.cs:45:9:45:33 | [assertion success] call to method IsFalse | Assert.cs:44:24:44:27 | null |
-| Assert.cs:45:9:45:33 | [assertion success] call to method IsFalse | Assert.cs:44:31:44:32 | "" |
-| Assert.cs:45:9:45:33 | [assertion success] call to method IsFalse | Assert.cs:45:9:45:33 | [assertion success] call to method IsFalse |
+| Assert.cs:46:9:46:36 | ...; | Assert.cs:42:10:42:11 | enter M6 |
+| Assert.cs:46:9:46:36 | ...; | Assert.cs:44:20:44:32 | ... ? ... : ... |
+| Assert.cs:46:9:46:36 | ...; | Assert.cs:44:24:44:27 | null |
+| Assert.cs:46:9:46:36 | ...; | Assert.cs:44:31:44:32 | "" |
+| Assert.cs:46:9:46:36 | ...; | Assert.cs:46:9:46:36 | ...; |
 | Assert.cs:49:10:49:11 | enter M7 | Assert.cs:49:10:49:11 | enter M7 |
 | Assert.cs:49:10:49:11 | exit M7 | Assert.cs:49:10:49:11 | exit M7 |
+| Assert.cs:49:10:49:11 | exit M7 (abnormal) | Assert.cs:49:10:49:11 | exit M7 (abnormal) |
 | Assert.cs:51:20:51:32 | ... ? ... : ... | Assert.cs:49:10:49:11 | enter M7 |
 | Assert.cs:51:20:51:32 | ... ? ... : ... | Assert.cs:51:20:51:32 | ... ? ... : ... |
 | Assert.cs:51:20:51:32 | ... ? ... : ... | Assert.cs:51:24:51:27 | null |
 | Assert.cs:51:20:51:32 | ... ? ... : ... | Assert.cs:51:31:51:32 | "" |
 | Assert.cs:51:24:51:27 | null | Assert.cs:51:24:51:27 | null |
 | Assert.cs:51:31:51:32 | "" | Assert.cs:51:31:51:32 | "" |
-| Assert.cs:52:9:52:33 | [assertion failure] call to method IsFalse | Assert.cs:52:9:52:33 | [assertion failure] call to method IsFalse |
-| Assert.cs:52:9:52:33 | [assertion success] call to method IsFalse | Assert.cs:49:10:49:11 | enter M7 |
-| Assert.cs:52:9:52:33 | [assertion success] call to method IsFalse | Assert.cs:51:20:51:32 | ... ? ... : ... |
-| Assert.cs:52:9:52:33 | [assertion success] call to method IsFalse | Assert.cs:51:24:51:27 | null |
-| Assert.cs:52:9:52:33 | [assertion success] call to method IsFalse | Assert.cs:51:31:51:32 | "" |
-| Assert.cs:52:9:52:33 | [assertion success] call to method IsFalse | Assert.cs:52:9:52:33 | [assertion success] call to method IsFalse |
+| Assert.cs:53:9:53:36 | ...; | Assert.cs:49:10:49:11 | enter M7 |
+| Assert.cs:53:9:53:36 | ...; | Assert.cs:51:20:51:32 | ... ? ... : ... |
+| Assert.cs:53:9:53:36 | ...; | Assert.cs:51:24:51:27 | null |
+| Assert.cs:53:9:53:36 | ...; | Assert.cs:51:31:51:32 | "" |
+| Assert.cs:53:9:53:36 | ...; | Assert.cs:53:9:53:36 | ...; |
 | Assert.cs:56:10:56:11 | enter M8 | Assert.cs:56:10:56:11 | enter M8 |
 | Assert.cs:56:10:56:11 | exit M8 | Assert.cs:56:10:56:11 | exit M8 |
-| Assert.cs:58:24:58:27 | [b (line 56): true] null | Assert.cs:56:10:56:11 | enter M8 |
-| Assert.cs:58:24:58:27 | [b (line 56): true] null | Assert.cs:58:24:58:27 | [b (line 56): true] null |
-| Assert.cs:58:31:58:32 | [b (line 56): false] "" | Assert.cs:58:31:58:32 | [b (line 56): false] "" |
-| Assert.cs:59:9:59:37 | [assertion failure] call to method IsTrue | Assert.cs:59:9:59:37 | [assertion failure] call to method IsTrue |
-| Assert.cs:59:9:59:37 | [assertion success] call to method IsTrue | Assert.cs:56:10:56:11 | enter M8 |
-| Assert.cs:59:9:59:37 | [assertion success] call to method IsTrue | Assert.cs:58:24:58:27 | [b (line 56): true] null |
-| Assert.cs:59:9:59:37 | [assertion success] call to method IsTrue | Assert.cs:59:9:59:37 | [assertion success] call to method IsTrue |
-| Assert.cs:59:9:59:37 | [assertion success] call to method IsTrue | Assert.cs:59:23:59:36 | [true] ... && ... |
-| Assert.cs:59:9:59:37 | [assertion success] call to method IsTrue | Assert.cs:59:36:59:36 | [b (line 56): true] access to parameter b |
-| Assert.cs:59:23:59:36 | [false] ... && ... | Assert.cs:59:23:59:36 | [false] ... && ... |
-| Assert.cs:59:23:59:36 | [true] ... && ... | Assert.cs:56:10:56:11 | enter M8 |
-| Assert.cs:59:23:59:36 | [true] ... && ... | Assert.cs:58:24:58:27 | [b (line 56): true] null |
-| Assert.cs:59:23:59:36 | [true] ... && ... | Assert.cs:59:23:59:36 | [true] ... && ... |
-| Assert.cs:59:23:59:36 | [true] ... && ... | Assert.cs:59:36:59:36 | [b (line 56): true] access to parameter b |
-| Assert.cs:59:36:59:36 | [b (line 56): false] access to parameter b | Assert.cs:59:36:59:36 | [b (line 56): false] access to parameter b |
-| Assert.cs:59:36:59:36 | [b (line 56): true] access to parameter b | Assert.cs:56:10:56:11 | enter M8 |
-| Assert.cs:59:36:59:36 | [b (line 56): true] access to parameter b | Assert.cs:58:24:58:27 | [b (line 56): true] null |
-| Assert.cs:59:36:59:36 | [b (line 56): true] access to parameter b | Assert.cs:59:36:59:36 | [b (line 56): true] access to parameter b |
+| Assert.cs:56:10:56:11 | exit M8 (abnormal) | Assert.cs:56:10:56:11 | exit M8 (abnormal) |
+| Assert.cs:58:20:58:32 | ... ? ... : ... | Assert.cs:56:10:56:11 | enter M8 |
+| Assert.cs:58:20:58:32 | ... ? ... : ... | Assert.cs:58:20:58:32 | ... ? ... : ... |
+| Assert.cs:58:20:58:32 | ... ? ... : ... | Assert.cs:58:24:58:27 | null |
+| Assert.cs:58:20:58:32 | ... ? ... : ... | Assert.cs:58:31:58:32 | "" |
+| Assert.cs:58:24:58:27 | null | Assert.cs:58:24:58:27 | null |
+| Assert.cs:58:31:58:32 | "" | Assert.cs:58:31:58:32 | "" |
+| Assert.cs:59:23:59:36 | ... && ... | Assert.cs:56:10:56:11 | enter M8 |
+| Assert.cs:59:23:59:36 | ... && ... | Assert.cs:58:20:58:32 | ... ? ... : ... |
+| Assert.cs:59:23:59:36 | ... && ... | Assert.cs:58:24:58:27 | null |
+| Assert.cs:59:23:59:36 | ... && ... | Assert.cs:58:31:58:32 | "" |
+| Assert.cs:59:23:59:36 | ... && ... | Assert.cs:59:23:59:36 | ... && ... |
+| Assert.cs:59:23:59:36 | ... && ... | Assert.cs:59:36:59:36 | access to parameter b |
+| Assert.cs:59:36:59:36 | access to parameter b | Assert.cs:59:36:59:36 | access to parameter b |
+| Assert.cs:60:9:60:36 | ...; | Assert.cs:56:10:56:11 | enter M8 |
+| Assert.cs:60:9:60:36 | ...; | Assert.cs:58:20:58:32 | ... ? ... : ... |
+| Assert.cs:60:9:60:36 | ...; | Assert.cs:58:24:58:27 | null |
+| Assert.cs:60:9:60:36 | ...; | Assert.cs:58:31:58:32 | "" |
+| Assert.cs:60:9:60:36 | ...; | Assert.cs:59:23:59:36 | ... && ... |
+| Assert.cs:60:9:60:36 | ...; | Assert.cs:59:36:59:36 | access to parameter b |
+| Assert.cs:60:9:60:36 | ...; | Assert.cs:60:9:60:36 | ...; |
 | Assert.cs:63:10:63:11 | enter M9 | Assert.cs:63:10:63:11 | enter M9 |
 | Assert.cs:63:10:63:11 | exit M9 | Assert.cs:63:10:63:11 | exit M9 |
-| Assert.cs:65:24:65:27 | [b (line 63): true] null | Assert.cs:65:24:65:27 | [b (line 63): true] null |
-| Assert.cs:65:31:65:32 | [b (line 63): false] "" | Assert.cs:63:10:63:11 | enter M9 |
-| Assert.cs:65:31:65:32 | [b (line 63): false] "" | Assert.cs:65:31:65:32 | [b (line 63): false] "" |
-| Assert.cs:66:9:66:38 | [assertion failure] call to method IsFalse | Assert.cs:66:9:66:38 | [assertion failure] call to method IsFalse |
-| Assert.cs:66:9:66:38 | [assertion success] call to method IsFalse | Assert.cs:63:10:63:11 | enter M9 |
-| Assert.cs:66:9:66:38 | [assertion success] call to method IsFalse | Assert.cs:65:31:65:32 | [b (line 63): false] "" |
-| Assert.cs:66:9:66:38 | [assertion success] call to method IsFalse | Assert.cs:66:9:66:38 | [assertion success] call to method IsFalse |
-| Assert.cs:66:9:66:38 | [assertion success] call to method IsFalse | Assert.cs:66:24:66:37 | [false] ... \|\| ... |
-| Assert.cs:66:9:66:38 | [assertion success] call to method IsFalse | Assert.cs:66:37:66:37 | [b (line 63): false] access to parameter b |
-| Assert.cs:66:24:66:37 | [false] ... \|\| ... | Assert.cs:63:10:63:11 | enter M9 |
-| Assert.cs:66:24:66:37 | [false] ... \|\| ... | Assert.cs:65:31:65:32 | [b (line 63): false] "" |
-| Assert.cs:66:24:66:37 | [false] ... \|\| ... | Assert.cs:66:24:66:37 | [false] ... \|\| ... |
-| Assert.cs:66:24:66:37 | [false] ... \|\| ... | Assert.cs:66:37:66:37 | [b (line 63): false] access to parameter b |
-| Assert.cs:66:24:66:37 | [true] ... \|\| ... | Assert.cs:66:24:66:37 | [true] ... \|\| ... |
-| Assert.cs:66:37:66:37 | [b (line 63): false] access to parameter b | Assert.cs:63:10:63:11 | enter M9 |
-| Assert.cs:66:37:66:37 | [b (line 63): false] access to parameter b | Assert.cs:65:31:65:32 | [b (line 63): false] "" |
-| Assert.cs:66:37:66:37 | [b (line 63): false] access to parameter b | Assert.cs:66:37:66:37 | [b (line 63): false] access to parameter b |
-| Assert.cs:66:37:66:37 | [b (line 63): true] access to parameter b | Assert.cs:66:37:66:37 | [b (line 63): true] access to parameter b |
+| Assert.cs:63:10:63:11 | exit M9 (abnormal) | Assert.cs:63:10:63:11 | exit M9 (abnormal) |
+| Assert.cs:65:20:65:32 | ... ? ... : ... | Assert.cs:63:10:63:11 | enter M9 |
+| Assert.cs:65:20:65:32 | ... ? ... : ... | Assert.cs:65:20:65:32 | ... ? ... : ... |
+| Assert.cs:65:20:65:32 | ... ? ... : ... | Assert.cs:65:24:65:27 | null |
+| Assert.cs:65:20:65:32 | ... ? ... : ... | Assert.cs:65:31:65:32 | "" |
+| Assert.cs:65:24:65:27 | null | Assert.cs:65:24:65:27 | null |
+| Assert.cs:65:31:65:32 | "" | Assert.cs:65:31:65:32 | "" |
+| Assert.cs:66:24:66:37 | ... \|\| ... | Assert.cs:63:10:63:11 | enter M9 |
+| Assert.cs:66:24:66:37 | ... \|\| ... | Assert.cs:65:20:65:32 | ... ? ... : ... |
+| Assert.cs:66:24:66:37 | ... \|\| ... | Assert.cs:65:24:65:27 | null |
+| Assert.cs:66:24:66:37 | ... \|\| ... | Assert.cs:65:31:65:32 | "" |
+| Assert.cs:66:24:66:37 | ... \|\| ... | Assert.cs:66:24:66:37 | ... \|\| ... |
+| Assert.cs:66:24:66:37 | ... \|\| ... | Assert.cs:66:37:66:37 | access to parameter b |
+| Assert.cs:66:37:66:37 | access to parameter b | Assert.cs:66:37:66:37 | access to parameter b |
+| Assert.cs:67:9:67:36 | ...; | Assert.cs:63:10:63:11 | enter M9 |
+| Assert.cs:67:9:67:36 | ...; | Assert.cs:65:20:65:32 | ... ? ... : ... |
+| Assert.cs:67:9:67:36 | ...; | Assert.cs:65:24:65:27 | null |
+| Assert.cs:67:9:67:36 | ...; | Assert.cs:65:31:65:32 | "" |
+| Assert.cs:67:9:67:36 | ...; | Assert.cs:66:24:66:37 | ... \|\| ... |
+| Assert.cs:67:9:67:36 | ...; | Assert.cs:66:37:66:37 | access to parameter b |
+| Assert.cs:67:9:67:36 | ...; | Assert.cs:67:9:67:36 | ...; |
 | Assert.cs:70:10:70:12 | enter M10 | Assert.cs:70:10:70:12 | enter M10 |
 | Assert.cs:70:10:70:12 | exit M10 | Assert.cs:70:10:70:12 | exit M10 |
-| Assert.cs:72:24:72:27 | [b (line 70): true] null | Assert.cs:70:10:70:12 | enter M10 |
-| Assert.cs:72:24:72:27 | [b (line 70): true] null | Assert.cs:72:24:72:27 | [b (line 70): true] null |
-| Assert.cs:72:31:72:32 | [b (line 70): false] "" | Assert.cs:72:31:72:32 | [b (line 70): false] "" |
-| Assert.cs:73:9:73:37 | [assertion failure] call to method IsTrue | Assert.cs:73:9:73:37 | [assertion failure] call to method IsTrue |
-| Assert.cs:73:9:73:37 | [assertion success] call to method IsTrue | Assert.cs:70:10:70:12 | enter M10 |
-| Assert.cs:73:9:73:37 | [assertion success] call to method IsTrue | Assert.cs:72:24:72:27 | [b (line 70): true] null |
-| Assert.cs:73:9:73:37 | [assertion success] call to method IsTrue | Assert.cs:73:9:73:37 | [assertion success] call to method IsTrue |
-| Assert.cs:73:9:73:37 | [assertion success] call to method IsTrue | Assert.cs:73:23:73:36 | [true] ... && ... |
-| Assert.cs:73:9:73:37 | [assertion success] call to method IsTrue | Assert.cs:73:36:73:36 | [b (line 70): true] access to parameter b |
-| Assert.cs:73:23:73:36 | [false] ... && ... | Assert.cs:73:23:73:36 | [false] ... && ... |
-| Assert.cs:73:23:73:36 | [true] ... && ... | Assert.cs:70:10:70:12 | enter M10 |
-| Assert.cs:73:23:73:36 | [true] ... && ... | Assert.cs:72:24:72:27 | [b (line 70): true] null |
-| Assert.cs:73:23:73:36 | [true] ... && ... | Assert.cs:73:23:73:36 | [true] ... && ... |
-| Assert.cs:73:23:73:36 | [true] ... && ... | Assert.cs:73:36:73:36 | [b (line 70): true] access to parameter b |
-| Assert.cs:73:36:73:36 | [b (line 70): false] access to parameter b | Assert.cs:73:36:73:36 | [b (line 70): false] access to parameter b |
-| Assert.cs:73:36:73:36 | [b (line 70): true] access to parameter b | Assert.cs:70:10:70:12 | enter M10 |
-| Assert.cs:73:36:73:36 | [b (line 70): true] access to parameter b | Assert.cs:72:24:72:27 | [b (line 70): true] null |
-| Assert.cs:73:36:73:36 | [b (line 70): true] access to parameter b | Assert.cs:73:36:73:36 | [b (line 70): true] access to parameter b |
+| Assert.cs:70:10:70:12 | exit M10 (abnormal) | Assert.cs:70:10:70:12 | exit M10 (abnormal) |
+| Assert.cs:72:20:72:32 | ... ? ... : ... | Assert.cs:70:10:70:12 | enter M10 |
+| Assert.cs:72:20:72:32 | ... ? ... : ... | Assert.cs:72:20:72:32 | ... ? ... : ... |
+| Assert.cs:72:20:72:32 | ... ? ... : ... | Assert.cs:72:24:72:27 | null |
+| Assert.cs:72:20:72:32 | ... ? ... : ... | Assert.cs:72:31:72:32 | "" |
+| Assert.cs:72:24:72:27 | null | Assert.cs:72:24:72:27 | null |
+| Assert.cs:72:31:72:32 | "" | Assert.cs:72:31:72:32 | "" |
+| Assert.cs:73:23:73:36 | ... && ... | Assert.cs:70:10:70:12 | enter M10 |
+| Assert.cs:73:23:73:36 | ... && ... | Assert.cs:72:20:72:32 | ... ? ... : ... |
+| Assert.cs:73:23:73:36 | ... && ... | Assert.cs:72:24:72:27 | null |
+| Assert.cs:73:23:73:36 | ... && ... | Assert.cs:72:31:72:32 | "" |
+| Assert.cs:73:23:73:36 | ... && ... | Assert.cs:73:23:73:36 | ... && ... |
+| Assert.cs:73:23:73:36 | ... && ... | Assert.cs:73:36:73:36 | access to parameter b |
+| Assert.cs:73:36:73:36 | access to parameter b | Assert.cs:73:36:73:36 | access to parameter b |
+| Assert.cs:74:9:74:36 | ...; | Assert.cs:70:10:70:12 | enter M10 |
+| Assert.cs:74:9:74:36 | ...; | Assert.cs:72:20:72:32 | ... ? ... : ... |
+| Assert.cs:74:9:74:36 | ...; | Assert.cs:72:24:72:27 | null |
+| Assert.cs:74:9:74:36 | ...; | Assert.cs:72:31:72:32 | "" |
+| Assert.cs:74:9:74:36 | ...; | Assert.cs:73:23:73:36 | ... && ... |
+| Assert.cs:74:9:74:36 | ...; | Assert.cs:73:36:73:36 | access to parameter b |
+| Assert.cs:74:9:74:36 | ...; | Assert.cs:74:9:74:36 | ...; |
 | Assert.cs:77:10:77:12 | enter M11 | Assert.cs:77:10:77:12 | enter M11 |
 | Assert.cs:77:10:77:12 | exit M11 | Assert.cs:77:10:77:12 | exit M11 |
-| Assert.cs:79:24:79:27 | [b (line 77): true] null | Assert.cs:79:24:79:27 | [b (line 77): true] null |
-| Assert.cs:79:31:79:32 | [b (line 77): false] "" | Assert.cs:77:10:77:12 | enter M11 |
-| Assert.cs:79:31:79:32 | [b (line 77): false] "" | Assert.cs:79:31:79:32 | [b (line 77): false] "" |
-| Assert.cs:80:9:80:38 | [assertion failure] call to method IsFalse | Assert.cs:80:9:80:38 | [assertion failure] call to method IsFalse |
-| Assert.cs:80:9:80:38 | [assertion success] call to method IsFalse | Assert.cs:77:10:77:12 | enter M11 |
-| Assert.cs:80:9:80:38 | [assertion success] call to method IsFalse | Assert.cs:79:31:79:32 | [b (line 77): false] "" |
-| Assert.cs:80:9:80:38 | [assertion success] call to method IsFalse | Assert.cs:80:9:80:38 | [assertion success] call to method IsFalse |
-| Assert.cs:80:9:80:38 | [assertion success] call to method IsFalse | Assert.cs:80:24:80:37 | [false] ... \|\| ... |
-| Assert.cs:80:9:80:38 | [assertion success] call to method IsFalse | Assert.cs:80:37:80:37 | [b (line 77): false] access to parameter b |
-| Assert.cs:80:24:80:37 | [false] ... \|\| ... | Assert.cs:77:10:77:12 | enter M11 |
-| Assert.cs:80:24:80:37 | [false] ... \|\| ... | Assert.cs:79:31:79:32 | [b (line 77): false] "" |
-| Assert.cs:80:24:80:37 | [false] ... \|\| ... | Assert.cs:80:24:80:37 | [false] ... \|\| ... |
-| Assert.cs:80:24:80:37 | [false] ... \|\| ... | Assert.cs:80:37:80:37 | [b (line 77): false] access to parameter b |
-| Assert.cs:80:24:80:37 | [true] ... \|\| ... | Assert.cs:80:24:80:37 | [true] ... \|\| ... |
-| Assert.cs:80:37:80:37 | [b (line 77): false] access to parameter b | Assert.cs:77:10:77:12 | enter M11 |
-| Assert.cs:80:37:80:37 | [b (line 77): false] access to parameter b | Assert.cs:79:31:79:32 | [b (line 77): false] "" |
-| Assert.cs:80:37:80:37 | [b (line 77): false] access to parameter b | Assert.cs:80:37:80:37 | [b (line 77): false] access to parameter b |
-| Assert.cs:80:37:80:37 | [b (line 77): true] access to parameter b | Assert.cs:80:37:80:37 | [b (line 77): true] access to parameter b |
+| Assert.cs:77:10:77:12 | exit M11 (abnormal) | Assert.cs:77:10:77:12 | exit M11 (abnormal) |
+| Assert.cs:79:20:79:32 | ... ? ... : ... | Assert.cs:77:10:77:12 | enter M11 |
+| Assert.cs:79:20:79:32 | ... ? ... : ... | Assert.cs:79:20:79:32 | ... ? ... : ... |
+| Assert.cs:79:20:79:32 | ... ? ... : ... | Assert.cs:79:24:79:27 | null |
+| Assert.cs:79:20:79:32 | ... ? ... : ... | Assert.cs:79:31:79:32 | "" |
+| Assert.cs:79:24:79:27 | null | Assert.cs:79:24:79:27 | null |
+| Assert.cs:79:31:79:32 | "" | Assert.cs:79:31:79:32 | "" |
+| Assert.cs:80:24:80:37 | ... \|\| ... | Assert.cs:77:10:77:12 | enter M11 |
+| Assert.cs:80:24:80:37 | ... \|\| ... | Assert.cs:79:20:79:32 | ... ? ... : ... |
+| Assert.cs:80:24:80:37 | ... \|\| ... | Assert.cs:79:24:79:27 | null |
+| Assert.cs:80:24:80:37 | ... \|\| ... | Assert.cs:79:31:79:32 | "" |
+| Assert.cs:80:24:80:37 | ... \|\| ... | Assert.cs:80:24:80:37 | ... \|\| ... |
+| Assert.cs:80:24:80:37 | ... \|\| ... | Assert.cs:80:37:80:37 | access to parameter b |
+| Assert.cs:80:37:80:37 | access to parameter b | Assert.cs:80:37:80:37 | access to parameter b |
+| Assert.cs:81:9:81:36 | ...; | Assert.cs:77:10:77:12 | enter M11 |
+| Assert.cs:81:9:81:36 | ...; | Assert.cs:79:20:79:32 | ... ? ... : ... |
+| Assert.cs:81:9:81:36 | ...; | Assert.cs:79:24:79:27 | null |
+| Assert.cs:81:9:81:36 | ...; | Assert.cs:79:31:79:32 | "" |
+| Assert.cs:81:9:81:36 | ...; | Assert.cs:80:24:80:37 | ... \|\| ... |
+| Assert.cs:81:9:81:36 | ...; | Assert.cs:80:37:80:37 | access to parameter b |
+| Assert.cs:81:9:81:36 | ...; | Assert.cs:81:9:81:36 | ...; |
 | Assert.cs:84:10:84:12 | enter M12 | Assert.cs:84:10:84:12 | enter M12 |
 | Assert.cs:84:10:84:12 | exit M12 | Assert.cs:84:10:84:12 | exit M12 |
 | Assert.cs:84:10:84:12 | exit M12 (abnormal) | Assert.cs:84:10:84:12 | exit M12 (abnormal) |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:84:10:84:12 | enter M12 |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:86:24:86:27 | [b (line 84): true] null |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:86:31:86:32 | [b (line 84): false] "" |
-| Assert.cs:87:9:87:31 | [assertion failure, b (line 84): false] call to method Assert | Assert.cs:87:9:87:31 | [assertion failure, b (line 84): false] call to method Assert |
-| Assert.cs:87:9:87:31 | [assertion failure, b (line 84): true] call to method Assert | Assert.cs:87:9:87:31 | [assertion failure, b (line 84): true] call to method Assert |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:84:10:84:12 | enter M12 |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:86:24:86:27 | [b (line 84): true] null |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:84:10:84:12 | enter M12 |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:86:24:86:27 | [b (line 84): true] null |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:90:17:90:20 | [b (line 84): true] null |
-| Assert.cs:90:24:90:25 | [b (line 84): false] "" | Assert.cs:90:24:90:25 | [b (line 84): false] "" |
-| Assert.cs:91:9:91:24 | [assertion failure, b (line 84): false] call to method IsNull | Assert.cs:91:9:91:24 | [assertion failure, b (line 84): false] call to method IsNull |
-| Assert.cs:91:9:91:24 | [assertion failure, b (line 84): true] call to method IsNull | Assert.cs:91:9:91:24 | [assertion failure, b (line 84): true] call to method IsNull |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull | Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:84:10:84:12 | enter M12 |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:86:24:86:27 | [b (line 84): true] null |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:90:17:90:20 | [b (line 84): true] null |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:84:10:84:12 | enter M12 |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:86:24:86:27 | [b (line 84): true] null |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:90:17:90:20 | [b (line 84): true] null |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:94:17:94:20 | [b (line 84): true] null |
-| Assert.cs:94:24:94:25 | [b (line 84): false] "" | Assert.cs:94:24:94:25 | [b (line 84): false] "" |
-| Assert.cs:95:9:95:27 | [assertion failure, b (line 84): false] call to method IsNotNull | Assert.cs:95:9:95:27 | [assertion failure, b (line 84): false] call to method IsNotNull |
-| Assert.cs:95:9:95:27 | [assertion failure, b (line 84): true] call to method IsNotNull | Assert.cs:95:9:95:27 | [assertion failure, b (line 84): true] call to method IsNotNull |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull | Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:84:10:84:12 | enter M12 |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:86:24:86:27 | [b (line 84): true] null |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:90:17:90:20 | [b (line 84): true] null |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:94:17:94:20 | [b (line 84): true] null |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:84:10:84:12 | enter M12 |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:86:24:86:27 | [b (line 84): true] null |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:90:17:90:20 | [b (line 84): true] null |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:94:17:94:20 | [b (line 84): true] null |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:98:17:98:20 | [b (line 84): true] null |
-| Assert.cs:98:24:98:25 | [b (line 84): false] "" | Assert.cs:98:24:98:25 | [b (line 84): false] "" |
-| Assert.cs:99:9:99:32 | [assertion failure, b (line 84): false] call to method IsTrue | Assert.cs:99:9:99:32 | [assertion failure, b (line 84): false] call to method IsTrue |
-| Assert.cs:99:9:99:32 | [assertion failure, b (line 84): true] call to method IsTrue | Assert.cs:99:9:99:32 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:84:10:84:12 | enter M12 |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:86:24:86:27 | [b (line 84): true] null |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:90:17:90:20 | [b (line 84): true] null |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:94:17:94:20 | [b (line 84): true] null |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:98:17:98:20 | [b (line 84): true] null |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:84:10:84:12 | enter M12 |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:86:24:86:27 | [b (line 84): true] null |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:90:17:90:20 | [b (line 84): true] null |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:94:17:94:20 | [b (line 84): true] null |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:98:17:98:20 | [b (line 84): true] null |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:102:17:102:20 | [b (line 84): true] null |
-| Assert.cs:102:24:102:25 | [b (line 84): false] "" | Assert.cs:102:24:102:25 | [b (line 84): false] "" |
-| Assert.cs:103:9:103:32 | [assertion failure, b (line 84): false] call to method IsTrue | Assert.cs:103:9:103:32 | [assertion failure, b (line 84): false] call to method IsTrue |
-| Assert.cs:103:9:103:32 | [assertion failure, b (line 84): true] call to method IsTrue | Assert.cs:103:9:103:32 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:84:10:84:12 | enter M12 |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:86:24:86:27 | [b (line 84): true] null |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:90:17:90:20 | [b (line 84): true] null |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:94:17:94:20 | [b (line 84): true] null |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:98:17:98:20 | [b (line 84): true] null |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:102:17:102:20 | [b (line 84): true] null |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:84:10:84:12 | enter M12 |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:86:24:86:27 | [b (line 84): true] null |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:90:17:90:20 | [b (line 84): true] null |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:94:17:94:20 | [b (line 84): true] null |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:98:17:98:20 | [b (line 84): true] null |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:102:17:102:20 | [b (line 84): true] null |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:106:17:106:20 | [b (line 84): true] null |
-| Assert.cs:106:24:106:25 | [b (line 84): false] "" | Assert.cs:106:24:106:25 | [b (line 84): false] "" |
-| Assert.cs:107:9:107:33 | [assertion failure, b (line 84): false] call to method IsFalse | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): false] call to method IsFalse |
-| Assert.cs:107:9:107:33 | [assertion failure, b (line 84): true] call to method IsFalse | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): false] call to method IsFalse | Assert.cs:107:9:107:33 | [assertion success, b (line 84): false] call to method IsFalse |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:84:10:84:12 | enter M12 |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:86:24:86:27 | [b (line 84): true] null |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:90:17:90:20 | [b (line 84): true] null |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:94:17:94:20 | [b (line 84): true] null |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:98:17:98:20 | [b (line 84): true] null |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:102:17:102:20 | [b (line 84): true] null |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:106:17:106:20 | [b (line 84): true] null |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:84:10:84:12 | enter M12 |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:86:24:86:27 | [b (line 84): true] null |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:90:17:90:20 | [b (line 84): true] null |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:94:17:94:20 | [b (line 84): true] null |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:98:17:98:20 | [b (line 84): true] null |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:102:17:102:20 | [b (line 84): true] null |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:106:17:106:20 | [b (line 84): true] null |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:110:17:110:20 | [b (line 84): true] null |
-| Assert.cs:110:24:110:25 | [b (line 84): false] "" | Assert.cs:110:24:110:25 | [b (line 84): false] "" |
-| Assert.cs:111:9:111:33 | [assertion failure, b (line 84): false] call to method IsFalse | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): false] call to method IsFalse |
-| Assert.cs:111:9:111:33 | [assertion failure, b (line 84): true] call to method IsFalse | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): false] call to method IsFalse | Assert.cs:111:9:111:33 | [assertion success, b (line 84): false] call to method IsFalse |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:84:10:84:12 | enter M12 |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:86:24:86:27 | [b (line 84): true] null |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:90:17:90:20 | [b (line 84): true] null |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:94:17:94:20 | [b (line 84): true] null |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:98:17:98:20 | [b (line 84): true] null |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:102:17:102:20 | [b (line 84): true] null |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:106:17:106:20 | [b (line 84): true] null |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:110:17:110:20 | [b (line 84): true] null |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:84:10:84:12 | enter M12 |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:86:24:86:27 | [b (line 84): true] null |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:90:17:90:20 | [b (line 84): true] null |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:94:17:94:20 | [b (line 84): true] null |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:98:17:98:20 | [b (line 84): true] null |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:102:17:102:20 | [b (line 84): true] null |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:106:17:106:20 | [b (line 84): true] null |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:110:17:110:20 | [b (line 84): true] null |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:114:17:114:20 | [b (line 84): true] null |
-| Assert.cs:114:24:114:25 | [b (line 84): false] "" | Assert.cs:114:24:114:25 | [b (line 84): false] "" |
-| Assert.cs:115:9:115:37 | [assertion failure, b (line 84): false] call to method IsTrue | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): false] call to method IsTrue |
-| Assert.cs:115:9:115:37 | [assertion failure, b (line 84): true] call to method IsTrue | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:84:10:84:12 | enter M12 |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:86:24:86:27 | [b (line 84): true] null |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:90:17:90:20 | [b (line 84): true] null |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:94:17:94:20 | [b (line 84): true] null |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:98:17:98:20 | [b (line 84): true] null |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:102:17:102:20 | [b (line 84): true] null |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:106:17:106:20 | [b (line 84): true] null |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:110:17:110:20 | [b (line 84): true] null |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:114:17:114:20 | [b (line 84): true] null |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:115:23:115:36 | [false, b (line 84): false] ... && ... | Assert.cs:115:23:115:36 | [false, b (line 84): false] ... && ... |
-| Assert.cs:115:23:115:36 | [false, b (line 84): true] ... && ... | Assert.cs:115:23:115:36 | [false, b (line 84): true] ... && ... |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:84:10:84:12 | enter M12 |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:86:24:86:27 | [b (line 84): true] null |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:90:17:90:20 | [b (line 84): true] null |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:94:17:94:20 | [b (line 84): true] null |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:98:17:98:20 | [b (line 84): true] null |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:102:17:102:20 | [b (line 84): true] null |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:106:17:106:20 | [b (line 84): true] null |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:110:17:110:20 | [b (line 84): true] null |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:114:17:114:20 | [b (line 84): true] null |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:115:36:115:36 | [b (line 84): false] access to parameter b | Assert.cs:115:36:115:36 | [b (line 84): false] access to parameter b |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:84:10:84:12 | enter M12 |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:86:24:86:27 | [b (line 84): true] null |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:90:17:90:20 | [b (line 84): true] null |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:94:17:94:20 | [b (line 84): true] null |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:98:17:98:20 | [b (line 84): true] null |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:102:17:102:20 | [b (line 84): true] null |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:106:17:106:20 | [b (line 84): true] null |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:110:17:110:20 | [b (line 84): true] null |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:114:17:114:20 | [b (line 84): true] null |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:84:10:84:12 | enter M12 |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:86:24:86:27 | [b (line 84): true] null |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:90:17:90:20 | [b (line 84): true] null |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:94:17:94:20 | [b (line 84): true] null |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:98:17:98:20 | [b (line 84): true] null |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:102:17:102:20 | [b (line 84): true] null |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:106:17:106:20 | [b (line 84): true] null |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:110:17:110:20 | [b (line 84): true] null |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:114:17:114:20 | [b (line 84): true] null |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:118:17:118:20 | [b (line 84): true] null |
-| Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse | Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:84:10:84:12 | enter M12 |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:86:24:86:27 | [b (line 84): true] null |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:90:17:90:20 | [b (line 84): true] null |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:94:17:94:20 | [b (line 84): true] null |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:98:17:98:20 | [b (line 84): true] null |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:102:17:102:20 | [b (line 84): true] null |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:106:17:106:20 | [b (line 84): true] null |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:110:17:110:20 | [b (line 84): true] null |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:114:17:114:20 | [b (line 84): true] null |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:118:17:118:20 | [b (line 84): true] null |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:84:10:84:12 | enter M12 |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:86:24:86:27 | [b (line 84): true] null |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:90:17:90:20 | [b (line 84): true] null |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:94:17:94:20 | [b (line 84): true] null |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:98:17:98:20 | [b (line 84): true] null |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:102:17:102:20 | [b (line 84): true] null |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:106:17:106:20 | [b (line 84): true] null |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:110:17:110:20 | [b (line 84): true] null |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:114:17:114:20 | [b (line 84): true] null |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:118:17:118:20 | [b (line 84): true] null |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... | Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:84:10:84:12 | enter M12 |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:86:24:86:27 | [b (line 84): true] null |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:90:17:90:20 | [b (line 84): true] null |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:94:17:94:20 | [b (line 84): true] null |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:98:17:98:20 | [b (line 84): true] null |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:102:17:102:20 | [b (line 84): true] null |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:106:17:106:20 | [b (line 84): true] null |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:110:17:110:20 | [b (line 84): true] null |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:114:17:114:20 | [b (line 84): true] null |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:118:17:118:20 | [b (line 84): true] null |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:84:10:84:12 | enter M12 |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:86:24:86:27 | [b (line 84): true] null |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:90:17:90:20 | [b (line 84): true] null |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:94:17:94:20 | [b (line 84): true] null |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:98:17:98:20 | [b (line 84): true] null |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:102:17:102:20 | [b (line 84): true] null |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:106:17:106:20 | [b (line 84): true] null |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:110:17:110:20 | [b (line 84): true] null |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:114:17:114:20 | [b (line 84): true] null |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:118:17:118:20 | [b (line 84): true] null |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:84:10:84:12 | enter M12 |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:86:24:86:27 | [b (line 84): true] null |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:90:17:90:20 | [b (line 84): true] null |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:94:17:94:20 | [b (line 84): true] null |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:98:17:98:20 | [b (line 84): true] null |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:102:17:102:20 | [b (line 84): true] null |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:106:17:106:20 | [b (line 84): true] null |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:110:17:110:20 | [b (line 84): true] null |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:114:17:114:20 | [b (line 84): true] null |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:118:17:118:20 | [b (line 84): true] null |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:122:17:122:20 | [b (line 84): true] null |
-| Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue |
-| Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:84:10:84:12 | enter M12 |
-| Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:86:24:86:27 | [b (line 84): true] null |
-| Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert |
-| Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:90:17:90:20 | [b (line 84): true] null |
-| Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull |
-| Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:94:17:94:20 | [b (line 84): true] null |
-| Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull |
-| Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:98:17:98:20 | [b (line 84): true] null |
-| Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:102:17:102:20 | [b (line 84): true] null |
-| Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:106:17:106:20 | [b (line 84): true] null |
-| Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:110:17:110:20 | [b (line 84): true] null |
-| Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:114:17:114:20 | [b (line 84): true] null |
-| Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:118:17:118:20 | [b (line 84): true] null |
-| Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... |
-| Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... |
-| Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:122:17:122:20 | [b (line 84): true] null |
-| Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... |
-| Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | Assert.cs:84:10:84:12 | enter M12 |
-| Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | Assert.cs:86:24:86:27 | [b (line 84): true] null |
-| Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert |
-| Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | Assert.cs:90:17:90:20 | [b (line 84): true] null |
-| Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull |
-| Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | Assert.cs:94:17:94:20 | [b (line 84): true] null |
-| Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull |
-| Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | Assert.cs:98:17:98:20 | [b (line 84): true] null |
-| Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | Assert.cs:102:17:102:20 | [b (line 84): true] null |
-| Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | Assert.cs:106:17:106:20 | [b (line 84): true] null |
-| Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | Assert.cs:110:17:110:20 | [b (line 84): true] null |
-| Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | Assert.cs:114:17:114:20 | [b (line 84): true] null |
-| Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | Assert.cs:118:17:118:20 | [b (line 84): true] null |
-| Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... |
-| Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... |
-| Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | Assert.cs:122:17:122:20 | [b (line 84): true] null |
-| Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | Assert.cs:84:10:84:12 | enter M12 |
-| Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | Assert.cs:86:24:86:27 | [b (line 84): true] null |
-| Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert |
-| Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | Assert.cs:90:17:90:20 | [b (line 84): true] null |
-| Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull |
-| Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | Assert.cs:94:17:94:20 | [b (line 84): true] null |
-| Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull |
-| Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | Assert.cs:98:17:98:20 | [b (line 84): true] null |
-| Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | Assert.cs:102:17:102:20 | [b (line 84): true] null |
-| Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | Assert.cs:106:17:106:20 | [b (line 84): true] null |
-| Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | Assert.cs:110:17:110:20 | [b (line 84): true] null |
-| Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | Assert.cs:114:17:114:20 | [b (line 84): true] null |
-| Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | Assert.cs:118:17:118:20 | [b (line 84): true] null |
-| Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... |
-| Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... |
-| Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | Assert.cs:122:17:122:20 | [b (line 84): true] null |
-| Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:126:17:126:20 | [b (line 84): true] null | Assert.cs:84:10:84:12 | enter M12 |
-| Assert.cs:126:17:126:20 | [b (line 84): true] null | Assert.cs:86:24:86:27 | [b (line 84): true] null |
-| Assert.cs:126:17:126:20 | [b (line 84): true] null | Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert |
-| Assert.cs:126:17:126:20 | [b (line 84): true] null | Assert.cs:90:17:90:20 | [b (line 84): true] null |
-| Assert.cs:126:17:126:20 | [b (line 84): true] null | Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull |
-| Assert.cs:126:17:126:20 | [b (line 84): true] null | Assert.cs:94:17:94:20 | [b (line 84): true] null |
-| Assert.cs:126:17:126:20 | [b (line 84): true] null | Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull |
-| Assert.cs:126:17:126:20 | [b (line 84): true] null | Assert.cs:98:17:98:20 | [b (line 84): true] null |
-| Assert.cs:126:17:126:20 | [b (line 84): true] null | Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:126:17:126:20 | [b (line 84): true] null | Assert.cs:102:17:102:20 | [b (line 84): true] null |
-| Assert.cs:126:17:126:20 | [b (line 84): true] null | Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:126:17:126:20 | [b (line 84): true] null | Assert.cs:106:17:106:20 | [b (line 84): true] null |
-| Assert.cs:126:17:126:20 | [b (line 84): true] null | Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:126:17:126:20 | [b (line 84): true] null | Assert.cs:110:17:110:20 | [b (line 84): true] null |
-| Assert.cs:126:17:126:20 | [b (line 84): true] null | Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:126:17:126:20 | [b (line 84): true] null | Assert.cs:114:17:114:20 | [b (line 84): true] null |
-| Assert.cs:126:17:126:20 | [b (line 84): true] null | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:126:17:126:20 | [b (line 84): true] null | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:126:17:126:20 | [b (line 84): true] null | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:126:17:126:20 | [b (line 84): true] null | Assert.cs:118:17:118:20 | [b (line 84): true] null |
-| Assert.cs:126:17:126:20 | [b (line 84): true] null | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:126:17:126:20 | [b (line 84): true] null | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... |
-| Assert.cs:126:17:126:20 | [b (line 84): true] null | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... |
-| Assert.cs:126:17:126:20 | [b (line 84): true] null | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:126:17:126:20 | [b (line 84): true] null | Assert.cs:122:17:122:20 | [b (line 84): true] null |
-| Assert.cs:126:17:126:20 | [b (line 84): true] null | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:126:17:126:20 | [b (line 84): true] null | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:126:17:126:20 | [b (line 84): true] null | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:126:17:126:20 | [b (line 84): true] null | Assert.cs:126:17:126:20 | [b (line 84): true] null |
-| Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse |
-| Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | Assert.cs:84:10:84:12 | enter M12 |
-| Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | Assert.cs:86:24:86:27 | [b (line 84): true] null |
-| Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert |
-| Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | Assert.cs:90:17:90:20 | [b (line 84): true] null |
-| Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull |
-| Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | Assert.cs:94:17:94:20 | [b (line 84): true] null |
-| Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull |
-| Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | Assert.cs:98:17:98:20 | [b (line 84): true] null |
-| Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | Assert.cs:102:17:102:20 | [b (line 84): true] null |
-| Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | Assert.cs:106:17:106:20 | [b (line 84): true] null |
-| Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | Assert.cs:110:17:110:20 | [b (line 84): true] null |
-| Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | Assert.cs:114:17:114:20 | [b (line 84): true] null |
-| Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | Assert.cs:118:17:118:20 | [b (line 84): true] null |
-| Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... |
-| Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... |
-| Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | Assert.cs:122:17:122:20 | [b (line 84): true] null |
-| Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | Assert.cs:126:17:126:20 | [b (line 84): true] null |
-| Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse |
-| Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | Assert.cs:127:24:127:38 | [false] ... \|\| ... |
-| Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | Assert.cs:127:37:127:38 | [false] !... |
-| Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:127:24:127:38 | [false] ... \|\| ... | Assert.cs:84:10:84:12 | enter M12 |
-| Assert.cs:127:24:127:38 | [false] ... \|\| ... | Assert.cs:86:24:86:27 | [b (line 84): true] null |
-| Assert.cs:127:24:127:38 | [false] ... \|\| ... | Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert |
-| Assert.cs:127:24:127:38 | [false] ... \|\| ... | Assert.cs:90:17:90:20 | [b (line 84): true] null |
-| Assert.cs:127:24:127:38 | [false] ... \|\| ... | Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull |
-| Assert.cs:127:24:127:38 | [false] ... \|\| ... | Assert.cs:94:17:94:20 | [b (line 84): true] null |
-| Assert.cs:127:24:127:38 | [false] ... \|\| ... | Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull |
-| Assert.cs:127:24:127:38 | [false] ... \|\| ... | Assert.cs:98:17:98:20 | [b (line 84): true] null |
-| Assert.cs:127:24:127:38 | [false] ... \|\| ... | Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:127:24:127:38 | [false] ... \|\| ... | Assert.cs:102:17:102:20 | [b (line 84): true] null |
-| Assert.cs:127:24:127:38 | [false] ... \|\| ... | Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:127:24:127:38 | [false] ... \|\| ... | Assert.cs:106:17:106:20 | [b (line 84): true] null |
-| Assert.cs:127:24:127:38 | [false] ... \|\| ... | Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:127:24:127:38 | [false] ... \|\| ... | Assert.cs:110:17:110:20 | [b (line 84): true] null |
-| Assert.cs:127:24:127:38 | [false] ... \|\| ... | Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:127:24:127:38 | [false] ... \|\| ... | Assert.cs:114:17:114:20 | [b (line 84): true] null |
-| Assert.cs:127:24:127:38 | [false] ... \|\| ... | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:127:24:127:38 | [false] ... \|\| ... | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:127:24:127:38 | [false] ... \|\| ... | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:127:24:127:38 | [false] ... \|\| ... | Assert.cs:118:17:118:20 | [b (line 84): true] null |
-| Assert.cs:127:24:127:38 | [false] ... \|\| ... | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:127:24:127:38 | [false] ... \|\| ... | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... |
-| Assert.cs:127:24:127:38 | [false] ... \|\| ... | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... |
-| Assert.cs:127:24:127:38 | [false] ... \|\| ... | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:127:24:127:38 | [false] ... \|\| ... | Assert.cs:122:17:122:20 | [b (line 84): true] null |
-| Assert.cs:127:24:127:38 | [false] ... \|\| ... | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:127:24:127:38 | [false] ... \|\| ... | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:127:24:127:38 | [false] ... \|\| ... | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:127:24:127:38 | [false] ... \|\| ... | Assert.cs:126:17:126:20 | [b (line 84): true] null |
-| Assert.cs:127:24:127:38 | [false] ... \|\| ... | Assert.cs:127:24:127:38 | [false] ... \|\| ... |
-| Assert.cs:127:24:127:38 | [false] ... \|\| ... | Assert.cs:127:37:127:38 | [false] !... |
-| Assert.cs:127:24:127:38 | [false] ... \|\| ... | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:127:24:127:38 | [true] ... \|\| ... | Assert.cs:127:24:127:38 | [true] ... \|\| ... |
-| Assert.cs:127:37:127:38 | [false] !... | Assert.cs:84:10:84:12 | enter M12 |
-| Assert.cs:127:37:127:38 | [false] !... | Assert.cs:86:24:86:27 | [b (line 84): true] null |
-| Assert.cs:127:37:127:38 | [false] !... | Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert |
-| Assert.cs:127:37:127:38 | [false] !... | Assert.cs:90:17:90:20 | [b (line 84): true] null |
-| Assert.cs:127:37:127:38 | [false] !... | Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull |
-| Assert.cs:127:37:127:38 | [false] !... | Assert.cs:94:17:94:20 | [b (line 84): true] null |
-| Assert.cs:127:37:127:38 | [false] !... | Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull |
-| Assert.cs:127:37:127:38 | [false] !... | Assert.cs:98:17:98:20 | [b (line 84): true] null |
-| Assert.cs:127:37:127:38 | [false] !... | Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:127:37:127:38 | [false] !... | Assert.cs:102:17:102:20 | [b (line 84): true] null |
-| Assert.cs:127:37:127:38 | [false] !... | Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:127:37:127:38 | [false] !... | Assert.cs:106:17:106:20 | [b (line 84): true] null |
-| Assert.cs:127:37:127:38 | [false] !... | Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:127:37:127:38 | [false] !... | Assert.cs:110:17:110:20 | [b (line 84): true] null |
-| Assert.cs:127:37:127:38 | [false] !... | Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:127:37:127:38 | [false] !... | Assert.cs:114:17:114:20 | [b (line 84): true] null |
-| Assert.cs:127:37:127:38 | [false] !... | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:127:37:127:38 | [false] !... | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:127:37:127:38 | [false] !... | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:127:37:127:38 | [false] !... | Assert.cs:118:17:118:20 | [b (line 84): true] null |
-| Assert.cs:127:37:127:38 | [false] !... | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:127:37:127:38 | [false] !... | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... |
-| Assert.cs:127:37:127:38 | [false] !... | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... |
-| Assert.cs:127:37:127:38 | [false] !... | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:127:37:127:38 | [false] !... | Assert.cs:122:17:122:20 | [b (line 84): true] null |
-| Assert.cs:127:37:127:38 | [false] !... | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:127:37:127:38 | [false] !... | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:127:37:127:38 | [false] !... | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:127:37:127:38 | [false] !... | Assert.cs:126:17:126:20 | [b (line 84): true] null |
-| Assert.cs:127:37:127:38 | [false] !... | Assert.cs:127:37:127:38 | [false] !... |
-| Assert.cs:127:37:127:38 | [false] !... | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | Assert.cs:84:10:84:12 | enter M12 |
-| Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | Assert.cs:86:24:86:27 | [b (line 84): true] null |
-| Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert |
-| Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | Assert.cs:90:17:90:20 | [b (line 84): true] null |
-| Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull |
-| Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | Assert.cs:94:17:94:20 | [b (line 84): true] null |
-| Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull |
-| Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | Assert.cs:98:17:98:20 | [b (line 84): true] null |
-| Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | Assert.cs:102:17:102:20 | [b (line 84): true] null |
-| Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | Assert.cs:106:17:106:20 | [b (line 84): true] null |
-| Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | Assert.cs:110:17:110:20 | [b (line 84): true] null |
-| Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | Assert.cs:114:17:114:20 | [b (line 84): true] null |
-| Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | Assert.cs:118:17:118:20 | [b (line 84): true] null |
-| Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse |
-| Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... |
-| Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... |
-| Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b |
-| Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | Assert.cs:122:17:122:20 | [b (line 84): true] null |
-| Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue |
-| Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... |
-| Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b |
-| Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | Assert.cs:126:17:126:20 | [b (line 84): true] null |
-| Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:84:10:84:12 | enter M12 |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:86:20:86:32 | ... ? ... : ... |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:86:24:86:27 | null |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:86:31:86:32 | "" |
+| Assert.cs:86:24:86:27 | null | Assert.cs:86:24:86:27 | null |
+| Assert.cs:86:31:86:32 | "" | Assert.cs:86:31:86:32 | "" |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:84:10:84:12 | enter M12 |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:86:20:86:32 | ... ? ... : ... |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:86:24:86:27 | null |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:86:31:86:32 | "" |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:88:9:88:36 | ...; |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:84:10:84:12 | enter M12 |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:86:20:86:32 | ... ? ... : ... |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:86:24:86:27 | null |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:86:31:86:32 | "" |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:88:9:88:36 | ...; |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:90:13:90:25 | ... ? ... : ... |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:90:17:90:20 | null |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:90:24:90:25 | "" |
+| Assert.cs:90:17:90:20 | null | Assert.cs:90:17:90:20 | null |
+| Assert.cs:90:24:90:25 | "" | Assert.cs:90:24:90:25 | "" |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:84:10:84:12 | enter M12 |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:86:20:86:32 | ... ? ... : ... |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:86:24:86:27 | null |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:86:31:86:32 | "" |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:88:9:88:36 | ...; |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:90:13:90:25 | ... ? ... : ... |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:90:17:90:20 | null |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:90:24:90:25 | "" |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:92:9:92:36 | ...; |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:84:10:84:12 | enter M12 |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:86:20:86:32 | ... ? ... : ... |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:86:24:86:27 | null |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:86:31:86:32 | "" |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:88:9:88:36 | ...; |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:90:13:90:25 | ... ? ... : ... |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:90:17:90:20 | null |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:90:24:90:25 | "" |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:92:9:92:36 | ...; |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:94:13:94:25 | ... ? ... : ... |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:94:17:94:20 | null |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:94:24:94:25 | "" |
+| Assert.cs:94:17:94:20 | null | Assert.cs:94:17:94:20 | null |
+| Assert.cs:94:24:94:25 | "" | Assert.cs:94:24:94:25 | "" |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:84:10:84:12 | enter M12 |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:86:20:86:32 | ... ? ... : ... |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:86:24:86:27 | null |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:86:31:86:32 | "" |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:88:9:88:36 | ...; |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:90:13:90:25 | ... ? ... : ... |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:90:17:90:20 | null |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:90:24:90:25 | "" |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:92:9:92:36 | ...; |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:94:13:94:25 | ... ? ... : ... |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:94:17:94:20 | null |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:94:24:94:25 | "" |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:96:9:96:36 | ...; |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:84:10:84:12 | enter M12 |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:86:20:86:32 | ... ? ... : ... |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:86:24:86:27 | null |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:86:31:86:32 | "" |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:88:9:88:36 | ...; |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:90:13:90:25 | ... ? ... : ... |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:90:17:90:20 | null |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:90:24:90:25 | "" |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:92:9:92:36 | ...; |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:94:13:94:25 | ... ? ... : ... |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:94:17:94:20 | null |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:94:24:94:25 | "" |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:96:9:96:36 | ...; |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:98:13:98:25 | ... ? ... : ... |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:98:17:98:20 | null |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:98:24:98:25 | "" |
+| Assert.cs:98:17:98:20 | null | Assert.cs:98:17:98:20 | null |
+| Assert.cs:98:24:98:25 | "" | Assert.cs:98:24:98:25 | "" |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:84:10:84:12 | enter M12 |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:86:20:86:32 | ... ? ... : ... |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:86:24:86:27 | null |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:86:31:86:32 | "" |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:88:9:88:36 | ...; |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:90:13:90:25 | ... ? ... : ... |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:90:17:90:20 | null |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:90:24:90:25 | "" |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:92:9:92:36 | ...; |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:94:13:94:25 | ... ? ... : ... |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:94:17:94:20 | null |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:94:24:94:25 | "" |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:96:9:96:36 | ...; |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:98:13:98:25 | ... ? ... : ... |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:98:17:98:20 | null |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:98:24:98:25 | "" |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:100:9:100:36 | ...; |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:84:10:84:12 | enter M12 |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:86:20:86:32 | ... ? ... : ... |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:86:24:86:27 | null |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:86:31:86:32 | "" |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:88:9:88:36 | ...; |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:90:13:90:25 | ... ? ... : ... |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:90:17:90:20 | null |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:90:24:90:25 | "" |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:92:9:92:36 | ...; |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:94:13:94:25 | ... ? ... : ... |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:94:17:94:20 | null |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:94:24:94:25 | "" |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:96:9:96:36 | ...; |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:98:13:98:25 | ... ? ... : ... |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:98:17:98:20 | null |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:98:24:98:25 | "" |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:100:9:100:36 | ...; |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:102:13:102:25 | ... ? ... : ... |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:102:17:102:20 | null |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:102:24:102:25 | "" |
+| Assert.cs:102:17:102:20 | null | Assert.cs:102:17:102:20 | null |
+| Assert.cs:102:24:102:25 | "" | Assert.cs:102:24:102:25 | "" |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:84:10:84:12 | enter M12 |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:86:20:86:32 | ... ? ... : ... |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:86:24:86:27 | null |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:86:31:86:32 | "" |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:88:9:88:36 | ...; |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:90:13:90:25 | ... ? ... : ... |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:90:17:90:20 | null |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:90:24:90:25 | "" |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:92:9:92:36 | ...; |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:94:13:94:25 | ... ? ... : ... |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:94:17:94:20 | null |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:94:24:94:25 | "" |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:96:9:96:36 | ...; |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:98:13:98:25 | ... ? ... : ... |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:98:17:98:20 | null |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:98:24:98:25 | "" |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:100:9:100:36 | ...; |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:102:13:102:25 | ... ? ... : ... |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:102:17:102:20 | null |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:102:24:102:25 | "" |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:104:9:104:36 | ...; |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:84:10:84:12 | enter M12 |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:86:20:86:32 | ... ? ... : ... |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:86:24:86:27 | null |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:86:31:86:32 | "" |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:88:9:88:36 | ...; |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:90:13:90:25 | ... ? ... : ... |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:90:17:90:20 | null |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:90:24:90:25 | "" |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:92:9:92:36 | ...; |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:94:13:94:25 | ... ? ... : ... |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:94:17:94:20 | null |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:94:24:94:25 | "" |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:96:9:96:36 | ...; |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:98:13:98:25 | ... ? ... : ... |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:98:17:98:20 | null |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:98:24:98:25 | "" |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:100:9:100:36 | ...; |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:102:13:102:25 | ... ? ... : ... |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:102:17:102:20 | null |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:102:24:102:25 | "" |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:104:9:104:36 | ...; |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:106:13:106:25 | ... ? ... : ... |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:106:17:106:20 | null |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:106:24:106:25 | "" |
+| Assert.cs:106:17:106:20 | null | Assert.cs:106:17:106:20 | null |
+| Assert.cs:106:24:106:25 | "" | Assert.cs:106:24:106:25 | "" |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:84:10:84:12 | enter M12 |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:86:20:86:32 | ... ? ... : ... |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:86:24:86:27 | null |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:86:31:86:32 | "" |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:88:9:88:36 | ...; |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:90:13:90:25 | ... ? ... : ... |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:90:17:90:20 | null |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:90:24:90:25 | "" |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:92:9:92:36 | ...; |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:94:13:94:25 | ... ? ... : ... |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:94:17:94:20 | null |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:94:24:94:25 | "" |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:96:9:96:36 | ...; |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:98:13:98:25 | ... ? ... : ... |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:98:17:98:20 | null |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:98:24:98:25 | "" |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:100:9:100:36 | ...; |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:102:13:102:25 | ... ? ... : ... |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:102:17:102:20 | null |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:102:24:102:25 | "" |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:104:9:104:36 | ...; |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:106:13:106:25 | ... ? ... : ... |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:106:17:106:20 | null |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:106:24:106:25 | "" |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:108:9:108:36 | ...; |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:84:10:84:12 | enter M12 |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:86:20:86:32 | ... ? ... : ... |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:86:24:86:27 | null |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:86:31:86:32 | "" |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:88:9:88:36 | ...; |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:90:13:90:25 | ... ? ... : ... |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:90:17:90:20 | null |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:90:24:90:25 | "" |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:92:9:92:36 | ...; |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:94:13:94:25 | ... ? ... : ... |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:94:17:94:20 | null |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:94:24:94:25 | "" |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:96:9:96:36 | ...; |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:98:13:98:25 | ... ? ... : ... |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:98:17:98:20 | null |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:98:24:98:25 | "" |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:100:9:100:36 | ...; |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:102:13:102:25 | ... ? ... : ... |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:102:17:102:20 | null |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:102:24:102:25 | "" |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:104:9:104:36 | ...; |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:106:13:106:25 | ... ? ... : ... |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:106:17:106:20 | null |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:106:24:106:25 | "" |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:108:9:108:36 | ...; |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:110:13:110:25 | ... ? ... : ... |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:110:17:110:20 | null |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:110:24:110:25 | "" |
+| Assert.cs:110:17:110:20 | null | Assert.cs:110:17:110:20 | null |
+| Assert.cs:110:24:110:25 | "" | Assert.cs:110:24:110:25 | "" |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:84:10:84:12 | enter M12 |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:86:20:86:32 | ... ? ... : ... |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:86:24:86:27 | null |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:86:31:86:32 | "" |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:88:9:88:36 | ...; |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:90:13:90:25 | ... ? ... : ... |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:90:17:90:20 | null |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:90:24:90:25 | "" |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:92:9:92:36 | ...; |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:94:13:94:25 | ... ? ... : ... |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:94:17:94:20 | null |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:94:24:94:25 | "" |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:96:9:96:36 | ...; |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:98:13:98:25 | ... ? ... : ... |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:98:17:98:20 | null |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:98:24:98:25 | "" |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:100:9:100:36 | ...; |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:102:13:102:25 | ... ? ... : ... |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:102:17:102:20 | null |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:102:24:102:25 | "" |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:104:9:104:36 | ...; |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:106:13:106:25 | ... ? ... : ... |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:106:17:106:20 | null |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:106:24:106:25 | "" |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:108:9:108:36 | ...; |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:110:13:110:25 | ... ? ... : ... |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:110:17:110:20 | null |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:110:24:110:25 | "" |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:112:9:112:36 | ...; |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:84:10:84:12 | enter M12 |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:86:20:86:32 | ... ? ... : ... |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:86:24:86:27 | null |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:86:31:86:32 | "" |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:88:9:88:36 | ...; |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:90:13:90:25 | ... ? ... : ... |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:90:17:90:20 | null |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:90:24:90:25 | "" |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:92:9:92:36 | ...; |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:94:13:94:25 | ... ? ... : ... |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:94:17:94:20 | null |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:94:24:94:25 | "" |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:96:9:96:36 | ...; |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:98:13:98:25 | ... ? ... : ... |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:98:17:98:20 | null |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:98:24:98:25 | "" |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:100:9:100:36 | ...; |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:102:13:102:25 | ... ? ... : ... |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:102:17:102:20 | null |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:102:24:102:25 | "" |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:104:9:104:36 | ...; |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:106:13:106:25 | ... ? ... : ... |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:106:17:106:20 | null |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:106:24:106:25 | "" |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:108:9:108:36 | ...; |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:110:13:110:25 | ... ? ... : ... |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:110:17:110:20 | null |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:110:24:110:25 | "" |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:112:9:112:36 | ...; |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:114:13:114:25 | ... ? ... : ... |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:114:17:114:20 | null |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:114:24:114:25 | "" |
+| Assert.cs:114:17:114:20 | null | Assert.cs:114:17:114:20 | null |
+| Assert.cs:114:24:114:25 | "" | Assert.cs:114:24:114:25 | "" |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:84:10:84:12 | enter M12 |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:86:20:86:32 | ... ? ... : ... |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:86:24:86:27 | null |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:86:31:86:32 | "" |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:88:9:88:36 | ...; |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:90:13:90:25 | ... ? ... : ... |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:90:17:90:20 | null |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:90:24:90:25 | "" |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:92:9:92:36 | ...; |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:94:13:94:25 | ... ? ... : ... |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:94:17:94:20 | null |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:94:24:94:25 | "" |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:96:9:96:36 | ...; |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:98:13:98:25 | ... ? ... : ... |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:98:17:98:20 | null |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:98:24:98:25 | "" |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:100:9:100:36 | ...; |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:102:13:102:25 | ... ? ... : ... |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:102:17:102:20 | null |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:102:24:102:25 | "" |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:104:9:104:36 | ...; |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:106:13:106:25 | ... ? ... : ... |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:106:17:106:20 | null |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:106:24:106:25 | "" |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:108:9:108:36 | ...; |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:110:13:110:25 | ... ? ... : ... |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:110:17:110:20 | null |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:110:24:110:25 | "" |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:112:9:112:36 | ...; |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:114:13:114:25 | ... ? ... : ... |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:114:17:114:20 | null |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:114:24:114:25 | "" |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:115:23:115:36 | ... && ... |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:115:36:115:36 | access to parameter b |
+| Assert.cs:115:36:115:36 | access to parameter b | Assert.cs:115:36:115:36 | access to parameter b |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:84:10:84:12 | enter M12 |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:86:20:86:32 | ... ? ... : ... |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:86:24:86:27 | null |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:86:31:86:32 | "" |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:88:9:88:36 | ...; |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:90:13:90:25 | ... ? ... : ... |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:90:17:90:20 | null |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:90:24:90:25 | "" |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:92:9:92:36 | ...; |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:94:13:94:25 | ... ? ... : ... |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:94:17:94:20 | null |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:94:24:94:25 | "" |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:96:9:96:36 | ...; |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:98:13:98:25 | ... ? ... : ... |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:98:17:98:20 | null |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:98:24:98:25 | "" |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:100:9:100:36 | ...; |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:102:13:102:25 | ... ? ... : ... |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:102:17:102:20 | null |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:102:24:102:25 | "" |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:104:9:104:36 | ...; |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:106:13:106:25 | ... ? ... : ... |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:106:17:106:20 | null |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:106:24:106:25 | "" |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:108:9:108:36 | ...; |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:110:13:110:25 | ... ? ... : ... |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:110:17:110:20 | null |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:110:24:110:25 | "" |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:112:9:112:36 | ...; |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:114:13:114:25 | ... ? ... : ... |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:114:17:114:20 | null |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:114:24:114:25 | "" |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:115:23:115:36 | ... && ... |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:115:36:115:36 | access to parameter b |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:116:9:116:36 | ...; |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:84:10:84:12 | enter M12 |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:86:20:86:32 | ... ? ... : ... |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:86:24:86:27 | null |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:86:31:86:32 | "" |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:88:9:88:36 | ...; |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:90:13:90:25 | ... ? ... : ... |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:90:17:90:20 | null |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:90:24:90:25 | "" |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:92:9:92:36 | ...; |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:94:13:94:25 | ... ? ... : ... |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:94:17:94:20 | null |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:94:24:94:25 | "" |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:96:9:96:36 | ...; |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:98:13:98:25 | ... ? ... : ... |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:98:17:98:20 | null |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:98:24:98:25 | "" |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:100:9:100:36 | ...; |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:102:13:102:25 | ... ? ... : ... |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:102:17:102:20 | null |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:102:24:102:25 | "" |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:104:9:104:36 | ...; |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:106:13:106:25 | ... ? ... : ... |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:106:17:106:20 | null |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:106:24:106:25 | "" |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:108:9:108:36 | ...; |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:110:13:110:25 | ... ? ... : ... |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:110:17:110:20 | null |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:110:24:110:25 | "" |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:112:9:112:36 | ...; |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:114:13:114:25 | ... ? ... : ... |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:114:17:114:20 | null |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:114:24:114:25 | "" |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:115:23:115:36 | ... && ... |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:115:36:115:36 | access to parameter b |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:116:9:116:36 | ...; |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:118:13:118:25 | ... ? ... : ... |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:118:17:118:20 | null |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:118:24:118:25 | "" |
+| Assert.cs:118:17:118:20 | null | Assert.cs:118:17:118:20 | null |
+| Assert.cs:118:24:118:25 | "" | Assert.cs:118:24:118:25 | "" |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:84:10:84:12 | enter M12 |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:86:20:86:32 | ... ? ... : ... |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:86:24:86:27 | null |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:86:31:86:32 | "" |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:88:9:88:36 | ...; |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:90:13:90:25 | ... ? ... : ... |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:90:17:90:20 | null |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:90:24:90:25 | "" |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:92:9:92:36 | ...; |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:94:13:94:25 | ... ? ... : ... |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:94:17:94:20 | null |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:94:24:94:25 | "" |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:96:9:96:36 | ...; |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:98:13:98:25 | ... ? ... : ... |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:98:17:98:20 | null |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:98:24:98:25 | "" |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:100:9:100:36 | ...; |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:102:13:102:25 | ... ? ... : ... |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:102:17:102:20 | null |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:102:24:102:25 | "" |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:104:9:104:36 | ...; |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:106:13:106:25 | ... ? ... : ... |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:106:17:106:20 | null |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:106:24:106:25 | "" |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:108:9:108:36 | ...; |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:110:13:110:25 | ... ? ... : ... |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:110:17:110:20 | null |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:110:24:110:25 | "" |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:112:9:112:36 | ...; |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:114:13:114:25 | ... ? ... : ... |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:114:17:114:20 | null |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:114:24:114:25 | "" |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:115:23:115:36 | ... && ... |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:115:36:115:36 | access to parameter b |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:116:9:116:36 | ...; |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:118:13:118:25 | ... ? ... : ... |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:118:17:118:20 | null |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:118:24:118:25 | "" |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:119:24:119:38 | ... \|\| ... |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:119:38:119:38 | access to parameter b |
+| Assert.cs:119:38:119:38 | access to parameter b | Assert.cs:119:38:119:38 | access to parameter b |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:84:10:84:12 | enter M12 |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:86:20:86:32 | ... ? ... : ... |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:86:24:86:27 | null |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:86:31:86:32 | "" |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:88:9:88:36 | ...; |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:90:13:90:25 | ... ? ... : ... |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:90:17:90:20 | null |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:90:24:90:25 | "" |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:92:9:92:36 | ...; |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:94:13:94:25 | ... ? ... : ... |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:94:17:94:20 | null |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:94:24:94:25 | "" |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:96:9:96:36 | ...; |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:98:13:98:25 | ... ? ... : ... |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:98:17:98:20 | null |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:98:24:98:25 | "" |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:100:9:100:36 | ...; |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:102:13:102:25 | ... ? ... : ... |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:102:17:102:20 | null |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:102:24:102:25 | "" |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:104:9:104:36 | ...; |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:106:13:106:25 | ... ? ... : ... |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:106:17:106:20 | null |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:106:24:106:25 | "" |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:108:9:108:36 | ...; |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:110:13:110:25 | ... ? ... : ... |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:110:17:110:20 | null |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:110:24:110:25 | "" |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:112:9:112:36 | ...; |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:114:13:114:25 | ... ? ... : ... |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:114:17:114:20 | null |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:114:24:114:25 | "" |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:115:23:115:36 | ... && ... |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:115:36:115:36 | access to parameter b |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:116:9:116:36 | ...; |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:118:13:118:25 | ... ? ... : ... |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:118:17:118:20 | null |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:118:24:118:25 | "" |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:119:24:119:38 | ... \|\| ... |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:119:38:119:38 | access to parameter b |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:120:9:120:36 | ...; |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:84:10:84:12 | enter M12 |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:86:20:86:32 | ... ? ... : ... |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:86:24:86:27 | null |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:86:31:86:32 | "" |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:88:9:88:36 | ...; |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:90:13:90:25 | ... ? ... : ... |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:90:17:90:20 | null |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:90:24:90:25 | "" |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:92:9:92:36 | ...; |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:94:13:94:25 | ... ? ... : ... |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:94:17:94:20 | null |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:94:24:94:25 | "" |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:96:9:96:36 | ...; |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:98:13:98:25 | ... ? ... : ... |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:98:17:98:20 | null |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:98:24:98:25 | "" |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:100:9:100:36 | ...; |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:102:13:102:25 | ... ? ... : ... |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:102:17:102:20 | null |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:102:24:102:25 | "" |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:104:9:104:36 | ...; |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:106:13:106:25 | ... ? ... : ... |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:106:17:106:20 | null |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:106:24:106:25 | "" |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:108:9:108:36 | ...; |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:110:13:110:25 | ... ? ... : ... |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:110:17:110:20 | null |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:110:24:110:25 | "" |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:112:9:112:36 | ...; |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:114:13:114:25 | ... ? ... : ... |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:114:17:114:20 | null |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:114:24:114:25 | "" |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:115:23:115:36 | ... && ... |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:115:36:115:36 | access to parameter b |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:116:9:116:36 | ...; |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:118:13:118:25 | ... ? ... : ... |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:118:17:118:20 | null |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:118:24:118:25 | "" |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:119:24:119:38 | ... \|\| ... |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:119:38:119:38 | access to parameter b |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:120:9:120:36 | ...; |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:122:13:122:25 | ... ? ... : ... |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:122:17:122:20 | null |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:122:24:122:25 | "" |
+| Assert.cs:122:17:122:20 | null | Assert.cs:122:17:122:20 | null |
+| Assert.cs:122:24:122:25 | "" | Assert.cs:122:24:122:25 | "" |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:84:10:84:12 | enter M12 |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:86:20:86:32 | ... ? ... : ... |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:86:24:86:27 | null |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:86:31:86:32 | "" |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:88:9:88:36 | ...; |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:90:13:90:25 | ... ? ... : ... |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:90:17:90:20 | null |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:90:24:90:25 | "" |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:92:9:92:36 | ...; |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:94:13:94:25 | ... ? ... : ... |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:94:17:94:20 | null |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:94:24:94:25 | "" |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:96:9:96:36 | ...; |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:98:13:98:25 | ... ? ... : ... |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:98:17:98:20 | null |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:98:24:98:25 | "" |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:100:9:100:36 | ...; |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:102:13:102:25 | ... ? ... : ... |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:102:17:102:20 | null |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:102:24:102:25 | "" |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:104:9:104:36 | ...; |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:106:13:106:25 | ... ? ... : ... |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:106:17:106:20 | null |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:106:24:106:25 | "" |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:108:9:108:36 | ...; |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:110:13:110:25 | ... ? ... : ... |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:110:17:110:20 | null |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:110:24:110:25 | "" |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:112:9:112:36 | ...; |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:114:13:114:25 | ... ? ... : ... |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:114:17:114:20 | null |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:114:24:114:25 | "" |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:115:23:115:36 | ... && ... |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:115:36:115:36 | access to parameter b |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:116:9:116:36 | ...; |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:118:13:118:25 | ... ? ... : ... |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:118:17:118:20 | null |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:118:24:118:25 | "" |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:119:24:119:38 | ... \|\| ... |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:119:38:119:38 | access to parameter b |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:120:9:120:36 | ...; |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:122:13:122:25 | ... ? ... : ... |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:122:17:122:20 | null |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:122:24:122:25 | "" |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:123:23:123:36 | ... && ... |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:123:36:123:36 | access to parameter b |
+| Assert.cs:123:36:123:36 | access to parameter b | Assert.cs:123:36:123:36 | access to parameter b |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:84:10:84:12 | enter M12 |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:86:20:86:32 | ... ? ... : ... |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:86:24:86:27 | null |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:86:31:86:32 | "" |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:88:9:88:36 | ...; |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:90:13:90:25 | ... ? ... : ... |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:90:17:90:20 | null |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:90:24:90:25 | "" |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:92:9:92:36 | ...; |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:94:13:94:25 | ... ? ... : ... |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:94:17:94:20 | null |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:94:24:94:25 | "" |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:96:9:96:36 | ...; |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:98:13:98:25 | ... ? ... : ... |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:98:17:98:20 | null |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:98:24:98:25 | "" |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:100:9:100:36 | ...; |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:102:13:102:25 | ... ? ... : ... |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:102:17:102:20 | null |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:102:24:102:25 | "" |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:104:9:104:36 | ...; |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:106:13:106:25 | ... ? ... : ... |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:106:17:106:20 | null |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:106:24:106:25 | "" |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:108:9:108:36 | ...; |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:110:13:110:25 | ... ? ... : ... |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:110:17:110:20 | null |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:110:24:110:25 | "" |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:112:9:112:36 | ...; |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:114:13:114:25 | ... ? ... : ... |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:114:17:114:20 | null |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:114:24:114:25 | "" |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:115:23:115:36 | ... && ... |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:115:36:115:36 | access to parameter b |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:116:9:116:36 | ...; |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:118:13:118:25 | ... ? ... : ... |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:118:17:118:20 | null |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:118:24:118:25 | "" |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:119:24:119:38 | ... \|\| ... |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:119:38:119:38 | access to parameter b |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:120:9:120:36 | ...; |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:122:13:122:25 | ... ? ... : ... |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:122:17:122:20 | null |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:122:24:122:25 | "" |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:123:23:123:36 | ... && ... |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:123:36:123:36 | access to parameter b |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:124:9:124:36 | ...; |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:84:10:84:12 | enter M12 |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:86:20:86:32 | ... ? ... : ... |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:86:24:86:27 | null |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:86:31:86:32 | "" |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:88:9:88:36 | ...; |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:90:13:90:25 | ... ? ... : ... |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:90:17:90:20 | null |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:90:24:90:25 | "" |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:92:9:92:36 | ...; |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:94:13:94:25 | ... ? ... : ... |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:94:17:94:20 | null |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:94:24:94:25 | "" |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:96:9:96:36 | ...; |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:98:13:98:25 | ... ? ... : ... |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:98:17:98:20 | null |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:98:24:98:25 | "" |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:100:9:100:36 | ...; |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:102:13:102:25 | ... ? ... : ... |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:102:17:102:20 | null |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:102:24:102:25 | "" |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:104:9:104:36 | ...; |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:106:13:106:25 | ... ? ... : ... |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:106:17:106:20 | null |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:106:24:106:25 | "" |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:108:9:108:36 | ...; |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:110:13:110:25 | ... ? ... : ... |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:110:17:110:20 | null |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:110:24:110:25 | "" |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:112:9:112:36 | ...; |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:114:13:114:25 | ... ? ... : ... |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:114:17:114:20 | null |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:114:24:114:25 | "" |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:115:23:115:36 | ... && ... |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:115:36:115:36 | access to parameter b |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:116:9:116:36 | ...; |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:118:13:118:25 | ... ? ... : ... |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:118:17:118:20 | null |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:118:24:118:25 | "" |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:119:24:119:38 | ... \|\| ... |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:119:38:119:38 | access to parameter b |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:120:9:120:36 | ...; |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:122:13:122:25 | ... ? ... : ... |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:122:17:122:20 | null |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:122:24:122:25 | "" |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:123:23:123:36 | ... && ... |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:123:36:123:36 | access to parameter b |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:124:9:124:36 | ...; |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:126:13:126:25 | ... ? ... : ... |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:126:17:126:20 | null |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:126:24:126:25 | "" |
+| Assert.cs:126:17:126:20 | null | Assert.cs:126:17:126:20 | null |
+| Assert.cs:126:24:126:25 | "" | Assert.cs:126:24:126:25 | "" |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:84:10:84:12 | enter M12 |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:86:20:86:32 | ... ? ... : ... |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:86:24:86:27 | null |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:86:31:86:32 | "" |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:88:9:88:36 | ...; |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:90:13:90:25 | ... ? ... : ... |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:90:17:90:20 | null |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:90:24:90:25 | "" |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:92:9:92:36 | ...; |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:94:13:94:25 | ... ? ... : ... |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:94:17:94:20 | null |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:94:24:94:25 | "" |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:96:9:96:36 | ...; |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:98:13:98:25 | ... ? ... : ... |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:98:17:98:20 | null |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:98:24:98:25 | "" |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:100:9:100:36 | ...; |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:102:13:102:25 | ... ? ... : ... |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:102:17:102:20 | null |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:102:24:102:25 | "" |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:104:9:104:36 | ...; |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:106:13:106:25 | ... ? ... : ... |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:106:17:106:20 | null |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:106:24:106:25 | "" |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:108:9:108:36 | ...; |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:110:13:110:25 | ... ? ... : ... |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:110:17:110:20 | null |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:110:24:110:25 | "" |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:112:9:112:36 | ...; |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:114:13:114:25 | ... ? ... : ... |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:114:17:114:20 | null |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:114:24:114:25 | "" |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:115:23:115:36 | ... && ... |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:115:36:115:36 | access to parameter b |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:116:9:116:36 | ...; |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:118:13:118:25 | ... ? ... : ... |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:118:17:118:20 | null |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:118:24:118:25 | "" |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:119:24:119:38 | ... \|\| ... |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:119:38:119:38 | access to parameter b |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:120:9:120:36 | ...; |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:122:13:122:25 | ... ? ... : ... |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:122:17:122:20 | null |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:122:24:122:25 | "" |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:123:23:123:36 | ... && ... |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:123:36:123:36 | access to parameter b |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:124:9:124:36 | ...; |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:126:13:126:25 | ... ? ... : ... |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:126:17:126:20 | null |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:126:24:126:25 | "" |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:127:24:127:38 | ... \|\| ... |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:127:38:127:38 | access to parameter b |
+| Assert.cs:127:38:127:38 | access to parameter b | Assert.cs:127:38:127:38 | access to parameter b |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:84:10:84:12 | enter M12 |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:86:20:86:32 | ... ? ... : ... |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:86:24:86:27 | null |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:86:31:86:32 | "" |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:88:9:88:36 | ...; |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:90:13:90:25 | ... ? ... : ... |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:90:17:90:20 | null |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:90:24:90:25 | "" |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:92:9:92:36 | ...; |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:94:13:94:25 | ... ? ... : ... |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:94:17:94:20 | null |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:94:24:94:25 | "" |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:96:9:96:36 | ...; |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:98:13:98:25 | ... ? ... : ... |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:98:17:98:20 | null |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:98:24:98:25 | "" |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:100:9:100:36 | ...; |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:102:13:102:25 | ... ? ... : ... |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:102:17:102:20 | null |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:102:24:102:25 | "" |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:104:9:104:36 | ...; |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:106:13:106:25 | ... ? ... : ... |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:106:17:106:20 | null |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:106:24:106:25 | "" |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:108:9:108:36 | ...; |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:110:13:110:25 | ... ? ... : ... |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:110:17:110:20 | null |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:110:24:110:25 | "" |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:112:9:112:36 | ...; |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:114:13:114:25 | ... ? ... : ... |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:114:17:114:20 | null |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:114:24:114:25 | "" |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:115:23:115:36 | ... && ... |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:115:36:115:36 | access to parameter b |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:116:9:116:36 | ...; |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:118:13:118:25 | ... ? ... : ... |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:118:17:118:20 | null |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:118:24:118:25 | "" |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:119:24:119:38 | ... \|\| ... |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:119:38:119:38 | access to parameter b |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:120:9:120:36 | ...; |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:122:13:122:25 | ... ? ... : ... |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:122:17:122:20 | null |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:122:24:122:25 | "" |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:123:23:123:36 | ... && ... |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:123:36:123:36 | access to parameter b |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:124:9:124:36 | ...; |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:126:13:126:25 | ... ? ... : ... |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:126:17:126:20 | null |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:126:24:126:25 | "" |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:127:24:127:38 | ... \|\| ... |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:127:38:127:38 | access to parameter b |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:128:9:128:36 | ...; |
 | Assert.cs:131:18:131:32 | enter AssertTrueFalse | Assert.cs:131:18:131:32 | enter AssertTrueFalse |
 | Assert.cs:138:10:138:12 | enter M13 | Assert.cs:138:10:138:12 | enter M13 |
 | Assert.cs:138:10:138:12 | exit M13 | Assert.cs:138:10:138:12 | exit M13 |
 | Assert.cs:138:10:138:12 | exit M13 (abnormal) | Assert.cs:138:10:138:12 | exit M13 (abnormal) |
-| Assert.cs:140:29:140:30 | [assertion failure] access to parameter b2 | Assert.cs:140:29:140:30 | [assertion failure] access to parameter b2 |
-| Assert.cs:140:29:140:30 | access to parameter b2 | Assert.cs:138:10:138:12 | enter M13 |
-| Assert.cs:140:29:140:30 | access to parameter b2 | Assert.cs:140:29:140:30 | access to parameter b2 |
-| Assert.cs:140:33:140:34 | [assertion failure] access to parameter b3 | Assert.cs:140:33:140:34 | [assertion failure] access to parameter b3 |
-| Assert.cs:140:33:140:34 | [assertion failure] access to parameter b3 | Assert.cs:140:33:140:34 | [assertion failure] access to parameter b3 |
-| Assert.cs:140:33:140:34 | [assertion success] access to parameter b3 | Assert.cs:138:10:138:12 | enter M13 |
-| Assert.cs:140:33:140:34 | [assertion success] access to parameter b3 | Assert.cs:140:29:140:30 | access to parameter b2 |
-| Assert.cs:140:33:140:34 | [assertion success] access to parameter b3 | Assert.cs:140:33:140:34 | [assertion success] access to parameter b3 |
+| Assert.cs:141:9:141:15 | return ...; | Assert.cs:138:10:138:12 | enter M13 |
+| Assert.cs:141:9:141:15 | return ...; | Assert.cs:141:9:141:15 | return ...; |
 | Assignments.cs:1:7:1:17 | enter Assignments | Assignments.cs:1:7:1:17 | enter Assignments |
 | Assignments.cs:3:10:3:10 | enter M | Assignments.cs:3:10:3:10 | enter M |
 | Assignments.cs:14:18:14:35 | enter (...) => ... | Assignments.cs:14:18:14:35 | enter (...) => ... |
@@ -14152,68 +12307,56 @@ postBlockDominance
 | BreakInTry.cs:20:10:20:11 | enter M2 | BreakInTry.cs:20:10:20:11 | enter M2 |
 | BreakInTry.cs:22:9:34:9 | foreach (... ... in ...) ... | BreakInTry.cs:20:10:20:11 | enter M2 |
 | BreakInTry.cs:22:9:34:9 | foreach (... ... in ...) ... | BreakInTry.cs:22:9:34:9 | foreach (... ... in ...) ... |
-| BreakInTry.cs:22:9:34:9 | foreach (... ... in ...) ... | BreakInTry.cs:30:13:33:13 | {...} |
-| BreakInTry.cs:22:9:34:9 | foreach (... ... in ...) ... | BreakInTry.cs:32:21:32:21 | ; |
 | BreakInTry.cs:22:22:22:24 | String arg | BreakInTry.cs:22:22:22:24 | String arg |
 | BreakInTry.cs:27:21:27:26 | break; | BreakInTry.cs:27:21:27:26 | break; |
+| BreakInTry.cs:30:13:33:13 | {...} | BreakInTry.cs:22:22:22:24 | String arg |
+| BreakInTry.cs:30:13:33:13 | {...} | BreakInTry.cs:27:21:27:26 | break; |
 | BreakInTry.cs:30:13:33:13 | {...} | BreakInTry.cs:30:13:33:13 | {...} |
 | BreakInTry.cs:32:21:32:21 | ; | BreakInTry.cs:32:21:32:21 | ; |
-| BreakInTry.cs:32:21:32:21 | [finally: break] ; | BreakInTry.cs:32:21:32:21 | [finally: break] ; |
 | BreakInTry.cs:35:7:35:7 | ; | BreakInTry.cs:20:10:20:11 | enter M2 |
 | BreakInTry.cs:35:7:35:7 | ; | BreakInTry.cs:22:9:34:9 | foreach (... ... in ...) ... |
 | BreakInTry.cs:35:7:35:7 | ; | BreakInTry.cs:22:22:22:24 | String arg |
 | BreakInTry.cs:35:7:35:7 | ; | BreakInTry.cs:27:21:27:26 | break; |
 | BreakInTry.cs:35:7:35:7 | ; | BreakInTry.cs:30:13:33:13 | {...} |
 | BreakInTry.cs:35:7:35:7 | ; | BreakInTry.cs:32:21:32:21 | ; |
-| BreakInTry.cs:35:7:35:7 | ; | BreakInTry.cs:32:21:32:21 | [finally: break] ; |
 | BreakInTry.cs:35:7:35:7 | ; | BreakInTry.cs:35:7:35:7 | ; |
 | BreakInTry.cs:38:10:38:11 | enter M3 | BreakInTry.cs:38:10:38:11 | enter M3 |
 | BreakInTry.cs:38:10:38:11 | exit M3 (normal) | BreakInTry.cs:38:10:38:11 | enter M3 |
 | BreakInTry.cs:38:10:38:11 | exit M3 (normal) | BreakInTry.cs:38:10:38:11 | exit M3 (normal) |
 | BreakInTry.cs:38:10:38:11 | exit M3 (normal) | BreakInTry.cs:43:17:43:23 | return ...; |
 | BreakInTry.cs:38:10:38:11 | exit M3 (normal) | BreakInTry.cs:46:9:52:9 | {...} |
-| BreakInTry.cs:38:10:38:11 | exit M3 (normal) | BreakInTry.cs:47:13:51:13 | [finally: return] foreach (... ... in ...) ... |
 | BreakInTry.cs:38:10:38:11 | exit M3 (normal) | BreakInTry.cs:47:13:51:13 | foreach (... ... in ...) ... |
 | BreakInTry.cs:38:10:38:11 | exit M3 (normal) | BreakInTry.cs:47:26:47:28 | String arg |
-| BreakInTry.cs:38:10:38:11 | exit M3 (normal) | BreakInTry.cs:47:26:47:28 | [finally: return] String arg |
-| BreakInTry.cs:38:10:38:11 | exit M3 (normal) | BreakInTry.cs:50:21:50:26 | [finally: return] break; |
 | BreakInTry.cs:38:10:38:11 | exit M3 (normal) | BreakInTry.cs:50:21:50:26 | break; |
 | BreakInTry.cs:38:10:38:11 | exit M3 (normal) | BreakInTry.cs:53:7:53:7 | ; |
 | BreakInTry.cs:43:17:43:23 | return ...; | BreakInTry.cs:43:17:43:23 | return ...; |
+| BreakInTry.cs:46:9:52:9 | {...} | BreakInTry.cs:38:10:38:11 | enter M3 |
+| BreakInTry.cs:46:9:52:9 | {...} | BreakInTry.cs:43:17:43:23 | return ...; |
 | BreakInTry.cs:46:9:52:9 | {...} | BreakInTry.cs:46:9:52:9 | {...} |
-| BreakInTry.cs:47:13:51:13 | [finally: return] foreach (... ... in ...) ... | BreakInTry.cs:43:17:43:23 | return ...; |
-| BreakInTry.cs:47:13:51:13 | [finally: return] foreach (... ... in ...) ... | BreakInTry.cs:47:13:51:13 | [finally: return] foreach (... ... in ...) ... |
+| BreakInTry.cs:47:13:51:13 | foreach (... ... in ...) ... | BreakInTry.cs:38:10:38:11 | enter M3 |
+| BreakInTry.cs:47:13:51:13 | foreach (... ... in ...) ... | BreakInTry.cs:43:17:43:23 | return ...; |
 | BreakInTry.cs:47:13:51:13 | foreach (... ... in ...) ... | BreakInTry.cs:46:9:52:9 | {...} |
 | BreakInTry.cs:47:13:51:13 | foreach (... ... in ...) ... | BreakInTry.cs:47:13:51:13 | foreach (... ... in ...) ... |
 | BreakInTry.cs:47:26:47:28 | String arg | BreakInTry.cs:47:26:47:28 | String arg |
-| BreakInTry.cs:47:26:47:28 | [finally: return] String arg | BreakInTry.cs:47:26:47:28 | [finally: return] String arg |
-| BreakInTry.cs:50:21:50:26 | [finally: return] break; | BreakInTry.cs:50:21:50:26 | [finally: return] break; |
 | BreakInTry.cs:50:21:50:26 | break; | BreakInTry.cs:50:21:50:26 | break; |
-| BreakInTry.cs:53:7:53:7 | ; | BreakInTry.cs:46:9:52:9 | {...} |
-| BreakInTry.cs:53:7:53:7 | ; | BreakInTry.cs:47:13:51:13 | foreach (... ... in ...) ... |
-| BreakInTry.cs:53:7:53:7 | ; | BreakInTry.cs:47:26:47:28 | String arg |
-| BreakInTry.cs:53:7:53:7 | ; | BreakInTry.cs:50:21:50:26 | break; |
 | BreakInTry.cs:53:7:53:7 | ; | BreakInTry.cs:53:7:53:7 | ; |
 | BreakInTry.cs:56:10:56:11 | enter M4 | BreakInTry.cs:56:10:56:11 | enter M4 |
 | BreakInTry.cs:56:10:56:11 | exit M4 (normal) | BreakInTry.cs:56:10:56:11 | enter M4 |
 | BreakInTry.cs:56:10:56:11 | exit M4 (normal) | BreakInTry.cs:56:10:56:11 | exit M4 (normal) |
 | BreakInTry.cs:56:10:56:11 | exit M4 (normal) | BreakInTry.cs:61:17:61:23 | return ...; |
 | BreakInTry.cs:56:10:56:11 | exit M4 (normal) | BreakInTry.cs:64:9:70:9 | {...} |
-| BreakInTry.cs:56:10:56:11 | exit M4 (normal) | BreakInTry.cs:65:13:69:13 | [finally: return] foreach (... ... in ...) ... |
 | BreakInTry.cs:56:10:56:11 | exit M4 (normal) | BreakInTry.cs:65:13:69:13 | foreach (... ... in ...) ... |
 | BreakInTry.cs:56:10:56:11 | exit M4 (normal) | BreakInTry.cs:65:26:65:28 | String arg |
-| BreakInTry.cs:56:10:56:11 | exit M4 (normal) | BreakInTry.cs:65:26:65:28 | [finally: return] String arg |
-| BreakInTry.cs:56:10:56:11 | exit M4 (normal) | BreakInTry.cs:68:21:68:26 | [finally: return] break; |
 | BreakInTry.cs:56:10:56:11 | exit M4 (normal) | BreakInTry.cs:68:21:68:26 | break; |
 | BreakInTry.cs:61:17:61:23 | return ...; | BreakInTry.cs:61:17:61:23 | return ...; |
+| BreakInTry.cs:64:9:70:9 | {...} | BreakInTry.cs:56:10:56:11 | enter M4 |
+| BreakInTry.cs:64:9:70:9 | {...} | BreakInTry.cs:61:17:61:23 | return ...; |
 | BreakInTry.cs:64:9:70:9 | {...} | BreakInTry.cs:64:9:70:9 | {...} |
-| BreakInTry.cs:65:13:69:13 | [finally: return] foreach (... ... in ...) ... | BreakInTry.cs:61:17:61:23 | return ...; |
-| BreakInTry.cs:65:13:69:13 | [finally: return] foreach (... ... in ...) ... | BreakInTry.cs:65:13:69:13 | [finally: return] foreach (... ... in ...) ... |
+| BreakInTry.cs:65:13:69:13 | foreach (... ... in ...) ... | BreakInTry.cs:56:10:56:11 | enter M4 |
+| BreakInTry.cs:65:13:69:13 | foreach (... ... in ...) ... | BreakInTry.cs:61:17:61:23 | return ...; |
 | BreakInTry.cs:65:13:69:13 | foreach (... ... in ...) ... | BreakInTry.cs:64:9:70:9 | {...} |
 | BreakInTry.cs:65:13:69:13 | foreach (... ... in ...) ... | BreakInTry.cs:65:13:69:13 | foreach (... ... in ...) ... |
 | BreakInTry.cs:65:26:65:28 | String arg | BreakInTry.cs:65:26:65:28 | String arg |
-| BreakInTry.cs:65:26:65:28 | [finally: return] String arg | BreakInTry.cs:65:26:65:28 | [finally: return] String arg |
-| BreakInTry.cs:68:21:68:26 | [finally: return] break; | BreakInTry.cs:68:21:68:26 | [finally: return] break; |
 | BreakInTry.cs:68:21:68:26 | break; | BreakInTry.cs:68:21:68:26 | break; |
 | CompileTimeOperators.cs:3:7:3:26 | enter CompileTimeOperators | CompileTimeOperators.cs:3:7:3:26 | enter CompileTimeOperators |
 | CompileTimeOperators.cs:5:9:5:15 | enter Default | CompileTimeOperators.cs:5:9:5:15 | enter Default |
@@ -14222,6 +12365,12 @@ postBlockDominance
 | CompileTimeOperators.cs:20:12:20:17 | enter Nameof | CompileTimeOperators.cs:20:12:20:17 | enter Nameof |
 | CompileTimeOperators.cs:26:7:26:22 | enter GotoInTryFinally | CompileTimeOperators.cs:26:7:26:22 | enter GotoInTryFinally |
 | CompileTimeOperators.cs:28:10:28:10 | enter M | CompileTimeOperators.cs:28:10:28:10 | enter M |
+| CompileTimeOperators.cs:28:10:28:10 | exit M | CompileTimeOperators.cs:28:10:28:10 | exit M |
+| CompileTimeOperators.cs:28:10:28:10 | exit M (abnormal) | CompileTimeOperators.cs:28:10:28:10 | exit M (abnormal) |
+| CompileTimeOperators.cs:39:9:39:34 | ...; | CompileTimeOperators.cs:39:9:39:34 | ...; |
+| CompileTimeOperators.cs:40:9:40:11 | End: | CompileTimeOperators.cs:28:10:28:10 | enter M |
+| CompileTimeOperators.cs:40:9:40:11 | End: | CompileTimeOperators.cs:39:9:39:34 | ...; |
+| CompileTimeOperators.cs:40:9:40:11 | End: | CompileTimeOperators.cs:40:9:40:11 | End: |
 | ConditionalAccess.cs:1:7:1:23 | enter ConditionalAccess | ConditionalAccess.cs:1:7:1:23 | enter ConditionalAccess |
 | ConditionalAccess.cs:3:12:3:13 | enter M1 | ConditionalAccess.cs:3:12:3:13 | enter M1 |
 | ConditionalAccess.cs:3:12:3:13 | exit M1 (normal) | ConditionalAccess.cs:3:12:3:13 | enter M1 |
@@ -14295,52 +12444,48 @@ postBlockDominance
 | Conditions.cs:3:10:3:19 | enter IncrOrDecr | Conditions.cs:3:10:3:19 | enter IncrOrDecr |
 | Conditions.cs:3:10:3:19 | exit IncrOrDecr (normal) | Conditions.cs:3:10:3:19 | enter IncrOrDecr |
 | Conditions.cs:3:10:3:19 | exit IncrOrDecr (normal) | Conditions.cs:3:10:3:19 | exit IncrOrDecr (normal) |
-| Conditions.cs:3:10:3:19 | exit IncrOrDecr (normal) | Conditions.cs:6:13:6:16 | [inc (line 3): true] ...; |
-| Conditions.cs:3:10:3:19 | exit IncrOrDecr (normal) | Conditions.cs:7:9:8:16 | [inc (line 3): false] if (...) ... |
+| Conditions.cs:3:10:3:19 | exit IncrOrDecr (normal) | Conditions.cs:6:13:6:16 | ...; |
+| Conditions.cs:3:10:3:19 | exit IncrOrDecr (normal) | Conditions.cs:7:9:8:16 | if (...) ... |
 | Conditions.cs:3:10:3:19 | exit IncrOrDecr (normal) | Conditions.cs:7:13:7:16 | [false] !... |
 | Conditions.cs:3:10:3:19 | exit IncrOrDecr (normal) | Conditions.cs:7:13:7:16 | [true] !... |
 | Conditions.cs:3:10:3:19 | exit IncrOrDecr (normal) | Conditions.cs:8:13:8:16 | ...; |
-| Conditions.cs:6:13:6:16 | [inc (line 3): true] ...; | Conditions.cs:6:13:6:16 | [inc (line 3): true] ...; |
-| Conditions.cs:7:9:8:16 | [inc (line 3): false] if (...) ... | Conditions.cs:7:9:8:16 | [inc (line 3): false] if (...) ... |
-| Conditions.cs:7:13:7:16 | [false] !... | Conditions.cs:6:13:6:16 | [inc (line 3): true] ...; |
+| Conditions.cs:6:13:6:16 | ...; | Conditions.cs:6:13:6:16 | ...; |
+| Conditions.cs:7:9:8:16 | if (...) ... | Conditions.cs:3:10:3:19 | enter IncrOrDecr |
+| Conditions.cs:7:9:8:16 | if (...) ... | Conditions.cs:6:13:6:16 | ...; |
+| Conditions.cs:7:9:8:16 | if (...) ... | Conditions.cs:7:9:8:16 | if (...) ... |
 | Conditions.cs:7:13:7:16 | [false] !... | Conditions.cs:7:13:7:16 | [false] !... |
-| Conditions.cs:7:13:7:16 | [true] !... | Conditions.cs:7:9:8:16 | [inc (line 3): false] if (...) ... |
 | Conditions.cs:7:13:7:16 | [true] !... | Conditions.cs:7:13:7:16 | [true] !... |
-| Conditions.cs:8:13:8:16 | ...; | Conditions.cs:7:9:8:16 | [inc (line 3): false] if (...) ... |
 | Conditions.cs:8:13:8:16 | ...; | Conditions.cs:7:13:7:16 | [true] !... |
 | Conditions.cs:8:13:8:16 | ...; | Conditions.cs:8:13:8:16 | ...; |
 | Conditions.cs:11:9:11:10 | enter M1 | Conditions.cs:11:9:11:10 | enter M1 |
-| Conditions.cs:15:13:15:16 | [b (line 11): true] ...; | Conditions.cs:15:13:15:16 | [b (line 11): true] ...; |
-| Conditions.cs:16:9:18:20 | [b (line 11): false] if (...) ... | Conditions.cs:16:9:18:20 | [b (line 11): false] if (...) ... |
-| Conditions.cs:17:13:18:20 | [b (line 11): false] if (...) ... | Conditions.cs:17:13:18:20 | [b (line 11): false] if (...) ... |
-| Conditions.cs:17:13:18:20 | [b (line 11): true] if (...) ... | Conditions.cs:17:13:18:20 | [b (line 11): true] if (...) ... |
-| Conditions.cs:17:17:17:18 | [false] !... | Conditions.cs:17:13:18:20 | [b (line 11): true] if (...) ... |
+| Conditions.cs:15:13:15:16 | ...; | Conditions.cs:15:13:15:16 | ...; |
+| Conditions.cs:16:9:18:20 | if (...) ... | Conditions.cs:11:9:11:10 | enter M1 |
+| Conditions.cs:16:9:18:20 | if (...) ... | Conditions.cs:15:13:15:16 | ...; |
+| Conditions.cs:16:9:18:20 | if (...) ... | Conditions.cs:16:9:18:20 | if (...) ... |
+| Conditions.cs:17:13:18:20 | if (...) ... | Conditions.cs:17:13:18:20 | if (...) ... |
 | Conditions.cs:17:17:17:18 | [false] !... | Conditions.cs:17:17:17:18 | [false] !... |
-| Conditions.cs:17:17:17:18 | [true] !... | Conditions.cs:17:13:18:20 | [b (line 11): false] if (...) ... |
 | Conditions.cs:17:17:17:18 | [true] !... | Conditions.cs:17:17:17:18 | [true] !... |
-| Conditions.cs:18:17:18:20 | ...; | Conditions.cs:17:13:18:20 | [b (line 11): false] if (...) ... |
 | Conditions.cs:18:17:18:20 | ...; | Conditions.cs:17:17:17:18 | [true] !... |
 | Conditions.cs:18:17:18:20 | ...; | Conditions.cs:18:17:18:20 | ...; |
 | Conditions.cs:19:16:19:16 | access to local variable x | Conditions.cs:11:9:11:10 | enter M1 |
-| Conditions.cs:19:16:19:16 | access to local variable x | Conditions.cs:15:13:15:16 | [b (line 11): true] ...; |
-| Conditions.cs:19:16:19:16 | access to local variable x | Conditions.cs:16:9:18:20 | [b (line 11): false] if (...) ... |
-| Conditions.cs:19:16:19:16 | access to local variable x | Conditions.cs:17:13:18:20 | [b (line 11): false] if (...) ... |
-| Conditions.cs:19:16:19:16 | access to local variable x | Conditions.cs:17:13:18:20 | [b (line 11): true] if (...) ... |
+| Conditions.cs:19:16:19:16 | access to local variable x | Conditions.cs:15:13:15:16 | ...; |
+| Conditions.cs:19:16:19:16 | access to local variable x | Conditions.cs:16:9:18:20 | if (...) ... |
+| Conditions.cs:19:16:19:16 | access to local variable x | Conditions.cs:17:13:18:20 | if (...) ... |
 | Conditions.cs:19:16:19:16 | access to local variable x | Conditions.cs:17:17:17:18 | [false] !... |
 | Conditions.cs:19:16:19:16 | access to local variable x | Conditions.cs:17:17:17:18 | [true] !... |
 | Conditions.cs:19:16:19:16 | access to local variable x | Conditions.cs:18:17:18:20 | ...; |
 | Conditions.cs:19:16:19:16 | access to local variable x | Conditions.cs:19:16:19:16 | access to local variable x |
 | Conditions.cs:22:9:22:10 | enter M2 | Conditions.cs:22:9:22:10 | enter M2 |
 | Conditions.cs:26:13:27:20 | if (...) ... | Conditions.cs:26:13:27:20 | if (...) ... |
-| Conditions.cs:27:17:27:20 | [b2 (line 22): true] ...; | Conditions.cs:27:17:27:20 | [b2 (line 22): true] ...; |
-| Conditions.cs:28:9:29:16 | [b2 (line 22): false] if (...) ... | Conditions.cs:28:9:29:16 | [b2 (line 22): false] if (...) ... |
+| Conditions.cs:27:17:27:20 | ...; | Conditions.cs:27:17:27:20 | ...; |
+| Conditions.cs:28:9:29:16 | if (...) ... | Conditions.cs:22:9:22:10 | enter M2 |
+| Conditions.cs:28:9:29:16 | if (...) ... | Conditions.cs:26:13:27:20 | if (...) ... |
+| Conditions.cs:28:9:29:16 | if (...) ... | Conditions.cs:27:17:27:20 | ...; |
 | Conditions.cs:28:9:29:16 | if (...) ... | Conditions.cs:28:9:29:16 | if (...) ... |
-| Conditions.cs:29:13:29:16 | ...; | Conditions.cs:27:17:27:20 | [b2 (line 22): true] ...; |
 | Conditions.cs:29:13:29:16 | ...; | Conditions.cs:29:13:29:16 | ...; |
 | Conditions.cs:30:16:30:16 | access to local variable x | Conditions.cs:22:9:22:10 | enter M2 |
 | Conditions.cs:30:16:30:16 | access to local variable x | Conditions.cs:26:13:27:20 | if (...) ... |
-| Conditions.cs:30:16:30:16 | access to local variable x | Conditions.cs:27:17:27:20 | [b2 (line 22): true] ...; |
-| Conditions.cs:30:16:30:16 | access to local variable x | Conditions.cs:28:9:29:16 | [b2 (line 22): false] if (...) ... |
+| Conditions.cs:30:16:30:16 | access to local variable x | Conditions.cs:27:17:27:20 | ...; |
 | Conditions.cs:30:16:30:16 | access to local variable x | Conditions.cs:28:9:29:16 | if (...) ... |
 | Conditions.cs:30:16:30:16 | access to local variable x | Conditions.cs:29:13:29:16 | ...; |
 | Conditions.cs:30:16:30:16 | access to local variable x | Conditions.cs:30:16:30:16 | access to local variable x |
@@ -14349,59 +12494,49 @@ postBlockDominance
 | Conditions.cs:39:9:40:16 | if (...) ... | Conditions.cs:33:9:33:10 | enter M3 |
 | Conditions.cs:39:9:40:16 | if (...) ... | Conditions.cs:38:13:38:20 | ...; |
 | Conditions.cs:39:9:40:16 | if (...) ... | Conditions.cs:39:9:40:16 | if (...) ... |
-| Conditions.cs:40:13:40:16 | [b2 (line 39): true] ...; | Conditions.cs:40:13:40:16 | [b2 (line 39): true] ...; |
-| Conditions.cs:41:9:42:16 | [b2 (line 39): false] if (...) ... | Conditions.cs:41:9:42:16 | [b2 (line 39): false] if (...) ... |
-| Conditions.cs:42:13:42:16 | ...; | Conditions.cs:40:13:40:16 | [b2 (line 39): true] ...; |
+| Conditions.cs:40:13:40:16 | ...; | Conditions.cs:40:13:40:16 | ...; |
+| Conditions.cs:41:9:42:16 | if (...) ... | Conditions.cs:33:9:33:10 | enter M3 |
+| Conditions.cs:41:9:42:16 | if (...) ... | Conditions.cs:38:13:38:20 | ...; |
+| Conditions.cs:41:9:42:16 | if (...) ... | Conditions.cs:39:9:40:16 | if (...) ... |
+| Conditions.cs:41:9:42:16 | if (...) ... | Conditions.cs:40:13:40:16 | ...; |
+| Conditions.cs:41:9:42:16 | if (...) ... | Conditions.cs:41:9:42:16 | if (...) ... |
 | Conditions.cs:42:13:42:16 | ...; | Conditions.cs:42:13:42:16 | ...; |
 | Conditions.cs:43:16:43:16 | access to local variable x | Conditions.cs:33:9:33:10 | enter M3 |
 | Conditions.cs:43:16:43:16 | access to local variable x | Conditions.cs:38:13:38:20 | ...; |
 | Conditions.cs:43:16:43:16 | access to local variable x | Conditions.cs:39:9:40:16 | if (...) ... |
-| Conditions.cs:43:16:43:16 | access to local variable x | Conditions.cs:40:13:40:16 | [b2 (line 39): true] ...; |
-| Conditions.cs:43:16:43:16 | access to local variable x | Conditions.cs:41:9:42:16 | [b2 (line 39): false] if (...) ... |
+| Conditions.cs:43:16:43:16 | access to local variable x | Conditions.cs:40:13:40:16 | ...; |
+| Conditions.cs:43:16:43:16 | access to local variable x | Conditions.cs:41:9:42:16 | if (...) ... |
 | Conditions.cs:43:16:43:16 | access to local variable x | Conditions.cs:42:13:42:16 | ...; |
 | Conditions.cs:43:16:43:16 | access to local variable x | Conditions.cs:43:16:43:16 | access to local variable x |
 | Conditions.cs:46:9:46:10 | enter M4 | Conditions.cs:46:9:46:10 | enter M4 |
-| Conditions.cs:49:16:49:16 | [b (line 46): false] access to parameter x | Conditions.cs:49:16:49:16 | [b (line 46): false] access to parameter x |
-| Conditions.cs:49:16:49:16 | [b (line 46): false] access to parameter x | Conditions.cs:50:9:53:9 | [b (line 46): false] {...} |
-| Conditions.cs:50:9:53:9 | [b (line 46): false] {...} | Conditions.cs:50:9:53:9 | [b (line 46): false] {...} |
-| Conditions.cs:50:9:53:9 | [b (line 46): true] {...} | Conditions.cs:50:9:53:9 | [b (line 46): true] {...} |
+| Conditions.cs:49:16:49:16 | access to parameter x | Conditions.cs:46:9:46:10 | enter M4 |
+| Conditions.cs:49:16:49:16 | access to parameter x | Conditions.cs:49:16:49:16 | access to parameter x |
+| Conditions.cs:49:16:49:16 | access to parameter x | Conditions.cs:50:9:53:9 | {...} |
+| Conditions.cs:49:16:49:16 | access to parameter x | Conditions.cs:52:17:52:20 | ...; |
 | Conditions.cs:50:9:53:9 | {...} | Conditions.cs:50:9:53:9 | {...} |
-| Conditions.cs:52:17:52:20 | [b (line 46): true] ...; | Conditions.cs:50:9:53:9 | [b (line 46): true] {...} |
-| Conditions.cs:52:17:52:20 | [b (line 46): true] ...; | Conditions.cs:52:17:52:20 | [b (line 46): true] ...; |
+| Conditions.cs:52:17:52:20 | ...; | Conditions.cs:52:17:52:20 | ...; |
 | Conditions.cs:54:16:54:16 | access to local variable y | Conditions.cs:46:9:46:10 | enter M4 |
-| Conditions.cs:54:16:54:16 | access to local variable y | Conditions.cs:49:16:49:16 | [b (line 46): false] access to parameter x |
-| Conditions.cs:54:16:54:16 | access to local variable y | Conditions.cs:50:9:53:9 | [b (line 46): false] {...} |
-| Conditions.cs:54:16:54:16 | access to local variable y | Conditions.cs:50:9:53:9 | [b (line 46): true] {...} |
+| Conditions.cs:54:16:54:16 | access to local variable y | Conditions.cs:49:16:49:16 | access to parameter x |
 | Conditions.cs:54:16:54:16 | access to local variable y | Conditions.cs:50:9:53:9 | {...} |
-| Conditions.cs:54:16:54:16 | access to local variable y | Conditions.cs:52:17:52:20 | [b (line 46): true] ...; |
+| Conditions.cs:54:16:54:16 | access to local variable y | Conditions.cs:52:17:52:20 | ...; |
 | Conditions.cs:54:16:54:16 | access to local variable y | Conditions.cs:54:16:54:16 | access to local variable y |
 | Conditions.cs:57:9:57:10 | enter M5 | Conditions.cs:57:9:57:10 | enter M5 |
-| Conditions.cs:60:16:60:16 | [b (line 57): false] access to parameter x | Conditions.cs:60:16:60:16 | [b (line 57): false] access to parameter x |
-| Conditions.cs:60:16:60:16 | [b (line 57): false] access to parameter x | Conditions.cs:61:9:64:9 | [b (line 57): false] {...} |
-| Conditions.cs:61:9:64:9 | [b (line 57): false] {...} | Conditions.cs:61:9:64:9 | [b (line 57): false] {...} |
-| Conditions.cs:61:9:64:9 | [b (line 57): true] {...} | Conditions.cs:61:9:64:9 | [b (line 57): true] {...} |
+| Conditions.cs:60:16:60:16 | access to parameter x | Conditions.cs:57:9:57:10 | enter M5 |
+| Conditions.cs:60:16:60:16 | access to parameter x | Conditions.cs:60:16:60:16 | access to parameter x |
+| Conditions.cs:60:16:60:16 | access to parameter x | Conditions.cs:61:9:64:9 | {...} |
+| Conditions.cs:60:16:60:16 | access to parameter x | Conditions.cs:63:17:63:20 | ...; |
 | Conditions.cs:61:9:64:9 | {...} | Conditions.cs:61:9:64:9 | {...} |
-| Conditions.cs:63:17:63:20 | [b (line 57): true] ...; | Conditions.cs:61:9:64:9 | [b (line 57): true] {...} |
-| Conditions.cs:63:17:63:20 | [b (line 57): true] ...; | Conditions.cs:63:17:63:20 | [b (line 57): true] ...; |
-| Conditions.cs:65:9:66:16 | [b (line 57): false] if (...) ... | Conditions.cs:60:16:60:16 | [b (line 57): false] access to parameter x |
-| Conditions.cs:65:9:66:16 | [b (line 57): false] if (...) ... | Conditions.cs:61:9:64:9 | [b (line 57): false] {...} |
-| Conditions.cs:65:9:66:16 | [b (line 57): false] if (...) ... | Conditions.cs:65:9:66:16 | [b (line 57): false] if (...) ... |
-| Conditions.cs:65:9:66:16 | [b (line 57): true] if (...) ... | Conditions.cs:61:9:64:9 | [b (line 57): true] {...} |
-| Conditions.cs:65:9:66:16 | [b (line 57): true] if (...) ... | Conditions.cs:63:17:63:20 | [b (line 57): true] ...; |
-| Conditions.cs:65:9:66:16 | [b (line 57): true] if (...) ... | Conditions.cs:65:9:66:16 | [b (line 57): true] if (...) ... |
+| Conditions.cs:63:17:63:20 | ...; | Conditions.cs:63:17:63:20 | ...; |
+| Conditions.cs:65:9:66:16 | if (...) ... | Conditions.cs:57:9:57:10 | enter M5 |
+| Conditions.cs:65:9:66:16 | if (...) ... | Conditions.cs:60:16:60:16 | access to parameter x |
+| Conditions.cs:65:9:66:16 | if (...) ... | Conditions.cs:61:9:64:9 | {...} |
+| Conditions.cs:65:9:66:16 | if (...) ... | Conditions.cs:63:17:63:20 | ...; |
 | Conditions.cs:65:9:66:16 | if (...) ... | Conditions.cs:65:9:66:16 | if (...) ... |
-| Conditions.cs:66:13:66:16 | ...; | Conditions.cs:61:9:64:9 | [b (line 57): true] {...} |
-| Conditions.cs:66:13:66:16 | ...; | Conditions.cs:63:17:63:20 | [b (line 57): true] ...; |
-| Conditions.cs:66:13:66:16 | ...; | Conditions.cs:65:9:66:16 | [b (line 57): true] if (...) ... |
 | Conditions.cs:66:13:66:16 | ...; | Conditions.cs:66:13:66:16 | ...; |
 | Conditions.cs:67:16:67:16 | access to local variable y | Conditions.cs:57:9:57:10 | enter M5 |
-| Conditions.cs:67:16:67:16 | access to local variable y | Conditions.cs:60:16:60:16 | [b (line 57): false] access to parameter x |
-| Conditions.cs:67:16:67:16 | access to local variable y | Conditions.cs:61:9:64:9 | [b (line 57): false] {...} |
-| Conditions.cs:67:16:67:16 | access to local variable y | Conditions.cs:61:9:64:9 | [b (line 57): true] {...} |
+| Conditions.cs:67:16:67:16 | access to local variable y | Conditions.cs:60:16:60:16 | access to parameter x |
 | Conditions.cs:67:16:67:16 | access to local variable y | Conditions.cs:61:9:64:9 | {...} |
-| Conditions.cs:67:16:67:16 | access to local variable y | Conditions.cs:63:17:63:20 | [b (line 57): true] ...; |
-| Conditions.cs:67:16:67:16 | access to local variable y | Conditions.cs:65:9:66:16 | [b (line 57): false] if (...) ... |
-| Conditions.cs:67:16:67:16 | access to local variable y | Conditions.cs:65:9:66:16 | [b (line 57): true] if (...) ... |
+| Conditions.cs:67:16:67:16 | access to local variable y | Conditions.cs:63:17:63:20 | ...; |
 | Conditions.cs:67:16:67:16 | access to local variable y | Conditions.cs:65:9:66:16 | if (...) ... |
 | Conditions.cs:67:16:67:16 | access to local variable y | Conditions.cs:66:13:66:16 | ...; |
 | Conditions.cs:67:16:67:16 | access to local variable y | Conditions.cs:67:16:67:16 | access to local variable y |
@@ -14466,22 +12601,19 @@ postBlockDominance
 | Conditions.cs:99:16:99:16 | access to local variable x | Conditions.cs:97:17:97:20 | ...; |
 | Conditions.cs:99:16:99:16 | access to local variable x | Conditions.cs:99:16:99:16 | access to local variable x |
 | Conditions.cs:102:12:102:13 | enter M8 | Conditions.cs:102:12:102:13 | enter M8 |
-| Conditions.cs:106:13:106:20 | [b (line 102): true] ...; | Conditions.cs:106:13:106:20 | [b (line 102): true] ...; |
-| Conditions.cs:107:9:109:24 | [b (line 102): false] if (...) ... | Conditions.cs:107:9:109:24 | [b (line 102): false] if (...) ... |
-| Conditions.cs:108:13:109:24 | [b (line 102): false] if (...) ... | Conditions.cs:108:13:109:24 | [b (line 102): false] if (...) ... |
-| Conditions.cs:108:13:109:24 | [b (line 102): true] if (...) ... | Conditions.cs:108:13:109:24 | [b (line 102): true] if (...) ... |
-| Conditions.cs:108:17:108:18 | [false] !... | Conditions.cs:108:13:109:24 | [b (line 102): true] if (...) ... |
+| Conditions.cs:106:13:106:20 | ...; | Conditions.cs:106:13:106:20 | ...; |
+| Conditions.cs:107:9:109:24 | if (...) ... | Conditions.cs:102:12:102:13 | enter M8 |
+| Conditions.cs:107:9:109:24 | if (...) ... | Conditions.cs:106:13:106:20 | ...; |
+| Conditions.cs:107:9:109:24 | if (...) ... | Conditions.cs:107:9:109:24 | if (...) ... |
+| Conditions.cs:108:13:109:24 | if (...) ... | Conditions.cs:108:13:109:24 | if (...) ... |
 | Conditions.cs:108:17:108:18 | [false] !... | Conditions.cs:108:17:108:18 | [false] !... |
-| Conditions.cs:108:17:108:18 | [true] !... | Conditions.cs:108:13:109:24 | [b (line 102): false] if (...) ... |
 | Conditions.cs:108:17:108:18 | [true] !... | Conditions.cs:108:17:108:18 | [true] !... |
-| Conditions.cs:109:17:109:24 | ...; | Conditions.cs:108:13:109:24 | [b (line 102): false] if (...) ... |
 | Conditions.cs:109:17:109:24 | ...; | Conditions.cs:108:17:108:18 | [true] !... |
 | Conditions.cs:109:17:109:24 | ...; | Conditions.cs:109:17:109:24 | ...; |
 | Conditions.cs:110:16:110:16 | access to local variable x | Conditions.cs:102:12:102:13 | enter M8 |
-| Conditions.cs:110:16:110:16 | access to local variable x | Conditions.cs:106:13:106:20 | [b (line 102): true] ...; |
-| Conditions.cs:110:16:110:16 | access to local variable x | Conditions.cs:107:9:109:24 | [b (line 102): false] if (...) ... |
-| Conditions.cs:110:16:110:16 | access to local variable x | Conditions.cs:108:13:109:24 | [b (line 102): false] if (...) ... |
-| Conditions.cs:110:16:110:16 | access to local variable x | Conditions.cs:108:13:109:24 | [b (line 102): true] if (...) ... |
+| Conditions.cs:110:16:110:16 | access to local variable x | Conditions.cs:106:13:106:20 | ...; |
+| Conditions.cs:110:16:110:16 | access to local variable x | Conditions.cs:107:9:109:24 | if (...) ... |
+| Conditions.cs:110:16:110:16 | access to local variable x | Conditions.cs:108:13:109:24 | if (...) ... |
 | Conditions.cs:110:16:110:16 | access to local variable x | Conditions.cs:108:17:108:18 | [false] !... |
 | Conditions.cs:110:16:110:16 | access to local variable x | Conditions.cs:108:17:108:18 | [true] !... |
 | Conditions.cs:110:16:110:16 | access to local variable x | Conditions.cs:109:17:109:24 | ...; |
@@ -14492,60 +12624,58 @@ postBlockDominance
 | Conditions.cs:113:10:113:11 | exit M9 (normal) | Conditions.cs:116:25:116:25 | access to local variable i |
 | Conditions.cs:113:10:113:11 | exit M9 (normal) | Conditions.cs:116:42:116:42 | access to local variable i |
 | Conditions.cs:113:10:113:11 | exit M9 (normal) | Conditions.cs:117:9:123:9 | {...} |
-| Conditions.cs:113:10:113:11 | exit M9 (normal) | Conditions.cs:119:17:119:21 | [false, last (line 118): true] !... |
-| Conditions.cs:113:10:113:11 | exit M9 (normal) | Conditions.cs:119:17:119:21 | [true, last (line 118): false] !... |
-| Conditions.cs:113:10:113:11 | exit M9 (normal) | Conditions.cs:120:17:120:23 | [last (line 118): false] ...; |
-| Conditions.cs:113:10:113:11 | exit M9 (normal) | Conditions.cs:121:13:122:25 | [last (line 118): true] if (...) ... |
+| Conditions.cs:113:10:113:11 | exit M9 (normal) | Conditions.cs:119:17:119:21 | [false] !... |
+| Conditions.cs:113:10:113:11 | exit M9 (normal) | Conditions.cs:119:17:119:21 | [true] !... |
+| Conditions.cs:113:10:113:11 | exit M9 (normal) | Conditions.cs:120:17:120:23 | ...; |
+| Conditions.cs:113:10:113:11 | exit M9 (normal) | Conditions.cs:121:13:122:25 | if (...) ... |
 | Conditions.cs:113:10:113:11 | exit M9 (normal) | Conditions.cs:122:17:122:25 | ...; |
 | Conditions.cs:116:25:116:25 | access to local variable i | Conditions.cs:113:10:113:11 | enter M9 |
 | Conditions.cs:116:25:116:25 | access to local variable i | Conditions.cs:116:25:116:25 | access to local variable i |
 | Conditions.cs:116:25:116:25 | access to local variable i | Conditions.cs:116:42:116:42 | access to local variable i |
 | Conditions.cs:116:25:116:25 | access to local variable i | Conditions.cs:117:9:123:9 | {...} |
-| Conditions.cs:116:25:116:25 | access to local variable i | Conditions.cs:119:17:119:21 | [false, last (line 118): true] !... |
-| Conditions.cs:116:25:116:25 | access to local variable i | Conditions.cs:119:17:119:21 | [true, last (line 118): false] !... |
-| Conditions.cs:116:25:116:25 | access to local variable i | Conditions.cs:120:17:120:23 | [last (line 118): false] ...; |
-| Conditions.cs:116:25:116:25 | access to local variable i | Conditions.cs:121:13:122:25 | [last (line 118): true] if (...) ... |
+| Conditions.cs:116:25:116:25 | access to local variable i | Conditions.cs:119:17:119:21 | [false] !... |
+| Conditions.cs:116:25:116:25 | access to local variable i | Conditions.cs:119:17:119:21 | [true] !... |
+| Conditions.cs:116:25:116:25 | access to local variable i | Conditions.cs:120:17:120:23 | ...; |
+| Conditions.cs:116:25:116:25 | access to local variable i | Conditions.cs:121:13:122:25 | if (...) ... |
 | Conditions.cs:116:25:116:25 | access to local variable i | Conditions.cs:122:17:122:25 | ...; |
 | Conditions.cs:116:42:116:42 | access to local variable i | Conditions.cs:116:42:116:42 | access to local variable i |
 | Conditions.cs:116:42:116:42 | access to local variable i | Conditions.cs:117:9:123:9 | {...} |
-| Conditions.cs:116:42:116:42 | access to local variable i | Conditions.cs:119:17:119:21 | [false, last (line 118): true] !... |
-| Conditions.cs:116:42:116:42 | access to local variable i | Conditions.cs:119:17:119:21 | [true, last (line 118): false] !... |
-| Conditions.cs:116:42:116:42 | access to local variable i | Conditions.cs:120:17:120:23 | [last (line 118): false] ...; |
-| Conditions.cs:116:42:116:42 | access to local variable i | Conditions.cs:121:13:122:25 | [last (line 118): true] if (...) ... |
+| Conditions.cs:116:42:116:42 | access to local variable i | Conditions.cs:119:17:119:21 | [false] !... |
+| Conditions.cs:116:42:116:42 | access to local variable i | Conditions.cs:119:17:119:21 | [true] !... |
+| Conditions.cs:116:42:116:42 | access to local variable i | Conditions.cs:120:17:120:23 | ...; |
+| Conditions.cs:116:42:116:42 | access to local variable i | Conditions.cs:121:13:122:25 | if (...) ... |
 | Conditions.cs:116:42:116:42 | access to local variable i | Conditions.cs:122:17:122:25 | ...; |
 | Conditions.cs:117:9:123:9 | {...} | Conditions.cs:117:9:123:9 | {...} |
-| Conditions.cs:119:17:119:21 | [false, last (line 118): true] !... | Conditions.cs:119:17:119:21 | [false, last (line 118): true] !... |
-| Conditions.cs:119:17:119:21 | [true, last (line 118): false] !... | Conditions.cs:119:17:119:21 | [true, last (line 118): false] !... |
-| Conditions.cs:120:17:120:23 | [last (line 118): false] ...; | Conditions.cs:119:17:119:21 | [true, last (line 118): false] !... |
-| Conditions.cs:120:17:120:23 | [last (line 118): false] ...; | Conditions.cs:120:17:120:23 | [last (line 118): false] ...; |
-| Conditions.cs:121:13:122:25 | [last (line 118): true] if (...) ... | Conditions.cs:119:17:119:21 | [false, last (line 118): true] !... |
-| Conditions.cs:121:13:122:25 | [last (line 118): true] if (...) ... | Conditions.cs:121:13:122:25 | [last (line 118): true] if (...) ... |
-| Conditions.cs:122:17:122:25 | ...; | Conditions.cs:119:17:119:21 | [false, last (line 118): true] !... |
-| Conditions.cs:122:17:122:25 | ...; | Conditions.cs:121:13:122:25 | [last (line 118): true] if (...) ... |
+| Conditions.cs:119:17:119:21 | [false] !... | Conditions.cs:119:17:119:21 | [false] !... |
+| Conditions.cs:119:17:119:21 | [true] !... | Conditions.cs:119:17:119:21 | [true] !... |
+| Conditions.cs:120:17:120:23 | ...; | Conditions.cs:119:17:119:21 | [true] !... |
+| Conditions.cs:120:17:120:23 | ...; | Conditions.cs:120:17:120:23 | ...; |
+| Conditions.cs:121:13:122:25 | if (...) ... | Conditions.cs:117:9:123:9 | {...} |
+| Conditions.cs:121:13:122:25 | if (...) ... | Conditions.cs:119:17:119:21 | [false] !... |
+| Conditions.cs:121:13:122:25 | if (...) ... | Conditions.cs:119:17:119:21 | [true] !... |
+| Conditions.cs:121:13:122:25 | if (...) ... | Conditions.cs:120:17:120:23 | ...; |
+| Conditions.cs:121:13:122:25 | if (...) ... | Conditions.cs:121:13:122:25 | if (...) ... |
 | Conditions.cs:122:17:122:25 | ...; | Conditions.cs:122:17:122:25 | ...; |
 | Conditions.cs:129:10:129:12 | enter M10 | Conditions.cs:129:10:129:12 | enter M10 |
-| Conditions.cs:131:16:131:19 | [Field1 (line 129): false] true | Conditions.cs:131:16:131:19 | [Field1 (line 129): false] true |
-| Conditions.cs:131:16:131:19 | [Field1 (line 129): true, Field2 (line 129): false] true | Conditions.cs:131:16:131:19 | [Field1 (line 129): true, Field2 (line 129): false] true |
-| Conditions.cs:132:9:140:9 | [Field1 (line 129): false] {...} | Conditions.cs:132:9:140:9 | [Field1 (line 129): false] {...} |
-| Conditions.cs:132:9:140:9 | [Field1 (line 129): true, Field2 (line 129): false] {...} | Conditions.cs:132:9:140:9 | [Field1 (line 129): true, Field2 (line 129): false] {...} |
-| Conditions.cs:132:9:140:9 | [Field1 (line 129): true, Field2 (line 129): true] {...} | Conditions.cs:132:9:140:9 | [Field1 (line 129): true, Field2 (line 129): true] {...} |
+| Conditions.cs:131:16:131:19 | true | Conditions.cs:131:16:131:19 | true |
 | Conditions.cs:132:9:140:9 | {...} | Conditions.cs:132:9:140:9 | {...} |
-| Conditions.cs:134:13:139:13 | [Field1 (line 129): true, Field2 (line 129): false] {...} | Conditions.cs:134:13:139:13 | [Field1 (line 129): true, Field2 (line 129): false] {...} |
-| Conditions.cs:134:13:139:13 | [Field1 (line 129): true, Field2 (line 129): true] {...} | Conditions.cs:134:13:139:13 | [Field1 (line 129): true, Field2 (line 129): true] {...} |
-| Conditions.cs:134:13:139:13 | [Field1 (line 129): true] {...} | Conditions.cs:134:13:139:13 | [Field1 (line 129): true] {...} |
-| Conditions.cs:136:17:138:17 | [Field1 (line 129): true, Field2 (line 129): true] {...} | Conditions.cs:136:17:138:17 | [Field1 (line 129): true, Field2 (line 129): true] {...} |
+| Conditions.cs:134:13:139:13 | {...} | Conditions.cs:134:13:139:13 | {...} |
+| Conditions.cs:136:17:138:17 | {...} | Conditions.cs:136:17:138:17 | {...} |
 | Conditions.cs:143:10:143:12 | enter M11 | Conditions.cs:143:10:143:12 | enter M11 |
 | Conditions.cs:143:10:143:12 | exit M11 (normal) | Conditions.cs:143:10:143:12 | enter M11 |
 | Conditions.cs:143:10:143:12 | exit M11 (normal) | Conditions.cs:143:10:143:12 | exit M11 (normal) |
-| Conditions.cs:143:10:143:12 | exit M11 (normal) | Conditions.cs:145:21:145:23 | [b (line 143): true] "a" |
-| Conditions.cs:143:10:143:12 | exit M11 (normal) | Conditions.cs:145:27:145:29 | [b (line 143): false] "b" |
+| Conditions.cs:143:10:143:12 | exit M11 (normal) | Conditions.cs:145:17:145:29 | ... ? ... : ... |
+| Conditions.cs:143:10:143:12 | exit M11 (normal) | Conditions.cs:145:21:145:23 | "a" |
+| Conditions.cs:143:10:143:12 | exit M11 (normal) | Conditions.cs:145:27:145:29 | "b" |
 | Conditions.cs:143:10:143:12 | exit M11 (normal) | Conditions.cs:147:13:147:49 | ...; |
 | Conditions.cs:143:10:143:12 | exit M11 (normal) | Conditions.cs:149:13:149:49 | ...; |
-| Conditions.cs:145:21:145:23 | [b (line 143): true] "a" | Conditions.cs:145:21:145:23 | [b (line 143): true] "a" |
-| Conditions.cs:145:27:145:29 | [b (line 143): false] "b" | Conditions.cs:145:27:145:29 | [b (line 143): false] "b" |
-| Conditions.cs:147:13:147:49 | ...; | Conditions.cs:145:21:145:23 | [b (line 143): true] "a" |
+| Conditions.cs:145:17:145:29 | ... ? ... : ... | Conditions.cs:143:10:143:12 | enter M11 |
+| Conditions.cs:145:17:145:29 | ... ? ... : ... | Conditions.cs:145:17:145:29 | ... ? ... : ... |
+| Conditions.cs:145:17:145:29 | ... ? ... : ... | Conditions.cs:145:21:145:23 | "a" |
+| Conditions.cs:145:17:145:29 | ... ? ... : ... | Conditions.cs:145:27:145:29 | "b" |
+| Conditions.cs:145:21:145:23 | "a" | Conditions.cs:145:21:145:23 | "a" |
+| Conditions.cs:145:27:145:29 | "b" | Conditions.cs:145:27:145:29 | "b" |
 | Conditions.cs:147:13:147:49 | ...; | Conditions.cs:147:13:147:49 | ...; |
-| Conditions.cs:149:13:149:49 | ...; | Conditions.cs:145:27:145:29 | [b (line 143): false] "b" |
 | Conditions.cs:149:13:149:49 | ...; | Conditions.cs:149:13:149:49 | ...; |
 | ExitMethods.cs:6:7:6:17 | enter ExitMethods | ExitMethods.cs:6:7:6:17 | enter ExitMethods |
 | ExitMethods.cs:8:10:8:11 | enter M1 | ExitMethods.cs:8:10:8:11 | enter M1 |
@@ -14556,17 +12686,12 @@ postBlockDominance
 | ExitMethods.cs:38:10:38:11 | enter M6 | ExitMethods.cs:38:10:38:11 | enter M6 |
 | ExitMethods.cs:38:10:38:11 | exit M6 (normal) | ExitMethods.cs:38:10:38:11 | enter M6 |
 | ExitMethods.cs:38:10:38:11 | exit M6 (normal) | ExitMethods.cs:38:10:38:11 | exit M6 (normal) |
-| ExitMethods.cs:38:10:38:11 | exit M6 (normal) | ExitMethods.cs:44:9:47:9 | [exception: ArgumentException] catch (...) {...} |
-| ExitMethods.cs:38:10:38:11 | exit M6 (normal) | ExitMethods.cs:44:9:47:9 | [exception: Exception] catch (...) {...} |
 | ExitMethods.cs:38:10:38:11 | exit M6 (normal) | ExitMethods.cs:45:9:47:9 | {...} |
-| ExitMethods.cs:38:10:38:11 | exit M6 (normal) | ExitMethods.cs:48:9:51:9 | [exception: Exception] catch (...) {...} |
+| ExitMethods.cs:38:10:38:11 | exit M6 (normal) | ExitMethods.cs:48:9:51:9 | catch (...) {...} |
 | ExitMethods.cs:38:10:38:11 | exit M6 (normal) | ExitMethods.cs:49:9:51:9 | {...} |
-| ExitMethods.cs:44:9:47:9 | [exception: ArgumentException] catch (...) {...} | ExitMethods.cs:44:9:47:9 | [exception: ArgumentException] catch (...) {...} |
-| ExitMethods.cs:44:9:47:9 | [exception: Exception] catch (...) {...} | ExitMethods.cs:44:9:47:9 | [exception: Exception] catch (...) {...} |
-| ExitMethods.cs:45:9:47:9 | {...} | ExitMethods.cs:44:9:47:9 | [exception: ArgumentException] catch (...) {...} |
 | ExitMethods.cs:45:9:47:9 | {...} | ExitMethods.cs:45:9:47:9 | {...} |
-| ExitMethods.cs:48:9:51:9 | [exception: Exception] catch (...) {...} | ExitMethods.cs:48:9:51:9 | [exception: Exception] catch (...) {...} |
-| ExitMethods.cs:49:9:51:9 | {...} | ExitMethods.cs:48:9:51:9 | [exception: Exception] catch (...) {...} |
+| ExitMethods.cs:48:9:51:9 | catch (...) {...} | ExitMethods.cs:48:9:51:9 | catch (...) {...} |
+| ExitMethods.cs:49:9:51:9 | {...} | ExitMethods.cs:48:9:51:9 | catch (...) {...} |
 | ExitMethods.cs:49:9:51:9 | {...} | ExitMethods.cs:49:9:51:9 | {...} |
 | ExitMethods.cs:54:10:54:11 | enter M7 | ExitMethods.cs:54:10:54:11 | enter M7 |
 | ExitMethods.cs:60:10:60:11 | enter M8 | ExitMethods.cs:60:10:60:11 | enter M8 |
@@ -14597,15 +12722,13 @@ postBlockDominance
 | ExitMethods.cs:117:34:117:34 | 0 | ExitMethods.cs:117:34:117:34 | 0 |
 | ExitMethods.cs:117:38:117:38 | 1 | ExitMethods.cs:117:38:117:38 | 1 |
 | ExitMethods.cs:120:17:120:32 | enter FailingAssertion | ExitMethods.cs:120:17:120:32 | enter FailingAssertion |
-| ExitMethods.cs:122:9:122:28 | [assertion failure] call to method IsTrue | ExitMethods.cs:122:9:122:28 | [assertion failure] call to method IsTrue |
 | ExitMethods.cs:126:17:126:33 | enter FailingAssertion2 | ExitMethods.cs:126:17:126:33 | enter FailingAssertion2 |
 | ExitMethods.cs:132:10:132:20 | enter AssertFalse | ExitMethods.cs:132:10:132:20 | enter AssertFalse |
 | ExitMethods.cs:132:10:132:20 | exit AssertFalse | ExitMethods.cs:132:10:132:20 | exit AssertFalse |
-| ExitMethods.cs:132:33:132:49 | [assertion failure] call to method IsFalse | ExitMethods.cs:132:33:132:49 | [assertion failure] call to method IsFalse |
-| ExitMethods.cs:132:33:132:49 | [assertion success] call to method IsFalse | ExitMethods.cs:132:10:132:20 | enter AssertFalse |
-| ExitMethods.cs:132:33:132:49 | [assertion success] call to method IsFalse | ExitMethods.cs:132:33:132:49 | [assertion success] call to method IsFalse |
+| ExitMethods.cs:132:10:132:20 | exit AssertFalse (abnormal) | ExitMethods.cs:132:10:132:20 | exit AssertFalse (abnormal) |
+| ExitMethods.cs:132:10:132:20 | exit AssertFalse (normal) | ExitMethods.cs:132:10:132:20 | enter AssertFalse |
+| ExitMethods.cs:132:10:132:20 | exit AssertFalse (normal) | ExitMethods.cs:132:10:132:20 | exit AssertFalse (normal) |
 | ExitMethods.cs:134:17:134:33 | enter FailingAssertion3 | ExitMethods.cs:134:17:134:33 | enter FailingAssertion3 |
-| ExitMethods.cs:136:9:136:25 | [assertion failure] call to method AssertFalse | ExitMethods.cs:136:9:136:25 | [assertion failure] call to method AssertFalse |
 | ExitMethods.cs:140:17:140:42 | enter ExceptionDispatchInfoThrow | ExitMethods.cs:140:17:140:42 | enter ExceptionDispatchInfoThrow |
 | ExitMethods.cs:140:17:140:42 | exit ExceptionDispatchInfoThrow (abnormal) | ExitMethods.cs:140:17:140:42 | exit ExceptionDispatchInfoThrow (abnormal) |
 | ExitMethods.cs:143:13:143:43 | ...; | ExitMethods.cs:143:13:143:43 | ...; |
@@ -14617,58 +12740,79 @@ postBlockDominance
 | Finally.cs:3:14:3:20 | enter Finally | Finally.cs:3:14:3:20 | enter Finally |
 | Finally.cs:7:10:7:11 | enter M1 | Finally.cs:7:10:7:11 | enter M1 |
 | Finally.cs:7:10:7:11 | exit M1 | Finally.cs:7:10:7:11 | exit M1 |
-| Finally.cs:14:9:16:9 | [finally: exception(Exception)] {...} | Finally.cs:14:9:16:9 | [finally: exception(Exception)] {...} |
-| Finally.cs:14:9:16:9 | {...} | Finally.cs:7:10:7:11 | enter M1 |
-| Finally.cs:14:9:16:9 | {...} | Finally.cs:14:9:16:9 | {...} |
+| Finally.cs:7:10:7:11 | exit M1 (abnormal) | Finally.cs:7:10:7:11 | exit M1 (abnormal) |
+| Finally.cs:7:10:7:11 | exit M1 (normal) | Finally.cs:7:10:7:11 | enter M1 |
+| Finally.cs:7:10:7:11 | exit M1 (normal) | Finally.cs:7:10:7:11 | exit M1 (normal) |
 | Finally.cs:19:10:19:11 | enter M2 | Finally.cs:19:10:19:11 | enter M2 |
 | Finally.cs:19:10:19:11 | exit M2 | Finally.cs:19:10:19:11 | exit M2 |
 | Finally.cs:19:10:19:11 | exit M2 (abnormal) | Finally.cs:19:10:19:11 | exit M2 (abnormal) |
 | Finally.cs:19:10:19:11 | exit M2 (normal) | Finally.cs:19:10:19:11 | enter M2 |
 | Finally.cs:19:10:19:11 | exit M2 (normal) | Finally.cs:19:10:19:11 | exit M2 (normal) |
 | Finally.cs:19:10:19:11 | exit M2 (normal) | Finally.cs:24:13:24:19 | return ...; |
-| Finally.cs:19:10:19:11 | exit M2 (normal) | Finally.cs:26:9:29:9 | [exception: Exception] catch (...) {...} |
-| Finally.cs:19:10:19:11 | exit M2 (normal) | Finally.cs:30:9:40:9 | [exception: Exception] catch (...) {...} |
-| Finally.cs:19:10:19:11 | exit M2 (normal) | Finally.cs:41:9:43:9 | [exception: Exception] catch (...) {...} |
+| Finally.cs:19:10:19:11 | exit M2 (normal) | Finally.cs:26:9:29:9 | catch (...) {...} |
+| Finally.cs:19:10:19:11 | exit M2 (normal) | Finally.cs:26:38:26:39 | IOException ex |
+| Finally.cs:19:10:19:11 | exit M2 (normal) | Finally.cs:27:9:29:9 | {...} |
+| Finally.cs:19:10:19:11 | exit M2 (normal) | Finally.cs:30:9:40:9 | catch (...) {...} |
+| Finally.cs:19:10:19:11 | exit M2 (normal) | Finally.cs:30:41:30:42 | ArgumentException ex |
+| Finally.cs:19:10:19:11 | exit M2 (normal) | Finally.cs:34:27:34:32 | throw ...; |
+| Finally.cs:19:10:19:11 | exit M2 (normal) | Finally.cs:41:9:43:9 | catch (...) {...} |
 | Finally.cs:19:10:19:11 | exit M2 (normal) | Finally.cs:42:9:43:9 | {...} |
+| Finally.cs:19:10:19:11 | exit M2 (normal) | Finally.cs:44:9:47:9 | catch {...} |
+| Finally.cs:19:10:19:11 | exit M2 (normal) | Finally.cs:49:9:51:9 | {...} |
 | Finally.cs:24:13:24:19 | return ...; | Finally.cs:24:13:24:19 | return ...; |
-| Finally.cs:26:9:29:9 | [exception: Exception] catch (...) {...} | Finally.cs:26:9:29:9 | [exception: Exception] catch (...) {...} |
-| Finally.cs:26:38:26:39 | [exception: Exception] IOException ex | Finally.cs:26:38:26:39 | [exception: Exception] IOException ex |
+| Finally.cs:26:9:29:9 | catch (...) {...} | Finally.cs:26:9:29:9 | catch (...) {...} |
+| Finally.cs:26:38:26:39 | IOException ex | Finally.cs:26:38:26:39 | IOException ex |
+| Finally.cs:27:9:29:9 | {...} | Finally.cs:26:38:26:39 | IOException ex |
 | Finally.cs:27:9:29:9 | {...} | Finally.cs:27:9:29:9 | {...} |
-| Finally.cs:30:9:40:9 | [exception: Exception] catch (...) {...} | Finally.cs:26:9:29:9 | [exception: Exception] catch (...) {...} |
-| Finally.cs:30:9:40:9 | [exception: Exception] catch (...) {...} | Finally.cs:30:9:40:9 | [exception: Exception] catch (...) {...} |
-| Finally.cs:30:41:30:42 | [exception: Exception] ArgumentException ex | Finally.cs:30:41:30:42 | [exception: Exception] ArgumentException ex |
+| Finally.cs:30:9:40:9 | catch (...) {...} | Finally.cs:30:9:40:9 | catch (...) {...} |
+| Finally.cs:30:41:30:42 | ArgumentException ex | Finally.cs:30:41:30:42 | ArgumentException ex |
+| Finally.cs:34:27:34:32 | throw ...; | Finally.cs:30:41:30:42 | ArgumentException ex |
 | Finally.cs:34:27:34:32 | throw ...; | Finally.cs:34:27:34:32 | throw ...; |
-| Finally.cs:41:9:43:9 | [exception: Exception] catch (...) {...} | Finally.cs:26:9:29:9 | [exception: Exception] catch (...) {...} |
-| Finally.cs:41:9:43:9 | [exception: Exception] catch (...) {...} | Finally.cs:30:9:40:9 | [exception: Exception] catch (...) {...} |
-| Finally.cs:41:9:43:9 | [exception: Exception] catch (...) {...} | Finally.cs:41:9:43:9 | [exception: Exception] catch (...) {...} |
-| Finally.cs:42:9:43:9 | {...} | Finally.cs:26:9:29:9 | [exception: Exception] catch (...) {...} |
-| Finally.cs:42:9:43:9 | {...} | Finally.cs:30:9:40:9 | [exception: Exception] catch (...) {...} |
-| Finally.cs:42:9:43:9 | {...} | Finally.cs:41:9:43:9 | [exception: Exception] catch (...) {...} |
+| Finally.cs:41:9:43:9 | catch (...) {...} | Finally.cs:41:9:43:9 | catch (...) {...} |
 | Finally.cs:42:9:43:9 | {...} | Finally.cs:42:9:43:9 | {...} |
+| Finally.cs:44:9:47:9 | catch {...} | Finally.cs:44:9:47:9 | catch {...} |
+| Finally.cs:49:9:51:9 | {...} | Finally.cs:19:10:19:11 | enter M2 |
+| Finally.cs:49:9:51:9 | {...} | Finally.cs:24:13:24:19 | return ...; |
+| Finally.cs:49:9:51:9 | {...} | Finally.cs:26:9:29:9 | catch (...) {...} |
+| Finally.cs:49:9:51:9 | {...} | Finally.cs:26:38:26:39 | IOException ex |
+| Finally.cs:49:9:51:9 | {...} | Finally.cs:27:9:29:9 | {...} |
+| Finally.cs:49:9:51:9 | {...} | Finally.cs:30:9:40:9 | catch (...) {...} |
+| Finally.cs:49:9:51:9 | {...} | Finally.cs:30:41:30:42 | ArgumentException ex |
+| Finally.cs:49:9:51:9 | {...} | Finally.cs:34:27:34:32 | throw ...; |
+| Finally.cs:49:9:51:9 | {...} | Finally.cs:41:9:43:9 | catch (...) {...} |
+| Finally.cs:49:9:51:9 | {...} | Finally.cs:42:9:43:9 | {...} |
+| Finally.cs:49:9:51:9 | {...} | Finally.cs:44:9:47:9 | catch {...} |
+| Finally.cs:49:9:51:9 | {...} | Finally.cs:49:9:51:9 | {...} |
 | Finally.cs:54:10:54:11 | enter M3 | Finally.cs:54:10:54:11 | enter M3 |
 | Finally.cs:54:10:54:11 | exit M3 | Finally.cs:54:10:54:11 | exit M3 |
 | Finally.cs:54:10:54:11 | exit M3 (abnormal) | Finally.cs:54:10:54:11 | exit M3 (abnormal) |
 | Finally.cs:54:10:54:11 | exit M3 (normal) | Finally.cs:54:10:54:11 | enter M3 |
 | Finally.cs:54:10:54:11 | exit M3 (normal) | Finally.cs:54:10:54:11 | exit M3 (normal) |
 | Finally.cs:54:10:54:11 | exit M3 (normal) | Finally.cs:59:13:59:19 | return ...; |
-| Finally.cs:54:10:54:11 | exit M3 (normal) | Finally.cs:61:9:64:9 | [exception: Exception] catch (...) {...} |
-| Finally.cs:54:10:54:11 | exit M3 (normal) | Finally.cs:65:9:67:9 | [exception: Exception] catch (...) {...} |
-| Finally.cs:54:10:54:11 | exit M3 (normal) | Finally.cs:65:26:65:26 | [exception: Exception] Exception e |
+| Finally.cs:54:10:54:11 | exit M3 (normal) | Finally.cs:61:9:64:9 | catch (...) {...} |
+| Finally.cs:54:10:54:11 | exit M3 (normal) | Finally.cs:61:38:61:39 | IOException ex |
+| Finally.cs:54:10:54:11 | exit M3 (normal) | Finally.cs:62:9:64:9 | {...} |
+| Finally.cs:54:10:54:11 | exit M3 (normal) | Finally.cs:65:9:67:9 | catch (...) {...} |
+| Finally.cs:54:10:54:11 | exit M3 (normal) | Finally.cs:65:26:65:26 | Exception e |
 | Finally.cs:54:10:54:11 | exit M3 (normal) | Finally.cs:66:9:67:9 | {...} |
+| Finally.cs:54:10:54:11 | exit M3 (normal) | Finally.cs:69:9:71:9 | {...} |
 | Finally.cs:59:13:59:19 | return ...; | Finally.cs:59:13:59:19 | return ...; |
-| Finally.cs:61:9:64:9 | [exception: Exception] catch (...) {...} | Finally.cs:61:9:64:9 | [exception: Exception] catch (...) {...} |
-| Finally.cs:61:38:61:39 | [exception: Exception] IOException ex | Finally.cs:61:38:61:39 | [exception: Exception] IOException ex |
+| Finally.cs:61:9:64:9 | catch (...) {...} | Finally.cs:61:9:64:9 | catch (...) {...} |
+| Finally.cs:61:38:61:39 | IOException ex | Finally.cs:61:38:61:39 | IOException ex |
+| Finally.cs:62:9:64:9 | {...} | Finally.cs:61:38:61:39 | IOException ex |
 | Finally.cs:62:9:64:9 | {...} | Finally.cs:62:9:64:9 | {...} |
-| Finally.cs:65:9:67:9 | [exception: Exception] catch (...) {...} | Finally.cs:61:9:64:9 | [exception: Exception] catch (...) {...} |
-| Finally.cs:65:9:67:9 | [exception: Exception] catch (...) {...} | Finally.cs:65:9:67:9 | [exception: Exception] catch (...) {...} |
-| Finally.cs:65:26:65:26 | [exception: Exception] Exception e | Finally.cs:61:9:64:9 | [exception: Exception] catch (...) {...} |
-| Finally.cs:65:26:65:26 | [exception: Exception] Exception e | Finally.cs:65:9:67:9 | [exception: Exception] catch (...) {...} |
-| Finally.cs:65:26:65:26 | [exception: Exception] Exception e | Finally.cs:65:26:65:26 | [exception: Exception] Exception e |
-| Finally.cs:66:9:67:9 | {...} | Finally.cs:61:9:64:9 | [exception: Exception] catch (...) {...} |
-| Finally.cs:66:9:67:9 | {...} | Finally.cs:65:9:67:9 | [exception: Exception] catch (...) {...} |
-| Finally.cs:66:9:67:9 | {...} | Finally.cs:65:26:65:26 | [exception: Exception] Exception e |
+| Finally.cs:65:9:67:9 | catch (...) {...} | Finally.cs:65:9:67:9 | catch (...) {...} |
+| Finally.cs:65:26:65:26 | Exception e | Finally.cs:65:26:65:26 | Exception e |
 | Finally.cs:66:9:67:9 | {...} | Finally.cs:66:9:67:9 | {...} |
-| Finally.cs:69:9:71:9 | [finally: exception(Exception)] {...} | Finally.cs:69:9:71:9 | [finally: exception(Exception)] {...} |
+| Finally.cs:69:9:71:9 | {...} | Finally.cs:54:10:54:11 | enter M3 |
+| Finally.cs:69:9:71:9 | {...} | Finally.cs:59:13:59:19 | return ...; |
+| Finally.cs:69:9:71:9 | {...} | Finally.cs:61:9:64:9 | catch (...) {...} |
+| Finally.cs:69:9:71:9 | {...} | Finally.cs:61:38:61:39 | IOException ex |
+| Finally.cs:69:9:71:9 | {...} | Finally.cs:62:9:64:9 | {...} |
+| Finally.cs:69:9:71:9 | {...} | Finally.cs:65:9:67:9 | catch (...) {...} |
+| Finally.cs:69:9:71:9 | {...} | Finally.cs:65:26:65:26 | Exception e |
+| Finally.cs:69:9:71:9 | {...} | Finally.cs:66:9:67:9 | {...} |
+| Finally.cs:69:9:71:9 | {...} | Finally.cs:69:9:71:9 | {...} |
 | Finally.cs:74:10:74:11 | enter M4 | Finally.cs:74:10:74:11 | enter M4 |
 | Finally.cs:74:10:74:11 | exit M4 | Finally.cs:74:10:74:11 | exit M4 |
 | Finally.cs:74:10:74:11 | exit M4 (abnormal) | Finally.cs:74:10:74:11 | exit M4 (abnormal) |
@@ -14682,42 +12826,35 @@ postBlockDominance
 | Finally.cs:74:10:74:11 | exit M4 (normal) | Finally.cs:85:17:86:26 | if (...) ... |
 | Finally.cs:74:10:74:11 | exit M4 (normal) | Finally.cs:86:21:86:26 | break; |
 | Finally.cs:74:10:74:11 | exit M4 (normal) | Finally.cs:89:13:99:13 | {...} |
-| Finally.cs:74:10:74:11 | exit M4 (normal) | Finally.cs:96:17:98:17 | [finally: break] {...} |
-| Finally.cs:74:10:74:11 | exit M4 (normal) | Finally.cs:96:17:98:17 | [finally: continue] {...} |
-| Finally.cs:74:10:74:11 | exit M4 (normal) | Finally.cs:96:17:98:17 | [finally: return] {...} |
+| Finally.cs:74:10:74:11 | exit M4 (normal) | Finally.cs:93:25:93:46 | throw ...; |
+| Finally.cs:74:10:74:11 | exit M4 (normal) | Finally.cs:93:31:93:45 | object creation of type Exception |
 | Finally.cs:74:10:74:11 | exit M4 (normal) | Finally.cs:96:17:98:17 | {...} |
 | Finally.cs:77:16:77:16 | access to local variable i | Finally.cs:74:10:74:11 | enter M4 |
 | Finally.cs:77:16:77:16 | access to local variable i | Finally.cs:77:16:77:16 | access to local variable i |
-| Finally.cs:77:16:77:16 | access to local variable i | Finally.cs:84:21:84:29 | continue; |
-| Finally.cs:77:16:77:16 | access to local variable i | Finally.cs:89:13:99:13 | {...} |
-| Finally.cs:77:16:77:16 | access to local variable i | Finally.cs:96:17:98:17 | [finally: continue] {...} |
-| Finally.cs:77:16:77:16 | access to local variable i | Finally.cs:96:17:98:17 | {...} |
 | Finally.cs:78:9:100:9 | {...} | Finally.cs:78:9:100:9 | {...} |
 | Finally.cs:82:21:82:27 | return ...; | Finally.cs:82:21:82:27 | return ...; |
 | Finally.cs:83:17:84:29 | if (...) ... | Finally.cs:83:17:84:29 | if (...) ... |
 | Finally.cs:84:21:84:29 | continue; | Finally.cs:84:21:84:29 | continue; |
 | Finally.cs:85:17:86:26 | if (...) ... | Finally.cs:85:17:86:26 | if (...) ... |
 | Finally.cs:86:21:86:26 | break; | Finally.cs:86:21:86:26 | break; |
+| Finally.cs:89:13:99:13 | {...} | Finally.cs:78:9:100:9 | {...} |
+| Finally.cs:89:13:99:13 | {...} | Finally.cs:82:21:82:27 | return ...; |
+| Finally.cs:89:13:99:13 | {...} | Finally.cs:83:17:84:29 | if (...) ... |
+| Finally.cs:89:13:99:13 | {...} | Finally.cs:84:21:84:29 | continue; |
+| Finally.cs:89:13:99:13 | {...} | Finally.cs:85:17:86:26 | if (...) ... |
+| Finally.cs:89:13:99:13 | {...} | Finally.cs:86:21:86:26 | break; |
 | Finally.cs:89:13:99:13 | {...} | Finally.cs:89:13:99:13 | {...} |
-| Finally.cs:93:25:93:46 | [finally: break] throw ...; | Finally.cs:93:25:93:46 | [finally: break] throw ...; |
-| Finally.cs:93:25:93:46 | [finally: continue] throw ...; | Finally.cs:93:25:93:46 | [finally: continue] throw ...; |
-| Finally.cs:93:25:93:46 | [finally: return] throw ...; | Finally.cs:93:25:93:46 | [finally: return] throw ...; |
 | Finally.cs:93:25:93:46 | throw ...; | Finally.cs:93:25:93:46 | throw ...; |
-| Finally.cs:93:31:93:45 | [finally: break] object creation of type Exception | Finally.cs:93:31:93:45 | [finally: break] object creation of type Exception |
-| Finally.cs:93:31:93:45 | [finally: continue] object creation of type Exception | Finally.cs:93:31:93:45 | [finally: continue] object creation of type Exception |
-| Finally.cs:93:31:93:45 | [finally: return] object creation of type Exception | Finally.cs:93:31:93:45 | [finally: return] object creation of type Exception |
 | Finally.cs:93:31:93:45 | object creation of type Exception | Finally.cs:93:31:93:45 | object creation of type Exception |
-| Finally.cs:96:17:98:17 | [finally(1): exception(Exception)] {...} | Finally.cs:96:17:98:17 | [finally(1): exception(Exception)] {...} |
-| Finally.cs:96:17:98:17 | [finally: break, finally(1): exception(Exception)] {...} | Finally.cs:96:17:98:17 | [finally: break, finally(1): exception(Exception)] {...} |
-| Finally.cs:96:17:98:17 | [finally: break] {...} | Finally.cs:86:21:86:26 | break; |
-| Finally.cs:96:17:98:17 | [finally: break] {...} | Finally.cs:96:17:98:17 | [finally: break] {...} |
-| Finally.cs:96:17:98:17 | [finally: continue, finally(1): exception(Exception)] {...} | Finally.cs:96:17:98:17 | [finally: continue, finally(1): exception(Exception)] {...} |
-| Finally.cs:96:17:98:17 | [finally: continue] {...} | Finally.cs:84:21:84:29 | continue; |
-| Finally.cs:96:17:98:17 | [finally: continue] {...} | Finally.cs:96:17:98:17 | [finally: continue] {...} |
-| Finally.cs:96:17:98:17 | [finally: return, finally(1): exception(Exception)] {...} | Finally.cs:96:17:98:17 | [finally: return, finally(1): exception(Exception)] {...} |
-| Finally.cs:96:17:98:17 | [finally: return] {...} | Finally.cs:82:21:82:27 | return ...; |
-| Finally.cs:96:17:98:17 | [finally: return] {...} | Finally.cs:96:17:98:17 | [finally: return] {...} |
+| Finally.cs:96:17:98:17 | {...} | Finally.cs:78:9:100:9 | {...} |
+| Finally.cs:96:17:98:17 | {...} | Finally.cs:82:21:82:27 | return ...; |
+| Finally.cs:96:17:98:17 | {...} | Finally.cs:83:17:84:29 | if (...) ... |
+| Finally.cs:96:17:98:17 | {...} | Finally.cs:84:21:84:29 | continue; |
+| Finally.cs:96:17:98:17 | {...} | Finally.cs:85:17:86:26 | if (...) ... |
+| Finally.cs:96:17:98:17 | {...} | Finally.cs:86:21:86:26 | break; |
 | Finally.cs:96:17:98:17 | {...} | Finally.cs:89:13:99:13 | {...} |
+| Finally.cs:96:17:98:17 | {...} | Finally.cs:93:25:93:46 | throw ...; |
+| Finally.cs:96:17:98:17 | {...} | Finally.cs:93:31:93:45 | object creation of type Exception |
 | Finally.cs:96:17:98:17 | {...} | Finally.cs:96:17:98:17 | {...} |
 | Finally.cs:103:10:103:11 | enter M5 | Finally.cs:103:10:103:11 | enter M5 |
 | Finally.cs:103:10:103:11 | exit M5 | Finally.cs:103:10:103:11 | exit M5 |
@@ -14730,132 +12867,82 @@ postBlockDominance
 | Finally.cs:103:10:103:11 | exit M5 (normal) | Finally.cs:109:13:110:49 | if (...) ... |
 | Finally.cs:103:10:103:11 | exit M5 (normal) | Finally.cs:109:17:109:28 | access to property Length |
 | Finally.cs:103:10:103:11 | exit M5 (normal) | Finally.cs:109:33:109:33 | 1 |
+| Finally.cs:103:10:103:11 | exit M5 (normal) | Finally.cs:110:17:110:49 | throw ...; |
+| Finally.cs:103:10:103:11 | exit M5 (normal) | Finally.cs:110:23:110:48 | object creation of type OutOfMemoryException |
 | Finally.cs:103:10:103:11 | exit M5 (normal) | Finally.cs:113:9:118:9 | {...} |
-| Finally.cs:103:10:103:11 | exit M5 (normal) | Finally.cs:114:17:114:36 | [false, finally: return] !... |
 | Finally.cs:103:10:103:11 | exit M5 (normal) | Finally.cs:114:17:114:36 | [false] !... |
-| Finally.cs:103:10:103:11 | exit M5 (normal) | Finally.cs:114:17:114:36 | [true, finally: return] !... |
 | Finally.cs:103:10:103:11 | exit M5 (normal) | Finally.cs:114:17:114:36 | [true] !... |
 | Finally.cs:103:10:103:11 | exit M5 (normal) | Finally.cs:115:17:115:41 | ...; |
-| Finally.cs:103:10:103:11 | exit M5 (normal) | Finally.cs:115:17:115:41 | [finally: return] ...; |
-| Finally.cs:103:10:103:11 | exit M5 (normal) | Finally.cs:116:13:117:37 | [finally: return] if (...) ... |
 | Finally.cs:103:10:103:11 | exit M5 (normal) | Finally.cs:116:13:117:37 | if (...) ... |
 | Finally.cs:103:10:103:11 | exit M5 (normal) | Finally.cs:117:17:117:37 | ...; |
-| Finally.cs:103:10:103:11 | exit M5 (normal) | Finally.cs:117:17:117:37 | [finally: return] ...; |
-| Finally.cs:107:17:107:28 | access to property Length | Finally.cs:103:10:103:11 | enter M5 |
 | Finally.cs:107:17:107:28 | access to property Length | Finally.cs:107:17:107:28 | access to property Length |
-| Finally.cs:107:33:107:33 | 0 | Finally.cs:103:10:103:11 | enter M5 |
-| Finally.cs:107:33:107:33 | 0 | Finally.cs:107:17:107:28 | access to property Length |
 | Finally.cs:107:33:107:33 | 0 | Finally.cs:107:33:107:33 | 0 |
 | Finally.cs:108:17:108:23 | return ...; | Finally.cs:108:17:108:23 | return ...; |
 | Finally.cs:109:13:110:49 | if (...) ... | Finally.cs:109:13:110:49 | if (...) ... |
-| Finally.cs:109:17:109:28 | access to property Length | Finally.cs:109:13:110:49 | if (...) ... |
 | Finally.cs:109:17:109:28 | access to property Length | Finally.cs:109:17:109:28 | access to property Length |
-| Finally.cs:109:33:109:33 | 1 | Finally.cs:109:13:110:49 | if (...) ... |
-| Finally.cs:109:33:109:33 | 1 | Finally.cs:109:17:109:28 | access to property Length |
 | Finally.cs:109:33:109:33 | 1 | Finally.cs:109:33:109:33 | 1 |
 | Finally.cs:110:17:110:49 | throw ...; | Finally.cs:110:17:110:49 | throw ...; |
 | Finally.cs:110:23:110:48 | object creation of type OutOfMemoryException | Finally.cs:110:23:110:48 | object creation of type OutOfMemoryException |
-| Finally.cs:113:9:118:9 | [finally: exception(Exception)] {...} | Finally.cs:113:9:118:9 | [finally: exception(Exception)] {...} |
-| Finally.cs:113:9:118:9 | [finally: exception(NullReferenceException)] {...} | Finally.cs:113:9:118:9 | [finally: exception(NullReferenceException)] {...} |
+| Finally.cs:113:9:118:9 | {...} | Finally.cs:103:10:103:11 | enter M5 |
+| Finally.cs:113:9:118:9 | {...} | Finally.cs:107:17:107:28 | access to property Length |
+| Finally.cs:113:9:118:9 | {...} | Finally.cs:107:33:107:33 | 0 |
+| Finally.cs:113:9:118:9 | {...} | Finally.cs:108:17:108:23 | return ...; |
 | Finally.cs:113:9:118:9 | {...} | Finally.cs:109:13:110:49 | if (...) ... |
 | Finally.cs:113:9:118:9 | {...} | Finally.cs:109:17:109:28 | access to property Length |
 | Finally.cs:113:9:118:9 | {...} | Finally.cs:109:33:109:33 | 1 |
+| Finally.cs:113:9:118:9 | {...} | Finally.cs:110:17:110:49 | throw ...; |
+| Finally.cs:113:9:118:9 | {...} | Finally.cs:110:23:110:48 | object creation of type OutOfMemoryException |
 | Finally.cs:113:9:118:9 | {...} | Finally.cs:113:9:118:9 | {...} |
-| Finally.cs:114:17:114:36 | [false, finally: exception(Exception)] !... | Finally.cs:114:17:114:36 | [false, finally: exception(Exception)] !... |
-| Finally.cs:114:17:114:36 | [false, finally: exception(NullReferenceException)] !... | Finally.cs:114:17:114:36 | [false, finally: exception(NullReferenceException)] !... |
-| Finally.cs:114:17:114:36 | [false, finally: exception(OutOfMemoryException)] !... | Finally.cs:114:17:114:36 | [false, finally: exception(OutOfMemoryException)] !... |
-| Finally.cs:114:17:114:36 | [false, finally: return] !... | Finally.cs:114:17:114:36 | [false, finally: return] !... |
 | Finally.cs:114:17:114:36 | [false] !... | Finally.cs:114:17:114:36 | [false] !... |
-| Finally.cs:114:17:114:36 | [true, finally: exception(Exception)] !... | Finally.cs:114:17:114:36 | [true, finally: exception(Exception)] !... |
-| Finally.cs:114:17:114:36 | [true, finally: exception(NullReferenceException)] !... | Finally.cs:114:17:114:36 | [true, finally: exception(NullReferenceException)] !... |
-| Finally.cs:114:17:114:36 | [true, finally: exception(OutOfMemoryException)] !... | Finally.cs:114:17:114:36 | [true, finally: exception(OutOfMemoryException)] !... |
-| Finally.cs:114:17:114:36 | [true, finally: return] !... | Finally.cs:114:17:114:36 | [true, finally: return] !... |
 | Finally.cs:114:17:114:36 | [true] !... | Finally.cs:114:17:114:36 | [true] !... |
 | Finally.cs:115:17:115:41 | ...; | Finally.cs:114:17:114:36 | [true] !... |
 | Finally.cs:115:17:115:41 | ...; | Finally.cs:115:17:115:41 | ...; |
-| Finally.cs:115:17:115:41 | [finally: exception(Exception)] ...; | Finally.cs:115:17:115:41 | [finally: exception(Exception)] ...; |
-| Finally.cs:115:17:115:41 | [finally: exception(NullReferenceException)] ...; | Finally.cs:115:17:115:41 | [finally: exception(NullReferenceException)] ...; |
-| Finally.cs:115:17:115:41 | [finally: exception(OutOfMemoryException)] ...; | Finally.cs:115:17:115:41 | [finally: exception(OutOfMemoryException)] ...; |
-| Finally.cs:115:17:115:41 | [finally: return] ...; | Finally.cs:114:17:114:36 | [true, finally: return] !... |
-| Finally.cs:115:17:115:41 | [finally: return] ...; | Finally.cs:115:17:115:41 | [finally: return] ...; |
-| Finally.cs:116:13:117:37 | [finally: exception(Exception)] if (...) ... | Finally.cs:116:13:117:37 | [finally: exception(Exception)] if (...) ... |
-| Finally.cs:116:13:117:37 | [finally: exception(NullReferenceException)] if (...) ... | Finally.cs:116:13:117:37 | [finally: exception(NullReferenceException)] if (...) ... |
-| Finally.cs:116:13:117:37 | [finally: exception(OutOfMemoryException)] if (...) ... | Finally.cs:116:13:117:37 | [finally: exception(OutOfMemoryException)] if (...) ... |
-| Finally.cs:116:13:117:37 | [finally: return] if (...) ... | Finally.cs:108:17:108:23 | return ...; |
-| Finally.cs:116:13:117:37 | [finally: return] if (...) ... | Finally.cs:114:17:114:36 | [false, finally: return] !... |
-| Finally.cs:116:13:117:37 | [finally: return] if (...) ... | Finally.cs:114:17:114:36 | [true, finally: return] !... |
-| Finally.cs:116:13:117:37 | [finally: return] if (...) ... | Finally.cs:115:17:115:41 | [finally: return] ...; |
-| Finally.cs:116:13:117:37 | [finally: return] if (...) ... | Finally.cs:116:13:117:37 | [finally: return] if (...) ... |
+| Finally.cs:116:13:117:37 | if (...) ... | Finally.cs:103:10:103:11 | enter M5 |
+| Finally.cs:116:13:117:37 | if (...) ... | Finally.cs:107:17:107:28 | access to property Length |
+| Finally.cs:116:13:117:37 | if (...) ... | Finally.cs:107:33:107:33 | 0 |
+| Finally.cs:116:13:117:37 | if (...) ... | Finally.cs:108:17:108:23 | return ...; |
 | Finally.cs:116:13:117:37 | if (...) ... | Finally.cs:109:13:110:49 | if (...) ... |
 | Finally.cs:116:13:117:37 | if (...) ... | Finally.cs:109:17:109:28 | access to property Length |
 | Finally.cs:116:13:117:37 | if (...) ... | Finally.cs:109:33:109:33 | 1 |
+| Finally.cs:116:13:117:37 | if (...) ... | Finally.cs:110:17:110:49 | throw ...; |
+| Finally.cs:116:13:117:37 | if (...) ... | Finally.cs:110:23:110:48 | object creation of type OutOfMemoryException |
 | Finally.cs:116:13:117:37 | if (...) ... | Finally.cs:113:9:118:9 | {...} |
 | Finally.cs:116:13:117:37 | if (...) ... | Finally.cs:114:17:114:36 | [false] !... |
 | Finally.cs:116:13:117:37 | if (...) ... | Finally.cs:114:17:114:36 | [true] !... |
 | Finally.cs:116:13:117:37 | if (...) ... | Finally.cs:115:17:115:41 | ...; |
 | Finally.cs:116:13:117:37 | if (...) ... | Finally.cs:116:13:117:37 | if (...) ... |
 | Finally.cs:117:17:117:37 | ...; | Finally.cs:117:17:117:37 | ...; |
-| Finally.cs:117:17:117:37 | [finally: exception(Exception)] ...; | Finally.cs:117:17:117:37 | [finally: exception(Exception)] ...; |
-| Finally.cs:117:17:117:37 | [finally: exception(NullReferenceException)] ...; | Finally.cs:117:17:117:37 | [finally: exception(NullReferenceException)] ...; |
-| Finally.cs:117:17:117:37 | [finally: exception(OutOfMemoryException)] ...; | Finally.cs:117:17:117:37 | [finally: exception(OutOfMemoryException)] ...; |
-| Finally.cs:117:17:117:37 | [finally: return] ...; | Finally.cs:117:17:117:37 | [finally: return] ...; |
 | Finally.cs:121:10:121:11 | enter M6 | Finally.cs:121:10:121:11 | enter M6 |
 | Finally.cs:133:10:133:11 | enter M7 | Finally.cs:133:10:133:11 | enter M7 |
-| Finally.cs:133:10:133:11 | exit M7 (abnormal) | Finally.cs:133:10:133:11 | exit M7 (abnormal) |
-| Finally.cs:140:9:143:9 | [finally: exception(Exception)] {...} | Finally.cs:140:9:143:9 | [finally: exception(Exception)] {...} |
-| Finally.cs:140:9:143:9 | {...} | Finally.cs:140:9:143:9 | {...} |
 | Finally.cs:147:10:147:11 | enter M8 | Finally.cs:147:10:147:11 | enter M8 |
 | Finally.cs:147:10:147:11 | exit M8 | Finally.cs:147:10:147:11 | exit M8 |
 | Finally.cs:147:10:147:11 | exit M8 (abnormal) | Finally.cs:147:10:147:11 | exit M8 (abnormal) |
 | Finally.cs:147:10:147:11 | exit M8 (normal) | Finally.cs:147:10:147:11 | enter M8 |
 | Finally.cs:147:10:147:11 | exit M8 (normal) | Finally.cs:147:10:147:11 | exit M8 (normal) |
+| Finally.cs:147:10:147:11 | exit M8 (normal) | Finally.cs:152:17:152:50 | throw ...; |
+| Finally.cs:147:10:147:11 | exit M8 (normal) | Finally.cs:152:23:152:49 | object creation of type ArgumentNullException |
 | Finally.cs:147:10:147:11 | exit M8 (normal) | Finally.cs:155:9:169:9 | {...} |
 | Finally.cs:147:10:147:11 | exit M8 (normal) | Finally.cs:158:36:158:36 | 1 |
 | Finally.cs:147:10:147:11 | exit M8 (normal) | Finally.cs:159:21:159:45 | throw ...; |
 | Finally.cs:147:10:147:11 | exit M8 (normal) | Finally.cs:159:41:159:43 | "1" |
-| Finally.cs:147:10:147:11 | exit M8 (normal) | Finally.cs:161:13:164:13 | [exception: Exception] catch (...) {...} |
-| Finally.cs:147:10:147:11 | exit M8 (normal) | Finally.cs:161:13:164:13 | [exception: NullReferenceException] catch (...) {...} |
-| Finally.cs:147:10:147:11 | exit M8 (normal) | Finally.cs:161:30:161:30 | [exception: Exception] Exception e |
-| Finally.cs:147:10:147:11 | exit M8 (normal) | Finally.cs:161:30:161:30 | [exception: NullReferenceException] Exception e |
+| Finally.cs:147:10:147:11 | exit M8 (normal) | Finally.cs:161:13:164:13 | catch (...) {...} |
+| Finally.cs:147:10:147:11 | exit M8 (normal) | Finally.cs:161:30:161:30 | Exception e |
 | Finally.cs:147:10:147:11 | exit M8 (normal) | Finally.cs:162:13:164:13 | {...} |
 | Finally.cs:147:10:147:11 | exit M8 (normal) | Finally.cs:165:13:168:13 | catch {...} |
 | Finally.cs:152:17:152:50 | throw ...; | Finally.cs:152:17:152:50 | throw ...; |
 | Finally.cs:152:23:152:49 | object creation of type ArgumentNullException | Finally.cs:152:23:152:49 | object creation of type ArgumentNullException |
-| Finally.cs:155:9:169:9 | [finally: exception(Exception)] {...} | Finally.cs:155:9:169:9 | [finally: exception(Exception)] {...} |
 | Finally.cs:155:9:169:9 | {...} | Finally.cs:147:10:147:11 | enter M8 |
+| Finally.cs:155:9:169:9 | {...} | Finally.cs:152:17:152:50 | throw ...; |
+| Finally.cs:155:9:169:9 | {...} | Finally.cs:152:23:152:49 | object creation of type ArgumentNullException |
 | Finally.cs:155:9:169:9 | {...} | Finally.cs:155:9:169:9 | {...} |
 | Finally.cs:158:36:158:36 | 1 | Finally.cs:158:36:158:36 | 1 |
-| Finally.cs:158:36:158:36 | [finally: exception(ArgumentNullException)] 1 | Finally.cs:158:36:158:36 | [finally: exception(ArgumentNullException)] 1 |
-| Finally.cs:158:36:158:36 | [finally: exception(Exception)] 1 | Finally.cs:158:36:158:36 | [finally: exception(Exception)] 1 |
-| Finally.cs:159:21:159:45 | [finally: exception(ArgumentNullException)] throw ...; | Finally.cs:159:21:159:45 | [finally: exception(ArgumentNullException)] throw ...; |
-| Finally.cs:159:21:159:45 | [finally: exception(Exception)] throw ...; | Finally.cs:159:21:159:45 | [finally: exception(Exception)] throw ...; |
 | Finally.cs:159:21:159:45 | throw ...; | Finally.cs:159:21:159:45 | throw ...; |
 | Finally.cs:159:41:159:43 | "1" | Finally.cs:159:41:159:43 | "1" |
-| Finally.cs:159:41:159:43 | [finally: exception(ArgumentNullException)] "1" | Finally.cs:159:41:159:43 | [finally: exception(ArgumentNullException)] "1" |
-| Finally.cs:159:41:159:43 | [finally: exception(Exception)] "1" | Finally.cs:159:41:159:43 | [finally: exception(Exception)] "1" |
-| Finally.cs:161:13:164:13 | [exception: Exception] catch (...) {...} | Finally.cs:159:21:159:45 | throw ...; |
-| Finally.cs:161:13:164:13 | [exception: Exception] catch (...) {...} | Finally.cs:159:41:159:43 | "1" |
-| Finally.cs:161:13:164:13 | [exception: Exception] catch (...) {...} | Finally.cs:161:13:164:13 | [exception: Exception] catch (...) {...} |
-| Finally.cs:161:13:164:13 | [exception: NullReferenceException] catch (...) {...} | Finally.cs:161:13:164:13 | [exception: NullReferenceException] catch (...) {...} |
-| Finally.cs:161:13:164:13 | [finally: exception(ArgumentNullException), exception: Exception] catch (...) {...} | Finally.cs:161:13:164:13 | [finally: exception(ArgumentNullException), exception: Exception] catch (...) {...} |
-| Finally.cs:161:13:164:13 | [finally: exception(ArgumentNullException), exception: NullReferenceException] catch (...) {...} | Finally.cs:161:13:164:13 | [finally: exception(ArgumentNullException), exception: NullReferenceException] catch (...) {...} |
-| Finally.cs:161:13:164:13 | [finally: exception(Exception), exception: Exception] catch (...) {...} | Finally.cs:161:13:164:13 | [finally: exception(Exception), exception: Exception] catch (...) {...} |
-| Finally.cs:161:13:164:13 | [finally: exception(Exception), exception: NullReferenceException] catch (...) {...} | Finally.cs:161:13:164:13 | [finally: exception(Exception), exception: NullReferenceException] catch (...) {...} |
-| Finally.cs:161:30:161:30 | [exception: Exception] Exception e | Finally.cs:159:21:159:45 | throw ...; |
-| Finally.cs:161:30:161:30 | [exception: Exception] Exception e | Finally.cs:159:41:159:43 | "1" |
-| Finally.cs:161:30:161:30 | [exception: Exception] Exception e | Finally.cs:161:13:164:13 | [exception: Exception] catch (...) {...} |
-| Finally.cs:161:30:161:30 | [exception: Exception] Exception e | Finally.cs:161:30:161:30 | [exception: Exception] Exception e |
-| Finally.cs:161:30:161:30 | [exception: NullReferenceException] Exception e | Finally.cs:161:13:164:13 | [exception: NullReferenceException] catch (...) {...} |
-| Finally.cs:161:30:161:30 | [exception: NullReferenceException] Exception e | Finally.cs:161:30:161:30 | [exception: NullReferenceException] Exception e |
-| Finally.cs:161:30:161:30 | [finally: exception(ArgumentNullException), exception: Exception] Exception e | Finally.cs:161:30:161:30 | [finally: exception(ArgumentNullException), exception: Exception] Exception e |
-| Finally.cs:161:30:161:30 | [finally: exception(ArgumentNullException), exception: NullReferenceException] Exception e | Finally.cs:161:30:161:30 | [finally: exception(ArgumentNullException), exception: NullReferenceException] Exception e |
-| Finally.cs:161:30:161:30 | [finally: exception(Exception), exception: Exception] Exception e | Finally.cs:161:30:161:30 | [finally: exception(Exception), exception: Exception] Exception e |
-| Finally.cs:161:30:161:30 | [finally: exception(Exception), exception: NullReferenceException] Exception e | Finally.cs:161:30:161:30 | [finally: exception(Exception), exception: NullReferenceException] Exception e |
-| Finally.cs:162:13:164:13 | [finally: exception(ArgumentNullException)] {...} | Finally.cs:162:13:164:13 | [finally: exception(ArgumentNullException)] {...} |
-| Finally.cs:162:13:164:13 | [finally: exception(Exception)] {...} | Finally.cs:162:13:164:13 | [finally: exception(Exception)] {...} |
+| Finally.cs:161:13:164:13 | catch (...) {...} | Finally.cs:159:21:159:45 | throw ...; |
+| Finally.cs:161:13:164:13 | catch (...) {...} | Finally.cs:159:41:159:43 | "1" |
+| Finally.cs:161:13:164:13 | catch (...) {...} | Finally.cs:161:13:164:13 | catch (...) {...} |
+| Finally.cs:161:30:161:30 | Exception e | Finally.cs:161:30:161:30 | Exception e |
 | Finally.cs:162:13:164:13 | {...} | Finally.cs:162:13:164:13 | {...} |
-| Finally.cs:165:13:168:13 | [finally: exception(ArgumentNullException)] catch {...} | Finally.cs:165:13:168:13 | [finally: exception(ArgumentNullException)] catch {...} |
-| Finally.cs:165:13:168:13 | [finally: exception(Exception)] catch {...} | Finally.cs:165:13:168:13 | [finally: exception(Exception)] catch {...} |
 | Finally.cs:165:13:168:13 | catch {...} | Finally.cs:165:13:168:13 | catch {...} |
 | Finally.cs:172:11:172:20 | enter ExceptionA | Finally.cs:172:11:172:20 | enter ExceptionA |
 | Finally.cs:173:11:173:20 | enter ExceptionB | Finally.cs:173:11:173:20 | enter ExceptionB |
@@ -14865,82 +12952,71 @@ postBlockDominance
 | Finally.cs:176:10:176:11 | exit M9 (abnormal) | Finally.cs:176:10:176:11 | exit M9 (abnormal) |
 | Finally.cs:176:10:176:11 | exit M9 (normal) | Finally.cs:176:10:176:11 | enter M9 |
 | Finally.cs:176:10:176:11 | exit M9 (normal) | Finally.cs:176:10:176:11 | exit M9 (normal) |
-| Finally.cs:176:10:176:11 | exit M9 (normal) | Finally.cs:183:9:192:9 | [b1 (line 176): false] {...} |
-| Finally.cs:176:10:176:11 | exit M9 (normal) | Finally.cs:186:25:186:47 | [b1 (line 176): false, b2 (line 176): true] throw ...; |
-| Finally.cs:176:10:176:11 | exit M9 (normal) | Finally.cs:186:31:186:46 | [b1 (line 176): false, b2 (line 176): true] object creation of type ExceptionB |
-| Finally.cs:176:10:176:11 | exit M9 (normal) | Finally.cs:188:13:191:13 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] catch (...) {...} |
-| Finally.cs:176:10:176:11 | exit M9 (normal) | Finally.cs:188:38:188:39 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] access to parameter b2 |
-| Finally.cs:176:10:176:11 | exit M9 (normal) | Finally.cs:188:38:188:39 | [exception: ExceptionB, b1 (line 176): false, b2 (line 176): true] access to parameter b2 |
-| Finally.cs:176:10:176:11 | exit M9 (normal) | Finally.cs:189:13:191:13 | [b1 (line 176): false] {...} |
-| Finally.cs:180:21:180:43 | [b1 (line 176): true] throw ...; | Finally.cs:180:21:180:43 | [b1 (line 176): true] throw ...; |
-| Finally.cs:180:27:180:42 | [b1 (line 176): true] object creation of type ExceptionA | Finally.cs:180:27:180:42 | [b1 (line 176): true] object creation of type ExceptionA |
-| Finally.cs:183:9:192:9 | [b1 (line 176): false] {...} | Finally.cs:176:10:176:11 | enter M9 |
-| Finally.cs:183:9:192:9 | [b1 (line 176): false] {...} | Finally.cs:183:9:192:9 | [b1 (line 176): false] {...} |
-| Finally.cs:183:9:192:9 | [finally: exception(Exception), b1 (line 176): true] {...} | Finally.cs:183:9:192:9 | [finally: exception(Exception), b1 (line 176): true] {...} |
-| Finally.cs:186:25:186:47 | [b1 (line 176): false, b2 (line 176): true] throw ...; | Finally.cs:186:25:186:47 | [b1 (line 176): false, b2 (line 176): true] throw ...; |
-| Finally.cs:186:25:186:47 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] throw ...; | Finally.cs:186:25:186:47 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] throw ...; |
-| Finally.cs:186:25:186:47 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] throw ...; | Finally.cs:186:25:186:47 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] throw ...; |
-| Finally.cs:186:31:186:46 | [b1 (line 176): false, b2 (line 176): true] object creation of type ExceptionB | Finally.cs:186:31:186:46 | [b1 (line 176): false, b2 (line 176): true] object creation of type ExceptionB |
-| Finally.cs:186:31:186:46 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB | Finally.cs:186:31:186:46 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB |
-| Finally.cs:186:31:186:46 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB | Finally.cs:186:31:186:46 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB |
-| Finally.cs:188:13:191:13 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] catch (...) {...} | Finally.cs:188:13:191:13 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] catch (...) {...} |
-| Finally.cs:188:13:191:13 | [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | Finally.cs:188:13:191:13 | [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...} |
-| Finally.cs:188:13:191:13 | [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | Finally.cs:188:13:191:13 | [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...} |
-| Finally.cs:188:38:188:39 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] access to parameter b2 | Finally.cs:188:13:191:13 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] catch (...) {...} |
-| Finally.cs:188:38:188:39 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] access to parameter b2 | Finally.cs:188:38:188:39 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] access to parameter b2 |
-| Finally.cs:188:38:188:39 | [exception: ExceptionB, b1 (line 176): false, b2 (line 176): true] access to parameter b2 | Finally.cs:186:25:186:47 | [b1 (line 176): false, b2 (line 176): true] throw ...; |
-| Finally.cs:188:38:188:39 | [exception: ExceptionB, b1 (line 176): false, b2 (line 176): true] access to parameter b2 | Finally.cs:188:38:188:39 | [exception: ExceptionB, b1 (line 176): false, b2 (line 176): true] access to parameter b2 |
-| Finally.cs:188:38:188:39 | [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | Finally.cs:188:38:188:39 | [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] access to parameter b2 |
-| Finally.cs:188:38:188:39 | [finally: exception(Exception), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | Finally.cs:188:38:188:39 | [finally: exception(Exception), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] access to parameter b2 |
-| Finally.cs:188:38:188:39 | [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | Finally.cs:188:38:188:39 | [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] access to parameter b2 |
-| Finally.cs:188:38:188:39 | [finally: exception(ExceptionA), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | Finally.cs:188:38:188:39 | [finally: exception(ExceptionA), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] access to parameter b2 |
-| Finally.cs:189:13:191:13 | [b1 (line 176): false] {...} | Finally.cs:186:25:186:47 | [b1 (line 176): false, b2 (line 176): true] throw ...; |
-| Finally.cs:189:13:191:13 | [b1 (line 176): false] {...} | Finally.cs:186:31:186:46 | [b1 (line 176): false, b2 (line 176): true] object creation of type ExceptionB |
-| Finally.cs:189:13:191:13 | [b1 (line 176): false] {...} | Finally.cs:188:13:191:13 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] catch (...) {...} |
-| Finally.cs:189:13:191:13 | [b1 (line 176): false] {...} | Finally.cs:188:38:188:39 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] access to parameter b2 |
-| Finally.cs:189:13:191:13 | [b1 (line 176): false] {...} | Finally.cs:188:38:188:39 | [exception: ExceptionB, b1 (line 176): false, b2 (line 176): true] access to parameter b2 |
-| Finally.cs:189:13:191:13 | [b1 (line 176): false] {...} | Finally.cs:189:13:191:13 | [b1 (line 176): false] {...} |
-| Finally.cs:189:13:191:13 | [finally: exception(Exception), b1 (line 176): true] {...} | Finally.cs:189:13:191:13 | [finally: exception(Exception), b1 (line 176): true] {...} |
-| Finally.cs:189:13:191:13 | [finally: exception(ExceptionA), b1 (line 176): true] {...} | Finally.cs:189:13:191:13 | [finally: exception(ExceptionA), b1 (line 176): true] {...} |
-| Finally.cs:190:31:190:46 | [finally: exception(Exception)] object creation of type ExceptionC | Finally.cs:190:31:190:46 | [finally: exception(Exception)] object creation of type ExceptionC |
-| Finally.cs:190:31:190:46 | [finally: exception(ExceptionA)] object creation of type ExceptionC | Finally.cs:190:31:190:46 | [finally: exception(ExceptionA)] object creation of type ExceptionC |
+| Finally.cs:176:10:176:11 | exit M9 (normal) | Finally.cs:180:21:180:43 | throw ...; |
+| Finally.cs:176:10:176:11 | exit M9 (normal) | Finally.cs:180:27:180:42 | object creation of type ExceptionA |
+| Finally.cs:176:10:176:11 | exit M9 (normal) | Finally.cs:183:9:192:9 | {...} |
+| Finally.cs:176:10:176:11 | exit M9 (normal) | Finally.cs:186:25:186:47 | throw ...; |
+| Finally.cs:176:10:176:11 | exit M9 (normal) | Finally.cs:186:31:186:46 | object creation of type ExceptionB |
+| Finally.cs:176:10:176:11 | exit M9 (normal) | Finally.cs:188:13:191:13 | catch (...) {...} |
+| Finally.cs:176:10:176:11 | exit M9 (normal) | Finally.cs:188:38:188:39 | access to parameter b2 |
+| Finally.cs:176:10:176:11 | exit M9 (normal) | Finally.cs:189:13:191:13 | {...} |
+| Finally.cs:180:21:180:43 | throw ...; | Finally.cs:180:21:180:43 | throw ...; |
+| Finally.cs:180:27:180:42 | object creation of type ExceptionA | Finally.cs:180:27:180:42 | object creation of type ExceptionA |
+| Finally.cs:183:9:192:9 | {...} | Finally.cs:176:10:176:11 | enter M9 |
+| Finally.cs:183:9:192:9 | {...} | Finally.cs:180:21:180:43 | throw ...; |
+| Finally.cs:183:9:192:9 | {...} | Finally.cs:180:27:180:42 | object creation of type ExceptionA |
+| Finally.cs:183:9:192:9 | {...} | Finally.cs:183:9:192:9 | {...} |
+| Finally.cs:186:25:186:47 | throw ...; | Finally.cs:186:25:186:47 | throw ...; |
+| Finally.cs:186:31:186:46 | object creation of type ExceptionB | Finally.cs:186:31:186:46 | object creation of type ExceptionB |
+| Finally.cs:188:13:191:13 | catch (...) {...} | Finally.cs:186:25:186:47 | throw ...; |
+| Finally.cs:188:13:191:13 | catch (...) {...} | Finally.cs:186:31:186:46 | object creation of type ExceptionB |
+| Finally.cs:188:13:191:13 | catch (...) {...} | Finally.cs:188:13:191:13 | catch (...) {...} |
+| Finally.cs:188:38:188:39 | access to parameter b2 | Finally.cs:186:25:186:47 | throw ...; |
+| Finally.cs:188:38:188:39 | access to parameter b2 | Finally.cs:186:31:186:46 | object creation of type ExceptionB |
+| Finally.cs:188:38:188:39 | access to parameter b2 | Finally.cs:188:13:191:13 | catch (...) {...} |
+| Finally.cs:188:38:188:39 | access to parameter b2 | Finally.cs:188:38:188:39 | access to parameter b2 |
+| Finally.cs:189:13:191:13 | {...} | Finally.cs:186:25:186:47 | throw ...; |
+| Finally.cs:189:13:191:13 | {...} | Finally.cs:186:31:186:46 | object creation of type ExceptionB |
+| Finally.cs:189:13:191:13 | {...} | Finally.cs:188:13:191:13 | catch (...) {...} |
+| Finally.cs:189:13:191:13 | {...} | Finally.cs:188:38:188:39 | access to parameter b2 |
+| Finally.cs:189:13:191:13 | {...} | Finally.cs:189:13:191:13 | {...} |
+| Finally.cs:190:31:190:46 | object creation of type ExceptionC | Finally.cs:190:31:190:46 | object creation of type ExceptionC |
 | Finally.cs:195:10:195:12 | enter M10 | Finally.cs:195:10:195:12 | enter M10 |
 | Finally.cs:195:10:195:12 | exit M10 | Finally.cs:195:10:195:12 | exit M10 |
 | Finally.cs:195:10:195:12 | exit M10 (abnormal) | Finally.cs:195:10:195:12 | exit M10 (abnormal) |
 | Finally.cs:199:21:199:43 | throw ...; | Finally.cs:199:21:199:43 | throw ...; |
 | Finally.cs:199:27:199:42 | object creation of type ExceptionA | Finally.cs:199:27:199:42 | object creation of type ExceptionA |
-| Finally.cs:202:9:212:9 | [finally: exception(Exception)] {...} | Finally.cs:202:9:212:9 | [finally: exception(Exception)] {...} |
 | Finally.cs:202:9:212:9 | {...} | Finally.cs:195:10:195:12 | enter M10 |
+| Finally.cs:202:9:212:9 | {...} | Finally.cs:199:21:199:43 | throw ...; |
+| Finally.cs:202:9:212:9 | {...} | Finally.cs:199:27:199:42 | object creation of type ExceptionA |
 | Finally.cs:202:9:212:9 | {...} | Finally.cs:202:9:212:9 | {...} |
-| Finally.cs:205:25:205:47 | [finally: exception(Exception)] throw ...; | Finally.cs:205:25:205:47 | [finally: exception(Exception)] throw ...; |
-| Finally.cs:205:25:205:47 | [finally: exception(ExceptionA)] throw ...; | Finally.cs:205:25:205:47 | [finally: exception(ExceptionA)] throw ...; |
 | Finally.cs:205:25:205:47 | throw ...; | Finally.cs:205:25:205:47 | throw ...; |
-| Finally.cs:205:31:205:46 | [finally: exception(Exception)] object creation of type ExceptionB | Finally.cs:205:31:205:46 | [finally: exception(Exception)] object creation of type ExceptionB |
-| Finally.cs:205:31:205:46 | [finally: exception(ExceptionA)] object creation of type ExceptionB | Finally.cs:205:31:205:46 | [finally: exception(ExceptionA)] object creation of type ExceptionB |
 | Finally.cs:205:31:205:46 | object creation of type ExceptionB | Finally.cs:205:31:205:46 | object creation of type ExceptionB |
-| Finally.cs:208:13:210:13 | [finally(1): exception(Exception)] {...} | Finally.cs:208:13:210:13 | [finally(1): exception(Exception)] {...} |
-| Finally.cs:208:13:210:13 | [finally: exception(Exception), finally(1): exception(Exception)] {...} | Finally.cs:208:13:210:13 | [finally: exception(Exception), finally(1): exception(Exception)] {...} |
-| Finally.cs:208:13:210:13 | [finally: exception(Exception)] {...} | Finally.cs:208:13:210:13 | [finally: exception(Exception)] {...} |
-| Finally.cs:208:13:210:13 | [finally: exception(ExceptionA), finally(1): exception(Exception)] {...} | Finally.cs:208:13:210:13 | [finally: exception(ExceptionA), finally(1): exception(Exception)] {...} |
-| Finally.cs:208:13:210:13 | [finally: exception(ExceptionA)] {...} | Finally.cs:208:13:210:13 | [finally: exception(ExceptionA)] {...} |
 | Finally.cs:208:13:210:13 | {...} | Finally.cs:195:10:195:12 | enter M10 |
+| Finally.cs:208:13:210:13 | {...} | Finally.cs:199:21:199:43 | throw ...; |
+| Finally.cs:208:13:210:13 | {...} | Finally.cs:199:27:199:42 | object creation of type ExceptionA |
 | Finally.cs:208:13:210:13 | {...} | Finally.cs:202:9:212:9 | {...} |
+| Finally.cs:208:13:210:13 | {...} | Finally.cs:205:25:205:47 | throw ...; |
+| Finally.cs:208:13:210:13 | {...} | Finally.cs:205:31:205:46 | object creation of type ExceptionB |
 | Finally.cs:208:13:210:13 | {...} | Finally.cs:208:13:210:13 | {...} |
-| Finally.cs:209:31:209:46 | [finally(1): exception(Exception)] object creation of type ExceptionC | Finally.cs:209:31:209:46 | [finally(1): exception(Exception)] object creation of type ExceptionC |
-| Finally.cs:209:31:209:46 | [finally(1): exception(ExceptionB)] object creation of type ExceptionC | Finally.cs:209:31:209:46 | [finally(1): exception(ExceptionB)] object creation of type ExceptionC |
-| Finally.cs:209:31:209:46 | [finally: exception(Exception), finally(1): exception(Exception)] object creation of type ExceptionC | Finally.cs:209:31:209:46 | [finally: exception(Exception), finally(1): exception(Exception)] object creation of type ExceptionC |
-| Finally.cs:209:31:209:46 | [finally: exception(Exception), finally(1): exception(ExceptionB)] object creation of type ExceptionC | Finally.cs:209:31:209:46 | [finally: exception(Exception), finally(1): exception(ExceptionB)] object creation of type ExceptionC |
-| Finally.cs:209:31:209:46 | [finally: exception(Exception)] object creation of type ExceptionC | Finally.cs:209:31:209:46 | [finally: exception(Exception)] object creation of type ExceptionC |
-| Finally.cs:209:31:209:46 | [finally: exception(ExceptionA), finally(1): exception(Exception)] object creation of type ExceptionC | Finally.cs:209:31:209:46 | [finally: exception(ExceptionA), finally(1): exception(Exception)] object creation of type ExceptionC |
-| Finally.cs:209:31:209:46 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] object creation of type ExceptionC | Finally.cs:209:31:209:46 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] object creation of type ExceptionC |
-| Finally.cs:209:31:209:46 | [finally: exception(ExceptionA)] object creation of type ExceptionC | Finally.cs:209:31:209:46 | [finally: exception(ExceptionA)] object creation of type ExceptionC |
 | Finally.cs:209:31:209:46 | object creation of type ExceptionC | Finally.cs:209:31:209:46 | object creation of type ExceptionC |
 | Finally.cs:211:13:211:29 | ...; | Finally.cs:195:10:195:12 | enter M10 |
+| Finally.cs:211:13:211:29 | ...; | Finally.cs:199:21:199:43 | throw ...; |
+| Finally.cs:211:13:211:29 | ...; | Finally.cs:199:27:199:42 | object creation of type ExceptionA |
 | Finally.cs:211:13:211:29 | ...; | Finally.cs:202:9:212:9 | {...} |
+| Finally.cs:211:13:211:29 | ...; | Finally.cs:205:25:205:47 | throw ...; |
+| Finally.cs:211:13:211:29 | ...; | Finally.cs:205:31:205:46 | object creation of type ExceptionB |
 | Finally.cs:211:13:211:29 | ...; | Finally.cs:208:13:210:13 | {...} |
 | Finally.cs:211:13:211:29 | ...; | Finally.cs:211:13:211:29 | ...; |
-| Finally.cs:211:13:211:29 | [finally: exception(Exception)] ...; | Finally.cs:211:13:211:29 | [finally: exception(Exception)] ...; |
-| Finally.cs:211:13:211:29 | [finally: exception(ExceptionA)] ...; | Finally.cs:211:13:211:29 | [finally: exception(ExceptionA)] ...; |
+| Finally.cs:213:9:213:25 | ...; | Finally.cs:195:10:195:12 | enter M10 |
+| Finally.cs:213:9:213:25 | ...; | Finally.cs:199:21:199:43 | throw ...; |
+| Finally.cs:213:9:213:25 | ...; | Finally.cs:199:27:199:42 | object creation of type ExceptionA |
+| Finally.cs:213:9:213:25 | ...; | Finally.cs:202:9:212:9 | {...} |
+| Finally.cs:213:9:213:25 | ...; | Finally.cs:205:25:205:47 | throw ...; |
+| Finally.cs:213:9:213:25 | ...; | Finally.cs:205:31:205:46 | object creation of type ExceptionB |
+| Finally.cs:213:9:213:25 | ...; | Finally.cs:208:13:210:13 | {...} |
+| Finally.cs:213:9:213:25 | ...; | Finally.cs:211:13:211:29 | ...; |
+| Finally.cs:213:9:213:25 | ...; | Finally.cs:213:9:213:25 | ...; |
 | Finally.cs:216:10:216:12 | enter M11 | Finally.cs:216:10:216:12 | enter M11 |
 | Finally.cs:222:9:225:9 | catch {...} | Finally.cs:222:9:225:9 | catch {...} |
 | Finally.cs:227:9:229:9 | {...} | Finally.cs:216:10:216:12 | enter M11 |
@@ -14951,34 +13027,44 @@ postBlockDominance
 | Finally.cs:233:10:233:12 | exit M12 (abnormal) | Finally.cs:233:10:233:12 | exit M12 (abnormal) |
 | Finally.cs:240:21:240:43 | throw ...; | Finally.cs:240:21:240:43 | throw ...; |
 | Finally.cs:240:27:240:42 | object creation of type ExceptionA | Finally.cs:240:27:240:42 | object creation of type ExceptionA |
-| Finally.cs:243:13:253:13 | [finally: exception(Exception)] {...} | Finally.cs:243:13:253:13 | [finally: exception(Exception)] {...} |
 | Finally.cs:243:13:253:13 | {...} | Finally.cs:233:10:233:12 | enter M12 |
+| Finally.cs:243:13:253:13 | {...} | Finally.cs:240:21:240:43 | throw ...; |
+| Finally.cs:243:13:253:13 | {...} | Finally.cs:240:27:240:42 | object creation of type ExceptionA |
 | Finally.cs:243:13:253:13 | {...} | Finally.cs:243:13:253:13 | {...} |
-| Finally.cs:247:25:247:47 | [finally: exception(Exception)] throw ...; | Finally.cs:247:25:247:47 | [finally: exception(Exception)] throw ...; |
-| Finally.cs:247:25:247:47 | [finally: exception(ExceptionA)] throw ...; | Finally.cs:247:25:247:47 | [finally: exception(ExceptionA)] throw ...; |
 | Finally.cs:247:25:247:47 | throw ...; | Finally.cs:247:25:247:47 | throw ...; |
-| Finally.cs:247:31:247:46 | [finally: exception(Exception)] object creation of type ExceptionA | Finally.cs:247:31:247:46 | [finally: exception(Exception)] object creation of type ExceptionA |
-| Finally.cs:247:31:247:46 | [finally: exception(ExceptionA)] object creation of type ExceptionA | Finally.cs:247:31:247:46 | [finally: exception(ExceptionA)] object creation of type ExceptionA |
 | Finally.cs:247:31:247:46 | object creation of type ExceptionA | Finally.cs:247:31:247:46 | object creation of type ExceptionA |
-| Finally.cs:250:17:252:17 | [finally(1): exception(Exception)] {...} | Finally.cs:250:17:252:17 | [finally(1): exception(Exception)] {...} |
-| Finally.cs:250:17:252:17 | [finally: exception(Exception), finally(1): exception(Exception)] {...} | Finally.cs:250:17:252:17 | [finally: exception(Exception), finally(1): exception(Exception)] {...} |
-| Finally.cs:250:17:252:17 | [finally: exception(Exception)] {...} | Finally.cs:250:17:252:17 | [finally: exception(Exception)] {...} |
-| Finally.cs:250:17:252:17 | [finally: exception(ExceptionA), finally(1): exception(Exception)] {...} | Finally.cs:250:17:252:17 | [finally: exception(ExceptionA), finally(1): exception(Exception)] {...} |
-| Finally.cs:250:17:252:17 | [finally: exception(ExceptionA)] {...} | Finally.cs:250:17:252:17 | [finally: exception(ExceptionA)] {...} |
 | Finally.cs:250:17:252:17 | {...} | Finally.cs:233:10:233:12 | enter M12 |
+| Finally.cs:250:17:252:17 | {...} | Finally.cs:240:21:240:43 | throw ...; |
+| Finally.cs:250:17:252:17 | {...} | Finally.cs:240:27:240:42 | object creation of type ExceptionA |
 | Finally.cs:250:17:252:17 | {...} | Finally.cs:243:13:253:13 | {...} |
+| Finally.cs:250:17:252:17 | {...} | Finally.cs:247:25:247:47 | throw ...; |
+| Finally.cs:250:17:252:17 | {...} | Finally.cs:247:31:247:46 | object creation of type ExceptionA |
 | Finally.cs:250:17:252:17 | {...} | Finally.cs:250:17:252:17 | {...} |
-| Finally.cs:257:9:259:9 | [finally: exception(Exception)] {...} | Finally.cs:257:9:259:9 | [finally: exception(Exception)] {...} |
-| Finally.cs:257:9:259:9 | [finally: exception(ExceptionA)] {...} | Finally.cs:257:9:259:9 | [finally: exception(ExceptionA)] {...} |
+| Finally.cs:254:13:254:45 | ...; | Finally.cs:254:13:254:45 | ...; |
 | Finally.cs:257:9:259:9 | {...} | Finally.cs:233:10:233:12 | enter M12 |
+| Finally.cs:257:9:259:9 | {...} | Finally.cs:240:21:240:43 | throw ...; |
+| Finally.cs:257:9:259:9 | {...} | Finally.cs:240:27:240:42 | object creation of type ExceptionA |
 | Finally.cs:257:9:259:9 | {...} | Finally.cs:243:13:253:13 | {...} |
+| Finally.cs:257:9:259:9 | {...} | Finally.cs:247:25:247:47 | throw ...; |
+| Finally.cs:257:9:259:9 | {...} | Finally.cs:247:31:247:46 | object creation of type ExceptionA |
 | Finally.cs:257:9:259:9 | {...} | Finally.cs:250:17:252:17 | {...} |
+| Finally.cs:257:9:259:9 | {...} | Finally.cs:254:13:254:45 | ...; |
 | Finally.cs:257:9:259:9 | {...} | Finally.cs:257:9:259:9 | {...} |
+| Finally.cs:260:9:260:34 | ...; | Finally.cs:233:10:233:12 | enter M12 |
+| Finally.cs:260:9:260:34 | ...; | Finally.cs:240:21:240:43 | throw ...; |
+| Finally.cs:260:9:260:34 | ...; | Finally.cs:240:27:240:42 | object creation of type ExceptionA |
+| Finally.cs:260:9:260:34 | ...; | Finally.cs:243:13:253:13 | {...} |
+| Finally.cs:260:9:260:34 | ...; | Finally.cs:247:25:247:47 | throw ...; |
+| Finally.cs:260:9:260:34 | ...; | Finally.cs:247:31:247:46 | object creation of type ExceptionA |
+| Finally.cs:260:9:260:34 | ...; | Finally.cs:250:17:252:17 | {...} |
+| Finally.cs:260:9:260:34 | ...; | Finally.cs:254:13:254:45 | ...; |
+| Finally.cs:260:9:260:34 | ...; | Finally.cs:257:9:259:9 | {...} |
+| Finally.cs:260:9:260:34 | ...; | Finally.cs:260:9:260:34 | ...; |
 | Finally.cs:263:10:263:12 | enter M13 | Finally.cs:263:10:263:12 | enter M13 |
 | Finally.cs:263:10:263:12 | exit M13 | Finally.cs:263:10:263:12 | exit M13 |
-| Finally.cs:270:9:273:9 | [finally: exception(Exception)] {...} | Finally.cs:270:9:273:9 | [finally: exception(Exception)] {...} |
-| Finally.cs:270:9:273:9 | {...} | Finally.cs:263:10:263:12 | enter M13 |
-| Finally.cs:270:9:273:9 | {...} | Finally.cs:270:9:273:9 | {...} |
+| Finally.cs:263:10:263:12 | exit M13 (abnormal) | Finally.cs:263:10:263:12 | exit M13 (abnormal) |
+| Finally.cs:263:10:263:12 | exit M13 (normal) | Finally.cs:263:10:263:12 | enter M13 |
+| Finally.cs:263:10:263:12 | exit M13 (normal) | Finally.cs:263:10:263:12 | exit M13 (normal) |
 | Foreach.cs:4:7:4:13 | enter Foreach | Foreach.cs:4:7:4:13 | enter Foreach |
 | Foreach.cs:6:10:6:11 | enter M1 | Foreach.cs:6:10:6:11 | enter M1 |
 | Foreach.cs:6:10:6:11 | exit M1 (normal) | Foreach.cs:6:10:6:11 | enter M1 |
@@ -15063,76 +13149,92 @@ postBlockDominance
 | LoopUnrolling.cs:7:10:7:11 | exit M1 (normal) | LoopUnrolling.cs:7:10:7:11 | enter M1 |
 | LoopUnrolling.cs:7:10:7:11 | exit M1 (normal) | LoopUnrolling.cs:7:10:7:11 | exit M1 (normal) |
 | LoopUnrolling.cs:7:10:7:11 | exit M1 (normal) | LoopUnrolling.cs:10:13:10:19 | return ...; |
+| LoopUnrolling.cs:7:10:7:11 | exit M1 (normal) | LoopUnrolling.cs:11:9:12:35 | foreach (... ... in ...) ... |
 | LoopUnrolling.cs:7:10:7:11 | exit M1 (normal) | LoopUnrolling.cs:11:22:11:24 | String arg |
 | LoopUnrolling.cs:7:10:7:11 | exit M1 (normal) | LoopUnrolling.cs:11:29:11:32 | access to parameter args |
 | LoopUnrolling.cs:10:13:10:19 | return ...; | LoopUnrolling.cs:10:13:10:19 | return ...; |
+| LoopUnrolling.cs:11:9:12:35 | foreach (... ... in ...) ... | LoopUnrolling.cs:11:9:12:35 | foreach (... ... in ...) ... |
+| LoopUnrolling.cs:11:9:12:35 | foreach (... ... in ...) ... | LoopUnrolling.cs:11:22:11:24 | String arg |
+| LoopUnrolling.cs:11:9:12:35 | foreach (... ... in ...) ... | LoopUnrolling.cs:11:29:11:32 | access to parameter args |
 | LoopUnrolling.cs:11:22:11:24 | String arg | LoopUnrolling.cs:11:22:11:24 | String arg |
-| LoopUnrolling.cs:11:22:11:24 | String arg | LoopUnrolling.cs:11:29:11:32 | access to parameter args |
 | LoopUnrolling.cs:11:29:11:32 | access to parameter args | LoopUnrolling.cs:11:29:11:32 | access to parameter args |
 | LoopUnrolling.cs:15:10:15:11 | enter M2 | LoopUnrolling.cs:15:10:15:11 | enter M2 |
 | LoopUnrolling.cs:15:10:15:11 | exit M2 (normal) | LoopUnrolling.cs:15:10:15:11 | enter M2 |
 | LoopUnrolling.cs:15:10:15:11 | exit M2 (normal) | LoopUnrolling.cs:15:10:15:11 | exit M2 (normal) |
+| LoopUnrolling.cs:15:10:15:11 | exit M2 (normal) | LoopUnrolling.cs:18:9:19:33 | foreach (... ... in ...) ... |
 | LoopUnrolling.cs:15:10:15:11 | exit M2 (normal) | LoopUnrolling.cs:18:22:18:22 | String x |
-| LoopUnrolling.cs:18:22:18:22 | String x | LoopUnrolling.cs:15:10:15:11 | enter M2 |
+| LoopUnrolling.cs:18:9:19:33 | foreach (... ... in ...) ... | LoopUnrolling.cs:15:10:15:11 | enter M2 |
+| LoopUnrolling.cs:18:9:19:33 | foreach (... ... in ...) ... | LoopUnrolling.cs:18:9:19:33 | foreach (... ... in ...) ... |
+| LoopUnrolling.cs:18:9:19:33 | foreach (... ... in ...) ... | LoopUnrolling.cs:18:22:18:22 | String x |
 | LoopUnrolling.cs:18:22:18:22 | String x | LoopUnrolling.cs:18:22:18:22 | String x |
 | LoopUnrolling.cs:22:10:22:11 | enter M3 | LoopUnrolling.cs:22:10:22:11 | enter M3 |
 | LoopUnrolling.cs:22:10:22:11 | exit M3 (normal) | LoopUnrolling.cs:22:10:22:11 | enter M3 |
 | LoopUnrolling.cs:22:10:22:11 | exit M3 (normal) | LoopUnrolling.cs:22:10:22:11 | exit M3 (normal) |
 | LoopUnrolling.cs:22:10:22:11 | exit M3 (normal) | LoopUnrolling.cs:24:9:26:40 | foreach (... ... in ...) ... |
 | LoopUnrolling.cs:22:10:22:11 | exit M3 (normal) | LoopUnrolling.cs:24:22:24:24 | Char arg |
+| LoopUnrolling.cs:22:10:22:11 | exit M3 (normal) | LoopUnrolling.cs:25:13:26:40 | foreach (... ... in ...) ... |
 | LoopUnrolling.cs:22:10:22:11 | exit M3 (normal) | LoopUnrolling.cs:25:26:25:29 | Char arg0 |
 | LoopUnrolling.cs:24:9:26:40 | foreach (... ... in ...) ... | LoopUnrolling.cs:22:10:22:11 | enter M3 |
 | LoopUnrolling.cs:24:9:26:40 | foreach (... ... in ...) ... | LoopUnrolling.cs:24:9:26:40 | foreach (... ... in ...) ... |
 | LoopUnrolling.cs:24:9:26:40 | foreach (... ... in ...) ... | LoopUnrolling.cs:24:22:24:24 | Char arg |
+| LoopUnrolling.cs:24:9:26:40 | foreach (... ... in ...) ... | LoopUnrolling.cs:25:13:26:40 | foreach (... ... in ...) ... |
 | LoopUnrolling.cs:24:9:26:40 | foreach (... ... in ...) ... | LoopUnrolling.cs:25:26:25:29 | Char arg0 |
 | LoopUnrolling.cs:24:22:24:24 | Char arg | LoopUnrolling.cs:24:22:24:24 | Char arg |
-| LoopUnrolling.cs:25:26:25:29 | Char arg0 | LoopUnrolling.cs:24:22:24:24 | Char arg |
+| LoopUnrolling.cs:25:13:26:40 | foreach (... ... in ...) ... | LoopUnrolling.cs:24:22:24:24 | Char arg |
+| LoopUnrolling.cs:25:13:26:40 | foreach (... ... in ...) ... | LoopUnrolling.cs:25:13:26:40 | foreach (... ... in ...) ... |
+| LoopUnrolling.cs:25:13:26:40 | foreach (... ... in ...) ... | LoopUnrolling.cs:25:26:25:29 | Char arg0 |
 | LoopUnrolling.cs:25:26:25:29 | Char arg0 | LoopUnrolling.cs:25:26:25:29 | Char arg0 |
 | LoopUnrolling.cs:29:10:29:11 | enter M4 | LoopUnrolling.cs:29:10:29:11 | enter M4 |
 | LoopUnrolling.cs:29:10:29:11 | exit M4 (normal) | LoopUnrolling.cs:29:10:29:11 | enter M4 |
 | LoopUnrolling.cs:29:10:29:11 | exit M4 (normal) | LoopUnrolling.cs:29:10:29:11 | exit M4 (normal) |
+| LoopUnrolling.cs:29:10:29:11 | exit M4 (normal) | LoopUnrolling.cs:32:9:33:33 | foreach (... ... in ...) ... |
+| LoopUnrolling.cs:29:10:29:11 | exit M4 (normal) | LoopUnrolling.cs:32:22:32:22 | String x |
+| LoopUnrolling.cs:32:9:33:33 | foreach (... ... in ...) ... | LoopUnrolling.cs:29:10:29:11 | enter M4 |
+| LoopUnrolling.cs:32:9:33:33 | foreach (... ... in ...) ... | LoopUnrolling.cs:32:9:33:33 | foreach (... ... in ...) ... |
+| LoopUnrolling.cs:32:9:33:33 | foreach (... ... in ...) ... | LoopUnrolling.cs:32:22:32:22 | String x |
+| LoopUnrolling.cs:32:22:32:22 | String x | LoopUnrolling.cs:32:22:32:22 | String x |
 | LoopUnrolling.cs:36:10:36:11 | enter M5 | LoopUnrolling.cs:36:10:36:11 | enter M5 |
 | LoopUnrolling.cs:36:10:36:11 | exit M5 (normal) | LoopUnrolling.cs:36:10:36:11 | enter M5 |
 | LoopUnrolling.cs:36:10:36:11 | exit M5 (normal) | LoopUnrolling.cs:36:10:36:11 | exit M5 (normal) |
 | LoopUnrolling.cs:36:10:36:11 | exit M5 (normal) | LoopUnrolling.cs:40:9:42:41 | foreach (... ... in ...) ... |
 | LoopUnrolling.cs:36:10:36:11 | exit M5 (normal) | LoopUnrolling.cs:40:22:40:22 | String x |
+| LoopUnrolling.cs:36:10:36:11 | exit M5 (normal) | LoopUnrolling.cs:41:13:42:41 | foreach (... ... in ...) ... |
 | LoopUnrolling.cs:36:10:36:11 | exit M5 (normal) | LoopUnrolling.cs:41:26:41:26 | String y |
 | LoopUnrolling.cs:40:9:42:41 | foreach (... ... in ...) ... | LoopUnrolling.cs:36:10:36:11 | enter M5 |
 | LoopUnrolling.cs:40:9:42:41 | foreach (... ... in ...) ... | LoopUnrolling.cs:40:9:42:41 | foreach (... ... in ...) ... |
 | LoopUnrolling.cs:40:9:42:41 | foreach (... ... in ...) ... | LoopUnrolling.cs:40:22:40:22 | String x |
+| LoopUnrolling.cs:40:9:42:41 | foreach (... ... in ...) ... | LoopUnrolling.cs:41:13:42:41 | foreach (... ... in ...) ... |
 | LoopUnrolling.cs:40:9:42:41 | foreach (... ... in ...) ... | LoopUnrolling.cs:41:26:41:26 | String y |
-| LoopUnrolling.cs:40:22:40:22 | String x | LoopUnrolling.cs:36:10:36:11 | enter M5 |
 | LoopUnrolling.cs:40:22:40:22 | String x | LoopUnrolling.cs:40:22:40:22 | String x |
-| LoopUnrolling.cs:41:26:41:26 | String y | LoopUnrolling.cs:36:10:36:11 | enter M5 |
-| LoopUnrolling.cs:41:26:41:26 | String y | LoopUnrolling.cs:40:22:40:22 | String x |
+| LoopUnrolling.cs:41:13:42:41 | foreach (... ... in ...) ... | LoopUnrolling.cs:40:22:40:22 | String x |
+| LoopUnrolling.cs:41:13:42:41 | foreach (... ... in ...) ... | LoopUnrolling.cs:41:13:42:41 | foreach (... ... in ...) ... |
+| LoopUnrolling.cs:41:13:42:41 | foreach (... ... in ...) ... | LoopUnrolling.cs:41:26:41:26 | String y |
 | LoopUnrolling.cs:41:26:41:26 | String y | LoopUnrolling.cs:41:26:41:26 | String y |
 | LoopUnrolling.cs:45:10:45:11 | enter M6 | LoopUnrolling.cs:45:10:45:11 | enter M6 |
+| LoopUnrolling.cs:45:10:45:11 | exit M6 (normal) | LoopUnrolling.cs:45:10:45:11 | enter M6 |
+| LoopUnrolling.cs:45:10:45:11 | exit M6 (normal) | LoopUnrolling.cs:45:10:45:11 | exit M6 (normal) |
 | LoopUnrolling.cs:48:22:48:22 | String x | LoopUnrolling.cs:48:22:48:22 | String x |
 | LoopUnrolling.cs:50:9:50:13 | Label: | LoopUnrolling.cs:50:9:50:13 | Label: |
 | LoopUnrolling.cs:55:10:55:11 | enter M7 | LoopUnrolling.cs:55:10:55:11 | enter M7 |
 | LoopUnrolling.cs:55:10:55:11 | exit M7 (normal) | LoopUnrolling.cs:55:10:55:11 | enter M7 |
 | LoopUnrolling.cs:55:10:55:11 | exit M7 (normal) | LoopUnrolling.cs:55:10:55:11 | exit M7 (normal) |
-| LoopUnrolling.cs:55:10:55:11 | exit M7 (normal) | LoopUnrolling.cs:58:9:64:9 | [b (line 55): false] foreach (... ... in ...) ... |
+| LoopUnrolling.cs:55:10:55:11 | exit M7 (normal) | LoopUnrolling.cs:58:9:64:9 | foreach (... ... in ...) ... |
 | LoopUnrolling.cs:55:10:55:11 | exit M7 (normal) | LoopUnrolling.cs:58:22:58:22 | String x |
-| LoopUnrolling.cs:55:10:55:11 | exit M7 (normal) | LoopUnrolling.cs:58:22:58:22 | [b (line 55): false] String x |
-| LoopUnrolling.cs:55:10:55:11 | exit M7 (normal) | LoopUnrolling.cs:58:22:58:22 | [b (line 55): true] String x |
-| LoopUnrolling.cs:55:10:55:11 | exit M7 (normal) | LoopUnrolling.cs:61:17:61:37 | [b (line 55): true] ...; |
-| LoopUnrolling.cs:55:10:55:11 | exit M7 (normal) | LoopUnrolling.cs:62:13:63:37 | [b (line 55): false] if (...) ... |
-| LoopUnrolling.cs:55:10:55:11 | exit M7 (normal) | LoopUnrolling.cs:63:17:63:37 | [b (line 55): true] ...; |
-| LoopUnrolling.cs:58:9:64:9 | [b (line 55): false] foreach (... ... in ...) ... | LoopUnrolling.cs:58:9:64:9 | [b (line 55): false] foreach (... ... in ...) ... |
-| LoopUnrolling.cs:58:9:64:9 | [b (line 55): false] foreach (... ... in ...) ... | LoopUnrolling.cs:58:22:58:22 | [b (line 55): false] String x |
-| LoopUnrolling.cs:58:9:64:9 | [b (line 55): false] foreach (... ... in ...) ... | LoopUnrolling.cs:62:13:63:37 | [b (line 55): false] if (...) ... |
-| LoopUnrolling.cs:58:22:58:22 | String x | LoopUnrolling.cs:55:10:55:11 | enter M7 |
+| LoopUnrolling.cs:55:10:55:11 | exit M7 (normal) | LoopUnrolling.cs:61:17:61:37 | ...; |
+| LoopUnrolling.cs:55:10:55:11 | exit M7 (normal) | LoopUnrolling.cs:62:13:63:37 | if (...) ... |
+| LoopUnrolling.cs:55:10:55:11 | exit M7 (normal) | LoopUnrolling.cs:63:17:63:37 | ...; |
+| LoopUnrolling.cs:58:9:64:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:55:10:55:11 | enter M7 |
+| LoopUnrolling.cs:58:9:64:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:58:9:64:9 | foreach (... ... in ...) ... |
+| LoopUnrolling.cs:58:9:64:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:58:22:58:22 | String x |
+| LoopUnrolling.cs:58:9:64:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:61:17:61:37 | ...; |
+| LoopUnrolling.cs:58:9:64:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:62:13:63:37 | if (...) ... |
+| LoopUnrolling.cs:58:9:64:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:63:17:63:37 | ...; |
 | LoopUnrolling.cs:58:22:58:22 | String x | LoopUnrolling.cs:58:22:58:22 | String x |
-| LoopUnrolling.cs:58:22:58:22 | [b (line 55): false] String x | LoopUnrolling.cs:58:22:58:22 | [b (line 55): false] String x |
-| LoopUnrolling.cs:58:22:58:22 | [b (line 55): true] String x | LoopUnrolling.cs:58:22:58:22 | [b (line 55): true] String x |
-| LoopUnrolling.cs:61:17:61:37 | [b (line 55): true] ...; | LoopUnrolling.cs:58:22:58:22 | [b (line 55): true] String x |
-| LoopUnrolling.cs:61:17:61:37 | [b (line 55): true] ...; | LoopUnrolling.cs:61:17:61:37 | [b (line 55): true] ...; |
-| LoopUnrolling.cs:62:13:63:37 | [b (line 55): false] if (...) ... | LoopUnrolling.cs:58:22:58:22 | [b (line 55): false] String x |
-| LoopUnrolling.cs:62:13:63:37 | [b (line 55): false] if (...) ... | LoopUnrolling.cs:62:13:63:37 | [b (line 55): false] if (...) ... |
-| LoopUnrolling.cs:63:17:63:37 | [b (line 55): true] ...; | LoopUnrolling.cs:58:22:58:22 | [b (line 55): true] String x |
-| LoopUnrolling.cs:63:17:63:37 | [b (line 55): true] ...; | LoopUnrolling.cs:61:17:61:37 | [b (line 55): true] ...; |
-| LoopUnrolling.cs:63:17:63:37 | [b (line 55): true] ...; | LoopUnrolling.cs:63:17:63:37 | [b (line 55): true] ...; |
+| LoopUnrolling.cs:61:17:61:37 | ...; | LoopUnrolling.cs:61:17:61:37 | ...; |
+| LoopUnrolling.cs:62:13:63:37 | if (...) ... | LoopUnrolling.cs:58:22:58:22 | String x |
+| LoopUnrolling.cs:62:13:63:37 | if (...) ... | LoopUnrolling.cs:61:17:61:37 | ...; |
+| LoopUnrolling.cs:62:13:63:37 | if (...) ... | LoopUnrolling.cs:62:13:63:37 | if (...) ... |
+| LoopUnrolling.cs:63:17:63:37 | ...; | LoopUnrolling.cs:63:17:63:37 | ...; |
 | LoopUnrolling.cs:67:10:67:11 | enter M8 | LoopUnrolling.cs:67:10:67:11 | enter M8 |
 | LoopUnrolling.cs:67:10:67:11 | exit M8 (normal) | LoopUnrolling.cs:67:10:67:11 | enter M8 |
 | LoopUnrolling.cs:67:10:67:11 | exit M8 (normal) | LoopUnrolling.cs:67:10:67:11 | exit M8 (normal) |
@@ -15140,23 +13242,45 @@ postBlockDominance
 | LoopUnrolling.cs:67:10:67:11 | exit M8 (normal) | LoopUnrolling.cs:69:13:69:23 | [true] !... |
 | LoopUnrolling.cs:67:10:67:11 | exit M8 (normal) | LoopUnrolling.cs:70:13:70:19 | return ...; |
 | LoopUnrolling.cs:67:10:67:11 | exit M8 (normal) | LoopUnrolling.cs:71:9:71:21 | ...; |
+| LoopUnrolling.cs:67:10:67:11 | exit M8 (normal) | LoopUnrolling.cs:72:9:73:35 | foreach (... ... in ...) ... |
+| LoopUnrolling.cs:67:10:67:11 | exit M8 (normal) | LoopUnrolling.cs:72:22:72:24 | String arg |
 | LoopUnrolling.cs:69:13:69:23 | [false] !... | LoopUnrolling.cs:69:13:69:23 | [false] !... |
 | LoopUnrolling.cs:69:13:69:23 | [true] !... | LoopUnrolling.cs:69:13:69:23 | [true] !... |
 | LoopUnrolling.cs:70:13:70:19 | return ...; | LoopUnrolling.cs:69:13:69:23 | [true] !... |
 | LoopUnrolling.cs:70:13:70:19 | return ...; | LoopUnrolling.cs:70:13:70:19 | return ...; |
 | LoopUnrolling.cs:71:9:71:21 | ...; | LoopUnrolling.cs:69:13:69:23 | [false] !... |
 | LoopUnrolling.cs:71:9:71:21 | ...; | LoopUnrolling.cs:71:9:71:21 | ...; |
+| LoopUnrolling.cs:72:9:73:35 | foreach (... ... in ...) ... | LoopUnrolling.cs:69:13:69:23 | [false] !... |
+| LoopUnrolling.cs:72:9:73:35 | foreach (... ... in ...) ... | LoopUnrolling.cs:71:9:71:21 | ...; |
+| LoopUnrolling.cs:72:9:73:35 | foreach (... ... in ...) ... | LoopUnrolling.cs:72:9:73:35 | foreach (... ... in ...) ... |
+| LoopUnrolling.cs:72:9:73:35 | foreach (... ... in ...) ... | LoopUnrolling.cs:72:22:72:24 | String arg |
+| LoopUnrolling.cs:72:22:72:24 | String arg | LoopUnrolling.cs:72:22:72:24 | String arg |
 | LoopUnrolling.cs:76:10:76:11 | enter M9 | LoopUnrolling.cs:76:10:76:11 | enter M9 |
 | LoopUnrolling.cs:76:10:76:11 | exit M9 (normal) | LoopUnrolling.cs:76:10:76:11 | enter M9 |
 | LoopUnrolling.cs:76:10:76:11 | exit M9 (normal) | LoopUnrolling.cs:76:10:76:11 | exit M9 (normal) |
+| LoopUnrolling.cs:76:10:76:11 | exit M9 (normal) | LoopUnrolling.cs:79:9:82:9 | foreach (... ... in ...) ... |
+| LoopUnrolling.cs:76:10:76:11 | exit M9 (normal) | LoopUnrolling.cs:79:22:79:22 | String x |
+| LoopUnrolling.cs:79:9:82:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:76:10:76:11 | enter M9 |
+| LoopUnrolling.cs:79:9:82:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:79:9:82:9 | foreach (... ... in ...) ... |
+| LoopUnrolling.cs:79:9:82:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:79:22:79:22 | String x |
+| LoopUnrolling.cs:79:22:79:22 | String x | LoopUnrolling.cs:79:22:79:22 | String x |
 | LoopUnrolling.cs:85:10:85:12 | enter M10 | LoopUnrolling.cs:85:10:85:12 | enter M10 |
 | LoopUnrolling.cs:85:10:85:12 | exit M10 (normal) | LoopUnrolling.cs:85:10:85:12 | enter M10 |
 | LoopUnrolling.cs:85:10:85:12 | exit M10 (normal) | LoopUnrolling.cs:85:10:85:12 | exit M10 (normal) |
+| LoopUnrolling.cs:85:10:85:12 | exit M10 (normal) | LoopUnrolling.cs:88:9:91:9 | foreach (... ... in ...) ... |
+| LoopUnrolling.cs:85:10:85:12 | exit M10 (normal) | LoopUnrolling.cs:88:22:88:22 | String x |
+| LoopUnrolling.cs:88:9:91:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:85:10:85:12 | enter M10 |
+| LoopUnrolling.cs:88:9:91:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:88:9:91:9 | foreach (... ... in ...) ... |
+| LoopUnrolling.cs:88:9:91:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:88:22:88:22 | String x |
+| LoopUnrolling.cs:88:22:88:22 | String x | LoopUnrolling.cs:88:22:88:22 | String x |
 | LoopUnrolling.cs:94:10:94:12 | enter M11 | LoopUnrolling.cs:94:10:94:12 | enter M11 |
 | LoopUnrolling.cs:94:10:94:12 | exit M11 (normal) | LoopUnrolling.cs:94:10:94:12 | enter M11 |
 | LoopUnrolling.cs:94:10:94:12 | exit M11 (normal) | LoopUnrolling.cs:94:10:94:12 | exit M11 (normal) |
+| LoopUnrolling.cs:94:10:94:12 | exit M11 (normal) | LoopUnrolling.cs:97:9:100:9 | foreach (... ... in ...) ... |
 | LoopUnrolling.cs:94:10:94:12 | exit M11 (normal) | LoopUnrolling.cs:97:22:97:22 | String x |
-| LoopUnrolling.cs:97:22:97:22 | String x | LoopUnrolling.cs:94:10:94:12 | enter M11 |
+| LoopUnrolling.cs:97:9:100:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:94:10:94:12 | enter M11 |
+| LoopUnrolling.cs:97:9:100:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:97:9:100:9 | foreach (... ... in ...) ... |
+| LoopUnrolling.cs:97:9:100:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:97:22:97:22 | String x |
 | LoopUnrolling.cs:97:22:97:22 | String x | LoopUnrolling.cs:97:22:97:22 | String x |
 | MultiImplementationA.cs:4:7:4:8 | call to constructor Object | MultiImplementationA.cs:4:7:4:8 | call to constructor Object |
 | MultiImplementationA.cs:4:7:4:8 | enter C1 | MultiImplementationA.cs:4:7:4:8 | enter C1 |
@@ -16520,6 +14644,13 @@ postBlockDominance
 | cflow.cs:255:13:255:20 | default: | cflow.cs:249:17:249:29 | goto default; |
 | cflow.cs:255:13:255:20 | default: | cflow.cs:255:13:255:20 | default: |
 | cflow.cs:261:49:261:53 | enter Yield | cflow.cs:261:49:261:53 | enter Yield |
+| cflow.cs:261:49:261:53 | exit Yield | cflow.cs:261:49:261:53 | exit Yield |
+| cflow.cs:261:49:261:53 | exit Yield (abnormal) | cflow.cs:261:49:261:53 | exit Yield (abnormal) |
+| cflow.cs:261:49:261:53 | exit Yield (normal) | cflow.cs:261:49:261:53 | enter Yield |
+| cflow.cs:261:49:261:53 | exit Yield (normal) | cflow.cs:261:49:261:53 | exit Yield (normal) |
+| cflow.cs:261:49:261:53 | exit Yield (normal) | cflow.cs:264:25:264:25 | access to local variable i |
+| cflow.cs:261:49:261:53 | exit Yield (normal) | cflow.cs:265:9:267:9 | {...} |
+| cflow.cs:261:49:261:53 | exit Yield (normal) | cflow.cs:268:9:276:9 | try {...} ... |
 | cflow.cs:264:25:264:25 | access to local variable i | cflow.cs:261:49:261:53 | enter Yield |
 | cflow.cs:264:25:264:25 | access to local variable i | cflow.cs:264:25:264:25 | access to local variable i |
 | cflow.cs:264:25:264:25 | access to local variable i | cflow.cs:265:9:267:9 | {...} |
diff --git a/csharp/ql/test/library-tests/controlflow/graph/EnclosingCallable.expected b/csharp/ql/test/library-tests/controlflow/graph/EnclosingCallable.expected
index fd87b8db058..4a4631e454d 100644
--- a/csharp/ql/test/library-tests/controlflow/graph/EnclosingCallable.expected
+++ b/csharp/ql/test/library-tests/controlflow/graph/EnclosingCallable.expected
@@ -371,8 +371,7 @@ nodeEnclosing
 | Assert.cs:9:20:9:32 | ... ? ... : ... | Assert.cs:7:10:7:11 | M1 |
 | Assert.cs:9:24:9:27 | null | Assert.cs:7:10:7:11 | M1 |
 | Assert.cs:9:31:9:32 | "" | Assert.cs:7:10:7:11 | M1 |
-| Assert.cs:10:9:10:31 | [assertion failure] call to method Assert | Assert.cs:7:10:7:11 | M1 |
-| Assert.cs:10:9:10:31 | [assertion success] call to method Assert | Assert.cs:7:10:7:11 | M1 |
+| Assert.cs:10:9:10:31 | call to method Assert | Assert.cs:7:10:7:11 | M1 |
 | Assert.cs:10:9:10:32 | ...; | Assert.cs:7:10:7:11 | M1 |
 | Assert.cs:10:22:10:22 | access to local variable s | Assert.cs:7:10:7:11 | M1 |
 | Assert.cs:10:22:10:30 | ... != ... | Assert.cs:7:10:7:11 | M1 |
@@ -392,8 +391,7 @@ nodeEnclosing
 | Assert.cs:16:20:16:32 | ... ? ... : ... | Assert.cs:14:10:14:11 | M2 |
 | Assert.cs:16:24:16:27 | null | Assert.cs:14:10:14:11 | M2 |
 | Assert.cs:16:31:16:32 | "" | Assert.cs:14:10:14:11 | M2 |
-| Assert.cs:17:9:17:24 | [assertion failure] call to method IsNull | Assert.cs:14:10:14:11 | M2 |
-| Assert.cs:17:9:17:24 | [assertion success] call to method IsNull | Assert.cs:14:10:14:11 | M2 |
+| Assert.cs:17:9:17:24 | call to method IsNull | Assert.cs:14:10:14:11 | M2 |
 | Assert.cs:17:9:17:25 | ...; | Assert.cs:14:10:14:11 | M2 |
 | Assert.cs:17:23:17:23 | access to local variable s | Assert.cs:14:10:14:11 | M2 |
 | Assert.cs:18:9:18:35 | call to method WriteLine | Assert.cs:14:10:14:11 | M2 |
@@ -411,8 +409,7 @@ nodeEnclosing
 | Assert.cs:23:20:23:32 | ... ? ... : ... | Assert.cs:21:10:21:11 | M3 |
 | Assert.cs:23:24:23:27 | null | Assert.cs:21:10:21:11 | M3 |
 | Assert.cs:23:31:23:32 | "" | Assert.cs:21:10:21:11 | M3 |
-| Assert.cs:24:9:24:27 | [assertion failure] call to method IsNotNull | Assert.cs:21:10:21:11 | M3 |
-| Assert.cs:24:9:24:27 | [assertion success] call to method IsNotNull | Assert.cs:21:10:21:11 | M3 |
+| Assert.cs:24:9:24:27 | call to method IsNotNull | Assert.cs:21:10:21:11 | M3 |
 | Assert.cs:24:9:24:28 | ...; | Assert.cs:21:10:21:11 | M3 |
 | Assert.cs:24:26:24:26 | access to local variable s | Assert.cs:21:10:21:11 | M3 |
 | Assert.cs:25:9:25:35 | call to method WriteLine | Assert.cs:21:10:21:11 | M3 |
@@ -430,8 +427,7 @@ nodeEnclosing
 | Assert.cs:30:20:30:32 | ... ? ... : ... | Assert.cs:28:10:28:11 | M4 |
 | Assert.cs:30:24:30:27 | null | Assert.cs:28:10:28:11 | M4 |
 | Assert.cs:30:31:30:32 | "" | Assert.cs:28:10:28:11 | M4 |
-| Assert.cs:31:9:31:32 | [assertion failure] call to method IsTrue | Assert.cs:28:10:28:11 | M4 |
-| Assert.cs:31:9:31:32 | [assertion success] call to method IsTrue | Assert.cs:28:10:28:11 | M4 |
+| Assert.cs:31:9:31:32 | call to method IsTrue | Assert.cs:28:10:28:11 | M4 |
 | Assert.cs:31:9:31:33 | ...; | Assert.cs:28:10:28:11 | M4 |
 | Assert.cs:31:23:31:23 | access to local variable s | Assert.cs:28:10:28:11 | M4 |
 | Assert.cs:31:23:31:31 | ... == ... | Assert.cs:28:10:28:11 | M4 |
@@ -451,8 +447,7 @@ nodeEnclosing
 | Assert.cs:37:20:37:32 | ... ? ... : ... | Assert.cs:35:10:35:11 | M5 |
 | Assert.cs:37:24:37:27 | null | Assert.cs:35:10:35:11 | M5 |
 | Assert.cs:37:31:37:32 | "" | Assert.cs:35:10:35:11 | M5 |
-| Assert.cs:38:9:38:32 | [assertion failure] call to method IsTrue | Assert.cs:35:10:35:11 | M5 |
-| Assert.cs:38:9:38:32 | [assertion success] call to method IsTrue | Assert.cs:35:10:35:11 | M5 |
+| Assert.cs:38:9:38:32 | call to method IsTrue | Assert.cs:35:10:35:11 | M5 |
 | Assert.cs:38:9:38:33 | ...; | Assert.cs:35:10:35:11 | M5 |
 | Assert.cs:38:23:38:23 | access to local variable s | Assert.cs:35:10:35:11 | M5 |
 | Assert.cs:38:23:38:31 | ... != ... | Assert.cs:35:10:35:11 | M5 |
@@ -472,8 +467,7 @@ nodeEnclosing
 | Assert.cs:44:20:44:32 | ... ? ... : ... | Assert.cs:42:10:42:11 | M6 |
 | Assert.cs:44:24:44:27 | null | Assert.cs:42:10:42:11 | M6 |
 | Assert.cs:44:31:44:32 | "" | Assert.cs:42:10:42:11 | M6 |
-| Assert.cs:45:9:45:33 | [assertion failure] call to method IsFalse | Assert.cs:42:10:42:11 | M6 |
-| Assert.cs:45:9:45:33 | [assertion success] call to method IsFalse | Assert.cs:42:10:42:11 | M6 |
+| Assert.cs:45:9:45:33 | call to method IsFalse | Assert.cs:42:10:42:11 | M6 |
 | Assert.cs:45:9:45:34 | ...; | Assert.cs:42:10:42:11 | M6 |
 | Assert.cs:45:24:45:24 | access to local variable s | Assert.cs:42:10:42:11 | M6 |
 | Assert.cs:45:24:45:32 | ... != ... | Assert.cs:42:10:42:11 | M6 |
@@ -493,8 +487,7 @@ nodeEnclosing
 | Assert.cs:51:20:51:32 | ... ? ... : ... | Assert.cs:49:10:49:11 | M7 |
 | Assert.cs:51:24:51:27 | null | Assert.cs:49:10:49:11 | M7 |
 | Assert.cs:51:31:51:32 | "" | Assert.cs:49:10:49:11 | M7 |
-| Assert.cs:52:9:52:33 | [assertion failure] call to method IsFalse | Assert.cs:49:10:49:11 | M7 |
-| Assert.cs:52:9:52:33 | [assertion success] call to method IsFalse | Assert.cs:49:10:49:11 | M7 |
+| Assert.cs:52:9:52:33 | call to method IsFalse | Assert.cs:49:10:49:11 | M7 |
 | Assert.cs:52:9:52:34 | ...; | Assert.cs:49:10:49:11 | M7 |
 | Assert.cs:52:24:52:24 | access to local variable s | Assert.cs:49:10:49:11 | M7 |
 | Assert.cs:52:24:52:32 | ... == ... | Assert.cs:49:10:49:11 | M7 |
@@ -509,27 +502,18 @@ nodeEnclosing
 | Assert.cs:56:10:56:11 | exit M8 (normal) | Assert.cs:56:10:56:11 | M8 |
 | Assert.cs:57:5:61:5 | {...} | Assert.cs:56:10:56:11 | M8 |
 | Assert.cs:58:9:58:33 | ... ...; | Assert.cs:56:10:56:11 | M8 |
-| Assert.cs:58:16:58:32 | [b (line 56): false] String s = ... | Assert.cs:56:10:56:11 | M8 |
-| Assert.cs:58:16:58:32 | [b (line 56): true] String s = ... | Assert.cs:56:10:56:11 | M8 |
+| Assert.cs:58:16:58:32 | String s = ... | Assert.cs:56:10:56:11 | M8 |
 | Assert.cs:58:20:58:20 | access to parameter b | Assert.cs:56:10:56:11 | M8 |
-| Assert.cs:58:20:58:32 | [b (line 56): false] ... ? ... : ... | Assert.cs:56:10:56:11 | M8 |
-| Assert.cs:58:20:58:32 | [b (line 56): true] ... ? ... : ... | Assert.cs:56:10:56:11 | M8 |
-| Assert.cs:58:24:58:27 | [b (line 56): true] null | Assert.cs:56:10:56:11 | M8 |
-| Assert.cs:58:31:58:32 | [b (line 56): false] "" | Assert.cs:56:10:56:11 | M8 |
-| Assert.cs:59:9:59:37 | [assertion failure] call to method IsTrue | Assert.cs:56:10:56:11 | M8 |
-| Assert.cs:59:9:59:37 | [assertion success] call to method IsTrue | Assert.cs:56:10:56:11 | M8 |
-| Assert.cs:59:9:59:38 | [b (line 56): false] ...; | Assert.cs:56:10:56:11 | M8 |
-| Assert.cs:59:9:59:38 | [b (line 56): true] ...; | Assert.cs:56:10:56:11 | M8 |
-| Assert.cs:59:23:59:23 | [b (line 56): false] access to local variable s | Assert.cs:56:10:56:11 | M8 |
-| Assert.cs:59:23:59:23 | [b (line 56): true] access to local variable s | Assert.cs:56:10:56:11 | M8 |
-| Assert.cs:59:23:59:31 | [b (line 56): false] ... != ... | Assert.cs:56:10:56:11 | M8 |
-| Assert.cs:59:23:59:31 | [b (line 56): true] ... != ... | Assert.cs:56:10:56:11 | M8 |
-| Assert.cs:59:23:59:36 | [false] ... && ... | Assert.cs:56:10:56:11 | M8 |
-| Assert.cs:59:23:59:36 | [true] ... && ... | Assert.cs:56:10:56:11 | M8 |
-| Assert.cs:59:28:59:31 | [b (line 56): false] null | Assert.cs:56:10:56:11 | M8 |
-| Assert.cs:59:28:59:31 | [b (line 56): true] null | Assert.cs:56:10:56:11 | M8 |
-| Assert.cs:59:36:59:36 | [b (line 56): false] access to parameter b | Assert.cs:56:10:56:11 | M8 |
-| Assert.cs:59:36:59:36 | [b (line 56): true] access to parameter b | Assert.cs:56:10:56:11 | M8 |
+| Assert.cs:58:20:58:32 | ... ? ... : ... | Assert.cs:56:10:56:11 | M8 |
+| Assert.cs:58:24:58:27 | null | Assert.cs:56:10:56:11 | M8 |
+| Assert.cs:58:31:58:32 | "" | Assert.cs:56:10:56:11 | M8 |
+| Assert.cs:59:9:59:37 | call to method IsTrue | Assert.cs:56:10:56:11 | M8 |
+| Assert.cs:59:9:59:38 | ...; | Assert.cs:56:10:56:11 | M8 |
+| Assert.cs:59:23:59:23 | access to local variable s | Assert.cs:56:10:56:11 | M8 |
+| Assert.cs:59:23:59:31 | ... != ... | Assert.cs:56:10:56:11 | M8 |
+| Assert.cs:59:23:59:36 | ... && ... | Assert.cs:56:10:56:11 | M8 |
+| Assert.cs:59:28:59:31 | null | Assert.cs:56:10:56:11 | M8 |
+| Assert.cs:59:36:59:36 | access to parameter b | Assert.cs:56:10:56:11 | M8 |
 | Assert.cs:60:9:60:35 | call to method WriteLine | Assert.cs:56:10:56:11 | M8 |
 | Assert.cs:60:9:60:36 | ...; | Assert.cs:56:10:56:11 | M8 |
 | Assert.cs:60:27:60:27 | access to local variable s | Assert.cs:56:10:56:11 | M8 |
@@ -540,27 +524,18 @@ nodeEnclosing
 | Assert.cs:63:10:63:11 | exit M9 (normal) | Assert.cs:63:10:63:11 | M9 |
 | Assert.cs:64:5:68:5 | {...} | Assert.cs:63:10:63:11 | M9 |
 | Assert.cs:65:9:65:33 | ... ...; | Assert.cs:63:10:63:11 | M9 |
-| Assert.cs:65:16:65:32 | [b (line 63): false] String s = ... | Assert.cs:63:10:63:11 | M9 |
-| Assert.cs:65:16:65:32 | [b (line 63): true] String s = ... | Assert.cs:63:10:63:11 | M9 |
+| Assert.cs:65:16:65:32 | String s = ... | Assert.cs:63:10:63:11 | M9 |
 | Assert.cs:65:20:65:20 | access to parameter b | Assert.cs:63:10:63:11 | M9 |
-| Assert.cs:65:20:65:32 | [b (line 63): false] ... ? ... : ... | Assert.cs:63:10:63:11 | M9 |
-| Assert.cs:65:20:65:32 | [b (line 63): true] ... ? ... : ... | Assert.cs:63:10:63:11 | M9 |
-| Assert.cs:65:24:65:27 | [b (line 63): true] null | Assert.cs:63:10:63:11 | M9 |
-| Assert.cs:65:31:65:32 | [b (line 63): false] "" | Assert.cs:63:10:63:11 | M9 |
-| Assert.cs:66:9:66:38 | [assertion failure] call to method IsFalse | Assert.cs:63:10:63:11 | M9 |
-| Assert.cs:66:9:66:38 | [assertion success] call to method IsFalse | Assert.cs:63:10:63:11 | M9 |
-| Assert.cs:66:9:66:39 | [b (line 63): false] ...; | Assert.cs:63:10:63:11 | M9 |
-| Assert.cs:66:9:66:39 | [b (line 63): true] ...; | Assert.cs:63:10:63:11 | M9 |
-| Assert.cs:66:24:66:24 | [b (line 63): false] access to local variable s | Assert.cs:63:10:63:11 | M9 |
-| Assert.cs:66:24:66:24 | [b (line 63): true] access to local variable s | Assert.cs:63:10:63:11 | M9 |
-| Assert.cs:66:24:66:32 | [b (line 63): false] ... == ... | Assert.cs:63:10:63:11 | M9 |
-| Assert.cs:66:24:66:32 | [b (line 63): true] ... == ... | Assert.cs:63:10:63:11 | M9 |
-| Assert.cs:66:24:66:37 | [false] ... \|\| ... | Assert.cs:63:10:63:11 | M9 |
-| Assert.cs:66:24:66:37 | [true] ... \|\| ... | Assert.cs:63:10:63:11 | M9 |
-| Assert.cs:66:29:66:32 | [b (line 63): false] null | Assert.cs:63:10:63:11 | M9 |
-| Assert.cs:66:29:66:32 | [b (line 63): true] null | Assert.cs:63:10:63:11 | M9 |
-| Assert.cs:66:37:66:37 | [b (line 63): false] access to parameter b | Assert.cs:63:10:63:11 | M9 |
-| Assert.cs:66:37:66:37 | [b (line 63): true] access to parameter b | Assert.cs:63:10:63:11 | M9 |
+| Assert.cs:65:20:65:32 | ... ? ... : ... | Assert.cs:63:10:63:11 | M9 |
+| Assert.cs:65:24:65:27 | null | Assert.cs:63:10:63:11 | M9 |
+| Assert.cs:65:31:65:32 | "" | Assert.cs:63:10:63:11 | M9 |
+| Assert.cs:66:9:66:38 | call to method IsFalse | Assert.cs:63:10:63:11 | M9 |
+| Assert.cs:66:9:66:39 | ...; | Assert.cs:63:10:63:11 | M9 |
+| Assert.cs:66:24:66:24 | access to local variable s | Assert.cs:63:10:63:11 | M9 |
+| Assert.cs:66:24:66:32 | ... == ... | Assert.cs:63:10:63:11 | M9 |
+| Assert.cs:66:24:66:37 | ... \|\| ... | Assert.cs:63:10:63:11 | M9 |
+| Assert.cs:66:29:66:32 | null | Assert.cs:63:10:63:11 | M9 |
+| Assert.cs:66:37:66:37 | access to parameter b | Assert.cs:63:10:63:11 | M9 |
 | Assert.cs:67:9:67:35 | call to method WriteLine | Assert.cs:63:10:63:11 | M9 |
 | Assert.cs:67:9:67:36 | ...; | Assert.cs:63:10:63:11 | M9 |
 | Assert.cs:67:27:67:27 | access to local variable s | Assert.cs:63:10:63:11 | M9 |
@@ -571,27 +546,18 @@ nodeEnclosing
 | Assert.cs:70:10:70:12 | exit M10 (normal) | Assert.cs:70:10:70:12 | M10 |
 | Assert.cs:71:5:75:5 | {...} | Assert.cs:70:10:70:12 | M10 |
 | Assert.cs:72:9:72:33 | ... ...; | Assert.cs:70:10:70:12 | M10 |
-| Assert.cs:72:16:72:32 | [b (line 70): false] String s = ... | Assert.cs:70:10:70:12 | M10 |
-| Assert.cs:72:16:72:32 | [b (line 70): true] String s = ... | Assert.cs:70:10:70:12 | M10 |
+| Assert.cs:72:16:72:32 | String s = ... | Assert.cs:70:10:70:12 | M10 |
 | Assert.cs:72:20:72:20 | access to parameter b | Assert.cs:70:10:70:12 | M10 |
-| Assert.cs:72:20:72:32 | [b (line 70): false] ... ? ... : ... | Assert.cs:70:10:70:12 | M10 |
-| Assert.cs:72:20:72:32 | [b (line 70): true] ... ? ... : ... | Assert.cs:70:10:70:12 | M10 |
-| Assert.cs:72:24:72:27 | [b (line 70): true] null | Assert.cs:70:10:70:12 | M10 |
-| Assert.cs:72:31:72:32 | [b (line 70): false] "" | Assert.cs:70:10:70:12 | M10 |
-| Assert.cs:73:9:73:37 | [assertion failure] call to method IsTrue | Assert.cs:70:10:70:12 | M10 |
-| Assert.cs:73:9:73:37 | [assertion success] call to method IsTrue | Assert.cs:70:10:70:12 | M10 |
-| Assert.cs:73:9:73:38 | [b (line 70): false] ...; | Assert.cs:70:10:70:12 | M10 |
-| Assert.cs:73:9:73:38 | [b (line 70): true] ...; | Assert.cs:70:10:70:12 | M10 |
-| Assert.cs:73:23:73:23 | [b (line 70): false] access to local variable s | Assert.cs:70:10:70:12 | M10 |
-| Assert.cs:73:23:73:23 | [b (line 70): true] access to local variable s | Assert.cs:70:10:70:12 | M10 |
-| Assert.cs:73:23:73:31 | [b (line 70): false] ... == ... | Assert.cs:70:10:70:12 | M10 |
-| Assert.cs:73:23:73:31 | [b (line 70): true] ... == ... | Assert.cs:70:10:70:12 | M10 |
-| Assert.cs:73:23:73:36 | [false] ... && ... | Assert.cs:70:10:70:12 | M10 |
-| Assert.cs:73:23:73:36 | [true] ... && ... | Assert.cs:70:10:70:12 | M10 |
-| Assert.cs:73:28:73:31 | [b (line 70): false] null | Assert.cs:70:10:70:12 | M10 |
-| Assert.cs:73:28:73:31 | [b (line 70): true] null | Assert.cs:70:10:70:12 | M10 |
-| Assert.cs:73:36:73:36 | [b (line 70): false] access to parameter b | Assert.cs:70:10:70:12 | M10 |
-| Assert.cs:73:36:73:36 | [b (line 70): true] access to parameter b | Assert.cs:70:10:70:12 | M10 |
+| Assert.cs:72:20:72:32 | ... ? ... : ... | Assert.cs:70:10:70:12 | M10 |
+| Assert.cs:72:24:72:27 | null | Assert.cs:70:10:70:12 | M10 |
+| Assert.cs:72:31:72:32 | "" | Assert.cs:70:10:70:12 | M10 |
+| Assert.cs:73:9:73:37 | call to method IsTrue | Assert.cs:70:10:70:12 | M10 |
+| Assert.cs:73:9:73:38 | ...; | Assert.cs:70:10:70:12 | M10 |
+| Assert.cs:73:23:73:23 | access to local variable s | Assert.cs:70:10:70:12 | M10 |
+| Assert.cs:73:23:73:31 | ... == ... | Assert.cs:70:10:70:12 | M10 |
+| Assert.cs:73:23:73:36 | ... && ... | Assert.cs:70:10:70:12 | M10 |
+| Assert.cs:73:28:73:31 | null | Assert.cs:70:10:70:12 | M10 |
+| Assert.cs:73:36:73:36 | access to parameter b | Assert.cs:70:10:70:12 | M10 |
 | Assert.cs:74:9:74:35 | call to method WriteLine | Assert.cs:70:10:70:12 | M10 |
 | Assert.cs:74:9:74:36 | ...; | Assert.cs:70:10:70:12 | M10 |
 | Assert.cs:74:27:74:27 | access to local variable s | Assert.cs:70:10:70:12 | M10 |
@@ -602,27 +568,18 @@ nodeEnclosing
 | Assert.cs:77:10:77:12 | exit M11 (normal) | Assert.cs:77:10:77:12 | M11 |
 | Assert.cs:78:5:82:5 | {...} | Assert.cs:77:10:77:12 | M11 |
 | Assert.cs:79:9:79:33 | ... ...; | Assert.cs:77:10:77:12 | M11 |
-| Assert.cs:79:16:79:32 | [b (line 77): false] String s = ... | Assert.cs:77:10:77:12 | M11 |
-| Assert.cs:79:16:79:32 | [b (line 77): true] String s = ... | Assert.cs:77:10:77:12 | M11 |
+| Assert.cs:79:16:79:32 | String s = ... | Assert.cs:77:10:77:12 | M11 |
 | Assert.cs:79:20:79:20 | access to parameter b | Assert.cs:77:10:77:12 | M11 |
-| Assert.cs:79:20:79:32 | [b (line 77): false] ... ? ... : ... | Assert.cs:77:10:77:12 | M11 |
-| Assert.cs:79:20:79:32 | [b (line 77): true] ... ? ... : ... | Assert.cs:77:10:77:12 | M11 |
-| Assert.cs:79:24:79:27 | [b (line 77): true] null | Assert.cs:77:10:77:12 | M11 |
-| Assert.cs:79:31:79:32 | [b (line 77): false] "" | Assert.cs:77:10:77:12 | M11 |
-| Assert.cs:80:9:80:38 | [assertion failure] call to method IsFalse | Assert.cs:77:10:77:12 | M11 |
-| Assert.cs:80:9:80:38 | [assertion success] call to method IsFalse | Assert.cs:77:10:77:12 | M11 |
-| Assert.cs:80:9:80:39 | [b (line 77): false] ...; | Assert.cs:77:10:77:12 | M11 |
-| Assert.cs:80:9:80:39 | [b (line 77): true] ...; | Assert.cs:77:10:77:12 | M11 |
-| Assert.cs:80:24:80:24 | [b (line 77): false] access to local variable s | Assert.cs:77:10:77:12 | M11 |
-| Assert.cs:80:24:80:24 | [b (line 77): true] access to local variable s | Assert.cs:77:10:77:12 | M11 |
-| Assert.cs:80:24:80:32 | [b (line 77): false] ... != ... | Assert.cs:77:10:77:12 | M11 |
-| Assert.cs:80:24:80:32 | [b (line 77): true] ... != ... | Assert.cs:77:10:77:12 | M11 |
-| Assert.cs:80:24:80:37 | [false] ... \|\| ... | Assert.cs:77:10:77:12 | M11 |
-| Assert.cs:80:24:80:37 | [true] ... \|\| ... | Assert.cs:77:10:77:12 | M11 |
-| Assert.cs:80:29:80:32 | [b (line 77): false] null | Assert.cs:77:10:77:12 | M11 |
-| Assert.cs:80:29:80:32 | [b (line 77): true] null | Assert.cs:77:10:77:12 | M11 |
-| Assert.cs:80:37:80:37 | [b (line 77): false] access to parameter b | Assert.cs:77:10:77:12 | M11 |
-| Assert.cs:80:37:80:37 | [b (line 77): true] access to parameter b | Assert.cs:77:10:77:12 | M11 |
+| Assert.cs:79:20:79:32 | ... ? ... : ... | Assert.cs:77:10:77:12 | M11 |
+| Assert.cs:79:24:79:27 | null | Assert.cs:77:10:77:12 | M11 |
+| Assert.cs:79:31:79:32 | "" | Assert.cs:77:10:77:12 | M11 |
+| Assert.cs:80:9:80:38 | call to method IsFalse | Assert.cs:77:10:77:12 | M11 |
+| Assert.cs:80:9:80:39 | ...; | Assert.cs:77:10:77:12 | M11 |
+| Assert.cs:80:24:80:24 | access to local variable s | Assert.cs:77:10:77:12 | M11 |
+| Assert.cs:80:24:80:32 | ... != ... | Assert.cs:77:10:77:12 | M11 |
+| Assert.cs:80:24:80:37 | ... \|\| ... | Assert.cs:77:10:77:12 | M11 |
+| Assert.cs:80:29:80:32 | null | Assert.cs:77:10:77:12 | M11 |
+| Assert.cs:80:37:80:37 | access to parameter b | Assert.cs:77:10:77:12 | M11 |
 | Assert.cs:81:9:81:35 | call to method WriteLine | Assert.cs:77:10:77:12 | M11 |
 | Assert.cs:81:9:81:36 | ...; | Assert.cs:77:10:77:12 | M11 |
 | Assert.cs:81:27:81:27 | access to local variable s | Assert.cs:77:10:77:12 | M11 |
@@ -633,287 +590,172 @@ nodeEnclosing
 | Assert.cs:84:10:84:12 | exit M12 (normal) | Assert.cs:84:10:84:12 | M12 |
 | Assert.cs:85:5:129:5 | {...} | Assert.cs:84:10:84:12 | M12 |
 | Assert.cs:86:9:86:33 | ... ...; | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:86:16:86:32 | [b (line 84): false] String s = ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:86:16:86:32 | [b (line 84): true] String s = ... | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:86:16:86:32 | String s = ... | Assert.cs:84:10:84:12 | M12 |
 | Assert.cs:86:20:86:20 | access to parameter b | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:86:20:86:32 | [b (line 84): false] ... ? ... : ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:86:20:86:32 | [b (line 84): true] ... ? ... : ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:87:9:87:31 | [assertion failure, b (line 84): false] call to method Assert | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:87:9:87:31 | [assertion failure, b (line 84): true] call to method Assert | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:87:9:87:32 | [b (line 84): false] ...; | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:87:9:87:32 | [b (line 84): true] ...; | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:87:22:87:22 | [b (line 84): false] access to local variable s | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:87:22:87:22 | [b (line 84): true] access to local variable s | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:87:22:87:30 | [b (line 84): false] ... != ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:87:22:87:30 | [b (line 84): true] ... != ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:87:27:87:30 | [b (line 84): false] null | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:87:27:87:30 | [b (line 84): true] null | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:88:9:88:35 | [b (line 84): false] call to method WriteLine | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:88:9:88:35 | [b (line 84): true] call to method WriteLine | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:88:9:88:36 | [b (line 84): false] ...; | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:88:9:88:36 | [b (line 84): true] ...; | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:88:27:88:27 | [b (line 84): false] access to local variable s | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:88:27:88:27 | [b (line 84): true] access to local variable s | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:88:27:88:34 | [b (line 84): false] access to property Length | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:88:27:88:34 | [b (line 84): true] access to property Length | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:90:9:90:25 | [b (line 84): false] ... = ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:90:9:90:25 | [b (line 84): true] ... = ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:90:9:90:26 | [b (line 84): false] ...; | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:90:9:90:26 | [b (line 84): true] ...; | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:90:13:90:13 | [b (line 84): false] access to parameter b | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:90:13:90:13 | [b (line 84): true] access to parameter b | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:90:13:90:25 | [b (line 84): false] ... ? ... : ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:90:13:90:25 | [b (line 84): true] ... ? ... : ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:90:24:90:25 | [b (line 84): false] "" | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:91:9:91:24 | [assertion failure, b (line 84): false] call to method IsNull | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:91:9:91:24 | [assertion failure, b (line 84): true] call to method IsNull | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:91:9:91:25 | [b (line 84): false] ...; | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:91:9:91:25 | [b (line 84): true] ...; | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:91:23:91:23 | [b (line 84): false] access to local variable s | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:91:23:91:23 | [b (line 84): true] access to local variable s | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:92:9:92:35 | [b (line 84): false] call to method WriteLine | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:92:9:92:35 | [b (line 84): true] call to method WriteLine | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:92:9:92:36 | [b (line 84): false] ...; | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:92:9:92:36 | [b (line 84): true] ...; | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:92:27:92:27 | [b (line 84): false] access to local variable s | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:92:27:92:27 | [b (line 84): true] access to local variable s | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:92:27:92:34 | [b (line 84): false] access to property Length | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:92:27:92:34 | [b (line 84): true] access to property Length | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:94:9:94:25 | [b (line 84): false] ... = ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:94:9:94:25 | [b (line 84): true] ... = ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:94:9:94:26 | [b (line 84): false] ...; | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:94:9:94:26 | [b (line 84): true] ...; | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:94:13:94:13 | [b (line 84): false] access to parameter b | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:94:13:94:13 | [b (line 84): true] access to parameter b | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:94:13:94:25 | [b (line 84): false] ... ? ... : ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:94:13:94:25 | [b (line 84): true] ... ? ... : ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:94:24:94:25 | [b (line 84): false] "" | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:95:9:95:27 | [assertion failure, b (line 84): false] call to method IsNotNull | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:95:9:95:27 | [assertion failure, b (line 84): true] call to method IsNotNull | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:95:9:95:28 | [b (line 84): false] ...; | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:95:9:95:28 | [b (line 84): true] ...; | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:95:26:95:26 | [b (line 84): false] access to local variable s | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:95:26:95:26 | [b (line 84): true] access to local variable s | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:96:9:96:35 | [b (line 84): false] call to method WriteLine | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:96:9:96:35 | [b (line 84): true] call to method WriteLine | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:96:9:96:36 | [b (line 84): false] ...; | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:96:9:96:36 | [b (line 84): true] ...; | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:96:27:96:27 | [b (line 84): false] access to local variable s | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:96:27:96:27 | [b (line 84): true] access to local variable s | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:96:27:96:34 | [b (line 84): false] access to property Length | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:96:27:96:34 | [b (line 84): true] access to property Length | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:98:9:98:25 | [b (line 84): false] ... = ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:98:9:98:25 | [b (line 84): true] ... = ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:98:9:98:26 | [b (line 84): false] ...; | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:98:9:98:26 | [b (line 84): true] ...; | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:98:13:98:13 | [b (line 84): false] access to parameter b | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:98:13:98:13 | [b (line 84): true] access to parameter b | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:98:13:98:25 | [b (line 84): false] ... ? ... : ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:98:13:98:25 | [b (line 84): true] ... ? ... : ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:98:24:98:25 | [b (line 84): false] "" | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:99:9:99:32 | [assertion failure, b (line 84): false] call to method IsTrue | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:99:9:99:32 | [assertion failure, b (line 84): true] call to method IsTrue | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:99:9:99:33 | [b (line 84): false] ...; | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:99:9:99:33 | [b (line 84): true] ...; | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:99:23:99:23 | [b (line 84): false] access to local variable s | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:99:23:99:23 | [b (line 84): true] access to local variable s | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:99:23:99:31 | [b (line 84): false] ... == ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:99:23:99:31 | [b (line 84): true] ... == ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:99:28:99:31 | [b (line 84): false] null | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:99:28:99:31 | [b (line 84): true] null | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:100:9:100:35 | [b (line 84): false] call to method WriteLine | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:100:9:100:35 | [b (line 84): true] call to method WriteLine | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:100:9:100:36 | [b (line 84): false] ...; | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:100:9:100:36 | [b (line 84): true] ...; | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:100:27:100:27 | [b (line 84): false] access to local variable s | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:100:27:100:27 | [b (line 84): true] access to local variable s | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:100:27:100:34 | [b (line 84): false] access to property Length | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:100:27:100:34 | [b (line 84): true] access to property Length | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:102:9:102:25 | [b (line 84): false] ... = ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:102:9:102:25 | [b (line 84): true] ... = ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:102:9:102:26 | [b (line 84): false] ...; | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:102:9:102:26 | [b (line 84): true] ...; | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:102:13:102:13 | [b (line 84): false] access to parameter b | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:102:13:102:13 | [b (line 84): true] access to parameter b | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:102:13:102:25 | [b (line 84): false] ... ? ... : ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:102:13:102:25 | [b (line 84): true] ... ? ... : ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:102:24:102:25 | [b (line 84): false] "" | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:103:9:103:32 | [assertion failure, b (line 84): false] call to method IsTrue | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:103:9:103:32 | [assertion failure, b (line 84): true] call to method IsTrue | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:103:9:103:33 | [b (line 84): false] ...; | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:103:9:103:33 | [b (line 84): true] ...; | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:103:23:103:23 | [b (line 84): false] access to local variable s | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:103:23:103:23 | [b (line 84): true] access to local variable s | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:103:23:103:31 | [b (line 84): false] ... != ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:103:23:103:31 | [b (line 84): true] ... != ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:103:28:103:31 | [b (line 84): false] null | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:103:28:103:31 | [b (line 84): true] null | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:104:9:104:35 | [b (line 84): false] call to method WriteLine | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:104:9:104:35 | [b (line 84): true] call to method WriteLine | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:104:9:104:36 | [b (line 84): false] ...; | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:104:9:104:36 | [b (line 84): true] ...; | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:104:27:104:27 | [b (line 84): false] access to local variable s | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:104:27:104:27 | [b (line 84): true] access to local variable s | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:104:27:104:34 | [b (line 84): false] access to property Length | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:104:27:104:34 | [b (line 84): true] access to property Length | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:106:9:106:25 | [b (line 84): false] ... = ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:106:9:106:25 | [b (line 84): true] ... = ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:106:9:106:26 | [b (line 84): false] ...; | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:106:9:106:26 | [b (line 84): true] ...; | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:106:13:106:13 | [b (line 84): false] access to parameter b | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:106:13:106:13 | [b (line 84): true] access to parameter b | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:106:13:106:25 | [b (line 84): false] ... ? ... : ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:106:13:106:25 | [b (line 84): true] ... ? ... : ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:106:24:106:25 | [b (line 84): false] "" | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:107:9:107:33 | [assertion failure, b (line 84): false] call to method IsFalse | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:107:9:107:33 | [assertion failure, b (line 84): true] call to method IsFalse | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): false] call to method IsFalse | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:107:9:107:34 | [b (line 84): false] ...; | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:107:9:107:34 | [b (line 84): true] ...; | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:107:24:107:24 | [b (line 84): false] access to local variable s | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:107:24:107:24 | [b (line 84): true] access to local variable s | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:107:24:107:32 | [b (line 84): false] ... != ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:107:24:107:32 | [b (line 84): true] ... != ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:107:29:107:32 | [b (line 84): false] null | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:107:29:107:32 | [b (line 84): true] null | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:108:9:108:35 | [b (line 84): false] call to method WriteLine | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:108:9:108:35 | [b (line 84): true] call to method WriteLine | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:108:9:108:36 | [b (line 84): false] ...; | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:108:9:108:36 | [b (line 84): true] ...; | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:108:27:108:27 | [b (line 84): false] access to local variable s | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:108:27:108:27 | [b (line 84): true] access to local variable s | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:108:27:108:34 | [b (line 84): false] access to property Length | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:108:27:108:34 | [b (line 84): true] access to property Length | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:110:9:110:25 | [b (line 84): false] ... = ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:110:9:110:25 | [b (line 84): true] ... = ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:110:9:110:26 | [b (line 84): false] ...; | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:110:9:110:26 | [b (line 84): true] ...; | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:110:13:110:13 | [b (line 84): false] access to parameter b | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:110:13:110:13 | [b (line 84): true] access to parameter b | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:110:13:110:25 | [b (line 84): false] ... ? ... : ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:110:13:110:25 | [b (line 84): true] ... ? ... : ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:110:24:110:25 | [b (line 84): false] "" | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:111:9:111:33 | [assertion failure, b (line 84): false] call to method IsFalse | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:111:9:111:33 | [assertion failure, b (line 84): true] call to method IsFalse | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): false] call to method IsFalse | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:111:9:111:34 | [b (line 84): false] ...; | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:111:9:111:34 | [b (line 84): true] ...; | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:111:24:111:24 | [b (line 84): false] access to local variable s | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:111:24:111:24 | [b (line 84): true] access to local variable s | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:111:24:111:32 | [b (line 84): false] ... == ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:111:24:111:32 | [b (line 84): true] ... == ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:111:29:111:32 | [b (line 84): false] null | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:111:29:111:32 | [b (line 84): true] null | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:112:9:112:35 | [b (line 84): false] call to method WriteLine | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:112:9:112:35 | [b (line 84): true] call to method WriteLine | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:112:9:112:36 | [b (line 84): false] ...; | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:112:9:112:36 | [b (line 84): true] ...; | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:112:27:112:27 | [b (line 84): false] access to local variable s | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:112:27:112:27 | [b (line 84): true] access to local variable s | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:112:27:112:34 | [b (line 84): false] access to property Length | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:112:27:112:34 | [b (line 84): true] access to property Length | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:114:9:114:25 | [b (line 84): false] ... = ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:114:9:114:25 | [b (line 84): true] ... = ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:114:9:114:26 | [b (line 84): false] ...; | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:114:9:114:26 | [b (line 84): true] ...; | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:114:13:114:13 | [b (line 84): false] access to parameter b | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:114:13:114:13 | [b (line 84): true] access to parameter b | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:114:13:114:25 | [b (line 84): false] ... ? ... : ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:114:13:114:25 | [b (line 84): true] ... ? ... : ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:114:24:114:25 | [b (line 84): false] "" | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:115:9:115:37 | [assertion failure, b (line 84): false] call to method IsTrue | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:115:9:115:37 | [assertion failure, b (line 84): true] call to method IsTrue | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:115:9:115:38 | [b (line 84): false] ...; | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:115:9:115:38 | [b (line 84): true] ...; | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:115:23:115:23 | [b (line 84): false] access to local variable s | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:115:23:115:23 | [b (line 84): true] access to local variable s | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:115:23:115:31 | [b (line 84): false] ... != ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:115:23:115:31 | [b (line 84): true] ... != ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:115:23:115:36 | [false, b (line 84): false] ... && ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:115:23:115:36 | [false, b (line 84): true] ... && ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:115:28:115:31 | [b (line 84): false] null | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:115:28:115:31 | [b (line 84): true] null | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:115:36:115:36 | [b (line 84): false] access to parameter b | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:116:9:116:35 | [b (line 84): true] call to method WriteLine | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:116:9:116:36 | [b (line 84): true] ...; | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:116:27:116:27 | [b (line 84): true] access to local variable s | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:116:27:116:34 | [b (line 84): true] access to property Length | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:118:9:118:25 | [b (line 84): true] ... = ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:118:9:118:26 | [b (line 84): true] ...; | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:118:13:118:13 | [b (line 84): true] access to parameter b | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:118:13:118:25 | [b (line 84): true] ... ? ... : ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:119:9:119:40 | [b (line 84): true] ...; | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:119:24:119:24 | [b (line 84): true] access to local variable s | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:119:24:119:32 | [b (line 84): true] ... == ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:119:29:119:32 | [b (line 84): true] null | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:120:9:120:35 | [b (line 84): true] call to method WriteLine | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:120:9:120:36 | [b (line 84): true] ...; | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:120:27:120:27 | [b (line 84): true] access to local variable s | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:120:27:120:34 | [b (line 84): true] access to property Length | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:122:9:122:25 | [b (line 84): true] ... = ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:122:9:122:26 | [b (line 84): true] ...; | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:122:13:122:13 | [b (line 84): true] access to parameter b | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:122:13:122:25 | [b (line 84): true] ... ? ... : ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:123:9:123:38 | [b (line 84): true] ...; | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:123:23:123:23 | [b (line 84): true] access to local variable s | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:123:23:123:31 | [b (line 84): true] ... == ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:123:28:123:31 | [b (line 84): true] null | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:124:9:124:35 | [b (line 84): true] call to method WriteLine | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:124:9:124:36 | [b (line 84): true] ...; | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:124:27:124:27 | [b (line 84): true] access to local variable s | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:124:27:124:34 | [b (line 84): true] access to property Length | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:126:9:126:25 | [b (line 84): true] ... = ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:126:9:126:26 | [b (line 84): true] ...; | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:126:13:126:13 | [b (line 84): true] access to parameter b | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:126:13:126:25 | [b (line 84): true] ... ? ... : ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:126:17:126:20 | [b (line 84): true] null | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:127:9:127:40 | [b (line 84): true] ...; | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:127:24:127:24 | [b (line 84): true] access to local variable s | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:127:24:127:32 | [b (line 84): true] ... != ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:127:24:127:38 | [false] ... \|\| ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:127:24:127:38 | [true] ... \|\| ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:127:29:127:32 | [b (line 84): true] null | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:127:37:127:38 | [false] !... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:86:24:86:27 | null | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:86:31:86:32 | "" | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:87:9:87:31 | call to method Assert | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:87:9:87:32 | ...; | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:87:22:87:22 | access to local variable s | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:87:22:87:30 | ... != ... | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:87:27:87:30 | null | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:88:9:88:35 | call to method WriteLine | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:88:27:88:27 | access to local variable s | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:88:27:88:34 | access to property Length | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:90:9:90:25 | ... = ... | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:90:9:90:26 | ...; | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:90:13:90:13 | access to parameter b | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:90:17:90:20 | null | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:90:24:90:25 | "" | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:91:9:91:24 | call to method IsNull | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:91:9:91:25 | ...; | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:91:23:91:23 | access to local variable s | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:92:9:92:35 | call to method WriteLine | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:92:27:92:27 | access to local variable s | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:92:27:92:34 | access to property Length | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:94:9:94:25 | ... = ... | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:94:9:94:26 | ...; | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:94:13:94:13 | access to parameter b | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:94:17:94:20 | null | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:94:24:94:25 | "" | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:95:9:95:27 | call to method IsNotNull | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:95:9:95:28 | ...; | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:95:26:95:26 | access to local variable s | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:96:9:96:35 | call to method WriteLine | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:96:27:96:27 | access to local variable s | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:96:27:96:34 | access to property Length | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:98:9:98:25 | ... = ... | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:98:9:98:26 | ...; | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:98:13:98:13 | access to parameter b | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:98:17:98:20 | null | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:98:24:98:25 | "" | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:99:9:99:32 | call to method IsTrue | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:99:9:99:33 | ...; | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:99:23:99:23 | access to local variable s | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:99:23:99:31 | ... == ... | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:99:28:99:31 | null | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:100:9:100:35 | call to method WriteLine | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:100:27:100:27 | access to local variable s | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:100:27:100:34 | access to property Length | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:102:9:102:25 | ... = ... | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:102:9:102:26 | ...; | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:102:13:102:13 | access to parameter b | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:102:17:102:20 | null | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:102:24:102:25 | "" | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:103:9:103:32 | call to method IsTrue | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:103:9:103:33 | ...; | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:103:23:103:23 | access to local variable s | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:103:23:103:31 | ... != ... | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:103:28:103:31 | null | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:104:9:104:35 | call to method WriteLine | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:104:27:104:27 | access to local variable s | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:104:27:104:34 | access to property Length | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:106:9:106:25 | ... = ... | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:106:9:106:26 | ...; | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:106:13:106:13 | access to parameter b | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:106:17:106:20 | null | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:106:24:106:25 | "" | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:107:9:107:33 | call to method IsFalse | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:107:9:107:34 | ...; | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:107:24:107:24 | access to local variable s | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:107:24:107:32 | ... != ... | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:107:29:107:32 | null | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:108:9:108:35 | call to method WriteLine | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:108:27:108:27 | access to local variable s | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:108:27:108:34 | access to property Length | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:110:9:110:25 | ... = ... | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:110:9:110:26 | ...; | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:110:13:110:13 | access to parameter b | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:110:17:110:20 | null | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:110:24:110:25 | "" | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:111:9:111:33 | call to method IsFalse | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:111:9:111:34 | ...; | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:111:24:111:24 | access to local variable s | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:111:24:111:32 | ... == ... | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:111:29:111:32 | null | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:112:9:112:35 | call to method WriteLine | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:112:27:112:27 | access to local variable s | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:112:27:112:34 | access to property Length | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:114:9:114:25 | ... = ... | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:114:9:114:26 | ...; | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:114:13:114:13 | access to parameter b | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:114:17:114:20 | null | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:114:24:114:25 | "" | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:115:9:115:37 | call to method IsTrue | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:115:9:115:38 | ...; | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:115:23:115:23 | access to local variable s | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:115:23:115:31 | ... != ... | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:115:28:115:31 | null | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:115:36:115:36 | access to parameter b | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:116:9:116:35 | call to method WriteLine | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:116:27:116:27 | access to local variable s | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:116:27:116:34 | access to property Length | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:118:9:118:25 | ... = ... | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:118:9:118:26 | ...; | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:118:13:118:13 | access to parameter b | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:118:17:118:20 | null | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:118:24:118:25 | "" | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:119:9:119:39 | call to method IsFalse | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:119:9:119:40 | ...; | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:119:24:119:24 | access to local variable s | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:119:24:119:32 | ... == ... | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:119:29:119:32 | null | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:119:37:119:38 | !... | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:119:38:119:38 | access to parameter b | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:120:9:120:35 | call to method WriteLine | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:120:27:120:27 | access to local variable s | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:120:27:120:34 | access to property Length | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:122:9:122:25 | ... = ... | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:122:9:122:26 | ...; | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:122:13:122:13 | access to parameter b | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:122:17:122:20 | null | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:122:24:122:25 | "" | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:123:9:123:37 | call to method IsTrue | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:123:9:123:38 | ...; | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:123:23:123:23 | access to local variable s | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:123:23:123:31 | ... == ... | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:123:28:123:31 | null | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:123:36:123:36 | access to parameter b | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:124:9:124:35 | call to method WriteLine | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:124:27:124:27 | access to local variable s | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:124:27:124:34 | access to property Length | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:126:9:126:25 | ... = ... | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:126:9:126:26 | ...; | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:126:13:126:13 | access to parameter b | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:126:17:126:20 | null | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:126:24:126:25 | "" | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:127:9:127:39 | call to method IsFalse | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:127:9:127:40 | ...; | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:127:24:127:24 | access to local variable s | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:127:24:127:32 | ... != ... | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:127:29:127:32 | null | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:127:37:127:38 | !... | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:127:38:127:38 | access to parameter b | Assert.cs:84:10:84:12 | M12 |
 | Assert.cs:128:9:128:35 | call to method WriteLine | Assert.cs:84:10:84:12 | M12 |
 | Assert.cs:128:9:128:36 | ...; | Assert.cs:84:10:84:12 | M12 |
 | Assert.cs:128:27:128:27 | access to local variable s | Assert.cs:84:10:84:12 | M12 |
@@ -927,17 +769,12 @@ nodeEnclosing
 | Assert.cs:138:10:138:12 | exit M13 (abnormal) | Assert.cs:138:10:138:12 | M13 |
 | Assert.cs:138:10:138:12 | exit M13 (normal) | Assert.cs:138:10:138:12 | M13 |
 | Assert.cs:139:5:142:5 | {...} | Assert.cs:138:10:138:12 | M13 |
-| Assert.cs:140:9:140:35 | [assertion failure] call to method AssertTrueFalse | Assert.cs:138:10:138:12 | M13 |
-| Assert.cs:140:9:140:35 | [assertion failure] call to method AssertTrueFalse | Assert.cs:138:10:138:12 | M13 |
-| Assert.cs:140:9:140:35 | [assertion success] call to method AssertTrueFalse | Assert.cs:138:10:138:12 | M13 |
+| Assert.cs:140:9:140:35 | call to method AssertTrueFalse | Assert.cs:138:10:138:12 | M13 |
 | Assert.cs:140:9:140:35 | this access | Assert.cs:138:10:138:12 | M13 |
 | Assert.cs:140:9:140:36 | ...; | Assert.cs:138:10:138:12 | M13 |
 | Assert.cs:140:25:140:26 | access to parameter b1 | Assert.cs:138:10:138:12 | M13 |
-| Assert.cs:140:29:140:30 | [assertion failure] access to parameter b2 | Assert.cs:138:10:138:12 | M13 |
 | Assert.cs:140:29:140:30 | access to parameter b2 | Assert.cs:138:10:138:12 | M13 |
-| Assert.cs:140:33:140:34 | [assertion failure] access to parameter b3 | Assert.cs:138:10:138:12 | M13 |
-| Assert.cs:140:33:140:34 | [assertion failure] access to parameter b3 | Assert.cs:138:10:138:12 | M13 |
-| Assert.cs:140:33:140:34 | [assertion success] access to parameter b3 | Assert.cs:138:10:138:12 | M13 |
+| Assert.cs:140:33:140:34 | access to parameter b3 | Assert.cs:138:10:138:12 | M13 |
 | Assert.cs:141:9:141:15 | return ...; | Assert.cs:138:10:138:12 | M13 |
 | Assignments.cs:1:7:1:17 | call to constructor Object | Assignments.cs:1:7:1:17 | Assignments |
 | Assignments.cs:1:7:1:17 | enter Assignments | Assignments.cs:1:7:1:17 | Assignments |
@@ -1029,18 +866,12 @@ nodeEnclosing
 | BreakInTry.cs:26:21:26:31 | ... == ... | BreakInTry.cs:20:10:20:11 | M2 |
 | BreakInTry.cs:26:28:26:31 | null | BreakInTry.cs:20:10:20:11 | M2 |
 | BreakInTry.cs:27:21:27:26 | break; | BreakInTry.cs:20:10:20:11 | M2 |
-| BreakInTry.cs:30:13:33:13 | [finally: break] {...} | BreakInTry.cs:20:10:20:11 | M2 |
 | BreakInTry.cs:30:13:33:13 | {...} | BreakInTry.cs:20:10:20:11 | M2 |
-| BreakInTry.cs:31:17:32:21 | [finally: break] if (...) ... | BreakInTry.cs:20:10:20:11 | M2 |
 | BreakInTry.cs:31:17:32:21 | if (...) ... | BreakInTry.cs:20:10:20:11 | M2 |
-| BreakInTry.cs:31:21:31:24 | [finally: break] access to parameter args | BreakInTry.cs:20:10:20:11 | M2 |
 | BreakInTry.cs:31:21:31:24 | access to parameter args | BreakInTry.cs:20:10:20:11 | M2 |
 | BreakInTry.cs:31:21:31:32 | ... == ... | BreakInTry.cs:20:10:20:11 | M2 |
-| BreakInTry.cs:31:21:31:32 | [finally: break] ... == ... | BreakInTry.cs:20:10:20:11 | M2 |
-| BreakInTry.cs:31:29:31:32 | [finally: break] null | BreakInTry.cs:20:10:20:11 | M2 |
 | BreakInTry.cs:31:29:31:32 | null | BreakInTry.cs:20:10:20:11 | M2 |
 | BreakInTry.cs:32:21:32:21 | ; | BreakInTry.cs:20:10:20:11 | M2 |
-| BreakInTry.cs:32:21:32:21 | [finally: break] ; | BreakInTry.cs:20:10:20:11 | M2 |
 | BreakInTry.cs:35:7:35:7 | ; | BreakInTry.cs:20:10:20:11 | M2 |
 | BreakInTry.cs:38:10:38:11 | enter M3 | BreakInTry.cs:38:10:38:11 | M3 |
 | BreakInTry.cs:38:10:38:11 | exit M3 | BreakInTry.cs:38:10:38:11 | M3 |
@@ -1053,25 +884,15 @@ nodeEnclosing
 | BreakInTry.cs:42:17:42:28 | ... == ... | BreakInTry.cs:38:10:38:11 | M3 |
 | BreakInTry.cs:42:25:42:28 | null | BreakInTry.cs:38:10:38:11 | M3 |
 | BreakInTry.cs:43:17:43:23 | return ...; | BreakInTry.cs:38:10:38:11 | M3 |
-| BreakInTry.cs:46:9:52:9 | [finally: return] {...} | BreakInTry.cs:38:10:38:11 | M3 |
 | BreakInTry.cs:46:9:52:9 | {...} | BreakInTry.cs:38:10:38:11 | M3 |
-| BreakInTry.cs:47:13:51:13 | [finally: return] foreach (... ... in ...) ... | BreakInTry.cs:38:10:38:11 | M3 |
 | BreakInTry.cs:47:13:51:13 | foreach (... ... in ...) ... | BreakInTry.cs:38:10:38:11 | M3 |
 | BreakInTry.cs:47:26:47:28 | String arg | BreakInTry.cs:38:10:38:11 | M3 |
-| BreakInTry.cs:47:26:47:28 | [finally: return] String arg | BreakInTry.cs:38:10:38:11 | M3 |
-| BreakInTry.cs:47:33:47:36 | [finally: return] access to parameter args | BreakInTry.cs:38:10:38:11 | M3 |
 | BreakInTry.cs:47:33:47:36 | access to parameter args | BreakInTry.cs:38:10:38:11 | M3 |
-| BreakInTry.cs:48:13:51:13 | [finally: return] {...} | BreakInTry.cs:38:10:38:11 | M3 |
 | BreakInTry.cs:48:13:51:13 | {...} | BreakInTry.cs:38:10:38:11 | M3 |
-| BreakInTry.cs:49:17:50:26 | [finally: return] if (...) ... | BreakInTry.cs:38:10:38:11 | M3 |
 | BreakInTry.cs:49:17:50:26 | if (...) ... | BreakInTry.cs:38:10:38:11 | M3 |
-| BreakInTry.cs:49:21:49:23 | [finally: return] access to local variable arg | BreakInTry.cs:38:10:38:11 | M3 |
 | BreakInTry.cs:49:21:49:23 | access to local variable arg | BreakInTry.cs:38:10:38:11 | M3 |
 | BreakInTry.cs:49:21:49:31 | ... == ... | BreakInTry.cs:38:10:38:11 | M3 |
-| BreakInTry.cs:49:21:49:31 | [finally: return] ... == ... | BreakInTry.cs:38:10:38:11 | M3 |
-| BreakInTry.cs:49:28:49:31 | [finally: return] null | BreakInTry.cs:38:10:38:11 | M3 |
 | BreakInTry.cs:49:28:49:31 | null | BreakInTry.cs:38:10:38:11 | M3 |
-| BreakInTry.cs:50:21:50:26 | [finally: return] break; | BreakInTry.cs:38:10:38:11 | M3 |
 | BreakInTry.cs:50:21:50:26 | break; | BreakInTry.cs:38:10:38:11 | M3 |
 | BreakInTry.cs:53:7:53:7 | ; | BreakInTry.cs:38:10:38:11 | M3 |
 | BreakInTry.cs:56:10:56:11 | enter M4 | BreakInTry.cs:56:10:56:11 | M4 |
@@ -1085,25 +906,15 @@ nodeEnclosing
 | BreakInTry.cs:60:17:60:28 | ... == ... | BreakInTry.cs:56:10:56:11 | M4 |
 | BreakInTry.cs:60:25:60:28 | null | BreakInTry.cs:56:10:56:11 | M4 |
 | BreakInTry.cs:61:17:61:23 | return ...; | BreakInTry.cs:56:10:56:11 | M4 |
-| BreakInTry.cs:64:9:70:9 | [finally: return] {...} | BreakInTry.cs:56:10:56:11 | M4 |
 | BreakInTry.cs:64:9:70:9 | {...} | BreakInTry.cs:56:10:56:11 | M4 |
-| BreakInTry.cs:65:13:69:13 | [finally: return] foreach (... ... in ...) ... | BreakInTry.cs:56:10:56:11 | M4 |
 | BreakInTry.cs:65:13:69:13 | foreach (... ... in ...) ... | BreakInTry.cs:56:10:56:11 | M4 |
 | BreakInTry.cs:65:26:65:28 | String arg | BreakInTry.cs:56:10:56:11 | M4 |
-| BreakInTry.cs:65:26:65:28 | [finally: return] String arg | BreakInTry.cs:56:10:56:11 | M4 |
-| BreakInTry.cs:65:33:65:36 | [finally: return] access to parameter args | BreakInTry.cs:56:10:56:11 | M4 |
 | BreakInTry.cs:65:33:65:36 | access to parameter args | BreakInTry.cs:56:10:56:11 | M4 |
-| BreakInTry.cs:66:13:69:13 | [finally: return] {...} | BreakInTry.cs:56:10:56:11 | M4 |
 | BreakInTry.cs:66:13:69:13 | {...} | BreakInTry.cs:56:10:56:11 | M4 |
-| BreakInTry.cs:67:17:68:26 | [finally: return] if (...) ... | BreakInTry.cs:56:10:56:11 | M4 |
 | BreakInTry.cs:67:17:68:26 | if (...) ... | BreakInTry.cs:56:10:56:11 | M4 |
-| BreakInTry.cs:67:21:67:23 | [finally: return] access to local variable arg | BreakInTry.cs:56:10:56:11 | M4 |
 | BreakInTry.cs:67:21:67:23 | access to local variable arg | BreakInTry.cs:56:10:56:11 | M4 |
 | BreakInTry.cs:67:21:67:31 | ... == ... | BreakInTry.cs:56:10:56:11 | M4 |
-| BreakInTry.cs:67:21:67:31 | [finally: return] ... == ... | BreakInTry.cs:56:10:56:11 | M4 |
-| BreakInTry.cs:67:28:67:31 | [finally: return] null | BreakInTry.cs:56:10:56:11 | M4 |
 | BreakInTry.cs:67:28:67:31 | null | BreakInTry.cs:56:10:56:11 | M4 |
-| BreakInTry.cs:68:21:68:26 | [finally: return] break; | BreakInTry.cs:56:10:56:11 | M4 |
 | BreakInTry.cs:68:21:68:26 | break; | BreakInTry.cs:56:10:56:11 | M4 |
 | CompileTimeOperators.cs:3:7:3:26 | call to constructor Object | CompileTimeOperators.cs:3:7:3:26 | CompileTimeOperators |
 | CompileTimeOperators.cs:3:7:3:26 | enter CompileTimeOperators | CompileTimeOperators.cs:3:7:3:26 | CompileTimeOperators |
@@ -1141,15 +952,19 @@ nodeEnclosing
 | CompileTimeOperators.cs:26:7:26:22 | {...} | CompileTimeOperators.cs:26:7:26:22 | GotoInTryFinally |
 | CompileTimeOperators.cs:28:10:28:10 | enter M | CompileTimeOperators.cs:28:10:28:10 | M |
 | CompileTimeOperators.cs:28:10:28:10 | exit M | CompileTimeOperators.cs:28:10:28:10 | M |
+| CompileTimeOperators.cs:28:10:28:10 | exit M (abnormal) | CompileTimeOperators.cs:28:10:28:10 | M |
 | CompileTimeOperators.cs:28:10:28:10 | exit M (normal) | CompileTimeOperators.cs:28:10:28:10 | M |
 | CompileTimeOperators.cs:29:5:41:5 | {...} | CompileTimeOperators.cs:28:10:28:10 | M |
 | CompileTimeOperators.cs:30:9:38:9 | try {...} ... | CompileTimeOperators.cs:28:10:28:10 | M |
 | CompileTimeOperators.cs:31:9:34:9 | {...} | CompileTimeOperators.cs:28:10:28:10 | M |
 | CompileTimeOperators.cs:32:13:32:21 | goto ...; | CompileTimeOperators.cs:28:10:28:10 | M |
-| CompileTimeOperators.cs:36:9:38:9 | [finally: goto(End)] {...} | CompileTimeOperators.cs:28:10:28:10 | M |
-| CompileTimeOperators.cs:37:13:37:40 | [finally: goto(End)] call to method WriteLine | CompileTimeOperators.cs:28:10:28:10 | M |
-| CompileTimeOperators.cs:37:13:37:41 | [finally: goto(End)] ...; | CompileTimeOperators.cs:28:10:28:10 | M |
-| CompileTimeOperators.cs:37:31:37:39 | [finally: goto(End)] "Finally" | CompileTimeOperators.cs:28:10:28:10 | M |
+| CompileTimeOperators.cs:36:9:38:9 | {...} | CompileTimeOperators.cs:28:10:28:10 | M |
+| CompileTimeOperators.cs:37:13:37:40 | call to method WriteLine | CompileTimeOperators.cs:28:10:28:10 | M |
+| CompileTimeOperators.cs:37:13:37:41 | ...; | CompileTimeOperators.cs:28:10:28:10 | M |
+| CompileTimeOperators.cs:37:31:37:39 | "Finally" | CompileTimeOperators.cs:28:10:28:10 | M |
+| CompileTimeOperators.cs:39:9:39:33 | call to method WriteLine | CompileTimeOperators.cs:28:10:28:10 | M |
+| CompileTimeOperators.cs:39:9:39:34 | ...; | CompileTimeOperators.cs:28:10:28:10 | M |
+| CompileTimeOperators.cs:39:27:39:32 | "Dead" | CompileTimeOperators.cs:28:10:28:10 | M |
 | CompileTimeOperators.cs:40:9:40:11 | End: | CompileTimeOperators.cs:28:10:28:10 | M |
 | CompileTimeOperators.cs:40:14:40:37 | call to method WriteLine | CompileTimeOperators.cs:28:10:28:10 | M |
 | CompileTimeOperators.cs:40:14:40:38 | ...; | CompileTimeOperators.cs:28:10:28:10 | M |
@@ -1259,15 +1074,13 @@ nodeEnclosing
 | Conditions.cs:4:5:9:5 | {...} | Conditions.cs:3:10:3:19 | IncrOrDecr |
 | Conditions.cs:5:9:6:16 | if (...) ... | Conditions.cs:3:10:3:19 | IncrOrDecr |
 | Conditions.cs:5:13:5:15 | access to parameter inc | Conditions.cs:3:10:3:19 | IncrOrDecr |
-| Conditions.cs:6:13:6:13 | [inc (line 3): true] access to parameter x | Conditions.cs:3:10:3:19 | IncrOrDecr |
-| Conditions.cs:6:13:6:15 | [inc (line 3): true] ...++ | Conditions.cs:3:10:3:19 | IncrOrDecr |
-| Conditions.cs:6:13:6:16 | [inc (line 3): true] ...; | Conditions.cs:3:10:3:19 | IncrOrDecr |
-| Conditions.cs:7:9:8:16 | [inc (line 3): false] if (...) ... | Conditions.cs:3:10:3:19 | IncrOrDecr |
-| Conditions.cs:7:9:8:16 | [inc (line 3): true] if (...) ... | Conditions.cs:3:10:3:19 | IncrOrDecr |
+| Conditions.cs:6:13:6:13 | access to parameter x | Conditions.cs:3:10:3:19 | IncrOrDecr |
+| Conditions.cs:6:13:6:15 | ...++ | Conditions.cs:3:10:3:19 | IncrOrDecr |
+| Conditions.cs:6:13:6:16 | ...; | Conditions.cs:3:10:3:19 | IncrOrDecr |
+| Conditions.cs:7:9:8:16 | if (...) ... | Conditions.cs:3:10:3:19 | IncrOrDecr |
 | Conditions.cs:7:13:7:16 | [false] !... | Conditions.cs:3:10:3:19 | IncrOrDecr |
 | Conditions.cs:7:13:7:16 | [true] !... | Conditions.cs:3:10:3:19 | IncrOrDecr |
-| Conditions.cs:7:14:7:16 | [inc (line 3): false] access to parameter inc | Conditions.cs:3:10:3:19 | IncrOrDecr |
-| Conditions.cs:7:14:7:16 | [inc (line 3): true] access to parameter inc | Conditions.cs:3:10:3:19 | IncrOrDecr |
+| Conditions.cs:7:14:7:16 | access to parameter inc | Conditions.cs:3:10:3:19 | IncrOrDecr |
 | Conditions.cs:8:13:8:13 | access to parameter x | Conditions.cs:3:10:3:19 | IncrOrDecr |
 | Conditions.cs:8:13:8:15 | ...-- | Conditions.cs:3:10:3:19 | IncrOrDecr |
 | Conditions.cs:8:13:8:16 | ...; | Conditions.cs:3:10:3:19 | IncrOrDecr |
@@ -1280,23 +1093,17 @@ nodeEnclosing
 | Conditions.cs:13:17:13:17 | 0 | Conditions.cs:11:9:11:10 | M1 |
 | Conditions.cs:14:9:15:16 | if (...) ... | Conditions.cs:11:9:11:10 | M1 |
 | Conditions.cs:14:13:14:13 | access to parameter b | Conditions.cs:11:9:11:10 | M1 |
-| Conditions.cs:15:13:15:13 | [b (line 11): true] access to local variable x | Conditions.cs:11:9:11:10 | M1 |
-| Conditions.cs:15:13:15:15 | [b (line 11): true] ...++ | Conditions.cs:11:9:11:10 | M1 |
-| Conditions.cs:15:13:15:16 | [b (line 11): true] ...; | Conditions.cs:11:9:11:10 | M1 |
-| Conditions.cs:16:9:18:20 | [b (line 11): false] if (...) ... | Conditions.cs:11:9:11:10 | M1 |
-| Conditions.cs:16:9:18:20 | [b (line 11): true] if (...) ... | Conditions.cs:11:9:11:10 | M1 |
-| Conditions.cs:16:13:16:13 | [b (line 11): false] access to local variable x | Conditions.cs:11:9:11:10 | M1 |
-| Conditions.cs:16:13:16:13 | [b (line 11): true] access to local variable x | Conditions.cs:11:9:11:10 | M1 |
-| Conditions.cs:16:13:16:17 | [b (line 11): false] ... > ... | Conditions.cs:11:9:11:10 | M1 |
-| Conditions.cs:16:13:16:17 | [b (line 11): true] ... > ... | Conditions.cs:11:9:11:10 | M1 |
-| Conditions.cs:16:17:16:17 | [b (line 11): false] 0 | Conditions.cs:11:9:11:10 | M1 |
-| Conditions.cs:16:17:16:17 | [b (line 11): true] 0 | Conditions.cs:11:9:11:10 | M1 |
-| Conditions.cs:17:13:18:20 | [b (line 11): false] if (...) ... | Conditions.cs:11:9:11:10 | M1 |
-| Conditions.cs:17:13:18:20 | [b (line 11): true] if (...) ... | Conditions.cs:11:9:11:10 | M1 |
+| Conditions.cs:15:13:15:13 | access to local variable x | Conditions.cs:11:9:11:10 | M1 |
+| Conditions.cs:15:13:15:15 | ...++ | Conditions.cs:11:9:11:10 | M1 |
+| Conditions.cs:15:13:15:16 | ...; | Conditions.cs:11:9:11:10 | M1 |
+| Conditions.cs:16:9:18:20 | if (...) ... | Conditions.cs:11:9:11:10 | M1 |
+| Conditions.cs:16:13:16:13 | access to local variable x | Conditions.cs:11:9:11:10 | M1 |
+| Conditions.cs:16:13:16:17 | ... > ... | Conditions.cs:11:9:11:10 | M1 |
+| Conditions.cs:16:17:16:17 | 0 | Conditions.cs:11:9:11:10 | M1 |
+| Conditions.cs:17:13:18:20 | if (...) ... | Conditions.cs:11:9:11:10 | M1 |
 | Conditions.cs:17:17:17:18 | [false] !... | Conditions.cs:11:9:11:10 | M1 |
 | Conditions.cs:17:17:17:18 | [true] !... | Conditions.cs:11:9:11:10 | M1 |
-| Conditions.cs:17:18:17:18 | [b (line 11): false] access to parameter b | Conditions.cs:11:9:11:10 | M1 |
-| Conditions.cs:17:18:17:18 | [b (line 11): true] access to parameter b | Conditions.cs:11:9:11:10 | M1 |
+| Conditions.cs:17:18:17:18 | access to parameter b | Conditions.cs:11:9:11:10 | M1 |
 | Conditions.cs:18:17:18:17 | access to local variable x | Conditions.cs:11:9:11:10 | M1 |
 | Conditions.cs:18:17:18:19 | ...-- | Conditions.cs:11:9:11:10 | M1 |
 | Conditions.cs:18:17:18:20 | ...; | Conditions.cs:11:9:11:10 | M1 |
@@ -1313,14 +1120,10 @@ nodeEnclosing
 | Conditions.cs:25:13:25:14 | access to parameter b1 | Conditions.cs:22:9:22:10 | M2 |
 | Conditions.cs:26:13:27:20 | if (...) ... | Conditions.cs:22:9:22:10 | M2 |
 | Conditions.cs:26:17:26:18 | access to parameter b2 | Conditions.cs:22:9:22:10 | M2 |
-| Conditions.cs:27:17:27:17 | [b2 (line 22): true] access to local variable x | Conditions.cs:22:9:22:10 | M2 |
-| Conditions.cs:27:17:27:19 | [b2 (line 22): true] ...++ | Conditions.cs:22:9:22:10 | M2 |
-| Conditions.cs:27:17:27:20 | [b2 (line 22): true] ...; | Conditions.cs:22:9:22:10 | M2 |
-| Conditions.cs:28:9:29:16 | [b2 (line 22): false] if (...) ... | Conditions.cs:22:9:22:10 | M2 |
-| Conditions.cs:28:9:29:16 | [b2 (line 22): true] if (...) ... | Conditions.cs:22:9:22:10 | M2 |
+| Conditions.cs:27:17:27:17 | access to local variable x | Conditions.cs:22:9:22:10 | M2 |
+| Conditions.cs:27:17:27:19 | ...++ | Conditions.cs:22:9:22:10 | M2 |
+| Conditions.cs:27:17:27:20 | ...; | Conditions.cs:22:9:22:10 | M2 |
 | Conditions.cs:28:9:29:16 | if (...) ... | Conditions.cs:22:9:22:10 | M2 |
-| Conditions.cs:28:13:28:14 | [b2 (line 22): false] access to parameter b2 | Conditions.cs:22:9:22:10 | M2 |
-| Conditions.cs:28:13:28:14 | [b2 (line 22): true] access to parameter b2 | Conditions.cs:22:9:22:10 | M2 |
 | Conditions.cs:28:13:28:14 | access to parameter b2 | Conditions.cs:22:9:22:10 | M2 |
 | Conditions.cs:29:13:29:13 | access to local variable x | Conditions.cs:22:9:22:10 | M2 |
 | Conditions.cs:29:13:29:15 | ...++ | Conditions.cs:22:9:22:10 | M2 |
@@ -1344,13 +1147,11 @@ nodeEnclosing
 | Conditions.cs:38:18:38:19 | access to parameter b1 | Conditions.cs:33:9:33:10 | M3 |
 | Conditions.cs:39:9:40:16 | if (...) ... | Conditions.cs:33:9:33:10 | M3 |
 | Conditions.cs:39:13:39:14 | access to local variable b2 | Conditions.cs:33:9:33:10 | M3 |
-| Conditions.cs:40:13:40:13 | [b2 (line 39): true] access to local variable x | Conditions.cs:33:9:33:10 | M3 |
-| Conditions.cs:40:13:40:15 | [b2 (line 39): true] ...++ | Conditions.cs:33:9:33:10 | M3 |
-| Conditions.cs:40:13:40:16 | [b2 (line 39): true] ...; | Conditions.cs:33:9:33:10 | M3 |
-| Conditions.cs:41:9:42:16 | [b2 (line 39): false] if (...) ... | Conditions.cs:33:9:33:10 | M3 |
-| Conditions.cs:41:9:42:16 | [b2 (line 39): true] if (...) ... | Conditions.cs:33:9:33:10 | M3 |
-| Conditions.cs:41:13:41:14 | [b2 (line 39): false] access to local variable b2 | Conditions.cs:33:9:33:10 | M3 |
-| Conditions.cs:41:13:41:14 | [b2 (line 39): true] access to local variable b2 | Conditions.cs:33:9:33:10 | M3 |
+| Conditions.cs:40:13:40:13 | access to local variable x | Conditions.cs:33:9:33:10 | M3 |
+| Conditions.cs:40:13:40:15 | ...++ | Conditions.cs:33:9:33:10 | M3 |
+| Conditions.cs:40:13:40:16 | ...; | Conditions.cs:33:9:33:10 | M3 |
+| Conditions.cs:41:9:42:16 | if (...) ... | Conditions.cs:33:9:33:10 | M3 |
+| Conditions.cs:41:13:41:14 | access to local variable b2 | Conditions.cs:33:9:33:10 | M3 |
 | Conditions.cs:42:13:42:13 | access to local variable x | Conditions.cs:33:9:33:10 | M3 |
 | Conditions.cs:42:13:42:15 | ...++ | Conditions.cs:33:9:33:10 | M3 |
 | Conditions.cs:42:13:42:16 | ...; | Conditions.cs:33:9:33:10 | M3 |
@@ -1364,30 +1165,16 @@ nodeEnclosing
 | Conditions.cs:48:13:48:17 | Int32 y = ... | Conditions.cs:46:9:46:10 | M4 |
 | Conditions.cs:48:17:48:17 | 0 | Conditions.cs:46:9:46:10 | M4 |
 | Conditions.cs:49:9:53:9 | while (...) ... | Conditions.cs:46:9:46:10 | M4 |
-| Conditions.cs:49:16:49:16 | [b (line 46): false] access to parameter x | Conditions.cs:46:9:46:10 | M4 |
-| Conditions.cs:49:16:49:16 | [b (line 46): true] access to parameter x | Conditions.cs:46:9:46:10 | M4 |
 | Conditions.cs:49:16:49:16 | access to parameter x | Conditions.cs:46:9:46:10 | M4 |
 | Conditions.cs:49:16:49:18 | ...-- | Conditions.cs:46:9:46:10 | M4 |
-| Conditions.cs:49:16:49:18 | [b (line 46): false] ...-- | Conditions.cs:46:9:46:10 | M4 |
-| Conditions.cs:49:16:49:18 | [b (line 46): true] ...-- | Conditions.cs:46:9:46:10 | M4 |
 | Conditions.cs:49:16:49:22 | ... > ... | Conditions.cs:46:9:46:10 | M4 |
-| Conditions.cs:49:16:49:22 | [b (line 46): false] ... > ... | Conditions.cs:46:9:46:10 | M4 |
-| Conditions.cs:49:16:49:22 | [b (line 46): true] ... > ... | Conditions.cs:46:9:46:10 | M4 |
 | Conditions.cs:49:22:49:22 | 0 | Conditions.cs:46:9:46:10 | M4 |
-| Conditions.cs:49:22:49:22 | [b (line 46): false] 0 | Conditions.cs:46:9:46:10 | M4 |
-| Conditions.cs:49:22:49:22 | [b (line 46): true] 0 | Conditions.cs:46:9:46:10 | M4 |
-| Conditions.cs:50:9:53:9 | [b (line 46): false] {...} | Conditions.cs:46:9:46:10 | M4 |
-| Conditions.cs:50:9:53:9 | [b (line 46): true] {...} | Conditions.cs:46:9:46:10 | M4 |
 | Conditions.cs:50:9:53:9 | {...} | Conditions.cs:46:9:46:10 | M4 |
-| Conditions.cs:51:13:52:20 | [b (line 46): false] if (...) ... | Conditions.cs:46:9:46:10 | M4 |
-| Conditions.cs:51:13:52:20 | [b (line 46): true] if (...) ... | Conditions.cs:46:9:46:10 | M4 |
 | Conditions.cs:51:13:52:20 | if (...) ... | Conditions.cs:46:9:46:10 | M4 |
-| Conditions.cs:51:17:51:17 | [b (line 46): false] access to parameter b | Conditions.cs:46:9:46:10 | M4 |
-| Conditions.cs:51:17:51:17 | [b (line 46): true] access to parameter b | Conditions.cs:46:9:46:10 | M4 |
 | Conditions.cs:51:17:51:17 | access to parameter b | Conditions.cs:46:9:46:10 | M4 |
-| Conditions.cs:52:17:52:17 | [b (line 46): true] access to local variable y | Conditions.cs:46:9:46:10 | M4 |
-| Conditions.cs:52:17:52:19 | [b (line 46): true] ...++ | Conditions.cs:46:9:46:10 | M4 |
-| Conditions.cs:52:17:52:20 | [b (line 46): true] ...; | Conditions.cs:46:9:46:10 | M4 |
+| Conditions.cs:52:17:52:17 | access to local variable y | Conditions.cs:46:9:46:10 | M4 |
+| Conditions.cs:52:17:52:19 | ...++ | Conditions.cs:46:9:46:10 | M4 |
+| Conditions.cs:52:17:52:20 | ...; | Conditions.cs:46:9:46:10 | M4 |
 | Conditions.cs:54:9:54:17 | return ...; | Conditions.cs:46:9:46:10 | M4 |
 | Conditions.cs:54:16:54:16 | access to local variable y | Conditions.cs:46:9:46:10 | M4 |
 | Conditions.cs:57:9:57:10 | enter M5 | Conditions.cs:57:9:57:10 | M5 |
@@ -1398,35 +1185,17 @@ nodeEnclosing
 | Conditions.cs:59:13:59:17 | Int32 y = ... | Conditions.cs:57:9:57:10 | M5 |
 | Conditions.cs:59:17:59:17 | 0 | Conditions.cs:57:9:57:10 | M5 |
 | Conditions.cs:60:9:64:9 | while (...) ... | Conditions.cs:57:9:57:10 | M5 |
-| Conditions.cs:60:16:60:16 | [b (line 57): false] access to parameter x | Conditions.cs:57:9:57:10 | M5 |
-| Conditions.cs:60:16:60:16 | [b (line 57): true] access to parameter x | Conditions.cs:57:9:57:10 | M5 |
 | Conditions.cs:60:16:60:16 | access to parameter x | Conditions.cs:57:9:57:10 | M5 |
 | Conditions.cs:60:16:60:18 | ...-- | Conditions.cs:57:9:57:10 | M5 |
-| Conditions.cs:60:16:60:18 | [b (line 57): false] ...-- | Conditions.cs:57:9:57:10 | M5 |
-| Conditions.cs:60:16:60:18 | [b (line 57): true] ...-- | Conditions.cs:57:9:57:10 | M5 |
 | Conditions.cs:60:16:60:22 | ... > ... | Conditions.cs:57:9:57:10 | M5 |
-| Conditions.cs:60:16:60:22 | [b (line 57): false] ... > ... | Conditions.cs:57:9:57:10 | M5 |
-| Conditions.cs:60:16:60:22 | [b (line 57): true] ... > ... | Conditions.cs:57:9:57:10 | M5 |
 | Conditions.cs:60:22:60:22 | 0 | Conditions.cs:57:9:57:10 | M5 |
-| Conditions.cs:60:22:60:22 | [b (line 57): false] 0 | Conditions.cs:57:9:57:10 | M5 |
-| Conditions.cs:60:22:60:22 | [b (line 57): true] 0 | Conditions.cs:57:9:57:10 | M5 |
-| Conditions.cs:61:9:64:9 | [b (line 57): false] {...} | Conditions.cs:57:9:57:10 | M5 |
-| Conditions.cs:61:9:64:9 | [b (line 57): true] {...} | Conditions.cs:57:9:57:10 | M5 |
 | Conditions.cs:61:9:64:9 | {...} | Conditions.cs:57:9:57:10 | M5 |
-| Conditions.cs:62:13:63:20 | [b (line 57): false] if (...) ... | Conditions.cs:57:9:57:10 | M5 |
-| Conditions.cs:62:13:63:20 | [b (line 57): true] if (...) ... | Conditions.cs:57:9:57:10 | M5 |
 | Conditions.cs:62:13:63:20 | if (...) ... | Conditions.cs:57:9:57:10 | M5 |
-| Conditions.cs:62:17:62:17 | [b (line 57): false] access to parameter b | Conditions.cs:57:9:57:10 | M5 |
-| Conditions.cs:62:17:62:17 | [b (line 57): true] access to parameter b | Conditions.cs:57:9:57:10 | M5 |
 | Conditions.cs:62:17:62:17 | access to parameter b | Conditions.cs:57:9:57:10 | M5 |
-| Conditions.cs:63:17:63:17 | [b (line 57): true] access to local variable y | Conditions.cs:57:9:57:10 | M5 |
-| Conditions.cs:63:17:63:19 | [b (line 57): true] ...++ | Conditions.cs:57:9:57:10 | M5 |
-| Conditions.cs:63:17:63:20 | [b (line 57): true] ...; | Conditions.cs:57:9:57:10 | M5 |
-| Conditions.cs:65:9:66:16 | [b (line 57): false] if (...) ... | Conditions.cs:57:9:57:10 | M5 |
-| Conditions.cs:65:9:66:16 | [b (line 57): true] if (...) ... | Conditions.cs:57:9:57:10 | M5 |
+| Conditions.cs:63:17:63:17 | access to local variable y | Conditions.cs:57:9:57:10 | M5 |
+| Conditions.cs:63:17:63:19 | ...++ | Conditions.cs:57:9:57:10 | M5 |
+| Conditions.cs:63:17:63:20 | ...; | Conditions.cs:57:9:57:10 | M5 |
 | Conditions.cs:65:9:66:16 | if (...) ... | Conditions.cs:57:9:57:10 | M5 |
-| Conditions.cs:65:13:65:13 | [b (line 57): false] access to parameter b | Conditions.cs:57:9:57:10 | M5 |
-| Conditions.cs:65:13:65:13 | [b (line 57): true] access to parameter b | Conditions.cs:57:9:57:10 | M5 |
 | Conditions.cs:65:13:65:13 | access to parameter b | Conditions.cs:57:9:57:10 | M5 |
 | Conditions.cs:66:13:66:13 | access to local variable y | Conditions.cs:57:9:57:10 | M5 |
 | Conditions.cs:66:13:66:15 | ...++ | Conditions.cs:57:9:57:10 | M5 |
@@ -1515,27 +1284,20 @@ nodeEnclosing
 | Conditions.cs:104:17:104:28 | call to method ToString | Conditions.cs:102:12:102:13 | M8 |
 | Conditions.cs:105:9:106:20 | if (...) ... | Conditions.cs:102:12:102:13 | M8 |
 | Conditions.cs:105:13:105:13 | access to parameter b | Conditions.cs:102:12:102:13 | M8 |
-| Conditions.cs:106:13:106:13 | [b (line 102): true] access to local variable x | Conditions.cs:102:12:102:13 | M8 |
-| Conditions.cs:106:13:106:19 | [b (line 102): true] ... + ... | Conditions.cs:102:12:102:13 | M8 |
-| Conditions.cs:106:13:106:19 | [b (line 102): true] ... = ... | Conditions.cs:102:12:102:13 | M8 |
-| Conditions.cs:106:13:106:20 | [b (line 102): true] ...; | Conditions.cs:102:12:102:13 | M8 |
-| Conditions.cs:106:18:106:19 | [b (line 102): true] "" | Conditions.cs:102:12:102:13 | M8 |
-| Conditions.cs:107:9:109:24 | [b (line 102): false] if (...) ... | Conditions.cs:102:12:102:13 | M8 |
-| Conditions.cs:107:9:109:24 | [b (line 102): true] if (...) ... | Conditions.cs:102:12:102:13 | M8 |
-| Conditions.cs:107:13:107:13 | [b (line 102): false] access to local variable x | Conditions.cs:102:12:102:13 | M8 |
-| Conditions.cs:107:13:107:13 | [b (line 102): true] access to local variable x | Conditions.cs:102:12:102:13 | M8 |
-| Conditions.cs:107:13:107:20 | [b (line 102): false] access to property Length | Conditions.cs:102:12:102:13 | M8 |
-| Conditions.cs:107:13:107:20 | [b (line 102): true] access to property Length | Conditions.cs:102:12:102:13 | M8 |
-| Conditions.cs:107:13:107:24 | [b (line 102): false] ... > ... | Conditions.cs:102:12:102:13 | M8 |
-| Conditions.cs:107:13:107:24 | [b (line 102): true] ... > ... | Conditions.cs:102:12:102:13 | M8 |
-| Conditions.cs:107:24:107:24 | [b (line 102): false] 0 | Conditions.cs:102:12:102:13 | M8 |
-| Conditions.cs:107:24:107:24 | [b (line 102): true] 0 | Conditions.cs:102:12:102:13 | M8 |
-| Conditions.cs:108:13:109:24 | [b (line 102): false] if (...) ... | Conditions.cs:102:12:102:13 | M8 |
-| Conditions.cs:108:13:109:24 | [b (line 102): true] if (...) ... | Conditions.cs:102:12:102:13 | M8 |
+| Conditions.cs:106:13:106:13 | access to local variable x | Conditions.cs:102:12:102:13 | M8 |
+| Conditions.cs:106:13:106:19 | ... + ... | Conditions.cs:102:12:102:13 | M8 |
+| Conditions.cs:106:13:106:19 | ... = ... | Conditions.cs:102:12:102:13 | M8 |
+| Conditions.cs:106:13:106:20 | ...; | Conditions.cs:102:12:102:13 | M8 |
+| Conditions.cs:106:18:106:19 | "" | Conditions.cs:102:12:102:13 | M8 |
+| Conditions.cs:107:9:109:24 | if (...) ... | Conditions.cs:102:12:102:13 | M8 |
+| Conditions.cs:107:13:107:13 | access to local variable x | Conditions.cs:102:12:102:13 | M8 |
+| Conditions.cs:107:13:107:20 | access to property Length | Conditions.cs:102:12:102:13 | M8 |
+| Conditions.cs:107:13:107:24 | ... > ... | Conditions.cs:102:12:102:13 | M8 |
+| Conditions.cs:107:24:107:24 | 0 | Conditions.cs:102:12:102:13 | M8 |
+| Conditions.cs:108:13:109:24 | if (...) ... | Conditions.cs:102:12:102:13 | M8 |
 | Conditions.cs:108:17:108:18 | [false] !... | Conditions.cs:102:12:102:13 | M8 |
 | Conditions.cs:108:17:108:18 | [true] !... | Conditions.cs:102:12:102:13 | M8 |
-| Conditions.cs:108:18:108:18 | [b (line 102): false] access to parameter b | Conditions.cs:102:12:102:13 | M8 |
-| Conditions.cs:108:18:108:18 | [b (line 102): true] access to parameter b | Conditions.cs:102:12:102:13 | M8 |
+| Conditions.cs:108:18:108:18 | access to parameter b | Conditions.cs:102:12:102:13 | M8 |
 | Conditions.cs:109:17:109:17 | access to local variable x | Conditions.cs:102:12:102:13 | M8 |
 | Conditions.cs:109:17:109:23 | ... + ... | Conditions.cs:102:12:102:13 | M8 |
 | Conditions.cs:109:17:109:23 | ... = ... | Conditions.cs:102:12:102:13 | M8 |
@@ -1569,75 +1331,46 @@ nodeEnclosing
 | Conditions.cs:118:29:118:43 | ... - ... | Conditions.cs:113:10:113:11 | M9 |
 | Conditions.cs:118:43:118:43 | 1 | Conditions.cs:113:10:113:11 | M9 |
 | Conditions.cs:119:13:120:23 | if (...) ... | Conditions.cs:113:10:113:11 | M9 |
-| Conditions.cs:119:17:119:21 | [false, last (line 118): true] !... | Conditions.cs:113:10:113:11 | M9 |
-| Conditions.cs:119:17:119:21 | [true, last (line 118): false] !... | Conditions.cs:113:10:113:11 | M9 |
+| Conditions.cs:119:17:119:21 | [false] !... | Conditions.cs:113:10:113:11 | M9 |
+| Conditions.cs:119:17:119:21 | [true] !... | Conditions.cs:113:10:113:11 | M9 |
 | Conditions.cs:119:18:119:21 | access to local variable last | Conditions.cs:113:10:113:11 | M9 |
-| Conditions.cs:120:17:120:22 | [last (line 118): false] ... = ... | Conditions.cs:113:10:113:11 | M9 |
-| Conditions.cs:120:17:120:23 | [last (line 118): false] ...; | Conditions.cs:113:10:113:11 | M9 |
-| Conditions.cs:120:21:120:22 | [last (line 118): false] "" | Conditions.cs:113:10:113:11 | M9 |
-| Conditions.cs:121:13:122:25 | [last (line 118): false] if (...) ... | Conditions.cs:113:10:113:11 | M9 |
-| Conditions.cs:121:13:122:25 | [last (line 118): true] if (...) ... | Conditions.cs:113:10:113:11 | M9 |
-| Conditions.cs:121:17:121:20 | [last (line 118): false] access to local variable last | Conditions.cs:113:10:113:11 | M9 |
-| Conditions.cs:121:17:121:20 | [last (line 118): true] access to local variable last | Conditions.cs:113:10:113:11 | M9 |
+| Conditions.cs:120:17:120:22 | ... = ... | Conditions.cs:113:10:113:11 | M9 |
+| Conditions.cs:120:17:120:23 | ...; | Conditions.cs:113:10:113:11 | M9 |
+| Conditions.cs:120:21:120:22 | "" | Conditions.cs:113:10:113:11 | M9 |
+| Conditions.cs:121:13:122:25 | if (...) ... | Conditions.cs:113:10:113:11 | M9 |
+| Conditions.cs:121:17:121:20 | access to local variable last | Conditions.cs:113:10:113:11 | M9 |
 | Conditions.cs:122:17:122:24 | ... = ... | Conditions.cs:113:10:113:11 | M9 |
 | Conditions.cs:122:17:122:25 | ...; | Conditions.cs:113:10:113:11 | M9 |
 | Conditions.cs:122:21:122:24 | null | Conditions.cs:113:10:113:11 | M9 |
 | Conditions.cs:129:10:129:12 | enter M10 | Conditions.cs:129:10:129:12 | M10 |
 | Conditions.cs:130:5:141:5 | {...} | Conditions.cs:129:10:129:12 | M10 |
 | Conditions.cs:131:9:140:9 | while (...) ... | Conditions.cs:129:10:129:12 | M10 |
-| Conditions.cs:131:16:131:19 | [Field1 (line 129): false] true | Conditions.cs:129:10:129:12 | M10 |
-| Conditions.cs:131:16:131:19 | [Field1 (line 129): true, Field2 (line 129): false] true | Conditions.cs:129:10:129:12 | M10 |
-| Conditions.cs:131:16:131:19 | [Field1 (line 129): true, Field2 (line 129): true] true | Conditions.cs:129:10:129:12 | M10 |
 | Conditions.cs:131:16:131:19 | true | Conditions.cs:129:10:129:12 | M10 |
-| Conditions.cs:132:9:140:9 | [Field1 (line 129): false] {...} | Conditions.cs:129:10:129:12 | M10 |
-| Conditions.cs:132:9:140:9 | [Field1 (line 129): true, Field2 (line 129): false] {...} | Conditions.cs:129:10:129:12 | M10 |
-| Conditions.cs:132:9:140:9 | [Field1 (line 129): true, Field2 (line 129): true] {...} | Conditions.cs:129:10:129:12 | M10 |
 | Conditions.cs:132:9:140:9 | {...} | Conditions.cs:129:10:129:12 | M10 |
-| Conditions.cs:133:13:139:13 | [Field1 (line 129): false] if (...) ... | Conditions.cs:129:10:129:12 | M10 |
-| Conditions.cs:133:13:139:13 | [Field1 (line 129): true, Field2 (line 129): false] if (...) ... | Conditions.cs:129:10:129:12 | M10 |
-| Conditions.cs:133:13:139:13 | [Field1 (line 129): true, Field2 (line 129): true] if (...) ... | Conditions.cs:129:10:129:12 | M10 |
 | Conditions.cs:133:13:139:13 | if (...) ... | Conditions.cs:129:10:129:12 | M10 |
-| Conditions.cs:133:17:133:22 | [Field1 (line 129): false] access to field Field1 | Conditions.cs:129:10:129:12 | M10 |
-| Conditions.cs:133:17:133:22 | [Field1 (line 129): false] this access | Conditions.cs:129:10:129:12 | M10 |
-| Conditions.cs:133:17:133:22 | [Field1 (line 129): true, Field2 (line 129): false] access to field Field1 | Conditions.cs:129:10:129:12 | M10 |
-| Conditions.cs:133:17:133:22 | [Field1 (line 129): true, Field2 (line 129): false] this access | Conditions.cs:129:10:129:12 | M10 |
-| Conditions.cs:133:17:133:22 | [Field1 (line 129): true, Field2 (line 129): true] access to field Field1 | Conditions.cs:129:10:129:12 | M10 |
-| Conditions.cs:133:17:133:22 | [Field1 (line 129): true, Field2 (line 129): true] this access | Conditions.cs:129:10:129:12 | M10 |
 | Conditions.cs:133:17:133:22 | access to field Field1 | Conditions.cs:129:10:129:12 | M10 |
 | Conditions.cs:133:17:133:22 | this access | Conditions.cs:129:10:129:12 | M10 |
-| Conditions.cs:134:13:139:13 | [Field1 (line 129): true, Field2 (line 129): false] {...} | Conditions.cs:129:10:129:12 | M10 |
-| Conditions.cs:134:13:139:13 | [Field1 (line 129): true, Field2 (line 129): true] {...} | Conditions.cs:129:10:129:12 | M10 |
-| Conditions.cs:134:13:139:13 | [Field1 (line 129): true] {...} | Conditions.cs:129:10:129:12 | M10 |
-| Conditions.cs:135:17:138:17 | [Field1 (line 129): true, Field2 (line 129): false] if (...) ... | Conditions.cs:129:10:129:12 | M10 |
-| Conditions.cs:135:17:138:17 | [Field1 (line 129): true, Field2 (line 129): true] if (...) ... | Conditions.cs:129:10:129:12 | M10 |
-| Conditions.cs:135:17:138:17 | [Field1 (line 129): true] if (...) ... | Conditions.cs:129:10:129:12 | M10 |
-| Conditions.cs:135:21:135:26 | [Field1 (line 129): true, Field2 (line 129): false] access to field Field2 | Conditions.cs:129:10:129:12 | M10 |
-| Conditions.cs:135:21:135:26 | [Field1 (line 129): true, Field2 (line 129): false] this access | Conditions.cs:129:10:129:12 | M10 |
-| Conditions.cs:135:21:135:26 | [Field1 (line 129): true, Field2 (line 129): true] access to field Field2 | Conditions.cs:129:10:129:12 | M10 |
-| Conditions.cs:135:21:135:26 | [Field1 (line 129): true, Field2 (line 129): true] this access | Conditions.cs:129:10:129:12 | M10 |
-| Conditions.cs:135:21:135:26 | [Field1 (line 129): true] access to field Field2 | Conditions.cs:129:10:129:12 | M10 |
-| Conditions.cs:135:21:135:26 | [Field1 (line 129): true] this access | Conditions.cs:129:10:129:12 | M10 |
-| Conditions.cs:136:17:138:17 | [Field1 (line 129): true, Field2 (line 129): true] {...} | Conditions.cs:129:10:129:12 | M10 |
-| Conditions.cs:137:21:137:26 | [Field1 (line 129): true, Field2 (line 129): true] access to field Field1 | Conditions.cs:129:10:129:12 | M10 |
-| Conditions.cs:137:21:137:26 | [Field1 (line 129): true, Field2 (line 129): true] this access | Conditions.cs:129:10:129:12 | M10 |
-| Conditions.cs:137:21:137:37 | [Field1 (line 129): true, Field2 (line 129): true] call to method ToString | Conditions.cs:129:10:129:12 | M10 |
-| Conditions.cs:137:21:137:38 | [Field1 (line 129): true, Field2 (line 129): true] ...; | Conditions.cs:129:10:129:12 | M10 |
+| Conditions.cs:134:13:139:13 | {...} | Conditions.cs:129:10:129:12 | M10 |
+| Conditions.cs:135:17:138:17 | if (...) ... | Conditions.cs:129:10:129:12 | M10 |
+| Conditions.cs:135:21:135:26 | access to field Field2 | Conditions.cs:129:10:129:12 | M10 |
+| Conditions.cs:135:21:135:26 | this access | Conditions.cs:129:10:129:12 | M10 |
+| Conditions.cs:136:17:138:17 | {...} | Conditions.cs:129:10:129:12 | M10 |
+| Conditions.cs:137:21:137:26 | access to field Field1 | Conditions.cs:129:10:129:12 | M10 |
+| Conditions.cs:137:21:137:26 | this access | Conditions.cs:129:10:129:12 | M10 |
+| Conditions.cs:137:21:137:37 | call to method ToString | Conditions.cs:129:10:129:12 | M10 |
+| Conditions.cs:137:21:137:38 | ...; | Conditions.cs:129:10:129:12 | M10 |
 | Conditions.cs:143:10:143:12 | enter M11 | Conditions.cs:143:10:143:12 | M11 |
 | Conditions.cs:143:10:143:12 | exit M11 | Conditions.cs:143:10:143:12 | M11 |
 | Conditions.cs:143:10:143:12 | exit M11 (normal) | Conditions.cs:143:10:143:12 | M11 |
 | Conditions.cs:144:5:150:5 | {...} | Conditions.cs:143:10:143:12 | M11 |
 | Conditions.cs:145:9:145:30 | ... ...; | Conditions.cs:143:10:143:12 | M11 |
-| Conditions.cs:145:13:145:29 | [b (line 143): false] String s = ... | Conditions.cs:143:10:143:12 | M11 |
-| Conditions.cs:145:13:145:29 | [b (line 143): true] String s = ... | Conditions.cs:143:10:143:12 | M11 |
+| Conditions.cs:145:13:145:29 | String s = ... | Conditions.cs:143:10:143:12 | M11 |
 | Conditions.cs:145:17:145:17 | access to parameter b | Conditions.cs:143:10:143:12 | M11 |
-| Conditions.cs:145:17:145:29 | [b (line 143): false] ... ? ... : ... | Conditions.cs:143:10:143:12 | M11 |
-| Conditions.cs:145:17:145:29 | [b (line 143): true] ... ? ... : ... | Conditions.cs:143:10:143:12 | M11 |
-| Conditions.cs:145:21:145:23 | [b (line 143): true] "a" | Conditions.cs:143:10:143:12 | M11 |
-| Conditions.cs:145:27:145:29 | [b (line 143): false] "b" | Conditions.cs:143:10:143:12 | M11 |
-| Conditions.cs:146:9:149:49 | [b (line 143): false] if (...) ... | Conditions.cs:143:10:143:12 | M11 |
-| Conditions.cs:146:9:149:49 | [b (line 143): true] if (...) ... | Conditions.cs:143:10:143:12 | M11 |
-| Conditions.cs:146:13:146:13 | [b (line 143): false] access to parameter b | Conditions.cs:143:10:143:12 | M11 |
-| Conditions.cs:146:13:146:13 | [b (line 143): true] access to parameter b | Conditions.cs:143:10:143:12 | M11 |
+| Conditions.cs:145:17:145:29 | ... ? ... : ... | Conditions.cs:143:10:143:12 | M11 |
+| Conditions.cs:145:21:145:23 | "a" | Conditions.cs:143:10:143:12 | M11 |
+| Conditions.cs:145:27:145:29 | "b" | Conditions.cs:143:10:143:12 | M11 |
+| Conditions.cs:146:9:149:49 | if (...) ... | Conditions.cs:143:10:143:12 | M11 |
+| Conditions.cs:146:13:146:13 | access to parameter b | Conditions.cs:143:10:143:12 | M11 |
 | Conditions.cs:147:13:147:48 | call to method WriteLine | Conditions.cs:143:10:143:12 | M11 |
 | Conditions.cs:147:13:147:49 | ...; | Conditions.cs:143:10:143:12 | M11 |
 | Conditions.cs:147:38:147:47 | $"..." | Conditions.cs:143:10:143:12 | M11 |
@@ -1701,11 +1434,10 @@ nodeEnclosing
 | ExitMethods.cs:42:13:42:30 | call to method ErrorAlways | ExitMethods.cs:38:10:38:11 | M6 |
 | ExitMethods.cs:42:13:42:31 | ...; | ExitMethods.cs:38:10:38:11 | M6 |
 | ExitMethods.cs:42:25:42:29 | false | ExitMethods.cs:38:10:38:11 | M6 |
-| ExitMethods.cs:44:9:47:9 | [exception: ArgumentException] catch (...) {...} | ExitMethods.cs:38:10:38:11 | M6 |
-| ExitMethods.cs:44:9:47:9 | [exception: Exception] catch (...) {...} | ExitMethods.cs:38:10:38:11 | M6 |
+| ExitMethods.cs:44:9:47:9 | catch (...) {...} | ExitMethods.cs:38:10:38:11 | M6 |
 | ExitMethods.cs:45:9:47:9 | {...} | ExitMethods.cs:38:10:38:11 | M6 |
 | ExitMethods.cs:46:13:46:19 | return ...; | ExitMethods.cs:38:10:38:11 | M6 |
-| ExitMethods.cs:48:9:51:9 | [exception: Exception] catch (...) {...} | ExitMethods.cs:38:10:38:11 | M6 |
+| ExitMethods.cs:48:9:51:9 | catch (...) {...} | ExitMethods.cs:38:10:38:11 | M6 |
 | ExitMethods.cs:49:9:51:9 | {...} | ExitMethods.cs:38:10:38:11 | M6 |
 | ExitMethods.cs:50:13:50:19 | return ...; | ExitMethods.cs:38:10:38:11 | M6 |
 | ExitMethods.cs:54:10:54:11 | enter M7 | ExitMethods.cs:54:10:54:11 | M7 |
@@ -1806,7 +1538,7 @@ nodeEnclosing
 | ExitMethods.cs:120:17:120:32 | exit FailingAssertion | ExitMethods.cs:120:17:120:32 | FailingAssertion |
 | ExitMethods.cs:120:17:120:32 | exit FailingAssertion (abnormal) | ExitMethods.cs:120:17:120:32 | FailingAssertion |
 | ExitMethods.cs:121:5:124:5 | {...} | ExitMethods.cs:120:17:120:32 | FailingAssertion |
-| ExitMethods.cs:122:9:122:28 | [assertion failure] call to method IsTrue | ExitMethods.cs:120:17:120:32 | FailingAssertion |
+| ExitMethods.cs:122:9:122:28 | call to method IsTrue | ExitMethods.cs:120:17:120:32 | FailingAssertion |
 | ExitMethods.cs:122:9:122:29 | ...; | ExitMethods.cs:120:17:120:32 | FailingAssertion |
 | ExitMethods.cs:122:23:122:27 | false | ExitMethods.cs:120:17:120:32 | FailingAssertion |
 | ExitMethods.cs:126:17:126:33 | enter FailingAssertion2 | ExitMethods.cs:126:17:126:33 | FailingAssertion2 |
@@ -1820,14 +1552,13 @@ nodeEnclosing
 | ExitMethods.cs:132:10:132:20 | exit AssertFalse | ExitMethods.cs:132:10:132:20 | AssertFalse |
 | ExitMethods.cs:132:10:132:20 | exit AssertFalse (abnormal) | ExitMethods.cs:132:10:132:20 | AssertFalse |
 | ExitMethods.cs:132:10:132:20 | exit AssertFalse (normal) | ExitMethods.cs:132:10:132:20 | AssertFalse |
-| ExitMethods.cs:132:33:132:49 | [assertion failure] call to method IsFalse | ExitMethods.cs:132:10:132:20 | AssertFalse |
-| ExitMethods.cs:132:33:132:49 | [assertion success] call to method IsFalse | ExitMethods.cs:132:10:132:20 | AssertFalse |
+| ExitMethods.cs:132:33:132:49 | call to method IsFalse | ExitMethods.cs:132:10:132:20 | AssertFalse |
 | ExitMethods.cs:132:48:132:48 | access to parameter b | ExitMethods.cs:132:10:132:20 | AssertFalse |
 | ExitMethods.cs:134:17:134:33 | enter FailingAssertion3 | ExitMethods.cs:134:17:134:33 | FailingAssertion3 |
 | ExitMethods.cs:134:17:134:33 | exit FailingAssertion3 | ExitMethods.cs:134:17:134:33 | FailingAssertion3 |
 | ExitMethods.cs:134:17:134:33 | exit FailingAssertion3 (abnormal) | ExitMethods.cs:134:17:134:33 | FailingAssertion3 |
 | ExitMethods.cs:135:5:138:5 | {...} | ExitMethods.cs:134:17:134:33 | FailingAssertion3 |
-| ExitMethods.cs:136:9:136:25 | [assertion failure] call to method AssertFalse | ExitMethods.cs:134:17:134:33 | FailingAssertion3 |
+| ExitMethods.cs:136:9:136:25 | call to method AssertFalse | ExitMethods.cs:134:17:134:33 | FailingAssertion3 |
 | ExitMethods.cs:136:9:136:25 | this access | ExitMethods.cs:134:17:134:33 | FailingAssertion3 |
 | ExitMethods.cs:136:9:136:26 | ...; | ExitMethods.cs:134:17:134:33 | FailingAssertion3 |
 | ExitMethods.cs:136:21:136:24 | true | ExitMethods.cs:134:17:134:33 | FailingAssertion3 |
@@ -1899,14 +1630,10 @@ nodeEnclosing
 | Finally.cs:11:13:11:37 | call to method WriteLine | Finally.cs:7:10:7:11 | M1 |
 | Finally.cs:11:13:11:38 | ...; | Finally.cs:7:10:7:11 | M1 |
 | Finally.cs:11:31:11:36 | "Try1" | Finally.cs:7:10:7:11 | M1 |
-| Finally.cs:14:9:16:9 | [finally: exception(Exception)] {...} | Finally.cs:7:10:7:11 | M1 |
 | Finally.cs:14:9:16:9 | {...} | Finally.cs:7:10:7:11 | M1 |
-| Finally.cs:15:13:15:40 | [finally: exception(Exception)] call to method WriteLine | Finally.cs:7:10:7:11 | M1 |
 | Finally.cs:15:13:15:40 | call to method WriteLine | Finally.cs:7:10:7:11 | M1 |
 | Finally.cs:15:13:15:41 | ...; | Finally.cs:7:10:7:11 | M1 |
-| Finally.cs:15:13:15:41 | [finally: exception(Exception)] ...; | Finally.cs:7:10:7:11 | M1 |
 | Finally.cs:15:31:15:39 | "Finally" | Finally.cs:7:10:7:11 | M1 |
-| Finally.cs:15:31:15:39 | [finally: exception(Exception)] "Finally" | Finally.cs:7:10:7:11 | M1 |
 | Finally.cs:19:10:19:11 | enter M2 | Finally.cs:19:10:19:11 | M2 |
 | Finally.cs:19:10:19:11 | exit M2 | Finally.cs:19:10:19:11 | M2 |
 | Finally.cs:19:10:19:11 | exit M2 (abnormal) | Finally.cs:19:10:19:11 | M2 |
@@ -1918,41 +1645,32 @@ nodeEnclosing
 | Finally.cs:23:13:23:38 | ...; | Finally.cs:19:10:19:11 | M2 |
 | Finally.cs:23:31:23:36 | "Try2" | Finally.cs:19:10:19:11 | M2 |
 | Finally.cs:24:13:24:19 | return ...; | Finally.cs:19:10:19:11 | M2 |
-| Finally.cs:26:9:29:9 | [exception: Exception] catch (...) {...} | Finally.cs:19:10:19:11 | M2 |
-| Finally.cs:26:38:26:39 | [exception: Exception] IOException ex | Finally.cs:19:10:19:11 | M2 |
-| Finally.cs:26:48:26:51 | [exception: Exception] true | Finally.cs:19:10:19:11 | M2 |
+| Finally.cs:26:9:29:9 | catch (...) {...} | Finally.cs:19:10:19:11 | M2 |
+| Finally.cs:26:38:26:39 | IOException ex | Finally.cs:19:10:19:11 | M2 |
+| Finally.cs:26:48:26:51 | true | Finally.cs:19:10:19:11 | M2 |
 | Finally.cs:27:9:29:9 | {...} | Finally.cs:19:10:19:11 | M2 |
 | Finally.cs:28:13:28:18 | throw ...; | Finally.cs:19:10:19:11 | M2 |
-| Finally.cs:30:9:40:9 | [exception: Exception] catch (...) {...} | Finally.cs:19:10:19:11 | M2 |
-| Finally.cs:30:41:30:42 | [exception: Exception] ArgumentException ex | Finally.cs:19:10:19:11 | M2 |
+| Finally.cs:30:9:40:9 | catch (...) {...} | Finally.cs:19:10:19:11 | M2 |
+| Finally.cs:30:41:30:42 | ArgumentException ex | Finally.cs:19:10:19:11 | M2 |
 | Finally.cs:31:9:40:9 | {...} | Finally.cs:19:10:19:11 | M2 |
 | Finally.cs:32:13:39:13 | try {...} ... | Finally.cs:19:10:19:11 | M2 |
 | Finally.cs:33:13:35:13 | {...} | Finally.cs:19:10:19:11 | M2 |
 | Finally.cs:34:17:34:32 | if (...) ... | Finally.cs:19:10:19:11 | M2 |
 | Finally.cs:34:21:34:24 | true | Finally.cs:19:10:19:11 | M2 |
 | Finally.cs:34:27:34:32 | throw ...; | Finally.cs:19:10:19:11 | M2 |
-| Finally.cs:37:13:39:13 | [finally: exception(ArgumentException)] {...} | Finally.cs:19:10:19:11 | M2 |
-| Finally.cs:38:17:38:44 | [finally: exception(ArgumentException)] throw ...; | Finally.cs:19:10:19:11 | M2 |
-| Finally.cs:38:23:38:43 | [finally: exception(ArgumentException)] object creation of type Exception | Finally.cs:19:10:19:11 | M2 |
-| Finally.cs:38:37:38:42 | [finally: exception(ArgumentException)] "Boo!" | Finally.cs:19:10:19:11 | M2 |
-| Finally.cs:41:9:43:9 | [exception: Exception] catch (...) {...} | Finally.cs:19:10:19:11 | M2 |
+| Finally.cs:37:13:39:13 | {...} | Finally.cs:19:10:19:11 | M2 |
+| Finally.cs:38:17:38:44 | throw ...; | Finally.cs:19:10:19:11 | M2 |
+| Finally.cs:38:23:38:43 | object creation of type Exception | Finally.cs:19:10:19:11 | M2 |
+| Finally.cs:38:37:38:42 | "Boo!" | Finally.cs:19:10:19:11 | M2 |
+| Finally.cs:41:9:43:9 | catch (...) {...} | Finally.cs:19:10:19:11 | M2 |
 | Finally.cs:42:9:43:9 | {...} | Finally.cs:19:10:19:11 | M2 |
-| Finally.cs:49:9:51:9 | [finally: exception(Exception)] {...} | Finally.cs:19:10:19:11 | M2 |
-| Finally.cs:49:9:51:9 | [finally: exception(IOException)] {...} | Finally.cs:19:10:19:11 | M2 |
-| Finally.cs:49:9:51:9 | [finally: return] {...} | Finally.cs:19:10:19:11 | M2 |
+| Finally.cs:44:9:47:9 | catch {...} | Finally.cs:19:10:19:11 | M2 |
+| Finally.cs:45:9:47:9 | {...} | Finally.cs:19:10:19:11 | M2 |
+| Finally.cs:46:13:46:19 | return ...; | Finally.cs:19:10:19:11 | M2 |
 | Finally.cs:49:9:51:9 | {...} | Finally.cs:19:10:19:11 | M2 |
-| Finally.cs:50:13:50:40 | [finally: exception(Exception)] call to method WriteLine | Finally.cs:19:10:19:11 | M2 |
-| Finally.cs:50:13:50:40 | [finally: exception(IOException)] call to method WriteLine | Finally.cs:19:10:19:11 | M2 |
-| Finally.cs:50:13:50:40 | [finally: return] call to method WriteLine | Finally.cs:19:10:19:11 | M2 |
 | Finally.cs:50:13:50:40 | call to method WriteLine | Finally.cs:19:10:19:11 | M2 |
 | Finally.cs:50:13:50:41 | ...; | Finally.cs:19:10:19:11 | M2 |
-| Finally.cs:50:13:50:41 | [finally: exception(Exception)] ...; | Finally.cs:19:10:19:11 | M2 |
-| Finally.cs:50:13:50:41 | [finally: exception(IOException)] ...; | Finally.cs:19:10:19:11 | M2 |
-| Finally.cs:50:13:50:41 | [finally: return] ...; | Finally.cs:19:10:19:11 | M2 |
 | Finally.cs:50:31:50:39 | "Finally" | Finally.cs:19:10:19:11 | M2 |
-| Finally.cs:50:31:50:39 | [finally: exception(Exception)] "Finally" | Finally.cs:19:10:19:11 | M2 |
-| Finally.cs:50:31:50:39 | [finally: exception(IOException)] "Finally" | Finally.cs:19:10:19:11 | M2 |
-| Finally.cs:50:31:50:39 | [finally: return] "Finally" | Finally.cs:19:10:19:11 | M2 |
 | Finally.cs:54:10:54:11 | enter M3 | Finally.cs:54:10:54:11 | M3 |
 | Finally.cs:54:10:54:11 | exit M3 | Finally.cs:54:10:54:11 | M3 |
 | Finally.cs:54:10:54:11 | exit M3 (abnormal) | Finally.cs:54:10:54:11 | M3 |
@@ -1964,34 +1682,22 @@ nodeEnclosing
 | Finally.cs:58:13:58:38 | ...; | Finally.cs:54:10:54:11 | M3 |
 | Finally.cs:58:31:58:36 | "Try3" | Finally.cs:54:10:54:11 | M3 |
 | Finally.cs:59:13:59:19 | return ...; | Finally.cs:54:10:54:11 | M3 |
-| Finally.cs:61:9:64:9 | [exception: Exception] catch (...) {...} | Finally.cs:54:10:54:11 | M3 |
-| Finally.cs:61:38:61:39 | [exception: Exception] IOException ex | Finally.cs:54:10:54:11 | M3 |
-| Finally.cs:61:48:61:51 | [exception: Exception] true | Finally.cs:54:10:54:11 | M3 |
+| Finally.cs:61:9:64:9 | catch (...) {...} | Finally.cs:54:10:54:11 | M3 |
+| Finally.cs:61:38:61:39 | IOException ex | Finally.cs:54:10:54:11 | M3 |
+| Finally.cs:61:48:61:51 | true | Finally.cs:54:10:54:11 | M3 |
 | Finally.cs:62:9:64:9 | {...} | Finally.cs:54:10:54:11 | M3 |
 | Finally.cs:63:13:63:18 | throw ...; | Finally.cs:54:10:54:11 | M3 |
-| Finally.cs:65:9:67:9 | [exception: Exception] catch (...) {...} | Finally.cs:54:10:54:11 | M3 |
-| Finally.cs:65:26:65:26 | [exception: Exception] Exception e | Finally.cs:54:10:54:11 | M3 |
-| Finally.cs:65:35:65:35 | [exception: Exception] access to local variable e | Finally.cs:54:10:54:11 | M3 |
-| Finally.cs:65:35:65:43 | [exception: Exception] access to property Message | Finally.cs:54:10:54:11 | M3 |
-| Finally.cs:65:35:65:51 | [exception: Exception] ... != ... | Finally.cs:54:10:54:11 | M3 |
-| Finally.cs:65:48:65:51 | [exception: Exception] null | Finally.cs:54:10:54:11 | M3 |
+| Finally.cs:65:9:67:9 | catch (...) {...} | Finally.cs:54:10:54:11 | M3 |
+| Finally.cs:65:26:65:26 | Exception e | Finally.cs:54:10:54:11 | M3 |
+| Finally.cs:65:35:65:35 | access to local variable e | Finally.cs:54:10:54:11 | M3 |
+| Finally.cs:65:35:65:43 | access to property Message | Finally.cs:54:10:54:11 | M3 |
+| Finally.cs:65:35:65:51 | ... != ... | Finally.cs:54:10:54:11 | M3 |
+| Finally.cs:65:48:65:51 | null | Finally.cs:54:10:54:11 | M3 |
 | Finally.cs:66:9:67:9 | {...} | Finally.cs:54:10:54:11 | M3 |
-| Finally.cs:69:9:71:9 | [finally: exception(Exception)] {...} | Finally.cs:54:10:54:11 | M3 |
-| Finally.cs:69:9:71:9 | [finally: exception(IOException)] {...} | Finally.cs:54:10:54:11 | M3 |
-| Finally.cs:69:9:71:9 | [finally: return] {...} | Finally.cs:54:10:54:11 | M3 |
 | Finally.cs:69:9:71:9 | {...} | Finally.cs:54:10:54:11 | M3 |
-| Finally.cs:70:13:70:40 | [finally: exception(Exception)] call to method WriteLine | Finally.cs:54:10:54:11 | M3 |
-| Finally.cs:70:13:70:40 | [finally: exception(IOException)] call to method WriteLine | Finally.cs:54:10:54:11 | M3 |
-| Finally.cs:70:13:70:40 | [finally: return] call to method WriteLine | Finally.cs:54:10:54:11 | M3 |
 | Finally.cs:70:13:70:40 | call to method WriteLine | Finally.cs:54:10:54:11 | M3 |
 | Finally.cs:70:13:70:41 | ...; | Finally.cs:54:10:54:11 | M3 |
-| Finally.cs:70:13:70:41 | [finally: exception(Exception)] ...; | Finally.cs:54:10:54:11 | M3 |
-| Finally.cs:70:13:70:41 | [finally: exception(IOException)] ...; | Finally.cs:54:10:54:11 | M3 |
-| Finally.cs:70:13:70:41 | [finally: return] ...; | Finally.cs:54:10:54:11 | M3 |
 | Finally.cs:70:31:70:39 | "Finally" | Finally.cs:54:10:54:11 | M3 |
-| Finally.cs:70:31:70:39 | [finally: exception(Exception)] "Finally" | Finally.cs:54:10:54:11 | M3 |
-| Finally.cs:70:31:70:39 | [finally: exception(IOException)] "Finally" | Finally.cs:54:10:54:11 | M3 |
-| Finally.cs:70:31:70:39 | [finally: return] "Finally" | Finally.cs:54:10:54:11 | M3 |
 | Finally.cs:74:10:74:11 | enter M4 | Finally.cs:74:10:74:11 | M4 |
 | Finally.cs:74:10:74:11 | exit M4 | Finally.cs:74:10:74:11 | M4 |
 | Finally.cs:74:10:74:11 | exit M4 (abnormal) | Finally.cs:74:10:74:11 | M4 |
@@ -2022,74 +1728,19 @@ nodeEnclosing
 | Finally.cs:85:21:85:26 | ... == ... | Finally.cs:74:10:74:11 | M4 |
 | Finally.cs:85:26:85:26 | 2 | Finally.cs:74:10:74:11 | M4 |
 | Finally.cs:86:21:86:26 | break; | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:89:13:99:13 | [finally: break] {...} | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:89:13:99:13 | [finally: continue] {...} | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:89:13:99:13 | [finally: return] {...} | Finally.cs:74:10:74:11 | M4 |
 | Finally.cs:89:13:99:13 | {...} | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:90:17:98:17 | [finally: break] try {...} ... | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:90:17:98:17 | [finally: continue] try {...} ... | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:90:17:98:17 | [finally: return] try {...} ... | Finally.cs:74:10:74:11 | M4 |
 | Finally.cs:90:17:98:17 | try {...} ... | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:91:17:94:17 | [finally: break] {...} | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:91:17:94:17 | [finally: continue] {...} | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:91:17:94:17 | [finally: return] {...} | Finally.cs:74:10:74:11 | M4 |
 | Finally.cs:91:17:94:17 | {...} | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:92:21:93:46 | [finally: break] if (...) ... | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:92:21:93:46 | [finally: continue] if (...) ... | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:92:21:93:46 | [finally: return] if (...) ... | Finally.cs:74:10:74:11 | M4 |
 | Finally.cs:92:21:93:46 | if (...) ... | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:92:25:92:25 | [finally: break] access to local variable i | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:92:25:92:25 | [finally: continue] access to local variable i | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:92:25:92:25 | [finally: return] access to local variable i | Finally.cs:74:10:74:11 | M4 |
 | Finally.cs:92:25:92:25 | access to local variable i | Finally.cs:74:10:74:11 | M4 |
 | Finally.cs:92:25:92:30 | ... == ... | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:92:25:92:30 | [finally: break] ... == ... | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:92:25:92:30 | [finally: continue] ... == ... | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:92:25:92:30 | [finally: return] ... == ... | Finally.cs:74:10:74:11 | M4 |
 | Finally.cs:92:30:92:30 | 3 | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:92:30:92:30 | [finally: break] 3 | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:92:30:92:30 | [finally: continue] 3 | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:92:30:92:30 | [finally: return] 3 | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:93:25:93:46 | [finally: break] throw ...; | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:93:25:93:46 | [finally: continue] throw ...; | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:93:25:93:46 | [finally: return] throw ...; | Finally.cs:74:10:74:11 | M4 |
 | Finally.cs:93:25:93:46 | throw ...; | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:93:31:93:45 | [finally: break] object creation of type Exception | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:93:31:93:45 | [finally: continue] object creation of type Exception | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:93:31:93:45 | [finally: return] object creation of type Exception | Finally.cs:74:10:74:11 | M4 |
 | Finally.cs:93:31:93:45 | object creation of type Exception | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:96:17:98:17 | [finally(1): exception(Exception)] {...} | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:96:17:98:17 | [finally: break, finally(1): exception(Exception)] {...} | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:96:17:98:17 | [finally: break] {...} | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:96:17:98:17 | [finally: continue, finally(1): exception(Exception)] {...} | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:96:17:98:17 | [finally: continue] {...} | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:96:17:98:17 | [finally: return, finally(1): exception(Exception)] {...} | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:96:17:98:17 | [finally: return] {...} | Finally.cs:74:10:74:11 | M4 |
 | Finally.cs:96:17:98:17 | {...} | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:97:21:97:21 | [finally(1): exception(Exception)] access to local variable i | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:97:21:97:21 | [finally: break, finally(1): exception(Exception)] access to local variable i | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:97:21:97:21 | [finally: break] access to local variable i | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:97:21:97:21 | [finally: continue, finally(1): exception(Exception)] access to local variable i | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:97:21:97:21 | [finally: continue] access to local variable i | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:97:21:97:21 | [finally: return, finally(1): exception(Exception)] access to local variable i | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:97:21:97:21 | [finally: return] access to local variable i | Finally.cs:74:10:74:11 | M4 |
 | Finally.cs:97:21:97:21 | access to local variable i | Finally.cs:74:10:74:11 | M4 |
 | Finally.cs:97:21:97:23 | ...-- | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:97:21:97:23 | [finally(1): exception(Exception)] ...-- | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:97:21:97:23 | [finally: break, finally(1): exception(Exception)] ...-- | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:97:21:97:23 | [finally: break] ...-- | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:97:21:97:23 | [finally: continue, finally(1): exception(Exception)] ...-- | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:97:21:97:23 | [finally: continue] ...-- | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:97:21:97:23 | [finally: return, finally(1): exception(Exception)] ...-- | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:97:21:97:23 | [finally: return] ...-- | Finally.cs:74:10:74:11 | M4 |
 | Finally.cs:97:21:97:24 | ...; | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:97:21:97:24 | [finally(1): exception(Exception)] ...; | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:97:21:97:24 | [finally: break, finally(1): exception(Exception)] ...; | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:97:21:97:24 | [finally: break] ...; | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:97:21:97:24 | [finally: continue, finally(1): exception(Exception)] ...; | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:97:21:97:24 | [finally: continue] ...; | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:97:21:97:24 | [finally: return, finally(1): exception(Exception)] ...; | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:97:21:97:24 | [finally: return] ...; | Finally.cs:74:10:74:11 | M4 |
 | Finally.cs:103:10:103:11 | enter M5 | Finally.cs:103:10:103:11 | M5 |
 | Finally.cs:103:10:103:11 | exit M5 | Finally.cs:103:10:103:11 | M5 |
 | Finally.cs:103:10:103:11 | exit M5 (abnormal) | Finally.cs:103:10:103:11 | M5 |
@@ -2112,116 +1763,28 @@ nodeEnclosing
 | Finally.cs:109:33:109:33 | 1 | Finally.cs:103:10:103:11 | M5 |
 | Finally.cs:110:17:110:49 | throw ...; | Finally.cs:103:10:103:11 | M5 |
 | Finally.cs:110:23:110:48 | object creation of type OutOfMemoryException | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:113:9:118:9 | [finally: exception(Exception)] {...} | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:113:9:118:9 | [finally: exception(NullReferenceException)] {...} | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:113:9:118:9 | [finally: exception(OutOfMemoryException)] {...} | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:113:9:118:9 | [finally: return] {...} | Finally.cs:103:10:103:11 | M5 |
 | Finally.cs:113:9:118:9 | {...} | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:114:13:115:41 | [finally: exception(Exception)] if (...) ... | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:114:13:115:41 | [finally: exception(NullReferenceException)] if (...) ... | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:114:13:115:41 | [finally: exception(OutOfMemoryException)] if (...) ... | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:114:13:115:41 | [finally: return] if (...) ... | Finally.cs:103:10:103:11 | M5 |
 | Finally.cs:114:13:115:41 | if (...) ... | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:114:17:114:36 | [false, finally: exception(Exception)] !... | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:114:17:114:36 | [false, finally: exception(NullReferenceException)] !... | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:114:17:114:36 | [false, finally: exception(OutOfMemoryException)] !... | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:114:17:114:36 | [false, finally: return] !... | Finally.cs:103:10:103:11 | M5 |
 | Finally.cs:114:17:114:36 | [false] !... | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:114:17:114:36 | [true, finally: exception(Exception)] !... | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:114:17:114:36 | [true, finally: exception(NullReferenceException)] !... | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:114:17:114:36 | [true, finally: exception(OutOfMemoryException)] !... | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:114:17:114:36 | [true, finally: return] !... | Finally.cs:103:10:103:11 | M5 |
 | Finally.cs:114:17:114:36 | [true] !... | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:114:19:114:23 | [finally: exception(Exception)] access to field Field | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:114:19:114:23 | [finally: exception(Exception)] this access | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:114:19:114:23 | [finally: exception(NullReferenceException)] access to field Field | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:114:19:114:23 | [finally: exception(NullReferenceException)] this access | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:114:19:114:23 | [finally: exception(OutOfMemoryException)] access to field Field | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:114:19:114:23 | [finally: exception(OutOfMemoryException)] this access | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:114:19:114:23 | [finally: return] access to field Field | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:114:19:114:23 | [finally: return] this access | Finally.cs:103:10:103:11 | M5 |
 | Finally.cs:114:19:114:23 | access to field Field | Finally.cs:103:10:103:11 | M5 |
 | Finally.cs:114:19:114:23 | this access | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:114:19:114:30 | [finally: exception(Exception)] access to property Length | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:114:19:114:30 | [finally: exception(NullReferenceException)] access to property Length | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:114:19:114:30 | [finally: exception(OutOfMemoryException)] access to property Length | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:114:19:114:30 | [finally: return] access to property Length | Finally.cs:103:10:103:11 | M5 |
 | Finally.cs:114:19:114:30 | access to property Length | Finally.cs:103:10:103:11 | M5 |
 | Finally.cs:114:19:114:35 | ... == ... | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:114:19:114:35 | [finally: exception(Exception)] ... == ... | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:114:19:114:35 | [finally: exception(NullReferenceException)] ... == ... | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:114:19:114:35 | [finally: exception(OutOfMemoryException)] ... == ... | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:114:19:114:35 | [finally: return] ... == ... | Finally.cs:103:10:103:11 | M5 |
 | Finally.cs:114:35:114:35 | 0 | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:114:35:114:35 | [finally: exception(Exception)] 0 | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:114:35:114:35 | [finally: exception(NullReferenceException)] 0 | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:114:35:114:35 | [finally: exception(OutOfMemoryException)] 0 | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:114:35:114:35 | [finally: return] 0 | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:115:17:115:40 | [finally: exception(Exception)] call to method WriteLine | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:115:17:115:40 | [finally: exception(NullReferenceException)] call to method WriteLine | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:115:17:115:40 | [finally: exception(OutOfMemoryException)] call to method WriteLine | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:115:17:115:40 | [finally: return] call to method WriteLine | Finally.cs:103:10:103:11 | M5 |
 | Finally.cs:115:17:115:40 | call to method WriteLine | Finally.cs:103:10:103:11 | M5 |
 | Finally.cs:115:17:115:41 | ...; | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:115:17:115:41 | [finally: exception(Exception)] ...; | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:115:17:115:41 | [finally: exception(NullReferenceException)] ...; | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:115:17:115:41 | [finally: exception(OutOfMemoryException)] ...; | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:115:17:115:41 | [finally: return] ...; | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:115:35:115:39 | [finally: exception(Exception)] access to field Field | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:115:35:115:39 | [finally: exception(Exception)] this access | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:115:35:115:39 | [finally: exception(NullReferenceException)] access to field Field | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:115:35:115:39 | [finally: exception(NullReferenceException)] this access | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:115:35:115:39 | [finally: exception(OutOfMemoryException)] access to field Field | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:115:35:115:39 | [finally: exception(OutOfMemoryException)] this access | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:115:35:115:39 | [finally: return] access to field Field | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:115:35:115:39 | [finally: return] this access | Finally.cs:103:10:103:11 | M5 |
 | Finally.cs:115:35:115:39 | access to field Field | Finally.cs:103:10:103:11 | M5 |
 | Finally.cs:115:35:115:39 | this access | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:116:13:117:37 | [finally: exception(Exception)] if (...) ... | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:116:13:117:37 | [finally: exception(NullReferenceException)] if (...) ... | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:116:13:117:37 | [finally: exception(OutOfMemoryException)] if (...) ... | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:116:13:117:37 | [finally: return] if (...) ... | Finally.cs:103:10:103:11 | M5 |
 | Finally.cs:116:13:117:37 | if (...) ... | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:116:17:116:21 | [finally: exception(Exception)] access to field Field | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:116:17:116:21 | [finally: exception(Exception)] this access | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:116:17:116:21 | [finally: exception(NullReferenceException)] access to field Field | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:116:17:116:21 | [finally: exception(NullReferenceException)] this access | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:116:17:116:21 | [finally: exception(OutOfMemoryException)] access to field Field | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:116:17:116:21 | [finally: exception(OutOfMemoryException)] this access | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:116:17:116:21 | [finally: return] access to field Field | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:116:17:116:21 | [finally: return] this access | Finally.cs:103:10:103:11 | M5 |
 | Finally.cs:116:17:116:21 | access to field Field | Finally.cs:103:10:103:11 | M5 |
 | Finally.cs:116:17:116:21 | this access | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:116:17:116:28 | [finally: exception(Exception)] access to property Length | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:116:17:116:28 | [finally: exception(NullReferenceException)] access to property Length | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:116:17:116:28 | [finally: exception(OutOfMemoryException)] access to property Length | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:116:17:116:28 | [finally: return] access to property Length | Finally.cs:103:10:103:11 | M5 |
 | Finally.cs:116:17:116:28 | access to property Length | Finally.cs:103:10:103:11 | M5 |
 | Finally.cs:116:17:116:32 | ... > ... | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:116:17:116:32 | [finally: exception(Exception)] ... > ... | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:116:17:116:32 | [finally: exception(NullReferenceException)] ... > ... | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:116:17:116:32 | [finally: exception(OutOfMemoryException)] ... > ... | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:116:17:116:32 | [finally: return] ... > ... | Finally.cs:103:10:103:11 | M5 |
 | Finally.cs:116:32:116:32 | 0 | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:116:32:116:32 | [finally: exception(Exception)] 0 | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:116:32:116:32 | [finally: exception(NullReferenceException)] 0 | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:116:32:116:32 | [finally: exception(OutOfMemoryException)] 0 | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:116:32:116:32 | [finally: return] 0 | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:117:17:117:36 | [finally: exception(Exception)] call to method WriteLine | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:117:17:117:36 | [finally: exception(NullReferenceException)] call to method WriteLine | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:117:17:117:36 | [finally: exception(OutOfMemoryException)] call to method WriteLine | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:117:17:117:36 | [finally: return] call to method WriteLine | Finally.cs:103:10:103:11 | M5 |
 | Finally.cs:117:17:117:36 | call to method WriteLine | Finally.cs:103:10:103:11 | M5 |
 | Finally.cs:117:17:117:37 | ...; | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:117:17:117:37 | [finally: exception(Exception)] ...; | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:117:17:117:37 | [finally: exception(NullReferenceException)] ...; | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:117:17:117:37 | [finally: exception(OutOfMemoryException)] ...; | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:117:17:117:37 | [finally: return] ...; | Finally.cs:103:10:103:11 | M5 |
 | Finally.cs:117:35:117:35 | 1 | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:117:35:117:35 | [finally: exception(Exception)] 1 | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:117:35:117:35 | [finally: exception(NullReferenceException)] 1 | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:117:35:117:35 | [finally: exception(OutOfMemoryException)] 1 | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:117:35:117:35 | [finally: return] 1 | Finally.cs:103:10:103:11 | M5 |
 | Finally.cs:121:10:121:11 | enter M6 | Finally.cs:121:10:121:11 | M6 |
 | Finally.cs:121:10:121:11 | exit M6 | Finally.cs:121:10:121:11 | M6 |
 | Finally.cs:121:10:121:11 | exit M6 (normal) | Finally.cs:121:10:121:11 | M6 |
@@ -2243,14 +1806,10 @@ nodeEnclosing
 | Finally.cs:137:13:137:36 | call to method WriteLine | Finally.cs:133:10:133:11 | M7 |
 | Finally.cs:137:13:137:37 | ...; | Finally.cs:133:10:133:11 | M7 |
 | Finally.cs:137:31:137:35 | "Try" | Finally.cs:133:10:133:11 | M7 |
-| Finally.cs:140:9:143:9 | [finally: exception(Exception)] {...} | Finally.cs:133:10:133:11 | M7 |
 | Finally.cs:140:9:143:9 | {...} | Finally.cs:133:10:133:11 | M7 |
-| Finally.cs:141:13:141:44 | [finally: exception(Exception)] throw ...; | Finally.cs:133:10:133:11 | M7 |
 | Finally.cs:141:13:141:44 | throw ...; | Finally.cs:133:10:133:11 | M7 |
-| Finally.cs:141:19:141:43 | [finally: exception(Exception)] object creation of type ArgumentException | Finally.cs:133:10:133:11 | M7 |
 | Finally.cs:141:19:141:43 | object creation of type ArgumentException | Finally.cs:133:10:133:11 | M7 |
 | Finally.cs:141:41:141:42 | "" | Finally.cs:133:10:133:11 | M7 |
-| Finally.cs:141:41:141:42 | [finally: exception(Exception)] "" | Finally.cs:133:10:133:11 | M7 |
 | Finally.cs:147:10:147:11 | enter M8 | Finally.cs:147:10:147:11 | M8 |
 | Finally.cs:147:10:147:11 | exit M8 | Finally.cs:147:10:147:11 | M8 |
 | Finally.cs:147:10:147:11 | exit M8 (abnormal) | Finally.cs:147:10:147:11 | M8 |
@@ -2264,108 +1823,34 @@ nodeEnclosing
 | Finally.cs:151:25:151:28 | null | Finally.cs:147:10:147:11 | M8 |
 | Finally.cs:152:17:152:50 | throw ...; | Finally.cs:147:10:147:11 | M8 |
 | Finally.cs:152:23:152:49 | object creation of type ArgumentNullException | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:155:9:169:9 | [finally: exception(ArgumentNullException)] {...} | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:155:9:169:9 | [finally: exception(Exception)] {...} | Finally.cs:147:10:147:11 | M8 |
 | Finally.cs:155:9:169:9 | {...} | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:156:13:168:13 | [finally: exception(ArgumentNullException)] try {...} ... | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:156:13:168:13 | [finally: exception(Exception)] try {...} ... | Finally.cs:147:10:147:11 | M8 |
 | Finally.cs:156:13:168:13 | try {...} ... | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:157:13:160:13 | [finally: exception(ArgumentNullException)] {...} | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:157:13:160:13 | [finally: exception(Exception)] {...} | Finally.cs:147:10:147:11 | M8 |
 | Finally.cs:157:13:160:13 | {...} | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:158:17:159:45 | [finally: exception(ArgumentNullException)] if (...) ... | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:158:17:159:45 | [finally: exception(Exception)] if (...) ... | Finally.cs:147:10:147:11 | M8 |
 | Finally.cs:158:17:159:45 | if (...) ... | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:158:21:158:24 | [finally: exception(ArgumentNullException)] access to parameter args | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:158:21:158:24 | [finally: exception(Exception)] access to parameter args | Finally.cs:147:10:147:11 | M8 |
 | Finally.cs:158:21:158:24 | access to parameter args | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:158:21:158:31 | [finally: exception(ArgumentNullException)] access to property Length | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:158:21:158:31 | [finally: exception(Exception)] access to property Length | Finally.cs:147:10:147:11 | M8 |
 | Finally.cs:158:21:158:31 | access to property Length | Finally.cs:147:10:147:11 | M8 |
 | Finally.cs:158:21:158:36 | ... == ... | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:158:21:158:36 | [finally: exception(ArgumentNullException)] ... == ... | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:158:21:158:36 | [finally: exception(Exception)] ... == ... | Finally.cs:147:10:147:11 | M8 |
 | Finally.cs:158:36:158:36 | 1 | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:158:36:158:36 | [finally: exception(ArgumentNullException)] 1 | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:158:36:158:36 | [finally: exception(Exception)] 1 | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:159:21:159:45 | [finally: exception(ArgumentNullException)] throw ...; | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:159:21:159:45 | [finally: exception(Exception)] throw ...; | Finally.cs:147:10:147:11 | M8 |
 | Finally.cs:159:21:159:45 | throw ...; | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:159:27:159:44 | [finally: exception(ArgumentNullException)] object creation of type Exception | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:159:27:159:44 | [finally: exception(Exception)] object creation of type Exception | Finally.cs:147:10:147:11 | M8 |
 | Finally.cs:159:27:159:44 | object creation of type Exception | Finally.cs:147:10:147:11 | M8 |
 | Finally.cs:159:41:159:43 | "1" | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:159:41:159:43 | [finally: exception(ArgumentNullException)] "1" | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:159:41:159:43 | [finally: exception(Exception)] "1" | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:161:13:164:13 | [exception: Exception] catch (...) {...} | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:161:13:164:13 | [exception: NullReferenceException] catch (...) {...} | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:161:13:164:13 | [finally: exception(ArgumentNullException), exception: Exception] catch (...) {...} | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:161:13:164:13 | [finally: exception(ArgumentNullException), exception: NullReferenceException] catch (...) {...} | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:161:13:164:13 | [finally: exception(Exception), exception: Exception] catch (...) {...} | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:161:13:164:13 | [finally: exception(Exception), exception: NullReferenceException] catch (...) {...} | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:161:30:161:30 | [exception: Exception] Exception e | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:161:30:161:30 | [exception: NullReferenceException] Exception e | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:161:30:161:30 | [finally: exception(ArgumentNullException), exception: Exception] Exception e | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:161:30:161:30 | [finally: exception(ArgumentNullException), exception: NullReferenceException] Exception e | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:161:30:161:30 | [finally: exception(Exception), exception: Exception] Exception e | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:161:30:161:30 | [finally: exception(Exception), exception: NullReferenceException] Exception e | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:161:39:161:39 | [exception: Exception] access to local variable e | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:161:39:161:39 | [exception: NullReferenceException] access to local variable e | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:161:39:161:39 | [finally: exception(ArgumentNullException), exception: Exception] access to local variable e | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:161:39:161:39 | [finally: exception(ArgumentNullException), exception: NullReferenceException] access to local variable e | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:161:39:161:39 | [finally: exception(Exception), exception: Exception] access to local variable e | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:161:39:161:39 | [finally: exception(Exception), exception: NullReferenceException] access to local variable e | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:161:39:161:47 | [exception: Exception] access to property Message | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:161:39:161:47 | [exception: NullReferenceException] access to property Message | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:161:39:161:47 | [finally: exception(ArgumentNullException), exception: Exception] access to property Message | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:161:39:161:47 | [finally: exception(ArgumentNullException), exception: NullReferenceException] access to property Message | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:161:39:161:47 | [finally: exception(Exception), exception: Exception] access to property Message | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:161:39:161:47 | [finally: exception(Exception), exception: NullReferenceException] access to property Message | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:161:39:161:54 | [exception: Exception] ... == ... | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:161:39:161:54 | [exception: NullReferenceException] ... == ... | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:161:39:161:54 | [finally: exception(ArgumentNullException), exception: Exception] ... == ... | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:161:39:161:54 | [finally: exception(ArgumentNullException), exception: NullReferenceException] ... == ... | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:161:39:161:54 | [finally: exception(Exception), exception: Exception] ... == ... | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:161:39:161:54 | [finally: exception(Exception), exception: NullReferenceException] ... == ... | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:161:52:161:54 | [exception: Exception] "1" | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:161:52:161:54 | [exception: NullReferenceException] "1" | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:161:52:161:54 | [finally: exception(ArgumentNullException), exception: Exception] "1" | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:161:52:161:54 | [finally: exception(ArgumentNullException), exception: NullReferenceException] "1" | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:161:52:161:54 | [finally: exception(Exception), exception: Exception] "1" | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:161:52:161:54 | [finally: exception(Exception), exception: NullReferenceException] "1" | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:162:13:164:13 | [finally: exception(ArgumentNullException)] {...} | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:162:13:164:13 | [finally: exception(Exception)] {...} | Finally.cs:147:10:147:11 | M8 |
+| Finally.cs:161:13:164:13 | catch (...) {...} | Finally.cs:147:10:147:11 | M8 |
+| Finally.cs:161:30:161:30 | Exception e | Finally.cs:147:10:147:11 | M8 |
+| Finally.cs:161:39:161:39 | access to local variable e | Finally.cs:147:10:147:11 | M8 |
+| Finally.cs:161:39:161:47 | access to property Message | Finally.cs:147:10:147:11 | M8 |
+| Finally.cs:161:39:161:54 | ... == ... | Finally.cs:147:10:147:11 | M8 |
+| Finally.cs:161:52:161:54 | "1" | Finally.cs:147:10:147:11 | M8 |
 | Finally.cs:162:13:164:13 | {...} | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:163:17:163:42 | [finally: exception(ArgumentNullException)] call to method WriteLine | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:163:17:163:42 | [finally: exception(Exception)] call to method WriteLine | Finally.cs:147:10:147:11 | M8 |
 | Finally.cs:163:17:163:42 | call to method WriteLine | Finally.cs:147:10:147:11 | M8 |
 | Finally.cs:163:17:163:43 | ...; | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:163:17:163:43 | [finally: exception(ArgumentNullException)] ...; | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:163:17:163:43 | [finally: exception(Exception)] ...; | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:163:35:163:38 | [finally: exception(ArgumentNullException)] access to parameter args | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:163:35:163:38 | [finally: exception(Exception)] access to parameter args | Finally.cs:147:10:147:11 | M8 |
 | Finally.cs:163:35:163:38 | access to parameter args | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:163:35:163:41 | [finally: exception(ArgumentNullException)] access to array element | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:163:35:163:41 | [finally: exception(Exception)] access to array element | Finally.cs:147:10:147:11 | M8 |
 | Finally.cs:163:35:163:41 | access to array element | Finally.cs:147:10:147:11 | M8 |
 | Finally.cs:163:40:163:40 | 0 | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:163:40:163:40 | [finally: exception(ArgumentNullException)] 0 | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:163:40:163:40 | [finally: exception(Exception)] 0 | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:165:13:168:13 | [finally: exception(ArgumentNullException)] catch {...} | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:165:13:168:13 | [finally: exception(Exception)] catch {...} | Finally.cs:147:10:147:11 | M8 |
 | Finally.cs:165:13:168:13 | catch {...} | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:166:13:168:13 | [finally: exception(ArgumentNullException)] {...} | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:166:13:168:13 | [finally: exception(Exception)] {...} | Finally.cs:147:10:147:11 | M8 |
 | Finally.cs:166:13:168:13 | {...} | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:167:17:167:37 | [finally: exception(ArgumentNullException)] call to method WriteLine | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:167:17:167:37 | [finally: exception(Exception)] call to method WriteLine | Finally.cs:147:10:147:11 | M8 |
 | Finally.cs:167:17:167:37 | call to method WriteLine | Finally.cs:147:10:147:11 | M8 |
 | Finally.cs:167:17:167:38 | ...; | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:167:17:167:38 | [finally: exception(ArgumentNullException)] ...; | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:167:17:167:38 | [finally: exception(Exception)] ...; | Finally.cs:147:10:147:11 | M8 |
 | Finally.cs:167:35:167:36 | "" | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:167:35:167:36 | [finally: exception(ArgumentNullException)] "" | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:167:35:167:36 | [finally: exception(Exception)] "" | Finally.cs:147:10:147:11 | M8 |
 | Finally.cs:172:11:172:20 | call to constructor Exception | Finally.cs:172:11:172:20 | ExceptionA |
 | Finally.cs:172:11:172:20 | enter ExceptionA | Finally.cs:172:11:172:20 | ExceptionA |
 | Finally.cs:172:11:172:20 | exit ExceptionA | Finally.cs:172:11:172:20 | ExceptionA |
@@ -2390,54 +1875,22 @@ nodeEnclosing
 | Finally.cs:179:9:181:9 | {...} | Finally.cs:176:10:176:11 | M9 |
 | Finally.cs:180:13:180:43 | if (...) ... | Finally.cs:176:10:176:11 | M9 |
 | Finally.cs:180:17:180:18 | access to parameter b1 | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:180:21:180:43 | [b1 (line 176): true] throw ...; | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:180:27:180:42 | [b1 (line 176): true] object creation of type ExceptionA | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:183:9:192:9 | [b1 (line 176): false] {...} | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:183:9:192:9 | [finally: exception(Exception), b1 (line 176): true] {...} | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:183:9:192:9 | [finally: exception(ExceptionA), b1 (line 176): true] {...} | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:184:13:191:13 | [b1 (line 176): false] try {...} ... | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:184:13:191:13 | [finally: exception(Exception), b1 (line 176): true] try {...} ... | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:184:13:191:13 | [finally: exception(ExceptionA), b1 (line 176): true] try {...} ... | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:185:13:187:13 | [b1 (line 176): false] {...} | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:185:13:187:13 | [finally: exception(Exception), b1 (line 176): true] {...} | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:185:13:187:13 | [finally: exception(ExceptionA), b1 (line 176): true] {...} | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:186:17:186:47 | [b1 (line 176): false] if (...) ... | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:186:17:186:47 | [finally: exception(Exception), b1 (line 176): true] if (...) ... | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:186:17:186:47 | [finally: exception(ExceptionA), b1 (line 176): true] if (...) ... | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:186:21:186:22 | [b1 (line 176): false] access to parameter b2 | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:186:21:186:22 | [finally: exception(Exception), b1 (line 176): true] access to parameter b2 | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:186:21:186:22 | [finally: exception(ExceptionA), b1 (line 176): true] access to parameter b2 | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:186:25:186:47 | [b1 (line 176): false, b2 (line 176): true] throw ...; | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:186:25:186:47 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] throw ...; | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:186:25:186:47 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] throw ...; | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:186:31:186:46 | [b1 (line 176): false, b2 (line 176): true] object creation of type ExceptionB | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:186:31:186:46 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:186:31:186:46 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:188:13:191:13 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] catch (...) {...} | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:188:13:191:13 | [exception: ExceptionB, b1 (line 176): false, b2 (line 176): true] catch (...) {...} | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:188:13:191:13 | [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:188:13:191:13 | [finally: exception(Exception), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:188:13:191:13 | [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:188:13:191:13 | [finally: exception(ExceptionA), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:188:38:188:39 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] access to parameter b2 | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:188:38:188:39 | [exception: ExceptionB, b1 (line 176): false, b2 (line 176): true] access to parameter b2 | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:188:38:188:39 | [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:188:38:188:39 | [finally: exception(Exception), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:188:38:188:39 | [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:188:38:188:39 | [finally: exception(ExceptionA), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:189:13:191:13 | [b1 (line 176): false] {...} | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:189:13:191:13 | [finally: exception(Exception), b1 (line 176): true] {...} | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:189:13:191:13 | [finally: exception(ExceptionA), b1 (line 176): true] {...} | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:190:17:190:47 | [b1 (line 176): false] if (...) ... | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:190:17:190:47 | [finally: exception(Exception), b1 (line 176): true] if (...) ... | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:190:17:190:47 | [finally: exception(ExceptionA), b1 (line 176): true] if (...) ... | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:190:21:190:22 | [b1 (line 176): false] access to parameter b1 | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:190:21:190:22 | [finally: exception(Exception), b1 (line 176): true] access to parameter b1 | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:190:21:190:22 | [finally: exception(ExceptionA), b1 (line 176): true] access to parameter b1 | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:190:25:190:47 | [finally: exception(Exception)] throw ...; | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:190:25:190:47 | [finally: exception(ExceptionA)] throw ...; | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:190:31:190:46 | [finally: exception(Exception)] object creation of type ExceptionC | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:190:31:190:46 | [finally: exception(ExceptionA)] object creation of type ExceptionC | Finally.cs:176:10:176:11 | M9 |
+| Finally.cs:180:21:180:43 | throw ...; | Finally.cs:176:10:176:11 | M9 |
+| Finally.cs:180:27:180:42 | object creation of type ExceptionA | Finally.cs:176:10:176:11 | M9 |
+| Finally.cs:183:9:192:9 | {...} | Finally.cs:176:10:176:11 | M9 |
+| Finally.cs:184:13:191:13 | try {...} ... | Finally.cs:176:10:176:11 | M9 |
+| Finally.cs:185:13:187:13 | {...} | Finally.cs:176:10:176:11 | M9 |
+| Finally.cs:186:17:186:47 | if (...) ... | Finally.cs:176:10:176:11 | M9 |
+| Finally.cs:186:21:186:22 | access to parameter b2 | Finally.cs:176:10:176:11 | M9 |
+| Finally.cs:186:25:186:47 | throw ...; | Finally.cs:176:10:176:11 | M9 |
+| Finally.cs:186:31:186:46 | object creation of type ExceptionB | Finally.cs:176:10:176:11 | M9 |
+| Finally.cs:188:13:191:13 | catch (...) {...} | Finally.cs:176:10:176:11 | M9 |
+| Finally.cs:188:38:188:39 | access to parameter b2 | Finally.cs:176:10:176:11 | M9 |
+| Finally.cs:189:13:191:13 | {...} | Finally.cs:176:10:176:11 | M9 |
+| Finally.cs:190:17:190:47 | if (...) ... | Finally.cs:176:10:176:11 | M9 |
+| Finally.cs:190:21:190:22 | access to parameter b1 | Finally.cs:176:10:176:11 | M9 |
+| Finally.cs:190:25:190:47 | throw ...; | Finally.cs:176:10:176:11 | M9 |
+| Finally.cs:190:31:190:46 | object creation of type ExceptionC | Finally.cs:176:10:176:11 | M9 |
 | Finally.cs:195:10:195:12 | enter M10 | Finally.cs:195:10:195:12 | M10 |
 | Finally.cs:195:10:195:12 | exit M10 | Finally.cs:195:10:195:12 | M10 |
 | Finally.cs:195:10:195:12 | exit M10 (abnormal) | Finally.cs:195:10:195:12 | M10 |
@@ -2449,84 +1902,22 @@ nodeEnclosing
 | Finally.cs:199:17:199:18 | access to parameter b1 | Finally.cs:195:10:195:12 | M10 |
 | Finally.cs:199:21:199:43 | throw ...; | Finally.cs:195:10:195:12 | M10 |
 | Finally.cs:199:27:199:42 | object creation of type ExceptionA | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:202:9:212:9 | [finally: exception(Exception)] {...} | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:202:9:212:9 | [finally: exception(ExceptionA)] {...} | Finally.cs:195:10:195:12 | M10 |
 | Finally.cs:202:9:212:9 | {...} | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:203:13:210:13 | [finally: exception(Exception)] try {...} ... | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:203:13:210:13 | [finally: exception(ExceptionA)] try {...} ... | Finally.cs:195:10:195:12 | M10 |
 | Finally.cs:203:13:210:13 | try {...} ... | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:204:13:206:13 | [finally: exception(Exception)] {...} | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:204:13:206:13 | [finally: exception(ExceptionA)] {...} | Finally.cs:195:10:195:12 | M10 |
 | Finally.cs:204:13:206:13 | {...} | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:205:17:205:47 | [finally: exception(Exception)] if (...) ... | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:205:17:205:47 | [finally: exception(ExceptionA)] if (...) ... | Finally.cs:195:10:195:12 | M10 |
 | Finally.cs:205:17:205:47 | if (...) ... | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:205:21:205:22 | [finally: exception(Exception)] access to parameter b2 | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:205:21:205:22 | [finally: exception(ExceptionA)] access to parameter b2 | Finally.cs:195:10:195:12 | M10 |
 | Finally.cs:205:21:205:22 | access to parameter b2 | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:205:25:205:47 | [finally: exception(Exception)] throw ...; | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:205:25:205:47 | [finally: exception(ExceptionA)] throw ...; | Finally.cs:195:10:195:12 | M10 |
 | Finally.cs:205:25:205:47 | throw ...; | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:205:31:205:46 | [finally: exception(Exception)] object creation of type ExceptionB | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:205:31:205:46 | [finally: exception(ExceptionA)] object creation of type ExceptionB | Finally.cs:195:10:195:12 | M10 |
 | Finally.cs:205:31:205:46 | object creation of type ExceptionB | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:208:13:210:13 | [finally(1): exception(Exception)] {...} | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:208:13:210:13 | [finally(1): exception(ExceptionB)] {...} | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:208:13:210:13 | [finally: exception(Exception), finally(1): exception(Exception)] {...} | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:208:13:210:13 | [finally: exception(Exception), finally(1): exception(ExceptionB)] {...} | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:208:13:210:13 | [finally: exception(Exception)] {...} | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:208:13:210:13 | [finally: exception(ExceptionA), finally(1): exception(Exception)] {...} | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:208:13:210:13 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] {...} | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:208:13:210:13 | [finally: exception(ExceptionA)] {...} | Finally.cs:195:10:195:12 | M10 |
 | Finally.cs:208:13:210:13 | {...} | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:209:17:209:47 | [finally(1): exception(Exception)] if (...) ... | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:209:17:209:47 | [finally(1): exception(ExceptionB)] if (...) ... | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:209:17:209:47 | [finally: exception(Exception), finally(1): exception(Exception)] if (...) ... | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:209:17:209:47 | [finally: exception(Exception), finally(1): exception(ExceptionB)] if (...) ... | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:209:17:209:47 | [finally: exception(Exception)] if (...) ... | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:209:17:209:47 | [finally: exception(ExceptionA), finally(1): exception(Exception)] if (...) ... | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:209:17:209:47 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] if (...) ... | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:209:17:209:47 | [finally: exception(ExceptionA)] if (...) ... | Finally.cs:195:10:195:12 | M10 |
 | Finally.cs:209:17:209:47 | if (...) ... | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:209:21:209:22 | [finally(1): exception(Exception)] access to parameter b3 | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:209:21:209:22 | [finally(1): exception(ExceptionB)] access to parameter b3 | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:209:21:209:22 | [finally: exception(Exception), finally(1): exception(Exception)] access to parameter b3 | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:209:21:209:22 | [finally: exception(Exception), finally(1): exception(ExceptionB)] access to parameter b3 | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:209:21:209:22 | [finally: exception(Exception)] access to parameter b3 | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:209:21:209:22 | [finally: exception(ExceptionA), finally(1): exception(Exception)] access to parameter b3 | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:209:21:209:22 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] access to parameter b3 | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:209:21:209:22 | [finally: exception(ExceptionA)] access to parameter b3 | Finally.cs:195:10:195:12 | M10 |
 | Finally.cs:209:21:209:22 | access to parameter b3 | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:209:25:209:47 | [finally(1): exception(Exception)] throw ...; | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:209:25:209:47 | [finally(1): exception(ExceptionB)] throw ...; | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:209:25:209:47 | [finally: exception(Exception), finally(1): exception(Exception)] throw ...; | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:209:25:209:47 | [finally: exception(Exception), finally(1): exception(ExceptionB)] throw ...; | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:209:25:209:47 | [finally: exception(Exception)] throw ...; | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:209:25:209:47 | [finally: exception(ExceptionA), finally(1): exception(Exception)] throw ...; | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:209:25:209:47 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] throw ...; | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:209:25:209:47 | [finally: exception(ExceptionA)] throw ...; | Finally.cs:195:10:195:12 | M10 |
 | Finally.cs:209:25:209:47 | throw ...; | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:209:31:209:46 | [finally(1): exception(Exception)] object creation of type ExceptionC | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:209:31:209:46 | [finally(1): exception(ExceptionB)] object creation of type ExceptionC | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:209:31:209:46 | [finally: exception(Exception), finally(1): exception(Exception)] object creation of type ExceptionC | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:209:31:209:46 | [finally: exception(Exception), finally(1): exception(ExceptionB)] object creation of type ExceptionC | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:209:31:209:46 | [finally: exception(Exception)] object creation of type ExceptionC | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:209:31:209:46 | [finally: exception(ExceptionA), finally(1): exception(Exception)] object creation of type ExceptionC | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:209:31:209:46 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] object creation of type ExceptionC | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:209:31:209:46 | [finally: exception(ExceptionA)] object creation of type ExceptionC | Finally.cs:195:10:195:12 | M10 |
 | Finally.cs:209:31:209:46 | object creation of type ExceptionC | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:211:13:211:16 | [finally: exception(Exception)] this access | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:211:13:211:16 | [finally: exception(ExceptionA)] this access | Finally.cs:195:10:195:12 | M10 |
 | Finally.cs:211:13:211:16 | this access | Finally.cs:195:10:195:12 | M10 |
 | Finally.cs:211:13:211:28 | ... = ... | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:211:13:211:28 | [finally: exception(Exception)] ... = ... | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:211:13:211:28 | [finally: exception(ExceptionA)] ... = ... | Finally.cs:195:10:195:12 | M10 |
 | Finally.cs:211:13:211:29 | ...; | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:211:13:211:29 | [finally: exception(Exception)] ...; | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:211:13:211:29 | [finally: exception(ExceptionA)] ...; | Finally.cs:195:10:195:12 | M10 |
 | Finally.cs:211:26:211:28 | "0" | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:211:26:211:28 | [finally: exception(Exception)] "0" | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:211:26:211:28 | [finally: exception(ExceptionA)] "0" | Finally.cs:195:10:195:12 | M10 |
 | Finally.cs:213:9:213:12 | this access | Finally.cs:195:10:195:12 | M10 |
 | Finally.cs:213:9:213:24 | ... = ... | Finally.cs:195:10:195:12 | M10 |
 | Finally.cs:213:9:213:25 | ...; | Finally.cs:195:10:195:12 | M10 |
@@ -2565,78 +1956,24 @@ nodeEnclosing
 | Finally.cs:239:21:239:22 | access to parameter b1 | Finally.cs:233:10:233:12 | M12 |
 | Finally.cs:240:21:240:43 | throw ...; | Finally.cs:233:10:233:12 | M12 |
 | Finally.cs:240:27:240:42 | object creation of type ExceptionA | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:243:13:253:13 | [finally: exception(Exception)] {...} | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:243:13:253:13 | [finally: exception(ExceptionA)] {...} | Finally.cs:233:10:233:12 | M12 |
 | Finally.cs:243:13:253:13 | {...} | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:244:17:252:17 | [finally: exception(Exception)] try {...} ... | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:244:17:252:17 | [finally: exception(ExceptionA)] try {...} ... | Finally.cs:233:10:233:12 | M12 |
 | Finally.cs:244:17:252:17 | try {...} ... | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:245:17:248:17 | [finally: exception(Exception)] {...} | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:245:17:248:17 | [finally: exception(ExceptionA)] {...} | Finally.cs:233:10:233:12 | M12 |
 | Finally.cs:245:17:248:17 | {...} | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:246:21:247:47 | [finally: exception(Exception)] if (...) ... | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:246:21:247:47 | [finally: exception(ExceptionA)] if (...) ... | Finally.cs:233:10:233:12 | M12 |
 | Finally.cs:246:21:247:47 | if (...) ... | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:246:25:246:26 | [finally: exception(Exception)] access to parameter b2 | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:246:25:246:26 | [finally: exception(ExceptionA)] access to parameter b2 | Finally.cs:233:10:233:12 | M12 |
 | Finally.cs:246:25:246:26 | access to parameter b2 | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:247:25:247:47 | [finally: exception(Exception)] throw ...; | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:247:25:247:47 | [finally: exception(ExceptionA)] throw ...; | Finally.cs:233:10:233:12 | M12 |
 | Finally.cs:247:25:247:47 | throw ...; | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:247:31:247:46 | [finally: exception(Exception)] object creation of type ExceptionA | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:247:31:247:46 | [finally: exception(ExceptionA)] object creation of type ExceptionA | Finally.cs:233:10:233:12 | M12 |
 | Finally.cs:247:31:247:46 | object creation of type ExceptionA | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:250:17:252:17 | [finally(1): exception(Exception)] {...} | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:250:17:252:17 | [finally(1): exception(ExceptionA)] {...} | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:250:17:252:17 | [finally: exception(Exception), finally(1): exception(Exception)] {...} | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:250:17:252:17 | [finally: exception(Exception), finally(1): exception(ExceptionA)] {...} | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:250:17:252:17 | [finally: exception(Exception)] {...} | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:250:17:252:17 | [finally: exception(ExceptionA), finally(1): exception(Exception)] {...} | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:250:17:252:17 | [finally: exception(ExceptionA), finally(1): exception(ExceptionA)] {...} | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:250:17:252:17 | [finally: exception(ExceptionA)] {...} | Finally.cs:233:10:233:12 | M12 |
 | Finally.cs:250:17:252:17 | {...} | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:251:21:251:54 | [finally(1): exception(Exception)] call to method WriteLine | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:251:21:251:54 | [finally(1): exception(ExceptionA)] call to method WriteLine | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:251:21:251:54 | [finally: exception(Exception), finally(1): exception(Exception)] call to method WriteLine | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:251:21:251:54 | [finally: exception(Exception), finally(1): exception(ExceptionA)] call to method WriteLine | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:251:21:251:54 | [finally: exception(Exception)] call to method WriteLine | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:251:21:251:54 | [finally: exception(ExceptionA), finally(1): exception(Exception)] call to method WriteLine | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:251:21:251:54 | [finally: exception(ExceptionA), finally(1): exception(ExceptionA)] call to method WriteLine | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:251:21:251:54 | [finally: exception(ExceptionA)] call to method WriteLine | Finally.cs:233:10:233:12 | M12 |
 | Finally.cs:251:21:251:54 | call to method WriteLine | Finally.cs:233:10:233:12 | M12 |
 | Finally.cs:251:21:251:55 | ...; | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:251:21:251:55 | [finally(1): exception(Exception)] ...; | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:251:21:251:55 | [finally(1): exception(ExceptionA)] ...; | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:251:21:251:55 | [finally: exception(Exception), finally(1): exception(Exception)] ...; | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:251:21:251:55 | [finally: exception(Exception), finally(1): exception(ExceptionA)] ...; | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:251:21:251:55 | [finally: exception(Exception)] ...; | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:251:21:251:55 | [finally: exception(ExceptionA), finally(1): exception(Exception)] ...; | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:251:21:251:55 | [finally: exception(ExceptionA), finally(1): exception(ExceptionA)] ...; | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:251:21:251:55 | [finally: exception(ExceptionA)] ...; | Finally.cs:233:10:233:12 | M12 |
 | Finally.cs:251:39:251:53 | "Inner finally" | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:251:39:251:53 | [finally(1): exception(Exception)] "Inner finally" | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:251:39:251:53 | [finally(1): exception(ExceptionA)] "Inner finally" | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:251:39:251:53 | [finally: exception(Exception), finally(1): exception(Exception)] "Inner finally" | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:251:39:251:53 | [finally: exception(Exception), finally(1): exception(ExceptionA)] "Inner finally" | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:251:39:251:53 | [finally: exception(Exception)] "Inner finally" | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:251:39:251:53 | [finally: exception(ExceptionA), finally(1): exception(Exception)] "Inner finally" | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:251:39:251:53 | [finally: exception(ExceptionA), finally(1): exception(ExceptionA)] "Inner finally" | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:251:39:251:53 | [finally: exception(ExceptionA)] "Inner finally" | Finally.cs:233:10:233:12 | M12 |
 | Finally.cs:254:13:254:44 | call to method WriteLine | Finally.cs:233:10:233:12 | M12 |
 | Finally.cs:254:13:254:45 | ...; | Finally.cs:233:10:233:12 | M12 |
 | Finally.cs:254:31:254:43 | "Mid finally" | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:257:9:259:9 | [finally: exception(Exception)] {...} | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:257:9:259:9 | [finally: exception(ExceptionA)] {...} | Finally.cs:233:10:233:12 | M12 |
 | Finally.cs:257:9:259:9 | {...} | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:258:13:258:46 | [finally: exception(Exception)] call to method WriteLine | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:258:13:258:46 | [finally: exception(ExceptionA)] call to method WriteLine | Finally.cs:233:10:233:12 | M12 |
 | Finally.cs:258:13:258:46 | call to method WriteLine | Finally.cs:233:10:233:12 | M12 |
 | Finally.cs:258:13:258:47 | ...; | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:258:13:258:47 | [finally: exception(Exception)] ...; | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:258:13:258:47 | [finally: exception(ExceptionA)] ...; | Finally.cs:233:10:233:12 | M12 |
 | Finally.cs:258:31:258:45 | "Outer finally" | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:258:31:258:45 | [finally: exception(Exception)] "Outer finally" | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:258:31:258:45 | [finally: exception(ExceptionA)] "Outer finally" | Finally.cs:233:10:233:12 | M12 |
 | Finally.cs:260:9:260:33 | call to method WriteLine | Finally.cs:233:10:233:12 | M12 |
 | Finally.cs:260:9:260:34 | ...; | Finally.cs:233:10:233:12 | M12 |
 | Finally.cs:260:27:260:32 | "Done" | Finally.cs:233:10:233:12 | M12 |
@@ -2650,24 +1987,15 @@ nodeEnclosing
 | Finally.cs:267:13:267:34 | call to method WriteLine | Finally.cs:263:10:263:12 | M13 |
 | Finally.cs:267:13:267:35 | ...; | Finally.cs:263:10:263:12 | M13 |
 | Finally.cs:267:31:267:33 | "1" | Finally.cs:263:10:263:12 | M13 |
-| Finally.cs:270:9:273:9 | [finally: exception(Exception)] {...} | Finally.cs:263:10:263:12 | M13 |
 | Finally.cs:270:9:273:9 | {...} | Finally.cs:263:10:263:12 | M13 |
-| Finally.cs:271:13:271:34 | [finally: exception(Exception)] call to method WriteLine | Finally.cs:263:10:263:12 | M13 |
 | Finally.cs:271:13:271:34 | call to method WriteLine | Finally.cs:263:10:263:12 | M13 |
 | Finally.cs:271:13:271:35 | ...; | Finally.cs:263:10:263:12 | M13 |
-| Finally.cs:271:13:271:35 | [finally: exception(Exception)] ...; | Finally.cs:263:10:263:12 | M13 |
 | Finally.cs:271:31:271:33 | "3" | Finally.cs:263:10:263:12 | M13 |
-| Finally.cs:271:31:271:33 | [finally: exception(Exception)] "3" | Finally.cs:263:10:263:12 | M13 |
-| Finally.cs:272:13:272:13 | [finally: exception(Exception)] access to parameter i | Finally.cs:263:10:263:12 | M13 |
 | Finally.cs:272:13:272:13 | access to parameter i | Finally.cs:263:10:263:12 | M13 |
 | Finally.cs:272:13:272:18 | ... + ... | Finally.cs:263:10:263:12 | M13 |
 | Finally.cs:272:13:272:18 | ... = ... | Finally.cs:263:10:263:12 | M13 |
-| Finally.cs:272:13:272:18 | [finally: exception(Exception)] ... + ... | Finally.cs:263:10:263:12 | M13 |
-| Finally.cs:272:13:272:18 | [finally: exception(Exception)] ... = ... | Finally.cs:263:10:263:12 | M13 |
 | Finally.cs:272:13:272:19 | ...; | Finally.cs:263:10:263:12 | M13 |
-| Finally.cs:272:13:272:19 | [finally: exception(Exception)] ...; | Finally.cs:263:10:263:12 | M13 |
 | Finally.cs:272:18:272:18 | 3 | Finally.cs:263:10:263:12 | M13 |
-| Finally.cs:272:18:272:18 | [finally: exception(Exception)] 3 | Finally.cs:263:10:263:12 | M13 |
 | Foreach.cs:4:7:4:13 | call to constructor Object | Foreach.cs:4:7:4:13 | Foreach |
 | Foreach.cs:4:7:4:13 | enter Foreach | Foreach.cs:4:7:4:13 | Foreach |
 | Foreach.cs:4:7:4:13 | exit Foreach | Foreach.cs:4:7:4:13 | Foreach |
@@ -2964,7 +2292,6 @@ nodeEnclosing
 | LoopUnrolling.cs:9:13:9:28 | ... == ... | LoopUnrolling.cs:7:10:7:11 | M1 |
 | LoopUnrolling.cs:9:28:9:28 | 0 | LoopUnrolling.cs:7:10:7:11 | M1 |
 | LoopUnrolling.cs:10:13:10:19 | return ...; | LoopUnrolling.cs:7:10:7:11 | M1 |
-| LoopUnrolling.cs:11:9:12:35 | [unroll (line 11)] foreach (... ... in ...) ... | LoopUnrolling.cs:7:10:7:11 | M1 |
 | LoopUnrolling.cs:11:9:12:35 | foreach (... ... in ...) ... | LoopUnrolling.cs:7:10:7:11 | M1 |
 | LoopUnrolling.cs:11:22:11:24 | String arg | LoopUnrolling.cs:7:10:7:11 | M1 |
 | LoopUnrolling.cs:11:29:11:32 | access to parameter args | LoopUnrolling.cs:7:10:7:11 | M1 |
@@ -2983,7 +2310,6 @@ nodeEnclosing
 | LoopUnrolling.cs:17:33:17:35 | "a" | LoopUnrolling.cs:15:10:15:11 | M2 |
 | LoopUnrolling.cs:17:38:17:40 | "b" | LoopUnrolling.cs:15:10:15:11 | M2 |
 | LoopUnrolling.cs:17:43:17:45 | "c" | LoopUnrolling.cs:15:10:15:11 | M2 |
-| LoopUnrolling.cs:18:9:19:33 | [unroll (line 18)] foreach (... ... in ...) ... | LoopUnrolling.cs:15:10:15:11 | M2 |
 | LoopUnrolling.cs:18:9:19:33 | foreach (... ... in ...) ... | LoopUnrolling.cs:15:10:15:11 | M2 |
 | LoopUnrolling.cs:18:22:18:22 | String x | LoopUnrolling.cs:15:10:15:11 | M2 |
 | LoopUnrolling.cs:18:27:18:28 | access to local variable xs | LoopUnrolling.cs:15:10:15:11 | M2 |
@@ -2997,7 +2323,6 @@ nodeEnclosing
 | LoopUnrolling.cs:24:9:26:40 | foreach (... ... in ...) ... | LoopUnrolling.cs:22:10:22:11 | M3 |
 | LoopUnrolling.cs:24:22:24:24 | Char arg | LoopUnrolling.cs:22:10:22:11 | M3 |
 | LoopUnrolling.cs:24:29:24:32 | access to parameter args | LoopUnrolling.cs:22:10:22:11 | M3 |
-| LoopUnrolling.cs:25:13:26:40 | [unroll (line 25)] foreach (... ... in ...) ... | LoopUnrolling.cs:22:10:22:11 | M3 |
 | LoopUnrolling.cs:25:13:26:40 | foreach (... ... in ...) ... | LoopUnrolling.cs:22:10:22:11 | M3 |
 | LoopUnrolling.cs:25:26:25:29 | Char arg0 | LoopUnrolling.cs:22:10:22:11 | M3 |
 | LoopUnrolling.cs:25:34:25:37 | access to parameter args | LoopUnrolling.cs:22:10:22:11 | M3 |
@@ -3012,8 +2337,12 @@ nodeEnclosing
 | LoopUnrolling.cs:31:13:31:30 | String[] xs = ... | LoopUnrolling.cs:29:10:29:11 | M4 |
 | LoopUnrolling.cs:31:18:31:30 | array creation of type String[] | LoopUnrolling.cs:29:10:29:11 | M4 |
 | LoopUnrolling.cs:31:29:31:29 | 0 | LoopUnrolling.cs:29:10:29:11 | M4 |
-| LoopUnrolling.cs:32:9:33:33 | [skip (line 32)] foreach (... ... in ...) ... | LoopUnrolling.cs:29:10:29:11 | M4 |
+| LoopUnrolling.cs:32:9:33:33 | foreach (... ... in ...) ... | LoopUnrolling.cs:29:10:29:11 | M4 |
+| LoopUnrolling.cs:32:22:32:22 | String x | LoopUnrolling.cs:29:10:29:11 | M4 |
 | LoopUnrolling.cs:32:27:32:28 | access to local variable xs | LoopUnrolling.cs:29:10:29:11 | M4 |
+| LoopUnrolling.cs:33:13:33:32 | call to method WriteLine | LoopUnrolling.cs:29:10:29:11 | M4 |
+| LoopUnrolling.cs:33:13:33:33 | ...; | LoopUnrolling.cs:29:10:29:11 | M4 |
+| LoopUnrolling.cs:33:31:33:31 | access to local variable x | LoopUnrolling.cs:29:10:29:11 | M4 |
 | LoopUnrolling.cs:36:10:36:11 | enter M5 | LoopUnrolling.cs:36:10:36:11 | M5 |
 | LoopUnrolling.cs:36:10:36:11 | exit M5 | LoopUnrolling.cs:36:10:36:11 | M5 |
 | LoopUnrolling.cs:36:10:36:11 | exit M5 (normal) | LoopUnrolling.cs:36:10:36:11 | M5 |
@@ -3034,11 +2363,9 @@ nodeEnclosing
 | LoopUnrolling.cs:39:33:39:35 | "0" | LoopUnrolling.cs:36:10:36:11 | M5 |
 | LoopUnrolling.cs:39:38:39:40 | "1" | LoopUnrolling.cs:36:10:36:11 | M5 |
 | LoopUnrolling.cs:39:43:39:45 | "2" | LoopUnrolling.cs:36:10:36:11 | M5 |
-| LoopUnrolling.cs:40:9:42:41 | [unroll (line 40)] foreach (... ... in ...) ... | LoopUnrolling.cs:36:10:36:11 | M5 |
 | LoopUnrolling.cs:40:9:42:41 | foreach (... ... in ...) ... | LoopUnrolling.cs:36:10:36:11 | M5 |
 | LoopUnrolling.cs:40:22:40:22 | String x | LoopUnrolling.cs:36:10:36:11 | M5 |
 | LoopUnrolling.cs:40:27:40:28 | access to local variable xs | LoopUnrolling.cs:36:10:36:11 | M5 |
-| LoopUnrolling.cs:41:13:42:41 | [unroll (line 41)] foreach (... ... in ...) ... | LoopUnrolling.cs:36:10:36:11 | M5 |
 | LoopUnrolling.cs:41:13:42:41 | foreach (... ... in ...) ... | LoopUnrolling.cs:36:10:36:11 | M5 |
 | LoopUnrolling.cs:41:26:41:26 | String y | LoopUnrolling.cs:36:10:36:11 | M5 |
 | LoopUnrolling.cs:41:31:41:32 | access to local variable ys | LoopUnrolling.cs:36:10:36:11 | M5 |
@@ -3048,6 +2375,8 @@ nodeEnclosing
 | LoopUnrolling.cs:42:35:42:39 | ... + ... | LoopUnrolling.cs:36:10:36:11 | M5 |
 | LoopUnrolling.cs:42:39:42:39 | access to local variable y | LoopUnrolling.cs:36:10:36:11 | M5 |
 | LoopUnrolling.cs:45:10:45:11 | enter M6 | LoopUnrolling.cs:45:10:45:11 | M6 |
+| LoopUnrolling.cs:45:10:45:11 | exit M6 | LoopUnrolling.cs:45:10:45:11 | M6 |
+| LoopUnrolling.cs:45:10:45:11 | exit M6 (normal) | LoopUnrolling.cs:45:10:45:11 | M6 |
 | LoopUnrolling.cs:46:5:53:5 | {...} | LoopUnrolling.cs:45:10:45:11 | M6 |
 | LoopUnrolling.cs:47:9:47:48 | ... ...; | LoopUnrolling.cs:45:10:45:11 | M6 |
 | LoopUnrolling.cs:47:13:47:47 | String[] xs = ... | LoopUnrolling.cs:45:10:45:11 | M6 |
@@ -3057,7 +2386,7 @@ nodeEnclosing
 | LoopUnrolling.cs:47:33:47:35 | "a" | LoopUnrolling.cs:45:10:45:11 | M6 |
 | LoopUnrolling.cs:47:38:47:40 | "b" | LoopUnrolling.cs:45:10:45:11 | M6 |
 | LoopUnrolling.cs:47:43:47:45 | "c" | LoopUnrolling.cs:45:10:45:11 | M6 |
-| LoopUnrolling.cs:48:9:52:9 | [unroll (line 48)] foreach (... ... in ...) ... | LoopUnrolling.cs:45:10:45:11 | M6 |
+| LoopUnrolling.cs:48:9:52:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:45:10:45:11 | M6 |
 | LoopUnrolling.cs:48:22:48:22 | String x | LoopUnrolling.cs:45:10:45:11 | M6 |
 | LoopUnrolling.cs:48:27:48:28 | access to local variable xs | LoopUnrolling.cs:45:10:45:11 | M6 |
 | LoopUnrolling.cs:49:9:52:9 | {...} | LoopUnrolling.cs:45:10:45:11 | M6 |
@@ -3078,32 +2407,20 @@ nodeEnclosing
 | LoopUnrolling.cs:57:33:57:35 | "a" | LoopUnrolling.cs:55:10:55:11 | M7 |
 | LoopUnrolling.cs:57:38:57:40 | "b" | LoopUnrolling.cs:55:10:55:11 | M7 |
 | LoopUnrolling.cs:57:43:57:45 | "c" | LoopUnrolling.cs:55:10:55:11 | M7 |
-| LoopUnrolling.cs:58:9:64:9 | [b (line 55): false] foreach (... ... in ...) ... | LoopUnrolling.cs:55:10:55:11 | M7 |
-| LoopUnrolling.cs:58:9:64:9 | [b (line 55): true] foreach (... ... in ...) ... | LoopUnrolling.cs:55:10:55:11 | M7 |
-| LoopUnrolling.cs:58:9:64:9 | [unroll (line 58)] foreach (... ... in ...) ... | LoopUnrolling.cs:55:10:55:11 | M7 |
+| LoopUnrolling.cs:58:9:64:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:55:10:55:11 | M7 |
 | LoopUnrolling.cs:58:22:58:22 | String x | LoopUnrolling.cs:55:10:55:11 | M7 |
-| LoopUnrolling.cs:58:22:58:22 | [b (line 55): false] String x | LoopUnrolling.cs:55:10:55:11 | M7 |
-| LoopUnrolling.cs:58:22:58:22 | [b (line 55): true] String x | LoopUnrolling.cs:55:10:55:11 | M7 |
 | LoopUnrolling.cs:58:27:58:28 | access to local variable xs | LoopUnrolling.cs:55:10:55:11 | M7 |
-| LoopUnrolling.cs:59:9:64:9 | [b (line 55): false] {...} | LoopUnrolling.cs:55:10:55:11 | M7 |
-| LoopUnrolling.cs:59:9:64:9 | [b (line 55): true] {...} | LoopUnrolling.cs:55:10:55:11 | M7 |
 | LoopUnrolling.cs:59:9:64:9 | {...} | LoopUnrolling.cs:55:10:55:11 | M7 |
-| LoopUnrolling.cs:60:13:61:37 | [b (line 55): false] if (...) ... | LoopUnrolling.cs:55:10:55:11 | M7 |
-| LoopUnrolling.cs:60:13:61:37 | [b (line 55): true] if (...) ... | LoopUnrolling.cs:55:10:55:11 | M7 |
 | LoopUnrolling.cs:60:13:61:37 | if (...) ... | LoopUnrolling.cs:55:10:55:11 | M7 |
-| LoopUnrolling.cs:60:17:60:17 | [b (line 55): false] access to parameter b | LoopUnrolling.cs:55:10:55:11 | M7 |
-| LoopUnrolling.cs:60:17:60:17 | [b (line 55): true] access to parameter b | LoopUnrolling.cs:55:10:55:11 | M7 |
 | LoopUnrolling.cs:60:17:60:17 | access to parameter b | LoopUnrolling.cs:55:10:55:11 | M7 |
-| LoopUnrolling.cs:61:17:61:36 | [b (line 55): true] call to method WriteLine | LoopUnrolling.cs:55:10:55:11 | M7 |
-| LoopUnrolling.cs:61:17:61:37 | [b (line 55): true] ...; | LoopUnrolling.cs:55:10:55:11 | M7 |
-| LoopUnrolling.cs:61:35:61:35 | [b (line 55): true] access to local variable x | LoopUnrolling.cs:55:10:55:11 | M7 |
-| LoopUnrolling.cs:62:13:63:37 | [b (line 55): false] if (...) ... | LoopUnrolling.cs:55:10:55:11 | M7 |
-| LoopUnrolling.cs:62:13:63:37 | [b (line 55): true] if (...) ... | LoopUnrolling.cs:55:10:55:11 | M7 |
-| LoopUnrolling.cs:62:17:62:17 | [b (line 55): false] access to parameter b | LoopUnrolling.cs:55:10:55:11 | M7 |
-| LoopUnrolling.cs:62:17:62:17 | [b (line 55): true] access to parameter b | LoopUnrolling.cs:55:10:55:11 | M7 |
-| LoopUnrolling.cs:63:17:63:36 | [b (line 55): true] call to method WriteLine | LoopUnrolling.cs:55:10:55:11 | M7 |
-| LoopUnrolling.cs:63:17:63:37 | [b (line 55): true] ...; | LoopUnrolling.cs:55:10:55:11 | M7 |
-| LoopUnrolling.cs:63:35:63:35 | [b (line 55): true] access to local variable x | LoopUnrolling.cs:55:10:55:11 | M7 |
+| LoopUnrolling.cs:61:17:61:36 | call to method WriteLine | LoopUnrolling.cs:55:10:55:11 | M7 |
+| LoopUnrolling.cs:61:17:61:37 | ...; | LoopUnrolling.cs:55:10:55:11 | M7 |
+| LoopUnrolling.cs:61:35:61:35 | access to local variable x | LoopUnrolling.cs:55:10:55:11 | M7 |
+| LoopUnrolling.cs:62:13:63:37 | if (...) ... | LoopUnrolling.cs:55:10:55:11 | M7 |
+| LoopUnrolling.cs:62:17:62:17 | access to parameter b | LoopUnrolling.cs:55:10:55:11 | M7 |
+| LoopUnrolling.cs:63:17:63:36 | call to method WriteLine | LoopUnrolling.cs:55:10:55:11 | M7 |
+| LoopUnrolling.cs:63:17:63:37 | ...; | LoopUnrolling.cs:55:10:55:11 | M7 |
+| LoopUnrolling.cs:63:35:63:35 | access to local variable x | LoopUnrolling.cs:55:10:55:11 | M7 |
 | LoopUnrolling.cs:67:10:67:11 | enter M8 | LoopUnrolling.cs:67:10:67:11 | M8 |
 | LoopUnrolling.cs:67:10:67:11 | exit M8 | LoopUnrolling.cs:67:10:67:11 | M8 |
 | LoopUnrolling.cs:67:10:67:11 | exit M8 (normal) | LoopUnrolling.cs:67:10:67:11 | M8 |
@@ -3117,8 +2434,12 @@ nodeEnclosing
 | LoopUnrolling.cs:71:9:71:12 | access to parameter args | LoopUnrolling.cs:67:10:67:11 | M8 |
 | LoopUnrolling.cs:71:9:71:20 | call to method Clear | LoopUnrolling.cs:67:10:67:11 | M8 |
 | LoopUnrolling.cs:71:9:71:21 | ...; | LoopUnrolling.cs:67:10:67:11 | M8 |
-| LoopUnrolling.cs:72:9:73:35 | [skip (line 72)] foreach (... ... in ...) ... | LoopUnrolling.cs:67:10:67:11 | M8 |
+| LoopUnrolling.cs:72:9:73:35 | foreach (... ... in ...) ... | LoopUnrolling.cs:67:10:67:11 | M8 |
+| LoopUnrolling.cs:72:22:72:24 | String arg | LoopUnrolling.cs:67:10:67:11 | M8 |
 | LoopUnrolling.cs:72:29:72:32 | access to parameter args | LoopUnrolling.cs:67:10:67:11 | M8 |
+| LoopUnrolling.cs:73:13:73:34 | call to method WriteLine | LoopUnrolling.cs:67:10:67:11 | M8 |
+| LoopUnrolling.cs:73:13:73:35 | ...; | LoopUnrolling.cs:67:10:67:11 | M8 |
+| LoopUnrolling.cs:73:31:73:33 | access to local variable arg | LoopUnrolling.cs:67:10:67:11 | M8 |
 | LoopUnrolling.cs:76:10:76:11 | enter M9 | LoopUnrolling.cs:76:10:76:11 | M9 |
 | LoopUnrolling.cs:76:10:76:11 | exit M9 | LoopUnrolling.cs:76:10:76:11 | M9 |
 | LoopUnrolling.cs:76:10:76:11 | exit M9 (normal) | LoopUnrolling.cs:76:10:76:11 | M9 |
@@ -3128,8 +2449,13 @@ nodeEnclosing
 | LoopUnrolling.cs:78:18:78:33 | array creation of type String[,] | LoopUnrolling.cs:76:10:76:11 | M9 |
 | LoopUnrolling.cs:78:29:78:29 | 2 | LoopUnrolling.cs:76:10:76:11 | M9 |
 | LoopUnrolling.cs:78:32:78:32 | 0 | LoopUnrolling.cs:76:10:76:11 | M9 |
-| LoopUnrolling.cs:79:9:82:9 | [skip (line 79)] foreach (... ... in ...) ... | LoopUnrolling.cs:76:10:76:11 | M9 |
+| LoopUnrolling.cs:79:9:82:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:76:10:76:11 | M9 |
+| LoopUnrolling.cs:79:22:79:22 | String x | LoopUnrolling.cs:76:10:76:11 | M9 |
 | LoopUnrolling.cs:79:27:79:28 | access to local variable xs | LoopUnrolling.cs:76:10:76:11 | M9 |
+| LoopUnrolling.cs:80:9:82:9 | {...} | LoopUnrolling.cs:76:10:76:11 | M9 |
+| LoopUnrolling.cs:81:13:81:32 | call to method WriteLine | LoopUnrolling.cs:76:10:76:11 | M9 |
+| LoopUnrolling.cs:81:13:81:33 | ...; | LoopUnrolling.cs:76:10:76:11 | M9 |
+| LoopUnrolling.cs:81:31:81:31 | access to local variable x | LoopUnrolling.cs:76:10:76:11 | M9 |
 | LoopUnrolling.cs:85:10:85:12 | enter M10 | LoopUnrolling.cs:85:10:85:12 | M10 |
 | LoopUnrolling.cs:85:10:85:12 | exit M10 | LoopUnrolling.cs:85:10:85:12 | M10 |
 | LoopUnrolling.cs:85:10:85:12 | exit M10 (normal) | LoopUnrolling.cs:85:10:85:12 | M10 |
@@ -3139,8 +2465,13 @@ nodeEnclosing
 | LoopUnrolling.cs:87:18:87:33 | array creation of type String[,] | LoopUnrolling.cs:85:10:85:12 | M10 |
 | LoopUnrolling.cs:87:29:87:29 | 0 | LoopUnrolling.cs:85:10:85:12 | M10 |
 | LoopUnrolling.cs:87:32:87:32 | 2 | LoopUnrolling.cs:85:10:85:12 | M10 |
-| LoopUnrolling.cs:88:9:91:9 | [skip (line 88)] foreach (... ... in ...) ... | LoopUnrolling.cs:85:10:85:12 | M10 |
+| LoopUnrolling.cs:88:9:91:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:85:10:85:12 | M10 |
+| LoopUnrolling.cs:88:22:88:22 | String x | LoopUnrolling.cs:85:10:85:12 | M10 |
 | LoopUnrolling.cs:88:27:88:28 | access to local variable xs | LoopUnrolling.cs:85:10:85:12 | M10 |
+| LoopUnrolling.cs:89:9:91:9 | {...} | LoopUnrolling.cs:85:10:85:12 | M10 |
+| LoopUnrolling.cs:90:13:90:32 | call to method WriteLine | LoopUnrolling.cs:85:10:85:12 | M10 |
+| LoopUnrolling.cs:90:13:90:33 | ...; | LoopUnrolling.cs:85:10:85:12 | M10 |
+| LoopUnrolling.cs:90:31:90:31 | access to local variable x | LoopUnrolling.cs:85:10:85:12 | M10 |
 | LoopUnrolling.cs:94:10:94:12 | enter M11 | LoopUnrolling.cs:94:10:94:12 | M11 |
 | LoopUnrolling.cs:94:10:94:12 | exit M11 | LoopUnrolling.cs:94:10:94:12 | M11 |
 | LoopUnrolling.cs:94:10:94:12 | exit M11 (normal) | LoopUnrolling.cs:94:10:94:12 | M11 |
@@ -3150,7 +2481,6 @@ nodeEnclosing
 | LoopUnrolling.cs:96:18:96:33 | array creation of type String[,] | LoopUnrolling.cs:94:10:94:12 | M11 |
 | LoopUnrolling.cs:96:29:96:29 | 2 | LoopUnrolling.cs:94:10:94:12 | M11 |
 | LoopUnrolling.cs:96:32:96:32 | 2 | LoopUnrolling.cs:94:10:94:12 | M11 |
-| LoopUnrolling.cs:97:9:100:9 | [unroll (line 97)] foreach (... ... in ...) ... | LoopUnrolling.cs:94:10:94:12 | M11 |
 | LoopUnrolling.cs:97:9:100:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:94:10:94:12 | M11 |
 | LoopUnrolling.cs:97:22:97:22 | String x | LoopUnrolling.cs:94:10:94:12 | M11 |
 | LoopUnrolling.cs:97:27:97:28 | access to local variable xs | LoopUnrolling.cs:94:10:94:12 | M11 |
@@ -4768,6 +4098,7 @@ nodeEnclosing
 | cflow.cs:257:17:257:22 | break; | cflow.cs:240:10:240:13 | Goto |
 | cflow.cs:261:49:261:53 | enter Yield | cflow.cs:261:49:261:53 | Yield |
 | cflow.cs:261:49:261:53 | exit Yield | cflow.cs:261:49:261:53 | Yield |
+| cflow.cs:261:49:261:53 | exit Yield (abnormal) | cflow.cs:261:49:261:53 | Yield |
 | cflow.cs:261:49:261:53 | exit Yield (normal) | cflow.cs:261:49:261:53 | Yield |
 | cflow.cs:262:5:277:5 | {...} | cflow.cs:261:49:261:53 | Yield |
 | cflow.cs:263:9:263:23 | yield return ...; | cflow.cs:261:49:261:53 | Yield |
@@ -4786,10 +4117,10 @@ nodeEnclosing
 | cflow.cs:268:9:276:9 | try {...} ... | cflow.cs:261:49:261:53 | Yield |
 | cflow.cs:269:9:272:9 | {...} | cflow.cs:261:49:261:53 | Yield |
 | cflow.cs:270:13:270:24 | yield break; | cflow.cs:261:49:261:53 | Yield |
-| cflow.cs:274:9:276:9 | [finally: return] {...} | cflow.cs:261:49:261:53 | Yield |
-| cflow.cs:275:13:275:41 | [finally: return] call to method WriteLine | cflow.cs:261:49:261:53 | Yield |
-| cflow.cs:275:13:275:42 | [finally: return] ...; | cflow.cs:261:49:261:53 | Yield |
-| cflow.cs:275:31:275:40 | [finally: return] "not dead" | cflow.cs:261:49:261:53 | Yield |
+| cflow.cs:274:9:276:9 | {...} | cflow.cs:261:49:261:53 | Yield |
+| cflow.cs:275:13:275:41 | call to method WriteLine | cflow.cs:261:49:261:53 | Yield |
+| cflow.cs:275:13:275:42 | ...; | cflow.cs:261:49:261:53 | Yield |
+| cflow.cs:275:31:275:40 | "not dead" | cflow.cs:261:49:261:53 | Yield |
 | cflow.cs:282:5:282:18 | enter ControlFlowSub | cflow.cs:282:5:282:18 | ControlFlowSub |
 | cflow.cs:282:5:282:18 | exit ControlFlowSub | cflow.cs:282:5:282:18 | ControlFlowSub |
 | cflow.cs:282:5:282:18 | exit ControlFlowSub (normal) | cflow.cs:282:5:282:18 | ControlFlowSub |
@@ -4881,177 +4212,149 @@ blockEnclosing
 | Assert.cs:5:7:5:17 | enter AssertTests | Assert.cs:5:7:5:17 | AssertTests |
 | Assert.cs:7:10:7:11 | enter M1 | Assert.cs:7:10:7:11 | M1 |
 | Assert.cs:7:10:7:11 | exit M1 | Assert.cs:7:10:7:11 | M1 |
+| Assert.cs:7:10:7:11 | exit M1 (abnormal) | Assert.cs:7:10:7:11 | M1 |
 | Assert.cs:9:20:9:32 | ... ? ... : ... | Assert.cs:7:10:7:11 | M1 |
 | Assert.cs:9:24:9:27 | null | Assert.cs:7:10:7:11 | M1 |
 | Assert.cs:9:31:9:32 | "" | Assert.cs:7:10:7:11 | M1 |
-| Assert.cs:10:9:10:31 | [assertion failure] call to method Assert | Assert.cs:7:10:7:11 | M1 |
-| Assert.cs:10:9:10:31 | [assertion success] call to method Assert | Assert.cs:7:10:7:11 | M1 |
+| Assert.cs:11:9:11:36 | ...; | Assert.cs:7:10:7:11 | M1 |
 | Assert.cs:14:10:14:11 | enter M2 | Assert.cs:14:10:14:11 | M2 |
 | Assert.cs:14:10:14:11 | exit M2 | Assert.cs:14:10:14:11 | M2 |
+| Assert.cs:14:10:14:11 | exit M2 (abnormal) | Assert.cs:14:10:14:11 | M2 |
 | Assert.cs:16:20:16:32 | ... ? ... : ... | Assert.cs:14:10:14:11 | M2 |
 | Assert.cs:16:24:16:27 | null | Assert.cs:14:10:14:11 | M2 |
 | Assert.cs:16:31:16:32 | "" | Assert.cs:14:10:14:11 | M2 |
-| Assert.cs:17:9:17:24 | [assertion failure] call to method IsNull | Assert.cs:14:10:14:11 | M2 |
-| Assert.cs:17:9:17:24 | [assertion success] call to method IsNull | Assert.cs:14:10:14:11 | M2 |
+| Assert.cs:18:9:18:36 | ...; | Assert.cs:14:10:14:11 | M2 |
 | Assert.cs:21:10:21:11 | enter M3 | Assert.cs:21:10:21:11 | M3 |
 | Assert.cs:21:10:21:11 | exit M3 | Assert.cs:21:10:21:11 | M3 |
+| Assert.cs:21:10:21:11 | exit M3 (abnormal) | Assert.cs:21:10:21:11 | M3 |
 | Assert.cs:23:20:23:32 | ... ? ... : ... | Assert.cs:21:10:21:11 | M3 |
 | Assert.cs:23:24:23:27 | null | Assert.cs:21:10:21:11 | M3 |
 | Assert.cs:23:31:23:32 | "" | Assert.cs:21:10:21:11 | M3 |
-| Assert.cs:24:9:24:27 | [assertion failure] call to method IsNotNull | Assert.cs:21:10:21:11 | M3 |
-| Assert.cs:24:9:24:27 | [assertion success] call to method IsNotNull | Assert.cs:21:10:21:11 | M3 |
+| Assert.cs:25:9:25:36 | ...; | Assert.cs:21:10:21:11 | M3 |
 | Assert.cs:28:10:28:11 | enter M4 | Assert.cs:28:10:28:11 | M4 |
 | Assert.cs:28:10:28:11 | exit M4 | Assert.cs:28:10:28:11 | M4 |
+| Assert.cs:28:10:28:11 | exit M4 (abnormal) | Assert.cs:28:10:28:11 | M4 |
 | Assert.cs:30:20:30:32 | ... ? ... : ... | Assert.cs:28:10:28:11 | M4 |
 | Assert.cs:30:24:30:27 | null | Assert.cs:28:10:28:11 | M4 |
 | Assert.cs:30:31:30:32 | "" | Assert.cs:28:10:28:11 | M4 |
-| Assert.cs:31:9:31:32 | [assertion failure] call to method IsTrue | Assert.cs:28:10:28:11 | M4 |
-| Assert.cs:31:9:31:32 | [assertion success] call to method IsTrue | Assert.cs:28:10:28:11 | M4 |
+| Assert.cs:32:9:32:36 | ...; | Assert.cs:28:10:28:11 | M4 |
 | Assert.cs:35:10:35:11 | enter M5 | Assert.cs:35:10:35:11 | M5 |
 | Assert.cs:35:10:35:11 | exit M5 | Assert.cs:35:10:35:11 | M5 |
+| Assert.cs:35:10:35:11 | exit M5 (abnormal) | Assert.cs:35:10:35:11 | M5 |
 | Assert.cs:37:20:37:32 | ... ? ... : ... | Assert.cs:35:10:35:11 | M5 |
 | Assert.cs:37:24:37:27 | null | Assert.cs:35:10:35:11 | M5 |
 | Assert.cs:37:31:37:32 | "" | Assert.cs:35:10:35:11 | M5 |
-| Assert.cs:38:9:38:32 | [assertion failure] call to method IsTrue | Assert.cs:35:10:35:11 | M5 |
-| Assert.cs:38:9:38:32 | [assertion success] call to method IsTrue | Assert.cs:35:10:35:11 | M5 |
+| Assert.cs:39:9:39:36 | ...; | Assert.cs:35:10:35:11 | M5 |
 | Assert.cs:42:10:42:11 | enter M6 | Assert.cs:42:10:42:11 | M6 |
 | Assert.cs:42:10:42:11 | exit M6 | Assert.cs:42:10:42:11 | M6 |
+| Assert.cs:42:10:42:11 | exit M6 (abnormal) | Assert.cs:42:10:42:11 | M6 |
 | Assert.cs:44:20:44:32 | ... ? ... : ... | Assert.cs:42:10:42:11 | M6 |
 | Assert.cs:44:24:44:27 | null | Assert.cs:42:10:42:11 | M6 |
 | Assert.cs:44:31:44:32 | "" | Assert.cs:42:10:42:11 | M6 |
-| Assert.cs:45:9:45:33 | [assertion failure] call to method IsFalse | Assert.cs:42:10:42:11 | M6 |
-| Assert.cs:45:9:45:33 | [assertion success] call to method IsFalse | Assert.cs:42:10:42:11 | M6 |
+| Assert.cs:46:9:46:36 | ...; | Assert.cs:42:10:42:11 | M6 |
 | Assert.cs:49:10:49:11 | enter M7 | Assert.cs:49:10:49:11 | M7 |
 | Assert.cs:49:10:49:11 | exit M7 | Assert.cs:49:10:49:11 | M7 |
+| Assert.cs:49:10:49:11 | exit M7 (abnormal) | Assert.cs:49:10:49:11 | M7 |
 | Assert.cs:51:20:51:32 | ... ? ... : ... | Assert.cs:49:10:49:11 | M7 |
 | Assert.cs:51:24:51:27 | null | Assert.cs:49:10:49:11 | M7 |
 | Assert.cs:51:31:51:32 | "" | Assert.cs:49:10:49:11 | M7 |
-| Assert.cs:52:9:52:33 | [assertion failure] call to method IsFalse | Assert.cs:49:10:49:11 | M7 |
-| Assert.cs:52:9:52:33 | [assertion success] call to method IsFalse | Assert.cs:49:10:49:11 | M7 |
+| Assert.cs:53:9:53:36 | ...; | Assert.cs:49:10:49:11 | M7 |
 | Assert.cs:56:10:56:11 | enter M8 | Assert.cs:56:10:56:11 | M8 |
 | Assert.cs:56:10:56:11 | exit M8 | Assert.cs:56:10:56:11 | M8 |
-| Assert.cs:58:24:58:27 | [b (line 56): true] null | Assert.cs:56:10:56:11 | M8 |
-| Assert.cs:58:31:58:32 | [b (line 56): false] "" | Assert.cs:56:10:56:11 | M8 |
-| Assert.cs:59:9:59:37 | [assertion failure] call to method IsTrue | Assert.cs:56:10:56:11 | M8 |
-| Assert.cs:59:9:59:37 | [assertion success] call to method IsTrue | Assert.cs:56:10:56:11 | M8 |
-| Assert.cs:59:23:59:36 | [false] ... && ... | Assert.cs:56:10:56:11 | M8 |
-| Assert.cs:59:23:59:36 | [true] ... && ... | Assert.cs:56:10:56:11 | M8 |
-| Assert.cs:59:36:59:36 | [b (line 56): false] access to parameter b | Assert.cs:56:10:56:11 | M8 |
-| Assert.cs:59:36:59:36 | [b (line 56): true] access to parameter b | Assert.cs:56:10:56:11 | M8 |
+| Assert.cs:56:10:56:11 | exit M8 (abnormal) | Assert.cs:56:10:56:11 | M8 |
+| Assert.cs:58:20:58:32 | ... ? ... : ... | Assert.cs:56:10:56:11 | M8 |
+| Assert.cs:58:24:58:27 | null | Assert.cs:56:10:56:11 | M8 |
+| Assert.cs:58:31:58:32 | "" | Assert.cs:56:10:56:11 | M8 |
+| Assert.cs:59:23:59:36 | ... && ... | Assert.cs:56:10:56:11 | M8 |
+| Assert.cs:59:36:59:36 | access to parameter b | Assert.cs:56:10:56:11 | M8 |
+| Assert.cs:60:9:60:36 | ...; | Assert.cs:56:10:56:11 | M8 |
 | Assert.cs:63:10:63:11 | enter M9 | Assert.cs:63:10:63:11 | M9 |
 | Assert.cs:63:10:63:11 | exit M9 | Assert.cs:63:10:63:11 | M9 |
-| Assert.cs:65:24:65:27 | [b (line 63): true] null | Assert.cs:63:10:63:11 | M9 |
-| Assert.cs:65:31:65:32 | [b (line 63): false] "" | Assert.cs:63:10:63:11 | M9 |
-| Assert.cs:66:9:66:38 | [assertion failure] call to method IsFalse | Assert.cs:63:10:63:11 | M9 |
-| Assert.cs:66:9:66:38 | [assertion success] call to method IsFalse | Assert.cs:63:10:63:11 | M9 |
-| Assert.cs:66:24:66:37 | [false] ... \|\| ... | Assert.cs:63:10:63:11 | M9 |
-| Assert.cs:66:24:66:37 | [true] ... \|\| ... | Assert.cs:63:10:63:11 | M9 |
-| Assert.cs:66:37:66:37 | [b (line 63): false] access to parameter b | Assert.cs:63:10:63:11 | M9 |
-| Assert.cs:66:37:66:37 | [b (line 63): true] access to parameter b | Assert.cs:63:10:63:11 | M9 |
+| Assert.cs:63:10:63:11 | exit M9 (abnormal) | Assert.cs:63:10:63:11 | M9 |
+| Assert.cs:65:20:65:32 | ... ? ... : ... | Assert.cs:63:10:63:11 | M9 |
+| Assert.cs:65:24:65:27 | null | Assert.cs:63:10:63:11 | M9 |
+| Assert.cs:65:31:65:32 | "" | Assert.cs:63:10:63:11 | M9 |
+| Assert.cs:66:24:66:37 | ... \|\| ... | Assert.cs:63:10:63:11 | M9 |
+| Assert.cs:66:37:66:37 | access to parameter b | Assert.cs:63:10:63:11 | M9 |
+| Assert.cs:67:9:67:36 | ...; | Assert.cs:63:10:63:11 | M9 |
 | Assert.cs:70:10:70:12 | enter M10 | Assert.cs:70:10:70:12 | M10 |
 | Assert.cs:70:10:70:12 | exit M10 | Assert.cs:70:10:70:12 | M10 |
-| Assert.cs:72:24:72:27 | [b (line 70): true] null | Assert.cs:70:10:70:12 | M10 |
-| Assert.cs:72:31:72:32 | [b (line 70): false] "" | Assert.cs:70:10:70:12 | M10 |
-| Assert.cs:73:9:73:37 | [assertion failure] call to method IsTrue | Assert.cs:70:10:70:12 | M10 |
-| Assert.cs:73:9:73:37 | [assertion success] call to method IsTrue | Assert.cs:70:10:70:12 | M10 |
-| Assert.cs:73:23:73:36 | [false] ... && ... | Assert.cs:70:10:70:12 | M10 |
-| Assert.cs:73:23:73:36 | [true] ... && ... | Assert.cs:70:10:70:12 | M10 |
-| Assert.cs:73:36:73:36 | [b (line 70): false] access to parameter b | Assert.cs:70:10:70:12 | M10 |
-| Assert.cs:73:36:73:36 | [b (line 70): true] access to parameter b | Assert.cs:70:10:70:12 | M10 |
+| Assert.cs:70:10:70:12 | exit M10 (abnormal) | Assert.cs:70:10:70:12 | M10 |
+| Assert.cs:72:20:72:32 | ... ? ... : ... | Assert.cs:70:10:70:12 | M10 |
+| Assert.cs:72:24:72:27 | null | Assert.cs:70:10:70:12 | M10 |
+| Assert.cs:72:31:72:32 | "" | Assert.cs:70:10:70:12 | M10 |
+| Assert.cs:73:23:73:36 | ... && ... | Assert.cs:70:10:70:12 | M10 |
+| Assert.cs:73:36:73:36 | access to parameter b | Assert.cs:70:10:70:12 | M10 |
+| Assert.cs:74:9:74:36 | ...; | Assert.cs:70:10:70:12 | M10 |
 | Assert.cs:77:10:77:12 | enter M11 | Assert.cs:77:10:77:12 | M11 |
 | Assert.cs:77:10:77:12 | exit M11 | Assert.cs:77:10:77:12 | M11 |
-| Assert.cs:79:24:79:27 | [b (line 77): true] null | Assert.cs:77:10:77:12 | M11 |
-| Assert.cs:79:31:79:32 | [b (line 77): false] "" | Assert.cs:77:10:77:12 | M11 |
-| Assert.cs:80:9:80:38 | [assertion failure] call to method IsFalse | Assert.cs:77:10:77:12 | M11 |
-| Assert.cs:80:9:80:38 | [assertion success] call to method IsFalse | Assert.cs:77:10:77:12 | M11 |
-| Assert.cs:80:24:80:37 | [false] ... \|\| ... | Assert.cs:77:10:77:12 | M11 |
-| Assert.cs:80:24:80:37 | [true] ... \|\| ... | Assert.cs:77:10:77:12 | M11 |
-| Assert.cs:80:37:80:37 | [b (line 77): false] access to parameter b | Assert.cs:77:10:77:12 | M11 |
-| Assert.cs:80:37:80:37 | [b (line 77): true] access to parameter b | Assert.cs:77:10:77:12 | M11 |
+| Assert.cs:77:10:77:12 | exit M11 (abnormal) | Assert.cs:77:10:77:12 | M11 |
+| Assert.cs:79:20:79:32 | ... ? ... : ... | Assert.cs:77:10:77:12 | M11 |
+| Assert.cs:79:24:79:27 | null | Assert.cs:77:10:77:12 | M11 |
+| Assert.cs:79:31:79:32 | "" | Assert.cs:77:10:77:12 | M11 |
+| Assert.cs:80:24:80:37 | ... \|\| ... | Assert.cs:77:10:77:12 | M11 |
+| Assert.cs:80:37:80:37 | access to parameter b | Assert.cs:77:10:77:12 | M11 |
+| Assert.cs:81:9:81:36 | ...; | Assert.cs:77:10:77:12 | M11 |
 | Assert.cs:84:10:84:12 | enter M12 | Assert.cs:84:10:84:12 | M12 |
 | Assert.cs:84:10:84:12 | exit M12 | Assert.cs:84:10:84:12 | M12 |
 | Assert.cs:84:10:84:12 | exit M12 (abnormal) | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:87:9:87:31 | [assertion failure, b (line 84): false] call to method Assert | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:87:9:87:31 | [assertion failure, b (line 84): true] call to method Assert | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:90:24:90:25 | [b (line 84): false] "" | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:91:9:91:24 | [assertion failure, b (line 84): false] call to method IsNull | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:91:9:91:24 | [assertion failure, b (line 84): true] call to method IsNull | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:94:24:94:25 | [b (line 84): false] "" | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:95:9:95:27 | [assertion failure, b (line 84): false] call to method IsNotNull | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:95:9:95:27 | [assertion failure, b (line 84): true] call to method IsNotNull | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:98:24:98:25 | [b (line 84): false] "" | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:99:9:99:32 | [assertion failure, b (line 84): false] call to method IsTrue | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:99:9:99:32 | [assertion failure, b (line 84): true] call to method IsTrue | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:102:24:102:25 | [b (line 84): false] "" | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:103:9:103:32 | [assertion failure, b (line 84): false] call to method IsTrue | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:103:9:103:32 | [assertion failure, b (line 84): true] call to method IsTrue | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:106:24:106:25 | [b (line 84): false] "" | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:107:9:107:33 | [assertion failure, b (line 84): false] call to method IsFalse | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:107:9:107:33 | [assertion failure, b (line 84): true] call to method IsFalse | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): false] call to method IsFalse | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:110:24:110:25 | [b (line 84): false] "" | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:111:9:111:33 | [assertion failure, b (line 84): false] call to method IsFalse | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:111:9:111:33 | [assertion failure, b (line 84): true] call to method IsFalse | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): false] call to method IsFalse | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:114:24:114:25 | [b (line 84): false] "" | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:115:9:115:37 | [assertion failure, b (line 84): false] call to method IsTrue | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:115:9:115:37 | [assertion failure, b (line 84): true] call to method IsTrue | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:115:23:115:36 | [false, b (line 84): false] ... && ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:115:23:115:36 | [false, b (line 84): true] ... && ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:115:36:115:36 | [b (line 84): false] access to parameter b | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:126:17:126:20 | [b (line 84): true] null | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:127:24:127:38 | [false] ... \|\| ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:127:24:127:38 | [true] ... \|\| ... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:127:37:127:38 | [false] !... | Assert.cs:84:10:84:12 | M12 |
-| Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:86:24:86:27 | null | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:86:31:86:32 | "" | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:90:17:90:20 | null | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:90:24:90:25 | "" | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:94:17:94:20 | null | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:94:24:94:25 | "" | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:98:17:98:20 | null | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:98:24:98:25 | "" | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:102:17:102:20 | null | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:102:24:102:25 | "" | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:106:17:106:20 | null | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:106:24:106:25 | "" | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:110:17:110:20 | null | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:110:24:110:25 | "" | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:114:17:114:20 | null | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:114:24:114:25 | "" | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:115:36:115:36 | access to parameter b | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:118:17:118:20 | null | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:118:24:118:25 | "" | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:119:38:119:38 | access to parameter b | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:122:17:122:20 | null | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:122:24:122:25 | "" | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:123:36:123:36 | access to parameter b | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:126:17:126:20 | null | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:126:24:126:25 | "" | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:127:38:127:38 | access to parameter b | Assert.cs:84:10:84:12 | M12 |
+| Assert.cs:128:9:128:36 | ...; | Assert.cs:84:10:84:12 | M12 |
 | Assert.cs:131:18:131:32 | enter AssertTrueFalse | Assert.cs:131:18:131:32 | AssertTrueFalse |
 | Assert.cs:138:10:138:12 | enter M13 | Assert.cs:138:10:138:12 | M13 |
 | Assert.cs:138:10:138:12 | exit M13 | Assert.cs:138:10:138:12 | M13 |
 | Assert.cs:138:10:138:12 | exit M13 (abnormal) | Assert.cs:138:10:138:12 | M13 |
-| Assert.cs:140:29:140:30 | [assertion failure] access to parameter b2 | Assert.cs:138:10:138:12 | M13 |
-| Assert.cs:140:29:140:30 | access to parameter b2 | Assert.cs:138:10:138:12 | M13 |
-| Assert.cs:140:33:140:34 | [assertion failure] access to parameter b3 | Assert.cs:138:10:138:12 | M13 |
-| Assert.cs:140:33:140:34 | [assertion failure] access to parameter b3 | Assert.cs:138:10:138:12 | M13 |
-| Assert.cs:140:33:140:34 | [assertion success] access to parameter b3 | Assert.cs:138:10:138:12 | M13 |
+| Assert.cs:141:9:141:15 | return ...; | Assert.cs:138:10:138:12 | M13 |
 | Assignments.cs:1:7:1:17 | enter Assignments | Assignments.cs:1:7:1:17 | Assignments |
 | Assignments.cs:3:10:3:10 | enter M | Assignments.cs:3:10:3:10 | M |
 | Assignments.cs:14:18:14:35 | enter (...) => ... | Assignments.cs:14:18:14:35 | (...) => ... |
@@ -5070,28 +4373,21 @@ blockEnclosing
 | BreakInTry.cs:27:21:27:26 | break; | BreakInTry.cs:20:10:20:11 | M2 |
 | BreakInTry.cs:30:13:33:13 | {...} | BreakInTry.cs:20:10:20:11 | M2 |
 | BreakInTry.cs:32:21:32:21 | ; | BreakInTry.cs:20:10:20:11 | M2 |
-| BreakInTry.cs:32:21:32:21 | [finally: break] ; | BreakInTry.cs:20:10:20:11 | M2 |
 | BreakInTry.cs:35:7:35:7 | ; | BreakInTry.cs:20:10:20:11 | M2 |
 | BreakInTry.cs:38:10:38:11 | enter M3 | BreakInTry.cs:38:10:38:11 | M3 |
 | BreakInTry.cs:38:10:38:11 | exit M3 (normal) | BreakInTry.cs:38:10:38:11 | M3 |
 | BreakInTry.cs:43:17:43:23 | return ...; | BreakInTry.cs:38:10:38:11 | M3 |
 | BreakInTry.cs:46:9:52:9 | {...} | BreakInTry.cs:38:10:38:11 | M3 |
-| BreakInTry.cs:47:13:51:13 | [finally: return] foreach (... ... in ...) ... | BreakInTry.cs:38:10:38:11 | M3 |
 | BreakInTry.cs:47:13:51:13 | foreach (... ... in ...) ... | BreakInTry.cs:38:10:38:11 | M3 |
 | BreakInTry.cs:47:26:47:28 | String arg | BreakInTry.cs:38:10:38:11 | M3 |
-| BreakInTry.cs:47:26:47:28 | [finally: return] String arg | BreakInTry.cs:38:10:38:11 | M3 |
-| BreakInTry.cs:50:21:50:26 | [finally: return] break; | BreakInTry.cs:38:10:38:11 | M3 |
 | BreakInTry.cs:50:21:50:26 | break; | BreakInTry.cs:38:10:38:11 | M3 |
 | BreakInTry.cs:53:7:53:7 | ; | BreakInTry.cs:38:10:38:11 | M3 |
 | BreakInTry.cs:56:10:56:11 | enter M4 | BreakInTry.cs:56:10:56:11 | M4 |
 | BreakInTry.cs:56:10:56:11 | exit M4 (normal) | BreakInTry.cs:56:10:56:11 | M4 |
 | BreakInTry.cs:61:17:61:23 | return ...; | BreakInTry.cs:56:10:56:11 | M4 |
 | BreakInTry.cs:64:9:70:9 | {...} | BreakInTry.cs:56:10:56:11 | M4 |
-| BreakInTry.cs:65:13:69:13 | [finally: return] foreach (... ... in ...) ... | BreakInTry.cs:56:10:56:11 | M4 |
 | BreakInTry.cs:65:13:69:13 | foreach (... ... in ...) ... | BreakInTry.cs:56:10:56:11 | M4 |
 | BreakInTry.cs:65:26:65:28 | String arg | BreakInTry.cs:56:10:56:11 | M4 |
-| BreakInTry.cs:65:26:65:28 | [finally: return] String arg | BreakInTry.cs:56:10:56:11 | M4 |
-| BreakInTry.cs:68:21:68:26 | [finally: return] break; | BreakInTry.cs:56:10:56:11 | M4 |
 | BreakInTry.cs:68:21:68:26 | break; | BreakInTry.cs:56:10:56:11 | M4 |
 | CompileTimeOperators.cs:3:7:3:26 | enter CompileTimeOperators | CompileTimeOperators.cs:3:7:3:26 | CompileTimeOperators |
 | CompileTimeOperators.cs:5:9:5:15 | enter Default | CompileTimeOperators.cs:5:9:5:15 | Default |
@@ -5100,6 +4396,10 @@ blockEnclosing
 | CompileTimeOperators.cs:20:12:20:17 | enter Nameof | CompileTimeOperators.cs:20:12:20:17 | Nameof |
 | CompileTimeOperators.cs:26:7:26:22 | enter GotoInTryFinally | CompileTimeOperators.cs:26:7:26:22 | GotoInTryFinally |
 | CompileTimeOperators.cs:28:10:28:10 | enter M | CompileTimeOperators.cs:28:10:28:10 | M |
+| CompileTimeOperators.cs:28:10:28:10 | exit M | CompileTimeOperators.cs:28:10:28:10 | M |
+| CompileTimeOperators.cs:28:10:28:10 | exit M (abnormal) | CompileTimeOperators.cs:28:10:28:10 | M |
+| CompileTimeOperators.cs:39:9:39:34 | ...; | CompileTimeOperators.cs:28:10:28:10 | M |
+| CompileTimeOperators.cs:40:9:40:11 | End: | CompileTimeOperators.cs:28:10:28:10 | M |
 | ConditionalAccess.cs:1:7:1:23 | enter ConditionalAccess | ConditionalAccess.cs:1:7:1:23 | ConditionalAccess |
 | ConditionalAccess.cs:3:12:3:13 | enter M1 | ConditionalAccess.cs:3:12:3:13 | M1 |
 | ConditionalAccess.cs:3:12:3:13 | exit M1 (normal) | ConditionalAccess.cs:3:12:3:13 | M1 |
@@ -5140,49 +4440,41 @@ blockEnclosing
 | Conditions.cs:1:7:1:16 | enter Conditions | Conditions.cs:1:7:1:16 | Conditions |
 | Conditions.cs:3:10:3:19 | enter IncrOrDecr | Conditions.cs:3:10:3:19 | IncrOrDecr |
 | Conditions.cs:3:10:3:19 | exit IncrOrDecr (normal) | Conditions.cs:3:10:3:19 | IncrOrDecr |
-| Conditions.cs:6:13:6:16 | [inc (line 3): true] ...; | Conditions.cs:3:10:3:19 | IncrOrDecr |
-| Conditions.cs:7:9:8:16 | [inc (line 3): false] if (...) ... | Conditions.cs:3:10:3:19 | IncrOrDecr |
+| Conditions.cs:6:13:6:16 | ...; | Conditions.cs:3:10:3:19 | IncrOrDecr |
+| Conditions.cs:7:9:8:16 | if (...) ... | Conditions.cs:3:10:3:19 | IncrOrDecr |
 | Conditions.cs:7:13:7:16 | [false] !... | Conditions.cs:3:10:3:19 | IncrOrDecr |
 | Conditions.cs:7:13:7:16 | [true] !... | Conditions.cs:3:10:3:19 | IncrOrDecr |
 | Conditions.cs:8:13:8:16 | ...; | Conditions.cs:3:10:3:19 | IncrOrDecr |
 | Conditions.cs:11:9:11:10 | enter M1 | Conditions.cs:11:9:11:10 | M1 |
-| Conditions.cs:15:13:15:16 | [b (line 11): true] ...; | Conditions.cs:11:9:11:10 | M1 |
-| Conditions.cs:16:9:18:20 | [b (line 11): false] if (...) ... | Conditions.cs:11:9:11:10 | M1 |
-| Conditions.cs:17:13:18:20 | [b (line 11): false] if (...) ... | Conditions.cs:11:9:11:10 | M1 |
-| Conditions.cs:17:13:18:20 | [b (line 11): true] if (...) ... | Conditions.cs:11:9:11:10 | M1 |
+| Conditions.cs:15:13:15:16 | ...; | Conditions.cs:11:9:11:10 | M1 |
+| Conditions.cs:16:9:18:20 | if (...) ... | Conditions.cs:11:9:11:10 | M1 |
+| Conditions.cs:17:13:18:20 | if (...) ... | Conditions.cs:11:9:11:10 | M1 |
 | Conditions.cs:17:17:17:18 | [false] !... | Conditions.cs:11:9:11:10 | M1 |
 | Conditions.cs:17:17:17:18 | [true] !... | Conditions.cs:11:9:11:10 | M1 |
 | Conditions.cs:18:17:18:20 | ...; | Conditions.cs:11:9:11:10 | M1 |
 | Conditions.cs:19:16:19:16 | access to local variable x | Conditions.cs:11:9:11:10 | M1 |
 | Conditions.cs:22:9:22:10 | enter M2 | Conditions.cs:22:9:22:10 | M2 |
 | Conditions.cs:26:13:27:20 | if (...) ... | Conditions.cs:22:9:22:10 | M2 |
-| Conditions.cs:27:17:27:20 | [b2 (line 22): true] ...; | Conditions.cs:22:9:22:10 | M2 |
-| Conditions.cs:28:9:29:16 | [b2 (line 22): false] if (...) ... | Conditions.cs:22:9:22:10 | M2 |
+| Conditions.cs:27:17:27:20 | ...; | Conditions.cs:22:9:22:10 | M2 |
 | Conditions.cs:28:9:29:16 | if (...) ... | Conditions.cs:22:9:22:10 | M2 |
 | Conditions.cs:29:13:29:16 | ...; | Conditions.cs:22:9:22:10 | M2 |
 | Conditions.cs:30:16:30:16 | access to local variable x | Conditions.cs:22:9:22:10 | M2 |
 | Conditions.cs:33:9:33:10 | enter M3 | Conditions.cs:33:9:33:10 | M3 |
 | Conditions.cs:38:13:38:20 | ...; | Conditions.cs:33:9:33:10 | M3 |
 | Conditions.cs:39:9:40:16 | if (...) ... | Conditions.cs:33:9:33:10 | M3 |
-| Conditions.cs:40:13:40:16 | [b2 (line 39): true] ...; | Conditions.cs:33:9:33:10 | M3 |
-| Conditions.cs:41:9:42:16 | [b2 (line 39): false] if (...) ... | Conditions.cs:33:9:33:10 | M3 |
+| Conditions.cs:40:13:40:16 | ...; | Conditions.cs:33:9:33:10 | M3 |
+| Conditions.cs:41:9:42:16 | if (...) ... | Conditions.cs:33:9:33:10 | M3 |
 | Conditions.cs:42:13:42:16 | ...; | Conditions.cs:33:9:33:10 | M3 |
 | Conditions.cs:43:16:43:16 | access to local variable x | Conditions.cs:33:9:33:10 | M3 |
 | Conditions.cs:46:9:46:10 | enter M4 | Conditions.cs:46:9:46:10 | M4 |
-| Conditions.cs:49:16:49:16 | [b (line 46): false] access to parameter x | Conditions.cs:46:9:46:10 | M4 |
-| Conditions.cs:50:9:53:9 | [b (line 46): false] {...} | Conditions.cs:46:9:46:10 | M4 |
-| Conditions.cs:50:9:53:9 | [b (line 46): true] {...} | Conditions.cs:46:9:46:10 | M4 |
+| Conditions.cs:49:16:49:16 | access to parameter x | Conditions.cs:46:9:46:10 | M4 |
 | Conditions.cs:50:9:53:9 | {...} | Conditions.cs:46:9:46:10 | M4 |
-| Conditions.cs:52:17:52:20 | [b (line 46): true] ...; | Conditions.cs:46:9:46:10 | M4 |
+| Conditions.cs:52:17:52:20 | ...; | Conditions.cs:46:9:46:10 | M4 |
 | Conditions.cs:54:16:54:16 | access to local variable y | Conditions.cs:46:9:46:10 | M4 |
 | Conditions.cs:57:9:57:10 | enter M5 | Conditions.cs:57:9:57:10 | M5 |
-| Conditions.cs:60:16:60:16 | [b (line 57): false] access to parameter x | Conditions.cs:57:9:57:10 | M5 |
-| Conditions.cs:61:9:64:9 | [b (line 57): false] {...} | Conditions.cs:57:9:57:10 | M5 |
-| Conditions.cs:61:9:64:9 | [b (line 57): true] {...} | Conditions.cs:57:9:57:10 | M5 |
+| Conditions.cs:60:16:60:16 | access to parameter x | Conditions.cs:57:9:57:10 | M5 |
 | Conditions.cs:61:9:64:9 | {...} | Conditions.cs:57:9:57:10 | M5 |
-| Conditions.cs:63:17:63:20 | [b (line 57): true] ...; | Conditions.cs:57:9:57:10 | M5 |
-| Conditions.cs:65:9:66:16 | [b (line 57): false] if (...) ... | Conditions.cs:57:9:57:10 | M5 |
-| Conditions.cs:65:9:66:16 | [b (line 57): true] if (...) ... | Conditions.cs:57:9:57:10 | M5 |
+| Conditions.cs:63:17:63:20 | ...; | Conditions.cs:57:9:57:10 | M5 |
 | Conditions.cs:65:9:66:16 | if (...) ... | Conditions.cs:57:9:57:10 | M5 |
 | Conditions.cs:66:13:66:16 | ...; | Conditions.cs:57:9:57:10 | M5 |
 | Conditions.cs:67:16:67:16 | access to local variable y | Conditions.cs:57:9:57:10 | M5 |
@@ -5205,10 +4497,9 @@ blockEnclosing
 | Conditions.cs:97:17:97:20 | ...; | Conditions.cs:86:9:86:10 | M7 |
 | Conditions.cs:99:16:99:16 | access to local variable x | Conditions.cs:86:9:86:10 | M7 |
 | Conditions.cs:102:12:102:13 | enter M8 | Conditions.cs:102:12:102:13 | M8 |
-| Conditions.cs:106:13:106:20 | [b (line 102): true] ...; | Conditions.cs:102:12:102:13 | M8 |
-| Conditions.cs:107:9:109:24 | [b (line 102): false] if (...) ... | Conditions.cs:102:12:102:13 | M8 |
-| Conditions.cs:108:13:109:24 | [b (line 102): false] if (...) ... | Conditions.cs:102:12:102:13 | M8 |
-| Conditions.cs:108:13:109:24 | [b (line 102): true] if (...) ... | Conditions.cs:102:12:102:13 | M8 |
+| Conditions.cs:106:13:106:20 | ...; | Conditions.cs:102:12:102:13 | M8 |
+| Conditions.cs:107:9:109:24 | if (...) ... | Conditions.cs:102:12:102:13 | M8 |
+| Conditions.cs:108:13:109:24 | if (...) ... | Conditions.cs:102:12:102:13 | M8 |
 | Conditions.cs:108:17:108:18 | [false] !... | Conditions.cs:102:12:102:13 | M8 |
 | Conditions.cs:108:17:108:18 | [true] !... | Conditions.cs:102:12:102:13 | M8 |
 | Conditions.cs:109:17:109:24 | ...; | Conditions.cs:102:12:102:13 | M8 |
@@ -5218,26 +4509,21 @@ blockEnclosing
 | Conditions.cs:116:25:116:25 | access to local variable i | Conditions.cs:113:10:113:11 | M9 |
 | Conditions.cs:116:42:116:42 | access to local variable i | Conditions.cs:113:10:113:11 | M9 |
 | Conditions.cs:117:9:123:9 | {...} | Conditions.cs:113:10:113:11 | M9 |
-| Conditions.cs:119:17:119:21 | [false, last (line 118): true] !... | Conditions.cs:113:10:113:11 | M9 |
-| Conditions.cs:119:17:119:21 | [true, last (line 118): false] !... | Conditions.cs:113:10:113:11 | M9 |
-| Conditions.cs:120:17:120:23 | [last (line 118): false] ...; | Conditions.cs:113:10:113:11 | M9 |
-| Conditions.cs:121:13:122:25 | [last (line 118): true] if (...) ... | Conditions.cs:113:10:113:11 | M9 |
+| Conditions.cs:119:17:119:21 | [false] !... | Conditions.cs:113:10:113:11 | M9 |
+| Conditions.cs:119:17:119:21 | [true] !... | Conditions.cs:113:10:113:11 | M9 |
+| Conditions.cs:120:17:120:23 | ...; | Conditions.cs:113:10:113:11 | M9 |
+| Conditions.cs:121:13:122:25 | if (...) ... | Conditions.cs:113:10:113:11 | M9 |
 | Conditions.cs:122:17:122:25 | ...; | Conditions.cs:113:10:113:11 | M9 |
 | Conditions.cs:129:10:129:12 | enter M10 | Conditions.cs:129:10:129:12 | M10 |
-| Conditions.cs:131:16:131:19 | [Field1 (line 129): false] true | Conditions.cs:129:10:129:12 | M10 |
-| Conditions.cs:131:16:131:19 | [Field1 (line 129): true, Field2 (line 129): false] true | Conditions.cs:129:10:129:12 | M10 |
-| Conditions.cs:132:9:140:9 | [Field1 (line 129): false] {...} | Conditions.cs:129:10:129:12 | M10 |
-| Conditions.cs:132:9:140:9 | [Field1 (line 129): true, Field2 (line 129): false] {...} | Conditions.cs:129:10:129:12 | M10 |
-| Conditions.cs:132:9:140:9 | [Field1 (line 129): true, Field2 (line 129): true] {...} | Conditions.cs:129:10:129:12 | M10 |
+| Conditions.cs:131:16:131:19 | true | Conditions.cs:129:10:129:12 | M10 |
 | Conditions.cs:132:9:140:9 | {...} | Conditions.cs:129:10:129:12 | M10 |
-| Conditions.cs:134:13:139:13 | [Field1 (line 129): true, Field2 (line 129): false] {...} | Conditions.cs:129:10:129:12 | M10 |
-| Conditions.cs:134:13:139:13 | [Field1 (line 129): true, Field2 (line 129): true] {...} | Conditions.cs:129:10:129:12 | M10 |
-| Conditions.cs:134:13:139:13 | [Field1 (line 129): true] {...} | Conditions.cs:129:10:129:12 | M10 |
-| Conditions.cs:136:17:138:17 | [Field1 (line 129): true, Field2 (line 129): true] {...} | Conditions.cs:129:10:129:12 | M10 |
+| Conditions.cs:134:13:139:13 | {...} | Conditions.cs:129:10:129:12 | M10 |
+| Conditions.cs:136:17:138:17 | {...} | Conditions.cs:129:10:129:12 | M10 |
 | Conditions.cs:143:10:143:12 | enter M11 | Conditions.cs:143:10:143:12 | M11 |
 | Conditions.cs:143:10:143:12 | exit M11 (normal) | Conditions.cs:143:10:143:12 | M11 |
-| Conditions.cs:145:21:145:23 | [b (line 143): true] "a" | Conditions.cs:143:10:143:12 | M11 |
-| Conditions.cs:145:27:145:29 | [b (line 143): false] "b" | Conditions.cs:143:10:143:12 | M11 |
+| Conditions.cs:145:17:145:29 | ... ? ... : ... | Conditions.cs:143:10:143:12 | M11 |
+| Conditions.cs:145:21:145:23 | "a" | Conditions.cs:143:10:143:12 | M11 |
+| Conditions.cs:145:27:145:29 | "b" | Conditions.cs:143:10:143:12 | M11 |
 | Conditions.cs:147:13:147:49 | ...; | Conditions.cs:143:10:143:12 | M11 |
 | Conditions.cs:149:13:149:49 | ...; | Conditions.cs:143:10:143:12 | M11 |
 | ExitMethods.cs:6:7:6:17 | enter ExitMethods | ExitMethods.cs:6:7:6:17 | ExitMethods |
@@ -5248,10 +4534,8 @@ blockEnclosing
 | ExitMethods.cs:32:10:32:11 | enter M5 | ExitMethods.cs:32:10:32:11 | M5 |
 | ExitMethods.cs:38:10:38:11 | enter M6 | ExitMethods.cs:38:10:38:11 | M6 |
 | ExitMethods.cs:38:10:38:11 | exit M6 (normal) | ExitMethods.cs:38:10:38:11 | M6 |
-| ExitMethods.cs:44:9:47:9 | [exception: ArgumentException] catch (...) {...} | ExitMethods.cs:38:10:38:11 | M6 |
-| ExitMethods.cs:44:9:47:9 | [exception: Exception] catch (...) {...} | ExitMethods.cs:38:10:38:11 | M6 |
 | ExitMethods.cs:45:9:47:9 | {...} | ExitMethods.cs:38:10:38:11 | M6 |
-| ExitMethods.cs:48:9:51:9 | [exception: Exception] catch (...) {...} | ExitMethods.cs:38:10:38:11 | M6 |
+| ExitMethods.cs:48:9:51:9 | catch (...) {...} | ExitMethods.cs:38:10:38:11 | M6 |
 | ExitMethods.cs:49:9:51:9 | {...} | ExitMethods.cs:38:10:38:11 | M6 |
 | ExitMethods.cs:54:10:54:11 | enter M7 | ExitMethods.cs:54:10:54:11 | M7 |
 | ExitMethods.cs:60:10:60:11 | enter M8 | ExitMethods.cs:60:10:60:11 | M8 |
@@ -5277,14 +4561,12 @@ blockEnclosing
 | ExitMethods.cs:117:34:117:34 | 0 | ExitMethods.cs:115:16:115:34 | ExtensionMethodCall |
 | ExitMethods.cs:117:38:117:38 | 1 | ExitMethods.cs:115:16:115:34 | ExtensionMethodCall |
 | ExitMethods.cs:120:17:120:32 | enter FailingAssertion | ExitMethods.cs:120:17:120:32 | FailingAssertion |
-| ExitMethods.cs:122:9:122:28 | [assertion failure] call to method IsTrue | ExitMethods.cs:120:17:120:32 | FailingAssertion |
 | ExitMethods.cs:126:17:126:33 | enter FailingAssertion2 | ExitMethods.cs:126:17:126:33 | FailingAssertion2 |
 | ExitMethods.cs:132:10:132:20 | enter AssertFalse | ExitMethods.cs:132:10:132:20 | AssertFalse |
 | ExitMethods.cs:132:10:132:20 | exit AssertFalse | ExitMethods.cs:132:10:132:20 | AssertFalse |
-| ExitMethods.cs:132:33:132:49 | [assertion failure] call to method IsFalse | ExitMethods.cs:132:10:132:20 | AssertFalse |
-| ExitMethods.cs:132:33:132:49 | [assertion success] call to method IsFalse | ExitMethods.cs:132:10:132:20 | AssertFalse |
+| ExitMethods.cs:132:10:132:20 | exit AssertFalse (abnormal) | ExitMethods.cs:132:10:132:20 | AssertFalse |
+| ExitMethods.cs:132:10:132:20 | exit AssertFalse (normal) | ExitMethods.cs:132:10:132:20 | AssertFalse |
 | ExitMethods.cs:134:17:134:33 | enter FailingAssertion3 | ExitMethods.cs:134:17:134:33 | FailingAssertion3 |
-| ExitMethods.cs:136:9:136:25 | [assertion failure] call to method AssertFalse | ExitMethods.cs:134:17:134:33 | FailingAssertion3 |
 | ExitMethods.cs:140:17:140:42 | enter ExceptionDispatchInfoThrow | ExitMethods.cs:140:17:140:42 | ExceptionDispatchInfoThrow |
 | ExitMethods.cs:140:17:140:42 | exit ExceptionDispatchInfoThrow (abnormal) | ExitMethods.cs:140:17:140:42 | ExceptionDispatchInfoThrow |
 | ExitMethods.cs:143:13:143:43 | ...; | ExitMethods.cs:140:17:140:42 | ExceptionDispatchInfoThrow |
@@ -5296,33 +4578,35 @@ blockEnclosing
 | Finally.cs:3:14:3:20 | enter Finally | Finally.cs:3:14:3:20 | Finally |
 | Finally.cs:7:10:7:11 | enter M1 | Finally.cs:7:10:7:11 | M1 |
 | Finally.cs:7:10:7:11 | exit M1 | Finally.cs:7:10:7:11 | M1 |
-| Finally.cs:14:9:16:9 | [finally: exception(Exception)] {...} | Finally.cs:7:10:7:11 | M1 |
-| Finally.cs:14:9:16:9 | {...} | Finally.cs:7:10:7:11 | M1 |
+| Finally.cs:7:10:7:11 | exit M1 (abnormal) | Finally.cs:7:10:7:11 | M1 |
+| Finally.cs:7:10:7:11 | exit M1 (normal) | Finally.cs:7:10:7:11 | M1 |
 | Finally.cs:19:10:19:11 | enter M2 | Finally.cs:19:10:19:11 | M2 |
 | Finally.cs:19:10:19:11 | exit M2 | Finally.cs:19:10:19:11 | M2 |
 | Finally.cs:19:10:19:11 | exit M2 (abnormal) | Finally.cs:19:10:19:11 | M2 |
 | Finally.cs:19:10:19:11 | exit M2 (normal) | Finally.cs:19:10:19:11 | M2 |
 | Finally.cs:24:13:24:19 | return ...; | Finally.cs:19:10:19:11 | M2 |
-| Finally.cs:26:9:29:9 | [exception: Exception] catch (...) {...} | Finally.cs:19:10:19:11 | M2 |
-| Finally.cs:26:38:26:39 | [exception: Exception] IOException ex | Finally.cs:19:10:19:11 | M2 |
+| Finally.cs:26:9:29:9 | catch (...) {...} | Finally.cs:19:10:19:11 | M2 |
+| Finally.cs:26:38:26:39 | IOException ex | Finally.cs:19:10:19:11 | M2 |
 | Finally.cs:27:9:29:9 | {...} | Finally.cs:19:10:19:11 | M2 |
-| Finally.cs:30:9:40:9 | [exception: Exception] catch (...) {...} | Finally.cs:19:10:19:11 | M2 |
-| Finally.cs:30:41:30:42 | [exception: Exception] ArgumentException ex | Finally.cs:19:10:19:11 | M2 |
+| Finally.cs:30:9:40:9 | catch (...) {...} | Finally.cs:19:10:19:11 | M2 |
+| Finally.cs:30:41:30:42 | ArgumentException ex | Finally.cs:19:10:19:11 | M2 |
 | Finally.cs:34:27:34:32 | throw ...; | Finally.cs:19:10:19:11 | M2 |
-| Finally.cs:41:9:43:9 | [exception: Exception] catch (...) {...} | Finally.cs:19:10:19:11 | M2 |
+| Finally.cs:41:9:43:9 | catch (...) {...} | Finally.cs:19:10:19:11 | M2 |
 | Finally.cs:42:9:43:9 | {...} | Finally.cs:19:10:19:11 | M2 |
+| Finally.cs:44:9:47:9 | catch {...} | Finally.cs:19:10:19:11 | M2 |
+| Finally.cs:49:9:51:9 | {...} | Finally.cs:19:10:19:11 | M2 |
 | Finally.cs:54:10:54:11 | enter M3 | Finally.cs:54:10:54:11 | M3 |
 | Finally.cs:54:10:54:11 | exit M3 | Finally.cs:54:10:54:11 | M3 |
 | Finally.cs:54:10:54:11 | exit M3 (abnormal) | Finally.cs:54:10:54:11 | M3 |
 | Finally.cs:54:10:54:11 | exit M3 (normal) | Finally.cs:54:10:54:11 | M3 |
 | Finally.cs:59:13:59:19 | return ...; | Finally.cs:54:10:54:11 | M3 |
-| Finally.cs:61:9:64:9 | [exception: Exception] catch (...) {...} | Finally.cs:54:10:54:11 | M3 |
-| Finally.cs:61:38:61:39 | [exception: Exception] IOException ex | Finally.cs:54:10:54:11 | M3 |
+| Finally.cs:61:9:64:9 | catch (...) {...} | Finally.cs:54:10:54:11 | M3 |
+| Finally.cs:61:38:61:39 | IOException ex | Finally.cs:54:10:54:11 | M3 |
 | Finally.cs:62:9:64:9 | {...} | Finally.cs:54:10:54:11 | M3 |
-| Finally.cs:65:9:67:9 | [exception: Exception] catch (...) {...} | Finally.cs:54:10:54:11 | M3 |
-| Finally.cs:65:26:65:26 | [exception: Exception] Exception e | Finally.cs:54:10:54:11 | M3 |
+| Finally.cs:65:9:67:9 | catch (...) {...} | Finally.cs:54:10:54:11 | M3 |
+| Finally.cs:65:26:65:26 | Exception e | Finally.cs:54:10:54:11 | M3 |
 | Finally.cs:66:9:67:9 | {...} | Finally.cs:54:10:54:11 | M3 |
-| Finally.cs:69:9:71:9 | [finally: exception(Exception)] {...} | Finally.cs:54:10:54:11 | M3 |
+| Finally.cs:69:9:71:9 | {...} | Finally.cs:54:10:54:11 | M3 |
 | Finally.cs:74:10:74:11 | enter M4 | Finally.cs:74:10:74:11 | M4 |
 | Finally.cs:74:10:74:11 | exit M4 | Finally.cs:74:10:74:11 | M4 |
 | Finally.cs:74:10:74:11 | exit M4 (abnormal) | Finally.cs:74:10:74:11 | M4 |
@@ -5335,21 +4619,8 @@ blockEnclosing
 | Finally.cs:85:17:86:26 | if (...) ... | Finally.cs:74:10:74:11 | M4 |
 | Finally.cs:86:21:86:26 | break; | Finally.cs:74:10:74:11 | M4 |
 | Finally.cs:89:13:99:13 | {...} | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:93:25:93:46 | [finally: break] throw ...; | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:93:25:93:46 | [finally: continue] throw ...; | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:93:25:93:46 | [finally: return] throw ...; | Finally.cs:74:10:74:11 | M4 |
 | Finally.cs:93:25:93:46 | throw ...; | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:93:31:93:45 | [finally: break] object creation of type Exception | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:93:31:93:45 | [finally: continue] object creation of type Exception | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:93:31:93:45 | [finally: return] object creation of type Exception | Finally.cs:74:10:74:11 | M4 |
 | Finally.cs:93:31:93:45 | object creation of type Exception | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:96:17:98:17 | [finally(1): exception(Exception)] {...} | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:96:17:98:17 | [finally: break, finally(1): exception(Exception)] {...} | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:96:17:98:17 | [finally: break] {...} | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:96:17:98:17 | [finally: continue, finally(1): exception(Exception)] {...} | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:96:17:98:17 | [finally: continue] {...} | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:96:17:98:17 | [finally: return, finally(1): exception(Exception)] {...} | Finally.cs:74:10:74:11 | M4 |
-| Finally.cs:96:17:98:17 | [finally: return] {...} | Finally.cs:74:10:74:11 | M4 |
 | Finally.cs:96:17:98:17 | {...} | Finally.cs:74:10:74:11 | M4 |
 | Finally.cs:103:10:103:11 | enter M5 | Finally.cs:103:10:103:11 | M5 |
 | Finally.cs:103:10:103:11 | exit M5 | Finally.cs:103:10:103:11 | M5 |
@@ -5363,73 +4634,27 @@ blockEnclosing
 | Finally.cs:109:33:109:33 | 1 | Finally.cs:103:10:103:11 | M5 |
 | Finally.cs:110:17:110:49 | throw ...; | Finally.cs:103:10:103:11 | M5 |
 | Finally.cs:110:23:110:48 | object creation of type OutOfMemoryException | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:113:9:118:9 | [finally: exception(Exception)] {...} | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:113:9:118:9 | [finally: exception(NullReferenceException)] {...} | Finally.cs:103:10:103:11 | M5 |
 | Finally.cs:113:9:118:9 | {...} | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:114:17:114:36 | [false, finally: exception(Exception)] !... | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:114:17:114:36 | [false, finally: exception(NullReferenceException)] !... | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:114:17:114:36 | [false, finally: exception(OutOfMemoryException)] !... | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:114:17:114:36 | [false, finally: return] !... | Finally.cs:103:10:103:11 | M5 |
 | Finally.cs:114:17:114:36 | [false] !... | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:114:17:114:36 | [true, finally: exception(Exception)] !... | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:114:17:114:36 | [true, finally: exception(NullReferenceException)] !... | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:114:17:114:36 | [true, finally: exception(OutOfMemoryException)] !... | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:114:17:114:36 | [true, finally: return] !... | Finally.cs:103:10:103:11 | M5 |
 | Finally.cs:114:17:114:36 | [true] !... | Finally.cs:103:10:103:11 | M5 |
 | Finally.cs:115:17:115:41 | ...; | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:115:17:115:41 | [finally: exception(Exception)] ...; | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:115:17:115:41 | [finally: exception(NullReferenceException)] ...; | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:115:17:115:41 | [finally: exception(OutOfMemoryException)] ...; | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:115:17:115:41 | [finally: return] ...; | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:116:13:117:37 | [finally: exception(Exception)] if (...) ... | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:116:13:117:37 | [finally: exception(NullReferenceException)] if (...) ... | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:116:13:117:37 | [finally: exception(OutOfMemoryException)] if (...) ... | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:116:13:117:37 | [finally: return] if (...) ... | Finally.cs:103:10:103:11 | M5 |
 | Finally.cs:116:13:117:37 | if (...) ... | Finally.cs:103:10:103:11 | M5 |
 | Finally.cs:117:17:117:37 | ...; | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:117:17:117:37 | [finally: exception(Exception)] ...; | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:117:17:117:37 | [finally: exception(NullReferenceException)] ...; | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:117:17:117:37 | [finally: exception(OutOfMemoryException)] ...; | Finally.cs:103:10:103:11 | M5 |
-| Finally.cs:117:17:117:37 | [finally: return] ...; | Finally.cs:103:10:103:11 | M5 |
 | Finally.cs:121:10:121:11 | enter M6 | Finally.cs:121:10:121:11 | M6 |
 | Finally.cs:133:10:133:11 | enter M7 | Finally.cs:133:10:133:11 | M7 |
-| Finally.cs:133:10:133:11 | exit M7 (abnormal) | Finally.cs:133:10:133:11 | M7 |
-| Finally.cs:140:9:143:9 | [finally: exception(Exception)] {...} | Finally.cs:133:10:133:11 | M7 |
-| Finally.cs:140:9:143:9 | {...} | Finally.cs:133:10:133:11 | M7 |
 | Finally.cs:147:10:147:11 | enter M8 | Finally.cs:147:10:147:11 | M8 |
 | Finally.cs:147:10:147:11 | exit M8 | Finally.cs:147:10:147:11 | M8 |
 | Finally.cs:147:10:147:11 | exit M8 (abnormal) | Finally.cs:147:10:147:11 | M8 |
 | Finally.cs:147:10:147:11 | exit M8 (normal) | Finally.cs:147:10:147:11 | M8 |
 | Finally.cs:152:17:152:50 | throw ...; | Finally.cs:147:10:147:11 | M8 |
 | Finally.cs:152:23:152:49 | object creation of type ArgumentNullException | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:155:9:169:9 | [finally: exception(Exception)] {...} | Finally.cs:147:10:147:11 | M8 |
 | Finally.cs:155:9:169:9 | {...} | Finally.cs:147:10:147:11 | M8 |
 | Finally.cs:158:36:158:36 | 1 | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:158:36:158:36 | [finally: exception(ArgumentNullException)] 1 | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:158:36:158:36 | [finally: exception(Exception)] 1 | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:159:21:159:45 | [finally: exception(ArgumentNullException)] throw ...; | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:159:21:159:45 | [finally: exception(Exception)] throw ...; | Finally.cs:147:10:147:11 | M8 |
 | Finally.cs:159:21:159:45 | throw ...; | Finally.cs:147:10:147:11 | M8 |
 | Finally.cs:159:41:159:43 | "1" | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:159:41:159:43 | [finally: exception(ArgumentNullException)] "1" | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:159:41:159:43 | [finally: exception(Exception)] "1" | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:161:13:164:13 | [exception: Exception] catch (...) {...} | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:161:13:164:13 | [exception: NullReferenceException] catch (...) {...} | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:161:13:164:13 | [finally: exception(ArgumentNullException), exception: Exception] catch (...) {...} | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:161:13:164:13 | [finally: exception(ArgumentNullException), exception: NullReferenceException] catch (...) {...} | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:161:13:164:13 | [finally: exception(Exception), exception: Exception] catch (...) {...} | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:161:13:164:13 | [finally: exception(Exception), exception: NullReferenceException] catch (...) {...} | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:161:30:161:30 | [exception: Exception] Exception e | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:161:30:161:30 | [exception: NullReferenceException] Exception e | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:161:30:161:30 | [finally: exception(ArgumentNullException), exception: Exception] Exception e | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:161:30:161:30 | [finally: exception(ArgumentNullException), exception: NullReferenceException] Exception e | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:161:30:161:30 | [finally: exception(Exception), exception: Exception] Exception e | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:161:30:161:30 | [finally: exception(Exception), exception: NullReferenceException] Exception e | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:162:13:164:13 | [finally: exception(ArgumentNullException)] {...} | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:162:13:164:13 | [finally: exception(Exception)] {...} | Finally.cs:147:10:147:11 | M8 |
+| Finally.cs:161:13:164:13 | catch (...) {...} | Finally.cs:147:10:147:11 | M8 |
+| Finally.cs:161:30:161:30 | Exception e | Finally.cs:147:10:147:11 | M8 |
 | Finally.cs:162:13:164:13 | {...} | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:165:13:168:13 | [finally: exception(ArgumentNullException)] catch {...} | Finally.cs:147:10:147:11 | M8 |
-| Finally.cs:165:13:168:13 | [finally: exception(Exception)] catch {...} | Finally.cs:147:10:147:11 | M8 |
 | Finally.cs:165:13:168:13 | catch {...} | Finally.cs:147:10:147:11 | M8 |
 | Finally.cs:172:11:172:20 | enter ExceptionA | Finally.cs:172:11:172:20 | ExceptionA |
 | Finally.cs:173:11:173:20 | enter ExceptionB | Finally.cs:173:11:173:20 | ExceptionB |
@@ -5438,61 +4663,27 @@ blockEnclosing
 | Finally.cs:176:10:176:11 | exit M9 | Finally.cs:176:10:176:11 | M9 |
 | Finally.cs:176:10:176:11 | exit M9 (abnormal) | Finally.cs:176:10:176:11 | M9 |
 | Finally.cs:176:10:176:11 | exit M9 (normal) | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:180:21:180:43 | [b1 (line 176): true] throw ...; | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:180:27:180:42 | [b1 (line 176): true] object creation of type ExceptionA | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:183:9:192:9 | [b1 (line 176): false] {...} | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:183:9:192:9 | [finally: exception(Exception), b1 (line 176): true] {...} | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:186:25:186:47 | [b1 (line 176): false, b2 (line 176): true] throw ...; | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:186:25:186:47 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] throw ...; | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:186:25:186:47 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] throw ...; | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:186:31:186:46 | [b1 (line 176): false, b2 (line 176): true] object creation of type ExceptionB | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:186:31:186:46 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:186:31:186:46 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:188:13:191:13 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] catch (...) {...} | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:188:13:191:13 | [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:188:13:191:13 | [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:188:38:188:39 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] access to parameter b2 | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:188:38:188:39 | [exception: ExceptionB, b1 (line 176): false, b2 (line 176): true] access to parameter b2 | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:188:38:188:39 | [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:188:38:188:39 | [finally: exception(Exception), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:188:38:188:39 | [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:188:38:188:39 | [finally: exception(ExceptionA), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:189:13:191:13 | [b1 (line 176): false] {...} | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:189:13:191:13 | [finally: exception(Exception), b1 (line 176): true] {...} | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:189:13:191:13 | [finally: exception(ExceptionA), b1 (line 176): true] {...} | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:190:31:190:46 | [finally: exception(Exception)] object creation of type ExceptionC | Finally.cs:176:10:176:11 | M9 |
-| Finally.cs:190:31:190:46 | [finally: exception(ExceptionA)] object creation of type ExceptionC | Finally.cs:176:10:176:11 | M9 |
+| Finally.cs:180:21:180:43 | throw ...; | Finally.cs:176:10:176:11 | M9 |
+| Finally.cs:180:27:180:42 | object creation of type ExceptionA | Finally.cs:176:10:176:11 | M9 |
+| Finally.cs:183:9:192:9 | {...} | Finally.cs:176:10:176:11 | M9 |
+| Finally.cs:186:25:186:47 | throw ...; | Finally.cs:176:10:176:11 | M9 |
+| Finally.cs:186:31:186:46 | object creation of type ExceptionB | Finally.cs:176:10:176:11 | M9 |
+| Finally.cs:188:13:191:13 | catch (...) {...} | Finally.cs:176:10:176:11 | M9 |
+| Finally.cs:188:38:188:39 | access to parameter b2 | Finally.cs:176:10:176:11 | M9 |
+| Finally.cs:189:13:191:13 | {...} | Finally.cs:176:10:176:11 | M9 |
+| Finally.cs:190:31:190:46 | object creation of type ExceptionC | Finally.cs:176:10:176:11 | M9 |
 | Finally.cs:195:10:195:12 | enter M10 | Finally.cs:195:10:195:12 | M10 |
 | Finally.cs:195:10:195:12 | exit M10 | Finally.cs:195:10:195:12 | M10 |
 | Finally.cs:195:10:195:12 | exit M10 (abnormal) | Finally.cs:195:10:195:12 | M10 |
 | Finally.cs:199:21:199:43 | throw ...; | Finally.cs:195:10:195:12 | M10 |
 | Finally.cs:199:27:199:42 | object creation of type ExceptionA | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:202:9:212:9 | [finally: exception(Exception)] {...} | Finally.cs:195:10:195:12 | M10 |
 | Finally.cs:202:9:212:9 | {...} | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:205:25:205:47 | [finally: exception(Exception)] throw ...; | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:205:25:205:47 | [finally: exception(ExceptionA)] throw ...; | Finally.cs:195:10:195:12 | M10 |
 | Finally.cs:205:25:205:47 | throw ...; | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:205:31:205:46 | [finally: exception(Exception)] object creation of type ExceptionB | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:205:31:205:46 | [finally: exception(ExceptionA)] object creation of type ExceptionB | Finally.cs:195:10:195:12 | M10 |
 | Finally.cs:205:31:205:46 | object creation of type ExceptionB | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:208:13:210:13 | [finally(1): exception(Exception)] {...} | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:208:13:210:13 | [finally: exception(Exception), finally(1): exception(Exception)] {...} | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:208:13:210:13 | [finally: exception(Exception)] {...} | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:208:13:210:13 | [finally: exception(ExceptionA), finally(1): exception(Exception)] {...} | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:208:13:210:13 | [finally: exception(ExceptionA)] {...} | Finally.cs:195:10:195:12 | M10 |
 | Finally.cs:208:13:210:13 | {...} | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:209:31:209:46 | [finally(1): exception(Exception)] object creation of type ExceptionC | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:209:31:209:46 | [finally(1): exception(ExceptionB)] object creation of type ExceptionC | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:209:31:209:46 | [finally: exception(Exception), finally(1): exception(Exception)] object creation of type ExceptionC | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:209:31:209:46 | [finally: exception(Exception), finally(1): exception(ExceptionB)] object creation of type ExceptionC | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:209:31:209:46 | [finally: exception(Exception)] object creation of type ExceptionC | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:209:31:209:46 | [finally: exception(ExceptionA), finally(1): exception(Exception)] object creation of type ExceptionC | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:209:31:209:46 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] object creation of type ExceptionC | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:209:31:209:46 | [finally: exception(ExceptionA)] object creation of type ExceptionC | Finally.cs:195:10:195:12 | M10 |
 | Finally.cs:209:31:209:46 | object creation of type ExceptionC | Finally.cs:195:10:195:12 | M10 |
 | Finally.cs:211:13:211:29 | ...; | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:211:13:211:29 | [finally: exception(Exception)] ...; | Finally.cs:195:10:195:12 | M10 |
-| Finally.cs:211:13:211:29 | [finally: exception(ExceptionA)] ...; | Finally.cs:195:10:195:12 | M10 |
+| Finally.cs:213:9:213:25 | ...; | Finally.cs:195:10:195:12 | M10 |
 | Finally.cs:216:10:216:12 | enter M11 | Finally.cs:216:10:216:12 | M11 |
 | Finally.cs:222:9:225:9 | catch {...} | Finally.cs:216:10:216:12 | M11 |
 | Finally.cs:227:9:229:9 | {...} | Finally.cs:216:10:216:12 | M11 |
@@ -5501,27 +4692,17 @@ blockEnclosing
 | Finally.cs:233:10:233:12 | exit M12 (abnormal) | Finally.cs:233:10:233:12 | M12 |
 | Finally.cs:240:21:240:43 | throw ...; | Finally.cs:233:10:233:12 | M12 |
 | Finally.cs:240:27:240:42 | object creation of type ExceptionA | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:243:13:253:13 | [finally: exception(Exception)] {...} | Finally.cs:233:10:233:12 | M12 |
 | Finally.cs:243:13:253:13 | {...} | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:247:25:247:47 | [finally: exception(Exception)] throw ...; | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:247:25:247:47 | [finally: exception(ExceptionA)] throw ...; | Finally.cs:233:10:233:12 | M12 |
 | Finally.cs:247:25:247:47 | throw ...; | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:247:31:247:46 | [finally: exception(Exception)] object creation of type ExceptionA | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:247:31:247:46 | [finally: exception(ExceptionA)] object creation of type ExceptionA | Finally.cs:233:10:233:12 | M12 |
 | Finally.cs:247:31:247:46 | object creation of type ExceptionA | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:250:17:252:17 | [finally(1): exception(Exception)] {...} | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:250:17:252:17 | [finally: exception(Exception), finally(1): exception(Exception)] {...} | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:250:17:252:17 | [finally: exception(Exception)] {...} | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:250:17:252:17 | [finally: exception(ExceptionA), finally(1): exception(Exception)] {...} | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:250:17:252:17 | [finally: exception(ExceptionA)] {...} | Finally.cs:233:10:233:12 | M12 |
 | Finally.cs:250:17:252:17 | {...} | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:257:9:259:9 | [finally: exception(Exception)] {...} | Finally.cs:233:10:233:12 | M12 |
-| Finally.cs:257:9:259:9 | [finally: exception(ExceptionA)] {...} | Finally.cs:233:10:233:12 | M12 |
+| Finally.cs:254:13:254:45 | ...; | Finally.cs:233:10:233:12 | M12 |
 | Finally.cs:257:9:259:9 | {...} | Finally.cs:233:10:233:12 | M12 |
+| Finally.cs:260:9:260:34 | ...; | Finally.cs:233:10:233:12 | M12 |
 | Finally.cs:263:10:263:12 | enter M13 | Finally.cs:263:10:263:12 | M13 |
 | Finally.cs:263:10:263:12 | exit M13 | Finally.cs:263:10:263:12 | M13 |
-| Finally.cs:270:9:273:9 | [finally: exception(Exception)] {...} | Finally.cs:263:10:263:12 | M13 |
-| Finally.cs:270:9:273:9 | {...} | Finally.cs:263:10:263:12 | M13 |
+| Finally.cs:263:10:263:12 | exit M13 (abnormal) | Finally.cs:263:10:263:12 | M13 |
+| Finally.cs:263:10:263:12 | exit M13 (normal) | Finally.cs:263:10:263:12 | M13 |
 | Foreach.cs:4:7:4:13 | enter Foreach | Foreach.cs:4:7:4:13 | Foreach |
 | Foreach.cs:6:10:6:11 | enter M1 | Foreach.cs:6:10:6:11 | M1 |
 | Foreach.cs:6:10:6:11 | exit M1 (normal) | Foreach.cs:6:10:6:11 | M1 |
@@ -5565,47 +4746,59 @@ blockEnclosing
 | LoopUnrolling.cs:7:10:7:11 | enter M1 | LoopUnrolling.cs:7:10:7:11 | M1 |
 | LoopUnrolling.cs:7:10:7:11 | exit M1 (normal) | LoopUnrolling.cs:7:10:7:11 | M1 |
 | LoopUnrolling.cs:10:13:10:19 | return ...; | LoopUnrolling.cs:7:10:7:11 | M1 |
+| LoopUnrolling.cs:11:9:12:35 | foreach (... ... in ...) ... | LoopUnrolling.cs:7:10:7:11 | M1 |
 | LoopUnrolling.cs:11:22:11:24 | String arg | LoopUnrolling.cs:7:10:7:11 | M1 |
 | LoopUnrolling.cs:11:29:11:32 | access to parameter args | LoopUnrolling.cs:7:10:7:11 | M1 |
 | LoopUnrolling.cs:15:10:15:11 | enter M2 | LoopUnrolling.cs:15:10:15:11 | M2 |
 | LoopUnrolling.cs:15:10:15:11 | exit M2 (normal) | LoopUnrolling.cs:15:10:15:11 | M2 |
+| LoopUnrolling.cs:18:9:19:33 | foreach (... ... in ...) ... | LoopUnrolling.cs:15:10:15:11 | M2 |
 | LoopUnrolling.cs:18:22:18:22 | String x | LoopUnrolling.cs:15:10:15:11 | M2 |
 | LoopUnrolling.cs:22:10:22:11 | enter M3 | LoopUnrolling.cs:22:10:22:11 | M3 |
 | LoopUnrolling.cs:22:10:22:11 | exit M3 (normal) | LoopUnrolling.cs:22:10:22:11 | M3 |
 | LoopUnrolling.cs:24:9:26:40 | foreach (... ... in ...) ... | LoopUnrolling.cs:22:10:22:11 | M3 |
 | LoopUnrolling.cs:24:22:24:24 | Char arg | LoopUnrolling.cs:22:10:22:11 | M3 |
+| LoopUnrolling.cs:25:13:26:40 | foreach (... ... in ...) ... | LoopUnrolling.cs:22:10:22:11 | M3 |
 | LoopUnrolling.cs:25:26:25:29 | Char arg0 | LoopUnrolling.cs:22:10:22:11 | M3 |
 | LoopUnrolling.cs:29:10:29:11 | enter M4 | LoopUnrolling.cs:29:10:29:11 | M4 |
 | LoopUnrolling.cs:29:10:29:11 | exit M4 (normal) | LoopUnrolling.cs:29:10:29:11 | M4 |
+| LoopUnrolling.cs:32:9:33:33 | foreach (... ... in ...) ... | LoopUnrolling.cs:29:10:29:11 | M4 |
+| LoopUnrolling.cs:32:22:32:22 | String x | LoopUnrolling.cs:29:10:29:11 | M4 |
 | LoopUnrolling.cs:36:10:36:11 | enter M5 | LoopUnrolling.cs:36:10:36:11 | M5 |
 | LoopUnrolling.cs:36:10:36:11 | exit M5 (normal) | LoopUnrolling.cs:36:10:36:11 | M5 |
 | LoopUnrolling.cs:40:9:42:41 | foreach (... ... in ...) ... | LoopUnrolling.cs:36:10:36:11 | M5 |
 | LoopUnrolling.cs:40:22:40:22 | String x | LoopUnrolling.cs:36:10:36:11 | M5 |
+| LoopUnrolling.cs:41:13:42:41 | foreach (... ... in ...) ... | LoopUnrolling.cs:36:10:36:11 | M5 |
 | LoopUnrolling.cs:41:26:41:26 | String y | LoopUnrolling.cs:36:10:36:11 | M5 |
 | LoopUnrolling.cs:45:10:45:11 | enter M6 | LoopUnrolling.cs:45:10:45:11 | M6 |
+| LoopUnrolling.cs:45:10:45:11 | exit M6 (normal) | LoopUnrolling.cs:45:10:45:11 | M6 |
 | LoopUnrolling.cs:48:22:48:22 | String x | LoopUnrolling.cs:45:10:45:11 | M6 |
 | LoopUnrolling.cs:50:9:50:13 | Label: | LoopUnrolling.cs:45:10:45:11 | M6 |
 | LoopUnrolling.cs:55:10:55:11 | enter M7 | LoopUnrolling.cs:55:10:55:11 | M7 |
 | LoopUnrolling.cs:55:10:55:11 | exit M7 (normal) | LoopUnrolling.cs:55:10:55:11 | M7 |
-| LoopUnrolling.cs:58:9:64:9 | [b (line 55): false] foreach (... ... in ...) ... | LoopUnrolling.cs:55:10:55:11 | M7 |
+| LoopUnrolling.cs:58:9:64:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:55:10:55:11 | M7 |
 | LoopUnrolling.cs:58:22:58:22 | String x | LoopUnrolling.cs:55:10:55:11 | M7 |
-| LoopUnrolling.cs:58:22:58:22 | [b (line 55): false] String x | LoopUnrolling.cs:55:10:55:11 | M7 |
-| LoopUnrolling.cs:58:22:58:22 | [b (line 55): true] String x | LoopUnrolling.cs:55:10:55:11 | M7 |
-| LoopUnrolling.cs:61:17:61:37 | [b (line 55): true] ...; | LoopUnrolling.cs:55:10:55:11 | M7 |
-| LoopUnrolling.cs:62:13:63:37 | [b (line 55): false] if (...) ... | LoopUnrolling.cs:55:10:55:11 | M7 |
-| LoopUnrolling.cs:63:17:63:37 | [b (line 55): true] ...; | LoopUnrolling.cs:55:10:55:11 | M7 |
+| LoopUnrolling.cs:61:17:61:37 | ...; | LoopUnrolling.cs:55:10:55:11 | M7 |
+| LoopUnrolling.cs:62:13:63:37 | if (...) ... | LoopUnrolling.cs:55:10:55:11 | M7 |
+| LoopUnrolling.cs:63:17:63:37 | ...; | LoopUnrolling.cs:55:10:55:11 | M7 |
 | LoopUnrolling.cs:67:10:67:11 | enter M8 | LoopUnrolling.cs:67:10:67:11 | M8 |
 | LoopUnrolling.cs:67:10:67:11 | exit M8 (normal) | LoopUnrolling.cs:67:10:67:11 | M8 |
 | LoopUnrolling.cs:69:13:69:23 | [false] !... | LoopUnrolling.cs:67:10:67:11 | M8 |
 | LoopUnrolling.cs:69:13:69:23 | [true] !... | LoopUnrolling.cs:67:10:67:11 | M8 |
 | LoopUnrolling.cs:70:13:70:19 | return ...; | LoopUnrolling.cs:67:10:67:11 | M8 |
 | LoopUnrolling.cs:71:9:71:21 | ...; | LoopUnrolling.cs:67:10:67:11 | M8 |
+| LoopUnrolling.cs:72:9:73:35 | foreach (... ... in ...) ... | LoopUnrolling.cs:67:10:67:11 | M8 |
+| LoopUnrolling.cs:72:22:72:24 | String arg | LoopUnrolling.cs:67:10:67:11 | M8 |
 | LoopUnrolling.cs:76:10:76:11 | enter M9 | LoopUnrolling.cs:76:10:76:11 | M9 |
 | LoopUnrolling.cs:76:10:76:11 | exit M9 (normal) | LoopUnrolling.cs:76:10:76:11 | M9 |
+| LoopUnrolling.cs:79:9:82:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:76:10:76:11 | M9 |
+| LoopUnrolling.cs:79:22:79:22 | String x | LoopUnrolling.cs:76:10:76:11 | M9 |
 | LoopUnrolling.cs:85:10:85:12 | enter M10 | LoopUnrolling.cs:85:10:85:12 | M10 |
 | LoopUnrolling.cs:85:10:85:12 | exit M10 (normal) | LoopUnrolling.cs:85:10:85:12 | M10 |
+| LoopUnrolling.cs:88:9:91:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:85:10:85:12 | M10 |
+| LoopUnrolling.cs:88:22:88:22 | String x | LoopUnrolling.cs:85:10:85:12 | M10 |
 | LoopUnrolling.cs:94:10:94:12 | enter M11 | LoopUnrolling.cs:94:10:94:12 | M11 |
 | LoopUnrolling.cs:94:10:94:12 | exit M11 (normal) | LoopUnrolling.cs:94:10:94:12 | M11 |
+| LoopUnrolling.cs:97:9:100:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:94:10:94:12 | M11 |
 | LoopUnrolling.cs:97:22:97:22 | String x | LoopUnrolling.cs:94:10:94:12 | M11 |
 | MultiImplementationA.cs:4:7:4:8 | call to constructor Object | MultiImplementationA.cs:4:7:4:8 | C1 |
 | MultiImplementationA.cs:4:7:4:8 | enter C1 | MultiImplementationA.cs:4:7:4:8 | C1 |
@@ -6124,6 +5317,9 @@ blockEnclosing
 | cflow.cs:254:17:254:27 | goto ...; | cflow.cs:240:10:240:13 | Goto |
 | cflow.cs:255:13:255:20 | default: | cflow.cs:240:10:240:13 | Goto |
 | cflow.cs:261:49:261:53 | enter Yield | cflow.cs:261:49:261:53 | Yield |
+| cflow.cs:261:49:261:53 | exit Yield | cflow.cs:261:49:261:53 | Yield |
+| cflow.cs:261:49:261:53 | exit Yield (abnormal) | cflow.cs:261:49:261:53 | Yield |
+| cflow.cs:261:49:261:53 | exit Yield (normal) | cflow.cs:261:49:261:53 | Yield |
 | cflow.cs:264:25:264:25 | access to local variable i | cflow.cs:261:49:261:53 | Yield |
 | cflow.cs:265:9:267:9 | {...} | cflow.cs:261:49:261:53 | Yield |
 | cflow.cs:268:9:276:9 | try {...} ... | cflow.cs:261:49:261:53 | Yield |
diff --git a/csharp/ql/test/library-tests/controlflow/graph/ExitElement.expected b/csharp/ql/test/library-tests/controlflow/graph/ExitElement.expected
index 495c74f169c..11880f4f825 100644
--- a/csharp/ql/test/library-tests/controlflow/graph/ExitElement.expected
+++ b/csharp/ql/test/library-tests/controlflow/graph/ExitElement.expected
@@ -327,8 +327,7 @@
 | Assert.cs:10:9:10:32 | ...; | Assert.cs:10:9:10:31 | call to method Assert | exit |
 | Assert.cs:10:9:10:32 | ...; | Assert.cs:10:9:10:31 | call to method Assert | normal |
 | Assert.cs:10:22:10:22 | access to local variable s | Assert.cs:10:22:10:22 | access to local variable s | normal |
-| Assert.cs:10:22:10:30 | ... != ... | Assert.cs:10:22:10:30 | ... != ... | false |
-| Assert.cs:10:22:10:30 | ... != ... | Assert.cs:10:22:10:30 | ... != ... | true |
+| Assert.cs:10:22:10:30 | ... != ... | Assert.cs:10:22:10:30 | ... != ... | normal |
 | Assert.cs:10:27:10:30 | null | Assert.cs:10:27:10:30 | null | normal |
 | Assert.cs:11:9:11:35 | call to method WriteLine | Assert.cs:11:9:11:35 | call to method WriteLine | normal |
 | Assert.cs:11:9:11:36 | ...; | Assert.cs:11:9:11:35 | call to method WriteLine | normal |
@@ -347,8 +346,7 @@
 | Assert.cs:17:9:17:24 | call to method IsNull | Assert.cs:17:9:17:24 | call to method IsNull | throw(AssertFailedException) |
 | Assert.cs:17:9:17:25 | ...; | Assert.cs:17:9:17:24 | call to method IsNull | normal |
 | Assert.cs:17:9:17:25 | ...; | Assert.cs:17:9:17:24 | call to method IsNull | throw(AssertFailedException) |
-| Assert.cs:17:23:17:23 | access to local variable s | Assert.cs:17:23:17:23 | access to local variable s | non-null |
-| Assert.cs:17:23:17:23 | access to local variable s | Assert.cs:17:23:17:23 | access to local variable s | null |
+| Assert.cs:17:23:17:23 | access to local variable s | Assert.cs:17:23:17:23 | access to local variable s | normal |
 | Assert.cs:18:9:18:35 | call to method WriteLine | Assert.cs:18:9:18:35 | call to method WriteLine | normal |
 | Assert.cs:18:9:18:36 | ...; | Assert.cs:18:9:18:35 | call to method WriteLine | normal |
 | Assert.cs:18:27:18:27 | access to local variable s | Assert.cs:18:27:18:27 | access to local variable s | normal |
@@ -366,8 +364,7 @@
 | Assert.cs:24:9:24:27 | call to method IsNotNull | Assert.cs:24:9:24:27 | call to method IsNotNull | throw(AssertFailedException) |
 | Assert.cs:24:9:24:28 | ...; | Assert.cs:24:9:24:27 | call to method IsNotNull | normal |
 | Assert.cs:24:9:24:28 | ...; | Assert.cs:24:9:24:27 | call to method IsNotNull | throw(AssertFailedException) |
-| Assert.cs:24:26:24:26 | access to local variable s | Assert.cs:24:26:24:26 | access to local variable s | non-null |
-| Assert.cs:24:26:24:26 | access to local variable s | Assert.cs:24:26:24:26 | access to local variable s | null |
+| Assert.cs:24:26:24:26 | access to local variable s | Assert.cs:24:26:24:26 | access to local variable s | normal |
 | Assert.cs:25:9:25:35 | call to method WriteLine | Assert.cs:25:9:25:35 | call to method WriteLine | normal |
 | Assert.cs:25:9:25:36 | ...; | Assert.cs:25:9:25:35 | call to method WriteLine | normal |
 | Assert.cs:25:27:25:27 | access to local variable s | Assert.cs:25:27:25:27 | access to local variable s | normal |
@@ -386,8 +383,7 @@
 | Assert.cs:31:9:31:33 | ...; | Assert.cs:31:9:31:32 | call to method IsTrue | normal |
 | Assert.cs:31:9:31:33 | ...; | Assert.cs:31:9:31:32 | call to method IsTrue | throw(AssertFailedException) |
 | Assert.cs:31:23:31:23 | access to local variable s | Assert.cs:31:23:31:23 | access to local variable s | normal |
-| Assert.cs:31:23:31:31 | ... == ... | Assert.cs:31:23:31:31 | ... == ... | false |
-| Assert.cs:31:23:31:31 | ... == ... | Assert.cs:31:23:31:31 | ... == ... | true |
+| Assert.cs:31:23:31:31 | ... == ... | Assert.cs:31:23:31:31 | ... == ... | normal |
 | Assert.cs:31:28:31:31 | null | Assert.cs:31:28:31:31 | null | normal |
 | Assert.cs:32:9:32:35 | call to method WriteLine | Assert.cs:32:9:32:35 | call to method WriteLine | normal |
 | Assert.cs:32:9:32:36 | ...; | Assert.cs:32:9:32:35 | call to method WriteLine | normal |
@@ -407,8 +403,7 @@
 | Assert.cs:38:9:38:33 | ...; | Assert.cs:38:9:38:32 | call to method IsTrue | normal |
 | Assert.cs:38:9:38:33 | ...; | Assert.cs:38:9:38:32 | call to method IsTrue | throw(AssertFailedException) |
 | Assert.cs:38:23:38:23 | access to local variable s | Assert.cs:38:23:38:23 | access to local variable s | normal |
-| Assert.cs:38:23:38:31 | ... != ... | Assert.cs:38:23:38:31 | ... != ... | false |
-| Assert.cs:38:23:38:31 | ... != ... | Assert.cs:38:23:38:31 | ... != ... | true |
+| Assert.cs:38:23:38:31 | ... != ... | Assert.cs:38:23:38:31 | ... != ... | normal |
 | Assert.cs:38:28:38:31 | null | Assert.cs:38:28:38:31 | null | normal |
 | Assert.cs:39:9:39:35 | call to method WriteLine | Assert.cs:39:9:39:35 | call to method WriteLine | normal |
 | Assert.cs:39:9:39:36 | ...; | Assert.cs:39:9:39:35 | call to method WriteLine | normal |
@@ -428,8 +423,7 @@
 | Assert.cs:45:9:45:34 | ...; | Assert.cs:45:9:45:33 | call to method IsFalse | normal |
 | Assert.cs:45:9:45:34 | ...; | Assert.cs:45:9:45:33 | call to method IsFalse | throw(AssertFailedException) |
 | Assert.cs:45:24:45:24 | access to local variable s | Assert.cs:45:24:45:24 | access to local variable s | normal |
-| Assert.cs:45:24:45:32 | ... != ... | Assert.cs:45:24:45:32 | ... != ... | false |
-| Assert.cs:45:24:45:32 | ... != ... | Assert.cs:45:24:45:32 | ... != ... | true |
+| Assert.cs:45:24:45:32 | ... != ... | Assert.cs:45:24:45:32 | ... != ... | normal |
 | Assert.cs:45:29:45:32 | null | Assert.cs:45:29:45:32 | null | normal |
 | Assert.cs:46:9:46:35 | call to method WriteLine | Assert.cs:46:9:46:35 | call to method WriteLine | normal |
 | Assert.cs:46:9:46:36 | ...; | Assert.cs:46:9:46:35 | call to method WriteLine | normal |
@@ -449,8 +443,7 @@
 | Assert.cs:52:9:52:34 | ...; | Assert.cs:52:9:52:33 | call to method IsFalse | normal |
 | Assert.cs:52:9:52:34 | ...; | Assert.cs:52:9:52:33 | call to method IsFalse | throw(AssertFailedException) |
 | Assert.cs:52:24:52:24 | access to local variable s | Assert.cs:52:24:52:24 | access to local variable s | normal |
-| Assert.cs:52:24:52:32 | ... == ... | Assert.cs:52:24:52:32 | ... == ... | false |
-| Assert.cs:52:24:52:32 | ... == ... | Assert.cs:52:24:52:32 | ... == ... | true |
+| Assert.cs:52:24:52:32 | ... == ... | Assert.cs:52:24:52:32 | ... == ... | normal |
 | Assert.cs:52:29:52:32 | null | Assert.cs:52:29:52:32 | null | normal |
 | Assert.cs:53:9:53:35 | call to method WriteLine | Assert.cs:53:9:53:35 | call to method WriteLine | normal |
 | Assert.cs:53:9:53:36 | ...; | Assert.cs:53:9:53:35 | call to method WriteLine | normal |
@@ -472,11 +465,9 @@
 | Assert.cs:59:23:59:23 | access to local variable s | Assert.cs:59:23:59:23 | access to local variable s | normal |
 | Assert.cs:59:23:59:31 | ... != ... | Assert.cs:59:23:59:31 | ... != ... | false |
 | Assert.cs:59:23:59:31 | ... != ... | Assert.cs:59:23:59:31 | ... != ... | true |
-| Assert.cs:59:23:59:36 | ... && ... | Assert.cs:59:23:59:36 | ... && ... | false |
-| Assert.cs:59:23:59:36 | ... && ... | Assert.cs:59:23:59:36 | ... && ... | true |
+| Assert.cs:59:23:59:36 | ... && ... | Assert.cs:59:23:59:36 | ... && ... | normal |
 | Assert.cs:59:28:59:31 | null | Assert.cs:59:28:59:31 | null | normal |
-| Assert.cs:59:36:59:36 | access to parameter b | Assert.cs:59:36:59:36 | access to parameter b | false |
-| Assert.cs:59:36:59:36 | access to parameter b | Assert.cs:59:36:59:36 | access to parameter b | true |
+| Assert.cs:59:36:59:36 | access to parameter b | Assert.cs:59:36:59:36 | access to parameter b | normal |
 | Assert.cs:60:9:60:35 | call to method WriteLine | Assert.cs:60:9:60:35 | call to method WriteLine | normal |
 | Assert.cs:60:9:60:36 | ...; | Assert.cs:60:9:60:35 | call to method WriteLine | normal |
 | Assert.cs:60:27:60:27 | access to local variable s | Assert.cs:60:27:60:27 | access to local variable s | normal |
@@ -497,11 +488,9 @@
 | Assert.cs:66:24:66:24 | access to local variable s | Assert.cs:66:24:66:24 | access to local variable s | normal |
 | Assert.cs:66:24:66:32 | ... == ... | Assert.cs:66:24:66:32 | ... == ... | false |
 | Assert.cs:66:24:66:32 | ... == ... | Assert.cs:66:24:66:32 | ... == ... | true |
-| Assert.cs:66:24:66:37 | ... \|\| ... | Assert.cs:66:24:66:37 | ... \|\| ... | false |
-| Assert.cs:66:24:66:37 | ... \|\| ... | Assert.cs:66:24:66:37 | ... \|\| ... | true |
+| Assert.cs:66:24:66:37 | ... \|\| ... | Assert.cs:66:24:66:37 | ... \|\| ... | normal |
 | Assert.cs:66:29:66:32 | null | Assert.cs:66:29:66:32 | null | normal |
-| Assert.cs:66:37:66:37 | access to parameter b | Assert.cs:66:37:66:37 | access to parameter b | false |
-| Assert.cs:66:37:66:37 | access to parameter b | Assert.cs:66:37:66:37 | access to parameter b | true |
+| Assert.cs:66:37:66:37 | access to parameter b | Assert.cs:66:37:66:37 | access to parameter b | normal |
 | Assert.cs:67:9:67:35 | call to method WriteLine | Assert.cs:67:9:67:35 | call to method WriteLine | normal |
 | Assert.cs:67:9:67:36 | ...; | Assert.cs:67:9:67:35 | call to method WriteLine | normal |
 | Assert.cs:67:27:67:27 | access to local variable s | Assert.cs:67:27:67:27 | access to local variable s | normal |
@@ -522,11 +511,9 @@
 | Assert.cs:73:23:73:23 | access to local variable s | Assert.cs:73:23:73:23 | access to local variable s | normal |
 | Assert.cs:73:23:73:31 | ... == ... | Assert.cs:73:23:73:31 | ... == ... | false |
 | Assert.cs:73:23:73:31 | ... == ... | Assert.cs:73:23:73:31 | ... == ... | true |
-| Assert.cs:73:23:73:36 | ... && ... | Assert.cs:73:23:73:36 | ... && ... | false |
-| Assert.cs:73:23:73:36 | ... && ... | Assert.cs:73:23:73:36 | ... && ... | true |
+| Assert.cs:73:23:73:36 | ... && ... | Assert.cs:73:23:73:36 | ... && ... | normal |
 | Assert.cs:73:28:73:31 | null | Assert.cs:73:28:73:31 | null | normal |
-| Assert.cs:73:36:73:36 | access to parameter b | Assert.cs:73:36:73:36 | access to parameter b | false |
-| Assert.cs:73:36:73:36 | access to parameter b | Assert.cs:73:36:73:36 | access to parameter b | true |
+| Assert.cs:73:36:73:36 | access to parameter b | Assert.cs:73:36:73:36 | access to parameter b | normal |
 | Assert.cs:74:9:74:35 | call to method WriteLine | Assert.cs:74:9:74:35 | call to method WriteLine | normal |
 | Assert.cs:74:9:74:36 | ...; | Assert.cs:74:9:74:35 | call to method WriteLine | normal |
 | Assert.cs:74:27:74:27 | access to local variable s | Assert.cs:74:27:74:27 | access to local variable s | normal |
@@ -547,11 +534,9 @@
 | Assert.cs:80:24:80:24 | access to local variable s | Assert.cs:80:24:80:24 | access to local variable s | normal |
 | Assert.cs:80:24:80:32 | ... != ... | Assert.cs:80:24:80:32 | ... != ... | false |
 | Assert.cs:80:24:80:32 | ... != ... | Assert.cs:80:24:80:32 | ... != ... | true |
-| Assert.cs:80:24:80:37 | ... \|\| ... | Assert.cs:80:24:80:37 | ... \|\| ... | false |
-| Assert.cs:80:24:80:37 | ... \|\| ... | Assert.cs:80:24:80:37 | ... \|\| ... | true |
+| Assert.cs:80:24:80:37 | ... \|\| ... | Assert.cs:80:24:80:37 | ... \|\| ... | normal |
 | Assert.cs:80:29:80:32 | null | Assert.cs:80:29:80:32 | null | normal |
-| Assert.cs:80:37:80:37 | access to parameter b | Assert.cs:80:37:80:37 | access to parameter b | false |
-| Assert.cs:80:37:80:37 | access to parameter b | Assert.cs:80:37:80:37 | access to parameter b | true |
+| Assert.cs:80:37:80:37 | access to parameter b | Assert.cs:80:37:80:37 | access to parameter b | normal |
 | Assert.cs:81:9:81:35 | call to method WriteLine | Assert.cs:81:9:81:35 | call to method WriteLine | normal |
 | Assert.cs:81:9:81:36 | ...; | Assert.cs:81:9:81:35 | call to method WriteLine | normal |
 | Assert.cs:81:27:81:27 | access to local variable s | Assert.cs:81:27:81:27 | access to local variable s | normal |
@@ -580,8 +565,7 @@
 | Assert.cs:87:9:87:32 | ...; | Assert.cs:87:9:87:31 | call to method Assert | exit |
 | Assert.cs:87:9:87:32 | ...; | Assert.cs:87:9:87:31 | call to method Assert | normal |
 | Assert.cs:87:22:87:22 | access to local variable s | Assert.cs:87:22:87:22 | access to local variable s | normal |
-| Assert.cs:87:22:87:30 | ... != ... | Assert.cs:87:22:87:30 | ... != ... | false |
-| Assert.cs:87:22:87:30 | ... != ... | Assert.cs:87:22:87:30 | ... != ... | true |
+| Assert.cs:87:22:87:30 | ... != ... | Assert.cs:87:22:87:30 | ... != ... | normal |
 | Assert.cs:87:27:87:30 | null | Assert.cs:87:27:87:30 | null | normal |
 | Assert.cs:88:9:88:35 | call to method WriteLine | Assert.cs:88:9:88:35 | call to method WriteLine | normal |
 | Assert.cs:88:9:88:36 | ...; | Assert.cs:88:9:88:35 | call to method WriteLine | normal |
@@ -598,8 +582,7 @@
 | Assert.cs:91:9:91:24 | call to method IsNull | Assert.cs:91:9:91:24 | call to method IsNull | throw(AssertFailedException) |
 | Assert.cs:91:9:91:25 | ...; | Assert.cs:91:9:91:24 | call to method IsNull | normal |
 | Assert.cs:91:9:91:25 | ...; | Assert.cs:91:9:91:24 | call to method IsNull | throw(AssertFailedException) |
-| Assert.cs:91:23:91:23 | access to local variable s | Assert.cs:91:23:91:23 | access to local variable s | non-null |
-| Assert.cs:91:23:91:23 | access to local variable s | Assert.cs:91:23:91:23 | access to local variable s | null |
+| Assert.cs:91:23:91:23 | access to local variable s | Assert.cs:91:23:91:23 | access to local variable s | normal |
 | Assert.cs:92:9:92:35 | call to method WriteLine | Assert.cs:92:9:92:35 | call to method WriteLine | normal |
 | Assert.cs:92:9:92:36 | ...; | Assert.cs:92:9:92:35 | call to method WriteLine | normal |
 | Assert.cs:92:27:92:27 | access to local variable s | Assert.cs:92:27:92:27 | access to local variable s | normal |
@@ -615,8 +598,7 @@
 | Assert.cs:95:9:95:27 | call to method IsNotNull | Assert.cs:95:9:95:27 | call to method IsNotNull | throw(AssertFailedException) |
 | Assert.cs:95:9:95:28 | ...; | Assert.cs:95:9:95:27 | call to method IsNotNull | normal |
 | Assert.cs:95:9:95:28 | ...; | Assert.cs:95:9:95:27 | call to method IsNotNull | throw(AssertFailedException) |
-| Assert.cs:95:26:95:26 | access to local variable s | Assert.cs:95:26:95:26 | access to local variable s | non-null |
-| Assert.cs:95:26:95:26 | access to local variable s | Assert.cs:95:26:95:26 | access to local variable s | null |
+| Assert.cs:95:26:95:26 | access to local variable s | Assert.cs:95:26:95:26 | access to local variable s | normal |
 | Assert.cs:96:9:96:35 | call to method WriteLine | Assert.cs:96:9:96:35 | call to method WriteLine | normal |
 | Assert.cs:96:9:96:36 | ...; | Assert.cs:96:9:96:35 | call to method WriteLine | normal |
 | Assert.cs:96:27:96:27 | access to local variable s | Assert.cs:96:27:96:27 | access to local variable s | normal |
@@ -633,8 +615,7 @@
 | Assert.cs:99:9:99:33 | ...; | Assert.cs:99:9:99:32 | call to method IsTrue | normal |
 | Assert.cs:99:9:99:33 | ...; | Assert.cs:99:9:99:32 | call to method IsTrue | throw(AssertFailedException) |
 | Assert.cs:99:23:99:23 | access to local variable s | Assert.cs:99:23:99:23 | access to local variable s | normal |
-| Assert.cs:99:23:99:31 | ... == ... | Assert.cs:99:23:99:31 | ... == ... | false |
-| Assert.cs:99:23:99:31 | ... == ... | Assert.cs:99:23:99:31 | ... == ... | true |
+| Assert.cs:99:23:99:31 | ... == ... | Assert.cs:99:23:99:31 | ... == ... | normal |
 | Assert.cs:99:28:99:31 | null | Assert.cs:99:28:99:31 | null | normal |
 | Assert.cs:100:9:100:35 | call to method WriteLine | Assert.cs:100:9:100:35 | call to method WriteLine | normal |
 | Assert.cs:100:9:100:36 | ...; | Assert.cs:100:9:100:35 | call to method WriteLine | normal |
@@ -652,8 +633,7 @@
 | Assert.cs:103:9:103:33 | ...; | Assert.cs:103:9:103:32 | call to method IsTrue | normal |
 | Assert.cs:103:9:103:33 | ...; | Assert.cs:103:9:103:32 | call to method IsTrue | throw(AssertFailedException) |
 | Assert.cs:103:23:103:23 | access to local variable s | Assert.cs:103:23:103:23 | access to local variable s | normal |
-| Assert.cs:103:23:103:31 | ... != ... | Assert.cs:103:23:103:31 | ... != ... | false |
-| Assert.cs:103:23:103:31 | ... != ... | Assert.cs:103:23:103:31 | ... != ... | true |
+| Assert.cs:103:23:103:31 | ... != ... | Assert.cs:103:23:103:31 | ... != ... | normal |
 | Assert.cs:103:28:103:31 | null | Assert.cs:103:28:103:31 | null | normal |
 | Assert.cs:104:9:104:35 | call to method WriteLine | Assert.cs:104:9:104:35 | call to method WriteLine | normal |
 | Assert.cs:104:9:104:36 | ...; | Assert.cs:104:9:104:35 | call to method WriteLine | normal |
@@ -671,8 +651,7 @@
 | Assert.cs:107:9:107:34 | ...; | Assert.cs:107:9:107:33 | call to method IsFalse | normal |
 | Assert.cs:107:9:107:34 | ...; | Assert.cs:107:9:107:33 | call to method IsFalse | throw(AssertFailedException) |
 | Assert.cs:107:24:107:24 | access to local variable s | Assert.cs:107:24:107:24 | access to local variable s | normal |
-| Assert.cs:107:24:107:32 | ... != ... | Assert.cs:107:24:107:32 | ... != ... | false |
-| Assert.cs:107:24:107:32 | ... != ... | Assert.cs:107:24:107:32 | ... != ... | true |
+| Assert.cs:107:24:107:32 | ... != ... | Assert.cs:107:24:107:32 | ... != ... | normal |
 | Assert.cs:107:29:107:32 | null | Assert.cs:107:29:107:32 | null | normal |
 | Assert.cs:108:9:108:35 | call to method WriteLine | Assert.cs:108:9:108:35 | call to method WriteLine | normal |
 | Assert.cs:108:9:108:36 | ...; | Assert.cs:108:9:108:35 | call to method WriteLine | normal |
@@ -690,8 +669,7 @@
 | Assert.cs:111:9:111:34 | ...; | Assert.cs:111:9:111:33 | call to method IsFalse | normal |
 | Assert.cs:111:9:111:34 | ...; | Assert.cs:111:9:111:33 | call to method IsFalse | throw(AssertFailedException) |
 | Assert.cs:111:24:111:24 | access to local variable s | Assert.cs:111:24:111:24 | access to local variable s | normal |
-| Assert.cs:111:24:111:32 | ... == ... | Assert.cs:111:24:111:32 | ... == ... | false |
-| Assert.cs:111:24:111:32 | ... == ... | Assert.cs:111:24:111:32 | ... == ... | true |
+| Assert.cs:111:24:111:32 | ... == ... | Assert.cs:111:24:111:32 | ... == ... | normal |
 | Assert.cs:111:29:111:32 | null | Assert.cs:111:29:111:32 | null | normal |
 | Assert.cs:112:9:112:35 | call to method WriteLine | Assert.cs:112:9:112:35 | call to method WriteLine | normal |
 | Assert.cs:112:9:112:36 | ...; | Assert.cs:112:9:112:35 | call to method WriteLine | normal |
@@ -711,11 +689,9 @@
 | Assert.cs:115:23:115:23 | access to local variable s | Assert.cs:115:23:115:23 | access to local variable s | normal |
 | Assert.cs:115:23:115:31 | ... != ... | Assert.cs:115:23:115:31 | ... != ... | false |
 | Assert.cs:115:23:115:31 | ... != ... | Assert.cs:115:23:115:31 | ... != ... | true |
-| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:115:23:115:36 | ... && ... | false |
-| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:115:23:115:36 | ... && ... | true |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:115:23:115:36 | ... && ... | normal |
 | Assert.cs:115:28:115:31 | null | Assert.cs:115:28:115:31 | null | normal |
-| Assert.cs:115:36:115:36 | access to parameter b | Assert.cs:115:36:115:36 | access to parameter b | false |
-| Assert.cs:115:36:115:36 | access to parameter b | Assert.cs:115:36:115:36 | access to parameter b | true |
+| Assert.cs:115:36:115:36 | access to parameter b | Assert.cs:115:36:115:36 | access to parameter b | normal |
 | Assert.cs:116:9:116:35 | call to method WriteLine | Assert.cs:116:9:116:35 | call to method WriteLine | normal |
 | Assert.cs:116:9:116:36 | ...; | Assert.cs:116:9:116:35 | call to method WriteLine | normal |
 | Assert.cs:116:27:116:27 | access to local variable s | Assert.cs:116:27:116:27 | access to local variable s | normal |
@@ -734,13 +710,10 @@
 | Assert.cs:119:24:119:24 | access to local variable s | Assert.cs:119:24:119:24 | access to local variable s | normal |
 | Assert.cs:119:24:119:32 | ... == ... | Assert.cs:119:24:119:32 | ... == ... | false |
 | Assert.cs:119:24:119:32 | ... == ... | Assert.cs:119:24:119:32 | ... == ... | true |
-| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:119:24:119:38 | ... \|\| ... | false |
-| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:119:24:119:38 | ... \|\| ... | true |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:119:24:119:38 | ... \|\| ... | normal |
 | Assert.cs:119:29:119:32 | null | Assert.cs:119:29:119:32 | null | normal |
-| Assert.cs:119:37:119:38 | !... | Assert.cs:119:37:119:38 | !... | false |
-| Assert.cs:119:37:119:38 | !... | Assert.cs:119:37:119:38 | !... | true |
-| Assert.cs:119:38:119:38 | access to parameter b | Assert.cs:119:38:119:38 | access to parameter b | false |
-| Assert.cs:119:38:119:38 | access to parameter b | Assert.cs:119:38:119:38 | access to parameter b | true |
+| Assert.cs:119:37:119:38 | !... | Assert.cs:119:37:119:38 | !... | normal |
+| Assert.cs:119:38:119:38 | access to parameter b | Assert.cs:119:38:119:38 | access to parameter b | normal |
 | Assert.cs:120:9:120:35 | call to method WriteLine | Assert.cs:120:9:120:35 | call to method WriteLine | normal |
 | Assert.cs:120:9:120:36 | ...; | Assert.cs:120:9:120:35 | call to method WriteLine | normal |
 | Assert.cs:120:27:120:27 | access to local variable s | Assert.cs:120:27:120:27 | access to local variable s | normal |
@@ -759,11 +732,9 @@
 | Assert.cs:123:23:123:23 | access to local variable s | Assert.cs:123:23:123:23 | access to local variable s | normal |
 | Assert.cs:123:23:123:31 | ... == ... | Assert.cs:123:23:123:31 | ... == ... | false |
 | Assert.cs:123:23:123:31 | ... == ... | Assert.cs:123:23:123:31 | ... == ... | true |
-| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:123:23:123:36 | ... && ... | false |
-| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:123:23:123:36 | ... && ... | true |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:123:23:123:36 | ... && ... | normal |
 | Assert.cs:123:28:123:31 | null | Assert.cs:123:28:123:31 | null | normal |
-| Assert.cs:123:36:123:36 | access to parameter b | Assert.cs:123:36:123:36 | access to parameter b | false |
-| Assert.cs:123:36:123:36 | access to parameter b | Assert.cs:123:36:123:36 | access to parameter b | true |
+| Assert.cs:123:36:123:36 | access to parameter b | Assert.cs:123:36:123:36 | access to parameter b | normal |
 | Assert.cs:124:9:124:35 | call to method WriteLine | Assert.cs:124:9:124:35 | call to method WriteLine | normal |
 | Assert.cs:124:9:124:36 | ...; | Assert.cs:124:9:124:35 | call to method WriteLine | normal |
 | Assert.cs:124:27:124:27 | access to local variable s | Assert.cs:124:27:124:27 | access to local variable s | normal |
@@ -782,13 +753,10 @@
 | Assert.cs:127:24:127:24 | access to local variable s | Assert.cs:127:24:127:24 | access to local variable s | normal |
 | Assert.cs:127:24:127:32 | ... != ... | Assert.cs:127:24:127:32 | ... != ... | false |
 | Assert.cs:127:24:127:32 | ... != ... | Assert.cs:127:24:127:32 | ... != ... | true |
-| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:127:24:127:38 | ... \|\| ... | false |
-| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:127:24:127:38 | ... \|\| ... | true |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:127:24:127:38 | ... \|\| ... | normal |
 | Assert.cs:127:29:127:32 | null | Assert.cs:127:29:127:32 | null | normal |
-| Assert.cs:127:37:127:38 | !... | Assert.cs:127:37:127:38 | !... | false |
-| Assert.cs:127:37:127:38 | !... | Assert.cs:127:37:127:38 | !... | true |
-| Assert.cs:127:38:127:38 | access to parameter b | Assert.cs:127:38:127:38 | access to parameter b | false |
-| Assert.cs:127:38:127:38 | access to parameter b | Assert.cs:127:38:127:38 | access to parameter b | true |
+| Assert.cs:127:37:127:38 | !... | Assert.cs:127:37:127:38 | !... | normal |
+| Assert.cs:127:38:127:38 | access to parameter b | Assert.cs:127:38:127:38 | access to parameter b | normal |
 | Assert.cs:128:9:128:35 | call to method WriteLine | Assert.cs:128:9:128:35 | call to method WriteLine | normal |
 | Assert.cs:128:9:128:36 | ...; | Assert.cs:128:9:128:35 | call to method WriteLine | normal |
 | Assert.cs:128:27:128:27 | access to local variable s | Assert.cs:128:27:128:27 | access to local variable s | normal |
@@ -801,10 +769,8 @@
 | Assert.cs:140:9:140:35 | this access | Assert.cs:140:9:140:35 | this access | normal |
 | Assert.cs:140:9:140:36 | ...; | Assert.cs:140:9:140:35 | call to method AssertTrueFalse | normal |
 | Assert.cs:140:9:140:36 | ...; | Assert.cs:140:9:140:35 | call to method AssertTrueFalse | throw(Exception) |
-| Assert.cs:140:25:140:26 | access to parameter b1 | Assert.cs:140:25:140:26 | access to parameter b1 | false |
-| Assert.cs:140:25:140:26 | access to parameter b1 | Assert.cs:140:25:140:26 | access to parameter b1 | true |
-| Assert.cs:140:29:140:30 | access to parameter b2 | Assert.cs:140:29:140:30 | access to parameter b2 | false |
-| Assert.cs:140:29:140:30 | access to parameter b2 | Assert.cs:140:29:140:30 | access to parameter b2 | true |
+| Assert.cs:140:25:140:26 | access to parameter b1 | Assert.cs:140:25:140:26 | access to parameter b1 | normal |
+| Assert.cs:140:29:140:30 | access to parameter b2 | Assert.cs:140:29:140:30 | access to parameter b2 | normal |
 | Assert.cs:140:33:140:34 | access to parameter b3 | Assert.cs:140:33:140:34 | access to parameter b3 | normal |
 | Assert.cs:141:9:141:15 | return ...; | Assert.cs:141:9:141:15 | return ...; | return |
 | Assignments.cs:1:7:1:17 | call to constructor Object | Assignments.cs:1:7:1:17 | call to constructor Object | normal |
@@ -1593,7 +1559,7 @@
 | ExitMethods.cs:121:5:124:5 | {...} | ExitMethods.cs:123:13:123:17 | Int32 x = ... | normal |
 | ExitMethods.cs:122:9:122:28 | call to method IsTrue | ExitMethods.cs:122:9:122:28 | call to method IsTrue | throw(AssertFailedException) |
 | ExitMethods.cs:122:9:122:29 | ...; | ExitMethods.cs:122:9:122:28 | call to method IsTrue | throw(AssertFailedException) |
-| ExitMethods.cs:122:23:122:27 | false | ExitMethods.cs:122:23:122:27 | false | false |
+| ExitMethods.cs:122:23:122:27 | false | ExitMethods.cs:122:23:122:27 | false | normal |
 | ExitMethods.cs:123:9:123:18 | ... ...; | ExitMethods.cs:123:13:123:17 | Int32 x = ... | normal |
 | ExitMethods.cs:123:13:123:17 | Int32 x = ... | ExitMethods.cs:123:13:123:17 | Int32 x = ... | normal |
 | ExitMethods.cs:123:17:123:17 | 0 | ExitMethods.cs:123:17:123:17 | 0 | normal |
@@ -1607,14 +1573,13 @@
 | ExitMethods.cs:129:17:129:17 | 0 | ExitMethods.cs:129:17:129:17 | 0 | normal |
 | ExitMethods.cs:132:33:132:49 | call to method IsFalse | ExitMethods.cs:132:33:132:49 | call to method IsFalse | normal |
 | ExitMethods.cs:132:33:132:49 | call to method IsFalse | ExitMethods.cs:132:33:132:49 | call to method IsFalse | throw(AssertFailedException) |
-| ExitMethods.cs:132:48:132:48 | access to parameter b | ExitMethods.cs:132:48:132:48 | access to parameter b | false |
-| ExitMethods.cs:132:48:132:48 | access to parameter b | ExitMethods.cs:132:48:132:48 | access to parameter b | true |
+| ExitMethods.cs:132:48:132:48 | access to parameter b | ExitMethods.cs:132:48:132:48 | access to parameter b | normal |
 | ExitMethods.cs:135:5:138:5 | {...} | ExitMethods.cs:136:9:136:25 | call to method AssertFalse | throw(AssertFailedException) |
 | ExitMethods.cs:135:5:138:5 | {...} | ExitMethods.cs:137:13:137:17 | Int32 x = ... | normal |
 | ExitMethods.cs:136:9:136:25 | call to method AssertFalse | ExitMethods.cs:136:9:136:25 | call to method AssertFalse | throw(AssertFailedException) |
 | ExitMethods.cs:136:9:136:25 | this access | ExitMethods.cs:136:9:136:25 | this access | normal |
 | ExitMethods.cs:136:9:136:26 | ...; | ExitMethods.cs:136:9:136:25 | call to method AssertFalse | throw(AssertFailedException) |
-| ExitMethods.cs:136:21:136:24 | true | ExitMethods.cs:136:21:136:24 | true | true |
+| ExitMethods.cs:136:21:136:24 | true | ExitMethods.cs:136:21:136:24 | true | normal |
 | ExitMethods.cs:137:9:137:18 | ... ...; | ExitMethods.cs:137:13:137:17 | Int32 x = ... | normal |
 | ExitMethods.cs:137:13:137:17 | Int32 x = ... | ExitMethods.cs:137:13:137:17 | Int32 x = ... | normal |
 | ExitMethods.cs:137:17:137:17 | 0 | ExitMethods.cs:137:17:137:17 | 0 | normal |
diff --git a/csharp/ql/test/library-tests/controlflow/graph/NodeGraph.expected b/csharp/ql/test/library-tests/controlflow/graph/NodeGraph.expected
index 1664d77538a..63855522ba6 100644
--- a/csharp/ql/test/library-tests/controlflow/graph/NodeGraph.expected
+++ b/csharp/ql/test/library-tests/controlflow/graph/NodeGraph.expected
@@ -350,12 +350,11 @@
 | Assert.cs:9:20:9:32 | ... ? ... : ... | Assert.cs:9:16:9:32 | String s = ... |  |
 | Assert.cs:9:24:9:27 | null | Assert.cs:9:20:9:32 | ... ? ... : ... |  |
 | Assert.cs:9:31:9:32 | "" | Assert.cs:9:20:9:32 | ... ? ... : ... |  |
-| Assert.cs:10:9:10:31 | [assertion failure] call to method Assert | Assert.cs:7:10:7:11 | exit M1 (abnormal) | exit |
-| Assert.cs:10:9:10:31 | [assertion success] call to method Assert | Assert.cs:11:9:11:36 | ...; |  |
+| Assert.cs:10:9:10:31 | call to method Assert | Assert.cs:7:10:7:11 | exit M1 (abnormal) | exit |
+| Assert.cs:10:9:10:31 | call to method Assert | Assert.cs:11:9:11:36 | ...; |  |
 | Assert.cs:10:9:10:32 | ...; | Assert.cs:10:22:10:22 | access to local variable s |  |
 | Assert.cs:10:22:10:22 | access to local variable s | Assert.cs:10:27:10:30 | null |  |
-| Assert.cs:10:22:10:30 | ... != ... | Assert.cs:10:9:10:31 | [assertion failure] call to method Assert | false |
-| Assert.cs:10:22:10:30 | ... != ... | Assert.cs:10:9:10:31 | [assertion success] call to method Assert | true |
+| Assert.cs:10:22:10:30 | ... != ... | Assert.cs:10:9:10:31 | call to method Assert |  |
 | Assert.cs:10:27:10:30 | null | Assert.cs:10:22:10:30 | ... != ... |  |
 | Assert.cs:11:9:11:35 | call to method WriteLine | Assert.cs:7:10:7:11 | exit M1 (normal) |  |
 | Assert.cs:11:9:11:36 | ...; | Assert.cs:11:27:11:27 | access to local variable s |  |
@@ -372,11 +371,10 @@
 | Assert.cs:16:20:16:32 | ... ? ... : ... | Assert.cs:16:16:16:32 | String s = ... |  |
 | Assert.cs:16:24:16:27 | null | Assert.cs:16:20:16:32 | ... ? ... : ... |  |
 | Assert.cs:16:31:16:32 | "" | Assert.cs:16:20:16:32 | ... ? ... : ... |  |
-| Assert.cs:17:9:17:24 | [assertion failure] call to method IsNull | Assert.cs:14:10:14:11 | exit M2 (abnormal) | exception(AssertFailedException) |
-| Assert.cs:17:9:17:24 | [assertion success] call to method IsNull | Assert.cs:18:9:18:36 | ...; |  |
+| Assert.cs:17:9:17:24 | call to method IsNull | Assert.cs:14:10:14:11 | exit M2 (abnormal) | exception |
+| Assert.cs:17:9:17:24 | call to method IsNull | Assert.cs:18:9:18:36 | ...; |  |
 | Assert.cs:17:9:17:25 | ...; | Assert.cs:17:23:17:23 | access to local variable s |  |
-| Assert.cs:17:23:17:23 | access to local variable s | Assert.cs:17:9:17:24 | [assertion failure] call to method IsNull | non-null |
-| Assert.cs:17:23:17:23 | access to local variable s | Assert.cs:17:9:17:24 | [assertion success] call to method IsNull | null |
+| Assert.cs:17:23:17:23 | access to local variable s | Assert.cs:17:9:17:24 | call to method IsNull |  |
 | Assert.cs:18:9:18:35 | call to method WriteLine | Assert.cs:14:10:14:11 | exit M2 (normal) |  |
 | Assert.cs:18:9:18:36 | ...; | Assert.cs:18:27:18:27 | access to local variable s |  |
 | Assert.cs:18:27:18:27 | access to local variable s | Assert.cs:18:27:18:34 | access to property Length |  |
@@ -392,11 +390,10 @@
 | Assert.cs:23:20:23:32 | ... ? ... : ... | Assert.cs:23:16:23:32 | String s = ... |  |
 | Assert.cs:23:24:23:27 | null | Assert.cs:23:20:23:32 | ... ? ... : ... |  |
 | Assert.cs:23:31:23:32 | "" | Assert.cs:23:20:23:32 | ... ? ... : ... |  |
-| Assert.cs:24:9:24:27 | [assertion failure] call to method IsNotNull | Assert.cs:21:10:21:11 | exit M3 (abnormal) | exception(AssertFailedException) |
-| Assert.cs:24:9:24:27 | [assertion success] call to method IsNotNull | Assert.cs:25:9:25:36 | ...; |  |
+| Assert.cs:24:9:24:27 | call to method IsNotNull | Assert.cs:21:10:21:11 | exit M3 (abnormal) | exception |
+| Assert.cs:24:9:24:27 | call to method IsNotNull | Assert.cs:25:9:25:36 | ...; |  |
 | Assert.cs:24:9:24:28 | ...; | Assert.cs:24:26:24:26 | access to local variable s |  |
-| Assert.cs:24:26:24:26 | access to local variable s | Assert.cs:24:9:24:27 | [assertion failure] call to method IsNotNull | null |
-| Assert.cs:24:26:24:26 | access to local variable s | Assert.cs:24:9:24:27 | [assertion success] call to method IsNotNull | non-null |
+| Assert.cs:24:26:24:26 | access to local variable s | Assert.cs:24:9:24:27 | call to method IsNotNull |  |
 | Assert.cs:25:9:25:35 | call to method WriteLine | Assert.cs:21:10:21:11 | exit M3 (normal) |  |
 | Assert.cs:25:9:25:36 | ...; | Assert.cs:25:27:25:27 | access to local variable s |  |
 | Assert.cs:25:27:25:27 | access to local variable s | Assert.cs:25:27:25:34 | access to property Length |  |
@@ -412,12 +409,11 @@
 | Assert.cs:30:20:30:32 | ... ? ... : ... | Assert.cs:30:16:30:32 | String s = ... |  |
 | Assert.cs:30:24:30:27 | null | Assert.cs:30:20:30:32 | ... ? ... : ... |  |
 | Assert.cs:30:31:30:32 | "" | Assert.cs:30:20:30:32 | ... ? ... : ... |  |
-| Assert.cs:31:9:31:32 | [assertion failure] call to method IsTrue | Assert.cs:28:10:28:11 | exit M4 (abnormal) | exception(AssertFailedException) |
-| Assert.cs:31:9:31:32 | [assertion success] call to method IsTrue | Assert.cs:32:9:32:36 | ...; |  |
+| Assert.cs:31:9:31:32 | call to method IsTrue | Assert.cs:28:10:28:11 | exit M4 (abnormal) | exception |
+| Assert.cs:31:9:31:32 | call to method IsTrue | Assert.cs:32:9:32:36 | ...; |  |
 | Assert.cs:31:9:31:33 | ...; | Assert.cs:31:23:31:23 | access to local variable s |  |
 | Assert.cs:31:23:31:23 | access to local variable s | Assert.cs:31:28:31:31 | null |  |
-| Assert.cs:31:23:31:31 | ... == ... | Assert.cs:31:9:31:32 | [assertion failure] call to method IsTrue | false |
-| Assert.cs:31:23:31:31 | ... == ... | Assert.cs:31:9:31:32 | [assertion success] call to method IsTrue | true |
+| Assert.cs:31:23:31:31 | ... == ... | Assert.cs:31:9:31:32 | call to method IsTrue |  |
 | Assert.cs:31:28:31:31 | null | Assert.cs:31:23:31:31 | ... == ... |  |
 | Assert.cs:32:9:32:35 | call to method WriteLine | Assert.cs:28:10:28:11 | exit M4 (normal) |  |
 | Assert.cs:32:9:32:36 | ...; | Assert.cs:32:27:32:27 | access to local variable s |  |
@@ -434,12 +430,11 @@
 | Assert.cs:37:20:37:32 | ... ? ... : ... | Assert.cs:37:16:37:32 | String s = ... |  |
 | Assert.cs:37:24:37:27 | null | Assert.cs:37:20:37:32 | ... ? ... : ... |  |
 | Assert.cs:37:31:37:32 | "" | Assert.cs:37:20:37:32 | ... ? ... : ... |  |
-| Assert.cs:38:9:38:32 | [assertion failure] call to method IsTrue | Assert.cs:35:10:35:11 | exit M5 (abnormal) | exception(AssertFailedException) |
-| Assert.cs:38:9:38:32 | [assertion success] call to method IsTrue | Assert.cs:39:9:39:36 | ...; |  |
+| Assert.cs:38:9:38:32 | call to method IsTrue | Assert.cs:35:10:35:11 | exit M5 (abnormal) | exception |
+| Assert.cs:38:9:38:32 | call to method IsTrue | Assert.cs:39:9:39:36 | ...; |  |
 | Assert.cs:38:9:38:33 | ...; | Assert.cs:38:23:38:23 | access to local variable s |  |
 | Assert.cs:38:23:38:23 | access to local variable s | Assert.cs:38:28:38:31 | null |  |
-| Assert.cs:38:23:38:31 | ... != ... | Assert.cs:38:9:38:32 | [assertion failure] call to method IsTrue | false |
-| Assert.cs:38:23:38:31 | ... != ... | Assert.cs:38:9:38:32 | [assertion success] call to method IsTrue | true |
+| Assert.cs:38:23:38:31 | ... != ... | Assert.cs:38:9:38:32 | call to method IsTrue |  |
 | Assert.cs:38:28:38:31 | null | Assert.cs:38:23:38:31 | ... != ... |  |
 | Assert.cs:39:9:39:35 | call to method WriteLine | Assert.cs:35:10:35:11 | exit M5 (normal) |  |
 | Assert.cs:39:9:39:36 | ...; | Assert.cs:39:27:39:27 | access to local variable s |  |
@@ -456,12 +451,11 @@
 | Assert.cs:44:20:44:32 | ... ? ... : ... | Assert.cs:44:16:44:32 | String s = ... |  |
 | Assert.cs:44:24:44:27 | null | Assert.cs:44:20:44:32 | ... ? ... : ... |  |
 | Assert.cs:44:31:44:32 | "" | Assert.cs:44:20:44:32 | ... ? ... : ... |  |
-| Assert.cs:45:9:45:33 | [assertion failure] call to method IsFalse | Assert.cs:42:10:42:11 | exit M6 (abnormal) | exception(AssertFailedException) |
-| Assert.cs:45:9:45:33 | [assertion success] call to method IsFalse | Assert.cs:46:9:46:36 | ...; |  |
+| Assert.cs:45:9:45:33 | call to method IsFalse | Assert.cs:42:10:42:11 | exit M6 (abnormal) | exception |
+| Assert.cs:45:9:45:33 | call to method IsFalse | Assert.cs:46:9:46:36 | ...; |  |
 | Assert.cs:45:9:45:34 | ...; | Assert.cs:45:24:45:24 | access to local variable s |  |
 | Assert.cs:45:24:45:24 | access to local variable s | Assert.cs:45:29:45:32 | null |  |
-| Assert.cs:45:24:45:32 | ... != ... | Assert.cs:45:9:45:33 | [assertion failure] call to method IsFalse | true |
-| Assert.cs:45:24:45:32 | ... != ... | Assert.cs:45:9:45:33 | [assertion success] call to method IsFalse | false |
+| Assert.cs:45:24:45:32 | ... != ... | Assert.cs:45:9:45:33 | call to method IsFalse |  |
 | Assert.cs:45:29:45:32 | null | Assert.cs:45:24:45:32 | ... != ... |  |
 | Assert.cs:46:9:46:35 | call to method WriteLine | Assert.cs:42:10:42:11 | exit M6 (normal) |  |
 | Assert.cs:46:9:46:36 | ...; | Assert.cs:46:27:46:27 | access to local variable s |  |
@@ -478,12 +472,11 @@
 | Assert.cs:51:20:51:32 | ... ? ... : ... | Assert.cs:51:16:51:32 | String s = ... |  |
 | Assert.cs:51:24:51:27 | null | Assert.cs:51:20:51:32 | ... ? ... : ... |  |
 | Assert.cs:51:31:51:32 | "" | Assert.cs:51:20:51:32 | ... ? ... : ... |  |
-| Assert.cs:52:9:52:33 | [assertion failure] call to method IsFalse | Assert.cs:49:10:49:11 | exit M7 (abnormal) | exception(AssertFailedException) |
-| Assert.cs:52:9:52:33 | [assertion success] call to method IsFalse | Assert.cs:53:9:53:36 | ...; |  |
+| Assert.cs:52:9:52:33 | call to method IsFalse | Assert.cs:49:10:49:11 | exit M7 (abnormal) | exception |
+| Assert.cs:52:9:52:33 | call to method IsFalse | Assert.cs:53:9:53:36 | ...; |  |
 | Assert.cs:52:9:52:34 | ...; | Assert.cs:52:24:52:24 | access to local variable s |  |
 | Assert.cs:52:24:52:24 | access to local variable s | Assert.cs:52:29:52:32 | null |  |
-| Assert.cs:52:24:52:32 | ... == ... | Assert.cs:52:9:52:33 | [assertion failure] call to method IsFalse | true |
-| Assert.cs:52:24:52:32 | ... == ... | Assert.cs:52:9:52:33 | [assertion success] call to method IsFalse | false |
+| Assert.cs:52:24:52:32 | ... == ... | Assert.cs:52:9:52:33 | call to method IsFalse |  |
 | Assert.cs:52:29:52:32 | null | Assert.cs:52:24:52:32 | ... == ... |  |
 | Assert.cs:53:9:53:35 | call to method WriteLine | Assert.cs:49:10:49:11 | exit M7 (normal) |  |
 | Assert.cs:53:9:53:36 | ...; | Assert.cs:53:27:53:27 | access to local variable s |  |
@@ -494,30 +487,21 @@
 | Assert.cs:56:10:56:11 | exit M8 (normal) | Assert.cs:56:10:56:11 | exit M8 |  |
 | Assert.cs:57:5:61:5 | {...} | Assert.cs:58:9:58:33 | ... ...; |  |
 | Assert.cs:58:9:58:33 | ... ...; | Assert.cs:58:20:58:20 | access to parameter b |  |
-| Assert.cs:58:16:58:32 | [b (line 56): false] String s = ... | Assert.cs:59:9:59:38 | [b (line 56): false] ...; |  |
-| Assert.cs:58:16:58:32 | [b (line 56): true] String s = ... | Assert.cs:59:9:59:38 | [b (line 56): true] ...; |  |
-| Assert.cs:58:20:58:20 | access to parameter b | Assert.cs:58:24:58:27 | [b (line 56): true] null | true |
-| Assert.cs:58:20:58:20 | access to parameter b | Assert.cs:58:31:58:32 | [b (line 56): false] "" | false |
-| Assert.cs:58:20:58:32 | [b (line 56): false] ... ? ... : ... | Assert.cs:58:16:58:32 | [b (line 56): false] String s = ... |  |
-| Assert.cs:58:20:58:32 | [b (line 56): true] ... ? ... : ... | Assert.cs:58:16:58:32 | [b (line 56): true] String s = ... |  |
-| Assert.cs:58:24:58:27 | [b (line 56): true] null | Assert.cs:58:20:58:32 | [b (line 56): true] ... ? ... : ... |  |
-| Assert.cs:58:31:58:32 | [b (line 56): false] "" | Assert.cs:58:20:58:32 | [b (line 56): false] ... ? ... : ... |  |
-| Assert.cs:59:9:59:37 | [assertion failure] call to method IsTrue | Assert.cs:56:10:56:11 | exit M8 (abnormal) | exception(AssertFailedException) |
-| Assert.cs:59:9:59:37 | [assertion success] call to method IsTrue | Assert.cs:60:9:60:36 | ...; |  |
-| Assert.cs:59:9:59:38 | [b (line 56): false] ...; | Assert.cs:59:23:59:23 | [b (line 56): false] access to local variable s |  |
-| Assert.cs:59:9:59:38 | [b (line 56): true] ...; | Assert.cs:59:23:59:23 | [b (line 56): true] access to local variable s |  |
-| Assert.cs:59:23:59:23 | [b (line 56): false] access to local variable s | Assert.cs:59:28:59:31 | [b (line 56): false] null |  |
-| Assert.cs:59:23:59:23 | [b (line 56): true] access to local variable s | Assert.cs:59:28:59:31 | [b (line 56): true] null |  |
-| Assert.cs:59:23:59:31 | [b (line 56): false] ... != ... | Assert.cs:59:23:59:36 | [false] ... && ... | false |
-| Assert.cs:59:23:59:31 | [b (line 56): false] ... != ... | Assert.cs:59:36:59:36 | [b (line 56): false] access to parameter b | true |
-| Assert.cs:59:23:59:31 | [b (line 56): true] ... != ... | Assert.cs:59:23:59:36 | [false] ... && ... | false |
-| Assert.cs:59:23:59:31 | [b (line 56): true] ... != ... | Assert.cs:59:36:59:36 | [b (line 56): true] access to parameter b | true |
-| Assert.cs:59:23:59:36 | [false] ... && ... | Assert.cs:59:9:59:37 | [assertion failure] call to method IsTrue | false |
-| Assert.cs:59:23:59:36 | [true] ... && ... | Assert.cs:59:9:59:37 | [assertion success] call to method IsTrue | true |
-| Assert.cs:59:28:59:31 | [b (line 56): false] null | Assert.cs:59:23:59:31 | [b (line 56): false] ... != ... |  |
-| Assert.cs:59:28:59:31 | [b (line 56): true] null | Assert.cs:59:23:59:31 | [b (line 56): true] ... != ... |  |
-| Assert.cs:59:36:59:36 | [b (line 56): false] access to parameter b | Assert.cs:59:23:59:36 | [false] ... && ... | false |
-| Assert.cs:59:36:59:36 | [b (line 56): true] access to parameter b | Assert.cs:59:23:59:36 | [true] ... && ... | true |
+| Assert.cs:58:16:58:32 | String s = ... | Assert.cs:59:9:59:38 | ...; |  |
+| Assert.cs:58:20:58:20 | access to parameter b | Assert.cs:58:24:58:27 | null | true |
+| Assert.cs:58:20:58:20 | access to parameter b | Assert.cs:58:31:58:32 | "" | false |
+| Assert.cs:58:20:58:32 | ... ? ... : ... | Assert.cs:58:16:58:32 | String s = ... |  |
+| Assert.cs:58:24:58:27 | null | Assert.cs:58:20:58:32 | ... ? ... : ... |  |
+| Assert.cs:58:31:58:32 | "" | Assert.cs:58:20:58:32 | ... ? ... : ... |  |
+| Assert.cs:59:9:59:37 | call to method IsTrue | Assert.cs:56:10:56:11 | exit M8 (abnormal) | exception |
+| Assert.cs:59:9:59:37 | call to method IsTrue | Assert.cs:60:9:60:36 | ...; |  |
+| Assert.cs:59:9:59:38 | ...; | Assert.cs:59:23:59:23 | access to local variable s |  |
+| Assert.cs:59:23:59:23 | access to local variable s | Assert.cs:59:28:59:31 | null |  |
+| Assert.cs:59:23:59:31 | ... != ... | Assert.cs:59:23:59:36 | ... && ... | false |
+| Assert.cs:59:23:59:31 | ... != ... | Assert.cs:59:36:59:36 | access to parameter b | true |
+| Assert.cs:59:23:59:36 | ... && ... | Assert.cs:59:9:59:37 | call to method IsTrue |  |
+| Assert.cs:59:28:59:31 | null | Assert.cs:59:23:59:31 | ... != ... |  |
+| Assert.cs:59:36:59:36 | access to parameter b | Assert.cs:59:23:59:36 | ... && ... |  |
 | Assert.cs:60:9:60:35 | call to method WriteLine | Assert.cs:56:10:56:11 | exit M8 (normal) |  |
 | Assert.cs:60:9:60:36 | ...; | Assert.cs:60:27:60:27 | access to local variable s |  |
 | Assert.cs:60:27:60:27 | access to local variable s | Assert.cs:60:27:60:34 | access to property Length |  |
@@ -527,30 +511,21 @@
 | Assert.cs:63:10:63:11 | exit M9 (normal) | Assert.cs:63:10:63:11 | exit M9 |  |
 | Assert.cs:64:5:68:5 | {...} | Assert.cs:65:9:65:33 | ... ...; |  |
 | Assert.cs:65:9:65:33 | ... ...; | Assert.cs:65:20:65:20 | access to parameter b |  |
-| Assert.cs:65:16:65:32 | [b (line 63): false] String s = ... | Assert.cs:66:9:66:39 | [b (line 63): false] ...; |  |
-| Assert.cs:65:16:65:32 | [b (line 63): true] String s = ... | Assert.cs:66:9:66:39 | [b (line 63): true] ...; |  |
-| Assert.cs:65:20:65:20 | access to parameter b | Assert.cs:65:24:65:27 | [b (line 63): true] null | true |
-| Assert.cs:65:20:65:20 | access to parameter b | Assert.cs:65:31:65:32 | [b (line 63): false] "" | false |
-| Assert.cs:65:20:65:32 | [b (line 63): false] ... ? ... : ... | Assert.cs:65:16:65:32 | [b (line 63): false] String s = ... |  |
-| Assert.cs:65:20:65:32 | [b (line 63): true] ... ? ... : ... | Assert.cs:65:16:65:32 | [b (line 63): true] String s = ... |  |
-| Assert.cs:65:24:65:27 | [b (line 63): true] null | Assert.cs:65:20:65:32 | [b (line 63): true] ... ? ... : ... |  |
-| Assert.cs:65:31:65:32 | [b (line 63): false] "" | Assert.cs:65:20:65:32 | [b (line 63): false] ... ? ... : ... |  |
-| Assert.cs:66:9:66:38 | [assertion failure] call to method IsFalse | Assert.cs:63:10:63:11 | exit M9 (abnormal) | exception(AssertFailedException) |
-| Assert.cs:66:9:66:38 | [assertion success] call to method IsFalse | Assert.cs:67:9:67:36 | ...; |  |
-| Assert.cs:66:9:66:39 | [b (line 63): false] ...; | Assert.cs:66:24:66:24 | [b (line 63): false] access to local variable s |  |
-| Assert.cs:66:9:66:39 | [b (line 63): true] ...; | Assert.cs:66:24:66:24 | [b (line 63): true] access to local variable s |  |
-| Assert.cs:66:24:66:24 | [b (line 63): false] access to local variable s | Assert.cs:66:29:66:32 | [b (line 63): false] null |  |
-| Assert.cs:66:24:66:24 | [b (line 63): true] access to local variable s | Assert.cs:66:29:66:32 | [b (line 63): true] null |  |
-| Assert.cs:66:24:66:32 | [b (line 63): false] ... == ... | Assert.cs:66:24:66:37 | [true] ... \|\| ... | true |
-| Assert.cs:66:24:66:32 | [b (line 63): false] ... == ... | Assert.cs:66:37:66:37 | [b (line 63): false] access to parameter b | false |
-| Assert.cs:66:24:66:32 | [b (line 63): true] ... == ... | Assert.cs:66:24:66:37 | [true] ... \|\| ... | true |
-| Assert.cs:66:24:66:32 | [b (line 63): true] ... == ... | Assert.cs:66:37:66:37 | [b (line 63): true] access to parameter b | false |
-| Assert.cs:66:24:66:37 | [false] ... \|\| ... | Assert.cs:66:9:66:38 | [assertion success] call to method IsFalse | false |
-| Assert.cs:66:24:66:37 | [true] ... \|\| ... | Assert.cs:66:9:66:38 | [assertion failure] call to method IsFalse | true |
-| Assert.cs:66:29:66:32 | [b (line 63): false] null | Assert.cs:66:24:66:32 | [b (line 63): false] ... == ... |  |
-| Assert.cs:66:29:66:32 | [b (line 63): true] null | Assert.cs:66:24:66:32 | [b (line 63): true] ... == ... |  |
-| Assert.cs:66:37:66:37 | [b (line 63): false] access to parameter b | Assert.cs:66:24:66:37 | [false] ... \|\| ... | false |
-| Assert.cs:66:37:66:37 | [b (line 63): true] access to parameter b | Assert.cs:66:24:66:37 | [true] ... \|\| ... | true |
+| Assert.cs:65:16:65:32 | String s = ... | Assert.cs:66:9:66:39 | ...; |  |
+| Assert.cs:65:20:65:20 | access to parameter b | Assert.cs:65:24:65:27 | null | true |
+| Assert.cs:65:20:65:20 | access to parameter b | Assert.cs:65:31:65:32 | "" | false |
+| Assert.cs:65:20:65:32 | ... ? ... : ... | Assert.cs:65:16:65:32 | String s = ... |  |
+| Assert.cs:65:24:65:27 | null | Assert.cs:65:20:65:32 | ... ? ... : ... |  |
+| Assert.cs:65:31:65:32 | "" | Assert.cs:65:20:65:32 | ... ? ... : ... |  |
+| Assert.cs:66:9:66:38 | call to method IsFalse | Assert.cs:63:10:63:11 | exit M9 (abnormal) | exception |
+| Assert.cs:66:9:66:38 | call to method IsFalse | Assert.cs:67:9:67:36 | ...; |  |
+| Assert.cs:66:9:66:39 | ...; | Assert.cs:66:24:66:24 | access to local variable s |  |
+| Assert.cs:66:24:66:24 | access to local variable s | Assert.cs:66:29:66:32 | null |  |
+| Assert.cs:66:24:66:32 | ... == ... | Assert.cs:66:24:66:37 | ... \|\| ... | true |
+| Assert.cs:66:24:66:32 | ... == ... | Assert.cs:66:37:66:37 | access to parameter b | false |
+| Assert.cs:66:24:66:37 | ... \|\| ... | Assert.cs:66:9:66:38 | call to method IsFalse |  |
+| Assert.cs:66:29:66:32 | null | Assert.cs:66:24:66:32 | ... == ... |  |
+| Assert.cs:66:37:66:37 | access to parameter b | Assert.cs:66:24:66:37 | ... \|\| ... |  |
 | Assert.cs:67:9:67:35 | call to method WriteLine | Assert.cs:63:10:63:11 | exit M9 (normal) |  |
 | Assert.cs:67:9:67:36 | ...; | Assert.cs:67:27:67:27 | access to local variable s |  |
 | Assert.cs:67:27:67:27 | access to local variable s | Assert.cs:67:27:67:34 | access to property Length |  |
@@ -560,30 +535,21 @@
 | Assert.cs:70:10:70:12 | exit M10 (normal) | Assert.cs:70:10:70:12 | exit M10 |  |
 | Assert.cs:71:5:75:5 | {...} | Assert.cs:72:9:72:33 | ... ...; |  |
 | Assert.cs:72:9:72:33 | ... ...; | Assert.cs:72:20:72:20 | access to parameter b |  |
-| Assert.cs:72:16:72:32 | [b (line 70): false] String s = ... | Assert.cs:73:9:73:38 | [b (line 70): false] ...; |  |
-| Assert.cs:72:16:72:32 | [b (line 70): true] String s = ... | Assert.cs:73:9:73:38 | [b (line 70): true] ...; |  |
-| Assert.cs:72:20:72:20 | access to parameter b | Assert.cs:72:24:72:27 | [b (line 70): true] null | true |
-| Assert.cs:72:20:72:20 | access to parameter b | Assert.cs:72:31:72:32 | [b (line 70): false] "" | false |
-| Assert.cs:72:20:72:32 | [b (line 70): false] ... ? ... : ... | Assert.cs:72:16:72:32 | [b (line 70): false] String s = ... |  |
-| Assert.cs:72:20:72:32 | [b (line 70): true] ... ? ... : ... | Assert.cs:72:16:72:32 | [b (line 70): true] String s = ... |  |
-| Assert.cs:72:24:72:27 | [b (line 70): true] null | Assert.cs:72:20:72:32 | [b (line 70): true] ... ? ... : ... |  |
-| Assert.cs:72:31:72:32 | [b (line 70): false] "" | Assert.cs:72:20:72:32 | [b (line 70): false] ... ? ... : ... |  |
-| Assert.cs:73:9:73:37 | [assertion failure] call to method IsTrue | Assert.cs:70:10:70:12 | exit M10 (abnormal) | exception(AssertFailedException) |
-| Assert.cs:73:9:73:37 | [assertion success] call to method IsTrue | Assert.cs:74:9:74:36 | ...; |  |
-| Assert.cs:73:9:73:38 | [b (line 70): false] ...; | Assert.cs:73:23:73:23 | [b (line 70): false] access to local variable s |  |
-| Assert.cs:73:9:73:38 | [b (line 70): true] ...; | Assert.cs:73:23:73:23 | [b (line 70): true] access to local variable s |  |
-| Assert.cs:73:23:73:23 | [b (line 70): false] access to local variable s | Assert.cs:73:28:73:31 | [b (line 70): false] null |  |
-| Assert.cs:73:23:73:23 | [b (line 70): true] access to local variable s | Assert.cs:73:28:73:31 | [b (line 70): true] null |  |
-| Assert.cs:73:23:73:31 | [b (line 70): false] ... == ... | Assert.cs:73:23:73:36 | [false] ... && ... | false |
-| Assert.cs:73:23:73:31 | [b (line 70): false] ... == ... | Assert.cs:73:36:73:36 | [b (line 70): false] access to parameter b | true |
-| Assert.cs:73:23:73:31 | [b (line 70): true] ... == ... | Assert.cs:73:23:73:36 | [false] ... && ... | false |
-| Assert.cs:73:23:73:31 | [b (line 70): true] ... == ... | Assert.cs:73:36:73:36 | [b (line 70): true] access to parameter b | true |
-| Assert.cs:73:23:73:36 | [false] ... && ... | Assert.cs:73:9:73:37 | [assertion failure] call to method IsTrue | false |
-| Assert.cs:73:23:73:36 | [true] ... && ... | Assert.cs:73:9:73:37 | [assertion success] call to method IsTrue | true |
-| Assert.cs:73:28:73:31 | [b (line 70): false] null | Assert.cs:73:23:73:31 | [b (line 70): false] ... == ... |  |
-| Assert.cs:73:28:73:31 | [b (line 70): true] null | Assert.cs:73:23:73:31 | [b (line 70): true] ... == ... |  |
-| Assert.cs:73:36:73:36 | [b (line 70): false] access to parameter b | Assert.cs:73:23:73:36 | [false] ... && ... | false |
-| Assert.cs:73:36:73:36 | [b (line 70): true] access to parameter b | Assert.cs:73:23:73:36 | [true] ... && ... | true |
+| Assert.cs:72:16:72:32 | String s = ... | Assert.cs:73:9:73:38 | ...; |  |
+| Assert.cs:72:20:72:20 | access to parameter b | Assert.cs:72:24:72:27 | null | true |
+| Assert.cs:72:20:72:20 | access to parameter b | Assert.cs:72:31:72:32 | "" | false |
+| Assert.cs:72:20:72:32 | ... ? ... : ... | Assert.cs:72:16:72:32 | String s = ... |  |
+| Assert.cs:72:24:72:27 | null | Assert.cs:72:20:72:32 | ... ? ... : ... |  |
+| Assert.cs:72:31:72:32 | "" | Assert.cs:72:20:72:32 | ... ? ... : ... |  |
+| Assert.cs:73:9:73:37 | call to method IsTrue | Assert.cs:70:10:70:12 | exit M10 (abnormal) | exception |
+| Assert.cs:73:9:73:37 | call to method IsTrue | Assert.cs:74:9:74:36 | ...; |  |
+| Assert.cs:73:9:73:38 | ...; | Assert.cs:73:23:73:23 | access to local variable s |  |
+| Assert.cs:73:23:73:23 | access to local variable s | Assert.cs:73:28:73:31 | null |  |
+| Assert.cs:73:23:73:31 | ... == ... | Assert.cs:73:23:73:36 | ... && ... | false |
+| Assert.cs:73:23:73:31 | ... == ... | Assert.cs:73:36:73:36 | access to parameter b | true |
+| Assert.cs:73:23:73:36 | ... && ... | Assert.cs:73:9:73:37 | call to method IsTrue |  |
+| Assert.cs:73:28:73:31 | null | Assert.cs:73:23:73:31 | ... == ... |  |
+| Assert.cs:73:36:73:36 | access to parameter b | Assert.cs:73:23:73:36 | ... && ... |  |
 | Assert.cs:74:9:74:35 | call to method WriteLine | Assert.cs:70:10:70:12 | exit M10 (normal) |  |
 | Assert.cs:74:9:74:36 | ...; | Assert.cs:74:27:74:27 | access to local variable s |  |
 | Assert.cs:74:27:74:27 | access to local variable s | Assert.cs:74:27:74:34 | access to property Length |  |
@@ -593,30 +559,21 @@
 | Assert.cs:77:10:77:12 | exit M11 (normal) | Assert.cs:77:10:77:12 | exit M11 |  |
 | Assert.cs:78:5:82:5 | {...} | Assert.cs:79:9:79:33 | ... ...; |  |
 | Assert.cs:79:9:79:33 | ... ...; | Assert.cs:79:20:79:20 | access to parameter b |  |
-| Assert.cs:79:16:79:32 | [b (line 77): false] String s = ... | Assert.cs:80:9:80:39 | [b (line 77): false] ...; |  |
-| Assert.cs:79:16:79:32 | [b (line 77): true] String s = ... | Assert.cs:80:9:80:39 | [b (line 77): true] ...; |  |
-| Assert.cs:79:20:79:20 | access to parameter b | Assert.cs:79:24:79:27 | [b (line 77): true] null | true |
-| Assert.cs:79:20:79:20 | access to parameter b | Assert.cs:79:31:79:32 | [b (line 77): false] "" | false |
-| Assert.cs:79:20:79:32 | [b (line 77): false] ... ? ... : ... | Assert.cs:79:16:79:32 | [b (line 77): false] String s = ... |  |
-| Assert.cs:79:20:79:32 | [b (line 77): true] ... ? ... : ... | Assert.cs:79:16:79:32 | [b (line 77): true] String s = ... |  |
-| Assert.cs:79:24:79:27 | [b (line 77): true] null | Assert.cs:79:20:79:32 | [b (line 77): true] ... ? ... : ... |  |
-| Assert.cs:79:31:79:32 | [b (line 77): false] "" | Assert.cs:79:20:79:32 | [b (line 77): false] ... ? ... : ... |  |
-| Assert.cs:80:9:80:38 | [assertion failure] call to method IsFalse | Assert.cs:77:10:77:12 | exit M11 (abnormal) | exception(AssertFailedException) |
-| Assert.cs:80:9:80:38 | [assertion success] call to method IsFalse | Assert.cs:81:9:81:36 | ...; |  |
-| Assert.cs:80:9:80:39 | [b (line 77): false] ...; | Assert.cs:80:24:80:24 | [b (line 77): false] access to local variable s |  |
-| Assert.cs:80:9:80:39 | [b (line 77): true] ...; | Assert.cs:80:24:80:24 | [b (line 77): true] access to local variable s |  |
-| Assert.cs:80:24:80:24 | [b (line 77): false] access to local variable s | Assert.cs:80:29:80:32 | [b (line 77): false] null |  |
-| Assert.cs:80:24:80:24 | [b (line 77): true] access to local variable s | Assert.cs:80:29:80:32 | [b (line 77): true] null |  |
-| Assert.cs:80:24:80:32 | [b (line 77): false] ... != ... | Assert.cs:80:24:80:37 | [true] ... \|\| ... | true |
-| Assert.cs:80:24:80:32 | [b (line 77): false] ... != ... | Assert.cs:80:37:80:37 | [b (line 77): false] access to parameter b | false |
-| Assert.cs:80:24:80:32 | [b (line 77): true] ... != ... | Assert.cs:80:24:80:37 | [true] ... \|\| ... | true |
-| Assert.cs:80:24:80:32 | [b (line 77): true] ... != ... | Assert.cs:80:37:80:37 | [b (line 77): true] access to parameter b | false |
-| Assert.cs:80:24:80:37 | [false] ... \|\| ... | Assert.cs:80:9:80:38 | [assertion success] call to method IsFalse | false |
-| Assert.cs:80:24:80:37 | [true] ... \|\| ... | Assert.cs:80:9:80:38 | [assertion failure] call to method IsFalse | true |
-| Assert.cs:80:29:80:32 | [b (line 77): false] null | Assert.cs:80:24:80:32 | [b (line 77): false] ... != ... |  |
-| Assert.cs:80:29:80:32 | [b (line 77): true] null | Assert.cs:80:24:80:32 | [b (line 77): true] ... != ... |  |
-| Assert.cs:80:37:80:37 | [b (line 77): false] access to parameter b | Assert.cs:80:24:80:37 | [false] ... \|\| ... | false |
-| Assert.cs:80:37:80:37 | [b (line 77): true] access to parameter b | Assert.cs:80:24:80:37 | [true] ... \|\| ... | true |
+| Assert.cs:79:16:79:32 | String s = ... | Assert.cs:80:9:80:39 | ...; |  |
+| Assert.cs:79:20:79:20 | access to parameter b | Assert.cs:79:24:79:27 | null | true |
+| Assert.cs:79:20:79:20 | access to parameter b | Assert.cs:79:31:79:32 | "" | false |
+| Assert.cs:79:20:79:32 | ... ? ... : ... | Assert.cs:79:16:79:32 | String s = ... |  |
+| Assert.cs:79:24:79:27 | null | Assert.cs:79:20:79:32 | ... ? ... : ... |  |
+| Assert.cs:79:31:79:32 | "" | Assert.cs:79:20:79:32 | ... ? ... : ... |  |
+| Assert.cs:80:9:80:38 | call to method IsFalse | Assert.cs:77:10:77:12 | exit M11 (abnormal) | exception |
+| Assert.cs:80:9:80:38 | call to method IsFalse | Assert.cs:81:9:81:36 | ...; |  |
+| Assert.cs:80:9:80:39 | ...; | Assert.cs:80:24:80:24 | access to local variable s |  |
+| Assert.cs:80:24:80:24 | access to local variable s | Assert.cs:80:29:80:32 | null |  |
+| Assert.cs:80:24:80:32 | ... != ... | Assert.cs:80:24:80:37 | ... \|\| ... | true |
+| Assert.cs:80:24:80:32 | ... != ... | Assert.cs:80:37:80:37 | access to parameter b | false |
+| Assert.cs:80:24:80:37 | ... \|\| ... | Assert.cs:80:9:80:38 | call to method IsFalse |  |
+| Assert.cs:80:29:80:32 | null | Assert.cs:80:24:80:32 | ... != ... |  |
+| Assert.cs:80:37:80:37 | access to parameter b | Assert.cs:80:24:80:37 | ... \|\| ... |  |
 | Assert.cs:81:9:81:35 | call to method WriteLine | Assert.cs:77:10:77:12 | exit M11 (normal) |  |
 | Assert.cs:81:9:81:36 | ...; | Assert.cs:81:27:81:27 | access to local variable s |  |
 | Assert.cs:81:27:81:27 | access to local variable s | Assert.cs:81:27:81:34 | access to property Length |  |
@@ -626,307 +583,198 @@
 | Assert.cs:84:10:84:12 | exit M12 (normal) | Assert.cs:84:10:84:12 | exit M12 |  |
 | Assert.cs:85:5:129:5 | {...} | Assert.cs:86:9:86:33 | ... ...; |  |
 | Assert.cs:86:9:86:33 | ... ...; | Assert.cs:86:20:86:20 | access to parameter b |  |
-| Assert.cs:86:16:86:32 | [b (line 84): false] String s = ... | Assert.cs:87:9:87:32 | [b (line 84): false] ...; |  |
-| Assert.cs:86:16:86:32 | [b (line 84): true] String s = ... | Assert.cs:87:9:87:32 | [b (line 84): true] ...; |  |
-| Assert.cs:86:20:86:20 | access to parameter b | Assert.cs:86:24:86:27 | [b (line 84): true] null | true |
-| Assert.cs:86:20:86:20 | access to parameter b | Assert.cs:86:31:86:32 | [b (line 84): false] "" | false |
-| Assert.cs:86:20:86:32 | [b (line 84): false] ... ? ... : ... | Assert.cs:86:16:86:32 | [b (line 84): false] String s = ... |  |
-| Assert.cs:86:20:86:32 | [b (line 84): true] ... ? ... : ... | Assert.cs:86:16:86:32 | [b (line 84): true] String s = ... |  |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | Assert.cs:86:20:86:32 | [b (line 84): true] ... ? ... : ... |  |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | Assert.cs:86:20:86:32 | [b (line 84): false] ... ? ... : ... |  |
-| Assert.cs:87:9:87:31 | [assertion failure, b (line 84): false] call to method Assert | Assert.cs:84:10:84:12 | exit M12 (abnormal) | exit |
-| Assert.cs:87:9:87:31 | [assertion failure, b (line 84): true] call to method Assert | Assert.cs:84:10:84:12 | exit M12 (abnormal) | exit |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | Assert.cs:88:9:88:36 | [b (line 84): false] ...; |  |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | Assert.cs:88:9:88:36 | [b (line 84): true] ...; |  |
-| Assert.cs:87:9:87:32 | [b (line 84): false] ...; | Assert.cs:87:22:87:22 | [b (line 84): false] access to local variable s |  |
-| Assert.cs:87:9:87:32 | [b (line 84): true] ...; | Assert.cs:87:22:87:22 | [b (line 84): true] access to local variable s |  |
-| Assert.cs:87:22:87:22 | [b (line 84): false] access to local variable s | Assert.cs:87:27:87:30 | [b (line 84): false] null |  |
-| Assert.cs:87:22:87:22 | [b (line 84): true] access to local variable s | Assert.cs:87:27:87:30 | [b (line 84): true] null |  |
-| Assert.cs:87:22:87:30 | [b (line 84): false] ... != ... | Assert.cs:87:9:87:31 | [assertion failure, b (line 84): false] call to method Assert | false |
-| Assert.cs:87:22:87:30 | [b (line 84): false] ... != ... | Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | true |
-| Assert.cs:87:22:87:30 | [b (line 84): true] ... != ... | Assert.cs:87:9:87:31 | [assertion failure, b (line 84): true] call to method Assert | false |
-| Assert.cs:87:22:87:30 | [b (line 84): true] ... != ... | Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | true |
-| Assert.cs:87:27:87:30 | [b (line 84): false] null | Assert.cs:87:22:87:30 | [b (line 84): false] ... != ... |  |
-| Assert.cs:87:27:87:30 | [b (line 84): true] null | Assert.cs:87:22:87:30 | [b (line 84): true] ... != ... |  |
-| Assert.cs:88:9:88:35 | [b (line 84): false] call to method WriteLine | Assert.cs:90:9:90:26 | [b (line 84): false] ...; |  |
-| Assert.cs:88:9:88:35 | [b (line 84): true] call to method WriteLine | Assert.cs:90:9:90:26 | [b (line 84): true] ...; |  |
-| Assert.cs:88:9:88:36 | [b (line 84): false] ...; | Assert.cs:88:27:88:27 | [b (line 84): false] access to local variable s |  |
-| Assert.cs:88:9:88:36 | [b (line 84): true] ...; | Assert.cs:88:27:88:27 | [b (line 84): true] access to local variable s |  |
-| Assert.cs:88:27:88:27 | [b (line 84): false] access to local variable s | Assert.cs:88:27:88:34 | [b (line 84): false] access to property Length |  |
-| Assert.cs:88:27:88:27 | [b (line 84): true] access to local variable s | Assert.cs:88:27:88:34 | [b (line 84): true] access to property Length |  |
-| Assert.cs:88:27:88:34 | [b (line 84): false] access to property Length | Assert.cs:88:9:88:35 | [b (line 84): false] call to method WriteLine |  |
-| Assert.cs:88:27:88:34 | [b (line 84): true] access to property Length | Assert.cs:88:9:88:35 | [b (line 84): true] call to method WriteLine |  |
-| Assert.cs:90:9:90:25 | [b (line 84): false] ... = ... | Assert.cs:91:9:91:25 | [b (line 84): false] ...; |  |
-| Assert.cs:90:9:90:25 | [b (line 84): true] ... = ... | Assert.cs:91:9:91:25 | [b (line 84): true] ...; |  |
-| Assert.cs:90:9:90:26 | [b (line 84): false] ...; | Assert.cs:90:13:90:13 | [b (line 84): false] access to parameter b |  |
-| Assert.cs:90:9:90:26 | [b (line 84): true] ...; | Assert.cs:90:13:90:13 | [b (line 84): true] access to parameter b |  |
-| Assert.cs:90:13:90:13 | [b (line 84): false] access to parameter b | Assert.cs:90:24:90:25 | [b (line 84): false] "" | false |
-| Assert.cs:90:13:90:13 | [b (line 84): true] access to parameter b | Assert.cs:90:17:90:20 | [b (line 84): true] null | true |
-| Assert.cs:90:13:90:25 | [b (line 84): false] ... ? ... : ... | Assert.cs:90:9:90:25 | [b (line 84): false] ... = ... |  |
-| Assert.cs:90:13:90:25 | [b (line 84): true] ... ? ... : ... | Assert.cs:90:9:90:25 | [b (line 84): true] ... = ... |  |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | Assert.cs:90:13:90:25 | [b (line 84): true] ... ? ... : ... |  |
-| Assert.cs:90:24:90:25 | [b (line 84): false] "" | Assert.cs:90:13:90:25 | [b (line 84): false] ... ? ... : ... |  |
-| Assert.cs:91:9:91:24 | [assertion failure, b (line 84): false] call to method IsNull | Assert.cs:84:10:84:12 | exit M12 (abnormal) | exception(AssertFailedException) |
-| Assert.cs:91:9:91:24 | [assertion failure, b (line 84): true] call to method IsNull | Assert.cs:84:10:84:12 | exit M12 (abnormal) | exception(AssertFailedException) |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull | Assert.cs:92:9:92:36 | [b (line 84): false] ...; |  |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | Assert.cs:92:9:92:36 | [b (line 84): true] ...; |  |
-| Assert.cs:91:9:91:25 | [b (line 84): false] ...; | Assert.cs:91:23:91:23 | [b (line 84): false] access to local variable s |  |
-| Assert.cs:91:9:91:25 | [b (line 84): true] ...; | Assert.cs:91:23:91:23 | [b (line 84): true] access to local variable s |  |
-| Assert.cs:91:23:91:23 | [b (line 84): false] access to local variable s | Assert.cs:91:9:91:24 | [assertion failure, b (line 84): false] call to method IsNull | non-null |
-| Assert.cs:91:23:91:23 | [b (line 84): false] access to local variable s | Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull | null |
-| Assert.cs:91:23:91:23 | [b (line 84): true] access to local variable s | Assert.cs:91:9:91:24 | [assertion failure, b (line 84): true] call to method IsNull | non-null |
-| Assert.cs:91:23:91:23 | [b (line 84): true] access to local variable s | Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | null |
-| Assert.cs:92:9:92:35 | [b (line 84): false] call to method WriteLine | Assert.cs:94:9:94:26 | [b (line 84): false] ...; |  |
-| Assert.cs:92:9:92:35 | [b (line 84): true] call to method WriteLine | Assert.cs:94:9:94:26 | [b (line 84): true] ...; |  |
-| Assert.cs:92:9:92:36 | [b (line 84): false] ...; | Assert.cs:92:27:92:27 | [b (line 84): false] access to local variable s |  |
-| Assert.cs:92:9:92:36 | [b (line 84): true] ...; | Assert.cs:92:27:92:27 | [b (line 84): true] access to local variable s |  |
-| Assert.cs:92:27:92:27 | [b (line 84): false] access to local variable s | Assert.cs:92:27:92:34 | [b (line 84): false] access to property Length |  |
-| Assert.cs:92:27:92:27 | [b (line 84): true] access to local variable s | Assert.cs:92:27:92:34 | [b (line 84): true] access to property Length |  |
-| Assert.cs:92:27:92:34 | [b (line 84): false] access to property Length | Assert.cs:92:9:92:35 | [b (line 84): false] call to method WriteLine |  |
-| Assert.cs:92:27:92:34 | [b (line 84): true] access to property Length | Assert.cs:92:9:92:35 | [b (line 84): true] call to method WriteLine |  |
-| Assert.cs:94:9:94:25 | [b (line 84): false] ... = ... | Assert.cs:95:9:95:28 | [b (line 84): false] ...; |  |
-| Assert.cs:94:9:94:25 | [b (line 84): true] ... = ... | Assert.cs:95:9:95:28 | [b (line 84): true] ...; |  |
-| Assert.cs:94:9:94:26 | [b (line 84): false] ...; | Assert.cs:94:13:94:13 | [b (line 84): false] access to parameter b |  |
-| Assert.cs:94:9:94:26 | [b (line 84): true] ...; | Assert.cs:94:13:94:13 | [b (line 84): true] access to parameter b |  |
-| Assert.cs:94:13:94:13 | [b (line 84): false] access to parameter b | Assert.cs:94:24:94:25 | [b (line 84): false] "" | false |
-| Assert.cs:94:13:94:13 | [b (line 84): true] access to parameter b | Assert.cs:94:17:94:20 | [b (line 84): true] null | true |
-| Assert.cs:94:13:94:25 | [b (line 84): false] ... ? ... : ... | Assert.cs:94:9:94:25 | [b (line 84): false] ... = ... |  |
-| Assert.cs:94:13:94:25 | [b (line 84): true] ... ? ... : ... | Assert.cs:94:9:94:25 | [b (line 84): true] ... = ... |  |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | Assert.cs:94:13:94:25 | [b (line 84): true] ... ? ... : ... |  |
-| Assert.cs:94:24:94:25 | [b (line 84): false] "" | Assert.cs:94:13:94:25 | [b (line 84): false] ... ? ... : ... |  |
-| Assert.cs:95:9:95:27 | [assertion failure, b (line 84): false] call to method IsNotNull | Assert.cs:84:10:84:12 | exit M12 (abnormal) | exception(AssertFailedException) |
-| Assert.cs:95:9:95:27 | [assertion failure, b (line 84): true] call to method IsNotNull | Assert.cs:84:10:84:12 | exit M12 (abnormal) | exception(AssertFailedException) |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull | Assert.cs:96:9:96:36 | [b (line 84): false] ...; |  |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | Assert.cs:96:9:96:36 | [b (line 84): true] ...; |  |
-| Assert.cs:95:9:95:28 | [b (line 84): false] ...; | Assert.cs:95:26:95:26 | [b (line 84): false] access to local variable s |  |
-| Assert.cs:95:9:95:28 | [b (line 84): true] ...; | Assert.cs:95:26:95:26 | [b (line 84): true] access to local variable s |  |
-| Assert.cs:95:26:95:26 | [b (line 84): false] access to local variable s | Assert.cs:95:9:95:27 | [assertion failure, b (line 84): false] call to method IsNotNull | null |
-| Assert.cs:95:26:95:26 | [b (line 84): false] access to local variable s | Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull | non-null |
-| Assert.cs:95:26:95:26 | [b (line 84): true] access to local variable s | Assert.cs:95:9:95:27 | [assertion failure, b (line 84): true] call to method IsNotNull | null |
-| Assert.cs:95:26:95:26 | [b (line 84): true] access to local variable s | Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | non-null |
-| Assert.cs:96:9:96:35 | [b (line 84): false] call to method WriteLine | Assert.cs:98:9:98:26 | [b (line 84): false] ...; |  |
-| Assert.cs:96:9:96:35 | [b (line 84): true] call to method WriteLine | Assert.cs:98:9:98:26 | [b (line 84): true] ...; |  |
-| Assert.cs:96:9:96:36 | [b (line 84): false] ...; | Assert.cs:96:27:96:27 | [b (line 84): false] access to local variable s |  |
-| Assert.cs:96:9:96:36 | [b (line 84): true] ...; | Assert.cs:96:27:96:27 | [b (line 84): true] access to local variable s |  |
-| Assert.cs:96:27:96:27 | [b (line 84): false] access to local variable s | Assert.cs:96:27:96:34 | [b (line 84): false] access to property Length |  |
-| Assert.cs:96:27:96:27 | [b (line 84): true] access to local variable s | Assert.cs:96:27:96:34 | [b (line 84): true] access to property Length |  |
-| Assert.cs:96:27:96:34 | [b (line 84): false] access to property Length | Assert.cs:96:9:96:35 | [b (line 84): false] call to method WriteLine |  |
-| Assert.cs:96:27:96:34 | [b (line 84): true] access to property Length | Assert.cs:96:9:96:35 | [b (line 84): true] call to method WriteLine |  |
-| Assert.cs:98:9:98:25 | [b (line 84): false] ... = ... | Assert.cs:99:9:99:33 | [b (line 84): false] ...; |  |
-| Assert.cs:98:9:98:25 | [b (line 84): true] ... = ... | Assert.cs:99:9:99:33 | [b (line 84): true] ...; |  |
-| Assert.cs:98:9:98:26 | [b (line 84): false] ...; | Assert.cs:98:13:98:13 | [b (line 84): false] access to parameter b |  |
-| Assert.cs:98:9:98:26 | [b (line 84): true] ...; | Assert.cs:98:13:98:13 | [b (line 84): true] access to parameter b |  |
-| Assert.cs:98:13:98:13 | [b (line 84): false] access to parameter b | Assert.cs:98:24:98:25 | [b (line 84): false] "" | false |
-| Assert.cs:98:13:98:13 | [b (line 84): true] access to parameter b | Assert.cs:98:17:98:20 | [b (line 84): true] null | true |
-| Assert.cs:98:13:98:25 | [b (line 84): false] ... ? ... : ... | Assert.cs:98:9:98:25 | [b (line 84): false] ... = ... |  |
-| Assert.cs:98:13:98:25 | [b (line 84): true] ... ? ... : ... | Assert.cs:98:9:98:25 | [b (line 84): true] ... = ... |  |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | Assert.cs:98:13:98:25 | [b (line 84): true] ... ? ... : ... |  |
-| Assert.cs:98:24:98:25 | [b (line 84): false] "" | Assert.cs:98:13:98:25 | [b (line 84): false] ... ? ... : ... |  |
-| Assert.cs:99:9:99:32 | [assertion failure, b (line 84): false] call to method IsTrue | Assert.cs:84:10:84:12 | exit M12 (abnormal) | exception(AssertFailedException) |
-| Assert.cs:99:9:99:32 | [assertion failure, b (line 84): true] call to method IsTrue | Assert.cs:84:10:84:12 | exit M12 (abnormal) | exception(AssertFailedException) |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:100:9:100:36 | [b (line 84): false] ...; |  |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:100:9:100:36 | [b (line 84): true] ...; |  |
-| Assert.cs:99:9:99:33 | [b (line 84): false] ...; | Assert.cs:99:23:99:23 | [b (line 84): false] access to local variable s |  |
-| Assert.cs:99:9:99:33 | [b (line 84): true] ...; | Assert.cs:99:23:99:23 | [b (line 84): true] access to local variable s |  |
-| Assert.cs:99:23:99:23 | [b (line 84): false] access to local variable s | Assert.cs:99:28:99:31 | [b (line 84): false] null |  |
-| Assert.cs:99:23:99:23 | [b (line 84): true] access to local variable s | Assert.cs:99:28:99:31 | [b (line 84): true] null |  |
-| Assert.cs:99:23:99:31 | [b (line 84): false] ... == ... | Assert.cs:99:9:99:32 | [assertion failure, b (line 84): false] call to method IsTrue | false |
-| Assert.cs:99:23:99:31 | [b (line 84): false] ... == ... | Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue | true |
-| Assert.cs:99:23:99:31 | [b (line 84): true] ... == ... | Assert.cs:99:9:99:32 | [assertion failure, b (line 84): true] call to method IsTrue | false |
-| Assert.cs:99:23:99:31 | [b (line 84): true] ... == ... | Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:99:28:99:31 | [b (line 84): false] null | Assert.cs:99:23:99:31 | [b (line 84): false] ... == ... |  |
-| Assert.cs:99:28:99:31 | [b (line 84): true] null | Assert.cs:99:23:99:31 | [b (line 84): true] ... == ... |  |
-| Assert.cs:100:9:100:35 | [b (line 84): false] call to method WriteLine | Assert.cs:102:9:102:26 | [b (line 84): false] ...; |  |
-| Assert.cs:100:9:100:35 | [b (line 84): true] call to method WriteLine | Assert.cs:102:9:102:26 | [b (line 84): true] ...; |  |
-| Assert.cs:100:9:100:36 | [b (line 84): false] ...; | Assert.cs:100:27:100:27 | [b (line 84): false] access to local variable s |  |
-| Assert.cs:100:9:100:36 | [b (line 84): true] ...; | Assert.cs:100:27:100:27 | [b (line 84): true] access to local variable s |  |
-| Assert.cs:100:27:100:27 | [b (line 84): false] access to local variable s | Assert.cs:100:27:100:34 | [b (line 84): false] access to property Length |  |
-| Assert.cs:100:27:100:27 | [b (line 84): true] access to local variable s | Assert.cs:100:27:100:34 | [b (line 84): true] access to property Length |  |
-| Assert.cs:100:27:100:34 | [b (line 84): false] access to property Length | Assert.cs:100:9:100:35 | [b (line 84): false] call to method WriteLine |  |
-| Assert.cs:100:27:100:34 | [b (line 84): true] access to property Length | Assert.cs:100:9:100:35 | [b (line 84): true] call to method WriteLine |  |
-| Assert.cs:102:9:102:25 | [b (line 84): false] ... = ... | Assert.cs:103:9:103:33 | [b (line 84): false] ...; |  |
-| Assert.cs:102:9:102:25 | [b (line 84): true] ... = ... | Assert.cs:103:9:103:33 | [b (line 84): true] ...; |  |
-| Assert.cs:102:9:102:26 | [b (line 84): false] ...; | Assert.cs:102:13:102:13 | [b (line 84): false] access to parameter b |  |
-| Assert.cs:102:9:102:26 | [b (line 84): true] ...; | Assert.cs:102:13:102:13 | [b (line 84): true] access to parameter b |  |
-| Assert.cs:102:13:102:13 | [b (line 84): false] access to parameter b | Assert.cs:102:24:102:25 | [b (line 84): false] "" | false |
-| Assert.cs:102:13:102:13 | [b (line 84): true] access to parameter b | Assert.cs:102:17:102:20 | [b (line 84): true] null | true |
-| Assert.cs:102:13:102:25 | [b (line 84): false] ... ? ... : ... | Assert.cs:102:9:102:25 | [b (line 84): false] ... = ... |  |
-| Assert.cs:102:13:102:25 | [b (line 84): true] ... ? ... : ... | Assert.cs:102:9:102:25 | [b (line 84): true] ... = ... |  |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | Assert.cs:102:13:102:25 | [b (line 84): true] ... ? ... : ... |  |
-| Assert.cs:102:24:102:25 | [b (line 84): false] "" | Assert.cs:102:13:102:25 | [b (line 84): false] ... ? ... : ... |  |
-| Assert.cs:103:9:103:32 | [assertion failure, b (line 84): false] call to method IsTrue | Assert.cs:84:10:84:12 | exit M12 (abnormal) | exception(AssertFailedException) |
-| Assert.cs:103:9:103:32 | [assertion failure, b (line 84): true] call to method IsTrue | Assert.cs:84:10:84:12 | exit M12 (abnormal) | exception(AssertFailedException) |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue | Assert.cs:104:9:104:36 | [b (line 84): false] ...; |  |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:104:9:104:36 | [b (line 84): true] ...; |  |
-| Assert.cs:103:9:103:33 | [b (line 84): false] ...; | Assert.cs:103:23:103:23 | [b (line 84): false] access to local variable s |  |
-| Assert.cs:103:9:103:33 | [b (line 84): true] ...; | Assert.cs:103:23:103:23 | [b (line 84): true] access to local variable s |  |
-| Assert.cs:103:23:103:23 | [b (line 84): false] access to local variable s | Assert.cs:103:28:103:31 | [b (line 84): false] null |  |
-| Assert.cs:103:23:103:23 | [b (line 84): true] access to local variable s | Assert.cs:103:28:103:31 | [b (line 84): true] null |  |
-| Assert.cs:103:23:103:31 | [b (line 84): false] ... != ... | Assert.cs:103:9:103:32 | [assertion failure, b (line 84): false] call to method IsTrue | false |
-| Assert.cs:103:23:103:31 | [b (line 84): false] ... != ... | Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue | true |
-| Assert.cs:103:23:103:31 | [b (line 84): true] ... != ... | Assert.cs:103:9:103:32 | [assertion failure, b (line 84): true] call to method IsTrue | false |
-| Assert.cs:103:23:103:31 | [b (line 84): true] ... != ... | Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:103:28:103:31 | [b (line 84): false] null | Assert.cs:103:23:103:31 | [b (line 84): false] ... != ... |  |
-| Assert.cs:103:28:103:31 | [b (line 84): true] null | Assert.cs:103:23:103:31 | [b (line 84): true] ... != ... |  |
-| Assert.cs:104:9:104:35 | [b (line 84): false] call to method WriteLine | Assert.cs:106:9:106:26 | [b (line 84): false] ...; |  |
-| Assert.cs:104:9:104:35 | [b (line 84): true] call to method WriteLine | Assert.cs:106:9:106:26 | [b (line 84): true] ...; |  |
-| Assert.cs:104:9:104:36 | [b (line 84): false] ...; | Assert.cs:104:27:104:27 | [b (line 84): false] access to local variable s |  |
-| Assert.cs:104:9:104:36 | [b (line 84): true] ...; | Assert.cs:104:27:104:27 | [b (line 84): true] access to local variable s |  |
-| Assert.cs:104:27:104:27 | [b (line 84): false] access to local variable s | Assert.cs:104:27:104:34 | [b (line 84): false] access to property Length |  |
-| Assert.cs:104:27:104:27 | [b (line 84): true] access to local variable s | Assert.cs:104:27:104:34 | [b (line 84): true] access to property Length |  |
-| Assert.cs:104:27:104:34 | [b (line 84): false] access to property Length | Assert.cs:104:9:104:35 | [b (line 84): false] call to method WriteLine |  |
-| Assert.cs:104:27:104:34 | [b (line 84): true] access to property Length | Assert.cs:104:9:104:35 | [b (line 84): true] call to method WriteLine |  |
-| Assert.cs:106:9:106:25 | [b (line 84): false] ... = ... | Assert.cs:107:9:107:34 | [b (line 84): false] ...; |  |
-| Assert.cs:106:9:106:25 | [b (line 84): true] ... = ... | Assert.cs:107:9:107:34 | [b (line 84): true] ...; |  |
-| Assert.cs:106:9:106:26 | [b (line 84): false] ...; | Assert.cs:106:13:106:13 | [b (line 84): false] access to parameter b |  |
-| Assert.cs:106:9:106:26 | [b (line 84): true] ...; | Assert.cs:106:13:106:13 | [b (line 84): true] access to parameter b |  |
-| Assert.cs:106:13:106:13 | [b (line 84): false] access to parameter b | Assert.cs:106:24:106:25 | [b (line 84): false] "" | false |
-| Assert.cs:106:13:106:13 | [b (line 84): true] access to parameter b | Assert.cs:106:17:106:20 | [b (line 84): true] null | true |
-| Assert.cs:106:13:106:25 | [b (line 84): false] ... ? ... : ... | Assert.cs:106:9:106:25 | [b (line 84): false] ... = ... |  |
-| Assert.cs:106:13:106:25 | [b (line 84): true] ... ? ... : ... | Assert.cs:106:9:106:25 | [b (line 84): true] ... = ... |  |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | Assert.cs:106:13:106:25 | [b (line 84): true] ... ? ... : ... |  |
-| Assert.cs:106:24:106:25 | [b (line 84): false] "" | Assert.cs:106:13:106:25 | [b (line 84): false] ... ? ... : ... |  |
-| Assert.cs:107:9:107:33 | [assertion failure, b (line 84): false] call to method IsFalse | Assert.cs:84:10:84:12 | exit M12 (abnormal) | exception(AssertFailedException) |
-| Assert.cs:107:9:107:33 | [assertion failure, b (line 84): true] call to method IsFalse | Assert.cs:84:10:84:12 | exit M12 (abnormal) | exception(AssertFailedException) |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): false] call to method IsFalse | Assert.cs:108:9:108:36 | [b (line 84): false] ...; |  |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:108:9:108:36 | [b (line 84): true] ...; |  |
-| Assert.cs:107:9:107:34 | [b (line 84): false] ...; | Assert.cs:107:24:107:24 | [b (line 84): false] access to local variable s |  |
-| Assert.cs:107:9:107:34 | [b (line 84): true] ...; | Assert.cs:107:24:107:24 | [b (line 84): true] access to local variable s |  |
-| Assert.cs:107:24:107:24 | [b (line 84): false] access to local variable s | Assert.cs:107:29:107:32 | [b (line 84): false] null |  |
-| Assert.cs:107:24:107:24 | [b (line 84): true] access to local variable s | Assert.cs:107:29:107:32 | [b (line 84): true] null |  |
-| Assert.cs:107:24:107:32 | [b (line 84): false] ... != ... | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): false] call to method IsFalse | true |
-| Assert.cs:107:24:107:32 | [b (line 84): false] ... != ... | Assert.cs:107:9:107:33 | [assertion success, b (line 84): false] call to method IsFalse | false |
-| Assert.cs:107:24:107:32 | [b (line 84): true] ... != ... | Assert.cs:107:9:107:33 | [assertion failure, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:107:24:107:32 | [b (line 84): true] ... != ... | Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | false |
-| Assert.cs:107:29:107:32 | [b (line 84): false] null | Assert.cs:107:24:107:32 | [b (line 84): false] ... != ... |  |
-| Assert.cs:107:29:107:32 | [b (line 84): true] null | Assert.cs:107:24:107:32 | [b (line 84): true] ... != ... |  |
-| Assert.cs:108:9:108:35 | [b (line 84): false] call to method WriteLine | Assert.cs:110:9:110:26 | [b (line 84): false] ...; |  |
-| Assert.cs:108:9:108:35 | [b (line 84): true] call to method WriteLine | Assert.cs:110:9:110:26 | [b (line 84): true] ...; |  |
-| Assert.cs:108:9:108:36 | [b (line 84): false] ...; | Assert.cs:108:27:108:27 | [b (line 84): false] access to local variable s |  |
-| Assert.cs:108:9:108:36 | [b (line 84): true] ...; | Assert.cs:108:27:108:27 | [b (line 84): true] access to local variable s |  |
-| Assert.cs:108:27:108:27 | [b (line 84): false] access to local variable s | Assert.cs:108:27:108:34 | [b (line 84): false] access to property Length |  |
-| Assert.cs:108:27:108:27 | [b (line 84): true] access to local variable s | Assert.cs:108:27:108:34 | [b (line 84): true] access to property Length |  |
-| Assert.cs:108:27:108:34 | [b (line 84): false] access to property Length | Assert.cs:108:9:108:35 | [b (line 84): false] call to method WriteLine |  |
-| Assert.cs:108:27:108:34 | [b (line 84): true] access to property Length | Assert.cs:108:9:108:35 | [b (line 84): true] call to method WriteLine |  |
-| Assert.cs:110:9:110:25 | [b (line 84): false] ... = ... | Assert.cs:111:9:111:34 | [b (line 84): false] ...; |  |
-| Assert.cs:110:9:110:25 | [b (line 84): true] ... = ... | Assert.cs:111:9:111:34 | [b (line 84): true] ...; |  |
-| Assert.cs:110:9:110:26 | [b (line 84): false] ...; | Assert.cs:110:13:110:13 | [b (line 84): false] access to parameter b |  |
-| Assert.cs:110:9:110:26 | [b (line 84): true] ...; | Assert.cs:110:13:110:13 | [b (line 84): true] access to parameter b |  |
-| Assert.cs:110:13:110:13 | [b (line 84): false] access to parameter b | Assert.cs:110:24:110:25 | [b (line 84): false] "" | false |
-| Assert.cs:110:13:110:13 | [b (line 84): true] access to parameter b | Assert.cs:110:17:110:20 | [b (line 84): true] null | true |
-| Assert.cs:110:13:110:25 | [b (line 84): false] ... ? ... : ... | Assert.cs:110:9:110:25 | [b (line 84): false] ... = ... |  |
-| Assert.cs:110:13:110:25 | [b (line 84): true] ... ? ... : ... | Assert.cs:110:9:110:25 | [b (line 84): true] ... = ... |  |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | Assert.cs:110:13:110:25 | [b (line 84): true] ... ? ... : ... |  |
-| Assert.cs:110:24:110:25 | [b (line 84): false] "" | Assert.cs:110:13:110:25 | [b (line 84): false] ... ? ... : ... |  |
-| Assert.cs:111:9:111:33 | [assertion failure, b (line 84): false] call to method IsFalse | Assert.cs:84:10:84:12 | exit M12 (abnormal) | exception(AssertFailedException) |
-| Assert.cs:111:9:111:33 | [assertion failure, b (line 84): true] call to method IsFalse | Assert.cs:84:10:84:12 | exit M12 (abnormal) | exception(AssertFailedException) |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): false] call to method IsFalse | Assert.cs:112:9:112:36 | [b (line 84): false] ...; |  |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:112:9:112:36 | [b (line 84): true] ...; |  |
-| Assert.cs:111:9:111:34 | [b (line 84): false] ...; | Assert.cs:111:24:111:24 | [b (line 84): false] access to local variable s |  |
-| Assert.cs:111:9:111:34 | [b (line 84): true] ...; | Assert.cs:111:24:111:24 | [b (line 84): true] access to local variable s |  |
-| Assert.cs:111:24:111:24 | [b (line 84): false] access to local variable s | Assert.cs:111:29:111:32 | [b (line 84): false] null |  |
-| Assert.cs:111:24:111:24 | [b (line 84): true] access to local variable s | Assert.cs:111:29:111:32 | [b (line 84): true] null |  |
-| Assert.cs:111:24:111:32 | [b (line 84): false] ... == ... | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): false] call to method IsFalse | true |
-| Assert.cs:111:24:111:32 | [b (line 84): false] ... == ... | Assert.cs:111:9:111:33 | [assertion success, b (line 84): false] call to method IsFalse | false |
-| Assert.cs:111:24:111:32 | [b (line 84): true] ... == ... | Assert.cs:111:9:111:33 | [assertion failure, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:111:24:111:32 | [b (line 84): true] ... == ... | Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | false |
-| Assert.cs:111:29:111:32 | [b (line 84): false] null | Assert.cs:111:24:111:32 | [b (line 84): false] ... == ... |  |
-| Assert.cs:111:29:111:32 | [b (line 84): true] null | Assert.cs:111:24:111:32 | [b (line 84): true] ... == ... |  |
-| Assert.cs:112:9:112:35 | [b (line 84): false] call to method WriteLine | Assert.cs:114:9:114:26 | [b (line 84): false] ...; |  |
-| Assert.cs:112:9:112:35 | [b (line 84): true] call to method WriteLine | Assert.cs:114:9:114:26 | [b (line 84): true] ...; |  |
-| Assert.cs:112:9:112:36 | [b (line 84): false] ...; | Assert.cs:112:27:112:27 | [b (line 84): false] access to local variable s |  |
-| Assert.cs:112:9:112:36 | [b (line 84): true] ...; | Assert.cs:112:27:112:27 | [b (line 84): true] access to local variable s |  |
-| Assert.cs:112:27:112:27 | [b (line 84): false] access to local variable s | Assert.cs:112:27:112:34 | [b (line 84): false] access to property Length |  |
-| Assert.cs:112:27:112:27 | [b (line 84): true] access to local variable s | Assert.cs:112:27:112:34 | [b (line 84): true] access to property Length |  |
-| Assert.cs:112:27:112:34 | [b (line 84): false] access to property Length | Assert.cs:112:9:112:35 | [b (line 84): false] call to method WriteLine |  |
-| Assert.cs:112:27:112:34 | [b (line 84): true] access to property Length | Assert.cs:112:9:112:35 | [b (line 84): true] call to method WriteLine |  |
-| Assert.cs:114:9:114:25 | [b (line 84): false] ... = ... | Assert.cs:115:9:115:38 | [b (line 84): false] ...; |  |
-| Assert.cs:114:9:114:25 | [b (line 84): true] ... = ... | Assert.cs:115:9:115:38 | [b (line 84): true] ...; |  |
-| Assert.cs:114:9:114:26 | [b (line 84): false] ...; | Assert.cs:114:13:114:13 | [b (line 84): false] access to parameter b |  |
-| Assert.cs:114:9:114:26 | [b (line 84): true] ...; | Assert.cs:114:13:114:13 | [b (line 84): true] access to parameter b |  |
-| Assert.cs:114:13:114:13 | [b (line 84): false] access to parameter b | Assert.cs:114:24:114:25 | [b (line 84): false] "" | false |
-| Assert.cs:114:13:114:13 | [b (line 84): true] access to parameter b | Assert.cs:114:17:114:20 | [b (line 84): true] null | true |
-| Assert.cs:114:13:114:25 | [b (line 84): false] ... ? ... : ... | Assert.cs:114:9:114:25 | [b (line 84): false] ... = ... |  |
-| Assert.cs:114:13:114:25 | [b (line 84): true] ... ? ... : ... | Assert.cs:114:9:114:25 | [b (line 84): true] ... = ... |  |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | Assert.cs:114:13:114:25 | [b (line 84): true] ... ? ... : ... |  |
-| Assert.cs:114:24:114:25 | [b (line 84): false] "" | Assert.cs:114:13:114:25 | [b (line 84): false] ... ? ... : ... |  |
-| Assert.cs:115:9:115:37 | [assertion failure, b (line 84): false] call to method IsTrue | Assert.cs:84:10:84:12 | exit M12 (abnormal) | exception(AssertFailedException) |
-| Assert.cs:115:9:115:37 | [assertion failure, b (line 84): true] call to method IsTrue | Assert.cs:84:10:84:12 | exit M12 (abnormal) | exception(AssertFailedException) |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:116:9:116:36 | [b (line 84): true] ...; |  |
-| Assert.cs:115:9:115:38 | [b (line 84): false] ...; | Assert.cs:115:23:115:23 | [b (line 84): false] access to local variable s |  |
-| Assert.cs:115:9:115:38 | [b (line 84): true] ...; | Assert.cs:115:23:115:23 | [b (line 84): true] access to local variable s |  |
-| Assert.cs:115:23:115:23 | [b (line 84): false] access to local variable s | Assert.cs:115:28:115:31 | [b (line 84): false] null |  |
-| Assert.cs:115:23:115:23 | [b (line 84): true] access to local variable s | Assert.cs:115:28:115:31 | [b (line 84): true] null |  |
-| Assert.cs:115:23:115:31 | [b (line 84): false] ... != ... | Assert.cs:115:23:115:36 | [false, b (line 84): false] ... && ... | false |
-| Assert.cs:115:23:115:31 | [b (line 84): false] ... != ... | Assert.cs:115:36:115:36 | [b (line 84): false] access to parameter b | true |
-| Assert.cs:115:23:115:31 | [b (line 84): true] ... != ... | Assert.cs:115:23:115:36 | [false, b (line 84): true] ... && ... | false |
-| Assert.cs:115:23:115:31 | [b (line 84): true] ... != ... | Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:115:23:115:36 | [false, b (line 84): false] ... && ... | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): false] call to method IsTrue | false |
-| Assert.cs:115:23:115:36 | [false, b (line 84): true] ... && ... | Assert.cs:115:9:115:37 | [assertion failure, b (line 84): true] call to method IsTrue | false |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:115:28:115:31 | [b (line 84): false] null | Assert.cs:115:23:115:31 | [b (line 84): false] ... != ... |  |
-| Assert.cs:115:28:115:31 | [b (line 84): true] null | Assert.cs:115:23:115:31 | [b (line 84): true] ... != ... |  |
-| Assert.cs:115:36:115:36 | [b (line 84): false] access to parameter b | Assert.cs:115:23:115:36 | [false, b (line 84): false] ... && ... | false |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | true |
-| Assert.cs:116:9:116:35 | [b (line 84): true] call to method WriteLine | Assert.cs:118:9:118:26 | [b (line 84): true] ...; |  |
-| Assert.cs:116:9:116:36 | [b (line 84): true] ...; | Assert.cs:116:27:116:27 | [b (line 84): true] access to local variable s |  |
-| Assert.cs:116:27:116:27 | [b (line 84): true] access to local variable s | Assert.cs:116:27:116:34 | [b (line 84): true] access to property Length |  |
-| Assert.cs:116:27:116:34 | [b (line 84): true] access to property Length | Assert.cs:116:9:116:35 | [b (line 84): true] call to method WriteLine |  |
-| Assert.cs:118:9:118:25 | [b (line 84): true] ... = ... | Assert.cs:119:9:119:40 | [b (line 84): true] ...; |  |
-| Assert.cs:118:9:118:26 | [b (line 84): true] ...; | Assert.cs:118:13:118:13 | [b (line 84): true] access to parameter b |  |
-| Assert.cs:118:13:118:13 | [b (line 84): true] access to parameter b | Assert.cs:118:17:118:20 | [b (line 84): true] null | true |
-| Assert.cs:118:13:118:25 | [b (line 84): true] ... ? ... : ... | Assert.cs:118:9:118:25 | [b (line 84): true] ... = ... |  |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | Assert.cs:118:13:118:25 | [b (line 84): true] ... ? ... : ... |  |
-| Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse | Assert.cs:84:10:84:12 | exit M12 (abnormal) | exception(AssertFailedException) |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | Assert.cs:120:9:120:36 | [b (line 84): true] ...; |  |
-| Assert.cs:119:9:119:40 | [b (line 84): true] ...; | Assert.cs:119:24:119:24 | [b (line 84): true] access to local variable s |  |
-| Assert.cs:119:24:119:24 | [b (line 84): true] access to local variable s | Assert.cs:119:29:119:32 | [b (line 84): true] null |  |
-| Assert.cs:119:24:119:32 | [b (line 84): true] ... == ... | Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... | true |
-| Assert.cs:119:24:119:32 | [b (line 84): true] ... == ... | Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | false |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | false |
-| Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... | Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse | true |
-| Assert.cs:119:29:119:32 | [b (line 84): true] null | Assert.cs:119:24:119:32 | [b (line 84): true] ... == ... |  |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | false |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | true |
-| Assert.cs:120:9:120:35 | [b (line 84): true] call to method WriteLine | Assert.cs:122:9:122:26 | [b (line 84): true] ...; |  |
-| Assert.cs:120:9:120:36 | [b (line 84): true] ...; | Assert.cs:120:27:120:27 | [b (line 84): true] access to local variable s |  |
-| Assert.cs:120:27:120:27 | [b (line 84): true] access to local variable s | Assert.cs:120:27:120:34 | [b (line 84): true] access to property Length |  |
-| Assert.cs:120:27:120:34 | [b (line 84): true] access to property Length | Assert.cs:120:9:120:35 | [b (line 84): true] call to method WriteLine |  |
-| Assert.cs:122:9:122:25 | [b (line 84): true] ... = ... | Assert.cs:123:9:123:38 | [b (line 84): true] ...; |  |
-| Assert.cs:122:9:122:26 | [b (line 84): true] ...; | Assert.cs:122:13:122:13 | [b (line 84): true] access to parameter b |  |
-| Assert.cs:122:13:122:13 | [b (line 84): true] access to parameter b | Assert.cs:122:17:122:20 | [b (line 84): true] null | true |
-| Assert.cs:122:13:122:25 | [b (line 84): true] ... ? ... : ... | Assert.cs:122:9:122:25 | [b (line 84): true] ... = ... |  |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | Assert.cs:122:13:122:25 | [b (line 84): true] ... ? ... : ... |  |
-| Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue | Assert.cs:84:10:84:12 | exit M12 (abnormal) | exception(AssertFailedException) |
-| Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | Assert.cs:124:9:124:36 | [b (line 84): true] ...; |  |
-| Assert.cs:123:9:123:38 | [b (line 84): true] ...; | Assert.cs:123:23:123:23 | [b (line 84): true] access to local variable s |  |
-| Assert.cs:123:23:123:23 | [b (line 84): true] access to local variable s | Assert.cs:123:28:123:31 | [b (line 84): true] null |  |
-| Assert.cs:123:23:123:31 | [b (line 84): true] ... == ... | Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... | false |
-| Assert.cs:123:23:123:31 | [b (line 84): true] ... == ... | Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | true |
-| Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... | Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue | false |
-| Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | true |
-| Assert.cs:123:28:123:31 | [b (line 84): true] null | Assert.cs:123:23:123:31 | [b (line 84): true] ... == ... |  |
-| Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | true |
-| Assert.cs:124:9:124:35 | [b (line 84): true] call to method WriteLine | Assert.cs:126:9:126:26 | [b (line 84): true] ...; |  |
-| Assert.cs:124:9:124:36 | [b (line 84): true] ...; | Assert.cs:124:27:124:27 | [b (line 84): true] access to local variable s |  |
-| Assert.cs:124:27:124:27 | [b (line 84): true] access to local variable s | Assert.cs:124:27:124:34 | [b (line 84): true] access to property Length |  |
-| Assert.cs:124:27:124:34 | [b (line 84): true] access to property Length | Assert.cs:124:9:124:35 | [b (line 84): true] call to method WriteLine |  |
-| Assert.cs:126:9:126:25 | [b (line 84): true] ... = ... | Assert.cs:127:9:127:40 | [b (line 84): true] ...; |  |
-| Assert.cs:126:9:126:26 | [b (line 84): true] ...; | Assert.cs:126:13:126:13 | [b (line 84): true] access to parameter b |  |
-| Assert.cs:126:13:126:13 | [b (line 84): true] access to parameter b | Assert.cs:126:17:126:20 | [b (line 84): true] null | true |
-| Assert.cs:126:13:126:25 | [b (line 84): true] ... ? ... : ... | Assert.cs:126:9:126:25 | [b (line 84): true] ... = ... |  |
-| Assert.cs:126:17:126:20 | [b (line 84): true] null | Assert.cs:126:13:126:25 | [b (line 84): true] ... ? ... : ... |  |
-| Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse | Assert.cs:84:10:84:12 | exit M12 (abnormal) | exception(AssertFailedException) |
-| Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | Assert.cs:128:9:128:36 | ...; |  |
-| Assert.cs:127:9:127:40 | [b (line 84): true] ...; | Assert.cs:127:24:127:24 | [b (line 84): true] access to local variable s |  |
-| Assert.cs:127:24:127:24 | [b (line 84): true] access to local variable s | Assert.cs:127:29:127:32 | [b (line 84): true] null |  |
-| Assert.cs:127:24:127:32 | [b (line 84): true] ... != ... | Assert.cs:127:24:127:38 | [true] ... \|\| ... | true |
-| Assert.cs:127:24:127:32 | [b (line 84): true] ... != ... | Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | false |
-| Assert.cs:127:24:127:38 | [false] ... \|\| ... | Assert.cs:127:9:127:39 | [assertion success] call to method IsFalse | false |
-| Assert.cs:127:24:127:38 | [true] ... \|\| ... | Assert.cs:127:9:127:39 | [assertion failure] call to method IsFalse | true |
-| Assert.cs:127:29:127:32 | [b (line 84): true] null | Assert.cs:127:24:127:32 | [b (line 84): true] ... != ... |  |
-| Assert.cs:127:37:127:38 | [false] !... | Assert.cs:127:24:127:38 | [false] ... \|\| ... | false |
-| Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | Assert.cs:127:37:127:38 | [false] !... | true |
+| Assert.cs:86:16:86:32 | String s = ... | Assert.cs:87:9:87:32 | ...; |  |
+| Assert.cs:86:20:86:20 | access to parameter b | Assert.cs:86:24:86:27 | null | true |
+| Assert.cs:86:20:86:20 | access to parameter b | Assert.cs:86:31:86:32 | "" | false |
+| Assert.cs:86:20:86:32 | ... ? ... : ... | Assert.cs:86:16:86:32 | String s = ... |  |
+| Assert.cs:86:24:86:27 | null | Assert.cs:86:20:86:32 | ... ? ... : ... |  |
+| Assert.cs:86:31:86:32 | "" | Assert.cs:86:20:86:32 | ... ? ... : ... |  |
+| Assert.cs:87:9:87:31 | call to method Assert | Assert.cs:84:10:84:12 | exit M12 (abnormal) | exit |
+| Assert.cs:87:9:87:31 | call to method Assert | Assert.cs:88:9:88:36 | ...; |  |
+| Assert.cs:87:9:87:32 | ...; | Assert.cs:87:22:87:22 | access to local variable s |  |
+| Assert.cs:87:22:87:22 | access to local variable s | Assert.cs:87:27:87:30 | null |  |
+| Assert.cs:87:22:87:30 | ... != ... | Assert.cs:87:9:87:31 | call to method Assert |  |
+| Assert.cs:87:27:87:30 | null | Assert.cs:87:22:87:30 | ... != ... |  |
+| Assert.cs:88:9:88:35 | call to method WriteLine | Assert.cs:90:9:90:26 | ...; |  |
+| Assert.cs:88:9:88:36 | ...; | Assert.cs:88:27:88:27 | access to local variable s |  |
+| Assert.cs:88:27:88:27 | access to local variable s | Assert.cs:88:27:88:34 | access to property Length |  |
+| Assert.cs:88:27:88:34 | access to property Length | Assert.cs:88:9:88:35 | call to method WriteLine |  |
+| Assert.cs:90:9:90:25 | ... = ... | Assert.cs:91:9:91:25 | ...; |  |
+| Assert.cs:90:9:90:26 | ...; | Assert.cs:90:13:90:13 | access to parameter b |  |
+| Assert.cs:90:13:90:13 | access to parameter b | Assert.cs:90:17:90:20 | null | true |
+| Assert.cs:90:13:90:13 | access to parameter b | Assert.cs:90:24:90:25 | "" | false |
+| Assert.cs:90:13:90:25 | ... ? ... : ... | Assert.cs:90:9:90:25 | ... = ... |  |
+| Assert.cs:90:17:90:20 | null | Assert.cs:90:13:90:25 | ... ? ... : ... |  |
+| Assert.cs:90:24:90:25 | "" | Assert.cs:90:13:90:25 | ... ? ... : ... |  |
+| Assert.cs:91:9:91:24 | call to method IsNull | Assert.cs:84:10:84:12 | exit M12 (abnormal) | exception |
+| Assert.cs:91:9:91:24 | call to method IsNull | Assert.cs:92:9:92:36 | ...; |  |
+| Assert.cs:91:9:91:25 | ...; | Assert.cs:91:23:91:23 | access to local variable s |  |
+| Assert.cs:91:23:91:23 | access to local variable s | Assert.cs:91:9:91:24 | call to method IsNull |  |
+| Assert.cs:92:9:92:35 | call to method WriteLine | Assert.cs:94:9:94:26 | ...; |  |
+| Assert.cs:92:9:92:36 | ...; | Assert.cs:92:27:92:27 | access to local variable s |  |
+| Assert.cs:92:27:92:27 | access to local variable s | Assert.cs:92:27:92:34 | access to property Length |  |
+| Assert.cs:92:27:92:34 | access to property Length | Assert.cs:92:9:92:35 | call to method WriteLine |  |
+| Assert.cs:94:9:94:25 | ... = ... | Assert.cs:95:9:95:28 | ...; |  |
+| Assert.cs:94:9:94:26 | ...; | Assert.cs:94:13:94:13 | access to parameter b |  |
+| Assert.cs:94:13:94:13 | access to parameter b | Assert.cs:94:17:94:20 | null | true |
+| Assert.cs:94:13:94:13 | access to parameter b | Assert.cs:94:24:94:25 | "" | false |
+| Assert.cs:94:13:94:25 | ... ? ... : ... | Assert.cs:94:9:94:25 | ... = ... |  |
+| Assert.cs:94:17:94:20 | null | Assert.cs:94:13:94:25 | ... ? ... : ... |  |
+| Assert.cs:94:24:94:25 | "" | Assert.cs:94:13:94:25 | ... ? ... : ... |  |
+| Assert.cs:95:9:95:27 | call to method IsNotNull | Assert.cs:84:10:84:12 | exit M12 (abnormal) | exception |
+| Assert.cs:95:9:95:27 | call to method IsNotNull | Assert.cs:96:9:96:36 | ...; |  |
+| Assert.cs:95:9:95:28 | ...; | Assert.cs:95:26:95:26 | access to local variable s |  |
+| Assert.cs:95:26:95:26 | access to local variable s | Assert.cs:95:9:95:27 | call to method IsNotNull |  |
+| Assert.cs:96:9:96:35 | call to method WriteLine | Assert.cs:98:9:98:26 | ...; |  |
+| Assert.cs:96:9:96:36 | ...; | Assert.cs:96:27:96:27 | access to local variable s |  |
+| Assert.cs:96:27:96:27 | access to local variable s | Assert.cs:96:27:96:34 | access to property Length |  |
+| Assert.cs:96:27:96:34 | access to property Length | Assert.cs:96:9:96:35 | call to method WriteLine |  |
+| Assert.cs:98:9:98:25 | ... = ... | Assert.cs:99:9:99:33 | ...; |  |
+| Assert.cs:98:9:98:26 | ...; | Assert.cs:98:13:98:13 | access to parameter b |  |
+| Assert.cs:98:13:98:13 | access to parameter b | Assert.cs:98:17:98:20 | null | true |
+| Assert.cs:98:13:98:13 | access to parameter b | Assert.cs:98:24:98:25 | "" | false |
+| Assert.cs:98:13:98:25 | ... ? ... : ... | Assert.cs:98:9:98:25 | ... = ... |  |
+| Assert.cs:98:17:98:20 | null | Assert.cs:98:13:98:25 | ... ? ... : ... |  |
+| Assert.cs:98:24:98:25 | "" | Assert.cs:98:13:98:25 | ... ? ... : ... |  |
+| Assert.cs:99:9:99:32 | call to method IsTrue | Assert.cs:84:10:84:12 | exit M12 (abnormal) | exception |
+| Assert.cs:99:9:99:32 | call to method IsTrue | Assert.cs:100:9:100:36 | ...; |  |
+| Assert.cs:99:9:99:33 | ...; | Assert.cs:99:23:99:23 | access to local variable s |  |
+| Assert.cs:99:23:99:23 | access to local variable s | Assert.cs:99:28:99:31 | null |  |
+| Assert.cs:99:23:99:31 | ... == ... | Assert.cs:99:9:99:32 | call to method IsTrue |  |
+| Assert.cs:99:28:99:31 | null | Assert.cs:99:23:99:31 | ... == ... |  |
+| Assert.cs:100:9:100:35 | call to method WriteLine | Assert.cs:102:9:102:26 | ...; |  |
+| Assert.cs:100:9:100:36 | ...; | Assert.cs:100:27:100:27 | access to local variable s |  |
+| Assert.cs:100:27:100:27 | access to local variable s | Assert.cs:100:27:100:34 | access to property Length |  |
+| Assert.cs:100:27:100:34 | access to property Length | Assert.cs:100:9:100:35 | call to method WriteLine |  |
+| Assert.cs:102:9:102:25 | ... = ... | Assert.cs:103:9:103:33 | ...; |  |
+| Assert.cs:102:9:102:26 | ...; | Assert.cs:102:13:102:13 | access to parameter b |  |
+| Assert.cs:102:13:102:13 | access to parameter b | Assert.cs:102:17:102:20 | null | true |
+| Assert.cs:102:13:102:13 | access to parameter b | Assert.cs:102:24:102:25 | "" | false |
+| Assert.cs:102:13:102:25 | ... ? ... : ... | Assert.cs:102:9:102:25 | ... = ... |  |
+| Assert.cs:102:17:102:20 | null | Assert.cs:102:13:102:25 | ... ? ... : ... |  |
+| Assert.cs:102:24:102:25 | "" | Assert.cs:102:13:102:25 | ... ? ... : ... |  |
+| Assert.cs:103:9:103:32 | call to method IsTrue | Assert.cs:84:10:84:12 | exit M12 (abnormal) | exception |
+| Assert.cs:103:9:103:32 | call to method IsTrue | Assert.cs:104:9:104:36 | ...; |  |
+| Assert.cs:103:9:103:33 | ...; | Assert.cs:103:23:103:23 | access to local variable s |  |
+| Assert.cs:103:23:103:23 | access to local variable s | Assert.cs:103:28:103:31 | null |  |
+| Assert.cs:103:23:103:31 | ... != ... | Assert.cs:103:9:103:32 | call to method IsTrue |  |
+| Assert.cs:103:28:103:31 | null | Assert.cs:103:23:103:31 | ... != ... |  |
+| Assert.cs:104:9:104:35 | call to method WriteLine | Assert.cs:106:9:106:26 | ...; |  |
+| Assert.cs:104:9:104:36 | ...; | Assert.cs:104:27:104:27 | access to local variable s |  |
+| Assert.cs:104:27:104:27 | access to local variable s | Assert.cs:104:27:104:34 | access to property Length |  |
+| Assert.cs:104:27:104:34 | access to property Length | Assert.cs:104:9:104:35 | call to method WriteLine |  |
+| Assert.cs:106:9:106:25 | ... = ... | Assert.cs:107:9:107:34 | ...; |  |
+| Assert.cs:106:9:106:26 | ...; | Assert.cs:106:13:106:13 | access to parameter b |  |
+| Assert.cs:106:13:106:13 | access to parameter b | Assert.cs:106:17:106:20 | null | true |
+| Assert.cs:106:13:106:13 | access to parameter b | Assert.cs:106:24:106:25 | "" | false |
+| Assert.cs:106:13:106:25 | ... ? ... : ... | Assert.cs:106:9:106:25 | ... = ... |  |
+| Assert.cs:106:17:106:20 | null | Assert.cs:106:13:106:25 | ... ? ... : ... |  |
+| Assert.cs:106:24:106:25 | "" | Assert.cs:106:13:106:25 | ... ? ... : ... |  |
+| Assert.cs:107:9:107:33 | call to method IsFalse | Assert.cs:84:10:84:12 | exit M12 (abnormal) | exception |
+| Assert.cs:107:9:107:33 | call to method IsFalse | Assert.cs:108:9:108:36 | ...; |  |
+| Assert.cs:107:9:107:34 | ...; | Assert.cs:107:24:107:24 | access to local variable s |  |
+| Assert.cs:107:24:107:24 | access to local variable s | Assert.cs:107:29:107:32 | null |  |
+| Assert.cs:107:24:107:32 | ... != ... | Assert.cs:107:9:107:33 | call to method IsFalse |  |
+| Assert.cs:107:29:107:32 | null | Assert.cs:107:24:107:32 | ... != ... |  |
+| Assert.cs:108:9:108:35 | call to method WriteLine | Assert.cs:110:9:110:26 | ...; |  |
+| Assert.cs:108:9:108:36 | ...; | Assert.cs:108:27:108:27 | access to local variable s |  |
+| Assert.cs:108:27:108:27 | access to local variable s | Assert.cs:108:27:108:34 | access to property Length |  |
+| Assert.cs:108:27:108:34 | access to property Length | Assert.cs:108:9:108:35 | call to method WriteLine |  |
+| Assert.cs:110:9:110:25 | ... = ... | Assert.cs:111:9:111:34 | ...; |  |
+| Assert.cs:110:9:110:26 | ...; | Assert.cs:110:13:110:13 | access to parameter b |  |
+| Assert.cs:110:13:110:13 | access to parameter b | Assert.cs:110:17:110:20 | null | true |
+| Assert.cs:110:13:110:13 | access to parameter b | Assert.cs:110:24:110:25 | "" | false |
+| Assert.cs:110:13:110:25 | ... ? ... : ... | Assert.cs:110:9:110:25 | ... = ... |  |
+| Assert.cs:110:17:110:20 | null | Assert.cs:110:13:110:25 | ... ? ... : ... |  |
+| Assert.cs:110:24:110:25 | "" | Assert.cs:110:13:110:25 | ... ? ... : ... |  |
+| Assert.cs:111:9:111:33 | call to method IsFalse | Assert.cs:84:10:84:12 | exit M12 (abnormal) | exception |
+| Assert.cs:111:9:111:33 | call to method IsFalse | Assert.cs:112:9:112:36 | ...; |  |
+| Assert.cs:111:9:111:34 | ...; | Assert.cs:111:24:111:24 | access to local variable s |  |
+| Assert.cs:111:24:111:24 | access to local variable s | Assert.cs:111:29:111:32 | null |  |
+| Assert.cs:111:24:111:32 | ... == ... | Assert.cs:111:9:111:33 | call to method IsFalse |  |
+| Assert.cs:111:29:111:32 | null | Assert.cs:111:24:111:32 | ... == ... |  |
+| Assert.cs:112:9:112:35 | call to method WriteLine | Assert.cs:114:9:114:26 | ...; |  |
+| Assert.cs:112:9:112:36 | ...; | Assert.cs:112:27:112:27 | access to local variable s |  |
+| Assert.cs:112:27:112:27 | access to local variable s | Assert.cs:112:27:112:34 | access to property Length |  |
+| Assert.cs:112:27:112:34 | access to property Length | Assert.cs:112:9:112:35 | call to method WriteLine |  |
+| Assert.cs:114:9:114:25 | ... = ... | Assert.cs:115:9:115:38 | ...; |  |
+| Assert.cs:114:9:114:26 | ...; | Assert.cs:114:13:114:13 | access to parameter b |  |
+| Assert.cs:114:13:114:13 | access to parameter b | Assert.cs:114:17:114:20 | null | true |
+| Assert.cs:114:13:114:13 | access to parameter b | Assert.cs:114:24:114:25 | "" | false |
+| Assert.cs:114:13:114:25 | ... ? ... : ... | Assert.cs:114:9:114:25 | ... = ... |  |
+| Assert.cs:114:17:114:20 | null | Assert.cs:114:13:114:25 | ... ? ... : ... |  |
+| Assert.cs:114:24:114:25 | "" | Assert.cs:114:13:114:25 | ... ? ... : ... |  |
+| Assert.cs:115:9:115:37 | call to method IsTrue | Assert.cs:84:10:84:12 | exit M12 (abnormal) | exception |
+| Assert.cs:115:9:115:37 | call to method IsTrue | Assert.cs:116:9:116:36 | ...; |  |
+| Assert.cs:115:9:115:38 | ...; | Assert.cs:115:23:115:23 | access to local variable s |  |
+| Assert.cs:115:23:115:23 | access to local variable s | Assert.cs:115:28:115:31 | null |  |
+| Assert.cs:115:23:115:31 | ... != ... | Assert.cs:115:23:115:36 | ... && ... | false |
+| Assert.cs:115:23:115:31 | ... != ... | Assert.cs:115:36:115:36 | access to parameter b | true |
+| Assert.cs:115:23:115:36 | ... && ... | Assert.cs:115:9:115:37 | call to method IsTrue |  |
+| Assert.cs:115:28:115:31 | null | Assert.cs:115:23:115:31 | ... != ... |  |
+| Assert.cs:115:36:115:36 | access to parameter b | Assert.cs:115:23:115:36 | ... && ... |  |
+| Assert.cs:116:9:116:35 | call to method WriteLine | Assert.cs:118:9:118:26 | ...; |  |
+| Assert.cs:116:9:116:36 | ...; | Assert.cs:116:27:116:27 | access to local variable s |  |
+| Assert.cs:116:27:116:27 | access to local variable s | Assert.cs:116:27:116:34 | access to property Length |  |
+| Assert.cs:116:27:116:34 | access to property Length | Assert.cs:116:9:116:35 | call to method WriteLine |  |
+| Assert.cs:118:9:118:25 | ... = ... | Assert.cs:119:9:119:40 | ...; |  |
+| Assert.cs:118:9:118:26 | ...; | Assert.cs:118:13:118:13 | access to parameter b |  |
+| Assert.cs:118:13:118:13 | access to parameter b | Assert.cs:118:17:118:20 | null | true |
+| Assert.cs:118:13:118:13 | access to parameter b | Assert.cs:118:24:118:25 | "" | false |
+| Assert.cs:118:13:118:25 | ... ? ... : ... | Assert.cs:118:9:118:25 | ... = ... |  |
+| Assert.cs:118:17:118:20 | null | Assert.cs:118:13:118:25 | ... ? ... : ... |  |
+| Assert.cs:118:24:118:25 | "" | Assert.cs:118:13:118:25 | ... ? ... : ... |  |
+| Assert.cs:119:9:119:39 | call to method IsFalse | Assert.cs:84:10:84:12 | exit M12 (abnormal) | exception |
+| Assert.cs:119:9:119:39 | call to method IsFalse | Assert.cs:120:9:120:36 | ...; |  |
+| Assert.cs:119:9:119:40 | ...; | Assert.cs:119:24:119:24 | access to local variable s |  |
+| Assert.cs:119:24:119:24 | access to local variable s | Assert.cs:119:29:119:32 | null |  |
+| Assert.cs:119:24:119:32 | ... == ... | Assert.cs:119:24:119:38 | ... \|\| ... | true |
+| Assert.cs:119:24:119:32 | ... == ... | Assert.cs:119:38:119:38 | access to parameter b | false |
+| Assert.cs:119:24:119:38 | ... \|\| ... | Assert.cs:119:9:119:39 | call to method IsFalse |  |
+| Assert.cs:119:29:119:32 | null | Assert.cs:119:24:119:32 | ... == ... |  |
+| Assert.cs:119:37:119:38 | !... | Assert.cs:119:24:119:38 | ... \|\| ... |  |
+| Assert.cs:119:38:119:38 | access to parameter b | Assert.cs:119:37:119:38 | !... |  |
+| Assert.cs:120:9:120:35 | call to method WriteLine | Assert.cs:122:9:122:26 | ...; |  |
+| Assert.cs:120:9:120:36 | ...; | Assert.cs:120:27:120:27 | access to local variable s |  |
+| Assert.cs:120:27:120:27 | access to local variable s | Assert.cs:120:27:120:34 | access to property Length |  |
+| Assert.cs:120:27:120:34 | access to property Length | Assert.cs:120:9:120:35 | call to method WriteLine |  |
+| Assert.cs:122:9:122:25 | ... = ... | Assert.cs:123:9:123:38 | ...; |  |
+| Assert.cs:122:9:122:26 | ...; | Assert.cs:122:13:122:13 | access to parameter b |  |
+| Assert.cs:122:13:122:13 | access to parameter b | Assert.cs:122:17:122:20 | null | true |
+| Assert.cs:122:13:122:13 | access to parameter b | Assert.cs:122:24:122:25 | "" | false |
+| Assert.cs:122:13:122:25 | ... ? ... : ... | Assert.cs:122:9:122:25 | ... = ... |  |
+| Assert.cs:122:17:122:20 | null | Assert.cs:122:13:122:25 | ... ? ... : ... |  |
+| Assert.cs:122:24:122:25 | "" | Assert.cs:122:13:122:25 | ... ? ... : ... |  |
+| Assert.cs:123:9:123:37 | call to method IsTrue | Assert.cs:84:10:84:12 | exit M12 (abnormal) | exception |
+| Assert.cs:123:9:123:37 | call to method IsTrue | Assert.cs:124:9:124:36 | ...; |  |
+| Assert.cs:123:9:123:38 | ...; | Assert.cs:123:23:123:23 | access to local variable s |  |
+| Assert.cs:123:23:123:23 | access to local variable s | Assert.cs:123:28:123:31 | null |  |
+| Assert.cs:123:23:123:31 | ... == ... | Assert.cs:123:23:123:36 | ... && ... | false |
+| Assert.cs:123:23:123:31 | ... == ... | Assert.cs:123:36:123:36 | access to parameter b | true |
+| Assert.cs:123:23:123:36 | ... && ... | Assert.cs:123:9:123:37 | call to method IsTrue |  |
+| Assert.cs:123:28:123:31 | null | Assert.cs:123:23:123:31 | ... == ... |  |
+| Assert.cs:123:36:123:36 | access to parameter b | Assert.cs:123:23:123:36 | ... && ... |  |
+| Assert.cs:124:9:124:35 | call to method WriteLine | Assert.cs:126:9:126:26 | ...; |  |
+| Assert.cs:124:9:124:36 | ...; | Assert.cs:124:27:124:27 | access to local variable s |  |
+| Assert.cs:124:27:124:27 | access to local variable s | Assert.cs:124:27:124:34 | access to property Length |  |
+| Assert.cs:124:27:124:34 | access to property Length | Assert.cs:124:9:124:35 | call to method WriteLine |  |
+| Assert.cs:126:9:126:25 | ... = ... | Assert.cs:127:9:127:40 | ...; |  |
+| Assert.cs:126:9:126:26 | ...; | Assert.cs:126:13:126:13 | access to parameter b |  |
+| Assert.cs:126:13:126:13 | access to parameter b | Assert.cs:126:17:126:20 | null | true |
+| Assert.cs:126:13:126:13 | access to parameter b | Assert.cs:126:24:126:25 | "" | false |
+| Assert.cs:126:13:126:25 | ... ? ... : ... | Assert.cs:126:9:126:25 | ... = ... |  |
+| Assert.cs:126:17:126:20 | null | Assert.cs:126:13:126:25 | ... ? ... : ... |  |
+| Assert.cs:126:24:126:25 | "" | Assert.cs:126:13:126:25 | ... ? ... : ... |  |
+| Assert.cs:127:9:127:39 | call to method IsFalse | Assert.cs:84:10:84:12 | exit M12 (abnormal) | exception |
+| Assert.cs:127:9:127:39 | call to method IsFalse | Assert.cs:128:9:128:36 | ...; |  |
+| Assert.cs:127:9:127:40 | ...; | Assert.cs:127:24:127:24 | access to local variable s |  |
+| Assert.cs:127:24:127:24 | access to local variable s | Assert.cs:127:29:127:32 | null |  |
+| Assert.cs:127:24:127:32 | ... != ... | Assert.cs:127:24:127:38 | ... \|\| ... | true |
+| Assert.cs:127:24:127:32 | ... != ... | Assert.cs:127:38:127:38 | access to parameter b | false |
+| Assert.cs:127:24:127:38 | ... \|\| ... | Assert.cs:127:9:127:39 | call to method IsFalse |  |
+| Assert.cs:127:29:127:32 | null | Assert.cs:127:24:127:32 | ... != ... |  |
+| Assert.cs:127:37:127:38 | !... | Assert.cs:127:24:127:38 | ... \|\| ... |  |
+| Assert.cs:127:38:127:38 | access to parameter b | Assert.cs:127:37:127:38 | !... |  |
 | Assert.cs:128:9:128:35 | call to method WriteLine | Assert.cs:84:10:84:12 | exit M12 (normal) |  |
 | Assert.cs:128:9:128:36 | ...; | Assert.cs:128:27:128:27 | access to local variable s |  |
 | Assert.cs:128:27:128:27 | access to local variable s | Assert.cs:128:27:128:34 | access to property Length |  |
@@ -938,19 +786,13 @@
 | Assert.cs:138:10:138:12 | exit M13 (abnormal) | Assert.cs:138:10:138:12 | exit M13 |  |
 | Assert.cs:138:10:138:12 | exit M13 (normal) | Assert.cs:138:10:138:12 | exit M13 |  |
 | Assert.cs:139:5:142:5 | {...} | Assert.cs:140:9:140:36 | ...; |  |
-| Assert.cs:140:9:140:35 | [assertion failure] call to method AssertTrueFalse | Assert.cs:138:10:138:12 | exit M13 (abnormal) | exception(Exception) |
-| Assert.cs:140:9:140:35 | [assertion failure] call to method AssertTrueFalse | Assert.cs:138:10:138:12 | exit M13 (abnormal) | exception(Exception) |
-| Assert.cs:140:9:140:35 | [assertion success] call to method AssertTrueFalse | Assert.cs:141:9:141:15 | return ...; |  |
+| Assert.cs:140:9:140:35 | call to method AssertTrueFalse | Assert.cs:138:10:138:12 | exit M13 (abnormal) | exception |
+| Assert.cs:140:9:140:35 | call to method AssertTrueFalse | Assert.cs:141:9:141:15 | return ...; |  |
 | Assert.cs:140:9:140:35 | this access | Assert.cs:140:25:140:26 | access to parameter b1 |  |
 | Assert.cs:140:9:140:36 | ...; | Assert.cs:140:9:140:35 | this access |  |
-| Assert.cs:140:25:140:26 | access to parameter b1 | Assert.cs:140:29:140:30 | [assertion failure] access to parameter b2 | false |
-| Assert.cs:140:25:140:26 | access to parameter b1 | Assert.cs:140:29:140:30 | access to parameter b2 | true |
-| Assert.cs:140:29:140:30 | [assertion failure] access to parameter b2 | Assert.cs:140:33:140:34 | [assertion failure] access to parameter b3 | false, true |
-| Assert.cs:140:29:140:30 | access to parameter b2 | Assert.cs:140:33:140:34 | [assertion failure] access to parameter b3 | true |
-| Assert.cs:140:29:140:30 | access to parameter b2 | Assert.cs:140:33:140:34 | [assertion success] access to parameter b3 | false |
-| Assert.cs:140:33:140:34 | [assertion failure] access to parameter b3 | Assert.cs:140:9:140:35 | [assertion failure] call to method AssertTrueFalse |  |
-| Assert.cs:140:33:140:34 | [assertion failure] access to parameter b3 | Assert.cs:140:9:140:35 | [assertion failure] call to method AssertTrueFalse |  |
-| Assert.cs:140:33:140:34 | [assertion success] access to parameter b3 | Assert.cs:140:9:140:35 | [assertion success] call to method AssertTrueFalse |  |
+| Assert.cs:140:25:140:26 | access to parameter b1 | Assert.cs:140:29:140:30 | access to parameter b2 |  |
+| Assert.cs:140:29:140:30 | access to parameter b2 | Assert.cs:140:33:140:34 | access to parameter b3 |  |
+| Assert.cs:140:33:140:34 | access to parameter b3 | Assert.cs:140:9:140:35 | call to method AssertTrueFalse |  |
 | Assert.cs:141:9:141:15 | return ...; | Assert.cs:138:10:138:12 | exit M13 (normal) | return |
 | Assignments.cs:1:7:1:17 | call to constructor Object | Assignments.cs:1:7:1:17 | {...} |  |
 | Assignments.cs:1:7:1:17 | enter Assignments | Assignments.cs:1:7:1:17 | call to constructor Object |  |
@@ -1039,21 +881,16 @@
 | BreakInTry.cs:26:21:26:31 | ... == ... | BreakInTry.cs:27:21:27:26 | break; | true |
 | BreakInTry.cs:26:21:26:31 | ... == ... | BreakInTry.cs:30:13:33:13 | {...} | false |
 | BreakInTry.cs:26:28:26:31 | null | BreakInTry.cs:26:21:26:31 | ... == ... |  |
-| BreakInTry.cs:27:21:27:26 | break; | BreakInTry.cs:30:13:33:13 | [finally: break] {...} | break |
-| BreakInTry.cs:30:13:33:13 | [finally: break] {...} | BreakInTry.cs:31:17:32:21 | [finally: break] if (...) ... |  |
+| BreakInTry.cs:27:21:27:26 | break; | BreakInTry.cs:30:13:33:13 | {...} | break |
 | BreakInTry.cs:30:13:33:13 | {...} | BreakInTry.cs:31:17:32:21 | if (...) ... |  |
-| BreakInTry.cs:31:17:32:21 | [finally: break] if (...) ... | BreakInTry.cs:31:21:31:24 | [finally: break] access to parameter args |  |
 | BreakInTry.cs:31:17:32:21 | if (...) ... | BreakInTry.cs:31:21:31:24 | access to parameter args |  |
-| BreakInTry.cs:31:21:31:24 | [finally: break] access to parameter args | BreakInTry.cs:31:29:31:32 | [finally: break] null |  |
 | BreakInTry.cs:31:21:31:24 | access to parameter args | BreakInTry.cs:31:29:31:32 | null |  |
 | BreakInTry.cs:31:21:31:32 | ... == ... | BreakInTry.cs:22:9:34:9 | foreach (... ... in ...) ... | false |
 | BreakInTry.cs:31:21:31:32 | ... == ... | BreakInTry.cs:32:21:32:21 | ; | true |
-| BreakInTry.cs:31:21:31:32 | [finally: break] ... == ... | BreakInTry.cs:32:21:32:21 | [finally: break] ; | true |
-| BreakInTry.cs:31:21:31:32 | [finally: break] ... == ... | BreakInTry.cs:35:7:35:7 | ; | false |
-| BreakInTry.cs:31:29:31:32 | [finally: break] null | BreakInTry.cs:31:21:31:32 | [finally: break] ... == ... |  |
+| BreakInTry.cs:31:21:31:32 | ... == ... | BreakInTry.cs:35:7:35:7 | ; | false |
 | BreakInTry.cs:31:29:31:32 | null | BreakInTry.cs:31:21:31:32 | ... == ... |  |
 | BreakInTry.cs:32:21:32:21 | ; | BreakInTry.cs:22:9:34:9 | foreach (... ... in ...) ... |  |
-| BreakInTry.cs:32:21:32:21 | [finally: break] ; | BreakInTry.cs:35:7:35:7 | ; | break |
+| BreakInTry.cs:32:21:32:21 | ; | BreakInTry.cs:35:7:35:7 | ; | break |
 | BreakInTry.cs:35:7:35:7 | ; | BreakInTry.cs:20:10:20:11 | exit M2 (normal) |  |
 | BreakInTry.cs:38:10:38:11 | enter M3 | BreakInTry.cs:39:5:54:5 | {...} |  |
 | BreakInTry.cs:38:10:38:11 | exit M3 (normal) | BreakInTry.cs:38:10:38:11 | exit M3 |  |
@@ -1065,30 +902,20 @@
 | BreakInTry.cs:42:17:42:28 | ... == ... | BreakInTry.cs:43:17:43:23 | return ...; | true |
 | BreakInTry.cs:42:17:42:28 | ... == ... | BreakInTry.cs:46:9:52:9 | {...} | false |
 | BreakInTry.cs:42:25:42:28 | null | BreakInTry.cs:42:17:42:28 | ... == ... |  |
-| BreakInTry.cs:43:17:43:23 | return ...; | BreakInTry.cs:46:9:52:9 | [finally: return] {...} | return |
-| BreakInTry.cs:46:9:52:9 | [finally: return] {...} | BreakInTry.cs:47:33:47:36 | [finally: return] access to parameter args |  |
+| BreakInTry.cs:43:17:43:23 | return ...; | BreakInTry.cs:46:9:52:9 | {...} | return |
 | BreakInTry.cs:46:9:52:9 | {...} | BreakInTry.cs:47:33:47:36 | access to parameter args |  |
-| BreakInTry.cs:47:13:51:13 | [finally: return] foreach (... ... in ...) ... | BreakInTry.cs:38:10:38:11 | exit M3 (normal) | return |
-| BreakInTry.cs:47:13:51:13 | [finally: return] foreach (... ... in ...) ... | BreakInTry.cs:47:26:47:28 | [finally: return] String arg | non-empty |
+| BreakInTry.cs:47:13:51:13 | foreach (... ... in ...) ... | BreakInTry.cs:38:10:38:11 | exit M3 (normal) | return |
 | BreakInTry.cs:47:13:51:13 | foreach (... ... in ...) ... | BreakInTry.cs:47:26:47:28 | String arg | non-empty |
 | BreakInTry.cs:47:13:51:13 | foreach (... ... in ...) ... | BreakInTry.cs:53:7:53:7 | ; | empty |
 | BreakInTry.cs:47:26:47:28 | String arg | BreakInTry.cs:48:13:51:13 | {...} |  |
-| BreakInTry.cs:47:26:47:28 | [finally: return] String arg | BreakInTry.cs:48:13:51:13 | [finally: return] {...} |  |
-| BreakInTry.cs:47:33:47:36 | [finally: return] access to parameter args | BreakInTry.cs:47:13:51:13 | [finally: return] foreach (... ... in ...) ... |  |
 | BreakInTry.cs:47:33:47:36 | access to parameter args | BreakInTry.cs:47:13:51:13 | foreach (... ... in ...) ... |  |
-| BreakInTry.cs:48:13:51:13 | [finally: return] {...} | BreakInTry.cs:49:17:50:26 | [finally: return] if (...) ... |  |
 | BreakInTry.cs:48:13:51:13 | {...} | BreakInTry.cs:49:17:50:26 | if (...) ... |  |
-| BreakInTry.cs:49:17:50:26 | [finally: return] if (...) ... | BreakInTry.cs:49:21:49:23 | [finally: return] access to local variable arg |  |
 | BreakInTry.cs:49:17:50:26 | if (...) ... | BreakInTry.cs:49:21:49:23 | access to local variable arg |  |
-| BreakInTry.cs:49:21:49:23 | [finally: return] access to local variable arg | BreakInTry.cs:49:28:49:31 | [finally: return] null |  |
 | BreakInTry.cs:49:21:49:23 | access to local variable arg | BreakInTry.cs:49:28:49:31 | null |  |
 | BreakInTry.cs:49:21:49:31 | ... == ... | BreakInTry.cs:47:13:51:13 | foreach (... ... in ...) ... | false |
 | BreakInTry.cs:49:21:49:31 | ... == ... | BreakInTry.cs:50:21:50:26 | break; | true |
-| BreakInTry.cs:49:21:49:31 | [finally: return] ... == ... | BreakInTry.cs:47:13:51:13 | [finally: return] foreach (... ... in ...) ... | false |
-| BreakInTry.cs:49:21:49:31 | [finally: return] ... == ... | BreakInTry.cs:50:21:50:26 | [finally: return] break; | true |
-| BreakInTry.cs:49:28:49:31 | [finally: return] null | BreakInTry.cs:49:21:49:31 | [finally: return] ... == ... |  |
 | BreakInTry.cs:49:28:49:31 | null | BreakInTry.cs:49:21:49:31 | ... == ... |  |
-| BreakInTry.cs:50:21:50:26 | [finally: return] break; | BreakInTry.cs:38:10:38:11 | exit M3 (normal) | return |
+| BreakInTry.cs:50:21:50:26 | break; | BreakInTry.cs:38:10:38:11 | exit M3 (normal) | return |
 | BreakInTry.cs:50:21:50:26 | break; | BreakInTry.cs:53:7:53:7 | ; | break |
 | BreakInTry.cs:53:7:53:7 | ; | BreakInTry.cs:38:10:38:11 | exit M3 (normal) |  |
 | BreakInTry.cs:56:10:56:11 | enter M4 | BreakInTry.cs:57:5:71:5 | {...} |  |
@@ -1101,31 +928,19 @@
 | BreakInTry.cs:60:17:60:28 | ... == ... | BreakInTry.cs:61:17:61:23 | return ...; | true |
 | BreakInTry.cs:60:17:60:28 | ... == ... | BreakInTry.cs:64:9:70:9 | {...} | false |
 | BreakInTry.cs:60:25:60:28 | null | BreakInTry.cs:60:17:60:28 | ... == ... |  |
-| BreakInTry.cs:61:17:61:23 | return ...; | BreakInTry.cs:64:9:70:9 | [finally: return] {...} | return |
-| BreakInTry.cs:64:9:70:9 | [finally: return] {...} | BreakInTry.cs:65:33:65:36 | [finally: return] access to parameter args |  |
+| BreakInTry.cs:61:17:61:23 | return ...; | BreakInTry.cs:64:9:70:9 | {...} | return |
 | BreakInTry.cs:64:9:70:9 | {...} | BreakInTry.cs:65:33:65:36 | access to parameter args |  |
-| BreakInTry.cs:65:13:69:13 | [finally: return] foreach (... ... in ...) ... | BreakInTry.cs:56:10:56:11 | exit M4 (normal) | return |
-| BreakInTry.cs:65:13:69:13 | [finally: return] foreach (... ... in ...) ... | BreakInTry.cs:65:26:65:28 | [finally: return] String arg | non-empty |
-| BreakInTry.cs:65:13:69:13 | foreach (... ... in ...) ... | BreakInTry.cs:56:10:56:11 | exit M4 (normal) | empty |
+| BreakInTry.cs:65:13:69:13 | foreach (... ... in ...) ... | BreakInTry.cs:56:10:56:11 | exit M4 (normal) | empty, return |
 | BreakInTry.cs:65:13:69:13 | foreach (... ... in ...) ... | BreakInTry.cs:65:26:65:28 | String arg | non-empty |
 | BreakInTry.cs:65:26:65:28 | String arg | BreakInTry.cs:66:13:69:13 | {...} |  |
-| BreakInTry.cs:65:26:65:28 | [finally: return] String arg | BreakInTry.cs:66:13:69:13 | [finally: return] {...} |  |
-| BreakInTry.cs:65:33:65:36 | [finally: return] access to parameter args | BreakInTry.cs:65:13:69:13 | [finally: return] foreach (... ... in ...) ... |  |
 | BreakInTry.cs:65:33:65:36 | access to parameter args | BreakInTry.cs:65:13:69:13 | foreach (... ... in ...) ... |  |
-| BreakInTry.cs:66:13:69:13 | [finally: return] {...} | BreakInTry.cs:67:17:68:26 | [finally: return] if (...) ... |  |
 | BreakInTry.cs:66:13:69:13 | {...} | BreakInTry.cs:67:17:68:26 | if (...) ... |  |
-| BreakInTry.cs:67:17:68:26 | [finally: return] if (...) ... | BreakInTry.cs:67:21:67:23 | [finally: return] access to local variable arg |  |
 | BreakInTry.cs:67:17:68:26 | if (...) ... | BreakInTry.cs:67:21:67:23 | access to local variable arg |  |
-| BreakInTry.cs:67:21:67:23 | [finally: return] access to local variable arg | BreakInTry.cs:67:28:67:31 | [finally: return] null |  |
 | BreakInTry.cs:67:21:67:23 | access to local variable arg | BreakInTry.cs:67:28:67:31 | null |  |
 | BreakInTry.cs:67:21:67:31 | ... == ... | BreakInTry.cs:65:13:69:13 | foreach (... ... in ...) ... | false |
 | BreakInTry.cs:67:21:67:31 | ... == ... | BreakInTry.cs:68:21:68:26 | break; | true |
-| BreakInTry.cs:67:21:67:31 | [finally: return] ... == ... | BreakInTry.cs:65:13:69:13 | [finally: return] foreach (... ... in ...) ... | false |
-| BreakInTry.cs:67:21:67:31 | [finally: return] ... == ... | BreakInTry.cs:68:21:68:26 | [finally: return] break; | true |
-| BreakInTry.cs:67:28:67:31 | [finally: return] null | BreakInTry.cs:67:21:67:31 | [finally: return] ... == ... |  |
 | BreakInTry.cs:67:28:67:31 | null | BreakInTry.cs:67:21:67:31 | ... == ... |  |
-| BreakInTry.cs:68:21:68:26 | [finally: return] break; | BreakInTry.cs:56:10:56:11 | exit M4 (normal) | return |
-| BreakInTry.cs:68:21:68:26 | break; | BreakInTry.cs:56:10:56:11 | exit M4 (normal) | break |
+| BreakInTry.cs:68:21:68:26 | break; | BreakInTry.cs:56:10:56:11 | exit M4 (normal) | break, return |
 | CompileTimeOperators.cs:3:7:3:26 | call to constructor Object | CompileTimeOperators.cs:3:7:3:26 | {...} |  |
 | CompileTimeOperators.cs:3:7:3:26 | enter CompileTimeOperators | CompileTimeOperators.cs:3:7:3:26 | call to constructor Object |  |
 | CompileTimeOperators.cs:3:7:3:26 | exit CompileTimeOperators (normal) | CompileTimeOperators.cs:3:7:3:26 | exit CompileTimeOperators |  |
@@ -1155,15 +970,21 @@
 | CompileTimeOperators.cs:26:7:26:22 | exit GotoInTryFinally (normal) | CompileTimeOperators.cs:26:7:26:22 | exit GotoInTryFinally |  |
 | CompileTimeOperators.cs:26:7:26:22 | {...} | CompileTimeOperators.cs:26:7:26:22 | exit GotoInTryFinally (normal) |  |
 | CompileTimeOperators.cs:28:10:28:10 | enter M | CompileTimeOperators.cs:29:5:41:5 | {...} |  |
+| CompileTimeOperators.cs:28:10:28:10 | exit M (abnormal) | CompileTimeOperators.cs:28:10:28:10 | exit M |  |
 | CompileTimeOperators.cs:28:10:28:10 | exit M (normal) | CompileTimeOperators.cs:28:10:28:10 | exit M |  |
 | CompileTimeOperators.cs:29:5:41:5 | {...} | CompileTimeOperators.cs:30:9:38:9 | try {...} ... |  |
 | CompileTimeOperators.cs:30:9:38:9 | try {...} ... | CompileTimeOperators.cs:31:9:34:9 | {...} |  |
 | CompileTimeOperators.cs:31:9:34:9 | {...} | CompileTimeOperators.cs:32:13:32:21 | goto ...; |  |
-| CompileTimeOperators.cs:32:13:32:21 | goto ...; | CompileTimeOperators.cs:36:9:38:9 | [finally: goto(End)] {...} | goto(End) |
-| CompileTimeOperators.cs:36:9:38:9 | [finally: goto(End)] {...} | CompileTimeOperators.cs:37:13:37:41 | [finally: goto(End)] ...; |  |
-| CompileTimeOperators.cs:37:13:37:40 | [finally: goto(End)] call to method WriteLine | CompileTimeOperators.cs:40:9:40:11 | End: | goto(End) |
-| CompileTimeOperators.cs:37:13:37:41 | [finally: goto(End)] ...; | CompileTimeOperators.cs:37:31:37:39 | [finally: goto(End)] "Finally" |  |
-| CompileTimeOperators.cs:37:31:37:39 | [finally: goto(End)] "Finally" | CompileTimeOperators.cs:37:13:37:40 | [finally: goto(End)] call to method WriteLine |  |
+| CompileTimeOperators.cs:32:13:32:21 | goto ...; | CompileTimeOperators.cs:36:9:38:9 | {...} | goto |
+| CompileTimeOperators.cs:36:9:38:9 | {...} | CompileTimeOperators.cs:37:13:37:41 | ...; |  |
+| CompileTimeOperators.cs:37:13:37:40 | call to method WriteLine | CompileTimeOperators.cs:28:10:28:10 | exit M (abnormal) | exception |
+| CompileTimeOperators.cs:37:13:37:40 | call to method WriteLine | CompileTimeOperators.cs:39:9:39:34 | ...; |  |
+| CompileTimeOperators.cs:37:13:37:40 | call to method WriteLine | CompileTimeOperators.cs:40:9:40:11 | End: | goto |
+| CompileTimeOperators.cs:37:13:37:41 | ...; | CompileTimeOperators.cs:37:31:37:39 | "Finally" |  |
+| CompileTimeOperators.cs:37:31:37:39 | "Finally" | CompileTimeOperators.cs:37:13:37:40 | call to method WriteLine |  |
+| CompileTimeOperators.cs:39:9:39:33 | call to method WriteLine | CompileTimeOperators.cs:40:9:40:11 | End: |  |
+| CompileTimeOperators.cs:39:9:39:34 | ...; | CompileTimeOperators.cs:39:27:39:32 | "Dead" |  |
+| CompileTimeOperators.cs:39:27:39:32 | "Dead" | CompileTimeOperators.cs:39:9:39:33 | call to method WriteLine |  |
 | CompileTimeOperators.cs:40:9:40:11 | End: | CompileTimeOperators.cs:40:14:40:38 | ...; |  |
 | CompileTimeOperators.cs:40:14:40:37 | call to method WriteLine | CompileTimeOperators.cs:28:10:28:10 | exit M (normal) |  |
 | CompileTimeOperators.cs:40:14:40:38 | ...; | CompileTimeOperators.cs:40:32:40:36 | "End" |  |
@@ -1271,17 +1092,16 @@
 | Conditions.cs:3:10:3:19 | exit IncrOrDecr (normal) | Conditions.cs:3:10:3:19 | exit IncrOrDecr |  |
 | Conditions.cs:4:5:9:5 | {...} | Conditions.cs:5:9:6:16 | if (...) ... |  |
 | Conditions.cs:5:9:6:16 | if (...) ... | Conditions.cs:5:13:5:15 | access to parameter inc |  |
-| Conditions.cs:5:13:5:15 | access to parameter inc | Conditions.cs:6:13:6:16 | [inc (line 3): true] ...; | true |
-| Conditions.cs:5:13:5:15 | access to parameter inc | Conditions.cs:7:9:8:16 | [inc (line 3): false] if (...) ... | false |
-| Conditions.cs:6:13:6:13 | [inc (line 3): true] access to parameter x | Conditions.cs:6:13:6:15 | [inc (line 3): true] ...++ |  |
-| Conditions.cs:6:13:6:15 | [inc (line 3): true] ...++ | Conditions.cs:7:9:8:16 | [inc (line 3): true] if (...) ... |  |
-| Conditions.cs:6:13:6:16 | [inc (line 3): true] ...; | Conditions.cs:6:13:6:13 | [inc (line 3): true] access to parameter x |  |
-| Conditions.cs:7:9:8:16 | [inc (line 3): false] if (...) ... | Conditions.cs:7:14:7:16 | [inc (line 3): false] access to parameter inc |  |
-| Conditions.cs:7:9:8:16 | [inc (line 3): true] if (...) ... | Conditions.cs:7:14:7:16 | [inc (line 3): true] access to parameter inc |  |
+| Conditions.cs:5:13:5:15 | access to parameter inc | Conditions.cs:6:13:6:16 | ...; | true |
+| Conditions.cs:5:13:5:15 | access to parameter inc | Conditions.cs:7:9:8:16 | if (...) ... | false |
+| Conditions.cs:6:13:6:13 | access to parameter x | Conditions.cs:6:13:6:15 | ...++ |  |
+| Conditions.cs:6:13:6:15 | ...++ | Conditions.cs:7:9:8:16 | if (...) ... |  |
+| Conditions.cs:6:13:6:16 | ...; | Conditions.cs:6:13:6:13 | access to parameter x |  |
+| Conditions.cs:7:9:8:16 | if (...) ... | Conditions.cs:7:14:7:16 | access to parameter inc |  |
 | Conditions.cs:7:13:7:16 | [false] !... | Conditions.cs:3:10:3:19 | exit IncrOrDecr (normal) | false |
 | Conditions.cs:7:13:7:16 | [true] !... | Conditions.cs:8:13:8:16 | ...; | true |
-| Conditions.cs:7:14:7:16 | [inc (line 3): false] access to parameter inc | Conditions.cs:7:13:7:16 | [true] !... | false |
-| Conditions.cs:7:14:7:16 | [inc (line 3): true] access to parameter inc | Conditions.cs:7:13:7:16 | [false] !... | true |
+| Conditions.cs:7:14:7:16 | access to parameter inc | Conditions.cs:7:13:7:16 | [false] !... | true |
+| Conditions.cs:7:14:7:16 | access to parameter inc | Conditions.cs:7:13:7:16 | [true] !... | false |
 | Conditions.cs:8:13:8:13 | access to parameter x | Conditions.cs:8:13:8:15 | ...-- |  |
 | Conditions.cs:8:13:8:15 | ...-- | Conditions.cs:3:10:3:19 | exit IncrOrDecr (normal) |  |
 | Conditions.cs:8:13:8:16 | ...; | Conditions.cs:8:13:8:13 | access to parameter x |  |
@@ -1292,27 +1112,21 @@
 | Conditions.cs:13:13:13:17 | Int32 x = ... | Conditions.cs:14:9:15:16 | if (...) ... |  |
 | Conditions.cs:13:17:13:17 | 0 | Conditions.cs:13:13:13:17 | Int32 x = ... |  |
 | Conditions.cs:14:9:15:16 | if (...) ... | Conditions.cs:14:13:14:13 | access to parameter b |  |
-| Conditions.cs:14:13:14:13 | access to parameter b | Conditions.cs:15:13:15:16 | [b (line 11): true] ...; | true |
-| Conditions.cs:14:13:14:13 | access to parameter b | Conditions.cs:16:9:18:20 | [b (line 11): false] if (...) ... | false |
-| Conditions.cs:15:13:15:13 | [b (line 11): true] access to local variable x | Conditions.cs:15:13:15:15 | [b (line 11): true] ...++ |  |
-| Conditions.cs:15:13:15:15 | [b (line 11): true] ...++ | Conditions.cs:16:9:18:20 | [b (line 11): true] if (...) ... |  |
-| Conditions.cs:15:13:15:16 | [b (line 11): true] ...; | Conditions.cs:15:13:15:13 | [b (line 11): true] access to local variable x |  |
-| Conditions.cs:16:9:18:20 | [b (line 11): false] if (...) ... | Conditions.cs:16:13:16:13 | [b (line 11): false] access to local variable x |  |
-| Conditions.cs:16:9:18:20 | [b (line 11): true] if (...) ... | Conditions.cs:16:13:16:13 | [b (line 11): true] access to local variable x |  |
-| Conditions.cs:16:13:16:13 | [b (line 11): false] access to local variable x | Conditions.cs:16:17:16:17 | [b (line 11): false] 0 |  |
-| Conditions.cs:16:13:16:13 | [b (line 11): true] access to local variable x | Conditions.cs:16:17:16:17 | [b (line 11): true] 0 |  |
-| Conditions.cs:16:13:16:17 | [b (line 11): false] ... > ... | Conditions.cs:17:13:18:20 | [b (line 11): false] if (...) ... | true |
-| Conditions.cs:16:13:16:17 | [b (line 11): false] ... > ... | Conditions.cs:19:16:19:16 | access to local variable x | false |
-| Conditions.cs:16:13:16:17 | [b (line 11): true] ... > ... | Conditions.cs:17:13:18:20 | [b (line 11): true] if (...) ... | true |
-| Conditions.cs:16:13:16:17 | [b (line 11): true] ... > ... | Conditions.cs:19:16:19:16 | access to local variable x | false |
-| Conditions.cs:16:17:16:17 | [b (line 11): false] 0 | Conditions.cs:16:13:16:17 | [b (line 11): false] ... > ... |  |
-| Conditions.cs:16:17:16:17 | [b (line 11): true] 0 | Conditions.cs:16:13:16:17 | [b (line 11): true] ... > ... |  |
-| Conditions.cs:17:13:18:20 | [b (line 11): false] if (...) ... | Conditions.cs:17:18:17:18 | [b (line 11): false] access to parameter b |  |
-| Conditions.cs:17:13:18:20 | [b (line 11): true] if (...) ... | Conditions.cs:17:18:17:18 | [b (line 11): true] access to parameter b |  |
+| Conditions.cs:14:13:14:13 | access to parameter b | Conditions.cs:15:13:15:16 | ...; | true |
+| Conditions.cs:14:13:14:13 | access to parameter b | Conditions.cs:16:9:18:20 | if (...) ... | false |
+| Conditions.cs:15:13:15:13 | access to local variable x | Conditions.cs:15:13:15:15 | ...++ |  |
+| Conditions.cs:15:13:15:15 | ...++ | Conditions.cs:16:9:18:20 | if (...) ... |  |
+| Conditions.cs:15:13:15:16 | ...; | Conditions.cs:15:13:15:13 | access to local variable x |  |
+| Conditions.cs:16:9:18:20 | if (...) ... | Conditions.cs:16:13:16:13 | access to local variable x |  |
+| Conditions.cs:16:13:16:13 | access to local variable x | Conditions.cs:16:17:16:17 | 0 |  |
+| Conditions.cs:16:13:16:17 | ... > ... | Conditions.cs:17:13:18:20 | if (...) ... | true |
+| Conditions.cs:16:13:16:17 | ... > ... | Conditions.cs:19:16:19:16 | access to local variable x | false |
+| Conditions.cs:16:17:16:17 | 0 | Conditions.cs:16:13:16:17 | ... > ... |  |
+| Conditions.cs:17:13:18:20 | if (...) ... | Conditions.cs:17:18:17:18 | access to parameter b |  |
 | Conditions.cs:17:17:17:18 | [false] !... | Conditions.cs:19:16:19:16 | access to local variable x | false |
 | Conditions.cs:17:17:17:18 | [true] !... | Conditions.cs:18:17:18:20 | ...; | true |
-| Conditions.cs:17:18:17:18 | [b (line 11): false] access to parameter b | Conditions.cs:17:17:17:18 | [true] !... | false |
-| Conditions.cs:17:18:17:18 | [b (line 11): true] access to parameter b | Conditions.cs:17:17:17:18 | [false] !... | true |
+| Conditions.cs:17:18:17:18 | access to parameter b | Conditions.cs:17:17:17:18 | [false] !... | true |
+| Conditions.cs:17:18:17:18 | access to parameter b | Conditions.cs:17:17:17:18 | [true] !... | false |
 | Conditions.cs:18:17:18:17 | access to local variable x | Conditions.cs:18:17:18:19 | ...-- |  |
 | Conditions.cs:18:17:18:19 | ...-- | Conditions.cs:19:16:19:16 | access to local variable x |  |
 | Conditions.cs:18:17:18:20 | ...; | Conditions.cs:18:17:18:17 | access to local variable x |  |
@@ -1328,16 +1142,12 @@
 | Conditions.cs:25:13:25:14 | access to parameter b1 | Conditions.cs:26:13:27:20 | if (...) ... | true |
 | Conditions.cs:25:13:25:14 | access to parameter b1 | Conditions.cs:28:9:29:16 | if (...) ... | false |
 | Conditions.cs:26:13:27:20 | if (...) ... | Conditions.cs:26:17:26:18 | access to parameter b2 |  |
-| Conditions.cs:26:17:26:18 | access to parameter b2 | Conditions.cs:27:17:27:20 | [b2 (line 22): true] ...; | true |
-| Conditions.cs:26:17:26:18 | access to parameter b2 | Conditions.cs:28:9:29:16 | [b2 (line 22): false] if (...) ... | false |
-| Conditions.cs:27:17:27:17 | [b2 (line 22): true] access to local variable x | Conditions.cs:27:17:27:19 | [b2 (line 22): true] ...++ |  |
-| Conditions.cs:27:17:27:19 | [b2 (line 22): true] ...++ | Conditions.cs:28:9:29:16 | [b2 (line 22): true] if (...) ... |  |
-| Conditions.cs:27:17:27:20 | [b2 (line 22): true] ...; | Conditions.cs:27:17:27:17 | [b2 (line 22): true] access to local variable x |  |
-| Conditions.cs:28:9:29:16 | [b2 (line 22): false] if (...) ... | Conditions.cs:28:13:28:14 | [b2 (line 22): false] access to parameter b2 |  |
-| Conditions.cs:28:9:29:16 | [b2 (line 22): true] if (...) ... | Conditions.cs:28:13:28:14 | [b2 (line 22): true] access to parameter b2 |  |
+| Conditions.cs:26:17:26:18 | access to parameter b2 | Conditions.cs:27:17:27:20 | ...; | true |
+| Conditions.cs:26:17:26:18 | access to parameter b2 | Conditions.cs:28:9:29:16 | if (...) ... | false |
+| Conditions.cs:27:17:27:17 | access to local variable x | Conditions.cs:27:17:27:19 | ...++ |  |
+| Conditions.cs:27:17:27:19 | ...++ | Conditions.cs:28:9:29:16 | if (...) ... |  |
+| Conditions.cs:27:17:27:20 | ...; | Conditions.cs:27:17:27:17 | access to local variable x |  |
 | Conditions.cs:28:9:29:16 | if (...) ... | Conditions.cs:28:13:28:14 | access to parameter b2 |  |
-| Conditions.cs:28:13:28:14 | [b2 (line 22): false] access to parameter b2 | Conditions.cs:30:16:30:16 | access to local variable x | false |
-| Conditions.cs:28:13:28:14 | [b2 (line 22): true] access to parameter b2 | Conditions.cs:29:13:29:16 | ...; | true |
 | Conditions.cs:28:13:28:14 | access to parameter b2 | Conditions.cs:29:13:29:16 | ...; | true |
 | Conditions.cs:28:13:28:14 | access to parameter b2 | Conditions.cs:30:16:30:16 | access to local variable x | false |
 | Conditions.cs:29:13:29:13 | access to local variable x | Conditions.cs:29:13:29:15 | ...++ |  |
@@ -1361,15 +1171,14 @@
 | Conditions.cs:38:13:38:20 | ...; | Conditions.cs:38:18:38:19 | access to parameter b1 |  |
 | Conditions.cs:38:18:38:19 | access to parameter b1 | Conditions.cs:38:13:38:19 | ... = ... |  |
 | Conditions.cs:39:9:40:16 | if (...) ... | Conditions.cs:39:13:39:14 | access to local variable b2 |  |
-| Conditions.cs:39:13:39:14 | access to local variable b2 | Conditions.cs:40:13:40:16 | [b2 (line 39): true] ...; | true |
-| Conditions.cs:39:13:39:14 | access to local variable b2 | Conditions.cs:41:9:42:16 | [b2 (line 39): false] if (...) ... | false |
-| Conditions.cs:40:13:40:13 | [b2 (line 39): true] access to local variable x | Conditions.cs:40:13:40:15 | [b2 (line 39): true] ...++ |  |
-| Conditions.cs:40:13:40:15 | [b2 (line 39): true] ...++ | Conditions.cs:41:9:42:16 | [b2 (line 39): true] if (...) ... |  |
-| Conditions.cs:40:13:40:16 | [b2 (line 39): true] ...; | Conditions.cs:40:13:40:13 | [b2 (line 39): true] access to local variable x |  |
-| Conditions.cs:41:9:42:16 | [b2 (line 39): false] if (...) ... | Conditions.cs:41:13:41:14 | [b2 (line 39): false] access to local variable b2 |  |
-| Conditions.cs:41:9:42:16 | [b2 (line 39): true] if (...) ... | Conditions.cs:41:13:41:14 | [b2 (line 39): true] access to local variable b2 |  |
-| Conditions.cs:41:13:41:14 | [b2 (line 39): false] access to local variable b2 | Conditions.cs:43:16:43:16 | access to local variable x | false |
-| Conditions.cs:41:13:41:14 | [b2 (line 39): true] access to local variable b2 | Conditions.cs:42:13:42:16 | ...; | true |
+| Conditions.cs:39:13:39:14 | access to local variable b2 | Conditions.cs:40:13:40:16 | ...; | true |
+| Conditions.cs:39:13:39:14 | access to local variable b2 | Conditions.cs:41:9:42:16 | if (...) ... | false |
+| Conditions.cs:40:13:40:13 | access to local variable x | Conditions.cs:40:13:40:15 | ...++ |  |
+| Conditions.cs:40:13:40:15 | ...++ | Conditions.cs:41:9:42:16 | if (...) ... |  |
+| Conditions.cs:40:13:40:16 | ...; | Conditions.cs:40:13:40:13 | access to local variable x |  |
+| Conditions.cs:41:9:42:16 | if (...) ... | Conditions.cs:41:13:41:14 | access to local variable b2 |  |
+| Conditions.cs:41:13:41:14 | access to local variable b2 | Conditions.cs:42:13:42:16 | ...; | true |
+| Conditions.cs:41:13:41:14 | access to local variable b2 | Conditions.cs:43:16:43:16 | access to local variable x | false |
 | Conditions.cs:42:13:42:13 | access to local variable x | Conditions.cs:42:13:42:15 | ...++ |  |
 | Conditions.cs:42:13:42:15 | ...++ | Conditions.cs:43:16:43:16 | access to local variable x |  |
 | Conditions.cs:42:13:42:16 | ...; | Conditions.cs:42:13:42:13 | access to local variable x |  |
@@ -1382,34 +1191,18 @@
 | Conditions.cs:48:13:48:17 | Int32 y = ... | Conditions.cs:49:9:53:9 | while (...) ... |  |
 | Conditions.cs:48:17:48:17 | 0 | Conditions.cs:48:13:48:17 | Int32 y = ... |  |
 | Conditions.cs:49:9:53:9 | while (...) ... | Conditions.cs:49:16:49:16 | access to parameter x |  |
-| Conditions.cs:49:16:49:16 | [b (line 46): false] access to parameter x | Conditions.cs:49:16:49:18 | [b (line 46): false] ...-- |  |
-| Conditions.cs:49:16:49:16 | [b (line 46): true] access to parameter x | Conditions.cs:49:16:49:18 | [b (line 46): true] ...-- |  |
 | Conditions.cs:49:16:49:16 | access to parameter x | Conditions.cs:49:16:49:18 | ...-- |  |
 | Conditions.cs:49:16:49:18 | ...-- | Conditions.cs:49:22:49:22 | 0 |  |
-| Conditions.cs:49:16:49:18 | [b (line 46): false] ...-- | Conditions.cs:49:22:49:22 | [b (line 46): false] 0 |  |
-| Conditions.cs:49:16:49:18 | [b (line 46): true] ...-- | Conditions.cs:49:22:49:22 | [b (line 46): true] 0 |  |
 | Conditions.cs:49:16:49:22 | ... > ... | Conditions.cs:50:9:53:9 | {...} | true |
 | Conditions.cs:49:16:49:22 | ... > ... | Conditions.cs:54:16:54:16 | access to local variable y | false |
-| Conditions.cs:49:16:49:22 | [b (line 46): false] ... > ... | Conditions.cs:50:9:53:9 | [b (line 46): false] {...} | true |
-| Conditions.cs:49:16:49:22 | [b (line 46): false] ... > ... | Conditions.cs:54:16:54:16 | access to local variable y | false |
-| Conditions.cs:49:16:49:22 | [b (line 46): true] ... > ... | Conditions.cs:50:9:53:9 | [b (line 46): true] {...} | true |
-| Conditions.cs:49:16:49:22 | [b (line 46): true] ... > ... | Conditions.cs:54:16:54:16 | access to local variable y | false |
 | Conditions.cs:49:22:49:22 | 0 | Conditions.cs:49:16:49:22 | ... > ... |  |
-| Conditions.cs:49:22:49:22 | [b (line 46): false] 0 | Conditions.cs:49:16:49:22 | [b (line 46): false] ... > ... |  |
-| Conditions.cs:49:22:49:22 | [b (line 46): true] 0 | Conditions.cs:49:16:49:22 | [b (line 46): true] ... > ... |  |
-| Conditions.cs:50:9:53:9 | [b (line 46): false] {...} | Conditions.cs:51:13:52:20 | [b (line 46): false] if (...) ... |  |
-| Conditions.cs:50:9:53:9 | [b (line 46): true] {...} | Conditions.cs:51:13:52:20 | [b (line 46): true] if (...) ... |  |
 | Conditions.cs:50:9:53:9 | {...} | Conditions.cs:51:13:52:20 | if (...) ... |  |
-| Conditions.cs:51:13:52:20 | [b (line 46): false] if (...) ... | Conditions.cs:51:17:51:17 | [b (line 46): false] access to parameter b |  |
-| Conditions.cs:51:13:52:20 | [b (line 46): true] if (...) ... | Conditions.cs:51:17:51:17 | [b (line 46): true] access to parameter b |  |
 | Conditions.cs:51:13:52:20 | if (...) ... | Conditions.cs:51:17:51:17 | access to parameter b |  |
-| Conditions.cs:51:17:51:17 | [b (line 46): false] access to parameter b | Conditions.cs:49:16:49:16 | [b (line 46): false] access to parameter x | false |
-| Conditions.cs:51:17:51:17 | [b (line 46): true] access to parameter b | Conditions.cs:52:17:52:20 | [b (line 46): true] ...; | true |
-| Conditions.cs:51:17:51:17 | access to parameter b | Conditions.cs:49:16:49:16 | [b (line 46): false] access to parameter x | false |
-| Conditions.cs:51:17:51:17 | access to parameter b | Conditions.cs:52:17:52:20 | [b (line 46): true] ...; | true |
-| Conditions.cs:52:17:52:17 | [b (line 46): true] access to local variable y | Conditions.cs:52:17:52:19 | [b (line 46): true] ...++ |  |
-| Conditions.cs:52:17:52:19 | [b (line 46): true] ...++ | Conditions.cs:49:16:49:16 | [b (line 46): true] access to parameter x |  |
-| Conditions.cs:52:17:52:20 | [b (line 46): true] ...; | Conditions.cs:52:17:52:17 | [b (line 46): true] access to local variable y |  |
+| Conditions.cs:51:17:51:17 | access to parameter b | Conditions.cs:49:16:49:16 | access to parameter x | false |
+| Conditions.cs:51:17:51:17 | access to parameter b | Conditions.cs:52:17:52:20 | ...; | true |
+| Conditions.cs:52:17:52:17 | access to local variable y | Conditions.cs:52:17:52:19 | ...++ |  |
+| Conditions.cs:52:17:52:19 | ...++ | Conditions.cs:49:16:49:16 | access to parameter x |  |
+| Conditions.cs:52:17:52:20 | ...; | Conditions.cs:52:17:52:17 | access to local variable y |  |
 | Conditions.cs:54:9:54:17 | return ...; | Conditions.cs:46:9:46:10 | exit M4 (normal) | return |
 | Conditions.cs:54:16:54:16 | access to local variable y | Conditions.cs:54:9:54:17 | return ...; |  |
 | Conditions.cs:57:9:57:10 | enter M5 | Conditions.cs:58:5:68:5 | {...} |  |
@@ -1419,39 +1212,19 @@
 | Conditions.cs:59:13:59:17 | Int32 y = ... | Conditions.cs:60:9:64:9 | while (...) ... |  |
 | Conditions.cs:59:17:59:17 | 0 | Conditions.cs:59:13:59:17 | Int32 y = ... |  |
 | Conditions.cs:60:9:64:9 | while (...) ... | Conditions.cs:60:16:60:16 | access to parameter x |  |
-| Conditions.cs:60:16:60:16 | [b (line 57): false] access to parameter x | Conditions.cs:60:16:60:18 | [b (line 57): false] ...-- |  |
-| Conditions.cs:60:16:60:16 | [b (line 57): true] access to parameter x | Conditions.cs:60:16:60:18 | [b (line 57): true] ...-- |  |
 | Conditions.cs:60:16:60:16 | access to parameter x | Conditions.cs:60:16:60:18 | ...-- |  |
 | Conditions.cs:60:16:60:18 | ...-- | Conditions.cs:60:22:60:22 | 0 |  |
-| Conditions.cs:60:16:60:18 | [b (line 57): false] ...-- | Conditions.cs:60:22:60:22 | [b (line 57): false] 0 |  |
-| Conditions.cs:60:16:60:18 | [b (line 57): true] ...-- | Conditions.cs:60:22:60:22 | [b (line 57): true] 0 |  |
 | Conditions.cs:60:16:60:22 | ... > ... | Conditions.cs:61:9:64:9 | {...} | true |
 | Conditions.cs:60:16:60:22 | ... > ... | Conditions.cs:65:9:66:16 | if (...) ... | false |
-| Conditions.cs:60:16:60:22 | [b (line 57): false] ... > ... | Conditions.cs:61:9:64:9 | [b (line 57): false] {...} | true |
-| Conditions.cs:60:16:60:22 | [b (line 57): false] ... > ... | Conditions.cs:65:9:66:16 | [b (line 57): false] if (...) ... | false |
-| Conditions.cs:60:16:60:22 | [b (line 57): true] ... > ... | Conditions.cs:61:9:64:9 | [b (line 57): true] {...} | true |
-| Conditions.cs:60:16:60:22 | [b (line 57): true] ... > ... | Conditions.cs:65:9:66:16 | [b (line 57): true] if (...) ... | false |
 | Conditions.cs:60:22:60:22 | 0 | Conditions.cs:60:16:60:22 | ... > ... |  |
-| Conditions.cs:60:22:60:22 | [b (line 57): false] 0 | Conditions.cs:60:16:60:22 | [b (line 57): false] ... > ... |  |
-| Conditions.cs:60:22:60:22 | [b (line 57): true] 0 | Conditions.cs:60:16:60:22 | [b (line 57): true] ... > ... |  |
-| Conditions.cs:61:9:64:9 | [b (line 57): false] {...} | Conditions.cs:62:13:63:20 | [b (line 57): false] if (...) ... |  |
-| Conditions.cs:61:9:64:9 | [b (line 57): true] {...} | Conditions.cs:62:13:63:20 | [b (line 57): true] if (...) ... |  |
 | Conditions.cs:61:9:64:9 | {...} | Conditions.cs:62:13:63:20 | if (...) ... |  |
-| Conditions.cs:62:13:63:20 | [b (line 57): false] if (...) ... | Conditions.cs:62:17:62:17 | [b (line 57): false] access to parameter b |  |
-| Conditions.cs:62:13:63:20 | [b (line 57): true] if (...) ... | Conditions.cs:62:17:62:17 | [b (line 57): true] access to parameter b |  |
 | Conditions.cs:62:13:63:20 | if (...) ... | Conditions.cs:62:17:62:17 | access to parameter b |  |
-| Conditions.cs:62:17:62:17 | [b (line 57): false] access to parameter b | Conditions.cs:60:16:60:16 | [b (line 57): false] access to parameter x | false |
-| Conditions.cs:62:17:62:17 | [b (line 57): true] access to parameter b | Conditions.cs:63:17:63:20 | [b (line 57): true] ...; | true |
-| Conditions.cs:62:17:62:17 | access to parameter b | Conditions.cs:60:16:60:16 | [b (line 57): false] access to parameter x | false |
-| Conditions.cs:62:17:62:17 | access to parameter b | Conditions.cs:63:17:63:20 | [b (line 57): true] ...; | true |
-| Conditions.cs:63:17:63:17 | [b (line 57): true] access to local variable y | Conditions.cs:63:17:63:19 | [b (line 57): true] ...++ |  |
-| Conditions.cs:63:17:63:19 | [b (line 57): true] ...++ | Conditions.cs:60:16:60:16 | [b (line 57): true] access to parameter x |  |
-| Conditions.cs:63:17:63:20 | [b (line 57): true] ...; | Conditions.cs:63:17:63:17 | [b (line 57): true] access to local variable y |  |
-| Conditions.cs:65:9:66:16 | [b (line 57): false] if (...) ... | Conditions.cs:65:13:65:13 | [b (line 57): false] access to parameter b |  |
-| Conditions.cs:65:9:66:16 | [b (line 57): true] if (...) ... | Conditions.cs:65:13:65:13 | [b (line 57): true] access to parameter b |  |
+| Conditions.cs:62:17:62:17 | access to parameter b | Conditions.cs:60:16:60:16 | access to parameter x | false |
+| Conditions.cs:62:17:62:17 | access to parameter b | Conditions.cs:63:17:63:20 | ...; | true |
+| Conditions.cs:63:17:63:17 | access to local variable y | Conditions.cs:63:17:63:19 | ...++ |  |
+| Conditions.cs:63:17:63:19 | ...++ | Conditions.cs:60:16:60:16 | access to parameter x |  |
+| Conditions.cs:63:17:63:20 | ...; | Conditions.cs:63:17:63:17 | access to local variable y |  |
 | Conditions.cs:65:9:66:16 | if (...) ... | Conditions.cs:65:13:65:13 | access to parameter b |  |
-| Conditions.cs:65:13:65:13 | [b (line 57): false] access to parameter b | Conditions.cs:67:16:67:16 | access to local variable y | false |
-| Conditions.cs:65:13:65:13 | [b (line 57): true] access to parameter b | Conditions.cs:66:13:66:16 | ...; | true |
 | Conditions.cs:65:13:65:13 | access to parameter b | Conditions.cs:66:13:66:16 | ...; | true |
 | Conditions.cs:65:13:65:13 | access to parameter b | Conditions.cs:67:16:67:16 | access to local variable y | false |
 | Conditions.cs:66:13:66:13 | access to local variable y | Conditions.cs:66:13:66:15 | ...++ |  |
@@ -1545,31 +1318,24 @@
 | Conditions.cs:104:17:104:17 | access to parameter b | Conditions.cs:104:17:104:28 | call to method ToString |  |
 | Conditions.cs:104:17:104:28 | call to method ToString | Conditions.cs:104:13:104:28 | String x = ... |  |
 | Conditions.cs:105:9:106:20 | if (...) ... | Conditions.cs:105:13:105:13 | access to parameter b |  |
-| Conditions.cs:105:13:105:13 | access to parameter b | Conditions.cs:106:13:106:20 | [b (line 102): true] ...; | true |
-| Conditions.cs:105:13:105:13 | access to parameter b | Conditions.cs:107:9:109:24 | [b (line 102): false] if (...) ... | false |
-| Conditions.cs:106:13:106:13 | [b (line 102): true] access to local variable x | Conditions.cs:106:18:106:19 | [b (line 102): true] "" |  |
-| Conditions.cs:106:13:106:19 | [b (line 102): true] ... + ... | Conditions.cs:106:13:106:19 | [b (line 102): true] ... = ... |  |
-| Conditions.cs:106:13:106:19 | [b (line 102): true] ... = ... | Conditions.cs:107:9:109:24 | [b (line 102): true] if (...) ... |  |
-| Conditions.cs:106:13:106:20 | [b (line 102): true] ...; | Conditions.cs:106:13:106:13 | [b (line 102): true] access to local variable x |  |
-| Conditions.cs:106:18:106:19 | [b (line 102): true] "" | Conditions.cs:106:13:106:19 | [b (line 102): true] ... + ... |  |
-| Conditions.cs:107:9:109:24 | [b (line 102): false] if (...) ... | Conditions.cs:107:13:107:13 | [b (line 102): false] access to local variable x |  |
-| Conditions.cs:107:9:109:24 | [b (line 102): true] if (...) ... | Conditions.cs:107:13:107:13 | [b (line 102): true] access to local variable x |  |
-| Conditions.cs:107:13:107:13 | [b (line 102): false] access to local variable x | Conditions.cs:107:13:107:20 | [b (line 102): false] access to property Length |  |
-| Conditions.cs:107:13:107:13 | [b (line 102): true] access to local variable x | Conditions.cs:107:13:107:20 | [b (line 102): true] access to property Length |  |
-| Conditions.cs:107:13:107:20 | [b (line 102): false] access to property Length | Conditions.cs:107:24:107:24 | [b (line 102): false] 0 |  |
-| Conditions.cs:107:13:107:20 | [b (line 102): true] access to property Length | Conditions.cs:107:24:107:24 | [b (line 102): true] 0 |  |
-| Conditions.cs:107:13:107:24 | [b (line 102): false] ... > ... | Conditions.cs:108:13:109:24 | [b (line 102): false] if (...) ... | true |
-| Conditions.cs:107:13:107:24 | [b (line 102): false] ... > ... | Conditions.cs:110:16:110:16 | access to local variable x | false |
-| Conditions.cs:107:13:107:24 | [b (line 102): true] ... > ... | Conditions.cs:108:13:109:24 | [b (line 102): true] if (...) ... | true |
-| Conditions.cs:107:13:107:24 | [b (line 102): true] ... > ... | Conditions.cs:110:16:110:16 | access to local variable x | false |
-| Conditions.cs:107:24:107:24 | [b (line 102): false] 0 | Conditions.cs:107:13:107:24 | [b (line 102): false] ... > ... |  |
-| Conditions.cs:107:24:107:24 | [b (line 102): true] 0 | Conditions.cs:107:13:107:24 | [b (line 102): true] ... > ... |  |
-| Conditions.cs:108:13:109:24 | [b (line 102): false] if (...) ... | Conditions.cs:108:18:108:18 | [b (line 102): false] access to parameter b |  |
-| Conditions.cs:108:13:109:24 | [b (line 102): true] if (...) ... | Conditions.cs:108:18:108:18 | [b (line 102): true] access to parameter b |  |
+| Conditions.cs:105:13:105:13 | access to parameter b | Conditions.cs:106:13:106:20 | ...; | true |
+| Conditions.cs:105:13:105:13 | access to parameter b | Conditions.cs:107:9:109:24 | if (...) ... | false |
+| Conditions.cs:106:13:106:13 | access to local variable x | Conditions.cs:106:18:106:19 | "" |  |
+| Conditions.cs:106:13:106:19 | ... + ... | Conditions.cs:106:13:106:19 | ... = ... |  |
+| Conditions.cs:106:13:106:19 | ... = ... | Conditions.cs:107:9:109:24 | if (...) ... |  |
+| Conditions.cs:106:13:106:20 | ...; | Conditions.cs:106:13:106:13 | access to local variable x |  |
+| Conditions.cs:106:18:106:19 | "" | Conditions.cs:106:13:106:19 | ... + ... |  |
+| Conditions.cs:107:9:109:24 | if (...) ... | Conditions.cs:107:13:107:13 | access to local variable x |  |
+| Conditions.cs:107:13:107:13 | access to local variable x | Conditions.cs:107:13:107:20 | access to property Length |  |
+| Conditions.cs:107:13:107:20 | access to property Length | Conditions.cs:107:24:107:24 | 0 |  |
+| Conditions.cs:107:13:107:24 | ... > ... | Conditions.cs:108:13:109:24 | if (...) ... | true |
+| Conditions.cs:107:13:107:24 | ... > ... | Conditions.cs:110:16:110:16 | access to local variable x | false |
+| Conditions.cs:107:24:107:24 | 0 | Conditions.cs:107:13:107:24 | ... > ... |  |
+| Conditions.cs:108:13:109:24 | if (...) ... | Conditions.cs:108:18:108:18 | access to parameter b |  |
 | Conditions.cs:108:17:108:18 | [false] !... | Conditions.cs:110:16:110:16 | access to local variable x | false |
 | Conditions.cs:108:17:108:18 | [true] !... | Conditions.cs:109:17:109:24 | ...; | true |
-| Conditions.cs:108:18:108:18 | [b (line 102): false] access to parameter b | Conditions.cs:108:17:108:18 | [true] !... | false |
-| Conditions.cs:108:18:108:18 | [b (line 102): true] access to parameter b | Conditions.cs:108:17:108:18 | [false] !... | true |
+| Conditions.cs:108:18:108:18 | access to parameter b | Conditions.cs:108:17:108:18 | [false] !... | true |
+| Conditions.cs:108:18:108:18 | access to parameter b | Conditions.cs:108:17:108:18 | [true] !... | false |
 | Conditions.cs:109:17:109:17 | access to local variable x | Conditions.cs:109:22:109:23 | "" |  |
 | Conditions.cs:109:17:109:23 | ... + ... | Conditions.cs:109:17:109:23 | ... = ... |  |
 | Conditions.cs:109:17:109:23 | ... = ... | Conditions.cs:110:16:110:16 | access to local variable x |  |
@@ -1603,78 +1369,51 @@
 | Conditions.cs:118:29:118:43 | ... - ... | Conditions.cs:118:24:118:43 | ... == ... |  |
 | Conditions.cs:118:43:118:43 | 1 | Conditions.cs:118:29:118:43 | ... - ... |  |
 | Conditions.cs:119:13:120:23 | if (...) ... | Conditions.cs:119:18:119:21 | access to local variable last |  |
-| Conditions.cs:119:17:119:21 | [false, last (line 118): true] !... | Conditions.cs:121:13:122:25 | [last (line 118): true] if (...) ... | false |
-| Conditions.cs:119:17:119:21 | [true, last (line 118): false] !... | Conditions.cs:120:17:120:23 | [last (line 118): false] ...; | true |
-| Conditions.cs:119:18:119:21 | access to local variable last | Conditions.cs:119:17:119:21 | [false, last (line 118): true] !... | true |
-| Conditions.cs:119:18:119:21 | access to local variable last | Conditions.cs:119:17:119:21 | [true, last (line 118): false] !... | false |
-| Conditions.cs:120:17:120:22 | [last (line 118): false] ... = ... | Conditions.cs:121:13:122:25 | [last (line 118): false] if (...) ... |  |
-| Conditions.cs:120:17:120:23 | [last (line 118): false] ...; | Conditions.cs:120:21:120:22 | [last (line 118): false] "" |  |
-| Conditions.cs:120:21:120:22 | [last (line 118): false] "" | Conditions.cs:120:17:120:22 | [last (line 118): false] ... = ... |  |
-| Conditions.cs:121:13:122:25 | [last (line 118): false] if (...) ... | Conditions.cs:121:17:121:20 | [last (line 118): false] access to local variable last |  |
-| Conditions.cs:121:13:122:25 | [last (line 118): true] if (...) ... | Conditions.cs:121:17:121:20 | [last (line 118): true] access to local variable last |  |
-| Conditions.cs:121:17:121:20 | [last (line 118): false] access to local variable last | Conditions.cs:116:42:116:42 | access to local variable i | false |
-| Conditions.cs:121:17:121:20 | [last (line 118): true] access to local variable last | Conditions.cs:122:17:122:25 | ...; | true |
+| Conditions.cs:119:17:119:21 | [false] !... | Conditions.cs:121:13:122:25 | if (...) ... | false |
+| Conditions.cs:119:17:119:21 | [true] !... | Conditions.cs:120:17:120:23 | ...; | true |
+| Conditions.cs:119:18:119:21 | access to local variable last | Conditions.cs:119:17:119:21 | [false] !... | true |
+| Conditions.cs:119:18:119:21 | access to local variable last | Conditions.cs:119:17:119:21 | [true] !... | false |
+| Conditions.cs:120:17:120:22 | ... = ... | Conditions.cs:121:13:122:25 | if (...) ... |  |
+| Conditions.cs:120:17:120:23 | ...; | Conditions.cs:120:21:120:22 | "" |  |
+| Conditions.cs:120:21:120:22 | "" | Conditions.cs:120:17:120:22 | ... = ... |  |
+| Conditions.cs:121:13:122:25 | if (...) ... | Conditions.cs:121:17:121:20 | access to local variable last |  |
+| Conditions.cs:121:17:121:20 | access to local variable last | Conditions.cs:116:42:116:42 | access to local variable i | false |
+| Conditions.cs:121:17:121:20 | access to local variable last | Conditions.cs:122:17:122:25 | ...; | true |
 | Conditions.cs:122:17:122:24 | ... = ... | Conditions.cs:116:42:116:42 | access to local variable i |  |
 | Conditions.cs:122:17:122:25 | ...; | Conditions.cs:122:21:122:24 | null |  |
 | Conditions.cs:122:21:122:24 | null | Conditions.cs:122:17:122:24 | ... = ... |  |
 | Conditions.cs:129:10:129:12 | enter M10 | Conditions.cs:130:5:141:5 | {...} |  |
 | Conditions.cs:130:5:141:5 | {...} | Conditions.cs:131:9:140:9 | while (...) ... |  |
 | Conditions.cs:131:9:140:9 | while (...) ... | Conditions.cs:131:16:131:19 | true |  |
-| Conditions.cs:131:16:131:19 | [Field1 (line 129): false] true | Conditions.cs:132:9:140:9 | [Field1 (line 129): false] {...} | true |
-| Conditions.cs:131:16:131:19 | [Field1 (line 129): true, Field2 (line 129): false] true | Conditions.cs:132:9:140:9 | [Field1 (line 129): true, Field2 (line 129): false] {...} | true |
-| Conditions.cs:131:16:131:19 | [Field1 (line 129): true, Field2 (line 129): true] true | Conditions.cs:132:9:140:9 | [Field1 (line 129): true, Field2 (line 129): true] {...} | true |
 | Conditions.cs:131:16:131:19 | true | Conditions.cs:132:9:140:9 | {...} | true |
-| Conditions.cs:132:9:140:9 | [Field1 (line 129): false] {...} | Conditions.cs:133:13:139:13 | [Field1 (line 129): false] if (...) ... |  |
-| Conditions.cs:132:9:140:9 | [Field1 (line 129): true, Field2 (line 129): false] {...} | Conditions.cs:133:13:139:13 | [Field1 (line 129): true, Field2 (line 129): false] if (...) ... |  |
-| Conditions.cs:132:9:140:9 | [Field1 (line 129): true, Field2 (line 129): true] {...} | Conditions.cs:133:13:139:13 | [Field1 (line 129): true, Field2 (line 129): true] if (...) ... |  |
 | Conditions.cs:132:9:140:9 | {...} | Conditions.cs:133:13:139:13 | if (...) ... |  |
-| Conditions.cs:133:13:139:13 | [Field1 (line 129): false] if (...) ... | Conditions.cs:133:17:133:22 | [Field1 (line 129): false] this access |  |
-| Conditions.cs:133:13:139:13 | [Field1 (line 129): true, Field2 (line 129): false] if (...) ... | Conditions.cs:133:17:133:22 | [Field1 (line 129): true, Field2 (line 129): false] this access |  |
-| Conditions.cs:133:13:139:13 | [Field1 (line 129): true, Field2 (line 129): true] if (...) ... | Conditions.cs:133:17:133:22 | [Field1 (line 129): true, Field2 (line 129): true] this access |  |
 | Conditions.cs:133:13:139:13 | if (...) ... | Conditions.cs:133:17:133:22 | this access |  |
-| Conditions.cs:133:17:133:22 | [Field1 (line 129): false] access to field Field1 | Conditions.cs:131:16:131:19 | [Field1 (line 129): false] true | false |
-| Conditions.cs:133:17:133:22 | [Field1 (line 129): false] this access | Conditions.cs:133:17:133:22 | [Field1 (line 129): false] access to field Field1 |  |
-| Conditions.cs:133:17:133:22 | [Field1 (line 129): true, Field2 (line 129): false] access to field Field1 | Conditions.cs:134:13:139:13 | [Field1 (line 129): true, Field2 (line 129): false] {...} | true |
-| Conditions.cs:133:17:133:22 | [Field1 (line 129): true, Field2 (line 129): false] this access | Conditions.cs:133:17:133:22 | [Field1 (line 129): true, Field2 (line 129): false] access to field Field1 |  |
-| Conditions.cs:133:17:133:22 | [Field1 (line 129): true, Field2 (line 129): true] access to field Field1 | Conditions.cs:134:13:139:13 | [Field1 (line 129): true, Field2 (line 129): true] {...} | true |
-| Conditions.cs:133:17:133:22 | [Field1 (line 129): true, Field2 (line 129): true] this access | Conditions.cs:133:17:133:22 | [Field1 (line 129): true, Field2 (line 129): true] access to field Field1 |  |
-| Conditions.cs:133:17:133:22 | access to field Field1 | Conditions.cs:131:16:131:19 | [Field1 (line 129): false] true | false |
-| Conditions.cs:133:17:133:22 | access to field Field1 | Conditions.cs:134:13:139:13 | [Field1 (line 129): true] {...} | true |
+| Conditions.cs:133:17:133:22 | access to field Field1 | Conditions.cs:131:16:131:19 | true | false |
+| Conditions.cs:133:17:133:22 | access to field Field1 | Conditions.cs:134:13:139:13 | {...} | true |
 | Conditions.cs:133:17:133:22 | this access | Conditions.cs:133:17:133:22 | access to field Field1 |  |
-| Conditions.cs:134:13:139:13 | [Field1 (line 129): true, Field2 (line 129): false] {...} | Conditions.cs:135:17:138:17 | [Field1 (line 129): true, Field2 (line 129): false] if (...) ... |  |
-| Conditions.cs:134:13:139:13 | [Field1 (line 129): true, Field2 (line 129): true] {...} | Conditions.cs:135:17:138:17 | [Field1 (line 129): true, Field2 (line 129): true] if (...) ... |  |
-| Conditions.cs:134:13:139:13 | [Field1 (line 129): true] {...} | Conditions.cs:135:17:138:17 | [Field1 (line 129): true] if (...) ... |  |
-| Conditions.cs:135:17:138:17 | [Field1 (line 129): true, Field2 (line 129): false] if (...) ... | Conditions.cs:135:21:135:26 | [Field1 (line 129): true, Field2 (line 129): false] this access |  |
-| Conditions.cs:135:17:138:17 | [Field1 (line 129): true, Field2 (line 129): true] if (...) ... | Conditions.cs:135:21:135:26 | [Field1 (line 129): true, Field2 (line 129): true] this access |  |
-| Conditions.cs:135:17:138:17 | [Field1 (line 129): true] if (...) ... | Conditions.cs:135:21:135:26 | [Field1 (line 129): true] this access |  |
-| Conditions.cs:135:21:135:26 | [Field1 (line 129): true, Field2 (line 129): false] access to field Field2 | Conditions.cs:131:16:131:19 | [Field1 (line 129): true, Field2 (line 129): false] true | false |
-| Conditions.cs:135:21:135:26 | [Field1 (line 129): true, Field2 (line 129): false] this access | Conditions.cs:135:21:135:26 | [Field1 (line 129): true, Field2 (line 129): false] access to field Field2 |  |
-| Conditions.cs:135:21:135:26 | [Field1 (line 129): true, Field2 (line 129): true] access to field Field2 | Conditions.cs:136:17:138:17 | [Field1 (line 129): true, Field2 (line 129): true] {...} | true |
-| Conditions.cs:135:21:135:26 | [Field1 (line 129): true, Field2 (line 129): true] this access | Conditions.cs:135:21:135:26 | [Field1 (line 129): true, Field2 (line 129): true] access to field Field2 |  |
-| Conditions.cs:135:21:135:26 | [Field1 (line 129): true] access to field Field2 | Conditions.cs:131:16:131:19 | [Field1 (line 129): true, Field2 (line 129): false] true | false |
-| Conditions.cs:135:21:135:26 | [Field1 (line 129): true] access to field Field2 | Conditions.cs:136:17:138:17 | [Field1 (line 129): true, Field2 (line 129): true] {...} | true |
-| Conditions.cs:135:21:135:26 | [Field1 (line 129): true] this access | Conditions.cs:135:21:135:26 | [Field1 (line 129): true] access to field Field2 |  |
-| Conditions.cs:136:17:138:17 | [Field1 (line 129): true, Field2 (line 129): true] {...} | Conditions.cs:137:21:137:38 | [Field1 (line 129): true, Field2 (line 129): true] ...; |  |
-| Conditions.cs:137:21:137:26 | [Field1 (line 129): true, Field2 (line 129): true] access to field Field1 | Conditions.cs:137:21:137:37 | [Field1 (line 129): true, Field2 (line 129): true] call to method ToString |  |
-| Conditions.cs:137:21:137:26 | [Field1 (line 129): true, Field2 (line 129): true] this access | Conditions.cs:137:21:137:26 | [Field1 (line 129): true, Field2 (line 129): true] access to field Field1 |  |
-| Conditions.cs:137:21:137:37 | [Field1 (line 129): true, Field2 (line 129): true] call to method ToString | Conditions.cs:131:16:131:19 | [Field1 (line 129): true, Field2 (line 129): true] true |  |
-| Conditions.cs:137:21:137:38 | [Field1 (line 129): true, Field2 (line 129): true] ...; | Conditions.cs:137:21:137:26 | [Field1 (line 129): true, Field2 (line 129): true] this access |  |
+| Conditions.cs:134:13:139:13 | {...} | Conditions.cs:135:17:138:17 | if (...) ... |  |
+| Conditions.cs:135:17:138:17 | if (...) ... | Conditions.cs:135:21:135:26 | this access |  |
+| Conditions.cs:135:21:135:26 | access to field Field2 | Conditions.cs:131:16:131:19 | true | false |
+| Conditions.cs:135:21:135:26 | access to field Field2 | Conditions.cs:136:17:138:17 | {...} | true |
+| Conditions.cs:135:21:135:26 | this access | Conditions.cs:135:21:135:26 | access to field Field2 |  |
+| Conditions.cs:136:17:138:17 | {...} | Conditions.cs:137:21:137:38 | ...; |  |
+| Conditions.cs:137:21:137:26 | access to field Field1 | Conditions.cs:137:21:137:37 | call to method ToString |  |
+| Conditions.cs:137:21:137:26 | this access | Conditions.cs:137:21:137:26 | access to field Field1 |  |
+| Conditions.cs:137:21:137:37 | call to method ToString | Conditions.cs:131:16:131:19 | true |  |
+| Conditions.cs:137:21:137:38 | ...; | Conditions.cs:137:21:137:26 | this access |  |
 | Conditions.cs:143:10:143:12 | enter M11 | Conditions.cs:144:5:150:5 | {...} |  |
 | Conditions.cs:143:10:143:12 | exit M11 (normal) | Conditions.cs:143:10:143:12 | exit M11 |  |
 | Conditions.cs:144:5:150:5 | {...} | Conditions.cs:145:9:145:30 | ... ...; |  |
 | Conditions.cs:145:9:145:30 | ... ...; | Conditions.cs:145:17:145:17 | access to parameter b |  |
-| Conditions.cs:145:13:145:29 | [b (line 143): false] String s = ... | Conditions.cs:146:9:149:49 | [b (line 143): false] if (...) ... |  |
-| Conditions.cs:145:13:145:29 | [b (line 143): true] String s = ... | Conditions.cs:146:9:149:49 | [b (line 143): true] if (...) ... |  |
-| Conditions.cs:145:17:145:17 | access to parameter b | Conditions.cs:145:21:145:23 | [b (line 143): true] "a" | true |
-| Conditions.cs:145:17:145:17 | access to parameter b | Conditions.cs:145:27:145:29 | [b (line 143): false] "b" | false |
-| Conditions.cs:145:17:145:29 | [b (line 143): false] ... ? ... : ... | Conditions.cs:145:13:145:29 | [b (line 143): false] String s = ... |  |
-| Conditions.cs:145:17:145:29 | [b (line 143): true] ... ? ... : ... | Conditions.cs:145:13:145:29 | [b (line 143): true] String s = ... |  |
-| Conditions.cs:145:21:145:23 | [b (line 143): true] "a" | Conditions.cs:145:17:145:29 | [b (line 143): true] ... ? ... : ... |  |
-| Conditions.cs:145:27:145:29 | [b (line 143): false] "b" | Conditions.cs:145:17:145:29 | [b (line 143): false] ... ? ... : ... |  |
-| Conditions.cs:146:9:149:49 | [b (line 143): false] if (...) ... | Conditions.cs:146:13:146:13 | [b (line 143): false] access to parameter b |  |
-| Conditions.cs:146:9:149:49 | [b (line 143): true] if (...) ... | Conditions.cs:146:13:146:13 | [b (line 143): true] access to parameter b |  |
-| Conditions.cs:146:13:146:13 | [b (line 143): false] access to parameter b | Conditions.cs:149:13:149:49 | ...; | false |
-| Conditions.cs:146:13:146:13 | [b (line 143): true] access to parameter b | Conditions.cs:147:13:147:49 | ...; | true |
+| Conditions.cs:145:13:145:29 | String s = ... | Conditions.cs:146:9:149:49 | if (...) ... |  |
+| Conditions.cs:145:17:145:17 | access to parameter b | Conditions.cs:145:21:145:23 | "a" | true |
+| Conditions.cs:145:17:145:17 | access to parameter b | Conditions.cs:145:27:145:29 | "b" | false |
+| Conditions.cs:145:17:145:29 | ... ? ... : ... | Conditions.cs:145:13:145:29 | String s = ... |  |
+| Conditions.cs:145:21:145:23 | "a" | Conditions.cs:145:17:145:29 | ... ? ... : ... |  |
+| Conditions.cs:145:27:145:29 | "b" | Conditions.cs:145:17:145:29 | ... ? ... : ... |  |
+| Conditions.cs:146:9:149:49 | if (...) ... | Conditions.cs:146:13:146:13 | access to parameter b |  |
+| Conditions.cs:146:13:146:13 | access to parameter b | Conditions.cs:147:13:147:49 | ...; | true |
+| Conditions.cs:146:13:146:13 | access to parameter b | Conditions.cs:149:13:149:49 | ...; | false |
 | Conditions.cs:147:13:147:48 | call to method WriteLine | Conditions.cs:143:10:143:12 | exit M11 (normal) |  |
 | Conditions.cs:147:13:147:49 | ...; | Conditions.cs:147:40:147:43 | "a = " |  |
 | Conditions.cs:147:38:147:47 | $"..." | Conditions.cs:147:13:147:48 | call to method WriteLine |  |
@@ -1708,7 +1447,7 @@
 | ExitMethods.cs:20:10:20:11 | enter M3 | ExitMethods.cs:21:5:24:5 | {...} |  |
 | ExitMethods.cs:20:10:20:11 | exit M3 (abnormal) | ExitMethods.cs:20:10:20:11 | exit M3 |  |
 | ExitMethods.cs:21:5:24:5 | {...} | ExitMethods.cs:22:9:22:26 | ...; |  |
-| ExitMethods.cs:22:9:22:25 | call to method ErrorAlways | ExitMethods.cs:20:10:20:11 | exit M3 (abnormal) | exception(ArgumentException), exception(Exception) |
+| ExitMethods.cs:22:9:22:25 | call to method ErrorAlways | ExitMethods.cs:20:10:20:11 | exit M3 (abnormal) | exception |
 | ExitMethods.cs:22:9:22:26 | ...; | ExitMethods.cs:22:21:22:24 | true |  |
 | ExitMethods.cs:22:21:22:24 | true | ExitMethods.cs:22:9:22:25 | call to method ErrorAlways |  |
 | ExitMethods.cs:26:10:26:11 | enter M4 | ExitMethods.cs:27:5:30:5 | {...} |  |
@@ -1728,27 +1467,25 @@
 | ExitMethods.cs:39:5:52:5 | {...} | ExitMethods.cs:40:9:51:9 | try {...} ... |  |
 | ExitMethods.cs:40:9:51:9 | try {...} ... | ExitMethods.cs:41:9:43:9 | {...} |  |
 | ExitMethods.cs:41:9:43:9 | {...} | ExitMethods.cs:42:13:42:31 | ...; |  |
-| ExitMethods.cs:42:13:42:30 | call to method ErrorAlways | ExitMethods.cs:44:9:47:9 | [exception: ArgumentException] catch (...) {...} | exception(ArgumentException) |
-| ExitMethods.cs:42:13:42:30 | call to method ErrorAlways | ExitMethods.cs:44:9:47:9 | [exception: Exception] catch (...) {...} | exception(Exception) |
+| ExitMethods.cs:42:13:42:30 | call to method ErrorAlways | ExitMethods.cs:44:9:47:9 | catch (...) {...} | exception |
 | ExitMethods.cs:42:13:42:31 | ...; | ExitMethods.cs:42:25:42:29 | false |  |
 | ExitMethods.cs:42:25:42:29 | false | ExitMethods.cs:42:13:42:30 | call to method ErrorAlways |  |
-| ExitMethods.cs:44:9:47:9 | [exception: ArgumentException] catch (...) {...} | ExitMethods.cs:45:9:47:9 | {...} | match |
-| ExitMethods.cs:44:9:47:9 | [exception: Exception] catch (...) {...} | ExitMethods.cs:45:9:47:9 | {...} | match |
-| ExitMethods.cs:44:9:47:9 | [exception: Exception] catch (...) {...} | ExitMethods.cs:48:9:51:9 | [exception: Exception] catch (...) {...} | no-match |
+| ExitMethods.cs:44:9:47:9 | catch (...) {...} | ExitMethods.cs:45:9:47:9 | {...} | match |
+| ExitMethods.cs:44:9:47:9 | catch (...) {...} | ExitMethods.cs:48:9:51:9 | catch (...) {...} | no-match |
 | ExitMethods.cs:45:9:47:9 | {...} | ExitMethods.cs:46:13:46:19 | return ...; |  |
 | ExitMethods.cs:46:13:46:19 | return ...; | ExitMethods.cs:38:10:38:11 | exit M6 (normal) | return |
-| ExitMethods.cs:48:9:51:9 | [exception: Exception] catch (...) {...} | ExitMethods.cs:49:9:51:9 | {...} | match |
+| ExitMethods.cs:48:9:51:9 | catch (...) {...} | ExitMethods.cs:49:9:51:9 | {...} | match |
 | ExitMethods.cs:49:9:51:9 | {...} | ExitMethods.cs:50:13:50:19 | return ...; |  |
 | ExitMethods.cs:50:13:50:19 | return ...; | ExitMethods.cs:38:10:38:11 | exit M6 (normal) | return |
 | ExitMethods.cs:54:10:54:11 | enter M7 | ExitMethods.cs:55:5:58:5 | {...} |  |
 | ExitMethods.cs:54:10:54:11 | exit M7 (abnormal) | ExitMethods.cs:54:10:54:11 | exit M7 |  |
 | ExitMethods.cs:55:5:58:5 | {...} | ExitMethods.cs:56:9:56:23 | ...; |  |
-| ExitMethods.cs:56:9:56:22 | call to method ErrorAlways2 | ExitMethods.cs:54:10:54:11 | exit M7 (abnormal) | exception(Exception) |
+| ExitMethods.cs:56:9:56:22 | call to method ErrorAlways2 | ExitMethods.cs:54:10:54:11 | exit M7 (abnormal) | exception |
 | ExitMethods.cs:56:9:56:23 | ...; | ExitMethods.cs:56:9:56:22 | call to method ErrorAlways2 |  |
 | ExitMethods.cs:60:10:60:11 | enter M8 | ExitMethods.cs:61:5:64:5 | {...} |  |
 | ExitMethods.cs:60:10:60:11 | exit M8 (abnormal) | ExitMethods.cs:60:10:60:11 | exit M8 |  |
 | ExitMethods.cs:61:5:64:5 | {...} | ExitMethods.cs:62:9:62:23 | ...; |  |
-| ExitMethods.cs:62:9:62:22 | call to method ErrorAlways3 | ExitMethods.cs:60:10:60:11 | exit M8 (abnormal) | exception(Exception) |
+| ExitMethods.cs:62:9:62:22 | call to method ErrorAlways3 | ExitMethods.cs:60:10:60:11 | exit M8 (abnormal) | exception |
 | ExitMethods.cs:62:9:62:23 | ...; | ExitMethods.cs:62:9:62:22 | call to method ErrorAlways3 |  |
 | ExitMethods.cs:66:17:66:26 | enter ErrorMaybe | ExitMethods.cs:67:5:70:5 | {...} |  |
 | ExitMethods.cs:66:17:66:26 | exit ErrorMaybe (abnormal) | ExitMethods.cs:66:17:66:26 | exit ErrorMaybe |  |
@@ -1757,7 +1494,7 @@
 | ExitMethods.cs:68:9:69:34 | if (...) ... | ExitMethods.cs:68:13:68:13 | access to parameter b |  |
 | ExitMethods.cs:68:13:68:13 | access to parameter b | ExitMethods.cs:66:17:66:26 | exit ErrorMaybe (normal) | false |
 | ExitMethods.cs:68:13:68:13 | access to parameter b | ExitMethods.cs:69:19:69:33 | object creation of type Exception | true |
-| ExitMethods.cs:69:13:69:34 | throw ...; | ExitMethods.cs:66:17:66:26 | exit ErrorMaybe (abnormal) | exception(Exception) |
+| ExitMethods.cs:69:13:69:34 | throw ...; | ExitMethods.cs:66:17:66:26 | exit ErrorMaybe (abnormal) | exception |
 | ExitMethods.cs:69:19:69:33 | object creation of type Exception | ExitMethods.cs:69:13:69:34 | throw ...; |  |
 | ExitMethods.cs:72:17:72:27 | enter ErrorAlways | ExitMethods.cs:73:5:78:5 | {...} |  |
 | ExitMethods.cs:72:17:72:27 | exit ErrorAlways (abnormal) | ExitMethods.cs:72:17:72:27 | exit ErrorAlways |  |
@@ -1765,19 +1502,19 @@
 | ExitMethods.cs:74:9:77:45 | if (...) ... | ExitMethods.cs:74:13:74:13 | access to parameter b |  |
 | ExitMethods.cs:74:13:74:13 | access to parameter b | ExitMethods.cs:75:19:75:33 | object creation of type Exception | true |
 | ExitMethods.cs:74:13:74:13 | access to parameter b | ExitMethods.cs:77:41:77:43 | "b" | false |
-| ExitMethods.cs:75:13:75:34 | throw ...; | ExitMethods.cs:72:17:72:27 | exit ErrorAlways (abnormal) | exception(Exception) |
+| ExitMethods.cs:75:13:75:34 | throw ...; | ExitMethods.cs:72:17:72:27 | exit ErrorAlways (abnormal) | exception |
 | ExitMethods.cs:75:19:75:33 | object creation of type Exception | ExitMethods.cs:75:13:75:34 | throw ...; |  |
-| ExitMethods.cs:77:13:77:45 | throw ...; | ExitMethods.cs:72:17:72:27 | exit ErrorAlways (abnormal) | exception(ArgumentException) |
+| ExitMethods.cs:77:13:77:45 | throw ...; | ExitMethods.cs:72:17:72:27 | exit ErrorAlways (abnormal) | exception |
 | ExitMethods.cs:77:19:77:44 | object creation of type ArgumentException | ExitMethods.cs:77:13:77:45 | throw ...; |  |
 | ExitMethods.cs:77:41:77:43 | "b" | ExitMethods.cs:77:19:77:44 | object creation of type ArgumentException |  |
 | ExitMethods.cs:80:17:80:28 | enter ErrorAlways2 | ExitMethods.cs:81:5:83:5 | {...} |  |
 | ExitMethods.cs:80:17:80:28 | exit ErrorAlways2 (abnormal) | ExitMethods.cs:80:17:80:28 | exit ErrorAlways2 |  |
 | ExitMethods.cs:81:5:83:5 | {...} | ExitMethods.cs:82:15:82:29 | object creation of type Exception |  |
-| ExitMethods.cs:82:9:82:30 | throw ...; | ExitMethods.cs:80:17:80:28 | exit ErrorAlways2 (abnormal) | exception(Exception) |
+| ExitMethods.cs:82:9:82:30 | throw ...; | ExitMethods.cs:80:17:80:28 | exit ErrorAlways2 (abnormal) | exception |
 | ExitMethods.cs:82:15:82:29 | object creation of type Exception | ExitMethods.cs:82:9:82:30 | throw ...; |  |
 | ExitMethods.cs:85:17:85:28 | enter ErrorAlways3 | ExitMethods.cs:85:41:85:55 | object creation of type Exception |  |
 | ExitMethods.cs:85:17:85:28 | exit ErrorAlways3 (abnormal) | ExitMethods.cs:85:17:85:28 | exit ErrorAlways3 |  |
-| ExitMethods.cs:85:35:85:55 | throw ... | ExitMethods.cs:85:17:85:28 | exit ErrorAlways3 (abnormal) | exception(Exception) |
+| ExitMethods.cs:85:35:85:55 | throw ... | ExitMethods.cs:85:17:85:28 | exit ErrorAlways3 (abnormal) | exception |
 | ExitMethods.cs:85:41:85:55 | object creation of type Exception | ExitMethods.cs:85:35:85:55 | throw ... |  |
 | ExitMethods.cs:87:10:87:13 | enter Exit | ExitMethods.cs:88:5:90:5 | {...} |  |
 | ExitMethods.cs:87:10:87:13 | exit Exit (abnormal) | ExitMethods.cs:87:10:87:13 | exit Exit |  |
@@ -1813,7 +1550,7 @@
 | ExitMethods.cs:112:29:112:29 | (...) ... | ExitMethods.cs:112:33:112:37 | access to parameter input |  |
 | ExitMethods.cs:112:29:112:37 | ... / ... | ExitMethods.cs:112:16:112:76 | ... ? ... : ... |  |
 | ExitMethods.cs:112:33:112:37 | access to parameter input | ExitMethods.cs:112:29:112:37 | ... / ... |  |
-| ExitMethods.cs:112:41:112:76 | throw ... | ExitMethods.cs:110:13:110:21 | exit ThrowExpr (abnormal) | exception(ArgumentException) |
+| ExitMethods.cs:112:41:112:76 | throw ... | ExitMethods.cs:110:13:110:21 | exit ThrowExpr (abnormal) | exception |
 | ExitMethods.cs:112:47:112:76 | object creation of type ArgumentException | ExitMethods.cs:112:41:112:76 | throw ... |  |
 | ExitMethods.cs:112:69:112:75 | "input" | ExitMethods.cs:112:47:112:76 | object creation of type ArgumentException |  |
 | ExitMethods.cs:115:16:115:34 | enter ExtensionMethodCall | ExitMethods.cs:116:5:118:5 | {...} |  |
@@ -1830,40 +1567,39 @@
 | ExitMethods.cs:120:17:120:32 | enter FailingAssertion | ExitMethods.cs:121:5:124:5 | {...} |  |
 | ExitMethods.cs:120:17:120:32 | exit FailingAssertion (abnormal) | ExitMethods.cs:120:17:120:32 | exit FailingAssertion |  |
 | ExitMethods.cs:121:5:124:5 | {...} | ExitMethods.cs:122:9:122:29 | ...; |  |
-| ExitMethods.cs:122:9:122:28 | [assertion failure] call to method IsTrue | ExitMethods.cs:120:17:120:32 | exit FailingAssertion (abnormal) | exception(AssertFailedException) |
+| ExitMethods.cs:122:9:122:28 | call to method IsTrue | ExitMethods.cs:120:17:120:32 | exit FailingAssertion (abnormal) | exception |
 | ExitMethods.cs:122:9:122:29 | ...; | ExitMethods.cs:122:23:122:27 | false |  |
-| ExitMethods.cs:122:23:122:27 | false | ExitMethods.cs:122:9:122:28 | [assertion failure] call to method IsTrue | false |
+| ExitMethods.cs:122:23:122:27 | false | ExitMethods.cs:122:9:122:28 | call to method IsTrue |  |
 | ExitMethods.cs:126:17:126:33 | enter FailingAssertion2 | ExitMethods.cs:127:5:130:5 | {...} |  |
 | ExitMethods.cs:126:17:126:33 | exit FailingAssertion2 (abnormal) | ExitMethods.cs:126:17:126:33 | exit FailingAssertion2 |  |
 | ExitMethods.cs:127:5:130:5 | {...} | ExitMethods.cs:128:9:128:27 | ...; |  |
-| ExitMethods.cs:128:9:128:26 | call to method FailingAssertion | ExitMethods.cs:126:17:126:33 | exit FailingAssertion2 (abnormal) | exception(AssertFailedException) |
+| ExitMethods.cs:128:9:128:26 | call to method FailingAssertion | ExitMethods.cs:126:17:126:33 | exit FailingAssertion2 (abnormal) | exception |
 | ExitMethods.cs:128:9:128:26 | this access | ExitMethods.cs:128:9:128:26 | call to method FailingAssertion |  |
 | ExitMethods.cs:128:9:128:27 | ...; | ExitMethods.cs:128:9:128:26 | this access |  |
 | ExitMethods.cs:132:10:132:20 | enter AssertFalse | ExitMethods.cs:132:48:132:48 | access to parameter b |  |
 | ExitMethods.cs:132:10:132:20 | exit AssertFalse (abnormal) | ExitMethods.cs:132:10:132:20 | exit AssertFalse |  |
 | ExitMethods.cs:132:10:132:20 | exit AssertFalse (normal) | ExitMethods.cs:132:10:132:20 | exit AssertFalse |  |
-| ExitMethods.cs:132:33:132:49 | [assertion failure] call to method IsFalse | ExitMethods.cs:132:10:132:20 | exit AssertFalse (abnormal) | exception(AssertFailedException) |
-| ExitMethods.cs:132:33:132:49 | [assertion success] call to method IsFalse | ExitMethods.cs:132:10:132:20 | exit AssertFalse (normal) |  |
-| ExitMethods.cs:132:48:132:48 | access to parameter b | ExitMethods.cs:132:33:132:49 | [assertion failure] call to method IsFalse | true |
-| ExitMethods.cs:132:48:132:48 | access to parameter b | ExitMethods.cs:132:33:132:49 | [assertion success] call to method IsFalse | false |
+| ExitMethods.cs:132:33:132:49 | call to method IsFalse | ExitMethods.cs:132:10:132:20 | exit AssertFalse (abnormal) | exception |
+| ExitMethods.cs:132:33:132:49 | call to method IsFalse | ExitMethods.cs:132:10:132:20 | exit AssertFalse (normal) |  |
+| ExitMethods.cs:132:48:132:48 | access to parameter b | ExitMethods.cs:132:33:132:49 | call to method IsFalse |  |
 | ExitMethods.cs:134:17:134:33 | enter FailingAssertion3 | ExitMethods.cs:135:5:138:5 | {...} |  |
 | ExitMethods.cs:134:17:134:33 | exit FailingAssertion3 (abnormal) | ExitMethods.cs:134:17:134:33 | exit FailingAssertion3 |  |
 | ExitMethods.cs:135:5:138:5 | {...} | ExitMethods.cs:136:9:136:26 | ...; |  |
-| ExitMethods.cs:136:9:136:25 | [assertion failure] call to method AssertFalse | ExitMethods.cs:134:17:134:33 | exit FailingAssertion3 (abnormal) | exception(AssertFailedException) |
+| ExitMethods.cs:136:9:136:25 | call to method AssertFalse | ExitMethods.cs:134:17:134:33 | exit FailingAssertion3 (abnormal) | exception |
 | ExitMethods.cs:136:9:136:25 | this access | ExitMethods.cs:136:21:136:24 | true |  |
 | ExitMethods.cs:136:9:136:26 | ...; | ExitMethods.cs:136:9:136:25 | this access |  |
-| ExitMethods.cs:136:21:136:24 | true | ExitMethods.cs:136:9:136:25 | [assertion failure] call to method AssertFalse | true |
+| ExitMethods.cs:136:21:136:24 | true | ExitMethods.cs:136:9:136:25 | call to method AssertFalse |  |
 | ExitMethods.cs:140:17:140:42 | enter ExceptionDispatchInfoThrow | ExitMethods.cs:141:5:147:5 | {...} |  |
 | ExitMethods.cs:140:17:140:42 | exit ExceptionDispatchInfoThrow (abnormal) | ExitMethods.cs:140:17:140:42 | exit ExceptionDispatchInfoThrow |  |
 | ExitMethods.cs:141:5:147:5 | {...} | ExitMethods.cs:142:9:145:53 | if (...) ... |  |
 | ExitMethods.cs:142:9:145:53 | if (...) ... | ExitMethods.cs:142:13:142:13 | access to parameter b |  |
 | ExitMethods.cs:142:13:142:13 | access to parameter b | ExitMethods.cs:143:13:143:43 | ...; | true |
 | ExitMethods.cs:142:13:142:13 | access to parameter b | ExitMethods.cs:145:13:145:53 | ...; | false |
-| ExitMethods.cs:143:13:143:42 | call to method Throw | ExitMethods.cs:140:17:140:42 | exit ExceptionDispatchInfoThrow (abnormal) | exception(ArgumentException) |
+| ExitMethods.cs:143:13:143:42 | call to method Throw | ExitMethods.cs:140:17:140:42 | exit ExceptionDispatchInfoThrow (abnormal) | exception |
 | ExitMethods.cs:143:13:143:43 | ...; | ExitMethods.cs:143:41:143:41 | access to parameter e |  |
 | ExitMethods.cs:143:41:143:41 | access to parameter e | ExitMethods.cs:143:13:143:42 | call to method Throw |  |
 | ExitMethods.cs:145:13:145:44 | call to method Capture | ExitMethods.cs:145:13:145:52 | call to method Throw |  |
-| ExitMethods.cs:145:13:145:52 | call to method Throw | ExitMethods.cs:140:17:140:42 | exit ExceptionDispatchInfoThrow (abnormal) | exception(Exception) |
+| ExitMethods.cs:145:13:145:52 | call to method Throw | ExitMethods.cs:140:17:140:42 | exit ExceptionDispatchInfoThrow (abnormal) | exception |
 | ExitMethods.cs:145:13:145:53 | ...; | ExitMethods.cs:145:43:145:43 | access to parameter e |  |
 | ExitMethods.cs:145:43:145:43 | access to parameter e | ExitMethods.cs:145:13:145:44 | call to method Capture |  |
 | Extensions.cs:5:23:5:29 | enter ToInt32 | Extensions.cs:6:5:8:5 | {...} |  |
@@ -1912,18 +1648,14 @@
 | Finally.cs:8:5:17:5 | {...} | Finally.cs:9:9:16:9 | try {...} ... |  |
 | Finally.cs:9:9:16:9 | try {...} ... | Finally.cs:10:9:12:9 | {...} |  |
 | Finally.cs:10:9:12:9 | {...} | Finally.cs:11:13:11:38 | ...; |  |
-| Finally.cs:11:13:11:37 | call to method WriteLine | Finally.cs:14:9:16:9 | [finally: exception(Exception)] {...} | exception(Exception) |
-| Finally.cs:11:13:11:37 | call to method WriteLine | Finally.cs:14:9:16:9 | {...} |  |
+| Finally.cs:11:13:11:37 | call to method WriteLine | Finally.cs:14:9:16:9 | {...} | , exception |
 | Finally.cs:11:13:11:38 | ...; | Finally.cs:11:31:11:36 | "Try1" |  |
 | Finally.cs:11:31:11:36 | "Try1" | Finally.cs:11:13:11:37 | call to method WriteLine |  |
-| Finally.cs:14:9:16:9 | [finally: exception(Exception)] {...} | Finally.cs:15:13:15:41 | [finally: exception(Exception)] ...; |  |
 | Finally.cs:14:9:16:9 | {...} | Finally.cs:15:13:15:41 | ...; |  |
-| Finally.cs:15:13:15:40 | [finally: exception(Exception)] call to method WriteLine | Finally.cs:7:10:7:11 | exit M1 (abnormal) | exception(Exception) |
+| Finally.cs:15:13:15:40 | call to method WriteLine | Finally.cs:7:10:7:11 | exit M1 (abnormal) | exception |
 | Finally.cs:15:13:15:40 | call to method WriteLine | Finally.cs:7:10:7:11 | exit M1 (normal) |  |
 | Finally.cs:15:13:15:41 | ...; | Finally.cs:15:31:15:39 | "Finally" |  |
-| Finally.cs:15:13:15:41 | [finally: exception(Exception)] ...; | Finally.cs:15:31:15:39 | [finally: exception(Exception)] "Finally" |  |
 | Finally.cs:15:31:15:39 | "Finally" | Finally.cs:15:13:15:40 | call to method WriteLine |  |
-| Finally.cs:15:31:15:39 | [finally: exception(Exception)] "Finally" | Finally.cs:15:13:15:40 | [finally: exception(Exception)] call to method WriteLine |  |
 | Finally.cs:19:10:19:11 | enter M2 | Finally.cs:20:5:52:5 | {...} |  |
 | Finally.cs:19:10:19:11 | exit M2 (abnormal) | Finally.cs:19:10:19:11 | exit M2 |  |
 | Finally.cs:19:10:19:11 | exit M2 (normal) | Finally.cs:19:10:19:11 | exit M2 |  |
@@ -1931,47 +1663,40 @@
 | Finally.cs:21:9:51:9 | try {...} ... | Finally.cs:22:9:25:9 | {...} |  |
 | Finally.cs:22:9:25:9 | {...} | Finally.cs:23:13:23:38 | ...; |  |
 | Finally.cs:23:13:23:37 | call to method WriteLine | Finally.cs:24:13:24:19 | return ...; |  |
-| Finally.cs:23:13:23:37 | call to method WriteLine | Finally.cs:26:9:29:9 | [exception: Exception] catch (...) {...} | exception(Exception) |
+| Finally.cs:23:13:23:37 | call to method WriteLine | Finally.cs:26:9:29:9 | catch (...) {...} | exception |
 | Finally.cs:23:13:23:38 | ...; | Finally.cs:23:31:23:36 | "Try2" |  |
 | Finally.cs:23:31:23:36 | "Try2" | Finally.cs:23:13:23:37 | call to method WriteLine |  |
-| Finally.cs:24:13:24:19 | return ...; | Finally.cs:49:9:51:9 | [finally: return] {...} | return |
-| Finally.cs:26:9:29:9 | [exception: Exception] catch (...) {...} | Finally.cs:26:38:26:39 | [exception: Exception] IOException ex | match |
-| Finally.cs:26:9:29:9 | [exception: Exception] catch (...) {...} | Finally.cs:30:9:40:9 | [exception: Exception] catch (...) {...} | no-match |
-| Finally.cs:26:38:26:39 | [exception: Exception] IOException ex | Finally.cs:26:48:26:51 | [exception: Exception] true |  |
-| Finally.cs:26:48:26:51 | [exception: Exception] true | Finally.cs:27:9:29:9 | {...} | true |
+| Finally.cs:24:13:24:19 | return ...; | Finally.cs:49:9:51:9 | {...} | return |
+| Finally.cs:26:9:29:9 | catch (...) {...} | Finally.cs:26:38:26:39 | IOException ex | match |
+| Finally.cs:26:9:29:9 | catch (...) {...} | Finally.cs:30:9:40:9 | catch (...) {...} | no-match |
+| Finally.cs:26:38:26:39 | IOException ex | Finally.cs:26:48:26:51 | true |  |
+| Finally.cs:26:48:26:51 | true | Finally.cs:27:9:29:9 | {...} | true |
 | Finally.cs:27:9:29:9 | {...} | Finally.cs:28:13:28:18 | throw ...; |  |
-| Finally.cs:28:13:28:18 | throw ...; | Finally.cs:49:9:51:9 | [finally: exception(IOException)] {...} | exception(IOException) |
-| Finally.cs:30:9:40:9 | [exception: Exception] catch (...) {...} | Finally.cs:30:41:30:42 | [exception: Exception] ArgumentException ex | match |
-| Finally.cs:30:9:40:9 | [exception: Exception] catch (...) {...} | Finally.cs:41:9:43:9 | [exception: Exception] catch (...) {...} | no-match |
-| Finally.cs:30:41:30:42 | [exception: Exception] ArgumentException ex | Finally.cs:31:9:40:9 | {...} |  |
+| Finally.cs:28:13:28:18 | throw ...; | Finally.cs:49:9:51:9 | {...} | exception |
+| Finally.cs:30:9:40:9 | catch (...) {...} | Finally.cs:30:41:30:42 | ArgumentException ex | match |
+| Finally.cs:30:9:40:9 | catch (...) {...} | Finally.cs:41:9:43:9 | catch (...) {...} | no-match |
+| Finally.cs:30:41:30:42 | ArgumentException ex | Finally.cs:31:9:40:9 | {...} |  |
 | Finally.cs:31:9:40:9 | {...} | Finally.cs:32:13:39:13 | try {...} ... |  |
 | Finally.cs:32:13:39:13 | try {...} ... | Finally.cs:33:13:35:13 | {...} |  |
 | Finally.cs:33:13:35:13 | {...} | Finally.cs:34:17:34:32 | if (...) ... |  |
 | Finally.cs:34:17:34:32 | if (...) ... | Finally.cs:34:21:34:24 | true |  |
 | Finally.cs:34:21:34:24 | true | Finally.cs:34:27:34:32 | throw ...; | true |
-| Finally.cs:34:27:34:32 | throw ...; | Finally.cs:37:13:39:13 | [finally: exception(ArgumentException)] {...} | exception(ArgumentException) |
-| Finally.cs:37:13:39:13 | [finally: exception(ArgumentException)] {...} | Finally.cs:38:37:38:42 | [finally: exception(ArgumentException)] "Boo!" |  |
-| Finally.cs:38:17:38:44 | [finally: exception(ArgumentException)] throw ...; | Finally.cs:49:9:51:9 | [finally: exception(Exception)] {...} | exception(Exception) |
-| Finally.cs:38:23:38:43 | [finally: exception(ArgumentException)] object creation of type Exception | Finally.cs:38:17:38:44 | [finally: exception(ArgumentException)] throw ...; |  |
-| Finally.cs:38:37:38:42 | [finally: exception(ArgumentException)] "Boo!" | Finally.cs:38:23:38:43 | [finally: exception(ArgumentException)] object creation of type Exception |  |
-| Finally.cs:41:9:43:9 | [exception: Exception] catch (...) {...} | Finally.cs:42:9:43:9 | {...} | match |
+| Finally.cs:34:27:34:32 | throw ...; | Finally.cs:37:13:39:13 | {...} | exception |
+| Finally.cs:37:13:39:13 | {...} | Finally.cs:38:37:38:42 | "Boo!" |  |
+| Finally.cs:38:17:38:44 | throw ...; | Finally.cs:49:9:51:9 | {...} | exception |
+| Finally.cs:38:23:38:43 | object creation of type Exception | Finally.cs:38:17:38:44 | throw ...; |  |
+| Finally.cs:38:37:38:42 | "Boo!" | Finally.cs:38:23:38:43 | object creation of type Exception |  |
+| Finally.cs:41:9:43:9 | catch (...) {...} | Finally.cs:42:9:43:9 | {...} | match |
+| Finally.cs:41:9:43:9 | catch (...) {...} | Finally.cs:44:9:47:9 | catch {...} | no-match |
 | Finally.cs:42:9:43:9 | {...} | Finally.cs:49:9:51:9 | {...} |  |
-| Finally.cs:49:9:51:9 | [finally: exception(Exception)] {...} | Finally.cs:50:13:50:41 | [finally: exception(Exception)] ...; |  |
-| Finally.cs:49:9:51:9 | [finally: exception(IOException)] {...} | Finally.cs:50:13:50:41 | [finally: exception(IOException)] ...; |  |
-| Finally.cs:49:9:51:9 | [finally: return] {...} | Finally.cs:50:13:50:41 | [finally: return] ...; |  |
+| Finally.cs:44:9:47:9 | catch {...} | Finally.cs:45:9:47:9 | {...} |  |
+| Finally.cs:45:9:47:9 | {...} | Finally.cs:46:13:46:19 | return ...; |  |
+| Finally.cs:46:13:46:19 | return ...; | Finally.cs:49:9:51:9 | {...} | return |
 | Finally.cs:49:9:51:9 | {...} | Finally.cs:50:13:50:41 | ...; |  |
-| Finally.cs:50:13:50:40 | [finally: exception(Exception)] call to method WriteLine | Finally.cs:19:10:19:11 | exit M2 (abnormal) | exception(Exception) |
-| Finally.cs:50:13:50:40 | [finally: exception(IOException)] call to method WriteLine | Finally.cs:19:10:19:11 | exit M2 (abnormal) | exception(IOException) |
-| Finally.cs:50:13:50:40 | [finally: return] call to method WriteLine | Finally.cs:19:10:19:11 | exit M2 (normal) | return |
-| Finally.cs:50:13:50:40 | call to method WriteLine | Finally.cs:19:10:19:11 | exit M2 (normal) |  |
+| Finally.cs:50:13:50:40 | call to method WriteLine | Finally.cs:19:10:19:11 | exit M2 (abnormal) | exception |
+| Finally.cs:50:13:50:40 | call to method WriteLine | Finally.cs:19:10:19:11 | exit M2 (normal) | , return |
 | Finally.cs:50:13:50:41 | ...; | Finally.cs:50:31:50:39 | "Finally" |  |
-| Finally.cs:50:13:50:41 | [finally: exception(Exception)] ...; | Finally.cs:50:31:50:39 | [finally: exception(Exception)] "Finally" |  |
-| Finally.cs:50:13:50:41 | [finally: exception(IOException)] ...; | Finally.cs:50:31:50:39 | [finally: exception(IOException)] "Finally" |  |
-| Finally.cs:50:13:50:41 | [finally: return] ...; | Finally.cs:50:31:50:39 | [finally: return] "Finally" |  |
 | Finally.cs:50:31:50:39 | "Finally" | Finally.cs:50:13:50:40 | call to method WriteLine |  |
-| Finally.cs:50:31:50:39 | [finally: exception(Exception)] "Finally" | Finally.cs:50:13:50:40 | [finally: exception(Exception)] call to method WriteLine |  |
-| Finally.cs:50:31:50:39 | [finally: exception(IOException)] "Finally" | Finally.cs:50:13:50:40 | [finally: exception(IOException)] call to method WriteLine |  |
-| Finally.cs:50:31:50:39 | [finally: return] "Finally" | Finally.cs:50:13:50:40 | [finally: return] call to method WriteLine |  |
 | Finally.cs:54:10:54:11 | enter M3 | Finally.cs:55:5:72:5 | {...} |  |
 | Finally.cs:54:10:54:11 | exit M3 (abnormal) | Finally.cs:54:10:54:11 | exit M3 |  |
 | Finally.cs:54:10:54:11 | exit M3 (normal) | Finally.cs:54:10:54:11 | exit M3 |  |
@@ -1979,40 +1704,30 @@
 | Finally.cs:56:9:71:9 | try {...} ... | Finally.cs:57:9:60:9 | {...} |  |
 | Finally.cs:57:9:60:9 | {...} | Finally.cs:58:13:58:38 | ...; |  |
 | Finally.cs:58:13:58:37 | call to method WriteLine | Finally.cs:59:13:59:19 | return ...; |  |
-| Finally.cs:58:13:58:37 | call to method WriteLine | Finally.cs:61:9:64:9 | [exception: Exception] catch (...) {...} | exception(Exception) |
+| Finally.cs:58:13:58:37 | call to method WriteLine | Finally.cs:61:9:64:9 | catch (...) {...} | exception |
 | Finally.cs:58:13:58:38 | ...; | Finally.cs:58:31:58:36 | "Try3" |  |
 | Finally.cs:58:31:58:36 | "Try3" | Finally.cs:58:13:58:37 | call to method WriteLine |  |
-| Finally.cs:59:13:59:19 | return ...; | Finally.cs:69:9:71:9 | [finally: return] {...} | return |
-| Finally.cs:61:9:64:9 | [exception: Exception] catch (...) {...} | Finally.cs:61:38:61:39 | [exception: Exception] IOException ex | match |
-| Finally.cs:61:9:64:9 | [exception: Exception] catch (...) {...} | Finally.cs:65:9:67:9 | [exception: Exception] catch (...) {...} | no-match |
-| Finally.cs:61:38:61:39 | [exception: Exception] IOException ex | Finally.cs:61:48:61:51 | [exception: Exception] true |  |
-| Finally.cs:61:48:61:51 | [exception: Exception] true | Finally.cs:62:9:64:9 | {...} | true |
+| Finally.cs:59:13:59:19 | return ...; | Finally.cs:69:9:71:9 | {...} | return |
+| Finally.cs:61:9:64:9 | catch (...) {...} | Finally.cs:61:38:61:39 | IOException ex | match |
+| Finally.cs:61:9:64:9 | catch (...) {...} | Finally.cs:65:9:67:9 | catch (...) {...} | no-match |
+| Finally.cs:61:38:61:39 | IOException ex | Finally.cs:61:48:61:51 | true |  |
+| Finally.cs:61:48:61:51 | true | Finally.cs:62:9:64:9 | {...} | true |
 | Finally.cs:62:9:64:9 | {...} | Finally.cs:63:13:63:18 | throw ...; |  |
-| Finally.cs:63:13:63:18 | throw ...; | Finally.cs:69:9:71:9 | [finally: exception(IOException)] {...} | exception(IOException) |
-| Finally.cs:65:9:67:9 | [exception: Exception] catch (...) {...} | Finally.cs:65:26:65:26 | [exception: Exception] Exception e | match |
-| Finally.cs:65:26:65:26 | [exception: Exception] Exception e | Finally.cs:65:35:65:35 | [exception: Exception] access to local variable e |  |
-| Finally.cs:65:35:65:35 | [exception: Exception] access to local variable e | Finally.cs:65:35:65:43 | [exception: Exception] access to property Message |  |
-| Finally.cs:65:35:65:43 | [exception: Exception] access to property Message | Finally.cs:65:48:65:51 | [exception: Exception] null |  |
-| Finally.cs:65:35:65:51 | [exception: Exception] ... != ... | Finally.cs:66:9:67:9 | {...} | true |
-| Finally.cs:65:35:65:51 | [exception: Exception] ... != ... | Finally.cs:69:9:71:9 | [finally: exception(Exception)] {...} | exception(Exception) |
-| Finally.cs:65:48:65:51 | [exception: Exception] null | Finally.cs:65:35:65:51 | [exception: Exception] ... != ... |  |
+| Finally.cs:63:13:63:18 | throw ...; | Finally.cs:69:9:71:9 | {...} | exception |
+| Finally.cs:65:9:67:9 | catch (...) {...} | Finally.cs:65:26:65:26 | Exception e | match |
+| Finally.cs:65:9:67:9 | catch (...) {...} | Finally.cs:69:9:71:9 | {...} | exception |
+| Finally.cs:65:26:65:26 | Exception e | Finally.cs:65:35:65:35 | access to local variable e |  |
+| Finally.cs:65:35:65:35 | access to local variable e | Finally.cs:65:35:65:43 | access to property Message |  |
+| Finally.cs:65:35:65:43 | access to property Message | Finally.cs:65:48:65:51 | null |  |
+| Finally.cs:65:35:65:51 | ... != ... | Finally.cs:66:9:67:9 | {...} | true |
+| Finally.cs:65:35:65:51 | ... != ... | Finally.cs:69:9:71:9 | {...} | exception |
+| Finally.cs:65:48:65:51 | null | Finally.cs:65:35:65:51 | ... != ... |  |
 | Finally.cs:66:9:67:9 | {...} | Finally.cs:69:9:71:9 | {...} |  |
-| Finally.cs:69:9:71:9 | [finally: exception(Exception)] {...} | Finally.cs:70:13:70:41 | [finally: exception(Exception)] ...; |  |
-| Finally.cs:69:9:71:9 | [finally: exception(IOException)] {...} | Finally.cs:70:13:70:41 | [finally: exception(IOException)] ...; |  |
-| Finally.cs:69:9:71:9 | [finally: return] {...} | Finally.cs:70:13:70:41 | [finally: return] ...; |  |
 | Finally.cs:69:9:71:9 | {...} | Finally.cs:70:13:70:41 | ...; |  |
-| Finally.cs:70:13:70:40 | [finally: exception(Exception)] call to method WriteLine | Finally.cs:54:10:54:11 | exit M3 (abnormal) | exception(Exception) |
-| Finally.cs:70:13:70:40 | [finally: exception(IOException)] call to method WriteLine | Finally.cs:54:10:54:11 | exit M3 (abnormal) | exception(IOException) |
-| Finally.cs:70:13:70:40 | [finally: return] call to method WriteLine | Finally.cs:54:10:54:11 | exit M3 (normal) | return |
-| Finally.cs:70:13:70:40 | call to method WriteLine | Finally.cs:54:10:54:11 | exit M3 (normal) |  |
+| Finally.cs:70:13:70:40 | call to method WriteLine | Finally.cs:54:10:54:11 | exit M3 (abnormal) | exception |
+| Finally.cs:70:13:70:40 | call to method WriteLine | Finally.cs:54:10:54:11 | exit M3 (normal) | , return |
 | Finally.cs:70:13:70:41 | ...; | Finally.cs:70:31:70:39 | "Finally" |  |
-| Finally.cs:70:13:70:41 | [finally: exception(Exception)] ...; | Finally.cs:70:31:70:39 | [finally: exception(Exception)] "Finally" |  |
-| Finally.cs:70:13:70:41 | [finally: exception(IOException)] ...; | Finally.cs:70:31:70:39 | [finally: exception(IOException)] "Finally" |  |
-| Finally.cs:70:13:70:41 | [finally: return] ...; | Finally.cs:70:31:70:39 | [finally: return] "Finally" |  |
 | Finally.cs:70:31:70:39 | "Finally" | Finally.cs:70:13:70:40 | call to method WriteLine |  |
-| Finally.cs:70:31:70:39 | [finally: exception(Exception)] "Finally" | Finally.cs:70:13:70:40 | [finally: exception(Exception)] call to method WriteLine |  |
-| Finally.cs:70:31:70:39 | [finally: exception(IOException)] "Finally" | Finally.cs:70:13:70:40 | [finally: exception(IOException)] call to method WriteLine |  |
-| Finally.cs:70:31:70:39 | [finally: return] "Finally" | Finally.cs:70:13:70:40 | [finally: return] call to method WriteLine |  |
 | Finally.cs:74:10:74:11 | enter M4 | Finally.cs:75:5:101:5 | {...} |  |
 | Finally.cs:74:10:74:11 | exit M4 (abnormal) | Finally.cs:74:10:74:11 | exit M4 |  |
 | Finally.cs:74:10:74:11 | exit M4 (normal) | Finally.cs:74:10:74:11 | exit M4 |  |
@@ -2033,95 +1748,36 @@
 | Finally.cs:81:21:81:26 | ... == ... | Finally.cs:82:21:82:27 | return ...; | true |
 | Finally.cs:81:21:81:26 | ... == ... | Finally.cs:83:17:84:29 | if (...) ... | false |
 | Finally.cs:81:26:81:26 | 0 | Finally.cs:81:21:81:26 | ... == ... |  |
-| Finally.cs:82:21:82:27 | return ...; | Finally.cs:89:13:99:13 | [finally: return] {...} | return |
+| Finally.cs:82:21:82:27 | return ...; | Finally.cs:89:13:99:13 | {...} | return |
 | Finally.cs:83:17:84:29 | if (...) ... | Finally.cs:83:21:83:21 | access to local variable i |  |
 | Finally.cs:83:21:83:21 | access to local variable i | Finally.cs:83:26:83:26 | 1 |  |
 | Finally.cs:83:21:83:26 | ... == ... | Finally.cs:84:21:84:29 | continue; | true |
 | Finally.cs:83:21:83:26 | ... == ... | Finally.cs:85:17:86:26 | if (...) ... | false |
 | Finally.cs:83:26:83:26 | 1 | Finally.cs:83:21:83:26 | ... == ... |  |
-| Finally.cs:84:21:84:29 | continue; | Finally.cs:89:13:99:13 | [finally: continue] {...} | continue |
+| Finally.cs:84:21:84:29 | continue; | Finally.cs:89:13:99:13 | {...} | continue |
 | Finally.cs:85:17:86:26 | if (...) ... | Finally.cs:85:21:85:21 | access to local variable i |  |
 | Finally.cs:85:21:85:21 | access to local variable i | Finally.cs:85:26:85:26 | 2 |  |
 | Finally.cs:85:21:85:26 | ... == ... | Finally.cs:86:21:86:26 | break; | true |
 | Finally.cs:85:21:85:26 | ... == ... | Finally.cs:89:13:99:13 | {...} | false |
 | Finally.cs:85:26:85:26 | 2 | Finally.cs:85:21:85:26 | ... == ... |  |
-| Finally.cs:86:21:86:26 | break; | Finally.cs:89:13:99:13 | [finally: break] {...} | break |
-| Finally.cs:89:13:99:13 | [finally: break] {...} | Finally.cs:90:17:98:17 | [finally: break] try {...} ... |  |
-| Finally.cs:89:13:99:13 | [finally: continue] {...} | Finally.cs:90:17:98:17 | [finally: continue] try {...} ... |  |
-| Finally.cs:89:13:99:13 | [finally: return] {...} | Finally.cs:90:17:98:17 | [finally: return] try {...} ... |  |
+| Finally.cs:86:21:86:26 | break; | Finally.cs:89:13:99:13 | {...} | break |
 | Finally.cs:89:13:99:13 | {...} | Finally.cs:90:17:98:17 | try {...} ... |  |
-| Finally.cs:90:17:98:17 | [finally: break] try {...} ... | Finally.cs:91:17:94:17 | [finally: break] {...} |  |
-| Finally.cs:90:17:98:17 | [finally: continue] try {...} ... | Finally.cs:91:17:94:17 | [finally: continue] {...} |  |
-| Finally.cs:90:17:98:17 | [finally: return] try {...} ... | Finally.cs:91:17:94:17 | [finally: return] {...} |  |
 | Finally.cs:90:17:98:17 | try {...} ... | Finally.cs:91:17:94:17 | {...} |  |
-| Finally.cs:91:17:94:17 | [finally: break] {...} | Finally.cs:92:21:93:46 | [finally: break] if (...) ... |  |
-| Finally.cs:91:17:94:17 | [finally: continue] {...} | Finally.cs:92:21:93:46 | [finally: continue] if (...) ... |  |
-| Finally.cs:91:17:94:17 | [finally: return] {...} | Finally.cs:92:21:93:46 | [finally: return] if (...) ... |  |
 | Finally.cs:91:17:94:17 | {...} | Finally.cs:92:21:93:46 | if (...) ... |  |
-| Finally.cs:92:21:93:46 | [finally: break] if (...) ... | Finally.cs:92:25:92:25 | [finally: break] access to local variable i |  |
-| Finally.cs:92:21:93:46 | [finally: continue] if (...) ... | Finally.cs:92:25:92:25 | [finally: continue] access to local variable i |  |
-| Finally.cs:92:21:93:46 | [finally: return] if (...) ... | Finally.cs:92:25:92:25 | [finally: return] access to local variable i |  |
 | Finally.cs:92:21:93:46 | if (...) ... | Finally.cs:92:25:92:25 | access to local variable i |  |
-| Finally.cs:92:25:92:25 | [finally: break] access to local variable i | Finally.cs:92:30:92:30 | [finally: break] 3 |  |
-| Finally.cs:92:25:92:25 | [finally: continue] access to local variable i | Finally.cs:92:30:92:30 | [finally: continue] 3 |  |
-| Finally.cs:92:25:92:25 | [finally: return] access to local variable i | Finally.cs:92:30:92:30 | [finally: return] 3 |  |
 | Finally.cs:92:25:92:25 | access to local variable i | Finally.cs:92:30:92:30 | 3 |  |
 | Finally.cs:92:25:92:30 | ... == ... | Finally.cs:93:31:93:45 | object creation of type Exception | true |
 | Finally.cs:92:25:92:30 | ... == ... | Finally.cs:96:17:98:17 | {...} | false |
-| Finally.cs:92:25:92:30 | [finally: break] ... == ... | Finally.cs:93:31:93:45 | [finally: break] object creation of type Exception | true |
-| Finally.cs:92:25:92:30 | [finally: break] ... == ... | Finally.cs:96:17:98:17 | [finally: break] {...} | false |
-| Finally.cs:92:25:92:30 | [finally: continue] ... == ... | Finally.cs:93:31:93:45 | [finally: continue] object creation of type Exception | true |
-| Finally.cs:92:25:92:30 | [finally: continue] ... == ... | Finally.cs:96:17:98:17 | [finally: continue] {...} | false |
-| Finally.cs:92:25:92:30 | [finally: return] ... == ... | Finally.cs:93:31:93:45 | [finally: return] object creation of type Exception | true |
-| Finally.cs:92:25:92:30 | [finally: return] ... == ... | Finally.cs:96:17:98:17 | [finally: return] {...} | false |
 | Finally.cs:92:30:92:30 | 3 | Finally.cs:92:25:92:30 | ... == ... |  |
-| Finally.cs:92:30:92:30 | [finally: break] 3 | Finally.cs:92:25:92:30 | [finally: break] ... == ... |  |
-| Finally.cs:92:30:92:30 | [finally: continue] 3 | Finally.cs:92:25:92:30 | [finally: continue] ... == ... |  |
-| Finally.cs:92:30:92:30 | [finally: return] 3 | Finally.cs:92:25:92:30 | [finally: return] ... == ... |  |
-| Finally.cs:93:25:93:46 | [finally: break] throw ...; | Finally.cs:96:17:98:17 | [finally: break, finally(1): exception(Exception)] {...} | exception(Exception) |
-| Finally.cs:93:25:93:46 | [finally: continue] throw ...; | Finally.cs:96:17:98:17 | [finally: continue, finally(1): exception(Exception)] {...} | exception(Exception) |
-| Finally.cs:93:25:93:46 | [finally: return] throw ...; | Finally.cs:96:17:98:17 | [finally: return, finally(1): exception(Exception)] {...} | exception(Exception) |
-| Finally.cs:93:25:93:46 | throw ...; | Finally.cs:96:17:98:17 | [finally(1): exception(Exception)] {...} | exception(Exception) |
-| Finally.cs:93:31:93:45 | [finally: break] object creation of type Exception | Finally.cs:93:25:93:46 | [finally: break] throw ...; |  |
-| Finally.cs:93:31:93:45 | [finally: break] object creation of type Exception | Finally.cs:96:17:98:17 | [finally: break, finally(1): exception(Exception)] {...} | exception(Exception) |
-| Finally.cs:93:31:93:45 | [finally: continue] object creation of type Exception | Finally.cs:93:25:93:46 | [finally: continue] throw ...; |  |
-| Finally.cs:93:31:93:45 | [finally: continue] object creation of type Exception | Finally.cs:96:17:98:17 | [finally: continue, finally(1): exception(Exception)] {...} | exception(Exception) |
-| Finally.cs:93:31:93:45 | [finally: return] object creation of type Exception | Finally.cs:93:25:93:46 | [finally: return] throw ...; |  |
-| Finally.cs:93:31:93:45 | [finally: return] object creation of type Exception | Finally.cs:96:17:98:17 | [finally: return, finally(1): exception(Exception)] {...} | exception(Exception) |
+| Finally.cs:93:25:93:46 | throw ...; | Finally.cs:96:17:98:17 | {...} | exception |
 | Finally.cs:93:31:93:45 | object creation of type Exception | Finally.cs:93:25:93:46 | throw ...; |  |
-| Finally.cs:93:31:93:45 | object creation of type Exception | Finally.cs:96:17:98:17 | [finally(1): exception(Exception)] {...} | exception(Exception) |
-| Finally.cs:96:17:98:17 | [finally(1): exception(Exception)] {...} | Finally.cs:97:21:97:24 | [finally(1): exception(Exception)] ...; |  |
-| Finally.cs:96:17:98:17 | [finally: break, finally(1): exception(Exception)] {...} | Finally.cs:97:21:97:24 | [finally: break, finally(1): exception(Exception)] ...; |  |
-| Finally.cs:96:17:98:17 | [finally: break] {...} | Finally.cs:97:21:97:24 | [finally: break] ...; |  |
-| Finally.cs:96:17:98:17 | [finally: continue, finally(1): exception(Exception)] {...} | Finally.cs:97:21:97:24 | [finally: continue, finally(1): exception(Exception)] ...; |  |
-| Finally.cs:96:17:98:17 | [finally: continue] {...} | Finally.cs:97:21:97:24 | [finally: continue] ...; |  |
-| Finally.cs:96:17:98:17 | [finally: return, finally(1): exception(Exception)] {...} | Finally.cs:97:21:97:24 | [finally: return, finally(1): exception(Exception)] ...; |  |
-| Finally.cs:96:17:98:17 | [finally: return] {...} | Finally.cs:97:21:97:24 | [finally: return] ...; |  |
+| Finally.cs:93:31:93:45 | object creation of type Exception | Finally.cs:96:17:98:17 | {...} | exception |
 | Finally.cs:96:17:98:17 | {...} | Finally.cs:97:21:97:24 | ...; |  |
-| Finally.cs:97:21:97:21 | [finally(1): exception(Exception)] access to local variable i | Finally.cs:97:21:97:23 | [finally(1): exception(Exception)] ...-- |  |
-| Finally.cs:97:21:97:21 | [finally: break, finally(1): exception(Exception)] access to local variable i | Finally.cs:97:21:97:23 | [finally: break, finally(1): exception(Exception)] ...-- |  |
-| Finally.cs:97:21:97:21 | [finally: break] access to local variable i | Finally.cs:97:21:97:23 | [finally: break] ...-- |  |
-| Finally.cs:97:21:97:21 | [finally: continue, finally(1): exception(Exception)] access to local variable i | Finally.cs:97:21:97:23 | [finally: continue, finally(1): exception(Exception)] ...-- |  |
-| Finally.cs:97:21:97:21 | [finally: continue] access to local variable i | Finally.cs:97:21:97:23 | [finally: continue] ...-- |  |
-| Finally.cs:97:21:97:21 | [finally: return, finally(1): exception(Exception)] access to local variable i | Finally.cs:97:21:97:23 | [finally: return, finally(1): exception(Exception)] ...-- |  |
-| Finally.cs:97:21:97:21 | [finally: return] access to local variable i | Finally.cs:97:21:97:23 | [finally: return] ...-- |  |
 | Finally.cs:97:21:97:21 | access to local variable i | Finally.cs:97:21:97:23 | ...-- |  |
-| Finally.cs:97:21:97:23 | ...-- | Finally.cs:77:16:77:16 | access to local variable i |  |
-| Finally.cs:97:21:97:23 | [finally(1): exception(Exception)] ...-- | Finally.cs:74:10:74:11 | exit M4 (abnormal) | exception(Exception) |
-| Finally.cs:97:21:97:23 | [finally: break, finally(1): exception(Exception)] ...-- | Finally.cs:74:10:74:11 | exit M4 (abnormal) | exception(Exception) |
-| Finally.cs:97:21:97:23 | [finally: break] ...-- | Finally.cs:74:10:74:11 | exit M4 (normal) | break |
-| Finally.cs:97:21:97:23 | [finally: continue, finally(1): exception(Exception)] ...-- | Finally.cs:74:10:74:11 | exit M4 (abnormal) | exception(Exception) |
-| Finally.cs:97:21:97:23 | [finally: continue] ...-- | Finally.cs:77:16:77:16 | access to local variable i | continue |
-| Finally.cs:97:21:97:23 | [finally: return, finally(1): exception(Exception)] ...-- | Finally.cs:74:10:74:11 | exit M4 (abnormal) | exception(Exception) |
-| Finally.cs:97:21:97:23 | [finally: return] ...-- | Finally.cs:74:10:74:11 | exit M4 (normal) | return |
+| Finally.cs:97:21:97:23 | ...-- | Finally.cs:74:10:74:11 | exit M4 (abnormal) | exception |
+| Finally.cs:97:21:97:23 | ...-- | Finally.cs:74:10:74:11 | exit M4 (normal) | break, return |
+| Finally.cs:97:21:97:23 | ...-- | Finally.cs:77:16:77:16 | access to local variable i | , continue |
 | Finally.cs:97:21:97:24 | ...; | Finally.cs:97:21:97:21 | access to local variable i |  |
-| Finally.cs:97:21:97:24 | [finally(1): exception(Exception)] ...; | Finally.cs:97:21:97:21 | [finally(1): exception(Exception)] access to local variable i |  |
-| Finally.cs:97:21:97:24 | [finally: break, finally(1): exception(Exception)] ...; | Finally.cs:97:21:97:21 | [finally: break, finally(1): exception(Exception)] access to local variable i |  |
-| Finally.cs:97:21:97:24 | [finally: break] ...; | Finally.cs:97:21:97:21 | [finally: break] access to local variable i |  |
-| Finally.cs:97:21:97:24 | [finally: continue, finally(1): exception(Exception)] ...; | Finally.cs:97:21:97:21 | [finally: continue, finally(1): exception(Exception)] access to local variable i |  |
-| Finally.cs:97:21:97:24 | [finally: continue] ...; | Finally.cs:97:21:97:21 | [finally: continue] access to local variable i |  |
-| Finally.cs:97:21:97:24 | [finally: return, finally(1): exception(Exception)] ...; | Finally.cs:97:21:97:21 | [finally: return, finally(1): exception(Exception)] access to local variable i |  |
-| Finally.cs:97:21:97:24 | [finally: return] ...; | Finally.cs:97:21:97:21 | [finally: return] access to local variable i |  |
 | Finally.cs:103:10:103:11 | enter M5 | Finally.cs:104:5:119:5 | {...} |  |
 | Finally.cs:103:10:103:11 | exit M5 (abnormal) | Finally.cs:103:10:103:11 | exit M5 |  |
 | Finally.cs:103:10:103:11 | exit M5 (normal) | Finally.cs:103:10:103:11 | exit M5 |  |
@@ -2130,148 +1786,52 @@
 | Finally.cs:106:9:111:9 | {...} | Finally.cs:107:13:108:23 | if (...) ... |  |
 | Finally.cs:107:13:108:23 | if (...) ... | Finally.cs:107:17:107:21 | this access |  |
 | Finally.cs:107:17:107:21 | access to field Field | Finally.cs:107:17:107:28 | access to property Length |  |
-| Finally.cs:107:17:107:21 | access to field Field | Finally.cs:113:9:118:9 | [finally: exception(NullReferenceException)] {...} | exception(NullReferenceException) |
+| Finally.cs:107:17:107:21 | access to field Field | Finally.cs:113:9:118:9 | {...} | exception |
 | Finally.cs:107:17:107:21 | this access | Finally.cs:107:17:107:21 | access to field Field |  |
 | Finally.cs:107:17:107:28 | access to property Length | Finally.cs:107:33:107:33 | 0 |  |
-| Finally.cs:107:17:107:28 | access to property Length | Finally.cs:113:9:118:9 | [finally: exception(Exception)] {...} | exception(Exception) |
-| Finally.cs:107:17:107:28 | access to property Length | Finally.cs:113:9:118:9 | [finally: exception(NullReferenceException)] {...} | exception(NullReferenceException) |
+| Finally.cs:107:17:107:28 | access to property Length | Finally.cs:113:9:118:9 | {...} | exception |
 | Finally.cs:107:17:107:33 | ... == ... | Finally.cs:108:17:108:23 | return ...; | true |
 | Finally.cs:107:17:107:33 | ... == ... | Finally.cs:109:13:110:49 | if (...) ... | false |
 | Finally.cs:107:33:107:33 | 0 | Finally.cs:107:17:107:33 | ... == ... |  |
-| Finally.cs:108:17:108:23 | return ...; | Finally.cs:113:9:118:9 | [finally: return] {...} | return |
+| Finally.cs:108:17:108:23 | return ...; | Finally.cs:113:9:118:9 | {...} | return |
 | Finally.cs:109:13:110:49 | if (...) ... | Finally.cs:109:17:109:21 | this access |  |
 | Finally.cs:109:17:109:21 | access to field Field | Finally.cs:109:17:109:28 | access to property Length |  |
-| Finally.cs:109:17:109:21 | access to field Field | Finally.cs:113:9:118:9 | [finally: exception(NullReferenceException)] {...} | exception(NullReferenceException) |
+| Finally.cs:109:17:109:21 | access to field Field | Finally.cs:113:9:118:9 | {...} | exception |
 | Finally.cs:109:17:109:21 | this access | Finally.cs:109:17:109:21 | access to field Field |  |
 | Finally.cs:109:17:109:28 | access to property Length | Finally.cs:109:33:109:33 | 1 |  |
-| Finally.cs:109:17:109:28 | access to property Length | Finally.cs:113:9:118:9 | [finally: exception(Exception)] {...} | exception(Exception) |
-| Finally.cs:109:17:109:28 | access to property Length | Finally.cs:113:9:118:9 | [finally: exception(NullReferenceException)] {...} | exception(NullReferenceException) |
+| Finally.cs:109:17:109:28 | access to property Length | Finally.cs:113:9:118:9 | {...} | exception |
 | Finally.cs:109:17:109:33 | ... == ... | Finally.cs:110:23:110:48 | object creation of type OutOfMemoryException | true |
 | Finally.cs:109:17:109:33 | ... == ... | Finally.cs:113:9:118:9 | {...} | false |
 | Finally.cs:109:33:109:33 | 1 | Finally.cs:109:17:109:33 | ... == ... |  |
-| Finally.cs:110:17:110:49 | throw ...; | Finally.cs:113:9:118:9 | [finally: exception(OutOfMemoryException)] {...} | exception(OutOfMemoryException) |
+| Finally.cs:110:17:110:49 | throw ...; | Finally.cs:113:9:118:9 | {...} | exception |
 | Finally.cs:110:23:110:48 | object creation of type OutOfMemoryException | Finally.cs:110:17:110:49 | throw ...; |  |
-| Finally.cs:110:23:110:48 | object creation of type OutOfMemoryException | Finally.cs:113:9:118:9 | [finally: exception(Exception)] {...} | exception(Exception) |
-| Finally.cs:113:9:118:9 | [finally: exception(Exception)] {...} | Finally.cs:114:13:115:41 | [finally: exception(Exception)] if (...) ... |  |
-| Finally.cs:113:9:118:9 | [finally: exception(NullReferenceException)] {...} | Finally.cs:114:13:115:41 | [finally: exception(NullReferenceException)] if (...) ... |  |
-| Finally.cs:113:9:118:9 | [finally: exception(OutOfMemoryException)] {...} | Finally.cs:114:13:115:41 | [finally: exception(OutOfMemoryException)] if (...) ... |  |
-| Finally.cs:113:9:118:9 | [finally: return] {...} | Finally.cs:114:13:115:41 | [finally: return] if (...) ... |  |
+| Finally.cs:110:23:110:48 | object creation of type OutOfMemoryException | Finally.cs:113:9:118:9 | {...} | exception |
 | Finally.cs:113:9:118:9 | {...} | Finally.cs:114:13:115:41 | if (...) ... |  |
-| Finally.cs:114:13:115:41 | [finally: exception(Exception)] if (...) ... | Finally.cs:114:19:114:23 | [finally: exception(Exception)] this access |  |
-| Finally.cs:114:13:115:41 | [finally: exception(NullReferenceException)] if (...) ... | Finally.cs:114:19:114:23 | [finally: exception(NullReferenceException)] this access |  |
-| Finally.cs:114:13:115:41 | [finally: exception(OutOfMemoryException)] if (...) ... | Finally.cs:114:19:114:23 | [finally: exception(OutOfMemoryException)] this access |  |
-| Finally.cs:114:13:115:41 | [finally: return] if (...) ... | Finally.cs:114:19:114:23 | [finally: return] this access |  |
 | Finally.cs:114:13:115:41 | if (...) ... | Finally.cs:114:19:114:23 | this access |  |
-| Finally.cs:114:17:114:36 | [false, finally: exception(Exception)] !... | Finally.cs:116:13:117:37 | [finally: exception(Exception)] if (...) ... | false |
-| Finally.cs:114:17:114:36 | [false, finally: exception(NullReferenceException)] !... | Finally.cs:116:13:117:37 | [finally: exception(NullReferenceException)] if (...) ... | false |
-| Finally.cs:114:17:114:36 | [false, finally: exception(OutOfMemoryException)] !... | Finally.cs:116:13:117:37 | [finally: exception(OutOfMemoryException)] if (...) ... | false |
-| Finally.cs:114:17:114:36 | [false, finally: return] !... | Finally.cs:116:13:117:37 | [finally: return] if (...) ... | false |
 | Finally.cs:114:17:114:36 | [false] !... | Finally.cs:116:13:117:37 | if (...) ... | false |
-| Finally.cs:114:17:114:36 | [true, finally: exception(Exception)] !... | Finally.cs:115:17:115:41 | [finally: exception(Exception)] ...; | true |
-| Finally.cs:114:17:114:36 | [true, finally: exception(NullReferenceException)] !... | Finally.cs:115:17:115:41 | [finally: exception(NullReferenceException)] ...; | true |
-| Finally.cs:114:17:114:36 | [true, finally: exception(OutOfMemoryException)] !... | Finally.cs:115:17:115:41 | [finally: exception(OutOfMemoryException)] ...; | true |
-| Finally.cs:114:17:114:36 | [true, finally: return] !... | Finally.cs:115:17:115:41 | [finally: return] ...; | true |
 | Finally.cs:114:17:114:36 | [true] !... | Finally.cs:115:17:115:41 | ...; | true |
-| Finally.cs:114:19:114:23 | [finally: exception(Exception)] access to field Field | Finally.cs:114:19:114:30 | [finally: exception(Exception)] access to property Length |  |
-| Finally.cs:114:19:114:23 | [finally: exception(Exception)] this access | Finally.cs:114:19:114:23 | [finally: exception(Exception)] access to field Field |  |
-| Finally.cs:114:19:114:23 | [finally: exception(NullReferenceException)] access to field Field | Finally.cs:114:19:114:30 | [finally: exception(NullReferenceException)] access to property Length |  |
-| Finally.cs:114:19:114:23 | [finally: exception(NullReferenceException)] this access | Finally.cs:114:19:114:23 | [finally: exception(NullReferenceException)] access to field Field |  |
-| Finally.cs:114:19:114:23 | [finally: exception(OutOfMemoryException)] access to field Field | Finally.cs:114:19:114:30 | [finally: exception(OutOfMemoryException)] access to property Length |  |
-| Finally.cs:114:19:114:23 | [finally: exception(OutOfMemoryException)] this access | Finally.cs:114:19:114:23 | [finally: exception(OutOfMemoryException)] access to field Field |  |
-| Finally.cs:114:19:114:23 | [finally: return] access to field Field | Finally.cs:114:19:114:30 | [finally: return] access to property Length |  |
-| Finally.cs:114:19:114:23 | [finally: return] this access | Finally.cs:114:19:114:23 | [finally: return] access to field Field |  |
 | Finally.cs:114:19:114:23 | access to field Field | Finally.cs:114:19:114:30 | access to property Length |  |
 | Finally.cs:114:19:114:23 | this access | Finally.cs:114:19:114:23 | access to field Field |  |
-| Finally.cs:114:19:114:30 | [finally: exception(Exception)] access to property Length | Finally.cs:114:35:114:35 | [finally: exception(Exception)] 0 |  |
-| Finally.cs:114:19:114:30 | [finally: exception(NullReferenceException)] access to property Length | Finally.cs:114:35:114:35 | [finally: exception(NullReferenceException)] 0 |  |
-| Finally.cs:114:19:114:30 | [finally: exception(OutOfMemoryException)] access to property Length | Finally.cs:114:35:114:35 | [finally: exception(OutOfMemoryException)] 0 |  |
-| Finally.cs:114:19:114:30 | [finally: return] access to property Length | Finally.cs:114:35:114:35 | [finally: return] 0 |  |
 | Finally.cs:114:19:114:30 | access to property Length | Finally.cs:114:35:114:35 | 0 |  |
 | Finally.cs:114:19:114:35 | ... == ... | Finally.cs:114:17:114:36 | [false] !... | true |
 | Finally.cs:114:19:114:35 | ... == ... | Finally.cs:114:17:114:36 | [true] !... | false |
-| Finally.cs:114:19:114:35 | [finally: exception(Exception)] ... == ... | Finally.cs:114:17:114:36 | [false, finally: exception(Exception)] !... | true |
-| Finally.cs:114:19:114:35 | [finally: exception(Exception)] ... == ... | Finally.cs:114:17:114:36 | [true, finally: exception(Exception)] !... | false |
-| Finally.cs:114:19:114:35 | [finally: exception(NullReferenceException)] ... == ... | Finally.cs:114:17:114:36 | [false, finally: exception(NullReferenceException)] !... | true |
-| Finally.cs:114:19:114:35 | [finally: exception(NullReferenceException)] ... == ... | Finally.cs:114:17:114:36 | [true, finally: exception(NullReferenceException)] !... | false |
-| Finally.cs:114:19:114:35 | [finally: exception(OutOfMemoryException)] ... == ... | Finally.cs:114:17:114:36 | [false, finally: exception(OutOfMemoryException)] !... | true |
-| Finally.cs:114:19:114:35 | [finally: exception(OutOfMemoryException)] ... == ... | Finally.cs:114:17:114:36 | [true, finally: exception(OutOfMemoryException)] !... | false |
-| Finally.cs:114:19:114:35 | [finally: return] ... == ... | Finally.cs:114:17:114:36 | [false, finally: return] !... | true |
-| Finally.cs:114:19:114:35 | [finally: return] ... == ... | Finally.cs:114:17:114:36 | [true, finally: return] !... | false |
 | Finally.cs:114:35:114:35 | 0 | Finally.cs:114:19:114:35 | ... == ... |  |
-| Finally.cs:114:35:114:35 | [finally: exception(Exception)] 0 | Finally.cs:114:19:114:35 | [finally: exception(Exception)] ... == ... |  |
-| Finally.cs:114:35:114:35 | [finally: exception(NullReferenceException)] 0 | Finally.cs:114:19:114:35 | [finally: exception(NullReferenceException)] ... == ... |  |
-| Finally.cs:114:35:114:35 | [finally: exception(OutOfMemoryException)] 0 | Finally.cs:114:19:114:35 | [finally: exception(OutOfMemoryException)] ... == ... |  |
-| Finally.cs:114:35:114:35 | [finally: return] 0 | Finally.cs:114:19:114:35 | [finally: return] ... == ... |  |
-| Finally.cs:115:17:115:40 | [finally: exception(Exception)] call to method WriteLine | Finally.cs:116:13:117:37 | [finally: exception(Exception)] if (...) ... |  |
-| Finally.cs:115:17:115:40 | [finally: exception(NullReferenceException)] call to method WriteLine | Finally.cs:116:13:117:37 | [finally: exception(NullReferenceException)] if (...) ... |  |
-| Finally.cs:115:17:115:40 | [finally: exception(OutOfMemoryException)] call to method WriteLine | Finally.cs:116:13:117:37 | [finally: exception(OutOfMemoryException)] if (...) ... |  |
-| Finally.cs:115:17:115:40 | [finally: return] call to method WriteLine | Finally.cs:116:13:117:37 | [finally: return] if (...) ... |  |
 | Finally.cs:115:17:115:40 | call to method WriteLine | Finally.cs:116:13:117:37 | if (...) ... |  |
 | Finally.cs:115:17:115:41 | ...; | Finally.cs:115:35:115:39 | this access |  |
-| Finally.cs:115:17:115:41 | [finally: exception(Exception)] ...; | Finally.cs:115:35:115:39 | [finally: exception(Exception)] this access |  |
-| Finally.cs:115:17:115:41 | [finally: exception(NullReferenceException)] ...; | Finally.cs:115:35:115:39 | [finally: exception(NullReferenceException)] this access |  |
-| Finally.cs:115:17:115:41 | [finally: exception(OutOfMemoryException)] ...; | Finally.cs:115:35:115:39 | [finally: exception(OutOfMemoryException)] this access |  |
-| Finally.cs:115:17:115:41 | [finally: return] ...; | Finally.cs:115:35:115:39 | [finally: return] this access |  |
-| Finally.cs:115:35:115:39 | [finally: exception(Exception)] access to field Field | Finally.cs:115:17:115:40 | [finally: exception(Exception)] call to method WriteLine |  |
-| Finally.cs:115:35:115:39 | [finally: exception(Exception)] this access | Finally.cs:115:35:115:39 | [finally: exception(Exception)] access to field Field |  |
-| Finally.cs:115:35:115:39 | [finally: exception(NullReferenceException)] access to field Field | Finally.cs:115:17:115:40 | [finally: exception(NullReferenceException)] call to method WriteLine |  |
-| Finally.cs:115:35:115:39 | [finally: exception(NullReferenceException)] this access | Finally.cs:115:35:115:39 | [finally: exception(NullReferenceException)] access to field Field |  |
-| Finally.cs:115:35:115:39 | [finally: exception(OutOfMemoryException)] access to field Field | Finally.cs:115:17:115:40 | [finally: exception(OutOfMemoryException)] call to method WriteLine |  |
-| Finally.cs:115:35:115:39 | [finally: exception(OutOfMemoryException)] this access | Finally.cs:115:35:115:39 | [finally: exception(OutOfMemoryException)] access to field Field |  |
-| Finally.cs:115:35:115:39 | [finally: return] access to field Field | Finally.cs:115:17:115:40 | [finally: return] call to method WriteLine |  |
-| Finally.cs:115:35:115:39 | [finally: return] this access | Finally.cs:115:35:115:39 | [finally: return] access to field Field |  |
 | Finally.cs:115:35:115:39 | access to field Field | Finally.cs:115:17:115:40 | call to method WriteLine |  |
 | Finally.cs:115:35:115:39 | this access | Finally.cs:115:35:115:39 | access to field Field |  |
-| Finally.cs:116:13:117:37 | [finally: exception(Exception)] if (...) ... | Finally.cs:116:17:116:21 | [finally: exception(Exception)] this access |  |
-| Finally.cs:116:13:117:37 | [finally: exception(NullReferenceException)] if (...) ... | Finally.cs:116:17:116:21 | [finally: exception(NullReferenceException)] this access |  |
-| Finally.cs:116:13:117:37 | [finally: exception(OutOfMemoryException)] if (...) ... | Finally.cs:116:17:116:21 | [finally: exception(OutOfMemoryException)] this access |  |
-| Finally.cs:116:13:117:37 | [finally: return] if (...) ... | Finally.cs:116:17:116:21 | [finally: return] this access |  |
 | Finally.cs:116:13:117:37 | if (...) ... | Finally.cs:116:17:116:21 | this access |  |
-| Finally.cs:116:17:116:21 | [finally: exception(Exception)] access to field Field | Finally.cs:116:17:116:28 | [finally: exception(Exception)] access to property Length |  |
-| Finally.cs:116:17:116:21 | [finally: exception(Exception)] this access | Finally.cs:116:17:116:21 | [finally: exception(Exception)] access to field Field |  |
-| Finally.cs:116:17:116:21 | [finally: exception(NullReferenceException)] access to field Field | Finally.cs:116:17:116:28 | [finally: exception(NullReferenceException)] access to property Length |  |
-| Finally.cs:116:17:116:21 | [finally: exception(NullReferenceException)] this access | Finally.cs:116:17:116:21 | [finally: exception(NullReferenceException)] access to field Field |  |
-| Finally.cs:116:17:116:21 | [finally: exception(OutOfMemoryException)] access to field Field | Finally.cs:116:17:116:28 | [finally: exception(OutOfMemoryException)] access to property Length |  |
-| Finally.cs:116:17:116:21 | [finally: exception(OutOfMemoryException)] this access | Finally.cs:116:17:116:21 | [finally: exception(OutOfMemoryException)] access to field Field |  |
-| Finally.cs:116:17:116:21 | [finally: return] access to field Field | Finally.cs:116:17:116:28 | [finally: return] access to property Length |  |
-| Finally.cs:116:17:116:21 | [finally: return] this access | Finally.cs:116:17:116:21 | [finally: return] access to field Field |  |
 | Finally.cs:116:17:116:21 | access to field Field | Finally.cs:116:17:116:28 | access to property Length |  |
 | Finally.cs:116:17:116:21 | this access | Finally.cs:116:17:116:21 | access to field Field |  |
-| Finally.cs:116:17:116:28 | [finally: exception(Exception)] access to property Length | Finally.cs:116:32:116:32 | [finally: exception(Exception)] 0 |  |
-| Finally.cs:116:17:116:28 | [finally: exception(NullReferenceException)] access to property Length | Finally.cs:116:32:116:32 | [finally: exception(NullReferenceException)] 0 |  |
-| Finally.cs:116:17:116:28 | [finally: exception(OutOfMemoryException)] access to property Length | Finally.cs:116:32:116:32 | [finally: exception(OutOfMemoryException)] 0 |  |
-| Finally.cs:116:17:116:28 | [finally: return] access to property Length | Finally.cs:116:32:116:32 | [finally: return] 0 |  |
 | Finally.cs:116:17:116:28 | access to property Length | Finally.cs:116:32:116:32 | 0 |  |
-| Finally.cs:116:17:116:32 | ... > ... | Finally.cs:103:10:103:11 | exit M5 (normal) | false |
+| Finally.cs:116:17:116:32 | ... > ... | Finally.cs:103:10:103:11 | exit M5 (abnormal) | exception |
+| Finally.cs:116:17:116:32 | ... > ... | Finally.cs:103:10:103:11 | exit M5 (normal) | false, return |
 | Finally.cs:116:17:116:32 | ... > ... | Finally.cs:117:17:117:37 | ...; | true |
-| Finally.cs:116:17:116:32 | [finally: exception(Exception)] ... > ... | Finally.cs:103:10:103:11 | exit M5 (abnormal) | exception(Exception) |
-| Finally.cs:116:17:116:32 | [finally: exception(Exception)] ... > ... | Finally.cs:117:17:117:37 | [finally: exception(Exception)] ...; | true |
-| Finally.cs:116:17:116:32 | [finally: exception(NullReferenceException)] ... > ... | Finally.cs:103:10:103:11 | exit M5 (abnormal) | exception(NullReferenceException) |
-| Finally.cs:116:17:116:32 | [finally: exception(NullReferenceException)] ... > ... | Finally.cs:117:17:117:37 | [finally: exception(NullReferenceException)] ...; | true |
-| Finally.cs:116:17:116:32 | [finally: exception(OutOfMemoryException)] ... > ... | Finally.cs:103:10:103:11 | exit M5 (abnormal) | exception(OutOfMemoryException) |
-| Finally.cs:116:17:116:32 | [finally: exception(OutOfMemoryException)] ... > ... | Finally.cs:117:17:117:37 | [finally: exception(OutOfMemoryException)] ...; | true |
-| Finally.cs:116:17:116:32 | [finally: return] ... > ... | Finally.cs:103:10:103:11 | exit M5 (normal) | return |
-| Finally.cs:116:17:116:32 | [finally: return] ... > ... | Finally.cs:117:17:117:37 | [finally: return] ...; | true |
 | Finally.cs:116:32:116:32 | 0 | Finally.cs:116:17:116:32 | ... > ... |  |
-| Finally.cs:116:32:116:32 | [finally: exception(Exception)] 0 | Finally.cs:116:17:116:32 | [finally: exception(Exception)] ... > ... |  |
-| Finally.cs:116:32:116:32 | [finally: exception(NullReferenceException)] 0 | Finally.cs:116:17:116:32 | [finally: exception(NullReferenceException)] ... > ... |  |
-| Finally.cs:116:32:116:32 | [finally: exception(OutOfMemoryException)] 0 | Finally.cs:116:17:116:32 | [finally: exception(OutOfMemoryException)] ... > ... |  |
-| Finally.cs:116:32:116:32 | [finally: return] 0 | Finally.cs:116:17:116:32 | [finally: return] ... > ... |  |
-| Finally.cs:117:17:117:36 | [finally: exception(Exception)] call to method WriteLine | Finally.cs:103:10:103:11 | exit M5 (abnormal) | exception(Exception) |
-| Finally.cs:117:17:117:36 | [finally: exception(NullReferenceException)] call to method WriteLine | Finally.cs:103:10:103:11 | exit M5 (abnormal) | exception(NullReferenceException) |
-| Finally.cs:117:17:117:36 | [finally: exception(OutOfMemoryException)] call to method WriteLine | Finally.cs:103:10:103:11 | exit M5 (abnormal) | exception(OutOfMemoryException) |
-| Finally.cs:117:17:117:36 | [finally: return] call to method WriteLine | Finally.cs:103:10:103:11 | exit M5 (normal) | return |
-| Finally.cs:117:17:117:36 | call to method WriteLine | Finally.cs:103:10:103:11 | exit M5 (normal) |  |
+| Finally.cs:117:17:117:36 | call to method WriteLine | Finally.cs:103:10:103:11 | exit M5 (abnormal) | exception |
+| Finally.cs:117:17:117:36 | call to method WriteLine | Finally.cs:103:10:103:11 | exit M5 (normal) | , return |
 | Finally.cs:117:17:117:37 | ...; | Finally.cs:117:35:117:35 | 1 |  |
-| Finally.cs:117:17:117:37 | [finally: exception(Exception)] ...; | Finally.cs:117:35:117:35 | [finally: exception(Exception)] 1 |  |
-| Finally.cs:117:17:117:37 | [finally: exception(NullReferenceException)] ...; | Finally.cs:117:35:117:35 | [finally: exception(NullReferenceException)] 1 |  |
-| Finally.cs:117:17:117:37 | [finally: exception(OutOfMemoryException)] ...; | Finally.cs:117:35:117:35 | [finally: exception(OutOfMemoryException)] 1 |  |
-| Finally.cs:117:17:117:37 | [finally: return] ...; | Finally.cs:117:35:117:35 | [finally: return] 1 |  |
 | Finally.cs:117:35:117:35 | 1 | Finally.cs:117:17:117:36 | call to method WriteLine |  |
-| Finally.cs:117:35:117:35 | [finally: exception(Exception)] 1 | Finally.cs:117:17:117:36 | [finally: exception(Exception)] call to method WriteLine |  |
-| Finally.cs:117:35:117:35 | [finally: exception(NullReferenceException)] 1 | Finally.cs:117:17:117:36 | [finally: exception(NullReferenceException)] call to method WriteLine |  |
-| Finally.cs:117:35:117:35 | [finally: exception(OutOfMemoryException)] 1 | Finally.cs:117:17:117:36 | [finally: exception(OutOfMemoryException)] call to method WriteLine |  |
-| Finally.cs:117:35:117:35 | [finally: return] 1 | Finally.cs:117:17:117:36 | [finally: return] call to method WriteLine |  |
 | Finally.cs:121:10:121:11 | enter M6 | Finally.cs:122:5:131:5 | {...} |  |
 | Finally.cs:121:10:121:11 | exit M6 (normal) | Finally.cs:121:10:121:11 | exit M6 |  |
 | Finally.cs:122:5:131:5 | {...} | Finally.cs:123:9:130:9 | try {...} ... |  |
@@ -2288,18 +1848,13 @@
 | Finally.cs:134:5:145:5 | {...} | Finally.cs:135:9:143:9 | try {...} ... |  |
 | Finally.cs:135:9:143:9 | try {...} ... | Finally.cs:136:9:138:9 | {...} |  |
 | Finally.cs:136:9:138:9 | {...} | Finally.cs:137:13:137:37 | ...; |  |
-| Finally.cs:137:13:137:36 | call to method WriteLine | Finally.cs:140:9:143:9 | [finally: exception(Exception)] {...} | exception(Exception) |
-| Finally.cs:137:13:137:36 | call to method WriteLine | Finally.cs:140:9:143:9 | {...} |  |
+| Finally.cs:137:13:137:36 | call to method WriteLine | Finally.cs:140:9:143:9 | {...} | , exception |
 | Finally.cs:137:13:137:37 | ...; | Finally.cs:137:31:137:35 | "Try" |  |
 | Finally.cs:137:31:137:35 | "Try" | Finally.cs:137:13:137:36 | call to method WriteLine |  |
-| Finally.cs:140:9:143:9 | [finally: exception(Exception)] {...} | Finally.cs:141:41:141:42 | [finally: exception(Exception)] "" |  |
 | Finally.cs:140:9:143:9 | {...} | Finally.cs:141:41:141:42 | "" |  |
-| Finally.cs:141:13:141:44 | [finally: exception(Exception)] throw ...; | Finally.cs:133:10:133:11 | exit M7 (abnormal) | exception(ArgumentException) |
-| Finally.cs:141:13:141:44 | throw ...; | Finally.cs:133:10:133:11 | exit M7 (abnormal) | exception(ArgumentException) |
-| Finally.cs:141:19:141:43 | [finally: exception(Exception)] object creation of type ArgumentException | Finally.cs:141:13:141:44 | [finally: exception(Exception)] throw ...; |  |
+| Finally.cs:141:13:141:44 | throw ...; | Finally.cs:133:10:133:11 | exit M7 (abnormal) | exception |
 | Finally.cs:141:19:141:43 | object creation of type ArgumentException | Finally.cs:141:13:141:44 | throw ...; |  |
 | Finally.cs:141:41:141:42 | "" | Finally.cs:141:19:141:43 | object creation of type ArgumentException |  |
-| Finally.cs:141:41:141:42 | [finally: exception(Exception)] "" | Finally.cs:141:19:141:43 | [finally: exception(Exception)] object creation of type ArgumentException |  |
 | Finally.cs:147:10:147:11 | enter M8 | Finally.cs:148:5:170:5 | {...} |  |
 | Finally.cs:147:10:147:11 | exit M8 (abnormal) | Finally.cs:147:10:147:11 | exit M8 |  |
 | Finally.cs:147:10:147:11 | exit M8 (normal) | Finally.cs:147:10:147:11 | exit M8 |  |
@@ -2311,129 +1866,45 @@
 | Finally.cs:151:17:151:28 | ... == ... | Finally.cs:152:23:152:49 | object creation of type ArgumentNullException | true |
 | Finally.cs:151:17:151:28 | ... == ... | Finally.cs:155:9:169:9 | {...} | false |
 | Finally.cs:151:25:151:28 | null | Finally.cs:151:17:151:28 | ... == ... |  |
-| Finally.cs:152:17:152:50 | throw ...; | Finally.cs:155:9:169:9 | [finally: exception(ArgumentNullException)] {...} | exception(ArgumentNullException) |
+| Finally.cs:152:17:152:50 | throw ...; | Finally.cs:155:9:169:9 | {...} | exception |
 | Finally.cs:152:23:152:49 | object creation of type ArgumentNullException | Finally.cs:152:17:152:50 | throw ...; |  |
-| Finally.cs:152:23:152:49 | object creation of type ArgumentNullException | Finally.cs:155:9:169:9 | [finally: exception(Exception)] {...} | exception(Exception) |
-| Finally.cs:155:9:169:9 | [finally: exception(ArgumentNullException)] {...} | Finally.cs:156:13:168:13 | [finally: exception(ArgumentNullException)] try {...} ... |  |
-| Finally.cs:155:9:169:9 | [finally: exception(Exception)] {...} | Finally.cs:156:13:168:13 | [finally: exception(Exception)] try {...} ... |  |
+| Finally.cs:152:23:152:49 | object creation of type ArgumentNullException | Finally.cs:155:9:169:9 | {...} | exception |
 | Finally.cs:155:9:169:9 | {...} | Finally.cs:156:13:168:13 | try {...} ... |  |
-| Finally.cs:156:13:168:13 | [finally: exception(ArgumentNullException)] try {...} ... | Finally.cs:157:13:160:13 | [finally: exception(ArgumentNullException)] {...} |  |
-| Finally.cs:156:13:168:13 | [finally: exception(Exception)] try {...} ... | Finally.cs:157:13:160:13 | [finally: exception(Exception)] {...} |  |
 | Finally.cs:156:13:168:13 | try {...} ... | Finally.cs:157:13:160:13 | {...} |  |
-| Finally.cs:157:13:160:13 | [finally: exception(ArgumentNullException)] {...} | Finally.cs:158:17:159:45 | [finally: exception(ArgumentNullException)] if (...) ... |  |
-| Finally.cs:157:13:160:13 | [finally: exception(Exception)] {...} | Finally.cs:158:17:159:45 | [finally: exception(Exception)] if (...) ... |  |
 | Finally.cs:157:13:160:13 | {...} | Finally.cs:158:17:159:45 | if (...) ... |  |
-| Finally.cs:158:17:159:45 | [finally: exception(ArgumentNullException)] if (...) ... | Finally.cs:158:21:158:24 | [finally: exception(ArgumentNullException)] access to parameter args |  |
-| Finally.cs:158:17:159:45 | [finally: exception(Exception)] if (...) ... | Finally.cs:158:21:158:24 | [finally: exception(Exception)] access to parameter args |  |
 | Finally.cs:158:17:159:45 | if (...) ... | Finally.cs:158:21:158:24 | access to parameter args |  |
-| Finally.cs:158:21:158:24 | [finally: exception(ArgumentNullException)] access to parameter args | Finally.cs:158:21:158:31 | [finally: exception(ArgumentNullException)] access to property Length |  |
-| Finally.cs:158:21:158:24 | [finally: exception(Exception)] access to parameter args | Finally.cs:158:21:158:31 | [finally: exception(Exception)] access to property Length |  |
 | Finally.cs:158:21:158:24 | access to parameter args | Finally.cs:158:21:158:31 | access to property Length |  |
-| Finally.cs:158:21:158:31 | [finally: exception(ArgumentNullException)] access to property Length | Finally.cs:158:36:158:36 | [finally: exception(ArgumentNullException)] 1 |  |
-| Finally.cs:158:21:158:31 | [finally: exception(ArgumentNullException)] access to property Length | Finally.cs:161:13:164:13 | [finally: exception(ArgumentNullException), exception: Exception] catch (...) {...} | exception(Exception) |
-| Finally.cs:158:21:158:31 | [finally: exception(ArgumentNullException)] access to property Length | Finally.cs:161:13:164:13 | [finally: exception(ArgumentNullException), exception: NullReferenceException] catch (...) {...} | exception(NullReferenceException) |
-| Finally.cs:158:21:158:31 | [finally: exception(Exception)] access to property Length | Finally.cs:158:36:158:36 | [finally: exception(Exception)] 1 |  |
-| Finally.cs:158:21:158:31 | [finally: exception(Exception)] access to property Length | Finally.cs:161:13:164:13 | [finally: exception(Exception), exception: Exception] catch (...) {...} | exception(Exception) |
-| Finally.cs:158:21:158:31 | [finally: exception(Exception)] access to property Length | Finally.cs:161:13:164:13 | [finally: exception(Exception), exception: NullReferenceException] catch (...) {...} | exception(NullReferenceException) |
 | Finally.cs:158:21:158:31 | access to property Length | Finally.cs:158:36:158:36 | 1 |  |
-| Finally.cs:158:21:158:31 | access to property Length | Finally.cs:161:13:164:13 | [exception: Exception] catch (...) {...} | exception(Exception) |
-| Finally.cs:158:21:158:31 | access to property Length | Finally.cs:161:13:164:13 | [exception: NullReferenceException] catch (...) {...} | exception(NullReferenceException) |
+| Finally.cs:158:21:158:31 | access to property Length | Finally.cs:161:13:164:13 | catch (...) {...} | exception |
+| Finally.cs:158:21:158:36 | ... == ... | Finally.cs:147:10:147:11 | exit M8 (abnormal) | exception |
 | Finally.cs:158:21:158:36 | ... == ... | Finally.cs:147:10:147:11 | exit M8 (normal) | false |
 | Finally.cs:158:21:158:36 | ... == ... | Finally.cs:159:41:159:43 | "1" | true |
-| Finally.cs:158:21:158:36 | [finally: exception(ArgumentNullException)] ... == ... | Finally.cs:147:10:147:11 | exit M8 (abnormal) | exception(ArgumentNullException) |
-| Finally.cs:158:21:158:36 | [finally: exception(ArgumentNullException)] ... == ... | Finally.cs:159:41:159:43 | [finally: exception(ArgumentNullException)] "1" | true |
-| Finally.cs:158:21:158:36 | [finally: exception(Exception)] ... == ... | Finally.cs:147:10:147:11 | exit M8 (abnormal) | exception(Exception) |
-| Finally.cs:158:21:158:36 | [finally: exception(Exception)] ... == ... | Finally.cs:159:41:159:43 | [finally: exception(Exception)] "1" | true |
 | Finally.cs:158:36:158:36 | 1 | Finally.cs:158:21:158:36 | ... == ... |  |
-| Finally.cs:158:36:158:36 | [finally: exception(ArgumentNullException)] 1 | Finally.cs:158:21:158:36 | [finally: exception(ArgumentNullException)] ... == ... |  |
-| Finally.cs:158:36:158:36 | [finally: exception(Exception)] 1 | Finally.cs:158:21:158:36 | [finally: exception(Exception)] ... == ... |  |
-| Finally.cs:159:21:159:45 | [finally: exception(ArgumentNullException)] throw ...; | Finally.cs:161:13:164:13 | [finally: exception(ArgumentNullException), exception: Exception] catch (...) {...} | exception(Exception) |
-| Finally.cs:159:21:159:45 | [finally: exception(Exception)] throw ...; | Finally.cs:161:13:164:13 | [finally: exception(Exception), exception: Exception] catch (...) {...} | exception(Exception) |
-| Finally.cs:159:21:159:45 | throw ...; | Finally.cs:161:13:164:13 | [exception: Exception] catch (...) {...} | exception(Exception) |
-| Finally.cs:159:27:159:44 | [finally: exception(ArgumentNullException)] object creation of type Exception | Finally.cs:159:21:159:45 | [finally: exception(ArgumentNullException)] throw ...; |  |
-| Finally.cs:159:27:159:44 | [finally: exception(ArgumentNullException)] object creation of type Exception | Finally.cs:161:13:164:13 | [finally: exception(ArgumentNullException), exception: Exception] catch (...) {...} | exception(Exception) |
-| Finally.cs:159:27:159:44 | [finally: exception(Exception)] object creation of type Exception | Finally.cs:159:21:159:45 | [finally: exception(Exception)] throw ...; |  |
-| Finally.cs:159:27:159:44 | [finally: exception(Exception)] object creation of type Exception | Finally.cs:161:13:164:13 | [finally: exception(Exception), exception: Exception] catch (...) {...} | exception(Exception) |
+| Finally.cs:159:21:159:45 | throw ...; | Finally.cs:161:13:164:13 | catch (...) {...} | exception |
 | Finally.cs:159:27:159:44 | object creation of type Exception | Finally.cs:159:21:159:45 | throw ...; |  |
-| Finally.cs:159:27:159:44 | object creation of type Exception | Finally.cs:161:13:164:13 | [exception: Exception] catch (...) {...} | exception(Exception) |
+| Finally.cs:159:27:159:44 | object creation of type Exception | Finally.cs:161:13:164:13 | catch (...) {...} | exception |
 | Finally.cs:159:41:159:43 | "1" | Finally.cs:159:27:159:44 | object creation of type Exception |  |
-| Finally.cs:159:41:159:43 | [finally: exception(ArgumentNullException)] "1" | Finally.cs:159:27:159:44 | [finally: exception(ArgumentNullException)] object creation of type Exception |  |
-| Finally.cs:159:41:159:43 | [finally: exception(Exception)] "1" | Finally.cs:159:27:159:44 | [finally: exception(Exception)] object creation of type Exception |  |
-| Finally.cs:161:13:164:13 | [exception: Exception] catch (...) {...} | Finally.cs:161:30:161:30 | [exception: Exception] Exception e | match |
-| Finally.cs:161:13:164:13 | [exception: NullReferenceException] catch (...) {...} | Finally.cs:161:30:161:30 | [exception: NullReferenceException] Exception e | match |
-| Finally.cs:161:13:164:13 | [finally: exception(ArgumentNullException), exception: Exception] catch (...) {...} | Finally.cs:161:30:161:30 | [finally: exception(ArgumentNullException), exception: Exception] Exception e | match |
-| Finally.cs:161:13:164:13 | [finally: exception(ArgumentNullException), exception: NullReferenceException] catch (...) {...} | Finally.cs:161:30:161:30 | [finally: exception(ArgumentNullException), exception: NullReferenceException] Exception e | match |
-| Finally.cs:161:13:164:13 | [finally: exception(Exception), exception: Exception] catch (...) {...} | Finally.cs:161:30:161:30 | [finally: exception(Exception), exception: Exception] Exception e | match |
-| Finally.cs:161:13:164:13 | [finally: exception(Exception), exception: NullReferenceException] catch (...) {...} | Finally.cs:161:30:161:30 | [finally: exception(Exception), exception: NullReferenceException] Exception e | match |
-| Finally.cs:161:30:161:30 | [exception: Exception] Exception e | Finally.cs:161:39:161:39 | [exception: Exception] access to local variable e |  |
-| Finally.cs:161:30:161:30 | [exception: NullReferenceException] Exception e | Finally.cs:161:39:161:39 | [exception: NullReferenceException] access to local variable e |  |
-| Finally.cs:161:30:161:30 | [finally: exception(ArgumentNullException), exception: Exception] Exception e | Finally.cs:161:39:161:39 | [finally: exception(ArgumentNullException), exception: Exception] access to local variable e |  |
-| Finally.cs:161:30:161:30 | [finally: exception(ArgumentNullException), exception: NullReferenceException] Exception e | Finally.cs:161:39:161:39 | [finally: exception(ArgumentNullException), exception: NullReferenceException] access to local variable e |  |
-| Finally.cs:161:30:161:30 | [finally: exception(Exception), exception: Exception] Exception e | Finally.cs:161:39:161:39 | [finally: exception(Exception), exception: Exception] access to local variable e |  |
-| Finally.cs:161:30:161:30 | [finally: exception(Exception), exception: NullReferenceException] Exception e | Finally.cs:161:39:161:39 | [finally: exception(Exception), exception: NullReferenceException] access to local variable e |  |
-| Finally.cs:161:39:161:39 | [exception: Exception] access to local variable e | Finally.cs:161:39:161:47 | [exception: Exception] access to property Message |  |
-| Finally.cs:161:39:161:39 | [exception: NullReferenceException] access to local variable e | Finally.cs:161:39:161:47 | [exception: NullReferenceException] access to property Message |  |
-| Finally.cs:161:39:161:39 | [finally: exception(ArgumentNullException), exception: Exception] access to local variable e | Finally.cs:161:39:161:47 | [finally: exception(ArgumentNullException), exception: Exception] access to property Message |  |
-| Finally.cs:161:39:161:39 | [finally: exception(ArgumentNullException), exception: NullReferenceException] access to local variable e | Finally.cs:161:39:161:47 | [finally: exception(ArgumentNullException), exception: NullReferenceException] access to property Message |  |
-| Finally.cs:161:39:161:39 | [finally: exception(Exception), exception: Exception] access to local variable e | Finally.cs:161:39:161:47 | [finally: exception(Exception), exception: Exception] access to property Message |  |
-| Finally.cs:161:39:161:39 | [finally: exception(Exception), exception: NullReferenceException] access to local variable e | Finally.cs:161:39:161:47 | [finally: exception(Exception), exception: NullReferenceException] access to property Message |  |
-| Finally.cs:161:39:161:47 | [exception: Exception] access to property Message | Finally.cs:161:52:161:54 | [exception: Exception] "1" |  |
-| Finally.cs:161:39:161:47 | [exception: NullReferenceException] access to property Message | Finally.cs:161:52:161:54 | [exception: NullReferenceException] "1" |  |
-| Finally.cs:161:39:161:47 | [finally: exception(ArgumentNullException), exception: Exception] access to property Message | Finally.cs:161:52:161:54 | [finally: exception(ArgumentNullException), exception: Exception] "1" |  |
-| Finally.cs:161:39:161:47 | [finally: exception(ArgumentNullException), exception: NullReferenceException] access to property Message | Finally.cs:161:52:161:54 | [finally: exception(ArgumentNullException), exception: NullReferenceException] "1" |  |
-| Finally.cs:161:39:161:47 | [finally: exception(Exception), exception: Exception] access to property Message | Finally.cs:161:52:161:54 | [finally: exception(Exception), exception: Exception] "1" |  |
-| Finally.cs:161:39:161:47 | [finally: exception(Exception), exception: NullReferenceException] access to property Message | Finally.cs:161:52:161:54 | [finally: exception(Exception), exception: NullReferenceException] "1" |  |
-| Finally.cs:161:39:161:54 | [exception: Exception] ... == ... | Finally.cs:162:13:164:13 | {...} | true |
-| Finally.cs:161:39:161:54 | [exception: Exception] ... == ... | Finally.cs:165:13:168:13 | catch {...} | false |
-| Finally.cs:161:39:161:54 | [exception: NullReferenceException] ... == ... | Finally.cs:162:13:164:13 | {...} | true |
-| Finally.cs:161:39:161:54 | [exception: NullReferenceException] ... == ... | Finally.cs:165:13:168:13 | catch {...} | false |
-| Finally.cs:161:39:161:54 | [finally: exception(ArgumentNullException), exception: Exception] ... == ... | Finally.cs:162:13:164:13 | [finally: exception(ArgumentNullException)] {...} | true |
-| Finally.cs:161:39:161:54 | [finally: exception(ArgumentNullException), exception: Exception] ... == ... | Finally.cs:165:13:168:13 | [finally: exception(ArgumentNullException)] catch {...} | false |
-| Finally.cs:161:39:161:54 | [finally: exception(ArgumentNullException), exception: NullReferenceException] ... == ... | Finally.cs:162:13:164:13 | [finally: exception(ArgumentNullException)] {...} | true |
-| Finally.cs:161:39:161:54 | [finally: exception(ArgumentNullException), exception: NullReferenceException] ... == ... | Finally.cs:165:13:168:13 | [finally: exception(ArgumentNullException)] catch {...} | false |
-| Finally.cs:161:39:161:54 | [finally: exception(Exception), exception: Exception] ... == ... | Finally.cs:162:13:164:13 | [finally: exception(Exception)] {...} | true |
-| Finally.cs:161:39:161:54 | [finally: exception(Exception), exception: Exception] ... == ... | Finally.cs:165:13:168:13 | [finally: exception(Exception)] catch {...} | false |
-| Finally.cs:161:39:161:54 | [finally: exception(Exception), exception: NullReferenceException] ... == ... | Finally.cs:162:13:164:13 | [finally: exception(Exception)] {...} | true |
-| Finally.cs:161:39:161:54 | [finally: exception(Exception), exception: NullReferenceException] ... == ... | Finally.cs:165:13:168:13 | [finally: exception(Exception)] catch {...} | false |
-| Finally.cs:161:52:161:54 | [exception: Exception] "1" | Finally.cs:161:39:161:54 | [exception: Exception] ... == ... |  |
-| Finally.cs:161:52:161:54 | [exception: NullReferenceException] "1" | Finally.cs:161:39:161:54 | [exception: NullReferenceException] ... == ... |  |
-| Finally.cs:161:52:161:54 | [finally: exception(ArgumentNullException), exception: Exception] "1" | Finally.cs:161:39:161:54 | [finally: exception(ArgumentNullException), exception: Exception] ... == ... |  |
-| Finally.cs:161:52:161:54 | [finally: exception(ArgumentNullException), exception: NullReferenceException] "1" | Finally.cs:161:39:161:54 | [finally: exception(ArgumentNullException), exception: NullReferenceException] ... == ... |  |
-| Finally.cs:161:52:161:54 | [finally: exception(Exception), exception: Exception] "1" | Finally.cs:161:39:161:54 | [finally: exception(Exception), exception: Exception] ... == ... |  |
-| Finally.cs:161:52:161:54 | [finally: exception(Exception), exception: NullReferenceException] "1" | Finally.cs:161:39:161:54 | [finally: exception(Exception), exception: NullReferenceException] ... == ... |  |
-| Finally.cs:162:13:164:13 | [finally: exception(ArgumentNullException)] {...} | Finally.cs:163:17:163:43 | [finally: exception(ArgumentNullException)] ...; |  |
-| Finally.cs:162:13:164:13 | [finally: exception(Exception)] {...} | Finally.cs:163:17:163:43 | [finally: exception(Exception)] ...; |  |
+| Finally.cs:161:13:164:13 | catch (...) {...} | Finally.cs:161:30:161:30 | Exception e | match |
+| Finally.cs:161:13:164:13 | catch (...) {...} | Finally.cs:165:13:168:13 | catch {...} | no-match |
+| Finally.cs:161:30:161:30 | Exception e | Finally.cs:161:39:161:39 | access to local variable e |  |
+| Finally.cs:161:39:161:39 | access to local variable e | Finally.cs:161:39:161:47 | access to property Message |  |
+| Finally.cs:161:39:161:47 | access to property Message | Finally.cs:161:52:161:54 | "1" |  |
+| Finally.cs:161:39:161:54 | ... == ... | Finally.cs:162:13:164:13 | {...} | true |
+| Finally.cs:161:39:161:54 | ... == ... | Finally.cs:165:13:168:13 | catch {...} | false |
+| Finally.cs:161:52:161:54 | "1" | Finally.cs:161:39:161:54 | ... == ... |  |
 | Finally.cs:162:13:164:13 | {...} | Finally.cs:163:17:163:43 | ...; |  |
-| Finally.cs:163:17:163:42 | [finally: exception(ArgumentNullException)] call to method WriteLine | Finally.cs:147:10:147:11 | exit M8 (abnormal) | exception(ArgumentNullException) |
-| Finally.cs:163:17:163:42 | [finally: exception(Exception)] call to method WriteLine | Finally.cs:147:10:147:11 | exit M8 (abnormal) | exception(Exception) |
+| Finally.cs:163:17:163:42 | call to method WriteLine | Finally.cs:147:10:147:11 | exit M8 (abnormal) | exception |
 | Finally.cs:163:17:163:42 | call to method WriteLine | Finally.cs:147:10:147:11 | exit M8 (normal) |  |
 | Finally.cs:163:17:163:43 | ...; | Finally.cs:163:35:163:38 | access to parameter args |  |
-| Finally.cs:163:17:163:43 | [finally: exception(ArgumentNullException)] ...; | Finally.cs:163:35:163:38 | [finally: exception(ArgumentNullException)] access to parameter args |  |
-| Finally.cs:163:17:163:43 | [finally: exception(Exception)] ...; | Finally.cs:163:35:163:38 | [finally: exception(Exception)] access to parameter args |  |
-| Finally.cs:163:35:163:38 | [finally: exception(ArgumentNullException)] access to parameter args | Finally.cs:163:40:163:40 | [finally: exception(ArgumentNullException)] 0 |  |
-| Finally.cs:163:35:163:38 | [finally: exception(Exception)] access to parameter args | Finally.cs:163:40:163:40 | [finally: exception(Exception)] 0 |  |
 | Finally.cs:163:35:163:38 | access to parameter args | Finally.cs:163:40:163:40 | 0 |  |
-| Finally.cs:163:35:163:41 | [finally: exception(ArgumentNullException)] access to array element | Finally.cs:163:17:163:42 | [finally: exception(ArgumentNullException)] call to method WriteLine |  |
-| Finally.cs:163:35:163:41 | [finally: exception(Exception)] access to array element | Finally.cs:163:17:163:42 | [finally: exception(Exception)] call to method WriteLine |  |
 | Finally.cs:163:35:163:41 | access to array element | Finally.cs:163:17:163:42 | call to method WriteLine |  |
 | Finally.cs:163:40:163:40 | 0 | Finally.cs:163:35:163:41 | access to array element |  |
-| Finally.cs:163:40:163:40 | [finally: exception(ArgumentNullException)] 0 | Finally.cs:163:35:163:41 | [finally: exception(ArgumentNullException)] access to array element |  |
-| Finally.cs:163:40:163:40 | [finally: exception(Exception)] 0 | Finally.cs:163:35:163:41 | [finally: exception(Exception)] access to array element |  |
-| Finally.cs:165:13:168:13 | [finally: exception(ArgumentNullException)] catch {...} | Finally.cs:166:13:168:13 | [finally: exception(ArgumentNullException)] {...} |  |
-| Finally.cs:165:13:168:13 | [finally: exception(Exception)] catch {...} | Finally.cs:166:13:168:13 | [finally: exception(Exception)] {...} |  |
 | Finally.cs:165:13:168:13 | catch {...} | Finally.cs:166:13:168:13 | {...} |  |
-| Finally.cs:166:13:168:13 | [finally: exception(ArgumentNullException)] {...} | Finally.cs:167:17:167:38 | [finally: exception(ArgumentNullException)] ...; |  |
-| Finally.cs:166:13:168:13 | [finally: exception(Exception)] {...} | Finally.cs:167:17:167:38 | [finally: exception(Exception)] ...; |  |
 | Finally.cs:166:13:168:13 | {...} | Finally.cs:167:17:167:38 | ...; |  |
-| Finally.cs:167:17:167:37 | [finally: exception(ArgumentNullException)] call to method WriteLine | Finally.cs:147:10:147:11 | exit M8 (abnormal) | exception(ArgumentNullException) |
-| Finally.cs:167:17:167:37 | [finally: exception(Exception)] call to method WriteLine | Finally.cs:147:10:147:11 | exit M8 (abnormal) | exception(Exception) |
+| Finally.cs:167:17:167:37 | call to method WriteLine | Finally.cs:147:10:147:11 | exit M8 (abnormal) | exception |
 | Finally.cs:167:17:167:37 | call to method WriteLine | Finally.cs:147:10:147:11 | exit M8 (normal) |  |
 | Finally.cs:167:17:167:38 | ...; | Finally.cs:167:35:167:36 | "" |  |
-| Finally.cs:167:17:167:38 | [finally: exception(ArgumentNullException)] ...; | Finally.cs:167:35:167:36 | [finally: exception(ArgumentNullException)] "" |  |
-| Finally.cs:167:17:167:38 | [finally: exception(Exception)] ...; | Finally.cs:167:35:167:36 | [finally: exception(Exception)] "" |  |
 | Finally.cs:167:35:167:36 | "" | Finally.cs:167:17:167:37 | call to method WriteLine |  |
-| Finally.cs:167:35:167:36 | [finally: exception(ArgumentNullException)] "" | Finally.cs:167:17:167:37 | [finally: exception(ArgumentNullException)] call to method WriteLine |  |
-| Finally.cs:167:35:167:36 | [finally: exception(Exception)] "" | Finally.cs:167:17:167:37 | [finally: exception(Exception)] call to method WriteLine |  |
 | Finally.cs:172:11:172:20 | call to constructor Exception | Finally.cs:172:11:172:20 | {...} |  |
 | Finally.cs:172:11:172:20 | enter ExceptionA | Finally.cs:172:11:172:20 | call to constructor Exception |  |
 | Finally.cs:172:11:172:20 | exit ExceptionA (normal) | Finally.cs:172:11:172:20 | exit ExceptionA |  |
@@ -2453,66 +1924,32 @@
 | Finally.cs:178:9:192:9 | try {...} ... | Finally.cs:179:9:181:9 | {...} |  |
 | Finally.cs:179:9:181:9 | {...} | Finally.cs:180:13:180:43 | if (...) ... |  |
 | Finally.cs:180:13:180:43 | if (...) ... | Finally.cs:180:17:180:18 | access to parameter b1 |  |
-| Finally.cs:180:17:180:18 | access to parameter b1 | Finally.cs:180:27:180:42 | [b1 (line 176): true] object creation of type ExceptionA | true |
-| Finally.cs:180:17:180:18 | access to parameter b1 | Finally.cs:183:9:192:9 | [b1 (line 176): false] {...} | false |
-| Finally.cs:180:21:180:43 | [b1 (line 176): true] throw ...; | Finally.cs:183:9:192:9 | [finally: exception(ExceptionA), b1 (line 176): true] {...} | exception(ExceptionA) |
-| Finally.cs:180:27:180:42 | [b1 (line 176): true] object creation of type ExceptionA | Finally.cs:180:21:180:43 | [b1 (line 176): true] throw ...; |  |
-| Finally.cs:180:27:180:42 | [b1 (line 176): true] object creation of type ExceptionA | Finally.cs:183:9:192:9 | [finally: exception(Exception), b1 (line 176): true] {...} | exception(Exception) |
-| Finally.cs:183:9:192:9 | [b1 (line 176): false] {...} | Finally.cs:184:13:191:13 | [b1 (line 176): false] try {...} ... |  |
-| Finally.cs:183:9:192:9 | [finally: exception(Exception), b1 (line 176): true] {...} | Finally.cs:184:13:191:13 | [finally: exception(Exception), b1 (line 176): true] try {...} ... |  |
-| Finally.cs:183:9:192:9 | [finally: exception(ExceptionA), b1 (line 176): true] {...} | Finally.cs:184:13:191:13 | [finally: exception(ExceptionA), b1 (line 176): true] try {...} ... |  |
-| Finally.cs:184:13:191:13 | [b1 (line 176): false] try {...} ... | Finally.cs:185:13:187:13 | [b1 (line 176): false] {...} |  |
-| Finally.cs:184:13:191:13 | [finally: exception(Exception), b1 (line 176): true] try {...} ... | Finally.cs:185:13:187:13 | [finally: exception(Exception), b1 (line 176): true] {...} |  |
-| Finally.cs:184:13:191:13 | [finally: exception(ExceptionA), b1 (line 176): true] try {...} ... | Finally.cs:185:13:187:13 | [finally: exception(ExceptionA), b1 (line 176): true] {...} |  |
-| Finally.cs:185:13:187:13 | [b1 (line 176): false] {...} | Finally.cs:186:17:186:47 | [b1 (line 176): false] if (...) ... |  |
-| Finally.cs:185:13:187:13 | [finally: exception(Exception), b1 (line 176): true] {...} | Finally.cs:186:17:186:47 | [finally: exception(Exception), b1 (line 176): true] if (...) ... |  |
-| Finally.cs:185:13:187:13 | [finally: exception(ExceptionA), b1 (line 176): true] {...} | Finally.cs:186:17:186:47 | [finally: exception(ExceptionA), b1 (line 176): true] if (...) ... |  |
-| Finally.cs:186:17:186:47 | [b1 (line 176): false] if (...) ... | Finally.cs:186:21:186:22 | [b1 (line 176): false] access to parameter b2 |  |
-| Finally.cs:186:17:186:47 | [finally: exception(Exception), b1 (line 176): true] if (...) ... | Finally.cs:186:21:186:22 | [finally: exception(Exception), b1 (line 176): true] access to parameter b2 |  |
-| Finally.cs:186:17:186:47 | [finally: exception(ExceptionA), b1 (line 176): true] if (...) ... | Finally.cs:186:21:186:22 | [finally: exception(ExceptionA), b1 (line 176): true] access to parameter b2 |  |
-| Finally.cs:186:21:186:22 | [b1 (line 176): false] access to parameter b2 | Finally.cs:176:10:176:11 | exit M9 (normal) | false |
-| Finally.cs:186:21:186:22 | [b1 (line 176): false] access to parameter b2 | Finally.cs:186:31:186:46 | [b1 (line 176): false, b2 (line 176): true] object creation of type ExceptionB | true |
-| Finally.cs:186:21:186:22 | [finally: exception(Exception), b1 (line 176): true] access to parameter b2 | Finally.cs:176:10:176:11 | exit M9 (abnormal) | exception(Exception) |
-| Finally.cs:186:21:186:22 | [finally: exception(Exception), b1 (line 176): true] access to parameter b2 | Finally.cs:186:31:186:46 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB | true |
-| Finally.cs:186:21:186:22 | [finally: exception(ExceptionA), b1 (line 176): true] access to parameter b2 | Finally.cs:176:10:176:11 | exit M9 (abnormal) | exception(ExceptionA) |
-| Finally.cs:186:21:186:22 | [finally: exception(ExceptionA), b1 (line 176): true] access to parameter b2 | Finally.cs:186:31:186:46 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB | true |
-| Finally.cs:186:25:186:47 | [b1 (line 176): false, b2 (line 176): true] throw ...; | Finally.cs:188:13:191:13 | [exception: ExceptionB, b1 (line 176): false, b2 (line 176): true] catch (...) {...} | exception(ExceptionB) |
-| Finally.cs:186:25:186:47 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] throw ...; | Finally.cs:188:13:191:13 | [finally: exception(Exception), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | exception(ExceptionB) |
-| Finally.cs:186:25:186:47 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] throw ...; | Finally.cs:188:13:191:13 | [finally: exception(ExceptionA), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | exception(ExceptionB) |
-| Finally.cs:186:31:186:46 | [b1 (line 176): false, b2 (line 176): true] object creation of type ExceptionB | Finally.cs:186:25:186:47 | [b1 (line 176): false, b2 (line 176): true] throw ...; |  |
-| Finally.cs:186:31:186:46 | [b1 (line 176): false, b2 (line 176): true] object creation of type ExceptionB | Finally.cs:188:13:191:13 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] catch (...) {...} | exception(Exception) |
-| Finally.cs:186:31:186:46 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB | Finally.cs:186:25:186:47 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] throw ...; |  |
-| Finally.cs:186:31:186:46 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB | Finally.cs:188:13:191:13 | [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | exception(Exception) |
-| Finally.cs:186:31:186:46 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB | Finally.cs:186:25:186:47 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] throw ...; |  |
-| Finally.cs:186:31:186:46 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB | Finally.cs:188:13:191:13 | [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | exception(Exception) |
-| Finally.cs:188:13:191:13 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] catch (...) {...} | Finally.cs:176:10:176:11 | exit M9 (abnormal) | exception(Exception) |
-| Finally.cs:188:13:191:13 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] catch (...) {...} | Finally.cs:188:38:188:39 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] access to parameter b2 | match |
-| Finally.cs:188:13:191:13 | [exception: ExceptionB, b1 (line 176): false, b2 (line 176): true] catch (...) {...} | Finally.cs:188:38:188:39 | [exception: ExceptionB, b1 (line 176): false, b2 (line 176): true] access to parameter b2 | match |
-| Finally.cs:188:13:191:13 | [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | Finally.cs:176:10:176:11 | exit M9 (abnormal) | exception(Exception) |
-| Finally.cs:188:13:191:13 | [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | Finally.cs:188:38:188:39 | [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | match |
-| Finally.cs:188:13:191:13 | [finally: exception(Exception), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | Finally.cs:188:38:188:39 | [finally: exception(Exception), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | match |
-| Finally.cs:188:13:191:13 | [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | Finally.cs:176:10:176:11 | exit M9 (abnormal) | exception(Exception) |
-| Finally.cs:188:13:191:13 | [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | Finally.cs:188:38:188:39 | [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | match |
-| Finally.cs:188:13:191:13 | [finally: exception(ExceptionA), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | Finally.cs:188:38:188:39 | [finally: exception(ExceptionA), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | match |
-| Finally.cs:188:38:188:39 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] access to parameter b2 | Finally.cs:189:13:191:13 | [b1 (line 176): false] {...} | true |
-| Finally.cs:188:38:188:39 | [exception: ExceptionB, b1 (line 176): false, b2 (line 176): true] access to parameter b2 | Finally.cs:189:13:191:13 | [b1 (line 176): false] {...} | true |
-| Finally.cs:188:38:188:39 | [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | Finally.cs:189:13:191:13 | [finally: exception(Exception), b1 (line 176): true] {...} | true |
-| Finally.cs:188:38:188:39 | [finally: exception(Exception), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | Finally.cs:189:13:191:13 | [finally: exception(Exception), b1 (line 176): true] {...} | true |
-| Finally.cs:188:38:188:39 | [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | Finally.cs:189:13:191:13 | [finally: exception(ExceptionA), b1 (line 176): true] {...} | true |
-| Finally.cs:188:38:188:39 | [finally: exception(ExceptionA), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | Finally.cs:189:13:191:13 | [finally: exception(ExceptionA), b1 (line 176): true] {...} | true |
-| Finally.cs:189:13:191:13 | [b1 (line 176): false] {...} | Finally.cs:190:17:190:47 | [b1 (line 176): false] if (...) ... |  |
-| Finally.cs:189:13:191:13 | [finally: exception(Exception), b1 (line 176): true] {...} | Finally.cs:190:17:190:47 | [finally: exception(Exception), b1 (line 176): true] if (...) ... |  |
-| Finally.cs:189:13:191:13 | [finally: exception(ExceptionA), b1 (line 176): true] {...} | Finally.cs:190:17:190:47 | [finally: exception(ExceptionA), b1 (line 176): true] if (...) ... |  |
-| Finally.cs:190:17:190:47 | [b1 (line 176): false] if (...) ... | Finally.cs:190:21:190:22 | [b1 (line 176): false] access to parameter b1 |  |
-| Finally.cs:190:17:190:47 | [finally: exception(Exception), b1 (line 176): true] if (...) ... | Finally.cs:190:21:190:22 | [finally: exception(Exception), b1 (line 176): true] access to parameter b1 |  |
-| Finally.cs:190:17:190:47 | [finally: exception(ExceptionA), b1 (line 176): true] if (...) ... | Finally.cs:190:21:190:22 | [finally: exception(ExceptionA), b1 (line 176): true] access to parameter b1 |  |
-| Finally.cs:190:21:190:22 | [b1 (line 176): false] access to parameter b1 | Finally.cs:176:10:176:11 | exit M9 (normal) | false |
-| Finally.cs:190:21:190:22 | [finally: exception(Exception), b1 (line 176): true] access to parameter b1 | Finally.cs:190:31:190:46 | [finally: exception(Exception)] object creation of type ExceptionC | true |
-| Finally.cs:190:21:190:22 | [finally: exception(ExceptionA), b1 (line 176): true] access to parameter b1 | Finally.cs:190:31:190:46 | [finally: exception(ExceptionA)] object creation of type ExceptionC | true |
-| Finally.cs:190:25:190:47 | [finally: exception(Exception)] throw ...; | Finally.cs:176:10:176:11 | exit M9 (abnormal) | exception(ExceptionC) |
-| Finally.cs:190:25:190:47 | [finally: exception(ExceptionA)] throw ...; | Finally.cs:176:10:176:11 | exit M9 (abnormal) | exception(ExceptionC) |
-| Finally.cs:190:31:190:46 | [finally: exception(Exception)] object creation of type ExceptionC | Finally.cs:190:25:190:47 | [finally: exception(Exception)] throw ...; |  |
-| Finally.cs:190:31:190:46 | [finally: exception(ExceptionA)] object creation of type ExceptionC | Finally.cs:190:25:190:47 | [finally: exception(ExceptionA)] throw ...; |  |
+| Finally.cs:180:17:180:18 | access to parameter b1 | Finally.cs:180:27:180:42 | object creation of type ExceptionA | true |
+| Finally.cs:180:17:180:18 | access to parameter b1 | Finally.cs:183:9:192:9 | {...} | false |
+| Finally.cs:180:21:180:43 | throw ...; | Finally.cs:183:9:192:9 | {...} | exception |
+| Finally.cs:180:27:180:42 | object creation of type ExceptionA | Finally.cs:180:21:180:43 | throw ...; |  |
+| Finally.cs:180:27:180:42 | object creation of type ExceptionA | Finally.cs:183:9:192:9 | {...} | exception |
+| Finally.cs:183:9:192:9 | {...} | Finally.cs:184:13:191:13 | try {...} ... |  |
+| Finally.cs:184:13:191:13 | try {...} ... | Finally.cs:185:13:187:13 | {...} |  |
+| Finally.cs:185:13:187:13 | {...} | Finally.cs:186:17:186:47 | if (...) ... |  |
+| Finally.cs:186:17:186:47 | if (...) ... | Finally.cs:186:21:186:22 | access to parameter b2 |  |
+| Finally.cs:186:21:186:22 | access to parameter b2 | Finally.cs:176:10:176:11 | exit M9 (abnormal) | exception |
+| Finally.cs:186:21:186:22 | access to parameter b2 | Finally.cs:176:10:176:11 | exit M9 (normal) | false |
+| Finally.cs:186:21:186:22 | access to parameter b2 | Finally.cs:186:31:186:46 | object creation of type ExceptionB | true |
+| Finally.cs:186:25:186:47 | throw ...; | Finally.cs:188:13:191:13 | catch (...) {...} | exception |
+| Finally.cs:186:31:186:46 | object creation of type ExceptionB | Finally.cs:186:25:186:47 | throw ...; |  |
+| Finally.cs:186:31:186:46 | object creation of type ExceptionB | Finally.cs:188:13:191:13 | catch (...) {...} | exception |
+| Finally.cs:188:13:191:13 | catch (...) {...} | Finally.cs:176:10:176:11 | exit M9 (abnormal) | exception |
+| Finally.cs:188:13:191:13 | catch (...) {...} | Finally.cs:188:38:188:39 | access to parameter b2 | match |
+| Finally.cs:188:38:188:39 | access to parameter b2 | Finally.cs:176:10:176:11 | exit M9 (abnormal) | exception |
+| Finally.cs:188:38:188:39 | access to parameter b2 | Finally.cs:189:13:191:13 | {...} | true |
+| Finally.cs:189:13:191:13 | {...} | Finally.cs:190:17:190:47 | if (...) ... |  |
+| Finally.cs:190:17:190:47 | if (...) ... | Finally.cs:190:21:190:22 | access to parameter b1 |  |
+| Finally.cs:190:21:190:22 | access to parameter b1 | Finally.cs:176:10:176:11 | exit M9 (abnormal) | exception |
+| Finally.cs:190:21:190:22 | access to parameter b1 | Finally.cs:176:10:176:11 | exit M9 (normal) | false |
+| Finally.cs:190:21:190:22 | access to parameter b1 | Finally.cs:190:31:190:46 | object creation of type ExceptionC | true |
+| Finally.cs:190:25:190:47 | throw ...; | Finally.cs:176:10:176:11 | exit M9 (abnormal) | exception |
+| Finally.cs:190:31:190:46 | object creation of type ExceptionC | Finally.cs:190:25:190:47 | throw ...; |  |
 | Finally.cs:195:10:195:12 | enter M10 | Finally.cs:196:5:214:5 | {...} |  |
 | Finally.cs:195:10:195:12 | exit M10 (abnormal) | Finally.cs:195:10:195:12 | exit M10 |  |
 | Finally.cs:195:10:195:12 | exit M10 (normal) | Finally.cs:195:10:195:12 | exit M10 |  |
@@ -2522,102 +1959,30 @@
 | Finally.cs:199:13:199:43 | if (...) ... | Finally.cs:199:17:199:18 | access to parameter b1 |  |
 | Finally.cs:199:17:199:18 | access to parameter b1 | Finally.cs:199:27:199:42 | object creation of type ExceptionA | true |
 | Finally.cs:199:17:199:18 | access to parameter b1 | Finally.cs:202:9:212:9 | {...} | false |
-| Finally.cs:199:21:199:43 | throw ...; | Finally.cs:202:9:212:9 | [finally: exception(ExceptionA)] {...} | exception(ExceptionA) |
+| Finally.cs:199:21:199:43 | throw ...; | Finally.cs:202:9:212:9 | {...} | exception |
 | Finally.cs:199:27:199:42 | object creation of type ExceptionA | Finally.cs:199:21:199:43 | throw ...; |  |
-| Finally.cs:199:27:199:42 | object creation of type ExceptionA | Finally.cs:202:9:212:9 | [finally: exception(Exception)] {...} | exception(Exception) |
-| Finally.cs:202:9:212:9 | [finally: exception(Exception)] {...} | Finally.cs:203:13:210:13 | [finally: exception(Exception)] try {...} ... |  |
-| Finally.cs:202:9:212:9 | [finally: exception(ExceptionA)] {...} | Finally.cs:203:13:210:13 | [finally: exception(ExceptionA)] try {...} ... |  |
+| Finally.cs:199:27:199:42 | object creation of type ExceptionA | Finally.cs:202:9:212:9 | {...} | exception |
 | Finally.cs:202:9:212:9 | {...} | Finally.cs:203:13:210:13 | try {...} ... |  |
-| Finally.cs:203:13:210:13 | [finally: exception(Exception)] try {...} ... | Finally.cs:204:13:206:13 | [finally: exception(Exception)] {...} |  |
-| Finally.cs:203:13:210:13 | [finally: exception(ExceptionA)] try {...} ... | Finally.cs:204:13:206:13 | [finally: exception(ExceptionA)] {...} |  |
 | Finally.cs:203:13:210:13 | try {...} ... | Finally.cs:204:13:206:13 | {...} |  |
-| Finally.cs:204:13:206:13 | [finally: exception(Exception)] {...} | Finally.cs:205:17:205:47 | [finally: exception(Exception)] if (...) ... |  |
-| Finally.cs:204:13:206:13 | [finally: exception(ExceptionA)] {...} | Finally.cs:205:17:205:47 | [finally: exception(ExceptionA)] if (...) ... |  |
 | Finally.cs:204:13:206:13 | {...} | Finally.cs:205:17:205:47 | if (...) ... |  |
-| Finally.cs:205:17:205:47 | [finally: exception(Exception)] if (...) ... | Finally.cs:205:21:205:22 | [finally: exception(Exception)] access to parameter b2 |  |
-| Finally.cs:205:17:205:47 | [finally: exception(ExceptionA)] if (...) ... | Finally.cs:205:21:205:22 | [finally: exception(ExceptionA)] access to parameter b2 |  |
 | Finally.cs:205:17:205:47 | if (...) ... | Finally.cs:205:21:205:22 | access to parameter b2 |  |
-| Finally.cs:205:21:205:22 | [finally: exception(Exception)] access to parameter b2 | Finally.cs:205:31:205:46 | [finally: exception(Exception)] object creation of type ExceptionB | true |
-| Finally.cs:205:21:205:22 | [finally: exception(Exception)] access to parameter b2 | Finally.cs:208:13:210:13 | [finally: exception(Exception)] {...} | false |
-| Finally.cs:205:21:205:22 | [finally: exception(ExceptionA)] access to parameter b2 | Finally.cs:205:31:205:46 | [finally: exception(ExceptionA)] object creation of type ExceptionB | true |
-| Finally.cs:205:21:205:22 | [finally: exception(ExceptionA)] access to parameter b2 | Finally.cs:208:13:210:13 | [finally: exception(ExceptionA)] {...} | false |
 | Finally.cs:205:21:205:22 | access to parameter b2 | Finally.cs:205:31:205:46 | object creation of type ExceptionB | true |
 | Finally.cs:205:21:205:22 | access to parameter b2 | Finally.cs:208:13:210:13 | {...} | false |
-| Finally.cs:205:25:205:47 | [finally: exception(Exception)] throw ...; | Finally.cs:208:13:210:13 | [finally: exception(Exception), finally(1): exception(ExceptionB)] {...} | exception(ExceptionB) |
-| Finally.cs:205:25:205:47 | [finally: exception(ExceptionA)] throw ...; | Finally.cs:208:13:210:13 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] {...} | exception(ExceptionB) |
-| Finally.cs:205:25:205:47 | throw ...; | Finally.cs:208:13:210:13 | [finally(1): exception(ExceptionB)] {...} | exception(ExceptionB) |
-| Finally.cs:205:31:205:46 | [finally: exception(Exception)] object creation of type ExceptionB | Finally.cs:205:25:205:47 | [finally: exception(Exception)] throw ...; |  |
-| Finally.cs:205:31:205:46 | [finally: exception(Exception)] object creation of type ExceptionB | Finally.cs:208:13:210:13 | [finally: exception(Exception), finally(1): exception(Exception)] {...} | exception(Exception) |
-| Finally.cs:205:31:205:46 | [finally: exception(ExceptionA)] object creation of type ExceptionB | Finally.cs:205:25:205:47 | [finally: exception(ExceptionA)] throw ...; |  |
-| Finally.cs:205:31:205:46 | [finally: exception(ExceptionA)] object creation of type ExceptionB | Finally.cs:208:13:210:13 | [finally: exception(ExceptionA), finally(1): exception(Exception)] {...} | exception(Exception) |
+| Finally.cs:205:25:205:47 | throw ...; | Finally.cs:208:13:210:13 | {...} | exception |
 | Finally.cs:205:31:205:46 | object creation of type ExceptionB | Finally.cs:205:25:205:47 | throw ...; |  |
-| Finally.cs:205:31:205:46 | object creation of type ExceptionB | Finally.cs:208:13:210:13 | [finally(1): exception(Exception)] {...} | exception(Exception) |
-| Finally.cs:208:13:210:13 | [finally(1): exception(Exception)] {...} | Finally.cs:209:17:209:47 | [finally(1): exception(Exception)] if (...) ... |  |
-| Finally.cs:208:13:210:13 | [finally(1): exception(ExceptionB)] {...} | Finally.cs:209:17:209:47 | [finally(1): exception(ExceptionB)] if (...) ... |  |
-| Finally.cs:208:13:210:13 | [finally: exception(Exception), finally(1): exception(Exception)] {...} | Finally.cs:209:17:209:47 | [finally: exception(Exception), finally(1): exception(Exception)] if (...) ... |  |
-| Finally.cs:208:13:210:13 | [finally: exception(Exception), finally(1): exception(ExceptionB)] {...} | Finally.cs:209:17:209:47 | [finally: exception(Exception), finally(1): exception(ExceptionB)] if (...) ... |  |
-| Finally.cs:208:13:210:13 | [finally: exception(Exception)] {...} | Finally.cs:209:17:209:47 | [finally: exception(Exception)] if (...) ... |  |
-| Finally.cs:208:13:210:13 | [finally: exception(ExceptionA), finally(1): exception(Exception)] {...} | Finally.cs:209:17:209:47 | [finally: exception(ExceptionA), finally(1): exception(Exception)] if (...) ... |  |
-| Finally.cs:208:13:210:13 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] {...} | Finally.cs:209:17:209:47 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] if (...) ... |  |
-| Finally.cs:208:13:210:13 | [finally: exception(ExceptionA)] {...} | Finally.cs:209:17:209:47 | [finally: exception(ExceptionA)] if (...) ... |  |
+| Finally.cs:205:31:205:46 | object creation of type ExceptionB | Finally.cs:208:13:210:13 | {...} | exception |
 | Finally.cs:208:13:210:13 | {...} | Finally.cs:209:17:209:47 | if (...) ... |  |
-| Finally.cs:209:17:209:47 | [finally(1): exception(Exception)] if (...) ... | Finally.cs:209:21:209:22 | [finally(1): exception(Exception)] access to parameter b3 |  |
-| Finally.cs:209:17:209:47 | [finally(1): exception(ExceptionB)] if (...) ... | Finally.cs:209:21:209:22 | [finally(1): exception(ExceptionB)] access to parameter b3 |  |
-| Finally.cs:209:17:209:47 | [finally: exception(Exception), finally(1): exception(Exception)] if (...) ... | Finally.cs:209:21:209:22 | [finally: exception(Exception), finally(1): exception(Exception)] access to parameter b3 |  |
-| Finally.cs:209:17:209:47 | [finally: exception(Exception), finally(1): exception(ExceptionB)] if (...) ... | Finally.cs:209:21:209:22 | [finally: exception(Exception), finally(1): exception(ExceptionB)] access to parameter b3 |  |
-| Finally.cs:209:17:209:47 | [finally: exception(Exception)] if (...) ... | Finally.cs:209:21:209:22 | [finally: exception(Exception)] access to parameter b3 |  |
-| Finally.cs:209:17:209:47 | [finally: exception(ExceptionA), finally(1): exception(Exception)] if (...) ... | Finally.cs:209:21:209:22 | [finally: exception(ExceptionA), finally(1): exception(Exception)] access to parameter b3 |  |
-| Finally.cs:209:17:209:47 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] if (...) ... | Finally.cs:209:21:209:22 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] access to parameter b3 |  |
-| Finally.cs:209:17:209:47 | [finally: exception(ExceptionA)] if (...) ... | Finally.cs:209:21:209:22 | [finally: exception(ExceptionA)] access to parameter b3 |  |
 | Finally.cs:209:17:209:47 | if (...) ... | Finally.cs:209:21:209:22 | access to parameter b3 |  |
-| Finally.cs:209:21:209:22 | [finally(1): exception(Exception)] access to parameter b3 | Finally.cs:195:10:195:12 | exit M10 (abnormal) | exception(Exception) |
-| Finally.cs:209:21:209:22 | [finally(1): exception(Exception)] access to parameter b3 | Finally.cs:209:31:209:46 | [finally(1): exception(Exception)] object creation of type ExceptionC | true |
-| Finally.cs:209:21:209:22 | [finally(1): exception(ExceptionB)] access to parameter b3 | Finally.cs:195:10:195:12 | exit M10 (abnormal) | exception(ExceptionB) |
-| Finally.cs:209:21:209:22 | [finally(1): exception(ExceptionB)] access to parameter b3 | Finally.cs:209:31:209:46 | [finally(1): exception(ExceptionB)] object creation of type ExceptionC | true |
-| Finally.cs:209:21:209:22 | [finally: exception(Exception), finally(1): exception(Exception)] access to parameter b3 | Finally.cs:195:10:195:12 | exit M10 (abnormal) | exception(Exception) |
-| Finally.cs:209:21:209:22 | [finally: exception(Exception), finally(1): exception(Exception)] access to parameter b3 | Finally.cs:209:31:209:46 | [finally: exception(Exception), finally(1): exception(Exception)] object creation of type ExceptionC | true |
-| Finally.cs:209:21:209:22 | [finally: exception(Exception), finally(1): exception(ExceptionB)] access to parameter b3 | Finally.cs:195:10:195:12 | exit M10 (abnormal) | exception(ExceptionB) |
-| Finally.cs:209:21:209:22 | [finally: exception(Exception), finally(1): exception(ExceptionB)] access to parameter b3 | Finally.cs:209:31:209:46 | [finally: exception(Exception), finally(1): exception(ExceptionB)] object creation of type ExceptionC | true |
-| Finally.cs:209:21:209:22 | [finally: exception(Exception)] access to parameter b3 | Finally.cs:209:31:209:46 | [finally: exception(Exception)] object creation of type ExceptionC | true |
-| Finally.cs:209:21:209:22 | [finally: exception(Exception)] access to parameter b3 | Finally.cs:211:13:211:29 | [finally: exception(Exception)] ...; | false |
-| Finally.cs:209:21:209:22 | [finally: exception(ExceptionA), finally(1): exception(Exception)] access to parameter b3 | Finally.cs:195:10:195:12 | exit M10 (abnormal) | exception(Exception) |
-| Finally.cs:209:21:209:22 | [finally: exception(ExceptionA), finally(1): exception(Exception)] access to parameter b3 | Finally.cs:209:31:209:46 | [finally: exception(ExceptionA), finally(1): exception(Exception)] object creation of type ExceptionC | true |
-| Finally.cs:209:21:209:22 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] access to parameter b3 | Finally.cs:195:10:195:12 | exit M10 (abnormal) | exception(ExceptionB) |
-| Finally.cs:209:21:209:22 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] access to parameter b3 | Finally.cs:209:31:209:46 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] object creation of type ExceptionC | true |
-| Finally.cs:209:21:209:22 | [finally: exception(ExceptionA)] access to parameter b3 | Finally.cs:209:31:209:46 | [finally: exception(ExceptionA)] object creation of type ExceptionC | true |
-| Finally.cs:209:21:209:22 | [finally: exception(ExceptionA)] access to parameter b3 | Finally.cs:211:13:211:29 | [finally: exception(ExceptionA)] ...; | false |
+| Finally.cs:209:21:209:22 | access to parameter b3 | Finally.cs:195:10:195:12 | exit M10 (abnormal) | exception |
 | Finally.cs:209:21:209:22 | access to parameter b3 | Finally.cs:209:31:209:46 | object creation of type ExceptionC | true |
 | Finally.cs:209:21:209:22 | access to parameter b3 | Finally.cs:211:13:211:29 | ...; | false |
-| Finally.cs:209:25:209:47 | [finally(1): exception(Exception)] throw ...; | Finally.cs:195:10:195:12 | exit M10 (abnormal) | exception(ExceptionC) |
-| Finally.cs:209:25:209:47 | [finally(1): exception(ExceptionB)] throw ...; | Finally.cs:195:10:195:12 | exit M10 (abnormal) | exception(ExceptionC) |
-| Finally.cs:209:25:209:47 | [finally: exception(Exception), finally(1): exception(Exception)] throw ...; | Finally.cs:195:10:195:12 | exit M10 (abnormal) | exception(ExceptionC) |
-| Finally.cs:209:25:209:47 | [finally: exception(Exception), finally(1): exception(ExceptionB)] throw ...; | Finally.cs:195:10:195:12 | exit M10 (abnormal) | exception(ExceptionC) |
-| Finally.cs:209:25:209:47 | [finally: exception(Exception)] throw ...; | Finally.cs:195:10:195:12 | exit M10 (abnormal) | exception(ExceptionC) |
-| Finally.cs:209:25:209:47 | [finally: exception(ExceptionA), finally(1): exception(Exception)] throw ...; | Finally.cs:195:10:195:12 | exit M10 (abnormal) | exception(ExceptionC) |
-| Finally.cs:209:25:209:47 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] throw ...; | Finally.cs:195:10:195:12 | exit M10 (abnormal) | exception(ExceptionC) |
-| Finally.cs:209:25:209:47 | [finally: exception(ExceptionA)] throw ...; | Finally.cs:195:10:195:12 | exit M10 (abnormal) | exception(ExceptionC) |
-| Finally.cs:209:25:209:47 | throw ...; | Finally.cs:195:10:195:12 | exit M10 (abnormal) | exception(ExceptionC) |
-| Finally.cs:209:31:209:46 | [finally(1): exception(Exception)] object creation of type ExceptionC | Finally.cs:209:25:209:47 | [finally(1): exception(Exception)] throw ...; |  |
-| Finally.cs:209:31:209:46 | [finally(1): exception(ExceptionB)] object creation of type ExceptionC | Finally.cs:209:25:209:47 | [finally(1): exception(ExceptionB)] throw ...; |  |
-| Finally.cs:209:31:209:46 | [finally: exception(Exception), finally(1): exception(Exception)] object creation of type ExceptionC | Finally.cs:209:25:209:47 | [finally: exception(Exception), finally(1): exception(Exception)] throw ...; |  |
-| Finally.cs:209:31:209:46 | [finally: exception(Exception), finally(1): exception(ExceptionB)] object creation of type ExceptionC | Finally.cs:209:25:209:47 | [finally: exception(Exception), finally(1): exception(ExceptionB)] throw ...; |  |
-| Finally.cs:209:31:209:46 | [finally: exception(Exception)] object creation of type ExceptionC | Finally.cs:209:25:209:47 | [finally: exception(Exception)] throw ...; |  |
-| Finally.cs:209:31:209:46 | [finally: exception(ExceptionA), finally(1): exception(Exception)] object creation of type ExceptionC | Finally.cs:209:25:209:47 | [finally: exception(ExceptionA), finally(1): exception(Exception)] throw ...; |  |
-| Finally.cs:209:31:209:46 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] object creation of type ExceptionC | Finally.cs:209:25:209:47 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] throw ...; |  |
-| Finally.cs:209:31:209:46 | [finally: exception(ExceptionA)] object creation of type ExceptionC | Finally.cs:209:25:209:47 | [finally: exception(ExceptionA)] throw ...; |  |
+| Finally.cs:209:25:209:47 | throw ...; | Finally.cs:195:10:195:12 | exit M10 (abnormal) | exception |
 | Finally.cs:209:31:209:46 | object creation of type ExceptionC | Finally.cs:209:25:209:47 | throw ...; |  |
-| Finally.cs:211:13:211:16 | [finally: exception(Exception)] this access | Finally.cs:211:26:211:28 | [finally: exception(Exception)] "0" |  |
-| Finally.cs:211:13:211:16 | [finally: exception(ExceptionA)] this access | Finally.cs:211:26:211:28 | [finally: exception(ExceptionA)] "0" |  |
 | Finally.cs:211:13:211:16 | this access | Finally.cs:211:26:211:28 | "0" |  |
+| Finally.cs:211:13:211:28 | ... = ... | Finally.cs:195:10:195:12 | exit M10 (abnormal) | exception |
 | Finally.cs:211:13:211:28 | ... = ... | Finally.cs:213:9:213:25 | ...; |  |
-| Finally.cs:211:13:211:28 | [finally: exception(Exception)] ... = ... | Finally.cs:195:10:195:12 | exit M10 (abnormal) | exception(Exception) |
-| Finally.cs:211:13:211:28 | [finally: exception(ExceptionA)] ... = ... | Finally.cs:195:10:195:12 | exit M10 (abnormal) | exception(ExceptionA) |
 | Finally.cs:211:13:211:29 | ...; | Finally.cs:211:13:211:16 | this access |  |
-| Finally.cs:211:13:211:29 | [finally: exception(Exception)] ...; | Finally.cs:211:13:211:16 | [finally: exception(Exception)] this access |  |
-| Finally.cs:211:13:211:29 | [finally: exception(ExceptionA)] ...; | Finally.cs:211:13:211:16 | [finally: exception(ExceptionA)] this access |  |
 | Finally.cs:211:26:211:28 | "0" | Finally.cs:211:13:211:28 | ... = ... |  |
-| Finally.cs:211:26:211:28 | [finally: exception(Exception)] "0" | Finally.cs:211:13:211:28 | [finally: exception(Exception)] ... = ... |  |
-| Finally.cs:211:26:211:28 | [finally: exception(ExceptionA)] "0" | Finally.cs:211:13:211:28 | [finally: exception(ExceptionA)] ... = ... |  |
 | Finally.cs:213:9:213:12 | this access | Finally.cs:213:22:213:24 | "1" |  |
 | Finally.cs:213:9:213:24 | ... = ... | Finally.cs:195:10:195:12 | exit M10 (normal) |  |
 | Finally.cs:213:9:213:25 | ...; | Finally.cs:213:9:213:12 | this access |  |
@@ -2627,7 +1992,7 @@
 | Finally.cs:217:5:231:5 | {...} | Finally.cs:218:9:229:9 | try {...} ... |  |
 | Finally.cs:218:9:229:9 | try {...} ... | Finally.cs:219:9:221:9 | {...} |  |
 | Finally.cs:219:9:221:9 | {...} | Finally.cs:220:13:220:37 | ...; |  |
-| Finally.cs:220:13:220:36 | call to method WriteLine | Finally.cs:222:9:225:9 | catch {...} | exception(Exception) |
+| Finally.cs:220:13:220:36 | call to method WriteLine | Finally.cs:222:9:225:9 | catch {...} | exception |
 | Finally.cs:220:13:220:36 | call to method WriteLine | Finally.cs:227:9:229:9 | {...} |  |
 | Finally.cs:220:13:220:37 | ...; | Finally.cs:220:31:220:35 | "Try" |  |
 | Finally.cs:220:31:220:35 | "Try" | Finally.cs:220:13:220:36 | call to method WriteLine |  |
@@ -2654,88 +2019,31 @@
 | Finally.cs:239:17:240:43 | if (...) ... | Finally.cs:239:21:239:22 | access to parameter b1 |  |
 | Finally.cs:239:21:239:22 | access to parameter b1 | Finally.cs:240:27:240:42 | object creation of type ExceptionA | true |
 | Finally.cs:239:21:239:22 | access to parameter b1 | Finally.cs:243:13:253:13 | {...} | false |
-| Finally.cs:240:21:240:43 | throw ...; | Finally.cs:243:13:253:13 | [finally: exception(ExceptionA)] {...} | exception(ExceptionA) |
+| Finally.cs:240:21:240:43 | throw ...; | Finally.cs:243:13:253:13 | {...} | exception |
 | Finally.cs:240:27:240:42 | object creation of type ExceptionA | Finally.cs:240:21:240:43 | throw ...; |  |
-| Finally.cs:240:27:240:42 | object creation of type ExceptionA | Finally.cs:243:13:253:13 | [finally: exception(Exception)] {...} | exception(Exception) |
-| Finally.cs:243:13:253:13 | [finally: exception(Exception)] {...} | Finally.cs:244:17:252:17 | [finally: exception(Exception)] try {...} ... |  |
-| Finally.cs:243:13:253:13 | [finally: exception(ExceptionA)] {...} | Finally.cs:244:17:252:17 | [finally: exception(ExceptionA)] try {...} ... |  |
+| Finally.cs:240:27:240:42 | object creation of type ExceptionA | Finally.cs:243:13:253:13 | {...} | exception |
 | Finally.cs:243:13:253:13 | {...} | Finally.cs:244:17:252:17 | try {...} ... |  |
-| Finally.cs:244:17:252:17 | [finally: exception(Exception)] try {...} ... | Finally.cs:245:17:248:17 | [finally: exception(Exception)] {...} |  |
-| Finally.cs:244:17:252:17 | [finally: exception(ExceptionA)] try {...} ... | Finally.cs:245:17:248:17 | [finally: exception(ExceptionA)] {...} |  |
 | Finally.cs:244:17:252:17 | try {...} ... | Finally.cs:245:17:248:17 | {...} |  |
-| Finally.cs:245:17:248:17 | [finally: exception(Exception)] {...} | Finally.cs:246:21:247:47 | [finally: exception(Exception)] if (...) ... |  |
-| Finally.cs:245:17:248:17 | [finally: exception(ExceptionA)] {...} | Finally.cs:246:21:247:47 | [finally: exception(ExceptionA)] if (...) ... |  |
 | Finally.cs:245:17:248:17 | {...} | Finally.cs:246:21:247:47 | if (...) ... |  |
-| Finally.cs:246:21:247:47 | [finally: exception(Exception)] if (...) ... | Finally.cs:246:25:246:26 | [finally: exception(Exception)] access to parameter b2 |  |
-| Finally.cs:246:21:247:47 | [finally: exception(ExceptionA)] if (...) ... | Finally.cs:246:25:246:26 | [finally: exception(ExceptionA)] access to parameter b2 |  |
 | Finally.cs:246:21:247:47 | if (...) ... | Finally.cs:246:25:246:26 | access to parameter b2 |  |
-| Finally.cs:246:25:246:26 | [finally: exception(Exception)] access to parameter b2 | Finally.cs:247:31:247:46 | [finally: exception(Exception)] object creation of type ExceptionA | true |
-| Finally.cs:246:25:246:26 | [finally: exception(Exception)] access to parameter b2 | Finally.cs:250:17:252:17 | [finally: exception(Exception)] {...} | false |
-| Finally.cs:246:25:246:26 | [finally: exception(ExceptionA)] access to parameter b2 | Finally.cs:247:31:247:46 | [finally: exception(ExceptionA)] object creation of type ExceptionA | true |
-| Finally.cs:246:25:246:26 | [finally: exception(ExceptionA)] access to parameter b2 | Finally.cs:250:17:252:17 | [finally: exception(ExceptionA)] {...} | false |
 | Finally.cs:246:25:246:26 | access to parameter b2 | Finally.cs:247:31:247:46 | object creation of type ExceptionA | true |
 | Finally.cs:246:25:246:26 | access to parameter b2 | Finally.cs:250:17:252:17 | {...} | false |
-| Finally.cs:247:25:247:47 | [finally: exception(Exception)] throw ...; | Finally.cs:250:17:252:17 | [finally: exception(Exception), finally(1): exception(ExceptionA)] {...} | exception(ExceptionA) |
-| Finally.cs:247:25:247:47 | [finally: exception(ExceptionA)] throw ...; | Finally.cs:250:17:252:17 | [finally: exception(ExceptionA), finally(1): exception(ExceptionA)] {...} | exception(ExceptionA) |
-| Finally.cs:247:25:247:47 | throw ...; | Finally.cs:250:17:252:17 | [finally(1): exception(ExceptionA)] {...} | exception(ExceptionA) |
-| Finally.cs:247:31:247:46 | [finally: exception(Exception)] object creation of type ExceptionA | Finally.cs:247:25:247:47 | [finally: exception(Exception)] throw ...; |  |
-| Finally.cs:247:31:247:46 | [finally: exception(Exception)] object creation of type ExceptionA | Finally.cs:250:17:252:17 | [finally: exception(Exception), finally(1): exception(Exception)] {...} | exception(Exception) |
-| Finally.cs:247:31:247:46 | [finally: exception(ExceptionA)] object creation of type ExceptionA | Finally.cs:247:25:247:47 | [finally: exception(ExceptionA)] throw ...; |  |
-| Finally.cs:247:31:247:46 | [finally: exception(ExceptionA)] object creation of type ExceptionA | Finally.cs:250:17:252:17 | [finally: exception(ExceptionA), finally(1): exception(Exception)] {...} | exception(Exception) |
+| Finally.cs:247:25:247:47 | throw ...; | Finally.cs:250:17:252:17 | {...} | exception |
 | Finally.cs:247:31:247:46 | object creation of type ExceptionA | Finally.cs:247:25:247:47 | throw ...; |  |
-| Finally.cs:247:31:247:46 | object creation of type ExceptionA | Finally.cs:250:17:252:17 | [finally(1): exception(Exception)] {...} | exception(Exception) |
-| Finally.cs:250:17:252:17 | [finally(1): exception(Exception)] {...} | Finally.cs:251:21:251:55 | [finally(1): exception(Exception)] ...; |  |
-| Finally.cs:250:17:252:17 | [finally(1): exception(ExceptionA)] {...} | Finally.cs:251:21:251:55 | [finally(1): exception(ExceptionA)] ...; |  |
-| Finally.cs:250:17:252:17 | [finally: exception(Exception), finally(1): exception(Exception)] {...} | Finally.cs:251:21:251:55 | [finally: exception(Exception), finally(1): exception(Exception)] ...; |  |
-| Finally.cs:250:17:252:17 | [finally: exception(Exception), finally(1): exception(ExceptionA)] {...} | Finally.cs:251:21:251:55 | [finally: exception(Exception), finally(1): exception(ExceptionA)] ...; |  |
-| Finally.cs:250:17:252:17 | [finally: exception(Exception)] {...} | Finally.cs:251:21:251:55 | [finally: exception(Exception)] ...; |  |
-| Finally.cs:250:17:252:17 | [finally: exception(ExceptionA), finally(1): exception(Exception)] {...} | Finally.cs:251:21:251:55 | [finally: exception(ExceptionA), finally(1): exception(Exception)] ...; |  |
-| Finally.cs:250:17:252:17 | [finally: exception(ExceptionA), finally(1): exception(ExceptionA)] {...} | Finally.cs:251:21:251:55 | [finally: exception(ExceptionA), finally(1): exception(ExceptionA)] ...; |  |
-| Finally.cs:250:17:252:17 | [finally: exception(ExceptionA)] {...} | Finally.cs:251:21:251:55 | [finally: exception(ExceptionA)] ...; |  |
+| Finally.cs:247:31:247:46 | object creation of type ExceptionA | Finally.cs:250:17:252:17 | {...} | exception |
 | Finally.cs:250:17:252:17 | {...} | Finally.cs:251:21:251:55 | ...; |  |
-| Finally.cs:251:21:251:54 | [finally(1): exception(Exception)] call to method WriteLine | Finally.cs:257:9:259:9 | [finally: exception(Exception)] {...} | exception(Exception) |
-| Finally.cs:251:21:251:54 | [finally(1): exception(ExceptionA)] call to method WriteLine | Finally.cs:257:9:259:9 | [finally: exception(ExceptionA)] {...} | exception(ExceptionA) |
-| Finally.cs:251:21:251:54 | [finally: exception(Exception), finally(1): exception(Exception)] call to method WriteLine | Finally.cs:257:9:259:9 | [finally: exception(Exception)] {...} | exception(Exception) |
-| Finally.cs:251:21:251:54 | [finally: exception(Exception), finally(1): exception(ExceptionA)] call to method WriteLine | Finally.cs:257:9:259:9 | [finally: exception(ExceptionA)] {...} | exception(ExceptionA) |
-| Finally.cs:251:21:251:54 | [finally: exception(Exception)] call to method WriteLine | Finally.cs:257:9:259:9 | [finally: exception(Exception)] {...} | exception(Exception) |
-| Finally.cs:251:21:251:54 | [finally: exception(ExceptionA), finally(1): exception(Exception)] call to method WriteLine | Finally.cs:257:9:259:9 | [finally: exception(Exception)] {...} | exception(Exception) |
-| Finally.cs:251:21:251:54 | [finally: exception(ExceptionA), finally(1): exception(ExceptionA)] call to method WriteLine | Finally.cs:257:9:259:9 | [finally: exception(ExceptionA)] {...} | exception(ExceptionA) |
-| Finally.cs:251:21:251:54 | [finally: exception(ExceptionA)] call to method WriteLine | Finally.cs:257:9:259:9 | [finally: exception(ExceptionA)] {...} | exception(ExceptionA) |
 | Finally.cs:251:21:251:54 | call to method WriteLine | Finally.cs:254:13:254:45 | ...; |  |
+| Finally.cs:251:21:251:54 | call to method WriteLine | Finally.cs:257:9:259:9 | {...} | exception |
 | Finally.cs:251:21:251:55 | ...; | Finally.cs:251:39:251:53 | "Inner finally" |  |
-| Finally.cs:251:21:251:55 | [finally(1): exception(Exception)] ...; | Finally.cs:251:39:251:53 | [finally(1): exception(Exception)] "Inner finally" |  |
-| Finally.cs:251:21:251:55 | [finally(1): exception(ExceptionA)] ...; | Finally.cs:251:39:251:53 | [finally(1): exception(ExceptionA)] "Inner finally" |  |
-| Finally.cs:251:21:251:55 | [finally: exception(Exception), finally(1): exception(Exception)] ...; | Finally.cs:251:39:251:53 | [finally: exception(Exception), finally(1): exception(Exception)] "Inner finally" |  |
-| Finally.cs:251:21:251:55 | [finally: exception(Exception), finally(1): exception(ExceptionA)] ...; | Finally.cs:251:39:251:53 | [finally: exception(Exception), finally(1): exception(ExceptionA)] "Inner finally" |  |
-| Finally.cs:251:21:251:55 | [finally: exception(Exception)] ...; | Finally.cs:251:39:251:53 | [finally: exception(Exception)] "Inner finally" |  |
-| Finally.cs:251:21:251:55 | [finally: exception(ExceptionA), finally(1): exception(Exception)] ...; | Finally.cs:251:39:251:53 | [finally: exception(ExceptionA), finally(1): exception(Exception)] "Inner finally" |  |
-| Finally.cs:251:21:251:55 | [finally: exception(ExceptionA), finally(1): exception(ExceptionA)] ...; | Finally.cs:251:39:251:53 | [finally: exception(ExceptionA), finally(1): exception(ExceptionA)] "Inner finally" |  |
-| Finally.cs:251:21:251:55 | [finally: exception(ExceptionA)] ...; | Finally.cs:251:39:251:53 | [finally: exception(ExceptionA)] "Inner finally" |  |
 | Finally.cs:251:39:251:53 | "Inner finally" | Finally.cs:251:21:251:54 | call to method WriteLine |  |
-| Finally.cs:251:39:251:53 | [finally(1): exception(Exception)] "Inner finally" | Finally.cs:251:21:251:54 | [finally(1): exception(Exception)] call to method WriteLine |  |
-| Finally.cs:251:39:251:53 | [finally(1): exception(ExceptionA)] "Inner finally" | Finally.cs:251:21:251:54 | [finally(1): exception(ExceptionA)] call to method WriteLine |  |
-| Finally.cs:251:39:251:53 | [finally: exception(Exception), finally(1): exception(Exception)] "Inner finally" | Finally.cs:251:21:251:54 | [finally: exception(Exception), finally(1): exception(Exception)] call to method WriteLine |  |
-| Finally.cs:251:39:251:53 | [finally: exception(Exception), finally(1): exception(ExceptionA)] "Inner finally" | Finally.cs:251:21:251:54 | [finally: exception(Exception), finally(1): exception(ExceptionA)] call to method WriteLine |  |
-| Finally.cs:251:39:251:53 | [finally: exception(Exception)] "Inner finally" | Finally.cs:251:21:251:54 | [finally: exception(Exception)] call to method WriteLine |  |
-| Finally.cs:251:39:251:53 | [finally: exception(ExceptionA), finally(1): exception(Exception)] "Inner finally" | Finally.cs:251:21:251:54 | [finally: exception(ExceptionA), finally(1): exception(Exception)] call to method WriteLine |  |
-| Finally.cs:251:39:251:53 | [finally: exception(ExceptionA), finally(1): exception(ExceptionA)] "Inner finally" | Finally.cs:251:21:251:54 | [finally: exception(ExceptionA), finally(1): exception(ExceptionA)] call to method WriteLine |  |
-| Finally.cs:251:39:251:53 | [finally: exception(ExceptionA)] "Inner finally" | Finally.cs:251:21:251:54 | [finally: exception(ExceptionA)] call to method WriteLine |  |
-| Finally.cs:254:13:254:44 | call to method WriteLine | Finally.cs:257:9:259:9 | [finally: exception(Exception)] {...} | exception(Exception) |
-| Finally.cs:254:13:254:44 | call to method WriteLine | Finally.cs:257:9:259:9 | {...} |  |
+| Finally.cs:254:13:254:44 | call to method WriteLine | Finally.cs:257:9:259:9 | {...} | , exception |
 | Finally.cs:254:13:254:45 | ...; | Finally.cs:254:31:254:43 | "Mid finally" |  |
 | Finally.cs:254:31:254:43 | "Mid finally" | Finally.cs:254:13:254:44 | call to method WriteLine |  |
-| Finally.cs:257:9:259:9 | [finally: exception(Exception)] {...} | Finally.cs:258:13:258:47 | [finally: exception(Exception)] ...; |  |
-| Finally.cs:257:9:259:9 | [finally: exception(ExceptionA)] {...} | Finally.cs:258:13:258:47 | [finally: exception(ExceptionA)] ...; |  |
 | Finally.cs:257:9:259:9 | {...} | Finally.cs:258:13:258:47 | ...; |  |
-| Finally.cs:258:13:258:46 | [finally: exception(Exception)] call to method WriteLine | Finally.cs:233:10:233:12 | exit M12 (abnormal) | exception(Exception) |
-| Finally.cs:258:13:258:46 | [finally: exception(ExceptionA)] call to method WriteLine | Finally.cs:233:10:233:12 | exit M12 (abnormal) | exception(ExceptionA) |
+| Finally.cs:258:13:258:46 | call to method WriteLine | Finally.cs:233:10:233:12 | exit M12 (abnormal) | exception |
 | Finally.cs:258:13:258:46 | call to method WriteLine | Finally.cs:260:9:260:34 | ...; |  |
 | Finally.cs:258:13:258:47 | ...; | Finally.cs:258:31:258:45 | "Outer finally" |  |
-| Finally.cs:258:13:258:47 | [finally: exception(Exception)] ...; | Finally.cs:258:31:258:45 | [finally: exception(Exception)] "Outer finally" |  |
-| Finally.cs:258:13:258:47 | [finally: exception(ExceptionA)] ...; | Finally.cs:258:31:258:45 | [finally: exception(ExceptionA)] "Outer finally" |  |
 | Finally.cs:258:31:258:45 | "Outer finally" | Finally.cs:258:13:258:46 | call to method WriteLine |  |
-| Finally.cs:258:31:258:45 | [finally: exception(Exception)] "Outer finally" | Finally.cs:258:13:258:46 | [finally: exception(Exception)] call to method WriteLine |  |
-| Finally.cs:258:31:258:45 | [finally: exception(ExceptionA)] "Outer finally" | Finally.cs:258:13:258:46 | [finally: exception(ExceptionA)] call to method WriteLine |  |
 | Finally.cs:260:9:260:33 | call to method WriteLine | Finally.cs:233:10:233:12 | exit M12 (normal) |  |
 | Finally.cs:260:9:260:34 | ...; | Finally.cs:260:27:260:32 | "Done" |  |
 | Finally.cs:260:27:260:32 | "Done" | Finally.cs:260:9:260:33 | call to method WriteLine |  |
@@ -2745,28 +2053,19 @@
 | Finally.cs:264:5:274:5 | {...} | Finally.cs:265:9:273:9 | try {...} ... |  |
 | Finally.cs:265:9:273:9 | try {...} ... | Finally.cs:266:9:268:9 | {...} |  |
 | Finally.cs:266:9:268:9 | {...} | Finally.cs:267:13:267:35 | ...; |  |
-| Finally.cs:267:13:267:34 | call to method WriteLine | Finally.cs:270:9:273:9 | [finally: exception(Exception)] {...} | exception(Exception) |
-| Finally.cs:267:13:267:34 | call to method WriteLine | Finally.cs:270:9:273:9 | {...} |  |
+| Finally.cs:267:13:267:34 | call to method WriteLine | Finally.cs:270:9:273:9 | {...} | , exception |
 | Finally.cs:267:13:267:35 | ...; | Finally.cs:267:31:267:33 | "1" |  |
 | Finally.cs:267:31:267:33 | "1" | Finally.cs:267:13:267:34 | call to method WriteLine |  |
-| Finally.cs:270:9:273:9 | [finally: exception(Exception)] {...} | Finally.cs:271:13:271:35 | [finally: exception(Exception)] ...; |  |
 | Finally.cs:270:9:273:9 | {...} | Finally.cs:271:13:271:35 | ...; |  |
-| Finally.cs:271:13:271:34 | [finally: exception(Exception)] call to method WriteLine | Finally.cs:272:13:272:19 | [finally: exception(Exception)] ...; |  |
 | Finally.cs:271:13:271:34 | call to method WriteLine | Finally.cs:272:13:272:19 | ...; |  |
 | Finally.cs:271:13:271:35 | ...; | Finally.cs:271:31:271:33 | "3" |  |
-| Finally.cs:271:13:271:35 | [finally: exception(Exception)] ...; | Finally.cs:271:31:271:33 | [finally: exception(Exception)] "3" |  |
 | Finally.cs:271:31:271:33 | "3" | Finally.cs:271:13:271:34 | call to method WriteLine |  |
-| Finally.cs:271:31:271:33 | [finally: exception(Exception)] "3" | Finally.cs:271:13:271:34 | [finally: exception(Exception)] call to method WriteLine |  |
-| Finally.cs:272:13:272:13 | [finally: exception(Exception)] access to parameter i | Finally.cs:272:18:272:18 | [finally: exception(Exception)] 3 |  |
 | Finally.cs:272:13:272:13 | access to parameter i | Finally.cs:272:18:272:18 | 3 |  |
 | Finally.cs:272:13:272:18 | ... + ... | Finally.cs:272:13:272:18 | ... = ... |  |
+| Finally.cs:272:13:272:18 | ... = ... | Finally.cs:263:10:263:12 | exit M13 (abnormal) | exception |
 | Finally.cs:272:13:272:18 | ... = ... | Finally.cs:263:10:263:12 | exit M13 (normal) |  |
-| Finally.cs:272:13:272:18 | [finally: exception(Exception)] ... + ... | Finally.cs:272:13:272:18 | [finally: exception(Exception)] ... = ... |  |
-| Finally.cs:272:13:272:18 | [finally: exception(Exception)] ... = ... | Finally.cs:263:10:263:12 | exit M13 (abnormal) | exception(Exception) |
 | Finally.cs:272:13:272:19 | ...; | Finally.cs:272:13:272:13 | access to parameter i |  |
-| Finally.cs:272:13:272:19 | [finally: exception(Exception)] ...; | Finally.cs:272:13:272:13 | [finally: exception(Exception)] access to parameter i |  |
 | Finally.cs:272:18:272:18 | 3 | Finally.cs:272:13:272:18 | ... + ... |  |
-| Finally.cs:272:18:272:18 | [finally: exception(Exception)] 3 | Finally.cs:272:13:272:18 | [finally: exception(Exception)] ... + ... |  |
 | Foreach.cs:4:7:4:13 | call to constructor Object | Foreach.cs:4:7:4:13 | {...} |  |
 | Foreach.cs:4:7:4:13 | enter Foreach | Foreach.cs:4:7:4:13 | call to constructor Object |  |
 | Foreach.cs:4:7:4:13 | exit Foreach (normal) | Foreach.cs:4:7:4:13 | exit Foreach |  |
@@ -3056,11 +2355,10 @@
 | LoopUnrolling.cs:9:13:9:28 | ... == ... | LoopUnrolling.cs:11:29:11:32 | access to parameter args | false |
 | LoopUnrolling.cs:9:28:9:28 | 0 | LoopUnrolling.cs:9:13:9:28 | ... == ... |  |
 | LoopUnrolling.cs:10:13:10:19 | return ...; | LoopUnrolling.cs:7:10:7:11 | exit M1 (normal) | return |
-| LoopUnrolling.cs:11:9:12:35 | [unroll (line 11)] foreach (... ... in ...) ... | LoopUnrolling.cs:11:22:11:24 | String arg | non-empty |
 | LoopUnrolling.cs:11:9:12:35 | foreach (... ... in ...) ... | LoopUnrolling.cs:7:10:7:11 | exit M1 (normal) | empty |
 | LoopUnrolling.cs:11:9:12:35 | foreach (... ... in ...) ... | LoopUnrolling.cs:11:22:11:24 | String arg | non-empty |
 | LoopUnrolling.cs:11:22:11:24 | String arg | LoopUnrolling.cs:12:13:12:35 | ...; |  |
-| LoopUnrolling.cs:11:29:11:32 | access to parameter args | LoopUnrolling.cs:11:9:12:35 | [unroll (line 11)] foreach (... ... in ...) ... |  |
+| LoopUnrolling.cs:11:29:11:32 | access to parameter args | LoopUnrolling.cs:11:9:12:35 | foreach (... ... in ...) ... |  |
 | LoopUnrolling.cs:12:13:12:34 | call to method WriteLine | LoopUnrolling.cs:11:9:12:35 | foreach (... ... in ...) ... |  |
 | LoopUnrolling.cs:12:13:12:35 | ...; | LoopUnrolling.cs:12:31:12:33 | access to local variable arg |  |
 | LoopUnrolling.cs:12:31:12:33 | access to local variable arg | LoopUnrolling.cs:12:13:12:34 | call to method WriteLine |  |
@@ -3075,11 +2373,10 @@
 | LoopUnrolling.cs:17:33:17:35 | "a" | LoopUnrolling.cs:17:38:17:40 | "b" |  |
 | LoopUnrolling.cs:17:38:17:40 | "b" | LoopUnrolling.cs:17:43:17:45 | "c" |  |
 | LoopUnrolling.cs:17:43:17:45 | "c" | LoopUnrolling.cs:17:31:17:47 | { ..., ... } |  |
-| LoopUnrolling.cs:18:9:19:33 | [unroll (line 18)] foreach (... ... in ...) ... | LoopUnrolling.cs:18:22:18:22 | String x | non-empty |
 | LoopUnrolling.cs:18:9:19:33 | foreach (... ... in ...) ... | LoopUnrolling.cs:15:10:15:11 | exit M2 (normal) | empty |
 | LoopUnrolling.cs:18:9:19:33 | foreach (... ... in ...) ... | LoopUnrolling.cs:18:22:18:22 | String x | non-empty |
 | LoopUnrolling.cs:18:22:18:22 | String x | LoopUnrolling.cs:19:13:19:33 | ...; |  |
-| LoopUnrolling.cs:18:27:18:28 | access to local variable xs | LoopUnrolling.cs:18:9:19:33 | [unroll (line 18)] foreach (... ... in ...) ... |  |
+| LoopUnrolling.cs:18:27:18:28 | access to local variable xs | LoopUnrolling.cs:18:9:19:33 | foreach (... ... in ...) ... |  |
 | LoopUnrolling.cs:19:13:19:32 | call to method WriteLine | LoopUnrolling.cs:18:9:19:33 | foreach (... ... in ...) ... |  |
 | LoopUnrolling.cs:19:13:19:33 | ...; | LoopUnrolling.cs:19:31:19:31 | access to local variable x |  |
 | LoopUnrolling.cs:19:31:19:31 | access to local variable x | LoopUnrolling.cs:19:13:19:32 | call to method WriteLine |  |
@@ -3090,11 +2387,10 @@
 | LoopUnrolling.cs:24:9:26:40 | foreach (... ... in ...) ... | LoopUnrolling.cs:24:22:24:24 | Char arg | non-empty |
 | LoopUnrolling.cs:24:22:24:24 | Char arg | LoopUnrolling.cs:25:34:25:37 | access to parameter args |  |
 | LoopUnrolling.cs:24:29:24:32 | access to parameter args | LoopUnrolling.cs:24:9:26:40 | foreach (... ... in ...) ... |  |
-| LoopUnrolling.cs:25:13:26:40 | [unroll (line 25)] foreach (... ... in ...) ... | LoopUnrolling.cs:25:26:25:29 | Char arg0 | non-empty |
 | LoopUnrolling.cs:25:13:26:40 | foreach (... ... in ...) ... | LoopUnrolling.cs:24:9:26:40 | foreach (... ... in ...) ... | empty |
 | LoopUnrolling.cs:25:13:26:40 | foreach (... ... in ...) ... | LoopUnrolling.cs:25:26:25:29 | Char arg0 | non-empty |
 | LoopUnrolling.cs:25:26:25:29 | Char arg0 | LoopUnrolling.cs:26:17:26:40 | ...; |  |
-| LoopUnrolling.cs:25:34:25:37 | access to parameter args | LoopUnrolling.cs:25:13:26:40 | [unroll (line 25)] foreach (... ... in ...) ... |  |
+| LoopUnrolling.cs:25:34:25:37 | access to parameter args | LoopUnrolling.cs:25:13:26:40 | foreach (... ... in ...) ... |  |
 | LoopUnrolling.cs:26:17:26:39 | call to method WriteLine | LoopUnrolling.cs:25:13:26:40 | foreach (... ... in ...) ... |  |
 | LoopUnrolling.cs:26:17:26:40 | ...; | LoopUnrolling.cs:26:35:26:38 | access to local variable arg0 |  |
 | LoopUnrolling.cs:26:35:26:38 | access to local variable arg0 | LoopUnrolling.cs:26:17:26:39 | call to method WriteLine |  |
@@ -3105,8 +2401,13 @@
 | LoopUnrolling.cs:31:13:31:30 | String[] xs = ... | LoopUnrolling.cs:32:27:32:28 | access to local variable xs |  |
 | LoopUnrolling.cs:31:18:31:30 | array creation of type String[] | LoopUnrolling.cs:31:13:31:30 | String[] xs = ... |  |
 | LoopUnrolling.cs:31:29:31:29 | 0 | LoopUnrolling.cs:31:18:31:30 | array creation of type String[] |  |
-| LoopUnrolling.cs:32:9:33:33 | [skip (line 32)] foreach (... ... in ...) ... | LoopUnrolling.cs:29:10:29:11 | exit M4 (normal) | empty |
-| LoopUnrolling.cs:32:27:32:28 | access to local variable xs | LoopUnrolling.cs:32:9:33:33 | [skip (line 32)] foreach (... ... in ...) ... |  |
+| LoopUnrolling.cs:32:9:33:33 | foreach (... ... in ...) ... | LoopUnrolling.cs:29:10:29:11 | exit M4 (normal) | empty |
+| LoopUnrolling.cs:32:9:33:33 | foreach (... ... in ...) ... | LoopUnrolling.cs:32:22:32:22 | String x | non-empty |
+| LoopUnrolling.cs:32:22:32:22 | String x | LoopUnrolling.cs:33:13:33:33 | ...; |  |
+| LoopUnrolling.cs:32:27:32:28 | access to local variable xs | LoopUnrolling.cs:32:9:33:33 | foreach (... ... in ...) ... |  |
+| LoopUnrolling.cs:33:13:33:32 | call to method WriteLine | LoopUnrolling.cs:32:9:33:33 | foreach (... ... in ...) ... |  |
+| LoopUnrolling.cs:33:13:33:33 | ...; | LoopUnrolling.cs:33:31:33:31 | access to local variable x |  |
+| LoopUnrolling.cs:33:31:33:31 | access to local variable x | LoopUnrolling.cs:33:13:33:32 | call to method WriteLine |  |
 | LoopUnrolling.cs:36:10:36:11 | enter M5 | LoopUnrolling.cs:37:5:43:5 | {...} |  |
 | LoopUnrolling.cs:36:10:36:11 | exit M5 (normal) | LoopUnrolling.cs:36:10:36:11 | exit M5 |  |
 | LoopUnrolling.cs:37:5:43:5 | {...} | LoopUnrolling.cs:38:9:38:48 | ... ...; |  |
@@ -3126,22 +2427,21 @@
 | LoopUnrolling.cs:39:33:39:35 | "0" | LoopUnrolling.cs:39:38:39:40 | "1" |  |
 | LoopUnrolling.cs:39:38:39:40 | "1" | LoopUnrolling.cs:39:43:39:45 | "2" |  |
 | LoopUnrolling.cs:39:43:39:45 | "2" | LoopUnrolling.cs:39:31:39:47 | { ..., ... } |  |
-| LoopUnrolling.cs:40:9:42:41 | [unroll (line 40)] foreach (... ... in ...) ... | LoopUnrolling.cs:40:22:40:22 | String x | non-empty |
 | LoopUnrolling.cs:40:9:42:41 | foreach (... ... in ...) ... | LoopUnrolling.cs:36:10:36:11 | exit M5 (normal) | empty |
 | LoopUnrolling.cs:40:9:42:41 | foreach (... ... in ...) ... | LoopUnrolling.cs:40:22:40:22 | String x | non-empty |
 | LoopUnrolling.cs:40:22:40:22 | String x | LoopUnrolling.cs:41:31:41:32 | access to local variable ys |  |
-| LoopUnrolling.cs:40:27:40:28 | access to local variable xs | LoopUnrolling.cs:40:9:42:41 | [unroll (line 40)] foreach (... ... in ...) ... |  |
-| LoopUnrolling.cs:41:13:42:41 | [unroll (line 41)] foreach (... ... in ...) ... | LoopUnrolling.cs:41:26:41:26 | String y | non-empty |
+| LoopUnrolling.cs:40:27:40:28 | access to local variable xs | LoopUnrolling.cs:40:9:42:41 | foreach (... ... in ...) ... |  |
 | LoopUnrolling.cs:41:13:42:41 | foreach (... ... in ...) ... | LoopUnrolling.cs:40:9:42:41 | foreach (... ... in ...) ... | empty |
 | LoopUnrolling.cs:41:13:42:41 | foreach (... ... in ...) ... | LoopUnrolling.cs:41:26:41:26 | String y | non-empty |
 | LoopUnrolling.cs:41:26:41:26 | String y | LoopUnrolling.cs:42:17:42:41 | ...; |  |
-| LoopUnrolling.cs:41:31:41:32 | access to local variable ys | LoopUnrolling.cs:41:13:42:41 | [unroll (line 41)] foreach (... ... in ...) ... |  |
+| LoopUnrolling.cs:41:31:41:32 | access to local variable ys | LoopUnrolling.cs:41:13:42:41 | foreach (... ... in ...) ... |  |
 | LoopUnrolling.cs:42:17:42:40 | call to method WriteLine | LoopUnrolling.cs:41:13:42:41 | foreach (... ... in ...) ... |  |
 | LoopUnrolling.cs:42:17:42:41 | ...; | LoopUnrolling.cs:42:35:42:35 | access to local variable x |  |
 | LoopUnrolling.cs:42:35:42:35 | access to local variable x | LoopUnrolling.cs:42:39:42:39 | access to local variable y |  |
 | LoopUnrolling.cs:42:35:42:39 | ... + ... | LoopUnrolling.cs:42:17:42:40 | call to method WriteLine |  |
 | LoopUnrolling.cs:42:39:42:39 | access to local variable y | LoopUnrolling.cs:42:35:42:39 | ... + ... |  |
 | LoopUnrolling.cs:45:10:45:11 | enter M6 | LoopUnrolling.cs:46:5:53:5 | {...} |  |
+| LoopUnrolling.cs:45:10:45:11 | exit M6 (normal) | LoopUnrolling.cs:45:10:45:11 | exit M6 |  |
 | LoopUnrolling.cs:46:5:53:5 | {...} | LoopUnrolling.cs:47:9:47:48 | ... ...; |  |
 | LoopUnrolling.cs:47:9:47:48 | ... ...; | LoopUnrolling.cs:47:18:47:47 | 3 |  |
 | LoopUnrolling.cs:47:13:47:47 | String[] xs = ... | LoopUnrolling.cs:48:27:48:28 | access to local variable xs |  |
@@ -3151,15 +2451,16 @@
 | LoopUnrolling.cs:47:33:47:35 | "a" | LoopUnrolling.cs:47:38:47:40 | "b" |  |
 | LoopUnrolling.cs:47:38:47:40 | "b" | LoopUnrolling.cs:47:43:47:45 | "c" |  |
 | LoopUnrolling.cs:47:43:47:45 | "c" | LoopUnrolling.cs:47:31:47:47 | { ..., ... } |  |
-| LoopUnrolling.cs:48:9:52:9 | [unroll (line 48)] foreach (... ... in ...) ... | LoopUnrolling.cs:48:22:48:22 | String x | non-empty |
+| LoopUnrolling.cs:48:9:52:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:45:10:45:11 | exit M6 (normal) | empty |
+| LoopUnrolling.cs:48:9:52:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:48:22:48:22 | String x | non-empty |
 | LoopUnrolling.cs:48:22:48:22 | String x | LoopUnrolling.cs:49:9:52:9 | {...} |  |
-| LoopUnrolling.cs:48:27:48:28 | access to local variable xs | LoopUnrolling.cs:48:9:52:9 | [unroll (line 48)] foreach (... ... in ...) ... |  |
+| LoopUnrolling.cs:48:27:48:28 | access to local variable xs | LoopUnrolling.cs:48:9:52:9 | foreach (... ... in ...) ... |  |
 | LoopUnrolling.cs:49:9:52:9 | {...} | LoopUnrolling.cs:50:9:50:13 | Label: |  |
 | LoopUnrolling.cs:50:9:50:13 | Label: | LoopUnrolling.cs:50:16:50:36 | ...; |  |
 | LoopUnrolling.cs:50:16:50:35 | call to method WriteLine | LoopUnrolling.cs:51:13:51:23 | goto ...; |  |
 | LoopUnrolling.cs:50:16:50:36 | ...; | LoopUnrolling.cs:50:34:50:34 | access to local variable x |  |
 | LoopUnrolling.cs:50:34:50:34 | access to local variable x | LoopUnrolling.cs:50:16:50:35 | call to method WriteLine |  |
-| LoopUnrolling.cs:51:13:51:23 | goto ...; | LoopUnrolling.cs:50:9:50:13 | Label: | goto(Label) |
+| LoopUnrolling.cs:51:13:51:23 | goto ...; | LoopUnrolling.cs:50:9:50:13 | Label: | goto |
 | LoopUnrolling.cs:55:10:55:11 | enter M7 | LoopUnrolling.cs:56:5:65:5 | {...} |  |
 | LoopUnrolling.cs:55:10:55:11 | exit M7 (normal) | LoopUnrolling.cs:55:10:55:11 | exit M7 |  |
 | LoopUnrolling.cs:56:5:65:5 | {...} | LoopUnrolling.cs:57:9:57:48 | ... ...; |  |
@@ -3171,35 +2472,23 @@
 | LoopUnrolling.cs:57:33:57:35 | "a" | LoopUnrolling.cs:57:38:57:40 | "b" |  |
 | LoopUnrolling.cs:57:38:57:40 | "b" | LoopUnrolling.cs:57:43:57:45 | "c" |  |
 | LoopUnrolling.cs:57:43:57:45 | "c" | LoopUnrolling.cs:57:31:57:47 | { ..., ... } |  |
-| LoopUnrolling.cs:58:9:64:9 | [b (line 55): false] foreach (... ... in ...) ... | LoopUnrolling.cs:55:10:55:11 | exit M7 (normal) | empty |
-| LoopUnrolling.cs:58:9:64:9 | [b (line 55): false] foreach (... ... in ...) ... | LoopUnrolling.cs:58:22:58:22 | [b (line 55): false] String x | non-empty |
-| LoopUnrolling.cs:58:9:64:9 | [b (line 55): true] foreach (... ... in ...) ... | LoopUnrolling.cs:55:10:55:11 | exit M7 (normal) | empty |
-| LoopUnrolling.cs:58:9:64:9 | [b (line 55): true] foreach (... ... in ...) ... | LoopUnrolling.cs:58:22:58:22 | [b (line 55): true] String x | non-empty |
-| LoopUnrolling.cs:58:9:64:9 | [unroll (line 58)] foreach (... ... in ...) ... | LoopUnrolling.cs:58:22:58:22 | String x | non-empty |
+| LoopUnrolling.cs:58:9:64:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:55:10:55:11 | exit M7 (normal) | empty |
+| LoopUnrolling.cs:58:9:64:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:58:22:58:22 | String x | non-empty |
 | LoopUnrolling.cs:58:22:58:22 | String x | LoopUnrolling.cs:59:9:64:9 | {...} |  |
-| LoopUnrolling.cs:58:22:58:22 | [b (line 55): false] String x | LoopUnrolling.cs:59:9:64:9 | [b (line 55): false] {...} |  |
-| LoopUnrolling.cs:58:22:58:22 | [b (line 55): true] String x | LoopUnrolling.cs:59:9:64:9 | [b (line 55): true] {...} |  |
-| LoopUnrolling.cs:58:27:58:28 | access to local variable xs | LoopUnrolling.cs:58:9:64:9 | [unroll (line 58)] foreach (... ... in ...) ... |  |
-| LoopUnrolling.cs:59:9:64:9 | [b (line 55): false] {...} | LoopUnrolling.cs:60:13:61:37 | [b (line 55): false] if (...) ... |  |
-| LoopUnrolling.cs:59:9:64:9 | [b (line 55): true] {...} | LoopUnrolling.cs:60:13:61:37 | [b (line 55): true] if (...) ... |  |
+| LoopUnrolling.cs:58:27:58:28 | access to local variable xs | LoopUnrolling.cs:58:9:64:9 | foreach (... ... in ...) ... |  |
 | LoopUnrolling.cs:59:9:64:9 | {...} | LoopUnrolling.cs:60:13:61:37 | if (...) ... |  |
-| LoopUnrolling.cs:60:13:61:37 | [b (line 55): false] if (...) ... | LoopUnrolling.cs:60:17:60:17 | [b (line 55): false] access to parameter b |  |
-| LoopUnrolling.cs:60:13:61:37 | [b (line 55): true] if (...) ... | LoopUnrolling.cs:60:17:60:17 | [b (line 55): true] access to parameter b |  |
 | LoopUnrolling.cs:60:13:61:37 | if (...) ... | LoopUnrolling.cs:60:17:60:17 | access to parameter b |  |
-| LoopUnrolling.cs:60:17:60:17 | [b (line 55): false] access to parameter b | LoopUnrolling.cs:62:13:63:37 | [b (line 55): false] if (...) ... | false |
-| LoopUnrolling.cs:60:17:60:17 | [b (line 55): true] access to parameter b | LoopUnrolling.cs:61:17:61:37 | [b (line 55): true] ...; | true |
-| LoopUnrolling.cs:60:17:60:17 | access to parameter b | LoopUnrolling.cs:61:17:61:37 | [b (line 55): true] ...; | true |
-| LoopUnrolling.cs:60:17:60:17 | access to parameter b | LoopUnrolling.cs:62:13:63:37 | [b (line 55): false] if (...) ... | false |
-| LoopUnrolling.cs:61:17:61:36 | [b (line 55): true] call to method WriteLine | LoopUnrolling.cs:62:13:63:37 | [b (line 55): true] if (...) ... |  |
-| LoopUnrolling.cs:61:17:61:37 | [b (line 55): true] ...; | LoopUnrolling.cs:61:35:61:35 | [b (line 55): true] access to local variable x |  |
-| LoopUnrolling.cs:61:35:61:35 | [b (line 55): true] access to local variable x | LoopUnrolling.cs:61:17:61:36 | [b (line 55): true] call to method WriteLine |  |
-| LoopUnrolling.cs:62:13:63:37 | [b (line 55): false] if (...) ... | LoopUnrolling.cs:62:17:62:17 | [b (line 55): false] access to parameter b |  |
-| LoopUnrolling.cs:62:13:63:37 | [b (line 55): true] if (...) ... | LoopUnrolling.cs:62:17:62:17 | [b (line 55): true] access to parameter b |  |
-| LoopUnrolling.cs:62:17:62:17 | [b (line 55): false] access to parameter b | LoopUnrolling.cs:58:9:64:9 | [b (line 55): false] foreach (... ... in ...) ... | false |
-| LoopUnrolling.cs:62:17:62:17 | [b (line 55): true] access to parameter b | LoopUnrolling.cs:63:17:63:37 | [b (line 55): true] ...; | true |
-| LoopUnrolling.cs:63:17:63:36 | [b (line 55): true] call to method WriteLine | LoopUnrolling.cs:58:9:64:9 | [b (line 55): true] foreach (... ... in ...) ... |  |
-| LoopUnrolling.cs:63:17:63:37 | [b (line 55): true] ...; | LoopUnrolling.cs:63:35:63:35 | [b (line 55): true] access to local variable x |  |
-| LoopUnrolling.cs:63:35:63:35 | [b (line 55): true] access to local variable x | LoopUnrolling.cs:63:17:63:36 | [b (line 55): true] call to method WriteLine |  |
+| LoopUnrolling.cs:60:17:60:17 | access to parameter b | LoopUnrolling.cs:61:17:61:37 | ...; | true |
+| LoopUnrolling.cs:60:17:60:17 | access to parameter b | LoopUnrolling.cs:62:13:63:37 | if (...) ... | false |
+| LoopUnrolling.cs:61:17:61:36 | call to method WriteLine | LoopUnrolling.cs:62:13:63:37 | if (...) ... |  |
+| LoopUnrolling.cs:61:17:61:37 | ...; | LoopUnrolling.cs:61:35:61:35 | access to local variable x |  |
+| LoopUnrolling.cs:61:35:61:35 | access to local variable x | LoopUnrolling.cs:61:17:61:36 | call to method WriteLine |  |
+| LoopUnrolling.cs:62:13:63:37 | if (...) ... | LoopUnrolling.cs:62:17:62:17 | access to parameter b |  |
+| LoopUnrolling.cs:62:17:62:17 | access to parameter b | LoopUnrolling.cs:58:9:64:9 | foreach (... ... in ...) ... | false |
+| LoopUnrolling.cs:62:17:62:17 | access to parameter b | LoopUnrolling.cs:63:17:63:37 | ...; | true |
+| LoopUnrolling.cs:63:17:63:36 | call to method WriteLine | LoopUnrolling.cs:58:9:64:9 | foreach (... ... in ...) ... |  |
+| LoopUnrolling.cs:63:17:63:37 | ...; | LoopUnrolling.cs:63:35:63:35 | access to local variable x |  |
+| LoopUnrolling.cs:63:35:63:35 | access to local variable x | LoopUnrolling.cs:63:17:63:36 | call to method WriteLine |  |
 | LoopUnrolling.cs:67:10:67:11 | enter M8 | LoopUnrolling.cs:68:5:74:5 | {...} |  |
 | LoopUnrolling.cs:67:10:67:11 | exit M8 (normal) | LoopUnrolling.cs:67:10:67:11 | exit M8 |  |
 | LoopUnrolling.cs:68:5:74:5 | {...} | LoopUnrolling.cs:69:9:70:19 | if (...) ... |  |
@@ -3213,8 +2502,13 @@
 | LoopUnrolling.cs:71:9:71:12 | access to parameter args | LoopUnrolling.cs:71:9:71:20 | call to method Clear |  |
 | LoopUnrolling.cs:71:9:71:20 | call to method Clear | LoopUnrolling.cs:72:29:72:32 | access to parameter args |  |
 | LoopUnrolling.cs:71:9:71:21 | ...; | LoopUnrolling.cs:71:9:71:12 | access to parameter args |  |
-| LoopUnrolling.cs:72:9:73:35 | [skip (line 72)] foreach (... ... in ...) ... | LoopUnrolling.cs:67:10:67:11 | exit M8 (normal) | empty |
-| LoopUnrolling.cs:72:29:72:32 | access to parameter args | LoopUnrolling.cs:72:9:73:35 | [skip (line 72)] foreach (... ... in ...) ... |  |
+| LoopUnrolling.cs:72:9:73:35 | foreach (... ... in ...) ... | LoopUnrolling.cs:67:10:67:11 | exit M8 (normal) | empty |
+| LoopUnrolling.cs:72:9:73:35 | foreach (... ... in ...) ... | LoopUnrolling.cs:72:22:72:24 | String arg | non-empty |
+| LoopUnrolling.cs:72:22:72:24 | String arg | LoopUnrolling.cs:73:13:73:35 | ...; |  |
+| LoopUnrolling.cs:72:29:72:32 | access to parameter args | LoopUnrolling.cs:72:9:73:35 | foreach (... ... in ...) ... |  |
+| LoopUnrolling.cs:73:13:73:34 | call to method WriteLine | LoopUnrolling.cs:72:9:73:35 | foreach (... ... in ...) ... |  |
+| LoopUnrolling.cs:73:13:73:35 | ...; | LoopUnrolling.cs:73:31:73:33 | access to local variable arg |  |
+| LoopUnrolling.cs:73:31:73:33 | access to local variable arg | LoopUnrolling.cs:73:13:73:34 | call to method WriteLine |  |
 | LoopUnrolling.cs:76:10:76:11 | enter M9 | LoopUnrolling.cs:77:5:83:5 | {...} |  |
 | LoopUnrolling.cs:76:10:76:11 | exit M9 (normal) | LoopUnrolling.cs:76:10:76:11 | exit M9 |  |
 | LoopUnrolling.cs:77:5:83:5 | {...} | LoopUnrolling.cs:78:9:78:34 | ... ...; |  |
@@ -3223,8 +2517,14 @@
 | LoopUnrolling.cs:78:18:78:33 | array creation of type String[,] | LoopUnrolling.cs:78:13:78:33 | String[,] xs = ... |  |
 | LoopUnrolling.cs:78:29:78:29 | 2 | LoopUnrolling.cs:78:32:78:32 | 0 |  |
 | LoopUnrolling.cs:78:32:78:32 | 0 | LoopUnrolling.cs:78:18:78:33 | array creation of type String[,] |  |
-| LoopUnrolling.cs:79:9:82:9 | [skip (line 79)] foreach (... ... in ...) ... | LoopUnrolling.cs:76:10:76:11 | exit M9 (normal) | empty |
-| LoopUnrolling.cs:79:27:79:28 | access to local variable xs | LoopUnrolling.cs:79:9:82:9 | [skip (line 79)] foreach (... ... in ...) ... |  |
+| LoopUnrolling.cs:79:9:82:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:76:10:76:11 | exit M9 (normal) | empty |
+| LoopUnrolling.cs:79:9:82:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:79:22:79:22 | String x | non-empty |
+| LoopUnrolling.cs:79:22:79:22 | String x | LoopUnrolling.cs:80:9:82:9 | {...} |  |
+| LoopUnrolling.cs:79:27:79:28 | access to local variable xs | LoopUnrolling.cs:79:9:82:9 | foreach (... ... in ...) ... |  |
+| LoopUnrolling.cs:80:9:82:9 | {...} | LoopUnrolling.cs:81:13:81:33 | ...; |  |
+| LoopUnrolling.cs:81:13:81:32 | call to method WriteLine | LoopUnrolling.cs:79:9:82:9 | foreach (... ... in ...) ... |  |
+| LoopUnrolling.cs:81:13:81:33 | ...; | LoopUnrolling.cs:81:31:81:31 | access to local variable x |  |
+| LoopUnrolling.cs:81:31:81:31 | access to local variable x | LoopUnrolling.cs:81:13:81:32 | call to method WriteLine |  |
 | LoopUnrolling.cs:85:10:85:12 | enter M10 | LoopUnrolling.cs:86:5:92:5 | {...} |  |
 | LoopUnrolling.cs:85:10:85:12 | exit M10 (normal) | LoopUnrolling.cs:85:10:85:12 | exit M10 |  |
 | LoopUnrolling.cs:86:5:92:5 | {...} | LoopUnrolling.cs:87:9:87:34 | ... ...; |  |
@@ -3233,8 +2533,14 @@
 | LoopUnrolling.cs:87:18:87:33 | array creation of type String[,] | LoopUnrolling.cs:87:13:87:33 | String[,] xs = ... |  |
 | LoopUnrolling.cs:87:29:87:29 | 0 | LoopUnrolling.cs:87:32:87:32 | 2 |  |
 | LoopUnrolling.cs:87:32:87:32 | 2 | LoopUnrolling.cs:87:18:87:33 | array creation of type String[,] |  |
-| LoopUnrolling.cs:88:9:91:9 | [skip (line 88)] foreach (... ... in ...) ... | LoopUnrolling.cs:85:10:85:12 | exit M10 (normal) | empty |
-| LoopUnrolling.cs:88:27:88:28 | access to local variable xs | LoopUnrolling.cs:88:9:91:9 | [skip (line 88)] foreach (... ... in ...) ... |  |
+| LoopUnrolling.cs:88:9:91:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:85:10:85:12 | exit M10 (normal) | empty |
+| LoopUnrolling.cs:88:9:91:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:88:22:88:22 | String x | non-empty |
+| LoopUnrolling.cs:88:22:88:22 | String x | LoopUnrolling.cs:89:9:91:9 | {...} |  |
+| LoopUnrolling.cs:88:27:88:28 | access to local variable xs | LoopUnrolling.cs:88:9:91:9 | foreach (... ... in ...) ... |  |
+| LoopUnrolling.cs:89:9:91:9 | {...} | LoopUnrolling.cs:90:13:90:33 | ...; |  |
+| LoopUnrolling.cs:90:13:90:32 | call to method WriteLine | LoopUnrolling.cs:88:9:91:9 | foreach (... ... in ...) ... |  |
+| LoopUnrolling.cs:90:13:90:33 | ...; | LoopUnrolling.cs:90:31:90:31 | access to local variable x |  |
+| LoopUnrolling.cs:90:31:90:31 | access to local variable x | LoopUnrolling.cs:90:13:90:32 | call to method WriteLine |  |
 | LoopUnrolling.cs:94:10:94:12 | enter M11 | LoopUnrolling.cs:95:5:101:5 | {...} |  |
 | LoopUnrolling.cs:94:10:94:12 | exit M11 (normal) | LoopUnrolling.cs:94:10:94:12 | exit M11 |  |
 | LoopUnrolling.cs:95:5:101:5 | {...} | LoopUnrolling.cs:96:9:96:34 | ... ...; |  |
@@ -3243,11 +2549,10 @@
 | LoopUnrolling.cs:96:18:96:33 | array creation of type String[,] | LoopUnrolling.cs:96:13:96:33 | String[,] xs = ... |  |
 | LoopUnrolling.cs:96:29:96:29 | 2 | LoopUnrolling.cs:96:32:96:32 | 2 |  |
 | LoopUnrolling.cs:96:32:96:32 | 2 | LoopUnrolling.cs:96:18:96:33 | array creation of type String[,] |  |
-| LoopUnrolling.cs:97:9:100:9 | [unroll (line 97)] foreach (... ... in ...) ... | LoopUnrolling.cs:97:22:97:22 | String x | non-empty |
 | LoopUnrolling.cs:97:9:100:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:94:10:94:12 | exit M11 (normal) | empty |
 | LoopUnrolling.cs:97:9:100:9 | foreach (... ... in ...) ... | LoopUnrolling.cs:97:22:97:22 | String x | non-empty |
 | LoopUnrolling.cs:97:22:97:22 | String x | LoopUnrolling.cs:98:9:100:9 | {...} |  |
-| LoopUnrolling.cs:97:27:97:28 | access to local variable xs | LoopUnrolling.cs:97:9:100:9 | [unroll (line 97)] foreach (... ... in ...) ... |  |
+| LoopUnrolling.cs:97:27:97:28 | access to local variable xs | LoopUnrolling.cs:97:9:100:9 | foreach (... ... in ...) ... |  |
 | LoopUnrolling.cs:98:9:100:9 | {...} | LoopUnrolling.cs:99:13:99:33 | ...; |  |
 | LoopUnrolling.cs:99:13:99:32 | call to method WriteLine | LoopUnrolling.cs:97:9:100:9 | foreach (... ... in ...) ... |  |
 | LoopUnrolling.cs:99:13:99:33 | ...; | LoopUnrolling.cs:99:31:99:31 | access to local variable x |  |
@@ -3261,27 +2566,27 @@
 | MultiImplementationA.cs:6:22:6:31 | enter get_P1 | MultiImplementationB.cs:3:22:3:22 | 0 |  |
 | MultiImplementationA.cs:6:22:6:31 | exit get_P1 (abnormal) | MultiImplementationA.cs:6:22:6:31 | exit get_P1 |  |
 | MultiImplementationA.cs:6:22:6:31 | exit get_P1 (normal) | MultiImplementationA.cs:6:22:6:31 | exit get_P1 |  |
-| MultiImplementationA.cs:6:22:6:31 | throw ... | MultiImplementationA.cs:6:22:6:31 | exit get_P1 (abnormal) | exception(NullReferenceException) |
+| MultiImplementationA.cs:6:22:6:31 | throw ... | MultiImplementationA.cs:6:22:6:31 | exit get_P1 (abnormal) | exception |
 | MultiImplementationA.cs:6:28:6:31 | null | MultiImplementationA.cs:6:22:6:31 | throw ... |  |
 | MultiImplementationA.cs:7:21:7:23 | enter get_P2 | MultiImplementationA.cs:7:25:7:39 | {...} |  |
 | MultiImplementationA.cs:7:21:7:23 | enter get_P2 | MultiImplementationB.cs:4:25:4:37 | {...} |  |
 | MultiImplementationA.cs:7:21:7:23 | exit get_P2 (abnormal) | MultiImplementationA.cs:7:21:7:23 | exit get_P2 |  |
 | MultiImplementationA.cs:7:21:7:23 | exit get_P2 (normal) | MultiImplementationA.cs:7:21:7:23 | exit get_P2 |  |
 | MultiImplementationA.cs:7:25:7:39 | {...} | MultiImplementationA.cs:7:33:7:36 | null |  |
-| MultiImplementationA.cs:7:27:7:37 | throw ...; | MultiImplementationA.cs:7:21:7:23 | exit get_P2 (abnormal) | exception(NullReferenceException) |
+| MultiImplementationA.cs:7:27:7:37 | throw ...; | MultiImplementationA.cs:7:21:7:23 | exit get_P2 (abnormal) | exception |
 | MultiImplementationA.cs:7:33:7:36 | null | MultiImplementationA.cs:7:27:7:37 | throw ...; |  |
 | MultiImplementationA.cs:7:41:7:43 | enter set_P2 | MultiImplementationA.cs:7:45:7:59 | {...} |  |
 | MultiImplementationA.cs:7:41:7:43 | enter set_P2 | MultiImplementationB.cs:4:43:4:45 | {...} |  |
 | MultiImplementationA.cs:7:41:7:43 | exit set_P2 (abnormal) | MultiImplementationA.cs:7:41:7:43 | exit set_P2 |  |
 | MultiImplementationA.cs:7:41:7:43 | exit set_P2 (normal) | MultiImplementationA.cs:7:41:7:43 | exit set_P2 |  |
 | MultiImplementationA.cs:7:45:7:59 | {...} | MultiImplementationA.cs:7:53:7:56 | null |  |
-| MultiImplementationA.cs:7:47:7:57 | throw ...; | MultiImplementationA.cs:7:41:7:43 | exit set_P2 (abnormal) | exception(NullReferenceException) |
+| MultiImplementationA.cs:7:47:7:57 | throw ...; | MultiImplementationA.cs:7:41:7:43 | exit set_P2 (abnormal) | exception |
 | MultiImplementationA.cs:7:53:7:56 | null | MultiImplementationA.cs:7:47:7:57 | throw ...; |  |
 | MultiImplementationA.cs:8:16:8:16 | enter M | MultiImplementationA.cs:8:29:8:32 | null |  |
 | MultiImplementationA.cs:8:16:8:16 | enter M | MultiImplementationB.cs:5:23:5:23 | 2 |  |
 | MultiImplementationA.cs:8:16:8:16 | exit M (abnormal) | MultiImplementationA.cs:8:16:8:16 | exit M |  |
 | MultiImplementationA.cs:8:16:8:16 | exit M (normal) | MultiImplementationA.cs:8:16:8:16 | exit M |  |
-| MultiImplementationA.cs:8:23:8:32 | throw ... | MultiImplementationA.cs:8:16:8:16 | exit M (abnormal) | exception(NullReferenceException) |
+| MultiImplementationA.cs:8:23:8:32 | throw ... | MultiImplementationA.cs:8:16:8:16 | exit M (abnormal) | exception |
 | MultiImplementationA.cs:8:29:8:32 | null | MultiImplementationA.cs:8:23:8:32 | throw ... |  |
 | MultiImplementationA.cs:13:16:13:16 | this access | MultiImplementationA.cs:13:20:13:20 | 0 |  |
 | MultiImplementationA.cs:13:16:13:20 | ... = ... | MultiImplementationA.cs:24:16:24:16 | this access |  |
@@ -3347,7 +2652,7 @@
 | MultiImplementationA.cs:28:7:28:8 | {...} | MultiImplementationA.cs:28:7:28:8 | exit C3 (normal) |  |
 | MultiImplementationA.cs:30:21:30:23 | enter get_P3 | MultiImplementationA.cs:30:34:30:37 | null |  |
 | MultiImplementationA.cs:30:21:30:23 | exit get_P3 (abnormal) | MultiImplementationA.cs:30:21:30:23 | exit get_P3 |  |
-| MultiImplementationA.cs:30:28:30:37 | throw ... | MultiImplementationA.cs:30:21:30:23 | exit get_P3 (abnormal) | exception(NullReferenceException) |
+| MultiImplementationA.cs:30:28:30:37 | throw ... | MultiImplementationA.cs:30:21:30:23 | exit get_P3 (abnormal) | exception |
 | MultiImplementationA.cs:30:34:30:37 | null | MultiImplementationA.cs:30:28:30:37 | throw ... |  |
 | MultiImplementationA.cs:34:15:34:16 | call to constructor Object | MultiImplementationA.cs:34:15:34:16 | {...} |  |
 | MultiImplementationA.cs:34:15:34:16 | enter C4 | MultiImplementationA.cs:34:15:34:16 | call to constructor Object |  |
@@ -3359,12 +2664,12 @@
 | MultiImplementationA.cs:36:9:36:10 | exit M1 (abnormal) | MultiImplementationA.cs:36:9:36:10 | exit M1 |  |
 | MultiImplementationA.cs:36:9:36:10 | exit M1 (normal) | MultiImplementationA.cs:36:9:36:10 | exit M1 |  |
 | MultiImplementationA.cs:36:14:36:28 | {...} | MultiImplementationA.cs:36:22:36:25 | null |  |
-| MultiImplementationA.cs:36:16:36:26 | throw ...; | MultiImplementationA.cs:36:9:36:10 | exit M1 (abnormal) | exception(NullReferenceException) |
+| MultiImplementationA.cs:36:16:36:26 | throw ...; | MultiImplementationA.cs:36:9:36:10 | exit M1 (abnormal) | exception |
 | MultiImplementationA.cs:36:22:36:25 | null | MultiImplementationA.cs:36:16:36:26 | throw ...; |  |
 | MultiImplementationA.cs:37:9:37:10 | enter M2 | MultiImplementationA.cs:37:14:37:28 | {...} |  |
 | MultiImplementationA.cs:37:9:37:10 | exit M2 (abnormal) | MultiImplementationA.cs:37:9:37:10 | exit M2 |  |
 | MultiImplementationA.cs:37:14:37:28 | {...} | MultiImplementationA.cs:37:22:37:25 | null |  |
-| MultiImplementationA.cs:37:16:37:26 | throw ...; | MultiImplementationA.cs:37:9:37:10 | exit M2 (abnormal) | exception(NullReferenceException) |
+| MultiImplementationA.cs:37:16:37:26 | throw ...; | MultiImplementationA.cs:37:9:37:10 | exit M2 (abnormal) | exception |
 | MultiImplementationA.cs:37:22:37:25 | null | MultiImplementationA.cs:37:16:37:26 | throw ...; |  |
 | MultiImplementationB.cs:1:7:1:8 | call to constructor Object | MultiImplementationB.cs:1:7:1:8 | {...} |  |
 | MultiImplementationB.cs:1:7:1:8 | {...} | MultiImplementationA.cs:4:7:4:8 | exit C1 (normal) |  |
@@ -3377,29 +2682,29 @@
 | MultiImplementationB.cs:11:16:11:16 | this access | MultiImplementationB.cs:11:20:11:20 | 1 |  |
 | MultiImplementationB.cs:11:16:11:20 | ... = ... | MultiImplementationB.cs:22:16:22:16 | this access |  |
 | MultiImplementationB.cs:11:20:11:20 | 1 | MultiImplementationB.cs:11:16:11:20 | ... = ... |  |
-| MultiImplementationB.cs:12:31:12:40 | throw ... | MultiImplementationA.cs:14:31:14:31 | exit get_Item (abnormal) | exception(NullReferenceException) |
+| MultiImplementationB.cs:12:31:12:40 | throw ... | MultiImplementationA.cs:14:31:14:31 | exit get_Item (abnormal) | exception |
 | MultiImplementationB.cs:12:37:12:40 | null | MultiImplementationB.cs:12:31:12:40 | throw ... |  |
 | MultiImplementationB.cs:13:40:13:54 | {...} | MultiImplementationB.cs:13:48:13:51 | null |  |
-| MultiImplementationB.cs:13:42:13:52 | throw ...; | MultiImplementationA.cs:15:36:15:38 | exit get_Item (abnormal) | exception(NullReferenceException) |
+| MultiImplementationB.cs:13:42:13:52 | throw ...; | MultiImplementationA.cs:15:36:15:38 | exit get_Item (abnormal) | exception |
 | MultiImplementationB.cs:13:48:13:51 | null | MultiImplementationB.cs:13:42:13:52 | throw ...; |  |
 | MultiImplementationB.cs:13:60:13:62 | {...} | MultiImplementationA.cs:15:54:15:56 | exit set_Item (normal) |  |
 | MultiImplementationB.cs:15:5:17:5 | {...} | MultiImplementationB.cs:16:9:16:31 | M2(...) |  |
 | MultiImplementationB.cs:16:9:16:31 | M2(...) | MultiImplementationA.cs:16:17:16:18 | exit M1 (normal) |  |
 | MultiImplementationB.cs:16:9:16:31 | enter M2 | MultiImplementationB.cs:16:27:16:30 | null |  |
 | MultiImplementationB.cs:16:9:16:31 | exit M2 (abnormal) | MultiImplementationB.cs:16:9:16:31 | exit M2 |  |
-| MultiImplementationB.cs:16:21:16:30 | throw ... | MultiImplementationB.cs:16:9:16:31 | exit M2 (abnormal) | exception(NullReferenceException) |
+| MultiImplementationB.cs:16:21:16:30 | throw ... | MultiImplementationB.cs:16:9:16:31 | exit M2 (abnormal) | exception |
 | MultiImplementationB.cs:16:27:16:30 | null | MultiImplementationB.cs:16:21:16:30 | throw ... |  |
 | MultiImplementationB.cs:18:12:18:13 | call to constructor Object | MultiImplementationB.cs:11:16:11:16 | this access |  |
 | MultiImplementationB.cs:18:22:18:36 | {...} | MultiImplementationB.cs:18:30:18:33 | null |  |
-| MultiImplementationB.cs:18:24:18:34 | throw ...; | MultiImplementationA.cs:20:12:20:13 | exit C2 (abnormal) | exception(NullReferenceException) |
+| MultiImplementationB.cs:18:24:18:34 | throw ...; | MultiImplementationA.cs:20:12:20:13 | exit C2 (abnormal) | exception |
 | MultiImplementationB.cs:18:30:18:33 | null | MultiImplementationB.cs:18:24:18:34 | throw ...; |  |
 | MultiImplementationB.cs:19:19:19:22 | call to constructor C2 | MultiImplementationB.cs:19:27:19:29 | {...} |  |
 | MultiImplementationB.cs:19:24:19:24 | 1 | MultiImplementationB.cs:19:19:19:22 | call to constructor C2 |  |
 | MultiImplementationB.cs:19:27:19:29 | {...} | MultiImplementationA.cs:21:12:21:13 | exit C2 (normal) |  |
 | MultiImplementationB.cs:20:11:20:25 | {...} | MultiImplementationB.cs:20:19:20:22 | null |  |
-| MultiImplementationB.cs:20:13:20:23 | throw ...; | MultiImplementationA.cs:22:6:22:7 | exit ~C2 (abnormal) | exception(NullReferenceException) |
+| MultiImplementationB.cs:20:13:20:23 | throw ...; | MultiImplementationA.cs:22:6:22:7 | exit ~C2 (abnormal) | exception |
 | MultiImplementationB.cs:20:19:20:22 | null | MultiImplementationB.cs:20:13:20:23 | throw ...; |  |
-| MultiImplementationB.cs:21:50:21:59 | throw ... | MultiImplementationA.cs:23:28:23:35 | exit implicit conversion (abnormal) | exception(NullReferenceException) |
+| MultiImplementationB.cs:21:50:21:59 | throw ... | MultiImplementationA.cs:23:28:23:35 | exit implicit conversion (abnormal) | exception |
 | MultiImplementationB.cs:21:56:21:59 | null | MultiImplementationB.cs:21:50:21:59 | throw ... |  |
 | MultiImplementationB.cs:22:16:22:16 | access to property P | MultiImplementationB.cs:22:32:22:34 | ... = ... |  |
 | MultiImplementationB.cs:22:16:22:16 | this access | MultiImplementationB.cs:22:34:22:34 | 1 |  |
@@ -3772,7 +3077,7 @@
 | PostDominance.cs:19:13:19:21 | [true] ... is ... | PostDominance.cs:20:45:20:53 | nameof(...) | true |
 | PostDominance.cs:19:18:19:21 | null | PostDominance.cs:19:13:19:21 | [false] ... is ... | no-match |
 | PostDominance.cs:19:18:19:21 | null | PostDominance.cs:19:13:19:21 | [true] ... is ... | match |
-| PostDominance.cs:20:13:20:55 | throw ...; | PostDominance.cs:17:10:17:11 | exit M3 (abnormal) | exception(ArgumentNullException) |
+| PostDominance.cs:20:13:20:55 | throw ...; | PostDominance.cs:17:10:17:11 | exit M3 (abnormal) | exception |
 | PostDominance.cs:20:19:20:54 | object creation of type ArgumentNullException | PostDominance.cs:20:13:20:55 | throw ...; |  |
 | PostDominance.cs:20:45:20:53 | nameof(...) | PostDominance.cs:20:19:20:54 | object creation of type ArgumentNullException |  |
 | PostDominance.cs:21:9:21:28 | call to method WriteLine | PostDominance.cs:17:10:17:11 | exit M3 (normal) |  |
@@ -3867,12 +3172,12 @@
 | Switch.cs:16:13:16:19 | case ...: | Switch.cs:16:18:16:18 | 0 |  |
 | Switch.cs:16:18:16:18 | 0 | Switch.cs:17:23:17:37 | object creation of type Exception | match |
 | Switch.cs:16:18:16:18 | 0 | Switch.cs:18:13:18:22 | case ...: | no-match |
-| Switch.cs:17:17:17:38 | throw ...; | Switch.cs:10:10:10:11 | exit M2 (abnormal) | exception(Exception) |
+| Switch.cs:17:17:17:38 | throw ...; | Switch.cs:10:10:10:11 | exit M2 (abnormal) | exception |
 | Switch.cs:17:23:17:37 | object creation of type Exception | Switch.cs:17:17:17:38 | throw ...; |  |
 | Switch.cs:18:13:18:22 | case ...: | Switch.cs:18:18:18:21 | null |  |
 | Switch.cs:18:18:18:21 | null | Switch.cs:19:17:19:29 | goto default; | match |
 | Switch.cs:18:18:18:21 | null | Switch.cs:20:13:20:23 | case ...: | no-match |
-| Switch.cs:19:17:19:29 | goto default; | Switch.cs:30:13:30:20 | default: | goto(default) |
+| Switch.cs:19:17:19:29 | goto default; | Switch.cs:30:13:30:20 | default: | goto |
 | Switch.cs:20:13:20:23 | case ...: | Switch.cs:20:18:20:22 | Int32 i |  |
 | Switch.cs:20:18:20:22 | Int32 i | Switch.cs:21:17:22:27 | if (...) ... | match |
 | Switch.cs:20:18:20:22 | Int32 i | Switch.cs:24:13:24:56 | case ...: | no-match |
@@ -3882,7 +3187,7 @@
 | Switch.cs:21:21:21:29 | ... == ... | Switch.cs:23:27:23:27 | 0 | false |
 | Switch.cs:21:26:21:29 | null | Switch.cs:21:21:21:29 | ... == ... |  |
 | Switch.cs:22:21:22:27 | return ...; | Switch.cs:10:10:10:11 | exit M2 (normal) | return |
-| Switch.cs:23:17:23:28 | goto case ...; | Switch.cs:16:13:16:19 | case ...: | goto(0) |
+| Switch.cs:23:17:23:28 | goto case ...; | Switch.cs:16:13:16:19 | case ...: | goto |
 | Switch.cs:23:27:23:27 | 0 | Switch.cs:23:17:23:28 | goto case ...; |  |
 | Switch.cs:24:13:24:56 | case ...: | Switch.cs:24:18:24:25 | String s |  |
 | Switch.cs:24:18:24:25 | String s | Switch.cs:24:32:24:32 | access to local variable s | match |
@@ -3905,16 +3210,16 @@
 | Switch.cs:27:13:27:39 | case ...: | Switch.cs:27:18:27:25 | Double d |  |
 | Switch.cs:27:18:27:25 | Double d | Switch.cs:27:32:27:38 | call to method Throw | match |
 | Switch.cs:27:18:27:25 | Double d | Switch.cs:30:13:30:20 | default: | no-match |
-| Switch.cs:27:32:27:38 | call to method Throw | Switch.cs:10:10:10:11 | exit M2 (abnormal) | exception(Exception) |
+| Switch.cs:27:32:27:38 | call to method Throw | Switch.cs:10:10:10:11 | exit M2 (abnormal) | exception |
 | Switch.cs:28:13:28:17 | Label: | Switch.cs:29:17:29:23 | return ...; |  |
 | Switch.cs:29:17:29:23 | return ...; | Switch.cs:10:10:10:11 | exit M2 (normal) | return |
 | Switch.cs:30:13:30:20 | default: | Switch.cs:31:17:31:27 | goto ...; |  |
-| Switch.cs:31:17:31:27 | goto ...; | Switch.cs:28:13:28:17 | Label: | goto(Label) |
+| Switch.cs:31:17:31:27 | goto ...; | Switch.cs:28:13:28:17 | Label: | goto |
 | Switch.cs:35:10:35:11 | enter M3 | Switch.cs:36:5:42:5 | {...} |  |
 | Switch.cs:35:10:35:11 | exit M3 (abnormal) | Switch.cs:35:10:35:11 | exit M3 |  |
 | Switch.cs:36:5:42:5 | {...} | Switch.cs:37:9:41:9 | switch (...) {...} |  |
 | Switch.cs:37:9:41:9 | switch (...) {...} | Switch.cs:37:17:37:23 | call to method Throw |  |
-| Switch.cs:37:17:37:23 | call to method Throw | Switch.cs:35:10:35:11 | exit M3 (abnormal) | exception(Exception) |
+| Switch.cs:37:17:37:23 | call to method Throw | Switch.cs:35:10:35:11 | exit M3 (abnormal) | exception |
 | Switch.cs:44:10:44:11 | enter M4 | Switch.cs:45:5:53:5 | {...} |  |
 | Switch.cs:44:10:44:11 | exit M4 (normal) | Switch.cs:44:10:44:11 | exit M4 |  |
 | Switch.cs:45:5:53:5 | {...} | Switch.cs:46:9:52:9 | switch (...) {...} |  |
@@ -4013,7 +3318,7 @@
 | Switch.cs:108:17:108:17 | 1 | Switch.cs:108:16:108:17 | -... |  |
 | Switch.cs:111:17:111:21 | enter Throw | Switch.cs:111:34:111:48 | object creation of type Exception |  |
 | Switch.cs:111:17:111:21 | exit Throw (abnormal) | Switch.cs:111:17:111:21 | exit Throw |  |
-| Switch.cs:111:28:111:48 | throw ... | Switch.cs:111:17:111:21 | exit Throw (abnormal) | exception(Exception) |
+| Switch.cs:111:28:111:48 | throw ... | Switch.cs:111:17:111:21 | exit Throw (abnormal) | exception |
 | Switch.cs:111:34:111:48 | object creation of type Exception | Switch.cs:111:28:111:48 | throw ... |  |
 | Switch.cs:113:9:113:11 | enter M10 | Switch.cs:114:5:121:5 | {...} |  |
 | Switch.cs:113:9:113:11 | exit M10 (normal) | Switch.cs:113:9:113:11 | exit M10 |  |
@@ -4126,7 +3431,7 @@
 | Switch.cs:156:28:156:31 | true | Switch.cs:156:41:156:45 | false | no-match |
 | Switch.cs:156:28:156:38 | ... => ... | Switch.cs:156:17:156:54 | ... switch { ... } |  |
 | Switch.cs:156:36:156:38 | "a" | Switch.cs:156:28:156:38 | ... => ... |  |
-| Switch.cs:156:41:156:45 | false | Switch.cs:154:10:154:12 | exit M15 (abnormal) | exception(InvalidOperationException) |
+| Switch.cs:156:41:156:45 | false | Switch.cs:154:10:154:12 | exit M15 (abnormal) | exception |
 | Switch.cs:156:41:156:45 | false | Switch.cs:156:50:156:52 | "b" | match |
 | Switch.cs:156:41:156:52 | ... => ... | Switch.cs:156:17:156:54 | ... switch { ... } |  |
 | Switch.cs:156:50:156:52 | "b" | Switch.cs:156:41:156:52 | ... => ... |  |
@@ -4361,7 +3666,7 @@
 | cflow.cs:42:17:42:38 | call to method WriteLine | cflow.cs:43:27:43:27 | 2 |  |
 | cflow.cs:42:17:42:39 | ...; | cflow.cs:42:35:42:37 | "1" |  |
 | cflow.cs:42:35:42:37 | "1" | cflow.cs:42:17:42:38 | call to method WriteLine |  |
-| cflow.cs:43:17:43:28 | goto case ...; | cflow.cs:44:13:44:19 | case ...: | goto(2) |
+| cflow.cs:43:17:43:28 | goto case ...; | cflow.cs:44:13:44:19 | case ...: | goto |
 | cflow.cs:43:27:43:27 | 2 | cflow.cs:43:17:43:28 | goto case ...; |  |
 | cflow.cs:44:13:44:19 | case ...: | cflow.cs:44:18:44:18 | 2 |  |
 | cflow.cs:44:18:44:18 | 2 | cflow.cs:45:17:45:39 | ...; | match |
@@ -4369,7 +3674,7 @@
 | cflow.cs:45:17:45:38 | call to method WriteLine | cflow.cs:46:27:46:27 | 1 |  |
 | cflow.cs:45:17:45:39 | ...; | cflow.cs:45:35:45:37 | "2" |  |
 | cflow.cs:45:35:45:37 | "2" | cflow.cs:45:17:45:38 | call to method WriteLine |  |
-| cflow.cs:46:17:46:28 | goto case ...; | cflow.cs:41:13:41:19 | case ...: | goto(1) |
+| cflow.cs:46:17:46:28 | goto case ...; | cflow.cs:41:13:41:19 | case ...: | goto |
 | cflow.cs:46:27:46:27 | 1 | cflow.cs:46:17:46:28 | goto case ...; |  |
 | cflow.cs:47:13:47:19 | case ...: | cflow.cs:47:18:47:18 | 3 |  |
 | cflow.cs:47:18:47:18 | 3 | cflow.cs:48:17:48:39 | ...; | match |
@@ -4407,7 +3712,7 @@
 | cflow.cs:63:23:63:33 | ... == ... | cflow.cs:63:21:63:34 | [false] !... | true |
 | cflow.cs:63:23:63:33 | ... == ... | cflow.cs:63:21:63:34 | [true] !... | false |
 | cflow.cs:63:32:63:33 | "" | cflow.cs:63:23:63:33 | ... == ... |  |
-| cflow.cs:64:21:64:55 | throw ...; | cflow.cs:37:17:37:22 | exit Switch (abnormal) | exception(NullReferenceException) |
+| cflow.cs:64:21:64:55 | throw ...; | cflow.cs:37:17:37:22 | exit Switch (abnormal) | exception |
 | cflow.cs:64:27:64:54 | object creation of type NullReferenceException | cflow.cs:64:21:64:55 | throw ...; |  |
 | cflow.cs:65:17:65:22 | break; | cflow.cs:67:16:67:16 | access to parameter a | break |
 | cflow.cs:67:9:67:17 | return ...; | cflow.cs:37:17:37:22 | exit Switch (normal) | return |
@@ -4462,7 +3767,7 @@
 | cflow.cs:92:13:92:27 | call to method Equals | cflow.cs:94:9:94:29 | ...; | false |
 | cflow.cs:92:20:92:20 | access to parameter s | cflow.cs:92:23:92:26 | null |  |
 | cflow.cs:92:23:92:26 | null | cflow.cs:92:13:92:27 | call to method Equals |  |
-| cflow.cs:93:13:93:49 | throw ...; | cflow.cs:90:18:90:19 | exit M3 (abnormal) | exception(ArgumentNullException) |
+| cflow.cs:93:13:93:49 | throw ...; | cflow.cs:90:18:90:19 | exit M3 (abnormal) | exception |
 | cflow.cs:93:19:93:48 | object creation of type ArgumentNullException | cflow.cs:93:13:93:49 | throw ...; |  |
 | cflow.cs:93:45:93:47 | "s" | cflow.cs:93:19:93:48 | object creation of type ArgumentNullException |  |
 | cflow.cs:94:9:94:28 | call to method WriteLine | cflow.cs:96:9:97:55 | if (...) ... |  |
@@ -4777,7 +4082,7 @@
 | cflow.cs:200:61:200:61 | access to local variable b | cflow.cs:200:40:200:61 | [true] ... && ... | true |
 | cflow.cs:201:9:205:9 | {...} | cflow.cs:202:13:204:13 | {...} |  |
 | cflow.cs:202:13:204:13 | {...} | cflow.cs:203:23:203:37 | object creation of type Exception |  |
-| cflow.cs:203:17:203:38 | throw ...; | cflow.cs:193:10:193:17 | exit Booleans (abnormal) | exception(Exception) |
+| cflow.cs:203:17:203:38 | throw ...; | cflow.cs:193:10:193:17 | exit Booleans (abnormal) | exception |
 | cflow.cs:203:23:203:37 | object creation of type Exception | cflow.cs:203:17:203:38 | throw ...; |  |
 | cflow.cs:208:10:208:11 | enter Do | cflow.cs:209:5:222:5 | {...} |  |
 | cflow.cs:208:10:208:11 | exit Do (normal) | cflow.cs:208:10:208:11 | exit Do |  |
@@ -4873,7 +4178,7 @@
 | cflow.cs:244:13:244:28 | ... > ... | cflow.cs:244:31:244:41 | goto ...; | true |
 | cflow.cs:244:13:244:28 | ... > ... | cflow.cs:246:9:258:9 | switch (...) {...} | false |
 | cflow.cs:244:28:244:28 | 0 | cflow.cs:244:13:244:28 | ... > ... |  |
-| cflow.cs:244:31:244:41 | goto ...; | cflow.cs:242:5:242:9 | Label: | goto(Label) |
+| cflow.cs:244:31:244:41 | goto ...; | cflow.cs:242:5:242:9 | Label: | goto |
 | cflow.cs:246:9:258:9 | switch (...) {...} | cflow.cs:246:17:246:21 | this access |  |
 | cflow.cs:246:17:246:21 | access to field Field | cflow.cs:246:17:246:28 | access to property Length |  |
 | cflow.cs:246:17:246:21 | this access | cflow.cs:246:17:246:21 | access to field Field |  |
@@ -4883,7 +4188,7 @@
 | cflow.cs:248:13:248:19 | case ...: | cflow.cs:248:18:248:18 | 0 |  |
 | cflow.cs:248:18:248:18 | 0 | cflow.cs:249:17:249:29 | goto default; | match |
 | cflow.cs:248:18:248:18 | 0 | cflow.cs:250:13:250:19 | case ...: | no-match |
-| cflow.cs:249:17:249:29 | goto default; | cflow.cs:255:13:255:20 | default: | goto(default) |
+| cflow.cs:249:17:249:29 | goto default; | cflow.cs:255:13:255:20 | default: | goto |
 | cflow.cs:250:13:250:19 | case ...: | cflow.cs:250:18:250:18 | 1 |  |
 | cflow.cs:250:18:250:18 | 1 | cflow.cs:251:17:251:37 | ...; | match |
 | cflow.cs:250:18:250:18 | 1 | cflow.cs:253:13:253:19 | case ...: | no-match |
@@ -4894,13 +4199,14 @@
 | cflow.cs:253:13:253:19 | case ...: | cflow.cs:253:18:253:18 | 2 |  |
 | cflow.cs:253:18:253:18 | 2 | cflow.cs:254:17:254:27 | goto ...; | match |
 | cflow.cs:253:18:253:18 | 2 | cflow.cs:255:13:255:20 | default: | no-match |
-| cflow.cs:254:17:254:27 | goto ...; | cflow.cs:242:5:242:9 | Label: | goto(Label) |
+| cflow.cs:254:17:254:27 | goto ...; | cflow.cs:242:5:242:9 | Label: | goto |
 | cflow.cs:255:13:255:20 | default: | cflow.cs:256:17:256:37 | ...; |  |
 | cflow.cs:256:17:256:36 | call to method WriteLine | cflow.cs:257:17:257:22 | break; |  |
 | cflow.cs:256:17:256:37 | ...; | cflow.cs:256:35:256:35 | 0 |  |
 | cflow.cs:256:35:256:35 | 0 | cflow.cs:256:17:256:36 | call to method WriteLine |  |
 | cflow.cs:257:17:257:22 | break; | cflow.cs:240:10:240:13 | exit Goto (normal) | break |
 | cflow.cs:261:49:261:53 | enter Yield | cflow.cs:262:5:277:5 | {...} |  |
+| cflow.cs:261:49:261:53 | exit Yield (abnormal) | cflow.cs:261:49:261:53 | exit Yield |  |
 | cflow.cs:261:49:261:53 | exit Yield (normal) | cflow.cs:261:49:261:53 | exit Yield |  |
 | cflow.cs:262:5:277:5 | {...} | cflow.cs:263:22:263:22 | 0 |  |
 | cflow.cs:263:9:263:23 | yield return ...; | cflow.cs:264:9:267:9 | for (...;...;...) ... |  |
@@ -4919,11 +4225,12 @@
 | cflow.cs:266:26:266:26 | access to local variable i | cflow.cs:266:13:266:27 | yield return ...; |  |
 | cflow.cs:268:9:276:9 | try {...} ... | cflow.cs:269:9:272:9 | {...} |  |
 | cflow.cs:269:9:272:9 | {...} | cflow.cs:270:13:270:24 | yield break; |  |
-| cflow.cs:270:13:270:24 | yield break; | cflow.cs:274:9:276:9 | [finally: return] {...} | return |
-| cflow.cs:274:9:276:9 | [finally: return] {...} | cflow.cs:275:13:275:42 | [finally: return] ...; |  |
-| cflow.cs:275:13:275:41 | [finally: return] call to method WriteLine | cflow.cs:261:49:261:53 | exit Yield (normal) | return |
-| cflow.cs:275:13:275:42 | [finally: return] ...; | cflow.cs:275:31:275:40 | [finally: return] "not dead" |  |
-| cflow.cs:275:31:275:40 | [finally: return] "not dead" | cflow.cs:275:13:275:41 | [finally: return] call to method WriteLine |  |
+| cflow.cs:270:13:270:24 | yield break; | cflow.cs:274:9:276:9 | {...} | return |
+| cflow.cs:274:9:276:9 | {...} | cflow.cs:275:13:275:42 | ...; |  |
+| cflow.cs:275:13:275:41 | call to method WriteLine | cflow.cs:261:49:261:53 | exit Yield (abnormal) | exception |
+| cflow.cs:275:13:275:41 | call to method WriteLine | cflow.cs:261:49:261:53 | exit Yield (normal) | , return |
+| cflow.cs:275:13:275:42 | ...; | cflow.cs:275:31:275:40 | "not dead" |  |
+| cflow.cs:275:31:275:40 | "not dead" | cflow.cs:275:13:275:41 | call to method WriteLine |  |
 | cflow.cs:282:5:282:18 | enter ControlFlowSub | cflow.cs:282:24:282:27 | call to constructor ControlFlow |  |
 | cflow.cs:282:5:282:18 | exit ControlFlowSub (normal) | cflow.cs:282:5:282:18 | exit ControlFlowSub |  |
 | cflow.cs:282:24:282:27 | call to constructor ControlFlow | cflow.cs:282:31:282:33 | {...} |  |
diff --git a/csharp/ql/test/library-tests/controlflow/graph/Nodes.expected b/csharp/ql/test/library-tests/controlflow/graph/Nodes.expected
index 7c5a64b7155..26e8d074b19 100644
--- a/csharp/ql/test/library-tests/controlflow/graph/Nodes.expected
+++ b/csharp/ql/test/library-tests/controlflow/graph/Nodes.expected
@@ -1,1032 +1,3 @@
-booleanNode
-| Assert.cs:58:16:58:32 | [b (line 56): false] String s = ... | b (line 56): false |
-| Assert.cs:58:16:58:32 | [b (line 56): true] String s = ... | b (line 56): true |
-| Assert.cs:58:20:58:32 | [b (line 56): false] ... ? ... : ... | b (line 56): false |
-| Assert.cs:58:20:58:32 | [b (line 56): true] ... ? ... : ... | b (line 56): true |
-| Assert.cs:58:24:58:27 | [b (line 56): true] null | b (line 56): true |
-| Assert.cs:58:31:58:32 | [b (line 56): false] "" | b (line 56): false |
-| Assert.cs:59:9:59:38 | [b (line 56): false] ...; | b (line 56): false |
-| Assert.cs:59:9:59:38 | [b (line 56): true] ...; | b (line 56): true |
-| Assert.cs:59:23:59:23 | [b (line 56): false] access to local variable s | b (line 56): false |
-| Assert.cs:59:23:59:23 | [b (line 56): true] access to local variable s | b (line 56): true |
-| Assert.cs:59:23:59:31 | [b (line 56): false] ... != ... | b (line 56): false |
-| Assert.cs:59:23:59:31 | [b (line 56): true] ... != ... | b (line 56): true |
-| Assert.cs:59:28:59:31 | [b (line 56): false] null | b (line 56): false |
-| Assert.cs:59:28:59:31 | [b (line 56): true] null | b (line 56): true |
-| Assert.cs:59:36:59:36 | [b (line 56): false] access to parameter b | b (line 56): false |
-| Assert.cs:59:36:59:36 | [b (line 56): true] access to parameter b | b (line 56): true |
-| Assert.cs:65:16:65:32 | [b (line 63): false] String s = ... | b (line 63): false |
-| Assert.cs:65:16:65:32 | [b (line 63): true] String s = ... | b (line 63): true |
-| Assert.cs:65:20:65:32 | [b (line 63): false] ... ? ... : ... | b (line 63): false |
-| Assert.cs:65:20:65:32 | [b (line 63): true] ... ? ... : ... | b (line 63): true |
-| Assert.cs:65:24:65:27 | [b (line 63): true] null | b (line 63): true |
-| Assert.cs:65:31:65:32 | [b (line 63): false] "" | b (line 63): false |
-| Assert.cs:66:9:66:39 | [b (line 63): false] ...; | b (line 63): false |
-| Assert.cs:66:9:66:39 | [b (line 63): true] ...; | b (line 63): true |
-| Assert.cs:66:24:66:24 | [b (line 63): false] access to local variable s | b (line 63): false |
-| Assert.cs:66:24:66:24 | [b (line 63): true] access to local variable s | b (line 63): true |
-| Assert.cs:66:24:66:32 | [b (line 63): false] ... == ... | b (line 63): false |
-| Assert.cs:66:24:66:32 | [b (line 63): true] ... == ... | b (line 63): true |
-| Assert.cs:66:29:66:32 | [b (line 63): false] null | b (line 63): false |
-| Assert.cs:66:29:66:32 | [b (line 63): true] null | b (line 63): true |
-| Assert.cs:66:37:66:37 | [b (line 63): false] access to parameter b | b (line 63): false |
-| Assert.cs:66:37:66:37 | [b (line 63): true] access to parameter b | b (line 63): true |
-| Assert.cs:72:16:72:32 | [b (line 70): false] String s = ... | b (line 70): false |
-| Assert.cs:72:16:72:32 | [b (line 70): true] String s = ... | b (line 70): true |
-| Assert.cs:72:20:72:32 | [b (line 70): false] ... ? ... : ... | b (line 70): false |
-| Assert.cs:72:20:72:32 | [b (line 70): true] ... ? ... : ... | b (line 70): true |
-| Assert.cs:72:24:72:27 | [b (line 70): true] null | b (line 70): true |
-| Assert.cs:72:31:72:32 | [b (line 70): false] "" | b (line 70): false |
-| Assert.cs:73:9:73:38 | [b (line 70): false] ...; | b (line 70): false |
-| Assert.cs:73:9:73:38 | [b (line 70): true] ...; | b (line 70): true |
-| Assert.cs:73:23:73:23 | [b (line 70): false] access to local variable s | b (line 70): false |
-| Assert.cs:73:23:73:23 | [b (line 70): true] access to local variable s | b (line 70): true |
-| Assert.cs:73:23:73:31 | [b (line 70): false] ... == ... | b (line 70): false |
-| Assert.cs:73:23:73:31 | [b (line 70): true] ... == ... | b (line 70): true |
-| Assert.cs:73:28:73:31 | [b (line 70): false] null | b (line 70): false |
-| Assert.cs:73:28:73:31 | [b (line 70): true] null | b (line 70): true |
-| Assert.cs:73:36:73:36 | [b (line 70): false] access to parameter b | b (line 70): false |
-| Assert.cs:73:36:73:36 | [b (line 70): true] access to parameter b | b (line 70): true |
-| Assert.cs:79:16:79:32 | [b (line 77): false] String s = ... | b (line 77): false |
-| Assert.cs:79:16:79:32 | [b (line 77): true] String s = ... | b (line 77): true |
-| Assert.cs:79:20:79:32 | [b (line 77): false] ... ? ... : ... | b (line 77): false |
-| Assert.cs:79:20:79:32 | [b (line 77): true] ... ? ... : ... | b (line 77): true |
-| Assert.cs:79:24:79:27 | [b (line 77): true] null | b (line 77): true |
-| Assert.cs:79:31:79:32 | [b (line 77): false] "" | b (line 77): false |
-| Assert.cs:80:9:80:39 | [b (line 77): false] ...; | b (line 77): false |
-| Assert.cs:80:9:80:39 | [b (line 77): true] ...; | b (line 77): true |
-| Assert.cs:80:24:80:24 | [b (line 77): false] access to local variable s | b (line 77): false |
-| Assert.cs:80:24:80:24 | [b (line 77): true] access to local variable s | b (line 77): true |
-| Assert.cs:80:24:80:32 | [b (line 77): false] ... != ... | b (line 77): false |
-| Assert.cs:80:24:80:32 | [b (line 77): true] ... != ... | b (line 77): true |
-| Assert.cs:80:29:80:32 | [b (line 77): false] null | b (line 77): false |
-| Assert.cs:80:29:80:32 | [b (line 77): true] null | b (line 77): true |
-| Assert.cs:80:37:80:37 | [b (line 77): false] access to parameter b | b (line 77): false |
-| Assert.cs:80:37:80:37 | [b (line 77): true] access to parameter b | b (line 77): true |
-| Assert.cs:86:16:86:32 | [b (line 84): false] String s = ... | b (line 84): false |
-| Assert.cs:86:16:86:32 | [b (line 84): true] String s = ... | b (line 84): true |
-| Assert.cs:86:20:86:32 | [b (line 84): false] ... ? ... : ... | b (line 84): false |
-| Assert.cs:86:20:86:32 | [b (line 84): true] ... ? ... : ... | b (line 84): true |
-| Assert.cs:86:24:86:27 | [b (line 84): true] null | b (line 84): true |
-| Assert.cs:86:31:86:32 | [b (line 84): false] "" | b (line 84): false |
-| Assert.cs:87:9:87:31 | [assertion failure, b (line 84): false] call to method Assert | b (line 84): false |
-| Assert.cs:87:9:87:31 | [assertion failure, b (line 84): true] call to method Assert | b (line 84): true |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): false] call to method Assert | b (line 84): false |
-| Assert.cs:87:9:87:31 | [assertion success, b (line 84): true] call to method Assert | b (line 84): true |
-| Assert.cs:87:9:87:32 | [b (line 84): false] ...; | b (line 84): false |
-| Assert.cs:87:9:87:32 | [b (line 84): true] ...; | b (line 84): true |
-| Assert.cs:87:22:87:22 | [b (line 84): false] access to local variable s | b (line 84): false |
-| Assert.cs:87:22:87:22 | [b (line 84): true] access to local variable s | b (line 84): true |
-| Assert.cs:87:22:87:30 | [b (line 84): false] ... != ... | b (line 84): false |
-| Assert.cs:87:22:87:30 | [b (line 84): true] ... != ... | b (line 84): true |
-| Assert.cs:87:27:87:30 | [b (line 84): false] null | b (line 84): false |
-| Assert.cs:87:27:87:30 | [b (line 84): true] null | b (line 84): true |
-| Assert.cs:88:9:88:35 | [b (line 84): false] call to method WriteLine | b (line 84): false |
-| Assert.cs:88:9:88:35 | [b (line 84): true] call to method WriteLine | b (line 84): true |
-| Assert.cs:88:9:88:36 | [b (line 84): false] ...; | b (line 84): false |
-| Assert.cs:88:9:88:36 | [b (line 84): true] ...; | b (line 84): true |
-| Assert.cs:88:27:88:27 | [b (line 84): false] access to local variable s | b (line 84): false |
-| Assert.cs:88:27:88:27 | [b (line 84): true] access to local variable s | b (line 84): true |
-| Assert.cs:88:27:88:34 | [b (line 84): false] access to property Length | b (line 84): false |
-| Assert.cs:88:27:88:34 | [b (line 84): true] access to property Length | b (line 84): true |
-| Assert.cs:90:9:90:25 | [b (line 84): false] ... = ... | b (line 84): false |
-| Assert.cs:90:9:90:25 | [b (line 84): true] ... = ... | b (line 84): true |
-| Assert.cs:90:9:90:26 | [b (line 84): false] ...; | b (line 84): false |
-| Assert.cs:90:9:90:26 | [b (line 84): true] ...; | b (line 84): true |
-| Assert.cs:90:13:90:13 | [b (line 84): false] access to parameter b | b (line 84): false |
-| Assert.cs:90:13:90:13 | [b (line 84): true] access to parameter b | b (line 84): true |
-| Assert.cs:90:13:90:25 | [b (line 84): false] ... ? ... : ... | b (line 84): false |
-| Assert.cs:90:13:90:25 | [b (line 84): true] ... ? ... : ... | b (line 84): true |
-| Assert.cs:90:17:90:20 | [b (line 84): true] null | b (line 84): true |
-| Assert.cs:90:24:90:25 | [b (line 84): false] "" | b (line 84): false |
-| Assert.cs:91:9:91:24 | [assertion failure, b (line 84): false] call to method IsNull | b (line 84): false |
-| Assert.cs:91:9:91:24 | [assertion failure, b (line 84): true] call to method IsNull | b (line 84): true |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): false] call to method IsNull | b (line 84): false |
-| Assert.cs:91:9:91:24 | [assertion success, b (line 84): true] call to method IsNull | b (line 84): true |
-| Assert.cs:91:9:91:25 | [b (line 84): false] ...; | b (line 84): false |
-| Assert.cs:91:9:91:25 | [b (line 84): true] ...; | b (line 84): true |
-| Assert.cs:91:23:91:23 | [b (line 84): false] access to local variable s | b (line 84): false |
-| Assert.cs:91:23:91:23 | [b (line 84): true] access to local variable s | b (line 84): true |
-| Assert.cs:92:9:92:35 | [b (line 84): false] call to method WriteLine | b (line 84): false |
-| Assert.cs:92:9:92:35 | [b (line 84): true] call to method WriteLine | b (line 84): true |
-| Assert.cs:92:9:92:36 | [b (line 84): false] ...; | b (line 84): false |
-| Assert.cs:92:9:92:36 | [b (line 84): true] ...; | b (line 84): true |
-| Assert.cs:92:27:92:27 | [b (line 84): false] access to local variable s | b (line 84): false |
-| Assert.cs:92:27:92:27 | [b (line 84): true] access to local variable s | b (line 84): true |
-| Assert.cs:92:27:92:34 | [b (line 84): false] access to property Length | b (line 84): false |
-| Assert.cs:92:27:92:34 | [b (line 84): true] access to property Length | b (line 84): true |
-| Assert.cs:94:9:94:25 | [b (line 84): false] ... = ... | b (line 84): false |
-| Assert.cs:94:9:94:25 | [b (line 84): true] ... = ... | b (line 84): true |
-| Assert.cs:94:9:94:26 | [b (line 84): false] ...; | b (line 84): false |
-| Assert.cs:94:9:94:26 | [b (line 84): true] ...; | b (line 84): true |
-| Assert.cs:94:13:94:13 | [b (line 84): false] access to parameter b | b (line 84): false |
-| Assert.cs:94:13:94:13 | [b (line 84): true] access to parameter b | b (line 84): true |
-| Assert.cs:94:13:94:25 | [b (line 84): false] ... ? ... : ... | b (line 84): false |
-| Assert.cs:94:13:94:25 | [b (line 84): true] ... ? ... : ... | b (line 84): true |
-| Assert.cs:94:17:94:20 | [b (line 84): true] null | b (line 84): true |
-| Assert.cs:94:24:94:25 | [b (line 84): false] "" | b (line 84): false |
-| Assert.cs:95:9:95:27 | [assertion failure, b (line 84): false] call to method IsNotNull | b (line 84): false |
-| Assert.cs:95:9:95:27 | [assertion failure, b (line 84): true] call to method IsNotNull | b (line 84): true |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): false] call to method IsNotNull | b (line 84): false |
-| Assert.cs:95:9:95:27 | [assertion success, b (line 84): true] call to method IsNotNull | b (line 84): true |
-| Assert.cs:95:9:95:28 | [b (line 84): false] ...; | b (line 84): false |
-| Assert.cs:95:9:95:28 | [b (line 84): true] ...; | b (line 84): true |
-| Assert.cs:95:26:95:26 | [b (line 84): false] access to local variable s | b (line 84): false |
-| Assert.cs:95:26:95:26 | [b (line 84): true] access to local variable s | b (line 84): true |
-| Assert.cs:96:9:96:35 | [b (line 84): false] call to method WriteLine | b (line 84): false |
-| Assert.cs:96:9:96:35 | [b (line 84): true] call to method WriteLine | b (line 84): true |
-| Assert.cs:96:9:96:36 | [b (line 84): false] ...; | b (line 84): false |
-| Assert.cs:96:9:96:36 | [b (line 84): true] ...; | b (line 84): true |
-| Assert.cs:96:27:96:27 | [b (line 84): false] access to local variable s | b (line 84): false |
-| Assert.cs:96:27:96:27 | [b (line 84): true] access to local variable s | b (line 84): true |
-| Assert.cs:96:27:96:34 | [b (line 84): false] access to property Length | b (line 84): false |
-| Assert.cs:96:27:96:34 | [b (line 84): true] access to property Length | b (line 84): true |
-| Assert.cs:98:9:98:25 | [b (line 84): false] ... = ... | b (line 84): false |
-| Assert.cs:98:9:98:25 | [b (line 84): true] ... = ... | b (line 84): true |
-| Assert.cs:98:9:98:26 | [b (line 84): false] ...; | b (line 84): false |
-| Assert.cs:98:9:98:26 | [b (line 84): true] ...; | b (line 84): true |
-| Assert.cs:98:13:98:13 | [b (line 84): false] access to parameter b | b (line 84): false |
-| Assert.cs:98:13:98:13 | [b (line 84): true] access to parameter b | b (line 84): true |
-| Assert.cs:98:13:98:25 | [b (line 84): false] ... ? ... : ... | b (line 84): false |
-| Assert.cs:98:13:98:25 | [b (line 84): true] ... ? ... : ... | b (line 84): true |
-| Assert.cs:98:17:98:20 | [b (line 84): true] null | b (line 84): true |
-| Assert.cs:98:24:98:25 | [b (line 84): false] "" | b (line 84): false |
-| Assert.cs:99:9:99:32 | [assertion failure, b (line 84): false] call to method IsTrue | b (line 84): false |
-| Assert.cs:99:9:99:32 | [assertion failure, b (line 84): true] call to method IsTrue | b (line 84): true |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): false] call to method IsTrue | b (line 84): false |
-| Assert.cs:99:9:99:32 | [assertion success, b (line 84): true] call to method IsTrue | b (line 84): true |
-| Assert.cs:99:9:99:33 | [b (line 84): false] ...; | b (line 84): false |
-| Assert.cs:99:9:99:33 | [b (line 84): true] ...; | b (line 84): true |
-| Assert.cs:99:23:99:23 | [b (line 84): false] access to local variable s | b (line 84): false |
-| Assert.cs:99:23:99:23 | [b (line 84): true] access to local variable s | b (line 84): true |
-| Assert.cs:99:23:99:31 | [b (line 84): false] ... == ... | b (line 84): false |
-| Assert.cs:99:23:99:31 | [b (line 84): true] ... == ... | b (line 84): true |
-| Assert.cs:99:28:99:31 | [b (line 84): false] null | b (line 84): false |
-| Assert.cs:99:28:99:31 | [b (line 84): true] null | b (line 84): true |
-| Assert.cs:100:9:100:35 | [b (line 84): false] call to method WriteLine | b (line 84): false |
-| Assert.cs:100:9:100:35 | [b (line 84): true] call to method WriteLine | b (line 84): true |
-| Assert.cs:100:9:100:36 | [b (line 84): false] ...; | b (line 84): false |
-| Assert.cs:100:9:100:36 | [b (line 84): true] ...; | b (line 84): true |
-| Assert.cs:100:27:100:27 | [b (line 84): false] access to local variable s | b (line 84): false |
-| Assert.cs:100:27:100:27 | [b (line 84): true] access to local variable s | b (line 84): true |
-| Assert.cs:100:27:100:34 | [b (line 84): false] access to property Length | b (line 84): false |
-| Assert.cs:100:27:100:34 | [b (line 84): true] access to property Length | b (line 84): true |
-| Assert.cs:102:9:102:25 | [b (line 84): false] ... = ... | b (line 84): false |
-| Assert.cs:102:9:102:25 | [b (line 84): true] ... = ... | b (line 84): true |
-| Assert.cs:102:9:102:26 | [b (line 84): false] ...; | b (line 84): false |
-| Assert.cs:102:9:102:26 | [b (line 84): true] ...; | b (line 84): true |
-| Assert.cs:102:13:102:13 | [b (line 84): false] access to parameter b | b (line 84): false |
-| Assert.cs:102:13:102:13 | [b (line 84): true] access to parameter b | b (line 84): true |
-| Assert.cs:102:13:102:25 | [b (line 84): false] ... ? ... : ... | b (line 84): false |
-| Assert.cs:102:13:102:25 | [b (line 84): true] ... ? ... : ... | b (line 84): true |
-| Assert.cs:102:17:102:20 | [b (line 84): true] null | b (line 84): true |
-| Assert.cs:102:24:102:25 | [b (line 84): false] "" | b (line 84): false |
-| Assert.cs:103:9:103:32 | [assertion failure, b (line 84): false] call to method IsTrue | b (line 84): false |
-| Assert.cs:103:9:103:32 | [assertion failure, b (line 84): true] call to method IsTrue | b (line 84): true |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): false] call to method IsTrue | b (line 84): false |
-| Assert.cs:103:9:103:32 | [assertion success, b (line 84): true] call to method IsTrue | b (line 84): true |
-| Assert.cs:103:9:103:33 | [b (line 84): false] ...; | b (line 84): false |
-| Assert.cs:103:9:103:33 | [b (line 84): true] ...; | b (line 84): true |
-| Assert.cs:103:23:103:23 | [b (line 84): false] access to local variable s | b (line 84): false |
-| Assert.cs:103:23:103:23 | [b (line 84): true] access to local variable s | b (line 84): true |
-| Assert.cs:103:23:103:31 | [b (line 84): false] ... != ... | b (line 84): false |
-| Assert.cs:103:23:103:31 | [b (line 84): true] ... != ... | b (line 84): true |
-| Assert.cs:103:28:103:31 | [b (line 84): false] null | b (line 84): false |
-| Assert.cs:103:28:103:31 | [b (line 84): true] null | b (line 84): true |
-| Assert.cs:104:9:104:35 | [b (line 84): false] call to method WriteLine | b (line 84): false |
-| Assert.cs:104:9:104:35 | [b (line 84): true] call to method WriteLine | b (line 84): true |
-| Assert.cs:104:9:104:36 | [b (line 84): false] ...; | b (line 84): false |
-| Assert.cs:104:9:104:36 | [b (line 84): true] ...; | b (line 84): true |
-| Assert.cs:104:27:104:27 | [b (line 84): false] access to local variable s | b (line 84): false |
-| Assert.cs:104:27:104:27 | [b (line 84): true] access to local variable s | b (line 84): true |
-| Assert.cs:104:27:104:34 | [b (line 84): false] access to property Length | b (line 84): false |
-| Assert.cs:104:27:104:34 | [b (line 84): true] access to property Length | b (line 84): true |
-| Assert.cs:106:9:106:25 | [b (line 84): false] ... = ... | b (line 84): false |
-| Assert.cs:106:9:106:25 | [b (line 84): true] ... = ... | b (line 84): true |
-| Assert.cs:106:9:106:26 | [b (line 84): false] ...; | b (line 84): false |
-| Assert.cs:106:9:106:26 | [b (line 84): true] ...; | b (line 84): true |
-| Assert.cs:106:13:106:13 | [b (line 84): false] access to parameter b | b (line 84): false |
-| Assert.cs:106:13:106:13 | [b (line 84): true] access to parameter b | b (line 84): true |
-| Assert.cs:106:13:106:25 | [b (line 84): false] ... ? ... : ... | b (line 84): false |
-| Assert.cs:106:13:106:25 | [b (line 84): true] ... ? ... : ... | b (line 84): true |
-| Assert.cs:106:17:106:20 | [b (line 84): true] null | b (line 84): true |
-| Assert.cs:106:24:106:25 | [b (line 84): false] "" | b (line 84): false |
-| Assert.cs:107:9:107:33 | [assertion failure, b (line 84): false] call to method IsFalse | b (line 84): false |
-| Assert.cs:107:9:107:33 | [assertion failure, b (line 84): true] call to method IsFalse | b (line 84): true |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): false] call to method IsFalse | b (line 84): false |
-| Assert.cs:107:9:107:33 | [assertion success, b (line 84): true] call to method IsFalse | b (line 84): true |
-| Assert.cs:107:9:107:34 | [b (line 84): false] ...; | b (line 84): false |
-| Assert.cs:107:9:107:34 | [b (line 84): true] ...; | b (line 84): true |
-| Assert.cs:107:24:107:24 | [b (line 84): false] access to local variable s | b (line 84): false |
-| Assert.cs:107:24:107:24 | [b (line 84): true] access to local variable s | b (line 84): true |
-| Assert.cs:107:24:107:32 | [b (line 84): false] ... != ... | b (line 84): false |
-| Assert.cs:107:24:107:32 | [b (line 84): true] ... != ... | b (line 84): true |
-| Assert.cs:107:29:107:32 | [b (line 84): false] null | b (line 84): false |
-| Assert.cs:107:29:107:32 | [b (line 84): true] null | b (line 84): true |
-| Assert.cs:108:9:108:35 | [b (line 84): false] call to method WriteLine | b (line 84): false |
-| Assert.cs:108:9:108:35 | [b (line 84): true] call to method WriteLine | b (line 84): true |
-| Assert.cs:108:9:108:36 | [b (line 84): false] ...; | b (line 84): false |
-| Assert.cs:108:9:108:36 | [b (line 84): true] ...; | b (line 84): true |
-| Assert.cs:108:27:108:27 | [b (line 84): false] access to local variable s | b (line 84): false |
-| Assert.cs:108:27:108:27 | [b (line 84): true] access to local variable s | b (line 84): true |
-| Assert.cs:108:27:108:34 | [b (line 84): false] access to property Length | b (line 84): false |
-| Assert.cs:108:27:108:34 | [b (line 84): true] access to property Length | b (line 84): true |
-| Assert.cs:110:9:110:25 | [b (line 84): false] ... = ... | b (line 84): false |
-| Assert.cs:110:9:110:25 | [b (line 84): true] ... = ... | b (line 84): true |
-| Assert.cs:110:9:110:26 | [b (line 84): false] ...; | b (line 84): false |
-| Assert.cs:110:9:110:26 | [b (line 84): true] ...; | b (line 84): true |
-| Assert.cs:110:13:110:13 | [b (line 84): false] access to parameter b | b (line 84): false |
-| Assert.cs:110:13:110:13 | [b (line 84): true] access to parameter b | b (line 84): true |
-| Assert.cs:110:13:110:25 | [b (line 84): false] ... ? ... : ... | b (line 84): false |
-| Assert.cs:110:13:110:25 | [b (line 84): true] ... ? ... : ... | b (line 84): true |
-| Assert.cs:110:17:110:20 | [b (line 84): true] null | b (line 84): true |
-| Assert.cs:110:24:110:25 | [b (line 84): false] "" | b (line 84): false |
-| Assert.cs:111:9:111:33 | [assertion failure, b (line 84): false] call to method IsFalse | b (line 84): false |
-| Assert.cs:111:9:111:33 | [assertion failure, b (line 84): true] call to method IsFalse | b (line 84): true |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): false] call to method IsFalse | b (line 84): false |
-| Assert.cs:111:9:111:33 | [assertion success, b (line 84): true] call to method IsFalse | b (line 84): true |
-| Assert.cs:111:9:111:34 | [b (line 84): false] ...; | b (line 84): false |
-| Assert.cs:111:9:111:34 | [b (line 84): true] ...; | b (line 84): true |
-| Assert.cs:111:24:111:24 | [b (line 84): false] access to local variable s | b (line 84): false |
-| Assert.cs:111:24:111:24 | [b (line 84): true] access to local variable s | b (line 84): true |
-| Assert.cs:111:24:111:32 | [b (line 84): false] ... == ... | b (line 84): false |
-| Assert.cs:111:24:111:32 | [b (line 84): true] ... == ... | b (line 84): true |
-| Assert.cs:111:29:111:32 | [b (line 84): false] null | b (line 84): false |
-| Assert.cs:111:29:111:32 | [b (line 84): true] null | b (line 84): true |
-| Assert.cs:112:9:112:35 | [b (line 84): false] call to method WriteLine | b (line 84): false |
-| Assert.cs:112:9:112:35 | [b (line 84): true] call to method WriteLine | b (line 84): true |
-| Assert.cs:112:9:112:36 | [b (line 84): false] ...; | b (line 84): false |
-| Assert.cs:112:9:112:36 | [b (line 84): true] ...; | b (line 84): true |
-| Assert.cs:112:27:112:27 | [b (line 84): false] access to local variable s | b (line 84): false |
-| Assert.cs:112:27:112:27 | [b (line 84): true] access to local variable s | b (line 84): true |
-| Assert.cs:112:27:112:34 | [b (line 84): false] access to property Length | b (line 84): false |
-| Assert.cs:112:27:112:34 | [b (line 84): true] access to property Length | b (line 84): true |
-| Assert.cs:114:9:114:25 | [b (line 84): false] ... = ... | b (line 84): false |
-| Assert.cs:114:9:114:25 | [b (line 84): true] ... = ... | b (line 84): true |
-| Assert.cs:114:9:114:26 | [b (line 84): false] ...; | b (line 84): false |
-| Assert.cs:114:9:114:26 | [b (line 84): true] ...; | b (line 84): true |
-| Assert.cs:114:13:114:13 | [b (line 84): false] access to parameter b | b (line 84): false |
-| Assert.cs:114:13:114:13 | [b (line 84): true] access to parameter b | b (line 84): true |
-| Assert.cs:114:13:114:25 | [b (line 84): false] ... ? ... : ... | b (line 84): false |
-| Assert.cs:114:13:114:25 | [b (line 84): true] ... ? ... : ... | b (line 84): true |
-| Assert.cs:114:17:114:20 | [b (line 84): true] null | b (line 84): true |
-| Assert.cs:114:24:114:25 | [b (line 84): false] "" | b (line 84): false |
-| Assert.cs:115:9:115:37 | [assertion failure, b (line 84): false] call to method IsTrue | b (line 84): false |
-| Assert.cs:115:9:115:37 | [assertion failure, b (line 84): true] call to method IsTrue | b (line 84): true |
-| Assert.cs:115:9:115:37 | [assertion success, b (line 84): true] call to method IsTrue | b (line 84): true |
-| Assert.cs:115:9:115:38 | [b (line 84): false] ...; | b (line 84): false |
-| Assert.cs:115:9:115:38 | [b (line 84): true] ...; | b (line 84): true |
-| Assert.cs:115:23:115:23 | [b (line 84): false] access to local variable s | b (line 84): false |
-| Assert.cs:115:23:115:23 | [b (line 84): true] access to local variable s | b (line 84): true |
-| Assert.cs:115:23:115:31 | [b (line 84): false] ... != ... | b (line 84): false |
-| Assert.cs:115:23:115:31 | [b (line 84): true] ... != ... | b (line 84): true |
-| Assert.cs:115:23:115:36 | [false, b (line 84): false] ... && ... | b (line 84): false |
-| Assert.cs:115:23:115:36 | [false, b (line 84): true] ... && ... | b (line 84): true |
-| Assert.cs:115:23:115:36 | [true, b (line 84): true] ... && ... | b (line 84): true |
-| Assert.cs:115:28:115:31 | [b (line 84): false] null | b (line 84): false |
-| Assert.cs:115:28:115:31 | [b (line 84): true] null | b (line 84): true |
-| Assert.cs:115:36:115:36 | [b (line 84): false] access to parameter b | b (line 84): false |
-| Assert.cs:115:36:115:36 | [b (line 84): true] access to parameter b | b (line 84): true |
-| Assert.cs:116:9:116:35 | [b (line 84): true] call to method WriteLine | b (line 84): true |
-| Assert.cs:116:9:116:36 | [b (line 84): true] ...; | b (line 84): true |
-| Assert.cs:116:27:116:27 | [b (line 84): true] access to local variable s | b (line 84): true |
-| Assert.cs:116:27:116:34 | [b (line 84): true] access to property Length | b (line 84): true |
-| Assert.cs:118:9:118:25 | [b (line 84): true] ... = ... | b (line 84): true |
-| Assert.cs:118:9:118:26 | [b (line 84): true] ...; | b (line 84): true |
-| Assert.cs:118:13:118:13 | [b (line 84): true] access to parameter b | b (line 84): true |
-| Assert.cs:118:13:118:25 | [b (line 84): true] ... ? ... : ... | b (line 84): true |
-| Assert.cs:118:17:118:20 | [b (line 84): true] null | b (line 84): true |
-| Assert.cs:119:9:119:39 | [assertion failure, b (line 84): true] call to method IsFalse | b (line 84): true |
-| Assert.cs:119:9:119:39 | [assertion success, b (line 84): true] call to method IsFalse | b (line 84): true |
-| Assert.cs:119:9:119:40 | [b (line 84): true] ...; | b (line 84): true |
-| Assert.cs:119:24:119:24 | [b (line 84): true] access to local variable s | b (line 84): true |
-| Assert.cs:119:24:119:32 | [b (line 84): true] ... == ... | b (line 84): true |
-| Assert.cs:119:24:119:38 | [false, b (line 84): true] ... \|\| ... | b (line 84): true |
-| Assert.cs:119:24:119:38 | [true, b (line 84): true] ... \|\| ... | b (line 84): true |
-| Assert.cs:119:29:119:32 | [b (line 84): true] null | b (line 84): true |
-| Assert.cs:119:37:119:38 | [false, b (line 84): true] !... | b (line 84): true |
-| Assert.cs:119:38:119:38 | [b (line 84): true] access to parameter b | b (line 84): true |
-| Assert.cs:120:9:120:35 | [b (line 84): true] call to method WriteLine | b (line 84): true |
-| Assert.cs:120:9:120:36 | [b (line 84): true] ...; | b (line 84): true |
-| Assert.cs:120:27:120:27 | [b (line 84): true] access to local variable s | b (line 84): true |
-| Assert.cs:120:27:120:34 | [b (line 84): true] access to property Length | b (line 84): true |
-| Assert.cs:122:9:122:25 | [b (line 84): true] ... = ... | b (line 84): true |
-| Assert.cs:122:9:122:26 | [b (line 84): true] ...; | b (line 84): true |
-| Assert.cs:122:13:122:13 | [b (line 84): true] access to parameter b | b (line 84): true |
-| Assert.cs:122:13:122:25 | [b (line 84): true] ... ? ... : ... | b (line 84): true |
-| Assert.cs:122:17:122:20 | [b (line 84): true] null | b (line 84): true |
-| Assert.cs:123:9:123:37 | [assertion failure, b (line 84): true] call to method IsTrue | b (line 84): true |
-| Assert.cs:123:9:123:37 | [assertion success, b (line 84): true] call to method IsTrue | b (line 84): true |
-| Assert.cs:123:9:123:38 | [b (line 84): true] ...; | b (line 84): true |
-| Assert.cs:123:23:123:23 | [b (line 84): true] access to local variable s | b (line 84): true |
-| Assert.cs:123:23:123:31 | [b (line 84): true] ... == ... | b (line 84): true |
-| Assert.cs:123:23:123:36 | [false, b (line 84): true] ... && ... | b (line 84): true |
-| Assert.cs:123:23:123:36 | [true, b (line 84): true] ... && ... | b (line 84): true |
-| Assert.cs:123:28:123:31 | [b (line 84): true] null | b (line 84): true |
-| Assert.cs:123:36:123:36 | [b (line 84): true] access to parameter b | b (line 84): true |
-| Assert.cs:124:9:124:35 | [b (line 84): true] call to method WriteLine | b (line 84): true |
-| Assert.cs:124:9:124:36 | [b (line 84): true] ...; | b (line 84): true |
-| Assert.cs:124:27:124:27 | [b (line 84): true] access to local variable s | b (line 84): true |
-| Assert.cs:124:27:124:34 | [b (line 84): true] access to property Length | b (line 84): true |
-| Assert.cs:126:9:126:25 | [b (line 84): true] ... = ... | b (line 84): true |
-| Assert.cs:126:9:126:26 | [b (line 84): true] ...; | b (line 84): true |
-| Assert.cs:126:13:126:13 | [b (line 84): true] access to parameter b | b (line 84): true |
-| Assert.cs:126:13:126:25 | [b (line 84): true] ... ? ... : ... | b (line 84): true |
-| Assert.cs:126:17:126:20 | [b (line 84): true] null | b (line 84): true |
-| Assert.cs:127:9:127:40 | [b (line 84): true] ...; | b (line 84): true |
-| Assert.cs:127:24:127:24 | [b (line 84): true] access to local variable s | b (line 84): true |
-| Assert.cs:127:24:127:32 | [b (line 84): true] ... != ... | b (line 84): true |
-| Assert.cs:127:29:127:32 | [b (line 84): true] null | b (line 84): true |
-| Assert.cs:127:38:127:38 | [b (line 84): true] access to parameter b | b (line 84): true |
-| Conditions.cs:6:13:6:13 | [inc (line 3): true] access to parameter x | inc (line 3): true |
-| Conditions.cs:6:13:6:15 | [inc (line 3): true] ...++ | inc (line 3): true |
-| Conditions.cs:6:13:6:16 | [inc (line 3): true] ...; | inc (line 3): true |
-| Conditions.cs:7:9:8:16 | [inc (line 3): false] if (...) ... | inc (line 3): false |
-| Conditions.cs:7:9:8:16 | [inc (line 3): true] if (...) ... | inc (line 3): true |
-| Conditions.cs:7:14:7:16 | [inc (line 3): false] access to parameter inc | inc (line 3): false |
-| Conditions.cs:7:14:7:16 | [inc (line 3): true] access to parameter inc | inc (line 3): true |
-| Conditions.cs:15:13:15:13 | [b (line 11): true] access to local variable x | b (line 11): true |
-| Conditions.cs:15:13:15:15 | [b (line 11): true] ...++ | b (line 11): true |
-| Conditions.cs:15:13:15:16 | [b (line 11): true] ...; | b (line 11): true |
-| Conditions.cs:16:9:18:20 | [b (line 11): false] if (...) ... | b (line 11): false |
-| Conditions.cs:16:9:18:20 | [b (line 11): true] if (...) ... | b (line 11): true |
-| Conditions.cs:16:13:16:13 | [b (line 11): false] access to local variable x | b (line 11): false |
-| Conditions.cs:16:13:16:13 | [b (line 11): true] access to local variable x | b (line 11): true |
-| Conditions.cs:16:13:16:17 | [b (line 11): false] ... > ... | b (line 11): false |
-| Conditions.cs:16:13:16:17 | [b (line 11): true] ... > ... | b (line 11): true |
-| Conditions.cs:16:17:16:17 | [b (line 11): false] 0 | b (line 11): false |
-| Conditions.cs:16:17:16:17 | [b (line 11): true] 0 | b (line 11): true |
-| Conditions.cs:17:13:18:20 | [b (line 11): false] if (...) ... | b (line 11): false |
-| Conditions.cs:17:13:18:20 | [b (line 11): true] if (...) ... | b (line 11): true |
-| Conditions.cs:17:18:17:18 | [b (line 11): false] access to parameter b | b (line 11): false |
-| Conditions.cs:17:18:17:18 | [b (line 11): true] access to parameter b | b (line 11): true |
-| Conditions.cs:27:17:27:17 | [b2 (line 22): true] access to local variable x | b2 (line 22): true |
-| Conditions.cs:27:17:27:19 | [b2 (line 22): true] ...++ | b2 (line 22): true |
-| Conditions.cs:27:17:27:20 | [b2 (line 22): true] ...; | b2 (line 22): true |
-| Conditions.cs:28:9:29:16 | [b2 (line 22): false] if (...) ... | b2 (line 22): false |
-| Conditions.cs:28:9:29:16 | [b2 (line 22): true] if (...) ... | b2 (line 22): true |
-| Conditions.cs:28:13:28:14 | [b2 (line 22): false] access to parameter b2 | b2 (line 22): false |
-| Conditions.cs:28:13:28:14 | [b2 (line 22): true] access to parameter b2 | b2 (line 22): true |
-| Conditions.cs:40:13:40:13 | [b2 (line 39): true] access to local variable x | b2 (line 39): true |
-| Conditions.cs:40:13:40:15 | [b2 (line 39): true] ...++ | b2 (line 39): true |
-| Conditions.cs:40:13:40:16 | [b2 (line 39): true] ...; | b2 (line 39): true |
-| Conditions.cs:41:9:42:16 | [b2 (line 39): false] if (...) ... | b2 (line 39): false |
-| Conditions.cs:41:9:42:16 | [b2 (line 39): true] if (...) ... | b2 (line 39): true |
-| Conditions.cs:41:13:41:14 | [b2 (line 39): false] access to local variable b2 | b2 (line 39): false |
-| Conditions.cs:41:13:41:14 | [b2 (line 39): true] access to local variable b2 | b2 (line 39): true |
-| Conditions.cs:49:16:49:16 | [b (line 46): false] access to parameter x | b (line 46): false |
-| Conditions.cs:49:16:49:16 | [b (line 46): true] access to parameter x | b (line 46): true |
-| Conditions.cs:49:16:49:18 | [b (line 46): false] ...-- | b (line 46): false |
-| Conditions.cs:49:16:49:18 | [b (line 46): true] ...-- | b (line 46): true |
-| Conditions.cs:49:16:49:22 | [b (line 46): false] ... > ... | b (line 46): false |
-| Conditions.cs:49:16:49:22 | [b (line 46): true] ... > ... | b (line 46): true |
-| Conditions.cs:49:22:49:22 | [b (line 46): false] 0 | b (line 46): false |
-| Conditions.cs:49:22:49:22 | [b (line 46): true] 0 | b (line 46): true |
-| Conditions.cs:50:9:53:9 | [b (line 46): false] {...} | b (line 46): false |
-| Conditions.cs:50:9:53:9 | [b (line 46): true] {...} | b (line 46): true |
-| Conditions.cs:51:13:52:20 | [b (line 46): false] if (...) ... | b (line 46): false |
-| Conditions.cs:51:13:52:20 | [b (line 46): true] if (...) ... | b (line 46): true |
-| Conditions.cs:51:17:51:17 | [b (line 46): false] access to parameter b | b (line 46): false |
-| Conditions.cs:51:17:51:17 | [b (line 46): true] access to parameter b | b (line 46): true |
-| Conditions.cs:52:17:52:17 | [b (line 46): true] access to local variable y | b (line 46): true |
-| Conditions.cs:52:17:52:19 | [b (line 46): true] ...++ | b (line 46): true |
-| Conditions.cs:52:17:52:20 | [b (line 46): true] ...; | b (line 46): true |
-| Conditions.cs:60:16:60:16 | [b (line 57): false] access to parameter x | b (line 57): false |
-| Conditions.cs:60:16:60:16 | [b (line 57): true] access to parameter x | b (line 57): true |
-| Conditions.cs:60:16:60:18 | [b (line 57): false] ...-- | b (line 57): false |
-| Conditions.cs:60:16:60:18 | [b (line 57): true] ...-- | b (line 57): true |
-| Conditions.cs:60:16:60:22 | [b (line 57): false] ... > ... | b (line 57): false |
-| Conditions.cs:60:16:60:22 | [b (line 57): true] ... > ... | b (line 57): true |
-| Conditions.cs:60:22:60:22 | [b (line 57): false] 0 | b (line 57): false |
-| Conditions.cs:60:22:60:22 | [b (line 57): true] 0 | b (line 57): true |
-| Conditions.cs:61:9:64:9 | [b (line 57): false] {...} | b (line 57): false |
-| Conditions.cs:61:9:64:9 | [b (line 57): true] {...} | b (line 57): true |
-| Conditions.cs:62:13:63:20 | [b (line 57): false] if (...) ... | b (line 57): false |
-| Conditions.cs:62:13:63:20 | [b (line 57): true] if (...) ... | b (line 57): true |
-| Conditions.cs:62:17:62:17 | [b (line 57): false] access to parameter b | b (line 57): false |
-| Conditions.cs:62:17:62:17 | [b (line 57): true] access to parameter b | b (line 57): true |
-| Conditions.cs:63:17:63:17 | [b (line 57): true] access to local variable y | b (line 57): true |
-| Conditions.cs:63:17:63:19 | [b (line 57): true] ...++ | b (line 57): true |
-| Conditions.cs:63:17:63:20 | [b (line 57): true] ...; | b (line 57): true |
-| Conditions.cs:65:9:66:16 | [b (line 57): false] if (...) ... | b (line 57): false |
-| Conditions.cs:65:9:66:16 | [b (line 57): true] if (...) ... | b (line 57): true |
-| Conditions.cs:65:13:65:13 | [b (line 57): false] access to parameter b | b (line 57): false |
-| Conditions.cs:65:13:65:13 | [b (line 57): true] access to parameter b | b (line 57): true |
-| Conditions.cs:106:13:106:13 | [b (line 102): true] access to local variable x | b (line 102): true |
-| Conditions.cs:106:13:106:19 | [b (line 102): true] ... + ... | b (line 102): true |
-| Conditions.cs:106:13:106:19 | [b (line 102): true] ... = ... | b (line 102): true |
-| Conditions.cs:106:13:106:20 | [b (line 102): true] ...; | b (line 102): true |
-| Conditions.cs:106:18:106:19 | [b (line 102): true] "" | b (line 102): true |
-| Conditions.cs:107:9:109:24 | [b (line 102): false] if (...) ... | b (line 102): false |
-| Conditions.cs:107:9:109:24 | [b (line 102): true] if (...) ... | b (line 102): true |
-| Conditions.cs:107:13:107:13 | [b (line 102): false] access to local variable x | b (line 102): false |
-| Conditions.cs:107:13:107:13 | [b (line 102): true] access to local variable x | b (line 102): true |
-| Conditions.cs:107:13:107:20 | [b (line 102): false] access to property Length | b (line 102): false |
-| Conditions.cs:107:13:107:20 | [b (line 102): true] access to property Length | b (line 102): true |
-| Conditions.cs:107:13:107:24 | [b (line 102): false] ... > ... | b (line 102): false |
-| Conditions.cs:107:13:107:24 | [b (line 102): true] ... > ... | b (line 102): true |
-| Conditions.cs:107:24:107:24 | [b (line 102): false] 0 | b (line 102): false |
-| Conditions.cs:107:24:107:24 | [b (line 102): true] 0 | b (line 102): true |
-| Conditions.cs:108:13:109:24 | [b (line 102): false] if (...) ... | b (line 102): false |
-| Conditions.cs:108:13:109:24 | [b (line 102): true] if (...) ... | b (line 102): true |
-| Conditions.cs:108:18:108:18 | [b (line 102): false] access to parameter b | b (line 102): false |
-| Conditions.cs:108:18:108:18 | [b (line 102): true] access to parameter b | b (line 102): true |
-| Conditions.cs:119:17:119:21 | [false, last (line 118): true] !... | last (line 118): true |
-| Conditions.cs:119:17:119:21 | [true, last (line 118): false] !... | last (line 118): false |
-| Conditions.cs:120:17:120:22 | [last (line 118): false] ... = ... | last (line 118): false |
-| Conditions.cs:120:17:120:23 | [last (line 118): false] ...; | last (line 118): false |
-| Conditions.cs:120:21:120:22 | [last (line 118): false] "" | last (line 118): false |
-| Conditions.cs:121:13:122:25 | [last (line 118): false] if (...) ... | last (line 118): false |
-| Conditions.cs:121:13:122:25 | [last (line 118): true] if (...) ... | last (line 118): true |
-| Conditions.cs:121:17:121:20 | [last (line 118): false] access to local variable last | last (line 118): false |
-| Conditions.cs:121:17:121:20 | [last (line 118): true] access to local variable last | last (line 118): true |
-| Conditions.cs:131:16:131:19 | [Field1 (line 129): false] true | Field1 (line 129): false |
-| Conditions.cs:131:16:131:19 | [Field1 (line 129): true, Field2 (line 129): false] true | Field1 (line 129): true |
-| Conditions.cs:131:16:131:19 | [Field1 (line 129): true, Field2 (line 129): false] true | Field2 (line 129): false |
-| Conditions.cs:131:16:131:19 | [Field1 (line 129): true, Field2 (line 129): true] true | Field1 (line 129): true |
-| Conditions.cs:131:16:131:19 | [Field1 (line 129): true, Field2 (line 129): true] true | Field2 (line 129): true |
-| Conditions.cs:132:9:140:9 | [Field1 (line 129): false] {...} | Field1 (line 129): false |
-| Conditions.cs:132:9:140:9 | [Field1 (line 129): true, Field2 (line 129): false] {...} | Field1 (line 129): true |
-| Conditions.cs:132:9:140:9 | [Field1 (line 129): true, Field2 (line 129): false] {...} | Field2 (line 129): false |
-| Conditions.cs:132:9:140:9 | [Field1 (line 129): true, Field2 (line 129): true] {...} | Field1 (line 129): true |
-| Conditions.cs:132:9:140:9 | [Field1 (line 129): true, Field2 (line 129): true] {...} | Field2 (line 129): true |
-| Conditions.cs:133:13:139:13 | [Field1 (line 129): false] if (...) ... | Field1 (line 129): false |
-| Conditions.cs:133:13:139:13 | [Field1 (line 129): true, Field2 (line 129): false] if (...) ... | Field1 (line 129): true |
-| Conditions.cs:133:13:139:13 | [Field1 (line 129): true, Field2 (line 129): false] if (...) ... | Field2 (line 129): false |
-| Conditions.cs:133:13:139:13 | [Field1 (line 129): true, Field2 (line 129): true] if (...) ... | Field1 (line 129): true |
-| Conditions.cs:133:13:139:13 | [Field1 (line 129): true, Field2 (line 129): true] if (...) ... | Field2 (line 129): true |
-| Conditions.cs:133:17:133:22 | [Field1 (line 129): false] access to field Field1 | Field1 (line 129): false |
-| Conditions.cs:133:17:133:22 | [Field1 (line 129): false] this access | Field1 (line 129): false |
-| Conditions.cs:133:17:133:22 | [Field1 (line 129): true, Field2 (line 129): false] access to field Field1 | Field1 (line 129): true |
-| Conditions.cs:133:17:133:22 | [Field1 (line 129): true, Field2 (line 129): false] access to field Field1 | Field2 (line 129): false |
-| Conditions.cs:133:17:133:22 | [Field1 (line 129): true, Field2 (line 129): false] this access | Field1 (line 129): true |
-| Conditions.cs:133:17:133:22 | [Field1 (line 129): true, Field2 (line 129): false] this access | Field2 (line 129): false |
-| Conditions.cs:133:17:133:22 | [Field1 (line 129): true, Field2 (line 129): true] access to field Field1 | Field1 (line 129): true |
-| Conditions.cs:133:17:133:22 | [Field1 (line 129): true, Field2 (line 129): true] access to field Field1 | Field2 (line 129): true |
-| Conditions.cs:133:17:133:22 | [Field1 (line 129): true, Field2 (line 129): true] this access | Field1 (line 129): true |
-| Conditions.cs:133:17:133:22 | [Field1 (line 129): true, Field2 (line 129): true] this access | Field2 (line 129): true |
-| Conditions.cs:134:13:139:13 | [Field1 (line 129): true, Field2 (line 129): false] {...} | Field1 (line 129): true |
-| Conditions.cs:134:13:139:13 | [Field1 (line 129): true, Field2 (line 129): false] {...} | Field2 (line 129): false |
-| Conditions.cs:134:13:139:13 | [Field1 (line 129): true, Field2 (line 129): true] {...} | Field1 (line 129): true |
-| Conditions.cs:134:13:139:13 | [Field1 (line 129): true, Field2 (line 129): true] {...} | Field2 (line 129): true |
-| Conditions.cs:134:13:139:13 | [Field1 (line 129): true] {...} | Field1 (line 129): true |
-| Conditions.cs:135:17:138:17 | [Field1 (line 129): true, Field2 (line 129): false] if (...) ... | Field1 (line 129): true |
-| Conditions.cs:135:17:138:17 | [Field1 (line 129): true, Field2 (line 129): false] if (...) ... | Field2 (line 129): false |
-| Conditions.cs:135:17:138:17 | [Field1 (line 129): true, Field2 (line 129): true] if (...) ... | Field1 (line 129): true |
-| Conditions.cs:135:17:138:17 | [Field1 (line 129): true, Field2 (line 129): true] if (...) ... | Field2 (line 129): true |
-| Conditions.cs:135:17:138:17 | [Field1 (line 129): true] if (...) ... | Field1 (line 129): true |
-| Conditions.cs:135:21:135:26 | [Field1 (line 129): true, Field2 (line 129): false] access to field Field2 | Field1 (line 129): true |
-| Conditions.cs:135:21:135:26 | [Field1 (line 129): true, Field2 (line 129): false] access to field Field2 | Field2 (line 129): false |
-| Conditions.cs:135:21:135:26 | [Field1 (line 129): true, Field2 (line 129): false] this access | Field1 (line 129): true |
-| Conditions.cs:135:21:135:26 | [Field1 (line 129): true, Field2 (line 129): false] this access | Field2 (line 129): false |
-| Conditions.cs:135:21:135:26 | [Field1 (line 129): true, Field2 (line 129): true] access to field Field2 | Field1 (line 129): true |
-| Conditions.cs:135:21:135:26 | [Field1 (line 129): true, Field2 (line 129): true] access to field Field2 | Field2 (line 129): true |
-| Conditions.cs:135:21:135:26 | [Field1 (line 129): true, Field2 (line 129): true] this access | Field1 (line 129): true |
-| Conditions.cs:135:21:135:26 | [Field1 (line 129): true, Field2 (line 129): true] this access | Field2 (line 129): true |
-| Conditions.cs:135:21:135:26 | [Field1 (line 129): true] access to field Field2 | Field1 (line 129): true |
-| Conditions.cs:135:21:135:26 | [Field1 (line 129): true] this access | Field1 (line 129): true |
-| Conditions.cs:136:17:138:17 | [Field1 (line 129): true, Field2 (line 129): true] {...} | Field1 (line 129): true |
-| Conditions.cs:136:17:138:17 | [Field1 (line 129): true, Field2 (line 129): true] {...} | Field2 (line 129): true |
-| Conditions.cs:137:21:137:26 | [Field1 (line 129): true, Field2 (line 129): true] access to field Field1 | Field1 (line 129): true |
-| Conditions.cs:137:21:137:26 | [Field1 (line 129): true, Field2 (line 129): true] access to field Field1 | Field2 (line 129): true |
-| Conditions.cs:137:21:137:26 | [Field1 (line 129): true, Field2 (line 129): true] this access | Field1 (line 129): true |
-| Conditions.cs:137:21:137:26 | [Field1 (line 129): true, Field2 (line 129): true] this access | Field2 (line 129): true |
-| Conditions.cs:137:21:137:37 | [Field1 (line 129): true, Field2 (line 129): true] call to method ToString | Field1 (line 129): true |
-| Conditions.cs:137:21:137:37 | [Field1 (line 129): true, Field2 (line 129): true] call to method ToString | Field2 (line 129): true |
-| Conditions.cs:137:21:137:38 | [Field1 (line 129): true, Field2 (line 129): true] ...; | Field1 (line 129): true |
-| Conditions.cs:137:21:137:38 | [Field1 (line 129): true, Field2 (line 129): true] ...; | Field2 (line 129): true |
-| Conditions.cs:145:13:145:29 | [b (line 143): false] String s = ... | b (line 143): false |
-| Conditions.cs:145:13:145:29 | [b (line 143): true] String s = ... | b (line 143): true |
-| Conditions.cs:145:17:145:29 | [b (line 143): false] ... ? ... : ... | b (line 143): false |
-| Conditions.cs:145:17:145:29 | [b (line 143): true] ... ? ... : ... | b (line 143): true |
-| Conditions.cs:145:21:145:23 | [b (line 143): true] "a" | b (line 143): true |
-| Conditions.cs:145:27:145:29 | [b (line 143): false] "b" | b (line 143): false |
-| Conditions.cs:146:9:149:49 | [b (line 143): false] if (...) ... | b (line 143): false |
-| Conditions.cs:146:9:149:49 | [b (line 143): true] if (...) ... | b (line 143): true |
-| Conditions.cs:146:13:146:13 | [b (line 143): false] access to parameter b | b (line 143): false |
-| Conditions.cs:146:13:146:13 | [b (line 143): true] access to parameter b | b (line 143): true |
-| Finally.cs:180:21:180:43 | [b1 (line 176): true] throw ...; | b1 (line 176): true |
-| Finally.cs:180:27:180:42 | [b1 (line 176): true] object creation of type ExceptionA | b1 (line 176): true |
-| Finally.cs:183:9:192:9 | [b1 (line 176): false] {...} | b1 (line 176): false |
-| Finally.cs:183:9:192:9 | [finally: exception(Exception), b1 (line 176): true] {...} | b1 (line 176): true |
-| Finally.cs:183:9:192:9 | [finally: exception(ExceptionA), b1 (line 176): true] {...} | b1 (line 176): true |
-| Finally.cs:184:13:191:13 | [b1 (line 176): false] try {...} ... | b1 (line 176): false |
-| Finally.cs:184:13:191:13 | [finally: exception(Exception), b1 (line 176): true] try {...} ... | b1 (line 176): true |
-| Finally.cs:184:13:191:13 | [finally: exception(ExceptionA), b1 (line 176): true] try {...} ... | b1 (line 176): true |
-| Finally.cs:185:13:187:13 | [b1 (line 176): false] {...} | b1 (line 176): false |
-| Finally.cs:185:13:187:13 | [finally: exception(Exception), b1 (line 176): true] {...} | b1 (line 176): true |
-| Finally.cs:185:13:187:13 | [finally: exception(ExceptionA), b1 (line 176): true] {...} | b1 (line 176): true |
-| Finally.cs:186:17:186:47 | [b1 (line 176): false] if (...) ... | b1 (line 176): false |
-| Finally.cs:186:17:186:47 | [finally: exception(Exception), b1 (line 176): true] if (...) ... | b1 (line 176): true |
-| Finally.cs:186:17:186:47 | [finally: exception(ExceptionA), b1 (line 176): true] if (...) ... | b1 (line 176): true |
-| Finally.cs:186:21:186:22 | [b1 (line 176): false] access to parameter b2 | b1 (line 176): false |
-| Finally.cs:186:21:186:22 | [finally: exception(Exception), b1 (line 176): true] access to parameter b2 | b1 (line 176): true |
-| Finally.cs:186:21:186:22 | [finally: exception(ExceptionA), b1 (line 176): true] access to parameter b2 | b1 (line 176): true |
-| Finally.cs:186:25:186:47 | [b1 (line 176): false, b2 (line 176): true] throw ...; | b1 (line 176): false |
-| Finally.cs:186:25:186:47 | [b1 (line 176): false, b2 (line 176): true] throw ...; | b2 (line 176): true |
-| Finally.cs:186:25:186:47 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] throw ...; | b1 (line 176): true |
-| Finally.cs:186:25:186:47 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] throw ...; | b2 (line 176): true |
-| Finally.cs:186:25:186:47 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] throw ...; | b1 (line 176): true |
-| Finally.cs:186:25:186:47 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] throw ...; | b2 (line 176): true |
-| Finally.cs:186:31:186:46 | [b1 (line 176): false, b2 (line 176): true] object creation of type ExceptionB | b1 (line 176): false |
-| Finally.cs:186:31:186:46 | [b1 (line 176): false, b2 (line 176): true] object creation of type ExceptionB | b2 (line 176): true |
-| Finally.cs:186:31:186:46 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB | b1 (line 176): true |
-| Finally.cs:186:31:186:46 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB | b2 (line 176): true |
-| Finally.cs:186:31:186:46 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB | b1 (line 176): true |
-| Finally.cs:186:31:186:46 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB | b2 (line 176): true |
-| Finally.cs:188:13:191:13 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] catch (...) {...} | b1 (line 176): false |
-| Finally.cs:188:13:191:13 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] catch (...) {...} | b2 (line 176): true |
-| Finally.cs:188:13:191:13 | [exception: ExceptionB, b1 (line 176): false, b2 (line 176): true] catch (...) {...} | b1 (line 176): false |
-| Finally.cs:188:13:191:13 | [exception: ExceptionB, b1 (line 176): false, b2 (line 176): true] catch (...) {...} | b2 (line 176): true |
-| Finally.cs:188:13:191:13 | [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | b1 (line 176): true |
-| Finally.cs:188:13:191:13 | [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | b2 (line 176): true |
-| Finally.cs:188:13:191:13 | [finally: exception(Exception), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | b1 (line 176): true |
-| Finally.cs:188:13:191:13 | [finally: exception(Exception), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | b2 (line 176): true |
-| Finally.cs:188:13:191:13 | [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | b1 (line 176): true |
-| Finally.cs:188:13:191:13 | [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | b2 (line 176): true |
-| Finally.cs:188:13:191:13 | [finally: exception(ExceptionA), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | b1 (line 176): true |
-| Finally.cs:188:13:191:13 | [finally: exception(ExceptionA), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | b2 (line 176): true |
-| Finally.cs:188:38:188:39 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] access to parameter b2 | b1 (line 176): false |
-| Finally.cs:188:38:188:39 | [exception: Exception, b1 (line 176): false, b2 (line 176): true] access to parameter b2 | b2 (line 176): true |
-| Finally.cs:188:38:188:39 | [exception: ExceptionB, b1 (line 176): false, b2 (line 176): true] access to parameter b2 | b1 (line 176): false |
-| Finally.cs:188:38:188:39 | [exception: ExceptionB, b1 (line 176): false, b2 (line 176): true] access to parameter b2 | b2 (line 176): true |
-| Finally.cs:188:38:188:39 | [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | b1 (line 176): true |
-| Finally.cs:188:38:188:39 | [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | b2 (line 176): true |
-| Finally.cs:188:38:188:39 | [finally: exception(Exception), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | b1 (line 176): true |
-| Finally.cs:188:38:188:39 | [finally: exception(Exception), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | b2 (line 176): true |
-| Finally.cs:188:38:188:39 | [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | b1 (line 176): true |
-| Finally.cs:188:38:188:39 | [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | b2 (line 176): true |
-| Finally.cs:188:38:188:39 | [finally: exception(ExceptionA), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | b1 (line 176): true |
-| Finally.cs:188:38:188:39 | [finally: exception(ExceptionA), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | b2 (line 176): true |
-| Finally.cs:189:13:191:13 | [b1 (line 176): false] {...} | b1 (line 176): false |
-| Finally.cs:189:13:191:13 | [finally: exception(Exception), b1 (line 176): true] {...} | b1 (line 176): true |
-| Finally.cs:189:13:191:13 | [finally: exception(ExceptionA), b1 (line 176): true] {...} | b1 (line 176): true |
-| Finally.cs:190:17:190:47 | [b1 (line 176): false] if (...) ... | b1 (line 176): false |
-| Finally.cs:190:17:190:47 | [finally: exception(Exception), b1 (line 176): true] if (...) ... | b1 (line 176): true |
-| Finally.cs:190:17:190:47 | [finally: exception(ExceptionA), b1 (line 176): true] if (...) ... | b1 (line 176): true |
-| Finally.cs:190:21:190:22 | [b1 (line 176): false] access to parameter b1 | b1 (line 176): false |
-| Finally.cs:190:21:190:22 | [finally: exception(Exception), b1 (line 176): true] access to parameter b1 | b1 (line 176): true |
-| Finally.cs:190:21:190:22 | [finally: exception(ExceptionA), b1 (line 176): true] access to parameter b1 | b1 (line 176): true |
-| LoopUnrolling.cs:58:9:64:9 | [b (line 55): false] foreach (... ... in ...) ... | b (line 55): false |
-| LoopUnrolling.cs:58:9:64:9 | [b (line 55): true] foreach (... ... in ...) ... | b (line 55): true |
-| LoopUnrolling.cs:58:22:58:22 | [b (line 55): false] String x | b (line 55): false |
-| LoopUnrolling.cs:58:22:58:22 | [b (line 55): true] String x | b (line 55): true |
-| LoopUnrolling.cs:59:9:64:9 | [b (line 55): false] {...} | b (line 55): false |
-| LoopUnrolling.cs:59:9:64:9 | [b (line 55): true] {...} | b (line 55): true |
-| LoopUnrolling.cs:60:13:61:37 | [b (line 55): false] if (...) ... | b (line 55): false |
-| LoopUnrolling.cs:60:13:61:37 | [b (line 55): true] if (...) ... | b (line 55): true |
-| LoopUnrolling.cs:60:17:60:17 | [b (line 55): false] access to parameter b | b (line 55): false |
-| LoopUnrolling.cs:60:17:60:17 | [b (line 55): true] access to parameter b | b (line 55): true |
-| LoopUnrolling.cs:61:17:61:36 | [b (line 55): true] call to method WriteLine | b (line 55): true |
-| LoopUnrolling.cs:61:17:61:37 | [b (line 55): true] ...; | b (line 55): true |
-| LoopUnrolling.cs:61:35:61:35 | [b (line 55): true] access to local variable x | b (line 55): true |
-| LoopUnrolling.cs:62:13:63:37 | [b (line 55): false] if (...) ... | b (line 55): false |
-| LoopUnrolling.cs:62:13:63:37 | [b (line 55): true] if (...) ... | b (line 55): true |
-| LoopUnrolling.cs:62:17:62:17 | [b (line 55): false] access to parameter b | b (line 55): false |
-| LoopUnrolling.cs:62:17:62:17 | [b (line 55): true] access to parameter b | b (line 55): true |
-| LoopUnrolling.cs:63:17:63:36 | [b (line 55): true] call to method WriteLine | b (line 55): true |
-| LoopUnrolling.cs:63:17:63:37 | [b (line 55): true] ...; | b (line 55): true |
-| LoopUnrolling.cs:63:35:63:35 | [b (line 55): true] access to local variable x | b (line 55): true |
-finallyNode
-| BreakInTry.cs:30:13:33:13 | [finally: break] {...} | BreakInTry.cs:24:13:33:13 | try {...} ... |
-| BreakInTry.cs:31:17:32:21 | [finally: break] if (...) ... | BreakInTry.cs:24:13:33:13 | try {...} ... |
-| BreakInTry.cs:31:21:31:24 | [finally: break] access to parameter args | BreakInTry.cs:24:13:33:13 | try {...} ... |
-| BreakInTry.cs:31:21:31:32 | [finally: break] ... == ... | BreakInTry.cs:24:13:33:13 | try {...} ... |
-| BreakInTry.cs:31:29:31:32 | [finally: break] null | BreakInTry.cs:24:13:33:13 | try {...} ... |
-| BreakInTry.cs:32:21:32:21 | [finally: break] ; | BreakInTry.cs:24:13:33:13 | try {...} ... |
-| BreakInTry.cs:46:9:52:9 | [finally: return] {...} | BreakInTry.cs:40:9:52:9 | try {...} ... |
-| BreakInTry.cs:47:13:51:13 | [finally: return] foreach (... ... in ...) ... | BreakInTry.cs:40:9:52:9 | try {...} ... |
-| BreakInTry.cs:47:26:47:28 | [finally: return] String arg | BreakInTry.cs:40:9:52:9 | try {...} ... |
-| BreakInTry.cs:47:33:47:36 | [finally: return] access to parameter args | BreakInTry.cs:40:9:52:9 | try {...} ... |
-| BreakInTry.cs:48:13:51:13 | [finally: return] {...} | BreakInTry.cs:40:9:52:9 | try {...} ... |
-| BreakInTry.cs:49:17:50:26 | [finally: return] if (...) ... | BreakInTry.cs:40:9:52:9 | try {...} ... |
-| BreakInTry.cs:49:21:49:23 | [finally: return] access to local variable arg | BreakInTry.cs:40:9:52:9 | try {...} ... |
-| BreakInTry.cs:49:21:49:31 | [finally: return] ... == ... | BreakInTry.cs:40:9:52:9 | try {...} ... |
-| BreakInTry.cs:49:28:49:31 | [finally: return] null | BreakInTry.cs:40:9:52:9 | try {...} ... |
-| BreakInTry.cs:50:21:50:26 | [finally: return] break; | BreakInTry.cs:40:9:52:9 | try {...} ... |
-| BreakInTry.cs:64:9:70:9 | [finally: return] {...} | BreakInTry.cs:58:9:70:9 | try {...} ... |
-| BreakInTry.cs:65:13:69:13 | [finally: return] foreach (... ... in ...) ... | BreakInTry.cs:58:9:70:9 | try {...} ... |
-| BreakInTry.cs:65:26:65:28 | [finally: return] String arg | BreakInTry.cs:58:9:70:9 | try {...} ... |
-| BreakInTry.cs:65:33:65:36 | [finally: return] access to parameter args | BreakInTry.cs:58:9:70:9 | try {...} ... |
-| BreakInTry.cs:66:13:69:13 | [finally: return] {...} | BreakInTry.cs:58:9:70:9 | try {...} ... |
-| BreakInTry.cs:67:17:68:26 | [finally: return] if (...) ... | BreakInTry.cs:58:9:70:9 | try {...} ... |
-| BreakInTry.cs:67:21:67:23 | [finally: return] access to local variable arg | BreakInTry.cs:58:9:70:9 | try {...} ... |
-| BreakInTry.cs:67:21:67:31 | [finally: return] ... == ... | BreakInTry.cs:58:9:70:9 | try {...} ... |
-| BreakInTry.cs:67:28:67:31 | [finally: return] null | BreakInTry.cs:58:9:70:9 | try {...} ... |
-| BreakInTry.cs:68:21:68:26 | [finally: return] break; | BreakInTry.cs:58:9:70:9 | try {...} ... |
-| CompileTimeOperators.cs:36:9:38:9 | [finally: goto(End)] {...} | CompileTimeOperators.cs:30:9:38:9 | try {...} ... |
-| CompileTimeOperators.cs:37:13:37:40 | [finally: goto(End)] call to method WriteLine | CompileTimeOperators.cs:30:9:38:9 | try {...} ... |
-| CompileTimeOperators.cs:37:13:37:41 | [finally: goto(End)] ...; | CompileTimeOperators.cs:30:9:38:9 | try {...} ... |
-| CompileTimeOperators.cs:37:31:37:39 | [finally: goto(End)] "Finally" | CompileTimeOperators.cs:30:9:38:9 | try {...} ... |
-| Finally.cs:14:9:16:9 | [finally: exception(Exception)] {...} | Finally.cs:9:9:16:9 | try {...} ... |
-| Finally.cs:15:13:15:40 | [finally: exception(Exception)] call to method WriteLine | Finally.cs:9:9:16:9 | try {...} ... |
-| Finally.cs:15:13:15:41 | [finally: exception(Exception)] ...; | Finally.cs:9:9:16:9 | try {...} ... |
-| Finally.cs:15:31:15:39 | [finally: exception(Exception)] "Finally" | Finally.cs:9:9:16:9 | try {...} ... |
-| Finally.cs:37:13:39:13 | [finally: exception(ArgumentException)] {...} | Finally.cs:32:13:39:13 | try {...} ... |
-| Finally.cs:38:17:38:44 | [finally: exception(ArgumentException)] throw ...; | Finally.cs:32:13:39:13 | try {...} ... |
-| Finally.cs:38:23:38:43 | [finally: exception(ArgumentException)] object creation of type Exception | Finally.cs:32:13:39:13 | try {...} ... |
-| Finally.cs:38:37:38:42 | [finally: exception(ArgumentException)] "Boo!" | Finally.cs:32:13:39:13 | try {...} ... |
-| Finally.cs:49:9:51:9 | [finally: exception(Exception)] {...} | Finally.cs:21:9:51:9 | try {...} ... |
-| Finally.cs:49:9:51:9 | [finally: exception(IOException)] {...} | Finally.cs:21:9:51:9 | try {...} ... |
-| Finally.cs:49:9:51:9 | [finally: return] {...} | Finally.cs:21:9:51:9 | try {...} ... |
-| Finally.cs:50:13:50:40 | [finally: exception(Exception)] call to method WriteLine | Finally.cs:21:9:51:9 | try {...} ... |
-| Finally.cs:50:13:50:40 | [finally: exception(IOException)] call to method WriteLine | Finally.cs:21:9:51:9 | try {...} ... |
-| Finally.cs:50:13:50:40 | [finally: return] call to method WriteLine | Finally.cs:21:9:51:9 | try {...} ... |
-| Finally.cs:50:13:50:41 | [finally: exception(Exception)] ...; | Finally.cs:21:9:51:9 | try {...} ... |
-| Finally.cs:50:13:50:41 | [finally: exception(IOException)] ...; | Finally.cs:21:9:51:9 | try {...} ... |
-| Finally.cs:50:13:50:41 | [finally: return] ...; | Finally.cs:21:9:51:9 | try {...} ... |
-| Finally.cs:50:31:50:39 | [finally: exception(Exception)] "Finally" | Finally.cs:21:9:51:9 | try {...} ... |
-| Finally.cs:50:31:50:39 | [finally: exception(IOException)] "Finally" | Finally.cs:21:9:51:9 | try {...} ... |
-| Finally.cs:50:31:50:39 | [finally: return] "Finally" | Finally.cs:21:9:51:9 | try {...} ... |
-| Finally.cs:69:9:71:9 | [finally: exception(Exception)] {...} | Finally.cs:56:9:71:9 | try {...} ... |
-| Finally.cs:69:9:71:9 | [finally: exception(IOException)] {...} | Finally.cs:56:9:71:9 | try {...} ... |
-| Finally.cs:69:9:71:9 | [finally: return] {...} | Finally.cs:56:9:71:9 | try {...} ... |
-| Finally.cs:70:13:70:40 | [finally: exception(Exception)] call to method WriteLine | Finally.cs:56:9:71:9 | try {...} ... |
-| Finally.cs:70:13:70:40 | [finally: exception(IOException)] call to method WriteLine | Finally.cs:56:9:71:9 | try {...} ... |
-| Finally.cs:70:13:70:40 | [finally: return] call to method WriteLine | Finally.cs:56:9:71:9 | try {...} ... |
-| Finally.cs:70:13:70:41 | [finally: exception(Exception)] ...; | Finally.cs:56:9:71:9 | try {...} ... |
-| Finally.cs:70:13:70:41 | [finally: exception(IOException)] ...; | Finally.cs:56:9:71:9 | try {...} ... |
-| Finally.cs:70:13:70:41 | [finally: return] ...; | Finally.cs:56:9:71:9 | try {...} ... |
-| Finally.cs:70:31:70:39 | [finally: exception(Exception)] "Finally" | Finally.cs:56:9:71:9 | try {...} ... |
-| Finally.cs:70:31:70:39 | [finally: exception(IOException)] "Finally" | Finally.cs:56:9:71:9 | try {...} ... |
-| Finally.cs:70:31:70:39 | [finally: return] "Finally" | Finally.cs:56:9:71:9 | try {...} ... |
-| Finally.cs:89:13:99:13 | [finally: break] {...} | Finally.cs:79:13:99:13 | try {...} ... |
-| Finally.cs:89:13:99:13 | [finally: continue] {...} | Finally.cs:79:13:99:13 | try {...} ... |
-| Finally.cs:89:13:99:13 | [finally: return] {...} | Finally.cs:79:13:99:13 | try {...} ... |
-| Finally.cs:90:17:98:17 | [finally: break] try {...} ... | Finally.cs:79:13:99:13 | try {...} ... |
-| Finally.cs:90:17:98:17 | [finally: continue] try {...} ... | Finally.cs:79:13:99:13 | try {...} ... |
-| Finally.cs:90:17:98:17 | [finally: return] try {...} ... | Finally.cs:79:13:99:13 | try {...} ... |
-| Finally.cs:91:17:94:17 | [finally: break] {...} | Finally.cs:79:13:99:13 | try {...} ... |
-| Finally.cs:91:17:94:17 | [finally: continue] {...} | Finally.cs:79:13:99:13 | try {...} ... |
-| Finally.cs:91:17:94:17 | [finally: return] {...} | Finally.cs:79:13:99:13 | try {...} ... |
-| Finally.cs:92:21:93:46 | [finally: break] if (...) ... | Finally.cs:79:13:99:13 | try {...} ... |
-| Finally.cs:92:21:93:46 | [finally: continue] if (...) ... | Finally.cs:79:13:99:13 | try {...} ... |
-| Finally.cs:92:21:93:46 | [finally: return] if (...) ... | Finally.cs:79:13:99:13 | try {...} ... |
-| Finally.cs:92:25:92:25 | [finally: break] access to local variable i | Finally.cs:79:13:99:13 | try {...} ... |
-| Finally.cs:92:25:92:25 | [finally: continue] access to local variable i | Finally.cs:79:13:99:13 | try {...} ... |
-| Finally.cs:92:25:92:25 | [finally: return] access to local variable i | Finally.cs:79:13:99:13 | try {...} ... |
-| Finally.cs:92:25:92:30 | [finally: break] ... == ... | Finally.cs:79:13:99:13 | try {...} ... |
-| Finally.cs:92:25:92:30 | [finally: continue] ... == ... | Finally.cs:79:13:99:13 | try {...} ... |
-| Finally.cs:92:25:92:30 | [finally: return] ... == ... | Finally.cs:79:13:99:13 | try {...} ... |
-| Finally.cs:92:30:92:30 | [finally: break] 3 | Finally.cs:79:13:99:13 | try {...} ... |
-| Finally.cs:92:30:92:30 | [finally: continue] 3 | Finally.cs:79:13:99:13 | try {...} ... |
-| Finally.cs:92:30:92:30 | [finally: return] 3 | Finally.cs:79:13:99:13 | try {...} ... |
-| Finally.cs:93:25:93:46 | [finally: break] throw ...; | Finally.cs:79:13:99:13 | try {...} ... |
-| Finally.cs:93:25:93:46 | [finally: continue] throw ...; | Finally.cs:79:13:99:13 | try {...} ... |
-| Finally.cs:93:25:93:46 | [finally: return] throw ...; | Finally.cs:79:13:99:13 | try {...} ... |
-| Finally.cs:93:31:93:45 | [finally: break] object creation of type Exception | Finally.cs:79:13:99:13 | try {...} ... |
-| Finally.cs:93:31:93:45 | [finally: continue] object creation of type Exception | Finally.cs:79:13:99:13 | try {...} ... |
-| Finally.cs:93:31:93:45 | [finally: return] object creation of type Exception | Finally.cs:79:13:99:13 | try {...} ... |
-| Finally.cs:96:17:98:17 | [finally(1): exception(Exception)] {...} | Finally.cs:90:17:98:17 | try {...} ... |
-| Finally.cs:96:17:98:17 | [finally: break, finally(1): exception(Exception)] {...} | Finally.cs:90:17:98:17 | try {...} ... |
-| Finally.cs:96:17:98:17 | [finally: break] {...} | Finally.cs:90:17:98:17 | try {...} ... |
-| Finally.cs:96:17:98:17 | [finally: continue, finally(1): exception(Exception)] {...} | Finally.cs:90:17:98:17 | try {...} ... |
-| Finally.cs:96:17:98:17 | [finally: continue] {...} | Finally.cs:90:17:98:17 | try {...} ... |
-| Finally.cs:96:17:98:17 | [finally: return, finally(1): exception(Exception)] {...} | Finally.cs:90:17:98:17 | try {...} ... |
-| Finally.cs:96:17:98:17 | [finally: return] {...} | Finally.cs:90:17:98:17 | try {...} ... |
-| Finally.cs:97:21:97:21 | [finally(1): exception(Exception)] access to local variable i | Finally.cs:90:17:98:17 | try {...} ... |
-| Finally.cs:97:21:97:21 | [finally: break, finally(1): exception(Exception)] access to local variable i | Finally.cs:90:17:98:17 | try {...} ... |
-| Finally.cs:97:21:97:21 | [finally: break] access to local variable i | Finally.cs:90:17:98:17 | try {...} ... |
-| Finally.cs:97:21:97:21 | [finally: continue, finally(1): exception(Exception)] access to local variable i | Finally.cs:90:17:98:17 | try {...} ... |
-| Finally.cs:97:21:97:21 | [finally: continue] access to local variable i | Finally.cs:90:17:98:17 | try {...} ... |
-| Finally.cs:97:21:97:21 | [finally: return, finally(1): exception(Exception)] access to local variable i | Finally.cs:90:17:98:17 | try {...} ... |
-| Finally.cs:97:21:97:21 | [finally: return] access to local variable i | Finally.cs:90:17:98:17 | try {...} ... |
-| Finally.cs:97:21:97:23 | [finally(1): exception(Exception)] ...-- | Finally.cs:90:17:98:17 | try {...} ... |
-| Finally.cs:97:21:97:23 | [finally: break, finally(1): exception(Exception)] ...-- | Finally.cs:90:17:98:17 | try {...} ... |
-| Finally.cs:97:21:97:23 | [finally: break] ...-- | Finally.cs:90:17:98:17 | try {...} ... |
-| Finally.cs:97:21:97:23 | [finally: continue, finally(1): exception(Exception)] ...-- | Finally.cs:90:17:98:17 | try {...} ... |
-| Finally.cs:97:21:97:23 | [finally: continue] ...-- | Finally.cs:90:17:98:17 | try {...} ... |
-| Finally.cs:97:21:97:23 | [finally: return, finally(1): exception(Exception)] ...-- | Finally.cs:90:17:98:17 | try {...} ... |
-| Finally.cs:97:21:97:23 | [finally: return] ...-- | Finally.cs:90:17:98:17 | try {...} ... |
-| Finally.cs:97:21:97:24 | [finally(1): exception(Exception)] ...; | Finally.cs:90:17:98:17 | try {...} ... |
-| Finally.cs:97:21:97:24 | [finally: break, finally(1): exception(Exception)] ...; | Finally.cs:90:17:98:17 | try {...} ... |
-| Finally.cs:97:21:97:24 | [finally: break] ...; | Finally.cs:90:17:98:17 | try {...} ... |
-| Finally.cs:97:21:97:24 | [finally: continue, finally(1): exception(Exception)] ...; | Finally.cs:90:17:98:17 | try {...} ... |
-| Finally.cs:97:21:97:24 | [finally: continue] ...; | Finally.cs:90:17:98:17 | try {...} ... |
-| Finally.cs:97:21:97:24 | [finally: return, finally(1): exception(Exception)] ...; | Finally.cs:90:17:98:17 | try {...} ... |
-| Finally.cs:97:21:97:24 | [finally: return] ...; | Finally.cs:90:17:98:17 | try {...} ... |
-| Finally.cs:113:9:118:9 | [finally: exception(Exception)] {...} | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:113:9:118:9 | [finally: exception(NullReferenceException)] {...} | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:113:9:118:9 | [finally: exception(OutOfMemoryException)] {...} | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:113:9:118:9 | [finally: return] {...} | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:114:13:115:41 | [finally: exception(Exception)] if (...) ... | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:114:13:115:41 | [finally: exception(NullReferenceException)] if (...) ... | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:114:13:115:41 | [finally: exception(OutOfMemoryException)] if (...) ... | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:114:13:115:41 | [finally: return] if (...) ... | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:114:17:114:36 | [false, finally: exception(Exception)] !... | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:114:17:114:36 | [false, finally: exception(NullReferenceException)] !... | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:114:17:114:36 | [false, finally: exception(OutOfMemoryException)] !... | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:114:17:114:36 | [false, finally: return] !... | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:114:17:114:36 | [true, finally: exception(Exception)] !... | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:114:17:114:36 | [true, finally: exception(NullReferenceException)] !... | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:114:17:114:36 | [true, finally: exception(OutOfMemoryException)] !... | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:114:17:114:36 | [true, finally: return] !... | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:114:19:114:23 | [finally: exception(Exception)] access to field Field | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:114:19:114:23 | [finally: exception(Exception)] this access | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:114:19:114:23 | [finally: exception(NullReferenceException)] access to field Field | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:114:19:114:23 | [finally: exception(NullReferenceException)] this access | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:114:19:114:23 | [finally: exception(OutOfMemoryException)] access to field Field | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:114:19:114:23 | [finally: exception(OutOfMemoryException)] this access | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:114:19:114:23 | [finally: return] access to field Field | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:114:19:114:23 | [finally: return] this access | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:114:19:114:30 | [finally: exception(Exception)] access to property Length | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:114:19:114:30 | [finally: exception(NullReferenceException)] access to property Length | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:114:19:114:30 | [finally: exception(OutOfMemoryException)] access to property Length | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:114:19:114:30 | [finally: return] access to property Length | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:114:19:114:35 | [finally: exception(Exception)] ... == ... | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:114:19:114:35 | [finally: exception(NullReferenceException)] ... == ... | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:114:19:114:35 | [finally: exception(OutOfMemoryException)] ... == ... | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:114:19:114:35 | [finally: return] ... == ... | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:114:35:114:35 | [finally: exception(Exception)] 0 | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:114:35:114:35 | [finally: exception(NullReferenceException)] 0 | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:114:35:114:35 | [finally: exception(OutOfMemoryException)] 0 | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:114:35:114:35 | [finally: return] 0 | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:115:17:115:40 | [finally: exception(Exception)] call to method WriteLine | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:115:17:115:40 | [finally: exception(NullReferenceException)] call to method WriteLine | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:115:17:115:40 | [finally: exception(OutOfMemoryException)] call to method WriteLine | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:115:17:115:40 | [finally: return] call to method WriteLine | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:115:17:115:41 | [finally: exception(Exception)] ...; | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:115:17:115:41 | [finally: exception(NullReferenceException)] ...; | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:115:17:115:41 | [finally: exception(OutOfMemoryException)] ...; | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:115:17:115:41 | [finally: return] ...; | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:115:35:115:39 | [finally: exception(Exception)] access to field Field | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:115:35:115:39 | [finally: exception(Exception)] this access | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:115:35:115:39 | [finally: exception(NullReferenceException)] access to field Field | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:115:35:115:39 | [finally: exception(NullReferenceException)] this access | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:115:35:115:39 | [finally: exception(OutOfMemoryException)] access to field Field | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:115:35:115:39 | [finally: exception(OutOfMemoryException)] this access | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:115:35:115:39 | [finally: return] access to field Field | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:115:35:115:39 | [finally: return] this access | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:116:13:117:37 | [finally: exception(Exception)] if (...) ... | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:116:13:117:37 | [finally: exception(NullReferenceException)] if (...) ... | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:116:13:117:37 | [finally: exception(OutOfMemoryException)] if (...) ... | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:116:13:117:37 | [finally: return] if (...) ... | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:116:17:116:21 | [finally: exception(Exception)] access to field Field | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:116:17:116:21 | [finally: exception(Exception)] this access | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:116:17:116:21 | [finally: exception(NullReferenceException)] access to field Field | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:116:17:116:21 | [finally: exception(NullReferenceException)] this access | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:116:17:116:21 | [finally: exception(OutOfMemoryException)] access to field Field | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:116:17:116:21 | [finally: exception(OutOfMemoryException)] this access | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:116:17:116:21 | [finally: return] access to field Field | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:116:17:116:21 | [finally: return] this access | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:116:17:116:28 | [finally: exception(Exception)] access to property Length | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:116:17:116:28 | [finally: exception(NullReferenceException)] access to property Length | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:116:17:116:28 | [finally: exception(OutOfMemoryException)] access to property Length | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:116:17:116:28 | [finally: return] access to property Length | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:116:17:116:32 | [finally: exception(Exception)] ... > ... | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:116:17:116:32 | [finally: exception(NullReferenceException)] ... > ... | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:116:17:116:32 | [finally: exception(OutOfMemoryException)] ... > ... | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:116:17:116:32 | [finally: return] ... > ... | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:116:32:116:32 | [finally: exception(Exception)] 0 | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:116:32:116:32 | [finally: exception(NullReferenceException)] 0 | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:116:32:116:32 | [finally: exception(OutOfMemoryException)] 0 | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:116:32:116:32 | [finally: return] 0 | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:117:17:117:36 | [finally: exception(Exception)] call to method WriteLine | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:117:17:117:36 | [finally: exception(NullReferenceException)] call to method WriteLine | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:117:17:117:36 | [finally: exception(OutOfMemoryException)] call to method WriteLine | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:117:17:117:36 | [finally: return] call to method WriteLine | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:117:17:117:37 | [finally: exception(Exception)] ...; | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:117:17:117:37 | [finally: exception(NullReferenceException)] ...; | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:117:17:117:37 | [finally: exception(OutOfMemoryException)] ...; | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:117:17:117:37 | [finally: return] ...; | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:117:35:117:35 | [finally: exception(Exception)] 1 | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:117:35:117:35 | [finally: exception(NullReferenceException)] 1 | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:117:35:117:35 | [finally: exception(OutOfMemoryException)] 1 | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:117:35:117:35 | [finally: return] 1 | Finally.cs:105:9:118:9 | try {...} ... |
-| Finally.cs:140:9:143:9 | [finally: exception(Exception)] {...} | Finally.cs:135:9:143:9 | try {...} ... |
-| Finally.cs:141:13:141:44 | [finally: exception(Exception)] throw ...; | Finally.cs:135:9:143:9 | try {...} ... |
-| Finally.cs:141:19:141:43 | [finally: exception(Exception)] object creation of type ArgumentException | Finally.cs:135:9:143:9 | try {...} ... |
-| Finally.cs:141:41:141:42 | [finally: exception(Exception)] "" | Finally.cs:135:9:143:9 | try {...} ... |
-| Finally.cs:155:9:169:9 | [finally: exception(ArgumentNullException)] {...} | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:155:9:169:9 | [finally: exception(Exception)] {...} | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:156:13:168:13 | [finally: exception(ArgumentNullException)] try {...} ... | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:156:13:168:13 | [finally: exception(Exception)] try {...} ... | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:157:13:160:13 | [finally: exception(ArgumentNullException)] {...} | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:157:13:160:13 | [finally: exception(Exception)] {...} | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:158:17:159:45 | [finally: exception(ArgumentNullException)] if (...) ... | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:158:17:159:45 | [finally: exception(Exception)] if (...) ... | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:158:21:158:24 | [finally: exception(ArgumentNullException)] access to parameter args | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:158:21:158:24 | [finally: exception(Exception)] access to parameter args | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:158:21:158:31 | [finally: exception(ArgumentNullException)] access to property Length | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:158:21:158:31 | [finally: exception(Exception)] access to property Length | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:158:21:158:36 | [finally: exception(ArgumentNullException)] ... == ... | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:158:21:158:36 | [finally: exception(Exception)] ... == ... | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:158:36:158:36 | [finally: exception(ArgumentNullException)] 1 | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:158:36:158:36 | [finally: exception(Exception)] 1 | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:159:21:159:45 | [finally: exception(ArgumentNullException)] throw ...; | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:159:21:159:45 | [finally: exception(Exception)] throw ...; | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:159:27:159:44 | [finally: exception(ArgumentNullException)] object creation of type Exception | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:159:27:159:44 | [finally: exception(Exception)] object creation of type Exception | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:159:41:159:43 | [finally: exception(ArgumentNullException)] "1" | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:159:41:159:43 | [finally: exception(Exception)] "1" | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:161:13:164:13 | [finally: exception(ArgumentNullException), exception: Exception] catch (...) {...} | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:161:13:164:13 | [finally: exception(ArgumentNullException), exception: NullReferenceException] catch (...) {...} | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:161:13:164:13 | [finally: exception(Exception), exception: Exception] catch (...) {...} | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:161:13:164:13 | [finally: exception(Exception), exception: NullReferenceException] catch (...) {...} | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:161:30:161:30 | [finally: exception(ArgumentNullException), exception: Exception] Exception e | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:161:30:161:30 | [finally: exception(ArgumentNullException), exception: NullReferenceException] Exception e | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:161:30:161:30 | [finally: exception(Exception), exception: Exception] Exception e | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:161:30:161:30 | [finally: exception(Exception), exception: NullReferenceException] Exception e | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:161:39:161:39 | [finally: exception(ArgumentNullException), exception: Exception] access to local variable e | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:161:39:161:39 | [finally: exception(ArgumentNullException), exception: NullReferenceException] access to local variable e | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:161:39:161:39 | [finally: exception(Exception), exception: Exception] access to local variable e | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:161:39:161:39 | [finally: exception(Exception), exception: NullReferenceException] access to local variable e | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:161:39:161:47 | [finally: exception(ArgumentNullException), exception: Exception] access to property Message | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:161:39:161:47 | [finally: exception(ArgumentNullException), exception: NullReferenceException] access to property Message | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:161:39:161:47 | [finally: exception(Exception), exception: Exception] access to property Message | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:161:39:161:47 | [finally: exception(Exception), exception: NullReferenceException] access to property Message | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:161:39:161:54 | [finally: exception(ArgumentNullException), exception: Exception] ... == ... | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:161:39:161:54 | [finally: exception(ArgumentNullException), exception: NullReferenceException] ... == ... | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:161:39:161:54 | [finally: exception(Exception), exception: Exception] ... == ... | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:161:39:161:54 | [finally: exception(Exception), exception: NullReferenceException] ... == ... | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:161:52:161:54 | [finally: exception(ArgumentNullException), exception: Exception] "1" | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:161:52:161:54 | [finally: exception(ArgumentNullException), exception: NullReferenceException] "1" | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:161:52:161:54 | [finally: exception(Exception), exception: Exception] "1" | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:161:52:161:54 | [finally: exception(Exception), exception: NullReferenceException] "1" | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:162:13:164:13 | [finally: exception(ArgumentNullException)] {...} | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:162:13:164:13 | [finally: exception(Exception)] {...} | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:163:17:163:42 | [finally: exception(ArgumentNullException)] call to method WriteLine | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:163:17:163:42 | [finally: exception(Exception)] call to method WriteLine | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:163:17:163:43 | [finally: exception(ArgumentNullException)] ...; | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:163:17:163:43 | [finally: exception(Exception)] ...; | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:163:35:163:38 | [finally: exception(ArgumentNullException)] access to parameter args | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:163:35:163:38 | [finally: exception(Exception)] access to parameter args | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:163:35:163:41 | [finally: exception(ArgumentNullException)] access to array element | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:163:35:163:41 | [finally: exception(Exception)] access to array element | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:163:40:163:40 | [finally: exception(ArgumentNullException)] 0 | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:163:40:163:40 | [finally: exception(Exception)] 0 | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:165:13:168:13 | [finally: exception(ArgumentNullException)] catch {...} | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:165:13:168:13 | [finally: exception(Exception)] catch {...} | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:166:13:168:13 | [finally: exception(ArgumentNullException)] {...} | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:166:13:168:13 | [finally: exception(Exception)] {...} | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:167:17:167:37 | [finally: exception(ArgumentNullException)] call to method WriteLine | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:167:17:167:37 | [finally: exception(Exception)] call to method WriteLine | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:167:17:167:38 | [finally: exception(ArgumentNullException)] ...; | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:167:17:167:38 | [finally: exception(Exception)] ...; | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:167:35:167:36 | [finally: exception(ArgumentNullException)] "" | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:167:35:167:36 | [finally: exception(Exception)] "" | Finally.cs:149:9:169:9 | try {...} ... |
-| Finally.cs:183:9:192:9 | [finally: exception(Exception), b1 (line 176): true] {...} | Finally.cs:178:9:192:9 | try {...} ... |
-| Finally.cs:183:9:192:9 | [finally: exception(ExceptionA), b1 (line 176): true] {...} | Finally.cs:178:9:192:9 | try {...} ... |
-| Finally.cs:184:13:191:13 | [finally: exception(Exception), b1 (line 176): true] try {...} ... | Finally.cs:178:9:192:9 | try {...} ... |
-| Finally.cs:184:13:191:13 | [finally: exception(ExceptionA), b1 (line 176): true] try {...} ... | Finally.cs:178:9:192:9 | try {...} ... |
-| Finally.cs:185:13:187:13 | [finally: exception(Exception), b1 (line 176): true] {...} | Finally.cs:178:9:192:9 | try {...} ... |
-| Finally.cs:185:13:187:13 | [finally: exception(ExceptionA), b1 (line 176): true] {...} | Finally.cs:178:9:192:9 | try {...} ... |
-| Finally.cs:186:17:186:47 | [finally: exception(Exception), b1 (line 176): true] if (...) ... | Finally.cs:178:9:192:9 | try {...} ... |
-| Finally.cs:186:17:186:47 | [finally: exception(ExceptionA), b1 (line 176): true] if (...) ... | Finally.cs:178:9:192:9 | try {...} ... |
-| Finally.cs:186:21:186:22 | [finally: exception(Exception), b1 (line 176): true] access to parameter b2 | Finally.cs:178:9:192:9 | try {...} ... |
-| Finally.cs:186:21:186:22 | [finally: exception(ExceptionA), b1 (line 176): true] access to parameter b2 | Finally.cs:178:9:192:9 | try {...} ... |
-| Finally.cs:186:25:186:47 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] throw ...; | Finally.cs:178:9:192:9 | try {...} ... |
-| Finally.cs:186:25:186:47 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] throw ...; | Finally.cs:178:9:192:9 | try {...} ... |
-| Finally.cs:186:31:186:46 | [finally: exception(Exception), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB | Finally.cs:178:9:192:9 | try {...} ... |
-| Finally.cs:186:31:186:46 | [finally: exception(ExceptionA), b1 (line 176): true, b2 (line 176): true] object creation of type ExceptionB | Finally.cs:178:9:192:9 | try {...} ... |
-| Finally.cs:188:13:191:13 | [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | Finally.cs:178:9:192:9 | try {...} ... |
-| Finally.cs:188:13:191:13 | [finally: exception(Exception), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | Finally.cs:178:9:192:9 | try {...} ... |
-| Finally.cs:188:13:191:13 | [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | Finally.cs:178:9:192:9 | try {...} ... |
-| Finally.cs:188:13:191:13 | [finally: exception(ExceptionA), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] catch (...) {...} | Finally.cs:178:9:192:9 | try {...} ... |
-| Finally.cs:188:38:188:39 | [finally: exception(Exception), exception: Exception, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | Finally.cs:178:9:192:9 | try {...} ... |
-| Finally.cs:188:38:188:39 | [finally: exception(Exception), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | Finally.cs:178:9:192:9 | try {...} ... |
-| Finally.cs:188:38:188:39 | [finally: exception(ExceptionA), exception: Exception, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | Finally.cs:178:9:192:9 | try {...} ... |
-| Finally.cs:188:38:188:39 | [finally: exception(ExceptionA), exception: ExceptionB, b1 (line 176): true, b2 (line 176): true] access to parameter b2 | Finally.cs:178:9:192:9 | try {...} ... |
-| Finally.cs:189:13:191:13 | [finally: exception(Exception), b1 (line 176): true] {...} | Finally.cs:178:9:192:9 | try {...} ... |
-| Finally.cs:189:13:191:13 | [finally: exception(ExceptionA), b1 (line 176): true] {...} | Finally.cs:178:9:192:9 | try {...} ... |
-| Finally.cs:190:17:190:47 | [finally: exception(Exception), b1 (line 176): true] if (...) ... | Finally.cs:178:9:192:9 | try {...} ... |
-| Finally.cs:190:17:190:47 | [finally: exception(ExceptionA), b1 (line 176): true] if (...) ... | Finally.cs:178:9:192:9 | try {...} ... |
-| Finally.cs:190:21:190:22 | [finally: exception(Exception), b1 (line 176): true] access to parameter b1 | Finally.cs:178:9:192:9 | try {...} ... |
-| Finally.cs:190:21:190:22 | [finally: exception(ExceptionA), b1 (line 176): true] access to parameter b1 | Finally.cs:178:9:192:9 | try {...} ... |
-| Finally.cs:190:25:190:47 | [finally: exception(Exception)] throw ...; | Finally.cs:178:9:192:9 | try {...} ... |
-| Finally.cs:190:25:190:47 | [finally: exception(ExceptionA)] throw ...; | Finally.cs:178:9:192:9 | try {...} ... |
-| Finally.cs:190:31:190:46 | [finally: exception(Exception)] object creation of type ExceptionC | Finally.cs:178:9:192:9 | try {...} ... |
-| Finally.cs:190:31:190:46 | [finally: exception(ExceptionA)] object creation of type ExceptionC | Finally.cs:178:9:192:9 | try {...} ... |
-| Finally.cs:202:9:212:9 | [finally: exception(Exception)] {...} | Finally.cs:197:9:212:9 | try {...} ... |
-| Finally.cs:202:9:212:9 | [finally: exception(ExceptionA)] {...} | Finally.cs:197:9:212:9 | try {...} ... |
-| Finally.cs:203:13:210:13 | [finally: exception(Exception)] try {...} ... | Finally.cs:197:9:212:9 | try {...} ... |
-| Finally.cs:203:13:210:13 | [finally: exception(ExceptionA)] try {...} ... | Finally.cs:197:9:212:9 | try {...} ... |
-| Finally.cs:204:13:206:13 | [finally: exception(Exception)] {...} | Finally.cs:197:9:212:9 | try {...} ... |
-| Finally.cs:204:13:206:13 | [finally: exception(ExceptionA)] {...} | Finally.cs:197:9:212:9 | try {...} ... |
-| Finally.cs:205:17:205:47 | [finally: exception(Exception)] if (...) ... | Finally.cs:197:9:212:9 | try {...} ... |
-| Finally.cs:205:17:205:47 | [finally: exception(ExceptionA)] if (...) ... | Finally.cs:197:9:212:9 | try {...} ... |
-| Finally.cs:205:21:205:22 | [finally: exception(Exception)] access to parameter b2 | Finally.cs:197:9:212:9 | try {...} ... |
-| Finally.cs:205:21:205:22 | [finally: exception(ExceptionA)] access to parameter b2 | Finally.cs:197:9:212:9 | try {...} ... |
-| Finally.cs:205:25:205:47 | [finally: exception(Exception)] throw ...; | Finally.cs:197:9:212:9 | try {...} ... |
-| Finally.cs:205:25:205:47 | [finally: exception(ExceptionA)] throw ...; | Finally.cs:197:9:212:9 | try {...} ... |
-| Finally.cs:205:31:205:46 | [finally: exception(Exception)] object creation of type ExceptionB | Finally.cs:197:9:212:9 | try {...} ... |
-| Finally.cs:205:31:205:46 | [finally: exception(ExceptionA)] object creation of type ExceptionB | Finally.cs:197:9:212:9 | try {...} ... |
-| Finally.cs:208:13:210:13 | [finally(1): exception(Exception)] {...} | Finally.cs:203:13:210:13 | try {...} ... |
-| Finally.cs:208:13:210:13 | [finally(1): exception(ExceptionB)] {...} | Finally.cs:203:13:210:13 | try {...} ... |
-| Finally.cs:208:13:210:13 | [finally: exception(Exception), finally(1): exception(Exception)] {...} | Finally.cs:203:13:210:13 | try {...} ... |
-| Finally.cs:208:13:210:13 | [finally: exception(Exception), finally(1): exception(ExceptionB)] {...} | Finally.cs:203:13:210:13 | try {...} ... |
-| Finally.cs:208:13:210:13 | [finally: exception(Exception)] {...} | Finally.cs:203:13:210:13 | try {...} ... |
-| Finally.cs:208:13:210:13 | [finally: exception(ExceptionA), finally(1): exception(Exception)] {...} | Finally.cs:203:13:210:13 | try {...} ... |
-| Finally.cs:208:13:210:13 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] {...} | Finally.cs:203:13:210:13 | try {...} ... |
-| Finally.cs:208:13:210:13 | [finally: exception(ExceptionA)] {...} | Finally.cs:203:13:210:13 | try {...} ... |
-| Finally.cs:209:17:209:47 | [finally(1): exception(Exception)] if (...) ... | Finally.cs:203:13:210:13 | try {...} ... |
-| Finally.cs:209:17:209:47 | [finally(1): exception(ExceptionB)] if (...) ... | Finally.cs:203:13:210:13 | try {...} ... |
-| Finally.cs:209:17:209:47 | [finally: exception(Exception), finally(1): exception(Exception)] if (...) ... | Finally.cs:203:13:210:13 | try {...} ... |
-| Finally.cs:209:17:209:47 | [finally: exception(Exception), finally(1): exception(ExceptionB)] if (...) ... | Finally.cs:203:13:210:13 | try {...} ... |
-| Finally.cs:209:17:209:47 | [finally: exception(Exception)] if (...) ... | Finally.cs:203:13:210:13 | try {...} ... |
-| Finally.cs:209:17:209:47 | [finally: exception(ExceptionA), finally(1): exception(Exception)] if (...) ... | Finally.cs:203:13:210:13 | try {...} ... |
-| Finally.cs:209:17:209:47 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] if (...) ... | Finally.cs:203:13:210:13 | try {...} ... |
-| Finally.cs:209:17:209:47 | [finally: exception(ExceptionA)] if (...) ... | Finally.cs:203:13:210:13 | try {...} ... |
-| Finally.cs:209:21:209:22 | [finally(1): exception(Exception)] access to parameter b3 | Finally.cs:203:13:210:13 | try {...} ... |
-| Finally.cs:209:21:209:22 | [finally(1): exception(ExceptionB)] access to parameter b3 | Finally.cs:203:13:210:13 | try {...} ... |
-| Finally.cs:209:21:209:22 | [finally: exception(Exception), finally(1): exception(Exception)] access to parameter b3 | Finally.cs:203:13:210:13 | try {...} ... |
-| Finally.cs:209:21:209:22 | [finally: exception(Exception), finally(1): exception(ExceptionB)] access to parameter b3 | Finally.cs:203:13:210:13 | try {...} ... |
-| Finally.cs:209:21:209:22 | [finally: exception(Exception)] access to parameter b3 | Finally.cs:203:13:210:13 | try {...} ... |
-| Finally.cs:209:21:209:22 | [finally: exception(ExceptionA), finally(1): exception(Exception)] access to parameter b3 | Finally.cs:203:13:210:13 | try {...} ... |
-| Finally.cs:209:21:209:22 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] access to parameter b3 | Finally.cs:203:13:210:13 | try {...} ... |
-| Finally.cs:209:21:209:22 | [finally: exception(ExceptionA)] access to parameter b3 | Finally.cs:203:13:210:13 | try {...} ... |
-| Finally.cs:209:25:209:47 | [finally(1): exception(Exception)] throw ...; | Finally.cs:203:13:210:13 | try {...} ... |
-| Finally.cs:209:25:209:47 | [finally(1): exception(ExceptionB)] throw ...; | Finally.cs:203:13:210:13 | try {...} ... |
-| Finally.cs:209:25:209:47 | [finally: exception(Exception), finally(1): exception(Exception)] throw ...; | Finally.cs:203:13:210:13 | try {...} ... |
-| Finally.cs:209:25:209:47 | [finally: exception(Exception), finally(1): exception(ExceptionB)] throw ...; | Finally.cs:203:13:210:13 | try {...} ... |
-| Finally.cs:209:25:209:47 | [finally: exception(Exception)] throw ...; | Finally.cs:203:13:210:13 | try {...} ... |
-| Finally.cs:209:25:209:47 | [finally: exception(ExceptionA), finally(1): exception(Exception)] throw ...; | Finally.cs:203:13:210:13 | try {...} ... |
-| Finally.cs:209:25:209:47 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] throw ...; | Finally.cs:203:13:210:13 | try {...} ... |
-| Finally.cs:209:25:209:47 | [finally: exception(ExceptionA)] throw ...; | Finally.cs:203:13:210:13 | try {...} ... |
-| Finally.cs:209:31:209:46 | [finally(1): exception(Exception)] object creation of type ExceptionC | Finally.cs:203:13:210:13 | try {...} ... |
-| Finally.cs:209:31:209:46 | [finally(1): exception(ExceptionB)] object creation of type ExceptionC | Finally.cs:203:13:210:13 | try {...} ... |
-| Finally.cs:209:31:209:46 | [finally: exception(Exception), finally(1): exception(Exception)] object creation of type ExceptionC | Finally.cs:203:13:210:13 | try {...} ... |
-| Finally.cs:209:31:209:46 | [finally: exception(Exception), finally(1): exception(ExceptionB)] object creation of type ExceptionC | Finally.cs:203:13:210:13 | try {...} ... |
-| Finally.cs:209:31:209:46 | [finally: exception(Exception)] object creation of type ExceptionC | Finally.cs:203:13:210:13 | try {...} ... |
-| Finally.cs:209:31:209:46 | [finally: exception(ExceptionA), finally(1): exception(Exception)] object creation of type ExceptionC | Finally.cs:203:13:210:13 | try {...} ... |
-| Finally.cs:209:31:209:46 | [finally: exception(ExceptionA), finally(1): exception(ExceptionB)] object creation of type ExceptionC | Finally.cs:203:13:210:13 | try {...} ... |
-| Finally.cs:209:31:209:46 | [finally: exception(ExceptionA)] object creation of type ExceptionC | Finally.cs:203:13:210:13 | try {...} ... |
-| Finally.cs:211:13:211:16 | [finally: exception(Exception)] this access | Finally.cs:197:9:212:9 | try {...} ... |
-| Finally.cs:211:13:211:16 | [finally: exception(ExceptionA)] this access | Finally.cs:197:9:212:9 | try {...} ... |
-| Finally.cs:211:13:211:28 | [finally: exception(Exception)] ... = ... | Finally.cs:197:9:212:9 | try {...} ... |
-| Finally.cs:211:13:211:28 | [finally: exception(ExceptionA)] ... = ... | Finally.cs:197:9:212:9 | try {...} ... |
-| Finally.cs:211:13:211:29 | [finally: exception(Exception)] ...; | Finally.cs:197:9:212:9 | try {...} ... |
-| Finally.cs:211:13:211:29 | [finally: exception(ExceptionA)] ...; | Finally.cs:197:9:212:9 | try {...} ... |
-| Finally.cs:211:26:211:28 | [finally: exception(Exception)] "0" | Finally.cs:197:9:212:9 | try {...} ... |
-| Finally.cs:211:26:211:28 | [finally: exception(ExceptionA)] "0" | Finally.cs:197:9:212:9 | try {...} ... |
-| Finally.cs:243:13:253:13 | [finally: exception(Exception)] {...} | Finally.cs:237:13:253:13 | try {...} ... |
-| Finally.cs:243:13:253:13 | [finally: exception(ExceptionA)] {...} | Finally.cs:237:13:253:13 | try {...} ... |
-| Finally.cs:244:17:252:17 | [finally: exception(Exception)] try {...} ... | Finally.cs:237:13:253:13 | try {...} ... |
-| Finally.cs:244:17:252:17 | [finally: exception(ExceptionA)] try {...} ... | Finally.cs:237:13:253:13 | try {...} ... |
-| Finally.cs:245:17:248:17 | [finally: exception(Exception)] {...} | Finally.cs:237:13:253:13 | try {...} ... |
-| Finally.cs:245:17:248:17 | [finally: exception(ExceptionA)] {...} | Finally.cs:237:13:253:13 | try {...} ... |
-| Finally.cs:246:21:247:47 | [finally: exception(Exception)] if (...) ... | Finally.cs:237:13:253:13 | try {...} ... |
-| Finally.cs:246:21:247:47 | [finally: exception(ExceptionA)] if (...) ... | Finally.cs:237:13:253:13 | try {...} ... |
-| Finally.cs:246:25:246:26 | [finally: exception(Exception)] access to parameter b2 | Finally.cs:237:13:253:13 | try {...} ... |
-| Finally.cs:246:25:246:26 | [finally: exception(ExceptionA)] access to parameter b2 | Finally.cs:237:13:253:13 | try {...} ... |
-| Finally.cs:247:25:247:47 | [finally: exception(Exception)] throw ...; | Finally.cs:237:13:253:13 | try {...} ... |
-| Finally.cs:247:25:247:47 | [finally: exception(ExceptionA)] throw ...; | Finally.cs:237:13:253:13 | try {...} ... |
-| Finally.cs:247:31:247:46 | [finally: exception(Exception)] object creation of type ExceptionA | Finally.cs:237:13:253:13 | try {...} ... |
-| Finally.cs:247:31:247:46 | [finally: exception(ExceptionA)] object creation of type ExceptionA | Finally.cs:237:13:253:13 | try {...} ... |
-| Finally.cs:250:17:252:17 | [finally(1): exception(Exception)] {...} | Finally.cs:244:17:252:17 | try {...} ... |
-| Finally.cs:250:17:252:17 | [finally(1): exception(ExceptionA)] {...} | Finally.cs:244:17:252:17 | try {...} ... |
-| Finally.cs:250:17:252:17 | [finally: exception(Exception), finally(1): exception(Exception)] {...} | Finally.cs:244:17:252:17 | try {...} ... |
-| Finally.cs:250:17:252:17 | [finally: exception(Exception), finally(1): exception(ExceptionA)] {...} | Finally.cs:244:17:252:17 | try {...} ... |
-| Finally.cs:250:17:252:17 | [finally: exception(Exception)] {...} | Finally.cs:244:17:252:17 | try {...} ... |
-| Finally.cs:250:17:252:17 | [finally: exception(ExceptionA), finally(1): exception(Exception)] {...} | Finally.cs:244:17:252:17 | try {...} ... |
-| Finally.cs:250:17:252:17 | [finally: exception(ExceptionA), finally(1): exception(ExceptionA)] {...} | Finally.cs:244:17:252:17 | try {...} ... |
-| Finally.cs:250:17:252:17 | [finally: exception(ExceptionA)] {...} | Finally.cs:244:17:252:17 | try {...} ... |
-| Finally.cs:251:21:251:54 | [finally(1): exception(Exception)] call to method WriteLine | Finally.cs:244:17:252:17 | try {...} ... |
-| Finally.cs:251:21:251:54 | [finally(1): exception(ExceptionA)] call to method WriteLine | Finally.cs:244:17:252:17 | try {...} ... |
-| Finally.cs:251:21:251:54 | [finally: exception(Exception), finally(1): exception(Exception)] call to method WriteLine | Finally.cs:244:17:252:17 | try {...} ... |
-| Finally.cs:251:21:251:54 | [finally: exception(Exception), finally(1): exception(ExceptionA)] call to method WriteLine | Finally.cs:244:17:252:17 | try {...} ... |
-| Finally.cs:251:21:251:54 | [finally: exception(Exception)] call to method WriteLine | Finally.cs:244:17:252:17 | try {...} ... |
-| Finally.cs:251:21:251:54 | [finally: exception(ExceptionA), finally(1): exception(Exception)] call to method WriteLine | Finally.cs:244:17:252:17 | try {...} ... |
-| Finally.cs:251:21:251:54 | [finally: exception(ExceptionA), finally(1): exception(ExceptionA)] call to method WriteLine | Finally.cs:244:17:252:17 | try {...} ... |
-| Finally.cs:251:21:251:54 | [finally: exception(ExceptionA)] call to method WriteLine | Finally.cs:244:17:252:17 | try {...} ... |
-| Finally.cs:251:21:251:55 | [finally(1): exception(Exception)] ...; | Finally.cs:244:17:252:17 | try {...} ... |
-| Finally.cs:251:21:251:55 | [finally(1): exception(ExceptionA)] ...; | Finally.cs:244:17:252:17 | try {...} ... |
-| Finally.cs:251:21:251:55 | [finally: exception(Exception), finally(1): exception(Exception)] ...; | Finally.cs:244:17:252:17 | try {...} ... |
-| Finally.cs:251:21:251:55 | [finally: exception(Exception), finally(1): exception(ExceptionA)] ...; | Finally.cs:244:17:252:17 | try {...} ... |
-| Finally.cs:251:21:251:55 | [finally: exception(Exception)] ...; | Finally.cs:244:17:252:17 | try {...} ... |
-| Finally.cs:251:21:251:55 | [finally: exception(ExceptionA), finally(1): exception(Exception)] ...; | Finally.cs:244:17:252:17 | try {...} ... |
-| Finally.cs:251:21:251:55 | [finally: exception(ExceptionA), finally(1): exception(ExceptionA)] ...; | Finally.cs:244:17:252:17 | try {...} ... |
-| Finally.cs:251:21:251:55 | [finally: exception(ExceptionA)] ...; | Finally.cs:244:17:252:17 | try {...} ... |
-| Finally.cs:251:39:251:53 | [finally(1): exception(Exception)] "Inner finally" | Finally.cs:244:17:252:17 | try {...} ... |
-| Finally.cs:251:39:251:53 | [finally(1): exception(ExceptionA)] "Inner finally" | Finally.cs:244:17:252:17 | try {...} ... |
-| Finally.cs:251:39:251:53 | [finally: exception(Exception), finally(1): exception(Exception)] "Inner finally" | Finally.cs:244:17:252:17 | try {...} ... |
-| Finally.cs:251:39:251:53 | [finally: exception(Exception), finally(1): exception(ExceptionA)] "Inner finally" | Finally.cs:244:17:252:17 | try {...} ... |
-| Finally.cs:251:39:251:53 | [finally: exception(Exception)] "Inner finally" | Finally.cs:244:17:252:17 | try {...} ... |
-| Finally.cs:251:39:251:53 | [finally: exception(ExceptionA), finally(1): exception(Exception)] "Inner finally" | Finally.cs:244:17:252:17 | try {...} ... |
-| Finally.cs:251:39:251:53 | [finally: exception(ExceptionA), finally(1): exception(ExceptionA)] "Inner finally" | Finally.cs:244:17:252:17 | try {...} ... |
-| Finally.cs:251:39:251:53 | [finally: exception(ExceptionA)] "Inner finally" | Finally.cs:244:17:252:17 | try {...} ... |
-| Finally.cs:257:9:259:9 | [finally: exception(Exception)] {...} | Finally.cs:235:9:259:9 | try {...} ... |
-| Finally.cs:257:9:259:9 | [finally: exception(ExceptionA)] {...} | Finally.cs:235:9:259:9 | try {...} ... |
-| Finally.cs:258:13:258:46 | [finally: exception(Exception)] call to method WriteLine | Finally.cs:235:9:259:9 | try {...} ... |
-| Finally.cs:258:13:258:46 | [finally: exception(ExceptionA)] call to method WriteLine | Finally.cs:235:9:259:9 | try {...} ... |
-| Finally.cs:258:13:258:47 | [finally: exception(Exception)] ...; | Finally.cs:235:9:259:9 | try {...} ... |
-| Finally.cs:258:13:258:47 | [finally: exception(ExceptionA)] ...; | Finally.cs:235:9:259:9 | try {...} ... |
-| Finally.cs:258:31:258:45 | [finally: exception(Exception)] "Outer finally" | Finally.cs:235:9:259:9 | try {...} ... |
-| Finally.cs:258:31:258:45 | [finally: exception(ExceptionA)] "Outer finally" | Finally.cs:235:9:259:9 | try {...} ... |
-| Finally.cs:270:9:273:9 | [finally: exception(Exception)] {...} | Finally.cs:265:9:273:9 | try {...} ... |
-| Finally.cs:271:13:271:34 | [finally: exception(Exception)] call to method WriteLine | Finally.cs:265:9:273:9 | try {...} ... |
-| Finally.cs:271:13:271:35 | [finally: exception(Exception)] ...; | Finally.cs:265:9:273:9 | try {...} ... |
-| Finally.cs:271:31:271:33 | [finally: exception(Exception)] "3" | Finally.cs:265:9:273:9 | try {...} ... |
-| Finally.cs:272:13:272:13 | [finally: exception(Exception)] access to parameter i | Finally.cs:265:9:273:9 | try {...} ... |
-| Finally.cs:272:13:272:18 | [finally: exception(Exception)] ... + ... | Finally.cs:265:9:273:9 | try {...} ... |
-| Finally.cs:272:13:272:18 | [finally: exception(Exception)] ... = ... | Finally.cs:265:9:273:9 | try {...} ... |
-| Finally.cs:272:13:272:19 | [finally: exception(Exception)] ...; | Finally.cs:265:9:273:9 | try {...} ... |
-| Finally.cs:272:18:272:18 | [finally: exception(Exception)] 3 | Finally.cs:265:9:273:9 | try {...} ... |
-| cflow.cs:274:9:276:9 | [finally: return] {...} | cflow.cs:268:9:276:9 | try {...} ... |
-| cflow.cs:275:13:275:41 | [finally: return] call to method WriteLine | cflow.cs:268:9:276:9 | try {...} ... |
-| cflow.cs:275:13:275:42 | [finally: return] ...; | cflow.cs:268:9:276:9 | try {...} ... |
-| cflow.cs:275:31:275:40 | [finally: return] "not dead" | cflow.cs:268:9:276:9 | try {...} ... |
-entryPoint
 | AccessorCalls.cs:1:7:1:19 | AccessorCalls | AccessorCalls.cs:1:7:1:19 | call to constructor Object |
 | AccessorCalls.cs:5:23:5:25 | get_Item | AccessorCalls.cs:5:30:5:30 | access to parameter i |
 | AccessorCalls.cs:5:33:5:35 | set_Item | AccessorCalls.cs:5:37:5:39 | {...} |
diff --git a/csharp/ql/test/library-tests/controlflow/graph/Nodes.ql b/csharp/ql/test/library-tests/controlflow/graph/Nodes.ql
index fb937bfbd9f..1140f78de66 100644
--- a/csharp/ql/test/library-tests/controlflow/graph/Nodes.ql
+++ b/csharp/ql/test/library-tests/controlflow/graph/Nodes.ql
@@ -5,22 +5,6 @@ import semmle.code.csharp.controlflow.internal.ControlFlowGraphImpl as Impl
 import semmle.code.csharp.controlflow.internal.Splitting as Splitting
 import Nodes
 
-query predicate booleanNode(ElementNode e, BooleanSplit split) { split = e.getASplit() }
-
-class MyFinallySplitControlFlowNode extends ElementNode {
-  MyFinallySplitControlFlowNode() {
-    exists(Splitting::FinallySplitting::FinallySplitType type |
-      type = this.getASplit().(FinallySplit).getType()
-    |
-      not type instanceof SuccessorTypes::NormalSuccessor
-    )
-  }
-
-  Impl::Statements::TryStmtTree getTryStmt() { this.getAstNode() = result.getAFinallyDescendant() }
-}
-
-query predicate finallyNode(MyFinallySplitControlFlowNode f, TryStmt try) { try = f.getTryStmt() }
-
 query predicate entryPoint(Callable c, SourceControlFlowElement cfn) {
   c.getEntryPoint().getASuccessor().getAstNode() = cfn
 }
diff --git a/csharp/ql/test/library-tests/controlflow/guards/AbstractValue.expected b/csharp/ql/test/library-tests/controlflow/guards/AbstractValue.expected
index fc84d28f449..a930349e930 100644
--- a/csharp/ql/test/library-tests/controlflow/guards/AbstractValue.expected
+++ b/csharp/ql/test/library-tests/controlflow/guards/AbstractValue.expected
@@ -1,4 +1,22 @@
-abstractValue
+|  | Assert.cs:9:31:9:32 | "" |
+|  | Assert.cs:16:31:16:32 | "" |
+|  | Assert.cs:23:31:23:32 | "" |
+|  | Assert.cs:30:31:30:32 | "" |
+|  | Assert.cs:37:31:37:32 | "" |
+|  | Assert.cs:44:31:44:32 | "" |
+|  | Assert.cs:51:31:51:32 | "" |
+|  | Assert.cs:58:31:58:32 | "" |
+|  | Assert.cs:65:31:65:32 | "" |
+|  | Assert.cs:72:31:72:32 | "" |
+|  | Assert.cs:79:31:79:32 | "" |
+|  | Collections.cs:73:40:73:41 | "" |
+|  | Guards.cs:96:18:96:19 | "" |
+|  | Guards.cs:97:31:97:31 | access to parameter s |
+|  | Guards.cs:157:18:157:19 | "" |
+|  | Guards.cs:158:24:158:24 | access to parameter o |
+|  | Guards.cs:282:13:282:14 | "" |
+|  | Guards.cs:283:17:283:17 | access to parameter o |
+|  | Guards.cs:341:31:341:32 | "" |
 | 0 | Collections.cs:11:32:11:32 | 0 |
 | 0 | Collections.cs:13:28:13:28 | 0 |
 | 0 | Collections.cs:15:27:15:27 | 0 |
@@ -21,9 +39,13 @@ abstractValue
 | 0 | Collections.cs:86:17:86:32 | 0 |
 | 0 | Guards.cs:12:24:12:24 | 0 |
 | 0 | Guards.cs:78:26:78:26 | 0 |
+| 0 | Guards.cs:78:26:78:26 | (...) ... |
 | 0 | Guards.cs:80:25:80:25 | 0 |
+| 0 | Guards.cs:80:25:80:25 | (...) ... |
 | 0 | Guards.cs:82:26:82:26 | 0 |
+| 0 | Guards.cs:82:26:82:26 | (...) ... |
 | 0 | Guards.cs:92:30:92:30 | 0 |
+| 0 | Guards.cs:92:30:92:30 | (...) ... |
 | 0 | Guards.cs:241:17:241:17 | 0 |
 | 0 | Guards.cs:255:17:255:19 | access to constant A |
 | 0 | Guards.cs:298:21:298:21 | 0 |
@@ -32,7 +54,6 @@ abstractValue
 | 0 | Guards.cs:322:18:322:18 | 0 |
 | 0 | Guards.cs:329:17:329:19 | access to constant A |
 | 0 | Guards.cs:334:20:334:20 | 0 |
-| 0 | Splitting.cs:137:20:137:20 | 0 |
 | 1 | Collections.cs:12:28:12:28 | 1 |
 | 1 | Collections.cs:14:28:14:28 | 1 |
 | 1 | Collections.cs:17:28:17:28 | 1 |
@@ -47,366 +68,827 @@ abstractValue
 | 1 | Collections.cs:81:36:81:36 | 1 |
 | 1 | Collections.cs:88:13:88:32 | 1 |
 | 1 | Guards.cs:92:25:92:25 | 1 |
+| 1 | Guards.cs:92:25:92:25 | (...) ... |
+| 1 | Guards.cs:243:13:243:17 | ... = ... |
 | 1 | Guards.cs:243:17:243:17 | 1 |
 | 1 | Guards.cs:246:18:246:18 | 1 |
+| 1 | Guards.cs:257:13:257:19 | ... = ... |
 | 1 | Guards.cs:257:17:257:19 | access to constant B |
 | 1 | Guards.cs:260:18:260:20 | access to constant B |
 | 1 | Guards.cs:299:18:299:18 | 1 |
 | 1 | Guards.cs:311:18:311:18 | 1 |
+| 1 | Guards.cs:319:13:319:17 | ... = ... |
 | 1 | Guards.cs:319:17:319:17 | 1 |
 | 1 | Guards.cs:322:13:322:13 | 1 |
 | 1 | Guards.cs:323:18:323:18 | 1 |
+| 1 | Guards.cs:331:13:331:19 | ... = ... |
 | 1 | Guards.cs:331:17:331:19 | access to constant B |
 | 1 | Guards.cs:334:13:334:15 | access to constant B |
 | 1 | Guards.cs:335:18:335:18 | 1 |
 | 3 | Collections.cs:54:13:54:42 | 3 |
 | 3 | Collections.cs:62:17:62:46 | 3 |
 | 10 | Guards.cs:84:25:84:26 | 10 |
+| 10 | Guards.cs:84:25:84:26 | (...) ... |
 | 10 | Guards.cs:86:26:86:27 | 10 |
-| empty | Collections.cs:53:13:53:16 | access to parameter args |
-| empty | Collections.cs:56:9:56:25 | ... = ... |
-| empty | Collections.cs:56:13:56:25 | array creation of type String[] |
-| empty | Collections.cs:57:9:57:13 | ... = ... |
-| empty | Collections.cs:57:13:57:13 | access to local variable x |
-| empty | Collections.cs:64:13:64:13 | access to local variable x |
-| empty | Collections.cs:86:17:86:32 | array creation of type String[] |
-| empty | Collections.cs:86:30:86:32 | { ..., ... } |
-| empty | Collections.cs:87:22:87:24 | { ..., ... } |
+| 10 | Guards.cs:86:26:86:27 | (...) ... |
+| <empty string> | Guards.cs:18:31:18:46 | "<empty string>" |
+| a | Collections.cs:54:28:54:30 | "a" |
+| a | Collections.cs:62:32:62:34 | "a" |
+| a | Collections.cs:66:19:66:21 | "a" |
+| a | Collections.cs:88:28:88:30 | "a" |
+| a | Collections.cs:89:24:89:26 | "a" |
+| b | Collections.cs:54:33:54:35 | "b" |
+| b | Collections.cs:62:37:62:39 | "b" |
+| b | Collections.cs:67:19:67:21 | "b" |
+| c | Collections.cs:54:38:54:40 | "c" |
+| c | Collections.cs:62:42:62:44 | "c" |
 | false | Assert.cs:85:61:85:65 | false |
+| false | Assert.cs:94:23:94:24 | access to parameter b2 |
 | false | Guards.cs:178:16:178:20 | false |
 | false | Guards.cs:181:53:181:57 | false |
+| false | Guards.cs:217:13:217:22 | ... = ... |
 | false | Guards.cs:217:18:217:22 | false |
 | false | Guards.cs:228:18:228:22 | false |
+| false | Guards.cs:295:13:295:22 | ... = ... |
 | false | Guards.cs:295:18:295:22 | false |
 | false | Guards.cs:305:18:305:22 | false |
-| non-empty | Collections.cs:54:9:54:42 | ... = ... |
-| non-empty | Collections.cs:54:13:54:42 | array creation of type String[] |
-| non-empty | Collections.cs:54:26:54:42 | { ..., ... } |
-| non-empty | Collections.cs:55:9:55:13 | ... = ... |
-| non-empty | Collections.cs:55:13:55:13 | access to local variable x |
-| non-empty | Collections.cs:62:17:62:46 | array creation of type String[] |
-| non-empty | Collections.cs:62:30:62:46 | { ..., ... } |
-| non-empty | Collections.cs:67:13:67:13 | access to local variable x |
-| non-empty | Collections.cs:88:9:88:32 | ... = ... |
-| non-empty | Collections.cs:88:13:88:32 | array creation of type String[] |
-| non-empty | Collections.cs:88:26:88:32 | { ..., ... } |
-| non-empty | Collections.cs:89:22:89:28 | { ..., ... } |
-| non-null | Assert.cs:9:31:9:32 | "" |
-| non-null | Assert.cs:10:9:10:13 | access to type Debug |
-| non-null | Assert.cs:11:9:11:15 | access to type Console |
-| non-null | Assert.cs:11:27:11:27 | access to local variable s |
-| non-null | Assert.cs:16:31:16:32 | "" |
-| non-null | Assert.cs:17:9:17:14 | access to type Assert |
-| non-null | Assert.cs:18:9:18:15 | access to type Console |
-| non-null | Assert.cs:23:31:23:32 | "" |
-| non-null | Assert.cs:24:9:24:14 | access to type Assert |
-| non-null | Assert.cs:25:9:25:15 | access to type Console |
-| non-null | Assert.cs:30:31:30:32 | "" |
-| non-null | Assert.cs:31:9:31:14 | access to type Assert |
-| non-null | Assert.cs:32:9:32:15 | access to type Console |
-| non-null | Assert.cs:37:31:37:32 | "" |
-| non-null | Assert.cs:38:9:38:14 | access to type Assert |
-| non-null | Assert.cs:39:9:39:15 | access to type Console |
-| non-null | Assert.cs:44:31:44:32 | "" |
-| non-null | Assert.cs:45:9:45:14 | access to type Assert |
-| non-null | Assert.cs:46:9:46:15 | access to type Console |
-| non-null | Assert.cs:51:31:51:32 | "" |
-| non-null | Assert.cs:52:9:52:14 | access to type Assert |
-| non-null | Assert.cs:53:9:53:15 | access to type Console |
-| non-null | Assert.cs:58:31:58:32 | "" |
-| non-null | Assert.cs:59:9:59:14 | access to type Assert |
-| non-null | Assert.cs:60:9:60:15 | access to type Console |
-| non-null | Assert.cs:65:31:65:32 | "" |
-| non-null | Assert.cs:66:9:66:14 | access to type Assert |
-| non-null | Assert.cs:67:9:67:15 | access to type Console |
-| non-null | Assert.cs:72:31:72:32 | "" |
-| non-null | Assert.cs:73:9:73:14 | access to type Assert |
-| non-null | Assert.cs:74:9:74:15 | access to type Console |
-| non-null | Assert.cs:79:31:79:32 | "" |
-| non-null | Assert.cs:80:9:80:14 | access to type Assert |
-| non-null | Assert.cs:81:9:81:15 | access to type Console |
-| non-null | Assert.cs:93:9:93:35 | this access |
-| non-null | Collections.cs:11:17:11:20 | access to parameter args |
-| non-null | Collections.cs:12:13:12:16 | access to parameter args |
-| non-null | Collections.cs:13:13:13:16 | access to parameter args |
-| non-null | Collections.cs:14:13:14:16 | access to parameter args |
-| non-null | Collections.cs:15:13:15:16 | access to parameter args |
-| non-null | Collections.cs:16:13:16:16 | access to parameter args |
-| non-null | Collections.cs:17:13:17:16 | access to parameter args |
-| non-null | Collections.cs:22:17:22:20 | access to parameter args |
-| non-null | Collections.cs:23:13:23:16 | access to parameter args |
-| non-null | Collections.cs:24:13:24:16 | access to parameter args |
-| non-null | Collections.cs:25:13:25:16 | access to parameter args |
-| non-null | Collections.cs:26:13:26:16 | access to parameter args |
-| non-null | Collections.cs:27:13:27:16 | access to parameter args |
-| non-null | Collections.cs:28:13:28:16 | access to parameter args |
-| non-null | Collections.cs:33:17:33:20 | access to parameter args |
-| non-null | Collections.cs:34:13:34:16 | access to parameter args |
-| non-null | Collections.cs:35:13:35:16 | access to parameter args |
-| non-null | Collections.cs:36:13:36:16 | access to parameter args |
-| non-null | Collections.cs:37:13:37:16 | access to parameter args |
-| non-null | Collections.cs:38:13:38:16 | access to parameter args |
-| non-null | Collections.cs:39:13:39:16 | access to parameter args |
-| non-null | Collections.cs:44:17:44:20 | access to parameter args |
-| non-null | Collections.cs:49:13:49:16 | access to parameter args |
-| non-null | Collections.cs:51:17:51:20 | access to parameter args |
-| non-null | Collections.cs:51:17:51:30 | call to method ToArray |
-| non-null | Collections.cs:52:9:52:12 | access to parameter args |
-| non-null | Collections.cs:53:9:53:9 | access to local variable x |
-| non-null | Collections.cs:53:9:53:26 | ... = ... |
-| non-null | Collections.cs:53:13:53:16 | access to parameter args |
-| non-null | Collections.cs:53:13:53:26 | call to method ToArray |
-| non-null | Collections.cs:54:9:54:9 | access to local variable x |
-| non-null | Collections.cs:54:9:54:42 | ... = ... |
-| non-null | Collections.cs:54:13:54:42 | array creation of type String[] |
-| non-null | Collections.cs:54:28:54:30 | "a" |
-| non-null | Collections.cs:54:33:54:35 | "b" |
-| non-null | Collections.cs:54:38:54:40 | "c" |
-| non-null | Collections.cs:55:9:55:9 | access to local variable x |
-| non-null | Collections.cs:55:9:55:13 | ... = ... |
-| non-null | Collections.cs:55:13:55:13 | access to local variable x |
-| non-null | Collections.cs:56:9:56:9 | access to local variable x |
-| non-null | Collections.cs:56:9:56:25 | ... = ... |
-| non-null | Collections.cs:56:13:56:25 | array creation of type String[] |
-| non-null | Collections.cs:57:9:57:9 | access to local variable x |
-| non-null | Collections.cs:57:9:57:13 | ... = ... |
-| non-null | Collections.cs:57:13:57:13 | access to local variable x |
-| non-null | Collections.cs:62:17:62:46 | array creation of type String[] |
-| non-null | Collections.cs:62:17:62:55 | call to method ToList<String> |
-| non-null | Collections.cs:62:32:62:34 | "a" |
-| non-null | Collections.cs:62:37:62:39 | "b" |
-| non-null | Collections.cs:62:42:62:44 | "c" |
-| non-null | Collections.cs:63:9:63:9 | access to local variable x |
-| non-null | Collections.cs:64:13:64:13 | access to local variable x |
-| non-null | Collections.cs:66:13:66:13 | access to local variable x |
-| non-null | Collections.cs:66:19:66:21 | "a" |
-| non-null | Collections.cs:67:13:67:13 | access to local variable x |
-| non-null | Collections.cs:67:19:67:21 | "b" |
-| non-null | Collections.cs:73:35:73:35 | access to parameter s |
-| non-null | Collections.cs:73:40:73:41 | "" |
-| non-null | Collections.cs:74:17:74:20 | access to parameter args |
-| non-null | Collections.cs:74:26:74:32 | access to local function IsEmpty |
-| non-null | Collections.cs:74:26:74:32 | delegate creation of type Func<String,Boolean> |
-| non-null | Collections.cs:74:26:74:32 | this access |
-| non-null | Collections.cs:75:13:75:16 | access to parameter args |
-| non-null | Collections.cs:75:24:75:30 | access to local function IsEmpty |
-| non-null | Collections.cs:75:24:75:30 | delegate creation of type Func<String,Boolean> |
-| non-null | Collections.cs:75:24:75:30 | this access |
-| non-null | Collections.cs:76:13:76:16 | access to parameter args |
-| non-null | Collections.cs:76:24:76:30 | access to local function IsEmpty |
-| non-null | Collections.cs:76:24:76:30 | delegate creation of type Func<String,Boolean> |
-| non-null | Collections.cs:76:24:76:30 | this access |
-| non-null | Collections.cs:77:13:77:16 | access to parameter args |
-| non-null | Collections.cs:77:24:77:30 | access to local function IsEmpty |
-| non-null | Collections.cs:77:24:77:30 | delegate creation of type Func<String,Boolean> |
-| non-null | Collections.cs:77:24:77:30 | this access |
-| non-null | Collections.cs:78:13:78:16 | access to parameter args |
-| non-null | Collections.cs:78:24:78:30 | access to local function IsEmpty |
-| non-null | Collections.cs:78:24:78:30 | delegate creation of type Func<String,Boolean> |
-| non-null | Collections.cs:78:24:78:30 | this access |
-| non-null | Collections.cs:79:13:79:16 | access to parameter args |
-| non-null | Collections.cs:79:24:79:30 | access to local function IsEmpty |
-| non-null | Collections.cs:79:24:79:30 | delegate creation of type Func<String,Boolean> |
-| non-null | Collections.cs:79:24:79:30 | this access |
-| non-null | Collections.cs:80:13:80:16 | access to parameter args |
-| non-null | Collections.cs:80:24:80:30 | access to local function IsEmpty |
-| non-null | Collections.cs:80:24:80:30 | delegate creation of type Func<String,Boolean> |
-| non-null | Collections.cs:80:24:80:30 | this access |
-| non-null | Collections.cs:81:13:81:16 | access to parameter args |
-| non-null | Collections.cs:81:24:81:30 | access to local function IsEmpty |
-| non-null | Collections.cs:81:24:81:30 | delegate creation of type Func<String,Boolean> |
-| non-null | Collections.cs:81:24:81:30 | this access |
-| non-null | Collections.cs:86:17:86:32 | array creation of type String[] |
-| non-null | Collections.cs:87:22:87:24 | array creation of type String[] |
-| non-null | Collections.cs:88:9:88:9 | access to local variable x |
-| non-null | Collections.cs:88:9:88:32 | ... = ... |
-| non-null | Collections.cs:88:13:88:32 | array creation of type String[] |
-| non-null | Collections.cs:88:28:88:30 | "a" |
-| non-null | Collections.cs:89:22:89:28 | array creation of type String[] |
-| non-null | Collections.cs:89:24:89:26 | "a" |
-| non-null | Collections.cs:94:29:94:32 | access to parameter args |
-| non-null | Collections.cs:95:13:95:19 | access to type Console |
-| non-null | Collections.cs:95:31:95:34 | access to parameter args |
-| non-null | Collections.cs:100:29:100:32 | access to parameter args |
-| non-null | Collections.cs:102:9:102:15 | access to type Console |
-| non-null | Collections.cs:102:27:102:30 | access to parameter args |
-| non-null | Guards.cs:12:13:12:13 | access to parameter s |
-| non-null | Guards.cs:14:13:14:19 | access to type Console |
-| non-null | Guards.cs:14:31:14:31 | access to parameter s |
-| non-null | Guards.cs:18:13:18:19 | access to type Console |
-| non-null | Guards.cs:18:31:18:46 | "<empty string>" |
-| non-null | Guards.cs:26:13:26:19 | access to type Console |
-| non-null | Guards.cs:26:31:26:31 | access to parameter s |
-| non-null | Guards.cs:32:14:32:19 | access to type String |
-| non-null | Guards.cs:33:13:33:19 | access to type Console |
-| non-null | Guards.cs:33:31:33:35 | ... + ... |
-| non-null | Guards.cs:36:14:36:20 | access to type Console |
-| non-null | Guards.cs:36:32:36:32 | access to parameter x |
-| non-null | Guards.cs:36:32:36:36 | ... + ... |
-| non-null | Guards.cs:36:36:36:36 | access to parameter y |
-| non-null | Guards.cs:39:13:39:19 | access to type Console |
-| non-null | Guards.cs:39:31:39:31 | access to parameter x |
-| non-null | Guards.cs:39:31:39:35 | ... + ... |
-| non-null | Guards.cs:39:35:39:35 | access to parameter y |
-| non-null | Guards.cs:42:14:42:20 | access to type Console |
-| non-null | Guards.cs:42:32:42:32 | access to parameter x |
-| non-null | Guards.cs:42:32:42:36 | ... + ... |
-| non-null | Guards.cs:42:36:42:36 | access to parameter y |
-| non-null | Guards.cs:44:13:44:17 | this access |
-| non-null | Guards.cs:45:13:45:19 | access to type Console |
-| non-null | Guards.cs:45:31:45:42 | object creation of type Guards |
-| non-null | Guards.cs:47:13:47:17 | this access |
-| non-null | Guards.cs:48:13:48:19 | access to type Console |
-| non-null | Guards.cs:48:31:48:34 | this access |
-| non-null | Guards.cs:48:31:48:40 | access to field Field |
-| non-null | Guards.cs:53:13:53:13 | access to parameter g |
-| non-null | Guards.cs:55:9:55:15 | access to type Console |
-| non-null | Guards.cs:55:27:55:27 | access to parameter g |
-| non-null | Guards.cs:55:27:55:33 | access to field Field |
-| non-null | Guards.cs:60:13:60:13 | access to parameter g |
-| non-null | Guards.cs:61:19:61:33 | object creation of type Exception |
-| non-null | Guards.cs:62:9:62:15 | access to type Console |
-| non-null | Guards.cs:62:27:62:27 | access to parameter g |
-| non-null | Guards.cs:62:27:62:36 | access to property Property |
-| non-null | Guards.cs:62:27:62:45 | access to property Property |
-| non-null | Guards.cs:62:27:62:51 | access to field Field |
-| non-null | Guards.cs:63:9:63:15 | access to type Console |
-| non-null | Guards.cs:63:27:63:27 | access to parameter g |
-| non-null | Guards.cs:63:27:63:36 | access to property Property |
-| non-null | Guards.cs:70:13:70:19 | access to type Console |
-| non-null | Guards.cs:70:31:70:31 | access to parameter s |
-| non-null | Guards.cs:71:13:71:13 | access to parameter s |
-| non-null | Guards.cs:72:13:72:19 | access to type Console |
-| non-null | Guards.cs:78:26:78:26 | (...) ... |
-| non-null | Guards.cs:79:13:79:19 | access to type Console |
-| non-null | Guards.cs:79:31:79:31 | access to parameter s |
-| non-null | Guards.cs:80:25:80:25 | (...) ... |
-| non-null | Guards.cs:81:13:81:19 | access to type Console |
-| non-null | Guards.cs:81:31:81:31 | access to parameter s |
-| non-null | Guards.cs:82:26:82:26 | (...) ... |
-| non-null | Guards.cs:83:13:83:19 | access to type Console |
-| non-null | Guards.cs:83:31:83:31 | access to parameter s |
-| non-null | Guards.cs:84:25:84:26 | (...) ... |
-| non-null | Guards.cs:85:13:85:19 | access to type Console |
-| non-null | Guards.cs:85:31:85:31 | access to parameter s |
-| non-null | Guards.cs:86:26:86:27 | (...) ... |
-| non-null | Guards.cs:87:13:87:19 | access to type Console |
-| non-null | Guards.cs:87:31:87:31 | access to parameter s |
-| non-null | Guards.cs:89:13:89:19 | access to type Console |
-| non-null | Guards.cs:89:31:89:31 | access to parameter s |
-| non-null | Guards.cs:91:13:91:19 | access to type Console |
-| non-null | Guards.cs:92:25:92:25 | (...) ... |
-| non-null | Guards.cs:92:30:92:30 | (...) ... |
-| non-null | Guards.cs:93:13:93:19 | access to type Console |
-| non-null | Guards.cs:95:13:95:19 | access to type Console |
-| non-null | Guards.cs:96:18:96:19 | "" |
-| non-null | Guards.cs:97:13:97:19 | access to type Console |
-| non-null | Guards.cs:97:31:97:31 | access to parameter s |
-| non-null | Guards.cs:99:13:99:19 | access to type Console |
-| non-null | Guards.cs:104:13:104:13 | access to parameter g |
-| non-null | Guards.cs:105:19:105:33 | object creation of type Exception |
-| non-null | Guards.cs:106:9:106:9 | access to parameter g |
-| non-null | Guards.cs:106:9:106:18 | access to property Property |
-| non-null | Guards.cs:107:9:107:15 | access to type Console |
-| non-null | Guards.cs:107:27:107:27 | access to parameter g |
-| non-null | Guards.cs:108:9:108:15 | access to type Console |
-| non-null | Guards.cs:108:27:108:27 | access to parameter g |
-| non-null | Guards.cs:108:27:108:36 | access to property Property |
-| non-null | Guards.cs:113:21:113:21 | access to parameter g |
-| non-null | Guards.cs:114:14:114:14 | access to parameter g |
-| non-null | Guards.cs:114:14:114:23 | access to property Property |
-| non-null | Guards.cs:114:14:114:32 | access to property Property |
-| non-null | Guards.cs:115:9:115:55 | ... = ... |
-| non-null | Guards.cs:115:17:115:17 | access to parameter g |
-| non-null | Guards.cs:115:17:115:26 | access to property Property |
-| non-null | Guards.cs:115:17:115:35 | access to property Property |
-| non-null | Guards.cs:115:17:115:55 | ... ?? ... |
-| non-null | Guards.cs:115:46:115:55 | throw ... |
-| non-null | Guards.cs:116:9:116:15 | access to type Console |
-| non-null | Guards.cs:116:27:116:27 | access to parameter g |
-| non-null | Guards.cs:116:27:116:36 | access to property Property |
-| non-null | Guards.cs:116:27:116:45 | access to property Property |
-| non-null | Guards.cs:116:27:116:51 | access to field Field |
-| non-null | Guards.cs:117:9:117:9 | access to parameter g |
-| non-null | Guards.cs:117:9:117:18 | access to property Property |
-| non-null | Guards.cs:118:9:118:15 | access to type Console |
-| non-null | Guards.cs:118:27:118:27 | access to parameter g |
-| non-null | Guards.cs:119:9:119:15 | access to type Console |
-| non-null | Guards.cs:119:27:119:27 | access to parameter g |
-| non-null | Guards.cs:119:27:119:36 | access to property Property |
-| non-null | Guards.cs:125:18:125:19 | access to parameter s1 |
-| non-null | Guards.cs:125:29:125:30 | access to parameter s1 |
-| non-null | Guards.cs:132:16:132:16 | access to parameter s |
-| non-null | Guards.cs:138:20:138:20 | access to parameter s |
-| non-null | Guards.cs:145:20:145:20 | access to local variable s |
-| non-null | Guards.cs:154:24:154:24 | access to parameter o |
-| non-null | Guards.cs:156:24:156:24 | access to local variable a |
-| non-null | Guards.cs:158:24:158:24 | access to parameter o |
-| non-null | Guards.cs:162:24:162:24 | access to parameter o |
-| non-null | Guards.cs:168:14:168:19 | access to type String |
-| non-null | Guards.cs:169:13:169:19 | access to type Console |
-| non-null | Guards.cs:169:31:169:31 | access to parameter x |
-| non-null | Guards.cs:183:38:183:49 | this access |
-| non-null | Guards.cs:189:14:189:25 | this access |
-| non-null | Guards.cs:190:13:190:19 | access to type Console |
-| non-null | Guards.cs:191:14:191:25 | this access |
-| non-null | Guards.cs:192:13:192:19 | access to type Console |
-| non-null | Guards.cs:193:14:193:25 | this access |
-| non-null | Guards.cs:194:13:194:19 | access to type Console |
-| non-null | Guards.cs:195:13:195:27 | this access |
-| non-null | Guards.cs:196:13:196:19 | access to type Console |
-| non-null | Guards.cs:197:14:197:29 | this access |
-| non-null | Guards.cs:198:13:198:19 | access to type Console |
-| non-null | Guards.cs:205:13:205:13 | access to parameter o |
-| non-null | Guards.cs:206:33:206:36 | access to parameter args |
-| non-null | Guards.cs:208:17:208:17 | access to parameter o |
-| non-null | Guards.cs:268:30:268:41 | call to method GetType |
-| non-null | Guards.cs:269:13:269:14 | access to parameter o1 |
-| non-null | Guards.cs:270:30:270:31 | access to parameter o2 |
-| non-null | Guards.cs:279:17:279:17 | access to parameter o |
-| non-null | Guards.cs:281:17:281:17 | access to local variable a |
-| non-null | Guards.cs:283:17:283:17 | access to parameter o |
-| non-null | Guards.cs:287:17:287:17 | access to parameter o |
-| non-null | Guards.cs:341:31:341:32 | "" |
-| non-null | Guards.cs:343:13:343:19 | access to type Console |
-| non-null | Guards.cs:343:31:343:31 | access to local variable s |
-| non-null | Guards.cs:349:13:349:13 | access to parameter o |
-| non-null | Splitting.cs:13:17:13:17 | access to parameter o |
-| non-null | Splitting.cs:23:24:23:24 | access to parameter o |
-| non-null | Splitting.cs:33:24:33:25 | "" |
-| non-null | Splitting.cs:44:17:44:17 | access to parameter o |
-| non-null | Splitting.cs:46:17:46:17 | access to parameter o |
-| non-null | Splitting.cs:55:13:55:13 | access to parameter o |
-| non-null | Splitting.cs:66:20:66:20 | access to parameter o |
-| non-null | Splitting.cs:78:24:78:24 | access to parameter o |
-| non-null | Splitting.cs:87:13:87:17 | access to type Debug |
-| non-null | Splitting.cs:90:13:90:13 | access to parameter o |
-| non-null | Splitting.cs:91:9:91:9 | access to parameter o |
-| non-null | Splitting.cs:97:13:97:17 | access to type Debug |
-| non-null | Splitting.cs:105:9:105:13 | access to type Debug |
-| non-null | Splitting.cs:107:13:107:13 | access to parameter o |
-| non-null | Splitting.cs:109:13:109:13 | access to parameter o |
-| non-null | Splitting.cs:116:9:116:13 | access to type Debug |
-| non-null | Splitting.cs:117:9:117:9 | access to parameter o |
-| non-null | Splitting.cs:119:13:119:13 | access to parameter o |
-| non-null | Splitting.cs:120:16:120:16 | access to parameter o |
-| non-null | Splitting.cs:129:17:129:17 | access to local variable o |
-| non-null | Splitting.cs:133:17:133:17 | access to local variable o |
-| non-null | Splitting.cs:133:17:133:29 | ... = ... |
-| non-null | Splitting.cs:133:21:133:29 | call to method M11 |
-| non-null | Splitting.cs:133:21:133:29 | this access |
-| non-null | Splitting.cs:133:28:133:28 | access to local variable o |
-| non-null | Splitting.cs:134:17:134:17 | access to local variable o |
+| not  | Guards.cs:99:31:99:31 | access to parameter s |
+| not  | Guards.cs:160:24:160:24 | access to parameter o |
+| not  | Guards.cs:162:24:162:24 | access to parameter o |
+| not  | Guards.cs:285:17:285:17 | access to parameter o |
+| not  | Guards.cs:287:17:287:17 | access to parameter o |
+| not null | Assert.cs:9:20:9:20 | access to parameter b |
+| not null | Assert.cs:9:31:9:32 | "" |
+| not null | Assert.cs:10:9:10:13 | access to type Debug |
+| not null | Assert.cs:10:9:10:31 | call to method Assert |
+| not null | Assert.cs:10:22:10:30 | ... != ... |
+| not null | Assert.cs:11:9:11:15 | access to type Console |
+| not null | Assert.cs:11:9:11:35 | call to method WriteLine |
+| not null | Assert.cs:11:27:11:27 | access to local variable s |
+| not null | Assert.cs:11:27:11:34 | access to property Length |
+| not null | Assert.cs:16:20:16:20 | access to parameter b |
+| not null | Assert.cs:16:31:16:32 | "" |
+| not null | Assert.cs:17:9:17:14 | access to type Assert |
+| not null | Assert.cs:17:9:17:24 | call to method IsNull |
+| not null | Assert.cs:18:9:18:15 | access to type Console |
+| not null | Assert.cs:18:9:18:35 | call to method WriteLine |
+| not null | Assert.cs:18:27:18:34 | access to property Length |
+| not null | Assert.cs:23:20:23:20 | access to parameter b |
+| not null | Assert.cs:23:31:23:32 | "" |
+| not null | Assert.cs:24:9:24:14 | access to type Assert |
+| not null | Assert.cs:24:9:24:27 | call to method IsNotNull |
+| not null | Assert.cs:25:9:25:15 | access to type Console |
+| not null | Assert.cs:25:9:25:35 | call to method WriteLine |
+| not null | Assert.cs:25:27:25:27 | access to local variable s |
+| not null | Assert.cs:25:27:25:34 | access to property Length |
+| not null | Assert.cs:30:20:30:20 | access to parameter b |
+| not null | Assert.cs:30:31:30:32 | "" |
+| not null | Assert.cs:31:9:31:14 | access to type Assert |
+| not null | Assert.cs:31:9:31:32 | call to method IsTrue |
+| not null | Assert.cs:31:23:31:31 | ... == ... |
+| not null | Assert.cs:32:9:32:15 | access to type Console |
+| not null | Assert.cs:32:9:32:35 | call to method WriteLine |
+| not null | Assert.cs:32:27:32:34 | access to property Length |
+| not null | Assert.cs:37:20:37:20 | access to parameter b |
+| not null | Assert.cs:37:31:37:32 | "" |
+| not null | Assert.cs:38:9:38:14 | access to type Assert |
+| not null | Assert.cs:38:9:38:32 | call to method IsTrue |
+| not null | Assert.cs:38:23:38:31 | ... != ... |
+| not null | Assert.cs:39:9:39:15 | access to type Console |
+| not null | Assert.cs:39:9:39:35 | call to method WriteLine |
+| not null | Assert.cs:39:27:39:27 | access to local variable s |
+| not null | Assert.cs:39:27:39:34 | access to property Length |
+| not null | Assert.cs:44:20:44:20 | access to parameter b |
+| not null | Assert.cs:44:31:44:32 | "" |
+| not null | Assert.cs:45:9:45:14 | access to type Assert |
+| not null | Assert.cs:45:9:45:33 | call to method IsFalse |
+| not null | Assert.cs:45:24:45:32 | ... != ... |
+| not null | Assert.cs:46:9:46:15 | access to type Console |
+| not null | Assert.cs:46:9:46:35 | call to method WriteLine |
+| not null | Assert.cs:46:27:46:34 | access to property Length |
+| not null | Assert.cs:51:20:51:20 | access to parameter b |
+| not null | Assert.cs:51:31:51:32 | "" |
+| not null | Assert.cs:52:9:52:14 | access to type Assert |
+| not null | Assert.cs:52:9:52:33 | call to method IsFalse |
+| not null | Assert.cs:52:24:52:32 | ... == ... |
+| not null | Assert.cs:53:9:53:15 | access to type Console |
+| not null | Assert.cs:53:9:53:35 | call to method WriteLine |
+| not null | Assert.cs:53:27:53:27 | access to local variable s |
+| not null | Assert.cs:53:27:53:34 | access to property Length |
+| not null | Assert.cs:58:20:58:20 | access to parameter b |
+| not null | Assert.cs:58:31:58:32 | "" |
+| not null | Assert.cs:59:9:59:14 | access to type Assert |
+| not null | Assert.cs:59:9:59:37 | call to method IsTrue |
+| not null | Assert.cs:59:23:59:31 | ... != ... |
+| not null | Assert.cs:59:23:59:36 | ... && ... |
+| not null | Assert.cs:59:36:59:36 | access to parameter b |
+| not null | Assert.cs:60:9:60:15 | access to type Console |
+| not null | Assert.cs:60:9:60:35 | call to method WriteLine |
+| not null | Assert.cs:60:27:60:27 | access to local variable s |
+| not null | Assert.cs:60:27:60:34 | access to property Length |
+| not null | Assert.cs:65:20:65:20 | access to parameter b |
+| not null | Assert.cs:65:31:65:32 | "" |
+| not null | Assert.cs:66:9:66:14 | access to type Assert |
+| not null | Assert.cs:66:9:66:38 | call to method IsFalse |
+| not null | Assert.cs:66:24:66:32 | ... == ... |
+| not null | Assert.cs:66:24:66:37 | ... \|\| ... |
+| not null | Assert.cs:66:37:66:37 | access to parameter b |
+| not null | Assert.cs:67:9:67:15 | access to type Console |
+| not null | Assert.cs:67:9:67:35 | call to method WriteLine |
+| not null | Assert.cs:67:27:67:27 | access to local variable s |
+| not null | Assert.cs:67:27:67:34 | access to property Length |
+| not null | Assert.cs:72:20:72:20 | access to parameter b |
+| not null | Assert.cs:72:31:72:32 | "" |
+| not null | Assert.cs:73:9:73:14 | access to type Assert |
+| not null | Assert.cs:73:9:73:37 | call to method IsTrue |
+| not null | Assert.cs:73:23:73:31 | ... == ... |
+| not null | Assert.cs:73:23:73:36 | ... && ... |
+| not null | Assert.cs:73:36:73:36 | access to parameter b |
+| not null | Assert.cs:74:9:74:15 | access to type Console |
+| not null | Assert.cs:74:9:74:35 | call to method WriteLine |
+| not null | Assert.cs:74:27:74:34 | access to property Length |
+| not null | Assert.cs:79:20:79:20 | access to parameter b |
+| not null | Assert.cs:79:31:79:32 | "" |
+| not null | Assert.cs:80:9:80:14 | access to type Assert |
+| not null | Assert.cs:80:9:80:38 | call to method IsFalse |
+| not null | Assert.cs:80:24:80:32 | ... != ... |
+| not null | Assert.cs:80:24:80:37 | ... \|\| ... |
+| not null | Assert.cs:80:37:80:37 | access to parameter b |
+| not null | Assert.cs:81:9:81:15 | access to type Console |
+| not null | Assert.cs:81:9:81:35 | call to method WriteLine |
+| not null | Assert.cs:81:27:81:34 | access to property Length |
+| not null | Assert.cs:85:61:85:65 | false |
+| not null | Assert.cs:86:61:86:64 | true |
+| not null | Assert.cs:93:9:93:35 | call to method AssertTrueFalse |
+| not null | Assert.cs:93:9:93:35 | this access |
+| not null | Assert.cs:93:25:93:26 | access to parameter b1 |
+| not null | Assert.cs:93:29:93:30 | access to parameter b2 |
+| not null | Assert.cs:93:33:93:34 | access to parameter b2 |
+| not null | Assert.cs:94:16:94:17 | access to parameter b1 |
+| not null | Assert.cs:94:16:94:24 | ... && ... |
+| not null | Assert.cs:94:22:94:24 | !... |
+| not null | Assert.cs:94:23:94:24 | access to parameter b2 |
+| not null | Collections.cs:11:13:11:13 | access to local variable b |
+| not null | Collections.cs:11:13:11:32 | Boolean b = ... |
+| not null | Collections.cs:11:17:11:20 | access to parameter args |
+| not null | Collections.cs:11:17:11:27 | access to property Length |
+| not null | Collections.cs:11:17:11:32 | ... == ... |
+| not null | Collections.cs:11:32:11:32 | 0 |
+| not null | Collections.cs:12:9:12:9 | access to local variable b |
+| not null | Collections.cs:12:9:12:28 | ... = ... |
+| not null | Collections.cs:12:13:12:16 | access to parameter args |
+| not null | Collections.cs:12:13:12:23 | access to property Length |
+| not null | Collections.cs:12:13:12:28 | ... == ... |
+| not null | Collections.cs:12:28:12:28 | 1 |
+| not null | Collections.cs:13:9:13:9 | access to local variable b |
+| not null | Collections.cs:13:9:13:28 | ... = ... |
+| not null | Collections.cs:13:13:13:16 | access to parameter args |
+| not null | Collections.cs:13:13:13:23 | access to property Length |
+| not null | Collections.cs:13:13:13:28 | ... != ... |
+| not null | Collections.cs:13:28:13:28 | 0 |
+| not null | Collections.cs:14:9:14:9 | access to local variable b |
+| not null | Collections.cs:14:9:14:28 | ... = ... |
+| not null | Collections.cs:14:13:14:16 | access to parameter args |
+| not null | Collections.cs:14:13:14:23 | access to property Length |
+| not null | Collections.cs:14:13:14:28 | ... != ... |
+| not null | Collections.cs:14:28:14:28 | 1 |
+| not null | Collections.cs:15:9:15:9 | access to local variable b |
+| not null | Collections.cs:15:9:15:27 | ... = ... |
+| not null | Collections.cs:15:13:15:16 | access to parameter args |
+| not null | Collections.cs:15:13:15:23 | access to property Length |
+| not null | Collections.cs:15:13:15:27 | ... > ... |
+| not null | Collections.cs:15:27:15:27 | 0 |
+| not null | Collections.cs:16:9:16:9 | access to local variable b |
+| not null | Collections.cs:16:9:16:28 | ... = ... |
+| not null | Collections.cs:16:13:16:16 | access to parameter args |
+| not null | Collections.cs:16:13:16:23 | access to property Length |
+| not null | Collections.cs:16:13:16:28 | ... >= ... |
+| not null | Collections.cs:16:28:16:28 | 0 |
+| not null | Collections.cs:17:9:17:9 | access to local variable b |
+| not null | Collections.cs:17:9:17:28 | ... = ... |
+| not null | Collections.cs:17:13:17:16 | access to parameter args |
+| not null | Collections.cs:17:13:17:23 | access to property Length |
+| not null | Collections.cs:17:13:17:28 | ... >= ... |
+| not null | Collections.cs:17:28:17:28 | 1 |
+| not null | Collections.cs:22:13:22:13 | access to local variable b |
+| not null | Collections.cs:22:13:22:31 | Boolean b = ... |
+| not null | Collections.cs:22:17:22:20 | access to parameter args |
+| not null | Collections.cs:22:17:22:26 | access to property Count |
+| not null | Collections.cs:22:17:22:31 | ... == ... |
+| not null | Collections.cs:22:31:22:31 | 0 |
+| not null | Collections.cs:23:9:23:9 | access to local variable b |
+| not null | Collections.cs:23:9:23:27 | ... = ... |
+| not null | Collections.cs:23:13:23:16 | access to parameter args |
+| not null | Collections.cs:23:13:23:22 | access to property Count |
+| not null | Collections.cs:23:13:23:27 | ... == ... |
+| not null | Collections.cs:23:27:23:27 | 1 |
+| not null | Collections.cs:24:9:24:9 | access to local variable b |
+| not null | Collections.cs:24:9:24:27 | ... = ... |
+| not null | Collections.cs:24:13:24:16 | access to parameter args |
+| not null | Collections.cs:24:13:24:22 | access to property Count |
+| not null | Collections.cs:24:13:24:27 | ... != ... |
+| not null | Collections.cs:24:27:24:27 | 0 |
+| not null | Collections.cs:25:9:25:9 | access to local variable b |
+| not null | Collections.cs:25:9:25:27 | ... = ... |
+| not null | Collections.cs:25:13:25:16 | access to parameter args |
+| not null | Collections.cs:25:13:25:22 | access to property Count |
+| not null | Collections.cs:25:13:25:27 | ... != ... |
+| not null | Collections.cs:25:27:25:27 | 1 |
+| not null | Collections.cs:26:9:26:9 | access to local variable b |
+| not null | Collections.cs:26:9:26:26 | ... = ... |
+| not null | Collections.cs:26:13:26:16 | access to parameter args |
+| not null | Collections.cs:26:13:26:22 | access to property Count |
+| not null | Collections.cs:26:13:26:26 | ... > ... |
+| not null | Collections.cs:26:26:26:26 | 0 |
+| not null | Collections.cs:27:9:27:9 | access to local variable b |
+| not null | Collections.cs:27:9:27:27 | ... = ... |
+| not null | Collections.cs:27:13:27:16 | access to parameter args |
+| not null | Collections.cs:27:13:27:22 | access to property Count |
+| not null | Collections.cs:27:13:27:27 | ... >= ... |
+| not null | Collections.cs:27:27:27:27 | 0 |
+| not null | Collections.cs:28:9:28:9 | access to local variable b |
+| not null | Collections.cs:28:9:28:27 | ... = ... |
+| not null | Collections.cs:28:13:28:16 | access to parameter args |
+| not null | Collections.cs:28:13:28:22 | access to property Count |
+| not null | Collections.cs:28:13:28:27 | ... >= ... |
+| not null | Collections.cs:28:27:28:27 | 1 |
+| not null | Collections.cs:33:13:33:13 | access to local variable b |
+| not null | Collections.cs:33:13:33:33 | Boolean b = ... |
+| not null | Collections.cs:33:17:33:20 | access to parameter args |
+| not null | Collections.cs:33:17:33:28 | call to method Count<String> |
+| not null | Collections.cs:33:17:33:33 | ... == ... |
+| not null | Collections.cs:33:33:33:33 | 0 |
+| not null | Collections.cs:34:9:34:9 | access to local variable b |
+| not null | Collections.cs:34:9:34:29 | ... = ... |
+| not null | Collections.cs:34:13:34:16 | access to parameter args |
+| not null | Collections.cs:34:13:34:24 | call to method Count<String> |
+| not null | Collections.cs:34:13:34:29 | ... == ... |
+| not null | Collections.cs:34:29:34:29 | 1 |
+| not null | Collections.cs:35:9:35:9 | access to local variable b |
+| not null | Collections.cs:35:9:35:29 | ... = ... |
+| not null | Collections.cs:35:13:35:16 | access to parameter args |
+| not null | Collections.cs:35:13:35:24 | call to method Count<String> |
+| not null | Collections.cs:35:13:35:29 | ... != ... |
+| not null | Collections.cs:35:29:35:29 | 0 |
+| not null | Collections.cs:36:9:36:9 | access to local variable b |
+| not null | Collections.cs:36:9:36:29 | ... = ... |
+| not null | Collections.cs:36:13:36:16 | access to parameter args |
+| not null | Collections.cs:36:13:36:24 | call to method Count<String> |
+| not null | Collections.cs:36:13:36:29 | ... != ... |
+| not null | Collections.cs:36:29:36:29 | 1 |
+| not null | Collections.cs:37:9:37:9 | access to local variable b |
+| not null | Collections.cs:37:9:37:28 | ... = ... |
+| not null | Collections.cs:37:13:37:16 | access to parameter args |
+| not null | Collections.cs:37:13:37:24 | call to method Count<String> |
+| not null | Collections.cs:37:13:37:28 | ... > ... |
+| not null | Collections.cs:37:28:37:28 | 0 |
+| not null | Collections.cs:38:9:38:9 | access to local variable b |
+| not null | Collections.cs:38:9:38:29 | ... = ... |
+| not null | Collections.cs:38:13:38:16 | access to parameter args |
+| not null | Collections.cs:38:13:38:24 | call to method Count<String> |
+| not null | Collections.cs:38:13:38:29 | ... >= ... |
+| not null | Collections.cs:38:29:38:29 | 0 |
+| not null | Collections.cs:39:9:39:9 | access to local variable b |
+| not null | Collections.cs:39:9:39:29 | ... = ... |
+| not null | Collections.cs:39:13:39:16 | access to parameter args |
+| not null | Collections.cs:39:13:39:24 | call to method Count<String> |
+| not null | Collections.cs:39:13:39:29 | ... >= ... |
+| not null | Collections.cs:39:29:39:29 | 1 |
+| not null | Collections.cs:44:13:44:13 | access to local variable b |
+| not null | Collections.cs:44:13:44:26 | Boolean b = ... |
+| not null | Collections.cs:44:17:44:20 | access to parameter args |
+| not null | Collections.cs:44:17:44:26 | call to method Any<String> |
+| not null | Collections.cs:49:13:49:16 | access to parameter args |
+| not null | Collections.cs:49:13:49:22 | access to property Count |
+| not null | Collections.cs:49:13:49:27 | ... == ... |
+| not null | Collections.cs:49:27:49:27 | 0 |
+| not null | Collections.cs:51:17:51:20 | access to parameter args |
+| not null | Collections.cs:51:17:51:30 | call to method ToArray |
+| not null | Collections.cs:52:9:52:12 | access to parameter args |
+| not null | Collections.cs:52:9:52:20 | call to method Clear |
+| not null | Collections.cs:53:9:53:9 | access to local variable x |
+| not null | Collections.cs:53:9:53:26 | ... = ... |
+| not null | Collections.cs:53:13:53:16 | access to parameter args |
+| not null | Collections.cs:53:13:53:26 | call to method ToArray |
+| not null | Collections.cs:54:9:54:9 | access to local variable x |
+| not null | Collections.cs:54:9:54:42 | ... = ... |
+| not null | Collections.cs:54:13:54:42 | 3 |
+| not null | Collections.cs:54:13:54:42 | array creation of type String[] |
+| not null | Collections.cs:54:28:54:30 | "a" |
+| not null | Collections.cs:54:33:54:35 | "b" |
+| not null | Collections.cs:54:38:54:40 | "c" |
+| not null | Collections.cs:55:9:55:9 | access to local variable x |
+| not null | Collections.cs:55:9:55:13 | ... = ... |
+| not null | Collections.cs:55:13:55:13 | access to local variable x |
+| not null | Collections.cs:56:9:56:9 | access to local variable x |
+| not null | Collections.cs:56:9:56:25 | ... = ... |
+| not null | Collections.cs:56:13:56:25 | array creation of type String[] |
+| not null | Collections.cs:56:24:56:24 | 0 |
+| not null | Collections.cs:57:9:57:9 | access to local variable x |
+| not null | Collections.cs:57:9:57:13 | ... = ... |
+| not null | Collections.cs:57:13:57:13 | access to local variable x |
+| not null | Collections.cs:62:17:62:46 | 3 |
+| not null | Collections.cs:62:17:62:46 | array creation of type String[] |
+| not null | Collections.cs:62:17:62:55 | call to method ToList<String> |
+| not null | Collections.cs:62:32:62:34 | "a" |
+| not null | Collections.cs:62:37:62:39 | "b" |
+| not null | Collections.cs:62:42:62:44 | "c" |
+| not null | Collections.cs:63:9:63:9 | access to local variable x |
+| not null | Collections.cs:63:9:63:17 | call to method Clear |
+| not null | Collections.cs:64:13:64:13 | access to local variable x |
+| not null | Collections.cs:64:13:64:19 | access to property Count |
+| not null | Collections.cs:64:13:64:24 | ... == ... |
+| not null | Collections.cs:64:24:64:24 | 0 |
+| not null | Collections.cs:66:13:66:13 | access to local variable x |
+| not null | Collections.cs:66:13:66:22 | call to method Add |
+| not null | Collections.cs:66:19:66:21 | "a" |
+| not null | Collections.cs:67:13:67:13 | access to local variable x |
+| not null | Collections.cs:67:13:67:22 | call to method Add |
+| not null | Collections.cs:67:19:67:21 | "b" |
+| not null | Collections.cs:73:35:73:35 | access to parameter s |
+| not null | Collections.cs:73:35:73:41 | ... == ... |
+| not null | Collections.cs:73:40:73:41 | "" |
+| not null | Collections.cs:74:13:74:13 | access to local variable b |
+| not null | Collections.cs:74:13:74:33 | Boolean b = ... |
+| not null | Collections.cs:74:17:74:20 | access to parameter args |
+| not null | Collections.cs:74:17:74:33 | call to method Any<String> |
+| not null | Collections.cs:74:26:74:32 | access to local function IsEmpty |
+| not null | Collections.cs:74:26:74:32 | delegate creation of type Func<String,Boolean> |
+| not null | Collections.cs:74:26:74:32 | this access |
+| not null | Collections.cs:75:9:75:9 | access to local variable b |
+| not null | Collections.cs:75:9:75:36 | ... = ... |
+| not null | Collections.cs:75:13:75:16 | access to parameter args |
+| not null | Collections.cs:75:13:75:31 | call to method Count<String> |
+| not null | Collections.cs:75:13:75:36 | ... == ... |
+| not null | Collections.cs:75:24:75:30 | access to local function IsEmpty |
+| not null | Collections.cs:75:24:75:30 | delegate creation of type Func<String,Boolean> |
+| not null | Collections.cs:75:24:75:30 | this access |
+| not null | Collections.cs:75:36:75:36 | 0 |
+| not null | Collections.cs:76:9:76:9 | access to local variable b |
+| not null | Collections.cs:76:9:76:36 | ... = ... |
+| not null | Collections.cs:76:13:76:16 | access to parameter args |
+| not null | Collections.cs:76:13:76:31 | call to method Count<String> |
+| not null | Collections.cs:76:13:76:36 | ... == ... |
+| not null | Collections.cs:76:24:76:30 | access to local function IsEmpty |
+| not null | Collections.cs:76:24:76:30 | delegate creation of type Func<String,Boolean> |
+| not null | Collections.cs:76:24:76:30 | this access |
+| not null | Collections.cs:76:36:76:36 | 1 |
+| not null | Collections.cs:77:9:77:9 | access to local variable b |
+| not null | Collections.cs:77:9:77:36 | ... = ... |
+| not null | Collections.cs:77:13:77:16 | access to parameter args |
+| not null | Collections.cs:77:13:77:31 | call to method Count<String> |
+| not null | Collections.cs:77:13:77:36 | ... != ... |
+| not null | Collections.cs:77:24:77:30 | access to local function IsEmpty |
+| not null | Collections.cs:77:24:77:30 | delegate creation of type Func<String,Boolean> |
+| not null | Collections.cs:77:24:77:30 | this access |
+| not null | Collections.cs:77:36:77:36 | 0 |
+| not null | Collections.cs:78:9:78:9 | access to local variable b |
+| not null | Collections.cs:78:9:78:36 | ... = ... |
+| not null | Collections.cs:78:13:78:16 | access to parameter args |
+| not null | Collections.cs:78:13:78:31 | call to method Count<String> |
+| not null | Collections.cs:78:13:78:36 | ... != ... |
+| not null | Collections.cs:78:24:78:30 | access to local function IsEmpty |
+| not null | Collections.cs:78:24:78:30 | delegate creation of type Func<String,Boolean> |
+| not null | Collections.cs:78:24:78:30 | this access |
+| not null | Collections.cs:78:36:78:36 | 1 |
+| not null | Collections.cs:79:9:79:9 | access to local variable b |
+| not null | Collections.cs:79:9:79:35 | ... = ... |
+| not null | Collections.cs:79:13:79:16 | access to parameter args |
+| not null | Collections.cs:79:13:79:31 | call to method Count<String> |
+| not null | Collections.cs:79:13:79:35 | ... > ... |
+| not null | Collections.cs:79:24:79:30 | access to local function IsEmpty |
+| not null | Collections.cs:79:24:79:30 | delegate creation of type Func<String,Boolean> |
+| not null | Collections.cs:79:24:79:30 | this access |
+| not null | Collections.cs:79:35:79:35 | 0 |
+| not null | Collections.cs:80:9:80:9 | access to local variable b |
+| not null | Collections.cs:80:9:80:36 | ... = ... |
+| not null | Collections.cs:80:13:80:16 | access to parameter args |
+| not null | Collections.cs:80:13:80:31 | call to method Count<String> |
+| not null | Collections.cs:80:13:80:36 | ... >= ... |
+| not null | Collections.cs:80:24:80:30 | access to local function IsEmpty |
+| not null | Collections.cs:80:24:80:30 | delegate creation of type Func<String,Boolean> |
+| not null | Collections.cs:80:24:80:30 | this access |
+| not null | Collections.cs:80:36:80:36 | 0 |
+| not null | Collections.cs:81:9:81:9 | access to local variable b |
+| not null | Collections.cs:81:9:81:36 | ... = ... |
+| not null | Collections.cs:81:13:81:16 | access to parameter args |
+| not null | Collections.cs:81:13:81:31 | call to method Count<String> |
+| not null | Collections.cs:81:13:81:36 | ... >= ... |
+| not null | Collections.cs:81:24:81:30 | access to local function IsEmpty |
+| not null | Collections.cs:81:24:81:30 | delegate creation of type Func<String,Boolean> |
+| not null | Collections.cs:81:24:81:30 | this access |
+| not null | Collections.cs:81:36:81:36 | 1 |
+| not null | Collections.cs:86:17:86:32 | 0 |
+| not null | Collections.cs:86:17:86:32 | array creation of type String[] |
+| not null | Collections.cs:87:22:87:24 | array creation of type String[] |
+| not null | Collections.cs:88:9:88:9 | access to local variable x |
+| not null | Collections.cs:88:9:88:32 | ... = ... |
+| not null | Collections.cs:88:13:88:32 | 1 |
+| not null | Collections.cs:88:13:88:32 | array creation of type String[] |
+| not null | Collections.cs:88:28:88:30 | "a" |
+| not null | Collections.cs:89:22:89:28 | array creation of type String[] |
+| not null | Collections.cs:89:24:89:26 | "a" |
+| not null | Collections.cs:94:29:94:32 | access to parameter args |
+| not null | Collections.cs:95:13:95:19 | access to type Console |
+| not null | Collections.cs:95:13:95:35 | call to method WriteLine |
+| not null | Collections.cs:95:31:95:34 | access to parameter args |
+| not null | Collections.cs:100:29:100:32 | access to parameter args |
+| not null | Collections.cs:102:9:102:15 | access to type Console |
+| not null | Collections.cs:102:9:102:31 | call to method WriteLine |
+| not null | Collections.cs:102:27:102:30 | access to parameter args |
+| not null | Guards.cs:10:13:10:25 | !... |
+| not null | Guards.cs:10:14:10:25 | !... |
+| not null | Guards.cs:10:16:10:24 | ... == ... |
+| not null | Guards.cs:12:13:12:13 | access to parameter s |
+| not null | Guards.cs:12:13:12:20 | access to property Length |
+| not null | Guards.cs:12:13:12:24 | ... > ... |
+| not null | Guards.cs:12:24:12:24 | 0 |
+| not null | Guards.cs:14:13:14:19 | access to type Console |
+| not null | Guards.cs:14:13:14:32 | call to method WriteLine |
+| not null | Guards.cs:14:31:14:31 | access to parameter s |
+| not null | Guards.cs:18:13:18:19 | access to type Console |
+| not null | Guards.cs:18:13:18:47 | call to method WriteLine |
+| not null | Guards.cs:18:31:18:46 | "<empty string>" |
+| not null | Guards.cs:24:13:24:21 | ... != ... |
+| not null | Guards.cs:26:13:26:19 | access to type Console |
+| not null | Guards.cs:26:13:26:32 | call to method WriteLine |
+| not null | Guards.cs:26:31:26:31 | access to parameter s |
+| not null | Guards.cs:32:13:32:36 | !... |
+| not null | Guards.cs:32:13:32:51 | ... & ... |
+| not null | Guards.cs:32:14:32:19 | access to type String |
+| not null | Guards.cs:32:14:32:36 | call to method IsNullOrEmpty |
+| not null | Guards.cs:32:40:32:51 | !... |
+| not null | Guards.cs:32:42:32:50 | ... == ... |
+| not null | Guards.cs:33:13:33:19 | access to type Console |
+| not null | Guards.cs:33:13:33:36 | call to method WriteLine |
+| not null | Guards.cs:33:31:33:31 | access to parameter x |
+| not null | Guards.cs:33:31:33:35 | ... + ... |
+| not null | Guards.cs:33:35:33:35 | access to parameter y |
+| not null | Guards.cs:35:13:35:21 | ... == ... |
+| not null | Guards.cs:35:13:35:34 | ... \|\| ... |
+| not null | Guards.cs:35:26:35:34 | ... == ... |
+| not null | Guards.cs:36:14:36:20 | access to type Console |
+| not null | Guards.cs:36:14:36:37 | call to method WriteLine |
+| not null | Guards.cs:36:32:36:32 | access to parameter x |
+| not null | Guards.cs:36:32:36:36 | ... + ... |
+| not null | Guards.cs:36:36:36:36 | access to parameter y |
+| not null | Guards.cs:38:13:38:37 | !... |
+| not null | Guards.cs:38:15:38:23 | ... == ... |
+| not null | Guards.cs:38:15:38:36 | ... \|\| ... |
+| not null | Guards.cs:38:28:38:36 | ... == ... |
+| not null | Guards.cs:39:13:39:19 | access to type Console |
+| not null | Guards.cs:39:13:39:36 | call to method WriteLine |
+| not null | Guards.cs:39:31:39:31 | access to parameter x |
+| not null | Guards.cs:39:31:39:35 | ... + ... |
+| not null | Guards.cs:39:35:39:35 | access to parameter y |
+| not null | Guards.cs:41:13:41:39 | !... |
+| not null | Guards.cs:41:14:41:39 | !... |
+| not null | Guards.cs:41:15:41:39 | !... |
+| not null | Guards.cs:41:17:41:25 | ... != ... |
+| not null | Guards.cs:41:17:41:38 | ... && ... |
+| not null | Guards.cs:41:30:41:38 | ... != ... |
+| not null | Guards.cs:42:14:42:20 | access to type Console |
+| not null | Guards.cs:42:14:42:37 | call to method WriteLine |
+| not null | Guards.cs:42:32:42:32 | access to parameter x |
+| not null | Guards.cs:42:32:42:36 | ... + ... |
+| not null | Guards.cs:42:36:42:36 | access to parameter y |
+| not null | Guards.cs:44:13:44:17 | this access |
+| not null | Guards.cs:44:13:44:25 | ... != ... |
+| not null | Guards.cs:45:13:45:19 | access to type Console |
+| not null | Guards.cs:45:13:45:49 | call to method WriteLine |
+| not null | Guards.cs:45:31:45:42 | object creation of type Guards |
+| not null | Guards.cs:47:13:47:17 | this access |
+| not null | Guards.cs:47:13:47:25 | ... != ... |
+| not null | Guards.cs:48:13:48:19 | access to type Console |
+| not null | Guards.cs:48:13:48:41 | call to method WriteLine |
+| not null | Guards.cs:48:31:48:34 | this access |
+| not null | Guards.cs:48:31:48:40 | access to field Field |
+| not null | Guards.cs:53:13:53:13 | access to parameter g |
+| not null | Guards.cs:53:13:53:27 | ... == ... |
+| not null | Guards.cs:55:9:55:15 | access to type Console |
+| not null | Guards.cs:55:9:55:34 | call to method WriteLine |
+| not null | Guards.cs:55:27:55:27 | access to parameter g |
+| not null | Guards.cs:55:27:55:33 | access to field Field |
+| not null | Guards.cs:60:13:60:13 | access to parameter g |
+| not null | Guards.cs:60:13:60:45 | ... == ... |
+| not null | Guards.cs:61:19:61:33 | object creation of type Exception |
+| not null | Guards.cs:62:9:62:15 | access to type Console |
+| not null | Guards.cs:62:9:62:52 | call to method WriteLine |
+| not null | Guards.cs:62:27:62:27 | access to parameter g |
+| not null | Guards.cs:62:27:62:36 | access to property Property |
+| not null | Guards.cs:62:27:62:45 | access to property Property |
+| not null | Guards.cs:62:27:62:51 | access to field Field |
+| not null | Guards.cs:63:9:63:15 | access to type Console |
+| not null | Guards.cs:63:9:63:43 | call to method WriteLine |
+| not null | Guards.cs:63:27:63:27 | access to parameter g |
+| not null | Guards.cs:63:27:63:36 | access to property Property |
+| not null | Guards.cs:68:16:68:24 | ... != ... |
+| not null | Guards.cs:70:13:70:19 | access to type Console |
+| not null | Guards.cs:70:13:70:32 | call to method WriteLine |
+| not null | Guards.cs:70:31:70:31 | access to parameter s |
+| not null | Guards.cs:71:13:71:13 | access to parameter s |
+| not null | Guards.cs:72:13:72:19 | access to type Console |
+| not null | Guards.cs:72:13:72:32 | call to method WriteLine |
+| not null | Guards.cs:78:13:78:26 | ... == ... |
+| not null | Guards.cs:78:26:78:26 | 0 |
+| not null | Guards.cs:78:26:78:26 | (...) ... |
+| not null | Guards.cs:79:13:79:19 | access to type Console |
+| not null | Guards.cs:79:13:79:32 | call to method WriteLine |
+| not null | Guards.cs:79:31:79:31 | access to parameter s |
+| not null | Guards.cs:80:13:80:25 | ... > ... |
+| not null | Guards.cs:80:25:80:25 | 0 |
+| not null | Guards.cs:80:25:80:25 | (...) ... |
+| not null | Guards.cs:81:13:81:19 | access to type Console |
+| not null | Guards.cs:81:13:81:32 | call to method WriteLine |
+| not null | Guards.cs:81:31:81:31 | access to parameter s |
+| not null | Guards.cs:82:13:82:26 | ... >= ... |
+| not null | Guards.cs:82:26:82:26 | 0 |
+| not null | Guards.cs:82:26:82:26 | (...) ... |
+| not null | Guards.cs:83:13:83:19 | access to type Console |
+| not null | Guards.cs:83:13:83:32 | call to method WriteLine |
+| not null | Guards.cs:83:31:83:31 | access to parameter s |
+| not null | Guards.cs:84:13:84:26 | ... < ... |
+| not null | Guards.cs:84:25:84:26 | 10 |
+| not null | Guards.cs:84:25:84:26 | (...) ... |
+| not null | Guards.cs:85:13:85:19 | access to type Console |
+| not null | Guards.cs:85:13:85:32 | call to method WriteLine |
+| not null | Guards.cs:85:31:85:31 | access to parameter s |
+| not null | Guards.cs:86:13:86:27 | ... <= ... |
+| not null | Guards.cs:86:26:86:27 | 10 |
+| not null | Guards.cs:86:26:86:27 | (...) ... |
+| not null | Guards.cs:87:13:87:19 | access to type Console |
+| not null | Guards.cs:87:13:87:32 | call to method WriteLine |
+| not null | Guards.cs:87:31:87:31 | access to parameter s |
+| not null | Guards.cs:88:13:88:29 | ... != ... |
+| not null | Guards.cs:89:13:89:19 | access to type Console |
+| not null | Guards.cs:89:13:89:32 | call to method WriteLine |
+| not null | Guards.cs:89:31:89:31 | access to parameter s |
+| not null | Guards.cs:91:13:91:19 | access to type Console |
+| not null | Guards.cs:91:13:91:32 | call to method WriteLine |
+| not null | Guards.cs:92:13:92:30 | ... != ... |
+| not null | Guards.cs:92:25:92:25 | 1 |
+| not null | Guards.cs:92:25:92:25 | (...) ... |
+| not null | Guards.cs:92:30:92:30 | 0 |
+| not null | Guards.cs:92:30:92:30 | (...) ... |
+| not null | Guards.cs:93:13:93:19 | access to type Console |
+| not null | Guards.cs:93:13:93:32 | call to method WriteLine |
+| not null | Guards.cs:95:13:95:19 | access to type Console |
+| not null | Guards.cs:95:13:95:32 | call to method WriteLine |
+| not null | Guards.cs:95:31:95:31 | access to parameter s |
+| not null | Guards.cs:96:13:96:19 | ... == ... |
+| not null | Guards.cs:96:18:96:19 | "" |
+| not null | Guards.cs:97:13:97:19 | access to type Console |
+| not null | Guards.cs:97:13:97:32 | call to method WriteLine |
+| not null | Guards.cs:97:31:97:31 | access to parameter s |
+| not null | Guards.cs:99:13:99:19 | access to type Console |
+| not null | Guards.cs:99:13:99:32 | call to method WriteLine |
+| not null | Guards.cs:104:13:104:13 | access to parameter g |
+| not null | Guards.cs:104:13:104:45 | ... == ... |
+| not null | Guards.cs:105:19:105:33 | object creation of type Exception |
+| not null | Guards.cs:106:9:106:9 | access to parameter g |
+| not null | Guards.cs:106:9:106:18 | access to property Property |
+| not null | Guards.cs:107:9:107:15 | access to type Console |
+| not null | Guards.cs:107:9:107:52 | call to method WriteLine |
+| not null | Guards.cs:107:27:107:27 | access to parameter g |
+| not null | Guards.cs:108:9:108:15 | access to type Console |
+| not null | Guards.cs:108:9:108:43 | call to method WriteLine |
+| not null | Guards.cs:108:27:108:27 | access to parameter g |
+| not null | Guards.cs:108:27:108:36 | access to property Property |
+| not null | Guards.cs:113:21:113:21 | access to parameter g |
+| not null | Guards.cs:114:14:114:14 | access to parameter g |
+| not null | Guards.cs:114:14:114:23 | access to property Property |
+| not null | Guards.cs:114:14:114:32 | access to property Property |
+| not null | Guards.cs:115:9:115:55 | ... = ... |
+| not null | Guards.cs:115:17:115:17 | access to parameter g |
+| not null | Guards.cs:115:17:115:26 | access to property Property |
+| not null | Guards.cs:115:17:115:35 | access to property Property |
+| not null | Guards.cs:115:17:115:55 | ... ?? ... |
+| not null | Guards.cs:115:46:115:55 | throw ... |
+| not null | Guards.cs:116:9:116:15 | access to type Console |
+| not null | Guards.cs:116:9:116:52 | call to method WriteLine |
+| not null | Guards.cs:116:27:116:27 | access to parameter g |
+| not null | Guards.cs:116:27:116:36 | access to property Property |
+| not null | Guards.cs:116:27:116:45 | access to property Property |
+| not null | Guards.cs:116:27:116:51 | access to field Field |
+| not null | Guards.cs:117:9:117:9 | access to parameter g |
+| not null | Guards.cs:117:9:117:18 | access to property Property |
+| not null | Guards.cs:118:9:118:15 | access to type Console |
+| not null | Guards.cs:118:9:118:52 | call to method WriteLine |
+| not null | Guards.cs:118:27:118:27 | access to parameter g |
+| not null | Guards.cs:119:9:119:15 | access to type Console |
+| not null | Guards.cs:119:9:119:43 | call to method WriteLine |
+| not null | Guards.cs:119:27:119:27 | access to parameter g |
+| not null | Guards.cs:119:27:119:36 | access to property Property |
+| not null | Guards.cs:124:13:124:14 | access to local variable b1 |
+| not null | Guards.cs:124:13:124:30 | Boolean b1 = ... |
+| not null | Guards.cs:124:18:124:30 | call to method Equals |
+| not null | Guards.cs:125:18:125:19 | access to parameter s1 |
+| not null | Guards.cs:125:29:125:30 | access to parameter s1 |
+| not null | Guards.cs:130:13:130:21 | ... is ... |
+| not null | Guards.cs:131:20:131:27 | access to property Length |
+| not null | Guards.cs:132:16:132:16 | access to parameter s |
+| not null | Guards.cs:132:16:132:23 | access to property Length |
+| not null | Guards.cs:137:13:137:25 | ... is ... |
+| not null | Guards.cs:137:18:137:23 | access to type String |
+| not null | Guards.cs:138:20:138:20 | access to parameter s |
+| not null | Guards.cs:138:20:138:27 | access to property Length |
+| not null | Guards.cs:139:16:139:23 | access to property Length |
+| not null | Guards.cs:144:13:144:25 | ... is ... |
+| not null | Guards.cs:145:20:145:20 | access to local variable s |
+| not null | Guards.cs:153:18:153:31 | access to type Action<Object> |
+| not null | Guards.cs:154:24:154:24 | access to parameter o |
+| not null | Guards.cs:156:24:156:24 | access to local variable a |
+| not null | Guards.cs:157:18:157:19 | "" |
+| not null | Guards.cs:158:24:158:24 | access to parameter o |
+| not null | Guards.cs:159:18:159:21 | null |
+| not null | Guards.cs:162:24:162:24 | access to parameter o |
+| not null | Guards.cs:168:13:168:41 | !... |
+| not null | Guards.cs:168:14:168:19 | access to type String |
+| not null | Guards.cs:168:14:168:41 | call to method IsNullOrWhiteSpace |
+| not null | Guards.cs:169:13:169:19 | access to type Console |
+| not null | Guards.cs:169:13:169:32 | call to method WriteLine |
+| not null | Guards.cs:169:31:169:31 | access to parameter x |
+| not null | Guards.cs:172:34:172:42 | ... == ... |
+| not null | Guards.cs:176:13:176:21 | ... is ... |
+| not null | Guards.cs:177:20:177:23 | true |
+| not null | Guards.cs:178:16:178:20 | false |
+| not null | Guards.cs:181:34:181:42 | ... == ... |
+| not null | Guards.cs:181:34:181:57 | ... ? ... : ... |
+| not null | Guards.cs:181:46:181:49 | true |
+| not null | Guards.cs:181:53:181:57 | false |
+| not null | Guards.cs:183:37:183:49 | !... |
+| not null | Guards.cs:183:38:183:49 | call to method NullTest3 |
+| not null | Guards.cs:183:38:183:49 | this access |
+| not null | Guards.cs:185:38:185:46 | ... == ... |
+| not null | Guards.cs:185:38:185:60 | ... ? ... : ... |
+| not null | Guards.cs:185:50:185:53 | true |
+| not null | Guards.cs:185:57:185:60 | true |
+| not null | Guards.cs:189:13:189:25 | !... |
+| not null | Guards.cs:189:14:189:25 | call to method NullTest1 |
+| not null | Guards.cs:189:14:189:25 | this access |
+| not null | Guards.cs:190:13:190:19 | access to type Console |
+| not null | Guards.cs:190:13:190:32 | call to method WriteLine |
+| not null | Guards.cs:191:13:191:25 | !... |
+| not null | Guards.cs:191:14:191:25 | call to method NullTest2 |
+| not null | Guards.cs:191:14:191:25 | this access |
+| not null | Guards.cs:192:13:192:19 | access to type Console |
+| not null | Guards.cs:192:13:192:32 | call to method WriteLine |
+| not null | Guards.cs:193:13:193:25 | !... |
+| not null | Guards.cs:193:14:193:25 | call to method NullTest3 |
+| not null | Guards.cs:193:14:193:25 | this access |
+| not null | Guards.cs:194:13:194:19 | access to type Console |
+| not null | Guards.cs:194:13:194:32 | call to method WriteLine |
+| not null | Guards.cs:195:13:195:27 | call to method NotNullTest4 |
+| not null | Guards.cs:195:13:195:27 | this access |
+| not null | Guards.cs:196:13:196:19 | access to type Console |
+| not null | Guards.cs:196:13:196:32 | call to method WriteLine |
+| not null | Guards.cs:197:13:197:29 | !... |
+| not null | Guards.cs:197:14:197:29 | call to method NullTestWrong |
+| not null | Guards.cs:197:14:197:29 | this access |
+| not null | Guards.cs:198:13:198:19 | access to type Console |
+| not null | Guards.cs:198:13:198:32 | call to method WriteLine |
+| not null | Guards.cs:203:13:203:21 | ... != ... |
+| not null | Guards.cs:205:13:205:13 | access to parameter o |
+| not null | Guards.cs:206:33:206:36 | access to parameter args |
+| not null | Guards.cs:208:17:208:17 | access to parameter o |
+| not null | Guards.cs:215:13:215:14 | access to local variable b2 |
+| not null | Guards.cs:215:13:215:21 | Boolean b2 = ... |
+| not null | Guards.cs:215:18:215:21 | true |
+| not null | Guards.cs:216:13:216:14 | access to parameter b1 |
+| not null | Guards.cs:217:13:217:14 | access to local variable b2 |
+| not null | Guards.cs:217:13:217:22 | ... = ... |
+| not null | Guards.cs:217:18:217:22 | false |
+| not null | Guards.cs:218:17:218:18 | access to local variable b2 |
+| not null | Guards.cs:220:18:220:21 | true |
+| not null | Guards.cs:228:13:228:14 | access to local variable b2 |
+| not null | Guards.cs:228:13:228:22 | Boolean b2 = ... |
+| not null | Guards.cs:228:18:228:22 | false |
+| not null | Guards.cs:229:13:229:14 | access to parameter b1 |
+| not null | Guards.cs:230:13:230:14 | access to local variable b2 |
+| not null | Guards.cs:230:13:230:21 | ... = ... |
+| not null | Guards.cs:230:18:230:21 | true |
+| not null | Guards.cs:231:17:231:18 | access to local variable b2 |
+| not null | Guards.cs:233:18:233:21 | true |
+| not null | Guards.cs:241:13:241:13 | access to local variable i |
+| not null | Guards.cs:241:13:241:17 | Int32 i = ... |
+| not null | Guards.cs:241:17:241:17 | 0 |
+| not null | Guards.cs:242:13:242:13 | access to parameter b |
+| not null | Guards.cs:243:13:243:13 | access to local variable i |
+| not null | Guards.cs:243:13:243:17 | ... = ... |
+| not null | Guards.cs:243:17:243:17 | 1 |
+| not null | Guards.cs:244:17:244:17 | access to local variable i |
+| not null | Guards.cs:246:18:246:18 | 1 |
+| not null | Guards.cs:255:13:255:13 | access to local variable e |
+| not null | Guards.cs:255:13:255:19 | E e = ... |
+| not null | Guards.cs:255:17:255:17 | access to type E |
+| not null | Guards.cs:255:17:255:19 | access to constant A |
+| not null | Guards.cs:256:13:256:13 | access to parameter b |
+| not null | Guards.cs:257:13:257:13 | access to local variable e |
+| not null | Guards.cs:257:13:257:19 | ... = ... |
+| not null | Guards.cs:257:17:257:17 | access to type E |
+| not null | Guards.cs:257:17:257:19 | access to constant B |
+| not null | Guards.cs:258:17:258:17 | access to local variable e |
+| not null | Guards.cs:260:18:260:18 | access to type E |
+| not null | Guards.cs:260:18:260:20 | access to constant B |
+| not null | Guards.cs:268:13:268:41 | call to operator == |
+| not null | Guards.cs:268:30:268:41 | call to method GetType |
+| not null | Guards.cs:269:13:269:14 | access to parameter o1 |
+| not null | Guards.cs:270:13:270:42 | call to operator == |
+| not null | Guards.cs:270:30:270:31 | access to parameter o2 |
+| not null | Guards.cs:278:13:278:26 | access to type Action<Object> |
+| not null | Guards.cs:279:17:279:17 | access to parameter o |
+| not null | Guards.cs:281:17:281:17 | access to local variable a |
+| not null | Guards.cs:282:13:282:14 | "" |
+| not null | Guards.cs:283:17:283:17 | access to parameter o |
+| not null | Guards.cs:287:17:287:17 | access to parameter o |
+| not null | Guards.cs:293:13:293:14 | access to local variable b2 |
+| not null | Guards.cs:293:13:293:21 | Boolean b2 = ... |
+| not null | Guards.cs:293:18:293:21 | true |
+| not null | Guards.cs:294:13:294:14 | access to parameter b1 |
+| not null | Guards.cs:295:13:295:14 | access to local variable b2 |
+| not null | Guards.cs:295:13:295:22 | ... = ... |
+| not null | Guards.cs:295:18:295:22 | false |
+| not null | Guards.cs:296:16:296:17 | access to local variable b2 |
+| not null | Guards.cs:296:16:300:9 | ... switch { ... } |
+| not null | Guards.cs:298:13:298:16 | true |
+| not null | Guards.cs:298:13:298:21 | ... => ... |
+| not null | Guards.cs:298:21:298:21 | 0 |
+| not null | Guards.cs:299:13:299:13 | _ |
+| not null | Guards.cs:299:13:299:18 | ... => ... |
+| not null | Guards.cs:299:18:299:18 | 1 |
+| not null | Guards.cs:305:13:305:14 | access to local variable b2 |
+| not null | Guards.cs:305:13:305:22 | Boolean b2 = ... |
+| not null | Guards.cs:305:18:305:22 | false |
+| not null | Guards.cs:306:13:306:14 | access to parameter b1 |
+| not null | Guards.cs:307:13:307:14 | access to local variable b2 |
+| not null | Guards.cs:307:13:307:21 | ... = ... |
+| not null | Guards.cs:307:18:307:21 | true |
+| not null | Guards.cs:308:16:308:17 | access to local variable b2 |
+| not null | Guards.cs:308:16:312:9 | ... switch { ... } |
+| not null | Guards.cs:310:13:310:16 | true |
+| not null | Guards.cs:310:13:310:21 | ... => ... |
+| not null | Guards.cs:310:21:310:21 | 0 |
+| not null | Guards.cs:311:13:311:13 | _ |
+| not null | Guards.cs:311:13:311:18 | ... => ... |
+| not null | Guards.cs:311:18:311:18 | 1 |
+| not null | Guards.cs:317:13:317:13 | access to local variable i |
+| not null | Guards.cs:317:13:317:17 | Int32 i = ... |
+| not null | Guards.cs:317:17:317:17 | 0 |
+| not null | Guards.cs:318:13:318:13 | access to parameter b |
+| not null | Guards.cs:319:13:319:13 | access to local variable i |
+| not null | Guards.cs:319:13:319:17 | ... = ... |
+| not null | Guards.cs:319:17:319:17 | 1 |
+| not null | Guards.cs:320:16:320:16 | access to local variable i |
+| not null | Guards.cs:320:16:324:9 | ... switch { ... } |
+| not null | Guards.cs:322:13:322:13 | 1 |
+| not null | Guards.cs:322:13:322:18 | ... => ... |
+| not null | Guards.cs:322:18:322:18 | 0 |
+| not null | Guards.cs:323:13:323:13 | _ |
+| not null | Guards.cs:323:13:323:18 | ... => ... |
+| not null | Guards.cs:323:18:323:18 | 1 |
+| not null | Guards.cs:329:13:329:13 | access to local variable e |
+| not null | Guards.cs:329:13:329:19 | E e = ... |
+| not null | Guards.cs:329:17:329:17 | access to type E |
+| not null | Guards.cs:329:17:329:19 | access to constant A |
+| not null | Guards.cs:330:13:330:13 | access to parameter b |
+| not null | Guards.cs:331:13:331:13 | access to local variable e |
+| not null | Guards.cs:331:13:331:19 | ... = ... |
+| not null | Guards.cs:331:17:331:17 | access to type E |
+| not null | Guards.cs:331:17:331:19 | access to constant B |
+| not null | Guards.cs:332:16:332:16 | access to local variable e |
+| not null | Guards.cs:332:16:336:9 | ... switch { ... } |
+| not null | Guards.cs:334:13:334:13 | access to type E |
+| not null | Guards.cs:334:13:334:15 | access to constant B |
+| not null | Guards.cs:334:13:334:20 | ... => ... |
+| not null | Guards.cs:334:20:334:20 | 0 |
+| not null | Guards.cs:335:13:335:13 | _ |
+| not null | Guards.cs:335:13:335:18 | ... => ... |
+| not null | Guards.cs:335:18:335:18 | 1 |
+| not null | Guards.cs:341:20:341:20 | access to parameter b |
+| not null | Guards.cs:341:31:341:32 | "" |
+| not null | Guards.cs:342:13:342:21 | ... != ... |
+| not null | Guards.cs:342:13:342:27 | ... && ... |
+| not null | Guards.cs:342:26:342:27 | !... |
+| not null | Guards.cs:342:27:342:27 | access to parameter b |
+| not null | Guards.cs:343:13:343:19 | access to type Console |
+| not null | Guards.cs:343:13:343:39 | call to method WriteLine |
+| not null | Guards.cs:343:31:343:31 | access to local variable s |
+| not null | Guards.cs:343:31:343:38 | access to property Length |
+| not null | Guards.cs:348:13:348:25 | ... is ... |
+| not null | Guards.cs:349:13:349:13 | access to parameter o |
 | null | Assert.cs:9:24:9:27 | null |
 | null | Assert.cs:10:27:10:30 | null |
 | null | Assert.cs:16:24:16:27 | null |
+| null | Assert.cs:18:27:18:27 | access to local variable s |
 | null | Assert.cs:23:24:23:27 | null |
 | null | Assert.cs:30:24:30:27 | null |
 | null | Assert.cs:31:28:31:31 | null |
+| null | Assert.cs:32:27:32:27 | access to local variable s |
 | null | Assert.cs:37:24:37:27 | null |
 | null | Assert.cs:38:28:38:31 | null |
 | null | Assert.cs:44:24:44:27 | null |
 | null | Assert.cs:45:29:45:32 | null |
+| null | Assert.cs:46:27:46:27 | access to local variable s |
 | null | Assert.cs:51:24:51:27 | null |
 | null | Assert.cs:52:29:52:32 | null |
 | null | Assert.cs:58:24:58:27 | null |
@@ -415,8 +897,10 @@ abstractValue
 | null | Assert.cs:66:29:66:32 | null |
 | null | Assert.cs:72:24:72:27 | null |
 | null | Assert.cs:73:28:73:31 | null |
+| null | Assert.cs:74:27:74:27 | access to local variable s |
 | null | Assert.cs:79:24:79:27 | null |
 | null | Assert.cs:80:29:80:32 | null |
+| null | Assert.cs:81:27:81:27 | access to local variable s |
 | null | Guards.cs:10:21:10:24 | null |
 | null | Guards.cs:24:18:24:21 | null |
 | null | Guards.cs:32:47:32:50 | null |
@@ -435,98 +919,48 @@ abstractValue
 | null | Guards.cs:71:17:71:20 | null |
 | null | Guards.cs:72:31:72:31 | access to parameter s |
 | null | Guards.cs:88:26:88:29 | null |
+| null | Guards.cs:91:31:91:31 | access to parameter s |
 | null | Guards.cs:104:42:104:45 | null |
 | null | Guards.cs:106:9:106:25 | ... = ... |
 | null | Guards.cs:106:22:106:25 | null |
+| null | Guards.cs:107:27:107:36 | access to property Property |
+| null | Guards.cs:108:27:108:36 | access to property Property |
 | null | Guards.cs:115:52:115:55 | null |
 | null | Guards.cs:117:9:117:25 | ... = ... |
 | null | Guards.cs:117:22:117:25 | null |
+| null | Guards.cs:118:27:118:36 | access to property Property |
+| null | Guards.cs:119:27:119:36 | access to property Property |
+| null | Guards.cs:130:18:130:21 | null |
+| null | Guards.cs:131:20:131:20 | access to parameter s |
+| null | Guards.cs:139:16:139:16 | access to parameter s |
+| null | Guards.cs:159:18:159:21 | null |
+| null | Guards.cs:160:24:160:24 | access to parameter o |
 | null | Guards.cs:172:39:172:42 | null |
+| null | Guards.cs:176:18:176:21 | null |
 | null | Guards.cs:181:39:181:42 | null |
 | null | Guards.cs:185:43:185:46 | null |
 | null | Guards.cs:203:18:203:21 | null |
+| null | Guards.cs:284:13:284:16 | null |
+| null | Guards.cs:285:17:285:17 | access to parameter o |
 | null | Guards.cs:341:24:341:27 | null |
 | null | Guards.cs:342:18:342:21 | null |
-| null | Splitting.cs:12:22:12:25 | null |
-| null | Splitting.cs:22:22:22:25 | null |
-| null | Splitting.cs:32:22:32:25 | null |
-| null | Splitting.cs:41:18:41:21 | null |
-| null | Splitting.cs:54:18:54:21 | null |
-| null | Splitting.cs:65:18:65:21 | null |
-| null | Splitting.cs:76:18:76:21 | null |
-| null | Splitting.cs:87:31:87:34 | null |
-| null | Splitting.cs:97:31:97:34 | null |
-| null | Splitting.cs:105:27:105:30 | null |
-| null | Splitting.cs:116:27:116:30 | null |
-| null | Splitting.cs:125:21:125:24 | null |
-| null | Splitting.cs:129:22:129:25 | null |
+| null | Guards.cs:348:22:348:25 | null |
+| true | Assert.cs:73:36:73:36 | access to parameter b |
+| true | Assert.cs:80:37:80:37 | access to parameter b |
 | true | Assert.cs:86:61:86:64 | true |
+| true | Assert.cs:94:16:94:17 | access to parameter b1 |
 | true | Guards.cs:177:20:177:23 | true |
 | true | Guards.cs:181:46:181:49 | true |
+| true | Guards.cs:185:38:185:60 | ... ? ... : ... |
 | true | Guards.cs:185:50:185:53 | true |
 | true | Guards.cs:185:57:185:60 | true |
 | true | Guards.cs:215:18:215:21 | true |
 | true | Guards.cs:220:18:220:21 | true |
+| true | Guards.cs:230:13:230:21 | ... = ... |
 | true | Guards.cs:230:18:230:21 | true |
 | true | Guards.cs:233:18:233:21 | true |
 | true | Guards.cs:293:18:293:21 | true |
 | true | Guards.cs:298:13:298:16 | true |
+| true | Guards.cs:307:13:307:21 | ... = ... |
 | true | Guards.cs:307:18:307:21 | true |
 | true | Guards.cs:310:13:310:16 | true |
-dualValue
-| empty | non-empty |
-| false | true |
-| match 1 | non-match 1 |
-| match 1 | non-match 1 |
-| match "" | non-match "" |
-| match "" | non-match "" |
-| match Action<String> a | non-match Action<String> a |
-| match Action<String> a | non-match Action<String> a |
-| match _ | non-match _ |
-| match _ | non-match _ |
-| match _ | non-match _ |
-| match _ | non-match _ |
-| match _ | non-match _ |
-| match access to constant B | non-match access to constant B |
-| match access to constant B | non-match access to constant B |
-| match access to type Action<Object> | non-match access to type Action<Object> |
-| match access to type Action<Object> | non-match access to type Action<Object> |
-| match null | non-match null |
-| match null | non-match null |
-| match true | non-match true |
-| match true | non-match true |
-| match true | non-match true |
-| match true | non-match true |
-| non-empty | empty |
-| non-match 1 | match 1 |
-| non-match 1 | match 1 |
-| non-match "" | match "" |
-| non-match "" | match "" |
-| non-match Action<String> a | match Action<String> a |
-| non-match Action<String> a | match Action<String> a |
-| non-match _ | match _ |
-| non-match _ | match _ |
-| non-match _ | match _ |
-| non-match _ | match _ |
-| non-match _ | match _ |
-| non-match access to constant B | match access to constant B |
-| non-match access to constant B | match access to constant B |
-| non-match access to type Action<Object> | match access to type Action<Object> |
-| non-match access to type Action<Object> | match access to type Action<Object> |
-| non-match null | match null |
-| non-match null | match null |
-| non-match true | match true |
-| non-match true | match true |
-| non-match true | match true |
-| non-match true | match true |
-| non-null | null |
-| null | non-null |
-| true | false |
-singletonValue
-| 0 |
-| 1 |
-| 3 |
-| 10 |
-| false |
-| null |
-| true |
diff --git a/csharp/ql/test/library-tests/controlflow/guards/AbstractValue.ql b/csharp/ql/test/library-tests/controlflow/guards/AbstractValue.ql
index e433004e3d5..8d86e312cb4 100644
--- a/csharp/ql/test/library-tests/controlflow/guards/AbstractValue.ql
+++ b/csharp/ql/test/library-tests/controlflow/guards/AbstractValue.ql
@@ -1,12 +1,6 @@
 import csharp
 private import semmle.code.csharp.controlflow.Guards
 
-query predicate abstractValue(AbstractValue value, Expr e) {
-  e = value.getAnExpr() and e.fromSource()
-}
-
-query predicate dualValue(AbstractValue value, AbstractValue dual) { dual = value.getDualValue() }
-
-query predicate singletonValue(AbstractValue value) {
-  value.isSingleton() and value.getAnExpr().fromSource()
+query predicate abstractValue(GuardValue value, Expr e) {
+  Guards::InternalUtil::exprHasValue(e, value) and e.fromSource()
 }
diff --git a/csharp/ql/test/library-tests/controlflow/guards/BooleanGuardedExpr.expected b/csharp/ql/test/library-tests/controlflow/guards/BooleanGuardedExpr.expected
index 67150b178dc..649e8362370 100644
--- a/csharp/ql/test/library-tests/controlflow/guards/BooleanGuardedExpr.expected
+++ b/csharp/ql/test/library-tests/controlflow/guards/BooleanGuardedExpr.expected
@@ -69,25 +69,17 @@
 | Guards.cs:208:17:208:17 | access to parameter o | Guards.cs:203:13:203:21 | ... != ... | Guards.cs:203:13:203:13 | access to parameter o | true |
 | Guards.cs:269:13:269:14 | access to parameter o1 | Guards.cs:268:13:268:41 | call to operator == | Guards.cs:268:13:268:14 | access to parameter o1 | true |
 | Guards.cs:271:13:271:14 | access to parameter o1 | Guards.cs:270:13:270:42 | call to operator == | Guards.cs:270:13:270:14 | access to parameter o1 | true |
+| Guards.cs:279:17:279:17 | access to parameter o | Guards.cs:278:13:279:28 | ... => ... | Guards.cs:279:17:279:17 | access to parameter o | true |
+| Guards.cs:281:17:281:17 | access to local variable a | Guards.cs:280:13:281:28 | ... => ... | Guards.cs:281:17:281:17 | access to local variable a | true |
+| Guards.cs:283:17:283:17 | access to parameter o | Guards.cs:278:13:279:28 | ... => ... | Guards.cs:279:17:279:17 | access to parameter o | false |
+| Guards.cs:283:17:283:17 | access to parameter o | Guards.cs:282:13:283:28 | ... => ... | Guards.cs:283:17:283:17 | access to parameter o | true |
+| Guards.cs:285:17:285:17 | access to parameter o | Guards.cs:278:13:279:28 | ... => ... | Guards.cs:279:17:279:17 | access to parameter o | false |
+| Guards.cs:285:17:285:17 | access to parameter o | Guards.cs:282:13:283:28 | ... => ... | Guards.cs:283:17:283:17 | access to parameter o | false |
+| Guards.cs:285:17:285:17 | access to parameter o | Guards.cs:284:13:285:28 | ... => ... | Guards.cs:285:17:285:17 | access to parameter o | true |
+| Guards.cs:287:17:287:17 | access to parameter o | Guards.cs:278:13:279:28 | ... => ... | Guards.cs:279:17:279:17 | access to parameter o | false |
+| Guards.cs:287:17:287:17 | access to parameter o | Guards.cs:282:13:283:28 | ... => ... | Guards.cs:283:17:283:17 | access to parameter o | false |
+| Guards.cs:287:17:287:17 | access to parameter o | Guards.cs:284:13:285:28 | ... => ... | Guards.cs:285:17:285:17 | access to parameter o | false |
+| Guards.cs:287:17:287:17 | access to parameter o | Guards.cs:286:13:287:28 | ... => ... | Guards.cs:287:17:287:17 | access to parameter o | true |
 | Guards.cs:342:27:342:27 | access to parameter b | Guards.cs:341:20:341:20 | access to parameter b | Guards.cs:341:20:341:20 | access to parameter b | false |
 | Guards.cs:343:31:343:31 | access to local variable s | Guards.cs:342:13:342:21 | ... != ... | Guards.cs:342:13:342:13 | access to local variable s | true |
 | Guards.cs:349:13:349:13 | access to parameter o | Guards.cs:348:13:348:25 | ... is ... | Guards.cs:348:13:348:13 | access to parameter o | true |
-| Splitting.cs:13:17:13:17 | access to parameter o | Splitting.cs:12:17:12:25 | ... != ... | Splitting.cs:12:17:12:17 | access to parameter o | true |
-| Splitting.cs:23:24:23:24 | access to parameter o | Splitting.cs:22:17:22:25 | ... != ... | Splitting.cs:22:17:22:17 | access to parameter o | true |
-| Splitting.cs:25:13:25:13 | access to parameter o | Splitting.cs:22:17:22:25 | ... != ... | Splitting.cs:22:17:22:17 | access to parameter o | false |
-| Splitting.cs:35:13:35:13 | access to parameter o | Splitting.cs:32:17:32:25 | ... == ... | Splitting.cs:32:17:32:17 | access to parameter o | false |
-| Splitting.cs:44:17:44:17 | access to parameter o | Splitting.cs:41:13:41:21 | ... != ... | Splitting.cs:41:13:41:13 | access to parameter o | true |
-| Splitting.cs:46:17:46:17 | access to parameter o | Splitting.cs:41:13:41:21 | ... != ... | Splitting.cs:41:13:41:13 | access to parameter o | true |
-| Splitting.cs:55:13:55:13 | access to parameter o | Splitting.cs:54:13:54:21 | ... != ... | Splitting.cs:54:13:54:13 | access to parameter o | true |
-| Splitting.cs:66:20:66:20 | access to parameter o | Splitting.cs:65:13:65:21 | ... != ... | Splitting.cs:65:13:65:13 | access to parameter o | true |
-| Splitting.cs:68:13:68:13 | access to parameter o | Splitting.cs:65:13:65:21 | ... != ... | Splitting.cs:65:13:65:13 | access to parameter o | false |
-| Splitting.cs:69:16:69:16 | access to parameter o | Splitting.cs:65:13:65:21 | ... != ... | Splitting.cs:65:13:65:13 | access to parameter o | false |
-| Splitting.cs:78:24:78:24 | access to parameter o | Splitting.cs:76:13:76:21 | ... != ... | Splitting.cs:76:13:76:13 | access to parameter o | true |
-| Splitting.cs:90:13:90:13 | access to parameter o | Splitting.cs:87:26:87:34 | ... != ... | Splitting.cs:87:26:87:26 | access to parameter o | true |
-| Splitting.cs:99:13:99:13 | access to parameter o | Splitting.cs:97:26:97:34 | ... == ... | Splitting.cs:97:26:97:26 | access to parameter o | true |
-| Splitting.cs:107:13:107:13 | access to parameter o | Splitting.cs:105:22:105:30 | ... != ... | Splitting.cs:105:22:105:22 | access to parameter o | true |
-| Splitting.cs:109:13:109:13 | access to parameter o | Splitting.cs:105:22:105:30 | ... != ... | Splitting.cs:105:22:105:22 | access to parameter o | true |
-| Splitting.cs:117:9:117:9 | access to parameter o | Splitting.cs:116:22:116:30 | ... != ... | Splitting.cs:116:22:116:22 | access to parameter o | true |
-| Splitting.cs:119:13:119:13 | access to parameter o | Splitting.cs:116:22:116:30 | ... != ... | Splitting.cs:116:22:116:22 | access to parameter o | true |
-| Splitting.cs:120:16:120:16 | access to parameter o | Splitting.cs:116:22:116:30 | ... != ... | Splitting.cs:116:22:116:22 | access to parameter o | true |
-| Splitting.cs:133:25:133:25 | access to parameter b | Splitting.cs:131:21:131:21 | access to parameter b | Splitting.cs:131:21:131:21 | access to parameter b | false |
diff --git a/csharp/ql/test/library-tests/controlflow/guards/Collections.ql b/csharp/ql/test/library-tests/controlflow/guards/Collections.ql
index 1d5d3ad5a6e..578a08de307 100644
--- a/csharp/ql/test/library-tests/controlflow/guards/Collections.ql
+++ b/csharp/ql/test/library-tests/controlflow/guards/Collections.ql
@@ -2,7 +2,7 @@ import csharp
 private import semmle.code.csharp.controlflow.Guards
 
 query predicate emptinessCheck(
-  Expr check, EnumerableCollectionExpr collection, AbstractValue v, boolean isEmpty
+  Expr check, EnumerableCollectionExpr collection, GuardValue v, boolean isEmpty
 ) {
   check = collection.getAnEmptinessCheck(v, isEmpty)
 }
diff --git a/csharp/ql/test/library-tests/controlflow/guards/GuardedControlFlowNode.expected b/csharp/ql/test/library-tests/controlflow/guards/GuardedControlFlowNode.expected
index 506f9e1f04c..b34cae88b80 100644
--- a/csharp/ql/test/library-tests/controlflow/guards/GuardedControlFlowNode.expected
+++ b/csharp/ql/test/library-tests/controlflow/guards/GuardedControlFlowNode.expected
@@ -1,280 +1,212 @@
-| Assert.cs:11:27:11:27 | access to local variable s | Assert.cs:10:22:10:22 | access to local variable s | Assert.cs:10:22:10:22 | access to local variable s | non-null |
+| Assert.cs:11:27:11:27 | access to local variable s | Assert.cs:10:9:10:31 | call to method Assert | Assert.cs:10:22:10:22 | access to local variable s | no exception |
+| Assert.cs:11:27:11:27 | access to local variable s | Assert.cs:10:22:10:22 | access to local variable s | Assert.cs:10:22:10:22 | access to local variable s | not null |
 | Assert.cs:11:27:11:27 | access to local variable s | Assert.cs:10:22:10:30 | ... != ... | Assert.cs:10:22:10:22 | access to local variable s | true |
+| Assert.cs:18:27:18:27 | access to local variable s | Assert.cs:17:9:17:24 | call to method IsNull | Assert.cs:17:23:17:23 | access to local variable s | no exception |
 | Assert.cs:18:27:18:27 | access to local variable s | Assert.cs:17:23:17:23 | access to local variable s | Assert.cs:17:23:17:23 | access to local variable s | null |
-| Assert.cs:25:27:25:27 | access to local variable s | Assert.cs:24:26:24:26 | access to local variable s | Assert.cs:24:26:24:26 | access to local variable s | non-null |
+| Assert.cs:25:27:25:27 | access to local variable s | Assert.cs:24:9:24:27 | call to method IsNotNull | Assert.cs:24:26:24:26 | access to local variable s | no exception |
+| Assert.cs:25:27:25:27 | access to local variable s | Assert.cs:24:26:24:26 | access to local variable s | Assert.cs:24:26:24:26 | access to local variable s | not null |
+| Assert.cs:32:27:32:27 | access to local variable s | Assert.cs:31:9:31:32 | call to method IsTrue | Assert.cs:31:23:31:23 | access to local variable s | no exception |
 | Assert.cs:32:27:32:27 | access to local variable s | Assert.cs:31:23:31:23 | access to local variable s | Assert.cs:31:23:31:23 | access to local variable s | null |
 | Assert.cs:32:27:32:27 | access to local variable s | Assert.cs:31:23:31:31 | ... == ... | Assert.cs:31:23:31:23 | access to local variable s | true |
-| Assert.cs:39:27:39:27 | access to local variable s | Assert.cs:38:23:38:23 | access to local variable s | Assert.cs:38:23:38:23 | access to local variable s | non-null |
+| Assert.cs:39:27:39:27 | access to local variable s | Assert.cs:38:9:38:32 | call to method IsTrue | Assert.cs:38:23:38:23 | access to local variable s | no exception |
+| Assert.cs:39:27:39:27 | access to local variable s | Assert.cs:38:23:38:23 | access to local variable s | Assert.cs:38:23:38:23 | access to local variable s | not null |
 | Assert.cs:39:27:39:27 | access to local variable s | Assert.cs:38:23:38:31 | ... != ... | Assert.cs:38:23:38:23 | access to local variable s | true |
+| Assert.cs:46:27:46:27 | access to local variable s | Assert.cs:45:9:45:33 | call to method IsFalse | Assert.cs:45:24:45:24 | access to local variable s | no exception |
 | Assert.cs:46:27:46:27 | access to local variable s | Assert.cs:45:24:45:24 | access to local variable s | Assert.cs:45:24:45:24 | access to local variable s | null |
 | Assert.cs:46:27:46:27 | access to local variable s | Assert.cs:45:24:45:32 | ... != ... | Assert.cs:45:24:45:24 | access to local variable s | false |
-| Assert.cs:53:27:53:27 | access to local variable s | Assert.cs:52:24:52:24 | access to local variable s | Assert.cs:52:24:52:24 | access to local variable s | non-null |
+| Assert.cs:53:27:53:27 | access to local variable s | Assert.cs:52:9:52:33 | call to method IsFalse | Assert.cs:52:24:52:24 | access to local variable s | no exception |
+| Assert.cs:53:27:53:27 | access to local variable s | Assert.cs:52:24:52:24 | access to local variable s | Assert.cs:52:24:52:24 | access to local variable s | not null |
 | Assert.cs:53:27:53:27 | access to local variable s | Assert.cs:52:24:52:32 | ... == ... | Assert.cs:52:24:52:24 | access to local variable s | false |
-| Assert.cs:59:36:59:36 | [b (line 56): false] access to parameter b | Assert.cs:58:20:58:20 | access to parameter b | Assert.cs:58:20:58:20 | access to parameter b | false |
-| Assert.cs:59:36:59:36 | [b (line 56): false] access to parameter b | Assert.cs:58:20:58:32 | ... ? ... : ... | Assert.cs:58:20:58:20 | access to parameter b | non-null |
-| Assert.cs:59:36:59:36 | [b (line 56): true] access to parameter b | Assert.cs:58:20:58:20 | access to parameter b | Assert.cs:58:20:58:20 | access to parameter b | false |
-| Assert.cs:59:36:59:36 | [b (line 56): true] access to parameter b | Assert.cs:58:20:58:20 | access to parameter b | Assert.cs:58:20:58:20 | access to parameter b | true |
-| Assert.cs:59:36:59:36 | [b (line 56): true] access to parameter b | Assert.cs:58:20:58:32 | ... ? ... : ... | Assert.cs:58:20:58:20 | access to parameter b | non-null |
-| Assert.cs:60:27:60:27 | access to local variable s | Assert.cs:59:23:59:23 | access to local variable s | Assert.cs:59:23:59:23 | access to local variable s | non-null |
+| Assert.cs:59:36:59:36 | access to parameter b | Assert.cs:58:20:58:20 | access to parameter b | Assert.cs:58:20:58:20 | access to parameter b | false |
+| Assert.cs:59:36:59:36 | access to parameter b | Assert.cs:58:20:58:32 | ... ? ... : ... | Assert.cs:58:20:58:20 | access to parameter b | not null |
+| Assert.cs:60:27:60:27 | access to local variable s | Assert.cs:59:23:59:23 | access to local variable s | Assert.cs:59:23:59:23 | access to local variable s | not null |
 | Assert.cs:60:27:60:27 | access to local variable s | Assert.cs:59:23:59:31 | ... != ... | Assert.cs:59:23:59:23 | access to local variable s | true |
-| Assert.cs:66:37:66:37 | [b (line 63): false] access to parameter b | Assert.cs:65:20:65:20 | access to parameter b | Assert.cs:65:20:65:20 | access to parameter b | false |
-| Assert.cs:66:37:66:37 | [b (line 63): false] access to parameter b | Assert.cs:65:20:65:32 | ... ? ... : ... | Assert.cs:65:20:65:20 | access to parameter b | non-null |
-| Assert.cs:66:37:66:37 | [b (line 63): true] access to parameter b | Assert.cs:65:20:65:20 | access to parameter b | Assert.cs:65:20:65:20 | access to parameter b | false |
-| Assert.cs:66:37:66:37 | [b (line 63): true] access to parameter b | Assert.cs:65:20:65:20 | access to parameter b | Assert.cs:65:20:65:20 | access to parameter b | true |
-| Assert.cs:66:37:66:37 | [b (line 63): true] access to parameter b | Assert.cs:65:20:65:32 | ... ? ... : ... | Assert.cs:65:20:65:20 | access to parameter b | non-null |
-| Assert.cs:67:27:67:27 | access to local variable s | Assert.cs:66:24:66:24 | access to local variable s | Assert.cs:66:24:66:24 | access to local variable s | non-null |
+| Assert.cs:66:37:66:37 | access to parameter b | Assert.cs:65:20:65:20 | access to parameter b | Assert.cs:65:20:65:20 | access to parameter b | false |
+| Assert.cs:66:37:66:37 | access to parameter b | Assert.cs:65:20:65:32 | ... ? ... : ... | Assert.cs:65:20:65:20 | access to parameter b | not null |
+| Assert.cs:67:27:67:27 | access to local variable s | Assert.cs:66:24:66:24 | access to local variable s | Assert.cs:66:24:66:24 | access to local variable s | not null |
 | Assert.cs:67:27:67:27 | access to local variable s | Assert.cs:66:24:66:32 | ... == ... | Assert.cs:66:24:66:24 | access to local variable s | false |
-| Assert.cs:73:36:73:36 | [b (line 70): false] access to parameter b | Assert.cs:72:20:72:20 | access to parameter b | Assert.cs:72:20:72:20 | access to parameter b | false |
-| Assert.cs:73:36:73:36 | [b (line 70): false] access to parameter b | Assert.cs:72:20:72:20 | access to parameter b | Assert.cs:72:20:72:20 | access to parameter b | true |
-| Assert.cs:73:36:73:36 | [b (line 70): false] access to parameter b | Assert.cs:72:20:72:32 | ... ? ... : ... | Assert.cs:72:20:72:20 | access to parameter b | null |
-| Assert.cs:73:36:73:36 | [b (line 70): true] access to parameter b | Assert.cs:72:20:72:20 | access to parameter b | Assert.cs:72:20:72:20 | access to parameter b | true |
-| Assert.cs:73:36:73:36 | [b (line 70): true] access to parameter b | Assert.cs:72:20:72:32 | ... ? ... : ... | Assert.cs:72:20:72:20 | access to parameter b | null |
+| Assert.cs:73:36:73:36 | access to parameter b | Assert.cs:72:20:72:20 | access to parameter b | Assert.cs:72:20:72:20 | access to parameter b | true |
+| Assert.cs:73:36:73:36 | access to parameter b | Assert.cs:72:20:72:32 | ... ? ... : ... | Assert.cs:72:20:72:20 | access to parameter b | null |
 | Assert.cs:74:27:74:27 | access to local variable s | Assert.cs:73:23:73:23 | access to local variable s | Assert.cs:73:23:73:23 | access to local variable s | null |
 | Assert.cs:74:27:74:27 | access to local variable s | Assert.cs:73:23:73:31 | ... == ... | Assert.cs:73:23:73:23 | access to local variable s | true |
-| Assert.cs:80:37:80:37 | [b (line 77): false] access to parameter b | Assert.cs:79:20:79:20 | access to parameter b | Assert.cs:79:20:79:20 | access to parameter b | false |
-| Assert.cs:80:37:80:37 | [b (line 77): false] access to parameter b | Assert.cs:79:20:79:20 | access to parameter b | Assert.cs:79:20:79:20 | access to parameter b | true |
-| Assert.cs:80:37:80:37 | [b (line 77): false] access to parameter b | Assert.cs:79:20:79:32 | ... ? ... : ... | Assert.cs:79:20:79:20 | access to parameter b | null |
-| Assert.cs:80:37:80:37 | [b (line 77): true] access to parameter b | Assert.cs:79:20:79:20 | access to parameter b | Assert.cs:79:20:79:20 | access to parameter b | true |
-| Assert.cs:80:37:80:37 | [b (line 77): true] access to parameter b | Assert.cs:79:20:79:32 | ... ? ... : ... | Assert.cs:79:20:79:20 | access to parameter b | null |
+| Assert.cs:80:37:80:37 | access to parameter b | Assert.cs:79:20:79:20 | access to parameter b | Assert.cs:79:20:79:20 | access to parameter b | true |
+| Assert.cs:80:37:80:37 | access to parameter b | Assert.cs:79:20:79:32 | ... ? ... : ... | Assert.cs:79:20:79:20 | access to parameter b | null |
 | Assert.cs:81:27:81:27 | access to local variable s | Assert.cs:80:24:80:24 | access to local variable s | Assert.cs:80:24:80:24 | access to local variable s | null |
 | Assert.cs:81:27:81:27 | access to local variable s | Assert.cs:80:24:80:32 | ... != ... | Assert.cs:80:24:80:24 | access to local variable s | false |
-| Assert.cs:93:33:93:34 | [assertion failure, b1 (line 91): false] access to parameter b2 | Assert.cs:93:29:93:30 | access to parameter b2 | Assert.cs:93:29:93:30 | access to parameter b2 | false |
-| Assert.cs:93:33:93:34 | [assertion failure, b1 (line 91): false] access to parameter b2 | Assert.cs:93:29:93:30 | access to parameter b2 | Assert.cs:93:29:93:30 | access to parameter b2 | true |
-| Assert.cs:93:33:93:34 | [assertion failure, b1 (line 91): true] access to parameter b2 | Assert.cs:93:29:93:30 | access to parameter b2 | Assert.cs:93:29:93:30 | access to parameter b2 | true |
-| Assert.cs:93:33:93:34 | [assertion success, b1 (line 91): true] access to parameter b2 | Assert.cs:93:29:93:30 | access to parameter b2 | Assert.cs:93:29:93:30 | access to parameter b2 | false |
-| Assert.cs:94:16:94:17 | [b1 (line 91): true] access to parameter b1 | Assert.cs:93:25:93:26 | access to parameter b1 | Assert.cs:93:25:93:26 | access to parameter b1 | true |
+| Assert.cs:94:16:94:17 | access to parameter b1 | Assert.cs:93:9:93:35 | call to method AssertTrueFalse | Assert.cs:93:25:93:26 | access to parameter b1 | no exception |
+| Assert.cs:94:16:94:17 | access to parameter b1 | Assert.cs:93:25:93:26 | access to parameter b1 | Assert.cs:93:25:93:26 | access to parameter b1 | true |
+| Assert.cs:94:23:94:24 | access to parameter b2 | Assert.cs:93:9:93:35 | call to method AssertTrueFalse | Assert.cs:93:29:93:30 | access to parameter b2 | no exception |
+| Assert.cs:94:23:94:24 | access to parameter b2 | Assert.cs:93:9:93:35 | call to method AssertTrueFalse | Assert.cs:93:33:93:34 | access to parameter b2 | no exception |
 | Assert.cs:94:23:94:24 | access to parameter b2 | Assert.cs:93:29:93:30 | access to parameter b2 | Assert.cs:93:29:93:30 | access to parameter b2 | false |
-| Collections.cs:51:17:51:20 | access to parameter args | Collections.cs:49:13:49:16 | access to parameter args | Collections.cs:49:13:49:16 | access to parameter args | non-empty |
+| Collections.cs:51:17:51:20 | access to parameter args | Collections.cs:49:13:49:22 | access to property Count | Collections.cs:49:13:49:16 | access to parameter args | not 0 |
 | Collections.cs:51:17:51:20 | access to parameter args | Collections.cs:49:13:49:27 | ... == ... | Collections.cs:49:13:49:16 | access to parameter args | false |
+| Collections.cs:52:9:52:12 | access to parameter args | Collections.cs:49:13:49:22 | access to property Count | Collections.cs:49:13:49:16 | access to parameter args | not 0 |
 | Collections.cs:52:9:52:12 | access to parameter args | Collections.cs:49:13:49:27 | ... == ... | Collections.cs:49:13:49:16 | access to parameter args | false |
+| Collections.cs:53:13:53:16 | access to parameter args | Collections.cs:49:13:49:22 | access to property Count | Collections.cs:49:13:49:16 | access to parameter args | not 0 |
 | Collections.cs:53:13:53:16 | access to parameter args | Collections.cs:49:13:49:27 | ... == ... | Collections.cs:49:13:49:16 | access to parameter args | false |
-| Collections.cs:66:13:66:13 | access to local variable x | Collections.cs:64:13:64:13 | access to local variable x | Collections.cs:64:13:64:13 | access to local variable x | empty |
+| Collections.cs:66:13:66:13 | access to local variable x | Collections.cs:64:13:64:19 | access to property Count | Collections.cs:64:13:64:13 | access to local variable x | 0 |
 | Collections.cs:66:13:66:13 | access to local variable x | Collections.cs:64:13:64:24 | ... == ... | Collections.cs:64:13:64:13 | access to local variable x | true |
+| Collections.cs:67:13:67:13 | access to local variable x | Collections.cs:64:13:64:19 | access to property Count | Collections.cs:64:13:64:13 | access to local variable x | 0 |
 | Collections.cs:67:13:67:13 | access to local variable x | Collections.cs:64:13:64:24 | ... == ... | Collections.cs:64:13:64:13 | access to local variable x | true |
-| Collections.cs:95:31:95:34 | access to parameter args | Collections.cs:94:29:94:32 | access to parameter args | Collections.cs:94:29:94:32 | access to parameter args | non-empty |
-| Guards.cs:12:13:12:13 | access to parameter s | Guards.cs:10:16:10:16 | access to parameter s | Guards.cs:10:16:10:16 | access to parameter s | non-null |
+| Guards.cs:12:13:12:13 | access to parameter s | Guards.cs:10:16:10:16 | access to parameter s | Guards.cs:10:16:10:16 | access to parameter s | not null |
 | Guards.cs:12:13:12:13 | access to parameter s | Guards.cs:10:16:10:24 | ... == ... | Guards.cs:10:16:10:16 | access to parameter s | false |
-| Guards.cs:14:31:14:31 | access to parameter s | Guards.cs:10:16:10:16 | access to parameter s | Guards.cs:10:16:10:16 | access to parameter s | non-null |
+| Guards.cs:14:31:14:31 | access to parameter s | Guards.cs:10:16:10:16 | access to parameter s | Guards.cs:10:16:10:16 | access to parameter s | not null |
 | Guards.cs:14:31:14:31 | access to parameter s | Guards.cs:10:16:10:24 | ... == ... | Guards.cs:10:16:10:16 | access to parameter s | false |
 | Guards.cs:14:31:14:31 | access to parameter s | Guards.cs:12:13:12:24 | ... > ... | Guards.cs:12:13:12:13 | access to parameter s | true |
-| Guards.cs:26:31:26:31 | access to parameter s | Guards.cs:24:13:24:13 | access to parameter s | Guards.cs:24:13:24:13 | access to parameter s | non-null |
+| Guards.cs:26:31:26:31 | access to parameter s | Guards.cs:24:13:24:13 | access to parameter s | Guards.cs:24:13:24:13 | access to parameter s | not null |
 | Guards.cs:26:31:26:31 | access to parameter s | Guards.cs:24:13:24:21 | ... != ... | Guards.cs:24:13:24:13 | access to parameter s | true |
 | Guards.cs:33:31:33:31 | access to parameter x | Guards.cs:32:14:32:36 | call to method IsNullOrEmpty | Guards.cs:32:35:32:35 | access to parameter x | false |
-| Guards.cs:33:31:33:31 | access to parameter x | Guards.cs:32:35:32:35 | access to parameter x | Guards.cs:32:35:32:35 | access to parameter x | non-null |
-| Guards.cs:33:35:33:35 | access to parameter y | Guards.cs:32:42:32:42 | access to parameter y | Guards.cs:32:42:32:42 | access to parameter y | non-null |
+| Guards.cs:33:31:33:31 | access to parameter x | Guards.cs:32:35:32:35 | access to parameter x | Guards.cs:32:35:32:35 | access to parameter x | not null |
+| Guards.cs:33:35:33:35 | access to parameter y | Guards.cs:32:42:32:42 | access to parameter y | Guards.cs:32:42:32:42 | access to parameter y | not null |
 | Guards.cs:33:35:33:35 | access to parameter y | Guards.cs:32:42:32:50 | ... == ... | Guards.cs:32:42:32:42 | access to parameter y | false |
-| Guards.cs:36:32:36:32 | access to parameter x | Guards.cs:35:13:35:13 | access to parameter x | Guards.cs:35:13:35:13 | access to parameter x | non-null |
+| Guards.cs:36:32:36:32 | access to parameter x | Guards.cs:35:13:35:13 | access to parameter x | Guards.cs:35:13:35:13 | access to parameter x | not null |
 | Guards.cs:36:32:36:32 | access to parameter x | Guards.cs:35:13:35:21 | ... == ... | Guards.cs:35:13:35:13 | access to parameter x | false |
-| Guards.cs:36:36:36:36 | access to parameter y | Guards.cs:35:26:35:26 | access to parameter y | Guards.cs:35:26:35:26 | access to parameter y | non-null |
+| Guards.cs:36:36:36:36 | access to parameter y | Guards.cs:35:26:35:26 | access to parameter y | Guards.cs:35:26:35:26 | access to parameter y | not null |
 | Guards.cs:36:36:36:36 | access to parameter y | Guards.cs:35:26:35:34 | ... == ... | Guards.cs:35:26:35:26 | access to parameter y | false |
-| Guards.cs:39:31:39:31 | access to parameter x | Guards.cs:38:15:38:15 | access to parameter x | Guards.cs:38:15:38:15 | access to parameter x | non-null |
+| Guards.cs:39:31:39:31 | access to parameter x | Guards.cs:38:15:38:15 | access to parameter x | Guards.cs:38:15:38:15 | access to parameter x | not null |
 | Guards.cs:39:31:39:31 | access to parameter x | Guards.cs:38:15:38:23 | ... == ... | Guards.cs:38:15:38:15 | access to parameter x | false |
-| Guards.cs:39:35:39:35 | access to parameter y | Guards.cs:38:28:38:28 | access to parameter y | Guards.cs:38:28:38:28 | access to parameter y | non-null |
+| Guards.cs:39:35:39:35 | access to parameter y | Guards.cs:38:28:38:28 | access to parameter y | Guards.cs:38:28:38:28 | access to parameter y | not null |
 | Guards.cs:39:35:39:35 | access to parameter y | Guards.cs:38:28:38:36 | ... == ... | Guards.cs:38:28:38:28 | access to parameter y | false |
-| Guards.cs:42:32:42:32 | access to parameter x | Guards.cs:41:17:41:17 | access to parameter x | Guards.cs:41:17:41:17 | access to parameter x | non-null |
+| Guards.cs:42:32:42:32 | access to parameter x | Guards.cs:41:17:41:17 | access to parameter x | Guards.cs:41:17:41:17 | access to parameter x | not null |
 | Guards.cs:42:32:42:32 | access to parameter x | Guards.cs:41:17:41:25 | ... != ... | Guards.cs:41:17:41:17 | access to parameter x | true |
-| Guards.cs:42:36:42:36 | access to parameter y | Guards.cs:41:30:41:30 | access to parameter y | Guards.cs:41:30:41:30 | access to parameter y | non-null |
+| Guards.cs:42:36:42:36 | access to parameter y | Guards.cs:41:30:41:30 | access to parameter y | Guards.cs:41:30:41:30 | access to parameter y | not null |
 | Guards.cs:42:36:42:36 | access to parameter y | Guards.cs:41:30:41:38 | ... != ... | Guards.cs:41:30:41:30 | access to parameter y | true |
-| Guards.cs:48:31:48:40 | access to field Field | Guards.cs:47:13:47:17 | access to field Field | Guards.cs:47:13:47:17 | access to field Field | non-null |
+| Guards.cs:48:31:48:40 | access to field Field | Guards.cs:47:13:47:17 | access to field Field | Guards.cs:47:13:47:17 | access to field Field | not null |
 | Guards.cs:48:31:48:40 | access to field Field | Guards.cs:47:13:47:25 | ... != ... | Guards.cs:47:13:47:17 | access to field Field | true |
-| Guards.cs:55:27:55:27 | access to parameter g | Guards.cs:53:13:53:19 | access to field Field | Guards.cs:53:13:53:13 | access to parameter g | non-null |
+| Guards.cs:55:27:55:27 | access to parameter g | Guards.cs:53:13:53:19 | access to field Field | Guards.cs:53:13:53:13 | access to parameter g | not null |
 | Guards.cs:55:27:55:27 | access to parameter g | Guards.cs:53:13:53:27 | ... == ... | Guards.cs:53:13:53:13 | access to parameter g | false |
-| Guards.cs:55:27:55:33 | access to field Field | Guards.cs:53:13:53:19 | access to field Field | Guards.cs:53:13:53:19 | access to field Field | non-null |
+| Guards.cs:55:27:55:33 | access to field Field | Guards.cs:53:13:53:19 | access to field Field | Guards.cs:53:13:53:19 | access to field Field | not null |
 | Guards.cs:55:27:55:33 | access to field Field | Guards.cs:53:13:53:27 | ... == ... | Guards.cs:53:13:53:19 | access to field Field | false |
-| Guards.cs:62:27:62:27 | access to parameter g | Guards.cs:60:13:60:37 | access to field Field | Guards.cs:60:13:60:13 | access to parameter g | non-null |
+| Guards.cs:62:27:62:27 | access to parameter g | Guards.cs:60:13:60:37 | access to field Field | Guards.cs:60:13:60:13 | access to parameter g | not null |
 | Guards.cs:62:27:62:27 | access to parameter g | Guards.cs:60:13:60:45 | ... == ... | Guards.cs:60:13:60:13 | access to parameter g | false |
-| Guards.cs:62:27:62:36 | access to property Property | Guards.cs:60:13:60:37 | access to field Field | Guards.cs:60:13:60:22 | access to property Property | non-null |
+| Guards.cs:62:27:62:36 | access to property Property | Guards.cs:60:13:60:37 | access to field Field | Guards.cs:60:13:60:22 | access to property Property | not null |
 | Guards.cs:62:27:62:36 | access to property Property | Guards.cs:60:13:60:45 | ... == ... | Guards.cs:60:13:60:22 | access to property Property | false |
-| Guards.cs:62:27:62:45 | access to property Property | Guards.cs:60:13:60:37 | access to field Field | Guards.cs:60:13:60:31 | access to property Property | non-null |
+| Guards.cs:62:27:62:45 | access to property Property | Guards.cs:60:13:60:37 | access to field Field | Guards.cs:60:13:60:31 | access to property Property | not null |
 | Guards.cs:62:27:62:45 | access to property Property | Guards.cs:60:13:60:45 | ... == ... | Guards.cs:60:13:60:31 | access to property Property | false |
-| Guards.cs:62:27:62:51 | access to field Field | Guards.cs:60:13:60:37 | access to field Field | Guards.cs:60:13:60:37 | access to field Field | non-null |
+| Guards.cs:62:27:62:51 | access to field Field | Guards.cs:60:13:60:37 | access to field Field | Guards.cs:60:13:60:37 | access to field Field | not null |
 | Guards.cs:62:27:62:51 | access to field Field | Guards.cs:60:13:60:45 | ... == ... | Guards.cs:60:13:60:37 | access to field Field | false |
-| Guards.cs:63:27:63:27 | access to parameter g | Guards.cs:60:13:60:37 | access to field Field | Guards.cs:60:13:60:13 | access to parameter g | non-null |
+| Guards.cs:63:27:63:27 | access to parameter g | Guards.cs:60:13:60:37 | access to field Field | Guards.cs:60:13:60:13 | access to parameter g | not null |
 | Guards.cs:63:27:63:27 | access to parameter g | Guards.cs:60:13:60:45 | ... == ... | Guards.cs:60:13:60:13 | access to parameter g | false |
-| Guards.cs:63:27:63:36 | access to property Property | Guards.cs:60:13:60:37 | access to field Field | Guards.cs:60:13:60:22 | access to property Property | non-null |
+| Guards.cs:63:27:63:36 | access to property Property | Guards.cs:60:13:60:37 | access to field Field | Guards.cs:60:13:60:22 | access to property Property | not null |
 | Guards.cs:63:27:63:36 | access to property Property | Guards.cs:60:13:60:45 | ... == ... | Guards.cs:60:13:60:22 | access to property Property | false |
-| Guards.cs:70:31:70:31 | access to parameter s | Guards.cs:68:16:68:16 | access to parameter s | Guards.cs:68:16:68:16 | access to parameter s | non-null |
+| Guards.cs:70:31:70:31 | access to parameter s | Guards.cs:68:16:68:16 | access to parameter s | Guards.cs:68:16:68:16 | access to parameter s | not null |
 | Guards.cs:70:31:70:31 | access to parameter s | Guards.cs:68:16:68:24 | ... != ... | Guards.cs:68:16:68:16 | access to parameter s | true |
-| Guards.cs:79:31:79:31 | access to parameter s | Guards.cs:78:13:78:13 | access to parameter s | Guards.cs:78:13:78:13 | access to parameter s | non-null |
-| Guards.cs:79:31:79:31 | access to parameter s | Guards.cs:78:13:78:21 | access to property Length | Guards.cs:78:13:78:13 | access to parameter s | non-null |
+| Guards.cs:79:31:79:31 | access to parameter s | Guards.cs:78:13:78:13 | access to parameter s | Guards.cs:78:13:78:13 | access to parameter s | not null |
+| Guards.cs:79:31:79:31 | access to parameter s | Guards.cs:78:13:78:21 | access to property Length | Guards.cs:78:13:78:13 | access to parameter s | not null |
 | Guards.cs:79:31:79:31 | access to parameter s | Guards.cs:78:13:78:26 | ... == ... | Guards.cs:78:13:78:13 | access to parameter s | true |
-| Guards.cs:81:31:81:31 | access to parameter s | Guards.cs:80:13:80:13 | access to parameter s | Guards.cs:80:13:80:13 | access to parameter s | non-null |
-| Guards.cs:81:31:81:31 | access to parameter s | Guards.cs:80:13:80:21 | access to property Length | Guards.cs:80:13:80:13 | access to parameter s | non-null |
+| Guards.cs:81:31:81:31 | access to parameter s | Guards.cs:80:13:80:13 | access to parameter s | Guards.cs:80:13:80:13 | access to parameter s | not null |
+| Guards.cs:81:31:81:31 | access to parameter s | Guards.cs:80:13:80:21 | access to property Length | Guards.cs:80:13:80:13 | access to parameter s | not null |
 | Guards.cs:81:31:81:31 | access to parameter s | Guards.cs:80:13:80:25 | ... > ... | Guards.cs:80:13:80:13 | access to parameter s | true |
-| Guards.cs:83:31:83:31 | access to parameter s | Guards.cs:82:13:82:13 | access to parameter s | Guards.cs:82:13:82:13 | access to parameter s | non-null |
-| Guards.cs:83:31:83:31 | access to parameter s | Guards.cs:82:13:82:21 | access to property Length | Guards.cs:82:13:82:13 | access to parameter s | non-null |
+| Guards.cs:83:31:83:31 | access to parameter s | Guards.cs:82:13:82:13 | access to parameter s | Guards.cs:82:13:82:13 | access to parameter s | not null |
+| Guards.cs:83:31:83:31 | access to parameter s | Guards.cs:82:13:82:21 | access to property Length | Guards.cs:82:13:82:13 | access to parameter s | not null |
 | Guards.cs:83:31:83:31 | access to parameter s | Guards.cs:82:13:82:26 | ... >= ... | Guards.cs:82:13:82:13 | access to parameter s | true |
-| Guards.cs:85:31:85:31 | access to parameter s | Guards.cs:84:13:84:13 | access to parameter s | Guards.cs:84:13:84:13 | access to parameter s | non-null |
-| Guards.cs:85:31:85:31 | access to parameter s | Guards.cs:84:13:84:21 | access to property Length | Guards.cs:84:13:84:13 | access to parameter s | non-null |
+| Guards.cs:85:31:85:31 | access to parameter s | Guards.cs:84:13:84:13 | access to parameter s | Guards.cs:84:13:84:13 | access to parameter s | not null |
+| Guards.cs:85:31:85:31 | access to parameter s | Guards.cs:84:13:84:21 | access to property Length | Guards.cs:84:13:84:13 | access to parameter s | not null |
 | Guards.cs:85:31:85:31 | access to parameter s | Guards.cs:84:13:84:26 | ... < ... | Guards.cs:84:13:84:13 | access to parameter s | true |
-| Guards.cs:87:31:87:31 | access to parameter s | Guards.cs:86:13:86:13 | access to parameter s | Guards.cs:86:13:86:13 | access to parameter s | non-null |
-| Guards.cs:87:31:87:31 | access to parameter s | Guards.cs:86:13:86:21 | access to property Length | Guards.cs:86:13:86:13 | access to parameter s | non-null |
+| Guards.cs:87:31:87:31 | access to parameter s | Guards.cs:86:13:86:13 | access to parameter s | Guards.cs:86:13:86:13 | access to parameter s | not null |
+| Guards.cs:87:31:87:31 | access to parameter s | Guards.cs:86:13:86:21 | access to property Length | Guards.cs:86:13:86:13 | access to parameter s | not null |
 | Guards.cs:87:31:87:31 | access to parameter s | Guards.cs:86:13:86:27 | ... <= ... | Guards.cs:86:13:86:13 | access to parameter s | true |
-| Guards.cs:89:31:89:31 | access to parameter s | Guards.cs:88:13:88:13 | access to parameter s | Guards.cs:88:13:88:13 | access to parameter s | non-null |
-| Guards.cs:89:31:89:31 | access to parameter s | Guards.cs:88:13:88:21 | access to property Length | Guards.cs:88:13:88:13 | access to parameter s | non-null |
+| Guards.cs:89:31:89:31 | access to parameter s | Guards.cs:88:13:88:13 | access to parameter s | Guards.cs:88:13:88:13 | access to parameter s | not null |
+| Guards.cs:89:31:89:31 | access to parameter s | Guards.cs:88:13:88:21 | access to property Length | Guards.cs:88:13:88:13 | access to parameter s | not null |
 | Guards.cs:89:31:89:31 | access to parameter s | Guards.cs:88:13:88:29 | ... != ... | Guards.cs:88:13:88:13 | access to parameter s | true |
 | Guards.cs:91:31:91:31 | access to parameter s | Guards.cs:88:13:88:13 | access to parameter s | Guards.cs:88:13:88:13 | access to parameter s | null |
 | Guards.cs:91:31:91:31 | access to parameter s | Guards.cs:88:13:88:21 | access to property Length | Guards.cs:88:13:88:13 | access to parameter s | null |
 | Guards.cs:91:31:91:31 | access to parameter s | Guards.cs:88:13:88:29 | ... != ... | Guards.cs:88:13:88:13 | access to parameter s | false |
 | Guards.cs:93:31:93:31 | access to parameter s | Guards.cs:92:13:92:30 | ... != ... | Guards.cs:92:13:92:13 | access to parameter s | true |
-| Guards.cs:95:31:95:31 | access to parameter s | Guards.cs:92:13:92:13 | access to parameter s | Guards.cs:92:13:92:13 | access to parameter s | non-null |
-| Guards.cs:95:31:95:31 | access to parameter s | Guards.cs:92:13:92:21 | access to property Length | Guards.cs:92:13:92:13 | access to parameter s | non-null |
-| Guards.cs:95:31:95:31 | access to parameter s | Guards.cs:92:13:92:25 | ... - ... | Guards.cs:92:13:92:13 | access to parameter s | non-null |
+| Guards.cs:95:31:95:31 | access to parameter s | Guards.cs:92:13:92:13 | access to parameter s | Guards.cs:92:13:92:13 | access to parameter s | not null |
+| Guards.cs:95:31:95:31 | access to parameter s | Guards.cs:92:13:92:21 | access to property Length | Guards.cs:92:13:92:13 | access to parameter s | not null |
+| Guards.cs:95:31:95:31 | access to parameter s | Guards.cs:92:13:92:25 | ... - ... | Guards.cs:92:13:92:13 | access to parameter s | not null |
 | Guards.cs:95:31:95:31 | access to parameter s | Guards.cs:92:13:92:30 | ... != ... | Guards.cs:92:13:92:13 | access to parameter s | false |
-| Guards.cs:97:31:97:31 | access to parameter s | Guards.cs:96:13:96:13 | access to parameter s | Guards.cs:96:13:96:13 | access to parameter s | non-null |
+| Guards.cs:97:31:97:31 | access to parameter s | Guards.cs:96:13:96:13 | access to parameter s | Guards.cs:96:13:96:13 | access to parameter s |  |
+| Guards.cs:97:31:97:31 | access to parameter s | Guards.cs:96:13:96:13 | access to parameter s | Guards.cs:96:13:96:13 | access to parameter s | not null |
 | Guards.cs:97:31:97:31 | access to parameter s | Guards.cs:96:13:96:19 | ... == ... | Guards.cs:96:13:96:13 | access to parameter s | true |
+| Guards.cs:99:31:99:31 | access to parameter s | Guards.cs:96:13:96:13 | access to parameter s | Guards.cs:96:13:96:13 | access to parameter s | not  |
 | Guards.cs:99:31:99:31 | access to parameter s | Guards.cs:96:13:96:19 | ... == ... | Guards.cs:96:13:96:13 | access to parameter s | false |
-| Guards.cs:106:9:106:9 | access to parameter g | Guards.cs:104:13:104:37 | access to field Field | Guards.cs:104:13:104:13 | access to parameter g | non-null |
+| Guards.cs:106:9:106:9 | access to parameter g | Guards.cs:104:13:104:37 | access to field Field | Guards.cs:104:13:104:13 | access to parameter g | not null |
 | Guards.cs:106:9:106:9 | access to parameter g | Guards.cs:104:13:104:45 | ... == ... | Guards.cs:104:13:104:13 | access to parameter g | false |
-| Guards.cs:107:27:107:27 | access to parameter g | Guards.cs:104:13:104:37 | access to field Field | Guards.cs:104:13:104:13 | access to parameter g | non-null |
+| Guards.cs:107:27:107:27 | access to parameter g | Guards.cs:104:13:104:37 | access to field Field | Guards.cs:104:13:104:13 | access to parameter g | not null |
 | Guards.cs:107:27:107:27 | access to parameter g | Guards.cs:104:13:104:45 | ... == ... | Guards.cs:104:13:104:13 | access to parameter g | false |
-| Guards.cs:108:27:108:27 | access to parameter g | Guards.cs:104:13:104:37 | access to field Field | Guards.cs:104:13:104:13 | access to parameter g | non-null |
+| Guards.cs:108:27:108:27 | access to parameter g | Guards.cs:104:13:104:37 | access to field Field | Guards.cs:104:13:104:13 | access to parameter g | not null |
 | Guards.cs:108:27:108:27 | access to parameter g | Guards.cs:104:13:104:45 | ... == ... | Guards.cs:104:13:104:13 | access to parameter g | false |
 | Guards.cs:114:14:114:14 | access to parameter g | Guards.cs:113:21:113:45 | access to field Field | Guards.cs:113:21:113:21 | access to parameter g | null |
 | Guards.cs:114:14:114:23 | access to property Property | Guards.cs:113:21:113:45 | access to field Field | Guards.cs:113:21:113:30 | access to property Property | null |
 | Guards.cs:114:14:114:32 | access to property Property | Guards.cs:113:21:113:45 | access to field Field | Guards.cs:113:21:113:39 | access to property Property | null |
 | Guards.cs:114:14:114:38 | access to field Field | Guards.cs:113:21:113:45 | access to field Field | Guards.cs:113:21:113:45 | access to field Field | null |
-| Guards.cs:116:27:116:27 | access to parameter g | Guards.cs:115:17:115:41 | access to field Field | Guards.cs:115:17:115:17 | access to parameter g | non-null |
-| Guards.cs:116:27:116:36 | access to property Property | Guards.cs:115:17:115:41 | access to field Field | Guards.cs:115:17:115:26 | access to property Property | non-null |
-| Guards.cs:116:27:116:45 | access to property Property | Guards.cs:115:17:115:41 | access to field Field | Guards.cs:115:17:115:35 | access to property Property | non-null |
-| Guards.cs:116:27:116:51 | access to field Field | Guards.cs:115:17:115:41 | access to field Field | Guards.cs:115:17:115:41 | access to field Field | non-null |
-| Guards.cs:117:9:117:9 | access to parameter g | Guards.cs:115:17:115:41 | access to field Field | Guards.cs:115:17:115:17 | access to parameter g | non-null |
-| Guards.cs:118:27:118:27 | access to parameter g | Guards.cs:115:17:115:41 | access to field Field | Guards.cs:115:17:115:17 | access to parameter g | non-null |
-| Guards.cs:119:27:119:27 | access to parameter g | Guards.cs:115:17:115:41 | access to field Field | Guards.cs:115:17:115:17 | access to parameter g | non-null |
-| Guards.cs:125:29:125:30 | access to parameter s1 | Guards.cs:125:18:125:19 | access to parameter s1 | Guards.cs:125:18:125:19 | access to parameter s1 | non-null |
+| Guards.cs:116:27:116:27 | access to parameter g | Guards.cs:115:17:115:41 | access to field Field | Guards.cs:115:17:115:17 | access to parameter g | not null |
+| Guards.cs:116:27:116:36 | access to property Property | Guards.cs:115:17:115:41 | access to field Field | Guards.cs:115:17:115:26 | access to property Property | not null |
+| Guards.cs:116:27:116:45 | access to property Property | Guards.cs:115:17:115:41 | access to field Field | Guards.cs:115:17:115:35 | access to property Property | not null |
+| Guards.cs:116:27:116:51 | access to field Field | Guards.cs:115:17:115:41 | access to field Field | Guards.cs:115:17:115:41 | access to field Field | not null |
+| Guards.cs:117:9:117:9 | access to parameter g | Guards.cs:115:17:115:41 | access to field Field | Guards.cs:115:17:115:17 | access to parameter g | not null |
+| Guards.cs:118:27:118:27 | access to parameter g | Guards.cs:115:17:115:41 | access to field Field | Guards.cs:115:17:115:17 | access to parameter g | not null |
+| Guards.cs:119:27:119:27 | access to parameter g | Guards.cs:115:17:115:41 | access to field Field | Guards.cs:115:17:115:17 | access to parameter g | not null |
+| Guards.cs:125:29:125:30 | access to parameter s1 | Guards.cs:125:18:125:19 | access to parameter s1 | Guards.cs:125:18:125:19 | access to parameter s1 | not null |
 | Guards.cs:131:20:131:20 | access to parameter s | Guards.cs:130:13:130:13 | access to parameter s | Guards.cs:130:13:130:13 | access to parameter s | null |
 | Guards.cs:131:20:131:20 | access to parameter s | Guards.cs:130:13:130:21 | ... is ... | Guards.cs:130:13:130:13 | access to parameter s | true |
-| Guards.cs:132:16:132:16 | access to parameter s | Guards.cs:130:13:130:13 | access to parameter s | Guards.cs:130:13:130:13 | access to parameter s | non-null |
+| Guards.cs:132:16:132:16 | access to parameter s | Guards.cs:130:13:130:13 | access to parameter s | Guards.cs:130:13:130:13 | access to parameter s | not null |
 | Guards.cs:132:16:132:16 | access to parameter s | Guards.cs:130:13:130:21 | ... is ... | Guards.cs:130:13:130:13 | access to parameter s | false |
-| Guards.cs:138:20:138:20 | access to parameter s | Guards.cs:137:13:137:13 | access to parameter s | Guards.cs:137:13:137:13 | access to parameter s | non-null |
+| Guards.cs:138:20:138:20 | access to parameter s | Guards.cs:137:13:137:13 | access to parameter s | Guards.cs:137:13:137:13 | access to parameter s | not null |
 | Guards.cs:138:20:138:20 | access to parameter s | Guards.cs:137:13:137:25 | ... is ... | Guards.cs:137:13:137:13 | access to parameter s | true |
 | Guards.cs:139:16:139:16 | access to parameter s | Guards.cs:137:13:137:13 | access to parameter s | Guards.cs:137:13:137:13 | access to parameter s | null |
 | Guards.cs:139:16:139:16 | access to parameter s | Guards.cs:137:13:137:25 | ... is ... | Guards.cs:137:13:137:13 | access to parameter s | false |
 | Guards.cs:146:16:146:16 | access to parameter o | Guards.cs:144:13:144:25 | ... is ... | Guards.cs:144:13:144:13 | access to parameter o | false |
-| Guards.cs:154:24:154:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | match access to type Action<Object> |
-| Guards.cs:154:24:154:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | non-null |
-| Guards.cs:158:24:158:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | match "" |
-| Guards.cs:158:24:158:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | non-match Action<String> a |
-| Guards.cs:158:24:158:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | non-match access to type Action<Object> |
-| Guards.cs:158:24:158:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | non-null |
-| Guards.cs:160:24:160:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | match null |
-| Guards.cs:160:24:160:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | non-match "" |
-| Guards.cs:160:24:160:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | non-match Action<String> a |
-| Guards.cs:160:24:160:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | non-match access to type Action<Object> |
+| Guards.cs:154:24:154:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | not null |
+| Guards.cs:158:24:158:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o |  |
+| Guards.cs:158:24:158:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | not null |
+| Guards.cs:160:24:160:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | not  |
 | Guards.cs:160:24:160:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | null |
-| Guards.cs:162:24:162:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | non-match "" |
-| Guards.cs:162:24:162:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | non-match Action<String> a |
-| Guards.cs:162:24:162:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | non-match access to type Action<Object> |
-| Guards.cs:162:24:162:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | non-match null |
-| Guards.cs:162:24:162:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | non-null |
+| Guards.cs:162:24:162:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | not  |
+| Guards.cs:162:24:162:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | not null |
 | Guards.cs:169:31:169:31 | access to parameter x | Guards.cs:168:14:168:41 | call to method IsNullOrWhiteSpace | Guards.cs:168:40:168:40 | access to parameter x | false |
-| Guards.cs:169:31:169:31 | access to parameter x | Guards.cs:168:40:168:40 | access to parameter x | Guards.cs:168:40:168:40 | access to parameter x | non-null |
+| Guards.cs:169:31:169:31 | access to parameter x | Guards.cs:168:40:168:40 | access to parameter x | Guards.cs:168:40:168:40 | access to parameter x | not null |
 | Guards.cs:190:31:190:31 | access to parameter s | Guards.cs:189:14:189:25 | call to method NullTest1 | Guards.cs:189:24:189:24 | access to parameter s | false |
-| Guards.cs:190:31:190:31 | access to parameter s | Guards.cs:189:24:189:24 | access to parameter s | Guards.cs:189:24:189:24 | access to parameter s | non-null |
+| Guards.cs:190:31:190:31 | access to parameter s | Guards.cs:189:24:189:24 | access to parameter s | Guards.cs:189:24:189:24 | access to parameter s | not null |
 | Guards.cs:192:31:192:31 | access to parameter s | Guards.cs:191:14:191:25 | call to method NullTest2 | Guards.cs:191:24:191:24 | access to parameter s | false |
-| Guards.cs:192:31:192:31 | access to parameter s | Guards.cs:191:24:191:24 | access to parameter s | Guards.cs:191:24:191:24 | access to parameter s | non-null |
+| Guards.cs:192:31:192:31 | access to parameter s | Guards.cs:191:24:191:24 | access to parameter s | Guards.cs:191:24:191:24 | access to parameter s | not null |
 | Guards.cs:194:31:194:31 | access to parameter s | Guards.cs:193:14:193:25 | call to method NullTest3 | Guards.cs:193:24:193:24 | access to parameter s | false |
-| Guards.cs:194:31:194:31 | access to parameter s | Guards.cs:193:24:193:24 | access to parameter s | Guards.cs:193:24:193:24 | access to parameter s | non-null |
+| Guards.cs:194:31:194:31 | access to parameter s | Guards.cs:193:24:193:24 | access to parameter s | Guards.cs:193:24:193:24 | access to parameter s | not null |
 | Guards.cs:196:31:196:31 | access to parameter s | Guards.cs:195:13:195:27 | call to method NotNullTest4 | Guards.cs:195:26:195:26 | access to parameter s | true |
-| Guards.cs:196:31:196:31 | access to parameter s | Guards.cs:195:26:195:26 | access to parameter s | Guards.cs:195:26:195:26 | access to parameter s | non-null |
+| Guards.cs:196:31:196:31 | access to parameter s | Guards.cs:195:26:195:26 | access to parameter s | Guards.cs:195:26:195:26 | access to parameter s | not null |
 | Guards.cs:198:31:198:31 | access to parameter s | Guards.cs:197:14:197:29 | call to method NullTestWrong | Guards.cs:197:28:197:28 | access to parameter s | false |
-| Guards.cs:205:13:205:13 | access to parameter o | Guards.cs:203:13:203:13 | access to parameter o | Guards.cs:203:13:203:13 | access to parameter o | non-null |
+| Guards.cs:205:13:205:13 | access to parameter o | Guards.cs:203:13:203:13 | access to parameter o | Guards.cs:203:13:203:13 | access to parameter o | not null |
 | Guards.cs:205:13:205:13 | access to parameter o | Guards.cs:203:13:203:21 | ... != ... | Guards.cs:203:13:203:13 | access to parameter o | true |
-| Guards.cs:208:17:208:17 | access to parameter o | Guards.cs:203:13:203:13 | access to parameter o | Guards.cs:203:13:203:13 | access to parameter o | non-null |
+| Guards.cs:208:17:208:17 | access to parameter o | Guards.cs:203:13:203:13 | access to parameter o | Guards.cs:203:13:203:13 | access to parameter o | not null |
 | Guards.cs:208:17:208:17 | access to parameter o | Guards.cs:203:13:203:21 | ... != ... | Guards.cs:203:13:203:13 | access to parameter o | true |
-| Guards.cs:269:13:269:14 | access to parameter o1 | Guards.cs:268:13:268:14 | access to parameter o1 | Guards.cs:268:13:268:14 | access to parameter o1 | non-null |
-| Guards.cs:269:13:269:14 | access to parameter o1 | Guards.cs:268:13:268:25 | call to method GetType | Guards.cs:268:13:268:14 | access to parameter o1 | non-null |
+| Guards.cs:269:13:269:14 | access to parameter o1 | Guards.cs:268:13:268:14 | access to parameter o1 | Guards.cs:268:13:268:14 | access to parameter o1 | not null |
+| Guards.cs:269:13:269:14 | access to parameter o1 | Guards.cs:268:13:268:25 | call to method GetType | Guards.cs:268:13:268:14 | access to parameter o1 | not null |
 | Guards.cs:269:13:269:14 | access to parameter o1 | Guards.cs:268:13:268:41 | call to operator == | Guards.cs:268:13:268:14 | access to parameter o1 | true |
 | Guards.cs:271:13:271:14 | access to parameter o1 | Guards.cs:270:13:270:42 | call to operator == | Guards.cs:270:13:270:14 | access to parameter o1 | true |
-| Guards.cs:279:17:279:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | match access to type Action<Object> |
-| Guards.cs:279:17:279:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | non-null |
-| Guards.cs:283:17:283:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | match "" |
-| Guards.cs:283:17:283:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | non-match Action<String> a |
-| Guards.cs:283:17:283:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | non-match access to type Action<Object> |
-| Guards.cs:283:17:283:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | non-null |
-| Guards.cs:285:17:285:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | match null |
-| Guards.cs:285:17:285:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | non-match "" |
-| Guards.cs:285:17:285:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | non-match Action<String> a |
-| Guards.cs:285:17:285:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | non-match access to type Action<Object> |
+| Guards.cs:279:17:279:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | not null |
+| Guards.cs:279:17:279:17 | access to parameter o | Guards.cs:278:13:279:28 | ... => ... | Guards.cs:279:17:279:17 | access to parameter o | true |
+| Guards.cs:279:17:279:28 | call to method ToString | Guards.cs:278:13:279:28 | ... => ... | Guards.cs:279:17:279:28 | call to method ToString | true |
+| Guards.cs:281:17:281:17 | access to local variable a | Guards.cs:280:13:281:28 | ... => ... | Guards.cs:281:17:281:17 | access to local variable a | true |
+| Guards.cs:281:17:281:28 | call to method ToString | Guards.cs:280:13:281:28 | ... => ... | Guards.cs:281:17:281:28 | call to method ToString | true |
+| Guards.cs:283:17:283:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o |  |
+| Guards.cs:283:17:283:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | not null |
+| Guards.cs:283:17:283:17 | access to parameter o | Guards.cs:278:13:279:28 | ... => ... | Guards.cs:279:17:279:17 | access to parameter o | false |
+| Guards.cs:283:17:283:17 | access to parameter o | Guards.cs:282:13:283:28 | ... => ... | Guards.cs:283:17:283:17 | access to parameter o | true |
+| Guards.cs:283:17:283:28 | call to method ToString | Guards.cs:278:13:279:28 | ... => ... | Guards.cs:279:17:279:28 | call to method ToString | false |
+| Guards.cs:283:17:283:28 | call to method ToString | Guards.cs:282:13:283:28 | ... => ... | Guards.cs:283:17:283:28 | call to method ToString | true |
+| Guards.cs:285:17:285:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | not  |
 | Guards.cs:285:17:285:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | null |
-| Guards.cs:287:17:287:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | match _ |
-| Guards.cs:287:17:287:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | non-match "" |
-| Guards.cs:287:17:287:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | non-match Action<String> a |
-| Guards.cs:287:17:287:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | non-match access to type Action<Object> |
-| Guards.cs:287:17:287:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | non-match null |
-| Guards.cs:287:17:287:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | non-null |
-| Guards.cs:342:27:342:27 | [b (line 339): false] access to parameter b | Guards.cs:341:20:341:20 | access to parameter b | Guards.cs:341:20:341:20 | access to parameter b | false |
-| Guards.cs:342:27:342:27 | [b (line 339): false] access to parameter b | Guards.cs:341:20:341:32 | ... ? ... : ... | Guards.cs:341:20:341:20 | access to parameter b | non-null |
-| Guards.cs:342:27:342:27 | [b (line 339): true] access to parameter b | Guards.cs:341:20:341:20 | access to parameter b | Guards.cs:341:20:341:20 | access to parameter b | false |
-| Guards.cs:342:27:342:27 | [b (line 339): true] access to parameter b | Guards.cs:341:20:341:20 | access to parameter b | Guards.cs:341:20:341:20 | access to parameter b | true |
-| Guards.cs:342:27:342:27 | [b (line 339): true] access to parameter b | Guards.cs:341:20:341:32 | ... ? ... : ... | Guards.cs:341:20:341:20 | access to parameter b | non-null |
-| Guards.cs:343:31:343:31 | access to local variable s | Guards.cs:342:13:342:13 | access to local variable s | Guards.cs:342:13:342:13 | access to local variable s | non-null |
+| Guards.cs:285:17:285:17 | access to parameter o | Guards.cs:278:13:279:28 | ... => ... | Guards.cs:279:17:279:17 | access to parameter o | false |
+| Guards.cs:285:17:285:17 | access to parameter o | Guards.cs:282:13:283:28 | ... => ... | Guards.cs:283:17:283:17 | access to parameter o | false |
+| Guards.cs:285:17:285:17 | access to parameter o | Guards.cs:284:13:285:28 | ... => ... | Guards.cs:285:17:285:17 | access to parameter o | true |
+| Guards.cs:285:17:285:28 | call to method ToString | Guards.cs:278:13:279:28 | ... => ... | Guards.cs:279:17:279:28 | call to method ToString | false |
+| Guards.cs:285:17:285:28 | call to method ToString | Guards.cs:282:13:283:28 | ... => ... | Guards.cs:283:17:283:28 | call to method ToString | false |
+| Guards.cs:285:17:285:28 | call to method ToString | Guards.cs:284:13:285:28 | ... => ... | Guards.cs:285:17:285:28 | call to method ToString | true |
+| Guards.cs:287:17:287:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | not  |
+| Guards.cs:287:17:287:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | not null |
+| Guards.cs:287:17:287:17 | access to parameter o | Guards.cs:278:13:279:28 | ... => ... | Guards.cs:279:17:279:17 | access to parameter o | false |
+| Guards.cs:287:17:287:17 | access to parameter o | Guards.cs:282:13:283:28 | ... => ... | Guards.cs:283:17:283:17 | access to parameter o | false |
+| Guards.cs:287:17:287:17 | access to parameter o | Guards.cs:284:13:285:28 | ... => ... | Guards.cs:285:17:285:17 | access to parameter o | false |
+| Guards.cs:287:17:287:17 | access to parameter o | Guards.cs:286:13:287:28 | ... => ... | Guards.cs:287:17:287:17 | access to parameter o | true |
+| Guards.cs:287:17:287:28 | call to method ToString | Guards.cs:278:13:279:28 | ... => ... | Guards.cs:279:17:279:28 | call to method ToString | false |
+| Guards.cs:287:17:287:28 | call to method ToString | Guards.cs:282:13:283:28 | ... => ... | Guards.cs:283:17:283:28 | call to method ToString | false |
+| Guards.cs:287:17:287:28 | call to method ToString | Guards.cs:284:13:285:28 | ... => ... | Guards.cs:285:17:285:28 | call to method ToString | false |
+| Guards.cs:287:17:287:28 | call to method ToString | Guards.cs:286:13:287:28 | ... => ... | Guards.cs:287:17:287:28 | call to method ToString | true |
+| Guards.cs:342:27:342:27 | access to parameter b | Guards.cs:341:20:341:20 | access to parameter b | Guards.cs:341:20:341:20 | access to parameter b | false |
+| Guards.cs:342:27:342:27 | access to parameter b | Guards.cs:341:20:341:32 | ... ? ... : ... | Guards.cs:341:20:341:20 | access to parameter b | not null |
+| Guards.cs:343:31:343:31 | access to local variable s | Guards.cs:342:13:342:13 | access to local variable s | Guards.cs:342:13:342:13 | access to local variable s | not null |
 | Guards.cs:343:31:343:31 | access to local variable s | Guards.cs:342:13:342:21 | ... != ... | Guards.cs:342:13:342:13 | access to local variable s | true |
-| Guards.cs:349:13:349:13 | access to parameter o | Guards.cs:348:13:348:13 | access to parameter o | Guards.cs:348:13:348:13 | access to parameter o | non-null |
+| Guards.cs:349:13:349:13 | access to parameter o | Guards.cs:348:13:348:13 | access to parameter o | Guards.cs:348:13:348:13 | access to parameter o | not null |
 | Guards.cs:349:13:349:13 | access to parameter o | Guards.cs:348:13:348:25 | ... is ... | Guards.cs:348:13:348:13 | access to parameter o | true |
-| Splitting.cs:13:17:13:17 | [b (line 9): true] access to parameter o | Splitting.cs:12:17:12:17 | access to parameter o | Splitting.cs:12:17:12:17 | access to parameter o | non-null |
-| Splitting.cs:13:17:13:17 | [b (line 9): true] access to parameter o | Splitting.cs:12:17:12:25 | ... != ... | Splitting.cs:12:17:12:17 | access to parameter o | true |
-| Splitting.cs:14:13:14:13 | [b (line 9): false] access to parameter b | Splitting.cs:11:13:11:13 | access to parameter b | Splitting.cs:11:13:11:13 | access to parameter b | false |
-| Splitting.cs:14:13:14:13 | [b (line 9): true] access to parameter b | Splitting.cs:11:13:11:13 | access to parameter b | Splitting.cs:11:13:11:13 | access to parameter b | true |
-| Splitting.cs:23:24:23:24 | access to parameter o | Splitting.cs:22:17:22:17 | access to parameter o | Splitting.cs:22:17:22:17 | access to parameter o | non-null |
-| Splitting.cs:23:24:23:24 | access to parameter o | Splitting.cs:22:17:22:25 | ... != ... | Splitting.cs:22:17:22:17 | access to parameter o | true |
-| Splitting.cs:24:13:24:13 | [b (line 19): false] access to parameter b | Splitting.cs:21:13:21:13 | access to parameter b | Splitting.cs:21:13:21:13 | access to parameter b | false |
-| Splitting.cs:24:13:24:13 | [b (line 19): true] access to parameter b | Splitting.cs:21:13:21:13 | access to parameter b | Splitting.cs:21:13:21:13 | access to parameter b | true |
-| Splitting.cs:25:13:25:13 | access to parameter o | Splitting.cs:22:17:22:17 | access to parameter o | Splitting.cs:22:17:22:17 | access to parameter o | null |
-| Splitting.cs:25:13:25:13 | access to parameter o | Splitting.cs:22:17:22:25 | ... != ... | Splitting.cs:22:17:22:17 | access to parameter o | false |
-| Splitting.cs:34:13:34:13 | [b (line 29): false] access to parameter b | Splitting.cs:31:13:31:13 | access to parameter b | Splitting.cs:31:13:31:13 | access to parameter b | false |
-| Splitting.cs:34:13:34:13 | [b (line 29): true] access to parameter b | Splitting.cs:31:13:31:13 | access to parameter b | Splitting.cs:31:13:31:13 | access to parameter b | true |
-| Splitting.cs:35:13:35:13 | access to parameter o | Splitting.cs:32:17:32:17 | access to parameter o | Splitting.cs:32:17:32:17 | access to parameter o | non-null |
-| Splitting.cs:35:13:35:13 | access to parameter o | Splitting.cs:32:17:32:25 | ... == ... | Splitting.cs:32:17:32:17 | access to parameter o | false |
-| Splitting.cs:44:17:44:17 | [b (line 39): true] access to parameter o | Splitting.cs:41:13:41:13 | access to parameter o | Splitting.cs:41:13:41:13 | access to parameter o | non-null |
-| Splitting.cs:44:17:44:17 | [b (line 39): true] access to parameter o | Splitting.cs:41:13:41:21 | ... != ... | Splitting.cs:41:13:41:13 | access to parameter o | true |
-| Splitting.cs:45:17:45:17 | [b (line 39): false] access to parameter b | Splitting.cs:43:17:43:17 | access to parameter b | Splitting.cs:43:17:43:17 | access to parameter b | false |
-| Splitting.cs:45:17:45:17 | [b (line 39): true] access to parameter b | Splitting.cs:43:17:43:17 | access to parameter b | Splitting.cs:43:17:43:17 | access to parameter b | true |
-| Splitting.cs:46:17:46:17 | access to parameter o | Splitting.cs:41:13:41:13 | access to parameter o | Splitting.cs:41:13:41:13 | access to parameter o | non-null |
-| Splitting.cs:46:17:46:17 | access to parameter o | Splitting.cs:41:13:41:21 | ... != ... | Splitting.cs:41:13:41:13 | access to parameter o | true |
-| Splitting.cs:55:13:55:13 | [b (line 50): false] access to parameter o | Splitting.cs:54:13:54:13 | access to parameter o | Splitting.cs:54:13:54:13 | access to parameter o | non-null |
-| Splitting.cs:55:13:55:13 | [b (line 50): false] access to parameter o | Splitting.cs:54:13:54:21 | ... != ... | Splitting.cs:54:13:54:13 | access to parameter o | true |
-| Splitting.cs:55:13:55:13 | [b (line 50): true] access to parameter o | Splitting.cs:54:13:54:13 | access to parameter o | Splitting.cs:54:13:54:13 | access to parameter o | non-null |
-| Splitting.cs:55:13:55:13 | [b (line 50): true] access to parameter o | Splitting.cs:54:13:54:21 | ... != ... | Splitting.cs:54:13:54:13 | access to parameter o | true |
-| Splitting.cs:56:13:56:13 | [b (line 50): false] access to parameter b | Splitting.cs:52:13:52:13 | access to parameter b | Splitting.cs:52:13:52:13 | access to parameter b | false |
-| Splitting.cs:56:13:56:13 | [b (line 50): true] access to parameter b | Splitting.cs:52:13:52:13 | access to parameter b | Splitting.cs:52:13:52:13 | access to parameter b | true |
-| Splitting.cs:66:20:66:20 | access to parameter o | Splitting.cs:65:13:65:13 | access to parameter o | Splitting.cs:65:13:65:13 | access to parameter o | non-null |
-| Splitting.cs:66:20:66:20 | access to parameter o | Splitting.cs:65:13:65:21 | ... != ... | Splitting.cs:65:13:65:13 | access to parameter o | true |
-| Splitting.cs:67:13:67:13 | [b (line 61): false] access to parameter b | Splitting.cs:63:13:63:13 | access to parameter b | Splitting.cs:63:13:63:13 | access to parameter b | false |
-| Splitting.cs:67:13:67:13 | [b (line 61): true] access to parameter b | Splitting.cs:63:13:63:13 | access to parameter b | Splitting.cs:63:13:63:13 | access to parameter b | true |
-| Splitting.cs:68:13:68:13 | access to parameter o | Splitting.cs:65:13:65:13 | access to parameter o | Splitting.cs:65:13:65:13 | access to parameter o | null |
-| Splitting.cs:68:13:68:13 | access to parameter o | Splitting.cs:65:13:65:21 | ... != ... | Splitting.cs:65:13:65:13 | access to parameter o | false |
-| Splitting.cs:69:16:69:16 | access to parameter o | Splitting.cs:65:13:65:13 | access to parameter o | Splitting.cs:65:13:65:13 | access to parameter o | null |
-| Splitting.cs:69:16:69:16 | access to parameter o | Splitting.cs:65:13:65:21 | ... != ... | Splitting.cs:65:13:65:13 | access to parameter o | false |
-| Splitting.cs:78:24:78:24 | access to parameter o | Splitting.cs:76:13:76:13 | access to parameter o | Splitting.cs:76:13:76:13 | access to parameter o | non-null |
-| Splitting.cs:78:24:78:24 | access to parameter o | Splitting.cs:76:13:76:21 | ... != ... | Splitting.cs:76:13:76:13 | access to parameter o | true |
-| Splitting.cs:79:13:79:13 | [b (line 72): false] access to parameter b | Splitting.cs:74:13:74:13 | access to parameter b | Splitting.cs:74:13:74:13 | access to parameter b | false |
-| Splitting.cs:79:13:79:13 | [b (line 72): true] access to parameter b | Splitting.cs:74:13:74:13 | access to parameter b | Splitting.cs:74:13:74:13 | access to parameter b | true |
-| Splitting.cs:88:9:88:9 | [b (line 84): true] access to parameter o | Splitting.cs:87:26:87:26 | access to parameter o | Splitting.cs:87:26:87:26 | access to parameter o | non-null |
-| Splitting.cs:88:9:88:9 | [b (line 84): true] access to parameter o | Splitting.cs:87:26:87:34 | ... != ... | Splitting.cs:87:26:87:26 | access to parameter o | true |
-| Splitting.cs:89:13:89:13 | [b (line 84): false] access to parameter b | Splitting.cs:86:13:86:13 | access to parameter b | Splitting.cs:86:13:86:13 | access to parameter b | false |
-| Splitting.cs:89:13:89:13 | [b (line 84): true] access to parameter b | Splitting.cs:86:13:86:13 | access to parameter b | Splitting.cs:86:13:86:13 | access to parameter b | true |
-| Splitting.cs:90:13:90:13 | access to parameter o | Splitting.cs:87:26:87:26 | access to parameter o | Splitting.cs:87:26:87:26 | access to parameter o | non-null |
-| Splitting.cs:90:13:90:13 | access to parameter o | Splitting.cs:87:26:87:34 | ... != ... | Splitting.cs:87:26:87:26 | access to parameter o | true |
-| Splitting.cs:98:13:98:13 | [b (line 94): false] access to parameter b | Splitting.cs:96:13:96:13 | access to parameter b | Splitting.cs:96:13:96:13 | access to parameter b | false |
-| Splitting.cs:98:13:98:13 | [b (line 94): true] access to parameter b | Splitting.cs:96:13:96:13 | access to parameter b | Splitting.cs:96:13:96:13 | access to parameter b | true |
-| Splitting.cs:99:13:99:13 | access to parameter o | Splitting.cs:97:26:97:26 | access to parameter o | Splitting.cs:97:26:97:26 | access to parameter o | null |
-| Splitting.cs:99:13:99:13 | access to parameter o | Splitting.cs:97:26:97:34 | ... == ... | Splitting.cs:97:26:97:26 | access to parameter o | true |
-| Splitting.cs:107:13:107:13 | [b (line 103): true] access to parameter o | Splitting.cs:105:22:105:22 | access to parameter o | Splitting.cs:105:22:105:22 | access to parameter o | non-null |
-| Splitting.cs:107:13:107:13 | [b (line 103): true] access to parameter o | Splitting.cs:105:22:105:30 | ... != ... | Splitting.cs:105:22:105:22 | access to parameter o | true |
-| Splitting.cs:108:13:108:13 | [b (line 103): false] access to parameter b | Splitting.cs:106:13:106:13 | access to parameter b | Splitting.cs:106:13:106:13 | access to parameter b | false |
-| Splitting.cs:108:13:108:13 | [b (line 103): true] access to parameter b | Splitting.cs:106:13:106:13 | access to parameter b | Splitting.cs:106:13:106:13 | access to parameter b | true |
-| Splitting.cs:109:13:109:13 | access to parameter o | Splitting.cs:105:22:105:22 | access to parameter o | Splitting.cs:105:22:105:22 | access to parameter o | non-null |
-| Splitting.cs:109:13:109:13 | access to parameter o | Splitting.cs:105:22:105:30 | ... != ... | Splitting.cs:105:22:105:22 | access to parameter o | true |
-| Splitting.cs:117:9:117:9 | [b (line 112): false] access to parameter o | Splitting.cs:116:22:116:22 | access to parameter o | Splitting.cs:116:22:116:22 | access to parameter o | non-null |
-| Splitting.cs:117:9:117:9 | [b (line 112): false] access to parameter o | Splitting.cs:116:22:116:30 | ... != ... | Splitting.cs:116:22:116:22 | access to parameter o | true |
-| Splitting.cs:117:9:117:9 | [b (line 112): true] access to parameter o | Splitting.cs:116:22:116:22 | access to parameter o | Splitting.cs:116:22:116:22 | access to parameter o | non-null |
-| Splitting.cs:117:9:117:9 | [b (line 112): true] access to parameter o | Splitting.cs:116:22:116:30 | ... != ... | Splitting.cs:116:22:116:22 | access to parameter o | true |
-| Splitting.cs:118:13:118:13 | [b (line 112): false] access to parameter b | Splitting.cs:114:13:114:13 | access to parameter b | Splitting.cs:114:13:114:13 | access to parameter b | false |
-| Splitting.cs:118:13:118:13 | [b (line 112): true] access to parameter b | Splitting.cs:114:13:114:13 | access to parameter b | Splitting.cs:114:13:114:13 | access to parameter b | true |
-| Splitting.cs:119:13:119:13 | access to parameter o | Splitting.cs:116:22:116:22 | access to parameter o | Splitting.cs:116:22:116:22 | access to parameter o | non-null |
-| Splitting.cs:119:13:119:13 | access to parameter o | Splitting.cs:116:22:116:30 | ... != ... | Splitting.cs:116:22:116:22 | access to parameter o | true |
-| Splitting.cs:120:16:120:16 | access to parameter o | Splitting.cs:116:22:116:22 | access to parameter o | Splitting.cs:116:22:116:22 | access to parameter o | non-null |
-| Splitting.cs:120:16:120:16 | access to parameter o | Splitting.cs:116:22:116:30 | ... != ... | Splitting.cs:116:22:116:22 | access to parameter o | true |
-| Splitting.cs:131:21:131:21 | [b (line 123): false] access to parameter b | Splitting.cs:131:21:131:21 | access to parameter b | Splitting.cs:131:21:131:21 | access to parameter b | false |
-| Splitting.cs:133:25:133:25 | [b (line 123): false] access to parameter b | Splitting.cs:131:21:131:21 | access to parameter b | Splitting.cs:131:21:131:21 | access to parameter b | false |
diff --git a/csharp/ql/test/library-tests/controlflow/guards/GuardedControlFlowNode.ql b/csharp/ql/test/library-tests/controlflow/guards/GuardedControlFlowNode.ql
index 82d843a2a41..183a097c27e 100644
--- a/csharp/ql/test/library-tests/controlflow/guards/GuardedControlFlowNode.ql
+++ b/csharp/ql/test/library-tests/controlflow/guards/GuardedControlFlowNode.ql
@@ -1,5 +1,5 @@
 import csharp
 import semmle.code.csharp.controlflow.Guards
 
-from GuardedControlFlowNode gcfn, Expr sub, AbstractValue v
+from GuardedControlFlowNode gcfn, Expr sub, GuardValue v
 select gcfn, gcfn.getAGuard(sub, v), sub, v
diff --git a/csharp/ql/test/library-tests/controlflow/guards/GuardedExpr.expected b/csharp/ql/test/library-tests/controlflow/guards/GuardedExpr.expected
index c61f41519ad..b34cae88b80 100644
--- a/csharp/ql/test/library-tests/controlflow/guards/GuardedExpr.expected
+++ b/csharp/ql/test/library-tests/controlflow/guards/GuardedExpr.expected
@@ -1,22 +1,29 @@
-| Assert.cs:11:27:11:27 | access to local variable s | Assert.cs:10:22:10:22 | access to local variable s | Assert.cs:10:22:10:22 | access to local variable s | non-null |
+| Assert.cs:11:27:11:27 | access to local variable s | Assert.cs:10:9:10:31 | call to method Assert | Assert.cs:10:22:10:22 | access to local variable s | no exception |
+| Assert.cs:11:27:11:27 | access to local variable s | Assert.cs:10:22:10:22 | access to local variable s | Assert.cs:10:22:10:22 | access to local variable s | not null |
 | Assert.cs:11:27:11:27 | access to local variable s | Assert.cs:10:22:10:30 | ... != ... | Assert.cs:10:22:10:22 | access to local variable s | true |
+| Assert.cs:18:27:18:27 | access to local variable s | Assert.cs:17:9:17:24 | call to method IsNull | Assert.cs:17:23:17:23 | access to local variable s | no exception |
 | Assert.cs:18:27:18:27 | access to local variable s | Assert.cs:17:23:17:23 | access to local variable s | Assert.cs:17:23:17:23 | access to local variable s | null |
-| Assert.cs:25:27:25:27 | access to local variable s | Assert.cs:24:26:24:26 | access to local variable s | Assert.cs:24:26:24:26 | access to local variable s | non-null |
+| Assert.cs:25:27:25:27 | access to local variable s | Assert.cs:24:9:24:27 | call to method IsNotNull | Assert.cs:24:26:24:26 | access to local variable s | no exception |
+| Assert.cs:25:27:25:27 | access to local variable s | Assert.cs:24:26:24:26 | access to local variable s | Assert.cs:24:26:24:26 | access to local variable s | not null |
+| Assert.cs:32:27:32:27 | access to local variable s | Assert.cs:31:9:31:32 | call to method IsTrue | Assert.cs:31:23:31:23 | access to local variable s | no exception |
 | Assert.cs:32:27:32:27 | access to local variable s | Assert.cs:31:23:31:23 | access to local variable s | Assert.cs:31:23:31:23 | access to local variable s | null |
 | Assert.cs:32:27:32:27 | access to local variable s | Assert.cs:31:23:31:31 | ... == ... | Assert.cs:31:23:31:23 | access to local variable s | true |
-| Assert.cs:39:27:39:27 | access to local variable s | Assert.cs:38:23:38:23 | access to local variable s | Assert.cs:38:23:38:23 | access to local variable s | non-null |
+| Assert.cs:39:27:39:27 | access to local variable s | Assert.cs:38:9:38:32 | call to method IsTrue | Assert.cs:38:23:38:23 | access to local variable s | no exception |
+| Assert.cs:39:27:39:27 | access to local variable s | Assert.cs:38:23:38:23 | access to local variable s | Assert.cs:38:23:38:23 | access to local variable s | not null |
 | Assert.cs:39:27:39:27 | access to local variable s | Assert.cs:38:23:38:31 | ... != ... | Assert.cs:38:23:38:23 | access to local variable s | true |
+| Assert.cs:46:27:46:27 | access to local variable s | Assert.cs:45:9:45:33 | call to method IsFalse | Assert.cs:45:24:45:24 | access to local variable s | no exception |
 | Assert.cs:46:27:46:27 | access to local variable s | Assert.cs:45:24:45:24 | access to local variable s | Assert.cs:45:24:45:24 | access to local variable s | null |
 | Assert.cs:46:27:46:27 | access to local variable s | Assert.cs:45:24:45:32 | ... != ... | Assert.cs:45:24:45:24 | access to local variable s | false |
-| Assert.cs:53:27:53:27 | access to local variable s | Assert.cs:52:24:52:24 | access to local variable s | Assert.cs:52:24:52:24 | access to local variable s | non-null |
+| Assert.cs:53:27:53:27 | access to local variable s | Assert.cs:52:9:52:33 | call to method IsFalse | Assert.cs:52:24:52:24 | access to local variable s | no exception |
+| Assert.cs:53:27:53:27 | access to local variable s | Assert.cs:52:24:52:24 | access to local variable s | Assert.cs:52:24:52:24 | access to local variable s | not null |
 | Assert.cs:53:27:53:27 | access to local variable s | Assert.cs:52:24:52:32 | ... == ... | Assert.cs:52:24:52:24 | access to local variable s | false |
 | Assert.cs:59:36:59:36 | access to parameter b | Assert.cs:58:20:58:20 | access to parameter b | Assert.cs:58:20:58:20 | access to parameter b | false |
-| Assert.cs:59:36:59:36 | access to parameter b | Assert.cs:58:20:58:32 | ... ? ... : ... | Assert.cs:58:20:58:20 | access to parameter b | non-null |
-| Assert.cs:60:27:60:27 | access to local variable s | Assert.cs:59:23:59:23 | access to local variable s | Assert.cs:59:23:59:23 | access to local variable s | non-null |
+| Assert.cs:59:36:59:36 | access to parameter b | Assert.cs:58:20:58:32 | ... ? ... : ... | Assert.cs:58:20:58:20 | access to parameter b | not null |
+| Assert.cs:60:27:60:27 | access to local variable s | Assert.cs:59:23:59:23 | access to local variable s | Assert.cs:59:23:59:23 | access to local variable s | not null |
 | Assert.cs:60:27:60:27 | access to local variable s | Assert.cs:59:23:59:31 | ... != ... | Assert.cs:59:23:59:23 | access to local variable s | true |
 | Assert.cs:66:37:66:37 | access to parameter b | Assert.cs:65:20:65:20 | access to parameter b | Assert.cs:65:20:65:20 | access to parameter b | false |
-| Assert.cs:66:37:66:37 | access to parameter b | Assert.cs:65:20:65:32 | ... ? ... : ... | Assert.cs:65:20:65:20 | access to parameter b | non-null |
-| Assert.cs:67:27:67:27 | access to local variable s | Assert.cs:66:24:66:24 | access to local variable s | Assert.cs:66:24:66:24 | access to local variable s | non-null |
+| Assert.cs:66:37:66:37 | access to parameter b | Assert.cs:65:20:65:32 | ... ? ... : ... | Assert.cs:65:20:65:20 | access to parameter b | not null |
+| Assert.cs:67:27:67:27 | access to local variable s | Assert.cs:66:24:66:24 | access to local variable s | Assert.cs:66:24:66:24 | access to local variable s | not null |
 | Assert.cs:67:27:67:27 | access to local variable s | Assert.cs:66:24:66:32 | ... == ... | Assert.cs:66:24:66:24 | access to local variable s | false |
 | Assert.cs:73:36:73:36 | access to parameter b | Assert.cs:72:20:72:20 | access to parameter b | Assert.cs:72:20:72:20 | access to parameter b | true |
 | Assert.cs:73:36:73:36 | access to parameter b | Assert.cs:72:20:72:32 | ... ? ... : ... | Assert.cs:72:20:72:20 | access to parameter b | null |
@@ -26,207 +33,180 @@
 | Assert.cs:80:37:80:37 | access to parameter b | Assert.cs:79:20:79:32 | ... ? ... : ... | Assert.cs:79:20:79:20 | access to parameter b | null |
 | Assert.cs:81:27:81:27 | access to local variable s | Assert.cs:80:24:80:24 | access to local variable s | Assert.cs:80:24:80:24 | access to local variable s | null |
 | Assert.cs:81:27:81:27 | access to local variable s | Assert.cs:80:24:80:32 | ... != ... | Assert.cs:80:24:80:24 | access to local variable s | false |
+| Assert.cs:94:16:94:17 | access to parameter b1 | Assert.cs:93:9:93:35 | call to method AssertTrueFalse | Assert.cs:93:25:93:26 | access to parameter b1 | no exception |
 | Assert.cs:94:16:94:17 | access to parameter b1 | Assert.cs:93:25:93:26 | access to parameter b1 | Assert.cs:93:25:93:26 | access to parameter b1 | true |
+| Assert.cs:94:23:94:24 | access to parameter b2 | Assert.cs:93:9:93:35 | call to method AssertTrueFalse | Assert.cs:93:29:93:30 | access to parameter b2 | no exception |
+| Assert.cs:94:23:94:24 | access to parameter b2 | Assert.cs:93:9:93:35 | call to method AssertTrueFalse | Assert.cs:93:33:93:34 | access to parameter b2 | no exception |
 | Assert.cs:94:23:94:24 | access to parameter b2 | Assert.cs:93:29:93:30 | access to parameter b2 | Assert.cs:93:29:93:30 | access to parameter b2 | false |
-| Collections.cs:51:17:51:20 | access to parameter args | Collections.cs:49:13:49:16 | access to parameter args | Collections.cs:49:13:49:16 | access to parameter args | non-empty |
+| Collections.cs:51:17:51:20 | access to parameter args | Collections.cs:49:13:49:22 | access to property Count | Collections.cs:49:13:49:16 | access to parameter args | not 0 |
 | Collections.cs:51:17:51:20 | access to parameter args | Collections.cs:49:13:49:27 | ... == ... | Collections.cs:49:13:49:16 | access to parameter args | false |
+| Collections.cs:52:9:52:12 | access to parameter args | Collections.cs:49:13:49:22 | access to property Count | Collections.cs:49:13:49:16 | access to parameter args | not 0 |
 | Collections.cs:52:9:52:12 | access to parameter args | Collections.cs:49:13:49:27 | ... == ... | Collections.cs:49:13:49:16 | access to parameter args | false |
+| Collections.cs:53:13:53:16 | access to parameter args | Collections.cs:49:13:49:22 | access to property Count | Collections.cs:49:13:49:16 | access to parameter args | not 0 |
 | Collections.cs:53:13:53:16 | access to parameter args | Collections.cs:49:13:49:27 | ... == ... | Collections.cs:49:13:49:16 | access to parameter args | false |
-| Collections.cs:66:13:66:13 | access to local variable x | Collections.cs:64:13:64:13 | access to local variable x | Collections.cs:64:13:64:13 | access to local variable x | empty |
+| Collections.cs:66:13:66:13 | access to local variable x | Collections.cs:64:13:64:19 | access to property Count | Collections.cs:64:13:64:13 | access to local variable x | 0 |
 | Collections.cs:66:13:66:13 | access to local variable x | Collections.cs:64:13:64:24 | ... == ... | Collections.cs:64:13:64:13 | access to local variable x | true |
+| Collections.cs:67:13:67:13 | access to local variable x | Collections.cs:64:13:64:19 | access to property Count | Collections.cs:64:13:64:13 | access to local variable x | 0 |
 | Collections.cs:67:13:67:13 | access to local variable x | Collections.cs:64:13:64:24 | ... == ... | Collections.cs:64:13:64:13 | access to local variable x | true |
-| Collections.cs:95:31:95:34 | access to parameter args | Collections.cs:94:29:94:32 | access to parameter args | Collections.cs:94:29:94:32 | access to parameter args | non-empty |
-| Guards.cs:12:13:12:13 | access to parameter s | Guards.cs:10:16:10:16 | access to parameter s | Guards.cs:10:16:10:16 | access to parameter s | non-null |
+| Guards.cs:12:13:12:13 | access to parameter s | Guards.cs:10:16:10:16 | access to parameter s | Guards.cs:10:16:10:16 | access to parameter s | not null |
 | Guards.cs:12:13:12:13 | access to parameter s | Guards.cs:10:16:10:24 | ... == ... | Guards.cs:10:16:10:16 | access to parameter s | false |
-| Guards.cs:14:31:14:31 | access to parameter s | Guards.cs:10:16:10:16 | access to parameter s | Guards.cs:10:16:10:16 | access to parameter s | non-null |
+| Guards.cs:14:31:14:31 | access to parameter s | Guards.cs:10:16:10:16 | access to parameter s | Guards.cs:10:16:10:16 | access to parameter s | not null |
 | Guards.cs:14:31:14:31 | access to parameter s | Guards.cs:10:16:10:24 | ... == ... | Guards.cs:10:16:10:16 | access to parameter s | false |
 | Guards.cs:14:31:14:31 | access to parameter s | Guards.cs:12:13:12:24 | ... > ... | Guards.cs:12:13:12:13 | access to parameter s | true |
-| Guards.cs:26:31:26:31 | access to parameter s | Guards.cs:24:13:24:13 | access to parameter s | Guards.cs:24:13:24:13 | access to parameter s | non-null |
+| Guards.cs:26:31:26:31 | access to parameter s | Guards.cs:24:13:24:13 | access to parameter s | Guards.cs:24:13:24:13 | access to parameter s | not null |
 | Guards.cs:26:31:26:31 | access to parameter s | Guards.cs:24:13:24:21 | ... != ... | Guards.cs:24:13:24:13 | access to parameter s | true |
 | Guards.cs:33:31:33:31 | access to parameter x | Guards.cs:32:14:32:36 | call to method IsNullOrEmpty | Guards.cs:32:35:32:35 | access to parameter x | false |
-| Guards.cs:33:31:33:31 | access to parameter x | Guards.cs:32:35:32:35 | access to parameter x | Guards.cs:32:35:32:35 | access to parameter x | non-null |
-| Guards.cs:33:35:33:35 | access to parameter y | Guards.cs:32:42:32:42 | access to parameter y | Guards.cs:32:42:32:42 | access to parameter y | non-null |
+| Guards.cs:33:31:33:31 | access to parameter x | Guards.cs:32:35:32:35 | access to parameter x | Guards.cs:32:35:32:35 | access to parameter x | not null |
+| Guards.cs:33:35:33:35 | access to parameter y | Guards.cs:32:42:32:42 | access to parameter y | Guards.cs:32:42:32:42 | access to parameter y | not null |
 | Guards.cs:33:35:33:35 | access to parameter y | Guards.cs:32:42:32:50 | ... == ... | Guards.cs:32:42:32:42 | access to parameter y | false |
-| Guards.cs:36:32:36:32 | access to parameter x | Guards.cs:35:13:35:13 | access to parameter x | Guards.cs:35:13:35:13 | access to parameter x | non-null |
+| Guards.cs:36:32:36:32 | access to parameter x | Guards.cs:35:13:35:13 | access to parameter x | Guards.cs:35:13:35:13 | access to parameter x | not null |
 | Guards.cs:36:32:36:32 | access to parameter x | Guards.cs:35:13:35:21 | ... == ... | Guards.cs:35:13:35:13 | access to parameter x | false |
-| Guards.cs:36:36:36:36 | access to parameter y | Guards.cs:35:26:35:26 | access to parameter y | Guards.cs:35:26:35:26 | access to parameter y | non-null |
+| Guards.cs:36:36:36:36 | access to parameter y | Guards.cs:35:26:35:26 | access to parameter y | Guards.cs:35:26:35:26 | access to parameter y | not null |
 | Guards.cs:36:36:36:36 | access to parameter y | Guards.cs:35:26:35:34 | ... == ... | Guards.cs:35:26:35:26 | access to parameter y | false |
-| Guards.cs:39:31:39:31 | access to parameter x | Guards.cs:38:15:38:15 | access to parameter x | Guards.cs:38:15:38:15 | access to parameter x | non-null |
+| Guards.cs:39:31:39:31 | access to parameter x | Guards.cs:38:15:38:15 | access to parameter x | Guards.cs:38:15:38:15 | access to parameter x | not null |
 | Guards.cs:39:31:39:31 | access to parameter x | Guards.cs:38:15:38:23 | ... == ... | Guards.cs:38:15:38:15 | access to parameter x | false |
-| Guards.cs:39:35:39:35 | access to parameter y | Guards.cs:38:28:38:28 | access to parameter y | Guards.cs:38:28:38:28 | access to parameter y | non-null |
+| Guards.cs:39:35:39:35 | access to parameter y | Guards.cs:38:28:38:28 | access to parameter y | Guards.cs:38:28:38:28 | access to parameter y | not null |
 | Guards.cs:39:35:39:35 | access to parameter y | Guards.cs:38:28:38:36 | ... == ... | Guards.cs:38:28:38:28 | access to parameter y | false |
-| Guards.cs:42:32:42:32 | access to parameter x | Guards.cs:41:17:41:17 | access to parameter x | Guards.cs:41:17:41:17 | access to parameter x | non-null |
+| Guards.cs:42:32:42:32 | access to parameter x | Guards.cs:41:17:41:17 | access to parameter x | Guards.cs:41:17:41:17 | access to parameter x | not null |
 | Guards.cs:42:32:42:32 | access to parameter x | Guards.cs:41:17:41:25 | ... != ... | Guards.cs:41:17:41:17 | access to parameter x | true |
-| Guards.cs:42:36:42:36 | access to parameter y | Guards.cs:41:30:41:30 | access to parameter y | Guards.cs:41:30:41:30 | access to parameter y | non-null |
+| Guards.cs:42:36:42:36 | access to parameter y | Guards.cs:41:30:41:30 | access to parameter y | Guards.cs:41:30:41:30 | access to parameter y | not null |
 | Guards.cs:42:36:42:36 | access to parameter y | Guards.cs:41:30:41:38 | ... != ... | Guards.cs:41:30:41:30 | access to parameter y | true |
-| Guards.cs:48:31:48:40 | access to field Field | Guards.cs:47:13:47:17 | access to field Field | Guards.cs:47:13:47:17 | access to field Field | non-null |
+| Guards.cs:48:31:48:40 | access to field Field | Guards.cs:47:13:47:17 | access to field Field | Guards.cs:47:13:47:17 | access to field Field | not null |
 | Guards.cs:48:31:48:40 | access to field Field | Guards.cs:47:13:47:25 | ... != ... | Guards.cs:47:13:47:17 | access to field Field | true |
-| Guards.cs:55:27:55:27 | access to parameter g | Guards.cs:53:13:53:19 | access to field Field | Guards.cs:53:13:53:13 | access to parameter g | non-null |
+| Guards.cs:55:27:55:27 | access to parameter g | Guards.cs:53:13:53:19 | access to field Field | Guards.cs:53:13:53:13 | access to parameter g | not null |
 | Guards.cs:55:27:55:27 | access to parameter g | Guards.cs:53:13:53:27 | ... == ... | Guards.cs:53:13:53:13 | access to parameter g | false |
-| Guards.cs:55:27:55:33 | access to field Field | Guards.cs:53:13:53:19 | access to field Field | Guards.cs:53:13:53:19 | access to field Field | non-null |
+| Guards.cs:55:27:55:33 | access to field Field | Guards.cs:53:13:53:19 | access to field Field | Guards.cs:53:13:53:19 | access to field Field | not null |
 | Guards.cs:55:27:55:33 | access to field Field | Guards.cs:53:13:53:27 | ... == ... | Guards.cs:53:13:53:19 | access to field Field | false |
-| Guards.cs:62:27:62:27 | access to parameter g | Guards.cs:60:13:60:37 | access to field Field | Guards.cs:60:13:60:13 | access to parameter g | non-null |
+| Guards.cs:62:27:62:27 | access to parameter g | Guards.cs:60:13:60:37 | access to field Field | Guards.cs:60:13:60:13 | access to parameter g | not null |
 | Guards.cs:62:27:62:27 | access to parameter g | Guards.cs:60:13:60:45 | ... == ... | Guards.cs:60:13:60:13 | access to parameter g | false |
-| Guards.cs:62:27:62:36 | access to property Property | Guards.cs:60:13:60:37 | access to field Field | Guards.cs:60:13:60:22 | access to property Property | non-null |
+| Guards.cs:62:27:62:36 | access to property Property | Guards.cs:60:13:60:37 | access to field Field | Guards.cs:60:13:60:22 | access to property Property | not null |
 | Guards.cs:62:27:62:36 | access to property Property | Guards.cs:60:13:60:45 | ... == ... | Guards.cs:60:13:60:22 | access to property Property | false |
-| Guards.cs:62:27:62:45 | access to property Property | Guards.cs:60:13:60:37 | access to field Field | Guards.cs:60:13:60:31 | access to property Property | non-null |
+| Guards.cs:62:27:62:45 | access to property Property | Guards.cs:60:13:60:37 | access to field Field | Guards.cs:60:13:60:31 | access to property Property | not null |
 | Guards.cs:62:27:62:45 | access to property Property | Guards.cs:60:13:60:45 | ... == ... | Guards.cs:60:13:60:31 | access to property Property | false |
-| Guards.cs:62:27:62:51 | access to field Field | Guards.cs:60:13:60:37 | access to field Field | Guards.cs:60:13:60:37 | access to field Field | non-null |
+| Guards.cs:62:27:62:51 | access to field Field | Guards.cs:60:13:60:37 | access to field Field | Guards.cs:60:13:60:37 | access to field Field | not null |
 | Guards.cs:62:27:62:51 | access to field Field | Guards.cs:60:13:60:45 | ... == ... | Guards.cs:60:13:60:37 | access to field Field | false |
-| Guards.cs:63:27:63:27 | access to parameter g | Guards.cs:60:13:60:37 | access to field Field | Guards.cs:60:13:60:13 | access to parameter g | non-null |
+| Guards.cs:63:27:63:27 | access to parameter g | Guards.cs:60:13:60:37 | access to field Field | Guards.cs:60:13:60:13 | access to parameter g | not null |
 | Guards.cs:63:27:63:27 | access to parameter g | Guards.cs:60:13:60:45 | ... == ... | Guards.cs:60:13:60:13 | access to parameter g | false |
-| Guards.cs:63:27:63:36 | access to property Property | Guards.cs:60:13:60:37 | access to field Field | Guards.cs:60:13:60:22 | access to property Property | non-null |
+| Guards.cs:63:27:63:36 | access to property Property | Guards.cs:60:13:60:37 | access to field Field | Guards.cs:60:13:60:22 | access to property Property | not null |
 | Guards.cs:63:27:63:36 | access to property Property | Guards.cs:60:13:60:45 | ... == ... | Guards.cs:60:13:60:22 | access to property Property | false |
-| Guards.cs:70:31:70:31 | access to parameter s | Guards.cs:68:16:68:16 | access to parameter s | Guards.cs:68:16:68:16 | access to parameter s | non-null |
+| Guards.cs:70:31:70:31 | access to parameter s | Guards.cs:68:16:68:16 | access to parameter s | Guards.cs:68:16:68:16 | access to parameter s | not null |
 | Guards.cs:70:31:70:31 | access to parameter s | Guards.cs:68:16:68:24 | ... != ... | Guards.cs:68:16:68:16 | access to parameter s | true |
-| Guards.cs:79:31:79:31 | access to parameter s | Guards.cs:78:13:78:13 | access to parameter s | Guards.cs:78:13:78:13 | access to parameter s | non-null |
-| Guards.cs:79:31:79:31 | access to parameter s | Guards.cs:78:13:78:21 | access to property Length | Guards.cs:78:13:78:13 | access to parameter s | non-null |
+| Guards.cs:79:31:79:31 | access to parameter s | Guards.cs:78:13:78:13 | access to parameter s | Guards.cs:78:13:78:13 | access to parameter s | not null |
+| Guards.cs:79:31:79:31 | access to parameter s | Guards.cs:78:13:78:21 | access to property Length | Guards.cs:78:13:78:13 | access to parameter s | not null |
 | Guards.cs:79:31:79:31 | access to parameter s | Guards.cs:78:13:78:26 | ... == ... | Guards.cs:78:13:78:13 | access to parameter s | true |
-| Guards.cs:81:31:81:31 | access to parameter s | Guards.cs:80:13:80:13 | access to parameter s | Guards.cs:80:13:80:13 | access to parameter s | non-null |
-| Guards.cs:81:31:81:31 | access to parameter s | Guards.cs:80:13:80:21 | access to property Length | Guards.cs:80:13:80:13 | access to parameter s | non-null |
+| Guards.cs:81:31:81:31 | access to parameter s | Guards.cs:80:13:80:13 | access to parameter s | Guards.cs:80:13:80:13 | access to parameter s | not null |
+| Guards.cs:81:31:81:31 | access to parameter s | Guards.cs:80:13:80:21 | access to property Length | Guards.cs:80:13:80:13 | access to parameter s | not null |
 | Guards.cs:81:31:81:31 | access to parameter s | Guards.cs:80:13:80:25 | ... > ... | Guards.cs:80:13:80:13 | access to parameter s | true |
-| Guards.cs:83:31:83:31 | access to parameter s | Guards.cs:82:13:82:13 | access to parameter s | Guards.cs:82:13:82:13 | access to parameter s | non-null |
-| Guards.cs:83:31:83:31 | access to parameter s | Guards.cs:82:13:82:21 | access to property Length | Guards.cs:82:13:82:13 | access to parameter s | non-null |
+| Guards.cs:83:31:83:31 | access to parameter s | Guards.cs:82:13:82:13 | access to parameter s | Guards.cs:82:13:82:13 | access to parameter s | not null |
+| Guards.cs:83:31:83:31 | access to parameter s | Guards.cs:82:13:82:21 | access to property Length | Guards.cs:82:13:82:13 | access to parameter s | not null |
 | Guards.cs:83:31:83:31 | access to parameter s | Guards.cs:82:13:82:26 | ... >= ... | Guards.cs:82:13:82:13 | access to parameter s | true |
-| Guards.cs:85:31:85:31 | access to parameter s | Guards.cs:84:13:84:13 | access to parameter s | Guards.cs:84:13:84:13 | access to parameter s | non-null |
-| Guards.cs:85:31:85:31 | access to parameter s | Guards.cs:84:13:84:21 | access to property Length | Guards.cs:84:13:84:13 | access to parameter s | non-null |
+| Guards.cs:85:31:85:31 | access to parameter s | Guards.cs:84:13:84:13 | access to parameter s | Guards.cs:84:13:84:13 | access to parameter s | not null |
+| Guards.cs:85:31:85:31 | access to parameter s | Guards.cs:84:13:84:21 | access to property Length | Guards.cs:84:13:84:13 | access to parameter s | not null |
 | Guards.cs:85:31:85:31 | access to parameter s | Guards.cs:84:13:84:26 | ... < ... | Guards.cs:84:13:84:13 | access to parameter s | true |
-| Guards.cs:87:31:87:31 | access to parameter s | Guards.cs:86:13:86:13 | access to parameter s | Guards.cs:86:13:86:13 | access to parameter s | non-null |
-| Guards.cs:87:31:87:31 | access to parameter s | Guards.cs:86:13:86:21 | access to property Length | Guards.cs:86:13:86:13 | access to parameter s | non-null |
+| Guards.cs:87:31:87:31 | access to parameter s | Guards.cs:86:13:86:13 | access to parameter s | Guards.cs:86:13:86:13 | access to parameter s | not null |
+| Guards.cs:87:31:87:31 | access to parameter s | Guards.cs:86:13:86:21 | access to property Length | Guards.cs:86:13:86:13 | access to parameter s | not null |
 | Guards.cs:87:31:87:31 | access to parameter s | Guards.cs:86:13:86:27 | ... <= ... | Guards.cs:86:13:86:13 | access to parameter s | true |
-| Guards.cs:89:31:89:31 | access to parameter s | Guards.cs:88:13:88:13 | access to parameter s | Guards.cs:88:13:88:13 | access to parameter s | non-null |
-| Guards.cs:89:31:89:31 | access to parameter s | Guards.cs:88:13:88:21 | access to property Length | Guards.cs:88:13:88:13 | access to parameter s | non-null |
+| Guards.cs:89:31:89:31 | access to parameter s | Guards.cs:88:13:88:13 | access to parameter s | Guards.cs:88:13:88:13 | access to parameter s | not null |
+| Guards.cs:89:31:89:31 | access to parameter s | Guards.cs:88:13:88:21 | access to property Length | Guards.cs:88:13:88:13 | access to parameter s | not null |
 | Guards.cs:89:31:89:31 | access to parameter s | Guards.cs:88:13:88:29 | ... != ... | Guards.cs:88:13:88:13 | access to parameter s | true |
 | Guards.cs:91:31:91:31 | access to parameter s | Guards.cs:88:13:88:13 | access to parameter s | Guards.cs:88:13:88:13 | access to parameter s | null |
 | Guards.cs:91:31:91:31 | access to parameter s | Guards.cs:88:13:88:21 | access to property Length | Guards.cs:88:13:88:13 | access to parameter s | null |
 | Guards.cs:91:31:91:31 | access to parameter s | Guards.cs:88:13:88:29 | ... != ... | Guards.cs:88:13:88:13 | access to parameter s | false |
 | Guards.cs:93:31:93:31 | access to parameter s | Guards.cs:92:13:92:30 | ... != ... | Guards.cs:92:13:92:13 | access to parameter s | true |
-| Guards.cs:95:31:95:31 | access to parameter s | Guards.cs:92:13:92:13 | access to parameter s | Guards.cs:92:13:92:13 | access to parameter s | non-null |
-| Guards.cs:95:31:95:31 | access to parameter s | Guards.cs:92:13:92:21 | access to property Length | Guards.cs:92:13:92:13 | access to parameter s | non-null |
-| Guards.cs:95:31:95:31 | access to parameter s | Guards.cs:92:13:92:25 | ... - ... | Guards.cs:92:13:92:13 | access to parameter s | non-null |
+| Guards.cs:95:31:95:31 | access to parameter s | Guards.cs:92:13:92:13 | access to parameter s | Guards.cs:92:13:92:13 | access to parameter s | not null |
+| Guards.cs:95:31:95:31 | access to parameter s | Guards.cs:92:13:92:21 | access to property Length | Guards.cs:92:13:92:13 | access to parameter s | not null |
+| Guards.cs:95:31:95:31 | access to parameter s | Guards.cs:92:13:92:25 | ... - ... | Guards.cs:92:13:92:13 | access to parameter s | not null |
 | Guards.cs:95:31:95:31 | access to parameter s | Guards.cs:92:13:92:30 | ... != ... | Guards.cs:92:13:92:13 | access to parameter s | false |
-| Guards.cs:97:31:97:31 | access to parameter s | Guards.cs:96:13:96:13 | access to parameter s | Guards.cs:96:13:96:13 | access to parameter s | non-null |
+| Guards.cs:97:31:97:31 | access to parameter s | Guards.cs:96:13:96:13 | access to parameter s | Guards.cs:96:13:96:13 | access to parameter s |  |
+| Guards.cs:97:31:97:31 | access to parameter s | Guards.cs:96:13:96:13 | access to parameter s | Guards.cs:96:13:96:13 | access to parameter s | not null |
 | Guards.cs:97:31:97:31 | access to parameter s | Guards.cs:96:13:96:19 | ... == ... | Guards.cs:96:13:96:13 | access to parameter s | true |
+| Guards.cs:99:31:99:31 | access to parameter s | Guards.cs:96:13:96:13 | access to parameter s | Guards.cs:96:13:96:13 | access to parameter s | not  |
 | Guards.cs:99:31:99:31 | access to parameter s | Guards.cs:96:13:96:19 | ... == ... | Guards.cs:96:13:96:13 | access to parameter s | false |
-| Guards.cs:106:9:106:9 | access to parameter g | Guards.cs:104:13:104:37 | access to field Field | Guards.cs:104:13:104:13 | access to parameter g | non-null |
+| Guards.cs:106:9:106:9 | access to parameter g | Guards.cs:104:13:104:37 | access to field Field | Guards.cs:104:13:104:13 | access to parameter g | not null |
 | Guards.cs:106:9:106:9 | access to parameter g | Guards.cs:104:13:104:45 | ... == ... | Guards.cs:104:13:104:13 | access to parameter g | false |
-| Guards.cs:107:27:107:27 | access to parameter g | Guards.cs:104:13:104:37 | access to field Field | Guards.cs:104:13:104:13 | access to parameter g | non-null |
+| Guards.cs:107:27:107:27 | access to parameter g | Guards.cs:104:13:104:37 | access to field Field | Guards.cs:104:13:104:13 | access to parameter g | not null |
 | Guards.cs:107:27:107:27 | access to parameter g | Guards.cs:104:13:104:45 | ... == ... | Guards.cs:104:13:104:13 | access to parameter g | false |
-| Guards.cs:108:27:108:27 | access to parameter g | Guards.cs:104:13:104:37 | access to field Field | Guards.cs:104:13:104:13 | access to parameter g | non-null |
+| Guards.cs:108:27:108:27 | access to parameter g | Guards.cs:104:13:104:37 | access to field Field | Guards.cs:104:13:104:13 | access to parameter g | not null |
 | Guards.cs:108:27:108:27 | access to parameter g | Guards.cs:104:13:104:45 | ... == ... | Guards.cs:104:13:104:13 | access to parameter g | false |
 | Guards.cs:114:14:114:14 | access to parameter g | Guards.cs:113:21:113:45 | access to field Field | Guards.cs:113:21:113:21 | access to parameter g | null |
 | Guards.cs:114:14:114:23 | access to property Property | Guards.cs:113:21:113:45 | access to field Field | Guards.cs:113:21:113:30 | access to property Property | null |
 | Guards.cs:114:14:114:32 | access to property Property | Guards.cs:113:21:113:45 | access to field Field | Guards.cs:113:21:113:39 | access to property Property | null |
 | Guards.cs:114:14:114:38 | access to field Field | Guards.cs:113:21:113:45 | access to field Field | Guards.cs:113:21:113:45 | access to field Field | null |
-| Guards.cs:116:27:116:27 | access to parameter g | Guards.cs:115:17:115:41 | access to field Field | Guards.cs:115:17:115:17 | access to parameter g | non-null |
-| Guards.cs:116:27:116:36 | access to property Property | Guards.cs:115:17:115:41 | access to field Field | Guards.cs:115:17:115:26 | access to property Property | non-null |
-| Guards.cs:116:27:116:45 | access to property Property | Guards.cs:115:17:115:41 | access to field Field | Guards.cs:115:17:115:35 | access to property Property | non-null |
-| Guards.cs:116:27:116:51 | access to field Field | Guards.cs:115:17:115:41 | access to field Field | Guards.cs:115:17:115:41 | access to field Field | non-null |
-| Guards.cs:117:9:117:9 | access to parameter g | Guards.cs:115:17:115:41 | access to field Field | Guards.cs:115:17:115:17 | access to parameter g | non-null |
-| Guards.cs:118:27:118:27 | access to parameter g | Guards.cs:115:17:115:41 | access to field Field | Guards.cs:115:17:115:17 | access to parameter g | non-null |
-| Guards.cs:119:27:119:27 | access to parameter g | Guards.cs:115:17:115:41 | access to field Field | Guards.cs:115:17:115:17 | access to parameter g | non-null |
-| Guards.cs:125:29:125:30 | access to parameter s1 | Guards.cs:125:18:125:19 | access to parameter s1 | Guards.cs:125:18:125:19 | access to parameter s1 | non-null |
+| Guards.cs:116:27:116:27 | access to parameter g | Guards.cs:115:17:115:41 | access to field Field | Guards.cs:115:17:115:17 | access to parameter g | not null |
+| Guards.cs:116:27:116:36 | access to property Property | Guards.cs:115:17:115:41 | access to field Field | Guards.cs:115:17:115:26 | access to property Property | not null |
+| Guards.cs:116:27:116:45 | access to property Property | Guards.cs:115:17:115:41 | access to field Field | Guards.cs:115:17:115:35 | access to property Property | not null |
+| Guards.cs:116:27:116:51 | access to field Field | Guards.cs:115:17:115:41 | access to field Field | Guards.cs:115:17:115:41 | access to field Field | not null |
+| Guards.cs:117:9:117:9 | access to parameter g | Guards.cs:115:17:115:41 | access to field Field | Guards.cs:115:17:115:17 | access to parameter g | not null |
+| Guards.cs:118:27:118:27 | access to parameter g | Guards.cs:115:17:115:41 | access to field Field | Guards.cs:115:17:115:17 | access to parameter g | not null |
+| Guards.cs:119:27:119:27 | access to parameter g | Guards.cs:115:17:115:41 | access to field Field | Guards.cs:115:17:115:17 | access to parameter g | not null |
+| Guards.cs:125:29:125:30 | access to parameter s1 | Guards.cs:125:18:125:19 | access to parameter s1 | Guards.cs:125:18:125:19 | access to parameter s1 | not null |
 | Guards.cs:131:20:131:20 | access to parameter s | Guards.cs:130:13:130:13 | access to parameter s | Guards.cs:130:13:130:13 | access to parameter s | null |
 | Guards.cs:131:20:131:20 | access to parameter s | Guards.cs:130:13:130:21 | ... is ... | Guards.cs:130:13:130:13 | access to parameter s | true |
-| Guards.cs:132:16:132:16 | access to parameter s | Guards.cs:130:13:130:13 | access to parameter s | Guards.cs:130:13:130:13 | access to parameter s | non-null |
+| Guards.cs:132:16:132:16 | access to parameter s | Guards.cs:130:13:130:13 | access to parameter s | Guards.cs:130:13:130:13 | access to parameter s | not null |
 | Guards.cs:132:16:132:16 | access to parameter s | Guards.cs:130:13:130:21 | ... is ... | Guards.cs:130:13:130:13 | access to parameter s | false |
-| Guards.cs:138:20:138:20 | access to parameter s | Guards.cs:137:13:137:13 | access to parameter s | Guards.cs:137:13:137:13 | access to parameter s | non-null |
+| Guards.cs:138:20:138:20 | access to parameter s | Guards.cs:137:13:137:13 | access to parameter s | Guards.cs:137:13:137:13 | access to parameter s | not null |
 | Guards.cs:138:20:138:20 | access to parameter s | Guards.cs:137:13:137:25 | ... is ... | Guards.cs:137:13:137:13 | access to parameter s | true |
 | Guards.cs:139:16:139:16 | access to parameter s | Guards.cs:137:13:137:13 | access to parameter s | Guards.cs:137:13:137:13 | access to parameter s | null |
 | Guards.cs:139:16:139:16 | access to parameter s | Guards.cs:137:13:137:25 | ... is ... | Guards.cs:137:13:137:13 | access to parameter s | false |
 | Guards.cs:146:16:146:16 | access to parameter o | Guards.cs:144:13:144:25 | ... is ... | Guards.cs:144:13:144:13 | access to parameter o | false |
-| Guards.cs:154:24:154:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | match access to type Action<Object> |
-| Guards.cs:154:24:154:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | non-null |
-| Guards.cs:158:24:158:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | match "" |
-| Guards.cs:158:24:158:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | non-match Action<String> a |
-| Guards.cs:158:24:158:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | non-match access to type Action<Object> |
-| Guards.cs:158:24:158:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | non-null |
-| Guards.cs:160:24:160:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | match null |
-| Guards.cs:160:24:160:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | non-match "" |
-| Guards.cs:160:24:160:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | non-match Action<String> a |
-| Guards.cs:160:24:160:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | non-match access to type Action<Object> |
+| Guards.cs:154:24:154:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | not null |
+| Guards.cs:158:24:158:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o |  |
+| Guards.cs:158:24:158:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | not null |
+| Guards.cs:160:24:160:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | not  |
 | Guards.cs:160:24:160:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | null |
-| Guards.cs:162:24:162:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | non-match "" |
-| Guards.cs:162:24:162:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | non-match Action<String> a |
-| Guards.cs:162:24:162:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | non-match access to type Action<Object> |
-| Guards.cs:162:24:162:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | non-match null |
-| Guards.cs:162:24:162:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | non-null |
+| Guards.cs:162:24:162:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | not  |
+| Guards.cs:162:24:162:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | not null |
 | Guards.cs:169:31:169:31 | access to parameter x | Guards.cs:168:14:168:41 | call to method IsNullOrWhiteSpace | Guards.cs:168:40:168:40 | access to parameter x | false |
-| Guards.cs:169:31:169:31 | access to parameter x | Guards.cs:168:40:168:40 | access to parameter x | Guards.cs:168:40:168:40 | access to parameter x | non-null |
+| Guards.cs:169:31:169:31 | access to parameter x | Guards.cs:168:40:168:40 | access to parameter x | Guards.cs:168:40:168:40 | access to parameter x | not null |
 | Guards.cs:190:31:190:31 | access to parameter s | Guards.cs:189:14:189:25 | call to method NullTest1 | Guards.cs:189:24:189:24 | access to parameter s | false |
-| Guards.cs:190:31:190:31 | access to parameter s | Guards.cs:189:24:189:24 | access to parameter s | Guards.cs:189:24:189:24 | access to parameter s | non-null |
+| Guards.cs:190:31:190:31 | access to parameter s | Guards.cs:189:24:189:24 | access to parameter s | Guards.cs:189:24:189:24 | access to parameter s | not null |
 | Guards.cs:192:31:192:31 | access to parameter s | Guards.cs:191:14:191:25 | call to method NullTest2 | Guards.cs:191:24:191:24 | access to parameter s | false |
-| Guards.cs:192:31:192:31 | access to parameter s | Guards.cs:191:24:191:24 | access to parameter s | Guards.cs:191:24:191:24 | access to parameter s | non-null |
+| Guards.cs:192:31:192:31 | access to parameter s | Guards.cs:191:24:191:24 | access to parameter s | Guards.cs:191:24:191:24 | access to parameter s | not null |
 | Guards.cs:194:31:194:31 | access to parameter s | Guards.cs:193:14:193:25 | call to method NullTest3 | Guards.cs:193:24:193:24 | access to parameter s | false |
-| Guards.cs:194:31:194:31 | access to parameter s | Guards.cs:193:24:193:24 | access to parameter s | Guards.cs:193:24:193:24 | access to parameter s | non-null |
+| Guards.cs:194:31:194:31 | access to parameter s | Guards.cs:193:24:193:24 | access to parameter s | Guards.cs:193:24:193:24 | access to parameter s | not null |
 | Guards.cs:196:31:196:31 | access to parameter s | Guards.cs:195:13:195:27 | call to method NotNullTest4 | Guards.cs:195:26:195:26 | access to parameter s | true |
-| Guards.cs:196:31:196:31 | access to parameter s | Guards.cs:195:26:195:26 | access to parameter s | Guards.cs:195:26:195:26 | access to parameter s | non-null |
+| Guards.cs:196:31:196:31 | access to parameter s | Guards.cs:195:26:195:26 | access to parameter s | Guards.cs:195:26:195:26 | access to parameter s | not null |
 | Guards.cs:198:31:198:31 | access to parameter s | Guards.cs:197:14:197:29 | call to method NullTestWrong | Guards.cs:197:28:197:28 | access to parameter s | false |
-| Guards.cs:205:13:205:13 | access to parameter o | Guards.cs:203:13:203:13 | access to parameter o | Guards.cs:203:13:203:13 | access to parameter o | non-null |
+| Guards.cs:205:13:205:13 | access to parameter o | Guards.cs:203:13:203:13 | access to parameter o | Guards.cs:203:13:203:13 | access to parameter o | not null |
 | Guards.cs:205:13:205:13 | access to parameter o | Guards.cs:203:13:203:21 | ... != ... | Guards.cs:203:13:203:13 | access to parameter o | true |
-| Guards.cs:208:17:208:17 | access to parameter o | Guards.cs:203:13:203:13 | access to parameter o | Guards.cs:203:13:203:13 | access to parameter o | non-null |
+| Guards.cs:208:17:208:17 | access to parameter o | Guards.cs:203:13:203:13 | access to parameter o | Guards.cs:203:13:203:13 | access to parameter o | not null |
 | Guards.cs:208:17:208:17 | access to parameter o | Guards.cs:203:13:203:21 | ... != ... | Guards.cs:203:13:203:13 | access to parameter o | true |
-| Guards.cs:269:13:269:14 | access to parameter o1 | Guards.cs:268:13:268:14 | access to parameter o1 | Guards.cs:268:13:268:14 | access to parameter o1 | non-null |
-| Guards.cs:269:13:269:14 | access to parameter o1 | Guards.cs:268:13:268:25 | call to method GetType | Guards.cs:268:13:268:14 | access to parameter o1 | non-null |
+| Guards.cs:269:13:269:14 | access to parameter o1 | Guards.cs:268:13:268:14 | access to parameter o1 | Guards.cs:268:13:268:14 | access to parameter o1 | not null |
+| Guards.cs:269:13:269:14 | access to parameter o1 | Guards.cs:268:13:268:25 | call to method GetType | Guards.cs:268:13:268:14 | access to parameter o1 | not null |
 | Guards.cs:269:13:269:14 | access to parameter o1 | Guards.cs:268:13:268:41 | call to operator == | Guards.cs:268:13:268:14 | access to parameter o1 | true |
 | Guards.cs:271:13:271:14 | access to parameter o1 | Guards.cs:270:13:270:42 | call to operator == | Guards.cs:270:13:270:14 | access to parameter o1 | true |
-| Guards.cs:279:17:279:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | match access to type Action<Object> |
-| Guards.cs:279:17:279:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | non-null |
-| Guards.cs:283:17:283:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | match "" |
-| Guards.cs:283:17:283:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | non-match Action<String> a |
-| Guards.cs:283:17:283:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | non-match access to type Action<Object> |
-| Guards.cs:283:17:283:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | non-null |
-| Guards.cs:285:17:285:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | match null |
-| Guards.cs:285:17:285:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | non-match "" |
-| Guards.cs:285:17:285:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | non-match Action<String> a |
-| Guards.cs:285:17:285:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | non-match access to type Action<Object> |
+| Guards.cs:279:17:279:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | not null |
+| Guards.cs:279:17:279:17 | access to parameter o | Guards.cs:278:13:279:28 | ... => ... | Guards.cs:279:17:279:17 | access to parameter o | true |
+| Guards.cs:279:17:279:28 | call to method ToString | Guards.cs:278:13:279:28 | ... => ... | Guards.cs:279:17:279:28 | call to method ToString | true |
+| Guards.cs:281:17:281:17 | access to local variable a | Guards.cs:280:13:281:28 | ... => ... | Guards.cs:281:17:281:17 | access to local variable a | true |
+| Guards.cs:281:17:281:28 | call to method ToString | Guards.cs:280:13:281:28 | ... => ... | Guards.cs:281:17:281:28 | call to method ToString | true |
+| Guards.cs:283:17:283:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o |  |
+| Guards.cs:283:17:283:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | not null |
+| Guards.cs:283:17:283:17 | access to parameter o | Guards.cs:278:13:279:28 | ... => ... | Guards.cs:279:17:279:17 | access to parameter o | false |
+| Guards.cs:283:17:283:17 | access to parameter o | Guards.cs:282:13:283:28 | ... => ... | Guards.cs:283:17:283:17 | access to parameter o | true |
+| Guards.cs:283:17:283:28 | call to method ToString | Guards.cs:278:13:279:28 | ... => ... | Guards.cs:279:17:279:28 | call to method ToString | false |
+| Guards.cs:283:17:283:28 | call to method ToString | Guards.cs:282:13:283:28 | ... => ... | Guards.cs:283:17:283:28 | call to method ToString | true |
+| Guards.cs:285:17:285:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | not  |
 | Guards.cs:285:17:285:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | null |
-| Guards.cs:287:17:287:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | match _ |
-| Guards.cs:287:17:287:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | non-match "" |
-| Guards.cs:287:17:287:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | non-match Action<String> a |
-| Guards.cs:287:17:287:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | non-match access to type Action<Object> |
-| Guards.cs:287:17:287:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | non-match null |
-| Guards.cs:287:17:287:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | non-null |
+| Guards.cs:285:17:285:17 | access to parameter o | Guards.cs:278:13:279:28 | ... => ... | Guards.cs:279:17:279:17 | access to parameter o | false |
+| Guards.cs:285:17:285:17 | access to parameter o | Guards.cs:282:13:283:28 | ... => ... | Guards.cs:283:17:283:17 | access to parameter o | false |
+| Guards.cs:285:17:285:17 | access to parameter o | Guards.cs:284:13:285:28 | ... => ... | Guards.cs:285:17:285:17 | access to parameter o | true |
+| Guards.cs:285:17:285:28 | call to method ToString | Guards.cs:278:13:279:28 | ... => ... | Guards.cs:279:17:279:28 | call to method ToString | false |
+| Guards.cs:285:17:285:28 | call to method ToString | Guards.cs:282:13:283:28 | ... => ... | Guards.cs:283:17:283:28 | call to method ToString | false |
+| Guards.cs:285:17:285:28 | call to method ToString | Guards.cs:284:13:285:28 | ... => ... | Guards.cs:285:17:285:28 | call to method ToString | true |
+| Guards.cs:287:17:287:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | not  |
+| Guards.cs:287:17:287:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | not null |
+| Guards.cs:287:17:287:17 | access to parameter o | Guards.cs:278:13:279:28 | ... => ... | Guards.cs:279:17:279:17 | access to parameter o | false |
+| Guards.cs:287:17:287:17 | access to parameter o | Guards.cs:282:13:283:28 | ... => ... | Guards.cs:283:17:283:17 | access to parameter o | false |
+| Guards.cs:287:17:287:17 | access to parameter o | Guards.cs:284:13:285:28 | ... => ... | Guards.cs:285:17:285:17 | access to parameter o | false |
+| Guards.cs:287:17:287:17 | access to parameter o | Guards.cs:286:13:287:28 | ... => ... | Guards.cs:287:17:287:17 | access to parameter o | true |
+| Guards.cs:287:17:287:28 | call to method ToString | Guards.cs:278:13:279:28 | ... => ... | Guards.cs:279:17:279:28 | call to method ToString | false |
+| Guards.cs:287:17:287:28 | call to method ToString | Guards.cs:282:13:283:28 | ... => ... | Guards.cs:283:17:283:28 | call to method ToString | false |
+| Guards.cs:287:17:287:28 | call to method ToString | Guards.cs:284:13:285:28 | ... => ... | Guards.cs:285:17:285:28 | call to method ToString | false |
+| Guards.cs:287:17:287:28 | call to method ToString | Guards.cs:286:13:287:28 | ... => ... | Guards.cs:287:17:287:28 | call to method ToString | true |
 | Guards.cs:342:27:342:27 | access to parameter b | Guards.cs:341:20:341:20 | access to parameter b | Guards.cs:341:20:341:20 | access to parameter b | false |
-| Guards.cs:342:27:342:27 | access to parameter b | Guards.cs:341:20:341:32 | ... ? ... : ... | Guards.cs:341:20:341:20 | access to parameter b | non-null |
-| Guards.cs:343:31:343:31 | access to local variable s | Guards.cs:342:13:342:13 | access to local variable s | Guards.cs:342:13:342:13 | access to local variable s | non-null |
+| Guards.cs:342:27:342:27 | access to parameter b | Guards.cs:341:20:341:32 | ... ? ... : ... | Guards.cs:341:20:341:20 | access to parameter b | not null |
+| Guards.cs:343:31:343:31 | access to local variable s | Guards.cs:342:13:342:13 | access to local variable s | Guards.cs:342:13:342:13 | access to local variable s | not null |
 | Guards.cs:343:31:343:31 | access to local variable s | Guards.cs:342:13:342:21 | ... != ... | Guards.cs:342:13:342:13 | access to local variable s | true |
-| Guards.cs:349:13:349:13 | access to parameter o | Guards.cs:348:13:348:13 | access to parameter o | Guards.cs:348:13:348:13 | access to parameter o | non-null |
+| Guards.cs:349:13:349:13 | access to parameter o | Guards.cs:348:13:348:13 | access to parameter o | Guards.cs:348:13:348:13 | access to parameter o | not null |
 | Guards.cs:349:13:349:13 | access to parameter o | Guards.cs:348:13:348:25 | ... is ... | Guards.cs:348:13:348:13 | access to parameter o | true |
-| Splitting.cs:13:17:13:17 | access to parameter o | Splitting.cs:12:17:12:17 | access to parameter o | Splitting.cs:12:17:12:17 | access to parameter o | non-null |
-| Splitting.cs:13:17:13:17 | access to parameter o | Splitting.cs:12:17:12:25 | ... != ... | Splitting.cs:12:17:12:17 | access to parameter o | true |
-| Splitting.cs:23:24:23:24 | access to parameter o | Splitting.cs:22:17:22:17 | access to parameter o | Splitting.cs:22:17:22:17 | access to parameter o | non-null |
-| Splitting.cs:23:24:23:24 | access to parameter o | Splitting.cs:22:17:22:25 | ... != ... | Splitting.cs:22:17:22:17 | access to parameter o | true |
-| Splitting.cs:25:13:25:13 | access to parameter o | Splitting.cs:22:17:22:17 | access to parameter o | Splitting.cs:22:17:22:17 | access to parameter o | null |
-| Splitting.cs:25:13:25:13 | access to parameter o | Splitting.cs:22:17:22:25 | ... != ... | Splitting.cs:22:17:22:17 | access to parameter o | false |
-| Splitting.cs:35:13:35:13 | access to parameter o | Splitting.cs:32:17:32:17 | access to parameter o | Splitting.cs:32:17:32:17 | access to parameter o | non-null |
-| Splitting.cs:35:13:35:13 | access to parameter o | Splitting.cs:32:17:32:25 | ... == ... | Splitting.cs:32:17:32:17 | access to parameter o | false |
-| Splitting.cs:44:17:44:17 | access to parameter o | Splitting.cs:41:13:41:13 | access to parameter o | Splitting.cs:41:13:41:13 | access to parameter o | non-null |
-| Splitting.cs:44:17:44:17 | access to parameter o | Splitting.cs:41:13:41:21 | ... != ... | Splitting.cs:41:13:41:13 | access to parameter o | true |
-| Splitting.cs:46:17:46:17 | access to parameter o | Splitting.cs:41:13:41:13 | access to parameter o | Splitting.cs:41:13:41:13 | access to parameter o | non-null |
-| Splitting.cs:46:17:46:17 | access to parameter o | Splitting.cs:41:13:41:21 | ... != ... | Splitting.cs:41:13:41:13 | access to parameter o | true |
-| Splitting.cs:55:13:55:13 | access to parameter o | Splitting.cs:54:13:54:13 | access to parameter o | Splitting.cs:54:13:54:13 | access to parameter o | non-null |
-| Splitting.cs:55:13:55:13 | access to parameter o | Splitting.cs:54:13:54:21 | ... != ... | Splitting.cs:54:13:54:13 | access to parameter o | true |
-| Splitting.cs:66:20:66:20 | access to parameter o | Splitting.cs:65:13:65:13 | access to parameter o | Splitting.cs:65:13:65:13 | access to parameter o | non-null |
-| Splitting.cs:66:20:66:20 | access to parameter o | Splitting.cs:65:13:65:21 | ... != ... | Splitting.cs:65:13:65:13 | access to parameter o | true |
-| Splitting.cs:68:13:68:13 | access to parameter o | Splitting.cs:65:13:65:13 | access to parameter o | Splitting.cs:65:13:65:13 | access to parameter o | null |
-| Splitting.cs:68:13:68:13 | access to parameter o | Splitting.cs:65:13:65:21 | ... != ... | Splitting.cs:65:13:65:13 | access to parameter o | false |
-| Splitting.cs:69:16:69:16 | access to parameter o | Splitting.cs:65:13:65:13 | access to parameter o | Splitting.cs:65:13:65:13 | access to parameter o | null |
-| Splitting.cs:69:16:69:16 | access to parameter o | Splitting.cs:65:13:65:21 | ... != ... | Splitting.cs:65:13:65:13 | access to parameter o | false |
-| Splitting.cs:78:24:78:24 | access to parameter o | Splitting.cs:76:13:76:13 | access to parameter o | Splitting.cs:76:13:76:13 | access to parameter o | non-null |
-| Splitting.cs:78:24:78:24 | access to parameter o | Splitting.cs:76:13:76:21 | ... != ... | Splitting.cs:76:13:76:13 | access to parameter o | true |
-| Splitting.cs:90:13:90:13 | access to parameter o | Splitting.cs:87:26:87:26 | access to parameter o | Splitting.cs:87:26:87:26 | access to parameter o | non-null |
-| Splitting.cs:90:13:90:13 | access to parameter o | Splitting.cs:87:26:87:34 | ... != ... | Splitting.cs:87:26:87:26 | access to parameter o | true |
-| Splitting.cs:99:13:99:13 | access to parameter o | Splitting.cs:97:26:97:26 | access to parameter o | Splitting.cs:97:26:97:26 | access to parameter o | null |
-| Splitting.cs:99:13:99:13 | access to parameter o | Splitting.cs:97:26:97:34 | ... == ... | Splitting.cs:97:26:97:26 | access to parameter o | true |
-| Splitting.cs:107:13:107:13 | access to parameter o | Splitting.cs:105:22:105:22 | access to parameter o | Splitting.cs:105:22:105:22 | access to parameter o | non-null |
-| Splitting.cs:107:13:107:13 | access to parameter o | Splitting.cs:105:22:105:30 | ... != ... | Splitting.cs:105:22:105:22 | access to parameter o | true |
-| Splitting.cs:109:13:109:13 | access to parameter o | Splitting.cs:105:22:105:22 | access to parameter o | Splitting.cs:105:22:105:22 | access to parameter o | non-null |
-| Splitting.cs:109:13:109:13 | access to parameter o | Splitting.cs:105:22:105:30 | ... != ... | Splitting.cs:105:22:105:22 | access to parameter o | true |
-| Splitting.cs:117:9:117:9 | access to parameter o | Splitting.cs:116:22:116:22 | access to parameter o | Splitting.cs:116:22:116:22 | access to parameter o | non-null |
-| Splitting.cs:117:9:117:9 | access to parameter o | Splitting.cs:116:22:116:30 | ... != ... | Splitting.cs:116:22:116:22 | access to parameter o | true |
-| Splitting.cs:119:13:119:13 | access to parameter o | Splitting.cs:116:22:116:22 | access to parameter o | Splitting.cs:116:22:116:22 | access to parameter o | non-null |
-| Splitting.cs:119:13:119:13 | access to parameter o | Splitting.cs:116:22:116:30 | ... != ... | Splitting.cs:116:22:116:22 | access to parameter o | true |
-| Splitting.cs:120:16:120:16 | access to parameter o | Splitting.cs:116:22:116:22 | access to parameter o | Splitting.cs:116:22:116:22 | access to parameter o | non-null |
-| Splitting.cs:120:16:120:16 | access to parameter o | Splitting.cs:116:22:116:30 | ... != ... | Splitting.cs:116:22:116:22 | access to parameter o | true |
-| Splitting.cs:133:25:133:25 | access to parameter b | Splitting.cs:131:21:131:21 | access to parameter b | Splitting.cs:131:21:131:21 | access to parameter b | false |
diff --git a/csharp/ql/test/library-tests/controlflow/guards/GuardedExpr.ql b/csharp/ql/test/library-tests/controlflow/guards/GuardedExpr.ql
index 4cdb4606dac..c825873677a 100644
--- a/csharp/ql/test/library-tests/controlflow/guards/GuardedExpr.ql
+++ b/csharp/ql/test/library-tests/controlflow/guards/GuardedExpr.ql
@@ -1,5 +1,5 @@
 import csharp
 import semmle.code.csharp.controlflow.Guards
 
-from GuardedExpr ge, Expr sub, AbstractValue v
+from GuardedExpr ge, Expr sub, GuardValue v
 select ge, ge.getAGuard(sub, v), sub, v
diff --git a/csharp/ql/test/library-tests/controlflow/guards/Implications.expected b/csharp/ql/test/library-tests/controlflow/guards/Implications.expected
deleted file mode 100644
index b346e653ec7..00000000000
--- a/csharp/ql/test/library-tests/controlflow/guards/Implications.expected
+++ /dev/null
@@ -1,472 +0,0 @@
-| Assert.cs:9:20:9:32 | ... ? ... : ... | non-null | Assert.cs:9:20:9:20 | access to parameter b | false |
-| Assert.cs:9:20:9:32 | ... ? ... : ... | non-null | Assert.cs:9:31:9:32 | "" | non-null |
-| Assert.cs:9:20:9:32 | ... ? ... : ... | null | Assert.cs:9:20:9:20 | access to parameter b | true |
-| Assert.cs:9:20:9:32 | ... ? ... : ... | null | Assert.cs:9:24:9:27 | null | null |
-| Assert.cs:10:22:10:22 | access to local variable s | empty | Assert.cs:9:20:9:32 | ... ? ... : ... | empty |
-| Assert.cs:10:22:10:22 | access to local variable s | non-empty | Assert.cs:9:20:9:32 | ... ? ... : ... | non-empty |
-| Assert.cs:10:22:10:22 | access to local variable s | non-null | Assert.cs:9:20:9:32 | ... ? ... : ... | non-null |
-| Assert.cs:10:22:10:22 | access to local variable s | null | Assert.cs:9:20:9:32 | ... ? ... : ... | null |
-| Assert.cs:10:22:10:30 | ... != ... | false | Assert.cs:9:20:9:20 | access to parameter b | true |
-| Assert.cs:10:22:10:30 | ... != ... | false | Assert.cs:10:22:10:22 | access to local variable s | null |
-| Assert.cs:10:22:10:30 | ... != ... | true | Assert.cs:9:20:9:20 | access to parameter b | false |
-| Assert.cs:10:22:10:30 | ... != ... | true | Assert.cs:10:22:10:22 | access to local variable s | non-null |
-| Assert.cs:11:27:11:27 | access to local variable s | non-null | Assert.cs:9:20:9:32 | ... ? ... : ... | non-null |
-| Assert.cs:11:27:11:27 | access to local variable s | null | Assert.cs:9:20:9:32 | ... ? ... : ... | null |
-| Assert.cs:16:20:16:32 | ... ? ... : ... | non-null | Assert.cs:16:20:16:20 | access to parameter b | false |
-| Assert.cs:16:20:16:32 | ... ? ... : ... | non-null | Assert.cs:16:31:16:32 | "" | non-null |
-| Assert.cs:16:20:16:32 | ... ? ... : ... | null | Assert.cs:16:20:16:20 | access to parameter b | true |
-| Assert.cs:16:20:16:32 | ... ? ... : ... | null | Assert.cs:16:24:16:27 | null | null |
-| Assert.cs:17:23:17:23 | access to local variable s | empty | Assert.cs:16:20:16:32 | ... ? ... : ... | empty |
-| Assert.cs:17:23:17:23 | access to local variable s | non-empty | Assert.cs:16:20:16:32 | ... ? ... : ... | non-empty |
-| Assert.cs:17:23:17:23 | access to local variable s | non-null | Assert.cs:16:20:16:20 | access to parameter b | false |
-| Assert.cs:17:23:17:23 | access to local variable s | non-null | Assert.cs:16:20:16:32 | ... ? ... : ... | non-null |
-| Assert.cs:17:23:17:23 | access to local variable s | null | Assert.cs:16:20:16:20 | access to parameter b | true |
-| Assert.cs:17:23:17:23 | access to local variable s | null | Assert.cs:16:20:16:32 | ... ? ... : ... | null |
-| Assert.cs:18:27:18:27 | access to local variable s | non-null | Assert.cs:16:20:16:32 | ... ? ... : ... | non-null |
-| Assert.cs:18:27:18:27 | access to local variable s | null | Assert.cs:16:20:16:32 | ... ? ... : ... | null |
-| Assert.cs:23:20:23:32 | ... ? ... : ... | non-null | Assert.cs:23:20:23:20 | access to parameter b | false |
-| Assert.cs:23:20:23:32 | ... ? ... : ... | non-null | Assert.cs:23:31:23:32 | "" | non-null |
-| Assert.cs:23:20:23:32 | ... ? ... : ... | null | Assert.cs:23:20:23:20 | access to parameter b | true |
-| Assert.cs:23:20:23:32 | ... ? ... : ... | null | Assert.cs:23:24:23:27 | null | null |
-| Assert.cs:24:26:24:26 | access to local variable s | empty | Assert.cs:23:20:23:32 | ... ? ... : ... | empty |
-| Assert.cs:24:26:24:26 | access to local variable s | non-empty | Assert.cs:23:20:23:32 | ... ? ... : ... | non-empty |
-| Assert.cs:24:26:24:26 | access to local variable s | non-null | Assert.cs:23:20:23:20 | access to parameter b | false |
-| Assert.cs:24:26:24:26 | access to local variable s | non-null | Assert.cs:23:20:23:32 | ... ? ... : ... | non-null |
-| Assert.cs:24:26:24:26 | access to local variable s | null | Assert.cs:23:20:23:20 | access to parameter b | true |
-| Assert.cs:24:26:24:26 | access to local variable s | null | Assert.cs:23:20:23:32 | ... ? ... : ... | null |
-| Assert.cs:25:27:25:27 | access to local variable s | non-null | Assert.cs:23:20:23:32 | ... ? ... : ... | non-null |
-| Assert.cs:25:27:25:27 | access to local variable s | null | Assert.cs:23:20:23:32 | ... ? ... : ... | null |
-| Assert.cs:30:20:30:32 | ... ? ... : ... | non-null | Assert.cs:30:20:30:20 | access to parameter b | false |
-| Assert.cs:30:20:30:32 | ... ? ... : ... | non-null | Assert.cs:30:31:30:32 | "" | non-null |
-| Assert.cs:30:20:30:32 | ... ? ... : ... | null | Assert.cs:30:20:30:20 | access to parameter b | true |
-| Assert.cs:30:20:30:32 | ... ? ... : ... | null | Assert.cs:30:24:30:27 | null | null |
-| Assert.cs:31:23:31:23 | access to local variable s | empty | Assert.cs:30:20:30:32 | ... ? ... : ... | empty |
-| Assert.cs:31:23:31:23 | access to local variable s | non-empty | Assert.cs:30:20:30:32 | ... ? ... : ... | non-empty |
-| Assert.cs:31:23:31:23 | access to local variable s | non-null | Assert.cs:30:20:30:32 | ... ? ... : ... | non-null |
-| Assert.cs:31:23:31:23 | access to local variable s | null | Assert.cs:30:20:30:32 | ... ? ... : ... | null |
-| Assert.cs:31:23:31:31 | ... == ... | false | Assert.cs:30:20:30:20 | access to parameter b | false |
-| Assert.cs:31:23:31:31 | ... == ... | false | Assert.cs:31:23:31:23 | access to local variable s | non-null |
-| Assert.cs:31:23:31:31 | ... == ... | true | Assert.cs:30:20:30:20 | access to parameter b | true |
-| Assert.cs:31:23:31:31 | ... == ... | true | Assert.cs:31:23:31:23 | access to local variable s | null |
-| Assert.cs:32:27:32:27 | access to local variable s | non-null | Assert.cs:30:20:30:32 | ... ? ... : ... | non-null |
-| Assert.cs:32:27:32:27 | access to local variable s | null | Assert.cs:30:20:30:32 | ... ? ... : ... | null |
-| Assert.cs:37:20:37:32 | ... ? ... : ... | non-null | Assert.cs:37:20:37:20 | access to parameter b | false |
-| Assert.cs:37:20:37:32 | ... ? ... : ... | non-null | Assert.cs:37:31:37:32 | "" | non-null |
-| Assert.cs:37:20:37:32 | ... ? ... : ... | null | Assert.cs:37:20:37:20 | access to parameter b | true |
-| Assert.cs:37:20:37:32 | ... ? ... : ... | null | Assert.cs:37:24:37:27 | null | null |
-| Assert.cs:38:23:38:23 | access to local variable s | empty | Assert.cs:37:20:37:32 | ... ? ... : ... | empty |
-| Assert.cs:38:23:38:23 | access to local variable s | non-empty | Assert.cs:37:20:37:32 | ... ? ... : ... | non-empty |
-| Assert.cs:38:23:38:23 | access to local variable s | non-null | Assert.cs:37:20:37:32 | ... ? ... : ... | non-null |
-| Assert.cs:38:23:38:23 | access to local variable s | null | Assert.cs:37:20:37:32 | ... ? ... : ... | null |
-| Assert.cs:38:23:38:31 | ... != ... | false | Assert.cs:37:20:37:20 | access to parameter b | true |
-| Assert.cs:38:23:38:31 | ... != ... | false | Assert.cs:38:23:38:23 | access to local variable s | null |
-| Assert.cs:38:23:38:31 | ... != ... | true | Assert.cs:37:20:37:20 | access to parameter b | false |
-| Assert.cs:38:23:38:31 | ... != ... | true | Assert.cs:38:23:38:23 | access to local variable s | non-null |
-| Assert.cs:39:27:39:27 | access to local variable s | non-null | Assert.cs:37:20:37:32 | ... ? ... : ... | non-null |
-| Assert.cs:39:27:39:27 | access to local variable s | null | Assert.cs:37:20:37:32 | ... ? ... : ... | null |
-| Assert.cs:44:20:44:32 | ... ? ... : ... | non-null | Assert.cs:44:20:44:20 | access to parameter b | false |
-| Assert.cs:44:20:44:32 | ... ? ... : ... | non-null | Assert.cs:44:31:44:32 | "" | non-null |
-| Assert.cs:44:20:44:32 | ... ? ... : ... | null | Assert.cs:44:20:44:20 | access to parameter b | true |
-| Assert.cs:44:20:44:32 | ... ? ... : ... | null | Assert.cs:44:24:44:27 | null | null |
-| Assert.cs:45:24:45:24 | access to local variable s | empty | Assert.cs:44:20:44:32 | ... ? ... : ... | empty |
-| Assert.cs:45:24:45:24 | access to local variable s | non-empty | Assert.cs:44:20:44:32 | ... ? ... : ... | non-empty |
-| Assert.cs:45:24:45:24 | access to local variable s | non-null | Assert.cs:44:20:44:32 | ... ? ... : ... | non-null |
-| Assert.cs:45:24:45:24 | access to local variable s | null | Assert.cs:44:20:44:32 | ... ? ... : ... | null |
-| Assert.cs:45:24:45:32 | ... != ... | false | Assert.cs:44:20:44:20 | access to parameter b | true |
-| Assert.cs:45:24:45:32 | ... != ... | false | Assert.cs:45:24:45:24 | access to local variable s | null |
-| Assert.cs:45:24:45:32 | ... != ... | true | Assert.cs:44:20:44:20 | access to parameter b | false |
-| Assert.cs:45:24:45:32 | ... != ... | true | Assert.cs:45:24:45:24 | access to local variable s | non-null |
-| Assert.cs:46:27:46:27 | access to local variable s | non-null | Assert.cs:44:20:44:32 | ... ? ... : ... | non-null |
-| Assert.cs:46:27:46:27 | access to local variable s | null | Assert.cs:44:20:44:32 | ... ? ... : ... | null |
-| Assert.cs:51:20:51:32 | ... ? ... : ... | non-null | Assert.cs:51:20:51:20 | access to parameter b | false |
-| Assert.cs:51:20:51:32 | ... ? ... : ... | non-null | Assert.cs:51:31:51:32 | "" | non-null |
-| Assert.cs:51:20:51:32 | ... ? ... : ... | null | Assert.cs:51:20:51:20 | access to parameter b | true |
-| Assert.cs:51:20:51:32 | ... ? ... : ... | null | Assert.cs:51:24:51:27 | null | null |
-| Assert.cs:52:24:52:24 | access to local variable s | empty | Assert.cs:51:20:51:32 | ... ? ... : ... | empty |
-| Assert.cs:52:24:52:24 | access to local variable s | non-empty | Assert.cs:51:20:51:32 | ... ? ... : ... | non-empty |
-| Assert.cs:52:24:52:24 | access to local variable s | non-null | Assert.cs:51:20:51:32 | ... ? ... : ... | non-null |
-| Assert.cs:52:24:52:24 | access to local variable s | null | Assert.cs:51:20:51:32 | ... ? ... : ... | null |
-| Assert.cs:52:24:52:32 | ... == ... | false | Assert.cs:51:20:51:20 | access to parameter b | false |
-| Assert.cs:52:24:52:32 | ... == ... | false | Assert.cs:52:24:52:24 | access to local variable s | non-null |
-| Assert.cs:52:24:52:32 | ... == ... | true | Assert.cs:51:20:51:20 | access to parameter b | true |
-| Assert.cs:52:24:52:32 | ... == ... | true | Assert.cs:52:24:52:24 | access to local variable s | null |
-| Assert.cs:53:27:53:27 | access to local variable s | non-null | Assert.cs:51:20:51:32 | ... ? ... : ... | non-null |
-| Assert.cs:53:27:53:27 | access to local variable s | null | Assert.cs:51:20:51:32 | ... ? ... : ... | null |
-| Assert.cs:58:20:58:32 | ... ? ... : ... | non-null | Assert.cs:58:20:58:20 | access to parameter b | false |
-| Assert.cs:58:20:58:32 | ... ? ... : ... | non-null | Assert.cs:58:31:58:32 | "" | non-null |
-| Assert.cs:58:20:58:32 | ... ? ... : ... | null | Assert.cs:58:20:58:20 | access to parameter b | true |
-| Assert.cs:58:20:58:32 | ... ? ... : ... | null | Assert.cs:58:24:58:27 | null | null |
-| Assert.cs:59:23:59:23 | access to local variable s | empty | Assert.cs:58:20:58:32 | ... ? ... : ... | empty |
-| Assert.cs:59:23:59:23 | access to local variable s | non-empty | Assert.cs:58:20:58:32 | ... ? ... : ... | non-empty |
-| Assert.cs:59:23:59:23 | access to local variable s | non-null | Assert.cs:58:20:58:32 | ... ? ... : ... | non-null |
-| Assert.cs:59:23:59:23 | access to local variable s | null | Assert.cs:58:20:58:32 | ... ? ... : ... | null |
-| Assert.cs:59:23:59:31 | ... != ... | false | Assert.cs:58:20:58:20 | access to parameter b | true |
-| Assert.cs:59:23:59:31 | ... != ... | false | Assert.cs:59:23:59:23 | access to local variable s | null |
-| Assert.cs:59:23:59:31 | ... != ... | true | Assert.cs:58:20:58:20 | access to parameter b | false |
-| Assert.cs:59:23:59:31 | ... != ... | true | Assert.cs:59:23:59:23 | access to local variable s | non-null |
-| Assert.cs:59:23:59:36 | ... && ... | true | Assert.cs:59:23:59:31 | ... != ... | true |
-| Assert.cs:59:23:59:36 | ... && ... | true | Assert.cs:59:36:59:36 | access to parameter b | true |
-| Assert.cs:60:27:60:27 | access to local variable s | non-null | Assert.cs:58:20:58:32 | ... ? ... : ... | non-null |
-| Assert.cs:60:27:60:27 | access to local variable s | null | Assert.cs:58:20:58:32 | ... ? ... : ... | null |
-| Assert.cs:65:20:65:32 | ... ? ... : ... | non-null | Assert.cs:65:20:65:20 | access to parameter b | false |
-| Assert.cs:65:20:65:32 | ... ? ... : ... | non-null | Assert.cs:65:31:65:32 | "" | non-null |
-| Assert.cs:65:20:65:32 | ... ? ... : ... | null | Assert.cs:65:20:65:20 | access to parameter b | true |
-| Assert.cs:65:20:65:32 | ... ? ... : ... | null | Assert.cs:65:24:65:27 | null | null |
-| Assert.cs:66:24:66:24 | access to local variable s | empty | Assert.cs:65:20:65:32 | ... ? ... : ... | empty |
-| Assert.cs:66:24:66:24 | access to local variable s | non-empty | Assert.cs:65:20:65:32 | ... ? ... : ... | non-empty |
-| Assert.cs:66:24:66:24 | access to local variable s | non-null | Assert.cs:65:20:65:32 | ... ? ... : ... | non-null |
-| Assert.cs:66:24:66:24 | access to local variable s | null | Assert.cs:65:20:65:32 | ... ? ... : ... | null |
-| Assert.cs:66:24:66:32 | ... == ... | false | Assert.cs:65:20:65:20 | access to parameter b | false |
-| Assert.cs:66:24:66:32 | ... == ... | false | Assert.cs:66:24:66:24 | access to local variable s | non-null |
-| Assert.cs:66:24:66:32 | ... == ... | true | Assert.cs:65:20:65:20 | access to parameter b | true |
-| Assert.cs:66:24:66:32 | ... == ... | true | Assert.cs:66:24:66:24 | access to local variable s | null |
-| Assert.cs:66:24:66:37 | ... \|\| ... | false | Assert.cs:66:24:66:32 | ... == ... | false |
-| Assert.cs:66:24:66:37 | ... \|\| ... | false | Assert.cs:66:37:66:37 | access to parameter b | false |
-| Assert.cs:67:27:67:27 | access to local variable s | non-null | Assert.cs:65:20:65:32 | ... ? ... : ... | non-null |
-| Assert.cs:67:27:67:27 | access to local variable s | null | Assert.cs:65:20:65:32 | ... ? ... : ... | null |
-| Assert.cs:72:20:72:32 | ... ? ... : ... | non-null | Assert.cs:72:20:72:20 | access to parameter b | false |
-| Assert.cs:72:20:72:32 | ... ? ... : ... | non-null | Assert.cs:72:31:72:32 | "" | non-null |
-| Assert.cs:72:20:72:32 | ... ? ... : ... | null | Assert.cs:72:20:72:20 | access to parameter b | true |
-| Assert.cs:72:20:72:32 | ... ? ... : ... | null | Assert.cs:72:24:72:27 | null | null |
-| Assert.cs:73:23:73:23 | access to local variable s | empty | Assert.cs:72:20:72:32 | ... ? ... : ... | empty |
-| Assert.cs:73:23:73:23 | access to local variable s | non-empty | Assert.cs:72:20:72:32 | ... ? ... : ... | non-empty |
-| Assert.cs:73:23:73:23 | access to local variable s | non-null | Assert.cs:72:20:72:32 | ... ? ... : ... | non-null |
-| Assert.cs:73:23:73:23 | access to local variable s | null | Assert.cs:72:20:72:32 | ... ? ... : ... | null |
-| Assert.cs:73:23:73:31 | ... == ... | false | Assert.cs:72:20:72:20 | access to parameter b | false |
-| Assert.cs:73:23:73:31 | ... == ... | false | Assert.cs:73:23:73:23 | access to local variable s | non-null |
-| Assert.cs:73:23:73:31 | ... == ... | true | Assert.cs:72:20:72:20 | access to parameter b | true |
-| Assert.cs:73:23:73:31 | ... == ... | true | Assert.cs:73:23:73:23 | access to local variable s | null |
-| Assert.cs:73:23:73:36 | ... && ... | true | Assert.cs:73:23:73:31 | ... == ... | true |
-| Assert.cs:73:23:73:36 | ... && ... | true | Assert.cs:73:36:73:36 | access to parameter b | true |
-| Assert.cs:74:27:74:27 | access to local variable s | non-null | Assert.cs:72:20:72:32 | ... ? ... : ... | non-null |
-| Assert.cs:74:27:74:27 | access to local variable s | null | Assert.cs:72:20:72:32 | ... ? ... : ... | null |
-| Assert.cs:79:20:79:32 | ... ? ... : ... | non-null | Assert.cs:79:20:79:20 | access to parameter b | false |
-| Assert.cs:79:20:79:32 | ... ? ... : ... | non-null | Assert.cs:79:31:79:32 | "" | non-null |
-| Assert.cs:79:20:79:32 | ... ? ... : ... | null | Assert.cs:79:20:79:20 | access to parameter b | true |
-| Assert.cs:79:20:79:32 | ... ? ... : ... | null | Assert.cs:79:24:79:27 | null | null |
-| Assert.cs:80:24:80:24 | access to local variable s | empty | Assert.cs:79:20:79:32 | ... ? ... : ... | empty |
-| Assert.cs:80:24:80:24 | access to local variable s | non-empty | Assert.cs:79:20:79:32 | ... ? ... : ... | non-empty |
-| Assert.cs:80:24:80:24 | access to local variable s | non-null | Assert.cs:79:20:79:32 | ... ? ... : ... | non-null |
-| Assert.cs:80:24:80:24 | access to local variable s | null | Assert.cs:79:20:79:32 | ... ? ... : ... | null |
-| Assert.cs:80:24:80:32 | ... != ... | false | Assert.cs:79:20:79:20 | access to parameter b | true |
-| Assert.cs:80:24:80:32 | ... != ... | false | Assert.cs:80:24:80:24 | access to local variable s | null |
-| Assert.cs:80:24:80:32 | ... != ... | true | Assert.cs:79:20:79:20 | access to parameter b | false |
-| Assert.cs:80:24:80:32 | ... != ... | true | Assert.cs:80:24:80:24 | access to local variable s | non-null |
-| Assert.cs:80:24:80:37 | ... \|\| ... | false | Assert.cs:80:24:80:32 | ... != ... | false |
-| Assert.cs:80:24:80:37 | ... \|\| ... | false | Assert.cs:80:37:80:37 | access to parameter b | false |
-| Assert.cs:81:27:81:27 | access to local variable s | non-null | Assert.cs:79:20:79:32 | ... ? ... : ... | non-null |
-| Assert.cs:81:27:81:27 | access to local variable s | null | Assert.cs:79:20:79:32 | ... ? ... : ... | null |
-| Assert.cs:94:16:94:24 | ... && ... | true | Assert.cs:94:16:94:17 | access to parameter b1 | true |
-| Assert.cs:94:16:94:24 | ... && ... | true | Assert.cs:94:22:94:24 | !... | true |
-| Assert.cs:94:22:94:24 | !... | false | Assert.cs:94:23:94:24 | access to parameter b2 | true |
-| Assert.cs:94:22:94:24 | !... | true | Assert.cs:94:23:94:24 | access to parameter b2 | false |
-| Collections.cs:11:17:11:32 | ... == ... | false | Collections.cs:11:17:11:20 | access to parameter args | non-empty |
-| Collections.cs:11:17:11:32 | ... == ... | true | Collections.cs:11:17:11:20 | access to parameter args | empty |
-| Collections.cs:12:13:12:28 | ... == ... | true | Collections.cs:12:13:12:16 | access to parameter args | non-empty |
-| Collections.cs:13:13:13:28 | ... != ... | false | Collections.cs:13:13:13:16 | access to parameter args | empty |
-| Collections.cs:13:13:13:28 | ... != ... | true | Collections.cs:13:13:13:16 | access to parameter args | non-empty |
-| Collections.cs:14:13:14:28 | ... != ... | false | Collections.cs:14:13:14:16 | access to parameter args | non-empty |
-| Collections.cs:15:13:15:27 | ... > ... | true | Collections.cs:15:13:15:16 | access to parameter args | non-empty |
-| Collections.cs:17:13:17:28 | ... >= ... | true | Collections.cs:17:13:17:16 | access to parameter args | non-empty |
-| Collections.cs:22:17:22:31 | ... == ... | false | Collections.cs:22:17:22:20 | access to parameter args | non-empty |
-| Collections.cs:22:17:22:31 | ... == ... | true | Collections.cs:22:17:22:20 | access to parameter args | empty |
-| Collections.cs:23:13:23:27 | ... == ... | true | Collections.cs:23:13:23:16 | access to parameter args | non-empty |
-| Collections.cs:24:13:24:27 | ... != ... | false | Collections.cs:24:13:24:16 | access to parameter args | empty |
-| Collections.cs:24:13:24:27 | ... != ... | true | Collections.cs:24:13:24:16 | access to parameter args | non-empty |
-| Collections.cs:25:13:25:27 | ... != ... | false | Collections.cs:25:13:25:16 | access to parameter args | non-empty |
-| Collections.cs:26:13:26:26 | ... > ... | true | Collections.cs:26:13:26:16 | access to parameter args | non-empty |
-| Collections.cs:28:13:28:27 | ... >= ... | true | Collections.cs:28:13:28:16 | access to parameter args | non-empty |
-| Collections.cs:33:17:33:33 | ... == ... | false | Collections.cs:33:17:33:20 | access to parameter args | non-empty |
-| Collections.cs:33:17:33:33 | ... == ... | true | Collections.cs:33:17:33:20 | access to parameter args | empty |
-| Collections.cs:34:13:34:29 | ... == ... | true | Collections.cs:34:13:34:16 | access to parameter args | non-empty |
-| Collections.cs:35:13:35:29 | ... != ... | false | Collections.cs:35:13:35:16 | access to parameter args | empty |
-| Collections.cs:35:13:35:29 | ... != ... | true | Collections.cs:35:13:35:16 | access to parameter args | non-empty |
-| Collections.cs:36:13:36:29 | ... != ... | false | Collections.cs:36:13:36:16 | access to parameter args | non-empty |
-| Collections.cs:37:13:37:28 | ... > ... | true | Collections.cs:37:13:37:16 | access to parameter args | non-empty |
-| Collections.cs:39:13:39:29 | ... >= ... | true | Collections.cs:39:13:39:16 | access to parameter args | non-empty |
-| Collections.cs:44:17:44:26 | call to method Any<String> | false | Collections.cs:44:17:44:20 | access to parameter args | empty |
-| Collections.cs:44:17:44:26 | call to method Any<String> | true | Collections.cs:44:17:44:20 | access to parameter args | non-empty |
-| Collections.cs:49:13:49:27 | ... == ... | false | Collections.cs:49:13:49:16 | access to parameter args | non-empty |
-| Collections.cs:49:13:49:27 | ... == ... | true | Collections.cs:49:13:49:16 | access to parameter args | empty |
-| Collections.cs:55:13:55:13 | access to local variable x | empty | Collections.cs:54:13:54:42 | array creation of type String[] | empty |
-| Collections.cs:55:13:55:13 | access to local variable x | non-empty | Collections.cs:54:13:54:42 | array creation of type String[] | non-empty |
-| Collections.cs:55:13:55:13 | access to local variable x | non-null | Collections.cs:54:13:54:42 | array creation of type String[] | non-null |
-| Collections.cs:55:13:55:13 | access to local variable x | null | Collections.cs:54:13:54:42 | array creation of type String[] | null |
-| Collections.cs:57:13:57:13 | access to local variable x | empty | Collections.cs:56:13:56:25 | array creation of type String[] | empty |
-| Collections.cs:57:13:57:13 | access to local variable x | non-empty | Collections.cs:56:13:56:25 | array creation of type String[] | non-empty |
-| Collections.cs:57:13:57:13 | access to local variable x | non-null | Collections.cs:56:13:56:25 | array creation of type String[] | non-null |
-| Collections.cs:57:13:57:13 | access to local variable x | null | Collections.cs:56:13:56:25 | array creation of type String[] | null |
-| Collections.cs:63:9:63:9 | access to local variable x | empty | Collections.cs:62:17:62:55 | call to method ToList<String> | empty |
-| Collections.cs:63:9:63:9 | access to local variable x | non-empty | Collections.cs:62:17:62:55 | call to method ToList<String> | non-empty |
-| Collections.cs:63:9:63:9 | access to local variable x | non-null | Collections.cs:62:17:62:55 | call to method ToList<String> | non-null |
-| Collections.cs:63:9:63:9 | access to local variable x | null | Collections.cs:62:17:62:55 | call to method ToList<String> | null |
-| Collections.cs:64:13:64:13 | access to local variable x | non-null | Collections.cs:62:17:62:55 | call to method ToList<String> | non-null |
-| Collections.cs:64:13:64:13 | access to local variable x | null | Collections.cs:62:17:62:55 | call to method ToList<String> | null |
-| Collections.cs:64:13:64:24 | ... == ... | false | Collections.cs:64:13:64:13 | access to local variable x | non-empty |
-| Collections.cs:64:13:64:24 | ... == ... | true | Collections.cs:64:13:64:13 | access to local variable x | empty |
-| Collections.cs:66:13:66:13 | access to local variable x | non-null | Collections.cs:62:17:62:55 | call to method ToList<String> | non-null |
-| Collections.cs:66:13:66:13 | access to local variable x | null | Collections.cs:62:17:62:55 | call to method ToList<String> | null |
-| Collections.cs:67:13:67:13 | access to local variable x | non-null | Collections.cs:62:17:62:55 | call to method ToList<String> | non-null |
-| Collections.cs:67:13:67:13 | access to local variable x | null | Collections.cs:62:17:62:55 | call to method ToList<String> | null |
-| Collections.cs:73:35:73:41 | ... == ... | true | Collections.cs:73:35:73:35 | access to parameter s | non-null |
-| Collections.cs:73:35:73:41 | ... == ... | true | Collections.cs:73:40:73:41 | "" | non-null |
-| Collections.cs:74:17:74:33 | call to method Any<String> | true | Collections.cs:74:17:74:20 | access to parameter args | non-empty |
-| Collections.cs:75:13:75:36 | ... == ... | false | Collections.cs:75:13:75:16 | access to parameter args | non-empty |
-| Collections.cs:76:13:76:36 | ... == ... | true | Collections.cs:76:13:76:16 | access to parameter args | non-empty |
-| Collections.cs:77:13:77:36 | ... != ... | true | Collections.cs:77:13:77:16 | access to parameter args | non-empty |
-| Collections.cs:78:13:78:36 | ... != ... | false | Collections.cs:78:13:78:16 | access to parameter args | non-empty |
-| Collections.cs:79:13:79:35 | ... > ... | true | Collections.cs:79:13:79:16 | access to parameter args | non-empty |
-| Collections.cs:81:13:81:36 | ... >= ... | true | Collections.cs:81:13:81:16 | access to parameter args | non-empty |
-| Guards.cs:10:13:10:25 | !... | false | Guards.cs:10:14:10:25 | !... | true |
-| Guards.cs:10:13:10:25 | !... | true | Guards.cs:10:14:10:25 | !... | false |
-| Guards.cs:10:14:10:25 | !... | false | Guards.cs:10:16:10:24 | ... == ... | true |
-| Guards.cs:10:14:10:25 | !... | true | Guards.cs:10:16:10:24 | ... == ... | false |
-| Guards.cs:10:16:10:24 | ... == ... | false | Guards.cs:10:16:10:16 | access to parameter s | non-null |
-| Guards.cs:10:16:10:24 | ... == ... | true | Guards.cs:10:16:10:16 | access to parameter s | null |
-| Guards.cs:24:13:24:21 | ... != ... | false | Guards.cs:24:13:24:13 | access to parameter s | null |
-| Guards.cs:24:13:24:21 | ... != ... | true | Guards.cs:24:13:24:13 | access to parameter s | non-null |
-| Guards.cs:32:13:32:36 | !... | false | Guards.cs:32:14:32:36 | call to method IsNullOrEmpty | true |
-| Guards.cs:32:13:32:36 | !... | true | Guards.cs:32:14:32:36 | call to method IsNullOrEmpty | false |
-| Guards.cs:32:13:32:51 | ... & ... | true | Guards.cs:32:13:32:36 | !... | true |
-| Guards.cs:32:13:32:51 | ... & ... | true | Guards.cs:32:40:32:51 | !... | true |
-| Guards.cs:32:14:32:36 | call to method IsNullOrEmpty | false | Guards.cs:32:35:32:35 | access to parameter x | non-null |
-| Guards.cs:32:40:32:51 | !... | false | Guards.cs:32:42:32:50 | ... == ... | true |
-| Guards.cs:32:40:32:51 | !... | true | Guards.cs:32:42:32:50 | ... == ... | false |
-| Guards.cs:32:42:32:50 | ... == ... | false | Guards.cs:32:42:32:42 | access to parameter y | non-null |
-| Guards.cs:32:42:32:50 | ... == ... | true | Guards.cs:32:42:32:42 | access to parameter y | null |
-| Guards.cs:33:31:33:35 | ... + ... | non-null | Guards.cs:33:31:33:31 | access to parameter x | non-null |
-| Guards.cs:33:31:33:35 | ... + ... | non-null | Guards.cs:33:35:33:35 | access to parameter y | non-null |
-| Guards.cs:35:13:35:21 | ... == ... | false | Guards.cs:35:13:35:13 | access to parameter x | non-null |
-| Guards.cs:35:13:35:21 | ... == ... | true | Guards.cs:35:13:35:13 | access to parameter x | null |
-| Guards.cs:35:13:35:34 | ... \|\| ... | false | Guards.cs:35:13:35:21 | ... == ... | false |
-| Guards.cs:35:13:35:34 | ... \|\| ... | false | Guards.cs:35:26:35:34 | ... == ... | false |
-| Guards.cs:35:26:35:34 | ... == ... | false | Guards.cs:35:26:35:26 | access to parameter y | non-null |
-| Guards.cs:35:26:35:34 | ... == ... | true | Guards.cs:35:26:35:26 | access to parameter y | null |
-| Guards.cs:36:32:36:36 | ... + ... | non-null | Guards.cs:36:32:36:32 | access to parameter x | non-null |
-| Guards.cs:36:32:36:36 | ... + ... | non-null | Guards.cs:36:36:36:36 | access to parameter y | non-null |
-| Guards.cs:36:32:36:36 | ... + ... | null | Guards.cs:36:32:36:32 | access to parameter x | null |
-| Guards.cs:36:32:36:36 | ... + ... | null | Guards.cs:36:36:36:36 | access to parameter y | null |
-| Guards.cs:38:13:38:37 | !... | false | Guards.cs:38:15:38:36 | ... \|\| ... | true |
-| Guards.cs:38:13:38:37 | !... | true | Guards.cs:38:15:38:36 | ... \|\| ... | false |
-| Guards.cs:38:15:38:23 | ... == ... | false | Guards.cs:38:15:38:15 | access to parameter x | non-null |
-| Guards.cs:38:15:38:23 | ... == ... | true | Guards.cs:38:15:38:15 | access to parameter x | null |
-| Guards.cs:38:15:38:36 | ... \|\| ... | false | Guards.cs:38:15:38:23 | ... == ... | false |
-| Guards.cs:38:15:38:36 | ... \|\| ... | false | Guards.cs:38:28:38:36 | ... == ... | false |
-| Guards.cs:38:28:38:36 | ... == ... | false | Guards.cs:38:28:38:28 | access to parameter y | non-null |
-| Guards.cs:38:28:38:36 | ... == ... | true | Guards.cs:38:28:38:28 | access to parameter y | null |
-| Guards.cs:39:31:39:35 | ... + ... | non-null | Guards.cs:39:31:39:31 | access to parameter x | non-null |
-| Guards.cs:39:31:39:35 | ... + ... | non-null | Guards.cs:39:35:39:35 | access to parameter y | non-null |
-| Guards.cs:39:31:39:35 | ... + ... | null | Guards.cs:39:31:39:31 | access to parameter x | null |
-| Guards.cs:39:31:39:35 | ... + ... | null | Guards.cs:39:35:39:35 | access to parameter y | null |
-| Guards.cs:41:13:41:39 | !... | false | Guards.cs:41:14:41:39 | !... | true |
-| Guards.cs:41:13:41:39 | !... | true | Guards.cs:41:14:41:39 | !... | false |
-| Guards.cs:41:14:41:39 | !... | false | Guards.cs:41:15:41:39 | !... | true |
-| Guards.cs:41:14:41:39 | !... | true | Guards.cs:41:15:41:39 | !... | false |
-| Guards.cs:41:15:41:39 | !... | false | Guards.cs:41:17:41:38 | ... && ... | true |
-| Guards.cs:41:15:41:39 | !... | true | Guards.cs:41:17:41:38 | ... && ... | false |
-| Guards.cs:41:17:41:25 | ... != ... | false | Guards.cs:41:17:41:17 | access to parameter x | null |
-| Guards.cs:41:17:41:25 | ... != ... | true | Guards.cs:41:17:41:17 | access to parameter x | non-null |
-| Guards.cs:41:17:41:38 | ... && ... | true | Guards.cs:41:17:41:25 | ... != ... | true |
-| Guards.cs:41:17:41:38 | ... && ... | true | Guards.cs:41:30:41:38 | ... != ... | true |
-| Guards.cs:41:30:41:38 | ... != ... | false | Guards.cs:41:30:41:30 | access to parameter y | null |
-| Guards.cs:41:30:41:38 | ... != ... | true | Guards.cs:41:30:41:30 | access to parameter y | non-null |
-| Guards.cs:42:32:42:36 | ... + ... | non-null | Guards.cs:42:32:42:32 | access to parameter x | non-null |
-| Guards.cs:42:32:42:36 | ... + ... | non-null | Guards.cs:42:36:42:36 | access to parameter y | non-null |
-| Guards.cs:42:32:42:36 | ... + ... | null | Guards.cs:42:32:42:32 | access to parameter x | null |
-| Guards.cs:42:32:42:36 | ... + ... | null | Guards.cs:42:36:42:36 | access to parameter y | null |
-| Guards.cs:44:13:44:25 | ... != ... | false | Guards.cs:44:13:44:17 | access to field Field | null |
-| Guards.cs:44:13:44:25 | ... != ... | true | Guards.cs:44:13:44:17 | access to field Field | non-null |
-| Guards.cs:47:13:47:25 | ... != ... | false | Guards.cs:47:13:47:17 | access to field Field | null |
-| Guards.cs:47:13:47:25 | ... != ... | true | Guards.cs:47:13:47:17 | access to field Field | non-null |
-| Guards.cs:53:13:53:27 | ... == ... | false | Guards.cs:53:13:53:19 | access to field Field | non-null |
-| Guards.cs:53:13:53:27 | ... == ... | true | Guards.cs:53:13:53:19 | access to field Field | null |
-| Guards.cs:60:13:60:45 | ... == ... | false | Guards.cs:60:13:60:37 | access to field Field | non-null |
-| Guards.cs:60:13:60:45 | ... == ... | true | Guards.cs:60:13:60:37 | access to field Field | null |
-| Guards.cs:68:16:68:24 | ... != ... | false | Guards.cs:68:16:68:16 | access to parameter s | null |
-| Guards.cs:68:16:68:24 | ... != ... | true | Guards.cs:68:16:68:16 | access to parameter s | non-null |
-| Guards.cs:72:31:72:31 | access to parameter s | empty | Guards.cs:71:17:71:20 | null | empty |
-| Guards.cs:72:31:72:31 | access to parameter s | non-empty | Guards.cs:71:17:71:20 | null | non-empty |
-| Guards.cs:72:31:72:31 | access to parameter s | non-null | Guards.cs:71:17:71:20 | null | non-null |
-| Guards.cs:72:31:72:31 | access to parameter s | null | Guards.cs:71:17:71:20 | null | null |
-| Guards.cs:78:13:78:21 | access to property Length | non-null | Guards.cs:78:13:78:13 | access to parameter s | non-null |
-| Guards.cs:78:13:78:21 | access to property Length | null | Guards.cs:78:13:78:13 | access to parameter s | null |
-| Guards.cs:78:13:78:26 | ... == ... | true | Guards.cs:78:13:78:21 | access to property Length | non-null |
-| Guards.cs:80:13:80:21 | access to property Length | non-null | Guards.cs:80:13:80:13 | access to parameter s | non-null |
-| Guards.cs:80:13:80:21 | access to property Length | null | Guards.cs:80:13:80:13 | access to parameter s | null |
-| Guards.cs:80:13:80:25 | ... > ... | true | Guards.cs:80:13:80:21 | access to property Length | non-null |
-| Guards.cs:82:13:82:21 | access to property Length | non-null | Guards.cs:82:13:82:13 | access to parameter s | non-null |
-| Guards.cs:82:13:82:21 | access to property Length | null | Guards.cs:82:13:82:13 | access to parameter s | null |
-| Guards.cs:82:13:82:26 | ... >= ... | true | Guards.cs:82:13:82:21 | access to property Length | non-null |
-| Guards.cs:84:13:84:21 | access to property Length | non-null | Guards.cs:84:13:84:13 | access to parameter s | non-null |
-| Guards.cs:84:13:84:21 | access to property Length | null | Guards.cs:84:13:84:13 | access to parameter s | null |
-| Guards.cs:84:13:84:26 | ... < ... | true | Guards.cs:84:13:84:21 | access to property Length | non-null |
-| Guards.cs:86:13:86:21 | access to property Length | non-null | Guards.cs:86:13:86:13 | access to parameter s | non-null |
-| Guards.cs:86:13:86:21 | access to property Length | null | Guards.cs:86:13:86:13 | access to parameter s | null |
-| Guards.cs:86:13:86:27 | ... <= ... | true | Guards.cs:86:13:86:21 | access to property Length | non-null |
-| Guards.cs:88:13:88:21 | access to property Length | non-null | Guards.cs:88:13:88:13 | access to parameter s | non-null |
-| Guards.cs:88:13:88:21 | access to property Length | null | Guards.cs:88:13:88:13 | access to parameter s | null |
-| Guards.cs:88:13:88:29 | ... != ... | false | Guards.cs:88:13:88:21 | access to property Length | null |
-| Guards.cs:88:13:88:29 | ... != ... | true | Guards.cs:88:13:88:21 | access to property Length | non-null |
-| Guards.cs:92:13:92:21 | access to property Length | non-null | Guards.cs:92:13:92:13 | access to parameter s | non-null |
-| Guards.cs:92:13:92:21 | access to property Length | null | Guards.cs:92:13:92:13 | access to parameter s | null |
-| Guards.cs:92:13:92:25 | ... - ... | non-null | Guards.cs:92:13:92:21 | access to property Length | non-null |
-| Guards.cs:92:13:92:25 | ... - ... | non-null | Guards.cs:92:25:92:25 | (...) ... | non-null |
-| Guards.cs:92:13:92:25 | ... - ... | null | Guards.cs:92:13:92:21 | access to property Length | null |
-| Guards.cs:92:13:92:30 | ... != ... | false | Guards.cs:92:13:92:25 | ... - ... | non-null |
-| Guards.cs:96:13:96:19 | ... == ... | true | Guards.cs:96:13:96:13 | access to parameter s | non-null |
-| Guards.cs:104:13:104:45 | ... == ... | false | Guards.cs:104:13:104:37 | access to field Field | non-null |
-| Guards.cs:104:13:104:45 | ... == ... | true | Guards.cs:104:13:104:37 | access to field Field | null |
-| Guards.cs:107:27:107:36 | access to property Property | non-null | Guards.cs:106:22:106:25 | null | non-null |
-| Guards.cs:107:27:107:36 | access to property Property | null | Guards.cs:106:22:106:25 | null | null |
-| Guards.cs:108:27:108:36 | access to property Property | non-null | Guards.cs:106:22:106:25 | null | non-null |
-| Guards.cs:108:27:108:36 | access to property Property | null | Guards.cs:106:22:106:25 | null | null |
-| Guards.cs:113:21:114:38 | ... ?? ... | null | Guards.cs:113:21:113:45 | access to field Field | null |
-| Guards.cs:113:21:114:38 | ... ?? ... | null | Guards.cs:114:14:114:38 | access to field Field | null |
-| Guards.cs:115:17:115:55 | ... ?? ... | null | Guards.cs:115:17:115:41 | access to field Field | null |
-| Guards.cs:115:17:115:55 | ... ?? ... | null | Guards.cs:115:46:115:55 | throw ... | null |
-| Guards.cs:118:27:118:36 | access to property Property | non-null | Guards.cs:117:22:117:25 | null | non-null |
-| Guards.cs:118:27:118:36 | access to property Property | null | Guards.cs:117:22:117:25 | null | null |
-| Guards.cs:119:27:119:36 | access to property Property | non-null | Guards.cs:117:22:117:25 | null | non-null |
-| Guards.cs:119:27:119:36 | access to property Property | null | Guards.cs:117:22:117:25 | null | null |
-| Guards.cs:125:18:125:31 | call to method Equals | non-null | Guards.cs:125:18:125:19 | access to parameter s1 | non-null |
-| Guards.cs:125:18:125:31 | call to method Equals | null | Guards.cs:125:18:125:19 | access to parameter s1 | null |
-| Guards.cs:125:18:125:31 | call to method Equals | true | Guards.cs:125:18:125:19 | access to parameter s1 | non-null |
-| Guards.cs:125:18:125:31 | call to method Equals | true | Guards.cs:125:29:125:30 | access to parameter s1 | non-null |
-| Guards.cs:130:13:130:21 | ... is ... | false | Guards.cs:130:13:130:13 | access to parameter s | non-null |
-| Guards.cs:130:13:130:21 | ... is ... | true | Guards.cs:130:13:130:13 | access to parameter s | null |
-| Guards.cs:137:13:137:25 | ... is ... | false | Guards.cs:137:13:137:13 | access to parameter s | null |
-| Guards.cs:137:13:137:25 | ... is ... | true | Guards.cs:137:13:137:13 | access to parameter s | non-null |
-| Guards.cs:144:13:144:25 | ... is ... | true | Guards.cs:144:13:144:13 | access to parameter o | non-null |
-| Guards.cs:145:20:145:20 | access to local variable s | empty | Guards.cs:144:13:144:13 | access to parameter o | empty |
-| Guards.cs:145:20:145:20 | access to local variable s | non-empty | Guards.cs:144:13:144:13 | access to parameter o | non-empty |
-| Guards.cs:145:20:145:20 | access to local variable s | non-null | Guards.cs:144:13:144:13 | access to parameter o | non-null |
-| Guards.cs:145:20:145:20 | access to local variable s | null | Guards.cs:144:13:144:13 | access to parameter o | null |
-| Guards.cs:151:17:151:17 | access to parameter o | match "" | Guards.cs:151:17:151:17 | access to parameter o | non-null |
-| Guards.cs:151:17:151:17 | access to parameter o | match Action<String> a | Guards.cs:151:17:151:17 | access to parameter o | non-null |
-| Guards.cs:151:17:151:17 | access to parameter o | match access to type Action<Object> | Guards.cs:151:17:151:17 | access to parameter o | non-null |
-| Guards.cs:151:17:151:17 | access to parameter o | match null | Guards.cs:151:17:151:17 | access to parameter o | null |
-| Guards.cs:151:17:151:17 | access to parameter o | non-match null | Guards.cs:151:17:151:17 | access to parameter o | non-null |
-| Guards.cs:156:24:156:24 | access to local variable a | non-null | Guards.cs:151:17:151:17 | access to parameter o | non-null |
-| Guards.cs:156:24:156:24 | access to local variable a | null | Guards.cs:151:17:151:17 | access to parameter o | null |
-| Guards.cs:168:13:168:41 | !... | false | Guards.cs:168:14:168:41 | call to method IsNullOrWhiteSpace | true |
-| Guards.cs:168:13:168:41 | !... | true | Guards.cs:168:14:168:41 | call to method IsNullOrWhiteSpace | false |
-| Guards.cs:168:14:168:41 | call to method IsNullOrWhiteSpace | false | Guards.cs:168:40:168:40 | access to parameter x | non-null |
-| Guards.cs:172:34:172:42 | ... == ... | false | Guards.cs:172:34:172:34 | access to parameter o | non-null |
-| Guards.cs:172:34:172:42 | ... == ... | true | Guards.cs:172:34:172:34 | access to parameter o | null |
-| Guards.cs:176:13:176:21 | ... is ... | false | Guards.cs:176:13:176:13 | access to parameter o | non-null |
-| Guards.cs:176:13:176:21 | ... is ... | true | Guards.cs:176:13:176:13 | access to parameter o | null |
-| Guards.cs:181:34:181:42 | ... == ... | false | Guards.cs:181:34:181:34 | access to parameter o | non-null |
-| Guards.cs:181:34:181:42 | ... == ... | true | Guards.cs:181:34:181:34 | access to parameter o | null |
-| Guards.cs:181:34:181:57 | ... ? ... : ... | false | Guards.cs:181:34:181:42 | ... == ... | false |
-| Guards.cs:181:34:181:57 | ... ? ... : ... | true | Guards.cs:181:34:181:42 | ... == ... | true |
-| Guards.cs:183:37:183:49 | !... | false | Guards.cs:183:38:183:49 | call to method NullTest3 | true |
-| Guards.cs:183:37:183:49 | !... | true | Guards.cs:183:38:183:49 | call to method NullTest3 | false |
-| Guards.cs:183:38:183:49 | call to method NullTest3 | false | Guards.cs:183:48:183:48 | access to parameter o | non-null |
-| Guards.cs:183:38:183:49 | call to method NullTest3 | true | Guards.cs:183:48:183:48 | access to parameter o | null |
-| Guards.cs:185:38:185:46 | ... == ... | false | Guards.cs:185:38:185:38 | access to parameter o | non-null |
-| Guards.cs:185:38:185:46 | ... == ... | true | Guards.cs:185:38:185:38 | access to parameter o | null |
-| Guards.cs:185:38:185:60 | ... ? ... : ... | false | Guards.cs:185:38:185:46 | ... == ... | false |
-| Guards.cs:185:38:185:60 | ... ? ... : ... | false | Guards.cs:185:38:185:46 | ... == ... | true |
-| Guards.cs:189:13:189:25 | !... | false | Guards.cs:189:14:189:25 | call to method NullTest1 | true |
-| Guards.cs:189:13:189:25 | !... | true | Guards.cs:189:14:189:25 | call to method NullTest1 | false |
-| Guards.cs:189:14:189:25 | call to method NullTest1 | false | Guards.cs:189:24:189:24 | access to parameter s | non-null |
-| Guards.cs:189:14:189:25 | call to method NullTest1 | true | Guards.cs:189:24:189:24 | access to parameter s | null |
-| Guards.cs:191:13:191:25 | !... | false | Guards.cs:191:14:191:25 | call to method NullTest2 | true |
-| Guards.cs:191:13:191:25 | !... | true | Guards.cs:191:14:191:25 | call to method NullTest2 | false |
-| Guards.cs:191:14:191:25 | call to method NullTest2 | false | Guards.cs:191:24:191:24 | access to parameter s | non-null |
-| Guards.cs:191:14:191:25 | call to method NullTest2 | true | Guards.cs:191:24:191:24 | access to parameter s | null |
-| Guards.cs:193:13:193:25 | !... | false | Guards.cs:193:14:193:25 | call to method NullTest3 | true |
-| Guards.cs:193:13:193:25 | !... | true | Guards.cs:193:14:193:25 | call to method NullTest3 | false |
-| Guards.cs:193:14:193:25 | call to method NullTest3 | false | Guards.cs:193:24:193:24 | access to parameter s | non-null |
-| Guards.cs:193:14:193:25 | call to method NullTest3 | true | Guards.cs:193:24:193:24 | access to parameter s | null |
-| Guards.cs:195:13:195:27 | call to method NotNullTest4 | false | Guards.cs:195:26:195:26 | access to parameter s | null |
-| Guards.cs:195:13:195:27 | call to method NotNullTest4 | true | Guards.cs:195:26:195:26 | access to parameter s | non-null |
-| Guards.cs:197:13:197:29 | !... | false | Guards.cs:197:14:197:29 | call to method NullTestWrong | true |
-| Guards.cs:197:13:197:29 | !... | true | Guards.cs:197:14:197:29 | call to method NullTestWrong | false |
-| Guards.cs:203:13:203:21 | ... != ... | false | Guards.cs:203:13:203:13 | access to parameter o | null |
-| Guards.cs:203:13:203:21 | ... != ... | true | Guards.cs:203:13:203:13 | access to parameter o | non-null |
-| Guards.cs:218:17:218:18 | access to local variable b2 | match true | Guards.cs:216:13:216:14 | access to parameter b1 | false |
-| Guards.cs:218:17:218:18 | access to local variable b2 | match true | Guards.cs:218:17:218:18 | access to local variable b2 | true |
-| Guards.cs:231:17:231:18 | access to local variable b2 | match true | Guards.cs:229:13:229:14 | access to parameter b1 | true |
-| Guards.cs:231:17:231:18 | access to local variable b2 | match true | Guards.cs:231:17:231:18 | access to local variable b2 | true |
-| Guards.cs:231:17:231:18 | access to local variable b2 | non-match true | Guards.cs:229:13:229:14 | access to parameter b1 | false |
-| Guards.cs:244:17:244:17 | access to local variable i | match 1 | Guards.cs:242:13:242:13 | access to parameter b | true |
-| Guards.cs:244:17:244:17 | access to local variable i | match 1 | Guards.cs:244:17:244:17 | access to local variable i | 1 |
-| Guards.cs:244:17:244:17 | access to local variable i | non-match 1 | Guards.cs:242:13:242:13 | access to parameter b | false |
-| Guards.cs:258:17:258:17 | access to local variable e | match access to constant B | Guards.cs:256:13:256:13 | access to parameter b | true |
-| Guards.cs:258:17:258:17 | access to local variable e | match access to constant B | Guards.cs:258:17:258:17 | access to local variable e | 1 |
-| Guards.cs:258:17:258:17 | access to local variable e | non-match access to constant B | Guards.cs:256:13:256:13 | access to parameter b | false |
-| Guards.cs:268:13:268:25 | call to method GetType | non-null | Guards.cs:268:13:268:14 | access to parameter o1 | non-null |
-| Guards.cs:268:13:268:41 | call to operator == | true | Guards.cs:268:13:268:25 | call to method GetType | non-null |
-| Guards.cs:270:13:270:25 | call to method GetType | non-null | Guards.cs:270:13:270:14 | access to parameter o1 | non-null |
-| Guards.cs:270:30:270:42 | call to method GetType | non-null | Guards.cs:270:30:270:31 | access to parameter o2 | non-null |
-| Guards.cs:276:16:276:16 | access to parameter o | match "" | Guards.cs:276:16:276:16 | access to parameter o | non-null |
-| Guards.cs:276:16:276:16 | access to parameter o | match Action<String> a | Guards.cs:276:16:276:16 | access to parameter o | non-null |
-| Guards.cs:276:16:276:16 | access to parameter o | match access to type Action<Object> | Guards.cs:276:16:276:16 | access to parameter o | non-null |
-| Guards.cs:276:16:276:16 | access to parameter o | match null | Guards.cs:276:16:276:16 | access to parameter o | null |
-| Guards.cs:276:16:276:16 | access to parameter o | non-match null | Guards.cs:276:16:276:16 | access to parameter o | non-null |
-| Guards.cs:278:13:279:28 | ... => ... | true | Guards.cs:276:16:276:16 | access to parameter o | non-null |
-| Guards.cs:280:13:281:28 | ... => ... | true | Guards.cs:276:16:276:16 | access to parameter o | non-null |
-| Guards.cs:281:17:281:17 | access to local variable a | non-null | Guards.cs:276:16:276:16 | access to parameter o | non-null |
-| Guards.cs:281:17:281:17 | access to local variable a | null | Guards.cs:276:16:276:16 | access to parameter o | null |
-| Guards.cs:282:13:283:28 | ... => ... | true | Guards.cs:276:16:276:16 | access to parameter o | non-null |
-| Guards.cs:284:13:285:28 | ... => ... | false | Guards.cs:276:16:276:16 | access to parameter o | non-null |
-| Guards.cs:284:13:285:28 | ... => ... | true | Guards.cs:276:16:276:16 | access to parameter o | null |
-| Guards.cs:286:13:287:28 | ... => ... | true | Guards.cs:276:16:276:16 | access to parameter o | non-null |
-| Guards.cs:296:16:296:17 | access to local variable b2 | match true | Guards.cs:294:13:294:14 | access to parameter b1 | false |
-| Guards.cs:296:16:296:17 | access to local variable b2 | match true | Guards.cs:296:16:296:17 | access to local variable b2 | true |
-| Guards.cs:308:16:308:17 | access to local variable b2 | match true | Guards.cs:306:13:306:14 | access to parameter b1 | true |
-| Guards.cs:308:16:308:17 | access to local variable b2 | match true | Guards.cs:308:16:308:17 | access to local variable b2 | true |
-| Guards.cs:308:16:308:17 | access to local variable b2 | non-match true | Guards.cs:306:13:306:14 | access to parameter b1 | false |
-| Guards.cs:320:16:320:16 | access to local variable i | match 1 | Guards.cs:318:13:318:13 | access to parameter b | true |
-| Guards.cs:320:16:320:16 | access to local variable i | match 1 | Guards.cs:320:16:320:16 | access to local variable i | 1 |
-| Guards.cs:320:16:320:16 | access to local variable i | non-match 1 | Guards.cs:318:13:318:13 | access to parameter b | false |
-| Guards.cs:332:16:332:16 | access to local variable e | match access to constant B | Guards.cs:330:13:330:13 | access to parameter b | true |
-| Guards.cs:332:16:332:16 | access to local variable e | match access to constant B | Guards.cs:332:16:332:16 | access to local variable e | 1 |
-| Guards.cs:332:16:332:16 | access to local variable e | non-match access to constant B | Guards.cs:330:13:330:13 | access to parameter b | false |
-| Guards.cs:341:20:341:32 | ... ? ... : ... | non-null | Guards.cs:341:20:341:20 | access to parameter b | false |
-| Guards.cs:341:20:341:32 | ... ? ... : ... | non-null | Guards.cs:341:31:341:32 | "" | non-null |
-| Guards.cs:341:20:341:32 | ... ? ... : ... | null | Guards.cs:341:20:341:20 | access to parameter b | true |
-| Guards.cs:341:20:341:32 | ... ? ... : ... | null | Guards.cs:341:24:341:27 | null | null |
-| Guards.cs:342:13:342:13 | access to local variable s | empty | Guards.cs:341:20:341:32 | ... ? ... : ... | empty |
-| Guards.cs:342:13:342:13 | access to local variable s | non-empty | Guards.cs:341:20:341:32 | ... ? ... : ... | non-empty |
-| Guards.cs:342:13:342:13 | access to local variable s | non-null | Guards.cs:341:20:341:32 | ... ? ... : ... | non-null |
-| Guards.cs:342:13:342:13 | access to local variable s | null | Guards.cs:341:20:341:32 | ... ? ... : ... | null |
-| Guards.cs:342:13:342:21 | ... != ... | false | Guards.cs:341:20:341:20 | access to parameter b | true |
-| Guards.cs:342:13:342:21 | ... != ... | false | Guards.cs:342:13:342:13 | access to local variable s | null |
-| Guards.cs:342:13:342:21 | ... != ... | true | Guards.cs:341:20:341:20 | access to parameter b | false |
-| Guards.cs:342:13:342:21 | ... != ... | true | Guards.cs:342:13:342:13 | access to local variable s | non-null |
-| Guards.cs:342:13:342:27 | ... && ... | true | Guards.cs:342:13:342:21 | ... != ... | true |
-| Guards.cs:342:13:342:27 | ... && ... | true | Guards.cs:342:26:342:27 | !... | true |
-| Guards.cs:342:26:342:27 | !... | false | Guards.cs:342:27:342:27 | access to parameter b | true |
-| Guards.cs:342:26:342:27 | !... | true | Guards.cs:342:27:342:27 | access to parameter b | false |
-| Guards.cs:343:31:343:31 | access to local variable s | non-null | Guards.cs:341:20:341:32 | ... ? ... : ... | non-null |
-| Guards.cs:343:31:343:31 | access to local variable s | null | Guards.cs:341:20:341:32 | ... ? ... : ... | null |
-| Guards.cs:348:13:348:25 | ... is ... | true | Guards.cs:348:13:348:13 | access to parameter o | non-null |
-| Splitting.cs:12:17:12:25 | ... != ... | false | Splitting.cs:12:17:12:17 | access to parameter o | null |
-| Splitting.cs:12:17:12:25 | ... != ... | true | Splitting.cs:12:17:12:17 | access to parameter o | non-null |
-| Splitting.cs:22:17:22:25 | ... != ... | false | Splitting.cs:22:17:22:17 | access to parameter o | null |
-| Splitting.cs:22:17:22:25 | ... != ... | true | Splitting.cs:22:17:22:17 | access to parameter o | non-null |
-| Splitting.cs:32:17:32:25 | ... == ... | false | Splitting.cs:32:17:32:17 | access to parameter o | non-null |
-| Splitting.cs:32:17:32:25 | ... == ... | true | Splitting.cs:32:17:32:17 | access to parameter o | null |
-| Splitting.cs:41:13:41:21 | ... != ... | false | Splitting.cs:41:13:41:13 | access to parameter o | null |
-| Splitting.cs:41:13:41:21 | ... != ... | true | Splitting.cs:41:13:41:13 | access to parameter o | non-null |
-| Splitting.cs:54:13:54:21 | ... != ... | false | Splitting.cs:54:13:54:13 | access to parameter o | null |
-| Splitting.cs:54:13:54:21 | ... != ... | true | Splitting.cs:54:13:54:13 | access to parameter o | non-null |
-| Splitting.cs:65:13:65:21 | ... != ... | false | Splitting.cs:65:13:65:13 | access to parameter o | null |
-| Splitting.cs:65:13:65:21 | ... != ... | true | Splitting.cs:65:13:65:13 | access to parameter o | non-null |
-| Splitting.cs:76:13:76:21 | ... != ... | false | Splitting.cs:76:13:76:13 | access to parameter o | null |
-| Splitting.cs:76:13:76:21 | ... != ... | true | Splitting.cs:76:13:76:13 | access to parameter o | non-null |
-| Splitting.cs:87:26:87:34 | ... != ... | false | Splitting.cs:87:26:87:26 | access to parameter o | null |
-| Splitting.cs:87:26:87:34 | ... != ... | true | Splitting.cs:87:26:87:26 | access to parameter o | non-null |
-| Splitting.cs:97:26:97:34 | ... == ... | false | Splitting.cs:97:26:97:26 | access to parameter o | non-null |
-| Splitting.cs:97:26:97:34 | ... == ... | true | Splitting.cs:97:26:97:26 | access to parameter o | null |
-| Splitting.cs:105:22:105:30 | ... != ... | false | Splitting.cs:105:22:105:22 | access to parameter o | null |
-| Splitting.cs:105:22:105:30 | ... != ... | true | Splitting.cs:105:22:105:22 | access to parameter o | non-null |
-| Splitting.cs:116:22:116:30 | ... != ... | false | Splitting.cs:116:22:116:22 | access to parameter o | null |
-| Splitting.cs:116:22:116:30 | ... != ... | true | Splitting.cs:116:22:116:22 | access to parameter o | non-null |
-| Splitting.cs:129:17:129:25 | ... != ... | false | Splitting.cs:129:17:129:17 | access to local variable o | null |
-| Splitting.cs:129:17:129:25 | ... != ... | false | Splitting.cs:129:22:129:25 | null | non-null |
-| Splitting.cs:129:17:129:25 | ... != ... | true | Splitting.cs:129:17:129:17 | access to local variable o | non-null |
-| Splitting.cs:134:17:134:17 | access to local variable o | non-null | Splitting.cs:133:21:133:29 | call to method M11 | non-null |
-| Splitting.cs:134:17:134:17 | access to local variable o | null | Splitting.cs:133:21:133:29 | call to method M11 | null |
diff --git a/csharp/ql/test/library-tests/controlflow/guards/Implications.ql b/csharp/ql/test/library-tests/controlflow/guards/Implications.ql
deleted file mode 100644
index 0c185b1a2dc..00000000000
--- a/csharp/ql/test/library-tests/controlflow/guards/Implications.ql
+++ /dev/null
@@ -1,6 +0,0 @@
-import csharp
-import semmle.code.csharp.controlflow.Guards
-
-query predicate impliesStep(Expr e1, AbstractValue v1, Expr e2, AbstractValue v2) {
-  Internal::impliesStep(e1, v1, e2, v2)
-}
diff --git a/csharp/ql/test/library-tests/controlflow/guards/MatchingGuardedExpr.expected b/csharp/ql/test/library-tests/controlflow/guards/MatchingGuardedExpr.expected
deleted file mode 100644
index 7087e3d5493..00000000000
--- a/csharp/ql/test/library-tests/controlflow/guards/MatchingGuardedExpr.expected
+++ /dev/null
@@ -1,25 +0,0 @@
-| Guards.cs:154:24:154:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:153:13:153:34 | case ...: | match access to type Action<Object> | true |
-| Guards.cs:158:24:158:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:153:13:153:34 | case ...: | non-match access to type Action<Object> | false |
-| Guards.cs:158:24:158:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:155:13:155:34 | case ...: | non-match Action<String> a | false |
-| Guards.cs:158:24:158:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:157:13:157:20 | case ...: | match "" | true |
-| Guards.cs:160:24:160:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:153:13:153:34 | case ...: | non-match access to type Action<Object> | false |
-| Guards.cs:160:24:160:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:155:13:155:34 | case ...: | non-match Action<String> a | false |
-| Guards.cs:160:24:160:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:157:13:157:20 | case ...: | non-match "" | false |
-| Guards.cs:160:24:160:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:159:13:159:22 | case ...: | match null | true |
-| Guards.cs:162:24:162:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:153:13:153:34 | case ...: | non-match access to type Action<Object> | false |
-| Guards.cs:162:24:162:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:155:13:155:34 | case ...: | non-match Action<String> a | false |
-| Guards.cs:162:24:162:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:157:13:157:20 | case ...: | non-match "" | false |
-| Guards.cs:162:24:162:24 | access to parameter o | Guards.cs:151:17:151:17 | access to parameter o | Guards.cs:159:13:159:22 | case ...: | non-match null | false |
-| Guards.cs:279:17:279:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:278:13:279:28 | ... => ... | match access to type Action<Object> | true |
-| Guards.cs:283:17:283:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:278:13:279:28 | ... => ... | non-match access to type Action<Object> | false |
-| Guards.cs:283:17:283:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:280:13:281:28 | ... => ... | non-match Action<String> a | false |
-| Guards.cs:283:17:283:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:282:13:283:28 | ... => ... | match "" | true |
-| Guards.cs:285:17:285:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:278:13:279:28 | ... => ... | non-match access to type Action<Object> | false |
-| Guards.cs:285:17:285:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:280:13:281:28 | ... => ... | non-match Action<String> a | false |
-| Guards.cs:285:17:285:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:282:13:283:28 | ... => ... | non-match "" | false |
-| Guards.cs:285:17:285:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:284:13:285:28 | ... => ... | match null | true |
-| Guards.cs:287:17:287:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:278:13:279:28 | ... => ... | non-match access to type Action<Object> | false |
-| Guards.cs:287:17:287:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:280:13:281:28 | ... => ... | non-match Action<String> a | false |
-| Guards.cs:287:17:287:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:282:13:283:28 | ... => ... | non-match "" | false |
-| Guards.cs:287:17:287:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:284:13:285:28 | ... => ... | non-match null | false |
-| Guards.cs:287:17:287:17 | access to parameter o | Guards.cs:276:16:276:16 | access to parameter o | Guards.cs:286:13:287:28 | ... => ... | match _ | true |
diff --git a/csharp/ql/test/library-tests/controlflow/guards/MatchingGuardedExpr.ql b/csharp/ql/test/library-tests/controlflow/guards/MatchingGuardedExpr.ql
deleted file mode 100644
index 93b8d565834..00000000000
--- a/csharp/ql/test/library-tests/controlflow/guards/MatchingGuardedExpr.ql
+++ /dev/null
@@ -1,8 +0,0 @@
-import csharp
-import semmle.code.csharp.controlflow.Guards
-
-from GuardedExpr ge, Expr e, AbstractValues::MatchValue v, boolean match
-where
-  e = ge.getAGuard(e, v) and
-  if v.isMatch() then match = true else match = false
-select ge, e, v.getCase(), v, match
diff --git a/csharp/ql/test/library-tests/controlflow/guards/NullGuardedExpr.expected b/csharp/ql/test/library-tests/controlflow/guards/NullGuardedExpr.expected
index fa21b5cb312..81607656b30 100644
--- a/csharp/ql/test/library-tests/controlflow/guards/NullGuardedExpr.expected
+++ b/csharp/ql/test/library-tests/controlflow/guards/NullGuardedExpr.expected
@@ -47,17 +47,3 @@
 | Guards.cs:287:17:287:17 | access to parameter o |
 | Guards.cs:343:31:343:31 | access to local variable s |
 | Guards.cs:349:13:349:13 | access to parameter o |
-| Splitting.cs:13:17:13:17 | access to parameter o |
-| Splitting.cs:23:24:23:24 | access to parameter o |
-| Splitting.cs:35:13:35:13 | access to parameter o |
-| Splitting.cs:44:17:44:17 | access to parameter o |
-| Splitting.cs:46:17:46:17 | access to parameter o |
-| Splitting.cs:55:13:55:13 | access to parameter o |
-| Splitting.cs:66:20:66:20 | access to parameter o |
-| Splitting.cs:78:24:78:24 | access to parameter o |
-| Splitting.cs:90:13:90:13 | access to parameter o |
-| Splitting.cs:107:13:107:13 | access to parameter o |
-| Splitting.cs:109:13:109:13 | access to parameter o |
-| Splitting.cs:117:9:117:9 | access to parameter o |
-| Splitting.cs:119:13:119:13 | access to parameter o |
-| Splitting.cs:120:16:120:16 | access to parameter o |
diff --git a/csharp/ql/test/library-tests/controlflow/guards/Splitting.cs b/csharp/ql/test/library-tests/controlflow/guards/Splitting.cs
deleted file mode 100644
index 7f42c5a87df..00000000000
--- a/csharp/ql/test/library-tests/controlflow/guards/Splitting.cs
+++ /dev/null
@@ -1,139 +0,0 @@
-using System;
-using System.Diagnostics;
-#nullable enable
-/// <summary>
-/// Tests related to CFG splitting.
-/// </summary>
-public class Splitting
-{
-    void M1(bool b, object? o)
-    {
-        if (b)
-            if (o != null)
-                o.ToString(); // null guarded
-        if (b)
-            o.ToString(); // not null guarded
-        o.ToString(); // not null guarded
-    }
-
-    string M2(bool b, object? o)
-    {
-        if (b)
-            if (o != null)
-                return o.ToString(); // null guarded
-        if (b)
-            o.ToString(); // anti-null guarded
-        return o.ToString(); // not null guarded
-    }
-
-    string M3(bool b, object? o)
-    {
-        if (b)
-            if (o == null)
-                return "";
-        if (b)
-            o.ToString(); // null guarded
-        return o.ToString(); // not null guarded
-    }
-
-    void M4(bool b, object? o)
-    {
-        if (o != null)
-        {
-            if (b)
-                o.ToString(); // null guarded
-            if (b)
-                o.ToString(); // null guarded
-        }
-    }
-
-    string M5(bool b, object? o)
-    {
-        if (b)
-            o.ToString(); // not null guarded
-        if (o != null)
-            o.ToString(); // null guarded
-        if (b)
-            o.ToString(); // not null guarded
-        return o.ToString(); // not null guarded
-    }
-
-    string M6(bool b, object? o)
-    {
-        if (b)
-            o.ToString(); // not null guarded
-        if (o != null)
-            return o.ToString(); // null guarded
-        if (b)
-            o.ToString(); // anti-null guarded
-        return o.ToString(); // anti-null guarded
-    }
-
-    string M7(bool b, object? o, bool b2)
-    {
-        if (b)
-            o.ToString(); // not null guarded
-        if (o != null)
-            if (b2)
-                return o.ToString(); // null guarded
-        if (b)
-            o.ToString(); // not null guarded
-        return o.ToString(); // not null guarded
-    }
-
-    void M8(bool b, object? o)
-    {
-        if (b)
-            Debug.Assert(o != null);
-        o.ToString(); // not null guarded
-        if (b)
-            o.ToString(); // null guarded
-        o.ToString(); // not null guarded
-    }
-
-    string M9(bool b, object? o)
-    {
-        if (b)
-            Debug.Assert(o == null);
-        if (b)
-            o.ToString(); // anti-null guarded
-        return o.ToString(); // not null guarded
-    }
-
-    void M10(bool b, object? o)
-    {
-        Debug.Assert(o != null);
-        if (b)
-            o.ToString(); // null guarded
-        if (b)
-            o.ToString(); // null guarded
-    }
-
-    string M11(bool b, object? o)
-    {
-        if (b)
-            o.ToString(); // not null guarded
-        Debug.Assert(o != null);
-        o.ToString(); // null guarded
-        if (b)
-            o.ToString(); // null guarded
-        return o.ToString(); // null guarded
-    }
-
-    public void M12(int i, bool b)
-    {
-        object? o = null;
-        do
-        {
-            o.GetHashCode(); // not null guarded
-            if (o != null)
-            {
-                if (b)
-                    return;
-                o = M11(b, o);
-                o.GetHashCode(); // not null guarded
-            }
-        }
-        while (i > 0);
-    }
-}
diff --git a/csharp/ql/test/library-tests/controlflow/splits/CONSISTENCY/CfgConsistency.expected b/csharp/ql/test/library-tests/controlflow/splits/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 04f7ae1f7d6..00000000000
--- a/csharp/ql/test/library-tests/controlflow/splits/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,3 +0,0 @@
-deadEnd
-| SplittingStressTest.cs:95:13:95:14 | [b5 (line 3): false] access to parameter b5 |
-| SplittingStressTest.cs:95:13:95:14 | [b5 (line 3): true] access to parameter b5 |
diff --git a/csharp/ql/test/library-tests/controlflow/splits/SplittingStressTest.cs b/csharp/ql/test/library-tests/controlflow/splits/SplittingStressTest.cs
deleted file mode 100644
index 14644f973d0..00000000000
--- a/csharp/ql/test/library-tests/controlflow/splits/SplittingStressTest.cs
+++ /dev/null
@@ -1,321 +0,0 @@
-class SplittingStressTest
-{
-    void M1(bool b1, bool b2, bool b3, bool b4, bool b5, bool b6, bool b7, bool b8, bool b9, bool b10, bool b11, bool b12, bool b13, bool b14, bool b15, bool b16, bool b17, bool b18, bool b19, bool b20, bool b21, bool b22, bool b23, bool b24, bool b25, bool b26, bool b27, bool b28, bool b29, bool b30, bool b31, bool b32, bool b33, bool b34, bool b35, bool b36, bool b37, bool b38, bool b39, bool b40)
-    {
-        if (b1)
-            ;
-        if (b2)
-            ;
-        if (b3)
-            ;
-        if (b4)
-            ;
-        if (b5)
-            ;
-        if (b6)
-            ;
-        if (b7)
-            ;
-        if (b8)
-            ;
-        if (b9)
-            ;
-        if (b10)
-            ;
-        if (b11)
-            ;
-        if (b12)
-            ;
-        if (b13)
-            ;
-        if (b14)
-            ;
-        if (b15)
-            ;
-        if (b16)
-            ;
-        if (b17)
-            ;
-        if (b18)
-            ;
-        if (b19)
-            ;
-        if (b20)
-            ;
-        if (b21)
-            ;
-        if (b22)
-            ;
-        if (b23)
-            ;
-        if (b24)
-            ;
-        if (b25)
-            ;
-        if (b26)
-            ;
-        if (b27)
-            ;
-        if (b28)
-            ;
-        if (b29)
-            ;
-        if (b30)
-            ;
-        if (b31)
-            ;
-        if (b32)
-            ;
-        if (b33)
-            ;
-        if (b34)
-            ;
-        if (b35)
-            ;
-        if (b36)
-            ;
-        if (b37)
-            ;
-        if (b38)
-            ;
-        if (b39)
-            ;
-        if (b40)
-            ;
-        ; // 2^40 splits
-
-        if (b1)
-            ;
-        if (b2)
-            ;
-        if (b3)
-            ;
-        if (b4)
-            ;
-        if (b5)
-            ;
-        if (b6)
-            ;
-        if (b7)
-            ;
-        if (b8)
-            ;
-        if (b9)
-            ;
-        if (b10)
-            ;
-        if (b11)
-            ;
-        if (b12)
-            ;
-        if (b13)
-            ;
-        if (b14)
-            ;
-        if (b15)
-            ;
-        if (b16)
-            ;
-        if (b17)
-            ;
-        if (b18)
-            ;
-        if (b19)
-            ;
-        if (b20)
-            ;
-        if (b21)
-            ;
-        if (b22)
-            ;
-        if (b23)
-            ;
-        if (b24)
-            ;
-        if (b25)
-            ;
-        if (b26)
-            ;
-        if (b27)
-            ;
-        if (b28)
-            ;
-        if (b29)
-            ;
-        if (b30)
-            ;
-        if (b31)
-            ;
-        if (b32)
-            ;
-        if (b33)
-            ;
-        if (b34)
-            ;
-        if (b35)
-            ;
-        if (b36)
-            ;
-        if (b37)
-            ;
-        if (b38)
-            ;
-        if (b39)
-            ;
-        if (b40)
-            ;
-        ;
-    }
-
-    void M2(int i, bool b1, bool b2, bool b3, bool b4, bool b5, bool b6, bool b7, bool b8, bool b9, bool b10, bool b11, bool b12, bool b13, bool b14, bool b15, bool b16, bool b17, bool b18, bool b19, bool b20, bool b21, bool b22, bool b23, bool b24, bool b25, bool b26, bool b27, bool b28, bool b29)
-    {
-        while (i-- > 0)
-        {
-            if (i == 1)
-            {
-                if (b1)
-                    ;
-            }
-            if (i == 2)
-            {
-                if (b2)
-                    ;
-            }
-            if (i == 3)
-            {
-                if (b3)
-                    ;
-            }
-            if (i == 4)
-            {
-                if (b4)
-                    ;
-            }
-            if (i == 5)
-            {
-                if (b5)
-                    ;
-            }
-            if (i == 6)
-            {
-                if (b6)
-                    ;
-            }
-            if (i == 7)
-            {
-                if (b7)
-                    ;
-            }
-            if (i == 8)
-            {
-                if (b8)
-                    ;
-            }
-            if (i == 9)
-            {
-                if (b9)
-                    ;
-            }
-            if (i == 10)
-            {
-                if (b10)
-                    ;
-            }
-            if (i == 11)
-            {
-                if (b11)
-                    ;
-            }
-            if (i == 12)
-            {
-                if (b12)
-                    ;
-            }
-            if (i == 13)
-            {
-                if (b13)
-                    ;
-            }
-            if (i == 14)
-            {
-                if (b14)
-                    ;
-            }
-            if (i == 15)
-            {
-                if (b15)
-                    ;
-            }
-            if (i == 16)
-            {
-                if (b16)
-                    ;
-            }
-            if (i == 17)
-            {
-                if (b17)
-                    ;
-            }
-            if (i == 18)
-            {
-                if (b18)
-                    ;
-            }
-            if (i == 19)
-            {
-                if (b19)
-                    ;
-            }
-            if (i == 20)
-            {
-                if (b20)
-                    ;
-            }
-            if (i == 21)
-            {
-                if (b21)
-                    ;
-            }
-            if (i == 22)
-            {
-                if (b22)
-                    ;
-            }
-            if (i == 23)
-            {
-                if (b23)
-                    ;
-            }
-            if (i == 24)
-            {
-                if (b24)
-                    ;
-            }
-            if (i == 25)
-            {
-                if (b25)
-                    ;
-            }
-            if (i == 26)
-            {
-                if (b26)
-                    ;
-            }
-            if (i == 27)
-            {
-                if (b27)
-                    ;
-            }
-            if (i == 28)
-            {
-                if (b28)
-                    ;
-            }
-            if (i == 29)
-            {
-                if (b29)
-                    ;
-            }
-        }
-    }
-}
diff --git a/csharp/ql/test/library-tests/controlflow/splits/SplittingStressTest.expected b/csharp/ql/test/library-tests/controlflow/splits/SplittingStressTest.expected
deleted file mode 100644
index 8ba5f8687b4..00000000000
--- a/csharp/ql/test/library-tests/controlflow/splits/SplittingStressTest.expected
+++ /dev/null
@@ -1,1908 +0,0 @@
-countSplits
-| SplittingStressTest.cs:1:7:1:25 | call to constructor Object | 1 |
-| SplittingStressTest.cs:1:7:1:25 | {...} | 1 |
-| SplittingStressTest.cs:4:5:168:5 | {...} | 1 |
-| SplittingStressTest.cs:5:9:6:13 | if (...) ... | 1 |
-| SplittingStressTest.cs:5:13:5:14 | access to parameter b1 | 1 |
-| SplittingStressTest.cs:6:13:6:13 | ; | 1 |
-| SplittingStressTest.cs:7:9:8:13 | if (...) ... | 2 |
-| SplittingStressTest.cs:7:13:7:14 | access to parameter b2 | 2 |
-| SplittingStressTest.cs:8:13:8:13 | ; | 2 |
-| SplittingStressTest.cs:9:9:10:13 | if (...) ... | 4 |
-| SplittingStressTest.cs:9:13:9:14 | access to parameter b3 | 4 |
-| SplittingStressTest.cs:10:13:10:13 | ; | 4 |
-| SplittingStressTest.cs:11:9:12:13 | if (...) ... | 8 |
-| SplittingStressTest.cs:11:13:11:14 | access to parameter b4 | 8 |
-| SplittingStressTest.cs:12:13:12:13 | ; | 8 |
-| SplittingStressTest.cs:13:9:14:13 | if (...) ... | 16 |
-| SplittingStressTest.cs:13:13:13:14 | access to parameter b5 | 16 |
-| SplittingStressTest.cs:14:13:14:13 | ; | 16 |
-| SplittingStressTest.cs:15:9:16:13 | if (...) ... | 32 |
-| SplittingStressTest.cs:15:13:15:14 | access to parameter b6 | 32 |
-| SplittingStressTest.cs:16:13:16:13 | ; | 32 |
-| SplittingStressTest.cs:17:9:18:13 | if (...) ... | 32 |
-| SplittingStressTest.cs:17:13:17:14 | access to parameter b7 | 32 |
-| SplittingStressTest.cs:18:13:18:13 | ; | 32 |
-| SplittingStressTest.cs:19:9:20:13 | if (...) ... | 32 |
-| SplittingStressTest.cs:19:13:19:14 | access to parameter b8 | 32 |
-| SplittingStressTest.cs:20:13:20:13 | ; | 32 |
-| SplittingStressTest.cs:21:9:22:13 | if (...) ... | 32 |
-| SplittingStressTest.cs:21:13:21:14 | access to parameter b9 | 32 |
-| SplittingStressTest.cs:22:13:22:13 | ; | 32 |
-| SplittingStressTest.cs:23:9:24:13 | if (...) ... | 32 |
-| SplittingStressTest.cs:23:13:23:15 | access to parameter b10 | 32 |
-| SplittingStressTest.cs:24:13:24:13 | ; | 32 |
-| SplittingStressTest.cs:25:9:26:13 | if (...) ... | 32 |
-| SplittingStressTest.cs:25:13:25:15 | access to parameter b11 | 32 |
-| SplittingStressTest.cs:26:13:26:13 | ; | 32 |
-| SplittingStressTest.cs:27:9:28:13 | if (...) ... | 32 |
-| SplittingStressTest.cs:27:13:27:15 | access to parameter b12 | 32 |
-| SplittingStressTest.cs:28:13:28:13 | ; | 32 |
-| SplittingStressTest.cs:29:9:30:13 | if (...) ... | 32 |
-| SplittingStressTest.cs:29:13:29:15 | access to parameter b13 | 32 |
-| SplittingStressTest.cs:30:13:30:13 | ; | 32 |
-| SplittingStressTest.cs:31:9:32:13 | if (...) ... | 32 |
-| SplittingStressTest.cs:31:13:31:15 | access to parameter b14 | 32 |
-| SplittingStressTest.cs:32:13:32:13 | ; | 32 |
-| SplittingStressTest.cs:33:9:34:13 | if (...) ... | 32 |
-| SplittingStressTest.cs:33:13:33:15 | access to parameter b15 | 32 |
-| SplittingStressTest.cs:34:13:34:13 | ; | 32 |
-| SplittingStressTest.cs:35:9:36:13 | if (...) ... | 32 |
-| SplittingStressTest.cs:35:13:35:15 | access to parameter b16 | 32 |
-| SplittingStressTest.cs:36:13:36:13 | ; | 32 |
-| SplittingStressTest.cs:37:9:38:13 | if (...) ... | 32 |
-| SplittingStressTest.cs:37:13:37:15 | access to parameter b17 | 32 |
-| SplittingStressTest.cs:38:13:38:13 | ; | 32 |
-| SplittingStressTest.cs:39:9:40:13 | if (...) ... | 32 |
-| SplittingStressTest.cs:39:13:39:15 | access to parameter b18 | 32 |
-| SplittingStressTest.cs:40:13:40:13 | ; | 32 |
-| SplittingStressTest.cs:41:9:42:13 | if (...) ... | 32 |
-| SplittingStressTest.cs:41:13:41:15 | access to parameter b19 | 32 |
-| SplittingStressTest.cs:42:13:42:13 | ; | 32 |
-| SplittingStressTest.cs:43:9:44:13 | if (...) ... | 32 |
-| SplittingStressTest.cs:43:13:43:15 | access to parameter b20 | 32 |
-| SplittingStressTest.cs:44:13:44:13 | ; | 32 |
-| SplittingStressTest.cs:45:9:46:13 | if (...) ... | 32 |
-| SplittingStressTest.cs:45:13:45:15 | access to parameter b21 | 32 |
-| SplittingStressTest.cs:46:13:46:13 | ; | 32 |
-| SplittingStressTest.cs:47:9:48:13 | if (...) ... | 32 |
-| SplittingStressTest.cs:47:13:47:15 | access to parameter b22 | 32 |
-| SplittingStressTest.cs:48:13:48:13 | ; | 32 |
-| SplittingStressTest.cs:49:9:50:13 | if (...) ... | 32 |
-| SplittingStressTest.cs:49:13:49:15 | access to parameter b23 | 32 |
-| SplittingStressTest.cs:50:13:50:13 | ; | 32 |
-| SplittingStressTest.cs:51:9:52:13 | if (...) ... | 32 |
-| SplittingStressTest.cs:51:13:51:15 | access to parameter b24 | 32 |
-| SplittingStressTest.cs:52:13:52:13 | ; | 32 |
-| SplittingStressTest.cs:53:9:54:13 | if (...) ... | 32 |
-| SplittingStressTest.cs:53:13:53:15 | access to parameter b25 | 32 |
-| SplittingStressTest.cs:54:13:54:13 | ; | 32 |
-| SplittingStressTest.cs:55:9:56:13 | if (...) ... | 32 |
-| SplittingStressTest.cs:55:13:55:15 | access to parameter b26 | 32 |
-| SplittingStressTest.cs:56:13:56:13 | ; | 32 |
-| SplittingStressTest.cs:57:9:58:13 | if (...) ... | 32 |
-| SplittingStressTest.cs:57:13:57:15 | access to parameter b27 | 32 |
-| SplittingStressTest.cs:58:13:58:13 | ; | 32 |
-| SplittingStressTest.cs:59:9:60:13 | if (...) ... | 32 |
-| SplittingStressTest.cs:59:13:59:15 | access to parameter b28 | 32 |
-| SplittingStressTest.cs:60:13:60:13 | ; | 32 |
-| SplittingStressTest.cs:61:9:62:13 | if (...) ... | 32 |
-| SplittingStressTest.cs:61:13:61:15 | access to parameter b29 | 32 |
-| SplittingStressTest.cs:62:13:62:13 | ; | 32 |
-| SplittingStressTest.cs:63:9:64:13 | if (...) ... | 32 |
-| SplittingStressTest.cs:63:13:63:15 | access to parameter b30 | 32 |
-| SplittingStressTest.cs:64:13:64:13 | ; | 32 |
-| SplittingStressTest.cs:65:9:66:13 | if (...) ... | 32 |
-| SplittingStressTest.cs:65:13:65:15 | access to parameter b31 | 32 |
-| SplittingStressTest.cs:66:13:66:13 | ; | 32 |
-| SplittingStressTest.cs:67:9:68:13 | if (...) ... | 32 |
-| SplittingStressTest.cs:67:13:67:15 | access to parameter b32 | 32 |
-| SplittingStressTest.cs:68:13:68:13 | ; | 32 |
-| SplittingStressTest.cs:69:9:70:13 | if (...) ... | 32 |
-| SplittingStressTest.cs:69:13:69:15 | access to parameter b33 | 32 |
-| SplittingStressTest.cs:70:13:70:13 | ; | 32 |
-| SplittingStressTest.cs:71:9:72:13 | if (...) ... | 32 |
-| SplittingStressTest.cs:71:13:71:15 | access to parameter b34 | 32 |
-| SplittingStressTest.cs:72:13:72:13 | ; | 32 |
-| SplittingStressTest.cs:73:9:74:13 | if (...) ... | 32 |
-| SplittingStressTest.cs:73:13:73:15 | access to parameter b35 | 32 |
-| SplittingStressTest.cs:74:13:74:13 | ; | 32 |
-| SplittingStressTest.cs:75:9:76:13 | if (...) ... | 32 |
-| SplittingStressTest.cs:75:13:75:15 | access to parameter b36 | 32 |
-| SplittingStressTest.cs:76:13:76:13 | ; | 32 |
-| SplittingStressTest.cs:77:9:78:13 | if (...) ... | 32 |
-| SplittingStressTest.cs:77:13:77:15 | access to parameter b37 | 32 |
-| SplittingStressTest.cs:78:13:78:13 | ; | 32 |
-| SplittingStressTest.cs:79:9:80:13 | if (...) ... | 32 |
-| SplittingStressTest.cs:79:13:79:15 | access to parameter b38 | 32 |
-| SplittingStressTest.cs:80:13:80:13 | ; | 32 |
-| SplittingStressTest.cs:81:9:82:13 | if (...) ... | 32 |
-| SplittingStressTest.cs:81:13:81:15 | access to parameter b39 | 32 |
-| SplittingStressTest.cs:82:13:82:13 | ; | 32 |
-| SplittingStressTest.cs:83:9:84:13 | if (...) ... | 32 |
-| SplittingStressTest.cs:83:13:83:15 | access to parameter b40 | 32 |
-| SplittingStressTest.cs:84:13:84:13 | ; | 32 |
-| SplittingStressTest.cs:85:9:85:9 | ; | 32 |
-| SplittingStressTest.cs:87:9:88:13 | if (...) ... | 32 |
-| SplittingStressTest.cs:87:13:87:14 | access to parameter b1 | 32 |
-| SplittingStressTest.cs:88:13:88:13 | ; | 16 |
-| SplittingStressTest.cs:89:9:90:13 | if (...) ... | 16 |
-| SplittingStressTest.cs:89:13:89:14 | access to parameter b2 | 16 |
-| SplittingStressTest.cs:90:13:90:13 | ; | 8 |
-| SplittingStressTest.cs:91:9:92:13 | if (...) ... | 8 |
-| SplittingStressTest.cs:91:13:91:14 | access to parameter b3 | 8 |
-| SplittingStressTest.cs:92:13:92:13 | ; | 4 |
-| SplittingStressTest.cs:93:9:94:13 | if (...) ... | 4 |
-| SplittingStressTest.cs:93:13:93:14 | access to parameter b4 | 4 |
-| SplittingStressTest.cs:94:13:94:13 | ; | 2 |
-| SplittingStressTest.cs:95:9:96:13 | if (...) ... | 2 |
-| SplittingStressTest.cs:95:13:95:14 | access to parameter b5 | 2 |
-| SplittingStressTest.cs:171:5:320:5 | {...} | 1 |
-| SplittingStressTest.cs:172:9:319:9 | while (...) ... | 1 |
-| SplittingStressTest.cs:172:16:172:16 | access to parameter i | 243 |
-| SplittingStressTest.cs:172:16:172:18 | ...-- | 243 |
-| SplittingStressTest.cs:172:16:172:22 | ... > ... | 243 |
-| SplittingStressTest.cs:172:22:172:22 | 0 | 243 |
-| SplittingStressTest.cs:173:9:319:9 | {...} | 243 |
-| SplittingStressTest.cs:174:13:178:13 | if (...) ... | 243 |
-| SplittingStressTest.cs:174:17:174:17 | access to parameter i | 243 |
-| SplittingStressTest.cs:174:17:174:22 | ... == ... | 243 |
-| SplittingStressTest.cs:174:22:174:22 | 1 | 243 |
-| SplittingStressTest.cs:175:13:178:13 | {...} | 243 |
-| SplittingStressTest.cs:176:17:177:21 | if (...) ... | 243 |
-| SplittingStressTest.cs:176:21:176:22 | access to parameter b1 | 243 |
-| SplittingStressTest.cs:177:21:177:21 | ; | 81 |
-| SplittingStressTest.cs:179:13:183:13 | if (...) ... | 243 |
-| SplittingStressTest.cs:179:17:179:17 | access to parameter i | 243 |
-| SplittingStressTest.cs:179:17:179:22 | ... == ... | 243 |
-| SplittingStressTest.cs:179:22:179:22 | 2 | 243 |
-| SplittingStressTest.cs:180:13:183:13 | {...} | 243 |
-| SplittingStressTest.cs:181:17:182:21 | if (...) ... | 243 |
-| SplittingStressTest.cs:181:21:181:22 | access to parameter b2 | 243 |
-| SplittingStressTest.cs:182:21:182:21 | ; | 81 |
-| SplittingStressTest.cs:184:13:188:13 | if (...) ... | 243 |
-| SplittingStressTest.cs:184:17:184:17 | access to parameter i | 243 |
-| SplittingStressTest.cs:184:17:184:22 | ... == ... | 243 |
-| SplittingStressTest.cs:184:22:184:22 | 3 | 243 |
-| SplittingStressTest.cs:185:13:188:13 | {...} | 243 |
-| SplittingStressTest.cs:186:17:187:21 | if (...) ... | 243 |
-| SplittingStressTest.cs:186:21:186:22 | access to parameter b3 | 243 |
-| SplittingStressTest.cs:187:21:187:21 | ; | 81 |
-| SplittingStressTest.cs:189:13:193:13 | if (...) ... | 243 |
-| SplittingStressTest.cs:189:17:189:17 | access to parameter i | 243 |
-| SplittingStressTest.cs:189:17:189:22 | ... == ... | 243 |
-| SplittingStressTest.cs:189:22:189:22 | 4 | 243 |
-| SplittingStressTest.cs:190:13:193:13 | {...} | 243 |
-| SplittingStressTest.cs:191:17:192:21 | if (...) ... | 243 |
-| SplittingStressTest.cs:191:21:191:22 | access to parameter b4 | 243 |
-| SplittingStressTest.cs:192:21:192:21 | ; | 81 |
-| SplittingStressTest.cs:194:13:198:13 | if (...) ... | 243 |
-| SplittingStressTest.cs:194:17:194:17 | access to parameter i | 243 |
-| SplittingStressTest.cs:194:17:194:22 | ... == ... | 243 |
-| SplittingStressTest.cs:194:22:194:22 | 5 | 243 |
-| SplittingStressTest.cs:195:13:198:13 | {...} | 243 |
-| SplittingStressTest.cs:196:17:197:21 | if (...) ... | 243 |
-| SplittingStressTest.cs:196:21:196:22 | access to parameter b5 | 243 |
-| SplittingStressTest.cs:197:21:197:21 | ; | 81 |
-| SplittingStressTest.cs:199:13:203:13 | if (...) ... | 243 |
-| SplittingStressTest.cs:199:17:199:17 | access to parameter i | 243 |
-| SplittingStressTest.cs:199:17:199:22 | ... == ... | 243 |
-| SplittingStressTest.cs:199:22:199:22 | 6 | 243 |
-| SplittingStressTest.cs:200:13:203:13 | {...} | 243 |
-| SplittingStressTest.cs:201:17:202:21 | if (...) ... | 243 |
-| SplittingStressTest.cs:201:21:201:22 | access to parameter b6 | 243 |
-| SplittingStressTest.cs:202:21:202:21 | ; | 243 |
-| SplittingStressTest.cs:204:13:208:13 | if (...) ... | 243 |
-| SplittingStressTest.cs:204:17:204:17 | access to parameter i | 243 |
-| SplittingStressTest.cs:204:17:204:22 | ... == ... | 243 |
-| SplittingStressTest.cs:204:22:204:22 | 7 | 243 |
-| SplittingStressTest.cs:205:13:208:13 | {...} | 243 |
-| SplittingStressTest.cs:206:17:207:21 | if (...) ... | 243 |
-| SplittingStressTest.cs:206:21:206:22 | access to parameter b7 | 243 |
-| SplittingStressTest.cs:207:21:207:21 | ; | 243 |
-| SplittingStressTest.cs:209:13:213:13 | if (...) ... | 243 |
-| SplittingStressTest.cs:209:17:209:17 | access to parameter i | 243 |
-| SplittingStressTest.cs:209:17:209:22 | ... == ... | 243 |
-| SplittingStressTest.cs:209:22:209:22 | 8 | 243 |
-| SplittingStressTest.cs:210:13:213:13 | {...} | 243 |
-| SplittingStressTest.cs:211:17:212:21 | if (...) ... | 243 |
-| SplittingStressTest.cs:211:21:211:22 | access to parameter b8 | 243 |
-| SplittingStressTest.cs:212:21:212:21 | ; | 243 |
-| SplittingStressTest.cs:214:13:218:13 | if (...) ... | 243 |
-| SplittingStressTest.cs:214:17:214:17 | access to parameter i | 243 |
-| SplittingStressTest.cs:214:17:214:22 | ... == ... | 243 |
-| SplittingStressTest.cs:214:22:214:22 | 9 | 243 |
-| SplittingStressTest.cs:215:13:218:13 | {...} | 243 |
-| SplittingStressTest.cs:216:17:217:21 | if (...) ... | 243 |
-| SplittingStressTest.cs:216:21:216:22 | access to parameter b9 | 243 |
-| SplittingStressTest.cs:217:21:217:21 | ; | 243 |
-| SplittingStressTest.cs:219:13:223:13 | if (...) ... | 243 |
-| SplittingStressTest.cs:219:17:219:17 | access to parameter i | 243 |
-| SplittingStressTest.cs:219:17:219:23 | ... == ... | 243 |
-| SplittingStressTest.cs:219:22:219:23 | 10 | 243 |
-| SplittingStressTest.cs:220:13:223:13 | {...} | 243 |
-| SplittingStressTest.cs:221:17:222:21 | if (...) ... | 243 |
-| SplittingStressTest.cs:221:21:221:23 | access to parameter b10 | 243 |
-| SplittingStressTest.cs:222:21:222:21 | ; | 243 |
-| SplittingStressTest.cs:224:13:228:13 | if (...) ... | 243 |
-| SplittingStressTest.cs:224:17:224:17 | access to parameter i | 243 |
-| SplittingStressTest.cs:224:17:224:23 | ... == ... | 243 |
-| SplittingStressTest.cs:224:22:224:23 | 11 | 243 |
-| SplittingStressTest.cs:225:13:228:13 | {...} | 243 |
-| SplittingStressTest.cs:226:17:227:21 | if (...) ... | 243 |
-| SplittingStressTest.cs:226:21:226:23 | access to parameter b11 | 243 |
-| SplittingStressTest.cs:227:21:227:21 | ; | 243 |
-| SplittingStressTest.cs:229:13:233:13 | if (...) ... | 243 |
-| SplittingStressTest.cs:229:17:229:17 | access to parameter i | 243 |
-| SplittingStressTest.cs:229:17:229:23 | ... == ... | 243 |
-| SplittingStressTest.cs:229:22:229:23 | 12 | 243 |
-| SplittingStressTest.cs:230:13:233:13 | {...} | 243 |
-| SplittingStressTest.cs:231:17:232:21 | if (...) ... | 243 |
-| SplittingStressTest.cs:231:21:231:23 | access to parameter b12 | 243 |
-| SplittingStressTest.cs:232:21:232:21 | ; | 243 |
-| SplittingStressTest.cs:234:13:238:13 | if (...) ... | 243 |
-| SplittingStressTest.cs:234:17:234:17 | access to parameter i | 243 |
-| SplittingStressTest.cs:234:17:234:23 | ... == ... | 243 |
-| SplittingStressTest.cs:234:22:234:23 | 13 | 243 |
-| SplittingStressTest.cs:235:13:238:13 | {...} | 243 |
-| SplittingStressTest.cs:236:17:237:21 | if (...) ... | 243 |
-| SplittingStressTest.cs:236:21:236:23 | access to parameter b13 | 243 |
-| SplittingStressTest.cs:237:21:237:21 | ; | 243 |
-| SplittingStressTest.cs:239:13:243:13 | if (...) ... | 243 |
-| SplittingStressTest.cs:239:17:239:17 | access to parameter i | 243 |
-| SplittingStressTest.cs:239:17:239:23 | ... == ... | 243 |
-| SplittingStressTest.cs:239:22:239:23 | 14 | 243 |
-| SplittingStressTest.cs:240:13:243:13 | {...} | 243 |
-| SplittingStressTest.cs:241:17:242:21 | if (...) ... | 243 |
-| SplittingStressTest.cs:241:21:241:23 | access to parameter b14 | 243 |
-| SplittingStressTest.cs:242:21:242:21 | ; | 243 |
-| SplittingStressTest.cs:244:13:248:13 | if (...) ... | 243 |
-| SplittingStressTest.cs:244:17:244:17 | access to parameter i | 243 |
-| SplittingStressTest.cs:244:17:244:23 | ... == ... | 243 |
-| SplittingStressTest.cs:244:22:244:23 | 15 | 243 |
-| SplittingStressTest.cs:245:13:248:13 | {...} | 243 |
-| SplittingStressTest.cs:246:17:247:21 | if (...) ... | 243 |
-| SplittingStressTest.cs:246:21:246:23 | access to parameter b15 | 243 |
-| SplittingStressTest.cs:247:21:247:21 | ; | 243 |
-| SplittingStressTest.cs:249:13:253:13 | if (...) ... | 243 |
-| SplittingStressTest.cs:249:17:249:17 | access to parameter i | 243 |
-| SplittingStressTest.cs:249:17:249:23 | ... == ... | 243 |
-| SplittingStressTest.cs:249:22:249:23 | 16 | 243 |
-| SplittingStressTest.cs:250:13:253:13 | {...} | 243 |
-| SplittingStressTest.cs:251:17:252:21 | if (...) ... | 243 |
-| SplittingStressTest.cs:251:21:251:23 | access to parameter b16 | 243 |
-| SplittingStressTest.cs:252:21:252:21 | ; | 243 |
-| SplittingStressTest.cs:254:13:258:13 | if (...) ... | 243 |
-| SplittingStressTest.cs:254:17:254:17 | access to parameter i | 243 |
-| SplittingStressTest.cs:254:17:254:23 | ... == ... | 243 |
-| SplittingStressTest.cs:254:22:254:23 | 17 | 243 |
-| SplittingStressTest.cs:255:13:258:13 | {...} | 243 |
-| SplittingStressTest.cs:256:17:257:21 | if (...) ... | 243 |
-| SplittingStressTest.cs:256:21:256:23 | access to parameter b17 | 243 |
-| SplittingStressTest.cs:257:21:257:21 | ; | 243 |
-| SplittingStressTest.cs:259:13:263:13 | if (...) ... | 243 |
-| SplittingStressTest.cs:259:17:259:17 | access to parameter i | 243 |
-| SplittingStressTest.cs:259:17:259:23 | ... == ... | 243 |
-| SplittingStressTest.cs:259:22:259:23 | 18 | 243 |
-| SplittingStressTest.cs:260:13:263:13 | {...} | 243 |
-| SplittingStressTest.cs:261:17:262:21 | if (...) ... | 243 |
-| SplittingStressTest.cs:261:21:261:23 | access to parameter b18 | 243 |
-| SplittingStressTest.cs:262:21:262:21 | ; | 243 |
-| SplittingStressTest.cs:264:13:268:13 | if (...) ... | 243 |
-| SplittingStressTest.cs:264:17:264:17 | access to parameter i | 243 |
-| SplittingStressTest.cs:264:17:264:23 | ... == ... | 243 |
-| SplittingStressTest.cs:264:22:264:23 | 19 | 243 |
-| SplittingStressTest.cs:265:13:268:13 | {...} | 243 |
-| SplittingStressTest.cs:266:17:267:21 | if (...) ... | 243 |
-| SplittingStressTest.cs:266:21:266:23 | access to parameter b19 | 243 |
-| SplittingStressTest.cs:267:21:267:21 | ; | 243 |
-| SplittingStressTest.cs:269:13:273:13 | if (...) ... | 243 |
-| SplittingStressTest.cs:269:17:269:17 | access to parameter i | 243 |
-| SplittingStressTest.cs:269:17:269:23 | ... == ... | 243 |
-| SplittingStressTest.cs:269:22:269:23 | 20 | 243 |
-| SplittingStressTest.cs:270:13:273:13 | {...} | 243 |
-| SplittingStressTest.cs:271:17:272:21 | if (...) ... | 243 |
-| SplittingStressTest.cs:271:21:271:23 | access to parameter b20 | 243 |
-| SplittingStressTest.cs:272:21:272:21 | ; | 243 |
-| SplittingStressTest.cs:274:13:278:13 | if (...) ... | 243 |
-| SplittingStressTest.cs:274:17:274:17 | access to parameter i | 243 |
-| SplittingStressTest.cs:274:17:274:23 | ... == ... | 243 |
-| SplittingStressTest.cs:274:22:274:23 | 21 | 243 |
-| SplittingStressTest.cs:275:13:278:13 | {...} | 243 |
-| SplittingStressTest.cs:276:17:277:21 | if (...) ... | 243 |
-| SplittingStressTest.cs:276:21:276:23 | access to parameter b21 | 243 |
-| SplittingStressTest.cs:277:21:277:21 | ; | 243 |
-| SplittingStressTest.cs:279:13:283:13 | if (...) ... | 243 |
-| SplittingStressTest.cs:279:17:279:17 | access to parameter i | 243 |
-| SplittingStressTest.cs:279:17:279:23 | ... == ... | 243 |
-| SplittingStressTest.cs:279:22:279:23 | 22 | 243 |
-| SplittingStressTest.cs:280:13:283:13 | {...} | 243 |
-| SplittingStressTest.cs:281:17:282:21 | if (...) ... | 243 |
-| SplittingStressTest.cs:281:21:281:23 | access to parameter b22 | 243 |
-| SplittingStressTest.cs:282:21:282:21 | ; | 243 |
-| SplittingStressTest.cs:284:13:288:13 | if (...) ... | 243 |
-| SplittingStressTest.cs:284:17:284:17 | access to parameter i | 243 |
-| SplittingStressTest.cs:284:17:284:23 | ... == ... | 243 |
-| SplittingStressTest.cs:284:22:284:23 | 23 | 243 |
-| SplittingStressTest.cs:285:13:288:13 | {...} | 243 |
-| SplittingStressTest.cs:286:17:287:21 | if (...) ... | 243 |
-| SplittingStressTest.cs:286:21:286:23 | access to parameter b23 | 243 |
-| SplittingStressTest.cs:287:21:287:21 | ; | 243 |
-| SplittingStressTest.cs:289:13:293:13 | if (...) ... | 243 |
-| SplittingStressTest.cs:289:17:289:17 | access to parameter i | 243 |
-| SplittingStressTest.cs:289:17:289:23 | ... == ... | 243 |
-| SplittingStressTest.cs:289:22:289:23 | 24 | 243 |
-| SplittingStressTest.cs:290:13:293:13 | {...} | 243 |
-| SplittingStressTest.cs:291:17:292:21 | if (...) ... | 243 |
-| SplittingStressTest.cs:291:21:291:23 | access to parameter b24 | 243 |
-| SplittingStressTest.cs:292:21:292:21 | ; | 243 |
-| SplittingStressTest.cs:294:13:298:13 | if (...) ... | 243 |
-| SplittingStressTest.cs:294:17:294:17 | access to parameter i | 243 |
-| SplittingStressTest.cs:294:17:294:23 | ... == ... | 243 |
-| SplittingStressTest.cs:294:22:294:23 | 25 | 243 |
-| SplittingStressTest.cs:295:13:298:13 | {...} | 243 |
-| SplittingStressTest.cs:296:17:297:21 | if (...) ... | 243 |
-| SplittingStressTest.cs:296:21:296:23 | access to parameter b25 | 243 |
-| SplittingStressTest.cs:297:21:297:21 | ; | 243 |
-| SplittingStressTest.cs:299:13:303:13 | if (...) ... | 243 |
-| SplittingStressTest.cs:299:17:299:17 | access to parameter i | 243 |
-| SplittingStressTest.cs:299:17:299:23 | ... == ... | 243 |
-| SplittingStressTest.cs:299:22:299:23 | 26 | 243 |
-| SplittingStressTest.cs:300:13:303:13 | {...} | 243 |
-| SplittingStressTest.cs:301:17:302:21 | if (...) ... | 243 |
-| SplittingStressTest.cs:301:21:301:23 | access to parameter b26 | 243 |
-| SplittingStressTest.cs:302:21:302:21 | ; | 243 |
-| SplittingStressTest.cs:304:13:308:13 | if (...) ... | 243 |
-| SplittingStressTest.cs:304:17:304:17 | access to parameter i | 243 |
-| SplittingStressTest.cs:304:17:304:23 | ... == ... | 243 |
-| SplittingStressTest.cs:304:22:304:23 | 27 | 243 |
-| SplittingStressTest.cs:305:13:308:13 | {...} | 243 |
-| SplittingStressTest.cs:306:17:307:21 | if (...) ... | 243 |
-| SplittingStressTest.cs:306:21:306:23 | access to parameter b27 | 243 |
-| SplittingStressTest.cs:307:21:307:21 | ; | 243 |
-| SplittingStressTest.cs:309:13:313:13 | if (...) ... | 243 |
-| SplittingStressTest.cs:309:17:309:17 | access to parameter i | 243 |
-| SplittingStressTest.cs:309:17:309:23 | ... == ... | 243 |
-| SplittingStressTest.cs:309:22:309:23 | 28 | 243 |
-| SplittingStressTest.cs:310:13:313:13 | {...} | 243 |
-| SplittingStressTest.cs:311:17:312:21 | if (...) ... | 243 |
-| SplittingStressTest.cs:311:21:311:23 | access to parameter b28 | 243 |
-| SplittingStressTest.cs:312:21:312:21 | ; | 243 |
-| SplittingStressTest.cs:314:13:318:13 | if (...) ... | 243 |
-| SplittingStressTest.cs:314:17:314:17 | access to parameter i | 243 |
-| SplittingStressTest.cs:314:17:314:23 | ... == ... | 243 |
-| SplittingStressTest.cs:314:22:314:23 | 29 | 243 |
-| SplittingStressTest.cs:315:13:318:13 | {...} | 243 |
-| SplittingStressTest.cs:316:17:317:21 | if (...) ... | 243 |
-| SplittingStressTest.cs:316:21:316:23 | access to parameter b29 | 243 |
-| SplittingStressTest.cs:317:21:317:21 | ; | 243 |
-ssaDef
-| SplittingStressTest.cs:3:18:3:19 | SSA param(b1) |
-| SplittingStressTest.cs:3:27:3:28 | SSA param(b2) |
-| SplittingStressTest.cs:3:36:3:37 | SSA param(b3) |
-| SplittingStressTest.cs:3:45:3:46 | SSA param(b4) |
-| SplittingStressTest.cs:3:54:3:55 | SSA param(b5) |
-| SplittingStressTest.cs:3:63:3:64 | SSA param(b6) |
-| SplittingStressTest.cs:3:72:3:73 | SSA param(b7) |
-| SplittingStressTest.cs:3:81:3:82 | SSA param(b8) |
-| SplittingStressTest.cs:3:90:3:91 | SSA param(b9) |
-| SplittingStressTest.cs:3:99:3:101 | SSA param(b10) |
-| SplittingStressTest.cs:3:109:3:111 | SSA param(b11) |
-| SplittingStressTest.cs:3:119:3:121 | SSA param(b12) |
-| SplittingStressTest.cs:3:129:3:131 | SSA param(b13) |
-| SplittingStressTest.cs:3:139:3:141 | SSA param(b14) |
-| SplittingStressTest.cs:3:149:3:151 | SSA param(b15) |
-| SplittingStressTest.cs:3:159:3:161 | SSA param(b16) |
-| SplittingStressTest.cs:3:169:3:171 | SSA param(b17) |
-| SplittingStressTest.cs:3:179:3:181 | SSA param(b18) |
-| SplittingStressTest.cs:3:189:3:191 | SSA param(b19) |
-| SplittingStressTest.cs:3:199:3:201 | SSA param(b20) |
-| SplittingStressTest.cs:3:209:3:211 | SSA param(b21) |
-| SplittingStressTest.cs:3:219:3:221 | SSA param(b22) |
-| SplittingStressTest.cs:3:229:3:231 | SSA param(b23) |
-| SplittingStressTest.cs:3:239:3:241 | SSA param(b24) |
-| SplittingStressTest.cs:3:249:3:251 | SSA param(b25) |
-| SplittingStressTest.cs:3:259:3:261 | SSA param(b26) |
-| SplittingStressTest.cs:3:269:3:271 | SSA param(b27) |
-| SplittingStressTest.cs:3:279:3:281 | SSA param(b28) |
-| SplittingStressTest.cs:3:289:3:291 | SSA param(b29) |
-| SplittingStressTest.cs:3:299:3:301 | SSA param(b30) |
-| SplittingStressTest.cs:3:309:3:311 | SSA param(b31) |
-| SplittingStressTest.cs:3:319:3:321 | SSA param(b32) |
-| SplittingStressTest.cs:3:329:3:331 | SSA param(b33) |
-| SplittingStressTest.cs:3:339:3:341 | SSA param(b34) |
-| SplittingStressTest.cs:3:349:3:351 | SSA param(b35) |
-| SplittingStressTest.cs:3:359:3:361 | SSA param(b36) |
-| SplittingStressTest.cs:3:369:3:371 | SSA param(b37) |
-| SplittingStressTest.cs:3:379:3:381 | SSA param(b38) |
-| SplittingStressTest.cs:3:389:3:391 | SSA param(b39) |
-| SplittingStressTest.cs:3:399:3:401 | SSA param(b40) |
-| SplittingStressTest.cs:170:17:170:17 | SSA param(i) |
-| SplittingStressTest.cs:170:25:170:26 | SSA param(b1) |
-| SplittingStressTest.cs:170:34:170:35 | SSA param(b2) |
-| SplittingStressTest.cs:170:43:170:44 | SSA param(b3) |
-| SplittingStressTest.cs:170:52:170:53 | SSA param(b4) |
-| SplittingStressTest.cs:170:61:170:62 | SSA param(b5) |
-| SplittingStressTest.cs:170:70:170:71 | SSA param(b6) |
-| SplittingStressTest.cs:170:79:170:80 | SSA param(b7) |
-| SplittingStressTest.cs:170:88:170:89 | SSA param(b8) |
-| SplittingStressTest.cs:170:97:170:98 | SSA param(b9) |
-| SplittingStressTest.cs:170:106:170:108 | SSA param(b10) |
-| SplittingStressTest.cs:170:116:170:118 | SSA param(b11) |
-| SplittingStressTest.cs:170:126:170:128 | SSA param(b12) |
-| SplittingStressTest.cs:170:136:170:138 | SSA param(b13) |
-| SplittingStressTest.cs:170:146:170:148 | SSA param(b14) |
-| SplittingStressTest.cs:170:156:170:158 | SSA param(b15) |
-| SplittingStressTest.cs:170:166:170:168 | SSA param(b16) |
-| SplittingStressTest.cs:170:176:170:178 | SSA param(b17) |
-| SplittingStressTest.cs:170:186:170:188 | SSA param(b18) |
-| SplittingStressTest.cs:170:196:170:198 | SSA param(b19) |
-| SplittingStressTest.cs:170:206:170:208 | SSA param(b20) |
-| SplittingStressTest.cs:170:216:170:218 | SSA param(b21) |
-| SplittingStressTest.cs:170:226:170:228 | SSA param(b22) |
-| SplittingStressTest.cs:170:236:170:238 | SSA param(b23) |
-| SplittingStressTest.cs:170:246:170:248 | SSA param(b24) |
-| SplittingStressTest.cs:170:256:170:258 | SSA param(b25) |
-| SplittingStressTest.cs:170:266:170:268 | SSA param(b26) |
-| SplittingStressTest.cs:170:276:170:278 | SSA param(b27) |
-| SplittingStressTest.cs:170:286:170:288 | SSA param(b28) |
-| SplittingStressTest.cs:170:296:170:298 | SSA param(b29) |
-| SplittingStressTest.cs:172:16:172:16 | SSA phi(i) |
-| SplittingStressTest.cs:172:16:172:18 | SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): false, b4 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): false, b4 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): false, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): false, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b4 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b4 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b2 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b2 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b2 (line 170): false, b4 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b2 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b2 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b2 (line 170): false, b4 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b2 (line 170): false, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b2 (line 170): false, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b2 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b4 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b4 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b4 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b2 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b2 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b2 (line 170): true, b4 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b2 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b2 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b2 (line 170): true, b4 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b2 (line 170): true, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b2 (line 170): true, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b2 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b3 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b3 (line 170): false, b4 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b3 (line 170): false, b4 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b3 (line 170): false, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b3 (line 170): false, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b3 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b3 (line 170): true, b4 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b3 (line 170): true, b4 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b3 (line 170): true, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b3 (line 170): true, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b3 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b4 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b4 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b4 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b4 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b4 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b4 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b2 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b2 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b2 (line 170): false, b4 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b2 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b2 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b2 (line 170): false, b4 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b2 (line 170): false, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b2 (line 170): false, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b2 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b4 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b4 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b2 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b2 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b2 (line 170): true, b4 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b2 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b2 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b2 (line 170): true, b4 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b2 (line 170): true, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b2 (line 170): true, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b2 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b3 (line 170): false, b4 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b3 (line 170): false, b4 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b3 (line 170): false, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b3 (line 170): false, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b3 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b3 (line 170): true, b4 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b3 (line 170): true, b4 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b3 (line 170): true, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b3 (line 170): true, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b3 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b4 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b4 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b1 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b2 (line 170): false, b3 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b2 (line 170): false, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b2 (line 170): false, b3 (line 170): false, b4 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b2 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b2 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b2 (line 170): false, b3 (line 170): false, b4 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b2 (line 170): false, b3 (line 170): false, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b2 (line 170): false, b3 (line 170): false, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b2 (line 170): false, b3 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b2 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b2 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b2 (line 170): false, b3 (line 170): true, b4 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b2 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b2 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b2 (line 170): false, b3 (line 170): true, b4 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b2 (line 170): false, b3 (line 170): true, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b2 (line 170): false, b3 (line 170): true, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b2 (line 170): false, b3 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b2 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b2 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b2 (line 170): false, b4 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b2 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b2 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b2 (line 170): false, b4 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b2 (line 170): false, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b2 (line 170): false, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b2 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b2 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b2 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b2 (line 170): true, b3 (line 170): false, b4 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b2 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b2 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b2 (line 170): true, b3 (line 170): false, b4 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b2 (line 170): true, b3 (line 170): false, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b2 (line 170): true, b3 (line 170): false, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b2 (line 170): true, b3 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b2 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b2 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b2 (line 170): true, b3 (line 170): true, b4 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b2 (line 170): true, b3 (line 170): true, b4 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b2 (line 170): true, b3 (line 170): true, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b2 (line 170): true, b3 (line 170): true, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b2 (line 170): true, b3 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b2 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b2 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b2 (line 170): true, b4 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b2 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b2 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b2 (line 170): true, b4 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b2 (line 170): true, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b2 (line 170): true, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b2 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b3 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b3 (line 170): false, b4 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b3 (line 170): false, b4 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b3 (line 170): false, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b3 (line 170): false, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b3 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b3 (line 170): true, b4 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b3 (line 170): true, b4 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b3 (line 170): true, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b3 (line 170): true, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b3 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b4 (line 170): false, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b4 (line 170): false, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b4 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b4 (line 170): true, b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b4 (line 170): true, b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b4 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b5 (line 170): false] SSA def(i) |
-| SplittingStressTest.cs:172:16:172:18 | [b5 (line 170): true] SSA def(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b2 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b2 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b2 (line 170): false, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b2 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b2 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b2 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b2 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b2 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b2 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b2 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b2 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b2 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b2 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b2 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b2 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b2 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b2 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b2 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b3 (line 170): false, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b3 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b3 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b3 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b3 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b3 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b3 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b3 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b3 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b3 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:177:21:177:21 | [b1 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): false, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b2 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b2 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b2 (line 170): false, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b2 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b2 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b2 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b2 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b2 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b2 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b2 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b2 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b2 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b2 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b2 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b2 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b2 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b2 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b2 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b3 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b3 (line 170): false, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b3 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b3 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b3 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b3 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b3 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b3 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b3 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b3 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b3 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b2 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b2 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b2 (line 170): false, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b2 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b2 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b2 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b2 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b2 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b2 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b2 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b2 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b2 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b2 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b2 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b2 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b2 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b2 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b2 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b3 (line 170): false, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b3 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b3 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b3 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b3 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b3 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b3 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b3 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b3 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b3 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:179:13:183:13 | [b1 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b1 (line 170): false, b2 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b1 (line 170): false, b2 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b1 (line 170): false, b2 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b1 (line 170): false, b2 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b1 (line 170): false, b2 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b1 (line 170): false, b2 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b1 (line 170): false, b2 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b1 (line 170): false, b2 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b1 (line 170): false, b2 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b1 (line 170): true, b2 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b1 (line 170): true, b2 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b1 (line 170): true, b2 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b1 (line 170): true, b2 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b1 (line 170): true, b2 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b1 (line 170): true, b2 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b1 (line 170): true, b2 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b1 (line 170): true, b2 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b1 (line 170): true, b2 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b2 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b2 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b2 (line 170): true, b3 (line 170): false, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b2 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b2 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b2 (line 170): true, b3 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b2 (line 170): true, b3 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b2 (line 170): true, b3 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b2 (line 170): true, b3 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b2 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b2 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b2 (line 170): true, b3 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b2 (line 170): true, b3 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b2 (line 170): true, b3 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b2 (line 170): true, b3 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b2 (line 170): true, b3 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b2 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b2 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b2 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b2 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b2 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b2 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b2 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b2 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:182:21:182:21 | [b2 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): false, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): false, b2 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): false, b2 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): false, b2 (line 170): false, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): false, b2 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): false, b2 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): false, b2 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): false, b2 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): false, b2 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): false, b2 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): false, b2 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): false, b2 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): false, b2 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): false, b2 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): false, b2 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): false, b2 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): false, b2 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): false, b2 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): false, b2 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): true, b2 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): true, b2 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): true, b2 (line 170): false, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): true, b2 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): true, b2 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): true, b2 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): true, b2 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): true, b2 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): true, b2 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): true, b2 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): true, b2 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): true, b2 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): true, b2 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): true, b2 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): true, b2 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): true, b2 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): true, b2 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b1 (line 170): true, b2 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b2 (line 170): false, b3 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b2 (line 170): false, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b2 (line 170): false, b3 (line 170): false, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b2 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b2 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b2 (line 170): false, b3 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b2 (line 170): false, b3 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b2 (line 170): false, b3 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b2 (line 170): false, b3 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b2 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b2 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b2 (line 170): false, b3 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b2 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b2 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b2 (line 170): false, b3 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b2 (line 170): false, b3 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b2 (line 170): false, b3 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b2 (line 170): false, b3 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b2 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b2 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b2 (line 170): false, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b2 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b2 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b2 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b2 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b2 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b2 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b2 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b2 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b2 (line 170): true, b3 (line 170): false, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b2 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b2 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b2 (line 170): true, b3 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b2 (line 170): true, b3 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b2 (line 170): true, b3 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b2 (line 170): true, b3 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b2 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b2 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b2 (line 170): true, b3 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b2 (line 170): true, b3 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b2 (line 170): true, b3 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b2 (line 170): true, b3 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b2 (line 170): true, b3 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b2 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b2 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b2 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b2 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b2 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b2 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b2 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b2 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:184:13:188:13 | [b2 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b1 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b1 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b1 (line 170): false, b3 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b1 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b1 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b1 (line 170): false, b3 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b1 (line 170): false, b3 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b1 (line 170): false, b3 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b1 (line 170): false, b3 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b1 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b1 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b1 (line 170): true, b3 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b1 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b1 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b1 (line 170): true, b3 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b1 (line 170): true, b3 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b1 (line 170): true, b3 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b1 (line 170): true, b3 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b2 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b2 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b2 (line 170): false, b3 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b2 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b2 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b2 (line 170): false, b3 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b2 (line 170): false, b3 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b2 (line 170): false, b3 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b2 (line 170): false, b3 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b2 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b2 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b2 (line 170): true, b3 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b2 (line 170): true, b3 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b2 (line 170): true, b3 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b2 (line 170): true, b3 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b2 (line 170): true, b3 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b3 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b3 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b3 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b3 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:187:21:187:21 | [b3 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): false, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): false, b3 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): false, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): false, b3 (line 170): false, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): false, b3 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): false, b3 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): false, b3 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): false, b3 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): false, b3 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): false, b3 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): false, b3 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): false, b3 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): false, b3 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): true, b3 (line 170): false, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): true, b3 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): true, b3 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): true, b3 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): true, b3 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): true, b3 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): true, b3 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): true, b3 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): true, b3 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b1 (line 170): true, b3 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b2 (line 170): false, b3 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b2 (line 170): false, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b2 (line 170): false, b3 (line 170): false, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b2 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b2 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b2 (line 170): false, b3 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b2 (line 170): false, b3 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b2 (line 170): false, b3 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b2 (line 170): false, b3 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b2 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b2 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b2 (line 170): false, b3 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b2 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b2 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b2 (line 170): false, b3 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b2 (line 170): false, b3 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b2 (line 170): false, b3 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b2 (line 170): false, b3 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b2 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b2 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b2 (line 170): true, b3 (line 170): false, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b2 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b2 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b2 (line 170): true, b3 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b2 (line 170): true, b3 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b2 (line 170): true, b3 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b2 (line 170): true, b3 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b2 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b2 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b2 (line 170): true, b3 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b2 (line 170): true, b3 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b2 (line 170): true, b3 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b2 (line 170): true, b3 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b2 (line 170): true, b3 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b3 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b3 (line 170): false, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b3 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b3 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b3 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b3 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b3 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b3 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b3 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b3 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:189:13:193:13 | [b3 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b1 (line 170): false, b2 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b1 (line 170): false, b2 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b1 (line 170): false, b2 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b1 (line 170): false, b2 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b1 (line 170): false, b2 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b1 (line 170): false, b2 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b1 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b1 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b1 (line 170): false, b3 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b1 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b1 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b1 (line 170): false, b3 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b1 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b1 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b1 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b1 (line 170): true, b2 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b1 (line 170): true, b2 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b1 (line 170): true, b2 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b1 (line 170): true, b2 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b1 (line 170): true, b2 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b1 (line 170): true, b2 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b1 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b1 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b1 (line 170): true, b3 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b1 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b1 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b1 (line 170): true, b3 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b1 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b1 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b1 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b2 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b2 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b2 (line 170): false, b3 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b2 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b2 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b2 (line 170): false, b3 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b2 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b2 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b2 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b2 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b2 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b2 (line 170): true, b3 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b2 (line 170): true, b3 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b2 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b2 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b2 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b3 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b3 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:192:21:192:21 | [b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): false, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): false, b2 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): false, b2 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): false, b2 (line 170): false, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): false, b2 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): false, b2 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): false, b2 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): false, b2 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): false, b2 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): false, b2 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): false, b2 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): false, b2 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): false, b2 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): false, b3 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): false, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): false, b3 (line 170): false, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): false, b3 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): false, b3 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): false, b3 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): false, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): true, b2 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): true, b2 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): true, b2 (line 170): false, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): true, b2 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): true, b2 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): true, b2 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): true, b2 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): true, b2 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): true, b2 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): true, b2 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): true, b2 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): true, b2 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): true, b3 (line 170): false, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): true, b3 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): true, b3 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): true, b3 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b1 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b2 (line 170): false, b3 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b2 (line 170): false, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b2 (line 170): false, b3 (line 170): false, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b2 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b2 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b2 (line 170): false, b3 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b2 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b2 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b2 (line 170): false, b3 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b2 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b2 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b2 (line 170): false, b3 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b2 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b2 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b2 (line 170): false, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b2 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b2 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b2 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b2 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b2 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b2 (line 170): true, b3 (line 170): false, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b2 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b2 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b2 (line 170): true, b3 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b2 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b2 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b2 (line 170): true, b3 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b2 (line 170): true, b3 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b2 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b2 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b2 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b2 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b2 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b2 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b3 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b3 (line 170): false, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b3 (line 170): false, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b3 (line 170): true, b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b3 (line 170): true, b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b4 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:194:13:198:13 | [b4 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b1 (line 170): false, b2 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b1 (line 170): false, b2 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b1 (line 170): false, b2 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b1 (line 170): false, b2 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b1 (line 170): false, b2 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b1 (line 170): false, b2 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b1 (line 170): false, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b1 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b1 (line 170): false, b3 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b1 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b1 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b1 (line 170): false, b3 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b1 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b1 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b1 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b1 (line 170): true, b2 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b1 (line 170): true, b2 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b1 (line 170): true, b2 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b1 (line 170): true, b2 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b1 (line 170): true, b2 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b1 (line 170): true, b2 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b1 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b1 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b1 (line 170): true, b3 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b1 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b1 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b1 (line 170): true, b3 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b1 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b1 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b1 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b2 (line 170): false, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b2 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b2 (line 170): false, b3 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b2 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b2 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b2 (line 170): false, b3 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b2 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b2 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b2 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b2 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b2 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b2 (line 170): true, b3 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b2 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b2 (line 170): true, b3 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b2 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b2 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b2 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b3 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b3 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:197:21:197:21 | [b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): false, b2 (line 170): false, b3 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): false, b2 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): false, b2 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): false, b2 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): false, b2 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): false, b2 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): false, b2 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): false, b2 (line 170): true, b3 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): false, b2 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): false, b2 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): false, b2 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): false, b2 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): false, b2 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): false, b2 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): false, b3 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): false, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): false, b3 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): false, b3 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): false, b3 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): false, b3 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): true, b2 (line 170): false, b3 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): true, b2 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): true, b2 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): true, b2 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): true, b2 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): true, b2 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): true, b2 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): true, b2 (line 170): true, b3 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): true, b2 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): true, b2 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): true, b2 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): true, b2 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): true, b2 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): true, b2 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): true, b3 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): true, b3 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): true, b3 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): true, b3 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b1 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b2 (line 170): false, b3 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b2 (line 170): false, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b2 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b2 (line 170): false, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b2 (line 170): false, b3 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b2 (line 170): false, b3 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b2 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b2 (line 170): false, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b2 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b2 (line 170): false, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b2 (line 170): false, b3 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b2 (line 170): false, b3 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b2 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b2 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b2 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b2 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b2 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b2 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b2 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b2 (line 170): true, b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b2 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b2 (line 170): true, b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b2 (line 170): true, b3 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b2 (line 170): true, b3 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b2 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b2 (line 170): true, b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b2 (line 170): true, b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b2 (line 170): true, b3 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b2 (line 170): true, b3 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b2 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b2 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b2 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b2 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b2 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b2 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b3 (line 170): false, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b3 (line 170): false, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b3 (line 170): false, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b3 (line 170): false, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b3 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b3 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b3 (line 170): true, b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b3 (line 170): true, b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b3 (line 170): true, b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b3 (line 170): true, b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b3 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b3 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b4 (line 170): false, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b4 (line 170): false, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b4 (line 170): true, b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b4 (line 170): true, b5 (line 170): true] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b5 (line 170): false] SSA phi(i) |
-| SplittingStressTest.cs:199:13:203:13 | [b5 (line 170): true] SSA phi(i) |
diff --git a/csharp/ql/test/library-tests/controlflow/splits/SplittingStressTest.ql b/csharp/ql/test/library-tests/controlflow/splits/SplittingStressTest.ql
deleted file mode 100644
index c1b5633912d..00000000000
--- a/csharp/ql/test/library-tests/controlflow/splits/SplittingStressTest.ql
+++ /dev/null
@@ -1,8 +0,0 @@
-import csharp
-
-query predicate countSplits(ControlFlowElement cfe, int i) {
-  not cfe.fromLibrary() and
-  i = strictcount(ControlFlow::Nodes::ElementNode n | n.getAstNode() = cfe)
-}
-
-query predicate ssaDef(Ssa::Definition def) { any() }
diff --git a/csharp/ql/test/library-tests/csharp11/PrintAst.expected b/csharp/ql/test/library-tests/csharp11/PrintAst.expected
index 3a3f4497423..1de7ff42928 100644
--- a/csharp/ql/test/library-tests/csharp11/PrintAst.expected
+++ b/csharp/ql/test/library-tests/csharp11/PrintAst.expected
@@ -1234,9 +1234,9 @@ StaticInterfaceMembers.cs:
 #   49|       1: [PropertyCall] access to property Real
 #   49|         -1: [ParameterAccess] access to parameter n
 #   51|   14: [Method] Inc
-#   51|     -1: [TypeMention] Complex
 #   51|     -1: [TypeMention] INumber<Complex>
 #   51|       1: [TypeMention] Complex
+#   51|     -1: [TypeMention] Complex
 #-----|     2: (Parameters)
 #   51|       0: [Parameter] other
 #   51|         -1: [TypeMention] Complex
@@ -1254,9 +1254,9 @@ StaticInterfaceMembers.cs:
 #   52|           1: [PropertyCall] access to property Imaginary
 #   52|             -1: [ParameterAccess] access to parameter other
 #   54|   15: [Method] Dec
-#   54|     -1: [TypeMention] Complex
 #   54|     -1: [TypeMention] INumber<Complex>
 #   54|       1: [TypeMention] Complex
+#   54|     -1: [TypeMention] Complex
 #-----|     2: (Parameters)
 #   54|       0: [Parameter] other
 #   54|         -1: [TypeMention] Complex
diff --git a/csharp/ql/test/library-tests/csharp7/TupleTypes.expected b/csharp/ql/test/library-tests/csharp7/TupleTypes.expected
index 9d7f3330151..86bd4d542b9 100644
--- a/csharp/ql/test/library-tests/csharp7/TupleTypes.expected
+++ b/csharp/ql/test/library-tests/csharp7/TupleTypes.expected
@@ -1,12 +1,8 @@
-| (Int32,(String,Int32)) | (int, (string, int)) | ValueTuple<int, (string, int)> | 2 | 0 | CSharp7.cs:96:19:96:19 | Item1 |
-| (Int32,(String,Int32)) | (int, (string, int)) | ValueTuple<int, (string, int)> | 2 | 1 | CSharp7.cs:102:22:102:46 | Item2 |
-| (Int32,Double) | (int, double) | ValueTuple<int, double> | 2 | 0 | CSharp7.cs:213:6:213:8 | Item1 |
-| (Int32,Double) | (int, double) | ValueTuple<int, double> | 2 | 1 | CSharp7.cs:213:11:213:16 | Item2 |
-| (Int32,Int32) | (int, int) | ValueTuple<int, int> | 2 | 0 | CSharp7.cs:62:10:62:10 | Item1 |
-| (Int32,Int32) | (int, int) | ValueTuple<int, int> | 2 | 1 | CSharp7.cs:62:17:62:17 | Item2 |
-| (Int32,String) | (int, string) | ValueTuple<int, string> | 2 | 0 | CSharp7.cs:95:19:95:19 | Item1 |
-| (Int32,String) | (int, string) | ValueTuple<int, string> | 2 | 1 | CSharp7.cs:95:22:95:37 | Item2 |
-| (String,Int32) | (string, int) | ValueTuple<string, int> | 2 | 0 | CSharp7.cs:82:17:82:17 | Item1 |
-| (String,Int32) | (string, int) | ValueTuple<string, int> | 2 | 1 | CSharp7.cs:82:23:82:23 | Item2 |
-| (String,String) | (string, string) | ValueTuple<string, string> | 2 | 0 | CSharp7.cs:87:19:87:27 | Item1 |
-| (String,String) | (string, string) | ValueTuple<string, string> | 2 | 1 | CSharp7.cs:87:30:87:33 | Item2 |
+| (Int32,(String,Int32)) | (int, (string, int)) | ValueTuple<int, (string, int)> | 2 | 0 | Item1 |
+| (Int32,(String,Int32)) | (int, (string, int)) | ValueTuple<int, (string, int)> | 2 | 1 | Item2 |
+| (Int32,Double) | (int, double) | ValueTuple<int, double> | 2 | 0 | Item1 |
+| (Int32,Double) | (int, double) | ValueTuple<int, double> | 2 | 1 | Item2 |
+| (Int32,String) | (int, string) | ValueTuple<int, string> | 2 | 0 | Item1 |
+| (Int32,String) | (int, string) | ValueTuple<int, string> | 2 | 1 | Item2 |
+| (String,String) | (string, string) | ValueTuple<string, string> | 2 | 0 | Item1 |
+| (String,String) | (string, string) | ValueTuple<string, string> | 2 | 1 | Item2 |
diff --git a/csharp/ql/test/library-tests/csharp7/TupleTypes.ql b/csharp/ql/test/library-tests/csharp7/TupleTypes.ql
index 288fe1bfe98..c8fd4ac9ab0 100644
--- a/csharp/ql/test/library-tests/csharp7/TupleTypes.ql
+++ b/csharp/ql/test/library-tests/csharp7/TupleTypes.ql
@@ -1,6 +1,6 @@
 import csharp
 
 from TupleType tt, int i
-where tt.getAnElement().fromSource()
+where tt.fromSource()
 select tt.getName(), tt.toStringWithTypes(), tt.getUnderlyingType().toStringWithTypes(),
-  tt.getArity(), i, tt.getElement(i)
+  tt.getArity(), i, tt.getElement(i).getName()
diff --git a/csharp/ql/test/library-tests/csharp8/NullableRefTypes.expected b/csharp/ql/test/library-tests/csharp8/NullableRefTypes.expected
index 56f2f7e3d60..6ad47e73d01 100644
--- a/csharp/ql/test/library-tests/csharp8/NullableRefTypes.expected
+++ b/csharp/ql/test/library-tests/csharp8/NullableRefTypes.expected
@@ -178,8 +178,8 @@ returnTypes
 | NullableRefTypes.cs:51:12:51:15 | Q<MyClass> | object |
 | NullableRefTypes.cs:51:12:51:15 | Q<MyClass> | object! |
 | NullableRefTypes.cs:51:12:51:15 | Q`1 | object! |
-| NullableRefTypes.cs:54:11:54:33 | Generic | Void! |
-| NullableRefTypes.cs:58:11:58:26 | Generic2 | Void! |
+| NullableRefTypes.cs:54:11:54:17 | Generic | Void! |
+| NullableRefTypes.cs:58:11:58:18 | Generic2 | Void! |
 | NullableRefTypes.cs:67:10:67:21 | GenericFn<MyClass> | Void |
 | NullableRefTypes.cs:67:10:67:21 | GenericFn<MyClass> | Void! |
 | NullableRefTypes.cs:67:10:67:21 | GenericFn`1 | Void! |
@@ -271,8 +271,8 @@ expressionTypes
 | NullableRefTypes.cs:40:26:40:30 | ref ... | MyClass |
 | NullableRefTypes.cs:40:30:40:30 | access to local variable b | MyClass? |
 | NullableRefTypes.cs:51:44:51:47 | null | null |
-| NullableRefTypes.cs:54:11:54:33 | call to constructor Object | object |
-| NullableRefTypes.cs:58:11:58:26 | call to constructor Object | object |
+| NullableRefTypes.cs:54:11:54:17 | call to constructor Object | object |
+| NullableRefTypes.cs:58:11:58:18 | call to constructor Object | object |
 | NullableRefTypes.cs:73:18:73:18 | access to local variable x | MyClass! |
 | NullableRefTypes.cs:73:18:73:25 | MyClass x = ... | MyClass! |
 | NullableRefTypes.cs:73:22:73:25 | null | null |
diff --git a/csharp/ql/test/library-tests/csharp8/switchexprcontrolflow.expected b/csharp/ql/test/library-tests/csharp8/switchexprcontrolflow.expected
index b8a976a78a6..83438c26f6e 100644
--- a/csharp/ql/test/library-tests/csharp8/switchexprcontrolflow.expected
+++ b/csharp/ql/test/library-tests/csharp8/switchexprcontrolflow.expected
@@ -45,9 +45,9 @@
 | patterns.cs:110:25:110:25 | 0 | patterns.cs:110:22:110:26 | (..., ...) | semmle.label | successor |
 | patterns.cs:111:13:111:17 | ( ... ) | patterns.cs:111:13:111:17 | [no-match] { ... } | semmle.label | no-match |
 | patterns.cs:111:13:111:17 | ( ... ) | patterns.cs:111:14:111:14 | 1 | semmle.label | match |
-| patterns.cs:111:13:111:17 | [match] { ... } | patterns.cs:98:10:98:20 | exit Expressions (abnormal) | semmle.label | exception(InvalidOperationException) |
+| patterns.cs:111:13:111:17 | [match] { ... } | patterns.cs:98:10:98:20 | exit Expressions (abnormal) | semmle.label | exception |
 | patterns.cs:111:13:111:17 | [match] { ... } | patterns.cs:111:23:111:23 | 0 | semmle.label | match |
-| patterns.cs:111:13:111:17 | [no-match] { ... } | patterns.cs:98:10:98:20 | exit Expressions (abnormal) | semmle.label | exception(InvalidOperationException) |
+| patterns.cs:111:13:111:17 | [no-match] { ... } | patterns.cs:98:10:98:20 | exit Expressions (abnormal) | semmle.label | exception |
 | patterns.cs:111:13:111:26 | ... => ... | patterns.cs:108:24:112:9 | ... switch { ... } | semmle.label | successor |
 | patterns.cs:111:14:111:14 | 1 | patterns.cs:111:13:111:17 | [no-match] { ... } | semmle.label | no-match |
 | patterns.cs:111:14:111:14 | 1 | patterns.cs:111:16:111:16 | 0 | semmle.label | match |
@@ -89,9 +89,9 @@
 | patterns.cs:118:32:118:33 | access to local variable x2 | patterns.cs:118:28:118:34 | (..., ...) | semmle.label | successor |
 | patterns.cs:119:13:119:28 | ( ... ) | patterns.cs:119:13:119:28 | [no-match] { ... } | semmle.label | no-match |
 | patterns.cs:119:13:119:28 | ( ... ) | patterns.cs:119:14:119:19 | Int32 x2 | semmle.label | match |
-| patterns.cs:119:13:119:28 | [match] { ... } | patterns.cs:98:10:98:20 | exit Expressions (abnormal) | semmle.label | exception(InvalidOperationException) |
+| patterns.cs:119:13:119:28 | [match] { ... } | patterns.cs:98:10:98:20 | exit Expressions (abnormal) | semmle.label | exception |
 | patterns.cs:119:13:119:28 | [match] { ... } | patterns.cs:119:34:119:34 | 0 | semmle.label | match |
-| patterns.cs:119:13:119:28 | [no-match] { ... } | patterns.cs:98:10:98:20 | exit Expressions (abnormal) | semmle.label | exception(InvalidOperationException) |
+| patterns.cs:119:13:119:28 | [no-match] { ... } | patterns.cs:98:10:98:20 | exit Expressions (abnormal) | semmle.label | exception |
 | patterns.cs:119:13:119:38 | ... => ... | patterns.cs:115:20:120:9 | ... switch { ... } | semmle.label | successor |
 | patterns.cs:119:14:119:19 | Int32 x2 | patterns.cs:119:13:119:28 | [no-match] { ... } | semmle.label | no-match |
 | patterns.cs:119:14:119:19 | Int32 x2 | patterns.cs:119:22:119:27 | Int32 y2 | semmle.label | match |
@@ -148,7 +148,7 @@
 | patterns.cs:130:17:130:17 | 2 | patterns.cs:130:13:130:18 | [match] { ... } | semmle.label | match |
 | patterns.cs:130:17:130:17 | 2 | patterns.cs:130:13:130:18 | [no-match] { ... } | semmle.label | no-match |
 | patterns.cs:130:23:130:23 | 2 | patterns.cs:130:13:130:23 | ... => ... | semmle.label | successor |
-| patterns.cs:131:13:131:22 | (..., ...) | patterns.cs:123:10:123:21 | exit Expressions2 (abnormal) | semmle.label | exception(InvalidOperationException) |
+| patterns.cs:131:13:131:22 | (..., ...) | patterns.cs:123:10:123:21 | exit Expressions2 (abnormal) | semmle.label | exception |
 | patterns.cs:131:13:131:22 | (..., ...) | patterns.cs:131:27:131:27 | 3 | semmle.label | match |
 | patterns.cs:131:13:131:27 | ... => ... | patterns.cs:126:17:132:9 | ... switch { ... } | semmle.label | successor |
 | patterns.cs:131:18:131:18 | Int32 x | patterns.cs:131:21:131:21 | _ | semmle.label | successor |
@@ -162,9 +162,9 @@
 | patterns.cs:136:17:143:13 | ... switch { ... } | patterns.cs:136:13:143:13 | ... = ... | semmle.label | successor |
 | patterns.cs:138:17:138:17 | 1 | patterns.cs:138:28:138:50 | object creation of type ArgumentException | semmle.label | match |
 | patterns.cs:138:17:138:17 | 1 | patterns.cs:139:17:139:17 | 2 | semmle.label | no-match |
-| patterns.cs:138:22:138:50 | throw ... | patterns.cs:145:9:148:9 | [exception: ArgumentException] catch (...) {...} | semmle.label | exception(ArgumentException) |
+| patterns.cs:138:22:138:50 | throw ... | patterns.cs:145:9:148:9 | catch (...) {...} | semmle.label | exception |
 | patterns.cs:138:28:138:50 | object creation of type ArgumentException | patterns.cs:138:22:138:50 | throw ... | semmle.label | successor |
-| patterns.cs:138:28:138:50 | object creation of type ArgumentException | patterns.cs:145:9:148:9 | [exception: Exception] catch (...) {...} | semmle.label | exception(Exception) |
+| patterns.cs:138:28:138:50 | object creation of type ArgumentException | patterns.cs:145:9:148:9 | catch (...) {...} | semmle.label | exception |
 | patterns.cs:139:17:139:17 | 2 | patterns.cs:139:22:139:22 | 3 | semmle.label | match |
 | patterns.cs:139:17:139:17 | 2 | patterns.cs:140:17:140:24 | Object y | semmle.label | no-match |
 | patterns.cs:139:17:139:22 | ... => ... | patterns.cs:136:17:143:13 | ... switch { ... } | semmle.label | successor |
@@ -187,20 +187,17 @@
 | patterns.cs:142:17:142:24 | access to type MyStruct | patterns.cs:142:17:142:36 | [no-match] { ... } | semmle.label | no-match |
 | patterns.cs:142:17:142:24 | access to type MyStruct | patterns.cs:142:31:142:32 | 10 | semmle.label | match |
 | patterns.cs:142:17:142:36 | [match] { ... } | patterns.cs:142:41:142:41 | 6 | semmle.label | match |
-| patterns.cs:142:17:142:36 | [match] { ... } | patterns.cs:145:9:148:9 | [exception: InvalidOperationException] catch (...) {...} | semmle.label | exception(InvalidOperationException) |
-| patterns.cs:142:17:142:36 | [no-match] { ... } | patterns.cs:145:9:148:9 | [exception: InvalidOperationException] catch (...) {...} | semmle.label | exception(InvalidOperationException) |
+| patterns.cs:142:17:142:36 | [match] { ... } | patterns.cs:145:9:148:9 | catch (...) {...} | semmle.label | exception |
+| patterns.cs:142:17:142:36 | [no-match] { ... } | patterns.cs:145:9:148:9 | catch (...) {...} | semmle.label | exception |
 | patterns.cs:142:17:142:41 | ... => ... | patterns.cs:136:17:143:13 | ... switch { ... } | semmle.label | successor |
 | patterns.cs:142:26:142:34 | [match] { ... } | patterns.cs:142:17:142:36 | [match] { ... } | semmle.label | match |
 | patterns.cs:142:26:142:34 | [no-match] { ... } | patterns.cs:142:17:142:36 | [no-match] { ... } | semmle.label | no-match |
 | patterns.cs:142:31:142:32 | 10 | patterns.cs:142:26:142:34 | [match] { ... } | semmle.label | match |
 | patterns.cs:142:31:142:32 | 10 | patterns.cs:142:26:142:34 | [no-match] { ... } | semmle.label | no-match |
 | patterns.cs:142:41:142:41 | 6 | patterns.cs:142:17:142:41 | ... => ... | semmle.label | successor |
-| patterns.cs:145:9:148:9 | [exception: ArgumentException] catch (...) {...} | patterns.cs:123:10:123:21 | exit Expressions2 (abnormal) | semmle.label | exception(ArgumentException) |
-| patterns.cs:145:9:148:9 | [exception: Exception] catch (...) {...} | patterns.cs:123:10:123:21 | exit Expressions2 (abnormal) | semmle.label | exception(Exception) |
-| patterns.cs:145:9:148:9 | [exception: Exception] catch (...) {...} | patterns.cs:145:41:145:42 | [exception: Exception] InvalidOperationException ex | semmle.label | match |
-| patterns.cs:145:9:148:9 | [exception: InvalidOperationException] catch (...) {...} | patterns.cs:145:41:145:42 | [exception: InvalidOperationException] InvalidOperationException ex | semmle.label | match |
-| patterns.cs:145:41:145:42 | [exception: Exception] InvalidOperationException ex | patterns.cs:146:9:148:9 | {...} | semmle.label | successor |
-| patterns.cs:145:41:145:42 | [exception: InvalidOperationException] InvalidOperationException ex | patterns.cs:146:9:148:9 | {...} | semmle.label | successor |
+| patterns.cs:145:9:148:9 | catch (...) {...} | patterns.cs:123:10:123:21 | exit Expressions2 (abnormal) | semmle.label | exception |
+| patterns.cs:145:9:148:9 | catch (...) {...} | patterns.cs:145:41:145:42 | InvalidOperationException ex | semmle.label | match |
+| patterns.cs:145:41:145:42 | InvalidOperationException ex | patterns.cs:146:9:148:9 | {...} | semmle.label | successor |
 | patterns.cs:146:9:148:9 | {...} | patterns.cs:147:13:147:51 | ...; | semmle.label | successor |
 | patterns.cs:147:13:147:50 | call to method WriteLine | patterns.cs:123:10:123:21 | exit Expressions2 (normal) | semmle.label | successor |
 | patterns.cs:147:13:147:51 | ...; | patterns.cs:147:31:147:49 | "Invalid operation" | semmle.label | successor |
diff --git a/csharp/ql/test/library-tests/csharp9/withExpr.expected b/csharp/ql/test/library-tests/csharp9/withExpr.expected
index 2d32e7c8bfd..cf3b9f5eb00 100644
--- a/csharp/ql/test/library-tests/csharp9/withExpr.expected
+++ b/csharp/ql/test/library-tests/csharp9/withExpr.expected
@@ -4,10 +4,10 @@ withExpr
 | Record.cs:77:21:77:31 | ... with { ... } | Person1 | Record.cs:77:21:77:22 | access to local variable p1 | Record.cs:77:29:77:31 | { ..., ... } | Person1.<Clone>$() |
 | Record.cs:84:16:84:33 | ... with { ... } | R1 | Record.cs:84:16:84:16 | access to local variable b | Record.cs:84:23:84:33 | { ..., ... } | R1.<Clone>$() |
 withTarget
-| Record.cs:75:18:75:47 | ... with { ... } | Record.cs:27:1:27:57 | <Clone>$ | Record.cs:27:1:27:57 | Person1 |
-| Record.cs:76:18:76:81 | ... with { ... } | Record.cs:29:1:30:35 | <Clone>$ | Record.cs:29:1:30:35 | Teacher1 |
-| Record.cs:77:21:77:31 | ... with { ... } | Record.cs:27:1:27:57 | <Clone>$ | Record.cs:27:1:27:57 | Person1 |
-| Record.cs:84:16:84:33 | ... with { ... } | Record.cs:54:1:54:39 | <Clone>$ | Record.cs:54:1:54:39 | R1 |
+| Record.cs:75:18:75:47 | ... with { ... } | Record.cs:27:1:27:57 | <Clone>$ | Record.cs:27:15:27:21 | Person1 |
+| Record.cs:76:18:76:81 | ... with { ... } | Record.cs:29:1:30:35 | <Clone>$ | Record.cs:29:15:29:22 | Teacher1 |
+| Record.cs:77:21:77:31 | ... with { ... } | Record.cs:27:1:27:57 | <Clone>$ | Record.cs:27:15:27:21 | Person1 |
+| Record.cs:84:16:84:33 | ... with { ... } | Record.cs:54:1:54:39 | <Clone>$ | Record.cs:54:24:54:25 | R1 |
 cloneOverrides
 | Person1.<Clone>$() | Student1.<Clone>$() |
 | Person1.<Clone>$() | Teacher1.<Clone>$() |
diff --git a/csharp/ql/test/library-tests/dataflow/barrier-guards/barrier-flow.ql b/csharp/ql/test/library-tests/dataflow/barrier-guards/barrier-flow.ql
index 5d63ff124ca..08579f1528f 100644
--- a/csharp/ql/test/library-tests/dataflow/barrier-guards/barrier-flow.ql
+++ b/csharp/ql/test/library-tests/dataflow/barrier-guards/barrier-flow.ql
@@ -5,10 +5,8 @@
 import csharp
 import semmle.code.csharp.controlflow.Guards
 
-private predicate stringConstCompare(Guard guard, Expr testedNode, AbstractValue value) {
-  guard
-      .isEquality(any(StringLiteral lit), testedNode,
-        value.(AbstractValues::BooleanValue).getValue())
+private predicate stringConstCompare(Guard guard, Expr testedNode, GuardValue value) {
+  guard.isEquality(any(StringLiteral lit), testedNode, value.asBooleanValue())
 }
 
 class StringConstCompareBarrier extends DataFlow::Node {
diff --git a/csharp/ql/test/library-tests/dataflow/call-sensitivity/CallSensitivityFlow.cs b/csharp/ql/test/library-tests/dataflow/call-sensitivity/CallSensitivityFlow.cs
index 9470b4536dc..109be4aa995 100644
--- a/csharp/ql/test/library-tests/dataflow/call-sensitivity/CallSensitivityFlow.cs
+++ b/csharp/ql/test/library-tests/dataflow/call-sensitivity/CallSensitivityFlow.cs
@@ -233,3 +233,33 @@ public interface InterfaceB
 {
     void Foo(A2 a, object o, bool cond);
 }
+
+public class A3
+{
+    public virtual void M1(object o)
+    {
+        this.M2(o);
+    }
+
+    public virtual void M2(object o)
+    {
+        Sink(o); // should not have flow
+    }
+
+    public static void Sink(object o)
+    {
+    }
+}
+
+public class A4 : A3
+{
+    public override void M2(object o)
+    {
+        Sink(o); // should have flow
+    }
+
+    private void CallM1()
+    {
+        base.M1(new object());
+    }
+}
diff --git a/csharp/ql/test/library-tests/dataflow/call-sensitivity/CallSensitivityFlow.expected b/csharp/ql/test/library-tests/dataflow/call-sensitivity/CallSensitivityFlow.expected
index dfe1a951b27..bcd15ee7831 100644
--- a/csharp/ql/test/library-tests/dataflow/call-sensitivity/CallSensitivityFlow.expected
+++ b/csharp/ql/test/library-tests/dataflow/call-sensitivity/CallSensitivityFlow.expected
@@ -2,7 +2,7 @@ edges
 | CallSensitivityFlow.cs:7:38:7:38 | o : Object | CallSensitivityFlow.cs:11:20:11:20 | access to parameter o : Object | provenance |  |
 | CallSensitivityFlow.cs:19:39:19:39 | o : Object | CallSensitivityFlow.cs:23:18:23:18 | access to parameter o | provenance |  |
 | CallSensitivityFlow.cs:27:40:27:40 | o : Object | CallSensitivityFlow.cs:31:18:31:18 | access to parameter o | provenance |  |
-| CallSensitivityFlow.cs:35:41:35:41 | o : Object | CallSensitivityFlow.cs:39:18:39:18 | [cond (line 35): true] access to parameter o | provenance |  |
+| CallSensitivityFlow.cs:35:41:35:41 | o : Object | CallSensitivityFlow.cs:39:18:39:18 | access to parameter o | provenance |  |
 | CallSensitivityFlow.cs:43:45:43:45 | o : Object | CallSensitivityFlow.cs:45:16:45:17 | access to local variable o1 : Object | provenance |  |
 | CallSensitivityFlow.cs:45:16:45:17 | access to local variable o1 : Object | CallSensitivityFlow.cs:49:20:49:22 | access to local variable tmp : Object | provenance |  |
 | CallSensitivityFlow.cs:49:20:49:22 | access to local variable tmp : Object | CallSensitivityFlow.cs:50:13:50:14 | access to local variable o2 : Object | provenance |  |
@@ -59,6 +59,10 @@ edges
 | CallSensitivityFlow.cs:187:13:187:13 | access to local variable o : Object | CallSensitivityFlow.cs:188:14:188:14 | access to local variable o | provenance |  |
 | CallSensitivityFlow.cs:187:17:187:30 | call to method CallMOut : Object | CallSensitivityFlow.cs:187:13:187:13 | access to local variable o : Object | provenance |  |
 | CallSensitivityFlow.cs:205:40:205:40 | o : Object | CallSensitivityFlow.cs:208:18:208:18 | access to parameter o | provenance |  |
+| CallSensitivityFlow.cs:239:35:239:35 | o : Object | CallSensitivityFlow.cs:241:17:241:17 | access to parameter o : Object | provenance |  |
+| CallSensitivityFlow.cs:241:17:241:17 | access to parameter o : Object | CallSensitivityFlow.cs:256:36:256:36 | o : Object | provenance |  |
+| CallSensitivityFlow.cs:256:36:256:36 | o : Object | CallSensitivityFlow.cs:258:14:258:14 | access to parameter o | provenance |  |
+| CallSensitivityFlow.cs:263:17:263:28 | object creation of type Object : Object | CallSensitivityFlow.cs:239:35:239:35 | o : Object | provenance |  |
 nodes
 | CallSensitivityFlow.cs:7:38:7:38 | o : Object | semmle.label | o : Object |
 | CallSensitivityFlow.cs:11:20:11:20 | access to parameter o : Object | semmle.label | access to parameter o : Object |
@@ -67,7 +71,7 @@ nodes
 | CallSensitivityFlow.cs:27:40:27:40 | o : Object | semmle.label | o : Object |
 | CallSensitivityFlow.cs:31:18:31:18 | access to parameter o | semmle.label | access to parameter o |
 | CallSensitivityFlow.cs:35:41:35:41 | o : Object | semmle.label | o : Object |
-| CallSensitivityFlow.cs:39:18:39:18 | [cond (line 35): true] access to parameter o | semmle.label | [cond (line 35): true] access to parameter o |
+| CallSensitivityFlow.cs:39:18:39:18 | access to parameter o | semmle.label | access to parameter o |
 | CallSensitivityFlow.cs:43:45:43:45 | o : Object | semmle.label | o : Object |
 | CallSensitivityFlow.cs:45:16:45:17 | access to local variable o1 : Object | semmle.label | access to local variable o1 : Object |
 | CallSensitivityFlow.cs:49:20:49:22 | access to local variable tmp : Object | semmle.label | access to local variable tmp : Object |
@@ -132,13 +136,18 @@ nodes
 | CallSensitivityFlow.cs:188:14:188:14 | access to local variable o | semmle.label | access to local variable o |
 | CallSensitivityFlow.cs:205:40:205:40 | o : Object | semmle.label | o : Object |
 | CallSensitivityFlow.cs:208:18:208:18 | access to parameter o | semmle.label | access to parameter o |
+| CallSensitivityFlow.cs:239:35:239:35 | o : Object | semmle.label | o : Object |
+| CallSensitivityFlow.cs:241:17:241:17 | access to parameter o : Object | semmle.label | access to parameter o : Object |
+| CallSensitivityFlow.cs:256:36:256:36 | o : Object | semmle.label | o : Object |
+| CallSensitivityFlow.cs:258:14:258:14 | access to parameter o | semmle.label | access to parameter o |
+| CallSensitivityFlow.cs:263:17:263:28 | object creation of type Object : Object | semmle.label | object creation of type Object : Object |
 subpaths
 | CallSensitivityFlow.cs:85:26:85:37 | object creation of type Object : Object | CallSensitivityFlow.cs:7:38:7:38 | o : Object | CallSensitivityFlow.cs:11:20:11:20 | access to parameter o : Object | CallSensitivityFlow.cs:85:14:85:44 | call to method FlowThrough |
 | CallSensitivityFlow.cs:105:26:105:37 | object creation of type Object : Object | CallSensitivityFlow.cs:7:38:7:38 | o : Object | CallSensitivityFlow.cs:11:20:11:20 | access to parameter o : Object | CallSensitivityFlow.cs:105:14:105:41 | call to method FlowThrough |
 #select
 | CallSensitivityFlow.cs:78:24:78:35 | object creation of type Object : Object | CallSensitivityFlow.cs:78:24:78:35 | object creation of type Object : Object | CallSensitivityFlow.cs:23:18:23:18 | access to parameter o | $@ | CallSensitivityFlow.cs:23:18:23:18 | access to parameter o | access to parameter o |
 | CallSensitivityFlow.cs:79:25:79:36 | object creation of type Object : Object | CallSensitivityFlow.cs:79:25:79:36 | object creation of type Object : Object | CallSensitivityFlow.cs:31:18:31:18 | access to parameter o | $@ | CallSensitivityFlow.cs:31:18:31:18 | access to parameter o | access to parameter o |
-| CallSensitivityFlow.cs:80:26:80:37 | object creation of type Object : Object | CallSensitivityFlow.cs:80:26:80:37 | object creation of type Object : Object | CallSensitivityFlow.cs:39:18:39:18 | [cond (line 35): true] access to parameter o | $@ | CallSensitivityFlow.cs:39:18:39:18 | [cond (line 35): true] access to parameter o | [cond (line 35): true] access to parameter o |
+| CallSensitivityFlow.cs:80:26:80:37 | object creation of type Object : Object | CallSensitivityFlow.cs:80:26:80:37 | object creation of type Object : Object | CallSensitivityFlow.cs:39:18:39:18 | access to parameter o | $@ | CallSensitivityFlow.cs:39:18:39:18 | access to parameter o | access to parameter o |
 | CallSensitivityFlow.cs:81:30:81:41 | object creation of type Object : Object | CallSensitivityFlow.cs:81:30:81:41 | object creation of type Object : Object | CallSensitivityFlow.cs:53:14:53:15 | access to local variable o3 | $@ | CallSensitivityFlow.cs:53:14:53:15 | access to local variable o3 | access to local variable o3 |
 | CallSensitivityFlow.cs:82:31:82:42 | object creation of type Object : Object | CallSensitivityFlow.cs:82:31:82:42 | object creation of type Object : Object | CallSensitivityFlow.cs:66:14:66:15 | access to local variable o3 | $@ | CallSensitivityFlow.cs:66:14:66:15 | access to local variable o3 | access to local variable o3 |
 | CallSensitivityFlow.cs:83:31:83:42 | object creation of type Object : Object | CallSensitivityFlow.cs:83:31:83:42 | object creation of type Object : Object | CallSensitivityFlow.cs:66:14:66:15 | access to local variable o3 | $@ | CallSensitivityFlow.cs:66:14:66:15 | access to local variable o3 | access to local variable o3 |
@@ -147,7 +156,7 @@ subpaths
 | CallSensitivityFlow.cs:87:31:87:42 | object creation of type Object : Object | CallSensitivityFlow.cs:87:31:87:42 | object creation of type Object : Object | CallSensitivityFlow.cs:66:14:66:15 | access to local variable o3 | $@ | CallSensitivityFlow.cs:66:14:66:15 | access to local variable o3 | access to local variable o3 |
 | CallSensitivityFlow.cs:101:24:101:35 | object creation of type Object : Object | CallSensitivityFlow.cs:101:24:101:35 | object creation of type Object : Object | CallSensitivityFlow.cs:23:18:23:18 | access to parameter o | $@ | CallSensitivityFlow.cs:23:18:23:18 | access to parameter o | access to parameter o |
 | CallSensitivityFlow.cs:102:25:102:36 | object creation of type Object : Object | CallSensitivityFlow.cs:102:25:102:36 | object creation of type Object : Object | CallSensitivityFlow.cs:31:18:31:18 | access to parameter o | $@ | CallSensitivityFlow.cs:31:18:31:18 | access to parameter o | access to parameter o |
-| CallSensitivityFlow.cs:103:26:103:37 | object creation of type Object : Object | CallSensitivityFlow.cs:103:26:103:37 | object creation of type Object : Object | CallSensitivityFlow.cs:39:18:39:18 | [cond (line 35): true] access to parameter o | $@ | CallSensitivityFlow.cs:39:18:39:18 | [cond (line 35): true] access to parameter o | [cond (line 35): true] access to parameter o |
+| CallSensitivityFlow.cs:103:26:103:37 | object creation of type Object : Object | CallSensitivityFlow.cs:103:26:103:37 | object creation of type Object : Object | CallSensitivityFlow.cs:39:18:39:18 | access to parameter o | $@ | CallSensitivityFlow.cs:39:18:39:18 | access to parameter o | access to parameter o |
 | CallSensitivityFlow.cs:104:30:104:41 | object creation of type Object : Object | CallSensitivityFlow.cs:104:30:104:41 | object creation of type Object : Object | CallSensitivityFlow.cs:53:14:53:15 | access to local variable o3 | $@ | CallSensitivityFlow.cs:53:14:53:15 | access to local variable o3 | access to local variable o3 |
 | CallSensitivityFlow.cs:105:26:105:37 | object creation of type Object : Object | CallSensitivityFlow.cs:105:26:105:37 | object creation of type Object : Object | CallSensitivityFlow.cs:105:14:105:41 | call to method FlowThrough | $@ | CallSensitivityFlow.cs:105:14:105:41 | call to method FlowThrough | call to method FlowThrough |
 | CallSensitivityFlow.cs:117:26:117:37 | object creation of type Object : Object | CallSensitivityFlow.cs:117:26:117:37 | object creation of type Object : Object | CallSensitivityFlow.cs:128:22:128:22 | access to parameter o | $@ | CallSensitivityFlow.cs:128:22:128:22 | access to parameter o | access to parameter o |
@@ -156,3 +165,4 @@ subpaths
 | CallSensitivityFlow.cs:172:37:172:48 | object creation of type Object : Object | CallSensitivityFlow.cs:172:37:172:48 | object creation of type Object : Object | CallSensitivityFlow.cs:188:14:188:14 | access to local variable o | $@ | CallSensitivityFlow.cs:188:14:188:14 | access to local variable o | access to local variable o |
 | CallSensitivityFlow.cs:182:21:182:32 | object creation of type Object : Object | CallSensitivityFlow.cs:182:21:182:32 | object creation of type Object : Object | CallSensitivityFlow.cs:208:18:208:18 | access to parameter o | $@ | CallSensitivityFlow.cs:208:18:208:18 | access to parameter o | access to parameter o |
 | CallSensitivityFlow.cs:185:21:185:32 | object creation of type Object : Object | CallSensitivityFlow.cs:185:21:185:32 | object creation of type Object : Object | CallSensitivityFlow.cs:164:14:164:14 | access to parameter o | $@ | CallSensitivityFlow.cs:164:14:164:14 | access to parameter o | access to parameter o |
+| CallSensitivityFlow.cs:263:17:263:28 | object creation of type Object : Object | CallSensitivityFlow.cs:263:17:263:28 | object creation of type Object : Object | CallSensitivityFlow.cs:258:14:258:14 | access to parameter o | $@ | CallSensitivityFlow.cs:258:14:258:14 | access to parameter o | access to parameter o |
diff --git a/csharp/ql/test/library-tests/dataflow/callablereturnsarg/Common.qll b/csharp/ql/test/library-tests/dataflow/callablereturnsarg/Common.qll
index ae9b56cd038..3a3a55e42cc 100644
--- a/csharp/ql/test/library-tests/dataflow/callablereturnsarg/Common.qll
+++ b/csharp/ql/test/library-tests/dataflow/callablereturnsarg/Common.qll
@@ -18,9 +18,7 @@ module Config implements DataFlow::ConfigSig {
   }
 
   predicate isBarrier(DataFlow::Node node) {
-    exists(AbstractValues::NullValue nv | node.(GuardedDataFlowNode).mustHaveValue(nv) |
-      nv.isNull()
-    )
+    exists(GuardValue nv | node.(GuardedDataFlowNode).mustHaveValue(nv) | nv.isNullValue())
   }
 }
 
diff --git a/csharp/ql/test/library-tests/dataflow/external-models/ExternalFlow.cs b/csharp/ql/test/library-tests/dataflow/external-models/ExternalFlow.cs
index 705efd35e38..d7552376c0f 100644
--- a/csharp/ql/test/library-tests/dataflow/external-models/ExternalFlow.cs
+++ b/csharp/ql/test/library-tests/dataflow/external-models/ExternalFlow.cs
@@ -116,7 +116,7 @@ namespace My.Qltest
         {
             var a = new object[] { new object() };
             var b = Reverse(a);
-            Sink(b); // No flow
+            Sink(b); // Flow
             Sink(b[0]); // Flow
         }
 
diff --git a/csharp/ql/test/library-tests/dataflow/external-models/ExternalFlow.expected b/csharp/ql/test/library-tests/dataflow/external-models/ExternalFlow.expected
index 7254208be18..3099a3fec7e 100644
--- a/csharp/ql/test/library-tests/dataflow/external-models/ExternalFlow.expected
+++ b/csharp/ql/test/library-tests/dataflow/external-models/ExternalFlow.expected
@@ -104,6 +104,7 @@ edges
 | ExternalFlow.cs:117:17:117:17 | access to local variable a : null [element] : Object | ExternalFlow.cs:118:29:118:29 | access to local variable a : null [element] : Object | provenance |  |
 | ExternalFlow.cs:117:34:117:49 | { ..., ... } : null [element] : Object | ExternalFlow.cs:117:17:117:17 | access to local variable a : null [element] : Object | provenance |  |
 | ExternalFlow.cs:117:36:117:47 | object creation of type Object : Object | ExternalFlow.cs:117:34:117:49 | { ..., ... } : null [element] : Object | provenance |  |
+| ExternalFlow.cs:118:17:118:17 | access to local variable b : null [element] : Object | ExternalFlow.cs:119:18:119:18 | access to local variable b | provenance |  |
 | ExternalFlow.cs:118:17:118:17 | access to local variable b : null [element] : Object | ExternalFlow.cs:120:18:120:18 | access to local variable b : null [element] : Object | provenance |  |
 | ExternalFlow.cs:118:21:118:30 | call to method Reverse : null [element] : Object | ExternalFlow.cs:118:17:118:17 | access to local variable b : null [element] : Object | provenance |  |
 | ExternalFlow.cs:118:29:118:29 | access to local variable a : null [element] : Object | ExternalFlow.cs:118:21:118:30 | call to method Reverse : null [element] : Object | provenance | MaD:7 |
@@ -240,6 +241,7 @@ nodes
 | ExternalFlow.cs:118:17:118:17 | access to local variable b : null [element] : Object | semmle.label | access to local variable b : null [element] : Object |
 | ExternalFlow.cs:118:21:118:30 | call to method Reverse : null [element] : Object | semmle.label | call to method Reverse : null [element] : Object |
 | ExternalFlow.cs:118:29:118:29 | access to local variable a : null [element] : Object | semmle.label | access to local variable a : null [element] : Object |
+| ExternalFlow.cs:119:18:119:18 | access to local variable b | semmle.label | access to local variable b |
 | ExternalFlow.cs:120:18:120:18 | access to local variable b : null [element] : Object | semmle.label | access to local variable b : null [element] : Object |
 | ExternalFlow.cs:120:18:120:21 | access to array element | semmle.label | access to array element |
 | ExternalFlow.cs:205:17:205:18 | access to local variable o2 : Object | semmle.label | access to local variable o2 : Object |
@@ -315,6 +317,7 @@ invalidModelRow
 | ExternalFlow.cs:102:22:102:22 | access to parameter d | ExternalFlow.cs:98:24:98:35 | object creation of type Object : Object | ExternalFlow.cs:102:22:102:22 | access to parameter d | $@ | ExternalFlow.cs:98:24:98:35 | object creation of type Object : Object | object creation of type Object : Object |
 | ExternalFlow.cs:104:18:104:25 | access to field Field | ExternalFlow.cs:98:24:98:35 | object creation of type Object : Object | ExternalFlow.cs:104:18:104:25 | access to field Field | $@ | ExternalFlow.cs:98:24:98:35 | object creation of type Object : Object | object creation of type Object : Object |
 | ExternalFlow.cs:112:18:112:25 | access to property MyProp | ExternalFlow.cs:111:24:111:35 | object creation of type Object : Object | ExternalFlow.cs:112:18:112:25 | access to property MyProp | $@ | ExternalFlow.cs:111:24:111:35 | object creation of type Object : Object | object creation of type Object : Object |
+| ExternalFlow.cs:119:18:119:18 | access to local variable b | ExternalFlow.cs:117:36:117:47 | object creation of type Object : Object | ExternalFlow.cs:119:18:119:18 | access to local variable b | $@ | ExternalFlow.cs:117:36:117:47 | object creation of type Object : Object | object creation of type Object : Object |
 | ExternalFlow.cs:120:18:120:21 | access to array element | ExternalFlow.cs:117:36:117:47 | object creation of type Object : Object | ExternalFlow.cs:120:18:120:21 | access to array element | $@ | ExternalFlow.cs:117:36:117:47 | object creation of type Object : Object | object creation of type Object : Object |
 | ExternalFlow.cs:206:18:206:48 | call to method MixedFlowArgs | ExternalFlow.cs:205:22:205:33 | object creation of type Object : Object | ExternalFlow.cs:206:18:206:48 | call to method MixedFlowArgs | $@ | ExternalFlow.cs:205:22:205:33 | object creation of type Object : Object | object creation of type Object : Object |
 | ExternalFlow.cs:212:18:212:62 | call to method GeneratedFlowWithGeneratedNeutral | ExternalFlow.cs:211:22:211:33 | object creation of type Object : Object | ExternalFlow.cs:212:18:212:62 | call to method GeneratedFlowWithGeneratedNeutral | $@ | ExternalFlow.cs:211:22:211:33 | object creation of type Object : Object | object creation of type Object : Object |
diff --git a/csharp/ql/test/library-tests/dataflow/global/DataFlow.expected b/csharp/ql/test/library-tests/dataflow/global/DataFlow.expected
index 3180b00f205..743b754a97b 100644
--- a/csharp/ql/test/library-tests/dataflow/global/DataFlow.expected
+++ b/csharp/ql/test/library-tests/dataflow/global/DataFlow.expected
@@ -84,13 +84,12 @@
 | GlobalDataFlow.cs:547:15:547:21 | access to field field |
 | MultiImplementationA.cs:7:39:7:39 | access to parameter x |
 | MultiImplementationB.cs:5:39:5:39 | access to parameter x |
-| Splitting.cs:9:15:9:15 | [b (line 3): false] access to local variable x |
-| Splitting.cs:9:15:9:15 | [b (line 3): true] access to local variable x |
+| Splitting.cs:9:15:9:15 | access to local variable x |
 | Splitting.cs:11:19:11:19 | access to local variable x |
 | Splitting.cs:21:21:21:33 | call to method Return<String> |
-| Splitting.cs:32:15:32:15 | [b (line 24): false] access to local variable x |
-| Splitting.cs:32:15:32:15 | [b (line 24): true] access to local variable x |
+| Splitting.cs:32:15:32:15 | access to local variable x |
 | Splitting.cs:34:19:34:19 | access to local variable x |
 | Splitting.cs:41:19:41:19 | access to local variable s |
+| Splitting.cs:43:19:43:19 | access to local variable s |
 | Splitting.cs:50:19:50:19 | access to local variable s |
 | Splitting.cs:52:19:52:19 | access to local variable s |
diff --git a/csharp/ql/test/library-tests/dataflow/global/DataFlowPath.expected b/csharp/ql/test/library-tests/dataflow/global/DataFlowPath.expected
index 7333890f68f..81f76ca4dc0 100644
--- a/csharp/ql/test/library-tests/dataflow/global/DataFlowPath.expected
+++ b/csharp/ql/test/library-tests/dataflow/global/DataFlowPath.expected
@@ -464,17 +464,12 @@ edges
 | MultiImplementationA.cs:7:27:7:27 | x : String | MultiImplementationA.cs:7:39:7:39 | access to parameter x | provenance |  |
 | MultiImplementationB.cs:3:28:3:41 | "taint source" : String | MultiImplementationB.cs:5:27:5:27 | x : String | provenance |  |
 | MultiImplementationB.cs:5:27:5:27 | x : String | MultiImplementationB.cs:5:39:5:39 | access to parameter x | provenance |  |
-| Splitting.cs:3:28:3:34 | tainted : String | Splitting.cs:8:24:8:30 | [b (line 3): false] access to parameter tainted : String | provenance |  |
-| Splitting.cs:3:28:3:34 | tainted : String | Splitting.cs:8:24:8:30 | [b (line 3): true] access to parameter tainted : String | provenance |  |
-| Splitting.cs:8:13:8:13 | access to local variable x : String | Splitting.cs:9:15:9:15 | [b (line 3): false] access to local variable x | provenance |  |
-| Splitting.cs:8:13:8:13 | access to local variable x : String | Splitting.cs:9:15:9:15 | [b (line 3): true] access to local variable x | provenance |  |
+| Splitting.cs:3:28:3:34 | tainted : String | Splitting.cs:8:24:8:30 | access to parameter tainted : String | provenance |  |
+| Splitting.cs:8:13:8:13 | access to local variable x : String | Splitting.cs:9:15:9:15 | access to local variable x | provenance |  |
 | Splitting.cs:8:13:8:13 | access to local variable x : String | Splitting.cs:11:19:11:19 | access to local variable x | provenance |  |
-| Splitting.cs:8:17:8:31 | [b (line 3): false] call to method Return<String> : String | Splitting.cs:8:13:8:13 | access to local variable x : String | provenance |  |
-| Splitting.cs:8:17:8:31 | [b (line 3): true] call to method Return<String> : String | Splitting.cs:8:13:8:13 | access to local variable x : String | provenance |  |
-| Splitting.cs:8:24:8:30 | [b (line 3): false] access to parameter tainted : String | Splitting.cs:8:17:8:31 | [b (line 3): false] call to method Return<String> : String | provenance |  |
-| Splitting.cs:8:24:8:30 | [b (line 3): false] access to parameter tainted : String | Splitting.cs:16:26:16:26 | x : String | provenance |  |
-| Splitting.cs:8:24:8:30 | [b (line 3): true] access to parameter tainted : String | Splitting.cs:8:17:8:31 | [b (line 3): true] call to method Return<String> : String | provenance |  |
-| Splitting.cs:8:24:8:30 | [b (line 3): true] access to parameter tainted : String | Splitting.cs:16:26:16:26 | x : String | provenance |  |
+| Splitting.cs:8:17:8:31 | call to method Return<String> : String | Splitting.cs:8:13:8:13 | access to local variable x : String | provenance |  |
+| Splitting.cs:8:24:8:30 | access to parameter tainted : String | Splitting.cs:8:17:8:31 | call to method Return<String> : String | provenance |  |
+| Splitting.cs:8:24:8:30 | access to parameter tainted : String | Splitting.cs:16:26:16:26 | x : String | provenance |  |
 | Splitting.cs:16:26:16:26 | x : String | Splitting.cs:16:32:16:32 | access to parameter x : String | provenance |  |
 | Splitting.cs:18:24:18:24 | s : String | Splitting.cs:20:29:20:29 | access to parameter s : String | provenance |  |
 | Splitting.cs:20:29:20:29 | access to parameter s : String | Splitting.cs:16:26:16:26 | x : String | provenance |  |
@@ -482,23 +477,17 @@ edges
 | Splitting.cs:21:9:21:11 | value : String | Splitting.cs:21:28:21:32 | access to parameter value : String | provenance |  |
 | Splitting.cs:21:28:21:32 | access to parameter value : String | Splitting.cs:16:26:16:26 | x : String | provenance |  |
 | Splitting.cs:21:28:21:32 | access to parameter value : String | Splitting.cs:21:21:21:33 | call to method Return<String> | provenance |  |
-| Splitting.cs:24:28:24:34 | tainted : String | Splitting.cs:30:17:30:23 | [b (line 24): false] access to parameter tainted : String | provenance |  |
-| Splitting.cs:24:28:24:34 | tainted : String | Splitting.cs:30:17:30:23 | [b (line 24): true] access to parameter tainted : String | provenance |  |
-| Splitting.cs:24:28:24:34 | tainted : String | Splitting.cs:31:19:31:25 | [b (line 24): false] access to parameter tainted : String | provenance |  |
-| Splitting.cs:24:28:24:34 | tainted : String | Splitting.cs:31:19:31:25 | [b (line 24): true] access to parameter tainted : String | provenance |  |
-| Splitting.cs:30:17:30:23 | [b (line 24): false] access to parameter tainted : String | Splitting.cs:21:9:21:11 | value : String | provenance |  |
-| Splitting.cs:30:17:30:23 | [b (line 24): true] access to parameter tainted : String | Splitting.cs:21:9:21:11 | value : String | provenance |  |
-| Splitting.cs:31:13:31:13 | access to local variable x : String | Splitting.cs:32:15:32:15 | [b (line 24): false] access to local variable x | provenance |  |
-| Splitting.cs:31:13:31:13 | access to local variable x : String | Splitting.cs:32:15:32:15 | [b (line 24): true] access to local variable x | provenance |  |
+| Splitting.cs:24:28:24:34 | tainted : String | Splitting.cs:30:17:30:23 | access to parameter tainted : String | provenance |  |
+| Splitting.cs:24:28:24:34 | tainted : String | Splitting.cs:31:19:31:25 | access to parameter tainted : String | provenance |  |
+| Splitting.cs:30:17:30:23 | access to parameter tainted : String | Splitting.cs:21:9:21:11 | value : String | provenance |  |
+| Splitting.cs:31:13:31:13 | access to local variable x : String | Splitting.cs:32:15:32:15 | access to local variable x | provenance |  |
 | Splitting.cs:31:13:31:13 | access to local variable x : String | Splitting.cs:34:19:34:19 | access to local variable x | provenance |  |
-| Splitting.cs:31:17:31:26 | [b (line 24): false] dynamic access to element : String | Splitting.cs:31:13:31:13 | access to local variable x : String | provenance |  |
-| Splitting.cs:31:17:31:26 | [b (line 24): true] dynamic access to element : String | Splitting.cs:31:13:31:13 | access to local variable x : String | provenance |  |
-| Splitting.cs:31:19:31:25 | [b (line 24): false] access to parameter tainted : String | Splitting.cs:18:24:18:24 | s : String | provenance |  |
-| Splitting.cs:31:19:31:25 | [b (line 24): false] access to parameter tainted : String | Splitting.cs:31:17:31:26 | [b (line 24): false] dynamic access to element : String | provenance |  |
-| Splitting.cs:31:19:31:25 | [b (line 24): true] access to parameter tainted : String | Splitting.cs:18:24:18:24 | s : String | provenance |  |
-| Splitting.cs:31:19:31:25 | [b (line 24): true] access to parameter tainted : String | Splitting.cs:31:17:31:26 | [b (line 24): true] dynamic access to element : String | provenance |  |
+| Splitting.cs:31:17:31:26 | dynamic access to element : String | Splitting.cs:31:13:31:13 | access to local variable x : String | provenance |  |
+| Splitting.cs:31:19:31:25 | access to parameter tainted : String | Splitting.cs:18:24:18:24 | s : String | provenance |  |
+| Splitting.cs:31:19:31:25 | access to parameter tainted : String | Splitting.cs:31:17:31:26 | dynamic access to element : String | provenance |  |
 | Splitting.cs:39:13:39:13 | access to local variable s : String | Splitting.cs:41:19:41:19 | access to local variable s | provenance |  |
-| Splitting.cs:39:21:39:34 | [b (line 37): true] "taint source" : String | Splitting.cs:39:13:39:13 | access to local variable s : String | provenance |  |
+| Splitting.cs:39:13:39:13 | access to local variable s : String | Splitting.cs:43:19:43:19 | access to local variable s | provenance |  |
+| Splitting.cs:39:21:39:34 | "taint source" : String | Splitting.cs:39:13:39:13 | access to local variable s : String | provenance |  |
 | Splitting.cs:48:13:48:13 | access to local variable s : String | Splitting.cs:50:19:50:19 | access to local variable s | provenance |  |
 | Splitting.cs:48:13:48:13 | access to local variable s : String | Splitting.cs:52:19:52:19 | access to local variable s | provenance |  |
 | Splitting.cs:48:36:48:49 | "taint source" : String | Splitting.cs:48:13:48:13 | access to local variable s : String | provenance |  |
@@ -919,13 +908,9 @@ nodes
 | MultiImplementationB.cs:5:39:5:39 | access to parameter x | semmle.label | access to parameter x |
 | Splitting.cs:3:28:3:34 | tainted : String | semmle.label | tainted : String |
 | Splitting.cs:8:13:8:13 | access to local variable x : String | semmle.label | access to local variable x : String |
-| Splitting.cs:8:13:8:13 | access to local variable x : String | semmle.label | access to local variable x : String |
-| Splitting.cs:8:17:8:31 | [b (line 3): false] call to method Return<String> : String | semmle.label | [b (line 3): false] call to method Return<String> : String |
-| Splitting.cs:8:17:8:31 | [b (line 3): true] call to method Return<String> : String | semmle.label | [b (line 3): true] call to method Return<String> : String |
-| Splitting.cs:8:24:8:30 | [b (line 3): false] access to parameter tainted : String | semmle.label | [b (line 3): false] access to parameter tainted : String |
-| Splitting.cs:8:24:8:30 | [b (line 3): true] access to parameter tainted : String | semmle.label | [b (line 3): true] access to parameter tainted : String |
-| Splitting.cs:9:15:9:15 | [b (line 3): false] access to local variable x | semmle.label | [b (line 3): false] access to local variable x |
-| Splitting.cs:9:15:9:15 | [b (line 3): true] access to local variable x | semmle.label | [b (line 3): true] access to local variable x |
+| Splitting.cs:8:17:8:31 | call to method Return<String> : String | semmle.label | call to method Return<String> : String |
+| Splitting.cs:8:24:8:30 | access to parameter tainted : String | semmle.label | access to parameter tainted : String |
+| Splitting.cs:9:15:9:15 | access to local variable x | semmle.label | access to local variable x |
 | Splitting.cs:11:19:11:19 | access to local variable x | semmle.label | access to local variable x |
 | Splitting.cs:16:26:16:26 | x : String | semmle.label | x : String |
 | Splitting.cs:16:32:16:32 | access to parameter x : String | semmle.label | access to parameter x : String |
@@ -936,20 +921,16 @@ nodes
 | Splitting.cs:21:21:21:33 | call to method Return<String> | semmle.label | call to method Return<String> |
 | Splitting.cs:21:28:21:32 | access to parameter value : String | semmle.label | access to parameter value : String |
 | Splitting.cs:24:28:24:34 | tainted : String | semmle.label | tainted : String |
-| Splitting.cs:30:17:30:23 | [b (line 24): false] access to parameter tainted : String | semmle.label | [b (line 24): false] access to parameter tainted : String |
-| Splitting.cs:30:17:30:23 | [b (line 24): true] access to parameter tainted : String | semmle.label | [b (line 24): true] access to parameter tainted : String |
+| Splitting.cs:30:17:30:23 | access to parameter tainted : String | semmle.label | access to parameter tainted : String |
 | Splitting.cs:31:13:31:13 | access to local variable x : String | semmle.label | access to local variable x : String |
-| Splitting.cs:31:13:31:13 | access to local variable x : String | semmle.label | access to local variable x : String |
-| Splitting.cs:31:17:31:26 | [b (line 24): false] dynamic access to element : String | semmle.label | [b (line 24): false] dynamic access to element : String |
-| Splitting.cs:31:17:31:26 | [b (line 24): true] dynamic access to element : String | semmle.label | [b (line 24): true] dynamic access to element : String |
-| Splitting.cs:31:19:31:25 | [b (line 24): false] access to parameter tainted : String | semmle.label | [b (line 24): false] access to parameter tainted : String |
-| Splitting.cs:31:19:31:25 | [b (line 24): true] access to parameter tainted : String | semmle.label | [b (line 24): true] access to parameter tainted : String |
-| Splitting.cs:32:15:32:15 | [b (line 24): false] access to local variable x | semmle.label | [b (line 24): false] access to local variable x |
-| Splitting.cs:32:15:32:15 | [b (line 24): true] access to local variable x | semmle.label | [b (line 24): true] access to local variable x |
+| Splitting.cs:31:17:31:26 | dynamic access to element : String | semmle.label | dynamic access to element : String |
+| Splitting.cs:31:19:31:25 | access to parameter tainted : String | semmle.label | access to parameter tainted : String |
+| Splitting.cs:32:15:32:15 | access to local variable x | semmle.label | access to local variable x |
 | Splitting.cs:34:19:34:19 | access to local variable x | semmle.label | access to local variable x |
 | Splitting.cs:39:13:39:13 | access to local variable s : String | semmle.label | access to local variable s : String |
-| Splitting.cs:39:21:39:34 | [b (line 37): true] "taint source" : String | semmle.label | [b (line 37): true] "taint source" : String |
+| Splitting.cs:39:21:39:34 | "taint source" : String | semmle.label | "taint source" : String |
 | Splitting.cs:41:19:41:19 | access to local variable s | semmle.label | access to local variable s |
+| Splitting.cs:43:19:43:19 | access to local variable s | semmle.label | access to local variable s |
 | Splitting.cs:48:13:48:13 | access to local variable s : String | semmle.label | access to local variable s : String |
 | Splitting.cs:48:36:48:49 | "taint source" : String | semmle.label | "taint source" : String |
 | Splitting.cs:50:19:50:19 | access to local variable s | semmle.label | access to local variable s |
@@ -984,17 +965,11 @@ subpaths
 | GlobalDataFlow.cs:389:18:389:18 | access to parameter x : String | GlobalDataFlow.cs:298:26:298:26 | x : String | GlobalDataFlow.cs:301:16:301:41 | ... ? ... : ... : String | GlobalDataFlow.cs:389:16:389:19 | delegate call : String |
 | GlobalDataFlow.cs:389:18:389:18 | access to parameter x : String | GlobalDataFlow.cs:300:27:300:28 | x0 : String | GlobalDataFlow.cs:300:33:300:34 | access to parameter x0 : String | GlobalDataFlow.cs:389:16:389:19 | delegate call : String |
 | GlobalDataFlow.cs:558:46:558:46 | access to local variable x : String | GlobalDataFlow.cs:81:79:81:79 | x : String | GlobalDataFlow.cs:81:84:81:84 | access to parameter x : String | GlobalDataFlow.cs:558:44:558:47 | delegate call : String |
-| Splitting.cs:8:24:8:30 | [b (line 3): false] access to parameter tainted : String | Splitting.cs:16:26:16:26 | x : String | Splitting.cs:16:32:16:32 | access to parameter x : String | Splitting.cs:8:17:8:31 | [b (line 3): false] call to method Return<String> : String |
-| Splitting.cs:8:24:8:30 | [b (line 3): true] access to parameter tainted : String | Splitting.cs:16:26:16:26 | x : String | Splitting.cs:16:32:16:32 | access to parameter x : String | Splitting.cs:8:17:8:31 | [b (line 3): true] call to method Return<String> : String |
+| Splitting.cs:8:24:8:30 | access to parameter tainted : String | Splitting.cs:16:26:16:26 | x : String | Splitting.cs:16:32:16:32 | access to parameter x : String | Splitting.cs:8:17:8:31 | call to method Return<String> : String |
 | Splitting.cs:20:29:20:29 | access to parameter s : String | Splitting.cs:16:26:16:26 | x : String | Splitting.cs:16:32:16:32 | access to parameter x : String | Splitting.cs:20:22:20:30 | call to method Return<String> : String |
 | Splitting.cs:21:28:21:32 | access to parameter value : String | Splitting.cs:16:26:16:26 | x : String | Splitting.cs:16:32:16:32 | access to parameter x : String | Splitting.cs:21:21:21:33 | call to method Return<String> |
-| Splitting.cs:31:19:31:25 | [b (line 24): false] access to parameter tainted : String | Splitting.cs:18:24:18:24 | s : String | Splitting.cs:20:22:20:30 | call to method Return<String> : String | Splitting.cs:31:17:31:26 | [b (line 24): false] dynamic access to element : String |
-| Splitting.cs:31:19:31:25 | [b (line 24): true] access to parameter tainted : String | Splitting.cs:18:24:18:24 | s : String | Splitting.cs:20:22:20:30 | call to method Return<String> : String | Splitting.cs:31:17:31:26 | [b (line 24): true] dynamic access to element : String |
+| Splitting.cs:31:19:31:25 | access to parameter tainted : String | Splitting.cs:18:24:18:24 | s : String | Splitting.cs:20:22:20:30 | call to method Return<String> : String | Splitting.cs:31:17:31:26 | dynamic access to element : String |
 #select
-| Splitting.cs:32:15:32:15 | [b (line 24): false] access to local variable x | Splitting.cs:24:28:24:34 | tainted : String | Splitting.cs:32:15:32:15 | [b (line 24): false] access to local variable x | [b (line 24): false] access to local variable x |
-| Splitting.cs:32:15:32:15 | [b (line 24): true] access to local variable x | Splitting.cs:24:28:24:34 | tainted : String | Splitting.cs:32:15:32:15 | [b (line 24): true] access to local variable x | [b (line 24): true] access to local variable x |
-| Splitting.cs:9:15:9:15 | [b (line 3): false] access to local variable x | Splitting.cs:3:28:3:34 | tainted : String | Splitting.cs:9:15:9:15 | [b (line 3): false] access to local variable x | [b (line 3): false] access to local variable x |
-| Splitting.cs:9:15:9:15 | [b (line 3): true] access to local variable x | Splitting.cs:3:28:3:34 | tainted : String | Splitting.cs:9:15:9:15 | [b (line 3): true] access to local variable x | [b (line 3): true] access to local variable x |
 | Capture.cs:246:19:246:25 | access to field Field | Capture.cs:242:19:242:32 | "taint source" : String | Capture.cs:246:19:246:25 | access to field Field | access to field Field |
 | Capture.cs:251:15:251:21 | access to field Field | Capture.cs:242:19:242:32 | "taint source" : String | Capture.cs:251:15:251:21 | access to field Field | access to field Field |
 | Capture.cs:251:15:251:21 | access to field Field | Capture.cs:247:23:247:36 | "taint source" : String | Capture.cs:251:15:251:21 | access to field Field | access to field Field |
@@ -1016,7 +991,8 @@ subpaths
 | GlobalDataFlow.cs:533:15:533:21 | access to field field | GlobalDataFlow.cs:483:20:483:33 | "taint source" : String | GlobalDataFlow.cs:533:15:533:21 | access to field field | access to field field |
 | GlobalDataFlow.cs:539:15:539:22 | access to field field | GlobalDataFlow.cs:483:20:483:33 | "taint source" : String | GlobalDataFlow.cs:539:15:539:22 | access to field field | access to field field |
 | GlobalDataFlow.cs:547:15:547:21 | access to field field | GlobalDataFlow.cs:483:20:483:33 | "taint source" : String | GlobalDataFlow.cs:547:15:547:21 | access to field field | access to field field |
-| Splitting.cs:41:19:41:19 | access to local variable s | Splitting.cs:39:21:39:34 | [b (line 37): true] "taint source" : String | Splitting.cs:41:19:41:19 | access to local variable s | access to local variable s |
+| Splitting.cs:41:19:41:19 | access to local variable s | Splitting.cs:39:21:39:34 | "taint source" : String | Splitting.cs:41:19:41:19 | access to local variable s | access to local variable s |
+| Splitting.cs:43:19:43:19 | access to local variable s | Splitting.cs:39:21:39:34 | "taint source" : String | Splitting.cs:43:19:43:19 | access to local variable s | access to local variable s |
 | Splitting.cs:50:19:50:19 | access to local variable s | Splitting.cs:48:36:48:49 | "taint source" : String | Splitting.cs:50:19:50:19 | access to local variable s | access to local variable s |
 | Splitting.cs:52:19:52:19 | access to local variable s | Splitting.cs:48:36:48:49 | "taint source" : String | Splitting.cs:52:19:52:19 | access to local variable s | access to local variable s |
 | GlobalDataFlow.cs:72:15:72:19 | access to local variable sink0 | GlobalDataFlow.cs:18:27:18:40 | "taint source" : String | GlobalDataFlow.cs:72:15:72:19 | access to local variable sink0 | access to local variable sink0 |
@@ -1068,7 +1044,9 @@ subpaths
 | Capture.cs:319:19:319:19 | access to local variable x | Capture.cs:318:17:318:30 | "taint source" : String | Capture.cs:319:19:319:19 | access to local variable x | access to local variable x |
 | Capture.cs:330:47:330:47 | access to local variable x | Capture.cs:328:17:328:30 | "taint source" : String | Capture.cs:330:47:330:47 | access to local variable x | access to local variable x |
 | Capture.cs:341:45:341:45 | access to local variable x | Capture.cs:339:17:339:30 | "taint source" : String | Capture.cs:341:45:341:45 | access to local variable x | access to local variable x |
+| Splitting.cs:9:15:9:15 | access to local variable x | Splitting.cs:3:28:3:34 | tainted : String | Splitting.cs:9:15:9:15 | access to local variable x | access to local variable x |
 | Splitting.cs:11:19:11:19 | access to local variable x | Splitting.cs:3:28:3:34 | tainted : String | Splitting.cs:11:19:11:19 | access to local variable x | access to local variable x |
+| Splitting.cs:32:15:32:15 | access to local variable x | Splitting.cs:24:28:24:34 | tainted : String | Splitting.cs:32:15:32:15 | access to local variable x | access to local variable x |
 | Splitting.cs:34:19:34:19 | access to local variable x | Splitting.cs:24:28:24:34 | tainted : String | Splitting.cs:34:19:34:19 | access to local variable x | access to local variable x |
 | Capture.cs:206:19:206:19 | access to parameter s | Capture.cs:211:21:211:34 | "taint source" : String | Capture.cs:206:19:206:19 | access to parameter s | access to parameter s |
 | Capture.cs:217:19:217:19 | access to parameter s | Capture.cs:221:21:221:34 | "taint source" : String | Capture.cs:217:19:217:19 | access to parameter s | access to parameter s |
diff --git a/csharp/ql/test/library-tests/dataflow/global/GetAnOutNode.expected b/csharp/ql/test/library-tests/dataflow/global/GetAnOutNode.expected
index 643b3e81350..db91ca3e73f 100644
--- a/csharp/ql/test/library-tests/dataflow/global/GetAnOutNode.expected
+++ b/csharp/ql/test/library-tests/dataflow/global/GetAnOutNode.expected
@@ -184,16 +184,12 @@
 | MultiImplementationA.cs:3:7:3:15 | call to constructor Object | normal | MultiImplementationA.cs:3:7:3:15 | call to constructor Object |
 | MultiImplementationB.cs:1:7:1:15 | call to constructor Object | normal | MultiImplementationB.cs:1:7:1:15 | call to constructor Object |
 | Splitting.cs:1:7:1:15 | call to constructor Object | normal | Splitting.cs:1:7:1:15 | call to constructor Object |
-| Splitting.cs:8:17:8:31 | [b (line 3): false] call to method Return<String> | normal | Splitting.cs:8:17:8:31 | [b (line 3): false] call to method Return<String> |
-| Splitting.cs:8:17:8:31 | [b (line 3): true] call to method Return<String> | normal | Splitting.cs:8:17:8:31 | [b (line 3): true] call to method Return<String> |
+| Splitting.cs:8:17:8:31 | call to method Return<String> | normal | Splitting.cs:8:17:8:31 | call to method Return<String> |
 | Splitting.cs:20:22:20:30 | call to method Return<String> | normal | Splitting.cs:20:22:20:30 | call to method Return<String> |
 | Splitting.cs:21:21:21:33 | call to method Return<String> | normal | Splitting.cs:21:21:21:33 | call to method Return<String> |
-| Splitting.cs:30:9:30:13 | [b (line 24): false] dynamic access to element | normal | Splitting.cs:30:9:30:13 | [b (line 24): false] dynamic access to element |
-| Splitting.cs:30:9:30:13 | [b (line 24): true] dynamic access to element | normal | Splitting.cs:30:9:30:13 | [b (line 24): true] dynamic access to element |
-| Splitting.cs:31:17:31:26 | [b (line 24): false] dynamic access to element | normal | Splitting.cs:31:17:31:26 | [b (line 24): false] dynamic access to element |
-| Splitting.cs:31:17:31:26 | [b (line 24): true] dynamic access to element | normal | Splitting.cs:31:17:31:26 | [b (line 24): true] dynamic access to element |
-| Splitting.cs:32:9:32:16 | [b (line 24): false] dynamic call to method Check | normal | Splitting.cs:32:9:32:16 | [b (line 24): false] dynamic call to method Check |
-| Splitting.cs:32:9:32:16 | [b (line 24): true] dynamic call to method Check | normal | Splitting.cs:32:9:32:16 | [b (line 24): true] dynamic call to method Check |
+| Splitting.cs:30:9:30:13 | dynamic access to element | normal | Splitting.cs:30:9:30:13 | dynamic access to element |
+| Splitting.cs:31:17:31:26 | dynamic access to element | normal | Splitting.cs:31:17:31:26 | dynamic access to element |
+| Splitting.cs:32:9:32:16 | dynamic call to method Check | normal | Splitting.cs:32:9:32:16 | dynamic call to method Check |
 | Splitting.cs:34:13:34:20 | dynamic call to method Check | normal | Splitting.cs:34:13:34:20 | dynamic call to method Check |
 | This.cs:7:5:7:8 | call to constructor Object | normal | This.cs:7:5:7:8 | call to constructor Object |
 | This.cs:17:9:17:18 | object creation of type This | normal | This.cs:17:9:17:18 | object creation of type This |
diff --git a/csharp/ql/test/library-tests/dataflow/global/TaintTracking.expected b/csharp/ql/test/library-tests/dataflow/global/TaintTracking.expected
index 8a68b204e02..aa37485069a 100644
--- a/csharp/ql/test/library-tests/dataflow/global/TaintTracking.expected
+++ b/csharp/ql/test/library-tests/dataflow/global/TaintTracking.expected
@@ -94,13 +94,12 @@
 | GlobalDataFlowStringBuilder.cs:50:15:50:19 | access to local variable sink3 |
 | MultiImplementationA.cs:7:39:7:39 | access to parameter x |
 | MultiImplementationB.cs:5:39:5:39 | access to parameter x |
-| Splitting.cs:9:15:9:15 | [b (line 3): false] access to local variable x |
-| Splitting.cs:9:15:9:15 | [b (line 3): true] access to local variable x |
+| Splitting.cs:9:15:9:15 | access to local variable x |
 | Splitting.cs:11:19:11:19 | access to local variable x |
 | Splitting.cs:21:21:21:33 | call to method Return<String> |
-| Splitting.cs:32:15:32:15 | [b (line 24): false] access to local variable x |
-| Splitting.cs:32:15:32:15 | [b (line 24): true] access to local variable x |
+| Splitting.cs:32:15:32:15 | access to local variable x |
 | Splitting.cs:34:19:34:19 | access to local variable x |
 | Splitting.cs:41:19:41:19 | access to local variable s |
+| Splitting.cs:43:19:43:19 | access to local variable s |
 | Splitting.cs:50:19:50:19 | access to local variable s |
 | Splitting.cs:52:19:52:19 | access to local variable s |
diff --git a/csharp/ql/test/library-tests/dataflow/global/TaintTrackingPath.expected b/csharp/ql/test/library-tests/dataflow/global/TaintTrackingPath.expected
index 8fcf385a4f5..7a6f90e961d 100644
--- a/csharp/ql/test/library-tests/dataflow/global/TaintTrackingPath.expected
+++ b/csharp/ql/test/library-tests/dataflow/global/TaintTrackingPath.expected
@@ -536,17 +536,12 @@ edges
 | MultiImplementationA.cs:7:27:7:27 | x : String | MultiImplementationA.cs:7:39:7:39 | access to parameter x | provenance |  |
 | MultiImplementationB.cs:3:28:3:41 | "taint source" : String | MultiImplementationB.cs:5:27:5:27 | x : String | provenance |  |
 | MultiImplementationB.cs:5:27:5:27 | x : String | MultiImplementationB.cs:5:39:5:39 | access to parameter x | provenance |  |
-| Splitting.cs:3:28:3:34 | tainted : String | Splitting.cs:8:24:8:30 | [b (line 3): false] access to parameter tainted : String | provenance |  |
-| Splitting.cs:3:28:3:34 | tainted : String | Splitting.cs:8:24:8:30 | [b (line 3): true] access to parameter tainted : String | provenance |  |
-| Splitting.cs:8:13:8:13 | access to local variable x : String | Splitting.cs:9:15:9:15 | [b (line 3): false] access to local variable x | provenance |  |
-| Splitting.cs:8:13:8:13 | access to local variable x : String | Splitting.cs:9:15:9:15 | [b (line 3): true] access to local variable x | provenance |  |
+| Splitting.cs:3:28:3:34 | tainted : String | Splitting.cs:8:24:8:30 | access to parameter tainted : String | provenance |  |
+| Splitting.cs:8:13:8:13 | access to local variable x : String | Splitting.cs:9:15:9:15 | access to local variable x | provenance |  |
 | Splitting.cs:8:13:8:13 | access to local variable x : String | Splitting.cs:11:19:11:19 | access to local variable x | provenance |  |
-| Splitting.cs:8:17:8:31 | [b (line 3): false] call to method Return<String> : String | Splitting.cs:8:13:8:13 | access to local variable x : String | provenance |  |
-| Splitting.cs:8:17:8:31 | [b (line 3): true] call to method Return<String> : String | Splitting.cs:8:13:8:13 | access to local variable x : String | provenance |  |
-| Splitting.cs:8:24:8:30 | [b (line 3): false] access to parameter tainted : String | Splitting.cs:8:17:8:31 | [b (line 3): false] call to method Return<String> : String | provenance |  |
-| Splitting.cs:8:24:8:30 | [b (line 3): false] access to parameter tainted : String | Splitting.cs:16:26:16:26 | x : String | provenance |  |
-| Splitting.cs:8:24:8:30 | [b (line 3): true] access to parameter tainted : String | Splitting.cs:8:17:8:31 | [b (line 3): true] call to method Return<String> : String | provenance |  |
-| Splitting.cs:8:24:8:30 | [b (line 3): true] access to parameter tainted : String | Splitting.cs:16:26:16:26 | x : String | provenance |  |
+| Splitting.cs:8:17:8:31 | call to method Return<String> : String | Splitting.cs:8:13:8:13 | access to local variable x : String | provenance |  |
+| Splitting.cs:8:24:8:30 | access to parameter tainted : String | Splitting.cs:8:17:8:31 | call to method Return<String> : String | provenance |  |
+| Splitting.cs:8:24:8:30 | access to parameter tainted : String | Splitting.cs:16:26:16:26 | x : String | provenance |  |
 | Splitting.cs:16:26:16:26 | x : String | Splitting.cs:16:32:16:32 | access to parameter x : String | provenance |  |
 | Splitting.cs:18:24:18:24 | s : String | Splitting.cs:20:29:20:29 | access to parameter s : String | provenance |  |
 | Splitting.cs:20:29:20:29 | access to parameter s : String | Splitting.cs:16:26:16:26 | x : String | provenance |  |
@@ -554,23 +549,17 @@ edges
 | Splitting.cs:21:9:21:11 | value : String | Splitting.cs:21:28:21:32 | access to parameter value : String | provenance |  |
 | Splitting.cs:21:28:21:32 | access to parameter value : String | Splitting.cs:16:26:16:26 | x : String | provenance |  |
 | Splitting.cs:21:28:21:32 | access to parameter value : String | Splitting.cs:21:21:21:33 | call to method Return<String> | provenance |  |
-| Splitting.cs:24:28:24:34 | tainted : String | Splitting.cs:30:17:30:23 | [b (line 24): false] access to parameter tainted : String | provenance |  |
-| Splitting.cs:24:28:24:34 | tainted : String | Splitting.cs:30:17:30:23 | [b (line 24): true] access to parameter tainted : String | provenance |  |
-| Splitting.cs:24:28:24:34 | tainted : String | Splitting.cs:31:19:31:25 | [b (line 24): false] access to parameter tainted : String | provenance |  |
-| Splitting.cs:24:28:24:34 | tainted : String | Splitting.cs:31:19:31:25 | [b (line 24): true] access to parameter tainted : String | provenance |  |
-| Splitting.cs:30:17:30:23 | [b (line 24): false] access to parameter tainted : String | Splitting.cs:21:9:21:11 | value : String | provenance |  |
-| Splitting.cs:30:17:30:23 | [b (line 24): true] access to parameter tainted : String | Splitting.cs:21:9:21:11 | value : String | provenance |  |
-| Splitting.cs:31:13:31:13 | access to local variable x : String | Splitting.cs:32:15:32:15 | [b (line 24): false] access to local variable x | provenance |  |
-| Splitting.cs:31:13:31:13 | access to local variable x : String | Splitting.cs:32:15:32:15 | [b (line 24): true] access to local variable x | provenance |  |
+| Splitting.cs:24:28:24:34 | tainted : String | Splitting.cs:30:17:30:23 | access to parameter tainted : String | provenance |  |
+| Splitting.cs:24:28:24:34 | tainted : String | Splitting.cs:31:19:31:25 | access to parameter tainted : String | provenance |  |
+| Splitting.cs:30:17:30:23 | access to parameter tainted : String | Splitting.cs:21:9:21:11 | value : String | provenance |  |
+| Splitting.cs:31:13:31:13 | access to local variable x : String | Splitting.cs:32:15:32:15 | access to local variable x | provenance |  |
 | Splitting.cs:31:13:31:13 | access to local variable x : String | Splitting.cs:34:19:34:19 | access to local variable x | provenance |  |
-| Splitting.cs:31:17:31:26 | [b (line 24): false] dynamic access to element : String | Splitting.cs:31:13:31:13 | access to local variable x : String | provenance |  |
-| Splitting.cs:31:17:31:26 | [b (line 24): true] dynamic access to element : String | Splitting.cs:31:13:31:13 | access to local variable x : String | provenance |  |
-| Splitting.cs:31:19:31:25 | [b (line 24): false] access to parameter tainted : String | Splitting.cs:18:24:18:24 | s : String | provenance |  |
-| Splitting.cs:31:19:31:25 | [b (line 24): false] access to parameter tainted : String | Splitting.cs:31:17:31:26 | [b (line 24): false] dynamic access to element : String | provenance |  |
-| Splitting.cs:31:19:31:25 | [b (line 24): true] access to parameter tainted : String | Splitting.cs:18:24:18:24 | s : String | provenance |  |
-| Splitting.cs:31:19:31:25 | [b (line 24): true] access to parameter tainted : String | Splitting.cs:31:17:31:26 | [b (line 24): true] dynamic access to element : String | provenance |  |
+| Splitting.cs:31:17:31:26 | dynamic access to element : String | Splitting.cs:31:13:31:13 | access to local variable x : String | provenance |  |
+| Splitting.cs:31:19:31:25 | access to parameter tainted : String | Splitting.cs:18:24:18:24 | s : String | provenance |  |
+| Splitting.cs:31:19:31:25 | access to parameter tainted : String | Splitting.cs:31:17:31:26 | dynamic access to element : String | provenance |  |
 | Splitting.cs:39:13:39:13 | access to local variable s : String | Splitting.cs:41:19:41:19 | access to local variable s | provenance |  |
-| Splitting.cs:39:21:39:34 | [b (line 37): true] "taint source" : String | Splitting.cs:39:13:39:13 | access to local variable s : String | provenance |  |
+| Splitting.cs:39:13:39:13 | access to local variable s : String | Splitting.cs:43:19:43:19 | access to local variable s | provenance |  |
+| Splitting.cs:39:21:39:34 | "taint source" : String | Splitting.cs:39:13:39:13 | access to local variable s : String | provenance |  |
 | Splitting.cs:48:13:48:13 | access to local variable s : String | Splitting.cs:50:19:50:19 | access to local variable s | provenance |  |
 | Splitting.cs:48:13:48:13 | access to local variable s : String | Splitting.cs:52:19:52:19 | access to local variable s | provenance |  |
 | Splitting.cs:48:36:48:49 | "taint source" : String | Splitting.cs:48:13:48:13 | access to local variable s : String | provenance |  |
@@ -1056,13 +1045,9 @@ nodes
 | MultiImplementationB.cs:5:39:5:39 | access to parameter x | semmle.label | access to parameter x |
 | Splitting.cs:3:28:3:34 | tainted : String | semmle.label | tainted : String |
 | Splitting.cs:8:13:8:13 | access to local variable x : String | semmle.label | access to local variable x : String |
-| Splitting.cs:8:13:8:13 | access to local variable x : String | semmle.label | access to local variable x : String |
-| Splitting.cs:8:17:8:31 | [b (line 3): false] call to method Return<String> : String | semmle.label | [b (line 3): false] call to method Return<String> : String |
-| Splitting.cs:8:17:8:31 | [b (line 3): true] call to method Return<String> : String | semmle.label | [b (line 3): true] call to method Return<String> : String |
-| Splitting.cs:8:24:8:30 | [b (line 3): false] access to parameter tainted : String | semmle.label | [b (line 3): false] access to parameter tainted : String |
-| Splitting.cs:8:24:8:30 | [b (line 3): true] access to parameter tainted : String | semmle.label | [b (line 3): true] access to parameter tainted : String |
-| Splitting.cs:9:15:9:15 | [b (line 3): false] access to local variable x | semmle.label | [b (line 3): false] access to local variable x |
-| Splitting.cs:9:15:9:15 | [b (line 3): true] access to local variable x | semmle.label | [b (line 3): true] access to local variable x |
+| Splitting.cs:8:17:8:31 | call to method Return<String> : String | semmle.label | call to method Return<String> : String |
+| Splitting.cs:8:24:8:30 | access to parameter tainted : String | semmle.label | access to parameter tainted : String |
+| Splitting.cs:9:15:9:15 | access to local variable x | semmle.label | access to local variable x |
 | Splitting.cs:11:19:11:19 | access to local variable x | semmle.label | access to local variable x |
 | Splitting.cs:16:26:16:26 | x : String | semmle.label | x : String |
 | Splitting.cs:16:32:16:32 | access to parameter x : String | semmle.label | access to parameter x : String |
@@ -1073,20 +1058,16 @@ nodes
 | Splitting.cs:21:21:21:33 | call to method Return<String> | semmle.label | call to method Return<String> |
 | Splitting.cs:21:28:21:32 | access to parameter value : String | semmle.label | access to parameter value : String |
 | Splitting.cs:24:28:24:34 | tainted : String | semmle.label | tainted : String |
-| Splitting.cs:30:17:30:23 | [b (line 24): false] access to parameter tainted : String | semmle.label | [b (line 24): false] access to parameter tainted : String |
-| Splitting.cs:30:17:30:23 | [b (line 24): true] access to parameter tainted : String | semmle.label | [b (line 24): true] access to parameter tainted : String |
+| Splitting.cs:30:17:30:23 | access to parameter tainted : String | semmle.label | access to parameter tainted : String |
 | Splitting.cs:31:13:31:13 | access to local variable x : String | semmle.label | access to local variable x : String |
-| Splitting.cs:31:13:31:13 | access to local variable x : String | semmle.label | access to local variable x : String |
-| Splitting.cs:31:17:31:26 | [b (line 24): false] dynamic access to element : String | semmle.label | [b (line 24): false] dynamic access to element : String |
-| Splitting.cs:31:17:31:26 | [b (line 24): true] dynamic access to element : String | semmle.label | [b (line 24): true] dynamic access to element : String |
-| Splitting.cs:31:19:31:25 | [b (line 24): false] access to parameter tainted : String | semmle.label | [b (line 24): false] access to parameter tainted : String |
-| Splitting.cs:31:19:31:25 | [b (line 24): true] access to parameter tainted : String | semmle.label | [b (line 24): true] access to parameter tainted : String |
-| Splitting.cs:32:15:32:15 | [b (line 24): false] access to local variable x | semmle.label | [b (line 24): false] access to local variable x |
-| Splitting.cs:32:15:32:15 | [b (line 24): true] access to local variable x | semmle.label | [b (line 24): true] access to local variable x |
+| Splitting.cs:31:17:31:26 | dynamic access to element : String | semmle.label | dynamic access to element : String |
+| Splitting.cs:31:19:31:25 | access to parameter tainted : String | semmle.label | access to parameter tainted : String |
+| Splitting.cs:32:15:32:15 | access to local variable x | semmle.label | access to local variable x |
 | Splitting.cs:34:19:34:19 | access to local variable x | semmle.label | access to local variable x |
 | Splitting.cs:39:13:39:13 | access to local variable s : String | semmle.label | access to local variable s : String |
-| Splitting.cs:39:21:39:34 | [b (line 37): true] "taint source" : String | semmle.label | [b (line 37): true] "taint source" : String |
+| Splitting.cs:39:21:39:34 | "taint source" : String | semmle.label | "taint source" : String |
 | Splitting.cs:41:19:41:19 | access to local variable s | semmle.label | access to local variable s |
+| Splitting.cs:43:19:43:19 | access to local variable s | semmle.label | access to local variable s |
 | Splitting.cs:48:13:48:13 | access to local variable s : String | semmle.label | access to local variable s : String |
 | Splitting.cs:48:36:48:49 | "taint source" : String | semmle.label | "taint source" : String |
 | Splitting.cs:50:19:50:19 | access to local variable s | semmle.label | access to local variable s |
@@ -1127,12 +1108,10 @@ subpaths
 | GlobalDataFlow.cs:558:46:558:46 | access to local variable x : String | GlobalDataFlow.cs:81:79:81:79 | x : String | GlobalDataFlow.cs:81:84:81:84 | access to parameter x : String | GlobalDataFlow.cs:558:44:558:47 | delegate call : String |
 | GlobalDataFlowStringBuilder.cs:30:35:30:48 | "taint source" : String | GlobalDataFlowStringBuilder.cs:17:64:17:64 | s : String | GlobalDataFlowStringBuilder.cs:17:53:17:54 | sb [Return] : StringBuilder | GlobalDataFlowStringBuilder.cs:30:31:30:32 | [post] access to local variable sb : StringBuilder |
 | GlobalDataFlowStringBuilder.cs:48:47:48:60 | "taint source" : String | GlobalDataFlowStringBuilder.cs:22:76:22:76 | s : String | GlobalDataFlowStringBuilder.cs:22:65:22:66 | sb [Return] : StringBuilder | GlobalDataFlowStringBuilder.cs:48:43:48:44 | [post] access to local variable sb : StringBuilder |
-| Splitting.cs:8:24:8:30 | [b (line 3): false] access to parameter tainted : String | Splitting.cs:16:26:16:26 | x : String | Splitting.cs:16:32:16:32 | access to parameter x : String | Splitting.cs:8:17:8:31 | [b (line 3): false] call to method Return<String> : String |
-| Splitting.cs:8:24:8:30 | [b (line 3): true] access to parameter tainted : String | Splitting.cs:16:26:16:26 | x : String | Splitting.cs:16:32:16:32 | access to parameter x : String | Splitting.cs:8:17:8:31 | [b (line 3): true] call to method Return<String> : String |
+| Splitting.cs:8:24:8:30 | access to parameter tainted : String | Splitting.cs:16:26:16:26 | x : String | Splitting.cs:16:32:16:32 | access to parameter x : String | Splitting.cs:8:17:8:31 | call to method Return<String> : String |
 | Splitting.cs:20:29:20:29 | access to parameter s : String | Splitting.cs:16:26:16:26 | x : String | Splitting.cs:16:32:16:32 | access to parameter x : String | Splitting.cs:20:22:20:30 | call to method Return<String> : String |
 | Splitting.cs:21:28:21:32 | access to parameter value : String | Splitting.cs:16:26:16:26 | x : String | Splitting.cs:16:32:16:32 | access to parameter x : String | Splitting.cs:21:21:21:33 | call to method Return<String> |
-| Splitting.cs:31:19:31:25 | [b (line 24): false] access to parameter tainted : String | Splitting.cs:18:24:18:24 | s : String | Splitting.cs:20:22:20:30 | call to method Return<String> : String | Splitting.cs:31:17:31:26 | [b (line 24): false] dynamic access to element : String |
-| Splitting.cs:31:19:31:25 | [b (line 24): true] access to parameter tainted : String | Splitting.cs:18:24:18:24 | s : String | Splitting.cs:20:22:20:30 | call to method Return<String> : String | Splitting.cs:31:17:31:26 | [b (line 24): true] dynamic access to element : String |
+| Splitting.cs:31:19:31:25 | access to parameter tainted : String | Splitting.cs:18:24:18:24 | s : String | Splitting.cs:20:22:20:30 | call to method Return<String> : String | Splitting.cs:31:17:31:26 | dynamic access to element : String |
 #select
 | Capture.cs:12:19:12:24 | access to local variable sink27 | Capture.cs:7:20:7:26 | tainted : String | Capture.cs:12:19:12:24 | access to local variable sink27 | access to local variable sink27 |
 | Capture.cs:21:23:21:28 | access to local variable sink28 | Capture.cs:7:20:7:26 | tainted : String | Capture.cs:21:23:21:28 | access to local variable sink28 | access to local variable sink28 |
@@ -1235,13 +1214,12 @@ subpaths
 | GlobalDataFlowStringBuilder.cs:50:15:50:19 | access to local variable sink3 | GlobalDataFlowStringBuilder.cs:48:47:48:60 | "taint source" : String | GlobalDataFlowStringBuilder.cs:50:15:50:19 | access to local variable sink3 | access to local variable sink3 |
 | MultiImplementationA.cs:7:39:7:39 | access to parameter x | MultiImplementationA.cs:5:28:5:41 | "taint source" : String | MultiImplementationA.cs:7:39:7:39 | access to parameter x | access to parameter x |
 | MultiImplementationB.cs:5:39:5:39 | access to parameter x | MultiImplementationB.cs:3:28:3:41 | "taint source" : String | MultiImplementationB.cs:5:39:5:39 | access to parameter x | access to parameter x |
-| Splitting.cs:9:15:9:15 | [b (line 3): false] access to local variable x | Splitting.cs:3:28:3:34 | tainted : String | Splitting.cs:9:15:9:15 | [b (line 3): false] access to local variable x | [b (line 3): false] access to local variable x |
-| Splitting.cs:9:15:9:15 | [b (line 3): true] access to local variable x | Splitting.cs:3:28:3:34 | tainted : String | Splitting.cs:9:15:9:15 | [b (line 3): true] access to local variable x | [b (line 3): true] access to local variable x |
+| Splitting.cs:9:15:9:15 | access to local variable x | Splitting.cs:3:28:3:34 | tainted : String | Splitting.cs:9:15:9:15 | access to local variable x | access to local variable x |
 | Splitting.cs:11:19:11:19 | access to local variable x | Splitting.cs:3:28:3:34 | tainted : String | Splitting.cs:11:19:11:19 | access to local variable x | access to local variable x |
 | Splitting.cs:21:21:21:33 | call to method Return<String> | Splitting.cs:24:28:24:34 | tainted : String | Splitting.cs:21:21:21:33 | call to method Return<String> | call to method Return<String> |
-| Splitting.cs:32:15:32:15 | [b (line 24): false] access to local variable x | Splitting.cs:24:28:24:34 | tainted : String | Splitting.cs:32:15:32:15 | [b (line 24): false] access to local variable x | [b (line 24): false] access to local variable x |
-| Splitting.cs:32:15:32:15 | [b (line 24): true] access to local variable x | Splitting.cs:24:28:24:34 | tainted : String | Splitting.cs:32:15:32:15 | [b (line 24): true] access to local variable x | [b (line 24): true] access to local variable x |
+| Splitting.cs:32:15:32:15 | access to local variable x | Splitting.cs:24:28:24:34 | tainted : String | Splitting.cs:32:15:32:15 | access to local variable x | access to local variable x |
 | Splitting.cs:34:19:34:19 | access to local variable x | Splitting.cs:24:28:24:34 | tainted : String | Splitting.cs:34:19:34:19 | access to local variable x | access to local variable x |
-| Splitting.cs:41:19:41:19 | access to local variable s | Splitting.cs:39:21:39:34 | [b (line 37): true] "taint source" : String | Splitting.cs:41:19:41:19 | access to local variable s | access to local variable s |
+| Splitting.cs:41:19:41:19 | access to local variable s | Splitting.cs:39:21:39:34 | "taint source" : String | Splitting.cs:41:19:41:19 | access to local variable s | access to local variable s |
+| Splitting.cs:43:19:43:19 | access to local variable s | Splitting.cs:39:21:39:34 | "taint source" : String | Splitting.cs:43:19:43:19 | access to local variable s | access to local variable s |
 | Splitting.cs:50:19:50:19 | access to local variable s | Splitting.cs:48:36:48:49 | "taint source" : String | Splitting.cs:50:19:50:19 | access to local variable s | access to local variable s |
 | Splitting.cs:52:19:52:19 | access to local variable s | Splitting.cs:48:36:48:49 | "taint source" : String | Splitting.cs:52:19:52:19 | access to local variable s | access to local variable s |
diff --git a/csharp/ql/test/library-tests/dataflow/library/FlowSummaries.expected b/csharp/ql/test/library-tests/dataflow/library/FlowSummaries.expected
index ff615d53115..8ffcd84e54b 100644
--- a/csharp/ql/test/library-tests/dataflow/library/FlowSummaries.expected
+++ b/csharp/ql/test/library-tests/dataflow/library/FlowSummaries.expected
@@ -1683,9 +1683,9 @@ summary
 | Microsoft.AspNetCore.WebSockets;WebSocketMiddleware;WebSocketMiddleware;(Microsoft.AspNetCore.Http.RequestDelegate,Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Builder.WebSocketOptions>,Microsoft.Extensions.Logging.ILoggerFactory);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Microsoft.AspNetCore.WebSockets;WebSocketsDependencyInjectionExtensions;AddWebSockets;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.AspNetCore.Builder.WebSocketOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.AspNetCore.WebUtilities;BufferedReadStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
-| Microsoft.AspNetCore.WebUtilities;BufferedReadStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| Microsoft.AspNetCore.WebUtilities;BufferedReadStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
-| Microsoft.AspNetCore.WebUtilities;BufferedReadStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
+| Microsoft.AspNetCore.WebUtilities;BufferedReadStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| Microsoft.AspNetCore.WebUtilities;BufferedReadStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
+| Microsoft.AspNetCore.WebUtilities;BufferedReadStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | Microsoft.AspNetCore.WebUtilities;BufferedReadStream;Write;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;manual |
 | Microsoft.AspNetCore.WebUtilities;BufferedReadStream;WriteAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[0].Element;Argument[this];taint;manual |
 | Microsoft.AspNetCore.WebUtilities;BufferedReadStream;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[0];Argument[this];taint;df-generated |
@@ -1696,10 +1696,10 @@ summary
 | Microsoft.AspNetCore.WebUtilities;FileBufferingReadStream;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.AspNetCore.WebUtilities;FileBufferingReadStream;FileBufferingReadStream;(System.IO.Stream,System.Int32,System.Nullable<System.Int64>,System.Func<System.String>);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
 | Microsoft.AspNetCore.WebUtilities;FileBufferingReadStream;FileBufferingReadStream;(System.IO.Stream,System.Int32,System.Nullable<System.Int64>,System.Func<System.String>,System.Buffers.ArrayPool<System.Byte>);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
-| Microsoft.AspNetCore.WebUtilities;FileBufferingReadStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| Microsoft.AspNetCore.WebUtilities;FileBufferingReadStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0].Element;taint;manual |
-| Microsoft.AspNetCore.WebUtilities;FileBufferingReadStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
-| Microsoft.AspNetCore.WebUtilities;FileBufferingReadStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
+| Microsoft.AspNetCore.WebUtilities;FileBufferingReadStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| Microsoft.AspNetCore.WebUtilities;FileBufferingReadStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0];taint;manual |
+| Microsoft.AspNetCore.WebUtilities;FileBufferingReadStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
+| Microsoft.AspNetCore.WebUtilities;FileBufferingReadStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | Microsoft.AspNetCore.WebUtilities;FileBufferingReadStream;Write;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;manual |
 | Microsoft.AspNetCore.WebUtilities;FileBufferingReadStream;WriteAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[0].Element;Argument[this];taint;manual |
 | Microsoft.AspNetCore.WebUtilities;FileBufferingReadStream;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[0];Argument[this];taint;df-generated |
@@ -1709,9 +1709,9 @@ summary
 | Microsoft.AspNetCore.WebUtilities;FileBufferingWriteStream;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.AspNetCore.WebUtilities;FileBufferingWriteStream;FileBufferingWriteStream;(System.Int32,System.Nullable<System.Int64>,System.Func<System.String>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | Microsoft.AspNetCore.WebUtilities;FileBufferingWriteStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
-| Microsoft.AspNetCore.WebUtilities;FileBufferingWriteStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| Microsoft.AspNetCore.WebUtilities;FileBufferingWriteStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
-| Microsoft.AspNetCore.WebUtilities;FileBufferingWriteStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
+| Microsoft.AspNetCore.WebUtilities;FileBufferingWriteStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| Microsoft.AspNetCore.WebUtilities;FileBufferingWriteStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
+| Microsoft.AspNetCore.WebUtilities;FileBufferingWriteStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | Microsoft.AspNetCore.WebUtilities;FileBufferingWriteStream;Write;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;manual |
 | Microsoft.AspNetCore.WebUtilities;FileBufferingWriteStream;WriteAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[0].Element;Argument[this];taint;manual |
 | Microsoft.AspNetCore.WebUtilities;FileBufferingWriteStream;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[0];Argument[this];taint;df-generated |
@@ -1719,10 +1719,10 @@ summary
 | Microsoft.AspNetCore.WebUtilities;FileBufferingWriteStream;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | Microsoft.AspNetCore.WebUtilities;FileBufferingWriteStream;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.AspNetCore.WebUtilities;HttpRequestStreamReader;Read;();Argument[this];ReturnValue;taint;manual |
-| Microsoft.AspNetCore.WebUtilities;HttpRequestStreamReader;Read;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| Microsoft.AspNetCore.WebUtilities;HttpRequestStreamReader;Read;(System.Span<System.Char>);Argument[this];Argument[0].Element;taint;manual |
-| Microsoft.AspNetCore.WebUtilities;HttpRequestStreamReader;ReadAsync;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| Microsoft.AspNetCore.WebUtilities;HttpRequestStreamReader;ReadAsync;(System.Memory<System.Char>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
+| Microsoft.AspNetCore.WebUtilities;HttpRequestStreamReader;Read;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| Microsoft.AspNetCore.WebUtilities;HttpRequestStreamReader;Read;(System.Span<System.Char>);Argument[this];Argument[0];taint;manual |
+| Microsoft.AspNetCore.WebUtilities;HttpRequestStreamReader;ReadAsync;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| Microsoft.AspNetCore.WebUtilities;HttpRequestStreamReader;ReadAsync;(System.Memory<System.Char>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | Microsoft.AspNetCore.WebUtilities;HttpRequestStreamReader;ReadLine;();Argument[this];ReturnValue;taint;manual |
 | Microsoft.AspNetCore.WebUtilities;HttpRequestStreamReader;ReadLineAsync;();Argument[this];ReturnValue;taint;manual |
 | Microsoft.AspNetCore.WebUtilities;HttpRequestStreamReader;ReadToEndAsync;();Argument[this];ReturnValue;taint;manual |
@@ -3715,7 +3715,6 @@ summary
 | Newtonsoft.Json.Linq;JObject;set_Item;(System.String,Newtonsoft.Json.Linq.JToken);Argument[0];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Key];value;manual |
 | Newtonsoft.Json.Linq;JObject;set_Item;(System.String,Newtonsoft.Json.Linq.JToken);Argument[1];Argument[this].Element.Property[System.Collections.Generic.KeyValuePair`2.Value];value;manual |
 | Newtonsoft.Json.Linq;JObject;set_Item;(System.String,Newtonsoft.Json.Linq.JToken);Argument[1];Argument[this].Element;value;manual |
-| Newtonsoft.Json.Linq;JPropertyDescriptor;GetValue;(System.Object);Argument[0];ReturnValue;taint;dfc-generated |
 | Newtonsoft.Json.Linq;JPropertyDescriptor;ResetValue;(System.Object);Argument[this];Argument[0];taint;df-generated |
 | Newtonsoft.Json.Linq;JPropertyDescriptor;SetValue;(System.Object,System.Object);Argument[0];Argument[this];taint;df-generated |
 | Newtonsoft.Json.Linq;JPropertyDescriptor;SetValue;(System.Object,System.Object);Argument[1];Argument[0];taint;df-generated |
@@ -5278,8 +5277,8 @@ summary
 | ServiceStack.Text;NetCoreMemory;Deserialize;(System.IO.Stream,System.Type,ServiceStack.Text.Common.DeserializeStringSpanDelegate);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | ServiceStack.Text;NetCoreMemory;DeserializeAsync;(System.IO.Stream,System.Type,ServiceStack.Text.Common.DeserializeStringSpanDelegate);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | ServiceStack.Text;RecyclableMemoryStream;GetBuffer;();Argument[this];ReturnValue;taint;df-generated |
-| ServiceStack.Text;RecyclableMemoryStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| ServiceStack.Text;RecyclableMemoryStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0].Element;taint;manual |
+| ServiceStack.Text;RecyclableMemoryStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| ServiceStack.Text;RecyclableMemoryStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0];taint;manual |
 | ServiceStack.Text;RecyclableMemoryStream;TryGetBuffer;(System.ArraySegment<System.Byte>);Argument[this];Argument[0].Element;taint;df-generated |
 | ServiceStack.Text;RecyclableMemoryStream;Write;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;manual |
 | ServiceStack.Text;RecyclableMemoryStream;Write;(System.ReadOnlySpan<System.Byte>);Argument[0].Element;Argument[this];taint;manual |
@@ -9085,7 +9084,6 @@ summary
 | System.ComponentModel;PropertyDescriptor;FillAttributes;(System.Collections.IList);Argument[this];Argument[0].Element;taint;df-generated |
 | System.ComponentModel;PropertyDescriptor;GetEditor;(System.Type);Argument[this];ReturnValue;taint;df-generated |
 | System.ComponentModel;PropertyDescriptor;GetInvocationTarget;(System.Type,System.Object);Argument[1];ReturnValue;value;dfc-generated |
-| System.ComponentModel;PropertyDescriptor;GetValue;(System.Object);Argument[0];ReturnValue;taint;dfc-generated |
 | System.ComponentModel;PropertyDescriptor;RemoveValueChanged;(System.Object,System.EventHandler);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel;PropertyDescriptor;ResetValue;(System.Object);Argument[this];Argument[0];taint;df-generated |
 | System.ComponentModel;PropertyDescriptor;SetValue;(System.Object,System.Object);Argument[0];Argument[this];taint;df-generated |
@@ -10659,7 +10657,7 @@ summary
 | System.Data.SqlTypes;SqlDecimal;op_UnaryNegation;(System.Data.SqlTypes.SqlDecimal);Argument[0];ReturnValue;value;dfc-generated |
 | System.Data.SqlTypes;SqlDouble;ReadXml;(System.Xml.XmlReader);Argument[0];Argument[this];taint;df-generated |
 | System.Data.SqlTypes;SqlDouble;WriteXml;(System.Xml.XmlWriter);Argument[this];Argument[0];taint;df-generated |
-| System.Data.SqlTypes;SqlFileStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
+| System.Data.SqlTypes;SqlFileStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
 | System.Data.SqlTypes;SqlFileStream;Write;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;manual |
 | System.Data.SqlTypes;SqlGuid;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
 | System.Data.SqlTypes;SqlGuid;ReadXml;(System.Xml.XmlReader);Argument[0];Argument[this];taint;df-generated |
@@ -11970,16 +11968,16 @@ summary
 | System.Globalization;TextInfo;ToUpper;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System.Globalization;TextInfo;get_CultureName;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO.Compression;BrotliStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
-| System.IO.Compression;BrotliStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0].Element;taint;manual |
+| System.IO.Compression;BrotliStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0];taint;manual |
 | System.IO.Compression;BrotliStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[0].Element;Argument[this];taint;manual |
 | System.IO.Compression;BrotliStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
 | System.IO.Compression;BrotliStream;BrotliStream;(System.IO.Stream,System.IO.Compression.CompressionMode,System.Boolean);Argument[0];Argument[this].SyntheticField[System.IO.Compression.BrotliStream._stream];value;dfc-generated |
 | System.IO.Compression;BrotliStream;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO.Compression;BrotliStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
-| System.IO.Compression;BrotliStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO.Compression;BrotliStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0].Element;taint;manual |
-| System.IO.Compression;BrotliStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
-| System.IO.Compression;BrotliStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
+| System.IO.Compression;BrotliStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO.Compression;BrotliStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0];taint;manual |
+| System.IO.Compression;BrotliStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
+| System.IO.Compression;BrotliStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | System.IO.Compression;BrotliStream;Write;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;manual |
 | System.IO.Compression;BrotliStream;Write;(System.ReadOnlySpan<System.Byte>);Argument[0].Element;Argument[this];taint;manual |
 | System.IO.Compression;BrotliStream;WriteAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[0].Element;Argument[this];taint;manual |
@@ -11989,7 +11987,7 @@ summary
 | System.IO.Compression;BrotliStream;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.IO.Compression;BrotliStream;get_BaseStream;();Argument[this].SyntheticField[System.IO.Compression.BrotliStream._stream];ReturnValue;value;dfc-generated |
 | System.IO.Compression;DeflateStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
-| System.IO.Compression;DeflateStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0].Element;taint;manual |
+| System.IO.Compression;DeflateStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0];taint;manual |
 | System.IO.Compression;DeflateStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[0].Element;Argument[this];taint;manual |
 | System.IO.Compression;DeflateStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
 | System.IO.Compression;DeflateStream;CopyTo;(System.IO.Stream,System.Int32);Argument[this];Argument[0];taint;manual |
@@ -12000,10 +11998,10 @@ summary
 | System.IO.Compression;DeflateStream;DeflateStream;(System.IO.Stream,System.IO.Compression.CompressionMode,System.Boolean);Argument[0];Argument[this];taint;manual |
 | System.IO.Compression;DeflateStream;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO.Compression;DeflateStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
-| System.IO.Compression;DeflateStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO.Compression;DeflateStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0].Element;taint;manual |
-| System.IO.Compression;DeflateStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
-| System.IO.Compression;DeflateStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
+| System.IO.Compression;DeflateStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO.Compression;DeflateStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0];taint;manual |
+| System.IO.Compression;DeflateStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
+| System.IO.Compression;DeflateStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | System.IO.Compression;DeflateStream;Write;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;manual |
 | System.IO.Compression;DeflateStream;Write;(System.ReadOnlySpan<System.Byte>);Argument[0].Element;Argument[this];taint;manual |
 | System.IO.Compression;DeflateStream;WriteAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[0].Element;Argument[this];taint;manual |
@@ -12013,7 +12011,7 @@ summary
 | System.IO.Compression;DeflateStream;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.IO.Compression;DeflateStream;get_BaseStream;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO.Compression;GZipStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
-| System.IO.Compression;GZipStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0].Element;taint;manual |
+| System.IO.Compression;GZipStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0];taint;manual |
 | System.IO.Compression;GZipStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[0].Element;Argument[this];taint;manual |
 | System.IO.Compression;GZipStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
 | System.IO.Compression;GZipStream;CopyTo;(System.IO.Stream,System.Int32);Argument[this];Argument[0];taint;manual |
@@ -12023,10 +12021,10 @@ summary
 | System.IO.Compression;GZipStream;GZipStream;(System.IO.Stream,System.IO.Compression.CompressionLevel,System.Boolean);Argument[0];Argument[this].SyntheticField[System.IO.Compression.GZipStream._deflateStream].SyntheticField[System.IO.Compression.DeflateStream._stream];value;dfc-generated |
 | System.IO.Compression;GZipStream;GZipStream;(System.IO.Stream,System.IO.Compression.CompressionMode,System.Boolean);Argument[0];Argument[this].SyntheticField[System.IO.Compression.GZipStream._deflateStream].SyntheticField[System.IO.Compression.DeflateStream._stream];value;dfc-generated |
 | System.IO.Compression;GZipStream;GZipStream;(System.IO.Stream,System.IO.Compression.ZLibCompressionOptions,System.Boolean);Argument[0];Argument[this].SyntheticField[System.IO.Compression.GZipStream._deflateStream].SyntheticField[System.IO.Compression.DeflateStream._stream];value;dfc-generated |
-| System.IO.Compression;GZipStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO.Compression;GZipStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0].Element;taint;manual |
-| System.IO.Compression;GZipStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
-| System.IO.Compression;GZipStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
+| System.IO.Compression;GZipStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO.Compression;GZipStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0];taint;manual |
+| System.IO.Compression;GZipStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
+| System.IO.Compression;GZipStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | System.IO.Compression;GZipStream;Write;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;manual |
 | System.IO.Compression;GZipStream;Write;(System.ReadOnlySpan<System.Byte>);Argument[0].Element;Argument[this];taint;manual |
 | System.IO.Compression;GZipStream;WriteAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[0].Element;Argument[this];taint;manual |
@@ -12036,17 +12034,17 @@ summary
 | System.IO.Compression;GZipStream;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.IO.Compression;GZipStream;get_BaseStream;();Argument[this].SyntheticField[System.IO.Compression.GZipStream._deflateStream].SyntheticField[System.IO.Compression.DeflateStream._stream];ReturnValue;value;dfc-generated |
 | System.IO.Compression;ZLibStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
-| System.IO.Compression;ZLibStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0].Element;taint;manual |
+| System.IO.Compression;ZLibStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0];taint;manual |
 | System.IO.Compression;ZLibStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[0].Element;Argument[this];taint;manual |
 | System.IO.Compression;ZLibStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
 | System.IO.Compression;ZLibStream;CopyTo;(System.IO.Stream,System.Int32);Argument[this];Argument[0];taint;manual |
 | System.IO.Compression;ZLibStream;CopyToAsync;(System.IO.Stream,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | System.IO.Compression;ZLibStream;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO.Compression;ZLibStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
-| System.IO.Compression;ZLibStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO.Compression;ZLibStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0].Element;taint;manual |
-| System.IO.Compression;ZLibStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
-| System.IO.Compression;ZLibStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
+| System.IO.Compression;ZLibStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO.Compression;ZLibStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0];taint;manual |
+| System.IO.Compression;ZLibStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
+| System.IO.Compression;ZLibStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | System.IO.Compression;ZLibStream;Write;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;manual |
 | System.IO.Compression;ZLibStream;Write;(System.ReadOnlySpan<System.Byte>);Argument[0].Element;Argument[this];taint;manual |
 | System.IO.Compression;ZLibStream;WriteAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[0].Element;Argument[this];taint;manual |
@@ -12090,16 +12088,16 @@ summary
 | System.IO.IsolatedStorage;IsolatedStorage;get_AssemblyIdentity;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO.IsolatedStorage;IsolatedStorage;get_DomainIdentity;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO.IsolatedStorage;IsolatedStorageFileStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
-| System.IO.IsolatedStorage;IsolatedStorageFileStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0].Element;taint;manual |
+| System.IO.IsolatedStorage;IsolatedStorageFileStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0];taint;manual |
 | System.IO.IsolatedStorage;IsolatedStorageFileStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[0].Element;Argument[this];taint;manual |
 | System.IO.IsolatedStorage;IsolatedStorageFileStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
 | System.IO.IsolatedStorage;IsolatedStorageFileStream;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO.IsolatedStorage;IsolatedStorageFileStream;FlushAsync;(System.Threading.CancellationToken);Argument[this].SyntheticField[System.IO.FileStream._strategy].SyntheticField[System.IO.Strategies.DerivedFileStreamStrategy._fileStream];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
 | System.IO.IsolatedStorage;IsolatedStorageFileStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
-| System.IO.IsolatedStorage;IsolatedStorageFileStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO.IsolatedStorage;IsolatedStorageFileStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0].Element;taint;manual |
-| System.IO.IsolatedStorage;IsolatedStorageFileStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
-| System.IO.IsolatedStorage;IsolatedStorageFileStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
+| System.IO.IsolatedStorage;IsolatedStorageFileStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO.IsolatedStorage;IsolatedStorageFileStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0];taint;manual |
+| System.IO.IsolatedStorage;IsolatedStorageFileStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
+| System.IO.IsolatedStorage;IsolatedStorageFileStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | System.IO.IsolatedStorage;IsolatedStorageFileStream;Write;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;manual |
 | System.IO.IsolatedStorage;IsolatedStorageFileStream;Write;(System.ReadOnlySpan<System.Byte>);Argument[0].Element;Argument[this];taint;manual |
 | System.IO.IsolatedStorage;IsolatedStorageFileStream;WriteAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[0].Element;Argument[this];taint;manual |
@@ -12150,15 +12148,15 @@ summary
 | System.IO.Pipes;NamedPipeServerStream;NamedPipeServerStream;(System.IO.Pipes.PipeDirection,System.Boolean,System.Boolean,Microsoft.Win32.SafeHandles.SafePipeHandle);Argument[3];Argument[this];taint;df-generated |
 | System.IO.Pipes;NamedPipeServerStream;RunAsClient;(System.IO.Pipes.PipeStreamImpersonationWorker);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.IO.Pipes;PipeStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
-| System.IO.Pipes;PipeStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0].Element;taint;manual |
+| System.IO.Pipes;PipeStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0];taint;manual |
 | System.IO.Pipes;PipeStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[0].Element;Argument[this];taint;manual |
 | System.IO.Pipes;PipeStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
 | System.IO.Pipes;PipeStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
 | System.IO.Pipes;PipeStream;InitializeHandle;(Microsoft.Win32.SafeHandles.SafePipeHandle,System.Boolean,System.Boolean);Argument[0];Argument[this].SyntheticField[System.IO.Pipes.PipeStream._handle];value;dfc-generated |
-| System.IO.Pipes;PipeStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO.Pipes;PipeStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0].Element;taint;manual |
-| System.IO.Pipes;PipeStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
-| System.IO.Pipes;PipeStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
+| System.IO.Pipes;PipeStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO.Pipes;PipeStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0];taint;manual |
+| System.IO.Pipes;PipeStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
+| System.IO.Pipes;PipeStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | System.IO.Pipes;PipeStream;Write;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;manual |
 | System.IO.Pipes;PipeStream;Write;(System.ReadOnlySpan<System.Byte>);Argument[0].Element;Argument[this];taint;manual |
 | System.IO.Pipes;PipeStream;WriteAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[0].Element;Argument[this];taint;manual |
@@ -12180,7 +12178,7 @@ summary
 | System.IO;BinaryWriter;Write;(System.ReadOnlySpan<System.Byte>);Argument[0];Argument[this];taint;df-generated |
 | System.IO;BinaryWriter;get_BaseStream;();Argument[this].Field[System.IO.BinaryWriter.OutStream];ReturnValue;value;dfc-generated |
 | System.IO;BufferedStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
-| System.IO;BufferedStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0].Element;taint;manual |
+| System.IO;BufferedStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0];taint;manual |
 | System.IO;BufferedStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[0].Element;Argument[this];taint;manual |
 | System.IO;BufferedStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
 | System.IO;BufferedStream;BufferedStream;(System.IO.Stream);Argument[0];Argument[this];taint;manual |
@@ -12189,10 +12187,10 @@ summary
 | System.IO;BufferedStream;CopyToAsync;(System.IO.Stream,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | System.IO;BufferedStream;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO;BufferedStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
-| System.IO;BufferedStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;BufferedStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;BufferedStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;BufferedStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
+| System.IO;BufferedStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO;BufferedStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0];taint;manual |
+| System.IO;BufferedStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
+| System.IO;BufferedStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | System.IO;BufferedStream;Write;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;manual |
 | System.IO;BufferedStream;Write;(System.ReadOnlySpan<System.Byte>);Argument[0].Element;Argument[this];taint;manual |
 | System.IO;BufferedStream;WriteAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[0].Element;Argument[this];taint;manual |
@@ -12302,7 +12300,7 @@ summary
 | System.IO;FileNotFoundException;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
 | System.IO;FileNotFoundException;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
 | System.IO;FileStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
-| System.IO;FileStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0].Element;taint;manual |
+| System.IO;FileStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0];taint;manual |
 | System.IO;FileStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[0].Element;Argument[this];taint;manual |
 | System.IO;FileStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
 | System.IO;FileStream;CopyTo;(System.IO.Stream,System.Int32);Argument[this];Argument[0];taint;manual |
@@ -12320,10 +12318,10 @@ summary
 | System.IO;FileStream;FileStream;(System.String,System.IO.FileStreamOptions);Argument[this];Argument[this].SyntheticField[System.IO.FileStream._strategy].SyntheticField[System.IO.Strategies.DerivedFileStreamStrategy._fileStream];value;dfc-generated |
 | System.IO;FileStream;FlushAsync;(System.Threading.CancellationToken);Argument[this].SyntheticField[System.IO.FileStream._strategy].SyntheticField[System.IO.Strategies.DerivedFileStreamStrategy._fileStream];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
 | System.IO;FileStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
-| System.IO;FileStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;FileStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;FileStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;FileStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
+| System.IO;FileStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO;FileStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0];taint;manual |
+| System.IO;FileStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
+| System.IO;FileStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | System.IO;FileStream;Write;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;manual |
 | System.IO;FileStream;Write;(System.ReadOnlySpan<System.Byte>);Argument[0].Element;Argument[this];taint;manual |
 | System.IO;FileStream;WriteAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[0].Element;Argument[this];taint;manual |
@@ -12364,7 +12362,7 @@ summary
 | System.IO;FileSystemWatcher;remove_Error;(System.IO.ErrorEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.IO;FileSystemWatcher;remove_Renamed;(System.IO.RenamedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.IO;MemoryStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
-| System.IO;MemoryStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0].Element;taint;manual |
+| System.IO;MemoryStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0];taint;manual |
 | System.IO;MemoryStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[0].Element;Argument[this];taint;manual |
 | System.IO;MemoryStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
 | System.IO;MemoryStream;CopyTo;(System.IO.Stream,System.Int32);Argument[this];Argument[0];taint;manual |
@@ -12376,10 +12374,10 @@ summary
 | System.IO;MemoryStream;MemoryStream;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;manual |
 | System.IO;MemoryStream;MemoryStream;(System.Byte[],System.Int32,System.Int32,System.Boolean);Argument[0].Element;Argument[this];taint;manual |
 | System.IO;MemoryStream;MemoryStream;(System.Byte[],System.Int32,System.Int32,System.Boolean,System.Boolean);Argument[0].Element;Argument[this];taint;manual |
-| System.IO;MemoryStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;MemoryStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;MemoryStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;MemoryStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
+| System.IO;MemoryStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO;MemoryStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0];taint;manual |
+| System.IO;MemoryStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
+| System.IO;MemoryStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | System.IO;MemoryStream;ToArray;();Argument[this];ReturnValue;taint;manual |
 | System.IO;MemoryStream;TryGetBuffer;(System.ArraySegment<System.Byte>);Argument[this];Argument[0].Element;taint;df-generated |
 | System.IO;MemoryStream;Write;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;manual |
@@ -12463,7 +12461,7 @@ summary
 | System.IO;RenamedEventArgs;get_OldName;();Argument[this].SyntheticField[System.IO.RenamedEventArgs._oldName];ReturnValue;value;dfc-generated |
 | System.IO;RenamedEventHandler;BeginInvoke;(System.Object,System.IO.RenamedEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.IO;Stream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
-| System.IO;Stream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0].Element;taint;manual |
+| System.IO;Stream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0];taint;manual |
 | System.IO;Stream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[0].Element;Argument[this];taint;manual |
 | System.IO;Stream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
 | System.IO;Stream;CopyTo;(System.IO.Stream);Argument[this];Argument[0];taint;manual |
@@ -12475,15 +12473,15 @@ summary
 | System.IO;Stream;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO;Stream;FlushAsync;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO;Stream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
-| System.IO;Stream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;Stream;Read;(System.Span<System.Byte>);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;Stream;ReadAsync;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;Stream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;Stream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;Stream;ReadAtLeast;(System.Span<System.Byte>,System.Int32,System.Boolean);Argument[this];Argument[0].Element;taint;manual |
+| System.IO;Stream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO;Stream;Read;(System.Span<System.Byte>);Argument[this];Argument[0];taint;manual |
+| System.IO;Stream;ReadAsync;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO;Stream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
+| System.IO;Stream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
+| System.IO;Stream;ReadAtLeast;(System.Span<System.Byte>,System.Int32,System.Boolean);Argument[this];Argument[0];taint;manual |
 | System.IO;Stream;ReadAtLeastAsync;(System.Memory<System.Byte>,System.Int32,System.Boolean,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
-| System.IO;Stream;ReadExactly;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;Stream;ReadExactly;(System.Span<System.Byte>);Argument[this];Argument[0].Element;taint;manual |
+| System.IO;Stream;ReadExactly;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO;Stream;ReadExactly;(System.Span<System.Byte>);Argument[this];Argument[0];taint;manual |
 | System.IO;Stream;Synchronized;(System.IO.Stream);Argument[0];ReturnValue;value;dfc-generated |
 | System.IO;Stream;Write;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;manual |
 | System.IO;Stream;Write;(System.ReadOnlySpan<System.Byte>);Argument[0].Element;Argument[this];taint;manual |
@@ -12494,14 +12492,14 @@ summary
 | System.IO;Stream;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | System.IO;Stream;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.IO;StreamReader;Read;();Argument[this];ReturnValue;taint;manual |
-| System.IO;StreamReader;Read;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;StreamReader;Read;(System.Span<System.Char>);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;StreamReader;ReadAsync;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;StreamReader;ReadAsync;(System.Memory<System.Char>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;StreamReader;ReadBlock;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;StreamReader;ReadBlock;(System.Span<System.Char>);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;StreamReader;ReadBlockAsync;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;StreamReader;ReadBlockAsync;(System.Memory<System.Char>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
+| System.IO;StreamReader;Read;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO;StreamReader;Read;(System.Span<System.Char>);Argument[this];Argument[0];taint;manual |
+| System.IO;StreamReader;ReadAsync;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO;StreamReader;ReadAsync;(System.Memory<System.Char>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
+| System.IO;StreamReader;ReadBlock;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO;StreamReader;ReadBlock;(System.Span<System.Char>);Argument[this];Argument[0];taint;manual |
+| System.IO;StreamReader;ReadBlockAsync;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO;StreamReader;ReadBlockAsync;(System.Memory<System.Char>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | System.IO;StreamReader;ReadLine;();Argument[this];ReturnValue;taint;manual |
 | System.IO;StreamReader;ReadLineAsync;();Argument[this];ReturnValue;taint;manual |
 | System.IO;StreamReader;ReadLineAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
@@ -12577,13 +12575,13 @@ summary
 | System.IO;StreamWriter;get_BaseStream;();Argument[this].SyntheticField[System.IO.StreamWriter._stream];ReturnValue;value;dfc-generated |
 | System.IO;StreamWriter;get_Encoding;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO;StringReader;Read;();Argument[this];ReturnValue;taint;manual |
-| System.IO;StringReader;Read;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;StringReader;Read;(System.Span<System.Char>);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;StringReader;ReadAsync;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;StringReader;ReadAsync;(System.Memory<System.Char>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;StringReader;ReadBlock;(System.Span<System.Char>);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;StringReader;ReadBlockAsync;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;StringReader;ReadBlockAsync;(System.Memory<System.Char>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
+| System.IO;StringReader;Read;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO;StringReader;Read;(System.Span<System.Char>);Argument[this];Argument[0];taint;manual |
+| System.IO;StringReader;ReadAsync;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO;StringReader;ReadAsync;(System.Memory<System.Char>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
+| System.IO;StringReader;ReadBlock;(System.Span<System.Char>);Argument[this];Argument[0];taint;manual |
+| System.IO;StringReader;ReadBlockAsync;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO;StringReader;ReadBlockAsync;(System.Memory<System.Char>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | System.IO;StringReader;ReadLine;();Argument[this];ReturnValue;taint;manual |
 | System.IO;StringReader;ReadLineAsync;();Argument[this];ReturnValue;taint;manual |
 | System.IO;StringReader;ReadLineAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
@@ -12615,14 +12613,14 @@ summary
 | System.IO;StringWriter;WriteLineAsync;(System.Text.StringBuilder,System.Threading.CancellationToken);Argument[0];Argument[this];taint;manual |
 | System.IO;StringWriter;get_Encoding;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO;TextReader;Read;();Argument[this];ReturnValue;taint;manual |
-| System.IO;TextReader;Read;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;TextReader;Read;(System.Span<System.Char>);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;TextReader;ReadAsync;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;TextReader;ReadAsync;(System.Memory<System.Char>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;TextReader;ReadBlock;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;TextReader;ReadBlock;(System.Span<System.Char>);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;TextReader;ReadBlockAsync;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;TextReader;ReadBlockAsync;(System.Memory<System.Char>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
+| System.IO;TextReader;Read;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO;TextReader;Read;(System.Span<System.Char>);Argument[this];Argument[0];taint;manual |
+| System.IO;TextReader;ReadAsync;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO;TextReader;ReadAsync;(System.Memory<System.Char>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
+| System.IO;TextReader;ReadBlock;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO;TextReader;ReadBlock;(System.Span<System.Char>);Argument[this];Argument[0];taint;manual |
+| System.IO;TextReader;ReadBlockAsync;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO;TextReader;ReadBlockAsync;(System.Memory<System.Char>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | System.IO;TextReader;ReadLine;();Argument[this];ReturnValue;taint;manual |
 | System.IO;TextReader;ReadLineAsync;();Argument[this];ReturnValue;taint;manual |
 | System.IO;TextReader;ReadLineAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
@@ -12707,10 +12705,10 @@ summary
 | System.IO;UnmanagedMemoryStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
 | System.IO;UnmanagedMemoryStream;Initialize;(System.Byte*,System.Int64,System.Int64,System.IO.FileAccess);Argument[0];Argument[this];taint;df-generated |
 | System.IO;UnmanagedMemoryStream;Initialize;(System.Runtime.InteropServices.SafeBuffer,System.Int64,System.Int64,System.IO.FileAccess);Argument[0];Argument[this];taint;df-generated |
-| System.IO;UnmanagedMemoryStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;UnmanagedMemoryStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;UnmanagedMemoryStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;UnmanagedMemoryStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
+| System.IO;UnmanagedMemoryStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO;UnmanagedMemoryStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0];taint;manual |
+| System.IO;UnmanagedMemoryStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
+| System.IO;UnmanagedMemoryStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | System.IO;UnmanagedMemoryStream;UnmanagedMemoryStream;(System.Byte*,System.Int64);Argument[0];Argument[this];taint;df-generated |
 | System.IO;UnmanagedMemoryStream;UnmanagedMemoryStream;(System.Byte*,System.Int64,System.Int64,System.IO.FileAccess);Argument[0];Argument[this];taint;df-generated |
 | System.IO;UnmanagedMemoryStream;UnmanagedMemoryStream;(System.Runtime.InteropServices.SafeBuffer,System.Int64,System.Int64);Argument[0];Argument[this];taint;df-generated |
@@ -15118,15 +15116,15 @@ summary
 | System.Net.Quic;QuicListener;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Quic;QuicListenerOptions;set_ConnectionOptionsCallback;(System.Func<System.Net.Quic.QuicConnection,System.Net.Security.SslClientHelloInfo,System.Threading.CancellationToken,System.Threading.Tasks.ValueTask<System.Net.Quic.QuicServerConnectionOptions>>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Net.Quic;QuicStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
-| System.Net.Quic;QuicStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0].Element;taint;manual |
+| System.Net.Quic;QuicStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0];taint;manual |
 | System.Net.Quic;QuicStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[0].Element;Argument[this];taint;manual |
 | System.Net.Quic;QuicStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
 | System.Net.Quic;QuicStream;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Quic;QuicStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
-| System.Net.Quic;QuicStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.Net.Quic;QuicStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0].Element;taint;manual |
-| System.Net.Quic;QuicStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
-| System.Net.Quic;QuicStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
+| System.Net.Quic;QuicStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Net.Quic;QuicStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0];taint;manual |
+| System.Net.Quic;QuicStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
+| System.Net.Quic;QuicStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | System.Net.Quic;QuicStream;Write;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;manual |
 | System.Net.Quic;QuicStream;Write;(System.ReadOnlySpan<System.Byte>);Argument[0].Element;Argument[this];taint;manual |
 | System.Net.Quic;QuicStream;WriteAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[0].Element;Argument[this];taint;manual |
@@ -15159,14 +15157,14 @@ summary
 | System.Net.Security;NegotiateStream;BeginAuthenticateAsServer;(System.Net.NetworkCredential,System.Security.Authentication.ExtendedProtection.ExtendedProtectionPolicy,System.Net.Security.ProtectionLevel,System.Security.Principal.TokenImpersonationLevel,System.AsyncCallback,System.Object);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
 | System.Net.Security;NegotiateStream;BeginAuthenticateAsServer;(System.Security.Authentication.ExtendedProtection.ExtendedProtectionPolicy,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Net.Security;NegotiateStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
-| System.Net.Security;NegotiateStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0].Element;taint;manual |
+| System.Net.Security;NegotiateStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0];taint;manual |
 | System.Net.Security;NegotiateStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[0].Element;Argument[this];taint;manual |
 | System.Net.Security;NegotiateStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
 | System.Net.Security;NegotiateStream;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Security;NegotiateStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
-| System.Net.Security;NegotiateStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.Net.Security;NegotiateStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
-| System.Net.Security;NegotiateStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
+| System.Net.Security;NegotiateStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Net.Security;NegotiateStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
+| System.Net.Security;NegotiateStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | System.Net.Security;NegotiateStream;Write;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;manual |
 | System.Net.Security;NegotiateStream;WriteAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[0].Element;Argument[this];taint;manual |
 | System.Net.Security;NegotiateStream;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[0];Argument[this];taint;df-generated |
@@ -15212,14 +15210,14 @@ summary
 | System.Net.Security;SslStream;BeginAuthenticateAsServer;(System.Security.Cryptography.X509Certificates.X509Certificate,System.Boolean,System.Boolean,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
 | System.Net.Security;SslStream;BeginAuthenticateAsServer;(System.Security.Cryptography.X509Certificates.X509Certificate,System.Boolean,System.Security.Authentication.SslProtocols,System.Boolean,System.AsyncCallback,System.Object);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
 | System.Net.Security;SslStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
-| System.Net.Security;SslStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0].Element;taint;manual |
+| System.Net.Security;SslStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0];taint;manual |
 | System.Net.Security;SslStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[0].Element;Argument[this];taint;manual |
 | System.Net.Security;SslStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
 | System.Net.Security;SslStream;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Security;SslStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
-| System.Net.Security;SslStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.Net.Security;SslStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
-| System.Net.Security;SslStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
+| System.Net.Security;SslStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Net.Security;SslStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
+| System.Net.Security;SslStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | System.Net.Security;SslStream;SslStream;(System.IO.Stream,System.Boolean,System.Net.Security.RemoteCertificateValidationCallback);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Net.Security;SslStream;SslStream;(System.IO.Stream,System.Boolean,System.Net.Security.RemoteCertificateValidationCallback,System.Net.Security.LocalCertificateSelectionCallback);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Net.Security;SslStream;SslStream;(System.IO.Stream,System.Boolean,System.Net.Security.RemoteCertificateValidationCallback,System.Net.Security.LocalCertificateSelectionCallback);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
@@ -15247,15 +15245,15 @@ summary
 | System.Net.Sockets;MulticastOption;MulticastOption;(System.Net.IPAddress,System.Net.IPAddress);Argument[0];Argument[this];taint;df-generated |
 | System.Net.Sockets;MulticastOption;MulticastOption;(System.Net.IPAddress,System.Net.IPAddress);Argument[1];Argument[this];taint;df-generated |
 | System.Net.Sockets;NetworkStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
-| System.Net.Sockets;NetworkStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0].Element;taint;manual |
+| System.Net.Sockets;NetworkStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0];taint;manual |
 | System.Net.Sockets;NetworkStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[0].Element;Argument[this];taint;manual |
 | System.Net.Sockets;NetworkStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
 | System.Net.Sockets;NetworkStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
 | System.Net.Sockets;NetworkStream;NetworkStream;(System.Net.Sockets.Socket,System.IO.FileAccess,System.Boolean);Argument[0];Argument[this].SyntheticField[System.Net.Sockets.NetworkStream._streamSocket];value;dfc-generated |
-| System.Net.Sockets;NetworkStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.Net.Sockets;NetworkStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0].Element;taint;manual |
-| System.Net.Sockets;NetworkStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
-| System.Net.Sockets;NetworkStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
+| System.Net.Sockets;NetworkStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Net.Sockets;NetworkStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0];taint;manual |
+| System.Net.Sockets;NetworkStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
+| System.Net.Sockets;NetworkStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | System.Net.Sockets;NetworkStream;Write;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;manual |
 | System.Net.Sockets;NetworkStream;Write;(System.ReadOnlySpan<System.Byte>);Argument[0].Element;Argument[this];taint;manual |
 | System.Net.Sockets;NetworkStream;WriteAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[0].Element;Argument[this];taint;manual |
@@ -17765,7 +17763,7 @@ summary
 | System.Security.Cryptography;CngUIPolicy;CngUIPolicy;(System.Security.Cryptography.CngUIProtectionLevels,System.String,System.String,System.String,System.String);Argument[3];Argument[this].Property[System.Security.Cryptography.CngUIPolicy.UseContext];value;dfc-generated |
 | System.Security.Cryptography;CngUIPolicy;CngUIPolicy;(System.Security.Cryptography.CngUIProtectionLevels,System.String,System.String,System.String,System.String);Argument[4];Argument[this].Property[System.Security.Cryptography.CngUIPolicy.CreationTitle];value;dfc-generated |
 | System.Security.Cryptography;CryptoStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
-| System.Security.Cryptography;CryptoStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0].Element;taint;manual |
+| System.Security.Cryptography;CryptoStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0];taint;manual |
 | System.Security.Cryptography;CryptoStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[0].Element;Argument[this];taint;manual |
 | System.Security.Cryptography;CryptoStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
 | System.Security.Cryptography;CryptoStream;CopyTo;(System.IO.Stream,System.Int32);Argument[this];Argument[0];taint;manual |
@@ -17774,9 +17772,9 @@ summary
 | System.Security.Cryptography;CryptoStream;CryptoStream;(System.IO.Stream,System.Security.Cryptography.ICryptoTransform,System.Security.Cryptography.CryptoStreamMode,System.Boolean);Argument[1];Argument[this];taint;df-generated |
 | System.Security.Cryptography;CryptoStream;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography;CryptoStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
-| System.Security.Cryptography;CryptoStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.Security.Cryptography;CryptoStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
-| System.Security.Cryptography;CryptoStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
+| System.Security.Cryptography;CryptoStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Security.Cryptography;CryptoStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
+| System.Security.Cryptography;CryptoStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | System.Security.Cryptography;CryptoStream;Write;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;manual |
 | System.Security.Cryptography;CryptoStream;WriteAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[0].Element;Argument[this];taint;manual |
 | System.Security.Cryptography;CryptoStream;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[0];Argument[this];taint;df-generated |
@@ -20882,24 +20880,33 @@ summary
 | System.Xml;XmlDictionaryReader;CreateDictionaryReader;(System.Xml.XmlReader);Argument[0];ReturnValue;value;dfc-generated |
 | System.Xml;XmlDictionaryReader;CreateMtomReader;(System.Byte[],System.Int32,System.Int32,System.Text.Encoding[],System.String,System.Xml.XmlDictionaryReaderQuotas,System.Int32,System.Xml.OnXmlDictionaryReaderClose);Argument[7];Argument[7].Parameter[delegate-self];value;hq-generated |
 | System.Xml;XmlDictionaryReader;CreateMtomReader;(System.IO.Stream,System.Text.Encoding[],System.String,System.Xml.XmlDictionaryReaderQuotas,System.Int32,System.Xml.OnXmlDictionaryReaderClose);Argument[5];Argument[5].Parameter[delegate-self];value;hq-generated |
-| System.Xml;XmlDictionaryReader;CreateTextReader;(System.Byte[],System.Int32,System.Int32,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose);Argument[5];Argument[5].Parameter[delegate-self];value;hq-generated |
-| System.Xml;XmlDictionaryReader;CreateTextReader;(System.IO.Stream,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
+| System.Xml;XmlDictionaryReader;CreateTextReader;(System.Byte[],System.Int32,System.Int32,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose);Argument[0].Element;ReturnValue;taint;manual |
+| System.Xml;XmlDictionaryReader;CreateTextReader;(System.Byte[],System.Int32,System.Int32,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose);Argument[5];Argument[5].Parameter[delegate-self];value;manual |
+| System.Xml;XmlDictionaryReader;CreateTextReader;(System.Byte[],System.Int32,System.Int32,System.Xml.XmlDictionaryReaderQuotas);Argument[0].Element;ReturnValue;taint;manual |
+| System.Xml;XmlDictionaryReader;CreateTextReader;(System.Byte[],System.Xml.XmlDictionaryReaderQuotas);Argument[0].Element;ReturnValue;taint;manual |
+| System.Xml;XmlDictionaryReader;CreateTextReader;(System.IO.Stream,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose);Argument[0];ReturnValue;taint;manual |
+| System.Xml;XmlDictionaryReader;CreateTextReader;(System.IO.Stream,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
+| System.Xml;XmlDictionaryReader;CreateTextReader;(System.IO.Stream,System.Xml.XmlDictionaryReaderQuotas);Argument[0];ReturnValue;taint;manual |
 | System.Xml;XmlDictionaryReader;GetAttribute;(System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDictionaryReader;GetNonAtomizedNames;(System.String,System.String);Argument[this];Argument[0];taint;df-generated |
 | System.Xml;XmlDictionaryReader;GetNonAtomizedNames;(System.String,System.String);Argument[this];Argument[1];taint;df-generated |
-| System.Xml;XmlDictionaryReader;ReadContentAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[1];ReturnValue;taint;df-generated |
-| System.Xml;XmlDictionaryReader;ReadContentAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];Argument[1];taint;df-generated |
-| System.Xml;XmlDictionaryReader;ReadContentAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlDictionaryReader;ReadContentAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlDictionaryReader;ReadContentAsBase64;();Argument[this];ReturnValue;taint;manual |
+| System.Xml;XmlDictionaryReader;ReadContentAsBinHex;();Argument[this];ReturnValue;taint;manual |
+| System.Xml;XmlDictionaryReader;ReadContentAsBinHex;(System.Int32);Argument[this];ReturnValue;taint;manual |
+| System.Xml;XmlDictionaryReader;ReadContentAsChars;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
 | System.Xml;XmlDictionaryReader;ReadContentAsQualifiedName;(System.String,System.String);Argument[this];Argument[0];taint;df-generated |
 | System.Xml;XmlDictionaryReader;ReadContentAsQualifiedName;(System.String,System.String);Argument[this];Argument[1];taint;df-generated |
-| System.Xml;XmlDictionaryReader;ReadContentAsString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlDictionaryReader;ReadContentAsString;();Argument[this];ReturnValue;taint;df-manual |
 | System.Xml;XmlDictionaryReader;ReadContentAsString;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDictionaryReader;ReadContentAsString;(System.String[],System.Int32);Argument[0].Element;ReturnValue;value;dfc-generated |
 | System.Xml;XmlDictionaryReader;ReadContentAsString;(System.Xml.XmlDictionaryString[],System.Int32);Argument[0].Element.Property[System.Xml.XmlDictionaryString.Value];ReturnValue;value;dfc-generated |
 | System.Xml;XmlDictionaryReader;ReadContentAsUniqueId;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlDictionaryReader;ReadElementContentAsString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlDictionaryReader;ReadElementContentAsBase64;();Argument[this];ReturnValue;taint;manual |
+| System.Xml;XmlDictionaryReader;ReadElementContentAsBinHex;();Argument[this];ReturnValue;taint;manual |
+| System.Xml;XmlDictionaryReader;ReadElementContentAsString;();Argument[this];ReturnValue;taint;df-manual |
 | System.Xml;XmlDictionaryReader;ReadElementContentAsUniqueId;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlDictionaryReader;ReadString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlDictionaryReader;ReadString;();Argument[this];ReturnValue;taint;df-manual |
 | System.Xml;XmlDictionaryReader;ReadString;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDictionaryReader;get_Quotas;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDictionaryString;ToString;();Argument[this].SyntheticField[System.Xml.XmlDictionaryString._value];ReturnValue;value;dfc-generated |
@@ -21261,30 +21268,28 @@ summary
 | System.Xml;XmlNodeList;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Xml;XmlNodeList;Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlNodeList;get_ItemOf;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlNodeReader;GetAttribute;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlNodeReader;GetAttribute;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlNodeReader;GetAttribute;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlNodeReader;GetAttribute;(System.Int32);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlNodeReader;GetAttribute;(System.String);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlNodeReader;GetAttribute;(System.String,System.String);Argument[this];ReturnValue;taint;df-manual |
 | System.Xml;XmlNodeReader;GetNamespacesInScope;(System.Xml.XmlNamespaceScope);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlNodeReader;LookupNamespace;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml;XmlNodeReader;LookupNamespace;(System.String);Argument[0];ReturnValue;value;dfc-manual |
 | System.Xml;XmlNodeReader;LookupPrefix;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlNodeReader;MoveToAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Xml;XmlNodeReader;ReadContentAsBase64;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlNodeReader;ReadContentAsBinHex;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlNodeReader;ReadElementContentAsBase64;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlNodeReader;ReadElementContentAsBinHex;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlNodeReader;ReadString;();Argument[this].Property[System.Xml.XmlReader.Value];ReturnValue;taint;df-generated |
-| System.Xml;XmlNodeReader;ReadString;();Argument[this].Property[System.Xml.XmlReader.Value];ReturnValue;taint;dfc-generated |
-| System.Xml;XmlNodeReader;ReadString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlNodeReader;ReadString;();Argument[this];ReturnValue;taint;dfc-generated |
+| System.Xml;XmlNodeReader;ReadContentAsBase64;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlNodeReader;ReadContentAsBinHex;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlNodeReader;ReadElementContentAsBase64;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlNodeReader;ReadElementContentAsBinHex;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlNodeReader;ReadString;();Argument[this];ReturnValue;taint;df-manual |
 | System.Xml;XmlNodeReader;XmlNodeReader;(System.Xml.XmlNode);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlNodeReader;get_BaseURI;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlNodeReader;get_LocalName;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlNodeReader;get_Name;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlNodeReader;get_NameTable;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlNodeReader;get_NamespaceURI;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlNodeReader;get_Prefix;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlNodeReader;get_SchemaInfo;();Argument[this];ReturnValue;value;dfc-generated |
-| System.Xml;XmlNodeReader;get_Value;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlNodeReader;get_BaseURI;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlNodeReader;get_LocalName;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlNodeReader;get_Name;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlNodeReader;get_NameTable;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlNodeReader;get_NamespaceURI;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlNodeReader;get_Prefix;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlNodeReader;get_SchemaInfo;();Argument[this];ReturnValue;value;dfc-manual |
+| System.Xml;XmlNodeReader;get_Value;();Argument[this];ReturnValue;taint;df-manual |
 | System.Xml;XmlNodeReader;get_XmlLang;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlNotation;CloneNode;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlNotation;WriteContentTo;(System.Xml.XmlWriter);Argument[this];Argument[0];taint;df-generated |
@@ -21337,60 +21342,58 @@ summary
 | System.Xml;XmlReader;Create;(System.String,System.Xml.XmlReaderSettings);Argument[0];ReturnValue;taint;manual |
 | System.Xml;XmlReader;Create;(System.String,System.Xml.XmlReaderSettings,System.Xml.XmlParserContext);Argument[0];ReturnValue;taint;manual |
 | System.Xml;XmlReader;Create;(System.Xml.XmlReader,System.Xml.XmlReaderSettings);Argument[0];ReturnValue;taint;manual |
-| System.Xml;XmlReader;GetAttribute;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;GetAttribute;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;GetAttribute;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;GetValueAsync;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;LookupNamespace;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml;XmlReader;GetAttribute;(System.Int32);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;GetAttribute;(System.String);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;GetAttribute;(System.String,System.String);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;GetValueAsync;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;LookupNamespace;(System.String);Argument[0];ReturnValue;value;dfc-manual |
 | System.Xml;XmlReader;MoveToAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Xml;XmlReader;ReadContentAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[1];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadContentAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];Argument[1];taint;df-generated |
-| System.Xml;XmlReader;ReadContentAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadContentAsAsync;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[1];Argument[this];taint;df-generated |
-| System.Xml;XmlReader;ReadContentAsAsync;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[1];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadContentAsAsync;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadContentAsBase64;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlReader;ReadContentAsBase64Async;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlReader;ReadContentAsBinHex;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlReader;ReadContentAsBinHexAsync;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlReader;ReadContentAsObject;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadContentAsString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadContentAsStringAsync;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlReader;ReadContentAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadContentAsAsync;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadContentAsBase64;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlReader;ReadContentAsBase64Async;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlReader;ReadContentAsBinHex;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlReader;ReadContentAsBinHexAsync;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlReader;ReadContentAsObject;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadContentAsObjectAsync;();Argument[this];ReturnValue;taint;manual |
+| System.Xml;XmlReader;ReadContentAsString;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadContentAsStringAsync;();Argument[this];ReturnValue;taint;df-manual |
 | System.Xml;XmlReader;ReadElementContentAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[1];ReturnValue;taint;df-generated |
 | System.Xml;XmlReader;ReadElementContentAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];Argument[1];taint;df-generated |
 | System.Xml;XmlReader;ReadElementContentAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadElementContentAs;(System.Type,System.Xml.IXmlNamespaceResolver,System.String,System.String);Argument[1];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadElementContentAs;(System.Type,System.Xml.IXmlNamespaceResolver,System.String,System.String);Argument[this];Argument[1];taint;df-generated |
-| System.Xml;XmlReader;ReadElementContentAs;(System.Type,System.Xml.IXmlNamespaceResolver,System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadElementContentAsAsync;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[1];Argument[this];taint;df-generated |
-| System.Xml;XmlReader;ReadElementContentAsAsync;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[1];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadElementContentAsBase64;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlReader;ReadElementContentAsBase64Async;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlReader;ReadElementContentAsBinHex;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlReader;ReadElementContentAsBinHexAsync;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlReader;ReadElementContentAsObject;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadElementContentAsObject;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadElementContentAsString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadElementContentAsString;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadElementString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadElementString;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadElementString;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadInnerXml;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadOuterXml;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadSubtree;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;get_BaseURI;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;get_Item;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;get_LocalName;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;get_Name;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;get_NameTable;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;get_NamespaceURI;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;get_Prefix;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;get_SchemaInfo;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Xml;XmlReader;ReadElementContentAs;(System.Type,System.Xml.IXmlNamespaceResolver,System.String,System.String);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadElementContentAsAsync;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];ReturnValue;taint;manual |
+| System.Xml;XmlReader;ReadElementContentAsBase64;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlReader;ReadElementContentAsBase64Async;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlReader;ReadElementContentAsBinHex;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlReader;ReadElementContentAsBinHexAsync;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlReader;ReadElementContentAsObject;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadElementContentAsObject;(System.String,System.String);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadElementContentAsString;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadElementContentAsString;(System.String,System.String);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadElementString;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadElementString;(System.String);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadElementString;(System.String,System.String);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadInnerXml;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadInnerXmlAsync;();Argument[this];ReturnValue;taint;manual |
+| System.Xml;XmlReader;ReadOuterXml;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadOuterXmlAsync;();Argument[this];ReturnValue;taint;manual |
+| System.Xml;XmlReader;ReadString;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadSubtree;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadValueChunk;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlReader;ReadValueChunkAsync;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlReader;get_BaseURI;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;get_Item;(System.String);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;get_Item;(System.String,System.String);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;get_LocalName;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;get_Name;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;get_NameTable;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;get_NamespaceURI;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;get_Prefix;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;get_SchemaInfo;();Argument[this];ReturnValue;value;dfc-manual |
 | System.Xml;XmlReader;get_Settings;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;get_Value;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlReader;get_Value;();Argument[this];ReturnValue;taint;df-manual |
 | System.Xml;XmlReader;get_XmlLang;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlReaderSettings;add_ValidationEventHandler;(System.Xml.Schema.ValidationEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Xml;XmlReaderSettings;remove_ValidationEventHandler;(System.Xml.Schema.ValidationEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -21430,43 +21433,44 @@ summary
 | System.Xml;XmlText;get_ParentNode;();Argument[this];ReturnValue;taint;manual |
 | System.Xml;XmlText;get_PreviousText;();Argument[this];ReturnValue;taint;manual |
 | System.Xml;XmlText;get_Value;();Argument[this];ReturnValue;taint;manual |
-| System.Xml;XmlTextReader;GetAttribute;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlTextReader;GetAttribute;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlTextReader;GetAttribute;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlTextReader;GetNamespacesInScope;(System.Xml.XmlNamespaceScope);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlTextReader;GetRemainder;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlTextReader;GetAttribute;(System.Int32);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlTextReader;GetAttribute;(System.String);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlTextReader;GetAttribute;(System.String,System.String);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlTextReader;GetNamespacesInScope;(System.Xml.XmlNamespaceScope);Argument[0];Argument[this];taint;manual |
+| System.Xml;XmlTextReader;GetRemainder;();Argument[this];ReturnValue;taint;manual |
 | System.Xml;XmlTextReader;LookupNamespace;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml;XmlTextReader;LookupNamespace;(System.String);Argument[0];ReturnValue;value;dfc-manual |
 | System.Xml;XmlTextReader;LookupPrefix;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlTextReader;MoveToAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Xml;XmlTextReader;ReadContentAsBase64;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlTextReader;ReadContentAsBinHex;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlTextReader;ReadElementContentAsBase64;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlTextReader;ReadElementContentAsBinHex;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlTextReader;ReadString;();Argument[this].Property[System.Xml.XmlReader.Value];ReturnValue;taint;df-generated |
-| System.Xml;XmlTextReader;ReadString;();Argument[this].Property[System.Xml.XmlReader.Value];ReturnValue;taint;dfc-generated |
-| System.Xml;XmlTextReader;ReadString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlTextReader;ReadString;();Argument[this];ReturnValue;taint;dfc-generated |
-| System.Xml;XmlTextReader;XmlTextReader;(System.IO.Stream,System.Xml.XmlNodeType,System.Xml.XmlParserContext);Argument[2];Argument[this];taint;df-generated |
-| System.Xml;XmlTextReader;XmlTextReader;(System.String);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._reportedBaseUri];taint;dfc-generated |
-| System.Xml;XmlTextReader;XmlTextReader;(System.String,System.IO.Stream,System.Xml.XmlNameTable);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._reportedBaseUri];value;dfc-generated |
-| System.Xml;XmlTextReader;XmlTextReader;(System.String,System.IO.TextReader,System.Xml.XmlNameTable);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._reportedBaseUri];value;dfc-generated |
-| System.Xml;XmlTextReader;XmlTextReader;(System.String,System.Xml.XmlNameTable);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._reportedBaseUri];taint;dfc-generated |
-| System.Xml;XmlTextReader;XmlTextReader;(System.String,System.Xml.XmlNodeType,System.Xml.XmlParserContext);Argument[2];Argument[this];taint;df-generated |
-| System.Xml;XmlTextReader;XmlTextReader;(System.Xml.XmlNameTable);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._nameTable];value;dfc-generated |
-| System.Xml;XmlTextReader;get_BaseURI;();Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._reportedBaseUri];ReturnValue;value;df-generated |
-| System.Xml;XmlTextReader;get_BaseURI;();Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._reportedBaseUri];ReturnValue;value;dfc-generated |
-| System.Xml;XmlTextReader;get_BaseURI;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlTextReader;get_BaseURI;();Argument[this];ReturnValue;taint;dfc-generated |
+| System.Xml;XmlTextReader;ReadBase64;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlTextReader;ReadBinHex;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlTextReader;ReadChars;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlTextReader;ReadContentAsBase64;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlTextReader;ReadContentAsBinHex;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlTextReader;ReadElementContentAsBase64;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlTextReader;ReadElementContentAsBinHex;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlTextReader;ReadString;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlTextReader;XmlTextReader;(System.IO.Stream);Argument[0];Argument[this];taint;manual |
+| System.Xml;XmlTextReader;XmlTextReader;(System.IO.Stream,System.Xml.XmlNameTable);Argument[0];Argument[this];taint;manual |
+| System.Xml;XmlTextReader;XmlTextReader;(System.IO.Stream,System.Xml.XmlNodeType,System.Xml.XmlParserContext);Argument[0];Argument[this];taint;manual |
+| System.Xml;XmlTextReader;XmlTextReader;(System.IO.TextReader);Argument[0];Argument[this];taint;manual |
+| System.Xml;XmlTextReader;XmlTextReader;(System.IO.TextReader,System.Xml.XmlNameTable);Argument[0];Argument[this];taint;manual |
+| System.Xml;XmlTextReader;XmlTextReader;(System.String);Argument[0];Argument[this];taint;manual |
+| System.Xml;XmlTextReader;XmlTextReader;(System.String,System.IO.Stream);Argument[0];Argument[this];taint;manual |
+| System.Xml;XmlTextReader;XmlTextReader;(System.String,System.IO.Stream,System.Xml.XmlNameTable);Argument[0];Argument[this];taint;manual |
+| System.Xml;XmlTextReader;XmlTextReader;(System.String,System.IO.TextReader);Argument[0];Argument[this];taint;manual |
+| System.Xml;XmlTextReader;XmlTextReader;(System.String,System.IO.TextReader,System.Xml.XmlNameTable);Argument[0];Argument[this];taint;manual |
+| System.Xml;XmlTextReader;XmlTextReader;(System.String,System.Xml.XmlNameTable);Argument[0];Argument[this];taint;manual |
+| System.Xml;XmlTextReader;XmlTextReader;(System.String,System.Xml.XmlNodeType,System.Xml.XmlParserContext);Argument[0];Argument[this];taint;manual |
+| System.Xml;XmlTextReader;XmlTextReader;(System.Xml.XmlNameTable);Argument[0];Argument[this];taint;manual |
+| System.Xml;XmlTextReader;get_BaseURI;();Argument[this];ReturnValue;taint;df-manual |
 | System.Xml;XmlTextReader;get_Encoding;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlTextReader;get_LocalName;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlTextReader;get_Name;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlTextReader;get_NameTable;();Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._nameTable];ReturnValue;value;df-generated |
-| System.Xml;XmlTextReader;get_NameTable;();Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._nameTable];ReturnValue;value;dfc-generated |
-| System.Xml;XmlTextReader;get_NameTable;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlTextReader;get_NameTable;();Argument[this];ReturnValue;taint;dfc-generated |
-| System.Xml;XmlTextReader;get_NamespaceURI;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlTextReader;get_Prefix;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlTextReader;get_Value;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlTextReader;get_LocalName;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlTextReader;get_Name;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlTextReader;get_NameTable;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlTextReader;get_NamespaceURI;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlTextReader;get_Prefix;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlTextReader;get_Value;();Argument[this];ReturnValue;taint;df-manual |
 | System.Xml;XmlTextReader;get_XmlLang;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlTextReader;set_XmlResolver;(System.Xml.XmlResolver);Argument[0];Argument[this];taint;df-generated |
 | System.Xml;XmlTextWriter;LookupPrefix;(System.String);Argument[this];ReturnValue;taint;df-generated |
@@ -21541,37 +21545,35 @@ summary
 | System.Xml;XmlUrlResolver;ResolveUri;(System.Uri,System.String);Argument[1];ReturnValue;taint;dfc-generated |
 | System.Xml;XmlUrlResolver;set_Credentials;(System.Net.ICredentials);Argument[0];Argument[this];taint;df-generated |
 | System.Xml;XmlUrlResolver;set_Proxy;(System.Net.IWebProxy);Argument[0];Argument[this];taint;df-generated |
-| System.Xml;XmlValidatingReader;GetAttribute;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlValidatingReader;GetAttribute;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlValidatingReader;GetAttribute;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlValidatingReader;GetAttribute;(System.Int32);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlValidatingReader;GetAttribute;(System.String);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlValidatingReader;GetAttribute;(System.String,System.String);Argument[this];ReturnValue;taint;df-manual |
 | System.Xml;XmlValidatingReader;GetNamespacesInScope;(System.Xml.XmlNamespaceScope);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlValidatingReader;LookupNamespace;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml;XmlValidatingReader;LookupNamespace;(System.String);Argument[0];ReturnValue;value;dfc-manual |
 | System.Xml;XmlValidatingReader;LookupPrefix;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlValidatingReader;MoveToAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Xml;XmlValidatingReader;ReadContentAsBase64;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlValidatingReader;ReadContentAsBinHex;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlValidatingReader;ReadElementContentAsBase64;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlValidatingReader;ReadElementContentAsBinHex;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlValidatingReader;ReadString;();Argument[this].Property[System.Xml.XmlReader.Value];ReturnValue;taint;df-generated |
-| System.Xml;XmlValidatingReader;ReadString;();Argument[this].Property[System.Xml.XmlReader.Value];ReturnValue;taint;dfc-generated |
-| System.Xml;XmlValidatingReader;ReadString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlValidatingReader;ReadString;();Argument[this];ReturnValue;taint;dfc-generated |
+| System.Xml;XmlValidatingReader;ReadContentAsBase64;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlValidatingReader;ReadContentAsBinHex;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlValidatingReader;ReadElementContentAsBase64;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlValidatingReader;ReadElementContentAsBinHex;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlValidatingReader;ReadString;();Argument[this];ReturnValue;taint;df-manual |
 | System.Xml;XmlValidatingReader;ReadTypedValue;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlValidatingReader;XmlValidatingReader;(System.IO.Stream,System.Xml.XmlNodeType,System.Xml.XmlParserContext);Argument[2];Argument[this];taint;df-generated |
 | System.Xml;XmlValidatingReader;XmlValidatingReader;(System.String,System.Xml.XmlNodeType,System.Xml.XmlParserContext);Argument[2];Argument[this];taint;df-generated |
 | System.Xml;XmlValidatingReader;XmlValidatingReader;(System.Xml.XmlReader);Argument[0];Argument[this];taint;df-generated |
 | System.Xml;XmlValidatingReader;add_ValidationEventHandler;(System.Xml.Schema.ValidationEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Xml;XmlValidatingReader;get_BaseURI;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlValidatingReader;get_BaseURI;();Argument[this];ReturnValue;taint;df-manual |
 | System.Xml;XmlValidatingReader;get_Encoding;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlValidatingReader;get_LocalName;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlValidatingReader;get_Name;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlValidatingReader;get_NameTable;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlValidatingReader;get_NamespaceURI;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlValidatingReader;get_Prefix;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlValidatingReader;get_LocalName;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlValidatingReader;get_Name;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlValidatingReader;get_NameTable;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlValidatingReader;get_NamespaceURI;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlValidatingReader;get_Prefix;();Argument[this];ReturnValue;taint;df-manual |
 | System.Xml;XmlValidatingReader;get_Reader;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlValidatingReader;get_SchemaType;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlValidatingReader;get_Schemas;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlValidatingReader;get_Value;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlValidatingReader;get_Value;();Argument[this];ReturnValue;taint;df-manual |
 | System.Xml;XmlValidatingReader;get_XmlLang;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlValidatingReader;remove_ValidationEventHandler;(System.Xml.Schema.ValidationEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Xml;XmlWhitespace;CloneNode;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
@@ -21887,15 +21889,15 @@ summary
 | System;Convert;ChangeType;(System.Object,System.Type,System.IFormatProvider);Argument[0];ReturnValue;taint;manual |
 | System;Convert;ChangeType;(System.Object,System.TypeCode);Argument[0];ReturnValue;taint;manual |
 | System;Convert;ChangeType;(System.Object,System.TypeCode,System.IFormatProvider);Argument[0];ReturnValue;taint;manual |
-| System;Convert;FromBase64CharArray;(System.Char[],System.Int32,System.Int32);Argument[0].Element;ReturnValue.Element;taint;manual |
-| System;Convert;FromBase64String;(System.String);Argument[0];ReturnValue.Element;taint;manual |
-| System;Convert;FromHexString;(System.ReadOnlySpan<System.Char>);Argument[0].Element;ReturnValue.Element;taint;manual |
-| System;Convert;FromHexString;(System.String);Argument[0];ReturnValue.Element;taint;manual |
+| System;Convert;FromBase64CharArray;(System.Char[],System.Int32,System.Int32);Argument[0].Element;ReturnValue;taint;manual |
+| System;Convert;FromBase64String;(System.String);Argument[0];ReturnValue;taint;manual |
+| System;Convert;FromHexString;(System.ReadOnlySpan<System.Char>);Argument[0].Element;ReturnValue;taint;manual |
+| System;Convert;FromHexString;(System.String);Argument[0];ReturnValue;taint;manual |
 | System;Convert;GetTypeCode;(System.Object);Argument[0];ReturnValue;taint;manual |
 | System;Convert;IsDBNull;(System.Object);Argument[0];ReturnValue;taint;manual |
-| System;Convert;ToBase64CharArray;(System.Byte[],System.Int32,System.Int32,System.Char[],System.Int32);Argument[0].Element;Argument[3].Element;taint;manual |
+| System;Convert;ToBase64CharArray;(System.Byte[],System.Int32,System.Int32,System.Char[],System.Int32);Argument[0].Element;Argument[3];taint;manual |
 | System;Convert;ToBase64CharArray;(System.Byte[],System.Int32,System.Int32,System.Char[],System.Int32);Argument[0].Element;ReturnValue;taint;manual |
-| System;Convert;ToBase64CharArray;(System.Byte[],System.Int32,System.Int32,System.Char[],System.Int32,System.Base64FormattingOptions);Argument[0].Element;Argument[3].Element;taint;manual |
+| System;Convert;ToBase64CharArray;(System.Byte[],System.Int32,System.Int32,System.Char[],System.Int32,System.Base64FormattingOptions);Argument[0].Element;Argument[3];taint;manual |
 | System;Convert;ToBase64CharArray;(System.Byte[],System.Int32,System.Int32,System.Char[],System.Int32,System.Base64FormattingOptions);Argument[0].Element;ReturnValue;taint;manual |
 | System;Convert;ToBase64String;(System.Byte[]);Argument[0].Element;ReturnValue;taint;manual |
 | System;Convert;ToBase64String;(System.Byte[],System.Base64FormattingOptions);Argument[0].Element;ReturnValue;taint;manual |
@@ -22201,13 +22203,13 @@ summary
 | System;Convert;ToUInt64;(System.UInt16);Argument[0];ReturnValue;taint;manual |
 | System;Convert;ToUInt64;(System.UInt32);Argument[0];ReturnValue;taint;manual |
 | System;Convert;ToUInt64;(System.UInt64);Argument[0];ReturnValue;taint;manual |
-| System;Convert;TryFromBase64Chars;(System.ReadOnlySpan<System.Char>,System.Span<System.Byte>,System.Int32);Argument[0].Element;Argument[1].Element;taint;manual |
+| System;Convert;TryFromBase64Chars;(System.ReadOnlySpan<System.Char>,System.Span<System.Byte>,System.Int32);Argument[0].Element;Argument[1];taint;manual |
 | System;Convert;TryFromBase64Chars;(System.ReadOnlySpan<System.Char>,System.Span<System.Byte>,System.Int32);Argument[0].Element;Argument[2];taint;manual |
 | System;Convert;TryFromBase64Chars;(System.ReadOnlySpan<System.Char>,System.Span<System.Byte>,System.Int32);Argument[0].Element;ReturnValue;taint;manual |
-| System;Convert;TryFromBase64String;(System.String,System.Span<System.Byte>,System.Int32);Argument[0];Argument[1].Element;taint;manual |
+| System;Convert;TryFromBase64String;(System.String,System.Span<System.Byte>,System.Int32);Argument[0];Argument[1];taint;manual |
 | System;Convert;TryFromBase64String;(System.String,System.Span<System.Byte>,System.Int32);Argument[0];Argument[2];taint;manual |
 | System;Convert;TryFromBase64String;(System.String,System.Span<System.Byte>,System.Int32);Argument[0];ReturnValue;taint;manual |
-| System;Convert;TryToBase64Chars;(System.ReadOnlySpan<System.Byte>,System.Span<System.Char>,System.Int32,System.Base64FormattingOptions);Argument[0].Element;Argument[1].Element;taint;manual |
+| System;Convert;TryToBase64Chars;(System.ReadOnlySpan<System.Byte>,System.Span<System.Char>,System.Int32,System.Base64FormattingOptions);Argument[0].Element;Argument[1];taint;manual |
 | System;Convert;TryToBase64Chars;(System.ReadOnlySpan<System.Byte>,System.Span<System.Char>,System.Int32,System.Base64FormattingOptions);Argument[0].Element;Argument[2];taint;manual |
 | System;Convert;TryToBase64Chars;(System.ReadOnlySpan<System.Byte>,System.Span<System.Char>,System.Int32,System.Base64FormattingOptions);Argument[0].Element;ReturnValue;taint;manual |
 | System;Converter<TInput,TOutput>;BeginInvoke;(TInput,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
@@ -25711,6 +25713,7 @@ neutral
 | Newtonsoft.Json.Linq;JObject;remove_PropertyChanged;(System.ComponentModel.PropertyChangedEventHandler);summary;df-generated |
 | Newtonsoft.Json.Linq;JObject;remove_PropertyChanging;(System.ComponentModel.PropertyChangingEventHandler);summary;df-generated |
 | Newtonsoft.Json.Linq;JPropertyDescriptor;CanResetValue;(System.Object);summary;df-generated |
+| Newtonsoft.Json.Linq;JPropertyDescriptor;GetValue;(System.Object);summary;manual |
 | Newtonsoft.Json.Linq;JPropertyDescriptor;ShouldSerializeValue;(System.Object);summary;df-generated |
 | Newtonsoft.Json.Linq;JPropertyDescriptor;get_ComponentType;();summary;df-generated |
 | Newtonsoft.Json.Linq;JPropertyDescriptor;get_IsReadOnly;();summary;df-generated |
@@ -28808,6 +28811,7 @@ neutral
 | System.ComponentModel;PropertyDescriptor;GetChildProperties;(System.Object,System.Attribute[]);summary;df-generated |
 | System.ComponentModel;PropertyDescriptor;GetHashCode;();summary;df-generated |
 | System.ComponentModel;PropertyDescriptor;GetTypeFromName;(System.String);summary;df-generated |
+| System.ComponentModel;PropertyDescriptor;GetValue;(System.Object);summary;manual |
 | System.ComponentModel;PropertyDescriptor;GetValueChangedHandler;(System.Object);summary;df-generated |
 | System.ComponentModel;PropertyDescriptor;OnValueChanged;(System.Object,System.EventArgs);summary;df-generated |
 | System.ComponentModel;PropertyDescriptor;PropertyDescriptor;(System.ComponentModel.MemberDescriptor);summary;df-generated |
diff --git a/csharp/ql/test/library-tests/dataflow/library/FlowSummariesFiltered.expected b/csharp/ql/test/library-tests/dataflow/library/FlowSummariesFiltered.expected
index faf716f4d7b..c885864a31e 100644
--- a/csharp/ql/test/library-tests/dataflow/library/FlowSummariesFiltered.expected
+++ b/csharp/ql/test/library-tests/dataflow/library/FlowSummariesFiltered.expected
@@ -6727,7 +6727,6 @@
 | System.ComponentModel;PropertyChangingEventHandler;BeginInvoke;(System.Object,System.ComponentModel.PropertyChangingEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel;PropertyDescriptor;AddValueChanged;(System.Object,System.EventHandler);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel;PropertyDescriptor;GetEditor;(System.Type);Argument[this];ReturnValue;taint;df-generated |
-| System.ComponentModel;PropertyDescriptor;GetValue;(System.Object);Argument[0];ReturnValue;taint;dfc-generated |
 | System.ComponentModel;PropertyDescriptor;RemoveValueChanged;(System.Object,System.EventHandler);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.ComponentModel;PropertyDescriptor;ResetValue;(System.Object);Argument[this];Argument[0];taint;df-generated |
 | System.ComponentModel;PropertyDescriptor;SetValue;(System.Object,System.Object);Argument[0];Argument[this];taint;df-generated |
@@ -9285,7 +9284,7 @@
 | System.IO;RenamedEventArgs;get_OldName;();Argument[this].SyntheticField[System.IO.RenamedEventArgs._oldName];ReturnValue;value;dfc-generated |
 | System.IO;RenamedEventHandler;BeginInvoke;(System.Object,System.IO.RenamedEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.IO;Stream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
-| System.IO;Stream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0].Element;taint;manual |
+| System.IO;Stream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0];taint;manual |
 | System.IO;Stream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[0].Element;Argument[this];taint;manual |
 | System.IO;Stream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
 | System.IO;Stream;CopyTo;(System.IO.Stream);Argument[this];Argument[0];taint;manual |
@@ -9296,15 +9295,15 @@
 | System.IO;Stream;CopyToAsync;(System.IO.Stream,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | System.IO;Stream;FlushAsync;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO;Stream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
-| System.IO;Stream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;Stream;Read;(System.Span<System.Byte>);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;Stream;ReadAsync;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;Stream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;Stream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;Stream;ReadAtLeast;(System.Span<System.Byte>,System.Int32,System.Boolean);Argument[this];Argument[0].Element;taint;manual |
+| System.IO;Stream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO;Stream;Read;(System.Span<System.Byte>);Argument[this];Argument[0];taint;manual |
+| System.IO;Stream;ReadAsync;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO;Stream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
+| System.IO;Stream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
+| System.IO;Stream;ReadAtLeast;(System.Span<System.Byte>,System.Int32,System.Boolean);Argument[this];Argument[0];taint;manual |
 | System.IO;Stream;ReadAtLeastAsync;(System.Memory<System.Byte>,System.Int32,System.Boolean,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
-| System.IO;Stream;ReadExactly;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;Stream;ReadExactly;(System.Span<System.Byte>);Argument[this];Argument[0].Element;taint;manual |
+| System.IO;Stream;ReadExactly;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO;Stream;ReadExactly;(System.Span<System.Byte>);Argument[this];Argument[0];taint;manual |
 | System.IO;Stream;Synchronized;(System.IO.Stream);Argument[0];ReturnValue;value;dfc-generated |
 | System.IO;Stream;Write;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;manual |
 | System.IO;Stream;Write;(System.ReadOnlySpan<System.Byte>);Argument[0].Element;Argument[this];taint;manual |
@@ -9336,14 +9335,14 @@
 | System.IO;StringWriter;StringWriter;(System.Text.StringBuilder,System.IFormatProvider);Argument[0];Argument[this];taint;manual |
 | System.IO;StringWriter;ToString;();Argument[this];ReturnValue;taint;manual |
 | System.IO;TextReader;Read;();Argument[this];ReturnValue;taint;manual |
-| System.IO;TextReader;Read;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;TextReader;Read;(System.Span<System.Char>);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;TextReader;ReadAsync;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;TextReader;ReadAsync;(System.Memory<System.Char>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;TextReader;ReadBlock;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;TextReader;ReadBlock;(System.Span<System.Char>);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;TextReader;ReadBlockAsync;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;TextReader;ReadBlockAsync;(System.Memory<System.Char>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
+| System.IO;TextReader;Read;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO;TextReader;Read;(System.Span<System.Char>);Argument[this];Argument[0];taint;manual |
+| System.IO;TextReader;ReadAsync;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO;TextReader;ReadAsync;(System.Memory<System.Char>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
+| System.IO;TextReader;ReadBlock;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO;TextReader;ReadBlock;(System.Span<System.Char>);Argument[this];Argument[0];taint;manual |
+| System.IO;TextReader;ReadBlockAsync;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO;TextReader;ReadBlockAsync;(System.Memory<System.Char>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | System.IO;TextReader;ReadLine;();Argument[this];ReturnValue;taint;manual |
 | System.IO;TextReader;ReadLineAsync;();Argument[this];ReturnValue;taint;manual |
 | System.IO;TextReader;ReadLineAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
@@ -16210,17 +16209,28 @@
 | System.Xml;XmlDictionaryReader;CreateDictionaryReader;(System.Xml.XmlReader);Argument[0];ReturnValue;value;dfc-generated |
 | System.Xml;XmlDictionaryReader;CreateMtomReader;(System.Byte[],System.Int32,System.Int32,System.Text.Encoding[],System.String,System.Xml.XmlDictionaryReaderQuotas,System.Int32,System.Xml.OnXmlDictionaryReaderClose);Argument[7];Argument[7].Parameter[delegate-self];value;hq-generated |
 | System.Xml;XmlDictionaryReader;CreateMtomReader;(System.IO.Stream,System.Text.Encoding[],System.String,System.Xml.XmlDictionaryReaderQuotas,System.Int32,System.Xml.OnXmlDictionaryReaderClose);Argument[5];Argument[5].Parameter[delegate-self];value;hq-generated |
-| System.Xml;XmlDictionaryReader;CreateTextReader;(System.Byte[],System.Int32,System.Int32,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose);Argument[5];Argument[5].Parameter[delegate-self];value;hq-generated |
-| System.Xml;XmlDictionaryReader;CreateTextReader;(System.IO.Stream,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
+| System.Xml;XmlDictionaryReader;CreateTextReader;(System.Byte[],System.Int32,System.Int32,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose);Argument[0].Element;ReturnValue;taint;manual |
+| System.Xml;XmlDictionaryReader;CreateTextReader;(System.Byte[],System.Int32,System.Int32,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose);Argument[5];Argument[5].Parameter[delegate-self];value;manual |
+| System.Xml;XmlDictionaryReader;CreateTextReader;(System.Byte[],System.Int32,System.Int32,System.Xml.XmlDictionaryReaderQuotas);Argument[0].Element;ReturnValue;taint;manual |
+| System.Xml;XmlDictionaryReader;CreateTextReader;(System.Byte[],System.Xml.XmlDictionaryReaderQuotas);Argument[0].Element;ReturnValue;taint;manual |
+| System.Xml;XmlDictionaryReader;CreateTextReader;(System.IO.Stream,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose);Argument[0];ReturnValue;taint;manual |
+| System.Xml;XmlDictionaryReader;CreateTextReader;(System.IO.Stream,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
+| System.Xml;XmlDictionaryReader;CreateTextReader;(System.IO.Stream,System.Xml.XmlDictionaryReaderQuotas);Argument[0];ReturnValue;taint;manual |
 | System.Xml;XmlDictionaryReader;GetAttribute;(System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDictionaryReader;GetNonAtomizedNames;(System.String,System.String);Argument[this];Argument[0];taint;df-generated |
 | System.Xml;XmlDictionaryReader;GetNonAtomizedNames;(System.String,System.String);Argument[this];Argument[1];taint;df-generated |
+| System.Xml;XmlDictionaryReader;ReadContentAsBase64;();Argument[this];ReturnValue;taint;manual |
+| System.Xml;XmlDictionaryReader;ReadContentAsBinHex;();Argument[this];ReturnValue;taint;manual |
+| System.Xml;XmlDictionaryReader;ReadContentAsBinHex;(System.Int32);Argument[this];ReturnValue;taint;manual |
+| System.Xml;XmlDictionaryReader;ReadContentAsChars;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
 | System.Xml;XmlDictionaryReader;ReadContentAsQualifiedName;(System.String,System.String);Argument[this];Argument[0];taint;df-generated |
 | System.Xml;XmlDictionaryReader;ReadContentAsQualifiedName;(System.String,System.String);Argument[this];Argument[1];taint;df-generated |
 | System.Xml;XmlDictionaryReader;ReadContentAsString;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDictionaryReader;ReadContentAsString;(System.String[],System.Int32);Argument[0].Element;ReturnValue;value;dfc-generated |
 | System.Xml;XmlDictionaryReader;ReadContentAsString;(System.Xml.XmlDictionaryString[],System.Int32);Argument[0].Element.Property[System.Xml.XmlDictionaryString.Value];ReturnValue;value;dfc-generated |
 | System.Xml;XmlDictionaryReader;ReadContentAsUniqueId;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlDictionaryReader;ReadElementContentAsBase64;();Argument[this];ReturnValue;taint;manual |
+| System.Xml;XmlDictionaryReader;ReadElementContentAsBinHex;();Argument[this];ReturnValue;taint;manual |
 | System.Xml;XmlDictionaryReader;ReadElementContentAsUniqueId;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDictionaryReader;ReadString;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDictionaryReader;get_Quotas;();Argument[this];ReturnValue;taint;df-generated |
@@ -16503,8 +16513,6 @@
 | System.Xml;XmlNodeChangedEventHandler;BeginInvoke;(System.Object,System.Xml.XmlNodeChangedEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Xml;XmlNodeList;Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlNodeList;get_ItemOf;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlNodeReader;ReadString;();Argument[this].Property[System.Xml.XmlReader.Value];ReturnValue;taint;df-generated |
-| System.Xml;XmlNodeReader;ReadString;();Argument[this].Property[System.Xml.XmlReader.Value];ReturnValue;taint;dfc-generated |
 | System.Xml;XmlNodeReader;XmlNodeReader;(System.Xml.XmlNode);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Xml;XmlNotation;get_PublicId;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlNotation;get_SystemId;();Argument[this];ReturnValue;taint;df-generated |
@@ -16539,60 +16547,58 @@
 | System.Xml;XmlReader;Create;(System.String,System.Xml.XmlReaderSettings);Argument[0];ReturnValue;taint;manual |
 | System.Xml;XmlReader;Create;(System.String,System.Xml.XmlReaderSettings,System.Xml.XmlParserContext);Argument[0];ReturnValue;taint;manual |
 | System.Xml;XmlReader;Create;(System.Xml.XmlReader,System.Xml.XmlReaderSettings);Argument[0];ReturnValue;taint;manual |
-| System.Xml;XmlReader;GetAttribute;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;GetAttribute;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;GetAttribute;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;GetValueAsync;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;LookupNamespace;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml;XmlReader;GetAttribute;(System.Int32);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;GetAttribute;(System.String);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;GetAttribute;(System.String,System.String);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;GetValueAsync;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;LookupNamespace;(System.String);Argument[0];ReturnValue;value;dfc-manual |
 | System.Xml;XmlReader;MoveToAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Xml;XmlReader;ReadContentAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[1];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadContentAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];Argument[1];taint;df-generated |
-| System.Xml;XmlReader;ReadContentAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadContentAsAsync;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[1];Argument[this];taint;df-generated |
-| System.Xml;XmlReader;ReadContentAsAsync;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[1];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadContentAsAsync;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadContentAsBase64;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlReader;ReadContentAsBase64Async;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlReader;ReadContentAsBinHex;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlReader;ReadContentAsBinHexAsync;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlReader;ReadContentAsObject;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadContentAsString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadContentAsStringAsync;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlReader;ReadContentAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadContentAsAsync;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadContentAsBase64;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlReader;ReadContentAsBase64Async;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlReader;ReadContentAsBinHex;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlReader;ReadContentAsBinHexAsync;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlReader;ReadContentAsObject;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadContentAsObjectAsync;();Argument[this];ReturnValue;taint;manual |
+| System.Xml;XmlReader;ReadContentAsString;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadContentAsStringAsync;();Argument[this];ReturnValue;taint;df-manual |
 | System.Xml;XmlReader;ReadElementContentAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[1];ReturnValue;taint;df-generated |
 | System.Xml;XmlReader;ReadElementContentAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];Argument[1];taint;df-generated |
 | System.Xml;XmlReader;ReadElementContentAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadElementContentAs;(System.Type,System.Xml.IXmlNamespaceResolver,System.String,System.String);Argument[1];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadElementContentAs;(System.Type,System.Xml.IXmlNamespaceResolver,System.String,System.String);Argument[this];Argument[1];taint;df-generated |
-| System.Xml;XmlReader;ReadElementContentAs;(System.Type,System.Xml.IXmlNamespaceResolver,System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadElementContentAsAsync;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[1];Argument[this];taint;df-generated |
-| System.Xml;XmlReader;ReadElementContentAsAsync;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[1];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadElementContentAsBase64;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlReader;ReadElementContentAsBase64Async;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlReader;ReadElementContentAsBinHex;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlReader;ReadElementContentAsBinHexAsync;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlReader;ReadElementContentAsObject;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadElementContentAsObject;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadElementContentAsString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadElementContentAsString;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadElementString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadElementString;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadElementString;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadInnerXml;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadOuterXml;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadSubtree;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;get_BaseURI;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;get_Item;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;get_LocalName;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;get_Name;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;get_NameTable;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;get_NamespaceURI;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;get_Prefix;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;get_SchemaInfo;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Xml;XmlReader;ReadElementContentAs;(System.Type,System.Xml.IXmlNamespaceResolver,System.String,System.String);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadElementContentAsAsync;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];ReturnValue;taint;manual |
+| System.Xml;XmlReader;ReadElementContentAsBase64;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlReader;ReadElementContentAsBase64Async;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlReader;ReadElementContentAsBinHex;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlReader;ReadElementContentAsBinHexAsync;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlReader;ReadElementContentAsObject;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadElementContentAsObject;(System.String,System.String);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadElementContentAsString;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadElementContentAsString;(System.String,System.String);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadElementString;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadElementString;(System.String);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadElementString;(System.String,System.String);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadInnerXml;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadInnerXmlAsync;();Argument[this];ReturnValue;taint;manual |
+| System.Xml;XmlReader;ReadOuterXml;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadOuterXmlAsync;();Argument[this];ReturnValue;taint;manual |
+| System.Xml;XmlReader;ReadString;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadSubtree;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadValueChunk;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlReader;ReadValueChunkAsync;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlReader;get_BaseURI;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;get_Item;(System.String);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;get_Item;(System.String,System.String);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;get_LocalName;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;get_Name;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;get_NameTable;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;get_NamespaceURI;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;get_Prefix;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;get_SchemaInfo;();Argument[this];ReturnValue;value;dfc-manual |
 | System.Xml;XmlReader;get_Settings;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;get_Value;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlReader;get_Value;();Argument[this];ReturnValue;taint;df-manual |
 | System.Xml;XmlReader;get_XmlLang;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlReaderSettings;add_ValidationEventHandler;(System.Xml.Schema.ValidationEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Xml;XmlReaderSettings;remove_ValidationEventHandler;(System.Xml.Schema.ValidationEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -16608,21 +16614,25 @@
 | System.Xml;XmlSecureResolver;GetEntityAsync;(System.Uri,System.String,System.Type);Argument[0];ReturnValue.Property[System.Threading.Tasks.Task`1.Result];taint;df-generated |
 | System.Xml;XmlSecureResolver;GetEntityAsync;(System.Uri,System.String,System.Type);Argument[0];ReturnValue.Property[System.Threading.Tasks.Task`1.Result];taint;dfc-generated |
 | System.Xml;XmlText;SplitText;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlTextReader;GetRemainder;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlTextReader;ReadString;();Argument[this].Property[System.Xml.XmlReader.Value];ReturnValue;taint;df-generated |
-| System.Xml;XmlTextReader;ReadString;();Argument[this].Property[System.Xml.XmlReader.Value];ReturnValue;taint;dfc-generated |
-| System.Xml;XmlTextReader;XmlTextReader;(System.IO.Stream,System.Xml.XmlNodeType,System.Xml.XmlParserContext);Argument[2];Argument[this];taint;df-generated |
-| System.Xml;XmlTextReader;XmlTextReader;(System.String);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._reportedBaseUri];taint;dfc-generated |
-| System.Xml;XmlTextReader;XmlTextReader;(System.String,System.IO.Stream,System.Xml.XmlNameTable);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._reportedBaseUri];value;dfc-generated |
-| System.Xml;XmlTextReader;XmlTextReader;(System.String,System.IO.TextReader,System.Xml.XmlNameTable);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._reportedBaseUri];value;dfc-generated |
-| System.Xml;XmlTextReader;XmlTextReader;(System.String,System.Xml.XmlNameTable);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._reportedBaseUri];taint;dfc-generated |
-| System.Xml;XmlTextReader;XmlTextReader;(System.String,System.Xml.XmlNodeType,System.Xml.XmlParserContext);Argument[2];Argument[this];taint;df-generated |
-| System.Xml;XmlTextReader;XmlTextReader;(System.Xml.XmlNameTable);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._nameTable];value;dfc-generated |
-| System.Xml;XmlTextReader;get_BaseURI;();Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._reportedBaseUri];ReturnValue;value;df-generated |
-| System.Xml;XmlTextReader;get_BaseURI;();Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._reportedBaseUri];ReturnValue;value;dfc-generated |
+| System.Xml;XmlTextReader;GetNamespacesInScope;(System.Xml.XmlNamespaceScope);Argument[0];Argument[this];taint;manual |
+| System.Xml;XmlTextReader;GetRemainder;();Argument[this];ReturnValue;taint;manual |
+| System.Xml;XmlTextReader;ReadBase64;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlTextReader;ReadBinHex;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlTextReader;ReadChars;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlTextReader;XmlTextReader;(System.IO.Stream);Argument[0];Argument[this];taint;manual |
+| System.Xml;XmlTextReader;XmlTextReader;(System.IO.Stream,System.Xml.XmlNameTable);Argument[0];Argument[this];taint;manual |
+| System.Xml;XmlTextReader;XmlTextReader;(System.IO.Stream,System.Xml.XmlNodeType,System.Xml.XmlParserContext);Argument[0];Argument[this];taint;manual |
+| System.Xml;XmlTextReader;XmlTextReader;(System.IO.TextReader);Argument[0];Argument[this];taint;manual |
+| System.Xml;XmlTextReader;XmlTextReader;(System.IO.TextReader,System.Xml.XmlNameTable);Argument[0];Argument[this];taint;manual |
+| System.Xml;XmlTextReader;XmlTextReader;(System.String);Argument[0];Argument[this];taint;manual |
+| System.Xml;XmlTextReader;XmlTextReader;(System.String,System.IO.Stream);Argument[0];Argument[this];taint;manual |
+| System.Xml;XmlTextReader;XmlTextReader;(System.String,System.IO.Stream,System.Xml.XmlNameTable);Argument[0];Argument[this];taint;manual |
+| System.Xml;XmlTextReader;XmlTextReader;(System.String,System.IO.TextReader);Argument[0];Argument[this];taint;manual |
+| System.Xml;XmlTextReader;XmlTextReader;(System.String,System.IO.TextReader,System.Xml.XmlNameTable);Argument[0];Argument[this];taint;manual |
+| System.Xml;XmlTextReader;XmlTextReader;(System.String,System.Xml.XmlNameTable);Argument[0];Argument[this];taint;manual |
+| System.Xml;XmlTextReader;XmlTextReader;(System.String,System.Xml.XmlNodeType,System.Xml.XmlParserContext);Argument[0];Argument[this];taint;manual |
+| System.Xml;XmlTextReader;XmlTextReader;(System.Xml.XmlNameTable);Argument[0];Argument[this];taint;manual |
 | System.Xml;XmlTextReader;get_Encoding;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlTextReader;get_NameTable;();Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._nameTable];ReturnValue;value;df-generated |
-| System.Xml;XmlTextReader;get_NameTable;();Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._nameTable];ReturnValue;value;dfc-generated |
 | System.Xml;XmlTextReader;set_XmlResolver;(System.Xml.XmlResolver);Argument[0];Argument[this];taint;df-generated |
 | System.Xml;XmlTextWriter;WriteDocType;(System.String,System.String,System.String,System.String);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter];taint;df-generated |
 | System.Xml;XmlTextWriter;WriteDocType;(System.String,System.String,System.String,System.String);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter];taint;dfc-generated |
@@ -16653,8 +16663,6 @@
 | System.Xml;XmlTextWriter;get_BaseStream;();Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter].Property[System.IO.StreamWriter.BaseStream];ReturnValue;value;dfc-generated |
 | System.Xml;XmlUrlResolver;GetEntity;(System.Uri,System.String,System.Type);Argument[0].Property[System.Uri.LocalPath];ReturnValue;taint;dfc-generated |
 | System.Xml;XmlUrlResolver;set_Proxy;(System.Net.IWebProxy);Argument[0];Argument[this];taint;df-generated |
-| System.Xml;XmlValidatingReader;ReadString;();Argument[this].Property[System.Xml.XmlReader.Value];ReturnValue;taint;df-generated |
-| System.Xml;XmlValidatingReader;ReadString;();Argument[this].Property[System.Xml.XmlReader.Value];ReturnValue;taint;dfc-generated |
 | System.Xml;XmlValidatingReader;ReadTypedValue;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlValidatingReader;XmlValidatingReader;(System.IO.Stream,System.Xml.XmlNodeType,System.Xml.XmlParserContext);Argument[2];Argument[this];taint;df-generated |
 | System.Xml;XmlValidatingReader;XmlValidatingReader;(System.String,System.Xml.XmlNodeType,System.Xml.XmlParserContext);Argument[2];Argument[this];taint;df-generated |
@@ -16908,15 +16916,15 @@
 | System;Convert;ChangeType;(System.Object,System.Type,System.IFormatProvider);Argument[0];ReturnValue;taint;manual |
 | System;Convert;ChangeType;(System.Object,System.TypeCode);Argument[0];ReturnValue;taint;manual |
 | System;Convert;ChangeType;(System.Object,System.TypeCode,System.IFormatProvider);Argument[0];ReturnValue;taint;manual |
-| System;Convert;FromBase64CharArray;(System.Char[],System.Int32,System.Int32);Argument[0].Element;ReturnValue.Element;taint;manual |
-| System;Convert;FromBase64String;(System.String);Argument[0];ReturnValue.Element;taint;manual |
-| System;Convert;FromHexString;(System.ReadOnlySpan<System.Char>);Argument[0].Element;ReturnValue.Element;taint;manual |
-| System;Convert;FromHexString;(System.String);Argument[0];ReturnValue.Element;taint;manual |
+| System;Convert;FromBase64CharArray;(System.Char[],System.Int32,System.Int32);Argument[0].Element;ReturnValue;taint;manual |
+| System;Convert;FromBase64String;(System.String);Argument[0];ReturnValue;taint;manual |
+| System;Convert;FromHexString;(System.ReadOnlySpan<System.Char>);Argument[0].Element;ReturnValue;taint;manual |
+| System;Convert;FromHexString;(System.String);Argument[0];ReturnValue;taint;manual |
 | System;Convert;GetTypeCode;(System.Object);Argument[0];ReturnValue;taint;manual |
 | System;Convert;IsDBNull;(System.Object);Argument[0];ReturnValue;taint;manual |
-| System;Convert;ToBase64CharArray;(System.Byte[],System.Int32,System.Int32,System.Char[],System.Int32);Argument[0].Element;Argument[3].Element;taint;manual |
+| System;Convert;ToBase64CharArray;(System.Byte[],System.Int32,System.Int32,System.Char[],System.Int32);Argument[0].Element;Argument[3];taint;manual |
 | System;Convert;ToBase64CharArray;(System.Byte[],System.Int32,System.Int32,System.Char[],System.Int32);Argument[0].Element;ReturnValue;taint;manual |
-| System;Convert;ToBase64CharArray;(System.Byte[],System.Int32,System.Int32,System.Char[],System.Int32,System.Base64FormattingOptions);Argument[0].Element;Argument[3].Element;taint;manual |
+| System;Convert;ToBase64CharArray;(System.Byte[],System.Int32,System.Int32,System.Char[],System.Int32,System.Base64FormattingOptions);Argument[0].Element;Argument[3];taint;manual |
 | System;Convert;ToBase64CharArray;(System.Byte[],System.Int32,System.Int32,System.Char[],System.Int32,System.Base64FormattingOptions);Argument[0].Element;ReturnValue;taint;manual |
 | System;Convert;ToBase64String;(System.Byte[]);Argument[0].Element;ReturnValue;taint;manual |
 | System;Convert;ToBase64String;(System.Byte[],System.Base64FormattingOptions);Argument[0].Element;ReturnValue;taint;manual |
@@ -17222,13 +17230,13 @@
 | System;Convert;ToUInt64;(System.UInt16);Argument[0];ReturnValue;taint;manual |
 | System;Convert;ToUInt64;(System.UInt32);Argument[0];ReturnValue;taint;manual |
 | System;Convert;ToUInt64;(System.UInt64);Argument[0];ReturnValue;taint;manual |
-| System;Convert;TryFromBase64Chars;(System.ReadOnlySpan<System.Char>,System.Span<System.Byte>,System.Int32);Argument[0].Element;Argument[1].Element;taint;manual |
+| System;Convert;TryFromBase64Chars;(System.ReadOnlySpan<System.Char>,System.Span<System.Byte>,System.Int32);Argument[0].Element;Argument[1];taint;manual |
 | System;Convert;TryFromBase64Chars;(System.ReadOnlySpan<System.Char>,System.Span<System.Byte>,System.Int32);Argument[0].Element;Argument[2];taint;manual |
 | System;Convert;TryFromBase64Chars;(System.ReadOnlySpan<System.Char>,System.Span<System.Byte>,System.Int32);Argument[0].Element;ReturnValue;taint;manual |
-| System;Convert;TryFromBase64String;(System.String,System.Span<System.Byte>,System.Int32);Argument[0];Argument[1].Element;taint;manual |
+| System;Convert;TryFromBase64String;(System.String,System.Span<System.Byte>,System.Int32);Argument[0];Argument[1];taint;manual |
 | System;Convert;TryFromBase64String;(System.String,System.Span<System.Byte>,System.Int32);Argument[0];Argument[2];taint;manual |
 | System;Convert;TryFromBase64String;(System.String,System.Span<System.Byte>,System.Int32);Argument[0];ReturnValue;taint;manual |
-| System;Convert;TryToBase64Chars;(System.ReadOnlySpan<System.Byte>,System.Span<System.Char>,System.Int32,System.Base64FormattingOptions);Argument[0].Element;Argument[1].Element;taint;manual |
+| System;Convert;TryToBase64Chars;(System.ReadOnlySpan<System.Byte>,System.Span<System.Char>,System.Int32,System.Base64FormattingOptions);Argument[0].Element;Argument[1];taint;manual |
 | System;Convert;TryToBase64Chars;(System.ReadOnlySpan<System.Byte>,System.Span<System.Char>,System.Int32,System.Base64FormattingOptions);Argument[0].Element;Argument[2];taint;manual |
 | System;Convert;TryToBase64Chars;(System.ReadOnlySpan<System.Byte>,System.Span<System.Char>,System.Int32,System.Base64FormattingOptions);Argument[0].Element;ReturnValue;taint;manual |
 | System;Converter<TInput,TOutput>;BeginInvoke;(TInput,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
diff --git a/csharp/ql/test/library-tests/dataflow/local/DataFlow.expected b/csharp/ql/test/library-tests/dataflow/local/DataFlow.expected
index 005d84b1c97..ed80fa1e8b3 100644
--- a/csharp/ql/test/library-tests/dataflow/local/DataFlow.expected
+++ b/csharp/ql/test/library-tests/dataflow/local/DataFlow.expected
@@ -13,7 +13,9 @@
 | SSA.cs:98:15:98:22 | access to local variable ssaSink4 |
 | SSA.cs:124:15:124:34 | access to field SsaFieldSink1 |
 | SSA.cs:180:15:180:22 | access to local variable ssaSink5 |
-| Splitting.cs:8:19:8:19 | [b (line 3): true] access to local variable x |
-| Splitting.cs:12:15:12:15 | [b (line 3): false] access to local variable x |
-| Splitting.cs:25:15:25:15 | [b (line 17): true] access to local variable x |
+| Splitting.cs:8:19:8:19 | access to local variable x |
+| Splitting.cs:12:15:12:15 | access to local variable x |
+| Splitting.cs:14:19:14:19 | access to local variable x |
+| Splitting.cs:25:15:25:15 | access to local variable x |
 | Splitting.cs:27:19:27:19 | access to local variable x |
+| Splitting.cs:29:19:29:19 | access to local variable x |
diff --git a/csharp/ql/test/library-tests/dataflow/local/DataFlowStep.expected b/csharp/ql/test/library-tests/dataflow/local/DataFlowStep.expected
index 7dc5e3e4636..6bf236135a2 100644
--- a/csharp/ql/test/library-tests/dataflow/local/DataFlowStep.expected
+++ b/csharp/ql/test/library-tests/dataflow/local/DataFlowStep.expected
@@ -50,32 +50,24 @@
 | LocalDataFlow.cs:76:13:76:17 | access to local variable sink6 | LocalDataFlow.cs:76:13:76:27 | SSA def(sink6) |
 | LocalDataFlow.cs:76:13:76:27 | SSA def(sink6) | LocalDataFlow.cs:77:15:77:19 | access to local variable sink6 |
 | LocalDataFlow.cs:76:22:76:26 | access to local variable sink5 | LocalDataFlow.cs:76:13:76:17 | access to local variable sink6 |
-| LocalDataFlow.cs:77:15:77:19 | [post] access to local variable sink6 | LocalDataFlow.cs:84:31:84:35 | [b (line 48): false] access to local variable sink6 |
-| LocalDataFlow.cs:77:15:77:19 | access to local variable sink6 | LocalDataFlow.cs:84:31:84:35 | [b (line 48): false] access to local variable sink6 |
+| LocalDataFlow.cs:77:15:77:19 | [post] access to local variable sink6 | LocalDataFlow.cs:84:31:84:35 | access to local variable sink6 |
+| LocalDataFlow.cs:77:15:77:19 | access to local variable sink6 | LocalDataFlow.cs:84:31:84:35 | access to local variable sink6 |
 | LocalDataFlow.cs:80:9:80:16 | access to local variable nonSink0 | LocalDataFlow.cs:80:9:80:29 | SSA def(nonSink0) |
 | LocalDataFlow.cs:80:9:80:29 | SSA def(nonSink0) | LocalDataFlow.cs:81:15:81:22 | access to local variable nonSink0 |
 | LocalDataFlow.cs:80:21:80:28 | access to local variable nonSink0 | LocalDataFlow.cs:80:9:80:16 | access to local variable nonSink0 |
-| LocalDataFlow.cs:84:13:84:17 | access to local variable sink7 | LocalDataFlow.cs:84:13:84:35 | [b (line 48): false] SSA def(sink7) |
-| LocalDataFlow.cs:84:13:84:17 | access to local variable sink7 | LocalDataFlow.cs:84:13:84:35 | [b (line 48): true] SSA def(sink7) |
-| LocalDataFlow.cs:84:13:84:35 | [b (line 48): false] SSA def(sink7) | LocalDataFlow.cs:85:15:85:19 | [b (line 48): false] access to local variable sink7 |
-| LocalDataFlow.cs:84:13:84:35 | [b (line 48): true] SSA def(sink7) | LocalDataFlow.cs:85:15:85:19 | [b (line 48): true] access to local variable sink7 |
-| LocalDataFlow.cs:84:21:84:21 | access to parameter b | LocalDataFlow.cs:88:20:88:20 | [b (line 48): false] access to parameter b |
-| LocalDataFlow.cs:84:21:84:21 | access to parameter b | LocalDataFlow.cs:88:20:88:20 | [b (line 48): true] access to parameter b |
-| LocalDataFlow.cs:84:21:84:35 | [b (line 48): false] ... ? ... : ... | LocalDataFlow.cs:84:13:84:17 | access to local variable sink7 |
-| LocalDataFlow.cs:84:21:84:35 | [b (line 48): true] ... ? ... : ... | LocalDataFlow.cs:84:13:84:17 | access to local variable sink7 |
-| LocalDataFlow.cs:84:25:84:27 | [b (line 48): true] "a" | LocalDataFlow.cs:84:21:84:35 | [b (line 48): true] ... ? ... : ... |
-| LocalDataFlow.cs:84:31:84:35 | [b (line 48): false] access to local variable sink6 | LocalDataFlow.cs:84:21:84:35 | [b (line 48): false] ... ? ... : ... |
-| LocalDataFlow.cs:85:15:85:19 | [b (line 48): false] access to local variable sink7 | LocalDataFlow.cs:88:32:88:36 | [input] SSA phi(sink7) |
-| LocalDataFlow.cs:85:15:85:19 | [b (line 48): true] access to local variable sink7 | LocalDataFlow.cs:88:24:88:28 | [input] SSA phi(sink7) |
-| LocalDataFlow.cs:85:15:85:19 | [post] [b (line 48): false] access to local variable sink7 | LocalDataFlow.cs:88:32:88:36 | [input] SSA phi(sink7) |
-| LocalDataFlow.cs:85:15:85:19 | [post] [b (line 48): true] access to local variable sink7 | LocalDataFlow.cs:88:24:88:28 | [input] SSA phi(sink7) |
+| LocalDataFlow.cs:84:13:84:17 | access to local variable sink7 | LocalDataFlow.cs:84:13:84:35 | SSA def(sink7) |
+| LocalDataFlow.cs:84:13:84:35 | SSA def(sink7) | LocalDataFlow.cs:85:15:85:19 | access to local variable sink7 |
+| LocalDataFlow.cs:84:21:84:21 | access to parameter b | LocalDataFlow.cs:88:20:88:20 | access to parameter b |
+| LocalDataFlow.cs:84:21:84:35 | ... ? ... : ... | LocalDataFlow.cs:84:13:84:17 | access to local variable sink7 |
+| LocalDataFlow.cs:84:25:84:27 | "a" | LocalDataFlow.cs:84:21:84:35 | ... ? ... : ... |
+| LocalDataFlow.cs:84:31:84:35 | access to local variable sink6 | LocalDataFlow.cs:84:21:84:35 | ... ? ... : ... |
+| LocalDataFlow.cs:85:15:85:19 | [post] access to local variable sink7 | LocalDataFlow.cs:92:29:92:33 | access to local variable sink7 |
+| LocalDataFlow.cs:85:15:85:19 | access to local variable sink7 | LocalDataFlow.cs:92:29:92:33 | access to local variable sink7 |
 | LocalDataFlow.cs:88:9:88:16 | access to local variable nonSink0 | LocalDataFlow.cs:88:9:88:36 | SSA def(nonSink0) |
 | LocalDataFlow.cs:88:9:88:36 | SSA def(nonSink0) | LocalDataFlow.cs:89:15:89:22 | access to local variable nonSink0 |
 | LocalDataFlow.cs:88:20:88:36 | ... ? ... : ... | LocalDataFlow.cs:88:9:88:16 | access to local variable nonSink0 |
 | LocalDataFlow.cs:88:24:88:28 | "abc" | LocalDataFlow.cs:88:20:88:36 | ... ? ... : ... |
-| LocalDataFlow.cs:88:24:88:28 | [input] SSA phi(sink7) | LocalDataFlow.cs:92:29:92:33 | access to local variable sink7 |
 | LocalDataFlow.cs:88:32:88:36 | "def" | LocalDataFlow.cs:88:20:88:36 | ... ? ... : ... |
-| LocalDataFlow.cs:88:32:88:36 | [input] SSA phi(sink7) | LocalDataFlow.cs:92:29:92:33 | access to local variable sink7 |
 | LocalDataFlow.cs:89:15:89:22 | [post] access to local variable nonSink0 | LocalDataFlow.cs:96:32:96:39 | access to local variable nonSink0 |
 | LocalDataFlow.cs:89:15:89:22 | access to local variable nonSink0 | LocalDataFlow.cs:96:32:96:39 | access to local variable nonSink0 |
 | LocalDataFlow.cs:92:13:92:17 | access to local variable sink8 | LocalDataFlow.cs:92:13:92:33 | SSA def(sink8) |
@@ -930,115 +922,85 @@
 | Splitting.cs:3:28:3:34 | SSA param(tainted) | Splitting.cs:5:17:5:23 | access to parameter tainted |
 | Splitting.cs:3:28:3:34 | tainted | Splitting.cs:3:28:3:34 | SSA param(tainted) |
 | Splitting.cs:5:13:5:13 | access to local variable x | Splitting.cs:5:13:5:23 | SSA def(x) |
-| Splitting.cs:5:13:5:23 | SSA def(x) | Splitting.cs:8:19:8:19 | [b (line 3): true] access to local variable x |
-| Splitting.cs:5:13:5:23 | SSA def(x) | Splitting.cs:12:15:12:15 | [b (line 3): false] access to local variable x |
+| Splitting.cs:5:13:5:23 | SSA def(x) | Splitting.cs:6:13:6:13 | [input] SSA phi read(x) |
+| Splitting.cs:5:13:5:23 | SSA def(x) | Splitting.cs:8:19:8:19 | access to local variable x |
 | Splitting.cs:5:17:5:23 | access to parameter tainted | Splitting.cs:5:13:5:13 | access to local variable x |
-| Splitting.cs:6:13:6:13 | access to parameter b | Splitting.cs:13:13:13:13 | [b (line 3): false] access to parameter b |
-| Splitting.cs:6:13:6:13 | access to parameter b | Splitting.cs:13:13:13:13 | [b (line 3): true] access to parameter b |
-| Splitting.cs:8:19:8:19 | [b (line 3): true] access to local variable x | Splitting.cs:9:17:9:17 | [b (line 3): true] access to local variable x |
-| Splitting.cs:8:19:8:19 | [post] [b (line 3): true] access to local variable x | Splitting.cs:9:17:9:17 | [b (line 3): true] access to local variable x |
-| Splitting.cs:9:17:9:17 | [b (line 3): true] access to local variable x | Splitting.cs:12:15:12:15 | [b (line 3): true] access to local variable x |
-| Splitting.cs:12:15:12:15 | [b (line 3): true] access to local variable x | Splitting.cs:14:19:14:19 | access to local variable x |
-| Splitting.cs:12:15:12:15 | [post] [b (line 3): true] access to local variable x | Splitting.cs:14:19:14:19 | access to local variable x |
+| Splitting.cs:6:13:6:13 | [input] SSA phi read(x) | Splitting.cs:12:15:12:15 | access to local variable x |
+| Splitting.cs:6:13:6:13 | access to parameter b | Splitting.cs:13:13:13:13 | access to parameter b |
+| Splitting.cs:8:19:8:19 | [post] access to local variable x | Splitting.cs:9:17:9:17 | access to local variable x |
+| Splitting.cs:8:19:8:19 | access to local variable x | Splitting.cs:9:17:9:17 | access to local variable x |
+| Splitting.cs:9:17:9:17 | access to local variable x | Splitting.cs:9:17:9:25 | [input] SSA phi read(x) |
+| Splitting.cs:9:17:9:25 | [input] SSA phi read(x) | Splitting.cs:12:15:12:15 | access to local variable x |
+| Splitting.cs:12:15:12:15 | [post] access to local variable x | Splitting.cs:14:19:14:19 | access to local variable x |
+| Splitting.cs:12:15:12:15 | access to local variable x | Splitting.cs:14:19:14:19 | access to local variable x |
 | Splitting.cs:17:18:17:18 | SSA param(b) | Splitting.cs:20:13:20:13 | access to parameter b |
 | Splitting.cs:17:18:17:18 | b | Splitting.cs:17:18:17:18 | SSA param(b) |
 | Splitting.cs:19:13:19:13 | access to local variable x | Splitting.cs:19:13:19:18 | SSA def(x) |
-| Splitting.cs:19:13:19:18 | SSA def(x) | Splitting.cs:22:19:22:19 | [b (line 17): true] access to local variable x |
-| Splitting.cs:19:13:19:18 | SSA def(x) | Splitting.cs:25:15:25:15 | [b (line 17): false] access to local variable x |
+| Splitting.cs:19:13:19:18 | SSA def(x) | Splitting.cs:20:13:20:13 | [input] SSA phi(x) |
+| Splitting.cs:19:13:19:18 | SSA def(x) | Splitting.cs:22:19:22:19 | access to local variable x |
 | Splitting.cs:19:17:19:18 | "" | Splitting.cs:19:13:19:13 | access to local variable x |
-| Splitting.cs:20:13:20:13 | access to parameter b | Splitting.cs:26:13:26:13 | [b (line 17): false] access to parameter b |
-| Splitting.cs:20:13:20:13 | access to parameter b | Splitting.cs:26:13:26:13 | [b (line 17): true] access to parameter b |
-| Splitting.cs:23:13:23:13 | access to local variable x | Splitting.cs:23:13:23:30 | [b (line 17): true] SSA def(x) |
-| Splitting.cs:23:13:23:30 | [b (line 17): true] SSA def(x) | Splitting.cs:25:15:25:15 | [b (line 17): true] access to local variable x |
-| Splitting.cs:23:17:23:30 | [b (line 17): true] "taint source" | Splitting.cs:23:13:23:13 | access to local variable x |
-| Splitting.cs:25:15:25:15 | [b (line 17): false] access to local variable x | Splitting.cs:29:19:29:19 | access to local variable x |
-| Splitting.cs:25:15:25:15 | [b (line 17): true] access to local variable x | Splitting.cs:27:19:27:19 | access to local variable x |
-| Splitting.cs:25:15:25:15 | [post] [b (line 17): false] access to local variable x | Splitting.cs:29:19:29:19 | access to local variable x |
-| Splitting.cs:25:15:25:15 | [post] [b (line 17): true] access to local variable x | Splitting.cs:27:19:27:19 | access to local variable x |
+| Splitting.cs:20:13:20:13 | [input] SSA phi(x) | Splitting.cs:25:15:25:15 | access to local variable x |
+| Splitting.cs:20:13:20:13 | access to parameter b | Splitting.cs:26:13:26:13 | access to parameter b |
+| Splitting.cs:23:13:23:13 | access to local variable x | Splitting.cs:23:13:23:30 | SSA def(x) |
+| Splitting.cs:23:13:23:30 | SSA def(x) | Splitting.cs:25:15:25:15 | access to local variable x |
+| Splitting.cs:23:17:23:30 | "taint source" | Splitting.cs:23:13:23:13 | access to local variable x |
+| Splitting.cs:25:15:25:15 | [post] access to local variable x | Splitting.cs:27:19:27:19 | access to local variable x |
+| Splitting.cs:25:15:25:15 | [post] access to local variable x | Splitting.cs:29:19:29:19 | access to local variable x |
+| Splitting.cs:25:15:25:15 | access to local variable x | Splitting.cs:27:19:27:19 | access to local variable x |
+| Splitting.cs:25:15:25:15 | access to local variable x | Splitting.cs:29:19:29:19 | access to local variable x |
 | Splitting.cs:32:18:32:18 | SSA param(b) | Splitting.cs:35:13:35:13 | access to parameter b |
 | Splitting.cs:32:18:32:18 | b | Splitting.cs:32:18:32:18 | SSA param(b) |
 | Splitting.cs:34:17:34:18 | "" | Splitting.cs:34:13:34:13 | access to local variable x |
-| Splitting.cs:35:13:35:13 | access to parameter b | Splitting.cs:39:15:39:15 | [b (line 32): false] access to parameter b |
-| Splitting.cs:35:13:35:13 | access to parameter b | Splitting.cs:39:15:39:15 | [b (line 32): true] access to parameter b |
-| Splitting.cs:36:17:36:19 | [b (line 32): true] "a" | Splitting.cs:36:13:36:13 | access to local variable x |
-| Splitting.cs:37:9:37:9 | access to local variable x | Splitting.cs:37:9:37:15 | [b (line 32): false] SSA def(x) |
-| Splitting.cs:37:9:37:9 | access to local variable x | Splitting.cs:37:9:37:15 | [b (line 32): true] SSA def(x) |
-| Splitting.cs:37:9:37:15 | [b (line 32): false] SSA def(x) | Splitting.cs:38:15:38:15 | [b (line 32): false] access to local variable x |
-| Splitting.cs:37:9:37:15 | [b (line 32): true] SSA def(x) | Splitting.cs:38:15:38:15 | [b (line 32): true] access to local variable x |
-| Splitting.cs:37:13:37:15 | [b (line 32): false] "b" | Splitting.cs:37:9:37:9 | access to local variable x |
-| Splitting.cs:37:13:37:15 | [b (line 32): true] "b" | Splitting.cs:37:9:37:9 | access to local variable x |
-| Splitting.cs:38:15:38:15 | [b (line 32): false] access to local variable x | Splitting.cs:40:23:40:23 | [b (line 32): false] access to local variable x |
-| Splitting.cs:38:15:38:15 | [b (line 32): true] access to local variable x | Splitting.cs:39:19:39:19 | [b (line 32): true] access to local variable x |
-| Splitting.cs:38:15:38:15 | [post] [b (line 32): false] access to local variable x | Splitting.cs:40:23:40:23 | [b (line 32): false] access to local variable x |
-| Splitting.cs:38:15:38:15 | [post] [b (line 32): true] access to local variable x | Splitting.cs:39:19:39:19 | [b (line 32): true] access to local variable x |
-| Splitting.cs:39:15:39:15 | [b (line 32): false] access to parameter b | Splitting.cs:42:13:42:13 | [b (line 32): false] access to parameter b |
-| Splitting.cs:39:15:39:15 | [b (line 32): true] access to parameter b | Splitting.cs:42:13:42:13 | [b (line 32): true] access to parameter b |
-| Splitting.cs:39:19:39:19 | [b (line 32): true] access to local variable x | Splitting.cs:39:15:39:25 | [b (line 32): true] ... ? ... : ... |
-| Splitting.cs:39:19:39:19 | [b (line 32): true] access to local variable x | Splitting.cs:40:23:40:23 | [b (line 32): true] access to local variable x |
-| Splitting.cs:39:19:39:19 | [post] [b (line 32): true] access to local variable x | Splitting.cs:40:23:40:23 | [b (line 32): true] access to local variable x |
-| Splitting.cs:39:23:39:25 | [b (line 32): false] "c" | Splitting.cs:39:15:39:25 | [b (line 32): false] ... ? ... : ... |
-| Splitting.cs:40:23:40:23 | [b (line 32): false] access to local variable x | Splitting.cs:40:15:40:23 | [b (line 32): false] (...) ... |
-| Splitting.cs:40:23:40:23 | [b (line 32): true] access to local variable x | Splitting.cs:40:15:40:23 | [b (line 32): true] (...) ... |
-| Splitting.cs:41:19:41:21 | [b (line 32): false] "d" | Splitting.cs:41:15:41:15 | access to local variable x |
-| Splitting.cs:41:19:41:21 | [b (line 32): false] "d" | Splitting.cs:41:15:41:21 | [b (line 32): false] ... = ... |
-| Splitting.cs:41:19:41:21 | [b (line 32): true] "d" | Splitting.cs:41:15:41:15 | access to local variable x |
-| Splitting.cs:41:19:41:21 | [b (line 32): true] "d" | Splitting.cs:41:15:41:21 | [b (line 32): true] ... = ... |
+| Splitting.cs:35:13:35:13 | access to parameter b | Splitting.cs:39:15:39:15 | access to parameter b |
+| Splitting.cs:36:17:36:19 | "a" | Splitting.cs:36:13:36:13 | access to local variable x |
+| Splitting.cs:37:9:37:9 | access to local variable x | Splitting.cs:37:9:37:15 | SSA def(x) |
+| Splitting.cs:37:9:37:15 | SSA def(x) | Splitting.cs:38:15:38:15 | access to local variable x |
+| Splitting.cs:37:13:37:15 | "b" | Splitting.cs:37:9:37:9 | access to local variable x |
+| Splitting.cs:38:15:38:15 | [post] access to local variable x | Splitting.cs:39:19:39:19 | access to local variable x |
+| Splitting.cs:38:15:38:15 | [post] access to local variable x | Splitting.cs:39:23:39:25 | [input] SSA phi read(x) |
+| Splitting.cs:38:15:38:15 | access to local variable x | Splitting.cs:39:19:39:19 | access to local variable x |
+| Splitting.cs:38:15:38:15 | access to local variable x | Splitting.cs:39:23:39:25 | [input] SSA phi read(x) |
+| Splitting.cs:39:15:39:15 | access to parameter b | Splitting.cs:42:13:42:13 | access to parameter b |
+| Splitting.cs:39:19:39:19 | [post] access to local variable x | Splitting.cs:40:23:40:23 | access to local variable x |
+| Splitting.cs:39:19:39:19 | access to local variable x | Splitting.cs:39:15:39:25 | ... ? ... : ... |
+| Splitting.cs:39:19:39:19 | access to local variable x | Splitting.cs:40:23:40:23 | access to local variable x |
+| Splitting.cs:39:23:39:25 | "c" | Splitting.cs:39:15:39:25 | ... ? ... : ... |
+| Splitting.cs:39:23:39:25 | [input] SSA phi read(x) | Splitting.cs:40:23:40:23 | access to local variable x |
+| Splitting.cs:40:23:40:23 | access to local variable x | Splitting.cs:40:15:40:23 | (...) ... |
+| Splitting.cs:41:19:41:21 | "d" | Splitting.cs:41:15:41:15 | access to local variable x |
+| Splitting.cs:41:19:41:21 | "d" | Splitting.cs:41:15:41:21 | ... = ... |
 | Splitting.cs:46:18:46:18 | SSA param(b) | Splitting.cs:49:13:49:13 | access to parameter b |
 | Splitting.cs:46:18:46:18 | b | Splitting.cs:46:18:46:18 | SSA param(b) |
 | Splitting.cs:48:13:48:13 | access to local variable x | Splitting.cs:48:13:48:18 | SSA def(x) |
-| Splitting.cs:48:13:48:18 | SSA def(x) | Splitting.cs:53:13:53:13 | [b (line 46): false] access to local variable x |
+| Splitting.cs:48:13:48:18 | SSA def(x) | Splitting.cs:53:13:53:13 | access to local variable x |
 | Splitting.cs:48:17:48:18 | "" | Splitting.cs:48:13:48:13 | access to local variable x |
-| Splitting.cs:49:13:49:13 | access to parameter b | Splitting.cs:60:13:60:13 | [b (line 46): false] access to parameter b |
-| Splitting.cs:49:13:49:13 | access to parameter b | Splitting.cs:60:13:60:13 | [b (line 46): true] access to parameter b |
-| Splitting.cs:50:13:50:13 | access to local variable x | Splitting.cs:50:13:50:21 | [b (line 46): true] SSA def(x) |
-| Splitting.cs:50:13:50:21 | [b (line 46): true] SSA def(x) | Splitting.cs:53:13:53:13 | [b (line 46): true] access to local variable x |
-| Splitting.cs:50:17:50:21 | [b (line 46): true] "abc" | Splitting.cs:50:13:50:13 | access to local variable x |
-| Splitting.cs:51:13:51:13 | access to local variable y | Splitting.cs:51:13:51:36 | [b (line 46): false] SSA def(y) |
-| Splitting.cs:51:13:51:13 | access to local variable y | Splitting.cs:51:13:51:36 | [b (line 46): true] SSA def(y) |
-| Splitting.cs:51:13:51:36 | [b (line 46): false] SSA def(y) | Splitting.cs:52:9:52:9 | [b (line 46): false] access to local variable y |
-| Splitting.cs:51:13:51:36 | [b (line 46): true] SSA def(y) | Splitting.cs:52:9:52:9 | [b (line 46): true] access to local variable y |
-| Splitting.cs:51:17:51:36 | [b (line 46): false] array creation of type String[] | Splitting.cs:51:13:51:13 | access to local variable y |
-| Splitting.cs:51:17:51:36 | [b (line 46): true] array creation of type String[] | Splitting.cs:51:13:51:13 | access to local variable y |
-| Splitting.cs:51:30:51:36 | [b (line 46): false] { ..., ... } | Splitting.cs:51:17:51:36 | [b (line 46): false] array creation of type String[] |
-| Splitting.cs:51:30:51:36 | [b (line 46): true] { ..., ... } | Splitting.cs:51:17:51:36 | [b (line 46): true] array creation of type String[] |
-| Splitting.cs:52:9:52:9 | [b (line 46): false] access to local variable y | Splitting.cs:53:17:53:17 | [b (line 46): false] access to local variable y |
-| Splitting.cs:52:9:52:9 | [b (line 46): true] access to local variable y | Splitting.cs:53:17:53:17 | [b (line 46): true] access to local variable y |
-| Splitting.cs:52:9:52:9 | [post] [b (line 46): false] access to local variable y | Splitting.cs:53:17:53:17 | [b (line 46): false] access to local variable y |
-| Splitting.cs:52:9:52:9 | [post] [b (line 46): true] access to local variable y | Splitting.cs:53:17:53:17 | [b (line 46): true] access to local variable y |
-| Splitting.cs:52:16:52:18 | [b (line 46): false] "b" | Splitting.cs:52:9:52:12 | access to array element |
-| Splitting.cs:52:16:52:18 | [b (line 46): true] "b" | Splitting.cs:52:9:52:12 | access to array element |
-| Splitting.cs:53:9:53:9 | access to local variable x | Splitting.cs:53:9:53:20 | [b (line 46): false] SSA def(x) |
-| Splitting.cs:53:9:53:9 | access to local variable x | Splitting.cs:53:9:53:20 | [b (line 46): true] SSA def(x) |
-| Splitting.cs:53:9:53:20 | [b (line 46): false] SSA def(x) | Splitting.cs:54:17:54:17 | [b (line 46): false] access to local variable x |
-| Splitting.cs:53:9:53:20 | [b (line 46): true] SSA def(x) | Splitting.cs:54:17:54:17 | [b (line 46): true] access to local variable x |
-| Splitting.cs:53:13:53:20 | [b (line 46): false] ... + ... | Splitting.cs:53:9:53:9 | access to local variable x |
-| Splitting.cs:53:13:53:20 | [b (line 46): true] ... + ... | Splitting.cs:53:9:53:9 | access to local variable x |
-| Splitting.cs:53:17:53:17 | [b (line 46): false] access to local variable y | Splitting.cs:57:17:57:17 | [b (line 46): false] access to local variable y |
-| Splitting.cs:53:17:53:17 | [b (line 46): true] access to local variable y | Splitting.cs:57:17:57:17 | [b (line 46): true] access to local variable y |
-| Splitting.cs:54:13:54:13 | access to local variable z | Splitting.cs:54:13:54:23 | [b (line 46): false] SSA def(z) |
-| Splitting.cs:54:13:54:13 | access to local variable z | Splitting.cs:54:13:54:23 | [b (line 46): true] SSA def(z) |
-| Splitting.cs:54:13:54:23 | [b (line 46): false] SSA def(z) | Splitting.cs:55:14:55:14 | [b (line 46): false] access to local variable z |
-| Splitting.cs:54:13:54:23 | [b (line 46): true] SSA def(z) | Splitting.cs:55:14:55:14 | [b (line 46): true] access to local variable z |
-| Splitting.cs:54:17:54:17 | [b (line 46): false] access to local variable x | Splitting.cs:56:17:56:17 | [b (line 46): false] access to local variable x |
-| Splitting.cs:54:17:54:17 | [b (line 46): true] access to local variable x | Splitting.cs:56:17:56:17 | [b (line 46): true] access to local variable x |
-| Splitting.cs:54:17:54:23 | [b (line 46): false] ... == ... | Splitting.cs:54:13:54:13 | access to local variable z |
-| Splitting.cs:54:17:54:23 | [b (line 46): true] ... == ... | Splitting.cs:54:13:54:13 | access to local variable z |
-| Splitting.cs:55:13:55:14 | [b (line 46): false] !... | Splitting.cs:55:9:55:9 | access to local variable z |
-| Splitting.cs:55:13:55:14 | [b (line 46): true] !... | Splitting.cs:55:9:55:9 | access to local variable z |
-| Splitting.cs:56:9:56:9 | access to local variable x | Splitting.cs:56:9:56:19 | [b (line 46): false] SSA def(x) |
-| Splitting.cs:56:9:56:9 | access to local variable x | Splitting.cs:56:9:56:19 | [b (line 46): true] SSA def(x) |
-| Splitting.cs:56:9:56:19 | [b (line 46): false] SSA def(x) | Splitting.cs:57:14:57:14 | [b (line 46): false] access to local variable x |
-| Splitting.cs:56:9:56:19 | [b (line 46): true] SSA def(x) | Splitting.cs:57:14:57:14 | [b (line 46): true] access to local variable x |
-| Splitting.cs:56:13:56:19 | [b (line 46): false] $"..." | Splitting.cs:56:9:56:9 | access to local variable x |
-| Splitting.cs:56:13:56:19 | [b (line 46): true] $"..." | Splitting.cs:56:9:56:9 | access to local variable x |
-| Splitting.cs:57:13:57:24 | [b (line 46): false] access to field Item1 | Splitting.cs:57:9:57:9 | access to local variable x |
-| Splitting.cs:57:13:57:24 | [b (line 46): true] access to field Item1 | Splitting.cs:57:9:57:9 | access to local variable x |
-| Splitting.cs:57:17:57:17 | [b (line 46): false] access to local variable y | Splitting.cs:58:27:58:27 | [b (line 46): false] access to local variable y |
-| Splitting.cs:57:17:57:17 | [b (line 46): true] access to local variable y | Splitting.cs:58:27:58:27 | [b (line 46): true] access to local variable y |
-| Splitting.cs:58:22:58:22 | String s | Splitting.cs:58:22:58:22 | [b (line 46): false] SSA def(s) |
-| Splitting.cs:58:22:58:22 | String s | Splitting.cs:58:22:58:22 | [b (line 46): true] SSA def(s) |
-| Splitting.cs:58:22:58:22 | [b (line 46): false] SSA def(s) | Splitting.cs:59:19:59:19 | [b (line 46): false] access to local variable s |
-| Splitting.cs:58:22:58:22 | [b (line 46): true] SSA def(s) | Splitting.cs:59:19:59:19 | [b (line 46): true] access to local variable s |
+| Splitting.cs:49:13:49:13 | access to parameter b | Splitting.cs:60:13:60:13 | access to parameter b |
+| Splitting.cs:50:13:50:13 | access to local variable x | Splitting.cs:50:13:50:21 | SSA def(x) |
+| Splitting.cs:50:13:50:21 | SSA def(x) | Splitting.cs:53:13:53:13 | access to local variable x |
+| Splitting.cs:50:17:50:21 | "abc" | Splitting.cs:50:13:50:13 | access to local variable x |
+| Splitting.cs:51:13:51:13 | access to local variable y | Splitting.cs:51:13:51:36 | SSA def(y) |
+| Splitting.cs:51:13:51:36 | SSA def(y) | Splitting.cs:52:9:52:9 | access to local variable y |
+| Splitting.cs:51:17:51:36 | array creation of type String[] | Splitting.cs:51:13:51:13 | access to local variable y |
+| Splitting.cs:51:30:51:36 | { ..., ... } | Splitting.cs:51:17:51:36 | array creation of type String[] |
+| Splitting.cs:52:9:52:9 | [post] access to local variable y | Splitting.cs:53:17:53:17 | access to local variable y |
+| Splitting.cs:52:9:52:9 | access to local variable y | Splitting.cs:53:17:53:17 | access to local variable y |
+| Splitting.cs:52:16:52:18 | "b" | Splitting.cs:52:9:52:12 | access to array element |
+| Splitting.cs:53:9:53:9 | access to local variable x | Splitting.cs:53:9:53:20 | SSA def(x) |
+| Splitting.cs:53:9:53:20 | SSA def(x) | Splitting.cs:54:17:54:17 | access to local variable x |
+| Splitting.cs:53:13:53:20 | ... + ... | Splitting.cs:53:9:53:9 | access to local variable x |
+| Splitting.cs:53:17:53:17 | access to local variable y | Splitting.cs:57:17:57:17 | access to local variable y |
+| Splitting.cs:54:13:54:13 | access to local variable z | Splitting.cs:54:13:54:23 | SSA def(z) |
+| Splitting.cs:54:13:54:23 | SSA def(z) | Splitting.cs:55:14:55:14 | access to local variable z |
+| Splitting.cs:54:17:54:17 | access to local variable x | Splitting.cs:56:17:56:17 | access to local variable x |
+| Splitting.cs:54:17:54:23 | ... == ... | Splitting.cs:54:13:54:13 | access to local variable z |
+| Splitting.cs:55:13:55:14 | !... | Splitting.cs:55:9:55:9 | access to local variable z |
+| Splitting.cs:56:9:56:9 | access to local variable x | Splitting.cs:56:9:56:19 | SSA def(x) |
+| Splitting.cs:56:9:56:19 | SSA def(x) | Splitting.cs:57:14:57:14 | access to local variable x |
+| Splitting.cs:56:13:56:19 | $"..." | Splitting.cs:56:9:56:9 | access to local variable x |
+| Splitting.cs:57:13:57:24 | access to field Item1 | Splitting.cs:57:9:57:9 | access to local variable x |
+| Splitting.cs:57:17:57:17 | access to local variable y | Splitting.cs:58:27:58:27 | access to local variable y |
+| Splitting.cs:58:22:58:22 | SSA def(s) | Splitting.cs:59:19:59:19 | access to local variable s |
+| Splitting.cs:58:22:58:22 | String s | Splitting.cs:58:22:58:22 | SSA def(s) |
 | UseUseExplosion.cs:21:10:21:10 | SSA entry def(this.Prop) | UseUseExplosion.cs:24:13:24:16 | access to property Prop |
 | UseUseExplosion.cs:21:10:21:10 | this | UseUseExplosion.cs:24:13:24:16 | this access |
 | UseUseExplosion.cs:23:13:23:13 | access to local variable x | UseUseExplosion.cs:23:13:23:17 | SSA def(x) |
diff --git a/csharp/ql/test/library-tests/dataflow/local/TaintTracking.expected b/csharp/ql/test/library-tests/dataflow/local/TaintTracking.expected
index 37988a13066..372d0bfb3e1 100644
--- a/csharp/ql/test/library-tests/dataflow/local/TaintTracking.expected
+++ b/csharp/ql/test/library-tests/dataflow/local/TaintTracking.expected
@@ -2,7 +2,7 @@
 | LocalDataFlow.cs:61:15:61:19 | access to local variable sink1 |
 | LocalDataFlow.cs:69:15:69:19 | access to local variable sink5 |
 | LocalDataFlow.cs:77:15:77:19 | access to local variable sink6 |
-| LocalDataFlow.cs:85:15:85:19 | [b (line 48): false] access to local variable sink7 |
+| LocalDataFlow.cs:85:15:85:19 | access to local variable sink7 |
 | LocalDataFlow.cs:93:15:93:19 | access to local variable sink8 |
 | LocalDataFlow.cs:101:15:101:19 | access to local variable sink9 |
 | LocalDataFlow.cs:109:15:109:20 | access to local variable sink15 |
@@ -51,7 +51,9 @@
 | SSA.cs:98:15:98:22 | access to local variable ssaSink4 |
 | SSA.cs:124:15:124:34 | access to field SsaFieldSink1 |
 | SSA.cs:180:15:180:22 | access to local variable ssaSink5 |
-| Splitting.cs:8:19:8:19 | [b (line 3): true] access to local variable x |
-| Splitting.cs:12:15:12:15 | [b (line 3): false] access to local variable x |
-| Splitting.cs:25:15:25:15 | [b (line 17): true] access to local variable x |
+| Splitting.cs:8:19:8:19 | access to local variable x |
+| Splitting.cs:12:15:12:15 | access to local variable x |
+| Splitting.cs:14:19:14:19 | access to local variable x |
+| Splitting.cs:25:15:25:15 | access to local variable x |
 | Splitting.cs:27:19:27:19 | access to local variable x |
+| Splitting.cs:29:19:29:19 | access to local variable x |
diff --git a/csharp/ql/test/library-tests/dataflow/local/TaintTrackingStep.expected b/csharp/ql/test/library-tests/dataflow/local/TaintTrackingStep.expected
index 360c0abd82d..1e9e48f5456 100644
--- a/csharp/ql/test/library-tests/dataflow/local/TaintTrackingStep.expected
+++ b/csharp/ql/test/library-tests/dataflow/local/TaintTrackingStep.expected
@@ -58,32 +58,24 @@
 | LocalDataFlow.cs:76:13:76:17 | access to local variable sink6 | LocalDataFlow.cs:76:13:76:27 | SSA def(sink6) |
 | LocalDataFlow.cs:76:13:76:27 | SSA def(sink6) | LocalDataFlow.cs:77:15:77:19 | access to local variable sink6 |
 | LocalDataFlow.cs:76:22:76:26 | access to local variable sink5 | LocalDataFlow.cs:76:13:76:17 | access to local variable sink6 |
-| LocalDataFlow.cs:77:15:77:19 | [post] access to local variable sink6 | LocalDataFlow.cs:84:31:84:35 | [b (line 48): false] access to local variable sink6 |
-| LocalDataFlow.cs:77:15:77:19 | access to local variable sink6 | LocalDataFlow.cs:84:31:84:35 | [b (line 48): false] access to local variable sink6 |
+| LocalDataFlow.cs:77:15:77:19 | [post] access to local variable sink6 | LocalDataFlow.cs:84:31:84:35 | access to local variable sink6 |
+| LocalDataFlow.cs:77:15:77:19 | access to local variable sink6 | LocalDataFlow.cs:84:31:84:35 | access to local variable sink6 |
 | LocalDataFlow.cs:80:9:80:16 | access to local variable nonSink0 | LocalDataFlow.cs:80:9:80:29 | SSA def(nonSink0) |
 | LocalDataFlow.cs:80:9:80:29 | SSA def(nonSink0) | LocalDataFlow.cs:81:15:81:22 | access to local variable nonSink0 |
 | LocalDataFlow.cs:80:21:80:28 | access to local variable nonSink0 | LocalDataFlow.cs:80:9:80:16 | access to local variable nonSink0 |
-| LocalDataFlow.cs:84:13:84:17 | access to local variable sink7 | LocalDataFlow.cs:84:13:84:35 | [b (line 48): false] SSA def(sink7) |
-| LocalDataFlow.cs:84:13:84:17 | access to local variable sink7 | LocalDataFlow.cs:84:13:84:35 | [b (line 48): true] SSA def(sink7) |
-| LocalDataFlow.cs:84:13:84:35 | [b (line 48): false] SSA def(sink7) | LocalDataFlow.cs:85:15:85:19 | [b (line 48): false] access to local variable sink7 |
-| LocalDataFlow.cs:84:13:84:35 | [b (line 48): true] SSA def(sink7) | LocalDataFlow.cs:85:15:85:19 | [b (line 48): true] access to local variable sink7 |
-| LocalDataFlow.cs:84:21:84:21 | access to parameter b | LocalDataFlow.cs:88:20:88:20 | [b (line 48): false] access to parameter b |
-| LocalDataFlow.cs:84:21:84:21 | access to parameter b | LocalDataFlow.cs:88:20:88:20 | [b (line 48): true] access to parameter b |
-| LocalDataFlow.cs:84:21:84:35 | [b (line 48): false] ... ? ... : ... | LocalDataFlow.cs:84:13:84:17 | access to local variable sink7 |
-| LocalDataFlow.cs:84:21:84:35 | [b (line 48): true] ... ? ... : ... | LocalDataFlow.cs:84:13:84:17 | access to local variable sink7 |
-| LocalDataFlow.cs:84:25:84:27 | [b (line 48): true] "a" | LocalDataFlow.cs:84:21:84:35 | [b (line 48): true] ... ? ... : ... |
-| LocalDataFlow.cs:84:31:84:35 | [b (line 48): false] access to local variable sink6 | LocalDataFlow.cs:84:21:84:35 | [b (line 48): false] ... ? ... : ... |
-| LocalDataFlow.cs:85:15:85:19 | [b (line 48): false] access to local variable sink7 | LocalDataFlow.cs:88:32:88:36 | [input] SSA phi(sink7) |
-| LocalDataFlow.cs:85:15:85:19 | [b (line 48): true] access to local variable sink7 | LocalDataFlow.cs:88:24:88:28 | [input] SSA phi(sink7) |
-| LocalDataFlow.cs:85:15:85:19 | [post] [b (line 48): false] access to local variable sink7 | LocalDataFlow.cs:88:32:88:36 | [input] SSA phi(sink7) |
-| LocalDataFlow.cs:85:15:85:19 | [post] [b (line 48): true] access to local variable sink7 | LocalDataFlow.cs:88:24:88:28 | [input] SSA phi(sink7) |
+| LocalDataFlow.cs:84:13:84:17 | access to local variable sink7 | LocalDataFlow.cs:84:13:84:35 | SSA def(sink7) |
+| LocalDataFlow.cs:84:13:84:35 | SSA def(sink7) | LocalDataFlow.cs:85:15:85:19 | access to local variable sink7 |
+| LocalDataFlow.cs:84:21:84:21 | access to parameter b | LocalDataFlow.cs:88:20:88:20 | access to parameter b |
+| LocalDataFlow.cs:84:21:84:35 | ... ? ... : ... | LocalDataFlow.cs:84:13:84:17 | access to local variable sink7 |
+| LocalDataFlow.cs:84:25:84:27 | "a" | LocalDataFlow.cs:84:21:84:35 | ... ? ... : ... |
+| LocalDataFlow.cs:84:31:84:35 | access to local variable sink6 | LocalDataFlow.cs:84:21:84:35 | ... ? ... : ... |
+| LocalDataFlow.cs:85:15:85:19 | [post] access to local variable sink7 | LocalDataFlow.cs:92:29:92:33 | access to local variable sink7 |
+| LocalDataFlow.cs:85:15:85:19 | access to local variable sink7 | LocalDataFlow.cs:92:29:92:33 | access to local variable sink7 |
 | LocalDataFlow.cs:88:9:88:16 | access to local variable nonSink0 | LocalDataFlow.cs:88:9:88:36 | SSA def(nonSink0) |
 | LocalDataFlow.cs:88:9:88:36 | SSA def(nonSink0) | LocalDataFlow.cs:89:15:89:22 | access to local variable nonSink0 |
 | LocalDataFlow.cs:88:20:88:36 | ... ? ... : ... | LocalDataFlow.cs:88:9:88:16 | access to local variable nonSink0 |
 | LocalDataFlow.cs:88:24:88:28 | "abc" | LocalDataFlow.cs:88:20:88:36 | ... ? ... : ... |
-| LocalDataFlow.cs:88:24:88:28 | [input] SSA phi(sink7) | LocalDataFlow.cs:92:29:92:33 | access to local variable sink7 |
 | LocalDataFlow.cs:88:32:88:36 | "def" | LocalDataFlow.cs:88:20:88:36 | ... ? ... : ... |
-| LocalDataFlow.cs:88:32:88:36 | [input] SSA phi(sink7) | LocalDataFlow.cs:92:29:92:33 | access to local variable sink7 |
 | LocalDataFlow.cs:89:15:89:22 | [post] access to local variable nonSink0 | LocalDataFlow.cs:96:32:96:39 | access to local variable nonSink0 |
 | LocalDataFlow.cs:89:15:89:22 | access to local variable nonSink0 | LocalDataFlow.cs:96:32:96:39 | access to local variable nonSink0 |
 | LocalDataFlow.cs:92:13:92:17 | access to local variable sink8 | LocalDataFlow.cs:92:13:92:33 | SSA def(sink8) |
@@ -1060,138 +1052,97 @@
 | Splitting.cs:3:28:3:34 | SSA param(tainted) | Splitting.cs:5:17:5:23 | access to parameter tainted |
 | Splitting.cs:3:28:3:34 | tainted | Splitting.cs:3:28:3:34 | SSA param(tainted) |
 | Splitting.cs:5:13:5:13 | access to local variable x | Splitting.cs:5:13:5:23 | SSA def(x) |
-| Splitting.cs:5:13:5:23 | SSA def(x) | Splitting.cs:8:19:8:19 | [b (line 3): true] access to local variable x |
-| Splitting.cs:5:13:5:23 | SSA def(x) | Splitting.cs:12:15:12:15 | [b (line 3): false] access to local variable x |
+| Splitting.cs:5:13:5:23 | SSA def(x) | Splitting.cs:6:13:6:13 | [input] SSA phi read(x) |
+| Splitting.cs:5:13:5:23 | SSA def(x) | Splitting.cs:8:19:8:19 | access to local variable x |
 | Splitting.cs:5:17:5:23 | access to parameter tainted | Splitting.cs:5:13:5:13 | access to local variable x |
-| Splitting.cs:6:13:6:13 | access to parameter b | Splitting.cs:13:13:13:13 | [b (line 3): false] access to parameter b |
-| Splitting.cs:6:13:6:13 | access to parameter b | Splitting.cs:13:13:13:13 | [b (line 3): true] access to parameter b |
-| Splitting.cs:8:19:8:19 | [b (line 3): true] access to local variable x | Splitting.cs:9:17:9:17 | [b (line 3): true] access to local variable x |
-| Splitting.cs:8:19:8:19 | [post] [b (line 3): true] access to local variable x | Splitting.cs:9:17:9:17 | [b (line 3): true] access to local variable x |
-| Splitting.cs:9:17:9:17 | [b (line 3): true] access to local variable x | Splitting.cs:9:17:9:25 | [b (line 3): true] ... == ... |
-| Splitting.cs:9:17:9:17 | [b (line 3): true] access to local variable x | Splitting.cs:12:15:12:15 | [b (line 3): true] access to local variable x |
-| Splitting.cs:12:15:12:15 | [b (line 3): true] access to local variable x | Splitting.cs:14:19:14:19 | access to local variable x |
-| Splitting.cs:12:15:12:15 | [post] [b (line 3): true] access to local variable x | Splitting.cs:14:19:14:19 | access to local variable x |
+| Splitting.cs:6:13:6:13 | [input] SSA phi read(x) | Splitting.cs:12:15:12:15 | access to local variable x |
+| Splitting.cs:6:13:6:13 | access to parameter b | Splitting.cs:13:13:13:13 | access to parameter b |
+| Splitting.cs:8:19:8:19 | [post] access to local variable x | Splitting.cs:9:17:9:17 | access to local variable x |
+| Splitting.cs:8:19:8:19 | access to local variable x | Splitting.cs:9:17:9:17 | access to local variable x |
+| Splitting.cs:9:17:9:17 | access to local variable x | Splitting.cs:9:17:9:25 | ... == ... |
+| Splitting.cs:9:17:9:17 | access to local variable x | Splitting.cs:9:17:9:25 | [input] SSA phi read(x) |
+| Splitting.cs:9:17:9:25 | [input] SSA phi read(x) | Splitting.cs:12:15:12:15 | access to local variable x |
+| Splitting.cs:12:15:12:15 | [post] access to local variable x | Splitting.cs:14:19:14:19 | access to local variable x |
+| Splitting.cs:12:15:12:15 | access to local variable x | Splitting.cs:14:19:14:19 | access to local variable x |
 | Splitting.cs:17:18:17:18 | SSA param(b) | Splitting.cs:20:13:20:13 | access to parameter b |
 | Splitting.cs:17:18:17:18 | b | Splitting.cs:17:18:17:18 | SSA param(b) |
 | Splitting.cs:19:13:19:13 | access to local variable x | Splitting.cs:19:13:19:18 | SSA def(x) |
-| Splitting.cs:19:13:19:18 | SSA def(x) | Splitting.cs:22:19:22:19 | [b (line 17): true] access to local variable x |
-| Splitting.cs:19:13:19:18 | SSA def(x) | Splitting.cs:25:15:25:15 | [b (line 17): false] access to local variable x |
+| Splitting.cs:19:13:19:18 | SSA def(x) | Splitting.cs:20:13:20:13 | [input] SSA phi(x) |
+| Splitting.cs:19:13:19:18 | SSA def(x) | Splitting.cs:22:19:22:19 | access to local variable x |
 | Splitting.cs:19:17:19:18 | "" | Splitting.cs:19:13:19:13 | access to local variable x |
-| Splitting.cs:20:13:20:13 | access to parameter b | Splitting.cs:26:13:26:13 | [b (line 17): false] access to parameter b |
-| Splitting.cs:20:13:20:13 | access to parameter b | Splitting.cs:26:13:26:13 | [b (line 17): true] access to parameter b |
-| Splitting.cs:23:13:23:13 | access to local variable x | Splitting.cs:23:13:23:30 | [b (line 17): true] SSA def(x) |
-| Splitting.cs:23:13:23:30 | [b (line 17): true] SSA def(x) | Splitting.cs:25:15:25:15 | [b (line 17): true] access to local variable x |
-| Splitting.cs:23:17:23:30 | [b (line 17): true] "taint source" | Splitting.cs:23:13:23:13 | access to local variable x |
-| Splitting.cs:25:15:25:15 | [b (line 17): false] access to local variable x | Splitting.cs:29:19:29:19 | access to local variable x |
-| Splitting.cs:25:15:25:15 | [b (line 17): true] access to local variable x | Splitting.cs:27:19:27:19 | access to local variable x |
-| Splitting.cs:25:15:25:15 | [post] [b (line 17): false] access to local variable x | Splitting.cs:29:19:29:19 | access to local variable x |
-| Splitting.cs:25:15:25:15 | [post] [b (line 17): true] access to local variable x | Splitting.cs:27:19:27:19 | access to local variable x |
+| Splitting.cs:20:13:20:13 | [input] SSA phi(x) | Splitting.cs:25:15:25:15 | access to local variable x |
+| Splitting.cs:20:13:20:13 | access to parameter b | Splitting.cs:26:13:26:13 | access to parameter b |
+| Splitting.cs:23:13:23:13 | access to local variable x | Splitting.cs:23:13:23:30 | SSA def(x) |
+| Splitting.cs:23:13:23:30 | SSA def(x) | Splitting.cs:25:15:25:15 | access to local variable x |
+| Splitting.cs:23:17:23:30 | "taint source" | Splitting.cs:23:13:23:13 | access to local variable x |
+| Splitting.cs:25:15:25:15 | [post] access to local variable x | Splitting.cs:27:19:27:19 | access to local variable x |
+| Splitting.cs:25:15:25:15 | [post] access to local variable x | Splitting.cs:29:19:29:19 | access to local variable x |
+| Splitting.cs:25:15:25:15 | access to local variable x | Splitting.cs:27:19:27:19 | access to local variable x |
+| Splitting.cs:25:15:25:15 | access to local variable x | Splitting.cs:29:19:29:19 | access to local variable x |
 | Splitting.cs:32:18:32:18 | SSA param(b) | Splitting.cs:35:13:35:13 | access to parameter b |
 | Splitting.cs:32:18:32:18 | b | Splitting.cs:32:18:32:18 | SSA param(b) |
 | Splitting.cs:34:17:34:18 | "" | Splitting.cs:34:13:34:13 | access to local variable x |
-| Splitting.cs:35:13:35:13 | access to parameter b | Splitting.cs:39:15:39:15 | [b (line 32): false] access to parameter b |
-| Splitting.cs:35:13:35:13 | access to parameter b | Splitting.cs:39:15:39:15 | [b (line 32): true] access to parameter b |
-| Splitting.cs:36:17:36:19 | [b (line 32): true] "a" | Splitting.cs:36:13:36:13 | access to local variable x |
-| Splitting.cs:37:9:37:9 | access to local variable x | Splitting.cs:37:9:37:15 | [b (line 32): false] SSA def(x) |
-| Splitting.cs:37:9:37:9 | access to local variable x | Splitting.cs:37:9:37:15 | [b (line 32): true] SSA def(x) |
-| Splitting.cs:37:9:37:15 | [b (line 32): false] SSA def(x) | Splitting.cs:38:15:38:15 | [b (line 32): false] access to local variable x |
-| Splitting.cs:37:9:37:15 | [b (line 32): true] SSA def(x) | Splitting.cs:38:15:38:15 | [b (line 32): true] access to local variable x |
-| Splitting.cs:37:13:37:15 | [b (line 32): false] "b" | Splitting.cs:37:9:37:9 | access to local variable x |
-| Splitting.cs:37:13:37:15 | [b (line 32): true] "b" | Splitting.cs:37:9:37:9 | access to local variable x |
-| Splitting.cs:38:15:38:15 | [b (line 32): false] access to local variable x | Splitting.cs:40:23:40:23 | [b (line 32): false] access to local variable x |
-| Splitting.cs:38:15:38:15 | [b (line 32): true] access to local variable x | Splitting.cs:39:19:39:19 | [b (line 32): true] access to local variable x |
-| Splitting.cs:38:15:38:15 | [post] [b (line 32): false] access to local variable x | Splitting.cs:40:23:40:23 | [b (line 32): false] access to local variable x |
-| Splitting.cs:38:15:38:15 | [post] [b (line 32): true] access to local variable x | Splitting.cs:39:19:39:19 | [b (line 32): true] access to local variable x |
-| Splitting.cs:39:15:39:15 | [b (line 32): false] access to parameter b | Splitting.cs:42:13:42:13 | [b (line 32): false] access to parameter b |
-| Splitting.cs:39:15:39:15 | [b (line 32): true] access to parameter b | Splitting.cs:42:13:42:13 | [b (line 32): true] access to parameter b |
-| Splitting.cs:39:19:39:19 | [b (line 32): true] access to local variable x | Splitting.cs:39:15:39:25 | [b (line 32): true] ... ? ... : ... |
-| Splitting.cs:39:19:39:19 | [b (line 32): true] access to local variable x | Splitting.cs:40:23:40:23 | [b (line 32): true] access to local variable x |
-| Splitting.cs:39:19:39:19 | [post] [b (line 32): true] access to local variable x | Splitting.cs:40:23:40:23 | [b (line 32): true] access to local variable x |
-| Splitting.cs:39:23:39:25 | [b (line 32): false] "c" | Splitting.cs:39:15:39:25 | [b (line 32): false] ... ? ... : ... |
-| Splitting.cs:40:23:40:23 | [b (line 32): false] access to local variable x | Splitting.cs:40:15:40:23 | [b (line 32): false] (...) ... |
-| Splitting.cs:40:23:40:23 | [b (line 32): true] access to local variable x | Splitting.cs:40:15:40:23 | [b (line 32): true] (...) ... |
-| Splitting.cs:41:19:41:21 | [b (line 32): false] "d" | Splitting.cs:41:15:41:15 | access to local variable x |
-| Splitting.cs:41:19:41:21 | [b (line 32): false] "d" | Splitting.cs:41:15:41:21 | [b (line 32): false] ... = ... |
-| Splitting.cs:41:19:41:21 | [b (line 32): true] "d" | Splitting.cs:41:15:41:15 | access to local variable x |
-| Splitting.cs:41:19:41:21 | [b (line 32): true] "d" | Splitting.cs:41:15:41:21 | [b (line 32): true] ... = ... |
+| Splitting.cs:35:13:35:13 | access to parameter b | Splitting.cs:39:15:39:15 | access to parameter b |
+| Splitting.cs:36:17:36:19 | "a" | Splitting.cs:36:13:36:13 | access to local variable x |
+| Splitting.cs:37:9:37:9 | access to local variable x | Splitting.cs:37:9:37:15 | SSA def(x) |
+| Splitting.cs:37:9:37:15 | SSA def(x) | Splitting.cs:38:15:38:15 | access to local variable x |
+| Splitting.cs:37:13:37:15 | "b" | Splitting.cs:37:9:37:9 | access to local variable x |
+| Splitting.cs:38:15:38:15 | [post] access to local variable x | Splitting.cs:39:19:39:19 | access to local variable x |
+| Splitting.cs:38:15:38:15 | [post] access to local variable x | Splitting.cs:39:23:39:25 | [input] SSA phi read(x) |
+| Splitting.cs:38:15:38:15 | access to local variable x | Splitting.cs:39:19:39:19 | access to local variable x |
+| Splitting.cs:38:15:38:15 | access to local variable x | Splitting.cs:39:23:39:25 | [input] SSA phi read(x) |
+| Splitting.cs:39:15:39:15 | access to parameter b | Splitting.cs:42:13:42:13 | access to parameter b |
+| Splitting.cs:39:19:39:19 | [post] access to local variable x | Splitting.cs:40:23:40:23 | access to local variable x |
+| Splitting.cs:39:19:39:19 | access to local variable x | Splitting.cs:39:15:39:25 | ... ? ... : ... |
+| Splitting.cs:39:19:39:19 | access to local variable x | Splitting.cs:40:23:40:23 | access to local variable x |
+| Splitting.cs:39:23:39:25 | "c" | Splitting.cs:39:15:39:25 | ... ? ... : ... |
+| Splitting.cs:39:23:39:25 | [input] SSA phi read(x) | Splitting.cs:40:23:40:23 | access to local variable x |
+| Splitting.cs:40:23:40:23 | access to local variable x | Splitting.cs:40:15:40:23 | (...) ... |
+| Splitting.cs:41:19:41:21 | "d" | Splitting.cs:41:15:41:15 | access to local variable x |
+| Splitting.cs:41:19:41:21 | "d" | Splitting.cs:41:15:41:21 | ... = ... |
 | Splitting.cs:46:18:46:18 | SSA param(b) | Splitting.cs:49:13:49:13 | access to parameter b |
 | Splitting.cs:46:18:46:18 | b | Splitting.cs:46:18:46:18 | SSA param(b) |
 | Splitting.cs:48:13:48:13 | access to local variable x | Splitting.cs:48:13:48:18 | SSA def(x) |
-| Splitting.cs:48:13:48:18 | SSA def(x) | Splitting.cs:53:13:53:13 | [b (line 46): false] access to local variable x |
+| Splitting.cs:48:13:48:18 | SSA def(x) | Splitting.cs:53:13:53:13 | access to local variable x |
 | Splitting.cs:48:17:48:18 | "" | Splitting.cs:48:13:48:13 | access to local variable x |
-| Splitting.cs:49:13:49:13 | access to parameter b | Splitting.cs:60:13:60:13 | [b (line 46): false] access to parameter b |
-| Splitting.cs:49:13:49:13 | access to parameter b | Splitting.cs:60:13:60:13 | [b (line 46): true] access to parameter b |
-| Splitting.cs:50:13:50:13 | access to local variable x | Splitting.cs:50:13:50:21 | [b (line 46): true] SSA def(x) |
-| Splitting.cs:50:13:50:21 | [b (line 46): true] SSA def(x) | Splitting.cs:53:13:53:13 | [b (line 46): true] access to local variable x |
-| Splitting.cs:50:17:50:21 | [b (line 46): true] "abc" | Splitting.cs:50:13:50:13 | access to local variable x |
-| Splitting.cs:51:13:51:13 | access to local variable y | Splitting.cs:51:13:51:36 | [b (line 46): false] SSA def(y) |
-| Splitting.cs:51:13:51:13 | access to local variable y | Splitting.cs:51:13:51:36 | [b (line 46): true] SSA def(y) |
-| Splitting.cs:51:13:51:36 | [b (line 46): false] SSA def(y) | Splitting.cs:52:9:52:9 | [b (line 46): false] access to local variable y |
-| Splitting.cs:51:13:51:36 | [b (line 46): true] SSA def(y) | Splitting.cs:52:9:52:9 | [b (line 46): true] access to local variable y |
-| Splitting.cs:51:17:51:36 | [b (line 46): false] array creation of type String[] | Splitting.cs:51:13:51:13 | access to local variable y |
-| Splitting.cs:51:17:51:36 | [b (line 46): true] array creation of type String[] | Splitting.cs:51:13:51:13 | access to local variable y |
-| Splitting.cs:51:30:51:36 | [b (line 46): false] { ..., ... } | Splitting.cs:51:17:51:36 | [b (line 46): false] array creation of type String[] |
-| Splitting.cs:51:30:51:36 | [b (line 46): true] { ..., ... } | Splitting.cs:51:17:51:36 | [b (line 46): true] array creation of type String[] |
-| Splitting.cs:51:32:51:34 | [b (line 46): false] "a" | Splitting.cs:51:30:51:36 | [b (line 46): false] { ..., ... } |
-| Splitting.cs:51:32:51:34 | [b (line 46): true] "a" | Splitting.cs:51:30:51:36 | [b (line 46): true] { ..., ... } |
-| Splitting.cs:52:9:52:9 | [b (line 46): false] access to local variable y | Splitting.cs:53:17:53:17 | [b (line 46): false] access to local variable y |
-| Splitting.cs:52:9:52:9 | [b (line 46): true] access to local variable y | Splitting.cs:53:17:53:17 | [b (line 46): true] access to local variable y |
-| Splitting.cs:52:9:52:9 | [post] [b (line 46): false] access to local variable y | Splitting.cs:53:17:53:17 | [b (line 46): false] access to local variable y |
-| Splitting.cs:52:9:52:9 | [post] [b (line 46): true] access to local variable y | Splitting.cs:53:17:53:17 | [b (line 46): true] access to local variable y |
-| Splitting.cs:52:16:52:18 | [b (line 46): false] "b" | Splitting.cs:52:9:52:9 | [post] [b (line 46): false] access to local variable y |
-| Splitting.cs:52:16:52:18 | [b (line 46): false] "b" | Splitting.cs:52:9:52:12 | access to array element |
-| Splitting.cs:52:16:52:18 | [b (line 46): true] "b" | Splitting.cs:52:9:52:9 | [post] [b (line 46): true] access to local variable y |
-| Splitting.cs:52:16:52:18 | [b (line 46): true] "b" | Splitting.cs:52:9:52:12 | access to array element |
-| Splitting.cs:53:9:53:9 | access to local variable x | Splitting.cs:53:9:53:20 | [b (line 46): false] SSA def(x) |
-| Splitting.cs:53:9:53:9 | access to local variable x | Splitting.cs:53:9:53:20 | [b (line 46): true] SSA def(x) |
-| Splitting.cs:53:9:53:20 | [b (line 46): false] SSA def(x) | Splitting.cs:54:17:54:17 | [b (line 46): false] access to local variable x |
-| Splitting.cs:53:9:53:20 | [b (line 46): true] SSA def(x) | Splitting.cs:54:17:54:17 | [b (line 46): true] access to local variable x |
-| Splitting.cs:53:13:53:13 | [b (line 46): false] access to local variable x | Splitting.cs:53:13:53:20 | [b (line 46): false] ... + ... |
-| Splitting.cs:53:13:53:13 | [b (line 46): true] access to local variable x | Splitting.cs:53:13:53:20 | [b (line 46): true] ... + ... |
-| Splitting.cs:53:13:53:20 | [b (line 46): false] ... + ... | Splitting.cs:53:9:53:9 | access to local variable x |
-| Splitting.cs:53:13:53:20 | [b (line 46): true] ... + ... | Splitting.cs:53:9:53:9 | access to local variable x |
-| Splitting.cs:53:17:53:17 | [b (line 46): false] access to local variable y | Splitting.cs:53:17:53:20 | [b (line 46): false] access to array element |
-| Splitting.cs:53:17:53:17 | [b (line 46): false] access to local variable y | Splitting.cs:57:17:57:17 | [b (line 46): false] access to local variable y |
-| Splitting.cs:53:17:53:17 | [b (line 46): true] access to local variable y | Splitting.cs:53:17:53:20 | [b (line 46): true] access to array element |
-| Splitting.cs:53:17:53:17 | [b (line 46): true] access to local variable y | Splitting.cs:57:17:57:17 | [b (line 46): true] access to local variable y |
-| Splitting.cs:53:17:53:20 | [b (line 46): false] access to array element | Splitting.cs:53:13:53:20 | [b (line 46): false] ... + ... |
-| Splitting.cs:53:17:53:20 | [b (line 46): true] access to array element | Splitting.cs:53:13:53:20 | [b (line 46): true] ... + ... |
-| Splitting.cs:54:13:54:13 | access to local variable z | Splitting.cs:54:13:54:23 | [b (line 46): false] SSA def(z) |
-| Splitting.cs:54:13:54:13 | access to local variable z | Splitting.cs:54:13:54:23 | [b (line 46): true] SSA def(z) |
-| Splitting.cs:54:13:54:23 | [b (line 46): false] SSA def(z) | Splitting.cs:55:14:55:14 | [b (line 46): false] access to local variable z |
-| Splitting.cs:54:13:54:23 | [b (line 46): true] SSA def(z) | Splitting.cs:55:14:55:14 | [b (line 46): true] access to local variable z |
-| Splitting.cs:54:17:54:17 | [b (line 46): false] access to local variable x | Splitting.cs:54:17:54:23 | [b (line 46): false] ... == ... |
-| Splitting.cs:54:17:54:17 | [b (line 46): false] access to local variable x | Splitting.cs:56:17:56:17 | [b (line 46): false] access to local variable x |
-| Splitting.cs:54:17:54:17 | [b (line 46): true] access to local variable x | Splitting.cs:54:17:54:23 | [b (line 46): true] ... == ... |
-| Splitting.cs:54:17:54:17 | [b (line 46): true] access to local variable x | Splitting.cs:56:17:56:17 | [b (line 46): true] access to local variable x |
-| Splitting.cs:54:17:54:23 | [b (line 46): false] ... == ... | Splitting.cs:54:13:54:13 | access to local variable z |
-| Splitting.cs:54:17:54:23 | [b (line 46): true] ... == ... | Splitting.cs:54:13:54:13 | access to local variable z |
-| Splitting.cs:55:13:55:14 | [b (line 46): false] !... | Splitting.cs:55:9:55:9 | access to local variable z |
-| Splitting.cs:55:13:55:14 | [b (line 46): true] !... | Splitting.cs:55:9:55:9 | access to local variable z |
-| Splitting.cs:55:14:55:14 | [b (line 46): false] access to local variable z | Splitting.cs:55:13:55:14 | [b (line 46): false] !... |
-| Splitting.cs:55:14:55:14 | [b (line 46): true] access to local variable z | Splitting.cs:55:13:55:14 | [b (line 46): true] !... |
-| Splitting.cs:56:9:56:9 | access to local variable x | Splitting.cs:56:9:56:19 | [b (line 46): false] SSA def(x) |
-| Splitting.cs:56:9:56:9 | access to local variable x | Splitting.cs:56:9:56:19 | [b (line 46): true] SSA def(x) |
-| Splitting.cs:56:9:56:19 | [b (line 46): false] SSA def(x) | Splitting.cs:57:14:57:14 | [b (line 46): false] access to local variable x |
-| Splitting.cs:56:9:56:19 | [b (line 46): true] SSA def(x) | Splitting.cs:57:14:57:14 | [b (line 46): true] access to local variable x |
-| Splitting.cs:56:13:56:19 | [b (line 46): false] $"..." | Splitting.cs:56:9:56:9 | access to local variable x |
-| Splitting.cs:56:13:56:19 | [b (line 46): true] $"..." | Splitting.cs:56:9:56:9 | access to local variable x |
-| Splitting.cs:56:15:56:15 | [b (line 46): false] "c" | Splitting.cs:56:13:56:19 | [b (line 46): false] $"..." |
-| Splitting.cs:56:15:56:15 | [b (line 46): true] "c" | Splitting.cs:56:13:56:19 | [b (line 46): true] $"..." |
-| Splitting.cs:56:16:56:18 | [b (line 46): false] {...} | Splitting.cs:56:13:56:19 | [b (line 46): false] $"..." |
-| Splitting.cs:56:16:56:18 | [b (line 46): true] {...} | Splitting.cs:56:13:56:19 | [b (line 46): true] $"..." |
-| Splitting.cs:56:17:56:17 | [b (line 46): false] access to local variable x | Splitting.cs:56:16:56:18 | [b (line 46): false] {...} |
-| Splitting.cs:56:17:56:17 | [b (line 46): true] access to local variable x | Splitting.cs:56:16:56:18 | [b (line 46): true] {...} |
-| Splitting.cs:57:13:57:24 | [b (line 46): false] access to field Item1 | Splitting.cs:57:9:57:9 | access to local variable x |
-| Splitting.cs:57:13:57:24 | [b (line 46): true] access to field Item1 | Splitting.cs:57:9:57:9 | access to local variable x |
-| Splitting.cs:57:17:57:17 | [b (line 46): false] access to local variable y | Splitting.cs:58:27:58:27 | [b (line 46): false] access to local variable y |
-| Splitting.cs:57:17:57:17 | [b (line 46): true] access to local variable y | Splitting.cs:58:27:58:27 | [b (line 46): true] access to local variable y |
-| Splitting.cs:58:22:58:22 | String s | Splitting.cs:58:22:58:22 | [b (line 46): false] SSA def(s) |
-| Splitting.cs:58:22:58:22 | String s | Splitting.cs:58:22:58:22 | [b (line 46): true] SSA def(s) |
-| Splitting.cs:58:22:58:22 | [b (line 46): false] SSA def(s) | Splitting.cs:59:19:59:19 | [b (line 46): false] access to local variable s |
-| Splitting.cs:58:22:58:22 | [b (line 46): true] SSA def(s) | Splitting.cs:59:19:59:19 | [b (line 46): true] access to local variable s |
-| Splitting.cs:58:27:58:27 | [b (line 46): false] access to local variable y | Splitting.cs:58:22:58:22 | [b (line 46): false] SSA def(s) |
-| Splitting.cs:58:27:58:27 | [b (line 46): true] access to local variable y | Splitting.cs:58:22:58:22 | [b (line 46): true] SSA def(s) |
+| Splitting.cs:49:13:49:13 | access to parameter b | Splitting.cs:60:13:60:13 | access to parameter b |
+| Splitting.cs:50:13:50:13 | access to local variable x | Splitting.cs:50:13:50:21 | SSA def(x) |
+| Splitting.cs:50:13:50:21 | SSA def(x) | Splitting.cs:53:13:53:13 | access to local variable x |
+| Splitting.cs:50:17:50:21 | "abc" | Splitting.cs:50:13:50:13 | access to local variable x |
+| Splitting.cs:51:13:51:13 | access to local variable y | Splitting.cs:51:13:51:36 | SSA def(y) |
+| Splitting.cs:51:13:51:36 | SSA def(y) | Splitting.cs:52:9:52:9 | access to local variable y |
+| Splitting.cs:51:17:51:36 | array creation of type String[] | Splitting.cs:51:13:51:13 | access to local variable y |
+| Splitting.cs:51:30:51:36 | { ..., ... } | Splitting.cs:51:17:51:36 | array creation of type String[] |
+| Splitting.cs:51:32:51:34 | "a" | Splitting.cs:51:30:51:36 | { ..., ... } |
+| Splitting.cs:52:9:52:9 | [post] access to local variable y | Splitting.cs:53:17:53:17 | access to local variable y |
+| Splitting.cs:52:9:52:9 | access to local variable y | Splitting.cs:53:17:53:17 | access to local variable y |
+| Splitting.cs:52:16:52:18 | "b" | Splitting.cs:52:9:52:9 | [post] access to local variable y |
+| Splitting.cs:52:16:52:18 | "b" | Splitting.cs:52:9:52:12 | access to array element |
+| Splitting.cs:53:9:53:9 | access to local variable x | Splitting.cs:53:9:53:20 | SSA def(x) |
+| Splitting.cs:53:9:53:20 | SSA def(x) | Splitting.cs:54:17:54:17 | access to local variable x |
+| Splitting.cs:53:13:53:13 | access to local variable x | Splitting.cs:53:13:53:20 | ... + ... |
+| Splitting.cs:53:13:53:20 | ... + ... | Splitting.cs:53:9:53:9 | access to local variable x |
+| Splitting.cs:53:17:53:17 | access to local variable y | Splitting.cs:53:17:53:20 | access to array element |
+| Splitting.cs:53:17:53:17 | access to local variable y | Splitting.cs:57:17:57:17 | access to local variable y |
+| Splitting.cs:53:17:53:20 | access to array element | Splitting.cs:53:13:53:20 | ... + ... |
+| Splitting.cs:54:13:54:13 | access to local variable z | Splitting.cs:54:13:54:23 | SSA def(z) |
+| Splitting.cs:54:13:54:23 | SSA def(z) | Splitting.cs:55:14:55:14 | access to local variable z |
+| Splitting.cs:54:17:54:17 | access to local variable x | Splitting.cs:54:17:54:23 | ... == ... |
+| Splitting.cs:54:17:54:17 | access to local variable x | Splitting.cs:56:17:56:17 | access to local variable x |
+| Splitting.cs:54:17:54:23 | ... == ... | Splitting.cs:54:13:54:13 | access to local variable z |
+| Splitting.cs:55:13:55:14 | !... | Splitting.cs:55:9:55:9 | access to local variable z |
+| Splitting.cs:55:14:55:14 | access to local variable z | Splitting.cs:55:13:55:14 | !... |
+| Splitting.cs:56:9:56:9 | access to local variable x | Splitting.cs:56:9:56:19 | SSA def(x) |
+| Splitting.cs:56:9:56:19 | SSA def(x) | Splitting.cs:57:14:57:14 | access to local variable x |
+| Splitting.cs:56:13:56:19 | $"..." | Splitting.cs:56:9:56:9 | access to local variable x |
+| Splitting.cs:56:15:56:15 | "c" | Splitting.cs:56:13:56:19 | $"..." |
+| Splitting.cs:56:16:56:18 | {...} | Splitting.cs:56:13:56:19 | $"..." |
+| Splitting.cs:56:17:56:17 | access to local variable x | Splitting.cs:56:16:56:18 | {...} |
+| Splitting.cs:57:13:57:24 | access to field Item1 | Splitting.cs:57:9:57:9 | access to local variable x |
+| Splitting.cs:57:17:57:17 | access to local variable y | Splitting.cs:58:27:58:27 | access to local variable y |
+| Splitting.cs:58:22:58:22 | SSA def(s) | Splitting.cs:59:19:59:19 | access to local variable s |
+| Splitting.cs:58:22:58:22 | String s | Splitting.cs:58:22:58:22 | SSA def(s) |
+| Splitting.cs:58:27:58:27 | access to local variable y | Splitting.cs:58:22:58:22 | SSA def(s) |
 | UseUseExplosion.cs:21:10:21:10 | SSA entry def(this.Prop) | UseUseExplosion.cs:24:13:24:16 | access to property Prop |
 | UseUseExplosion.cs:21:10:21:10 | this | UseUseExplosion.cs:24:13:24:16 | this access |
 | UseUseExplosion.cs:23:13:23:13 | access to local variable x | UseUseExplosion.cs:23:13:23:17 | SSA def(x) |
diff --git a/csharp/ql/test/library-tests/dataflow/modulusanalysis/ModulusAnalysis.expected b/csharp/ql/test/library-tests/dataflow/modulusanalysis/ModulusAnalysis.expected
index eb08a808522..ac03ba8b8f3 100644
--- a/csharp/ql/test/library-tests/dataflow/modulusanalysis/ModulusAnalysis.expected
+++ b/csharp/ql/test/library-tests/dataflow/modulusanalysis/ModulusAnalysis.expected
@@ -89,26 +89,24 @@
 | ModulusAnalysis.cs:47:37:47:38 | 11 | 0 | 11 | 0 |
 | ModulusAnalysis.cs:48:34:48:34 | access to local variable l | 0 | 1 | 4 |
 | ModulusAnalysis.cs:48:34:48:34 | access to local variable l | SSA def(l) | 0 | 0 |
-| ModulusAnalysis.cs:52:13:52:25 | [cond2 (line 9): true] ... = ... | 0 | 3 | 4 |
-| ModulusAnalysis.cs:52:17:52:17 | [cond2 (line 9): true] access to parameter i | SSA param(i) | 0 | 0 |
-| ModulusAnalysis.cs:52:17:52:21 | [cond2 (line 9): true] ... * ... | 0 | 0 | 4 |
-| ModulusAnalysis.cs:52:17:52:25 | [cond2 (line 9): true] ... + ... | 0 | 3 | 4 |
-| ModulusAnalysis.cs:52:21:52:21 | [cond2 (line 9): true] 4 | 0 | 4 | 0 |
-| ModulusAnalysis.cs:52:25:52:25 | [cond2 (line 9): true] 3 | 0 | 3 | 0 |
-| ModulusAnalysis.cs:56:13:56:25 | [cond2 (line 9): false] ... = ... | 0 | 7 | 8 |
-| ModulusAnalysis.cs:56:17:56:17 | [cond2 (line 9): false] access to parameter i | SSA param(i) | 0 | 0 |
-| ModulusAnalysis.cs:56:17:56:21 | [cond2 (line 9): false] ... * ... | 0 | 0 | 8 |
-| ModulusAnalysis.cs:56:17:56:25 | [cond2 (line 9): false] ... + ... | 0 | 7 | 8 |
-| ModulusAnalysis.cs:56:21:56:21 | [cond2 (line 9): false] 8 | 0 | 8 | 0 |
-| ModulusAnalysis.cs:56:25:56:25 | [cond2 (line 9): false] 7 | 0 | 7 | 0 |
-| ModulusAnalysis.cs:58:34:58:34 | [cond2 (line 9): false] access to local variable j | 0 | 7 | 8 |
-| ModulusAnalysis.cs:58:34:58:34 | [cond2 (line 9): false] access to local variable j | [cond2 (line 9): false] SSA def(j) | 0 | 0 |
-| ModulusAnalysis.cs:58:34:58:34 | [cond2 (line 9): true] access to local variable j | 0 | 3 | 4 |
-| ModulusAnalysis.cs:58:34:58:34 | [cond2 (line 9): true] access to local variable j | [cond2 (line 9): true] SSA def(j) | 0 | 0 |
+| ModulusAnalysis.cs:52:13:52:25 | ... = ... | 0 | 3 | 4 |
+| ModulusAnalysis.cs:52:17:52:17 | access to parameter i | SSA param(i) | 0 | 0 |
+| ModulusAnalysis.cs:52:17:52:21 | ... * ... | 0 | 0 | 4 |
+| ModulusAnalysis.cs:52:17:52:25 | ... + ... | 0 | 3 | 4 |
+| ModulusAnalysis.cs:52:21:52:21 | 4 | 0 | 4 | 0 |
+| ModulusAnalysis.cs:52:25:52:25 | 3 | 0 | 3 | 0 |
+| ModulusAnalysis.cs:56:13:56:25 | ... = ... | 0 | 7 | 8 |
+| ModulusAnalysis.cs:56:17:56:17 | access to parameter i | SSA param(i) | 0 | 0 |
+| ModulusAnalysis.cs:56:17:56:21 | ... * ... | 0 | 0 | 8 |
+| ModulusAnalysis.cs:56:17:56:25 | ... + ... | 0 | 7 | 8 |
+| ModulusAnalysis.cs:56:21:56:21 | 8 | 0 | 8 | 0 |
+| ModulusAnalysis.cs:56:25:56:25 | 7 | 0 | 7 | 0 |
+| ModulusAnalysis.cs:58:34:58:34 | access to local variable j | 0 | 3 | 4 |
+| ModulusAnalysis.cs:58:34:58:34 | access to local variable j | SSA phi(j) | 0 | 0 |
 | ModulusAnalysis.cs:62:38:62:38 | access to local variable j | 0 | 3 | 4 |
-| ModulusAnalysis.cs:62:38:62:38 | access to local variable j | [cond2 (line 9): true] SSA def(j) | 0 | 0 |
-| ModulusAnalysis.cs:66:38:66:38 | access to local variable j | 0 | 7 | 8 |
-| ModulusAnalysis.cs:66:38:66:38 | access to local variable j | [cond2 (line 9): false] SSA def(j) | 0 | 0 |
+| ModulusAnalysis.cs:62:38:62:38 | access to local variable j | SSA phi(j) | 0 | 0 |
+| ModulusAnalysis.cs:66:38:66:38 | access to local variable j | 0 | 3 | 4 |
+| ModulusAnalysis.cs:66:38:66:38 | access to local variable j | SSA phi(j) | 0 | 0 |
 | ModulusAnalysis.cs:69:17:69:18 | 64 | 0 | 64 | 0 |
 | ModulusAnalysis.cs:70:34:70:34 | access to local variable t | 0 | 64 | 0 |
 | ModulusAnalysis.cs:70:34:70:34 | access to local variable t | SSA def(t) | 0 | 0 |
@@ -131,22 +129,20 @@
 | ModulusAnalysis.cs:75:25:75:25 | 3 | 0 | 3 | 0 |
 | ModulusAnalysis.cs:77:38:77:38 | access to parameter x | 0 | 3 | 16 |
 | ModulusAnalysis.cs:77:38:77:38 | access to parameter x | SSA param(x) | 0 | 0 |
-| ModulusAnalysis.cs:80:9:82:23 | [cond3 (line 9): false] ... = ... | 0 | 7 | 8 |
-| ModulusAnalysis.cs:80:9:82:23 | [cond3 (line 9): true] ... = ... | 0 | 3 | 4 |
-| ModulusAnalysis.cs:80:13:82:23 | [cond3 (line 9): false] ... ? ... : ... | 0 | 7 | 8 |
-| ModulusAnalysis.cs:80:13:82:23 | [cond3 (line 9): true] ... ? ... : ... | 0 | 3 | 4 |
-| ModulusAnalysis.cs:81:15:81:15 | [cond3 (line 9): true] access to parameter i | SSA param(i) | 0 | 0 |
-| ModulusAnalysis.cs:81:15:81:19 | [cond3 (line 9): true] ... * ... | 0 | 0 | 4 |
-| ModulusAnalysis.cs:81:15:81:23 | [cond3 (line 9): true] ... + ... | 0 | 3 | 4 |
-| ModulusAnalysis.cs:81:19:81:19 | [cond3 (line 9): true] 4 | 0 | 4 | 0 |
-| ModulusAnalysis.cs:81:23:81:23 | [cond3 (line 9): true] 3 | 0 | 3 | 0 |
-| ModulusAnalysis.cs:82:15:82:15 | [cond3 (line 9): false] access to parameter i | SSA param(i) | 0 | 0 |
-| ModulusAnalysis.cs:82:15:82:19 | [cond3 (line 9): false] ... * ... | 0 | 0 | 8 |
-| ModulusAnalysis.cs:82:15:82:23 | [cond3 (line 9): false] ... + ... | 0 | 7 | 8 |
-| ModulusAnalysis.cs:82:19:82:19 | [cond3 (line 9): false] 8 | 0 | 8 | 0 |
-| ModulusAnalysis.cs:82:23:82:23 | [cond3 (line 9): false] 7 | 0 | 7 | 0 |
-| ModulusAnalysis.cs:84:38:84:38 | access to local variable j | 0 | 7 | 8 |
-| ModulusAnalysis.cs:84:38:84:38 | access to local variable j | [cond3 (line 9): false] SSA def(j) | 0 | 0 |
+| ModulusAnalysis.cs:80:9:82:23 | ... = ... | 0 | 3 | 4 |
+| ModulusAnalysis.cs:80:13:82:23 | ... ? ... : ... | 0 | 3 | 4 |
+| ModulusAnalysis.cs:81:15:81:15 | access to parameter i | SSA param(i) | 0 | 0 |
+| ModulusAnalysis.cs:81:15:81:19 | ... * ... | 0 | 0 | 4 |
+| ModulusAnalysis.cs:81:15:81:23 | ... + ... | 0 | 3 | 4 |
+| ModulusAnalysis.cs:81:19:81:19 | 4 | 0 | 4 | 0 |
+| ModulusAnalysis.cs:81:23:81:23 | 3 | 0 | 3 | 0 |
+| ModulusAnalysis.cs:82:15:82:15 | access to parameter i | SSA param(i) | 0 | 0 |
+| ModulusAnalysis.cs:82:15:82:19 | ... * ... | 0 | 0 | 8 |
+| ModulusAnalysis.cs:82:15:82:23 | ... + ... | 0 | 7 | 8 |
+| ModulusAnalysis.cs:82:19:82:19 | 8 | 0 | 8 | 0 |
+| ModulusAnalysis.cs:82:23:82:23 | 7 | 0 | 7 | 0 |
+| ModulusAnalysis.cs:84:38:84:38 | access to local variable j | 0 | 3 | 4 |
+| ModulusAnalysis.cs:84:38:84:38 | access to local variable j | SSA def(j) | 0 | 0 |
 | ModulusAnalysis.cs:89:22:89:22 | 0 | 0 | 0 | 0 |
 | ModulusAnalysis.cs:89:25:89:25 | access to local variable i | SSA phi(i) | 0 | 0 |
 | ModulusAnalysis.cs:89:29:89:31 | access to parameter cap | SSA param(cap) | 0 | 0 |
diff --git a/csharp/ql/test/library-tests/dataflow/signanalysis/SignAnalysis.expected b/csharp/ql/test/library-tests/dataflow/signanalysis/SignAnalysis.expected
index 69a73d52508..b0d97c4d6e4 100644
--- a/csharp/ql/test/library-tests/dataflow/signanalysis/SignAnalysis.expected
+++ b/csharp/ql/test/library-tests/dataflow/signanalysis/SignAnalysis.expected
@@ -236,15 +236,11 @@
 | SignAnalysis.cs:464:9:464:9 | access to local variable x | positive |
 | SignAnalysis.cs:464:9:464:11 | ...++ | positive |
 | SignAnalysis.cs:465:34:465:34 | access to local variable x | strictlyPositive |
-| SignAnalysis.cs:470:21:470:21 | [b (line 468): true] 1 | strictlyPositive |
-| SignAnalysis.cs:470:25:470:26 | [b (line 468): false] -... | strictlyNegative |
-| SignAnalysis.cs:470:26:470:26 | [b (line 468): false] 1 | strictlyPositive |
-| SignAnalysis.cs:480:16:480:20 | [b (line 477): true] ... = ... | strictlyPositive |
-| SignAnalysis.cs:480:20:480:20 | [b (line 477): true] 1 | strictlyPositive |
-| SignAnalysis.cs:480:28:480:33 | [b (line 477): false] ... = ... | strictlyNegative |
-| SignAnalysis.cs:480:32:480:33 | [b (line 477): false] -... | strictlyNegative |
-| SignAnalysis.cs:480:33:480:33 | [b (line 477): false] 1 | strictlyPositive |
-| SignAnalysis.cs:482:34:482:34 | [b (line 477): false] access to local variable x | strictlyNegative |
-| SignAnalysis.cs:482:34:482:34 | [b (line 477): true] access to local variable x | strictlyPositive |
-| SignAnalysis.cs:485:38:485:38 | access to local variable x | strictlyPositive |
-| SignAnalysis.cs:487:38:487:38 | access to local variable x | strictlyNegative |
+| SignAnalysis.cs:470:21:470:21 | 1 | strictlyPositive |
+| SignAnalysis.cs:470:25:470:26 | -... | strictlyNegative |
+| SignAnalysis.cs:470:26:470:26 | 1 | strictlyPositive |
+| SignAnalysis.cs:480:16:480:20 | ... = ... | strictlyPositive |
+| SignAnalysis.cs:480:20:480:20 | 1 | strictlyPositive |
+| SignAnalysis.cs:480:28:480:33 | ... = ... | strictlyNegative |
+| SignAnalysis.cs:480:32:480:33 | -... | strictlyNegative |
+| SignAnalysis.cs:480:33:480:33 | 1 | strictlyPositive |
diff --git a/csharp/ql/test/library-tests/dataflow/ssa/DefAdjacentRead.expected b/csharp/ql/test/library-tests/dataflow/ssa/DefAdjacentRead.expected
index 221b551b1f0..13036f0f0ae 100644
--- a/csharp/ql/test/library-tests/dataflow/ssa/DefAdjacentRead.expected
+++ b/csharp/ql/test/library-tests/dataflow/ssa/DefAdjacentRead.expected
@@ -119,13 +119,6 @@
 | Properties.cs:74:23:74:23 | a | Properties.cs:74:23:74:54 | Action a = ... | Properties.cs:77:9:77:9 | access to local variable a |
 | Properties.cs:75:23:75:23 | b | Properties.cs:75:23:75:35 | Action b = ... | Properties.cs:80:9:80:9 | access to local variable b |
 | Properties.cs:106:37:106:37 | p | Properties.cs:106:37:106:37 | p | Properties.cs:106:42:106:42 | access to parameter p |
-| Splitting.cs:3:18:3:18 | b | Splitting.cs:3:18:3:18 | b | Splitting.cs:6:13:6:13 | access to parameter b |
-| Splitting.cs:5:13:5:13 | x | Splitting.cs:10:13:10:19 | ... = ... | Splitting.cs:11:13:11:13 | access to local variable x |
-| Splitting.cs:22:18:22:18 | b | Splitting.cs:22:18:22:18 | b | Splitting.cs:25:13:25:13 | access to parameter b |
-| Splitting.cs:24:13:24:13 | x | Splitting.cs:29:13:29:19 | ... = ... | Splitting.cs:30:13:30:13 | access to local variable x |
-| Splitting.cs:24:13:24:13 | x | Splitting.cs:32:9:32:15 | ... = ... | Splitting.cs:33:9:33:9 | access to local variable x |
-| Splitting.cs:42:18:42:18 | b | Splitting.cs:42:18:42:18 | b | Splitting.cs:45:13:45:13 | access to parameter b |
-| Splitting.cs:44:13:44:13 | x | Splitting.cs:49:13:49:19 | ... = ... | Splitting.cs:50:13:50:13 | access to local variable x |
 | Test.cs:3:9:3:13 | field | Test.cs:57:9:57:17 | ... = ... | Test.cs:58:13:58:17 | access to field field |
 | Test.cs:5:15:5:20 | param1 | Test.cs:5:15:5:20 | param1 | Test.cs:11:13:11:18 | access to parameter param1 |
 | Test.cs:5:67:5:72 | param2 | Test.cs:5:67:5:72 | param2 | Test.cs:39:27:39:32 | access to parameter param2 |
diff --git a/csharp/ql/test/library-tests/dataflow/ssa/ReadAdjacentRead.expected b/csharp/ql/test/library-tests/dataflow/ssa/ReadAdjacentRead.expected
index 1b416d1b4f2..3e6623aa4e8 100644
--- a/csharp/ql/test/library-tests/dataflow/ssa/ReadAdjacentRead.expected
+++ b/csharp/ql/test/library-tests/dataflow/ssa/ReadAdjacentRead.expected
@@ -94,14 +94,6 @@
 | Properties.cs:104:16:104:20 | Props | Properties.cs:114:20:114:35 | access to field Props | Properties.cs:115:21:115:36 | access to field Props |
 | Properties.cs:104:16:104:20 | Props | Properties.cs:115:21:115:30 | access to field Props | Properties.cs:116:17:116:26 | access to field Props |
 | Properties.cs:104:16:104:20 | Props | Properties.cs:115:21:115:36 | access to field Props | Properties.cs:116:17:116:32 | access to field Props |
-| Splitting.cs:3:18:3:18 | b | Splitting.cs:6:13:6:13 | access to parameter b | Splitting.cs:15:13:15:13 | access to parameter b |
-| Splitting.cs:5:13:5:13 | x | Splitting.cs:13:9:13:9 | access to local variable x | Splitting.cs:14:9:14:9 | access to local variable x |
-| Splitting.cs:5:13:5:13 | x | Splitting.cs:14:9:14:9 | access to local variable x | Splitting.cs:17:13:17:13 | access to local variable x |
-| Splitting.cs:22:18:22:18 | b | Splitting.cs:25:13:25:13 | access to parameter b | Splitting.cs:35:13:35:13 | access to parameter b |
-| Splitting.cs:24:13:24:13 | x | Splitting.cs:33:9:33:9 | access to local variable x | Splitting.cs:34:9:34:9 | access to local variable x |
-| Splitting.cs:24:13:24:13 | x | Splitting.cs:34:9:34:9 | access to local variable x | Splitting.cs:37:13:37:13 | access to local variable x |
-| Splitting.cs:42:18:42:18 | b | Splitting.cs:45:13:45:13 | access to parameter b | Splitting.cs:52:13:52:13 | access to parameter b |
-| Splitting.cs:44:13:44:13 | x | Splitting.cs:54:9:54:9 | access to local variable x | Splitting.cs:55:9:55:9 | access to local variable x |
 | Test.cs:8:13:8:13 | x | Test.cs:25:16:25:16 | access to local variable x | Test.cs:25:16:25:16 | access to local variable x |
 | Test.cs:9:13:9:13 | y | Test.cs:25:20:25:20 | access to local variable y | Test.cs:31:13:31:13 | access to local variable y |
 | Test.cs:9:13:9:13 | y | Test.cs:25:20:25:20 | access to local variable y | Test.cs:43:20:43:20 | access to local variable y |
diff --git a/csharp/ql/test/library-tests/dataflow/ssa/SSAPhi.expected b/csharp/ql/test/library-tests/dataflow/ssa/SSAPhi.expected
index 8cbd5e6b1b6..e69a5cbe088 100644
--- a/csharp/ql/test/library-tests/dataflow/ssa/SSAPhi.expected
+++ b/csharp/ql/test/library-tests/dataflow/ssa/SSAPhi.expected
@@ -33,8 +33,6 @@
 | Properties.cs:33:19:33:22 | Properties.stat | Properties.cs:50:9:50:17 | SSA phi(Properties.stat) | Properties.cs:49:17:49:32 | SSA call def(Properties.stat) |
 | Properties.cs:61:23:61:23 | i | Properties.cs:63:16:63:16 | SSA phi(i) | Properties.cs:61:23:61:23 | SSA param(i) |
 | Properties.cs:61:23:61:23 | i | Properties.cs:63:16:63:16 | SSA phi(i) | Properties.cs:63:16:63:18 | SSA def(i) |
-| Splitting.cs:44:13:44:13 | x | Splitting.cs:54:9:54:21 | SSA phi(x) | Splitting.cs:46:13:46:19 | [b (line 42): true] SSA def(x) |
-| Splitting.cs:44:13:44:13 | x | Splitting.cs:54:9:54:21 | SSA phi(x) | Splitting.cs:49:13:49:19 | [b (line 42): false] SSA def(x) |
 | Test.cs:5:15:5:20 | param1 | Test.cs:25:16:25:16 | SSA phi(param1) | Test.cs:5:15:5:20 | SSA param(param1) |
 | Test.cs:5:15:5:20 | param1 | Test.cs:25:16:25:16 | SSA phi(param1) | Test.cs:27:17:27:24 | SSA def(param1) |
 | Test.cs:5:15:5:20 | param1 | Test.cs:33:9:33:19 | SSA phi(param1) | Test.cs:25:16:25:16 | SSA phi(param1) |
diff --git a/csharp/ql/test/library-tests/dataflow/ssa/Splitting.cs b/csharp/ql/test/library-tests/dataflow/ssa/Splitting.cs
deleted file mode 100644
index 3969b9ab339..00000000000
--- a/csharp/ql/test/library-tests/dataflow/ssa/Splitting.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-class Splitting
-{
-    void M1(bool b)
-    {
-        var x = "";
-        if (b)
-            x = "a";
-        else
-        {
-            x = "b";
-            x.ToString();
-        }
-        x.ToString();
-        x.ToString();
-        if (b)
-        {
-            x.ToString();
-            x = "c";
-        }
-    }
-
-    void M2(bool b)
-    {
-        var x = "";
-        if (b)
-            x = "a";
-        else
-        {
-            x = "b";
-            x.ToString();
-        }
-        x = "c";
-        x.ToString();
-        x.ToString();
-        if (b)
-        {
-            x.ToString();
-            x = "d";
-        }
-    }
-
-    void M3(bool b)
-    {
-        var x = "";
-        if (b)
-            x = "a";
-        else
-        {
-            x = "b";
-            x.ToString();
-        }
-        if (b)
-            b = false;
-        x.ToString();
-        x.ToString();
-    }
-}
diff --git a/csharp/ql/test/library-tests/dataflow/ssa/SsaDef.expected b/csharp/ql/test/library-tests/dataflow/ssa/SsaDef.expected
index 8d0e2b8261d..3f117d6412e 100644
--- a/csharp/ql/test/library-tests/dataflow/ssa/SsaDef.expected
+++ b/csharp/ql/test/library-tests/dataflow/ssa/SsaDef.expected
@@ -35,7 +35,6 @@
 | Capture.cs:248:36:248:36 | j | Capture.cs:251:13:251:17 | SSA def(j) |
 | Consistency.cs:7:25:7:25 | b | Consistency.cs:7:25:7:25 | SSA param(b) |
 | Consistency.cs:15:17:15:17 | i | Consistency.cs:15:17:15:21 | SSA def(i) |
-| Consistency.cs:15:17:15:17 | i | Consistency.cs:15:17:15:21 | [finally: exception(Exception)] SSA def(i) |
 | Consistency.cs:25:29:25:29 | c | Consistency.cs:25:29:25:29 | SSA def(c) |
 | Consistency.cs:26:13:26:19 | c.Field | Consistency.cs:25:29:25:29 | SSA qualifier def(c.Field) |
 | Consistency.cs:30:30:30:30 | c | Consistency.cs:32:9:32:29 | SSA def(c) |
@@ -242,17 +241,6 @@
 | Properties.cs:114:20:114:35 | this.Props.Props | Properties.cs:113:9:113:22 | SSA call def(this.Props.Props) |
 | Properties.cs:115:21:115:39 | this.Props.Props.xs | Properties.cs:108:10:108:10 | SSA qualifier def(this.Props.Props.xs) |
 | Properties.cs:115:21:115:39 | this.Props.Props.xs | Properties.cs:113:9:113:22 | SSA qualifier def(this.Props.Props.xs) |
-| Splitting.cs:3:18:3:18 | b | Splitting.cs:3:18:3:18 | SSA param(b) |
-| Splitting.cs:5:13:5:13 | x | Splitting.cs:7:13:7:19 | [b (line 3): true] SSA def(x) |
-| Splitting.cs:5:13:5:13 | x | Splitting.cs:10:13:10:19 | [b (line 3): false] SSA def(x) |
-| Splitting.cs:22:18:22:18 | b | Splitting.cs:22:18:22:18 | SSA param(b) |
-| Splitting.cs:24:13:24:13 | x | Splitting.cs:29:13:29:19 | [b (line 22): false] SSA def(x) |
-| Splitting.cs:24:13:24:13 | x | Splitting.cs:32:9:32:15 | [b (line 22): false] SSA def(x) |
-| Splitting.cs:24:13:24:13 | x | Splitting.cs:32:9:32:15 | [b (line 22): true] SSA def(x) |
-| Splitting.cs:42:18:42:18 | b | Splitting.cs:42:18:42:18 | SSA param(b) |
-| Splitting.cs:44:13:44:13 | x | Splitting.cs:46:13:46:19 | [b (line 42): true] SSA def(x) |
-| Splitting.cs:44:13:44:13 | x | Splitting.cs:49:13:49:19 | [b (line 42): false] SSA def(x) |
-| Splitting.cs:44:13:44:13 | x | Splitting.cs:54:9:54:21 | SSA phi(x) |
 | Test.cs:5:15:5:20 | param1 | Test.cs:5:15:5:20 | SSA param(param1) |
 | Test.cs:5:15:5:20 | param1 | Test.cs:25:16:25:16 | SSA phi(param1) |
 | Test.cs:5:15:5:20 | param1 | Test.cs:27:17:27:24 | SSA def(param1) |
@@ -289,7 +277,7 @@
 | Test.cs:56:13:56:17 | this.field | Test.cs:46:10:46:10 | SSA entry def(this.field) |
 | Test.cs:56:13:56:17 | this.field | Test.cs:57:9:57:17 | SSA def(this.field) |
 | Test.cs:62:16:62:16 | x | Test.cs:62:16:62:16 | SSA param(x) |
-| Test.cs:68:45:68:45 | e | Test.cs:68:45:68:45 | [exception: DivideByZeroException] SSA def(e) |
+| Test.cs:68:45:68:45 | e | Test.cs:68:45:68:45 | SSA def(e) |
 | Test.cs:76:24:76:25 | b1 | Test.cs:76:24:76:25 | SSA param(b1) |
 | Test.cs:76:33:76:34 | b2 | Test.cs:76:33:76:34 | SSA param(b2) |
 | Test.cs:76:42:76:43 | b3 | Test.cs:76:42:76:43 | SSA param(b3) |
diff --git a/csharp/ql/test/library-tests/dataflow/ssa/SsaDefElement.expected b/csharp/ql/test/library-tests/dataflow/ssa/SsaDefElement.expected
index 272db29e6f4..4bbe88295ed 100644
--- a/csharp/ql/test/library-tests/dataflow/ssa/SsaDefElement.expected
+++ b/csharp/ql/test/library-tests/dataflow/ssa/SsaDefElement.expected
@@ -35,7 +35,6 @@
 | Capture.cs:251:13:251:17 | SSA def(j) | Capture.cs:251:13:251:17 | ... = ... |
 | Consistency.cs:7:25:7:25 | SSA param(b) | Consistency.cs:7:25:7:25 | b |
 | Consistency.cs:15:17:15:21 | SSA def(i) | Consistency.cs:15:17:15:21 | Int32 i = ... |
-| Consistency.cs:15:17:15:21 | [finally: exception(Exception)] SSA def(i) | Consistency.cs:15:17:15:21 | Int32 i = ... |
 | Consistency.cs:25:29:25:29 | SSA def(c) | Consistency.cs:25:9:25:30 | call to method Out |
 | Consistency.cs:25:29:25:29 | SSA qualifier def(c.Field) | Consistency.cs:25:9:25:30 | call to method Out |
 | Consistency.cs:32:9:32:29 | SSA def(c) | Consistency.cs:32:9:32:29 | ... = ... |
@@ -52,9 +51,12 @@
 | DefUse.cs:13:13:13:18 | SSA def(y) | DefUse.cs:13:13:13:18 | ... = ... |
 | DefUse.cs:18:13:18:18 | SSA def(y) | DefUse.cs:18:13:18:18 | ... = ... |
 | DefUse.cs:19:13:19:18 | SSA def(w) | DefUse.cs:19:13:19:18 | ... = ... |
+| DefUse.cs:23:9:23:15 | SSA phi(w) | DefUse.cs:23:9:23:15 | ...; |
+| DefUse.cs:23:9:23:15 | SSA phi(y) | DefUse.cs:23:9:23:15 | ...; |
 | DefUse.cs:28:13:28:18 | SSA def(y) | DefUse.cs:28:13:28:18 | ... = ... |
 | DefUse.cs:29:13:29:18 | SSA def(w) | DefUse.cs:29:13:29:18 | ... = ... |
 | DefUse.cs:39:13:39:18 | SSA def(y) | DefUse.cs:39:13:39:18 | ... = ... |
+| DefUse.cs:42:9:42:15 | SSA phi(y) | DefUse.cs:42:9:42:15 | ...; |
 | DefUse.cs:44:13:44:17 | SSA def(z) | DefUse.cs:44:13:44:17 | Int32 z = ... |
 | DefUse.cs:47:23:47:23 | SSA def(z) | DefUse.cs:47:9:47:24 | call to method outMethod |
 | DefUse.cs:50:23:50:23 | SSA def(z) | DefUse.cs:50:9:50:24 | call to method refMethod |
@@ -65,12 +67,14 @@
 | DefUse.cs:67:19:67:27 | SSA def(tc) | DefUse.cs:67:19:67:27 | TestClass tc = ... |
 | DefUse.cs:79:13:79:18 | SSA def(x1) | DefUse.cs:79:13:79:18 | Int32 x1 = ... |
 | DefUse.cs:80:30:80:31 | SSA def(x1) | DefUse.cs:80:16:80:32 | call to method refMethod |
+| DefUse.cs:80:30:80:31 | SSA phi(x1) | DefUse.cs:80:30:80:31 | access to local variable x1 |
 | DefUse.cs:83:13:83:18 | SSA def(x2) | DefUse.cs:83:13:83:18 | Int32 x2 = ... |
 | DefUse.cs:85:15:85:16 | SSA def(x2) | DefUse.cs:84:9:86:17 | call to method refOutMethod |
 | DefUse.cs:89:13:89:18 | SSA def(x3) | DefUse.cs:89:13:89:18 | Int32 x3 = ... |
 | DefUse.cs:92:15:92:16 | SSA def(x3) | DefUse.cs:91:9:93:17 | call to method refOutMethod |
 | DefUse.cs:93:15:93:16 | SSA def(x4) | DefUse.cs:91:9:93:17 | call to method refOutMethod |
 | DefUse.cs:97:13:97:18 | SSA def(x5) | DefUse.cs:97:13:97:18 | Int32 x5 = ... |
+| DefUse.cs:98:16:98:17 | SSA phi(x5) | DefUse.cs:98:16:98:17 | access to local variable x5 |
 | DefUse.cs:101:13:101:23 | SSA def(x5) | DefUse.cs:101:13:101:23 | ... = ... |
 | DefUse.cs:104:9:104:15 | SSA def(x5) | DefUse.cs:104:9:104:15 | ... = ... |
 | DefUse.cs:114:47:114:52 | SSA def(i) | DefUse.cs:114:47:114:52 | ... = ... |
@@ -93,13 +97,16 @@
 | Example.cs:8:9:8:22 | SSA def(this.Field) | Example.cs:8:9:8:22 | ... = ... |
 | Example.cs:11:13:11:30 | SSA def(this.Field) | Example.cs:11:13:11:30 | ... = ... |
 | Example.cs:13:13:13:23 | SSA call def(this.Field) | Example.cs:13:13:13:23 | call to method SetField |
+| Example.cs:14:9:14:24 | SSA phi(this.Field) | Example.cs:14:9:14:24 | ...; |
 | Example.cs:18:16:18:16 | SSA param(p) | Example.cs:18:16:18:16 | p |
 | Example.cs:18:24:18:24 | SSA param(b) | Example.cs:18:24:18:24 | b |
 | Example.cs:23:13:23:17 | SSA def(p) | Example.cs:23:13:23:17 | ... = ... |
+| Example.cs:25:9:25:15 | SSA phi(p) | Example.cs:25:9:25:15 | ...; |
 | Fields.cs:16:17:16:17 | SSA entry def(this.xs) | Fields.cs:16:17:16:17 | F |
 | Fields.cs:19:9:19:13 | SSA call def(this.xs) | Fields.cs:19:9:19:13 | call to method Upd |
 | Fields.cs:20:9:20:14 | SSA def(x) | Fields.cs:20:9:20:14 | ... = ... |
 | Fields.cs:22:13:22:17 | SSA call def(this.xs) | Fields.cs:22:13:22:17 | call to method Upd |
+| Fields.cs:23:9:23:20 | SSA phi(this.xs) | Fields.cs:23:9:23:20 | ...; |
 | Fields.cs:24:9:24:23 | SSA def(this.xs) | Fields.cs:24:9:24:23 | ... = ... |
 | Fields.cs:28:17:28:17 | SSA entry def(Fields.stat) | Fields.cs:28:17:28:17 | G |
 | Fields.cs:28:17:28:17 | SSA entry def(this.xs) | Fields.cs:28:17:28:17 | G |
@@ -118,6 +125,9 @@
 | Fields.cs:49:13:49:28 | SSA def(f) | Fields.cs:49:13:49:28 | ... = ... |
 | Fields.cs:49:13:49:28 | SSA qualifier def(f.xs) | Fields.cs:49:13:49:28 | ... = ... |
 | Fields.cs:49:17:49:28 | SSA call def(Fields.stat) | Fields.cs:49:17:49:28 | object creation of type Fields |
+| Fields.cs:50:9:50:17 | SSA phi(Fields.stat) | Fields.cs:50:9:50:17 | ...; |
+| Fields.cs:50:9:50:17 | SSA phi(f) | Fields.cs:50:9:50:17 | ...; |
+| Fields.cs:50:9:50:17 | SSA phi(f.xs) | Fields.cs:50:9:50:17 | ...; |
 | Fields.cs:51:9:51:20 | SSA call def(Fields.stat) | Fields.cs:51:9:51:20 | object creation of type Fields |
 | Fields.cs:61:17:61:17 | SSA entry def(this.LoopField) | Fields.cs:61:17:61:17 | H |
 | Fields.cs:61:17:61:17 | SSA entry def(this.SingleAccessedField) | Fields.cs:61:17:61:17 | H |
@@ -179,6 +189,7 @@
 | Properties.cs:19:9:19:13 | SSA call def(this.xs) | Properties.cs:19:9:19:13 | call to method Upd |
 | Properties.cs:20:9:20:14 | SSA def(x) | Properties.cs:20:9:20:14 | ... = ... |
 | Properties.cs:22:13:22:17 | SSA call def(this.xs) | Properties.cs:22:13:22:17 | call to method Upd |
+| Properties.cs:23:9:23:20 | SSA phi(this.xs) | Properties.cs:23:9:23:20 | ...; |
 | Properties.cs:24:9:24:23 | SSA def(this.xs) | Properties.cs:24:9:24:23 | ... = ... |
 | Properties.cs:28:17:28:17 | SSA entry def(Properties.stat) | Properties.cs:28:17:28:17 | G |
 | Properties.cs:28:17:28:17 | SSA entry def(this.xs) | Properties.cs:28:17:28:17 | G |
@@ -197,10 +208,14 @@
 | Properties.cs:49:13:49:32 | SSA def(f) | Properties.cs:49:13:49:32 | ... = ... |
 | Properties.cs:49:13:49:32 | SSA qualifier def(f.xs) | Properties.cs:49:13:49:32 | ... = ... |
 | Properties.cs:49:17:49:32 | SSA call def(Properties.stat) | Properties.cs:49:17:49:32 | object creation of type Properties |
+| Properties.cs:50:9:50:17 | SSA phi(Properties.stat) | Properties.cs:50:9:50:17 | ...; |
+| Properties.cs:50:9:50:17 | SSA phi(f) | Properties.cs:50:9:50:17 | ...; |
+| Properties.cs:50:9:50:17 | SSA phi(f.xs) | Properties.cs:50:9:50:17 | ...; |
 | Properties.cs:51:9:51:24 | SSA call def(Properties.stat) | Properties.cs:51:9:51:24 | object creation of type Properties |
 | Properties.cs:61:17:61:17 | SSA entry def(this.LoopProp) | Properties.cs:61:17:61:17 | H |
 | Properties.cs:61:17:61:17 | SSA entry def(this.SingleAccessedProp) | Properties.cs:61:17:61:17 | H |
 | Properties.cs:61:23:61:23 | SSA param(i) | Properties.cs:61:23:61:23 | i |
+| Properties.cs:63:16:63:16 | SSA phi(i) | Properties.cs:63:16:63:16 | access to parameter i |
 | Properties.cs:63:16:63:18 | SSA def(i) | Properties.cs:63:16:63:18 | ...-- |
 | Properties.cs:70:17:70:17 | SSA entry def(this.SingleAccessedProp) | Properties.cs:70:17:70:17 | I |
 | Properties.cs:73:13:73:32 | SSA def(f) | Properties.cs:73:13:73:32 | Properties f = ... |
@@ -221,16 +236,6 @@
 | Properties.cs:113:9:113:22 | SSA call def(this.Props) | Properties.cs:113:9:113:22 | call to method SetProps |
 | Properties.cs:113:9:113:22 | SSA call def(this.Props.Props) | Properties.cs:113:9:113:22 | call to method SetProps |
 | Properties.cs:113:9:113:22 | SSA qualifier def(this.Props.Props.xs) | Properties.cs:113:9:113:22 | call to method SetProps |
-| Splitting.cs:3:18:3:18 | SSA param(b) | Splitting.cs:3:18:3:18 | b |
-| Splitting.cs:7:13:7:19 | [b (line 3): true] SSA def(x) | Splitting.cs:7:13:7:19 | ... = ... |
-| Splitting.cs:10:13:10:19 | [b (line 3): false] SSA def(x) | Splitting.cs:10:13:10:19 | ... = ... |
-| Splitting.cs:22:18:22:18 | SSA param(b) | Splitting.cs:22:18:22:18 | b |
-| Splitting.cs:29:13:29:19 | [b (line 22): false] SSA def(x) | Splitting.cs:29:13:29:19 | ... = ... |
-| Splitting.cs:32:9:32:15 | [b (line 22): false] SSA def(x) | Splitting.cs:32:9:32:15 | ... = ... |
-| Splitting.cs:32:9:32:15 | [b (line 22): true] SSA def(x) | Splitting.cs:32:9:32:15 | ... = ... |
-| Splitting.cs:42:18:42:18 | SSA param(b) | Splitting.cs:42:18:42:18 | b |
-| Splitting.cs:46:13:46:19 | [b (line 42): true] SSA def(x) | Splitting.cs:46:13:46:19 | ... = ... |
-| Splitting.cs:49:13:49:19 | [b (line 42): false] SSA def(x) | Splitting.cs:49:13:49:19 | ... = ... |
 | Test.cs:5:15:5:20 | SSA param(param1) | Test.cs:5:15:5:20 | param1 |
 | Test.cs:5:67:5:72 | SSA param(param2) | Test.cs:5:67:5:72 | param2 |
 | Test.cs:7:9:7:17 | SSA def(this.field) | Test.cs:7:9:7:17 | ... = ... |
@@ -243,20 +248,31 @@
 | Test.cs:20:13:20:18 | SSA def(y) | Test.cs:20:13:20:18 | ... = ... |
 | Test.cs:21:13:21:22 | SSA def(this.field) | Test.cs:21:13:21:22 | ... = ... |
 | Test.cs:22:13:22:17 | SSA def(z) | Test.cs:22:13:22:17 | ... = ... |
+| Test.cs:24:9:24:15 | SSA phi(this.field) | Test.cs:24:9:24:15 | ...; |
+| Test.cs:24:9:24:15 | SSA phi(x) | Test.cs:24:9:24:15 | ...; |
+| Test.cs:24:9:24:15 | SSA phi(y) | Test.cs:24:9:24:15 | ...; |
+| Test.cs:24:9:24:15 | SSA phi(z) | Test.cs:24:9:24:15 | ...; |
+| Test.cs:25:16:25:16 | SSA phi(param1) | Test.cs:25:16:25:16 | access to local variable x |
+| Test.cs:25:16:25:16 | SSA phi(y) | Test.cs:25:16:25:16 | access to local variable x |
 | Test.cs:27:17:27:24 | SSA def(param1) | Test.cs:27:17:27:24 | ...++ |
 | Test.cs:31:13:31:18 | SSA def(y) | Test.cs:31:13:31:18 | ... = ... |
+| Test.cs:33:9:33:19 | SSA phi(param1) | Test.cs:33:9:33:19 | ...; |
 | Test.cs:34:18:34:22 | SSA def(i) | Test.cs:34:18:34:22 | Int32 i = ... |
+| Test.cs:34:25:34:25 | SSA phi(i) | Test.cs:34:25:34:25 | access to local variable i |
+| Test.cs:34:25:34:25 | SSA phi(x) | Test.cs:34:25:34:25 | access to local variable i |
 | Test.cs:34:33:34:35 | SSA def(i) | Test.cs:34:33:34:35 | ...++ |
 | Test.cs:36:13:36:18 | SSA def(x) | Test.cs:36:13:36:18 | ... = ... |
+| Test.cs:39:9:42:9 | SSA phi(param1) | Test.cs:39:9:42:9 | foreach (... ... in ...) ... |
 | Test.cs:39:22:39:22 | SSA def(w) | Test.cs:39:22:39:22 | Int32 w |
 | Test.cs:41:13:41:23 | SSA def(param1) | Test.cs:41:13:41:23 | ... = ... |
 | Test.cs:46:10:46:10 | SSA entry def(this.field) | Test.cs:46:10:46:10 | g |
 | Test.cs:46:16:46:18 | SSA param(in) | Test.cs:46:16:46:18 | in |
 | Test.cs:50:13:50:20 | SSA def(out) | Test.cs:50:13:50:20 | ... = ... |
 | Test.cs:54:13:54:20 | SSA def(out) | Test.cs:54:13:54:20 | ... = ... |
+| Test.cs:56:9:56:19 | SSA phi(out) | Test.cs:56:9:56:19 | ...; |
 | Test.cs:57:9:57:17 | SSA def(this.field) | Test.cs:57:9:57:17 | ... = ... |
 | Test.cs:62:16:62:16 | SSA param(x) | Test.cs:62:16:62:16 | x |
-| Test.cs:68:45:68:45 | [exception: DivideByZeroException] SSA def(e) | Test.cs:68:45:68:45 | DivideByZeroException e |
+| Test.cs:68:45:68:45 | SSA def(e) | Test.cs:68:45:68:45 | DivideByZeroException e |
 | Test.cs:76:24:76:25 | SSA param(b1) | Test.cs:76:24:76:25 | b1 |
 | Test.cs:76:33:76:34 | SSA param(b2) | Test.cs:76:33:76:34 | b2 |
 | Test.cs:76:42:76:43 | SSA param(b3) | Test.cs:76:42:76:43 | b3 |
@@ -265,6 +281,7 @@
 | Test.cs:76:69:76:70 | SSA param(b6) | Test.cs:76:69:76:70 | b6 |
 | Test.cs:78:13:78:17 | SSA def(x) | Test.cs:78:13:78:17 | Int32 x = ... |
 | Test.cs:108:13:108:17 | SSA def(x) | Test.cs:108:13:108:17 | ... = ... |
+| Test.cs:113:9:116:9 | SSA phi(x) | Test.cs:113:9:116:9 | if (...) ... |
 | Tuples.cs:10:9:10:54 | SSA def(b) | Tuples.cs:10:9:10:54 | ... = ... |
 | Tuples.cs:10:9:10:54 | SSA def(s) | Tuples.cs:10:9:10:54 | ... = ... |
 | Tuples.cs:10:9:10:54 | SSA def(x) | Tuples.cs:10:9:10:54 | ... = ... |
diff --git a/csharp/ql/test/library-tests/dataflow/ssa/SsaExplicitDef.expected b/csharp/ql/test/library-tests/dataflow/ssa/SsaExplicitDef.expected
index 3dfc82d27ad..a8bcd3e4daf 100644
--- a/csharp/ql/test/library-tests/dataflow/ssa/SsaExplicitDef.expected
+++ b/csharp/ql/test/library-tests/dataflow/ssa/SsaExplicitDef.expected
@@ -15,7 +15,6 @@
 | Capture.cs:212:30:212:35 | exited | Capture.cs:212:30:212:71 | SSA def(exited) | Capture.cs:212:30:212:71 | EventHandler exited = ... |
 | Capture.cs:248:36:248:36 | j | Capture.cs:251:13:251:17 | SSA def(j) | Capture.cs:251:13:251:17 | ... = ... |
 | Consistency.cs:15:17:15:17 | i | Consistency.cs:15:17:15:21 | SSA def(i) | Consistency.cs:15:17:15:21 | Int32 i = ... |
-| Consistency.cs:15:17:15:17 | i | Consistency.cs:15:17:15:21 | [finally: exception(Exception)] SSA def(i) | Consistency.cs:15:17:15:21 | Int32 i = ... |
 | Consistency.cs:25:29:25:29 | c | Consistency.cs:25:29:25:29 | SSA def(c) | Consistency.cs:25:29:25:29 | Consistency c |
 | Consistency.cs:30:30:30:30 | c | Consistency.cs:32:9:32:29 | SSA def(c) | Consistency.cs:32:9:32:29 | ... = ... |
 | Consistency.cs:44:11:44:11 | s | Consistency.cs:44:11:44:11 | SSA def(s) | Consistency.cs:44:11:44:11 | S s |
@@ -117,13 +116,6 @@
 | Properties.cs:76:9:76:12 | f.xs | Properties.cs:84:9:84:25 | SSA def(f.xs) | Properties.cs:84:9:84:25 | ... = ... |
 | Properties.cs:78:9:78:15 | this.xs | Properties.cs:81:9:81:22 | SSA def(this.xs) | Properties.cs:81:9:81:22 | ... = ... |
 | Properties.cs:78:9:78:15 | this.xs | Properties.cs:83:9:83:22 | SSA def(this.xs) | Properties.cs:83:9:83:22 | ... = ... |
-| Splitting.cs:5:13:5:13 | x | Splitting.cs:7:13:7:19 | [b (line 3): true] SSA def(x) | Splitting.cs:7:13:7:19 | ... = ... |
-| Splitting.cs:5:13:5:13 | x | Splitting.cs:10:13:10:19 | [b (line 3): false] SSA def(x) | Splitting.cs:10:13:10:19 | ... = ... |
-| Splitting.cs:24:13:24:13 | x | Splitting.cs:29:13:29:19 | [b (line 22): false] SSA def(x) | Splitting.cs:29:13:29:19 | ... = ... |
-| Splitting.cs:24:13:24:13 | x | Splitting.cs:32:9:32:15 | [b (line 22): false] SSA def(x) | Splitting.cs:32:9:32:15 | ... = ... |
-| Splitting.cs:24:13:24:13 | x | Splitting.cs:32:9:32:15 | [b (line 22): true] SSA def(x) | Splitting.cs:32:9:32:15 | ... = ... |
-| Splitting.cs:44:13:44:13 | x | Splitting.cs:46:13:46:19 | [b (line 42): true] SSA def(x) | Splitting.cs:46:13:46:19 | ... = ... |
-| Splitting.cs:44:13:44:13 | x | Splitting.cs:49:13:49:19 | [b (line 42): false] SSA def(x) | Splitting.cs:49:13:49:19 | ... = ... |
 | Test.cs:5:15:5:20 | param1 | Test.cs:27:17:27:24 | SSA def(param1) | Test.cs:27:17:27:24 | ...++ |
 | Test.cs:5:15:5:20 | param1 | Test.cs:41:13:41:23 | SSA def(param1) | Test.cs:41:13:41:23 | ... = ... |
 | Test.cs:7:9:7:13 | this.field | Test.cs:7:9:7:17 | SSA def(this.field) | Test.cs:7:9:7:17 | ... = ... |
@@ -144,7 +136,7 @@
 | Test.cs:46:29:46:32 | out | Test.cs:50:13:50:20 | SSA def(out) | Test.cs:50:13:50:20 | ... = ... |
 | Test.cs:46:29:46:32 | out | Test.cs:54:13:54:20 | SSA def(out) | Test.cs:54:13:54:20 | ... = ... |
 | Test.cs:56:13:56:17 | this.field | Test.cs:57:9:57:17 | SSA def(this.field) | Test.cs:57:9:57:17 | ... = ... |
-| Test.cs:68:45:68:45 | e | Test.cs:68:45:68:45 | [exception: DivideByZeroException] SSA def(e) | Test.cs:68:45:68:45 | DivideByZeroException e |
+| Test.cs:68:45:68:45 | e | Test.cs:68:45:68:45 | SSA def(e) | Test.cs:68:45:68:45 | DivideByZeroException e |
 | Test.cs:78:13:78:13 | x | Test.cs:78:13:78:17 | SSA def(x) | Test.cs:78:13:78:17 | Int32 x = ... |
 | Test.cs:78:13:78:13 | x | Test.cs:108:13:108:17 | SSA def(x) | Test.cs:108:13:108:17 | ... = ... |
 | Tuples.cs:10:14:10:14 | x | Tuples.cs:10:9:10:54 | SSA def(x) | Tuples.cs:10:9:10:54 | ... = ... |
diff --git a/csharp/ql/test/library-tests/dataflow/ssa/SsaImplicitParameterDef.expected b/csharp/ql/test/library-tests/dataflow/ssa/SsaImplicitParameterDef.expected
index f5c93b95944..3ba88d1dd17 100644
--- a/csharp/ql/test/library-tests/dataflow/ssa/SsaImplicitParameterDef.expected
+++ b/csharp/ql/test/library-tests/dataflow/ssa/SsaImplicitParameterDef.expected
@@ -28,9 +28,6 @@
 | OutRef.cs:39:35:39:35 | j | OutRef.cs:39:35:39:35 | SSA param(j) | OutRef.cs:39:35:39:35 | j |
 | Properties.cs:61:23:61:23 | i | Properties.cs:61:23:61:23 | SSA param(i) | Properties.cs:61:23:61:23 | i |
 | Properties.cs:106:37:106:37 | p | Properties.cs:106:37:106:37 | SSA param(p) | Properties.cs:106:37:106:37 | p |
-| Splitting.cs:3:18:3:18 | b | Splitting.cs:3:18:3:18 | SSA param(b) | Splitting.cs:3:18:3:18 | b |
-| Splitting.cs:22:18:22:18 | b | Splitting.cs:22:18:22:18 | SSA param(b) | Splitting.cs:22:18:22:18 | b |
-| Splitting.cs:42:18:42:18 | b | Splitting.cs:42:18:42:18 | SSA param(b) | Splitting.cs:42:18:42:18 | b |
 | Test.cs:5:15:5:20 | param1 | Test.cs:5:15:5:20 | SSA param(param1) | Test.cs:5:15:5:20 | param1 |
 | Test.cs:5:67:5:72 | param2 | Test.cs:5:67:5:72 | SSA param(param2) | Test.cs:5:67:5:72 | param2 |
 | Test.cs:46:16:46:18 | in | Test.cs:46:16:46:18 | SSA param(in) | Test.cs:46:16:46:18 | in |
diff --git a/csharp/ql/test/library-tests/dataflow/ssa/SsaRead.expected b/csharp/ql/test/library-tests/dataflow/ssa/SsaRead.expected
index 9daa4269711..46aba07eb37 100644
--- a/csharp/ql/test/library-tests/dataflow/ssa/SsaRead.expected
+++ b/csharp/ql/test/library-tests/dataflow/ssa/SsaRead.expected
@@ -35,7 +35,6 @@
 | Capture.cs:212:30:212:35 | exited | Capture.cs:212:30:212:71 | SSA def(exited) | Capture.cs:213:29:213:34 | access to local variable exited |
 | Consistency.cs:7:25:7:25 | b | Consistency.cs:7:25:7:25 | SSA param(b) | Consistency.cs:11:17:11:17 | access to parameter b |
 | Consistency.cs:15:17:15:17 | i | Consistency.cs:15:17:15:21 | SSA def(i) | Consistency.cs:16:17:16:17 | access to local variable i |
-| Consistency.cs:15:17:15:17 | i | Consistency.cs:15:17:15:21 | [finally: exception(Exception)] SSA def(i) | Consistency.cs:16:17:16:17 | access to local variable i |
 | Consistency.cs:25:29:25:29 | c | Consistency.cs:25:29:25:29 | SSA def(c) | Consistency.cs:26:13:26:13 | access to local variable c |
 | Consistency.cs:25:29:25:29 | c | Consistency.cs:25:29:25:29 | SSA def(c) | Consistency.cs:27:13:27:13 | access to local variable c |
 | Consistency.cs:26:13:26:19 | c.Field | Consistency.cs:25:29:25:29 | SSA qualifier def(c.Field) | Consistency.cs:26:13:26:19 | access to field Field |
@@ -288,27 +287,6 @@
 | Properties.cs:114:20:114:35 | this.Props.Props | Properties.cs:113:9:113:22 | SSA call def(this.Props.Props) | Properties.cs:116:17:116:32 | access to field Props |
 | Properties.cs:115:21:115:39 | this.Props.Props.xs | Properties.cs:113:9:113:22 | SSA qualifier def(this.Props.Props.xs) | Properties.cs:115:21:115:39 | access to property xs |
 | Properties.cs:115:21:115:39 | this.Props.Props.xs | Properties.cs:113:9:113:22 | SSA qualifier def(this.Props.Props.xs) | Properties.cs:116:17:116:35 | access to property xs |
-| Splitting.cs:3:18:3:18 | b | Splitting.cs:3:18:3:18 | SSA param(b) | Splitting.cs:6:13:6:13 | access to parameter b |
-| Splitting.cs:3:18:3:18 | b | Splitting.cs:3:18:3:18 | SSA param(b) | Splitting.cs:15:13:15:13 | access to parameter b |
-| Splitting.cs:5:13:5:13 | x | Splitting.cs:7:13:7:19 | [b (line 3): true] SSA def(x) | Splitting.cs:13:9:13:9 | access to local variable x |
-| Splitting.cs:5:13:5:13 | x | Splitting.cs:7:13:7:19 | [b (line 3): true] SSA def(x) | Splitting.cs:14:9:14:9 | access to local variable x |
-| Splitting.cs:5:13:5:13 | x | Splitting.cs:7:13:7:19 | [b (line 3): true] SSA def(x) | Splitting.cs:17:13:17:13 | access to local variable x |
-| Splitting.cs:5:13:5:13 | x | Splitting.cs:10:13:10:19 | [b (line 3): false] SSA def(x) | Splitting.cs:11:13:11:13 | access to local variable x |
-| Splitting.cs:5:13:5:13 | x | Splitting.cs:10:13:10:19 | [b (line 3): false] SSA def(x) | Splitting.cs:13:9:13:9 | access to local variable x |
-| Splitting.cs:5:13:5:13 | x | Splitting.cs:10:13:10:19 | [b (line 3): false] SSA def(x) | Splitting.cs:14:9:14:9 | access to local variable x |
-| Splitting.cs:22:18:22:18 | b | Splitting.cs:22:18:22:18 | SSA param(b) | Splitting.cs:25:13:25:13 | access to parameter b |
-| Splitting.cs:22:18:22:18 | b | Splitting.cs:22:18:22:18 | SSA param(b) | Splitting.cs:35:13:35:13 | access to parameter b |
-| Splitting.cs:24:13:24:13 | x | Splitting.cs:29:13:29:19 | [b (line 22): false] SSA def(x) | Splitting.cs:30:13:30:13 | access to local variable x |
-| Splitting.cs:24:13:24:13 | x | Splitting.cs:32:9:32:15 | [b (line 22): false] SSA def(x) | Splitting.cs:33:9:33:9 | access to local variable x |
-| Splitting.cs:24:13:24:13 | x | Splitting.cs:32:9:32:15 | [b (line 22): false] SSA def(x) | Splitting.cs:34:9:34:9 | access to local variable x |
-| Splitting.cs:24:13:24:13 | x | Splitting.cs:32:9:32:15 | [b (line 22): true] SSA def(x) | Splitting.cs:33:9:33:9 | access to local variable x |
-| Splitting.cs:24:13:24:13 | x | Splitting.cs:32:9:32:15 | [b (line 22): true] SSA def(x) | Splitting.cs:34:9:34:9 | access to local variable x |
-| Splitting.cs:24:13:24:13 | x | Splitting.cs:32:9:32:15 | [b (line 22): true] SSA def(x) | Splitting.cs:37:13:37:13 | access to local variable x |
-| Splitting.cs:42:18:42:18 | b | Splitting.cs:42:18:42:18 | SSA param(b) | Splitting.cs:45:13:45:13 | access to parameter b |
-| Splitting.cs:42:18:42:18 | b | Splitting.cs:42:18:42:18 | SSA param(b) | Splitting.cs:52:13:52:13 | access to parameter b |
-| Splitting.cs:44:13:44:13 | x | Splitting.cs:49:13:49:19 | [b (line 42): false] SSA def(x) | Splitting.cs:50:13:50:13 | access to local variable x |
-| Splitting.cs:44:13:44:13 | x | Splitting.cs:54:9:54:21 | SSA phi(x) | Splitting.cs:54:9:54:9 | access to local variable x |
-| Splitting.cs:44:13:44:13 | x | Splitting.cs:54:9:54:21 | SSA phi(x) | Splitting.cs:55:9:55:9 | access to local variable x |
 | Test.cs:5:15:5:20 | param1 | Test.cs:5:15:5:20 | SSA param(param1) | Test.cs:11:13:11:18 | access to parameter param1 |
 | Test.cs:5:15:5:20 | param1 | Test.cs:25:16:25:16 | SSA phi(param1) | Test.cs:27:17:27:22 | access to parameter param1 |
 | Test.cs:5:15:5:20 | param1 | Test.cs:39:9:42:9 | SSA phi(param1) | Test.cs:41:13:41:18 | access to parameter param1 |
@@ -332,7 +310,7 @@
 | Test.cs:56:13:56:17 | this.field | Test.cs:46:10:46:10 | SSA entry def(this.field) | Test.cs:56:13:56:17 | access to field field |
 | Test.cs:56:13:56:17 | this.field | Test.cs:57:9:57:17 | SSA def(this.field) | Test.cs:58:13:58:17 | access to field field |
 | Test.cs:62:16:62:16 | x | Test.cs:62:16:62:16 | SSA param(x) | Test.cs:66:28:66:28 | access to parameter x |
-| Test.cs:68:45:68:45 | e | Test.cs:68:45:68:45 | [exception: DivideByZeroException] SSA def(e) | Test.cs:70:17:70:17 | access to local variable e |
+| Test.cs:68:45:68:45 | e | Test.cs:68:45:68:45 | SSA def(e) | Test.cs:70:17:70:17 | access to local variable e |
 | Test.cs:76:24:76:25 | b1 | Test.cs:76:24:76:25 | SSA param(b1) | Test.cs:80:13:80:14 | access to parameter b1 |
 | Test.cs:76:33:76:34 | b2 | Test.cs:76:33:76:34 | SSA param(b2) | Test.cs:84:18:84:19 | access to parameter b2 |
 | Test.cs:76:42:76:43 | b3 | Test.cs:76:42:76:43 | SSA param(b3) | Test.cs:90:13:90:14 | access to parameter b3 |
diff --git a/csharp/ql/test/library-tests/dataflow/ssa/SsaUltimateDef.expected b/csharp/ql/test/library-tests/dataflow/ssa/SsaUltimateDef.expected
index d0e6b073f01..d6dfac1475a 100644
--- a/csharp/ql/test/library-tests/dataflow/ssa/SsaUltimateDef.expected
+++ b/csharp/ql/test/library-tests/dataflow/ssa/SsaUltimateDef.expected
@@ -35,7 +35,6 @@
 | Capture.cs:248:36:248:36 | j | Capture.cs:251:13:251:17 | SSA def(j) | Capture.cs:251:13:251:17 | SSA def(j) |
 | Consistency.cs:7:25:7:25 | b | Consistency.cs:7:25:7:25 | SSA param(b) | Consistency.cs:7:25:7:25 | SSA param(b) |
 | Consistency.cs:15:17:15:17 | i | Consistency.cs:15:17:15:21 | SSA def(i) | Consistency.cs:15:17:15:21 | SSA def(i) |
-| Consistency.cs:15:17:15:17 | i | Consistency.cs:15:17:15:21 | [finally: exception(Exception)] SSA def(i) | Consistency.cs:15:17:15:21 | [finally: exception(Exception)] SSA def(i) |
 | Consistency.cs:25:29:25:29 | c | Consistency.cs:25:29:25:29 | SSA def(c) | Consistency.cs:25:29:25:29 | SSA def(c) |
 | Consistency.cs:26:13:26:19 | c.Field | Consistency.cs:25:29:25:29 | SSA qualifier def(c.Field) | Consistency.cs:25:29:25:29 | SSA qualifier def(c.Field) |
 | Consistency.cs:30:30:30:30 | c | Consistency.cs:32:9:32:29 | SSA def(c) | Consistency.cs:32:9:32:29 | SSA def(c) |
@@ -329,18 +328,6 @@
 | Properties.cs:115:21:115:39 | this.Props.Props.xs | Properties.cs:108:10:108:10 | SSA qualifier def(this.Props.Props.xs) | Properties.cs:108:10:108:10 | SSA qualifier def(this.Props.Props.xs) |
 | Properties.cs:115:21:115:39 | this.Props.Props.xs | Properties.cs:113:9:113:22 | SSA qualifier def(this.Props.Props.xs) | Properties.cs:108:10:108:10 | SSA qualifier def(this.Props.Props.xs) |
 | Properties.cs:115:21:115:39 | this.Props.Props.xs | Properties.cs:113:9:113:22 | SSA qualifier def(this.Props.Props.xs) | Properties.cs:113:9:113:22 | SSA qualifier def(this.Props.Props.xs) |
-| Splitting.cs:3:18:3:18 | b | Splitting.cs:3:18:3:18 | SSA param(b) | Splitting.cs:3:18:3:18 | SSA param(b) |
-| Splitting.cs:5:13:5:13 | x | Splitting.cs:7:13:7:19 | [b (line 3): true] SSA def(x) | Splitting.cs:7:13:7:19 | [b (line 3): true] SSA def(x) |
-| Splitting.cs:5:13:5:13 | x | Splitting.cs:10:13:10:19 | [b (line 3): false] SSA def(x) | Splitting.cs:10:13:10:19 | [b (line 3): false] SSA def(x) |
-| Splitting.cs:22:18:22:18 | b | Splitting.cs:22:18:22:18 | SSA param(b) | Splitting.cs:22:18:22:18 | SSA param(b) |
-| Splitting.cs:24:13:24:13 | x | Splitting.cs:29:13:29:19 | [b (line 22): false] SSA def(x) | Splitting.cs:29:13:29:19 | [b (line 22): false] SSA def(x) |
-| Splitting.cs:24:13:24:13 | x | Splitting.cs:32:9:32:15 | [b (line 22): false] SSA def(x) | Splitting.cs:32:9:32:15 | [b (line 22): false] SSA def(x) |
-| Splitting.cs:24:13:24:13 | x | Splitting.cs:32:9:32:15 | [b (line 22): true] SSA def(x) | Splitting.cs:32:9:32:15 | [b (line 22): true] SSA def(x) |
-| Splitting.cs:42:18:42:18 | b | Splitting.cs:42:18:42:18 | SSA param(b) | Splitting.cs:42:18:42:18 | SSA param(b) |
-| Splitting.cs:44:13:44:13 | x | Splitting.cs:46:13:46:19 | [b (line 42): true] SSA def(x) | Splitting.cs:46:13:46:19 | [b (line 42): true] SSA def(x) |
-| Splitting.cs:44:13:44:13 | x | Splitting.cs:49:13:49:19 | [b (line 42): false] SSA def(x) | Splitting.cs:49:13:49:19 | [b (line 42): false] SSA def(x) |
-| Splitting.cs:44:13:44:13 | x | Splitting.cs:54:9:54:21 | SSA phi(x) | Splitting.cs:46:13:46:19 | [b (line 42): true] SSA def(x) |
-| Splitting.cs:44:13:44:13 | x | Splitting.cs:54:9:54:21 | SSA phi(x) | Splitting.cs:49:13:49:19 | [b (line 42): false] SSA def(x) |
 | Test.cs:5:15:5:20 | param1 | Test.cs:5:15:5:20 | SSA param(param1) | Test.cs:5:15:5:20 | SSA param(param1) |
 | Test.cs:5:15:5:20 | param1 | Test.cs:25:16:25:16 | SSA phi(param1) | Test.cs:5:15:5:20 | SSA param(param1) |
 | Test.cs:5:15:5:20 | param1 | Test.cs:25:16:25:16 | SSA phi(param1) | Test.cs:27:17:27:24 | SSA def(param1) |
@@ -391,7 +378,7 @@
 | Test.cs:56:13:56:17 | this.field | Test.cs:46:10:46:10 | SSA entry def(this.field) | Test.cs:46:10:46:10 | SSA entry def(this.field) |
 | Test.cs:56:13:56:17 | this.field | Test.cs:57:9:57:17 | SSA def(this.field) | Test.cs:57:9:57:17 | SSA def(this.field) |
 | Test.cs:62:16:62:16 | x | Test.cs:62:16:62:16 | SSA param(x) | Test.cs:62:16:62:16 | SSA param(x) |
-| Test.cs:68:45:68:45 | e | Test.cs:68:45:68:45 | [exception: DivideByZeroException] SSA def(e) | Test.cs:68:45:68:45 | [exception: DivideByZeroException] SSA def(e) |
+| Test.cs:68:45:68:45 | e | Test.cs:68:45:68:45 | SSA def(e) | Test.cs:68:45:68:45 | SSA def(e) |
 | Test.cs:76:24:76:25 | b1 | Test.cs:76:24:76:25 | SSA param(b1) | Test.cs:76:24:76:25 | SSA param(b1) |
 | Test.cs:76:33:76:34 | b2 | Test.cs:76:33:76:34 | SSA param(b2) | Test.cs:76:33:76:34 | SSA param(b2) |
 | Test.cs:76:42:76:43 | b3 | Test.cs:76:42:76:43 | SSA param(b3) | Test.cs:76:42:76:43 | SSA param(b3) |
diff --git a/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest1.expected b/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest1.expected
index a3850dd73eb..124caa4e69e 100644
--- a/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest1.expected
+++ b/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest1.expected
@@ -1,30 +1,30 @@
 models
 | 1 | Sink: System.Data.SqlClient; SqlCommand; false; SqlCommand; (System.String,System.Data.SqlClient.SqlConnection); ; Argument[0]; sql-injection; manual |
 | 2 | Source: System.Net.Sockets; TcpClient; false; GetStream; ; ; ReturnValue; remote; manual |
-| 3 | Summary: System.IO; Stream; true; Read; (System.Byte[],System.Int32,System.Int32); ; Argument[this]; Argument[0].Element; taint; manual |
+| 3 | Summary: System.IO; Stream; true; Read; (System.Byte[],System.Int32,System.Int32); ; Argument[this]; Argument[0]; taint; manual |
 | 4 | Summary: System.Text; Encoding; true; GetString; (System.Byte[]); ; Argument[0].Element; ReturnValue; taint; manual |
 edges
-| Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | Test.cs:15:56:15:60 | access to parameter bytes : Byte[] [element] : Object | provenance |  |
-| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] [element] : Object | Test.cs:15:20:15:61 | call to method GetString : String | provenance | MaD:4 |
+| Test.cs:12:45:12:49 | bytes : Byte[] | Test.cs:15:56:15:60 | access to parameter bytes : Byte[] | provenance |  |
+| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] | Test.cs:15:20:15:61 | call to method GetString : String | provenance | MaD:4 |
 | Test.cs:23:33:23:38 | access to local variable stream : NetworkStream | Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | provenance |  |
 | Test.cs:23:42:23:59 | call to method GetStream : NetworkStream | Test.cs:23:33:23:38 | access to local variable stream : NetworkStream | provenance | Src:MaD:2  |
-| Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] [element] : Object | provenance | MaD:3 |
-| Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] [element] : Object | Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | provenance |  |
+| Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] | provenance | MaD:3 |
+| Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] | Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | provenance |  |
 | Test.cs:28:85:28:105 | call to method BytesToString : String | Test.cs:28:42:28:111 | ... + ... | provenance | Sink:MaD:1 |
-| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | provenance |  |
-| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | Test.cs:28:85:28:105 | call to method BytesToString : String | provenance | MaD:4 |
+| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | Test.cs:12:45:12:49 | bytes : Byte[] | provenance |  |
+| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | Test.cs:28:85:28:105 | call to method BytesToString : String | provenance | MaD:4 |
 nodes
-| Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | semmle.label | bytes : Byte[] [element] : Object |
+| Test.cs:12:45:12:49 | bytes : Byte[] | semmle.label | bytes : Byte[] |
 | Test.cs:15:20:15:61 | call to method GetString : String | semmle.label | call to method GetString : String |
-| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] [element] : Object | semmle.label | access to parameter bytes : Byte[] [element] : Object |
+| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] | semmle.label | access to parameter bytes : Byte[] |
 | Test.cs:23:33:23:38 | access to local variable stream : NetworkStream | semmle.label | access to local variable stream : NetworkStream |
 | Test.cs:23:42:23:59 | call to method GetStream : NetworkStream | semmle.label | call to method GetStream : NetworkStream |
 | Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | semmle.label | access to local variable stream : NetworkStream |
-| Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] [element] : Object | semmle.label | [post] access to local variable buffer : Byte[] [element] : Object |
+| Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] | semmle.label | [post] access to local variable buffer : Byte[] |
 | Test.cs:28:42:28:111 | ... + ... | semmle.label | ... + ... |
 | Test.cs:28:85:28:105 | call to method BytesToString : String | semmle.label | call to method BytesToString : String |
-| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | semmle.label | access to local variable buffer : Byte[] [element] : Object |
+| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | semmle.label | access to local variable buffer : Byte[] |
 subpaths
-| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | Test.cs:15:20:15:61 | call to method GetString : String | Test.cs:28:85:28:105 | call to method BytesToString : String |
+| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | Test.cs:12:45:12:49 | bytes : Byte[] | Test.cs:15:20:15:61 | call to method GetString : String | Test.cs:28:85:28:105 | call to method BytesToString : String |
 #select
 | Test.cs:23:42:23:59 | call to method GetStream : NetworkStream | Test.cs:28:42:28:111 | ... + ... |
diff --git a/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest2.expected b/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest2.expected
index 9b1b32b57fd..d3ae7cc363d 100644
--- a/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest2.expected
+++ b/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest2.expected
@@ -2,36 +2,36 @@ models
 | 1 | Sink: System.Data.SqlClient; SqlCommand; false; SqlCommand; (System.String,System.Data.SqlClient.SqlConnection); ; Argument[0]; sql-injection; manual |
 | 2 | Source: My.Qltest; TestSources; false; ExecuteQuery; (System.String); ; ReturnValue; database; manual |
 | 3 | Source: System.Net.Sockets; TcpClient; false; GetStream; ; ; ReturnValue; remote; manual |
-| 4 | Summary: System.IO; Stream; true; Read; (System.Byte[],System.Int32,System.Int32); ; Argument[this]; Argument[0].Element; taint; manual |
+| 4 | Summary: System.IO; Stream; true; Read; (System.Byte[],System.Int32,System.Int32); ; Argument[this]; Argument[0]; taint; manual |
 | 5 | Summary: System.Text; Encoding; true; GetString; (System.Byte[]); ; Argument[0].Element; ReturnValue; taint; manual |
 edges
-| Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | Test.cs:15:56:15:60 | access to parameter bytes : Byte[] [element] : Object | provenance |  |
-| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] [element] : Object | Test.cs:15:20:15:61 | call to method GetString : String | provenance | MaD:5 |
+| Test.cs:12:45:12:49 | bytes : Byte[] | Test.cs:15:56:15:60 | access to parameter bytes : Byte[] | provenance |  |
+| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] | Test.cs:15:20:15:61 | call to method GetString : String | provenance | MaD:5 |
 | Test.cs:23:33:23:38 | access to local variable stream : NetworkStream | Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | provenance |  |
 | Test.cs:23:42:23:59 | call to method GetStream : NetworkStream | Test.cs:23:33:23:38 | access to local variable stream : NetworkStream | provenance | Src:MaD:3  |
-| Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] [element] : Object | provenance | MaD:4 |
-| Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] [element] : Object | Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | provenance |  |
+| Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] | provenance | MaD:4 |
+| Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] | Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | provenance |  |
 | Test.cs:28:85:28:105 | call to method BytesToString : String | Test.cs:28:42:28:111 | ... + ... | provenance | Sink:MaD:1 |
-| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | provenance |  |
-| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | Test.cs:28:85:28:105 | call to method BytesToString : String | provenance | MaD:5 |
+| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | Test.cs:12:45:12:49 | bytes : Byte[] | provenance |  |
+| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | Test.cs:28:85:28:105 | call to method BytesToString : String | provenance | MaD:5 |
 | Test.cs:34:20:34:25 | access to local variable result : String | Test.cs:37:42:37:96 | ... + ... | provenance | Sink:MaD:1 |
 | Test.cs:34:29:34:69 | call to method ExecuteQuery : String | Test.cs:34:20:34:25 | access to local variable result : String | provenance | Src:MaD:2  |
 nodes
-| Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | semmle.label | bytes : Byte[] [element] : Object |
+| Test.cs:12:45:12:49 | bytes : Byte[] | semmle.label | bytes : Byte[] |
 | Test.cs:15:20:15:61 | call to method GetString : String | semmle.label | call to method GetString : String |
-| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] [element] : Object | semmle.label | access to parameter bytes : Byte[] [element] : Object |
+| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] | semmle.label | access to parameter bytes : Byte[] |
 | Test.cs:23:33:23:38 | access to local variable stream : NetworkStream | semmle.label | access to local variable stream : NetworkStream |
 | Test.cs:23:42:23:59 | call to method GetStream : NetworkStream | semmle.label | call to method GetStream : NetworkStream |
 | Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | semmle.label | access to local variable stream : NetworkStream |
-| Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] [element] : Object | semmle.label | [post] access to local variable buffer : Byte[] [element] : Object |
+| Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] | semmle.label | [post] access to local variable buffer : Byte[] |
 | Test.cs:28:42:28:111 | ... + ... | semmle.label | ... + ... |
 | Test.cs:28:85:28:105 | call to method BytesToString : String | semmle.label | call to method BytesToString : String |
-| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | semmle.label | access to local variable buffer : Byte[] [element] : Object |
+| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | semmle.label | access to local variable buffer : Byte[] |
 | Test.cs:34:20:34:25 | access to local variable result : String | semmle.label | access to local variable result : String |
 | Test.cs:34:29:34:69 | call to method ExecuteQuery : String | semmle.label | call to method ExecuteQuery : String |
 | Test.cs:37:42:37:96 | ... + ... | semmle.label | ... + ... |
 subpaths
-| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | Test.cs:15:20:15:61 | call to method GetString : String | Test.cs:28:85:28:105 | call to method BytesToString : String |
+| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | Test.cs:12:45:12:49 | bytes : Byte[] | Test.cs:15:20:15:61 | call to method GetString : String | Test.cs:28:85:28:105 | call to method BytesToString : String |
 #select
 | Test.cs:23:42:23:59 | call to method GetStream : NetworkStream | Test.cs:28:42:28:111 | ... + ... |
 | Test.cs:34:29:34:69 | call to method ExecuteQuery : String | Test.cs:37:42:37:96 | ... + ... |
diff --git a/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest3.expected b/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest3.expected
index ee8d0615b2d..ea0ab7943d2 100644
--- a/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest3.expected
+++ b/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest3.expected
@@ -4,18 +4,18 @@ models
 | 3 | Source: My.Qltest; TestSources; false; GetCliArg; (System.Int32); ; ReturnValue; commandargs; manual |
 | 4 | Source: My.Qltest; TestSources; false; ReadEnv; (System.String); ; ReturnValue; environment; manual |
 | 5 | Source: System.Net.Sockets; TcpClient; false; GetStream; ; ; ReturnValue; remote; manual |
-| 6 | Summary: System.IO; Stream; true; Read; (System.Byte[],System.Int32,System.Int32); ; Argument[this]; Argument[0].Element; taint; manual |
+| 6 | Summary: System.IO; Stream; true; Read; (System.Byte[],System.Int32,System.Int32); ; Argument[this]; Argument[0]; taint; manual |
 | 7 | Summary: System.Text; Encoding; true; GetString; (System.Byte[]); ; Argument[0].Element; ReturnValue; taint; manual |
 edges
-| Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | Test.cs:15:56:15:60 | access to parameter bytes : Byte[] [element] : Object | provenance |  |
-| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] [element] : Object | Test.cs:15:20:15:61 | call to method GetString : String | provenance | MaD:7 |
+| Test.cs:12:45:12:49 | bytes : Byte[] | Test.cs:15:56:15:60 | access to parameter bytes : Byte[] | provenance |  |
+| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] | Test.cs:15:20:15:61 | call to method GetString : String | provenance | MaD:7 |
 | Test.cs:23:33:23:38 | access to local variable stream : NetworkStream | Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | provenance |  |
 | Test.cs:23:42:23:59 | call to method GetStream : NetworkStream | Test.cs:23:33:23:38 | access to local variable stream : NetworkStream | provenance | Src:MaD:5  |
-| Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] [element] : Object | provenance | MaD:6 |
-| Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] [element] : Object | Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | provenance |  |
+| Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] | provenance | MaD:6 |
+| Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] | Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | provenance |  |
 | Test.cs:28:85:28:105 | call to method BytesToString : String | Test.cs:28:42:28:111 | ... + ... | provenance | Sink:MaD:1 |
-| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | provenance |  |
-| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | Test.cs:28:85:28:105 | call to method BytesToString : String | provenance | MaD:7 |
+| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | Test.cs:12:45:12:49 | bytes : Byte[] | provenance |  |
+| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | Test.cs:28:85:28:105 | call to method BytesToString : String | provenance | MaD:7 |
 | Test.cs:34:20:34:25 | access to local variable result : String | Test.cs:37:42:37:96 | ... + ... | provenance | Sink:MaD:1 |
 | Test.cs:34:29:34:69 | call to method ExecuteQuery : String | Test.cs:34:20:34:25 | access to local variable result : String | provenance | Src:MaD:2  |
 | Test.cs:43:20:43:25 | access to local variable result : String | Test.cs:46:42:46:96 | ... + ... | provenance | Sink:MaD:1 |
@@ -23,16 +23,16 @@ edges
 | Test.cs:62:20:62:25 | access to local variable result : String | Test.cs:65:42:65:96 | ... + ... | provenance | Sink:MaD:1 |
 | Test.cs:62:29:62:48 | call to method GetCliArg : String | Test.cs:62:20:62:25 | access to local variable result : String | provenance | Src:MaD:3  |
 nodes
-| Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | semmle.label | bytes : Byte[] [element] : Object |
+| Test.cs:12:45:12:49 | bytes : Byte[] | semmle.label | bytes : Byte[] |
 | Test.cs:15:20:15:61 | call to method GetString : String | semmle.label | call to method GetString : String |
-| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] [element] : Object | semmle.label | access to parameter bytes : Byte[] [element] : Object |
+| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] | semmle.label | access to parameter bytes : Byte[] |
 | Test.cs:23:33:23:38 | access to local variable stream : NetworkStream | semmle.label | access to local variable stream : NetworkStream |
 | Test.cs:23:42:23:59 | call to method GetStream : NetworkStream | semmle.label | call to method GetStream : NetworkStream |
 | Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | semmle.label | access to local variable stream : NetworkStream |
-| Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] [element] : Object | semmle.label | [post] access to local variable buffer : Byte[] [element] : Object |
+| Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] | semmle.label | [post] access to local variable buffer : Byte[] |
 | Test.cs:28:42:28:111 | ... + ... | semmle.label | ... + ... |
 | Test.cs:28:85:28:105 | call to method BytesToString : String | semmle.label | call to method BytesToString : String |
-| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | semmle.label | access to local variable buffer : Byte[] [element] : Object |
+| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | semmle.label | access to local variable buffer : Byte[] |
 | Test.cs:34:20:34:25 | access to local variable result : String | semmle.label | access to local variable result : String |
 | Test.cs:34:29:34:69 | call to method ExecuteQuery : String | semmle.label | call to method ExecuteQuery : String |
 | Test.cs:37:42:37:96 | ... + ... | semmle.label | ... + ... |
@@ -43,7 +43,7 @@ nodes
 | Test.cs:62:29:62:48 | call to method GetCliArg : String | semmle.label | call to method GetCliArg : String |
 | Test.cs:65:42:65:96 | ... + ... | semmle.label | ... + ... |
 subpaths
-| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | Test.cs:15:20:15:61 | call to method GetString : String | Test.cs:28:85:28:105 | call to method BytesToString : String |
+| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | Test.cs:12:45:12:49 | bytes : Byte[] | Test.cs:15:20:15:61 | call to method GetString : String | Test.cs:28:85:28:105 | call to method BytesToString : String |
 #select
 | Test.cs:23:42:23:59 | call to method GetStream : NetworkStream | Test.cs:28:42:28:111 | ... + ... |
 | Test.cs:34:29:34:69 | call to method ExecuteQuery : String | Test.cs:37:42:37:96 | ... + ... |
diff --git a/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest4.expected b/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest4.expected
index cac7f178b40..9648aa5e5eb 100644
--- a/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest4.expected
+++ b/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest4.expected
@@ -5,18 +5,18 @@ models
 | 4 | Source: My.Qltest; TestSources; false; GetCustom; (System.String); ; ReturnValue; custom; manual |
 | 5 | Source: My.Qltest; TestSources; false; ReadEnv; (System.String); ; ReturnValue; environment; manual |
 | 6 | Source: System.Net.Sockets; TcpClient; false; GetStream; ; ; ReturnValue; remote; manual |
-| 7 | Summary: System.IO; Stream; true; Read; (System.Byte[],System.Int32,System.Int32); ; Argument[this]; Argument[0].Element; taint; manual |
+| 7 | Summary: System.IO; Stream; true; Read; (System.Byte[],System.Int32,System.Int32); ; Argument[this]; Argument[0]; taint; manual |
 | 8 | Summary: System.Text; Encoding; true; GetString; (System.Byte[]); ; Argument[0].Element; ReturnValue; taint; manual |
 edges
-| Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | Test.cs:15:56:15:60 | access to parameter bytes : Byte[] [element] : Object | provenance |  |
-| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] [element] : Object | Test.cs:15:20:15:61 | call to method GetString : String | provenance | MaD:8 |
+| Test.cs:12:45:12:49 | bytes : Byte[] | Test.cs:15:56:15:60 | access to parameter bytes : Byte[] | provenance |  |
+| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] | Test.cs:15:20:15:61 | call to method GetString : String | provenance | MaD:8 |
 | Test.cs:23:33:23:38 | access to local variable stream : NetworkStream | Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | provenance |  |
 | Test.cs:23:42:23:59 | call to method GetStream : NetworkStream | Test.cs:23:33:23:38 | access to local variable stream : NetworkStream | provenance | Src:MaD:6  |
-| Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] [element] : Object | provenance | MaD:7 |
-| Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] [element] : Object | Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | provenance |  |
+| Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] | provenance | MaD:7 |
+| Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] | Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | provenance |  |
 | Test.cs:28:85:28:105 | call to method BytesToString : String | Test.cs:28:42:28:111 | ... + ... | provenance | Sink:MaD:1 |
-| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | provenance |  |
-| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | Test.cs:28:85:28:105 | call to method BytesToString : String | provenance | MaD:8 |
+| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | Test.cs:12:45:12:49 | bytes : Byte[] | provenance |  |
+| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | Test.cs:28:85:28:105 | call to method BytesToString : String | provenance | MaD:8 |
 | Test.cs:34:20:34:25 | access to local variable result : String | Test.cs:37:42:37:96 | ... + ... | provenance | Sink:MaD:1 |
 | Test.cs:34:29:34:69 | call to method ExecuteQuery : String | Test.cs:34:20:34:25 | access to local variable result : String | provenance | Src:MaD:2  |
 | Test.cs:43:20:43:25 | access to local variable result : String | Test.cs:46:42:46:96 | ... + ... | provenance | Sink:MaD:1 |
@@ -26,16 +26,16 @@ edges
 | Test.cs:62:20:62:25 | access to local variable result : String | Test.cs:65:42:65:96 | ... + ... | provenance | Sink:MaD:1 |
 | Test.cs:62:29:62:48 | call to method GetCliArg : String | Test.cs:62:20:62:25 | access to local variable result : String | provenance | Src:MaD:3  |
 nodes
-| Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | semmle.label | bytes : Byte[] [element] : Object |
+| Test.cs:12:45:12:49 | bytes : Byte[] | semmle.label | bytes : Byte[] |
 | Test.cs:15:20:15:61 | call to method GetString : String | semmle.label | call to method GetString : String |
-| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] [element] : Object | semmle.label | access to parameter bytes : Byte[] [element] : Object |
+| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] | semmle.label | access to parameter bytes : Byte[] |
 | Test.cs:23:33:23:38 | access to local variable stream : NetworkStream | semmle.label | access to local variable stream : NetworkStream |
 | Test.cs:23:42:23:59 | call to method GetStream : NetworkStream | semmle.label | call to method GetStream : NetworkStream |
 | Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | semmle.label | access to local variable stream : NetworkStream |
-| Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] [element] : Object | semmle.label | [post] access to local variable buffer : Byte[] [element] : Object |
+| Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] | semmle.label | [post] access to local variable buffer : Byte[] |
 | Test.cs:28:42:28:111 | ... + ... | semmle.label | ... + ... |
 | Test.cs:28:85:28:105 | call to method BytesToString : String | semmle.label | call to method BytesToString : String |
-| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | semmle.label | access to local variable buffer : Byte[] [element] : Object |
+| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | semmle.label | access to local variable buffer : Byte[] |
 | Test.cs:34:20:34:25 | access to local variable result : String | semmle.label | access to local variable result : String |
 | Test.cs:34:29:34:69 | call to method ExecuteQuery : String | semmle.label | call to method ExecuteQuery : String |
 | Test.cs:37:42:37:96 | ... + ... | semmle.label | ... + ... |
@@ -49,7 +49,7 @@ nodes
 | Test.cs:62:29:62:48 | call to method GetCliArg : String | semmle.label | call to method GetCliArg : String |
 | Test.cs:65:42:65:96 | ... + ... | semmle.label | ... + ... |
 subpaths
-| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | Test.cs:15:20:15:61 | call to method GetString : String | Test.cs:28:85:28:105 | call to method BytesToString : String |
+| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | Test.cs:12:45:12:49 | bytes : Byte[] | Test.cs:15:20:15:61 | call to method GetString : String | Test.cs:28:85:28:105 | call to method BytesToString : String |
 #select
 | Test.cs:23:42:23:59 | call to method GetStream : NetworkStream | Test.cs:28:42:28:111 | ... + ... |
 | Test.cs:34:29:34:69 | call to method ExecuteQuery : String | Test.cs:37:42:37:96 | ... + ... |
diff --git a/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest5.expected b/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest5.expected
index b0e7142693f..b13812650b8 100644
--- a/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest5.expected
+++ b/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest5.expected
@@ -3,33 +3,33 @@ models
 | 2 | Source: My.Qltest; TestSources; false; GetCliArg; (System.Int32); ; ReturnValue; commandargs; manual |
 | 3 | Source: My.Qltest; TestSources; false; ReadEnv; (System.String); ; ReturnValue; environment; manual |
 | 4 | Source: System.Net.Sockets; TcpClient; false; GetStream; ; ; ReturnValue; remote; manual |
-| 5 | Summary: System.IO; Stream; true; Read; (System.Byte[],System.Int32,System.Int32); ; Argument[this]; Argument[0].Element; taint; manual |
+| 5 | Summary: System.IO; Stream; true; Read; (System.Byte[],System.Int32,System.Int32); ; Argument[this]; Argument[0]; taint; manual |
 | 6 | Summary: System.Text; Encoding; true; GetString; (System.Byte[]); ; Argument[0].Element; ReturnValue; taint; manual |
 edges
-| Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | Test.cs:15:56:15:60 | access to parameter bytes : Byte[] [element] : Object | provenance |  |
-| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] [element] : Object | Test.cs:15:20:15:61 | call to method GetString : String | provenance | MaD:6 |
+| Test.cs:12:45:12:49 | bytes : Byte[] | Test.cs:15:56:15:60 | access to parameter bytes : Byte[] | provenance |  |
+| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] | Test.cs:15:20:15:61 | call to method GetString : String | provenance | MaD:6 |
 | Test.cs:23:33:23:38 | access to local variable stream : NetworkStream | Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | provenance |  |
 | Test.cs:23:42:23:59 | call to method GetStream : NetworkStream | Test.cs:23:33:23:38 | access to local variable stream : NetworkStream | provenance | Src:MaD:4  |
-| Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] [element] : Object | provenance | MaD:5 |
-| Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] [element] : Object | Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | provenance |  |
+| Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] | provenance | MaD:5 |
+| Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] | Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | provenance |  |
 | Test.cs:28:85:28:105 | call to method BytesToString : String | Test.cs:28:42:28:111 | ... + ... | provenance | Sink:MaD:1 |
-| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | provenance |  |
-| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | Test.cs:28:85:28:105 | call to method BytesToString : String | provenance | MaD:6 |
+| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | Test.cs:12:45:12:49 | bytes : Byte[] | provenance |  |
+| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | Test.cs:28:85:28:105 | call to method BytesToString : String | provenance | MaD:6 |
 | Test.cs:43:20:43:25 | access to local variable result : String | Test.cs:46:42:46:96 | ... + ... | provenance | Sink:MaD:1 |
 | Test.cs:43:29:43:50 | call to method ReadEnv : String | Test.cs:43:20:43:25 | access to local variable result : String | provenance | Src:MaD:3  |
 | Test.cs:62:20:62:25 | access to local variable result : String | Test.cs:65:42:65:96 | ... + ... | provenance | Sink:MaD:1 |
 | Test.cs:62:29:62:48 | call to method GetCliArg : String | Test.cs:62:20:62:25 | access to local variable result : String | provenance | Src:MaD:2  |
 nodes
-| Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | semmle.label | bytes : Byte[] [element] : Object |
+| Test.cs:12:45:12:49 | bytes : Byte[] | semmle.label | bytes : Byte[] |
 | Test.cs:15:20:15:61 | call to method GetString : String | semmle.label | call to method GetString : String |
-| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] [element] : Object | semmle.label | access to parameter bytes : Byte[] [element] : Object |
+| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] | semmle.label | access to parameter bytes : Byte[] |
 | Test.cs:23:33:23:38 | access to local variable stream : NetworkStream | semmle.label | access to local variable stream : NetworkStream |
 | Test.cs:23:42:23:59 | call to method GetStream : NetworkStream | semmle.label | call to method GetStream : NetworkStream |
 | Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | semmle.label | access to local variable stream : NetworkStream |
-| Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] [element] : Object | semmle.label | [post] access to local variable buffer : Byte[] [element] : Object |
+| Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] | semmle.label | [post] access to local variable buffer : Byte[] |
 | Test.cs:28:42:28:111 | ... + ... | semmle.label | ... + ... |
 | Test.cs:28:85:28:105 | call to method BytesToString : String | semmle.label | call to method BytesToString : String |
-| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | semmle.label | access to local variable buffer : Byte[] [element] : Object |
+| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | semmle.label | access to local variable buffer : Byte[] |
 | Test.cs:43:20:43:25 | access to local variable result : String | semmle.label | access to local variable result : String |
 | Test.cs:43:29:43:50 | call to method ReadEnv : String | semmle.label | call to method ReadEnv : String |
 | Test.cs:46:42:46:96 | ... + ... | semmle.label | ... + ... |
@@ -37,7 +37,7 @@ nodes
 | Test.cs:62:29:62:48 | call to method GetCliArg : String | semmle.label | call to method GetCliArg : String |
 | Test.cs:65:42:65:96 | ... + ... | semmle.label | ... + ... |
 subpaths
-| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | Test.cs:15:20:15:61 | call to method GetString : String | Test.cs:28:85:28:105 | call to method BytesToString : String |
+| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | Test.cs:12:45:12:49 | bytes : Byte[] | Test.cs:15:20:15:61 | call to method GetString : String | Test.cs:28:85:28:105 | call to method BytesToString : String |
 #select
 | Test.cs:23:42:23:59 | call to method GetStream : NetworkStream | Test.cs:28:42:28:111 | ... + ... |
 | Test.cs:43:29:43:50 | call to method ReadEnv : String | Test.cs:46:42:46:96 | ... + ... |
diff --git a/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest6.expected b/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest6.expected
index ae9fccfab80..ccaa28dde3e 100644
--- a/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest6.expected
+++ b/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest6.expected
@@ -3,33 +3,33 @@ models
 | 2 | Source: My.Qltest; TestSources; false; ExecuteQuery; (System.String); ; ReturnValue; database; manual |
 | 3 | Source: My.Qltest; TestSources; false; GetCliArg; (System.Int32); ; ReturnValue; commandargs; manual |
 | 4 | Source: System.Net.Sockets; TcpClient; false; GetStream; ; ; ReturnValue; remote; manual |
-| 5 | Summary: System.IO; Stream; true; Read; (System.Byte[],System.Int32,System.Int32); ; Argument[this]; Argument[0].Element; taint; manual |
+| 5 | Summary: System.IO; Stream; true; Read; (System.Byte[],System.Int32,System.Int32); ; Argument[this]; Argument[0]; taint; manual |
 | 6 | Summary: System.Text; Encoding; true; GetString; (System.Byte[]); ; Argument[0].Element; ReturnValue; taint; manual |
 edges
-| Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | Test.cs:15:56:15:60 | access to parameter bytes : Byte[] [element] : Object | provenance |  |
-| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] [element] : Object | Test.cs:15:20:15:61 | call to method GetString : String | provenance | MaD:6 |
+| Test.cs:12:45:12:49 | bytes : Byte[] | Test.cs:15:56:15:60 | access to parameter bytes : Byte[] | provenance |  |
+| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] | Test.cs:15:20:15:61 | call to method GetString : String | provenance | MaD:6 |
 | Test.cs:23:33:23:38 | access to local variable stream : NetworkStream | Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | provenance |  |
 | Test.cs:23:42:23:59 | call to method GetStream : NetworkStream | Test.cs:23:33:23:38 | access to local variable stream : NetworkStream | provenance | Src:MaD:4  |
-| Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] [element] : Object | provenance | MaD:5 |
-| Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] [element] : Object | Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | provenance |  |
+| Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] | provenance | MaD:5 |
+| Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] | Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | provenance |  |
 | Test.cs:28:85:28:105 | call to method BytesToString : String | Test.cs:28:42:28:111 | ... + ... | provenance | Sink:MaD:1 |
-| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | provenance |  |
-| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | Test.cs:28:85:28:105 | call to method BytesToString : String | provenance | MaD:6 |
+| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | Test.cs:12:45:12:49 | bytes : Byte[] | provenance |  |
+| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | Test.cs:28:85:28:105 | call to method BytesToString : String | provenance | MaD:6 |
 | Test.cs:34:20:34:25 | access to local variable result : String | Test.cs:37:42:37:96 | ... + ... | provenance | Sink:MaD:1 |
 | Test.cs:34:29:34:69 | call to method ExecuteQuery : String | Test.cs:34:20:34:25 | access to local variable result : String | provenance | Src:MaD:2  |
 | Test.cs:62:20:62:25 | access to local variable result : String | Test.cs:65:42:65:96 | ... + ... | provenance | Sink:MaD:1 |
 | Test.cs:62:29:62:48 | call to method GetCliArg : String | Test.cs:62:20:62:25 | access to local variable result : String | provenance | Src:MaD:3  |
 nodes
-| Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | semmle.label | bytes : Byte[] [element] : Object |
+| Test.cs:12:45:12:49 | bytes : Byte[] | semmle.label | bytes : Byte[] |
 | Test.cs:15:20:15:61 | call to method GetString : String | semmle.label | call to method GetString : String |
-| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] [element] : Object | semmle.label | access to parameter bytes : Byte[] [element] : Object |
+| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] | semmle.label | access to parameter bytes : Byte[] |
 | Test.cs:23:33:23:38 | access to local variable stream : NetworkStream | semmle.label | access to local variable stream : NetworkStream |
 | Test.cs:23:42:23:59 | call to method GetStream : NetworkStream | semmle.label | call to method GetStream : NetworkStream |
 | Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | semmle.label | access to local variable stream : NetworkStream |
-| Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] [element] : Object | semmle.label | [post] access to local variable buffer : Byte[] [element] : Object |
+| Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] | semmle.label | [post] access to local variable buffer : Byte[] |
 | Test.cs:28:42:28:111 | ... + ... | semmle.label | ... + ... |
 | Test.cs:28:85:28:105 | call to method BytesToString : String | semmle.label | call to method BytesToString : String |
-| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | semmle.label | access to local variable buffer : Byte[] [element] : Object |
+| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | semmle.label | access to local variable buffer : Byte[] |
 | Test.cs:34:20:34:25 | access to local variable result : String | semmle.label | access to local variable result : String |
 | Test.cs:34:29:34:69 | call to method ExecuteQuery : String | semmle.label | call to method ExecuteQuery : String |
 | Test.cs:37:42:37:96 | ... + ... | semmle.label | ... + ... |
@@ -37,7 +37,7 @@ nodes
 | Test.cs:62:29:62:48 | call to method GetCliArg : String | semmle.label | call to method GetCliArg : String |
 | Test.cs:65:42:65:96 | ... + ... | semmle.label | ... + ... |
 subpaths
-| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | Test.cs:15:20:15:61 | call to method GetString : String | Test.cs:28:85:28:105 | call to method BytesToString : String |
+| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | Test.cs:12:45:12:49 | bytes : Byte[] | Test.cs:15:20:15:61 | call to method GetString : String | Test.cs:28:85:28:105 | call to method BytesToString : String |
 #select
 | Test.cs:23:42:23:59 | call to method GetStream : NetworkStream | Test.cs:28:42:28:111 | ... + ... |
 | Test.cs:34:29:34:69 | call to method ExecuteQuery : String | Test.cs:37:42:37:96 | ... + ... |
diff --git a/csharp/ql/test/library-tests/definitions/PrintAst.expected b/csharp/ql/test/library-tests/definitions/PrintAst.expected
index 1ad3ad1a61d..9b5606d30f5 100644
--- a/csharp/ql/test/library-tests/definitions/PrintAst.expected
+++ b/csharp/ql/test/library-tests/definitions/PrintAst.expected
@@ -272,8 +272,8 @@ definitions.cs:
 #  125|           0: [MethodCall] call to method M
 #  125|             -1: [BaseAccess] base access
 #  128|     6: [Method] M2`1
-#  128|       -1: [TypeMention] Void
 #  128|       -1: [TypeMention] I1
+#  128|       -1: [TypeMention] Void
 #-----|       1: (Type parameters)
 #  128|         0: [TypeParameter] T
 #  128|       4: [BlockStmt] {...}
@@ -356,8 +356,8 @@ definitions.cs:
 #  153|           0: [Parameter] value
 #  153|         4: [BlockStmt] {...}
 #  154|     6: [Method] M
-#  154|       -1: [TypeMention] A
 #  154|       -1: [TypeMention] I4
+#  154|       -1: [TypeMention] A
 #  154|       4: [ThrowExpr] throw ...
 #  154|         0: [ObjectCreation] object creation of type Exception
 #  154|           0: [TypeMention] Exception
diff --git a/csharp/ql/test/library-tests/exceptions/Exceptions1.expected b/csharp/ql/test/library-tests/exceptions/Exceptions1.expected
index f3e813a7395..c97468d6189 100644
--- a/csharp/ql/test/library-tests/exceptions/Exceptions1.expected
+++ b/csharp/ql/test/library-tests/exceptions/Exceptions1.expected
@@ -9,14 +9,55 @@
 | exceptions.cs:76:13:76:13 | ; | exceptions.cs:89:13:89:13 | ; |
 | exceptions.cs:76:13:76:13 | ; | exceptions.cs:93:13:93:13 | ; |
 | exceptions.cs:76:13:76:13 | ; | exceptions.cs:97:13:97:13 | ; |
+| exceptions.cs:105:13:105:13 | ; | exceptions.cs:110:13:110:13 | ; |
 | exceptions.cs:105:13:105:13 | ; | exceptions.cs:114:13:114:13 | ; |
+| exceptions.cs:105:13:105:13 | ; | exceptions.cs:118:13:118:13 | ; |
+| exceptions.cs:105:13:105:13 | ; | exceptions.cs:122:13:122:13 | ; |
+| exceptions.cs:105:13:105:13 | ; | exceptions.cs:126:13:126:13 | ; |
+| exceptions.cs:134:13:134:13 | ; | exceptions.cs:139:13:139:13 | ; |
 | exceptions.cs:134:13:134:13 | ; | exceptions.cs:143:13:143:13 | ; |
+| exceptions.cs:134:13:134:13 | ; | exceptions.cs:147:13:147:13 | ; |
+| exceptions.cs:134:13:134:13 | ; | exceptions.cs:151:13:151:13 | ; |
+| exceptions.cs:134:13:134:13 | ; | exceptions.cs:155:13:155:13 | ; |
+| exceptions.cs:163:13:163:13 | ; | exceptions.cs:168:13:168:13 | ; |
 | exceptions.cs:163:13:163:13 | ; | exceptions.cs:172:13:172:13 | ; |
+| exceptions.cs:163:13:163:13 | ; | exceptions.cs:176:13:176:13 | ; |
+| exceptions.cs:163:13:163:13 | ; | exceptions.cs:180:13:180:13 | ; |
+| exceptions.cs:163:13:163:13 | ; | exceptions.cs:184:13:184:13 | ; |
+| exceptions.cs:222:13:222:13 | ; | exceptions.cs:227:13:227:13 | ; |
+| exceptions.cs:222:13:222:13 | ; | exceptions.cs:231:13:231:13 | ; |
 | exceptions.cs:222:13:222:13 | ; | exceptions.cs:235:13:235:13 | ; |
+| exceptions.cs:222:13:222:13 | ; | exceptions.cs:239:13:239:13 | ; |
+| exceptions.cs:222:13:222:13 | ; | exceptions.cs:243:13:243:13 | ; |
+| exceptions.cs:280:13:280:13 | ; | exceptions.cs:285:13:285:13 | ; |
+| exceptions.cs:280:13:280:13 | ; | exceptions.cs:289:13:289:13 | ; |
+| exceptions.cs:280:13:280:13 | ; | exceptions.cs:293:13:293:13 | ; |
 | exceptions.cs:280:13:280:13 | ; | exceptions.cs:297:13:297:13 | ; |
+| exceptions.cs:280:13:280:13 | ; | exceptions.cs:301:13:301:13 | ; |
 | exceptions.cs:309:13:309:13 | ; | exceptions.cs:314:13:314:13 | ; |
+| exceptions.cs:309:13:309:13 | ; | exceptions.cs:318:13:318:13 | ; |
+| exceptions.cs:309:13:309:13 | ; | exceptions.cs:322:13:322:13 | ; |
+| exceptions.cs:309:13:309:13 | ; | exceptions.cs:326:13:326:13 | ; |
+| exceptions.cs:309:13:309:13 | ; | exceptions.cs:330:13:330:13 | ; |
+| exceptions.cs:338:13:338:13 | ; | exceptions.cs:343:13:343:13 | ; |
 | exceptions.cs:338:13:338:13 | ; | exceptions.cs:347:13:347:13 | ; |
+| exceptions.cs:338:13:338:13 | ; | exceptions.cs:351:13:351:13 | ; |
+| exceptions.cs:338:13:338:13 | ; | exceptions.cs:355:13:355:13 | ; |
+| exceptions.cs:338:13:338:13 | ; | exceptions.cs:359:13:359:13 | ; |
+| exceptions.cs:368:13:368:13 | ; | exceptions.cs:373:13:373:13 | ; |
+| exceptions.cs:368:13:368:13 | ; | exceptions.cs:377:13:377:13 | ; |
+| exceptions.cs:368:13:368:13 | ; | exceptions.cs:381:13:381:13 | ; |
 | exceptions.cs:368:13:368:13 | ; | exceptions.cs:385:13:385:13 | ; |
+| exceptions.cs:368:13:368:13 | ; | exceptions.cs:389:13:389:13 | ; |
+| exceptions.cs:398:13:398:13 | ; | exceptions.cs:403:13:403:13 | ; |
 | exceptions.cs:398:13:398:13 | ; | exceptions.cs:407:13:407:13 | ; |
+| exceptions.cs:398:13:398:13 | ; | exceptions.cs:411:13:411:13 | ; |
+| exceptions.cs:398:13:398:13 | ; | exceptions.cs:415:13:415:13 | ; |
+| exceptions.cs:398:13:398:13 | ; | exceptions.cs:419:13:419:13 | ; |
 | exceptions.cs:451:13:451:13 | ; | exceptions.cs:456:13:456:13 | ; |
+| exceptions.cs:451:13:451:13 | ; | exceptions.cs:460:13:460:13 | ; |
+| exceptions.cs:468:13:468:13 | ; | exceptions.cs:473:13:473:13 | ; |
+| exceptions.cs:468:13:468:13 | ; | exceptions.cs:477:13:477:13 | ; |
+| exceptions.cs:468:13:468:13 | ; | exceptions.cs:481:13:481:13 | ; |
 | exceptions.cs:468:13:468:13 | ; | exceptions.cs:485:13:485:13 | ; |
+| exceptions.cs:468:13:468:13 | ; | exceptions.cs:489:13:489:13 | ; |
diff --git a/csharp/ql/test/library-tests/expressions/ConstructorInitializers.expected b/csharp/ql/test/library-tests/expressions/ConstructorInitializers.expected
index 00e46f6359c..2e6a5f679ba 100644
--- a/csharp/ql/test/library-tests/expressions/ConstructorInitializers.expected
+++ b/csharp/ql/test/library-tests/expressions/ConstructorInitializers.expected
@@ -27,6 +27,6 @@
 | file://:0:0:0:0 | TestCreations | expressions.cs:383:18:383:30 | call to constructor Object | file://:0:0:0:0 | Object |
 | file://:0:0:0:0 | TestUnaryOperator | expressions.cs:292:11:292:27 | call to constructor Object | file://:0:0:0:0 | Object |
 | file://:0:0:0:0 | TupleExprs | expressions.cs:501:11:501:20 | call to constructor Object | file://:0:0:0:0 | Object |
-| file://:0:0:0:0 | X | expressions.cs:108:15:108:18 | call to constructor Object | file://:0:0:0:0 | Object |
+| file://:0:0:0:0 | X | expressions.cs:108:15:108:15 | call to constructor Object | file://:0:0:0:0 | Object |
 | file://:0:0:0:0 | X | expressions.cs:216:18:216:18 | call to constructor Object | file://:0:0:0:0 | Object |
-| file://:0:0:0:0 | Y | expressions.cs:104:15:104:21 | call to constructor Object | file://:0:0:0:0 | Object |
+| file://:0:0:0:0 | Y | expressions.cs:104:15:104:15 | call to constructor Object | file://:0:0:0:0 | Object |
diff --git a/csharp/ql/test/library-tests/frameworks/microsoft/aspnetcore/blazor/Xss.expected b/csharp/ql/test/library-tests/frameworks/microsoft/aspnetcore/blazor/Xss.expected
index 3b9a54fafb3..476875a279e 100644
--- a/csharp/ql/test/library-tests/frameworks/microsoft/aspnetcore/blazor/Xss.expected
+++ b/csharp/ql/test/library-tests/frameworks/microsoft/aspnetcore/blazor/Xss.expected
@@ -1,6 +1,13 @@
+#select
+| Components_Pages_TestPage_razor.g.cs:138:15:138:22 | access to property UrlParam | Components_Pages_TestPage_razor.g.cs:138:15:138:22 | access to property UrlParam | Components_Pages_TestPage_razor.g.cs:138:15:138:22 | access to property UrlParam | $@ flows to here and is written to HTML or JavaScript. | Components_Pages_TestPage_razor.g.cs:138:15:138:22 | access to property UrlParam | User-provided value |
+| Components_Pages_TestPage_razor.g.cs:188:18:188:27 | access to property QueryParam | Components_Pages_TestPage_razor.g.cs:188:18:188:27 | access to property QueryParam | Components_Pages_TestPage_razor.g.cs:188:18:188:27 | access to property QueryParam | $@ flows to here and is written to HTML or JavaScript. | Components_Pages_TestPage_razor.g.cs:188:18:188:27 | access to property QueryParam | User-provided value |
+| Name.cs:13:53:13:59 | access to property TheName | NameList2.cs:31:57:31:60 | access to property Name : String | Name.cs:13:53:13:59 | access to property TheName | $@ flows to here and is written to HTML or JavaScript. | NameList2.cs:31:57:31:60 | access to property Name : String | User-provided value |
+| Name.cs:13:53:13:59 | access to property TheName | NameList.cs:31:99:31:102 | access to property Name : String | Name.cs:13:53:13:59 | access to property TheName | $@ flows to here and is written to HTML or JavaScript. | NameList.cs:31:99:31:102 | access to property Name : String | User-provided value |
 edges
-| NameList2.cs:31:57:31:60 | access to property Name : String | Name.cs:13:53:13:59 | access to property TheName | provenance | Sink:MaD:149 |
-| NameList.cs:31:99:31:102 | access to property Name : String | Name.cs:13:53:13:59 | access to property TheName | provenance | Sink:MaD:149 |
+| NameList2.cs:31:57:31:60 | access to property Name : String | Name.cs:13:53:13:59 | access to property TheName | provenance | Sink:MaD:1 |
+| NameList.cs:31:99:31:102 | access to property Name : String | Name.cs:13:53:13:59 | access to property TheName | provenance | Sink:MaD:1 |
+models
+| 1 | Sink: Microsoft.AspNetCore.Components; MarkupString; false; op_Explicit; (System.String); ; Argument[0]; html-injection; manual |
 nodes
 | Components_Pages_TestPage_razor.g.cs:138:15:138:22 | access to property UrlParam | semmle.label | access to property UrlParam |
 | Components_Pages_TestPage_razor.g.cs:188:18:188:27 | access to property QueryParam | semmle.label | access to property QueryParam |
@@ -8,8 +15,3 @@ nodes
 | NameList2.cs:31:57:31:60 | access to property Name : String | semmle.label | access to property Name : String |
 | NameList.cs:31:99:31:102 | access to property Name : String | semmle.label | access to property Name : String |
 subpaths
-#select
-| Components_Pages_TestPage_razor.g.cs:138:15:138:22 | access to property UrlParam | Components_Pages_TestPage_razor.g.cs:138:15:138:22 | access to property UrlParam | Components_Pages_TestPage_razor.g.cs:138:15:138:22 | access to property UrlParam | $@ flows to here and is written to HTML or JavaScript. | Components_Pages_TestPage_razor.g.cs:138:15:138:22 | access to property UrlParam | User-provided value |
-| Components_Pages_TestPage_razor.g.cs:188:18:188:27 | access to property QueryParam | Components_Pages_TestPage_razor.g.cs:188:18:188:27 | access to property QueryParam | Components_Pages_TestPage_razor.g.cs:188:18:188:27 | access to property QueryParam | $@ flows to here and is written to HTML or JavaScript. | Components_Pages_TestPage_razor.g.cs:188:18:188:27 | access to property QueryParam | User-provided value |
-| Name.cs:13:53:13:59 | access to property TheName | NameList2.cs:31:57:31:60 | access to property Name : String | Name.cs:13:53:13:59 | access to property TheName | $@ flows to here and is written to HTML or JavaScript. | NameList2.cs:31:57:31:60 | access to property Name : String | User-provided value |
-| Name.cs:13:53:13:59 | access to property TheName | NameList.cs:31:99:31:102 | access to property Name : String | Name.cs:13:53:13:59 | access to property TheName | $@ flows to here and is written to HTML or JavaScript. | NameList.cs:31:99:31:102 | access to property Name : String | User-provided value |
diff --git a/csharp/ql/test/library-tests/frameworks/microsoft/aspnetcore/blazor/Xss.qlref b/csharp/ql/test/library-tests/frameworks/microsoft/aspnetcore/blazor/Xss.qlref
index faad1d6403c..89b5b951bdb 100644
--- a/csharp/ql/test/library-tests/frameworks/microsoft/aspnetcore/blazor/Xss.qlref
+++ b/csharp/ql/test/library-tests/frameworks/microsoft/aspnetcore/blazor/Xss.qlref
@@ -1 +1,2 @@
-Security Features/CWE-079/XSS.ql
\ No newline at end of file
+query: Security Features/CWE-079/XSS.ql
+postprocess: utils/test/PrettyPrintModels.ql
diff --git a/csharp/ql/test/library-tests/goto/Goto1.expected b/csharp/ql/test/library-tests/goto/Goto1.expected
index e6c124726a3..0baaf5ef723 100644
--- a/csharp/ql/test/library-tests/goto/Goto1.expected
+++ b/csharp/ql/test/library-tests/goto/Goto1.expected
@@ -7,7 +7,7 @@
 | goto.cs:5:5:20:5 | {...} | goto.cs:6:9:8:9 | {...} | semmle.label | successor |
 | goto.cs:6:9:8:9 | {...} | goto.cs:7:13:7:14 | s1: | semmle.label | successor |
 | goto.cs:7:13:7:14 | s1: | goto.cs:7:17:7:24 | goto ...; | semmle.label | successor |
-| goto.cs:7:17:7:24 | goto ...; | goto.cs:9:9:9:10 | s2: | semmle.label | goto(s2) |
+| goto.cs:7:17:7:24 | goto ...; | goto.cs:9:9:9:10 | s2: | semmle.label | goto |
 | goto.cs:9:9:9:10 | s2: | goto.cs:9:13:9:27 | ... ...; | semmle.label | successor |
 | goto.cs:9:13:9:27 | ... ...; | goto.cs:9:24:9:26 | "5" | semmle.label | successor |
 | goto.cs:9:20:9:26 | String s = ... | goto.cs:10:9:18:9 | switch (...) {...} | semmle.label | successor |
@@ -18,24 +18,24 @@
 | goto.cs:12:18:12:21 | null | goto.cs:12:24:12:25 | s3: | semmle.label | match |
 | goto.cs:12:18:12:21 | null | goto.cs:13:13:13:21 | case ...: | semmle.label | no-match |
 | goto.cs:12:24:12:25 | s3: | goto.cs:12:38:12:40 | "1" | semmle.label | successor |
-| goto.cs:12:28:12:41 | goto case ...; | goto.cs:13:13:13:21 | case ...: | semmle.label | goto(1) |
+| goto.cs:12:28:12:41 | goto case ...; | goto.cs:13:13:13:21 | case ...: | semmle.label | goto |
 | goto.cs:12:38:12:40 | "1" | goto.cs:12:28:12:41 | goto case ...; | semmle.label | successor |
 | goto.cs:13:13:13:21 | case ...: | goto.cs:13:18:13:20 | "1" | semmle.label | successor |
 | goto.cs:13:18:13:20 | "1" | goto.cs:13:23:13:24 | s4: | semmle.label | match |
 | goto.cs:13:18:13:20 | "1" | goto.cs:14:13:14:21 | case ...: | semmle.label | no-match |
 | goto.cs:13:23:13:24 | s4: | goto.cs:13:37:13:39 | "2" | semmle.label | successor |
-| goto.cs:13:27:13:40 | goto case ...; | goto.cs:14:13:14:21 | case ...: | semmle.label | goto(2) |
+| goto.cs:13:27:13:40 | goto case ...; | goto.cs:14:13:14:21 | case ...: | semmle.label | goto |
 | goto.cs:13:37:13:39 | "2" | goto.cs:13:27:13:40 | goto case ...; | semmle.label | successor |
 | goto.cs:14:13:14:21 | case ...: | goto.cs:14:18:14:20 | "2" | semmle.label | successor |
 | goto.cs:14:18:14:20 | "2" | goto.cs:14:23:14:24 | s5: | semmle.label | match |
 | goto.cs:14:18:14:20 | "2" | goto.cs:15:13:15:21 | case ...: | semmle.label | no-match |
 | goto.cs:14:23:14:24 | s5: | goto.cs:14:27:14:34 | goto ...; | semmle.label | successor |
-| goto.cs:14:27:14:34 | goto ...; | goto.cs:9:9:9:10 | s2: | semmle.label | goto(s2) |
+| goto.cs:14:27:14:34 | goto ...; | goto.cs:9:9:9:10 | s2: | semmle.label | goto |
 | goto.cs:15:13:15:21 | case ...: | goto.cs:15:18:15:20 | "3" | semmle.label | successor |
 | goto.cs:15:18:15:20 | "3" | goto.cs:15:23:15:24 | s6: | semmle.label | match |
 | goto.cs:15:18:15:20 | "3" | goto.cs:16:13:16:21 | case ...: | semmle.label | no-match |
 | goto.cs:15:23:15:24 | s6: | goto.cs:15:27:15:39 | goto default; | semmle.label | successor |
-| goto.cs:15:27:15:39 | goto default; | goto.cs:17:13:17:20 | default: | semmle.label | goto(default) |
+| goto.cs:15:27:15:39 | goto default; | goto.cs:17:13:17:20 | default: | semmle.label | goto |
 | goto.cs:16:13:16:21 | case ...: | goto.cs:16:18:16:20 | "4" | semmle.label | successor |
 | goto.cs:16:18:16:20 | "4" | goto.cs:16:23:16:24 | s7: | semmle.label | match |
 | goto.cs:16:18:16:20 | "4" | goto.cs:17:13:17:20 | default: | semmle.label | no-match |
@@ -43,7 +43,7 @@
 | goto.cs:16:27:16:32 | break; | goto.cs:19:9:19:10 | s9: | semmle.label | break |
 | goto.cs:17:13:17:20 | default: | goto.cs:17:22:17:23 | s8: | semmle.label | successor |
 | goto.cs:17:22:17:23 | s8: | goto.cs:17:36:17:39 | null | semmle.label | successor |
-| goto.cs:17:26:17:40 | goto case ...; | goto.cs:12:13:12:22 | case ...: | semmle.label | goto(null) |
+| goto.cs:17:26:17:40 | goto case ...; | goto.cs:12:13:12:22 | case ...: | semmle.label | goto |
 | goto.cs:17:36:17:39 | null | goto.cs:17:26:17:40 | goto case ...; | semmle.label | successor |
 | goto.cs:19:9:19:10 | s9: | goto.cs:19:12:19:12 | ; | semmle.label | successor |
 | goto.cs:19:12:19:12 | ; | goto.cs:4:17:4:20 | exit Main (normal) | semmle.label | successor |
diff --git a/csharp/ql/test/library-tests/locations/A.cs b/csharp/ql/test/library-tests/locations/A.cs
new file mode 100644
index 00000000000..565683622da
--- /dev/null
+++ b/csharp/ql/test/library-tests/locations/A.cs
@@ -0,0 +1,40 @@
+using System;
+
+public abstract class A<T>
+{
+    public abstract T Prop { get; }
+    public abstract T this[int index] { get; set; }
+    public abstract event EventHandler Event;
+    public void Apply(T t1) { }
+    public abstract object ToObject(T t2);
+    public object Field;
+    public A() { }
+    public A(T t) { }
+    ~A() { }
+    public static A<T> operator +(A<T> a1, A<T> a2) { return a1; }
+}
+
+public class A2 : A<string>
+{
+    public override string Prop => "";
+
+    public override string this[int i]
+    {
+        get { return ""; }
+        set { }
+    }
+
+    public override event EventHandler Event
+    {
+        add { }
+        remove { }
+    }
+
+    public override object ToObject(string t) => t;
+
+    public void M()
+    {
+        A2 other = new();
+        other.Apply("");
+    }
+}
diff --git a/csharp/ql/test/library-tests/locations/B.cs b/csharp/ql/test/library-tests/locations/B.cs
new file mode 100644
index 00000000000..c4cfa971116
--- /dev/null
+++ b/csharp/ql/test/library-tests/locations/B.cs
@@ -0,0 +1,20 @@
+using System;
+
+public class B : A<int>
+{
+    public override int Prop => 0;
+
+    public override int this[int i]
+    {
+        get { return 0; }
+        set { }
+    }
+
+    public override event EventHandler Event
+    {
+        add { }
+        remove { }
+    }
+
+    public override object ToObject(int t) => t;
+}
diff --git a/csharp/ql/test/library-tests/locations/Base.cs b/csharp/ql/test/library-tests/locations/Base.cs
new file mode 100644
index 00000000000..413534319c4
--- /dev/null
+++ b/csharp/ql/test/library-tests/locations/Base.cs
@@ -0,0 +1,8 @@
+public abstract class Base<T>
+{
+    public void M() { }
+
+    public class InnerBase { }
+}
+
+public abstract class Base2<T> { }
diff --git a/csharp/ql/test/library-tests/locations/C.cs b/csharp/ql/test/library-tests/locations/C.cs
new file mode 100644
index 00000000000..a4063646d53
--- /dev/null
+++ b/csharp/ql/test/library-tests/locations/C.cs
@@ -0,0 +1,12 @@
+using System;
+
+class C
+{
+    public void M()
+    {
+        B b = new B();
+        b.Apply(0);
+        A2 a2 = new A2();
+        a2.Apply("");
+    }
+}
diff --git a/csharp/ql/test/library-tests/locations/Multiple1.cs b/csharp/ql/test/library-tests/locations/Multiple1.cs
new file mode 100644
index 00000000000..1d8a6491b14
--- /dev/null
+++ b/csharp/ql/test/library-tests/locations/Multiple1.cs
@@ -0,0 +1,13 @@
+public partial class Multiple { }
+
+public partial class MultipleGeneric<S> { }
+
+public class Multiple1Specific
+{
+    public static (int, string) M()
+    {
+        (int, string) x = (0, "");
+        (int, int) y = (0, 0);
+        return x;
+    }
+}
diff --git a/csharp/ql/test/library-tests/locations/Multiple2.cs b/csharp/ql/test/library-tests/locations/Multiple2.cs
new file mode 100644
index 00000000000..e6383306616
--- /dev/null
+++ b/csharp/ql/test/library-tests/locations/Multiple2.cs
@@ -0,0 +1,11 @@
+public partial class Multiple { }
+
+public partial class MultipleGeneric<S> { }
+
+public class Multiple2Specific
+{
+    public void M()
+    {
+        (int, string) z = (0, "");
+    }
+}
diff --git a/csharp/ql/test/library-tests/locations/Sub.cs b/csharp/ql/test/library-tests/locations/Sub.cs
new file mode 100644
index 00000000000..744cf63b7b1
--- /dev/null
+++ b/csharp/ql/test/library-tests/locations/Sub.cs
@@ -0,0 +1,8 @@
+public class Sub : Base<int>
+{
+    public void SubM()
+    {
+        M();
+        var x = new InnerBase();
+    }
+}
diff --git a/csharp/ql/test/library-tests/locations/locations.expected b/csharp/ql/test/library-tests/locations/locations.expected
new file mode 100644
index 00000000000..d41369ddcd4
--- /dev/null
+++ b/csharp/ql/test/library-tests/locations/locations.expected
@@ -0,0 +1,179 @@
+member_locations
+| A.cs:3:23:3:26 | A<Int32> | A.cs:5:23:5:26 | Prop | A.cs:5:23:5:26 | A.cs:5:23:5:26 |
+| A.cs:3:23:3:26 | A<Int32> | A.cs:6:23:6:26 | Item | A.cs:6:23:6:26 | A.cs:6:23:6:26 |
+| A.cs:3:23:3:26 | A<Int32> | A.cs:7:40:7:44 | Event | A.cs:7:40:7:44 | A.cs:7:40:7:44 |
+| A.cs:3:23:3:26 | A<Int32> | A.cs:8:17:8:21 | Apply | A.cs:8:17:8:21 | A.cs:8:17:8:21 |
+| A.cs:3:23:3:26 | A<Int32> | A.cs:9:28:9:35 | ToObject | A.cs:9:28:9:35 | A.cs:9:28:9:35 |
+| A.cs:3:23:3:26 | A<Int32> | A.cs:10:19:10:23 | Field | A.cs:10:19:10:23 | A.cs:10:19:10:23 |
+| A.cs:3:23:3:26 | A<Int32> | A.cs:11:12:11:12 | A | A.cs:11:12:11:12 | A.cs:11:12:11:12 |
+| A.cs:3:23:3:26 | A<Int32> | A.cs:12:12:12:12 | A | A.cs:12:12:12:12 | A.cs:12:12:12:12 |
+| A.cs:3:23:3:26 | A<Int32> | A.cs:13:6:13:6 | ~A | A.cs:13:6:13:6 | A.cs:13:6:13:6 |
+| A.cs:3:23:3:26 | A<Int32> | A.cs:14:33:14:33 | + | A.cs:14:33:14:33 | A.cs:14:33:14:33 |
+| A.cs:3:23:3:26 | A<String> | A.cs:5:23:5:26 | Prop | A.cs:5:23:5:26 | A.cs:5:23:5:26 |
+| A.cs:3:23:3:26 | A<String> | A.cs:6:23:6:26 | Item | A.cs:6:23:6:26 | A.cs:6:23:6:26 |
+| A.cs:3:23:3:26 | A<String> | A.cs:7:40:7:44 | Event | A.cs:7:40:7:44 | A.cs:7:40:7:44 |
+| A.cs:3:23:3:26 | A<String> | A.cs:8:17:8:21 | Apply | A.cs:8:17:8:21 | A.cs:8:17:8:21 |
+| A.cs:3:23:3:26 | A<String> | A.cs:9:28:9:35 | ToObject | A.cs:9:28:9:35 | A.cs:9:28:9:35 |
+| A.cs:3:23:3:26 | A<String> | A.cs:10:19:10:23 | Field | A.cs:10:19:10:23 | A.cs:10:19:10:23 |
+| A.cs:3:23:3:26 | A<String> | A.cs:11:12:11:12 | A | A.cs:11:12:11:12 | A.cs:11:12:11:12 |
+| A.cs:3:23:3:26 | A<String> | A.cs:12:12:12:12 | A | A.cs:12:12:12:12 | A.cs:12:12:12:12 |
+| A.cs:3:23:3:26 | A<String> | A.cs:13:6:13:6 | ~A | A.cs:13:6:13:6 | A.cs:13:6:13:6 |
+| A.cs:3:23:3:26 | A<String> | A.cs:14:33:14:33 | + | A.cs:14:33:14:33 | A.cs:14:33:14:33 |
+| A.cs:3:23:3:26 | A`1 | A.cs:5:23:5:26 | Prop | A.cs:5:23:5:26 | A.cs:5:23:5:26 |
+| A.cs:3:23:3:26 | A`1 | A.cs:6:23:6:26 | Item | A.cs:6:23:6:26 | A.cs:6:23:6:26 |
+| A.cs:3:23:3:26 | A`1 | A.cs:7:40:7:44 | Event | A.cs:7:40:7:44 | A.cs:7:40:7:44 |
+| A.cs:3:23:3:26 | A`1 | A.cs:8:17:8:21 | Apply | A.cs:8:17:8:21 | A.cs:8:17:8:21 |
+| A.cs:3:23:3:26 | A`1 | A.cs:9:28:9:35 | ToObject | A.cs:9:28:9:35 | A.cs:9:28:9:35 |
+| A.cs:3:23:3:26 | A`1 | A.cs:10:19:10:23 | Field | A.cs:10:19:10:23 | A.cs:10:19:10:23 |
+| A.cs:3:23:3:26 | A`1 | A.cs:11:12:11:12 | A | A.cs:11:12:11:12 | A.cs:11:12:11:12 |
+| A.cs:3:23:3:26 | A`1 | A.cs:12:12:12:12 | A | A.cs:12:12:12:12 | A.cs:12:12:12:12 |
+| A.cs:3:23:3:26 | A`1 | A.cs:13:6:13:6 | ~A | A.cs:13:6:13:6 | A.cs:13:6:13:6 |
+| A.cs:3:23:3:26 | A`1 | A.cs:14:33:14:33 | + | A.cs:14:33:14:33 | A.cs:14:33:14:33 |
+| A.cs:17:14:17:15 | A2 | A.cs:17:14:17:15 | A2 | A.cs:17:14:17:15 | A.cs:17:14:17:15 |
+| A.cs:17:14:17:15 | A2 | A.cs:19:28:19:31 | Prop | A.cs:19:28:19:31 | A.cs:19:28:19:31 |
+| A.cs:17:14:17:15 | A2 | A.cs:21:28:21:31 | Item | A.cs:21:28:21:31 | A.cs:21:28:21:31 |
+| A.cs:17:14:17:15 | A2 | A.cs:27:40:27:44 | Event | A.cs:27:40:27:44 | A.cs:27:40:27:44 |
+| A.cs:17:14:17:15 | A2 | A.cs:33:28:33:35 | ToObject | A.cs:33:28:33:35 | A.cs:33:28:33:35 |
+| A.cs:17:14:17:15 | A2 | A.cs:35:17:35:17 | M | A.cs:35:17:35:17 | A.cs:35:17:35:17 |
+| B.cs:3:14:3:14 | B | B.cs:3:14:3:14 | B | B.cs:3:14:3:14 | B.cs:3:14:3:14 |
+| B.cs:3:14:3:14 | B | B.cs:5:25:5:28 | Prop | B.cs:5:25:5:28 | B.cs:5:25:5:28 |
+| B.cs:3:14:3:14 | B | B.cs:7:25:7:28 | Item | B.cs:7:25:7:28 | B.cs:7:25:7:28 |
+| B.cs:3:14:3:14 | B | B.cs:13:40:13:44 | Event | B.cs:13:40:13:44 | B.cs:13:40:13:44 |
+| B.cs:3:14:3:14 | B | B.cs:19:28:19:35 | ToObject | B.cs:19:28:19:35 | B.cs:19:28:19:35 |
+| Base.cs:1:23:1:29 | Base<Int32> | Base.cs:1:23:1:26 | Base | Base.cs:1:23:1:26 | Base.cs:1:23:1:26 |
+| Base.cs:1:23:1:29 | Base<Int32> | Base.cs:3:17:3:17 | M | Base.cs:3:17:3:17 | Base.cs:3:17:3:17 |
+| Base.cs:1:23:1:29 | Base<Int32> | Base.cs:5:18:5:26 | InnerBase | Base.cs:5:18:5:26 | Base.cs:5:18:5:26 |
+| Base.cs:1:23:1:29 | Base`1 | Base.cs:1:23:1:26 | Base | Base.cs:1:23:1:26 | Base.cs:1:23:1:26 |
+| Base.cs:1:23:1:29 | Base`1 | Base.cs:3:17:3:17 | M | Base.cs:3:17:3:17 | Base.cs:3:17:3:17 |
+| Base.cs:1:23:1:29 | Base`1 | Base.cs:5:18:5:26 | InnerBase | Base.cs:5:18:5:26 | Base.cs:5:18:5:26 |
+| Base.cs:5:18:5:26 | InnerBase | Base.cs:5:18:5:26 | InnerBase | Base.cs:5:18:5:26 | Base.cs:5:18:5:26 |
+| Base.cs:5:18:5:26 | InnerBase | Base.cs:5:18:5:26 | InnerBase | Base.cs:5:18:5:26 | Base.cs:5:18:5:26 |
+| Base.cs:8:23:8:30 | Base2`1 | Base.cs:8:23:8:27 | Base2 | Base.cs:8:23:8:27 | Base.cs:8:23:8:27 |
+| C.cs:3:7:3:7 | C | C.cs:3:7:3:7 | C | C.cs:3:7:3:7 | C.cs:3:7:3:7 |
+| C.cs:3:7:3:7 | C | C.cs:5:17:5:17 | M | C.cs:5:17:5:17 | C.cs:5:17:5:17 |
+| Multiple1.cs:1:22:1:29 | Multiple | Multiple1.cs:1:22:1:29 | Multiple | Multiple1.cs:1:22:1:29 | Multiple1.cs:1:22:1:29 |
+| Multiple1.cs:3:22:3:39 | MultipleGeneric`1 | Multiple1.cs:3:22:3:36 | MultipleGeneric | Multiple1.cs:3:22:3:36 | Multiple1.cs:3:22:3:36 |
+| Multiple1.cs:5:14:5:30 | Multiple1Specific | Multiple1.cs:5:14:5:30 | Multiple1Specific | Multiple1.cs:5:14:5:30 | Multiple1.cs:5:14:5:30 |
+| Multiple1.cs:5:14:5:30 | Multiple1Specific | Multiple1.cs:7:33:7:33 | M | Multiple1.cs:7:33:7:33 | Multiple1.cs:7:33:7:33 |
+| Multiple2.cs:1:22:1:29 | Multiple | Multiple1.cs:1:22:1:29 | Multiple | Multiple1.cs:1:22:1:29 | Multiple1.cs:1:22:1:29 |
+| Multiple2.cs:3:22:3:39 | MultipleGeneric`1 | Multiple1.cs:3:22:3:36 | MultipleGeneric | Multiple1.cs:3:22:3:36 | Multiple1.cs:3:22:3:36 |
+| Multiple2.cs:5:14:5:30 | Multiple2Specific | Multiple2.cs:5:14:5:30 | Multiple2Specific | Multiple2.cs:5:14:5:30 | Multiple2.cs:5:14:5:30 |
+| Multiple2.cs:5:14:5:30 | Multiple2Specific | Multiple2.cs:7:17:7:17 | M | Multiple2.cs:7:17:7:17 | Multiple2.cs:7:17:7:17 |
+| Sub.cs:1:14:1:16 | Sub | Sub.cs:1:14:1:16 | Sub | Sub.cs:1:14:1:16 | Sub.cs:1:14:1:16 |
+| Sub.cs:1:14:1:16 | Sub | Sub.cs:3:17:3:20 | SubM | Sub.cs:3:17:3:20 | Sub.cs:3:17:3:20 |
+accessor_location
+| A.cs:3:23:3:26 | A<Int32> | A.cs:5:30:5:32 | get_Prop | A.cs:5:30:5:32 | A.cs:5:30:5:32 |
+| A.cs:3:23:3:26 | A<Int32> | A.cs:6:41:6:43 | get_Item | A.cs:6:41:6:43 | A.cs:6:41:6:43 |
+| A.cs:3:23:3:26 | A<Int32> | A.cs:6:46:6:48 | set_Item | A.cs:6:46:6:48 | A.cs:6:46:6:48 |
+| A.cs:3:23:3:26 | A<Int32> | A.cs:7:40:7:44 | add_Event | A.cs:7:40:7:44 | A.cs:7:40:7:44 |
+| A.cs:3:23:3:26 | A<Int32> | A.cs:7:40:7:44 | remove_Event | A.cs:7:40:7:44 | A.cs:7:40:7:44 |
+| A.cs:3:23:3:26 | A<String> | A.cs:5:30:5:32 | get_Prop | A.cs:5:30:5:32 | A.cs:5:30:5:32 |
+| A.cs:3:23:3:26 | A<String> | A.cs:6:41:6:43 | get_Item | A.cs:6:41:6:43 | A.cs:6:41:6:43 |
+| A.cs:3:23:3:26 | A<String> | A.cs:6:46:6:48 | set_Item | A.cs:6:46:6:48 | A.cs:6:46:6:48 |
+| A.cs:3:23:3:26 | A<String> | A.cs:7:40:7:44 | add_Event | A.cs:7:40:7:44 | A.cs:7:40:7:44 |
+| A.cs:3:23:3:26 | A<String> | A.cs:7:40:7:44 | remove_Event | A.cs:7:40:7:44 | A.cs:7:40:7:44 |
+| A.cs:3:23:3:26 | A`1 | A.cs:5:30:5:32 | get_Prop | A.cs:5:30:5:32 | A.cs:5:30:5:32 |
+| A.cs:3:23:3:26 | A`1 | A.cs:6:41:6:43 | get_Item | A.cs:6:41:6:43 | A.cs:6:41:6:43 |
+| A.cs:3:23:3:26 | A`1 | A.cs:6:46:6:48 | set_Item | A.cs:6:46:6:48 | A.cs:6:46:6:48 |
+| A.cs:3:23:3:26 | A`1 | A.cs:7:40:7:44 | add_Event | A.cs:7:40:7:44 | A.cs:7:40:7:44 |
+| A.cs:3:23:3:26 | A`1 | A.cs:7:40:7:44 | remove_Event | A.cs:7:40:7:44 | A.cs:7:40:7:44 |
+| A.cs:17:14:17:15 | A2 | A.cs:19:36:19:37 | get_Prop | A.cs:19:36:19:37 | A.cs:19:36:19:37 |
+| A.cs:17:14:17:15 | A2 | A.cs:23:9:23:11 | get_Item | A.cs:23:9:23:11 | A.cs:23:9:23:11 |
+| A.cs:17:14:17:15 | A2 | A.cs:24:9:24:11 | set_Item | A.cs:24:9:24:11 | A.cs:24:9:24:11 |
+| A.cs:17:14:17:15 | A2 | A.cs:29:9:29:11 | add_Event | A.cs:29:9:29:11 | A.cs:29:9:29:11 |
+| A.cs:17:14:17:15 | A2 | A.cs:30:9:30:14 | remove_Event | A.cs:30:9:30:14 | A.cs:30:9:30:14 |
+| B.cs:3:14:3:14 | B | B.cs:5:33:5:33 | get_Prop | B.cs:5:33:5:33 | B.cs:5:33:5:33 |
+| B.cs:3:14:3:14 | B | B.cs:9:9:9:11 | get_Item | B.cs:9:9:9:11 | B.cs:9:9:9:11 |
+| B.cs:3:14:3:14 | B | B.cs:10:9:10:11 | set_Item | B.cs:10:9:10:11 | B.cs:10:9:10:11 |
+| B.cs:3:14:3:14 | B | B.cs:15:9:15:11 | add_Event | B.cs:15:9:15:11 | B.cs:15:9:15:11 |
+| B.cs:3:14:3:14 | B | B.cs:16:9:16:14 | remove_Event | B.cs:16:9:16:14 | B.cs:16:9:16:14 |
+type_location
+| A.cs:3:23:3:26 | A<Int32> | A.cs:3:23:3:26 | A.cs:3:23:3:26 |
+| A.cs:3:23:3:26 | A<String> | A.cs:3:23:3:26 | A.cs:3:23:3:26 |
+| A.cs:3:23:3:26 | A`1 | A.cs:3:23:3:26 | A.cs:3:23:3:26 |
+| A.cs:3:25:3:25 | T | A.cs:3:25:3:25 | A.cs:3:25:3:25 |
+| A.cs:17:14:17:15 | A2 | A.cs:17:14:17:15 | A.cs:17:14:17:15 |
+| B.cs:3:14:3:14 | B | B.cs:3:14:3:14 | B.cs:3:14:3:14 |
+| Base.cs:1:23:1:29 | Base<Int32> | Base.cs:1:23:1:29 | Base.cs:1:23:1:29 |
+| Base.cs:1:23:1:29 | Base`1 | Base.cs:1:23:1:29 | Base.cs:1:23:1:29 |
+| Base.cs:1:28:1:28 | T | Base.cs:1:28:1:28 | Base.cs:1:28:1:28 |
+| Base.cs:5:18:5:26 | InnerBase | Base.cs:5:18:5:26 | Base.cs:5:18:5:26 |
+| Base.cs:5:18:5:26 | InnerBase | Base.cs:5:18:5:26 | Base.cs:5:18:5:26 |
+| Base.cs:8:23:8:30 | Base2`1 | Base.cs:8:23:8:30 | Base.cs:8:23:8:30 |
+| Base.cs:8:29:8:29 | T | Base.cs:8:29:8:29 | Base.cs:8:29:8:29 |
+| C.cs:3:7:3:7 | C | C.cs:3:7:3:7 | C.cs:3:7:3:7 |
+| Multiple1.cs:1:22:1:29 | Multiple | Multiple1.cs:1:22:1:29 | Multiple1.cs:1:22:1:29 |
+| Multiple1.cs:1:22:1:29 | Multiple | Multiple2.cs:1:22:1:29 | Multiple2.cs:1:22:1:29 |
+| Multiple1.cs:3:22:3:39 | MultipleGeneric`1 | Multiple1.cs:3:22:3:39 | Multiple1.cs:3:22:3:39 |
+| Multiple1.cs:3:22:3:39 | MultipleGeneric`1 | Multiple2.cs:3:22:3:39 | Multiple2.cs:3:22:3:39 |
+| Multiple1.cs:3:38:3:38 | S | Multiple1.cs:3:38:3:38 | Multiple1.cs:3:38:3:38 |
+| Multiple1.cs:5:14:5:30 | Multiple1Specific | Multiple1.cs:5:14:5:30 | Multiple1.cs:5:14:5:30 |
+| Multiple1.cs:7:19:7:31 | (Int32,String) | Multiple1.cs:7:19:7:31 | Multiple1.cs:7:19:7:31 |
+| Multiple1.cs:10:9:10:18 | (Int32,Int32) | Multiple1.cs:10:9:10:18 | Multiple1.cs:10:9:10:18 |
+| Multiple2.cs:1:22:1:29 | Multiple | Multiple1.cs:1:22:1:29 | Multiple1.cs:1:22:1:29 |
+| Multiple2.cs:1:22:1:29 | Multiple | Multiple2.cs:1:22:1:29 | Multiple2.cs:1:22:1:29 |
+| Multiple2.cs:3:22:3:39 | MultipleGeneric`1 | Multiple1.cs:3:22:3:39 | Multiple1.cs:3:22:3:39 |
+| Multiple2.cs:3:22:3:39 | MultipleGeneric`1 | Multiple2.cs:3:22:3:39 | Multiple2.cs:3:22:3:39 |
+| Multiple2.cs:5:14:5:30 | Multiple2Specific | Multiple2.cs:5:14:5:30 | Multiple2.cs:5:14:5:30 |
+| Sub.cs:1:14:1:16 | Sub | Sub.cs:1:14:1:16 | Sub.cs:1:14:1:16 |
+calltype_location
+| A.cs:17:14:17:15 | call to constructor A | A.cs:3:23:3:26 | A<String> | A.cs:3:23:3:26 | A.cs:3:23:3:26 |
+| A.cs:37:20:37:24 | object creation of type A2 | A.cs:17:14:17:15 | A2 | A.cs:17:14:17:15 | A.cs:17:14:17:15 |
+| B.cs:3:14:3:14 | call to constructor A | A.cs:3:23:3:26 | A<Int32> | A.cs:3:23:3:26 | A.cs:3:23:3:26 |
+| C.cs:7:15:7:21 | object creation of type B | B.cs:3:14:3:14 | B | B.cs:3:14:3:14 | B.cs:3:14:3:14 |
+| C.cs:9:17:9:24 | object creation of type A2 | A.cs:17:14:17:15 | A2 | A.cs:17:14:17:15 | A.cs:17:14:17:15 |
+| Sub.cs:1:14:1:16 | call to constructor Base | Base.cs:1:23:1:29 | Base<Int32> | Base.cs:1:23:1:29 | Base.cs:1:23:1:29 |
+| Sub.cs:6:17:6:31 | object creation of type InnerBase | Base.cs:5:18:5:26 | InnerBase | Base.cs:5:18:5:26 | Base.cs:5:18:5:26 |
+typeparameter_location
+| A.cs:3:25:3:25 | T | A.cs:3:25:3:25 | A.cs:3:25:3:25 |
+| Base.cs:1:28:1:28 | T | Base.cs:1:28:1:28 | Base.cs:1:28:1:28 |
+| Base.cs:8:29:8:29 | T | Base.cs:8:29:8:29 | Base.cs:8:29:8:29 |
+| Multiple1.cs:3:38:3:38 | S | Multiple1.cs:3:38:3:38 | Multiple1.cs:3:38:3:38 |
+| Multiple1.cs:3:38:3:38 | S | Multiple2.cs:3:38:3:38 | Multiple2.cs:3:38:3:38 |
+tupletype_location
+| Multiple1.cs:7:19:7:31 | (Int32,String) | Multiple1.cs:7:19:7:31 | Multiple1.cs:7:19:7:31 |
+| Multiple1.cs:7:19:7:31 | (Int32,String) | Multiple2.cs:9:9:9:21 | Multiple2.cs:9:9:9:21 |
+| Multiple1.cs:10:9:10:18 | (Int32,Int32) | Multiple1.cs:10:9:10:18 | Multiple1.cs:10:9:10:18 |
+parameter_locations
+| A.cs:6:41:6:43 | get_Item | A.cs:6:32:6:36 | index | A.cs:6:32:6:36 | A.cs:6:32:6:36 |
+| A.cs:6:41:6:43 | get_Item | A.cs:6:32:6:36 | index | A.cs:6:32:6:36 | A.cs:6:32:6:36 |
+| A.cs:6:41:6:43 | get_Item | A.cs:6:32:6:36 | index | A.cs:6:32:6:36 | A.cs:6:32:6:36 |
+| A.cs:6:46:6:48 | set_Item | A.cs:6:32:6:36 | index | A.cs:6:32:6:36 | A.cs:6:32:6:36 |
+| A.cs:6:46:6:48 | set_Item | A.cs:6:32:6:36 | index | A.cs:6:32:6:36 | A.cs:6:32:6:36 |
+| A.cs:6:46:6:48 | set_Item | A.cs:6:32:6:36 | index | A.cs:6:32:6:36 | A.cs:6:32:6:36 |
+| A.cs:6:46:6:48 | set_Item | A.cs:6:46:6:48 | value | A.cs:6:46:6:48 | A.cs:6:46:6:48 |
+| A.cs:6:46:6:48 | set_Item | A.cs:6:46:6:48 | value | A.cs:6:46:6:48 | A.cs:6:46:6:48 |
+| A.cs:6:46:6:48 | set_Item | A.cs:6:46:6:48 | value | A.cs:6:46:6:48 | A.cs:6:46:6:48 |
+| A.cs:7:40:7:44 | add_Event | A.cs:7:40:7:44 | value | A.cs:7:40:7:44 | A.cs:7:40:7:44 |
+| A.cs:7:40:7:44 | add_Event | A.cs:7:40:7:44 | value | A.cs:7:40:7:44 | A.cs:7:40:7:44 |
+| A.cs:7:40:7:44 | add_Event | A.cs:7:40:7:44 | value | A.cs:7:40:7:44 | A.cs:7:40:7:44 |
+| A.cs:7:40:7:44 | remove_Event | A.cs:7:40:7:44 | value | A.cs:7:40:7:44 | A.cs:7:40:7:44 |
+| A.cs:7:40:7:44 | remove_Event | A.cs:7:40:7:44 | value | A.cs:7:40:7:44 | A.cs:7:40:7:44 |
+| A.cs:7:40:7:44 | remove_Event | A.cs:7:40:7:44 | value | A.cs:7:40:7:44 | A.cs:7:40:7:44 |
+| A.cs:8:17:8:21 | Apply | A.cs:8:25:8:26 | t1 | A.cs:8:25:8:26 | A.cs:8:25:8:26 |
+| A.cs:8:17:8:21 | Apply | A.cs:8:25:8:26 | t1 | A.cs:8:25:8:26 | A.cs:8:25:8:26 |
+| A.cs:8:17:8:21 | Apply | A.cs:8:25:8:26 | t1 | A.cs:8:25:8:26 | A.cs:8:25:8:26 |
+| A.cs:9:28:9:35 | ToObject | A.cs:9:39:9:40 | t2 | A.cs:9:39:9:40 | A.cs:9:39:9:40 |
+| A.cs:9:28:9:35 | ToObject | A.cs:9:39:9:40 | t2 | A.cs:9:39:9:40 | A.cs:9:39:9:40 |
+| A.cs:9:28:9:35 | ToObject | A.cs:9:39:9:40 | t2 | A.cs:9:39:9:40 | A.cs:9:39:9:40 |
+| A.cs:12:12:12:12 | A | A.cs:12:16:12:16 | t | A.cs:12:16:12:16 | A.cs:12:16:12:16 |
+| A.cs:12:12:12:12 | A | A.cs:12:16:12:16 | t | A.cs:12:16:12:16 | A.cs:12:16:12:16 |
+| A.cs:12:12:12:12 | A | A.cs:12:16:12:16 | t | A.cs:12:16:12:16 | A.cs:12:16:12:16 |
+| A.cs:14:33:14:33 | + | A.cs:14:40:14:41 | a1 | A.cs:14:40:14:41 | A.cs:14:40:14:41 |
+| A.cs:14:33:14:33 | + | A.cs:14:40:14:41 | a1 | A.cs:14:40:14:41 | A.cs:14:40:14:41 |
+| A.cs:14:33:14:33 | + | A.cs:14:40:14:41 | a1 | A.cs:14:40:14:41 | A.cs:14:40:14:41 |
+| A.cs:14:33:14:33 | + | A.cs:14:49:14:50 | a2 | A.cs:14:49:14:50 | A.cs:14:49:14:50 |
+| A.cs:14:33:14:33 | + | A.cs:14:49:14:50 | a2 | A.cs:14:49:14:50 | A.cs:14:49:14:50 |
+| A.cs:14:33:14:33 | + | A.cs:14:49:14:50 | a2 | A.cs:14:49:14:50 | A.cs:14:49:14:50 |
+| A.cs:23:9:23:11 | get_Item | A.cs:21:37:21:37 | i | A.cs:21:37:21:37 | A.cs:21:37:21:37 |
+| A.cs:24:9:24:11 | set_Item | A.cs:21:37:21:37 | i | A.cs:21:37:21:37 | A.cs:21:37:21:37 |
+| A.cs:24:9:24:11 | set_Item | A.cs:24:9:24:11 | value | A.cs:24:9:24:11 | A.cs:24:9:24:11 |
+| A.cs:29:9:29:11 | add_Event | A.cs:29:9:29:11 | value | A.cs:29:9:29:11 | A.cs:29:9:29:11 |
+| A.cs:30:9:30:14 | remove_Event | A.cs:30:9:30:14 | value | A.cs:30:9:30:14 | A.cs:30:9:30:14 |
+| A.cs:33:28:33:35 | ToObject | A.cs:33:44:33:44 | t | A.cs:33:44:33:44 | A.cs:33:44:33:44 |
+| B.cs:9:9:9:11 | get_Item | B.cs:7:34:7:34 | i | B.cs:7:34:7:34 | B.cs:7:34:7:34 |
+| B.cs:10:9:10:11 | set_Item | B.cs:7:34:7:34 | i | B.cs:7:34:7:34 | B.cs:7:34:7:34 |
+| B.cs:10:9:10:11 | set_Item | B.cs:10:9:10:11 | value | B.cs:10:9:10:11 | B.cs:10:9:10:11 |
+| B.cs:15:9:15:11 | add_Event | B.cs:15:9:15:11 | value | B.cs:15:9:15:11 | B.cs:15:9:15:11 |
+| B.cs:16:9:16:14 | remove_Event | B.cs:16:9:16:14 | value | B.cs:16:9:16:14 | B.cs:16:9:16:14 |
+| B.cs:19:28:19:35 | ToObject | B.cs:19:41:19:41 | t | B.cs:19:41:19:41 | B.cs:19:41:19:41 |
diff --git a/csharp/ql/test/library-tests/locations/locations.ql b/csharp/ql/test/library-tests/locations/locations.ql
new file mode 100644
index 00000000000..d97852d7b3b
--- /dev/null
+++ b/csharp/ql/test/library-tests/locations/locations.ql
@@ -0,0 +1,31 @@
+import csharp
+
+query predicate member_locations(Type t, Member m, SourceLocation l) {
+  t = m.getDeclaringType() and
+  l = m.getLocation() and
+  not l instanceof EmptyLocation and
+  t.fromSource()
+}
+
+query predicate accessor_location(Type t, Accessor a, SourceLocation l) {
+  t = a.getDeclaringType() and
+  l = a.getLocation() and
+  not l instanceof EmptyLocation
+}
+
+query predicate type_location(Type t, SourceLocation l) {
+  l = t.getLocation() and not l instanceof EmptyLocation
+}
+
+query predicate calltype_location(Call call, Type t, SourceLocation l) {
+  t = call.getType() and
+  l = t.getALocation()
+}
+
+query predicate typeparameter_location(TypeParameter tp, SourceLocation l) { tp.getALocation() = l }
+
+query predicate tupletype_location(TupleType tt, SourceLocation l) { tt.getALocation() = l }
+
+query predicate parameter_locations(Callable c, Parameter p, SourceLocation l) {
+  p.getCallable() = c and p.getALocation() = l
+}
diff --git a/csharp/ql/test/library-tests/overlay/base/A.cs b/csharp/ql/test/library-tests/overlay/base/A.cs
new file mode 100644
index 00000000000..263824a575c
--- /dev/null
+++ b/csharp/ql/test/library-tests/overlay/base/A.cs
@@ -0,0 +1,66 @@
+using System;
+
+namespace ConsoleApp1
+{
+    public class A
+    {
+        private string name;
+        public A(string x)
+        {
+            name = x;
+        }
+
+        // Destructor
+        ~A()
+        {
+            Console.WriteLine("Destructor called!");
+        }
+
+        public string Prop { get; set; } = "Hello";
+
+        public object this[int i]
+        {
+            get { return new object(); }
+            set { }
+        }
+
+        /*
+         * An example event
+         */
+        public event EventHandler Clicked
+        {
+            add
+            {
+                Console.WriteLine("Handler added");
+            }
+            remove
+            {
+                Console.WriteLine("Handler removed");
+            }
+        }
+
+        public static A operator +(A a, A b)
+        {
+            return a;
+        }
+
+        [MyObsolete]
+        public void ObsoleteMethod() { }
+
+        public int OldMethod(int x)
+        {
+            var y = x + 1;
+            return y;
+        }
+
+        public override string ToString()
+        {
+            var x = $"A: {name}";
+            return x;
+        }
+    }
+
+    public class MyObsoleteAttribute : Attribute { }
+
+    public class B { }
+}
diff --git a/csharp/ql/test/library-tests/overlay/base/Program.cs b/csharp/ql/test/library-tests/overlay/base/Program.cs
new file mode 100644
index 00000000000..bc57d682a26
--- /dev/null
+++ b/csharp/ql/test/library-tests/overlay/base/Program.cs
@@ -0,0 +1,65 @@
+using System;
+
+namespace ConsoleApp1
+{
+    internal class Program
+    {
+        public static void Main(string[] args)
+        {
+            if (args.Length == 0)
+            {
+                Console.WriteLine("Print usage instructions here.");
+                return;
+            }
+            var x = args[0];
+            var a = new A(x);
+            Console.WriteLine(a.ToString());
+        }
+
+        private string programName;
+
+        public Program(string x)
+        {
+            programName = x;
+        }
+
+        // Program destructor
+        ~Program()
+        {
+            Console.WriteLine("Program destructor called!");
+        }
+
+        public string ProgramProp { get; set; } = "Hello World!";
+
+        public string this[int i]
+        {
+            get { return string.Empty; }
+            set { }
+        }
+
+        /*
+         * A program event.
+         */
+        public event EventHandler ProgramClicked
+        {
+            add
+            {
+                Console.WriteLine("Program handler added");
+            }
+            remove
+            {
+                Console.WriteLine("Program handler removed");
+            }
+        }
+
+        public static Program operator -(Program a, Program b)
+        {
+            return b;
+        }
+
+        [Program]
+        public void AnnotatedMethod() { }
+    }
+
+    public class ProgramAttribute : Attribute { }
+}
diff --git a/csharp/ql/test/library-tests/overlay/base/options b/csharp/ql/test/library-tests/overlay/base/options
new file mode 100644
index 00000000000..7ba3811b2af
--- /dev/null
+++ b/csharp/ql/test/library-tests/overlay/base/options
@@ -0,0 +1 @@
+semmle-extractor-options: --standalone
diff --git a/csharp/ql/test/library-tests/overlay/base/test.expected b/csharp/ql/test/library-tests/overlay/base/test.expected
new file mode 100644
index 00000000000..0c2b5750f2c
--- /dev/null
+++ b/csharp/ql/test/library-tests/overlay/base/test.expected
@@ -0,0 +1,276 @@
+expressions
+| A.cs:8:16:8:16 | call to constructor Object |
+| A.cs:10:13:10:16 | access to field name |
+| A.cs:10:13:10:16 | this access |
+| A.cs:10:13:10:20 | ... = ... |
+| A.cs:10:20:10:20 | access to parameter x |
+| A.cs:16:13:16:19 | access to type Console |
+| A.cs:16:13:16:51 | call to method WriteLine |
+| A.cs:16:31:16:50 | "Destructor called!" |
+| A.cs:19:23:19:26 | access to property Prop |
+| A.cs:19:23:19:26 | this access |
+| A.cs:19:42:19:50 | ... = ... |
+| A.cs:19:44:19:50 | "Hello" |
+| A.cs:23:26:23:37 | object creation of type Object |
+| A.cs:34:17:34:23 | access to type Console |
+| A.cs:34:17:34:50 | call to method WriteLine |
+| A.cs:34:35:34:49 | "Handler added" |
+| A.cs:38:17:38:23 | access to type Console |
+| A.cs:38:17:38:52 | call to method WriteLine |
+| A.cs:38:35:38:51 | "Handler removed" |
+| A.cs:44:20:44:20 | access to parameter a |
+| A.cs:52:17:52:17 | access to local variable y |
+| A.cs:52:17:52:25 | Int32 y = ... |
+| A.cs:52:21:52:21 | access to parameter x |
+| A.cs:52:21:52:25 | ... + ... |
+| A.cs:52:25:52:25 | 1 |
+| A.cs:53:20:53:20 | access to local variable y |
+| A.cs:58:17:58:17 | access to local variable x |
+| A.cs:58:17:58:32 | String x = ... |
+| A.cs:58:21:58:32 | $"..." |
+| A.cs:58:23:58:25 | "A: " |
+| A.cs:58:26:58:31 | {...} |
+| A.cs:58:27:58:30 | access to field name |
+| A.cs:58:27:58:30 | this access |
+| A.cs:59:20:59:20 | access to local variable x |
+| A.cs:63:18:63:36 | call to constructor Attribute |
+| A.cs:65:18:65:18 | call to constructor Object |
+| Program.cs:9:17:9:20 | access to parameter args |
+| Program.cs:9:17:9:27 | access to property Length |
+| Program.cs:9:17:9:32 | ... == ... |
+| Program.cs:9:32:9:32 | 0 |
+| Program.cs:11:17:11:23 | access to type Console |
+| Program.cs:11:17:11:67 | call to method WriteLine |
+| Program.cs:11:35:11:66 | "Print usage instructions here." |
+| Program.cs:14:17:14:17 | access to local variable x |
+| Program.cs:14:17:14:27 | String x = ... |
+| Program.cs:14:21:14:24 | access to parameter args |
+| Program.cs:14:21:14:27 | access to array element |
+| Program.cs:14:26:14:26 | 0 |
+| Program.cs:15:17:15:17 | access to local variable a |
+| Program.cs:15:17:15:28 | A a = ... |
+| Program.cs:15:21:15:28 | object creation of type A |
+| Program.cs:15:27:15:27 | access to local variable x |
+| Program.cs:16:13:16:19 | access to type Console |
+| Program.cs:16:13:16:43 | call to method WriteLine |
+| Program.cs:16:31:16:31 | access to local variable a |
+| Program.cs:16:31:16:42 | call to method ToString |
+| Program.cs:21:16:21:22 | call to constructor Object |
+| Program.cs:23:13:23:23 | access to field programName |
+| Program.cs:23:13:23:23 | this access |
+| Program.cs:23:13:23:27 | ... = ... |
+| Program.cs:23:27:23:27 | access to parameter x |
+| Program.cs:29:13:29:19 | access to type Console |
+| Program.cs:29:13:29:59 | call to method WriteLine |
+| Program.cs:29:31:29:58 | "Program destructor called!" |
+| Program.cs:32:23:32:33 | access to property ProgramProp |
+| Program.cs:32:23:32:33 | this access |
+| Program.cs:32:49:32:64 | ... = ... |
+| Program.cs:32:51:32:64 | "Hello World!" |
+| Program.cs:36:26:36:31 | access to type String |
+| Program.cs:36:26:36:37 | access to field Empty |
+| Program.cs:47:17:47:23 | access to type Console |
+| Program.cs:47:17:47:58 | call to method WriteLine |
+| Program.cs:47:35:47:57 | "Program handler added" |
+| Program.cs:51:17:51:23 | access to type Console |
+| Program.cs:51:17:51:60 | call to method WriteLine |
+| Program.cs:51:35:51:59 | "Program handler removed" |
+| Program.cs:57:20:57:20 | access to parameter b |
+| Program.cs:64:18:64:33 | call to constructor Attribute |
+statements
+| A.cs:9:9:11:9 | {...} |
+| A.cs:10:13:10:21 | ...; |
+| A.cs:15:9:17:9 | {...} |
+| A.cs:16:13:16:52 | ...; |
+| A.cs:23:17:23:40 | {...} |
+| A.cs:23:19:23:38 | return ...; |
+| A.cs:24:17:24:19 | {...} |
+| A.cs:33:13:35:13 | {...} |
+| A.cs:34:17:34:51 | ...; |
+| A.cs:37:13:39:13 | {...} |
+| A.cs:38:17:38:53 | ...; |
+| A.cs:43:9:45:9 | {...} |
+| A.cs:44:13:44:21 | return ...; |
+| A.cs:48:38:48:40 | {...} |
+| A.cs:51:9:54:9 | {...} |
+| A.cs:52:13:52:26 | ... ...; |
+| A.cs:53:13:53:21 | return ...; |
+| A.cs:57:9:60:9 | {...} |
+| A.cs:58:13:58:33 | ... ...; |
+| A.cs:59:13:59:21 | return ...; |
+| A.cs:63:18:63:36 | {...} |
+| A.cs:65:18:65:18 | {...} |
+| Program.cs:8:9:17:9 | {...} |
+| Program.cs:9:13:13:13 | if (...) ... |
+| Program.cs:10:13:13:13 | {...} |
+| Program.cs:11:17:11:68 | ...; |
+| Program.cs:12:17:12:23 | return ...; |
+| Program.cs:14:13:14:28 | ... ...; |
+| Program.cs:15:13:15:29 | ... ...; |
+| Program.cs:16:13:16:44 | ...; |
+| Program.cs:22:9:24:9 | {...} |
+| Program.cs:23:13:23:28 | ...; |
+| Program.cs:28:9:30:9 | {...} |
+| Program.cs:29:13:29:60 | ...; |
+| Program.cs:36:17:36:40 | {...} |
+| Program.cs:36:19:36:38 | return ...; |
+| Program.cs:37:17:37:19 | {...} |
+| Program.cs:46:13:48:13 | {...} |
+| Program.cs:47:17:47:59 | ...; |
+| Program.cs:50:13:52:13 | {...} |
+| Program.cs:51:17:51:61 | ...; |
+| Program.cs:56:9:58:9 | {...} |
+| Program.cs:57:13:57:21 | return ...; |
+| Program.cs:61:39:61:41 | {...} |
+| Program.cs:64:18:64:33 | {...} |
+methods
+| A.cs:48:21:48:34 | ObsoleteMethod |
+| A.cs:50:20:50:28 | OldMethod |
+| A.cs:56:32:56:39 | ToString |
+| Program.cs:7:28:7:31 | Main |
+| Program.cs:61:21:61:35 | AnnotatedMethod |
+types
+| A.cs:5:18:5:18 | A |
+| A.cs:63:18:63:36 | MyObsoleteAttribute |
+| A.cs:65:18:65:18 | B |
+| Program.cs:5:20:5:26 | Program |
+| Program.cs:64:18:64:33 | ProgramAttribute |
+parameters
+| A.cs:8:25:8:25 | x |
+| A.cs:19:35:19:37 | value |
+| A.cs:21:32:21:32 | i |
+| A.cs:21:32:21:32 | i |
+| A.cs:21:32:21:32 | i |
+| A.cs:24:13:24:15 | value |
+| A.cs:32:13:32:15 | value |
+| A.cs:36:13:36:18 | value |
+| A.cs:42:38:42:38 | a |
+| A.cs:42:43:42:43 | b |
+| A.cs:50:34:50:34 | x |
+| Program.cs:7:42:7:45 | args |
+| Program.cs:21:31:21:31 | x |
+| Program.cs:32:42:32:44 | value |
+| Program.cs:34:32:34:32 | i |
+| Program.cs:34:32:34:32 | i |
+| Program.cs:34:32:34:32 | i |
+| Program.cs:37:13:37:15 | value |
+| Program.cs:45:13:45:15 | value |
+| Program.cs:49:13:49:18 | value |
+| Program.cs:55:50:55:50 | a |
+| Program.cs:55:61:55:61 | b |
+operators
+| A.cs:42:34:42:34 | + |
+| Program.cs:55:40:55:40 | - |
+constructors
+| A.cs:8:16:8:16 | A |
+| Program.cs:21:16:21:22 | Program |
+destructors
+| A.cs:14:10:14:10 | ~A |
+| Program.cs:27:10:27:16 | ~Program |
+fields
+| A.cs:7:24:7:27 | name |
+| Program.cs:19:24:19:34 | programName |
+properties
+| A.cs:19:23:19:26 | Prop |
+| Program.cs:32:23:32:33 | ProgramProp |
+indexers
+| A.cs:21:23:21:26 | Item |
+| Program.cs:34:23:34:26 | Item |
+accessors
+| A.cs:19:30:19:32 | get_Prop |
+| A.cs:19:35:19:37 | set_Prop |
+| A.cs:23:13:23:15 | get_Item |
+| A.cs:24:13:24:15 | set_Item |
+| A.cs:32:13:32:15 | add_Clicked |
+| A.cs:36:13:36:18 | remove_Clicked |
+| Program.cs:32:37:32:39 | get_ProgramProp |
+| Program.cs:32:42:32:44 | set_ProgramProp |
+| Program.cs:36:13:36:15 | get_Item |
+| Program.cs:37:13:37:15 | set_Item |
+| Program.cs:45:13:45:15 | add_ProgramClicked |
+| Program.cs:49:13:49:18 | remove_ProgramClicked |
+attributes
+| A.cs:47:10:47:19 | [MyObsolete(...)] |
+| Program.cs:60:10:60:16 | [Program(...)] |
+events
+| A.cs:30:35:30:41 | Clicked |
+| Program.cs:43:35:43:48 | ProgramClicked |
+eventAccessors
+| A.cs:32:13:32:15 | add_Clicked |
+| A.cs:36:13:36:18 | remove_Clicked |
+| Program.cs:45:13:45:15 | add_ProgramClicked |
+| Program.cs:49:13:49:18 | remove_ProgramClicked |
+usingDirectives
+| A.cs:1:1:1:13 | using ...; |
+| Program.cs:1:1:1:13 | using ...; |
+commentLines
+| A.cs:13:9:13:21 | // ... |
+| A.cs:27:9:27:10 | /* ... */ |
+| A.cs:28:1:28:27 | /* ... */ |
+| A.cs:29:1:29:11 | /* ... */ |
+| Program.cs:26:9:26:29 | // ... |
+| Program.cs:40:9:40:10 | /* ... */ |
+| Program.cs:41:1:41:27 | /* ... */ |
+| Program.cs:42:1:42:11 | /* ... */ |
+commentBlocks
+| A.cs:13:9:13:21 | // ... |
+| A.cs:27:9:29:11 | /* ... */ |
+| Program.cs:26:9:26:29 | // ... |
+| Program.cs:40:9:42:11 | /* ... */ |
+typeMentions
+| A.cs:7:17:7:22 | String |
+| A.cs:8:18:8:23 | String |
+| A.cs:16:13:16:19 | Console |
+| A.cs:19:16:19:21 | String |
+| A.cs:21:16:21:21 | Object |
+| A.cs:21:28:21:30 | Int32 |
+| A.cs:23:30:23:35 | Object |
+| A.cs:34:17:34:23 | Console |
+| A.cs:38:17:38:23 | Console |
+| A.cs:42:23:42:23 | A |
+| A.cs:42:36:42:36 | A |
+| A.cs:42:41:42:41 | A |
+| A.cs:47:10:47:19 | MyObsoleteAttribute |
+| A.cs:48:16:48:19 | Void |
+| A.cs:50:16:50:18 | Int32 |
+| A.cs:50:30:50:32 | Int32 |
+| A.cs:52:13:52:15 | Int32 |
+| A.cs:56:25:56:30 | String |
+| A.cs:58:13:58:15 | String |
+| A.cs:63:40:63:48 | Attribute |
+| Program.cs:7:23:7:26 | Void |
+| Program.cs:7:33:7:38 | String |
+| Program.cs:7:33:7:40 | String[] |
+| Program.cs:11:17:11:23 | Console |
+| Program.cs:14:13:14:15 | String |
+| Program.cs:15:13:15:15 | A |
+| Program.cs:15:25:15:25 | A |
+| Program.cs:16:13:16:19 | Console |
+| Program.cs:19:17:19:22 | String |
+| Program.cs:21:24:21:29 | String |
+| Program.cs:29:13:29:19 | Console |
+| Program.cs:32:16:32:21 | String |
+| Program.cs:34:16:34:21 | String |
+| Program.cs:34:28:34:30 | Int32 |
+| Program.cs:36:26:36:31 | String |
+| Program.cs:47:17:47:23 | Console |
+| Program.cs:51:17:51:23 | Console |
+| Program.cs:55:23:55:29 | Program |
+| Program.cs:55:42:55:48 | Program |
+| Program.cs:55:53:55:59 | Program |
+| Program.cs:60:10:60:16 | ProgramAttribute |
+| Program.cs:61:16:61:19 | Void |
+| Program.cs:64:37:64:45 | Attribute |
+xmlLocatables
+| web.changed.config:2:1:12:17 | configuration |
+| web.changed.config:3:3:4:16 | system.web |
+| web.changed.config:5:3:11:22 | system.webServer |
+| web.changed.config:6:5:10:20 | httpProtocol |
+| web.changed.config:7:7:9:23 | customHeaders |
+| web.changed.config:8:9:8:42 | add |
+| web.changed.config:8:9:8:42 | name=MyOption |
+| web.changed.config:8:9:8:42 | value=1 |
+| web.unchanged.config:2:1:6:17 | configuration |
+| web.unchanged.config:3:3:5:16 | system.web |
+| web.unchanged.config:4:5:4:37 | httpCookies |
+| web.unchanged.config:4:5:4:37 | requireSSL=true |
diff --git a/csharp/ql/test/library-tests/overlay/base/test.qlref b/csharp/ql/test/library-tests/overlay/base/test.qlref
new file mode 100644
index 00000000000..bbce8f8b98d
--- /dev/null
+++ b/csharp/ql/test/library-tests/overlay/base/test.qlref
@@ -0,0 +1 @@
+query: ../test.ql
diff --git a/csharp/ql/test/library-tests/overlay/base/web.changed.config b/csharp/ql/test/library-tests/overlay/base/web.changed.config
new file mode 100644
index 00000000000..a678c32c5a0
--- /dev/null
+++ b/csharp/ql/test/library-tests/overlay/base/web.changed.config
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <system.web>
+  </system.web>
+  <system.webServer>
+    <httpProtocol>
+      <customHeaders>
+        <add name="MyOption" value="1" />
+      </customHeaders>
+    </httpProtocol>
+  </system.webServer>
+</configuration>
diff --git a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/ConfigEmpty/Web.config b/csharp/ql/test/library-tests/overlay/base/web.unchanged.config
similarity index 73%
rename from csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/ConfigEmpty/Web.config
rename to csharp/ql/test/library-tests/overlay/base/web.unchanged.config
index 96fd10c05b7..e4dc561c53f 100644
--- a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/ConfigEmpty/Web.config	
+++ b/csharp/ql/test/library-tests/overlay/base/web.unchanged.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
   <system.web>
-    <httpCookies />
+    <httpCookies requireSSL="true"/>
   </system.web>
 </configuration>
diff --git a/csharp/ql/test/library-tests/overlay/codeql-test.yml b/csharp/ql/test/library-tests/overlay/codeql-test.yml
new file mode 100644
index 00000000000..59ca317af6f
--- /dev/null
+++ b/csharp/ql/test/library-tests/overlay/codeql-test.yml
@@ -0,0 +1,3 @@
+overlay:
+  base: "base/"
+  overlay: "overlay/"
diff --git a/csharp/ql/test/library-tests/overlay/options b/csharp/ql/test/library-tests/overlay/options
new file mode 100644
index 00000000000..7ba3811b2af
--- /dev/null
+++ b/csharp/ql/test/library-tests/overlay/options
@@ -0,0 +1 @@
+semmle-extractor-options: --standalone
diff --git a/csharp/ql/test/library-tests/overlay/overlay/A.cs b/csharp/ql/test/library-tests/overlay/overlay/A.cs
new file mode 100644
index 00000000000..7955f810bd8
--- /dev/null
+++ b/csharp/ql/test/library-tests/overlay/overlay/A.cs
@@ -0,0 +1,70 @@
+using System;
+
+namespace ConsoleApp1
+{
+    public class C { }
+
+    public class A
+    {
+        private string name;
+        public A(string x)
+        {
+            name = x;
+        }
+
+        // Destructor
+        ~A()
+        {
+            Console.WriteLine("Destructor called!");
+        }
+
+        public string Prop { get; set; } = "Hello";
+
+        public object this[int i]
+        {
+            get { return new object(); }
+            set { }
+        }
+
+        /*
+         * An example event
+         */
+        public event EventHandler Clicked
+        {
+            add
+            {
+                Console.WriteLine("Handler added");
+            }
+            remove
+            {
+                Console.WriteLine("Handler removed");
+            }
+        }
+
+        public static A operator +(A a, A b)
+        {
+            return a;
+        }
+
+        [MyObsolete]
+        public void ObsoleteMethod() { }
+
+
+        public override string ToString()
+        {
+            string y;
+            y = $"Name: {name}";
+            return y;
+        }
+
+        public void NewMethod()
+        {
+            if (name.EndsWith("test"))
+            {
+                name = name.ToUpper();
+            }
+        }
+    }
+
+    public class MyObsoleteAttribute : Attribute { }
+}
diff --git a/csharp/ql/test/library-tests/overlay/overlay/Program.cs b/csharp/ql/test/library-tests/overlay/overlay/Program.cs
new file mode 100644
index 00000000000..bc57d682a26
--- /dev/null
+++ b/csharp/ql/test/library-tests/overlay/overlay/Program.cs
@@ -0,0 +1,65 @@
+using System;
+
+namespace ConsoleApp1
+{
+    internal class Program
+    {
+        public static void Main(string[] args)
+        {
+            if (args.Length == 0)
+            {
+                Console.WriteLine("Print usage instructions here.");
+                return;
+            }
+            var x = args[0];
+            var a = new A(x);
+            Console.WriteLine(a.ToString());
+        }
+
+        private string programName;
+
+        public Program(string x)
+        {
+            programName = x;
+        }
+
+        // Program destructor
+        ~Program()
+        {
+            Console.WriteLine("Program destructor called!");
+        }
+
+        public string ProgramProp { get; set; } = "Hello World!";
+
+        public string this[int i]
+        {
+            get { return string.Empty; }
+            set { }
+        }
+
+        /*
+         * A program event.
+         */
+        public event EventHandler ProgramClicked
+        {
+            add
+            {
+                Console.WriteLine("Program handler added");
+            }
+            remove
+            {
+                Console.WriteLine("Program handler removed");
+            }
+        }
+
+        public static Program operator -(Program a, Program b)
+        {
+            return b;
+        }
+
+        [Program]
+        public void AnnotatedMethod() { }
+    }
+
+    public class ProgramAttribute : Attribute { }
+}
diff --git a/csharp/ql/test/library-tests/overlay/overlay/options b/csharp/ql/test/library-tests/overlay/overlay/options
new file mode 100644
index 00000000000..7ba3811b2af
--- /dev/null
+++ b/csharp/ql/test/library-tests/overlay/overlay/options
@@ -0,0 +1 @@
+semmle-extractor-options: --standalone
diff --git a/csharp/ql/test/library-tests/overlay/overlay/test.expected b/csharp/ql/test/library-tests/overlay/overlay/test.expected
new file mode 100644
index 00000000000..d9d4d0ec6fe
--- /dev/null
+++ b/csharp/ql/test/library-tests/overlay/overlay/test.expected
@@ -0,0 +1,274 @@
+expressions
+| A.cs:5:18:5:18 | call to constructor Object |
+| A.cs:10:16:10:16 | call to constructor Object |
+| A.cs:12:13:12:16 | access to field name |
+| A.cs:12:13:12:16 | this access |
+| A.cs:12:13:12:20 | ... = ... |
+| A.cs:12:20:12:20 | access to parameter x |
+| A.cs:18:13:18:19 | access to type Console |
+| A.cs:18:13:18:51 | call to method WriteLine |
+| A.cs:18:31:18:50 | "Destructor called!" |
+| A.cs:21:23:21:26 | access to property Prop |
+| A.cs:21:23:21:26 | this access |
+| A.cs:21:42:21:50 | ... = ... |
+| A.cs:21:44:21:50 | "Hello" |
+| A.cs:25:26:25:37 | object creation of type Object |
+| A.cs:36:17:36:23 | access to type Console |
+| A.cs:36:17:36:50 | call to method WriteLine |
+| A.cs:36:35:36:49 | "Handler added" |
+| A.cs:40:17:40:23 | access to type Console |
+| A.cs:40:17:40:52 | call to method WriteLine |
+| A.cs:40:35:40:51 | "Handler removed" |
+| A.cs:46:20:46:20 | access to parameter a |
+| A.cs:55:20:55:20 | String y |
+| A.cs:56:13:56:13 | access to local variable y |
+| A.cs:56:13:56:31 | ... = ... |
+| A.cs:56:17:56:31 | $"..." |
+| A.cs:56:19:56:24 | "Name: " |
+| A.cs:56:25:56:30 | {...} |
+| A.cs:56:26:56:29 | access to field name |
+| A.cs:56:26:56:29 | this access |
+| A.cs:57:20:57:20 | access to local variable y |
+| A.cs:62:17:62:20 | access to field name |
+| A.cs:62:17:62:20 | this access |
+| A.cs:62:17:62:37 | call to method EndsWith |
+| A.cs:62:31:62:36 | "test" |
+| A.cs:64:17:64:20 | access to field name |
+| A.cs:64:17:64:20 | this access |
+| A.cs:64:17:64:37 | ... = ... |
+| A.cs:64:24:64:27 | access to field name |
+| A.cs:64:24:64:27 | this access |
+| A.cs:64:24:64:37 | call to method ToUpper |
+| A.cs:69:18:69:36 | call to constructor Attribute |
+| Program.cs:9:17:9:20 | access to parameter args |
+| Program.cs:9:17:9:27 | access to property Length |
+| Program.cs:9:17:9:32 | ... == ... |
+| Program.cs:9:32:9:32 | 0 |
+| Program.cs:11:17:11:23 | access to type Console |
+| Program.cs:11:17:11:67 | call to method WriteLine |
+| Program.cs:11:35:11:66 | "Print usage instructions here." |
+| Program.cs:14:17:14:17 | access to local variable x |
+| Program.cs:14:17:14:27 | String x = ... |
+| Program.cs:14:21:14:24 | access to parameter args |
+| Program.cs:14:21:14:27 | access to array element |
+| Program.cs:14:26:14:26 | 0 |
+| Program.cs:15:17:15:17 | access to local variable a |
+| Program.cs:15:17:15:28 | A a = ... |
+| Program.cs:15:21:15:28 | object creation of type A |
+| Program.cs:15:27:15:27 | access to local variable x |
+| Program.cs:16:13:16:19 | access to type Console |
+| Program.cs:16:13:16:43 | call to method WriteLine |
+| Program.cs:16:31:16:31 | access to local variable a |
+| Program.cs:16:31:16:42 | call to method ToString |
+| Program.cs:21:16:21:22 | call to constructor Object |
+| Program.cs:23:13:23:23 | access to field programName |
+| Program.cs:23:13:23:23 | this access |
+| Program.cs:23:13:23:27 | ... = ... |
+| Program.cs:23:27:23:27 | access to parameter x |
+| Program.cs:29:13:29:19 | access to type Console |
+| Program.cs:29:13:29:59 | call to method WriteLine |
+| Program.cs:29:31:29:58 | "Program destructor called!" |
+| Program.cs:32:23:32:33 | access to property ProgramProp |
+| Program.cs:32:23:32:33 | this access |
+| Program.cs:32:49:32:64 | ... = ... |
+| Program.cs:32:51:32:64 | "Hello World!" |
+| Program.cs:36:26:36:31 | access to type String |
+| Program.cs:36:26:36:37 | access to field Empty |
+| Program.cs:47:17:47:23 | access to type Console |
+| Program.cs:47:17:47:58 | call to method WriteLine |
+| Program.cs:47:35:47:57 | "Program handler added" |
+| Program.cs:51:17:51:23 | access to type Console |
+| Program.cs:51:17:51:60 | call to method WriteLine |
+| Program.cs:51:35:51:59 | "Program handler removed" |
+| Program.cs:57:20:57:20 | access to parameter b |
+| Program.cs:64:18:64:33 | call to constructor Attribute |
+statements
+| A.cs:5:18:5:18 | {...} |
+| A.cs:11:9:13:9 | {...} |
+| A.cs:12:13:12:21 | ...; |
+| A.cs:17:9:19:9 | {...} |
+| A.cs:18:13:18:52 | ...; |
+| A.cs:25:17:25:40 | {...} |
+| A.cs:25:19:25:38 | return ...; |
+| A.cs:26:17:26:19 | {...} |
+| A.cs:35:13:37:13 | {...} |
+| A.cs:36:17:36:51 | ...; |
+| A.cs:39:13:41:13 | {...} |
+| A.cs:40:17:40:53 | ...; |
+| A.cs:45:9:47:9 | {...} |
+| A.cs:46:13:46:21 | return ...; |
+| A.cs:50:38:50:40 | {...} |
+| A.cs:54:9:58:9 | {...} |
+| A.cs:55:13:55:21 | ... ...; |
+| A.cs:56:13:56:32 | ...; |
+| A.cs:57:13:57:21 | return ...; |
+| A.cs:61:9:66:9 | {...} |
+| A.cs:62:13:65:13 | if (...) ... |
+| A.cs:63:13:65:13 | {...} |
+| A.cs:64:17:64:38 | ...; |
+| A.cs:69:18:69:36 | {...} |
+| Program.cs:8:9:17:9 | {...} |
+| Program.cs:9:13:13:13 | if (...) ... |
+| Program.cs:10:13:13:13 | {...} |
+| Program.cs:11:17:11:68 | ...; |
+| Program.cs:12:17:12:23 | return ...; |
+| Program.cs:14:13:14:28 | ... ...; |
+| Program.cs:15:13:15:29 | ... ...; |
+| Program.cs:16:13:16:44 | ...; |
+| Program.cs:22:9:24:9 | {...} |
+| Program.cs:23:13:23:28 | ...; |
+| Program.cs:28:9:30:9 | {...} |
+| Program.cs:29:13:29:60 | ...; |
+| Program.cs:36:17:36:40 | {...} |
+| Program.cs:36:19:36:38 | return ...; |
+| Program.cs:37:17:37:19 | {...} |
+| Program.cs:46:13:48:13 | {...} |
+| Program.cs:47:17:47:59 | ...; |
+| Program.cs:50:13:52:13 | {...} |
+| Program.cs:51:17:51:61 | ...; |
+| Program.cs:56:9:58:9 | {...} |
+| Program.cs:57:13:57:21 | return ...; |
+| Program.cs:61:39:61:41 | {...} |
+| Program.cs:64:18:64:33 | {...} |
+methods
+| A.cs:50:21:50:34 | ObsoleteMethod |
+| A.cs:53:32:53:39 | ToString |
+| A.cs:60:21:60:29 | NewMethod |
+| Program.cs:7:28:7:31 | Main |
+| Program.cs:61:21:61:35 | AnnotatedMethod |
+types
+| A.cs:5:18:5:18 | C |
+| A.cs:7:18:7:18 | A |
+| A.cs:69:18:69:36 | MyObsoleteAttribute |
+| Program.cs:5:20:5:26 | Program |
+| Program.cs:64:18:64:33 | ProgramAttribute |
+parameters
+| A.cs:10:25:10:25 | x |
+| A.cs:21:35:21:37 | value |
+| A.cs:23:32:23:32 | i |
+| A.cs:23:32:23:32 | i |
+| A.cs:23:32:23:32 | i |
+| A.cs:26:13:26:15 | value |
+| A.cs:34:13:34:15 | value |
+| A.cs:38:13:38:18 | value |
+| A.cs:44:38:44:38 | a |
+| A.cs:44:43:44:43 | b |
+| Program.cs:7:42:7:45 | args |
+| Program.cs:21:31:21:31 | x |
+| Program.cs:32:42:32:44 | value |
+| Program.cs:34:32:34:32 | i |
+| Program.cs:34:32:34:32 | i |
+| Program.cs:34:32:34:32 | i |
+| Program.cs:37:13:37:15 | value |
+| Program.cs:45:13:45:15 | value |
+| Program.cs:49:13:49:18 | value |
+| Program.cs:55:50:55:50 | a |
+| Program.cs:55:61:55:61 | b |
+operators
+| A.cs:44:34:44:34 | + |
+| Program.cs:55:40:55:40 | - |
+constructors
+| A.cs:10:16:10:16 | A |
+| Program.cs:21:16:21:22 | Program |
+destructors
+| A.cs:16:10:16:10 | ~A |
+| Program.cs:27:10:27:16 | ~Program |
+fields
+| A.cs:9:24:9:27 | name |
+| Program.cs:19:24:19:34 | programName |
+properties
+| A.cs:21:23:21:26 | Prop |
+| Program.cs:32:23:32:33 | ProgramProp |
+indexers
+| A.cs:23:23:23:26 | Item |
+| Program.cs:34:23:34:26 | Item |
+accessors
+| A.cs:21:30:21:32 | get_Prop |
+| A.cs:21:35:21:37 | set_Prop |
+| A.cs:25:13:25:15 | get_Item |
+| A.cs:26:13:26:15 | set_Item |
+| A.cs:34:13:34:15 | add_Clicked |
+| A.cs:38:13:38:18 | remove_Clicked |
+| Program.cs:32:37:32:39 | get_ProgramProp |
+| Program.cs:32:42:32:44 | set_ProgramProp |
+| Program.cs:36:13:36:15 | get_Item |
+| Program.cs:37:13:37:15 | set_Item |
+| Program.cs:45:13:45:15 | add_ProgramClicked |
+| Program.cs:49:13:49:18 | remove_ProgramClicked |
+attributes
+| A.cs:49:10:49:19 | [MyObsolete(...)] |
+| Program.cs:60:10:60:16 | [Program(...)] |
+events
+| A.cs:32:35:32:41 | Clicked |
+| Program.cs:43:35:43:48 | ProgramClicked |
+eventAccessors
+| A.cs:34:13:34:15 | add_Clicked |
+| A.cs:38:13:38:18 | remove_Clicked |
+| Program.cs:45:13:45:15 | add_ProgramClicked |
+| Program.cs:49:13:49:18 | remove_ProgramClicked |
+usingDirectives
+| A.cs:1:1:1:13 | using ...; |
+| Program.cs:1:1:1:13 | using ...; |
+commentLines
+| A.cs:15:9:15:21 | // ... |
+| A.cs:29:9:29:10 | /* ... */ |
+| A.cs:30:1:30:27 | /* ... */ |
+| A.cs:31:1:31:11 | /* ... */ |
+| Program.cs:26:9:26:29 | // ... |
+| Program.cs:40:9:40:10 | /* ... */ |
+| Program.cs:41:1:41:27 | /* ... */ |
+| Program.cs:42:1:42:11 | /* ... */ |
+commentBlocks
+| A.cs:15:9:15:21 | // ... |
+| A.cs:29:9:31:11 | /* ... */ |
+| Program.cs:26:9:26:29 | // ... |
+| Program.cs:40:9:42:11 | /* ... */ |
+typeMentions
+| A.cs:9:17:9:22 | String |
+| A.cs:10:18:10:23 | String |
+| A.cs:18:13:18:19 | Console |
+| A.cs:21:16:21:21 | String |
+| A.cs:23:16:23:21 | Object |
+| A.cs:23:28:23:30 | Int32 |
+| A.cs:25:30:25:35 | Object |
+| A.cs:36:17:36:23 | Console |
+| A.cs:40:17:40:23 | Console |
+| A.cs:44:23:44:23 | A |
+| A.cs:44:36:44:36 | A |
+| A.cs:44:41:44:41 | A |
+| A.cs:49:10:49:19 | MyObsoleteAttribute |
+| A.cs:50:16:50:19 | Void |
+| A.cs:53:25:53:30 | String |
+| A.cs:55:13:55:18 | String |
+| A.cs:60:16:60:19 | Void |
+| A.cs:69:40:69:48 | Attribute |
+| Program.cs:7:23:7:26 | Void |
+| Program.cs:7:33:7:38 | String |
+| Program.cs:7:33:7:40 | String[] |
+| Program.cs:11:17:11:23 | Console |
+| Program.cs:14:13:14:15 | String |
+| Program.cs:15:13:15:15 | A |
+| Program.cs:15:25:15:25 | A |
+| Program.cs:16:13:16:19 | Console |
+| Program.cs:19:17:19:22 | String |
+| Program.cs:21:24:21:29 | String |
+| Program.cs:29:13:29:19 | Console |
+| Program.cs:32:16:32:21 | String |
+| Program.cs:34:16:34:21 | String |
+| Program.cs:34:28:34:30 | Int32 |
+| Program.cs:36:26:36:31 | String |
+| Program.cs:47:17:47:23 | Console |
+| Program.cs:51:17:51:23 | Console |
+| Program.cs:55:23:55:29 | Program |
+| Program.cs:55:42:55:48 | Program |
+| Program.cs:55:53:55:59 | Program |
+| Program.cs:60:10:60:16 | ProgramAttribute |
+| Program.cs:61:16:61:19 | Void |
+| Program.cs:64:37:64:45 | Attribute |
+xmlLocatables
+| web.changed.config:2:1:5:17 | configuration |
+| web.changed.config:3:3:4:16 | system.web |
+| web.unchanged.config:2:1:6:17 | configuration |
+| web.unchanged.config:3:3:5:16 | system.web |
+| web.unchanged.config:4:5:4:37 | httpCookies |
+| web.unchanged.config:4:5:4:37 | requireSSL=true |
diff --git a/csharp/ql/test/library-tests/overlay/overlay/test.qlref b/csharp/ql/test/library-tests/overlay/overlay/test.qlref
new file mode 100644
index 00000000000..bbce8f8b98d
--- /dev/null
+++ b/csharp/ql/test/library-tests/overlay/overlay/test.qlref
@@ -0,0 +1 @@
+query: ../test.ql
diff --git a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLFalseSystemWeb/Web.config b/csharp/ql/test/library-tests/overlay/overlay/web.changed.config
similarity index 83%
rename from csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLFalseSystemWeb/Web.config
rename to csharp/ql/test/library-tests/overlay/overlay/web.changed.config
index 96fd10c05b7..8f0b996a024 100644
--- a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLFalseSystemWeb/Web.config	
+++ b/csharp/ql/test/library-tests/overlay/overlay/web.changed.config
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
   <system.web>
-    <httpCookies />
   </system.web>
 </configuration>
diff --git a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/ConfigFalse/Web.config b/csharp/ql/test/library-tests/overlay/overlay/web.unchanged.config
similarity index 72%
rename from csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/ConfigFalse/Web.config
rename to csharp/ql/test/library-tests/overlay/overlay/web.unchanged.config
index ec7b88761ca..e4dc561c53f 100644
--- a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/ConfigFalse/Web.config	
+++ b/csharp/ql/test/library-tests/overlay/overlay/web.unchanged.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
   <system.web>
-    <httpCookies requireSSL="false" />
+    <httpCookies requireSSL="true"/>
   </system.web>
 </configuration>
diff --git a/csharp/ql/test/library-tests/overlay/test.ql b/csharp/ql/test/library-tests/overlay/test.ql
new file mode 100644
index 00000000000..91f3c6a3aab
--- /dev/null
+++ b/csharp/ql/test/library-tests/overlay/test.ql
@@ -0,0 +1,41 @@
+import csharp
+
+query predicate expressions(Expr e) { e.fromSource() }
+
+query predicate statements(Stmt s) { s.fromSource() }
+
+query predicate methods(Method m) { m.fromSource() }
+
+query predicate types(Type t) { t.fromSource() }
+
+query predicate parameters(Parameter p) { p.fromSource() }
+
+query predicate operators(Operator o) { o.fromSource() }
+
+query predicate constructors(Constructor c) { c.fromSource() }
+
+query predicate destructors(Destructor d) { d.fromSource() }
+
+query predicate fields(Field f) { f.fromSource() }
+
+query predicate properties(Property p) { p.fromSource() }
+
+query predicate indexers(Indexer i) { i.fromSource() }
+
+query predicate accessors(Accessor a) { a.fromSource() }
+
+query predicate attributes(Attribute a) { a.fromSource() }
+
+query predicate events(Event ev) { ev.fromSource() }
+
+query predicate eventAccessors(EventAccessor ea) { ea.fromSource() }
+
+query predicate usingDirectives(UsingDirective ud) { ud.fromSource() }
+
+query predicate commentLines(CommentLine cl) { any() }
+
+query predicate commentBlocks(CommentBlock cb) { any() }
+
+query predicate typeMentions(TypeMention tm) { any() }
+
+query predicate xmlLocatables(XmlLocatable xl) { any() }
diff --git a/csharp/ql/test/library-tests/overlay/testlocations.expected b/csharp/ql/test/library-tests/overlay/testlocations.expected
new file mode 100644
index 00000000000..28715da9ee9
--- /dev/null
+++ b/csharp/ql/test/library-tests/overlay/testlocations.expected
@@ -0,0 +1,5 @@
+elementsWithMultipleSourceLocations
+typeMentionsWithMultipleSourceLocations
+commentLinesWithMultipleSourceLocations
+commentBlocksWithMultipleSourceLocations
+removedEntities
diff --git a/csharp/ql/test/library-tests/overlay/testlocations.ql b/csharp/ql/test/library-tests/overlay/testlocations.ql
new file mode 100644
index 00000000000..24aaeda218c
--- /dev/null
+++ b/csharp/ql/test/library-tests/overlay/testlocations.ql
@@ -0,0 +1,29 @@
+import csharp
+
+// This is a consistency check that the overlay mechanism for cleaning up locations
+// works correctly.
+query predicate elementsWithMultipleSourceLocations(Element e, SourceLocation loc) {
+  e.fromSource() and
+  not e instanceof Namespace and
+  strictcount(SourceLocation l0 | l0 = e.getALocation()) > 1 and
+  loc = e.getALocation()
+}
+
+query predicate typeMentionsWithMultipleSourceLocations(TypeMention tm, SourceLocation loc) {
+  strictcount(SourceLocation l0 | l0 = tm.getLocation()) > 1 and
+  loc = tm.getLocation()
+}
+
+query predicate commentLinesWithMultipleSourceLocations(CommentLine cl, SourceLocation loc) {
+  strictcount(SourceLocation l0 | l0 = cl.getLocation()) > 1 and
+  loc = cl.getLocation()
+}
+
+query predicate commentBlocksWithMultipleSourceLocations(CommentBlock cb, SourceLocation loc) {
+  strictcount(SourceLocation l0 | l0 = cb.getLocation()) > 1 and
+  loc = cb.getLocation()
+}
+
+// This is a consistency check that the entities that are removed as a part of
+// the changes in the overlay are indeed removed from the database.
+query predicate removedEntities(Element e) { e.(Method).getName() = "OldMethod" }
diff --git a/csharp/ql/test/library-tests/partial/Partial1.expected b/csharp/ql/test/library-tests/partial/Partial1.expected
index af7be135914..55dcaabcea7 100644
--- a/csharp/ql/test/library-tests/partial/Partial1.expected
+++ b/csharp/ql/test/library-tests/partial/Partial1.expected
@@ -10,3 +10,5 @@
 | Partial.cs:28:9:28:11 | set_Item |
 | Partial.cs:32:15:32:33 | OnePartPartialClass |
 | Partial.cs:34:18:34:42 | PartialMethodWithoutBody2 |
+| PartialMultipleFiles1.cs:1:22:1:41 | PartialMultipleFiles |
+| PartialMultipleFiles2.cs:1:22:1:41 | PartialMultipleFiles |
diff --git a/csharp/ql/test/library-tests/partial/PartialConstructors.expected b/csharp/ql/test/library-tests/partial/PartialConstructors.expected
new file mode 100644
index 00000000000..01779f1b81e
--- /dev/null
+++ b/csharp/ql/test/library-tests/partial/PartialConstructors.expected
@@ -0,0 +1,4 @@
+| Partial.cs:1:15:1:26 | TwoPartClass | Partial.cs:1:15:1:26 | {...} |
+| Partial.cs:32:15:32:33 | OnePartPartialClass | Partial.cs:32:15:32:33 | {...} |
+| Partial.cs:38:7:38:21 | NonPartialClass | Partial.cs:38:7:38:21 | {...} |
+| PartialMultipleFiles1.cs:1:22:1:41 | PartialMultipleFiles | PartialMultipleFiles1.cs:1:22:1:41 | {...} |
diff --git a/csharp/ql/test/library-tests/partial/PartialConstructors.ql b/csharp/ql/test/library-tests/partial/PartialConstructors.ql
new file mode 100644
index 00000000000..049de629085
--- /dev/null
+++ b/csharp/ql/test/library-tests/partial/PartialConstructors.ql
@@ -0,0 +1,5 @@
+import csharp
+
+from Constructor c
+where c.getDeclaringType().fromSource()
+select c, c.getBody()
diff --git a/csharp/ql/test/library-tests/partial/PartialMultipleFiles1.cs b/csharp/ql/test/library-tests/partial/PartialMultipleFiles1.cs
new file mode 100644
index 00000000000..6f9471f19ca
--- /dev/null
+++ b/csharp/ql/test/library-tests/partial/PartialMultipleFiles1.cs
@@ -0,0 +1 @@
+public partial class PartialMultipleFiles { }
diff --git a/csharp/ql/test/library-tests/partial/PartialMultipleFiles2.cs b/csharp/ql/test/library-tests/partial/PartialMultipleFiles2.cs
new file mode 100644
index 00000000000..6f9471f19ca
--- /dev/null
+++ b/csharp/ql/test/library-tests/partial/PartialMultipleFiles2.cs
@@ -0,0 +1 @@
+public partial class PartialMultipleFiles { }
diff --git a/csharp/ql/test/library-tests/partial/PrintAst.expected b/csharp/ql/test/library-tests/partial/PrintAst.expected
index 8d9da42fc11..d97f6fc01f0 100644
--- a/csharp/ql/test/library-tests/partial/PrintAst.expected
+++ b/csharp/ql/test/library-tests/partial/PrintAst.expected
@@ -89,3 +89,7 @@ Partial.cs:
 #   42|         0: [Parameter] index
 #   45|         1: [Parameter] value
 #   45|       4: [BlockStmt] {...}
+PartialMultipleFiles1.cs:
+#    1| [Class] PartialMultipleFiles
+PartialMultipleFiles2.cs:
+#    1| [Class] PartialMultipleFiles
diff --git a/csharp/ql/test/library-tests/tainttracking/collections/CollectionTaintTracking.cs b/csharp/ql/test/library-tests/tainttracking/collections/CollectionTaintTracking.cs
new file mode 100644
index 00000000000..d4177a57661
--- /dev/null
+++ b/csharp/ql/test/library-tests/tainttracking/collections/CollectionTaintTracking.cs
@@ -0,0 +1,13 @@
+public class CollectionTaintTracking
+{
+    public void ImplicitCollectionReadAtSink()
+    {
+        var tainted = Source<object>(1);
+        var arr = new object[] { tainted };
+        Sink(arr); // $ hasTaintFlow=1
+    }
+
+    static T Source<T>(object source) => throw null;
+
+    public static void Sink<T>(T t) { }
+}
diff --git a/csharp/ql/test/library-tests/tainttracking/collections/CollectionTaintTracking.expected b/csharp/ql/test/library-tests/tainttracking/collections/CollectionTaintTracking.expected
new file mode 100644
index 00000000000..6d93e7f5ef9
--- /dev/null
+++ b/csharp/ql/test/library-tests/tainttracking/collections/CollectionTaintTracking.expected
@@ -0,0 +1,18 @@
+models
+edges
+| CollectionTaintTracking.cs:5:13:5:19 | access to local variable tainted : Object | CollectionTaintTracking.cs:6:34:6:40 | access to local variable tainted : Object | provenance |  |
+| CollectionTaintTracking.cs:5:23:5:39 | call to method Source<Object> : Object | CollectionTaintTracking.cs:5:13:5:19 | access to local variable tainted : Object | provenance |  |
+| CollectionTaintTracking.cs:6:13:6:15 | access to local variable arr : null [element] : Object | CollectionTaintTracking.cs:7:14:7:16 | access to local variable arr | provenance |  |
+| CollectionTaintTracking.cs:6:32:6:42 | { ..., ... } : null [element] : Object | CollectionTaintTracking.cs:6:13:6:15 | access to local variable arr : null [element] : Object | provenance |  |
+| CollectionTaintTracking.cs:6:34:6:40 | access to local variable tainted : Object | CollectionTaintTracking.cs:6:32:6:42 | { ..., ... } : null [element] : Object | provenance |  |
+nodes
+| CollectionTaintTracking.cs:5:13:5:19 | access to local variable tainted : Object | semmle.label | access to local variable tainted : Object |
+| CollectionTaintTracking.cs:5:23:5:39 | call to method Source<Object> : Object | semmle.label | call to method Source<Object> : Object |
+| CollectionTaintTracking.cs:6:13:6:15 | access to local variable arr : null [element] : Object | semmle.label | access to local variable arr : null [element] : Object |
+| CollectionTaintTracking.cs:6:32:6:42 | { ..., ... } : null [element] : Object | semmle.label | { ..., ... } : null [element] : Object |
+| CollectionTaintTracking.cs:6:34:6:40 | access to local variable tainted : Object | semmle.label | access to local variable tainted : Object |
+| CollectionTaintTracking.cs:7:14:7:16 | access to local variable arr | semmle.label | access to local variable arr |
+subpaths
+testFailures
+#select
+| CollectionTaintTracking.cs:7:14:7:16 | access to local variable arr | CollectionTaintTracking.cs:5:23:5:39 | call to method Source<Object> : Object | CollectionTaintTracking.cs:7:14:7:16 | access to local variable arr | $@ | CollectionTaintTracking.cs:5:23:5:39 | call to method Source<Object> : Object | call to method Source<Object> : Object |
diff --git a/csharp/ql/test/library-tests/tainttracking/collections/CollectionTaintTracking.ql b/csharp/ql/test/library-tests/tainttracking/collections/CollectionTaintTracking.ql
new file mode 100644
index 00000000000..0af8971a13b
--- /dev/null
+++ b/csharp/ql/test/library-tests/tainttracking/collections/CollectionTaintTracking.ql
@@ -0,0 +1,12 @@
+/**
+ * @kind path-problem
+ */
+
+import csharp
+import utils.test.InlineFlowTest
+import TaintFlowTest<DefaultFlowConfig>
+import PathGraph
+
+from PathNode source, PathNode sink
+where flowPath(source, sink)
+select sink, source, sink, "$@", source, source.toString()
diff --git a/csharp/ql/test/library-tests/tainttracking/collections/options b/csharp/ql/test/library-tests/tainttracking/collections/options
new file mode 100644
index 00000000000..75c39b4541b
--- /dev/null
+++ b/csharp/ql/test/library-tests/tainttracking/collections/options
@@ -0,0 +1,2 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj
diff --git a/csharp/ql/test/query-tests/API Abuse/FormatInvalid/FormatInvalid.expected b/csharp/ql/test/query-tests/API Abuse/FormatInvalid/FormatInvalid.expected
index a33793ae461..30cb9112c3d 100644
--- a/csharp/ql/test/query-tests/API Abuse/FormatInvalid/FormatInvalid.expected	
+++ b/csharp/ql/test/query-tests/API Abuse/FormatInvalid/FormatInvalid.expected	
@@ -40,7 +40,7 @@
 | FormatInvalid.cs:111:23:111:25 | "}" | FormatInvalid.cs:111:23:111:25 | "}" | FormatInvalid.cs:111:23:111:25 | "}" | Invalid format string used in $@ formatting call. | FormatInvalid.cs:111:9:111:32 | call to method Write | this | FormatInvalid.cs:111:9:111:32 | call to method Write | this |
 | FormatInvalid.cs:112:23:112:25 | "}" | FormatInvalid.cs:112:23:112:25 | "}" | FormatInvalid.cs:112:23:112:25 | "}" | Invalid format string used in $@ formatting call. | FormatInvalid.cs:112:9:112:35 | call to method Write | this | FormatInvalid.cs:112:9:112:35 | call to method Write | this |
 | FormatInvalid.cs:113:23:113:25 | "}" | FormatInvalid.cs:113:23:113:25 | "}" | FormatInvalid.cs:113:23:113:25 | "}" | Invalid format string used in $@ formatting call. | FormatInvalid.cs:113:9:113:38 | call to method Write | this | FormatInvalid.cs:113:9:113:38 | call to method Write | this |
-| FormatInvalid.cs:118:56:118:58 | "}" | FormatInvalid.cs:118:56:118:58 | [assertion success] "}" | FormatInvalid.cs:118:56:118:58 | [assertion success] "}" | Invalid format string used in $@ formatting call. | FormatInvalid.cs:118:9:118:63 | call to method Assert | this | FormatInvalid.cs:118:9:118:63 | call to method Assert | this |
+| FormatInvalid.cs:118:56:118:58 | "}" | FormatInvalid.cs:118:56:118:58 | "}" | FormatInvalid.cs:118:56:118:58 | "}" | Invalid format string used in $@ formatting call. | FormatInvalid.cs:118:9:118:63 | call to method Assert | this | FormatInvalid.cs:118:9:118:63 | call to method Assert | this |
 | FormatInvalid.cs:119:18:119:20 | "}" | FormatInvalid.cs:119:18:119:20 | "}" | FormatInvalid.cs:119:18:119:20 | "}" | Invalid format string used in $@ formatting call. | FormatInvalid.cs:119:9:119:24 | call to method Write | this | FormatInvalid.cs:119:9:119:24 | call to method Write | this |
 | FormatInvalid.cs:120:40:120:42 | "}" | FormatInvalid.cs:120:40:120:42 | "}" | FormatInvalid.cs:120:40:120:42 | "}" | Invalid format string used in $@ formatting call. | FormatInvalid.cs:120:9:120:47 | call to method Print | this | FormatInvalid.cs:120:9:120:47 | call to method Print | this |
 | FormatInvalid.cs:140:44:140:46 | "}" | FormatInvalid.cs:140:44:140:46 | "}" | FormatInvalid.cs:140:44:140:46 | "}" | Invalid format string used in $@ formatting call. | FormatInvalid.cs:140:22:140:47 | call to method Parse | this | FormatInvalid.cs:140:22:140:47 | call to method Parse | this |
@@ -264,8 +264,8 @@ nodes
 | FormatInvalid.cs:112:23:112:25 | "}" | semmle.label | "}" |
 | FormatInvalid.cs:113:23:113:25 | "}" | semmle.label | "}" |
 | FormatInvalid.cs:113:23:113:25 | "}" | semmle.label | "}" |
-| FormatInvalid.cs:118:56:118:58 | [assertion success] "}" | semmle.label | [assertion success] "}" |
-| FormatInvalid.cs:118:56:118:58 | [assertion success] "}" | semmle.label | [assertion success] "}" |
+| FormatInvalid.cs:118:56:118:58 | "}" | semmle.label | "}" |
+| FormatInvalid.cs:118:56:118:58 | "}" | semmle.label | "}" |
 | FormatInvalid.cs:119:18:119:20 | "}" | semmle.label | "}" |
 | FormatInvalid.cs:119:18:119:20 | "}" | semmle.label | "}" |
 | FormatInvalid.cs:120:40:120:42 | "}" | semmle.label | "}" |
diff --git a/csharp/ql/test/query-tests/Bad Practices/Control-Flow/ConstantCondition/ConstantCondition.expected b/csharp/ql/test/query-tests/Bad Practices/Control-Flow/ConstantCondition/ConstantCondition.expected
index e154d10b9d3..fc310e53fde 100644
--- a/csharp/ql/test/query-tests/Bad Practices/Control-Flow/ConstantCondition/ConstantCondition.expected	
+++ b/csharp/ql/test/query-tests/Bad Practices/Control-Flow/ConstantCondition/ConstantCondition.expected	
@@ -1,31 +1,31 @@
-| ConstantCondition.cs:38:18:38:29 | (...) ... | Expression is always 'null'. |
-| ConstantCondition.cs:39:18:39:24 | (...) ... | Expression is never 'null'. |
-| ConstantCondition.cs:46:17:46:26 | (...) ... | Expression is always 'null'. |
-| ConstantCondition.cs:47:17:47:18 | "" | Expression is never 'null'. |
-| ConstantCondition.cs:48:13:48:19 | (...) ... | Expression is never 'null'. |
-| ConstantCondition.cs:49:13:49:14 | "" | Expression is never 'null'. |
-| ConstantCondition.cs:62:18:62:18 | 2 | Pattern never matches. |
-| ConstantCondition.cs:64:18:64:18 | 3 | Pattern always matches. |
-| ConstantCondition.cs:75:18:75:20 | access to type Int32 | Pattern never matches. |
-| ConstantCondition.cs:95:13:95:13 | _ | Pattern always matches. |
-| ConstantCondition.cs:114:13:114:14 | access to parameter b1 | Condition always evaluates to 'true'. |
-| ConstantCondition.cs:114:19:114:20 | access to parameter b2 | Condition always evaluates to 'true'. |
-| ConstantCondition.cs:141:22:141:22 | _ | Pattern always matches. |
-| ConstantConditionBad.cs:5:16:5:20 | ... > ... | Condition always evaluates to 'false'. |
-| ConstantConditionalExpressionCondition.cs:11:22:11:34 | ... == ... | Condition always evaluates to 'true'. |
-| ConstantConditionalExpressionCondition.cs:12:21:12:25 | false | Condition always evaluates to 'false'. |
-| ConstantConditionalExpressionCondition.cs:13:21:13:30 | ... == ... | Condition always evaluates to 'true'. |
-| ConstantForCondition.cs:9:29:9:33 | false | Condition always evaluates to 'false'. |
-| ConstantForCondition.cs:11:29:11:34 | ... == ... | Condition always evaluates to 'false'. |
-| ConstantIfCondition.cs:11:17:11:29 | ... == ... | Condition always evaluates to 'true'. |
-| ConstantIfCondition.cs:14:17:14:21 | false | Condition always evaluates to 'false'. |
-| ConstantIfCondition.cs:17:17:17:26 | ... == ... | Condition always evaluates to 'true'. |
-| ConstantIsNullOrEmpty.cs:10:21:10:54 | call to method IsNullOrEmpty | Condition always evaluates to 'false'. |
-| ConstantIsNullOrEmpty.cs:46:21:46:46 | call to method IsNullOrEmpty | Condition always evaluates to 'true'. |
-| ConstantIsNullOrEmpty.cs:50:21:50:44 | call to method IsNullOrEmpty | Condition always evaluates to 'true'. |
-| ConstantIsNullOrEmpty.cs:54:21:54:45 | call to method IsNullOrEmpty | Condition always evaluates to 'false'. |
-| ConstantNullCoalescingLeftHandOperand.cs:11:24:11:34 | access to constant NULL_OBJECT | Expression is never 'null'. |
-| ConstantNullCoalescingLeftHandOperand.cs:12:24:12:27 | null | Expression is always 'null'. |
-| ConstantWhileCondition.cs:12:20:12:32 | ... == ... | Condition always evaluates to 'true'. |
-| ConstantWhileCondition.cs:16:20:16:24 | false | Condition always evaluates to 'false'. |
-| ConstantWhileCondition.cs:24:20:24:29 | ... == ... | Condition always evaluates to 'true'. |
+| ConstantCondition.cs:38:18:38:29 | (...) ... | Expression is always 'null'. | ConstantCondition.cs:38:18:38:29 | (...) ... | dummy |
+| ConstantCondition.cs:39:18:39:24 | (...) ... | Expression is never 'null'. | ConstantCondition.cs:39:18:39:24 | (...) ... | dummy |
+| ConstantCondition.cs:46:17:46:26 | (...) ... | Expression is always 'null'. | ConstantCondition.cs:46:17:46:26 | (...) ... | dummy |
+| ConstantCondition.cs:47:17:47:18 | "" | Expression is never 'null'. | ConstantCondition.cs:47:17:47:18 | "" | dummy |
+| ConstantCondition.cs:48:13:48:19 | (...) ... | Expression is never 'null'. | ConstantCondition.cs:48:13:48:19 | (...) ... | dummy |
+| ConstantCondition.cs:49:13:49:14 | "" | Expression is never 'null'. | ConstantCondition.cs:49:13:49:14 | "" | dummy |
+| ConstantCondition.cs:62:18:62:18 | 2 | Pattern never matches. | ConstantCondition.cs:62:18:62:18 | 2 | dummy |
+| ConstantCondition.cs:64:18:64:18 | 3 | Pattern always matches. | ConstantCondition.cs:64:18:64:18 | 3 | dummy |
+| ConstantCondition.cs:75:18:75:20 | access to type Int32 | Pattern never matches. | ConstantCondition.cs:75:18:75:20 | access to type Int32 | dummy |
+| ConstantCondition.cs:95:13:95:13 | _ | Pattern always matches. | ConstantCondition.cs:95:13:95:13 | _ | dummy |
+| ConstantCondition.cs:114:13:114:14 | access to parameter b1 | Condition is always true because of $@. | ConstantCondition.cs:110:14:110:15 | access to parameter b1 | access to parameter b1 |
+| ConstantCondition.cs:114:19:114:20 | access to parameter b2 | Condition is always true because of $@. | ConstantCondition.cs:112:14:112:15 | access to parameter b2 | access to parameter b2 |
+| ConstantCondition.cs:141:22:141:22 | _ | Pattern always matches. | ConstantCondition.cs:141:22:141:22 | _ | dummy |
+| ConstantConditionBad.cs:5:16:5:20 | ... > ... | Condition always evaluates to 'false'. | ConstantConditionBad.cs:5:16:5:20 | ... > ... | dummy |
+| ConstantConditionalExpressionCondition.cs:11:22:11:34 | ... == ... | Condition always evaluates to 'true'. | ConstantConditionalExpressionCondition.cs:11:22:11:34 | ... == ... | dummy |
+| ConstantConditionalExpressionCondition.cs:12:21:12:25 | false | Condition always evaluates to 'false'. | ConstantConditionalExpressionCondition.cs:12:21:12:25 | false | dummy |
+| ConstantConditionalExpressionCondition.cs:13:21:13:30 | ... == ... | Condition always evaluates to 'true'. | ConstantConditionalExpressionCondition.cs:13:21:13:30 | ... == ... | dummy |
+| ConstantForCondition.cs:9:29:9:33 | false | Condition always evaluates to 'false'. | ConstantForCondition.cs:9:29:9:33 | false | dummy |
+| ConstantForCondition.cs:11:29:11:34 | ... == ... | Condition always evaluates to 'false'. | ConstantForCondition.cs:11:29:11:34 | ... == ... | dummy |
+| ConstantIfCondition.cs:11:17:11:29 | ... == ... | Condition always evaluates to 'true'. | ConstantIfCondition.cs:11:17:11:29 | ... == ... | dummy |
+| ConstantIfCondition.cs:14:17:14:21 | false | Condition always evaluates to 'false'. | ConstantIfCondition.cs:14:17:14:21 | false | dummy |
+| ConstantIfCondition.cs:17:17:17:26 | ... == ... | Condition always evaluates to 'true'. | ConstantIfCondition.cs:17:17:17:26 | ... == ... | dummy |
+| ConstantIsNullOrEmpty.cs:10:21:10:54 | call to method IsNullOrEmpty | Condition always evaluates to 'false'. | ConstantIsNullOrEmpty.cs:10:21:10:54 | call to method IsNullOrEmpty | dummy |
+| ConstantIsNullOrEmpty.cs:46:21:46:46 | call to method IsNullOrEmpty | Condition always evaluates to 'true'. | ConstantIsNullOrEmpty.cs:46:21:46:46 | call to method IsNullOrEmpty | dummy |
+| ConstantIsNullOrEmpty.cs:50:21:50:44 | call to method IsNullOrEmpty | Condition always evaluates to 'true'. | ConstantIsNullOrEmpty.cs:50:21:50:44 | call to method IsNullOrEmpty | dummy |
+| ConstantIsNullOrEmpty.cs:54:21:54:45 | call to method IsNullOrEmpty | Condition always evaluates to 'false'. | ConstantIsNullOrEmpty.cs:54:21:54:45 | call to method IsNullOrEmpty | dummy |
+| ConstantNullCoalescingLeftHandOperand.cs:11:24:11:34 | access to constant NULL_OBJECT | Expression is never 'null'. | ConstantNullCoalescingLeftHandOperand.cs:11:24:11:34 | access to constant NULL_OBJECT | dummy |
+| ConstantNullCoalescingLeftHandOperand.cs:12:24:12:27 | null | Expression is always 'null'. | ConstantNullCoalescingLeftHandOperand.cs:12:24:12:27 | null | dummy |
+| ConstantWhileCondition.cs:12:20:12:32 | ... == ... | Condition always evaluates to 'true'. | ConstantWhileCondition.cs:12:20:12:32 | ... == ... | dummy |
+| ConstantWhileCondition.cs:16:20:16:24 | false | Condition always evaluates to 'false'. | ConstantWhileCondition.cs:16:20:16:24 | false | dummy |
+| ConstantWhileCondition.cs:24:20:24:29 | ... == ... | Condition always evaluates to 'true'. | ConstantWhileCondition.cs:24:20:24:29 | ... == ... | dummy |
diff --git a/csharp/ql/test/query-tests/Dead Code/DeadStoreOfLocal/DeadStoreOfLocal.cs b/csharp/ql/test/query-tests/Dead Code/DeadStoreOfLocal/DeadStoreOfLocal.cs
index 04d8e20c09e..03a6644fe80 100644
--- a/csharp/ql/test/query-tests/Dead Code/DeadStoreOfLocal/DeadStoreOfLocal.cs	
+++ b/csharp/ql/test/query-tests/Dead Code/DeadStoreOfLocal/DeadStoreOfLocal.cs	
@@ -395,7 +395,7 @@ class Initializers
     {
         var s = "";
         if (b)
-            s = "abc"; // $ Alert
+            s = "abc"; // Not reported
         if (!b)
             return s;
         return null;
diff --git a/csharp/ql/test/query-tests/Dead Code/DeadStoreOfLocal/DeadStoreOfLocal.expected b/csharp/ql/test/query-tests/Dead Code/DeadStoreOfLocal/DeadStoreOfLocal.expected
index 6f718c49407..6271d6276c7 100644
--- a/csharp/ql/test/query-tests/Dead Code/DeadStoreOfLocal/DeadStoreOfLocal.expected	
+++ b/csharp/ql/test/query-tests/Dead Code/DeadStoreOfLocal/DeadStoreOfLocal.expected	
@@ -13,7 +13,6 @@
 | DeadStoreOfLocal.cs:314:18:314:23 | Object v2 | This assignment to $@ is useless, since its value is never read. | DeadStoreOfLocal.cs:314:22:314:23 | v2 | v2 |
 | DeadStoreOfLocal.cs:331:9:331:32 | ... = ... | This assignment to $@ is useless, since its value is never read. | DeadStoreOfLocal.cs:327:23:327:23 | b | b |
 | DeadStoreOfLocal.cs:372:13:372:20 | String s = ... | This assignment to $@ is useless, since its value is never read. | DeadStoreOfLocal.cs:372:13:372:13 | s | s |
-| DeadStoreOfLocal.cs:398:13:398:21 | ... = ... | This assignment to $@ is useless, since its value is never read. | DeadStoreOfLocal.cs:396:13:396:13 | s | s |
 | DeadStoreOfLocal.cs:472:20:472:76 | FileStream y = ... | This assignment to $@ is useless, since its value is never read. | DeadStoreOfLocal.cs:472:20:472:20 | y | y |
 | DeadStoreOfLocalBad.cs:7:13:7:48 | Boolean success = ... | This assignment to $@ is useless, since its value is never read. | DeadStoreOfLocalBad.cs:7:13:7:19 | success | success |
 | DeadStoreOfLocalBad.cs:23:32:23:32 | FormatException e | This assignment to $@ is useless, since its value is never read. | DeadStoreOfLocalBad.cs:23:32:23:32 | e | e |
diff --git a/csharp/ql/test/query-tests/Nullness/C.cs b/csharp/ql/test/query-tests/Nullness/C.cs
index 405dceb74d5..8c6a0226f36 100644
--- a/csharp/ql/test/query-tests/Nullness/C.cs
+++ b/csharp/ql/test/query-tests/Nullness/C.cs
@@ -74,7 +74,7 @@ public class C
 
     public void TestNull()
     {
-        object o = null;
+        object o = Maybe() ? null : new object();
         if (IsNotNull(o))
             o.ToString(); // GOOD
 
diff --git a/csharp/ql/test/query-tests/Nullness/D.cs b/csharp/ql/test/query-tests/Nullness/D.cs
index ffc4fd193c7..a465a434be6 100644
--- a/csharp/ql/test/query-tests/Nullness/D.cs
+++ b/csharp/ql/test/query-tests/Nullness/D.cs
@@ -14,7 +14,7 @@ public class D
     public void Caller()
     {
         Callee1(new object());
-        Callee1(null); // $ Source[cs/dereferenced-value-may-be-null]
+        Callee1(null);
         Callee2(new object());
     }
 
@@ -23,7 +23,7 @@ public class D
         param.ToString(); // $ Alert[cs/dereferenced-value-may-be-null]
     }
 
-    public void Callee2(object param) // $ Source[cs/dereferenced-value-may-be-null]
+    public void Callee2(object param)
     {
         if (param != null)
         {
@@ -55,24 +55,24 @@ public class D
         if ((2 > 1 && o4 != null) != false)
             o4.ToString(); // GOOD
 
-        var o5 = (o4 != null) ? "" : null; // $ Source[cs/dereferenced-value-may-be-null]
+        var o5 = (o4 != null) ? "" : null;
         if (o5 != null)
             o4.ToString(); // GOOD
         if (o4 != null)
-            o5.ToString(); // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
+            o5.ToString(); // GOOD
 
         var o6 = maybe ? null : "";
         if (!CustomIsNull(o6))
             o6.ToString(); // GOOD
 
-        var o7 = maybe ? null : ""; // $ Source[cs/dereferenced-value-may-be-null]
+        var o7 = maybe ? null : "";
         var ok = o7 != null && 2 > 1;
         if (ok)
             o7.ToString(); // GOOD
         else
             o7.ToString(); // $ Alert[cs/dereferenced-value-may-be-null]
 
-        var o8 = maybe ? null : ""; // $ Source[cs/dereferenced-value-may-be-null]
+        var o8 = maybe ? null : "";
         int track = o8 == null ? 42 : 1 + 1;
         if (track == 2)
             o8.ToString(); // GOOD
@@ -86,7 +86,7 @@ public class D
 
     public void Deref(int i)
     {
-        int[] xs = maybe ? null : new int[2]; // $ Source[cs/dereferenced-value-may-be-null]
+        int[] xs = maybe ? null : new int[2];
         if (i > 1)
             xs[0] = 5; // $ Alert[cs/dereferenced-value-may-be-null]
 
@@ -122,7 +122,7 @@ public class D
             x.ToString(); // GOOD
     }
 
-    public void LengthGuard(int[] a, int[] b) // $ Source[cs/dereferenced-value-may-be-null]
+    public void LengthGuard(int[] a, int[] b)
     {
         int alen = a == null ? 0 : a.Length; // GOOD
         int blen = b == null ? 0 : b.Length; // GOOD
@@ -146,7 +146,7 @@ public class D
         }
     }
 
-    public void MissedGuard(object obj) // $ Source[cs/dereferenced-value-may-be-null]
+    public void MissedGuard(object obj)
     {
         obj.ToString(); // $ Alert[cs/dereferenced-value-may-be-null]
         var x = obj != null ? 1 : 0;
@@ -160,7 +160,7 @@ public class D
 
     public void Exceptions()
     {
-        object obj = null; // $ Source[cs/dereferenced-value-may-be-null]
+        object obj = null;
         try
         {
             obj = MkMaybe();
@@ -237,16 +237,16 @@ public class D
         if (flag)
             o.ToString(); // GOOD
 
-        o = null; // $ Source[cs/dereferenced-value-may-be-null]
+        o = null;
         var other = maybe ? null : "";
         if (other == null)
             o = "";
         if (other != null)
             o.ToString(); // $ Alert[cs/dereferenced-value-may-be-null] (always - but reported as maybe)
         else
-            o.ToString(); // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
+            o.ToString(); // GOOD
 
-        var o2 = (num < 0) ? null : ""; // $ Source[cs/dereferenced-value-may-be-null]
+        var o2 = (num < 0) ? null : "";
         if (num < 0)
             o2 = "";
         else
@@ -255,7 +255,7 @@ public class D
 
     public void TrackingVariable(int[] a)
     {
-        object o = null; // $ Source[cs/dereferenced-value-may-be-null]
+        object o = null;
         object other = null;
         if (maybe)
         {
@@ -264,9 +264,9 @@ public class D
         }
 
         if (other is string)
-            o.ToString(); // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
+            o.ToString(); // GOOD
 
-        o = null; // $ Source[cs/dereferenced-value-may-be-null]
+        o = null;
         int count = 0;
         var found = false;
         for (var i = 0; i < a.Length; i++)
@@ -280,7 +280,7 @@ public class D
             }
             if (a[i] > 10000)
             {
-                o = null; // $ Source[cs/dereferenced-value-may-be-null]
+                o = null;
                 count = 0;
                 if (2 > i) { }
                 found = false;
@@ -291,17 +291,17 @@ public class D
             o.ToString(); // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
 
         if (found)
-            o.ToString(); // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
+            o.ToString(); // GOOD
 
-        object prev = null; // $ Source[cs/dereferenced-value-may-be-null]
+        object prev = null;
         for (var i = 0; i < a.Length; ++i)
         {
             if (i != 0)
-                prev.ToString(); // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
+                prev.ToString(); // GOOD
             prev = a[i];
         }
 
-        string s = null; // $ Source[cs/dereferenced-value-may-be-null]
+        string s = null;
         {
             var s_null = true;
             foreach (var i in a)
@@ -310,10 +310,10 @@ public class D
                 s = "" + a;
             }
             if (!s_null)
-                s.ToString(); // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
+                s.ToString(); // GOOD
         }
 
-        object r = null; // $ Source[cs/dereferenced-value-may-be-null]
+        object r = null;
         var stat = MyStatus.INIT;
         while (stat == MyStatus.INIT && stat != MyStatus.READY)
         {
@@ -321,7 +321,7 @@ public class D
             if (stat == MyStatus.INIT)
                 stat = MyStatus.READY;
         }
-        r.ToString(); // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
+        r.ToString(); // GOOD
     }
 
     public enum MyStatus
@@ -348,7 +348,7 @@ public class D
 
     public void LoopCorr(int iters)
     {
-        int[] a = null; // $ Source[cs/dereferenced-value-may-be-null]
+        int[] a = null;
         if (iters > 0)
             a = new int[iters];
 
@@ -357,13 +357,13 @@ public class D
 
         if (iters > 0)
         {
-            string last = null; // $ Source[cs/dereferenced-value-may-be-null]
+            string last = null;
             for (var i = 0; i < iters; i++)
                 last = "abc";
             last.ToString(); // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
         }
 
-        int[] b = maybe ? null : new int[iters]; // $ Source[cs/dereferenced-value-may-be-null]
+        int[] b = maybe ? null : new int[iters];
         if (iters > 0 && (b == null || b.Length < iters))
             throw new Exception();
 
@@ -385,7 +385,7 @@ public class D
             ioe.ToString(); // $ Alert[cs/dereferenced-value-is-always-null]
     }
 
-    public void LengthGuard2(int[] a, int[] b) // $ Source[cs/dereferenced-value-may-be-null]
+    public void LengthGuard2(int[] a, int[] b)
     {
         int alen = a == null ? 0 : a.Length; // GOOD
         int sum = 0;
@@ -402,13 +402,13 @@ public class D
         i = -3;
     }
 
-    public void CorrConds2(object x, object y) // $ Source[cs/dereferenced-value-may-be-null]
+    public void CorrConds2(object x, object y)
     {
         if ((x != null && y == null) || (x == null && y != null))
             return;
         if (x != null)
-            y.ToString(); // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
+            y.ToString(); // GOOD
         if (y != null)
-            x.ToString(); // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
+            x.ToString(); // GOOD
     }
 }
diff --git a/csharp/ql/test/query-tests/Nullness/E.cs b/csharp/ql/test/query-tests/Nullness/E.cs
index f8264523b68..e6a8066d9a7 100644
--- a/csharp/ql/test/query-tests/Nullness/E.cs
+++ b/csharp/ql/test/query-tests/Nullness/E.cs
@@ -6,9 +6,9 @@ public class E
 {
     public void Ex1(long[][][] a1, int ix, int len)
     {
-        long[][] a2 = null; // $ Source[cs/dereferenced-value-may-be-null]
+        long[][] a2 = null;
         var haveA2 = ix < len && (a2 = a1[ix]) != null;
-        long[] a3 = null; // $ Source[cs/dereferenced-value-may-be-null]
+        long[] a3 = null;
         var haveA3 = haveA2 && (a3 = a2[ix]) != null; // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
         if (haveA3)
             a3[0] = 0; // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
@@ -20,7 +20,7 @@ public class E
         var s2 = (s1 == null) ? null : "";
         if (s2 == null)
         {
-            s1 = y ? null : ""; // $ Source[cs/dereferenced-value-may-be-null]
+            s1 = y ? null : "";
             s2 = (s1 == null) ? null : "";
         }
         if (s2 != null)
@@ -32,7 +32,7 @@ public class E
         string last = null;
         foreach (var s in new string[] { "aa", "bb" })
             last = s;
-        last.ToString(); // GOOD
+        last.ToString(); // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
 
         last = null;
         if (ss.Any())
@@ -40,7 +40,7 @@ public class E
             foreach (var s in ss)
                 last = s;
 
-            last.ToString(); // GOOD
+            last.ToString(); // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
         }
     }
 
@@ -48,7 +48,7 @@ public class E
     {
         int index = 0;
         var result = new List<List<string>>();
-        List<string> slice = null; // $ Source[cs/dereferenced-value-may-be-null]
+        List<string> slice = null;
         var iter = list.GetEnumerator();
         while (iter.MoveNext())
         {
@@ -63,7 +63,7 @@ public class E
         }
     }
 
-    public void Ex5(bool hasArr, int[] arr) // $ Source[cs/dereferenced-value-may-be-null]
+    public void Ex5(bool hasArr, int[] arr)
     {
         int arrLen = 0;
         if (hasArr)
@@ -104,7 +104,7 @@ public class E
 
     public void Ex7(int[] arr1)
     {
-        int[] arr2 = null; // $ Source[cs/dereferenced-value-may-be-null]
+        int[] arr2 = null;
         if (arr1.Length > 0)
             arr2 = new int[arr1.Length];
 
@@ -122,7 +122,7 @@ public class E
             int j = 0;
             while (!stop && j < lim)
             {
-                int step = (j * obj.GetHashCode()) % 10; // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
+                int step = (j * obj.GetHashCode()) % 10; // GOOD
                 if (step == 0)
                 {
                     obj.ToString(); // GOOD
@@ -134,7 +134,7 @@ public class E
                     }
                     else
                     {
-                        obj = null; // $ Source[cs/dereferenced-value-may-be-null]
+                        obj = null;
                     }
                     continue;
                 }
@@ -149,17 +149,17 @@ public class E
         {
             return;
         }
-        object obj2 = obj1; // $ Source[cs/dereferenced-value-may-be-null]
+        object obj2 = obj1;
         if (obj2 != null && obj2.GetHashCode() % 5 > 2)
         {
             obj2.ToString(); // GOOD
             cond = true;
         }
         if (cond)
-            obj2.ToString(); // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
+            obj2.ToString(); // GOOD
     }
 
-    public void Ex10(int[] a) // $ Source[cs/dereferenced-value-may-be-null]
+    public void Ex10(int[] a)
     {
         int n = a == null ? 0 : a.Length;
         for (var i = 0; i < n; i++)
@@ -170,12 +170,12 @@ public class E
         }
     }
 
-    public void Ex11(object obj, bool b1) // $ Source[cs/dereferenced-value-may-be-null]
+    public void Ex11(object obj, bool b1)
     {
         bool b2 = obj == null ? false : b1;
         if (b2 == null)
         {
-            obj.ToString(); // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
+            obj.ToString(); // GOOD
         }
         if (obj == null)
         {
@@ -183,11 +183,11 @@ public class E
         }
         if (b1 == null)
         {
-            obj.ToString(); // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
+            obj.ToString(); // GOOD
         }
     }
 
-    public void Ex12(object o) // $ Source[cs/dereferenced-value-may-be-null]
+    public void Ex12(object o)
     {
         var i = o.GetHashCode(); // $ Alert[cs/dereferenced-value-may-be-null]
         var s = o?.ToString();
@@ -195,12 +195,12 @@ public class E
 
     public void Ex13(bool b)
     {
-        var o = b ? null : ""; // $ Source[cs/dereferenced-value-may-be-null]
-        o.M1(); // GOOD
+        var o = b ? null : "";
+        o.M1(); // GOOD (because M1 doesn't deref o)
         if (b)
             o.M2(); // $ Alert[cs/dereferenced-value-may-be-null]
         else
-            o.Select(x => x); // $ Alert[cs/dereferenced-value-may-be-null]
+            o.Select(x => x); // GOOD
     }
 
     public int Ex14(string s)
@@ -214,28 +214,28 @@ public class E
     {
         var x = "";
         if (b)
-            x = null; // $ Source[cs/dereferenced-value-may-be-null]
+            x = null;
         x.ToString(); // $ Alert[cs/dereferenced-value-may-be-null]
         if (b)
-            x.ToString(); // $ Alert[cs/dereferenced-value-is-always-null]
+            x.ToString(); // dominated by prior deref, i.e. not reported
     }
 
     public void Ex16(bool b)
     {
         var x = "";
         if (b)
-            x = null; // $ Source[cs/dereferenced-value-may-be-null]
+            x = null;
         if (b)
-            x.ToString(); // $ Alert[cs/dereferenced-value-is-always-null]
-        x.ToString(); // $ Alert[cs/dereferenced-value-may-be-null]
+            x.ToString(); // $ Alert[cs/dereferenced-value-may-be-null]
+        x.ToString(); // "dominated" by prior deref, i.e. not reported
     }
 
-    public int Ex17(int? i) // $ Source[cs/dereferenced-value-may-be-null]
+    public int Ex17(int? i)
     {
         return i.Value; // $ Alert[cs/dereferenced-value-may-be-null]
     }
 
-    public int Ex18(int? i) // $ Source[cs/dereferenced-value-may-be-null]
+    public int Ex18(int? i)
     {
         return (int)i; // $ Alert[cs/dereferenced-value-may-be-null]
     }
@@ -280,7 +280,7 @@ public class E
     {
         if (b)
             b.ToString();
-        var o = Make(); // $ Source[cs/dereferenced-value-may-be-null]
+        var o = Make();
         o?.ToString();
         o.ToString(); // $ Alert[cs/dereferenced-value-may-be-null]
         if (b)
@@ -298,7 +298,7 @@ public class E
 
     public void Ex25(object o)
     {
-        var s = o as string; // $ Source[cs/dereferenced-value-may-be-null]
+        var s = o as string;
         s.ToString(); // $ Alert[cs/dereferenced-value-may-be-null]
     }
 
@@ -339,13 +339,13 @@ public class E
 
     static void Ex30(string s, object o)
     {
-        var x = s ?? o as string; // $ Source[cs/dereferenced-value-may-be-null]
+        var x = s ?? o as string;
         x.ToString(); // $ Alert[cs/dereferenced-value-may-be-null]
     }
 
     static void Ex31(string s, object o)
     {
-        dynamic x = s ?? o as string; // $ Source[cs/dereferenced-value-may-be-null]
+        dynamic x = s ?? o as string;
         x.ToString(); // $ Alert[cs/dereferenced-value-may-be-null]
     }
 
@@ -371,19 +371,19 @@ public class E
     {
         if (o is string)
         {
-            var s = o as string; // $ Source[cs/dereferenced-value-may-be-null]
+            var s = o as string;
             return s.Length; // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
         }
         return -1;
     }
 
-    static bool Ex37(E e1, E e2) // $ Source[cs/dereferenced-value-may-be-null]
+    static bool Ex37(E e1, E e2)
     {
         if ((e1 == null && e2 != null) || (e1 != null && e2 == null))
             return false;
         if (e1 == null && e2 == null)
             return true;
-        return e1.Long == e2.Long; // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
+        return e1.Long == e2.Long; // GOOD
     }
 
     int Ex38(int? i)
@@ -432,24 +432,33 @@ public class E
         return @is.Any();
     }
 
-    static void Ex45(string s)
+    static void Ex45(string s, int i)
     {
-        if (s is null)
+        if (i == 0 && s is null)
         {
             s.ToString(); // $ Alert[cs/dereferenced-value-is-always-null]
         }
 
-        if (s is not not null)
+        if (i == 1 && s is not not null)
         {
-            s.ToString(); // $ MISSING: Alert[cs/dereferenced-value-is-always-null]
+            s.ToString(); // $ Alert[cs/dereferenced-value-may-be-null] MISSING: Alert[cs/dereferenced-value-is-always-null]
         }
 
-        if (s is not null)
+        if (i == 2 && s is not null)
         {
             s.ToString(); // GOOD
         }
 
-        if (s is object)
+        if (i == 3 && s is object)
+        {
+            s.ToString(); // GOOD
+        }
+
+        if (s is not object)
+        {
+            s.ToString();  // $ Alert[cs/dereferenced-value-may-be-null]
+        }
+        else
         {
             s.ToString(); // GOOD
         }
diff --git a/csharp/ql/test/query-tests/Nullness/EqualityCheck.expected b/csharp/ql/test/query-tests/Nullness/EqualityCheck.expected
index 9e66a5bccd1..5ba1fdf8765 100644
--- a/csharp/ql/test/query-tests/Nullness/EqualityCheck.expected
+++ b/csharp/ql/test/query-tests/Nullness/EqualityCheck.expected
@@ -190,12 +190,12 @@
 | E.cs:83:13:83:24 | ... != ... | false | E.cs:83:21:83:24 | null | E.cs:83:13:83:16 | access to parameter vals |
 | E.cs:85:18:85:29 | ... != ... | false | E.cs:85:18:85:21 | access to parameter vals | E.cs:85:26:85:29 | null |
 | E.cs:85:18:85:29 | ... != ... | false | E.cs:85:26:85:29 | null | E.cs:85:18:85:21 | access to parameter vals |
-| E.cs:90:17:90:27 | access to local variable switchguard | match access to constant MY_CONST_A | E.cs:90:17:90:27 | access to local variable switchguard | E.cs:92:18:92:27 | access to constant MY_CONST_A |
-| E.cs:90:17:90:27 | access to local variable switchguard | match access to constant MY_CONST_A | E.cs:92:18:92:27 | access to constant MY_CONST_A | E.cs:90:17:90:27 | access to local variable switchguard |
-| E.cs:90:17:90:27 | access to local variable switchguard | match access to constant MY_CONST_B | E.cs:90:17:90:27 | access to local variable switchguard | E.cs:97:18:97:27 | access to constant MY_CONST_B |
-| E.cs:90:17:90:27 | access to local variable switchguard | match access to constant MY_CONST_B | E.cs:97:18:97:27 | access to constant MY_CONST_B | E.cs:90:17:90:27 | access to local variable switchguard |
-| E.cs:90:17:90:27 | access to local variable switchguard | match access to constant MY_CONST_C | E.cs:90:17:90:27 | access to local variable switchguard | E.cs:95:18:95:27 | access to constant MY_CONST_C |
-| E.cs:90:17:90:27 | access to local variable switchguard | match access to constant MY_CONST_C | E.cs:95:18:95:27 | access to constant MY_CONST_C | E.cs:90:17:90:27 | access to local variable switchguard |
+| E.cs:92:13:92:28 | case ...: | true | E.cs:90:17:90:27 | access to local variable switchguard | E.cs:92:18:92:27 | access to constant MY_CONST_A |
+| E.cs:92:13:92:28 | case ...: | true | E.cs:92:18:92:27 | access to constant MY_CONST_A | E.cs:90:17:90:27 | access to local variable switchguard |
+| E.cs:95:13:95:28 | case ...: | true | E.cs:90:17:90:27 | access to local variable switchguard | E.cs:95:18:95:27 | access to constant MY_CONST_C |
+| E.cs:95:13:95:28 | case ...: | true | E.cs:95:18:95:27 | access to constant MY_CONST_C | E.cs:90:17:90:27 | access to local variable switchguard |
+| E.cs:97:13:97:28 | case ...: | true | E.cs:90:17:90:27 | access to local variable switchguard | E.cs:97:18:97:27 | access to constant MY_CONST_B |
+| E.cs:97:13:97:28 | case ...: | true | E.cs:97:18:97:27 | access to constant MY_CONST_B | E.cs:90:17:90:27 | access to local variable switchguard |
 | E.cs:126:21:126:29 | ... == ... | true | E.cs:126:21:126:24 | access to local variable step | E.cs:126:29:126:29 | 0 |
 | E.cs:126:21:126:29 | ... == ... | true | E.cs:126:29:126:29 | 0 | E.cs:126:21:126:24 | access to local variable step |
 | E.cs:153:13:153:24 | ... != ... | false | E.cs:153:13:153:16 | access to local variable obj2 | E.cs:153:21:153:24 | null |
@@ -244,8 +244,18 @@
 | E.cs:423:33:423:44 | ... == ... | true | E.cs:423:38:423:44 | access to property Value | E.cs:423:33:423:33 | access to parameter j |
 | E.cs:430:34:430:45 | ... == ... | true | E.cs:430:34:430:34 | access to parameter j | E.cs:430:39:430:45 | access to property Value |
 | E.cs:430:34:430:45 | ... == ... | true | E.cs:430:39:430:45 | access to property Value | E.cs:430:34:430:34 | access to parameter j |
-| E.cs:437:13:437:21 | ... is ... | true | E.cs:437:13:437:13 | access to parameter s | E.cs:437:18:437:21 | null |
-| E.cs:437:13:437:21 | ... is ... | true | E.cs:437:18:437:21 | null | E.cs:437:13:437:13 | access to parameter s |
+| E.cs:437:13:437:18 | ... == ... | true | E.cs:437:13:437:13 | access to parameter i | E.cs:437:18:437:18 | 0 |
+| E.cs:437:13:437:18 | ... == ... | true | E.cs:437:18:437:18 | 0 | E.cs:437:13:437:13 | access to parameter i |
+| E.cs:437:23:437:31 | ... is ... | true | E.cs:437:23:437:23 | access to parameter s | E.cs:437:28:437:31 | null |
+| E.cs:437:23:437:31 | ... is ... | true | E.cs:437:28:437:31 | null | E.cs:437:23:437:23 | access to parameter s |
+| E.cs:442:13:442:18 | ... == ... | true | E.cs:442:13:442:13 | access to parameter i | E.cs:442:18:442:18 | 1 |
+| E.cs:442:13:442:18 | ... == ... | true | E.cs:442:18:442:18 | 1 | E.cs:442:13:442:13 | access to parameter i |
+| E.cs:447:13:447:18 | ... == ... | true | E.cs:447:13:447:13 | access to parameter i | E.cs:447:18:447:18 | 2 |
+| E.cs:447:13:447:18 | ... == ... | true | E.cs:447:18:447:18 | 2 | E.cs:447:13:447:13 | access to parameter i |
+| E.cs:447:23:447:35 | ... is ... | false | E.cs:447:23:447:23 | access to parameter s | E.cs:447:32:447:35 | null |
+| E.cs:447:23:447:35 | ... is ... | false | E.cs:447:32:447:35 | null | E.cs:447:23:447:23 | access to parameter s |
+| E.cs:452:13:452:18 | ... == ... | true | E.cs:452:13:452:13 | access to parameter i | E.cs:452:18:452:18 | 3 |
+| E.cs:452:13:452:18 | ... == ... | true | E.cs:452:18:452:18 | 3 | E.cs:452:13:452:13 | access to parameter i |
 | Forwarding.cs:59:13:59:21 | ... == ... | true | Forwarding.cs:59:13:59:13 | access to parameter o | Forwarding.cs:59:18:59:21 | null |
 | Forwarding.cs:59:13:59:21 | ... == ... | true | Forwarding.cs:59:18:59:21 | null | Forwarding.cs:59:13:59:13 | access to parameter o |
 | Forwarding.cs:78:16:78:39 | call to method ReferenceEquals | true | Forwarding.cs:78:32:78:32 | access to parameter o | Forwarding.cs:78:35:78:38 | null |
diff --git a/csharp/ql/test/query-tests/Nullness/EqualityCheck.ql b/csharp/ql/test/query-tests/Nullness/EqualityCheck.ql
index 3036911b5a6..1140d4e9a9d 100644
--- a/csharp/ql/test/query-tests/Nullness/EqualityCheck.ql
+++ b/csharp/ql/test/query-tests/Nullness/EqualityCheck.ql
@@ -1,5 +1,6 @@
 import csharp
 import semmle.code.csharp.controlflow.Guards
 
-from Expr e1, AbstractValue v, Expr e2
-select Internal::getAnEqualityCheck(e1, v, e2), v, e1, e2
+from Guard guard, Expr e1, Expr e2, boolean eqval
+where guard.isEquality(e1, e2, eqval)
+select guard, eqval, e1, e2
diff --git a/csharp/ql/test/query-tests/Nullness/Forwarding.cs b/csharp/ql/test/query-tests/Nullness/Forwarding.cs
index 122c5036567..fc7b7eb2e8f 100644
--- a/csharp/ql/test/query-tests/Nullness/Forwarding.cs
+++ b/csharp/ql/test/query-tests/Nullness/Forwarding.cs
@@ -28,7 +28,7 @@ class ForwardingTests
 
         if (IsNotNull(s))
         {
-            Console.WriteLine(s.Length); // GOOD
+            Console.WriteLine(s.Length); // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-is-always-null]
         }
 
         if (IsNotNullWrong(s))
diff --git a/csharp/ql/test/query-tests/Nullness/Implications.expected b/csharp/ql/test/query-tests/Nullness/Implications.expected
deleted file mode 100644
index ec660dd44a4..00000000000
--- a/csharp/ql/test/query-tests/Nullness/Implications.expected
+++ /dev/null
@@ -1,1520 +0,0 @@
-| A.cs:8:15:8:32 | access to local variable synchronizedAlways | non-null | A.cs:7:37:7:40 | null | non-null |
-| A.cs:8:15:8:32 | access to local variable synchronizedAlways | null | A.cs:7:37:7:40 | null | null |
-| A.cs:10:13:10:30 | access to local variable synchronizedAlways | non-null | A.cs:7:37:7:40 | null | non-null |
-| A.cs:10:13:10:30 | access to local variable synchronizedAlways | null | A.cs:7:37:7:40 | null | null |
-| A.cs:17:9:17:17 | access to local variable arrayNull | empty | A.cs:16:27:16:30 | null | empty |
-| A.cs:17:9:17:17 | access to local variable arrayNull | non-empty | A.cs:16:27:16:30 | null | non-empty |
-| A.cs:17:9:17:17 | access to local variable arrayNull | non-null | A.cs:16:27:16:30 | null | non-null |
-| A.cs:17:9:17:17 | access to local variable arrayNull | null | A.cs:16:27:16:30 | null | null |
-| A.cs:21:9:21:15 | access to local variable arrayOk | empty | A.cs:20:19:20:29 | array creation of type Int32[] | empty |
-| A.cs:21:9:21:15 | access to local variable arrayOk | non-empty | A.cs:20:19:20:29 | array creation of type Int32[] | non-empty |
-| A.cs:21:9:21:15 | access to local variable arrayOk | non-null | A.cs:20:19:20:29 | array creation of type Int32[] | non-null |
-| A.cs:21:9:21:15 | access to local variable arrayOk | null | A.cs:20:19:20:29 | array creation of type Int32[] | null |
-| A.cs:31:27:31:37 | access to local variable arrayAccess | empty | A.cs:26:29:26:32 | null | empty |
-| A.cs:31:27:31:37 | access to local variable arrayAccess | non-empty | A.cs:26:29:26:32 | null | non-empty |
-| A.cs:31:27:31:37 | access to local variable arrayAccess | non-null | A.cs:26:29:26:32 | null | non-null |
-| A.cs:31:27:31:37 | access to local variable arrayAccess | null | A.cs:26:29:26:32 | null | null |
-| A.cs:32:27:32:37 | access to local variable fieldAccess | empty | A.cs:27:32:27:35 | null | empty |
-| A.cs:32:27:32:37 | access to local variable fieldAccess | non-empty | A.cs:27:32:27:35 | null | non-empty |
-| A.cs:32:27:32:37 | access to local variable fieldAccess | non-null | A.cs:27:32:27:35 | null | non-null |
-| A.cs:32:27:32:37 | access to local variable fieldAccess | null | A.cs:27:32:27:35 | null | null |
-| A.cs:33:28:33:39 | access to local variable methodAccess | non-null | A.cs:28:31:28:34 | null | non-null |
-| A.cs:33:28:33:39 | access to local variable methodAccess | null | A.cs:28:31:28:34 | null | null |
-| A.cs:34:27:34:36 | access to local variable methodCall | non-null | A.cs:29:29:29:32 | null | non-null |
-| A.cs:34:27:34:36 | access to local variable methodCall | null | A.cs:29:29:29:32 | null | null |
-| A.cs:36:27:36:37 | access to local variable arrayAccess | non-null | A.cs:26:29:26:32 | null | non-null |
-| A.cs:36:27:36:37 | access to local variable arrayAccess | null | A.cs:26:29:26:32 | null | null |
-| A.cs:37:27:37:37 | access to local variable fieldAccess | non-null | A.cs:27:32:27:35 | null | non-null |
-| A.cs:37:27:37:37 | access to local variable fieldAccess | null | A.cs:27:32:27:35 | null | null |
-| A.cs:38:15:38:26 | access to local variable methodAccess | non-null | A.cs:28:31:28:34 | null | non-null |
-| A.cs:38:15:38:26 | access to local variable methodAccess | null | A.cs:28:31:28:34 | null | null |
-| A.cs:39:27:39:36 | access to local variable methodCall | non-null | A.cs:29:29:29:32 | null | non-null |
-| A.cs:39:27:39:36 | access to local variable methodCall | null | A.cs:29:29:29:32 | null | null |
-| A.cs:49:25:49:30 | access to local variable varRef | non-null | A.cs:48:25:48:28 | null | non-null |
-| A.cs:49:25:49:30 | access to local variable varRef | null | A.cs:48:25:48:28 | null | null |
-| A.cs:50:9:50:14 | access to local variable varRef | non-null | A.cs:48:25:48:28 | null | non-null |
-| A.cs:50:9:50:14 | access to local variable varRef | null | A.cs:48:25:48:28 | null | null |
-| A.cs:53:25:53:30 | access to local variable varRef | non-null | A.cs:52:18:52:21 | null | non-null |
-| A.cs:53:25:53:30 | access to local variable varRef | null | A.cs:52:18:52:21 | null | null |
-| A.cs:61:36:61:45 | ... = ... | empty | A.cs:61:36:61:41 | access to local variable actual | empty |
-| A.cs:61:36:61:45 | ... = ... | empty | A.cs:61:45:61:45 | access to parameter e | empty |
-| A.cs:61:36:61:45 | ... = ... | non-empty | A.cs:61:36:61:41 | access to local variable actual | non-empty |
-| A.cs:61:36:61:45 | ... = ... | non-empty | A.cs:61:45:61:45 | access to parameter e | non-empty |
-| A.cs:61:36:61:45 | ... = ... | non-null | A.cs:61:36:61:41 | access to local variable actual | non-null |
-| A.cs:61:36:61:45 | ... = ... | non-null | A.cs:61:45:61:45 | access to parameter e | non-null |
-| A.cs:61:36:61:45 | ... = ... | null | A.cs:61:36:61:41 | access to local variable actual | null |
-| A.cs:61:36:61:45 | ... = ... | null | A.cs:61:45:61:45 | access to parameter e | null |
-| A.cs:63:9:63:11 | access to local variable fun | non-null | A.cs:61:26:61:45 | (...) => ... | non-null |
-| A.cs:63:9:63:11 | access to local variable fun | null | A.cs:61:26:61:45 | (...) => ... | null |
-| Assert.cs:9:20:9:32 | ... ? ... : ... | non-null | Assert.cs:9:20:9:20 | access to parameter b | false |
-| Assert.cs:9:20:9:32 | ... ? ... : ... | non-null | Assert.cs:9:31:9:32 | "" | non-null |
-| Assert.cs:9:20:9:32 | ... ? ... : ... | null | Assert.cs:9:20:9:20 | access to parameter b | true |
-| Assert.cs:9:20:9:32 | ... ? ... : ... | null | Assert.cs:9:24:9:27 | null | null |
-| Assert.cs:10:22:10:22 | access to local variable s | empty | Assert.cs:9:20:9:32 | ... ? ... : ... | empty |
-| Assert.cs:10:22:10:22 | access to local variable s | non-empty | Assert.cs:9:20:9:32 | ... ? ... : ... | non-empty |
-| Assert.cs:10:22:10:22 | access to local variable s | non-null | Assert.cs:9:20:9:32 | ... ? ... : ... | non-null |
-| Assert.cs:10:22:10:22 | access to local variable s | null | Assert.cs:9:20:9:32 | ... ? ... : ... | null |
-| Assert.cs:10:22:10:30 | ... != ... | false | Assert.cs:9:20:9:20 | access to parameter b | true |
-| Assert.cs:10:22:10:30 | ... != ... | false | Assert.cs:10:22:10:22 | access to local variable s | null |
-| Assert.cs:10:22:10:30 | ... != ... | true | Assert.cs:9:20:9:20 | access to parameter b | false |
-| Assert.cs:10:22:10:30 | ... != ... | true | Assert.cs:10:22:10:22 | access to local variable s | non-null |
-| Assert.cs:11:27:11:27 | access to local variable s | non-null | Assert.cs:9:20:9:32 | ... ? ... : ... | non-null |
-| Assert.cs:11:27:11:27 | access to local variable s | null | Assert.cs:9:20:9:32 | ... ? ... : ... | null |
-| Assert.cs:13:13:13:25 | ... ? ... : ... | non-null | Assert.cs:13:13:13:13 | access to parameter b | false |
-| Assert.cs:13:13:13:25 | ... ? ... : ... | non-null | Assert.cs:13:24:13:25 | "" | non-null |
-| Assert.cs:13:13:13:25 | ... ? ... : ... | null | Assert.cs:13:13:13:13 | access to parameter b | true |
-| Assert.cs:13:13:13:25 | ... ? ... : ... | null | Assert.cs:13:17:13:20 | null | null |
-| Assert.cs:14:23:14:23 | access to local variable s | empty | Assert.cs:13:13:13:25 | ... ? ... : ... | empty |
-| Assert.cs:14:23:14:23 | access to local variable s | non-empty | Assert.cs:13:13:13:25 | ... ? ... : ... | non-empty |
-| Assert.cs:14:23:14:23 | access to local variable s | non-null | Assert.cs:13:13:13:13 | access to parameter b | false |
-| Assert.cs:14:23:14:23 | access to local variable s | non-null | Assert.cs:13:13:13:25 | ... ? ... : ... | non-null |
-| Assert.cs:14:23:14:23 | access to local variable s | null | Assert.cs:13:13:13:13 | access to parameter b | true |
-| Assert.cs:14:23:14:23 | access to local variable s | null | Assert.cs:13:13:13:25 | ... ? ... : ... | null |
-| Assert.cs:15:27:15:27 | access to local variable s | non-null | Assert.cs:13:13:13:25 | ... ? ... : ... | non-null |
-| Assert.cs:15:27:15:27 | access to local variable s | null | Assert.cs:13:13:13:25 | ... ? ... : ... | null |
-| Assert.cs:17:13:17:25 | ... ? ... : ... | non-null | Assert.cs:17:13:17:13 | access to parameter b | false |
-| Assert.cs:17:13:17:25 | ... ? ... : ... | non-null | Assert.cs:17:24:17:25 | "" | non-null |
-| Assert.cs:17:13:17:25 | ... ? ... : ... | null | Assert.cs:17:13:17:13 | access to parameter b | true |
-| Assert.cs:17:13:17:25 | ... ? ... : ... | null | Assert.cs:17:17:17:20 | null | null |
-| Assert.cs:18:26:18:26 | access to local variable s | empty | Assert.cs:17:13:17:25 | ... ? ... : ... | empty |
-| Assert.cs:18:26:18:26 | access to local variable s | non-empty | Assert.cs:17:13:17:25 | ... ? ... : ... | non-empty |
-| Assert.cs:18:26:18:26 | access to local variable s | non-null | Assert.cs:17:13:17:13 | access to parameter b | false |
-| Assert.cs:18:26:18:26 | access to local variable s | non-null | Assert.cs:17:13:17:25 | ... ? ... : ... | non-null |
-| Assert.cs:18:26:18:26 | access to local variable s | null | Assert.cs:17:13:17:13 | access to parameter b | true |
-| Assert.cs:18:26:18:26 | access to local variable s | null | Assert.cs:17:13:17:25 | ... ? ... : ... | null |
-| Assert.cs:19:27:19:27 | access to local variable s | non-null | Assert.cs:17:13:17:25 | ... ? ... : ... | non-null |
-| Assert.cs:19:27:19:27 | access to local variable s | null | Assert.cs:17:13:17:25 | ... ? ... : ... | null |
-| Assert.cs:21:13:21:25 | ... ? ... : ... | non-null | Assert.cs:21:13:21:13 | access to parameter b | false |
-| Assert.cs:21:13:21:25 | ... ? ... : ... | non-null | Assert.cs:21:24:21:25 | "" | non-null |
-| Assert.cs:21:13:21:25 | ... ? ... : ... | null | Assert.cs:21:13:21:13 | access to parameter b | true |
-| Assert.cs:21:13:21:25 | ... ? ... : ... | null | Assert.cs:21:17:21:20 | null | null |
-| Assert.cs:22:23:22:23 | access to local variable s | empty | Assert.cs:21:13:21:25 | ... ? ... : ... | empty |
-| Assert.cs:22:23:22:23 | access to local variable s | non-empty | Assert.cs:21:13:21:25 | ... ? ... : ... | non-empty |
-| Assert.cs:22:23:22:23 | access to local variable s | non-null | Assert.cs:21:13:21:25 | ... ? ... : ... | non-null |
-| Assert.cs:22:23:22:23 | access to local variable s | null | Assert.cs:21:13:21:25 | ... ? ... : ... | null |
-| Assert.cs:22:23:22:31 | ... == ... | false | Assert.cs:21:13:21:13 | access to parameter b | false |
-| Assert.cs:22:23:22:31 | ... == ... | false | Assert.cs:22:23:22:23 | access to local variable s | non-null |
-| Assert.cs:22:23:22:31 | ... == ... | true | Assert.cs:21:13:21:13 | access to parameter b | true |
-| Assert.cs:22:23:22:31 | ... == ... | true | Assert.cs:22:23:22:23 | access to local variable s | null |
-| Assert.cs:23:27:23:27 | access to local variable s | non-null | Assert.cs:21:13:21:25 | ... ? ... : ... | non-null |
-| Assert.cs:23:27:23:27 | access to local variable s | null | Assert.cs:21:13:21:25 | ... ? ... : ... | null |
-| Assert.cs:25:13:25:25 | ... ? ... : ... | non-null | Assert.cs:25:13:25:13 | access to parameter b | false |
-| Assert.cs:25:13:25:25 | ... ? ... : ... | non-null | Assert.cs:25:24:25:25 | "" | non-null |
-| Assert.cs:25:13:25:25 | ... ? ... : ... | null | Assert.cs:25:13:25:13 | access to parameter b | true |
-| Assert.cs:25:13:25:25 | ... ? ... : ... | null | Assert.cs:25:17:25:20 | null | null |
-| Assert.cs:26:23:26:23 | access to local variable s | empty | Assert.cs:25:13:25:25 | ... ? ... : ... | empty |
-| Assert.cs:26:23:26:23 | access to local variable s | non-empty | Assert.cs:25:13:25:25 | ... ? ... : ... | non-empty |
-| Assert.cs:26:23:26:23 | access to local variable s | non-null | Assert.cs:25:13:25:25 | ... ? ... : ... | non-null |
-| Assert.cs:26:23:26:23 | access to local variable s | null | Assert.cs:25:13:25:25 | ... ? ... : ... | null |
-| Assert.cs:26:23:26:31 | ... != ... | false | Assert.cs:25:13:25:13 | access to parameter b | true |
-| Assert.cs:26:23:26:31 | ... != ... | false | Assert.cs:26:23:26:23 | access to local variable s | null |
-| Assert.cs:26:23:26:31 | ... != ... | true | Assert.cs:25:13:25:13 | access to parameter b | false |
-| Assert.cs:26:23:26:31 | ... != ... | true | Assert.cs:26:23:26:23 | access to local variable s | non-null |
-| Assert.cs:27:27:27:27 | access to local variable s | non-null | Assert.cs:25:13:25:25 | ... ? ... : ... | non-null |
-| Assert.cs:27:27:27:27 | access to local variable s | null | Assert.cs:25:13:25:25 | ... ? ... : ... | null |
-| Assert.cs:29:13:29:25 | ... ? ... : ... | non-null | Assert.cs:29:13:29:13 | access to parameter b | false |
-| Assert.cs:29:13:29:25 | ... ? ... : ... | non-null | Assert.cs:29:24:29:25 | "" | non-null |
-| Assert.cs:29:13:29:25 | ... ? ... : ... | null | Assert.cs:29:13:29:13 | access to parameter b | true |
-| Assert.cs:29:13:29:25 | ... ? ... : ... | null | Assert.cs:29:17:29:20 | null | null |
-| Assert.cs:30:24:30:24 | access to local variable s | empty | Assert.cs:29:13:29:25 | ... ? ... : ... | empty |
-| Assert.cs:30:24:30:24 | access to local variable s | non-empty | Assert.cs:29:13:29:25 | ... ? ... : ... | non-empty |
-| Assert.cs:30:24:30:24 | access to local variable s | non-null | Assert.cs:29:13:29:25 | ... ? ... : ... | non-null |
-| Assert.cs:30:24:30:24 | access to local variable s | null | Assert.cs:29:13:29:25 | ... ? ... : ... | null |
-| Assert.cs:30:24:30:32 | ... != ... | false | Assert.cs:29:13:29:13 | access to parameter b | true |
-| Assert.cs:30:24:30:32 | ... != ... | false | Assert.cs:30:24:30:24 | access to local variable s | null |
-| Assert.cs:30:24:30:32 | ... != ... | true | Assert.cs:29:13:29:13 | access to parameter b | false |
-| Assert.cs:30:24:30:32 | ... != ... | true | Assert.cs:30:24:30:24 | access to local variable s | non-null |
-| Assert.cs:31:27:31:27 | access to local variable s | non-null | Assert.cs:29:13:29:25 | ... ? ... : ... | non-null |
-| Assert.cs:31:27:31:27 | access to local variable s | null | Assert.cs:29:13:29:25 | ... ? ... : ... | null |
-| Assert.cs:33:13:33:25 | ... ? ... : ... | non-null | Assert.cs:33:13:33:13 | access to parameter b | false |
-| Assert.cs:33:13:33:25 | ... ? ... : ... | non-null | Assert.cs:33:24:33:25 | "" | non-null |
-| Assert.cs:33:13:33:25 | ... ? ... : ... | null | Assert.cs:33:13:33:13 | access to parameter b | true |
-| Assert.cs:33:13:33:25 | ... ? ... : ... | null | Assert.cs:33:17:33:20 | null | null |
-| Assert.cs:34:24:34:24 | access to local variable s | empty | Assert.cs:33:13:33:25 | ... ? ... : ... | empty |
-| Assert.cs:34:24:34:24 | access to local variable s | non-empty | Assert.cs:33:13:33:25 | ... ? ... : ... | non-empty |
-| Assert.cs:34:24:34:24 | access to local variable s | non-null | Assert.cs:33:13:33:25 | ... ? ... : ... | non-null |
-| Assert.cs:34:24:34:24 | access to local variable s | null | Assert.cs:33:13:33:25 | ... ? ... : ... | null |
-| Assert.cs:34:24:34:32 | ... == ... | false | Assert.cs:33:13:33:13 | access to parameter b | false |
-| Assert.cs:34:24:34:32 | ... == ... | false | Assert.cs:34:24:34:24 | access to local variable s | non-null |
-| Assert.cs:34:24:34:32 | ... == ... | true | Assert.cs:33:13:33:13 | access to parameter b | true |
-| Assert.cs:34:24:34:32 | ... == ... | true | Assert.cs:34:24:34:24 | access to local variable s | null |
-| Assert.cs:35:27:35:27 | access to local variable s | non-null | Assert.cs:33:13:33:25 | ... ? ... : ... | non-null |
-| Assert.cs:35:27:35:27 | access to local variable s | null | Assert.cs:33:13:33:25 | ... ? ... : ... | null |
-| Assert.cs:37:13:37:25 | ... ? ... : ... | non-null | Assert.cs:37:13:37:13 | access to parameter b | false |
-| Assert.cs:37:13:37:25 | ... ? ... : ... | non-null | Assert.cs:37:24:37:25 | "" | non-null |
-| Assert.cs:37:13:37:25 | ... ? ... : ... | null | Assert.cs:37:13:37:13 | access to parameter b | true |
-| Assert.cs:37:13:37:25 | ... ? ... : ... | null | Assert.cs:37:17:37:20 | null | null |
-| Assert.cs:38:23:38:23 | access to local variable s | empty | Assert.cs:37:13:37:25 | ... ? ... : ... | empty |
-| Assert.cs:38:23:38:23 | access to local variable s | non-empty | Assert.cs:37:13:37:25 | ... ? ... : ... | non-empty |
-| Assert.cs:38:23:38:23 | access to local variable s | non-null | Assert.cs:37:13:37:25 | ... ? ... : ... | non-null |
-| Assert.cs:38:23:38:23 | access to local variable s | null | Assert.cs:37:13:37:25 | ... ? ... : ... | null |
-| Assert.cs:38:23:38:31 | ... != ... | false | Assert.cs:37:13:37:13 | access to parameter b | true |
-| Assert.cs:38:23:38:31 | ... != ... | false | Assert.cs:38:23:38:23 | access to local variable s | null |
-| Assert.cs:38:23:38:31 | ... != ... | true | Assert.cs:37:13:37:13 | access to parameter b | false |
-| Assert.cs:38:23:38:31 | ... != ... | true | Assert.cs:38:23:38:23 | access to local variable s | non-null |
-| Assert.cs:38:23:38:36 | ... && ... | true | Assert.cs:38:23:38:31 | ... != ... | true |
-| Assert.cs:38:23:38:36 | ... && ... | true | Assert.cs:38:36:38:36 | access to parameter b | true |
-| Assert.cs:39:27:39:27 | access to local variable s | non-null | Assert.cs:37:13:37:25 | ... ? ... : ... | non-null |
-| Assert.cs:39:27:39:27 | access to local variable s | null | Assert.cs:37:13:37:25 | ... ? ... : ... | null |
-| Assert.cs:41:13:41:25 | ... ? ... : ... | non-null | Assert.cs:41:13:41:13 | access to parameter b | false |
-| Assert.cs:41:13:41:25 | ... ? ... : ... | non-null | Assert.cs:41:24:41:25 | "" | non-null |
-| Assert.cs:41:13:41:25 | ... ? ... : ... | null | Assert.cs:41:13:41:13 | access to parameter b | true |
-| Assert.cs:41:13:41:25 | ... ? ... : ... | null | Assert.cs:41:17:41:20 | null | null |
-| Assert.cs:42:24:42:24 | access to local variable s | empty | Assert.cs:41:13:41:25 | ... ? ... : ... | empty |
-| Assert.cs:42:24:42:24 | access to local variable s | non-empty | Assert.cs:41:13:41:25 | ... ? ... : ... | non-empty |
-| Assert.cs:42:24:42:24 | access to local variable s | non-null | Assert.cs:41:13:41:25 | ... ? ... : ... | non-null |
-| Assert.cs:42:24:42:24 | access to local variable s | null | Assert.cs:41:13:41:25 | ... ? ... : ... | null |
-| Assert.cs:42:24:42:32 | ... == ... | false | Assert.cs:41:13:41:13 | access to parameter b | false |
-| Assert.cs:42:24:42:32 | ... == ... | false | Assert.cs:42:24:42:24 | access to local variable s | non-null |
-| Assert.cs:42:24:42:32 | ... == ... | true | Assert.cs:41:13:41:13 | access to parameter b | true |
-| Assert.cs:42:24:42:32 | ... == ... | true | Assert.cs:42:24:42:24 | access to local variable s | null |
-| Assert.cs:42:24:42:38 | ... \|\| ... | false | Assert.cs:42:24:42:32 | ... == ... | false |
-| Assert.cs:42:24:42:38 | ... \|\| ... | false | Assert.cs:42:37:42:38 | !... | false |
-| Assert.cs:42:37:42:38 | !... | false | Assert.cs:42:38:42:38 | access to parameter b | true |
-| Assert.cs:42:37:42:38 | !... | true | Assert.cs:42:38:42:38 | access to parameter b | false |
-| Assert.cs:43:27:43:27 | access to local variable s | non-null | Assert.cs:41:13:41:25 | ... ? ... : ... | non-null |
-| Assert.cs:43:27:43:27 | access to local variable s | null | Assert.cs:41:13:41:25 | ... ? ... : ... | null |
-| Assert.cs:45:13:45:25 | ... ? ... : ... | non-null | Assert.cs:45:13:45:13 | access to parameter b | false |
-| Assert.cs:45:13:45:25 | ... ? ... : ... | non-null | Assert.cs:45:24:45:25 | "" | non-null |
-| Assert.cs:45:13:45:25 | ... ? ... : ... | null | Assert.cs:45:13:45:13 | access to parameter b | true |
-| Assert.cs:45:13:45:25 | ... ? ... : ... | null | Assert.cs:45:17:45:20 | null | null |
-| Assert.cs:46:23:46:23 | access to local variable s | empty | Assert.cs:45:13:45:25 | ... ? ... : ... | empty |
-| Assert.cs:46:23:46:23 | access to local variable s | non-empty | Assert.cs:45:13:45:25 | ... ? ... : ... | non-empty |
-| Assert.cs:46:23:46:23 | access to local variable s | non-null | Assert.cs:45:13:45:25 | ... ? ... : ... | non-null |
-| Assert.cs:46:23:46:23 | access to local variable s | null | Assert.cs:45:13:45:25 | ... ? ... : ... | null |
-| Assert.cs:46:23:46:31 | ... == ... | false | Assert.cs:45:13:45:13 | access to parameter b | false |
-| Assert.cs:46:23:46:31 | ... == ... | false | Assert.cs:46:23:46:23 | access to local variable s | non-null |
-| Assert.cs:46:23:46:31 | ... == ... | true | Assert.cs:45:13:45:13 | access to parameter b | true |
-| Assert.cs:46:23:46:31 | ... == ... | true | Assert.cs:46:23:46:23 | access to local variable s | null |
-| Assert.cs:46:23:46:36 | ... && ... | true | Assert.cs:46:23:46:31 | ... == ... | true |
-| Assert.cs:46:23:46:36 | ... && ... | true | Assert.cs:46:36:46:36 | access to parameter b | true |
-| Assert.cs:47:27:47:27 | access to local variable s | non-null | Assert.cs:45:13:45:25 | ... ? ... : ... | non-null |
-| Assert.cs:47:27:47:27 | access to local variable s | null | Assert.cs:45:13:45:25 | ... ? ... : ... | null |
-| Assert.cs:49:13:49:25 | ... ? ... : ... | non-null | Assert.cs:49:13:49:13 | access to parameter b | false |
-| Assert.cs:49:13:49:25 | ... ? ... : ... | non-null | Assert.cs:49:24:49:25 | "" | non-null |
-| Assert.cs:49:13:49:25 | ... ? ... : ... | null | Assert.cs:49:13:49:13 | access to parameter b | true |
-| Assert.cs:49:13:49:25 | ... ? ... : ... | null | Assert.cs:49:17:49:20 | null | null |
-| Assert.cs:50:24:50:24 | access to local variable s | empty | Assert.cs:49:13:49:25 | ... ? ... : ... | empty |
-| Assert.cs:50:24:50:24 | access to local variable s | non-empty | Assert.cs:49:13:49:25 | ... ? ... : ... | non-empty |
-| Assert.cs:50:24:50:24 | access to local variable s | non-null | Assert.cs:49:13:49:25 | ... ? ... : ... | non-null |
-| Assert.cs:50:24:50:24 | access to local variable s | null | Assert.cs:49:13:49:25 | ... ? ... : ... | null |
-| Assert.cs:50:24:50:32 | ... != ... | false | Assert.cs:49:13:49:13 | access to parameter b | true |
-| Assert.cs:50:24:50:32 | ... != ... | false | Assert.cs:50:24:50:24 | access to local variable s | null |
-| Assert.cs:50:24:50:32 | ... != ... | true | Assert.cs:49:13:49:13 | access to parameter b | false |
-| Assert.cs:50:24:50:32 | ... != ... | true | Assert.cs:50:24:50:24 | access to local variable s | non-null |
-| Assert.cs:50:24:50:38 | ... \|\| ... | false | Assert.cs:50:24:50:32 | ... != ... | false |
-| Assert.cs:50:24:50:38 | ... \|\| ... | false | Assert.cs:50:37:50:38 | !... | false |
-| Assert.cs:50:37:50:38 | !... | false | Assert.cs:50:38:50:38 | access to parameter b | true |
-| Assert.cs:50:37:50:38 | !... | true | Assert.cs:50:38:50:38 | access to parameter b | false |
-| Assert.cs:51:27:51:27 | access to local variable s | non-null | Assert.cs:49:13:49:25 | ... ? ... : ... | non-null |
-| Assert.cs:51:27:51:27 | access to local variable s | null | Assert.cs:49:13:49:25 | ... ? ... : ... | null |
-| B.cs:12:13:12:24 | access to local variable eqCallAlways | non-null | B.cs:7:26:7:29 | null | non-null |
-| B.cs:12:13:12:24 | access to local variable eqCallAlways | null | B.cs:7:26:7:29 | null | null |
-| B.cs:12:13:12:32 | call to operator == | false | B.cs:12:13:12:24 | access to local variable eqCallAlways | non-null |
-| B.cs:12:13:12:32 | call to operator == | false | B.cs:12:29:12:32 | null | non-null |
-| B.cs:12:13:12:32 | call to operator == | true | B.cs:12:13:12:24 | access to local variable eqCallAlways | null |
-| B.cs:12:13:12:32 | call to operator == | true | B.cs:12:29:12:32 | null | null |
-| B.cs:13:13:13:24 | access to local variable eqCallAlways | non-null | B.cs:7:26:7:29 | null | non-null |
-| B.cs:13:13:13:24 | access to local variable eqCallAlways | null | B.cs:7:26:7:29 | null | null |
-| B.cs:15:13:15:14 | access to local variable b2 | non-null | B.cs:8:16:8:19 | null | non-null |
-| B.cs:15:13:15:14 | access to local variable b2 | null | B.cs:8:16:8:19 | null | null |
-| B.cs:15:13:15:22 | call to operator != | false | B.cs:15:13:15:14 | access to local variable b2 | null |
-| B.cs:15:13:15:22 | call to operator != | false | B.cs:15:19:15:22 | null | null |
-| B.cs:15:13:15:22 | call to operator != | true | B.cs:15:13:15:14 | access to local variable b2 | non-null |
-| B.cs:15:13:15:22 | call to operator != | true | B.cs:15:19:15:22 | null | non-null |
-| B.cs:16:13:16:14 | access to local variable b2 | non-null | B.cs:8:16:8:19 | null | non-null |
-| B.cs:16:13:16:14 | access to local variable b2 | null | B.cs:8:16:8:19 | null | null |
-| B.cs:18:13:18:14 | access to local variable b3 | non-null | B.cs:9:16:9:19 | null | non-null |
-| B.cs:18:13:18:14 | access to local variable b3 | null | B.cs:9:16:9:19 | null | null |
-| B.cs:18:13:18:22 | call to operator == | false | B.cs:18:13:18:14 | access to local variable b3 | non-null |
-| B.cs:18:13:18:22 | call to operator == | false | B.cs:18:19:18:22 | null | non-null |
-| B.cs:18:13:18:22 | call to operator == | true | B.cs:18:13:18:14 | access to local variable b3 | null |
-| B.cs:18:13:18:22 | call to operator == | true | B.cs:18:19:18:22 | null | null |
-| B.cs:20:13:20:14 | access to local variable b3 | non-null | B.cs:9:16:9:19 | null | non-null |
-| B.cs:20:13:20:14 | access to local variable b3 | null | B.cs:9:16:9:19 | null | null |
-| B.cs:22:13:22:25 | access to local variable neqCallAlways | non-null | B.cs:10:27:10:30 | null | non-null |
-| B.cs:22:13:22:25 | access to local variable neqCallAlways | null | B.cs:10:27:10:30 | null | null |
-| B.cs:22:13:22:33 | call to operator != | false | B.cs:22:13:22:25 | access to local variable neqCallAlways | null |
-| B.cs:22:13:22:33 | call to operator != | false | B.cs:22:30:22:33 | null | null |
-| B.cs:22:13:22:33 | call to operator != | true | B.cs:22:13:22:25 | access to local variable neqCallAlways | non-null |
-| B.cs:22:13:22:33 | call to operator != | true | B.cs:22:30:22:33 | null | non-null |
-| B.cs:24:13:24:25 | access to local variable neqCallAlways | non-null | B.cs:10:27:10:30 | null | non-null |
-| B.cs:24:13:24:25 | access to local variable neqCallAlways | null | B.cs:10:27:10:30 | null | null |
-| B.cs:34:16:34:26 | !... | false | B.cs:34:18:34:25 | call to operator == | true |
-| B.cs:34:16:34:26 | !... | true | B.cs:34:18:34:25 | call to operator == | false |
-| B.cs:53:17:53:25 | (...) ... | non-null | B.cs:53:25:53:25 | access to local variable o | non-null |
-| B.cs:53:17:53:25 | (...) ... | null | B.cs:53:25:53:25 | access to local variable o | null |
-| B.cs:53:17:53:33 | ... != ... | false | B.cs:53:17:53:25 | (...) ... | null |
-| B.cs:53:17:53:33 | ... != ... | false | B.cs:53:30:53:33 | null | null |
-| B.cs:53:17:53:33 | ... != ... | true | B.cs:53:17:53:25 | (...) ... | non-null |
-| B.cs:53:17:53:33 | ... != ... | true | B.cs:53:30:53:33 | null | non-null |
-| B.cs:53:25:53:25 | access to local variable o | non-null | B.cs:52:24:52:27 | null | non-null |
-| B.cs:53:25:53:25 | access to local variable o | null | B.cs:52:24:52:27 | null | null |
-| B.cs:55:26:55:26 | access to local variable o | non-null | B.cs:52:24:52:27 | null | non-null |
-| B.cs:55:26:55:26 | access to local variable o | null | B.cs:52:24:52:27 | null | null |
-| B.cs:55:26:55:36 | call to method Equals | false | B.cs:55:26:55:26 | access to local variable o | non-null |
-| B.cs:55:26:55:36 | call to method Equals | false | B.cs:55:35:55:35 | access to local variable o | non-null |
-| B.cs:55:26:55:36 | call to method Equals | true | B.cs:55:26:55:26 | access to local variable o | null |
-| B.cs:55:26:55:36 | call to method Equals | true | B.cs:55:35:55:35 | access to local variable o | null |
-| B.cs:55:35:55:35 | access to local variable o | non-null | B.cs:52:24:52:27 | null | non-null |
-| B.cs:55:35:55:35 | access to local variable o | null | B.cs:52:24:52:27 | null | null |
-| C.cs:11:13:11:30 | !... | false | C.cs:11:15:11:29 | !... | true |
-| C.cs:11:13:11:30 | !... | true | C.cs:11:15:11:29 | !... | false |
-| C.cs:11:15:11:29 | !... | false | C.cs:11:17:11:28 | !... | true |
-| C.cs:11:15:11:29 | !... | true | C.cs:11:17:11:28 | !... | false |
-| C.cs:11:17:11:28 | !... | false | C.cs:11:19:11:27 | ... == ... | true |
-| C.cs:11:17:11:28 | !... | true | C.cs:11:19:11:27 | ... == ... | false |
-| C.cs:11:19:11:19 | access to local variable o | non-null | C.cs:10:20:10:23 | null | non-null |
-| C.cs:11:19:11:19 | access to local variable o | null | C.cs:10:20:10:23 | null | null |
-| C.cs:11:19:11:27 | ... == ... | false | C.cs:11:19:11:19 | access to local variable o | non-null |
-| C.cs:11:19:11:27 | ... == ... | false | C.cs:11:24:11:27 | null | non-null |
-| C.cs:11:19:11:27 | ... == ... | true | C.cs:11:19:11:19 | access to local variable o | null |
-| C.cs:11:19:11:27 | ... == ... | true | C.cs:11:24:11:27 | null | null |
-| C.cs:13:13:13:13 | access to local variable o | non-null | C.cs:10:20:10:23 | null | non-null |
-| C.cs:13:13:13:13 | access to local variable o | null | C.cs:10:20:10:23 | null | null |
-| C.cs:16:13:16:24 | !... | false | C.cs:16:15:16:23 | ... != ... | true |
-| C.cs:16:13:16:24 | !... | true | C.cs:16:15:16:23 | ... != ... | false |
-| C.cs:16:15:16:15 | access to local variable o | non-null | C.cs:10:20:10:23 | null | non-null |
-| C.cs:16:15:16:15 | access to local variable o | null | C.cs:10:20:10:23 | null | null |
-| C.cs:16:15:16:23 | ... != ... | false | C.cs:16:15:16:15 | access to local variable o | null |
-| C.cs:16:15:16:23 | ... != ... | false | C.cs:16:20:16:23 | null | null |
-| C.cs:16:15:16:23 | ... != ... | true | C.cs:16:15:16:15 | access to local variable o | non-null |
-| C.cs:16:15:16:23 | ... != ... | true | C.cs:16:20:16:23 | null | non-null |
-| C.cs:18:13:18:13 | access to local variable o | non-null | C.cs:10:20:10:23 | null | non-null |
-| C.cs:18:13:18:13 | access to local variable o | null | C.cs:10:20:10:23 | null | null |
-| C.cs:24:13:24:21 | ... != ... | false | C.cs:24:13:24:13 | access to parameter o | null |
-| C.cs:24:13:24:21 | ... != ... | true | C.cs:24:13:24:13 | access to parameter o | non-null |
-| C.cs:28:37:28:45 | ... == ... | false | C.cs:28:37:28:37 | access to parameter o | non-null |
-| C.cs:28:37:28:45 | ... == ... | true | C.cs:28:37:28:37 | access to parameter o | null |
-| C.cs:30:40:30:48 | ... != ... | false | C.cs:30:40:30:40 | access to parameter o | null |
-| C.cs:30:40:30:48 | ... != ... | true | C.cs:30:40:30:40 | access to parameter o | non-null |
-| C.cs:34:13:34:21 | ... == ... | false | C.cs:34:13:34:13 | access to parameter o | non-null |
-| C.cs:34:13:34:21 | ... == ... | true | C.cs:34:13:34:13 | access to parameter o | null |
-| C.cs:40:17:40:35 | ... ? ... : ... | non-null | C.cs:40:17:40:23 | call to method Maybe | false |
-| C.cs:40:17:40:35 | ... ? ... : ... | non-null | C.cs:40:34:40:35 | "" | non-null |
-| C.cs:40:17:40:35 | ... ? ... : ... | null | C.cs:40:17:40:23 | call to method Maybe | true |
-| C.cs:40:17:40:35 | ... ? ... : ... | null | C.cs:40:27:40:30 | null | null |
-| C.cs:41:22:41:22 | access to local variable s | empty | C.cs:40:17:40:35 | ... ? ... : ... | empty |
-| C.cs:41:22:41:22 | access to local variable s | non-empty | C.cs:40:17:40:35 | ... ? ... : ... | non-empty |
-| C.cs:41:22:41:22 | access to local variable s | non-null | C.cs:40:17:40:35 | ... ? ... : ... | non-null |
-| C.cs:41:22:41:22 | access to local variable s | null | C.cs:40:17:40:35 | ... ? ... : ... | null |
-| C.cs:41:22:41:30 | ... == ... | false | C.cs:40:17:40:23 | call to method Maybe | false |
-| C.cs:41:22:41:30 | ... == ... | false | C.cs:41:22:41:22 | access to local variable s | non-null |
-| C.cs:41:22:41:30 | ... == ... | true | C.cs:40:17:40:23 | call to method Maybe | true |
-| C.cs:41:22:41:30 | ... == ... | true | C.cs:41:22:41:22 | access to local variable s | null |
-| C.cs:42:9:42:9 | access to local variable s | non-null | C.cs:40:17:40:35 | ... ? ... : ... | non-null |
-| C.cs:42:9:42:9 | access to local variable s | null | C.cs:40:17:40:35 | ... ? ... : ... | null |
-| C.cs:44:13:44:31 | ... ? ... : ... | non-null | C.cs:44:13:44:19 | call to method Maybe | false |
-| C.cs:44:13:44:31 | ... ? ... : ... | non-null | C.cs:44:30:44:31 | "" | non-null |
-| C.cs:44:13:44:31 | ... ? ... : ... | null | C.cs:44:13:44:19 | call to method Maybe | true |
-| C.cs:44:13:44:31 | ... ? ... : ... | null | C.cs:44:23:44:26 | null | null |
-| C.cs:45:22:45:22 | access to local variable s | empty | C.cs:44:13:44:31 | ... ? ... : ... | empty |
-| C.cs:45:22:45:22 | access to local variable s | non-empty | C.cs:44:13:44:31 | ... ? ... : ... | non-empty |
-| C.cs:45:22:45:22 | access to local variable s | non-null | C.cs:44:13:44:31 | ... ? ... : ... | non-null |
-| C.cs:45:22:45:22 | access to local variable s | null | C.cs:44:13:44:31 | ... ? ... : ... | null |
-| C.cs:45:22:45:30 | ... != ... | false | C.cs:44:13:44:19 | call to method Maybe | true |
-| C.cs:45:22:45:30 | ... != ... | false | C.cs:45:22:45:22 | access to local variable s | null |
-| C.cs:45:22:45:30 | ... != ... | true | C.cs:44:13:44:19 | call to method Maybe | false |
-| C.cs:45:22:45:30 | ... != ... | true | C.cs:45:22:45:22 | access to local variable s | non-null |
-| C.cs:46:9:46:9 | access to local variable s | non-null | C.cs:44:13:44:31 | ... ? ... : ... | non-null |
-| C.cs:46:9:46:9 | access to local variable s | null | C.cs:44:13:44:31 | ... ? ... : ... | null |
-| C.cs:52:20:52:21 | access to local variable o1 | non-null | C.cs:51:18:51:29 | object creation of type Object | non-null |
-| C.cs:52:20:52:21 | access to local variable o1 | null | C.cs:51:18:51:29 | object creation of type Object | null |
-| C.cs:53:9:53:10 | access to local variable o1 | non-null | C.cs:51:18:51:29 | object creation of type Object | non-null |
-| C.cs:53:9:53:10 | access to local variable o1 | null | C.cs:51:18:51:29 | object creation of type Object | null |
-| C.cs:55:18:55:36 | ... ? ... : ... | non-null | C.cs:55:18:55:24 | call to method Maybe | false |
-| C.cs:55:18:55:36 | ... ? ... : ... | non-null | C.cs:55:35:55:36 | "" | non-null |
-| C.cs:55:18:55:36 | ... ? ... : ... | null | C.cs:55:18:55:24 | call to method Maybe | true |
-| C.cs:55:18:55:36 | ... ? ... : ... | null | C.cs:55:28:55:31 | null | null |
-| C.cs:56:23:56:24 | access to local variable o2 | empty | C.cs:55:18:55:36 | ... ? ... : ... | empty |
-| C.cs:56:23:56:24 | access to local variable o2 | non-empty | C.cs:55:18:55:36 | ... ? ... : ... | non-empty |
-| C.cs:56:23:56:24 | access to local variable o2 | non-null | C.cs:55:18:55:24 | call to method Maybe | false |
-| C.cs:56:23:56:24 | access to local variable o2 | non-null | C.cs:55:18:55:36 | ... ? ... : ... | non-null |
-| C.cs:56:23:56:24 | access to local variable o2 | null | C.cs:55:18:55:24 | call to method Maybe | true |
-| C.cs:56:23:56:24 | access to local variable o2 | null | C.cs:55:18:55:36 | ... ? ... : ... | null |
-| C.cs:57:9:57:10 | access to local variable o2 | non-null | C.cs:55:18:55:36 | ... ? ... : ... | non-null |
-| C.cs:57:9:57:10 | access to local variable o2 | null | C.cs:55:18:55:36 | ... ? ... : ... | null |
-| C.cs:62:18:62:46 | ... ? ... : ... | non-null | C.cs:62:18:62:24 | call to method Maybe | false |
-| C.cs:62:18:62:46 | ... ? ... : ... | non-null | C.cs:62:35:62:46 | object creation of type Object | non-null |
-| C.cs:62:18:62:46 | ... ? ... : ... | null | C.cs:62:18:62:24 | call to method Maybe | true |
-| C.cs:62:18:62:46 | ... ? ... : ... | null | C.cs:62:28:62:31 | null | null |
-| C.cs:63:23:63:24 | access to local variable o1 | non-null | C.cs:62:18:62:46 | ... ? ... : ... | non-null |
-| C.cs:63:23:63:24 | access to local variable o1 | null | C.cs:62:18:62:46 | ... ? ... : ... | null |
-| C.cs:64:9:64:10 | access to local variable o1 | non-null | C.cs:62:18:62:46 | ... ? ... : ... | non-null |
-| C.cs:64:9:64:10 | access to local variable o1 | null | C.cs:62:18:62:46 | ... ? ... : ... | null |
-| C.cs:66:18:66:46 | ... ? ... : ... | non-null | C.cs:66:18:66:24 | call to method Maybe | false |
-| C.cs:66:18:66:46 | ... ? ... : ... | non-null | C.cs:66:35:66:46 | object creation of type Object | non-null |
-| C.cs:66:18:66:46 | ... ? ... : ... | null | C.cs:66:18:66:24 | call to method Maybe | true |
-| C.cs:66:18:66:46 | ... ? ... : ... | null | C.cs:66:28:66:31 | null | null |
-| C.cs:67:23:67:24 | access to local variable o1 | non-null | C.cs:62:18:62:46 | ... ? ... : ... | non-null |
-| C.cs:67:23:67:24 | access to local variable o1 | null | C.cs:62:18:62:46 | ... ? ... : ... | null |
-| C.cs:68:9:68:10 | access to local variable o2 | non-null | C.cs:66:18:66:46 | ... ? ... : ... | non-null |
-| C.cs:68:9:68:10 | access to local variable o2 | null | C.cs:66:18:66:46 | ... ? ... : ... | null |
-| C.cs:70:18:70:46 | ... ? ... : ... | non-null | C.cs:70:18:70:24 | call to method Maybe | false |
-| C.cs:70:18:70:46 | ... ? ... : ... | non-null | C.cs:70:35:70:46 | object creation of type Object | non-null |
-| C.cs:70:18:70:46 | ... ? ... : ... | null | C.cs:70:18:70:24 | call to method Maybe | true |
-| C.cs:70:18:70:46 | ... ? ... : ... | null | C.cs:70:28:70:31 | null | null |
-| C.cs:71:26:71:27 | access to local variable o3 | non-null | C.cs:70:18:70:24 | call to method Maybe | false |
-| C.cs:71:26:71:27 | access to local variable o3 | non-null | C.cs:70:18:70:46 | ... ? ... : ... | non-null |
-| C.cs:71:26:71:27 | access to local variable o3 | null | C.cs:70:18:70:24 | call to method Maybe | true |
-| C.cs:71:26:71:27 | access to local variable o3 | null | C.cs:70:18:70:46 | ... ? ... : ... | null |
-| C.cs:72:9:72:10 | access to local variable o3 | non-null | C.cs:70:18:70:46 | ... ? ... : ... | non-null |
-| C.cs:72:9:72:10 | access to local variable o3 | null | C.cs:70:18:70:46 | ... ? ... : ... | null |
-| C.cs:78:13:78:24 | call to method IsNotNull | false | C.cs:78:23:78:23 | access to local variable o | null |
-| C.cs:78:13:78:24 | call to method IsNotNull | true | C.cs:78:23:78:23 | access to local variable o | non-null |
-| C.cs:78:23:78:23 | access to local variable o | non-null | C.cs:77:20:77:23 | null | non-null |
-| C.cs:78:23:78:23 | access to local variable o | null | C.cs:77:20:77:23 | null | null |
-| C.cs:79:13:79:13 | access to local variable o | non-null | C.cs:77:20:77:23 | null | non-null |
-| C.cs:79:13:79:13 | access to local variable o | null | C.cs:77:20:77:23 | null | null |
-| C.cs:81:13:81:22 | !... | false | C.cs:81:14:81:22 | call to method IsNull | true |
-| C.cs:81:13:81:22 | !... | true | C.cs:81:14:81:22 | call to method IsNull | false |
-| C.cs:81:14:81:22 | call to method IsNull | false | C.cs:81:21:81:21 | access to local variable o | non-null |
-| C.cs:81:14:81:22 | call to method IsNull | true | C.cs:81:21:81:21 | access to local variable o | null |
-| C.cs:81:21:81:21 | access to local variable o | non-null | C.cs:77:20:77:23 | null | non-null |
-| C.cs:81:21:81:21 | access to local variable o | null | C.cs:77:20:77:23 | null | null |
-| C.cs:82:13:82:13 | access to local variable o | non-null | C.cs:77:20:77:23 | null | non-null |
-| C.cs:82:13:82:13 | access to local variable o | null | C.cs:77:20:77:23 | null | null |
-| C.cs:88:13:88:13 | access to local variable o | non-null | C.cs:87:20:87:23 | null | non-null |
-| C.cs:88:13:88:13 | access to local variable o | null | C.cs:87:20:87:23 | null | null |
-| C.cs:88:13:88:23 | ... is ... | true | C.cs:88:13:88:13 | access to local variable o | non-null |
-| C.cs:89:13:89:13 | access to local variable o | non-null | C.cs:87:20:87:23 | null | non-null |
-| C.cs:89:13:89:13 | access to local variable o | null | C.cs:87:20:87:23 | null | null |
-| C.cs:94:17:94:45 | ... ? ... : ... | non-null | C.cs:94:17:94:23 | call to method Maybe | false |
-| C.cs:94:17:94:45 | ... ? ... : ... | non-null | C.cs:94:34:94:45 | object creation of type Object | non-null |
-| C.cs:94:17:94:45 | ... ? ... : ... | null | C.cs:94:17:94:23 | call to method Maybe | true |
-| C.cs:94:17:94:45 | ... ? ... : ... | null | C.cs:94:27:94:30 | null | null |
-| C.cs:95:15:95:15 | access to local variable o | non-null | C.cs:94:17:94:45 | ... ? ... : ... | non-null |
-| C.cs:95:15:95:15 | access to local variable o | null | C.cs:94:17:94:45 | ... ? ... : ... | null |
-| C.cs:96:13:96:13 | access to local variable o | non-null | C.cs:94:17:94:45 | ... ? ... : ... | non-null |
-| C.cs:96:13:96:13 | access to local variable o | null | C.cs:94:17:94:45 | ... ? ... : ... | null |
-| C.cs:113:22:113:28 | access to local variable colours | empty | C.cs:112:26:112:29 | null | empty |
-| C.cs:113:22:113:28 | access to local variable colours | non-empty | C.cs:112:26:112:29 | null | non-empty |
-| C.cs:113:22:113:28 | access to local variable colours | non-null | C.cs:112:26:112:29 | null | non-null |
-| C.cs:113:22:113:28 | access to local variable colours | null | C.cs:112:26:112:29 | null | null |
-| C.cs:113:22:113:36 | ... == ... | false | C.cs:113:22:113:28 | access to local variable colours | non-null |
-| C.cs:113:22:113:36 | ... == ... | false | C.cs:113:33:113:36 | null | non-null |
-| C.cs:113:22:113:36 | ... == ... | true | C.cs:113:22:113:28 | access to local variable colours | null |
-| C.cs:113:22:113:36 | ... == ... | true | C.cs:113:33:113:36 | null | null |
-| C.cs:113:22:113:59 | ... \|\| ... | false | C.cs:113:22:113:36 | ... == ... | false |
-| C.cs:113:22:113:59 | ... \|\| ... | false | C.cs:113:41:113:59 | ... == ... | false |
-| C.cs:113:22:113:90 | ... ? ... : ... | null | C.cs:113:22:113:59 | ... \|\| ... | false |
-| C.cs:113:22:113:90 | ... ? ... : ... | null | C.cs:113:73:113:90 | call to method ToString | null |
-| C.cs:113:41:113:47 | access to local variable colours | non-null | C.cs:112:26:112:29 | null | non-null |
-| C.cs:113:41:113:47 | access to local variable colours | null | C.cs:112:26:112:29 | null | null |
-| C.cs:113:73:113:79 | access to local variable colours | non-null | C.cs:112:26:112:29 | null | non-null |
-| C.cs:113:73:113:79 | access to local variable colours | null | C.cs:112:26:112:29 | null | null |
-| C.cs:120:13:120:20 | access to local variable children | empty | C.cs:118:29:118:32 | null | empty |
-| C.cs:120:13:120:20 | access to local variable children | non-empty | C.cs:118:29:118:32 | null | non-empty |
-| C.cs:120:13:120:20 | access to local variable children | non-null | C.cs:118:29:118:32 | null | non-null |
-| C.cs:120:13:120:20 | access to local variable children | null | C.cs:118:29:118:32 | null | null |
-| C.cs:120:13:120:28 | ... == ... | false | C.cs:120:13:120:20 | access to local variable children | non-null |
-| C.cs:120:13:120:28 | ... == ... | false | C.cs:120:25:120:28 | null | non-null |
-| C.cs:120:13:120:28 | ... == ... | true | C.cs:120:13:120:20 | access to local variable children | null |
-| C.cs:120:13:120:28 | ... == ... | true | C.cs:120:25:120:28 | null | null |
-| C.cs:122:13:122:31 | ... > ... | true | C.cs:122:13:122:20 | access to local variable children | non-empty |
-| C.cs:129:13:129:38 | ... == ... | false | C.cs:129:14:129:29 | ... = ... | non-null |
-| C.cs:129:13:129:38 | ... == ... | false | C.cs:129:35:129:38 | null | non-null |
-| C.cs:129:13:129:38 | ... == ... | true | C.cs:129:14:129:29 | ... = ... | null |
-| C.cs:129:13:129:38 | ... == ... | true | C.cs:129:35:129:38 | null | null |
-| C.cs:129:13:129:55 | ... \|\| ... | false | C.cs:129:13:129:38 | ... == ... | false |
-| C.cs:129:13:129:55 | ... \|\| ... | false | C.cs:129:43:129:55 | ... > ... | false |
-| C.cs:129:14:129:29 | ... = ... | empty | C.cs:129:14:129:15 | access to local variable ok | empty |
-| C.cs:129:14:129:29 | ... = ... | empty | C.cs:129:20:129:28 | ... = ... | empty |
-| C.cs:129:14:129:29 | ... = ... | non-empty | C.cs:129:14:129:15 | access to local variable ok | non-empty |
-| C.cs:129:14:129:29 | ... = ... | non-empty | C.cs:129:20:129:28 | ... = ... | non-empty |
-| C.cs:129:14:129:29 | ... = ... | non-null | C.cs:129:14:129:15 | access to local variable ok | non-null |
-| C.cs:129:14:129:29 | ... = ... | non-null | C.cs:129:20:129:28 | ... = ... | non-null |
-| C.cs:129:14:129:29 | ... = ... | null | C.cs:129:14:129:15 | access to local variable ok | null |
-| C.cs:129:14:129:29 | ... = ... | null | C.cs:129:20:129:28 | ... = ... | null |
-| C.cs:129:20:129:28 | ... = ... | empty | C.cs:129:20:129:21 | access to local variable xx | empty |
-| C.cs:129:20:129:28 | ... = ... | empty | C.cs:129:25:129:28 | null | empty |
-| C.cs:129:20:129:28 | ... = ... | non-empty | C.cs:129:20:129:21 | access to local variable xx | non-empty |
-| C.cs:129:20:129:28 | ... = ... | non-empty | C.cs:129:25:129:28 | null | non-empty |
-| C.cs:129:20:129:28 | ... = ... | non-null | C.cs:129:20:129:21 | access to local variable xx | non-null |
-| C.cs:129:20:129:28 | ... = ... | non-null | C.cs:129:25:129:28 | null | non-null |
-| C.cs:129:20:129:28 | ... = ... | null | C.cs:129:20:129:21 | access to local variable xx | null |
-| C.cs:129:20:129:28 | ... = ... | null | C.cs:129:25:129:28 | null | null |
-| C.cs:129:43:129:44 | access to local variable ok | empty | C.cs:129:20:129:28 | ... = ... | empty |
-| C.cs:129:43:129:44 | access to local variable ok | non-empty | C.cs:129:20:129:28 | ... = ... | non-empty |
-| C.cs:129:43:129:44 | access to local variable ok | non-null | C.cs:129:20:129:28 | ... = ... | non-null |
-| C.cs:129:43:129:44 | access to local variable ok | null | C.cs:129:20:129:28 | ... = ... | null |
-| C.cs:137:13:137:48 | ... \|\| ... | false | C.cs:137:13:137:30 | call to local function Foo | false |
-| C.cs:137:13:137:48 | ... \|\| ... | false | C.cs:137:35:137:48 | ... > ... | false |
-| C.cs:137:17:137:29 | ... = ... | empty | C.cs:137:17:137:19 | access to local variable ok2 | empty |
-| C.cs:137:17:137:29 | ... = ... | empty | C.cs:137:23:137:29 | "hello" | empty |
-| C.cs:137:17:137:29 | ... = ... | non-empty | C.cs:137:17:137:19 | access to local variable ok2 | non-empty |
-| C.cs:137:17:137:29 | ... = ... | non-empty | C.cs:137:23:137:29 | "hello" | non-empty |
-| C.cs:137:17:137:29 | ... = ... | non-null | C.cs:137:17:137:19 | access to local variable ok2 | non-null |
-| C.cs:137:17:137:29 | ... = ... | non-null | C.cs:137:23:137:29 | "hello" | non-null |
-| C.cs:137:17:137:29 | ... = ... | null | C.cs:137:17:137:19 | access to local variable ok2 | null |
-| C.cs:137:17:137:29 | ... = ... | null | C.cs:137:23:137:29 | "hello" | null |
-| C.cs:137:35:137:37 | access to local variable ok2 | empty | C.cs:137:23:137:29 | "hello" | empty |
-| C.cs:137:35:137:37 | access to local variable ok2 | non-empty | C.cs:137:23:137:29 | "hello" | non-empty |
-| C.cs:137:35:137:37 | access to local variable ok2 | non-null | C.cs:137:23:137:29 | "hello" | non-null |
-| C.cs:137:35:137:37 | access to local variable ok2 | null | C.cs:137:23:137:29 | "hello" | null |
-| C.cs:145:13:145:39 | ... != ... | false | C.cs:145:14:145:30 | ... = ... | null |
-| C.cs:145:13:145:39 | ... != ... | false | C.cs:145:36:145:39 | null | null |
-| C.cs:145:13:145:39 | ... != ... | true | C.cs:145:14:145:30 | ... = ... | non-null |
-| C.cs:145:13:145:39 | ... != ... | true | C.cs:145:36:145:39 | null | non-null |
-| C.cs:145:13:145:57 | ... && ... | true | C.cs:145:13:145:39 | ... != ... | true |
-| C.cs:145:13:145:57 | ... && ... | true | C.cs:145:44:145:57 | ... > ... | true |
-| C.cs:145:14:145:30 | ... = ... | empty | C.cs:145:14:145:15 | access to local variable xx | empty |
-| C.cs:145:14:145:30 | ... = ... | empty | C.cs:145:20:145:29 | ... = ... | empty |
-| C.cs:145:14:145:30 | ... = ... | non-empty | C.cs:145:14:145:15 | access to local variable xx | non-empty |
-| C.cs:145:14:145:30 | ... = ... | non-empty | C.cs:145:20:145:29 | ... = ... | non-empty |
-| C.cs:145:14:145:30 | ... = ... | non-null | C.cs:145:14:145:15 | access to local variable xx | non-null |
-| C.cs:145:14:145:30 | ... = ... | non-null | C.cs:145:20:145:29 | ... = ... | non-null |
-| C.cs:145:14:145:30 | ... = ... | null | C.cs:145:14:145:15 | access to local variable xx | null |
-| C.cs:145:14:145:30 | ... = ... | null | C.cs:145:20:145:29 | ... = ... | null |
-| C.cs:145:20:145:29 | ... = ... | empty | C.cs:145:20:145:22 | access to local variable ok3 | empty |
-| C.cs:145:20:145:29 | ... = ... | empty | C.cs:145:26:145:29 | null | empty |
-| C.cs:145:20:145:29 | ... = ... | non-empty | C.cs:145:20:145:22 | access to local variable ok3 | non-empty |
-| C.cs:145:20:145:29 | ... = ... | non-empty | C.cs:145:26:145:29 | null | non-empty |
-| C.cs:145:20:145:29 | ... = ... | non-null | C.cs:145:20:145:22 | access to local variable ok3 | non-null |
-| C.cs:145:20:145:29 | ... = ... | non-null | C.cs:145:26:145:29 | null | non-null |
-| C.cs:145:20:145:29 | ... = ... | null | C.cs:145:20:145:22 | access to local variable ok3 | null |
-| C.cs:145:20:145:29 | ... = ... | null | C.cs:145:26:145:29 | null | null |
-| C.cs:145:44:145:46 | access to local variable ok3 | empty | C.cs:145:26:145:29 | null | empty |
-| C.cs:145:44:145:46 | access to local variable ok3 | non-empty | C.cs:145:26:145:29 | null | non-empty |
-| C.cs:145:44:145:46 | access to local variable ok3 | non-null | C.cs:145:26:145:29 | null | non-null |
-| C.cs:145:44:145:46 | access to local variable ok3 | null | C.cs:145:26:145:29 | null | null |
-| C.cs:157:16:157:16 | access to local variable s | empty | C.cs:155:17:155:20 | null | empty |
-| C.cs:157:16:157:16 | access to local variable s | non-empty | C.cs:155:17:155:20 | null | non-empty |
-| C.cs:157:16:157:16 | access to local variable s | non-null | C.cs:155:17:155:20 | null | non-null |
-| C.cs:157:16:157:16 | access to local variable s | null | C.cs:155:17:155:20 | null | null |
-| C.cs:157:16:157:24 | ... != ... | false | C.cs:157:16:157:16 | access to local variable s | null |
-| C.cs:157:16:157:24 | ... != ... | false | C.cs:157:21:157:24 | null | null |
-| C.cs:157:16:157:24 | ... != ... | true | C.cs:157:16:157:16 | access to local variable s | non-null |
-| C.cs:157:16:157:24 | ... != ... | true | C.cs:157:21:157:24 | null | non-null |
-| C.cs:165:16:165:16 | access to local variable s | empty | C.cs:163:17:163:20 | null | empty |
-| C.cs:165:16:165:16 | access to local variable s | non-empty | C.cs:163:17:163:20 | null | non-empty |
-| C.cs:165:16:165:16 | access to local variable s | non-null | C.cs:163:17:163:20 | null | non-null |
-| C.cs:165:16:165:16 | access to local variable s | null | C.cs:163:17:163:20 | null | null |
-| C.cs:165:16:165:24 | ... != ... | false | C.cs:165:16:165:16 | access to local variable s | null |
-| C.cs:165:16:165:24 | ... != ... | false | C.cs:165:21:165:24 | null | null |
-| C.cs:165:16:165:24 | ... != ... | true | C.cs:165:16:165:16 | access to local variable s | non-null |
-| C.cs:165:16:165:24 | ... != ... | true | C.cs:165:21:165:24 | null | non-null |
-| C.cs:170:13:170:13 | access to local variable s | non-null | C.cs:167:13:167:16 | null | non-null |
-| C.cs:170:13:170:13 | access to local variable s | null | C.cs:167:13:167:16 | null | null |
-| C.cs:172:16:172:16 | access to local variable s | non-null | C.cs:167:13:167:16 | null | non-null |
-| C.cs:172:16:172:16 | access to local variable s | null | C.cs:167:13:167:16 | null | null |
-| C.cs:172:16:172:24 | ... != ... | false | C.cs:172:16:172:16 | access to local variable s | null |
-| C.cs:172:16:172:24 | ... != ... | false | C.cs:172:21:172:24 | null | null |
-| C.cs:172:16:172:24 | ... != ... | true | C.cs:172:16:172:16 | access to local variable s | non-null |
-| C.cs:172:16:172:24 | ... != ... | true | C.cs:172:21:172:24 | null | non-null |
-| C.cs:186:16:186:24 | ... != ... | false | C.cs:186:16:186:16 | access to local variable s | null |
-| C.cs:186:16:186:24 | ... != ... | true | C.cs:186:16:186:16 | access to local variable s | non-null |
-| C.cs:210:17:210:35 | ... ? ... : ... | non-null | C.cs:210:17:210:23 | call to method Maybe | false |
-| C.cs:210:17:210:35 | ... ? ... : ... | non-null | C.cs:210:34:210:35 | "" | non-null |
-| C.cs:210:17:210:35 | ... ? ... : ... | null | C.cs:210:17:210:23 | call to method Maybe | true |
-| C.cs:210:17:210:35 | ... ? ... : ... | null | C.cs:210:27:210:30 | null | null |
-| C.cs:211:13:211:13 | access to local variable s | empty | C.cs:210:17:210:35 | ... ? ... : ... | empty |
-| C.cs:211:13:211:13 | access to local variable s | non-empty | C.cs:210:17:210:35 | ... ? ... : ... | non-empty |
-| C.cs:211:13:211:13 | access to local variable s | non-null | C.cs:210:17:210:35 | ... ? ... : ... | non-null |
-| C.cs:211:13:211:13 | access to local variable s | null | C.cs:210:17:210:35 | ... ? ... : ... | null |
-| C.cs:211:13:211:21 | ... != ... | false | C.cs:210:17:210:23 | call to method Maybe | true |
-| C.cs:211:13:211:21 | ... != ... | false | C.cs:211:13:211:13 | access to local variable s | null |
-| C.cs:211:13:211:21 | ... != ... | true | C.cs:210:17:210:23 | call to method Maybe | false |
-| C.cs:211:13:211:21 | ... != ... | true | C.cs:211:13:211:13 | access to local variable s | non-null |
-| C.cs:213:13:213:13 | access to local variable s | non-null | C.cs:210:17:210:35 | ... ? ... : ... | non-null |
-| C.cs:213:13:213:13 | access to local variable s | null | C.cs:210:17:210:35 | ... ? ... : ... | null |
-| C.cs:217:13:217:21 | ... == ... | false | C.cs:211:13:211:21 | ... != ... | false |
-| C.cs:217:13:217:21 | ... == ... | false | C.cs:217:13:217:13 | access to local variable s | non-null |
-| C.cs:217:13:217:21 | ... == ... | true | C.cs:217:13:217:13 | access to local variable s | null |
-| C.cs:221:13:221:13 | access to local variable s | empty | C.cs:220:13:220:14 | "" | empty |
-| C.cs:221:13:221:13 | access to local variable s | non-empty | C.cs:220:13:220:14 | "" | non-empty |
-| C.cs:221:13:221:13 | access to local variable s | non-null | C.cs:220:13:220:14 | "" | non-null |
-| C.cs:221:13:221:13 | access to local variable s | null | C.cs:220:13:220:14 | "" | null |
-| C.cs:221:13:221:21 | ... != ... | false | C.cs:221:13:221:13 | access to local variable s | null |
-| C.cs:221:13:221:21 | ... != ... | false | C.cs:221:18:221:21 | null | non-null |
-| C.cs:221:13:221:21 | ... != ... | true | C.cs:221:13:221:13 | access to local variable s | non-null |
-| C.cs:221:13:221:42 | ... && ... | true | C.cs:221:13:221:21 | ... != ... | true |
-| C.cs:221:13:221:42 | ... && ... | true | C.cs:221:26:221:42 | ... == ... | true |
-| C.cs:221:26:221:26 | access to local variable s | non-null | C.cs:220:13:220:14 | "" | non-null |
-| C.cs:221:26:221:26 | access to local variable s | null | C.cs:220:13:220:14 | "" | null |
-| C.cs:229:14:229:19 | ... = ... | empty | C.cs:229:14:229:14 | access to local variable s | empty |
-| C.cs:229:14:229:19 | ... = ... | empty | C.cs:229:18:229:19 | "" | empty |
-| C.cs:229:14:229:19 | ... = ... | non-empty | C.cs:229:14:229:14 | access to local variable s | non-empty |
-| C.cs:229:14:229:19 | ... = ... | non-empty | C.cs:229:18:229:19 | "" | non-empty |
-| C.cs:229:14:229:19 | ... = ... | non-null | C.cs:229:14:229:14 | access to local variable s | non-null |
-| C.cs:229:14:229:19 | ... = ... | non-null | C.cs:229:18:229:19 | "" | non-null |
-| C.cs:229:14:229:19 | ... = ... | null | C.cs:229:14:229:14 | access to local variable s | null |
-| C.cs:229:14:229:19 | ... = ... | null | C.cs:229:18:229:19 | "" | null |
-| C.cs:229:22:229:30 | ... != ... | false | C.cs:229:22:229:22 | access to local variable s | null |
-| C.cs:229:22:229:30 | ... != ... | true | C.cs:229:22:229:22 | access to local variable s | non-null |
-| C.cs:229:33:229:40 | ... = ... | empty | C.cs:229:33:229:33 | access to local variable s | empty |
-| C.cs:229:33:229:40 | ... = ... | empty | C.cs:229:37:229:40 | null | empty |
-| C.cs:229:33:229:40 | ... = ... | non-empty | C.cs:229:33:229:33 | access to local variable s | non-empty |
-| C.cs:229:33:229:40 | ... = ... | non-empty | C.cs:229:37:229:40 | null | non-empty |
-| C.cs:229:33:229:40 | ... = ... | non-null | C.cs:229:33:229:33 | access to local variable s | non-null |
-| C.cs:229:33:229:40 | ... = ... | non-null | C.cs:229:37:229:40 | null | non-null |
-| C.cs:229:33:229:40 | ... = ... | null | C.cs:229:33:229:33 | access to local variable s | null |
-| C.cs:229:33:229:40 | ... = ... | null | C.cs:229:37:229:40 | null | null |
-| C.cs:235:14:235:21 | ... = ... | empty | C.cs:235:14:235:14 | access to local variable s | empty |
-| C.cs:235:14:235:21 | ... = ... | empty | C.cs:235:18:235:21 | null | empty |
-| C.cs:235:14:235:21 | ... = ... | non-empty | C.cs:235:14:235:14 | access to local variable s | non-empty |
-| C.cs:235:14:235:21 | ... = ... | non-empty | C.cs:235:18:235:21 | null | non-empty |
-| C.cs:235:14:235:21 | ... = ... | non-null | C.cs:235:14:235:14 | access to local variable s | non-null |
-| C.cs:235:14:235:21 | ... = ... | non-null | C.cs:235:18:235:21 | null | non-null |
-| C.cs:235:14:235:21 | ... = ... | null | C.cs:235:14:235:14 | access to local variable s | null |
-| C.cs:235:14:235:21 | ... = ... | null | C.cs:235:18:235:21 | null | null |
-| C.cs:235:24:235:32 | ... == ... | false | C.cs:235:24:235:24 | access to local variable s | non-null |
-| C.cs:235:24:235:32 | ... == ... | false | C.cs:235:29:235:32 | null | non-null |
-| C.cs:235:24:235:32 | ... == ... | true | C.cs:235:24:235:24 | access to local variable s | null |
-| C.cs:235:24:235:32 | ... == ... | true | C.cs:235:29:235:32 | null | null |
-| C.cs:235:35:235:42 | ... = ... | empty | C.cs:235:35:235:35 | access to local variable s | empty |
-| C.cs:235:35:235:42 | ... = ... | empty | C.cs:235:39:235:42 | null | empty |
-| C.cs:235:35:235:42 | ... = ... | non-empty | C.cs:235:35:235:35 | access to local variable s | non-empty |
-| C.cs:235:35:235:42 | ... = ... | non-empty | C.cs:235:39:235:42 | null | non-empty |
-| C.cs:235:35:235:42 | ... = ... | non-null | C.cs:235:35:235:35 | access to local variable s | non-null |
-| C.cs:235:35:235:42 | ... = ... | non-null | C.cs:235:39:235:42 | null | non-null |
-| C.cs:235:35:235:42 | ... = ... | null | C.cs:235:35:235:35 | access to local variable s | null |
-| C.cs:235:35:235:42 | ... = ... | null | C.cs:235:39:235:42 | null | null |
-| C.cs:240:14:240:19 | ... = ... | empty | C.cs:240:14:240:14 | access to local variable s | empty |
-| C.cs:240:14:240:19 | ... = ... | empty | C.cs:240:18:240:19 | "" | empty |
-| C.cs:240:14:240:19 | ... = ... | non-empty | C.cs:240:14:240:14 | access to local variable s | non-empty |
-| C.cs:240:14:240:19 | ... = ... | non-empty | C.cs:240:18:240:19 | "" | non-empty |
-| C.cs:240:14:240:19 | ... = ... | non-null | C.cs:240:14:240:14 | access to local variable s | non-null |
-| C.cs:240:14:240:19 | ... = ... | non-null | C.cs:240:18:240:19 | "" | non-null |
-| C.cs:240:14:240:19 | ... = ... | null | C.cs:240:14:240:14 | access to local variable s | null |
-| C.cs:240:14:240:19 | ... = ... | null | C.cs:240:18:240:19 | "" | null |
-| C.cs:240:24:240:31 | ... = ... | empty | C.cs:240:24:240:24 | access to local variable s | empty |
-| C.cs:240:24:240:31 | ... = ... | empty | C.cs:240:28:240:31 | null | empty |
-| C.cs:240:24:240:31 | ... = ... | non-empty | C.cs:240:24:240:24 | access to local variable s | non-empty |
-| C.cs:240:24:240:31 | ... = ... | non-empty | C.cs:240:28:240:31 | null | non-empty |
-| C.cs:240:24:240:31 | ... = ... | non-null | C.cs:240:24:240:24 | access to local variable s | non-null |
-| C.cs:240:24:240:31 | ... = ... | non-null | C.cs:240:28:240:31 | null | non-null |
-| C.cs:240:24:240:31 | ... = ... | null | C.cs:240:24:240:24 | access to local variable s | null |
-| C.cs:240:24:240:31 | ... = ... | null | C.cs:240:28:240:31 | null | null |
-| C.cs:249:9:249:9 | access to local variable a | empty | C.cs:248:19:248:22 | null | empty |
-| C.cs:249:9:249:9 | access to local variable a | non-empty | C.cs:248:19:248:22 | null | non-empty |
-| C.cs:249:9:249:9 | access to local variable a | non-null | C.cs:248:19:248:22 | null | non-null |
-| C.cs:249:9:249:9 | access to local variable a | null | C.cs:248:19:248:22 | null | null |
-| C.cs:252:9:252:9 | access to local variable a | empty | C.cs:251:13:251:23 | array creation of type Int32[] | empty |
-| C.cs:252:9:252:9 | access to local variable a | non-empty | C.cs:251:13:251:23 | array creation of type Int32[] | non-empty |
-| C.cs:252:9:252:9 | access to local variable a | non-null | C.cs:251:13:251:23 | array creation of type Int32[] | non-null |
-| C.cs:252:9:252:9 | access to local variable a | null | C.cs:251:13:251:23 | array creation of type Int32[] | null |
-| C.cs:260:9:260:10 | access to local variable ia | empty | C.cs:257:20:257:23 | null | empty |
-| C.cs:260:9:260:10 | access to local variable ia | non-empty | C.cs:257:20:257:23 | null | non-empty |
-| C.cs:260:9:260:10 | access to local variable ia | non-null | C.cs:257:20:257:23 | null | non-null |
-| C.cs:260:9:260:10 | access to local variable ia | null | C.cs:257:20:257:23 | null | null |
-| C.cs:261:20:261:21 | access to local variable sa | empty | C.cs:258:23:258:26 | null | empty |
-| C.cs:261:20:261:21 | access to local variable sa | non-empty | C.cs:258:23:258:26 | null | non-empty |
-| C.cs:261:20:261:21 | access to local variable sa | non-null | C.cs:258:23:258:26 | null | non-null |
-| C.cs:261:20:261:21 | access to local variable sa | null | C.cs:258:23:258:26 | null | null |
-| C.cs:263:9:263:10 | access to local variable ia | non-null | C.cs:257:20:257:23 | null | non-null |
-| C.cs:263:9:263:10 | access to local variable ia | null | C.cs:257:20:257:23 | null | null |
-| C.cs:264:16:264:17 | access to local variable sa | non-null | C.cs:258:23:258:26 | null | non-null |
-| C.cs:264:16:264:17 | access to local variable sa | null | C.cs:258:23:258:26 | null | null |
-| D.cs:28:13:28:25 | ... != ... | false | D.cs:28:13:28:17 | access to parameter param | null |
-| D.cs:28:13:28:25 | ... != ... | true | D.cs:28:13:28:17 | access to parameter param | non-null |
-| D.cs:37:13:37:23 | ... is ... | true | D.cs:37:13:37:13 | access to parameter x | non-null |
-| D.cs:38:13:38:21 | ... == ... | false | D.cs:38:13:38:13 | access to parameter x | non-null |
-| D.cs:38:13:38:21 | ... == ... | true | D.cs:38:13:38:13 | access to parameter x | null |
-| D.cs:39:16:39:24 | ... == ... | false | D.cs:39:16:39:16 | access to parameter x | non-null |
-| D.cs:39:16:39:24 | ... == ... | true | D.cs:39:16:39:16 | access to parameter x | null |
-| D.cs:44:18:44:44 | ... ? ... : ... | non-null | D.cs:44:18:44:22 | access to field maybe | false |
-| D.cs:44:18:44:44 | ... ? ... : ... | non-null | D.cs:44:33:44:44 | object creation of type Object | non-null |
-| D.cs:44:18:44:44 | ... ? ... : ... | null | D.cs:44:18:44:22 | access to field maybe | true |
-| D.cs:44:18:44:44 | ... ? ... : ... | null | D.cs:44:26:44:29 | null | null |
-| D.cs:45:13:45:14 | access to local variable o1 | non-null | D.cs:44:18:44:44 | ... ? ... : ... | non-null |
-| D.cs:45:13:45:14 | access to local variable o1 | null | D.cs:44:18:44:44 | ... ? ... : ... | null |
-| D.cs:45:13:45:22 | ... != ... | false | D.cs:44:18:44:22 | access to field maybe | true |
-| D.cs:45:13:45:22 | ... != ... | false | D.cs:45:13:45:14 | access to local variable o1 | null |
-| D.cs:45:13:45:22 | ... != ... | true | D.cs:44:18:44:22 | access to field maybe | false |
-| D.cs:45:13:45:22 | ... != ... | true | D.cs:45:13:45:14 | access to local variable o1 | non-null |
-| D.cs:45:25:45:26 | access to local variable o1 | non-null | D.cs:44:18:44:44 | ... ? ... : ... | non-null |
-| D.cs:45:25:45:26 | access to local variable o1 | null | D.cs:44:18:44:44 | ... ? ... : ... | null |
-| D.cs:47:18:47:34 | ... ? ... : ... | non-null | D.cs:47:18:47:22 | access to field maybe | false |
-| D.cs:47:18:47:34 | ... ? ... : ... | non-null | D.cs:47:33:47:34 | "" | non-null |
-| D.cs:47:18:47:34 | ... ? ... : ... | null | D.cs:47:18:47:22 | access to field maybe | true |
-| D.cs:47:18:47:34 | ... ? ... : ... | null | D.cs:47:26:47:29 | null | null |
-| D.cs:48:13:48:14 | access to local variable o2 | empty | D.cs:47:18:47:34 | ... ? ... : ... | empty |
-| D.cs:48:13:48:14 | access to local variable o2 | non-empty | D.cs:47:18:47:34 | ... ? ... : ... | non-empty |
-| D.cs:48:13:48:14 | access to local variable o2 | non-null | D.cs:47:18:47:34 | ... ? ... : ... | non-null |
-| D.cs:48:13:48:14 | access to local variable o2 | null | D.cs:47:18:47:34 | ... ? ... : ... | null |
-| D.cs:48:13:48:24 | ... is ... | false | D.cs:47:18:47:22 | access to field maybe | true |
-| D.cs:48:13:48:24 | ... is ... | false | D.cs:48:13:48:14 | access to local variable o2 | null |
-| D.cs:48:13:48:24 | ... is ... | true | D.cs:47:18:47:22 | access to field maybe | false |
-| D.cs:48:13:48:24 | ... is ... | true | D.cs:48:13:48:14 | access to local variable o2 | non-null |
-| D.cs:48:27:48:28 | access to local variable o2 | non-null | D.cs:47:18:47:34 | ... ? ... : ... | non-null |
-| D.cs:48:27:48:28 | access to local variable o2 | null | D.cs:47:18:47:34 | ... ? ... : ... | null |
-| D.cs:51:13:51:44 | ... != ... | false | D.cs:51:14:51:35 | ... = ... | null |
-| D.cs:51:13:51:44 | ... != ... | true | D.cs:51:14:51:35 | ... = ... | non-null |
-| D.cs:51:14:51:35 | ... = ... | non-null | D.cs:51:14:51:15 | access to local variable o3 | non-null |
-| D.cs:51:14:51:35 | ... = ... | non-null | D.cs:51:19:51:35 | ... ? ... : ... | non-null |
-| D.cs:51:14:51:35 | ... = ... | null | D.cs:51:14:51:15 | access to local variable o3 | null |
-| D.cs:51:14:51:35 | ... = ... | null | D.cs:51:19:51:35 | ... ? ... : ... | null |
-| D.cs:51:19:51:35 | ... ? ... : ... | non-null | D.cs:51:19:51:23 | access to field maybe | false |
-| D.cs:51:19:51:35 | ... ? ... : ... | non-null | D.cs:51:34:51:35 | "" | non-null |
-| D.cs:51:19:51:35 | ... ? ... : ... | null | D.cs:51:19:51:23 | access to field maybe | true |
-| D.cs:51:19:51:35 | ... ? ... : ... | null | D.cs:51:27:51:30 | null | null |
-| D.cs:52:13:52:14 | access to local variable o3 | non-null | D.cs:51:19:51:35 | ... ? ... : ... | non-null |
-| D.cs:52:13:52:14 | access to local variable o3 | null | D.cs:51:19:51:35 | ... ? ... : ... | null |
-| D.cs:54:18:54:34 | ... ? ... : ... | non-null | D.cs:54:18:54:22 | access to field maybe | false |
-| D.cs:54:18:54:34 | ... ? ... : ... | non-null | D.cs:54:33:54:34 | "" | non-null |
-| D.cs:54:18:54:34 | ... ? ... : ... | null | D.cs:54:18:54:22 | access to field maybe | true |
-| D.cs:54:18:54:34 | ... ? ... : ... | null | D.cs:54:26:54:29 | null | null |
-| D.cs:55:13:55:42 | ... != ... | false | D.cs:55:14:55:32 | ... && ... | false |
-| D.cs:55:13:55:42 | ... != ... | true | D.cs:55:14:55:32 | ... && ... | true |
-| D.cs:55:14:55:32 | ... && ... | true | D.cs:55:14:55:18 | ... > ... | true |
-| D.cs:55:14:55:32 | ... && ... | true | D.cs:55:23:55:32 | ... != ... | true |
-| D.cs:55:23:55:24 | access to local variable o4 | empty | D.cs:54:18:54:34 | ... ? ... : ... | empty |
-| D.cs:55:23:55:24 | access to local variable o4 | non-empty | D.cs:54:18:54:34 | ... ? ... : ... | non-empty |
-| D.cs:55:23:55:24 | access to local variable o4 | non-null | D.cs:54:18:54:34 | ... ? ... : ... | non-null |
-| D.cs:55:23:55:24 | access to local variable o4 | null | D.cs:54:18:54:34 | ... ? ... : ... | null |
-| D.cs:55:23:55:32 | ... != ... | false | D.cs:54:18:54:22 | access to field maybe | true |
-| D.cs:55:23:55:32 | ... != ... | false | D.cs:55:23:55:24 | access to local variable o4 | null |
-| D.cs:55:23:55:32 | ... != ... | true | D.cs:54:18:54:22 | access to field maybe | false |
-| D.cs:55:23:55:32 | ... != ... | true | D.cs:55:23:55:24 | access to local variable o4 | non-null |
-| D.cs:56:13:56:14 | access to local variable o4 | non-null | D.cs:54:18:54:34 | ... ? ... : ... | non-null |
-| D.cs:56:13:56:14 | access to local variable o4 | null | D.cs:54:18:54:34 | ... ? ... : ... | null |
-| D.cs:58:18:58:41 | ... ? ... : ... | non-null | D.cs:58:19:58:28 | ... != ... | true |
-| D.cs:58:18:58:41 | ... ? ... : ... | non-null | D.cs:58:33:58:34 | "" | non-null |
-| D.cs:58:18:58:41 | ... ? ... : ... | null | D.cs:58:19:58:28 | ... != ... | false |
-| D.cs:58:18:58:41 | ... ? ... : ... | null | D.cs:58:38:58:41 | null | null |
-| D.cs:58:19:58:20 | access to local variable o4 | non-null | D.cs:54:18:54:34 | ... ? ... : ... | non-null |
-| D.cs:58:19:58:20 | access to local variable o4 | null | D.cs:54:18:54:34 | ... ? ... : ... | null |
-| D.cs:58:19:58:28 | ... != ... | false | D.cs:54:18:54:22 | access to field maybe | true |
-| D.cs:58:19:58:28 | ... != ... | false | D.cs:58:19:58:20 | access to local variable o4 | null |
-| D.cs:58:19:58:28 | ... != ... | true | D.cs:54:18:54:22 | access to field maybe | false |
-| D.cs:58:19:58:28 | ... != ... | true | D.cs:58:19:58:20 | access to local variable o4 | non-null |
-| D.cs:59:13:59:14 | access to local variable o5 | empty | D.cs:58:18:58:41 | ... ? ... : ... | empty |
-| D.cs:59:13:59:14 | access to local variable o5 | non-empty | D.cs:58:18:58:41 | ... ? ... : ... | non-empty |
-| D.cs:59:13:59:14 | access to local variable o5 | non-null | D.cs:58:18:58:41 | ... ? ... : ... | non-null |
-| D.cs:59:13:59:14 | access to local variable o5 | null | D.cs:58:18:58:41 | ... ? ... : ... | null |
-| D.cs:59:13:59:22 | ... != ... | false | D.cs:58:19:58:28 | ... != ... | false |
-| D.cs:59:13:59:22 | ... != ... | false | D.cs:59:13:59:14 | access to local variable o5 | null |
-| D.cs:59:13:59:22 | ... != ... | true | D.cs:58:19:58:28 | ... != ... | true |
-| D.cs:59:13:59:22 | ... != ... | true | D.cs:59:13:59:14 | access to local variable o5 | non-null |
-| D.cs:60:13:60:14 | access to local variable o4 | non-null | D.cs:54:18:54:34 | ... ? ... : ... | non-null |
-| D.cs:60:13:60:14 | access to local variable o4 | null | D.cs:54:18:54:34 | ... ? ... : ... | null |
-| D.cs:61:13:61:14 | access to local variable o4 | non-null | D.cs:54:18:54:34 | ... ? ... : ... | non-null |
-| D.cs:61:13:61:14 | access to local variable o4 | null | D.cs:54:18:54:34 | ... ? ... : ... | null |
-| D.cs:61:13:61:22 | ... != ... | false | D.cs:54:18:54:22 | access to field maybe | true |
-| D.cs:61:13:61:22 | ... != ... | false | D.cs:61:13:61:14 | access to local variable o4 | null |
-| D.cs:61:13:61:22 | ... != ... | true | D.cs:54:18:54:22 | access to field maybe | false |
-| D.cs:61:13:61:22 | ... != ... | true | D.cs:61:13:61:14 | access to local variable o4 | non-null |
-| D.cs:62:13:62:14 | access to local variable o5 | non-null | D.cs:58:18:58:41 | ... ? ... : ... | non-null |
-| D.cs:62:13:62:14 | access to local variable o5 | null | D.cs:58:18:58:41 | ... ? ... : ... | null |
-| D.cs:64:18:64:34 | ... ? ... : ... | non-null | D.cs:64:18:64:22 | access to field maybe | false |
-| D.cs:64:18:64:34 | ... ? ... : ... | non-null | D.cs:64:33:64:34 | "" | non-null |
-| D.cs:64:18:64:34 | ... ? ... : ... | null | D.cs:64:18:64:22 | access to field maybe | true |
-| D.cs:64:18:64:34 | ... ? ... : ... | null | D.cs:64:26:64:29 | null | null |
-| D.cs:65:13:65:29 | !... | false | D.cs:65:14:65:29 | call to method CustomIsNull | true |
-| D.cs:65:13:65:29 | !... | true | D.cs:65:14:65:29 | call to method CustomIsNull | false |
-| D.cs:65:14:65:29 | call to method CustomIsNull | false | D.cs:64:18:64:22 | access to field maybe | false |
-| D.cs:65:14:65:29 | call to method CustomIsNull | false | D.cs:65:27:65:28 | access to local variable o6 | non-null |
-| D.cs:65:14:65:29 | call to method CustomIsNull | true | D.cs:64:18:64:22 | access to field maybe | true |
-| D.cs:65:14:65:29 | call to method CustomIsNull | true | D.cs:65:27:65:28 | access to local variable o6 | null |
-| D.cs:65:27:65:28 | access to local variable o6 | empty | D.cs:64:18:64:34 | ... ? ... : ... | empty |
-| D.cs:65:27:65:28 | access to local variable o6 | non-empty | D.cs:64:18:64:34 | ... ? ... : ... | non-empty |
-| D.cs:65:27:65:28 | access to local variable o6 | non-null | D.cs:64:18:64:34 | ... ? ... : ... | non-null |
-| D.cs:65:27:65:28 | access to local variable o6 | null | D.cs:64:18:64:34 | ... ? ... : ... | null |
-| D.cs:66:13:66:14 | access to local variable o6 | non-null | D.cs:64:18:64:34 | ... ? ... : ... | non-null |
-| D.cs:66:13:66:14 | access to local variable o6 | null | D.cs:64:18:64:34 | ... ? ... : ... | null |
-| D.cs:68:18:68:34 | ... ? ... : ... | non-null | D.cs:68:18:68:22 | access to field maybe | false |
-| D.cs:68:18:68:34 | ... ? ... : ... | non-null | D.cs:68:33:68:34 | "" | non-null |
-| D.cs:68:18:68:34 | ... ? ... : ... | null | D.cs:68:18:68:22 | access to field maybe | true |
-| D.cs:68:18:68:34 | ... ? ... : ... | null | D.cs:68:26:68:29 | null | null |
-| D.cs:69:18:69:19 | access to local variable o7 | empty | D.cs:68:18:68:34 | ... ? ... : ... | empty |
-| D.cs:69:18:69:19 | access to local variable o7 | non-empty | D.cs:68:18:68:34 | ... ? ... : ... | non-empty |
-| D.cs:69:18:69:19 | access to local variable o7 | non-null | D.cs:68:18:68:34 | ... ? ... : ... | non-null |
-| D.cs:69:18:69:19 | access to local variable o7 | null | D.cs:68:18:68:34 | ... ? ... : ... | null |
-| D.cs:69:18:69:27 | ... != ... | false | D.cs:68:18:68:22 | access to field maybe | true |
-| D.cs:69:18:69:27 | ... != ... | false | D.cs:69:18:69:19 | access to local variable o7 | null |
-| D.cs:69:18:69:27 | ... != ... | true | D.cs:68:18:68:22 | access to field maybe | false |
-| D.cs:69:18:69:27 | ... != ... | true | D.cs:69:18:69:19 | access to local variable o7 | non-null |
-| D.cs:69:18:69:36 | ... && ... | true | D.cs:69:18:69:27 | ... != ... | true |
-| D.cs:69:18:69:36 | ... && ... | true | D.cs:69:32:69:36 | ... > ... | true |
-| D.cs:70:13:70:14 | access to local variable ok | false | D.cs:69:18:69:36 | ... && ... | false |
-| D.cs:70:13:70:14 | access to local variable ok | true | D.cs:69:18:69:36 | ... && ... | true |
-| D.cs:71:13:71:14 | access to local variable o7 | non-null | D.cs:68:18:68:34 | ... ? ... : ... | non-null |
-| D.cs:71:13:71:14 | access to local variable o7 | null | D.cs:68:18:68:34 | ... ? ... : ... | null |
-| D.cs:73:13:73:14 | access to local variable o7 | non-null | D.cs:68:18:68:34 | ... ? ... : ... | non-null |
-| D.cs:73:13:73:14 | access to local variable o7 | null | D.cs:68:18:68:34 | ... ? ... : ... | null |
-| D.cs:75:18:75:34 | ... ? ... : ... | non-null | D.cs:75:18:75:22 | access to field maybe | false |
-| D.cs:75:18:75:34 | ... ? ... : ... | non-null | D.cs:75:33:75:34 | "" | non-null |
-| D.cs:75:18:75:34 | ... ? ... : ... | null | D.cs:75:18:75:22 | access to field maybe | true |
-| D.cs:75:18:75:34 | ... ? ... : ... | null | D.cs:75:26:75:29 | null | null |
-| D.cs:76:21:76:22 | access to local variable o8 | empty | D.cs:75:18:75:34 | ... ? ... : ... | empty |
-| D.cs:76:21:76:22 | access to local variable o8 | non-empty | D.cs:75:18:75:34 | ... ? ... : ... | non-empty |
-| D.cs:76:21:76:22 | access to local variable o8 | non-null | D.cs:75:18:75:34 | ... ? ... : ... | non-null |
-| D.cs:76:21:76:22 | access to local variable o8 | null | D.cs:75:18:75:34 | ... ? ... : ... | null |
-| D.cs:76:21:76:30 | ... == ... | false | D.cs:75:18:75:22 | access to field maybe | false |
-| D.cs:76:21:76:30 | ... == ... | false | D.cs:76:21:76:22 | access to local variable o8 | non-null |
-| D.cs:76:21:76:30 | ... == ... | true | D.cs:75:18:75:22 | access to field maybe | true |
-| D.cs:76:21:76:30 | ... == ... | true | D.cs:76:21:76:22 | access to local variable o8 | null |
-| D.cs:77:13:77:22 | ... == ... | false | D.cs:76:21:76:30 | ... == ... | true |
-| D.cs:77:13:77:22 | ... == ... | true | D.cs:76:21:76:30 | ... == ... | false |
-| D.cs:78:13:78:14 | access to local variable o8 | non-null | D.cs:75:18:75:34 | ... ? ... : ... | non-null |
-| D.cs:78:13:78:14 | access to local variable o8 | null | D.cs:75:18:75:34 | ... ? ... : ... | null |
-| D.cs:79:13:79:23 | ... != ... | false | D.cs:76:21:76:30 | ... == ... | true |
-| D.cs:79:13:79:23 | ... != ... | true | D.cs:76:21:76:30 | ... == ... | false |
-| D.cs:80:13:80:14 | access to local variable o8 | non-null | D.cs:75:18:75:34 | ... ? ... : ... | non-null |
-| D.cs:80:13:80:14 | access to local variable o8 | null | D.cs:75:18:75:34 | ... ? ... : ... | null |
-| D.cs:82:13:82:14 | access to local variable o8 | non-null | D.cs:75:18:75:34 | ... ? ... : ... | non-null |
-| D.cs:82:13:82:14 | access to local variable o8 | null | D.cs:75:18:75:34 | ... ? ... : ... | null |
-| D.cs:84:13:84:14 | access to local variable o8 | non-null | D.cs:75:18:75:34 | ... ? ... : ... | non-null |
-| D.cs:84:13:84:14 | access to local variable o8 | null | D.cs:75:18:75:34 | ... ? ... : ... | null |
-| D.cs:89:20:89:44 | ... ? ... : ... | empty | D.cs:89:20:89:24 | access to field maybe | true |
-| D.cs:89:20:89:44 | ... ? ... : ... | empty | D.cs:89:28:89:31 | null | empty |
-| D.cs:89:20:89:44 | ... ? ... : ... | non-null | D.cs:89:20:89:24 | access to field maybe | false |
-| D.cs:89:20:89:44 | ... ? ... : ... | non-null | D.cs:89:35:89:44 | array creation of type Int32[] | non-null |
-| D.cs:89:20:89:44 | ... ? ... : ... | null | D.cs:89:20:89:24 | access to field maybe | true |
-| D.cs:89:20:89:44 | ... ? ... : ... | null | D.cs:89:28:89:31 | null | null |
-| D.cs:91:13:91:14 | access to local variable xs | empty | D.cs:89:20:89:44 | ... ? ... : ... | empty |
-| D.cs:91:13:91:14 | access to local variable xs | non-empty | D.cs:89:20:89:44 | ... ? ... : ... | non-empty |
-| D.cs:91:13:91:14 | access to local variable xs | non-null | D.cs:89:20:89:44 | ... ? ... : ... | non-null |
-| D.cs:91:13:91:14 | access to local variable xs | null | D.cs:89:20:89:44 | ... ? ... : ... | null |
-| D.cs:94:21:94:22 | access to local variable xs | non-null | D.cs:89:20:89:44 | ... ? ... : ... | non-null |
-| D.cs:94:21:94:22 | access to local variable xs | null | D.cs:89:20:89:44 | ... ? ... : ... | null |
-| D.cs:98:21:98:22 | access to local variable xs | non-null | D.cs:89:20:89:44 | ... ? ... : ... | non-null |
-| D.cs:98:21:98:22 | access to local variable xs | null | D.cs:89:20:89:44 | ... ? ... : ... | null |
-| D.cs:102:31:102:32 | access to local variable xs | non-null | D.cs:89:20:89:44 | ... ? ... : ... | non-null |
-| D.cs:102:31:102:32 | access to local variable xs | null | D.cs:89:20:89:44 | ... ? ... : ... | null |
-| D.cs:105:19:105:20 | access to local variable xs | non-null | D.cs:89:20:89:44 | ... ? ... : ... | non-null |
-| D.cs:105:19:105:20 | access to local variable xs | null | D.cs:89:20:89:44 | ... ? ... : ... | null |
-| D.cs:106:17:106:18 | access to local variable xs | non-null | D.cs:89:20:89:44 | ... ? ... : ... | non-null |
-| D.cs:106:17:106:18 | access to local variable xs | null | D.cs:89:20:89:44 | ... ? ... : ... | null |
-| D.cs:110:26:110:27 | access to local variable xs | non-null | D.cs:89:20:89:44 | ... ? ... : ... | non-null |
-| D.cs:110:26:110:27 | access to local variable xs | null | D.cs:89:20:89:44 | ... ? ... : ... | null |
-| D.cs:110:26:110:35 | ... != ... | false | D.cs:89:20:89:24 | access to field maybe | true |
-| D.cs:110:26:110:35 | ... != ... | false | D.cs:110:26:110:27 | access to local variable xs | null |
-| D.cs:110:26:110:35 | ... != ... | true | D.cs:89:20:89:24 | access to field maybe | false |
-| D.cs:110:26:110:35 | ... != ... | true | D.cs:110:26:110:27 | access to local variable xs | non-null |
-| D.cs:111:13:111:14 | access to local variable xs | non-null | D.cs:89:20:89:44 | ... ? ... : ... | non-null |
-| D.cs:111:13:111:14 | access to local variable xs | null | D.cs:89:20:89:44 | ... ? ... : ... | null |
-| D.cs:111:21:111:22 | access to local variable xs | non-null | D.cs:89:20:89:44 | ... ? ... : ... | non-null |
-| D.cs:111:21:111:22 | access to local variable xs | null | D.cs:89:20:89:44 | ... ? ... : ... | null |
-| D.cs:117:17:117:32 | ... ? ... : ... | non-null | D.cs:117:17:117:17 | access to parameter b | false |
-| D.cs:117:17:117:32 | ... ? ... : ... | non-null | D.cs:117:28:117:32 | "abc" | non-null |
-| D.cs:117:17:117:32 | ... ? ... : ... | null | D.cs:117:17:117:17 | access to parameter b | true |
-| D.cs:117:17:117:32 | ... ? ... : ... | null | D.cs:117:21:117:24 | null | null |
-| D.cs:118:13:118:13 | access to local variable x | empty | D.cs:117:17:117:32 | ... ? ... : ... | empty |
-| D.cs:118:13:118:13 | access to local variable x | non-empty | D.cs:117:17:117:32 | ... ? ... : ... | non-empty |
-| D.cs:118:13:118:13 | access to local variable x | non-null | D.cs:117:17:117:32 | ... ? ... : ... | non-null |
-| D.cs:118:13:118:13 | access to local variable x | null | D.cs:117:17:117:32 | ... ? ... : ... | null |
-| D.cs:118:13:118:21 | ... == ... | false | D.cs:117:17:117:17 | access to parameter b | false |
-| D.cs:118:13:118:21 | ... == ... | false | D.cs:118:13:118:13 | access to local variable x | non-null |
-| D.cs:118:13:118:21 | ... == ... | true | D.cs:117:17:117:17 | access to parameter b | true |
-| D.cs:118:13:118:21 | ... == ... | true | D.cs:118:13:118:13 | access to local variable x | null |
-| D.cs:118:13:118:30 | ... ? ... : ... | null | D.cs:118:13:118:21 | ... == ... | false |
-| D.cs:118:13:118:30 | ... ? ... : ... | null | D.cs:118:30:118:30 | access to local variable x | null |
-| D.cs:118:30:118:30 | access to local variable x | non-null | D.cs:117:17:117:32 | ... ? ... : ... | non-null |
-| D.cs:118:30:118:30 | access to local variable x | null | D.cs:117:17:117:32 | ... ? ... : ... | null |
-| D.cs:119:13:119:13 | access to local variable x | empty | D.cs:118:13:118:30 | ... ? ... : ... | empty |
-| D.cs:119:13:119:13 | access to local variable x | non-empty | D.cs:118:13:118:30 | ... ? ... : ... | non-empty |
-| D.cs:119:13:119:13 | access to local variable x | non-null | D.cs:118:13:118:30 | ... ? ... : ... | non-null |
-| D.cs:119:13:119:13 | access to local variable x | null | D.cs:118:13:118:30 | ... ? ... : ... | null |
-| D.cs:119:13:119:21 | ... == ... | false | D.cs:119:13:119:13 | access to local variable x | non-null |
-| D.cs:119:13:119:21 | ... == ... | true | D.cs:118:13:118:21 | ... == ... | false |
-| D.cs:119:13:119:21 | ... == ... | true | D.cs:119:13:119:13 | access to local variable x | null |
-| D.cs:120:13:120:13 | access to local variable x | non-null | D.cs:118:13:118:30 | ... ? ... : ... | non-null |
-| D.cs:120:13:120:13 | access to local variable x | null | D.cs:118:13:118:30 | ... ? ... : ... | null |
-| D.cs:122:13:122:13 | access to local variable x | non-null | D.cs:118:13:118:30 | ... ? ... : ... | non-null |
-| D.cs:122:13:122:13 | access to local variable x | null | D.cs:118:13:118:30 | ... ? ... : ... | null |
-| D.cs:127:20:127:28 | ... == ... | false | D.cs:127:20:127:20 | access to parameter a | non-null |
-| D.cs:127:20:127:28 | ... == ... | true | D.cs:127:20:127:20 | access to parameter a | null |
-| D.cs:128:20:128:28 | ... == ... | false | D.cs:128:20:128:20 | access to parameter b | non-null |
-| D.cs:128:20:128:28 | ... == ... | true | D.cs:128:20:128:20 | access to parameter b | null |
-| D.cs:139:13:139:21 | ... != ... | false | D.cs:139:13:139:13 | access to parameter a | null |
-| D.cs:139:13:139:21 | ... != ... | true | D.cs:139:13:139:13 | access to parameter a | non-null |
-| D.cs:152:17:152:27 | ... != ... | false | D.cs:152:17:152:19 | access to parameter obj | null |
-| D.cs:152:17:152:27 | ... != ... | true | D.cs:152:17:152:19 | access to parameter obj | non-null |
-| D.cs:182:9:182:12 | access to local variable obj2 | non-null | D.cs:176:20:176:28 | call to method MkMaybe | non-null |
-| D.cs:182:9:182:12 | access to local variable obj2 | null | D.cs:176:20:176:28 | call to method MkMaybe | null |
-| D.cs:190:9:190:12 | access to local variable obj3 | non-null | D.cs:187:20:187:28 | call to method MkMaybe | non-null |
-| D.cs:190:9:190:12 | access to local variable obj3 | null | D.cs:187:20:187:28 | call to method MkMaybe | null |
-| D.cs:196:13:196:13 | access to local variable o | non-null | D.cs:195:17:195:28 | object creation of type Object | non-null |
-| D.cs:196:13:196:13 | access to local variable o | null | D.cs:195:17:195:28 | object creation of type Object | null |
-| D.cs:196:13:196:21 | ... == ... | false | D.cs:196:13:196:13 | access to local variable o | non-null |
-| D.cs:196:13:196:21 | ... == ... | true | D.cs:196:13:196:13 | access to local variable o | null |
-| D.cs:196:13:196:21 | ... == ... | true | D.cs:196:18:196:21 | null | non-null |
-| D.cs:197:13:197:13 | access to local variable o | non-null | D.cs:195:17:195:28 | object creation of type Object | non-null |
-| D.cs:197:13:197:13 | access to local variable o | null | D.cs:195:17:195:28 | object creation of type Object | null |
-| D.cs:198:9:198:9 | access to local variable o | non-null | D.cs:195:17:195:28 | object creation of type Object | non-null |
-| D.cs:198:9:198:9 | access to local variable o | null | D.cs:195:17:195:28 | object creation of type Object | null |
-| D.cs:206:17:206:25 | ... == ... | false | D.cs:206:17:206:17 | access to local variable e | non-null |
-| D.cs:206:17:206:25 | ... == ... | true | D.cs:206:17:206:17 | access to local variable e | null |
-| D.cs:212:18:212:18 | access to local variable n | non-null | D.cs:211:20:211:23 | null | non-null |
-| D.cs:212:18:212:18 | access to local variable n | null | D.cs:211:20:211:23 | null | null |
-| D.cs:212:18:212:26 | ... == ... | false | D.cs:212:18:212:18 | access to local variable n | non-null |
-| D.cs:212:18:212:26 | ... == ... | false | D.cs:212:23:212:26 | null | non-null |
-| D.cs:212:18:212:26 | ... == ... | true | D.cs:212:18:212:18 | access to local variable n | null |
-| D.cs:212:18:212:26 | ... == ... | true | D.cs:212:23:212:26 | null | null |
-| D.cs:212:18:212:45 | ... ? ... : ... | non-null | D.cs:212:18:212:26 | ... == ... | true |
-| D.cs:212:18:212:45 | ... ? ... : ... | non-null | D.cs:212:30:212:41 | object creation of type Object | non-null |
-| D.cs:212:18:212:45 | ... ? ... : ... | null | D.cs:212:18:212:26 | ... == ... | false |
-| D.cs:212:18:212:45 | ... ? ... : ... | null | D.cs:212:45:212:45 | access to local variable n | null |
-| D.cs:212:45:212:45 | access to local variable n | non-null | D.cs:211:20:211:23 | null | non-null |
-| D.cs:212:45:212:45 | access to local variable n | null | D.cs:211:20:211:23 | null | null |
-| D.cs:213:9:213:10 | access to local variable o2 | non-null | D.cs:212:18:212:45 | ... ? ... : ... | non-null |
-| D.cs:213:9:213:10 | access to local variable o2 | null | D.cs:212:18:212:45 | ... ? ... : ... | null |
-| D.cs:216:13:216:14 | access to local variable o3 | empty | D.cs:215:18:215:22 | "abc" | empty |
-| D.cs:216:13:216:14 | access to local variable o3 | non-empty | D.cs:215:18:215:22 | "abc" | non-empty |
-| D.cs:216:13:216:14 | access to local variable o3 | non-null | D.cs:215:18:215:22 | "abc" | non-null |
-| D.cs:216:13:216:14 | access to local variable o3 | null | D.cs:215:18:215:22 | "abc" | null |
-| D.cs:216:13:216:22 | ... == ... | false | D.cs:216:13:216:14 | access to local variable o3 | non-null |
-| D.cs:216:13:216:22 | ... == ... | true | D.cs:216:13:216:14 | access to local variable o3 | null |
-| D.cs:216:13:216:22 | ... == ... | true | D.cs:216:19:216:22 | null | non-null |
-| D.cs:217:13:217:14 | access to local variable o3 | non-null | D.cs:215:18:215:22 | "abc" | non-null |
-| D.cs:217:13:217:14 | access to local variable o3 | null | D.cs:215:18:215:22 | "abc" | null |
-| D.cs:218:9:218:10 | access to local variable o3 | non-null | D.cs:215:18:215:22 | "abc" | non-null |
-| D.cs:218:9:218:10 | access to local variable o3 | null | D.cs:215:18:215:22 | "abc" | null |
-| D.cs:220:18:220:26 | ... + ... | non-null | D.cs:220:18:220:19 | "" | non-null |
-| D.cs:220:18:220:26 | ... + ... | non-null | D.cs:220:23:220:26 | null | non-null |
-| D.cs:220:18:220:26 | ... + ... | null | D.cs:220:23:220:26 | null | null |
-| D.cs:221:13:221:14 | access to local variable o4 | empty | D.cs:220:18:220:26 | ... + ... | empty |
-| D.cs:221:13:221:14 | access to local variable o4 | non-empty | D.cs:220:18:220:26 | ... + ... | non-empty |
-| D.cs:221:13:221:14 | access to local variable o4 | non-null | D.cs:220:18:220:26 | ... + ... | non-null |
-| D.cs:221:13:221:14 | access to local variable o4 | null | D.cs:220:18:220:26 | ... + ... | null |
-| D.cs:221:13:221:22 | ... == ... | false | D.cs:221:13:221:14 | access to local variable o4 | non-null |
-| D.cs:221:13:221:22 | ... == ... | true | D.cs:221:13:221:14 | access to local variable o4 | null |
-| D.cs:221:13:221:22 | ... == ... | true | D.cs:221:19:221:22 | null | non-null |
-| D.cs:222:13:222:14 | access to local variable o4 | non-null | D.cs:220:18:220:26 | ... + ... | non-null |
-| D.cs:222:13:222:14 | access to local variable o4 | null | D.cs:220:18:220:26 | ... + ... | null |
-| D.cs:223:9:223:10 | access to local variable o4 | non-null | D.cs:220:18:220:26 | ... + ... | non-null |
-| D.cs:223:9:223:10 | access to local variable o4 | null | D.cs:220:18:220:26 | ... + ... | null |
-| D.cs:232:13:232:13 | access to local variable o | non-null | D.cs:230:17:230:28 | object creation of type Object | non-null |
-| D.cs:232:13:232:13 | access to local variable o | null | D.cs:230:17:230:28 | object creation of type Object | null |
-| D.cs:238:13:238:13 | access to local variable o | non-null | D.cs:236:17:236:18 | "" | non-null |
-| D.cs:238:13:238:13 | access to local variable o | null | D.cs:236:17:236:18 | "" | null |
-| D.cs:241:21:241:37 | ... ? ... : ... | non-null | D.cs:241:21:241:25 | access to field maybe | false |
-| D.cs:241:21:241:37 | ... ? ... : ... | non-null | D.cs:241:36:241:37 | "" | non-null |
-| D.cs:241:21:241:37 | ... ? ... : ... | null | D.cs:241:21:241:25 | access to field maybe | true |
-| D.cs:241:21:241:37 | ... ? ... : ... | null | D.cs:241:29:241:32 | null | null |
-| D.cs:242:13:242:17 | access to local variable other | empty | D.cs:241:21:241:37 | ... ? ... : ... | empty |
-| D.cs:242:13:242:17 | access to local variable other | non-empty | D.cs:241:21:241:37 | ... ? ... : ... | non-empty |
-| D.cs:242:13:242:17 | access to local variable other | non-null | D.cs:241:21:241:37 | ... ? ... : ... | non-null |
-| D.cs:242:13:242:17 | access to local variable other | null | D.cs:241:21:241:37 | ... ? ... : ... | null |
-| D.cs:242:13:242:25 | ... == ... | false | D.cs:241:21:241:25 | access to field maybe | false |
-| D.cs:242:13:242:25 | ... == ... | false | D.cs:242:13:242:17 | access to local variable other | non-null |
-| D.cs:242:13:242:25 | ... == ... | true | D.cs:241:21:241:25 | access to field maybe | true |
-| D.cs:242:13:242:25 | ... == ... | true | D.cs:242:13:242:17 | access to local variable other | null |
-| D.cs:244:13:244:17 | access to local variable other | non-null | D.cs:241:21:241:37 | ... ? ... : ... | non-null |
-| D.cs:244:13:244:17 | access to local variable other | null | D.cs:241:21:241:37 | ... ? ... : ... | null |
-| D.cs:244:13:244:25 | ... != ... | false | D.cs:241:21:241:25 | access to field maybe | true |
-| D.cs:244:13:244:25 | ... != ... | false | D.cs:244:13:244:17 | access to local variable other | null |
-| D.cs:244:13:244:25 | ... != ... | true | D.cs:241:21:241:25 | access to field maybe | false |
-| D.cs:244:13:244:25 | ... != ... | true | D.cs:244:13:244:17 | access to local variable other | non-null |
-| D.cs:249:18:249:38 | ... ? ... : ... | non-null | D.cs:249:19:249:25 | ... < ... | false |
-| D.cs:249:18:249:38 | ... ? ... : ... | non-null | D.cs:249:37:249:38 | "" | non-null |
-| D.cs:249:18:249:38 | ... ? ... : ... | null | D.cs:249:19:249:25 | ... < ... | true |
-| D.cs:249:18:249:38 | ... ? ... : ... | null | D.cs:249:30:249:33 | null | null |
-| D.cs:253:13:253:14 | access to local variable o2 | empty | D.cs:249:18:249:38 | ... ? ... : ... | empty |
-| D.cs:253:13:253:14 | access to local variable o2 | non-empty | D.cs:249:18:249:38 | ... ? ... : ... | non-empty |
-| D.cs:253:13:253:14 | access to local variable o2 | non-null | D.cs:249:18:249:38 | ... ? ... : ... | non-null |
-| D.cs:253:13:253:14 | access to local variable o2 | null | D.cs:249:18:249:38 | ... ? ... : ... | null |
-| D.cs:266:13:266:27 | ... is ... | true | D.cs:266:13:266:17 | access to local variable other | non-null |
-| D.cs:310:21:310:26 | ... + ... | non-null | D.cs:310:21:310:22 | "" | non-null |
-| D.cs:310:21:310:26 | ... + ... | non-null | D.cs:310:26:310:26 | call to method ToString | non-null |
-| D.cs:310:21:310:26 | ... + ... | null | D.cs:310:26:310:26 | call to method ToString | null |
-| D.cs:312:17:312:23 | !... | false | D.cs:312:18:312:23 | access to local variable s_null | true |
-| D.cs:312:17:312:23 | !... | true | D.cs:312:18:312:23 | access to local variable s_null | false |
-| D.cs:318:16:318:62 | ... && ... | true | D.cs:318:16:318:36 | ... == ... | true |
-| D.cs:318:16:318:62 | ... && ... | true | D.cs:318:41:318:62 | ... != ... | true |
-| D.cs:336:13:336:23 | ... == ... | false | D.cs:336:13:336:15 | access to parameter obj | non-null |
-| D.cs:336:13:336:23 | ... == ... | true | D.cs:336:13:336:15 | access to parameter obj | null |
-| D.cs:341:13:341:23 | ... != ... | false | D.cs:336:13:336:23 | ... == ... | false |
-| D.cs:341:13:341:23 | ... != ... | false | D.cs:341:13:341:15 | access to local variable msg | null |
-| D.cs:341:13:341:23 | ... != ... | true | D.cs:341:13:341:15 | access to local variable msg | non-null |
-| D.cs:343:13:343:27 | ... + ... | non-null | D.cs:343:13:343:15 | access to local variable msg | non-null |
-| D.cs:343:13:343:27 | ... + ... | non-null | D.cs:343:20:343:27 | "foobar" | non-null |
-| D.cs:343:13:343:27 | ... + ... | null | D.cs:343:13:343:15 | access to local variable msg | null |
-| D.cs:343:13:343:27 | ... = ... | empty | D.cs:343:13:343:15 | access to local variable msg | empty |
-| D.cs:343:13:343:27 | ... = ... | empty | D.cs:343:13:343:27 | ... + ... | empty |
-| D.cs:343:13:343:27 | ... = ... | non-empty | D.cs:343:13:343:15 | access to local variable msg | non-empty |
-| D.cs:343:13:343:27 | ... = ... | non-empty | D.cs:343:13:343:27 | ... + ... | non-empty |
-| D.cs:343:13:343:27 | ... = ... | non-null | D.cs:343:13:343:15 | access to local variable msg | non-null |
-| D.cs:343:13:343:27 | ... = ... | non-null | D.cs:343:13:343:27 | ... + ... | non-null |
-| D.cs:343:13:343:27 | ... = ... | null | D.cs:343:13:343:15 | access to local variable msg | null |
-| D.cs:343:13:343:27 | ... = ... | null | D.cs:343:13:343:27 | ... + ... | null |
-| D.cs:344:33:344:35 | access to local variable msg | empty | D.cs:343:13:343:27 | ... + ... | empty |
-| D.cs:344:33:344:35 | access to local variable msg | non-empty | D.cs:343:13:343:27 | ... + ... | non-empty |
-| D.cs:344:33:344:35 | access to local variable msg | non-null | D.cs:343:13:343:27 | ... + ... | non-null |
-| D.cs:344:33:344:35 | access to local variable msg | null | D.cs:343:13:343:27 | ... + ... | null |
-| D.cs:366:19:366:47 | ... ? ... : ... | non-null | D.cs:366:19:366:23 | access to field maybe | false |
-| D.cs:366:19:366:47 | ... ? ... : ... | non-null | D.cs:366:34:366:47 | array creation of type Int32[] | non-null |
-| D.cs:366:19:366:47 | ... ? ... : ... | null | D.cs:366:19:366:23 | access to field maybe | true |
-| D.cs:366:19:366:47 | ... ? ... : ... | null | D.cs:366:27:366:30 | null | null |
-| D.cs:367:13:367:56 | ... && ... | true | D.cs:367:13:367:21 | ... > ... | true |
-| D.cs:367:13:367:56 | ... && ... | true | D.cs:367:27:367:55 | ... \|\| ... | true |
-| D.cs:367:27:367:27 | access to local variable b | empty | D.cs:366:19:366:47 | ... ? ... : ... | empty |
-| D.cs:367:27:367:27 | access to local variable b | non-empty | D.cs:366:19:366:47 | ... ? ... : ... | non-empty |
-| D.cs:367:27:367:27 | access to local variable b | non-null | D.cs:366:19:366:47 | ... ? ... : ... | non-null |
-| D.cs:367:27:367:27 | access to local variable b | null | D.cs:366:19:366:47 | ... ? ... : ... | null |
-| D.cs:367:27:367:35 | ... == ... | false | D.cs:366:19:366:23 | access to field maybe | false |
-| D.cs:367:27:367:35 | ... == ... | false | D.cs:367:27:367:27 | access to local variable b | non-null |
-| D.cs:367:27:367:35 | ... == ... | true | D.cs:366:19:366:23 | access to field maybe | true |
-| D.cs:367:27:367:35 | ... == ... | true | D.cs:367:27:367:27 | access to local variable b | null |
-| D.cs:367:27:367:55 | ... \|\| ... | false | D.cs:367:27:367:35 | ... == ... | false |
-| D.cs:367:27:367:55 | ... \|\| ... | false | D.cs:367:40:367:55 | ... < ... | false |
-| D.cs:367:40:367:40 | access to local variable b | non-null | D.cs:366:19:366:47 | ... ? ... : ... | non-null |
-| D.cs:367:40:367:40 | access to local variable b | null | D.cs:366:19:366:47 | ... ? ... : ... | null |
-| D.cs:372:13:372:13 | access to local variable b | non-null | D.cs:366:19:366:47 | ... ? ... : ... | non-null |
-| D.cs:372:13:372:13 | access to local variable b | null | D.cs:366:19:366:47 | ... ? ... : ... | null |
-| D.cs:382:13:382:23 | ... != ... | false | D.cs:379:13:379:13 | access to parameter b | false |
-| D.cs:382:13:382:23 | ... != ... | false | D.cs:382:13:382:15 | access to local variable ioe | null |
-| D.cs:382:13:382:23 | ... != ... | true | D.cs:382:13:382:15 | access to local variable ioe | non-null |
-| D.cs:390:20:390:28 | ... == ... | false | D.cs:390:20:390:20 | access to parameter a | non-null |
-| D.cs:390:20:390:28 | ... == ... | true | D.cs:390:20:390:20 | access to parameter a | null |
-| D.cs:397:20:397:28 | ... == ... | false | D.cs:397:20:397:20 | access to parameter b | non-null |
-| D.cs:397:20:397:28 | ... == ... | true | D.cs:397:20:397:20 | access to parameter b | null |
-| D.cs:407:13:407:64 | ... \|\| ... | false | D.cs:407:14:407:35 | ... && ... | false |
-| D.cs:407:13:407:64 | ... \|\| ... | false | D.cs:407:42:407:63 | ... && ... | false |
-| D.cs:407:14:407:22 | ... != ... | false | D.cs:407:14:407:14 | access to parameter x | null |
-| D.cs:407:14:407:22 | ... != ... | true | D.cs:407:14:407:14 | access to parameter x | non-null |
-| D.cs:407:14:407:35 | ... && ... | true | D.cs:407:14:407:22 | ... != ... | true |
-| D.cs:407:14:407:35 | ... && ... | true | D.cs:407:27:407:35 | ... == ... | true |
-| D.cs:407:27:407:35 | ... == ... | false | D.cs:407:27:407:27 | access to parameter y | non-null |
-| D.cs:407:27:407:35 | ... == ... | true | D.cs:407:27:407:27 | access to parameter y | null |
-| D.cs:407:42:407:50 | ... == ... | false | D.cs:407:42:407:42 | access to parameter x | non-null |
-| D.cs:407:42:407:50 | ... == ... | true | D.cs:407:42:407:42 | access to parameter x | null |
-| D.cs:407:42:407:63 | ... && ... | true | D.cs:407:42:407:50 | ... == ... | true |
-| D.cs:407:42:407:63 | ... && ... | true | D.cs:407:55:407:63 | ... != ... | true |
-| D.cs:407:55:407:63 | ... != ... | false | D.cs:407:55:407:55 | access to parameter y | null |
-| D.cs:407:55:407:63 | ... != ... | true | D.cs:407:55:407:55 | access to parameter y | non-null |
-| D.cs:409:13:409:21 | ... != ... | false | D.cs:409:13:409:13 | access to parameter x | null |
-| D.cs:409:13:409:21 | ... != ... | true | D.cs:409:13:409:13 | access to parameter x | non-null |
-| D.cs:411:13:411:21 | ... != ... | false | D.cs:411:13:411:13 | access to parameter y | null |
-| D.cs:411:13:411:21 | ... != ... | true | D.cs:411:13:411:13 | access to parameter y | non-null |
-| E.cs:10:22:10:54 | ... && ... | true | E.cs:10:22:10:29 | ... < ... | true |
-| E.cs:10:22:10:54 | ... && ... | true | E.cs:10:34:10:54 | ... != ... | true |
-| E.cs:10:34:10:54 | ... != ... | false | E.cs:10:35:10:45 | ... = ... | null |
-| E.cs:10:34:10:54 | ... != ... | true | E.cs:10:35:10:45 | ... = ... | non-null |
-| E.cs:10:35:10:45 | ... = ... | empty | E.cs:10:35:10:36 | access to local variable a2 | empty |
-| E.cs:10:35:10:45 | ... = ... | empty | E.cs:10:40:10:45 | access to array element | empty |
-| E.cs:10:35:10:45 | ... = ... | non-empty | E.cs:10:35:10:36 | access to local variable a2 | non-empty |
-| E.cs:10:35:10:45 | ... = ... | non-empty | E.cs:10:40:10:45 | access to array element | non-empty |
-| E.cs:10:35:10:45 | ... = ... | non-null | E.cs:10:35:10:36 | access to local variable a2 | non-null |
-| E.cs:10:35:10:45 | ... = ... | non-null | E.cs:10:40:10:45 | access to array element | non-null |
-| E.cs:10:35:10:45 | ... = ... | null | E.cs:10:35:10:36 | access to local variable a2 | null |
-| E.cs:10:35:10:45 | ... = ... | null | E.cs:10:40:10:45 | access to array element | null |
-| E.cs:12:22:12:27 | access to local variable haveA2 | false | E.cs:10:22:10:54 | ... && ... | false |
-| E.cs:12:22:12:27 | access to local variable haveA2 | true | E.cs:10:22:10:54 | ... && ... | true |
-| E.cs:12:22:12:52 | ... && ... | true | E.cs:12:22:12:27 | access to local variable haveA2 | true |
-| E.cs:12:22:12:52 | ... && ... | true | E.cs:12:32:12:52 | ... != ... | true |
-| E.cs:12:32:12:52 | ... != ... | false | E.cs:12:33:12:43 | ... = ... | null |
-| E.cs:12:32:12:52 | ... != ... | true | E.cs:12:33:12:43 | ... = ... | non-null |
-| E.cs:12:33:12:43 | ... = ... | empty | E.cs:12:33:12:34 | access to local variable a3 | empty |
-| E.cs:12:33:12:43 | ... = ... | empty | E.cs:12:38:12:43 | access to array element | empty |
-| E.cs:12:33:12:43 | ... = ... | non-empty | E.cs:12:33:12:34 | access to local variable a3 | non-empty |
-| E.cs:12:33:12:43 | ... = ... | non-empty | E.cs:12:38:12:43 | access to array element | non-empty |
-| E.cs:12:33:12:43 | ... = ... | non-null | E.cs:12:33:12:34 | access to local variable a3 | non-null |
-| E.cs:12:33:12:43 | ... = ... | non-null | E.cs:12:38:12:43 | access to array element | non-null |
-| E.cs:12:33:12:43 | ... = ... | null | E.cs:12:33:12:34 | access to local variable a3 | null |
-| E.cs:12:33:12:43 | ... = ... | null | E.cs:12:38:12:43 | access to array element | null |
-| E.cs:13:13:13:18 | access to local variable haveA3 | false | E.cs:12:22:12:52 | ... && ... | false |
-| E.cs:13:13:13:18 | access to local variable haveA3 | true | E.cs:12:22:12:52 | ... && ... | true |
-| E.cs:19:18:19:30 | ... ? ... : ... | non-null | E.cs:19:18:19:18 | access to parameter x | false |
-| E.cs:19:18:19:30 | ... ? ... : ... | non-null | E.cs:19:29:19:30 | "" | non-null |
-| E.cs:19:18:19:30 | ... ? ... : ... | null | E.cs:19:18:19:18 | access to parameter x | true |
-| E.cs:19:18:19:30 | ... ? ... : ... | null | E.cs:19:22:19:25 | null | null |
-| E.cs:20:18:20:41 | ... ? ... : ... | non-null | E.cs:20:19:20:28 | ... == ... | false |
-| E.cs:20:18:20:41 | ... ? ... : ... | non-null | E.cs:20:40:20:41 | "" | non-null |
-| E.cs:20:18:20:41 | ... ? ... : ... | null | E.cs:20:19:20:28 | ... == ... | true |
-| E.cs:20:18:20:41 | ... ? ... : ... | null | E.cs:20:33:20:36 | null | null |
-| E.cs:20:19:20:20 | access to local variable s1 | empty | E.cs:19:18:19:30 | ... ? ... : ... | empty |
-| E.cs:20:19:20:20 | access to local variable s1 | non-empty | E.cs:19:18:19:30 | ... ? ... : ... | non-empty |
-| E.cs:20:19:20:20 | access to local variable s1 | non-null | E.cs:19:18:19:30 | ... ? ... : ... | non-null |
-| E.cs:20:19:20:20 | access to local variable s1 | null | E.cs:19:18:19:30 | ... ? ... : ... | null |
-| E.cs:20:19:20:28 | ... == ... | false | E.cs:19:18:19:18 | access to parameter x | false |
-| E.cs:20:19:20:28 | ... == ... | false | E.cs:20:19:20:20 | access to local variable s1 | non-null |
-| E.cs:20:19:20:28 | ... == ... | true | E.cs:19:18:19:18 | access to parameter x | true |
-| E.cs:20:19:20:28 | ... == ... | true | E.cs:20:19:20:20 | access to local variable s1 | null |
-| E.cs:21:13:21:14 | access to local variable s2 | empty | E.cs:20:18:20:41 | ... ? ... : ... | empty |
-| E.cs:21:13:21:14 | access to local variable s2 | non-empty | E.cs:20:18:20:41 | ... ? ... : ... | non-empty |
-| E.cs:21:13:21:14 | access to local variable s2 | non-null | E.cs:20:18:20:41 | ... ? ... : ... | non-null |
-| E.cs:21:13:21:14 | access to local variable s2 | null | E.cs:20:18:20:41 | ... ? ... : ... | null |
-| E.cs:21:13:21:22 | ... == ... | false | E.cs:20:19:20:28 | ... == ... | false |
-| E.cs:21:13:21:22 | ... == ... | false | E.cs:21:13:21:14 | access to local variable s2 | non-null |
-| E.cs:21:13:21:22 | ... == ... | true | E.cs:20:19:20:28 | ... == ... | true |
-| E.cs:21:13:21:22 | ... == ... | true | E.cs:21:13:21:14 | access to local variable s2 | null |
-| E.cs:23:18:23:30 | ... ? ... : ... | non-null | E.cs:23:18:23:18 | access to parameter y | false |
-| E.cs:23:18:23:30 | ... ? ... : ... | non-null | E.cs:23:29:23:30 | "" | non-null |
-| E.cs:23:18:23:30 | ... ? ... : ... | null | E.cs:23:18:23:18 | access to parameter y | true |
-| E.cs:23:18:23:30 | ... ? ... : ... | null | E.cs:23:22:23:25 | null | null |
-| E.cs:24:18:24:41 | ... ? ... : ... | non-null | E.cs:24:19:24:28 | ... == ... | false |
-| E.cs:24:18:24:41 | ... ? ... : ... | non-null | E.cs:24:40:24:41 | "" | non-null |
-| E.cs:24:18:24:41 | ... ? ... : ... | null | E.cs:24:19:24:28 | ... == ... | true |
-| E.cs:24:18:24:41 | ... ? ... : ... | null | E.cs:24:33:24:36 | null | null |
-| E.cs:24:19:24:20 | access to local variable s1 | empty | E.cs:23:18:23:30 | ... ? ... : ... | empty |
-| E.cs:24:19:24:20 | access to local variable s1 | non-empty | E.cs:23:18:23:30 | ... ? ... : ... | non-empty |
-| E.cs:24:19:24:20 | access to local variable s1 | non-null | E.cs:23:18:23:30 | ... ? ... : ... | non-null |
-| E.cs:24:19:24:20 | access to local variable s1 | null | E.cs:23:18:23:30 | ... ? ... : ... | null |
-| E.cs:24:19:24:28 | ... == ... | false | E.cs:23:18:23:18 | access to parameter y | false |
-| E.cs:24:19:24:28 | ... == ... | false | E.cs:24:19:24:20 | access to local variable s1 | non-null |
-| E.cs:24:19:24:28 | ... == ... | true | E.cs:23:18:23:18 | access to parameter y | true |
-| E.cs:24:19:24:28 | ... == ... | true | E.cs:24:19:24:20 | access to local variable s1 | null |
-| E.cs:26:13:26:22 | ... != ... | false | E.cs:26:13:26:14 | access to local variable s2 | null |
-| E.cs:26:13:26:22 | ... != ... | true | E.cs:26:13:26:14 | access to local variable s2 | non-null |
-| E.cs:35:9:35:12 | access to local variable last | empty | E.cs:34:20:34:20 | access to local variable s | empty |
-| E.cs:35:9:35:12 | access to local variable last | non-empty | E.cs:34:20:34:20 | access to local variable s | non-empty |
-| E.cs:35:9:35:12 | access to local variable last | non-null | E.cs:34:20:34:20 | access to local variable s | non-null |
-| E.cs:35:9:35:12 | access to local variable last | null | E.cs:34:20:34:20 | access to local variable s | null |
-| E.cs:38:13:38:20 | call to method Any<String> | false | E.cs:38:13:38:14 | access to parameter ss | empty |
-| E.cs:38:13:38:20 | call to method Any<String> | true | E.cs:38:13:38:14 | access to parameter ss | non-empty |
-| E.cs:43:13:43:16 | access to local variable last | empty | E.cs:41:24:41:24 | access to local variable s | empty |
-| E.cs:43:13:43:16 | access to local variable last | non-empty | E.cs:41:24:41:24 | access to local variable s | non-empty |
-| E.cs:43:13:43:16 | access to local variable last | non-null | E.cs:41:24:41:24 | access to local variable s | non-null |
-| E.cs:43:13:43:16 | access to local variable last | null | E.cs:41:24:41:24 | access to local variable s | null |
-| E.cs:53:16:53:19 | access to local variable iter | non-null | E.cs:52:20:52:39 | call to method GetEnumerator | non-null |
-| E.cs:53:16:53:19 | access to local variable iter | null | E.cs:52:20:52:39 | call to method GetEnumerator | null |
-| E.cs:55:23:55:26 | access to local variable iter | non-null | E.cs:52:20:52:39 | call to method GetEnumerator | non-null |
-| E.cs:55:23:55:26 | access to local variable iter | null | E.cs:52:20:52:39 | call to method GetEnumerator | null |
-| E.cs:59:17:59:22 | access to local variable result | empty | E.cs:50:22:50:45 | object creation of type List<List<String>> | empty |
-| E.cs:59:17:59:22 | access to local variable result | non-empty | E.cs:50:22:50:45 | object creation of type List<List<String>> | non-empty |
-| E.cs:59:17:59:22 | access to local variable result | non-null | E.cs:50:22:50:45 | object creation of type List<List<String>> | non-null |
-| E.cs:59:17:59:22 | access to local variable result | null | E.cs:50:22:50:45 | object creation of type List<List<String>> | null |
-| E.cs:59:28:59:32 | access to local variable slice | empty | E.cs:58:25:58:42 | object creation of type List<String> | empty |
-| E.cs:59:28:59:32 | access to local variable slice | non-empty | E.cs:58:25:58:42 | object creation of type List<String> | non-empty |
-| E.cs:59:28:59:32 | access to local variable slice | non-null | E.cs:58:25:58:42 | object creation of type List<String> | non-null |
-| E.cs:59:28:59:32 | access to local variable slice | null | E.cs:58:25:58:42 | object creation of type List<String> | null |
-| E.cs:61:23:61:25 | access to local variable str | empty | E.cs:55:23:55:34 | access to property Current | empty |
-| E.cs:61:23:61:25 | access to local variable str | non-empty | E.cs:55:23:55:34 | access to property Current | non-empty |
-| E.cs:61:23:61:25 | access to local variable str | non-null | E.cs:55:23:55:34 | access to property Current | non-null |
-| E.cs:61:23:61:25 | access to local variable str | null | E.cs:55:23:55:34 | access to property Current | null |
-| E.cs:70:22:70:32 | ... == ... | false | E.cs:70:22:70:24 | access to parameter arr | non-null |
-| E.cs:70:22:70:32 | ... == ... | true | E.cs:70:22:70:24 | access to parameter arr | null |
-| E.cs:83:13:83:24 | ... != ... | false | E.cs:83:13:83:16 | access to parameter vals | null |
-| E.cs:83:13:83:24 | ... != ... | true | E.cs:83:13:83:16 | access to parameter vals | non-null |
-| E.cs:83:13:83:30 | ... && ... | true | E.cs:83:13:83:24 | ... != ... | true |
-| E.cs:83:13:83:30 | ... && ... | true | E.cs:83:29:83:30 | access to parameter b1 | true |
-| E.cs:85:18:85:29 | ... != ... | false | E.cs:85:18:85:21 | access to parameter vals | null |
-| E.cs:85:18:85:29 | ... != ... | true | E.cs:85:18:85:21 | access to parameter vals | non-null |
-| E.cs:85:18:85:35 | ... && ... | true | E.cs:85:18:85:29 | ... != ... | true |
-| E.cs:85:18:85:35 | ... && ... | true | E.cs:85:34:85:35 | access to parameter b2 | true |
-| E.cs:90:17:90:27 | access to local variable switchguard | match access to constant MY_CONST_A | E.cs:83:13:83:30 | ... && ... | true |
-| E.cs:90:17:90:27 | access to local variable switchguard | match access to constant MY_CONST_A | E.cs:90:17:90:27 | access to local variable switchguard | 1 |
-| E.cs:90:17:90:27 | access to local variable switchguard | match access to constant MY_CONST_B | E.cs:83:13:83:30 | ... && ... | false |
-| E.cs:90:17:90:27 | access to local variable switchguard | match access to constant MY_CONST_B | E.cs:85:18:85:35 | ... && ... | true |
-| E.cs:90:17:90:27 | access to local variable switchguard | match access to constant MY_CONST_B | E.cs:90:17:90:27 | access to local variable switchguard | 2 |
-| E.cs:90:17:90:27 | access to local variable switchguard | match access to constant MY_CONST_C | E.cs:83:13:83:30 | ... && ... | false |
-| E.cs:90:17:90:27 | access to local variable switchguard | match access to constant MY_CONST_C | E.cs:85:18:85:35 | ... && ... | false |
-| E.cs:90:17:90:27 | access to local variable switchguard | match access to constant MY_CONST_C | E.cs:90:17:90:27 | access to local variable switchguard | 3 |
-| E.cs:90:17:90:27 | access to local variable switchguard | non-match access to constant MY_CONST_A | E.cs:83:13:83:30 | ... && ... | false |
-| E.cs:108:13:108:27 | ... > ... | true | E.cs:108:13:108:16 | access to parameter arr1 | non-empty |
-| E.cs:120:16:120:20 | !... | false | E.cs:120:17:120:20 | access to local variable stop | true |
-| E.cs:120:16:120:20 | !... | true | E.cs:120:17:120:20 | access to local variable stop | false |
-| E.cs:123:20:123:24 | !... | false | E.cs:123:21:123:24 | access to local variable stop | true |
-| E.cs:123:20:123:24 | !... | true | E.cs:123:21:123:24 | access to local variable stop | false |
-| E.cs:123:20:123:35 | ... && ... | true | E.cs:123:20:123:24 | !... | true |
-| E.cs:123:20:123:35 | ... && ... | true | E.cs:123:29:123:35 | ... < ... | true |
-| E.cs:131:25:131:29 | !... | false | E.cs:131:26:131:29 | access to local variable stop | true |
-| E.cs:131:25:131:29 | !... | true | E.cs:131:26:131:29 | access to local variable stop | false |
-| E.cs:131:26:131:29 | access to local variable stop | false | E.cs:130:28:130:33 | ... >= ... | false |
-| E.cs:131:26:131:29 | access to local variable stop | true | E.cs:130:28:130:33 | ... >= ... | true |
-| E.cs:153:13:153:16 | access to local variable obj2 | non-null | E.cs:152:23:152:26 | access to parameter obj1 | non-null |
-| E.cs:153:13:153:16 | access to local variable obj2 | null | E.cs:152:23:152:26 | access to parameter obj1 | null |
-| E.cs:153:13:153:24 | ... != ... | false | E.cs:153:13:153:16 | access to local variable obj2 | null |
-| E.cs:153:13:153:24 | ... != ... | true | E.cs:153:13:153:16 | access to local variable obj2 | non-null |
-| E.cs:153:13:153:54 | ... && ... | true | E.cs:153:13:153:24 | ... != ... | true |
-| E.cs:153:13:153:54 | ... && ... | true | E.cs:153:29:153:54 | ... > ... | true |
-| E.cs:153:29:153:32 | access to local variable obj2 | non-null | E.cs:152:23:152:26 | access to parameter obj1 | non-null |
-| E.cs:153:29:153:32 | access to local variable obj2 | null | E.cs:152:23:152:26 | access to parameter obj1 | null |
-| E.cs:155:13:155:16 | access to local variable obj2 | non-null | E.cs:152:23:152:26 | access to parameter obj1 | non-null |
-| E.cs:155:13:155:16 | access to local variable obj2 | null | E.cs:152:23:152:26 | access to parameter obj1 | null |
-| E.cs:159:13:159:16 | access to local variable obj2 | non-null | E.cs:152:23:152:26 | access to parameter obj1 | non-null |
-| E.cs:159:13:159:16 | access to local variable obj2 | null | E.cs:152:23:152:26 | access to parameter obj1 | null |
-| E.cs:164:17:164:25 | ... == ... | false | E.cs:164:17:164:17 | access to parameter a | non-null |
-| E.cs:164:17:164:25 | ... == ... | true | E.cs:164:17:164:17 | access to parameter a | null |
-| E.cs:175:19:175:29 | ... == ... | false | E.cs:175:19:175:21 | access to parameter obj | non-null |
-| E.cs:175:19:175:29 | ... == ... | true | E.cs:175:19:175:21 | access to parameter obj | null |
-| E.cs:175:19:175:42 | ... ? ... : ... | true | E.cs:175:19:175:29 | ... == ... | false |
-| E.cs:175:19:175:42 | ... ? ... : ... | true | E.cs:175:41:175:42 | access to parameter b1 | true |
-| E.cs:176:13:176:14 | (...) ... | non-null | E.cs:176:13:176:14 | access to local variable b2 | non-null |
-| E.cs:176:13:176:14 | (...) ... | null | E.cs:176:13:176:14 | access to local variable b2 | null |
-| E.cs:176:13:176:14 | access to local variable b2 | false | E.cs:175:19:175:42 | ... ? ... : ... | false |
-| E.cs:176:13:176:14 | access to local variable b2 | true | E.cs:175:19:175:42 | ... ? ... : ... | true |
-| E.cs:176:13:176:22 | ... == ... | false | E.cs:176:13:176:14 | (...) ... | non-null |
-| E.cs:176:13:176:22 | ... == ... | true | E.cs:176:13:176:14 | (...) ... | null |
-| E.cs:176:13:176:22 | ... == ... | true | E.cs:176:19:176:22 | null | non-null |
-| E.cs:180:13:180:23 | ... == ... | false | E.cs:180:13:180:15 | access to parameter obj | non-null |
-| E.cs:180:13:180:23 | ... == ... | true | E.cs:180:13:180:15 | access to parameter obj | null |
-| E.cs:184:13:184:14 | (...) ... | non-null | E.cs:184:13:184:14 | access to parameter b1 | non-null |
-| E.cs:184:13:184:14 | (...) ... | null | E.cs:184:13:184:14 | access to parameter b1 | null |
-| E.cs:184:13:184:22 | ... == ... | false | E.cs:184:13:184:14 | (...) ... | non-null |
-| E.cs:184:13:184:22 | ... == ... | true | E.cs:184:13:184:14 | (...) ... | null |
-| E.cs:184:13:184:22 | ... == ... | true | E.cs:184:19:184:22 | null | non-null |
-| E.cs:193:17:193:29 | call to method ToString | non-null | E.cs:193:17:193:17 | access to parameter o | non-null |
-| E.cs:198:17:198:29 | ... ? ... : ... | non-null | E.cs:198:17:198:17 | access to parameter b | false |
-| E.cs:198:17:198:29 | ... ? ... : ... | non-null | E.cs:198:28:198:29 | "" | non-null |
-| E.cs:198:17:198:29 | ... ? ... : ... | null | E.cs:198:17:198:17 | access to parameter b | true |
-| E.cs:198:17:198:29 | ... ? ... : ... | null | E.cs:198:21:198:24 | null | null |
-| E.cs:199:9:199:9 | access to local variable o | empty | E.cs:198:17:198:29 | ... ? ... : ... | empty |
-| E.cs:199:9:199:9 | access to local variable o | non-empty | E.cs:198:17:198:29 | ... ? ... : ... | non-empty |
-| E.cs:199:9:199:9 | access to local variable o | non-null | E.cs:198:17:198:29 | ... ? ... : ... | non-null |
-| E.cs:199:9:199:9 | access to local variable o | null | E.cs:198:17:198:29 | ... ? ... : ... | null |
-| E.cs:201:13:201:13 | access to local variable o | non-null | E.cs:198:17:198:29 | ... ? ... : ... | non-null |
-| E.cs:201:13:201:13 | access to local variable o | null | E.cs:198:17:198:29 | ... ? ... : ... | null |
-| E.cs:203:13:203:13 | access to local variable o | non-null | E.cs:198:17:198:29 | ... ? ... : ... | non-null |
-| E.cs:203:13:203:13 | access to local variable o | null | E.cs:198:17:198:29 | ... ? ... : ... | null |
-| E.cs:208:13:208:23 | ... is ... | false | E.cs:208:13:208:13 | access to parameter s | null |
-| E.cs:208:13:208:23 | ... is ... | true | E.cs:208:13:208:13 | access to parameter s | non-null |
-| E.cs:220:13:220:13 | access to local variable x | non-null | E.cs:217:17:217:20 | null | non-null |
-| E.cs:220:13:220:13 | access to local variable x | null | E.cs:217:17:217:20 | null | null |
-| E.cs:229:13:229:13 | access to local variable x | empty | E.cs:227:17:227:20 | null | empty |
-| E.cs:229:13:229:13 | access to local variable x | non-empty | E.cs:227:17:227:20 | null | non-empty |
-| E.cs:229:13:229:13 | access to local variable x | non-null | E.cs:227:17:227:20 | null | non-null |
-| E.cs:229:13:229:13 | access to local variable x | null | E.cs:227:17:227:20 | null | null |
-| E.cs:245:13:245:22 | access to property HasValue | false | E.cs:245:13:245:13 | access to parameter i | null |
-| E.cs:245:13:245:22 | access to property HasValue | true | E.cs:245:13:245:13 | access to parameter i | non-null |
-| E.cs:252:13:252:21 | ... != ... | false | E.cs:252:13:252:13 | access to parameter i | null |
-| E.cs:252:13:252:21 | ... != ... | true | E.cs:252:13:252:13 | access to parameter i | non-null |
-| E.cs:259:13:259:21 | ... == ... | false | E.cs:259:13:259:13 | access to parameter i | non-null |
-| E.cs:259:13:259:21 | ... == ... | true | E.cs:259:13:259:13 | access to parameter i | null |
-| E.cs:270:13:270:13 | access to local variable o | non-null | E.cs:269:17:269:22 | call to method Make | non-null |
-| E.cs:270:13:270:13 | access to local variable o | null | E.cs:269:17:269:22 | call to method Make | null |
-| E.cs:274:17:274:25 | ... != ... | false | E.cs:274:17:274:17 | access to local variable o | null |
-| E.cs:274:17:274:25 | ... != ... | true | E.cs:274:17:274:17 | access to local variable o | non-null |
-| E.cs:284:9:284:9 | access to local variable o | empty | E.cs:283:17:283:22 | call to method Make | empty |
-| E.cs:284:9:284:9 | access to local variable o | non-empty | E.cs:283:17:283:22 | call to method Make | non-empty |
-| E.cs:284:9:284:9 | access to local variable o | non-null | E.cs:283:17:283:22 | call to method Make | non-null |
-| E.cs:284:9:284:9 | access to local variable o | null | E.cs:283:17:283:22 | call to method Make | null |
-| E.cs:285:9:285:9 | access to local variable o | non-null | E.cs:283:17:283:22 | call to method Make | non-null |
-| E.cs:285:9:285:9 | access to local variable o | null | E.cs:283:17:283:22 | call to method Make | null |
-| E.cs:292:20:292:32 | ... ? ... : ... | non-null | E.cs:292:20:292:20 | access to parameter b | false |
-| E.cs:292:20:292:32 | ... ? ... : ... | non-null | E.cs:292:31:292:32 | "" | non-null |
-| E.cs:292:20:292:32 | ... ? ... : ... | null | E.cs:292:20:292:20 | access to parameter b | true |
-| E.cs:292:20:292:32 | ... ? ... : ... | null | E.cs:292:24:292:27 | null | null |
-| E.cs:293:13:293:13 | access to local variable s | empty | E.cs:292:20:292:32 | ... ? ... : ... | empty |
-| E.cs:293:13:293:13 | access to local variable s | non-empty | E.cs:292:20:292:32 | ... ? ... : ... | non-empty |
-| E.cs:293:13:293:13 | access to local variable s | non-null | E.cs:292:20:292:20 | access to parameter b | false |
-| E.cs:293:13:293:13 | access to local variable s | non-null | E.cs:292:20:292:32 | ... ? ... : ... | non-null |
-| E.cs:293:13:293:13 | access to local variable s | null | E.cs:292:20:292:20 | access to parameter b | true |
-| E.cs:293:13:293:13 | access to local variable s | null | E.cs:292:20:292:32 | ... ? ... : ... | null |
-| E.cs:293:13:293:19 | call to method M2 | non-null | E.cs:293:13:293:13 | access to local variable s | non-null |
-| E.cs:293:13:293:19 | call to method M2 | null | E.cs:293:13:293:13 | access to local variable s | null |
-| E.cs:293:13:293:24 | ... == ... | true | E.cs:293:13:293:19 | call to method M2 | non-null |
-| E.cs:295:13:295:13 | access to local variable s | non-null | E.cs:292:20:292:32 | ... ? ... : ... | non-null |
-| E.cs:295:13:295:13 | access to local variable s | null | E.cs:292:20:292:32 | ... ? ... : ... | null |
-| E.cs:302:9:302:9 | access to local variable s | empty | E.cs:301:17:301:27 | ... as ... | empty |
-| E.cs:302:9:302:9 | access to local variable s | non-empty | E.cs:301:17:301:27 | ... as ... | non-empty |
-| E.cs:302:9:302:9 | access to local variable s | non-null | E.cs:301:17:301:27 | ... as ... | non-null |
-| E.cs:302:9:302:9 | access to local variable s | null | E.cs:301:17:301:27 | ... as ... | null |
-| E.cs:309:13:309:22 | access to property HasValue | false | E.cs:309:13:309:13 | access to field l | null |
-| E.cs:309:13:309:22 | access to property HasValue | true | E.cs:309:13:309:13 | access to field l | non-null |
-| E.cs:317:22:317:38 | ... ? ... : ... | non-null | E.cs:317:22:317:26 | access to field Field | false |
-| E.cs:317:22:317:38 | ... ? ... : ... | non-null | E.cs:317:37:317:38 | "" | non-null |
-| E.cs:317:22:317:38 | ... ? ... : ... | null | E.cs:317:22:317:26 | access to field Field | true |
-| E.cs:317:22:317:38 | ... ? ... : ... | null | E.cs:317:30:317:33 | null | null |
-| E.cs:321:13:321:30 | ... is ... | false | E.cs:321:14:321:21 | ... ?? ... | non-null |
-| E.cs:321:13:321:30 | ... is ... | true | E.cs:321:14:321:21 | ... ?? ... | null |
-| E.cs:321:14:321:21 | ... ?? ... | null | E.cs:321:14:321:15 | access to parameter s1 | null |
-| E.cs:321:14:321:21 | ... ?? ... | null | E.cs:321:20:321:21 | access to parameter s2 | null |
-| E.cs:330:17:330:28 | (...) ... | non-null | E.cs:330:25:330:28 | null | non-null |
-| E.cs:330:17:330:28 | (...) ... | null | E.cs:330:25:330:28 | null | null |
-| E.cs:330:17:330:36 | ... ?? ... | null | E.cs:330:17:330:28 | (...) ... | null |
-| E.cs:330:17:330:36 | ... ?? ... | null | E.cs:330:33:330:36 | null | null |
-| E.cs:331:9:331:9 | access to local variable x | empty | E.cs:330:17:330:36 | ... ?? ... | empty |
-| E.cs:331:9:331:9 | access to local variable x | non-empty | E.cs:330:17:330:36 | ... ?? ... | non-empty |
-| E.cs:331:9:331:9 | access to local variable x | non-null | E.cs:330:17:330:36 | ... ?? ... | non-null |
-| E.cs:331:9:331:9 | access to local variable x | null | E.cs:330:17:330:36 | ... ?? ... | null |
-| E.cs:336:17:336:23 | ... ?? ... | null | E.cs:336:17:336:17 | access to parameter s | null |
-| E.cs:336:17:336:23 | ... ?? ... | null | E.cs:336:22:336:23 | "" | null |
-| E.cs:337:9:337:9 | access to local variable x | empty | E.cs:336:17:336:23 | ... ?? ... | empty |
-| E.cs:337:9:337:9 | access to local variable x | non-empty | E.cs:336:17:336:23 | ... ?? ... | non-empty |
-| E.cs:337:9:337:9 | access to local variable x | non-null | E.cs:336:17:336:23 | ... ?? ... | non-null |
-| E.cs:337:9:337:9 | access to local variable x | null | E.cs:336:17:336:23 | ... ?? ... | null |
-| E.cs:342:17:342:32 | ... ?? ... | null | E.cs:342:17:342:17 | access to parameter s | null |
-| E.cs:342:17:342:32 | ... ?? ... | null | E.cs:342:22:342:32 | ... as ... | null |
-| E.cs:343:9:343:9 | access to local variable x | empty | E.cs:342:17:342:32 | ... ?? ... | empty |
-| E.cs:343:9:343:9 | access to local variable x | non-empty | E.cs:342:17:342:32 | ... ?? ... | non-empty |
-| E.cs:343:9:343:9 | access to local variable x | non-null | E.cs:342:17:342:32 | ... ?? ... | non-null |
-| E.cs:343:9:343:9 | access to local variable x | null | E.cs:342:17:342:32 | ... ?? ... | null |
-| E.cs:348:21:348:36 | ... ?? ... | null | E.cs:348:21:348:21 | access to parameter s | null |
-| E.cs:348:21:348:36 | ... ?? ... | null | E.cs:348:26:348:36 | ... as ... | null |
-| E.cs:349:9:349:9 | access to local variable x | non-null | E.cs:348:21:348:36 | ... ?? ... | non-null |
-| E.cs:349:9:349:9 | access to local variable x | null | E.cs:348:21:348:36 | ... ?? ... | null |
-| E.cs:354:21:354:36 | ... ?? ... | null | E.cs:354:21:354:21 | access to parameter s | null |
-| E.cs:354:21:354:36 | ... ?? ... | null | E.cs:354:26:354:36 | ... as ... | null |
-| E.cs:355:13:355:13 | access to local variable x | non-null | E.cs:354:21:354:36 | ... ?? ... | non-null |
-| E.cs:355:13:355:13 | access to local variable x | null | E.cs:354:21:354:36 | ... ?? ... | null |
-| E.cs:355:13:355:21 | dynamic call to operator != | false | E.cs:355:13:355:13 | access to local variable x | null |
-| E.cs:355:13:355:21 | dynamic call to operator != | true | E.cs:355:13:355:13 | access to local variable x | non-null |
-| E.cs:356:13:356:13 | access to local variable x | non-null | E.cs:354:21:354:36 | ... ?? ... | non-null |
-| E.cs:356:13:356:13 | access to local variable x | null | E.cs:354:21:354:36 | ... ?? ... | null |
-| E.cs:361:17:361:32 | ... ?? ... | null | E.cs:361:17:361:17 | access to parameter s | null |
-| E.cs:361:17:361:32 | ... ?? ... | null | E.cs:361:22:361:32 | ... as ... | null |
-| E.cs:362:13:362:13 | access to local variable x | empty | E.cs:361:17:361:32 | ... ?? ... | empty |
-| E.cs:362:13:362:13 | access to local variable x | non-empty | E.cs:361:17:361:32 | ... ?? ... | non-empty |
-| E.cs:362:13:362:13 | access to local variable x | non-null | E.cs:361:17:361:32 | ... ?? ... | non-null |
-| E.cs:362:13:362:13 | access to local variable x | null | E.cs:361:17:361:32 | ... ?? ... | null |
-| E.cs:362:13:362:29 | ... != ... | false | E.cs:362:13:362:13 | access to local variable x | null |
-| E.cs:362:13:362:29 | ... != ... | true | E.cs:362:13:362:13 | access to local variable x | non-null |
-| E.cs:362:18:362:29 | (...) ... | non-null | E.cs:362:26:362:29 | null | non-null |
-| E.cs:362:18:362:29 | (...) ... | null | E.cs:362:26:362:29 | null | null |
-| E.cs:363:13:363:13 | access to local variable x | non-null | E.cs:361:17:361:32 | ... ?? ... | non-null |
-| E.cs:363:13:363:13 | access to local variable x | null | E.cs:361:17:361:32 | ... ?? ... | null |
-| E.cs:372:13:372:23 | ... is ... | true | E.cs:372:13:372:13 | access to parameter o | non-null |
-| E.cs:375:20:375:20 | access to local variable s | empty | E.cs:374:21:374:31 | ... as ... | empty |
-| E.cs:375:20:375:20 | access to local variable s | non-empty | E.cs:374:21:374:31 | ... as ... | non-empty |
-| E.cs:375:20:375:20 | access to local variable s | non-null | E.cs:374:21:374:31 | ... as ... | non-null |
-| E.cs:375:20:375:20 | access to local variable s | null | E.cs:374:21:374:31 | ... as ... | null |
-| E.cs:382:13:382:68 | ... \|\| ... | false | E.cs:382:14:382:37 | ... && ... | false |
-| E.cs:382:13:382:68 | ... \|\| ... | false | E.cs:382:44:382:67 | ... && ... | false |
-| E.cs:382:14:382:23 | ... == ... | false | E.cs:382:14:382:15 | access to parameter e1 | non-null |
-| E.cs:382:14:382:23 | ... == ... | true | E.cs:382:14:382:15 | access to parameter e1 | null |
-| E.cs:382:14:382:37 | ... && ... | true | E.cs:382:14:382:23 | ... == ... | true |
-| E.cs:382:14:382:37 | ... && ... | true | E.cs:382:28:382:37 | ... != ... | true |
-| E.cs:382:28:382:37 | ... != ... | false | E.cs:382:28:382:29 | access to parameter e2 | null |
-| E.cs:382:28:382:37 | ... != ... | true | E.cs:382:28:382:29 | access to parameter e2 | non-null |
-| E.cs:382:44:382:53 | ... != ... | false | E.cs:382:44:382:45 | access to parameter e1 | null |
-| E.cs:382:44:382:53 | ... != ... | true | E.cs:382:44:382:45 | access to parameter e1 | non-null |
-| E.cs:382:44:382:67 | ... && ... | true | E.cs:382:44:382:53 | ... != ... | true |
-| E.cs:382:44:382:67 | ... && ... | true | E.cs:382:58:382:67 | ... == ... | true |
-| E.cs:382:58:382:67 | ... == ... | false | E.cs:382:58:382:59 | access to parameter e2 | non-null |
-| E.cs:382:58:382:67 | ... == ... | true | E.cs:382:58:382:59 | access to parameter e2 | null |
-| E.cs:384:13:384:22 | ... == ... | false | E.cs:384:13:384:14 | access to parameter e1 | non-null |
-| E.cs:384:13:384:22 | ... == ... | true | E.cs:384:13:384:14 | access to parameter e1 | null |
-| E.cs:384:13:384:36 | ... && ... | true | E.cs:384:13:384:22 | ... == ... | true |
-| E.cs:384:13:384:36 | ... && ... | true | E.cs:384:27:384:36 | ... == ... | true |
-| E.cs:384:27:384:36 | ... == ... | false | E.cs:384:27:384:28 | access to parameter e2 | non-null |
-| E.cs:384:27:384:36 | ... == ... | true | E.cs:384:27:384:28 | access to parameter e2 | null |
-| E.cs:404:9:404:9 | access to local variable i | non-null | E.cs:403:18:403:21 | null | non-null |
-| E.cs:404:9:404:9 | access to local variable i | null | E.cs:403:18:403:21 | null | null |
-| E.cs:404:9:404:18 | ... = ... | non-null | E.cs:404:9:404:9 | access to local variable i | non-null |
-| E.cs:404:9:404:18 | ... = ... | non-null | E.cs:404:9:404:18 | ... ?? ... | non-null |
-| E.cs:404:9:404:18 | ... = ... | null | E.cs:404:9:404:9 | access to local variable i | null |
-| E.cs:404:9:404:18 | ... = ... | null | E.cs:404:9:404:18 | ... ?? ... | null |
-| E.cs:404:9:404:18 | ... ?? ... | null | E.cs:404:9:404:9 | access to local variable i | null |
-| E.cs:404:9:404:18 | ... ?? ... | null | E.cs:404:15:404:18 | null | null |
-| E.cs:405:16:405:16 | access to local variable i | non-null | E.cs:404:9:404:18 | ... ?? ... | non-null |
-| E.cs:405:16:405:16 | access to local variable i | null | E.cs:404:9:404:18 | ... ?? ... | null |
-| E.cs:411:9:411:9 | access to local variable i | non-null | E.cs:410:18:410:18 | (...) ... | non-null |
-| E.cs:411:9:411:9 | access to local variable i | null | E.cs:410:18:410:18 | (...) ... | null |
-| E.cs:411:9:411:18 | ... = ... | non-null | E.cs:411:9:411:9 | access to local variable i | non-null |
-| E.cs:411:9:411:18 | ... = ... | non-null | E.cs:411:9:411:18 | ... ?? ... | non-null |
-| E.cs:411:9:411:18 | ... = ... | null | E.cs:411:9:411:9 | access to local variable i | null |
-| E.cs:411:9:411:18 | ... = ... | null | E.cs:411:9:411:18 | ... ?? ... | null |
-| E.cs:411:9:411:18 | ... ?? ... | null | E.cs:411:9:411:9 | access to local variable i | null |
-| E.cs:411:9:411:18 | ... ?? ... | null | E.cs:411:15:411:18 | null | null |
-| E.cs:412:16:412:16 | access to local variable i | non-null | E.cs:411:9:411:18 | ... ?? ... | non-null |
-| E.cs:412:16:412:16 | access to local variable i | null | E.cs:411:9:411:18 | ... ?? ... | null |
-| E.cs:417:16:417:41 | call to method Any<Int32> | true | E.cs:417:16:417:18 | access to parameter is | non-empty |
-| E.cs:422:13:422:22 | access to property HasValue | false | E.cs:422:13:422:13 | access to parameter i | null |
-| E.cs:422:13:422:22 | access to property HasValue | true | E.cs:422:13:422:13 | access to parameter i | non-null |
-| E.cs:423:20:423:45 | call to method Any<Int32> | true | E.cs:423:20:423:22 | access to parameter is | non-empty |
-| E.cs:429:13:429:22 | access to property HasValue | false | E.cs:429:13:429:13 | access to parameter i | null |
-| E.cs:429:13:429:22 | access to property HasValue | true | E.cs:429:13:429:13 | access to parameter i | non-null |
-| E.cs:432:16:432:24 | call to method Any<Int32> | false | E.cs:432:16:432:18 | access to parameter is | empty |
-| E.cs:432:16:432:24 | call to method Any<Int32> | true | E.cs:432:16:432:18 | access to parameter is | non-empty |
-| E.cs:437:13:437:21 | ... is ... | false | E.cs:437:13:437:13 | access to parameter s | non-null |
-| E.cs:437:13:437:21 | ... is ... | true | E.cs:437:13:437:13 | access to parameter s | null |
-| E.cs:442:13:442:29 | ... is ... | true | E.cs:442:13:442:13 | access to parameter s | non-null |
-| E.cs:447:13:447:25 | ... is ... | true | E.cs:447:13:447:13 | access to parameter s | non-null |
-| E.cs:452:13:452:23 | ... is ... | true | E.cs:452:13:452:13 | access to parameter s | non-null |
-| F.cs:8:9:8:9 | access to local variable o | non-null | F.cs:7:20:7:23 | null | non-null |
-| F.cs:8:9:8:9 | access to local variable o | null | F.cs:7:20:7:23 | null | null |
-| F.cs:14:9:14:9 | access to local variable o | non-null | F.cs:13:21:13:24 | null | non-null |
-| F.cs:14:9:14:9 | access to local variable o | null | F.cs:13:21:13:24 | null | null |
-| Forwarding.cs:9:13:9:30 | !... | false | Forwarding.cs:9:14:9:30 | call to method IsNullOrEmpty | true |
-| Forwarding.cs:9:13:9:30 | !... | true | Forwarding.cs:9:14:9:30 | call to method IsNullOrEmpty | false |
-| Forwarding.cs:9:14:9:14 | access to local variable s | empty | Forwarding.cs:7:20:7:23 | null | empty |
-| Forwarding.cs:9:14:9:14 | access to local variable s | non-empty | Forwarding.cs:7:20:7:23 | null | non-empty |
-| Forwarding.cs:9:14:9:14 | access to local variable s | non-null | Forwarding.cs:7:20:7:23 | null | non-null |
-| Forwarding.cs:9:14:9:14 | access to local variable s | null | Forwarding.cs:7:20:7:23 | null | null |
-| Forwarding.cs:9:14:9:30 | call to method IsNullOrEmpty | false | Forwarding.cs:9:14:9:14 | access to local variable s | non-null |
-| Forwarding.cs:11:31:11:31 | access to local variable s | non-null | Forwarding.cs:7:20:7:23 | null | non-null |
-| Forwarding.cs:11:31:11:31 | access to local variable s | null | Forwarding.cs:7:20:7:23 | null | null |
-| Forwarding.cs:14:13:14:13 | access to local variable s | non-null | Forwarding.cs:7:20:7:23 | null | non-null |
-| Forwarding.cs:14:13:14:13 | access to local variable s | null | Forwarding.cs:7:20:7:23 | null | null |
-| Forwarding.cs:14:13:14:32 | call to method IsNotNullOrEmpty | true | Forwarding.cs:14:13:14:13 | access to local variable s | non-null |
-| Forwarding.cs:16:31:16:31 | access to local variable s | non-null | Forwarding.cs:7:20:7:23 | null | non-null |
-| Forwarding.cs:16:31:16:31 | access to local variable s | null | Forwarding.cs:7:20:7:23 | null | null |
-| Forwarding.cs:19:13:19:23 | !... | false | Forwarding.cs:19:14:19:23 | call to method IsNull | true |
-| Forwarding.cs:19:13:19:23 | !... | true | Forwarding.cs:19:14:19:23 | call to method IsNull | false |
-| Forwarding.cs:19:14:19:14 | access to local variable s | non-null | Forwarding.cs:7:20:7:23 | null | non-null |
-| Forwarding.cs:19:14:19:14 | access to local variable s | null | Forwarding.cs:7:20:7:23 | null | null |
-| Forwarding.cs:19:14:19:23 | call to method IsNull | false | Forwarding.cs:19:14:19:14 | access to local variable s | non-null |
-| Forwarding.cs:19:14:19:23 | call to method IsNull | true | Forwarding.cs:19:14:19:14 | access to local variable s | null |
-| Forwarding.cs:21:31:21:31 | access to local variable s | non-null | Forwarding.cs:7:20:7:23 | null | non-null |
-| Forwarding.cs:21:31:21:31 | access to local variable s | null | Forwarding.cs:7:20:7:23 | null | null |
-| Forwarding.cs:24:13:24:13 | access to local variable s | non-null | Forwarding.cs:7:20:7:23 | null | non-null |
-| Forwarding.cs:24:13:24:13 | access to local variable s | null | Forwarding.cs:7:20:7:23 | null | null |
-| Forwarding.cs:24:13:24:25 | call to method IsNotNull | false | Forwarding.cs:24:13:24:13 | access to local variable s | null |
-| Forwarding.cs:24:13:24:25 | call to method IsNotNull | true | Forwarding.cs:24:13:24:13 | access to local variable s | non-null |
-| Forwarding.cs:26:31:26:31 | access to local variable s | non-null | Forwarding.cs:7:20:7:23 | null | non-null |
-| Forwarding.cs:26:31:26:31 | access to local variable s | null | Forwarding.cs:7:20:7:23 | null | null |
-| Forwarding.cs:29:13:29:24 | call to method IsNotNull | true | Forwarding.cs:29:23:29:23 | access to local variable s | non-null |
-| Forwarding.cs:29:23:29:23 | access to local variable s | non-null | Forwarding.cs:7:20:7:23 | null | non-null |
-| Forwarding.cs:29:23:29:23 | access to local variable s | null | Forwarding.cs:7:20:7:23 | null | null |
-| Forwarding.cs:31:31:31:31 | access to local variable s | non-null | Forwarding.cs:7:20:7:23 | null | non-null |
-| Forwarding.cs:31:31:31:31 | access to local variable s | null | Forwarding.cs:7:20:7:23 | null | null |
-| Forwarding.cs:34:13:34:29 | call to method IsNotNullWrong | false | Forwarding.cs:34:28:34:28 | access to local variable s | non-null |
-| Forwarding.cs:34:28:34:28 | access to local variable s | non-null | Forwarding.cs:7:20:7:23 | null | non-null |
-| Forwarding.cs:34:28:34:28 | access to local variable s | null | Forwarding.cs:7:20:7:23 | null | null |
-| Forwarding.cs:36:31:36:31 | access to local variable s | non-null | Forwarding.cs:7:20:7:23 | null | non-null |
-| Forwarding.cs:36:31:36:31 | access to local variable s | null | Forwarding.cs:7:20:7:23 | null | null |
-| Forwarding.cs:39:25:39:25 | access to local variable s | non-null | Forwarding.cs:7:20:7:23 | null | non-null |
-| Forwarding.cs:39:25:39:25 | access to local variable s | null | Forwarding.cs:7:20:7:23 | null | null |
-| Forwarding.cs:40:27:40:27 | access to local variable s | non-null | Forwarding.cs:7:20:7:23 | null | non-null |
-| Forwarding.cs:40:27:40:27 | access to local variable s | null | Forwarding.cs:7:20:7:23 | null | null |
-| Forwarding.cs:45:16:45:26 | ... is ... | true | Forwarding.cs:45:16:45:16 | access to parameter o | non-null |
-| Forwarding.cs:45:30:45:61 | !... | false | Forwarding.cs:45:31:45:61 | call to method IsNullOrEmpty | true |
-| Forwarding.cs:45:30:45:61 | !... | true | Forwarding.cs:45:31:45:61 | call to method IsNullOrEmpty | false |
-| Forwarding.cs:45:31:45:61 | call to method IsNullOrEmpty | false | Forwarding.cs:45:52:45:60 | (...) ... | non-null |
-| Forwarding.cs:45:52:45:60 | (...) ... | non-null | Forwarding.cs:45:60:45:60 | access to parameter o | non-null |
-| Forwarding.cs:45:52:45:60 | (...) ... | null | Forwarding.cs:45:60:45:60 | access to parameter o | null |
-| Forwarding.cs:45:65:45:75 | !... | false | Forwarding.cs:45:66:45:75 | call to method IsNull | true |
-| Forwarding.cs:45:65:45:75 | !... | true | Forwarding.cs:45:66:45:75 | call to method IsNull | false |
-| Forwarding.cs:45:66:45:75 | call to method IsNull | false | Forwarding.cs:45:66:45:66 | access to parameter o | non-null |
-| Forwarding.cs:45:66:45:75 | call to method IsNull | true | Forwarding.cs:45:66:45:66 | access to parameter o | null |
-| Forwarding.cs:50:13:50:23 | ... is ... | true | Forwarding.cs:50:13:50:13 | access to parameter o | non-null |
-| Forwarding.cs:52:20:52:51 | !... | false | Forwarding.cs:52:21:52:51 | call to method IsNullOrEmpty | true |
-| Forwarding.cs:52:20:52:51 | !... | true | Forwarding.cs:52:21:52:51 | call to method IsNullOrEmpty | false |
-| Forwarding.cs:52:21:52:51 | call to method IsNullOrEmpty | false | Forwarding.cs:52:42:52:50 | (...) ... | non-null |
-| Forwarding.cs:52:42:52:50 | (...) ... | non-null | Forwarding.cs:52:50:52:50 | access to parameter o | non-null |
-| Forwarding.cs:52:42:52:50 | (...) ... | null | Forwarding.cs:52:50:52:50 | access to parameter o | null |
-| Forwarding.cs:59:13:59:21 | ... == ... | false | Forwarding.cs:59:13:59:13 | access to parameter o | non-null |
-| Forwarding.cs:59:13:59:21 | ... == ... | true | Forwarding.cs:59:13:59:13 | access to parameter o | null |
-| Forwarding.cs:68:16:68:38 | call to method IsNullOrEmpty | false | Forwarding.cs:68:37:68:37 | access to parameter s | non-null |
-| Forwarding.cs:73:16:73:39 | !... | false | Forwarding.cs:73:17:73:39 | call to method IsNullOrEmpty | true |
-| Forwarding.cs:73:16:73:39 | !... | true | Forwarding.cs:73:17:73:39 | call to method IsNullOrEmpty | false |
-| Forwarding.cs:73:17:73:39 | call to method IsNullOrEmpty | false | Forwarding.cs:73:38:73:38 | access to parameter s | non-null |
-| Forwarding.cs:78:16:78:39 | call to method ReferenceEquals | false | Forwarding.cs:78:32:78:32 | access to parameter o | non-null |
-| Forwarding.cs:78:16:78:39 | call to method ReferenceEquals | true | Forwarding.cs:78:32:78:32 | access to parameter o | null |
-| Forwarding.cs:83:16:83:24 | ... != ... | false | Forwarding.cs:83:16:83:16 | access to parameter o | null |
-| Forwarding.cs:83:16:83:24 | ... != ... | true | Forwarding.cs:83:16:83:16 | access to parameter o | non-null |
-| GuardedString.cs:7:20:7:32 | ... ? ... : ... | non-null | GuardedString.cs:7:20:7:20 | access to parameter b | false |
-| GuardedString.cs:7:20:7:32 | ... ? ... : ... | non-null | GuardedString.cs:7:31:7:32 | "" | non-null |
-| GuardedString.cs:7:20:7:32 | ... ? ... : ... | null | GuardedString.cs:7:20:7:20 | access to parameter b | true |
-| GuardedString.cs:7:20:7:32 | ... ? ... : ... | null | GuardedString.cs:7:24:7:27 | null | null |
-| GuardedString.cs:9:13:9:36 | !... | false | GuardedString.cs:9:14:9:36 | call to method IsNullOrEmpty | true |
-| GuardedString.cs:9:13:9:36 | !... | true | GuardedString.cs:9:14:9:36 | call to method IsNullOrEmpty | false |
-| GuardedString.cs:9:14:9:36 | call to method IsNullOrEmpty | false | GuardedString.cs:7:20:7:20 | access to parameter b | false |
-| GuardedString.cs:9:14:9:36 | call to method IsNullOrEmpty | false | GuardedString.cs:9:35:9:35 | access to local variable s | non-null |
-| GuardedString.cs:9:35:9:35 | access to local variable s | empty | GuardedString.cs:7:20:7:32 | ... ? ... : ... | empty |
-| GuardedString.cs:9:35:9:35 | access to local variable s | non-empty | GuardedString.cs:7:20:7:32 | ... ? ... : ... | non-empty |
-| GuardedString.cs:9:35:9:35 | access to local variable s | non-null | GuardedString.cs:7:20:7:32 | ... ? ... : ... | non-null |
-| GuardedString.cs:9:35:9:35 | access to local variable s | null | GuardedString.cs:7:20:7:32 | ... ? ... : ... | null |
-| GuardedString.cs:11:31:11:31 | access to local variable s | non-null | GuardedString.cs:7:20:7:32 | ... ? ... : ... | non-null |
-| GuardedString.cs:11:31:11:31 | access to local variable s | null | GuardedString.cs:7:20:7:32 | ... ? ... : ... | null |
-| GuardedString.cs:14:13:14:41 | !... | false | GuardedString.cs:14:14:14:41 | call to method IsNullOrWhiteSpace | true |
-| GuardedString.cs:14:13:14:41 | !... | true | GuardedString.cs:14:14:14:41 | call to method IsNullOrWhiteSpace | false |
-| GuardedString.cs:14:14:14:41 | call to method IsNullOrWhiteSpace | false | GuardedString.cs:7:20:7:20 | access to parameter b | false |
-| GuardedString.cs:14:14:14:41 | call to method IsNullOrWhiteSpace | false | GuardedString.cs:14:40:14:40 | access to local variable s | non-null |
-| GuardedString.cs:14:40:14:40 | access to local variable s | non-null | GuardedString.cs:7:20:7:32 | ... ? ... : ... | non-null |
-| GuardedString.cs:14:40:14:40 | access to local variable s | null | GuardedString.cs:7:20:7:32 | ... ? ... : ... | null |
-| GuardedString.cs:16:31:16:31 | access to local variable s | non-null | GuardedString.cs:7:20:7:32 | ... ? ... : ... | non-null |
-| GuardedString.cs:16:31:16:31 | access to local variable s | null | GuardedString.cs:7:20:7:32 | ... ? ... : ... | null |
-| GuardedString.cs:19:13:19:13 | access to local variable s | non-null | GuardedString.cs:7:20:7:20 | access to parameter b | false |
-| GuardedString.cs:19:13:19:13 | access to local variable s | non-null | GuardedString.cs:7:20:7:32 | ... ? ... : ... | non-null |
-| GuardedString.cs:19:13:19:13 | access to local variable s | null | GuardedString.cs:7:20:7:20 | access to parameter b | true |
-| GuardedString.cs:19:13:19:13 | access to local variable s | null | GuardedString.cs:7:20:7:32 | ... ? ... : ... | null |
-| GuardedString.cs:19:13:19:21 | access to property Length | non-null | GuardedString.cs:19:13:19:13 | access to local variable s | non-null |
-| GuardedString.cs:19:13:19:21 | access to property Length | null | GuardedString.cs:19:13:19:13 | access to local variable s | null |
-| GuardedString.cs:19:13:19:26 | ... == ... | true | GuardedString.cs:19:13:19:21 | access to property Length | non-null |
-| GuardedString.cs:20:31:20:31 | access to local variable s | non-null | GuardedString.cs:7:20:7:32 | ... ? ... : ... | non-null |
-| GuardedString.cs:20:31:20:31 | access to local variable s | null | GuardedString.cs:7:20:7:32 | ... ? ... : ... | null |
-| GuardedString.cs:22:13:22:13 | access to local variable s | non-null | GuardedString.cs:7:20:7:20 | access to parameter b | false |
-| GuardedString.cs:22:13:22:13 | access to local variable s | non-null | GuardedString.cs:7:20:7:32 | ... ? ... : ... | non-null |
-| GuardedString.cs:22:13:22:13 | access to local variable s | null | GuardedString.cs:7:20:7:20 | access to parameter b | true |
-| GuardedString.cs:22:13:22:13 | access to local variable s | null | GuardedString.cs:7:20:7:32 | ... ? ... : ... | null |
-| GuardedString.cs:22:13:22:21 | access to property Length | non-null | GuardedString.cs:22:13:22:13 | access to local variable s | non-null |
-| GuardedString.cs:22:13:22:21 | access to property Length | null | GuardedString.cs:22:13:22:13 | access to local variable s | null |
-| GuardedString.cs:22:13:22:25 | ... > ... | true | GuardedString.cs:22:13:22:21 | access to property Length | non-null |
-| GuardedString.cs:23:31:23:31 | access to local variable s | non-null | GuardedString.cs:7:20:7:32 | ... ? ... : ... | non-null |
-| GuardedString.cs:23:31:23:31 | access to local variable s | null | GuardedString.cs:7:20:7:32 | ... ? ... : ... | null |
-| GuardedString.cs:25:13:25:13 | access to local variable s | non-null | GuardedString.cs:7:20:7:20 | access to parameter b | false |
-| GuardedString.cs:25:13:25:13 | access to local variable s | non-null | GuardedString.cs:7:20:7:32 | ... ? ... : ... | non-null |
-| GuardedString.cs:25:13:25:13 | access to local variable s | null | GuardedString.cs:7:20:7:20 | access to parameter b | true |
-| GuardedString.cs:25:13:25:13 | access to local variable s | null | GuardedString.cs:7:20:7:32 | ... ? ... : ... | null |
-| GuardedString.cs:25:13:25:21 | access to property Length | non-null | GuardedString.cs:25:13:25:13 | access to local variable s | non-null |
-| GuardedString.cs:25:13:25:21 | access to property Length | null | GuardedString.cs:25:13:25:13 | access to local variable s | null |
-| GuardedString.cs:25:13:25:26 | ... >= ... | true | GuardedString.cs:25:13:25:21 | access to property Length | non-null |
-| GuardedString.cs:26:31:26:31 | access to local variable s | non-null | GuardedString.cs:7:20:7:32 | ... ? ... : ... | non-null |
-| GuardedString.cs:26:31:26:31 | access to local variable s | null | GuardedString.cs:7:20:7:32 | ... ? ... : ... | null |
-| GuardedString.cs:28:13:28:13 | access to local variable s | non-null | GuardedString.cs:7:20:7:20 | access to parameter b | false |
-| GuardedString.cs:28:13:28:13 | access to local variable s | non-null | GuardedString.cs:7:20:7:32 | ... ? ... : ... | non-null |
-| GuardedString.cs:28:13:28:13 | access to local variable s | null | GuardedString.cs:7:20:7:20 | access to parameter b | true |
-| GuardedString.cs:28:13:28:13 | access to local variable s | null | GuardedString.cs:7:20:7:32 | ... ? ... : ... | null |
-| GuardedString.cs:28:13:28:21 | access to property Length | non-null | GuardedString.cs:28:13:28:13 | access to local variable s | non-null |
-| GuardedString.cs:28:13:28:21 | access to property Length | null | GuardedString.cs:28:13:28:13 | access to local variable s | null |
-| GuardedString.cs:28:13:28:26 | ... < ... | true | GuardedString.cs:28:13:28:21 | access to property Length | non-null |
-| GuardedString.cs:29:31:29:31 | access to local variable s | non-null | GuardedString.cs:7:20:7:32 | ... ? ... : ... | non-null |
-| GuardedString.cs:29:31:29:31 | access to local variable s | null | GuardedString.cs:7:20:7:32 | ... ? ... : ... | null |
-| GuardedString.cs:31:13:31:13 | access to local variable s | non-null | GuardedString.cs:7:20:7:20 | access to parameter b | false |
-| GuardedString.cs:31:13:31:13 | access to local variable s | non-null | GuardedString.cs:7:20:7:32 | ... ? ... : ... | non-null |
-| GuardedString.cs:31:13:31:13 | access to local variable s | null | GuardedString.cs:7:20:7:20 | access to parameter b | true |
-| GuardedString.cs:31:13:31:13 | access to local variable s | null | GuardedString.cs:7:20:7:32 | ... ? ... : ... | null |
-| GuardedString.cs:31:13:31:21 | access to property Length | non-null | GuardedString.cs:31:13:31:13 | access to local variable s | non-null |
-| GuardedString.cs:31:13:31:21 | access to property Length | null | GuardedString.cs:31:13:31:13 | access to local variable s | null |
-| GuardedString.cs:31:13:31:27 | ... <= ... | true | GuardedString.cs:31:13:31:21 | access to property Length | non-null |
-| GuardedString.cs:32:31:32:31 | access to local variable s | non-null | GuardedString.cs:7:20:7:32 | ... ? ... : ... | non-null |
-| GuardedString.cs:32:31:32:31 | access to local variable s | null | GuardedString.cs:7:20:7:32 | ... ? ... : ... | null |
-| GuardedString.cs:34:13:34:13 | access to local variable s | non-null | GuardedString.cs:7:20:7:20 | access to parameter b | false |
-| GuardedString.cs:34:13:34:13 | access to local variable s | non-null | GuardedString.cs:7:20:7:32 | ... ? ... : ... | non-null |
-| GuardedString.cs:34:13:34:13 | access to local variable s | null | GuardedString.cs:7:20:7:20 | access to parameter b | true |
-| GuardedString.cs:34:13:34:13 | access to local variable s | null | GuardedString.cs:7:20:7:32 | ... ? ... : ... | null |
-| GuardedString.cs:34:13:34:21 | access to property Length | non-null | GuardedString.cs:34:13:34:13 | access to local variable s | non-null |
-| GuardedString.cs:34:13:34:21 | access to property Length | null | GuardedString.cs:34:13:34:13 | access to local variable s | null |
-| GuardedString.cs:34:13:34:26 | ... != ... | false | GuardedString.cs:34:13:34:21 | access to property Length | non-null |
-| GuardedString.cs:35:31:35:31 | access to local variable s | non-null | GuardedString.cs:7:20:7:32 | ... ? ... : ... | non-null |
-| GuardedString.cs:35:31:35:31 | access to local variable s | null | GuardedString.cs:7:20:7:32 | ... ? ... : ... | null |
-| GuardedString.cs:37:31:37:31 | access to local variable s | non-null | GuardedString.cs:7:20:7:32 | ... ? ... : ... | non-null |
-| GuardedString.cs:37:31:37:31 | access to local variable s | null | GuardedString.cs:7:20:7:32 | ... ? ... : ... | null |
-| ImplicitToString.cs:8:23:8:23 | access to local variable o | non-null | ImplicitToString.cs:7:20:7:23 | null | non-null |
-| ImplicitToString.cs:8:23:8:23 | access to local variable o | null | ImplicitToString.cs:7:20:7:23 | null | null |
-| NullAlwaysBad.cs:9:17:9:25 | ... != ... | false | NullAlwaysBad.cs:9:17:9:17 | access to parameter s | null |
-| NullAlwaysBad.cs:9:17:9:25 | ... != ... | true | NullAlwaysBad.cs:9:17:9:17 | access to parameter s | non-null |
-| NullAlwaysBad.cs:9:17:9:41 | ... \|\| ... | false | NullAlwaysBad.cs:9:17:9:25 | ... != ... | false |
-| NullAlwaysBad.cs:9:17:9:41 | ... \|\| ... | false | NullAlwaysBad.cs:9:30:9:41 | ... > ... | false |
-| NullAlwaysGood.cs:9:17:9:25 | ... != ... | false | NullAlwaysGood.cs:9:17:9:17 | access to parameter s | null |
-| NullAlwaysGood.cs:9:17:9:25 | ... != ... | true | NullAlwaysGood.cs:9:17:9:17 | access to parameter s | non-null |
-| NullAlwaysGood.cs:9:17:9:41 | ... && ... | true | NullAlwaysGood.cs:9:17:9:25 | ... != ... | true |
-| NullAlwaysGood.cs:9:17:9:41 | ... && ... | true | NullAlwaysGood.cs:9:30:9:41 | ... > ... | true |
-| NullMaybeGood.cs:7:13:7:21 | ... != ... | false | NullMaybeGood.cs:7:13:7:13 | access to parameter o | null |
-| NullMaybeGood.cs:7:13:7:21 | ... != ... | true | NullMaybeGood.cs:7:13:7:13 | access to parameter o | non-null |
-| StringConcatenation.cs:8:9:8:9 | access to local variable s | empty | StringConcatenation.cs:7:20:7:23 | null | empty |
-| StringConcatenation.cs:8:9:8:9 | access to local variable s | non-empty | StringConcatenation.cs:7:20:7:23 | null | non-empty |
-| StringConcatenation.cs:8:9:8:9 | access to local variable s | non-null | StringConcatenation.cs:7:20:7:23 | null | non-null |
-| StringConcatenation.cs:8:9:8:9 | access to local variable s | null | StringConcatenation.cs:7:20:7:23 | null | null |
-| StringConcatenation.cs:8:9:8:18 | ... + ... | non-null | StringConcatenation.cs:8:9:8:9 | access to local variable s | non-null |
-| StringConcatenation.cs:8:9:8:18 | ... + ... | non-null | StringConcatenation.cs:8:14:8:18 | "abc" | non-null |
-| StringConcatenation.cs:8:9:8:18 | ... + ... | null | StringConcatenation.cs:8:9:8:9 | access to local variable s | null |
-| StringConcatenation.cs:8:9:8:18 | ... = ... | empty | StringConcatenation.cs:8:9:8:9 | access to local variable s | empty |
-| StringConcatenation.cs:8:9:8:18 | ... = ... | empty | StringConcatenation.cs:8:9:8:18 | ... + ... | empty |
-| StringConcatenation.cs:8:9:8:18 | ... = ... | non-empty | StringConcatenation.cs:8:9:8:9 | access to local variable s | non-empty |
-| StringConcatenation.cs:8:9:8:18 | ... = ... | non-empty | StringConcatenation.cs:8:9:8:18 | ... + ... | non-empty |
-| StringConcatenation.cs:8:9:8:18 | ... = ... | non-null | StringConcatenation.cs:8:9:8:9 | access to local variable s | non-null |
-| StringConcatenation.cs:8:9:8:18 | ... = ... | non-null | StringConcatenation.cs:8:9:8:18 | ... + ... | non-null |
-| StringConcatenation.cs:8:9:8:18 | ... = ... | null | StringConcatenation.cs:8:9:8:9 | access to local variable s | null |
-| StringConcatenation.cs:8:9:8:18 | ... = ... | null | StringConcatenation.cs:8:9:8:18 | ... + ... | null |
-| StringConcatenation.cs:9:13:9:13 | access to local variable s | empty | StringConcatenation.cs:8:9:8:18 | ... + ... | empty |
-| StringConcatenation.cs:9:13:9:13 | access to local variable s | non-empty | StringConcatenation.cs:8:9:8:18 | ... + ... | non-empty |
-| StringConcatenation.cs:9:13:9:13 | access to local variable s | non-null | StringConcatenation.cs:8:9:8:18 | ... + ... | non-null |
-| StringConcatenation.cs:9:13:9:13 | access to local variable s | null | StringConcatenation.cs:8:9:8:18 | ... + ... | null |
-| StringConcatenation.cs:15:16:15:22 | ... != ... | false | StringConcatenation.cs:15:16:15:16 | access to local variable s | non-null |
-| StringConcatenation.cs:22:16:22:22 | ... != ... | false | StringConcatenation.cs:22:16:22:16 | access to local variable s | non-null |
-| StringConcatenation.cs:23:13:23:22 | ... + ... | non-null | StringConcatenation.cs:23:13:23:13 | access to local variable s | non-null |
-| StringConcatenation.cs:23:13:23:22 | ... + ... | non-null | StringConcatenation.cs:23:18:23:22 | "abc" | non-null |
-| StringConcatenation.cs:23:13:23:22 | ... + ... | null | StringConcatenation.cs:23:13:23:13 | access to local variable s | null |
-| StringConcatenation.cs:23:13:23:22 | ... = ... | empty | StringConcatenation.cs:23:13:23:13 | access to local variable s | empty |
-| StringConcatenation.cs:23:13:23:22 | ... = ... | empty | StringConcatenation.cs:23:13:23:22 | ... + ... | empty |
-| StringConcatenation.cs:23:13:23:22 | ... = ... | non-empty | StringConcatenation.cs:23:13:23:13 | access to local variable s | non-empty |
-| StringConcatenation.cs:23:13:23:22 | ... = ... | non-empty | StringConcatenation.cs:23:13:23:22 | ... + ... | non-empty |
-| StringConcatenation.cs:23:13:23:22 | ... = ... | non-null | StringConcatenation.cs:23:13:23:13 | access to local variable s | non-null |
-| StringConcatenation.cs:23:13:23:22 | ... = ... | non-null | StringConcatenation.cs:23:13:23:22 | ... + ... | non-null |
-| StringConcatenation.cs:23:13:23:22 | ... = ... | null | StringConcatenation.cs:23:13:23:13 | access to local variable s | null |
-| StringConcatenation.cs:23:13:23:22 | ... = ... | null | StringConcatenation.cs:23:13:23:22 | ... + ... | null |
-| StringConcatenation.cs:30:9:30:9 | access to local variable s | empty | StringConcatenation.cs:29:20:29:24 | "abc" | empty |
-| StringConcatenation.cs:30:9:30:9 | access to local variable s | non-empty | StringConcatenation.cs:29:20:29:24 | "abc" | non-empty |
-| StringConcatenation.cs:30:9:30:9 | access to local variable s | non-null | StringConcatenation.cs:29:20:29:24 | "abc" | non-null |
-| StringConcatenation.cs:30:9:30:9 | access to local variable s | null | StringConcatenation.cs:29:20:29:24 | "abc" | null |
-| StringConcatenation.cs:30:9:30:17 | ... + ... | non-null | StringConcatenation.cs:30:9:30:9 | access to local variable s | non-null |
-| StringConcatenation.cs:30:9:30:17 | ... + ... | non-null | StringConcatenation.cs:30:14:30:17 | null | non-null |
-| StringConcatenation.cs:30:9:30:17 | ... + ... | null | StringConcatenation.cs:30:14:30:17 | null | null |
-| StringConcatenation.cs:30:9:30:17 | ... = ... | empty | StringConcatenation.cs:30:9:30:9 | access to local variable s | empty |
-| StringConcatenation.cs:30:9:30:17 | ... = ... | empty | StringConcatenation.cs:30:9:30:17 | ... + ... | empty |
-| StringConcatenation.cs:30:9:30:17 | ... = ... | non-empty | StringConcatenation.cs:30:9:30:9 | access to local variable s | non-empty |
-| StringConcatenation.cs:30:9:30:17 | ... = ... | non-empty | StringConcatenation.cs:30:9:30:17 | ... + ... | non-empty |
-| StringConcatenation.cs:30:9:30:17 | ... = ... | non-null | StringConcatenation.cs:30:9:30:9 | access to local variable s | non-null |
-| StringConcatenation.cs:30:9:30:17 | ... = ... | non-null | StringConcatenation.cs:30:9:30:17 | ... + ... | non-null |
-| StringConcatenation.cs:30:9:30:17 | ... = ... | null | StringConcatenation.cs:30:9:30:9 | access to local variable s | null |
-| StringConcatenation.cs:30:9:30:17 | ... = ... | null | StringConcatenation.cs:30:9:30:17 | ... + ... | null |
-| StringConcatenation.cs:31:13:31:13 | access to local variable s | empty | StringConcatenation.cs:30:9:30:17 | ... + ... | empty |
-| StringConcatenation.cs:31:13:31:13 | access to local variable s | non-empty | StringConcatenation.cs:30:9:30:17 | ... + ... | non-empty |
-| StringConcatenation.cs:31:13:31:13 | access to local variable s | non-null | StringConcatenation.cs:30:9:30:17 | ... + ... | non-null |
-| StringConcatenation.cs:31:13:31:13 | access to local variable s | null | StringConcatenation.cs:30:9:30:17 | ... + ... | null |
diff --git a/csharp/ql/test/query-tests/Nullness/Implications.ql b/csharp/ql/test/query-tests/Nullness/Implications.ql
deleted file mode 100644
index 8f265616646..00000000000
--- a/csharp/ql/test/query-tests/Nullness/Implications.ql
+++ /dev/null
@@ -1,8 +0,0 @@
-import csharp
-import semmle.code.csharp.controlflow.Guards
-
-query predicate impliesStep(Expr e1, AbstractValue v1, Expr e2, AbstractValue v2) {
-  e1.fromSource() and
-  e2.fromSource() and
-  Internal::impliesStep(e1, v1, e2, v2)
-}
diff --git a/csharp/ql/test/query-tests/Nullness/NullAlways.expected b/csharp/ql/test/query-tests/Nullness/NullAlways.expected
index e2e594b2e2c..a633c4a1506 100644
--- a/csharp/ql/test/query-tests/Nullness/NullAlways.expected
+++ b/csharp/ql/test/query-tests/Nullness/NullAlways.expected
@@ -31,14 +31,13 @@
 | D.cs:222:13:222:14 | access to local variable o4 | Variable $@ is always null at this dereference. | D.cs:220:13:220:14 | o4 | o4 |
 | D.cs:385:13:385:15 | access to local variable ioe | Variable $@ is always null at this dereference. | D.cs:378:19:378:21 | ioe | ioe |
 | E.cs:210:16:210:16 | access to parameter s | Variable $@ is always null at this dereference. | E.cs:206:28:206:28 | s | s |
-| E.cs:220:13:220:13 | access to local variable x | Variable $@ is always null at this dereference. | E.cs:215:13:215:13 | x | x |
-| E.cs:229:13:229:13 | access to local variable x | Variable $@ is always null at this dereference. | E.cs:225:13:225:13 | x | x |
 | E.cs:323:13:323:14 | access to parameter s1 | Variable $@ is always null at this dereference. | E.cs:319:29:319:30 | s1 | s1 |
 | E.cs:324:13:324:14 | access to parameter s2 | Variable $@ is always null at this dereference. | E.cs:319:40:319:41 | s2 | s2 |
 | E.cs:331:9:331:9 | access to local variable x | Variable $@ is always null at this dereference. | E.cs:330:13:330:13 | x | x |
 | E.cs:405:16:405:16 | access to local variable i | Variable $@ is always null at this dereference. | E.cs:403:14:403:14 | i | i |
 | E.cs:439:13:439:13 | access to parameter s | Variable $@ is always null at this dereference. | E.cs:435:29:435:29 | s | s |
 | F.cs:8:9:8:9 | access to local variable o | Variable $@ is always null at this dereference. | F.cs:7:16:7:16 | o | o |
+| Forwarding.cs:31:31:31:31 | access to local variable s | Variable $@ is always null at this dereference. | Forwarding.cs:7:16:7:16 | s | s |
 | Forwarding.cs:36:31:36:31 | access to local variable s | Variable $@ is always null at this dereference. | Forwarding.cs:7:16:7:16 | s | s |
 | Forwarding.cs:40:27:40:27 | access to local variable s | Variable $@ is always null at this dereference. | Forwarding.cs:7:16:7:16 | s | s |
 | NullAlwaysBad.cs:9:30:9:30 | access to parameter s | Variable $@ is always null at this dereference. | NullAlwaysBad.cs:7:29:7:29 | s | s |
diff --git a/csharp/ql/test/query-tests/Nullness/NullCheck.expected b/csharp/ql/test/query-tests/Nullness/NullCheck.expected
index 600699b6156..ada1054f02c 100644
--- a/csharp/ql/test/query-tests/Nullness/NullCheck.expected
+++ b/csharp/ql/test/query-tests/Nullness/NullCheck.expected
@@ -1,355 +1,149 @@
-| Assert.cs:10:22:10:30 | ... != ... | Assert.cs:10:22:10:22 | access to local variable s | false | true |
-| Assert.cs:10:22:10:30 | ... != ... | Assert.cs:10:22:10:22 | access to local variable s | true | false |
-| Assert.cs:14:23:14:23 | access to local variable s | Assert.cs:14:23:14:23 | access to local variable s | non-null | false |
-| Assert.cs:14:23:14:23 | access to local variable s | Assert.cs:14:23:14:23 | access to local variable s | null | true |
-| Assert.cs:18:26:18:26 | access to local variable s | Assert.cs:18:26:18:26 | access to local variable s | non-null | false |
-| Assert.cs:18:26:18:26 | access to local variable s | Assert.cs:18:26:18:26 | access to local variable s | null | true |
-| Assert.cs:22:23:22:31 | ... == ... | Assert.cs:22:23:22:23 | access to local variable s | false | false |
-| Assert.cs:22:23:22:31 | ... == ... | Assert.cs:22:23:22:23 | access to local variable s | true | true |
-| Assert.cs:26:23:26:31 | ... != ... | Assert.cs:26:23:26:23 | access to local variable s | false | true |
-| Assert.cs:26:23:26:31 | ... != ... | Assert.cs:26:23:26:23 | access to local variable s | true | false |
-| Assert.cs:30:24:30:32 | ... != ... | Assert.cs:30:24:30:24 | access to local variable s | false | true |
-| Assert.cs:30:24:30:32 | ... != ... | Assert.cs:30:24:30:24 | access to local variable s | true | false |
-| Assert.cs:34:24:34:32 | ... == ... | Assert.cs:34:24:34:24 | access to local variable s | false | false |
-| Assert.cs:34:24:34:32 | ... == ... | Assert.cs:34:24:34:24 | access to local variable s | true | true |
-| Assert.cs:38:23:38:31 | ... != ... | Assert.cs:38:23:38:23 | access to local variable s | false | true |
-| Assert.cs:38:23:38:31 | ... != ... | Assert.cs:38:23:38:23 | access to local variable s | true | false |
-| Assert.cs:42:24:42:32 | ... == ... | Assert.cs:42:24:42:24 | access to local variable s | false | false |
-| Assert.cs:42:24:42:32 | ... == ... | Assert.cs:42:24:42:24 | access to local variable s | true | true |
-| Assert.cs:46:23:46:31 | ... == ... | Assert.cs:46:23:46:23 | access to local variable s | false | false |
-| Assert.cs:46:23:46:31 | ... == ... | Assert.cs:46:23:46:23 | access to local variable s | true | true |
-| Assert.cs:50:24:50:32 | ... != ... | Assert.cs:50:24:50:24 | access to local variable s | false | true |
-| Assert.cs:50:24:50:32 | ... != ... | Assert.cs:50:24:50:24 | access to local variable s | true | false |
-| B.cs:12:13:12:32 | call to operator == | B.cs:12:13:12:24 | access to local variable eqCallAlways | false | false |
-| B.cs:12:13:12:32 | call to operator == | B.cs:12:13:12:24 | access to local variable eqCallAlways | true | true |
-| B.cs:12:13:12:32 | call to operator == | B.cs:12:29:12:32 | null | false | false |
-| B.cs:12:13:12:32 | call to operator == | B.cs:12:29:12:32 | null | true | true |
-| B.cs:15:13:15:22 | call to operator != | B.cs:15:13:15:14 | access to local variable b2 | false | true |
-| B.cs:15:13:15:22 | call to operator != | B.cs:15:13:15:14 | access to local variable b2 | true | false |
-| B.cs:15:13:15:22 | call to operator != | B.cs:15:19:15:22 | null | false | true |
-| B.cs:15:13:15:22 | call to operator != | B.cs:15:19:15:22 | null | true | false |
-| B.cs:18:13:18:22 | call to operator == | B.cs:18:13:18:14 | access to local variable b3 | false | false |
-| B.cs:18:13:18:22 | call to operator == | B.cs:18:13:18:14 | access to local variable b3 | true | true |
-| B.cs:18:13:18:22 | call to operator == | B.cs:18:19:18:22 | null | false | false |
-| B.cs:18:13:18:22 | call to operator == | B.cs:18:19:18:22 | null | true | true |
-| B.cs:22:13:22:33 | call to operator != | B.cs:22:13:22:25 | access to local variable neqCallAlways | false | true |
-| B.cs:22:13:22:33 | call to operator != | B.cs:22:13:22:25 | access to local variable neqCallAlways | true | false |
-| B.cs:22:13:22:33 | call to operator != | B.cs:22:30:22:33 | null | false | true |
-| B.cs:22:13:22:33 | call to operator != | B.cs:22:30:22:33 | null | true | false |
-| B.cs:53:17:53:33 | ... != ... | B.cs:53:17:53:25 | (...) ... | false | true |
-| B.cs:53:17:53:33 | ... != ... | B.cs:53:17:53:25 | (...) ... | true | false |
-| B.cs:53:17:53:33 | ... != ... | B.cs:53:30:53:33 | null | false | true |
-| B.cs:53:17:53:33 | ... != ... | B.cs:53:30:53:33 | null | true | false |
-| B.cs:55:26:55:36 | call to method Equals | B.cs:55:26:55:26 | access to local variable o | false | false |
-| B.cs:55:26:55:36 | call to method Equals | B.cs:55:26:55:26 | access to local variable o | true | true |
-| B.cs:55:26:55:36 | call to method Equals | B.cs:55:35:55:35 | access to local variable o | false | false |
-| B.cs:55:26:55:36 | call to method Equals | B.cs:55:35:55:35 | access to local variable o | true | true |
-| C.cs:11:19:11:27 | ... == ... | C.cs:11:19:11:19 | access to local variable o | false | false |
-| C.cs:11:19:11:27 | ... == ... | C.cs:11:19:11:19 | access to local variable o | true | true |
-| C.cs:11:19:11:27 | ... == ... | C.cs:11:24:11:27 | null | false | false |
-| C.cs:11:19:11:27 | ... == ... | C.cs:11:24:11:27 | null | true | true |
-| C.cs:16:15:16:23 | ... != ... | C.cs:16:15:16:15 | access to local variable o | false | true |
-| C.cs:16:15:16:23 | ... != ... | C.cs:16:15:16:15 | access to local variable o | true | false |
-| C.cs:16:15:16:23 | ... != ... | C.cs:16:20:16:23 | null | false | true |
-| C.cs:16:15:16:23 | ... != ... | C.cs:16:20:16:23 | null | true | false |
-| C.cs:24:13:24:21 | ... != ... | C.cs:24:13:24:13 | access to parameter o | false | true |
-| C.cs:24:13:24:21 | ... != ... | C.cs:24:13:24:13 | access to parameter o | true | false |
-| C.cs:28:37:28:45 | ... == ... | C.cs:28:37:28:37 | access to parameter o | false | false |
-| C.cs:28:37:28:45 | ... == ... | C.cs:28:37:28:37 | access to parameter o | true | true |
-| C.cs:30:40:30:48 | ... != ... | C.cs:30:40:30:40 | access to parameter o | false | true |
-| C.cs:30:40:30:48 | ... != ... | C.cs:30:40:30:40 | access to parameter o | true | false |
-| C.cs:34:13:34:21 | ... == ... | C.cs:34:13:34:13 | access to parameter o | false | false |
-| C.cs:34:13:34:21 | ... == ... | C.cs:34:13:34:13 | access to parameter o | true | true |
-| C.cs:41:22:41:30 | ... == ... | C.cs:41:22:41:22 | access to local variable s | false | false |
-| C.cs:41:22:41:30 | ... == ... | C.cs:41:22:41:22 | access to local variable s | true | true |
-| C.cs:45:22:45:30 | ... != ... | C.cs:45:22:45:22 | access to local variable s | false | true |
-| C.cs:45:22:45:30 | ... != ... | C.cs:45:22:45:22 | access to local variable s | true | false |
-| C.cs:56:23:56:24 | access to local variable o2 | C.cs:56:23:56:24 | access to local variable o2 | non-null | false |
-| C.cs:56:23:56:24 | access to local variable o2 | C.cs:56:23:56:24 | access to local variable o2 | null | true |
-| C.cs:71:26:71:27 | access to local variable o3 | C.cs:71:26:71:27 | access to local variable o3 | non-null | false |
-| C.cs:71:26:71:27 | access to local variable o3 | C.cs:71:26:71:27 | access to local variable o3 | null | true |
-| C.cs:78:13:78:24 | call to method IsNotNull | C.cs:78:23:78:23 | access to local variable o | false | true |
-| C.cs:78:13:78:24 | call to method IsNotNull | C.cs:78:23:78:23 | access to local variable o | true | false |
-| C.cs:81:14:81:22 | call to method IsNull | C.cs:81:21:81:21 | access to local variable o | false | false |
-| C.cs:81:14:81:22 | call to method IsNull | C.cs:81:21:81:21 | access to local variable o | true | true |
-| C.cs:88:13:88:23 | ... is ... | C.cs:88:13:88:13 | access to local variable o | true | false |
-| C.cs:113:22:113:36 | ... == ... | C.cs:113:22:113:28 | access to local variable colours | false | false |
-| C.cs:113:22:113:36 | ... == ... | C.cs:113:22:113:28 | access to local variable colours | true | true |
-| C.cs:113:22:113:36 | ... == ... | C.cs:113:33:113:36 | null | false | false |
-| C.cs:113:22:113:36 | ... == ... | C.cs:113:33:113:36 | null | true | true |
-| C.cs:120:13:120:28 | ... == ... | C.cs:120:13:120:20 | access to local variable children | false | false |
-| C.cs:120:13:120:28 | ... == ... | C.cs:120:13:120:20 | access to local variable children | true | true |
-| C.cs:120:13:120:28 | ... == ... | C.cs:120:25:120:28 | null | false | false |
-| C.cs:120:13:120:28 | ... == ... | C.cs:120:25:120:28 | null | true | true |
-| C.cs:129:13:129:38 | ... == ... | C.cs:129:14:129:29 | ... = ... | false | false |
-| C.cs:129:13:129:38 | ... == ... | C.cs:129:14:129:29 | ... = ... | true | true |
-| C.cs:129:13:129:38 | ... == ... | C.cs:129:35:129:38 | null | false | false |
-| C.cs:129:13:129:38 | ... == ... | C.cs:129:35:129:38 | null | true | true |
-| C.cs:145:13:145:39 | ... != ... | C.cs:145:14:145:30 | ... = ... | false | true |
-| C.cs:145:13:145:39 | ... != ... | C.cs:145:14:145:30 | ... = ... | true | false |
-| C.cs:145:13:145:39 | ... != ... | C.cs:145:36:145:39 | null | false | true |
-| C.cs:145:13:145:39 | ... != ... | C.cs:145:36:145:39 | null | true | false |
-| C.cs:157:16:157:24 | ... != ... | C.cs:157:16:157:16 | access to local variable s | false | true |
-| C.cs:157:16:157:24 | ... != ... | C.cs:157:16:157:16 | access to local variable s | true | false |
-| C.cs:157:16:157:24 | ... != ... | C.cs:157:21:157:24 | null | false | true |
-| C.cs:157:16:157:24 | ... != ... | C.cs:157:21:157:24 | null | true | false |
-| C.cs:165:16:165:24 | ... != ... | C.cs:165:16:165:16 | access to local variable s | false | true |
-| C.cs:165:16:165:24 | ... != ... | C.cs:165:16:165:16 | access to local variable s | true | false |
-| C.cs:165:16:165:24 | ... != ... | C.cs:165:21:165:24 | null | false | true |
-| C.cs:165:16:165:24 | ... != ... | C.cs:165:21:165:24 | null | true | false |
-| C.cs:172:16:172:24 | ... != ... | C.cs:172:16:172:16 | access to local variable s | false | true |
-| C.cs:172:16:172:24 | ... != ... | C.cs:172:16:172:16 | access to local variable s | true | false |
-| C.cs:172:16:172:24 | ... != ... | C.cs:172:21:172:24 | null | false | true |
-| C.cs:172:16:172:24 | ... != ... | C.cs:172:21:172:24 | null | true | false |
-| C.cs:186:16:186:24 | ... != ... | C.cs:186:16:186:16 | access to local variable s | false | true |
-| C.cs:186:16:186:24 | ... != ... | C.cs:186:16:186:16 | access to local variable s | true | false |
-| C.cs:211:13:211:21 | ... != ... | C.cs:211:13:211:13 | access to local variable s | false | true |
-| C.cs:211:13:211:21 | ... != ... | C.cs:211:13:211:13 | access to local variable s | true | false |
-| C.cs:217:13:217:21 | ... == ... | C.cs:217:13:217:13 | access to local variable s | false | false |
-| C.cs:217:13:217:21 | ... == ... | C.cs:217:13:217:13 | access to local variable s | true | true |
-| C.cs:221:13:221:21 | ... != ... | C.cs:221:13:221:13 | access to local variable s | false | true |
-| C.cs:221:13:221:21 | ... != ... | C.cs:221:13:221:13 | access to local variable s | true | false |
-| C.cs:221:13:221:21 | ... != ... | C.cs:221:18:221:21 | null | false | false |
-| C.cs:229:22:229:30 | ... != ... | C.cs:229:22:229:22 | access to local variable s | false | true |
-| C.cs:229:22:229:30 | ... != ... | C.cs:229:22:229:22 | access to local variable s | true | false |
-| C.cs:235:24:235:32 | ... == ... | C.cs:235:24:235:24 | access to local variable s | false | false |
-| C.cs:235:24:235:32 | ... == ... | C.cs:235:24:235:24 | access to local variable s | true | true |
-| C.cs:235:24:235:32 | ... == ... | C.cs:235:29:235:32 | null | false | false |
-| C.cs:235:24:235:32 | ... == ... | C.cs:235:29:235:32 | null | true | true |
-| D.cs:28:13:28:25 | ... != ... | D.cs:28:13:28:17 | access to parameter param | false | true |
-| D.cs:28:13:28:25 | ... != ... | D.cs:28:13:28:17 | access to parameter param | true | false |
-| D.cs:37:13:37:23 | ... is ... | D.cs:37:13:37:13 | access to parameter x | true | false |
-| D.cs:38:13:38:21 | ... == ... | D.cs:38:13:38:13 | access to parameter x | false | false |
-| D.cs:38:13:38:21 | ... == ... | D.cs:38:13:38:13 | access to parameter x | true | true |
-| D.cs:39:16:39:24 | ... == ... | D.cs:39:16:39:16 | access to parameter x | false | false |
-| D.cs:39:16:39:24 | ... == ... | D.cs:39:16:39:16 | access to parameter x | true | true |
-| D.cs:45:13:45:22 | ... != ... | D.cs:45:13:45:14 | access to local variable o1 | false | true |
-| D.cs:45:13:45:22 | ... != ... | D.cs:45:13:45:14 | access to local variable o1 | true | false |
-| D.cs:48:13:48:24 | ... is ... | D.cs:48:13:48:14 | access to local variable o2 | false | true |
-| D.cs:48:13:48:24 | ... is ... | D.cs:48:13:48:14 | access to local variable o2 | true | false |
-| D.cs:51:13:51:44 | ... != ... | D.cs:51:14:51:35 | ... = ... | false | true |
-| D.cs:51:13:51:44 | ... != ... | D.cs:51:14:51:35 | ... = ... | true | false |
-| D.cs:55:23:55:32 | ... != ... | D.cs:55:23:55:24 | access to local variable o4 | false | true |
-| D.cs:55:23:55:32 | ... != ... | D.cs:55:23:55:24 | access to local variable o4 | true | false |
-| D.cs:58:19:58:28 | ... != ... | D.cs:58:19:58:20 | access to local variable o4 | false | true |
-| D.cs:58:19:58:28 | ... != ... | D.cs:58:19:58:20 | access to local variable o4 | true | false |
-| D.cs:59:13:59:22 | ... != ... | D.cs:59:13:59:14 | access to local variable o5 | false | true |
-| D.cs:59:13:59:22 | ... != ... | D.cs:59:13:59:14 | access to local variable o5 | true | false |
-| D.cs:61:13:61:22 | ... != ... | D.cs:61:13:61:14 | access to local variable o4 | false | true |
-| D.cs:61:13:61:22 | ... != ... | D.cs:61:13:61:14 | access to local variable o4 | true | false |
-| D.cs:65:14:65:29 | call to method CustomIsNull | D.cs:65:27:65:28 | access to local variable o6 | false | false |
-| D.cs:65:14:65:29 | call to method CustomIsNull | D.cs:65:27:65:28 | access to local variable o6 | true | true |
-| D.cs:69:18:69:27 | ... != ... | D.cs:69:18:69:19 | access to local variable o7 | false | true |
-| D.cs:69:18:69:27 | ... != ... | D.cs:69:18:69:19 | access to local variable o7 | true | false |
-| D.cs:76:21:76:30 | ... == ... | D.cs:76:21:76:22 | access to local variable o8 | false | false |
-| D.cs:76:21:76:30 | ... == ... | D.cs:76:21:76:22 | access to local variable o8 | true | true |
-| D.cs:110:26:110:35 | ... != ... | D.cs:110:26:110:27 | access to local variable xs | false | true |
-| D.cs:110:26:110:35 | ... != ... | D.cs:110:26:110:27 | access to local variable xs | true | false |
-| D.cs:118:13:118:21 | ... == ... | D.cs:118:13:118:13 | access to local variable x | false | false |
-| D.cs:118:13:118:21 | ... == ... | D.cs:118:13:118:13 | access to local variable x | true | true |
-| D.cs:119:13:119:21 | ... == ... | D.cs:119:13:119:13 | access to local variable x | false | false |
-| D.cs:119:13:119:21 | ... == ... | D.cs:119:13:119:13 | access to local variable x | true | true |
-| D.cs:127:20:127:28 | ... == ... | D.cs:127:20:127:20 | access to parameter a | false | false |
-| D.cs:127:20:127:28 | ... == ... | D.cs:127:20:127:20 | access to parameter a | true | true |
-| D.cs:128:20:128:28 | ... == ... | D.cs:128:20:128:20 | access to parameter b | false | false |
-| D.cs:128:20:128:28 | ... == ... | D.cs:128:20:128:20 | access to parameter b | true | true |
-| D.cs:139:13:139:21 | ... != ... | D.cs:139:13:139:13 | access to parameter a | false | true |
-| D.cs:139:13:139:21 | ... != ... | D.cs:139:13:139:13 | access to parameter a | true | false |
-| D.cs:152:17:152:27 | ... != ... | D.cs:152:17:152:19 | access to parameter obj | false | true |
-| D.cs:152:17:152:27 | ... != ... | D.cs:152:17:152:19 | access to parameter obj | true | false |
-| D.cs:196:13:196:21 | ... == ... | D.cs:196:13:196:13 | access to local variable o | false | false |
-| D.cs:196:13:196:21 | ... == ... | D.cs:196:13:196:13 | access to local variable o | true | true |
-| D.cs:196:13:196:21 | ... == ... | D.cs:196:18:196:21 | null | true | false |
-| D.cs:206:17:206:25 | ... == ... | D.cs:206:17:206:17 | access to local variable e | false | false |
-| D.cs:206:17:206:25 | ... == ... | D.cs:206:17:206:17 | access to local variable e | true | true |
-| D.cs:212:18:212:26 | ... == ... | D.cs:212:18:212:18 | access to local variable n | false | false |
-| D.cs:212:18:212:26 | ... == ... | D.cs:212:18:212:18 | access to local variable n | true | true |
-| D.cs:212:18:212:26 | ... == ... | D.cs:212:23:212:26 | null | false | false |
-| D.cs:212:18:212:26 | ... == ... | D.cs:212:23:212:26 | null | true | true |
-| D.cs:216:13:216:22 | ... == ... | D.cs:216:13:216:14 | access to local variable o3 | false | false |
-| D.cs:216:13:216:22 | ... == ... | D.cs:216:13:216:14 | access to local variable o3 | true | true |
-| D.cs:216:13:216:22 | ... == ... | D.cs:216:19:216:22 | null | true | false |
-| D.cs:221:13:221:22 | ... == ... | D.cs:221:13:221:14 | access to local variable o4 | false | false |
-| D.cs:221:13:221:22 | ... == ... | D.cs:221:13:221:14 | access to local variable o4 | true | true |
-| D.cs:221:13:221:22 | ... == ... | D.cs:221:19:221:22 | null | true | false |
-| D.cs:242:13:242:25 | ... == ... | D.cs:242:13:242:17 | access to local variable other | false | false |
-| D.cs:242:13:242:25 | ... == ... | D.cs:242:13:242:17 | access to local variable other | true | true |
-| D.cs:244:13:244:25 | ... != ... | D.cs:244:13:244:17 | access to local variable other | false | true |
-| D.cs:244:13:244:25 | ... != ... | D.cs:244:13:244:17 | access to local variable other | true | false |
-| D.cs:266:13:266:27 | ... is ... | D.cs:266:13:266:17 | access to local variable other | true | false |
-| D.cs:336:13:336:23 | ... == ... | D.cs:336:13:336:15 | access to parameter obj | false | false |
-| D.cs:336:13:336:23 | ... == ... | D.cs:336:13:336:15 | access to parameter obj | true | true |
-| D.cs:341:13:341:23 | ... != ... | D.cs:341:13:341:15 | access to local variable msg | false | true |
-| D.cs:341:13:341:23 | ... != ... | D.cs:341:13:341:15 | access to local variable msg | true | false |
-| D.cs:367:27:367:35 | ... == ... | D.cs:367:27:367:27 | access to local variable b | false | false |
-| D.cs:367:27:367:35 | ... == ... | D.cs:367:27:367:27 | access to local variable b | true | true |
-| D.cs:382:13:382:23 | ... != ... | D.cs:382:13:382:15 | access to local variable ioe | false | true |
-| D.cs:382:13:382:23 | ... != ... | D.cs:382:13:382:15 | access to local variable ioe | true | false |
-| D.cs:390:20:390:28 | ... == ... | D.cs:390:20:390:20 | access to parameter a | false | false |
-| D.cs:390:20:390:28 | ... == ... | D.cs:390:20:390:20 | access to parameter a | true | true |
-| D.cs:397:20:397:28 | ... == ... | D.cs:397:20:397:20 | access to parameter b | false | false |
-| D.cs:397:20:397:28 | ... == ... | D.cs:397:20:397:20 | access to parameter b | true | true |
-| D.cs:407:14:407:22 | ... != ... | D.cs:407:14:407:14 | access to parameter x | false | true |
-| D.cs:407:14:407:22 | ... != ... | D.cs:407:14:407:14 | access to parameter x | true | false |
-| D.cs:407:27:407:35 | ... == ... | D.cs:407:27:407:27 | access to parameter y | false | false |
-| D.cs:407:27:407:35 | ... == ... | D.cs:407:27:407:27 | access to parameter y | true | true |
-| D.cs:407:42:407:50 | ... == ... | D.cs:407:42:407:42 | access to parameter x | false | false |
-| D.cs:407:42:407:50 | ... == ... | D.cs:407:42:407:42 | access to parameter x | true | true |
-| D.cs:407:55:407:63 | ... != ... | D.cs:407:55:407:55 | access to parameter y | false | true |
-| D.cs:407:55:407:63 | ... != ... | D.cs:407:55:407:55 | access to parameter y | true | false |
-| D.cs:409:13:409:21 | ... != ... | D.cs:409:13:409:13 | access to parameter x | false | true |
-| D.cs:409:13:409:21 | ... != ... | D.cs:409:13:409:13 | access to parameter x | true | false |
-| D.cs:411:13:411:21 | ... != ... | D.cs:411:13:411:13 | access to parameter y | false | true |
-| D.cs:411:13:411:21 | ... != ... | D.cs:411:13:411:13 | access to parameter y | true | false |
-| E.cs:10:34:10:54 | ... != ... | E.cs:10:35:10:45 | ... = ... | false | true |
-| E.cs:10:34:10:54 | ... != ... | E.cs:10:35:10:45 | ... = ... | true | false |
-| E.cs:12:32:12:52 | ... != ... | E.cs:12:33:12:43 | ... = ... | false | true |
-| E.cs:12:32:12:52 | ... != ... | E.cs:12:33:12:43 | ... = ... | true | false |
-| E.cs:20:19:20:28 | ... == ... | E.cs:20:19:20:20 | access to local variable s1 | false | false |
-| E.cs:20:19:20:28 | ... == ... | E.cs:20:19:20:20 | access to local variable s1 | true | true |
-| E.cs:21:13:21:22 | ... == ... | E.cs:21:13:21:14 | access to local variable s2 | false | false |
-| E.cs:21:13:21:22 | ... == ... | E.cs:21:13:21:14 | access to local variable s2 | true | true |
-| E.cs:24:19:24:28 | ... == ... | E.cs:24:19:24:20 | access to local variable s1 | false | false |
-| E.cs:24:19:24:28 | ... == ... | E.cs:24:19:24:20 | access to local variable s1 | true | true |
-| E.cs:26:13:26:22 | ... != ... | E.cs:26:13:26:14 | access to local variable s2 | false | true |
-| E.cs:26:13:26:22 | ... != ... | E.cs:26:13:26:14 | access to local variable s2 | true | false |
-| E.cs:70:22:70:32 | ... == ... | E.cs:70:22:70:24 | access to parameter arr | false | false |
-| E.cs:70:22:70:32 | ... == ... | E.cs:70:22:70:24 | access to parameter arr | true | true |
-| E.cs:83:13:83:24 | ... != ... | E.cs:83:13:83:16 | access to parameter vals | false | true |
-| E.cs:83:13:83:24 | ... != ... | E.cs:83:13:83:16 | access to parameter vals | true | false |
-| E.cs:85:18:85:29 | ... != ... | E.cs:85:18:85:21 | access to parameter vals | false | true |
-| E.cs:85:18:85:29 | ... != ... | E.cs:85:18:85:21 | access to parameter vals | true | false |
-| E.cs:153:13:153:24 | ... != ... | E.cs:153:13:153:16 | access to local variable obj2 | false | true |
-| E.cs:153:13:153:24 | ... != ... | E.cs:153:13:153:16 | access to local variable obj2 | true | false |
-| E.cs:164:17:164:25 | ... == ... | E.cs:164:17:164:17 | access to parameter a | false | false |
-| E.cs:164:17:164:25 | ... == ... | E.cs:164:17:164:17 | access to parameter a | true | true |
-| E.cs:175:19:175:29 | ... == ... | E.cs:175:19:175:21 | access to parameter obj | false | false |
-| E.cs:175:19:175:29 | ... == ... | E.cs:175:19:175:21 | access to parameter obj | true | true |
-| E.cs:176:13:176:22 | ... == ... | E.cs:176:13:176:14 | (...) ... | false | false |
-| E.cs:176:13:176:22 | ... == ... | E.cs:176:13:176:14 | (...) ... | true | true |
-| E.cs:176:13:176:22 | ... == ... | E.cs:176:19:176:22 | null | true | false |
-| E.cs:180:13:180:23 | ... == ... | E.cs:180:13:180:15 | access to parameter obj | false | false |
-| E.cs:180:13:180:23 | ... == ... | E.cs:180:13:180:15 | access to parameter obj | true | true |
-| E.cs:184:13:184:22 | ... == ... | E.cs:184:13:184:14 | (...) ... | false | false |
-| E.cs:184:13:184:22 | ... == ... | E.cs:184:13:184:14 | (...) ... | true | true |
-| E.cs:184:13:184:22 | ... == ... | E.cs:184:19:184:22 | null | true | false |
-| E.cs:193:17:193:17 | access to parameter o | E.cs:193:17:193:17 | access to parameter o | non-null | false |
-| E.cs:193:17:193:17 | access to parameter o | E.cs:193:17:193:17 | access to parameter o | null | true |
-| E.cs:208:13:208:23 | ... is ... | E.cs:208:13:208:13 | access to parameter s | false | true |
-| E.cs:208:13:208:23 | ... is ... | E.cs:208:13:208:13 | access to parameter s | true | false |
-| E.cs:245:13:245:22 | access to property HasValue | E.cs:245:13:245:13 | access to parameter i | false | true |
-| E.cs:245:13:245:22 | access to property HasValue | E.cs:245:13:245:13 | access to parameter i | true | false |
-| E.cs:252:13:252:21 | ... != ... | E.cs:252:13:252:13 | access to parameter i | false | true |
-| E.cs:252:13:252:21 | ... != ... | E.cs:252:13:252:13 | access to parameter i | true | false |
-| E.cs:259:13:259:21 | ... == ... | E.cs:259:13:259:13 | access to parameter i | false | false |
-| E.cs:259:13:259:21 | ... == ... | E.cs:259:13:259:13 | access to parameter i | true | true |
-| E.cs:274:17:274:25 | ... != ... | E.cs:274:17:274:17 | access to local variable o | false | true |
-| E.cs:274:17:274:25 | ... != ... | E.cs:274:17:274:17 | access to local variable o | true | false |
-| E.cs:284:9:284:9 | access to local variable o | E.cs:284:9:284:9 | access to local variable o | non-null | false |
-| E.cs:284:9:284:9 | access to local variable o | E.cs:284:9:284:9 | access to local variable o | null | true |
-| E.cs:293:13:293:13 | access to local variable s | E.cs:293:13:293:13 | access to local variable s | non-null | false |
-| E.cs:293:13:293:13 | access to local variable s | E.cs:293:13:293:13 | access to local variable s | null | true |
-| E.cs:293:13:293:24 | ... == ... | E.cs:293:13:293:19 | call to method M2 | true | false |
-| E.cs:306:31:306:31 | access to field l | E.cs:306:31:306:31 | access to field l | non-null | false |
-| E.cs:306:31:306:31 | access to field l | E.cs:306:31:306:31 | access to field l | null | true |
-| E.cs:309:13:309:22 | access to property HasValue | E.cs:309:13:309:13 | access to field l | false | true |
-| E.cs:309:13:309:22 | access to property HasValue | E.cs:309:13:309:13 | access to field l | true | false |
-| E.cs:321:13:321:30 | ... is ... | E.cs:321:14:321:21 | ... ?? ... | false | false |
-| E.cs:321:13:321:30 | ... is ... | E.cs:321:14:321:21 | ... ?? ... | true | true |
-| E.cs:321:14:321:15 | access to parameter s1 | E.cs:321:14:321:15 | access to parameter s1 | non-null | false |
-| E.cs:321:14:321:15 | access to parameter s1 | E.cs:321:14:321:15 | access to parameter s1 | null | true |
-| E.cs:330:17:330:28 | (...) ... | E.cs:330:17:330:28 | (...) ... | null | true |
-| E.cs:336:17:336:17 | access to parameter s | E.cs:336:17:336:17 | access to parameter s | non-null | false |
-| E.cs:336:17:336:17 | access to parameter s | E.cs:336:17:336:17 | access to parameter s | null | true |
-| E.cs:342:17:342:17 | access to parameter s | E.cs:342:17:342:17 | access to parameter s | non-null | false |
-| E.cs:342:17:342:17 | access to parameter s | E.cs:342:17:342:17 | access to parameter s | null | true |
-| E.cs:348:21:348:21 | access to parameter s | E.cs:348:21:348:21 | access to parameter s | non-null | false |
-| E.cs:348:21:348:21 | access to parameter s | E.cs:348:21:348:21 | access to parameter s | null | true |
-| E.cs:354:21:354:21 | access to parameter s | E.cs:354:21:354:21 | access to parameter s | non-null | false |
-| E.cs:354:21:354:21 | access to parameter s | E.cs:354:21:354:21 | access to parameter s | null | true |
-| E.cs:355:13:355:21 | dynamic call to operator != | E.cs:355:13:355:13 | access to local variable x | false | true |
-| E.cs:355:13:355:21 | dynamic call to operator != | E.cs:355:13:355:13 | access to local variable x | true | false |
-| E.cs:361:17:361:17 | access to parameter s | E.cs:361:17:361:17 | access to parameter s | non-null | false |
-| E.cs:361:17:361:17 | access to parameter s | E.cs:361:17:361:17 | access to parameter s | null | true |
-| E.cs:362:13:362:29 | ... != ... | E.cs:362:13:362:13 | access to local variable x | false | true |
-| E.cs:362:13:362:29 | ... != ... | E.cs:362:13:362:13 | access to local variable x | true | false |
-| E.cs:372:13:372:23 | ... is ... | E.cs:372:13:372:13 | access to parameter o | true | false |
-| E.cs:382:14:382:23 | ... == ... | E.cs:382:14:382:15 | access to parameter e1 | false | false |
-| E.cs:382:14:382:23 | ... == ... | E.cs:382:14:382:15 | access to parameter e1 | true | true |
-| E.cs:382:28:382:37 | ... != ... | E.cs:382:28:382:29 | access to parameter e2 | false | true |
-| E.cs:382:28:382:37 | ... != ... | E.cs:382:28:382:29 | access to parameter e2 | true | false |
-| E.cs:382:44:382:53 | ... != ... | E.cs:382:44:382:45 | access to parameter e1 | false | true |
-| E.cs:382:44:382:53 | ... != ... | E.cs:382:44:382:45 | access to parameter e1 | true | false |
-| E.cs:382:58:382:67 | ... == ... | E.cs:382:58:382:59 | access to parameter e2 | false | false |
-| E.cs:382:58:382:67 | ... == ... | E.cs:382:58:382:59 | access to parameter e2 | true | true |
-| E.cs:384:13:384:22 | ... == ... | E.cs:384:13:384:14 | access to parameter e1 | false | false |
-| E.cs:384:13:384:22 | ... == ... | E.cs:384:13:384:14 | access to parameter e1 | true | true |
-| E.cs:384:27:384:36 | ... == ... | E.cs:384:27:384:28 | access to parameter e2 | false | false |
-| E.cs:384:27:384:36 | ... == ... | E.cs:384:27:384:28 | access to parameter e2 | true | true |
-| E.cs:391:9:391:9 | access to parameter i | E.cs:391:9:391:9 | access to parameter i | non-null | false |
-| E.cs:391:9:391:9 | access to parameter i | E.cs:391:9:391:9 | access to parameter i | null | true |
-| E.cs:397:9:397:13 | access to parameter color | E.cs:397:9:397:13 | access to parameter color | non-null | false |
-| E.cs:397:9:397:13 | access to parameter color | E.cs:397:9:397:13 | access to parameter color | null | true |
-| E.cs:404:9:404:9 | access to local variable i | E.cs:404:9:404:9 | access to local variable i | non-null | false |
-| E.cs:404:9:404:9 | access to local variable i | E.cs:404:9:404:9 | access to local variable i | null | true |
-| E.cs:411:9:411:9 | access to local variable i | E.cs:411:9:411:9 | access to local variable i | non-null | false |
-| E.cs:411:9:411:9 | access to local variable i | E.cs:411:9:411:9 | access to local variable i | null | true |
-| E.cs:422:13:422:22 | access to property HasValue | E.cs:422:13:422:13 | access to parameter i | false | true |
-| E.cs:422:13:422:22 | access to property HasValue | E.cs:422:13:422:13 | access to parameter i | true | false |
-| E.cs:429:13:429:22 | access to property HasValue | E.cs:429:13:429:13 | access to parameter i | false | true |
-| E.cs:429:13:429:22 | access to property HasValue | E.cs:429:13:429:13 | access to parameter i | true | false |
-| E.cs:437:13:437:21 | ... is ... | E.cs:437:13:437:13 | access to parameter s | false | false |
-| E.cs:437:13:437:21 | ... is ... | E.cs:437:13:437:13 | access to parameter s | true | true |
-| E.cs:442:13:442:29 | ... is ... | E.cs:442:13:442:13 | access to parameter s | true | false |
-| E.cs:447:13:447:25 | ... is ... | E.cs:447:13:447:13 | access to parameter s | true | false |
-| E.cs:452:13:452:23 | ... is ... | E.cs:452:13:452:13 | access to parameter s | true | false |
-| Forwarding.cs:9:14:9:30 | call to method IsNullOrEmpty | Forwarding.cs:9:14:9:14 | access to local variable s | false | false |
-| Forwarding.cs:14:13:14:32 | call to method IsNotNullOrEmpty | Forwarding.cs:14:13:14:13 | access to local variable s | true | false |
-| Forwarding.cs:19:14:19:23 | call to method IsNull | Forwarding.cs:19:14:19:14 | access to local variable s | false | false |
-| Forwarding.cs:19:14:19:23 | call to method IsNull | Forwarding.cs:19:14:19:14 | access to local variable s | true | true |
-| Forwarding.cs:24:13:24:25 | call to method IsNotNull | Forwarding.cs:24:13:24:13 | access to local variable s | false | true |
-| Forwarding.cs:24:13:24:25 | call to method IsNotNull | Forwarding.cs:24:13:24:13 | access to local variable s | true | false |
-| Forwarding.cs:29:13:29:24 | call to method IsNotNull | Forwarding.cs:29:23:29:23 | access to local variable s | true | false |
-| Forwarding.cs:34:13:34:29 | call to method IsNotNullWrong | Forwarding.cs:34:28:34:28 | access to local variable s | false | false |
-| Forwarding.cs:45:16:45:26 | ... is ... | Forwarding.cs:45:16:45:16 | access to parameter o | true | false |
-| Forwarding.cs:45:31:45:61 | call to method IsNullOrEmpty | Forwarding.cs:45:52:45:60 | (...) ... | false | false |
-| Forwarding.cs:45:66:45:75 | call to method IsNull | Forwarding.cs:45:66:45:66 | access to parameter o | false | false |
-| Forwarding.cs:45:66:45:75 | call to method IsNull | Forwarding.cs:45:66:45:66 | access to parameter o | true | true |
-| Forwarding.cs:50:13:50:23 | ... is ... | Forwarding.cs:50:13:50:13 | access to parameter o | true | false |
-| Forwarding.cs:52:21:52:51 | call to method IsNullOrEmpty | Forwarding.cs:52:42:52:50 | (...) ... | false | false |
-| Forwarding.cs:59:13:59:21 | ... == ... | Forwarding.cs:59:13:59:13 | access to parameter o | false | false |
-| Forwarding.cs:59:13:59:21 | ... == ... | Forwarding.cs:59:13:59:13 | access to parameter o | true | true |
-| Forwarding.cs:68:16:68:38 | call to method IsNullOrEmpty | Forwarding.cs:68:37:68:37 | access to parameter s | false | false |
-| Forwarding.cs:73:17:73:39 | call to method IsNullOrEmpty | Forwarding.cs:73:38:73:38 | access to parameter s | false | false |
-| Forwarding.cs:78:16:78:39 | call to method ReferenceEquals | Forwarding.cs:78:32:78:32 | access to parameter o | false | false |
-| Forwarding.cs:78:16:78:39 | call to method ReferenceEquals | Forwarding.cs:78:32:78:32 | access to parameter o | true | true |
-| Forwarding.cs:83:16:83:24 | ... != ... | Forwarding.cs:83:16:83:16 | access to parameter o | false | true |
-| Forwarding.cs:83:16:83:24 | ... != ... | Forwarding.cs:83:16:83:16 | access to parameter o | true | false |
-| GuardedString.cs:9:14:9:36 | call to method IsNullOrEmpty | GuardedString.cs:9:35:9:35 | access to local variable s | false | false |
-| GuardedString.cs:14:14:14:41 | call to method IsNullOrWhiteSpace | GuardedString.cs:14:40:14:40 | access to local variable s | false | false |
-| GuardedString.cs:19:13:19:13 | access to local variable s | GuardedString.cs:19:13:19:13 | access to local variable s | non-null | false |
-| GuardedString.cs:19:13:19:13 | access to local variable s | GuardedString.cs:19:13:19:13 | access to local variable s | null | true |
-| GuardedString.cs:19:13:19:26 | ... == ... | GuardedString.cs:19:13:19:21 | access to property Length | true | false |
-| GuardedString.cs:22:13:22:13 | access to local variable s | GuardedString.cs:22:13:22:13 | access to local variable s | non-null | false |
-| GuardedString.cs:22:13:22:13 | access to local variable s | GuardedString.cs:22:13:22:13 | access to local variable s | null | true |
-| GuardedString.cs:22:13:22:25 | ... > ... | GuardedString.cs:22:13:22:21 | access to property Length | true | false |
-| GuardedString.cs:25:13:25:13 | access to local variable s | GuardedString.cs:25:13:25:13 | access to local variable s | non-null | false |
-| GuardedString.cs:25:13:25:13 | access to local variable s | GuardedString.cs:25:13:25:13 | access to local variable s | null | true |
-| GuardedString.cs:25:13:25:26 | ... >= ... | GuardedString.cs:25:13:25:21 | access to property Length | true | false |
-| GuardedString.cs:28:13:28:13 | access to local variable s | GuardedString.cs:28:13:28:13 | access to local variable s | non-null | false |
-| GuardedString.cs:28:13:28:13 | access to local variable s | GuardedString.cs:28:13:28:13 | access to local variable s | null | true |
-| GuardedString.cs:28:13:28:26 | ... < ... | GuardedString.cs:28:13:28:21 | access to property Length | true | false |
-| GuardedString.cs:31:13:31:13 | access to local variable s | GuardedString.cs:31:13:31:13 | access to local variable s | non-null | false |
-| GuardedString.cs:31:13:31:13 | access to local variable s | GuardedString.cs:31:13:31:13 | access to local variable s | null | true |
-| GuardedString.cs:31:13:31:27 | ... <= ... | GuardedString.cs:31:13:31:21 | access to property Length | true | false |
-| GuardedString.cs:34:13:34:13 | access to local variable s | GuardedString.cs:34:13:34:13 | access to local variable s | non-null | false |
-| GuardedString.cs:34:13:34:13 | access to local variable s | GuardedString.cs:34:13:34:13 | access to local variable s | null | true |
-| GuardedString.cs:34:13:34:26 | ... != ... | GuardedString.cs:34:13:34:21 | access to property Length | false | false |
-| NullAlwaysBad.cs:9:17:9:25 | ... != ... | NullAlwaysBad.cs:9:17:9:17 | access to parameter s | false | true |
-| NullAlwaysBad.cs:9:17:9:25 | ... != ... | NullAlwaysBad.cs:9:17:9:17 | access to parameter s | true | false |
-| NullAlwaysGood.cs:9:17:9:25 | ... != ... | NullAlwaysGood.cs:9:17:9:17 | access to parameter s | false | true |
-| NullAlwaysGood.cs:9:17:9:25 | ... != ... | NullAlwaysGood.cs:9:17:9:17 | access to parameter s | true | false |
-| NullMaybeGood.cs:7:13:7:21 | ... != ... | NullMaybeGood.cs:7:13:7:13 | access to parameter o | false | true |
-| NullMaybeGood.cs:7:13:7:21 | ... != ... | NullMaybeGood.cs:7:13:7:13 | access to parameter o | true | false |
-| StringConcatenation.cs:15:16:15:22 | ... != ... | StringConcatenation.cs:15:16:15:16 | access to local variable s | false | false |
-| StringConcatenation.cs:22:16:22:22 | ... != ... | StringConcatenation.cs:22:16:22:16 | access to local variable s | false | false |
+| Assert.cs:10:22:10:30 | ... != ... | Assert.cs:10:22:10:22 | access to local variable s |
+| Assert.cs:22:23:22:31 | ... == ... | Assert.cs:22:23:22:23 | access to local variable s |
+| Assert.cs:26:23:26:31 | ... != ... | Assert.cs:26:23:26:23 | access to local variable s |
+| Assert.cs:30:24:30:32 | ... != ... | Assert.cs:30:24:30:24 | access to local variable s |
+| Assert.cs:34:24:34:32 | ... == ... | Assert.cs:34:24:34:24 | access to local variable s |
+| Assert.cs:38:23:38:31 | ... != ... | Assert.cs:38:23:38:23 | access to local variable s |
+| Assert.cs:42:24:42:32 | ... == ... | Assert.cs:42:24:42:24 | access to local variable s |
+| Assert.cs:46:23:46:31 | ... == ... | Assert.cs:46:23:46:23 | access to local variable s |
+| Assert.cs:50:24:50:32 | ... != ... | Assert.cs:50:24:50:24 | access to local variable s |
+| B.cs:12:13:12:32 | call to operator == | B.cs:12:13:12:24 | access to local variable eqCallAlways |
+| B.cs:12:13:12:32 | call to operator == | B.cs:12:29:12:32 | null |
+| B.cs:15:13:15:22 | call to operator != | B.cs:15:13:15:14 | access to local variable b2 |
+| B.cs:15:13:15:22 | call to operator != | B.cs:15:19:15:22 | null |
+| B.cs:18:13:18:22 | call to operator == | B.cs:18:13:18:14 | access to local variable b3 |
+| B.cs:18:13:18:22 | call to operator == | B.cs:18:19:18:22 | null |
+| B.cs:22:13:22:33 | call to operator != | B.cs:22:13:22:25 | access to local variable neqCallAlways |
+| B.cs:22:13:22:33 | call to operator != | B.cs:22:30:22:33 | null |
+| B.cs:53:17:53:33 | ... != ... | B.cs:53:17:53:25 | (...) ... |
+| B.cs:53:17:53:33 | ... != ... | B.cs:53:30:53:33 | null |
+| B.cs:55:26:55:36 | call to method Equals | B.cs:55:26:55:26 | access to local variable o |
+| B.cs:55:26:55:36 | call to method Equals | B.cs:55:35:55:35 | access to local variable o |
+| C.cs:11:19:11:27 | ... == ... | C.cs:11:19:11:19 | access to local variable o |
+| C.cs:11:19:11:27 | ... == ... | C.cs:11:24:11:27 | null |
+| C.cs:16:15:16:23 | ... != ... | C.cs:16:15:16:15 | access to local variable o |
+| C.cs:16:15:16:23 | ... != ... | C.cs:16:20:16:23 | null |
+| C.cs:24:13:24:21 | ... != ... | C.cs:24:13:24:13 | access to parameter o |
+| C.cs:28:37:28:45 | ... == ... | C.cs:28:37:28:37 | access to parameter o |
+| C.cs:30:40:30:48 | ... != ... | C.cs:30:40:30:40 | access to parameter o |
+| C.cs:34:13:34:21 | ... == ... | C.cs:34:13:34:13 | access to parameter o |
+| C.cs:41:22:41:30 | ... == ... | C.cs:41:22:41:22 | access to local variable s |
+| C.cs:45:22:45:30 | ... != ... | C.cs:45:22:45:22 | access to local variable s |
+| C.cs:78:13:78:24 | call to method IsNotNull | C.cs:78:23:78:23 | access to local variable o |
+| C.cs:81:14:81:22 | call to method IsNull | C.cs:81:21:81:21 | access to local variable o |
+| C.cs:113:22:113:36 | ... == ... | C.cs:113:22:113:28 | access to local variable colours |
+| C.cs:113:22:113:36 | ... == ... | C.cs:113:33:113:36 | null |
+| C.cs:120:13:120:28 | ... == ... | C.cs:120:13:120:20 | access to local variable children |
+| C.cs:120:13:120:28 | ... == ... | C.cs:120:25:120:28 | null |
+| C.cs:129:13:129:38 | ... == ... | C.cs:129:14:129:29 | ... = ... |
+| C.cs:129:13:129:38 | ... == ... | C.cs:129:35:129:38 | null |
+| C.cs:145:13:145:39 | ... != ... | C.cs:145:14:145:30 | ... = ... |
+| C.cs:145:13:145:39 | ... != ... | C.cs:145:36:145:39 | null |
+| C.cs:157:16:157:24 | ... != ... | C.cs:157:16:157:16 | access to local variable s |
+| C.cs:157:16:157:24 | ... != ... | C.cs:157:21:157:24 | null |
+| C.cs:165:16:165:24 | ... != ... | C.cs:165:16:165:16 | access to local variable s |
+| C.cs:165:16:165:24 | ... != ... | C.cs:165:21:165:24 | null |
+| C.cs:172:16:172:24 | ... != ... | C.cs:172:16:172:16 | access to local variable s |
+| C.cs:172:16:172:24 | ... != ... | C.cs:172:21:172:24 | null |
+| C.cs:186:16:186:24 | ... != ... | C.cs:186:16:186:16 | access to local variable s |
+| C.cs:211:13:211:21 | ... != ... | C.cs:211:13:211:13 | access to local variable s |
+| C.cs:217:13:217:21 | ... == ... | C.cs:217:13:217:13 | access to local variable s |
+| C.cs:229:22:229:30 | ... != ... | C.cs:229:22:229:22 | access to local variable s |
+| C.cs:235:24:235:32 | ... == ... | C.cs:235:24:235:24 | access to local variable s |
+| C.cs:235:24:235:32 | ... == ... | C.cs:235:29:235:32 | null |
+| D.cs:28:13:28:25 | ... != ... | D.cs:28:13:28:17 | access to parameter param |
+| D.cs:38:13:38:21 | ... == ... | D.cs:38:13:38:13 | access to parameter x |
+| D.cs:39:16:39:24 | ... == ... | D.cs:39:16:39:16 | access to parameter x |
+| D.cs:45:13:45:22 | ... != ... | D.cs:45:13:45:14 | access to local variable o1 |
+| D.cs:48:13:48:24 | ... is ... | D.cs:48:13:48:14 | access to local variable o2 |
+| D.cs:51:13:51:44 | ... != ... | D.cs:51:14:51:35 | ... = ... |
+| D.cs:55:23:55:32 | ... != ... | D.cs:55:23:55:24 | access to local variable o4 |
+| D.cs:58:19:58:28 | ... != ... | D.cs:58:19:58:20 | access to local variable o4 |
+| D.cs:59:13:59:22 | ... != ... | D.cs:59:13:59:14 | access to local variable o5 |
+| D.cs:61:13:61:22 | ... != ... | D.cs:61:13:61:14 | access to local variable o4 |
+| D.cs:65:14:65:29 | call to method CustomIsNull | D.cs:65:27:65:28 | access to local variable o6 |
+| D.cs:69:18:69:27 | ... != ... | D.cs:69:18:69:19 | access to local variable o7 |
+| D.cs:76:21:76:30 | ... == ... | D.cs:76:21:76:22 | access to local variable o8 |
+| D.cs:110:26:110:35 | ... != ... | D.cs:110:26:110:27 | access to local variable xs |
+| D.cs:118:13:118:21 | ... == ... | D.cs:118:13:118:13 | access to local variable x |
+| D.cs:119:13:119:21 | ... == ... | D.cs:119:13:119:13 | access to local variable x |
+| D.cs:127:20:127:28 | ... == ... | D.cs:127:20:127:20 | access to parameter a |
+| D.cs:128:20:128:28 | ... == ... | D.cs:128:20:128:20 | access to parameter b |
+| D.cs:139:13:139:21 | ... != ... | D.cs:139:13:139:13 | access to parameter a |
+| D.cs:152:17:152:27 | ... != ... | D.cs:152:17:152:19 | access to parameter obj |
+| D.cs:206:17:206:25 | ... == ... | D.cs:206:17:206:17 | access to local variable e |
+| D.cs:212:18:212:26 | ... == ... | D.cs:212:18:212:18 | access to local variable n |
+| D.cs:212:18:212:26 | ... == ... | D.cs:212:23:212:26 | null |
+| D.cs:242:13:242:25 | ... == ... | D.cs:242:13:242:17 | access to local variable other |
+| D.cs:244:13:244:25 | ... != ... | D.cs:244:13:244:17 | access to local variable other |
+| D.cs:336:13:336:23 | ... == ... | D.cs:336:13:336:15 | access to parameter obj |
+| D.cs:341:13:341:23 | ... != ... | D.cs:341:13:341:15 | access to local variable msg |
+| D.cs:367:27:367:35 | ... == ... | D.cs:367:27:367:27 | access to local variable b |
+| D.cs:382:13:382:23 | ... != ... | D.cs:382:13:382:15 | access to local variable ioe |
+| D.cs:390:20:390:28 | ... == ... | D.cs:390:20:390:20 | access to parameter a |
+| D.cs:397:20:397:28 | ... == ... | D.cs:397:20:397:20 | access to parameter b |
+| D.cs:407:14:407:22 | ... != ... | D.cs:407:14:407:14 | access to parameter x |
+| D.cs:407:27:407:35 | ... == ... | D.cs:407:27:407:27 | access to parameter y |
+| D.cs:407:42:407:50 | ... == ... | D.cs:407:42:407:42 | access to parameter x |
+| D.cs:407:55:407:63 | ... != ... | D.cs:407:55:407:55 | access to parameter y |
+| D.cs:409:13:409:21 | ... != ... | D.cs:409:13:409:13 | access to parameter x |
+| D.cs:411:13:411:21 | ... != ... | D.cs:411:13:411:13 | access to parameter y |
+| E.cs:10:34:10:54 | ... != ... | E.cs:10:35:10:45 | ... = ... |
+| E.cs:12:32:12:52 | ... != ... | E.cs:12:33:12:43 | ... = ... |
+| E.cs:20:19:20:28 | ... == ... | E.cs:20:19:20:20 | access to local variable s1 |
+| E.cs:21:13:21:22 | ... == ... | E.cs:21:13:21:14 | access to local variable s2 |
+| E.cs:24:19:24:28 | ... == ... | E.cs:24:19:24:20 | access to local variable s1 |
+| E.cs:26:13:26:22 | ... != ... | E.cs:26:13:26:14 | access to local variable s2 |
+| E.cs:70:22:70:32 | ... == ... | E.cs:70:22:70:24 | access to parameter arr |
+| E.cs:83:13:83:24 | ... != ... | E.cs:83:13:83:16 | access to parameter vals |
+| E.cs:85:18:85:29 | ... != ... | E.cs:85:18:85:21 | access to parameter vals |
+| E.cs:153:13:153:24 | ... != ... | E.cs:153:13:153:16 | access to local variable obj2 |
+| E.cs:164:17:164:25 | ... == ... | E.cs:164:17:164:17 | access to parameter a |
+| E.cs:175:19:175:29 | ... == ... | E.cs:175:19:175:21 | access to parameter obj |
+| E.cs:180:13:180:23 | ... == ... | E.cs:180:13:180:15 | access to parameter obj |
+| E.cs:193:17:193:17 | access to parameter o | E.cs:193:17:193:17 | access to parameter o |
+| E.cs:208:13:208:23 | ... is ... | E.cs:208:13:208:13 | access to parameter s |
+| E.cs:245:13:245:22 | access to property HasValue | E.cs:245:13:245:13 | access to parameter i |
+| E.cs:252:13:252:21 | ... != ... | E.cs:252:13:252:13 | access to parameter i |
+| E.cs:259:13:259:21 | ... == ... | E.cs:259:13:259:13 | access to parameter i |
+| E.cs:274:17:274:25 | ... != ... | E.cs:274:17:274:17 | access to local variable o |
+| E.cs:284:9:284:9 | access to local variable o | E.cs:284:9:284:9 | access to local variable o |
+| E.cs:293:13:293:13 | access to local variable s | E.cs:293:13:293:13 | access to local variable s |
+| E.cs:306:31:306:31 | access to field l | E.cs:306:31:306:31 | access to field l |
+| E.cs:309:13:309:22 | access to property HasValue | E.cs:309:13:309:13 | access to field l |
+| E.cs:321:13:321:30 | ... is ... | E.cs:321:14:321:21 | ... ?? ... |
+| E.cs:321:14:321:15 | access to parameter s1 | E.cs:321:14:321:15 | access to parameter s1 |
+| E.cs:330:17:330:28 | (...) ... | E.cs:330:17:330:28 | (...) ... |
+| E.cs:336:17:336:17 | access to parameter s | E.cs:336:17:336:17 | access to parameter s |
+| E.cs:342:17:342:17 | access to parameter s | E.cs:342:17:342:17 | access to parameter s |
+| E.cs:348:21:348:21 | access to parameter s | E.cs:348:21:348:21 | access to parameter s |
+| E.cs:354:21:354:21 | access to parameter s | E.cs:354:21:354:21 | access to parameter s |
+| E.cs:355:13:355:21 | dynamic call to operator != | E.cs:355:13:355:13 | access to local variable x |
+| E.cs:361:17:361:17 | access to parameter s | E.cs:361:17:361:17 | access to parameter s |
+| E.cs:362:13:362:29 | ... != ... | E.cs:362:13:362:13 | access to local variable x |
+| E.cs:382:14:382:23 | ... == ... | E.cs:382:14:382:15 | access to parameter e1 |
+| E.cs:382:28:382:37 | ... != ... | E.cs:382:28:382:29 | access to parameter e2 |
+| E.cs:382:44:382:53 | ... != ... | E.cs:382:44:382:45 | access to parameter e1 |
+| E.cs:382:58:382:67 | ... == ... | E.cs:382:58:382:59 | access to parameter e2 |
+| E.cs:384:13:384:22 | ... == ... | E.cs:384:13:384:14 | access to parameter e1 |
+| E.cs:384:27:384:36 | ... == ... | E.cs:384:27:384:28 | access to parameter e2 |
+| E.cs:391:9:391:9 | access to parameter i | E.cs:391:9:391:9 | access to parameter i |
+| E.cs:397:9:397:13 | access to parameter color | E.cs:397:9:397:13 | access to parameter color |
+| E.cs:404:9:404:9 | access to local variable i | E.cs:404:9:404:9 | access to local variable i |
+| E.cs:422:13:422:22 | access to property HasValue | E.cs:422:13:422:13 | access to parameter i |
+| E.cs:429:13:429:22 | access to property HasValue | E.cs:429:13:429:13 | access to parameter i |
+| E.cs:437:23:437:31 | ... is ... | E.cs:437:23:437:23 | access to parameter s |
+| E.cs:447:23:447:35 | ... is ... | E.cs:447:23:447:23 | access to parameter s |
+| Forwarding.cs:45:66:45:75 | call to method IsNull | Forwarding.cs:45:66:45:66 | access to parameter o |
+| Forwarding.cs:59:13:59:21 | ... == ... | Forwarding.cs:59:13:59:13 | access to parameter o |
+| Forwarding.cs:78:16:78:39 | call to method ReferenceEquals | Forwarding.cs:78:32:78:32 | access to parameter o |
+| Forwarding.cs:83:16:83:24 | ... != ... | Forwarding.cs:83:16:83:16 | access to parameter o |
+| GuardedString.cs:19:13:19:13 | access to local variable s | GuardedString.cs:19:13:19:13 | access to local variable s |
+| GuardedString.cs:22:13:22:13 | access to local variable s | GuardedString.cs:22:13:22:13 | access to local variable s |
+| GuardedString.cs:25:13:25:13 | access to local variable s | GuardedString.cs:25:13:25:13 | access to local variable s |
+| GuardedString.cs:28:13:28:13 | access to local variable s | GuardedString.cs:28:13:28:13 | access to local variable s |
+| GuardedString.cs:31:13:31:13 | access to local variable s | GuardedString.cs:31:13:31:13 | access to local variable s |
+| GuardedString.cs:34:13:34:13 | access to local variable s | GuardedString.cs:34:13:34:13 | access to local variable s |
+| NullAlwaysBad.cs:9:17:9:25 | ... != ... | NullAlwaysBad.cs:9:17:9:17 | access to parameter s |
+| NullAlwaysGood.cs:9:17:9:25 | ... != ... | NullAlwaysGood.cs:9:17:9:17 | access to parameter s |
+| NullMaybeGood.cs:7:13:7:21 | ... != ... | NullMaybeGood.cs:7:13:7:13 | access to parameter o |
diff --git a/csharp/ql/test/query-tests/Nullness/NullCheck.ql b/csharp/ql/test/query-tests/Nullness/NullCheck.ql
index 4dbd80b7877..5ab3414b971 100644
--- a/csharp/ql/test/query-tests/Nullness/NullCheck.ql
+++ b/csharp/ql/test/query-tests/Nullness/NullCheck.ql
@@ -1,5 +1,6 @@
 import csharp
 import semmle.code.csharp.controlflow.Guards
 
-from DereferenceableExpr de, AbstractValue v, boolean isNull
-select de.getANullCheck(v, isNull), de, v, isNull
+from DereferenceableExpr de, Guards::Guard reason
+where de.guardSuggestsMaybeNull(reason)
+select reason, de
diff --git a/csharp/ql/test/query-tests/Nullness/NullMaybe.expected b/csharp/ql/test/query-tests/Nullness/NullMaybe.expected
index 876cde548b6..6a0d8372e3e 100644
--- a/csharp/ql/test/query-tests/Nullness/NullMaybe.expected
+++ b/csharp/ql/test/query-tests/Nullness/NullMaybe.expected
@@ -1,936 +1,66 @@
-#select
-| C.cs:64:9:64:10 | access to local variable o1 | C.cs:62:13:62:46 | SSA def(o1) | C.cs:64:9:64:10 | access to local variable o1 | Variable $@ may be null at this access because of $@ assignment. | C.cs:62:13:62:14 | o1 | o1 | C.cs:62:13:62:46 | Object o1 = ... | this |
-| C.cs:68:9:68:10 | access to local variable o2 | C.cs:66:13:66:46 | SSA def(o2) | C.cs:68:9:68:10 | access to local variable o2 | Variable $@ may be null at this access because of $@ assignment. | C.cs:66:13:66:14 | o2 | o2 | C.cs:66:13:66:46 | Object o2 = ... | this |
-| C.cs:95:15:95:15 | access to local variable o | C.cs:94:13:94:45 | SSA def(o) | C.cs:95:15:95:15 | access to local variable o | Variable $@ may be null at this access because of $@ assignment. | C.cs:94:13:94:13 | o | o | C.cs:94:13:94:45 | Object o = ... | this |
-| C.cs:103:27:103:30 | access to parameter list | C.cs:102:13:102:23 | SSA def(list) | C.cs:103:27:103:30 | access to parameter list | Variable $@ may be null at this access because of $@ assignment. | C.cs:99:42:99:45 | list | list | C.cs:102:13:102:23 | ... = ... | this |
-| C.cs:177:13:177:13 | access to local variable s | C.cs:178:13:178:20 | SSA def(s) | C.cs:177:13:177:13 | access to local variable s | Variable $@ may be null at this access because of $@ assignment. | C.cs:151:13:151:13 | s | s | C.cs:178:13:178:20 | ... = ... | this |
-| C.cs:203:13:203:13 | access to local variable s | C.cs:204:13:204:20 | SSA def(s) | C.cs:203:13:203:13 | access to local variable s | Variable $@ may be null at this access because of $@ assignment. | C.cs:185:13:185:13 | s | s | C.cs:204:13:204:20 | ... = ... | this |
-| C.cs:223:9:223:9 | access to local variable s | C.cs:222:13:222:20 | SSA def(s) | C.cs:223:9:223:9 | access to local variable s | Variable $@ may be null at this access because of $@ assignment. | C.cs:210:13:210:13 | s | s | C.cs:222:13:222:20 | ... = ... | this |
-| C.cs:242:13:242:13 | access to local variable s | C.cs:240:24:240:31 | SSA def(s) | C.cs:242:13:242:13 | access to local variable s | Variable $@ may be null at this access because of $@ assignment. | C.cs:228:16:228:16 | s | s | C.cs:240:24:240:31 | ... = ... | this |
-| D.cs:23:9:23:13 | access to parameter param | D.cs:17:17:17:20 | null | D.cs:23:9:23:13 | access to parameter param | Variable $@ may be null at this access because of $@ null argument. | D.cs:21:32:21:36 | param | param | D.cs:17:17:17:20 | null | this |
-| D.cs:32:9:32:13 | access to parameter param | D.cs:26:32:26:36 | SSA param(param) | D.cs:32:9:32:13 | access to parameter param | Variable $@ may be null at this access as suggested by $@ null check. | D.cs:26:32:26:36 | param | param | D.cs:28:13:28:25 | ... != ... | this |
-| D.cs:62:13:62:14 | access to local variable o5 | D.cs:58:13:58:41 | SSA def(o5) | D.cs:62:13:62:14 | access to local variable o5 | Variable $@ may be null at this access because of $@ assignment. | D.cs:58:13:58:14 | o5 | o5 | D.cs:58:13:58:41 | String o5 = ... | this |
-| D.cs:73:13:73:14 | access to local variable o7 | D.cs:68:13:68:34 | SSA def(o7) | D.cs:73:13:73:14 | access to local variable o7 | Variable $@ may be null at this access because of $@ assignment. | D.cs:68:13:68:14 | o7 | o7 | D.cs:68:13:68:34 | String o7 = ... | this |
-| D.cs:82:13:82:14 | access to local variable o8 | D.cs:75:13:75:34 | SSA def(o8) | D.cs:82:13:82:14 | access to local variable o8 | Variable $@ may be null at this access because of $@ assignment. | D.cs:75:13:75:14 | o8 | o8 | D.cs:75:13:75:34 | String o8 = ... | this |
-| D.cs:84:13:84:14 | access to local variable o8 | D.cs:75:13:75:34 | SSA def(o8) | D.cs:84:13:84:14 | access to local variable o8 | Variable $@ may be null at this access because of $@ assignment. | D.cs:75:13:75:14 | o8 | o8 | D.cs:75:13:75:34 | String o8 = ... | this |
-| D.cs:91:13:91:14 | access to local variable xs | D.cs:89:15:89:44 | SSA def(xs) | D.cs:91:13:91:14 | access to local variable xs | Variable $@ may be null at this access because of $@ assignment. | D.cs:89:15:89:16 | xs | xs | D.cs:89:15:89:44 | Int32[] xs = ... | this |
-| D.cs:94:21:94:22 | access to local variable xs | D.cs:89:15:89:44 | SSA def(xs) | D.cs:94:21:94:22 | access to local variable xs | Variable $@ may be null at this access because of $@ assignment. | D.cs:89:15:89:16 | xs | xs | D.cs:89:15:89:44 | Int32[] xs = ... | this |
-| D.cs:98:21:98:22 | access to local variable xs | D.cs:89:15:89:44 | SSA def(xs) | D.cs:98:21:98:22 | access to local variable xs | Variable $@ may be null at this access because of $@ assignment. | D.cs:89:15:89:16 | xs | xs | D.cs:89:15:89:44 | Int32[] xs = ... | this |
-| D.cs:102:31:102:32 | access to local variable xs | D.cs:89:15:89:44 | SSA def(xs) | D.cs:102:31:102:32 | access to local variable xs | Variable $@ may be null at this access because of $@ assignment. | D.cs:89:15:89:16 | xs | xs | D.cs:89:15:89:44 | Int32[] xs = ... | this |
-| D.cs:105:19:105:20 | access to local variable xs | D.cs:89:15:89:44 | SSA def(xs) | D.cs:105:19:105:20 | access to local variable xs | Variable $@ may be null at this access because of $@ assignment. | D.cs:89:15:89:16 | xs | xs | D.cs:89:15:89:44 | Int32[] xs = ... | this |
-| D.cs:134:24:134:24 | access to parameter a | D.cs:125:35:125:35 | SSA param(a) | D.cs:134:24:134:24 | access to parameter a | Variable $@ may be null at this access as suggested by $@ null check. | D.cs:125:35:125:35 | a | a | D.cs:127:20:127:28 | ... == ... | this |
-| D.cs:134:24:134:24 | access to parameter a | D.cs:125:35:125:35 | SSA param(a) | D.cs:134:24:134:24 | access to parameter a | Variable $@ may be null at this access as suggested by $@ null check. | D.cs:125:35:125:35 | a | a | D.cs:139:13:139:21 | ... != ... | this |
-| D.cs:135:24:135:24 | access to parameter b | D.cs:125:44:125:44 | SSA param(b) | D.cs:135:24:135:24 | access to parameter b | Variable $@ may be null at this access as suggested by $@ null check. | D.cs:125:44:125:44 | b | b | D.cs:128:20:128:28 | ... == ... | this |
-| D.cs:145:20:145:20 | access to parameter a | D.cs:125:35:125:35 | SSA param(a) | D.cs:145:20:145:20 | access to parameter a | Variable $@ may be null at this access as suggested by $@ null check. | D.cs:125:35:125:35 | a | a | D.cs:127:20:127:28 | ... == ... | this |
-| D.cs:145:20:145:20 | access to parameter a | D.cs:125:35:125:35 | SSA param(a) | D.cs:145:20:145:20 | access to parameter a | Variable $@ may be null at this access as suggested by $@ null check. | D.cs:125:35:125:35 | a | a | D.cs:139:13:139:21 | ... != ... | this |
-| D.cs:151:9:151:11 | access to parameter obj | D.cs:149:36:149:38 | SSA param(obj) | D.cs:151:9:151:11 | access to parameter obj | Variable $@ may be null at this access as suggested by $@ null check. | D.cs:149:36:149:38 | obj | obj | D.cs:152:17:152:27 | ... != ... | this |
-| D.cs:171:9:171:11 | access to local variable obj | D.cs:163:16:163:25 | SSA def(obj) | D.cs:171:9:171:11 | access to local variable obj | Variable $@ may be null at this access because of $@ assignment. | D.cs:163:16:163:18 | obj | obj | D.cs:163:16:163:25 | Object obj = ... | this |
-| D.cs:245:13:245:13 | access to local variable o | D.cs:240:9:240:16 | SSA def(o) | D.cs:245:13:245:13 | access to local variable o | Variable $@ may be null at this access because of $@ assignment. | D.cs:228:16:228:16 | o | o | D.cs:240:9:240:16 | ... = ... | this |
-| D.cs:247:13:247:13 | access to local variable o | D.cs:240:9:240:16 | SSA def(o) | D.cs:247:13:247:13 | access to local variable o | Variable $@ may be null at this access because of $@ assignment. | D.cs:228:16:228:16 | o | o | D.cs:240:9:240:16 | ... = ... | this |
-| D.cs:253:13:253:14 | access to local variable o2 | D.cs:249:13:249:38 | SSA def(o2) | D.cs:253:13:253:14 | access to local variable o2 | Variable $@ may be null at this access because of $@ assignment. | D.cs:249:13:249:14 | o2 | o2 | D.cs:249:13:249:38 | String o2 = ... | this |
-| D.cs:267:13:267:13 | access to local variable o | D.cs:258:16:258:23 | SSA def(o) | D.cs:267:13:267:13 | access to local variable o | Variable $@ may be null at this access because of $@ assignment. | D.cs:258:16:258:16 | o | o | D.cs:258:16:258:23 | Object o = ... | this |
-| D.cs:291:13:291:13 | access to local variable o | D.cs:269:9:269:16 | SSA def(o) | D.cs:291:13:291:13 | access to local variable o | Variable $@ may be null at this access because of $@ assignment. | D.cs:258:16:258:16 | o | o | D.cs:269:9:269:16 | ... = ... | this |
-| D.cs:291:13:291:13 | access to local variable o | D.cs:283:17:283:24 | SSA def(o) | D.cs:291:13:291:13 | access to local variable o | Variable $@ may be null at this access because of $@ assignment. | D.cs:258:16:258:16 | o | o | D.cs:283:17:283:24 | ... = ... | this |
-| D.cs:294:13:294:13 | access to local variable o | D.cs:269:9:269:16 | SSA def(o) | D.cs:294:13:294:13 | access to local variable o | Variable $@ may be null at this access because of $@ assignment. | D.cs:258:16:258:16 | o | o | D.cs:269:9:269:16 | ... = ... | this |
-| D.cs:294:13:294:13 | access to local variable o | D.cs:283:17:283:24 | SSA def(o) | D.cs:294:13:294:13 | access to local variable o | Variable $@ may be null at this access because of $@ assignment. | D.cs:258:16:258:16 | o | o | D.cs:283:17:283:24 | ... = ... | this |
-| D.cs:300:17:300:20 | access to local variable prev | D.cs:296:16:296:26 | SSA def(prev) | D.cs:300:17:300:20 | access to local variable prev | Variable $@ may be null at this access because of $@ assignment. | D.cs:296:16:296:19 | prev | prev | D.cs:296:16:296:26 | Object prev = ... | this |
-| D.cs:313:17:313:17 | access to local variable s | D.cs:304:16:304:23 | SSA def(s) | D.cs:313:17:313:17 | access to local variable s | Variable $@ may be null at this access because of $@ assignment. | D.cs:304:16:304:16 | s | s | D.cs:304:16:304:23 | String s = ... | this |
-| D.cs:324:9:324:9 | access to local variable r | D.cs:316:16:316:23 | SSA def(r) | D.cs:324:9:324:9 | access to local variable r | Variable $@ may be null at this access because of $@ assignment. | D.cs:316:16:316:16 | r | r | D.cs:316:16:316:23 | Object r = ... | this |
-| D.cs:356:13:356:13 | access to local variable a | D.cs:351:15:351:22 | SSA def(a) | D.cs:356:13:356:13 | access to local variable a | Variable $@ may be null at this access because of $@ assignment. | D.cs:351:15:351:15 | a | a | D.cs:351:15:351:22 | Int32[] a = ... | this |
-| D.cs:363:13:363:16 | access to local variable last | D.cs:360:20:360:30 | SSA def(last) | D.cs:363:13:363:16 | access to local variable last | Variable $@ may be null at this access because of $@ assignment. | D.cs:360:20:360:23 | last | last | D.cs:360:20:360:30 | String last = ... | this |
-| D.cs:372:13:372:13 | access to local variable b | D.cs:366:15:366:47 | SSA def(b) | D.cs:372:13:372:13 | access to local variable b | Variable $@ may be null at this access because of $@ assignment. | D.cs:366:15:366:15 | b | b | D.cs:366:15:366:47 | Int32[] b = ... | this |
-| D.cs:395:20:395:20 | access to parameter a | D.cs:388:36:388:36 | SSA param(a) | D.cs:395:20:395:20 | access to parameter a | Variable $@ may be null at this access as suggested by $@ null check. | D.cs:388:36:388:36 | a | a | D.cs:390:20:390:28 | ... == ... | this |
-| D.cs:400:20:400:20 | access to parameter b | D.cs:388:45:388:45 | SSA param(b) | D.cs:400:20:400:20 | access to parameter b | Variable $@ may be null at this access as suggested by $@ null check. | D.cs:388:45:388:45 | b | b | D.cs:397:20:397:28 | ... == ... | this |
-| D.cs:410:13:410:13 | access to parameter y | D.cs:405:45:405:45 | SSA param(y) | D.cs:410:13:410:13 | access to parameter y | Variable $@ may be null at this access as suggested by $@ null check. | D.cs:405:45:405:45 | y | y | D.cs:407:27:407:35 | ... == ... | this |
-| D.cs:410:13:410:13 | access to parameter y | D.cs:405:45:405:45 | SSA param(y) | D.cs:410:13:410:13 | access to parameter y | Variable $@ may be null at this access as suggested by $@ null check. | D.cs:405:45:405:45 | y | y | D.cs:407:55:407:63 | ... != ... | this |
-| D.cs:410:13:410:13 | access to parameter y | D.cs:405:45:405:45 | SSA param(y) | D.cs:410:13:410:13 | access to parameter y | Variable $@ may be null at this access as suggested by $@ null check. | D.cs:405:45:405:45 | y | y | D.cs:411:13:411:21 | ... != ... | this |
-| D.cs:412:13:412:13 | access to parameter x | D.cs:405:35:405:35 | SSA param(x) | D.cs:412:13:412:13 | access to parameter x | Variable $@ may be null at this access as suggested by $@ null check. | D.cs:405:35:405:35 | x | x | D.cs:407:14:407:22 | ... != ... | this |
-| D.cs:412:13:412:13 | access to parameter x | D.cs:405:35:405:35 | SSA param(x) | D.cs:412:13:412:13 | access to parameter x | Variable $@ may be null at this access as suggested by $@ null check. | D.cs:405:35:405:35 | x | x | D.cs:407:42:407:50 | ... == ... | this |
-| D.cs:412:13:412:13 | access to parameter x | D.cs:405:35:405:35 | SSA param(x) | D.cs:412:13:412:13 | access to parameter x | Variable $@ may be null at this access as suggested by $@ null check. | D.cs:405:35:405:35 | x | x | D.cs:409:13:409:21 | ... != ... | this |
-| E.cs:12:38:12:39 | access to local variable a2 | E.cs:9:18:9:26 | SSA def(a2) | E.cs:12:38:12:39 | access to local variable a2 | Variable $@ may be null at this access because of $@ assignment. | E.cs:9:18:9:19 | a2 | a2 | E.cs:9:18:9:26 | Int64[][] a2 = ... | this |
-| E.cs:14:13:14:14 | access to local variable a3 | E.cs:11:16:11:24 | SSA def(a3) | E.cs:14:13:14:14 | access to local variable a3 | Variable $@ may be null at this access because of $@ assignment. | E.cs:11:16:11:17 | a3 | a3 | E.cs:11:16:11:24 | Int64[] a3 = ... | this |
-| E.cs:27:13:27:14 | access to local variable s1 | E.cs:23:13:23:30 | SSA def(s1) | E.cs:27:13:27:14 | access to local variable s1 | Variable $@ may be null at this access because of $@ assignment. | E.cs:19:13:19:14 | s1 | s1 | E.cs:23:13:23:30 | ... = ... | this |
-| E.cs:61:13:61:17 | access to local variable slice | E.cs:51:22:51:33 | SSA def(slice) | E.cs:61:13:61:17 | access to local variable slice | Variable $@ may be null at this access because of $@ assignment. | E.cs:51:22:51:26 | slice | slice | E.cs:51:22:51:33 | List<String> slice = ... | this |
-| E.cs:73:13:73:15 | access to parameter arr | E.cs:66:40:66:42 | SSA param(arr) | E.cs:73:13:73:15 | access to parameter arr | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:66:40:66:42 | arr | arr | E.cs:70:22:70:32 | ... == ... | this |
-| E.cs:112:13:112:16 | access to local variable arr2 | E.cs:107:15:107:25 | SSA def(arr2) | E.cs:112:13:112:16 | access to local variable arr2 | Variable $@ may be null at this access because of $@ assignment. | E.cs:107:15:107:18 | arr2 | arr2 | E.cs:107:15:107:25 | Int32[] arr2 = ... | this |
-| E.cs:125:33:125:35 | access to local variable obj | E.cs:137:25:137:34 | SSA def(obj) | E.cs:125:33:125:35 | access to local variable obj | Variable $@ may be null at this access because of $@ assignment. | E.cs:119:13:119:15 | obj | obj | E.cs:137:25:137:34 | ... = ... | this |
-| E.cs:159:13:159:16 | access to local variable obj2 | E.cs:152:16:152:26 | SSA def(obj2) | E.cs:159:13:159:16 | access to local variable obj2 | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:152:16:152:19 | obj2 | obj2 | E.cs:153:13:153:24 | ... != ... | this |
-| E.cs:167:21:167:21 | access to parameter a | E.cs:162:28:162:28 | SSA param(a) | E.cs:167:21:167:21 | access to parameter a | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:162:28:162:28 | a | a | E.cs:164:17:164:25 | ... == ... | this |
-| E.cs:178:13:178:15 | access to parameter obj | E.cs:173:29:173:31 | SSA param(obj) | E.cs:178:13:178:15 | access to parameter obj | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:173:29:173:31 | obj | obj | E.cs:175:19:175:29 | ... == ... | this |
-| E.cs:178:13:178:15 | access to parameter obj | E.cs:173:29:173:31 | SSA param(obj) | E.cs:178:13:178:15 | access to parameter obj | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:173:29:173:31 | obj | obj | E.cs:180:13:180:23 | ... == ... | this |
-| E.cs:186:13:186:15 | access to parameter obj | E.cs:173:29:173:31 | SSA param(obj) | E.cs:186:13:186:15 | access to parameter obj | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:173:29:173:31 | obj | obj | E.cs:175:19:175:29 | ... == ... | this |
-| E.cs:186:13:186:15 | access to parameter obj | E.cs:173:29:173:31 | SSA param(obj) | E.cs:186:13:186:15 | access to parameter obj | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:173:29:173:31 | obj | obj | E.cs:180:13:180:23 | ... == ... | this |
-| E.cs:192:17:192:17 | access to parameter o | E.cs:190:29:190:29 | SSA param(o) | E.cs:192:17:192:17 | access to parameter o | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:190:29:190:29 | o | o | E.cs:193:17:193:17 | access to parameter o | this |
-| E.cs:201:13:201:13 | access to local variable o | E.cs:198:13:198:29 | [b (line 196): true] SSA def(o) | E.cs:201:13:201:13 | access to local variable o | Variable $@ may be null at this access because of $@ assignment. | E.cs:198:13:198:13 | o | o | E.cs:198:13:198:29 | String o = ... | this |
-| E.cs:203:13:203:13 | access to local variable o | E.cs:198:13:198:29 | [b (line 196): false] SSA def(o) | E.cs:203:13:203:13 | access to local variable o | Variable $@ may be null at this access because of $@ assignment. | E.cs:198:13:198:13 | o | o | E.cs:198:13:198:29 | String o = ... | this |
-| E.cs:218:9:218:9 | access to local variable x | E.cs:217:13:217:20 | [b (line 213): true] SSA def(x) | E.cs:218:9:218:9 | access to local variable x | Variable $@ may be null at this access because of $@ assignment. | E.cs:215:13:215:13 | x | x | E.cs:217:13:217:20 | ... = ... | this |
-| E.cs:230:9:230:9 | access to local variable x | E.cs:227:13:227:20 | [b (line 223): true] SSA def(x) | E.cs:230:9:230:9 | access to local variable x | Variable $@ may be null at this access because of $@ assignment. | E.cs:225:13:225:13 | x | x | E.cs:227:13:227:20 | ... = ... | this |
-| E.cs:235:16:235:16 | access to parameter i | E.cs:233:26:233:26 | SSA param(i) | E.cs:235:16:235:16 | access to parameter i | Variable $@ may be null at this access because it has a nullable type. | E.cs:233:26:233:26 | i | i | E.cs:233:26:233:26 | i | this |
-| E.cs:240:21:240:21 | access to parameter i | E.cs:238:26:238:26 | SSA param(i) | E.cs:240:21:240:21 | access to parameter i | Variable $@ may be null at this access because it has a nullable type. | E.cs:238:26:238:26 | i | i | E.cs:238:26:238:26 | i | this |
-| E.cs:285:9:285:9 | access to local variable o | E.cs:283:13:283:22 | [b (line 279): false] SSA def(o) | E.cs:285:9:285:9 | access to local variable o | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:283:13:283:13 | o | o | E.cs:284:9:284:9 | access to local variable o | this |
-| E.cs:285:9:285:9 | access to local variable o | E.cs:283:13:283:22 | [b (line 279): true] SSA def(o) | E.cs:285:9:285:9 | access to local variable o | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:283:13:283:13 | o | o | E.cs:284:9:284:9 | access to local variable o | this |
-| E.cs:302:9:302:9 | access to local variable s | E.cs:301:13:301:27 | SSA def(s) | E.cs:302:9:302:9 | access to local variable s | Variable $@ may be null at this access because of $@ assignment. | E.cs:301:13:301:13 | s | s | E.cs:301:13:301:27 | String s = ... | this |
-| E.cs:343:9:343:9 | access to local variable x | E.cs:342:13:342:32 | SSA def(x) | E.cs:343:9:343:9 | access to local variable x | Variable $@ may be null at this access because of $@ assignment. | E.cs:342:13:342:13 | x | x | E.cs:342:13:342:32 | String x = ... | this |
-| E.cs:349:9:349:9 | access to local variable x | E.cs:348:17:348:36 | SSA def(x) | E.cs:349:9:349:9 | access to local variable x | Variable $@ may be null at this access because of $@ assignment. | E.cs:348:17:348:17 | x | x | E.cs:348:17:348:36 | dynamic x = ... | this |
-| E.cs:366:41:366:41 | access to parameter s | E.cs:366:28:366:28 | SSA param(s) | E.cs:366:41:366:41 | access to parameter s | Variable $@ may be null at this access because the parameter has a null default value. | E.cs:366:28:366:28 | s | s | E.cs:366:32:366:35 | null | this |
-| E.cs:375:20:375:20 | access to local variable s | E.cs:374:17:374:31 | SSA def(s) | E.cs:375:20:375:20 | access to local variable s | Variable $@ may be null at this access because of $@ assignment. | E.cs:374:17:374:17 | s | s | E.cs:374:17:374:31 | String s = ... | this |
-| E.cs:386:16:386:17 | access to parameter e1 | E.cs:380:24:380:25 | SSA param(e1) | E.cs:386:16:386:17 | access to parameter e1 | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:380:24:380:25 | e1 | e1 | E.cs:382:14:382:23 | ... == ... | this |
-| E.cs:386:16:386:17 | access to parameter e1 | E.cs:380:24:380:25 | SSA param(e1) | E.cs:386:16:386:17 | access to parameter e1 | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:380:24:380:25 | e1 | e1 | E.cs:382:44:382:53 | ... != ... | this |
-| E.cs:386:16:386:17 | access to parameter e1 | E.cs:380:24:380:25 | SSA param(e1) | E.cs:386:16:386:17 | access to parameter e1 | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:380:24:380:25 | e1 | e1 | E.cs:384:13:384:22 | ... == ... | this |
-| E.cs:386:27:386:28 | access to parameter e2 | E.cs:380:30:380:31 | SSA param(e2) | E.cs:386:27:386:28 | access to parameter e2 | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:380:30:380:31 | e2 | e2 | E.cs:382:28:382:37 | ... != ... | this |
-| E.cs:386:27:386:28 | access to parameter e2 | E.cs:380:30:380:31 | SSA param(e2) | E.cs:386:27:386:28 | access to parameter e2 | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:380:30:380:31 | e2 | e2 | E.cs:382:58:382:67 | ... == ... | this |
-| E.cs:386:27:386:28 | access to parameter e2 | E.cs:380:30:380:31 | SSA param(e2) | E.cs:386:27:386:28 | access to parameter e2 | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:380:30:380:31 | e2 | e2 | E.cs:384:27:384:36 | ... == ... | this |
-| E.cs:417:34:417:34 | access to parameter i | E.cs:417:24:417:40 | SSA capture def(i) | E.cs:417:34:417:34 | access to parameter i | Variable $@ may be null at this access because it has a nullable type. | E.cs:415:27:415:27 | i | i | E.cs:415:27:415:27 | i | this |
-| E.cs:423:38:423:38 | access to parameter i | E.cs:423:28:423:44 | SSA capture def(i) | E.cs:423:38:423:38 | access to parameter i | Variable $@ may be null at this access because it has a nullable type. | E.cs:420:27:420:27 | i | i | E.cs:420:27:420:27 | i | this |
-| E.cs:430:39:430:39 | access to parameter i | E.cs:430:29:430:45 | SSA capture def(i) | E.cs:430:39:430:39 | access to parameter i | Variable $@ may be null at this access because it has a nullable type. | E.cs:427:27:427:27 | i | i | E.cs:427:27:427:27 | i | this |
-| GuardedString.cs:35:31:35:31 | access to local variable s | GuardedString.cs:7:16:7:32 | SSA def(s) | GuardedString.cs:35:31:35:31 | access to local variable s | Variable $@ may be null at this access because of $@ assignment. | GuardedString.cs:7:16:7:16 | s | s | GuardedString.cs:7:16:7:32 | String s = ... | this |
-| NullMaybeBad.cs:7:27:7:27 | access to parameter o | NullMaybeBad.cs:13:17:13:20 | null | NullMaybeBad.cs:7:27:7:27 | access to parameter o | Variable $@ may be null at this access because of $@ null argument. | NullMaybeBad.cs:5:25:5:25 | o | o | NullMaybeBad.cs:13:17:13:20 | null | this |
-| Params.cs:14:17:14:20 | access to parameter args | Params.cs:20:12:20:15 | null | Params.cs:14:17:14:20 | access to parameter args | Variable $@ may be null at this access because of $@ null argument. | Params.cs:12:36:12:39 | args | args | Params.cs:20:12:20:15 | null | this |
-| StringConcatenation.cs:16:17:16:17 | access to local variable s | StringConcatenation.cs:14:16:14:23 | SSA def(s) | StringConcatenation.cs:16:17:16:17 | access to local variable s | Variable $@ may be null at this access because of $@ assignment. | StringConcatenation.cs:14:16:14:16 | s | s | StringConcatenation.cs:14:16:14:23 | String s = ... | this |
-edges
-| A.cs:7:16:7:40 | SSA def(synchronizedAlways) | A.cs:8:15:8:32 | access to local variable synchronizedAlways |
-| A.cs:7:16:7:40 | SSA def(synchronizedAlways) | A.cs:10:13:10:30 | access to local variable synchronizedAlways |
-| A.cs:16:15:16:30 | SSA def(arrayNull) | A.cs:17:9:17:17 | access to local variable arrayNull |
-| A.cs:26:15:26:32 | SSA def(arrayAccess) | A.cs:31:27:31:37 | access to local variable arrayAccess |
-| A.cs:26:15:26:32 | SSA def(arrayAccess) | A.cs:36:27:36:37 | access to local variable arrayAccess |
-| A.cs:27:18:27:35 | SSA def(fieldAccess) | A.cs:32:27:32:37 | access to local variable fieldAccess |
-| A.cs:27:18:27:35 | SSA def(fieldAccess) | A.cs:37:27:37:37 | access to local variable fieldAccess |
-| A.cs:28:16:28:34 | SSA def(methodAccess) | A.cs:33:28:33:39 | access to local variable methodAccess |
-| A.cs:28:16:28:34 | SSA def(methodAccess) | A.cs:38:15:38:26 | access to local variable methodAccess |
-| A.cs:29:16:29:32 | SSA def(methodCall) | A.cs:34:27:34:36 | access to local variable methodCall |
-| A.cs:29:16:29:32 | SSA def(methodCall) | A.cs:39:27:39:36 | access to local variable methodCall |
-| A.cs:48:16:48:28 | SSA def(varRef) | A.cs:50:9:50:14 | access to local variable varRef |
-| Assert.cs:13:9:13:25 | [b (line 7): false] SSA def(s) | Assert.cs:15:27:15:27 | access to local variable s |
-| Assert.cs:13:9:13:25 | [b (line 7): true] SSA def(s) | Assert.cs:15:27:15:27 | access to local variable s |
-| Assert.cs:21:9:21:25 | [b (line 7): false] SSA def(s) | Assert.cs:23:27:23:27 | access to local variable s |
-| Assert.cs:21:9:21:25 | [b (line 7): true] SSA def(s) | Assert.cs:23:27:23:27 | access to local variable s |
-| Assert.cs:29:9:29:25 | [b (line 7): false] SSA def(s) | Assert.cs:31:27:31:27 | access to local variable s |
-| Assert.cs:29:9:29:25 | [b (line 7): true] SSA def(s) | Assert.cs:31:27:31:27 | access to local variable s |
-| Assert.cs:45:9:45:25 | [b (line 7): true] SSA def(s) | Assert.cs:46:36:46:36 | [b (line 7): true] access to parameter b |
-| Assert.cs:46:23:46:36 | [true, b (line 7): true] ... && ... | Assert.cs:47:27:47:27 | access to local variable s |
-| Assert.cs:46:36:46:36 | [b (line 7): true] access to parameter b | Assert.cs:46:23:46:36 | [true, b (line 7): true] ... && ... |
-| Assert.cs:49:9:49:25 | [b (line 7): true] SSA def(s) | Assert.cs:50:38:50:38 | [b (line 7): true] access to parameter b |
-| Assert.cs:50:24:50:38 | [false] ... \|\| ... | Assert.cs:51:27:51:27 | access to local variable s |
-| Assert.cs:50:37:50:38 | [false] !... | Assert.cs:50:24:50:38 | [false] ... \|\| ... |
-| Assert.cs:50:38:50:38 | [b (line 7): true] access to parameter b | Assert.cs:50:37:50:38 | [false] !... |
-| B.cs:7:11:7:29 | SSA def(eqCallAlways) | B.cs:13:13:13:24 | access to local variable eqCallAlways |
-| B.cs:10:11:10:30 | SSA def(neqCallAlways) | B.cs:13:13:13:36 | ...; |
-| B.cs:10:11:10:30 | SSA def(neqCallAlways) | B.cs:15:9:16:26 | if (...) ... |
-| B.cs:13:13:13:36 | ...; | B.cs:15:9:16:26 | if (...) ... |
-| B.cs:15:9:16:26 | if (...) ... | B.cs:16:13:16:26 | ...; |
-| B.cs:15:9:16:26 | if (...) ... | B.cs:18:9:20:26 | if (...) ... |
-| B.cs:16:13:16:26 | ...; | B.cs:18:9:20:26 | if (...) ... |
-| B.cs:18:9:20:26 | if (...) ... | B.cs:18:25:18:27 | {...} |
-| B.cs:18:9:20:26 | if (...) ... | B.cs:20:13:20:26 | ...; |
-| B.cs:18:25:18:27 | {...} | B.cs:22:9:24:37 | if (...) ... |
-| B.cs:20:13:20:26 | ...; | B.cs:22:9:24:37 | if (...) ... |
-| B.cs:22:9:24:37 | if (...) ... | B.cs:24:13:24:25 | access to local variable neqCallAlways |
-| C.cs:10:16:10:23 | SSA def(o) | C.cs:11:17:11:28 | [false] !... |
-| C.cs:11:13:11:30 | [false] !... | C.cs:16:9:19:9 | if (...) ... |
-| C.cs:11:15:11:29 | [true] !... | C.cs:11:13:11:30 | [false] !... |
-| C.cs:11:17:11:28 | [false] !... | C.cs:11:15:11:29 | [true] !... |
-| C.cs:16:9:19:9 | if (...) ... | C.cs:16:13:16:24 | [true] !... |
-| C.cs:16:13:16:24 | [true] !... | C.cs:18:13:18:13 | access to local variable o |
-| C.cs:40:13:40:35 | SSA def(s) | C.cs:42:9:42:9 | access to local variable s |
-| C.cs:55:13:55:36 | SSA def(o2) | C.cs:57:9:57:10 | access to local variable o2 |
-| C.cs:62:13:62:46 | SSA def(o1) | C.cs:64:9:64:10 | access to local variable o1 |
-| C.cs:66:13:66:46 | SSA def(o2) | C.cs:68:9:68:10 | access to local variable o2 |
-| C.cs:94:13:94:45 | SSA def(o) | C.cs:95:15:95:15 | access to local variable o |
-| C.cs:94:13:94:45 | SSA def(o) | C.cs:96:13:96:13 | access to local variable o |
-| C.cs:102:13:102:23 | SSA def(list) | C.cs:103:27:103:30 | access to parameter list |
-| C.cs:102:13:102:23 | SSA def(list) | C.cs:103:27:103:30 | access to parameter list |
-| C.cs:103:9:107:9 | foreach (... ... in ...) ... | C.cs:103:22:103:22 | Int32 x |
-| C.cs:103:9:107:9 | foreach (... ... in ...) ... | C.cs:106:13:106:16 | access to parameter list |
-| C.cs:103:22:103:22 | Int32 x | C.cs:103:9:107:9 | foreach (... ... in ...) ... |
-| C.cs:103:27:103:30 | access to parameter list | C.cs:103:9:107:9 | foreach (... ... in ...) ... |
-| C.cs:159:9:159:16 | SSA def(s) | C.cs:162:13:162:13 | access to local variable s |
-| C.cs:167:9:167:16 | SSA def(s) | C.cs:170:13:170:13 | access to local variable s |
-| C.cs:178:13:178:20 | SSA def(s) | C.cs:177:13:177:13 | access to local variable s |
-| C.cs:193:9:193:16 | SSA def(s) | C.cs:196:13:196:13 | access to local variable s |
-| C.cs:197:13:197:20 | [b (line 192): true] SSA def(s) | C.cs:196:13:196:13 | access to local variable s |
-| C.cs:201:16:201:19 | true | C.cs:203:13:203:13 | access to local variable s |
-| C.cs:204:13:204:20 | SSA def(s) | C.cs:201:16:201:19 | true |
-| C.cs:210:13:210:35 | SSA def(s) | C.cs:217:9:218:25 | if (...) ... |
-| C.cs:214:13:214:20 | SSA def(s) | C.cs:217:9:218:25 | if (...) ... |
-| C.cs:217:9:218:25 | if (...) ... | C.cs:218:13:218:13 | access to local variable s |
-| C.cs:222:13:222:20 | SSA def(s) | C.cs:223:9:223:9 | access to local variable s |
-| C.cs:229:22:229:22 | access to local variable s | C.cs:233:9:233:9 | access to local variable s |
-| C.cs:229:33:229:40 | SSA def(s) | C.cs:229:22:229:22 | access to local variable s |
-| C.cs:235:14:235:21 | SSA def(s) | C.cs:235:24:235:24 | access to local variable s |
-| C.cs:235:24:235:24 | access to local variable s | C.cs:237:13:237:13 | access to local variable s |
-| C.cs:235:35:235:42 | SSA def(s) | C.cs:235:24:235:24 | access to local variable s |
-| C.cs:240:24:240:31 | SSA def(s) | C.cs:242:13:242:13 | access to local variable s |
-| C.cs:248:15:248:22 | SSA def(a) | C.cs:249:9:249:9 | access to local variable a |
-| C.cs:257:15:257:23 | SSA def(ia) | C.cs:260:9:260:10 | access to local variable ia |
-| C.cs:257:15:257:23 | SSA def(ia) | C.cs:263:9:263:10 | access to local variable ia |
-| C.cs:258:18:258:26 | SSA def(sa) | C.cs:261:20:261:21 | access to local variable sa |
-| C.cs:258:18:258:26 | SSA def(sa) | C.cs:264:16:264:17 | access to local variable sa |
-| D.cs:17:17:17:20 | null | D.cs:23:9:23:13 | access to parameter param |
-| D.cs:26:32:26:36 | SSA param(param) | D.cs:32:9:32:13 | access to parameter param |
-| D.cs:58:13:58:41 | SSA def(o5) | D.cs:61:9:62:26 | if (...) ... |
-| D.cs:61:9:62:26 | if (...) ... | D.cs:62:13:62:14 | access to local variable o5 |
-| D.cs:68:13:68:34 | SSA def(o7) | D.cs:69:18:69:36 | ... && ... |
-| D.cs:69:18:69:36 | ... && ... | D.cs:73:13:73:14 | access to local variable o7 |
-| D.cs:75:13:75:34 | SSA def(o8) | D.cs:76:34:76:35 | 42 |
-| D.cs:76:21:76:43 | ... ? ... : ... | D.cs:79:9:80:26 | if (...) ... |
-| D.cs:76:34:76:35 | 42 | D.cs:76:21:76:43 | ... ? ... : ... |
-| D.cs:79:9:80:26 | if (...) ... | D.cs:81:9:82:26 | if (...) ... |
-| D.cs:81:9:82:26 | if (...) ... | D.cs:82:13:82:14 | access to local variable o8 |
-| D.cs:81:9:82:26 | if (...) ... | D.cs:82:13:82:26 | ...; |
-| D.cs:81:9:82:26 | if (...) ... | D.cs:83:9:84:26 | if (...) ... |
-| D.cs:82:13:82:26 | ...; | D.cs:83:9:84:26 | if (...) ... |
-| D.cs:83:9:84:26 | if (...) ... | D.cs:84:13:84:14 | access to local variable o8 |
-| D.cs:89:15:89:44 | SSA def(xs) | D.cs:91:13:91:14 | access to local variable xs |
-| D.cs:89:15:89:44 | SSA def(xs) | D.cs:91:13:91:22 | ...; |
-| D.cs:89:15:89:44 | SSA def(xs) | D.cs:93:9:94:30 | if (...) ... |
-| D.cs:91:13:91:22 | ...; | D.cs:93:9:94:30 | if (...) ... |
-| D.cs:93:9:94:30 | if (...) ... | D.cs:94:13:94:30 | ...; |
-| D.cs:93:9:94:30 | if (...) ... | D.cs:94:21:94:22 | access to local variable xs |
-| D.cs:93:9:94:30 | if (...) ... | D.cs:96:9:99:9 | if (...) ... |
-| D.cs:94:13:94:30 | ...; | D.cs:96:9:99:9 | if (...) ... |
-| D.cs:96:9:99:9 | if (...) ... | D.cs:97:9:99:9 | {...} |
-| D.cs:96:9:99:9 | if (...) ... | D.cs:98:21:98:22 | access to local variable xs |
-| D.cs:96:9:99:9 | if (...) ... | D.cs:101:9:102:35 | if (...) ... |
-| D.cs:97:9:99:9 | {...} | D.cs:101:9:102:35 | if (...) ... |
-| D.cs:101:9:102:35 | if (...) ... | D.cs:102:31:102:32 | access to local variable xs |
-| D.cs:101:9:102:35 | if (...) ... | D.cs:102:31:102:32 | access to local variable xs |
-| D.cs:101:9:102:35 | if (...) ... | D.cs:104:9:106:30 | if (...) ... |
-| D.cs:102:13:102:35 | foreach (... ... in ...) ... | D.cs:102:26:102:26 | Int32 _ |
-| D.cs:102:13:102:35 | foreach (... ... in ...) ... | D.cs:104:9:106:30 | if (...) ... |
-| D.cs:102:26:102:26 | Int32 _ | D.cs:102:13:102:35 | foreach (... ... in ...) ... |
-| D.cs:102:31:102:32 | access to local variable xs | D.cs:102:13:102:35 | foreach (... ... in ...) ... |
-| D.cs:104:9:106:30 | if (...) ... | D.cs:105:19:105:20 | access to local variable xs |
-| D.cs:104:9:106:30 | if (...) ... | D.cs:106:17:106:18 | access to local variable xs |
-| D.cs:118:9:118:30 | SSA def(x) | D.cs:120:13:120:13 | access to local variable x |
-| D.cs:125:35:125:35 | SSA param(a) | D.cs:127:32:127:32 | 0 |
-| D.cs:125:35:125:35 | SSA param(a) | D.cs:127:32:127:32 | 0 |
-| D.cs:125:44:125:44 | SSA param(b) | D.cs:127:32:127:32 | 0 |
-| D.cs:125:44:125:44 | SSA param(b) | D.cs:127:36:127:36 | access to parameter a |
-| D.cs:127:20:127:43 | ... ? ... : ... | D.cs:128:32:128:32 | 0 |
-| D.cs:127:20:127:43 | ... ? ... : ... | D.cs:128:32:128:32 | 0 |
-| D.cs:127:20:127:43 | ... ? ... : ... | D.cs:128:36:128:36 | access to parameter b |
-| D.cs:127:32:127:32 | 0 | D.cs:127:20:127:43 | ... ? ... : ... |
-| D.cs:127:32:127:32 | 0 | D.cs:127:20:127:43 | ... ? ... : ... |
-| D.cs:127:36:127:36 | access to parameter a | D.cs:127:20:127:43 | ... ? ... : ... |
-| D.cs:128:20:128:43 | ... ? ... : ... | D.cs:131:9:137:9 | {...} |
-| D.cs:128:20:128:43 | ... ? ... : ... | D.cs:131:9:137:9 | {...} |
-| D.cs:128:20:128:43 | ... ? ... : ... | D.cs:138:9:138:18 | ... ...; |
-| D.cs:128:32:128:32 | 0 | D.cs:128:20:128:43 | ... ? ... : ... |
-| D.cs:128:32:128:32 | 0 | D.cs:128:20:128:43 | ... ? ... : ... |
-| D.cs:128:36:128:36 | access to parameter b | D.cs:128:20:128:43 | ... ? ... : ... |
-| D.cs:131:9:137:9 | {...} | D.cs:132:29:132:29 | access to local variable i |
-| D.cs:131:9:137:9 | {...} | D.cs:132:29:132:29 | access to local variable i |
-| D.cs:132:29:132:29 | access to local variable i | D.cs:133:13:136:13 | {...} |
-| D.cs:132:29:132:29 | access to local variable i | D.cs:133:13:136:13 | {...} |
-| D.cs:132:29:132:29 | access to local variable i | D.cs:134:24:134:24 | access to parameter a |
-| D.cs:132:29:132:29 | access to local variable i | D.cs:135:24:135:24 | access to parameter b |
-| D.cs:132:29:132:29 | access to local variable i | D.cs:138:9:138:18 | ... ...; |
-| D.cs:133:13:136:13 | {...} | D.cs:132:29:132:29 | access to local variable i |
-| D.cs:133:13:136:13 | {...} | D.cs:132:29:132:29 | access to local variable i |
-| D.cs:138:9:138:18 | ... ...; | D.cs:142:13:142:22 | ...; |
-| D.cs:142:13:142:22 | ...; | D.cs:143:9:146:9 | for (...;...;...) ... |
-| D.cs:143:9:146:9 | for (...;...;...) ... | D.cs:143:25:143:25 | access to local variable i |
-| D.cs:143:25:143:25 | access to local variable i | D.cs:144:9:146:9 | {...} |
-| D.cs:143:25:143:25 | access to local variable i | D.cs:145:20:145:20 | access to parameter a |
-| D.cs:144:9:146:9 | {...} | D.cs:143:25:143:25 | access to local variable i |
-| D.cs:149:36:149:38 | SSA param(obj) | D.cs:151:9:151:11 | access to parameter obj |
-| D.cs:163:16:163:25 | SSA def(obj) | D.cs:168:9:170:9 | [exception: Exception] catch (...) {...} |
-| D.cs:168:9:170:9 | [exception: Exception] catch (...) {...} | D.cs:168:26:168:26 | [exception: Exception] Exception e |
-| D.cs:168:26:168:26 | [exception: Exception] Exception e | D.cs:171:9:171:11 | access to local variable obj |
-| D.cs:240:9:240:16 | SSA def(o) | D.cs:241:29:241:32 | null |
-| D.cs:240:9:240:16 | SSA def(o) | D.cs:241:36:241:37 | "" |
-| D.cs:241:21:241:37 | ... ? ... : ... | D.cs:244:9:247:25 | if (...) ... |
-| D.cs:241:29:241:32 | null | D.cs:241:21:241:37 | ... ? ... : ... |
-| D.cs:241:36:241:37 | "" | D.cs:241:21:241:37 | ... ? ... : ... |
-| D.cs:244:9:247:25 | if (...) ... | D.cs:245:13:245:13 | access to local variable o |
-| D.cs:244:9:247:25 | if (...) ... | D.cs:247:13:247:13 | access to local variable o |
-| D.cs:249:13:249:38 | SSA def(o2) | D.cs:253:13:253:14 | access to local variable o2 |
-| D.cs:258:16:258:23 | SSA def(o) | D.cs:266:9:267:25 | if (...) ... |
-| D.cs:266:9:267:25 | if (...) ... | D.cs:266:13:266:27 | [true] ... is ... |
-| D.cs:266:13:266:27 | [true] ... is ... | D.cs:267:13:267:13 | access to local variable o |
-| D.cs:269:9:269:16 | SSA def(o) | D.cs:272:25:272:25 | access to local variable i |
-| D.cs:272:25:272:25 | access to local variable i | D.cs:273:9:288:9 | {...} |
-| D.cs:272:25:272:25 | access to local variable i | D.cs:290:9:291:25 | if (...) ... |
-| D.cs:272:39:272:39 | access to local variable i | D.cs:272:25:272:25 | access to local variable i |
-| D.cs:273:9:288:9 | {...} | D.cs:281:13:287:13 | if (...) ... |
-| D.cs:281:13:287:13 | if (...) ... | D.cs:272:39:272:39 | access to local variable i |
-| D.cs:283:17:283:24 | SSA def(o) | D.cs:285:28:285:30 | {...} |
-| D.cs:283:17:283:24 | SSA def(o) | D.cs:286:17:286:30 | ...; |
-| D.cs:285:28:285:30 | {...} | D.cs:286:17:286:30 | ...; |
-| D.cs:286:17:286:30 | ...; | D.cs:272:39:272:39 | access to local variable i |
-| D.cs:290:9:291:25 | if (...) ... | D.cs:291:13:291:13 | access to local variable o |
-| D.cs:290:9:291:25 | if (...) ... | D.cs:291:13:291:25 | ...; |
-| D.cs:290:9:291:25 | if (...) ... | D.cs:293:9:294:25 | if (...) ... |
-| D.cs:291:13:291:25 | ...; | D.cs:293:9:294:25 | if (...) ... |
-| D.cs:293:9:294:25 | if (...) ... | D.cs:294:13:294:13 | access to local variable o |
-| D.cs:296:16:296:26 | SSA def(prev) | D.cs:297:25:297:25 | access to local variable i |
-| D.cs:297:25:297:25 | access to local variable i | D.cs:298:9:302:9 | {...} |
-| D.cs:298:9:302:9 | {...} | D.cs:300:17:300:20 | access to local variable prev |
-| D.cs:304:16:304:23 | SSA def(s) | D.cs:307:13:311:13 | foreach (... ... in ...) ... |
-| D.cs:307:13:311:13 | foreach (... ... in ...) ... | D.cs:312:13:313:29 | if (...) ... |
-| D.cs:312:13:313:29 | if (...) ... | D.cs:312:17:312:23 | [true] !... |
-| D.cs:312:17:312:23 | [true] !... | D.cs:313:17:313:17 | access to local variable s |
-| D.cs:316:16:316:23 | SSA def(r) | D.cs:318:16:318:19 | access to local variable stat |
-| D.cs:318:16:318:19 | access to local variable stat | D.cs:318:16:318:62 | [false] ... && ... |
-| D.cs:318:16:318:19 | access to local variable stat | D.cs:318:41:318:44 | access to local variable stat |
-| D.cs:318:16:318:62 | [false] ... && ... | D.cs:324:9:324:9 | access to local variable r |
-| D.cs:318:41:318:44 | access to local variable stat | D.cs:318:16:318:62 | [false] ... && ... |
-| D.cs:351:15:351:22 | SSA def(a) | D.cs:355:9:356:21 | for (...;...;...) ... |
-| D.cs:355:9:356:21 | for (...;...;...) ... | D.cs:355:25:355:25 | access to local variable i |
-| D.cs:355:25:355:25 | access to local variable i | D.cs:356:13:356:13 | access to local variable a |
-| D.cs:355:25:355:25 | access to local variable i | D.cs:356:13:356:21 | ...; |
-| D.cs:356:13:356:21 | ...; | D.cs:355:25:355:25 | access to local variable i |
-| D.cs:360:20:360:30 | SSA def(last) | D.cs:361:29:361:29 | access to local variable i |
-| D.cs:361:29:361:29 | access to local variable i | D.cs:363:13:363:16 | access to local variable last |
-| D.cs:366:15:366:47 | SSA def(b) | D.cs:367:13:367:56 | [false] ... && ... |
-| D.cs:367:13:367:56 | [false] ... && ... | D.cs:370:9:373:9 | for (...;...;...) ... |
-| D.cs:370:9:373:9 | for (...;...;...) ... | D.cs:370:25:370:25 | access to local variable i |
-| D.cs:370:25:370:25 | access to local variable i | D.cs:371:9:373:9 | {...} |
-| D.cs:370:25:370:25 | access to local variable i | D.cs:372:13:372:13 | access to local variable b |
-| D.cs:371:9:373:9 | {...} | D.cs:370:25:370:25 | access to local variable i |
-| D.cs:378:19:378:28 | SSA def(ioe) | D.cs:382:9:385:27 | if (...) ... |
-| D.cs:382:9:385:27 | if (...) ... | D.cs:385:13:385:15 | access to local variable ioe |
-| D.cs:388:36:388:36 | SSA param(a) | D.cs:390:32:390:32 | 0 |
-| D.cs:388:45:388:45 | SSA param(b) | D.cs:390:32:390:32 | 0 |
-| D.cs:388:45:388:45 | SSA param(b) | D.cs:390:36:390:36 | access to parameter a |
-| D.cs:390:20:390:43 | ... ? ... : ... | D.cs:393:21:393:21 | access to local variable i |
-| D.cs:390:20:390:43 | ... ? ... : ... | D.cs:393:21:393:21 | access to local variable i |
-| D.cs:390:32:390:32 | 0 | D.cs:390:20:390:43 | ... ? ... : ... |
-| D.cs:390:32:390:32 | 0 | D.cs:390:20:390:43 | ... ? ... : ... |
-| D.cs:390:36:390:36 | access to parameter a | D.cs:390:20:390:43 | ... ? ... : ... |
-| D.cs:393:21:393:21 | access to local variable i | D.cs:394:9:396:9 | {...} |
-| D.cs:393:21:393:21 | access to local variable i | D.cs:394:9:396:9 | {...} |
-| D.cs:393:21:393:21 | access to local variable i | D.cs:395:20:395:20 | access to parameter a |
-| D.cs:393:21:393:21 | access to local variable i | D.cs:397:9:397:44 | ... ...; |
-| D.cs:394:9:396:9 | {...} | D.cs:393:21:393:21 | access to local variable i |
-| D.cs:394:9:396:9 | {...} | D.cs:393:21:393:21 | access to local variable i |
-| D.cs:397:9:397:44 | ... ...; | D.cs:397:32:397:32 | 0 |
-| D.cs:397:20:397:43 | ... ? ... : ... | D.cs:398:21:398:21 | access to local variable i |
-| D.cs:397:32:397:32 | 0 | D.cs:397:20:397:43 | ... ? ... : ... |
-| D.cs:398:21:398:21 | access to local variable i | D.cs:399:9:401:9 | {...} |
-| D.cs:398:21:398:21 | access to local variable i | D.cs:400:20:400:20 | access to parameter b |
-| D.cs:399:9:401:9 | {...} | D.cs:398:21:398:21 | access to local variable i |
-| D.cs:405:35:405:35 | SSA param(x) | D.cs:407:14:407:35 | [false] ... && ... |
-| D.cs:405:35:405:35 | SSA param(x) | D.cs:407:14:407:35 | [false] ... && ... |
-| D.cs:405:35:405:35 | SSA param(x) | D.cs:407:14:407:35 | [false] ... && ... |
-| D.cs:405:45:405:45 | SSA param(y) | D.cs:407:14:407:35 | [false] ... && ... |
-| D.cs:405:45:405:45 | SSA param(y) | D.cs:407:14:407:35 | [false] ... && ... |
-| D.cs:405:45:405:45 | SSA param(y) | D.cs:407:14:407:35 | [false] ... && ... |
-| D.cs:407:13:407:64 | [false] ... \|\| ... | D.cs:409:9:410:25 | if (...) ... |
-| D.cs:407:13:407:64 | [false] ... \|\| ... | D.cs:409:9:410:25 | if (...) ... |
-| D.cs:407:14:407:35 | [false] ... && ... | D.cs:407:42:407:42 | access to parameter x |
-| D.cs:407:14:407:35 | [false] ... && ... | D.cs:407:42:407:42 | access to parameter x |
-| D.cs:407:42:407:42 | access to parameter x | D.cs:407:42:407:63 | [false] ... && ... |
-| D.cs:407:42:407:42 | access to parameter x | D.cs:407:55:407:55 | access to parameter y |
-| D.cs:407:42:407:42 | access to parameter x | D.cs:407:55:407:55 | access to parameter y |
-| D.cs:407:42:407:63 | [false] ... && ... | D.cs:407:13:407:64 | [false] ... \|\| ... |
-| D.cs:407:42:407:63 | [false] ... && ... | D.cs:407:13:407:64 | [false] ... \|\| ... |
-| D.cs:407:55:407:55 | access to parameter y | D.cs:407:42:407:63 | [false] ... && ... |
-| D.cs:407:55:407:55 | access to parameter y | D.cs:407:42:407:63 | [false] ... && ... |
-| D.cs:409:9:410:25 | if (...) ... | D.cs:410:13:410:13 | access to parameter y |
-| D.cs:409:9:410:25 | if (...) ... | D.cs:411:9:412:25 | if (...) ... |
-| D.cs:411:9:412:25 | if (...) ... | D.cs:412:13:412:13 | access to parameter x |
-| E.cs:9:18:9:26 | SSA def(a2) | E.cs:10:22:10:54 | ... && ... |
-| E.cs:10:22:10:54 | ... && ... | E.cs:12:38:12:39 | access to local variable a2 |
-| E.cs:11:16:11:24 | SSA def(a3) | E.cs:12:22:12:52 | ... && ... |
-| E.cs:12:22:12:52 | ... && ... | E.cs:14:13:14:14 | access to local variable a3 |
-| E.cs:23:13:23:30 | SSA def(s1) | E.cs:24:33:24:36 | null |
-| E.cs:24:18:24:41 | ... ? ... : ... | E.cs:26:9:27:26 | if (...) ... |
-| E.cs:24:33:24:36 | null | E.cs:24:18:24:41 | ... ? ... : ... |
-| E.cs:26:9:27:26 | if (...) ... | E.cs:27:13:27:14 | access to local variable s1 |
-| E.cs:51:22:51:33 | SSA def(slice) | E.cs:53:16:53:19 | access to local variable iter |
-| E.cs:53:16:53:19 | access to local variable iter | E.cs:54:9:63:9 | {...} |
-| E.cs:54:9:63:9 | {...} | E.cs:61:13:61:17 | access to local variable slice |
-| E.cs:54:9:63:9 | {...} | E.cs:61:13:61:27 | ...; |
-| E.cs:61:13:61:27 | ...; | E.cs:53:16:53:19 | access to local variable iter |
-| E.cs:66:40:66:42 | SSA param(arr) | E.cs:70:13:70:50 | ...; |
-| E.cs:66:40:66:42 | SSA param(arr) | E.cs:72:9:73:23 | if (...) ... |
-| E.cs:70:13:70:50 | ...; | E.cs:70:36:70:36 | 0 |
-| E.cs:70:22:70:49 | ... ? ... : ... | E.cs:72:9:73:23 | if (...) ... |
-| E.cs:70:36:70:36 | 0 | E.cs:70:22:70:49 | ... ? ... : ... |
-| E.cs:72:9:73:23 | if (...) ... | E.cs:73:13:73:15 | access to parameter arr |
-| E.cs:107:15:107:25 | SSA def(arr2) | E.cs:111:9:112:30 | for (...;...;...) ... |
-| E.cs:111:9:112:30 | for (...;...;...) ... | E.cs:111:25:111:25 | access to local variable i |
-| E.cs:111:25:111:25 | access to local variable i | E.cs:112:13:112:16 | access to local variable arr2 |
-| E.cs:111:25:111:25 | access to local variable i | E.cs:112:13:112:30 | ...; |
-| E.cs:112:13:112:30 | ...; | E.cs:111:25:111:25 | access to local variable i |
-| E.cs:120:16:120:20 | [true] !... | E.cs:121:9:143:9 | {...} |
-| E.cs:120:17:120:20 | access to local variable stop | E.cs:120:16:120:20 | [true] !... |
-| E.cs:121:9:143:9 | {...} | E.cs:123:21:123:24 | access to local variable stop |
-| E.cs:123:20:123:24 | [false] !... | E.cs:123:20:123:35 | [false] ... && ... |
-| E.cs:123:20:123:24 | [true] !... | E.cs:123:29:123:29 | access to local variable j |
-| E.cs:123:20:123:35 | [false] ... && ... | E.cs:120:17:120:20 | access to local variable stop |
-| E.cs:123:20:123:35 | [true] ... && ... | E.cs:124:13:142:13 | {...} |
-| E.cs:123:20:123:35 | [true] ... && ... | E.cs:125:33:125:35 | access to local variable obj |
-| E.cs:123:21:123:24 | access to local variable stop | E.cs:123:20:123:24 | [false] !... |
-| E.cs:123:21:123:24 | access to local variable stop | E.cs:123:20:123:24 | [true] !... |
-| E.cs:123:29:123:29 | access to local variable j | E.cs:123:20:123:35 | [false] ... && ... |
-| E.cs:123:29:123:29 | access to local variable j | E.cs:123:20:123:35 | [true] ... && ... |
-| E.cs:124:13:142:13 | {...} | E.cs:128:21:128:23 | access to local variable obj |
-| E.cs:124:13:142:13 | {...} | E.cs:141:17:141:26 | ...; |
-| E.cs:137:25:137:34 | SSA def(obj) | E.cs:139:21:139:29 | continue; |
-| E.cs:139:21:139:29 | continue; | E.cs:123:21:123:24 | access to local variable stop |
-| E.cs:141:17:141:26 | ...; | E.cs:123:21:123:24 | access to local variable stop |
-| E.cs:152:16:152:26 | SSA def(obj2) | E.cs:153:13:153:54 | [false] ... && ... |
-| E.cs:153:13:153:54 | [false] ... && ... | E.cs:158:9:159:28 | if (...) ... |
-| E.cs:158:9:159:28 | if (...) ... | E.cs:159:13:159:16 | access to local variable obj2 |
-| E.cs:162:28:162:28 | SSA param(a) | E.cs:164:29:164:29 | 0 |
-| E.cs:164:17:164:40 | ... ? ... : ... | E.cs:165:25:165:25 | access to local variable i |
-| E.cs:164:29:164:29 | 0 | E.cs:164:17:164:40 | ... ? ... : ... |
-| E.cs:165:25:165:25 | access to local variable i | E.cs:166:9:170:9 | {...} |
-| E.cs:165:25:165:25 | access to local variable i | E.cs:167:21:167:21 | access to parameter a |
-| E.cs:165:32:165:32 | access to local variable i | E.cs:165:25:165:25 | access to local variable i |
-| E.cs:166:9:170:9 | {...} | E.cs:165:32:165:32 | access to local variable i |
-| E.cs:173:29:173:31 | SSA param(obj) | E.cs:175:33:175:37 | false |
-| E.cs:173:29:173:31 | SSA param(obj) | E.cs:175:33:175:37 | false |
-| E.cs:175:19:175:42 | ... ? ... : ... | E.cs:177:9:179:9 | {...} |
-| E.cs:175:19:175:42 | ... ? ... : ... | E.cs:178:13:178:15 | access to parameter obj |
-| E.cs:175:19:175:42 | ... ? ... : ... | E.cs:180:9:183:9 | if (...) ... |
-| E.cs:175:33:175:37 | false | E.cs:175:19:175:42 | ... ? ... : ... |
-| E.cs:177:9:179:9 | {...} | E.cs:180:9:183:9 | if (...) ... |
-| E.cs:180:9:183:9 | if (...) ... | E.cs:181:9:183:9 | {...} |
-| E.cs:181:9:183:9 | {...} | E.cs:184:9:187:9 | if (...) ... |
-| E.cs:184:9:187:9 | if (...) ... | E.cs:186:13:186:15 | access to parameter obj |
-| E.cs:190:29:190:29 | SSA param(o) | E.cs:192:17:192:17 | access to parameter o |
-| E.cs:198:13:198:29 | [b (line 196): false] SSA def(o) | E.cs:203:13:203:13 | access to local variable o |
-| E.cs:198:13:198:29 | [b (line 196): true] SSA def(o) | E.cs:201:13:201:13 | access to local variable o |
-| E.cs:206:28:206:28 | SSA param(s) | E.cs:208:13:208:23 | [false] ... is ... |
-| E.cs:208:13:208:23 | [false] ... is ... | E.cs:210:16:210:16 | access to parameter s |
-| E.cs:217:13:217:20 | [b (line 213): true] SSA def(x) | E.cs:218:9:218:9 | access to local variable x |
-| E.cs:217:13:217:20 | [b (line 213): true] SSA def(x) | E.cs:220:13:220:13 | access to local variable x |
-| E.cs:227:13:227:20 | [b (line 223): true] SSA def(x) | E.cs:229:13:229:13 | access to local variable x |
-| E.cs:227:13:227:20 | [b (line 223): true] SSA def(x) | E.cs:229:13:229:25 | ...; |
-| E.cs:229:13:229:25 | ...; | E.cs:230:9:230:9 | access to local variable x |
-| E.cs:233:26:233:26 | SSA param(i) | E.cs:235:16:235:16 | access to parameter i |
-| E.cs:238:26:238:26 | SSA param(i) | E.cs:240:21:240:21 | access to parameter i |
-| E.cs:283:13:283:22 | [b (line 279): false] SSA def(o) | E.cs:285:9:285:9 | access to local variable o |
-| E.cs:283:13:283:22 | [b (line 279): true] SSA def(o) | E.cs:285:9:285:9 | access to local variable o |
-| E.cs:301:13:301:27 | SSA def(s) | E.cs:302:9:302:9 | access to local variable s |
-| E.cs:319:29:319:30 | SSA param(s1) | E.cs:321:20:321:21 | access to parameter s2 |
-| E.cs:321:13:321:30 | [true] ... is ... | E.cs:323:13:323:14 | access to parameter s1 |
-| E.cs:321:14:321:21 | ... ?? ... | E.cs:321:13:321:30 | [true] ... is ... |
-| E.cs:321:20:321:21 | access to parameter s2 | E.cs:321:14:321:21 | ... ?? ... |
-| E.cs:330:13:330:36 | SSA def(x) | E.cs:331:9:331:9 | access to local variable x |
-| E.cs:342:13:342:32 | SSA def(x) | E.cs:343:9:343:9 | access to local variable x |
-| E.cs:348:17:348:36 | SSA def(x) | E.cs:349:9:349:9 | access to local variable x |
-| E.cs:366:28:366:28 | SSA param(s) | E.cs:366:41:366:41 | access to parameter s |
-| E.cs:374:17:374:31 | SSA def(s) | E.cs:375:20:375:20 | access to local variable s |
-| E.cs:380:24:380:25 | SSA param(e1) | E.cs:382:28:382:29 | access to parameter e2 |
-| E.cs:380:24:380:25 | SSA param(e1) | E.cs:382:28:382:29 | access to parameter e2 |
-| E.cs:380:24:380:25 | SSA param(e1) | E.cs:382:28:382:29 | access to parameter e2 |
-| E.cs:380:30:380:31 | SSA param(e2) | E.cs:382:14:382:37 | [false] ... && ... |
-| E.cs:380:30:380:31 | SSA param(e2) | E.cs:382:14:382:37 | [false] ... && ... |
-| E.cs:380:30:380:31 | SSA param(e2) | E.cs:382:14:382:37 | [false] ... && ... |
-| E.cs:380:30:380:31 | SSA param(e2) | E.cs:382:28:382:29 | access to parameter e2 |
-| E.cs:380:30:380:31 | SSA param(e2) | E.cs:382:28:382:29 | access to parameter e2 |
-| E.cs:380:30:380:31 | SSA param(e2) | E.cs:382:28:382:29 | access to parameter e2 |
-| E.cs:382:13:382:68 | [false] ... \|\| ... | E.cs:384:9:385:24 | if (...) ... |
-| E.cs:382:13:382:68 | [false] ... \|\| ... | E.cs:384:9:385:24 | if (...) ... |
-| E.cs:382:14:382:37 | [false] ... && ... | E.cs:382:44:382:45 | access to parameter e1 |
-| E.cs:382:14:382:37 | [false] ... && ... | E.cs:382:44:382:45 | access to parameter e1 |
-| E.cs:382:28:382:29 | access to parameter e2 | E.cs:382:14:382:37 | [false] ... && ... |
-| E.cs:382:28:382:29 | access to parameter e2 | E.cs:382:14:382:37 | [false] ... && ... |
-| E.cs:382:44:382:45 | access to parameter e1 | E.cs:382:44:382:67 | [false] ... && ... |
-| E.cs:382:44:382:45 | access to parameter e1 | E.cs:382:44:382:67 | [false] ... && ... |
-| E.cs:382:44:382:67 | [false] ... && ... | E.cs:382:13:382:68 | [false] ... \|\| ... |
-| E.cs:382:44:382:67 | [false] ... && ... | E.cs:382:13:382:68 | [false] ... \|\| ... |
-| E.cs:384:9:385:24 | if (...) ... | E.cs:384:13:384:36 | [false] ... && ... |
-| E.cs:384:9:385:24 | if (...) ... | E.cs:384:27:384:28 | access to parameter e2 |
-| E.cs:384:13:384:36 | [false] ... && ... | E.cs:386:16:386:17 | access to parameter e1 |
-| E.cs:384:13:384:36 | [false] ... && ... | E.cs:386:27:386:28 | access to parameter e2 |
-| E.cs:384:27:384:28 | access to parameter e2 | E.cs:384:13:384:36 | [false] ... && ... |
-| E.cs:404:9:404:18 | SSA def(i) | E.cs:405:16:405:16 | access to local variable i |
-| E.cs:404:9:404:18 | SSA def(i) | E.cs:405:16:405:16 | access to local variable i |
-| E.cs:417:24:417:40 | SSA capture def(i) | E.cs:417:34:417:34 | access to parameter i |
-| E.cs:423:28:423:44 | SSA capture def(i) | E.cs:423:38:423:38 | access to parameter i |
-| E.cs:430:29:430:45 | SSA capture def(i) | E.cs:430:39:430:39 | access to parameter i |
-| E.cs:435:29:435:29 | SSA param(s) | E.cs:437:13:437:21 | [true] ... is ... |
-| E.cs:437:13:437:21 | [true] ... is ... | E.cs:439:13:439:13 | access to parameter s |
-| F.cs:7:16:7:23 | SSA def(o) | F.cs:8:9:8:9 | access to local variable o |
-| Forwarding.cs:7:16:7:23 | SSA def(s) | Forwarding.cs:9:13:9:30 | [false] !... |
-| Forwarding.cs:9:13:9:30 | [false] !... | Forwarding.cs:14:9:17:9 | if (...) ... |
-| Forwarding.cs:14:9:17:9 | if (...) ... | Forwarding.cs:19:9:22:9 | if (...) ... |
-| Forwarding.cs:19:9:22:9 | if (...) ... | Forwarding.cs:19:13:19:23 | [false] !... |
-| Forwarding.cs:19:13:19:23 | [false] !... | Forwarding.cs:24:9:27:9 | if (...) ... |
-| Forwarding.cs:24:9:27:9 | if (...) ... | Forwarding.cs:29:9:32:9 | if (...) ... |
-| Forwarding.cs:29:9:32:9 | if (...) ... | Forwarding.cs:34:9:37:9 | if (...) ... |
-| Forwarding.cs:34:9:37:9 | if (...) ... | Forwarding.cs:35:9:37:9 | {...} |
-| Forwarding.cs:34:9:37:9 | if (...) ... | Forwarding.cs:36:31:36:31 | access to local variable s |
-| Forwarding.cs:35:9:37:9 | {...} | Forwarding.cs:40:27:40:27 | access to local variable s |
-| GuardedString.cs:7:16:7:32 | SSA def(s) | GuardedString.cs:9:13:9:36 | [false] !... |
-| GuardedString.cs:9:13:9:36 | [false] !... | GuardedString.cs:14:9:17:9 | if (...) ... |
-| GuardedString.cs:14:9:17:9 | if (...) ... | GuardedString.cs:14:13:14:41 | [false] !... |
-| GuardedString.cs:14:13:14:41 | [false] !... | GuardedString.cs:19:9:20:40 | if (...) ... |
-| GuardedString.cs:19:9:20:40 | if (...) ... | GuardedString.cs:19:26:19:26 | 0 |
-| GuardedString.cs:19:26:19:26 | 0 | GuardedString.cs:22:9:23:40 | if (...) ... |
-| GuardedString.cs:22:9:23:40 | if (...) ... | GuardedString.cs:22:25:22:25 | 0 |
-| GuardedString.cs:22:25:22:25 | 0 | GuardedString.cs:25:9:26:40 | if (...) ... |
-| GuardedString.cs:25:9:26:40 | if (...) ... | GuardedString.cs:25:26:25:26 | 0 |
-| GuardedString.cs:25:26:25:26 | 0 | GuardedString.cs:28:9:29:40 | if (...) ... |
-| GuardedString.cs:28:9:29:40 | if (...) ... | GuardedString.cs:28:25:28:26 | 10 |
-| GuardedString.cs:28:25:28:26 | 10 | GuardedString.cs:31:9:32:40 | if (...) ... |
-| GuardedString.cs:31:9:32:40 | if (...) ... | GuardedString.cs:31:26:31:27 | 10 |
-| GuardedString.cs:31:26:31:27 | 10 | GuardedString.cs:34:9:37:40 | if (...) ... |
-| GuardedString.cs:34:9:37:40 | if (...) ... | GuardedString.cs:34:26:34:26 | 0 |
-| GuardedString.cs:34:26:34:26 | 0 | GuardedString.cs:35:31:35:31 | access to local variable s |
-| NullAlwaysBad.cs:7:29:7:29 | SSA param(s) | NullAlwaysBad.cs:9:30:9:30 | access to parameter s |
-| NullMaybeBad.cs:13:17:13:20 | null | NullMaybeBad.cs:7:27:7:27 | access to parameter o |
-| Params.cs:20:12:20:15 | null | Params.cs:14:17:14:20 | access to parameter args |
-| StringConcatenation.cs:14:16:14:23 | SSA def(s) | StringConcatenation.cs:15:16:15:16 | access to local variable s |
-| StringConcatenation.cs:15:16:15:16 | access to local variable s | StringConcatenation.cs:16:17:16:17 | access to local variable s |
-nodes
-| A.cs:7:16:7:40 | SSA def(synchronizedAlways) |
-| A.cs:8:15:8:32 | access to local variable synchronizedAlways |
-| A.cs:10:13:10:30 | access to local variable synchronizedAlways |
-| A.cs:16:15:16:30 | SSA def(arrayNull) |
-| A.cs:17:9:17:17 | access to local variable arrayNull |
-| A.cs:26:15:26:32 | SSA def(arrayAccess) |
-| A.cs:27:18:27:35 | SSA def(fieldAccess) |
-| A.cs:28:16:28:34 | SSA def(methodAccess) |
-| A.cs:29:16:29:32 | SSA def(methodCall) |
-| A.cs:31:27:31:37 | access to local variable arrayAccess |
-| A.cs:32:27:32:37 | access to local variable fieldAccess |
-| A.cs:33:28:33:39 | access to local variable methodAccess |
-| A.cs:34:27:34:36 | access to local variable methodCall |
-| A.cs:36:27:36:37 | access to local variable arrayAccess |
-| A.cs:37:27:37:37 | access to local variable fieldAccess |
-| A.cs:38:15:38:26 | access to local variable methodAccess |
-| A.cs:39:27:39:36 | access to local variable methodCall |
-| A.cs:48:16:48:28 | SSA def(varRef) |
-| A.cs:50:9:50:14 | access to local variable varRef |
-| Assert.cs:13:9:13:25 | [b (line 7): false] SSA def(s) |
-| Assert.cs:13:9:13:25 | [b (line 7): true] SSA def(s) |
-| Assert.cs:15:27:15:27 | access to local variable s |
-| Assert.cs:15:27:15:27 | access to local variable s |
-| Assert.cs:21:9:21:25 | [b (line 7): false] SSA def(s) |
-| Assert.cs:21:9:21:25 | [b (line 7): true] SSA def(s) |
-| Assert.cs:23:27:23:27 | access to local variable s |
-| Assert.cs:23:27:23:27 | access to local variable s |
-| Assert.cs:29:9:29:25 | [b (line 7): false] SSA def(s) |
-| Assert.cs:29:9:29:25 | [b (line 7): true] SSA def(s) |
-| Assert.cs:31:27:31:27 | access to local variable s |
-| Assert.cs:31:27:31:27 | access to local variable s |
-| Assert.cs:45:9:45:25 | [b (line 7): true] SSA def(s) |
-| Assert.cs:46:23:46:36 | [true, b (line 7): true] ... && ... |
-| Assert.cs:46:36:46:36 | [b (line 7): true] access to parameter b |
-| Assert.cs:47:27:47:27 | access to local variable s |
-| Assert.cs:49:9:49:25 | [b (line 7): true] SSA def(s) |
-| Assert.cs:50:24:50:38 | [false] ... \|\| ... |
-| Assert.cs:50:37:50:38 | [false] !... |
-| Assert.cs:50:38:50:38 | [b (line 7): true] access to parameter b |
-| Assert.cs:51:27:51:27 | access to local variable s |
-| B.cs:7:11:7:29 | SSA def(eqCallAlways) |
-| B.cs:10:11:10:30 | SSA def(neqCallAlways) |
-| B.cs:13:13:13:24 | access to local variable eqCallAlways |
-| B.cs:13:13:13:36 | ...; |
-| B.cs:15:9:16:26 | if (...) ... |
-| B.cs:16:13:16:26 | ...; |
-| B.cs:18:9:20:26 | if (...) ... |
-| B.cs:18:25:18:27 | {...} |
-| B.cs:20:13:20:26 | ...; |
-| B.cs:22:9:24:37 | if (...) ... |
-| B.cs:24:13:24:25 | access to local variable neqCallAlways |
-| C.cs:10:16:10:23 | SSA def(o) |
-| C.cs:11:13:11:30 | [false] !... |
-| C.cs:11:15:11:29 | [true] !... |
-| C.cs:11:17:11:28 | [false] !... |
-| C.cs:16:9:19:9 | if (...) ... |
-| C.cs:16:13:16:24 | [true] !... |
-| C.cs:18:13:18:13 | access to local variable o |
-| C.cs:40:13:40:35 | SSA def(s) |
-| C.cs:42:9:42:9 | access to local variable s |
-| C.cs:55:13:55:36 | SSA def(o2) |
-| C.cs:57:9:57:10 | access to local variable o2 |
-| C.cs:62:13:62:46 | SSA def(o1) |
-| C.cs:64:9:64:10 | access to local variable o1 |
-| C.cs:66:13:66:46 | SSA def(o2) |
-| C.cs:68:9:68:10 | access to local variable o2 |
-| C.cs:94:13:94:45 | SSA def(o) |
-| C.cs:95:15:95:15 | access to local variable o |
-| C.cs:96:13:96:13 | access to local variable o |
-| C.cs:102:13:102:23 | SSA def(list) |
-| C.cs:103:9:107:9 | foreach (... ... in ...) ... |
-| C.cs:103:22:103:22 | Int32 x |
-| C.cs:103:27:103:30 | access to parameter list |
-| C.cs:103:27:103:30 | access to parameter list |
-| C.cs:106:13:106:16 | access to parameter list |
-| C.cs:159:9:159:16 | SSA def(s) |
-| C.cs:162:13:162:13 | access to local variable s |
-| C.cs:167:9:167:16 | SSA def(s) |
-| C.cs:170:13:170:13 | access to local variable s |
-| C.cs:177:13:177:13 | access to local variable s |
-| C.cs:178:13:178:20 | SSA def(s) |
-| C.cs:193:9:193:16 | SSA def(s) |
-| C.cs:196:13:196:13 | access to local variable s |
-| C.cs:197:13:197:20 | [b (line 192): true] SSA def(s) |
-| C.cs:201:16:201:19 | true |
-| C.cs:203:13:203:13 | access to local variable s |
-| C.cs:204:13:204:20 | SSA def(s) |
-| C.cs:210:13:210:35 | SSA def(s) |
-| C.cs:214:13:214:20 | SSA def(s) |
-| C.cs:217:9:218:25 | if (...) ... |
-| C.cs:218:13:218:13 | access to local variable s |
-| C.cs:222:13:222:20 | SSA def(s) |
-| C.cs:223:9:223:9 | access to local variable s |
-| C.cs:229:22:229:22 | access to local variable s |
-| C.cs:229:33:229:40 | SSA def(s) |
-| C.cs:233:9:233:9 | access to local variable s |
-| C.cs:235:14:235:21 | SSA def(s) |
-| C.cs:235:24:235:24 | access to local variable s |
-| C.cs:235:35:235:42 | SSA def(s) |
-| C.cs:237:13:237:13 | access to local variable s |
-| C.cs:240:24:240:31 | SSA def(s) |
-| C.cs:242:13:242:13 | access to local variable s |
-| C.cs:248:15:248:22 | SSA def(a) |
-| C.cs:249:9:249:9 | access to local variable a |
-| C.cs:257:15:257:23 | SSA def(ia) |
-| C.cs:258:18:258:26 | SSA def(sa) |
-| C.cs:260:9:260:10 | access to local variable ia |
-| C.cs:261:20:261:21 | access to local variable sa |
-| C.cs:263:9:263:10 | access to local variable ia |
-| C.cs:264:16:264:17 | access to local variable sa |
-| D.cs:17:17:17:20 | null |
-| D.cs:23:9:23:13 | access to parameter param |
-| D.cs:26:32:26:36 | SSA param(param) |
-| D.cs:32:9:32:13 | access to parameter param |
-| D.cs:58:13:58:41 | SSA def(o5) |
-| D.cs:61:9:62:26 | if (...) ... |
-| D.cs:62:13:62:14 | access to local variable o5 |
-| D.cs:68:13:68:34 | SSA def(o7) |
-| D.cs:69:18:69:36 | ... && ... |
-| D.cs:73:13:73:14 | access to local variable o7 |
-| D.cs:75:13:75:34 | SSA def(o8) |
-| D.cs:76:21:76:43 | ... ? ... : ... |
-| D.cs:76:34:76:35 | 42 |
-| D.cs:79:9:80:26 | if (...) ... |
-| D.cs:81:9:82:26 | if (...) ... |
-| D.cs:82:13:82:14 | access to local variable o8 |
-| D.cs:82:13:82:26 | ...; |
-| D.cs:83:9:84:26 | if (...) ... |
-| D.cs:84:13:84:14 | access to local variable o8 |
-| D.cs:89:15:89:44 | SSA def(xs) |
-| D.cs:91:13:91:14 | access to local variable xs |
-| D.cs:91:13:91:22 | ...; |
-| D.cs:93:9:94:30 | if (...) ... |
-| D.cs:94:13:94:30 | ...; |
-| D.cs:94:21:94:22 | access to local variable xs |
-| D.cs:96:9:99:9 | if (...) ... |
-| D.cs:97:9:99:9 | {...} |
-| D.cs:98:21:98:22 | access to local variable xs |
-| D.cs:101:9:102:35 | if (...) ... |
-| D.cs:102:13:102:35 | foreach (... ... in ...) ... |
-| D.cs:102:26:102:26 | Int32 _ |
-| D.cs:102:31:102:32 | access to local variable xs |
-| D.cs:102:31:102:32 | access to local variable xs |
-| D.cs:104:9:106:30 | if (...) ... |
-| D.cs:105:19:105:20 | access to local variable xs |
-| D.cs:106:17:106:18 | access to local variable xs |
-| D.cs:118:9:118:30 | SSA def(x) |
-| D.cs:120:13:120:13 | access to local variable x |
-| D.cs:125:35:125:35 | SSA param(a) |
-| D.cs:125:35:125:35 | SSA param(a) |
-| D.cs:125:44:125:44 | SSA param(b) |
-| D.cs:127:20:127:43 | ... ? ... : ... |
-| D.cs:127:20:127:43 | ... ? ... : ... |
-| D.cs:127:32:127:32 | 0 |
-| D.cs:127:32:127:32 | 0 |
-| D.cs:127:36:127:36 | access to parameter a |
-| D.cs:128:20:128:43 | ... ? ... : ... |
-| D.cs:128:20:128:43 | ... ? ... : ... |
-| D.cs:128:32:128:32 | 0 |
-| D.cs:128:32:128:32 | 0 |
-| D.cs:128:36:128:36 | access to parameter b |
-| D.cs:131:9:137:9 | {...} |
-| D.cs:131:9:137:9 | {...} |
-| D.cs:132:29:132:29 | access to local variable i |
-| D.cs:132:29:132:29 | access to local variable i |
-| D.cs:133:13:136:13 | {...} |
-| D.cs:133:13:136:13 | {...} |
-| D.cs:134:24:134:24 | access to parameter a |
-| D.cs:135:24:135:24 | access to parameter b |
-| D.cs:138:9:138:18 | ... ...; |
-| D.cs:142:13:142:22 | ...; |
-| D.cs:143:9:146:9 | for (...;...;...) ... |
-| D.cs:143:25:143:25 | access to local variable i |
-| D.cs:144:9:146:9 | {...} |
-| D.cs:145:20:145:20 | access to parameter a |
-| D.cs:149:36:149:38 | SSA param(obj) |
-| D.cs:151:9:151:11 | access to parameter obj |
-| D.cs:163:16:163:25 | SSA def(obj) |
-| D.cs:168:9:170:9 | [exception: Exception] catch (...) {...} |
-| D.cs:168:26:168:26 | [exception: Exception] Exception e |
-| D.cs:171:9:171:11 | access to local variable obj |
-| D.cs:240:9:240:16 | SSA def(o) |
-| D.cs:241:21:241:37 | ... ? ... : ... |
-| D.cs:241:29:241:32 | null |
-| D.cs:241:36:241:37 | "" |
-| D.cs:244:9:247:25 | if (...) ... |
-| D.cs:245:13:245:13 | access to local variable o |
-| D.cs:247:13:247:13 | access to local variable o |
-| D.cs:249:13:249:38 | SSA def(o2) |
-| D.cs:253:13:253:14 | access to local variable o2 |
-| D.cs:258:16:258:23 | SSA def(o) |
-| D.cs:266:9:267:25 | if (...) ... |
-| D.cs:266:13:266:27 | [true] ... is ... |
-| D.cs:267:13:267:13 | access to local variable o |
-| D.cs:269:9:269:16 | SSA def(o) |
-| D.cs:272:25:272:25 | access to local variable i |
-| D.cs:272:39:272:39 | access to local variable i |
-| D.cs:273:9:288:9 | {...} |
-| D.cs:281:13:287:13 | if (...) ... |
-| D.cs:283:17:283:24 | SSA def(o) |
-| D.cs:285:28:285:30 | {...} |
-| D.cs:286:17:286:30 | ...; |
-| D.cs:290:9:291:25 | if (...) ... |
-| D.cs:291:13:291:13 | access to local variable o |
-| D.cs:291:13:291:25 | ...; |
-| D.cs:293:9:294:25 | if (...) ... |
-| D.cs:294:13:294:13 | access to local variable o |
-| D.cs:296:16:296:26 | SSA def(prev) |
-| D.cs:297:25:297:25 | access to local variable i |
-| D.cs:298:9:302:9 | {...} |
-| D.cs:300:17:300:20 | access to local variable prev |
-| D.cs:304:16:304:23 | SSA def(s) |
-| D.cs:307:13:311:13 | foreach (... ... in ...) ... |
-| D.cs:312:13:313:29 | if (...) ... |
-| D.cs:312:17:312:23 | [true] !... |
-| D.cs:313:17:313:17 | access to local variable s |
-| D.cs:316:16:316:23 | SSA def(r) |
-| D.cs:318:16:318:19 | access to local variable stat |
-| D.cs:318:16:318:62 | [false] ... && ... |
-| D.cs:318:41:318:44 | access to local variable stat |
-| D.cs:324:9:324:9 | access to local variable r |
-| D.cs:351:15:351:22 | SSA def(a) |
-| D.cs:355:9:356:21 | for (...;...;...) ... |
-| D.cs:355:25:355:25 | access to local variable i |
-| D.cs:356:13:356:13 | access to local variable a |
-| D.cs:356:13:356:21 | ...; |
-| D.cs:360:20:360:30 | SSA def(last) |
-| D.cs:361:29:361:29 | access to local variable i |
-| D.cs:363:13:363:16 | access to local variable last |
-| D.cs:366:15:366:47 | SSA def(b) |
-| D.cs:367:13:367:56 | [false] ... && ... |
-| D.cs:370:9:373:9 | for (...;...;...) ... |
-| D.cs:370:25:370:25 | access to local variable i |
-| D.cs:371:9:373:9 | {...} |
-| D.cs:372:13:372:13 | access to local variable b |
-| D.cs:378:19:378:28 | SSA def(ioe) |
-| D.cs:382:9:385:27 | if (...) ... |
-| D.cs:385:13:385:15 | access to local variable ioe |
-| D.cs:388:36:388:36 | SSA param(a) |
-| D.cs:388:45:388:45 | SSA param(b) |
-| D.cs:390:20:390:43 | ... ? ... : ... |
-| D.cs:390:20:390:43 | ... ? ... : ... |
-| D.cs:390:32:390:32 | 0 |
-| D.cs:390:32:390:32 | 0 |
-| D.cs:390:36:390:36 | access to parameter a |
-| D.cs:393:21:393:21 | access to local variable i |
-| D.cs:393:21:393:21 | access to local variable i |
-| D.cs:394:9:396:9 | {...} |
-| D.cs:394:9:396:9 | {...} |
-| D.cs:395:20:395:20 | access to parameter a |
-| D.cs:397:9:397:44 | ... ...; |
-| D.cs:397:20:397:43 | ... ? ... : ... |
-| D.cs:397:32:397:32 | 0 |
-| D.cs:398:21:398:21 | access to local variable i |
-| D.cs:399:9:401:9 | {...} |
-| D.cs:400:20:400:20 | access to parameter b |
-| D.cs:405:35:405:35 | SSA param(x) |
-| D.cs:405:35:405:35 | SSA param(x) |
-| D.cs:405:35:405:35 | SSA param(x) |
-| D.cs:405:45:405:45 | SSA param(y) |
-| D.cs:405:45:405:45 | SSA param(y) |
-| D.cs:405:45:405:45 | SSA param(y) |
-| D.cs:407:13:407:64 | [false] ... \|\| ... |
-| D.cs:407:13:407:64 | [false] ... \|\| ... |
-| D.cs:407:14:407:35 | [false] ... && ... |
-| D.cs:407:14:407:35 | [false] ... && ... |
-| D.cs:407:42:407:42 | access to parameter x |
-| D.cs:407:42:407:42 | access to parameter x |
-| D.cs:407:42:407:63 | [false] ... && ... |
-| D.cs:407:42:407:63 | [false] ... && ... |
-| D.cs:407:55:407:55 | access to parameter y |
-| D.cs:407:55:407:55 | access to parameter y |
-| D.cs:409:9:410:25 | if (...) ... |
-| D.cs:409:9:410:25 | if (...) ... |
-| D.cs:410:13:410:13 | access to parameter y |
-| D.cs:411:9:412:25 | if (...) ... |
-| D.cs:412:13:412:13 | access to parameter x |
-| E.cs:9:18:9:26 | SSA def(a2) |
-| E.cs:10:22:10:54 | ... && ... |
-| E.cs:11:16:11:24 | SSA def(a3) |
-| E.cs:12:22:12:52 | ... && ... |
-| E.cs:12:38:12:39 | access to local variable a2 |
-| E.cs:14:13:14:14 | access to local variable a3 |
-| E.cs:23:13:23:30 | SSA def(s1) |
-| E.cs:24:18:24:41 | ... ? ... : ... |
-| E.cs:24:33:24:36 | null |
-| E.cs:26:9:27:26 | if (...) ... |
-| E.cs:27:13:27:14 | access to local variable s1 |
-| E.cs:51:22:51:33 | SSA def(slice) |
-| E.cs:53:16:53:19 | access to local variable iter |
-| E.cs:54:9:63:9 | {...} |
-| E.cs:61:13:61:17 | access to local variable slice |
-| E.cs:61:13:61:27 | ...; |
-| E.cs:66:40:66:42 | SSA param(arr) |
-| E.cs:70:13:70:50 | ...; |
-| E.cs:70:22:70:49 | ... ? ... : ... |
-| E.cs:70:36:70:36 | 0 |
-| E.cs:72:9:73:23 | if (...) ... |
-| E.cs:73:13:73:15 | access to parameter arr |
-| E.cs:107:15:107:25 | SSA def(arr2) |
-| E.cs:111:9:112:30 | for (...;...;...) ... |
-| E.cs:111:25:111:25 | access to local variable i |
-| E.cs:112:13:112:16 | access to local variable arr2 |
-| E.cs:112:13:112:30 | ...; |
-| E.cs:120:16:120:20 | [true] !... |
-| E.cs:120:17:120:20 | access to local variable stop |
-| E.cs:121:9:143:9 | {...} |
-| E.cs:123:20:123:24 | [false] !... |
-| E.cs:123:20:123:24 | [true] !... |
-| E.cs:123:20:123:35 | [false] ... && ... |
-| E.cs:123:20:123:35 | [true] ... && ... |
-| E.cs:123:21:123:24 | access to local variable stop |
-| E.cs:123:29:123:29 | access to local variable j |
-| E.cs:124:13:142:13 | {...} |
-| E.cs:125:33:125:35 | access to local variable obj |
-| E.cs:128:21:128:23 | access to local variable obj |
-| E.cs:137:25:137:34 | SSA def(obj) |
-| E.cs:139:21:139:29 | continue; |
-| E.cs:141:17:141:26 | ...; |
-| E.cs:152:16:152:26 | SSA def(obj2) |
-| E.cs:153:13:153:54 | [false] ... && ... |
-| E.cs:158:9:159:28 | if (...) ... |
-| E.cs:159:13:159:16 | access to local variable obj2 |
-| E.cs:162:28:162:28 | SSA param(a) |
-| E.cs:164:17:164:40 | ... ? ... : ... |
-| E.cs:164:29:164:29 | 0 |
-| E.cs:165:25:165:25 | access to local variable i |
-| E.cs:165:32:165:32 | access to local variable i |
-| E.cs:166:9:170:9 | {...} |
-| E.cs:167:21:167:21 | access to parameter a |
-| E.cs:173:29:173:31 | SSA param(obj) |
-| E.cs:173:29:173:31 | SSA param(obj) |
-| E.cs:175:19:175:42 | ... ? ... : ... |
-| E.cs:175:33:175:37 | false |
-| E.cs:177:9:179:9 | {...} |
-| E.cs:178:13:178:15 | access to parameter obj |
-| E.cs:180:9:183:9 | if (...) ... |
-| E.cs:181:9:183:9 | {...} |
-| E.cs:184:9:187:9 | if (...) ... |
-| E.cs:186:13:186:15 | access to parameter obj |
-| E.cs:190:29:190:29 | SSA param(o) |
-| E.cs:192:17:192:17 | access to parameter o |
-| E.cs:198:13:198:29 | [b (line 196): false] SSA def(o) |
-| E.cs:198:13:198:29 | [b (line 196): true] SSA def(o) |
-| E.cs:201:13:201:13 | access to local variable o |
-| E.cs:203:13:203:13 | access to local variable o |
-| E.cs:206:28:206:28 | SSA param(s) |
-| E.cs:208:13:208:23 | [false] ... is ... |
-| E.cs:210:16:210:16 | access to parameter s |
-| E.cs:217:13:217:20 | [b (line 213): true] SSA def(x) |
-| E.cs:218:9:218:9 | access to local variable x |
-| E.cs:220:13:220:13 | access to local variable x |
-| E.cs:227:13:227:20 | [b (line 223): true] SSA def(x) |
-| E.cs:229:13:229:13 | access to local variable x |
-| E.cs:229:13:229:25 | ...; |
-| E.cs:230:9:230:9 | access to local variable x |
-| E.cs:233:26:233:26 | SSA param(i) |
-| E.cs:235:16:235:16 | access to parameter i |
-| E.cs:238:26:238:26 | SSA param(i) |
-| E.cs:240:21:240:21 | access to parameter i |
-| E.cs:283:13:283:22 | [b (line 279): false] SSA def(o) |
-| E.cs:283:13:283:22 | [b (line 279): true] SSA def(o) |
-| E.cs:285:9:285:9 | access to local variable o |
-| E.cs:285:9:285:9 | access to local variable o |
-| E.cs:301:13:301:27 | SSA def(s) |
-| E.cs:302:9:302:9 | access to local variable s |
-| E.cs:319:29:319:30 | SSA param(s1) |
-| E.cs:321:13:321:30 | [true] ... is ... |
-| E.cs:321:14:321:21 | ... ?? ... |
-| E.cs:321:20:321:21 | access to parameter s2 |
-| E.cs:323:13:323:14 | access to parameter s1 |
-| E.cs:330:13:330:36 | SSA def(x) |
-| E.cs:331:9:331:9 | access to local variable x |
-| E.cs:342:13:342:32 | SSA def(x) |
-| E.cs:343:9:343:9 | access to local variable x |
-| E.cs:348:17:348:36 | SSA def(x) |
-| E.cs:349:9:349:9 | access to local variable x |
-| E.cs:366:28:366:28 | SSA param(s) |
-| E.cs:366:41:366:41 | access to parameter s |
-| E.cs:374:17:374:31 | SSA def(s) |
-| E.cs:375:20:375:20 | access to local variable s |
-| E.cs:380:24:380:25 | SSA param(e1) |
-| E.cs:380:24:380:25 | SSA param(e1) |
-| E.cs:380:24:380:25 | SSA param(e1) |
-| E.cs:380:30:380:31 | SSA param(e2) |
-| E.cs:380:30:380:31 | SSA param(e2) |
-| E.cs:380:30:380:31 | SSA param(e2) |
-| E.cs:382:13:382:68 | [false] ... \|\| ... |
-| E.cs:382:13:382:68 | [false] ... \|\| ... |
-| E.cs:382:14:382:37 | [false] ... && ... |
-| E.cs:382:14:382:37 | [false] ... && ... |
-| E.cs:382:28:382:29 | access to parameter e2 |
-| E.cs:382:28:382:29 | access to parameter e2 |
-| E.cs:382:44:382:45 | access to parameter e1 |
-| E.cs:382:44:382:45 | access to parameter e1 |
-| E.cs:382:44:382:67 | [false] ... && ... |
-| E.cs:382:44:382:67 | [false] ... && ... |
-| E.cs:384:9:385:24 | if (...) ... |
-| E.cs:384:9:385:24 | if (...) ... |
-| E.cs:384:13:384:36 | [false] ... && ... |
-| E.cs:384:13:384:36 | [false] ... && ... |
-| E.cs:384:27:384:28 | access to parameter e2 |
-| E.cs:386:16:386:17 | access to parameter e1 |
-| E.cs:386:27:386:28 | access to parameter e2 |
-| E.cs:404:9:404:18 | SSA def(i) |
-| E.cs:404:9:404:18 | SSA def(i) |
-| E.cs:405:16:405:16 | access to local variable i |
-| E.cs:417:24:417:40 | SSA capture def(i) |
-| E.cs:417:34:417:34 | access to parameter i |
-| E.cs:423:28:423:44 | SSA capture def(i) |
-| E.cs:423:38:423:38 | access to parameter i |
-| E.cs:430:29:430:45 | SSA capture def(i) |
-| E.cs:430:39:430:39 | access to parameter i |
-| E.cs:435:29:435:29 | SSA param(s) |
-| E.cs:437:13:437:21 | [true] ... is ... |
-| E.cs:439:13:439:13 | access to parameter s |
-| F.cs:7:16:7:23 | SSA def(o) |
-| F.cs:8:9:8:9 | access to local variable o |
-| Forwarding.cs:7:16:7:23 | SSA def(s) |
-| Forwarding.cs:9:13:9:30 | [false] !... |
-| Forwarding.cs:14:9:17:9 | if (...) ... |
-| Forwarding.cs:19:9:22:9 | if (...) ... |
-| Forwarding.cs:19:13:19:23 | [false] !... |
-| Forwarding.cs:24:9:27:9 | if (...) ... |
-| Forwarding.cs:29:9:32:9 | if (...) ... |
-| Forwarding.cs:34:9:37:9 | if (...) ... |
-| Forwarding.cs:35:9:37:9 | {...} |
-| Forwarding.cs:36:31:36:31 | access to local variable s |
-| Forwarding.cs:40:27:40:27 | access to local variable s |
-| GuardedString.cs:7:16:7:32 | SSA def(s) |
-| GuardedString.cs:9:13:9:36 | [false] !... |
-| GuardedString.cs:14:9:17:9 | if (...) ... |
-| GuardedString.cs:14:13:14:41 | [false] !... |
-| GuardedString.cs:19:9:20:40 | if (...) ... |
-| GuardedString.cs:19:26:19:26 | 0 |
-| GuardedString.cs:22:9:23:40 | if (...) ... |
-| GuardedString.cs:22:25:22:25 | 0 |
-| GuardedString.cs:25:9:26:40 | if (...) ... |
-| GuardedString.cs:25:26:25:26 | 0 |
-| GuardedString.cs:28:9:29:40 | if (...) ... |
-| GuardedString.cs:28:25:28:26 | 10 |
-| GuardedString.cs:31:9:32:40 | if (...) ... |
-| GuardedString.cs:31:26:31:27 | 10 |
-| GuardedString.cs:34:9:37:40 | if (...) ... |
-| GuardedString.cs:34:26:34:26 | 0 |
-| GuardedString.cs:35:31:35:31 | access to local variable s |
-| NullAlwaysBad.cs:7:29:7:29 | SSA param(s) |
-| NullAlwaysBad.cs:9:30:9:30 | access to parameter s |
-| NullMaybeBad.cs:7:27:7:27 | access to parameter o |
-| NullMaybeBad.cs:13:17:13:20 | null |
-| Params.cs:14:17:14:20 | access to parameter args |
-| Params.cs:20:12:20:15 | null |
-| StringConcatenation.cs:14:16:14:23 | SSA def(s) |
-| StringConcatenation.cs:15:16:15:16 | access to local variable s |
-| StringConcatenation.cs:16:17:16:17 | access to local variable s |
+| C.cs:64:9:64:10 | access to local variable o1 | Variable $@ may be null at this access because of $@ assignment. | C.cs:62:13:62:14 | o1 | o1 | C.cs:62:13:62:46 | Object o1 = ... | this |
+| C.cs:68:9:68:10 | access to local variable o2 | Variable $@ may be null at this access because of $@ assignment. | C.cs:66:13:66:14 | o2 | o2 | C.cs:66:13:66:46 | Object o2 = ... | this |
+| C.cs:95:15:95:15 | access to local variable o | Variable $@ may be null at this access because of $@ assignment. | C.cs:94:13:94:13 | o | o | C.cs:94:13:94:45 | Object o = ... | this |
+| C.cs:103:27:103:30 | access to parameter list | Variable $@ may be null at this access because of $@ assignment. | C.cs:99:42:99:45 | list | list | C.cs:102:13:102:23 | ... = ... | this |
+| C.cs:177:13:177:13 | access to local variable s | Variable $@ may be null at this access because of $@ assignment. | C.cs:151:13:151:13 | s | s | C.cs:178:13:178:20 | ... = ... | this |
+| C.cs:203:13:203:13 | access to local variable s | Variable $@ may be null at this access because of $@ assignment. | C.cs:185:13:185:13 | s | s | C.cs:204:13:204:20 | ... = ... | this |
+| C.cs:223:9:223:9 | access to local variable s | Variable $@ may be null at this access because of $@ assignment. | C.cs:210:13:210:13 | s | s | C.cs:222:13:222:20 | ... = ... | this |
+| C.cs:242:13:242:13 | access to local variable s | Variable $@ may be null at this access because of $@ assignment. | C.cs:228:16:228:16 | s | s | C.cs:240:24:240:31 | ... = ... | this |
+| D.cs:23:9:23:13 | access to parameter param | Variable $@ may be null at this access because of $@ null argument. | D.cs:21:32:21:36 | param | param | D.cs:17:17:17:20 | null | this |
+| D.cs:32:9:32:13 | access to parameter param | Variable $@ may be null at this access as suggested by $@ null check. | D.cs:26:32:26:36 | param | param | D.cs:28:13:28:25 | ... != ... | this |
+| D.cs:73:13:73:14 | access to local variable o7 | Variable $@ may be null at this access because of $@ assignment. | D.cs:68:13:68:14 | o7 | o7 | D.cs:68:13:68:34 | String o7 = ... | this |
+| D.cs:82:13:82:14 | access to local variable o8 | Variable $@ may be null at this access because of $@ assignment. | D.cs:75:13:75:14 | o8 | o8 | D.cs:75:13:75:34 | String o8 = ... | this |
+| D.cs:84:13:84:14 | access to local variable o8 | Variable $@ may be null at this access because of $@ assignment. | D.cs:75:13:75:14 | o8 | o8 | D.cs:75:13:75:34 | String o8 = ... | this |
+| D.cs:91:13:91:14 | access to local variable xs | Variable $@ may be null at this access because of $@ assignment. | D.cs:89:15:89:16 | xs | xs | D.cs:89:15:89:44 | Int32[] xs = ... | this |
+| D.cs:94:21:94:22 | access to local variable xs | Variable $@ may be null at this access because of $@ assignment. | D.cs:89:15:89:16 | xs | xs | D.cs:89:15:89:44 | Int32[] xs = ... | this |
+| D.cs:98:21:98:22 | access to local variable xs | Variable $@ may be null at this access because of $@ assignment. | D.cs:89:15:89:16 | xs | xs | D.cs:89:15:89:44 | Int32[] xs = ... | this |
+| D.cs:102:31:102:32 | access to local variable xs | Variable $@ may be null at this access because of $@ assignment. | D.cs:89:15:89:16 | xs | xs | D.cs:89:15:89:44 | Int32[] xs = ... | this |
+| D.cs:105:19:105:20 | access to local variable xs | Variable $@ may be null at this access because of $@ assignment. | D.cs:89:15:89:16 | xs | xs | D.cs:89:15:89:44 | Int32[] xs = ... | this |
+| D.cs:134:24:134:24 | access to parameter a | Variable $@ may be null at this access as suggested by $@ null check. | D.cs:125:35:125:35 | a | a | D.cs:127:20:127:28 | ... == ... | this |
+| D.cs:134:24:134:24 | access to parameter a | Variable $@ may be null at this access as suggested by $@ null check. | D.cs:125:35:125:35 | a | a | D.cs:139:13:139:21 | ... != ... | this |
+| D.cs:135:24:135:24 | access to parameter b | Variable $@ may be null at this access as suggested by $@ null check. | D.cs:125:44:125:44 | b | b | D.cs:128:20:128:28 | ... == ... | this |
+| D.cs:145:20:145:20 | access to parameter a | Variable $@ may be null at this access as suggested by $@ null check. | D.cs:125:35:125:35 | a | a | D.cs:127:20:127:28 | ... == ... | this |
+| D.cs:145:20:145:20 | access to parameter a | Variable $@ may be null at this access as suggested by $@ null check. | D.cs:125:35:125:35 | a | a | D.cs:139:13:139:21 | ... != ... | this |
+| D.cs:151:9:151:11 | access to parameter obj | Variable $@ may be null at this access as suggested by $@ null check. | D.cs:149:36:149:38 | obj | obj | D.cs:152:17:152:27 | ... != ... | this |
+| D.cs:171:9:171:11 | access to local variable obj | Variable $@ may be null at this access because of $@ assignment. | D.cs:163:16:163:18 | obj | obj | D.cs:163:16:163:25 | Object obj = ... | this |
+| D.cs:245:13:245:13 | access to local variable o | Variable $@ may be null at this access because of $@ assignment. | D.cs:228:16:228:16 | o | o | D.cs:240:9:240:16 | ... = ... | this |
+| D.cs:253:13:253:14 | access to local variable o2 | Variable $@ may be null at this access because of $@ assignment. | D.cs:249:13:249:14 | o2 | o2 | D.cs:249:13:249:38 | String o2 = ... | this |
+| D.cs:291:13:291:13 | access to local variable o | Variable $@ may be null at this access because of $@ assignment. | D.cs:258:16:258:16 | o | o | D.cs:269:9:269:16 | ... = ... | this |
+| D.cs:291:13:291:13 | access to local variable o | Variable $@ may be null at this access because of $@ assignment. | D.cs:258:16:258:16 | o | o | D.cs:283:17:283:24 | ... = ... | this |
+| D.cs:356:13:356:13 | access to local variable a | Variable $@ may be null at this access because of $@ assignment. | D.cs:351:15:351:15 | a | a | D.cs:351:15:351:22 | Int32[] a = ... | this |
+| D.cs:363:13:363:16 | access to local variable last | Variable $@ may be null at this access because of $@ assignment. | D.cs:360:20:360:23 | last | last | D.cs:360:20:360:30 | String last = ... | this |
+| D.cs:372:13:372:13 | access to local variable b | Variable $@ may be null at this access because of $@ assignment. | D.cs:366:15:366:15 | b | b | D.cs:366:15:366:47 | Int32[] b = ... | this |
+| D.cs:395:20:395:20 | access to parameter a | Variable $@ may be null at this access as suggested by $@ null check. | D.cs:388:36:388:36 | a | a | D.cs:390:20:390:28 | ... == ... | this |
+| D.cs:400:20:400:20 | access to parameter b | Variable $@ may be null at this access as suggested by $@ null check. | D.cs:388:45:388:45 | b | b | D.cs:397:20:397:28 | ... == ... | this |
+| E.cs:12:38:12:39 | access to local variable a2 | Variable $@ may be null at this access because of $@ assignment. | E.cs:9:18:9:19 | a2 | a2 | E.cs:9:18:9:26 | Int64[][] a2 = ... | this |
+| E.cs:14:13:14:14 | access to local variable a3 | Variable $@ may be null at this access because of $@ assignment. | E.cs:11:16:11:17 | a3 | a3 | E.cs:11:16:11:24 | Int64[] a3 = ... | this |
+| E.cs:27:13:27:14 | access to local variable s1 | Variable $@ may be null at this access because of $@ assignment. | E.cs:19:13:19:14 | s1 | s1 | E.cs:23:13:23:30 | ... = ... | this |
+| E.cs:35:9:35:12 | access to local variable last | Variable $@ may be null at this access because of $@ assignment. | E.cs:32:16:32:19 | last | last | E.cs:32:16:32:26 | String last = ... | this |
+| E.cs:43:13:43:16 | access to local variable last | Variable $@ may be null at this access because of $@ assignment. | E.cs:32:16:32:19 | last | last | E.cs:37:9:37:19 | ... = ... | this |
+| E.cs:61:13:61:17 | access to local variable slice | Variable $@ may be null at this access because of $@ assignment. | E.cs:51:22:51:26 | slice | slice | E.cs:51:22:51:33 | List<String> slice = ... | this |
+| E.cs:73:13:73:15 | access to parameter arr | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:66:40:66:42 | arr | arr | E.cs:70:22:70:32 | ... == ... | this |
+| E.cs:112:13:112:16 | access to local variable arr2 | Variable $@ may be null at this access because of $@ assignment. | E.cs:107:15:107:18 | arr2 | arr2 | E.cs:107:15:107:25 | Int32[] arr2 = ... | this |
+| E.cs:167:21:167:21 | access to parameter a | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:162:28:162:28 | a | a | E.cs:164:17:164:25 | ... == ... | this |
+| E.cs:192:17:192:17 | access to parameter o | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:190:29:190:29 | o | o | E.cs:193:17:193:17 | access to parameter o | this |
+| E.cs:201:13:201:13 | access to local variable o | Variable $@ may be null at this access because of $@ assignment. | E.cs:198:13:198:13 | o | o | E.cs:198:13:198:29 | String o = ... | this |
+| E.cs:218:9:218:9 | access to local variable x | Variable $@ may be null at this access because of $@ assignment. | E.cs:215:13:215:13 | x | x | E.cs:217:13:217:20 | ... = ... | this |
+| E.cs:229:13:229:13 | access to local variable x | Variable $@ may be null at this access because of $@ assignment. | E.cs:225:13:225:13 | x | x | E.cs:227:13:227:20 | ... = ... | this |
+| E.cs:235:16:235:16 | access to parameter i | Variable $@ may be null at this access because it has a nullable type. | E.cs:233:26:233:26 | i | i | E.cs:233:26:233:26 | i | this |
+| E.cs:240:21:240:21 | access to parameter i | Variable $@ may be null at this access because it has a nullable type. | E.cs:238:26:238:26 | i | i | E.cs:238:26:238:26 | i | this |
+| E.cs:285:9:285:9 | access to local variable o | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:283:13:283:13 | o | o | E.cs:284:9:284:9 | access to local variable o | this |
+| E.cs:302:9:302:9 | access to local variable s | Variable $@ may be null at this access because of $@ assignment. | E.cs:301:13:301:13 | s | s | E.cs:301:13:301:27 | String s = ... | this |
+| E.cs:343:9:343:9 | access to local variable x | Variable $@ may be null at this access because of $@ assignment. | E.cs:342:13:342:13 | x | x | E.cs:342:13:342:32 | String x = ... | this |
+| E.cs:349:9:349:9 | access to local variable x | Variable $@ may be null at this access because of $@ assignment. | E.cs:348:17:348:17 | x | x | E.cs:348:17:348:36 | dynamic x = ... | this |
+| E.cs:366:41:366:41 | access to parameter s | Variable $@ may be null at this access because the parameter has a null default value. | E.cs:366:28:366:28 | s | s | E.cs:366:32:366:35 | null | this |
+| E.cs:375:20:375:20 | access to local variable s | Variable $@ may be null at this access because of $@ assignment. | E.cs:374:17:374:17 | s | s | E.cs:374:17:374:31 | String s = ... | this |
+| E.cs:417:34:417:34 | access to parameter i | Variable $@ may be null at this access because it has a nullable type. | E.cs:415:27:415:27 | i | i | E.cs:415:27:415:27 | i | this |
+| E.cs:423:38:423:38 | access to parameter i | Variable $@ may be null at this access because it has a nullable type. | E.cs:420:27:420:27 | i | i | E.cs:420:27:420:27 | i | this |
+| E.cs:430:39:430:39 | access to parameter i | Variable $@ may be null at this access because it has a nullable type. | E.cs:427:27:427:27 | i | i | E.cs:427:27:427:27 | i | this |
+| E.cs:444:13:444:13 | access to parameter s | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:435:29:435:29 | s | s | E.cs:437:23:437:31 | ... is ... | this |
+| E.cs:444:13:444:13 | access to parameter s | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:435:29:435:29 | s | s | E.cs:447:23:447:35 | ... is ... | this |
+| E.cs:459:13:459:13 | access to parameter s | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:435:29:435:29 | s | s | E.cs:437:23:437:31 | ... is ... | this |
+| E.cs:459:13:459:13 | access to parameter s | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:435:29:435:29 | s | s | E.cs:447:23:447:35 | ... is ... | this |
+| GuardedString.cs:35:31:35:31 | access to local variable s | Variable $@ may be null at this access because of $@ assignment. | GuardedString.cs:7:16:7:16 | s | s | GuardedString.cs:7:16:7:32 | String s = ... | this |
+| NullMaybeBad.cs:7:27:7:27 | access to parameter o | Variable $@ may be null at this access because of $@ null argument. | NullMaybeBad.cs:5:25:5:25 | o | o | NullMaybeBad.cs:13:17:13:20 | null | this |
+| Params.cs:14:17:14:20 | access to parameter args | Variable $@ may be null at this access because of $@ null argument. | Params.cs:12:36:12:39 | args | args | Params.cs:20:12:20:15 | null | this |
+| StringConcatenation.cs:16:17:16:17 | access to local variable s | Variable $@ may be null at this access because of $@ assignment. | StringConcatenation.cs:14:16:14:16 | s | s | StringConcatenation.cs:14:16:14:23 | String s = ... | this |
diff --git a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieHttpOnlyFalseAspNetCore/CookieBuilder/HttpOnly.expected b/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/AspNetCore/CookieBuilder/CookieWithoutHttpOnly.expected
similarity index 100%
rename from csharp/ql/test/experimental/Security Features/CWE-1004/CookieHttpOnlyFalseAspNetCore/CookieBuilder/HttpOnly.expected
rename to csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/AspNetCore/CookieBuilder/CookieWithoutHttpOnly.expected
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/AspNetCore/CookieBuilder/CookieWithoutHttpOnly.qlref b/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/AspNetCore/CookieBuilder/CookieWithoutHttpOnly.qlref
new file mode 100644
index 00000000000..9cfe2cba268
--- /dev/null
+++ b/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/AspNetCore/CookieBuilder/CookieWithoutHttpOnly.qlref	
@@ -0,0 +1,2 @@
+query: Security Features/CWE-1004/CookieWithoutHttpOnly.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLFalseAspNetCore/CookieBuilder/Program.cs b/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/AspNetCore/CookieBuilder/Program.cs
similarity index 77%
rename from csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLFalseAspNetCore/CookieBuilder/Program.cs
rename to csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/AspNetCore/CookieBuilder/Program.cs
index 4f51bdb5bc5..ba92978ec49 100644
--- a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLFalseAspNetCore/CookieBuilder/Program.cs	
+++ b/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/AspNetCore/CookieBuilder/Program.cs	
@@ -10,14 +10,14 @@ public class Startup
     {
         services.AddAuthentication().AddCookie(o =>
         {
-            o.Cookie.HttpOnly = false;
-            o.Cookie.SecurePolicy = Microsoft.AspNetCore.Http.CookieSecurePolicy.None;
+            o.Cookie.HttpOnly = false; // $ Alert
+            o.Cookie.SecurePolicy = Microsoft.AspNetCore.Http.CookieSecurePolicy.None; 
         });
 
         services.AddSession(options =>
         {
-            options.Cookie.SecurePolicy = Microsoft.AspNetCore.Http.CookieSecurePolicy.None;
-            options.Cookie.HttpOnly = false;
+            options.Cookie.SecurePolicy = Microsoft.AspNetCore.Http.CookieSecurePolicy.None; 
+            options.Cookie.HttpOnly = false; // $ Alert
         });
     }
 }
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/AspNetCore/NoPolicy/CookieWithoutHttpOnly.expected b/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/AspNetCore/NoPolicy/CookieWithoutHttpOnly.expected
new file mode 100644
index 00000000000..1e71f06bfb6
--- /dev/null
+++ b/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/AspNetCore/NoPolicy/CookieWithoutHttpOnly.expected	
@@ -0,0 +1,4 @@
+| Program.cs:5:9:5:48 | call to method Append | Cookie attribute 'HttpOnly' is not set to true. |
+| Program.cs:10:29:10:73 | object creation of type CookieOptions | Cookie attribute 'HttpOnly' is not set to true. |
+| Program.cs:42:29:42:73 | object creation of type CookieOptions | Cookie attribute 'HttpOnly' is not set to true. |
+| Program.cs:49:29:49:94 | object creation of type CookieOptions | Cookie attribute 'HttpOnly' is not set to true. |
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/AspNetCore/NoPolicy/CookieWithoutHttpOnly.qlref b/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/AspNetCore/NoPolicy/CookieWithoutHttpOnly.qlref
new file mode 100644
index 00000000000..9cfe2cba268
--- /dev/null
+++ b/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/AspNetCore/NoPolicy/CookieWithoutHttpOnly.qlref	
@@ -0,0 +1,2 @@
+query: Security Features/CWE-1004/CookieWithoutHttpOnly.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieHttpOnlyFalseAspNetCore/NoPolicy/Program.cs b/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/AspNetCore/NoPolicy/Program.cs
similarity index 80%
rename from csharp/ql/test/experimental/Security Features/CWE-1004/CookieHttpOnlyFalseAspNetCore/NoPolicy/Program.cs
rename to csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/AspNetCore/NoPolicy/Program.cs
index 6f12958fba7..4df46f20c8c 100644
--- a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieHttpOnlyFalseAspNetCore/NoPolicy/Program.cs	
+++ b/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/AspNetCore/NoPolicy/Program.cs	
@@ -1,11 +1,29 @@
 public class MyController : Microsoft.AspNetCore.Mvc.Controller
 {
+    public void CookieDefault()
+    {
+        Response.Cookies.Append("auth", "value"); // $Alert // BAD: HttpOnly is set to false by default
+    }
+
+    public void CookieDefault2()
+    {
+        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions(); // $Alert 
+        Response.Cookies.Append("auth", "value", cookieOptions); // BAD: HttpOnly is set to false by default
+    }
+
     public void CookieDelete()
     {
         var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions();
         Response.Cookies.Delete("auth", cookieOptions); // GOOD: Delete call
     }
 
+    void CookieDirectFalseForgery()
+    {
+        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions();
+        cookieOptions.HttpOnly = false;
+        Response.Cookies.Append("antiforgerytoken", "secret", cookieOptions); // GOOD: not an auth cookie
+    }
+
     void CookieDirectTrue()
     {
         var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions();
@@ -21,21 +39,14 @@ public class MyController : Microsoft.AspNetCore.Mvc.Controller
 
     void CookieDirectFalse()
     {
-        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions();
+        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions(); // $Alert 
         cookieOptions.HttpOnly = false;
         Response.Cookies.Append("auth", "secret", cookieOptions); // BAD
     }
 
-    void CookieDirectFalseForgery()
-    {
-        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions();
-        cookieOptions.HttpOnly = false;
-        Response.Cookies.Append("antiforgerytoken", "secret", cookieOptions); // GOOD: not an auth cookie
-    }
-
     void CookieDirectFalseInitializer()
     {
-        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions() { HttpOnly = false };
+        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions() { HttpOnly = false }; // $Alert 
         Response.Cookies.Append("auth", "secret", cookieOptions); // BAD
     }
 
@@ -56,16 +67,16 @@ public class MyController : Microsoft.AspNetCore.Mvc.Controller
 
     void CookieIntermediateFalse()
     {
-        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions();
+        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions(); // $MISSING:Alert
         bool v = false;
         cookieOptions.HttpOnly = v;
-        Response.Cookies.Append("auth", "secret", cookieOptions); // BAD
+        Response.Cookies.Append("auth", "secret", cookieOptions); // BAD, but not detected
     }
 
     void CookieIntermediateFalseInitializer()
     {
         bool v = false;
-        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions() { HttpOnly = v };
-        Response.Cookies.Append("auth", "secret", cookieOptions); // BAD
+        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions() { HttpOnly = v }; // $MISSING:Alert 
+        Response.Cookies.Append("auth", "secret", cookieOptions); // BAD, but not detected
     }
 }
diff --git a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieHttpOnlyFalseAspNetCore/UseCookiePolicyCallback/HttpOnly.expected b/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/AspNetCore/PolicyAlways/CookieWithoutHttpOnly.expected
similarity index 100%
rename from csharp/ql/test/experimental/Security Features/CWE-1004/CookieHttpOnlyFalseAspNetCore/UseCookiePolicyCallback/HttpOnly.expected
rename to csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/AspNetCore/PolicyAlways/CookieWithoutHttpOnly.expected
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/AspNetCore/PolicyAlways/CookieWithoutHttpOnly.qlref b/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/AspNetCore/PolicyAlways/CookieWithoutHttpOnly.qlref
new file mode 100644
index 00000000000..9cfe2cba268
--- /dev/null
+++ b/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/AspNetCore/PolicyAlways/CookieWithoutHttpOnly.qlref	
@@ -0,0 +1,2 @@
+query: Security Features/CWE-1004/CookieWithoutHttpOnly.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlyAspNetCore/UseCookiePolicyAlways/Program.cs b/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/AspNetCore/PolicyAlways/Program.cs
similarity index 92%
rename from csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlyAspNetCore/UseCookiePolicyAlways/Program.cs
rename to csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/AspNetCore/PolicyAlways/Program.cs
index 115f448a39b..cdb8a9081d1 100644
--- a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlyAspNetCore/UseCookiePolicyAlways/Program.cs	
+++ b/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/AspNetCore/PolicyAlways/Program.cs	
@@ -20,6 +20,6 @@ public class Startup
     // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
     public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
     {
-        app.UseCookiePolicy(new CookiePolicyOptions() { HttpOnly = Microsoft.AspNetCore.CookiePolicy.HttpOnlyPolicy.Always});
+        app.UseCookiePolicy(new CookiePolicyOptions() { HttpOnly = Microsoft.AspNetCore.CookiePolicy.HttpOnlyPolicy.Always });
     }
 }
diff --git a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlyAspNetCore/UseCookiePolicyAlways/HttpOnly.expected b/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/AspNetCore/PolicyCallback/CookieWithoutHttpOnly.expected
similarity index 100%
rename from csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlyAspNetCore/UseCookiePolicyAlways/HttpOnly.expected
rename to csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/AspNetCore/PolicyCallback/CookieWithoutHttpOnly.expected
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/AspNetCore/PolicyCallback/CookieWithoutHttpOnly.qlref b/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/AspNetCore/PolicyCallback/CookieWithoutHttpOnly.qlref
new file mode 100644
index 00000000000..9cfe2cba268
--- /dev/null
+++ b/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/AspNetCore/PolicyCallback/CookieWithoutHttpOnly.qlref	
@@ -0,0 +1,2 @@
+query: Security Features/CWE-1004/CookieWithoutHttpOnly.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlyAspNetCore/UseCookiePolicyCallback/Program.cs b/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/AspNetCore/PolicyCallback/Program.cs
similarity index 88%
rename from csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlyAspNetCore/UseCookiePolicyCallback/Program.cs
rename to csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/AspNetCore/PolicyCallback/Program.cs
index 417b1f77277..6d44521e85f 100644
--- a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlyAspNetCore/UseCookiePolicyCallback/Program.cs	
+++ b/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/AspNetCore/PolicyCallback/Program.cs	
@@ -6,6 +6,11 @@ using Microsoft.AspNetCore.Http;
 public class MyController : Microsoft.AspNetCore.Mvc.Controller
 {
     public void CookieDefault()
+    {
+        Response.Cookies.Append("auth", "secret"); // GOOD: HttpOnly is set in callback
+    }
+
+    public void CookieDefault2()
     {
         var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions();
         Response.Cookies.Append("auth", "secret", cookieOptions); // GOOD: HttpOnly is set in callback
diff --git a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlyAspNetCore/UseCookiePolicyNone/HttpOnly.expected b/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/AspNetCore/PolicyNone/CookieWithoutHttpOnly.expected
similarity index 100%
rename from csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlyAspNetCore/UseCookiePolicyNone/HttpOnly.expected
rename to csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/AspNetCore/PolicyNone/CookieWithoutHttpOnly.expected
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/AspNetCore/PolicyNone/CookieWithoutHttpOnly.qlref b/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/AspNetCore/PolicyNone/CookieWithoutHttpOnly.qlref
new file mode 100644
index 00000000000..9cfe2cba268
--- /dev/null
+++ b/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/AspNetCore/PolicyNone/CookieWithoutHttpOnly.qlref	
@@ -0,0 +1,2 @@
+query: Security Features/CWE-1004/CookieWithoutHttpOnly.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlyAspNetCore/UseCookiePolicyNone/Program.cs b/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/AspNetCore/PolicyNone/Program.cs
similarity index 85%
rename from csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlyAspNetCore/UseCookiePolicyNone/Program.cs
rename to csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/AspNetCore/PolicyNone/Program.cs
index 7be845aadfe..187a02e71dc 100644
--- a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlyAspNetCore/UseCookiePolicyNone/Program.cs	
+++ b/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/AspNetCore/PolicyNone/Program.cs	
@@ -5,12 +5,12 @@ public class MyController : Microsoft.AspNetCore.Mvc.Controller
 {
     public void CookieDefault()
     {
-        Response.Cookies.Append("auth", "secret"); // Bad: HttpOnly policy set to None
+        Response.Cookies.Append("auth", "secret"); // $ Alert // Bad: HttpOnly policy set to None
     }
 
     public void CookieDefault2()
     {
-        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions();
+        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions(); // $ Alert 
         Response.Cookies.Append("auth", "secret", cookieOptions); // Bad: HttpOnly policy set to None
     }
 }
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/AspNetCore/options b/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/AspNetCore/options
new file mode 100644
index 00000000000..3282ecf48f6
--- /dev/null
+++ b/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/AspNetCore/options	
@@ -0,0 +1,3 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../../../../resources/stubs/_frameworks/Microsoft.AspNetCore.App/Microsoft.AspNetCore.App.csproj
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/SystemWeb/HttpOnlyCookiesFalse/CookieWithoutHttpOnly.expected b/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/SystemWeb/HttpOnlyCookiesFalse/CookieWithoutHttpOnly.expected
new file mode 100644
index 00000000000..3a3d027e1f9
--- /dev/null
+++ b/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/SystemWeb/HttpOnlyCookiesFalse/CookieWithoutHttpOnly.expected	
@@ -0,0 +1,3 @@
+| Program.cs:16:22:16:59 | object creation of type HttpCookie | Cookie attribute 'HttpOnly' is not set to true. |
+| Program.cs:32:22:32:59 | object creation of type HttpCookie | Cookie attribute 'HttpOnly' is not set to true. |
+| Program.cs:38:22:38:80 | object creation of type HttpCookie | Cookie attribute 'HttpOnly' is not set to true. |
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/SystemWeb/HttpOnlyCookiesFalse/CookieWithoutHttpOnly.qlref b/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/SystemWeb/HttpOnlyCookiesFalse/CookieWithoutHttpOnly.qlref
new file mode 100644
index 00000000000..9cfe2cba268
--- /dev/null
+++ b/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/SystemWeb/HttpOnlyCookiesFalse/CookieWithoutHttpOnly.qlref	
@@ -0,0 +1,2 @@
+query: Security Features/CWE-1004/CookieWithoutHttpOnly.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieHttpOnlyFalseSystemWeb/Program.cs b/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/SystemWeb/HttpOnlyCookiesFalse/Program.cs
similarity index 71%
rename from csharp/ql/test/experimental/Security Features/CWE-1004/CookieHttpOnlyFalseSystemWeb/Program.cs
rename to csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/SystemWeb/HttpOnlyCookiesFalse/Program.cs
index 6ab389f63cc..3e63963712f 100644
--- a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieHttpOnlyFalseSystemWeb/Program.cs	
+++ b/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/SystemWeb/HttpOnlyCookiesFalse/Program.cs	
@@ -11,6 +11,16 @@ class Program
         var cookie = new System.Web.HttpCookie("sessionID") { HttpOnly = true }; // GOOD
     }
 
+    void CookieDefault()
+    {
+        var cookie = new System.Web.HttpCookie("sessionID"); // $Alert // BAD: httpOnlyCookies is set to false by default
+    }
+
+    void CookieDefaultForgery()
+    {
+        var cookie = new System.Web.HttpCookie("anticsrftoken"); // GOOD: not an auth cookie
+    }
+
     void CookieForgeryDirectFalse()
     {
         var cookie = new System.Web.HttpCookie("antiforgerytoken");
@@ -19,13 +29,13 @@ class Program
 
     void CookieDirectFalse()
     {
-        var cookie = new System.Web.HttpCookie("sessionID");
+        var cookie = new System.Web.HttpCookie("sessionID"); // $Alert 
         cookie.HttpOnly = false; // BAD
     }
 
     void CookieDirectFalseInitializer()
     {
-        var cookie = new System.Web.HttpCookie("sessionID") { HttpOnly = false }; // BAD
+        var cookie = new System.Web.HttpCookie("sessionID") { HttpOnly = false };  // $Alert // BAD
     }
 
     void CookieIntermediateTrue()
@@ -43,7 +53,7 @@ class Program
 
     void CookieIntermediateFalse()
     {
-        var cookie = new System.Web.HttpCookie("sessionID");
+        var cookie = new System.Web.HttpCookie("sessionID"); // MISSING:Alert 
         bool v = false;
         cookie.HttpOnly = v; // BAD
     }
@@ -51,6 +61,6 @@ class Program
     void CookieIntermediateFalseInitializer()
     {
         bool v = false;
-        var cookie = new System.Web.HttpCookie("sessionID") { HttpOnly = v }; // BAD
+        var cookie = new System.Web.HttpCookie("sessionID") { HttpOnly = v };  // $MISSING:Alert // BAD
     }
 }
diff --git a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieHttpOnlyFalseSystemWeb/Web.config b/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/SystemWeb/HttpOnlyCookiesFalse/Web.config
similarity index 100%
rename from csharp/ql/test/experimental/Security Features/CWE-1004/CookieHttpOnlyFalseSystemWeb/Web.config
rename to csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/SystemWeb/HttpOnlyCookiesFalse/Web.config
diff --git a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlyAspNetCore/UseCookiePolicyCallback/HttpOnly.expected b/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/SystemWeb/HttpOnlyCookiesTrue/CookieWithoutHttpOnly.expected
similarity index 100%
rename from csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlyAspNetCore/UseCookiePolicyCallback/HttpOnly.expected
rename to csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/SystemWeb/HttpOnlyCookiesTrue/CookieWithoutHttpOnly.expected
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/SystemWeb/HttpOnlyCookiesTrue/CookieWithoutHttpOnly.qlref b/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/SystemWeb/HttpOnlyCookiesTrue/CookieWithoutHttpOnly.qlref
new file mode 100644
index 00000000000..9cfe2cba268
--- /dev/null
+++ b/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/SystemWeb/HttpOnlyCookiesTrue/CookieWithoutHttpOnly.qlref	
@@ -0,0 +1,2 @@
+query: Security Features/CWE-1004/CookieWithoutHttpOnly.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/SystemWeb/HttpOnlyCookiesTrue/Program.cs b/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/SystemWeb/HttpOnlyCookiesTrue/Program.cs
new file mode 100644
index 00000000000..cd60e4df262
--- /dev/null
+++ b/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/SystemWeb/HttpOnlyCookiesTrue/Program.cs	
@@ -0,0 +1,7 @@
+class Program
+{
+    void CookieDefault()
+    {
+        var cookie = new System.Web.HttpCookie("auth"); // GOOD: httpOnlyCookies is set to true in config
+    }
+}
diff --git a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlySystemWeb/HttpCookiesTrue/Web.config b/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/SystemWeb/HttpOnlyCookiesTrue/Web.config
similarity index 70%
rename from csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlySystemWeb/HttpCookiesTrue/Web.config
rename to csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/SystemWeb/HttpOnlyCookiesTrue/Web.config
index fc262149211..8bb37742741 100644
--- a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlySystemWeb/HttpCookiesTrue/Web.config	
+++ b/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/SystemWeb/HttpOnlyCookiesTrue/Web.config	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
   <system.web>
-    <httpCookies httpOnlyCookies="true" />
+    <httpCookies httpOnlyCookies="true"/>
   </system.web>
 </configuration>
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/SystemWeb/options b/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/SystemWeb/options
new file mode 100644
index 00000000000..9414f8d8ef8
--- /dev/null
+++ b/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/SystemWeb/options	
@@ -0,0 +1,3 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj
+semmle-extractor-options: ${testdir}/../../../../../../resources/stubs/System.Web.cs
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/WebConfigAddedHeaderInLocation/MissingXFrameOptions.cs b/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/WebConfigAddedHeaderInLocation/MissingXFrameOptions.cs
new file mode 100644
index 00000000000..48073a309fd
--- /dev/null
+++ b/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/WebConfigAddedHeaderInLocation/MissingXFrameOptions.cs	
@@ -0,0 +1,18 @@
+using System;
+using System.Web;
+
+public class AddXFrameOptions : IHttpHandler
+{
+
+    public void ProcessRequest(HttpContext ctx)
+    {
+    }
+
+    public bool IsReusable
+    {
+        get
+        {
+            return true;
+        }
+    }
+}
diff --git a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlySystemWeb/HttpCookiesTrue/HttpOnly.expected b/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/WebConfigAddedHeaderInLocation/MissingXFrameOptions.expected
similarity index 100%
rename from csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlySystemWeb/HttpCookiesTrue/HttpOnly.expected
rename to csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/WebConfigAddedHeaderInLocation/MissingXFrameOptions.expected
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/WebConfigAddedHeaderInLocation/MissingXFrameOptions.qlref b/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/WebConfigAddedHeaderInLocation/MissingXFrameOptions.qlref
new file mode 100644
index 00000000000..b8a963200e5
--- /dev/null
+++ b/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/WebConfigAddedHeaderInLocation/MissingXFrameOptions.qlref	
@@ -0,0 +1 @@
+Security Features/CWE-451/MissingXFrameOptions.ql
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/WebConfigAddedHeaderInLocation/Web.config b/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/WebConfigAddedHeaderInLocation/Web.config
new file mode 100644
index 00000000000..ce837c2b981
--- /dev/null
+++ b/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/WebConfigAddedHeaderInLocation/Web.config	
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <location path="." inheritInChildApplications="false">
+    <system.webServer>
+      <httpProtocol>
+        <customHeaders>
+          <add name="X-Frame-Options" value="SAMEORIGIN" />
+        </customHeaders>
+      </httpProtocol>
+    </system.webServer>
+  </location>
+</configuration>
diff --git a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlySystemWeb/ConfigEmpty/options b/csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/WebConfigAddedHeaderInLocation/options
similarity index 100%
rename from csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlySystemWeb/ConfigEmpty/options
rename to csharp/ql/test/query-tests/Security Features/CWE-451/MissingXFrameOptions/WebConfigAddedHeaderInLocation/options
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-502/UnsafeDeserializationUntrustedInput/UnsafeDeserializationUntrustedInput.expected b/csharp/ql/test/query-tests/Security Features/CWE-502/UnsafeDeserializationUntrustedInput/UnsafeDeserializationUntrustedInput.expected
index c3377fcb04f..88d0baa4943 100644
--- a/csharp/ql/test/query-tests/Security Features/CWE-502/UnsafeDeserializationUntrustedInput/UnsafeDeserializationUntrustedInput.expected	
+++ b/csharp/ql/test/query-tests/Security Features/CWE-502/UnsafeDeserializationUntrustedInput/UnsafeDeserializationUntrustedInput.expected	
@@ -11,9 +11,9 @@ edges
 | BinaryFormatterUntrustedInputBad.cs:13:48:13:83 | call to method GetBytes : Byte[] | BinaryFormatterUntrustedInputBad.cs:13:31:13:84 | object creation of type MemoryStream | provenance | MaD:1 |
 | BinaryFormatterUntrustedInputBad.cs:13:71:13:77 | access to parameter textBox : TextBox | BinaryFormatterUntrustedInputBad.cs:13:71:13:82 | access to property Text : String | provenance | MaD:3 |
 | BinaryFormatterUntrustedInputBad.cs:13:71:13:82 | access to property Text : String | BinaryFormatterUntrustedInputBad.cs:13:48:13:83 | call to method GetBytes : Byte[] | provenance | MaD:2 |
-| BinaryFormatterUntrustedInputBad.cs:23:48:23:82 | call to method FromBase64String : Byte[] [element] : Object | BinaryFormatterUntrustedInputBad.cs:23:31:23:83 | object creation of type MemoryStream | provenance | MaD:1 |
+| BinaryFormatterUntrustedInputBad.cs:23:48:23:82 | call to method FromBase64String : Byte[] | BinaryFormatterUntrustedInputBad.cs:23:31:23:83 | object creation of type MemoryStream | provenance | MaD:1 |
 | BinaryFormatterUntrustedInputBad.cs:23:73:23:76 | access to parameter data : TextBox | BinaryFormatterUntrustedInputBad.cs:23:73:23:81 | access to property Text : String | provenance | MaD:3 |
-| BinaryFormatterUntrustedInputBad.cs:23:73:23:81 | access to property Text : String | BinaryFormatterUntrustedInputBad.cs:23:48:23:82 | call to method FromBase64String : Byte[] [element] : Object | provenance | MaD:4 |
+| BinaryFormatterUntrustedInputBad.cs:23:73:23:81 | access to property Text : String | BinaryFormatterUntrustedInputBad.cs:23:48:23:82 | call to method FromBase64String : Byte[] | provenance | MaD:4 |
 | DataContractJsonSerializerUntrustedInputBad.cs:13:47:13:79 | call to method GetBytes : Byte[] | DataContractJsonSerializerUntrustedInputBad.cs:13:30:13:80 | object creation of type MemoryStream | provenance | MaD:1 |
 | DataContractJsonSerializerUntrustedInputBad.cs:13:70:13:73 | access to parameter data : TextBox | DataContractJsonSerializerUntrustedInputBad.cs:13:70:13:78 | access to property Text : String | provenance | MaD:3 |
 | DataContractJsonSerializerUntrustedInputBad.cs:13:70:13:78 | access to property Text : String | DataContractJsonSerializerUntrustedInputBad.cs:13:47:13:79 | call to method GetBytes : Byte[] | provenance | MaD:2 |
@@ -34,14 +34,14 @@ models
 | 1 | Summary: System.IO; MemoryStream; false; MemoryStream; (System.Byte[]); ; Argument[0].Element; Argument[this]; taint; manual |
 | 2 | Summary: System.Text; Encoding; true; GetBytes; (System.String); ; Argument[0]; ReturnValue; taint; manual |
 | 3 | Summary: System.Web.UI.WebControls; TextBox; false; get_Text; (); ; Argument[this]; ReturnValue; taint; manual |
-| 4 | Summary: System; Convert; false; FromBase64String; (System.String); ; Argument[0]; ReturnValue.Element; taint; manual |
+| 4 | Summary: System; Convert; false; FromBase64String; (System.String); ; Argument[0]; ReturnValue; taint; manual |
 nodes
 | BinaryFormatterUntrustedInputBad.cs:13:31:13:84 | object creation of type MemoryStream | semmle.label | object creation of type MemoryStream |
 | BinaryFormatterUntrustedInputBad.cs:13:48:13:83 | call to method GetBytes : Byte[] | semmle.label | call to method GetBytes : Byte[] |
 | BinaryFormatterUntrustedInputBad.cs:13:71:13:77 | access to parameter textBox : TextBox | semmle.label | access to parameter textBox : TextBox |
 | BinaryFormatterUntrustedInputBad.cs:13:71:13:82 | access to property Text : String | semmle.label | access to property Text : String |
 | BinaryFormatterUntrustedInputBad.cs:23:31:23:83 | object creation of type MemoryStream | semmle.label | object creation of type MemoryStream |
-| BinaryFormatterUntrustedInputBad.cs:23:48:23:82 | call to method FromBase64String : Byte[] [element] : Object | semmle.label | call to method FromBase64String : Byte[] [element] : Object |
+| BinaryFormatterUntrustedInputBad.cs:23:48:23:82 | call to method FromBase64String : Byte[] | semmle.label | call to method FromBase64String : Byte[] |
 | BinaryFormatterUntrustedInputBad.cs:23:73:23:76 | access to parameter data : TextBox | semmle.label | access to parameter data : TextBox |
 | BinaryFormatterUntrustedInputBad.cs:23:73:23:81 | access to property Text : String | semmle.label | access to property Text : String |
 | DataContractJsonSerializerUntrustedInputBad.cs:13:30:13:80 | object creation of type MemoryStream | semmle.label | object creation of type MemoryStream |
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-611/stubs.cs b/csharp/ql/test/query-tests/Security Features/CWE-611/stubs.cs
index 04c39623cac..6375ac035c1 100644
--- a/csharp/ql/test/query-tests/Security Features/CWE-611/stubs.cs	
+++ b/csharp/ql/test/query-tests/Security Features/CWE-611/stubs.cs	
@@ -1,3 +1,9 @@
-namespace System.Web;
+namespace System
+{
+    public class Uri { }
 
-public interface IHtmlString { }
+    namespace Web
+    {
+        public interface IHtmlString { }
+    }
+}
diff --git a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLFalseAspNetCore/CookieBuilder/RequireSSL.expected b/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/AspNetCore/CookieBuilder/CookieWithoutSecure.expected
similarity index 100%
rename from csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLFalseAspNetCore/CookieBuilder/RequireSSL.expected
rename to csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/AspNetCore/CookieBuilder/CookieWithoutSecure.expected
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/AspNetCore/CookieBuilder/CookieWithoutSecure.qlref b/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/AspNetCore/CookieBuilder/CookieWithoutSecure.qlref
new file mode 100644
index 00000000000..bb0094e7d8f
--- /dev/null
+++ b/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/AspNetCore/CookieBuilder/CookieWithoutSecure.qlref	
@@ -0,0 +1,2 @@
+query: Security Features/CWE-614/CookieWithoutSecure.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieHttpOnlyFalseAspNetCore/CookieBuilder/Program.cs b/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/AspNetCore/CookieBuilder/Program.cs
similarity index 89%
rename from csharp/ql/test/experimental/Security Features/CWE-1004/CookieHttpOnlyFalseAspNetCore/CookieBuilder/Program.cs
rename to csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/AspNetCore/CookieBuilder/Program.cs
index 4f51bdb5bc5..245c693f513 100644
--- a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieHttpOnlyFalseAspNetCore/CookieBuilder/Program.cs	
+++ b/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/AspNetCore/CookieBuilder/Program.cs	
@@ -11,12 +11,12 @@ public class Startup
         services.AddAuthentication().AddCookie(o =>
         {
             o.Cookie.HttpOnly = false;
-            o.Cookie.SecurePolicy = Microsoft.AspNetCore.Http.CookieSecurePolicy.None;
+            o.Cookie.SecurePolicy = Microsoft.AspNetCore.Http.CookieSecurePolicy.None; // $ Alert
         });
 
         services.AddSession(options =>
         {
-            options.Cookie.SecurePolicy = Microsoft.AspNetCore.Http.CookieSecurePolicy.None;
+            options.Cookie.SecurePolicy = Microsoft.AspNetCore.Http.CookieSecurePolicy.None; // $ Alert
             options.Cookie.HttpOnly = false;
         });
     }
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/AspNetCore/NoPolicy/CookieWithoutSecure.expected b/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/AspNetCore/NoPolicy/CookieWithoutSecure.expected
new file mode 100644
index 00000000000..4c2bbcca1ca
--- /dev/null
+++ b/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/AspNetCore/NoPolicy/CookieWithoutSecure.expected	
@@ -0,0 +1,4 @@
+| Program.cs:5:9:5:48 | call to method Append | Cookie attribute 'Secure' is not set to true. |
+| Program.cs:10:29:10:73 | object creation of type CookieOptions | Cookie attribute 'Secure' is not set to true. |
+| Program.cs:35:29:35:73 | object creation of type CookieOptions | Cookie attribute 'Secure' is not set to true. |
+| Program.cs:42:29:42:92 | object creation of type CookieOptions | Cookie attribute 'Secure' is not set to true. |
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/AspNetCore/NoPolicy/CookieWithoutSecure.qlref b/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/AspNetCore/NoPolicy/CookieWithoutSecure.qlref
new file mode 100644
index 00000000000..bb0094e7d8f
--- /dev/null
+++ b/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/AspNetCore/NoPolicy/CookieWithoutSecure.qlref	
@@ -0,0 +1,2 @@
+query: Security Features/CWE-614/CookieWithoutSecure.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLFalseAspNetCore/NoPolicy/Program.cs b/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/AspNetCore/NoPolicy/Program.cs
similarity index 78%
rename from csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLFalseAspNetCore/NoPolicy/Program.cs
rename to csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/AspNetCore/NoPolicy/Program.cs
index b1ad1aede91..733e2d71fcc 100644
--- a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLFalseAspNetCore/NoPolicy/Program.cs	
+++ b/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/AspNetCore/NoPolicy/Program.cs	
@@ -1,5 +1,16 @@
 public class MyController : Microsoft.AspNetCore.Mvc.Controller
 {
+    public void CookieDefault()
+    {
+        Response.Cookies.Append("name", "value"); // $Alert // BAD: Secure is set to false by default
+    }
+
+    public void CookieDefault2()
+    {
+        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions(); // $Alert 
+        Response.Cookies.Append("name", "value", cookieOptions); // BAD: Secure is set to false by default
+    }
+
     public void CookieDelete()
     {
         var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions();
@@ -21,14 +32,14 @@ public class MyController : Microsoft.AspNetCore.Mvc.Controller
 
     void CookieDirectFalse()
     {
-        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions();
+        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions(); // $Alert 
         cookieOptions.Secure = false;
         Response.Cookies.Append("auth", "secret", cookieOptions); // BAD
     }
 
     void CookieDirectFalseInitializer()
     {
-        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions() { Secure = false };
+        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions() { Secure = false }; // $Alert 
         Response.Cookies.Append("auth", "secret", cookieOptions); // BAD
     }
 
@@ -49,16 +60,16 @@ public class MyController : Microsoft.AspNetCore.Mvc.Controller
 
     void CookieIntermediateFalse()
     {
-        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions();
+        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions(); // $MISSING:Alert
         bool v = false;
         cookieOptions.Secure = v;
-        Response.Cookies.Append("auth", "secret", cookieOptions); // BAD
+        Response.Cookies.Append("auth", "secret", cookieOptions); // BAD, but not detected
     }
 
     void CookieIntermediateFalseInitializer()
     {
         bool v = false;
-        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions() { Secure = v };
-        Response.Cookies.Append("auth", "secret", cookieOptions); // BAD
+        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions() { Secure = v }; // $MISSING:Alert 
+        Response.Cookies.Append("auth", "secret", cookieOptions); // BAD, but not detected
     }
 }
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/AspNetCore/PolicyAlways/CookieWithoutSecure.expected b/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/AspNetCore/PolicyAlways/CookieWithoutSecure.expected
new file mode 100644
index 00000000000..8b137891791
--- /dev/null
+++ b/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/AspNetCore/PolicyAlways/CookieWithoutSecure.expected	
@@ -0,0 +1 @@
+
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/AspNetCore/PolicyAlways/CookieWithoutSecure.qlref b/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/AspNetCore/PolicyAlways/CookieWithoutSecure.qlref
new file mode 100644
index 00000000000..bb0094e7d8f
--- /dev/null
+++ b/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/AspNetCore/PolicyAlways/CookieWithoutSecure.qlref	
@@ -0,0 +1,2 @@
+query: Security Features/CWE-614/CookieWithoutSecure.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLAspNetCore/UseCookiePolicyAlways/Program.cs b/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/AspNetCore/PolicyAlways/Program.cs
similarity index 100%
rename from csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLAspNetCore/UseCookiePolicyAlways/Program.cs
rename to csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/AspNetCore/PolicyAlways/Program.cs
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/AspNetCore/PolicyCallback/CookieWithoutSecure.expected b/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/AspNetCore/PolicyCallback/CookieWithoutSecure.expected
new file mode 100644
index 00000000000..8b137891791
--- /dev/null
+++ b/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/AspNetCore/PolicyCallback/CookieWithoutSecure.expected	
@@ -0,0 +1 @@
+
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/AspNetCore/PolicyCallback/CookieWithoutSecure.qlref b/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/AspNetCore/PolicyCallback/CookieWithoutSecure.qlref
new file mode 100644
index 00000000000..bb0094e7d8f
--- /dev/null
+++ b/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/AspNetCore/PolicyCallback/CookieWithoutSecure.qlref	
@@ -0,0 +1,2 @@
+query: Security Features/CWE-614/CookieWithoutSecure.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLAspNetCore/UseCookiePolicyCallback/Program.cs b/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/AspNetCore/PolicyCallback/Program.cs
similarity index 100%
rename from csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLAspNetCore/UseCookiePolicyCallback/Program.cs
rename to csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/AspNetCore/PolicyCallback/Program.cs
diff --git a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLAspNetCore/UseCookiePolicyNone/RequireSSL.expected b/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/AspNetCore/PolicyNone/CookieWithoutSecure.expected
similarity index 100%
rename from csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLAspNetCore/UseCookiePolicyNone/RequireSSL.expected
rename to csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/AspNetCore/PolicyNone/CookieWithoutSecure.expected
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/AspNetCore/PolicyNone/CookieWithoutSecure.qlref b/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/AspNetCore/PolicyNone/CookieWithoutSecure.qlref
new file mode 100644
index 00000000000..bb0094e7d8f
--- /dev/null
+++ b/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/AspNetCore/PolicyNone/CookieWithoutSecure.qlref	
@@ -0,0 +1,2 @@
+query: Security Features/CWE-614/CookieWithoutSecure.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLAspNetCore/UseCookiePolicyNone/Program.cs b/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/AspNetCore/PolicyNone/Program.cs
similarity index 86%
rename from csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLAspNetCore/UseCookiePolicyNone/Program.cs
rename to csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/AspNetCore/PolicyNone/Program.cs
index 9db1f5380d4..989412e3d02 100644
--- a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLAspNetCore/UseCookiePolicyNone/Program.cs	
+++ b/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/AspNetCore/PolicyNone/Program.cs	
@@ -5,12 +5,12 @@ public class MyController : Microsoft.AspNetCore.Mvc.Controller
 {
     public void CookieDefault()
     {
-        Response.Cookies.Append("auth", "secret"); // Bad: Secure policy set to None
+        Response.Cookies.Append("auth", "secret"); // $ Alert // Bad: Secure policy set to None
     }
 
     public void CookieDefault2()
     {
-        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions();
+        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions(); // $ Alert 
         Response.Cookies.Append("auth", "secret", cookieOptions); // Bad: Secure policy set to None
     }
 }
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/AspNetCore/options b/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/AspNetCore/options
new file mode 100644
index 00000000000..3282ecf48f6
--- /dev/null
+++ b/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/AspNetCore/options	
@@ -0,0 +1,3 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../../../../resources/stubs/_frameworks/Microsoft.AspNetCore.App/Microsoft.AspNetCore.App.csproj
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/SystemWeb/RequireSSLFalse/CookieWithoutSecure.expected b/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/SystemWeb/RequireSSLFalse/CookieWithoutSecure.expected
new file mode 100644
index 00000000000..4ef56f10d55
--- /dev/null
+++ b/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/SystemWeb/RequireSSLFalse/CookieWithoutSecure.expected	
@@ -0,0 +1,3 @@
+| Program.cs:5:22:5:60 | object creation of type HttpCookie | Cookie attribute 'Secure' is not set to true. |
+| Program.cs:34:22:34:60 | object creation of type HttpCookie | Cookie attribute 'Secure' is not set to true. |
+| Program.cs:40:22:40:79 | object creation of type HttpCookie | Cookie attribute 'Secure' is not set to true. |
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/SystemWeb/RequireSSLFalse/CookieWithoutSecure.qlref b/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/SystemWeb/RequireSSLFalse/CookieWithoutSecure.qlref
new file mode 100644
index 00000000000..bb0094e7d8f
--- /dev/null
+++ b/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/SystemWeb/RequireSSLFalse/CookieWithoutSecure.qlref	
@@ -0,0 +1,2 @@
+query: Security Features/CWE-614/CookieWithoutSecure.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLFalseSystemWeb/Program.cs b/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/SystemWeb/RequireSSLFalse/Program.cs
similarity index 68%
rename from csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLFalseSystemWeb/Program.cs
rename to csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/SystemWeb/RequireSSLFalse/Program.cs
index 3a6d80b50c9..250b1f7780e 100644
--- a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLFalseSystemWeb/Program.cs	
+++ b/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/SystemWeb/RequireSSLFalse/Program.cs	
@@ -1,5 +1,10 @@
 class Program
 {
+    void CookieDefault()
+    {
+        var cookie = new System.Web.HttpCookie("cookieName"); // $Alert // BAD: requireSSL is set to false by default
+    }
+
     void CookieDirectTrue()
     {
         var cookie = new System.Web.HttpCookie("cookieName");
@@ -11,17 +16,6 @@ class Program
         var cookie = new System.Web.HttpCookie("cookieName") { Secure = true }; // GOOD
     }
 
-    void CookieDirectFalse()
-    {
-        var cookie = new System.Web.HttpCookie("cookieName");
-        cookie.Secure = false; // BAD
-    }
-
-    void CookieDirectFalseInitializer()
-    {
-        var cookie = new System.Web.HttpCookie("cookieName") { Secure = false }; // BAD
-    }
-
     void CookieIntermediateTrue()
     {
         var cookie = new System.Web.HttpCookie("cookieName");
@@ -35,16 +29,27 @@ class Program
         var cookie = new System.Web.HttpCookie("cookieName") { Secure = v }; // GOOD: should track local data flow
     }
 
-    void CookieIntermediateFalse()
+    void CookieDirectFalse()
     {
-        var cookie = new System.Web.HttpCookie("cookieName");
+        var cookie = new System.Web.HttpCookie("cookieName"); // $Alert 
+        cookie.Secure = false; // BAD
+    }
+
+    void CookieDirectFalseInitializer()
+    {
+        var cookie = new System.Web.HttpCookie("cookieName") { Secure = false }; // $Alert // BAD
+    }
+
+        void CookieIntermediateFalse()
+    {
+        var cookie = new System.Web.HttpCookie("cookieName"); // $MISSING:Alert
         bool v = false;
-        cookie.Secure = v; // BAD
+        cookie.Secure = v; // BAD, but not detected
     }
 
     void CookieIntermediateFalseInitializer()
     {
         bool v = false;
-        var cookie = new System.Web.HttpCookie("cookieName") { Secure = v }; // BAD
+        var cookie = new System.Web.HttpCookie("cookieName") { Secure = v }; // $MISSING:Alert // BAD, but not detected
     }
 }
diff --git a/csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlySystemWeb/ConfigEmpty/Web.config b/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/SystemWeb/RequireSSLFalse/Web.config
similarity index 100%
rename from csharp/ql/test/experimental/Security Features/CWE-1004/CookieWithoutHttpOnlySystemWeb/ConfigEmpty/Web.config
rename to csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/SystemWeb/RequireSSLFalse/Web.config
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/SystemWeb/RequireSSLFalse/options b/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/SystemWeb/RequireSSLFalse/options
new file mode 100644
index 00000000000..9414f8d8ef8
--- /dev/null
+++ b/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/SystemWeb/RequireSSLFalse/options	
@@ -0,0 +1,3 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj
+semmle-extractor-options: ${testdir}/../../../../../../resources/stubs/System.Web.cs
diff --git a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLAspNetCore/UseCookiePolicyAlways/RequireSSL.expected b/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/SystemWeb/RequireSSLTrue/FormsTrue/CookieWithoutSecure.expected
similarity index 100%
rename from csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLAspNetCore/UseCookiePolicyAlways/RequireSSL.expected
rename to csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/SystemWeb/RequireSSLTrue/FormsTrue/CookieWithoutSecure.expected
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/SystemWeb/RequireSSLTrue/FormsTrue/CookieWithoutSecure.qlref b/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/SystemWeb/RequireSSLTrue/FormsTrue/CookieWithoutSecure.qlref
new file mode 100644
index 00000000000..bb0094e7d8f
--- /dev/null
+++ b/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/SystemWeb/RequireSSLTrue/FormsTrue/CookieWithoutSecure.qlref	
@@ -0,0 +1,2 @@
+query: Security Features/CWE-614/CookieWithoutSecure.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/SystemWeb/RequireSSLTrue/FormsTrue/Program.cs b/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/SystemWeb/RequireSSLTrue/FormsTrue/Program.cs
new file mode 100644
index 00000000000..8f2c4cce0a4
--- /dev/null
+++ b/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/SystemWeb/RequireSSLTrue/FormsTrue/Program.cs	
@@ -0,0 +1,7 @@
+class Program
+{
+    void CookieDefault()
+    {
+        var cookie = new System.Web.HttpCookie("cookieName"); // GOOD: requireSSL is set to true in config
+    }
+}
diff --git a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/FormsTrue/Web.config b/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/SystemWeb/RequireSSLTrue/FormsTrue/Web.config
similarity index 100%
rename from csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/FormsTrue/Web.config
rename to csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/SystemWeb/RequireSSLTrue/FormsTrue/Web.config
diff --git a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLAspNetCore/UseCookiePolicyCallback/RequireSSL.expected b/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/SystemWeb/RequireSSLTrue/HttpCookiesTrue/CookieWithoutSecure.expected
similarity index 100%
rename from csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLAspNetCore/UseCookiePolicyCallback/RequireSSL.expected
rename to csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/SystemWeb/RequireSSLTrue/HttpCookiesTrue/CookieWithoutSecure.expected
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/SystemWeb/RequireSSLTrue/HttpCookiesTrue/CookieWithoutSecure.qlref b/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/SystemWeb/RequireSSLTrue/HttpCookiesTrue/CookieWithoutSecure.qlref
new file mode 100644
index 00000000000..bb0094e7d8f
--- /dev/null
+++ b/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/SystemWeb/RequireSSLTrue/HttpCookiesTrue/CookieWithoutSecure.qlref	
@@ -0,0 +1,2 @@
+query: Security Features/CWE-614/CookieWithoutSecure.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/SystemWeb/RequireSSLTrue/HttpCookiesTrue/Program.cs b/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/SystemWeb/RequireSSLTrue/HttpCookiesTrue/Program.cs
new file mode 100644
index 00000000000..8f2c4cce0a4
--- /dev/null
+++ b/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/SystemWeb/RequireSSLTrue/HttpCookiesTrue/Program.cs	
@@ -0,0 +1,7 @@
+class Program
+{
+    void CookieDefault()
+    {
+        var cookie = new System.Web.HttpCookie("cookieName"); // GOOD: requireSSL is set to true in config
+    }
+}
diff --git a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/HttpCookiesTrue/Web.config b/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/SystemWeb/RequireSSLTrue/HttpCookiesTrue/Web.config
similarity index 100%
rename from csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/HttpCookiesTrue/Web.config
rename to csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/SystemWeb/RequireSSLTrue/HttpCookiesTrue/Web.config
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/SystemWeb/RequireSSLTrue/options b/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/SystemWeb/RequireSSLTrue/options
new file mode 100644
index 00000000000..488c2bc3705
--- /dev/null
+++ b/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/SystemWeb/RequireSSLTrue/options	
@@ -0,0 +1,3 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../../../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj
+semmle-extractor-options: ${testdir}/../../../../../../../resources/stubs/System.Web.cs
diff --git a/csharp/ql/test/query-tests/standalone/Bad Practices/Control-Flow/ConstantCondition/ConstantCondition.expected b/csharp/ql/test/query-tests/standalone/Bad Practices/Control-Flow/ConstantCondition/ConstantCondition.expected
index 25ed39bebb7..b00cfb3115e 100644
--- a/csharp/ql/test/query-tests/standalone/Bad Practices/Control-Flow/ConstantCondition/ConstantCondition.expected	
+++ b/csharp/ql/test/query-tests/standalone/Bad Practices/Control-Flow/ConstantCondition/ConstantCondition.expected	
@@ -1,2 +1,2 @@
-| ConstantCondition.cs:15:13:15:26 | ... is ... | Condition always evaluates to 'false'. |
-| ConstantCondition.cs:15:24:15:26 | access to type Int32 | Pattern never matches. |
+| ConstantCondition.cs:15:13:15:26 | ... is ... | Condition always evaluates to 'false'. | ConstantCondition.cs:15:13:15:26 | ... is ... | dummy |
+| ConstantCondition.cs:15:24:15:26 | access to type Int32 | Pattern never matches. | ConstantCondition.cs:15:24:15:26 | access to type Int32 | dummy |
diff --git a/csharp/ql/test/resources/stubs/System.Web.cs b/csharp/ql/test/resources/stubs/System.Web.cs
index f0572742f88..c15b871095f 100644
--- a/csharp/ql/test/resources/stubs/System.Web.cs
+++ b/csharp/ql/test/resources/stubs/System.Web.cs
@@ -178,6 +178,13 @@ namespace System.Web
         public string RawUrl { get; set; }
         public HttpCookieCollection Cookies => null;
         public bool IsAuthenticated { get; set; }
+        public NameValueCollection Form { get; }
+        public NameValueCollection Headers { get; }
+        public NameValueCollection Params { get; }
+        public string UserAgent { get; }
+        public Uri UrlReferrer { get; }
+        public NameValueCollection ServerVariables { get; }
+        public String this[String key] => null;
     }
 
     public class HttpRequestWrapper : System.Web.HttpRequestBase
diff --git a/csharp/scripts/create-extractor-pack.sh b/csharp/scripts/create-extractor-pack.sh
index c3e6090a635..a1b5a044ebc 100755
--- a/csharp/scripts/create-extractor-pack.sh
+++ b/csharp/scripts/create-extractor-pack.sh
@@ -21,7 +21,7 @@ mkdir -p extractor-pack
 mkdir -p extractor-pack/tools/${platform}
 
 function dotnet_publish {
-  dotnet publish --self-contained --configuration Release --runtime ${dotnet_platform} -p:RuntimeFrameworkVersion=9.0.0 $1 --output extractor-pack/tools/${platform}
+  dotnet publish --self-contained --configuration Release --runtime ${dotnet_platform} -p:RuntimeFrameworkVersion=9.0.5 $1 --output extractor-pack/tools/${platform}
 }
 
 dotnet tool restore
diff --git a/csharp/scripts/stubs/helpers.py b/csharp/scripts/stubs/helpers.py
index d1f3bdb59c2..f3810e4f8cc 100644
--- a/csharp/scripts/stubs/helpers.py
+++ b/csharp/scripts/stubs/helpers.py
@@ -118,7 +118,7 @@ class Generator:
         bqrsFile = os.path.join(rawOutputDir, outputName + '.bqrs')
         jsonFile = os.path.join(rawOutputDir, outputName + '.json')
 
-        sdk_version = '9.0.100'
+        sdk_version = '9.0.300'
         print("\n* Creating new global.json file and setting SDK to " + sdk_version)
         self.run_cmd(['dotnet', 'new', 'globaljson', '--force', '--sdk-version', sdk_version, '--output', self.workDir])
 
diff --git a/csharp/tools/tracing-config.lua b/csharp/tools/tracing-config.lua
index a48a93c073c..13ede12a237 100644
--- a/csharp/tools/tracing-config.lua
+++ b/csharp/tools/tracing-config.lua
@@ -221,9 +221,9 @@ function RegisterExtractorPack(id)
     }
     local posixMatchers = {
         DotnetMatcherBuild,
-        CreatePatternMatcher({ '^mcs%.exe$', '^csc%.exe$' }, MatchCompilerName,
+        CreatePatternMatcher({ '^mcs%.exe$', '^csc%.exe$', '^csc$' }, MatchCompilerName,
             extractor, {
-            prepend = { '--compiler', '"${compiler}"' },
+            prepend = { '--compiler', '${compiler}' },
             order = ORDER_BEFORE
         }),
         MsBuildMatcher,
diff --git a/docs/codeql/codeql-for-visual-studio-code/setting-up-codeql-in-visual-studio-code.rst b/docs/codeql/codeql-for-visual-studio-code/setting-up-codeql-in-visual-studio-code.rst
index 94b291a69b8..3c2f44fcf15 100644
--- a/docs/codeql/codeql-for-visual-studio-code/setting-up-codeql-in-visual-studio-code.rst
+++ b/docs/codeql/codeql-for-visual-studio-code/setting-up-codeql-in-visual-studio-code.rst
@@ -74,7 +74,7 @@ To use the starter workspace:
     * Make sure you include the submodules, either by using ``git clone --recursive``, or using by ``git submodule update --init --remote`` after cloning.
     * Use ``git submodule update --remote`` regularly to keep the submodules up to date.
 
-#. In VS Code, use the **File** > **Open Workspace** option to open the ``vscode-codeql-starter.code-workspace`` file from your checkout of the workspace repository.
+#. In VS Code, use the **File** > **Open Workspace from File** option to open the ``vscode-codeql-starter.code-workspace`` file from your checkout of the workspace repository.
 
 Remember to update the ``ql`` submodule in the starter workspace periodically to ensure that it remains compatible with newer versions of the VS Code extension and the CodeQL CLI.
 
diff --git a/docs/codeql/codeql-language-guides/analyzing-data-flow-in-cpp.rst b/docs/codeql/codeql-language-guides/analyzing-data-flow-in-cpp.rst
index e04cdac3deb..2f2381f32ad 100644
--- a/docs/codeql/codeql-language-guides/analyzing-data-flow-in-cpp.rst
+++ b/docs/codeql/codeql-language-guides/analyzing-data-flow-in-cpp.rst
@@ -314,7 +314,7 @@ Exercise 2: Write a query that finds all hard-coded strings used to create a ``h
 
 Exercise 3: Write a class that represents flow sources from ``getenv``. (`Answer <#exercise-3>`__)
 
-Exercise 4: Using the answers from 2 and 3, write a query which finds all global data flow paths from ``getenv`` to ``gethostbyname``. (`Answer <#exercise-4>`__)
+Exercise 4: Using the answers from 2 and 3, write a query which finds all global data flow paths from ``getenv`` to ``gethostbyname``. (`Answer <#exercise-4>`__ `Answer as a path query <#path-query-example>`__)
 
 Answers
 -------
@@ -411,6 +411,48 @@ Exercise 4
      GetenvToGethostbynameFlow::flow(source, sink)
    select getenv, fc
 
+Path query example
+~~~~~~~~~~~~~~~~~~
+
+Here is the answer to exercise 4 above, converted into a path query:
+
+.. code-block:: ql
+
+   /**
+    * @kind path-problem
+    * @problem.severity warning
+    * @id getenv-to-gethostbyname
+    */
+
+   import cpp
+   import semmle.code.cpp.dataflow.new.DataFlow
+
+   class GetenvSource extends DataFlow::Node {
+     GetenvSource() { this.asIndirectExpr(1).(FunctionCall).getTarget().hasGlobalName("getenv") }
+   }
+
+   module GetenvToGethostbynameConfiguration implements DataFlow::ConfigSig {
+     predicate isSource(DataFlow::Node source) { source instanceof GetenvSource }
+
+     predicate isSink(DataFlow::Node sink) {
+       exists(FunctionCall fc |
+         sink.asIndirectExpr(1) = fc.getArgument(0) and
+         fc.getTarget().hasName("gethostbyname")
+       )
+     }
+   }
+
+   module GetenvToGethostbynameFlow = DataFlow::Global<GetenvToGethostbynameConfiguration>;
+
+   import GetenvToGethostbynameFlow::PathGraph
+
+   from GetenvToGethostbynameFlow::PathNode source, GetenvToGethostbynameFlow::PathNode sink
+   where GetenvToGethostbynameFlow::flowPath(source, sink)
+   select sink.getNode(), source, sink, "This file access uses data from $@.",
+     source, "user-controllable input."
+
+For more information, see "`Creating path queries <https://codeql.github.com/docs/writing-codeql-queries/creating-path-queries/>`__".
+
 Further reading
 ---------------
 
diff --git a/docs/codeql/codeql-language-guides/analyzing-data-flow-in-csharp.rst b/docs/codeql/codeql-language-guides/analyzing-data-flow-in-csharp.rst
index 7e60956a5a9..af196d314ed 100644
--- a/docs/codeql/codeql-language-guides/analyzing-data-flow-in-csharp.rst
+++ b/docs/codeql/codeql-language-guides/analyzing-data-flow-in-csharp.rst
@@ -287,7 +287,7 @@ Exercise 2: Find all hard-coded strings passed to ``System.Uri``, using global d
 
 Exercise 3: Define a class that represents flow sources from ``System.Environment.GetEnvironmentVariable``. (`Answer <#exercise-3>`__)
 
-Exercise 4: Using the answers from 2 and 3, write a query which finds all global data flow paths from ``System.Environment.GetEnvironmentVariable`` to ``System.Uri``. (`Answer <#exercise-4>`__)
+Exercise 4: Using the answers from 2 and 3, write a query which finds all global data flow paths from ``System.Environment.GetEnvironmentVariable`` to ``System.Uri``. (`Answer <#exercise-4>`__ `Answer as a path query <#path-query-example>`__)
 
 Extending library data flow
 ---------------------------
@@ -537,6 +537,48 @@ This can be adapted from the ``SystemUriFlow`` class:
      }
    }
 
+Path query example
+~~~~~~~~~~~~~~~~~~
+
+Here is the answer to exercise 4 above, converted into a path query:
+
+.. code-block:: ql
+
+   /**
+    * @kind path-problem
+    * @problem.severity warning
+    * @id getenv-to-gethostbyname
+    */
+
+   import csharp
+
+   class EnvironmentVariableFlowSource extends DataFlow::ExprNode {
+     EnvironmentVariableFlowSource() {
+       this.getExpr().(MethodCall).getTarget().hasQualifiedName("System.Environment.GetEnvironmentVariable")
+     }
+   }
+
+   module EnvironmentToUriConfig implements DataFlow::ConfigSig {
+     predicate isSource(DataFlow::Node src) {
+       src instanceof EnvironmentVariableFlowSource
+     }
+
+     predicate isSink(DataFlow::Node sink) {
+       exists(Call c | c.getTarget().(Constructor).getDeclaringType().hasQualifiedName("System.Uri")
+       and sink.asExpr()=c.getArgument(0))
+     }
+   }
+
+   module EnvironmentToUriFlow = DataFlow::Global<EnvironmentToUriConfig>;
+
+   import EnvironmentToUriFlow::PathGraph
+
+   from EnvironmentToUriFlow::PathNode src, EnvironmentToUriFlow::PathNode sink
+   where EnvironmentToUriFlow::flowPath(src, sink)
+   select src.getNode(), src, sink, "This environment variable constructs a 'System.Uri' $@.", sink, "here"
+
+For more information, see "`Creating path queries <https://codeql.github.com/docs/writing-codeql-queries/creating-path-queries/>`__".
+
 Further reading
 ---------------
 
diff --git a/docs/codeql/codeql-language-guides/analyzing-data-flow-in-go.rst b/docs/codeql/codeql-language-guides/analyzing-data-flow-in-go.rst
index 537a2308203..3b71f28c0ce 100644
--- a/docs/codeql/codeql-language-guides/analyzing-data-flow-in-go.rst
+++ b/docs/codeql/codeql-language-guides/analyzing-data-flow-in-go.rst
@@ -224,7 +224,7 @@ The resulting module has an identical signature to the one obtained from ``DataF
 Flow sources
 ~~~~~~~~~~~~
 
-The data flow library contains some predefined flow sources. The class ``RemoteFlowSource`` (defined in ``semmle.code.java.dataflow.FlowSources``) represents data flow sources that may be controlled by a remote user, which is useful for finding security problems.
+The data flow library contains some predefined flow sources. The class ``RemoteFlowSource`` represents data flow sources that may be controlled by a remote user, which is useful for finding security problems.
 
 Examples
 ~~~~~~~~
@@ -252,7 +252,7 @@ Exercise 2: Write a query that finds all hard-coded strings used to create a ``u
 
 Exercise 3: Write a class that represents flow sources from ``os.Getenv(..)``. (`Answer <#exercise-3>`__)
 
-Exercise 4: Using the answers from 2 and 3, write a query which finds all global data flow paths from ``os.Getenv`` to ``url.URL``. (`Answer <#exercise-4>`__)
+Exercise 4: Using the answers from 2 and 3, write a query which finds all global data flow paths from ``os.Getenv`` to ``url.URL``. (`Answer <#exercise-4>`__ `Answer as a path query <#path-query-example>`__)
 
 Answers
 -------
@@ -312,7 +312,7 @@ Exercise 3
 
    import go
 
-   class GetenvSource extends CallExpr {
+   class GetenvSource extends DataFlow::CallNode {
      GetenvSource() {
        exists(Function m | m = this.getTarget() |
          m.hasQualifiedName("os", "Getenv")
@@ -327,7 +327,7 @@ Exercise 4
 
    import go
 
-   class GetenvSource extends CallExpr {
+   class GetenvSource extends DataFlow::CallNode {
      GetenvSource() {
        exists(Function m | m = this.getTarget() |
          m.hasQualifiedName("os", "Getenv")
@@ -350,7 +350,6 @@ Exercise 4
          sink.asExpr() = call.getArgument(0)
        )
      }
-     }
    }
 
    module GetenvToURLFlow = DataFlow::Global<GetenvToURLConfig>;
@@ -359,6 +358,56 @@ Exercise 4
    where GetenvToURLFlow::flow(src, sink)
    select src, "This environment variable constructs a URL $@.", sink, "here"
 
+Path query example
+~~~~~~~~~~~~~~~~~~
+
+Here is the answer to exercise 4 above, converted into a path query:
+
+.. code-block:: ql
+
+   /**
+    * @kind path-problem
+    * @problem.severity warning
+    * @id getenv-to-url
+    */
+
+   import go
+
+   class GetenvSource extends DataFlow::CallNode {
+     GetenvSource() {
+       exists(Function m | m = this.getTarget() |
+         m.hasQualifiedName("os", "Getenv")
+       )
+     }
+   }
+
+   module GetenvToURLConfig implements DataFlow::ConfigSig {
+     predicate isSource(DataFlow::Node source) {
+       source instanceof GetenvSource
+     }
+
+     predicate isSink(DataFlow::Node sink) {
+       exists(Function urlParse, CallExpr call |
+         (
+           urlParse.hasQualifiedName("url", "Parse") or
+           urlParse.hasQualifiedName("url", "ParseRequestURI")
+         ) and
+         call.getTarget() = urlParse and
+         sink.asExpr() = call.getArgument(0)
+       )
+     }
+   }
+
+   module GetenvToURLFlow = DataFlow::Global<GetenvToURLConfig>;
+
+   import GetenvToURLFlow::PathGraph
+
+   from GetenvToURLFlow::PathNode src, GetenvToURLFlow::PathNode sink
+   where GetenvToURLFlow::flowPath(src, sink)
+   select src.getNode(), src, sink, "This environment variable constructs a URL $@.", sink, "here"
+
+For more information, see "`Creating path queries <https://codeql.github.com/docs/writing-codeql-queries/creating-path-queries/>`__".
+
 Further reading
 ---------------
 
diff --git a/docs/codeql/codeql-language-guides/analyzing-data-flow-in-java.rst b/docs/codeql/codeql-language-guides/analyzing-data-flow-in-java.rst
index bade378d3a0..6273c03e5d9 100644
--- a/docs/codeql/codeql-language-guides/analyzing-data-flow-in-java.rst
+++ b/docs/codeql/codeql-language-guides/analyzing-data-flow-in-java.rst
@@ -262,7 +262,7 @@ Exercise 2: Write a query that finds all hard-coded strings used to create a ``j
 
 Exercise 3: Write a class that represents flow sources from ``java.lang.System.getenv(..)``. (`Answer <#exercise-3>`__)
 
-Exercise 4: Using the answers from 2 and 3, write a query which finds all global data flow paths from ``getenv`` to ``java.net.URL``. (`Answer <#exercise-4>`__)
+Exercise 4: Using the answers from 2 and 3, write a query which finds all global data flow paths from ``getenv`` to ``java.net.URL``. (`Answer <#exercise-4>`__ `Answer as a path query <#path-query-example>`__)
 
 Answers
 -------
@@ -361,6 +361,54 @@ Exercise 4
    where GetenvToURLFlow::flow(src, sink)
    select src, "This environment variable constructs a URL $@.", sink, "here"
 
+Path query example
+~~~~~~~~~~~~~~~~~~
+
+Here is the answer to exercise 4 above, converted into a path query:
+
+.. code-block:: ql
+
+   /**
+    * @kind path-problem
+    * @problem.severity warning
+    * @id getenv-to-url
+    */
+
+   import java
+   import semmle.code.java.dataflow.DataFlow
+
+   class GetenvSource extends DataFlow::ExprNode {
+     GetenvSource() {
+       exists(Method m | m = this.asExpr().(MethodCall).getMethod() |
+         m.hasName("getenv") and
+         m.getDeclaringType() instanceof TypeSystem
+       )
+     }
+   }
+
+   module GetenvToURLConfig implements DataFlow::ConfigSig {
+     predicate isSource(DataFlow::Node source) {
+       source instanceof GetenvSource
+     }
+
+     predicate isSink(DataFlow::Node sink) {
+       exists(Call call |
+         sink.asExpr() = call.getArgument(0) and
+         call.getCallee().(Constructor).getDeclaringType().hasQualifiedName("java.net", "URL")
+       )
+     }
+   }
+
+   module GetenvToURLFlow = DataFlow::Global<GetenvToURLConfig>;
+
+   import GetenvToURLFlow::PathGraph
+
+   from GetenvToURLFlow::PathNode src, GetenvToURLFlow::PathNode sink
+   where GetenvToURLFlow::flowPath(src, sink)
+   select src.getNode(), src, sink, "This environment variable constructs a URL $@.", sink, "here"
+
+For more information, see "`Creating path queries <https://codeql.github.com/docs/writing-codeql-queries/creating-path-queries/>`__".
+
 Further reading
 ---------------
 
diff --git a/docs/codeql/codeql-language-guides/analyzing-data-flow-in-javascript-and-typescript.rst b/docs/codeql/codeql-language-guides/analyzing-data-flow-in-javascript-and-typescript.rst
index d6e6621e578..a0e62706041 100644
--- a/docs/codeql/codeql-language-guides/analyzing-data-flow-in-javascript-and-typescript.rst
+++ b/docs/codeql/codeql-language-guides/analyzing-data-flow-in-javascript-and-typescript.rst
@@ -456,7 +456,7 @@ Exercise 3: Write a class which represents flow sources from the array elements
 Hint: array indices are properties with numeric names; you can use regular expression matching to check this. (`Answer <#exercise-3>`__)
 
 Exercise 4: Using the answers from 2 and 3, write a query which finds all global data flow paths from array elements of the result of a call to the ``tagName`` argument to the
-``createElement`` function. (`Answer <#exercise-4>`__)
+``createElement`` function. (`Answer <#exercise-4>`__ `Answer as a path query <#path-query-example>`__)
 
 Answers
 -------
@@ -541,6 +541,48 @@ Exercise 4
   where HardCodedTagNameFlow::flow(source, sink)
   select source, sink
 
+Path query example
+~~~~~~~~~~~~~~~~~~
+
+Here is the answer to exercise 4 above, converted into a path query:
+
+.. code-block:: ql
+
+  /**
+   * @kind path-problem
+   * @problem.severity warning
+   * @id hard-coded-tag-name
+   */
+
+  import javascript
+
+  class ArrayEntryCallResult extends DataFlow::Node {
+    ArrayEntryCallResult() {
+      exists(DataFlow::CallNode call, string index |
+        this = call.getAPropertyRead(index) and
+        index.regexpMatch("\\d+")
+      )
+    }
+  }
+
+  module HardCodedTagNameConfig implements DataFlow::ConfigSig {
+    predicate isSource(DataFlow::Node source) { source instanceof ArrayEntryCallResult }
+
+    predicate isSink(DataFlow::Node sink) {
+      sink = DataFlow::globalVarRef("document").getAMethodCall("createElement").getArgument(0)
+    }
+  }
+
+  module HardCodedTagNameFlow = DataFlow::Global<HardCodedTagNameConfig>;
+
+   import HardCodedTagNameFlow::PathGraph
+
+   from HardCodedTagNameFlow::PathNode source, HardCodedTagNameFlow::PathNode sink
+   where HardCodedTagNameFlow::flowPath(source, sink)
+   select sink.getNode(), source, sink, "Hard-coded tag name $@.", source, "here"
+
+For more information, see "`Creating path queries <https://codeql.github.com/docs/writing-codeql-queries/creating-path-queries/>`__".
+
 Further reading
 ---------------
 
diff --git a/docs/codeql/codeql-language-guides/analyzing-data-flow-in-python.rst b/docs/codeql/codeql-language-guides/analyzing-data-flow-in-python.rst
index 4bce178d41f..143c54e6fbd 100644
--- a/docs/codeql/codeql-language-guides/analyzing-data-flow-in-python.rst
+++ b/docs/codeql/codeql-language-guides/analyzing-data-flow-in-python.rst
@@ -354,11 +354,50 @@ This data flow configuration tracks data flow from environment variables to open
     select fileOpen, "This call to 'os.open' uses data from $@.",
       environment, "call to 'os.getenv'"
 
+Path query example
+~~~~~~~~~~~~~~~~~~
+
+Here is the network input example above, converted into a path query:
+
+.. code-block:: ql
+
+    /**
+     * @kind path-problem
+     * @problem.severity warning
+     * @id file-system-access-from-remote-input
+     */
+
+    import python
+    import semmle.python.dataflow.new.DataFlow
+    import semmle.python.dataflow.new.TaintTracking
+    import semmle.python.dataflow.new.RemoteFlowSources
+    import semmle.python.Concepts
+
+    module RemoteToFileConfiguration implements DataFlow::ConfigSig {
+      predicate isSource(DataFlow::Node source) {
+        source instanceof RemoteFlowSource
+      }
+
+      predicate isSink(DataFlow::Node sink) {
+        sink = any(FileSystemAccess fa).getAPathArgument()
+      }
+    }
+
+    module RemoteToFileFlow = TaintTracking::Global<RemoteToFileConfiguration>;
+
+    import RemoteToFileFlow::PathGraph
+
+    from RemoteToFileFlow::PathNode input, RemoteToFileFlow::PathNode fileAccess
+    where RemoteToFileFlow::flowPath(input, fileAccess)
+    select fileAccess.getNode(), input, fileAccess, "This file access uses data from $@.",
+      input, "user-controllable input."
+
+For more information, see "`Creating path queries <https://codeql.github.com/docs/writing-codeql-queries/creating-path-queries/>`__".
 
 Further reading
 ---------------
 
-- `Exploring data flow with path queries  <https://docs.github.com/en/code-security/codeql-for-vs-code/getting-started-with-codeql-for-vs-code/exploring-data-flow-with-path-queries>`__ in the GitHub documentation.
+- `Creating path queries  <https://codeql.github.com/docs/writing-codeql-queries/creating-path-queries/>`__.
 
 
 .. include:: ../reusables/python-further-reading.rst
diff --git a/docs/codeql/codeql-language-guides/analyzing-data-flow-in-ruby.rst b/docs/codeql/codeql-language-guides/analyzing-data-flow-in-ruby.rst
index 53d6dfa2d1c..c0dd373f39b 100644
--- a/docs/codeql/codeql-language-guides/analyzing-data-flow-in-ruby.rst
+++ b/docs/codeql/codeql-language-guides/analyzing-data-flow-in-ruby.rst
@@ -372,6 +372,43 @@ The following global data-flow query finds calls to ``File.open`` where the file
     select fileOpen, "This call to 'File.open' uses data from $@.", environment,
       "an environment variable"
 
+Path query example
+~~~~~~~~~~~~~~~~~~
+
+Here is the taint-tracking example above, converted into a path query:
+
+.. code-block:: ql
+
+    /**
+     * @kind path-problem
+     * @problem.severity warning
+     * @id file-system-access-from-remote-input
+     */
+
+    import codeql.ruby.DataFlow
+    import codeql.ruby.TaintTracking
+    import codeql.ruby.Concepts
+    import codeql.ruby.dataflow.RemoteFlowSources
+
+    module RemoteToFileConfiguration implements DataFlow::ConfigSig {
+      predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
+
+      predicate isSink(DataFlow::Node sink) {
+        sink = any(FileSystemAccess fa).getAPathArgument()
+      }
+    }
+
+    module RemoteToFileFlow = TaintTracking::Global<RemoteToFileConfiguration>;
+
+    import RemoteToFileFlow::PathGraph
+
+    from RemoteToFileFlow::PathNode input, RemoteToFileFlow::PathNode fileAccess
+    where RemoteToFileFlow::flowPath(input, fileAccess)
+    select fileAccess.getNode(), input, fileAccess, "This file access uses data from $@.",
+      input, "user-controllable input."
+
+For more information, see "`Creating path queries <https://codeql.github.com/docs/writing-codeql-queries/creating-path-queries/>`__".
+
 Further reading
 ---------------
 
diff --git a/docs/codeql/codeql-language-guides/analyzing-data-flow-in-rust.rst b/docs/codeql/codeql-language-guides/analyzing-data-flow-in-rust.rst
index 8aed9fc9326..7623e1f4465 100644
--- a/docs/codeql/codeql-language-guides/analyzing-data-flow-in-rust.rst
+++ b/docs/codeql/codeql-language-guides/analyzing-data-flow-in-rust.rst
@@ -231,6 +231,46 @@ The following global taint-tracking query finds places where a string literal is
     where ConstantPasswordFlow::flow(sourceNode, sinkNode)
     select sinkNode, "The value $@ is used as a constant password.", sourceNode, sourceNode.toString()
 
+Path query example
+~~~~~~~~~~~~~~~~~~
+
+Here is the taint-tracking example above, converted into a path query:
+
+.. code-block:: ql
+
+    /**
+     * @kind path-problem
+     * @problem.severity warning
+     * @id constant-password
+     */
+
+    import rust
+    import codeql.rust.dataflow.DataFlow
+    import codeql.rust.dataflow.TaintTracking
+
+    module ConstantPasswordConfig implements DataFlow::ConfigSig {
+      predicate isSource(DataFlow::Node node) { node.asExpr().getExpr() instanceof StringLiteralExpr }
+
+      predicate isSink(DataFlow::Node node) {
+        // any argument going to a parameter called `password`
+        exists(Function f, CallExpr call, int index |
+          call.getArg(index) = node.asExpr().getExpr() and
+          call.getStaticTarget() = f and
+          f.getParam(index).getPat().(IdentPat).getName().getText() = "password"
+        )
+      }
+    }
+
+    module ConstantPasswordFlow = TaintTracking::Global<ConstantPasswordConfig>;
+
+    import ConstantPasswordFlow::PathGraph
+
+    from ConstantPasswordFlow::PathNode sourceNode, ConstantPasswordFlow::PathNode sinkNode
+    where ConstantPasswordFlow::flowPath(sourceNode, sinkNode)
+    select sinkNode.getNode(), sourceNode, sinkNode, "The value $@ is used as a constant password.", sourceNode, sourceNode.toString()
+
+For more information, see "`Creating path queries <https://codeql.github.com/docs/writing-codeql-queries/creating-path-queries/>`__".
+
 
 Further reading
 ---------------
diff --git a/docs/codeql/codeql-language-guides/analyzing-data-flow-in-swift.rst b/docs/codeql/codeql-language-guides/analyzing-data-flow-in-swift.rst
index b41c82ca7ef..8bded333654 100644
--- a/docs/codeql/codeql-language-guides/analyzing-data-flow-in-swift.rst
+++ b/docs/codeql/codeql-language-guides/analyzing-data-flow-in-swift.rst
@@ -278,6 +278,45 @@ The following global taint-tracking query finds places where a value from a remo
    where SqlInjectionFlow::flow(sourceNode, sinkNode)
    select sinkNode, "This query depends on a $@.", sourceNode, "user-provided value"
 
+Path query example
+~~~~~~~~~~~~~~~~~~
+
+Here is the string literal example above, converted into a path query:
+
+.. code-block:: ql
+
+   /**
+    * @kind path-problem
+    * @problem.severity warning
+    * @id sql-injection
+    */
+
+   import swift
+   import codeql.swift.dataflow.DataFlow
+   import codeql.swift.dataflow.TaintTracking
+   import codeql.swift.dataflow.FlowSources
+
+   module SqlInjectionConfig implements DataFlow::ConfigSig {
+     predicate isSource(DataFlow::Node node) { node instanceof FlowSource }
+
+     predicate isSink(DataFlow::Node node) {
+       exists(CallExpr call |
+         call.getStaticTarget().(Method).hasQualifiedName("Connection", "execute(_:)") and
+         call.getArgument(0).getExpr() = node.asExpr()
+       )
+     }
+   }
+
+   module SqlInjectionFlow = TaintTracking::Global<SqlInjectionConfig>;
+
+   import SqlInjectionFlow::PathGraph
+
+   from SqlInjectionFlow::PathNode sourceNode, SqlInjectionFlow::PathNode sinkNode
+   where SqlInjectionFlow::flowPath(sourceNode, sinkNode)
+   select sinkNode.getNode(), sourceNode, sinkNode, "This query depends on a $@.", sourceNode, "user-provided value"
+
+For more information, see "`Creating path queries <https://codeql.github.com/docs/writing-codeql-queries/creating-path-queries/>`__".
+
 Further reading
 ---------------
 
diff --git a/docs/codeql/codeql-language-guides/basic-query-for-rust-code.rst b/docs/codeql/codeql-language-guides/basic-query-for-rust-code.rst
new file mode 100644
index 00000000000..75892e41d42
--- /dev/null
+++ b/docs/codeql/codeql-language-guides/basic-query-for-rust-code.rst
@@ -0,0 +1,131 @@
+.. _basic-query-for-rust-code:
+
+Basic query for Rust code
+==========================
+
+Learn to write and run a simple CodeQL query using Visual Studio Code with the CodeQL extension.
+
+.. include:: ../reusables/vs-code-basic-instructions/setup-to-run-queries.rst
+
+About the query
+---------------
+
+The query we're going to run performs a basic search of the code for ``if`` expressions that are redundant, in the sense that they have an empty ``then`` branch. For example, code such as:
+
+.. code-block:: rust
+
+   if error {
+     // we should handle the error
+   }
+
+.. include:: ../reusables/vs-code-basic-instructions/find-database.rst
+
+Running a quick query
+---------------------
+
+.. include:: ../reusables/vs-code-basic-instructions/run-quick-query-1.rst
+
+#. In the quick query tab, delete the content and paste in the following query.
+
+   .. code-block:: ql
+
+      import rust
+
+      from IfExpr ifExpr
+      where ifExpr.getThen().(BlockExpr).getStmtList().getNumberOfStmtOrExpr() = 0
+      select ifExpr, "This 'if' expression is redundant."
+
+.. include:: ../reusables/vs-code-basic-instructions/run-quick-query-2.rst
+
+.. image:: ../images/codeql-for-visual-studio-code/basic-rust-query-results-1.png
+   :align: center
+
+If any matching code is found, click a link in the ``ifExpr`` column to open the file and highlight the matching ``if`` expression.
+
+.. image:: ../images/codeql-for-visual-studio-code/basic-rust-query-results-2.png
+   :align: center
+
+.. include:: ../reusables/vs-code-basic-instructions/note-store-quick-query.rst
+
+About the query structure
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+After the initial ``import`` statement, this simple query comprises three parts that serve similar purposes to the FROM, WHERE, and SELECT parts of an SQL query.
+
++----------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------+
+| Query part                                                                       | Purpose                                                                                                           | Details                                                                                              |
++==================================================================================+===================================================================================================================+======================================================================================================+
+| ``import rust``                                                                  | Imports the standard CodeQL AST libraries for Rust.                                                               | Every query begins with one or more ``import`` statements.                                           |
++----------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------+
+| ``from IfExpr ifExpr``                                                           | Defines the variables for the query.                                                                              | We use: an ``IfExpr`` variable for ``if`` expressions.                                               |
+|                                                                                  | Declarations are of the form:                                                                                     |                                                                                                      |
+|                                                                                  | ``<type> <variable name>``                                                                                        |                                                                                                      |
++----------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------+
+| ``where ifExpr.getThen().(BlockExpr).getStmtList().getNumberOfStmtOrExpr() = 0`` | Defines a condition on the variables.                                                                             | ``ifExpr.getThen()``: gets the ``then`` branch of the ``if`` expression.                             |
+|                                                                                  |                                                                                                                   | ``.(BlockExpr)``: requires that the ``then`` branch is a block expression (``{ }``).                 |
+|                                                                                  |                                                                                                                   | ``.getStmtList()``: gets the list of things in the block.                                            |
+|                                                                                  |                                                                                                                   | ``.getNumberOfStmtOrExpr() = 0``: requires that there are no statements or expressions in the block. |
++----------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------+
+| ``select ifExpr, "This 'if' expression is redundant."``                          | Defines what to report for each match.                                                                            | Reports the resulting ``if`` expression with a string that explains the problem.                     |
+|                                                                                  |                                                                                                                   |                                                                                                      |
+|                                                                                  | ``select`` statements for queries that are used to find instances of poor coding practice are always in the form: |                                                                                                      |
+|                                                                                  | ``select <program element>, "<alert message>"``                                                                   |                                                                                                      |
++----------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------+
+
+Extend the query
+----------------
+
+Query writing is an inherently iterative process. You write a simple query and then, when you run it, you discover examples that you had not previously considered, or opportunities for improvement.
+
+Remove false positive results
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Browsing the results of our basic query shows that it could be improved. Among the results you are likely to find examples of ``if`` expressions with an ``else`` branch, where an empty ``then`` branch does serve a purpose. For example:
+
+.. code-block:: rust
+
+   if (option == "-verbose") {
+     // nothing to do - handled earlier
+   } else {
+     handleError("unrecognized option")
+   }
+
+In this case, identifying the ``if`` expression with the empty ``then`` branch as redundant is a false positive. One solution to this is to modify the query to select ``if`` expressions where both the ``then`` and ``else`` branches are missing.
+
+To exclude ``if`` expressions that have an ``else`` branch:
+
+#. Add the following to the where clause:
+
+   .. code-block:: ql
+
+      and not exists(ifExpr.getElse())
+
+   The ``where`` clause is now:
+
+   .. code-block:: ql
+
+      where
+        ifExpr.getThen().(BlockExpr).getStmtList().getNumberOfStmtOrExpr() = 0 and
+        not exists(ifExpr.getElse())
+
+#. Re-run the query.
+
+   There are now fewer results because ``if`` expressions with an ``else`` branch are no longer included.
+
+Further reading
+---------------
+
+.. include:: ../reusables/rust-further-reading.rst
+.. include:: ../reusables/codeql-ref-tools-further-reading.rst
+
+.. Article-specific substitutions for the reusables used in docs/codeql/reusables/vs-code-basic-instructions
+
+.. |language-text| replace:: Rust
+
+.. |language-code| replace:: ``rust``
+
+.. |example-url| replace:: https://github.com/rust-lang/rustlings
+
+.. |image-quick-query| image:: ../images/codeql-for-visual-studio-code/quick-query-tab-rust.png
+
+.. |result-col-1|  replace:: The first column corresponds to the expression ``ifExpr`` and is linked to the location in the source code of the project where ``ifExpr`` occurs.
diff --git a/docs/codeql/codeql-language-guides/codeql-for-rust.rst b/docs/codeql/codeql-language-guides/codeql-for-rust.rst
index 24292909467..1c08acbf2fb 100644
--- a/docs/codeql/codeql-language-guides/codeql-for-rust.rst
+++ b/docs/codeql/codeql-language-guides/codeql-for-rust.rst
@@ -9,8 +9,12 @@ Experiment and learn how to write effective and efficient queries for CodeQL dat
 .. toctree::
    :hidden:
 
+   basic-query-for-rust-code
    codeql-library-for-rust
    analyzing-data-flow-in-rust
 
+-  :doc:`Basic query for Rust code <basic-query-for-rust-code>`: Learn to write and run a simple CodeQL query.
+
 -  :doc:`CodeQL library for Rust <codeql-library-for-rust>`: When analyzing Rust code, you can make use of the large collection of classes in the CodeQL library for Rust.
+
 -  :doc:`Analyzing data flow in Rust <analyzing-data-flow-in-rust>`: You can use CodeQL to track the flow of data through a Rust program to places where the data is used.
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.10.0.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.10.0.rst
index 96826b25608..7b7cba95fd3 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.10.0.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.10.0.rst
@@ -9,7 +9,7 @@ CodeQL 2.10.0 (2022-06-27)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.10.1.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.10.1.rst
index b059afcfc9e..17c0589c596 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.10.1.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.10.1.rst
@@ -9,7 +9,7 @@ CodeQL 2.10.1 (2022-07-19)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.10.2.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.10.2.rst
index 37e094f7495..93794d214ce 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.10.2.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.10.2.rst
@@ -9,7 +9,7 @@ CodeQL 2.10.2 (2022-08-02)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.10.3.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.10.3.rst
index 75d3183d4dd..f66721b9128 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.10.3.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.10.3.rst
@@ -9,7 +9,7 @@ CodeQL 2.10.3 (2022-08-15)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.10.4.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.10.4.rst
index c6d9c4c7805..7e15085db02 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.10.4.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.10.4.rst
@@ -9,7 +9,7 @@ CodeQL 2.10.4 (2022-08-31)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.10.5.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.10.5.rst
index 9c2373e358c..72082e16d70 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.10.5.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.10.5.rst
@@ -9,7 +9,7 @@ CodeQL 2.10.5 (2022-09-13)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.11.0.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.11.0.rst
index a9b32080979..332d060068e 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.11.0.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.11.0.rst
@@ -9,7 +9,7 @@ CodeQL 2.11.0 (2022-09-28)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.11.1.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.11.1.rst
index d7aff79a078..3847694a0fe 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.11.1.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.11.1.rst
@@ -9,7 +9,7 @@ CodeQL 2.11.1 (2022-10-11)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.11.2.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.11.2.rst
index 83083a9c3a9..9e0dd258b07 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.11.2.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.11.2.rst
@@ -9,7 +9,7 @@ CodeQL 2.11.2 (2022-10-25)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.11.3.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.11.3.rst
index 893d8b52ae1..fb3948cdfce 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.11.3.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.11.3.rst
@@ -9,7 +9,7 @@ CodeQL 2.11.3 (2022-11-11)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.11.4.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.11.4.rst
index ab22a245583..37b52835a7f 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.11.4.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.11.4.rst
@@ -9,7 +9,7 @@ CodeQL 2.11.4 (2022-11-24)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.11.5.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.11.5.rst
index 1ccd87c81ad..9a0f23f55c6 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.11.5.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.11.5.rst
@@ -9,7 +9,7 @@ CodeQL 2.11.5 (2022-12-07)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.11.6.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.11.6.rst
index cc4dabd21ac..2455de41316 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.11.6.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.11.6.rst
@@ -9,7 +9,7 @@ CodeQL 2.11.6 (2022-12-13)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.12.0.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.12.0.rst
index 0b7c47773d6..0993702172f 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.12.0.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.12.0.rst
@@ -9,7 +9,7 @@ CodeQL 2.12.0 (2023-01-10)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.12.1.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.12.1.rst
index c0dd4057e9e..88d9a9d202f 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.12.1.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.12.1.rst
@@ -9,7 +9,7 @@ CodeQL 2.12.1 (2023-01-23)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.12.2.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.12.2.rst
index 22df6d46a06..fc78c1bfb2b 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.12.2.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.12.2.rst
@@ -9,7 +9,7 @@ CodeQL 2.12.2 (2023-02-07)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.12.3.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.12.3.rst
index f3258301786..f954f436150 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.12.3.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.12.3.rst
@@ -9,7 +9,7 @@ CodeQL 2.12.3 (2023-02-23)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.12.4.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.12.4.rst
index 8545a2f77ca..9c84debe0a9 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.12.4.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.12.4.rst
@@ -9,7 +9,7 @@ CodeQL 2.12.4 (2023-03-09)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.12.5.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.12.5.rst
index 5a0c6ae4f92..a25613a96e6 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.12.5.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.12.5.rst
@@ -9,7 +9,7 @@ CodeQL 2.12.5 (2023-03-21)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.12.6.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.12.6.rst
index aa61cc37f8b..cf542efebda 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.12.6.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.12.6.rst
@@ -9,7 +9,7 @@ CodeQL 2.12.6 (2023-04-04)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.12.7.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.12.7.rst
index f9c0b12d10f..6fd4d8f416c 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.12.7.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.12.7.rst
@@ -9,7 +9,7 @@ CodeQL 2.12.7 (2023-04-18)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.13.0.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.13.0.rst
index 046e0f548ca..3d3bb548598 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.13.0.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.13.0.rst
@@ -9,7 +9,7 @@ CodeQL 2.13.0 (2023-04-20)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.13.1.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.13.1.rst
index 3af28abf08b..ba78f5fc2f4 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.13.1.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.13.1.rst
@@ -9,7 +9,7 @@ CodeQL 2.13.1 (2023-05-03)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.13.3.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.13.3.rst
index 1cff5244519..09c97c03ff6 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.13.3.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.13.3.rst
@@ -9,7 +9,7 @@ CodeQL 2.13.3 (2023-05-31)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.13.4.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.13.4.rst
index 6bc1dc9daec..8443cea4738 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.13.4.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.13.4.rst
@@ -9,7 +9,7 @@ CodeQL 2.13.4 (2023-06-19)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.13.5.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.13.5.rst
index f559a2d6154..b0877954388 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.13.5.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.13.5.rst
@@ -9,7 +9,7 @@ CodeQL 2.13.5 (2023-07-05)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.14.0.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.14.0.rst
index 3583785a082..9c2a459120a 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.14.0.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.14.0.rst
@@ -9,7 +9,7 @@ CodeQL 2.14.0 (2023-07-13)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.14.1.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.14.1.rst
index 736f48e5ddc..bcdebcae4f7 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.14.1.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.14.1.rst
@@ -9,7 +9,7 @@ CodeQL 2.14.1 (2023-07-27)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.14.2.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.14.2.rst
index ccc388fe210..82362f17567 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.14.2.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.14.2.rst
@@ -9,7 +9,7 @@ CodeQL 2.14.2 (2023-08-11)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.14.3.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.14.3.rst
index 2707003615b..fc6861d094c 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.14.3.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.14.3.rst
@@ -9,7 +9,7 @@ CodeQL 2.14.3 (2023-08-25)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.14.4.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.14.4.rst
index 9ad1517025f..7880af6540e 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.14.4.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.14.4.rst
@@ -9,7 +9,7 @@ CodeQL 2.14.4 (2023-09-12)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.14.5.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.14.5.rst
index c56fced5e1d..d3cc1ba634c 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.14.5.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.14.5.rst
@@ -9,7 +9,7 @@ CodeQL 2.14.5 (2023-09-14)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.14.6.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.14.6.rst
index a6e8643624c..ef518ba829b 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.14.6.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.14.6.rst
@@ -9,7 +9,7 @@ CodeQL 2.14.6 (2023-09-26)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.15.0.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.15.0.rst
index 14635c0fb50..320d322cf19 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.15.0.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.15.0.rst
@@ -9,7 +9,7 @@ CodeQL 2.15.0 (2023-10-11)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.15.1.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.15.1.rst
index b98fcd1cd3c..d82569c71f7 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.15.1.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.15.1.rst
@@ -9,7 +9,7 @@ CodeQL 2.15.1 (2023-10-19)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.15.2.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.15.2.rst
index c542a4df350..60baabb9e5a 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.15.2.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.15.2.rst
@@ -9,7 +9,7 @@ CodeQL 2.15.2 (2023-11-13)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.15.3.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.15.3.rst
index 1bcadd72b5a..fc9e283ecfc 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.15.3.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.15.3.rst
@@ -9,7 +9,7 @@ CodeQL 2.15.3 (2023-11-22)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.15.4.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.15.4.rst
index f7cbcd80210..f72f1cb8c06 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.15.4.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.15.4.rst
@@ -9,7 +9,7 @@ CodeQL 2.15.4 (2023-12-11)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.15.5.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.15.5.rst
index 31977c61599..c674850e7cd 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.15.5.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.15.5.rst
@@ -9,7 +9,7 @@ CodeQL 2.15.5 (2023-12-20)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.16.0.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.16.0.rst
index 127994f2999..c516ae0fb62 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.16.0.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.16.0.rst
@@ -9,7 +9,7 @@ CodeQL 2.16.0 (2024-01-16)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.16.1.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.16.1.rst
index cd328246d8c..99a675dbe77 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.16.1.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.16.1.rst
@@ -9,7 +9,7 @@ CodeQL 2.16.1 (2024-01-25)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.16.2.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.16.2.rst
index db04b157756..c7529d18cf4 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.16.2.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.16.2.rst
@@ -9,7 +9,7 @@ CodeQL 2.16.2 (2024-02-12)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.16.3.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.16.3.rst
index 016bf7583fb..5071c80291c 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.16.3.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.16.3.rst
@@ -9,7 +9,7 @@ CodeQL 2.16.3 (2024-02-22)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.16.4.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.16.4.rst
index a73ce5982fd..f3200dfa5fa 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.16.4.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.16.4.rst
@@ -9,7 +9,7 @@ CodeQL 2.16.4 (2024-03-11)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.16.5.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.16.5.rst
index cb602e126d1..f416159c3ee 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.16.5.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.16.5.rst
@@ -9,7 +9,7 @@ CodeQL 2.16.5 (2024-03-21)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.16.6.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.16.6.rst
index dba880ceaae..16c87249130 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.16.6.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.16.6.rst
@@ -9,7 +9,7 @@ CodeQL 2.16.6 (2024-03-26)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.17.0.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.17.0.rst
index 9551941ea38..51c18155920 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.17.0.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.17.0.rst
@@ -9,7 +9,7 @@ CodeQL 2.17.0 (2024-04-04)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.17.1.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.17.1.rst
index c162c3f9554..de95f2a7d8b 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.17.1.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.17.1.rst
@@ -9,7 +9,7 @@ CodeQL 2.17.1 (2024-04-24)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.17.2.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.17.2.rst
index 9fb2aee867b..6f6fc6f2427 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.17.2.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.17.2.rst
@@ -9,7 +9,7 @@ CodeQL 2.17.2 (2024-05-07)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.17.3.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.17.3.rst
index 45286dd2723..345c66059a9 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.17.3.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.17.3.rst
@@ -9,7 +9,7 @@ CodeQL 2.17.3 (2024-05-17)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.17.4.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.17.4.rst
index e705d8fe17f..9ae59714b90 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.17.4.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.17.4.rst
@@ -9,7 +9,7 @@ CodeQL 2.17.4 (2024-06-03)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.17.5.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.17.5.rst
index e86eb795b1e..d32b5a327e7 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.17.5.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.17.5.rst
@@ -9,7 +9,7 @@ CodeQL 2.17.5 (2024-06-12)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.17.6.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.17.6.rst
index 584d45889d5..74abb31897e 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.17.6.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.17.6.rst
@@ -9,7 +9,7 @@ CodeQL 2.17.6 (2024-06-27)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.18.0.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.18.0.rst
index c299355c00e..99764e480a5 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.18.0.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.18.0.rst
@@ -9,7 +9,7 @@ CodeQL 2.18.0 (2024-07-11)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.18.1.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.18.1.rst
index a13cd9cdc5d..5d4dd5179a1 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.18.1.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.18.1.rst
@@ -9,7 +9,7 @@ CodeQL 2.18.1 (2024-07-25)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.18.2.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.18.2.rst
index 3bc21179a89..bc67ac410d4 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.18.2.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.18.2.rst
@@ -9,7 +9,7 @@ CodeQL 2.18.2 (2024-08-13)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.18.3.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.18.3.rst
index 31ecd6e0ed7..77792853900 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.18.3.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.18.3.rst
@@ -9,7 +9,7 @@ CodeQL 2.18.3 (2024-08-28)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.18.4.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.18.4.rst
index 14f7cb96647..18556314725 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.18.4.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.18.4.rst
@@ -9,7 +9,7 @@ CodeQL 2.18.4 (2024-09-12)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.19.0.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.19.0.rst
index 0184b811817..ce5973268db 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.19.0.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.19.0.rst
@@ -9,7 +9,7 @@ CodeQL 2.19.0 (2024-09-18)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.19.1.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.19.1.rst
index 352a229a422..f2948d0db67 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.19.1.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.19.1.rst
@@ -9,7 +9,7 @@ CodeQL 2.19.1 (2024-10-04)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.19.2.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.19.2.rst
index b21bc2566a8..edc40712dc0 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.19.2.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.19.2.rst
@@ -9,7 +9,7 @@ CodeQL 2.19.2 (2024-10-21)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.19.3.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.19.3.rst
index c078993aa3f..183adc77e41 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.19.3.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.19.3.rst
@@ -9,7 +9,7 @@ CodeQL 2.19.3 (2024-11-07)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.19.4.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.19.4.rst
index 9235d63fe2c..2135aa8f759 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.19.4.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.19.4.rst
@@ -9,7 +9,7 @@ CodeQL 2.19.4 (2024-12-02)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.20.0.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.20.0.rst
index 70fed1e9cfd..1d1422d381c 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.20.0.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.20.0.rst
@@ -9,7 +9,7 @@ CodeQL 2.20.0 (2024-12-09)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.20.1.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.20.1.rst
index 11f30e96086..5d3d2d99f9e 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.20.1.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.20.1.rst
@@ -9,7 +9,7 @@ CodeQL 2.20.1 (2025-01-09)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.20.2.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.20.2.rst
index ed4d502ea2d..c657bf0c48e 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.20.2.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.20.2.rst
@@ -9,7 +9,7 @@ CodeQL 2.20.2 (2025-01-22)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.20.3.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.20.3.rst
index 053d11610a4..1fca15790f1 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.20.3.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.20.3.rst
@@ -9,7 +9,7 @@ CodeQL 2.20.3 (2025-01-24)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.20.4.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.20.4.rst
index c3012e020c7..673d4a55d59 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.20.4.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.20.4.rst
@@ -9,7 +9,7 @@ CodeQL 2.20.4 (2025-02-06)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.20.5.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.20.5.rst
index 855f25655ec..d3264090af1 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.20.5.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.20.5.rst
@@ -9,7 +9,7 @@ CodeQL 2.20.5 (2025-02-20)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.20.6.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.20.6.rst
index 76c038bded2..841b637cc34 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.20.6.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.20.6.rst
@@ -9,7 +9,7 @@ CodeQL 2.20.6 (2025-03-06)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.20.7.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.20.7.rst
index fd6885b025e..144382c9737 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.20.7.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.20.7.rst
@@ -9,7 +9,7 @@ CodeQL 2.20.7 (2025-03-18)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.21.0.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.21.0.rst
index b6396b2be4e..a9a27208831 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.21.0.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.21.0.rst
@@ -9,7 +9,7 @@ CodeQL 2.21.0 (2025-04-03)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.21.1.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.21.1.rst
index 40587985d9d..ada0a6102fc 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.21.1.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.21.1.rst
@@ -9,7 +9,7 @@ CodeQL 2.21.1 (2025-04-22)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.21.2.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.21.2.rst
index 636cf2fe63d..97d52abf744 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.21.2.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.21.2.rst
@@ -9,7 +9,7 @@ CodeQL 2.21.2 (2025-05-01)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.21.3.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.21.3.rst
index d499f27dcb1..71a8e3a6824 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.21.3.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.21.3.rst
@@ -9,7 +9,7 @@ CodeQL 2.21.3 (2025-05-15)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.21.4.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.21.4.rst
index c21a9940b4b..6fcbc0cd0ca 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.21.4.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.21.4.rst
@@ -9,7 +9,7 @@ CodeQL 2.21.4 (2025-06-02)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.22.0.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.22.0.rst
index d60b0e95769..4288b9c2e98 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.22.0.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.22.0.rst
@@ -9,7 +9,7 @@ CodeQL 2.22.0 (2025-06-11)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.22.1.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.22.1.rst
index 0b051d5473f..6aed611d5cf 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.22.1.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.22.1.rst
@@ -9,7 +9,7 @@ CodeQL 2.22.1 (2025-06-26)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.22.2.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.22.2.rst
index 92c440a05af..6164266e10f 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.22.2.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.22.2.rst
@@ -9,7 +9,7 @@ CodeQL 2.22.2 (2025-07-29)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.22.3.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.22.3.rst
index 7a1d554855d..4f1d34ff2dd 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.22.3.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.22.3.rst
@@ -9,7 +9,7 @@ CodeQL 2.22.3 (2025-08-06)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.22.4.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.22.4.rst
new file mode 100644
index 00000000000..1a592436a8f
--- /dev/null
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.22.4.rst
@@ -0,0 +1,108 @@
+.. _codeql-cli-2.22.4:
+
+==========================
+CodeQL 2.22.4 (2025-08-21)
+==========================
+
+.. contents:: Contents
+   :depth: 2
+   :local:
+   :backlinks: none
+
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+
+Security Coverage
+-----------------
+
+CodeQL 2.22.4 runs a total of 478 security queries when configured with the Default suite (covering 169 CWE). The Extended suite enables an additional 130 queries (covering 32 more CWE). 2 security queries have been added with this release.
+
+CodeQL CLI
+----------
+
+There are no user-facing CLI changes in this release.
+
+Query Packs
+-----------
+
+Minor Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+C/C++
+"""""
+
+*   The :code:`cpp/short-global-name` query will no longer give alerts for instantiations of template variables, only for the template itself.
+*   Fixed a false positive in :code:`cpp/overflow-buffer` when the type of the destination buffer is a reference to a class/struct type.
+
+JavaScript/TypeScript
+"""""""""""""""""""""
+
+*   The :code:`js/regex-injection` query no longer considers environment variables as sources by default. Environment variables can be re-enabled as sources by setting the threat model to include the "environment" category.
+
+New Queries
+~~~~~~~~~~~
+
+Rust
+""""
+
+*   Added a new query, :code:`rust/cleartext-storage-database`, for detecting cases where sensitive information is stored non-encrypted in a database.
+
+Language Libraries
+------------------
+
+Bug Fixes
+~~~~~~~~~
+
+Ruby
+""""
+
+*   Made the following changes to :code:`NetHttpRequest`
+
+    *   Adds :code:`connectionNode`, like other Ruby HTTP clients
+    *   Makes :code:`requestNode` and :code:`connectionNode` public so subclasses can use them
+    *   Adds detection of :code:`Net::HTTP.start`, a common way to make HTTP requests in Ruby
+
+Major Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Java/Kotlin
+"""""""""""
+
+*   Added library models for the relevant method calls under :code:`jakarta.servlet.ServletRequest` and :code:`jakarta.servlet.http.HttpServletRequest` as remote flow sources.
+
+Minor Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+C/C++
+"""""
+
+*   The guards libraries (:code:`semmle.code.cpp.controlflow.Guards` and :code:`semmle.code.cpp.controlflow.IRGuards`) have been improved to recognize more guards.
+*   Improved dataflow through global variables in the new dataflow library (:code:`semmle.code.cpp.dataflow.new.DataFlow` and :code:`semmle.code.cpp.dataflow.new.TaintTracking`). Queries based on these libraries will produce more results on codebases with many global variables.
+*   The global value numbering library (:code:`semmle.code.cpp.valuenumbering.GlobalValueNumbering` and :code:`semmle.code.cpp.ir.ValueNumbering`) has been improved so more expressions are assigned the same value number.
+
+Golang
+""""""
+
+*   Go 1.25 is now supported.
+
+Java/Kotlin
+"""""""""""
+
+*   Guard implication logic involving wrapper methods has been improved. In particular, this means fewer false positives for :code:`java/dereferenced-value-may-be-null`.
+
+JavaScript/TypeScript
+"""""""""""""""""""""
+
+*   Improved modeling of command-line argument parsing libraries `arg <https://www.npmjs.com/package/arg>`__, `args <https://www.npmjs.com/package/args>`__, `command-line-args <https://www.npmjs.com/package/command-line-args>`__ and `commander <https://www.npmjs.com/package/commander>`__
+
+Rust
+""""
+
+*   |link-code-let-chains-in-code-if-and-code-while-1|_ are now supported, as well as |link-code-if-let-guards-in-code-match-expressions-2|_.
+*   Added more detail to models of :code:`postgres`, :code:`rusqlite`, :code:`sqlx` and :code:`tokio-postgres`. This may improve query results, particularly for :code:`rust/sql-injection` and :code:`rust/cleartext-storage-database`.
+
+.. |link-code-let-chains-in-code-if-and-code-while-1| replace:: :code:`let` chains in :code:`if` and :code:`while`\ 
+.. _link-code-let-chains-in-code-if-and-code-while-1: https://doc.rust-lang.org/edition-guide/rust-2024/let-chains.html
+
+.. |link-code-if-let-guards-in-code-match-expressions-2| replace:: :code:`if let` guards in :code:`match` expressions
+.. _link-code-if-let-guards-in-code-match-expressions-2: https://rust-lang.github.io/rfcs/2294-if-let-guard.html
+
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.23.0.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.23.0.rst
new file mode 100644
index 00000000000..4091be0911e
--- /dev/null
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.23.0.rst
@@ -0,0 +1,149 @@
+.. _codeql-cli-2.23.0:
+
+==========================
+CodeQL 2.23.0 (2025-09-04)
+==========================
+
+.. contents:: Contents
+   :depth: 2
+   :local:
+   :backlinks: none
+
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+
+Security Coverage
+-----------------
+
+CodeQL 2.23.0 runs a total of 479 security queries when configured with the Default suite (covering 169 CWE). The Extended suite enables an additional 131 queries (covering 32 more CWE). 2 security queries have been added with this release.
+
+CodeQL CLI
+----------
+
+Miscellaneous
+~~~~~~~~~~~~~
+
+*   The build of Eclipse Temurin OpenJDK that is used to run the CodeQL CLI has been updated to version 21.0.8.
+
+Query Packs
+-----------
+
+Bug Fixes
+~~~~~~~~~
+
+C/C++
+"""""
+
+*   Fixed an inconsistency across languages where most have a :code:`Customizations.qll` file for adding customizations, but not all did.
+
+Swift
+"""""
+
+*   Fixed an inconsistency across languages where most have a :code:`Customizations.qll` file for adding customizations, but not all did.
+
+Rust
+""""
+
+*   The "Low Rust analysis quality" query (:code:`rust/diagnostic/database-quality`) has been tuned so that it won't trigger on databases that have extracted normally. This will remove spurious messages of "Low Rust analysis quality" on the CodeQL status page.
+*   Fixed an inconsistency across languages where most have a :code:`Customizations.qll` file for adding customizations, but not all did.
+
+Minor Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Java/Kotlin
+"""""""""""
+
+*   Fixed a bug that was causing false negatives in rare cases in the query :code:`java/dereferenced-value-may-be-null`.
+*   Removed the :code:`java/empty-statement` query that was subsumed by the :code:`java/empty-block` query.
+
+Python
+""""""
+
+*   The :code:`py/unexpected-raise-in-special-method` query has been modernized. It produces additional results in cases where the exception is
+    only raised conditionally. Its precision has been changed from :code:`very-high` to :code:`high`.
+*   The queries :code:`py/incomplete-ordering`, :code:`py/inconsistent-equality`, and :code:`py/equals-hash-mismatch` have been modernized; no longer relying on outdated libraries, improved documentation, and no longer producing alerts for problems specific to Python 2.
+
+New Queries
+~~~~~~~~~~~
+
+Java/Kotlin
+"""""""""""
+
+*   The query :code:`java/insecure-spring-actuator-config` has been promoted from experimental to the main query pack as :code:`java/spring-boot-exposed-actuators-config`. Its results will now appear by default. This query detects exposure of Spring Boot actuators through configuration files. It was originally submitted as an experimental query `by @luchua-bc <https://github.com/github/codeql/pull/5384>`__.
+
+Rust
+""""
+
+*   Added a new query, :code:`rust/log-injection`, for detecting cases where log entries could be forged by a malicious user.
+
+Query Metadata Changes
+~~~~~~~~~~~~~~~~~~~~~~
+
+Java/Kotlin
+"""""""""""
+
+*   The tag :code:`maintainability` has been removed from :code:`java/run-finalizers-on-exit` and the tags :code:`quality`, :code:`correctness`, and :code:`performance` have been added.
+*   The tag :code:`maintainability` has been removed from :code:`java/garbage-collection` and the tags :code:`quality` and :code:`correctness` have been added.
+
+Language Libraries
+------------------
+
+Major Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Rust
+""""
+
+*   Path resolution has been removed from the Rust extractor. For the majority of purposes CodeQL computed paths have been in use for several previous releases, this completes the transition. Extraction is now faster and more reliable.
+
+Minor Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+C/C++
+"""""
+
+*   Added flow summaries for the :code:`Microsoft::WRL::ComPtr` member functions.
+*   The new dataflow/taint-tracking library (:code:`semmle.code.cpp.dataflow.new.DataFlow` and :code:`semmle.code.cpp.dataflow.new.TaintTracking`) now resolves virtual function calls more precisely. This results in fewer false positives when running dataflow/taint-tracking queries on C++ projects.
+
+C#
+""
+
+*   A bug has been fixed in the data flow analysis, which means that flow through calls using the :code:`base` qualifier may now be tracked more accurately.
+*   Added summary models for :code:`System.Xml.XmlReader`, :code:`System.Xml.XmlTextReader` and :code:`System.Xml.XmlDictionaryReader`.
+*   Models-as-data summaries for byte and char arrays and pointers now treat the entire collection as tainted, reflecting their common use as string alternatives.
+*   The default taint tracking configuration now allows implicit reads from collections at sinks and in additional flow steps. This increases flow coverage for many taint tracking queries and helps reduce false negatives.
+
+JavaScript/TypeScript
+"""""""""""""""""""""
+
+*   Removed :code:`libxmljs` as an XML bomb sink. The underlying libxml2 library now includes `entity reference loop detection <https://github.com/GNOME/libxml2/blob/0c948334a8f5c66d50e9f8992e62998017dc4fc6/NEWS#L905-L908>`__ that prevents XML bomb attacks.
+
+Python
+""""""
+
+*   The modelling of Psycopg2 now supports the use of :code:`psycopg2.pool` connection pools for handling database connections.
+*   Removed :code:`lxml` as an XML bomb sink. The underlying libxml2 library now includes `entity reference loop detection <https://github.com/lxml/lxml/blob/f33ac2c2f5f9c4c4c1fc47f363be96db308f2fa6/doc/FAQ.txt#L1077>`__ that prevents XML bomb attacks.
+
+Rust
+""""
+
+*   Attribute macros are now taken into account when identifying macro-expanded code. This affects the queries :code:`rust/unused-variable` and :code:`rust/unused-value`, which exclude results in macro-expanded code.
+*   Improved modelling of the :code:`std::fs`, :code:`async_std::fs` and :code:`tokio::fs` libraries. This may cause more alerts to be found by Rust injection queries, particularly :code:`rust/path-injection`.
+
+New Features
+~~~~~~~~~~~~
+
+C/C++
+"""""
+
+*   Added a new class :code:`PchFile` representing precompiled header (PCH) files used during project compilation.
+
+Shared Libraries
+----------------
+
+Minor Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Utility Classes
+"""""""""""""""
+
+*   Added :code:`LocatableOption` and :code:`OptionWithLocationInfo` as modules providing option types with location information.
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.23.1.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.23.1.rst
new file mode 100644
index 00000000000..ff22a3f647c
--- /dev/null
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.23.1.rst
@@ -0,0 +1,176 @@
+.. _codeql-cli-2.23.1:
+
+==========================
+CodeQL 2.23.1 (2025-09-23)
+==========================
+
+.. contents:: Contents
+   :depth: 2
+   :local:
+   :backlinks: none
+
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+
+Security Coverage
+-----------------
+
+CodeQL 2.23.1 runs a total of 478 security queries when configured with the Default suite (covering 166 CWE). The Extended suite enables an additional 135 queries (covering 35 more CWE). 3 security queries have been added with this release.
+
+CodeQL CLI
+----------
+
+New Features
+~~~~~~~~~~~~
+
+*   CodeQL now adds the sources and sinks of path alerts to the :code:`relatedLocations` property of SARIF results if they are not included as the primary location or within the alert message. This means that path alerts will show on PRs if a source or sink is added or modified, even for queries that don't follow the common convention of selecting the sink as the primary location and mentioning the source in the alert message.
+    
+*   CodeQL now populates file coverage information for GitHub Actions on
+    \ `the tool status page for code scanning <https://docs.github.com/en/code-security/code-scanning/managing-your-code-scanning-configuration/about-the-tool-status-page#viewing-the-tool-status-page-for-a-repository>`__.
+
+Query Packs
+-----------
+
+Bug Fixes
+~~~~~~~~~
+
+C/C++
+"""""
+
+*   The predicate :code:`occurenceCount` in the file module :code:`MagicConstants` has been deprecated. Use :code:`occurrenceCount` instead.
+*   The predicate :code:`additionalAdditionOrSubstractionCheckForLeapYear` in the file module :code:`LeapYear` has been deprecated. Use :code:`additionalAdditionOrSubtractionCheckForLeapYear` instead.
+
+C#
+""
+
+*   The message for :code:`csharp/diagnostic/database-quality` has been updated to include detailed database health metrics. Additionally, the threshold for reporting database health issues has been lowered from 95% to 85% (if any metric falls below this percentage). These changes are visible on the tool status page.
+
+Java/Kotlin
+"""""""""""
+
+*   The message for :code:`java/diagnostic/database-quality` has been updated to include detailed database health metrics. Additionally, the threshold for reporting database health issues has been lowered from 95% to 85% (if any metric falls below this percentage). These changes are visible on the tool status page.
+
+Rust
+""""
+
+*   The message for :code:`rust/diagnostic/database-quality` has been updated to include detailed database health metrics. These changes are visible on the tool status page.
+
+Major Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+C/C++
+"""""
+
+*   The queries :code:`cpp/wrong-type-format-argument`, :code:`cpp/comparison-with-wider-type`, :code:`cpp/integer-multiplication-cast-to-long`, :code:`cpp/implicit-function-declaration` and :code:`cpp/suspicious-add-sizeof` have had their precisions reduced from :code:`high` to :code:`medium`. They will also now give alerts for projects built with :code:`build-mode: none`.
+*   The queries :code:`cpp/wrong-type-format-argument`, :code:`cpp/comparison-with-wider-type`, :code:`cpp/integer-multiplication-cast-to-long` and :code:`cpp/suspicious-add-sizeof` are no longer included in the :code:`code-scanning` suite.
+
+Java/Kotlin
+"""""""""""
+
+*   The implementation of :code:`java/dereferenced-value-may-be-null` has been completely replaced with a new general control-flow reachability library. This improves precision by reducing false positives. However, since the entire calculation has been reworked, there can be small corner cases where precision regressions might occur and new false positives may occur, but these cases should be rare.
+
+JavaScript/TypeScript
+"""""""""""""""""""""
+
+*   Added support for TypeScript 5.9
+*   Added support for :code:`import defer` syntax in JavaScript and TypeScript.
+
+Minor Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+C#
+""
+
+*   The query :code:`cs/call-to-object-tostring` has been improved to remove false positives for enum types.
+
+JavaScript/TypeScript
+"""""""""""""""""""""
+
+*   Data flow is now tracked through the :code:`Promise.try` and :code:`Array.prototype.with` functions.
+*   Query :code:`js/index-out-of-bounds` no longer produces a false-positive when a strictly-less-than check overrides a previous less-than-or-equal test.
+*   The query :code:`js/remote-property-injection` now detects property injection vulnerabilities through object enumeration patterns such as :code:`Object.keys()`.
+*   The query "Permissive CORS configuration" (:code:`js/cors-permissive-configuration`) has been promoted from experimental and is now part of the default security suite. Thank you to @maikypedia who `submitted the original experimental query <https://github.com/github/codeql/pull/14342>`__!
+
+Python
+""""""
+
+*   The queries :code:`py/missing-call-to-init`, :code:`py/missing-calls-to-del`, :code:`py/multiple-calls-to-init`, and :code:`py/multiple-calls-to-del` queries have been modernized; no longer relying on outdated libraries, producing more precise results with more descriptive alert messages, and improved documentation.
+
+GitHub Actions
+""""""""""""""
+
+*   Actions analysis now reports file coverage information on the CodeQL status page.
+
+Deprecated Queries
+~~~~~~~~~~~~~~~~~~
+
+C#
+""
+
+*   The query :code:`cs/captured-foreach-variable` has been deprecated as the semantics of capturing a 'foreach' variable and using it outside the loop has been stable since C# version 5.
+
+New Queries
+~~~~~~~~~~~
+
+Rust
+""""
+
+*   Added a new query, :code:`rust/request-forgery`, for detecting server-side request forgery vulnerabilities.
+
+Language Libraries
+------------------
+
+Minor Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Golang
+""""""
+
+*   The second argument of the :code:`CreateTemp` function, from the :code:`os` package, is no longer a path-injection sink due to proper sanitization by Go.
+*   The query "Uncontrolled data used in path expression" (:code:`go/path-injection`) now detects sanitizing a path by adding :code:`os.PathSeparator` or ``\`` to the beginning.
+
+Java/Kotlin
+"""""""""""
+
+*   Improved support for various assertion libraries, in particular JUnit. This affects the control-flow graph slightly, and in turn affects several queries (mainly quality queries). Most queries should see improved precision (new true positives and fewer false positives), in particular :code:`java/constant-comparison`, :code:`java/index-out-of-bounds`, :code:`java/dereferenced-value-may-be-null`, and :code:`java/useless-null-check`. Some medium precision queries like :code:`java/toctou-race-condition` and :code:`java/unreleased-lock` may see mixed result changes (both slight improvements and slight regressions).
+*   Added taint flow model for :code:`java.crypto.KDF`.
+*   Added taint flow model for :code:`java.lang.ScopedValue`.
+
+JavaScript/TypeScript
+"""""""""""""""""""""
+
+*   Added modeling for promisification libraries :code:`@gar/promisify`, :code:`es6-promisify`, :code:`util.promisify`, :code:`thenify-all`, :code:`call-me-maybe`, :code:`@google-cloud/promisify`, and :code:`util-promisify`.
+*   Data flow is now tracked through promisified user-defined functions.
+
+Swift
+"""""
+
+*   Updated to allow analysis of Swift 6.1.3.
+
+Rust
+""""
+
+*   Added cryptography related models for the :code:`cookie` and :code:`biscotti` crates.
+
+Deprecated APIs
+~~~~~~~~~~~~~~~
+
+C/C++
+"""""
+
+*   The predicate :code:`getAContructorCall` in the class :code:`SslContextClass` has been deprecated. Use :code:`getAConstructorCall` instead.
+
+New Features
+~~~~~~~~~~~~
+
+C/C++
+"""""
+
+*   Added predicates :code:`getTransitiveNumberOfVlaDimensionStmts`, :code:`getTransitiveVlaDimensionStmt`, and :code:`getParentVlaDecl` to :code:`VlaDeclStmt` for handling :code:`VlaDeclStmt`\ s whose base type is defined in terms of another :code:`VlaDeclStmt` via a :code:`typedef`.
+
+Java/Kotlin
+"""""""""""
+
+*   The Java extractor and QL libraries now support Java 25.
+*   Added support for Java 25 compact source files (JEP 512). The new predicate :code:`Class.isImplicit()` identifies classes that are implicitly declared when using compact source files, and the new predicate :code:`CompilationUnit.isCompactSourceFile()` identifies compilation units that contain compact source files.
+*   Added support for Java 25 module import declarations.
+*   Add :code:`ModuleImportDeclaration` class.
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.23.2.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.23.2.rst
new file mode 100644
index 00000000000..246af4c3be1
--- /dev/null
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.23.2.rst
@@ -0,0 +1,89 @@
+.. _codeql-cli-2.23.2:
+
+==========================
+CodeQL 2.23.2 (2025-10-02)
+==========================
+
+.. contents:: Contents
+   :depth: 2
+   :local:
+   :backlinks: none
+
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+
+Security Coverage
+-----------------
+
+CodeQL 2.23.2 runs a total of 479 security queries when configured with the Default suite (covering 166 CWE). The Extended suite enables an additional 135 queries (covering 35 more CWE). 1 security query has been added with this release.
+
+CodeQL CLI
+----------
+
+Bug Fixes
+~~~~~~~~~
+
+*   The :code:`codeql generate query-help` command now prepends the query's name (taken from the :code:`.ql` file) as a level-one heading when processing markdown query help, for consistency with help generated from a :code:`.qhelp` file.
+
+New Features
+~~~~~~~~~~~~
+
+*   CodeQL Go analysis now supports the "Git Source" type for `private package registries <https://docs.github.com/en/code-security/securing-your-organization/enabling-security-features-in-your-organization/giving-org-access-private-registries>`__. This is in addition to the existing support for the "GOPROXY server" type.
+
+Query Packs
+-----------
+
+Minor Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+C#
+""
+
+*   The modeling of null guards based on complex pattern expressions has been improved, which in turn improves the query :code:`cs/dereferenced-value-may-be-null` by removing false positives.
+*   The query :code:`cs/xmldoc/missing-summary` has been removed from the :code:`code-quality` suite, to align with other languages.
+
+Python
+""""""
+
+*   The queries that check for unmatchable :code:`$` and :code:`^` in regular expressions did not account correctly for occurrences inside lookahead and lookbehind assertions. These occurrences are now handled correctly, eliminating this source of false positives.
+*   The :code:`py/inheritance/signature-mismatch` query has been modernized. It produces more precise results and more descriptive alert messages.
+*   The :code:`py/inheritance/incorrect-overriding-signature` query has been deprecated. Its results have been consolidated into the :code:`py/inheritance/signature-mismatch` query.
+
+New Queries
+~~~~~~~~~~~
+
+Rust
+""""
+
+*   Added a new query, :code:`rust/non-https-url`, for detecting the use of non-HTTPS URLs that can be intercepted by third parties.
+
+Language Libraries
+------------------
+
+Minor Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+JavaScript/TypeScript
+"""""""""""""""""""""
+
+*   Added modeling of :code:`GraphQLObjectType` resolver function parameters as remote sources.
+*   Support for the `graphql <https://www.npmjs.com/package/graphql>`__ library has been improved. Data flow from GraphQL query sources and variables to resolver function parameters is now tracked.
+*   Added support for the :code:`aws-sdk` and :code:`@aws-sdk/client-dynamodb`, :code:`@aws-sdk/client-athena`, :code:`@aws-sdk/client-s3`, and :code:`@aws-sdk/client-rds-data` packages.
+
+Python
+""""""
+
+*   Data flow tracking through global variables now supports nested field access patterns such as :code:`global_var.obj.field`. This improves the precision of taint tracking analysis when data flows through complex global variable structures.
+
+New Features
+~~~~~~~~~~~~
+
+Ruby
+""""
+
+*   Initial modeling for the Ruby Grape framework in :code:`Grape.qll` has been added to detect API endpoints, parameters, and headers within Grape API classes.
+
+Rust
+""""
+
+*   The models-as-data format for sources now supports access paths of the form
+    :code:`Argument[i].Parameter[j]`. This denotes that the source passes tainted data to the :code:`j`\ th parameter of its :code:`i`\ th argument (which must be a function or a closure).
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.23.3.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.23.3.rst
new file mode 100644
index 00000000000..8abbc879c3e
--- /dev/null
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.23.3.rst
@@ -0,0 +1,136 @@
+.. _codeql-cli-2.23.3:
+
+==========================
+CodeQL 2.23.3 (2025-10-17)
+==========================
+
+.. contents:: Contents
+   :depth: 2
+   :local:
+   :backlinks: none
+
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+
+Security Coverage
+-----------------
+
+CodeQL 2.23.3 runs a total of 480 security queries when configured with the Default suite (covering 166 CWE). The Extended suite enables an additional 135 queries (covering 35 more CWE). 1 security query has been added with this release.
+
+CodeQL CLI
+----------
+
+Breaking Changes
+~~~~~~~~~~~~~~~~
+
+*   The :code:`--permissive` command line option has been removed from the C/C++ extractor,
+    and passing the option will make the extractor fail. The option was introduced to make the extractor accept the following invalid code, which is accepted by gcc with the :code:`-fpermissive` flag:
+
+    ..  code-block:: cpp
+    
+        void f(char*);
+        void g() {
+          const char* str = "string";
+          f(str);
+        }
+        
+    The :code:`--permissive` option was removed, as under some circumstances it would break the extractor's ability to parse valid C++ code. When calling the extractor directly,
+    :code:`--permissive` should no longer be passed. The above code will fail to parse, and we recommend the code being made :code:`const`\ -correct.
+
+Bug Fixes
+~~~~~~~~~
+
+*   Fixed a bug that made many :code:`codeql` subcommands fail with the message :code:`not in while, until, select, or repeat loop` on Linux or macOS systems where :code:`/bin/sh` is :code:`zsh`.
+
+Query Packs
+-----------
+
+New Queries
+~~~~~~~~~~~
+
+Rust
+""""
+
+*   Added a new query, :code:`rust/insecure-cookie`, to detect cookies created without the 'Secure' attribute.
+
+Language Libraries
+------------------
+
+Bug Fixes
+~~~~~~~~~
+
+Python
+""""""
+
+*   The Python extractor no longer crashes with an :code:`ImportError` when run using Python 3.14.
+
+Breaking Changes
+~~~~~~~~~~~~~~~~
+
+C/C++
+"""""
+
+*   The "Guards" libraries (:code:`semmle.code.cpp.controlflow.Guards` and :code:`semmle.code.cpp.controlflow.IRGuards`) have been totally rewritten to recognize many more guards. The API remains unchanged, but the :code:`GuardCondition` class now extends :code:`Element` instead of :code:`Expr`.
+
+Golang
+""""""
+
+*   The member predicate :code:`writesField` on :code:`DataFlow::Write` now uses the post-update node for :code:`base` when that is the node being updated, which is in all cases except initializing a struct literal. A new member predicate :code:`writesFieldPreUpdate` has been added for cases where this behaviour is not desired.
+*   The member predicate :code:`writesElement` on :code:`DataFlow::Write` now uses the post-update node for :code:`base` when that is the node being updated, which is in all cases except initializing an array/slice/map literal. A new member predicate :code:`writesElementPreUpdate` has been added for cases where this behaviour is not desired.
+
+Major Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Golang
+""""""
+
+*   The shape of the Go data-flow graph has changed. Previously for code like :code:`x := def(); use1(x); use2(x)`, there would be edges from the definition of :code:`x` to each use. Now there is an edge from the definition to the first use, then another from the first use to the second, and so on. This means that data-flow barriers work differently - flow will not reach any uses after the barrier node. Where this is not desired it may be necessary to add an additional flow step to propagate the flow forward. Additionally, when a variable may be subject to a side-effect, such as updating an array, passing a pointer to a function that might write through it or writing to a field of a struct, there is now a dedicated post-update node representing the variable after this side-effect has taken place. Previously post-update nodes were aliases for either a variable's definition, or were equal to the pre-update node. This led to backwards steps in the data-flow graph, which could cause false positives. For example, in the previous code there would be an edge from :code:`x` in :code:`use2(x)` back to the definition of :code:`x`. If we define our sources as any argument of :code:`use2` and our sinks as any argument of :code:`use1` then this would lead to a false positive path. Now there are distinct post-update nodes and no backwards edge to the definition, so we will not find this false positive path.
+
+Minor Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+C#
+""
+
+*   The extraction of location information for parameters, fields, constructors, destructors and user operators has been optimized. Previously, location information was extracted multiple times for each bound generic. Now, only the location of the unbound generic declaration is extracted during the extraction phase, and the QL library explicitly reuses this location for all bound instances of the same generic.
+*   The extraction of location information for type parameters and tuples types has been optimized. Previously, location information was extracted multiple times for each type when it was declared across multiple files. Now, the extraction context is respected during the extraction phase, ensuring locations are only extracted within the appropriate context. This change should be transparent to end-users but may improve extraction performance in some cases.
+*   The extraction of location information for named types (classes, structs, etc.) has been optimized. Previously, location information was extracted multiple times for each type when it was declared across multiple files. Now, the extraction context is respected during the extraction phase, ensuring locations are only extracted within the appropriate context. This change should be transparent to end-users but may improve extraction performance in some cases.
+*   The extraction of the location for bound generic entities (methods, accessors, indexers, properties, and events) has been optimized. Previously, location information was extracted multiple times for each bound generic. Now, only the location of the unbound generic declaration is extracted during the extraction phase, and the QL library explicitly reuses this location for all bound instances of the same generic.
+
+Golang
+""""""
+
+*   The query :code:`go/request-forgery` will no longer report alerts when the user input is of a simple type, like a number or a boolean.
+*   For the query :code:`go/unvalidated-url-redirection`, when untrusted data is assigned to the :code:`Host` field of a :code:`url.URL` struct, we consider the whole struct untrusted. We now also include the case when this happens during struct initialization, for example :code:`&url.URL{Host: untrustedData}`.
+*   :code:`go/unvalidated-url-redirection` and :code:`go/request-forgery` have a shared notion of a safe URL, which is known to not be malicious. Some URLs which were incorrectly considered safe are now correctly considered unsafe. This may lead to more alerts for those two queries.
+
+Java/Kotlin
+"""""""""""
+
+*   Fields of certain objects are considered tainted if the object is tainted. This holds, for example, for objects that occur directly as sources in the active threat model (for instance, a remote flow source). This has now been amended to also include array types, such that if an array like :code:`MyPojo[]` is a source, then fields of a tainted :code:`MyPojo` are now also considered tainted.
+
+Rust
+""""
+
+*   Improve data flow through functions being passed as function pointers.
+
+Deprecated APIs
+~~~~~~~~~~~~~~~
+
+Golang
+""""""
+
+*   The class :code:`SqlInjection::NumericOrBooleanSanitizer` has been deprecated. Use :code:`SimpleTypeSanitizer` from :code:`semmle.go.security.Sanitizers` instead.
+*   The member predicate :code:`writesComponent` on :code:`DataFlow::Write` has been deprecated. Instead, use :code:`writesFieldPreUpdate` and :code:`writesElementPreUpdate`, or their new versions :code:`writesField` and :code:`writesElement`.
+
+New Features
+~~~~~~~~~~~~
+
+C/C++
+"""""
+
+*   C/C++ :code:`build-mode: none` support is now generally available.
+
+Rust
+""""
+
+*   Rust analysis is now Generally Available (GA).
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.4.1.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.4.1.rst
index 58d7f61cba8..af61c689885 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.4.1.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.4.1.rst
@@ -9,7 +9,7 @@ CodeQL 2.4.1 (2020-12-19)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.4.2.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.4.2.rst
index 26cd430bd5f..dcbd51e613a 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.4.2.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.4.2.rst
@@ -9,7 +9,7 @@ CodeQL 2.4.2 (2021-01-22)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.4.3.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.4.3.rst
index 7bd90f4e621..6936a0a200e 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.4.3.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.4.3.rst
@@ -9,7 +9,7 @@ CodeQL 2.4.3 (2021-01-29)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.4.4.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.4.4.rst
index 5b918dc90e8..8c0709928af 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.4.4.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.4.4.rst
@@ -9,7 +9,7 @@ CodeQL 2.4.4 (2021-02-12)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.4.5.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.4.5.rst
index 9d4a5b329b1..9ef2182c9f5 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.4.5.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.4.5.rst
@@ -9,7 +9,7 @@ CodeQL 2.4.5 (2021-03-08)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.4.6.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.4.6.rst
index c5f1a57ea0d..ba551f3333d 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.4.6.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.4.6.rst
@@ -9,7 +9,7 @@ CodeQL 2.4.6 (2021-03-19)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.5.0.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.5.0.rst
index 45b21c0d03c..0e983e5cacb 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.5.0.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.5.0.rst
@@ -9,7 +9,7 @@ CodeQL 2.5.0 (2021-03-26)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.5.1.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.5.1.rst
index 7aa11611c71..8f259708fdc 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.5.1.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.5.1.rst
@@ -9,7 +9,7 @@ CodeQL 2.5.1 (2021-04-19)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.5.2.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.5.2.rst
index dde165f5f3c..09049680fae 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.5.2.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.5.2.rst
@@ -9,7 +9,7 @@ CodeQL 2.5.2 (2021-04-21)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.5.3.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.5.3.rst
index 05717dacb04..518a699fbf3 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.5.3.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.5.3.rst
@@ -9,7 +9,7 @@ CodeQL 2.5.3 (2021-04-30)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.5.4.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.5.4.rst
index 85cb5102041..33a1ee1e802 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.5.4.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.5.4.rst
@@ -9,7 +9,7 @@ CodeQL 2.5.4 (2021-05-03)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.5.5.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.5.5.rst
index 349d9c2ab4c..02946e207ff 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.5.5.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.5.5.rst
@@ -9,7 +9,7 @@ CodeQL 2.5.5 (2021-05-17)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.5.6.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.5.6.rst
index 5d9b4fab3aa..8f7444f3339 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.5.6.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.5.6.rst
@@ -9,7 +9,7 @@ CodeQL 2.5.6 (2021-06-22)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.5.7.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.5.7.rst
index 31c0fcbc387..a79252fdbe8 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.5.7.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.5.7.rst
@@ -9,7 +9,7 @@ CodeQL 2.5.7 (2021-07-02)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.5.8.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.5.8.rst
index 753da44a257..da7e793d1c6 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.5.8.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.5.8.rst
@@ -9,7 +9,7 @@ CodeQL 2.5.8 (2021-07-26)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.5.9.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.5.9.rst
index e142a305026..cc9120def9e 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.5.9.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.5.9.rst
@@ -9,7 +9,7 @@ CodeQL 2.5.9 (2021-08-09)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.6.0.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.6.0.rst
index 494f9ed2d71..6b7a81e5ac5 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.6.0.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.6.0.rst
@@ -9,7 +9,7 @@ CodeQL 2.6.0 (2021-08-24)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.6.1.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.6.1.rst
index 0ff5d4bd9f0..a9e030c403a 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.6.1.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.6.1.rst
@@ -9,7 +9,7 @@ CodeQL 2.6.1 (2021-09-07)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.6.2.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.6.2.rst
index af7c4b7042b..6a67b21f33c 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.6.2.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.6.2.rst
@@ -9,7 +9,7 @@ CodeQL 2.6.2 (2021-09-21)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.6.3.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.6.3.rst
index e566b818a00..d5c4e3e3f57 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.6.3.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.6.3.rst
@@ -9,7 +9,7 @@ CodeQL 2.6.3 (2021-10-06)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.7.0.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.7.0.rst
index dbbd36aea5e..9ac5b7f3e92 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.7.0.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.7.0.rst
@@ -9,7 +9,7 @@ CodeQL 2.7.0 (2021-10-27)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.7.1.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.7.1.rst
index f28740575f3..09aead4a36e 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.7.1.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.7.1.rst
@@ -9,7 +9,7 @@ CodeQL 2.7.1 (2021-11-15)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.7.2.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.7.2.rst
index ecd7d53c3e0..c2c0d35179c 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.7.2.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.7.2.rst
@@ -9,7 +9,7 @@ CodeQL 2.7.2 (2021-11-22)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.7.3.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.7.3.rst
index ffac75543ca..af2cac49d3f 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.7.3.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.7.3.rst
@@ -9,7 +9,7 @@ CodeQL 2.7.3 (2021-12-06)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.7.5.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.7.5.rst
index d754aec07cb..c3107ea0386 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.7.5.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.7.5.rst
@@ -9,7 +9,7 @@ CodeQL 2.7.5 (2022-01-17)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.7.6.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.7.6.rst
index ef418261258..6d9820c064d 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.7.6.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.7.6.rst
@@ -9,7 +9,7 @@ CodeQL 2.7.6 (2022-01-24)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.8.0.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.8.0.rst
index 03e16acf5d9..602465d13f6 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.8.0.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.8.0.rst
@@ -9,7 +9,7 @@ CodeQL 2.8.0 (2022-02-04)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.8.1.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.8.1.rst
index 184a488ca4a..d25904b4028 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.8.1.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.8.1.rst
@@ -9,7 +9,7 @@ CodeQL 2.8.1 (2022-02-15)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.8.2.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.8.2.rst
index 6c778328d9b..1f7aba69555 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.8.2.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.8.2.rst
@@ -9,7 +9,7 @@ CodeQL 2.8.2 (2022-02-28)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.8.3.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.8.3.rst
index 0a5c75d06d6..9fcc89afbc9 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.8.3.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.8.3.rst
@@ -9,7 +9,7 @@ CodeQL 2.8.3 (2022-03-14)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.8.4.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.8.4.rst
index a9cb1ddde70..83766ab58bc 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.8.4.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.8.4.rst
@@ -9,7 +9,7 @@ CodeQL 2.8.4 (2022-03-29)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.8.5.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.8.5.rst
index e9dcb93b10c..9cd2e1b7a67 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.8.5.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.8.5.rst
@@ -9,7 +9,7 @@ CodeQL 2.8.5 (2022-04-07)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.9.0.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.9.0.rst
index 3b289245398..bf104cfb5d3 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.9.0.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.9.0.rst
@@ -9,7 +9,7 @@ CodeQL 2.9.0 (2022-04-26)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.9.1.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.9.1.rst
index 0a2cd31ba3b..0e983c973d7 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.9.1.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.9.1.rst
@@ -9,7 +9,7 @@ CodeQL 2.9.1 (2022-05-05)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.9.2.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.9.2.rst
index ff7548ce259..a3ae2394118 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.9.2.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.9.2.rst
@@ -9,7 +9,7 @@ CodeQL 2.9.2 (2022-05-16)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.9.3.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.9.3.rst
index fe8834674d5..c5f14565820 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.9.3.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.9.3.rst
@@ -9,7 +9,7 @@ CodeQL 2.9.3 (2022-05-31)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.9.4.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.9.4.rst
index 1cd748682c5..0bac2d62b6f 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.9.4.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.9.4.rst
@@ -9,7 +9,7 @@ CodeQL 2.9.4 (2022-06-20)
    :local:
    :backlinks: none
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 Security Coverage
 -----------------
diff --git a/docs/codeql/codeql-overview/codeql-changelog/index.rst b/docs/codeql/codeql-overview/codeql-changelog/index.rst
index dcf6c7bcba0..4b3e1f5bb98 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/index.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/index.rst
@@ -4,13 +4,18 @@
 CodeQL change logs
 ==================
 
-This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/application-security/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
 
 A list of queries for each suite and language `is available here <https://docs.github.com/en/code-security/code-scanning/managing-your-code-scanning-configuration/codeql-query-suites#queries-included-in-the-default-and-security-extended-query-suites>`__.
 
 .. toctree::
    :maxdepth: 1
 
+   codeql-cli-2.23.3
+   codeql-cli-2.23.2
+   codeql-cli-2.23.1
+   codeql-cli-2.23.0
+   codeql-cli-2.22.4
    codeql-cli-2.22.3
    codeql-cli-2.22.2
    codeql-cli-2.22.1
diff --git a/docs/codeql/codeql-overview/system-requirements.rst b/docs/codeql/codeql-overview/system-requirements.rst
index cc46db60c35..9f477a9b39b 100644
--- a/docs/codeql/codeql-overview/system-requirements.rst
+++ b/docs/codeql/codeql-overview/system-requirements.rst
@@ -42,6 +42,14 @@ For Ruby extraction:
 
 - On Windows, the ``msvcp140.dll`` must be installed and available on the system. This can be installed by downloading the appropriate Microsoft Visual C++ Redistributable for Visual Studio.
 
+For Rust extraction:
+
+- ``rustup`` and ``cargo`` must be installed.
+
+For Swift extraction:
+
+- Only macOS is supported as a host platform.
+
 For Java extraction:
 
 - There must be a ``java`` or ``java.exe`` executable available on the ``PATH``, and the ``JAVA_HOME`` environment variable must point to the corresponding JDK's home directory.
diff --git a/docs/codeql/images/codeql-for-visual-studio-code/basic-rust-query-results-1.png b/docs/codeql/images/codeql-for-visual-studio-code/basic-rust-query-results-1.png
new file mode 100644
index 00000000000..8bbd3f6fa99
Binary files /dev/null and b/docs/codeql/images/codeql-for-visual-studio-code/basic-rust-query-results-1.png differ
diff --git a/docs/codeql/images/codeql-for-visual-studio-code/basic-rust-query-results-2.png b/docs/codeql/images/codeql-for-visual-studio-code/basic-rust-query-results-2.png
new file mode 100644
index 00000000000..6b67bf7a87f
Binary files /dev/null and b/docs/codeql/images/codeql-for-visual-studio-code/basic-rust-query-results-2.png differ
diff --git a/docs/codeql/images/codeql-for-visual-studio-code/quick-query-tab-rust.png b/docs/codeql/images/codeql-for-visual-studio-code/quick-query-tab-rust.png
new file mode 100644
index 00000000000..467785fb3b4
Binary files /dev/null and b/docs/codeql/images/codeql-for-visual-studio-code/quick-query-tab-rust.png differ
diff --git a/docs/codeql/ql-language-reference/aliases.rst b/docs/codeql/ql-language-reference/aliases.rst
index efbbef65cda..ebecbdf0a2b 100644
--- a/docs/codeql/ql-language-reference/aliases.rst
+++ b/docs/codeql/ql-language-reference/aliases.rst
@@ -137,6 +137,6 @@ During :ref:`name resolution <name-resolution>`, ambiguity between aliases from
 for the same module/type/predicate is allowed, but ambiguity between between aliases from distinct **strong**
 alias definitions is invalid QL.
 Likewise, for the purpose of applicative instantiation of :ref:`parameterised modules <parameterized-modules>`
-and `:ref:`parameterised module signatures <parameterized-module-signatures>`, aliases from **weak** alias
+and :ref:`parameterised module signatures <parameterized-module-signatures>`, aliases from **weak** alias
 definitions for instantiation arguments do not result in separate instantiations, but aliases from **strong**
 alias definitions for instantiation arguments do.
diff --git a/docs/codeql/ql-language-reference/annotations.rst b/docs/codeql/ql-language-reference/annotations.rst
index 0ddb28c3a9d..b792e807c93 100644
--- a/docs/codeql/ql-language-reference/annotations.rst
+++ b/docs/codeql/ql-language-reference/annotations.rst
@@ -16,9 +16,9 @@ For example, to declare a module ``M`` as private, you could use:
     }
 
 Note that some annotations act on an entity itself, whilst others act on a particular *name* for the entity:
-  - Act on an **entity**: ``abstract``, ``cached``, ``external``, ``transient``, ``override``, ``pragma``, ``language``,
-    and ``bindingset``
-  - Act on a **name**: ``deprecated``, ``library``, ``private``, ``final``, and ``query``
+  - Act on an **entity**: ``abstract``, ``bindingset``, ``cached``, ``extensible``, ``external``, ``language``,
+    ``override``, ``pragma``, and ``transient``
+  - Act on a **name**: ``additional``, ``deprecated``, ``final``, ``library``, ``private``, and ``query``
 
 For example, if you annotate an entity with ``private``, then only that particular name is
 private. You could still access that entity under a different name (using an :ref:`alias <aliases>`).
@@ -97,13 +97,27 @@ own body, or they must inherit from another class that overrides ``isSource``:
       // doesn't need to override `isSource`, because it inherits it from ConfigA
     }
 
+.. index:: additional
+.. _additional:
+
+``additional``
+==============
+
+**Available for**: |classes|, |algebraic datatypes|, |type unions|, |non-member predicates|, |modules|, |aliases|, |signatures|
+
+The ``additional`` annotation can be used on declarations in explicit modules.
+All declarations that are not required by a module signature in modules that implement |module signatures| must be annotated with ``additional``.
+
+Omitting ``additional`` on such declarations, or using the annotation in any other context, will result in a compiler error.
+Other than that, the annotation has no effect.
+
 .. index:: cached
 .. _cached:
 
 ``cached``
 ==========
 
-**Available for**: |classes|, |algebraic datatypes|, |characteristic predicates|, |member predicates|, |non-member predicates|, |modules|
+**Available for**: |classes|, |algebraic datatypes|, |type unions|, |characteristic predicates|, |member predicates|, |non-member predicates|, |modules|
 
 The ``cached`` annotation indicates that an entity should be evaluated in its entirety and
 stored in the evaluation cache. All later references to this entity will use the 
@@ -126,7 +140,7 @@ body must also be annotated with ``cached``, otherwise a compiler error is repor
 ``deprecated``
 ==============
 
-**Available for**: |classes|, |algebraic datatypes|, |member predicates|, |non-member predicates|, |imports|, |fields|, |modules|, |aliases|
+**Available for**: |classes|, |algebraic datatypes|, |type unions|, |member predicates|, |non-member predicates|, |imports|, |fields|, |modules|, |aliases|, |signatures|
 
 The ``deprecated`` annotation is applied to names that are outdated and scheduled for removal
 in a future release of QL.
@@ -151,6 +165,16 @@ For example, the name ``DataFlowNode`` is deprecated and has the following QLDoc
 
 This QLDoc comment appears when you use the name ``DataFlowNode`` in a QL editor.
 
+.. index:: extensible
+.. _extensible:
+
+``extensible``
+==============
+
+**Available for**: |non-member predicates|
+
+The ``extensible`` annotation is used to mark predicates that are populated at evaluation time through data extensions.
+
 .. index:: external
 .. _external:
 
@@ -235,7 +259,7 @@ warning.
 ``private``
 ===========
 
-**Available for**: |classes|, |algebraic datatypes|, |member predicates|, |non-member predicates|, |imports|, |fields|, |modules|, |aliases|
+**Available for**: |classes|, |algebraic datatypes|, |type unions|, |member predicates|, |non-member predicates|, |imports|, |fields|, |modules|, |aliases|, |signatures|
 
 The ``private`` annotation is used to prevent names from being exported.
 
@@ -461,7 +485,7 @@ For more information, see ":ref:`monotonic-aggregates`."
 Binding sets
 ============
 
-**Available for**: |classes|, |characteristic predicates|, |member predicates|, |non-member predicates|
+**Available for**: |classes|, |characteristic predicates|, |member predicates|, |non-member predicates|, |predicate signatures|, |type signatures|
 
 ``bindingset[...]``
 -------------------
@@ -490,4 +514,9 @@ The ``bindingset`` annotation takes a comma-separated list of variables.
 .. |aliases|                   replace:: :ref:`aliases <aliases>`
 .. |type-aliases|              replace:: :ref:`type aliases <type-aliases>`
 .. |algebraic datatypes|       replace:: :ref:`algebraic datatypes <algebraic-datatypes>`
+.. |type unions|               replace:: :ref:`type unions <type-unions>`
 .. |expressions|               replace:: :ref:`expressions <expressions>`
+.. |signatures|                replace:: :ref:`signatures <signatures>`
+.. |predicate signatures|      replace:: :ref:`predicate signatures <predicate-signatures>`
+.. |type signatures|           replace:: :ref:`type signatures <type-signatures>`
+.. |module signatures|         replace:: :ref:`module signatures <module-signatures>`
diff --git a/docs/codeql/ql-language-reference/expressions.rst b/docs/codeql/ql-language-reference/expressions.rst
index 5c73681f7aa..327cabb6181 100644
--- a/docs/codeql/ql-language-reference/expressions.rst
+++ b/docs/codeql/ql-language-reference/expressions.rst
@@ -625,7 +625,7 @@ Then the evaluation of the ``depth`` predicate proceeds as follows:
 +-----------+--------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | **Stage** | **depth**                                  | **Comments**                                                                                                                                                             |
 +===========+============================================+==========================================================================================================================================================================+
-| 0         |                                            | We always begin with the empty set.                                                                                                                                      |
+| 0         |                                            | We always begin with the empty set.                                                                                                                                      |
 +-----------+--------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | 1         | ``(0, b), (0, d), (0, e)``                 | The nodes with no children have depth 0. The recursive step for **a** and **c** fails to produce a value, since some of their children do not have values for ``depth``. |
 +-----------+--------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
diff --git a/docs/codeql/ql-language-reference/formulas.rst b/docs/codeql/ql-language-reference/formulas.rst
index 8745217decc..c17ba858ed7 100644
--- a/docs/codeql/ql-language-reference/formulas.rst
+++ b/docs/codeql/ql-language-reference/formulas.rst
@@ -193,7 +193,7 @@ information on cartesian products, see ":ref:`Troubleshooting query performance
 <troubleshooting-query-performance>`".
 
 It is possible to enable warnings about implicit this receivers for `CodeQL packs
-<https://docs.github.com/en/code-security/codeql-cli/codeql-cli-reference/about-codeql-packs#warnonimplicitthis>`__
+<https://docs.github.com/en/code-security/codeql-cli/using-the-advanced-functionality-of-the-codeql-cli/publishing-and-using-codeql-packs#warnonimplicitthis>`__
 through the ``warnOnImplicitThis`` property.
 
 .. _parenthesized-formulas:
diff --git a/docs/codeql/ql-language-reference/ql-language-specification.rst b/docs/codeql/ql-language-reference/ql-language-specification.rst
index 9989c73e5dc..1d84cc31c73 100644
--- a/docs/codeql/ql-language-reference/ql-language-specification.rst
+++ b/docs/codeql/ql-language-reference/ql-language-specification.rst
@@ -36,7 +36,7 @@ Architecture
 
 A *QL program* consists of a query module defined in a QL file and a number of library modules defined in QLL files that it imports (see "`Import directives <#import-directives>`__"). The module in the QL file includes one or more queries (see "`Queries <#queries>`__"). A module may also include *import directives* (see "`Import directives <#import-directives>`__"), non-member predicates (see "`Non-member predicates <#non-member-predicates>`__"), class definitions (see "`Classes <#classes>`__"), and module definitions (see "`Modules <#modules>`__").
 
-QL programs are interpreted in the context of a *database* and a *library path* . The database provides a number of definitions: database types (see "`Types <#types>`__"), entities (see "`Values <#values>`__"), built-in predicates (see "`Built-ins <#built-ins>`__"), and the *database content* of built-in predicates and external predicates (see "`Evaluation <#evaluation>`__"). The library path is a sequence of file-system directories that hold QLL files.
+QL programs are interpreted in the context of a *database* and a *library path* . The database provides a number of definitions: database types (see "`Types <#types>`__"), entities (see "`Values <#values>`__"), built-in predicates (see "`Built-ins <#built-ins>`__"), and the *database content* of built-in predicates, external predicates, and extensible predicates (see "`Evaluation <#evaluation>`__"). The library path is a sequence of file-system directories that hold QLL files.
 
 A QL program can be *evaluated* (see "`Evaluation <#evaluation>`__") to produce a set of tuples of values (see "`Values <#values>`__").
 
@@ -761,17 +761,17 @@ Various kinds of syntax can have *annotations* applied to them. Annotations are
    annotation ::= simpleAnnotation | argsAnnotation
 
    simpleAnnotation ::= "abstract"
-                    |   "cached"
-                    |   "external"
-                    |   "extensible"
-                    |   "final"
-                    |   "transient"
-                    |   "library"
-                    |   "private"
-                    |   "deprecated"
-                    |   "override"
                     |   "additional"
+                    |   "cached"
+                    |   "deprecated"
+                    |   "extensible"
+                    |   "external"
+                    |   "final"
+                    |   "library"
+                    |   "override"
+                    |   "private"
                     |   "query"
+                    |   "transient"
 
    argsAnnotation ::= "pragma" "[" ("inline" | "inline_late" | "noinline" | "nomagic" | "noopt" | "assume_small_delta") "]"
                   |   "language" "[" "monotonicAggregates" "]"
@@ -791,28 +791,28 @@ The following table summarizes the syntactic constructs which can be marked with
 +================+=========+============+===================+=======================+=========+========+=========+=========+============+
 | ``abstract``   | yes     |            | yes               |                       |         |        |         |         |            |
 +----------------+---------+------------+-------------------+-----------------------+---------+--------+---------+---------+------------+
+| ``additional`` | yes     |            |                   | yes                   |         |        | yes     | yes     | yes        |
++----------------+---------+------------+-------------------+-----------------------+---------+--------+---------+---------+------------+
 | ``cached``     | yes     | yes        | yes               | yes                   |         |        | yes     |         |            |
 +----------------+---------+------------+-------------------+-----------------------+---------+--------+---------+---------+------------+
-| ``external``   |         |            |                   | yes                   |         |        |         |         |            |
-+----------------+---------+------------+-------------------+-----------------------+---------+--------+---------+---------+------------+
-| ``extensible`` |         |            |                   | yes                   |         |        |         |         |            |
-+----------------+---------+------------+-------------------+-----------------------+---------+--------+---------+---------+------------+
-| ``final``      | yes     |            | yes               |                       |         | yes    |         | (yes)   |            |
-+----------------+---------+------------+-------------------+-----------------------+---------+--------+---------+---------+------------+
-| ``transient``  |         |            |                   | yes                   |         |        |         |         |            |
-+----------------+---------+------------+-------------------+-----------------------+---------+--------+---------+---------+------------+
-| ``library``    | (yes)   |            |                   |                       |         |        |         |         |            |
-+----------------+---------+------------+-------------------+-----------------------+---------+--------+---------+---------+------------+
-| ``private``    | yes     |            | yes               | yes                   | yes     | yes    | yes     | yes     | yes        |
-+----------------+---------+------------+-------------------+-----------------------+---------+--------+---------+---------+------------+
 | ``deprecated`` | yes     |            | yes               | yes                   | yes     | yes    | yes     | yes     | yes        |
 +----------------+---------+------------+-------------------+-----------------------+---------+--------+---------+---------+------------+
+| ``extensible`` |         |            |                   | yes                   |         |        |         |         |            |
++----------------+---------+------------+-------------------+-----------------------+---------+--------+---------+---------+------------+
+| ``external``   |         |            |                   | yes                   |         |        |         |         |            |
++----------------+---------+------------+-------------------+-----------------------+---------+--------+---------+---------+------------+
+| ``final``      | yes     |            | yes               |                       |         | yes    |         | (yes)   |            |
++----------------+---------+------------+-------------------+-----------------------+---------+--------+---------+---------+------------+
+| ``library``    | (yes)   |            |                   |                       |         |        |         |         |            |
++----------------+---------+------------+-------------------+-----------------------+---------+--------+---------+---------+------------+
 | ``override``   |         |            | yes               |                       |         | yes    |         |         |            |
 +----------------+---------+------------+-------------------+-----------------------+---------+--------+---------+---------+------------+
-| ``additional`` | yes     |            |                   | yes                   |         |        | yes     | yes     | yes        |
+| ``private``    | yes     |            | yes               | yes                   | yes     | yes    | yes     | yes     | yes        |
 +----------------+---------+------------+-------------------+-----------------------+---------+--------+---------+---------+------------+
 | ``query``      |         |            |                   | yes                   |         |        |         | yes     |            |
 +----------------+---------+------------+-------------------+-----------------------+---------+--------+---------+---------+------------+
+| ``transient``  |         |            |                   | yes                   |         |        |         |         |            |
++----------------+---------+------------+-------------------+-----------------------+---------+--------+---------+---------+------------+
 
 The ``library`` annotation is only usable within a QLL file, not a QL file.
 The ``final`` annotation is usable on type aliases, but not on module aliases and predicate aliases.
@@ -933,7 +933,9 @@ A predicate definition adds a mapping from the predicate name and arity to the p
 
 When a predicate is a top-level clause in a module, it is called a non-member predicate. See below for "`Member predicates <#member-predicates>`__."
 
-A valid non-member predicate can be annotated with ``cached``, ``deprecated``, ``external``, ``transient``, ``private``, and ``query``. Note, the ``transient`` annotation can only be applied if the non-member predicate is also annotated with ``external``.
+A valid non-member predicate can be annotated with ``additional``, ``cached``, ``deprecated``, ``extensible``, ``external``, ``transient``, ``private``, and ``query``.
+Note, the ``transient`` annotation can only be applied if the non-member predicate is also annotated with ``external``.
+Note, the annotations ``extensible`` and ``external`` cannot both be used on the same non-member predicate.
 
 The head of the predicate gives a name, an optional *result type*, and a sequence of variables declarations that are *arguments*:
 
@@ -951,7 +953,7 @@ The body of a predicate is of one of three forms:
 
 In the first form, with just a semicolon, the predicate is said to not have a body. In the second form, the body of the predicate is the given formula (see "`Formulas <#formulas>`__"). In the third form, the body is a higher-order relation.
 
-A valid non-member predicate must have a body, either a formula or a higher-order relation, unless it is external, in which case it must not have a body.
+A valid non-member predicate must have a body, either a formula or a higher-order relation, unless it is external or extensible, in which case it must not have a body.
 
 The typing environment for the body of the formula, if present, maps the variables in the head of the predicate to their associated types. If the predicate has a result type, then the typing environment also maps ``result`` to the result type.
 
@@ -979,7 +981,7 @@ A class type is said to *final inherit* from base types that are final or refere
 
 A class adds a mapping from the class name to the class declaration to the current module's declared type environment.
 
-A valid class can be annotated with ``abstract``, ``final``, ``library``, and ``private``. Any other annotation renders the class invalid.
+A valid class can be annotated with ``abstract``, ``additional``, ``final``, ``library``, and ``private``. Any other annotation renders the class invalid.
 
 A valid class may not inherit from itself, or from more than one primitive type. The set of types that a valid class inherits from must be disjoint from the set of types that it final inherits from.
 
@@ -1052,7 +1054,7 @@ A member predicate ``p`` with enclosing class ``C`` *shadows* a member predicate
 
 Member predicates have one or more *root definitions*. If a member predicate overrides no other member predicate, then it is its own root definition. Otherwise, its root definitions are those of any member predicate that it overrides.
 
-A valid member predicate must have a body unless it is abstract or external, in which case it must not have a body.
+A valid member predicate must have a body unless it is abstract, in which case it must not have a body.
 
 A valid member predicate must override another member predicate if it is annotated override.
 
@@ -2179,7 +2181,7 @@ If a QL program has no valid stratification, then the program itself is not vali
 Layer evaluation
 ~~~~~~~~~~~~~~~~
 
-The store is first initialized with the *database content* of all built-in predicates and external predicates. The database content of a predicate is a set of ordered tuples that are included in the database.
+The store is first initialized with the *database content* of all built-in predicates, external predicates, and extensible predicates. The database content of a predicate is a set of ordered tuples that are included in the database.
 
 Each layer of the stratification is *populated* in order. To populate a layer, each predicate in the layer is repeatedly populated until the store stops changing. The way that a predicate is populated is as follows:
 
@@ -2292,17 +2294,17 @@ The complete grammar for QL is as follows:
    annotation ::= simpleAnnotation | argsAnnotation
 
    simpleAnnotation ::= "abstract"
-                    |   "cached"
-                    |   "external"
-                    |   "extensible"
-                    |   "final"
-                    |   "transient"
-                    |   "library"
-                    |   "private"
-                    |   "deprecated"
-                    |   "override"
                     |   "additional"
+                    |   "cached"
+                    |   "deprecated"
+                    |   "extensible"
+                    |   "external"
+                    |   "final"
+                    |   "library"
+                    |   "override"
+                    |   "private"
                     |   "query"
+                    |   "transient"
 
    argsAnnotation ::= "pragma" "[" ("inline" | "inline_late" | "noinline" | "nomagic" | "noopt" | "assume_small_delta") "]"
                   |   "language" "[" "monotonicAggregates" "]"
diff --git a/docs/codeql/ql-language-reference/signatures.rst b/docs/codeql/ql-language-reference/signatures.rst
index e80c54c47e4..f0fb8c03d7f 100644
--- a/docs/codeql/ql-language-reference/signatures.rst
+++ b/docs/codeql/ql-language-reference/signatures.rst
@@ -10,6 +10,10 @@ Signatures
 Parameterized modules use signatures as a type system for their parameters.
 There are three categories of signatures: **predicate signatures**, **type signatures**, and **module signatures**.
 
+.. index:: predicate signature
+
+.. _predicate-signatures:
+
 Predicate signatures
 ====================
 
@@ -36,6 +40,10 @@ For example:
 
     signature int operator(int lhs, int rhs);
 
+.. index:: type signature
+
+.. _type-signatures:
+
 Type signatures
 ===============
 
@@ -66,6 +74,10 @@ For example:
       string toString();
     }
 
+.. index:: module signature
+
+.. _module-signatures:
+
 Module signatures
 =================
 
diff --git a/docs/codeql/reusables/extractors.rst b/docs/codeql/reusables/extractors.rst
index c09926666b0..4365d106258 100644
--- a/docs/codeql/reusables/extractors.rst
+++ b/docs/codeql/reusables/extractors.rst
@@ -20,7 +20,7 @@
      - ``python``
    * - Ruby
      - ``ruby``
-     - Rust
+   * - Rust
      - ``rust``
    * - Swift
      - ``swift``
diff --git a/docs/codeql/reusables/supported-frameworks.rst b/docs/codeql/reusables/supported-frameworks.rst
index 3d89a663004..472e463cf79 100644
--- a/docs/codeql/reusables/supported-frameworks.rst
+++ b/docs/codeql/reusables/supported-frameworks.rst
@@ -313,7 +313,6 @@ Rust built-in support
 Provided by the current versions of the
 CodeQL query pack ``codeql/rust-queries`` (`changelog <https://github.com/github/codeql/tree/codeql-cli/latest/rust/ql/src/CHANGELOG.md>`__, `source <https://github.com/github/codeql/tree/codeql-cli/latest/rust/ql/src>`__)
 and the CodeQL library pack ``codeql/rust-all`` (`changelog <https://github.com/github/codeql/tree/codeql-cli/latest/rust/ql/lib/CHANGELOG.md>`__, `source <https://github.com/github/codeql/tree/codeql-cli/latest/rust/ql/lib>`__).
-All support is experimental.
 
 .. csv-table::
    :header-rows: 1
@@ -324,16 +323,21 @@ All support is experimental.
    Name, Category
    `actix-web <https://crates.io/crates/actix-web>`__, Web framework
    alloc, Standard library
+   `async-std <https://crates.io/crates/async-std>`__, Asynchronous programming library
+   `biscotti <https://crates.io/crates/biscotti>`__, Cookie management
    `clap <http://crates.io/crates/clap>`__, Utility library
+   `cookie <https://crates.io/crates/cookie>`__, Cookie management
    core, Standard library
    `digest <https://crates.io/crates/digest>`__, Cryptography library
-   `futures-executor <https://crates.io/crates/futures-executor>`__, Utility library
+   `futures <https://crates.io/crates/futures>`__, Asynchronous programming library
+   `futures-rustls <https://crates.io/crates/futures-rustls>`__, Network communicator
    `hyper <https://crates.io/crates/hyper>`__, HTTP library
-   `hyper-util <https://crates.io/crates/hyper-util>`__, HTTP library
    `libc <https://crates.io/crates/libc>`__, Utility library
    `log <https://crates.io/crates/log>`__, Logging library
    `md5 <https://crates.io/crates/md5>`__, Utility library
    `memchr <https://crates.io/crates/memchr>`__, Utility library
+   `mysql <https://crates.io/crates/mysql>`__, Database
+   `mysql_async <https://crates.io/crates/mysql_async>`__, Database
    `once_cell <https://crates.io/crates/once_cell>`__, Utility library
    `poem <https://crates.io/crates/poem>`__, Web framework
    `postgres <https://crates.io/crates/postgres>`__, Database
@@ -345,12 +349,14 @@ All support is experimental.
    `rusqlite <https://crates.io/crates/rusqlite>`__, Database
    std, Standard library
    `rust-crypto <https://crates.io/crates/rust-crypto>`__, Cryptography library
+   `rustls <https://crates.io/crates/rustls>`__, Network communicator
    `serde <https://crates.io/crates/serde>`__, Serialization
    `smallvec <https://crates.io/crates/smallvec>`__, Utility library
    `sqlx <https://crates.io/crates/sqlx>`__, Database
    `tokio <https://crates.io/crates/tokio>`__, Asynchronous IO
    `tokio-postgres <https://crates.io/crates/tokio-postgres>`__, Database
    `url <https://crates.io/crates/url>`__, Utility library
+   `warp <https://crates.io/crates/warp>`__, Web framework
 
 Swift built-in support
 ================================
diff --git a/docs/codeql/reusables/supported-versions-compilers.rst b/docs/codeql/reusables/supported-versions-compilers.rst
index 78641764660..8dcfd1a5dc0 100644
--- a/docs/codeql/reusables/supported-versions-compilers.rst
+++ b/docs/codeql/reusables/supported-versions-compilers.rst
@@ -17,8 +17,8 @@
 
    .NET 5, .NET 6, .NET 7, .NET 8, .NET 9","``.sln``, ``.csproj``, ``.cs``, ``.cshtml``, ``.xaml``"
    GitHub Actions,"Not applicable",Not applicable,"``.github/workflows/*.yml``, ``.github/workflows/*.yaml``, ``**/action.yml``, ``**/action.yaml``"
-   Go (aka Golang), "Go up to 1.24", "Go 1.11 or more recent", ``.go``
-   Java,"Java 7 to 24 [6]_","javac (OpenJDK and Oracle JDK),
+   Go (aka Golang), "Go up to 1.25", "Go 1.11 or more recent", ``.go``
+   Java,"Java 7 to 25 [6]_","javac (OpenJDK and Oracle JDK),
 
    Eclipse compiler for Java (ECJ) [7]_",``.java``
    Kotlin,"Kotlin 1.6.0 to 2.2.2\ *x*","kotlinc",``.kt``
@@ -26,8 +26,8 @@
    Python [9]_,"2.7, 3.5, 3.6, 3.7, 3.8, 3.9, 3.10, 3.11, 3.12, 3.13",Not applicable,``.py``
    Ruby [10]_,"up to 3.3",Not applicable,"``.rb``, ``.erb``, ``.gemspec``, ``Gemfile``"
    Rust [11]_,"Rust editions 2021 and 2024","Rust compiler","``.rs``, ``Cargo.toml``"
-   Swift [12]_,"Swift 5.4-6.1","Swift compiler","``.swift``"
-   TypeScript [13]_,"2.6-5.8",Standard TypeScript compiler,"``.ts``, ``.tsx``, ``.mts``, ``.cts``"
+   Swift [12]_ [13]_,"Swift 5.4-6.2","Swift compiler","``.swift``"
+   TypeScript [14]_,"2.6-5.9",Standard TypeScript compiler,"``.ts``, ``.tsx``, ``.mts``, ``.cts``"
 
 .. container:: footnote-group
 
@@ -36,11 +36,12 @@
     .. [3] Objective-C, Objective-C++, C++/CLI, and C++/CX are not supported.
     .. [4] Support for the clang-cl compiler is preliminary.
     .. [5] Support for the Arm Compiler (armcc) is preliminary.
-    .. [6] Builds that execute on Java 7 to 24 can be analyzed. The analysis understands standard language features in Java 8 to 24; "preview" and "incubator" features are not supported. Source code using Java language versions older than Java 8 are analyzed as Java 8 code.
+    .. [6] Builds that execute on Java 7 to 25 can be analyzed. The analysis understands standard language features in Java 8 to 25; "preview" and "incubator" features are not supported. Source code using Java language versions older than Java 8 are analyzed as Java 8 code.
     .. [7] ECJ is supported when the build invokes it via the Maven Compiler plugin or the Takari Lifecycle plugin.
     .. [8] JSX and Flow code, YAML, JSON, HTML, and XML files may also be analyzed with JavaScript files.
     .. [9] The extractor requires Python 3 to run. To analyze Python 2.7 you should install both versions of Python.
     .. [10] Requires glibc 2.17.
     .. [11] Requires ``rustup`` and ``cargo`` to be installed. Features from nightly toolchains are not supported.
     .. [12] Support for the analysis of Swift requires macOS.
-    .. [13] TypeScript analysis is performed by running the JavaScript extractor with TypeScript enabled. This is the default.
+    .. [13] Embedded Swift is not supported.
+    .. [14] TypeScript analysis is performed by running the JavaScript extractor with TypeScript enabled. This is the default.
diff --git a/docs/codeql/writing-codeql-queries/creating-path-queries.rst b/docs/codeql/writing-codeql-queries/creating-path-queries.rst
index 7e178f94b44..2e439baa7f4 100644
--- a/docs/codeql/writing-codeql-queries/creating-path-queries.rst
+++ b/docs/codeql/writing-codeql-queries/creating-path-queries.rst
@@ -33,6 +33,7 @@ For more language-specific information on analyzing data flow, see:
 - ":ref:`Analyzing data flow in JavaScript/TypeScript <analyzing-data-flow-in-javascript-and-typescript>`"
 - ":ref:`Analyzing data flow in Python <analyzing-data-flow-in-python>`"
 - ":ref:`Analyzing data flow in Ruby <analyzing-data-flow-in-ruby>`"
+- ":ref:`Analyzing data flow in Rust <analyzing-data-flow-in-rust>`"
 - ":ref:`Analyzing data flow in Swift <analyzing-data-flow-in-swift>`"
 
 Path query examples
@@ -59,7 +60,7 @@ You should use the following template:
      */
 
     import <language>
-    // For some languages (Java/C++/Python/Swift) you need to explicitly import the data flow library, such as
+    // For some languages (Java/C++/Python/Rust/Swift) you need to explicitly import the data flow library, such as
     // import semmle.code.java.dataflow.DataFlow or import codeql.swift.dataflow.DataFlow
     ...
 
@@ -124,7 +125,7 @@ Declaring sources and sinks
 You must provide information about the ``source`` and ``sink`` in your path query. These are objects that correspond to the nodes of the paths that you are exploring.
 The name and the type of the ``source`` and the ``sink`` must be declared in the ``from`` statement of the query, and the types must be compatible with the nodes of the graph computed by the ``edges`` predicate.
 
-If you are querying C/C++, C#, Go, Java/Kotlin, JavaScript/TypeScript, Python, or Ruby code (and you have used ``import MyFlow::PathGraph`` in your query), the definitions of the ``source`` and ``sink`` are accessed via the module resulting from the application of the ``Global<..>`` module in the data flow library. You should declare both of these objects in the ``from`` statement.
+If you are querying C/C++, C#, Go, Java/Kotlin, JavaScript/TypeScript, Python, Ruby, or Rust code (and you have used ``import MyFlow::PathGraph`` in your query), the definitions of the ``source`` and ``sink`` are accessed via the module resulting from the application of the ``Global<..>`` module in the data flow library. You should declare both of these objects in the ``from`` statement.
 For example:
 
 .. code-block:: ql
@@ -145,7 +146,7 @@ The configuration module must be defined to include definitions of sources and s
 - ``isSource()`` defines where data may flow from.
 - ``isSink()`` defines where data may flow to.
 
-For more information on using the configuration class in your analysis see the sections on global data flow in ":ref:`Analyzing data flow in C/C++ <analyzing-data-flow-in-cpp>`," ":ref:`Analyzing data flow in C# <analyzing-data-flow-in-csharp>`," and ":ref:`Analyzing data flow in Python <analyzing-data-flow-in-python>`."
+For more information on using the configuration class in your analysis see the sections on global data flow in ":ref:`Analyzing data flow in C/C++ <analyzing-data-flow-in-cpp>`," ":ref:`Analyzing data flow in C# <analyzing-data-flow-in-csharp>`," ":ref:`Analyzing data flow in Python <analyzing-data-flow-in-python>`," and ":ref:`Analyzing data flow in Rust <analyzing-data-flow-in-rust>`."
 
 You can also create a configuration for different frameworks and environments by extending the ``Configuration`` class. For more information, see ":ref:`Types <defining-a-class>`" in the QL language reference.
 
diff --git a/docs/supported-queries.md b/docs/supported-queries.md
index fa4cf1ea5d8..8ff2fb12046 100644
--- a/docs/supported-queries.md
+++ b/docs/supported-queries.md
@@ -2,8 +2,8 @@
 
 Queries and libraries outside [the `experimental` directories](experimental.md) are _supported_ by GitHub, allowing our users to rely on their continued existence and functionality in the future:
 
-1. Once a query or library has appeared in a stable release, a one-year deprecation period is required before we can remove it. There can be exceptions to this when it's not technically possible to mark it as deprecated.
-2. Major changes to supported queries and libraries are always announced in the [change notes for stable releases](../change-notes/).
+1. Once a query has appeared in a stable release, a one-year deprecation period is required before we can remove it.
+2. Major changes to supported queries and libraries are always announced in the change notes for stable releases.
 3. We will do our best to address user reports of false positives or false negatives.
 
 Because of these commitments, we set a high bar for accepting new supported queries. The requirements are detailed in the rest of this document.
diff --git a/go/codeql-extractor.yml b/go/codeql-extractor.yml
index 49c8c75232f..7a009fb2610 100644
--- a/go/codeql-extractor.yml
+++ b/go/codeql-extractor.yml
@@ -9,6 +9,8 @@ column_kind: "utf8"
 build_modes:
   - autobuild
   - manual
+default_queries:
+  - codeql/go-queries
 github_api_languages:
   - Go
 scc_languages:
@@ -19,6 +21,7 @@ file_types:
     extensions:
       - .go
 legacy_qltest_extraction: true
+overlay_support_version: 20250626
 options:
   extract_tests:
     title: Whether to include Go test files in the CodeQL database.
diff --git a/go/downgrades/b1341734d6870b105e5c9d168ce7dec25d7f72d0/go.dbscheme b/go/downgrades/b1341734d6870b105e5c9d168ce7dec25d7f72d0/go.dbscheme
new file mode 100644
index 00000000000..b3da71c3ac2
--- /dev/null
+++ b/go/downgrades/b1341734d6870b105e5c9d168ce7dec25d7f72d0/go.dbscheme
@@ -0,0 +1,552 @@
+/** Auto-generated dbscheme; do not edit. Run `make gen` in directory `go/` to regenerate. */
+
+
+/** Duplicate code **/
+
+duplicateCode(
+  unique int id : @duplication,
+  varchar(900) relativePath : string ref,
+  int equivClass : int ref);
+
+similarCode(
+  unique int id : @similarity,
+  varchar(900) relativePath : string ref,
+  int equivClass : int ref);
+
+@duplication_or_similarity = @duplication | @similarity;
+
+tokens(
+  int id : @duplication_or_similarity ref,
+  int offset : int ref,
+  int beginLine : int ref,
+  int beginColumn : int ref,
+  int endLine : int ref,
+  int endColumn : int ref);
+
+/** External data **/
+
+externalData(
+  int id : @externalDataElement,
+  varchar(900) path : string ref,
+  int column: int ref,
+  varchar(900) value : string ref
+);
+
+snapshotDate(unique date snapshotDate : date ref);
+
+sourceLocationPrefix(varchar(900) prefix : string ref);
+
+
+/*
+ * XML Files
+ */
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+compilations(unique int id: @compilation, string cwd: string ref);
+
+#keyset[id, num]
+compilation_args(int id: @compilation ref, int num: int ref, string arg: string ref);
+
+#keyset[id, num, kind]
+compilation_time(int id: @compilation ref, int num: int ref, int kind: int ref, float secs: float ref);
+
+diagnostic_for(unique int diagnostic: @diagnostic ref, int compilation: @compilation ref, int file_number: int ref, int file_number_diagnostic_number: int ref);
+
+compilation_finished(unique int id: @compilation ref, float cpu_seconds: float ref, float elapsed_seconds: float ref);
+
+#keyset[id, num]
+compilation_compiling_files(int id: @compilation ref, int num: int ref, int file: @file ref);
+
+diagnostics(unique int id: @diagnostic, int severity: int ref, string error_tag: string ref, string error_message: string ref,
+            string full_error_message: string ref, int location: @location ref);
+
+locations_default(unique int id: @location_default, int file: @file ref, int beginLine: int ref, int beginColumn: int ref,
+                  int endLine: int ref, int endColumn: int ref);
+
+numlines(int element_id: @sourceline ref, int num_lines: int ref, int num_code: int ref, int num_comment: int ref);
+
+files(unique int id: @file, string name: string ref);
+
+folders(unique int id: @folder, string name: string ref);
+
+containerparent(int parent: @container ref, unique int child: @container ref);
+
+has_location(unique int locatable: @locatable ref, int location: @location ref);
+
+#keyset[parent, idx]
+comment_groups(unique int id: @comment_group, int parent: @file ref, int idx: int ref);
+
+comments(unique int id: @comment, int kind: int ref, int parent: @comment_group ref, int idx: int ref, string text: string ref);
+
+doc_comments(unique int node: @documentable ref, int comment: @comment_group ref);
+
+#keyset[parent, idx]
+exprs(unique int id: @expr, int kind: int ref, int parent: @exprparent ref, int idx: int ref);
+
+literals(unique int expr: @expr ref, string value: string ref, string raw: string ref);
+
+constvalues(unique int expr: @expr ref, string value: string ref, string exact: string ref);
+
+fields(unique int id: @field, int parent: @fieldparent ref, int idx: int ref);
+
+typeparamdecls(unique int id: @typeparamdecl, int parent: @typeparamdeclparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+stmts(unique int id: @stmt, int kind: int ref, int parent: @stmtparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+decls(unique int id: @decl, int kind: int ref, int parent: @declparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+specs(unique int id: @spec, int kind: int ref, int parent: @gendecl ref, int idx: int ref);
+
+scopes(unique int id: @scope, int kind: int ref);
+
+scopenesting(unique int inner: @scope ref, int outer: @scope ref);
+
+scopenodes(unique int node: @scopenode ref, int scope: @localscope ref);
+
+objects(unique int id: @object, int kind: int ref, string name: string ref);
+
+objectscopes(unique int object: @object ref, int scope: @scope ref);
+
+objecttypes(unique int object: @object ref, int tp: @type ref);
+
+methodreceivers(unique int method: @object ref, int receiver: @object ref);
+
+fieldstructs(unique int field: @object ref, int struct: @structtype ref);
+
+methodhosts(int method: @object ref, int host: @definedtype ref);
+
+defs(int ident: @ident ref, int object: @object ref);
+
+uses(int ident: @ident ref, int object: @object ref);
+
+types(unique int id: @type, int kind: int ref);
+
+type_of(unique int expr: @expr ref, int tp: @type ref);
+
+typename(unique int tp: @type ref, string name: string ref);
+
+key_type(unique int map: @maptype ref, int tp: @type ref);
+
+element_type(unique int container: @containertype ref, int tp: @type ref);
+
+base_type(unique int ptr: @pointertype ref, int tp: @type ref);
+
+underlying_type(unique int defined: @definedtype ref, int tp: @type ref);
+
+#keyset[parent, index]
+component_types(int parent: @compositetype ref, int index: int ref, string name: string ref, int tp: @type ref);
+
+#keyset[parent, index]
+struct_tags(int parent: @structtype ref, int index: int ref, string tag: string ref);
+
+#keyset[interface, index]
+interface_private_method_ids(int interface: @interfacetype ref, int index: int ref, string id: string ref);
+
+array_length(unique int tp: @arraytype ref, string len: string ref);
+
+type_objects(unique int tp: @type ref, int object: @object ref);
+
+packages(unique int id: @package, string name: string ref, string path: string ref, int scope: @packagescope ref);
+
+#keyset[parent, idx]
+modexprs(unique int id: @modexpr, int kind: int ref, int parent: @modexprparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+modtokens(string token: string ref, int parent: @modexpr ref, int idx: int ref);
+
+#keyset[package, idx]
+errors(unique int id: @error, int kind: int ref, string msg: string ref, string rawpos: string ref,
+       string file: string ref, int line: int ref, int col: int ref, int package: @package ref, int idx: int ref);
+
+has_ellipsis(int id: @callorconversionexpr ref);
+
+variadic(int id: @signaturetype ref);
+
+#keyset[parent, idx]
+typeparam(unique int tp: @typeparamtype ref, string name: string ref, int bound: @compositetype ref,
+          int parent: @typeparamparentobject ref, int idx: int ref);
+
+@container = @file | @folder;
+
+@locatable = @xmllocatable | @node | @localscope;
+
+@node = @documentable | @exprparent | @modexprparent | @fieldparent | @stmtparent | @declparent | @typeparamdeclparent
+      | @scopenode | @comment_group | @comment;
+
+@documentable = @file | @field | @typeparamdecl | @spec | @gendecl | @funcdecl | @modexpr;
+
+@exprparent = @funcdef | @file | @expr | @field | @stmt | @decl | @typeparamdecl | @spec;
+
+@modexprparent = @file | @modexpr;
+
+@fieldparent = @decl | @structtypeexpr | @functypeexpr | @interfacetypeexpr;
+
+@stmtparent = @funcdef | @stmt | @decl;
+
+@declparent = @file | @declstmt;
+
+@typeparamdeclparent = @funcdecl | @typespec;
+
+@funcdef = @funclit | @funcdecl;
+
+@scopenode = @file | @functypeexpr | @blockstmt | @ifstmt | @caseclause | @switchstmt | @commclause | @loopstmt;
+
+@location = @location_default;
+
+@sourceline = @locatable;
+
+case @comment.kind of
+  0 = @slashslashcomment
+| 1 = @slashstarcomment;
+
+case @expr.kind of
+  0 = @badexpr
+| 1 = @ident
+| 2 = @ellipsis
+| 3 = @intlit
+| 4 = @floatlit
+| 5 = @imaglit
+| 6 = @charlit
+| 7 = @stringlit
+| 8 = @funclit
+| 9 = @compositelit
+| 10 = @parenexpr
+| 11 = @selectorexpr
+| 12 = @indexexpr
+| 13 = @genericfunctioninstantiationexpr
+| 14 = @generictypeinstantiationexpr
+| 15 = @sliceexpr
+| 16 = @typeassertexpr
+| 17 = @callorconversionexpr
+| 18 = @starexpr
+| 19 = @keyvalueexpr
+| 20 = @arraytypeexpr
+| 21 = @structtypeexpr
+| 22 = @functypeexpr
+| 23 = @interfacetypeexpr
+| 24 = @maptypeexpr
+| 25 = @typesetliteralexpr
+| 26 = @plusexpr
+| 27 = @minusexpr
+| 28 = @notexpr
+| 29 = @complementexpr
+| 30 = @derefexpr
+| 31 = @addressexpr
+| 32 = @arrowexpr
+| 33 = @lorexpr
+| 34 = @landexpr
+| 35 = @eqlexpr
+| 36 = @neqexpr
+| 37 = @lssexpr
+| 38 = @leqexpr
+| 39 = @gtrexpr
+| 40 = @geqexpr
+| 41 = @addexpr
+| 42 = @subexpr
+| 43 = @orexpr
+| 44 = @xorexpr
+| 45 = @mulexpr
+| 46 = @quoexpr
+| 47 = @remexpr
+| 48 = @shlexpr
+| 49 = @shrexpr
+| 50 = @andexpr
+| 51 = @andnotexpr
+| 52 = @sendchantypeexpr
+| 53 = @recvchantypeexpr
+| 54 = @sendrcvchantypeexpr;
+
+@basiclit = @intlit | @floatlit | @imaglit | @charlit | @stringlit;
+
+@operatorexpr = @logicalexpr | @arithmeticexpr | @bitwiseexpr | @unaryexpr | @binaryexpr;
+
+@logicalexpr = @logicalunaryexpr | @logicalbinaryexpr;
+
+@arithmeticexpr = @arithmeticunaryexpr | @arithmeticbinaryexpr;
+
+@bitwiseexpr = @bitwiseunaryexpr | @bitwisebinaryexpr;
+
+@unaryexpr = @logicalunaryexpr | @bitwiseunaryexpr | @arithmeticunaryexpr | @derefexpr | @addressexpr | @arrowexpr;
+
+@logicalunaryexpr = @notexpr;
+
+@bitwiseunaryexpr = @complementexpr;
+
+@arithmeticunaryexpr = @plusexpr | @minusexpr;
+
+@binaryexpr = @logicalbinaryexpr | @bitwisebinaryexpr | @arithmeticbinaryexpr | @comparison;
+
+@logicalbinaryexpr = @lorexpr | @landexpr;
+
+@bitwisebinaryexpr = @shiftexpr | @orexpr | @xorexpr | @andexpr | @andnotexpr;
+
+@arithmeticbinaryexpr = @addexpr | @subexpr | @mulexpr | @quoexpr | @remexpr;
+
+@shiftexpr = @shlexpr | @shrexpr;
+
+@comparison = @equalitytest | @relationalcomparison;
+
+@equalitytest = @eqlexpr | @neqexpr;
+
+@relationalcomparison = @lssexpr | @leqexpr | @gtrexpr | @geqexpr;
+
+@chantypeexpr = @sendchantypeexpr | @recvchantypeexpr | @sendrcvchantypeexpr;
+
+case @stmt.kind of
+  0 = @badstmt
+| 1 = @declstmt
+| 2 = @emptystmt
+| 3 = @labeledstmt
+| 4 = @exprstmt
+| 5 = @sendstmt
+| 6 = @incstmt
+| 7 = @decstmt
+| 8 = @gostmt
+| 9 = @deferstmt
+| 10 = @returnstmt
+| 11 = @breakstmt
+| 12 = @continuestmt
+| 13 = @gotostmt
+| 14 = @fallthroughstmt
+| 15 = @blockstmt
+| 16 = @ifstmt
+| 17 = @caseclause
+| 18 = @exprswitchstmt
+| 19 = @typeswitchstmt
+| 20 = @commclause
+| 21 = @selectstmt
+| 22 = @forstmt
+| 23 = @rangestmt
+| 24 = @assignstmt
+| 25 = @definestmt
+| 26 = @addassignstmt
+| 27 = @subassignstmt
+| 28 = @mulassignstmt
+| 29 = @quoassignstmt
+| 30 = @remassignstmt
+| 31 = @andassignstmt
+| 32 = @orassignstmt
+| 33 = @xorassignstmt
+| 34 = @shlassignstmt
+| 35 = @shrassignstmt
+| 36 = @andnotassignstmt;
+
+@incdecstmt = @incstmt | @decstmt;
+
+@assignment = @simpleassignstmt | @compoundassignstmt;
+
+@simpleassignstmt = @assignstmt | @definestmt;
+
+@compoundassignstmt = @addassignstmt | @subassignstmt | @mulassignstmt | @quoassignstmt | @remassignstmt
+                    | @andassignstmt | @orassignstmt | @xorassignstmt | @shlassignstmt | @shrassignstmt | @andnotassignstmt;
+
+@branchstmt = @breakstmt | @continuestmt | @gotostmt | @fallthroughstmt;
+
+@switchstmt = @exprswitchstmt | @typeswitchstmt;
+
+@loopstmt = @forstmt | @rangestmt;
+
+case @decl.kind of
+  0 = @baddecl
+| 1 = @importdecl
+| 2 = @constdecl
+| 3 = @typedecl
+| 4 = @vardecl
+| 5 = @funcdecl;
+
+@gendecl = @importdecl | @constdecl | @typedecl | @vardecl;
+
+case @spec.kind of
+  0 = @importspec
+| 1 = @valuespec
+| 2 = @typedefspec
+| 3 = @aliasspec;
+
+@typespec = @typedefspec | @aliasspec;
+
+case @object.kind of
+  0 = @pkgobject
+| 1 = @decltypeobject
+| 2 = @builtintypeobject
+| 3 = @declconstobject
+| 4 = @builtinconstobject
+| 5 = @declvarobject
+| 6 = @declfunctionobject
+| 7 = @builtinfunctionobject
+| 8 = @labelobject;
+
+@typeparamparentobject = @decltypeobject | @declfunctionobject;
+
+@declobject = @decltypeobject | @declconstobject | @declvarobject | @declfunctionobject;
+
+@builtinobject = @builtintypeobject | @builtinconstobject | @builtinfunctionobject;
+
+@typeobject = @decltypeobject | @builtintypeobject;
+
+@valueobject = @constobject | @varobject | @functionobject;
+
+@constobject = @declconstobject | @builtinconstobject;
+
+@varobject = @declvarobject;
+
+@functionobject = @declfunctionobject | @builtinfunctionobject;
+
+case @scope.kind of
+  0 = @universescope
+| 1 = @packagescope
+| 2 = @localscope;
+
+case @type.kind of
+  0 = @invalidtype
+| 1 = @boolexprtype
+| 2 = @inttype
+| 3 = @int8type
+| 4 = @int16type
+| 5 = @int32type
+| 6 = @int64type
+| 7 = @uinttype
+| 8 = @uint8type
+| 9 = @uint16type
+| 10 = @uint32type
+| 11 = @uint64type
+| 12 = @uintptrtype
+| 13 = @float32type
+| 14 = @float64type
+| 15 = @complex64type
+| 16 = @complex128type
+| 17 = @stringexprtype
+| 18 = @unsafepointertype
+| 19 = @boolliteraltype
+| 20 = @intliteraltype
+| 21 = @runeliteraltype
+| 22 = @floatliteraltype
+| 23 = @complexliteraltype
+| 24 = @stringliteraltype
+| 25 = @nilliteraltype
+| 26 = @typeparamtype
+| 27 = @arraytype
+| 28 = @slicetype
+| 29 = @structtype
+| 30 = @pointertype
+| 31 = @interfacetype
+| 32 = @tupletype
+| 33 = @signaturetype
+| 34 = @maptype
+| 35 = @sendchantype
+| 36 = @recvchantype
+| 37 = @sendrcvchantype
+| 38 = @definedtype
+| 39 = @typesetliteraltype;
+
+@basictype = @booltype | @numerictype | @stringtype | @literaltype | @invalidtype | @unsafepointertype;
+
+@booltype = @boolexprtype | @boolliteraltype;
+
+@numerictype = @integertype | @floattype | @complextype;
+
+@integertype = @signedintegertype | @unsignedintegertype;
+
+@signedintegertype = @inttype | @int8type | @int16type | @int32type | @int64type | @intliteraltype | @runeliteraltype;
+
+@unsignedintegertype = @uinttype | @uint8type | @uint16type | @uint32type | @uint64type | @uintptrtype;
+
+@floattype = @float32type | @float64type | @floatliteraltype;
+
+@complextype = @complex64type | @complex128type | @complexliteraltype;
+
+@stringtype = @stringexprtype | @stringliteraltype;
+
+@literaltype = @boolliteraltype | @intliteraltype | @runeliteraltype | @floatliteraltype | @complexliteraltype
+             | @stringliteraltype | @nilliteraltype;
+
+@compositetype = @typeparamtype | @containertype | @structtype | @pointertype | @interfacetype | @tupletype
+               | @signaturetype | @definedtype | @typesetliteraltype;
+
+@containertype = @arraytype | @slicetype | @maptype | @chantype;
+
+@chantype = @sendchantype | @recvchantype | @sendrcvchantype;
+
+case @modexpr.kind of
+  0 = @modcommentblock
+| 1 = @modline
+| 2 = @modlineblock
+| 3 = @modlparen
+| 4 = @modrparen;
+
+case @error.kind of
+  0 = @unknownerror
+| 1 = @listerror
+| 2 = @parseerror
+| 3 = @typeerror;
+
diff --git a/go/downgrades/b1341734d6870b105e5c9d168ce7dec25d7f72d0/old.dbscheme b/go/downgrades/b1341734d6870b105e5c9d168ce7dec25d7f72d0/old.dbscheme
new file mode 100644
index 00000000000..b1341734d68
--- /dev/null
+++ b/go/downgrades/b1341734d6870b105e5c9d168ce7dec25d7f72d0/old.dbscheme
@@ -0,0 +1,563 @@
+/** Auto-generated dbscheme; do not edit. Run `make gen` in directory `go/` to regenerate. */
+
+
+/** Duplicate code **/
+
+duplicateCode(
+  unique int id : @duplication,
+  varchar(900) relativePath : string ref,
+  int equivClass : int ref);
+
+similarCode(
+  unique int id : @similarity,
+  varchar(900) relativePath : string ref,
+  int equivClass : int ref);
+
+@duplication_or_similarity = @duplication | @similarity;
+
+tokens(
+  int id : @duplication_or_similarity ref,
+  int offset : int ref,
+  int beginLine : int ref,
+  int beginColumn : int ref,
+  int endLine : int ref,
+  int endColumn : int ref);
+
+/** External data **/
+
+externalData(
+  int id : @externalDataElement,
+  varchar(900) path : string ref,
+  int column: int ref,
+  varchar(900) value : string ref
+);
+
+snapshotDate(unique date snapshotDate : date ref);
+
+sourceLocationPrefix(varchar(900) prefix : string ref);
+
+/** Overlay support **/
+
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+overlayChangedFiles(
+  string path: string ref
+);
+
+
+/*
+ * XML Files
+ */
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+compilations(unique int id: @compilation, string cwd: string ref);
+
+#keyset[id, num]
+compilation_args(int id: @compilation ref, int num: int ref, string arg: string ref);
+
+#keyset[id, num, kind]
+compilation_time(int id: @compilation ref, int num: int ref, int kind: int ref, float secs: float ref);
+
+diagnostic_for(unique int diagnostic: @diagnostic ref, int compilation: @compilation ref, int file_number: int ref, int file_number_diagnostic_number: int ref);
+
+compilation_finished(unique int id: @compilation ref, float cpu_seconds: float ref, float elapsed_seconds: float ref);
+
+#keyset[id, num]
+compilation_compiling_files(int id: @compilation ref, int num: int ref, int file: @file ref);
+
+diagnostics(unique int id: @diagnostic, int severity: int ref, string error_tag: string ref, string error_message: string ref,
+            string full_error_message: string ref, int location: @location ref);
+
+locations_default(unique int id: @location_default, int file: @file ref, int beginLine: int ref, int beginColumn: int ref,
+                  int endLine: int ref, int endColumn: int ref);
+
+numlines(int element_id: @sourceline ref, int num_lines: int ref, int num_code: int ref, int num_comment: int ref);
+
+files(unique int id: @file, string name: string ref);
+
+folders(unique int id: @folder, string name: string ref);
+
+containerparent(int parent: @container ref, unique int child: @container ref);
+
+has_location(unique int locatable: @locatable ref, int location: @location ref);
+
+#keyset[parent, idx]
+comment_groups(unique int id: @comment_group, int parent: @file ref, int idx: int ref);
+
+comments(unique int id: @comment, int kind: int ref, int parent: @comment_group ref, int idx: int ref, string text: string ref);
+
+doc_comments(unique int node: @documentable ref, int comment: @comment_group ref);
+
+#keyset[parent, idx]
+exprs(unique int id: @expr, int kind: int ref, int parent: @exprparent ref, int idx: int ref);
+
+literals(unique int expr: @expr ref, string value: string ref, string raw: string ref);
+
+constvalues(unique int expr: @expr ref, string value: string ref, string exact: string ref);
+
+fields(unique int id: @field, int parent: @fieldparent ref, int idx: int ref);
+
+typeparamdecls(unique int id: @typeparamdecl, int parent: @typeparamdeclparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+stmts(unique int id: @stmt, int kind: int ref, int parent: @stmtparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+decls(unique int id: @decl, int kind: int ref, int parent: @declparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+specs(unique int id: @spec, int kind: int ref, int parent: @gendecl ref, int idx: int ref);
+
+scopes(unique int id: @scope, int kind: int ref);
+
+scopenesting(unique int inner: @scope ref, int outer: @scope ref);
+
+scopenodes(unique int node: @scopenode ref, int scope: @localscope ref);
+
+objects(unique int id: @object, int kind: int ref, string name: string ref);
+
+objectscopes(unique int object: @object ref, int scope: @scope ref);
+
+objecttypes(unique int object: @object ref, int tp: @type ref);
+
+methodreceivers(unique int method: @object ref, int receiver: @object ref);
+
+fieldstructs(unique int field: @object ref, int struct: @structtype ref);
+
+methodhosts(int method: @object ref, int host: @definedtype ref);
+
+defs(int ident: @ident ref, int object: @object ref);
+
+uses(int ident: @ident ref, int object: @object ref);
+
+types(unique int id: @type, int kind: int ref);
+
+type_of(unique int expr: @expr ref, int tp: @type ref);
+
+typename(unique int tp: @type ref, string name: string ref);
+
+key_type(unique int map: @maptype ref, int tp: @type ref);
+
+element_type(unique int container: @containertype ref, int tp: @type ref);
+
+base_type(unique int ptr: @pointertype ref, int tp: @type ref);
+
+underlying_type(unique int defined: @definedtype ref, int tp: @type ref);
+
+#keyset[parent, index]
+component_types(int parent: @compositetype ref, int index: int ref, string name: string ref, int tp: @type ref);
+
+#keyset[parent, index]
+struct_tags(int parent: @structtype ref, int index: int ref, string tag: string ref);
+
+#keyset[interface, index]
+interface_private_method_ids(int interface: @interfacetype ref, int index: int ref, string id: string ref);
+
+array_length(unique int tp: @arraytype ref, string len: string ref);
+
+type_objects(unique int tp: @type ref, int object: @object ref);
+
+packages(unique int id: @package, string name: string ref, string path: string ref, int scope: @packagescope ref);
+
+#keyset[parent, idx]
+modexprs(unique int id: @modexpr, int kind: int ref, int parent: @modexprparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+modtokens(string token: string ref, int parent: @modexpr ref, int idx: int ref);
+
+#keyset[package, idx]
+errors(unique int id: @error, int kind: int ref, string msg: string ref, string rawpos: string ref,
+       string file: string ref, int line: int ref, int col: int ref, int package: @package ref, int idx: int ref);
+
+has_ellipsis(int id: @callorconversionexpr ref);
+
+variadic(int id: @signaturetype ref);
+
+#keyset[parent, idx]
+typeparam(unique int tp: @typeparamtype ref, string name: string ref, int bound: @compositetype ref,
+          int parent: @typeparamparentobject ref, int idx: int ref);
+
+@container = @file | @folder;
+
+@locatable = @xmllocatable | @node | @localscope;
+
+@node = @documentable | @exprparent | @modexprparent | @fieldparent | @stmtparent | @declparent | @typeparamdeclparent
+      | @scopenode | @comment_group | @comment;
+
+@documentable = @file | @field | @typeparamdecl | @spec | @gendecl | @funcdecl | @modexpr;
+
+@exprparent = @funcdef | @file | @expr | @field | @stmt | @decl | @typeparamdecl | @spec;
+
+@modexprparent = @file | @modexpr;
+
+@fieldparent = @decl | @structtypeexpr | @functypeexpr | @interfacetypeexpr;
+
+@stmtparent = @funcdef | @stmt | @decl;
+
+@declparent = @file | @declstmt;
+
+@typeparamdeclparent = @funcdecl | @typespec;
+
+@funcdef = @funclit | @funcdecl;
+
+@scopenode = @file | @functypeexpr | @blockstmt | @ifstmt | @caseclause | @switchstmt | @commclause | @loopstmt;
+
+@location = @location_default;
+
+@sourceline = @locatable;
+
+case @comment.kind of
+  0 = @slashslashcomment
+| 1 = @slashstarcomment;
+
+case @expr.kind of
+  0 = @badexpr
+| 1 = @ident
+| 2 = @ellipsis
+| 3 = @intlit
+| 4 = @floatlit
+| 5 = @imaglit
+| 6 = @charlit
+| 7 = @stringlit
+| 8 = @funclit
+| 9 = @compositelit
+| 10 = @parenexpr
+| 11 = @selectorexpr
+| 12 = @indexexpr
+| 13 = @genericfunctioninstantiationexpr
+| 14 = @generictypeinstantiationexpr
+| 15 = @sliceexpr
+| 16 = @typeassertexpr
+| 17 = @callorconversionexpr
+| 18 = @starexpr
+| 19 = @keyvalueexpr
+| 20 = @arraytypeexpr
+| 21 = @structtypeexpr
+| 22 = @functypeexpr
+| 23 = @interfacetypeexpr
+| 24 = @maptypeexpr
+| 25 = @typesetliteralexpr
+| 26 = @plusexpr
+| 27 = @minusexpr
+| 28 = @notexpr
+| 29 = @complementexpr
+| 30 = @derefexpr
+| 31 = @addressexpr
+| 32 = @arrowexpr
+| 33 = @lorexpr
+| 34 = @landexpr
+| 35 = @eqlexpr
+| 36 = @neqexpr
+| 37 = @lssexpr
+| 38 = @leqexpr
+| 39 = @gtrexpr
+| 40 = @geqexpr
+| 41 = @addexpr
+| 42 = @subexpr
+| 43 = @orexpr
+| 44 = @xorexpr
+| 45 = @mulexpr
+| 46 = @quoexpr
+| 47 = @remexpr
+| 48 = @shlexpr
+| 49 = @shrexpr
+| 50 = @andexpr
+| 51 = @andnotexpr
+| 52 = @sendchantypeexpr
+| 53 = @recvchantypeexpr
+| 54 = @sendrcvchantypeexpr;
+
+@basiclit = @intlit | @floatlit | @imaglit | @charlit | @stringlit;
+
+@operatorexpr = @logicalexpr | @arithmeticexpr | @bitwiseexpr | @unaryexpr | @binaryexpr;
+
+@logicalexpr = @logicalunaryexpr | @logicalbinaryexpr;
+
+@arithmeticexpr = @arithmeticunaryexpr | @arithmeticbinaryexpr;
+
+@bitwiseexpr = @bitwiseunaryexpr | @bitwisebinaryexpr;
+
+@unaryexpr = @logicalunaryexpr | @bitwiseunaryexpr | @arithmeticunaryexpr | @derefexpr | @addressexpr | @arrowexpr;
+
+@logicalunaryexpr = @notexpr;
+
+@bitwiseunaryexpr = @complementexpr;
+
+@arithmeticunaryexpr = @plusexpr | @minusexpr;
+
+@binaryexpr = @logicalbinaryexpr | @bitwisebinaryexpr | @arithmeticbinaryexpr | @comparison;
+
+@logicalbinaryexpr = @lorexpr | @landexpr;
+
+@bitwisebinaryexpr = @shiftexpr | @orexpr | @xorexpr | @andexpr | @andnotexpr;
+
+@arithmeticbinaryexpr = @addexpr | @subexpr | @mulexpr | @quoexpr | @remexpr;
+
+@shiftexpr = @shlexpr | @shrexpr;
+
+@comparison = @equalitytest | @relationalcomparison;
+
+@equalitytest = @eqlexpr | @neqexpr;
+
+@relationalcomparison = @lssexpr | @leqexpr | @gtrexpr | @geqexpr;
+
+@chantypeexpr = @sendchantypeexpr | @recvchantypeexpr | @sendrcvchantypeexpr;
+
+case @stmt.kind of
+  0 = @badstmt
+| 1 = @declstmt
+| 2 = @emptystmt
+| 3 = @labeledstmt
+| 4 = @exprstmt
+| 5 = @sendstmt
+| 6 = @incstmt
+| 7 = @decstmt
+| 8 = @gostmt
+| 9 = @deferstmt
+| 10 = @returnstmt
+| 11 = @breakstmt
+| 12 = @continuestmt
+| 13 = @gotostmt
+| 14 = @fallthroughstmt
+| 15 = @blockstmt
+| 16 = @ifstmt
+| 17 = @caseclause
+| 18 = @exprswitchstmt
+| 19 = @typeswitchstmt
+| 20 = @commclause
+| 21 = @selectstmt
+| 22 = @forstmt
+| 23 = @rangestmt
+| 24 = @assignstmt
+| 25 = @definestmt
+| 26 = @addassignstmt
+| 27 = @subassignstmt
+| 28 = @mulassignstmt
+| 29 = @quoassignstmt
+| 30 = @remassignstmt
+| 31 = @andassignstmt
+| 32 = @orassignstmt
+| 33 = @xorassignstmt
+| 34 = @shlassignstmt
+| 35 = @shrassignstmt
+| 36 = @andnotassignstmt;
+
+@incdecstmt = @incstmt | @decstmt;
+
+@assignment = @simpleassignstmt | @compoundassignstmt;
+
+@simpleassignstmt = @assignstmt | @definestmt;
+
+@compoundassignstmt = @addassignstmt | @subassignstmt | @mulassignstmt | @quoassignstmt | @remassignstmt
+                    | @andassignstmt | @orassignstmt | @xorassignstmt | @shlassignstmt | @shrassignstmt | @andnotassignstmt;
+
+@branchstmt = @breakstmt | @continuestmt | @gotostmt | @fallthroughstmt;
+
+@switchstmt = @exprswitchstmt | @typeswitchstmt;
+
+@loopstmt = @forstmt | @rangestmt;
+
+case @decl.kind of
+  0 = @baddecl
+| 1 = @importdecl
+| 2 = @constdecl
+| 3 = @typedecl
+| 4 = @vardecl
+| 5 = @funcdecl;
+
+@gendecl = @importdecl | @constdecl | @typedecl | @vardecl;
+
+case @spec.kind of
+  0 = @importspec
+| 1 = @valuespec
+| 2 = @typedefspec
+| 3 = @aliasspec;
+
+@typespec = @typedefspec | @aliasspec;
+
+case @object.kind of
+  0 = @pkgobject
+| 1 = @decltypeobject
+| 2 = @builtintypeobject
+| 3 = @declconstobject
+| 4 = @builtinconstobject
+| 5 = @declvarobject
+| 6 = @declfunctionobject
+| 7 = @builtinfunctionobject
+| 8 = @labelobject;
+
+@typeparamparentobject = @decltypeobject | @declfunctionobject;
+
+@declobject = @decltypeobject | @declconstobject | @declvarobject | @declfunctionobject;
+
+@builtinobject = @builtintypeobject | @builtinconstobject | @builtinfunctionobject;
+
+@typeobject = @decltypeobject | @builtintypeobject;
+
+@valueobject = @constobject | @varobject | @functionobject;
+
+@constobject = @declconstobject | @builtinconstobject;
+
+@varobject = @declvarobject;
+
+@functionobject = @declfunctionobject | @builtinfunctionobject;
+
+case @scope.kind of
+  0 = @universescope
+| 1 = @packagescope
+| 2 = @localscope;
+
+case @type.kind of
+  0 = @invalidtype
+| 1 = @boolexprtype
+| 2 = @inttype
+| 3 = @int8type
+| 4 = @int16type
+| 5 = @int32type
+| 6 = @int64type
+| 7 = @uinttype
+| 8 = @uint8type
+| 9 = @uint16type
+| 10 = @uint32type
+| 11 = @uint64type
+| 12 = @uintptrtype
+| 13 = @float32type
+| 14 = @float64type
+| 15 = @complex64type
+| 16 = @complex128type
+| 17 = @stringexprtype
+| 18 = @unsafepointertype
+| 19 = @boolliteraltype
+| 20 = @intliteraltype
+| 21 = @runeliteraltype
+| 22 = @floatliteraltype
+| 23 = @complexliteraltype
+| 24 = @stringliteraltype
+| 25 = @nilliteraltype
+| 26 = @typeparamtype
+| 27 = @arraytype
+| 28 = @slicetype
+| 29 = @structtype
+| 30 = @pointertype
+| 31 = @interfacetype
+| 32 = @tupletype
+| 33 = @signaturetype
+| 34 = @maptype
+| 35 = @sendchantype
+| 36 = @recvchantype
+| 37 = @sendrcvchantype
+| 38 = @definedtype
+| 39 = @typesetliteraltype;
+
+@basictype = @booltype | @numerictype | @stringtype | @literaltype | @invalidtype | @unsafepointertype;
+
+@booltype = @boolexprtype | @boolliteraltype;
+
+@numerictype = @integertype | @floattype | @complextype;
+
+@integertype = @signedintegertype | @unsignedintegertype;
+
+@signedintegertype = @inttype | @int8type | @int16type | @int32type | @int64type | @intliteraltype | @runeliteraltype;
+
+@unsignedintegertype = @uinttype | @uint8type | @uint16type | @uint32type | @uint64type | @uintptrtype;
+
+@floattype = @float32type | @float64type | @floatliteraltype;
+
+@complextype = @complex64type | @complex128type | @complexliteraltype;
+
+@stringtype = @stringexprtype | @stringliteraltype;
+
+@literaltype = @boolliteraltype | @intliteraltype | @runeliteraltype | @floatliteraltype | @complexliteraltype
+             | @stringliteraltype | @nilliteraltype;
+
+@compositetype = @typeparamtype | @containertype | @structtype | @pointertype | @interfacetype | @tupletype
+               | @signaturetype | @definedtype | @typesetliteraltype;
+
+@containertype = @arraytype | @slicetype | @maptype | @chantype;
+
+@chantype = @sendchantype | @recvchantype | @sendrcvchantype;
+
+case @modexpr.kind of
+  0 = @modcommentblock
+| 1 = @modline
+| 2 = @modlineblock
+| 3 = @modlparen
+| 4 = @modrparen;
+
+case @error.kind of
+  0 = @unknownerror
+| 1 = @listerror
+| 2 = @parseerror
+| 3 = @typeerror;
+
diff --git a/go/downgrades/b1341734d6870b105e5c9d168ce7dec25d7f72d0/upgrade.properties b/go/downgrades/b1341734d6870b105e5c9d168ce7dec25d7f72d0/upgrade.properties
new file mode 100644
index 00000000000..1a7cdb0ad71
--- /dev/null
+++ b/go/downgrades/b1341734d6870b105e5c9d168ce7dec25d7f72d0/upgrade.properties
@@ -0,0 +1,4 @@
+description: Add databaseMetadata and overlayChangedFiles relations
+compatibility: full
+databaseMetadata.rel: delete
+overlayChangedFiles.rel: delete
diff --git a/go/extractor/cli/go-autobuilder/BUILD.bazel b/go/extractor/cli/go-autobuilder/BUILD.bazel
index 0c705d5b194..003836b0874 100644
--- a/go/extractor/cli/go-autobuilder/BUILD.bazel
+++ b/go/extractor/cli/go-autobuilder/BUILD.bazel
@@ -12,6 +12,7 @@ go_library(
         "//go/extractor/autobuilder",
         "//go/extractor/diagnostics",
         "//go/extractor/project",
+        "//go/extractor/srcarchive",
         "//go/extractor/toolchain",
         "//go/extractor/util",
     ],
diff --git a/go/extractor/cli/go-autobuilder/go-autobuilder.go b/go/extractor/cli/go-autobuilder/go-autobuilder.go
index 1601b5659d3..756bd19b45e 100644
--- a/go/extractor/cli/go-autobuilder/go-autobuilder.go
+++ b/go/extractor/cli/go-autobuilder/go-autobuilder.go
@@ -13,6 +13,7 @@ import (
 	"github.com/github/codeql-go/extractor/autobuilder"
 	"github.com/github/codeql-go/extractor/diagnostics"
 	"github.com/github/codeql-go/extractor/project"
+	"github.com/github/codeql-go/extractor/srcarchive"
 	"github.com/github/codeql-go/extractor/toolchain"
 	"github.com/github/codeql-go/extractor/util"
 )
@@ -273,7 +274,7 @@ func createPathTransformerFile(newdir string) *os.File {
 		log.Fatalf("Failed to chdir into %s: %s\n", newdir, err.Error())
 	}
 
-	// set up SEMMLE_PATH_TRANSFORMER to ensure paths in the source archive and the snapshot
+	// set up CODEQL_PATH_TRANSFORMER to ensure paths in the source archive and the snapshot
 	// match the original source location, not the location we moved it to
 	pt, err := os.CreateTemp("", "path-transformer")
 	if err != nil {
@@ -283,7 +284,7 @@ func createPathTransformerFile(newdir string) *os.File {
 }
 
 // Writes the path transformer file
-func writePathTransformerFile(pt *os.File, realSrc, root, newdir string) {
+func writePathTransformerFile(pt *os.File, realSrc, newdir string) {
 	_, err := pt.WriteString("#" + realSrc + "\n" + newdir + "//\n")
 	if err != nil {
 		log.Fatalf("Unable to write path transformer file: %s.", err.Error())
@@ -292,9 +293,9 @@ func writePathTransformerFile(pt *os.File, realSrc, root, newdir string) {
 	if err != nil {
 		log.Fatalf("Unable to close path transformer file: %s.", err.Error())
 	}
-	err = os.Setenv("SEMMLE_PATH_TRANSFORMER", pt.Name())
+	err = os.Setenv("CODEQL_PATH_TRANSFORMER", pt.Name())
 	if err != nil {
-		log.Fatalf("Unable to set SEMMLE_PATH_TRANSFORMER environment variable: %s.\n", err.Error())
+		log.Fatalf("Unable to set CODEQL_PATH_TRANSFORMER environment variable: %s.\n", err.Error())
 	}
 }
 
@@ -447,7 +448,7 @@ func installDependencies(workspace project.GoWorkspace) {
 }
 
 // Run the extractor.
-func extract(workspace project.GoWorkspace) bool {
+func extract(workspace project.GoWorkspace, sourceRoot string) bool {
 	extractor, err := util.GetExtractorPath()
 	if err != nil {
 		log.Fatalf("Could not determine path of extractor: %v.\n", err)
@@ -458,6 +459,12 @@ func extract(workspace project.GoWorkspace) bool {
 		extractorArgs = append(extractorArgs, workspace.ModMode.ArgsForGoVersion(toolchain.GetEnvGoSemVer())...)
 	}
 
+	if util.IsOverlayExtraction() {
+		// When we are extracting an overlay, pass the source root to the extractor so that it knows
+		// how to resolve the relative paths in the list of changed files.
+		extractorArgs = append(extractorArgs, "--source-root", sourceRoot)
+	}
+
 	if len(workspace.Modules) == 0 {
 		// There may be no modules if we are using e.g. Dep or Glide
 		extractorArgs = append(extractorArgs, "./...")
@@ -501,9 +508,6 @@ func installDependenciesAndBuild() {
 
 	srcdir := getSourceDir()
 
-	// we set `SEMMLE_PATH_TRANSFORMER` ourselves in some cases, so blank it out first for consistency
-	os.Setenv("SEMMLE_PATH_TRANSFORMER", "")
-
 	// determine how to install dependencies and whether a GOPATH needs to be set up before
 	// extraction
 	workspaces := project.GetWorkspaceInfo(true)
@@ -534,7 +538,21 @@ func installDependenciesAndBuild() {
 			pt := createPathTransformerFile(paths.newdir)
 			defer os.Remove(pt.Name())
 
-			writePathTransformerFile(pt, paths.realSrc, paths.root, paths.newdir)
+			// We're about to create out own path transformer, so that paths containing the
+			// temporary GOPATH point to the right location. However, if there was already an
+			// incoming path transformer, the right location will be what _it_ wanted to transform
+			// paths to.
+			existingPathTransformer, err := srcarchive.LoadProjectLayoutFromEnv()
+			if err != nil {
+				log.Fatalf("Unable to load path transformer: %s.\n", err.Error())
+			}
+			var realSrc string
+			if existingPathTransformer == nil {
+				realSrc = paths.realSrc
+			} else {
+				realSrc = existingPathTransformer.To
+			}
+			writePathTransformerFile(pt, realSrc, paths.newdir)
 			setGopath(paths.root)
 		}
 	}
@@ -575,6 +593,12 @@ func installDependenciesAndBuild() {
 		buildWithCustomCommands(inst)
 	}
 
+	// The autobuilder is invoked with its working directory set to the source directory.
+	sourceRoot, err := os.Getwd()
+	if err != nil {
+		log.Fatalf("Failed to get current working directory: %s\n", err.Error())
+	}
+
 	// Attempt to extract all workspaces; we will tolerate individual extraction failures here
 	for i, workspace := range workspaces {
 		if workspace.ModMode == project.ModVendor {
@@ -595,7 +619,7 @@ func installDependenciesAndBuild() {
 			}
 		}
 
-		workspaces[i].Extracted = extract(workspace)
+		workspaces[i].Extracted = extract(workspace, sourceRoot)
 
 		if !workspaces[i].Extracted {
 			unsuccessfulProjects = append(unsuccessfulProjects, workspace.BaseDir)
@@ -620,9 +644,13 @@ func installDependenciesAndBuild() {
 	} else {
 		log.Printf("Success: extraction succeeded for all %d discovered project(s).\n", len(workspaces))
 	}
+
+	util.WriteOverlayBaseMetadata()
 }
 
 func main() {
+	util.SetLogLevel()
+
 	if len(os.Args) == 1 {
 		installDependenciesAndBuild()
 	} else if len(os.Args) == 2 && os.Args[1] == "--identify-environment" {
diff --git a/go/extractor/cli/go-extractor/BUILD.bazel b/go/extractor/cli/go-extractor/BUILD.bazel
index 769e4a7b09b..ec7cf150f0a 100644
--- a/go/extractor/cli/go-extractor/BUILD.bazel
+++ b/go/extractor/cli/go-extractor/BUILD.bazel
@@ -11,6 +11,7 @@ go_library(
     deps = [
         "//go/extractor",
         "//go/extractor/diagnostics",
+        "//go/extractor/util",
     ],
 )
 
diff --git a/go/extractor/cli/go-extractor/go-extractor.go b/go/extractor/cli/go-extractor/go-extractor.go
index 425af6cd55d..d394d5fde40 100644
--- a/go/extractor/cli/go-extractor/go-extractor.go
+++ b/go/extractor/cli/go-extractor/go-extractor.go
@@ -10,6 +10,7 @@ import (
 
 	"github.com/github/codeql-go/extractor"
 	"github.com/github/codeql-go/extractor/diagnostics"
+	"github.com/github/codeql-go/extractor/util"
 )
 
 var cpuprofile, memprofile string
@@ -23,9 +24,10 @@ func usage() {
 
 // extractTests is set (a) if we were manually commanded to extract tests via the relevant
 // environment variable / extractor option, or (b) we're mimicking a `go test` command.
-func parseFlags(args []string, mimic bool, extractTests bool) ([]string, []string, bool) {
+func parseFlags(args []string, mimic bool, extractTests bool) ([]string, []string, bool, string) {
 	i := 0
 	buildFlags := []string{}
+	var sourceRoot string
 	for ; i < len(args) && strings.HasPrefix(args[i], "-"); i++ {
 		if args[i] == "--" {
 			i++
@@ -60,6 +62,18 @@ func parseFlags(args []string, mimic bool, extractTests bool) ([]string, []strin
 				} else {
 					log.Fatalf("--mimic requires an argument, e.g. --mimic go")
 				}
+			case "--source-root":
+				// The extractor can be called by the autobuilder with the working directory set to
+				// the directory containing the workspace we're extracting, and this may be a
+				// subdirectory of the actual source root. This argument lets us resolve paths that
+				// are relative to that source root, e.g. for the list of overlay changed files.
+				if i+1 < len(args) {
+					i++
+					sourceRoot = args[i]
+					log.Printf("Source root is %s", sourceRoot)
+				} else {
+					log.Fatalf("--source-root requires an argument, e.g. --source-root /path/to/root")
+				}
 			}
 		}
 
@@ -92,12 +106,14 @@ func parseFlags(args []string, mimic bool, extractTests bool) ([]string, []strin
 	cpuprofile = os.Getenv("CODEQL_EXTRACTOR_GO_CPU_PROFILE")
 	memprofile = os.Getenv("CODEQL_EXTRACTOR_GO_MEM_PROFILE")
 
-	return buildFlags, args[i:], extractTests
+	return buildFlags, args[i:], extractTests, sourceRoot
 }
 
 func main() {
+	util.SetLogLevel()
+
 	extractTestsDefault := os.Getenv("CODEQL_EXTRACTOR_GO_OPTION_EXTRACT_TESTS") == "true"
-	buildFlags, patterns, extractTests := parseFlags(os.Args[1:], false, extractTestsDefault)
+	buildFlags, patterns, extractTests, sourceRoot := parseFlags(os.Args[1:], false, extractTestsDefault)
 
 	if cpuprofile != "" {
 		f, err := os.Create(cpuprofile)
@@ -117,7 +133,7 @@ func main() {
 	}
 
 	log.Printf("Build flags: '%s'; patterns: '%s'\n", strings.Join(buildFlags, " "), strings.Join(patterns, " "))
-	err := extractor.ExtractWithFlags(buildFlags, patterns, extractTests)
+	err := extractor.ExtractWithFlags(buildFlags, patterns, extractTests, sourceRoot)
 	if err != nil {
 		errString := err.Error()
 		if strings.Contains(errString, "unexpected directory layout:") {
diff --git a/go/extractor/dbscheme/tables.go b/go/extractor/dbscheme/tables.go
index 665ecdcc240..9c537fbaf89 100644
--- a/go/extractor/dbscheme/tables.go
+++ b/go/extractor/dbscheme/tables.go
@@ -43,6 +43,17 @@ externalData(
 snapshotDate(unique date snapshotDate : date ref);
 
 sourceLocationPrefix(varchar(900) prefix : string ref);
+
+/** Overlay support **/
+
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+overlayChangedFiles(
+  string path: string ref
+);
 `)
 
 // Copied directly from the XML dbscheme
diff --git a/go/extractor/extractor.go b/go/extractor/extractor.go
index 67c12737584..09dd1b3f575 100644
--- a/go/extractor/extractor.go
+++ b/go/extractor/extractor.go
@@ -11,6 +11,7 @@ import (
 	"go/types"
 	"io"
 	"log"
+	"log/slog"
 	"os"
 	"path/filepath"
 	"reflect"
@@ -58,16 +59,11 @@ func init() {
 	}
 }
 
-// Extract extracts the packages specified by the given patterns
-func Extract(patterns []string) error {
-	return ExtractWithFlags(nil, patterns, false)
-}
-
 // ExtractWithFlags extracts the packages specified by the given patterns and build flags
-func ExtractWithFlags(buildFlags []string, patterns []string, extractTests bool) error {
+func ExtractWithFlags(buildFlags []string, patterns []string, extractTests bool, sourceRoot string) error {
 	startTime := time.Now()
 
-	extraction := NewExtraction(buildFlags, patterns)
+	extraction := NewExtraction(buildFlags, patterns, sourceRoot)
 	defer extraction.StatWriter.Close()
 
 	modEnabled := os.Getenv("GO111MODULE") != "off"
@@ -323,16 +319,17 @@ func ExtractWithFlags(buildFlags []string, patterns []string, extractTests bool)
 type Extraction struct {
 	// A lock for preventing concurrent writes to maps and the stat trap writer, as they are not
 	// thread-safe
-	Lock         sync.Mutex
-	LabelKey     string
-	Label        trap.Label
-	StatWriter   *trap.Writer
-	WaitGroup    sync.WaitGroup
-	GoroutineSem *semaphore
-	FdSem        *semaphore
-	NextFileId   int
-	FileInfo     map[string]*FileInfo
-	SeenGoMods   map[string]bool
+	Lock           sync.Mutex
+	LabelKey       string
+	Label          trap.Label
+	StatWriter     *trap.Writer
+	WaitGroup      sync.WaitGroup
+	GoroutineSem   *semaphore
+	FdSem          *semaphore
+	NextFileId     int
+	FileInfo       map[string]*FileInfo
+	SeenGoMods     map[string]bool
+	OverlayChanges map[string]bool
 }
 
 type FileInfo struct {
@@ -367,7 +364,7 @@ func (extraction *Extraction) GetNextErr(path string) int {
 	return res
 }
 
-func NewExtraction(buildFlags []string, patterns []string) *Extraction {
+func NewExtraction(buildFlags []string, patterns []string, sourceRoot string) *Extraction {
 	hash := md5.New()
 	io.WriteString(hash, "go")
 	for _, buildFlag := range buildFlags {
@@ -379,6 +376,22 @@ func NewExtraction(buildFlags []string, patterns []string) *Extraction {
 	}
 	sum := hash.Sum(nil)
 
+	overlayChangeList := util.GetOverlayChanges(sourceRoot)
+	var overlayChanges map[string]bool
+	if overlayChangeList == nil {
+		overlayChanges = nil
+	} else {
+		overlayChanges = make(map[string]bool)
+		for _, changedFilePath := range overlayChangeList {
+			absPath, err := filepath.Abs(changedFilePath)
+			if err != nil {
+				log.Fatalf("Error resolving absolute path of overlay change %s: %s", changedFilePath, err.Error())
+			}
+			overlayChanges[absPath] = true
+			slog.Info("Overlay changed file", "path", absPath)
+		}
+	}
+
 	i := 0
 	var path string
 	// split compilation files into directories to avoid filling a single directory with too many files
@@ -438,10 +451,11 @@ func NewExtraction(buildFlags []string, patterns []string) *Extraction {
 		FdSem: newSemaphore(100),
 		// this semaphore is used to limit the number of goroutines spawned, so we
 		// don't run into memory issues
-		GoroutineSem: newSemaphore(MaxGoRoutines),
-		NextFileId:   0,
-		FileInfo:     make(map[string]*FileInfo),
-		SeenGoMods:   make(map[string]bool),
+		GoroutineSem:   newSemaphore(MaxGoRoutines),
+		NextFileId:     0,
+		FileInfo:       make(map[string]*FileInfo),
+		SeenGoMods:     make(map[string]bool),
+		OverlayChanges: overlayChanges,
 	}
 }
 
@@ -720,6 +734,16 @@ func (extraction *Extraction) extractFile(ast *ast.File, pkg *packages.Package)
 		return nil
 	}
 	path := normalizedPath(ast, fset)
+	// If we're extracting an overlay, we want to skip extraction of files that haven't changed.
+	// Since some files may be outside the source directory (e.g. files preprocessed by cgo) we
+	// can't easily know if they have changed (or came from source files that changed), so we always
+	// extract a file if it's not in the package directory.
+	if extraction.OverlayChanges != nil &&
+		!extraction.OverlayChanges[path] &&
+		strings.HasPrefix(path+string(filepath.Separator), pkg.Dir) {
+		slog.Info("Skipping unchanged file in overlay extraction", "path", path)
+		return nil
+	}
 
 	extraction.FdSem.acquire(3)
 
@@ -791,12 +815,12 @@ func (extraction *Extraction) extractFileInfo(tw *trap.Writer, file string, isDu
 			displayPath = rawPath
 		}
 		if i == len(components)-1 {
-			lbl := tw.Labeler.FileLabelFor(file)
+			lbl := tw.Labeler.FileLabelFor(path)
 			dbscheme.FilesTable.Emit(tw, lbl, displayPath)
 			dbscheme.ContainerParentTable.Emit(tw, parentLbl, lbl)
 			dbscheme.HasLocationTable.Emit(tw, lbl, emitLocation(tw, lbl, 0, 0, 0, 0))
 			extraction.Lock.Lock()
-			slbl := extraction.StatWriter.Labeler.FileLabelFor(file)
+			slbl := extraction.StatWriter.Labeler.FileLabelFor(path)
 			if !isDummy {
 				dbscheme.CompilationCompilingFilesTable.Emit(extraction.StatWriter, extraction.Label, extraction.GetFileIdx(file), slbl)
 			}
diff --git a/go/extractor/go.mod b/go/extractor/go.mod
index 8ec7ec72fc2..e581fdb652c 100644
--- a/go/extractor/go.mod
+++ b/go/extractor/go.mod
@@ -9,8 +9,8 @@ toolchain go1.25.0
 // when adding or removing dependencies, run
 //    bazel mod tidy
 require (
-	golang.org/x/mod v0.26.0
-	golang.org/x/tools v0.35.0
+	golang.org/x/mod v0.30.0
+	golang.org/x/tools v0.39.0
 )
 
-require golang.org/x/sync v0.16.0 // indirect
+require golang.org/x/sync v0.18.0 // indirect
diff --git a/go/extractor/go.sum b/go/extractor/go.sum
index 58f0d0b933b..6579b482848 100644
--- a/go/extractor/go.sum
+++ b/go/extractor/go.sum
@@ -1,8 +1,8 @@
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-golang.org/x/mod v0.26.0 h1:EGMPT//Ezu+ylkCijjPc+f4Aih7sZvaAr+O3EHBxvZg=
-golang.org/x/mod v0.26.0/go.mod h1:/j6NAhSk8iQ723BGAUyoAcn7SlD7s15Dp9Nd/SfeaFQ=
-golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
-golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
-golang.org/x/tools v0.35.0 h1:mBffYraMEf7aa0sB+NuKnuCy8qI/9Bughn8dC2Gu5r0=
-golang.org/x/tools v0.35.0/go.mod h1:NKdj5HkL/73byiZSJjqJgKn3ep7KjFkBOkR/Hps3VPw=
+golang.org/x/mod v0.30.0 h1:fDEXFVZ/fmCKProc/yAXXUijritrDzahmwwefnjoPFk=
+golang.org/x/mod v0.30.0/go.mod h1:lAsf5O2EvJeSFMiBxXDki7sCgAxEUcZHXoXMKT4GJKc=
+golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I=
+golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
+golang.org/x/tools v0.39.0 h1:ik4ho21kwuQln40uelmciQPp9SipgNDdrafrYA4TmQQ=
+golang.org/x/tools v0.39.0/go.mod h1:JnefbkDPyD8UU2kI5fuf8ZX4/yUeh9W877ZeBONxUqQ=
diff --git a/go/extractor/gomodextractor.go b/go/extractor/gomodextractor.go
index be52af59760..8dce96b6e6a 100644
--- a/go/extractor/gomodextractor.go
+++ b/go/extractor/gomodextractor.go
@@ -20,6 +20,11 @@ func (extraction *Extraction) extractGoMod(path string) error {
 		path = normPath
 	}
 
+	if extraction.OverlayChanges != nil && !extraction.OverlayChanges[path] {
+		// This go.mod did not change since the base was extracted
+		return nil
+	}
+
 	extraction.Lock.Lock()
 	if extraction.SeenGoMods[path] {
 		extraction.Lock.Unlock()
diff --git a/go/extractor/srcarchive/BUILD.bazel b/go/extractor/srcarchive/BUILD.bazel
index e72e2e7ca08..6d8776abce7 100644
--- a/go/extractor/srcarchive/BUILD.bazel
+++ b/go/extractor/srcarchive/BUILD.bazel
@@ -10,6 +10,7 @@ go_library(
     ],
     importpath = "github.com/github/codeql-go/extractor/srcarchive",
     visibility = ["//visibility:public"],
+    deps = ["//go/extractor/util"],
 )
 
 go_test(
diff --git a/go/extractor/srcarchive/projectlayout.go b/go/extractor/srcarchive/projectlayout.go
index 6301755ef8a..0a628f38424 100644
--- a/go/extractor/srcarchive/projectlayout.go
+++ b/go/extractor/srcarchive/projectlayout.go
@@ -6,6 +6,8 @@ import (
 	"fmt"
 	"os"
 	"strings"
+
+	"github.com/github/codeql-go/extractor/util"
 )
 
 // ProjectLayout describes a very simple project layout rewriting paths starting
@@ -16,7 +18,7 @@ import (
 //	# to
 //	from//
 type ProjectLayout struct {
-	from, to string
+	From, To string
 }
 
 // normaliseSlashes adds an initial slash to `path` if there isn't one, and trims
@@ -28,6 +30,25 @@ func normaliseSlashes(path string) string {
 	return strings.TrimSuffix(path, "/")
 }
 
+// LoadProjectLayoutFromEnv loads a project layout from the file referenced by the
+// {CODEQL,SEMMLE}_PATH_TRANSFORMER environment variable. If neither env var is set, returns nil. If
+// the file cannot be read or does not have the right format, it returns an error.
+func LoadProjectLayoutFromEnv() (*ProjectLayout, error) {
+	pt := util.Getenv("CODEQL_PATH_TRANSFORMER", "SEMMLE_PATH_TRANSFORMER")
+	if pt == "" {
+		return nil, nil
+	}
+	ptf, err := os.Open(pt)
+	if err != nil {
+		return nil, err
+	}
+	projLayout, err := LoadProjectLayout(ptf)
+	if err != nil {
+		return nil, err
+	}
+	return projLayout, nil
+}
+
 // LoadProjectLayout loads a project layout from the given file, returning an error
 // if the file does not have the right format
 func LoadProjectLayout(file *os.File) (*ProjectLayout, error) {
@@ -41,7 +62,7 @@ func LoadProjectLayout(file *os.File) (*ProjectLayout, error) {
 	if !strings.HasPrefix(line, "#") {
 		return nil, fmt.Errorf("first line of project layout should start with #, but got %s", line)
 	}
-	res.to = normaliseSlashes(strings.TrimSpace(strings.TrimPrefix(line, "#")))
+	res.To = normaliseSlashes(strings.TrimSpace(strings.TrimPrefix(line, "#")))
 
 	if !scanner.Scan() {
 		return nil, errors.New("empty section in project-layout file")
@@ -57,7 +78,7 @@ func LoadProjectLayout(file *os.File) (*ProjectLayout, error) {
 	if strings.HasPrefix(line, "-") || strings.Contains(line, "*") || strings.Contains(line, "//") {
 		return nil, errors.New("unsupported project-layout feature")
 	}
-	res.from = normaliseSlashes(line)
+	res.From = normaliseSlashes(line)
 
 	for scanner.Scan() {
 		if strings.TrimSpace(scanner.Text()) != "" {
@@ -71,11 +92,11 @@ func LoadProjectLayout(file *os.File) (*ProjectLayout, error) {
 // transformString transforms `str` as specified by the project layout: if it starts with the `from`
 // prefix, that prefix is relaced by `to`; otherwise the string is returned unchanged
 func (p *ProjectLayout) transformString(str string) string {
-	if str == p.from {
-		return p.to
+	if str == p.From {
+		return p.To
 	}
-	if strings.HasPrefix(str, p.from+"/") {
-		return p.to + "/" + str[len(p.from)+1:]
+	if strings.HasPrefix(str, p.From+"/") {
+		return p.To + "/" + str[len(p.From)+1:]
 	}
 	return str
 }
diff --git a/go/extractor/srcarchive/projectlayout_test.go b/go/extractor/srcarchive/projectlayout_test.go
index 8fb17607cae..507ee183d9a 100644
--- a/go/extractor/srcarchive/projectlayout_test.go
+++ b/go/extractor/srcarchive/projectlayout_test.go
@@ -28,6 +28,32 @@ func mkProjectLayout(projectLayoutSource string, t *testing.T) (*ProjectLayout,
 	return LoadProjectLayout(pt)
 }
 
+func mkProjectLayoutFromEnv(projectLayoutSource string, t *testing.T) (*ProjectLayout, error) {
+	pt, err := os.CreateTemp("", "path-transformer-from-env")
+	if err != nil {
+		t.Fatalf("Unable to create temporary file for project layout: %s", err.Error())
+	}
+	defer os.Remove(pt.Name())
+	_, err = pt.WriteString(projectLayoutSource)
+	if err != nil {
+		t.Fatalf("Unable to write to temporary file for project layout: %s", err.Error())
+	}
+	err = pt.Close()
+	if err != nil {
+		t.Fatalf("Unable to close path transformer file: %s.", err.Error())
+	}
+
+	pt, err = os.Open(pt.Name())
+	if err != nil {
+		t.Fatalf("Unable to open path transformer file: %s.", err.Error())
+	}
+
+	os.Setenv("CODEQL_PATH_TRANSFORMER", pt.Name())
+	defer os.Unsetenv("CODEQL_PATH_TRANSFORMER")
+
+	return LoadProjectLayoutFromEnv()
+}
+
 func testTransformation(projectLayout *ProjectLayout, t *testing.T, path string, expected string) {
 	actual := projectLayout.Transform(path)
 	if actual != expected {
@@ -35,16 +61,12 @@ func testTransformation(projectLayout *ProjectLayout, t *testing.T, path string,
 	}
 }
 
-func TestValidProjectLayout(t *testing.T) {
-	p, err := mkProjectLayout(`
+const validProjectLayoutSource = `
 # /opt/src
 /opt/src/root/src/org/repo//
-`, t)
-
-	if err != nil {
-		t.Fatalf("Error loading project layout: %s", err.Error())
-	}
+`
 
+func testTransformationsForValidProjectLayout(p *ProjectLayout, t *testing.T) {
 	testTransformation(p, t, "/opt/src/root/src/org/repo", "/opt/src")
 	testTransformation(p, t, "/opt/src/root/src/org/repo/", "/opt/src/")
 	testTransformation(p, t, "/opt/src/root/src/org/repo/main.go", "/opt/src/main.go")
@@ -53,6 +75,26 @@ func TestValidProjectLayout(t *testing.T) {
 	testTransformation(p, t, "opt/src/root/src/org/repo", "opt/src/root/src/org/repo")
 }
 
+func TestValidProjectLayout(t *testing.T) {
+	p, err := mkProjectLayout(validProjectLayoutSource, t)
+
+	if err != nil {
+		t.Fatalf("Error loading project layout: %s", err.Error())
+	}
+
+	testTransformationsForValidProjectLayout(p, t)
+}
+
+func TestValidProjectLayoutFromEnv(t *testing.T) {
+	p, err := mkProjectLayoutFromEnv(validProjectLayoutSource, t)
+
+	if err != nil {
+		t.Fatalf("Error loading project layout: %s", err.Error())
+	}
+
+	testTransformationsForValidProjectLayout(p, t)
+}
+
 func TestWindowsPaths(t *testing.T) {
 	p, err := mkProjectLayout(`
 # /c:/virtual
diff --git a/go/extractor/srcarchive/srcarchive.go b/go/extractor/srcarchive/srcarchive.go
index ee9aea43064..3f4c1d1a90d 100644
--- a/go/extractor/srcarchive/srcarchive.go
+++ b/go/extractor/srcarchive/srcarchive.go
@@ -4,6 +4,7 @@ import (
 	"errors"
 	"io"
 	"log"
+	"log/slog"
 	"os"
 	"path/filepath"
 	"strings"
@@ -12,16 +13,14 @@ import (
 var pathTransformer *ProjectLayout
 
 func init() {
-	pt := os.Getenv("SEMMLE_PATH_TRANSFORMER")
-	if pt != "" {
-		ptf, err := os.Open(pt)
-		if err != nil {
-			log.Fatalf("Unable to open path transformer %s: %s.\n", pt, err.Error())
-		}
-		pathTransformer, err = LoadProjectLayout(ptf)
-		if err != nil {
-			log.Fatalf("Unable to initialize path transformer: %s.\n", err.Error())
+	pt, err := LoadProjectLayoutFromEnv()
+	if err == nil {
+		pathTransformer = pt
+		if pathTransformer != nil {
+			slog.Info("Loaded path transformer", "from", pathTransformer.From, "to", pathTransformer.To)
 		}
+	} else {
+		log.Fatalf("Unable to load path transformer: %s.\n", err.Error())
 	}
 }
 
@@ -69,7 +68,7 @@ func srcArchive() (string, error) {
 	return srcArchive, nil
 }
 
-// TransformPath applies the transformations specified by `SEMMLE_PATH_TRANSFORMER` (if any) to the
+// TransformPath applies the transformations specified by `CODEQL_PATH_TRANSFORMER` (if any) to the
 // given path
 func TransformPath(path string) string {
 	if pathTransformer != nil {
diff --git a/go/extractor/trap/labels.go b/go/extractor/trap/labels.go
index 2822da61ff1..3fc02d066cf 100644
--- a/go/extractor/trap/labels.go
+++ b/go/extractor/trap/labels.go
@@ -3,7 +3,9 @@ package trap
 import (
 	"fmt"
 	"go/types"
+	"path/filepath"
 
+	"github.com/github/codeql-go/extractor/srcarchive"
 	"github.com/github/codeql-go/extractor/util"
 )
 
@@ -67,14 +69,14 @@ func (l *Labeler) GlobalID(key string) Label {
 // FileLabel returns the label for a file with path `path`.
 func (l *Labeler) FileLabel() Label {
 	if l.fileLabel == InvalidLabel {
-		l.fileLabel = l.FileLabelFor(l.tw.path)
+		l.fileLabel = l.FileLabelFor(srcarchive.TransformPath(l.tw.path))
 	}
 	return l.fileLabel
 }
 
 // FileLabelFor returns the label for the file for which the trap writer `tw` is associated
 func (l *Labeler) FileLabelFor(path string) Label {
-	return l.GlobalID(util.EscapeTrapSpecialChars(path) + ";sourcefile")
+	return l.GlobalID(util.EscapeTrapSpecialChars(filepath.ToSlash(path)) + ";sourcefile")
 }
 
 // LocalID associates a label with the given AST node `nd` and returns it
diff --git a/go/extractor/util/BUILD.bazel b/go/extractor/util/BUILD.bazel
index dd294a63a9c..ee090607ced 100644
--- a/go/extractor/util/BUILD.bazel
+++ b/go/extractor/util/BUILD.bazel
@@ -6,6 +6,8 @@ go_library(
     name = "util",
     srcs = [
         "extractvendordirs.go",
+        "logging.go",
+        "overlays.go",
         "registryproxy.go",
         "semver.go",
         "util.go",
@@ -18,6 +20,7 @@ go_library(
 go_test(
     name = "util_test",
     srcs = [
+        "logging_test.go",
         "registryproxy_test.go",
         "semver_test.go",
         "util_test.go",
diff --git a/go/extractor/util/logging.go b/go/extractor/util/logging.go
new file mode 100644
index 00000000000..b0919151edf
--- /dev/null
+++ b/go/extractor/util/logging.go
@@ -0,0 +1,45 @@
+package util
+
+import (
+	"log/slog"
+	"os"
+	"strings"
+)
+
+// Mirrors the verbosity definitions in the CodeQL CLI, which are passed to us
+// in the `CODEQL_VERBOSITY` environment variable.
+type Verbosity string
+
+const (
+	// Only print error messages.
+	Errors Verbosity = "errors"
+	// Print warnings and error messages.
+	Warnings Verbosity = "warnings"
+	// Default verbosity.
+	Progress Verbosity = "progress"
+	// More details of normal operations.
+	Details Verbosity = "progress+"
+	// Debug level set by e.g. the CodeQL Action.
+	Spammy Verbosity = "progress++"
+	// The most detailed.
+	Spammier Verbosity = "progress+++"
+)
+
+func parseLogLevel(value string) slog.Level {
+	value = strings.ToLower(value)
+	if strings.HasPrefix(value, string(Details)) {
+		return slog.LevelDebug
+	} else if value == string(Errors) {
+		return slog.LevelError
+	} else if value == string(Warnings) {
+		return slog.LevelWarn
+	} else {
+		// Default
+		return slog.LevelInfo
+	}
+}
+
+// Sets the log level for the default `slog` logger, based on `CODEQL_VERBOSITY`.
+func SetLogLevel() {
+	slog.SetLogLoggerLevel(parseLogLevel(os.Getenv("CODEQL_VERBOSITY")))
+}
diff --git a/go/extractor/util/logging_test.go b/go/extractor/util/logging_test.go
new file mode 100644
index 00000000000..1409f7b8d9a
--- /dev/null
+++ b/go/extractor/util/logging_test.go
@@ -0,0 +1,33 @@
+package util
+
+import (
+	"log/slog"
+	"strings"
+	"testing"
+)
+
+func assertLogLevel(t *testing.T, value string, level slog.Level) {
+	actual := parseLogLevel(value)
+	if actual != level {
+		t.Errorf("Expected %s to parse as %s, but got %s", value, level, actual)
+	}
+}
+
+func TestParseLogLevel(t *testing.T) {
+	// Known verbosity levels.
+	assertLogLevel(t, string(Errors), slog.LevelError)
+	assertLogLevel(t, string(Warnings), slog.LevelWarn)
+	assertLogLevel(t, string(Progress), slog.LevelInfo)
+	assertLogLevel(t, string(Details), slog.LevelDebug)
+	assertLogLevel(t, string(Spammy), slog.LevelDebug)
+	assertLogLevel(t, string(Spammier), slog.LevelDebug)
+
+	// Ignore case
+	assertLogLevel(t, strings.ToUpper(string(Spammier)), slog.LevelDebug)
+	assertLogLevel(t, strings.ToUpper(string(Errors)), slog.LevelError)
+
+	// Other values default to LevelInfo
+	assertLogLevel(t, "", slog.LevelInfo)
+	assertLogLevel(t, "unknown", slog.LevelInfo)
+	assertLogLevel(t, "none", slog.LevelInfo)
+}
diff --git a/go/extractor/util/overlays.go b/go/extractor/util/overlays.go
new file mode 100644
index 00000000000..6a5c3760549
--- /dev/null
+++ b/go/extractor/util/overlays.go
@@ -0,0 +1,70 @@
+package util
+
+import (
+	"encoding/json"
+	"log"
+	"os"
+	"path/filepath"
+)
+
+func IsOverlayExtraction() bool {
+	_, present := os.LookupEnv("CODEQL_EXTRACTOR_GO_OVERLAY_METADATA_IN")
+	return present
+}
+
+// If the relevant environment variable is set, indicating that we are extracting an overlay
+// database, GetOverlayChanges returns the list of relative paths of files that have changed (or
+// been deleted). Otherwise, it returns `nil`.
+func GetOverlayChanges(sourceRoot string) []string {
+	if overlayChangesJsonPath, present := os.LookupEnv("CODEQL_EXTRACTOR_GO_OVERLAY_CHANGES"); present {
+		log.Printf("Reading overlay changes from: %s", overlayChangesJsonPath)
+
+		file, err := os.Open(overlayChangesJsonPath)
+		if err != nil {
+			log.Fatalf("Failed to open overlay changes JSON file: %s", err)
+		}
+		defer file.Close()
+
+		var overlayData struct {
+			Changes []string `json:"changes"`
+		}
+
+		decoder := json.NewDecoder(file)
+		if err := decoder.Decode(&overlayData); err != nil {
+			log.Fatalf("Failed to decode overlay changes JSON file: %s", err)
+		}
+
+		absPaths := make([]string, 0, len(overlayData.Changes))
+		if sourceRoot == "" {
+			// This shouldn't happen, because it implies the extractor was invoked in some way other
+			// than from the autobuilder. However, we'll only attempt to build an overlay if there
+			// exists an overlay _base_, and only the autobuilder writes the metadata file that
+			// ensures a database is created as an overlay-base.
+			log.Fatalf("Extractor is running in overlay mode, but --source-root was not provided")
+		}
+		for _, relPath := range overlayData.Changes {
+			absPaths = append(absPaths, filepath.Clean(sourceRoot+"/"+relPath))
+		}
+
+		return absPaths
+	} else {
+		return nil
+	}
+}
+
+// WriteOverlayBaseMetadata creates an empty metadata file if we are extracting an overlay base;
+// otherwise, it does nothing.
+func WriteOverlayBaseMetadata() {
+	if metadataPath, present := os.LookupEnv("CODEQL_EXTRACTOR_GO_OVERLAY_BASE_METADATA_OUT"); present {
+		log.Printf("Writing overlay base metadata to: %s", metadataPath)
+
+		// In principle, we could store some metadata here and read it back when extracting the
+		// overlay. For now, we don't need to store anything, but the CLI still requires us to write
+		// something, so just create an empty file.
+		file, err := os.Create(metadataPath)
+		if err != nil {
+			log.Fatalf("Failed to create overlay base metadata file: %s", err)
+		}
+		file.Close()
+	}
+}
diff --git a/go/extractor/util/registryproxy.go b/go/extractor/util/registryproxy.go
index 301d45896d2..1f20832e8d8 100644
--- a/go/extractor/util/registryproxy.go
+++ b/go/extractor/util/registryproxy.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"log/slog"
+	"net/url"
 	"os"
 	"os/exec"
 	"strings"
@@ -14,6 +15,7 @@ const PROXY_PORT = "CODEQL_PROXY_PORT"
 const PROXY_CA_CERTIFICATE = "CODEQL_PROXY_CA_CERTIFICATE"
 const PROXY_URLS = "CODEQL_PROXY_URLS"
 const GOPROXY_SERVER = "goproxy_server"
+const GIT_SOURCE = "git_source"
 
 type RegistryConfig struct {
 	Type string `json:"type"`
@@ -26,9 +28,11 @@ var proxy_address string
 // The path to the temporary file that stores the proxy certificate, if any.
 var proxy_cert_file string
 
-// An array of registry configurations that are relevant to Go.
-// This excludes other registry configurations that may be available, but are not relevant to Go.
-var proxy_configs []RegistryConfig
+// An array of goproxy server URLs.
+var goproxy_servers []string
+
+// An array of Git URLs.
+var git_sources []string
 
 // Stores the environment variables that we wish to pass on to `go` commands.
 var proxy_vars []string = nil
@@ -53,7 +57,13 @@ func getEnvVars() []string {
 	if proxy_host, proxy_host_set := os.LookupEnv(PROXY_HOST); proxy_host_set && proxy_host != "" {
 		if proxy_port, proxy_port_set := os.LookupEnv(PROXY_PORT); proxy_port_set && proxy_port != "" {
 			proxy_address = fmt.Sprintf("http://%s:%s", proxy_host, proxy_port)
-			result = append(result, fmt.Sprintf("HTTP_PROXY=%s", proxy_address), fmt.Sprintf("HTTPS_PROXY=%s", proxy_address))
+			result = append(
+				result,
+				fmt.Sprintf("HTTP_PROXY=%s", proxy_address),
+				fmt.Sprintf("HTTPS_PROXY=%s", proxy_address),
+				fmt.Sprintf("http_proxy=%s", proxy_address),
+				fmt.Sprintf("https_proxy=%s", proxy_address),
+			)
 
 			slog.Info("Found private registry proxy", slog.String("proxy_address", proxy_address))
 		}
@@ -91,20 +101,49 @@ func getEnvVars() []string {
 			// filter others out at this point.
 			for _, cfg := range val {
 				if cfg.Type == GOPROXY_SERVER {
-					proxy_configs = append(proxy_configs, cfg)
+					goproxy_servers = append(goproxy_servers, cfg.URL)
 					slog.Info("Found GOPROXY server", slog.String("url", cfg.URL))
+				} else if cfg.Type == GIT_SOURCE {
+					parsed, err := url.Parse(cfg.URL)
+					if err == nil && parsed.Hostname() != "" {
+						git_source := parsed.Hostname() + parsed.Path + "*"
+						git_sources = append(git_sources, git_source)
+						slog.Info("Found Git source", slog.String("source", git_source))
+					} else {
+						slog.Warn("Not a valid URL for Git source", slog.String("url", cfg.URL))
+					}
 				}
 			}
 
-			if len(proxy_configs) > 0 {
+			goprivate := []string{}
+
+			if len(goproxy_servers) > 0 {
 				goproxy_val := "https://proxy.golang.org,direct"
 
-				for _, cfg := range proxy_configs {
-					goproxy_val = cfg.URL + "," + goproxy_val
+				for _, url := range goproxy_servers {
+					goproxy_val = url + "," + goproxy_val
 				}
 
-				result = append(result, fmt.Sprintf("GOPROXY=%s", goproxy_val), "GOPRIVATE=", "GONOPROXY=")
+				result = append(result, fmt.Sprintf("GOPROXY=%s", goproxy_val), "GONOPROXY=")
 			}
+
+			if len(git_sources) > 0 {
+				goprivate = append(goprivate, git_sources...)
+
+				if proxy_cert_file != "" {
+					slog.Info("Configuring `git` to use proxy certificate", slog.String("path", proxy_cert_file))
+					cmd := exec.Command("git", "config", "--global", "http.sslCAInfo", proxy_cert_file)
+
+					out, cmdErr := cmd.CombinedOutput()
+					slog.Info(string(out))
+
+					if cmdErr != nil {
+						slog.Error("Failed to configure `git` to accept the certificate file", slog.String("error", cmdErr.Error()))
+					}
+				}
+			}
+
+			result = append(result, fmt.Sprintf("GOPRIVATE=%s", strings.Join(goprivate, ",")))
 		}
 	}
 
@@ -113,11 +152,6 @@ func getEnvVars() []string {
 
 // Applies private package proxy related environment variables to `cmd`.
 func ApplyProxyEnvVars(cmd *exec.Cmd) {
-	slog.Debug(
-		"Applying private registry proxy environment variables",
-		slog.String("cmd_args", strings.Join(cmd.Args, " ")),
-	)
-
 	// If we haven't done so yet, check whether the proxy environment variables are set
 	// and extract information from them.
 	if !proxy_vars_checked {
@@ -131,4 +165,10 @@ func ApplyProxyEnvVars(cmd *exec.Cmd) {
 	if proxy_vars != nil {
 		cmd.Env = append(os.Environ(), proxy_vars...)
 	}
+
+	slog.Debug(
+		"Applying private registry proxy environment variables",
+		slog.String("cmd_args", strings.Join(cmd.Args, " ")),
+		slog.String("proxy_vars", strings.Join(proxy_vars, ",")),
+	)
 }
diff --git a/go/extractor/util/registryproxy_test.go b/go/extractor/util/registryproxy_test.go
index a21b1a215c1..ef63bd9d3f8 100644
--- a/go/extractor/util/registryproxy_test.go
+++ b/go/extractor/util/registryproxy_test.go
@@ -47,3 +47,31 @@ func TestParseRegistryConfigs(t *testing.T) {
 		t.Fatalf("Expected `URL` to be `https://proxy.example.com/mod`, but got `%s`", first.URL)
 	}
 }
+
+func TestParseRegistryConfigsMultiple(t *testing.T) {
+	multiple := parseRegistryConfigsSuccess(t, "[{ \"type\": \"git_source\", \"url\": \"https://github.com/github\" }, { \"type\": \"goproxy_server\", \"url\": \"https://proxy.example.com/mod\" }]")
+
+	if len(multiple) != 2 {
+		t.Fatalf("Expected `parseRegistryConfigs` to return two configurations, but got %d.", len(multiple))
+	}
+
+	first := multiple[0]
+
+	if first.Type != "git_source" {
+		t.Fatalf("Expected `Type` to be `git_source`, but got `%s`", first.Type)
+	}
+
+	if first.URL != "https://github.com/github" {
+		t.Fatalf("Expected `URL` to be `https://github.com/github`, but got `%s`", first.URL)
+	}
+
+	second := multiple[1]
+
+	if second.Type != "goproxy_server" {
+		t.Fatalf("Expected `Type` to be `goproxy_server`, but got `%s`", second.Type)
+	}
+
+	if second.URL != "https://proxy.example.com/mod" {
+		t.Fatalf("Expected `URL` to be `https://proxy.example.com/mod`, but got `%s`", second.URL)
+	}
+}
diff --git a/go/old-change-notes/2020-10-01-gomod-extraction.md b/go/old-change-notes/2020-10-01-gomod-extraction.md
index ca0c0c72d50..a975a15973a 100644
--- a/go/old-change-notes/2020-10-01-gomod-extraction.md
+++ b/go/old-change-notes/2020-10-01-gomod-extraction.md
@@ -1,2 +1,2 @@
 lgtm,codescanning
-* The extractor now only extracts go.mod files belonging to extracted packages. In particular, vendored go.mod files will no longer be extracted unless the vendored package is explicitly passed to the extractor. This will remove unexpected `GoModExpr` and similar expressions seen by queries.
+* The extractor now only extracts go.mod files belonging to extracted packages. In particular, vendored go.mod files will no longer be extracted unless the vendored package is explicitly passed to the extractor. This will remove unexpected `GoModExpr` and similar expressions seen by queries.
diff --git a/go/ql/consistency-queries/CHANGELOG.md b/go/ql/consistency-queries/CHANGELOG.md
index 6e50e04a514..870695d684c 100644
--- a/go/ql/consistency-queries/CHANGELOG.md
+++ b/go/ql/consistency-queries/CHANGELOG.md
@@ -1,3 +1,27 @@
+## 1.0.34
+
+No user-facing changes.
+
+## 1.0.33
+
+No user-facing changes.
+
+## 1.0.32
+
+No user-facing changes.
+
+## 1.0.31
+
+No user-facing changes.
+
+## 1.0.30
+
+No user-facing changes.
+
+## 1.0.29
+
+No user-facing changes.
+
 ## 1.0.28
 
 No user-facing changes.
diff --git a/go/ql/consistency-queries/change-notes/released/1.0.29.md b/go/ql/consistency-queries/change-notes/released/1.0.29.md
new file mode 100644
index 00000000000..e6b79b88ef3
--- /dev/null
+++ b/go/ql/consistency-queries/change-notes/released/1.0.29.md
@@ -0,0 +1,3 @@
+## 1.0.29
+
+No user-facing changes.
diff --git a/go/ql/consistency-queries/change-notes/released/1.0.30.md b/go/ql/consistency-queries/change-notes/released/1.0.30.md
new file mode 100644
index 00000000000..cb2cf6d0a27
--- /dev/null
+++ b/go/ql/consistency-queries/change-notes/released/1.0.30.md
@@ -0,0 +1,3 @@
+## 1.0.30
+
+No user-facing changes.
diff --git a/go/ql/consistency-queries/change-notes/released/1.0.31.md b/go/ql/consistency-queries/change-notes/released/1.0.31.md
new file mode 100644
index 00000000000..b2642bbb5f8
--- /dev/null
+++ b/go/ql/consistency-queries/change-notes/released/1.0.31.md
@@ -0,0 +1,3 @@
+## 1.0.31
+
+No user-facing changes.
diff --git a/go/ql/consistency-queries/change-notes/released/1.0.32.md b/go/ql/consistency-queries/change-notes/released/1.0.32.md
new file mode 100644
index 00000000000..05c4073731c
--- /dev/null
+++ b/go/ql/consistency-queries/change-notes/released/1.0.32.md
@@ -0,0 +1,3 @@
+## 1.0.32
+
+No user-facing changes.
diff --git a/go/ql/consistency-queries/change-notes/released/1.0.33.md b/go/ql/consistency-queries/change-notes/released/1.0.33.md
new file mode 100644
index 00000000000..3a65838479f
--- /dev/null
+++ b/go/ql/consistency-queries/change-notes/released/1.0.33.md
@@ -0,0 +1,3 @@
+## 1.0.33
+
+No user-facing changes.
diff --git a/go/ql/consistency-queries/change-notes/released/1.0.34.md b/go/ql/consistency-queries/change-notes/released/1.0.34.md
new file mode 100644
index 00000000000..7e097cfe937
--- /dev/null
+++ b/go/ql/consistency-queries/change-notes/released/1.0.34.md
@@ -0,0 +1,3 @@
+## 1.0.34
+
+No user-facing changes.
diff --git a/go/ql/consistency-queries/codeql-pack.release.yml b/go/ql/consistency-queries/codeql-pack.release.yml
index 328402fb34f..b736654032c 100644
--- a/go/ql/consistency-queries/codeql-pack.release.yml
+++ b/go/ql/consistency-queries/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.28
+lastReleaseVersion: 1.0.34
diff --git a/go/ql/consistency-queries/qlpack.yml b/go/ql/consistency-queries/qlpack.yml
index 706e295580e..be82fc786d2 100644
--- a/go/ql/consistency-queries/qlpack.yml
+++ b/go/ql/consistency-queries/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql-go-consistency-queries
-version: 1.0.29-dev
+version: 1.0.35-dev
 groups:
   - go
   - queries
diff --git a/go/ql/lib/CHANGELOG.md b/go/ql/lib/CHANGELOG.md
index b047f838925..e2d2a71f6bd 100644
--- a/go/ql/lib/CHANGELOG.md
+++ b/go/ql/lib/CHANGELOG.md
@@ -1,3 +1,50 @@
+## 5.0.1
+
+No user-facing changes.
+
+## 5.0.0
+
+### Breaking Changes
+
+* The member predicate `writesField` on `DataFlow::Write` now uses the post-update node for `base` when that is the node being updated, which is in all cases except initializing a struct literal. A new member predicate `writesFieldPreUpdate` has been added for cases where this behaviour is not desired.
+* The member predicate `writesElement` on `DataFlow::Write` now uses the post-update node for `base` when that is the node being updated, which is in all cases except initializing an array/slice/map literal. A new member predicate `writesElementPreUpdate` has been added for cases where this behaviour is not desired.
+
+### Deprecated APIs
+
+* The class `SqlInjection::NumericOrBooleanSanitizer` has been deprecated. Use `SimpleTypeSanitizer` from `semmle.go.security.Sanitizers` instead.
+* The member predicate `writesComponent` on `DataFlow::Write` has been deprecated. Instead, use `writesFieldPreUpdate` and `writesElementPreUpdate`, or their new versions `writesField` and `writesElement`.
+
+### Major Analysis Improvements
+
+* The shape of the Go data-flow graph has changed. Previously for code like `x := def(); use1(x); use2(x)`, there would be edges from the definition of `x` to each use. Now there is an edge from the definition to the first use, then another from the first use to the second, and so on. This means that data-flow barriers work differently - flow will not reach any uses after the barrier node. Where this is not desired it may be necessary to add an additional flow step to propagate the flow forward. Additionally, when a variable may be subject to a side-effect, such as updating an array, passing a pointer to a function that might write through it or writing to a field of a struct, there is now a dedicated post-update node representing the variable after this side-effect has taken place. Previously post-update nodes were aliases for either a variable's definition, or were equal to the pre-update node. This led to backwards steps in the data-flow graph, which could cause false positives. For example, in the previous code there would be an edge from `x` in `use2(x)` back to the definition of `x`. If we define our sources as any argument of `use2` and our sinks as any argument of `use1` then this would lead to a false positive path. Now there are distinct post-update nodes and no backwards edge to the definition, so we will not find this false positive path.
+
+### Minor Analysis Improvements
+
+* The query `go/request-forgery` will no longer report alerts when the user input is of a simple type, like a number or a boolean.
+* For the query `go/unvalidated-url-redirection`, when untrusted data is assigned to the `Host` field of a `url.URL` struct, we consider the whole struct untrusted. We now also include the case when this happens during struct initialization, for example `&url.URL{Host: untrustedData}`.
+* `go/unvalidated-url-redirection` and `go/request-forgery` have a shared notion of a safe URL, which is known to not be malicious. Some URLs which were incorrectly considered safe are now correctly considered unsafe. This may lead to more alerts for those two queries.
+
+## 4.3.5
+
+No user-facing changes.
+
+## 4.3.4
+
+### Minor Analysis Improvements
+
+* The second argument of the `CreateTemp` function, from the `os` package, is no longer a path-injection sink due to proper sanitization by Go.
+* The query "Uncontrolled data used in path expression" (`go/path-injection`) now detects sanitizing a path by adding `os.PathSeparator` or `\` to the beginning.
+
+## 4.3.3
+
+No user-facing changes.
+
+## 4.3.2
+
+### Minor Analysis Improvements
+
+* Go 1.25 is now supported.
+
 ## 4.3.1
 
 No user-facing changes.
diff --git a/go/ql/lib/change-notes/2025-11-11-path-transformer.md b/go/ql/lib/change-notes/2025-11-11-path-transformer.md
new file mode 100644
index 00000000000..c36cf8fb83e
--- /dev/null
+++ b/go/ql/lib/change-notes/2025-11-11-path-transformer.md
@@ -0,0 +1,7 @@
+---
+category: fix
+---
+* Some fixes relating to use of path transformers when extracting a database:
+  * Fixed a problem where the path transformer would be ignored when extracting older codebases that predate the use of Go modules.
+  * The environment variable `CODEQL_PATH_TRANSFORMER` is now recognized, in addition to `SEMMLE_PATH_TRANSFORMER`.
+  * Fixed some cases where the extractor emitted paths without applying the path transformer.
diff --git a/go/ql/lib/change-notes/released/4.3.2.md b/go/ql/lib/change-notes/released/4.3.2.md
new file mode 100644
index 00000000000..18a80c84a81
--- /dev/null
+++ b/go/ql/lib/change-notes/released/4.3.2.md
@@ -0,0 +1,5 @@
+## 4.3.2
+
+### Minor Analysis Improvements
+
+* Go 1.25 is now supported.
diff --git a/go/ql/lib/change-notes/released/4.3.3.md b/go/ql/lib/change-notes/released/4.3.3.md
new file mode 100644
index 00000000000..d6710bacd7f
--- /dev/null
+++ b/go/ql/lib/change-notes/released/4.3.3.md
@@ -0,0 +1,3 @@
+## 4.3.3
+
+No user-facing changes.
diff --git a/go/ql/lib/change-notes/released/4.3.4.md b/go/ql/lib/change-notes/released/4.3.4.md
new file mode 100644
index 00000000000..cc1b662d14c
--- /dev/null
+++ b/go/ql/lib/change-notes/released/4.3.4.md
@@ -0,0 +1,6 @@
+## 4.3.4
+
+### Minor Analysis Improvements
+
+* The second argument of the `CreateTemp` function, from the `os` package, is no longer a path-injection sink due to proper sanitization by Go.
+* The query "Uncontrolled data used in path expression" (`go/path-injection`) now detects sanitizing a path by adding `os.PathSeparator` or `\` to the beginning.
diff --git a/go/ql/lib/change-notes/released/4.3.5.md b/go/ql/lib/change-notes/released/4.3.5.md
new file mode 100644
index 00000000000..e386c2fbd98
--- /dev/null
+++ b/go/ql/lib/change-notes/released/4.3.5.md
@@ -0,0 +1,3 @@
+## 4.3.5
+
+No user-facing changes.
diff --git a/go/ql/lib/change-notes/released/5.0.0.md b/go/ql/lib/change-notes/released/5.0.0.md
new file mode 100644
index 00000000000..096e0b350bf
--- /dev/null
+++ b/go/ql/lib/change-notes/released/5.0.0.md
@@ -0,0 +1,21 @@
+## 5.0.0
+
+### Breaking Changes
+
+* The member predicate `writesField` on `DataFlow::Write` now uses the post-update node for `base` when that is the node being updated, which is in all cases except initializing a struct literal. A new member predicate `writesFieldPreUpdate` has been added for cases where this behaviour is not desired.
+* The member predicate `writesElement` on `DataFlow::Write` now uses the post-update node for `base` when that is the node being updated, which is in all cases except initializing an array/slice/map literal. A new member predicate `writesElementPreUpdate` has been added for cases where this behaviour is not desired.
+
+### Deprecated APIs
+
+* The class `SqlInjection::NumericOrBooleanSanitizer` has been deprecated. Use `SimpleTypeSanitizer` from `semmle.go.security.Sanitizers` instead.
+* The member predicate `writesComponent` on `DataFlow::Write` has been deprecated. Instead, use `writesFieldPreUpdate` and `writesElementPreUpdate`, or their new versions `writesField` and `writesElement`.
+
+### Major Analysis Improvements
+
+* The shape of the Go data-flow graph has changed. Previously for code like `x := def(); use1(x); use2(x)`, there would be edges from the definition of `x` to each use. Now there is an edge from the definition to the first use, then another from the first use to the second, and so on. This means that data-flow barriers work differently - flow will not reach any uses after the barrier node. Where this is not desired it may be necessary to add an additional flow step to propagate the flow forward. Additionally, when a variable may be subject to a side-effect, such as updating an array, passing a pointer to a function that might write through it or writing to a field of a struct, there is now a dedicated post-update node representing the variable after this side-effect has taken place. Previously post-update nodes were aliases for either a variable's definition, or were equal to the pre-update node. This led to backwards steps in the data-flow graph, which could cause false positives. For example, in the previous code there would be an edge from `x` in `use2(x)` back to the definition of `x`. If we define our sources as any argument of `use2` and our sinks as any argument of `use1` then this would lead to a false positive path. Now there are distinct post-update nodes and no backwards edge to the definition, so we will not find this false positive path.
+
+### Minor Analysis Improvements
+
+* The query `go/request-forgery` will no longer report alerts when the user input is of a simple type, like a number or a boolean.
+* For the query `go/unvalidated-url-redirection`, when untrusted data is assigned to the `Host` field of a `url.URL` struct, we consider the whole struct untrusted. We now also include the case when this happens during struct initialization, for example `&url.URL{Host: untrustedData}`.
+* `go/unvalidated-url-redirection` and `go/request-forgery` have a shared notion of a safe URL, which is known to not be malicious. Some URLs which were incorrectly considered safe are now correctly considered unsafe. This may lead to more alerts for those two queries.
diff --git a/go/ql/lib/change-notes/released/5.0.1.md b/go/ql/lib/change-notes/released/5.0.1.md
new file mode 100644
index 00000000000..b99e1ae0268
--- /dev/null
+++ b/go/ql/lib/change-notes/released/5.0.1.md
@@ -0,0 +1,3 @@
+## 5.0.1
+
+No user-facing changes.
diff --git a/go/ql/lib/codeql-pack.release.yml b/go/ql/lib/codeql-pack.release.yml
index 70ac3707fcd..ae7df5e18b7 100644
--- a/go/ql/lib/codeql-pack.release.yml
+++ b/go/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 4.3.1
+lastReleaseVersion: 5.0.1
diff --git a/go/ql/lib/ext/os.model.yml b/go/ql/lib/ext/os.model.yml
index b4f074146b7..7d2070b53ba 100644
--- a/go/ql/lib/ext/os.model.yml
+++ b/go/ql/lib/ext/os.model.yml
@@ -28,7 +28,7 @@ extensions:
       - ["os", "", False, "ReadDir", "", "", "Argument[0]", "path-injection", "manual"]
       - ["os", "", False, "ReadFile", "", "", "Argument[0]", "path-injection", "manual"]
       - ["os", "", False, "MkdirTemp", "", "", "Argument[0..1]", "path-injection", "manual"]
-      - ["os", "", False, "CreateTemp", "", "", "Argument[0..1]", "path-injection", "manual"]
+      - ["os", "", False, "CreateTemp", "", "", "Argument[0]", "path-injection", "manual"]
       - ["os", "", False, "WriteFile", "", "", "Argument[0]", "path-injection", "manual"]
       # command-injection
       - ["os", "", False, "StartProcess", "", "", "Argument[0]", "command-injection", "manual"]
diff --git a/go/ql/lib/go.dbscheme b/go/ql/lib/go.dbscheme
index b3da71c3ac2..b1341734d68 100644
--- a/go/ql/lib/go.dbscheme
+++ b/go/ql/lib/go.dbscheme
@@ -36,6 +36,17 @@ snapshotDate(unique date snapshotDate : date ref);
 
 sourceLocationPrefix(varchar(900) prefix : string ref);
 
+/** Overlay support **/
+
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+overlayChangedFiles(
+  string path: string ref
+);
+
 
 /*
  * XML Files
diff --git a/go/ql/lib/qlpack.yml b/go/ql/lib/qlpack.yml
index 391245fa689..058e65978f2 100644
--- a/go/ql/lib/qlpack.yml
+++ b/go/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/go-all
-version: 4.3.2-dev
+version: 5.0.2-dev
 groups: go
 dbscheme: go.dbscheme
 extractor: go
@@ -14,3 +14,4 @@ dependencies:
 dataExtensions:
   - ext/*.model.yml
 warnOnImplicitThis: true
+compileForOverlayEval: true
diff --git a/go/ql/lib/semmle/go/Architectures.qll b/go/ql/lib/semmle/go/Architectures.qll
index e509de4bc68..bb4face2407 100644
--- a/go/ql/lib/semmle/go/Architectures.qll
+++ b/go/ql/lib/semmle/go/Architectures.qll
@@ -28,7 +28,7 @@ class Architecture extends string {
   }
 
   /**
-   * Gets the integer and pointer type width for this architecture.
+   * Gets the integer and pointer type width for this architecture.
    *
    * As of the time of writing, this appears to always be identical -- there aren't
    * Go architectures with 64-bit pointers but 32-bit ints, for example.
diff --git a/go/ql/lib/semmle/go/Locations.qll b/go/ql/lib/semmle/go/Locations.qll
index 817fea56f00..7503421c0ff 100644
--- a/go/ql/lib/semmle/go/Locations.qll
+++ b/go/ql/lib/semmle/go/Locations.qll
@@ -1,6 +1,7 @@
 /** Provides classes for working with locations and program elements that have locations. */
 
 import go
+private import semmle.go.Overlay
 
 /**
  * A location as given by a file, a start line, a start column,
diff --git a/go/ql/lib/semmle/go/Overlay.qll b/go/ql/lib/semmle/go/Overlay.qll
new file mode 100644
index 00000000000..97d7f788fdb
--- /dev/null
+++ b/go/ql/lib/semmle/go/Overlay.qll
@@ -0,0 +1,91 @@
+/**
+ * Defines entity discard predicates for Go overlay analysis.
+ */
+overlay[local]
+module;
+
+/**
+ * A local predicate that always holds for the overlay variant and never holds for the base variant.
+ * This is used to define local predicates that behave differently for the base and overlay variant.
+ */
+private predicate isOverlay() { databaseMetadata("isOverlay", "true") }
+
+/** Gets the file containing the given `locatable`. */
+private @file getFile(@locatable locatable) {
+  exists(@location_default location | has_location(locatable, location) |
+    locations_default(location, result, _, _, _, _)
+  )
+}
+
+/** Holds if the `locatable` is in the `file` and is part of the overlay base database. */
+private predicate discardableLocatable(@file file, @locatable locatable) {
+  not isOverlay() and
+  file = getFile(locatable) and
+  // Avoid discarding @file entities, since they are shared between base and overlay.
+  not locatable instanceof @file
+}
+
+/**
+ * Holds if the given `path` is for a file in the base database whose entities should be discarded.
+ */
+bindingset[path]
+private predicate discardableFile(string path) {
+  isOverlay() and
+  (
+    overlayChangedFiles(path)
+    or
+    // The extractor unconditionally extracts files outside of the source directory (these are
+    // typically cgo-processed source files), so all entities in such files should be discarded.
+    not exists(string srcLoc | sourceLocationPrefix(srcLoc) |
+      path.substring(0, srcLoc.length()) = srcLoc
+    )
+  )
+}
+
+/**
+ * Holds if the given `locatable` should be discarded, because it is part of the overlay base and is
+ * in a file that was also extracted as part of the overlay database.
+ */
+overlay[discard_entity]
+private predicate discardLocatable(@locatable locatable) {
+  exists(@file file, string path | files(file, path) |
+    discardableLocatable(file, locatable) and discardableFile(path)
+  )
+}
+
+private @file getXmlFile(@xmllocatable locatable) {
+  exists(@location_default location | xmllocations(locatable, location) |
+    locations_default(location, result, _, _, _, _)
+  )
+}
+
+private @file getXmlFileInBase(@xmllocatable locatable) {
+  not isOverlay() and
+  result = getXmlFile(locatable)
+}
+
+/**
+ * Holds if the given `file` was extracted as part of the overlay and was extracted by the HTML/XML
+ * extractor.
+ */
+private predicate overlayXmlExtracted(@file file) {
+  isOverlay() and
+  exists(@xmllocatable locatable |
+    not files(locatable, _) and not xmlNs(locatable, _, _, _) and file = getXmlFile(locatable)
+  )
+}
+
+/**
+ * Holds if the given XML `locatable` should be discarded, because it is part of the overlay base
+ * and is in a file that was also extracted as part of the overlay database.
+ */
+overlay[discard_entity]
+private predicate discardXmlLocatable(@xmllocatable locatable) {
+  exists(@file file | file = getXmlFileInBase(locatable) |
+    exists(string path | files(file, path) | overlayChangedFiles(path))
+    or
+    // The HTML/XML extractor is currently not incremental and may extract more files than those
+    // included in overlayChangedFiles.
+    overlayXmlExtracted(file)
+  )
+}
diff --git a/go/ql/lib/semmle/go/StringOps.qll b/go/ql/lib/semmle/go/StringOps.qll
index 351617abf9d..3463e4fdf87 100644
--- a/go/ql/lib/semmle/go/StringOps.qll
+++ b/go/ql/lib/semmle/go/StringOps.qll
@@ -306,11 +306,12 @@ module StringOps {
      */
     class StringFormatCall extends DataFlow::CallNode {
       string fmt;
-      Range f;
 
       StringFormatCall() {
-        this = f.getACall() and
-        fmt = this.getArgument(f.getFormatStringIndex()).getStringValue() and
+        exists(Range f |
+          this = f.getACall() and
+          fmt = this.getArgument(f.getFormatStringIndex()).getStringValue()
+        ) and
         fmt.regexpMatch(getFormatComponentRegex() + "*")
       }
 
diff --git a/go/ql/lib/semmle/go/controlflow/ControlFlowGraph.qll b/go/ql/lib/semmle/go/controlflow/ControlFlowGraph.qll
index f5905b89bea..1e66bc61dc4 100644
--- a/go/ql/lib/semmle/go/controlflow/ControlFlowGraph.qll
+++ b/go/ql/lib/semmle/go/controlflow/ControlFlowGraph.qll
@@ -118,6 +118,8 @@ module ControlFlow {
     /** Gets the left-hand side of this write. */
     IR::WriteTarget getLhs() { result = super.getLhs() }
 
+    private predicate isInitialization() { super.isInitialization() }
+
     /** Gets the right-hand side of this write. */
     DataFlow::Node getRhs() { super.getRhs() = result.asInstruction() }
 
@@ -132,21 +134,45 @@ module ControlFlow {
 
     /**
      * Holds if this node sets the value of field `f` on `base` (or its implicit dereference) to
-     * `rhs`.
+     * `rhs`, where `base` represents the post-update value.
+     *
+     * For example, for the assignment `x.width = newWidth`, `base` is the post-update node of
+     * either the data-flow node corresponding to `x` or (if `x` is a pointer) the data-flow node
+     * corresponding to the implicit dereference `*x`, `f` is the field referenced by `width`, and
+     * `rhs` is the data-flow node corresponding to `newWidth`. If this `WriteNode` is a struct
+     * initialization then there is no post-update node and `base` is the struct literal being
+     * initialized.
+     */
+    predicate writesField(DataFlow::Node base, Field f, DataFlow::Node rhs) {
+      exists(DataFlow::Node b | this.writesFieldPreUpdate(b, f, rhs) |
+        this.isInitialization() and base = b
+        or
+        not this.isInitialization() and
+        b = base.(DataFlow::PostUpdateNode).getPreUpdateNode()
+      )
+    }
+
+    /**
+     * Holds if this node sets the value of field `f` on `base` (or its implicit dereference) to
+     * `rhs`, where `base` represents the pre-update value.
      *
      * For example, for the assignment `x.width = newWidth`, `base` is either the data-flow node
      * corresponding to `x` or (if `x` is a pointer) the data-flow node corresponding to the
-     * implicit dereference `*x`, `f` is the field referenced by `width`, and `rhs` is the data-flow
-     * node corresponding to `newWidth`.
+     * implicit dereference `*x`, `f` is the field referenced by `width`, and `rhs` is the
+     * data-flow node corresponding to `newWidth`.
      */
-    predicate writesField(DataFlow::Node base, Field f, DataFlow::Node rhs) {
+    predicate writesFieldPreUpdate(DataFlow::Node base, Field f, DataFlow::Node rhs) {
+      this.writesFieldInsn(base.asInstruction(), f, rhs.asInstruction())
+    }
+
+    private predicate writesFieldInsn(IR::Instruction base, Field f, IR::Instruction rhs) {
       exists(IR::FieldTarget trg | trg = super.getLhs() |
         (
-          trg.getBase() = base.asInstruction() or
-          trg.getBase() = MkImplicitDeref(base.asExpr())
+          trg.getBase() = base or
+          trg.getBase() = MkImplicitDeref(base.(IR::EvalInstruction).getExpr())
         ) and
         trg.getField() = f and
-        super.getRhs() = rhs.asInstruction()
+        super.getRhs() = rhs
       )
     }
 
@@ -154,27 +180,66 @@ module ControlFlow {
      * Holds if this node sets the value of element `index` on `base` (or its implicit dereference)
      * to `rhs`.
      *
-     * For example, for the assignment `xs[i] = v`, `base` is either the data-flow node
-     * corresponding to `xs` or (if `xs` is a pointer) the data-flow node corresponding to the
-     * implicit dereference `*xs`, `index` is the data-flow node corresponding to `i`, and `rhs`
-     * is the data-flow node corresponding to `base`.
+     * For example, for the assignment `xs[i] = v`, `base` is the post-update node of the data-flow
+     * node corresponding to `xs` or (if `xs` is a pointer) the implicit dereference `*xs`, `index`
+     * is the data-flow node corresponding to `i`, and `rhs` is the data-flow node corresponding to
+     * `base`. If this `WriteNode` corresponds to the initialization of an array/slice/map then
+     * there is no need for a post-update node and `base` is the array/slice/map literal being
+     * initialized.
      */
     predicate writesElement(DataFlow::Node base, DataFlow::Node index, DataFlow::Node rhs) {
+      exists(DataFlow::Node b | this.writesElementPreUpdate(b, index, rhs) |
+        this.isInitialization() and base = b
+        or
+        not this.isInitialization() and
+        b = base.(DataFlow::PostUpdateNode).getPreUpdateNode()
+      )
+    }
+
+    /**
+     * Holds if this node sets the value of element `index` on `base` (or its implicit dereference)
+     * to `rhs`.
+     *
+     * For example, for the assignment `xs[i] = v`, `base` is the post-update node of the data-flow
+     * node corresponding to `xs` or (if `xs` is a pointer) the implicit dereference `*xs`, `index`
+     * is the data-flow node corresponding to `i`, and `rhs` is the data-flow node corresponding to
+     * `base`. If this `WriteNode` corresponds to the initialization of an array/slice/map then
+     * there is no need for a post-update node and `base` is the array/slice/map literal being
+     * initialized.
+     */
+    predicate writesElementPreUpdate(DataFlow::Node base, DataFlow::Node index, DataFlow::Node rhs) {
+      this.writesElementInsn(base.asInstruction(), index.asInstruction(), rhs.asInstruction())
+    }
+
+    private predicate writesElementInsn(
+      IR::Instruction base, IR::Instruction index, IR::Instruction rhs
+    ) {
       exists(IR::ElementTarget trg | trg = super.getLhs() |
         (
-          trg.getBase() = base.asInstruction() or
-          trg.getBase() = MkImplicitDeref(base.asExpr())
+          trg.getBase() = base or
+          trg.getBase() = MkImplicitDeref(base.(IR::EvalInstruction).getExpr())
         ) and
-        trg.getIndex() = index.asInstruction() and
-        super.getRhs() = rhs.asInstruction()
+        trg.getIndex() = index and
+        super.getRhs() = rhs
       )
     }
 
+    /**
+     * DEPRECATED: Use the disjunct of `writesElement` and `writesField`, or `writesFieldPreUpdate`
+     * and `writesElementPreUpdate`, instead.
+     *
+     * Holds if this node sets any field or element of `base` (or its implicit dereference) to
+     * `rhs`, where `base` represents the pre-update value.
+     */
+    deprecated predicate writesComponent(DataFlow::Node base, DataFlow::Node rhs) {
+      this.writesElementPreUpdate(base, _, rhs) or this.writesFieldPreUpdate(base, _, rhs)
+    }
+
     /**
      * Holds if this node sets any field or element of `base` to `rhs`.
      */
-    predicate writesComponent(DataFlow::Node base, DataFlow::Node rhs) {
-      this.writesElement(base, _, rhs) or this.writesField(base, _, rhs)
+    predicate writesComponentInstruction(IR::Instruction base, IR::Instruction rhs) {
+      this.writesElementInsn(base, _, rhs) or this.writesFieldInsn(base, _, rhs)
     }
   }
 
diff --git a/go/ql/lib/semmle/go/controlflow/IR.qll b/go/ql/lib/semmle/go/controlflow/IR.qll
index 1a56dfcf2dc..2c8b673184e 100644
--- a/go/ql/lib/semmle/go/controlflow/IR.qll
+++ b/go/ql/lib/semmle/go/controlflow/IR.qll
@@ -430,18 +430,25 @@ module IR {
    */
   class WriteInstruction extends Instruction {
     WriteTarget lhs;
+    Boolean initialization;
 
     WriteInstruction() {
-      lhs = MkLhs(this, _)
+      (
+        lhs = MkLhs(this, _)
+        or
+        lhs = MkResultWriteTarget(this)
+      ) and
+      initialization = false
       or
-      lhs = MkLiteralElementTarget(this)
-      or
-      lhs = MkResultWriteTarget(this)
+      lhs = MkLiteralElementTarget(this) and initialization = true
     }
 
     /** Gets the target to which this instruction writes. */
     WriteTarget getLhs() { result = lhs }
 
+    /** Holds if this instruction initializes a literal. */
+    predicate isInitialization() { initialization = true }
+
     /** Gets the instruction computing the value this instruction writes. */
     Instruction getRhs() { none() }
 
diff --git a/go/ql/lib/semmle/go/dataflow/SSA.qll b/go/ql/lib/semmle/go/dataflow/SSA.qll
index d13bbe2de63..98dae5f3d01 100644
--- a/go/ql/lib/semmle/go/dataflow/SSA.qll
+++ b/go/ql/lib/semmle/go/dataflow/SSA.qll
@@ -166,6 +166,13 @@ class SsaDefinition extends TSsaDefinition {
   ) {
     this.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
   }
+
+  /**
+   * Gets the first instruction that the value of this `SsaDefinition` can
+   * reach without passing through any other instructions, but possibly through
+   * phi nodes.
+   */
+  IR::Instruction getAFirstUse() { firstUse(this, result) }
 }
 
 /**
@@ -410,3 +417,12 @@ DataFlow::Node getASimilarReadNode(DataFlow::Node node) {
     result = readFields.similar().getAUse()
   )
 }
+
+/**
+ * Gets an instruction such that  `pred` and `result` form an adjacent
+ * use-use-pair of the same`SsaSourceVariable`, that is, the value read in
+ * `pred` can reach `result` without passing through any other use or any SSA
+ * definition of the variable except for phi nodes and uncertain implicit
+ * updates.
+ */
+IR::Instruction getAnAdjacentUse(IR::Instruction pred) { adjacentUseUse(pred, result) }
diff --git a/go/ql/lib/semmle/go/dataflow/SsaImpl.qll b/go/ql/lib/semmle/go/dataflow/SsaImpl.qll
index 0db37ac03ce..8549d9b497a 100644
--- a/go/ql/lib/semmle/go/dataflow/SsaImpl.qll
+++ b/go/ql/lib/semmle/go/dataflow/SsaImpl.qll
@@ -199,6 +199,8 @@ private module Internal {
   /**
    * Holds if the `i`th node of `bb` is a use or an SSA definition of variable `v`, with
    * `k` indicating whether it is the former or the latter.
+   *
+   * Note this includes phi nodes, whereas `ref` above only includes explicit writes and captures.
    */
   private predicate ssaRef(ReachableBasicBlock bb, int i, SsaSourceVariable v, RefKind k) {
     useAt(bb, i, v) and k = ReadRef()
@@ -290,6 +292,172 @@ private module Internal {
     or
     rewindReads(bb, i, v) = 1 and result = getDefReachingEndOf(bb.getImmediateDominator(), v)
   }
+
+  private module AdjacentUsesImpl {
+    /** Holds if `v` is defined or used in `b`. */
+    private predicate varOccursInBlock(SsaSourceVariable v, ReachableBasicBlock b) {
+      ssaRef(b, _, v, _)
+    }
+
+    /** Holds if `v` occurs in `b` or one of `b`'s transitive successors. */
+    private predicate blockPrecedesVar(SsaSourceVariable v, ReachableBasicBlock b) {
+      varOccursInBlock(v, b)
+      or
+      exists(getDefReachingEndOf(b, v))
+    }
+
+    /**
+     * Holds if `v` occurs in `b1` and `b2` is one of `b1`'s successors.
+     *
+     * Factored out of `varBlockReaches` to force join order compared to the larger
+     * set `blockPrecedesVar(v, b2)`.
+     */
+    pragma[noinline]
+    private predicate varBlockReachesBaseCand(
+      SsaSourceVariable v, ReachableBasicBlock b1, ReachableBasicBlock b2
+    ) {
+      varOccursInBlock(v, b1) and
+      b2 = b1.getASuccessor()
+    }
+
+    /**
+     * Holds if `b2` is a transitive successor of `b1` and `v` occurs in `b1` and
+     * in `b2` or one of its transitive successors but not in any block on the path
+     * between `b1` and `b2`. Unlike `varBlockReaches` this may include blocks `b2`
+     * where `v` is dead.
+     *
+     * Factored out of `varBlockReaches` to force join order compared to the larger
+     * set `blockPrecedesVar(v, b2)`.
+     */
+    pragma[noinline]
+    private predicate varBlockReachesRecCand(
+      SsaSourceVariable v, ReachableBasicBlock b1, ReachableBasicBlock mid, ReachableBasicBlock b2
+    ) {
+      varBlockReaches(v, b1, mid) and
+      not varOccursInBlock(v, mid) and
+      b2 = mid.getASuccessor()
+    }
+
+    /**
+     * Holds if `b2` is a transitive successor of `b1` and `v` occurs in `b1` and
+     * in `b2` or one of its transitive successors but not in any block on the path
+     * between `b1` and `b2`.
+     */
+    private predicate varBlockReaches(
+      SsaSourceVariable v, ReachableBasicBlock b1, ReachableBasicBlock b2
+    ) {
+      varBlockReachesBaseCand(v, b1, b2) and
+      blockPrecedesVar(v, b2)
+      or
+      varBlockReachesRecCand(v, b1, _, b2) and
+      blockPrecedesVar(v, b2)
+    }
+
+    /**
+     * Holds if `b2` is a transitive successor of `b1` and `v` occurs in `b1` and
+     * `b2` but not in any block on the path between `b1` and `b2`.
+     */
+    private predicate varBlockStep(
+      SsaSourceVariable v, ReachableBasicBlock b1, ReachableBasicBlock b2
+    ) {
+      varBlockReaches(v, b1, b2) and
+      varOccursInBlock(v, b2)
+    }
+
+    /**
+     * Gets the maximum rank among all SSA references to `v` in basic block `bb`.
+     */
+    private int maxSsaRefRank(ReachableBasicBlock bb, SsaSourceVariable v) {
+      result = max(ssaRefRank(bb, _, v, _))
+    }
+
+    /**
+     * Holds if `v` occurs at index `i1` in `b1` and at index `i2` in `b2` and
+     * there is a path between them without any occurrence of `v`.
+     */
+    pragma[nomagic]
+    predicate adjacentVarRefs(
+      SsaSourceVariable v, ReachableBasicBlock b1, int i1, ReachableBasicBlock b2, int i2
+    ) {
+      exists(int rankix |
+        b1 = b2 and
+        ssaRefRank(b1, i1, v, _) = rankix and
+        ssaRefRank(b2, i2, v, _) = rankix + 1
+      )
+      or
+      maxSsaRefRank(b1, v) = ssaRefRank(b1, i1, v, _) and
+      varBlockStep(v, b1, b2) and
+      ssaRefRank(b2, i2, v, _) = 1
+    }
+
+    predicate variableUse(SsaSourceVariable v, IR::Instruction use, ReachableBasicBlock bb, int i) {
+      bb.getNode(i) = use and
+      exists(SsaVariable sv |
+        sv.getSourceVariable() = v and
+        use = sv.getAUse()
+      )
+    }
+  }
+
+  private import AdjacentUsesImpl
+
+  /**
+   * Holds if the value defined at `def` can reach `use` without passing through
+   * any other uses, but possibly through phi nodes.
+   */
+  cached
+  predicate firstUse(SsaDefinition def, IR::Instruction use) {
+    exists(SsaSourceVariable v, ReachableBasicBlock b1, int i1, ReachableBasicBlock b2, int i2 |
+      adjacentVarRefs(v, b1, i1, b2, i2) and
+      def.definesAt(b1, i1, v) and
+      variableUse(v, use, b2, i2)
+    )
+    or
+    exists(
+      SsaSourceVariable v, SsaPhiNode redef, ReachableBasicBlock b1, int i1, ReachableBasicBlock b2,
+      int i2
+    |
+      adjacentVarRefs(v, b1, i1, b2, i2) and
+      def.definesAt(b1, i1, v) and
+      redef.definesAt(b2, i2, v) and
+      firstUse(redef, use)
+    )
+  }
+
+  /**
+   * Holds if `use1` and `use2` form an adjacent use-use-pair of the same SSA
+   * variable, that is, the value read in `use1` can reach `use2` without passing
+   * through any other use or any SSA definition of the variable.
+   */
+  cached
+  predicate adjacentUseUseSameVar(IR::Instruction use1, IR::Instruction use2) {
+    exists(SsaSourceVariable v, ReachableBasicBlock b1, int i1, ReachableBasicBlock b2, int i2 |
+      adjacentVarRefs(v, b1, i1, b2, i2) and
+      variableUse(v, use1, b1, i1) and
+      variableUse(v, use2, b2, i2)
+    )
+  }
+
+  /**
+   * Holds if `use1` and `use2` form an adjacent use-use-pair of the same
+   * `SsaSourceVariable`, that is, the value read in `use1` can reach `use2`
+   * without passing through any other use or any SSA definition of the variable
+   * except for phi nodes and uncertain implicit updates.
+   */
+  cached
+  predicate adjacentUseUse(IR::Instruction use1, IR::Instruction use2) {
+    adjacentUseUseSameVar(use1, use2)
+    or
+    exists(
+      SsaSourceVariable v, SsaPhiNode def, ReachableBasicBlock b1, int i1, ReachableBasicBlock b2,
+      int i2
+    |
+      adjacentVarRefs(v, b1, i1, b2, i2) and
+      variableUse(v, use1, b1, i1) and
+      def.definesAt(b2, i2, v) and
+      firstUse(def, use2)
+    )
+  }
 }
 
 import Internal
diff --git a/go/ql/lib/semmle/go/dataflow/internal/ContainerFlow.qll b/go/ql/lib/semmle/go/dataflow/internal/ContainerFlow.qll
index 9f07693b7ea..e978cb3e587 100644
--- a/go/ql/lib/semmle/go/dataflow/internal/ContainerFlow.qll
+++ b/go/ql/lib/semmle/go/dataflow/internal/ContainerFlow.qll
@@ -22,7 +22,7 @@ predicate containerStoreStep(Node node1, Node node2, Content c) {
         t instanceof SliceType
       ) and
       (
-        exists(Write w | w.writesElement(node2.(PostUpdateNode).getPreUpdateNode(), _, node1))
+        exists(Write w | w.writesElement(node2, _, node1))
         or
         node1 = node2.(ImplicitVarargsSlice).getCallNode().getAnImplicitVarargsArgument()
         or
@@ -36,17 +36,19 @@ predicate containerStoreStep(Node node1, Node node2, Content c) {
     )
     or
     c instanceof CollectionContent and
-    exists(SendStmt send |
-      send.getChannel() = node2.(ExprNode).asExpr() and send.getValue() = node1.(ExprNode).asExpr()
+    exists(SendStmt send, Node channelExprNode |
+      send.getChannel() = channelExprNode.(ExprNode).asExpr() and
+      node2.(PostUpdateNode).getPreUpdateNode() = channelExprNode and
+      send.getValue() = node1.(ExprNode).asExpr()
     )
     or
     c instanceof MapKeyContent and
     t instanceof MapType and
-    exists(Write w | w.writesElement(node2.(PostUpdateNode).getPreUpdateNode(), node1, _))
+    exists(Write w | w.writesElement(node2, node1, _))
     or
     c instanceof MapValueContent and
     t instanceof MapType and
-    exists(Write w | w.writesElement(node2.(PostUpdateNode).getPreUpdateNode(), _, node1))
+    exists(Write w | w.writesElement(node2, _, node1))
   )
 }
 
diff --git a/go/ql/lib/semmle/go/dataflow/internal/DataFlowNodes.qll b/go/ql/lib/semmle/go/dataflow/internal/DataFlowNodes.qll
index a770f047d65..d48335d299f 100644
--- a/go/ql/lib/semmle/go/dataflow/internal/DataFlowNodes.qll
+++ b/go/ql/lib/semmle/go/dataflow/internal/DataFlowNodes.qll
@@ -12,7 +12,8 @@ private newtype TNode =
   MkGlobalFunctionNode(Function f) or
   MkImplicitVarargsSlice(CallExpr c) { c.hasImplicitVarargs() } or
   MkSliceElementNode(SliceExpr se) or
-  MkFlowSummaryNode(FlowSummaryImpl::Private::SummaryNode sn)
+  MkFlowSummaryNode(FlowSummaryImpl::Private::SummaryNode sn) or
+  MkDefaultPostUpdateNode(IR::Instruction insn) { insnHasPostUpdateNode(insn) }
 
 /** Nodes intended for only use inside the data-flow libraries. */
 module Private {
@@ -760,18 +761,27 @@ module Public {
     predicate isReceiverOf(MethodDecl m) { parm.isReceiverOf(m) }
   }
 
-  private Node getADirectlyWrittenNode() {
-    exists(Write w | w.writesComponent(result, _)) or
-    result = DataFlow::exprNode(any(SendStmt s).getChannel())
-  }
-
-  private DataFlow::Node getAccessPathPredecessor(DataFlow::Node node) {
-    result = node.(PointerDereferenceNode).getOperand()
+  private IR::Instruction getADirectlyWrittenInsn() {
+    exists(Write w | w.writesComponentInstruction(result, _))
     or
-    result = node.(ComponentReadNode).getBase()
+    result = IR::evalExprInstruction(any(SendStmt s).getChannel())
   }
 
-  private Node getAWrittenNode() { result = getAccessPathPredecessor*(getADirectlyWrittenNode()) }
+  private IR::Instruction getAccessPathPredecessorInsn(IR::Instruction insn) {
+    exists(Expr e1, Expr e2 |
+      insn = IR::evalExprInstruction(e1) and result = IR::evalExprInstruction(e2)
+    |
+      e2 = e1.(DerefExpr).getOperand() or e2 = e1.(StarExpr).getBase()
+    )
+    or
+    exists(Expr e | insn = IR::implicitDerefInstruction(e) and result = IR::evalExprInstruction(e))
+    or
+    result = insn.(IR::ComponentReadInstruction).getBase()
+  }
+
+  private IR::Instruction getAWrittenInsn() {
+    result = getAccessPathPredecessorInsn*(getADirectlyWrittenInsn())
+  }
 
   /**
    * Holds if `tp` is a type that may (directly or indirectly) reference a memory location.
@@ -807,31 +817,51 @@ module Public {
     abstract Node getPreUpdateNode();
   }
 
-  private class DefaultPostUpdateNode extends PostUpdateNode {
+  /** Holds if the node corresponding to `insn` has a post-update node. */
+  predicate insnHasPostUpdateNode(IR::Instruction insn) {
+    exists(Expr e | insn.(IR::EvalInstruction).getExpr() = e |
+      e instanceof AddressExpr or
+      e = any(AddressExpr ae).getOperand() or
+      e = any(StarExpr ae).getBase() or
+      e = any(DerefExpr ae).getOperand() or
+      e = any(IR::EvalImplicitDerefInstruction eidi).getOperand()
+    )
+    or
+    exists(CallExpr ce |
+      ce.getArgument(0).getType() instanceof TupleType and
+      insn = IR::extractTupleElement(IR::evalExprInstruction(ce.getArgument(0)), _)
+      or
+      not ce.getArgument(0).getType() instanceof TupleType and
+      insn = IR::evalExprInstruction(ce.getAnArgument())
+      or
+      // Receiver of a method call
+      exists(IR::MethodReadInstruction mri |
+        ce.getTarget() instanceof Method and
+        mri = IR::evalExprInstruction(ce.getCalleeExpr()) and
+        insn = mri.getReceiver()
+      )
+    ) and
+    mutableType(insn.getResultType())
+    or
+    insn = getAWrittenInsn()
+  }
+
+  private class DefaultPostUpdateNode extends PostUpdateNode, MkDefaultPostUpdateNode {
     Node preupd;
 
-    DefaultPostUpdateNode() {
-      (
-        preupd instanceof AddressOperationNode
-        or
-        preupd = any(AddressOperationNode addr).getOperand()
-        or
-        preupd = any(PointerDereferenceNode deref).getOperand()
-        or
-        preupd = getAWrittenNode()
-        or
-        preupd = any(ArgumentNode arg).getACorrespondingSyntacticArgument() and
-        mutableType(preupd.getType())
-      ) and
-      (
-        preupd = this.(SsaNode).getAUse()
-        or
-        preupd = this and
-        not basicLocalFlowStep(_, this)
-      )
-    }
+    DefaultPostUpdateNode() { this = MkDefaultPostUpdateNode(preupd.asInstruction()) }
 
     override Node getPreUpdateNode() { result = preupd }
+
+    override ControlFlow::Root getRoot() { result = preupd.getRoot() }
+
+    override Type getType() { result = preupd.getType() }
+
+    override string getNodeKind() { result = "post-update node" }
+
+    override string toString() { result = preupd.toString() + " [postupdate]" }
+
+    override Location getLocation() { result = preupd.getLocation() }
   }
 
   /**
@@ -866,7 +896,7 @@ module Public {
     int getPosition() { result = i }
 
     /**
-     * Gets a data-flow node for a syntactic argument corresponding this this
+     * Gets a data-flow node for a syntactic argument corresponding to this
      * argument. If this argument is not an implicit varargs slice then this
      * will just be the argument itself. If this argument is an implicit
      * varargs slice then this will be a data-flow node that for an argument
@@ -994,7 +1024,7 @@ module Public {
   class ComponentReadNode extends ReadNode {
     override IR::ComponentReadInstruction insn;
 
-    /** Gets the data-flow node representing the base from which the field or element is read. */
+    /** Gets the data-flow node representing the base from which the field or element is read. */
     Node getBase() { result = DataFlow::instructionNode(insn.getBase()) }
   }
 
diff --git a/go/ql/lib/semmle/go/dataflow/internal/DataFlowPrivate.qll b/go/ql/lib/semmle/go/dataflow/internal/DataFlowPrivate.qll
index 2d05b211a57..94609d1c111 100644
--- a/go/ql/lib/semmle/go/dataflow/internal/DataFlowPrivate.qll
+++ b/go/ql/lib/semmle/go/dataflow/internal/DataFlowPrivate.qll
@@ -65,23 +65,30 @@ predicate basicLocalFlowStep(Node nodeFrom, Node nodeTo) {
     else nodeTo.asInstruction() = evalAssert
   )
   or
-  // Instruction -> SSA
+  // Instruction -> SSA defn
   exists(IR::Instruction pred, SsaExplicitDefinition succ |
     succ.getRhs() = pred and
-    nodeFrom = instructionNode(pred) and
-    nodeTo = ssaNode(succ)
+    (
+      nodeFrom = instructionNode(pred) or
+      nodeFrom.(PostUpdateNode).getPreUpdateNode() = instructionNode(pred)
+    ) and
+    nodeTo = ssaNode(succ.getVariable())
   )
   or
-  // SSA -> SSA
-  exists(SsaDefinition pred, SsaPseudoDefinition succ | succ.getAnInput() = pred |
-    nodeFrom = ssaNode(pred) and
-    nodeTo = ssaNode(succ)
+  // SSA defn -> first SSA use
+  exists(SsaDefinition pred, IR::Instruction succ | succ = pred.getAFirstUse() |
+    (pred instanceof SsaExplicitDefinition or pred instanceof SsaVariableCapture) and
+    nodeFrom = ssaNode(pred.getVariable()) and
+    nodeTo = instructionNode(succ)
   )
   or
-  // SSA -> Instruction
-  exists(SsaDefinition pred, IR::Instruction succ |
-    succ = pred.getVariable().getAUse() and
-    nodeFrom = ssaNode(pred) and
+  // SSA use -> successive SSA use
+  // Note this case includes Phi node traversal
+  exists(IR::Instruction pred, IR::Instruction succ | succ = getAnAdjacentUse(pred) |
+    (
+      nodeFrom = instructionNode(pred) or
+      nodeFrom.(PostUpdateNode).getPreUpdateNode() = instructionNode(pred)
+    ) and
     nodeTo = instructionNode(succ)
   )
   or
@@ -96,6 +103,10 @@ private Field getASparselyUsedChannelTypedField() {
   count(result.getARead()) = 2
 }
 
+bindingset[v]
+pragma[inline_late]
+private predicate isValueEntityRead(ValueEntity v, Node n) { n = v.getARead() }
+
 /**
  * Holds if data can flow from `node1` to `node2` in a way that loses the
  * calling context. For example, this would happen with flow through a
@@ -110,14 +121,22 @@ predicate jumpStep(Node n1, Node n2) {
       or
       n1.(DataFlow::PostUpdateNode).getPreUpdateNode() = v.getARead()
     ) and
-    n2 = v.getARead()
+    isValueEntityRead(v, n2)
   )
   or
-  exists(SsaDefinition pred, SsaDefinition succ |
-    succ.(SsaVariableCapture).getSourceVariable() = pred.(SsaExplicitDefinition).getSourceVariable()
-  |
-    n1 = ssaNode(pred) and
+  exists(SsaExplicitDefinition def, SsaVariableCapture succ |
+    succ.getSourceVariable() = def.getSourceVariable() and
     n2 = ssaNode(succ)
+  |
+    not exists(def.getAFirstUse()) and n1 = ssaNode(def)
+    or
+    exists(IR::Instruction lastUse |
+      lastUse = getAnAdjacentUse*(def.getAFirstUse()) and
+      not exists(getAnAdjacentUse(lastUse))
+    |
+      n1 = instructionNode(lastUse) or
+      n1.(DataFlow::PostUpdateNode).getPreUpdateNode() = instructionNode(lastUse)
+    )
   )
   or
   // If a channel-typed field is referenced exactly once in the context of
@@ -145,15 +164,17 @@ predicate jumpStep(Node n1, Node n2) {
  */
 predicate storeStep(Node node1, ContentSet cs, Node node2) {
   exists(Content c | cs.asOneContent() = c |
-    // a write `(*p).f = rhs` is modeled as two store steps: `rhs` is flows into field `f` of `(*p)`,
-    // which in turn flows into the pointer content of `p`
+    // a write `(*p).f = rhs` is modeled as two store steps: `rhs` is flows into field `f` of the
+    // post-update node of `(*p)`, which in turn flows into the pointer content of the post-update
+    // node of `p`
     exists(Write w, Field f, DataFlow::Node base, DataFlow::Node rhs | w.writesField(base, f, rhs) |
       node1 = rhs and
-      node2.(PostUpdateNode).getPreUpdateNode() = base and
+      node2 = base and
       c = any(DataFlow::FieldContent fc | fc.getField() = f)
       or
       node1 = base and
-      node2.(PostUpdateNode).getPreUpdateNode() = node1.(PointerDereferenceNode).getOperand() and
+      node2.(PostUpdateNode).getPreUpdateNode() =
+        node1.(PostUpdateNode).getPreUpdateNode().(PointerDereferenceNode).getOperand() and
       c = any(DataFlow::PointerContent pc | pc.getPointerType() = node2.getType())
     )
     or
diff --git a/go/ql/lib/semmle/go/dataflow/internal/DataFlowUtil.qll b/go/ql/lib/semmle/go/dataflow/internal/DataFlowUtil.qll
index 2cd1bbcc747..14ff455646c 100644
--- a/go/ql/lib/semmle/go/dataflow/internal/DataFlowUtil.qll
+++ b/go/ql/lib/semmle/go/dataflow/internal/DataFlowUtil.qll
@@ -367,7 +367,7 @@ module BarrierGuard<guardChecksSig/3 guardChecks> {
   }
 
   /**
-   * Holds if `guard` marks a point in the control-flow graph where this node
+   * Holds if `guard` marks a point in the control-flow graph where `g`
    * is known to validate `nd`, which is represented by `ap`.
    *
    * This predicate exists to enforce a good join order in `getAGuardedNode`.
@@ -378,7 +378,7 @@ module BarrierGuard<guardChecksSig/3 guardChecks> {
   }
 
   /**
-   * Holds if `guard` marks a point in the control-flow graph where this node
+   * Holds if `guard` marks a point in the control-flow graph where `g`
    * is known to validate `nd`.
    */
   private predicate guards(Node g, ControlFlow::ConditionGuardNode guard, Node nd) {
diff --git a/go/ql/lib/semmle/go/dataflow/internal/FlowSummaryImpl.qll b/go/ql/lib/semmle/go/dataflow/internal/FlowSummaryImpl.qll
index 35887d076c0..f12c9e6eeb1 100644
--- a/go/ql/lib/semmle/go/dataflow/internal/FlowSummaryImpl.qll
+++ b/go/ql/lib/semmle/go/dataflow/internal/FlowSummaryImpl.qll
@@ -117,7 +117,9 @@ private module StepsInput implements Impl::Private::StepsInputSig {
     )
   }
 
-  Node getSourceNode(Input::SourceBase source, Impl::Private::SummaryComponent sc) { none() }
+  DataFlowCallable getSourceNodeEnclosingCallable(Input::SourceBase source) { none() }
+
+  Node getSourceNode(Input::SourceBase source, Impl::Private::SummaryComponentStack s) { none() }
 
   Node getSinkNode(Input::SinkBase sink, Impl::Private::SummaryComponent sc) { none() }
 }
@@ -440,7 +442,7 @@ module SourceSinkInterpretationInput implements
       f = e.asFieldEntity()
     |
       c = "" and
-      fw.writesField(base, f, node.asNode()) and
+      fw.writesFieldPreUpdate(base, f, node.asNode()) and
       pragma[only_bind_into](e) = getElementWithQualifier(f, base)
     )
     or
diff --git a/go/ql/lib/semmle/go/dataflow/internal/TaintTrackingUtil.qll b/go/ql/lib/semmle/go/dataflow/internal/TaintTrackingUtil.qll
index c69a7f32e63..af28f7f4020 100644
--- a/go/ql/lib/semmle/go/dataflow/internal/TaintTrackingUtil.qll
+++ b/go/ql/lib/semmle/go/dataflow/internal/TaintTrackingUtil.qll
@@ -83,23 +83,25 @@ class AdditionalTaintStep extends Unit {
   abstract predicate step(DataFlow::Node node1, DataFlow::Node node2);
 }
 
-/**
- * Holds if the additional step from `pred` to `succ` should be included in all
- * global taint flow configurations.
- */
-predicate localAdditionalTaintStep(DataFlow::Node pred, DataFlow::Node succ, string model) {
-  (
-    referenceStep(pred, succ) or
-    elementWriteStep(pred, succ) or
-    fieldReadStep(pred, succ) or
-    elementStep(pred, succ) or
-    tupleStep(pred, succ) or
-    stringConcatStep(pred, succ) or
-    sliceStep(pred, succ)
+private predicate localAdditionalForwardTaintStep(
+  DataFlow::Node pred, DataFlow::Node succ, string model
+) {
+  exists(DataFlow::Node pred2 |
+    pred2 = pred
+    or
+    pred2 = pred.(DataFlow::PostUpdateNode).getPreUpdateNode()
+  |
+    referenceStep(pred2, succ) or
+    elementWriteStep(pred2, succ) or
+    fieldReadStep(pred2, succ) or
+    elementStep(pred2, succ) or
+    tupleStep(pred2, succ) or
+    stringConcatStep(pred2, succ) or
+    sliceStep(pred2, succ)
   ) and
   model = ""
   or
-  any(FunctionModel fm).taintStep(pred, succ) and model = "FunctionModel"
+  any(FunctionModel fm).forwardTaintStep(pred, succ) and model = "FunctionModel"
   or
   any(AdditionalTaintStep a).step(pred, succ) and model = "AdditionalTaintStep"
   or
@@ -107,6 +109,43 @@ predicate localAdditionalTaintStep(DataFlow::Node pred, DataFlow::Node succ, str
         .getSummaryNode(), succ.(DataFlowPrivate::FlowSummaryNode).getSummaryNode(), false, model)
 }
 
+/**
+ * This is a helper predicate for `localAdditionalBackwardTaintStep`. It mixes
+ * local data flow with local forward taint steps. It should only ever be used
+ * via its transitive closure, which gives local forward taint flow, that is
+ * with backward steps excluded.
+ */
+private predicate partialLocalForwardTaintFlow(DataFlow::Node pred, DataFlow::Node succ) {
+  DataFlow::localFlow(pred, succ) or
+  localAdditionalForwardTaintStep(pred, succ, _) or
+  // Simple flow through library code is included in the exposed local
+  // step relation, even though flow is technically inter-procedural
+  FlowSummaryImpl::Private::Steps::summaryThroughStepTaint(pred, succ, _)
+}
+
+/**
+ * Holds if taint flows backwards from `pred` to `succ` via a function model.
+ */
+private predicate localAdditionalBackwardTaintStep(
+  DataFlow::Node pred, DataFlow::Node succ, string model
+) {
+  // backward step through function model
+  exists(FunctionModel m, DataFlow::Node resultNode |
+    m.backwardTaintStep(resultNode, succ) and
+    partialLocalForwardTaintFlow+(resultNode, pred.(DataFlow::PostUpdateNode).getPreUpdateNode())
+  ) and
+  model = "FunctionModel"
+}
+
+/**
+ * Holds if the additional step from `pred` to `succ` should be included in all
+ * global taint flow configurations.
+ */
+predicate localAdditionalTaintStep(DataFlow::Node pred, DataFlow::Node succ, string model) {
+  localAdditionalForwardTaintStep(pred, succ, model) or
+  localAdditionalBackwardTaintStep(pred, succ, model)
+}
+
 /**
  * Holds if taint flows from `pred` to `succ` via a reference or dereference.
  *
@@ -140,7 +179,7 @@ predicate referenceStep(DataFlow::Node pred, DataFlow::Node succ) {
  * `succ`.
  */
 predicate elementWriteStep(DataFlow::Node pred, DataFlow::Node succ) {
-  any(DataFlow::Write w).writesElement(succ.(DataFlow::PostUpdateNode).getPreUpdateNode(), _, pred)
+  any(DataFlow::Write w).writesElement(succ, _, pred)
   or
   FlowSummaryImpl::Private::Steps::summaryStoreStep(pred.(DataFlowPrivate::FlowSummaryNode)
         .getSummaryNode(), any(DataFlow::ArrayContent ac).asContentSet(),
@@ -195,23 +234,36 @@ abstract class FunctionModel extends Function {
   abstract predicate hasTaintFlow(FunctionInput input, FunctionOutput output);
 
   /** Gets an input node for this model for the call `c`. */
-  DataFlow::Node getAnInputNode(DataFlow::CallNode c) { this.taintStepForCall(result, _, c) }
+  DataFlow::Node getAnInputNode(DataFlow::CallNode c) { this.taintStepForCall(result, _, c, _) }
 
   /** Gets an output node for this model for the call `c`. */
-  DataFlow::Node getAnOutputNode(DataFlow::CallNode c) { this.taintStepForCall(_, result, c) }
+  DataFlow::Node getAnOutputNode(DataFlow::CallNode c) { this.taintStepForCall(_, result, c, _) }
 
   /** Holds if this function model causes taint to flow from `pred` to `succ` for the call `c`. */
-  predicate taintStepForCall(DataFlow::Node pred, DataFlow::Node succ, DataFlow::CallNode c) {
+  predicate taintStepForCall(
+    DataFlow::Node pred, DataFlow::Node succ, DataFlow::CallNode c, Boolean forward
+  ) {
     c = this.getACall() and
     exists(FunctionInput inp, FunctionOutput outp | this.hasTaintFlow(inp, outp) |
       pred = pragma[only_bind_out](inp).getNode(c) and
-      succ = pragma[only_bind_out](outp).getNode(c)
+      succ = pragma[only_bind_out](outp).getNode(c) and
+      if inp.isResult() or inp.isResult(_) then forward = false else forward = true
     )
   }
 
   /** Holds if this function model causes taint to flow from `pred` to `succ`. */
   predicate taintStep(DataFlow::Node pred, DataFlow::Node succ) {
-    this.taintStepForCall(pred, succ, _)
+    this.taintStepForCall(pred, succ, _, _)
+  }
+
+  /** Holds if this function model causes taint to flow forward from `pred` to `succ`. */
+  predicate forwardTaintStep(DataFlow::Node pred, DataFlow::Node succ) {
+    this.taintStepForCall(pred, succ, _, true)
+  }
+
+  /** Holds if this function model causes taint to flow backwards from `pred` to `succ`. */
+  predicate backwardTaintStep(DataFlow::Node pred, DataFlow::Node succ) {
+    this.taintStepForCall(pred, succ, _, false)
   }
 }
 
diff --git a/go/ql/lib/semmle/go/frameworks/Beego.qll b/go/ql/lib/semmle/go/frameworks/Beego.qll
index a9e296a1f97..952958cebf0 100644
--- a/go/ql/lib/semmle/go/frameworks/Beego.qll
+++ b/go/ql/lib/semmle/go/frameworks/Beego.qll
@@ -109,7 +109,7 @@ module Beego {
 
     override string getAContentType() {
       // Super-method provides content-types for `Body`, which requires us to search
-      // for `ContentType` and `Header` calls against the same `BeegoOutput` instance
+      // for `ContentType` and `Header` calls against the same `BeegoOutput` instance
       result = super.getAContentType()
       or
       // Specifically describe methods that set the content-type and body in one operation:
diff --git a/go/ql/lib/semmle/go/frameworks/Email.qll b/go/ql/lib/semmle/go/frameworks/Email.qll
index a1d43d3c397..ba4cf8be415 100644
--- a/go/ql/lib/semmle/go/frameworks/Email.qll
+++ b/go/ql/lib/semmle/go/frameworks/Email.qll
@@ -26,9 +26,14 @@ module EmailData {
   private class SmtpData extends Range {
     SmtpData() {
       // func (c *Client) Data() (io.WriteCloser, error)
-      exists(Method data |
+      exists(Method data, DataFlow::Node n |
         data.hasQualifiedName("net/smtp", "Client", "Data") and
-        this.(DataFlow::SsaNode).getInit() = data.getACall().getResult(0)
+        // Deal with cases like
+        //   w, _ := s.Data()
+        //   io.WriteString(w, source()) // $ Alert
+        //   w.Write(source())           // $ Alert
+        DataFlow::localFlow(data.getACall().getResult(0), n) and
+        this.(DataFlow::PostUpdateNode).getPreUpdateNode() = n
       )
       or
       // func SendMail(addr string, a Auth, from string, to []string, msg []byte) error
diff --git a/go/ql/lib/semmle/go/frameworks/GinCors.qll b/go/ql/lib/semmle/go/frameworks/GinCors.qll
index 582ea368073..cc993ea4dee 100644
--- a/go/ql/lib/semmle/go/frameworks/GinCors.qll
+++ b/go/ql/lib/semmle/go/frameworks/GinCors.qll
@@ -27,7 +27,7 @@ module GinCors {
     AllowCredentialsWrite() {
       exists(Field f, Write w |
         f.hasQualifiedName(packagePath(), "Config", "AllowCredentials") and
-        w.writesField(base, f, this) and
+        w.writesFieldPreUpdate(base, f, this) and
         this.getType() instanceof BoolType
       )
     }
@@ -61,7 +61,7 @@ module GinCors {
     AllowOriginsWrite() {
       exists(Field f, Write w |
         f.hasQualifiedName(packagePath(), "Config", "AllowOrigins") and
-        w.writesField(base, f, this) and
+        w.writesFieldPreUpdate(base, f, this) and
         this.asExpr() instanceof SliceLit
       )
     }
@@ -95,7 +95,7 @@ module GinCors {
     AllowAllOriginsWrite() {
       exists(Field f, Write w |
         f.hasQualifiedName(packagePath(), "Config", "AllowAllOrigins") and
-        w.writesField(base, f, this) and
+        w.writesFieldPreUpdate(base, f, this) and
         this.getType() instanceof BoolType
       )
     }
@@ -109,14 +109,9 @@ module GinCors {
      * Get config variable holding header values
      */
     override GinConfig getConfig() {
-      exists(GinConfig gc |
-        (
-          gc.getV().getBaseVariable().getDefinition().(SsaExplicitDefinition).getRhs() =
-            base.asInstruction() or
-          gc.getV().getAUse() = base
-        ) and
-        result = gc
-      )
+      result.getV().getBaseVariable().getDefinition().(SsaExplicitDefinition).getRhs() =
+        base.asInstruction() or
+      result.getV().getAUse() = base
     }
   }
 
diff --git a/go/ql/lib/semmle/go/frameworks/NoSQL.qll b/go/ql/lib/semmle/go/frameworks/NoSQL.qll
index 36932149628..5fa155395fc 100644
--- a/go/ql/lib/semmle/go/frameworks/NoSQL.qll
+++ b/go/ql/lib/semmle/go/frameworks/NoSQL.qll
@@ -38,9 +38,8 @@ module NoSql {
    */
   predicate isAdditionalMongoTaintStep(DataFlow::Node pred, DataFlow::Node succ) {
     // Taint an entry if the `Value` is tainted
-    exists(Write w, DataFlow::Node base, Field f | w.writesField(base, f, pred) |
-      base = succ.(DataFlow::PostUpdateNode).getPreUpdateNode() and
-      base.getType().hasQualifiedName(package("go.mongodb.org/mongo-driver", "bson/primitive"), "E") and
+    exists(Write w, Field f | w.writesField(succ, f, pred) |
+      succ.getType().hasQualifiedName(package("go.mongodb.org/mongo-driver", "bson/primitive"), "E") and
       f.getName() = "Value"
     )
   }
diff --git a/go/ql/lib/semmle/go/frameworks/Protobuf.qll b/go/ql/lib/semmle/go/frameworks/Protobuf.qll
index 550f9917560..62443eb46af 100644
--- a/go/ql/lib/semmle/go/frameworks/Protobuf.qll
+++ b/go/ql/lib/semmle/go/frameworks/Protobuf.qll
@@ -64,11 +64,10 @@ module Protobuf {
    */
   private class MarshalStateStep extends TaintTracking::AdditionalTaintStep {
     override predicate step(DataFlow::Node pred, DataFlow::Node succ) {
-      exists(DataFlow::PostUpdateNode marshalInput, DataFlow::CallNode marshalStateCall |
+      exists(DataFlow::Node marshalInput, DataFlow::CallNode marshalStateCall |
         marshalStateCall = marshalStateMethod().getACall() and
         // pred -> marshalInput.Message
-        any(DataFlow::Write w)
-            .writesField(marshalInput.getPreUpdateNode(), inputMessageField(), pred) and
+        any(DataFlow::Write w).writesField(marshalInput, inputMessageField(), pred) and
         // marshalInput -> marshalStateCall
         marshalStateCall.getArgument(0) = globalValueNumber(marshalInput).getANode() and
         // marshalStateCall -> succ
@@ -142,10 +141,10 @@ module Protobuf {
   private class WriteMessageFieldStep extends TaintTracking::AdditionalTaintStep {
     override predicate step(DataFlow::Node pred, DataFlow::Node succ) {
       [succ.getType(), succ.getType().getPointerType()] instanceof MessageType and
-      exists(DataFlow::ReadNode base |
-        succ.(DataFlow::PostUpdateNode).getPreUpdateNode() = getUnderlyingNode(base)
+      exists(DataFlow::Write w, DataFlow::ReadNode base |
+        w.writesElementPreUpdate(base, _, pred) or w.writesFieldPreUpdate(base, _, pred)
       |
-        any(DataFlow::Write w).writesComponent(base, pred)
+        succ.(DataFlow::PostUpdateNode).getPreUpdateNode() = getUnderlyingNode(base)
       )
     }
   }
diff --git a/go/ql/lib/semmle/go/frameworks/RsCors.qll b/go/ql/lib/semmle/go/frameworks/RsCors.qll
index b9cee2aa459..52b4a7fe6d0 100644
--- a/go/ql/lib/semmle/go/frameworks/RsCors.qll
+++ b/go/ql/lib/semmle/go/frameworks/RsCors.qll
@@ -54,7 +54,7 @@ module RsCors {
     AllowCredentialsWrite() {
       exists(Field f, Write w |
         f.hasQualifiedName(packagePath(), "Options", "AllowCredentials") and
-        w.writesField(base, f, this) and
+        w.writesFieldPreUpdate(base, f, this) and
         this.getType() instanceof BoolType
       )
     }
@@ -82,7 +82,7 @@ module RsCors {
     AllowOriginsWrite() {
       exists(Field f, Write w |
         f.hasQualifiedName(packagePath(), "Options", "AllowedOrigins") and
-        w.writesField(base, f, this) and
+        w.writesFieldPreUpdate(base, f, this) and
         this.asExpr() instanceof SliceLit
       )
     }
@@ -113,7 +113,7 @@ module RsCors {
     AllowAllOriginsWrite() {
       exists(Field f, Write w |
         f.hasQualifiedName(packagePath(), "Options", "AllowAllOrigins") and
-        w.writesField(base, f, this) and
+        w.writesFieldPreUpdate(base, f, this) and
         this.getType() instanceof BoolType
       )
     }
diff --git a/go/ql/lib/semmle/go/frameworks/stdlib/NetHttp.qll b/go/ql/lib/semmle/go/frameworks/stdlib/NetHttp.qll
index 9a917f05ff5..88c9605502f 100644
--- a/go/ql/lib/semmle/go/frameworks/stdlib/NetHttp.qll
+++ b/go/ql/lib/semmle/go/frameworks/stdlib/NetHttp.qll
@@ -52,7 +52,7 @@ module NetHttp {
 
     MapWrite() {
       this.getType().hasQualifiedName("net/http", "Header") and
-      any(Write write).writesElement(this, index, rhs)
+      any(Write write).writesElementPreUpdate(this, index, rhs)
     }
 
     override DataFlow::Node getName() { result = index }
diff --git a/go/ql/lib/semmle/go/security/AllocationSizeOverflow.qll b/go/ql/lib/semmle/go/security/AllocationSizeOverflow.qll
index 9531e279812..079ab35ee36 100644
--- a/go/ql/lib/semmle/go/security/AllocationSizeOverflow.qll
+++ b/go/ql/lib/semmle/go/security/AllocationSizeOverflow.qll
@@ -56,6 +56,17 @@ module AllocationSizeOverflow {
         succ = c
       )
     }
+
+    predicate observeDiffInformedIncrementalMode() { any() }
+
+    Location getASelectedSinkLocation(DataFlow::Node sink) {
+      result = sink.getLocation()
+      or
+      exists(DataFlow::Node allocsz |
+        isSinkWithAllocationSize(sink, allocsz) and
+        result = allocsz.getLocation()
+      )
+    }
   }
 
   /** Tracks taint flow to find allocation-size overflows. */
diff --git a/go/ql/lib/semmle/go/security/AllocationSizeOverflowCustomizations.qll b/go/ql/lib/semmle/go/security/AllocationSizeOverflowCustomizations.qll
index 60841b048f4..3eced801f20 100644
--- a/go/ql/lib/semmle/go/security/AllocationSizeOverflowCustomizations.qll
+++ b/go/ql/lib/semmle/go/security/AllocationSizeOverflowCustomizations.qll
@@ -32,7 +32,10 @@ module AllocationSizeOverflow {
   /**
    * A data-flow node that is an operand to an operation that may overflow.
    */
-  abstract class OverflowProneOperand extends DataFlow::Node { }
+  abstract class OverflowProneOperand extends DataFlow::Node {
+    /** Gets the operation that may overflow that `this` is an operand of. */
+    abstract DataFlow::Node getOverflowProneOperation();
+  }
 
   /**
    * A data-flow node that represents the size argument of an allocation, such as the `n` in
@@ -91,8 +94,7 @@ module AllocationSizeOverflow {
     AllocationSize allocsz;
 
     DefaultSink() {
-      this instanceof OverflowProneOperand and
-      localStep*(this, allocsz) and
+      localStep*(this.(OverflowProneOperand).getOverflowProneOperation(), allocsz) and
       not allocsz instanceof AllocationSizeCheckBarrier
     }
 
@@ -134,15 +136,18 @@ module AllocationSizeOverflow {
 
   /** An operand of an arithmetic expression that could cause overflow. */
   private class DefaultOverflowProneOperand extends OverflowProneOperand {
+    OperatorExpr parent;
+
     DefaultOverflowProneOperand() {
-      exists(OperatorExpr parent | isOverflowProne(parent) |
-        this.asExpr() = parent.getAnOperand() and
-        // only consider outermost operands to avoid double reporting
-        not exists(OperatorExpr grandparent | parent = grandparent.getAnOperand().stripParens() |
-          isOverflowProne(grandparent)
-        )
+      isOverflowProne(parent) and
+      this.asExpr() = parent.getAnOperand() and
+      // only consider outermost operands to avoid double reporting
+      not exists(OperatorExpr grandparent | parent = grandparent.getAnOperand().stripParens() |
+        isOverflowProne(grandparent)
       )
     }
+
+    override DataFlow::Node getOverflowProneOperation() { result.asExpr() = parent }
   }
 
   /**
diff --git a/go/ql/lib/semmle/go/security/CleartextLogging.qll b/go/ql/lib/semmle/go/security/CleartextLogging.qll
index 5218d03d908..5254b3e3a29 100644
--- a/go/ql/lib/semmle/go/security/CleartextLogging.qll
+++ b/go/ql/lib/semmle/go/security/CleartextLogging.qll
@@ -35,9 +35,7 @@ module CleartextLogging {
 
     predicate isAdditionalFlowStep(DataFlow::Node src, DataFlow::Node trg) {
       // A taint propagating data-flow edge through structs: a tainted write taints the entire struct.
-      exists(Write write |
-        write.writesField(trg.(DataFlow::PostUpdateNode).getPreUpdateNode(), _, src)
-      )
+      exists(Write write | write.writesField(trg, _, src))
       or
       // taint steps that do not include flow through fields. Field reads would produce FPs due to
       // the additional taint step above that taints whole structs from individual field writes.
diff --git a/go/ql/lib/semmle/go/security/CleartextLoggingCustomizations.qll b/go/ql/lib/semmle/go/security/CleartextLoggingCustomizations.qll
index 6c95686cb8c..4abc9021268 100644
--- a/go/ql/lib/semmle/go/security/CleartextLoggingCustomizations.qll
+++ b/go/ql/lib/semmle/go/security/CleartextLoggingCustomizations.qll
@@ -55,6 +55,8 @@ module CleartextLogging {
       |
         this.asExpr().(Ident).getName() = name
         or
+        this.(DataFlow::SsaNode).getSourceVariable().getName() = name
+        or
         this.(DataFlow::FieldReadNode).getFieldName() = name
         or
         this.(DataFlow::CallNode).getCalleeName() = name
@@ -143,7 +145,7 @@ module CleartextLogging {
       not this instanceof NonCleartextPassword and
       name.regexpMatch(maybePassword()) and
       (
-        this.asExpr().(Ident).getName() = name
+        this.(DataFlow::SsaNode).getSourceVariable().getName() = name
         or
         exists(DataFlow::FieldReadNode fn |
           fn = this and
diff --git a/go/ql/lib/semmle/go/security/CommandInjection.qll b/go/ql/lib/semmle/go/security/CommandInjection.qll
index 7dc6f3991fc..face45358a9 100644
--- a/go/ql/lib/semmle/go/security/CommandInjection.qll
+++ b/go/ql/lib/semmle/go/security/CommandInjection.qll
@@ -24,6 +24,8 @@ module CommandInjection {
     }
 
     predicate isBarrier(DataFlow::Node node) { node instanceof Sanitizer }
+
+    predicate observeDiffInformedIncrementalMode() { any() }
   }
 
   /**
@@ -80,6 +82,30 @@ module CommandInjection {
       node instanceof Sanitizer or
       node = any(ArgumentArrayWithDoubleDash array).getASanitizedElement()
     }
+
+    predicate observeDiffInformedIncrementalMode() { any() }
+
+    // Hack: with use-use flow, we might have x (use at line 1) -> x (use at line 2),
+    // x (use at line 1) -> array at line 1 and x (use at line 2) -> array at line 2,
+    // in the context
+    //
+    // array1 := {"--", x}
+    // array2 := {x, "--"}
+    //
+    // We want to taint array2 but not array1, which suggests excluding the edge x (use 1) -> array1
+    // However isSanitizer only allows us to remove nodes (isSanitizerIn/Out permit removing all outgoing
+    // or incoming edges); we can't remove an individual edge, so instead we supply extra edges connecting
+    // the definition with the next use.
+    predicate isAdditionalFlowStep(DataFlow::Node pred, DataFlow::Node succ) {
+      exists(
+        ArgumentArrayWithDoubleDash array, DataFlow::InstructionNode sanitized,
+        DataFlow::SsaNode defn
+      |
+        sanitized = array.getASanitizedElement() and sanitized = defn.getAUse()
+      |
+        pred = defn and succ = sanitized.getASuccessor()
+      )
+    }
   }
 
   /**
diff --git a/go/ql/lib/semmle/go/security/ExternalAPIs.qll b/go/ql/lib/semmle/go/security/ExternalAPIs.qll
index 4a561c17136..f85f939258f 100644
--- a/go/ql/lib/semmle/go/security/ExternalAPIs.qll
+++ b/go/ql/lib/semmle/go/security/ExternalAPIs.qll
@@ -186,6 +186,8 @@ private module UntrustedDataConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof ExternalApiDataNode }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
 }
 
 /**
diff --git a/go/ql/lib/semmle/go/security/HardcodedCredentials.qll b/go/ql/lib/semmle/go/security/HardcodedCredentials.qll
index 0be50fc2306..877a2b4570e 100644
--- a/go/ql/lib/semmle/go/security/HardcodedCredentials.qll
+++ b/go/ql/lib/semmle/go/security/HardcodedCredentials.qll
@@ -30,6 +30,8 @@ module HardcodedCredentials {
     predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
 
     predicate isBarrier(DataFlow::Node node) { node instanceof Sanitizer }
+
+    predicate observeDiffInformedIncrementalMode() { any() }
   }
 
   /** Tracks taint flow for reasoning about hardcoded credentials. */
diff --git a/go/ql/lib/semmle/go/security/IncorrectIntegerConversionLib.qll b/go/ql/lib/semmle/go/security/IncorrectIntegerConversionLib.qll
index 9125ab6e400..161916cd11e 100644
--- a/go/ql/lib/semmle/go/security/IncorrectIntegerConversionLib.qll
+++ b/go/ql/lib/semmle/go/security/IncorrectIntegerConversionLib.qll
@@ -290,13 +290,17 @@ private predicate integerTypeBound(IntegerType it, int bitSize, int architecture
  * the type assertion succeeded. If it is not checked then there will be a
  * run-time panic if the type assertion fails, so we can assume it succeeded.
  */
-class TypeAssertionCheck extends DataFlow::ExprNode, FlowStateTransformer {
+class TypeAssertionCheck extends DataFlow::InstructionNode, FlowStateTransformer {
   IntegerType it;
 
   TypeAssertionCheck() {
-    exists(TypeAssertExpr tae |
-      this = DataFlow::exprNode(tae.getExpr()) and
-      it = tae.getTypeExpr().getType().getUnderlyingType()
+    exists(IR::Instruction evalAssert, TypeAssertExpr assert |
+      it = assert.getTypeExpr().getType().getUnderlyingType() and
+      evalAssert = IR::evalExprInstruction(assert)
+    |
+      if exists(IR::extractTupleElement(evalAssert, _))
+      then this.asInstruction() = IR::extractTupleElement(evalAssert, 0)
+      else this.asInstruction() = evalAssert
     )
   }
 
@@ -440,6 +444,12 @@ private module ConversionWithoutBoundsCheckConfig implements DataFlow::StateConf
     state2 = node2.(FlowStateTransformer).transform(state1) and
     DataFlow::simpleLocalFlowStep(node1, node2, _)
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
+
+  Location getASelectedSinkLocation(DataFlow::Node sink) {
+    result = sink.getASuccessor().getLocation()
+  }
 }
 
 /**
diff --git a/go/ql/lib/semmle/go/security/InsecureRandomness.qll b/go/ql/lib/semmle/go/security/InsecureRandomness.qll
index 83746f7b96e..4dac659eabf 100644
--- a/go/ql/lib/semmle/go/security/InsecureRandomness.qll
+++ b/go/ql/lib/semmle/go/security/InsecureRandomness.qll
@@ -39,6 +39,10 @@ module InsecureRandomness {
         n2.getType() instanceof IntegerType
       )
     }
+
+    predicate observeDiffInformedIncrementalMode() {
+      none() // Can't have accurate sink location override because of secondary use of `flowPath` in select.
+    }
   }
 
   /**
diff --git a/go/ql/lib/semmle/go/security/LogInjectionCustomizations.qll b/go/ql/lib/semmle/go/security/LogInjectionCustomizations.qll
index 565cf29a450..9160c204df1 100644
--- a/go/ql/lib/semmle/go/security/LogInjectionCustomizations.qll
+++ b/go/ql/lib/semmle/go/security/LogInjectionCustomizations.qll
@@ -35,7 +35,15 @@ module LogInjection {
 
   /** An argument to a logging mechanism. */
   class LoggerSink extends Sink {
-    LoggerSink() { this = any(LoggerCall log).getAValueFormattedMessageComponent() }
+    LoggerSink() {
+      exists(LoggerCall call |
+        this = call.getAValueFormattedMessageComponent() and
+        // exclude arguments to `call` which have a safe format argument, which
+        // aren't caught by SafeFormatArgumentSanitizer as that sanitizes the
+        // result of the call.
+        not safeFormatArgument(this, call)
+      )
+    }
   }
 
   /**
@@ -47,6 +55,22 @@ module LogInjection {
     ReplaceSanitizer() { this.getReplacedString() = ["\r", "\n"] }
   }
 
+  /**
+   * Holds if `arg` is an argument to `call` that is formatted using the `%q`
+   * directive. This formatting directive replaces newline characters with
+   * escape sequences, so `arg` would not be a sink for log injection.
+   */
+  private predicate safeFormatArgument(
+    DataFlow::Node arg, StringOps::Formatting::StringFormatCall call
+  ) {
+    exists(string safeDirective |
+      // Mark "%q" formats as safe, but not "%#q", which would preserve newline characters.
+      safeDirective.regexpMatch("%[^%#]*q")
+    |
+      arg = call.getOperand(_, safeDirective)
+    )
+  }
+
   /**
    * An argument that is formatted using the `%q` directive, considered as a sanitizer
    * for log injection.
@@ -55,10 +79,8 @@ module LogInjection {
    */
   private class SafeFormatArgumentSanitizer extends Sanitizer {
     SafeFormatArgumentSanitizer() {
-      exists(StringOps::Formatting::StringFormatCall call, string safeDirective |
-        this = call.getOperand(_, safeDirective) and
-        // Mark "%q" formats as safe, but not "%#q", which would preserve newline characters.
-        safeDirective.regexpMatch("%[^%#]*q")
+      exists(StringOps::Formatting::StringFormatCall call | safeFormatArgument(_, call) |
+        this = call.getAResult()
       )
     }
   }
diff --git a/go/ql/lib/semmle/go/security/OpenUrlRedirect.qll b/go/ql/lib/semmle/go/security/OpenUrlRedirect.qll
index 1d2d7a1c60b..eb651c3b69f 100644
--- a/go/ql/lib/semmle/go/security/OpenUrlRedirect.qll
+++ b/go/ql/lib/semmle/go/security/OpenUrlRedirect.qll
@@ -33,8 +33,8 @@ module OpenUrlRedirect {
       any(AdditionalStep s).hasTaintStep(pred, succ)
       or
       // propagate to a URL when its host is assigned to
-      exists(Write w, Field f, SsaWithFields v | f.hasQualifiedName("net/url", "URL", "Host") |
-        w.writesField(v.getAUse(), f, pred) and succ = v.getAUse()
+      exists(Write w, Field f | f.hasQualifiedName("net/url", "URL", "Host") |
+        w.writesField(succ, f, pred)
       )
       or
       // propagate out of most URL fields, but not `ForceQuery` and `Scheme`
@@ -48,8 +48,10 @@ module OpenUrlRedirect {
 
     predicate isBarrierOut(DataFlow::Node node) {
       // block propagation of this unsafe value when its host is overwritten
-      exists(Write w, Field f | f.hasQualifiedName("net/url", "URL", "Host") |
-        w.writesField(node.getASuccessor(), f, _)
+      exists(Write w, Field f, DataFlow::Node base |
+        f.hasQualifiedName("net/url", "URL", "Host") and
+        w.writesField(base, f, _) and
+        base.(DataFlow::PostUpdateNode).getPreUpdateNode() = node
       )
       or
       hostnameSanitizingPrefixEdge(node, _)
diff --git a/go/ql/lib/semmle/go/security/OpenUrlRedirectCustomizations.qll b/go/ql/lib/semmle/go/security/OpenUrlRedirectCustomizations.qll
index 870edeee962..248276ba396 100644
--- a/go/ql/lib/semmle/go/security/OpenUrlRedirectCustomizations.qll
+++ b/go/ql/lib/semmle/go/security/OpenUrlRedirectCustomizations.qll
@@ -6,7 +6,7 @@
 
 import go
 import UrlConcatenation
-import SafeUrlFlowCustomizations
+private import SafeUrlFlowCustomizations
 import semmle.go.dataflow.barrierguardutil.RedirectCheckBarrierGuard
 import semmle.go.dataflow.barrierguardutil.RegexpCheck
 import semmle.go.dataflow.barrierguardutil.UrlCheck
@@ -75,25 +75,18 @@ module OpenUrlRedirect {
     }
   }
 
-  bindingset[var, w]
-  pragma[inline_late]
-  private predicate useIsDominated(SsaWithFields var, Write w, DataFlow::ReadNode sanitizedRead) {
-    w.dominatesNode(sanitizedRead.asInstruction()) and
-    sanitizedRead = var.getAUse()
-  }
-
   /**
-   * An access to a variable that is preceded by an assignment to its `Path` field.
+   * An assignment of a safe value to the field `Path`, considered as a barrier for sanitizing
+   * untrusted URLs.
    *
    * This is overapproximate; this will currently remove flow through all `Url.Path` assignments
    * which contain a substring that could sanitize data.
    */
-  class PathAssignmentBarrier extends Barrier, Read {
+  class PathAssignmentBarrier extends Barrier {
     PathAssignmentBarrier() {
-      exists(Write w, SsaWithFields var |
-        hasHostnameSanitizingSubstring(w.getRhs()) and
-        w.writesField(var.getAUse(), any(Field f | f.getName() = "Path"), _) and
-        useIsDominated(var, w, this)
+      exists(Write w, DataFlow::Node rhs |
+        hasHostnameSanitizingSubstring(rhs) and
+        w.writesFieldPreUpdate(this, any(Field f | f.getName() = "Path"), rhs)
       )
     }
   }
@@ -121,21 +114,6 @@ module OpenUrlRedirect {
 /** A sink for an open redirect, considered as a sink for safe URL flow. */
 private class SafeUrlSink extends SafeUrlFlow::Sink instanceof OpenUrlRedirect::Sink { }
 
-/**
- * A read of a field considered unsafe to redirect to, considered as a sanitizer for a safe
- * URL.
- */
-private class UnsafeFieldReadSanitizer extends SafeUrlFlow::SanitizerEdge {
-  UnsafeFieldReadSanitizer() {
-    exists(DataFlow::FieldReadNode frn, string name |
-      name = ["User", "RawQuery", "Fragment"] and
-      frn.getField().hasQualifiedName("net/url", "URL")
-    |
-      this = frn.getBase()
-    )
-  }
-}
-
 /**
  * Reinstate the usual field propagation rules for fields, which the OpenURLRedirect
  * query usually excludes, for fields of `Params` other than `Params.Fixed`.
diff --git a/go/ql/lib/semmle/go/security/ReflectedXss.qll b/go/ql/lib/semmle/go/security/ReflectedXss.qll
index 1068c6fae3d..35501269cc1 100644
--- a/go/ql/lib/semmle/go/security/ReflectedXss.qll
+++ b/go/ql/lib/semmle/go/security/ReflectedXss.qll
@@ -22,6 +22,14 @@ module ReflectedXss {
     predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
 
     predicate isBarrier(DataFlow::Node node) { node instanceof Sanitizer }
+
+    predicate observeDiffInformedIncrementalMode() { any() }
+
+    Location getASelectedSinkLocation(DataFlow::Node sink) {
+      result = sink.getLocation()
+      or
+      result = sink.(SharedXss::Sink).getAssociatedLoc().getLocation()
+    }
   }
 
   /** Tracks taint flow from untrusted data to XSS attack vectors. */
diff --git a/go/ql/lib/semmle/go/security/RequestForgery.qll b/go/ql/lib/semmle/go/security/RequestForgery.qll
index bdf26a1f18f..03b6f9ac0b0 100644
--- a/go/ql/lib/semmle/go/security/RequestForgery.qll
+++ b/go/ql/lib/semmle/go/security/RequestForgery.qll
@@ -27,10 +27,18 @@ module RequestForgery {
 
     predicate isAdditionalFlowStep(DataFlow::Node pred, DataFlow::Node succ) {
       // propagate to a URL when its host is assigned to
-      exists(Write w, Field f, SsaWithFields v | f.hasQualifiedName("net/url", "URL", "Host") |
-        w.writesField(v.getAUse(), f, pred) and succ = v.getAUse()
+      exists(Write w, Field f | f.hasQualifiedName("net/url", "URL", "Host") |
+        w.writesField(succ, f, pred)
       )
     }
+
+    predicate observeDiffInformedIncrementalMode() { any() }
+
+    Location getASelectedSinkLocation(DataFlow::Node sink) {
+      result = sink.getLocation()
+      or
+      result = sink.(Sink).getARequest().getLocation()
+    }
   }
 
   /** Tracks taint flow from untrusted data to request forgery attack vectors. */
diff --git a/go/ql/lib/semmle/go/security/RequestForgeryCustomizations.qll b/go/ql/lib/semmle/go/security/RequestForgeryCustomizations.qll
index 2449ffe488c..82f9df4b506 100644
--- a/go/ql/lib/semmle/go/security/RequestForgeryCustomizations.qll
+++ b/go/ql/lib/semmle/go/security/RequestForgeryCustomizations.qll
@@ -4,11 +4,12 @@
 
 import go
 import UrlConcatenation
-import SafeUrlFlowCustomizations
+private import SafeUrlFlowCustomizations
 import semmle.go.dataflow.barrierguardutil.RedirectCheckBarrierGuard
 import semmle.go.dataflow.barrierguardutil.RegexpCheck
 import semmle.go.dataflow.barrierguardutil.UrlCheck
 import semmle.go.dataflow.ExternalFlow
+private import semmle.go.security.Sanitizers
 
 /** Provides classes and predicates for the request forgery query. */
 module RequestForgery {
@@ -114,22 +115,12 @@ module RequestForgery {
    * considered a barrier guard for `url`.
    */
   class UrlCheckAsBarrierGuard extends UrlCheckBarrier, Sanitizer { }
+
+  /**
+   * A simple-typed node, considered a sanitizer for request forgery.
+   */
+  private class DefaultSanitizer extends Sanitizer instanceof SimpleTypeSanitizer { }
 }
 
 /** A sink for request forgery, considered as a sink for safe URL flow. */
 private class SafeUrlSink extends SafeUrlFlow::Sink instanceof RequestForgery::Sink { }
-
-/**
- * A read of a field considered unsafe for request forgery, considered as a sanitizer for a safe
- * URL.
- */
-private class UnsafeFieldReadSanitizer extends SafeUrlFlow::SanitizerEdge {
-  UnsafeFieldReadSanitizer() {
-    exists(DataFlow::FieldReadNode frn, string name |
-      (name = "RawQuery" or name = "Fragment" or name = "User") and
-      frn.getField().hasQualifiedName("net/url", "URL")
-    |
-      this = frn.getBase()
-    )
-  }
-}
diff --git a/go/ql/lib/semmle/go/security/SafeUrlFlow.qll b/go/ql/lib/semmle/go/security/SafeUrlFlow.qll
index d74e2156a60..7144614c305 100644
--- a/go/ql/lib/semmle/go/security/SafeUrlFlow.qll
+++ b/go/ql/lib/semmle/go/security/SafeUrlFlow.qll
@@ -22,20 +22,29 @@ module SafeUrlFlow {
     predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
 
     predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
-      // propagate to a URL when its host is assigned to
-      exists(Write w, Field f, SsaWithFields v | f.hasQualifiedName("net/url", "URL", "Host") |
-        w.writesField(v.getAUse(), f, node1) and node2 = v.getAUse()
+      // propagate taint to the post-update node of a URL when its host is
+      // assigned to
+      exists(Write w, Field f | f.hasQualifiedName("net/url", "URL", "Host") |
+        w.writesField(node2, f, node1)
       )
     }
 
     predicate isBarrierOut(DataFlow::Node node) {
       // block propagation of this safe value when its host is overwritten
       exists(Write w, Field f | f.hasQualifiedName("net/url", "URL", "Host") |
-        w.writesField(node.getASuccessor(), f, _)
+        // We sanitize the pre-update node to block flow from previous value.
+        // This fits in with the additional flow step above propagating taint
+        // from the value written to the Host field to the post-update node of
+        // the URL.
+        w.writesFieldPreUpdate(node, f, _)
       )
       or
       node instanceof SanitizerEdge
     }
+
+    predicate observeDiffInformedIncrementalMode() {
+      none() // only used as secondary configuration
+    }
   }
 
   /** Tracks taint flow for reasoning about safe URLs. */
diff --git a/go/ql/lib/semmle/go/security/SafeUrlFlowCustomizations.qll b/go/ql/lib/semmle/go/security/SafeUrlFlowCustomizations.qll
index 5f0572db11e..8acd88fb26d 100644
--- a/go/ql/lib/semmle/go/security/SafeUrlFlowCustomizations.qll
+++ b/go/ql/lib/semmle/go/security/SafeUrlFlowCustomizations.qll
@@ -40,4 +40,19 @@ module SafeUrlFlow {
   private class StringSlicingEdge extends SanitizerEdge {
     StringSlicingEdge() { this = any(DataFlow::SliceNode sn) }
   }
+
+  /**
+   * A read of a field considered unsafe to redirect to, considered as a sanitizer for a safe
+   * URL.
+   */
+  private class UnsafeFieldReadSanitizer extends SanitizerEdge {
+    UnsafeFieldReadSanitizer() {
+      exists(DataFlow::FieldReadNode frn, string name |
+        name = ["Fragment", "RawQuery", "User"] and
+        frn.getField().hasQualifiedName("net/url", "URL", name)
+      |
+        this = frn.getBase()
+      )
+    }
+  }
 }
diff --git a/go/ql/lib/semmle/go/security/Sanitizers.qll b/go/ql/lib/semmle/go/security/Sanitizers.qll
new file mode 100644
index 00000000000..4391e12c25a
--- /dev/null
+++ b/go/ql/lib/semmle/go/security/Sanitizers.qll
@@ -0,0 +1,16 @@
+/**
+ * Classes to represent sanitizers commonly used in dataflow and taint tracking
+ * configurations.
+ */
+
+import go
+
+/**
+ * A node whose type is a simple type unlikely to carry taint, such as a
+ * numeric or boolean type.
+ */
+class SimpleTypeSanitizer extends DataFlow::Node {
+  SimpleTypeSanitizer() {
+    this.getType() instanceof NumericType or this.getType() instanceof BoolType
+  }
+}
diff --git a/go/ql/lib/semmle/go/security/SqlInjectionCustomizations.qll b/go/ql/lib/semmle/go/security/SqlInjectionCustomizations.qll
index 0b2f96a9283..f26168ad1d7 100644
--- a/go/ql/lib/semmle/go/security/SqlInjectionCustomizations.qll
+++ b/go/ql/lib/semmle/go/security/SqlInjectionCustomizations.qll
@@ -4,6 +4,7 @@
  */
 
 import go
+private import semmle.go.security.Sanitizers
 
 /**
  * Provides extension points for customizing the taint tracking configuration for reasoning about
@@ -39,12 +40,11 @@ module SqlInjection {
   /** A NoSql query, considered as a taint sink for SQL injection. */
   class NoSqlQueryAsSink extends Sink instanceof NoSql::Query { }
 
+  /** DEPRECATED: Use `SimpleTypeSanitizer` from semmle.go.security.Sanitizers instead. */
+  deprecated class NumericOrBooleanSanitizer = SimpleTypeSanitizer;
+
   /**
    * A numeric- or boolean-typed node, considered a sanitizer for sql injection.
    */
-  class NumericOrBooleanSanitizer extends Sanitizer {
-    NumericOrBooleanSanitizer() {
-      this.getType() instanceof NumericType or this.getType() instanceof BoolType
-    }
-  }
+  private class DefaultSanitizer extends Sanitizer instanceof SimpleTypeSanitizer { }
 }
diff --git a/go/ql/lib/semmle/go/security/TaintedPathCustomizations.qll b/go/ql/lib/semmle/go/security/TaintedPathCustomizations.qll
index 39db60de483..747f2ab0d08 100644
--- a/go/ql/lib/semmle/go/security/TaintedPathCustomizations.qll
+++ b/go/ql/lib/semmle/go/security/TaintedPathCustomizations.qll
@@ -87,7 +87,7 @@ module TaintedPath {
       exists(DataFlow::CallNode cleanCall, StringOps::Concatenation concatNode |
         cleanCall = any(Function f | f.hasQualifiedName("path/filepath", "Clean")).getACall() and
         concatNode = cleanCall.getArgument(0) and
-        concatNode.getOperand(0).asExpr().(StringLit).getValue() = "/" and
+        concatNode.getOperand(0).getStringValue().prefix(1) = ["/", "\\"] and
         this = cleanCall.getResult()
       )
     }
diff --git a/go/ql/lib/upgrades/b3da71c3ac204b557c86e9d9c26012360bdbdccb/go.dbscheme b/go/ql/lib/upgrades/b3da71c3ac204b557c86e9d9c26012360bdbdccb/go.dbscheme
new file mode 100644
index 00000000000..b1341734d68
--- /dev/null
+++ b/go/ql/lib/upgrades/b3da71c3ac204b557c86e9d9c26012360bdbdccb/go.dbscheme
@@ -0,0 +1,563 @@
+/** Auto-generated dbscheme; do not edit. Run `make gen` in directory `go/` to regenerate. */
+
+
+/** Duplicate code **/
+
+duplicateCode(
+  unique int id : @duplication,
+  varchar(900) relativePath : string ref,
+  int equivClass : int ref);
+
+similarCode(
+  unique int id : @similarity,
+  varchar(900) relativePath : string ref,
+  int equivClass : int ref);
+
+@duplication_or_similarity = @duplication | @similarity;
+
+tokens(
+  int id : @duplication_or_similarity ref,
+  int offset : int ref,
+  int beginLine : int ref,
+  int beginColumn : int ref,
+  int endLine : int ref,
+  int endColumn : int ref);
+
+/** External data **/
+
+externalData(
+  int id : @externalDataElement,
+  varchar(900) path : string ref,
+  int column: int ref,
+  varchar(900) value : string ref
+);
+
+snapshotDate(unique date snapshotDate : date ref);
+
+sourceLocationPrefix(varchar(900) prefix : string ref);
+
+/** Overlay support **/
+
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+overlayChangedFiles(
+  string path: string ref
+);
+
+
+/*
+ * XML Files
+ */
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+compilations(unique int id: @compilation, string cwd: string ref);
+
+#keyset[id, num]
+compilation_args(int id: @compilation ref, int num: int ref, string arg: string ref);
+
+#keyset[id, num, kind]
+compilation_time(int id: @compilation ref, int num: int ref, int kind: int ref, float secs: float ref);
+
+diagnostic_for(unique int diagnostic: @diagnostic ref, int compilation: @compilation ref, int file_number: int ref, int file_number_diagnostic_number: int ref);
+
+compilation_finished(unique int id: @compilation ref, float cpu_seconds: float ref, float elapsed_seconds: float ref);
+
+#keyset[id, num]
+compilation_compiling_files(int id: @compilation ref, int num: int ref, int file: @file ref);
+
+diagnostics(unique int id: @diagnostic, int severity: int ref, string error_tag: string ref, string error_message: string ref,
+            string full_error_message: string ref, int location: @location ref);
+
+locations_default(unique int id: @location_default, int file: @file ref, int beginLine: int ref, int beginColumn: int ref,
+                  int endLine: int ref, int endColumn: int ref);
+
+numlines(int element_id: @sourceline ref, int num_lines: int ref, int num_code: int ref, int num_comment: int ref);
+
+files(unique int id: @file, string name: string ref);
+
+folders(unique int id: @folder, string name: string ref);
+
+containerparent(int parent: @container ref, unique int child: @container ref);
+
+has_location(unique int locatable: @locatable ref, int location: @location ref);
+
+#keyset[parent, idx]
+comment_groups(unique int id: @comment_group, int parent: @file ref, int idx: int ref);
+
+comments(unique int id: @comment, int kind: int ref, int parent: @comment_group ref, int idx: int ref, string text: string ref);
+
+doc_comments(unique int node: @documentable ref, int comment: @comment_group ref);
+
+#keyset[parent, idx]
+exprs(unique int id: @expr, int kind: int ref, int parent: @exprparent ref, int idx: int ref);
+
+literals(unique int expr: @expr ref, string value: string ref, string raw: string ref);
+
+constvalues(unique int expr: @expr ref, string value: string ref, string exact: string ref);
+
+fields(unique int id: @field, int parent: @fieldparent ref, int idx: int ref);
+
+typeparamdecls(unique int id: @typeparamdecl, int parent: @typeparamdeclparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+stmts(unique int id: @stmt, int kind: int ref, int parent: @stmtparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+decls(unique int id: @decl, int kind: int ref, int parent: @declparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+specs(unique int id: @spec, int kind: int ref, int parent: @gendecl ref, int idx: int ref);
+
+scopes(unique int id: @scope, int kind: int ref);
+
+scopenesting(unique int inner: @scope ref, int outer: @scope ref);
+
+scopenodes(unique int node: @scopenode ref, int scope: @localscope ref);
+
+objects(unique int id: @object, int kind: int ref, string name: string ref);
+
+objectscopes(unique int object: @object ref, int scope: @scope ref);
+
+objecttypes(unique int object: @object ref, int tp: @type ref);
+
+methodreceivers(unique int method: @object ref, int receiver: @object ref);
+
+fieldstructs(unique int field: @object ref, int struct: @structtype ref);
+
+methodhosts(int method: @object ref, int host: @definedtype ref);
+
+defs(int ident: @ident ref, int object: @object ref);
+
+uses(int ident: @ident ref, int object: @object ref);
+
+types(unique int id: @type, int kind: int ref);
+
+type_of(unique int expr: @expr ref, int tp: @type ref);
+
+typename(unique int tp: @type ref, string name: string ref);
+
+key_type(unique int map: @maptype ref, int tp: @type ref);
+
+element_type(unique int container: @containertype ref, int tp: @type ref);
+
+base_type(unique int ptr: @pointertype ref, int tp: @type ref);
+
+underlying_type(unique int defined: @definedtype ref, int tp: @type ref);
+
+#keyset[parent, index]
+component_types(int parent: @compositetype ref, int index: int ref, string name: string ref, int tp: @type ref);
+
+#keyset[parent, index]
+struct_tags(int parent: @structtype ref, int index: int ref, string tag: string ref);
+
+#keyset[interface, index]
+interface_private_method_ids(int interface: @interfacetype ref, int index: int ref, string id: string ref);
+
+array_length(unique int tp: @arraytype ref, string len: string ref);
+
+type_objects(unique int tp: @type ref, int object: @object ref);
+
+packages(unique int id: @package, string name: string ref, string path: string ref, int scope: @packagescope ref);
+
+#keyset[parent, idx]
+modexprs(unique int id: @modexpr, int kind: int ref, int parent: @modexprparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+modtokens(string token: string ref, int parent: @modexpr ref, int idx: int ref);
+
+#keyset[package, idx]
+errors(unique int id: @error, int kind: int ref, string msg: string ref, string rawpos: string ref,
+       string file: string ref, int line: int ref, int col: int ref, int package: @package ref, int idx: int ref);
+
+has_ellipsis(int id: @callorconversionexpr ref);
+
+variadic(int id: @signaturetype ref);
+
+#keyset[parent, idx]
+typeparam(unique int tp: @typeparamtype ref, string name: string ref, int bound: @compositetype ref,
+          int parent: @typeparamparentobject ref, int idx: int ref);
+
+@container = @file | @folder;
+
+@locatable = @xmllocatable | @node | @localscope;
+
+@node = @documentable | @exprparent | @modexprparent | @fieldparent | @stmtparent | @declparent | @typeparamdeclparent
+      | @scopenode | @comment_group | @comment;
+
+@documentable = @file | @field | @typeparamdecl | @spec | @gendecl | @funcdecl | @modexpr;
+
+@exprparent = @funcdef | @file | @expr | @field | @stmt | @decl | @typeparamdecl | @spec;
+
+@modexprparent = @file | @modexpr;
+
+@fieldparent = @decl | @structtypeexpr | @functypeexpr | @interfacetypeexpr;
+
+@stmtparent = @funcdef | @stmt | @decl;
+
+@declparent = @file | @declstmt;
+
+@typeparamdeclparent = @funcdecl | @typespec;
+
+@funcdef = @funclit | @funcdecl;
+
+@scopenode = @file | @functypeexpr | @blockstmt | @ifstmt | @caseclause | @switchstmt | @commclause | @loopstmt;
+
+@location = @location_default;
+
+@sourceline = @locatable;
+
+case @comment.kind of
+  0 = @slashslashcomment
+| 1 = @slashstarcomment;
+
+case @expr.kind of
+  0 = @badexpr
+| 1 = @ident
+| 2 = @ellipsis
+| 3 = @intlit
+| 4 = @floatlit
+| 5 = @imaglit
+| 6 = @charlit
+| 7 = @stringlit
+| 8 = @funclit
+| 9 = @compositelit
+| 10 = @parenexpr
+| 11 = @selectorexpr
+| 12 = @indexexpr
+| 13 = @genericfunctioninstantiationexpr
+| 14 = @generictypeinstantiationexpr
+| 15 = @sliceexpr
+| 16 = @typeassertexpr
+| 17 = @callorconversionexpr
+| 18 = @starexpr
+| 19 = @keyvalueexpr
+| 20 = @arraytypeexpr
+| 21 = @structtypeexpr
+| 22 = @functypeexpr
+| 23 = @interfacetypeexpr
+| 24 = @maptypeexpr
+| 25 = @typesetliteralexpr
+| 26 = @plusexpr
+| 27 = @minusexpr
+| 28 = @notexpr
+| 29 = @complementexpr
+| 30 = @derefexpr
+| 31 = @addressexpr
+| 32 = @arrowexpr
+| 33 = @lorexpr
+| 34 = @landexpr
+| 35 = @eqlexpr
+| 36 = @neqexpr
+| 37 = @lssexpr
+| 38 = @leqexpr
+| 39 = @gtrexpr
+| 40 = @geqexpr
+| 41 = @addexpr
+| 42 = @subexpr
+| 43 = @orexpr
+| 44 = @xorexpr
+| 45 = @mulexpr
+| 46 = @quoexpr
+| 47 = @remexpr
+| 48 = @shlexpr
+| 49 = @shrexpr
+| 50 = @andexpr
+| 51 = @andnotexpr
+| 52 = @sendchantypeexpr
+| 53 = @recvchantypeexpr
+| 54 = @sendrcvchantypeexpr;
+
+@basiclit = @intlit | @floatlit | @imaglit | @charlit | @stringlit;
+
+@operatorexpr = @logicalexpr | @arithmeticexpr | @bitwiseexpr | @unaryexpr | @binaryexpr;
+
+@logicalexpr = @logicalunaryexpr | @logicalbinaryexpr;
+
+@arithmeticexpr = @arithmeticunaryexpr | @arithmeticbinaryexpr;
+
+@bitwiseexpr = @bitwiseunaryexpr | @bitwisebinaryexpr;
+
+@unaryexpr = @logicalunaryexpr | @bitwiseunaryexpr | @arithmeticunaryexpr | @derefexpr | @addressexpr | @arrowexpr;
+
+@logicalunaryexpr = @notexpr;
+
+@bitwiseunaryexpr = @complementexpr;
+
+@arithmeticunaryexpr = @plusexpr | @minusexpr;
+
+@binaryexpr = @logicalbinaryexpr | @bitwisebinaryexpr | @arithmeticbinaryexpr | @comparison;
+
+@logicalbinaryexpr = @lorexpr | @landexpr;
+
+@bitwisebinaryexpr = @shiftexpr | @orexpr | @xorexpr | @andexpr | @andnotexpr;
+
+@arithmeticbinaryexpr = @addexpr | @subexpr | @mulexpr | @quoexpr | @remexpr;
+
+@shiftexpr = @shlexpr | @shrexpr;
+
+@comparison = @equalitytest | @relationalcomparison;
+
+@equalitytest = @eqlexpr | @neqexpr;
+
+@relationalcomparison = @lssexpr | @leqexpr | @gtrexpr | @geqexpr;
+
+@chantypeexpr = @sendchantypeexpr | @recvchantypeexpr | @sendrcvchantypeexpr;
+
+case @stmt.kind of
+  0 = @badstmt
+| 1 = @declstmt
+| 2 = @emptystmt
+| 3 = @labeledstmt
+| 4 = @exprstmt
+| 5 = @sendstmt
+| 6 = @incstmt
+| 7 = @decstmt
+| 8 = @gostmt
+| 9 = @deferstmt
+| 10 = @returnstmt
+| 11 = @breakstmt
+| 12 = @continuestmt
+| 13 = @gotostmt
+| 14 = @fallthroughstmt
+| 15 = @blockstmt
+| 16 = @ifstmt
+| 17 = @caseclause
+| 18 = @exprswitchstmt
+| 19 = @typeswitchstmt
+| 20 = @commclause
+| 21 = @selectstmt
+| 22 = @forstmt
+| 23 = @rangestmt
+| 24 = @assignstmt
+| 25 = @definestmt
+| 26 = @addassignstmt
+| 27 = @subassignstmt
+| 28 = @mulassignstmt
+| 29 = @quoassignstmt
+| 30 = @remassignstmt
+| 31 = @andassignstmt
+| 32 = @orassignstmt
+| 33 = @xorassignstmt
+| 34 = @shlassignstmt
+| 35 = @shrassignstmt
+| 36 = @andnotassignstmt;
+
+@incdecstmt = @incstmt | @decstmt;
+
+@assignment = @simpleassignstmt | @compoundassignstmt;
+
+@simpleassignstmt = @assignstmt | @definestmt;
+
+@compoundassignstmt = @addassignstmt | @subassignstmt | @mulassignstmt | @quoassignstmt | @remassignstmt
+                    | @andassignstmt | @orassignstmt | @xorassignstmt | @shlassignstmt | @shrassignstmt | @andnotassignstmt;
+
+@branchstmt = @breakstmt | @continuestmt | @gotostmt | @fallthroughstmt;
+
+@switchstmt = @exprswitchstmt | @typeswitchstmt;
+
+@loopstmt = @forstmt | @rangestmt;
+
+case @decl.kind of
+  0 = @baddecl
+| 1 = @importdecl
+| 2 = @constdecl
+| 3 = @typedecl
+| 4 = @vardecl
+| 5 = @funcdecl;
+
+@gendecl = @importdecl | @constdecl | @typedecl | @vardecl;
+
+case @spec.kind of
+  0 = @importspec
+| 1 = @valuespec
+| 2 = @typedefspec
+| 3 = @aliasspec;
+
+@typespec = @typedefspec | @aliasspec;
+
+case @object.kind of
+  0 = @pkgobject
+| 1 = @decltypeobject
+| 2 = @builtintypeobject
+| 3 = @declconstobject
+| 4 = @builtinconstobject
+| 5 = @declvarobject
+| 6 = @declfunctionobject
+| 7 = @builtinfunctionobject
+| 8 = @labelobject;
+
+@typeparamparentobject = @decltypeobject | @declfunctionobject;
+
+@declobject = @decltypeobject | @declconstobject | @declvarobject | @declfunctionobject;
+
+@builtinobject = @builtintypeobject | @builtinconstobject | @builtinfunctionobject;
+
+@typeobject = @decltypeobject | @builtintypeobject;
+
+@valueobject = @constobject | @varobject | @functionobject;
+
+@constobject = @declconstobject | @builtinconstobject;
+
+@varobject = @declvarobject;
+
+@functionobject = @declfunctionobject | @builtinfunctionobject;
+
+case @scope.kind of
+  0 = @universescope
+| 1 = @packagescope
+| 2 = @localscope;
+
+case @type.kind of
+  0 = @invalidtype
+| 1 = @boolexprtype
+| 2 = @inttype
+| 3 = @int8type
+| 4 = @int16type
+| 5 = @int32type
+| 6 = @int64type
+| 7 = @uinttype
+| 8 = @uint8type
+| 9 = @uint16type
+| 10 = @uint32type
+| 11 = @uint64type
+| 12 = @uintptrtype
+| 13 = @float32type
+| 14 = @float64type
+| 15 = @complex64type
+| 16 = @complex128type
+| 17 = @stringexprtype
+| 18 = @unsafepointertype
+| 19 = @boolliteraltype
+| 20 = @intliteraltype
+| 21 = @runeliteraltype
+| 22 = @floatliteraltype
+| 23 = @complexliteraltype
+| 24 = @stringliteraltype
+| 25 = @nilliteraltype
+| 26 = @typeparamtype
+| 27 = @arraytype
+| 28 = @slicetype
+| 29 = @structtype
+| 30 = @pointertype
+| 31 = @interfacetype
+| 32 = @tupletype
+| 33 = @signaturetype
+| 34 = @maptype
+| 35 = @sendchantype
+| 36 = @recvchantype
+| 37 = @sendrcvchantype
+| 38 = @definedtype
+| 39 = @typesetliteraltype;
+
+@basictype = @booltype | @numerictype | @stringtype | @literaltype | @invalidtype | @unsafepointertype;
+
+@booltype = @boolexprtype | @boolliteraltype;
+
+@numerictype = @integertype | @floattype | @complextype;
+
+@integertype = @signedintegertype | @unsignedintegertype;
+
+@signedintegertype = @inttype | @int8type | @int16type | @int32type | @int64type | @intliteraltype | @runeliteraltype;
+
+@unsignedintegertype = @uinttype | @uint8type | @uint16type | @uint32type | @uint64type | @uintptrtype;
+
+@floattype = @float32type | @float64type | @floatliteraltype;
+
+@complextype = @complex64type | @complex128type | @complexliteraltype;
+
+@stringtype = @stringexprtype | @stringliteraltype;
+
+@literaltype = @boolliteraltype | @intliteraltype | @runeliteraltype | @floatliteraltype | @complexliteraltype
+             | @stringliteraltype | @nilliteraltype;
+
+@compositetype = @typeparamtype | @containertype | @structtype | @pointertype | @interfacetype | @tupletype
+               | @signaturetype | @definedtype | @typesetliteraltype;
+
+@containertype = @arraytype | @slicetype | @maptype | @chantype;
+
+@chantype = @sendchantype | @recvchantype | @sendrcvchantype;
+
+case @modexpr.kind of
+  0 = @modcommentblock
+| 1 = @modline
+| 2 = @modlineblock
+| 3 = @modlparen
+| 4 = @modrparen;
+
+case @error.kind of
+  0 = @unknownerror
+| 1 = @listerror
+| 2 = @parseerror
+| 3 = @typeerror;
+
diff --git a/go/ql/lib/upgrades/b3da71c3ac204b557c86e9d9c26012360bdbdccb/old.dbscheme b/go/ql/lib/upgrades/b3da71c3ac204b557c86e9d9c26012360bdbdccb/old.dbscheme
new file mode 100644
index 00000000000..b3da71c3ac2
--- /dev/null
+++ b/go/ql/lib/upgrades/b3da71c3ac204b557c86e9d9c26012360bdbdccb/old.dbscheme
@@ -0,0 +1,552 @@
+/** Auto-generated dbscheme; do not edit. Run `make gen` in directory `go/` to regenerate. */
+
+
+/** Duplicate code **/
+
+duplicateCode(
+  unique int id : @duplication,
+  varchar(900) relativePath : string ref,
+  int equivClass : int ref);
+
+similarCode(
+  unique int id : @similarity,
+  varchar(900) relativePath : string ref,
+  int equivClass : int ref);
+
+@duplication_or_similarity = @duplication | @similarity;
+
+tokens(
+  int id : @duplication_or_similarity ref,
+  int offset : int ref,
+  int beginLine : int ref,
+  int beginColumn : int ref,
+  int endLine : int ref,
+  int endColumn : int ref);
+
+/** External data **/
+
+externalData(
+  int id : @externalDataElement,
+  varchar(900) path : string ref,
+  int column: int ref,
+  varchar(900) value : string ref
+);
+
+snapshotDate(unique date snapshotDate : date ref);
+
+sourceLocationPrefix(varchar(900) prefix : string ref);
+
+
+/*
+ * XML Files
+ */
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+compilations(unique int id: @compilation, string cwd: string ref);
+
+#keyset[id, num]
+compilation_args(int id: @compilation ref, int num: int ref, string arg: string ref);
+
+#keyset[id, num, kind]
+compilation_time(int id: @compilation ref, int num: int ref, int kind: int ref, float secs: float ref);
+
+diagnostic_for(unique int diagnostic: @diagnostic ref, int compilation: @compilation ref, int file_number: int ref, int file_number_diagnostic_number: int ref);
+
+compilation_finished(unique int id: @compilation ref, float cpu_seconds: float ref, float elapsed_seconds: float ref);
+
+#keyset[id, num]
+compilation_compiling_files(int id: @compilation ref, int num: int ref, int file: @file ref);
+
+diagnostics(unique int id: @diagnostic, int severity: int ref, string error_tag: string ref, string error_message: string ref,
+            string full_error_message: string ref, int location: @location ref);
+
+locations_default(unique int id: @location_default, int file: @file ref, int beginLine: int ref, int beginColumn: int ref,
+                  int endLine: int ref, int endColumn: int ref);
+
+numlines(int element_id: @sourceline ref, int num_lines: int ref, int num_code: int ref, int num_comment: int ref);
+
+files(unique int id: @file, string name: string ref);
+
+folders(unique int id: @folder, string name: string ref);
+
+containerparent(int parent: @container ref, unique int child: @container ref);
+
+has_location(unique int locatable: @locatable ref, int location: @location ref);
+
+#keyset[parent, idx]
+comment_groups(unique int id: @comment_group, int parent: @file ref, int idx: int ref);
+
+comments(unique int id: @comment, int kind: int ref, int parent: @comment_group ref, int idx: int ref, string text: string ref);
+
+doc_comments(unique int node: @documentable ref, int comment: @comment_group ref);
+
+#keyset[parent, idx]
+exprs(unique int id: @expr, int kind: int ref, int parent: @exprparent ref, int idx: int ref);
+
+literals(unique int expr: @expr ref, string value: string ref, string raw: string ref);
+
+constvalues(unique int expr: @expr ref, string value: string ref, string exact: string ref);
+
+fields(unique int id: @field, int parent: @fieldparent ref, int idx: int ref);
+
+typeparamdecls(unique int id: @typeparamdecl, int parent: @typeparamdeclparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+stmts(unique int id: @stmt, int kind: int ref, int parent: @stmtparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+decls(unique int id: @decl, int kind: int ref, int parent: @declparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+specs(unique int id: @spec, int kind: int ref, int parent: @gendecl ref, int idx: int ref);
+
+scopes(unique int id: @scope, int kind: int ref);
+
+scopenesting(unique int inner: @scope ref, int outer: @scope ref);
+
+scopenodes(unique int node: @scopenode ref, int scope: @localscope ref);
+
+objects(unique int id: @object, int kind: int ref, string name: string ref);
+
+objectscopes(unique int object: @object ref, int scope: @scope ref);
+
+objecttypes(unique int object: @object ref, int tp: @type ref);
+
+methodreceivers(unique int method: @object ref, int receiver: @object ref);
+
+fieldstructs(unique int field: @object ref, int struct: @structtype ref);
+
+methodhosts(int method: @object ref, int host: @definedtype ref);
+
+defs(int ident: @ident ref, int object: @object ref);
+
+uses(int ident: @ident ref, int object: @object ref);
+
+types(unique int id: @type, int kind: int ref);
+
+type_of(unique int expr: @expr ref, int tp: @type ref);
+
+typename(unique int tp: @type ref, string name: string ref);
+
+key_type(unique int map: @maptype ref, int tp: @type ref);
+
+element_type(unique int container: @containertype ref, int tp: @type ref);
+
+base_type(unique int ptr: @pointertype ref, int tp: @type ref);
+
+underlying_type(unique int defined: @definedtype ref, int tp: @type ref);
+
+#keyset[parent, index]
+component_types(int parent: @compositetype ref, int index: int ref, string name: string ref, int tp: @type ref);
+
+#keyset[parent, index]
+struct_tags(int parent: @structtype ref, int index: int ref, string tag: string ref);
+
+#keyset[interface, index]
+interface_private_method_ids(int interface: @interfacetype ref, int index: int ref, string id: string ref);
+
+array_length(unique int tp: @arraytype ref, string len: string ref);
+
+type_objects(unique int tp: @type ref, int object: @object ref);
+
+packages(unique int id: @package, string name: string ref, string path: string ref, int scope: @packagescope ref);
+
+#keyset[parent, idx]
+modexprs(unique int id: @modexpr, int kind: int ref, int parent: @modexprparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+modtokens(string token: string ref, int parent: @modexpr ref, int idx: int ref);
+
+#keyset[package, idx]
+errors(unique int id: @error, int kind: int ref, string msg: string ref, string rawpos: string ref,
+       string file: string ref, int line: int ref, int col: int ref, int package: @package ref, int idx: int ref);
+
+has_ellipsis(int id: @callorconversionexpr ref);
+
+variadic(int id: @signaturetype ref);
+
+#keyset[parent, idx]
+typeparam(unique int tp: @typeparamtype ref, string name: string ref, int bound: @compositetype ref,
+          int parent: @typeparamparentobject ref, int idx: int ref);
+
+@container = @file | @folder;
+
+@locatable = @xmllocatable | @node | @localscope;
+
+@node = @documentable | @exprparent | @modexprparent | @fieldparent | @stmtparent | @declparent | @typeparamdeclparent
+      | @scopenode | @comment_group | @comment;
+
+@documentable = @file | @field | @typeparamdecl | @spec | @gendecl | @funcdecl | @modexpr;
+
+@exprparent = @funcdef | @file | @expr | @field | @stmt | @decl | @typeparamdecl | @spec;
+
+@modexprparent = @file | @modexpr;
+
+@fieldparent = @decl | @structtypeexpr | @functypeexpr | @interfacetypeexpr;
+
+@stmtparent = @funcdef | @stmt | @decl;
+
+@declparent = @file | @declstmt;
+
+@typeparamdeclparent = @funcdecl | @typespec;
+
+@funcdef = @funclit | @funcdecl;
+
+@scopenode = @file | @functypeexpr | @blockstmt | @ifstmt | @caseclause | @switchstmt | @commclause | @loopstmt;
+
+@location = @location_default;
+
+@sourceline = @locatable;
+
+case @comment.kind of
+  0 = @slashslashcomment
+| 1 = @slashstarcomment;
+
+case @expr.kind of
+  0 = @badexpr
+| 1 = @ident
+| 2 = @ellipsis
+| 3 = @intlit
+| 4 = @floatlit
+| 5 = @imaglit
+| 6 = @charlit
+| 7 = @stringlit
+| 8 = @funclit
+| 9 = @compositelit
+| 10 = @parenexpr
+| 11 = @selectorexpr
+| 12 = @indexexpr
+| 13 = @genericfunctioninstantiationexpr
+| 14 = @generictypeinstantiationexpr
+| 15 = @sliceexpr
+| 16 = @typeassertexpr
+| 17 = @callorconversionexpr
+| 18 = @starexpr
+| 19 = @keyvalueexpr
+| 20 = @arraytypeexpr
+| 21 = @structtypeexpr
+| 22 = @functypeexpr
+| 23 = @interfacetypeexpr
+| 24 = @maptypeexpr
+| 25 = @typesetliteralexpr
+| 26 = @plusexpr
+| 27 = @minusexpr
+| 28 = @notexpr
+| 29 = @complementexpr
+| 30 = @derefexpr
+| 31 = @addressexpr
+| 32 = @arrowexpr
+| 33 = @lorexpr
+| 34 = @landexpr
+| 35 = @eqlexpr
+| 36 = @neqexpr
+| 37 = @lssexpr
+| 38 = @leqexpr
+| 39 = @gtrexpr
+| 40 = @geqexpr
+| 41 = @addexpr
+| 42 = @subexpr
+| 43 = @orexpr
+| 44 = @xorexpr
+| 45 = @mulexpr
+| 46 = @quoexpr
+| 47 = @remexpr
+| 48 = @shlexpr
+| 49 = @shrexpr
+| 50 = @andexpr
+| 51 = @andnotexpr
+| 52 = @sendchantypeexpr
+| 53 = @recvchantypeexpr
+| 54 = @sendrcvchantypeexpr;
+
+@basiclit = @intlit | @floatlit | @imaglit | @charlit | @stringlit;
+
+@operatorexpr = @logicalexpr | @arithmeticexpr | @bitwiseexpr | @unaryexpr | @binaryexpr;
+
+@logicalexpr = @logicalunaryexpr | @logicalbinaryexpr;
+
+@arithmeticexpr = @arithmeticunaryexpr | @arithmeticbinaryexpr;
+
+@bitwiseexpr = @bitwiseunaryexpr | @bitwisebinaryexpr;
+
+@unaryexpr = @logicalunaryexpr | @bitwiseunaryexpr | @arithmeticunaryexpr | @derefexpr | @addressexpr | @arrowexpr;
+
+@logicalunaryexpr = @notexpr;
+
+@bitwiseunaryexpr = @complementexpr;
+
+@arithmeticunaryexpr = @plusexpr | @minusexpr;
+
+@binaryexpr = @logicalbinaryexpr | @bitwisebinaryexpr | @arithmeticbinaryexpr | @comparison;
+
+@logicalbinaryexpr = @lorexpr | @landexpr;
+
+@bitwisebinaryexpr = @shiftexpr | @orexpr | @xorexpr | @andexpr | @andnotexpr;
+
+@arithmeticbinaryexpr = @addexpr | @subexpr | @mulexpr | @quoexpr | @remexpr;
+
+@shiftexpr = @shlexpr | @shrexpr;
+
+@comparison = @equalitytest | @relationalcomparison;
+
+@equalitytest = @eqlexpr | @neqexpr;
+
+@relationalcomparison = @lssexpr | @leqexpr | @gtrexpr | @geqexpr;
+
+@chantypeexpr = @sendchantypeexpr | @recvchantypeexpr | @sendrcvchantypeexpr;
+
+case @stmt.kind of
+  0 = @badstmt
+| 1 = @declstmt
+| 2 = @emptystmt
+| 3 = @labeledstmt
+| 4 = @exprstmt
+| 5 = @sendstmt
+| 6 = @incstmt
+| 7 = @decstmt
+| 8 = @gostmt
+| 9 = @deferstmt
+| 10 = @returnstmt
+| 11 = @breakstmt
+| 12 = @continuestmt
+| 13 = @gotostmt
+| 14 = @fallthroughstmt
+| 15 = @blockstmt
+| 16 = @ifstmt
+| 17 = @caseclause
+| 18 = @exprswitchstmt
+| 19 = @typeswitchstmt
+| 20 = @commclause
+| 21 = @selectstmt
+| 22 = @forstmt
+| 23 = @rangestmt
+| 24 = @assignstmt
+| 25 = @definestmt
+| 26 = @addassignstmt
+| 27 = @subassignstmt
+| 28 = @mulassignstmt
+| 29 = @quoassignstmt
+| 30 = @remassignstmt
+| 31 = @andassignstmt
+| 32 = @orassignstmt
+| 33 = @xorassignstmt
+| 34 = @shlassignstmt
+| 35 = @shrassignstmt
+| 36 = @andnotassignstmt;
+
+@incdecstmt = @incstmt | @decstmt;
+
+@assignment = @simpleassignstmt | @compoundassignstmt;
+
+@simpleassignstmt = @assignstmt | @definestmt;
+
+@compoundassignstmt = @addassignstmt | @subassignstmt | @mulassignstmt | @quoassignstmt | @remassignstmt
+                    | @andassignstmt | @orassignstmt | @xorassignstmt | @shlassignstmt | @shrassignstmt | @andnotassignstmt;
+
+@branchstmt = @breakstmt | @continuestmt | @gotostmt | @fallthroughstmt;
+
+@switchstmt = @exprswitchstmt | @typeswitchstmt;
+
+@loopstmt = @forstmt | @rangestmt;
+
+case @decl.kind of
+  0 = @baddecl
+| 1 = @importdecl
+| 2 = @constdecl
+| 3 = @typedecl
+| 4 = @vardecl
+| 5 = @funcdecl;
+
+@gendecl = @importdecl | @constdecl | @typedecl | @vardecl;
+
+case @spec.kind of
+  0 = @importspec
+| 1 = @valuespec
+| 2 = @typedefspec
+| 3 = @aliasspec;
+
+@typespec = @typedefspec | @aliasspec;
+
+case @object.kind of
+  0 = @pkgobject
+| 1 = @decltypeobject
+| 2 = @builtintypeobject
+| 3 = @declconstobject
+| 4 = @builtinconstobject
+| 5 = @declvarobject
+| 6 = @declfunctionobject
+| 7 = @builtinfunctionobject
+| 8 = @labelobject;
+
+@typeparamparentobject = @decltypeobject | @declfunctionobject;
+
+@declobject = @decltypeobject | @declconstobject | @declvarobject | @declfunctionobject;
+
+@builtinobject = @builtintypeobject | @builtinconstobject | @builtinfunctionobject;
+
+@typeobject = @decltypeobject | @builtintypeobject;
+
+@valueobject = @constobject | @varobject | @functionobject;
+
+@constobject = @declconstobject | @builtinconstobject;
+
+@varobject = @declvarobject;
+
+@functionobject = @declfunctionobject | @builtinfunctionobject;
+
+case @scope.kind of
+  0 = @universescope
+| 1 = @packagescope
+| 2 = @localscope;
+
+case @type.kind of
+  0 = @invalidtype
+| 1 = @boolexprtype
+| 2 = @inttype
+| 3 = @int8type
+| 4 = @int16type
+| 5 = @int32type
+| 6 = @int64type
+| 7 = @uinttype
+| 8 = @uint8type
+| 9 = @uint16type
+| 10 = @uint32type
+| 11 = @uint64type
+| 12 = @uintptrtype
+| 13 = @float32type
+| 14 = @float64type
+| 15 = @complex64type
+| 16 = @complex128type
+| 17 = @stringexprtype
+| 18 = @unsafepointertype
+| 19 = @boolliteraltype
+| 20 = @intliteraltype
+| 21 = @runeliteraltype
+| 22 = @floatliteraltype
+| 23 = @complexliteraltype
+| 24 = @stringliteraltype
+| 25 = @nilliteraltype
+| 26 = @typeparamtype
+| 27 = @arraytype
+| 28 = @slicetype
+| 29 = @structtype
+| 30 = @pointertype
+| 31 = @interfacetype
+| 32 = @tupletype
+| 33 = @signaturetype
+| 34 = @maptype
+| 35 = @sendchantype
+| 36 = @recvchantype
+| 37 = @sendrcvchantype
+| 38 = @definedtype
+| 39 = @typesetliteraltype;
+
+@basictype = @booltype | @numerictype | @stringtype | @literaltype | @invalidtype | @unsafepointertype;
+
+@booltype = @boolexprtype | @boolliteraltype;
+
+@numerictype = @integertype | @floattype | @complextype;
+
+@integertype = @signedintegertype | @unsignedintegertype;
+
+@signedintegertype = @inttype | @int8type | @int16type | @int32type | @int64type | @intliteraltype | @runeliteraltype;
+
+@unsignedintegertype = @uinttype | @uint8type | @uint16type | @uint32type | @uint64type | @uintptrtype;
+
+@floattype = @float32type | @float64type | @floatliteraltype;
+
+@complextype = @complex64type | @complex128type | @complexliteraltype;
+
+@stringtype = @stringexprtype | @stringliteraltype;
+
+@literaltype = @boolliteraltype | @intliteraltype | @runeliteraltype | @floatliteraltype | @complexliteraltype
+             | @stringliteraltype | @nilliteraltype;
+
+@compositetype = @typeparamtype | @containertype | @structtype | @pointertype | @interfacetype | @tupletype
+               | @signaturetype | @definedtype | @typesetliteraltype;
+
+@containertype = @arraytype | @slicetype | @maptype | @chantype;
+
+@chantype = @sendchantype | @recvchantype | @sendrcvchantype;
+
+case @modexpr.kind of
+  0 = @modcommentblock
+| 1 = @modline
+| 2 = @modlineblock
+| 3 = @modlparen
+| 4 = @modrparen;
+
+case @error.kind of
+  0 = @unknownerror
+| 1 = @listerror
+| 2 = @parseerror
+| 3 = @typeerror;
+
diff --git a/go/ql/lib/upgrades/b3da71c3ac204b557c86e9d9c26012360bdbdccb/upgrade.properties b/go/ql/lib/upgrades/b3da71c3ac204b557c86e9d9c26012360bdbdccb/upgrade.properties
new file mode 100644
index 00000000000..52b67d65af7
--- /dev/null
+++ b/go/ql/lib/upgrades/b3da71c3ac204b557c86e9d9c26012360bdbdccb/upgrade.properties
@@ -0,0 +1,2 @@
+description: Add databaseMetadata and overlayChangedFiles relations
+compatibility: full
diff --git a/go/ql/src/CHANGELOG.md b/go/ql/src/CHANGELOG.md
index eb21b53b4f7..786164b5fe4 100644
--- a/go/ql/src/CHANGELOG.md
+++ b/go/ql/src/CHANGELOG.md
@@ -1,3 +1,27 @@
+## 1.4.8
+
+No user-facing changes.
+
+## 1.4.7
+
+No user-facing changes.
+
+## 1.4.6
+
+No user-facing changes.
+
+## 1.4.5
+
+No user-facing changes.
+
+## 1.4.4
+
+No user-facing changes.
+
+## 1.4.3
+
+No user-facing changes.
+
 ## 1.4.2
 
 No user-facing changes.
diff --git a/go/ql/src/InconsistentCode/MissingErrorCheck.qhelp b/go/ql/src/InconsistentCode/MissingErrorCheck.qhelp
index d542a728cfe..0d5610e1391 100644
--- a/go/ql/src/InconsistentCode/MissingErrorCheck.qhelp
+++ b/go/ql/src/InconsistentCode/MissingErrorCheck.qhelp
@@ -22,7 +22,7 @@ the returned pointer.</p>
 
 <sample src="MissingErrorCheck.go" />
 
-<p>The corrected version of <code>user</code> checks <code>err</code> before using <code>ptr</code>.</p>
+<p>The corrected version of <code>user</code> checks <code>err</code> before using <code>ptr</code>.</p>
 
 <sample src="MissingErrorCheckGood.go" />
 
diff --git a/go/ql/src/InconsistentCode/MissingErrorCheck.ql b/go/ql/src/InconsistentCode/MissingErrorCheck.ql
index 8e277c6ae74..e16b8641a97 100644
--- a/go/ql/src/InconsistentCode/MissingErrorCheck.ql
+++ b/go/ql/src/InconsistentCode/MissingErrorCheck.ql
@@ -22,7 +22,7 @@ predicate isNil(DataFlow::Node node) { node = Builtin::nil().getARead() }
 /**
  * Matches if `call` may return a nil pointer alongside an error value.
  *
- * This is both an over- and under-estimate: over in that we assume opaque functions may use this
+ * This is both an over- and under-estimate: over in that we assume opaque functions may use this
  * convention, and under in that functions with bodies are only recognized if they use a literal
  * `nil` for the pointer return value at some return site.
  */
@@ -73,6 +73,16 @@ predicate checksValue(IR::Instruction instruction, DataFlow::SsaNode value) {
   )
 }
 
+// Now that we have use-use flow, phi nodes aren't directly involved in the flow graph. TODO: change this?
+DataFlow::SsaNode phiDefinedFrom(DataFlow::SsaNode node) {
+  result.getDefinition().(SsaPseudoDefinition).getAnInput() = node.getDefinition().getVariable()
+}
+
+DataFlow::SsaNode definedFrom(DataFlow::SsaNode node) {
+  DataFlow::localFlow(node, result) or
+  result = phiDefinedFrom*(node)
+}
+
 /**
  * Matches if `call` is a function returning (`ptr`, `err`) where `ptr` may be nil, and neither
  * `ptr` not `err` has been checked for validity as of `node`.
@@ -99,7 +109,7 @@ predicate returnUncheckedAtNode(
     // localFlow is used to permit checks via either an SSA phi node or ordinary assignment.
     returnUncheckedAtNode(call, node.getAPredecessor(), ptr, err) and
     not exists(DataFlow::SsaNode checked |
-      DataFlow::localFlow(ptr, checked) or DataFlow::localFlow(err, checked)
+      checked = definedFrom(ptr) or checked = definedFrom(err)
     |
       checksValue(node, checked)
     )
diff --git a/go/ql/src/InconsistentCode/MistypedExponentiation.ql b/go/ql/src/InconsistentCode/MistypedExponentiation.ql
index b445a713ce6..91fb63d319c 100644
--- a/go/ql/src/InconsistentCode/MistypedExponentiation.ql
+++ b/go/ql/src/InconsistentCode/MistypedExponentiation.ql
@@ -13,12 +13,16 @@
 
 import go
 
+private Expr getConstantInitialiser(Expr e) {
+  exists(DeclaredConstant c | e = c.getAReference() | result = c.getInit())
+}
+
 /** Holds if `e` is not 0 and is either an octal or hexadecimal literal, or the number one. */
 predicate maybeXorBitPattern(Expr e) {
   // 0 makes no sense as an xor bit pattern
   not e.getNumericValue() = 0 and
   // include octal and hex literals
-  e.(IntLit).getText().matches("0%")
+  [e, getConstantInitialiser(e)].(IntLit).getText().matches("0%")
   or
   e.getNumericValue() = 1
 }
diff --git a/go/ql/src/InconsistentCode/UnhandledCloseWritableHandle.ql b/go/ql/src/InconsistentCode/UnhandledCloseWritableHandle.ql
index d3210c48011..25b1c8ae8fc 100644
--- a/go/ql/src/InconsistentCode/UnhandledCloseWritableHandle.ql
+++ b/go/ql/src/InconsistentCode/UnhandledCloseWritableHandle.ql
@@ -70,8 +70,8 @@ predicate unhandledCall(DataFlow::CallNode call) {
  */
 predicate isWritableFileHandle(DataFlow::Node source, DataFlow::CallNode call) {
   exists(OpenFileFun f, DataFlow::Node flags, QualifiedName flag |
-    // check that the source is a result of the call
-    source = call.getAResult() and
+    // check that the source is the first result of the call
+    source = call.getResult(0) and
     // find a call to the os.OpenFile function
     f.getACall() = call and
     // get the flags expression used for opening the file
@@ -128,6 +128,14 @@ module UnhandledFileCloseConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { isWritableFileHandle(source, _) }
 
   predicate isSink(DataFlow::Node sink) { isCloseSink(sink, _) }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
+
+  Location getASelectedSourceLocation(DataFlow::Node source) {
+    exists(DataFlow::CallNode openCall | result = [openCall.getLocation(), source.getLocation()] |
+      isWritableFileHandle(source, openCall)
+    )
+  }
 }
 
 /**
diff --git a/go/ql/src/RedundantCode/DeadStoreOfField.ql b/go/ql/src/RedundantCode/DeadStoreOfField.ql
index be3a77d3ac7..4a971343823 100644
--- a/go/ql/src/RedundantCode/DeadStoreOfField.ql
+++ b/go/ql/src/RedundantCode/DeadStoreOfField.ql
@@ -89,7 +89,7 @@ Type getTypeEmbeddedViaPointer(Type t) {
 from Write w, LocalVariable v, Field f
 where
   // `w` writes `f` on `v`
-  w.writesField(v.getARead(), f, _) and
+  w.writesFieldPreUpdate(v.getARead(), f, _) and
   // but `f` is never read on `v`
   not exists(Read r | r.readsField(v.getARead(), f)) and
   // exclude pointer-typed `v`; there may be reads through an alias
diff --git a/go/ql/src/RedundantCode/ImpossibleInterfaceNilCheck.ql b/go/ql/src/RedundantCode/ImpossibleInterfaceNilCheck.ql
index c5aeb287358..c8ff9c345f6 100644
--- a/go/ql/src/RedundantCode/ImpossibleInterfaceNilCheck.ql
+++ b/go/ql/src/RedundantCode/ImpossibleInterfaceNilCheck.ql
@@ -35,7 +35,9 @@ predicate flowsToInterfaceNilCheck(DataFlow::Node nd) {
  */
 predicate nonNilWrapper(DataFlow::Node nd) {
   flowsToInterfaceNilCheck(nd) and
-  forex(DataFlow::Node pred | pred = nd.getAPredecessor() |
+  forex(DataFlow::Node pred |
+    pred = nd.getAPredecessor() and not pred instanceof DataFlow::PostUpdateNode
+  |
     exists(Type predtp | predtp = pred.getType().getUnderlyingType() |
       not predtp instanceof InterfaceType and
       not predtp instanceof NilLiteralType and
diff --git a/go/ql/src/Security/CWE-295/DisabledCertificateCheck.ql b/go/ql/src/Security/CWE-295/DisabledCertificateCheck.ql
index ae83fbce8bc..bc05c8cf4aa 100644
--- a/go/ql/src/Security/CWE-295/DisabledCertificateCheck.ql
+++ b/go/ql/src/Security/CWE-295/DisabledCertificateCheck.ql
@@ -34,7 +34,7 @@ predicate becomesPartOf(DataFlow::Node part, DataFlow::Node whole) {
   or
   whole.(DataFlow::AddressOperationNode).getOperand() = part
   or
-  exists(Write w | w.writesField(whole.(DataFlow::PostUpdateNode).getPreUpdateNode(), _, part))
+  exists(Write w | w.writesField(whole, _, part))
 }
 
 /**
diff --git a/go/ql/src/Security/CWE-322/InsecureHostKeyCallback.ql b/go/ql/src/Security/CWE-322/InsecureHostKeyCallback.ql
index c0b5898601c..87c5a2184b0 100644
--- a/go/ql/src/Security/CWE-322/InsecureHostKeyCallback.ql
+++ b/go/ql/src/Security/CWE-322/InsecureHostKeyCallback.ql
@@ -68,6 +68,8 @@ module Config implements DataFlow::ConfigSig {
   }
 
   predicate isSink(DataFlow::Node sink) { writeIsSink(sink, _) }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
 }
 
 /**
@@ -96,8 +98,8 @@ predicate hostCheckReachesSink(Flow::PathNode sink) {
         Flow::flowPath(source, otherSink) and
         Config::writeIsSink(sink.getNode(), sinkWrite) and
         Config::writeIsSink(otherSink.getNode(), otherSinkWrite) and
-        sinkWrite.writesField(sinkAccessPath.getAUse(), _, sink.getNode()) and
-        otherSinkWrite.writesField(otherSinkAccessPath.getAUse(), _, otherSink.getNode()) and
+        sinkWrite.writesFieldPreUpdate(sinkAccessPath.getAUse(), _, sink.getNode()) and
+        otherSinkWrite.writesFieldPreUpdate(otherSinkAccessPath.getAUse(), _, otherSink.getNode()) and
         otherSinkAccessPath = sinkAccessPath.similar()
       )
     )
diff --git a/go/ql/src/Security/CWE-326/InsufficientKeySize.ql b/go/ql/src/Security/CWE-326/InsufficientKeySize.ql
index 5d0ee7ac6ab..6fa421baaeb 100644
--- a/go/ql/src/Security/CWE-326/InsufficientKeySize.ql
+++ b/go/ql/src/Security/CWE-326/InsufficientKeySize.ql
@@ -27,8 +27,6 @@ module Config implements DataFlow::ConfigSig {
   }
 
   predicate observeDiffInformedIncrementalMode() { any() }
-
-  Location getASelectedSourceLocation(DataFlow::Node sink) { none() }
 }
 
 /**
diff --git a/go/ql/src/Security/CWE-327/InsecureTLS.ql b/go/ql/src/Security/CWE-327/InsecureTLS.ql
index a4a9ab1f549..b5d8a81f3d8 100644
--- a/go/ql/src/Security/CWE-327/InsecureTLS.ql
+++ b/go/ql/src/Security/CWE-327/InsecureTLS.ql
@@ -65,7 +65,7 @@ module TlsVersionFlowConfig implements DataFlow::ConfigSig {
    */
   additional predicate isSink(DataFlow::Node sink, Field fld, DataFlow::Node base, Write fieldWrite) {
     fld.hasQualifiedName("crypto/tls", "Config", ["MinVersion", "MaxVersion"]) and
-    fieldWrite.writesField(base, fld, sink)
+    fieldWrite.writesFieldPreUpdate(base, fld, sink)
   }
 
   predicate isSource(DataFlow::Node source) { intIsSource(source, _) }
@@ -190,7 +190,7 @@ module TlsInsecureCipherSuitesFlowConfig implements DataFlow::ConfigSig {
    */
   additional predicate isSink(DataFlow::Node sink, Field fld, DataFlow::Node base, Write fieldWrite) {
     fld.hasQualifiedName("crypto/tls", "Config", "CipherSuites") and
-    fieldWrite.writesField(base, fld, sink)
+    fieldWrite.writesFieldPreUpdate(base, fld, sink)
   }
 
   predicate isSink(DataFlow::Node sink) { isSink(sink, _, _, _) }
@@ -211,7 +211,7 @@ module TlsInsecureCipherSuitesFlow = TaintTracking::Global<TlsInsecureCipherSuit
 
 /**
  * Holds if an insecure TLS cipher suite flows from `source` to `sink`, where `sink`
- * is written to the CipherSuites list of a `tls.Config` instance. `message` describes
+ * is written to the CipherSuites list of a `tls.Config` instance. `message` describes
  * the exact problem found.
  */
 predicate isInsecureTlsCipherFlow(
diff --git a/go/ql/src/Security/CWE-352/ConstantOauth2State.ql b/go/ql/src/Security/CWE-352/ConstantOauth2State.ql
index 8898a6bb101..501eb6109c7 100644
--- a/go/ql/src/Security/CWE-352/ConstantOauth2State.ql
+++ b/go/ql/src/Security/CWE-352/ConstantOauth2State.ql
@@ -61,7 +61,7 @@ predicate isUrlTaintingConfigStep(DataFlow::Node pred, DataFlow::Node succ) {
   exists(Write w, Field f |
     f.hasQualifiedName(package("golang.org/x/oauth2", ""), "Config", "RedirectURL")
   |
-    w.writesField(succ.(DataFlow::PostUpdateNode).getPreUpdateNode(), f, pred)
+    w.writesField(succ, f, pred)
   )
 }
 
diff --git a/go/ql/src/Security/CWE-601/BadRedirectCheck.ql b/go/ql/src/Security/CWE-601/BadRedirectCheck.ql
index bc60e1339eb..7b4cc9f99fc 100644
--- a/go/ql/src/Security/CWE-601/BadRedirectCheck.ql
+++ b/go/ql/src/Security/CWE-601/BadRedirectCheck.ql
@@ -123,6 +123,17 @@ module Config implements DataFlow::ConfigSig {
   }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof OpenUrlRedirect::Sink }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
+
+  Location getASelectedSourceLocation(DataFlow::Node source) {
+    result = source.getLocation()
+    or
+    exists(DataFlow::Node check |
+      isCheckedSource(source, check) and
+      result = check.getLocation()
+    )
+  }
 }
 
 module Flow = TaintTracking::Global<Config>;
diff --git a/go/ql/src/Security/CWE-681/IncorrectIntegerConversionQuery.ql b/go/ql/src/Security/CWE-681/IncorrectIntegerConversionQuery.ql
index a310f024a2d..ce5081a92e9 100644
--- a/go/ql/src/Security/CWE-681/IncorrectIntegerConversionQuery.ql
+++ b/go/ql/src/Security/CWE-681/IncorrectIntegerConversionQuery.ql
@@ -18,7 +18,8 @@ import semmle.go.security.IncorrectIntegerConversionLib
 import Flow::PathGraph
 
 from
-  Flow::PathNode source, Flow::PathNode sink, DataFlow::CallNode call, DataFlow::Node sinkConverted
+  Flow::PathNode source, Flow::PathNode sink, DataFlow::CallNode call,
+  DataFlow::TypeCastNode sinkConverted
 where
   Flow::flowPath(source, sink) and
   call.getResult(0) = source.getNode() and
diff --git a/go/ql/src/change-notes/released/1.4.3.md b/go/ql/src/change-notes/released/1.4.3.md
new file mode 100644
index 00000000000..abf2a0d4dcc
--- /dev/null
+++ b/go/ql/src/change-notes/released/1.4.3.md
@@ -0,0 +1,3 @@
+## 1.4.3
+
+No user-facing changes.
diff --git a/go/ql/src/change-notes/released/1.4.4.md b/go/ql/src/change-notes/released/1.4.4.md
new file mode 100644
index 00000000000..cb7dd204b9c
--- /dev/null
+++ b/go/ql/src/change-notes/released/1.4.4.md
@@ -0,0 +1,3 @@
+## 1.4.4
+
+No user-facing changes.
diff --git a/go/ql/src/change-notes/released/1.4.5.md b/go/ql/src/change-notes/released/1.4.5.md
new file mode 100644
index 00000000000..930163bb5ae
--- /dev/null
+++ b/go/ql/src/change-notes/released/1.4.5.md
@@ -0,0 +1,3 @@
+## 1.4.5
+
+No user-facing changes.
diff --git a/go/ql/src/change-notes/released/1.4.6.md b/go/ql/src/change-notes/released/1.4.6.md
new file mode 100644
index 00000000000..5146f9e1cbf
--- /dev/null
+++ b/go/ql/src/change-notes/released/1.4.6.md
@@ -0,0 +1,3 @@
+## 1.4.6
+
+No user-facing changes.
diff --git a/go/ql/src/change-notes/released/1.4.7.md b/go/ql/src/change-notes/released/1.4.7.md
new file mode 100644
index 00000000000..4f064ad746f
--- /dev/null
+++ b/go/ql/src/change-notes/released/1.4.7.md
@@ -0,0 +1,3 @@
+## 1.4.7
+
+No user-facing changes.
diff --git a/go/ql/src/change-notes/released/1.4.8.md b/go/ql/src/change-notes/released/1.4.8.md
new file mode 100644
index 00000000000..06976d05e75
--- /dev/null
+++ b/go/ql/src/change-notes/released/1.4.8.md
@@ -0,0 +1,3 @@
+## 1.4.8
+
+No user-facing changes.
diff --git a/go/ql/src/codeql-pack.release.yml b/go/ql/src/codeql-pack.release.yml
index a76cacdf799..16e6425ae7e 100644
--- a/go/ql/src/codeql-pack.release.yml
+++ b/go/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.4.2
+lastReleaseVersion: 1.4.8
diff --git a/go/ql/src/experimental/CWE-1004/AuthCookie.qll b/go/ql/src/experimental/CWE-1004/AuthCookie.qll
index 411da5a79fa..58c9f8642b3 100644
--- a/go/ql/src/experimental/CWE-1004/AuthCookie.qll
+++ b/go/ql/src/experimental/CWE-1004/AuthCookie.qll
@@ -28,7 +28,7 @@ private class GorillaSessionOptionsField extends Field {
 private DataFlow::Node getValueForFieldWrite(StructLit sl, string field) {
   exists(Write w, DataFlow::Node base, Field f |
     f.getName() = field and
-    w.writesField(base, f, result) and
+    w.writesFieldPreUpdate(base, f, result) and
     (
       sl = base.asExpr()
       or
@@ -116,6 +116,12 @@ private module BoolToGinSetCookieTrackingConfig implements DataFlow::ConfigSig {
       )
     )
   }
+
+  predicate observeDiffInformedIncrementalMode() {
+    any() // Merged with other flows in CookieWithoutHttpOnly.ql
+  }
+
+  Location getASelectedSourceLocation(DataFlow::Node source) { none() }
 }
 
 /**
@@ -203,10 +209,7 @@ private module GorillaSessionOptionsTrackingConfig implements DataFlow::ConfigSi
   predicate isSink(DataFlow::Node sink) { sink instanceof GorillaSessionSaveSink }
 
   predicate isAdditionalFlowStep(DataFlow::Node pred, DataFlow::Node succ) {
-    exists(GorillaSessionOptionsField f, DataFlow::Write w, DataFlow::Node base |
-      w.writesField(base, f, pred) and
-      succ = base
-    )
+    exists(GorillaSessionOptionsField f, DataFlow::Write w | w.writesField(succ, f, pred))
   }
 }
 
@@ -230,10 +233,7 @@ private module BoolToGorillaSessionOptionsTrackingConfig implements DataFlow::Co
       sl = succ.asExpr()
     )
     or
-    exists(GorillaSessionOptionsField f, DataFlow::Write w, DataFlow::Node base |
-      w.writesField(base, f, pred) and
-      succ = base
-    )
+    exists(GorillaSessionOptionsField f, DataFlow::Write w | w.writesField(succ, f, pred))
   }
 }
 
diff --git a/go/ql/src/experimental/CWE-369/DivideByZero.ql b/go/ql/src/experimental/CWE-369/DivideByZero.ql
index 8afd165832b..99cd120dbf8 100644
--- a/go/ql/src/experimental/CWE-369/DivideByZero.ql
+++ b/go/ql/src/experimental/CWE-369/DivideByZero.ql
@@ -47,8 +47,6 @@ module Config implements DataFlow::ConfigSig {
   }
 
   predicate observeDiffInformedIncrementalMode() { any() }
-
-  Location getASelectedSourceLocation(DataFlow::Node sink) { none() }
 }
 
 /**
diff --git a/go/ql/src/experimental/CWE-807/SensitiveConditionBypass.qll b/go/ql/src/experimental/CWE-807/SensitiveConditionBypass.qll
index 2f2ca94fa87..33e6c6c0144 100644
--- a/go/ql/src/experimental/CWE-807/SensitiveConditionBypass.qll
+++ b/go/ql/src/experimental/CWE-807/SensitiveConditionBypass.qll
@@ -59,6 +59,14 @@ private module Config implements DataFlow::ConfigSig {
       not c.isPotentialFalsePositive()
     )
   }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
+
+  Location getASelectedSourceLocation(DataFlow::Node source) { none() }
+
+  Location getASelectedSinkLocation(DataFlow::Node sink) {
+    exists(ComparisonExpr comp | result = comp.getLocation() | sink.asExpr() = comp.getAnOperand())
+  }
 }
 
 /**
diff --git a/go/ql/src/experimental/CWE-840/ConditionalBypass.ql b/go/ql/src/experimental/CWE-840/ConditionalBypass.ql
index b70be1ff42d..64f7c3c9ac2 100644
--- a/go/ql/src/experimental/CWE-840/ConditionalBypass.ql
+++ b/go/ql/src/experimental/CWE-840/ConditionalBypass.ql
@@ -22,6 +22,10 @@ module Config implements DataFlow::ConfigSig {
   predicate isSink(DataFlow::Node sink) {
     exists(ComparisonExpr c | c.getAnOperand() = sink.asExpr())
   }
+
+  predicate observeDiffInformedIncrementalMode() {
+    none() // can't override the locations accurately because of secondary use of config.
+  }
 }
 
 /** Tracks taint flow for reasoning about conditional bypass. */
diff --git a/go/ql/src/experimental/CWE-918/SSRF.qll b/go/ql/src/experimental/CWE-918/SSRF.qll
index b1374da8a5f..998ce83ba74 100644
--- a/go/ql/src/experimental/CWE-918/SSRF.qll
+++ b/go/ql/src/experimental/CWE-918/SSRF.qll
@@ -22,14 +22,22 @@ module ServerSideRequestForgery {
 
     predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
       // propagate to a URL when its host is assigned to
-      exists(Write w, Field f, SsaWithFields v | f.hasQualifiedName("net/url", "URL", "Host") |
-        w.writesField(v.getAUse(), f, node1) and node2 = v.getAUse()
+      exists(Write w, Field f | f.hasQualifiedName("net/url", "URL", "Host") |
+        w.writesField(node2, f, node1)
       )
     }
 
     predicate isBarrier(DataFlow::Node node) { node instanceof Sanitizer }
 
     predicate isBarrierOut(DataFlow::Node node) { node instanceof SanitizerEdge }
+
+    predicate observeDiffInformedIncrementalMode() { any() }
+
+    Location getASelectedSinkLocation(DataFlow::Node sink) {
+      result = sink.(Sink).getLocation()
+      or
+      result = sink.(Sink).getARequest().getLocation()
+    }
   }
 
   /** Tracks taint flow for reasoning about request forgery vulnerabilities. */
diff --git a/go/ql/src/experimental/IntegerOverflow/RangeAnalysis.qll b/go/ql/src/experimental/IntegerOverflow/RangeAnalysis.qll
index eccb0b73589..f3f4c15f008 100644
--- a/go/ql/src/experimental/IntegerOverflow/RangeAnalysis.qll
+++ b/go/ql/src/experimental/IntegerOverflow/RangeAnalysis.qll
@@ -74,7 +74,7 @@ float getAnUpperBound(Expr expr) {
             result = getAnUpperBound(greater.asExpr()) + bias
           )
         else
-          //If not, find the coresponding `SsaDefinition`, then call `getAnSsaUpperBound` on it.
+          //If not, find the corresponding `SsaDefinition`, then call `getAnSsaUpperBound` on it.
           result = getAnSsaUpperBound(v.getDefinition())
       )
     )
@@ -231,7 +231,7 @@ float getALowerBound(Expr expr) {
             result = lbs - bias
           )
         else
-          //find coresponding SSA definition and calls `getAnSsaLowerBound` on it.
+          //find corresponding SSA definition and calls `getAnSsaLowerBound` on it.
           result = getAnSsaLowerBound(v.getDefinition())
       )
     )
@@ -347,91 +347,85 @@ float getALowerBound(Expr expr) {
  * Gets a possible upper bound of SSA definition `def`.
  */
 float getAnSsaUpperBound(SsaDefinition def) {
-  if recursiveSelfDef(def)
-  then none()
-  else (
-    if def instanceof SsaExplicitDefinition
-    then
-      exists(SsaExplicitDefinition explicitDef | explicitDef = def |
-        //SSA definition coresponding to a `SimpleAssignStmt`
-        if explicitDef.getInstruction() instanceof IR::AssignInstruction
+  not recursiveSelfDef(def) and
+  (
+    def instanceof SsaExplicitDefinition and
+    exists(SsaExplicitDefinition explicitDef | explicitDef = def |
+      //SSA definition corresponding to a `SimpleAssignStmt`
+      if explicitDef.getInstruction() instanceof IR::AssignInstruction
+      then
+        exists(IR::AssignInstruction assignInstr, SimpleAssignStmt simpleAssign |
+          assignInstr = explicitDef.getInstruction() and
+          assignInstr.getRhs().(IR::EvalInstruction).getExpr() = simpleAssign.getRhs() and
+          result = getAnUpperBound(simpleAssign.getRhs())
+        )
+        or
+        //SSA definition corresponding to a ValueSpec(used in a variable declaration)
+        exists(IR::AssignInstruction declInstr, ValueSpec vs, int i, Expr init |
+          declInstr = explicitDef.getInstruction() and
+          declInstr = IR::initInstruction(vs, i) and
+          init = vs.getInit(i) and
+          result = getAnUpperBound(init)
+        )
+        or
+        //SSA definition corresponding to an `AddAssignStmt` (x += y) or `SubAssignStmt` (x -= y)
+        exists(
+          IR::AssignInstruction assignInstr, SsaExplicitDefinition prevDef,
+          CompoundAssignStmt compoundAssign, float prevBound, float delta
+        |
+          assignInstr = explicitDef.getInstruction() and
+          getAUse(prevDef) = compoundAssign.getLhs() and
+          assignInstr = IR::assignInstruction(compoundAssign, 0) and
+          prevBound = getAnSsaUpperBound(prevDef) and
+          (
+            compoundAssign instanceof AddAssignStmt and
+            delta = getAnUpperBound(compoundAssign.getRhs()) and
+            result = addRoundingUp(prevBound, delta)
+            or
+            compoundAssign instanceof SubAssignStmt and
+            delta = getALowerBound(compoundAssign.getRhs()) and
+            result = addRoundingUp(prevBound, -delta)
+          )
+        )
+      else
+        //SSA definition corresponding to an `IncDecStmt`
+        if explicitDef.getInstruction() instanceof IR::IncDecInstruction
         then
-          exists(IR::AssignInstruction assignInstr, SimpleAssignStmt simpleAssign |
-            assignInstr = explicitDef.getInstruction() and
-            assignInstr.getRhs().(IR::EvalInstruction).getExpr() = simpleAssign.getRhs() and
-            result = getAnUpperBound(simpleAssign.getRhs())
-          )
-          or
-          //SSA definition coresponding to a ValueSpec(used in a variable declaration)
-          exists(IR::AssignInstruction declInstr, ValueSpec vs, int i, Expr init |
-            declInstr = explicitDef.getInstruction() and
-            declInstr = IR::initInstruction(vs, i) and
-            init = vs.getInit(i) and
-            result = getAnUpperBound(init)
-          )
-          or
-          //SSA definition coresponding to an `AddAssignStmt` (x += y) or `SubAssignStmt` (x -= y)
-          exists(
-            IR::AssignInstruction assignInstr, SsaExplicitDefinition prevDef,
-            CompoundAssignStmt compoundAssign, float prevBound, float delta
-          |
-            assignInstr = explicitDef.getInstruction() and
-            getAUse(prevDef) = compoundAssign.getLhs() and
-            assignInstr = IR::assignInstruction(compoundAssign, 0) and
-            prevBound = getAnSsaUpperBound(prevDef) and
-            if compoundAssign instanceof AddAssignStmt
-            then
-              delta = getAnUpperBound(compoundAssign.getRhs()) and
-              result = addRoundingUp(prevBound, delta)
-            else
-              if compoundAssign instanceof SubAssignStmt
-              then
-                delta = getALowerBound(compoundAssign.getRhs()) and
-                result = addRoundingUp(prevBound, -delta)
-              else none()
-          )
-        else
-          //SSA definition coresponding to an `IncDecStmt`
-          if explicitDef.getInstruction() instanceof IR::IncDecInstruction
-          then
-            exists(IncDecStmt incOrDec, IR::IncDecInstruction instr, float exprLB |
-              instr = explicitDef.getInstruction() and
-              exprLB = getAnUpperBound(incOrDec.getOperand()) and
-              instr.getRhs().(IR::EvalIncDecRhsInstruction).getStmt() = incOrDec and
-              (
-                //IncStmt(x++)
-                exists(IncStmt inc |
-                  inc = incOrDec and
-                  result = addRoundingUp(exprLB, 1)
-                )
-                or
-                //DecStmt(x--)
-                exists(DecStmt dec |
-                  dec = incOrDec and
-                  result = addRoundingUp(exprLB, -1)
-                )
+          exists(IncDecStmt incOrDec, IR::IncDecInstruction instr, float exprLB |
+            instr = explicitDef.getInstruction() and
+            exprLB = getAnUpperBound(incOrDec.getOperand()) and
+            instr.getRhs().(IR::EvalIncDecRhsInstruction).getStmt() = incOrDec and
+            (
+              //IncStmt(x++)
+              exists(IncStmt inc |
+                inc = incOrDec and
+                result = addRoundingUp(exprLB, 1)
+              )
+              or
+              //DecStmt(x--)
+              exists(DecStmt dec |
+                dec = incOrDec and
+                result = addRoundingUp(exprLB, -1)
               )
             )
-          else
-            //SSA definition coreponding to the init of the parameter
-            if explicitDef.getInstruction() instanceof IR::InitParameterInstruction
-            then
-              exists(IR::InitParameterInstruction instr, Parameter p |
-                instr = explicitDef.getInstruction() and
-                IR::initParamInstruction(p) = instr and
-                result = typeMaxValue(p.getType())
-              )
-            else none()
-      )
-    else
-      //this SSA definition is a phi node.
-      if def instanceof SsaPhiNode
-      then
-        exists(SsaPhiNode phi |
-          phi = def and
-          result = getAnSsaUpperBound(phi.getAnInput().getDefinition())
+          )
+        else (
+          //SSA definition coreponding to the init of the parameter
+          explicitDef.getInstruction() instanceof IR::InitParameterInstruction and
+          exists(IR::InitParameterInstruction instr, Parameter p |
+            instr = explicitDef.getInstruction() and
+            IR::initParamInstruction(p) = instr and
+            result = typeMaxValue(p.getType())
+          )
         )
-      else none()
+    )
+    or
+    //this SSA definition is a phi node.
+    def instanceof SsaPhiNode and
+    exists(SsaPhiNode phi |
+      phi = def and
+      result = getAnSsaUpperBound(phi.getAnInput().getDefinition())
+    )
   )
 }
 
@@ -439,91 +433,85 @@ float getAnSsaUpperBound(SsaDefinition def) {
  * Gets a possible lower bound of SSA definition `def`.
  */
 float getAnSsaLowerBound(SsaDefinition def) {
-  if recursiveSelfDef(def)
-  then none()
-  else (
-    if def instanceof SsaExplicitDefinition
-    then
-      exists(SsaExplicitDefinition explicitDef | explicitDef = def |
-        if explicitDef.getInstruction() instanceof IR::AssignInstruction
+  not recursiveSelfDef(def) and
+  (
+    def instanceof SsaExplicitDefinition and
+    exists(SsaExplicitDefinition explicitDef | explicitDef = def |
+      if explicitDef.getInstruction() instanceof IR::AssignInstruction
+      then
+        //SimpleAssignStmt
+        exists(IR::AssignInstruction assignInstr, SimpleAssignStmt simpleAssign |
+          assignInstr = explicitDef.getInstruction() and
+          assignInstr.getRhs().(IR::EvalInstruction).getExpr() = simpleAssign.getRhs() and
+          result = getALowerBound(simpleAssign.getRhs())
+        )
+        or
+        //ValueSpec
+        exists(IR::AssignInstruction declInstr, ValueSpec vs, int i, Expr init |
+          declInstr = explicitDef.getInstruction() and
+          declInstr = IR::initInstruction(vs, i) and
+          init = vs.getInit(i) and
+          result = getALowerBound(init)
+        )
+        or
+        //AddAssignStmt(x += y)
+        exists(
+          IR::AssignInstruction assignInstr, SsaExplicitDefinition prevDef,
+          CompoundAssignStmt compoundAssign, float prevBound, float delta
+        |
+          assignInstr = explicitDef.getInstruction() and
+          getAUse(prevDef) = compoundAssign.getLhs() and
+          assignInstr = IR::assignInstruction(compoundAssign, 0) and
+          prevBound = getAnSsaLowerBound(prevDef) and
+          (
+            compoundAssign instanceof AddAssignStmt and
+            delta = getALowerBound(compoundAssign.getRhs()) and
+            result = addRoundingDown(prevBound, delta)
+            or
+            compoundAssign instanceof SubAssignStmt and
+            delta = getAnUpperBound(compoundAssign.getRhs()) and
+            result = addRoundingDown(prevBound, -delta)
+          )
+        )
+      else
+        //IncDecStmt
+        if explicitDef.getInstruction() instanceof IR::IncDecInstruction
         then
-          //SimpleAssignStmt
-          exists(IR::AssignInstruction assignInstr, SimpleAssignStmt simpleAssign |
-            assignInstr = explicitDef.getInstruction() and
-            assignInstr.getRhs().(IR::EvalInstruction).getExpr() = simpleAssign.getRhs() and
-            result = getALowerBound(simpleAssign.getRhs())
-          )
-          or
-          //ValueSpec
-          exists(IR::AssignInstruction declInstr, ValueSpec vs, int i, Expr init |
-            declInstr = explicitDef.getInstruction() and
-            declInstr = IR::initInstruction(vs, i) and
-            init = vs.getInit(i) and
-            result = getALowerBound(init)
-          )
-          or
-          //AddAssignStmt(x += y)
-          exists(
-            IR::AssignInstruction assignInstr, SsaExplicitDefinition prevDef,
-            CompoundAssignStmt compoundAssign, float prevBound, float delta
-          |
-            assignInstr = explicitDef.getInstruction() and
-            getAUse(prevDef) = compoundAssign.getLhs() and
-            assignInstr = IR::assignInstruction(compoundAssign, 0) and
-            prevBound = getAnSsaLowerBound(prevDef) and
-            if compoundAssign instanceof AddAssignStmt
-            then
-              delta = getALowerBound(compoundAssign.getRhs()) and
-              result = addRoundingDown(prevBound, delta)
-            else
-              if compoundAssign instanceof SubAssignStmt
-              then
-                delta = getAnUpperBound(compoundAssign.getRhs()) and
-                result = addRoundingDown(prevBound, -delta)
-              else none()
-          )
-        else
-          //IncDecStmt
-          if explicitDef.getInstruction() instanceof IR::IncDecInstruction
-          then
-            exists(IncDecStmt incOrDec, IR::IncDecInstruction instr, float exprLB |
-              instr = explicitDef.getInstruction() and
-              exprLB = getALowerBound(incOrDec.getOperand()) and
-              instr.getRhs().(IR::EvalIncDecRhsInstruction).getStmt() = incOrDec and
-              (
-                //IncStmt(x++)
-                exists(IncStmt inc |
-                  inc = incOrDec and
-                  result = addRoundingDown(exprLB, 1)
-                )
-                or
-                //DecStmt(x--)
-                exists(DecStmt dec |
-                  dec = incOrDec and
-                  result = addRoundingDown(exprLB, -1)
-                )
+          exists(IncDecStmt incOrDec, IR::IncDecInstruction instr, float exprLB |
+            instr = explicitDef.getInstruction() and
+            exprLB = getALowerBound(incOrDec.getOperand()) and
+            instr.getRhs().(IR::EvalIncDecRhsInstruction).getStmt() = incOrDec and
+            (
+              //IncStmt(x++)
+              exists(IncStmt inc |
+                inc = incOrDec and
+                result = addRoundingDown(exprLB, 1)
+              )
+              or
+              //DecStmt(x--)
+              exists(DecStmt dec |
+                dec = incOrDec and
+                result = addRoundingDown(exprLB, -1)
               )
             )
-          else
-            //init of the function parameter
-            if explicitDef.getInstruction() instanceof IR::InitParameterInstruction
-            then
-              exists(IR::InitParameterInstruction instr, Parameter p |
-                instr = explicitDef.getInstruction() and
-                IR::initParamInstruction(p) = instr and
-                result = typeMinValue(p.getType())
-              )
-            else none()
-      )
-    else
-      //phi node
-      if def instanceof SsaPhiNode
-      then
-        exists(SsaPhiNode phi |
-          phi = def and
-          result = getAnSsaLowerBound(phi.getAnInput().getDefinition())
+          )
+        else (
+          //init of the function parameter
+          explicitDef.getInstruction() instanceof IR::InitParameterInstruction and
+          exists(IR::InitParameterInstruction instr, Parameter p |
+            instr = explicitDef.getInstruction() and
+            IR::initParamInstruction(p) = instr and
+            result = typeMinValue(p.getType())
+          )
         )
-      else none()
+    )
+    or
+    //phi node
+    def instanceof SsaPhiNode and
+    exists(SsaPhiNode phi |
+      phi = def and
+      result = getAnSsaLowerBound(phi.getAnInput().getDefinition())
+    )
   )
 }
 
@@ -533,13 +521,13 @@ float getAnSsaLowerBound(SsaDefinition def) {
  * The structure of this function needs to be same as `getAnSsaLowerBound`
  */
 predicate ssaDependsOnSsa(SsaDefinition nextDef, SsaDefinition prevDef) {
-  //SSA definition coresponding to a `SimpleAssignStmt`
+  //SSA definition corresponding to a `SimpleAssignStmt`
   exists(SimpleAssignStmt simpleAssign |
     nextDef.(SsaExplicitDefinition).getInstruction() = IR::assignInstruction(simpleAssign, _) and
     ssaDependsOnExpr(prevDef, simpleAssign.getRhs())
   )
   or
-  //SSA definition coresponding to a `ValueSpec`(used in variable declaration)
+  //SSA definition corresponding to a `ValueSpec`(used in variable declaration)
   exists(IR::AssignInstruction declInstr, ValueSpec vs, int i, Expr init |
     declInstr = nextDef.(SsaExplicitDefinition).getInstruction() and
     declInstr = IR::initInstruction(vs, i) and
@@ -547,7 +535,7 @@ predicate ssaDependsOnSsa(SsaDefinition nextDef, SsaDefinition prevDef) {
     ssaDependsOnExpr(prevDef, init)
   )
   or
-  //SSA definition coresponding to a `AddAssignStmt` or `SubAssignStmt`
+  //SSA definition corresponding to a `AddAssignStmt` or `SubAssignStmt`
   exists(CompoundAssignStmt compoundAssign |
     (compoundAssign instanceof AddAssignStmt or compoundAssign instanceof SubAssignStmt) and
     nextDef.(SsaExplicitDefinition).getInstruction() = IR::assignInstruction(compoundAssign, 0) and
@@ -557,7 +545,7 @@ predicate ssaDependsOnSsa(SsaDefinition nextDef, SsaDefinition prevDef) {
     )
   )
   or
-  //SSA definition coresponding to a `IncDecStmt`
+  //SSA definition corresponding to a `IncDecStmt`
   exists(IncDecStmt incDec |
     nextDef
         .(SsaExplicitDefinition)
@@ -569,7 +557,7 @@ predicate ssaDependsOnSsa(SsaDefinition nextDef, SsaDefinition prevDef) {
     ssaDependsOnExpr(prevDef, incDec.getOperand())
   )
   or
-  //if `nextDef` coresponding to the init of a parameter, there is no coresponding `prevDef`
+  //if `nextDef` corresponding to the init of a parameter, there is no corresponding `prevDef`
   //if `nextDef` is a phi node and `prevDef` is one of the input of the phi node, then `nextDef` depends on `prevDef` directly.
   exists(SsaPhiNode phi | nextDef = phi and phi.getAnInput().getDefinition() = prevDef)
 }
diff --git a/go/ql/src/qlpack.yml b/go/ql/src/qlpack.yml
index d3c411a74f7..4a0baaa7836 100644
--- a/go/ql/src/qlpack.yml
+++ b/go/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/go-queries
-version: 1.4.3-dev
+version: 1.4.9-dev
 groups:
   - go
   - queries
diff --git a/go/ql/test/example-tests/snippets/typeinfo.expected b/go/ql/test/example-tests/snippets/typeinfo.expected
index 728a1dfc6f7..91ea716693f 100644
--- a/go/ql/test/example-tests/snippets/typeinfo.expected
+++ b/go/ql/test/example-tests/snippets/typeinfo.expected
@@ -5,3 +5,4 @@
 | main.go:18:12:18:14 | argument corresponding to req |
 | main.go:18:12:18:14 | definition of req |
 | main.go:20:5:20:7 | req |
+| main.go:20:5:20:7 | req [postupdate] |
diff --git a/go/ql/test/experimental/CWE-1004/CookieWithoutHttpOnly.expected b/go/ql/test/experimental/CWE-1004/CookieWithoutHttpOnly.expected
index 5c7bef1155e..355c0a62b1b 100644
--- a/go/ql/test/experimental/CWE-1004/CookieWithoutHttpOnly.expected
+++ b/go/ql/test/experimental/CWE-1004/CookieWithoutHttpOnly.expected
@@ -1,90 +1,54 @@
 edges
 | CookieWithoutHttpOnly.go:11:7:14:2 | struct literal | CookieWithoutHttpOnly.go:15:20:15:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:11:7:14:2 | struct literal | CookieWithoutHttpOnly.go:15:20:15:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:11:7:14:2 | struct literal | CookieWithoutHttpOnly.go:15:21:15:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:12:10:12:18 | "session" | CookieWithoutHttpOnly.go:11:7:14:2 | struct literal | provenance | Config |
-| CookieWithoutHttpOnly.go:15:20:15:21 | &... | CookieWithoutHttpOnly.go:15:21:15:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:15:20:15:21 | &... [pointer] | CookieWithoutHttpOnly.go:15:20:15:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:15:20:15:21 | &... [pointer] | CookieWithoutHttpOnly.go:15:20:15:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:15:20:15:21 | &... [pointer] | CookieWithoutHttpOnly.go:15:21:15:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:15:21:15:21 | c | CookieWithoutHttpOnly.go:15:20:15:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:15:21:15:21 | c | CookieWithoutHttpOnly.go:15:20:15:21 | &... [pointer] | provenance |  |
 | CookieWithoutHttpOnly.go:19:7:23:2 | struct literal | CookieWithoutHttpOnly.go:24:20:24:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:19:7:23:2 | struct literal | CookieWithoutHttpOnly.go:24:20:24:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:19:7:23:2 | struct literal | CookieWithoutHttpOnly.go:24:20:24:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:19:7:23:2 | struct literal | CookieWithoutHttpOnly.go:24:20:24:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:19:7:23:2 | struct literal | CookieWithoutHttpOnly.go:24:21:24:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:19:7:23:2 | struct literal | CookieWithoutHttpOnly.go:24:21:24:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:20:13:20:21 | "session" | CookieWithoutHttpOnly.go:19:7:23:2 | struct literal | provenance | Config |
 | CookieWithoutHttpOnly.go:22:13:22:17 | false | CookieWithoutHttpOnly.go:19:7:23:2 | struct literal | provenance | Config |
-| CookieWithoutHttpOnly.go:24:20:24:21 | &... | CookieWithoutHttpOnly.go:24:21:24:21 | c | provenance |  |
-| CookieWithoutHttpOnly.go:24:20:24:21 | &... | CookieWithoutHttpOnly.go:24:21:24:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:24:20:24:21 | &... [pointer] | CookieWithoutHttpOnly.go:24:20:24:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:24:20:24:21 | &... [pointer] | CookieWithoutHttpOnly.go:24:20:24:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:24:20:24:21 | &... [pointer] | CookieWithoutHttpOnly.go:24:20:24:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:24:20:24:21 | &... [pointer] | CookieWithoutHttpOnly.go:24:20:24:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:24:20:24:21 | &... [pointer] | CookieWithoutHttpOnly.go:24:21:24:21 | c | provenance |  |
-| CookieWithoutHttpOnly.go:24:20:24:21 | &... [pointer] | CookieWithoutHttpOnly.go:24:21:24:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:24:21:24:21 | c | CookieWithoutHttpOnly.go:24:20:24:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:24:21:24:21 | c | CookieWithoutHttpOnly.go:24:20:24:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:24:21:24:21 | c | CookieWithoutHttpOnly.go:24:20:24:21 | &... [pointer] | provenance |  |
 | CookieWithoutHttpOnly.go:24:21:24:21 | c | CookieWithoutHttpOnly.go:24:20:24:21 | &... [pointer] | provenance |  |
 | CookieWithoutHttpOnly.go:28:7:32:2 | struct literal | CookieWithoutHttpOnly.go:33:20:33:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:28:7:32:2 | struct literal | CookieWithoutHttpOnly.go:33:20:33:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:28:7:32:2 | struct literal | CookieWithoutHttpOnly.go:33:20:33:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:28:7:32:2 | struct literal | CookieWithoutHttpOnly.go:33:20:33:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:28:7:32:2 | struct literal | CookieWithoutHttpOnly.go:33:21:33:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:28:7:32:2 | struct literal | CookieWithoutHttpOnly.go:33:21:33:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:29:13:29:21 | "session" | CookieWithoutHttpOnly.go:28:7:32:2 | struct literal | provenance | Config |
 | CookieWithoutHttpOnly.go:31:13:31:16 | true | CookieWithoutHttpOnly.go:28:7:32:2 | struct literal | provenance | Config |
-| CookieWithoutHttpOnly.go:33:20:33:21 | &... | CookieWithoutHttpOnly.go:33:21:33:21 | c | provenance |  |
-| CookieWithoutHttpOnly.go:33:20:33:21 | &... | CookieWithoutHttpOnly.go:33:21:33:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:33:20:33:21 | &... [pointer] | CookieWithoutHttpOnly.go:33:20:33:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:33:20:33:21 | &... [pointer] | CookieWithoutHttpOnly.go:33:20:33:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:33:20:33:21 | &... [pointer] | CookieWithoutHttpOnly.go:33:20:33:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:33:20:33:21 | &... [pointer] | CookieWithoutHttpOnly.go:33:20:33:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:33:20:33:21 | &... [pointer] | CookieWithoutHttpOnly.go:33:21:33:21 | c | provenance |  |
-| CookieWithoutHttpOnly.go:33:20:33:21 | &... [pointer] | CookieWithoutHttpOnly.go:33:21:33:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:33:21:33:21 | c | CookieWithoutHttpOnly.go:33:20:33:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:33:21:33:21 | c | CookieWithoutHttpOnly.go:33:20:33:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:33:21:33:21 | c | CookieWithoutHttpOnly.go:33:20:33:21 | &... [pointer] | provenance |  |
 | CookieWithoutHttpOnly.go:33:21:33:21 | c | CookieWithoutHttpOnly.go:33:20:33:21 | &... [pointer] | provenance |  |
 | CookieWithoutHttpOnly.go:37:7:40:2 | struct literal | CookieWithoutHttpOnly.go:42:20:42:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:37:7:40:2 | struct literal | CookieWithoutHttpOnly.go:42:20:42:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:37:7:40:2 | struct literal | CookieWithoutHttpOnly.go:42:20:42:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:37:7:40:2 | struct literal | CookieWithoutHttpOnly.go:42:20:42:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:37:7:40:2 | struct literal | CookieWithoutHttpOnly.go:42:21:42:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:37:7:40:2 | struct literal | CookieWithoutHttpOnly.go:42:21:42:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:38:10:38:18 | "session" | CookieWithoutHttpOnly.go:37:7:40:2 | struct literal | provenance | Config |
 | CookieWithoutHttpOnly.go:41:15:41:18 | true | CookieWithoutHttpOnly.go:37:7:40:2 | struct literal | provenance | Config |
-| CookieWithoutHttpOnly.go:42:20:42:21 | &... | CookieWithoutHttpOnly.go:42:21:42:21 | c | provenance |  |
-| CookieWithoutHttpOnly.go:42:20:42:21 | &... | CookieWithoutHttpOnly.go:42:21:42:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:42:20:42:21 | &... [pointer] | CookieWithoutHttpOnly.go:42:20:42:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:42:20:42:21 | &... [pointer] | CookieWithoutHttpOnly.go:42:20:42:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:42:20:42:21 | &... [pointer] | CookieWithoutHttpOnly.go:42:20:42:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:42:20:42:21 | &... [pointer] | CookieWithoutHttpOnly.go:42:20:42:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:42:20:42:21 | &... [pointer] | CookieWithoutHttpOnly.go:42:21:42:21 | c | provenance |  |
-| CookieWithoutHttpOnly.go:42:20:42:21 | &... [pointer] | CookieWithoutHttpOnly.go:42:21:42:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:42:21:42:21 | c | CookieWithoutHttpOnly.go:42:20:42:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:42:21:42:21 | c | CookieWithoutHttpOnly.go:42:20:42:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:42:21:42:21 | c | CookieWithoutHttpOnly.go:42:20:42:21 | &... [pointer] | provenance |  |
 | CookieWithoutHttpOnly.go:42:21:42:21 | c | CookieWithoutHttpOnly.go:42:20:42:21 | &... [pointer] | provenance |  |
 | CookieWithoutHttpOnly.go:46:7:49:2 | struct literal | CookieWithoutHttpOnly.go:51:20:51:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:46:7:49:2 | struct literal | CookieWithoutHttpOnly.go:51:20:51:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:46:7:49:2 | struct literal | CookieWithoutHttpOnly.go:51:20:51:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:46:7:49:2 | struct literal | CookieWithoutHttpOnly.go:51:20:51:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:46:7:49:2 | struct literal | CookieWithoutHttpOnly.go:51:21:51:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:46:7:49:2 | struct literal | CookieWithoutHttpOnly.go:51:21:51:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:47:10:47:18 | "session" | CookieWithoutHttpOnly.go:46:7:49:2 | struct literal | provenance | Config |
 | CookieWithoutHttpOnly.go:50:15:50:19 | false | CookieWithoutHttpOnly.go:46:7:49:2 | struct literal | provenance | Config |
-| CookieWithoutHttpOnly.go:51:20:51:21 | &... | CookieWithoutHttpOnly.go:51:21:51:21 | c | provenance |  |
-| CookieWithoutHttpOnly.go:51:20:51:21 | &... | CookieWithoutHttpOnly.go:51:21:51:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:51:20:51:21 | &... [pointer] | CookieWithoutHttpOnly.go:51:20:51:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:51:20:51:21 | &... [pointer] | CookieWithoutHttpOnly.go:51:20:51:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:51:20:51:21 | &... [pointer] | CookieWithoutHttpOnly.go:51:20:51:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:51:20:51:21 | &... [pointer] | CookieWithoutHttpOnly.go:51:20:51:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:51:20:51:21 | &... [pointer] | CookieWithoutHttpOnly.go:51:21:51:21 | c | provenance |  |
-| CookieWithoutHttpOnly.go:51:20:51:21 | &... [pointer] | CookieWithoutHttpOnly.go:51:21:51:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:51:21:51:21 | c | CookieWithoutHttpOnly.go:51:20:51:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:51:21:51:21 | c | CookieWithoutHttpOnly.go:51:20:51:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:51:21:51:21 | c | CookieWithoutHttpOnly.go:51:20:51:21 | &... [pointer] | provenance |  |
@@ -93,20 +57,12 @@ edges
 | CookieWithoutHttpOnly.go:55:9:55:13 | false | CookieWithoutHttpOnly.go:59:13:59:15 | val | provenance |  |
 | CookieWithoutHttpOnly.go:56:7:60:2 | struct literal | CookieWithoutHttpOnly.go:61:20:61:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:56:7:60:2 | struct literal | CookieWithoutHttpOnly.go:61:20:61:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:56:7:60:2 | struct literal | CookieWithoutHttpOnly.go:61:20:61:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:56:7:60:2 | struct literal | CookieWithoutHttpOnly.go:61:20:61:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:56:7:60:2 | struct literal | CookieWithoutHttpOnly.go:61:21:61:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:56:7:60:2 | struct literal | CookieWithoutHttpOnly.go:61:21:61:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:57:13:57:21 | "session" | CookieWithoutHttpOnly.go:56:7:60:2 | struct literal | provenance | Config |
 | CookieWithoutHttpOnly.go:59:13:59:15 | val | CookieWithoutHttpOnly.go:56:7:60:2 | struct literal | provenance | Config |
-| CookieWithoutHttpOnly.go:61:20:61:21 | &... | CookieWithoutHttpOnly.go:61:21:61:21 | c | provenance |  |
-| CookieWithoutHttpOnly.go:61:20:61:21 | &... | CookieWithoutHttpOnly.go:61:21:61:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:61:20:61:21 | &... [pointer] | CookieWithoutHttpOnly.go:61:20:61:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:61:20:61:21 | &... [pointer] | CookieWithoutHttpOnly.go:61:20:61:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:61:20:61:21 | &... [pointer] | CookieWithoutHttpOnly.go:61:20:61:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:61:20:61:21 | &... [pointer] | CookieWithoutHttpOnly.go:61:20:61:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:61:20:61:21 | &... [pointer] | CookieWithoutHttpOnly.go:61:21:61:21 | c | provenance |  |
-| CookieWithoutHttpOnly.go:61:20:61:21 | &... [pointer] | CookieWithoutHttpOnly.go:61:21:61:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:61:21:61:21 | c | CookieWithoutHttpOnly.go:61:20:61:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:61:21:61:21 | c | CookieWithoutHttpOnly.go:61:20:61:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:61:21:61:21 | c | CookieWithoutHttpOnly.go:61:20:61:21 | &... [pointer] | provenance |  |
@@ -115,20 +71,12 @@ edges
 | CookieWithoutHttpOnly.go:65:9:65:12 | true | CookieWithoutHttpOnly.go:69:13:69:15 | val | provenance |  |
 | CookieWithoutHttpOnly.go:66:7:70:2 | struct literal | CookieWithoutHttpOnly.go:71:20:71:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:66:7:70:2 | struct literal | CookieWithoutHttpOnly.go:71:20:71:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:66:7:70:2 | struct literal | CookieWithoutHttpOnly.go:71:20:71:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:66:7:70:2 | struct literal | CookieWithoutHttpOnly.go:71:20:71:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:66:7:70:2 | struct literal | CookieWithoutHttpOnly.go:71:21:71:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:66:7:70:2 | struct literal | CookieWithoutHttpOnly.go:71:21:71:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:67:13:67:21 | "session" | CookieWithoutHttpOnly.go:66:7:70:2 | struct literal | provenance | Config |
 | CookieWithoutHttpOnly.go:69:13:69:15 | val | CookieWithoutHttpOnly.go:66:7:70:2 | struct literal | provenance | Config |
-| CookieWithoutHttpOnly.go:71:20:71:21 | &... | CookieWithoutHttpOnly.go:71:21:71:21 | c | provenance |  |
-| CookieWithoutHttpOnly.go:71:20:71:21 | &... | CookieWithoutHttpOnly.go:71:21:71:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:71:20:71:21 | &... [pointer] | CookieWithoutHttpOnly.go:71:20:71:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:71:20:71:21 | &... [pointer] | CookieWithoutHttpOnly.go:71:20:71:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:71:20:71:21 | &... [pointer] | CookieWithoutHttpOnly.go:71:20:71:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:71:20:71:21 | &... [pointer] | CookieWithoutHttpOnly.go:71:20:71:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:71:20:71:21 | &... [pointer] | CookieWithoutHttpOnly.go:71:21:71:21 | c | provenance |  |
-| CookieWithoutHttpOnly.go:71:20:71:21 | &... [pointer] | CookieWithoutHttpOnly.go:71:21:71:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:71:21:71:21 | c | CookieWithoutHttpOnly.go:71:20:71:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:71:21:71:21 | c | CookieWithoutHttpOnly.go:71:20:71:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:71:21:71:21 | c | CookieWithoutHttpOnly.go:71:20:71:21 | &... [pointer] | provenance |  |
@@ -137,20 +85,12 @@ edges
 | CookieWithoutHttpOnly.go:75:9:75:12 | true | CookieWithoutHttpOnly.go:80:15:80:17 | val | provenance |  |
 | CookieWithoutHttpOnly.go:76:7:79:2 | struct literal | CookieWithoutHttpOnly.go:81:20:81:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:76:7:79:2 | struct literal | CookieWithoutHttpOnly.go:81:20:81:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:76:7:79:2 | struct literal | CookieWithoutHttpOnly.go:81:20:81:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:76:7:79:2 | struct literal | CookieWithoutHttpOnly.go:81:20:81:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:76:7:79:2 | struct literal | CookieWithoutHttpOnly.go:81:21:81:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:76:7:79:2 | struct literal | CookieWithoutHttpOnly.go:81:21:81:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:77:10:77:18 | "session" | CookieWithoutHttpOnly.go:76:7:79:2 | struct literal | provenance | Config |
 | CookieWithoutHttpOnly.go:80:15:80:17 | val | CookieWithoutHttpOnly.go:76:7:79:2 | struct literal | provenance | Config |
-| CookieWithoutHttpOnly.go:81:20:81:21 | &... | CookieWithoutHttpOnly.go:81:21:81:21 | c | provenance |  |
-| CookieWithoutHttpOnly.go:81:20:81:21 | &... | CookieWithoutHttpOnly.go:81:21:81:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:81:20:81:21 | &... [pointer] | CookieWithoutHttpOnly.go:81:20:81:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:81:20:81:21 | &... [pointer] | CookieWithoutHttpOnly.go:81:20:81:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:81:20:81:21 | &... [pointer] | CookieWithoutHttpOnly.go:81:20:81:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:81:20:81:21 | &... [pointer] | CookieWithoutHttpOnly.go:81:20:81:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:81:20:81:21 | &... [pointer] | CookieWithoutHttpOnly.go:81:21:81:21 | c | provenance |  |
-| CookieWithoutHttpOnly.go:81:20:81:21 | &... [pointer] | CookieWithoutHttpOnly.go:81:21:81:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:81:21:81:21 | c | CookieWithoutHttpOnly.go:81:20:81:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:81:21:81:21 | c | CookieWithoutHttpOnly.go:81:20:81:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:81:21:81:21 | c | CookieWithoutHttpOnly.go:81:20:81:21 | &... [pointer] | provenance |  |
@@ -159,51 +99,31 @@ edges
 | CookieWithoutHttpOnly.go:85:9:85:13 | false | CookieWithoutHttpOnly.go:90:15:90:17 | val | provenance |  |
 | CookieWithoutHttpOnly.go:86:7:89:2 | struct literal | CookieWithoutHttpOnly.go:91:20:91:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:86:7:89:2 | struct literal | CookieWithoutHttpOnly.go:91:20:91:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:86:7:89:2 | struct literal | CookieWithoutHttpOnly.go:91:20:91:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:86:7:89:2 | struct literal | CookieWithoutHttpOnly.go:91:20:91:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:86:7:89:2 | struct literal | CookieWithoutHttpOnly.go:91:21:91:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:86:7:89:2 | struct literal | CookieWithoutHttpOnly.go:91:21:91:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:87:10:87:18 | "session" | CookieWithoutHttpOnly.go:86:7:89:2 | struct literal | provenance | Config |
 | CookieWithoutHttpOnly.go:90:15:90:17 | val | CookieWithoutHttpOnly.go:86:7:89:2 | struct literal | provenance | Config |
-| CookieWithoutHttpOnly.go:91:20:91:21 | &... | CookieWithoutHttpOnly.go:91:21:91:21 | c | provenance |  |
-| CookieWithoutHttpOnly.go:91:20:91:21 | &... | CookieWithoutHttpOnly.go:91:21:91:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:91:20:91:21 | &... [pointer] | CookieWithoutHttpOnly.go:91:20:91:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:91:20:91:21 | &... [pointer] | CookieWithoutHttpOnly.go:91:20:91:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:91:20:91:21 | &... [pointer] | CookieWithoutHttpOnly.go:91:20:91:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:91:20:91:21 | &... [pointer] | CookieWithoutHttpOnly.go:91:20:91:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:91:20:91:21 | &... [pointer] | CookieWithoutHttpOnly.go:91:21:91:21 | c | provenance |  |
-| CookieWithoutHttpOnly.go:91:20:91:21 | &... [pointer] | CookieWithoutHttpOnly.go:91:21:91:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:91:21:91:21 | c | CookieWithoutHttpOnly.go:91:20:91:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:91:21:91:21 | c | CookieWithoutHttpOnly.go:91:20:91:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:91:21:91:21 | c | CookieWithoutHttpOnly.go:91:20:91:21 | &... [pointer] | provenance |  |
 | CookieWithoutHttpOnly.go:91:21:91:21 | c | CookieWithoutHttpOnly.go:91:20:91:21 | &... [pointer] | provenance |  |
 | CookieWithoutHttpOnly.go:95:7:98:2 | struct literal | CookieWithoutHttpOnly.go:100:20:100:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:95:7:98:2 | struct literal | CookieWithoutHttpOnly.go:100:20:100:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:95:7:98:2 | struct literal | CookieWithoutHttpOnly.go:100:21:100:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:99:15:99:19 | false | CookieWithoutHttpOnly.go:95:7:98:2 | struct literal | provenance | Config |
-| CookieWithoutHttpOnly.go:100:20:100:21 | &... | CookieWithoutHttpOnly.go:100:21:100:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:100:20:100:21 | &... [pointer] | CookieWithoutHttpOnly.go:100:20:100:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:100:20:100:21 | &... [pointer] | CookieWithoutHttpOnly.go:100:20:100:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:100:20:100:21 | &... [pointer] | CookieWithoutHttpOnly.go:100:21:100:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:100:21:100:21 | c | CookieWithoutHttpOnly.go:100:20:100:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:100:21:100:21 | c | CookieWithoutHttpOnly.go:100:20:100:21 | &... [pointer] | provenance |  |
 | CookieWithoutHttpOnly.go:104:10:104:18 | "session" | CookieWithoutHttpOnly.go:106:10:106:13 | name | provenance |  |
 | CookieWithoutHttpOnly.go:105:7:108:2 | struct literal | CookieWithoutHttpOnly.go:110:20:110:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:105:7:108:2 | struct literal | CookieWithoutHttpOnly.go:110:20:110:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:105:7:108:2 | struct literal | CookieWithoutHttpOnly.go:110:20:110:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:105:7:108:2 | struct literal | CookieWithoutHttpOnly.go:110:20:110:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:105:7:108:2 | struct literal | CookieWithoutHttpOnly.go:110:21:110:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:105:7:108:2 | struct literal | CookieWithoutHttpOnly.go:110:21:110:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:106:10:106:13 | name | CookieWithoutHttpOnly.go:105:7:108:2 | struct literal | provenance | Config |
 | CookieWithoutHttpOnly.go:109:15:109:19 | false | CookieWithoutHttpOnly.go:105:7:108:2 | struct literal | provenance | Config |
-| CookieWithoutHttpOnly.go:110:20:110:21 | &... | CookieWithoutHttpOnly.go:110:21:110:21 | c | provenance |  |
-| CookieWithoutHttpOnly.go:110:20:110:21 | &... | CookieWithoutHttpOnly.go:110:21:110:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:110:20:110:21 | &... [pointer] | CookieWithoutHttpOnly.go:110:20:110:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:110:20:110:21 | &... [pointer] | CookieWithoutHttpOnly.go:110:20:110:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:110:20:110:21 | &... [pointer] | CookieWithoutHttpOnly.go:110:20:110:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:110:20:110:21 | &... [pointer] | CookieWithoutHttpOnly.go:110:20:110:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:110:20:110:21 | &... [pointer] | CookieWithoutHttpOnly.go:110:21:110:21 | c | provenance |  |
-| CookieWithoutHttpOnly.go:110:20:110:21 | &... [pointer] | CookieWithoutHttpOnly.go:110:21:110:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:110:21:110:21 | c | CookieWithoutHttpOnly.go:110:20:110:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:110:21:110:21 | c | CookieWithoutHttpOnly.go:110:20:110:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:110:21:110:21 | c | CookieWithoutHttpOnly.go:110:20:110:21 | &... [pointer] | provenance |  |
@@ -211,20 +131,12 @@ edges
 | CookieWithoutHttpOnly.go:114:13:114:24 | "login_name" | CookieWithoutHttpOnly.go:116:10:116:16 | session | provenance |  |
 | CookieWithoutHttpOnly.go:115:7:118:2 | struct literal | CookieWithoutHttpOnly.go:120:20:120:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:115:7:118:2 | struct literal | CookieWithoutHttpOnly.go:120:20:120:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:115:7:118:2 | struct literal | CookieWithoutHttpOnly.go:120:20:120:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:115:7:118:2 | struct literal | CookieWithoutHttpOnly.go:120:20:120:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:115:7:118:2 | struct literal | CookieWithoutHttpOnly.go:120:21:120:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:115:7:118:2 | struct literal | CookieWithoutHttpOnly.go:120:21:120:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:116:10:116:16 | session | CookieWithoutHttpOnly.go:115:7:118:2 | struct literal | provenance | Config |
 | CookieWithoutHttpOnly.go:119:15:119:19 | false | CookieWithoutHttpOnly.go:115:7:118:2 | struct literal | provenance | Config |
-| CookieWithoutHttpOnly.go:120:20:120:21 | &... | CookieWithoutHttpOnly.go:120:21:120:21 | c | provenance |  |
-| CookieWithoutHttpOnly.go:120:20:120:21 | &... | CookieWithoutHttpOnly.go:120:21:120:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:120:20:120:21 | &... [pointer] | CookieWithoutHttpOnly.go:120:20:120:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:120:20:120:21 | &... [pointer] | CookieWithoutHttpOnly.go:120:20:120:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:120:20:120:21 | &... [pointer] | CookieWithoutHttpOnly.go:120:20:120:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:120:20:120:21 | &... [pointer] | CookieWithoutHttpOnly.go:120:20:120:21 | &... | provenance |  |
-| CookieWithoutHttpOnly.go:120:20:120:21 | &... [pointer] | CookieWithoutHttpOnly.go:120:21:120:21 | c | provenance |  |
-| CookieWithoutHttpOnly.go:120:20:120:21 | &... [pointer] | CookieWithoutHttpOnly.go:120:21:120:21 | c | provenance |  |
 | CookieWithoutHttpOnly.go:120:21:120:21 | c | CookieWithoutHttpOnly.go:120:20:120:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:120:21:120:21 | c | CookieWithoutHttpOnly.go:120:20:120:21 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:120:21:120:21 | c | CookieWithoutHttpOnly.go:120:20:120:21 | &... [pointer] | provenance |  |
@@ -235,233 +147,83 @@ edges
 | CookieWithoutHttpOnly.go:123:13:123:49 | call to NewCookieStore | CookieWithoutHttpOnly.go:158:16:158:20 | store | provenance |  |
 | CookieWithoutHttpOnly.go:123:13:123:49 | call to NewCookieStore | CookieWithoutHttpOnly.go:170:16:170:20 | store | provenance |  |
 | CookieWithoutHttpOnly.go:123:13:123:49 | call to NewCookieStore | CookieWithoutHttpOnly.go:183:16:183:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:123:13:123:49 | call to NewCookieStore | CookieWithoutHttpOnly.go:191:2:191:6 | store | provenance |  |
 | CookieWithoutHttpOnly.go:123:13:123:49 | call to NewCookieStore | CookieWithoutHttpOnly.go:195:16:195:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:123:13:123:49 | call to NewCookieStore | CookieWithoutHttpOnly.go:202:2:202:6 | store | provenance |  |
 | CookieWithoutHttpOnly.go:126:2:126:43 | ... := ...[0] | CookieWithoutHttpOnly.go:129:2:129:8 | session | provenance |  |
 | CookieWithoutHttpOnly.go:126:16:126:20 | store | CookieWithoutHttpOnly.go:126:2:126:43 | ... := ...[0] | provenance | Config |
-| CookieWithoutHttpOnly.go:126:16:126:20 | store | CookieWithoutHttpOnly.go:126:16:126:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:126:16:126:20 | store | CookieWithoutHttpOnly.go:134:16:134:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:126:16:126:20 | store | CookieWithoutHttpOnly.go:146:16:146:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:126:16:126:20 | store | CookieWithoutHttpOnly.go:158:16:158:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:126:16:126:20 | store | CookieWithoutHttpOnly.go:170:16:170:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:126:16:126:20 | store | CookieWithoutHttpOnly.go:183:16:183:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:126:16:126:20 | store | CookieWithoutHttpOnly.go:191:2:191:6 | store | provenance |  |
-| CookieWithoutHttpOnly.go:126:16:126:20 | store | CookieWithoutHttpOnly.go:195:16:195:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:126:16:126:20 | store | CookieWithoutHttpOnly.go:202:2:202:6 | store | provenance |  |
 | CookieWithoutHttpOnly.go:133:2:133:9 | definition of httpOnly | CookieWithoutHttpOnly.go:139:13:139:20 | httpOnly | provenance |  |
 | CookieWithoutHttpOnly.go:133:14:133:18 | false | CookieWithoutHttpOnly.go:139:13:139:20 | httpOnly | provenance |  |
-| CookieWithoutHttpOnly.go:134:2:134:8 | definition of session [pointer] | CookieWithoutHttpOnly.go:135:2:135:8 | session [pointer] | provenance |  |
-| CookieWithoutHttpOnly.go:134:2:134:8 | definition of session [pointer] | CookieWithoutHttpOnly.go:135:2:135:8 | session [pointer] | provenance |  |
-| CookieWithoutHttpOnly.go:134:2:134:8 | definition of session [pointer] | CookieWithoutHttpOnly.go:137:2:137:8 | session [pointer] | provenance |  |
-| CookieWithoutHttpOnly.go:134:2:134:8 | definition of session [pointer] | CookieWithoutHttpOnly.go:137:2:137:8 | session [pointer] | provenance |  |
-| CookieWithoutHttpOnly.go:134:2:134:8 | definition of session [pointer] | CookieWithoutHttpOnly.go:142:2:142:8 | session | provenance |  |
-| CookieWithoutHttpOnly.go:134:2:134:8 | definition of session [pointer] | CookieWithoutHttpOnly.go:142:2:142:8 | session | provenance |  |
 | CookieWithoutHttpOnly.go:134:2:134:43 | ... := ...[0] | CookieWithoutHttpOnly.go:142:2:142:8 | session | provenance |  |
-| CookieWithoutHttpOnly.go:134:16:134:20 | store | CookieWithoutHttpOnly.go:126:16:126:20 | store | provenance |  |
 | CookieWithoutHttpOnly.go:134:16:134:20 | store | CookieWithoutHttpOnly.go:134:2:134:43 | ... := ...[0] | provenance | Config |
-| CookieWithoutHttpOnly.go:134:16:134:20 | store | CookieWithoutHttpOnly.go:134:16:134:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:134:16:134:20 | store | CookieWithoutHttpOnly.go:146:16:146:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:134:16:134:20 | store | CookieWithoutHttpOnly.go:158:16:158:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:134:16:134:20 | store | CookieWithoutHttpOnly.go:170:16:170:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:134:16:134:20 | store | CookieWithoutHttpOnly.go:183:16:183:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:134:16:134:20 | store | CookieWithoutHttpOnly.go:191:2:191:6 | store | provenance |  |
-| CookieWithoutHttpOnly.go:134:16:134:20 | store | CookieWithoutHttpOnly.go:195:16:195:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:134:16:134:20 | store | CookieWithoutHttpOnly.go:202:2:202:6 | store | provenance |  |
-| CookieWithoutHttpOnly.go:135:2:135:8 | implicit dereference | CookieWithoutHttpOnly.go:134:2:134:8 | definition of session [pointer] | provenance |  |
-| CookieWithoutHttpOnly.go:135:2:135:8 | implicit dereference | CookieWithoutHttpOnly.go:134:2:134:8 | definition of session [pointer] | provenance |  |
-| CookieWithoutHttpOnly.go:135:2:135:8 | implicit dereference | CookieWithoutHttpOnly.go:137:2:137:8 | session | provenance |  |
-| CookieWithoutHttpOnly.go:135:2:135:8 | implicit dereference | CookieWithoutHttpOnly.go:137:2:137:8 | session | provenance |  |
-| CookieWithoutHttpOnly.go:135:2:135:8 | implicit dereference | CookieWithoutHttpOnly.go:142:2:142:8 | session | provenance |  |
-| CookieWithoutHttpOnly.go:135:2:135:8 | implicit dereference | CookieWithoutHttpOnly.go:142:2:142:8 | session | provenance |  |
-| CookieWithoutHttpOnly.go:135:2:135:8 | session [pointer] | CookieWithoutHttpOnly.go:135:2:135:8 | implicit dereference | provenance |  |
-| CookieWithoutHttpOnly.go:135:2:135:8 | session [pointer] | CookieWithoutHttpOnly.go:135:2:135:8 | implicit dereference | provenance |  |
-| CookieWithoutHttpOnly.go:137:2:137:8 | implicit dereference | CookieWithoutHttpOnly.go:134:2:134:8 | definition of session [pointer] | provenance |  |
-| CookieWithoutHttpOnly.go:137:2:137:8 | implicit dereference | CookieWithoutHttpOnly.go:134:2:134:8 | definition of session [pointer] | provenance |  |
-| CookieWithoutHttpOnly.go:137:2:137:8 | implicit dereference | CookieWithoutHttpOnly.go:135:2:135:8 | implicit dereference | provenance |  |
-| CookieWithoutHttpOnly.go:137:2:137:8 | implicit dereference | CookieWithoutHttpOnly.go:135:2:135:8 | implicit dereference | provenance |  |
-| CookieWithoutHttpOnly.go:137:2:137:8 | implicit dereference | CookieWithoutHttpOnly.go:137:2:137:8 | session | provenance |  |
-| CookieWithoutHttpOnly.go:137:2:137:8 | implicit dereference | CookieWithoutHttpOnly.go:137:2:137:8 | session | provenance |  |
-| CookieWithoutHttpOnly.go:137:2:137:8 | implicit dereference | CookieWithoutHttpOnly.go:142:2:142:8 | session | provenance |  |
-| CookieWithoutHttpOnly.go:137:2:137:8 | implicit dereference | CookieWithoutHttpOnly.go:142:2:142:8 | session | provenance |  |
-| CookieWithoutHttpOnly.go:137:2:137:8 | session | CookieWithoutHttpOnly.go:137:2:137:8 | implicit dereference | provenance |  |
-| CookieWithoutHttpOnly.go:137:2:137:8 | session | CookieWithoutHttpOnly.go:137:2:137:8 | implicit dereference | provenance |  |
-| CookieWithoutHttpOnly.go:137:2:137:8 | session [pointer] | CookieWithoutHttpOnly.go:137:2:137:8 | implicit dereference | provenance |  |
-| CookieWithoutHttpOnly.go:137:2:137:8 | session [pointer] | CookieWithoutHttpOnly.go:137:2:137:8 | implicit dereference | provenance |  |
-| CookieWithoutHttpOnly.go:137:20:140:2 | &... | CookieWithoutHttpOnly.go:137:2:137:8 | implicit dereference | provenance | Config |
-| CookieWithoutHttpOnly.go:137:20:140:2 | &... | CookieWithoutHttpOnly.go:137:2:137:8 | implicit dereference | provenance | Config |
-| CookieWithoutHttpOnly.go:137:20:140:2 | &... | CookieWithoutHttpOnly.go:137:2:137:8 | session | provenance | Config |
-| CookieWithoutHttpOnly.go:137:20:140:2 | &... | CookieWithoutHttpOnly.go:137:2:137:8 | session | provenance | Config |
-| CookieWithoutHttpOnly.go:137:20:140:2 | &... | CookieWithoutHttpOnly.go:137:21:140:2 | struct literal | provenance |  |
+| CookieWithoutHttpOnly.go:137:2:137:8 | implicit dereference [postupdate] | CookieWithoutHttpOnly.go:137:2:137:8 | session [postupdate] | provenance |  |
+| CookieWithoutHttpOnly.go:137:2:137:8 | implicit dereference [postupdate] | CookieWithoutHttpOnly.go:137:2:137:8 | session [postupdate] | provenance |  |
+| CookieWithoutHttpOnly.go:137:2:137:8 | implicit dereference [postupdate] | CookieWithoutHttpOnly.go:137:2:137:8 | session [postupdate] [pointer] | provenance |  |
+| CookieWithoutHttpOnly.go:137:2:137:8 | implicit dereference [postupdate] | CookieWithoutHttpOnly.go:137:2:137:8 | session [postupdate] [pointer] | provenance |  |
+| CookieWithoutHttpOnly.go:137:2:137:8 | session [postupdate] | CookieWithoutHttpOnly.go:142:2:142:8 | session | provenance |  |
+| CookieWithoutHttpOnly.go:137:2:137:8 | session [postupdate] | CookieWithoutHttpOnly.go:142:2:142:8 | session | provenance |  |
+| CookieWithoutHttpOnly.go:137:2:137:8 | session [postupdate] [pointer] | CookieWithoutHttpOnly.go:142:2:142:8 | session | provenance |  |
+| CookieWithoutHttpOnly.go:137:2:137:8 | session [postupdate] [pointer] | CookieWithoutHttpOnly.go:142:2:142:8 | session | provenance |  |
+| CookieWithoutHttpOnly.go:137:20:140:2 | &... | CookieWithoutHttpOnly.go:137:2:137:8 | implicit dereference [postupdate] | provenance | Config |
+| CookieWithoutHttpOnly.go:137:20:140:2 | &... | CookieWithoutHttpOnly.go:137:2:137:8 | implicit dereference [postupdate] | provenance | Config |
+| CookieWithoutHttpOnly.go:137:20:140:2 | &... | CookieWithoutHttpOnly.go:137:2:137:8 | session [postupdate] | provenance | Config |
+| CookieWithoutHttpOnly.go:137:20:140:2 | &... | CookieWithoutHttpOnly.go:137:2:137:8 | session [postupdate] | provenance | Config |
 | CookieWithoutHttpOnly.go:137:21:140:2 | struct literal | CookieWithoutHttpOnly.go:137:20:140:2 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:137:21:140:2 | struct literal | CookieWithoutHttpOnly.go:137:20:140:2 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:139:13:139:20 | httpOnly | CookieWithoutHttpOnly.go:137:21:140:2 | struct literal | provenance | Config |
-| CookieWithoutHttpOnly.go:146:2:146:8 | definition of session [pointer] | CookieWithoutHttpOnly.go:147:2:147:8 | session [pointer] | provenance |  |
-| CookieWithoutHttpOnly.go:146:2:146:8 | definition of session [pointer] | CookieWithoutHttpOnly.go:149:2:149:8 | session [pointer] | provenance |  |
-| CookieWithoutHttpOnly.go:146:2:146:8 | definition of session [pointer] | CookieWithoutHttpOnly.go:153:2:153:8 | session | provenance |  |
 | CookieWithoutHttpOnly.go:146:2:146:43 | ... := ...[0] | CookieWithoutHttpOnly.go:153:2:153:8 | session | provenance |  |
-| CookieWithoutHttpOnly.go:146:16:146:20 | store | CookieWithoutHttpOnly.go:126:16:126:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:146:16:146:20 | store | CookieWithoutHttpOnly.go:134:16:134:20 | store | provenance |  |
 | CookieWithoutHttpOnly.go:146:16:146:20 | store | CookieWithoutHttpOnly.go:146:2:146:43 | ... := ...[0] | provenance | Config |
-| CookieWithoutHttpOnly.go:146:16:146:20 | store | CookieWithoutHttpOnly.go:146:16:146:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:146:16:146:20 | store | CookieWithoutHttpOnly.go:158:16:158:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:146:16:146:20 | store | CookieWithoutHttpOnly.go:170:16:170:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:146:16:146:20 | store | CookieWithoutHttpOnly.go:183:16:183:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:146:16:146:20 | store | CookieWithoutHttpOnly.go:191:2:191:6 | store | provenance |  |
-| CookieWithoutHttpOnly.go:146:16:146:20 | store | CookieWithoutHttpOnly.go:195:16:195:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:146:16:146:20 | store | CookieWithoutHttpOnly.go:202:2:202:6 | store | provenance |  |
-| CookieWithoutHttpOnly.go:147:2:147:8 | implicit dereference | CookieWithoutHttpOnly.go:146:2:146:8 | definition of session [pointer] | provenance |  |
-| CookieWithoutHttpOnly.go:147:2:147:8 | implicit dereference | CookieWithoutHttpOnly.go:149:2:149:8 | session | provenance |  |
-| CookieWithoutHttpOnly.go:147:2:147:8 | implicit dereference | CookieWithoutHttpOnly.go:153:2:153:8 | session | provenance |  |
-| CookieWithoutHttpOnly.go:147:2:147:8 | session [pointer] | CookieWithoutHttpOnly.go:147:2:147:8 | implicit dereference | provenance |  |
-| CookieWithoutHttpOnly.go:149:2:149:8 | implicit dereference | CookieWithoutHttpOnly.go:146:2:146:8 | definition of session [pointer] | provenance |  |
-| CookieWithoutHttpOnly.go:149:2:149:8 | implicit dereference | CookieWithoutHttpOnly.go:147:2:147:8 | implicit dereference | provenance |  |
-| CookieWithoutHttpOnly.go:149:2:149:8 | implicit dereference | CookieWithoutHttpOnly.go:149:2:149:8 | session | provenance |  |
-| CookieWithoutHttpOnly.go:149:2:149:8 | implicit dereference | CookieWithoutHttpOnly.go:153:2:153:8 | session | provenance |  |
-| CookieWithoutHttpOnly.go:149:2:149:8 | session | CookieWithoutHttpOnly.go:149:2:149:8 | implicit dereference | provenance |  |
-| CookieWithoutHttpOnly.go:149:2:149:8 | session [pointer] | CookieWithoutHttpOnly.go:149:2:149:8 | implicit dereference | provenance |  |
-| CookieWithoutHttpOnly.go:149:20:151:2 | &... | CookieWithoutHttpOnly.go:149:2:149:8 | implicit dereference | provenance | Config |
-| CookieWithoutHttpOnly.go:149:20:151:2 | &... | CookieWithoutHttpOnly.go:149:2:149:8 | session | provenance | Config |
+| CookieWithoutHttpOnly.go:149:2:149:8 | implicit dereference [postupdate] | CookieWithoutHttpOnly.go:149:2:149:8 | session [postupdate] | provenance |  |
+| CookieWithoutHttpOnly.go:149:2:149:8 | implicit dereference [postupdate] | CookieWithoutHttpOnly.go:149:2:149:8 | session [postupdate] [pointer] | provenance |  |
+| CookieWithoutHttpOnly.go:149:2:149:8 | session [postupdate] | CookieWithoutHttpOnly.go:153:2:153:8 | session | provenance |  |
+| CookieWithoutHttpOnly.go:149:2:149:8 | session [postupdate] [pointer] | CookieWithoutHttpOnly.go:153:2:153:8 | session | provenance |  |
+| CookieWithoutHttpOnly.go:149:20:151:2 | &... | CookieWithoutHttpOnly.go:149:2:149:8 | implicit dereference [postupdate] | provenance | Config |
+| CookieWithoutHttpOnly.go:149:20:151:2 | &... | CookieWithoutHttpOnly.go:149:2:149:8 | session [postupdate] | provenance | Config |
 | CookieWithoutHttpOnly.go:149:21:151:2 | struct literal | CookieWithoutHttpOnly.go:149:20:151:2 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:157:2:157:9 | definition of httpOnly | CookieWithoutHttpOnly.go:163:13:163:20 | httpOnly | provenance |  |
 | CookieWithoutHttpOnly.go:157:14:157:17 | true | CookieWithoutHttpOnly.go:163:13:163:20 | httpOnly | provenance |  |
-| CookieWithoutHttpOnly.go:158:2:158:8 | definition of session [pointer] | CookieWithoutHttpOnly.go:159:2:159:8 | session [pointer] | provenance |  |
-| CookieWithoutHttpOnly.go:158:2:158:8 | definition of session [pointer] | CookieWithoutHttpOnly.go:159:2:159:8 | session [pointer] | provenance |  |
-| CookieWithoutHttpOnly.go:158:2:158:8 | definition of session [pointer] | CookieWithoutHttpOnly.go:161:2:161:8 | session [pointer] | provenance |  |
-| CookieWithoutHttpOnly.go:158:2:158:8 | definition of session [pointer] | CookieWithoutHttpOnly.go:161:2:161:8 | session [pointer] | provenance |  |
-| CookieWithoutHttpOnly.go:158:2:158:8 | definition of session [pointer] | CookieWithoutHttpOnly.go:166:2:166:8 | session | provenance |  |
-| CookieWithoutHttpOnly.go:158:2:158:8 | definition of session [pointer] | CookieWithoutHttpOnly.go:166:2:166:8 | session | provenance |  |
 | CookieWithoutHttpOnly.go:158:2:158:43 | ... := ...[0] | CookieWithoutHttpOnly.go:166:2:166:8 | session | provenance |  |
-| CookieWithoutHttpOnly.go:158:16:158:20 | store | CookieWithoutHttpOnly.go:126:16:126:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:158:16:158:20 | store | CookieWithoutHttpOnly.go:134:16:134:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:158:16:158:20 | store | CookieWithoutHttpOnly.go:146:16:146:20 | store | provenance |  |
 | CookieWithoutHttpOnly.go:158:16:158:20 | store | CookieWithoutHttpOnly.go:158:2:158:43 | ... := ...[0] | provenance | Config |
-| CookieWithoutHttpOnly.go:158:16:158:20 | store | CookieWithoutHttpOnly.go:158:16:158:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:158:16:158:20 | store | CookieWithoutHttpOnly.go:170:16:170:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:158:16:158:20 | store | CookieWithoutHttpOnly.go:183:16:183:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:158:16:158:20 | store | CookieWithoutHttpOnly.go:191:2:191:6 | store | provenance |  |
-| CookieWithoutHttpOnly.go:158:16:158:20 | store | CookieWithoutHttpOnly.go:195:16:195:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:158:16:158:20 | store | CookieWithoutHttpOnly.go:202:2:202:6 | store | provenance |  |
-| CookieWithoutHttpOnly.go:159:2:159:8 | implicit dereference | CookieWithoutHttpOnly.go:158:2:158:8 | definition of session [pointer] | provenance |  |
-| CookieWithoutHttpOnly.go:159:2:159:8 | implicit dereference | CookieWithoutHttpOnly.go:158:2:158:8 | definition of session [pointer] | provenance |  |
-| CookieWithoutHttpOnly.go:159:2:159:8 | implicit dereference | CookieWithoutHttpOnly.go:161:2:161:8 | session | provenance |  |
-| CookieWithoutHttpOnly.go:159:2:159:8 | implicit dereference | CookieWithoutHttpOnly.go:161:2:161:8 | session | provenance |  |
-| CookieWithoutHttpOnly.go:159:2:159:8 | implicit dereference | CookieWithoutHttpOnly.go:166:2:166:8 | session | provenance |  |
-| CookieWithoutHttpOnly.go:159:2:159:8 | implicit dereference | CookieWithoutHttpOnly.go:166:2:166:8 | session | provenance |  |
-| CookieWithoutHttpOnly.go:159:2:159:8 | session [pointer] | CookieWithoutHttpOnly.go:159:2:159:8 | implicit dereference | provenance |  |
-| CookieWithoutHttpOnly.go:159:2:159:8 | session [pointer] | CookieWithoutHttpOnly.go:159:2:159:8 | implicit dereference | provenance |  |
-| CookieWithoutHttpOnly.go:161:2:161:8 | implicit dereference | CookieWithoutHttpOnly.go:158:2:158:8 | definition of session [pointer] | provenance |  |
-| CookieWithoutHttpOnly.go:161:2:161:8 | implicit dereference | CookieWithoutHttpOnly.go:158:2:158:8 | definition of session [pointer] | provenance |  |
-| CookieWithoutHttpOnly.go:161:2:161:8 | implicit dereference | CookieWithoutHttpOnly.go:159:2:159:8 | implicit dereference | provenance |  |
-| CookieWithoutHttpOnly.go:161:2:161:8 | implicit dereference | CookieWithoutHttpOnly.go:159:2:159:8 | implicit dereference | provenance |  |
-| CookieWithoutHttpOnly.go:161:2:161:8 | implicit dereference | CookieWithoutHttpOnly.go:161:2:161:8 | session | provenance |  |
-| CookieWithoutHttpOnly.go:161:2:161:8 | implicit dereference | CookieWithoutHttpOnly.go:161:2:161:8 | session | provenance |  |
-| CookieWithoutHttpOnly.go:161:2:161:8 | implicit dereference | CookieWithoutHttpOnly.go:166:2:166:8 | session | provenance |  |
-| CookieWithoutHttpOnly.go:161:2:161:8 | implicit dereference | CookieWithoutHttpOnly.go:166:2:166:8 | session | provenance |  |
-| CookieWithoutHttpOnly.go:161:2:161:8 | session | CookieWithoutHttpOnly.go:161:2:161:8 | implicit dereference | provenance |  |
-| CookieWithoutHttpOnly.go:161:2:161:8 | session | CookieWithoutHttpOnly.go:161:2:161:8 | implicit dereference | provenance |  |
-| CookieWithoutHttpOnly.go:161:2:161:8 | session [pointer] | CookieWithoutHttpOnly.go:161:2:161:8 | implicit dereference | provenance |  |
-| CookieWithoutHttpOnly.go:161:2:161:8 | session [pointer] | CookieWithoutHttpOnly.go:161:2:161:8 | implicit dereference | provenance |  |
-| CookieWithoutHttpOnly.go:161:20:164:2 | &... | CookieWithoutHttpOnly.go:161:2:161:8 | implicit dereference | provenance | Config |
-| CookieWithoutHttpOnly.go:161:20:164:2 | &... | CookieWithoutHttpOnly.go:161:2:161:8 | implicit dereference | provenance | Config |
-| CookieWithoutHttpOnly.go:161:20:164:2 | &... | CookieWithoutHttpOnly.go:161:2:161:8 | session | provenance | Config |
-| CookieWithoutHttpOnly.go:161:20:164:2 | &... | CookieWithoutHttpOnly.go:161:2:161:8 | session | provenance | Config |
-| CookieWithoutHttpOnly.go:161:20:164:2 | &... | CookieWithoutHttpOnly.go:161:21:164:2 | struct literal | provenance |  |
+| CookieWithoutHttpOnly.go:161:2:161:8 | implicit dereference [postupdate] | CookieWithoutHttpOnly.go:161:2:161:8 | session [postupdate] | provenance |  |
+| CookieWithoutHttpOnly.go:161:2:161:8 | implicit dereference [postupdate] | CookieWithoutHttpOnly.go:161:2:161:8 | session [postupdate] | provenance |  |
+| CookieWithoutHttpOnly.go:161:2:161:8 | implicit dereference [postupdate] | CookieWithoutHttpOnly.go:161:2:161:8 | session [postupdate] [pointer] | provenance |  |
+| CookieWithoutHttpOnly.go:161:2:161:8 | implicit dereference [postupdate] | CookieWithoutHttpOnly.go:161:2:161:8 | session [postupdate] [pointer] | provenance |  |
+| CookieWithoutHttpOnly.go:161:2:161:8 | session [postupdate] | CookieWithoutHttpOnly.go:166:2:166:8 | session | provenance |  |
+| CookieWithoutHttpOnly.go:161:2:161:8 | session [postupdate] | CookieWithoutHttpOnly.go:166:2:166:8 | session | provenance |  |
+| CookieWithoutHttpOnly.go:161:2:161:8 | session [postupdate] [pointer] | CookieWithoutHttpOnly.go:166:2:166:8 | session | provenance |  |
+| CookieWithoutHttpOnly.go:161:2:161:8 | session [postupdate] [pointer] | CookieWithoutHttpOnly.go:166:2:166:8 | session | provenance |  |
+| CookieWithoutHttpOnly.go:161:20:164:2 | &... | CookieWithoutHttpOnly.go:161:2:161:8 | implicit dereference [postupdate] | provenance | Config |
+| CookieWithoutHttpOnly.go:161:20:164:2 | &... | CookieWithoutHttpOnly.go:161:2:161:8 | implicit dereference [postupdate] | provenance | Config |
+| CookieWithoutHttpOnly.go:161:20:164:2 | &... | CookieWithoutHttpOnly.go:161:2:161:8 | session [postupdate] | provenance | Config |
+| CookieWithoutHttpOnly.go:161:20:164:2 | &... | CookieWithoutHttpOnly.go:161:2:161:8 | session [postupdate] | provenance | Config |
 | CookieWithoutHttpOnly.go:161:21:164:2 | struct literal | CookieWithoutHttpOnly.go:161:20:164:2 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:161:21:164:2 | struct literal | CookieWithoutHttpOnly.go:161:20:164:2 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:163:13:163:20 | httpOnly | CookieWithoutHttpOnly.go:161:21:164:2 | struct literal | provenance | Config |
 | CookieWithoutHttpOnly.go:169:56:169:63 | argument corresponding to httpOnly | CookieWithoutHttpOnly.go:175:13:175:20 | httpOnly | provenance |  |
 | CookieWithoutHttpOnly.go:169:56:169:63 | definition of httpOnly | CookieWithoutHttpOnly.go:175:13:175:20 | httpOnly | provenance |  |
-| CookieWithoutHttpOnly.go:170:2:170:8 | definition of session [pointer] | CookieWithoutHttpOnly.go:171:2:171:8 | session [pointer] | provenance |  |
-| CookieWithoutHttpOnly.go:170:2:170:8 | definition of session [pointer] | CookieWithoutHttpOnly.go:171:2:171:8 | session [pointer] | provenance |  |
-| CookieWithoutHttpOnly.go:170:2:170:8 | definition of session [pointer] | CookieWithoutHttpOnly.go:173:2:173:8 | session [pointer] | provenance |  |
-| CookieWithoutHttpOnly.go:170:2:170:8 | definition of session [pointer] | CookieWithoutHttpOnly.go:173:2:173:8 | session [pointer] | provenance |  |
-| CookieWithoutHttpOnly.go:170:2:170:8 | definition of session [pointer] | CookieWithoutHttpOnly.go:178:2:178:8 | session | provenance |  |
-| CookieWithoutHttpOnly.go:170:2:170:8 | definition of session [pointer] | CookieWithoutHttpOnly.go:178:2:178:8 | session | provenance |  |
 | CookieWithoutHttpOnly.go:170:2:170:43 | ... := ...[0] | CookieWithoutHttpOnly.go:178:2:178:8 | session | provenance |  |
-| CookieWithoutHttpOnly.go:170:16:170:20 | store | CookieWithoutHttpOnly.go:126:16:126:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:170:16:170:20 | store | CookieWithoutHttpOnly.go:134:16:134:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:170:16:170:20 | store | CookieWithoutHttpOnly.go:146:16:146:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:170:16:170:20 | store | CookieWithoutHttpOnly.go:158:16:158:20 | store | provenance |  |
 | CookieWithoutHttpOnly.go:170:16:170:20 | store | CookieWithoutHttpOnly.go:170:2:170:43 | ... := ...[0] | provenance | Config |
-| CookieWithoutHttpOnly.go:170:16:170:20 | store | CookieWithoutHttpOnly.go:170:16:170:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:170:16:170:20 | store | CookieWithoutHttpOnly.go:183:16:183:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:170:16:170:20 | store | CookieWithoutHttpOnly.go:191:2:191:6 | store | provenance |  |
-| CookieWithoutHttpOnly.go:170:16:170:20 | store | CookieWithoutHttpOnly.go:195:16:195:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:170:16:170:20 | store | CookieWithoutHttpOnly.go:202:2:202:6 | store | provenance |  |
-| CookieWithoutHttpOnly.go:171:2:171:8 | implicit dereference | CookieWithoutHttpOnly.go:170:2:170:8 | definition of session [pointer] | provenance |  |
-| CookieWithoutHttpOnly.go:171:2:171:8 | implicit dereference | CookieWithoutHttpOnly.go:170:2:170:8 | definition of session [pointer] | provenance |  |
-| CookieWithoutHttpOnly.go:171:2:171:8 | implicit dereference | CookieWithoutHttpOnly.go:173:2:173:8 | session | provenance |  |
-| CookieWithoutHttpOnly.go:171:2:171:8 | implicit dereference | CookieWithoutHttpOnly.go:173:2:173:8 | session | provenance |  |
-| CookieWithoutHttpOnly.go:171:2:171:8 | implicit dereference | CookieWithoutHttpOnly.go:178:2:178:8 | session | provenance |  |
-| CookieWithoutHttpOnly.go:171:2:171:8 | implicit dereference | CookieWithoutHttpOnly.go:178:2:178:8 | session | provenance |  |
-| CookieWithoutHttpOnly.go:171:2:171:8 | session [pointer] | CookieWithoutHttpOnly.go:171:2:171:8 | implicit dereference | provenance |  |
-| CookieWithoutHttpOnly.go:171:2:171:8 | session [pointer] | CookieWithoutHttpOnly.go:171:2:171:8 | implicit dereference | provenance |  |
-| CookieWithoutHttpOnly.go:173:2:173:8 | implicit dereference | CookieWithoutHttpOnly.go:170:2:170:8 | definition of session [pointer] | provenance |  |
-| CookieWithoutHttpOnly.go:173:2:173:8 | implicit dereference | CookieWithoutHttpOnly.go:170:2:170:8 | definition of session [pointer] | provenance |  |
-| CookieWithoutHttpOnly.go:173:2:173:8 | implicit dereference | CookieWithoutHttpOnly.go:171:2:171:8 | implicit dereference | provenance |  |
-| CookieWithoutHttpOnly.go:173:2:173:8 | implicit dereference | CookieWithoutHttpOnly.go:171:2:171:8 | implicit dereference | provenance |  |
-| CookieWithoutHttpOnly.go:173:2:173:8 | implicit dereference | CookieWithoutHttpOnly.go:173:2:173:8 | session | provenance |  |
-| CookieWithoutHttpOnly.go:173:2:173:8 | implicit dereference | CookieWithoutHttpOnly.go:173:2:173:8 | session | provenance |  |
-| CookieWithoutHttpOnly.go:173:2:173:8 | implicit dereference | CookieWithoutHttpOnly.go:178:2:178:8 | session | provenance |  |
-| CookieWithoutHttpOnly.go:173:2:173:8 | implicit dereference | CookieWithoutHttpOnly.go:178:2:178:8 | session | provenance |  |
-| CookieWithoutHttpOnly.go:173:2:173:8 | session | CookieWithoutHttpOnly.go:173:2:173:8 | implicit dereference | provenance |  |
-| CookieWithoutHttpOnly.go:173:2:173:8 | session | CookieWithoutHttpOnly.go:173:2:173:8 | implicit dereference | provenance |  |
-| CookieWithoutHttpOnly.go:173:2:173:8 | session [pointer] | CookieWithoutHttpOnly.go:173:2:173:8 | implicit dereference | provenance |  |
-| CookieWithoutHttpOnly.go:173:2:173:8 | session [pointer] | CookieWithoutHttpOnly.go:173:2:173:8 | implicit dereference | provenance |  |
-| CookieWithoutHttpOnly.go:173:20:176:2 | &... | CookieWithoutHttpOnly.go:173:2:173:8 | implicit dereference | provenance | Config |
-| CookieWithoutHttpOnly.go:173:20:176:2 | &... | CookieWithoutHttpOnly.go:173:2:173:8 | implicit dereference | provenance | Config |
-| CookieWithoutHttpOnly.go:173:20:176:2 | &... | CookieWithoutHttpOnly.go:173:2:173:8 | session | provenance | Config |
-| CookieWithoutHttpOnly.go:173:20:176:2 | &... | CookieWithoutHttpOnly.go:173:2:173:8 | session | provenance | Config |
-| CookieWithoutHttpOnly.go:173:20:176:2 | &... | CookieWithoutHttpOnly.go:173:21:176:2 | struct literal | provenance |  |
+| CookieWithoutHttpOnly.go:173:2:173:8 | implicit dereference [postupdate] | CookieWithoutHttpOnly.go:173:2:173:8 | session [postupdate] | provenance |  |
+| CookieWithoutHttpOnly.go:173:2:173:8 | implicit dereference [postupdate] | CookieWithoutHttpOnly.go:173:2:173:8 | session [postupdate] | provenance |  |
+| CookieWithoutHttpOnly.go:173:2:173:8 | implicit dereference [postupdate] | CookieWithoutHttpOnly.go:173:2:173:8 | session [postupdate] [pointer] | provenance |  |
+| CookieWithoutHttpOnly.go:173:2:173:8 | implicit dereference [postupdate] | CookieWithoutHttpOnly.go:173:2:173:8 | session [postupdate] [pointer] | provenance |  |
+| CookieWithoutHttpOnly.go:173:2:173:8 | session [postupdate] | CookieWithoutHttpOnly.go:178:2:178:8 | session | provenance |  |
+| CookieWithoutHttpOnly.go:173:2:173:8 | session [postupdate] | CookieWithoutHttpOnly.go:178:2:178:8 | session | provenance |  |
+| CookieWithoutHttpOnly.go:173:2:173:8 | session [postupdate] [pointer] | CookieWithoutHttpOnly.go:178:2:178:8 | session | provenance |  |
+| CookieWithoutHttpOnly.go:173:2:173:8 | session [postupdate] [pointer] | CookieWithoutHttpOnly.go:178:2:178:8 | session | provenance |  |
+| CookieWithoutHttpOnly.go:173:20:176:2 | &... | CookieWithoutHttpOnly.go:173:2:173:8 | implicit dereference [postupdate] | provenance | Config |
+| CookieWithoutHttpOnly.go:173:20:176:2 | &... | CookieWithoutHttpOnly.go:173:2:173:8 | implicit dereference [postupdate] | provenance | Config |
+| CookieWithoutHttpOnly.go:173:20:176:2 | &... | CookieWithoutHttpOnly.go:173:2:173:8 | session [postupdate] | provenance | Config |
+| CookieWithoutHttpOnly.go:173:20:176:2 | &... | CookieWithoutHttpOnly.go:173:2:173:8 | session [postupdate] | provenance | Config |
 | CookieWithoutHttpOnly.go:173:21:176:2 | struct literal | CookieWithoutHttpOnly.go:173:20:176:2 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:173:21:176:2 | struct literal | CookieWithoutHttpOnly.go:173:20:176:2 | &... | provenance |  |
 | CookieWithoutHttpOnly.go:175:13:175:20 | httpOnly | CookieWithoutHttpOnly.go:173:21:176:2 | struct literal | provenance | Config |
 | CookieWithoutHttpOnly.go:183:2:183:43 | ... := ...[0] | CookieWithoutHttpOnly.go:191:19:191:25 | session | provenance |  |
-| CookieWithoutHttpOnly.go:183:16:183:20 | store | CookieWithoutHttpOnly.go:126:16:126:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:183:16:183:20 | store | CookieWithoutHttpOnly.go:134:16:134:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:183:16:183:20 | store | CookieWithoutHttpOnly.go:146:16:146:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:183:16:183:20 | store | CookieWithoutHttpOnly.go:158:16:158:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:183:16:183:20 | store | CookieWithoutHttpOnly.go:170:16:170:20 | store | provenance |  |
 | CookieWithoutHttpOnly.go:183:16:183:20 | store | CookieWithoutHttpOnly.go:183:2:183:43 | ... := ...[0] | provenance | Config |
-| CookieWithoutHttpOnly.go:183:16:183:20 | store | CookieWithoutHttpOnly.go:183:16:183:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:183:16:183:20 | store | CookieWithoutHttpOnly.go:191:2:191:6 | store | provenance |  |
-| CookieWithoutHttpOnly.go:183:16:183:20 | store | CookieWithoutHttpOnly.go:195:16:195:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:183:16:183:20 | store | CookieWithoutHttpOnly.go:202:2:202:6 | store | provenance |  |
-| CookieWithoutHttpOnly.go:191:2:191:6 | store | CookieWithoutHttpOnly.go:126:16:126:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:191:2:191:6 | store | CookieWithoutHttpOnly.go:134:16:134:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:191:2:191:6 | store | CookieWithoutHttpOnly.go:146:16:146:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:191:2:191:6 | store | CookieWithoutHttpOnly.go:158:16:158:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:191:2:191:6 | store | CookieWithoutHttpOnly.go:170:16:170:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:191:2:191:6 | store | CookieWithoutHttpOnly.go:183:16:183:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:191:2:191:6 | store | CookieWithoutHttpOnly.go:191:2:191:6 | store | provenance |  |
-| CookieWithoutHttpOnly.go:191:2:191:6 | store | CookieWithoutHttpOnly.go:195:16:195:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:191:2:191:6 | store | CookieWithoutHttpOnly.go:202:2:202:6 | store | provenance |  |
 | CookieWithoutHttpOnly.go:195:2:195:43 | ... := ...[0] | CookieWithoutHttpOnly.go:202:19:202:25 | session | provenance |  |
-| CookieWithoutHttpOnly.go:195:16:195:20 | store | CookieWithoutHttpOnly.go:126:16:126:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:195:16:195:20 | store | CookieWithoutHttpOnly.go:134:16:134:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:195:16:195:20 | store | CookieWithoutHttpOnly.go:146:16:146:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:195:16:195:20 | store | CookieWithoutHttpOnly.go:158:16:158:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:195:16:195:20 | store | CookieWithoutHttpOnly.go:170:16:170:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:195:16:195:20 | store | CookieWithoutHttpOnly.go:183:16:183:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:195:16:195:20 | store | CookieWithoutHttpOnly.go:191:2:191:6 | store | provenance |  |
 | CookieWithoutHttpOnly.go:195:16:195:20 | store | CookieWithoutHttpOnly.go:195:2:195:43 | ... := ...[0] | provenance | Config |
-| CookieWithoutHttpOnly.go:195:16:195:20 | store | CookieWithoutHttpOnly.go:195:16:195:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:195:16:195:20 | store | CookieWithoutHttpOnly.go:202:2:202:6 | store | provenance |  |
-| CookieWithoutHttpOnly.go:202:2:202:6 | store | CookieWithoutHttpOnly.go:126:16:126:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:202:2:202:6 | store | CookieWithoutHttpOnly.go:134:16:134:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:202:2:202:6 | store | CookieWithoutHttpOnly.go:146:16:146:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:202:2:202:6 | store | CookieWithoutHttpOnly.go:158:16:158:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:202:2:202:6 | store | CookieWithoutHttpOnly.go:170:16:170:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:202:2:202:6 | store | CookieWithoutHttpOnly.go:183:16:183:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:202:2:202:6 | store | CookieWithoutHttpOnly.go:191:2:191:6 | store | provenance |  |
-| CookieWithoutHttpOnly.go:202:2:202:6 | store | CookieWithoutHttpOnly.go:195:16:195:20 | store | provenance |  |
-| CookieWithoutHttpOnly.go:202:2:202:6 | store | CookieWithoutHttpOnly.go:202:2:202:6 | store | provenance |  |
 nodes
 | CookieWithoutHttpOnly.go:11:7:14:2 | struct literal | semmle.label | struct literal |
 | CookieWithoutHttpOnly.go:12:10:12:18 | "session" | semmle.label | "session" |
 | CookieWithoutHttpOnly.go:15:20:15:21 | &... | semmle.label | &... |
-| CookieWithoutHttpOnly.go:15:20:15:21 | &... | semmle.label | &... |
 | CookieWithoutHttpOnly.go:15:20:15:21 | &... [pointer] | semmle.label | &... [pointer] |
 | CookieWithoutHttpOnly.go:15:21:15:21 | c | semmle.label | c |
 | CookieWithoutHttpOnly.go:19:7:23:2 | struct literal | semmle.label | struct literal |
@@ -470,8 +232,6 @@ nodes
 | CookieWithoutHttpOnly.go:22:13:22:17 | false | semmle.label | false |
 | CookieWithoutHttpOnly.go:24:20:24:21 | &... | semmle.label | &... |
 | CookieWithoutHttpOnly.go:24:20:24:21 | &... | semmle.label | &... |
-| CookieWithoutHttpOnly.go:24:20:24:21 | &... | semmle.label | &... |
-| CookieWithoutHttpOnly.go:24:20:24:21 | &... | semmle.label | &... |
 | CookieWithoutHttpOnly.go:24:20:24:21 | &... [pointer] | semmle.label | &... [pointer] |
 | CookieWithoutHttpOnly.go:24:20:24:21 | &... [pointer] | semmle.label | &... [pointer] |
 | CookieWithoutHttpOnly.go:24:21:24:21 | c | semmle.label | c |
@@ -482,8 +242,6 @@ nodes
 | CookieWithoutHttpOnly.go:31:13:31:16 | true | semmle.label | true |
 | CookieWithoutHttpOnly.go:33:20:33:21 | &... | semmle.label | &... |
 | CookieWithoutHttpOnly.go:33:20:33:21 | &... | semmle.label | &... |
-| CookieWithoutHttpOnly.go:33:20:33:21 | &... | semmle.label | &... |
-| CookieWithoutHttpOnly.go:33:20:33:21 | &... | semmle.label | &... |
 | CookieWithoutHttpOnly.go:33:20:33:21 | &... [pointer] | semmle.label | &... [pointer] |
 | CookieWithoutHttpOnly.go:33:20:33:21 | &... [pointer] | semmle.label | &... [pointer] |
 | CookieWithoutHttpOnly.go:33:21:33:21 | c | semmle.label | c |
@@ -494,8 +252,6 @@ nodes
 | CookieWithoutHttpOnly.go:41:15:41:18 | true | semmle.label | true |
 | CookieWithoutHttpOnly.go:42:20:42:21 | &... | semmle.label | &... |
 | CookieWithoutHttpOnly.go:42:20:42:21 | &... | semmle.label | &... |
-| CookieWithoutHttpOnly.go:42:20:42:21 | &... | semmle.label | &... |
-| CookieWithoutHttpOnly.go:42:20:42:21 | &... | semmle.label | &... |
 | CookieWithoutHttpOnly.go:42:20:42:21 | &... [pointer] | semmle.label | &... [pointer] |
 | CookieWithoutHttpOnly.go:42:20:42:21 | &... [pointer] | semmle.label | &... [pointer] |
 | CookieWithoutHttpOnly.go:42:21:42:21 | c | semmle.label | c |
@@ -506,8 +262,6 @@ nodes
 | CookieWithoutHttpOnly.go:50:15:50:19 | false | semmle.label | false |
 | CookieWithoutHttpOnly.go:51:20:51:21 | &... | semmle.label | &... |
 | CookieWithoutHttpOnly.go:51:20:51:21 | &... | semmle.label | &... |
-| CookieWithoutHttpOnly.go:51:20:51:21 | &... | semmle.label | &... |
-| CookieWithoutHttpOnly.go:51:20:51:21 | &... | semmle.label | &... |
 | CookieWithoutHttpOnly.go:51:20:51:21 | &... [pointer] | semmle.label | &... [pointer] |
 | CookieWithoutHttpOnly.go:51:20:51:21 | &... [pointer] | semmle.label | &... [pointer] |
 | CookieWithoutHttpOnly.go:51:21:51:21 | c | semmle.label | c |
@@ -520,8 +274,6 @@ nodes
 | CookieWithoutHttpOnly.go:59:13:59:15 | val | semmle.label | val |
 | CookieWithoutHttpOnly.go:61:20:61:21 | &... | semmle.label | &... |
 | CookieWithoutHttpOnly.go:61:20:61:21 | &... | semmle.label | &... |
-| CookieWithoutHttpOnly.go:61:20:61:21 | &... | semmle.label | &... |
-| CookieWithoutHttpOnly.go:61:20:61:21 | &... | semmle.label | &... |
 | CookieWithoutHttpOnly.go:61:20:61:21 | &... [pointer] | semmle.label | &... [pointer] |
 | CookieWithoutHttpOnly.go:61:20:61:21 | &... [pointer] | semmle.label | &... [pointer] |
 | CookieWithoutHttpOnly.go:61:21:61:21 | c | semmle.label | c |
@@ -534,8 +286,6 @@ nodes
 | CookieWithoutHttpOnly.go:69:13:69:15 | val | semmle.label | val |
 | CookieWithoutHttpOnly.go:71:20:71:21 | &... | semmle.label | &... |
 | CookieWithoutHttpOnly.go:71:20:71:21 | &... | semmle.label | &... |
-| CookieWithoutHttpOnly.go:71:20:71:21 | &... | semmle.label | &... |
-| CookieWithoutHttpOnly.go:71:20:71:21 | &... | semmle.label | &... |
 | CookieWithoutHttpOnly.go:71:20:71:21 | &... [pointer] | semmle.label | &... [pointer] |
 | CookieWithoutHttpOnly.go:71:20:71:21 | &... [pointer] | semmle.label | &... [pointer] |
 | CookieWithoutHttpOnly.go:71:21:71:21 | c | semmle.label | c |
@@ -548,8 +298,6 @@ nodes
 | CookieWithoutHttpOnly.go:80:15:80:17 | val | semmle.label | val |
 | CookieWithoutHttpOnly.go:81:20:81:21 | &... | semmle.label | &... |
 | CookieWithoutHttpOnly.go:81:20:81:21 | &... | semmle.label | &... |
-| CookieWithoutHttpOnly.go:81:20:81:21 | &... | semmle.label | &... |
-| CookieWithoutHttpOnly.go:81:20:81:21 | &... | semmle.label | &... |
 | CookieWithoutHttpOnly.go:81:20:81:21 | &... [pointer] | semmle.label | &... [pointer] |
 | CookieWithoutHttpOnly.go:81:20:81:21 | &... [pointer] | semmle.label | &... [pointer] |
 | CookieWithoutHttpOnly.go:81:21:81:21 | c | semmle.label | c |
@@ -562,8 +310,6 @@ nodes
 | CookieWithoutHttpOnly.go:90:15:90:17 | val | semmle.label | val |
 | CookieWithoutHttpOnly.go:91:20:91:21 | &... | semmle.label | &... |
 | CookieWithoutHttpOnly.go:91:20:91:21 | &... | semmle.label | &... |
-| CookieWithoutHttpOnly.go:91:20:91:21 | &... | semmle.label | &... |
-| CookieWithoutHttpOnly.go:91:20:91:21 | &... | semmle.label | &... |
 | CookieWithoutHttpOnly.go:91:20:91:21 | &... [pointer] | semmle.label | &... [pointer] |
 | CookieWithoutHttpOnly.go:91:20:91:21 | &... [pointer] | semmle.label | &... [pointer] |
 | CookieWithoutHttpOnly.go:91:21:91:21 | c | semmle.label | c |
@@ -571,7 +317,6 @@ nodes
 | CookieWithoutHttpOnly.go:95:7:98:2 | struct literal | semmle.label | struct literal |
 | CookieWithoutHttpOnly.go:99:15:99:19 | false | semmle.label | false |
 | CookieWithoutHttpOnly.go:100:20:100:21 | &... | semmle.label | &... |
-| CookieWithoutHttpOnly.go:100:20:100:21 | &... | semmle.label | &... |
 | CookieWithoutHttpOnly.go:100:20:100:21 | &... [pointer] | semmle.label | &... [pointer] |
 | CookieWithoutHttpOnly.go:100:21:100:21 | c | semmle.label | c |
 | CookieWithoutHttpOnly.go:104:10:104:18 | "session" | semmle.label | "session" |
@@ -581,8 +326,6 @@ nodes
 | CookieWithoutHttpOnly.go:109:15:109:19 | false | semmle.label | false |
 | CookieWithoutHttpOnly.go:110:20:110:21 | &... | semmle.label | &... |
 | CookieWithoutHttpOnly.go:110:20:110:21 | &... | semmle.label | &... |
-| CookieWithoutHttpOnly.go:110:20:110:21 | &... | semmle.label | &... |
-| CookieWithoutHttpOnly.go:110:20:110:21 | &... | semmle.label | &... |
 | CookieWithoutHttpOnly.go:110:20:110:21 | &... [pointer] | semmle.label | &... [pointer] |
 | CookieWithoutHttpOnly.go:110:20:110:21 | &... [pointer] | semmle.label | &... [pointer] |
 | CookieWithoutHttpOnly.go:110:21:110:21 | c | semmle.label | c |
@@ -594,8 +337,6 @@ nodes
 | CookieWithoutHttpOnly.go:119:15:119:19 | false | semmle.label | false |
 | CookieWithoutHttpOnly.go:120:20:120:21 | &... | semmle.label | &... |
 | CookieWithoutHttpOnly.go:120:20:120:21 | &... | semmle.label | &... |
-| CookieWithoutHttpOnly.go:120:20:120:21 | &... | semmle.label | &... |
-| CookieWithoutHttpOnly.go:120:20:120:21 | &... | semmle.label | &... |
 | CookieWithoutHttpOnly.go:120:20:120:21 | &... [pointer] | semmle.label | &... [pointer] |
 | CookieWithoutHttpOnly.go:120:20:120:21 | &... [pointer] | semmle.label | &... [pointer] |
 | CookieWithoutHttpOnly.go:120:21:120:21 | c | semmle.label | c |
@@ -606,20 +347,14 @@ nodes
 | CookieWithoutHttpOnly.go:129:2:129:8 | session | semmle.label | session |
 | CookieWithoutHttpOnly.go:133:2:133:9 | definition of httpOnly | semmle.label | definition of httpOnly |
 | CookieWithoutHttpOnly.go:133:14:133:18 | false | semmle.label | false |
-| CookieWithoutHttpOnly.go:134:2:134:8 | definition of session [pointer] | semmle.label | definition of session [pointer] |
-| CookieWithoutHttpOnly.go:134:2:134:8 | definition of session [pointer] | semmle.label | definition of session [pointer] |
 | CookieWithoutHttpOnly.go:134:2:134:43 | ... := ...[0] | semmle.label | ... := ...[0] |
 | CookieWithoutHttpOnly.go:134:16:134:20 | store | semmle.label | store |
-| CookieWithoutHttpOnly.go:135:2:135:8 | implicit dereference | semmle.label | implicit dereference |
-| CookieWithoutHttpOnly.go:135:2:135:8 | implicit dereference | semmle.label | implicit dereference |
-| CookieWithoutHttpOnly.go:135:2:135:8 | session [pointer] | semmle.label | session [pointer] |
-| CookieWithoutHttpOnly.go:135:2:135:8 | session [pointer] | semmle.label | session [pointer] |
-| CookieWithoutHttpOnly.go:137:2:137:8 | implicit dereference | semmle.label | implicit dereference |
-| CookieWithoutHttpOnly.go:137:2:137:8 | implicit dereference | semmle.label | implicit dereference |
-| CookieWithoutHttpOnly.go:137:2:137:8 | session | semmle.label | session |
-| CookieWithoutHttpOnly.go:137:2:137:8 | session | semmle.label | session |
-| CookieWithoutHttpOnly.go:137:2:137:8 | session [pointer] | semmle.label | session [pointer] |
-| CookieWithoutHttpOnly.go:137:2:137:8 | session [pointer] | semmle.label | session [pointer] |
+| CookieWithoutHttpOnly.go:137:2:137:8 | implicit dereference [postupdate] | semmle.label | implicit dereference [postupdate] |
+| CookieWithoutHttpOnly.go:137:2:137:8 | implicit dereference [postupdate] | semmle.label | implicit dereference [postupdate] |
+| CookieWithoutHttpOnly.go:137:2:137:8 | session [postupdate] | semmle.label | session [postupdate] |
+| CookieWithoutHttpOnly.go:137:2:137:8 | session [postupdate] | semmle.label | session [postupdate] |
+| CookieWithoutHttpOnly.go:137:2:137:8 | session [postupdate] [pointer] | semmle.label | session [postupdate] [pointer] |
+| CookieWithoutHttpOnly.go:137:2:137:8 | session [postupdate] [pointer] | semmle.label | session [postupdate] [pointer] |
 | CookieWithoutHttpOnly.go:137:20:140:2 | &... | semmle.label | &... |
 | CookieWithoutHttpOnly.go:137:20:140:2 | &... | semmle.label | &... |
 | CookieWithoutHttpOnly.go:137:21:140:2 | struct literal | semmle.label | struct literal |
@@ -628,34 +363,25 @@ nodes
 | CookieWithoutHttpOnly.go:142:2:142:8 | session | semmle.label | session |
 | CookieWithoutHttpOnly.go:142:2:142:8 | session | semmle.label | session |
 | CookieWithoutHttpOnly.go:142:2:142:8 | session | semmle.label | session |
-| CookieWithoutHttpOnly.go:146:2:146:8 | definition of session [pointer] | semmle.label | definition of session [pointer] |
 | CookieWithoutHttpOnly.go:146:2:146:43 | ... := ...[0] | semmle.label | ... := ...[0] |
 | CookieWithoutHttpOnly.go:146:16:146:20 | store | semmle.label | store |
-| CookieWithoutHttpOnly.go:147:2:147:8 | implicit dereference | semmle.label | implicit dereference |
-| CookieWithoutHttpOnly.go:147:2:147:8 | session [pointer] | semmle.label | session [pointer] |
-| CookieWithoutHttpOnly.go:149:2:149:8 | implicit dereference | semmle.label | implicit dereference |
-| CookieWithoutHttpOnly.go:149:2:149:8 | session | semmle.label | session |
-| CookieWithoutHttpOnly.go:149:2:149:8 | session [pointer] | semmle.label | session [pointer] |
+| CookieWithoutHttpOnly.go:149:2:149:8 | implicit dereference [postupdate] | semmle.label | implicit dereference [postupdate] |
+| CookieWithoutHttpOnly.go:149:2:149:8 | session [postupdate] | semmle.label | session [postupdate] |
+| CookieWithoutHttpOnly.go:149:2:149:8 | session [postupdate] [pointer] | semmle.label | session [postupdate] [pointer] |
 | CookieWithoutHttpOnly.go:149:20:151:2 | &... | semmle.label | &... |
 | CookieWithoutHttpOnly.go:149:21:151:2 | struct literal | semmle.label | struct literal |
 | CookieWithoutHttpOnly.go:153:2:153:8 | session | semmle.label | session |
 | CookieWithoutHttpOnly.go:153:2:153:8 | session | semmle.label | session |
 | CookieWithoutHttpOnly.go:157:2:157:9 | definition of httpOnly | semmle.label | definition of httpOnly |
 | CookieWithoutHttpOnly.go:157:14:157:17 | true | semmle.label | true |
-| CookieWithoutHttpOnly.go:158:2:158:8 | definition of session [pointer] | semmle.label | definition of session [pointer] |
-| CookieWithoutHttpOnly.go:158:2:158:8 | definition of session [pointer] | semmle.label | definition of session [pointer] |
 | CookieWithoutHttpOnly.go:158:2:158:43 | ... := ...[0] | semmle.label | ... := ...[0] |
 | CookieWithoutHttpOnly.go:158:16:158:20 | store | semmle.label | store |
-| CookieWithoutHttpOnly.go:159:2:159:8 | implicit dereference | semmle.label | implicit dereference |
-| CookieWithoutHttpOnly.go:159:2:159:8 | implicit dereference | semmle.label | implicit dereference |
-| CookieWithoutHttpOnly.go:159:2:159:8 | session [pointer] | semmle.label | session [pointer] |
-| CookieWithoutHttpOnly.go:159:2:159:8 | session [pointer] | semmle.label | session [pointer] |
-| CookieWithoutHttpOnly.go:161:2:161:8 | implicit dereference | semmle.label | implicit dereference |
-| CookieWithoutHttpOnly.go:161:2:161:8 | implicit dereference | semmle.label | implicit dereference |
-| CookieWithoutHttpOnly.go:161:2:161:8 | session | semmle.label | session |
-| CookieWithoutHttpOnly.go:161:2:161:8 | session | semmle.label | session |
-| CookieWithoutHttpOnly.go:161:2:161:8 | session [pointer] | semmle.label | session [pointer] |
-| CookieWithoutHttpOnly.go:161:2:161:8 | session [pointer] | semmle.label | session [pointer] |
+| CookieWithoutHttpOnly.go:161:2:161:8 | implicit dereference [postupdate] | semmle.label | implicit dereference [postupdate] |
+| CookieWithoutHttpOnly.go:161:2:161:8 | implicit dereference [postupdate] | semmle.label | implicit dereference [postupdate] |
+| CookieWithoutHttpOnly.go:161:2:161:8 | session [postupdate] | semmle.label | session [postupdate] |
+| CookieWithoutHttpOnly.go:161:2:161:8 | session [postupdate] | semmle.label | session [postupdate] |
+| CookieWithoutHttpOnly.go:161:2:161:8 | session [postupdate] [pointer] | semmle.label | session [postupdate] [pointer] |
+| CookieWithoutHttpOnly.go:161:2:161:8 | session [postupdate] [pointer] | semmle.label | session [postupdate] [pointer] |
 | CookieWithoutHttpOnly.go:161:20:164:2 | &... | semmle.label | &... |
 | CookieWithoutHttpOnly.go:161:20:164:2 | &... | semmle.label | &... |
 | CookieWithoutHttpOnly.go:161:21:164:2 | struct literal | semmle.label | struct literal |
@@ -666,20 +392,14 @@ nodes
 | CookieWithoutHttpOnly.go:166:2:166:8 | session | semmle.label | session |
 | CookieWithoutHttpOnly.go:169:56:169:63 | argument corresponding to httpOnly | semmle.label | argument corresponding to httpOnly |
 | CookieWithoutHttpOnly.go:169:56:169:63 | definition of httpOnly | semmle.label | definition of httpOnly |
-| CookieWithoutHttpOnly.go:170:2:170:8 | definition of session [pointer] | semmle.label | definition of session [pointer] |
-| CookieWithoutHttpOnly.go:170:2:170:8 | definition of session [pointer] | semmle.label | definition of session [pointer] |
 | CookieWithoutHttpOnly.go:170:2:170:43 | ... := ...[0] | semmle.label | ... := ...[0] |
 | CookieWithoutHttpOnly.go:170:16:170:20 | store | semmle.label | store |
-| CookieWithoutHttpOnly.go:171:2:171:8 | implicit dereference | semmle.label | implicit dereference |
-| CookieWithoutHttpOnly.go:171:2:171:8 | implicit dereference | semmle.label | implicit dereference |
-| CookieWithoutHttpOnly.go:171:2:171:8 | session [pointer] | semmle.label | session [pointer] |
-| CookieWithoutHttpOnly.go:171:2:171:8 | session [pointer] | semmle.label | session [pointer] |
-| CookieWithoutHttpOnly.go:173:2:173:8 | implicit dereference | semmle.label | implicit dereference |
-| CookieWithoutHttpOnly.go:173:2:173:8 | implicit dereference | semmle.label | implicit dereference |
-| CookieWithoutHttpOnly.go:173:2:173:8 | session | semmle.label | session |
-| CookieWithoutHttpOnly.go:173:2:173:8 | session | semmle.label | session |
-| CookieWithoutHttpOnly.go:173:2:173:8 | session [pointer] | semmle.label | session [pointer] |
-| CookieWithoutHttpOnly.go:173:2:173:8 | session [pointer] | semmle.label | session [pointer] |
+| CookieWithoutHttpOnly.go:173:2:173:8 | implicit dereference [postupdate] | semmle.label | implicit dereference [postupdate] |
+| CookieWithoutHttpOnly.go:173:2:173:8 | implicit dereference [postupdate] | semmle.label | implicit dereference [postupdate] |
+| CookieWithoutHttpOnly.go:173:2:173:8 | session [postupdate] | semmle.label | session [postupdate] |
+| CookieWithoutHttpOnly.go:173:2:173:8 | session [postupdate] | semmle.label | session [postupdate] |
+| CookieWithoutHttpOnly.go:173:2:173:8 | session [postupdate] [pointer] | semmle.label | session [postupdate] [pointer] |
+| CookieWithoutHttpOnly.go:173:2:173:8 | session [postupdate] [pointer] | semmle.label | session [postupdate] [pointer] |
 | CookieWithoutHttpOnly.go:173:20:176:2 | &... | semmle.label | &... |
 | CookieWithoutHttpOnly.go:173:20:176:2 | &... | semmle.label | &... |
 | CookieWithoutHttpOnly.go:173:21:176:2 | struct literal | semmle.label | struct literal |
@@ -690,11 +410,9 @@ nodes
 | CookieWithoutHttpOnly.go:178:2:178:8 | session | semmle.label | session |
 | CookieWithoutHttpOnly.go:183:2:183:43 | ... := ...[0] | semmle.label | ... := ...[0] |
 | CookieWithoutHttpOnly.go:183:16:183:20 | store | semmle.label | store |
-| CookieWithoutHttpOnly.go:191:2:191:6 | store | semmle.label | store |
 | CookieWithoutHttpOnly.go:191:19:191:25 | session | semmle.label | session |
 | CookieWithoutHttpOnly.go:195:2:195:43 | ... := ...[0] | semmle.label | ... := ...[0] |
 | CookieWithoutHttpOnly.go:195:16:195:20 | store | semmle.label | store |
-| CookieWithoutHttpOnly.go:202:2:202:6 | store | semmle.label | store |
 | CookieWithoutHttpOnly.go:202:19:202:25 | session | semmle.label | session |
 | CookieWithoutHttpOnly.go:214:66:214:70 | false | semmle.label | false |
 subpaths
diff --git a/go/ql/test/experimental/CWE-321-V2/HardCodedKeys.expected b/go/ql/test/experimental/CWE-321-V2/HardCodedKeys.expected
index fa926d9be30..5b26a2a9b36 100644
--- a/go/ql/test/experimental/CWE-321-V2/HardCodedKeys.expected
+++ b/go/ql/test/experimental/CWE-321-V2/HardCodedKeys.expected
@@ -1,16 +1,12 @@
 edges
 | go-jose.v3.go:13:14:13:34 | type conversion | go-jose.v3.go:24:32:24:37 | JwtKey | provenance |  |
-| go-jose.v3.go:13:14:13:34 | type conversion | go-jose.v3.go:24:32:24:37 | JwtKey | provenance |  |
 | go-jose.v3.go:13:21:13:33 | "AllYourBase" | go-jose.v3.go:13:14:13:34 | type conversion | provenance |  |
-| go-jose.v3.go:24:32:24:37 | JwtKey | go-jose.v3.go:24:32:24:37 | JwtKey | provenance |  |
-| go-jose.v3.go:24:32:24:37 | JwtKey | go-jose.v3.go:24:32:24:37 | JwtKey | provenance |  |
 | golang-jwt-v5.go:19:15:19:35 | type conversion | golang-jwt-v5.go:27:9:27:15 | JwtKey1 | provenance |  |
 | golang-jwt-v5.go:19:22:19:34 | "AllYourBase" | golang-jwt-v5.go:19:15:19:35 | type conversion | provenance |  |
 nodes
 | go-jose.v3.go:13:14:13:34 | type conversion | semmle.label | type conversion |
 | go-jose.v3.go:13:21:13:33 | "AllYourBase" | semmle.label | "AllYourBase" |
 | go-jose.v3.go:24:32:24:37 | JwtKey | semmle.label | JwtKey |
-| go-jose.v3.go:24:32:24:37 | JwtKey | semmle.label | JwtKey |
 | golang-jwt-v5.go:19:15:19:35 | type conversion | semmle.label | type conversion |
 | golang-jwt-v5.go:19:22:19:34 | "AllYourBase" | semmle.label | "AllYourBase" |
 | golang-jwt-v5.go:27:9:27:15 | JwtKey1 | semmle.label | JwtKey1 |
diff --git a/go/ql/test/experimental/CWE-522-DecompressionBombs/DecompressionBombs.expected b/go/ql/test/experimental/CWE-522-DecompressionBombs/DecompressionBombs.expected
index 34703cdeef4..46bccc77a97 100644
--- a/go/ql/test/experimental/CWE-522-DecompressionBombs/DecompressionBombs.expected
+++ b/go/ql/test/experimental/CWE-522-DecompressionBombs/DecompressionBombs.expected
@@ -68,9 +68,9 @@ edges
 | test.go:91:15:91:26 | selection of Body | test.go:555:19:555:22 | definition of file | provenance | Src:MaD:1  |
 | test.go:93:5:93:16 | selection of Body | test.go:580:9:580:12 | definition of file | provenance | Src:MaD:1  |
 | test.go:128:20:128:27 | definition of filename | test.go:130:33:130:40 | filename | provenance |  |
-| test.go:128:20:128:27 | definition of filename | test.go:143:51:143:58 | filename | provenance |  |
 | test.go:130:2:130:41 | ... := ...[0] | test.go:132:12:132:12 | f | provenance |  |
 | test.go:130:33:130:40 | filename | test.go:130:2:130:41 | ... := ...[0] | provenance | Config |
+| test.go:130:33:130:40 | filename | test.go:143:51:143:58 | filename | provenance |  |
 | test.go:132:3:132:19 | ... := ...[0] | test.go:134:37:134:38 | rc | provenance |  |
 | test.go:132:12:132:12 | f | test.go:132:3:132:19 | ... := ...[0] | provenance | MaD:4 |
 | test.go:143:2:143:59 | ... := ...[0] | test.go:145:12:145:12 | f | provenance |  |
diff --git a/go/ql/test/experimental/CWE-74/DsnInjectionLocal.expected b/go/ql/test/experimental/CWE-74/DsnInjectionLocal.expected
index 634d637c588..4b26395c8e7 100644
--- a/go/ql/test/experimental/CWE-74/DsnInjectionLocal.expected
+++ b/go/ql/test/experimental/CWE-74/DsnInjectionLocal.expected
@@ -7,17 +7,14 @@ edges
 | Dsn.go:28:11:28:110 | call to Sprintf | Dsn.go:29:29:29:33 | dbDSN | provenance |  |
 | Dsn.go:28:102:28:109 | index expression | Dsn.go:28:11:28:110 | []type{args} [array] | provenance |  |
 | Dsn.go:28:102:28:109 | index expression | Dsn.go:28:11:28:110 | call to Sprintf | provenance | FunctionModel |
-| Dsn.go:62:2:62:4 | definition of cfg [pointer] | Dsn.go:63:9:63:11 | cfg [pointer] | provenance |  |
-| Dsn.go:62:2:62:4 | definition of cfg [pointer] | Dsn.go:67:102:67:104 | cfg [pointer] | provenance |  |
-| Dsn.go:63:9:63:11 | cfg [pointer] | Dsn.go:63:9:63:11 | implicit dereference | provenance |  |
-| Dsn.go:63:9:63:11 | implicit dereference | Dsn.go:62:2:62:4 | definition of cfg [pointer] | provenance |  |
-| Dsn.go:63:9:63:11 | implicit dereference | Dsn.go:67:102:67:108 | selection of dsn | provenance |  |
+| Dsn.go:63:9:63:11 | cfg [postupdate] [pointer] | Dsn.go:67:102:67:104 | cfg [pointer] | provenance |  |
+| Dsn.go:63:9:63:11 | implicit dereference [postupdate] | Dsn.go:63:9:63:11 | cfg [postupdate] [pointer] | provenance |  |
+| Dsn.go:63:9:63:11 | implicit dereference [postupdate] | Dsn.go:67:102:67:108 | selection of dsn | provenance |  |
 | Dsn.go:63:19:63:25 | selection of Args | Dsn.go:63:19:63:29 | slice expression | provenance | Src:MaD:1  |
-| Dsn.go:63:19:63:29 | slice expression | Dsn.go:63:9:63:11 | implicit dereference | provenance | FunctionModel |
+| Dsn.go:63:19:63:29 | slice expression | Dsn.go:63:9:63:11 | implicit dereference [postupdate] | provenance | FunctionModel |
 | Dsn.go:67:11:67:109 | []type{args} [array] | Dsn.go:67:11:67:109 | call to Sprintf | provenance | MaD:2 |
 | Dsn.go:67:11:67:109 | call to Sprintf | Dsn.go:68:29:68:33 | dbDSN | provenance |  |
 | Dsn.go:67:102:67:104 | cfg [pointer] | Dsn.go:67:102:67:104 | implicit dereference | provenance |  |
-| Dsn.go:67:102:67:104 | implicit dereference | Dsn.go:63:9:63:11 | implicit dereference | provenance |  |
 | Dsn.go:67:102:67:104 | implicit dereference | Dsn.go:67:102:67:108 | selection of dsn | provenance |  |
 | Dsn.go:67:102:67:108 | selection of dsn | Dsn.go:67:11:67:109 | []type{args} [array] | provenance |  |
 | Dsn.go:67:102:67:108 | selection of dsn | Dsn.go:67:11:67:109 | call to Sprintf | provenance | FunctionModel |
@@ -30,9 +27,8 @@ nodes
 | Dsn.go:28:11:28:110 | call to Sprintf | semmle.label | call to Sprintf |
 | Dsn.go:28:102:28:109 | index expression | semmle.label | index expression |
 | Dsn.go:29:29:29:33 | dbDSN | semmle.label | dbDSN |
-| Dsn.go:62:2:62:4 | definition of cfg [pointer] | semmle.label | definition of cfg [pointer] |
-| Dsn.go:63:9:63:11 | cfg [pointer] | semmle.label | cfg [pointer] |
-| Dsn.go:63:9:63:11 | implicit dereference | semmle.label | implicit dereference |
+| Dsn.go:63:9:63:11 | cfg [postupdate] [pointer] | semmle.label | cfg [postupdate] [pointer] |
+| Dsn.go:63:9:63:11 | implicit dereference [postupdate] | semmle.label | implicit dereference [postupdate] |
 | Dsn.go:63:19:63:25 | selection of Args | semmle.label | selection of Args |
 | Dsn.go:63:19:63:29 | slice expression | semmle.label | slice expression |
 | Dsn.go:67:11:67:109 | []type{args} [array] | semmle.label | []type{args} [array] |
diff --git a/go/ql/test/experimental/CWE-918/SSRF.expected b/go/ql/test/experimental/CWE-918/SSRF.expected
index 87780085a54..5c8d1832ac1 100644
--- a/go/ql/test/experimental/CWE-918/SSRF.expected
+++ b/go/ql/test/experimental/CWE-918/SSRF.expected
@@ -1,12 +1,13 @@
 #select
-| builtin.go:22:12:22:63 | call to Get | builtin.go:19:12:19:34 | call to FormValue | builtin.go:22:21:22:62 | ...+... | The URL of this request depends on a user-provided value. |
-| builtin.go:88:12:88:53 | call to Dial | builtin.go:83:21:83:31 | call to Referer | builtin.go:88:27:88:40 | untrustedInput | The URL of this request depends on a user-provided value. |
-| builtin.go:102:13:102:40 | call to DialConfig | builtin.go:97:21:97:31 | call to Referer | builtin.go:101:36:101:49 | untrustedInput | The URL of this request depends on a user-provided value. |
-| builtin.go:114:3:114:39 | call to Dial | builtin.go:111:21:111:31 | call to Referer | builtin.go:114:15:114:28 | untrustedInput | The URL of this request depends on a user-provided value. |
-| builtin.go:132:3:132:62 | call to DialContext | builtin.go:129:21:129:31 | call to Referer | builtin.go:132:38:132:51 | untrustedInput | The URL of this request depends on a user-provided value. |
-| new-tests.go:31:2:31:58 | call to Get | new-tests.go:26:26:26:30 | &... | new-tests.go:31:11:31:57 | call to Sprintf | The URL of this request depends on a user-provided value. |
-| new-tests.go:32:2:32:58 | call to Get | new-tests.go:26:26:26:30 | &... | new-tests.go:32:11:32:57 | call to Sprintf | The URL of this request depends on a user-provided value. |
-| new-tests.go:35:3:35:59 | call to Get | new-tests.go:26:26:26:30 | &... | new-tests.go:35:12:35:58 | call to Sprintf | The URL of this request depends on a user-provided value. |
+| builtin.go:23:12:23:63 | call to Get | builtin.go:20:12:20:34 | call to FormValue | builtin.go:23:21:23:62 | ...+... | The URL of this request depends on a user-provided value. |
+| builtin.go:89:12:89:53 | call to Dial | builtin.go:84:21:84:31 | call to Referer | builtin.go:89:27:89:40 | untrustedInput | The URL of this request depends on a user-provided value. |
+| builtin.go:103:13:103:40 | call to DialConfig | builtin.go:98:21:98:31 | call to Referer | builtin.go:102:36:102:49 | untrustedInput | The URL of this request depends on a user-provided value. |
+| builtin.go:115:3:115:39 | call to Dial | builtin.go:112:21:112:31 | call to Referer | builtin.go:115:15:115:28 | untrustedInput | The URL of this request depends on a user-provided value. |
+| builtin.go:133:3:133:62 | call to DialContext | builtin.go:130:21:130:31 | call to Referer | builtin.go:133:38:133:51 | untrustedInput | The URL of this request depends on a user-provided value. |
+| builtin.go:156:12:156:33 | call to Get | builtin.go:151:16:151:36 | call to FormValue | builtin.go:156:21:156:32 | call to String | The URL of this request depends on a user-provided value. |
+| new-tests.go:31:2:31:58 | call to Get | new-tests.go:26:26:26:30 | &... [postupdate] | new-tests.go:31:11:31:57 | call to Sprintf | The URL of this request depends on a user-provided value. |
+| new-tests.go:32:2:32:58 | call to Get | new-tests.go:26:26:26:30 | &... [postupdate] | new-tests.go:32:11:32:57 | call to Sprintf | The URL of this request depends on a user-provided value. |
+| new-tests.go:35:3:35:59 | call to Get | new-tests.go:26:26:26:30 | &... [postupdate] | new-tests.go:35:12:35:58 | call to Sprintf | The URL of this request depends on a user-provided value. |
 | new-tests.go:47:2:47:47 | call to Get | new-tests.go:39:18:39:30 | call to Param | new-tests.go:47:11:47:46 | ...+... | The URL of this request depends on a user-provided value. |
 | new-tests.go:50:2:50:47 | call to Get | new-tests.go:49:18:49:30 | call to Query | new-tests.go:50:11:50:46 | ...+... | The URL of this request depends on a user-provided value. |
 | new-tests.go:68:2:68:58 | call to Get | new-tests.go:62:31:62:38 | selection of Body | new-tests.go:68:11:68:57 | call to Sprintf | The URL of this request depends on a user-provided value. |
@@ -17,14 +18,20 @@
 | new-tests.go:88:2:88:47 | call to Get | new-tests.go:86:10:86:20 | call to Vars | new-tests.go:88:11:88:46 | ...+... | The URL of this request depends on a user-provided value. |
 | new-tests.go:96:2:96:47 | call to Get | new-tests.go:95:18:95:45 | call to URLParam | new-tests.go:96:11:96:46 | ...+... | The URL of this request depends on a user-provided value. |
 edges
-| builtin.go:19:12:19:34 | call to FormValue | builtin.go:22:21:22:62 | ...+... | provenance | Src:MaD:7  |
-| builtin.go:83:21:83:31 | call to Referer | builtin.go:88:27:88:40 | untrustedInput | provenance | Src:MaD:8  |
-| builtin.go:97:21:97:31 | call to Referer | builtin.go:101:36:101:49 | untrustedInput | provenance | Src:MaD:8  |
-| builtin.go:111:21:111:31 | call to Referer | builtin.go:114:15:114:28 | untrustedInput | provenance | Src:MaD:8  |
-| builtin.go:129:21:129:31 | call to Referer | builtin.go:132:38:132:51 | untrustedInput | provenance | Src:MaD:8  |
-| new-tests.go:26:26:26:30 | &... | new-tests.go:31:48:31:56 | selection of word | provenance | Src:MaD:3  |
-| new-tests.go:26:26:26:30 | &... | new-tests.go:32:48:32:56 | selection of safe | provenance | Src:MaD:3  |
-| new-tests.go:26:26:26:30 | &... | new-tests.go:35:49:35:57 | selection of word | provenance | Src:MaD:3  |
+| builtin.go:20:12:20:34 | call to FormValue | builtin.go:23:21:23:62 | ...+... | provenance | Src:MaD:7  |
+| builtin.go:84:21:84:31 | call to Referer | builtin.go:89:27:89:40 | untrustedInput | provenance | Src:MaD:8  |
+| builtin.go:98:21:98:31 | call to Referer | builtin.go:102:36:102:49 | untrustedInput | provenance | Src:MaD:8  |
+| builtin.go:112:21:112:31 | call to Referer | builtin.go:115:15:115:28 | untrustedInput | provenance | Src:MaD:8  |
+| builtin.go:130:21:130:31 | call to Referer | builtin.go:133:38:133:51 | untrustedInput | provenance | Src:MaD:8  |
+| builtin.go:151:16:151:36 | call to FormValue | builtin.go:154:13:154:22 | unsafehost | provenance | Src:MaD:7  |
+| builtin.go:154:2:154:4 | implicit dereference [postupdate] | builtin.go:154:2:154:4 | url [postupdate] | provenance |  |
+| builtin.go:154:2:154:4 | url [postupdate] | builtin.go:156:21:156:23 | url | provenance |  |
+| builtin.go:154:13:154:22 | unsafehost | builtin.go:154:2:154:4 | implicit dereference [postupdate] | provenance | Config |
+| builtin.go:154:13:154:22 | unsafehost | builtin.go:154:2:154:4 | url [postupdate] | provenance | Config |
+| builtin.go:156:21:156:23 | url | builtin.go:156:21:156:32 | call to String | provenance | MaD:12 |
+| new-tests.go:26:26:26:30 | &... [postupdate] | new-tests.go:31:48:31:56 | selection of word | provenance | Src:MaD:3  |
+| new-tests.go:26:26:26:30 | &... [postupdate] | new-tests.go:32:48:32:56 | selection of safe | provenance | Src:MaD:3  |
+| new-tests.go:26:26:26:30 | &... [postupdate] | new-tests.go:35:49:35:57 | selection of word | provenance | Src:MaD:3  |
 | new-tests.go:31:11:31:57 | []type{args} [array] | new-tests.go:31:11:31:57 | call to Sprintf | provenance | MaD:11 |
 | new-tests.go:31:48:31:56 | selection of word | new-tests.go:31:11:31:57 | []type{args} [array] | provenance |  |
 | new-tests.go:31:48:31:56 | selection of word | new-tests.go:31:11:31:57 | call to Sprintf | provenance | FunctionModel |
@@ -37,11 +44,11 @@ edges
 | new-tests.go:39:18:39:30 | call to Param | new-tests.go:47:11:47:46 | ...+... | provenance | Src:MaD:1  |
 | new-tests.go:49:18:49:30 | call to Query | new-tests.go:50:11:50:46 | ...+... | provenance | Src:MaD:2  |
 | new-tests.go:62:2:62:39 | ... := ...[0] | new-tests.go:63:17:63:23 | reqBody | provenance |  |
-| new-tests.go:62:31:62:38 | selection of Body | new-tests.go:62:2:62:39 | ... := ...[0] | provenance | Src:MaD:6 MaD:12 |
-| new-tests.go:63:17:63:23 | reqBody | new-tests.go:63:26:63:30 | &... | provenance | MaD:10 |
-| new-tests.go:63:26:63:30 | &... | new-tests.go:68:48:68:56 | selection of word | provenance |  |
-| new-tests.go:63:26:63:30 | &... | new-tests.go:69:48:69:56 | selection of safe | provenance |  |
-| new-tests.go:63:26:63:30 | &... | new-tests.go:74:49:74:57 | selection of word | provenance |  |
+| new-tests.go:62:31:62:38 | selection of Body | new-tests.go:62:2:62:39 | ... := ...[0] | provenance | Src:MaD:6 MaD:13 |
+| new-tests.go:63:17:63:23 | reqBody | new-tests.go:63:26:63:30 | &... [postupdate] | provenance | MaD:10 |
+| new-tests.go:63:26:63:30 | &... [postupdate] | new-tests.go:68:48:68:56 | selection of word | provenance |  |
+| new-tests.go:63:26:63:30 | &... [postupdate] | new-tests.go:69:48:69:56 | selection of safe | provenance |  |
+| new-tests.go:63:26:63:30 | &... [postupdate] | new-tests.go:74:49:74:57 | selection of word | provenance |  |
 | new-tests.go:68:11:68:57 | []type{args} [array] | new-tests.go:68:11:68:57 | call to Sprintf | provenance | MaD:11 |
 | new-tests.go:68:48:68:56 | selection of word | new-tests.go:68:11:68:57 | []type{args} [array] | provenance |  |
 | new-tests.go:68:48:68:56 | selection of word | new-tests.go:68:11:68:57 | call to Sprintf | provenance | FunctionModel |
@@ -51,12 +58,12 @@ edges
 | new-tests.go:74:12:74:58 | []type{args} [array] | new-tests.go:74:12:74:58 | call to Sprintf | provenance | MaD:11 |
 | new-tests.go:74:49:74:57 | selection of word | new-tests.go:74:12:74:58 | []type{args} [array] | provenance |  |
 | new-tests.go:74:49:74:57 | selection of word | new-tests.go:74:12:74:58 | call to Sprintf | provenance | FunctionModel |
-| new-tests.go:78:18:78:24 | selection of URL | new-tests.go:78:18:78:32 | call to Query | provenance | Src:MaD:9 MaD:13 |
-| new-tests.go:78:18:78:32 | call to Query | new-tests.go:78:18:78:46 | call to Get | provenance | MaD:14 |
+| new-tests.go:78:18:78:24 | selection of URL | new-tests.go:78:18:78:32 | call to Query | provenance | Src:MaD:9 MaD:14 |
+| new-tests.go:78:18:78:32 | call to Query | new-tests.go:78:18:78:46 | call to Get | provenance | MaD:15 |
 | new-tests.go:78:18:78:46 | call to Get | new-tests.go:79:11:79:46 | ...+... | provenance |  |
 | new-tests.go:81:18:81:67 | call to TrimPrefix | new-tests.go:82:11:82:46 | ...+... | provenance |  |
 | new-tests.go:81:37:81:43 | selection of URL | new-tests.go:81:37:81:48 | selection of Path | provenance | Src:MaD:9  |
-| new-tests.go:81:37:81:48 | selection of Path | new-tests.go:81:18:81:67 | call to TrimPrefix | provenance | MaD:15 |
+| new-tests.go:81:37:81:48 | selection of Path | new-tests.go:81:18:81:67 | call to TrimPrefix | provenance | MaD:16 |
 | new-tests.go:86:10:86:20 | call to Vars | new-tests.go:88:11:88:46 | ...+... | provenance | Src:MaD:5  |
 | new-tests.go:95:18:95:45 | call to URLParam | new-tests.go:96:11:96:46 | ...+... | provenance | Src:MaD:4  |
 models
@@ -71,22 +78,29 @@ models
 | 9 | Source: net/http; Request; true; URL; ; ; ; remote; manual |
 | 10 | Summary: encoding/json; ; false; Unmarshal; ; ; Argument[0]; Argument[1]; taint; manual |
 | 11 | Summary: fmt; ; false; Sprintf; ; ; Argument[1].ArrayElement; ReturnValue; taint; manual |
-| 12 | Summary: io/ioutil; ; false; ReadAll; ; ; Argument[0]; ReturnValue[0]; taint; manual |
-| 13 | Summary: net/url; URL; true; Query; ; ; Argument[receiver]; ReturnValue; taint; manual |
-| 14 | Summary: net/url; Values; true; Get; ; ; Argument[receiver]; ReturnValue; taint; manual |
-| 15 | Summary: strings; ; false; TrimPrefix; ; ; Argument[0]; ReturnValue; taint; manual |
+| 12 | Summary: fmt; Stringer; true; String; ; ; Argument[receiver]; ReturnValue; taint; manual |
+| 13 | Summary: io/ioutil; ; false; ReadAll; ; ; Argument[0]; ReturnValue[0]; taint; manual |
+| 14 | Summary: net/url; URL; true; Query; ; ; Argument[receiver]; ReturnValue; taint; manual |
+| 15 | Summary: net/url; Values; true; Get; ; ; Argument[receiver]; ReturnValue; taint; manual |
+| 16 | Summary: strings; ; false; TrimPrefix; ; ; Argument[0]; ReturnValue; taint; manual |
 nodes
-| builtin.go:19:12:19:34 | call to FormValue | semmle.label | call to FormValue |
-| builtin.go:22:21:22:62 | ...+... | semmle.label | ...+... |
-| builtin.go:83:21:83:31 | call to Referer | semmle.label | call to Referer |
-| builtin.go:88:27:88:40 | untrustedInput | semmle.label | untrustedInput |
-| builtin.go:97:21:97:31 | call to Referer | semmle.label | call to Referer |
-| builtin.go:101:36:101:49 | untrustedInput | semmle.label | untrustedInput |
-| builtin.go:111:21:111:31 | call to Referer | semmle.label | call to Referer |
-| builtin.go:114:15:114:28 | untrustedInput | semmle.label | untrustedInput |
-| builtin.go:129:21:129:31 | call to Referer | semmle.label | call to Referer |
-| builtin.go:132:38:132:51 | untrustedInput | semmle.label | untrustedInput |
-| new-tests.go:26:26:26:30 | &... | semmle.label | &... |
+| builtin.go:20:12:20:34 | call to FormValue | semmle.label | call to FormValue |
+| builtin.go:23:21:23:62 | ...+... | semmle.label | ...+... |
+| builtin.go:84:21:84:31 | call to Referer | semmle.label | call to Referer |
+| builtin.go:89:27:89:40 | untrustedInput | semmle.label | untrustedInput |
+| builtin.go:98:21:98:31 | call to Referer | semmle.label | call to Referer |
+| builtin.go:102:36:102:49 | untrustedInput | semmle.label | untrustedInput |
+| builtin.go:112:21:112:31 | call to Referer | semmle.label | call to Referer |
+| builtin.go:115:15:115:28 | untrustedInput | semmle.label | untrustedInput |
+| builtin.go:130:21:130:31 | call to Referer | semmle.label | call to Referer |
+| builtin.go:133:38:133:51 | untrustedInput | semmle.label | untrustedInput |
+| builtin.go:151:16:151:36 | call to FormValue | semmle.label | call to FormValue |
+| builtin.go:154:2:154:4 | implicit dereference [postupdate] | semmle.label | implicit dereference [postupdate] |
+| builtin.go:154:2:154:4 | url [postupdate] | semmle.label | url [postupdate] |
+| builtin.go:154:13:154:22 | unsafehost | semmle.label | unsafehost |
+| builtin.go:156:21:156:23 | url | semmle.label | url |
+| builtin.go:156:21:156:32 | call to String | semmle.label | call to String |
+| new-tests.go:26:26:26:30 | &... [postupdate] | semmle.label | &... [postupdate] |
 | new-tests.go:31:11:31:57 | []type{args} [array] | semmle.label | []type{args} [array] |
 | new-tests.go:31:11:31:57 | call to Sprintf | semmle.label | call to Sprintf |
 | new-tests.go:31:48:31:56 | selection of word | semmle.label | selection of word |
@@ -103,7 +117,7 @@ nodes
 | new-tests.go:62:2:62:39 | ... := ...[0] | semmle.label | ... := ...[0] |
 | new-tests.go:62:31:62:38 | selection of Body | semmle.label | selection of Body |
 | new-tests.go:63:17:63:23 | reqBody | semmle.label | reqBody |
-| new-tests.go:63:26:63:30 | &... | semmle.label | &... |
+| new-tests.go:63:26:63:30 | &... [postupdate] | semmle.label | &... [postupdate] |
 | new-tests.go:68:11:68:57 | []type{args} [array] | semmle.label | []type{args} [array] |
 | new-tests.go:68:11:68:57 | call to Sprintf | semmle.label | call to Sprintf |
 | new-tests.go:68:48:68:56 | selection of word | semmle.label | selection of word |
diff --git a/go/ql/test/experimental/CWE-918/SSRF.qlref b/go/ql/test/experimental/CWE-918/SSRF.qlref
index 7cba541836f..d68094fa2a0 100644
--- a/go/ql/test/experimental/CWE-918/SSRF.qlref
+++ b/go/ql/test/experimental/CWE-918/SSRF.qlref
@@ -1,2 +1,4 @@
 query: experimental/CWE-918/SSRF.ql
-postprocess: utils/test/PrettyPrintModels.ql
+postprocess:
+  - utils/test/PrettyPrintModels.ql
+  - utils/test/InlineExpectationsTestQuery.ql
diff --git a/go/ql/test/experimental/CWE-918/builtin.go b/go/ql/test/experimental/CWE-918/builtin.go
index 5c65bc9d3de..6c39f24dc47 100644
--- a/go/ql/test/experimental/CWE-918/builtin.go
+++ b/go/ql/test/experimental/CWE-918/builtin.go
@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"log"
 	"net/http"
+	"net/url"
 	"regexp"
 	"strings"
 
@@ -16,10 +17,10 @@ import (
 )
 
 func handler(w http.ResponseWriter, req *http.Request) {
-	target := req.FormValue("target")
+	target := req.FormValue("target") // $ Source
 
 	// BAD: `target` is controlled by the attacker
-	_, err := http.Get("https://" + target + ".example.com/data/")
+	_, err := http.Get("https://" + target + ".example.com/data/") // $ Alert
 	if err != nil {
 		// error handling
 	}
@@ -80,12 +81,12 @@ func test() {
 
 	// x net websocket dial bad
 	http.HandleFunc("/ex2", func(w http.ResponseWriter, r *http.Request) {
-		untrustedInput := r.Referer()
+		untrustedInput := r.Referer() // $ Source
 
 		origin := "http://localhost/"
 
 		// bad as input is directly passed to dial function
-		ws, _ := websocket.Dial(untrustedInput, "", origin) // SSRF
+		ws, _ := websocket.Dial(untrustedInput, "", origin) // $ Alert
 		var msg = make([]byte, 512)
 		var n int
 		n, _ = ws.Read(msg)
@@ -94,12 +95,12 @@ func test() {
 
 	// x net websocket dialConfig bad
 	http.HandleFunc("/ex3", func(w http.ResponseWriter, r *http.Request) {
-		untrustedInput := r.Referer()
+		untrustedInput := r.Referer() // $ Source
 
 		origin := "http://localhost/"
 		// bad as input is directly used
-		config, _ := websocket.NewConfig(untrustedInput, origin) // SSRF
-		ws2, _ := websocket.DialConfig(config)
+		config, _ := websocket.NewConfig(untrustedInput, origin) // $ Sink
+		ws2, _ := websocket.DialConfig(config)                   // $ Alert
 		var msg = make([]byte, 512)
 		var n int
 		n, _ = ws2.Read(msg)
@@ -108,10 +109,10 @@ func test() {
 
 	// gorilla websocket Dialer.Dial bad
 	http.HandleFunc("/ex6", func(w http.ResponseWriter, r *http.Request) {
-		untrustedInput := r.Referer()
+		untrustedInput := r.Referer() // $ Source
 
 		dialer := gorilla.Dialer{}
-		dialer.Dial(untrustedInput, r.Header) //SSRF
+		dialer.Dial(untrustedInput, r.Header) // $ Alert
 	})
 
 	// gorilla websocket Dialer.Dial good
@@ -126,10 +127,10 @@ func test() {
 
 	// gorilla websocket Dialer.DialContext bad
 	http.HandleFunc("/ex8", func(w http.ResponseWriter, r *http.Request) {
-		untrustedInput := r.Referer()
+		untrustedInput := r.Referer() // $ Source
 
 		dialer := gorilla.Dialer{}
-		dialer.DialContext(context.TODO(), untrustedInput, r.Header) //SSRF
+		dialer.DialContext(context.TODO(), untrustedInput, r.Header) // $ Alert
 	})
 
 	// gorilla websocket Dialer.DialContext good
@@ -145,3 +146,16 @@ func test() {
 	log.Println(http.ListenAndServe(":80", nil))
 
 }
+
+func handler2(w http.ResponseWriter, req *http.Request) {
+	unsafehost := req.FormValue("host") // $ Source
+
+	url, _ := url.Parse("http://example.com/data")
+	url.Host = unsafehost
+	// BAD: `target` is controlled by the attacker
+	_, err := http.Get(url.String()) // $ Alert
+	if err != nil {
+		// error handling
+	}
+	// process request response
+}
diff --git a/go/ql/test/experimental/CWE-918/new-tests.go b/go/ql/test/experimental/CWE-918/new-tests.go
index 040bad48596..ddf94daa09e 100644
--- a/go/ql/test/experimental/CWE-918/new-tests.go
+++ b/go/ql/test/experimental/CWE-918/new-tests.go
@@ -23,20 +23,20 @@ func HandlerGin(c *gin.Context) {
 		safe    string `binding:"alphanum"`
 	}
 
-	err := c.ShouldBindJSON(&body)
+	err := c.ShouldBindJSON(&body) // $ Source
 
 	http.Get(fmt.Sprintf("http://example.com/%d", body.integer)) // OK
 	http.Get(fmt.Sprintf("http://example.com/%v", body.float))   // OK
 	http.Get(fmt.Sprintf("http://example.com/%v", body.boolean)) // OK
-	http.Get(fmt.Sprintf("http://example.com/%s", body.word))    // SSRF
-	http.Get(fmt.Sprintf("http://example.com/%s", body.safe))    // SSRF
+	http.Get(fmt.Sprintf("http://example.com/%s", body.word))    // $ Alert
+	http.Get(fmt.Sprintf("http://example.com/%s", body.safe))    // $ Alert
 
 	if err == nil {
-		http.Get(fmt.Sprintf("http://example.com/%s", body.word)) // SSRF
+		http.Get(fmt.Sprintf("http://example.com/%s", body.word)) // $ Alert
 		http.Get(fmt.Sprintf("http://example.com/%s", body.safe)) // OK
 	}
 
-	taintedParam := c.Param("id")
+	taintedParam := c.Param("id") // $ Source
 
 	validate := validator.New()
 	err = validate.Var(taintedParam, "alpha")
@@ -44,10 +44,10 @@ func HandlerGin(c *gin.Context) {
 		http.Get("http://example.com/" + taintedParam) // OK
 	}
 
-	http.Get("http://example.com/" + taintedParam) //SSRF
+	http.Get("http://example.com/" + taintedParam) // $ Alert
 
-	taintedQuery := c.Query("id")
-	http.Get("http://example.com/" + taintedQuery) //SSRF
+	taintedQuery := c.Query("id")                  // $ Source
+	http.Get("http://example.com/" + taintedQuery) // $ Alert
 }
 
 func HandlerHttp(req *http.Request) {
@@ -59,41 +59,41 @@ func HandlerHttp(req *http.Request) {
 		word    string
 		safe    string `validate:"alphanum"`
 	}
-	reqBody, _ := ioutil.ReadAll(req.Body)
+	reqBody, _ := ioutil.ReadAll(req.Body) // $ Source
 	json.Unmarshal(reqBody, &body)
 
 	http.Get(fmt.Sprintf("http://example.com/%d", body.integer)) // OK
 	http.Get(fmt.Sprintf("http://example.com/%v", body.float))   // OK
 	http.Get(fmt.Sprintf("http://example.com/%v", body.boolean)) // OK
-	http.Get(fmt.Sprintf("http://example.com/%s", body.word))    // SSRF
-	http.Get(fmt.Sprintf("http://example.com/%s", body.safe))    // SSRF
+	http.Get(fmt.Sprintf("http://example.com/%s", body.word))    // $ Alert
+	http.Get(fmt.Sprintf("http://example.com/%s", body.safe))    // $ Alert
 
 	validate := validator.New()
 	err := validate.Struct(body)
 	if err == nil {
-		http.Get(fmt.Sprintf("http://example.com/%s", body.word)) // SSRF
+		http.Get(fmt.Sprintf("http://example.com/%s", body.word)) // $ Alert
 		http.Get(fmt.Sprintf("http://example.com/%s", body.safe)) // OK
 	}
 
-	taintedQuery := req.URL.Query().Get("param1")
-	http.Get("http://example.com/" + taintedQuery) // SSRF
+	taintedQuery := req.URL.Query().Get("param1")  // $ Source
+	http.Get("http://example.com/" + taintedQuery) // $ Alert
 
-	taintedParam := strings.TrimPrefix(req.URL.Path, "/example-path/")
-	http.Get("http://example.com/" + taintedParam) // SSRF
+	taintedParam := strings.TrimPrefix(req.URL.Path, "/example-path/") // $ Source
+	http.Get("http://example.com/" + taintedParam)                     // $ Alert
 }
 
 func HandlerMux(r *http.Request) {
-	vars := mux.Vars(r)
+	vars := mux.Vars(r) // $ Source
 	taintedParam := vars["id"]
-	http.Get("http://example.com/" + taintedParam) // SSRF
+	http.Get("http://example.com/" + taintedParam) // $ Alert
 
 	numericID, _ := strconv.Atoi(taintedParam)
 	http.Get(fmt.Sprintf("http://example.com/%d", numericID)) // OK
 }
 
 func HandlerChi(r *http.Request) {
-	taintedParam := chi.URLParam(r, "articleID")
-	http.Get("http://example.com/" + taintedParam) // SSRF
+	taintedParam := chi.URLParam(r, "articleID")   // $ Source
+	http.Get("http://example.com/" + taintedParam) // $ Alert
 
 	b, _ := strconv.ParseBool(taintedParam)
 	http.Get(fmt.Sprintf("http://example.com/%t", b)) // OK
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ChannelField/test.expected b/go/ql/test/library-tests/semmle/go/dataflow/ChannelField/test.expected
index 547c7b25da1..6936b333cf1 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ChannelField/test.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ChannelField/test.expected
@@ -1,22 +1,14 @@
 invalidModelRow
 edges
 | test.go:9:9:9:11 | selection of c [collection] | test.go:9:7:9:11 | <-... | provenance |  |
-| test.go:13:16:13:16 | definition of s [pointer, c, collection] | test.go:16:2:16:2 | s [pointer, c, collection] | provenance |  |
 | test.go:15:10:15:17 | call to source | test.go:16:9:16:12 | data | provenance |  |
-| test.go:16:2:16:2 | implicit dereference [c, collection] | test.go:13:16:13:16 | definition of s [pointer, c, collection] | provenance |  |
-| test.go:16:2:16:2 | implicit dereference [c, collection] | test.go:16:2:16:4 | selection of c [collection] | provenance |  |
-| test.go:16:2:16:2 | s [pointer, c, collection] | test.go:16:2:16:2 | implicit dereference [c, collection] | provenance |  |
-| test.go:16:2:16:4 | selection of c [collection] | test.go:9:9:9:11 | selection of c [collection] | provenance |  |
-| test.go:16:2:16:4 | selection of c [collection] | test.go:16:2:16:2 | implicit dereference [c, collection] | provenance |  |
-| test.go:16:9:16:12 | data | test.go:16:2:16:4 | selection of c [collection] | provenance |  |
+| test.go:16:2:16:4 | selection of c [postupdate] [collection] | test.go:9:9:9:11 | selection of c [collection] | provenance |  |
+| test.go:16:9:16:12 | data | test.go:16:2:16:4 | selection of c [postupdate] [collection] | provenance |  |
 nodes
 | test.go:9:7:9:11 | <-... | semmle.label | <-... |
 | test.go:9:9:9:11 | selection of c [collection] | semmle.label | selection of c [collection] |
-| test.go:13:16:13:16 | definition of s [pointer, c, collection] | semmle.label | definition of s [pointer, c, collection] |
 | test.go:15:10:15:17 | call to source | semmle.label | call to source |
-| test.go:16:2:16:2 | implicit dereference [c, collection] | semmle.label | implicit dereference [c, collection] |
-| test.go:16:2:16:2 | s [pointer, c, collection] | semmle.label | s [pointer, c, collection] |
-| test.go:16:2:16:4 | selection of c [collection] | semmle.label | selection of c [collection] |
+| test.go:16:2:16:4 | selection of c [postupdate] [collection] | semmle.label | selection of c [postupdate] [collection] |
 | test.go:16:9:16:12 | data | semmle.label | data |
 subpaths
 #select
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/DefaultTaintSanitizer/DefaultSanitizer.expected b/go/ql/test/library-tests/semmle/go/dataflow/DefaultTaintSanitizer/DefaultSanitizer.expected
index b198361df04..72124e7dae0 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/DefaultTaintSanitizer/DefaultSanitizer.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/DefaultTaintSanitizer/DefaultSanitizer.expected
@@ -4,27 +4,27 @@ models
 | 3 | Summary: io; Reader; true; Read; ; ; Argument[receiver]; Argument[0]; taint; manual |
 | 4 | Summary: os; File; true; Read; ; ; Argument[receiver]; Argument[0]; taint; manual |
 edges
-| Builtin.go:6:2:6:2 | definition of b | Builtin.go:8:9:8:17 | type conversion | provenance |  |
-| Builtin.go:7:2:7:15 | selection of Body | Builtin.go:6:2:6:2 | definition of b | provenance | Src:MaD:1 MaD:2 |
-| Builtin.go:7:2:7:15 | selection of Body | Builtin.go:6:2:6:2 | definition of b | provenance | Src:MaD:1 MaD:3 |
-| Builtin.go:7:2:7:15 | selection of Body | Builtin.go:6:2:6:2 | definition of b | provenance | Src:MaD:1 MaD:4 |
-| Builtin.go:12:2:12:2 | definition of b | Builtin.go:17:9:17:17 | type conversion | provenance |  |
-| Builtin.go:13:2:13:15 | selection of Body | Builtin.go:12:2:12:2 | definition of b | provenance | Src:MaD:1 MaD:2 |
-| Builtin.go:13:2:13:15 | selection of Body | Builtin.go:12:2:12:2 | definition of b | provenance | Src:MaD:1 MaD:3 |
-| Builtin.go:13:2:13:15 | selection of Body | Builtin.go:12:2:12:2 | definition of b | provenance | Src:MaD:1 MaD:4 |
-| Builtin.go:21:2:21:2 | definition of b | Builtin.go:24:10:24:18 | type conversion | provenance |  |
-| Builtin.go:22:2:22:15 | selection of Body | Builtin.go:21:2:21:2 | definition of b | provenance | Src:MaD:1 MaD:2 |
-| Builtin.go:22:2:22:15 | selection of Body | Builtin.go:21:2:21:2 | definition of b | provenance | Src:MaD:1 MaD:3 |
-| Builtin.go:22:2:22:15 | selection of Body | Builtin.go:21:2:21:2 | definition of b | provenance | Src:MaD:1 MaD:4 |
+| Builtin.go:7:2:7:15 | selection of Body | Builtin.go:7:22:7:22 | b [postupdate] | provenance | Src:MaD:1 MaD:2 |
+| Builtin.go:7:2:7:15 | selection of Body | Builtin.go:7:22:7:22 | b [postupdate] | provenance | Src:MaD:1 MaD:3 |
+| Builtin.go:7:2:7:15 | selection of Body | Builtin.go:7:22:7:22 | b [postupdate] | provenance | Src:MaD:1 MaD:4 |
+| Builtin.go:7:22:7:22 | b [postupdate] | Builtin.go:8:9:8:17 | type conversion | provenance |  |
+| Builtin.go:13:2:13:15 | selection of Body | Builtin.go:13:22:13:22 | b [postupdate] | provenance | Src:MaD:1 MaD:2 |
+| Builtin.go:13:2:13:15 | selection of Body | Builtin.go:13:22:13:22 | b [postupdate] | provenance | Src:MaD:1 MaD:3 |
+| Builtin.go:13:2:13:15 | selection of Body | Builtin.go:13:22:13:22 | b [postupdate] | provenance | Src:MaD:1 MaD:4 |
+| Builtin.go:13:22:13:22 | b [postupdate] | Builtin.go:17:9:17:17 | type conversion | provenance |  |
+| Builtin.go:22:2:22:15 | selection of Body | Builtin.go:22:22:22:22 | b [postupdate] | provenance | Src:MaD:1 MaD:2 |
+| Builtin.go:22:2:22:15 | selection of Body | Builtin.go:22:22:22:22 | b [postupdate] | provenance | Src:MaD:1 MaD:3 |
+| Builtin.go:22:2:22:15 | selection of Body | Builtin.go:22:22:22:22 | b [postupdate] | provenance | Src:MaD:1 MaD:4 |
+| Builtin.go:22:22:22:22 | b [postupdate] | Builtin.go:24:10:24:18 | type conversion | provenance |  |
 nodes
-| Builtin.go:6:2:6:2 | definition of b | semmle.label | definition of b |
 | Builtin.go:7:2:7:15 | selection of Body | semmle.label | selection of Body |
+| Builtin.go:7:22:7:22 | b [postupdate] | semmle.label | b [postupdate] |
 | Builtin.go:8:9:8:17 | type conversion | semmle.label | type conversion |
-| Builtin.go:12:2:12:2 | definition of b | semmle.label | definition of b |
 | Builtin.go:13:2:13:15 | selection of Body | semmle.label | selection of Body |
+| Builtin.go:13:22:13:22 | b [postupdate] | semmle.label | b [postupdate] |
 | Builtin.go:17:9:17:17 | type conversion | semmle.label | type conversion |
-| Builtin.go:21:2:21:2 | definition of b | semmle.label | definition of b |
 | Builtin.go:22:2:22:15 | selection of Body | semmle.label | selection of Body |
+| Builtin.go:22:22:22:22 | b [postupdate] | semmle.label | b [postupdate] |
 | Builtin.go:24:10:24:18 | type conversion | semmle.label | type conversion |
 subpaths
 #select
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/srcs.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/srcs.expected
index a6f313198d1..f99ee92a492 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/srcs.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/srcs.expected
@@ -1,6 +1,5 @@
 invalidModelRow
 #select
-| test.go:10:6:10:8 | definition of arg | qltest-arg |
 | test.go:39:8:39:15 | call to Src1 | qltest |
 | test.go:40:8:40:15 | call to Src2 | qltest |
 | test.go:40:8:40:15 | call to Src2 | qltest-w-subtypes |
@@ -8,6 +7,7 @@ invalidModelRow
 | test.go:42:2:42:21 | ... = ...[0] | qltest |
 | test.go:42:2:42:21 | ... = ...[1] | qltest-w-subtypes |
 | test.go:43:2:43:22 | ... = ...[1] | qltest-w-subtypes |
+| test.go:44:11:44:13 | arg [postupdate] | qltest-arg |
 | test.go:59:9:59:16 | call to Src1 | qltest |
 | test.go:102:46:102:53 | call to Src1 | qltest |
 | test.go:112:35:112:42 | call to Src1 | qltest |
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/steps.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/steps.expected
index eaf00bde26f..97a1cc49261 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/steps.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/steps.expected
@@ -2,18 +2,18 @@ invalidModelRow
 #select
 | test.go:17:23:17:25 | arg | test.go:17:10:17:26 | call to StepArgRes |
 | test.go:18:27:18:29 | arg | test.go:18:2:18:30 | ... = ...[1] |
-| test.go:19:15:19:17 | arg | test.go:11:6:11:9 | definition of arg1 |
-| test.go:21:16:21:18 | arg | test.go:13:6:13:6 | definition of t |
+| test.go:19:15:19:17 | arg | test.go:19:20:19:23 | arg1 [postupdate] |
+| test.go:21:16:21:18 | arg | test.go:21:2:21:2 | t [postupdate] |
 | test.go:22:10:22:10 | t | test.go:22:10:22:24 | call to StepQualRes |
-| test.go:23:2:23:2 | t | test.go:10:6:10:8 | definition of arg |
+| test.go:23:2:23:2 | t | test.go:23:16:23:18 | arg [postupdate] |
 | test.go:24:32:24:34 | arg | test.go:24:10:24:35 | call to StepArgResNoQual |
 | test.go:61:25:61:27 | src | test.go:61:12:61:28 | call to StepArgRes |
 | test.go:64:29:64:31 | src | test.go:64:2:64:32 | ... := ...[1] |
-| test.go:68:15:68:17 | src | test.go:67:6:67:11 | definition of taint3 |
-| test.go:76:21:76:23 | src | test.go:75:6:75:11 | definition of taint4 |
+| test.go:68:15:68:17 | src | test.go:68:20:68:25 | taint3 [postupdate] |
+| test.go:76:21:76:23 | src | test.go:76:2:76:7 | taint4 [postupdate] |
 | test.go:79:13:79:25 | type assertion | test.go:79:12:79:40 | call to StepQualRes |
-| test.go:83:3:83:15 | type assertion | test.go:82:6:82:11 | definition of taint6 |
+| test.go:83:3:83:15 | type assertion | test.go:83:30:83:35 | taint6 [postupdate] |
 | test.go:86:34:86:36 | src | test.go:86:12:86:37 | call to StepArgResNoQual |
 | test.go:149:10:149:27 | []type{args} | test.go:149:10:149:27 | call to append |
 | test.go:149:17:149:21 | slice | test.go:149:10:149:27 | call to append |
-| test.go:155:15:155:20 | slice1 | test.go:154:2:154:7 | definition of slice2 |
+| test.go:155:15:155:20 | slice1 | test.go:155:7:155:12 | slice2 [postupdate] |
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/test.go b/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/test.go
index 14b9a43b599..c9d732e7400 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/test.go
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/test.go
@@ -158,7 +158,7 @@ func simpleflow() {
 	ch := make(chan string)
 	ch <- a.Src1().(string)
 	taint16 := test.StepArgCollectionContentRes(ch)
-	b.Sink1(taint16) // $ MISSING: hasTaintFlow="taint16" // currently fails due to lack of post-update nodes after send statements
+	b.Sink1(taint16) // $ hasTaintFlow="taint16"
 
 	c1 := test.C{""}
 	c1.Set(a.Src1().(string))
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/srcs.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/srcs.expected
index a85e8689960..009238baa4d 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/srcs.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/srcs.expected
@@ -1,6 +1,5 @@
 invalidModelRow
 #select
-| test.go:10:6:10:8 | definition of arg | qltest-arg |
 | test.go:39:8:39:15 | call to Src1 | qltest |
 | test.go:40:8:40:15 | call to Src2 | qltest |
 | test.go:40:8:40:15 | call to Src2 | qltest-w-subtypes |
@@ -8,6 +7,7 @@ invalidModelRow
 | test.go:42:2:42:21 | ... = ...[0] | qltest |
 | test.go:42:2:42:21 | ... = ...[1] | qltest-w-subtypes |
 | test.go:43:2:43:22 | ... = ...[1] | qltest-w-subtypes |
+| test.go:44:11:44:13 | arg [postupdate] | qltest-arg |
 | test.go:59:9:59:16 | call to Src1 | qltest |
 | test.go:102:46:102:53 | call to Src1 | qltest |
 | test.go:112:35:112:42 | call to Src1 | qltest |
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/steps.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/steps.expected
index e53ed76ad00..eb52daa4253 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/steps.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/steps.expected
@@ -2,17 +2,17 @@ invalidModelRow
 #select
 | test.go:17:23:17:25 | arg | test.go:17:10:17:26 | call to StepArgRes |
 | test.go:18:27:18:29 | arg | test.go:18:2:18:30 | ... = ...[1] |
-| test.go:19:15:19:17 | arg | test.go:11:6:11:9 | definition of arg1 |
-| test.go:21:16:21:18 | arg | test.go:13:6:13:6 | definition of t |
+| test.go:19:15:19:17 | arg | test.go:19:20:19:23 | arg1 [postupdate] |
+| test.go:21:16:21:18 | arg | test.go:21:2:21:2 | t [postupdate] |
 | test.go:22:10:22:10 | t | test.go:22:10:22:24 | call to StepQualRes |
-| test.go:23:2:23:2 | t | test.go:10:6:10:8 | definition of arg |
+| test.go:23:2:23:2 | t | test.go:23:16:23:18 | arg [postupdate] |
 | test.go:24:32:24:34 | arg | test.go:24:10:24:35 | call to StepArgResNoQual |
 | test.go:61:25:61:27 | src | test.go:61:12:61:28 | call to StepArgRes |
 | test.go:64:29:64:31 | src | test.go:64:2:64:32 | ... := ...[1] |
-| test.go:68:15:68:17 | src | test.go:67:6:67:11 | definition of taint3 |
-| test.go:76:21:76:23 | src | test.go:75:6:75:11 | definition of taint4 |
+| test.go:68:15:68:17 | src | test.go:68:20:68:25 | taint3 [postupdate] |
+| test.go:76:21:76:23 | src | test.go:76:2:76:7 | taint4 [postupdate] |
 | test.go:79:13:79:25 | type assertion | test.go:79:12:79:40 | call to StepQualRes |
-| test.go:83:3:83:15 | type assertion | test.go:82:6:82:11 | definition of taint6 |
+| test.go:83:3:83:15 | type assertion | test.go:83:30:83:35 | taint6 [postupdate] |
 | test.go:86:34:86:36 | src | test.go:86:12:86:37 | call to StepArgResNoQual |
 | test.go:202:14:202:19 | srcInt | test.go:202:10:202:26 | call to max |
 | test.go:202:22:202:22 | 0 | test.go:202:10:202:26 | call to max |
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/test.go b/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/test.go
index f118880d497..3c172e6082d 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/test.go
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/test.go
@@ -158,7 +158,7 @@ func simpleflow() {
 	ch := make(chan string)
 	ch <- a.Src1().(string)
 	taint16 := test.StepArgCollectionContentRes(ch)
-	b.Sink1(taint16) // $ MISSING: hasValueFlow="taint16" // currently fails due to lack of post-update nodes after send statements
+	b.Sink1(taint16) // $ hasValueFlow="taint16"
 
 	c1 := test.C{""}
 	c1.Set(a.Src1().(string))
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/FlowSteps/LocalFlowStep.expected b/go/ql/test/library-tests/semmle/go/dataflow/FlowSteps/LocalFlowStep.expected
index c6bfdfdc1d5..fcbb78716a4 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/FlowSteps/LocalFlowStep.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/FlowSteps/LocalFlowStep.expected
@@ -49,21 +49,21 @@
 | main.go:3:6:3:10 | function test1 | main.go:34:2:34:6 | test1 |
 | main.go:3:12:3:12 | argument corresponding to x | main.go:3:12:3:12 | definition of x |
 | main.go:3:12:3:12 | definition of x | main.go:5:5:5:5 | x |
-| main.go:3:12:3:12 | definition of x | main.go:6:7:6:7 | x |
-| main.go:3:12:3:12 | definition of x | main.go:8:8:8:8 | x |
-| main.go:3:12:3:12 | definition of x | main.go:10:7:10:7 | x |
-| main.go:3:12:3:12 | definition of x | main.go:10:22:10:22 | x |
 | main.go:3:19:3:20 | argument corresponding to fn | main.go:3:19:3:20 | definition of fn |
 | main.go:3:19:3:20 | definition of fn | main.go:10:24:10:25 | fn |
-| main.go:6:3:6:3 | definition of y | main.go:10:2:10:2 | y = phi(def@6:3, def@8:3) |
+| main.go:5:5:5:5 | x | main.go:6:7:6:7 | x |
+| main.go:5:5:5:5 | x | main.go:8:8:8:8 | x |
+| main.go:6:3:6:3 | definition of y | main.go:10:12:10:12 | y |
 | main.go:6:7:6:7 | x | main.go:6:3:6:3 | definition of y |
-| main.go:8:3:8:3 | definition of y | main.go:10:2:10:2 | y = phi(def@6:3, def@8:3) |
+| main.go:6:7:6:7 | x | main.go:10:7:10:7 | x |
+| main.go:8:3:8:3 | definition of y | main.go:10:12:10:12 | y |
 | main.go:8:7:8:8 | -... | main.go:8:3:8:3 | definition of y |
+| main.go:8:8:8:8 | x | main.go:10:7:10:7 | x |
 | main.go:10:2:10:2 | definition of z | main.go:11:14:11:14 | z |
-| main.go:10:2:10:2 | y = phi(def@6:3, def@8:3) | main.go:10:12:10:12 | y |
-| main.go:10:2:10:2 | y = phi(def@6:3, def@8:3) | main.go:10:17:10:17 | y |
+| main.go:10:7:10:7 | x | main.go:10:22:10:22 | x |
 | main.go:10:7:10:12 | ...<=... | main.go:10:7:10:27 | ...&&... |
 | main.go:10:7:10:27 | ...&&... | main.go:10:2:10:2 | definition of z |
+| main.go:10:12:10:12 | y | main.go:10:17:10:17 | y |
 | main.go:10:17:10:27 | ...>=... | main.go:10:7:10:27 | ...&&... |
 | main.go:11:14:11:14 | z | main.go:11:9:11:15 | type conversion |
 | main.go:14:6:14:10 | function test2 | main.go:34:8:34:12 | test2 |
@@ -84,50 +84,54 @@
 | main.go:26:5:26:6 | definition of ok | main.go:27:5:27:6 | ok |
 | main.go:26:11:26:11 | x | main.go:26:2:26:17 | ... := ...[0] |
 | main.go:38:2:38:2 | definition of s | main.go:39:15:39:15 | s |
-| main.go:38:2:38:2 | definition of s | main.go:40:15:40:15 | s |
-| main.go:38:2:38:2 | definition of s | main.go:42:7:42:7 | s |
 | main.go:38:7:38:20 | slice literal | main.go:38:2:38:2 | definition of s |
+| main.go:38:7:38:20 | slice literal [postupdate] | main.go:38:2:38:2 | definition of s |
 | main.go:39:2:39:3 | definition of s1 | main.go:40:18:40:19 | s1 |
 | main.go:39:8:39:25 | call to append | main.go:39:2:39:3 | definition of s1 |
+| main.go:39:15:39:15 | s | main.go:40:15:40:15 | s |
+| main.go:39:15:39:15 | s [postupdate] | main.go:40:15:40:15 | s |
 | main.go:40:2:40:3 | definition of s2 | main.go:43:9:43:10 | s2 |
 | main.go:40:8:40:23 | call to append | main.go:40:2:40:3 | definition of s2 |
+| main.go:40:15:40:15 | s | main.go:42:7:42:7 | s |
+| main.go:40:15:40:15 | s [postupdate] | main.go:42:7:42:7 | s |
 | main.go:41:2:41:3 | definition of s4 | main.go:42:10:42:11 | s4 |
 | main.go:41:8:41:21 | call to make | main.go:41:2:41:3 | definition of s4 |
 | main.go:46:13:46:14 | argument corresponding to xs | main.go:46:13:46:14 | definition of xs |
 | main.go:46:13:46:14 | definition of xs | main.go:47:20:47:21 | xs |
-| main.go:46:24:46:27 | definition of keys | main.go:47:20:47:21 | keys = phi(def@46:24, def@49:3) |
+| main.go:46:24:46:27 | definition of keys | main.go:46:24:46:27 | implicit read of keys |
+| main.go:46:24:46:27 | definition of keys | main.go:49:3:49:6 | keys |
 | main.go:46:24:46:27 | zero value for keys | main.go:46:24:46:27 | definition of keys |
-| main.go:46:34:46:37 | definition of vals | main.go:47:20:47:21 | vals = phi(def@46:34, def@48:3) |
+| main.go:46:34:46:37 | definition of vals | main.go:46:34:46:37 | implicit read of vals |
+| main.go:46:34:46:37 | definition of vals | main.go:48:3:48:6 | vals |
 | main.go:46:34:46:37 | zero value for vals | main.go:46:34:46:37 | definition of vals |
 | main.go:47:2:50:2 | range statement[0] | main.go:47:6:47:6 | definition of k |
 | main.go:47:2:50:2 | range statement[1] | main.go:47:9:47:9 | definition of v |
 | main.go:47:6:47:6 | definition of k | main.go:49:11:49:11 | k |
 | main.go:47:9:47:9 | definition of v | main.go:48:11:48:11 | v |
-| main.go:47:20:47:21 | keys = phi(def@46:24, def@49:3) | main.go:46:24:46:27 | implicit read of keys |
-| main.go:47:20:47:21 | keys = phi(def@46:24, def@49:3) | main.go:49:3:49:6 | keys |
-| main.go:47:20:47:21 | vals = phi(def@46:34, def@48:3) | main.go:46:34:46:37 | implicit read of vals |
-| main.go:47:20:47:21 | vals = phi(def@46:34, def@48:3) | main.go:48:3:48:6 | vals |
-| main.go:48:3:48:6 | definition of vals | main.go:47:20:47:21 | vals = phi(def@46:34, def@48:3) |
+| main.go:48:3:48:6 | definition of vals | main.go:46:34:46:37 | implicit read of vals |
+| main.go:48:3:48:6 | definition of vals | main.go:48:3:48:6 | vals |
 | main.go:48:3:48:11 | ... += ... | main.go:48:3:48:6 | definition of vals |
-| main.go:49:3:49:6 | definition of keys | main.go:47:20:47:21 | keys = phi(def@46:24, def@49:3) |
+| main.go:49:3:49:6 | definition of keys | main.go:46:24:46:27 | implicit read of keys |
+| main.go:49:3:49:6 | definition of keys | main.go:49:3:49:6 | keys |
 | main.go:49:3:49:11 | ... += ... | main.go:49:3:49:6 | definition of keys |
 | main.go:55:6:55:7 | definition of ch | main.go:56:2:56:3 | ch |
-| main.go:55:6:55:7 | definition of ch | main.go:57:4:57:5 | ch |
 | main.go:55:6:55:7 | zero value for ch | main.go:55:6:55:7 | definition of ch |
+| main.go:56:2:56:3 | ch | main.go:57:4:57:5 | ch |
+| main.go:56:2:56:3 | ch [postupdate] | main.go:57:4:57:5 | ch |
 | main.go:61:2:61:2 | definition of x | main.go:64:11:64:11 | x |
-| main.go:61:2:61:2 | definition of x | main.go:65:11:65:11 | x |
 | main.go:61:7:61:7 | 1 | main.go:61:2:61:2 | definition of x |
 | main.go:62:2:62:2 | definition of y | main.go:64:14:64:14 | y |
-| main.go:62:2:62:2 | definition of y | main.go:65:14:65:14 | y |
 | main.go:62:7:62:7 | 2 | main.go:62:2:62:2 | definition of y |
 | main.go:63:2:63:2 | definition of z | main.go:64:17:64:17 | z |
-| main.go:63:2:63:2 | definition of z | main.go:65:17:65:17 | z |
 | main.go:63:7:63:7 | 3 | main.go:63:2:63:2 | definition of z |
 | main.go:64:2:64:2 | definition of a | main.go:66:9:66:9 | a |
 | main.go:64:7:64:18 | call to min | main.go:64:2:64:2 | definition of a |
 | main.go:64:11:64:11 | x | main.go:64:7:64:18 | call to min |
+| main.go:64:11:64:11 | x | main.go:65:11:65:11 | x |
 | main.go:64:14:64:14 | y | main.go:64:7:64:18 | call to min |
+| main.go:64:14:64:14 | y | main.go:65:14:65:14 | y |
 | main.go:64:17:64:17 | z | main.go:64:7:64:18 | call to min |
+| main.go:64:17:64:17 | z | main.go:65:17:65:17 | z |
 | main.go:65:2:65:2 | definition of b | main.go:66:12:66:12 | b |
 | main.go:65:7:65:18 | call to max | main.go:65:2:65:2 | definition of b |
 | main.go:65:11:65:11 | x | main.go:65:7:65:18 | call to max |
@@ -135,62 +139,71 @@
 | main.go:65:17:65:17 | z | main.go:65:7:65:18 | call to max |
 | strings.go:8:12:8:12 | argument corresponding to s | strings.go:8:12:8:12 | definition of s |
 | strings.go:8:12:8:12 | definition of s | strings.go:9:24:9:24 | s |
-| strings.go:8:12:8:12 | definition of s | strings.go:10:27:10:27 | s |
 | strings.go:9:2:9:3 | definition of s2 | strings.go:11:20:11:21 | s2 |
-| strings.go:9:2:9:3 | definition of s2 | strings.go:11:48:11:49 | s2 |
 | strings.go:9:8:9:38 | call to Replace | strings.go:9:2:9:3 | definition of s2 |
+| strings.go:9:24:9:24 | s | strings.go:10:27:10:27 | s |
 | strings.go:10:2:10:3 | definition of s3 | strings.go:11:24:11:25 | s3 |
-| strings.go:10:2:10:3 | definition of s3 | strings.go:11:67:11:68 | s3 |
 | strings.go:10:8:10:42 | call to ReplaceAll | strings.go:10:2:10:3 | definition of s3 |
+| strings.go:11:20:11:21 | s2 | strings.go:11:48:11:49 | s2 |
+| strings.go:11:24:11:25 | s3 | strings.go:11:67:11:68 | s3 |
 | url.go:8:12:8:12 | argument corresponding to b | url.go:8:12:8:12 | definition of b |
 | url.go:8:12:8:12 | definition of b | url.go:11:5:11:5 | b |
 | url.go:8:20:8:20 | argument corresponding to s | url.go:8:20:8:20 | definition of s |
 | url.go:8:20:8:20 | definition of s | url.go:12:46:12:46 | s |
 | url.go:8:20:8:20 | definition of s | url.go:14:48:14:48 | s |
-| url.go:12:3:12:5 | definition of res | url.go:16:5:16:7 | res = phi(def@12:3, def@14:3) |
+| url.go:12:3:12:5 | definition of res | url.go:19:9:19:11 | res |
 | url.go:12:3:12:48 | ... = ...[0] | url.go:12:3:12:5 | definition of res |
 | url.go:12:3:12:48 | ... = ...[1] | url.go:12:8:12:10 | definition of err |
-| url.go:12:8:12:10 | definition of err | url.go:16:5:16:7 | err = phi(def@12:8, def@14:8) |
-| url.go:14:3:14:5 | definition of res | url.go:16:5:16:7 | res = phi(def@12:3, def@14:3) |
+| url.go:12:8:12:10 | definition of err | url.go:16:5:16:7 | err |
+| url.go:14:3:14:5 | definition of res | url.go:19:9:19:11 | res |
 | url.go:14:3:14:50 | ... = ...[0] | url.go:14:3:14:5 | definition of res |
 | url.go:14:3:14:50 | ... = ...[1] | url.go:14:8:14:10 | definition of err |
-| url.go:14:8:14:10 | definition of err | url.go:16:5:16:7 | err = phi(def@12:8, def@14:8) |
-| url.go:16:5:16:7 | err = phi(def@12:8, def@14:8) | url.go:16:5:16:7 | err |
-| url.go:16:5:16:7 | res = phi(def@12:3, def@14:3) | url.go:19:9:19:11 | res |
+| url.go:14:8:14:10 | definition of err | url.go:16:5:16:7 | err |
 | url.go:22:12:22:12 | argument corresponding to i | url.go:22:12:22:12 | definition of i |
 | url.go:22:12:22:12 | definition of i | url.go:24:5:24:5 | i |
 | url.go:22:19:22:19 | argument corresponding to s | url.go:22:19:22:19 | definition of s |
 | url.go:22:19:22:19 | definition of s | url.go:23:20:23:20 | s |
-| url.go:22:19:22:19 | definition of s | url.go:27:29:27:29 | s |
 | url.go:23:2:23:2 | definition of u | url.go:25:10:25:10 | u |
 | url.go:23:2:23:21 | ... := ...[0] | url.go:23:2:23:2 | definition of u |
+| url.go:23:20:23:20 | s | url.go:27:29:27:29 | s |
 | url.go:27:2:27:2 | definition of u | url.go:28:14:28:14 | u |
-| url.go:27:2:27:2 | definition of u | url.go:29:14:29:14 | u |
-| url.go:27:2:27:2 | definition of u | url.go:30:11:30:11 | u |
-| url.go:27:2:27:2 | definition of u | url.go:32:9:32:9 | u |
 | url.go:27:2:27:30 | ... = ...[0] | url.go:27:2:27:2 | definition of u |
+| url.go:28:14:28:14 | u | url.go:29:14:29:14 | u |
+| url.go:28:14:28:14 | u [postupdate] | url.go:29:14:29:14 | u |
+| url.go:29:14:29:14 | u | url.go:30:11:30:11 | u |
+| url.go:29:14:29:14 | u [postupdate] | url.go:30:11:30:11 | u |
 | url.go:30:2:30:3 | definition of bs | url.go:31:14:31:15 | bs |
 | url.go:30:2:30:27 | ... := ...[0] | url.go:30:2:30:3 | definition of bs |
+| url.go:30:11:30:11 | u | url.go:32:9:32:9 | u |
+| url.go:30:11:30:11 | u [postupdate] | url.go:32:9:32:9 | u |
 | url.go:32:2:32:2 | definition of u | url.go:33:14:33:14 | u |
-| url.go:32:2:32:2 | definition of u | url.go:34:14:34:14 | u |
-| url.go:32:2:32:2 | definition of u | url.go:35:14:35:14 | u |
-| url.go:32:2:32:2 | definition of u | url.go:36:6:36:6 | u |
-| url.go:32:2:32:2 | definition of u | url.go:36:25:36:25 | u |
 | url.go:32:2:32:23 | ... = ...[0] | url.go:32:2:32:2 | definition of u |
+| url.go:33:14:33:14 | u | url.go:34:14:34:14 | u |
+| url.go:33:14:33:14 | u [postupdate] | url.go:34:14:34:14 | u |
+| url.go:34:14:34:14 | u | url.go:35:14:35:14 | u |
+| url.go:34:14:34:14 | u [postupdate] | url.go:35:14:35:14 | u |
+| url.go:35:14:35:14 | u | url.go:36:6:36:6 | u |
+| url.go:35:14:35:14 | u [postupdate] | url.go:36:6:36:6 | u |
 | url.go:36:2:36:2 | definition of u | url.go:37:9:37:9 | u |
+| url.go:36:6:36:6 | u | url.go:36:25:36:25 | u |
+| url.go:36:6:36:6 | u [postupdate] | url.go:36:25:36:25 | u |
 | url.go:36:6:36:26 | call to ResolveReference | url.go:36:2:36:2 | definition of u |
 | url.go:42:2:42:3 | definition of ui | url.go:43:11:43:12 | ui |
-| url.go:42:2:42:3 | definition of ui | url.go:45:14:45:15 | ui |
-| url.go:42:2:42:3 | definition of ui | url.go:46:9:46:10 | ui |
 | url.go:42:7:42:38 | call to UserPassword | url.go:42:2:42:3 | definition of ui |
 | url.go:43:2:43:3 | definition of pw | url.go:44:14:44:15 | pw |
 | url.go:43:2:43:23 | ... := ...[0] | url.go:43:2:43:3 | definition of pw |
+| url.go:43:11:43:12 | ui | url.go:45:14:45:15 | ui |
+| url.go:43:11:43:12 | ui [postupdate] | url.go:45:14:45:15 | ui |
+| url.go:45:14:45:15 | ui | url.go:46:9:46:10 | ui |
+| url.go:45:14:45:15 | ui [postupdate] | url.go:46:9:46:10 | ui |
 | url.go:49:12:49:12 | argument corresponding to q | url.go:49:12:49:12 | definition of q |
 | url.go:49:12:49:12 | definition of q | url.go:50:25:50:25 | q |
 | url.go:50:2:50:2 | definition of v | url.go:51:14:51:14 | v |
-| url.go:50:2:50:2 | definition of v | url.go:52:14:52:14 | v |
-| url.go:50:2:50:2 | definition of v | url.go:53:9:53:9 | v |
 | url.go:50:2:50:26 | ... := ...[0] | url.go:50:2:50:2 | definition of v |
+| url.go:51:14:51:14 | v | url.go:52:14:52:14 | v |
+| url.go:51:14:51:14 | v [postupdate] | url.go:52:14:52:14 | v |
+| url.go:52:14:52:14 | v | url.go:53:9:53:9 | v |
+| url.go:52:14:52:14 | v [postupdate] | url.go:53:9:53:9 | v |
 | url.go:56:12:56:12 | argument corresponding to q | url.go:56:12:56:12 | definition of q |
 | url.go:56:12:56:12 | definition of q | url.go:57:29:57:29 | q |
 | url.go:57:2:57:8 | definition of joined1 | url.go:58:38:58:44 | joined1 |
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/FlowSteps/LocalTaintStep.expected b/go/ql/test/library-tests/semmle/go/dataflow/FlowSteps/LocalTaintStep.expected
index 6fadcdaabe6..66784562496 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/FlowSteps/LocalTaintStep.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/FlowSteps/LocalTaintStep.expected
@@ -7,7 +7,7 @@
 | main.go:39:15:39:15 | s | main.go:39:8:39:25 | call to append |
 | main.go:40:15:40:15 | s | main.go:40:8:40:23 | call to append |
 | main.go:40:18:40:19 | s1 | main.go:40:8:40:23 | call to append |
-| main.go:42:10:42:11 | s4 | main.go:38:2:38:2 | definition of s |
+| main.go:42:10:42:11 | s4 | main.go:42:7:42:7 | s [postupdate] |
 | main.go:47:20:47:21 | next key-value pair in range | main.go:47:2:50:2 | range statement[0] |
 | main.go:47:20:47:21 | next key-value pair in range | main.go:47:2:50:2 | range statement[1] |
 | main.go:47:20:47:21 | xs | main.go:47:2:50:2 | range statement[1] |
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/FunctionInputsAndOutputs/FunctionModelStep.expected b/go/ql/test/library-tests/semmle/go/dataflow/FunctionInputsAndOutputs/FunctionModelStep.expected
index f9b4b8106f1..b0c0a58b339 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/FunctionInputsAndOutputs/FunctionModelStep.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/FunctionInputsAndOutputs/FunctionModelStep.expected
@@ -1,3 +1,3 @@
-| file://:0:0:0:0 | NewEncoder | tst2.go:10:9:10:26 | call to NewEncoder | tst2.go:9:6:9:6 | definition of w |
-| file://:0:0:0:0 | ReadFrom | tst.go:10:23:10:28 | reader | tst.go:9:2:9:12 | definition of bytesBuffer |
-| file://:0:0:0:0 | Reset | reset.go:12:15:12:20 | source | reset.go:11:6:11:11 | definition of reader |
+| file://:0:0:0:0 | NewEncoder | tst2.go:10:9:10:26 | call to NewEncoder | tst2.go:10:25:10:25 | w [postupdate] |
+| file://:0:0:0:0 | ReadFrom | tst.go:10:23:10:28 | reader | tst.go:10:2:10:12 | bytesBuffer [postupdate] |
+| file://:0:0:0:0 | Reset | reset.go:12:15:12:20 | source | reset.go:12:2:12:7 | reader [postupdate] |
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/FunctionInputsAndOutputs/FunctionOutput_getExitNode.expected b/go/ql/test/library-tests/semmle/go/dataflow/FunctionInputsAndOutputs/FunctionOutput_getExitNode.expected
index e8addfb217e..eebf68d92d4 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/FunctionInputsAndOutputs/FunctionOutput_getExitNode.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/FunctionInputsAndOutputs/FunctionOutput_getExitNode.expected
@@ -1,13 +1,13 @@
-| parameter 0 | reset.go:12:2:12:21 | call to Reset | reset.go:9:2:9:7 | definition of source |
-| parameter 0 | tst2.go:10:9:10:26 | call to NewEncoder | tst2.go:9:6:9:6 | definition of w |
-| parameter 0 | tst2.go:10:9:10:39 | call to Encode | tst2.go:8:12:8:15 | definition of data |
-| parameter 0 | tst.go:10:2:10:29 | call to ReadFrom | tst.go:8:12:8:17 | definition of reader |
-| parameter 0 | tst.go:16:2:16:12 | call to test5 | tst.go:15:12:15:12 | definition of x |
-| parameter 1 | tst.go:16:2:16:12 | call to test5 | tst.go:15:15:15:15 | definition of y |
-| receiver | main.go:53:14:53:21 | call to bump | main.go:52:2:52:2 | definition of c |
-| receiver | reset.go:12:2:12:21 | call to Reset | reset.go:11:6:11:11 | definition of reader |
-| receiver | tst2.go:10:9:10:39 | call to Encode | tst2.go:10:9:10:26 | call to NewEncoder |
-| receiver | tst.go:10:2:10:29 | call to ReadFrom | tst.go:9:2:9:12 | definition of bytesBuffer |
+| parameter 0 | reset.go:12:2:12:21 | call to Reset | reset.go:12:15:12:20 | source [postupdate] |
+| parameter 0 | tst2.go:10:9:10:26 | call to NewEncoder | tst2.go:10:25:10:25 | w [postupdate] |
+| parameter 0 | tst2.go:10:9:10:39 | call to Encode | tst2.go:10:35:10:38 | data [postupdate] |
+| parameter 0 | tst.go:10:2:10:29 | call to ReadFrom | tst.go:10:23:10:28 | reader [postupdate] |
+| parameter 0 | tst.go:16:2:16:12 | call to test5 | tst.go:16:8:16:8 | x [postupdate] |
+| parameter 1 | tst.go:16:2:16:12 | call to test5 | tst.go:16:11:16:11 | y [postupdate] |
+| receiver | main.go:53:14:53:21 | call to bump | main.go:53:14:53:14 | c [postupdate] |
+| receiver | reset.go:12:2:12:21 | call to Reset | reset.go:12:2:12:7 | reader [postupdate] |
+| receiver | tst2.go:10:9:10:39 | call to Encode | tst2.go:10:9:10:26 | call to NewEncoder [postupdate] |
+| receiver | tst.go:10:2:10:29 | call to ReadFrom | tst.go:10:2:10:12 | bytesBuffer [postupdate] |
 | result | main.go:51:2:51:14 | call to op | main.go:51:2:51:14 | call to op |
 | result | main.go:53:2:53:22 | call to op2 | main.go:53:2:53:22 | call to op2 |
 | result | main.go:53:14:53:21 | call to bump | main.go:53:14:53:21 | call to bump |
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/PostUpdateNodes/test.expected b/go/ql/test/library-tests/semmle/go/dataflow/PostUpdateNodes/test.expected
index 5ee74a7cde4..d29d11627b0 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/PostUpdateNodes/test.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/PostUpdateNodes/test.expected
@@ -1,15 +1,26 @@
-| test.go:19:2:19:2 | definition of a |
-| test.go:20:11:20:14 | &... |
-| test.go:20:12:20:14 | selection of b |
-| test.go:21:2:21:5 | selection of bs |
-| test.go:21:2:21:8 | index expression |
-| test.go:21:17:21:20 | &... |
-| test.go:21:18:21:20 | struct literal |
-| test.go:22:2:22:5 | selection of bs |
-| test.go:22:2:22:8 | index expression |
-| test.go:22:2:22:13 | implicit dereference |
-| test.go:22:2:22:13 | selection of cptr |
-| test.go:23:2:23:7 | implicit dereference |
-| test.go:23:2:23:7 | selection of bptr |
-| test.go:23:2:23:12 | implicit dereference |
-| test.go:23:2:23:12 | selection of cptr |
+| file://:0:0:0:0 | [summary param] 0 in copy | file://:0:0:0:0 | [summary] to write: Argument[0] in copy |
+| test.go:23:2:23:2 | a | test.go:23:2:23:2 | a [postupdate] |
+| test.go:23:11:23:14 | &... | test.go:23:11:23:14 | &... [postupdate] |
+| test.go:23:12:23:14 | selection of b | test.go:23:12:23:14 | selection of b [postupdate] |
+| test.go:24:2:24:2 | a | test.go:24:2:24:2 | a [postupdate] |
+| test.go:24:2:24:5 | selection of bs | test.go:24:2:24:5 | selection of bs [postupdate] |
+| test.go:24:2:24:8 | index expression | test.go:24:2:24:8 | index expression [postupdate] |
+| test.go:24:17:24:20 | &... | test.go:24:17:24:20 | &... [postupdate] |
+| test.go:24:18:24:20 | struct literal | test.go:24:18:24:20 | struct literal [postupdate] |
+| test.go:25:2:25:2 | a | test.go:25:2:25:2 | a [postupdate] |
+| test.go:25:2:25:5 | selection of bs | test.go:25:2:25:5 | selection of bs [postupdate] |
+| test.go:25:2:25:8 | index expression | test.go:25:2:25:8 | index expression [postupdate] |
+| test.go:25:2:25:13 | implicit dereference | test.go:25:2:25:13 | implicit dereference [postupdate] |
+| test.go:25:2:25:13 | selection of cptr | test.go:25:2:25:13 | selection of cptr [postupdate] |
+| test.go:26:2:26:2 | a | test.go:26:2:26:2 | a [postupdate] |
+| test.go:26:2:26:7 | implicit dereference | test.go:26:2:26:7 | implicit dereference [postupdate] |
+| test.go:26:2:26:7 | selection of bptr | test.go:26:2:26:7 | selection of bptr [postupdate] |
+| test.go:26:2:26:12 | implicit dereference | test.go:26:2:26:12 | implicit dereference [postupdate] |
+| test.go:26:2:26:12 | selection of cptr | test.go:26:2:26:12 | selection of cptr [postupdate] |
+| test.go:28:7:28:10 | struct literal | test.go:28:7:28:10 | struct literal [postupdate] |
+| test.go:29:2:29:2 | c | test.go:29:2:29:2 | c [postupdate] |
+| test.go:29:6:29:6 | a | test.go:29:6:29:6 | a [postupdate] |
+| test.go:30:2:30:2 | c | test.go:30:2:30:2 | c [postupdate] |
+| test.go:30:7:30:7 | a | test.go:30:7:30:7 | a [postupdate] |
+| test.go:35:4:35:4 | a | test.go:35:4:35:4 | a [postupdate] |
+| test.go:36:5:36:5 | a | test.go:36:5:36:5 | a [postupdate] |
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/PostUpdateNodes/test.go b/go/ql/test/library-tests/semmle/go/dataflow/PostUpdateNodes/test.go
index f9d4b3d8e65..3cb8656b96d 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/PostUpdateNodes/test.go
+++ b/go/ql/test/library-tests/semmle/go/dataflow/PostUpdateNodes/test.go
@@ -4,6 +4,9 @@ type C struct {
 	field int
 }
 
+func (c C) m(a A)   {}
+func (c *C) mp(a A) {}
+
 type B struct {
 	cptr *C
 }
@@ -22,4 +25,13 @@ func f() {
 	a.bs[3].cptr.field = 100
 	a.bptr.cptr.field = 101
 
+	c := C{0}
+	c.m(a)
+	c.mp(a)
+
+	// Indirect method calls - missing post-update nodes for the receivers
+	f := c.m
+	fp := c.mp
+	f(a)
+	fp(a)
 }
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/PostUpdateNodes/test.ql b/go/ql/test/library-tests/semmle/go/dataflow/PostUpdateNodes/test.ql
index 384b3346431..b200ed4b8a7 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/PostUpdateNodes/test.ql
+++ b/go/ql/test/library-tests/semmle/go/dataflow/PostUpdateNodes/test.ql
@@ -1,4 +1,4 @@
 import go
 
 from DataFlow::PostUpdateNode pun
-select pun
+select pun.getPreUpdateNode(), pun
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/PromotedFields/LocalFlowStep.expected b/go/ql/test/library-tests/semmle/go/dataflow/PromotedFields/LocalFlowStep.expected
index d61d6be9c5f..5908aa8d113 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/PromotedFields/LocalFlowStep.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/PromotedFields/LocalFlowStep.expected
@@ -79,106 +79,136 @@
 | main.go:7:6:7:9 | function sink | main.go:149:2:149:5 | sink |
 | main.go:7:6:7:9 | function sink | main.go:150:2:150:5 | sink |
 | main.go:22:2:22:6 | definition of outer | main.go:25:7:25:11 | outer |
-| main.go:22:2:22:6 | definition of outer | main.go:26:7:26:11 | outer |
-| main.go:22:2:22:6 | definition of outer | main.go:27:7:27:11 | outer |
-| main.go:22:2:22:6 | definition of outer | main.go:28:7:28:11 | outer |
 | main.go:22:11:24:2 | struct literal | main.go:22:2:22:6 | definition of outer |
+| main.go:22:11:24:2 | struct literal [postupdate] | main.go:22:2:22:6 | definition of outer |
+| main.go:25:7:25:11 | outer | main.go:26:7:26:11 | outer |
+| main.go:26:7:26:11 | outer | main.go:27:7:27:11 | outer |
+| main.go:27:7:27:11 | outer | main.go:28:7:28:11 | outer |
 | main.go:30:2:30:7 | definition of outerp | main.go:33:7:33:12 | outerp |
-| main.go:30:2:30:7 | definition of outerp | main.go:34:7:34:12 | outerp |
-| main.go:30:2:30:7 | definition of outerp | main.go:35:7:35:12 | outerp |
-| main.go:30:2:30:7 | definition of outerp | main.go:36:7:36:12 | outerp |
 | main.go:30:12:32:2 | &... | main.go:30:2:30:7 | definition of outerp |
+| main.go:30:12:32:2 | &... [postupdate] | main.go:30:2:30:7 | definition of outerp |
+| main.go:33:7:33:12 | outerp | main.go:34:7:34:12 | outerp |
+| main.go:33:7:33:12 | outerp [postupdate] | main.go:34:7:34:12 | outerp |
+| main.go:34:7:34:12 | outerp | main.go:35:7:35:12 | outerp |
+| main.go:34:7:34:12 | outerp [postupdate] | main.go:35:7:35:12 | outerp |
+| main.go:35:7:35:12 | outerp | main.go:36:7:36:12 | outerp |
+| main.go:35:7:35:12 | outerp [postupdate] | main.go:36:7:36:12 | outerp |
 | main.go:40:2:40:6 | definition of outer | main.go:41:7:41:11 | outer |
-| main.go:40:2:40:6 | definition of outer | main.go:42:7:42:11 | outer |
-| main.go:40:2:40:6 | definition of outer | main.go:43:7:43:11 | outer |
-| main.go:40:2:40:6 | definition of outer | main.go:44:7:44:11 | outer |
 | main.go:40:11:40:40 | struct literal | main.go:40:2:40:6 | definition of outer |
+| main.go:40:11:40:40 | struct literal [postupdate] | main.go:40:2:40:6 | definition of outer |
+| main.go:41:7:41:11 | outer | main.go:42:7:42:11 | outer |
+| main.go:42:7:42:11 | outer | main.go:43:7:43:11 | outer |
+| main.go:43:7:43:11 | outer | main.go:44:7:44:11 | outer |
 | main.go:46:2:46:7 | definition of outerp | main.go:47:7:47:12 | outerp |
-| main.go:46:2:46:7 | definition of outerp | main.go:48:7:48:12 | outerp |
-| main.go:46:2:46:7 | definition of outerp | main.go:49:7:49:12 | outerp |
-| main.go:46:2:46:7 | definition of outerp | main.go:50:7:50:12 | outerp |
 | main.go:46:12:46:42 | &... | main.go:46:2:46:7 | definition of outerp |
+| main.go:46:12:46:42 | &... [postupdate] | main.go:46:2:46:7 | definition of outerp |
+| main.go:47:7:47:12 | outerp | main.go:48:7:48:12 | outerp |
+| main.go:47:7:47:12 | outerp [postupdate] | main.go:48:7:48:12 | outerp |
+| main.go:48:7:48:12 | outerp | main.go:49:7:49:12 | outerp |
+| main.go:48:7:48:12 | outerp [postupdate] | main.go:49:7:49:12 | outerp |
+| main.go:49:7:49:12 | outerp | main.go:50:7:50:12 | outerp |
+| main.go:49:7:49:12 | outerp [postupdate] | main.go:50:7:50:12 | outerp |
 | main.go:54:2:54:6 | definition of inner | main.go:55:19:55:23 | inner |
 | main.go:54:11:54:25 | struct literal | main.go:54:2:54:6 | definition of inner |
+| main.go:54:11:54:25 | struct literal [postupdate] | main.go:54:2:54:6 | definition of inner |
 | main.go:55:2:55:7 | definition of middle | main.go:56:17:56:22 | middle |
 | main.go:55:12:55:24 | struct literal | main.go:55:2:55:7 | definition of middle |
+| main.go:55:12:55:24 | struct literal [postupdate] | main.go:55:2:55:7 | definition of middle |
 | main.go:56:2:56:6 | definition of outer | main.go:57:7:57:11 | outer |
-| main.go:56:2:56:6 | definition of outer | main.go:58:7:58:11 | outer |
-| main.go:56:2:56:6 | definition of outer | main.go:59:7:59:11 | outer |
-| main.go:56:2:56:6 | definition of outer | main.go:60:7:60:11 | outer |
 | main.go:56:11:56:23 | struct literal | main.go:56:2:56:6 | definition of outer |
+| main.go:56:11:56:23 | struct literal [postupdate] | main.go:56:2:56:6 | definition of outer |
+| main.go:57:7:57:11 | outer | main.go:58:7:58:11 | outer |
+| main.go:58:7:58:11 | outer | main.go:59:7:59:11 | outer |
+| main.go:59:7:59:11 | outer | main.go:60:7:60:11 | outer |
 | main.go:62:2:62:7 | definition of innerp | main.go:63:20:63:25 | innerp |
 | main.go:62:12:62:26 | struct literal | main.go:62:2:62:7 | definition of innerp |
+| main.go:62:12:62:26 | struct literal [postupdate] | main.go:62:2:62:7 | definition of innerp |
 | main.go:63:2:63:8 | definition of middlep | main.go:64:18:64:24 | middlep |
 | main.go:63:13:63:26 | struct literal | main.go:63:2:63:8 | definition of middlep |
+| main.go:63:13:63:26 | struct literal [postupdate] | main.go:63:2:63:8 | definition of middlep |
 | main.go:64:2:64:7 | definition of outerp | main.go:65:7:65:12 | outerp |
-| main.go:64:2:64:7 | definition of outerp | main.go:66:7:66:12 | outerp |
-| main.go:64:2:64:7 | definition of outerp | main.go:67:7:67:12 | outerp |
-| main.go:64:2:64:7 | definition of outerp | main.go:68:7:68:12 | outerp |
 | main.go:64:12:64:25 | struct literal | main.go:64:2:64:7 | definition of outerp |
+| main.go:64:12:64:25 | struct literal [postupdate] | main.go:64:2:64:7 | definition of outerp |
+| main.go:65:7:65:12 | outerp | main.go:66:7:66:12 | outerp |
+| main.go:66:7:66:12 | outerp | main.go:67:7:67:12 | outerp |
+| main.go:67:7:67:12 | outerp | main.go:68:7:68:12 | outerp |
 | main.go:72:2:72:6 | definition of inner | main.go:73:26:73:30 | inner |
 | main.go:72:11:72:25 | struct literal | main.go:72:2:72:6 | definition of inner |
+| main.go:72:11:72:25 | struct literal [postupdate] | main.go:72:2:72:6 | definition of inner |
 | main.go:73:2:73:7 | definition of middle | main.go:74:25:74:30 | middle |
 | main.go:73:12:73:31 | struct literal | main.go:73:2:73:7 | definition of middle |
+| main.go:73:12:73:31 | struct literal [postupdate] | main.go:73:2:73:7 | definition of middle |
 | main.go:74:2:74:6 | definition of outer | main.go:75:7:75:11 | outer |
-| main.go:74:2:74:6 | definition of outer | main.go:76:7:76:11 | outer |
-| main.go:74:2:74:6 | definition of outer | main.go:77:7:77:11 | outer |
-| main.go:74:2:74:6 | definition of outer | main.go:78:7:78:11 | outer |
 | main.go:74:11:74:31 | struct literal | main.go:74:2:74:6 | definition of outer |
+| main.go:74:11:74:31 | struct literal [postupdate] | main.go:74:2:74:6 | definition of outer |
+| main.go:75:7:75:11 | outer | main.go:76:7:76:11 | outer |
+| main.go:76:7:76:11 | outer | main.go:77:7:77:11 | outer |
+| main.go:77:7:77:11 | outer | main.go:78:7:78:11 | outer |
 | main.go:80:2:80:7 | definition of innerp | main.go:81:27:81:32 | innerp |
 | main.go:80:12:80:26 | struct literal | main.go:80:2:80:7 | definition of innerp |
+| main.go:80:12:80:26 | struct literal [postupdate] | main.go:80:2:80:7 | definition of innerp |
 | main.go:81:2:81:8 | definition of middlep | main.go:82:26:82:32 | middlep |
 | main.go:81:13:81:33 | struct literal | main.go:81:2:81:8 | definition of middlep |
+| main.go:81:13:81:33 | struct literal [postupdate] | main.go:81:2:81:8 | definition of middlep |
 | main.go:82:2:82:7 | definition of outerp | main.go:83:7:83:12 | outerp |
-| main.go:82:2:82:7 | definition of outerp | main.go:84:7:84:12 | outerp |
-| main.go:82:2:82:7 | definition of outerp | main.go:85:7:85:12 | outerp |
-| main.go:82:2:82:7 | definition of outerp | main.go:86:7:86:12 | outerp |
 | main.go:82:12:82:33 | struct literal | main.go:82:2:82:7 | definition of outerp |
+| main.go:82:12:82:33 | struct literal [postupdate] | main.go:82:2:82:7 | definition of outerp |
+| main.go:83:7:83:12 | outerp | main.go:84:7:84:12 | outerp |
+| main.go:84:7:84:12 | outerp | main.go:85:7:85:12 | outerp |
+| main.go:85:7:85:12 | outerp | main.go:86:7:86:12 | outerp |
 | main.go:90:6:90:10 | definition of outer | main.go:91:2:91:6 | outer |
-| main.go:90:6:90:10 | definition of outer | main.go:92:7:92:11 | outer |
-| main.go:90:6:90:10 | definition of outer | main.go:93:7:93:11 | outer |
-| main.go:90:6:90:10 | definition of outer | main.go:94:7:94:11 | outer |
-| main.go:90:6:90:10 | definition of outer | main.go:95:7:95:11 | outer |
 | main.go:90:6:90:10 | zero value for outer | main.go:90:6:90:10 | definition of outer |
+| main.go:91:2:91:6 | outer | main.go:92:7:92:11 | outer |
+| main.go:91:2:91:6 | outer [postupdate] | main.go:92:7:92:11 | outer |
+| main.go:92:7:92:11 | outer | main.go:93:7:93:11 | outer |
+| main.go:93:7:93:11 | outer | main.go:94:7:94:11 | outer |
+| main.go:94:7:94:11 | outer | main.go:95:7:95:11 | outer |
 | main.go:97:6:97:11 | definition of outerp | main.go:98:2:98:7 | outerp |
-| main.go:97:6:97:11 | definition of outerp | main.go:99:7:99:12 | outerp |
-| main.go:97:6:97:11 | definition of outerp | main.go:100:7:100:12 | outerp |
-| main.go:97:6:97:11 | definition of outerp | main.go:101:7:101:12 | outerp |
-| main.go:97:6:97:11 | definition of outerp | main.go:102:7:102:12 | outerp |
 | main.go:97:6:97:11 | zero value for outerp | main.go:97:6:97:11 | definition of outerp |
+| main.go:98:2:98:7 | outerp | main.go:99:7:99:12 | outerp |
+| main.go:98:2:98:7 | outerp [postupdate] | main.go:99:7:99:12 | outerp |
+| main.go:99:7:99:12 | outerp | main.go:100:7:100:12 | outerp |
+| main.go:100:7:100:12 | outerp | main.go:101:7:101:12 | outerp |
+| main.go:101:7:101:12 | outerp | main.go:102:7:102:12 | outerp |
 | main.go:106:6:106:10 | definition of outer | main.go:107:2:107:6 | outer |
-| main.go:106:6:106:10 | definition of outer | main.go:108:7:108:11 | outer |
-| main.go:106:6:106:10 | definition of outer | main.go:109:7:109:11 | outer |
-| main.go:106:6:106:10 | definition of outer | main.go:110:7:110:11 | outer |
-| main.go:106:6:106:10 | definition of outer | main.go:111:7:111:11 | outer |
 | main.go:106:6:106:10 | zero value for outer | main.go:106:6:106:10 | definition of outer |
+| main.go:107:2:107:6 | outer | main.go:108:7:108:11 | outer |
+| main.go:107:2:107:6 | outer [postupdate] | main.go:108:7:108:11 | outer |
+| main.go:108:7:108:11 | outer | main.go:109:7:109:11 | outer |
+| main.go:109:7:109:11 | outer | main.go:110:7:110:11 | outer |
+| main.go:110:7:110:11 | outer | main.go:111:7:111:11 | outer |
 | main.go:113:6:113:11 | definition of outerp | main.go:114:2:114:7 | outerp |
-| main.go:113:6:113:11 | definition of outerp | main.go:115:7:115:12 | outerp |
-| main.go:113:6:113:11 | definition of outerp | main.go:116:7:116:12 | outerp |
-| main.go:113:6:113:11 | definition of outerp | main.go:117:7:117:12 | outerp |
-| main.go:113:6:113:11 | definition of outerp | main.go:118:7:118:12 | outerp |
 | main.go:113:6:113:11 | zero value for outerp | main.go:113:6:113:11 | definition of outerp |
+| main.go:114:2:114:7 | outerp | main.go:115:7:115:12 | outerp |
+| main.go:114:2:114:7 | outerp [postupdate] | main.go:115:7:115:12 | outerp |
+| main.go:115:7:115:12 | outerp | main.go:116:7:116:12 | outerp |
+| main.go:116:7:116:12 | outerp | main.go:117:7:117:12 | outerp |
+| main.go:117:7:117:12 | outerp | main.go:118:7:118:12 | outerp |
 | main.go:122:6:122:10 | definition of outer | main.go:123:2:123:6 | outer |
-| main.go:122:6:122:10 | definition of outer | main.go:124:7:124:11 | outer |
-| main.go:122:6:122:10 | definition of outer | main.go:125:7:125:11 | outer |
-| main.go:122:6:122:10 | definition of outer | main.go:126:7:126:11 | outer |
-| main.go:122:6:122:10 | definition of outer | main.go:127:7:127:11 | outer |
 | main.go:122:6:122:10 | zero value for outer | main.go:122:6:122:10 | definition of outer |
+| main.go:123:2:123:6 | outer | main.go:124:7:124:11 | outer |
+| main.go:123:2:123:6 | outer [postupdate] | main.go:124:7:124:11 | outer |
+| main.go:124:7:124:11 | outer | main.go:125:7:125:11 | outer |
+| main.go:125:7:125:11 | outer | main.go:126:7:126:11 | outer |
+| main.go:126:7:126:11 | outer | main.go:127:7:127:11 | outer |
 | main.go:129:6:129:11 | definition of outerp | main.go:130:2:130:7 | outerp |
-| main.go:129:6:129:11 | definition of outerp | main.go:131:7:131:12 | outerp |
-| main.go:129:6:129:11 | definition of outerp | main.go:132:7:132:12 | outerp |
-| main.go:129:6:129:11 | definition of outerp | main.go:133:7:133:12 | outerp |
-| main.go:129:6:129:11 | definition of outerp | main.go:134:7:134:12 | outerp |
 | main.go:129:6:129:11 | zero value for outerp | main.go:129:6:129:11 | definition of outerp |
+| main.go:130:2:130:7 | outerp | main.go:131:7:131:12 | outerp |
+| main.go:130:2:130:7 | outerp [postupdate] | main.go:131:7:131:12 | outerp |
+| main.go:131:7:131:12 | outerp | main.go:132:7:132:12 | outerp |
+| main.go:132:7:132:12 | outerp | main.go:133:7:133:12 | outerp |
+| main.go:133:7:133:12 | outerp | main.go:134:7:134:12 | outerp |
 | main.go:138:6:138:10 | definition of outer | main.go:139:2:139:6 | outer |
-| main.go:138:6:138:10 | definition of outer | main.go:140:7:140:11 | outer |
-| main.go:138:6:138:10 | definition of outer | main.go:141:7:141:11 | outer |
-| main.go:138:6:138:10 | definition of outer | main.go:142:7:142:11 | outer |
-| main.go:138:6:138:10 | definition of outer | main.go:143:7:143:11 | outer |
 | main.go:138:6:138:10 | zero value for outer | main.go:138:6:138:10 | definition of outer |
+| main.go:139:2:139:6 | outer | main.go:140:7:140:11 | outer |
+| main.go:139:2:139:6 | outer [postupdate] | main.go:140:7:140:11 | outer |
+| main.go:140:7:140:11 | outer | main.go:141:7:141:11 | outer |
+| main.go:141:7:141:11 | outer | main.go:142:7:142:11 | outer |
+| main.go:142:7:142:11 | outer | main.go:143:7:143:11 | outer |
 | main.go:145:6:145:11 | definition of outerp | main.go:146:2:146:7 | outerp |
-| main.go:145:6:145:11 | definition of outerp | main.go:147:7:147:12 | outerp |
-| main.go:145:6:145:11 | definition of outerp | main.go:148:7:148:12 | outerp |
-| main.go:145:6:145:11 | definition of outerp | main.go:149:7:149:12 | outerp |
-| main.go:145:6:145:11 | definition of outerp | main.go:150:7:150:12 | outerp |
 | main.go:145:6:145:11 | zero value for outerp | main.go:145:6:145:11 | definition of outerp |
+| main.go:146:2:146:7 | outerp | main.go:147:7:147:12 | outerp |
+| main.go:146:2:146:7 | outerp [postupdate] | main.go:147:7:147:12 | outerp |
+| main.go:147:7:147:12 | outerp | main.go:148:7:148:12 | outerp |
+| main.go:148:7:148:12 | outerp | main.go:149:7:149:12 | outerp |
+| main.go:149:7:149:12 | outerp | main.go:150:7:150:12 | outerp |
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ReadsAndWrites/writesElement.expected b/go/ql/test/library-tests/semmle/go/dataflow/ReadsAndWrites/writesElement.expected
index 77bb562d3f5..44792aa3d29 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ReadsAndWrites/writesElement.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ReadsAndWrites/writesElement.expected
@@ -1,3 +1,3 @@
-| tst.go:19:2:19:6 | assignment to element | tst.go:19:2:19:3 | xs | tst.go:19:5:19:5 | 0 | tst.go:19:10:19:14 | index expression |
-| tst.go:20:2:20:6 | assignment to element | tst.go:20:2:20:3 | implicit dereference | tst.go:20:5:20:5 | 0 | tst.go:20:10:20:14 | index expression |
-| tst.go:20:2:20:6 | assignment to element | tst.go:20:2:20:3 | ps | tst.go:20:5:20:5 | 0 | tst.go:20:10:20:14 | index expression |
+| tst.go:19:2:19:6 | assignment to element | tst.go:19:2:19:3 | xs [postupdate] | tst.go:19:5:19:5 | 0 | tst.go:19:10:19:14 | index expression |
+| tst.go:20:2:20:6 | assignment to element | tst.go:20:2:20:3 | implicit dereference [postupdate] | tst.go:20:5:20:5 | 0 | tst.go:20:10:20:14 | index expression |
+| tst.go:20:2:20:6 | assignment to element | tst.go:20:2:20:3 | ps [postupdate] | tst.go:20:5:20:5 | 0 | tst.go:20:10:20:14 | index expression |
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ReadsAndWrites/writesField.expected b/go/ql/test/library-tests/semmle/go/dataflow/ReadsAndWrites/writesField.expected
index 8e71670f8c1..7862b2d61b3 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ReadsAndWrites/writesField.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ReadsAndWrites/writesField.expected
@@ -1,3 +1,3 @@
-| tst.go:8:2:8:4 | assignment to field f | tst.go:8:2:8:2 | implicit dereference | tst.go:4:2:4:2 | f | tst.go:8:8:8:14 | ...+... |
-| tst.go:8:2:8:4 | assignment to field f | tst.go:8:2:8:2 | t | tst.go:4:2:4:2 | f | tst.go:8:8:8:14 | ...+... |
-| tst.go:17:2:17:4 | assignment to field f | tst.go:17:2:17:2 | x | tst.go:4:2:4:2 | f | tst.go:17:8:17:14 | ...+... |
+| tst.go:8:2:8:4 | assignment to field f | tst.go:8:2:8:2 | implicit dereference [postupdate] | tst.go:4:2:4:2 | f | tst.go:8:8:8:14 | ...+... |
+| tst.go:8:2:8:4 | assignment to field f | tst.go:8:2:8:2 | t [postupdate] | tst.go:4:2:4:2 | f | tst.go:8:8:8:14 | ...+... |
+| tst.go:17:2:17:4 | assignment to field f | tst.go:17:2:17:2 | x [postupdate] | tst.go:4:2:4:2 | f | tst.go:17:8:17:14 | ...+... |
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/test_gogf_gf_database_gdb.go b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/test_gogf_gf_database_gdb.go
index 436c9dab677..45e6a3aefa1 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/test_gogf_gf_database_gdb.go
+++ b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/database/test_gogf_gf_database_gdb.go
@@ -30,9 +30,9 @@ func gogf_Core(g gdb.Core) {
 	g.GetStruct(&v7, "SELECT user from users") // $ source
 	sink(v7)                                   // $ hasTaintFlow="v7"
 
-	var v8 []User // $ source
-	g.GetStructs(v8, "SELECT user from users")
-	sink(v8) // $ hasTaintFlow="v8"
+	var v8 []User
+	g.GetStructs(v8, "SELECT user from users") // $ source
+	sink(v8)                                   // $ hasTaintFlow="v8"
 
 	v9, _ := g.GetValue("SELECT user from users") // $ source
 	sink(v9)                                      // $ hasTaintFlow="v9"
@@ -132,9 +132,9 @@ func gogf_TX(g gdb.TX) {
 	g.GetStruct(&v4, "SELECT user from users") // $ source
 	sink(v4)                                   // $ hasTaintFlow="v4"
 
-	var v5 []User // $ source
-	g.GetStructs(v5, "SELECT user from users")
-	sink(v5) // $ hasTaintFlow="v5"
+	var v5 []User
+	g.GetStructs(v5, "SELECT user from users") // $ source
+	sink(v5)                                   // $ hasTaintFlow="v5"
 
 	v6, _ := g.GetValue("SELECT user from users") // $ source
 	sink(v6)                                      // $ hasTaintFlow="v6"
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Beego/CleartextLogging.expected b/go/ql/test/library-tests/semmle/go/frameworks/Beego/CleartextLogging.expected
index 6fd71942356..591d990be47 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Beego/CleartextLogging.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Beego/CleartextLogging.expected
@@ -1,5 +1,40 @@
 edges
+| test.go:153:17:153:24 | definition of password | test.go:154:14:154:21 | password | provenance |  |
+| test.go:153:17:153:24 | definition of password | test.go:155:17:155:24 | password | provenance |  |
+| test.go:153:17:153:24 | definition of password | test.go:156:14:156:21 | password | provenance |  |
+| test.go:153:17:153:24 | definition of password | test.go:157:18:157:25 | password | provenance |  |
+| test.go:153:17:153:24 | definition of password | test.go:158:14:158:21 | password | provenance |  |
+| test.go:153:17:153:24 | definition of password | test.go:159:13:159:20 | password | provenance |  |
+| test.go:153:17:153:24 | definition of password | test.go:160:22:160:29 | password | provenance |  |
+| test.go:153:17:153:24 | definition of password | test.go:161:15:161:22 | password | provenance |  |
+| test.go:153:17:153:24 | definition of password | test.go:162:14:162:21 | password | provenance |  |
+| test.go:153:17:153:24 | definition of password | test.go:163:13:163:20 | password | provenance |  |
+| test.go:153:17:153:24 | definition of password | test.go:164:16:164:23 | password | provenance |  |
+| test.go:153:17:153:24 | definition of password | test.go:165:13:165:20 | password | provenance | Sink:MaD:380 |
+| test.go:153:17:153:24 | definition of password | test.go:166:16:166:23 | password | provenance | Sink:MaD:381 |
+| test.go:153:17:153:24 | definition of password | test.go:167:13:167:20 | password | provenance | Sink:MaD:382 |
+| test.go:153:17:153:24 | definition of password | test.go:168:17:168:24 | password | provenance | Sink:MaD:383 |
+| test.go:153:17:153:24 | definition of password | test.go:169:13:169:20 | password | provenance | Sink:MaD:384 |
+| test.go:153:17:153:24 | definition of password | test.go:170:12:170:19 | password | provenance | Sink:MaD:385 |
+| test.go:153:17:153:24 | definition of password | test.go:171:21:171:28 | password | provenance | Sink:MaD:386 |
+| test.go:153:17:153:24 | definition of password | test.go:172:14:172:21 | password | provenance | Sink:MaD:387 |
+| test.go:153:17:153:24 | definition of password | test.go:173:13:173:20 | password | provenance | Sink:MaD:388 |
+| test.go:153:17:153:24 | definition of password | test.go:174:12:174:19 | password | provenance | Sink:MaD:389 |
+| test.go:153:17:153:24 | definition of password | test.go:175:15:175:22 | password | provenance | Sink:MaD:390 |
+| test.go:153:17:153:24 | definition of password | test.go:176:15:176:22 | password | provenance | Sink:MaD:391 |
+| test.go:153:17:153:24 | definition of password | test.go:177:18:177:25 | password | provenance | Sink:MaD:392 |
+| test.go:153:17:153:24 | definition of password | test.go:178:15:178:22 | password | provenance | Sink:MaD:393 |
+| test.go:153:17:153:24 | definition of password | test.go:179:19:179:26 | password | provenance | Sink:MaD:394 |
+| test.go:153:17:153:24 | definition of password | test.go:180:15:180:22 | password | provenance | Sink:MaD:395 |
+| test.go:153:17:153:24 | definition of password | test.go:181:14:181:21 | password | provenance | Sink:MaD:396 |
+| test.go:153:17:153:24 | definition of password | test.go:182:23:182:30 | password | provenance | Sink:MaD:397 |
+| test.go:153:17:153:24 | definition of password | test.go:183:16:183:23 | password | provenance | Sink:MaD:398 |
+| test.go:153:17:153:24 | definition of password | test.go:184:15:184:22 | password | provenance | Sink:MaD:399 |
+| test.go:153:17:153:24 | definition of password | test.go:185:14:185:21 | password | provenance | Sink:MaD:400 |
+| test.go:153:17:153:24 | definition of password | test.go:186:17:186:24 | password | provenance | Sink:MaD:401 |
+| test.go:153:17:153:24 | definition of password | test.go:187:16:187:23 | password | provenance |  |
 nodes
+| test.go:153:17:153:24 | definition of password | semmle.label | definition of password |
 | test.go:154:14:154:21 | password | semmle.label | password |
 | test.go:155:17:155:24 | password | semmle.label | password |
 | test.go:156:14:156:21 | password | semmle.label | password |
@@ -36,37 +71,37 @@ nodes
 | test.go:187:16:187:23 | password | semmle.label | password |
 subpaths
 #select
-| test.go:154:14:154:21 | password | test.go:154:14:154:21 | password | test.go:154:14:154:21 | password | $@ flows to a logging call. | test.go:154:14:154:21 | password | Sensitive data returned by an access to password |
-| test.go:155:17:155:24 | password | test.go:155:17:155:24 | password | test.go:155:17:155:24 | password | $@ flows to a logging call. | test.go:155:17:155:24 | password | Sensitive data returned by an access to password |
-| test.go:156:14:156:21 | password | test.go:156:14:156:21 | password | test.go:156:14:156:21 | password | $@ flows to a logging call. | test.go:156:14:156:21 | password | Sensitive data returned by an access to password |
-| test.go:157:18:157:25 | password | test.go:157:18:157:25 | password | test.go:157:18:157:25 | password | $@ flows to a logging call. | test.go:157:18:157:25 | password | Sensitive data returned by an access to password |
-| test.go:158:14:158:21 | password | test.go:158:14:158:21 | password | test.go:158:14:158:21 | password | $@ flows to a logging call. | test.go:158:14:158:21 | password | Sensitive data returned by an access to password |
-| test.go:159:13:159:20 | password | test.go:159:13:159:20 | password | test.go:159:13:159:20 | password | $@ flows to a logging call. | test.go:159:13:159:20 | password | Sensitive data returned by an access to password |
-| test.go:160:22:160:29 | password | test.go:160:22:160:29 | password | test.go:160:22:160:29 | password | $@ flows to a logging call. | test.go:160:22:160:29 | password | Sensitive data returned by an access to password |
-| test.go:161:15:161:22 | password | test.go:161:15:161:22 | password | test.go:161:15:161:22 | password | $@ flows to a logging call. | test.go:161:15:161:22 | password | Sensitive data returned by an access to password |
-| test.go:162:14:162:21 | password | test.go:162:14:162:21 | password | test.go:162:14:162:21 | password | $@ flows to a logging call. | test.go:162:14:162:21 | password | Sensitive data returned by an access to password |
-| test.go:163:13:163:20 | password | test.go:163:13:163:20 | password | test.go:163:13:163:20 | password | $@ flows to a logging call. | test.go:163:13:163:20 | password | Sensitive data returned by an access to password |
-| test.go:164:16:164:23 | password | test.go:164:16:164:23 | password | test.go:164:16:164:23 | password | $@ flows to a logging call. | test.go:164:16:164:23 | password | Sensitive data returned by an access to password |
-| test.go:165:13:165:20 | password | test.go:165:13:165:20 | password | test.go:165:13:165:20 | password | $@ flows to a logging call. | test.go:165:13:165:20 | password | Sensitive data returned by an access to password |
-| test.go:166:16:166:23 | password | test.go:166:16:166:23 | password | test.go:166:16:166:23 | password | $@ flows to a logging call. | test.go:166:16:166:23 | password | Sensitive data returned by an access to password |
-| test.go:167:13:167:20 | password | test.go:167:13:167:20 | password | test.go:167:13:167:20 | password | $@ flows to a logging call. | test.go:167:13:167:20 | password | Sensitive data returned by an access to password |
-| test.go:168:17:168:24 | password | test.go:168:17:168:24 | password | test.go:168:17:168:24 | password | $@ flows to a logging call. | test.go:168:17:168:24 | password | Sensitive data returned by an access to password |
-| test.go:169:13:169:20 | password | test.go:169:13:169:20 | password | test.go:169:13:169:20 | password | $@ flows to a logging call. | test.go:169:13:169:20 | password | Sensitive data returned by an access to password |
-| test.go:170:12:170:19 | password | test.go:170:12:170:19 | password | test.go:170:12:170:19 | password | $@ flows to a logging call. | test.go:170:12:170:19 | password | Sensitive data returned by an access to password |
-| test.go:171:21:171:28 | password | test.go:171:21:171:28 | password | test.go:171:21:171:28 | password | $@ flows to a logging call. | test.go:171:21:171:28 | password | Sensitive data returned by an access to password |
-| test.go:172:14:172:21 | password | test.go:172:14:172:21 | password | test.go:172:14:172:21 | password | $@ flows to a logging call. | test.go:172:14:172:21 | password | Sensitive data returned by an access to password |
-| test.go:173:13:173:20 | password | test.go:173:13:173:20 | password | test.go:173:13:173:20 | password | $@ flows to a logging call. | test.go:173:13:173:20 | password | Sensitive data returned by an access to password |
-| test.go:174:12:174:19 | password | test.go:174:12:174:19 | password | test.go:174:12:174:19 | password | $@ flows to a logging call. | test.go:174:12:174:19 | password | Sensitive data returned by an access to password |
-| test.go:175:15:175:22 | password | test.go:175:15:175:22 | password | test.go:175:15:175:22 | password | $@ flows to a logging call. | test.go:175:15:175:22 | password | Sensitive data returned by an access to password |
-| test.go:176:15:176:22 | password | test.go:176:15:176:22 | password | test.go:176:15:176:22 | password | $@ flows to a logging call. | test.go:176:15:176:22 | password | Sensitive data returned by an access to password |
-| test.go:177:18:177:25 | password | test.go:177:18:177:25 | password | test.go:177:18:177:25 | password | $@ flows to a logging call. | test.go:177:18:177:25 | password | Sensitive data returned by an access to password |
-| test.go:178:15:178:22 | password | test.go:178:15:178:22 | password | test.go:178:15:178:22 | password | $@ flows to a logging call. | test.go:178:15:178:22 | password | Sensitive data returned by an access to password |
-| test.go:179:19:179:26 | password | test.go:179:19:179:26 | password | test.go:179:19:179:26 | password | $@ flows to a logging call. | test.go:179:19:179:26 | password | Sensitive data returned by an access to password |
-| test.go:180:15:180:22 | password | test.go:180:15:180:22 | password | test.go:180:15:180:22 | password | $@ flows to a logging call. | test.go:180:15:180:22 | password | Sensitive data returned by an access to password |
-| test.go:181:14:181:21 | password | test.go:181:14:181:21 | password | test.go:181:14:181:21 | password | $@ flows to a logging call. | test.go:181:14:181:21 | password | Sensitive data returned by an access to password |
-| test.go:182:23:182:30 | password | test.go:182:23:182:30 | password | test.go:182:23:182:30 | password | $@ flows to a logging call. | test.go:182:23:182:30 | password | Sensitive data returned by an access to password |
-| test.go:183:16:183:23 | password | test.go:183:16:183:23 | password | test.go:183:16:183:23 | password | $@ flows to a logging call. | test.go:183:16:183:23 | password | Sensitive data returned by an access to password |
-| test.go:184:15:184:22 | password | test.go:184:15:184:22 | password | test.go:184:15:184:22 | password | $@ flows to a logging call. | test.go:184:15:184:22 | password | Sensitive data returned by an access to password |
-| test.go:185:14:185:21 | password | test.go:185:14:185:21 | password | test.go:185:14:185:21 | password | $@ flows to a logging call. | test.go:185:14:185:21 | password | Sensitive data returned by an access to password |
-| test.go:186:17:186:24 | password | test.go:186:17:186:24 | password | test.go:186:17:186:24 | password | $@ flows to a logging call. | test.go:186:17:186:24 | password | Sensitive data returned by an access to password |
-| test.go:187:16:187:23 | password | test.go:187:16:187:23 | password | test.go:187:16:187:23 | password | $@ flows to a logging call. | test.go:187:16:187:23 | password | Sensitive data returned by an access to password |
+| test.go:154:14:154:21 | password | test.go:153:17:153:24 | definition of password | test.go:154:14:154:21 | password | $@ flows to a logging call. | test.go:153:17:153:24 | definition of password | Sensitive data returned by an access to password |
+| test.go:155:17:155:24 | password | test.go:153:17:153:24 | definition of password | test.go:155:17:155:24 | password | $@ flows to a logging call. | test.go:153:17:153:24 | definition of password | Sensitive data returned by an access to password |
+| test.go:156:14:156:21 | password | test.go:153:17:153:24 | definition of password | test.go:156:14:156:21 | password | $@ flows to a logging call. | test.go:153:17:153:24 | definition of password | Sensitive data returned by an access to password |
+| test.go:157:18:157:25 | password | test.go:153:17:153:24 | definition of password | test.go:157:18:157:25 | password | $@ flows to a logging call. | test.go:153:17:153:24 | definition of password | Sensitive data returned by an access to password |
+| test.go:158:14:158:21 | password | test.go:153:17:153:24 | definition of password | test.go:158:14:158:21 | password | $@ flows to a logging call. | test.go:153:17:153:24 | definition of password | Sensitive data returned by an access to password |
+| test.go:159:13:159:20 | password | test.go:153:17:153:24 | definition of password | test.go:159:13:159:20 | password | $@ flows to a logging call. | test.go:153:17:153:24 | definition of password | Sensitive data returned by an access to password |
+| test.go:160:22:160:29 | password | test.go:153:17:153:24 | definition of password | test.go:160:22:160:29 | password | $@ flows to a logging call. | test.go:153:17:153:24 | definition of password | Sensitive data returned by an access to password |
+| test.go:161:15:161:22 | password | test.go:153:17:153:24 | definition of password | test.go:161:15:161:22 | password | $@ flows to a logging call. | test.go:153:17:153:24 | definition of password | Sensitive data returned by an access to password |
+| test.go:162:14:162:21 | password | test.go:153:17:153:24 | definition of password | test.go:162:14:162:21 | password | $@ flows to a logging call. | test.go:153:17:153:24 | definition of password | Sensitive data returned by an access to password |
+| test.go:163:13:163:20 | password | test.go:153:17:153:24 | definition of password | test.go:163:13:163:20 | password | $@ flows to a logging call. | test.go:153:17:153:24 | definition of password | Sensitive data returned by an access to password |
+| test.go:164:16:164:23 | password | test.go:153:17:153:24 | definition of password | test.go:164:16:164:23 | password | $@ flows to a logging call. | test.go:153:17:153:24 | definition of password | Sensitive data returned by an access to password |
+| test.go:165:13:165:20 | password | test.go:153:17:153:24 | definition of password | test.go:165:13:165:20 | password | $@ flows to a logging call. | test.go:153:17:153:24 | definition of password | Sensitive data returned by an access to password |
+| test.go:166:16:166:23 | password | test.go:153:17:153:24 | definition of password | test.go:166:16:166:23 | password | $@ flows to a logging call. | test.go:153:17:153:24 | definition of password | Sensitive data returned by an access to password |
+| test.go:167:13:167:20 | password | test.go:153:17:153:24 | definition of password | test.go:167:13:167:20 | password | $@ flows to a logging call. | test.go:153:17:153:24 | definition of password | Sensitive data returned by an access to password |
+| test.go:168:17:168:24 | password | test.go:153:17:153:24 | definition of password | test.go:168:17:168:24 | password | $@ flows to a logging call. | test.go:153:17:153:24 | definition of password | Sensitive data returned by an access to password |
+| test.go:169:13:169:20 | password | test.go:153:17:153:24 | definition of password | test.go:169:13:169:20 | password | $@ flows to a logging call. | test.go:153:17:153:24 | definition of password | Sensitive data returned by an access to password |
+| test.go:170:12:170:19 | password | test.go:153:17:153:24 | definition of password | test.go:170:12:170:19 | password | $@ flows to a logging call. | test.go:153:17:153:24 | definition of password | Sensitive data returned by an access to password |
+| test.go:171:21:171:28 | password | test.go:153:17:153:24 | definition of password | test.go:171:21:171:28 | password | $@ flows to a logging call. | test.go:153:17:153:24 | definition of password | Sensitive data returned by an access to password |
+| test.go:172:14:172:21 | password | test.go:153:17:153:24 | definition of password | test.go:172:14:172:21 | password | $@ flows to a logging call. | test.go:153:17:153:24 | definition of password | Sensitive data returned by an access to password |
+| test.go:173:13:173:20 | password | test.go:153:17:153:24 | definition of password | test.go:173:13:173:20 | password | $@ flows to a logging call. | test.go:153:17:153:24 | definition of password | Sensitive data returned by an access to password |
+| test.go:174:12:174:19 | password | test.go:153:17:153:24 | definition of password | test.go:174:12:174:19 | password | $@ flows to a logging call. | test.go:153:17:153:24 | definition of password | Sensitive data returned by an access to password |
+| test.go:175:15:175:22 | password | test.go:153:17:153:24 | definition of password | test.go:175:15:175:22 | password | $@ flows to a logging call. | test.go:153:17:153:24 | definition of password | Sensitive data returned by an access to password |
+| test.go:176:15:176:22 | password | test.go:153:17:153:24 | definition of password | test.go:176:15:176:22 | password | $@ flows to a logging call. | test.go:153:17:153:24 | definition of password | Sensitive data returned by an access to password |
+| test.go:177:18:177:25 | password | test.go:153:17:153:24 | definition of password | test.go:177:18:177:25 | password | $@ flows to a logging call. | test.go:153:17:153:24 | definition of password | Sensitive data returned by an access to password |
+| test.go:178:15:178:22 | password | test.go:153:17:153:24 | definition of password | test.go:178:15:178:22 | password | $@ flows to a logging call. | test.go:153:17:153:24 | definition of password | Sensitive data returned by an access to password |
+| test.go:179:19:179:26 | password | test.go:153:17:153:24 | definition of password | test.go:179:19:179:26 | password | $@ flows to a logging call. | test.go:153:17:153:24 | definition of password | Sensitive data returned by an access to password |
+| test.go:180:15:180:22 | password | test.go:153:17:153:24 | definition of password | test.go:180:15:180:22 | password | $@ flows to a logging call. | test.go:153:17:153:24 | definition of password | Sensitive data returned by an access to password |
+| test.go:181:14:181:21 | password | test.go:153:17:153:24 | definition of password | test.go:181:14:181:21 | password | $@ flows to a logging call. | test.go:153:17:153:24 | definition of password | Sensitive data returned by an access to password |
+| test.go:182:23:182:30 | password | test.go:153:17:153:24 | definition of password | test.go:182:23:182:30 | password | $@ flows to a logging call. | test.go:153:17:153:24 | definition of password | Sensitive data returned by an access to password |
+| test.go:183:16:183:23 | password | test.go:153:17:153:24 | definition of password | test.go:183:16:183:23 | password | $@ flows to a logging call. | test.go:153:17:153:24 | definition of password | Sensitive data returned by an access to password |
+| test.go:184:15:184:22 | password | test.go:153:17:153:24 | definition of password | test.go:184:15:184:22 | password | $@ flows to a logging call. | test.go:153:17:153:24 | definition of password | Sensitive data returned by an access to password |
+| test.go:185:14:185:21 | password | test.go:153:17:153:24 | definition of password | test.go:185:14:185:21 | password | $@ flows to a logging call. | test.go:153:17:153:24 | definition of password | Sensitive data returned by an access to password |
+| test.go:186:17:186:24 | password | test.go:153:17:153:24 | definition of password | test.go:186:17:186:24 | password | $@ flows to a logging call. | test.go:153:17:153:24 | definition of password | Sensitive data returned by an access to password |
+| test.go:187:16:187:23 | password | test.go:153:17:153:24 | definition of password | test.go:187:16:187:23 | password | $@ flows to a logging call. | test.go:153:17:153:24 | definition of password | Sensitive data returned by an access to password |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Beego/ReflectedXss.expected b/go/ql/test/library-tests/semmle/go/frameworks/Beego/ReflectedXss.expected
index aa0345f221e..be8ae2ec2fa 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Beego/ReflectedXss.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Beego/ReflectedXss.expected
@@ -1,7 +1,7 @@
 #select
-| test.go:35:13:35:30 | type conversion | test.go:33:6:33:10 | definition of bound | test.go:35:13:35:30 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:33:6:33:10 | definition of bound | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:36:13:36:27 | type conversion | test.go:33:6:33:10 | definition of bound | test.go:36:13:36:27 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:33:6:33:10 | definition of bound | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:37:13:37:29 | type conversion | test.go:33:6:33:10 | definition of bound | test.go:37:13:37:29 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:33:6:33:10 | definition of bound | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:35:13:35:30 | type conversion | test.go:34:13:34:17 | bound [postupdate] | test.go:35:13:35:30 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:34:13:34:17 | bound [postupdate] | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:36:13:36:27 | type conversion | test.go:34:13:34:17 | bound [postupdate] | test.go:36:13:36:27 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:34:13:34:17 | bound [postupdate] | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:37:13:37:29 | type conversion | test.go:34:13:34:17 | bound [postupdate] | test.go:37:13:37:29 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:34:13:34:17 | bound [postupdate] | user-provided value | test.go:0:0:0:0 | test.go |  |
 | test.go:42:13:42:43 | type conversion | test.go:42:20:42:42 | call to Cookie | test.go:42:13:42:43 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:42:20:42:42 | call to Cookie | user-provided value | test.go:0:0:0:0 | test.go |  |
 | test.go:47:13:47:52 | type conversion | test.go:47:20:47:31 | call to Data | test.go:47:13:47:52 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:47:20:47:31 | call to Data | user-provided value | test.go:0:0:0:0 | test.go |  |
 | test.go:52:13:52:53 | type conversion | test.go:52:20:52:43 | call to GetData | test.go:52:13:52:53 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:52:20:52:43 | call to GetData | user-provided value | test.go:0:0:0:0 | test.go |  |
@@ -30,7 +30,7 @@
 | test.go:232:14:232:22 | type conversion | test.go:231:7:231:28 | call to GetString | test.go:232:14:232:22 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:231:7:231:28 | call to GetString | user-provided value | test.go:0:0:0:0 | test.go |  |
 | test.go:235:14:235:26 | type conversion | test.go:234:8:234:35 | call to GetStrings | test.go:235:14:235:26 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:234:8:234:35 | call to GetStrings | user-provided value | test.go:0:0:0:0 | test.go |  |
 | test.go:238:14:238:27 | type conversion | test.go:237:9:237:17 | call to Input | test.go:238:14:238:27 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:237:9:237:17 | call to Input | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:242:14:242:30 | type conversion | test.go:240:6:240:8 | definition of str | test.go:242:14:242:30 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:240:6:240:8 | definition of str | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:242:14:242:30 | type conversion | test.go:241:14:241:16 | str [postupdate] | test.go:242:14:242:30 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:241:14:241:16 | str [postupdate] | user-provided value | test.go:0:0:0:0 | test.go |  |
 | test.go:249:21:249:29 | untrusted | test.go:246:15:246:36 | call to GetString | test.go:249:21:249:29 | untrusted | Cross-site scripting vulnerability due to $@. | test.go:246:15:246:36 | call to GetString | user-provided value | test.go:0:0:0:0 | test.go |  |
 | test.go:259:16:259:45 | type conversion | test.go:259:23:259:44 | call to GetCookie | test.go:259:16:259:45 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:259:23:259:44 | call to GetCookie | user-provided value | test.go:0:0:0:0 | test.go |  |
 | test.go:264:16:264:37 | call to GetCookie | test.go:264:16:264:37 | call to GetCookie | test.go:264:16:264:37 | call to GetCookie | Cross-site scripting vulnerability due to $@. | test.go:264:16:264:37 | call to GetCookie | user-provided value | test.go:0:0:0:0 | test.go |  |
@@ -53,9 +53,9 @@
 | test.go:311:21:311:48 | type assertion | test.go:309:15:309:36 | call to GetString | test.go:311:21:311:48 | type assertion | Cross-site scripting vulnerability due to $@. | test.go:309:15:309:36 | call to GetString | user-provided value | test.go:0:0:0:0 | test.go |  |
 | test.go:312:21:312:52 | type assertion | test.go:309:15:309:36 | call to GetString | test.go:312:21:312:52 | type assertion | Cross-site scripting vulnerability due to $@. | test.go:309:15:309:36 | call to GetString | user-provided value | test.go:0:0:0:0 | test.go |  |
 edges
-| test.go:33:6:33:10 | definition of bound | test.go:35:13:35:30 | type conversion | provenance | Src:MaD:1  |
-| test.go:33:6:33:10 | definition of bound | test.go:36:13:36:27 | type conversion | provenance | Src:MaD:1  |
-| test.go:33:6:33:10 | definition of bound | test.go:37:13:37:29 | type conversion | provenance | Src:MaD:1  |
+| test.go:34:13:34:17 | bound [postupdate] | test.go:35:13:35:30 | type conversion | provenance | Src:MaD:1  |
+| test.go:34:13:34:17 | bound [postupdate] | test.go:36:13:36:27 | type conversion | provenance | Src:MaD:1  |
+| test.go:34:13:34:17 | bound [postupdate] | test.go:37:13:37:29 | type conversion | provenance | Src:MaD:1  |
 | test.go:42:20:42:42 | call to Cookie | test.go:42:13:42:43 | type conversion | provenance | Src:MaD:2  |
 | test.go:47:20:47:31 | call to Data | test.go:47:13:47:52 | type conversion | provenance | Src:MaD:3  |
 | test.go:52:20:52:43 | call to GetData | test.go:52:13:52:53 | type conversion | provenance | Src:MaD:4  |
@@ -87,8 +87,8 @@ edges
 | test.go:204:36:204:53 | type assertion | test.go:204:21:204:54 | call to Str2html | provenance | MaD:39 |
 | test.go:205:21:205:58 | call to Substr | test.go:205:14:205:59 | type conversion | provenance |  |
 | test.go:205:34:205:51 | type assertion | test.go:205:21:205:58 | call to Substr | provenance | MaD:40 |
-| test.go:207:6:207:6 | definition of s | test.go:209:14:209:28 | type conversion | provenance |  |
-| test.go:208:18:208:33 | selection of Form | test.go:207:6:207:6 | definition of s | provenance | Src:MaD:21 MaD:38 |
+| test.go:208:18:208:33 | selection of Form | test.go:208:36:208:36 | s [postupdate] | provenance | Src:MaD:21 MaD:38 |
+| test.go:208:36:208:36 | s [postupdate] | test.go:209:14:209:28 | type conversion | provenance |  |
 | test.go:223:2:223:34 | ... := ...[0] | test.go:225:31:225:31 | f | provenance | Src:MaD:15  |
 | test.go:223:2:223:34 | ... := ...[1] | test.go:224:14:224:32 | type conversion | provenance | Src:MaD:15  |
 | test.go:225:2:225:32 | ... := ...[0] | test.go:226:14:226:20 | content | provenance |  |
@@ -97,7 +97,7 @@ edges
 | test.go:231:7:231:28 | call to GetString | test.go:232:14:232:22 | type conversion | provenance | Src:MaD:17  |
 | test.go:234:8:234:35 | call to GetStrings | test.go:235:14:235:26 | type conversion | provenance | Src:MaD:18  |
 | test.go:237:9:237:17 | call to Input | test.go:238:14:238:27 | type conversion | provenance | Src:MaD:19  |
-| test.go:240:6:240:8 | definition of str | test.go:242:14:242:30 | type conversion | provenance | Src:MaD:20  |
+| test.go:241:14:241:16 | str [postupdate] | test.go:242:14:242:30 | type conversion | provenance | Src:MaD:20  |
 | test.go:246:15:246:36 | call to GetString | test.go:249:21:249:29 | untrusted | provenance | Src:MaD:17  |
 | test.go:259:23:259:44 | call to GetCookie | test.go:259:16:259:45 | type conversion | provenance | Src:MaD:14  |
 | test.go:270:62:270:83 | call to GetCookie | test.go:270:55:270:84 | type conversion | provenance | Src:MaD:14  |
@@ -116,8 +116,8 @@ edges
 | test.go:275:2:275:40 | ... := ...[0] | test.go:301:39:301:50 | genericFiles | provenance | Src:MaD:16  |
 | test.go:275:2:275:40 | ... := ...[0] | test.go:302:40:302:51 | genericFiles | provenance | Src:MaD:16  |
 | test.go:275:2:275:40 | ... := ...[0] | test.go:303:39:303:50 | genericFiles | provenance | Src:MaD:16  |
-| test.go:276:2:276:13 | definition of genericFiles [array] | test.go:297:51:297:62 | genericFiles [array] | provenance |  |
-| test.go:278:21:278:28 | index expression | test.go:276:2:276:13 | definition of genericFiles [array] | provenance |  |
+| test.go:278:3:278:14 | genericFiles [postupdate] [array] | test.go:297:51:297:62 | genericFiles [array] | provenance |  |
+| test.go:278:21:278:28 | index expression | test.go:278:3:278:14 | genericFiles [postupdate] [array] | provenance |  |
 | test.go:283:44:283:60 | selection of Filename | test.go:283:21:283:61 | call to GetDisplayString | provenance | FunctionModel |
 | test.go:284:21:284:53 | call to SliceChunk | test.go:284:21:284:92 | selection of Filename | provenance |  |
 | test.go:284:38:284:49 | genericFiles | test.go:284:21:284:53 | call to SliceChunk | provenance | MaD:22 |
@@ -146,10 +146,10 @@ edges
 | test.go:302:40:302:51 | genericFiles | test.go:302:21:302:52 | call to SliceShuffle | provenance | MaD:30 |
 | test.go:303:21:303:51 | call to SliceUnique | test.go:303:21:303:87 | selection of Filename | provenance |  |
 | test.go:303:39:303:50 | genericFiles | test.go:303:21:303:51 | call to SliceUnique | provenance | MaD:31 |
-| test.go:308:2:308:5 | definition of bMap | test.go:311:21:311:24 | bMap | provenance |  |
-| test.go:308:2:308:5 | definition of bMap | test.go:312:21:312:24 | bMap | provenance |  |
 | test.go:309:15:309:36 | call to GetString | test.go:310:22:310:30 | untrusted | provenance | Src:MaD:17  |
-| test.go:310:22:310:30 | untrusted | test.go:308:2:308:5 | definition of bMap | provenance | MaD:34 |
+| test.go:310:2:310:5 | bMap [postupdate] | test.go:311:21:311:24 | bMap | provenance |  |
+| test.go:310:2:310:5 | bMap [postupdate] | test.go:312:21:312:24 | bMap | provenance |  |
+| test.go:310:22:310:30 | untrusted | test.go:310:2:310:5 | bMap [postupdate] | provenance | MaD:34 |
 | test.go:311:21:311:24 | bMap | test.go:311:21:311:39 | call to Get | provenance | MaD:32 |
 | test.go:311:21:311:39 | call to Get | test.go:311:21:311:48 | type assertion | provenance |  |
 | test.go:312:21:312:24 | bMap | test.go:312:21:312:32 | call to Items | provenance | MaD:33 |
@@ -197,7 +197,7 @@ models
 | 40 | Summary: group:beego; ; false; Substr; ; ; Argument[0]; ReturnValue; taint; manual |
 | 41 | Summary: io/ioutil; ; false; ReadAll; ; ; Argument[0]; ReturnValue[0]; taint; manual |
 nodes
-| test.go:33:6:33:10 | definition of bound | semmle.label | definition of bound |
+| test.go:34:13:34:17 | bound [postupdate] | semmle.label | bound [postupdate] |
 | test.go:35:13:35:30 | type conversion | semmle.label | type conversion |
 | test.go:36:13:36:27 | type conversion | semmle.label | type conversion |
 | test.go:37:13:37:29 | type conversion | semmle.label | type conversion |
@@ -249,8 +249,8 @@ nodes
 | test.go:205:14:205:59 | type conversion | semmle.label | type conversion |
 | test.go:205:21:205:58 | call to Substr | semmle.label | call to Substr |
 | test.go:205:34:205:51 | type assertion | semmle.label | type assertion |
-| test.go:207:6:207:6 | definition of s | semmle.label | definition of s |
 | test.go:208:18:208:33 | selection of Form | semmle.label | selection of Form |
+| test.go:208:36:208:36 | s [postupdate] | semmle.label | s [postupdate] |
 | test.go:209:14:209:28 | type conversion | semmle.label | type conversion |
 | test.go:223:2:223:34 | ... := ...[0] | semmle.label | ... := ...[0] |
 | test.go:223:2:223:34 | ... := ...[1] | semmle.label | ... := ...[1] |
@@ -266,7 +266,7 @@ nodes
 | test.go:235:14:235:26 | type conversion | semmle.label | type conversion |
 | test.go:237:9:237:17 | call to Input | semmle.label | call to Input |
 | test.go:238:14:238:27 | type conversion | semmle.label | type conversion |
-| test.go:240:6:240:8 | definition of str | semmle.label | definition of str |
+| test.go:241:14:241:16 | str [postupdate] | semmle.label | str [postupdate] |
 | test.go:242:14:242:30 | type conversion | semmle.label | type conversion |
 | test.go:246:15:246:36 | call to GetString | semmle.label | call to GetString |
 | test.go:249:21:249:29 | untrusted | semmle.label | untrusted |
@@ -277,7 +277,7 @@ nodes
 | test.go:270:55:270:84 | type conversion | semmle.label | type conversion |
 | test.go:270:62:270:83 | call to GetCookie | semmle.label | call to GetCookie |
 | test.go:275:2:275:40 | ... := ...[0] | semmle.label | ... := ...[0] |
-| test.go:276:2:276:13 | definition of genericFiles [array] | semmle.label | definition of genericFiles [array] |
+| test.go:278:3:278:14 | genericFiles [postupdate] [array] | semmle.label | genericFiles [postupdate] [array] |
 | test.go:278:21:278:28 | index expression | semmle.label | index expression |
 | test.go:283:21:283:61 | call to GetDisplayString | semmle.label | call to GetDisplayString |
 | test.go:283:44:283:60 | selection of Filename | semmle.label | selection of Filename |
@@ -321,8 +321,8 @@ nodes
 | test.go:303:21:303:51 | call to SliceUnique | semmle.label | call to SliceUnique |
 | test.go:303:21:303:87 | selection of Filename | semmle.label | selection of Filename |
 | test.go:303:39:303:50 | genericFiles | semmle.label | genericFiles |
-| test.go:308:2:308:5 | definition of bMap | semmle.label | definition of bMap |
 | test.go:309:15:309:36 | call to GetString | semmle.label | call to GetString |
+| test.go:310:2:310:5 | bMap [postupdate] | semmle.label | bMap [postupdate] |
 | test.go:310:22:310:30 | untrusted | semmle.label | untrusted |
 | test.go:311:21:311:24 | bMap | semmle.label | bMap |
 | test.go:311:21:311:39 | call to Get | semmle.label | call to Get |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Beego/TaintedPath.expected b/go/ql/test/library-tests/semmle/go/frameworks/Beego/TaintedPath.expected
index 98b536aac65..2324a9679ad 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Beego/TaintedPath.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Beego/TaintedPath.expected
@@ -10,8 +10,8 @@ edges
 | test.go:215:15:215:26 | call to Data | test.go:216:18:216:26 | untrusted | provenance | Src:MaD:6 Sink:MaD:2 |
 | test.go:215:15:215:26 | call to Data | test.go:217:10:217:18 | untrusted | provenance | Src:MaD:6 Sink:MaD:5 |
 | test.go:215:15:215:26 | call to Data | test.go:218:35:218:43 | untrusted | provenance | Src:MaD:6 Sink:MaD:3 |
-| test.go:324:17:324:37 | selection of RequestBody | test.go:324:40:324:43 | &... | provenance | Src:MaD:7 MaD:8 |
-| test.go:324:40:324:43 | &... | test.go:326:35:326:43 | untrusted | provenance | Sink:MaD:3 |
+| test.go:324:17:324:37 | selection of RequestBody | test.go:324:40:324:43 | &... [postupdate] | provenance | Src:MaD:7 MaD:8 |
+| test.go:324:40:324:43 | &... [postupdate] | test.go:326:35:326:43 | untrusted | provenance | Sink:MaD:3 |
 | test.go:332:15:332:26 | call to Data | test.go:334:23:334:31 | untrusted | provenance | Src:MaD:6 Sink:MaD:1 |
 | test.go:340:15:340:26 | call to Data | test.go:342:53:342:61 | untrusted | provenance | Src:MaD:6 Sink:MaD:4 |
 | test.go:340:15:340:26 | call to Data | test.go:344:23:344:31 | untrusted | provenance | Src:MaD:6 Sink:MaD:1 |
@@ -30,7 +30,7 @@ nodes
 | test.go:217:10:217:18 | untrusted | semmle.label | untrusted |
 | test.go:218:35:218:43 | untrusted | semmle.label | untrusted |
 | test.go:324:17:324:37 | selection of RequestBody | semmle.label | selection of RequestBody |
-| test.go:324:40:324:43 | &... | semmle.label | &... |
+| test.go:324:40:324:43 | &... [postupdate] | semmle.label | &... [postupdate] |
 | test.go:326:35:326:43 | untrusted | semmle.label | untrusted |
 | test.go:332:15:332:26 | call to Data | semmle.label | call to Data |
 | test.go:334:23:334:31 | untrusted | semmle.label | untrusted |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Beego/test.go b/go/ql/test/library-tests/semmle/go/frameworks/Beego/test.go
index 2d2af8092de..d702f4a5445 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Beego/test.go
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Beego/test.go
@@ -297,7 +297,7 @@ func testUtilsPropagators(c *beego.Controller) {
 	c.CustomAbort(500, utils.SlicePad(untainted, 10, genericFiles[0])[0].(*multipart.FileHeader).Filename)
 	c.CustomAbort(500, utils.SlicePad(genericFiles, 10, untainted[0])[0].(*multipart.FileHeader).Filename)
 	c.CustomAbort(500, utils.SliceRand(genericFiles).(*multipart.FileHeader).Filename)
-	// Note this is misnamed -- it's a map operation, not a reduce
+	// Note this is misnamed -- it's a map operation, not a reduce
 	c.CustomAbort(500, utils.SliceReduce(genericFiles, func(x interface{}) interface{} { return x })[0].(*multipart.FileHeader).Filename)
 	c.CustomAbort(500, utils.SliceShuffle(genericFiles)[0].(*multipart.FileHeader).Filename)
 	c.CustomAbort(500, utils.SliceUnique(genericFiles)[0].(*multipart.FileHeader).Filename)
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/BeegoOrm/StoredXss.expected b/go/ql/test/library-tests/semmle/go/frameworks/BeegoOrm/StoredXss.expected
index f766a1a2db6..87c68cdc50b 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/BeegoOrm/StoredXss.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/BeegoOrm/StoredXss.expected
@@ -1,8 +1,8 @@
 #select
-| test.go:81:13:81:29 | type conversion | test.go:80:13:80:16 | &... | test.go:81:13:81:29 | type conversion | Stored cross-site scripting vulnerability due to $@. | test.go:80:13:80:16 | &... | stored value |
-| test.go:82:13:82:43 | type conversion | test.go:80:13:80:16 | &... | test.go:82:13:82:43 | type conversion | Stored cross-site scripting vulnerability due to $@. | test.go:80:13:80:16 | &... | stored value |
-| test.go:86:13:86:30 | type conversion | test.go:85:22:85:26 | &... | test.go:86:13:86:30 | type conversion | Stored cross-site scripting vulnerability due to $@. | test.go:85:22:85:26 | &... | stored value |
-| test.go:90:13:90:30 | type conversion | test.go:89:21:89:25 | &... | test.go:90:13:90:30 | type conversion | Stored cross-site scripting vulnerability due to $@. | test.go:89:21:89:25 | &... | stored value |
+| test.go:81:13:81:29 | type conversion | test.go:80:13:80:16 | &... [postupdate] | test.go:81:13:81:29 | type conversion | Stored cross-site scripting vulnerability due to $@. | test.go:80:13:80:16 | &... [postupdate] | stored value |
+| test.go:82:13:82:43 | type conversion | test.go:80:13:80:16 | &... [postupdate] | test.go:82:13:82:43 | type conversion | Stored cross-site scripting vulnerability due to $@. | test.go:80:13:80:16 | &... [postupdate] | stored value |
+| test.go:86:13:86:30 | type conversion | test.go:85:22:85:26 | &... [postupdate] | test.go:86:13:86:30 | type conversion | Stored cross-site scripting vulnerability due to $@. | test.go:85:22:85:26 | &... [postupdate] | stored value |
+| test.go:90:13:90:30 | type conversion | test.go:89:21:89:25 | &... [postupdate] | test.go:90:13:90:30 | type conversion | Stored cross-site scripting vulnerability due to $@. | test.go:89:21:89:25 | &... [postupdate] | stored value |
 | test.go:95:13:95:37 | type conversion | test.go:95:20:95:36 | call to Value | test.go:95:13:95:37 | type conversion | Stored cross-site scripting vulnerability due to $@. | test.go:95:20:95:36 | call to Value | stored value |
 | test.go:96:13:96:49 | type conversion | test.go:96:20:96:39 | call to RawValue | test.go:96:13:96:49 | type conversion | Stored cross-site scripting vulnerability due to $@. | test.go:96:20:96:39 | call to RawValue | stored value |
 | test.go:97:13:97:38 | type conversion | test.go:97:20:97:37 | call to String | test.go:97:13:97:38 | type conversion | Stored cross-site scripting vulnerability due to $@. | test.go:97:20:97:37 | call to String | stored value |
@@ -12,25 +12,25 @@
 | test.go:101:13:101:38 | type conversion | test.go:101:20:101:37 | call to Value | test.go:101:13:101:38 | type conversion | Stored cross-site scripting vulnerability due to $@. | test.go:101:20:101:37 | call to Value | stored value |
 | test.go:102:13:102:50 | type conversion | test.go:102:20:102:40 | call to RawValue | test.go:102:13:102:50 | type conversion | Stored cross-site scripting vulnerability due to $@. | test.go:102:20:102:40 | call to RawValue | stored value |
 | test.go:103:13:103:39 | type conversion | test.go:103:20:103:38 | call to String | test.go:103:13:103:39 | type conversion | Stored cross-site scripting vulnerability due to $@. | test.go:103:20:103:38 | call to String | stored value |
-| test.go:110:13:110:33 | type conversion | test.go:109:9:109:13 | &... | test.go:110:13:110:33 | type conversion | Stored cross-site scripting vulnerability due to $@. | test.go:109:9:109:13 | &... | stored value |
-| test.go:114:13:114:29 | type conversion | test.go:113:9:113:12 | &... | test.go:114:13:114:29 | type conversion | Stored cross-site scripting vulnerability due to $@. | test.go:113:9:113:12 | &... | stored value |
-| test.go:118:13:118:48 | type conversion | test.go:117:12:117:19 | &... | test.go:118:13:118:48 | type conversion | Stored cross-site scripting vulnerability due to $@. | test.go:117:12:117:19 | &... | stored value |
-| test.go:122:13:122:43 | type conversion | test.go:121:16:121:24 | &... | test.go:122:13:122:43 | type conversion | Stored cross-site scripting vulnerability due to $@. | test.go:121:16:121:24 | &... | stored value |
-| test.go:126:13:126:39 | type conversion | test.go:125:16:125:23 | &... | test.go:126:13:126:39 | type conversion | Stored cross-site scripting vulnerability due to $@. | test.go:125:16:125:23 | &... | stored value |
-| test.go:130:13:130:47 | type conversion | test.go:129:15:129:24 | &... | test.go:130:13:130:47 | type conversion | Stored cross-site scripting vulnerability due to $@. | test.go:129:15:129:24 | &... | stored value |
-| test.go:134:13:134:38 | type conversion | test.go:133:18:133:30 | &... | test.go:134:13:134:38 | type conversion | Stored cross-site scripting vulnerability due to $@. | test.go:133:18:133:30 | &... | stored value |
-| test.go:141:13:141:48 | type conversion | test.go:140:12:140:19 | &... | test.go:141:13:141:48 | type conversion | Stored cross-site scripting vulnerability due to $@. | test.go:140:12:140:19 | &... | stored value |
-| test.go:145:13:145:43 | type conversion | test.go:144:16:144:24 | &... | test.go:145:13:145:43 | type conversion | Stored cross-site scripting vulnerability due to $@. | test.go:144:16:144:24 | &... | stored value |
-| test.go:149:13:149:39 | type conversion | test.go:148:16:148:23 | &... | test.go:149:13:149:39 | type conversion | Stored cross-site scripting vulnerability due to $@. | test.go:148:16:148:23 | &... | stored value |
-| test.go:153:13:153:47 | type conversion | test.go:152:15:152:24 | &... | test.go:153:13:153:47 | type conversion | Stored cross-site scripting vulnerability due to $@. | test.go:152:15:152:24 | &... | stored value |
-| test.go:157:13:157:38 | type conversion | test.go:156:18:156:30 | &... | test.go:157:13:157:38 | type conversion | Stored cross-site scripting vulnerability due to $@. | test.go:156:18:156:30 | &... | stored value |
-| test.go:161:13:161:28 | type conversion | test.go:160:14:160:22 | &... | test.go:161:13:161:28 | type conversion | Stored cross-site scripting vulnerability due to $@. | test.go:160:14:160:22 | &... | stored value |
-| test.go:165:13:165:32 | type conversion | test.go:164:15:164:24 | &... | test.go:165:13:165:32 | type conversion | Stored cross-site scripting vulnerability due to $@. | test.go:164:15:164:24 | &... | stored value |
+| test.go:110:13:110:33 | type conversion | test.go:109:9:109:13 | &... [postupdate] | test.go:110:13:110:33 | type conversion | Stored cross-site scripting vulnerability due to $@. | test.go:109:9:109:13 | &... [postupdate] | stored value |
+| test.go:114:13:114:29 | type conversion | test.go:113:9:113:12 | &... [postupdate] | test.go:114:13:114:29 | type conversion | Stored cross-site scripting vulnerability due to $@. | test.go:113:9:113:12 | &... [postupdate] | stored value |
+| test.go:118:13:118:48 | type conversion | test.go:117:12:117:19 | &... [postupdate] | test.go:118:13:118:48 | type conversion | Stored cross-site scripting vulnerability due to $@. | test.go:117:12:117:19 | &... [postupdate] | stored value |
+| test.go:122:13:122:43 | type conversion | test.go:121:16:121:24 | &... [postupdate] | test.go:122:13:122:43 | type conversion | Stored cross-site scripting vulnerability due to $@. | test.go:121:16:121:24 | &... [postupdate] | stored value |
+| test.go:126:13:126:39 | type conversion | test.go:125:16:125:23 | &... [postupdate] | test.go:126:13:126:39 | type conversion | Stored cross-site scripting vulnerability due to $@. | test.go:125:16:125:23 | &... [postupdate] | stored value |
+| test.go:130:13:130:47 | type conversion | test.go:129:15:129:24 | &... [postupdate] | test.go:130:13:130:47 | type conversion | Stored cross-site scripting vulnerability due to $@. | test.go:129:15:129:24 | &... [postupdate] | stored value |
+| test.go:134:13:134:38 | type conversion | test.go:133:18:133:30 | &... [postupdate] | test.go:134:13:134:38 | type conversion | Stored cross-site scripting vulnerability due to $@. | test.go:133:18:133:30 | &... [postupdate] | stored value |
+| test.go:141:13:141:48 | type conversion | test.go:140:12:140:19 | &... [postupdate] | test.go:141:13:141:48 | type conversion | Stored cross-site scripting vulnerability due to $@. | test.go:140:12:140:19 | &... [postupdate] | stored value |
+| test.go:145:13:145:43 | type conversion | test.go:144:16:144:24 | &... [postupdate] | test.go:145:13:145:43 | type conversion | Stored cross-site scripting vulnerability due to $@. | test.go:144:16:144:24 | &... [postupdate] | stored value |
+| test.go:149:13:149:39 | type conversion | test.go:148:16:148:23 | &... [postupdate] | test.go:149:13:149:39 | type conversion | Stored cross-site scripting vulnerability due to $@. | test.go:148:16:148:23 | &... [postupdate] | stored value |
+| test.go:153:13:153:47 | type conversion | test.go:152:15:152:24 | &... [postupdate] | test.go:153:13:153:47 | type conversion | Stored cross-site scripting vulnerability due to $@. | test.go:152:15:152:24 | &... [postupdate] | stored value |
+| test.go:157:13:157:38 | type conversion | test.go:156:18:156:30 | &... [postupdate] | test.go:157:13:157:38 | type conversion | Stored cross-site scripting vulnerability due to $@. | test.go:156:18:156:30 | &... [postupdate] | stored value |
+| test.go:161:13:161:28 | type conversion | test.go:160:14:160:22 | &... [postupdate] | test.go:161:13:161:28 | type conversion | Stored cross-site scripting vulnerability due to $@. | test.go:160:14:160:22 | &... [postupdate] | stored value |
+| test.go:165:13:165:32 | type conversion | test.go:164:15:164:24 | &... [postupdate] | test.go:165:13:165:32 | type conversion | Stored cross-site scripting vulnerability due to $@. | test.go:164:15:164:24 | &... [postupdate] | stored value |
 edges
-| test.go:80:13:80:16 | &... | test.go:81:13:81:29 | type conversion | provenance | Src:MaD:1  |
-| test.go:80:13:80:16 | &... | test.go:82:13:82:43 | type conversion | provenance | Src:MaD:1  |
-| test.go:85:22:85:26 | &... | test.go:86:13:86:30 | type conversion | provenance | Src:MaD:2  |
-| test.go:89:21:89:25 | &... | test.go:90:13:90:30 | type conversion | provenance | Src:MaD:3  |
+| test.go:80:13:80:16 | &... [postupdate] | test.go:81:13:81:29 | type conversion | provenance | Src:MaD:1  |
+| test.go:80:13:80:16 | &... [postupdate] | test.go:82:13:82:43 | type conversion | provenance | Src:MaD:1  |
+| test.go:85:22:85:26 | &... [postupdate] | test.go:86:13:86:30 | type conversion | provenance | Src:MaD:2  |
+| test.go:89:21:89:25 | &... [postupdate] | test.go:90:13:90:30 | type conversion | provenance | Src:MaD:3  |
 | test.go:95:20:95:36 | call to Value | test.go:95:13:95:37 | type conversion | provenance |  |
 | test.go:96:20:96:39 | call to RawValue | test.go:96:13:96:49 | type conversion | provenance |  |
 | test.go:97:20:97:37 | call to String | test.go:97:13:97:38 | type conversion | provenance |  |
@@ -40,31 +40,31 @@ edges
 | test.go:101:20:101:37 | call to Value | test.go:101:13:101:38 | type conversion | provenance |  |
 | test.go:102:20:102:40 | call to RawValue | test.go:102:13:102:50 | type conversion | provenance |  |
 | test.go:103:20:103:38 | call to String | test.go:103:13:103:39 | type conversion | provenance |  |
-| test.go:109:9:109:13 | &... | test.go:110:13:110:33 | type conversion | provenance |  |
-| test.go:113:9:113:12 | &... | test.go:114:13:114:29 | type conversion | provenance |  |
-| test.go:117:12:117:19 | &... | test.go:118:13:118:48 | type conversion | provenance |  |
-| test.go:121:16:121:24 | &... | test.go:122:13:122:43 | type conversion | provenance |  |
-| test.go:125:16:125:23 | &... | test.go:126:13:126:39 | type conversion | provenance |  |
-| test.go:129:15:129:24 | &... | test.go:130:13:130:47 | type conversion | provenance |  |
-| test.go:133:18:133:30 | &... | test.go:134:13:134:38 | type conversion | provenance |  |
-| test.go:140:12:140:19 | &... | test.go:141:13:141:48 | type conversion | provenance |  |
-| test.go:144:16:144:24 | &... | test.go:145:13:145:43 | type conversion | provenance |  |
-| test.go:148:16:148:23 | &... | test.go:149:13:149:39 | type conversion | provenance |  |
-| test.go:152:15:152:24 | &... | test.go:153:13:153:47 | type conversion | provenance |  |
-| test.go:156:18:156:30 | &... | test.go:157:13:157:38 | type conversion | provenance |  |
-| test.go:160:14:160:22 | &... | test.go:161:13:161:28 | type conversion | provenance |  |
-| test.go:164:15:164:24 | &... | test.go:165:13:165:32 | type conversion | provenance |  |
+| test.go:109:9:109:13 | &... [postupdate] | test.go:110:13:110:33 | type conversion | provenance |  |
+| test.go:113:9:113:12 | &... [postupdate] | test.go:114:13:114:29 | type conversion | provenance |  |
+| test.go:117:12:117:19 | &... [postupdate] | test.go:118:13:118:48 | type conversion | provenance |  |
+| test.go:121:16:121:24 | &... [postupdate] | test.go:122:13:122:43 | type conversion | provenance |  |
+| test.go:125:16:125:23 | &... [postupdate] | test.go:126:13:126:39 | type conversion | provenance |  |
+| test.go:129:15:129:24 | &... [postupdate] | test.go:130:13:130:47 | type conversion | provenance |  |
+| test.go:133:18:133:30 | &... [postupdate] | test.go:134:13:134:38 | type conversion | provenance |  |
+| test.go:140:12:140:19 | &... [postupdate] | test.go:141:13:141:48 | type conversion | provenance |  |
+| test.go:144:16:144:24 | &... [postupdate] | test.go:145:13:145:43 | type conversion | provenance |  |
+| test.go:148:16:148:23 | &... [postupdate] | test.go:149:13:149:39 | type conversion | provenance |  |
+| test.go:152:15:152:24 | &... [postupdate] | test.go:153:13:153:47 | type conversion | provenance |  |
+| test.go:156:18:156:30 | &... [postupdate] | test.go:157:13:157:38 | type conversion | provenance |  |
+| test.go:160:14:160:22 | &... [postupdate] | test.go:161:13:161:28 | type conversion | provenance |  |
+| test.go:164:15:164:24 | &... [postupdate] | test.go:165:13:165:32 | type conversion | provenance |  |
 models
 | 1 | Source: group:beego-orm; Ormer; true; Read; ; ; Argument[0]; database; manual |
 | 2 | Source: group:beego-orm; Ormer; true; ReadForUpdate; ; ; Argument[0]; database; manual |
 | 3 | Source: group:beego-orm; Ormer; true; ReadOrCreate; ; ; Argument[0]; database; manual |
 nodes
-| test.go:80:13:80:16 | &... | semmle.label | &... |
+| test.go:80:13:80:16 | &... [postupdate] | semmle.label | &... [postupdate] |
 | test.go:81:13:81:29 | type conversion | semmle.label | type conversion |
 | test.go:82:13:82:43 | type conversion | semmle.label | type conversion |
-| test.go:85:22:85:26 | &... | semmle.label | &... |
+| test.go:85:22:85:26 | &... [postupdate] | semmle.label | &... [postupdate] |
 | test.go:86:13:86:30 | type conversion | semmle.label | type conversion |
-| test.go:89:21:89:25 | &... | semmle.label | &... |
+| test.go:89:21:89:25 | &... [postupdate] | semmle.label | &... [postupdate] |
 | test.go:90:13:90:30 | type conversion | semmle.label | type conversion |
 | test.go:95:13:95:37 | type conversion | semmle.label | type conversion |
 | test.go:95:20:95:36 | call to Value | semmle.label | call to Value |
@@ -84,32 +84,32 @@ nodes
 | test.go:102:20:102:40 | call to RawValue | semmle.label | call to RawValue |
 | test.go:103:13:103:39 | type conversion | semmle.label | type conversion |
 | test.go:103:20:103:38 | call to String | semmle.label | call to String |
-| test.go:109:9:109:13 | &... | semmle.label | &... |
+| test.go:109:9:109:13 | &... [postupdate] | semmle.label | &... [postupdate] |
 | test.go:110:13:110:33 | type conversion | semmle.label | type conversion |
-| test.go:113:9:113:12 | &... | semmle.label | &... |
+| test.go:113:9:113:12 | &... [postupdate] | semmle.label | &... [postupdate] |
 | test.go:114:13:114:29 | type conversion | semmle.label | type conversion |
-| test.go:117:12:117:19 | &... | semmle.label | &... |
+| test.go:117:12:117:19 | &... [postupdate] | semmle.label | &... [postupdate] |
 | test.go:118:13:118:48 | type conversion | semmle.label | type conversion |
-| test.go:121:16:121:24 | &... | semmle.label | &... |
+| test.go:121:16:121:24 | &... [postupdate] | semmle.label | &... [postupdate] |
 | test.go:122:13:122:43 | type conversion | semmle.label | type conversion |
-| test.go:125:16:125:23 | &... | semmle.label | &... |
+| test.go:125:16:125:23 | &... [postupdate] | semmle.label | &... [postupdate] |
 | test.go:126:13:126:39 | type conversion | semmle.label | type conversion |
-| test.go:129:15:129:24 | &... | semmle.label | &... |
+| test.go:129:15:129:24 | &... [postupdate] | semmle.label | &... [postupdate] |
 | test.go:130:13:130:47 | type conversion | semmle.label | type conversion |
-| test.go:133:18:133:30 | &... | semmle.label | &... |
+| test.go:133:18:133:30 | &... [postupdate] | semmle.label | &... [postupdate] |
 | test.go:134:13:134:38 | type conversion | semmle.label | type conversion |
-| test.go:140:12:140:19 | &... | semmle.label | &... |
+| test.go:140:12:140:19 | &... [postupdate] | semmle.label | &... [postupdate] |
 | test.go:141:13:141:48 | type conversion | semmle.label | type conversion |
-| test.go:144:16:144:24 | &... | semmle.label | &... |
+| test.go:144:16:144:24 | &... [postupdate] | semmle.label | &... [postupdate] |
 | test.go:145:13:145:43 | type conversion | semmle.label | type conversion |
-| test.go:148:16:148:23 | &... | semmle.label | &... |
+| test.go:148:16:148:23 | &... [postupdate] | semmle.label | &... [postupdate] |
 | test.go:149:13:149:39 | type conversion | semmle.label | type conversion |
-| test.go:152:15:152:24 | &... | semmle.label | &... |
+| test.go:152:15:152:24 | &... [postupdate] | semmle.label | &... [postupdate] |
 | test.go:153:13:153:47 | type conversion | semmle.label | type conversion |
-| test.go:156:18:156:30 | &... | semmle.label | &... |
+| test.go:156:18:156:30 | &... [postupdate] | semmle.label | &... [postupdate] |
 | test.go:157:13:157:38 | type conversion | semmle.label | type conversion |
-| test.go:160:14:160:22 | &... | semmle.label | &... |
+| test.go:160:14:160:22 | &... [postupdate] | semmle.label | &... [postupdate] |
 | test.go:161:13:161:28 | type conversion | semmle.label | type conversion |
-| test.go:164:15:164:24 | &... | semmle.label | &... |
+| test.go:164:15:164:24 | &... [postupdate] | semmle.label | &... [postupdate] |
 | test.go:165:13:165:32 | type conversion | semmle.label | type conversion |
 subpaths
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Echo/OpenRedirect.expected b/go/ql/test/library-tests/semmle/go/frameworks/Echo/OpenRedirect.expected
index 4b38e6e8c47..0fa6b12603a 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Echo/OpenRedirect.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Echo/OpenRedirect.expected
@@ -1,14 +1,15 @@
 #select
 | test.go:173:20:173:24 | param | test.go:172:11:172:32 | call to Param | test.go:173:20:173:24 | param | This path to an untrusted URL redirection depends on a $@. | test.go:172:11:172:32 | call to Param | user-provided value |
-| test.go:182:20:182:28 | ...+... | test.go:178:11:178:32 | call to Param | test.go:182:20:182:28 | ...+... | This path to an untrusted URL redirection depends on a $@. | test.go:178:11:178:32 | call to Param | user-provided value |
+| test.go:185:20:185:29 | ...+... | test.go:178:11:178:32 | call to Param | test.go:185:20:185:29 | ...+... | This path to an untrusted URL redirection depends on a $@. | test.go:178:11:178:32 | call to Param | user-provided value |
 edges
 | test.go:172:11:172:32 | call to Param | test.go:173:20:173:24 | param | provenance | Src:MaD:2 Sink:MaD:1 |
-| test.go:178:11:178:32 | call to Param | test.go:182:24:182:28 | param | provenance | Src:MaD:2  |
-| test.go:182:24:182:28 | param | test.go:182:20:182:28 | ...+... | provenance | Config Sink:MaD:1 |
-| test.go:190:9:190:26 | star expression | test.go:190:10:190:26 | selection of URL | provenance | Config |
-| test.go:190:9:190:26 | star expression | test.go:193:21:193:23 | url | provenance |  |
-| test.go:190:10:190:26 | selection of URL | test.go:190:9:190:26 | star expression | provenance | Src:MaD:3 Config |
-| test.go:193:21:193:23 | url | test.go:193:21:193:32 | call to String | provenance | Config Sink:MaD:1 |
+| test.go:178:11:178:32 | call to Param | test.go:185:24:185:29 | param2 | provenance | Src:MaD:2  |
+| test.go:185:24:185:29 | param2 | test.go:185:20:185:29 | ...+... | provenance | Config Sink:MaD:1 |
+| test.go:193:9:193:26 | star expression | test.go:193:10:193:26 | selection of URL [postupdate] | provenance | Config |
+| test.go:193:9:193:26 | star expression | test.go:196:21:196:23 | url | provenance |  |
+| test.go:193:10:193:26 | selection of URL | test.go:193:9:193:26 | star expression | provenance | Src:MaD:3 Config |
+| test.go:193:10:193:26 | selection of URL [postupdate] | test.go:193:9:193:26 | star expression | provenance | Config |
+| test.go:196:21:196:23 | url | test.go:196:21:196:32 | call to String | provenance | Config Sink:MaD:1 |
 models
 | 1 | Sink: github.com/labstack/echo; Context; true; Redirect; ; ; Argument[1]; url-redirection; manual |
 | 2 | Source: github.com/labstack/echo; Context; true; Param; ; ; ReturnValue[0]; remote; manual |
@@ -17,10 +18,11 @@ nodes
 | test.go:172:11:172:32 | call to Param | semmle.label | call to Param |
 | test.go:173:20:173:24 | param | semmle.label | param |
 | test.go:178:11:178:32 | call to Param | semmle.label | call to Param |
-| test.go:182:20:182:28 | ...+... | semmle.label | ...+... |
-| test.go:182:24:182:28 | param | semmle.label | param |
-| test.go:190:9:190:26 | star expression | semmle.label | star expression |
-| test.go:190:10:190:26 | selection of URL | semmle.label | selection of URL |
-| test.go:193:21:193:23 | url | semmle.label | url |
-| test.go:193:21:193:32 | call to String | semmle.label | call to String |
+| test.go:185:20:185:29 | ...+... | semmle.label | ...+... |
+| test.go:185:24:185:29 | param2 | semmle.label | param2 |
+| test.go:193:9:193:26 | star expression | semmle.label | star expression |
+| test.go:193:10:193:26 | selection of URL | semmle.label | selection of URL |
+| test.go:193:10:193:26 | selection of URL [postupdate] | semmle.label | selection of URL [postupdate] |
+| test.go:196:21:196:23 | url | semmle.label | url |
+| test.go:196:21:196:32 | call to String | semmle.label | call to String |
 subpaths
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Echo/ReflectedXss.expected b/go/ql/test/library-tests/semmle/go/frameworks/Echo/ReflectedXss.expected
index 61b8706f4e0..4e885d284d4 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Echo/ReflectedXss.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Echo/ReflectedXss.expected
@@ -11,7 +11,7 @@
 | test.go:77:20:77:25 | buffer | test.go:72:2:72:31 | ... := ...[0] | test.go:77:20:77:25 | buffer | Cross-site scripting vulnerability due to $@. | test.go:72:2:72:31 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
 | test.go:83:16:83:24 | selection of Value | test.go:82:2:82:32 | ... := ...[0] | test.go:83:16:83:24 | selection of Value | Cross-site scripting vulnerability due to $@. | test.go:82:2:82:32 | ... := ...[0] | user-provided value | test.go:0:0:0:0 | test.go |  |
 | test.go:89:16:89:31 | selection of Value | test.go:88:13:88:25 | call to Cookies | test.go:89:16:89:31 | selection of Value | Cross-site scripting vulnerability due to $@. | test.go:88:13:88:25 | call to Cookies | user-provided value | test.go:0:0:0:0 | test.go |  |
-| test.go:100:16:100:21 | selection of s | test.go:99:11:99:15 | &... | test.go:100:16:100:21 | selection of s | Cross-site scripting vulnerability due to $@. | test.go:99:11:99:15 | &... | user-provided value | test.go:0:0:0:0 | test.go |  |
+| test.go:100:16:100:21 | selection of s | test.go:99:11:99:15 | &... [postupdate] | test.go:100:16:100:21 | selection of s | Cross-site scripting vulnerability due to $@. | test.go:99:11:99:15 | &... [postupdate] | user-provided value | test.go:0:0:0:0 | test.go |  |
 | test.go:114:16:114:42 | type assertion | test.go:113:21:113:42 | call to Param | test.go:114:16:114:42 | type assertion | Cross-site scripting vulnerability due to $@. | test.go:113:21:113:42 | call to Param | user-provided value | test.go:0:0:0:0 | test.go |  |
 | test.go:125:16:125:20 | param | test.go:124:11:124:32 | call to Param | test.go:125:16:125:20 | param | Cross-site scripting vulnerability due to $@. | test.go:124:11:124:32 | call to Param | user-provided value | test.go:0:0:0:0 | test.go |  |
 | test.go:131:20:131:32 | type conversion | test.go:130:11:130:32 | call to Param | test.go:131:20:131:32 | type conversion | Cross-site scripting vulnerability due to $@. | test.go:130:11:130:32 | call to Param | user-provided value | test.go:0:0:0:0 | test.go |  |
@@ -29,23 +29,23 @@ edges
 | test.go:57:2:57:46 | ... := ...[0] | test.go:58:13:58:22 | fileHeader | provenance | Src:MaD:4  |
 | test.go:58:2:58:29 | ... := ...[0] | test.go:60:2:60:5 | file | provenance |  |
 | test.go:58:13:58:22 | fileHeader | test.go:58:2:58:29 | ... := ...[0] | provenance | MaD:17 |
-| test.go:59:2:59:7 | definition of buffer | test.go:61:20:61:25 | buffer | provenance |  |
-| test.go:60:2:60:5 | file | test.go:59:2:59:7 | definition of buffer | provenance | MaD:15 |
-| test.go:60:2:60:5 | file | test.go:59:2:59:7 | definition of buffer | provenance | MaD:16 |
-| test.go:60:2:60:5 | file | test.go:59:2:59:7 | definition of buffer | provenance | MaD:18 |
+| test.go:60:2:60:5 | file | test.go:60:12:60:17 | buffer [postupdate] | provenance | MaD:15 |
+| test.go:60:2:60:5 | file | test.go:60:12:60:17 | buffer [postupdate] | provenance | MaD:16 |
+| test.go:60:2:60:5 | file | test.go:60:12:60:17 | buffer [postupdate] | provenance | MaD:18 |
+| test.go:60:12:60:17 | buffer [postupdate] | test.go:61:20:61:25 | buffer | provenance |  |
 | test.go:66:2:66:31 | ... := ...[0] | test.go:67:16:67:41 | index expression | provenance | Src:MaD:7  |
 | test.go:72:2:72:31 | ... := ...[0] | test.go:74:13:74:22 | fileHeader | provenance | Src:MaD:7  |
 | test.go:74:2:74:29 | ... := ...[0] | test.go:76:2:76:5 | file | provenance |  |
 | test.go:74:13:74:22 | fileHeader | test.go:74:2:74:29 | ... := ...[0] | provenance | MaD:17 |
-| test.go:75:2:75:7 | definition of buffer | test.go:77:20:77:25 | buffer | provenance |  |
-| test.go:76:2:76:5 | file | test.go:75:2:75:7 | definition of buffer | provenance | MaD:15 |
-| test.go:76:2:76:5 | file | test.go:75:2:75:7 | definition of buffer | provenance | MaD:16 |
-| test.go:76:2:76:5 | file | test.go:75:2:75:7 | definition of buffer | provenance | MaD:18 |
+| test.go:76:2:76:5 | file | test.go:76:12:76:17 | buffer [postupdate] | provenance | MaD:15 |
+| test.go:76:2:76:5 | file | test.go:76:12:76:17 | buffer [postupdate] | provenance | MaD:16 |
+| test.go:76:2:76:5 | file | test.go:76:12:76:17 | buffer [postupdate] | provenance | MaD:18 |
+| test.go:76:12:76:17 | buffer [postupdate] | test.go:77:20:77:25 | buffer | provenance |  |
 | test.go:82:2:82:32 | ... := ...[0] | test.go:83:16:83:24 | selection of Value | provenance | Src:MaD:2  |
 | test.go:88:13:88:25 | call to Cookies | test.go:89:16:89:31 | selection of Value | provenance | Src:MaD:3  |
-| test.go:99:11:99:15 | &... | test.go:100:16:100:21 | selection of s | provenance | Src:MaD:1  |
-| test.go:112:17:112:19 | definition of ctx | test.go:114:16:114:18 | ctx | provenance |  |
-| test.go:113:21:113:42 | call to Param | test.go:112:17:112:19 | definition of ctx | provenance | Src:MaD:8 MaD:14 |
+| test.go:99:11:99:15 | &... [postupdate] | test.go:100:16:100:21 | selection of s | provenance | Src:MaD:1  |
+| test.go:113:2:113:4 | ctx [postupdate] | test.go:114:16:114:18 | ctx | provenance |  |
+| test.go:113:21:113:42 | call to Param | test.go:113:2:113:4 | ctx [postupdate] | provenance | Src:MaD:8 MaD:14 |
 | test.go:114:16:114:18 | ctx | test.go:114:16:114:33 | call to Get | provenance | MaD:13 |
 | test.go:114:16:114:33 | call to Get | test.go:114:16:114:42 | type assertion | provenance |  |
 | test.go:124:11:124:32 | call to Param | test.go:125:16:125:20 | param | provenance | Src:MaD:8  |
@@ -93,24 +93,24 @@ nodes
 | test.go:57:2:57:46 | ... := ...[0] | semmle.label | ... := ...[0] |
 | test.go:58:2:58:29 | ... := ...[0] | semmle.label | ... := ...[0] |
 | test.go:58:13:58:22 | fileHeader | semmle.label | fileHeader |
-| test.go:59:2:59:7 | definition of buffer | semmle.label | definition of buffer |
 | test.go:60:2:60:5 | file | semmle.label | file |
+| test.go:60:12:60:17 | buffer [postupdate] | semmle.label | buffer [postupdate] |
 | test.go:61:20:61:25 | buffer | semmle.label | buffer |
 | test.go:66:2:66:31 | ... := ...[0] | semmle.label | ... := ...[0] |
 | test.go:67:16:67:41 | index expression | semmle.label | index expression |
 | test.go:72:2:72:31 | ... := ...[0] | semmle.label | ... := ...[0] |
 | test.go:74:2:74:29 | ... := ...[0] | semmle.label | ... := ...[0] |
 | test.go:74:13:74:22 | fileHeader | semmle.label | fileHeader |
-| test.go:75:2:75:7 | definition of buffer | semmle.label | definition of buffer |
 | test.go:76:2:76:5 | file | semmle.label | file |
+| test.go:76:12:76:17 | buffer [postupdate] | semmle.label | buffer [postupdate] |
 | test.go:77:20:77:25 | buffer | semmle.label | buffer |
 | test.go:82:2:82:32 | ... := ...[0] | semmle.label | ... := ...[0] |
 | test.go:83:16:83:24 | selection of Value | semmle.label | selection of Value |
 | test.go:88:13:88:25 | call to Cookies | semmle.label | call to Cookies |
 | test.go:89:16:89:31 | selection of Value | semmle.label | selection of Value |
-| test.go:99:11:99:15 | &... | semmle.label | &... |
+| test.go:99:11:99:15 | &... [postupdate] | semmle.label | &... [postupdate] |
 | test.go:100:16:100:21 | selection of s | semmle.label | selection of s |
-| test.go:112:17:112:19 | definition of ctx | semmle.label | definition of ctx |
+| test.go:113:2:113:4 | ctx [postupdate] | semmle.label | ctx [postupdate] |
 | test.go:113:21:113:42 | call to Param | semmle.label | call to Param |
 | test.go:114:16:114:18 | ctx | semmle.label | ctx |
 | test.go:114:16:114:33 | call to Get | semmle.label | call to Get |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Echo/TaintedPath.expected b/go/ql/test/library-tests/semmle/go/frameworks/Echo/TaintedPath.expected
index c579c480fb3..6a26aba5d76 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Echo/TaintedPath.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Echo/TaintedPath.expected
@@ -1,16 +1,16 @@
 #select
-| test.go:222:17:222:24 | filepath | test.go:221:15:221:38 | call to QueryParam | test.go:222:17:222:24 | filepath | This path depends on a $@. | test.go:221:15:221:38 | call to QueryParam | user-provided value |
-| test.go:226:23:226:30 | filepath | test.go:225:15:225:38 | call to QueryParam | test.go:226:23:226:30 | filepath | This path depends on a $@. | test.go:225:15:225:38 | call to QueryParam | user-provided value |
+| test.go:225:17:225:24 | filepath | test.go:224:15:224:38 | call to QueryParam | test.go:225:17:225:24 | filepath | This path depends on a $@. | test.go:224:15:224:38 | call to QueryParam | user-provided value |
+| test.go:229:23:229:30 | filepath | test.go:228:15:228:38 | call to QueryParam | test.go:229:23:229:30 | filepath | This path depends on a $@. | test.go:228:15:228:38 | call to QueryParam | user-provided value |
 edges
-| test.go:221:15:221:38 | call to QueryParam | test.go:222:17:222:24 | filepath | provenance | Src:MaD:3 Sink:MaD:2 |
-| test.go:225:15:225:38 | call to QueryParam | test.go:226:23:226:30 | filepath | provenance | Src:MaD:3 Sink:MaD:1 |
+| test.go:224:15:224:38 | call to QueryParam | test.go:225:17:225:24 | filepath | provenance | Src:MaD:3 Sink:MaD:2 |
+| test.go:228:15:228:38 | call to QueryParam | test.go:229:23:229:30 | filepath | provenance | Src:MaD:3 Sink:MaD:1 |
 models
 | 1 | Sink: github.com/labstack/echo; Context; true; Attachment; ; ; Argument[0]; path-injection; manual |
 | 2 | Sink: github.com/labstack/echo; Context; true; File; ; ; Argument[0]; path-injection; manual |
 | 3 | Source: github.com/labstack/echo; Context; true; QueryParam; ; ; ReturnValue[0]; remote; manual |
 nodes
-| test.go:221:15:221:38 | call to QueryParam | semmle.label | call to QueryParam |
-| test.go:222:17:222:24 | filepath | semmle.label | filepath |
-| test.go:225:15:225:38 | call to QueryParam | semmle.label | call to QueryParam |
-| test.go:226:23:226:30 | filepath | semmle.label | filepath |
+| test.go:224:15:224:38 | call to QueryParam | semmle.label | call to QueryParam |
+| test.go:225:17:225:24 | filepath | semmle.label | filepath |
+| test.go:228:15:228:38 | call to QueryParam | semmle.label | call to QueryParam |
+| test.go:229:23:229:30 | filepath | semmle.label | filepath |
 subpaths
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Echo/test.go b/go/ql/test/library-tests/semmle/go/frameworks/Echo/test.go
index 45f92cd19cb..4a9f4e161f6 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Echo/test.go
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Echo/test.go
@@ -176,12 +176,15 @@ func testRedirect(ctx echo.Context) error {
 
 func testLocalRedirects(ctx echo.Context) error {
 	param := ctx.Param("someParam")
+	param2 := param
+	param3 := param
+	// Gratuitous copy because sanitization of uses propagates to subsequent uses
 	// GOOD: local redirects are unproblematic
 	ctx.Redirect(301, "/local"+param)
 	// BAD: this could be a non-local redirect
-	ctx.Redirect(301, "/"+param)
+	ctx.Redirect(301, "/"+param2)
 	// GOOD: localhost redirects are unproblematic
-	ctx.Redirect(301, "//localhost/"+param)
+	ctx.Redirect(301, "//localhost/"+param3)
 	return nil
 }
 
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Email/EmailData.expected b/go/ql/test/library-tests/semmle/go/frameworks/Email/EmailData.expected
index 99b33b4a780..3324ee56033 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Email/EmailData.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Email/EmailData.expected
@@ -1,5 +1,5 @@
 | mail.go:15:73:15:94 | type conversion |
-| mail.go:18:19:18:23 | definition of write |
+| mail.go:20:17:20:21 | write [postupdate] |
 | mail.go:26:49:26:52 | text |
 | mail.go:26:76:26:79 | text |
 | mail.go:27:20:27:23 | text |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Encoding/jsoniter.expected b/go/ql/test/library-tests/semmle/go/frameworks/Encoding/jsoniter.expected
index 0e79c3135b0..5dfd597c10a 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Encoding/jsoniter.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Encoding/jsoniter.expected
@@ -9,28 +9,28 @@ edges
 | jsoniter.go:23:20:23:38 | call to getUntrustedBytes | jsoniter.go:31:21:31:34 | untrustedInput | provenance |  |
 | jsoniter.go:24:21:24:40 | call to getUntrustedString | jsoniter.go:35:27:35:41 | untrustedString | provenance |  |
 | jsoniter.go:24:21:24:40 | call to getUntrustedString | jsoniter.go:39:31:39:45 | untrustedString | provenance |  |
-| jsoniter.go:27:17:27:30 | untrustedInput | jsoniter.go:27:33:27:37 | &... | provenance | MaD:4 |
-| jsoniter.go:27:33:27:37 | &... | jsoniter.go:28:15:28:24 | selection of field | provenance | Sink:MaD:1 |
-| jsoniter.go:31:21:31:34 | untrustedInput | jsoniter.go:31:37:31:42 | &... | provenance | MaD:2 |
-| jsoniter.go:31:37:31:42 | &... | jsoniter.go:32:15:32:25 | selection of field | provenance | Sink:MaD:1 |
-| jsoniter.go:35:27:35:41 | untrustedString | jsoniter.go:35:44:35:49 | &... | provenance | MaD:5 |
-| jsoniter.go:35:44:35:49 | &... | jsoniter.go:36:15:36:25 | selection of field | provenance | Sink:MaD:1 |
-| jsoniter.go:39:31:39:45 | untrustedString | jsoniter.go:39:48:39:53 | &... | provenance | MaD:3 |
-| jsoniter.go:39:48:39:53 | &... | jsoniter.go:40:15:40:25 | selection of field | provenance | Sink:MaD:1 |
+| jsoniter.go:27:17:27:30 | untrustedInput | jsoniter.go:27:33:27:37 | &... [postupdate] | provenance | MaD:4 |
+| jsoniter.go:27:33:27:37 | &... [postupdate] | jsoniter.go:28:15:28:24 | selection of field | provenance | Sink:MaD:1 |
+| jsoniter.go:31:21:31:34 | untrustedInput | jsoniter.go:31:37:31:42 | &... [postupdate] | provenance | MaD:2 |
+| jsoniter.go:31:37:31:42 | &... [postupdate] | jsoniter.go:32:15:32:25 | selection of field | provenance | Sink:MaD:1 |
+| jsoniter.go:35:27:35:41 | untrustedString | jsoniter.go:35:44:35:49 | &... [postupdate] | provenance | MaD:5 |
+| jsoniter.go:35:44:35:49 | &... [postupdate] | jsoniter.go:36:15:36:25 | selection of field | provenance | Sink:MaD:1 |
+| jsoniter.go:39:31:39:45 | untrustedString | jsoniter.go:39:48:39:53 | &... [postupdate] | provenance | MaD:3 |
+| jsoniter.go:39:48:39:53 | &... [postupdate] | jsoniter.go:40:15:40:25 | selection of field | provenance | Sink:MaD:1 |
 nodes
 | jsoniter.go:23:20:23:38 | call to getUntrustedBytes | semmle.label | call to getUntrustedBytes |
 | jsoniter.go:24:21:24:40 | call to getUntrustedString | semmle.label | call to getUntrustedString |
 | jsoniter.go:27:17:27:30 | untrustedInput | semmle.label | untrustedInput |
-| jsoniter.go:27:33:27:37 | &... | semmle.label | &... |
+| jsoniter.go:27:33:27:37 | &... [postupdate] | semmle.label | &... [postupdate] |
 | jsoniter.go:28:15:28:24 | selection of field | semmle.label | selection of field |
 | jsoniter.go:31:21:31:34 | untrustedInput | semmle.label | untrustedInput |
-| jsoniter.go:31:37:31:42 | &... | semmle.label | &... |
+| jsoniter.go:31:37:31:42 | &... [postupdate] | semmle.label | &... [postupdate] |
 | jsoniter.go:32:15:32:25 | selection of field | semmle.label | selection of field |
 | jsoniter.go:35:27:35:41 | untrustedString | semmle.label | untrustedString |
-| jsoniter.go:35:44:35:49 | &... | semmle.label | &... |
+| jsoniter.go:35:44:35:49 | &... [postupdate] | semmle.label | &... [postupdate] |
 | jsoniter.go:36:15:36:25 | selection of field | semmle.label | selection of field |
 | jsoniter.go:39:31:39:45 | untrustedString | semmle.label | untrustedString |
-| jsoniter.go:39:48:39:53 | &... | semmle.label | &... |
+| jsoniter.go:39:48:39:53 | &... [postupdate] | semmle.label | &... [postupdate] |
 | jsoniter.go:40:15:40:25 | selection of field | semmle.label | selection of field |
 subpaths
 invalidModelRow
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/fasthttp.go b/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/fasthttp.go
index c25c9d01058..061f50355d5 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/fasthttp.go
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/fasthttp.go
@@ -169,10 +169,10 @@ func fasthttpServer() {
 		fmt.Println(body1, body2, body3, body4)
 		requestCtx.Request.BodyStream() // $ RemoteFlowSource="call to BodyStream"
 
-		requestCtx.Request.ReadBody(&bufio.Reader{}, 100, 1000)               // $ RemoteFlowSource="&..."
-		requestCtx.Request.ReadLimitBody(&bufio.Reader{}, 100)                // $ RemoteFlowSource="&..."
-		requestCtx.Request.ContinueReadBodyStream(&bufio.Reader{}, 100, true) // $ RemoteFlowSource="&..."
-		requestCtx.Request.ContinueReadBody(&bufio.Reader{}, 100)             // $ RemoteFlowSource="&..."
+		requestCtx.Request.ReadBody(&bufio.Reader{}, 100, 1000)               // $ RemoteFlowSource="&..." RemoteFlowSource="&... [postupdate]"
+		requestCtx.Request.ReadLimitBody(&bufio.Reader{}, 100)                // $ RemoteFlowSource="&..." RemoteFlowSource="&... [postupdate]"
+		requestCtx.Request.ContinueReadBodyStream(&bufio.Reader{}, 100, true) // $ RemoteFlowSource="&..." RemoteFlowSource="&... [postupdate]"
+		requestCtx.Request.ContinueReadBody(&bufio.Reader{}, 100)             // $ RemoteFlowSource="&..." RemoteFlowSource="&... [postupdate]"
 
 		// Response methods
 		// Xss Sinks Related method
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Gin/Gin.expected b/go/ql/test/library-tests/semmle/go/frameworks/Gin/Gin.expected
index 719a6a26147..071bf34cd7e 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Gin/Gin.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Gin/Gin.expected
@@ -31,39 +31,39 @@
 | Gin.go:158:10:158:19 | selection of Params |
 | Gin.go:162:13:162:22 | selection of Params |
 | Gin.go:168:12:168:21 | selection of Params |
-| Gin.go:178:16:178:22 | &... |
-| Gin.go:182:7:182:19 | definition of personPointer |
-| Gin.go:188:15:188:21 | &... |
-| Gin.go:192:7:192:19 | definition of personPointer |
-| Gin.go:198:16:198:22 | &... |
-| Gin.go:202:7:202:19 | definition of personPointer |
-| Gin.go:208:15:208:21 | &... |
-| Gin.go:212:7:212:19 | definition of personPointer |
-| Gin.go:218:17:218:23 | &... |
-| Gin.go:222:7:222:19 | definition of personPointer |
-| Gin.go:228:20:228:26 | &... |
-| Gin.go:232:7:232:19 | definition of personPointer |
-| Gin.go:238:16:238:22 | &... |
-| Gin.go:242:7:242:19 | definition of personPointer |
-| Gin.go:248:12:248:18 | &... |
-| Gin.go:252:7:252:19 | definition of personPointer |
-| Gin.go:258:18:258:24 | &... |
-| Gin.go:262:7:262:19 | definition of personPointer |
-| Gin.go:268:26:268:32 | &... |
-| Gin.go:272:7:272:19 | definition of personPointer |
-| Gin.go:278:22:278:28 | &... |
-| Gin.go:282:7:282:19 | definition of personPointer |
-| Gin.go:288:23:288:29 | &... |
-| Gin.go:292:7:292:19 | definition of personPointer |
-| Gin.go:298:21:298:27 | &... |
-| Gin.go:302:7:302:19 | definition of personPointer |
-| Gin.go:308:22:308:28 | &... |
-| Gin.go:312:7:312:19 | definition of personPointer |
-| Gin.go:318:21:318:27 | &... |
-| Gin.go:322:7:322:19 | definition of personPointer |
-| Gin.go:328:22:328:28 | &... |
-| Gin.go:332:7:332:19 | definition of personPointer |
-| Gin.go:338:18:338:24 | &... |
-| Gin.go:342:7:342:19 | definition of personPointer |
-| Gin.go:348:24:348:30 | &... |
-| Gin.go:352:7:352:19 | definition of personPointer |
+| Gin.go:178:16:178:22 | &... [postupdate] |
+| Gin.go:183:16:183:28 | personPointer [postupdate] |
+| Gin.go:188:15:188:21 | &... [postupdate] |
+| Gin.go:193:15:193:27 | personPointer [postupdate] |
+| Gin.go:198:16:198:22 | &... [postupdate] |
+| Gin.go:203:16:203:28 | personPointer [postupdate] |
+| Gin.go:208:15:208:21 | &... [postupdate] |
+| Gin.go:213:15:213:27 | personPointer [postupdate] |
+| Gin.go:218:17:218:23 | &... [postupdate] |
+| Gin.go:223:17:223:29 | personPointer [postupdate] |
+| Gin.go:228:20:228:26 | &... [postupdate] |
+| Gin.go:233:20:233:32 | personPointer [postupdate] |
+| Gin.go:238:16:238:22 | &... [postupdate] |
+| Gin.go:243:16:243:28 | personPointer [postupdate] |
+| Gin.go:248:12:248:18 | &... [postupdate] |
+| Gin.go:253:12:253:24 | personPointer [postupdate] |
+| Gin.go:258:18:258:24 | &... [postupdate] |
+| Gin.go:263:18:263:30 | personPointer [postupdate] |
+| Gin.go:268:26:268:32 | &... [postupdate] |
+| Gin.go:273:26:273:38 | personPointer [postupdate] |
+| Gin.go:278:22:278:28 | &... [postupdate] |
+| Gin.go:283:22:283:34 | personPointer [postupdate] |
+| Gin.go:288:23:288:29 | &... [postupdate] |
+| Gin.go:293:23:293:35 | personPointer [postupdate] |
+| Gin.go:298:21:298:27 | &... [postupdate] |
+| Gin.go:303:21:303:33 | personPointer [postupdate] |
+| Gin.go:308:22:308:28 | &... [postupdate] |
+| Gin.go:313:22:313:34 | personPointer [postupdate] |
+| Gin.go:318:21:318:27 | &... [postupdate] |
+| Gin.go:323:21:323:33 | personPointer [postupdate] |
+| Gin.go:328:22:328:28 | &... [postupdate] |
+| Gin.go:333:22:333:34 | personPointer [postupdate] |
+| Gin.go:338:18:338:24 | &... [postupdate] |
+| Gin.go:343:18:343:30 | personPointer [postupdate] |
+| Gin.go:348:24:348:30 | &... [postupdate] |
+| Gin.go:353:24:353:36 | personPointer [postupdate] |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/GoMicro/LogInjection.expected b/go/ql/test/library-tests/semmle/go/frameworks/GoMicro/LogInjection.expected
index 8e113c12ef7..703066d6449 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/GoMicro/LogInjection.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/GoMicro/LogInjection.expected
@@ -1,26 +1,8 @@
 edges
-| main.go:18:46:18:48 | definition of req | main.go:18:46:18:48 | definition of req [Return] | provenance |  |
 | main.go:18:46:18:48 | definition of req | main.go:21:28:21:31 | name | provenance |  |
-| main.go:18:46:18:48 | definition of req | main.go:21:28:21:31 | name | provenance |  |
-| main.go:18:46:18:48 | definition of req [Return] | proto/Hello.pb.micro.go:85:53:85:54 | definition of in | provenance |  |
-| proto/Hello.pb.micro.go:85:53:85:54 | definition of in | proto/Hello.pb.micro.go:85:53:85:54 | definition of in [Return] | provenance |  |
-| proto/Hello.pb.micro.go:85:53:85:54 | definition of in | proto/Hello.pb.micro.go:86:37:86:38 | in | provenance |  |
-| proto/Hello.pb.micro.go:85:53:85:54 | definition of in | proto/Hello.pb.micro.go:86:37:86:38 | in | provenance |  |
-| proto/Hello.pb.micro.go:85:53:85:54 | definition of in [Return] | proto/Hello.pb.micro.go:85:53:85:54 | definition of in | provenance |  |
-| proto/Hello.pb.micro.go:86:37:86:38 | in | main.go:18:46:18:48 | definition of req | provenance |  |
-| proto/Hello.pb.micro.go:86:37:86:38 | in | main.go:18:46:18:48 | definition of req | provenance |  |
-| proto/Hello.pb.micro.go:86:37:86:38 | in | proto/Hello.pb.micro.go:85:53:85:54 | definition of in | provenance |  |
-| proto/Hello.pb.micro.go:86:37:86:38 | in | proto/Hello.pb.micro.go:85:53:85:54 | definition of in | provenance |  |
 nodes
 | main.go:18:46:18:48 | definition of req | semmle.label | definition of req |
-| main.go:18:46:18:48 | definition of req | semmle.label | definition of req |
-| main.go:18:46:18:48 | definition of req [Return] | semmle.label | definition of req [Return] |
 | main.go:21:28:21:31 | name | semmle.label | name |
-| proto/Hello.pb.micro.go:85:53:85:54 | definition of in | semmle.label | definition of in |
-| proto/Hello.pb.micro.go:85:53:85:54 | definition of in | semmle.label | definition of in |
-| proto/Hello.pb.micro.go:85:53:85:54 | definition of in [Return] | semmle.label | definition of in [Return] |
-| proto/Hello.pb.micro.go:86:37:86:38 | in | semmle.label | in |
-| proto/Hello.pb.micro.go:86:37:86:38 | in | semmle.label | in |
 subpaths
 #select
 | main.go:21:28:21:31 | name | main.go:18:46:18:48 | definition of req | main.go:21:28:21:31 | name | This log entry depends on a $@. | main.go:18:46:18:48 | definition of req | user-provided value |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Gorestful/gorestful.expected b/go/ql/test/library-tests/semmle/go/frameworks/Gorestful/gorestful.expected
index 4cdacabe873..0af67462f7c 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Gorestful/gorestful.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Gorestful/gorestful.expected
@@ -8,11 +8,11 @@ edges
 | gorestful.go:15:15:15:44 | call to QueryParameters | gorestful.go:15:15:15:47 | index expression | provenance | Src:MaD:4 Sink:MaD:1 |
 | gorestful.go:17:2:17:39 | ... := ...[0] | gorestful.go:18:15:18:17 | val | provenance | Src:MaD:2 Sink:MaD:1 |
 | gorestful.go:21:15:21:38 | call to PathParameters | gorestful.go:21:15:21:45 | index expression | provenance | Src:MaD:3 Sink:MaD:1 |
-| gorestful.go:23:21:23:24 | &... | gorestful.go:24:15:24:21 | selection of cmd | provenance | Src:MaD:5 Sink:MaD:1 |
+| gorestful.go:23:21:23:24 | &... [postupdate] | gorestful.go:24:15:24:21 | selection of cmd | provenance | Src:MaD:5 Sink:MaD:1 |
 | gorestful_v2.go:15:15:15:44 | call to QueryParameters | gorestful_v2.go:15:15:15:47 | index expression | provenance | Src:MaD:4 Sink:MaD:1 |
 | gorestful_v2.go:17:2:17:39 | ... := ...[0] | gorestful_v2.go:18:15:18:17 | val | provenance | Src:MaD:2 Sink:MaD:1 |
 | gorestful_v2.go:21:15:21:38 | call to PathParameters | gorestful_v2.go:21:15:21:45 | index expression | provenance | Src:MaD:3 Sink:MaD:1 |
-| gorestful_v2.go:23:21:23:24 | &... | gorestful_v2.go:24:15:24:21 | selection of cmd | provenance | Src:MaD:5 Sink:MaD:1 |
+| gorestful_v2.go:23:21:23:24 | &... [postupdate] | gorestful_v2.go:24:15:24:21 | selection of cmd | provenance | Src:MaD:5 Sink:MaD:1 |
 nodes
 | gorestful.go:15:15:15:44 | call to QueryParameters | semmle.label | call to QueryParameters |
 | gorestful.go:15:15:15:47 | index expression | semmle.label | index expression |
@@ -23,7 +23,7 @@ nodes
 | gorestful.go:20:15:20:42 | call to PathParameter | semmle.label | call to PathParameter |
 | gorestful.go:21:15:21:38 | call to PathParameters | semmle.label | call to PathParameters |
 | gorestful.go:21:15:21:45 | index expression | semmle.label | index expression |
-| gorestful.go:23:21:23:24 | &... | semmle.label | &... |
+| gorestful.go:23:21:23:24 | &... [postupdate] | semmle.label | &... [postupdate] |
 | gorestful.go:24:15:24:21 | selection of cmd | semmle.label | selection of cmd |
 | gorestful_v2.go:15:15:15:44 | call to QueryParameters | semmle.label | call to QueryParameters |
 | gorestful_v2.go:15:15:15:47 | index expression | semmle.label | index expression |
@@ -34,7 +34,7 @@ nodes
 | gorestful_v2.go:20:15:20:42 | call to PathParameter | semmle.label | call to PathParameter |
 | gorestful_v2.go:21:15:21:38 | call to PathParameters | semmle.label | call to PathParameters |
 | gorestful_v2.go:21:15:21:45 | index expression | semmle.label | index expression |
-| gorestful_v2.go:23:21:23:24 | &... | semmle.label | &... |
+| gorestful_v2.go:23:21:23:24 | &... [postupdate] | semmle.label | &... [postupdate] |
 | gorestful_v2.go:24:15:24:21 | selection of cmd | semmle.label | selection of cmd |
 subpaths
 invalidModelRow
@@ -45,11 +45,11 @@ invalidModelRow
 | gorestful.go:19:15:19:44 | call to HeaderParameter | gorestful.go:19:15:19:44 | call to HeaderParameter | gorestful.go:19:15:19:44 | call to HeaderParameter | This command depends on $@. | gorestful.go:19:15:19:44 | call to HeaderParameter | a user-provided value |
 | gorestful.go:20:15:20:42 | call to PathParameter | gorestful.go:20:15:20:42 | call to PathParameter | gorestful.go:20:15:20:42 | call to PathParameter | This command depends on $@. | gorestful.go:20:15:20:42 | call to PathParameter | a user-provided value |
 | gorestful.go:21:15:21:45 | index expression | gorestful.go:21:15:21:38 | call to PathParameters | gorestful.go:21:15:21:45 | index expression | This command depends on $@. | gorestful.go:21:15:21:38 | call to PathParameters | a user-provided value |
-| gorestful.go:24:15:24:21 | selection of cmd | gorestful.go:23:21:23:24 | &... | gorestful.go:24:15:24:21 | selection of cmd | This command depends on $@. | gorestful.go:23:21:23:24 | &... | a user-provided value |
+| gorestful.go:24:15:24:21 | selection of cmd | gorestful.go:23:21:23:24 | &... [postupdate] | gorestful.go:24:15:24:21 | selection of cmd | This command depends on $@. | gorestful.go:23:21:23:24 | &... [postupdate] | a user-provided value |
 | gorestful_v2.go:15:15:15:47 | index expression | gorestful_v2.go:15:15:15:44 | call to QueryParameters | gorestful_v2.go:15:15:15:47 | index expression | This command depends on $@. | gorestful_v2.go:15:15:15:44 | call to QueryParameters | a user-provided value |
 | gorestful_v2.go:16:15:16:43 | call to QueryParameter | gorestful_v2.go:16:15:16:43 | call to QueryParameter | gorestful_v2.go:16:15:16:43 | call to QueryParameter | This command depends on $@. | gorestful_v2.go:16:15:16:43 | call to QueryParameter | a user-provided value |
 | gorestful_v2.go:18:15:18:17 | val | gorestful_v2.go:17:2:17:39 | ... := ...[0] | gorestful_v2.go:18:15:18:17 | val | This command depends on $@. | gorestful_v2.go:17:2:17:39 | ... := ...[0] | a user-provided value |
 | gorestful_v2.go:19:15:19:44 | call to HeaderParameter | gorestful_v2.go:19:15:19:44 | call to HeaderParameter | gorestful_v2.go:19:15:19:44 | call to HeaderParameter | This command depends on $@. | gorestful_v2.go:19:15:19:44 | call to HeaderParameter | a user-provided value |
 | gorestful_v2.go:20:15:20:42 | call to PathParameter | gorestful_v2.go:20:15:20:42 | call to PathParameter | gorestful_v2.go:20:15:20:42 | call to PathParameter | This command depends on $@. | gorestful_v2.go:20:15:20:42 | call to PathParameter | a user-provided value |
 | gorestful_v2.go:21:15:21:45 | index expression | gorestful_v2.go:21:15:21:38 | call to PathParameters | gorestful_v2.go:21:15:21:45 | index expression | This command depends on $@. | gorestful_v2.go:21:15:21:38 | call to PathParameters | a user-provided value |
-| gorestful_v2.go:24:15:24:21 | selection of cmd | gorestful_v2.go:23:21:23:24 | &... | gorestful_v2.go:24:15:24:21 | selection of cmd | This command depends on $@. | gorestful_v2.go:23:21:23:24 | &... | a user-provided value |
+| gorestful_v2.go:24:15:24:21 | selection of cmd | gorestful_v2.go:23:21:23:24 | &... [postupdate] | gorestful_v2.go:24:15:24:21 | selection of cmd | This command depends on $@. | gorestful_v2.go:23:21:23:24 | &... [postupdate] | a user-provided value |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Revel/EndToEnd.go b/go/ql/test/library-tests/semmle/go/frameworks/Revel/EndToEnd.go
index a21911f3beb..69fc2c52c4a 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Revel/EndToEnd.go
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Revel/EndToEnd.go
@@ -26,19 +26,19 @@ type MyRoute struct {
 // Implement some request handlers on that Controller exhibiting some common problems:
 
 func (c MyRoute) Handler1() revel.Result {
-	// GOOD: the Render function is likely to properly escape the user-controlled parameter.
+	// GOOD: the Render function is likely to properly escape the user-controlled parameter.
 	return c.Render("someviewparam", c.Params.Form.Get("someField"))
 }
 
 func (c MyRoute) Handler2() revel.Result {
-	// BAD: the RenderBinary function copies an `io.Reader` to the user's browser.
+	// BAD: the RenderBinary function copies an `io.Reader` to the user's browser.
 	buf := &bytes.Buffer{}
 	buf.WriteString(c.Params.Form.Get("someField"))
 	return c.RenderBinary(buf, "index.html", revel.Inline, time.Now()) // $ responsebody='buf'
 }
 
 func (c MyRoute) Handler3() revel.Result {
-	// GOOD: the RenderBinary function copies an `io.Reader` to the user's browser, but the filename
+	// GOOD: the RenderBinary function copies an `io.Reader` to the user's browser, but the filename
 	// means it will be given a safe content-type.
 	buf := &bytes.Buffer{}
 	buf.WriteString(c.Params.Form.Get("someField"))
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Revel/OpenRedirect.expected b/go/ql/test/library-tests/semmle/go/frameworks/Revel/OpenRedirect.expected
index 6e20fd5699c..d3f52f4f9c6 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Revel/OpenRedirect.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Revel/OpenRedirect.expected
@@ -1,10 +1,11 @@
 #select
 | EndToEnd.go:94:20:94:49 | call to Get | EndToEnd.go:94:20:94:27 | selection of Params | EndToEnd.go:94:20:94:49 | call to Get | This path to an untrusted URL redirection depends on a $@. | EndToEnd.go:94:20:94:27 | selection of Params | user-provided value |
 edges
-| EndToEnd.go:94:20:94:27 | implicit dereference | EndToEnd.go:94:20:94:27 | selection of Params | provenance | Config |
+| EndToEnd.go:94:20:94:27 | implicit dereference | EndToEnd.go:94:20:94:27 | selection of Params [postupdate] | provenance | Config |
 | EndToEnd.go:94:20:94:27 | implicit dereference | EndToEnd.go:94:20:94:32 | selection of Form | provenance | Config |
 | EndToEnd.go:94:20:94:27 | selection of Params | EndToEnd.go:94:20:94:27 | implicit dereference | provenance | Src:MaD:2 Config |
 | EndToEnd.go:94:20:94:27 | selection of Params | EndToEnd.go:94:20:94:32 | selection of Form | provenance | Src:MaD:2 Config |
+| EndToEnd.go:94:20:94:27 | selection of Params [postupdate] | EndToEnd.go:94:20:94:27 | implicit dereference | provenance | Config |
 | EndToEnd.go:94:20:94:32 | selection of Form | EndToEnd.go:94:20:94:49 | call to Get | provenance | Config Sink:MaD:1 |
 models
 | 1 | Sink: group:revel; Controller; true; Redirect; ; ; Argument[0]; url-redirection; manual |
@@ -12,6 +13,7 @@ models
 nodes
 | EndToEnd.go:94:20:94:27 | implicit dereference | semmle.label | implicit dereference |
 | EndToEnd.go:94:20:94:27 | selection of Params | semmle.label | selection of Params |
+| EndToEnd.go:94:20:94:27 | selection of Params [postupdate] | semmle.label | selection of Params [postupdate] |
 | EndToEnd.go:94:20:94:32 | selection of Form | semmle.label | selection of Form |
 | EndToEnd.go:94:20:94:49 | call to Get | semmle.label | call to Get |
 subpaths
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Revel/ReflectedXss.expected b/go/ql/test/library-tests/semmle/go/frameworks/Revel/ReflectedXss.expected
index 9d45f1e2996..9ea4016a7e4 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Revel/ReflectedXss.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Revel/ReflectedXss.expected
@@ -5,10 +5,10 @@
 | examples/booking/app/init.go:36:44:36:53 | selection of Path | examples/booking/app/init.go:36:44:36:48 | selection of URL | examples/booking/app/init.go:36:44:36:53 | selection of Path | Cross-site scripting vulnerability due to $@. | examples/booking/app/init.go:36:44:36:48 | selection of URL | user-provided value | examples/booking/app/init.go:0:0:0:0 | examples/booking/app/init.go |  |
 | examples/booking/app/init.go:40:49:40:58 | selection of Path | examples/booking/app/init.go:40:49:40:53 | selection of URL | examples/booking/app/init.go:40:49:40:58 | selection of Path | Cross-site scripting vulnerability due to $@. | examples/booking/app/init.go:40:49:40:53 | selection of URL | user-provided value | examples/booking/app/init.go:0:0:0:0 | examples/booking/app/init.go |  |
 edges
-| EndToEnd.go:35:2:35:4 | definition of buf | EndToEnd.go:37:24:37:26 | buf | provenance |  |
+| EndToEnd.go:36:2:36:4 | buf [postupdate] | EndToEnd.go:37:24:37:26 | buf | provenance |  |
 | EndToEnd.go:36:18:36:25 | selection of Params | EndToEnd.go:36:18:36:30 | selection of Form | provenance | Src:MaD:1  |
 | EndToEnd.go:36:18:36:30 | selection of Form | EndToEnd.go:36:18:36:47 | call to Get | provenance | MaD:4 |
-| EndToEnd.go:36:18:36:47 | call to Get | EndToEnd.go:35:2:35:4 | definition of buf | provenance | MaD:3 |
+| EndToEnd.go:36:18:36:47 | call to Get | EndToEnd.go:36:2:36:4 | buf [postupdate] | provenance | MaD:3 |
 | EndToEnd.go:69:22:69:29 | selection of Params | EndToEnd.go:69:22:69:34 | selection of Form | provenance | Src:MaD:1  |
 | EndToEnd.go:69:22:69:34 | selection of Form | EndToEnd.go:69:22:69:51 | call to Get | provenance | MaD:4 |
 | Revel.go:70:22:70:29 | selection of Params | Revel.go:70:22:70:35 | selection of Query | provenance | Src:MaD:1  |
@@ -20,7 +20,7 @@ models
 | 3 | Summary: io; StringWriter; true; WriteString; ; ; Argument[0]; Argument[receiver]; taint; manual |
 | 4 | Summary: net/url; Values; true; Get; ; ; Argument[receiver]; ReturnValue; taint; manual |
 nodes
-| EndToEnd.go:35:2:35:4 | definition of buf | semmle.label | definition of buf |
+| EndToEnd.go:36:2:36:4 | buf [postupdate] | semmle.label | buf [postupdate] |
 | EndToEnd.go:36:18:36:25 | selection of Params | semmle.label | selection of Params |
 | EndToEnd.go:36:18:36:30 | selection of Form | semmle.label | selection of Form |
 | EndToEnd.go:36:18:36:47 | call to Get | semmle.label | call to Get |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/Os.go b/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/Os.go
index b27c5d1f47c..859a3bbd3bd 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/Os.go
+++ b/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/Os.go
@@ -178,6 +178,6 @@ func fsAccesses() {
 	os.ReadDir(path)                     // $ fsaccess=path
 	os.ReadFile(path)                    // $ fsaccess=path
 	os.MkdirTemp(path, part)             // $ fsaccess=path fsaccess=part
-	os.CreateTemp(path, part)            // $ fsaccess=path fsaccess=part
+	os.CreateTemp(path, part)            // $ fsaccess=path
 	os.WriteFile(path, []byte{}, 0600)   // $ fsaccess=path
 }
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/TaintSteps/TaintStep.expected b/go/ql/test/library-tests/semmle/go/frameworks/TaintSteps/TaintStep.expected
index b7c6f703cf5..cfbbc771f77 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/TaintSteps/TaintStep.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/TaintSteps/TaintStep.expected
@@ -8,64 +8,76 @@ invalidModelRow
 | crypto.go:11:18:11:57 | call to Open | crypto.go:11:2:11:57 | ... := ...[1] |
 | crypto.go:11:42:11:51 | ciphertext | crypto.go:11:2:11:57 | ... := ...[0] |
 | io.go:14:31:14:43 | "some string" | io.go:14:13:14:44 | call to NewReader |
-| io.go:16:3:16:3 | definition of w | io.go:16:23:16:27 | &... |
-| io.go:16:3:16:3 | definition of w | io.go:16:30:16:34 | &... |
-| io.go:16:23:16:27 | &... | io.go:15:7:15:10 | definition of buf1 |
+| io.go:16:23:16:27 | &... | io.go:16:24:16:27 | buf1 [postupdate] |
+| io.go:16:23:16:27 | &... [postupdate] | io.go:16:24:16:27 | buf1 [postupdate] |
 | io.go:16:24:16:27 | buf1 | io.go:16:23:16:27 | &... |
-| io.go:16:30:16:34 | &... | io.go:15:13:15:16 | definition of buf2 |
+| io.go:16:24:16:27 | buf1 [postupdate] | io.go:16:23:16:27 | &... |
+| io.go:16:30:16:34 | &... | io.go:16:31:16:34 | buf2 [postupdate] |
+| io.go:16:30:16:34 | &... [postupdate] | io.go:16:31:16:34 | buf2 [postupdate] |
 | io.go:16:31:16:34 | buf2 | io.go:16:30:16:34 | &... |
-| io.go:18:14:18:19 | reader | io.go:16:3:16:3 | definition of w |
+| io.go:16:31:16:34 | buf2 [postupdate] | io.go:16:30:16:34 | &... |
+| io.go:18:11:18:11 | w [postupdate] | io.go:16:23:16:27 | &... [postupdate] |
+| io.go:18:11:18:11 | w [postupdate] | io.go:16:30:16:34 | &... [postupdate] |
+| io.go:18:14:18:19 | reader | io.go:18:11:18:11 | w [postupdate] |
 | io.go:22:31:22:43 | "some string" | io.go:22:13:22:44 | call to NewReader |
-| io.go:25:19:25:23 | &... | io.go:23:7:23:10 | definition of buf1 |
+| io.go:25:19:25:23 | &... | io.go:25:20:25:23 | buf1 [postupdate] |
+| io.go:25:19:25:23 | &... [postupdate] | io.go:25:20:25:23 | buf1 [postupdate] |
 | io.go:25:20:25:23 | buf1 | io.go:25:19:25:23 | &... |
-| io.go:27:21:27:26 | reader | io.go:25:3:25:4 | definition of w2 |
+| io.go:25:20:25:23 | buf1 [postupdate] | io.go:25:19:25:23 | &... |
+| io.go:27:21:27:26 | reader | io.go:27:17:27:18 | w2 [postupdate] |
 | io.go:31:31:31:43 | "some string" | io.go:31:13:31:44 | call to NewReader |
-| io.go:33:19:33:23 | &... | io.go:32:7:32:10 | definition of buf1 |
+| io.go:33:19:33:23 | &... | io.go:33:20:33:23 | buf1 [postupdate] |
+| io.go:33:19:33:23 | &... [postupdate] | io.go:33:20:33:23 | buf1 [postupdate] |
 | io.go:33:20:33:23 | buf1 | io.go:33:19:33:23 | &... |
-| io.go:35:16:35:21 | reader | io.go:33:3:33:4 | definition of w2 |
-| io.go:39:6:39:6 | definition of w | io.go:39:3:39:19 | ... := ...[0] |
+| io.go:33:20:33:23 | buf1 [postupdate] | io.go:33:19:33:23 | &... |
+| io.go:35:16:35:21 | reader | io.go:35:12:35:13 | w2 [postupdate] |
 | io.go:39:11:39:19 | call to Pipe | io.go:39:3:39:19 | ... := ...[0] |
 | io.go:39:11:39:19 | call to Pipe | io.go:39:3:39:19 | ... := ...[1] |
-| io.go:40:17:40:31 | "some string\\n" | io.go:39:6:39:6 | definition of w |
-| io.go:43:16:43:16 | r | io.go:42:3:42:5 | definition of buf |
+| io.go:40:14:40:14 | w [postupdate] | io.go:39:3:39:19 | ... := ...[0] |
+| io.go:40:17:40:31 | "some string\\n" | io.go:40:14:40:14 | w [postupdate] |
+| io.go:43:16:43:16 | r | io.go:43:3:43:5 | buf [postupdate] |
 | io.go:44:13:44:15 | buf | io.go:44:13:44:24 | call to String |
 | io.go:48:31:48:43 | "some string" | io.go:48:13:48:44 | call to NewReader |
-| io.go:50:18:50:23 | reader | io.go:49:3:49:5 | definition of buf |
+| io.go:50:18:50:23 | reader | io.go:50:26:50:28 | buf [postupdate] |
 | io.go:54:31:54:43 | "some string" | io.go:54:13:54:44 | call to NewReader |
-| io.go:56:15:56:20 | reader | io.go:55:3:55:5 | definition of buf |
-| io.go:61:18:61:21 | &... | io.go:60:7:60:9 | definition of buf |
+| io.go:56:15:56:20 | reader | io.go:56:23:56:25 | buf [postupdate] |
+| io.go:61:18:61:21 | &... | io.go:61:19:61:21 | buf [postupdate] |
+| io.go:61:18:61:21 | &... [postupdate] | io.go:61:19:61:21 | buf [postupdate] |
 | io.go:61:19:61:21 | buf | io.go:61:18:61:21 | &... |
-| io.go:62:21:62:26 | "test" | io.go:61:3:61:3 | definition of w |
+| io.go:61:19:61:21 | buf [postupdate] | io.go:61:18:61:21 | &... |
+| io.go:62:21:62:26 | "test" | io.go:62:18:62:18 | w [postupdate] |
 | io.go:65:31:65:43 | "some string" | io.go:65:13:65:44 | call to NewReader |
-| io.go:67:3:67:8 | reader | io.go:66:3:66:5 | definition of buf |
+| io.go:67:3:67:8 | reader | io.go:67:15:67:17 | buf [postupdate] |
 | io.go:70:31:70:43 | "some string" | io.go:70:13:70:44 | call to NewReader |
-| io.go:72:3:72:8 | reader | io.go:71:3:71:5 | definition of buf |
+| io.go:72:3:72:8 | reader | io.go:72:17:72:19 | buf [postupdate] |
 | io.go:76:31:76:43 | "some string" | io.go:76:13:76:44 | call to NewReader |
 | io.go:77:24:77:29 | reader | io.go:77:9:77:33 | call to LimitReader |
-| io.go:78:22:78:23 | lr | io.go:78:11:78:19 | selection of Stdout |
+| io.go:78:22:78:23 | lr | io.go:78:11:78:19 | selection of Stdout [postupdate] |
 | io.go:82:27:82:36 | "reader1 " | io.go:82:9:82:37 | call to NewReader |
 | io.go:83:27:83:36 | "reader2 " | io.go:83:9:83:37 | call to NewReader |
 | io.go:84:27:84:35 | "reader3" | io.go:84:9:84:36 | call to NewReader |
 | io.go:85:23:85:24 | r1 | io.go:85:8:85:33 | call to MultiReader |
 | io.go:85:27:85:28 | r2 | io.go:85:8:85:33 | call to MultiReader |
 | io.go:85:31:85:32 | r3 | io.go:85:8:85:33 | call to MultiReader |
-| io.go:86:22:86:22 | r | io.go:86:11:86:19 | selection of Stdout |
+| io.go:86:22:86:22 | r | io.go:86:11:86:19 | selection of Stdout [postupdate] |
 | io.go:89:26:89:38 | "some string" | io.go:89:8:89:39 | call to NewReader |
 | io.go:91:23:91:23 | r | io.go:91:10:91:30 | call to TeeReader |
-| io.go:91:23:91:23 | r | io.go:91:26:91:29 | &... |
-| io.go:91:26:91:29 | &... | io.go:90:7:90:9 | definition of buf |
+| io.go:91:23:91:23 | r | io.go:91:26:91:29 | &... [postupdate] |
+| io.go:91:26:91:29 | &... | io.go:91:27:91:29 | buf [postupdate] |
+| io.go:91:26:91:29 | &... [postupdate] | io.go:91:27:91:29 | buf [postupdate] |
 | io.go:91:27:91:29 | buf | io.go:91:26:91:29 | &... |
-| io.go:93:22:93:24 | tee | io.go:93:11:93:19 | selection of Stdout |
+| io.go:91:27:91:29 | buf [postupdate] | io.go:91:26:91:29 | &... |
+| io.go:93:22:93:24 | tee | io.go:93:11:93:19 | selection of Stdout [postupdate] |
 | io.go:96:26:96:38 | "some string" | io.go:96:8:96:39 | call to NewReader |
 | io.go:97:28:97:28 | r | io.go:97:8:97:36 | call to NewSectionReader |
-| io.go:98:22:98:22 | s | io.go:98:11:98:19 | selection of Stdout |
+| io.go:98:22:98:22 | s | io.go:98:11:98:19 | selection of Stdout [postupdate] |
 | io.go:101:26:101:38 | "some string" | io.go:101:8:101:39 | call to NewReader |
-| io.go:102:3:102:3 | r | io.go:102:13:102:21 | selection of Stdout |
+| io.go:102:3:102:3 | r | io.go:102:13:102:21 | selection of Stdout [postupdate] |
 | io.go:108:30:108:42 | "some string" | io.go:108:12:108:43 | call to NewReader |
 | io.go:109:12:109:33 | call to ReadAll | io.go:109:2:109:33 | ... := ...[0] |
 | io.go:109:12:109:33 | call to ReadAll | io.go:109:2:109:33 | ... := ...[1] |
 | io.go:109:27:109:32 | reader | io.go:109:2:109:33 | ... := ...[0] |
-| io.go:110:18:110:20 | buf | io.go:110:2:110:10 | selection of Stdout |
+| io.go:110:18:110:20 | buf | io.go:110:2:110:10 | selection of Stdout [postupdate] |
 | main.go:11:12:11:26 | call to Marshal | main.go:11:2:11:26 | ... := ...[0] |
 | main.go:11:12:11:26 | call to Marshal | main.go:11:2:11:26 | ... := ...[1] |
 | main.go:11:25:11:25 | v | main.go:11:2:11:26 | ... := ...[0] |
@@ -84,11 +96,13 @@ invalidModelRow
 | main.go:23:25:23:31 | decoded | main.go:23:9:23:48 | slice literal |
 | main.go:23:34:23:36 | err | main.go:23:9:23:48 | slice literal |
 | main.go:23:39:23:47 | reEncoded | main.go:23:9:23:48 | slice literal |
-| main.go:28:2:28:4 | implicit dereference | main.go:26:15:26:17 | definition of req |
+| main.go:28:2:28:4 | implicit dereference | main.go:28:2:28:4 | req [postupdate] |
 | main.go:28:2:28:4 | implicit dereference | main.go:28:2:28:9 | selection of Body |
 | main.go:28:2:28:4 | req | main.go:28:2:28:4 | implicit dereference |
-| main.go:28:2:28:9 | selection of Body | main.go:27:2:27:2 | definition of b |
-| main.go:34:2:34:4 | implicit dereference | main.go:32:16:32:18 | definition of req |
+| main.go:28:2:28:4 | req [postupdate] | main.go:28:2:28:4 | implicit dereference |
+| main.go:28:2:28:9 | selection of Body | main.go:28:16:28:16 | b [postupdate] |
+| main.go:34:2:34:4 | implicit dereference | main.go:34:2:34:4 | req [postupdate] |
 | main.go:34:2:34:4 | implicit dereference | main.go:34:2:34:9 | selection of Body |
 | main.go:34:2:34:4 | req | main.go:34:2:34:4 | implicit dereference |
-| main.go:34:2:34:9 | selection of Body | main.go:33:2:33:2 | definition of b |
+| main.go:34:2:34:4 | req [postupdate] | main.go:34:2:34:4 | implicit dereference |
+| main.go:34:2:34:9 | selection of Body | main.go:34:16:34:16 | b [postupdate] |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Twirp/RequestForgery.expected b/go/ql/test/library-tests/semmle/go/frameworks/Twirp/RequestForgery.expected
index 6bda68257ef..7b1fa1a3121 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Twirp/RequestForgery.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Twirp/RequestForgery.expected
@@ -3,42 +3,28 @@
 | server/main.go:30:38:30:48 | selection of Text | server/main.go:19:56:19:61 | definition of params | server/main.go:30:38:30:48 | selection of Text | The $@ of this request depends on a $@. | server/main.go:30:38:30:48 | selection of Text | URL | server/main.go:19:56:19:61 | definition of params | user-provided value |
 edges
 | client/main.go:16:35:16:78 | &... | server/main.go:19:56:19:61 | definition of params | provenance |  |
-| rpc/notes/service.twirp.go:473:6:473:13 | definition of typedReq | rpc/notes/service.twirp.go:477:44:477:51 | typedReq | provenance |  |
-| rpc/notes/service.twirp.go:477:44:477:51 | typedReq | server/main.go:19:56:19:61 | definition of params | provenance |  |
-| rpc/notes/service.twirp.go:493:2:496:2 | capture variable reqContent | rpc/notes/service.twirp.go:495:35:495:44 | reqContent | provenance |  |
-| rpc/notes/service.twirp.go:495:35:495:44 | reqContent | server/main.go:19:56:19:61 | definition of params | provenance |  |
+| client/main.go:16:35:16:78 | &... [postupdate] | client/main.go:16:35:16:78 | &... | provenance |  |
 | rpc/notes/service.twirp.go:538:2:538:33 | ... := ...[0] | rpc/notes/service.twirp.go:544:27:544:29 | buf | provenance |  |
 | rpc/notes/service.twirp.go:538:25:538:32 | selection of Body | rpc/notes/service.twirp.go:538:2:538:33 | ... := ...[0] | provenance | Src:MaD:1 MaD:3 |
-| rpc/notes/service.twirp.go:543:2:543:11 | definition of reqContent | rpc/notes/service.twirp.go:574:2:577:2 | capture variable reqContent | provenance |  |
-| rpc/notes/service.twirp.go:544:27:544:29 | buf | rpc/notes/service.twirp.go:543:2:543:11 | definition of reqContent | provenance | MaD:2 |
-| rpc/notes/service.twirp.go:554:6:554:13 | definition of typedReq | rpc/notes/service.twirp.go:558:44:558:51 | typedReq | provenance |  |
-| rpc/notes/service.twirp.go:558:44:558:51 | typedReq | server/main.go:19:56:19:61 | definition of params | provenance |  |
+| rpc/notes/service.twirp.go:544:27:544:29 | buf | rpc/notes/service.twirp.go:544:32:544:41 | reqContent [postupdate] | provenance | MaD:2 |
+| rpc/notes/service.twirp.go:544:32:544:41 | reqContent [postupdate] | rpc/notes/service.twirp.go:574:2:577:2 | capture variable reqContent | provenance |  |
 | rpc/notes/service.twirp.go:574:2:577:2 | capture variable reqContent | rpc/notes/service.twirp.go:576:35:576:44 | reqContent | provenance |  |
 | rpc/notes/service.twirp.go:576:35:576:44 | reqContent | server/main.go:19:56:19:61 | definition of params | provenance |  |
 | server/main.go:19:56:19:61 | definition of params | server/main.go:19:56:19:61 | definition of params [Return] | provenance |  |
 | server/main.go:19:56:19:61 | definition of params | server/main.go:30:38:30:48 | selection of Text | provenance |  |
 | server/main.go:19:56:19:61 | definition of params | server/main.go:30:38:30:48 | selection of Text | provenance |  |
-| server/main.go:19:56:19:61 | definition of params [Return] | client/main.go:16:35:16:78 | &... | provenance |  |
-| server/main.go:19:56:19:61 | definition of params [Return] | rpc/notes/service.twirp.go:473:6:473:13 | definition of typedReq | provenance |  |
-| server/main.go:19:56:19:61 | definition of params [Return] | rpc/notes/service.twirp.go:493:2:496:2 | capture variable reqContent | provenance |  |
-| server/main.go:19:56:19:61 | definition of params [Return] | rpc/notes/service.twirp.go:554:6:554:13 | definition of typedReq | provenance |  |
-| server/main.go:19:56:19:61 | definition of params [Return] | rpc/notes/service.twirp.go:574:2:577:2 | capture variable reqContent | provenance |  |
+| server/main.go:19:56:19:61 | definition of params [Return] | client/main.go:16:35:16:78 | &... [postupdate] | provenance |  |
 models
 | 1 | Source: net/http; Request; true; Body; ; ; ; remote; manual |
 | 2 | Summary: google.golang.org/protobuf/proto; ; false; Unmarshal; ; ; Argument[0]; Argument[1]; taint; manual |
 | 3 | Summary: io; ; false; ReadAll; ; ; Argument[0]; ReturnValue[0]; taint; manual |
 nodes
 | client/main.go:16:35:16:78 | &... | semmle.label | &... |
-| rpc/notes/service.twirp.go:473:6:473:13 | definition of typedReq | semmle.label | definition of typedReq |
-| rpc/notes/service.twirp.go:477:44:477:51 | typedReq | semmle.label | typedReq |
-| rpc/notes/service.twirp.go:493:2:496:2 | capture variable reqContent | semmle.label | capture variable reqContent |
-| rpc/notes/service.twirp.go:495:35:495:44 | reqContent | semmle.label | reqContent |
+| client/main.go:16:35:16:78 | &... [postupdate] | semmle.label | &... [postupdate] |
 | rpc/notes/service.twirp.go:538:2:538:33 | ... := ...[0] | semmle.label | ... := ...[0] |
 | rpc/notes/service.twirp.go:538:25:538:32 | selection of Body | semmle.label | selection of Body |
-| rpc/notes/service.twirp.go:543:2:543:11 | definition of reqContent | semmle.label | definition of reqContent |
 | rpc/notes/service.twirp.go:544:27:544:29 | buf | semmle.label | buf |
-| rpc/notes/service.twirp.go:554:6:554:13 | definition of typedReq | semmle.label | definition of typedReq |
-| rpc/notes/service.twirp.go:558:44:558:51 | typedReq | semmle.label | typedReq |
+| rpc/notes/service.twirp.go:544:32:544:41 | reqContent [postupdate] | semmle.label | reqContent [postupdate] |
 | rpc/notes/service.twirp.go:574:2:577:2 | capture variable reqContent | semmle.label | capture variable reqContent |
 | rpc/notes/service.twirp.go:576:35:576:44 | reqContent | semmle.label | reqContent |
 | server/main.go:19:56:19:61 | definition of params | semmle.label | definition of params |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/WebSocket/Read.expected b/go/ql/test/library-tests/semmle/go/frameworks/WebSocket/Read.expected
index 4bfef26418a..4c4bd0743d2 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/WebSocket/Read.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/WebSocket/Read.expected
@@ -1,8 +1,8 @@
-| WebSocketReadWrite.go:31:7:31:10 | definition of xnet |
-| WebSocketReadWrite.go:35:3:35:7 | definition of xnet2 |
+| WebSocketReadWrite.go:32:11:32:14 | xnet [postupdate] |
+| WebSocketReadWrite.go:36:21:36:25 | xnet2 [postupdate] |
 | WebSocketReadWrite.go:41:3:41:40 | ... := ...[1] |
 | WebSocketReadWrite.go:44:3:44:48 | ... := ...[1] |
-| WebSocketReadWrite.go:51:7:51:16 | definition of gorillaMsg |
-| WebSocketReadWrite.go:55:3:55:10 | definition of gorilla2 |
+| WebSocketReadWrite.go:52:26:52:35 | gorillaMsg [postupdate] |
+| WebSocketReadWrite.go:56:17:56:24 | gorilla2 [postupdate] |
 | WebSocketReadWrite.go:61:3:61:38 | ... := ...[1] |
 | WebSocketReadWrite.go:67:3:67:36 | ... := ...[0] |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/WebSocket/RemoteFlowSources.expected b/go/ql/test/library-tests/semmle/go/frameworks/WebSocket/RemoteFlowSources.expected
index 0124cf73218..e0c1603ff2e 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/WebSocket/RemoteFlowSources.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/WebSocket/RemoteFlowSources.expected
@@ -1,9 +1,9 @@
 | WebSocketReadWrite.go:27:9:27:16 | selection of Header |
-| WebSocketReadWrite.go:31:7:31:10 | definition of xnet |
-| WebSocketReadWrite.go:35:3:35:7 | definition of xnet2 |
+| WebSocketReadWrite.go:32:11:32:14 | xnet [postupdate] |
+| WebSocketReadWrite.go:36:21:36:25 | xnet2 [postupdate] |
 | WebSocketReadWrite.go:41:3:41:40 | ... := ...[1] |
 | WebSocketReadWrite.go:44:3:44:48 | ... := ...[1] |
-| WebSocketReadWrite.go:51:7:51:16 | definition of gorillaMsg |
-| WebSocketReadWrite.go:55:3:55:10 | definition of gorilla2 |
+| WebSocketReadWrite.go:52:26:52:35 | gorillaMsg [postupdate] |
+| WebSocketReadWrite.go:56:17:56:24 | gorilla2 [postupdate] |
 | WebSocketReadWrite.go:61:3:61:38 | ... := ...[1] |
 | WebSocketReadWrite.go:67:3:67:36 | ... := ...[0] |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/XNetHtml/ReflectedXss.expected b/go/ql/test/library-tests/semmle/go/frameworks/XNetHtml/ReflectedXss.expected
index b94733d5054..17c74de5555 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/XNetHtml/ReflectedXss.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/XNetHtml/ReflectedXss.expected
@@ -44,28 +44,20 @@ edges
 | test.go:39:23:39:77 | call to NewTokenizerFragment | test.go:40:15:40:31 | tokenizerFragment | provenance |  |
 | test.go:39:49:39:60 | selection of Body | test.go:39:23:39:77 | call to NewTokenizerFragment | provenance | Src:MaD:1 MaD:4 |
 | test.go:40:15:40:31 | tokenizerFragment | test.go:40:15:40:42 | call to Buffered | provenance | MaD:12 |
-| test.go:42:6:42:14 | definition of cleanNode | test.go:45:22:45:31 | &... | provenance |  |
-| test.go:42:6:42:14 | definition of cleanNode | test.go:45:22:45:31 | &... | provenance |  |
-| test.go:42:6:42:14 | definition of cleanNode | test.go:45:23:45:31 | cleanNode | provenance |  |
 | test.go:43:2:43:43 | ... := ...[0] | test.go:44:24:44:34 | taintedNode | provenance |  |
 | test.go:43:31:43:42 | selection of Body | test.go:43:2:43:43 | ... := ...[0] | provenance | Src:MaD:1 MaD:5 |
-| test.go:44:24:44:34 | taintedNode | test.go:42:6:42:14 | definition of cleanNode | provenance | MaD:10 |
-| test.go:45:22:45:31 | &... | test.go:45:23:45:31 | cleanNode | provenance |  |
+| test.go:44:2:44:10 | cleanNode [postupdate] | test.go:45:22:45:31 | &... | provenance |  |
+| test.go:44:2:44:10 | cleanNode [postupdate] | test.go:45:23:45:31 | cleanNode | provenance |  |
+| test.go:44:24:44:34 | taintedNode | test.go:44:2:44:10 | cleanNode [postupdate] | provenance | MaD:10 |
 | test.go:45:22:45:31 | &... [pointer] | test.go:45:22:45:31 | &... | provenance |  |
-| test.go:45:22:45:31 | &... [pointer] | test.go:45:22:45:31 | &... | provenance |  |
-| test.go:45:22:45:31 | &... [pointer] | test.go:45:23:45:31 | cleanNode | provenance |  |
 | test.go:45:23:45:31 | cleanNode | test.go:45:22:45:31 | &... | provenance |  |
 | test.go:45:23:45:31 | cleanNode | test.go:45:22:45:31 | &... [pointer] | provenance |  |
-| test.go:47:6:47:15 | definition of cleanNode2 | test.go:50:22:50:32 | &... | provenance |  |
-| test.go:47:6:47:15 | definition of cleanNode2 | test.go:50:22:50:32 | &... | provenance |  |
-| test.go:47:6:47:15 | definition of cleanNode2 | test.go:50:23:50:32 | cleanNode2 | provenance |  |
 | test.go:48:2:48:44 | ... := ...[0] | test.go:49:26:49:37 | taintedNode2 | provenance |  |
 | test.go:48:32:48:43 | selection of Body | test.go:48:2:48:44 | ... := ...[0] | provenance | Src:MaD:1 MaD:5 |
-| test.go:49:26:49:37 | taintedNode2 | test.go:47:6:47:15 | definition of cleanNode2 | provenance | MaD:11 |
-| test.go:50:22:50:32 | &... | test.go:50:23:50:32 | cleanNode2 | provenance |  |
+| test.go:49:2:49:11 | cleanNode2 [postupdate] | test.go:50:22:50:32 | &... | provenance |  |
+| test.go:49:2:49:11 | cleanNode2 [postupdate] | test.go:50:23:50:32 | cleanNode2 | provenance |  |
+| test.go:49:26:49:37 | taintedNode2 | test.go:49:2:49:11 | cleanNode2 [postupdate] | provenance | MaD:11 |
 | test.go:50:22:50:32 | &... [pointer] | test.go:50:22:50:32 | &... | provenance |  |
-| test.go:50:22:50:32 | &... [pointer] | test.go:50:22:50:32 | &... | provenance |  |
-| test.go:50:22:50:32 | &... [pointer] | test.go:50:23:50:32 | cleanNode2 | provenance |  |
 | test.go:50:23:50:32 | cleanNode2 | test.go:50:22:50:32 | &... | provenance |  |
 | test.go:50:23:50:32 | cleanNode2 | test.go:50:22:50:32 | &... [pointer] | provenance |  |
 models
@@ -125,20 +117,18 @@ nodes
 | test.go:39:49:39:60 | selection of Body | semmle.label | selection of Body |
 | test.go:40:15:40:31 | tokenizerFragment | semmle.label | tokenizerFragment |
 | test.go:40:15:40:42 | call to Buffered | semmle.label | call to Buffered |
-| test.go:42:6:42:14 | definition of cleanNode | semmle.label | definition of cleanNode |
 | test.go:43:2:43:43 | ... := ...[0] | semmle.label | ... := ...[0] |
 | test.go:43:31:43:42 | selection of Body | semmle.label | selection of Body |
+| test.go:44:2:44:10 | cleanNode [postupdate] | semmle.label | cleanNode [postupdate] |
 | test.go:44:24:44:34 | taintedNode | semmle.label | taintedNode |
 | test.go:45:22:45:31 | &... | semmle.label | &... |
-| test.go:45:22:45:31 | &... | semmle.label | &... |
 | test.go:45:22:45:31 | &... [pointer] | semmle.label | &... [pointer] |
 | test.go:45:23:45:31 | cleanNode | semmle.label | cleanNode |
-| test.go:47:6:47:15 | definition of cleanNode2 | semmle.label | definition of cleanNode2 |
 | test.go:48:2:48:44 | ... := ...[0] | semmle.label | ... := ...[0] |
 | test.go:48:32:48:43 | selection of Body | semmle.label | selection of Body |
+| test.go:49:2:49:11 | cleanNode2 [postupdate] | semmle.label | cleanNode2 [postupdate] |
 | test.go:49:26:49:37 | taintedNode2 | semmle.label | taintedNode2 |
 | test.go:50:22:50:32 | &... | semmle.label | &... |
-| test.go:50:22:50:32 | &... | semmle.label | &... |
 | test.go:50:22:50:32 | &... [pointer] | semmle.label | &... [pointer] |
 | test.go:50:23:50:32 | cleanNode2 | semmle.label | cleanNode2 |
 subpaths
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Yaml/yaml.go b/go/ql/test/library-tests/semmle/go/frameworks/Yaml/yaml.go
index 9861acf33e6..fb8f7ea4bfa 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Yaml/yaml.go
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Yaml/yaml.go
@@ -13,30 +13,30 @@ func main() {
 	var inb []byte
 
 	out, _ = yaml1.Marshal(in) // $ marshaler="yaml: in -> ... = ...[0]" ttfnmodelstep="in -> ... = ...[0]"
-	yaml1.Unmarshal(inb, out)  // $ unmarshaler="yaml: inb -> definition of out" ttfnmodelstep="inb -> definition of out"
+	yaml1.Unmarshal(inb, out)  // $ unmarshaler="yaml: inb -> out [postupdate]" ttfnmodelstep="inb -> out [postupdate]"
 
 	out, _ = yaml2.Marshal(in)      // $ marshaler="yaml: in -> ... = ...[0]" ttfnmodelstep="in -> ... = ...[0]"
-	yaml2.Unmarshal(inb, out)       // $ unmarshaler="yaml: inb -> definition of out" ttfnmodelstep="inb -> definition of out"
-	yaml2.UnmarshalStrict(inb, out) // $ unmarshaler="yaml: inb -> definition of out" ttfnmodelstep="inb -> definition of out"
+	yaml2.Unmarshal(inb, out)       // $ unmarshaler="yaml: inb -> out [postupdate]" ttfnmodelstep="inb -> out [postupdate]"
+	yaml2.UnmarshalStrict(inb, out) // $ unmarshaler="yaml: inb -> out [postupdate]" ttfnmodelstep="inb -> out [postupdate]"
 
 	var r io.Reader
 	d := yaml2.NewDecoder(r) // $ ttfnmodelstep="r -> call to NewDecoder"
-	d.Decode(out)            // $ ttfnmodelstep="d -> definition of out"
+	d.Decode(out)            // $ ttfnmodelstep="d -> out [postupdate]"
 
 	var w io.Writer
-	e := yaml2.NewEncoder(w) // $ ttfnmodelstep="definition of e -> definition of w"
-	e.Encode(in)             // $ ttfnmodelstep="in -> definition of e"
+	e := yaml2.NewEncoder(w) // $ ttfnmodelstep="definition of e -> w [postupdate]"
+	e.Encode(in)             // $ ttfnmodelstep="in -> e [postupdate]"
 
 	out, _ = yaml3.Marshal(in) // $ marshaler="yaml: in -> ... = ...[0]" ttfnmodelstep="in -> ... = ...[0]"
-	yaml3.Unmarshal(inb, out)  // $ unmarshaler="yaml: inb -> definition of out" ttfnmodelstep="inb -> definition of out"
+	yaml3.Unmarshal(inb, out)  // $ unmarshaler="yaml: inb -> out [postupdate]" ttfnmodelstep="inb -> out [postupdate]"
 
 	d1 := yaml3.NewDecoder(r) // $ ttfnmodelstep="r -> call to NewDecoder"
-	d1.Decode(out)            // $ ttfnmodelstep="d1 -> definition of out"
+	d1.Decode(out)            // $ ttfnmodelstep="d1 -> out [postupdate]"
 
-	e1 := yaml3.NewEncoder(w) // $ ttfnmodelstep="definition of e1 -> definition of w"
-	e1.Encode(in)             // $ ttfnmodelstep="in -> definition of e1"
+	e1 := yaml3.NewEncoder(w) // $ ttfnmodelstep="definition of e1 -> w [postupdate]"
+	e1.Encode(in)             // $ ttfnmodelstep="in -> e1 [postupdate]"
 
 	var n1 yaml3.Node
-	n1.Decode(out) // $ ttfnmodelstep="n1 -> definition of out"
-	n1.Encode(in)  // $ ttfnmodelstep="in -> definition of n1"
+	n1.Decode(out) // $ ttfnmodelstep="n1 -> out [postupdate]"
+	n1.Encode(in)  // $ ttfnmodelstep="in -> n1 [postupdate]"
 }
diff --git a/go/ql/test/library-tests/semmle/go/security/SafeUrlFlow/SafeUrlFlow.expected b/go/ql/test/library-tests/semmle/go/security/SafeUrlFlow/SafeUrlFlow.expected
new file mode 100644
index 00000000000..c2f82841d83
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/security/SafeUrlFlow/SafeUrlFlow.expected
@@ -0,0 +1,122 @@
+#select
+| SafeUrlFlow.go:11:24:11:50 | ...+... | SafeUrlFlow.go:10:14:10:21 | selection of Host | SafeUrlFlow.go:11:24:11:50 | ...+... | A safe URL flows here from $@. | SafeUrlFlow.go:10:14:10:21 | selection of Host | here |
+| SafeUrlFlow.go:14:29:14:44 | call to String | SafeUrlFlow.go:13:13:13:19 | selection of URL | SafeUrlFlow.go:14:29:14:44 | call to String | A safe URL flows here from $@. | SafeUrlFlow.go:13:13:13:19 | selection of URL | here |
+| SafeUrlFlow.go:18:11:18:28 | call to String | SafeUrlFlow.go:10:14:10:21 | selection of Host | SafeUrlFlow.go:18:11:18:28 | call to String | A safe URL flows here from $@. | SafeUrlFlow.go:10:14:10:21 | selection of Host | here |
+| SafeUrlFlow.go:45:24:45:61 | ...+... | SafeUrlFlow.go:37:13:37:19 | selection of URL | SafeUrlFlow.go:45:24:45:61 | ...+... | A safe URL flows here from $@. | SafeUrlFlow.go:37:13:37:19 | selection of URL | here |
+| SafeUrlFlow.go:46:29:46:55 | ...+... | SafeUrlFlow.go:37:13:37:19 | selection of URL | SafeUrlFlow.go:46:29:46:55 | ...+... | A safe URL flows here from $@. | SafeUrlFlow.go:37:13:37:19 | selection of URL | here |
+| SafeUrlFlow.go:47:11:47:42 | ...+... | SafeUrlFlow.go:37:13:37:19 | selection of URL | SafeUrlFlow.go:47:11:47:42 | ...+... | A safe URL flows here from $@. | SafeUrlFlow.go:37:13:37:19 | selection of URL | here |
+| SafeUrlFlow.go:57:11:57:26 | call to String | SafeUrlFlow.go:54:13:54:19 | selection of URL | SafeUrlFlow.go:57:11:57:26 | call to String | A safe URL flows here from $@. | SafeUrlFlow.go:54:13:54:19 | selection of URL | here |
+| SafeUrlFlow.go:58:12:58:27 | call to String | SafeUrlFlow.go:54:13:54:19 | selection of URL | SafeUrlFlow.go:58:12:58:27 | call to String | A safe URL flows here from $@. | SafeUrlFlow.go:54:13:54:19 | selection of URL | here |
+| SafeUrlFlow.go:59:16:59:31 | call to String | SafeUrlFlow.go:54:13:54:19 | selection of URL | SafeUrlFlow.go:59:16:59:31 | call to String | A safe URL flows here from $@. | SafeUrlFlow.go:54:13:54:19 | selection of URL | here |
+| SafeUrlFlow.go:60:12:60:27 | call to String | SafeUrlFlow.go:54:13:54:19 | selection of URL | SafeUrlFlow.go:60:12:60:27 | call to String | A safe URL flows here from $@. | SafeUrlFlow.go:54:13:54:19 | selection of URL | here |
+| SafeUrlFlow.go:64:13:64:28 | call to String | SafeUrlFlow.go:54:13:54:19 | selection of URL | SafeUrlFlow.go:64:13:64:28 | call to String | A safe URL flows here from $@. | SafeUrlFlow.go:54:13:54:19 | selection of URL | here |
+| SafeUrlFlow.go:65:14:65:29 | call to String | SafeUrlFlow.go:54:13:54:19 | selection of URL | SafeUrlFlow.go:65:14:65:29 | call to String | A safe URL flows here from $@. | SafeUrlFlow.go:54:13:54:19 | selection of URL | here |
+| SafeUrlFlow.go:66:18:66:33 | call to String | SafeUrlFlow.go:54:13:54:19 | selection of URL | SafeUrlFlow.go:66:18:66:33 | call to String | A safe URL flows here from $@. | SafeUrlFlow.go:54:13:54:19 | selection of URL | here |
+| SafeUrlFlow.go:67:14:67:29 | call to String | SafeUrlFlow.go:54:13:54:19 | selection of URL | SafeUrlFlow.go:67:14:67:29 | call to String | A safe URL flows here from $@. | SafeUrlFlow.go:54:13:54:19 | selection of URL | here |
+| SafeUrlFlow.go:70:39:70:54 | call to String | SafeUrlFlow.go:54:13:54:19 | selection of URL | SafeUrlFlow.go:70:39:70:54 | call to String | A safe URL flows here from $@. | SafeUrlFlow.go:54:13:54:19 | selection of URL | here |
+| SafeUrlFlow.go:74:70:74:85 | call to String | SafeUrlFlow.go:54:13:54:19 | selection of URL | SafeUrlFlow.go:74:70:74:85 | call to String | A safe URL flows here from $@. | SafeUrlFlow.go:54:13:54:19 | selection of URL | here |
+| SafeUrlFlow.go:78:40:78:55 | call to String | SafeUrlFlow.go:54:13:54:19 | selection of URL | SafeUrlFlow.go:78:40:78:55 | call to String | A safe URL flows here from $@. | SafeUrlFlow.go:54:13:54:19 | selection of URL | here |
+| SafeUrlFlow.go:89:24:89:41 | call to String | SafeUrlFlow.go:84:14:84:21 | selection of Host | SafeUrlFlow.go:89:24:89:41 | call to String | A safe URL flows here from $@. | SafeUrlFlow.go:84:14:84:21 | selection of Host | here |
+| SafeUrlFlow.go:105:11:105:23 | reconstructed | SafeUrlFlow.go:96:13:96:19 | selection of URL | SafeUrlFlow.go:105:11:105:23 | reconstructed | A safe URL flows here from $@. | SafeUrlFlow.go:96:13:96:19 | selection of URL | here |
+| SafeUrlFlow.go:108:24:108:50 | ...+... | SafeUrlFlow.go:96:13:96:19 | selection of URL | SafeUrlFlow.go:108:24:108:50 | ...+... | A safe URL flows here from $@. | SafeUrlFlow.go:96:13:96:19 | selection of URL | here |
+| SafeUrlFlow.go:109:29:109:58 | ...+... | SafeUrlFlow.go:96:13:96:19 | selection of URL | SafeUrlFlow.go:109:29:109:58 | ...+... | A safe URL flows here from $@. | SafeUrlFlow.go:96:13:96:19 | selection of URL | here |
+| SafeUrlFlow.go:110:12:110:42 | ...+... | SafeUrlFlow.go:96:13:96:19 | selection of URL | SafeUrlFlow.go:110:12:110:42 | ...+... | A safe URL flows here from $@. | SafeUrlFlow.go:96:13:96:19 | selection of URL | here |
+| SafeUrlFlow.go:111:12:111:25 | safeOpaquePart | SafeUrlFlow.go:96:13:96:19 | selection of URL | SafeUrlFlow.go:111:12:111:25 | safeOpaquePart | A safe URL flows here from $@. | SafeUrlFlow.go:96:13:96:19 | selection of URL | here |
+edges
+| SafeUrlFlow.go:10:14:10:21 | selection of Host | SafeUrlFlow.go:11:24:11:50 | ...+... | provenance | Sink:MaD:1 |
+| SafeUrlFlow.go:10:14:10:21 | selection of Host | SafeUrlFlow.go:17:19:17:26 | safeHost | provenance |  |
+| SafeUrlFlow.go:13:13:13:19 | selection of URL | SafeUrlFlow.go:14:29:14:35 | safeURL | provenance | Src:MaD:2  |
+| SafeUrlFlow.go:14:29:14:35 | safeURL | SafeUrlFlow.go:14:29:14:44 | call to String | provenance | MaD:3 |
+| SafeUrlFlow.go:17:2:17:10 | targetURL [postupdate] | SafeUrlFlow.go:18:11:18:19 | targetURL | provenance |  |
+| SafeUrlFlow.go:17:19:17:26 | safeHost | SafeUrlFlow.go:17:2:17:10 | targetURL [postupdate] | provenance | Config |
+| SafeUrlFlow.go:18:11:18:19 | targetURL | SafeUrlFlow.go:18:11:18:28 | call to String | provenance | MaD:3 |
+| SafeUrlFlow.go:37:13:37:19 | selection of URL | SafeUrlFlow.go:45:24:45:61 | ...+... | provenance | Src:MaD:2 Sink:MaD:1 |
+| SafeUrlFlow.go:37:13:37:19 | selection of URL | SafeUrlFlow.go:46:29:46:55 | ...+... | provenance | Src:MaD:2  |
+| SafeUrlFlow.go:37:13:37:19 | selection of URL | SafeUrlFlow.go:47:11:47:42 | ...+... | provenance | Src:MaD:2  |
+| SafeUrlFlow.go:54:13:54:19 | selection of URL | SafeUrlFlow.go:57:11:57:17 | safeURL | provenance | Src:MaD:2  |
+| SafeUrlFlow.go:54:13:54:19 | selection of URL | SafeUrlFlow.go:58:12:58:18 | safeURL | provenance | Src:MaD:2  |
+| SafeUrlFlow.go:54:13:54:19 | selection of URL | SafeUrlFlow.go:59:16:59:22 | safeURL | provenance | Src:MaD:2  |
+| SafeUrlFlow.go:54:13:54:19 | selection of URL | SafeUrlFlow.go:60:12:60:18 | safeURL | provenance | Src:MaD:2  |
+| SafeUrlFlow.go:54:13:54:19 | selection of URL | SafeUrlFlow.go:64:13:64:19 | safeURL | provenance | Src:MaD:2  |
+| SafeUrlFlow.go:54:13:54:19 | selection of URL | SafeUrlFlow.go:65:14:65:20 | safeURL | provenance | Src:MaD:2  |
+| SafeUrlFlow.go:54:13:54:19 | selection of URL | SafeUrlFlow.go:66:18:66:24 | safeURL | provenance | Src:MaD:2  |
+| SafeUrlFlow.go:54:13:54:19 | selection of URL | SafeUrlFlow.go:67:14:67:20 | safeURL | provenance | Src:MaD:2  |
+| SafeUrlFlow.go:54:13:54:19 | selection of URL | SafeUrlFlow.go:70:39:70:45 | safeURL | provenance | Src:MaD:2  |
+| SafeUrlFlow.go:54:13:54:19 | selection of URL | SafeUrlFlow.go:74:70:74:76 | safeURL | provenance | Src:MaD:2  |
+| SafeUrlFlow.go:54:13:54:19 | selection of URL | SafeUrlFlow.go:78:40:78:46 | safeURL | provenance | Src:MaD:2  |
+| SafeUrlFlow.go:57:11:57:17 | safeURL | SafeUrlFlow.go:57:11:57:26 | call to String | provenance | MaD:3 |
+| SafeUrlFlow.go:58:12:58:18 | safeURL | SafeUrlFlow.go:58:12:58:27 | call to String | provenance | MaD:3 |
+| SafeUrlFlow.go:59:16:59:22 | safeURL | SafeUrlFlow.go:59:16:59:31 | call to String | provenance | MaD:3 |
+| SafeUrlFlow.go:60:12:60:18 | safeURL | SafeUrlFlow.go:60:12:60:27 | call to String | provenance | MaD:3 |
+| SafeUrlFlow.go:64:13:64:19 | safeURL | SafeUrlFlow.go:64:13:64:28 | call to String | provenance | MaD:3 |
+| SafeUrlFlow.go:65:14:65:20 | safeURL | SafeUrlFlow.go:65:14:65:29 | call to String | provenance | MaD:3 |
+| SafeUrlFlow.go:66:18:66:24 | safeURL | SafeUrlFlow.go:66:18:66:33 | call to String | provenance | MaD:3 |
+| SafeUrlFlow.go:67:14:67:20 | safeURL | SafeUrlFlow.go:67:14:67:29 | call to String | provenance | MaD:3 |
+| SafeUrlFlow.go:70:39:70:45 | safeURL | SafeUrlFlow.go:70:39:70:54 | call to String | provenance | MaD:3 |
+| SafeUrlFlow.go:74:70:74:76 | safeURL | SafeUrlFlow.go:74:70:74:85 | call to String | provenance | MaD:3 |
+| SafeUrlFlow.go:78:40:78:46 | safeURL | SafeUrlFlow.go:78:40:78:55 | call to String | provenance | MaD:3 |
+| SafeUrlFlow.go:84:14:84:21 | selection of Host | SafeUrlFlow.go:87:19:87:26 | safeHost | provenance |  |
+| SafeUrlFlow.go:87:2:87:10 | implicit dereference [postupdate] | SafeUrlFlow.go:87:2:87:10 | targetURL [postupdate] | provenance |  |
+| SafeUrlFlow.go:87:2:87:10 | targetURL [postupdate] | SafeUrlFlow.go:89:24:89:32 | targetURL | provenance |  |
+| SafeUrlFlow.go:87:19:87:26 | safeHost | SafeUrlFlow.go:87:2:87:10 | implicit dereference [postupdate] | provenance | Config |
+| SafeUrlFlow.go:87:19:87:26 | safeHost | SafeUrlFlow.go:87:2:87:10 | targetURL [postupdate] | provenance | Config |
+| SafeUrlFlow.go:89:24:89:32 | targetURL | SafeUrlFlow.go:89:24:89:41 | call to String | provenance | MaD:3 Sink:MaD:1 |
+| SafeUrlFlow.go:96:13:96:19 | selection of URL | SafeUrlFlow.go:105:11:105:23 | reconstructed | provenance | Src:MaD:2  |
+| SafeUrlFlow.go:96:13:96:19 | selection of URL | SafeUrlFlow.go:108:24:108:50 | ...+... | provenance | Src:MaD:2 Sink:MaD:1 |
+| SafeUrlFlow.go:96:13:96:19 | selection of URL | SafeUrlFlow.go:109:29:109:58 | ...+... | provenance | Src:MaD:2  |
+| SafeUrlFlow.go:96:13:96:19 | selection of URL | SafeUrlFlow.go:110:12:110:42 | ...+... | provenance | Src:MaD:2  |
+| SafeUrlFlow.go:96:13:96:19 | selection of URL | SafeUrlFlow.go:111:12:111:25 | safeOpaquePart | provenance | Src:MaD:2  |
+models
+| 1 | Sink: net/http; ; false; Redirect; ; ; Argument[2]; url-redirection[0]; manual |
+| 2 | Source: net/http; Request; true; URL; ; ; ; remote; manual |
+| 3 | Summary: fmt; Stringer; true; String; ; ; Argument[receiver]; ReturnValue; taint; manual |
+nodes
+| SafeUrlFlow.go:10:14:10:21 | selection of Host | semmle.label | selection of Host |
+| SafeUrlFlow.go:11:24:11:50 | ...+... | semmle.label | ...+... |
+| SafeUrlFlow.go:13:13:13:19 | selection of URL | semmle.label | selection of URL |
+| SafeUrlFlow.go:14:29:14:35 | safeURL | semmle.label | safeURL |
+| SafeUrlFlow.go:14:29:14:44 | call to String | semmle.label | call to String |
+| SafeUrlFlow.go:17:2:17:10 | targetURL [postupdate] | semmle.label | targetURL [postupdate] |
+| SafeUrlFlow.go:17:19:17:26 | safeHost | semmle.label | safeHost |
+| SafeUrlFlow.go:18:11:18:19 | targetURL | semmle.label | targetURL |
+| SafeUrlFlow.go:18:11:18:28 | call to String | semmle.label | call to String |
+| SafeUrlFlow.go:37:13:37:19 | selection of URL | semmle.label | selection of URL |
+| SafeUrlFlow.go:45:24:45:61 | ...+... | semmle.label | ...+... |
+| SafeUrlFlow.go:46:29:46:55 | ...+... | semmle.label | ...+... |
+| SafeUrlFlow.go:47:11:47:42 | ...+... | semmle.label | ...+... |
+| SafeUrlFlow.go:54:13:54:19 | selection of URL | semmle.label | selection of URL |
+| SafeUrlFlow.go:57:11:57:17 | safeURL | semmle.label | safeURL |
+| SafeUrlFlow.go:57:11:57:26 | call to String | semmle.label | call to String |
+| SafeUrlFlow.go:58:12:58:18 | safeURL | semmle.label | safeURL |
+| SafeUrlFlow.go:58:12:58:27 | call to String | semmle.label | call to String |
+| SafeUrlFlow.go:59:16:59:22 | safeURL | semmle.label | safeURL |
+| SafeUrlFlow.go:59:16:59:31 | call to String | semmle.label | call to String |
+| SafeUrlFlow.go:60:12:60:18 | safeURL | semmle.label | safeURL |
+| SafeUrlFlow.go:60:12:60:27 | call to String | semmle.label | call to String |
+| SafeUrlFlow.go:64:13:64:19 | safeURL | semmle.label | safeURL |
+| SafeUrlFlow.go:64:13:64:28 | call to String | semmle.label | call to String |
+| SafeUrlFlow.go:65:14:65:20 | safeURL | semmle.label | safeURL |
+| SafeUrlFlow.go:65:14:65:29 | call to String | semmle.label | call to String |
+| SafeUrlFlow.go:66:18:66:24 | safeURL | semmle.label | safeURL |
+| SafeUrlFlow.go:66:18:66:33 | call to String | semmle.label | call to String |
+| SafeUrlFlow.go:67:14:67:20 | safeURL | semmle.label | safeURL |
+| SafeUrlFlow.go:67:14:67:29 | call to String | semmle.label | call to String |
+| SafeUrlFlow.go:70:39:70:45 | safeURL | semmle.label | safeURL |
+| SafeUrlFlow.go:70:39:70:54 | call to String | semmle.label | call to String |
+| SafeUrlFlow.go:74:70:74:76 | safeURL | semmle.label | safeURL |
+| SafeUrlFlow.go:74:70:74:85 | call to String | semmle.label | call to String |
+| SafeUrlFlow.go:78:40:78:46 | safeURL | semmle.label | safeURL |
+| SafeUrlFlow.go:78:40:78:55 | call to String | semmle.label | call to String |
+| SafeUrlFlow.go:84:14:84:21 | selection of Host | semmle.label | selection of Host |
+| SafeUrlFlow.go:87:2:87:10 | implicit dereference [postupdate] | semmle.label | implicit dereference [postupdate] |
+| SafeUrlFlow.go:87:2:87:10 | targetURL [postupdate] | semmle.label | targetURL [postupdate] |
+| SafeUrlFlow.go:87:19:87:26 | safeHost | semmle.label | safeHost |
+| SafeUrlFlow.go:89:24:89:32 | targetURL | semmle.label | targetURL |
+| SafeUrlFlow.go:89:24:89:41 | call to String | semmle.label | call to String |
+| SafeUrlFlow.go:96:13:96:19 | selection of URL | semmle.label | selection of URL |
+| SafeUrlFlow.go:105:11:105:23 | reconstructed | semmle.label | reconstructed |
+| SafeUrlFlow.go:108:24:108:50 | ...+... | semmle.label | ...+... |
+| SafeUrlFlow.go:109:29:109:58 | ...+... | semmle.label | ...+... |
+| SafeUrlFlow.go:110:12:110:42 | ...+... | semmle.label | ...+... |
+| SafeUrlFlow.go:111:12:111:25 | safeOpaquePart | semmle.label | safeOpaquePart |
+subpaths
diff --git a/go/ql/test/library-tests/semmle/go/security/SafeUrlFlow/SafeUrlFlow.go b/go/ql/test/library-tests/semmle/go/security/SafeUrlFlow/SafeUrlFlow.go
new file mode 100644
index 00000000000..4718b973844
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/security/SafeUrlFlow/SafeUrlFlow.go
@@ -0,0 +1,122 @@
+package main
+
+import (
+	"context"
+	"net/http"
+	"net/url"
+)
+
+func testStdlibSources(w http.ResponseWriter, req *http.Request) {
+	safeHost := req.Host                                                 // $ Source
+	http.Redirect(w, req, "https://"+safeHost+"/path", http.StatusFound) // $ Alert
+
+	safeURL := req.URL                           // $ Source
+	w.Header().Set("Location", safeURL.String()) // $ Alert
+
+	targetURL := url.URL{}
+	targetURL.Host = safeHost    // URL is safe if Host is safe
+	http.Get(targetURL.String()) // $ Alert
+}
+
+func testBarrierEdge1(w http.ResponseWriter, req *http.Request) {
+	safeURL := req.URL
+
+	query := safeURL.Query()                                       // query is not guaranteed to be safe
+	http.Redirect(w, req, query.Get("redirect"), http.StatusFound) // not guaranteed to be safe
+}
+
+func testBarrierEdge2(w http.ResponseWriter, req *http.Request) {
+	safeURL := req.URL
+
+	urlString := safeURL.String()
+	sliced := urlString[0:10]          // a substring of a safe URL is not guaranteed to be safe
+	w.Header().Set("Location", sliced) // not guaranteed to be safe
+}
+
+func testFieldReads(w http.ResponseWriter, req *http.Request) {
+	safeURL := req.URL // $ Source
+
+	safeScheme := safeURL.Scheme // the scheme of a safe URL is safe
+	safeHost := safeURL.Host     // the host of a safe URL is safe
+	safePath := safeURL.Path     // the path of a safe URL is safe
+	fragment := safeURL.Fragment // the fragment of a safe URL is not guaranteed to be safe
+	user := safeURL.User         // the user of a safe URL is not guaranteed to be safe
+
+	http.Redirect(w, req, "https://"+safeScheme+"://example.com", http.StatusFound) // $ Alert
+	w.Header().Set("Location", "https://"+safeHost+"/path")                         // $ Alert
+	http.Get("https://example.com" + safePath)                                      // $ Alert
+
+	http.Get(fragment)      // not guaranteed to be safe
+	http.Get(user.String()) // not guaranteed to be safe
+}
+
+func testRequestForgerySinks(req *http.Request) {
+	safeURL := req.URL // $ Source
+
+	// Standard library HTTP functions (request-forgery sinks)
+	http.Get(safeURL.String())                           // $ Alert
+	http.Post(safeURL.String(), "application/json", nil) // $ Alert
+	http.PostForm(safeURL.String(), nil)                 // $ Alert
+	http.Head(safeURL.String())                          // $ Alert
+
+	// HTTP Client methods (request-forgery sinks)
+	client := &http.Client{}
+	client.Get(safeURL.String())                           // $ Alert
+	client.Post(safeURL.String(), "application/json", nil) // $ Alert
+	client.PostForm(safeURL.String(), nil)                 // $ Alert
+	client.Head(safeURL.String())                          // $ Alert
+
+	// NewRequest + Client.Do (request-forgery sinks)
+	request, _ := http.NewRequest("GET", safeURL.String(), nil) // $ Alert
+	client.Do(request)
+
+	// NewRequestWithContext + Client.Do (request-forgery sinks)
+	reqWithCtx, _ := http.NewRequestWithContext(context.TODO(), "POST", safeURL.String(), nil) // $ Alert
+	client.Do(reqWithCtx)
+
+	// RoundTrip method (request-forgery sink)
+	request2, _ := http.NewRequest("GET", safeURL.String(), nil) // $ Alert
+	transport := &http.Transport{}
+	transport.RoundTrip(request2)
+}
+
+func testHostFieldAssignmentFlow(w http.ResponseWriter, req *http.Request) {
+	safeHost := req.Host // $ Source
+
+	targetURL, _ := url.Parse("http://example.com/data")
+	targetURL.Host = safeHost // URL is safe if Host is safe
+
+	http.Redirect(w, req, targetURL.String(), http.StatusFound) // $ Alert
+
+	targetURL.Host = "something.else.com" // targetURL is not guaranteed to be safe now that Host is overwritten
+	http.Get(targetURL.String())
+}
+
+func testFieldAccess(w http.ResponseWriter, req *http.Request) {
+	safeURL := req.URL // $ Source
+
+	safeHost := safeURL.Host         // the host of a safe URL is safe
+	safePath := safeURL.Path         // the path of a safe URL is safe
+	safeScheme := safeURL.Scheme     // the scheme of a safe URL is safe
+	safeOpaquePart := safeURL.Opaque // the opaque part of a safe URL is safe
+
+	// Reconstruct URL - still guaranteed to be safe
+	reconstructed := safeScheme + "://" + safeHost + safePath
+	http.Get(reconstructed) // $ Alert
+
+	// Test individual fields
+	http.Redirect(w, req, "https://"+safeHost+"/path", http.StatusFound) // $ Alert
+	w.Header().Set("Location", "https://example.com"+safePath)           // $ Alert
+	http.Post(safeScheme+"://example.com/api", "application/json", nil)  // $ Alert
+	http.Post(safeOpaquePart, "application/json", nil)                   // $ Alert
+
+	user := safeURL.User         // the user of a safe URL is not guaranteed to be safe
+	query := safeURL.RawQuery    // the query of a safe URL is not guaranteed to be safe
+	fragment := safeURL.Fragment // the fragment of a safe URL is not guaranteed to be safe
+
+	if user != nil {
+		http.Redirect(w, req, user.String(), http.StatusFound) // not guaranteed to be safe
+	}
+	w.Header().Set("Location", "https://example.com/?"+query) // not guaranteed to be safe
+	http.Get("https://example.com/#" + fragment)              // not guaranteed to be safe
+}
diff --git a/go/ql/test/library-tests/semmle/go/security/SafeUrlFlow/SafeUrlFlow.ql b/go/ql/test/library-tests/semmle/go/security/SafeUrlFlow/SafeUrlFlow.ql
new file mode 100644
index 00000000000..badc69f386c
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/security/SafeUrlFlow/SafeUrlFlow.ql
@@ -0,0 +1,15 @@
+/**
+ * @id go/test-safe-url-flow
+ * @kind path-problem
+ * @problem.severity recommendation
+ */
+
+import go
+import semmle.go.security.RequestForgeryCustomizations
+import semmle.go.security.OpenUrlRedirectCustomizations
+import semmle.go.security.SafeUrlFlow
+import SafeUrlFlow::Flow::PathGraph
+
+from SafeUrlFlow::Flow::PathNode source, SafeUrlFlow::Flow::PathNode sink
+where SafeUrlFlow::Flow::flowPath(source, sink)
+select sink.getNode(), source, sink, "A safe URL flows here from $@.", source.getNode(), "here"
diff --git a/go/ql/test/library-tests/semmle/go/security/SafeUrlFlow/SafeUrlFlow.qlref b/go/ql/test/library-tests/semmle/go/security/SafeUrlFlow/SafeUrlFlow.qlref
new file mode 100644
index 00000000000..db1b80a6317
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/security/SafeUrlFlow/SafeUrlFlow.qlref
@@ -0,0 +1,4 @@
+query: SafeUrlFlow.ql
+postprocess:
+  - utils/test/PrettyPrintModels.ql
+  - utils/test/InlineExpectationsTestQuery.ql
diff --git a/go/ql/test/query-tests/InconsistentCode/MistypedExponentiation/main.go b/go/ql/test/query-tests/InconsistentCode/MistypedExponentiation/main.go
index 2449ccdac62..b8b4be44847 100644
--- a/go/ql/test/query-tests/InconsistentCode/MistypedExponentiation/main.go
+++ b/go/ql/test/query-tests/InconsistentCode/MistypedExponentiation/main.go
@@ -22,6 +22,13 @@ func main() {
 
 	mask := (((1 << 10) - 1) ^ 7) // OK
 
+	const (
+		c1 = 0x1234
+		c2 = 0x5678
+	)
+
+	fmt.Println(c1 ^ c2) // OK
+
 	// This is not ok, but isn't detected because the multiplication binds tighter
 	// than the xor operator and so the query doesn't see a constant on the left
 	// hand side of ^.
diff --git a/go/ql/test/query-tests/Security/CWE-022/TaintedPath.expected b/go/ql/test/query-tests/Security/CWE-022/TaintedPath.expected
index 839d35f663c..c95fa5e7af6 100644
--- a/go/ql/test/query-tests/Security/CWE-022/TaintedPath.expected
+++ b/go/ql/test/query-tests/Security/CWE-022/TaintedPath.expected
@@ -1,25 +1,25 @@
 #select
-| TaintedPath.go:17:29:17:40 | tainted_path | TaintedPath.go:14:18:14:22 | selection of URL | TaintedPath.go:17:29:17:40 | tainted_path | This path depends on a $@. | TaintedPath.go:14:18:14:22 | selection of URL | user-provided value |
-| TaintedPath.go:21:28:21:69 | call to Join | TaintedPath.go:14:18:14:22 | selection of URL | TaintedPath.go:21:28:21:69 | call to Join | This path depends on a $@. | TaintedPath.go:14:18:14:22 | selection of URL | user-provided value |
-| TaintedPath.go:68:28:68:57 | call to Clean | TaintedPath.go:14:18:14:22 | selection of URL | TaintedPath.go:68:28:68:57 | call to Clean | This path depends on a $@. | TaintedPath.go:14:18:14:22 | selection of URL | user-provided value |
+| TaintedPath.go:18:29:18:40 | tainted_path | TaintedPath.go:15:18:15:22 | selection of URL | TaintedPath.go:18:29:18:40 | tainted_path | This path depends on a $@. | TaintedPath.go:15:18:15:22 | selection of URL | user-provided value |
+| TaintedPath.go:22:28:22:69 | call to Join | TaintedPath.go:15:18:15:22 | selection of URL | TaintedPath.go:22:28:22:69 | call to Join | This path depends on a $@. | TaintedPath.go:15:18:15:22 | selection of URL | user-provided value |
+| TaintedPath.go:74:28:74:57 | call to Clean | TaintedPath.go:15:18:15:22 | selection of URL | TaintedPath.go:74:28:74:57 | call to Clean | This path depends on a $@. | TaintedPath.go:15:18:15:22 | selection of URL | user-provided value |
 edges
-| TaintedPath.go:14:18:14:22 | selection of URL | TaintedPath.go:14:18:14:30 | call to Query | provenance | Src:MaD:2 MaD:3 |
-| TaintedPath.go:14:18:14:30 | call to Query | TaintedPath.go:17:29:17:40 | tainted_path | provenance | Sink:MaD:1 |
-| TaintedPath.go:14:18:14:30 | call to Query | TaintedPath.go:21:57:21:68 | tainted_path | provenance |  |
-| TaintedPath.go:14:18:14:30 | call to Query | TaintedPath.go:68:39:68:56 | ...+... | provenance |  |
-| TaintedPath.go:21:57:21:68 | tainted_path | TaintedPath.go:21:28:21:69 | call to Join | provenance | FunctionModel Sink:MaD:1 |
-| TaintedPath.go:68:39:68:56 | ...+... | TaintedPath.go:68:28:68:57 | call to Clean | provenance | MaD:4 Sink:MaD:1 |
+| TaintedPath.go:15:18:15:22 | selection of URL | TaintedPath.go:15:18:15:30 | call to Query | provenance | Src:MaD:2 MaD:3 |
+| TaintedPath.go:15:18:15:30 | call to Query | TaintedPath.go:18:29:18:40 | tainted_path | provenance | Sink:MaD:1 |
+| TaintedPath.go:15:18:15:30 | call to Query | TaintedPath.go:22:57:22:68 | tainted_path | provenance |  |
+| TaintedPath.go:22:57:22:68 | tainted_path | TaintedPath.go:22:28:22:69 | call to Join | provenance | FunctionModel Sink:MaD:1 |
+| TaintedPath.go:22:57:22:68 | tainted_path | TaintedPath.go:74:39:74:56 | ...+... | provenance |  |
+| TaintedPath.go:74:39:74:56 | ...+... | TaintedPath.go:74:28:74:57 | call to Clean | provenance | MaD:4 Sink:MaD:1 |
 models
 | 1 | Sink: io/ioutil; ; false; ReadFile; ; ; Argument[0]; path-injection; manual |
 | 2 | Source: net/http; Request; true; URL; ; ; ; remote; manual |
 | 3 | Summary: net/url; URL; true; Query; ; ; Argument[receiver]; ReturnValue; taint; manual |
 | 4 | Summary: path; ; false; Clean; ; ; Argument[0]; ReturnValue; taint; manual |
 nodes
-| TaintedPath.go:14:18:14:22 | selection of URL | semmle.label | selection of URL |
-| TaintedPath.go:14:18:14:30 | call to Query | semmle.label | call to Query |
-| TaintedPath.go:17:29:17:40 | tainted_path | semmle.label | tainted_path |
-| TaintedPath.go:21:28:21:69 | call to Join | semmle.label | call to Join |
-| TaintedPath.go:21:57:21:68 | tainted_path | semmle.label | tainted_path |
-| TaintedPath.go:68:28:68:57 | call to Clean | semmle.label | call to Clean |
-| TaintedPath.go:68:39:68:56 | ...+... | semmle.label | ...+... |
+| TaintedPath.go:15:18:15:22 | selection of URL | semmle.label | selection of URL |
+| TaintedPath.go:15:18:15:30 | call to Query | semmle.label | call to Query |
+| TaintedPath.go:18:29:18:40 | tainted_path | semmle.label | tainted_path |
+| TaintedPath.go:22:28:22:69 | call to Join | semmle.label | call to Join |
+| TaintedPath.go:22:57:22:68 | tainted_path | semmle.label | tainted_path |
+| TaintedPath.go:74:28:74:57 | call to Clean | semmle.label | call to Clean |
+| TaintedPath.go:74:39:74:56 | ...+... | semmle.label | ...+... |
 subpaths
diff --git a/go/ql/test/query-tests/Security/CWE-022/TaintedPath.go b/go/ql/test/query-tests/Security/CWE-022/TaintedPath.go
index 82c0592a516..65da5caecd2 100644
--- a/go/ql/test/query-tests/Security/CWE-022/TaintedPath.go
+++ b/go/ql/test/query-tests/Security/CWE-022/TaintedPath.go
@@ -4,6 +4,7 @@ import (
 	"io/ioutil"
 	"mime/multipart"
 	"net/http"
+	"os"
 	"path"
 	"path/filepath"
 	"regexp"
@@ -63,6 +64,11 @@ func handler(w http.ResponseWriter, r *http.Request) {
 	data, _ = ioutil.ReadFile(filepath.Clean("/" + tainted_path))
 	w.Write(data)
 
+	// GOOD: Sanitized by filepath.Clean with a prepended os.PathSeparator forcing interpretation
+	// as an absolute path, so that Clean will throw away any leading `..` components.
+	data, _ = ioutil.ReadFile(filepath.Clean(string(os.PathSeparator) + "hardcoded" + tainted_path))
+	w.Write(data)
+
 	// BAD: Sanitized by path.Clean with a prepended '/' forcing interpretation
 	// as an absolute path, however is not sufficient for Windows paths.
 	data, _ = ioutil.ReadFile(path.Clean("/" + tainted_path))
diff --git a/go/ql/test/query-tests/Security/CWE-078/CommandInjection.expected b/go/ql/test/query-tests/Security/CWE-078/CommandInjection.expected
index dff32df4e1f..78dde84a947 100644
--- a/go/ql/test/query-tests/Security/CWE-078/CommandInjection.expected
+++ b/go/ql/test/query-tests/Security/CWE-078/CommandInjection.expected
@@ -48,14 +48,14 @@ edges
 | GitSubcommands.go:11:13:11:27 | call to Query | GitSubcommands.go:17:36:17:42 | tainted | provenance |  |
 | GitSubcommands.go:33:13:33:19 | selection of URL | GitSubcommands.go:33:13:33:27 | call to Query | provenance | Src:MaD:2 MaD:7 |
 | GitSubcommands.go:33:13:33:27 | call to Query | GitSubcommands.go:38:32:38:38 | tainted | provenance |  |
+| SanitizingDoubleDash.go:9:2:9:8 | definition of tainted | SanitizingDoubleDash.go:13:25:13:31 | tainted | provenance |  |
+| SanitizingDoubleDash.go:9:2:9:8 | definition of tainted | SanitizingDoubleDash.go:14:23:14:33 | slice expression | provenance |  |
+| SanitizingDoubleDash.go:9:2:9:8 | definition of tainted | SanitizingDoubleDash.go:39:31:39:37 | tainted | provenance | Config |
+| SanitizingDoubleDash.go:9:2:9:8 | definition of tainted | SanitizingDoubleDash.go:52:24:52:30 | tainted | provenance | Config |
+| SanitizingDoubleDash.go:9:2:9:8 | definition of tainted | SanitizingDoubleDash.go:68:31:68:37 | tainted | provenance | Config |
+| SanitizingDoubleDash.go:9:2:9:8 | definition of tainted | SanitizingDoubleDash.go:80:23:80:29 | tainted | provenance | Config |
 | SanitizingDoubleDash.go:9:13:9:19 | selection of URL | SanitizingDoubleDash.go:9:13:9:27 | call to Query | provenance | Src:MaD:2 MaD:7 |
-| SanitizingDoubleDash.go:9:13:9:27 | call to Query | SanitizingDoubleDash.go:13:25:13:31 | tainted | provenance |  |
-| SanitizingDoubleDash.go:9:13:9:27 | call to Query | SanitizingDoubleDash.go:14:23:14:33 | slice expression | provenance |  |
-| SanitizingDoubleDash.go:9:13:9:27 | call to Query | SanitizingDoubleDash.go:39:31:39:37 | tainted | provenance |  |
-| SanitizingDoubleDash.go:9:13:9:27 | call to Query | SanitizingDoubleDash.go:52:24:52:30 | tainted | provenance |  |
-| SanitizingDoubleDash.go:9:13:9:27 | call to Query | SanitizingDoubleDash.go:53:21:53:28 | arrayLit | provenance |  |
-| SanitizingDoubleDash.go:9:13:9:27 | call to Query | SanitizingDoubleDash.go:68:31:68:37 | tainted | provenance |  |
-| SanitizingDoubleDash.go:9:13:9:27 | call to Query | SanitizingDoubleDash.go:80:23:80:29 | tainted | provenance |  |
+| SanitizingDoubleDash.go:9:13:9:27 | call to Query | SanitizingDoubleDash.go:9:2:9:8 | definition of tainted | provenance |  |
 | SanitizingDoubleDash.go:13:15:13:32 | array literal [array] | SanitizingDoubleDash.go:14:23:14:30 | arrayLit [array] | provenance |  |
 | SanitizingDoubleDash.go:13:25:13:31 | tainted | SanitizingDoubleDash.go:13:15:13:32 | array literal [array] | provenance |  |
 | SanitizingDoubleDash.go:14:23:14:30 | arrayLit [array] | SanitizingDoubleDash.go:14:23:14:33 | slice element node | provenance |  |
@@ -67,6 +67,7 @@ edges
 | SanitizingDoubleDash.go:39:31:39:37 | tainted | SanitizingDoubleDash.go:39:14:39:44 | []type{args} [array] | provenance |  |
 | SanitizingDoubleDash.go:52:15:52:31 | slice literal [array] | SanitizingDoubleDash.go:53:21:53:28 | arrayLit [array] | provenance |  |
 | SanitizingDoubleDash.go:52:24:52:30 | tainted | SanitizingDoubleDash.go:52:15:52:31 | slice literal [array] | provenance |  |
+| SanitizingDoubleDash.go:52:24:52:30 | tainted | SanitizingDoubleDash.go:53:21:53:28 | arrayLit | provenance |  |
 | SanitizingDoubleDash.go:53:14:53:35 | call to append | SanitizingDoubleDash.go:54:23:54:30 | arrayLit | provenance |  |
 | SanitizingDoubleDash.go:53:14:53:35 | call to append [array] | SanitizingDoubleDash.go:54:23:54:30 | arrayLit | provenance |  |
 | SanitizingDoubleDash.go:53:21:53:28 | arrayLit | SanitizingDoubleDash.go:53:14:53:35 | call to append | provenance | MaD:4 |
@@ -180,6 +181,7 @@ nodes
 | GitSubcommands.go:33:13:33:19 | selection of URL | semmle.label | selection of URL |
 | GitSubcommands.go:33:13:33:27 | call to Query | semmle.label | call to Query |
 | GitSubcommands.go:38:32:38:38 | tainted | semmle.label | tainted |
+| SanitizingDoubleDash.go:9:2:9:8 | definition of tainted | semmle.label | definition of tainted |
 | SanitizingDoubleDash.go:9:13:9:19 | selection of URL | semmle.label | selection of URL |
 | SanitizingDoubleDash.go:9:13:9:27 | call to Query | semmle.label | call to Query |
 | SanitizingDoubleDash.go:13:15:13:32 | array literal [array] | semmle.label | array literal [array] |
diff --git a/go/ql/test/query-tests/Security/CWE-078/SanitizingDoubleDash.go b/go/ql/test/query-tests/Security/CWE-078/SanitizingDoubleDash.go
index d69a970f0d0..0428df55086 100644
--- a/go/ql/test/query-tests/Security/CWE-078/SanitizingDoubleDash.go
+++ b/go/ql/test/query-tests/Security/CWE-078/SanitizingDoubleDash.go
@@ -93,62 +93,62 @@ func testDoubleDashIrrelevant(req *http.Request) {
 
 	{
 		arrayLit := [1]string{tainted}
-		exec.Command("sudo", arrayLit[:]...)
+		exec.Command("sudo", arrayLit[:]...) // BAD
 	}
 
 	{
 		arrayLit := [2]string{"--", tainted}
-		exec.Command("sudo", arrayLit[:]...)
+		exec.Command("sudo", arrayLit[:]...) // BAD
 	}
 
 	{
 		arrayLit := []string{"--", tainted}
-		exec.Command("sudo", arrayLit...)
+		exec.Command("sudo", arrayLit...) // BAD
 	}
 
 	{
 		arrayLit := []string{}
 		arrayLit = append(arrayLit, "--", tainted)
-		exec.Command("sudo", arrayLit...)
+		exec.Command("sudo", arrayLit...) // BAD
 	}
 
 	{
 		arrayLit := []string{}
 		arrayLit = append(arrayLit, tainted, "--")
-		exec.Command("sudo", arrayLit...)
+		exec.Command("sudo", arrayLit...) // BAD
 	}
 
 	{
 		arrayLit := []string{"--"}
 		arrayLit = append(arrayLit, tainted)
-		exec.Command("sudo", arrayLit...)
+		exec.Command("sudo", arrayLit...) // BAD
 	}
 
 	{
 		arrayLit := []string{tainted}
 		arrayLit = append(arrayLit, "--")
-		exec.Command("sudo", arrayLit...)
+		exec.Command("sudo", arrayLit...) // BAD
 	}
 
 	{
 		arrayLit := []string{"--"}
 		arrayLit = append(arrayLit, "something else")
 		arrayLit = append(arrayLit, tainted)
-		exec.Command("sudo", arrayLit...)
+		exec.Command("sudo", arrayLit...) // BAD
 	}
 
 	{
 		arrayLit := []string{"something else"}
 		arrayLit = append(arrayLit, tainted)
 		arrayLit = append(arrayLit, "--")
-		exec.Command("sudo", arrayLit...)
+		exec.Command("sudo", arrayLit...) // BAD
 	}
 
 	{
-		exec.Command("sudo", "--", tainted)
+		exec.Command("sudo", "--", tainted) // BAD
 	}
 
 	{
-		exec.Command("sudo", tainted, "--")
+		exec.Command("sudo", tainted, "--") // BAD
 	}
 }
diff --git a/go/ql/test/query-tests/Security/CWE-078/StoredCommand.expected b/go/ql/test/query-tests/Security/CWE-078/StoredCommand.expected
index c274067926a..809f5c20976 100644
--- a/go/ql/test/query-tests/Security/CWE-078/StoredCommand.expected
+++ b/go/ql/test/query-tests/Security/CWE-078/StoredCommand.expected
@@ -2,14 +2,14 @@
 | StoredCommand.go:14:22:14:28 | cmdName | StoredCommand.go:11:2:11:27 | ... := ...[0] | StoredCommand.go:14:22:14:28 | cmdName | This command depends on a $@. | StoredCommand.go:11:2:11:27 | ... := ...[0] | stored value |
 edges
 | StoredCommand.go:11:2:11:27 | ... := ...[0] | StoredCommand.go:13:2:13:5 | rows | provenance | Src:MaD:2  |
-| StoredCommand.go:13:2:13:5 | rows | StoredCommand.go:13:12:13:19 | &... | provenance | FunctionModel |
-| StoredCommand.go:13:12:13:19 | &... | StoredCommand.go:14:22:14:28 | cmdName | provenance | Sink:MaD:1 |
+| StoredCommand.go:13:2:13:5 | rows | StoredCommand.go:13:12:13:19 | &... [postupdate] | provenance | FunctionModel |
+| StoredCommand.go:13:12:13:19 | &... [postupdate] | StoredCommand.go:14:22:14:28 | cmdName | provenance | Sink:MaD:1 |
 models
 | 1 | Sink: os/exec; ; false; Command; ; ; Argument[0]; command-injection; manual |
 | 2 | Source: database/sql; DB; true; Query; ; ; ReturnValue[0]; database; manual |
 nodes
 | StoredCommand.go:11:2:11:27 | ... := ...[0] | semmle.label | ... := ...[0] |
 | StoredCommand.go:13:2:13:5 | rows | semmle.label | rows |
-| StoredCommand.go:13:12:13:19 | &... | semmle.label | &... |
+| StoredCommand.go:13:12:13:19 | &... [postupdate] | semmle.label | &... [postupdate] |
 | StoredCommand.go:14:22:14:28 | cmdName | semmle.label | cmdName |
 subpaths
diff --git a/go/ql/test/query-tests/Security/CWE-079/ReflectedXss.expected b/go/ql/test/query-tests/Security/CWE-079/ReflectedXss.expected
index 91b39e0e2a0..0e1265b5c1e 100644
--- a/go/ql/test/query-tests/Security/CWE-079/ReflectedXss.expected
+++ b/go/ql/test/query-tests/Security/CWE-079/ReflectedXss.expected
@@ -13,11 +13,11 @@
 | reflectedxsstest.go:54:11:54:21 | type conversion | reflectedxsstest.go:51:14:51:18 | selection of URL | reflectedxsstest.go:54:11:54:21 | type conversion | Cross-site scripting vulnerability due to $@. | reflectedxsstest.go:51:14:51:18 | selection of URL | user-provided value | reflectedxsstest.go:0:0:0:0 | reflectedxsstest.go |  |
 | tst.go:18:12:18:39 | type conversion | tst.go:14:15:14:20 | selection of Form | tst.go:18:12:18:39 | type conversion | Cross-site scripting vulnerability due to $@. | tst.go:14:15:14:20 | selection of Form | user-provided value | tst.go:0:0:0:0 | tst.go |  |
 | tst.go:53:12:53:26 | type conversion | tst.go:48:14:48:19 | selection of Form | tst.go:53:12:53:26 | type conversion | Cross-site scripting vulnerability due to $@. | tst.go:48:14:48:19 | selection of Form | user-provided value | tst.go:0:0:0:0 | tst.go |  |
-| websocketXss.go:32:24:32:27 | xnet | websocketXss.go:30:7:30:10 | definition of xnet | websocketXss.go:32:24:32:27 | xnet | Cross-site scripting vulnerability due to $@. | websocketXss.go:30:7:30:10 | definition of xnet | user-provided value | websocketXss.go:0:0:0:0 | websocketXss.go |  |
-| websocketXss.go:36:24:36:28 | xnet2 | websocketXss.go:34:3:34:7 | definition of xnet2 | websocketXss.go:36:24:36:28 | xnet2 | Cross-site scripting vulnerability due to $@. | websocketXss.go:34:3:34:7 | definition of xnet2 | user-provided value | websocketXss.go:0:0:0:0 | websocketXss.go |  |
+| websocketXss.go:32:24:32:27 | xnet | websocketXss.go:31:11:31:14 | xnet [postupdate] | websocketXss.go:32:24:32:27 | xnet | Cross-site scripting vulnerability due to $@. | websocketXss.go:31:11:31:14 | xnet [postupdate] | user-provided value | websocketXss.go:0:0:0:0 | websocketXss.go |  |
+| websocketXss.go:36:24:36:28 | xnet2 | websocketXss.go:35:21:35:25 | xnet2 [postupdate] | websocketXss.go:36:24:36:28 | xnet2 | Cross-site scripting vulnerability due to $@. | websocketXss.go:35:21:35:25 | xnet2 [postupdate] | user-provided value | websocketXss.go:0:0:0:0 | websocketXss.go |  |
 | websocketXss.go:41:24:41:29 | nhooyr | websocketXss.go:40:3:40:40 | ... := ...[1] | websocketXss.go:41:24:41:29 | nhooyr | Cross-site scripting vulnerability due to $@. | websocketXss.go:40:3:40:40 | ... := ...[1] | user-provided value | websocketXss.go:0:0:0:0 | websocketXss.go |  |
-| websocketXss.go:48:24:48:33 | gorillaMsg | websocketXss.go:46:7:46:16 | definition of gorillaMsg | websocketXss.go:48:24:48:33 | gorillaMsg | Cross-site scripting vulnerability due to $@. | websocketXss.go:46:7:46:16 | definition of gorillaMsg | user-provided value | websocketXss.go:0:0:0:0 | websocketXss.go |  |
-| websocketXss.go:52:24:52:31 | gorilla2 | websocketXss.go:50:3:50:10 | definition of gorilla2 | websocketXss.go:52:24:52:31 | gorilla2 | Cross-site scripting vulnerability due to $@. | websocketXss.go:50:3:50:10 | definition of gorilla2 | user-provided value | websocketXss.go:0:0:0:0 | websocketXss.go |  |
+| websocketXss.go:48:24:48:33 | gorillaMsg | websocketXss.go:47:26:47:35 | gorillaMsg [postupdate] | websocketXss.go:48:24:48:33 | gorillaMsg | Cross-site scripting vulnerability due to $@. | websocketXss.go:47:26:47:35 | gorillaMsg [postupdate] | user-provided value | websocketXss.go:0:0:0:0 | websocketXss.go |  |
+| websocketXss.go:52:24:52:31 | gorilla2 | websocketXss.go:51:17:51:24 | gorilla2 [postupdate] | websocketXss.go:52:24:52:31 | gorilla2 | Cross-site scripting vulnerability due to $@. | websocketXss.go:51:17:51:24 | gorilla2 [postupdate] | user-provided value | websocketXss.go:0:0:0:0 | websocketXss.go |  |
 | websocketXss.go:55:24:55:31 | gorilla3 | websocketXss.go:54:3:54:38 | ... := ...[1] | websocketXss.go:55:24:55:31 | gorilla3 | Cross-site scripting vulnerability due to $@. | websocketXss.go:54:3:54:38 | ... := ...[1] | user-provided value | websocketXss.go:0:0:0:0 | websocketXss.go |  |
 edges
 | ReflectedXss.go:11:15:11:20 | selection of Form | ReflectedXss.go:11:15:11:36 | call to Get | provenance | Src:MaD:6 MaD:18 |
@@ -48,8 +48,8 @@ edges
 | reflectedxsstest.go:39:16:39:21 | reader | reflectedxsstest.go:39:2:39:32 | ... := ...[0] | provenance | MaD:16 |
 | reflectedxsstest.go:40:14:40:17 | part | reflectedxsstest.go:40:14:40:28 | call to FileName | provenance | MaD:15 |
 | reflectedxsstest.go:40:14:40:28 | call to FileName | reflectedxsstest.go:44:46:44:53 | partName | provenance |  |
-| reflectedxsstest.go:41:2:41:10 | definition of byteSlice | reflectedxsstest.go:45:10:45:18 | byteSlice | provenance |  |
-| reflectedxsstest.go:42:2:42:5 | part | reflectedxsstest.go:41:2:41:10 | definition of byteSlice | provenance | MaD:14 |
+| reflectedxsstest.go:42:2:42:5 | part | reflectedxsstest.go:42:12:42:20 | byteSlice [postupdate] | provenance | MaD:14 |
+| reflectedxsstest.go:42:12:42:20 | byteSlice [postupdate] | reflectedxsstest.go:45:10:45:18 | byteSlice | provenance |  |
 | reflectedxsstest.go:44:17:44:54 | []type{args} [array] | reflectedxsstest.go:44:17:44:54 | call to Sprintf | provenance | MaD:12 |
 | reflectedxsstest.go:44:17:44:54 | call to Sprintf | reflectedxsstest.go:44:10:44:55 | type conversion | provenance |  |
 | reflectedxsstest.go:44:46:44:53 | partName | reflectedxsstest.go:44:17:44:54 | []type{args} [array] | provenance |  |
@@ -62,11 +62,11 @@ edges
 | tst.go:18:32:18:32 | a | tst.go:18:19:18:38 | call to Join | provenance | MaD:19 |
 | tst.go:48:14:48:19 | selection of Form | tst.go:48:14:48:34 | call to Get | provenance | Src:MaD:6 MaD:18 |
 | tst.go:48:14:48:34 | call to Get | tst.go:53:12:53:26 | type conversion | provenance |  |
-| websocketXss.go:30:7:30:10 | definition of xnet | websocketXss.go:32:24:32:27 | xnet | provenance | Src:MaD:5  |
-| websocketXss.go:34:3:34:7 | definition of xnet2 | websocketXss.go:36:24:36:28 | xnet2 | provenance | Src:MaD:4  |
+| websocketXss.go:31:11:31:14 | xnet [postupdate] | websocketXss.go:32:24:32:27 | xnet | provenance | Src:MaD:5  |
+| websocketXss.go:35:21:35:25 | xnet2 [postupdate] | websocketXss.go:36:24:36:28 | xnet2 | provenance | Src:MaD:4  |
 | websocketXss.go:40:3:40:40 | ... := ...[1] | websocketXss.go:41:24:41:29 | nhooyr | provenance | Src:MaD:11  |
-| websocketXss.go:46:7:46:16 | definition of gorillaMsg | websocketXss.go:48:24:48:33 | gorillaMsg | provenance | Src:MaD:1  |
-| websocketXss.go:50:3:50:10 | definition of gorilla2 | websocketXss.go:52:24:52:31 | gorilla2 | provenance | Src:MaD:2  |
+| websocketXss.go:47:26:47:35 | gorillaMsg [postupdate] | websocketXss.go:48:24:48:33 | gorillaMsg | provenance | Src:MaD:1  |
+| websocketXss.go:51:17:51:24 | gorilla2 [postupdate] | websocketXss.go:52:24:52:31 | gorilla2 | provenance | Src:MaD:2  |
 | websocketXss.go:54:3:54:38 | ... := ...[1] | websocketXss.go:55:24:55:31 | gorilla3 | provenance | Src:MaD:3  |
 models
 | 1 | Source: github.com/gorilla/websocket; ; false; ReadJSON; ; ; Argument[1]; remote; manual |
@@ -123,8 +123,8 @@ nodes
 | reflectedxsstest.go:39:16:39:21 | reader | semmle.label | reader |
 | reflectedxsstest.go:40:14:40:17 | part | semmle.label | part |
 | reflectedxsstest.go:40:14:40:28 | call to FileName | semmle.label | call to FileName |
-| reflectedxsstest.go:41:2:41:10 | definition of byteSlice | semmle.label | definition of byteSlice |
 | reflectedxsstest.go:42:2:42:5 | part | semmle.label | part |
+| reflectedxsstest.go:42:12:42:20 | byteSlice [postupdate] | semmle.label | byteSlice [postupdate] |
 | reflectedxsstest.go:44:10:44:55 | type conversion | semmle.label | type conversion |
 | reflectedxsstest.go:44:17:44:54 | []type{args} [array] | semmle.label | []type{args} [array] |
 | reflectedxsstest.go:44:17:44:54 | call to Sprintf | semmle.label | call to Sprintf |
@@ -141,16 +141,25 @@ nodes
 | tst.go:48:14:48:19 | selection of Form | semmle.label | selection of Form |
 | tst.go:48:14:48:34 | call to Get | semmle.label | call to Get |
 | tst.go:53:12:53:26 | type conversion | semmle.label | type conversion |
-| websocketXss.go:30:7:30:10 | definition of xnet | semmle.label | definition of xnet |
+| websocketXss.go:31:11:31:14 | xnet [postupdate] | semmle.label | xnet [postupdate] |
 | websocketXss.go:32:24:32:27 | xnet | semmle.label | xnet |
-| websocketXss.go:34:3:34:7 | definition of xnet2 | semmle.label | definition of xnet2 |
+| websocketXss.go:35:21:35:25 | xnet2 [postupdate] | semmle.label | xnet2 [postupdate] |
 | websocketXss.go:36:24:36:28 | xnet2 | semmle.label | xnet2 |
 | websocketXss.go:40:3:40:40 | ... := ...[1] | semmle.label | ... := ...[1] |
 | websocketXss.go:41:24:41:29 | nhooyr | semmle.label | nhooyr |
-| websocketXss.go:46:7:46:16 | definition of gorillaMsg | semmle.label | definition of gorillaMsg |
+| websocketXss.go:47:26:47:35 | gorillaMsg [postupdate] | semmle.label | gorillaMsg [postupdate] |
 | websocketXss.go:48:24:48:33 | gorillaMsg | semmle.label | gorillaMsg |
-| websocketXss.go:50:3:50:10 | definition of gorilla2 | semmle.label | definition of gorilla2 |
+| websocketXss.go:51:17:51:24 | gorilla2 [postupdate] | semmle.label | gorilla2 [postupdate] |
 | websocketXss.go:52:24:52:31 | gorilla2 | semmle.label | gorilla2 |
 | websocketXss.go:54:3:54:38 | ... := ...[1] | semmle.label | ... := ...[1] |
 | websocketXss.go:55:24:55:31 | gorilla3 | semmle.label | gorilla3 |
 subpaths
+testFailures
+| websocketXss.go:30:32:30:60 | comment | Missing result: Source[go/reflected-xss] |
+| websocketXss.go:31:11:31:14 | xnet [postupdate] | Unexpected result: Source |
+| websocketXss.go:34:30:34:58 | comment | Missing result: Source[go/reflected-xss] |
+| websocketXss.go:35:21:35:25 | xnet2 [postupdate] | Unexpected result: Source |
+| websocketXss.go:46:38:46:66 | comment | Missing result: Source[go/reflected-xss] |
+| websocketXss.go:47:26:47:35 | gorillaMsg [postupdate] | Unexpected result: Source |
+| websocketXss.go:50:33:50:61 | comment | Missing result: Source[go/reflected-xss] |
+| websocketXss.go:51:17:51:24 | gorilla2 [postupdate] | Unexpected result: Source |
diff --git a/go/ql/test/query-tests/Security/CWE-079/StoredXss.expected b/go/ql/test/query-tests/Security/CWE-079/StoredXss.expected
index 4e2958c767e..41ec62706d0 100644
--- a/go/ql/test/query-tests/Security/CWE-079/StoredXss.expected
+++ b/go/ql/test/query-tests/Security/CWE-079/StoredXss.expected
@@ -3,15 +3,15 @@
 | stored.go:61:22:61:25 | path | stored.go:59:30:59:33 | definition of path | stored.go:61:22:61:25 | path | Stored cross-site scripting vulnerability due to $@. | stored.go:59:30:59:33 | definition of path | stored value |
 edges
 | stored.go:18:3:18:28 | ... := ...[0] | stored.go:25:14:25:17 | rows | provenance | Src:MaD:1  |
-| stored.go:25:14:25:17 | rows | stored.go:25:29:25:33 | &... | provenance | FunctionModel |
-| stored.go:25:29:25:33 | &... | stored.go:30:22:30:25 | name | provenance |  |
+| stored.go:25:14:25:17 | rows | stored.go:25:29:25:33 | &... [postupdate] | provenance | FunctionModel |
+| stored.go:25:29:25:33 | &... [postupdate] | stored.go:30:22:30:25 | name | provenance |  |
 | stored.go:59:30:59:33 | definition of path | stored.go:61:22:61:25 | path | provenance |  |
 models
 | 1 | Source: database/sql; DB; true; Query; ; ; ReturnValue[0]; database; manual |
 nodes
 | stored.go:18:3:18:28 | ... := ...[0] | semmle.label | ... := ...[0] |
 | stored.go:25:14:25:17 | rows | semmle.label | rows |
-| stored.go:25:29:25:33 | &... | semmle.label | &... |
+| stored.go:25:29:25:33 | &... [postupdate] | semmle.label | &... [postupdate] |
 | stored.go:30:22:30:25 | name | semmle.label | name |
 | stored.go:59:30:59:33 | definition of path | semmle.label | definition of path |
 | stored.go:61:22:61:25 | path | semmle.label | path |
diff --git a/go/ql/test/query-tests/Security/CWE-089/SqlInjection.expected b/go/ql/test/query-tests/Security/CWE-089/SqlInjection.expected
index 1ce8c3d1dcf..e8c6848b569 100644
--- a/go/ql/test/query-tests/Security/CWE-089/SqlInjection.expected
+++ b/go/ql/test/query-tests/Security/CWE-089/SqlInjection.expected
@@ -33,24 +33,24 @@ edges
 | SqlInjection.go:11:3:11:29 | index expression | SqlInjection.go:10:7:11:30 | call to Sprintf | provenance | FunctionModel |
 | issue48.go:17:2:17:33 | ... := ...[0] | issue48.go:18:17:18:17 | b | provenance |  |
 | issue48.go:17:25:17:32 | selection of Body | issue48.go:17:2:17:33 | ... := ...[0] | provenance | Src:MaD:17 MaD:24 |
-| issue48.go:18:17:18:17 | b | issue48.go:18:20:18:39 | &... | provenance | MaD:22 |
-| issue48.go:18:20:18:39 | &... | issue48.go:21:3:21:33 | index expression | provenance |  |
+| issue48.go:18:17:18:17 | b | issue48.go:18:20:18:39 | &... [postupdate] | provenance | MaD:22 |
+| issue48.go:18:20:18:39 | &... [postupdate] | issue48.go:21:3:21:33 | index expression | provenance |  |
 | issue48.go:20:8:21:34 | []type{args} [array] | issue48.go:20:8:21:34 | call to Sprintf | provenance | MaD:23 |
 | issue48.go:20:8:21:34 | call to Sprintf | issue48.go:22:11:22:12 | q3 | provenance | Sink:MaD:1 |
 | issue48.go:21:3:21:33 | index expression | issue48.go:20:8:21:34 | []type{args} [array] | provenance |  |
 | issue48.go:21:3:21:33 | index expression | issue48.go:20:8:21:34 | call to Sprintf | provenance | FunctionModel |
 | issue48.go:27:2:27:34 | ... := ...[0] | issue48.go:28:17:28:18 | b2 | provenance |  |
 | issue48.go:27:26:27:33 | selection of Body | issue48.go:27:2:27:34 | ... := ...[0] | provenance | Src:MaD:17 MaD:24 |
-| issue48.go:28:17:28:18 | b2 | issue48.go:28:21:28:41 | &... | provenance | MaD:22 |
-| issue48.go:28:21:28:41 | &... | issue48.go:31:3:31:31 | selection of Category | provenance |  |
+| issue48.go:28:17:28:18 | b2 | issue48.go:28:21:28:41 | &... [postupdate] | provenance | MaD:22 |
+| issue48.go:28:21:28:41 | &... [postupdate] | issue48.go:31:3:31:31 | selection of Category | provenance |  |
 | issue48.go:30:8:31:32 | []type{args} [array] | issue48.go:30:8:31:32 | call to Sprintf | provenance | MaD:23 |
 | issue48.go:30:8:31:32 | call to Sprintf | issue48.go:32:11:32:12 | q4 | provenance | Sink:MaD:1 |
 | issue48.go:31:3:31:31 | selection of Category | issue48.go:30:8:31:32 | []type{args} [array] | provenance |  |
 | issue48.go:31:3:31:31 | selection of Category | issue48.go:30:8:31:32 | call to Sprintf | provenance | FunctionModel |
-| issue48.go:37:17:37:50 | type conversion | issue48.go:37:53:37:73 | &... | provenance | MaD:22 |
+| issue48.go:37:17:37:50 | type conversion | issue48.go:37:53:37:73 | &... [postupdate] | provenance | MaD:22 |
 | issue48.go:37:24:37:30 | selection of URL | issue48.go:37:24:37:38 | call to Query | provenance | Src:MaD:21 MaD:26 |
 | issue48.go:37:24:37:38 | call to Query | issue48.go:37:17:37:50 | type conversion | provenance |  |
-| issue48.go:37:53:37:73 | &... | issue48.go:40:3:40:31 | selection of Category | provenance |  |
+| issue48.go:37:53:37:73 | &... [postupdate] | issue48.go:40:3:40:31 | selection of Category | provenance |  |
 | issue48.go:39:8:40:32 | []type{args} [array] | issue48.go:39:8:40:32 | call to Sprintf | provenance | MaD:23 |
 | issue48.go:39:8:40:32 | call to Sprintf | issue48.go:41:11:41:12 | q5 | provenance | Sink:MaD:1 |
 | issue48.go:40:3:40:31 | selection of Category | issue48.go:39:8:40:32 | []type{args} [array] | provenance |  |
@@ -76,39 +76,33 @@ edges
 | main.go:34:3:34:13 | implicit dereference [Category] | main.go:34:3:34:22 | selection of Category | provenance |  |
 | main.go:34:3:34:22 | selection of Category | main.go:33:7:34:23 | []type{args} [array] | provenance |  |
 | main.go:34:3:34:22 | selection of Category | main.go:33:7:34:23 | call to Sprintf | provenance | FunctionModel |
-| main.go:39:2:39:12 | definition of RequestData [pointer, Category] | main.go:40:2:40:12 | RequestData [pointer, Category] | provenance |  |
-| main.go:39:2:39:12 | definition of RequestData [pointer, Category] | main.go:43:3:43:13 | RequestData [pointer, Category] | provenance |  |
-| main.go:40:2:40:12 | RequestData [pointer, Category] | main.go:40:2:40:12 | implicit dereference [Category] | provenance |  |
-| main.go:40:2:40:12 | implicit dereference [Category] | main.go:39:2:39:12 | definition of RequestData [pointer, Category] | provenance |  |
+| main.go:40:2:40:12 | RequestData [postupdate] [pointer, Category] | main.go:43:3:43:13 | RequestData [pointer, Category] | provenance |  |
+| main.go:40:2:40:12 | implicit dereference [postupdate] [Category] | main.go:40:2:40:12 | RequestData [postupdate] [pointer, Category] | provenance |  |
 | main.go:40:25:40:31 | selection of URL | main.go:40:25:40:39 | call to Query | provenance | Src:MaD:21 MaD:26 |
 | main.go:40:25:40:39 | call to Query | main.go:40:25:40:51 | index expression | provenance |  |
-| main.go:40:25:40:51 | index expression | main.go:40:2:40:12 | implicit dereference [Category] | provenance |  |
+| main.go:40:25:40:51 | index expression | main.go:40:2:40:12 | implicit dereference [postupdate] [Category] | provenance |  |
 | main.go:42:7:43:23 | []type{args} [array] | main.go:42:7:43:23 | call to Sprintf | provenance | MaD:23 |
 | main.go:42:7:43:23 | call to Sprintf | main.go:44:11:44:11 | q | provenance | Sink:MaD:1 |
 | main.go:43:3:43:13 | RequestData [pointer, Category] | main.go:43:3:43:13 | implicit dereference [Category] | provenance |  |
 | main.go:43:3:43:13 | implicit dereference [Category] | main.go:43:3:43:22 | selection of Category | provenance |  |
 | main.go:43:3:43:22 | selection of Category | main.go:42:7:43:23 | []type{args} [array] | provenance |  |
 | main.go:43:3:43:22 | selection of Category | main.go:42:7:43:23 | call to Sprintf | provenance | FunctionModel |
-| main.go:48:2:48:12 | definition of RequestData [pointer, Category] | main.go:49:4:49:14 | RequestData [pointer, Category] | provenance |  |
-| main.go:48:2:48:12 | definition of RequestData [pointer, Category] | main.go:52:3:52:13 | RequestData [pointer, Category] | provenance |  |
-| main.go:49:3:49:14 | star expression [Category] | main.go:48:2:48:12 | definition of RequestData [pointer, Category] | provenance |  |
-| main.go:49:4:49:14 | RequestData [pointer, Category] | main.go:49:3:49:14 | star expression [Category] | provenance |  |
+| main.go:49:3:49:14 | star expression [postupdate] [Category] | main.go:49:4:49:14 | RequestData [postupdate] [pointer, Category] | provenance |  |
+| main.go:49:4:49:14 | RequestData [postupdate] [pointer, Category] | main.go:52:3:52:13 | RequestData [pointer, Category] | provenance |  |
 | main.go:49:28:49:34 | selection of URL | main.go:49:28:49:42 | call to Query | provenance | Src:MaD:21 MaD:26 |
 | main.go:49:28:49:42 | call to Query | main.go:49:28:49:54 | index expression | provenance |  |
-| main.go:49:28:49:54 | index expression | main.go:49:3:49:14 | star expression [Category] | provenance |  |
+| main.go:49:28:49:54 | index expression | main.go:49:3:49:14 | star expression [postupdate] [Category] | provenance |  |
 | main.go:51:7:52:23 | []type{args} [array] | main.go:51:7:52:23 | call to Sprintf | provenance | MaD:23 |
 | main.go:51:7:52:23 | call to Sprintf | main.go:53:11:53:11 | q | provenance | Sink:MaD:1 |
 | main.go:52:3:52:13 | RequestData [pointer, Category] | main.go:52:3:52:13 | implicit dereference [Category] | provenance |  |
 | main.go:52:3:52:13 | implicit dereference [Category] | main.go:52:3:52:22 | selection of Category | provenance |  |
 | main.go:52:3:52:22 | selection of Category | main.go:51:7:52:23 | []type{args} [array] | provenance |  |
 | main.go:52:3:52:22 | selection of Category | main.go:51:7:52:23 | call to Sprintf | provenance | FunctionModel |
-| main.go:57:2:57:12 | definition of RequestData [pointer, Category] | main.go:58:4:58:14 | RequestData [pointer, Category] | provenance |  |
-| main.go:57:2:57:12 | definition of RequestData [pointer, Category] | main.go:61:5:61:15 | RequestData [pointer, Category] | provenance |  |
-| main.go:58:3:58:14 | star expression [Category] | main.go:57:2:57:12 | definition of RequestData [pointer, Category] | provenance |  |
-| main.go:58:4:58:14 | RequestData [pointer, Category] | main.go:58:3:58:14 | star expression [Category] | provenance |  |
+| main.go:58:3:58:14 | star expression [postupdate] [Category] | main.go:58:4:58:14 | RequestData [postupdate] [pointer, Category] | provenance |  |
+| main.go:58:4:58:14 | RequestData [postupdate] [pointer, Category] | main.go:61:5:61:15 | RequestData [pointer, Category] | provenance |  |
 | main.go:58:28:58:34 | selection of URL | main.go:58:28:58:42 | call to Query | provenance | Src:MaD:21 MaD:26 |
 | main.go:58:28:58:42 | call to Query | main.go:58:28:58:54 | index expression | provenance |  |
-| main.go:58:28:58:54 | index expression | main.go:58:3:58:14 | star expression [Category] | provenance |  |
+| main.go:58:28:58:54 | index expression | main.go:58:3:58:14 | star expression [postupdate] [Category] | provenance |  |
 | main.go:60:7:61:26 | []type{args} [array] | main.go:60:7:61:26 | call to Sprintf | provenance | MaD:23 |
 | main.go:60:7:61:26 | call to Sprintf | main.go:62:11:62:11 | q | provenance | Sink:MaD:1 |
 | main.go:61:3:61:25 | selection of Category | main.go:60:7:61:26 | []type{args} [array] | provenance |  |
@@ -117,22 +111,22 @@ edges
 | main.go:61:5:61:15 | RequestData [pointer, Category] | main.go:61:4:61:15 | star expression [Category] | provenance |  |
 | mongoDB.go:40:20:40:30 | call to Referer | mongoDB.go:42:28:42:41 | untrustedInput | provenance | Src:MaD:20  |
 | mongoDB.go:42:19:42:42 | struct literal | mongoDB.go:50:34:50:39 | filter | provenance |  |
-| mongoDB.go:42:19:42:42 | struct literal | mongoDB.go:61:27:61:32 | filter | provenance | Sink:MaD:4 |
-| mongoDB.go:42:19:42:42 | struct literal | mongoDB.go:63:23:63:28 | filter | provenance | Sink:MaD:5 |
-| mongoDB.go:42:19:42:42 | struct literal | mongoDB.go:64:22:64:27 | filter | provenance | Sink:MaD:6 |
-| mongoDB.go:42:19:42:42 | struct literal | mongoDB.go:66:32:66:37 | filter | provenance | Sink:MaD:7 |
-| mongoDB.go:42:19:42:42 | struct literal | mongoDB.go:69:17:69:22 | filter | provenance | Sink:MaD:8 |
-| mongoDB.go:42:19:42:42 | struct literal | mongoDB.go:70:20:70:25 | filter | provenance | Sink:MaD:9 |
-| mongoDB.go:42:19:42:42 | struct literal | mongoDB.go:71:29:71:34 | filter | provenance | Sink:MaD:10 |
-| mongoDB.go:42:19:42:42 | struct literal | mongoDB.go:72:30:72:35 | filter | provenance | Sink:MaD:11 |
-| mongoDB.go:42:19:42:42 | struct literal | mongoDB.go:73:29:73:34 | filter | provenance | Sink:MaD:12 |
-| mongoDB.go:42:19:42:42 | struct literal | mongoDB.go:78:23:78:28 | filter | provenance | Sink:MaD:13 |
-| mongoDB.go:42:19:42:42 | struct literal | mongoDB.go:79:23:79:28 | filter | provenance | Sink:MaD:14 |
-| mongoDB.go:42:19:42:42 | struct literal | mongoDB.go:80:22:80:27 | filter | provenance | Sink:MaD:15 |
 | mongoDB.go:42:28:42:41 | untrustedInput | mongoDB.go:42:19:42:42 | struct literal | provenance | Config |
 | mongoDB.go:50:23:50:40 | struct literal | mongoDB.go:57:22:57:29 | pipeline | provenance | Sink:MaD:3 |
 | mongoDB.go:50:23:50:40 | struct literal | mongoDB.go:81:18:81:25 | pipeline | provenance | Sink:MaD:16 |
 | mongoDB.go:50:34:50:39 | filter | mongoDB.go:50:23:50:40 | struct literal | provenance | Config |
+| mongoDB.go:50:34:50:39 | filter | mongoDB.go:61:27:61:32 | filter | provenance | Sink:MaD:4 |
+| mongoDB.go:50:34:50:39 | filter | mongoDB.go:63:23:63:28 | filter | provenance | Sink:MaD:5 |
+| mongoDB.go:50:34:50:39 | filter | mongoDB.go:64:22:64:27 | filter | provenance | Sink:MaD:6 |
+| mongoDB.go:50:34:50:39 | filter | mongoDB.go:66:32:66:37 | filter | provenance | Sink:MaD:7 |
+| mongoDB.go:50:34:50:39 | filter | mongoDB.go:69:17:69:22 | filter | provenance | Sink:MaD:8 |
+| mongoDB.go:50:34:50:39 | filter | mongoDB.go:70:20:70:25 | filter | provenance | Sink:MaD:9 |
+| mongoDB.go:50:34:50:39 | filter | mongoDB.go:71:29:71:34 | filter | provenance | Sink:MaD:10 |
+| mongoDB.go:50:34:50:39 | filter | mongoDB.go:72:30:72:35 | filter | provenance | Sink:MaD:11 |
+| mongoDB.go:50:34:50:39 | filter | mongoDB.go:73:29:73:34 | filter | provenance | Sink:MaD:12 |
+| mongoDB.go:50:34:50:39 | filter | mongoDB.go:78:23:78:28 | filter | provenance | Sink:MaD:13 |
+| mongoDB.go:50:34:50:39 | filter | mongoDB.go:79:23:79:28 | filter | provenance | Sink:MaD:14 |
+| mongoDB.go:50:34:50:39 | filter | mongoDB.go:80:22:80:27 | filter | provenance | Sink:MaD:15 |
 models
 | 1 | Sink: database/sql; DB; true; Query; ; ; Argument[0]; sql-injection; manual |
 | 2 | Sink: database/sql; Tx; true; Query; ; ; Argument[0]; sql-injection; manual |
@@ -170,7 +164,7 @@ nodes
 | issue48.go:17:2:17:33 | ... := ...[0] | semmle.label | ... := ...[0] |
 | issue48.go:17:25:17:32 | selection of Body | semmle.label | selection of Body |
 | issue48.go:18:17:18:17 | b | semmle.label | b |
-| issue48.go:18:20:18:39 | &... | semmle.label | &... |
+| issue48.go:18:20:18:39 | &... [postupdate] | semmle.label | &... [postupdate] |
 | issue48.go:20:8:21:34 | []type{args} [array] | semmle.label | []type{args} [array] |
 | issue48.go:20:8:21:34 | call to Sprintf | semmle.label | call to Sprintf |
 | issue48.go:21:3:21:33 | index expression | semmle.label | index expression |
@@ -178,7 +172,7 @@ nodes
 | issue48.go:27:2:27:34 | ... := ...[0] | semmle.label | ... := ...[0] |
 | issue48.go:27:26:27:33 | selection of Body | semmle.label | selection of Body |
 | issue48.go:28:17:28:18 | b2 | semmle.label | b2 |
-| issue48.go:28:21:28:41 | &... | semmle.label | &... |
+| issue48.go:28:21:28:41 | &... [postupdate] | semmle.label | &... [postupdate] |
 | issue48.go:30:8:31:32 | []type{args} [array] | semmle.label | []type{args} [array] |
 | issue48.go:30:8:31:32 | call to Sprintf | semmle.label | call to Sprintf |
 | issue48.go:31:3:31:31 | selection of Category | semmle.label | selection of Category |
@@ -186,7 +180,7 @@ nodes
 | issue48.go:37:17:37:50 | type conversion | semmle.label | type conversion |
 | issue48.go:37:24:37:30 | selection of URL | semmle.label | selection of URL |
 | issue48.go:37:24:37:38 | call to Query | semmle.label | call to Query |
-| issue48.go:37:53:37:73 | &... | semmle.label | &... |
+| issue48.go:37:53:37:73 | &... [postupdate] | semmle.label | &... [postupdate] |
 | issue48.go:39:8:40:32 | []type{args} [array] | semmle.label | []type{args} [array] |
 | issue48.go:39:8:40:32 | call to Sprintf | semmle.label | call to Sprintf |
 | issue48.go:40:3:40:31 | selection of Category | semmle.label | selection of Category |
@@ -213,9 +207,8 @@ nodes
 | main.go:34:3:34:13 | implicit dereference [Category] | semmle.label | implicit dereference [Category] |
 | main.go:34:3:34:22 | selection of Category | semmle.label | selection of Category |
 | main.go:35:11:35:11 | q | semmle.label | q |
-| main.go:39:2:39:12 | definition of RequestData [pointer, Category] | semmle.label | definition of RequestData [pointer, Category] |
-| main.go:40:2:40:12 | RequestData [pointer, Category] | semmle.label | RequestData [pointer, Category] |
-| main.go:40:2:40:12 | implicit dereference [Category] | semmle.label | implicit dereference [Category] |
+| main.go:40:2:40:12 | RequestData [postupdate] [pointer, Category] | semmle.label | RequestData [postupdate] [pointer, Category] |
+| main.go:40:2:40:12 | implicit dereference [postupdate] [Category] | semmle.label | implicit dereference [postupdate] [Category] |
 | main.go:40:25:40:31 | selection of URL | semmle.label | selection of URL |
 | main.go:40:25:40:39 | call to Query | semmle.label | call to Query |
 | main.go:40:25:40:51 | index expression | semmle.label | index expression |
@@ -225,9 +218,8 @@ nodes
 | main.go:43:3:43:13 | implicit dereference [Category] | semmle.label | implicit dereference [Category] |
 | main.go:43:3:43:22 | selection of Category | semmle.label | selection of Category |
 | main.go:44:11:44:11 | q | semmle.label | q |
-| main.go:48:2:48:12 | definition of RequestData [pointer, Category] | semmle.label | definition of RequestData [pointer, Category] |
-| main.go:49:3:49:14 | star expression [Category] | semmle.label | star expression [Category] |
-| main.go:49:4:49:14 | RequestData [pointer, Category] | semmle.label | RequestData [pointer, Category] |
+| main.go:49:3:49:14 | star expression [postupdate] [Category] | semmle.label | star expression [postupdate] [Category] |
+| main.go:49:4:49:14 | RequestData [postupdate] [pointer, Category] | semmle.label | RequestData [postupdate] [pointer, Category] |
 | main.go:49:28:49:34 | selection of URL | semmle.label | selection of URL |
 | main.go:49:28:49:42 | call to Query | semmle.label | call to Query |
 | main.go:49:28:49:54 | index expression | semmle.label | index expression |
@@ -237,9 +229,8 @@ nodes
 | main.go:52:3:52:13 | implicit dereference [Category] | semmle.label | implicit dereference [Category] |
 | main.go:52:3:52:22 | selection of Category | semmle.label | selection of Category |
 | main.go:53:11:53:11 | q | semmle.label | q |
-| main.go:57:2:57:12 | definition of RequestData [pointer, Category] | semmle.label | definition of RequestData [pointer, Category] |
-| main.go:58:3:58:14 | star expression [Category] | semmle.label | star expression [Category] |
-| main.go:58:4:58:14 | RequestData [pointer, Category] | semmle.label | RequestData [pointer, Category] |
+| main.go:58:3:58:14 | star expression [postupdate] [Category] | semmle.label | star expression [postupdate] [Category] |
+| main.go:58:4:58:14 | RequestData [postupdate] [pointer, Category] | semmle.label | RequestData [postupdate] [pointer, Category] |
 | main.go:58:28:58:34 | selection of URL | semmle.label | selection of URL |
 | main.go:58:28:58:42 | call to Query | semmle.label | call to Query |
 | main.go:58:28:58:54 | index expression | semmle.label | index expression |
diff --git a/go/ql/test/query-tests/Security/CWE-190/AllocationSizeOverflow.expected b/go/ql/test/query-tests/Security/CWE-190/AllocationSizeOverflow.expected
index 3a9de1ebe60..ec1835a6f8a 100644
--- a/go/ql/test/query-tests/Security/CWE-190/AllocationSizeOverflow.expected
+++ b/go/ql/test/query-tests/Security/CWE-190/AllocationSizeOverflow.expected
@@ -17,10 +17,13 @@ edges
 | tst2.go:14:2:14:29 | ... := ...[0] | tst2.go:15:26:15:29 | data | provenance |  |
 | tst2.go:15:26:15:29 | data | tst2.go:15:22:15:30 | call to len | provenance | Config |
 | tst3.go:6:2:6:31 | ... := ...[0] | tst3.go:7:26:7:33 | jsonData | provenance |  |
-| tst3.go:6:2:6:31 | ... := ...[0] | tst3.go:24:20:24:27 | jsonData | provenance |  |
-| tst3.go:6:2:6:31 | ... := ...[0] | tst3.go:32:20:32:27 | jsonData | provenance |  |
 | tst3.go:7:26:7:33 | jsonData | tst3.go:7:22:7:34 | call to len | provenance | Config |
+| tst3.go:7:26:7:33 | jsonData | tst3.go:9:32:9:39 | jsonData | provenance |  |
+| tst3.go:9:32:9:39 | jsonData | tst3.go:11:9:11:16 | jsonData | provenance |  |
+| tst3.go:11:9:11:16 | jsonData | tst3.go:16:20:16:27 | jsonData | provenance |  |
+| tst3.go:16:20:16:27 | jsonData | tst3.go:24:20:24:27 | jsonData | provenance |  |
 | tst3.go:24:20:24:27 | jsonData | tst3.go:24:16:24:28 | call to len | provenance | Config |
+| tst3.go:24:20:24:27 | jsonData | tst3.go:32:20:32:27 | jsonData | provenance |  |
 | tst3.go:32:20:32:27 | jsonData | tst3.go:32:16:32:28 | call to len | provenance | Config |
 | tst.go:14:2:14:30 | ... = ...[0] | tst.go:15:26:15:33 | jsonData | provenance |  |
 | tst.go:15:26:15:33 | jsonData | tst.go:15:22:15:34 | call to len | provenance | Config |
@@ -45,6 +48,9 @@ nodes
 | tst3.go:6:2:6:31 | ... := ...[0] | semmle.label | ... := ...[0] |
 | tst3.go:7:22:7:34 | call to len | semmle.label | call to len |
 | tst3.go:7:26:7:33 | jsonData | semmle.label | jsonData |
+| tst3.go:9:32:9:39 | jsonData | semmle.label | jsonData |
+| tst3.go:11:9:11:16 | jsonData | semmle.label | jsonData |
+| tst3.go:16:20:16:27 | jsonData | semmle.label | jsonData |
 | tst3.go:24:16:24:28 | call to len | semmle.label | call to len |
 | tst3.go:24:20:24:27 | jsonData | semmle.label | jsonData |
 | tst3.go:32:16:32:28 | call to len | semmle.label | call to len |
diff --git a/go/ql/test/query-tests/Security/CWE-209/StackTraceExposure.expected b/go/ql/test/query-tests/Security/CWE-209/StackTraceExposure.expected
index c62c6126648..732b9cd5cae 100644
--- a/go/ql/test/query-tests/Security/CWE-209/StackTraceExposure.expected
+++ b/go/ql/test/query-tests/Security/CWE-209/StackTraceExposure.expected
@@ -1,8 +1,8 @@
 edges
-| test.go:14:2:14:4 | definition of buf | test.go:17:10:17:12 | buf | provenance |  |
+| test.go:15:28:15:30 | buf [postupdate] | test.go:18:10:18:12 | buf | provenance |  |
 nodes
-| test.go:14:2:14:4 | definition of buf | semmle.label | definition of buf |
-| test.go:17:10:17:12 | buf | semmle.label | buf |
+| test.go:15:28:15:30 | buf [postupdate] | semmle.label | buf [postupdate] |
+| test.go:18:10:18:12 | buf | semmle.label | buf |
 subpaths
 #select
-| test.go:17:10:17:12 | buf | test.go:14:2:14:4 | definition of buf | test.go:17:10:17:12 | buf | HTTP response depends on $@ and may be exposed to an external user. | test.go:14:2:14:4 | definition of buf | stack trace information |
+| test.go:18:10:18:12 | buf | test.go:15:28:15:30 | buf [postupdate] | test.go:18:10:18:12 | buf | HTTP response depends on $@ and may be exposed to an external user. | test.go:15:28:15:30 | buf [postupdate] | stack trace information |
diff --git a/go/ql/test/query-tests/Security/CWE-209/test.go b/go/ql/test/query-tests/Security/CWE-209/test.go
index 2ad35680048..77df73b8046 100644
--- a/go/ql/test/query-tests/Security/CWE-209/test.go
+++ b/go/ql/test/query-tests/Security/CWE-209/test.go
@@ -12,7 +12,8 @@ var logger log.Logger
 
 func handlePanic(w http.ResponseWriter, r *http.Request) {
 	buf := make([]byte, 2<<16)
-	buf = buf[:runtime.Stack(buf, true)]
+	stackLen := runtime.Stack(buf, true)
+	buf = buf[:stackLen]
 	// BAD: printing a stack trace back to the response
 	w.Write(buf)
 	// GOOD: logging the response to the server and sending
diff --git a/go/ql/test/query-tests/Security/CWE-295/DisabledCertificateCheck/main.go b/go/ql/test/query-tests/Security/CWE-295/DisabledCertificateCheck/main.go
index 027a88b9bb6..3cb5d107a70 100644
--- a/go/ql/test/query-tests/Security/CWE-295/DisabledCertificateCheck/main.go
+++ b/go/ql/test/query-tests/Security/CWE-295/DisabledCertificateCheck/main.go
@@ -64,9 +64,22 @@ func bad3() *http.Transport {
 	return transport
 }
 
-func good3() *http.Transport {
-	insecureTransport := &http.Transport{
-		TLSClientConfig: &tls.Config{InsecureSkipVerify: true}, // OK
+func good3(i int) *http.Transport {
+	if i == 0 {
+		insecureTransport := &http.Transport{
+			TLSClientConfig: &tls.Config{InsecureSkipVerify: true}, // OK
+		}
+		return insecureTransport
+	} else if i == 1 {
+		temp1 := tls.Config{InsecureSkipVerify: true}
+		temp2 := &temp1
+		selfSignConfig := &http.Transport{TLSClientConfig: temp2} // OK
+		return selfSignConfig
+	} else if i == 2 {
+		temp1 := tls.Config{}
+		temp1.InsecureSkipVerify = true
+		untrustedTransport := &http.Transport{TLSClientConfig: &temp1} // OK
+		return untrustedTransport
 	}
-	return insecureTransport
+	return nil
 }
diff --git a/go/ql/test/query-tests/Security/CWE-312/CleartextLogging.expected b/go/ql/test/query-tests/Security/CWE-312/CleartextLogging.expected
index a7f7f83a9ff..f748c7a7773 100644
--- a/go/ql/test/query-tests/Security/CWE-312/CleartextLogging.expected
+++ b/go/ql/test/query-tests/Security/CWE-312/CleartextLogging.expected
@@ -1,105 +1,248 @@
 #select
 | klog.go:23:15:23:20 | header | klog.go:21:30:21:37 | selection of Header | klog.go:23:15:23:20 | header | $@ flows to a logging call. | klog.go:21:30:21:37 | selection of Header | Sensitive data returned by HTTP request headers |
 | klog.go:29:13:29:41 | call to Get | klog.go:29:13:29:20 | selection of Header | klog.go:29:13:29:41 | call to Get | $@ flows to a logging call. | klog.go:29:13:29:20 | selection of Header | Sensitive data returned by HTTP request headers |
-| main.go:16:12:16:19 | password | main.go:16:12:16:19 | password | main.go:16:12:16:19 | password | $@ flows to a logging call. | main.go:16:12:16:19 | password | Sensitive data returned by an access to password |
-| main.go:17:19:17:26 | password | main.go:17:19:17:26 | password | main.go:17:19:17:26 | password | $@ flows to a logging call. | main.go:17:19:17:26 | password | Sensitive data returned by an access to password |
-| main.go:18:13:18:20 | password | main.go:18:13:18:20 | password | main.go:18:13:18:20 | password | $@ flows to a logging call. | main.go:18:13:18:20 | password | Sensitive data returned by an access to password |
-| main.go:19:14:19:21 | password | main.go:19:14:19:21 | password | main.go:19:14:19:21 | password | $@ flows to a logging call. | main.go:19:14:19:21 | password | Sensitive data returned by an access to password |
-| main.go:20:12:20:19 | password | main.go:20:12:20:19 | password | main.go:20:12:20:19 | password | $@ flows to a logging call. | main.go:20:12:20:19 | password | Sensitive data returned by an access to password |
-| main.go:21:19:21:26 | password | main.go:21:19:21:26 | password | main.go:21:19:21:26 | password | $@ flows to a logging call. | main.go:21:19:21:26 | password | Sensitive data returned by an access to password |
-| main.go:22:13:22:20 | password | main.go:22:13:22:20 | password | main.go:22:13:22:20 | password | $@ flows to a logging call. | main.go:22:13:22:20 | password | Sensitive data returned by an access to password |
-| main.go:23:14:23:21 | password | main.go:23:14:23:21 | password | main.go:23:14:23:21 | password | $@ flows to a logging call. | main.go:23:14:23:21 | password | Sensitive data returned by an access to password |
-| main.go:24:12:24:19 | password | main.go:24:12:24:19 | password | main.go:24:12:24:19 | password | $@ flows to a logging call. | main.go:24:12:24:19 | password | Sensitive data returned by an access to password |
-| main.go:25:19:25:26 | password | main.go:25:19:25:26 | password | main.go:25:19:25:26 | password | $@ flows to a logging call. | main.go:25:19:25:26 | password | Sensitive data returned by an access to password |
-| main.go:26:13:26:20 | password | main.go:26:13:26:20 | password | main.go:26:13:26:20 | password | $@ flows to a logging call. | main.go:26:13:26:20 | password | Sensitive data returned by an access to password |
-| main.go:27:14:27:21 | password | main.go:27:14:27:21 | password | main.go:27:14:27:21 | password | $@ flows to a logging call. | main.go:27:14:27:21 | password | Sensitive data returned by an access to password |
-| main.go:28:16:28:23 | password | main.go:28:16:28:23 | password | main.go:28:16:28:23 | password | $@ flows to a logging call. | main.go:28:16:28:23 | password | Sensitive data returned by an access to password |
-| main.go:32:10:32:17 | password | main.go:32:10:32:17 | password | main.go:32:10:32:17 | password | $@ flows to a logging call. | main.go:32:10:32:17 | password | Sensitive data returned by an access to password |
-| main.go:33:17:33:24 | password | main.go:33:17:33:24 | password | main.go:33:17:33:24 | password | $@ flows to a logging call. | main.go:33:17:33:24 | password | Sensitive data returned by an access to password |
-| main.go:34:11:34:18 | password | main.go:34:11:34:18 | password | main.go:34:11:34:18 | password | $@ flows to a logging call. | main.go:34:11:34:18 | password | Sensitive data returned by an access to password |
-| main.go:35:12:35:19 | password | main.go:35:12:35:19 | password | main.go:35:12:35:19 | password | $@ flows to a logging call. | main.go:35:12:35:19 | password | Sensitive data returned by an access to password |
-| main.go:36:10:36:17 | password | main.go:36:10:36:17 | password | main.go:36:10:36:17 | password | $@ flows to a logging call. | main.go:36:10:36:17 | password | Sensitive data returned by an access to password |
-| main.go:37:17:37:24 | password | main.go:37:17:37:24 | password | main.go:37:17:37:24 | password | $@ flows to a logging call. | main.go:37:17:37:24 | password | Sensitive data returned by an access to password |
-| main.go:38:11:38:18 | password | main.go:38:11:38:18 | password | main.go:38:11:38:18 | password | $@ flows to a logging call. | main.go:38:11:38:18 | password | Sensitive data returned by an access to password |
-| main.go:39:12:39:19 | password | main.go:39:12:39:19 | password | main.go:39:12:39:19 | password | $@ flows to a logging call. | main.go:39:12:39:19 | password | Sensitive data returned by an access to password |
-| main.go:40:10:40:17 | password | main.go:40:10:40:17 | password | main.go:40:10:40:17 | password | $@ flows to a logging call. | main.go:40:10:40:17 | password | Sensitive data returned by an access to password |
-| main.go:41:17:41:24 | password | main.go:41:17:41:24 | password | main.go:41:17:41:24 | password | $@ flows to a logging call. | main.go:41:17:41:24 | password | Sensitive data returned by an access to password |
-| main.go:42:11:42:18 | password | main.go:42:11:42:18 | password | main.go:42:11:42:18 | password | $@ flows to a logging call. | main.go:42:11:42:18 | password | Sensitive data returned by an access to password |
-| main.go:43:12:43:19 | password | main.go:43:12:43:19 | password | main.go:43:12:43:19 | password | $@ flows to a logging call. | main.go:43:12:43:19 | password | Sensitive data returned by an access to password |
-| main.go:44:14:44:21 | password | main.go:44:14:44:21 | password | main.go:44:14:44:21 | password | $@ flows to a logging call. | main.go:44:14:44:21 | password | Sensitive data returned by an access to password |
-| main.go:47:12:47:19 | password | main.go:47:12:47:19 | password | main.go:47:12:47:19 | password | $@ flows to a logging call. | main.go:47:12:47:19 | password | Sensitive data returned by an access to password |
-| main.go:48:17:48:24 | password | main.go:48:17:48:24 | password | main.go:48:17:48:24 | password | $@ flows to a logging call. | main.go:48:17:48:24 | password | Sensitive data returned by an access to password |
-| main.go:55:35:55:42 | password | main.go:55:35:55:42 | password | main.go:55:35:55:42 | password | $@ flows to a logging call. | main.go:55:35:55:42 | password | Sensitive data returned by an access to password |
-| overrides.go:13:14:13:23 | call to String | overrides.go:9:9:9:16 | password | overrides.go:13:14:13:23 | call to String | $@ flows to a logging call. | overrides.go:9:9:9:16 | password | Sensitive data returned by an access to password |
-| passwords.go:9:14:9:14 | x | passwords.go:30:8:30:15 | password | passwords.go:9:14:9:14 | x | $@ flows to a logging call. | passwords.go:30:8:30:15 | password | Sensitive data returned by an access to password |
-| passwords.go:25:14:25:21 | password | passwords.go:25:14:25:21 | password | passwords.go:25:14:25:21 | password | $@ flows to a logging call. | passwords.go:25:14:25:21 | password | Sensitive data returned by an access to password |
+| main.go:19:12:19:19 | password | main.go:17:2:17:9 | definition of password | main.go:19:12:19:19 | password | $@ flows to a logging call. | main.go:17:2:17:9 | definition of password | Sensitive data returned by an access to password |
+| main.go:20:19:20:26 | password | main.go:17:2:17:9 | definition of password | main.go:20:19:20:26 | password | $@ flows to a logging call. | main.go:17:2:17:9 | definition of password | Sensitive data returned by an access to password |
+| main.go:21:13:21:20 | password | main.go:17:2:17:9 | definition of password | main.go:21:13:21:20 | password | $@ flows to a logging call. | main.go:17:2:17:9 | definition of password | Sensitive data returned by an access to password |
+| main.go:22:14:22:21 | password | main.go:17:2:17:9 | definition of password | main.go:22:14:22:21 | password | $@ flows to a logging call. | main.go:17:2:17:9 | definition of password | Sensitive data returned by an access to password |
+| main.go:24:13:24:20 | password | main.go:17:2:17:9 | definition of password | main.go:24:13:24:20 | password | $@ flows to a logging call. | main.go:17:2:17:9 | definition of password | Sensitive data returned by an access to password |
+| main.go:27:20:27:27 | password | main.go:17:2:17:9 | definition of password | main.go:27:20:27:27 | password | $@ flows to a logging call. | main.go:17:2:17:9 | definition of password | Sensitive data returned by an access to password |
+| main.go:30:14:30:21 | password | main.go:17:2:17:9 | definition of password | main.go:30:14:30:21 | password | $@ flows to a logging call. | main.go:17:2:17:9 | definition of password | Sensitive data returned by an access to password |
+| main.go:33:15:33:22 | password | main.go:17:2:17:9 | definition of password | main.go:33:15:33:22 | password | $@ flows to a logging call. | main.go:17:2:17:9 | definition of password | Sensitive data returned by an access to password |
+| main.go:36:13:36:20 | password | main.go:17:2:17:9 | definition of password | main.go:36:13:36:20 | password | $@ flows to a logging call. | main.go:17:2:17:9 | definition of password | Sensitive data returned by an access to password |
+| main.go:39:20:39:27 | password | main.go:17:2:17:9 | definition of password | main.go:39:20:39:27 | password | $@ flows to a logging call. | main.go:17:2:17:9 | definition of password | Sensitive data returned by an access to password |
+| main.go:42:14:42:21 | password | main.go:17:2:17:9 | definition of password | main.go:42:14:42:21 | password | $@ flows to a logging call. | main.go:17:2:17:9 | definition of password | Sensitive data returned by an access to password |
+| main.go:45:15:45:22 | password | main.go:17:2:17:9 | definition of password | main.go:45:15:45:22 | password | $@ flows to a logging call. | main.go:17:2:17:9 | definition of password | Sensitive data returned by an access to password |
+| main.go:47:16:47:23 | password | main.go:17:2:17:9 | definition of password | main.go:47:16:47:23 | password | $@ flows to a logging call. | main.go:17:2:17:9 | definition of password | Sensitive data returned by an access to password |
+| main.go:51:10:51:17 | password | main.go:17:2:17:9 | definition of password | main.go:51:10:51:17 | password | $@ flows to a logging call. | main.go:17:2:17:9 | definition of password | Sensitive data returned by an access to password |
+| main.go:52:17:52:24 | password | main.go:17:2:17:9 | definition of password | main.go:52:17:52:24 | password | $@ flows to a logging call. | main.go:17:2:17:9 | definition of password | Sensitive data returned by an access to password |
+| main.go:53:11:53:18 | password | main.go:17:2:17:9 | definition of password | main.go:53:11:53:18 | password | $@ flows to a logging call. | main.go:17:2:17:9 | definition of password | Sensitive data returned by an access to password |
+| main.go:54:12:54:19 | password | main.go:17:2:17:9 | definition of password | main.go:54:12:54:19 | password | $@ flows to a logging call. | main.go:17:2:17:9 | definition of password | Sensitive data returned by an access to password |
+| main.go:56:11:56:18 | password | main.go:17:2:17:9 | definition of password | main.go:56:11:56:18 | password | $@ flows to a logging call. | main.go:17:2:17:9 | definition of password | Sensitive data returned by an access to password |
+| main.go:59:18:59:25 | password | main.go:17:2:17:9 | definition of password | main.go:59:18:59:25 | password | $@ flows to a logging call. | main.go:17:2:17:9 | definition of password | Sensitive data returned by an access to password |
+| main.go:62:12:62:19 | password | main.go:17:2:17:9 | definition of password | main.go:62:12:62:19 | password | $@ flows to a logging call. | main.go:17:2:17:9 | definition of password | Sensitive data returned by an access to password |
+| main.go:65:13:65:20 | password | main.go:17:2:17:9 | definition of password | main.go:65:13:65:20 | password | $@ flows to a logging call. | main.go:17:2:17:9 | definition of password | Sensitive data returned by an access to password |
+| main.go:68:11:68:18 | password | main.go:17:2:17:9 | definition of password | main.go:68:11:68:18 | password | $@ flows to a logging call. | main.go:17:2:17:9 | definition of password | Sensitive data returned by an access to password |
+| main.go:71:18:71:25 | password | main.go:17:2:17:9 | definition of password | main.go:71:18:71:25 | password | $@ flows to a logging call. | main.go:17:2:17:9 | definition of password | Sensitive data returned by an access to password |
+| main.go:74:12:74:19 | password | main.go:17:2:17:9 | definition of password | main.go:74:12:74:19 | password | $@ flows to a logging call. | main.go:17:2:17:9 | definition of password | Sensitive data returned by an access to password |
+| main.go:77:13:77:20 | password | main.go:17:2:17:9 | definition of password | main.go:77:13:77:20 | password | $@ flows to a logging call. | main.go:17:2:17:9 | definition of password | Sensitive data returned by an access to password |
+| main.go:79:14:79:21 | password | main.go:17:2:17:9 | definition of password | main.go:79:14:79:21 | password | $@ flows to a logging call. | main.go:17:2:17:9 | definition of password | Sensitive data returned by an access to password |
+| main.go:82:12:82:19 | password | main.go:17:2:17:9 | definition of password | main.go:82:12:82:19 | password | $@ flows to a logging call. | main.go:17:2:17:9 | definition of password | Sensitive data returned by an access to password |
+| main.go:83:17:83:24 | password | main.go:17:2:17:9 | definition of password | main.go:83:17:83:24 | password | $@ flows to a logging call. | main.go:17:2:17:9 | definition of password | Sensitive data returned by an access to password |
+| main.go:87:29:87:34 | fields | main.go:17:2:17:9 | definition of password | main.go:87:29:87:34 | fields | $@ flows to a logging call. | main.go:17:2:17:9 | definition of password | Sensitive data returned by an access to password |
+| main.go:90:35:90:42 | password | main.go:17:2:17:9 | definition of password | main.go:90:35:90:42 | password | $@ flows to a logging call. | main.go:17:2:17:9 | definition of password | Sensitive data returned by an access to password |
+| overrides.go:13:14:13:23 | call to String | overrides.go:8:2:8:9 | definition of password | overrides.go:13:14:13:23 | call to String | $@ flows to a logging call. | overrides.go:8:2:8:9 | definition of password | Sensitive data returned by an access to password |
+| passwords.go:9:14:9:14 | x | passwords.go:21:2:21:9 | definition of password | passwords.go:9:14:9:14 | x | $@ flows to a logging call. | passwords.go:21:2:21:9 | definition of password | Sensitive data returned by an access to password |
+| passwords.go:25:14:25:21 | password | passwords.go:21:2:21:9 | definition of password | passwords.go:25:14:25:21 | password | $@ flows to a logging call. | passwords.go:21:2:21:9 | definition of password | Sensitive data returned by an access to password |
 | passwords.go:26:14:26:23 | selection of password | passwords.go:26:14:26:23 | selection of password | passwords.go:26:14:26:23 | selection of password | $@ flows to a logging call. | passwords.go:26:14:26:23 | selection of password | Sensitive data returned by an access to password |
 | passwords.go:27:14:27:26 | call to getPassword | passwords.go:27:14:27:26 | call to getPassword | passwords.go:27:14:27:26 | call to getPassword | $@ flows to a logging call. | passwords.go:27:14:27:26 | call to getPassword | Sensitive data returned by a call to getPassword |
 | passwords.go:28:14:28:28 | call to getPassword | passwords.go:28:14:28:28 | call to getPassword | passwords.go:28:14:28:28 | call to getPassword | $@ flows to a logging call. | passwords.go:28:14:28:28 | call to getPassword | Sensitive data returned by a call to getPassword |
-| passwords.go:32:12:32:19 | password | passwords.go:32:12:32:19 | password | passwords.go:32:12:32:19 | password | $@ flows to a logging call. | passwords.go:32:12:32:19 | password | Sensitive data returned by an access to password |
-| passwords.go:34:14:34:35 | ...+... | passwords.go:34:28:34:35 | password | passwords.go:34:14:34:35 | ...+... | $@ flows to a logging call. | passwords.go:34:28:34:35 | password | Sensitive data returned by an access to password |
+| passwords.go:32:12:32:19 | password | passwords.go:21:2:21:9 | definition of password | passwords.go:32:12:32:19 | password | $@ flows to a logging call. | passwords.go:21:2:21:9 | definition of password | Sensitive data returned by an access to password |
+| passwords.go:34:14:34:35 | ...+... | passwords.go:21:2:21:9 | definition of password | passwords.go:34:14:34:35 | ...+... | $@ flows to a logging call. | passwords.go:21:2:21:9 | definition of password | Sensitive data returned by an access to password |
 | passwords.go:39:14:39:17 | obj1 | passwords.go:37:13:37:13 | x | passwords.go:39:14:39:17 | obj1 | $@ flows to a logging call. | passwords.go:37:13:37:13 | x | Sensitive data returned by an access to password |
-| passwords.go:44:14:44:17 | obj2 | passwords.go:42:6:42:13 | password | passwords.go:44:14:44:17 | obj2 | $@ flows to a logging call. | passwords.go:42:6:42:13 | password | Sensitive data returned by an access to password |
-| passwords.go:47:14:47:17 | obj3 | passwords.go:48:11:48:18 | password | passwords.go:47:14:47:17 | obj3 | $@ flows to a logging call. | passwords.go:48:11:48:18 | password | Sensitive data returned by an access to password |
-| passwords.go:51:14:51:27 | fixed_password | passwords.go:51:14:51:27 | fixed_password | passwords.go:51:14:51:27 | fixed_password | $@ flows to a logging call. | passwords.go:51:14:51:27 | fixed_password | Sensitive data returned by an access to fixed_password |
-| passwords.go:88:14:88:26 | utilityObject | passwords.go:86:16:86:36 | call to make | passwords.go:88:14:88:26 | utilityObject | $@ flows to a logging call. | passwords.go:86:16:86:36 | call to make | Sensitive data returned by an access to passwordSet |
-| passwords.go:91:23:91:28 | secret | passwords.go:90:12:90:19 | password | passwords.go:91:23:91:28 | secret | $@ flows to a logging call. | passwords.go:90:12:90:19 | password | Sensitive data returned by an access to password |
-| passwords.go:101:15:101:40 | ...+... | passwords.go:101:33:101:40 | password | passwords.go:101:15:101:40 | ...+... | $@ flows to a logging call. | passwords.go:101:33:101:40 | password | Sensitive data returned by an access to password |
-| passwords.go:107:16:107:41 | ...+... | passwords.go:107:34:107:41 | password | passwords.go:107:16:107:41 | ...+... | $@ flows to a logging call. | passwords.go:107:34:107:41 | password | Sensitive data returned by an access to password |
-| passwords.go:112:15:112:40 | ...+... | passwords.go:112:33:112:40 | password | passwords.go:112:15:112:40 | ...+... | $@ flows to a logging call. | passwords.go:112:33:112:40 | password | Sensitive data returned by an access to password |
-| passwords.go:116:14:116:45 | ...+... | passwords.go:116:28:116:36 | password1 | passwords.go:116:14:116:45 | ...+... | $@ flows to a logging call. | passwords.go:116:28:116:36 | password1 | Sensitive data returned by an access to password1 |
-| passwords.go:125:14:125:19 | config | passwords.go:119:13:119:13 | x | passwords.go:125:14:125:19 | config | $@ flows to a logging call. | passwords.go:119:13:119:13 | x | Sensitive data returned by an access to password |
-| passwords.go:125:14:125:19 | config | passwords.go:121:13:121:20 | password | passwords.go:125:14:125:19 | config | $@ flows to a logging call. | passwords.go:121:13:121:20 | password | Sensitive data returned by an access to password |
-| passwords.go:125:14:125:19 | config | passwords.go:122:13:122:25 | call to getPassword | passwords.go:125:14:125:19 | config | $@ flows to a logging call. | passwords.go:122:13:122:25 | call to getPassword | Sensitive data returned by a call to getPassword |
-| passwords.go:126:14:126:21 | selection of x | passwords.go:121:13:121:20 | password | passwords.go:126:14:126:21 | selection of x | $@ flows to a logging call. | passwords.go:121:13:121:20 | password | Sensitive data returned by an access to password |
-| passwords.go:127:14:127:21 | selection of y | passwords.go:122:13:122:25 | call to getPassword | passwords.go:127:14:127:21 | selection of y | $@ flows to a logging call. | passwords.go:122:13:122:25 | call to getPassword | Sensitive data returned by a call to getPassword |
-| protobuf.go:14:14:14:35 | call to GetDescription | protobuf.go:12:22:12:29 | password | protobuf.go:14:14:14:35 | call to GetDescription | $@ flows to a logging call. | protobuf.go:12:22:12:29 | password | Sensitive data returned by an access to password |
+| passwords.go:44:14:44:17 | obj2 | passwords.go:21:2:21:9 | definition of password | passwords.go:44:14:44:17 | obj2 | $@ flows to a logging call. | passwords.go:21:2:21:9 | definition of password | Sensitive data returned by an access to password |
+| passwords.go:51:14:51:27 | fixed_password | passwords.go:50:2:50:15 | definition of fixed_password | passwords.go:51:14:51:27 | fixed_password | $@ flows to a logging call. | passwords.go:50:2:50:15 | definition of fixed_password | Sensitive data returned by an access to fixed_password |
+| passwords.go:89:14:89:26 | utilityObject | passwords.go:87:16:87:36 | call to make | passwords.go:89:14:89:26 | utilityObject | $@ flows to a logging call. | passwords.go:87:16:87:36 | call to make | Sensitive data returned by an access to passwordSet |
+| passwords.go:92:23:92:28 | secret | passwords.go:21:2:21:9 | definition of password | passwords.go:92:23:92:28 | secret | $@ flows to a logging call. | passwords.go:21:2:21:9 | definition of password | Sensitive data returned by an access to password |
+| passwords.go:102:15:102:40 | ...+... | passwords.go:21:2:21:9 | definition of password | passwords.go:102:15:102:40 | ...+... | $@ flows to a logging call. | passwords.go:21:2:21:9 | definition of password | Sensitive data returned by an access to password |
+| passwords.go:108:16:108:41 | ...+... | passwords.go:21:2:21:9 | definition of password | passwords.go:108:16:108:41 | ...+... | $@ flows to a logging call. | passwords.go:21:2:21:9 | definition of password | Sensitive data returned by an access to password |
+| passwords.go:113:15:113:40 | ...+... | passwords.go:21:2:21:9 | definition of password | passwords.go:113:15:113:40 | ...+... | $@ flows to a logging call. | passwords.go:21:2:21:9 | definition of password | Sensitive data returned by an access to password |
+| passwords.go:117:14:117:45 | ...+... | passwords.go:116:6:116:14 | definition of password1 | passwords.go:117:14:117:45 | ...+... | $@ flows to a logging call. | passwords.go:116:6:116:14 | definition of password1 | Sensitive data returned by an access to password1 |
+| passwords.go:127:14:127:19 | config | passwords.go:21:2:21:9 | definition of password | passwords.go:127:14:127:19 | config | $@ flows to a logging call. | passwords.go:21:2:21:9 | definition of password | Sensitive data returned by an access to password |
+| passwords.go:127:14:127:19 | config | passwords.go:121:13:121:14 | x3 | passwords.go:127:14:127:19 | config | $@ flows to a logging call. | passwords.go:121:13:121:14 | x3 | Sensitive data returned by an access to password |
+| passwords.go:127:14:127:19 | config | passwords.go:124:13:124:25 | call to getPassword | passwords.go:127:14:127:19 | config | $@ flows to a logging call. | passwords.go:124:13:124:25 | call to getPassword | Sensitive data returned by a call to getPassword |
+| passwords.go:128:14:128:21 | selection of x | passwords.go:21:2:21:9 | definition of password | passwords.go:128:14:128:21 | selection of x | $@ flows to a logging call. | passwords.go:21:2:21:9 | definition of password | Sensitive data returned by an access to password |
+| passwords.go:129:14:129:21 | selection of y | passwords.go:124:13:124:25 | call to getPassword | passwords.go:129:14:129:21 | selection of y | $@ flows to a logging call. | passwords.go:124:13:124:25 | call to getPassword | Sensitive data returned by a call to getPassword |
+| protobuf.go:14:14:14:35 | call to GetDescription | protobuf.go:9:2:9:9 | definition of password | protobuf.go:14:14:14:35 | call to GetDescription | $@ flows to a logging call. | protobuf.go:9:2:9:9 | definition of password | Sensitive data returned by an access to password |
 edges
 | klog.go:21:3:26:3 | range statement[1] | klog.go:22:27:22:33 | headers | provenance |  |
-| klog.go:21:30:21:37 | selection of Header | klog.go:21:3:26:3 | range statement[1] | provenance | Src:MaD:1 Config |
+| klog.go:21:30:21:37 | selection of Header | klog.go:21:3:26:3 | range statement[1] | provenance | Src:MaD:11 Config |
 | klog.go:22:4:25:4 | range statement[1] | klog.go:23:15:23:20 | header | provenance |  |
 | klog.go:22:27:22:33 | headers | klog.go:22:4:25:4 | range statement[1] | provenance | Config |
-| klog.go:29:13:29:20 | selection of Header | klog.go:29:13:29:41 | call to Get | provenance | Src:MaD:1 Config |
+| klog.go:29:13:29:20 | selection of Header | klog.go:29:13:29:41 | call to Get | provenance | Src:MaD:11 Config |
+| main.go:17:2:17:9 | definition of password | main.go:19:12:19:19 | password | provenance |  |
+| main.go:17:2:17:9 | definition of password | main.go:20:19:20:26 | password | provenance |  |
+| main.go:17:2:17:9 | definition of password | main.go:21:13:21:20 | password | provenance | Sink:MaD:6 |
+| main.go:17:2:17:9 | definition of password | main.go:22:14:22:21 | password | provenance |  |
+| main.go:17:2:17:9 | definition of password | main.go:24:13:24:20 | password | provenance |  |
+| main.go:17:2:17:9 | definition of password | main.go:27:20:27:27 | password | provenance |  |
+| main.go:17:2:17:9 | definition of password | main.go:30:14:30:21 | password | provenance | Sink:MaD:3 |
+| main.go:17:2:17:9 | definition of password | main.go:33:15:33:22 | password | provenance |  |
+| main.go:17:2:17:9 | definition of password | main.go:36:13:36:20 | password | provenance |  |
+| main.go:17:2:17:9 | definition of password | main.go:39:20:39:27 | password | provenance |  |
+| main.go:17:2:17:9 | definition of password | main.go:42:14:42:21 | password | provenance | Sink:MaD:5 |
+| main.go:17:2:17:9 | definition of password | main.go:45:15:45:22 | password | provenance |  |
+| main.go:17:2:17:9 | definition of password | main.go:47:16:47:23 | password | provenance | Sink:MaD:4 |
+| main.go:17:2:17:9 | definition of password | main.go:51:10:51:17 | password | provenance |  |
+| main.go:17:2:17:9 | definition of password | main.go:51:10:51:17 | password | provenance |  |
+| main.go:51:10:51:17 | password | main.go:52:17:52:24 | password | provenance |  |
+| main.go:51:10:51:17 | password | main.go:52:17:52:24 | password | provenance |  |
+| main.go:52:17:52:24 | password | main.go:53:11:53:18 | password | provenance |  |
+| main.go:52:17:52:24 | password | main.go:53:11:53:18 | password | provenance | Sink:MaD:10 |
+| main.go:53:11:53:18 | password | main.go:54:12:54:19 | password | provenance |  |
+| main.go:53:11:53:18 | password | main.go:54:12:54:19 | password | provenance |  |
+| main.go:54:12:54:19 | password | main.go:56:11:56:18 | password | provenance |  |
+| main.go:54:12:54:19 | password | main.go:56:11:56:18 | password | provenance |  |
+| main.go:54:12:54:19 | password | main.go:59:18:59:25 | password | provenance |  |
+| main.go:54:12:54:19 | password | main.go:59:18:59:25 | password | provenance |  |
+| main.go:54:12:54:19 | password | main.go:62:12:62:19 | password | provenance |  |
+| main.go:54:12:54:19 | password | main.go:62:12:62:19 | password | provenance | Sink:MaD:7 |
+| main.go:54:12:54:19 | password | main.go:65:13:65:20 | password | provenance |  |
+| main.go:54:12:54:19 | password | main.go:65:13:65:20 | password | provenance |  |
+| main.go:54:12:54:19 | password | main.go:68:11:68:18 | password | provenance |  |
+| main.go:54:12:54:19 | password | main.go:68:11:68:18 | password | provenance |  |
+| main.go:54:12:54:19 | password | main.go:71:18:71:25 | password | provenance |  |
+| main.go:54:12:54:19 | password | main.go:71:18:71:25 | password | provenance |  |
+| main.go:54:12:54:19 | password | main.go:74:12:74:19 | password | provenance |  |
+| main.go:54:12:54:19 | password | main.go:74:12:74:19 | password | provenance | Sink:MaD:9 |
+| main.go:54:12:54:19 | password | main.go:77:13:77:20 | password | provenance |  |
+| main.go:54:12:54:19 | password | main.go:77:13:77:20 | password | provenance |  |
+| main.go:54:12:54:19 | password | main.go:79:14:79:21 | password | provenance | Sink:MaD:8 |
+| main.go:54:12:54:19 | password | main.go:80:17:80:24 | password | provenance |  |
+| main.go:56:11:56:18 | password | main.go:59:18:59:25 | password | provenance |  |
+| main.go:56:11:56:18 | password | main.go:59:18:59:25 | password | provenance |  |
+| main.go:56:11:56:18 | password | main.go:62:12:62:19 | password | provenance |  |
+| main.go:56:11:56:18 | password | main.go:62:12:62:19 | password | provenance | Sink:MaD:7 |
+| main.go:56:11:56:18 | password | main.go:65:13:65:20 | password | provenance |  |
+| main.go:56:11:56:18 | password | main.go:65:13:65:20 | password | provenance |  |
+| main.go:56:11:56:18 | password | main.go:68:11:68:18 | password | provenance |  |
+| main.go:56:11:56:18 | password | main.go:68:11:68:18 | password | provenance |  |
+| main.go:56:11:56:18 | password | main.go:71:18:71:25 | password | provenance |  |
+| main.go:56:11:56:18 | password | main.go:71:18:71:25 | password | provenance |  |
+| main.go:56:11:56:18 | password | main.go:74:12:74:19 | password | provenance |  |
+| main.go:56:11:56:18 | password | main.go:74:12:74:19 | password | provenance | Sink:MaD:9 |
+| main.go:56:11:56:18 | password | main.go:77:13:77:20 | password | provenance |  |
+| main.go:56:11:56:18 | password | main.go:77:13:77:20 | password | provenance |  |
+| main.go:56:11:56:18 | password | main.go:79:14:79:21 | password | provenance | Sink:MaD:8 |
+| main.go:56:11:56:18 | password | main.go:80:17:80:24 | password | provenance |  |
+| main.go:59:18:59:25 | password | main.go:62:12:62:19 | password | provenance |  |
+| main.go:59:18:59:25 | password | main.go:62:12:62:19 | password | provenance | Sink:MaD:7 |
+| main.go:59:18:59:25 | password | main.go:65:13:65:20 | password | provenance |  |
+| main.go:59:18:59:25 | password | main.go:65:13:65:20 | password | provenance |  |
+| main.go:59:18:59:25 | password | main.go:68:11:68:18 | password | provenance |  |
+| main.go:59:18:59:25 | password | main.go:68:11:68:18 | password | provenance |  |
+| main.go:59:18:59:25 | password | main.go:71:18:71:25 | password | provenance |  |
+| main.go:59:18:59:25 | password | main.go:71:18:71:25 | password | provenance |  |
+| main.go:59:18:59:25 | password | main.go:74:12:74:19 | password | provenance |  |
+| main.go:59:18:59:25 | password | main.go:74:12:74:19 | password | provenance | Sink:MaD:9 |
+| main.go:59:18:59:25 | password | main.go:77:13:77:20 | password | provenance |  |
+| main.go:59:18:59:25 | password | main.go:77:13:77:20 | password | provenance |  |
+| main.go:59:18:59:25 | password | main.go:79:14:79:21 | password | provenance | Sink:MaD:8 |
+| main.go:59:18:59:25 | password | main.go:80:17:80:24 | password | provenance |  |
+| main.go:62:12:62:19 | password | main.go:65:13:65:20 | password | provenance |  |
+| main.go:62:12:62:19 | password | main.go:65:13:65:20 | password | provenance |  |
+| main.go:62:12:62:19 | password | main.go:68:11:68:18 | password | provenance |  |
+| main.go:62:12:62:19 | password | main.go:68:11:68:18 | password | provenance |  |
+| main.go:62:12:62:19 | password | main.go:71:18:71:25 | password | provenance |  |
+| main.go:62:12:62:19 | password | main.go:71:18:71:25 | password | provenance |  |
+| main.go:62:12:62:19 | password | main.go:74:12:74:19 | password | provenance |  |
+| main.go:62:12:62:19 | password | main.go:74:12:74:19 | password | provenance | Sink:MaD:9 |
+| main.go:62:12:62:19 | password | main.go:77:13:77:20 | password | provenance |  |
+| main.go:62:12:62:19 | password | main.go:77:13:77:20 | password | provenance |  |
+| main.go:62:12:62:19 | password | main.go:79:14:79:21 | password | provenance | Sink:MaD:8 |
+| main.go:62:12:62:19 | password | main.go:80:17:80:24 | password | provenance |  |
+| main.go:65:13:65:20 | password | main.go:68:11:68:18 | password | provenance |  |
+| main.go:65:13:65:20 | password | main.go:68:11:68:18 | password | provenance |  |
+| main.go:65:13:65:20 | password | main.go:71:18:71:25 | password | provenance |  |
+| main.go:65:13:65:20 | password | main.go:71:18:71:25 | password | provenance |  |
+| main.go:65:13:65:20 | password | main.go:74:12:74:19 | password | provenance |  |
+| main.go:65:13:65:20 | password | main.go:74:12:74:19 | password | provenance | Sink:MaD:9 |
+| main.go:65:13:65:20 | password | main.go:77:13:77:20 | password | provenance |  |
+| main.go:65:13:65:20 | password | main.go:77:13:77:20 | password | provenance |  |
+| main.go:65:13:65:20 | password | main.go:79:14:79:21 | password | provenance | Sink:MaD:8 |
+| main.go:65:13:65:20 | password | main.go:80:17:80:24 | password | provenance |  |
+| main.go:68:11:68:18 | password | main.go:71:18:71:25 | password | provenance |  |
+| main.go:68:11:68:18 | password | main.go:71:18:71:25 | password | provenance |  |
+| main.go:68:11:68:18 | password | main.go:74:12:74:19 | password | provenance |  |
+| main.go:68:11:68:18 | password | main.go:74:12:74:19 | password | provenance | Sink:MaD:9 |
+| main.go:68:11:68:18 | password | main.go:77:13:77:20 | password | provenance |  |
+| main.go:68:11:68:18 | password | main.go:77:13:77:20 | password | provenance |  |
+| main.go:68:11:68:18 | password | main.go:79:14:79:21 | password | provenance | Sink:MaD:8 |
+| main.go:68:11:68:18 | password | main.go:80:17:80:24 | password | provenance |  |
+| main.go:71:18:71:25 | password | main.go:74:12:74:19 | password | provenance |  |
+| main.go:71:18:71:25 | password | main.go:74:12:74:19 | password | provenance | Sink:MaD:9 |
+| main.go:71:18:71:25 | password | main.go:77:13:77:20 | password | provenance |  |
+| main.go:71:18:71:25 | password | main.go:77:13:77:20 | password | provenance |  |
+| main.go:71:18:71:25 | password | main.go:79:14:79:21 | password | provenance | Sink:MaD:8 |
+| main.go:71:18:71:25 | password | main.go:80:17:80:24 | password | provenance |  |
+| main.go:74:12:74:19 | password | main.go:77:13:77:20 | password | provenance |  |
+| main.go:74:12:74:19 | password | main.go:77:13:77:20 | password | provenance |  |
+| main.go:74:12:74:19 | password | main.go:79:14:79:21 | password | provenance | Sink:MaD:8 |
+| main.go:74:12:74:19 | password | main.go:80:17:80:24 | password | provenance |  |
+| main.go:77:13:77:20 | password | main.go:79:14:79:21 | password | provenance | Sink:MaD:8 |
+| main.go:77:13:77:20 | password | main.go:80:17:80:24 | password | provenance |  |
+| main.go:80:17:80:24 | password | main.go:82:12:82:19 | password | provenance |  |
+| main.go:80:17:80:24 | password | main.go:83:17:83:24 | password | provenance |  |
+| main.go:80:17:80:24 | password | main.go:86:19:86:26 | password | provenance |  |
+| main.go:86:2:86:7 | fields [postupdate] | main.go:87:29:87:34 | fields | provenance | Sink:MaD:2 |
+| main.go:86:19:86:26 | password | main.go:86:2:86:7 | fields [postupdate] | provenance | Config |
+| main.go:86:19:86:26 | password | main.go:90:35:90:42 | password | provenance | Sink:MaD:1 |
+| overrides.go:8:2:8:9 | definition of password | overrides.go:9:9:9:16 | password | provenance |  |
 | overrides.go:9:9:9:16 | password | overrides.go:13:14:13:23 | call to String | provenance |  |
 | passwords.go:8:12:8:12 | definition of x | passwords.go:9:14:9:14 | x | provenance |  |
+| passwords.go:21:2:21:9 | definition of password | passwords.go:25:14:25:21 | password | provenance |  |
+| passwords.go:21:2:21:9 | definition of password | passwords.go:30:8:30:15 | password | provenance |  |
+| passwords.go:21:2:21:9 | definition of password | passwords.go:32:12:32:19 | password | provenance |  |
+| passwords.go:21:2:21:9 | definition of password | passwords.go:34:28:34:35 | password | provenance |  |
 | passwords.go:30:8:30:15 | password | passwords.go:8:12:8:12 | definition of x | provenance |  |
 | passwords.go:34:28:34:35 | password | passwords.go:34:14:34:35 | ...+... | provenance | Config |
+| passwords.go:34:28:34:35 | password | passwords.go:42:6:42:13 | password | provenance |  |
 | passwords.go:36:10:38:2 | struct literal | passwords.go:39:14:39:17 | obj1 | provenance |  |
 | passwords.go:37:13:37:13 | x | passwords.go:36:10:38:2 | struct literal | provenance | Config |
 | passwords.go:41:10:43:2 | struct literal | passwords.go:44:14:44:17 | obj2 | provenance |  |
 | passwords.go:42:6:42:13 | password | passwords.go:41:10:43:2 | struct literal | provenance | Config |
-| passwords.go:46:6:46:9 | definition of obj3 | passwords.go:47:14:47:17 | obj3 | provenance |  |
-| passwords.go:48:11:48:18 | password | passwords.go:46:6:46:9 | definition of obj3 | provenance | Config |
-| passwords.go:85:19:87:2 | struct literal | passwords.go:88:14:88:26 | utilityObject | provenance |  |
-| passwords.go:86:16:86:36 | call to make | passwords.go:85:19:87:2 | struct literal | provenance | Config |
-| passwords.go:90:12:90:19 | password | passwords.go:91:23:91:28 | secret | provenance |  |
-| passwords.go:101:33:101:40 | password | passwords.go:101:15:101:40 | ...+... | provenance | Config |
-| passwords.go:107:34:107:41 | password | passwords.go:107:16:107:41 | ...+... | provenance | Config |
-| passwords.go:112:33:112:40 | password | passwords.go:112:15:112:40 | ...+... | provenance | Config |
-| passwords.go:116:28:116:36 | password1 | passwords.go:116:28:116:45 | call to String | provenance | Config |
-| passwords.go:116:28:116:45 | call to String | passwords.go:116:14:116:45 | ...+... | provenance | Config |
-| passwords.go:118:12:123:2 | struct literal | passwords.go:125:14:125:19 | config | provenance |  |
-| passwords.go:118:12:123:2 | struct literal [x] | passwords.go:126:14:126:19 | config [x] | provenance |  |
-| passwords.go:118:12:123:2 | struct literal [y] | passwords.go:127:14:127:19 | config [y] | provenance |  |
-| passwords.go:119:13:119:13 | x | passwords.go:118:12:123:2 | struct literal | provenance | Config |
-| passwords.go:121:13:121:20 | password | passwords.go:118:12:123:2 | struct literal | provenance | Config |
-| passwords.go:121:13:121:20 | password | passwords.go:118:12:123:2 | struct literal [x] | provenance |  |
-| passwords.go:122:13:122:25 | call to getPassword | passwords.go:118:12:123:2 | struct literal | provenance | Config |
-| passwords.go:122:13:122:25 | call to getPassword | passwords.go:118:12:123:2 | struct literal [y] | provenance |  |
-| passwords.go:126:14:126:19 | config [x] | passwords.go:126:14:126:21 | selection of x | provenance |  |
-| passwords.go:127:14:127:19 | config [y] | passwords.go:127:14:127:21 | selection of y | provenance |  |
-| protobuf.go:11:2:11:6 | definition of query [pointer, Description] | protobuf.go:12:2:12:6 | query [pointer, Description] | provenance |  |
-| protobuf.go:11:2:11:6 | definition of query [pointer, Description] | protobuf.go:14:14:14:18 | query [pointer, Description] | provenance |  |
-| protobuf.go:12:2:12:6 | implicit dereference [Description] | protobuf.go:11:2:11:6 | definition of query [pointer, Description] | provenance |  |
-| protobuf.go:12:2:12:6 | query [pointer, Description] | protobuf.go:12:2:12:6 | implicit dereference [Description] | provenance |  |
-| protobuf.go:12:22:12:29 | password | protobuf.go:12:2:12:6 | implicit dereference [Description] | provenance |  |
+| passwords.go:42:6:42:13 | password | passwords.go:48:11:48:18 | password | provenance |  |
+| passwords.go:48:11:48:18 | password | passwords.go:92:23:92:28 | secret | provenance |  |
+| passwords.go:48:11:48:18 | password | passwords.go:102:33:102:40 | password | provenance |  |
+| passwords.go:48:11:48:18 | password | passwords.go:108:34:108:41 | password | provenance |  |
+| passwords.go:48:11:48:18 | password | passwords.go:113:33:113:40 | password | provenance |  |
+| passwords.go:48:11:48:18 | password | passwords.go:123:13:123:20 | password | provenance |  |
+| passwords.go:50:2:50:15 | definition of fixed_password | passwords.go:51:14:51:27 | fixed_password | provenance |  |
+| passwords.go:86:19:88:2 | struct literal | passwords.go:89:14:89:26 | utilityObject | provenance |  |
+| passwords.go:87:16:87:36 | call to make | passwords.go:86:19:88:2 | struct literal | provenance | Config |
+| passwords.go:102:33:102:40 | password | passwords.go:102:15:102:40 | ...+... | provenance | Config |
+| passwords.go:102:33:102:40 | password | passwords.go:108:34:108:41 | password | provenance |  |
+| passwords.go:102:33:102:40 | password | passwords.go:113:33:113:40 | password | provenance |  |
+| passwords.go:102:33:102:40 | password | passwords.go:123:13:123:20 | password | provenance |  |
+| passwords.go:108:34:108:41 | password | passwords.go:108:16:108:41 | ...+... | provenance | Config |
+| passwords.go:108:34:108:41 | password | passwords.go:113:33:113:40 | password | provenance |  |
+| passwords.go:108:34:108:41 | password | passwords.go:123:13:123:20 | password | provenance |  |
+| passwords.go:113:33:113:40 | password | passwords.go:113:15:113:40 | ...+... | provenance | Config |
+| passwords.go:113:33:113:40 | password | passwords.go:123:13:123:20 | password | provenance |  |
+| passwords.go:116:6:116:14 | definition of password1 | passwords.go:117:28:117:36 | password1 | provenance |  |
+| passwords.go:117:28:117:36 | password1 | passwords.go:117:28:117:45 | call to String | provenance | Config |
+| passwords.go:117:28:117:45 | call to String | passwords.go:117:14:117:45 | ...+... | provenance | Config |
+| passwords.go:120:12:125:2 | struct literal | passwords.go:127:14:127:19 | config | provenance |  |
+| passwords.go:120:12:125:2 | struct literal [x] | passwords.go:128:14:128:19 | config [x] | provenance |  |
+| passwords.go:120:12:125:2 | struct literal [y] | passwords.go:129:14:129:19 | config [y] | provenance |  |
+| passwords.go:121:13:121:14 | x3 | passwords.go:120:12:125:2 | struct literal | provenance | Config |
+| passwords.go:123:13:123:20 | password | passwords.go:120:12:125:2 | struct literal | provenance | Config |
+| passwords.go:123:13:123:20 | password | passwords.go:120:12:125:2 | struct literal [x] | provenance |  |
+| passwords.go:124:13:124:25 | call to getPassword | passwords.go:120:12:125:2 | struct literal | provenance | Config |
+| passwords.go:124:13:124:25 | call to getPassword | passwords.go:120:12:125:2 | struct literal [y] | provenance |  |
+| passwords.go:128:14:128:19 | config [x] | passwords.go:128:14:128:21 | selection of x | provenance |  |
+| passwords.go:129:14:129:19 | config [y] | passwords.go:129:14:129:21 | selection of y | provenance |  |
+| protobuf.go:9:2:9:9 | definition of password | protobuf.go:12:22:12:29 | password | provenance |  |
+| protobuf.go:12:2:12:6 | implicit dereference [postupdate] [Description] | protobuf.go:12:2:12:6 | query [postupdate] [pointer, Description] | provenance |  |
+| protobuf.go:12:2:12:6 | query [postupdate] [pointer, Description] | protobuf.go:14:14:14:18 | query [pointer, Description] | provenance |  |
+| protobuf.go:12:22:12:29 | password | protobuf.go:12:2:12:6 | implicit dereference [postupdate] [Description] | provenance |  |
 | protobuf.go:14:14:14:18 | query [pointer, Description] | protobuf.go:14:14:14:35 | call to GetDescription | provenance |  |
 | protobuf.go:14:14:14:18 | query [pointer, Description] | protos/query/query.pb.go:117:7:117:7 | definition of x [pointer, Description] | provenance |  |
 | protos/query/query.pb.go:117:7:117:7 | definition of x [pointer, Description] | protos/query/query.pb.go:119:10:119:10 | x [pointer, Description] | provenance |  |
 | protos/query/query.pb.go:119:10:119:10 | implicit dereference [Description] | protos/query/query.pb.go:119:10:119:22 | selection of Description | provenance |  |
 | protos/query/query.pb.go:119:10:119:10 | x [pointer, Description] | protos/query/query.pb.go:119:10:119:10 | implicit dereference [Description] | provenance |  |
 models
-| 1 | Source: net/http; Request; true; Header; ; ; ; remote; manual |
+| 1 | Sink: group:logrus; ; false; WithField; ; ; Argument[0..1]; log-injection; manual |
+| 2 | Sink: group:logrus; ; false; WithFields; ; ; Argument[0]; log-injection; manual |
+| 3 | Sink: log; ; false; Fatalf; ; ; Argument[0..1]; log-injection; manual |
+| 4 | Sink: log; ; false; Output; ; ; Argument[1]; log-injection; manual |
+| 5 | Sink: log; ; false; Panicf; ; ; Argument[0..1]; log-injection; manual |
+| 6 | Sink: log; ; false; Printf; ; ; Argument[0..1]; log-injection; manual |
+| 7 | Sink: log; Logger; true; Fatalf; ; ; Argument[0..1]; log-injection; manual |
+| 8 | Sink: log; Logger; true; Output; ; ; Argument[1]; log-injection; manual |
+| 9 | Sink: log; Logger; true; Panicf; ; ; Argument[0..1]; log-injection; manual |
+| 10 | Sink: log; Logger; true; Printf; ; ; Argument[0..1]; log-injection; manual |
+| 11 | Source: net/http; Request; true; Header; ; ; ; remote; manual |
 nodes
 | klog.go:21:3:26:3 | range statement[1] | semmle.label | range statement[1] |
 | klog.go:21:30:21:37 | selection of Header | semmle.label | selection of Header |
@@ -108,39 +251,58 @@ nodes
 | klog.go:23:15:23:20 | header | semmle.label | header |
 | klog.go:29:13:29:20 | selection of Header | semmle.label | selection of Header |
 | klog.go:29:13:29:41 | call to Get | semmle.label | call to Get |
-| main.go:16:12:16:19 | password | semmle.label | password |
-| main.go:17:19:17:26 | password | semmle.label | password |
-| main.go:18:13:18:20 | password | semmle.label | password |
-| main.go:19:14:19:21 | password | semmle.label | password |
-| main.go:20:12:20:19 | password | semmle.label | password |
-| main.go:21:19:21:26 | password | semmle.label | password |
-| main.go:22:13:22:20 | password | semmle.label | password |
-| main.go:23:14:23:21 | password | semmle.label | password |
-| main.go:24:12:24:19 | password | semmle.label | password |
-| main.go:25:19:25:26 | password | semmle.label | password |
-| main.go:26:13:26:20 | password | semmle.label | password |
-| main.go:27:14:27:21 | password | semmle.label | password |
-| main.go:28:16:28:23 | password | semmle.label | password |
-| main.go:32:10:32:17 | password | semmle.label | password |
-| main.go:33:17:33:24 | password | semmle.label | password |
-| main.go:34:11:34:18 | password | semmle.label | password |
-| main.go:35:12:35:19 | password | semmle.label | password |
-| main.go:36:10:36:17 | password | semmle.label | password |
-| main.go:37:17:37:24 | password | semmle.label | password |
-| main.go:38:11:38:18 | password | semmle.label | password |
-| main.go:39:12:39:19 | password | semmle.label | password |
-| main.go:40:10:40:17 | password | semmle.label | password |
-| main.go:41:17:41:24 | password | semmle.label | password |
-| main.go:42:11:42:18 | password | semmle.label | password |
-| main.go:43:12:43:19 | password | semmle.label | password |
-| main.go:44:14:44:21 | password | semmle.label | password |
-| main.go:47:12:47:19 | password | semmle.label | password |
-| main.go:48:17:48:24 | password | semmle.label | password |
-| main.go:55:35:55:42 | password | semmle.label | password |
+| main.go:17:2:17:9 | definition of password | semmle.label | definition of password |
+| main.go:19:12:19:19 | password | semmle.label | password |
+| main.go:20:19:20:26 | password | semmle.label | password |
+| main.go:21:13:21:20 | password | semmle.label | password |
+| main.go:22:14:22:21 | password | semmle.label | password |
+| main.go:24:13:24:20 | password | semmle.label | password |
+| main.go:27:20:27:27 | password | semmle.label | password |
+| main.go:30:14:30:21 | password | semmle.label | password |
+| main.go:33:15:33:22 | password | semmle.label | password |
+| main.go:36:13:36:20 | password | semmle.label | password |
+| main.go:39:20:39:27 | password | semmle.label | password |
+| main.go:42:14:42:21 | password | semmle.label | password |
+| main.go:45:15:45:22 | password | semmle.label | password |
+| main.go:47:16:47:23 | password | semmle.label | password |
+| main.go:51:10:51:17 | password | semmle.label | password |
+| main.go:51:10:51:17 | password | semmle.label | password |
+| main.go:52:17:52:24 | password | semmle.label | password |
+| main.go:52:17:52:24 | password | semmle.label | password |
+| main.go:53:11:53:18 | password | semmle.label | password |
+| main.go:53:11:53:18 | password | semmle.label | password |
+| main.go:54:12:54:19 | password | semmle.label | password |
+| main.go:54:12:54:19 | password | semmle.label | password |
+| main.go:56:11:56:18 | password | semmle.label | password |
+| main.go:56:11:56:18 | password | semmle.label | password |
+| main.go:59:18:59:25 | password | semmle.label | password |
+| main.go:59:18:59:25 | password | semmle.label | password |
+| main.go:62:12:62:19 | password | semmle.label | password |
+| main.go:62:12:62:19 | password | semmle.label | password |
+| main.go:65:13:65:20 | password | semmle.label | password |
+| main.go:65:13:65:20 | password | semmle.label | password |
+| main.go:68:11:68:18 | password | semmle.label | password |
+| main.go:68:11:68:18 | password | semmle.label | password |
+| main.go:71:18:71:25 | password | semmle.label | password |
+| main.go:71:18:71:25 | password | semmle.label | password |
+| main.go:74:12:74:19 | password | semmle.label | password |
+| main.go:74:12:74:19 | password | semmle.label | password |
+| main.go:77:13:77:20 | password | semmle.label | password |
+| main.go:77:13:77:20 | password | semmle.label | password |
+| main.go:79:14:79:21 | password | semmle.label | password |
+| main.go:80:17:80:24 | password | semmle.label | password |
+| main.go:82:12:82:19 | password | semmle.label | password |
+| main.go:83:17:83:24 | password | semmle.label | password |
+| main.go:86:2:86:7 | fields [postupdate] | semmle.label | fields [postupdate] |
+| main.go:86:19:86:26 | password | semmle.label | password |
+| main.go:87:29:87:34 | fields | semmle.label | fields |
+| main.go:90:35:90:42 | password | semmle.label | password |
+| overrides.go:8:2:8:9 | definition of password | semmle.label | definition of password |
 | overrides.go:9:9:9:16 | password | semmle.label | password |
 | overrides.go:13:14:13:23 | call to String | semmle.label | call to String |
 | passwords.go:8:12:8:12 | definition of x | semmle.label | definition of x |
 | passwords.go:9:14:9:14 | x | semmle.label | x |
+| passwords.go:21:2:21:9 | definition of password | semmle.label | definition of password |
 | passwords.go:25:14:25:21 | password | semmle.label | password |
 | passwords.go:26:14:26:23 | selection of password | semmle.label | selection of password |
 | passwords.go:27:14:27:26 | call to getPassword | semmle.label | call to getPassword |
@@ -155,38 +317,37 @@ nodes
 | passwords.go:41:10:43:2 | struct literal | semmle.label | struct literal |
 | passwords.go:42:6:42:13 | password | semmle.label | password |
 | passwords.go:44:14:44:17 | obj2 | semmle.label | obj2 |
-| passwords.go:46:6:46:9 | definition of obj3 | semmle.label | definition of obj3 |
-| passwords.go:47:14:47:17 | obj3 | semmle.label | obj3 |
 | passwords.go:48:11:48:18 | password | semmle.label | password |
+| passwords.go:50:2:50:15 | definition of fixed_password | semmle.label | definition of fixed_password |
 | passwords.go:51:14:51:27 | fixed_password | semmle.label | fixed_password |
-| passwords.go:85:19:87:2 | struct literal | semmle.label | struct literal |
-| passwords.go:86:16:86:36 | call to make | semmle.label | call to make |
-| passwords.go:88:14:88:26 | utilityObject | semmle.label | utilityObject |
-| passwords.go:90:12:90:19 | password | semmle.label | password |
-| passwords.go:91:23:91:28 | secret | semmle.label | secret |
-| passwords.go:101:15:101:40 | ...+... | semmle.label | ...+... |
-| passwords.go:101:33:101:40 | password | semmle.label | password |
-| passwords.go:107:16:107:41 | ...+... | semmle.label | ...+... |
-| passwords.go:107:34:107:41 | password | semmle.label | password |
-| passwords.go:112:15:112:40 | ...+... | semmle.label | ...+... |
-| passwords.go:112:33:112:40 | password | semmle.label | password |
-| passwords.go:116:14:116:45 | ...+... | semmle.label | ...+... |
-| passwords.go:116:28:116:36 | password1 | semmle.label | password1 |
-| passwords.go:116:28:116:45 | call to String | semmle.label | call to String |
-| passwords.go:118:12:123:2 | struct literal | semmle.label | struct literal |
-| passwords.go:118:12:123:2 | struct literal [x] | semmle.label | struct literal [x] |
-| passwords.go:118:12:123:2 | struct literal [y] | semmle.label | struct literal [y] |
-| passwords.go:119:13:119:13 | x | semmle.label | x |
-| passwords.go:121:13:121:20 | password | semmle.label | password |
-| passwords.go:122:13:122:25 | call to getPassword | semmle.label | call to getPassword |
-| passwords.go:125:14:125:19 | config | semmle.label | config |
-| passwords.go:126:14:126:19 | config [x] | semmle.label | config [x] |
-| passwords.go:126:14:126:21 | selection of x | semmle.label | selection of x |
-| passwords.go:127:14:127:19 | config [y] | semmle.label | config [y] |
-| passwords.go:127:14:127:21 | selection of y | semmle.label | selection of y |
-| protobuf.go:11:2:11:6 | definition of query [pointer, Description] | semmle.label | definition of query [pointer, Description] |
-| protobuf.go:12:2:12:6 | implicit dereference [Description] | semmle.label | implicit dereference [Description] |
-| protobuf.go:12:2:12:6 | query [pointer, Description] | semmle.label | query [pointer, Description] |
+| passwords.go:86:19:88:2 | struct literal | semmle.label | struct literal |
+| passwords.go:87:16:87:36 | call to make | semmle.label | call to make |
+| passwords.go:89:14:89:26 | utilityObject | semmle.label | utilityObject |
+| passwords.go:92:23:92:28 | secret | semmle.label | secret |
+| passwords.go:102:15:102:40 | ...+... | semmle.label | ...+... |
+| passwords.go:102:33:102:40 | password | semmle.label | password |
+| passwords.go:108:16:108:41 | ...+... | semmle.label | ...+... |
+| passwords.go:108:34:108:41 | password | semmle.label | password |
+| passwords.go:113:15:113:40 | ...+... | semmle.label | ...+... |
+| passwords.go:113:33:113:40 | password | semmle.label | password |
+| passwords.go:116:6:116:14 | definition of password1 | semmle.label | definition of password1 |
+| passwords.go:117:14:117:45 | ...+... | semmle.label | ...+... |
+| passwords.go:117:28:117:36 | password1 | semmle.label | password1 |
+| passwords.go:117:28:117:45 | call to String | semmle.label | call to String |
+| passwords.go:120:12:125:2 | struct literal | semmle.label | struct literal |
+| passwords.go:120:12:125:2 | struct literal [x] | semmle.label | struct literal [x] |
+| passwords.go:120:12:125:2 | struct literal [y] | semmle.label | struct literal [y] |
+| passwords.go:121:13:121:14 | x3 | semmle.label | x3 |
+| passwords.go:123:13:123:20 | password | semmle.label | password |
+| passwords.go:124:13:124:25 | call to getPassword | semmle.label | call to getPassword |
+| passwords.go:127:14:127:19 | config | semmle.label | config |
+| passwords.go:128:14:128:19 | config [x] | semmle.label | config [x] |
+| passwords.go:128:14:128:21 | selection of x | semmle.label | selection of x |
+| passwords.go:129:14:129:19 | config [y] | semmle.label | config [y] |
+| passwords.go:129:14:129:21 | selection of y | semmle.label | selection of y |
+| protobuf.go:9:2:9:9 | definition of password | semmle.label | definition of password |
+| protobuf.go:12:2:12:6 | implicit dereference [postupdate] [Description] | semmle.label | implicit dereference [postupdate] [Description] |
+| protobuf.go:12:2:12:6 | query [postupdate] [pointer, Description] | semmle.label | query [postupdate] [pointer, Description] |
 | protobuf.go:12:22:12:29 | password | semmle.label | password |
 | protobuf.go:14:14:14:18 | query [pointer, Description] | semmle.label | query [pointer, Description] |
 | protobuf.go:14:14:14:35 | call to GetDescription | semmle.label | call to GetDescription |
diff --git a/go/ql/test/query-tests/Security/CWE-312/main.go b/go/ql/test/query-tests/Security/CWE-312/main.go
index 17a183ff209..e30a8182265 100644
--- a/go/ql/test/query-tests/Security/CWE-312/main.go
+++ b/go/ql/test/query-tests/Security/CWE-312/main.go
@@ -5,27 +5,46 @@ package main
 
 import (
 	"log"
+	"math/rand"
 
 	"github.com/golang/glog"
 	"github.com/sirupsen/logrus"
 )
 
+var i int = rand.Int()
+
 func main() {
-	password := "P4ssw0rd"
+	password := "P4ssw0rd" // $ Source
 
 	log.Print(password)        // $ Alert
 	log.Printf("%s", password) // $ Alert
 	log.Printf(password, "")   // $ Alert
 	log.Println(password)      // $ Alert
-	log.Fatal(password)        // $ Alert
-	log.Fatalf("%s", password) // $ Alert
-	log.Fatalf(password, "")   // $ Alert
-	log.Fatalln(password)      // $ Alert
-	log.Panic(password)        // $ Alert
-	log.Panicf("%s", password) // $ Alert
-	log.Panicf(password, "")   // $ Alert
-	log.Panicln(password)      // $ Alert
-	log.Output(0, password)    // $ Alert
+	if i == 0 {
+		log.Fatal(password) // $ Alert
+	}
+	if i == 1 {
+		log.Fatalf("%s", password) // $ Alert
+	}
+	if i == 2 {
+		log.Fatalf(password, "") // $ Alert
+	}
+	if i == 3 {
+		log.Fatalln(password) // $ Alert
+	}
+	if i == 4 {
+		log.Panic(password) // $ Alert
+	}
+	if i == 5 {
+		log.Panicf("%s", password) // $ Alert
+	}
+	if i == 6 {
+		log.Panicf(password, "") // $ Alert
+	}
+	if i == 7 {
+		log.Panicln(password) // $ Alert
+	}
+	log.Output(0, password) // $ Alert
 	log.Printf("%T", password)
 
 	l := log.Default()
@@ -33,15 +52,31 @@ func main() {
 	l.Printf("%s", password) // $ Alert
 	l.Printf(password, "")   // $ Alert
 	l.Println(password)      // $ Alert
-	l.Fatal(password)        // $ Alert
-	l.Fatalf("%s", password) // $ Alert
-	l.Fatalf(password, "")   // $ Alert
-	l.Fatalln(password)      // $ Alert
-	l.Panic(password)        // $ Alert
-	l.Panicf("%s", password) // $ Alert
-	l.Panicf(password, "")   // $ Alert
-	l.Panicln(password)      // $ Alert
-	l.Output(0, password)    // $ Alert
+	if i == 100 {
+		l.Fatal(password) // $ Alert
+	}
+	if i == 101 {
+		l.Fatalf("%s", password) // $ Alert
+	}
+	if i == 102 {
+		l.Fatalf(password, "") // $ Alert
+	}
+	if i == 103 {
+		l.Fatalln(password) // $ Alert
+	}
+	if i == 104 {
+		l.Panic(password) // $ Alert
+	}
+	if i == 105 {
+		l.Panicf("%s", password) // $ Alert
+	}
+	if i == 106 {
+		l.Panicf(password, "") // $ Alert
+	}
+	if i == 107 {
+		l.Panicln(password) // $ Alert
+	}
+	l.Output(0, password) // $ Alert
 	l.Printf("%T", password)
 
 	glog.Info(password)      // $ Alert
@@ -49,7 +84,7 @@ func main() {
 
 	fields := make(logrus.Fields)
 	fields["pass"] = password
-	entry := logrus.WithFields(fields)
+	entry := logrus.WithFields(fields) // $ Alert
 	entry.Errorf("")
 
 	entry = logrus.WithField("pass", password) // $ Alert
diff --git a/go/ql/test/query-tests/Security/CWE-312/overrides.go b/go/ql/test/query-tests/Security/CWE-312/overrides.go
index 98fbdad9e77..4ac9401d2c0 100644
--- a/go/ql/test/query-tests/Security/CWE-312/overrides.go
+++ b/go/ql/test/query-tests/Security/CWE-312/overrides.go
@@ -5,8 +5,8 @@ import "fmt"
 type s struct{}
 
 func (_ s) String() string {
-	password := "horsebatterystaplecorrect"
-	return password // $ Source
+	password := "horsebatterystaplecorrect" // $ Source
+	return password
 }
 
 func overrideTest(x s, y fmt.Stringer) {
diff --git a/go/ql/test/query-tests/Security/CWE-312/passwords.go b/go/ql/test/query-tests/Security/CWE-312/passwords.go
index f99178f0fae..38c977e41b8 100644
--- a/go/ql/test/query-tests/Security/CWE-312/passwords.go
+++ b/go/ql/test/query-tests/Security/CWE-312/passwords.go
@@ -18,7 +18,7 @@ func redact(kind, value string) string {
 
 func test() {
 	name := "user"
-	password := "P@ssw0rd"
+	password := "P@ssw0rd" // $ Source
 	x := "horsebatterystapleincorrect"
 	var o passStruct
 
@@ -27,7 +27,7 @@ func test() {
 	log.Println(getPassword())   // $ Alert
 	log.Println(o.getPassword()) // $ Alert
 
-	myLog(password) // $ Source
+	myLog(password)
 
 	log.Panic(password) // $ Alert
 
@@ -39,16 +39,16 @@ func test() {
 	log.Println(obj1) // $ Alert
 
 	obj2 := xStruct{
-		x: password, // $ Source
+		x: password,
 	}
 	log.Println(obj2) // $ Alert
 
 	var obj3 xStruct
-	log.Println(obj3) // $ SPURIOUS: Alert // caught because of the below line and def-use flow
-	obj3.x = password // $ Source
+	log.Println(obj3)
+	obj3.x = password
 
-	fixed_password := "cowbatterystaplecorrect"
-	log.Println(fixed_password) // $ Alert // Probably OK
+	fixed_password := "cowbatterystaplecorrect" // $ Source
+	log.Println(fixed_password)                 // $ Alert // Probably OK
 
 	log.Println(IncorrectPasswordError) // OK
 
@@ -65,7 +65,8 @@ func test() {
 	log.Println(actually_secure_password)        // OK
 
 	var user1 cryptedStruct
-	user1.cryptedPassword = x
+	x2 := "perhaps sensitive"
+	user1.cryptedPassword = x2
 	log.Println(user1) // OK
 
 	var user2 passStruct
@@ -87,7 +88,7 @@ func test() {
 	}
 	log.Println(utilityObject) // $ Alert
 
-	secret := password           // $ Source
+	secret := password
 	log.Printf("pw: %s", secret) // $ Alert
 
 	log.Println("Password is: " + redact("password", password))
@@ -112,13 +113,14 @@ func test() {
 		log.Println("Password is: " + password) // $ SPURIOUS: Alert
 	}
 
-	var password1 stringable = stringable{"arstneio"}
-	log.Println(name + ", " + password1.String()) // $ Alert
+	var password1 stringable = stringable{"arstneio"} // $ Source
+	log.Println(name + ", " + password1.String())     // $ Alert
 
+	x3 := "sheepbatterystaplecorrect"
 	config := Config{
-		password: x, // $ Source
+		password: x3, // $ Source
 		hostname: "tarski",
-		x:        password,      // $ Source
+		x:        password,
 		y:        getPassword(), // $ Source
 	}
 	log.Println(config.hostname) // OK
diff --git a/go/ql/test/query-tests/Security/CWE-312/protobuf.go b/go/ql/test/query-tests/Security/CWE-312/protobuf.go
index a995f0d7cb8..3609410e2b0 100644
--- a/go/ql/test/query-tests/Security/CWE-312/protobuf.go
+++ b/go/ql/test/query-tests/Security/CWE-312/protobuf.go
@@ -6,10 +6,10 @@ import (
 )
 
 func testProtobuf() {
-	password := "P@ssw0rd"
+	password := "P@ssw0rd" // $ Source
 
 	query := &query.Query{}
-	query.Description = password // $ Source
+	query.Description = password
 
 	log.Println(query.GetDescription()) // $ Alert
 	log.Println(query.GetId())          // OK
diff --git a/go/ql/test/query-tests/Security/CWE-338/InsecureRandomness/InsecureRandomness.expected b/go/ql/test/query-tests/Security/CWE-338/InsecureRandomness/InsecureRandomness.expected
index b2659fffde7..ef5f3a1f7b9 100644
--- a/go/ql/test/query-tests/Security/CWE-338/InsecureRandomness/InsecureRandomness.expected
+++ b/go/ql/test/query-tests/Security/CWE-338/InsecureRandomness/InsecureRandomness.expected
@@ -1,8 +1,7 @@
 #select
 | InsecureRandomness.go:12:18:12:40 | call to Intn | InsecureRandomness.go:12:18:12:40 | call to Intn | InsecureRandomness.go:12:18:12:40 | call to Intn | A password-related function depends on a $@ generated with a cryptographically weak RNG. | InsecureRandomness.go:12:18:12:40 | call to Intn | random number |
 | sample.go:26:25:26:30 | call to Guid | sample.go:15:49:15:61 | call to Uint32 | sample.go:26:25:26:30 | call to Guid | This cryptographic algorithm depends on a $@ generated with a cryptographically weak RNG. | sample.go:15:49:15:61 | call to Uint32 | random number |
-| sample.go:37:25:37:29 | nonce | sample.go:34:12:34:40 | call to New | sample.go:37:25:37:29 | nonce | This cryptographic algorithm depends on a $@ generated with a cryptographically weak RNG. | sample.go:34:12:34:40 | call to New | random number |
-| sample.go:37:32:37:36 | nonce | sample.go:34:12:34:40 | call to New | sample.go:37:32:37:36 | nonce | This cryptographic algorithm depends on a $@ generated with a cryptographically weak RNG. | sample.go:34:12:34:40 | call to New | random number |
+| sample.go:37:35:37:39 | nonce | sample.go:34:12:34:40 | call to New | sample.go:37:35:37:39 | nonce | This cryptographic algorithm depends on a $@ generated with a cryptographically weak RNG. | sample.go:34:12:34:40 | call to New | random number |
 | sample.go:43:17:43:39 | call to Intn | sample.go:43:17:43:39 | call to Intn | sample.go:43:17:43:39 | call to Intn | A password-related function depends on a $@ generated with a cryptographically weak RNG. | sample.go:43:17:43:39 | call to Intn | random number |
 | sample.go:58:32:58:43 | type conversion | sample.go:55:17:55:42 | call to Intn | sample.go:58:32:58:43 | type conversion | This cryptographic algorithm depends on a $@ generated with a cryptographically weak RNG. | sample.go:55:17:55:42 | call to Intn | random number |
 edges
@@ -13,10 +12,9 @@ edges
 | sample.go:15:49:15:61 | call to Uint32 | sample.go:15:31:15:62 | []type{args} [array] | provenance |  |
 | sample.go:15:49:15:61 | call to Uint32 | sample.go:15:31:15:62 | call to Sprintf | provenance | FunctionModel |
 | sample.go:16:9:16:15 | slice expression | sample.go:26:25:26:30 | call to Guid | provenance |  |
-| sample.go:33:2:33:6 | definition of nonce | sample.go:37:25:37:29 | nonce | provenance |  |
-| sample.go:33:2:33:6 | definition of nonce | sample.go:37:32:37:36 | nonce | provenance |  |
 | sample.go:34:12:34:40 | call to New | sample.go:35:14:35:19 | random | provenance |  |
-| sample.go:35:14:35:19 | random | sample.go:33:2:33:6 | definition of nonce | provenance | MaD:2 |
+| sample.go:35:14:35:19 | random | sample.go:35:22:35:26 | nonce [postupdate] | provenance | MaD:2 |
+| sample.go:35:22:35:26 | nonce [postupdate] | sample.go:37:35:37:39 | nonce | provenance |  |
 | sample.go:55:17:55:42 | call to Intn | sample.go:56:29:56:38 | randNumber | provenance |  |
 | sample.go:56:11:56:40 | type conversion | sample.go:58:32:58:43 | type conversion | provenance |  |
 | sample.go:56:18:56:39 | index expression | sample.go:56:11:56:40 | type conversion | provenance |  |
@@ -33,11 +31,10 @@ nodes
 | sample.go:15:49:15:61 | call to Uint32 | semmle.label | call to Uint32 |
 | sample.go:16:9:16:15 | slice expression | semmle.label | slice expression |
 | sample.go:26:25:26:30 | call to Guid | semmle.label | call to Guid |
-| sample.go:33:2:33:6 | definition of nonce | semmle.label | definition of nonce |
 | sample.go:34:12:34:40 | call to New | semmle.label | call to New |
 | sample.go:35:14:35:19 | random | semmle.label | random |
-| sample.go:37:25:37:29 | nonce | semmle.label | nonce |
-| sample.go:37:32:37:36 | nonce | semmle.label | nonce |
+| sample.go:35:22:35:26 | nonce [postupdate] | semmle.label | nonce [postupdate] |
+| sample.go:37:35:37:39 | nonce | semmle.label | nonce |
 | sample.go:43:17:43:39 | call to Intn | semmle.label | call to Intn |
 | sample.go:44:17:44:39 | call to Intn | semmle.label | call to Intn |
 | sample.go:45:17:45:39 | call to Intn | semmle.label | call to Intn |
diff --git a/go/ql/test/query-tests/Security/CWE-338/InsecureRandomness/sample.go b/go/ql/test/query-tests/Security/CWE-338/InsecureRandomness/sample.go
index df703ff0dfa..9eef81f63bb 100644
--- a/go/ql/test/query-tests/Security/CWE-338/InsecureRandomness/sample.go
+++ b/go/ql/test/query-tests/Security/CWE-338/InsecureRandomness/sample.go
@@ -34,7 +34,7 @@ func encrypt(data []byte, password string) []byte {
 	random := rand.New(rand.NewSource(999))
 	io.ReadFull(random, nonce)
 
-	ciphertext := gcm.Seal(nonce, nonce, data, nil) // BAD: use of an insecure rng to generate a nonce
+	ciphertext := gcm.Seal(data[:0], nonce, data, nil) // BAD: use of an insecure rng to generate a nonce
 	return ciphertext
 }
 
diff --git a/go/ql/test/query-tests/Security/CWE-601/OpenUrlRedirect/OpenUrlRedirect.expected b/go/ql/test/query-tests/Security/CWE-601/OpenUrlRedirect/OpenUrlRedirect.expected
index f8d193348ba..d9f24369ca2 100644
--- a/go/ql/test/query-tests/Security/CWE-601/OpenUrlRedirect/OpenUrlRedirect.expected
+++ b/go/ql/test/query-tests/Security/CWE-601/OpenUrlRedirect/OpenUrlRedirect.expected
@@ -2,69 +2,93 @@
 | OpenUrlRedirect.go:10:23:10:42 | call to Get | OpenUrlRedirect.go:10:23:10:28 | selection of Form | OpenUrlRedirect.go:10:23:10:42 | call to Get | This path to an untrusted URL redirection depends on a $@. | OpenUrlRedirect.go:10:23:10:28 | selection of Form | user-provided value |
 | stdlib.go:15:30:15:35 | target | stdlib.go:13:13:13:18 | selection of Form | stdlib.go:15:30:15:35 | target | This path to an untrusted URL redirection depends on a $@. | stdlib.go:13:13:13:18 | selection of Form | user-provided value |
 | stdlib.go:24:30:24:35 | target | stdlib.go:22:13:22:18 | selection of Form | stdlib.go:24:30:24:35 | target | This path to an untrusted URL redirection depends on a $@. | stdlib.go:22:13:22:18 | selection of Form | user-provided value |
-| stdlib.go:35:30:35:39 | ...+... | stdlib.go:31:13:31:18 | selection of Form | stdlib.go:35:30:35:39 | ...+... | This path to an untrusted URL redirection depends on a $@. | stdlib.go:31:13:31:18 | selection of Form | user-provided value |
-| stdlib.go:46:23:46:28 | target | stdlib.go:44:13:44:18 | selection of Form | stdlib.go:46:23:46:28 | target | This path to an untrusted URL redirection depends on a $@. | stdlib.go:44:13:44:18 | selection of Form | user-provided value |
-| stdlib.go:67:23:67:40 | ...+... | stdlib.go:64:13:64:18 | selection of Form | stdlib.go:67:23:67:40 | ...+... | This path to an untrusted URL redirection depends on a $@. | stdlib.go:64:13:64:18 | selection of Form | user-provided value |
-| stdlib.go:92:23:92:28 | target | stdlib.go:89:13:89:18 | selection of Form | stdlib.go:92:23:92:28 | target | This path to an untrusted URL redirection depends on a $@. | stdlib.go:89:13:89:18 | selection of Form | user-provided value |
-| stdlib.go:152:23:152:28 | target | stdlib.go:146:13:146:18 | selection of Form | stdlib.go:152:23:152:28 | target | This path to an untrusted URL redirection depends on a $@. | stdlib.go:146:13:146:18 | selection of Form | user-provided value |
-| stdlib.go:184:23:184:28 | target | stdlib.go:182:13:182:33 | call to FormValue | stdlib.go:184:23:184:28 | target | This path to an untrusted URL redirection depends on a $@. | stdlib.go:182:13:182:33 | call to FormValue | user-provided value |
-| stdlib.go:192:23:192:33 | selection of Path | stdlib.go:190:36:190:56 | call to FormValue | stdlib.go:192:23:192:33 | selection of Path | This path to an untrusted URL redirection depends on a $@. | stdlib.go:190:36:190:56 | call to FormValue | user-provided value |
-| stdlib.go:194:23:194:42 | call to EscapedPath | stdlib.go:190:36:190:56 | call to FormValue | stdlib.go:194:23:194:42 | call to EscapedPath | This path to an untrusted URL redirection depends on a $@. | stdlib.go:190:36:190:56 | call to FormValue | user-provided value |
+| stdlib.go:39:30:39:40 | ...+... | stdlib.go:33:13:33:18 | selection of Form | stdlib.go:39:30:39:40 | ...+... | This path to an untrusted URL redirection depends on a $@. | stdlib.go:33:13:33:18 | selection of Form | user-provided value |
+| stdlib.go:50:23:50:28 | target | stdlib.go:48:13:48:18 | selection of Form | stdlib.go:50:23:50:28 | target | This path to an untrusted URL redirection depends on a $@. | stdlib.go:48:13:48:18 | selection of Form | user-provided value |
+| stdlib.go:71:23:71:40 | ...+... | stdlib.go:68:13:68:18 | selection of Form | stdlib.go:71:23:71:40 | ...+... | This path to an untrusted URL redirection depends on a $@. | stdlib.go:68:13:68:18 | selection of Form | user-provided value |
+| stdlib.go:96:23:96:28 | target | stdlib.go:93:13:93:18 | selection of Form | stdlib.go:96:23:96:28 | target | This path to an untrusted URL redirection depends on a $@. | stdlib.go:93:13:93:18 | selection of Form | user-provided value |
+| stdlib.go:156:23:156:28 | target | stdlib.go:150:13:150:18 | selection of Form | stdlib.go:156:23:156:28 | target | This path to an untrusted URL redirection depends on a $@. | stdlib.go:150:13:150:18 | selection of Form | user-provided value |
+| stdlib.go:188:23:188:28 | target | stdlib.go:186:13:186:33 | call to FormValue | stdlib.go:188:23:188:28 | target | This path to an untrusted URL redirection depends on a $@. | stdlib.go:186:13:186:33 | call to FormValue | user-provided value |
+| stdlib.go:196:23:196:33 | selection of Path | stdlib.go:194:36:194:56 | call to FormValue | stdlib.go:196:23:196:33 | selection of Path | This path to an untrusted URL redirection depends on a $@. | stdlib.go:194:36:194:56 | call to FormValue | user-provided value |
+| stdlib.go:198:23:198:42 | call to EscapedPath | stdlib.go:194:36:194:56 | call to FormValue | stdlib.go:198:23:198:42 | call to EscapedPath | This path to an untrusted URL redirection depends on a $@. | stdlib.go:194:36:194:56 | call to FormValue | user-provided value |
+| stdlib.go:212:23:212:28 | selection of Path | stdlib.go:210:12:210:30 | call to FormValue | stdlib.go:212:23:212:28 | selection of Path | This path to an untrusted URL redirection depends on a $@. | stdlib.go:210:12:210:30 | call to FormValue | user-provided value |
+| stdlib.go:214:23:214:32 | call to String | stdlib.go:210:12:210:30 | call to FormValue | stdlib.go:214:23:214:32 | call to String | This path to an untrusted URL redirection depends on a $@. | stdlib.go:210:12:210:30 | call to FormValue | user-provided value |
+| stdlib.go:261:23:261:32 | call to String | stdlib.go:257:12:257:30 | call to FormValue | stdlib.go:261:23:261:32 | call to String | This path to an untrusted URL redirection depends on a $@. | stdlib.go:257:12:257:30 | call to FormValue | user-provided value |
 edges
 | OpenUrlRedirect.go:10:23:10:28 | selection of Form | OpenUrlRedirect.go:10:23:10:42 | call to Get | provenance | Src:MaD:2 Config Sink:MaD:1 |
 | stdlib.go:13:13:13:18 | selection of Form | stdlib.go:13:13:13:32 | call to Get | provenance | Src:MaD:2 Config |
 | stdlib.go:13:13:13:32 | call to Get | stdlib.go:15:30:15:35 | target | provenance |  |
 | stdlib.go:22:13:22:18 | selection of Form | stdlib.go:22:13:22:32 | call to Get | provenance | Src:MaD:2 Config |
 | stdlib.go:22:13:22:32 | call to Get | stdlib.go:24:30:24:35 | target | provenance |  |
-| stdlib.go:31:13:31:18 | selection of Form | stdlib.go:31:13:31:32 | call to Get | provenance | Src:MaD:2 Config |
-| stdlib.go:31:13:31:32 | call to Get | stdlib.go:35:34:35:39 | target | provenance |  |
-| stdlib.go:35:34:35:39 | target | stdlib.go:35:30:35:39 | ...+... | provenance | Config |
-| stdlib.go:44:13:44:18 | selection of Form | stdlib.go:44:13:44:32 | call to Get | provenance | Src:MaD:2 Config |
-| stdlib.go:44:13:44:32 | call to Get | stdlib.go:46:23:46:28 | target | provenance | Sink:MaD:1 |
-| stdlib.go:64:13:64:18 | selection of Form | stdlib.go:64:13:64:32 | call to Get | provenance | Src:MaD:2 Config |
-| stdlib.go:64:13:64:32 | call to Get | stdlib.go:67:23:67:28 | target | provenance |  |
-| stdlib.go:67:23:67:28 | target | stdlib.go:67:23:67:37 | ...+... | provenance | Config |
-| stdlib.go:67:23:67:37 | ...+... | stdlib.go:67:23:67:40 | ...+... | provenance | Config Sink:MaD:1 |
-| stdlib.go:89:13:89:18 | selection of Form | stdlib.go:89:13:89:32 | call to Get | provenance | Src:MaD:2 Config |
-| stdlib.go:89:13:89:32 | call to Get | stdlib.go:90:3:90:8 | target | provenance |  |
-| stdlib.go:90:3:90:8 | target | stdlib.go:90:3:90:25 | ... += ... | provenance | Config |
-| stdlib.go:90:3:90:25 | ... += ... | stdlib.go:92:23:92:28 | target | provenance | Sink:MaD:1 |
-| stdlib.go:107:54:107:54 | definition of r [pointer, URL, pointer] | stdlib.go:112:4:112:4 | r [pointer, URL, pointer] | provenance |  |
-| stdlib.go:107:54:107:54 | definition of r [pointer, URL] | stdlib.go:112:4:112:4 | r [pointer, URL] | provenance |  |
-| stdlib.go:107:54:107:54 | definition of r [pointer, URL] | stdlib.go:113:24:113:24 | r [pointer, URL] | provenance |  |
-| stdlib.go:112:4:112:4 | implicit dereference [URL, pointer] | stdlib.go:107:54:107:54 | definition of r [pointer, URL, pointer] | provenance |  |
-| stdlib.go:112:4:112:4 | implicit dereference [URL, pointer] | stdlib.go:112:4:112:8 | selection of URL [pointer] | provenance |  |
-| stdlib.go:112:4:112:4 | implicit dereference [URL] | stdlib.go:107:54:107:54 | definition of r [pointer, URL] | provenance |  |
-| stdlib.go:112:4:112:4 | implicit dereference [URL] | stdlib.go:112:4:112:8 | selection of URL | provenance |  |
-| stdlib.go:112:4:112:4 | r [pointer, URL, pointer] | stdlib.go:112:4:112:4 | implicit dereference [URL, pointer] | provenance |  |
-| stdlib.go:112:4:112:4 | r [pointer, URL] | stdlib.go:112:4:112:4 | implicit dereference [URL] | provenance |  |
-| stdlib.go:112:4:112:8 | implicit dereference | stdlib.go:112:4:112:8 | selection of URL | provenance | Config |
-| stdlib.go:112:4:112:8 | implicit dereference | stdlib.go:112:4:112:8 | selection of URL [pointer] | provenance |  |
-| stdlib.go:112:4:112:8 | selection of URL | stdlib.go:112:4:112:4 | implicit dereference [URL] | provenance | Src:MaD:4  |
-| stdlib.go:112:4:112:8 | selection of URL | stdlib.go:112:4:112:8 | implicit dereference | provenance | Src:MaD:4 Config |
-| stdlib.go:112:4:112:8 | selection of URL [pointer] | stdlib.go:112:4:112:4 | implicit dereference [URL, pointer] | provenance |  |
-| stdlib.go:112:4:112:8 | selection of URL [pointer] | stdlib.go:112:4:112:8 | implicit dereference | provenance |  |
-| stdlib.go:113:24:113:24 | implicit dereference [URL] | stdlib.go:113:24:113:28 | selection of URL | provenance |  |
-| stdlib.go:113:24:113:24 | r [pointer, URL] | stdlib.go:113:24:113:24 | implicit dereference [URL] | provenance |  |
-| stdlib.go:113:24:113:28 | selection of URL | stdlib.go:113:24:113:37 | call to String | provenance | Src:MaD:4 Config Sink:MaD:1 |
-| stdlib.go:146:13:146:18 | selection of Form | stdlib.go:146:13:146:32 | call to Get | provenance | Src:MaD:2 Config |
-| stdlib.go:146:13:146:32 | call to Get | stdlib.go:152:23:152:28 | target | provenance | Sink:MaD:1 |
-| stdlib.go:159:10:159:15 | star expression | stdlib.go:159:11:159:15 | selection of URL | provenance | Config |
-| stdlib.go:159:10:159:15 | star expression | stdlib.go:162:24:162:26 | url | provenance |  |
-| stdlib.go:159:11:159:15 | selection of URL | stdlib.go:159:10:159:15 | star expression | provenance | Src:MaD:4 Config |
-| stdlib.go:162:24:162:26 | url | stdlib.go:162:24:162:35 | call to String | provenance | Config Sink:MaD:1 |
-| stdlib.go:173:35:173:39 | selection of URL | stdlib.go:173:35:173:52 | call to RequestURI | provenance | Src:MaD:4 Config |
-| stdlib.go:173:35:173:52 | call to RequestURI | stdlib.go:173:24:173:52 | ...+... | provenance | Config Sink:MaD:1 |
-| stdlib.go:182:13:182:33 | call to FormValue | stdlib.go:184:23:184:28 | target | provenance | Src:MaD:3 Sink:MaD:1 |
-| stdlib.go:190:3:190:8 | definition of target | stdlib.go:192:23:192:28 | target | provenance |  |
-| stdlib.go:190:3:190:8 | definition of target | stdlib.go:194:23:194:28 | target | provenance |  |
-| stdlib.go:190:3:190:57 | ... := ...[0] | stdlib.go:190:3:190:8 | definition of target | provenance |  |
-| stdlib.go:190:36:190:56 | call to FormValue | stdlib.go:190:3:190:57 | ... := ...[0] | provenance | Src:MaD:3 Config |
-| stdlib.go:192:23:192:28 | implicit dereference | stdlib.go:190:3:190:8 | definition of target | provenance | Config |
-| stdlib.go:192:23:192:28 | implicit dereference | stdlib.go:192:23:192:33 | selection of Path | provenance | Config Sink:MaD:1 |
-| stdlib.go:192:23:192:28 | target | stdlib.go:192:23:192:28 | implicit dereference | provenance | Config |
-| stdlib.go:192:23:192:28 | target | stdlib.go:192:23:192:33 | selection of Path | provenance | Config Sink:MaD:1 |
-| stdlib.go:194:23:194:28 | target | stdlib.go:194:23:194:42 | call to EscapedPath | provenance | Config Sink:MaD:1 |
+| stdlib.go:33:13:33:18 | selection of Form | stdlib.go:33:13:33:32 | call to Get | provenance | Src:MaD:2 Config |
+| stdlib.go:33:13:33:32 | call to Get | stdlib.go:39:34:39:40 | target2 | provenance |  |
+| stdlib.go:39:34:39:40 | target2 | stdlib.go:39:30:39:40 | ...+... | provenance | Config |
+| stdlib.go:48:13:48:18 | selection of Form | stdlib.go:48:13:48:32 | call to Get | provenance | Src:MaD:2 Config |
+| stdlib.go:48:13:48:32 | call to Get | stdlib.go:50:23:50:28 | target | provenance | Sink:MaD:1 |
+| stdlib.go:68:13:68:18 | selection of Form | stdlib.go:68:13:68:32 | call to Get | provenance | Src:MaD:2 Config |
+| stdlib.go:68:13:68:32 | call to Get | stdlib.go:71:23:71:28 | target | provenance |  |
+| stdlib.go:71:23:71:28 | target | stdlib.go:71:23:71:37 | ...+... | provenance | Config |
+| stdlib.go:71:23:71:37 | ...+... | stdlib.go:71:23:71:40 | ...+... | provenance | Config Sink:MaD:1 |
+| stdlib.go:93:13:93:18 | selection of Form | stdlib.go:93:13:93:32 | call to Get | provenance | Src:MaD:2 Config |
+| stdlib.go:93:13:93:32 | call to Get | stdlib.go:94:3:94:8 | target | provenance |  |
+| stdlib.go:94:3:94:8 | target | stdlib.go:94:3:94:25 | ... += ... | provenance | Config |
+| stdlib.go:94:3:94:25 | ... += ... | stdlib.go:96:23:96:28 | target | provenance | Sink:MaD:1 |
+| stdlib.go:116:4:116:4 | implicit dereference [postupdate] [URL] | stdlib.go:116:4:116:4 | r [postupdate] [pointer, URL] | provenance |  |
+| stdlib.go:116:4:116:4 | r [postupdate] [pointer, URL] | stdlib.go:117:24:117:24 | r [pointer, URL] | provenance |  |
+| stdlib.go:116:4:116:8 | implicit dereference | stdlib.go:116:4:116:8 | selection of URL [postupdate] | provenance | Config |
+| stdlib.go:116:4:116:8 | selection of URL | stdlib.go:116:4:116:8 | implicit dereference | provenance | Src:MaD:4 Config |
+| stdlib.go:116:4:116:8 | selection of URL [postupdate] | stdlib.go:116:4:116:4 | implicit dereference [postupdate] [URL] | provenance |  |
+| stdlib.go:116:4:116:8 | selection of URL [postupdate] | stdlib.go:116:4:116:8 | implicit dereference | provenance | Config |
+| stdlib.go:117:24:117:24 | implicit dereference [URL] | stdlib.go:117:24:117:28 | selection of URL | provenance |  |
+| stdlib.go:117:24:117:24 | r [pointer, URL] | stdlib.go:117:24:117:24 | implicit dereference [URL] | provenance |  |
+| stdlib.go:117:24:117:28 | selection of URL | stdlib.go:117:24:117:37 | call to String | provenance | Src:MaD:4 Config Sink:MaD:1 |
+| stdlib.go:150:13:150:18 | selection of Form | stdlib.go:150:13:150:32 | call to Get | provenance | Src:MaD:2 Config |
+| stdlib.go:150:13:150:32 | call to Get | stdlib.go:156:23:156:28 | target | provenance | Sink:MaD:1 |
+| stdlib.go:163:10:163:15 | star expression | stdlib.go:163:11:163:15 | selection of URL [postupdate] | provenance | Config |
+| stdlib.go:163:10:163:15 | star expression | stdlib.go:166:24:166:26 | url | provenance |  |
+| stdlib.go:163:11:163:15 | selection of URL | stdlib.go:163:10:163:15 | star expression | provenance | Src:MaD:4 Config |
+| stdlib.go:163:11:163:15 | selection of URL [postupdate] | stdlib.go:163:10:163:15 | star expression | provenance | Config |
+| stdlib.go:166:24:166:26 | url | stdlib.go:166:24:166:35 | call to String | provenance | Config Sink:MaD:1 |
+| stdlib.go:177:35:177:39 | selection of URL | stdlib.go:177:35:177:52 | call to RequestURI | provenance | Src:MaD:4 Config |
+| stdlib.go:177:35:177:52 | call to RequestURI | stdlib.go:177:24:177:52 | ...+... | provenance | Config Sink:MaD:1 |
+| stdlib.go:186:13:186:33 | call to FormValue | stdlib.go:188:23:188:28 | target | provenance | Src:MaD:3 Sink:MaD:1 |
+| stdlib.go:194:3:194:57 | ... := ...[0] | stdlib.go:196:23:196:28 | target | provenance |  |
+| stdlib.go:194:36:194:56 | call to FormValue | stdlib.go:194:3:194:57 | ... := ...[0] | provenance | Src:MaD:3 Config |
+| stdlib.go:196:23:196:28 | implicit dereference | stdlib.go:196:23:196:28 | target [postupdate] | provenance | Config |
+| stdlib.go:196:23:196:28 | implicit dereference | stdlib.go:196:23:196:33 | selection of Path | provenance | Config Sink:MaD:1 |
+| stdlib.go:196:23:196:28 | target | stdlib.go:196:23:196:28 | implicit dereference | provenance | Config |
+| stdlib.go:196:23:196:28 | target | stdlib.go:196:23:196:33 | selection of Path | provenance | Config Sink:MaD:1 |
+| stdlib.go:196:23:196:28 | target | stdlib.go:198:23:198:28 | target | provenance |  |
+| stdlib.go:196:23:196:28 | target [postupdate] | stdlib.go:196:23:196:28 | implicit dereference | provenance | Config |
+| stdlib.go:196:23:196:28 | target [postupdate] | stdlib.go:198:23:198:28 | target | provenance |  |
+| stdlib.go:198:23:198:28 | target | stdlib.go:198:23:198:42 | call to EscapedPath | provenance | Config Sink:MaD:1 |
+| stdlib.go:210:3:210:3 | implicit dereference [postupdate] | stdlib.go:210:3:210:3 | u [postupdate] | provenance | Config |
+| stdlib.go:210:3:210:3 | implicit dereference [postupdate] | stdlib.go:210:3:210:3 | u [postupdate] [pointer] | provenance |  |
+| stdlib.go:210:3:210:3 | u [postupdate] | stdlib.go:212:23:212:23 | u | provenance |  |
+| stdlib.go:210:3:210:3 | u [postupdate] [pointer] | stdlib.go:212:23:212:23 | u [pointer] | provenance |  |
+| stdlib.go:210:12:210:30 | call to FormValue | stdlib.go:210:3:210:3 | implicit dereference [postupdate] | provenance | Src:MaD:3 Config |
+| stdlib.go:210:12:210:30 | call to FormValue | stdlib.go:210:3:210:3 | u [postupdate] | provenance | Src:MaD:3 Config |
+| stdlib.go:212:23:212:23 | implicit dereference | stdlib.go:212:23:212:23 | u [postupdate] | provenance | Config |
+| stdlib.go:212:23:212:23 | implicit dereference | stdlib.go:212:23:212:28 | selection of Path | provenance | Config Sink:MaD:1 |
+| stdlib.go:212:23:212:23 | u | stdlib.go:212:23:212:23 | implicit dereference | provenance | Config |
+| stdlib.go:212:23:212:23 | u | stdlib.go:212:23:212:28 | selection of Path | provenance | Config Sink:MaD:1 |
+| stdlib.go:212:23:212:23 | u | stdlib.go:214:23:214:23 | u | provenance |  |
+| stdlib.go:212:23:212:23 | u [pointer] | stdlib.go:212:23:212:23 | implicit dereference | provenance |  |
+| stdlib.go:212:23:212:23 | u [postupdate] | stdlib.go:212:23:212:23 | implicit dereference | provenance | Config |
+| stdlib.go:212:23:212:23 | u [postupdate] | stdlib.go:214:23:214:23 | u | provenance |  |
+| stdlib.go:214:23:214:23 | u | stdlib.go:214:23:214:32 | call to String | provenance | Config Sink:MaD:1 |
+| stdlib.go:257:3:257:3 | implicit dereference [postupdate] | stdlib.go:257:3:257:3 | u [postupdate] | provenance | Config |
+| stdlib.go:257:3:257:3 | implicit dereference [postupdate] | stdlib.go:257:3:257:3 | u [postupdate] [pointer] | provenance |  |
+| stdlib.go:257:3:257:3 | u [postupdate] | stdlib.go:260:3:260:3 | u | provenance |  |
+| stdlib.go:257:3:257:3 | u [postupdate] [pointer] | stdlib.go:260:3:260:3 | u [pointer] | provenance |  |
+| stdlib.go:257:12:257:30 | call to FormValue | stdlib.go:257:3:257:3 | implicit dereference [postupdate] | provenance | Src:MaD:3 Config |
+| stdlib.go:257:12:257:30 | call to FormValue | stdlib.go:257:3:257:3 | u [postupdate] | provenance | Src:MaD:3 Config |
+| stdlib.go:260:3:260:3 | implicit dereference | stdlib.go:260:3:260:3 | u [postupdate] | provenance | Config |
+| stdlib.go:260:3:260:3 | u | stdlib.go:260:3:260:3 | implicit dereference | provenance | Config |
+| stdlib.go:260:3:260:3 | u | stdlib.go:261:23:261:23 | u | provenance |  |
+| stdlib.go:260:3:260:3 | u [pointer] | stdlib.go:260:3:260:3 | implicit dereference | provenance |  |
+| stdlib.go:260:3:260:3 | u [postupdate] | stdlib.go:260:3:260:3 | implicit dereference | provenance | Config |
+| stdlib.go:260:3:260:3 | u [postupdate] | stdlib.go:261:23:261:23 | u | provenance |  |
+| stdlib.go:261:23:261:23 | u | stdlib.go:261:23:261:32 | call to String | provenance | Config Sink:MaD:1 |
 models
 | 1 | Sink: net/http; ; false; Redirect; ; ; Argument[2]; url-redirection[0]; manual |
 | 2 | Source: net/http; Request; true; Form; ; ; ; remote; manual |
@@ -79,54 +103,72 @@ nodes
 | stdlib.go:22:13:22:18 | selection of Form | semmle.label | selection of Form |
 | stdlib.go:22:13:22:32 | call to Get | semmle.label | call to Get |
 | stdlib.go:24:30:24:35 | target | semmle.label | target |
-| stdlib.go:31:13:31:18 | selection of Form | semmle.label | selection of Form |
-| stdlib.go:31:13:31:32 | call to Get | semmle.label | call to Get |
-| stdlib.go:35:30:35:39 | ...+... | semmle.label | ...+... |
-| stdlib.go:35:34:35:39 | target | semmle.label | target |
-| stdlib.go:44:13:44:18 | selection of Form | semmle.label | selection of Form |
-| stdlib.go:44:13:44:32 | call to Get | semmle.label | call to Get |
-| stdlib.go:46:23:46:28 | target | semmle.label | target |
-| stdlib.go:64:13:64:18 | selection of Form | semmle.label | selection of Form |
-| stdlib.go:64:13:64:32 | call to Get | semmle.label | call to Get |
-| stdlib.go:67:23:67:28 | target | semmle.label | target |
-| stdlib.go:67:23:67:37 | ...+... | semmle.label | ...+... |
-| stdlib.go:67:23:67:40 | ...+... | semmle.label | ...+... |
-| stdlib.go:89:13:89:18 | selection of Form | semmle.label | selection of Form |
-| stdlib.go:89:13:89:32 | call to Get | semmle.label | call to Get |
-| stdlib.go:90:3:90:8 | target | semmle.label | target |
-| stdlib.go:90:3:90:25 | ... += ... | semmle.label | ... += ... |
-| stdlib.go:92:23:92:28 | target | semmle.label | target |
-| stdlib.go:107:54:107:54 | definition of r [pointer, URL, pointer] | semmle.label | definition of r [pointer, URL, pointer] |
-| stdlib.go:107:54:107:54 | definition of r [pointer, URL] | semmle.label | definition of r [pointer, URL] |
-| stdlib.go:112:4:112:4 | implicit dereference [URL, pointer] | semmle.label | implicit dereference [URL, pointer] |
-| stdlib.go:112:4:112:4 | implicit dereference [URL] | semmle.label | implicit dereference [URL] |
-| stdlib.go:112:4:112:4 | r [pointer, URL, pointer] | semmle.label | r [pointer, URL, pointer] |
-| stdlib.go:112:4:112:4 | r [pointer, URL] | semmle.label | r [pointer, URL] |
-| stdlib.go:112:4:112:8 | implicit dereference | semmle.label | implicit dereference |
-| stdlib.go:112:4:112:8 | selection of URL | semmle.label | selection of URL |
-| stdlib.go:112:4:112:8 | selection of URL [pointer] | semmle.label | selection of URL [pointer] |
-| stdlib.go:113:24:113:24 | implicit dereference [URL] | semmle.label | implicit dereference [URL] |
-| stdlib.go:113:24:113:24 | r [pointer, URL] | semmle.label | r [pointer, URL] |
-| stdlib.go:113:24:113:28 | selection of URL | semmle.label | selection of URL |
-| stdlib.go:113:24:113:37 | call to String | semmle.label | call to String |
-| stdlib.go:146:13:146:18 | selection of Form | semmle.label | selection of Form |
-| stdlib.go:146:13:146:32 | call to Get | semmle.label | call to Get |
-| stdlib.go:152:23:152:28 | target | semmle.label | target |
-| stdlib.go:159:10:159:15 | star expression | semmle.label | star expression |
-| stdlib.go:159:11:159:15 | selection of URL | semmle.label | selection of URL |
-| stdlib.go:162:24:162:26 | url | semmle.label | url |
-| stdlib.go:162:24:162:35 | call to String | semmle.label | call to String |
-| stdlib.go:173:24:173:52 | ...+... | semmle.label | ...+... |
-| stdlib.go:173:35:173:39 | selection of URL | semmle.label | selection of URL |
-| stdlib.go:173:35:173:52 | call to RequestURI | semmle.label | call to RequestURI |
-| stdlib.go:182:13:182:33 | call to FormValue | semmle.label | call to FormValue |
-| stdlib.go:184:23:184:28 | target | semmle.label | target |
-| stdlib.go:190:3:190:8 | definition of target | semmle.label | definition of target |
-| stdlib.go:190:3:190:57 | ... := ...[0] | semmle.label | ... := ...[0] |
-| stdlib.go:190:36:190:56 | call to FormValue | semmle.label | call to FormValue |
-| stdlib.go:192:23:192:28 | implicit dereference | semmle.label | implicit dereference |
-| stdlib.go:192:23:192:28 | target | semmle.label | target |
-| stdlib.go:192:23:192:33 | selection of Path | semmle.label | selection of Path |
-| stdlib.go:194:23:194:28 | target | semmle.label | target |
-| stdlib.go:194:23:194:42 | call to EscapedPath | semmle.label | call to EscapedPath |
+| stdlib.go:33:13:33:18 | selection of Form | semmle.label | selection of Form |
+| stdlib.go:33:13:33:32 | call to Get | semmle.label | call to Get |
+| stdlib.go:39:30:39:40 | ...+... | semmle.label | ...+... |
+| stdlib.go:39:34:39:40 | target2 | semmle.label | target2 |
+| stdlib.go:48:13:48:18 | selection of Form | semmle.label | selection of Form |
+| stdlib.go:48:13:48:32 | call to Get | semmle.label | call to Get |
+| stdlib.go:50:23:50:28 | target | semmle.label | target |
+| stdlib.go:68:13:68:18 | selection of Form | semmle.label | selection of Form |
+| stdlib.go:68:13:68:32 | call to Get | semmle.label | call to Get |
+| stdlib.go:71:23:71:28 | target | semmle.label | target |
+| stdlib.go:71:23:71:37 | ...+... | semmle.label | ...+... |
+| stdlib.go:71:23:71:40 | ...+... | semmle.label | ...+... |
+| stdlib.go:93:13:93:18 | selection of Form | semmle.label | selection of Form |
+| stdlib.go:93:13:93:32 | call to Get | semmle.label | call to Get |
+| stdlib.go:94:3:94:8 | target | semmle.label | target |
+| stdlib.go:94:3:94:25 | ... += ... | semmle.label | ... += ... |
+| stdlib.go:96:23:96:28 | target | semmle.label | target |
+| stdlib.go:116:4:116:4 | implicit dereference [postupdate] [URL] | semmle.label | implicit dereference [postupdate] [URL] |
+| stdlib.go:116:4:116:4 | r [postupdate] [pointer, URL] | semmle.label | r [postupdate] [pointer, URL] |
+| stdlib.go:116:4:116:8 | implicit dereference | semmle.label | implicit dereference |
+| stdlib.go:116:4:116:8 | selection of URL | semmle.label | selection of URL |
+| stdlib.go:116:4:116:8 | selection of URL [postupdate] | semmle.label | selection of URL [postupdate] |
+| stdlib.go:117:24:117:24 | implicit dereference [URL] | semmle.label | implicit dereference [URL] |
+| stdlib.go:117:24:117:24 | r [pointer, URL] | semmle.label | r [pointer, URL] |
+| stdlib.go:117:24:117:28 | selection of URL | semmle.label | selection of URL |
+| stdlib.go:117:24:117:37 | call to String | semmle.label | call to String |
+| stdlib.go:150:13:150:18 | selection of Form | semmle.label | selection of Form |
+| stdlib.go:150:13:150:32 | call to Get | semmle.label | call to Get |
+| stdlib.go:156:23:156:28 | target | semmle.label | target |
+| stdlib.go:163:10:163:15 | star expression | semmle.label | star expression |
+| stdlib.go:163:11:163:15 | selection of URL | semmle.label | selection of URL |
+| stdlib.go:163:11:163:15 | selection of URL [postupdate] | semmle.label | selection of URL [postupdate] |
+| stdlib.go:166:24:166:26 | url | semmle.label | url |
+| stdlib.go:166:24:166:35 | call to String | semmle.label | call to String |
+| stdlib.go:177:24:177:52 | ...+... | semmle.label | ...+... |
+| stdlib.go:177:35:177:39 | selection of URL | semmle.label | selection of URL |
+| stdlib.go:177:35:177:52 | call to RequestURI | semmle.label | call to RequestURI |
+| stdlib.go:186:13:186:33 | call to FormValue | semmle.label | call to FormValue |
+| stdlib.go:188:23:188:28 | target | semmle.label | target |
+| stdlib.go:194:3:194:57 | ... := ...[0] | semmle.label | ... := ...[0] |
+| stdlib.go:194:36:194:56 | call to FormValue | semmle.label | call to FormValue |
+| stdlib.go:196:23:196:28 | implicit dereference | semmle.label | implicit dereference |
+| stdlib.go:196:23:196:28 | target | semmle.label | target |
+| stdlib.go:196:23:196:28 | target [postupdate] | semmle.label | target [postupdate] |
+| stdlib.go:196:23:196:33 | selection of Path | semmle.label | selection of Path |
+| stdlib.go:198:23:198:28 | target | semmle.label | target |
+| stdlib.go:198:23:198:42 | call to EscapedPath | semmle.label | call to EscapedPath |
+| stdlib.go:210:3:210:3 | implicit dereference [postupdate] | semmle.label | implicit dereference [postupdate] |
+| stdlib.go:210:3:210:3 | u [postupdate] | semmle.label | u [postupdate] |
+| stdlib.go:210:3:210:3 | u [postupdate] [pointer] | semmle.label | u [postupdate] [pointer] |
+| stdlib.go:210:12:210:30 | call to FormValue | semmle.label | call to FormValue |
+| stdlib.go:212:23:212:23 | implicit dereference | semmle.label | implicit dereference |
+| stdlib.go:212:23:212:23 | u | semmle.label | u |
+| stdlib.go:212:23:212:23 | u [pointer] | semmle.label | u [pointer] |
+| stdlib.go:212:23:212:23 | u [postupdate] | semmle.label | u [postupdate] |
+| stdlib.go:212:23:212:28 | selection of Path | semmle.label | selection of Path |
+| stdlib.go:214:23:214:23 | u | semmle.label | u |
+| stdlib.go:214:23:214:32 | call to String | semmle.label | call to String |
+| stdlib.go:257:3:257:3 | implicit dereference [postupdate] | semmle.label | implicit dereference [postupdate] |
+| stdlib.go:257:3:257:3 | u [postupdate] | semmle.label | u [postupdate] |
+| stdlib.go:257:3:257:3 | u [postupdate] [pointer] | semmle.label | u [postupdate] [pointer] |
+| stdlib.go:257:12:257:30 | call to FormValue | semmle.label | call to FormValue |
+| stdlib.go:260:3:260:3 | implicit dereference | semmle.label | implicit dereference |
+| stdlib.go:260:3:260:3 | u | semmle.label | u |
+| stdlib.go:260:3:260:3 | u [pointer] | semmle.label | u [pointer] |
+| stdlib.go:260:3:260:3 | u [postupdate] | semmle.label | u [postupdate] |
+| stdlib.go:261:23:261:23 | u | semmle.label | u |
+| stdlib.go:261:23:261:32 | call to String | semmle.label | call to String |
 subpaths
diff --git a/go/ql/test/query-tests/Security/CWE-601/OpenUrlRedirect/OpenUrlRedirect.go b/go/ql/test/query-tests/Security/CWE-601/OpenUrlRedirect/OpenUrlRedirect.go
index 606b5d43ac0..752cf47decc 100644
--- a/go/ql/test/query-tests/Security/CWE-601/OpenUrlRedirect/OpenUrlRedirect.go
+++ b/go/ql/test/query-tests/Security/CWE-601/OpenUrlRedirect/OpenUrlRedirect.go
@@ -7,6 +7,6 @@ import (
 func serve() {
 	http.HandleFunc("/redir", func(w http.ResponseWriter, r *http.Request) {
 		r.ParseForm()
-		http.Redirect(w, r, r.Form.Get("target"), 302)
+		http.Redirect(w, r, r.Form.Get("target"), 302) // $ Alert
 	})
 }
diff --git a/go/ql/test/query-tests/Security/CWE-601/OpenUrlRedirect/OpenUrlRedirect.qlref b/go/ql/test/query-tests/Security/CWE-601/OpenUrlRedirect/OpenUrlRedirect.qlref
index 867dd766561..13add930f51 100644
--- a/go/ql/test/query-tests/Security/CWE-601/OpenUrlRedirect/OpenUrlRedirect.qlref
+++ b/go/ql/test/query-tests/Security/CWE-601/OpenUrlRedirect/OpenUrlRedirect.qlref
@@ -1,2 +1,4 @@
 query: Security/CWE-601/OpenUrlRedirect.ql
-postprocess: utils/test/PrettyPrintModels.ql
+postprocess:
+  - utils/test/PrettyPrintModels.ql
+  - utils/test/InlineExpectationsTestQuery.ql
diff --git a/go/ql/test/query-tests/Security/CWE-601/OpenUrlRedirect/stdlib.go b/go/ql/test/query-tests/Security/CWE-601/OpenUrlRedirect/stdlib.go
index 0ccacd7d87e..57f2964288c 100644
--- a/go/ql/test/query-tests/Security/CWE-601/OpenUrlRedirect/stdlib.go
+++ b/go/ql/test/query-tests/Security/CWE-601/OpenUrlRedirect/stdlib.go
@@ -10,40 +10,44 @@ func serveStdlib() {
 	http.HandleFunc("/ex", func(w http.ResponseWriter, r *http.Request) {
 		r.ParseForm()
 
-		target := r.Form.Get("target")
+		target := r.Form.Get("target") // $ Source
 		// BAD: a request parameter is incorporated without validation into a URL redirect
-		w.Header().Set("Location", target)
+		w.Header().Set("Location", target) // $ Alert
 		w.WriteHeader(302)
 	})
 
 	http.HandleFunc("/ex1", func(w http.ResponseWriter, r *http.Request) {
 		r.ParseForm()
 
-		target := r.Form.Get("target")
+		target := r.Form.Get("target") // $ Source
 		// Probably OK because the status is set to 500, but we catch it anyway
-		w.Header().Set("Location", target)
+		w.Header().Set("Location", target) // $ Alert
 		w.WriteHeader(500)
 	})
 
 	http.HandleFunc("/ex2", func(w http.ResponseWriter, r *http.Request) {
 		r.ParseForm()
 
-		target := r.Form.Get("target")
+		// Taking gratuitous copies of target so that sanitizing the use in
+		// the first request doesn't also sanitize other uses
+		target := r.Form.Get("target") // $ Source
+		target2 := target
+		target3 := target
 		// GOOD: local redirects are unproblematic
 		w.Header().Set("Location", "/local"+target)
 		// BAD: this could be a non-local redirect
-		w.Header().Set("Location", "/"+target)
+		w.Header().Set("Location", "/"+target2) // $ Alert
 		// GOOD: localhost redirects are unproblematic
-		w.Header().Set("Location", "//localhost/"+target)
+		w.Header().Set("Location", "//localhost/"+target3)
 		w.WriteHeader(302)
 	})
 
 	http.HandleFunc("/ex3", func(w http.ResponseWriter, r *http.Request) {
 		r.ParseForm()
 
-		target := r.Form.Get("target")
+		target := r.Form.Get("target") // $ Source
 		// BAD: using the utility function
-		http.Redirect(w, r, target, 301)
+		http.Redirect(w, r, target, 301) // $ Alert
 	})
 
 	http.HandleFunc("/ex4", func(w http.ResponseWriter, r *http.Request) {
@@ -61,10 +65,10 @@ func serveStdlib() {
 	http.HandleFunc("/ex5", func(w http.ResponseWriter, r *http.Request) {
 		r.ParseForm()
 
-		target := r.Form.Get("target")
+		target := r.Form.Get("target") // $ Source
 		me := "me"
 		// BAD: may be a global redirection
-		http.Redirect(w, r, target+"?from="+me, 301)
+		http.Redirect(w, r, target+"?from="+me, 301) // $ Alert
 	})
 
 	http.HandleFunc("/ex6", func(w http.ResponseWriter, r *http.Request) {
@@ -86,10 +90,10 @@ func serveStdlib() {
 	http.HandleFunc("/ex7", func(w http.ResponseWriter, r *http.Request) {
 		r.ParseForm()
 
-		target := r.Form.Get("target")
+		target := r.Form.Get("target") // $ Source
 		target += "/index.html"
 		// BAD
-		http.Redirect(w, r, target, 302)
+		http.Redirect(w, r, target, 302) // $ Alert
 	})
 
 	http.HandleFunc("/ex7", func(w http.ResponseWriter, r *http.Request) {
@@ -143,13 +147,13 @@ func serveStdlib() {
 	http.HandleFunc("/ex9", func(w http.ResponseWriter, r *http.Request) {
 		r.ParseForm()
 
-		target := r.Form.Get("target")
+		target := r.Form.Get("target") // $ Source
 		// GOOD, but we catch this anyway: a check is done on the URL
 		if !isValidRedirect(target) {
 			target = "/"
 		}
 
-		http.Redirect(w, r, target, 302)
+		http.Redirect(w, r, target, 302) // $ SPURIOUS: Alert
 	})
 
 	http.HandleFunc("/ex8", func(w http.ResponseWriter, r *http.Request) {
@@ -179,22 +183,38 @@ func serveStdlib() {
 	http.HandleFunc("/ex9", func(w http.ResponseWriter, r *http.Request) {
 		r.ParseForm()
 
-		target := r.FormValue("target")
+		target := r.FormValue("target") // $ Source
 		// BAD: a request parameter is incorporated without validation into a URL redirect
-		http.Redirect(w, r, target, 301)
+		http.Redirect(w, r, target, 301) // $ Alert
 	})
 
 	http.HandleFunc("/ex10", func(w http.ResponseWriter, r *http.Request) {
 		r.ParseForm()
 
-		target, _ := url.ParseRequestURI(r.FormValue("target"))
+		target, _ := url.ParseRequestURI(r.FormValue("target")) // $ Source
 		// BAD: Path could start with `//`
-		http.Redirect(w, r, target.Path, 301)
+		http.Redirect(w, r, target.Path, 301) // $ Alert
 		// BAD: EscapedPath() does not help with that
-		http.Redirect(w, r, target.EscapedPath(), 301)
+		http.Redirect(w, r, target.EscapedPath(), 301) // $ Alert
+		target.Host = "example.com"
+		// BAD: Host field was overwritten but Path field remains untrusted
+		http.Redirect(w, r, target.Path, 301) // $ MISSING: Alert
+		// GOOD: untrusted Host field was overwritten
+		http.Redirect(w, r, target.String(), 301)
 	})
 
 	http.HandleFunc("/ex11", func(w http.ResponseWriter, r *http.Request) {
+		r.ParseForm()
+
+		u, _ := url.Parse("http://bing.com/search?q=dotnet")
+		u.Host = r.FormValue("host") // $ Source
+		// GOOD: Path field is trusted
+		http.Redirect(w, r, u.Path, 301) // $ SPURIOUS: Alert
+		// BAD: Host field is untrusted
+		http.Redirect(w, r, u.String(), 301) // $ Alert
+	})
+
+	http.HandleFunc("/ex12", func(w http.ResponseWriter, r *http.Request) {
 		// GOOD: all these fields and methods are disregarded for OpenRedirect attacks:
 		buf := make([]byte, 100)
 		r.Body.Read(buf)
@@ -219,5 +239,27 @@ func serveStdlib() {
 		http.Redirect(w, r, string(buf), 301)
 	})
 
+	http.HandleFunc("/ex13", func(w http.ResponseWriter, r *http.Request) {
+		r.ParseForm()
+
+		u, _ := url.Parse("http://example.com")
+		u.Host = r.FormValue("host")
+		// GOOD: Path field is assigned a value with a hostname-sanitizing substring,
+		// so subsequent uses of u are sanitized by PathAssignmentBarrier
+		u.Path = "/safe/" + r.FormValue("path")
+		http.Redirect(w, r, u.String(), 301)
+	})
+
+	http.HandleFunc("/ex14", func(w http.ResponseWriter, r *http.Request) {
+		r.ParseForm()
+
+		u, _ := url.Parse("http://example.com")
+		u.Host = r.FormValue("host") // $ Source
+		// BAD: Path field is assigned but without a hostname-sanitizing substring,
+		// so the Host field remains untrusted
+		u.Path = r.FormValue("path")
+		http.Redirect(w, r, u.String(), 301) // $ Alert
+	})
+
 	http.ListenAndServe(":80", nil)
 }
diff --git a/go/ql/test/query-tests/Security/CWE-640/EmailBad.go b/go/ql/test/query-tests/Security/CWE-640/EmailBad.go
index aab8467b340..7ceed9e7a36 100644
--- a/go/ql/test/query-tests/Security/CWE-640/EmailBad.go
+++ b/go/ql/test/query-tests/Security/CWE-640/EmailBad.go
@@ -6,8 +6,8 @@ import (
 )
 
 func mail(w http.ResponseWriter, r *http.Request) {
-	host := r.Header.Get("Host")
+	host := r.Header.Get("Host") // $ Source
 	token := backend.getUserSecretResetToken(email)
 	body := "Click to reset password: " + host + "/" + token
-	smtp.SendMail("test.test", nil, "from@from.com", nil, []byte(body))
+	smtp.SendMail("test.test", nil, "from@from.com", nil, []byte(body)) // $ Alert
 }
diff --git a/go/ql/test/query-tests/Security/CWE-640/EmailInjection.expected b/go/ql/test/query-tests/Security/CWE-640/EmailInjection.expected
index ac5985f110d..aa4b4914c18 100644
--- a/go/ql/test/query-tests/Security/CWE-640/EmailInjection.expected
+++ b/go/ql/test/query-tests/Security/CWE-640/EmailInjection.expected
@@ -1,66 +1,107 @@
 #select
 | EmailBad.go:12:56:12:67 | type conversion | EmailBad.go:9:10:9:17 | selection of Header | EmailBad.go:12:56:12:67 | type conversion | Email content may contain $@. | EmailBad.go:9:10:9:17 | selection of Header | untrusted input |
-| main.go:31:57:31:78 | type conversion | main.go:29:21:29:31 | call to Referer | main.go:31:57:31:78 | type conversion | Email content may contain $@. | main.go:29:21:29:31 | call to Referer | untrusted input |
-| main.go:40:3:40:7 | definition of write | main.go:37:21:37:31 | call to Referer | main.go:40:3:40:7 | definition of write | Email content may contain $@. | main.go:37:21:37:31 | call to Referer | untrusted input |
-| main.go:52:46:52:59 | untrustedInput | main.go:46:21:46:31 | call to Referer | main.go:52:46:52:59 | untrustedInput | Email content may contain $@. | main.go:46:21:46:31 | call to Referer | untrusted input |
-| main.go:53:52:53:65 | untrustedInput | main.go:46:21:46:31 | call to Referer | main.go:53:52:53:65 | untrustedInput | Email content may contain $@. | main.go:46:21:46:31 | call to Referer | untrusted input |
-| main.go:63:16:63:22 | content | main.go:58:21:58:31 | call to Referer | main.go:63:16:63:22 | content | Email content may contain $@. | main.go:58:21:58:31 | call to Referer | untrusted input |
-| main.go:76:50:76:56 | content | main.go:68:21:68:31 | call to Referer | main.go:76:50:76:56 | content | Email content may contain $@. | main.go:68:21:68:31 | call to Referer | untrusted input |
-| main.go:76:59:76:65 | content | main.go:68:21:68:31 | call to Referer | main.go:76:59:76:65 | content | Email content may contain $@. | main.go:68:21:68:31 | call to Referer | untrusted input |
-| main.go:77:16:77:22 | content | main.go:68:21:68:31 | call to Referer | main.go:77:16:77:22 | content | Email content may contain $@. | main.go:68:21:68:31 | call to Referer | untrusted input |
-| main.go:89:37:89:50 | untrustedInput | main.go:82:21:82:31 | call to Referer | main.go:89:37:89:50 | untrustedInput | Email content may contain $@. | main.go:82:21:82:31 | call to Referer | untrusted input |
-| main.go:93:16:93:23 | content2 | main.go:82:21:82:31 | call to Referer | main.go:93:16:93:23 | content2 | Email content may contain $@. | main.go:82:21:82:31 | call to Referer | untrusted input |
+| main.go:33:57:33:78 | type conversion | main.go:31:21:31:31 | call to Referer | main.go:33:57:33:78 | type conversion | Email content may contain $@. | main.go:31:21:31:31 | call to Referer | untrusted input |
+| main.go:43:18:43:22 | write [postupdate] | main.go:39:21:39:31 | call to Referer | main.go:43:18:43:22 | write [postupdate] | Email content may contain $@. | main.go:39:21:39:31 | call to Referer | untrusted input |
+| main.go:54:46:54:59 | untrustedInput | main.go:48:21:48:31 | call to Referer | main.go:54:46:54:59 | untrustedInput | Email content may contain $@. | main.go:48:21:48:31 | call to Referer | untrusted input |
+| main.go:55:52:55:65 | untrustedInput | main.go:48:21:48:31 | call to Referer | main.go:55:52:55:65 | untrustedInput | Email content may contain $@. | main.go:48:21:48:31 | call to Referer | untrusted input |
+| main.go:65:16:65:22 | content | main.go:60:21:60:31 | call to Referer | main.go:65:16:65:22 | content | Email content may contain $@. | main.go:60:21:60:31 | call to Referer | untrusted input |
+| main.go:78:50:78:56 | content | main.go:70:21:70:31 | call to Referer | main.go:78:50:78:56 | content | Email content may contain $@. | main.go:70:21:70:31 | call to Referer | untrusted input |
+| main.go:78:59:78:65 | content | main.go:70:21:70:31 | call to Referer | main.go:78:59:78:65 | content | Email content may contain $@. | main.go:70:21:70:31 | call to Referer | untrusted input |
+| main.go:79:16:79:22 | content | main.go:70:21:70:31 | call to Referer | main.go:79:16:79:22 | content | Email content may contain $@. | main.go:70:21:70:31 | call to Referer | untrusted input |
+| main.go:91:37:91:50 | untrustedInput | main.go:84:21:84:31 | call to Referer | main.go:91:37:91:50 | untrustedInput | Email content may contain $@. | main.go:84:21:84:31 | call to Referer | untrusted input |
+| main.go:95:16:95:23 | content2 | main.go:84:21:84:31 | call to Referer | main.go:95:16:95:23 | content2 | Email content may contain $@. | main.go:84:21:84:31 | call to Referer | untrusted input |
+| main.go:124:57:124:65 | call to Bytes | main.go:113:21:113:31 | call to Referer | main.go:124:57:124:65 | call to Bytes | Email content may contain $@. | main.go:113:21:113:31 | call to Referer | untrusted input |
+| main.go:141:57:141:65 | call to Bytes | main.go:129:21:129:31 | call to Referer | main.go:141:57:141:65 | call to Bytes | Email content may contain $@. | main.go:129:21:129:31 | call to Referer | untrusted input |
+| main.go:151:3:151:3 | w [postupdate] | main.go:146:22:146:32 | call to Referer | main.go:151:3:151:3 | w [postupdate] | Email content may contain $@. | main.go:146:22:146:32 | call to Referer | untrusted input |
+| main.go:152:3:152:3 | w [postupdate] | main.go:147:22:147:32 | call to Referer | main.go:152:3:152:3 | w [postupdate] | Email content may contain $@. | main.go:147:22:147:32 | call to Referer | untrusted input |
 edges
-| EmailBad.go:9:10:9:17 | selection of Header | EmailBad.go:9:10:9:29 | call to Get | provenance | Src:MaD:1 MaD:5 |
+| EmailBad.go:9:10:9:17 | selection of Header | EmailBad.go:9:10:9:29 | call to Get | provenance | Src:MaD:1 MaD:8 |
 | EmailBad.go:9:10:9:29 | call to Get | EmailBad.go:12:56:12:67 | type conversion | provenance |  |
-| main.go:29:21:29:31 | call to Referer | main.go:31:57:31:78 | type conversion | provenance | Src:MaD:2  |
-| main.go:37:21:37:31 | call to Referer | main.go:41:25:41:38 | untrustedInput | provenance | Src:MaD:2  |
-| main.go:41:25:41:38 | untrustedInput | main.go:40:3:40:7 | definition of write | provenance | MaD:4 |
-| main.go:46:21:46:31 | call to Referer | main.go:52:46:52:59 | untrustedInput | provenance | Src:MaD:2  |
-| main.go:46:21:46:31 | call to Referer | main.go:53:52:53:65 | untrustedInput | provenance | Src:MaD:2  |
-| main.go:58:21:58:31 | call to Referer | main.go:60:47:60:60 | untrustedInput | provenance | Src:MaD:2  |
-| main.go:60:14:60:61 | call to NewContent | main.go:63:16:63:22 | content | provenance |  |
-| main.go:60:47:60:60 | untrustedInput | main.go:60:14:60:61 | call to NewContent | provenance | MaD:3 |
-| main.go:68:21:68:31 | call to Referer | main.go:74:47:74:60 | untrustedInput | provenance | Src:MaD:2  |
-| main.go:74:14:74:61 | call to NewContent | main.go:76:50:76:56 | content | provenance |  |
-| main.go:74:14:74:61 | call to NewContent | main.go:76:59:76:65 | content | provenance |  |
-| main.go:74:14:74:61 | call to NewContent | main.go:77:16:77:22 | content | provenance |  |
-| main.go:74:47:74:60 | untrustedInput | main.go:74:14:74:61 | call to NewContent | provenance | MaD:3 |
-| main.go:82:21:82:31 | call to Referer | main.go:89:37:89:50 | untrustedInput | provenance | Src:MaD:2  |
-| main.go:82:21:82:31 | call to Referer | main.go:91:48:91:61 | untrustedInput | provenance | Src:MaD:2  |
-| main.go:91:15:91:62 | call to NewContent | main.go:93:16:93:23 | content2 | provenance |  |
-| main.go:91:48:91:61 | untrustedInput | main.go:91:15:91:62 | call to NewContent | provenance | MaD:3 |
+| main.go:31:21:31:31 | call to Referer | main.go:33:57:33:78 | type conversion | provenance | Src:MaD:2  |
+| main.go:39:21:39:31 | call to Referer | main.go:43:25:43:38 | untrustedInput | provenance | Src:MaD:2  |
+| main.go:43:25:43:38 | untrustedInput | main.go:43:18:43:22 | write [postupdate] | provenance | MaD:5 |
+| main.go:48:21:48:31 | call to Referer | main.go:54:46:54:59 | untrustedInput | provenance | Src:MaD:2  |
+| main.go:48:21:48:31 | call to Referer | main.go:55:52:55:65 | untrustedInput | provenance | Src:MaD:2  |
+| main.go:60:21:60:31 | call to Referer | main.go:62:47:62:60 | untrustedInput | provenance | Src:MaD:2  |
+| main.go:62:14:62:61 | call to NewContent | main.go:65:16:65:22 | content | provenance |  |
+| main.go:62:47:62:60 | untrustedInput | main.go:62:14:62:61 | call to NewContent | provenance | MaD:4 |
+| main.go:70:21:70:31 | call to Referer | main.go:76:47:76:60 | untrustedInput | provenance | Src:MaD:2  |
+| main.go:76:14:76:61 | call to NewContent | main.go:78:50:78:56 | content | provenance |  |
+| main.go:76:14:76:61 | call to NewContent | main.go:78:59:78:65 | content | provenance |  |
+| main.go:76:14:76:61 | call to NewContent | main.go:79:16:79:22 | content | provenance |  |
+| main.go:76:47:76:60 | untrustedInput | main.go:76:14:76:61 | call to NewContent | provenance | MaD:4 |
+| main.go:84:21:84:31 | call to Referer | main.go:91:37:91:50 | untrustedInput | provenance | Src:MaD:2  |
+| main.go:84:21:84:31 | call to Referer | main.go:93:48:93:61 | untrustedInput | provenance | Src:MaD:2  |
+| main.go:93:15:93:62 | call to NewContent | main.go:95:16:95:23 | content2 | provenance |  |
+| main.go:93:48:93:61 | untrustedInput | main.go:93:15:93:62 | call to NewContent | provenance | MaD:4 |
+| main.go:113:21:113:31 | call to Referer | main.go:119:28:119:41 | untrustedInput | provenance | Src:MaD:2  |
+| main.go:116:29:116:30 | &... [postupdate] | main.go:124:57:124:57 | b | provenance |  |
+| main.go:119:3:119:4 | mw [postupdate] | main.go:116:29:116:30 | &... [postupdate] | provenance | FunctionModel |
+| main.go:119:28:119:41 | untrustedInput | main.go:119:3:119:4 | mw [postupdate] | provenance | MaD:7 |
+| main.go:124:57:124:57 | b | main.go:124:57:124:65 | call to Bytes | provenance | MaD:3 |
+| main.go:129:21:129:31 | call to Referer | main.go:136:30:136:43 | untrustedInput | provenance | Src:MaD:2  |
+| main.go:132:29:132:30 | &... [postupdate] | main.go:141:57:141:57 | b | provenance |  |
+| main.go:135:20:135:21 | mw [postupdate] | main.go:132:29:132:30 | &... [postupdate] | provenance | FunctionModel |
+| main.go:136:18:136:27 | formWriter [postupdate] | main.go:135:20:135:21 | mw [postupdate] | provenance | FunctionModel |
+| main.go:136:30:136:43 | untrustedInput | main.go:136:18:136:27 | formWriter [postupdate] | provenance | MaD:5 |
+| main.go:141:57:141:57 | b | main.go:141:57:141:65 | call to Bytes | provenance | MaD:3 |
+| main.go:146:22:146:32 | call to Referer | main.go:151:11:151:33 | type conversion | provenance | Src:MaD:2  |
+| main.go:147:22:147:32 | call to Referer | main.go:152:11:152:33 | type conversion | provenance | Src:MaD:2  |
+| main.go:151:11:151:33 | type conversion | main.go:151:3:151:3 | w [postupdate] | provenance | MaD:6 |
+| main.go:152:11:152:33 | type conversion | main.go:152:3:152:3 | w [postupdate] | provenance | MaD:6 |
 models
 | 1 | Source: net/http; Request; true; Header; ; ; ; remote; manual |
 | 2 | Source: net/http; Request; true; Referer; ; ; ReturnValue; remote; manual |
-| 3 | Summary: github.com/sendgrid/sendgrid-go/helpers/mail; ; false; NewContent; ; ; Argument[1]; ReturnValue; taint; manual |
-| 4 | Summary: io; ; false; WriteString; ; ; Argument[1]; Argument[0]; taint; manual |
-| 5 | Summary: net/http; Header; true; Get; ; ; Argument[receiver]; ReturnValue; taint; manual |
+| 3 | Summary: bytes; Buffer; true; Bytes; ; ; Argument[receiver]; ReturnValue; taint; manual |
+| 4 | Summary: github.com/sendgrid/sendgrid-go/helpers/mail; ; false; NewContent; ; ; Argument[1]; ReturnValue; taint; manual |
+| 5 | Summary: io; ; false; WriteString; ; ; Argument[1]; Argument[0]; taint; manual |
+| 6 | Summary: io; Writer; true; Write; ; ; Argument[0]; Argument[receiver]; taint; manual |
+| 7 | Summary: mime/multipart; Writer; true; WriteField; ; ; Argument[0..1]; Argument[receiver]; taint; manual |
+| 8 | Summary: net/http; Header; true; Get; ; ; Argument[receiver]; ReturnValue; taint; manual |
 nodes
 | EmailBad.go:9:10:9:17 | selection of Header | semmle.label | selection of Header |
 | EmailBad.go:9:10:9:29 | call to Get | semmle.label | call to Get |
 | EmailBad.go:12:56:12:67 | type conversion | semmle.label | type conversion |
-| main.go:29:21:29:31 | call to Referer | semmle.label | call to Referer |
-| main.go:31:57:31:78 | type conversion | semmle.label | type conversion |
-| main.go:37:21:37:31 | call to Referer | semmle.label | call to Referer |
-| main.go:40:3:40:7 | definition of write | semmle.label | definition of write |
-| main.go:41:25:41:38 | untrustedInput | semmle.label | untrustedInput |
-| main.go:46:21:46:31 | call to Referer | semmle.label | call to Referer |
-| main.go:52:46:52:59 | untrustedInput | semmle.label | untrustedInput |
-| main.go:53:52:53:65 | untrustedInput | semmle.label | untrustedInput |
-| main.go:58:21:58:31 | call to Referer | semmle.label | call to Referer |
-| main.go:60:14:60:61 | call to NewContent | semmle.label | call to NewContent |
-| main.go:60:47:60:60 | untrustedInput | semmle.label | untrustedInput |
-| main.go:63:16:63:22 | content | semmle.label | content |
-| main.go:68:21:68:31 | call to Referer | semmle.label | call to Referer |
-| main.go:74:14:74:61 | call to NewContent | semmle.label | call to NewContent |
-| main.go:74:47:74:60 | untrustedInput | semmle.label | untrustedInput |
-| main.go:76:50:76:56 | content | semmle.label | content |
-| main.go:76:59:76:65 | content | semmle.label | content |
-| main.go:77:16:77:22 | content | semmle.label | content |
-| main.go:82:21:82:31 | call to Referer | semmle.label | call to Referer |
-| main.go:89:37:89:50 | untrustedInput | semmle.label | untrustedInput |
-| main.go:91:15:91:62 | call to NewContent | semmle.label | call to NewContent |
-| main.go:91:48:91:61 | untrustedInput | semmle.label | untrustedInput |
-| main.go:93:16:93:23 | content2 | semmle.label | content2 |
+| main.go:31:21:31:31 | call to Referer | semmle.label | call to Referer |
+| main.go:33:57:33:78 | type conversion | semmle.label | type conversion |
+| main.go:39:21:39:31 | call to Referer | semmle.label | call to Referer |
+| main.go:43:18:43:22 | write [postupdate] | semmle.label | write [postupdate] |
+| main.go:43:25:43:38 | untrustedInput | semmle.label | untrustedInput |
+| main.go:48:21:48:31 | call to Referer | semmle.label | call to Referer |
+| main.go:54:46:54:59 | untrustedInput | semmle.label | untrustedInput |
+| main.go:55:52:55:65 | untrustedInput | semmle.label | untrustedInput |
+| main.go:60:21:60:31 | call to Referer | semmle.label | call to Referer |
+| main.go:62:14:62:61 | call to NewContent | semmle.label | call to NewContent |
+| main.go:62:47:62:60 | untrustedInput | semmle.label | untrustedInput |
+| main.go:65:16:65:22 | content | semmle.label | content |
+| main.go:70:21:70:31 | call to Referer | semmle.label | call to Referer |
+| main.go:76:14:76:61 | call to NewContent | semmle.label | call to NewContent |
+| main.go:76:47:76:60 | untrustedInput | semmle.label | untrustedInput |
+| main.go:78:50:78:56 | content | semmle.label | content |
+| main.go:78:59:78:65 | content | semmle.label | content |
+| main.go:79:16:79:22 | content | semmle.label | content |
+| main.go:84:21:84:31 | call to Referer | semmle.label | call to Referer |
+| main.go:91:37:91:50 | untrustedInput | semmle.label | untrustedInput |
+| main.go:93:15:93:62 | call to NewContent | semmle.label | call to NewContent |
+| main.go:93:48:93:61 | untrustedInput | semmle.label | untrustedInput |
+| main.go:95:16:95:23 | content2 | semmle.label | content2 |
+| main.go:113:21:113:31 | call to Referer | semmle.label | call to Referer |
+| main.go:116:29:116:30 | &... [postupdate] | semmle.label | &... [postupdate] |
+| main.go:119:3:119:4 | mw [postupdate] | semmle.label | mw [postupdate] |
+| main.go:119:28:119:41 | untrustedInput | semmle.label | untrustedInput |
+| main.go:124:57:124:57 | b | semmle.label | b |
+| main.go:124:57:124:65 | call to Bytes | semmle.label | call to Bytes |
+| main.go:129:21:129:31 | call to Referer | semmle.label | call to Referer |
+| main.go:132:29:132:30 | &... [postupdate] | semmle.label | &... [postupdate] |
+| main.go:135:20:135:21 | mw [postupdate] | semmle.label | mw [postupdate] |
+| main.go:136:18:136:27 | formWriter [postupdate] | semmle.label | formWriter [postupdate] |
+| main.go:136:30:136:43 | untrustedInput | semmle.label | untrustedInput |
+| main.go:141:57:141:57 | b | semmle.label | b |
+| main.go:141:57:141:65 | call to Bytes | semmle.label | call to Bytes |
+| main.go:146:22:146:32 | call to Referer | semmle.label | call to Referer |
+| main.go:147:22:147:32 | call to Referer | semmle.label | call to Referer |
+| main.go:151:3:151:3 | w [postupdate] | semmle.label | w [postupdate] |
+| main.go:151:11:151:33 | type conversion | semmle.label | type conversion |
+| main.go:152:3:152:3 | w [postupdate] | semmle.label | w [postupdate] |
+| main.go:152:11:152:33 | type conversion | semmle.label | type conversion |
 subpaths
diff --git a/go/ql/test/query-tests/Security/CWE-640/EmailInjection.qlref b/go/ql/test/query-tests/Security/CWE-640/EmailInjection.qlref
index c3b6cac3113..67240cd9df4 100644
--- a/go/ql/test/query-tests/Security/CWE-640/EmailInjection.qlref
+++ b/go/ql/test/query-tests/Security/CWE-640/EmailInjection.qlref
@@ -1,2 +1,4 @@
 query: Security/CWE-640/EmailInjection.ql
-postprocess: utils/test/PrettyPrintModels.ql
+postprocess:
+  - utils/test/PrettyPrintModels.ql
+  - utils/test/InlineExpectationsTestQuery.ql
diff --git a/go/ql/test/query-tests/Security/CWE-640/main.go b/go/ql/test/query-tests/Security/CWE-640/main.go
index c6685475a8d..73ff8f6b1fb 100644
--- a/go/ql/test/query-tests/Security/CWE-640/main.go
+++ b/go/ql/test/query-tests/Security/CWE-640/main.go
@@ -3,11 +3,13 @@ package main
 //go:generate depstubber -vendor github.com/sendgrid/sendgrid-go/helpers/mail "" NewEmail,NewSingleEmail,NewContent,NewV3Mail,NewV3MailInit
 
 import (
+	"bytes"
 	"crypto/hmac"
 	"crypto/sha256"
 	"encoding/base64"
 	"io"
 	"log"
+	"mime/multipart"
 	"net/http"
 	"net/smtp"
 
@@ -26,46 +28,46 @@ func main() {
 
 	// Not OK
 	http.HandleFunc("/ex0", func(w http.ResponseWriter, r *http.Request) {
-		untrustedInput := r.Referer()
+		untrustedInput := r.Referer() // $ Source
 
-		smtp.SendMail("test.test", nil, "from@from.com", nil, []byte(untrustedInput))
+		smtp.SendMail("test.test", nil, "from@from.com", nil, []byte(untrustedInput)) // $ Alert
 
 	})
 
 	// Not OK
 	http.HandleFunc("/ex1", func(w http.ResponseWriter, r *http.Request) {
-		untrustedInput := r.Referer()
+		untrustedInput := r.Referer() // $ Source
 
 		s, _ := smtp.Dial("test.test")
 		write, _ := s.Data()
-		io.WriteString(write, untrustedInput)
+		io.WriteString(write, untrustedInput) // $ Alert
 	})
 
 	// Not OK
 	http.HandleFunc("/ex2", func(w http.ResponseWriter, r *http.Request) {
-		untrustedInput := r.Referer()
+		untrustedInput := r.Referer() // $ Source
 
 		from := sendgrid.NewEmail("from", "from@from.com")
 		to := sendgrid.NewEmail("to", "to@to.com")
 		subject := "test"
 		body := "body"
-		sendgrid.NewSingleEmail(from, subject, to, untrustedInput, body)
-		sendgrid.NewSingleEmail(from, subject, to, body, untrustedInput)
+		sendgrid.NewSingleEmail(from, subject, to, untrustedInput, body) // $ Alert
+		sendgrid.NewSingleEmail(from, subject, to, body, untrustedInput) // $ Alert
 	})
 
 	// Not OK
 	http.HandleFunc("/ex3", func(w http.ResponseWriter, r *http.Request) {
-		untrustedInput := r.Referer()
+		untrustedInput := r.Referer() // $ Source
 
 		content := sendgrid.NewContent("text/html", untrustedInput)
 
 		v := sendgrid.NewV3Mail()
-		v.AddContent(content)
+		v.AddContent(content) // $ Alert
 	})
 
 	// Not OK
 	http.HandleFunc("/ex4", func(w http.ResponseWriter, r *http.Request) {
-		untrustedInput := r.Referer()
+		untrustedInput := r.Referer() // $ Source
 
 		from := sendgrid.NewEmail("from", "from@from.com")
 		to := sendgrid.NewEmail("to", "to@to.com")
@@ -73,24 +75,24 @@ func main() {
 
 		content := sendgrid.NewContent("text/html", untrustedInput)
 
-		v := sendgrid.NewV3MailInit(from, subject, to, content, content)
-		v.AddContent(content)
+		v := sendgrid.NewV3MailInit(from, subject, to, content, content) // $ Alert
+		v.AddContent(content)                                            // $ Alert
 	})
 
 	// Not OK
 	http.HandleFunc("/ex5", func(w http.ResponseWriter, r *http.Request) {
-		untrustedInput := r.Referer()
+		untrustedInput := r.Referer() // $ Source
 
 		from := sendgrid.NewEmail("from", "from@from.com")
 		to := sendgrid.NewEmail("to", "to@to.com")
 
 		content := sendgrid.NewContent("text/html", "test")
 
-		v := sendgrid.NewV3MailInit(from, untrustedInput, to, content, content)
+		v := sendgrid.NewV3MailInit(from, untrustedInput, to, content, content) // $ Alert
 
 		content2 := sendgrid.NewContent("text/html", untrustedInput)
 
-		v.AddContent(content2)
+		v.AddContent(content2) // $ Alert
 	})
 
 	// OK
@@ -106,6 +108,52 @@ func main() {
 		smtp.SendMail("test.test", nil, "from@from.com", nil, []byte(signature))
 	})
 
+	// Not OK - mime/multipart.New.Writer test
+	http.HandleFunc("/multipart1", func(w http.ResponseWriter, r *http.Request) {
+		untrustedInput := r.Referer() // $ Source
+
+		var b bytes.Buffer
+		mw := multipart.NewWriter(&b)
+
+		// Add user-controlled data directly to the multipart writer
+		mw.WriteField("message", untrustedInput) // Injection point
+
+		mw.Close()
+
+		// Send the potentially malicious email content
+		smtp.SendMail("test.test", nil, "from@from.com", nil, b.Bytes()) // $ Alert
+	})
+
+	// Not OK - alternative multipart test
+	http.HandleFunc("/multipart2", func(w http.ResponseWriter, r *http.Request) {
+		untrustedInput := r.Referer() // $ Source
+
+		var b bytes.Buffer
+		mw := multipart.NewWriter(&b)
+
+		// Create form file with untrusted content
+		formWriter, _ := mw.CreateFormFile("attachment", "message.txt")
+		io.WriteString(formWriter, untrustedInput) // Injection point
+
+		mw.Close()
+
+		// Send email with user-controlled form file content
+		smtp.SendMail("test.test", nil, "from@from.com", nil, b.Bytes()) // $ Alert
+	})
+
+	// Not OK - check only one result when sink is Client.Data() from net/smtp
+	{
+		untrustedInput1 := r.Referer() // $ Source=s1
+		untrustedInput2 := r.Referer() // $ Source=s2
+		c, _ := smtp.Dial("mail.example.com:smtp")
+		w, _ := c.Data()
+		w.Write([]byte("safe text"))
+		w.Write([]byte(untrustedInput1)) // $ Alert=s1
+		w.Write([]byte(untrustedInput2)) // $ Alert=s2
+		w.Close()
+		c.Quit()
+	}
+
 	log.Println(http.ListenAndServe(":80", nil))
 
 }
diff --git a/go/ql/test/query-tests/Security/CWE-918/RequestForgery.expected b/go/ql/test/query-tests/Security/CWE-918/RequestForgery.expected
index 696d8dd700b..15b0e179e98 100644
--- a/go/ql/test/query-tests/Security/CWE-918/RequestForgery.expected
+++ b/go/ql/test/query-tests/Security/CWE-918/RequestForgery.expected
@@ -1,18 +1,18 @@
 #select
 | RequestForgery.go:11:15:11:66 | call to Get | RequestForgery.go:8:12:8:34 | call to FormValue | RequestForgery.go:11:24:11:65 | ...+... | The $@ of this request depends on a $@. | RequestForgery.go:11:24:11:65 | ...+... | URL | RequestForgery.go:8:12:8:34 | call to FormValue | user-provided value |
-| tst.go:14:2:14:18 | call to Get | tst.go:10:13:10:35 | call to FormValue | tst.go:14:11:14:17 | tainted | The $@ of this request depends on a $@. | tst.go:14:11:14:17 | tainted | URL | tst.go:10:13:10:35 | call to FormValue | user-provided value |
-| tst.go:16:2:16:19 | call to Head | tst.go:10:13:10:35 | call to FormValue | tst.go:16:12:16:18 | tainted | The $@ of this request depends on a $@. | tst.go:16:12:16:18 | tainted | URL | tst.go:10:13:10:35 | call to FormValue | user-provided value |
-| tst.go:18:2:18:38 | call to Post | tst.go:10:13:10:35 | call to FormValue | tst.go:18:12:18:18 | tainted | The $@ of this request depends on a $@. | tst.go:18:12:18:18 | tainted | URL | tst.go:10:13:10:35 | call to FormValue | user-provided value |
-| tst.go:20:2:20:28 | call to PostForm | tst.go:10:13:10:35 | call to FormValue | tst.go:20:16:20:22 | tainted | The $@ of this request depends on a $@. | tst.go:20:16:20:22 | tainted | URL | tst.go:10:13:10:35 | call to FormValue | user-provided value |
-| tst.go:24:2:24:15 | call to Do | tst.go:10:13:10:35 | call to FormValue | tst.go:23:35:23:41 | tainted | The $@ of this request depends on a $@. | tst.go:23:35:23:41 | tainted | URL | tst.go:10:13:10:35 | call to FormValue | user-provided value |
-| tst.go:27:2:27:15 | call to Do | tst.go:10:13:10:35 | call to FormValue | tst.go:26:68:26:74 | tainted | The $@ of this request depends on a $@. | tst.go:26:68:26:74 | tainted | URL | tst.go:10:13:10:35 | call to FormValue | user-provided value |
-| tst.go:29:2:29:20 | call to Get | tst.go:10:13:10:35 | call to FormValue | tst.go:29:13:29:19 | tainted | The $@ of this request depends on a $@. | tst.go:29:13:29:19 | tainted | URL | tst.go:10:13:10:35 | call to FormValue | user-provided value |
-| tst.go:30:2:30:21 | call to Head | tst.go:10:13:10:35 | call to FormValue | tst.go:30:14:30:20 | tainted | The $@ of this request depends on a $@. | tst.go:30:14:30:20 | tainted | URL | tst.go:10:13:10:35 | call to FormValue | user-provided value |
-| tst.go:31:2:31:40 | call to Post | tst.go:10:13:10:35 | call to FormValue | tst.go:31:14:31:20 | tainted | The $@ of this request depends on a $@. | tst.go:31:14:31:20 | tainted | URL | tst.go:10:13:10:35 | call to FormValue | user-provided value |
-| tst.go:32:2:32:30 | call to PostForm | tst.go:10:13:10:35 | call to FormValue | tst.go:32:18:32:24 | tainted | The $@ of this request depends on a $@. | tst.go:32:18:32:24 | tainted | URL | tst.go:10:13:10:35 | call to FormValue | user-provided value |
-| tst.go:34:2:34:30 | call to Get | tst.go:10:13:10:35 | call to FormValue | tst.go:34:11:34:29 | ...+... | The $@ of this request depends on a $@. | tst.go:34:11:34:29 | ...+... | URL | tst.go:10:13:10:35 | call to FormValue | user-provided value |
-| tst.go:36:2:36:41 | call to Get | tst.go:10:13:10:35 | call to FormValue | tst.go:36:11:36:40 | ...+... | The $@ of this request depends on a $@. | tst.go:36:11:36:40 | ...+... | URL | tst.go:10:13:10:35 | call to FormValue | user-provided value |
-| tst.go:44:2:44:21 | call to Get | tst.go:10:13:10:35 | call to FormValue | tst.go:44:11:44:20 | call to String | The $@ of this request depends on a $@. | tst.go:44:11:44:20 | call to String | URL | tst.go:10:13:10:35 | call to FormValue | user-provided value |
+| tst.go:19:2:19:18 | call to Get | tst.go:11:13:11:35 | call to FormValue | tst.go:19:11:19:17 | tainted | The $@ of this request depends on a $@. | tst.go:19:11:19:17 | tainted | URL | tst.go:11:13:11:35 | call to FormValue | user-provided value |
+| tst.go:21:2:21:19 | call to Head | tst.go:11:13:11:35 | call to FormValue | tst.go:21:12:21:18 | tainted | The $@ of this request depends on a $@. | tst.go:21:12:21:18 | tainted | URL | tst.go:11:13:11:35 | call to FormValue | user-provided value |
+| tst.go:23:2:23:38 | call to Post | tst.go:11:13:11:35 | call to FormValue | tst.go:23:12:23:18 | tainted | The $@ of this request depends on a $@. | tst.go:23:12:23:18 | tainted | URL | tst.go:11:13:11:35 | call to FormValue | user-provided value |
+| tst.go:25:2:25:28 | call to PostForm | tst.go:11:13:11:35 | call to FormValue | tst.go:25:16:25:22 | tainted | The $@ of this request depends on a $@. | tst.go:25:16:25:22 | tainted | URL | tst.go:11:13:11:35 | call to FormValue | user-provided value |
+| tst.go:29:2:29:15 | call to Do | tst.go:11:13:11:35 | call to FormValue | tst.go:28:35:28:41 | tainted | The $@ of this request depends on a $@. | tst.go:28:35:28:41 | tainted | URL | tst.go:11:13:11:35 | call to FormValue | user-provided value |
+| tst.go:32:2:32:15 | call to Do | tst.go:11:13:11:35 | call to FormValue | tst.go:31:68:31:74 | tainted | The $@ of this request depends on a $@. | tst.go:31:68:31:74 | tainted | URL | tst.go:11:13:11:35 | call to FormValue | user-provided value |
+| tst.go:34:2:34:20 | call to Get | tst.go:11:13:11:35 | call to FormValue | tst.go:34:13:34:19 | tainted | The $@ of this request depends on a $@. | tst.go:34:13:34:19 | tainted | URL | tst.go:11:13:11:35 | call to FormValue | user-provided value |
+| tst.go:35:2:35:21 | call to Head | tst.go:11:13:11:35 | call to FormValue | tst.go:35:14:35:20 | tainted | The $@ of this request depends on a $@. | tst.go:35:14:35:20 | tainted | URL | tst.go:11:13:11:35 | call to FormValue | user-provided value |
+| tst.go:36:2:36:40 | call to Post | tst.go:11:13:11:35 | call to FormValue | tst.go:36:14:36:20 | tainted | The $@ of this request depends on a $@. | tst.go:36:14:36:20 | tainted | URL | tst.go:11:13:11:35 | call to FormValue | user-provided value |
+| tst.go:37:2:37:30 | call to PostForm | tst.go:11:13:11:35 | call to FormValue | tst.go:37:18:37:24 | tainted | The $@ of this request depends on a $@. | tst.go:37:18:37:24 | tainted | URL | tst.go:11:13:11:35 | call to FormValue | user-provided value |
+| tst.go:39:2:39:30 | call to Get | tst.go:11:13:11:35 | call to FormValue | tst.go:39:11:39:29 | ...+... | The $@ of this request depends on a $@. | tst.go:39:11:39:29 | ...+... | URL | tst.go:11:13:11:35 | call to FormValue | user-provided value |
+| tst.go:41:2:41:41 | call to Get | tst.go:11:13:11:35 | call to FormValue | tst.go:41:11:41:40 | ...+... | The $@ of this request depends on a $@. | tst.go:41:11:41:40 | ...+... | URL | tst.go:11:13:11:35 | call to FormValue | user-provided value |
+| tst.go:49:2:49:21 | call to Get | tst.go:11:13:11:35 | call to FormValue | tst.go:49:11:49:20 | call to String | The $@ of this request depends on a $@. | tst.go:49:11:49:20 | call to String | URL | tst.go:11:13:11:35 | call to FormValue | user-provided value |
 | websocket.go:65:12:65:53 | call to Dial | websocket.go:60:21:60:31 | call to Referer | websocket.go:65:27:65:40 | untrustedInput | The $@ of this request depends on a $@. | websocket.go:65:27:65:40 | untrustedInput | WebSocket URL | websocket.go:60:21:60:31 | call to Referer | user-provided value |
 | websocket.go:79:13:79:40 | call to DialConfig | websocket.go:74:21:74:31 | call to Referer | websocket.go:78:36:78:49 | untrustedInput | The $@ of this request depends on a $@. | websocket.go:78:36:78:49 | untrustedInput | WebSocket URL | websocket.go:74:21:74:31 | call to Referer | user-provided value |
 | websocket.go:91:3:91:50 | call to Dial | websocket.go:88:21:88:31 | call to Referer | websocket.go:91:31:91:44 | untrustedInput | The $@ of this request depends on a $@. | websocket.go:91:31:91:44 | untrustedInput | WebSocket URL | websocket.go:88:21:88:31 | call to Referer | user-provided value |
@@ -24,29 +24,24 @@
 | websocket.go:204:7:204:29 | call to New | websocket.go:202:21:202:31 | call to Referer | websocket.go:204:15:204:28 | untrustedInput | The $@ of this request depends on a $@. | websocket.go:204:15:204:28 | untrustedInput | WebSocket URL | websocket.go:202:21:202:31 | call to Referer | user-provided value |
 edges
 | RequestForgery.go:8:12:8:34 | call to FormValue | RequestForgery.go:11:24:11:65 | ...+... | provenance | Src:MaD:1  |
-| tst.go:10:13:10:35 | call to FormValue | tst.go:14:11:14:17 | tainted | provenance | Src:MaD:1  |
-| tst.go:10:13:10:35 | call to FormValue | tst.go:16:12:16:18 | tainted | provenance | Src:MaD:1  |
-| tst.go:10:13:10:35 | call to FormValue | tst.go:18:12:18:18 | tainted | provenance | Src:MaD:1  |
-| tst.go:10:13:10:35 | call to FormValue | tst.go:20:16:20:22 | tainted | provenance | Src:MaD:1  |
-| tst.go:10:13:10:35 | call to FormValue | tst.go:23:35:23:41 | tainted | provenance | Src:MaD:1  |
-| tst.go:10:13:10:35 | call to FormValue | tst.go:26:68:26:74 | tainted | provenance | Src:MaD:1  |
-| tst.go:10:13:10:35 | call to FormValue | tst.go:29:13:29:19 | tainted | provenance | Src:MaD:1  |
-| tst.go:10:13:10:35 | call to FormValue | tst.go:30:14:30:20 | tainted | provenance | Src:MaD:1  |
-| tst.go:10:13:10:35 | call to FormValue | tst.go:31:14:31:20 | tainted | provenance | Src:MaD:1  |
-| tst.go:10:13:10:35 | call to FormValue | tst.go:32:18:32:24 | tainted | provenance | Src:MaD:1  |
-| tst.go:10:13:10:35 | call to FormValue | tst.go:34:11:34:29 | ...+... | provenance | Src:MaD:1  |
-| tst.go:10:13:10:35 | call to FormValue | tst.go:36:11:36:40 | ...+... | provenance | Src:MaD:1  |
-| tst.go:10:13:10:35 | call to FormValue | tst.go:43:11:43:17 | tainted | provenance | Src:MaD:1  |
-| tst.go:42:2:42:2 | definition of u [pointer] | tst.go:43:2:43:2 | u [pointer] | provenance |  |
-| tst.go:43:2:43:2 | implicit dereference | tst.go:42:2:42:2 | definition of u [pointer] | provenance |  |
-| tst.go:43:2:43:2 | implicit dereference | tst.go:43:2:43:2 | u | provenance |  |
-| tst.go:43:2:43:2 | implicit dereference | tst.go:44:11:44:11 | u | provenance |  |
-| tst.go:43:2:43:2 | u | tst.go:43:2:43:2 | implicit dereference | provenance |  |
-| tst.go:43:2:43:2 | u | tst.go:44:11:44:11 | u | provenance |  |
-| tst.go:43:2:43:2 | u [pointer] | tst.go:43:2:43:2 | implicit dereference | provenance |  |
-| tst.go:43:11:43:17 | tainted | tst.go:43:2:43:2 | u | provenance | Config |
-| tst.go:43:11:43:17 | tainted | tst.go:44:11:44:11 | u | provenance | Config |
-| tst.go:44:11:44:11 | u | tst.go:44:11:44:20 | call to String | provenance | MaD:3 |
+| tst.go:11:13:11:35 | call to FormValue | tst.go:19:11:19:17 | tainted | provenance | Src:MaD:1  |
+| tst.go:11:13:11:35 | call to FormValue | tst.go:21:12:21:18 | tainted | provenance | Src:MaD:1  |
+| tst.go:11:13:11:35 | call to FormValue | tst.go:23:12:23:18 | tainted | provenance | Src:MaD:1  |
+| tst.go:11:13:11:35 | call to FormValue | tst.go:25:16:25:22 | tainted | provenance | Src:MaD:1  |
+| tst.go:11:13:11:35 | call to FormValue | tst.go:28:35:28:41 | tainted | provenance | Src:MaD:1  |
+| tst.go:11:13:11:35 | call to FormValue | tst.go:31:68:31:74 | tainted | provenance | Src:MaD:1  |
+| tst.go:11:13:11:35 | call to FormValue | tst.go:34:13:34:19 | tainted | provenance | Src:MaD:1  |
+| tst.go:11:13:11:35 | call to FormValue | tst.go:35:14:35:20 | tainted | provenance | Src:MaD:1  |
+| tst.go:11:13:11:35 | call to FormValue | tst.go:36:14:36:20 | tainted | provenance | Src:MaD:1  |
+| tst.go:11:13:11:35 | call to FormValue | tst.go:37:18:37:24 | tainted | provenance | Src:MaD:1  |
+| tst.go:11:13:11:35 | call to FormValue | tst.go:39:11:39:29 | ...+... | provenance | Src:MaD:1  |
+| tst.go:11:13:11:35 | call to FormValue | tst.go:41:11:41:40 | ...+... | provenance | Src:MaD:1  |
+| tst.go:11:13:11:35 | call to FormValue | tst.go:48:11:48:18 | tainted2 | provenance | Src:MaD:1  |
+| tst.go:48:2:48:2 | implicit dereference [postupdate] | tst.go:48:2:48:2 | u [postupdate] | provenance |  |
+| tst.go:48:2:48:2 | u [postupdate] | tst.go:49:11:49:11 | u | provenance |  |
+| tst.go:48:11:48:18 | tainted2 | tst.go:48:2:48:2 | implicit dereference [postupdate] | provenance | Config |
+| tst.go:48:11:48:18 | tainted2 | tst.go:48:2:48:2 | u [postupdate] | provenance | Config |
+| tst.go:49:11:49:11 | u | tst.go:49:11:49:20 | call to String | provenance | MaD:3 |
 | websocket.go:60:21:60:31 | call to Referer | websocket.go:65:27:65:40 | untrustedInput | provenance | Src:MaD:2  |
 | websocket.go:74:21:74:31 | call to Referer | websocket.go:78:36:78:49 | untrustedInput | provenance | Src:MaD:2  |
 | websocket.go:88:21:88:31 | call to Referer | websocket.go:91:31:91:44 | untrustedInput | provenance | Src:MaD:2  |
@@ -63,26 +58,24 @@ models
 nodes
 | RequestForgery.go:8:12:8:34 | call to FormValue | semmle.label | call to FormValue |
 | RequestForgery.go:11:24:11:65 | ...+... | semmle.label | ...+... |
-| tst.go:10:13:10:35 | call to FormValue | semmle.label | call to FormValue |
-| tst.go:14:11:14:17 | tainted | semmle.label | tainted |
-| tst.go:16:12:16:18 | tainted | semmle.label | tainted |
-| tst.go:18:12:18:18 | tainted | semmle.label | tainted |
-| tst.go:20:16:20:22 | tainted | semmle.label | tainted |
-| tst.go:23:35:23:41 | tainted | semmle.label | tainted |
-| tst.go:26:68:26:74 | tainted | semmle.label | tainted |
-| tst.go:29:13:29:19 | tainted | semmle.label | tainted |
-| tst.go:30:14:30:20 | tainted | semmle.label | tainted |
-| tst.go:31:14:31:20 | tainted | semmle.label | tainted |
-| tst.go:32:18:32:24 | tainted | semmle.label | tainted |
-| tst.go:34:11:34:29 | ...+... | semmle.label | ...+... |
-| tst.go:36:11:36:40 | ...+... | semmle.label | ...+... |
-| tst.go:42:2:42:2 | definition of u [pointer] | semmle.label | definition of u [pointer] |
-| tst.go:43:2:43:2 | implicit dereference | semmle.label | implicit dereference |
-| tst.go:43:2:43:2 | u | semmle.label | u |
-| tst.go:43:2:43:2 | u [pointer] | semmle.label | u [pointer] |
-| tst.go:43:11:43:17 | tainted | semmle.label | tainted |
-| tst.go:44:11:44:11 | u | semmle.label | u |
-| tst.go:44:11:44:20 | call to String | semmle.label | call to String |
+| tst.go:11:13:11:35 | call to FormValue | semmle.label | call to FormValue |
+| tst.go:19:11:19:17 | tainted | semmle.label | tainted |
+| tst.go:21:12:21:18 | tainted | semmle.label | tainted |
+| tst.go:23:12:23:18 | tainted | semmle.label | tainted |
+| tst.go:25:16:25:22 | tainted | semmle.label | tainted |
+| tst.go:28:35:28:41 | tainted | semmle.label | tainted |
+| tst.go:31:68:31:74 | tainted | semmle.label | tainted |
+| tst.go:34:13:34:19 | tainted | semmle.label | tainted |
+| tst.go:35:14:35:20 | tainted | semmle.label | tainted |
+| tst.go:36:14:36:20 | tainted | semmle.label | tainted |
+| tst.go:37:18:37:24 | tainted | semmle.label | tainted |
+| tst.go:39:11:39:29 | ...+... | semmle.label | ...+... |
+| tst.go:41:11:41:40 | ...+... | semmle.label | ...+... |
+| tst.go:48:2:48:2 | implicit dereference [postupdate] | semmle.label | implicit dereference [postupdate] |
+| tst.go:48:2:48:2 | u [postupdate] | semmle.label | u [postupdate] |
+| tst.go:48:11:48:18 | tainted2 | semmle.label | tainted2 |
+| tst.go:49:11:49:11 | u | semmle.label | u |
+| tst.go:49:11:49:20 | call to String | semmle.label | call to String |
 | websocket.go:60:21:60:31 | call to Referer | semmle.label | call to Referer |
 | websocket.go:65:27:65:40 | untrustedInput | semmle.label | untrustedInput |
 | websocket.go:74:21:74:31 | call to Referer | semmle.label | call to Referer |
diff --git a/go/ql/test/query-tests/Security/CWE-918/RequestForgery.ext.yml b/go/ql/test/query-tests/Security/CWE-918/RequestForgery.ext.yml
new file mode 100644
index 00000000000..1fc92a07144
--- /dev/null
+++ b/go/ql/test/query-tests/Security/CWE-918/RequestForgery.ext.yml
@@ -0,0 +1,6 @@
+extensions:
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sourceModel
+    data:
+      - ["main", "", False, "intSource", "", "", "ReturnValue", "remote", "manual"]
diff --git a/go/ql/test/query-tests/Security/CWE-918/tst.go b/go/ql/test/query-tests/Security/CWE-918/tst.go
index 44a172ddad0..e237f5f30e7 100644
--- a/go/ql/test/query-tests/Security/CWE-918/tst.go
+++ b/go/ql/test/query-tests/Security/CWE-918/tst.go
@@ -2,12 +2,17 @@ package main
 
 import (
 	"context"
+	"fmt"
 	"net/http"
 	"net/url"
 )
 
 func handler2(w http.ResponseWriter, req *http.Request) {
 	tainted := req.FormValue("target") // $ Source
+	// Gratuitous copy due to use-use flow propagating sanitization when
+	// used as a suffix in the last two OK cases forwards onto the final
+	// Not OK case.
+	tainted2 := tainted
 
 	http.Get("example.com") // OK
 
@@ -40,10 +45,18 @@ func handler2(w http.ResponseWriter, req *http.Request) {
 	http.Get("http://example.com/?" + tainted) // OK
 
 	u, _ := url.Parse("http://example.com/relative-path")
-	u.Host = tainted
+	u.Host = tainted2
 	http.Get(u.String()) // $ Alert
+
+	// Simple types are considered sanitized.
+	url := fmt.Sprintf("%s/%d", "some-url", intSource())
+	http.Get("http://" + url)
 }
 
 func main() {
 
 }
+
+func intSource() int64 {
+	return 0
+}
diff --git a/java/documentation/library-coverage/coverage.csv b/java/documentation/library-coverage/coverage.csv
index 7ec0b4c5f0f..a936bcdeddf 100644
--- a/java/documentation/library-coverage/coverage.csv
+++ b/java/documentation/library-coverage/coverage.csv
@@ -76,7 +76,7 @@ jakarta.activation,2,,2,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,1,,,,,,,,,,,,,,,,2,
 jakarta.faces.context,4,7,,,,,,,,,,,,,,2,,,,,,,,,,,2,,,,,,,,,,,,,,,,,,,,,,,,7,,
 jakarta.json,,,123,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,100,23
 jakarta.persistence,2,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,1,
-jakarta.servlet,2,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,1,,
+jakarta.servlet,2,19,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,19,,
 jakarta.ws.rs.client,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,
 jakarta.ws.rs.container,,9,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,9,,
 jakarta.ws.rs.core,2,,149,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,94,55
@@ -85,7 +85,7 @@ java.applet,,,11,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,11,
 java.awt,1,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,3
 java.beans,1,,177,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,82,95
 java.io,66,1,225,,,,,,,,,22,,,,,,,,,,,,,,,44,,,,,,,,,,,,,,,,,,,,,,,1,,202,23
-java.lang,38,3,783,,13,,,,,,1,,,,,,,,,,,,8,,,,11,,,4,,,1,,,,,,,,,,,,,,,,3,,,506,277
+java.lang,38,3,790,,13,,,,,,1,,,,,,,,,,,,8,,,,11,,,4,,,1,,,,,,,,,,,,,,,,3,,,510,280
 java.math,,,9,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,9
 java.net,23,3,347,,,,1,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,21,,,,,,,,,,,,,,,3,248,99
 java.nio,47,,499,,,,,,,,,5,,,,,,,,,,,,,,,41,,,,,,,,,1,,,,,,,,,,,,,,,,302,197
@@ -99,7 +99,7 @@ javafx.scene.web,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,
 javax.accessibility,,,63,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,28,35
 javax.activation,2,,7,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,1,,,,,,,,,,,,,,,,7,
 javax.annotation.processing,,,28,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,25,3
-javax.crypto,19,,114,,,12,3,,2,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,61,53
+javax.crypto,19,,140,,,12,3,,2,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,76,64
 javax.faces.context,4,7,,,,,,,,,,,,,,2,,,,,,,,,,,2,,,,,,,,,,,,,,,,,,,,,,,,7,,
 javax.imageio,1,,304,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,138,166
 javax.jms,,9,57,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,9,57,
diff --git a/java/documentation/library-coverage/coverage.rst b/java/documentation/library-coverage/coverage.rst
index aa6a3f2c171..22e3ecfa5e7 100644
--- a/java/documentation/library-coverage/coverage.rst
+++ b/java/documentation/library-coverage/coverage.rst
@@ -18,10 +18,10 @@ Java framework & library support
    `Google Guava <https://guava.dev/>`_,``com.google.common.*``,,730,43,9,,,,,
    JBoss Logging,``org.jboss.logging``,,,324,,,,,,
    `JSON-java <https://github.com/stleary/JSON-java>`_,``org.json``,,236,,,,,,,
-   Java Standard Library,``java.*``,10,4621,260,99,,9,,,26
-   Java extensions,"``javax.*``, ``jakarta.*``",69,4159,90,10,4,2,1,1,4
+   Java Standard Library,``java.*``,10,4628,260,99,,9,,,26
+   Java extensions,"``javax.*``, ``jakarta.*``",87,4185,90,10,4,2,1,1,4
    Kotlin Standard Library,``kotlin*``,,1849,16,14,,,,,2
    `Spring <https://spring.io/>`_,``org.springframework.*``,38,486,143,26,,28,14,,35
    Others,"``actions.osgi``, ``antlr``, ``ch.ethz.ssh2``, ``cn.hutool.core.codec``, ``com.alibaba.com.caucho.hessian.io``, ``com.alibaba.druid.sql``, ``com.alibaba.fastjson2``, ``com.amazonaws.auth``, ``com.auth0.jwt.algorithms``, ``com.azure.identity``, ``com.caucho.burlap.io``, ``com.caucho.hessian.io``, ``com.cedarsoftware.util.io``, ``com.esotericsoftware.kryo.io``, ``com.esotericsoftware.kryo5.io``, ``com.esotericsoftware.yamlbeans``, ``com.fasterxml.jackson.core``, ``com.fasterxml.jackson.databind``, ``com.google.gson``, ``com.hubspot.jinjava``, ``com.jcraft.jsch``, ``com.microsoft.sqlserver.jdbc``, ``com.mitchellbosecke.pebble``, ``com.mongodb``, ``com.opensymphony.xwork2``, ``com.rabbitmq.client``, ``com.sshtools.j2ssh.authentication``, ``com.sun.crypto.provider``, ``com.sun.jndi.ldap``, ``com.sun.net.httpserver``, ``com.sun.net.ssl``, ``com.sun.rowset``, ``com.sun.security.auth.module``, ``com.sun.security.ntlm``, ``com.sun.security.sasl.digest``, ``com.thoughtworks.xstream``, ``com.trilead.ssh2``, ``com.unboundid.ldap.sdk``, ``com.zaxxer.hikari``, ``flexjson``, ``freemarker.cache``, ``freemarker.template``, ``groovy.lang``, ``groovy.text``, ``groovy.util``, ``hudson``, ``io.jsonwebtoken``, ``io.netty.bootstrap``, ``io.netty.buffer``, ``io.netty.channel``, ``io.netty.handler.codec``, ``io.netty.handler.ssl``, ``io.netty.handler.stream``, ``io.netty.resolver``, ``io.netty.util``, ``io.undertow.server.handlers.resource``, ``javafx.scene.web``, ``jenkins``, ``jodd.json``, ``liquibase.database.jvm``, ``liquibase.statement.core``, ``net.lingala.zip4j``, ``net.schmizz.sshj``, ``net.sf.json``, ``net.sf.saxon.s9api``, ``ognl``, ``okhttp3``, ``org.acegisecurity``, ``org.antlr.runtime``, ``org.apache.commons.codec``, ``org.apache.commons.compress.archivers.tar``, ``org.apache.commons.exec``, ``org.apache.commons.httpclient.util``, ``org.apache.commons.jelly``, ``org.apache.commons.jexl2``, ``org.apache.commons.jexl3``, ``org.apache.commons.lang``, ``org.apache.commons.logging``, ``org.apache.commons.net``, ``org.apache.commons.ognl``, ``org.apache.cxf.catalog``, ``org.apache.cxf.common.classloader``, ``org.apache.cxf.common.jaxb``, ``org.apache.cxf.common.logging``, ``org.apache.cxf.configuration.jsse``, ``org.apache.cxf.helpers``, ``org.apache.cxf.resource``, ``org.apache.cxf.staxutils``, ``org.apache.cxf.tools.corba.utils``, ``org.apache.cxf.tools.util``, ``org.apache.cxf.transform``, ``org.apache.directory.ldap.client.api``, ``org.apache.hadoop.fs``, ``org.apache.hadoop.hive.metastore``, ``org.apache.hadoop.hive.ql.exec``, ``org.apache.hadoop.hive.ql.metadata``, ``org.apache.hc.client5.http.async.methods``, ``org.apache.hc.client5.http.classic.methods``, ``org.apache.hc.client5.http.fluent``, ``org.apache.hive.hcatalog.templeton``, ``org.apache.ibatis.jdbc``, ``org.apache.ibatis.mapping``, ``org.apache.log4j``, ``org.apache.shiro.authc``, ``org.apache.shiro.codec``, ``org.apache.shiro.jndi``, ``org.apache.shiro.mgt``, ``org.apache.sshd.client.session``, ``org.apache.struts.beanvalidation.validation.interceptor``, ``org.apache.struts2``, ``org.apache.tools.ant``, ``org.apache.tools.zip``, ``org.apache.velocity.app``, ``org.apache.velocity.runtime``, ``org.codehaus.cargo.container.installer``, ``org.codehaus.groovy.control``, ``org.dom4j``, ``org.eclipse.jetty.client``, ``org.exolab.castor.xml``, ``org.fusesource.leveldbjni``, ``org.geogebra.web.full.main``, ``org.gradle.api.file``, ``org.hibernate``, ``org.ho.yaml``, ``org.influxdb``, ``org.jabsorb``, ``org.jboss.vfs``, ``org.jdbi.v3.core``, ``org.jenkins.ui.icon``, ``org.jenkins.ui.symbol``, ``org.jooq``, ``org.keycloak.models.map.storage``, ``org.kohsuke.stapler``, ``org.lastaflute.web``, ``org.mvel2``, ``org.openjdk.jmh.runner.options``, ``org.owasp.esapi``, ``org.pac4j.jwt.config.encryption``, ``org.pac4j.jwt.config.signature``, ``org.scijava.log``, ``org.slf4j``, ``org.thymeleaf``, ``org.xml.sax``, ``org.xmlpull.v1``, ``org.yaml.snakeyaml``, ``play.libs.ws``, ``play.mvc``, ``ratpack.core.form``, ``ratpack.core.handling``, ``ratpack.core.http``, ``ratpack.exec``, ``ratpack.form``, ``ratpack.func``, ``ratpack.handling``, ``ratpack.http``, ``ratpack.util``, ``retrofit2``, ``software.amazon.awssdk.transfer.s3.model``, ``sun.jvmstat.perfdata.monitor.protocol.local``, ``sun.jvmstat.perfdata.monitor.protocol.rmi``, ``sun.misc``, ``sun.net.ftp``, ``sun.net.www.protocol.http``, ``sun.security.acl``, ``sun.security.jgss.krb5``, ``sun.security.krb5``, ``sun.security.pkcs``, ``sun.security.pkcs11``, ``sun.security.provider``, ``sun.security.ssl``, ``sun.security.x509``, ``sun.tools.jconsole``",133,10525,927,140,6,22,18,,208
-   Totals,,312,26328,2656,404,16,128,33,1,409
+   Totals,,330,26361,2656,404,16,128,33,1,409
 
diff --git a/java/downgrades/9f6026c400996c13842974b24f076a486ad1f69c/old.dbscheme b/java/downgrades/9f6026c400996c13842974b24f076a486ad1f69c/old.dbscheme
new file mode 100644
index 00000000000..9f6026c4009
--- /dev/null
+++ b/java/downgrades/9f6026c400996c13842974b24f076a486ad1f69c/old.dbscheme
@@ -0,0 +1,1240 @@
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   javac A.java B.java C.java
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   javac A.java B.java C.java
+     */
+    unique int id : @compilation,
+    int kind: int ref,
+    string cwd : string ref,
+    string name : string ref
+);
+
+case @compilation.kind of
+   1  = @javacompilation
+|  2  = @kotlincompilation
+;
+
+compilation_started(
+    int id : @compilation ref
+)
+
+compilation_info(
+    int id : @compilation ref,
+    string info_key: string ref,
+    string info_value: string ref
+)
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   javac A.java B.java C.java
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--javac-args`
+ * 2   | A.java
+ * 3   | B.java
+ * 4   | C.java
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@@@someFile` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   javac A.java B.java C.java
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | A.java
+ * 1   | B.java
+ * 2   | C.java
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * For each file recorded in `compilation_compiling_files`,
+ * there will be a corresponding row in
+ * `compilation_compiling_files_completed` once extraction
+ * of that file is complete. The `result` will indicate the
+ * extraction result:
+ *
+ *     0: Successfully extracted
+ *     1: Errors were encountered, but extraction recovered
+ *     2: Errors were encountered, and extraction could not recover
+ */
+#keyset[id, num]
+compilation_compiling_files_completed(
+    int id : @compilation ref,
+    int num : int ref,
+    int result : int ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * The `cpu_seconds` and `elapsed_seconds` are the CPU time and elapsed
+ * time (respectively) that the original compilation (not the extraction)
+ * took for compiler invocation `id`.
+ */
+compilation_compiler_times(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ * The `result` will indicate the extraction result:
+ *
+ *     0: Successfully extracted
+ *     1: Errors were encountered, but extraction recovered
+ *     2: Errors were encountered, and extraction could not recover
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref,
+    int result : int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    string generated_by: string ref, // TODO: Sync this with the other languages?
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location_default ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    unique int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/*
+ * External artifacts
+ */
+
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+sourceLocationPrefix(
+  string prefix : string ref
+);
+
+databaseMetadata(
+  string metadataKey : string ref,
+  string value : string ref
+);
+
+overlayChangedFiles(
+  string path: string ref
+);
+
+/*
+ * SMAP
+ */
+
+smap_header(
+  int outputFileId: @file ref,
+  string outputFilename: string ref,
+  string defaultStratum: string ref
+);
+
+smap_files(
+  int outputFileId: @file ref,
+  string stratum: string ref,
+  int inputFileNum: int ref,
+  string inputFileName: string ref,
+  int inputFileId: @file ref
+);
+
+smap_lines(
+  int outputFileId: @file ref,
+  string stratum: string ref,
+  int inputFileNum: int ref,
+  int inputStartLine: int ref,
+  int inputLineCount: int ref,
+  int outputStartLine: int ref,
+  int outputLineIncrement: int ref
+);
+
+/*
+ * Locations and files
+ */
+
+@location = @location_default ;
+
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+hasLocation(
+  int locatableid: @locatable ref,
+  int id: @location ref
+);
+
+@sourceline = @locatable ;
+
+#keyset[element_id]
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @folder | @file
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*
+ * Java
+ */
+
+cupackage(
+  unique int id: @file ref,
+  int packageid: @package ref
+);
+
+#keyset[fileid,keyName]
+jarManifestMain(
+  int fileid: @file ref,
+  string keyName: string ref,
+  string value: string ref
+);
+
+#keyset[fileid,entryName,keyName]
+jarManifestEntries(
+  int fileid: @file ref,
+  string entryName: string ref,
+  string keyName: string ref,
+  string value: string ref
+);
+
+packages(
+  unique int id: @package,
+  string nodeName: string ref
+);
+
+primitives(
+  unique int id: @primitive,
+  string nodeName: string ref
+);
+
+modifiers(
+  unique int id: @modifier,
+  string nodeName: string ref
+);
+
+/**
+ * An errortype is used when the extractor is unable to extract a type
+ * correctly for some reason.
+ */
+error_type(
+  unique int id: @errortype
+);
+
+classes_or_interfaces(
+  unique int id: @classorinterface,
+  string nodeName: string ref,
+  int parentid: @package ref,
+  int sourceid: @classorinterface ref
+);
+
+file_class(
+  int id: @classorinterface ref
+);
+
+class_object(
+  unique int id: @classorinterface ref,
+  unique int instance: @field ref
+);
+
+type_companion_object(
+  unique int id: @classorinterface ref,
+  unique int instance: @field ref,
+  unique int companion_object: @classorinterface ref
+);
+
+kt_nullable_types(
+  unique int id: @kt_nullable_type,
+  int classid: @reftype ref
+)
+
+kt_notnull_types(
+  unique int id: @kt_notnull_type,
+  int classid: @reftype ref
+)
+
+kt_type_alias(
+  unique int id: @kt_type_alias,
+  string name: string ref,
+  int kttypeid: @kt_type ref
+)
+
+@kt_type = @kt_nullable_type | @kt_notnull_type
+
+isInterface(
+  unique int id: @classorinterface ref
+);
+
+isRecord(
+  unique int id: @classorinterface ref
+);
+
+fielddecls(
+  unique int id: @fielddecl,
+  int parentid: @reftype ref
+);
+
+#keyset[fieldId] #keyset[fieldDeclId,pos]
+fieldDeclaredIn(
+  int fieldId: @field ref,
+  int fieldDeclId: @fielddecl ref,
+  int pos: int ref
+);
+
+fields(
+  unique int id: @field,
+  string nodeName: string ref,
+  int typeid: @type ref,
+  int parentid: @reftype ref
+);
+
+fieldsKotlinType(
+  unique int id: @field ref,
+  int kttypeid: @kt_type ref
+);
+
+constrs(
+  unique int id: @constructor,
+  string nodeName: string ref,
+  string signature: string ref,
+  int typeid: @type ref,
+  int parentid: @reftype ref,
+  int sourceid: @constructor ref
+);
+
+constrsKotlinType(
+  unique int id: @constructor ref,
+  int kttypeid: @kt_type ref
+);
+
+methods(
+  unique int id: @method,
+  string nodeName: string ref,
+  string signature: string ref,
+  int typeid: @type ref,
+  int parentid: @reftype ref,
+  int sourceid: @method ref
+);
+
+methodsKotlinType(
+  unique int id: @method ref,
+  int kttypeid: @kt_type ref
+);
+
+#keyset[parentid,pos]
+params(
+  unique int id: @param,
+  int typeid: @type ref,
+  int pos: int ref,
+  int parentid: @callable ref,
+  int sourceid: @param ref
+);
+
+paramsKotlinType(
+  unique int id: @param ref,
+  int kttypeid: @kt_type ref
+);
+
+paramName(
+  unique int id: @param ref,
+  string nodeName: string ref
+);
+
+isVarargsParam(
+  int param: @param ref
+);
+
+exceptions(
+  unique int id: @exception,
+  int typeid: @type ref,
+  int parentid: @callable ref
+);
+
+isAnnotType(
+  int interfaceid: @classorinterface ref
+);
+
+isAnnotElem(
+  int methodid: @method ref
+);
+
+annotValue(
+  int parentid: @annotation ref,
+  int id2: @method ref,
+  unique int value: @expr ref
+);
+
+isEnumType(
+  int classid: @classorinterface ref
+);
+
+isEnumConst(
+  int fieldid: @field ref
+);
+
+#keyset[parentid,pos]
+typeVars(
+  unique int id: @typevariable,
+  string nodeName: string ref,
+  int pos: int ref,
+  int parentid: @classorinterfaceorcallable ref
+);
+
+wildcards(
+  unique int id: @wildcard,
+  string nodeName: string ref,
+  int kind: int ref
+);
+
+#keyset[parentid,pos]
+typeBounds(
+  unique int id: @typebound,
+  int typeid: @reftype ref,
+  int pos: int ref,
+  int parentid: @boundedtype ref
+);
+
+#keyset[parentid,pos]
+typeArgs(
+  int argumentid: @reftype ref,
+  int pos: int ref,
+  int parentid: @classorinterfaceorcallable ref
+);
+
+isParameterized(
+  int memberid: @member ref
+);
+
+isRaw(
+  int memberid: @member ref
+);
+
+#keyset[classid] #keyset[parent]
+isAnonymClass(
+  int classid: @classorinterface ref,
+  int parent: @classinstancexpr ref
+);
+
+#keyset[typeid] #keyset[parent]
+isLocalClassOrInterface(
+  int typeid: @classorinterface ref,
+  int parent: @localtypedeclstmt ref
+);
+
+isImplicitClass(
+  unique int classid: @classorinterface ref
+);
+
+isDefConstr(
+  int constructorid: @constructor ref
+);
+
+#keyset[exprId]
+lambdaKind(
+  int exprId: @lambdaexpr ref,
+  int bodyKind: int ref
+);
+
+isCanonicalConstr(
+  int constructorid: @constructor ref
+);
+
+arrays(
+  unique int id: @array,
+  string nodeName: string ref,
+  int elementtypeid: @type ref,
+  int dimension: int ref,
+  int componenttypeid: @type ref
+);
+
+enclInReftype(
+  unique int child: @reftype ref,
+  int parent: @reftype ref
+);
+
+extendsReftype(
+  int id1: @reftype ref,
+  int id2: @classorinterface ref
+);
+
+implInterface(
+  int id1: @classorarray ref,
+  int id2: @classorinterface ref
+);
+
+permits(
+  int id1: @classorinterface ref,
+  int id2: @classorinterface ref
+);
+
+hasModifier(
+  int id1: @modifiable ref,
+  int id2: @modifier ref
+);
+
+imports(
+  unique int id: @import,
+  int holder: @classorinterfaceorpackage ref,
+  string name: string ref,
+  int kind: int ref
+);
+
+#keyset[parent,idx]
+stmts(
+  unique int id: @stmt,
+  int kind: int ref,
+  int parent: @stmtparent ref,
+  int idx: int ref,
+  int bodydecl: @callable ref
+);
+
+@stmtparent = @callable | @stmt | @switchexpr | @whenexpr| @stmtexpr;
+
+case @stmt.kind of
+  0 = @block
+| 1 = @ifstmt
+| 2 = @forstmt
+| 3 = @enhancedforstmt
+| 4 = @whilestmt
+| 5 = @dostmt
+| 6 = @trystmt
+| 7 = @switchstmt
+| 8 = @synchronizedstmt
+| 9 = @returnstmt
+| 10 = @throwstmt
+| 11 = @breakstmt
+| 12 = @continuestmt
+| 13 = @emptystmt
+| 14 = @exprstmt
+| 15 = @labeledstmt
+| 16 = @assertstmt
+| 17 = @localvariabledeclstmt
+| 18 = @localtypedeclstmt
+| 19 = @constructorinvocationstmt
+| 20 = @superconstructorinvocationstmt
+| 21 = @case
+| 22 = @catchclause
+| 23 = @yieldstmt
+| 24 = @errorstmt
+| 25 = @whenbranch
+;
+
+#keyset[parent,idx]
+exprs(
+  unique int id: @expr,
+  int kind: int ref,
+  int typeid: @type ref,
+  int parent: @exprparent ref,
+  int idx: int ref
+);
+
+exprsKotlinType(
+  unique int id: @expr ref,
+  int kttypeid: @kt_type ref
+);
+
+callableEnclosingExpr(
+  unique int id: @expr ref,
+  int callable_id: @callable ref
+);
+
+statementEnclosingExpr(
+  unique int id: @expr ref,
+  int statement_id: @stmt ref
+);
+
+isParenthesized(
+  unique int id: @expr ref,
+  int parentheses: int ref
+);
+
+case @expr.kind of
+   1  = @arrayaccess
+|  2  = @arraycreationexpr
+|  3  = @arrayinit
+|  4  = @assignexpr
+|  5  = @assignaddexpr
+|  6  = @assignsubexpr
+|  7  = @assignmulexpr
+|  8  = @assigndivexpr
+|  9  = @assignremexpr
+| 10  = @assignandexpr
+| 11  = @assignorexpr
+| 12  = @assignxorexpr
+| 13  = @assignlshiftexpr
+| 14  = @assignrshiftexpr
+| 15  = @assignurshiftexpr
+| 16  = @booleanliteral
+| 17  = @integerliteral
+| 18  = @longliteral
+| 19  = @floatingpointliteral
+| 20  = @doubleliteral
+| 21  = @characterliteral
+| 22  = @stringliteral
+| 23  = @nullliteral
+| 24  = @mulexpr
+| 25  = @divexpr
+| 26  = @remexpr
+| 27  = @addexpr
+| 28  = @subexpr
+| 29  = @lshiftexpr
+| 30  = @rshiftexpr
+| 31  = @urshiftexpr
+| 32  = @andbitexpr
+| 33  = @orbitexpr
+| 34  = @xorbitexpr
+| 35  = @andlogicalexpr
+| 36  = @orlogicalexpr
+| 37  = @ltexpr
+| 38  = @gtexpr
+| 39  = @leexpr
+| 40  = @geexpr
+| 41  = @eqexpr
+| 42  = @neexpr
+| 43  = @postincexpr
+| 44  = @postdecexpr
+| 45  = @preincexpr
+| 46  = @predecexpr
+| 47  = @minusexpr
+| 48  = @plusexpr
+| 49  = @bitnotexpr
+| 50  = @lognotexpr
+| 51  = @castexpr
+| 52  = @newexpr
+| 53  = @conditionalexpr
+| 54  = @parexpr         // deprecated
+| 55  = @instanceofexpr
+| 56  = @localvariabledeclexpr
+| 57  = @typeliteral
+| 58  = @thisaccess
+| 59  = @superaccess
+| 60  = @varaccess
+| 61  = @methodaccess
+| 62  = @unannotatedtypeaccess
+| 63  = @arraytypeaccess
+| 64  = @packageaccess
+| 65  = @wildcardtypeaccess
+| 66  = @declannotation
+| 67  = @uniontypeaccess
+| 68  = @lambdaexpr
+| 69  = @memberref
+| 70  = @annotatedtypeaccess
+| 71  = @typeannotation
+| 72  = @intersectiontypeaccess
+| 73  = @switchexpr
+| 74  = @errorexpr
+| 75  = @whenexpr
+| 76  = @getclassexpr
+| 77  = @safecastexpr
+| 78  = @implicitcastexpr
+| 79  = @implicitnotnullexpr
+| 80  = @implicitcoerciontounitexpr
+| 81  = @notinstanceofexpr
+| 82  = @stmtexpr
+| 83  = @stringtemplateexpr
+| 84  = @notnullexpr
+| 85  = @unsafecoerceexpr
+| 86  = @valueeqexpr
+| 87  = @valueneexpr
+| 88  = @propertyref
+| 89  = @recordpatternexpr
+;
+
+/** Holds if this `when` expression was written as an `if` expression. */
+when_if(unique int id: @whenexpr ref);
+
+/** Holds if this `when` branch was written as an `else` branch. */
+when_branch_else(unique int id: @whenbranch ref);
+
+@classinstancexpr = @newexpr | @lambdaexpr | @memberref | @propertyref
+
+@annotation = @declannotation | @typeannotation
+@typeaccess = @unannotatedtypeaccess | @annotatedtypeaccess
+
+@assignment = @assignexpr
+             | @assignop;
+
+@unaryassignment = @postincexpr
+                 | @postdecexpr
+                 | @preincexpr
+                 | @predecexpr;
+
+@assignop = @assignaddexpr
+             | @assignsubexpr
+             | @assignmulexpr
+             | @assigndivexpr
+             | @assignremexpr
+             | @assignandexpr
+             | @assignorexpr
+             | @assignxorexpr
+             | @assignlshiftexpr
+             | @assignrshiftexpr
+             | @assignurshiftexpr;
+
+@literal = @booleanliteral
+             | @integerliteral
+             | @longliteral
+             | @floatingpointliteral
+             | @doubleliteral
+             | @characterliteral
+             | @stringliteral
+             | @nullliteral;
+
+@binaryexpr = @mulexpr
+             | @divexpr
+             | @remexpr
+             | @addexpr
+             | @subexpr
+             | @lshiftexpr
+             | @rshiftexpr
+             | @urshiftexpr
+             | @andbitexpr
+             | @orbitexpr
+             | @xorbitexpr
+             | @andlogicalexpr
+             | @orlogicalexpr
+             | @ltexpr
+             | @gtexpr
+             | @leexpr
+             | @geexpr
+             | @eqexpr
+             | @neexpr
+             | @valueeqexpr
+             | @valueneexpr;
+
+@unaryexpr =   @postincexpr
+             | @postdecexpr
+             | @preincexpr
+             | @predecexpr
+             | @minusexpr
+             | @plusexpr
+             | @bitnotexpr
+             | @lognotexpr
+             | @notnullexpr;
+
+@caller =  @classinstancexpr
+         | @methodaccess
+         | @constructorinvocationstmt
+         | @superconstructorinvocationstmt;
+
+callableBinding(
+  unique int callerid: @caller ref,
+  int callee: @callable ref
+);
+
+memberRefBinding(
+  unique int id: @expr ref,
+  int callable: @callable ref
+);
+
+propertyRefGetBinding(
+  unique int id: @expr ref,
+  int getter: @callable ref
+);
+
+propertyRefFieldBinding(
+  unique int id: @expr ref,
+  int field: @field ref
+);
+
+propertyRefSetBinding(
+  unique int id: @expr ref,
+  int setter: @callable ref
+);
+
+@exprparent = @stmt | @expr | @whenbranch | @callable | @field | @fielddecl | @classorinterface | @param | @localvar | @typevariable;
+
+variableBinding(
+  unique int expr: @varaccess ref,
+  int variable: @variable ref
+);
+
+@variable = @localscopevariable | @field;
+
+@localscopevariable = @localvar | @param;
+
+localvars(
+  unique int id: @localvar,
+  string nodeName: string ref,
+  int typeid: @type ref,
+  int parentid: @localvariabledeclexpr ref
+);
+
+localvarsKotlinType(
+  unique int id: @localvar ref,
+  int kttypeid: @kt_type ref
+);
+
+@namedexprorstmt = @breakstmt
+                 | @continuestmt
+                 | @labeledstmt
+                 | @literal;
+
+namestrings(
+  string name: string ref,
+  string value: string ref,
+  unique int parent: @namedexprorstmt ref
+);
+
+/*
+ * Modules
+ */
+
+#keyset[name]
+modules(
+  unique int id: @module,
+  string name: string ref
+);
+
+isOpen(
+  int id: @module ref
+);
+
+#keyset[fileId]
+cumodule(
+  int fileId: @file ref,
+  int moduleId: @module ref
+);
+
+@directive = @requires
+           | @exports
+           | @opens
+           | @uses
+           | @provides
+
+#keyset[directive]
+directives(
+  int id: @module ref,
+  int directive: @directive ref
+);
+
+requires(
+  unique int id: @requires,
+  int target: @module ref
+);
+
+isTransitive(
+  int id: @requires ref
+);
+
+isStatic(
+  int id: @requires ref
+);
+
+exports(
+  unique int id: @exports,
+  int target: @package ref
+);
+
+exportsTo(
+  int id: @exports ref,
+  int target: @module ref
+);
+
+opens(
+  unique int id: @opens,
+  int target: @package ref
+);
+
+opensTo(
+  int id: @opens ref,
+  int target: @module ref
+);
+
+uses(
+  unique int id: @uses,
+  string serviceInterface: string ref
+);
+
+provides(
+  unique int id: @provides,
+  string serviceInterface: string ref
+);
+
+providesWith(
+  int id: @provides ref,
+  string serviceImpl: string ref
+);
+
+isNullDefaultCase(
+  int id: @case ref
+);
+
+/*
+ * Javadoc
+ */
+
+javadoc(
+  unique int id: @javadoc
+);
+
+isNormalComment(
+  int commentid : @javadoc ref
+);
+
+isEolComment(
+  int commentid : @javadoc ref
+);
+
+hasJavadoc(
+  int documentableid: @member ref,
+  int javadocid: @javadoc ref
+);
+
+#keyset[parentid,idx]
+javadocTag(
+  unique int id: @javadocTag,
+  string name: string ref,
+  int parentid: @javadocParent ref,
+  int idx: int ref
+);
+
+#keyset[parentid,idx]
+javadocText(
+  unique int id: @javadocText,
+  string text: string ref,
+  int parentid: @javadocParent ref,
+  int idx: int ref
+);
+
+@javadocParent = @javadoc | @javadocTag;
+@javadocElement = @javadocTag | @javadocText;
+
+@classorinterfaceorpackage = @classorinterface | @package;
+@classorinterfaceorcallable = @classorinterface | @callable;
+@boundedtype = @typevariable | @wildcard;
+@reftype = @classorinterface | @array | @boundedtype | @errortype;
+@classorarray = @classorinterface | @array;
+@type = @primitive | @reftype;
+@callable = @method | @constructor;
+
+/** A program element that has a name. */
+@element = @package | @modifier | @annotation | @errortype |
+           @locatableElement;
+
+@locatableElement = @file | @primitive | @classorinterface | @method | @constructor | @param | @exception | @field |
+                    @boundedtype | @array | @localvar | @expr | @stmt | @import | @fielddecl | @kt_type | @kt_type_alias |
+                    @kt_property;
+
+@modifiable = @member_modifiable| @param | @localvar | @typevariable;
+
+@member_modifiable = @classorinterface | @method | @constructor | @field | @kt_property;
+
+@member = @method | @constructor | @field | @reftype ;
+
+/** A program element that has a location. */
+@locatable = @typebound | @javadoc | @javadocTag | @javadocText | @xmllocatable | @ktcomment |
+             @locatableElement;
+
+@top = @element | @locatable | @folder;
+
+/*
+ * XML Files
+ */
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+/*
+ * configuration files with key value pairs
+ */
+
+configs(
+  unique int id: @config
+);
+
+configNames(
+  unique int id: @configName,
+  int config: @config ref,
+  string name: string ref
+);
+
+configValues(
+  unique int id: @configValue,
+  int config: @config ref,
+  string value: string ref
+);
+
+configLocations(
+  int locatable: @configLocatable ref,
+  int location: @location_default ref
+);
+
+@configLocatable = @config | @configName | @configValue;
+
+ktComments(
+  unique int id: @ktcomment,
+  int kind: int ref,
+  string text : string ref
+)
+
+ktCommentSections(
+  unique int id: @ktcommentsection,
+  int comment: @ktcomment ref,
+  string content : string ref
+)
+
+ktCommentSectionNames(
+  unique int id: @ktcommentsection ref,
+  string name : string ref
+)
+
+ktCommentSectionSubjectNames(
+  unique int id: @ktcommentsection ref,
+  string subjectname : string ref
+)
+
+#keyset[id, owner]
+ktCommentOwners(
+  int id: @ktcomment ref,
+  int owner: @top ref
+)
+
+ktExtensionFunctions(
+  unique int id: @method ref,
+  int typeid: @type ref,
+  int kttypeid: @kt_type ref
+)
+
+ktProperties(
+  unique int id: @kt_property,
+  string nodeName: string ref
+)
+
+ktPropertyGetters(
+  unique int id: @kt_property ref,
+  int getter: @method ref
+)
+
+ktPropertySetters(
+  unique int id: @kt_property ref,
+  int setter: @method ref
+)
+
+ktPropertyBackingFields(
+  unique int id: @kt_property ref,
+  int backingField: @field ref
+)
+
+ktSyntheticBody(
+  unique int id: @callable ref,
+  int kind: int ref
+  // 1: ENUM_VALUES
+  // 2: ENUM_VALUEOF
+  // 3: ENUM_ENTRIES
+)
+
+ktLocalFunction(
+  unique int id: @method ref
+)
+
+ktInitializerAssignment(
+  unique int id: @assignexpr ref
+)
+
+ktPropertyDelegates(
+  unique int id: @kt_property ref,
+  unique int variableId: @variable ref
+)
+
+/**
+ * If `id` is a compiler generated element, then the kind indicates the
+ * reason that the compiler generated it.
+ * See `Element.compilerGeneratedReason()` for an explanation of what
+ * each `kind` means.
+ */
+compiler_generated(
+  unique int id: @element ref,
+  int kind: int ref
+)
+
+ktFunctionOriginalNames(
+  unique int id: @method ref,
+  string name: string ref
+)
+
+ktDataClasses(
+  unique int id: @classorinterface ref
+)
diff --git a/java/downgrades/9f6026c400996c13842974b24f076a486ad1f69c/semmlecode.dbscheme b/java/downgrades/9f6026c400996c13842974b24f076a486ad1f69c/semmlecode.dbscheme
new file mode 100644
index 00000000000..1b8f5f4c747
--- /dev/null
+++ b/java/downgrades/9f6026c400996c13842974b24f076a486ad1f69c/semmlecode.dbscheme
@@ -0,0 +1,1236 @@
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   javac A.java B.java C.java
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   javac A.java B.java C.java
+     */
+    unique int id : @compilation,
+    int kind: int ref,
+    string cwd : string ref,
+    string name : string ref
+);
+
+case @compilation.kind of
+   1  = @javacompilation
+|  2  = @kotlincompilation
+;
+
+compilation_started(
+    int id : @compilation ref
+)
+
+compilation_info(
+    int id : @compilation ref,
+    string info_key: string ref,
+    string info_value: string ref
+)
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   javac A.java B.java C.java
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--javac-args`
+ * 2   | A.java
+ * 3   | B.java
+ * 4   | C.java
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@@@someFile` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   javac A.java B.java C.java
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | A.java
+ * 1   | B.java
+ * 2   | C.java
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * For each file recorded in `compilation_compiling_files`,
+ * there will be a corresponding row in
+ * `compilation_compiling_files_completed` once extraction
+ * of that file is complete. The `result` will indicate the
+ * extraction result:
+ *
+ *     0: Successfully extracted
+ *     1: Errors were encountered, but extraction recovered
+ *     2: Errors were encountered, and extraction could not recover
+ */
+#keyset[id, num]
+compilation_compiling_files_completed(
+    int id : @compilation ref,
+    int num : int ref,
+    int result : int ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * The `cpu_seconds` and `elapsed_seconds` are the CPU time and elapsed
+ * time (respectively) that the original compilation (not the extraction)
+ * took for compiler invocation `id`.
+ */
+compilation_compiler_times(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ * The `result` will indicate the extraction result:
+ *
+ *     0: Successfully extracted
+ *     1: Errors were encountered, but extraction recovered
+ *     2: Errors were encountered, and extraction could not recover
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref,
+    int result : int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    string generated_by: string ref, // TODO: Sync this with the other languages?
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location_default ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    unique int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/*
+ * External artifacts
+ */
+
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+sourceLocationPrefix(
+  string prefix : string ref
+);
+
+databaseMetadata(
+  string metadataKey : string ref,
+  string value : string ref
+);
+
+overlayChangedFiles(
+  string path: string ref
+);
+
+/*
+ * SMAP
+ */
+
+smap_header(
+  int outputFileId: @file ref,
+  string outputFilename: string ref,
+  string defaultStratum: string ref
+);
+
+smap_files(
+  int outputFileId: @file ref,
+  string stratum: string ref,
+  int inputFileNum: int ref,
+  string inputFileName: string ref,
+  int inputFileId: @file ref
+);
+
+smap_lines(
+  int outputFileId: @file ref,
+  string stratum: string ref,
+  int inputFileNum: int ref,
+  int inputStartLine: int ref,
+  int inputLineCount: int ref,
+  int outputStartLine: int ref,
+  int outputLineIncrement: int ref
+);
+
+/*
+ * Locations and files
+ */
+
+@location = @location_default ;
+
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+hasLocation(
+  int locatableid: @locatable ref,
+  int id: @location ref
+);
+
+@sourceline = @locatable ;
+
+#keyset[element_id]
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @folder | @file
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*
+ * Java
+ */
+
+cupackage(
+  unique int id: @file ref,
+  int packageid: @package ref
+);
+
+#keyset[fileid,keyName]
+jarManifestMain(
+  int fileid: @file ref,
+  string keyName: string ref,
+  string value: string ref
+);
+
+#keyset[fileid,entryName,keyName]
+jarManifestEntries(
+  int fileid: @file ref,
+  string entryName: string ref,
+  string keyName: string ref,
+  string value: string ref
+);
+
+packages(
+  unique int id: @package,
+  string nodeName: string ref
+);
+
+primitives(
+  unique int id: @primitive,
+  string nodeName: string ref
+);
+
+modifiers(
+  unique int id: @modifier,
+  string nodeName: string ref
+);
+
+/**
+ * An errortype is used when the extractor is unable to extract a type
+ * correctly for some reason.
+ */
+error_type(
+  unique int id: @errortype
+);
+
+classes_or_interfaces(
+  unique int id: @classorinterface,
+  string nodeName: string ref,
+  int parentid: @package ref,
+  int sourceid: @classorinterface ref
+);
+
+file_class(
+  int id: @classorinterface ref
+);
+
+class_object(
+  unique int id: @classorinterface ref,
+  unique int instance: @field ref
+);
+
+type_companion_object(
+  unique int id: @classorinterface ref,
+  unique int instance: @field ref,
+  unique int companion_object: @classorinterface ref
+);
+
+kt_nullable_types(
+  unique int id: @kt_nullable_type,
+  int classid: @reftype ref
+)
+
+kt_notnull_types(
+  unique int id: @kt_notnull_type,
+  int classid: @reftype ref
+)
+
+kt_type_alias(
+  unique int id: @kt_type_alias,
+  string name: string ref,
+  int kttypeid: @kt_type ref
+)
+
+@kt_type = @kt_nullable_type | @kt_notnull_type
+
+isInterface(
+  unique int id: @classorinterface ref
+);
+
+isRecord(
+  unique int id: @classorinterface ref
+);
+
+fielddecls(
+  unique int id: @fielddecl,
+  int parentid: @reftype ref
+);
+
+#keyset[fieldId] #keyset[fieldDeclId,pos]
+fieldDeclaredIn(
+  int fieldId: @field ref,
+  int fieldDeclId: @fielddecl ref,
+  int pos: int ref
+);
+
+fields(
+  unique int id: @field,
+  string nodeName: string ref,
+  int typeid: @type ref,
+  int parentid: @reftype ref
+);
+
+fieldsKotlinType(
+  unique int id: @field ref,
+  int kttypeid: @kt_type ref
+);
+
+constrs(
+  unique int id: @constructor,
+  string nodeName: string ref,
+  string signature: string ref,
+  int typeid: @type ref,
+  int parentid: @reftype ref,
+  int sourceid: @constructor ref
+);
+
+constrsKotlinType(
+  unique int id: @constructor ref,
+  int kttypeid: @kt_type ref
+);
+
+methods(
+  unique int id: @method,
+  string nodeName: string ref,
+  string signature: string ref,
+  int typeid: @type ref,
+  int parentid: @reftype ref,
+  int sourceid: @method ref
+);
+
+methodsKotlinType(
+  unique int id: @method ref,
+  int kttypeid: @kt_type ref
+);
+
+#keyset[parentid,pos]
+params(
+  unique int id: @param,
+  int typeid: @type ref,
+  int pos: int ref,
+  int parentid: @callable ref,
+  int sourceid: @param ref
+);
+
+paramsKotlinType(
+  unique int id: @param ref,
+  int kttypeid: @kt_type ref
+);
+
+paramName(
+  unique int id: @param ref,
+  string nodeName: string ref
+);
+
+isVarargsParam(
+  int param: @param ref
+);
+
+exceptions(
+  unique int id: @exception,
+  int typeid: @type ref,
+  int parentid: @callable ref
+);
+
+isAnnotType(
+  int interfaceid: @classorinterface ref
+);
+
+isAnnotElem(
+  int methodid: @method ref
+);
+
+annotValue(
+  int parentid: @annotation ref,
+  int id2: @method ref,
+  unique int value: @expr ref
+);
+
+isEnumType(
+  int classid: @classorinterface ref
+);
+
+isEnumConst(
+  int fieldid: @field ref
+);
+
+#keyset[parentid,pos]
+typeVars(
+  unique int id: @typevariable,
+  string nodeName: string ref,
+  int pos: int ref,
+  int parentid: @classorinterfaceorcallable ref
+);
+
+wildcards(
+  unique int id: @wildcard,
+  string nodeName: string ref,
+  int kind: int ref
+);
+
+#keyset[parentid,pos]
+typeBounds(
+  unique int id: @typebound,
+  int typeid: @reftype ref,
+  int pos: int ref,
+  int parentid: @boundedtype ref
+);
+
+#keyset[parentid,pos]
+typeArgs(
+  int argumentid: @reftype ref,
+  int pos: int ref,
+  int parentid: @classorinterfaceorcallable ref
+);
+
+isParameterized(
+  int memberid: @member ref
+);
+
+isRaw(
+  int memberid: @member ref
+);
+
+#keyset[classid] #keyset[parent]
+isAnonymClass(
+  int classid: @classorinterface ref,
+  int parent: @classinstancexpr ref
+);
+
+#keyset[typeid] #keyset[parent]
+isLocalClassOrInterface(
+  int typeid: @classorinterface ref,
+  int parent: @localtypedeclstmt ref
+);
+
+isDefConstr(
+  int constructorid: @constructor ref
+);
+
+#keyset[exprId]
+lambdaKind(
+  int exprId: @lambdaexpr ref,
+  int bodyKind: int ref
+);
+
+isCanonicalConstr(
+  int constructorid: @constructor ref
+);
+
+arrays(
+  unique int id: @array,
+  string nodeName: string ref,
+  int elementtypeid: @type ref,
+  int dimension: int ref,
+  int componenttypeid: @type ref
+);
+
+enclInReftype(
+  unique int child: @reftype ref,
+  int parent: @reftype ref
+);
+
+extendsReftype(
+  int id1: @reftype ref,
+  int id2: @classorinterface ref
+);
+
+implInterface(
+  int id1: @classorarray ref,
+  int id2: @classorinterface ref
+);
+
+permits(
+  int id1: @classorinterface ref,
+  int id2: @classorinterface ref
+);
+
+hasModifier(
+  int id1: @modifiable ref,
+  int id2: @modifier ref
+);
+
+imports(
+  unique int id: @import,
+  int holder: @classorinterfaceorpackage ref,
+  string name: string ref,
+  int kind: int ref
+);
+
+#keyset[parent,idx]
+stmts(
+  unique int id: @stmt,
+  int kind: int ref,
+  int parent: @stmtparent ref,
+  int idx: int ref,
+  int bodydecl: @callable ref
+);
+
+@stmtparent = @callable | @stmt | @switchexpr | @whenexpr| @stmtexpr;
+
+case @stmt.kind of
+  0 = @block
+| 1 = @ifstmt
+| 2 = @forstmt
+| 3 = @enhancedforstmt
+| 4 = @whilestmt
+| 5 = @dostmt
+| 6 = @trystmt
+| 7 = @switchstmt
+| 8 = @synchronizedstmt
+| 9 = @returnstmt
+| 10 = @throwstmt
+| 11 = @breakstmt
+| 12 = @continuestmt
+| 13 = @emptystmt
+| 14 = @exprstmt
+| 15 = @labeledstmt
+| 16 = @assertstmt
+| 17 = @localvariabledeclstmt
+| 18 = @localtypedeclstmt
+| 19 = @constructorinvocationstmt
+| 20 = @superconstructorinvocationstmt
+| 21 = @case
+| 22 = @catchclause
+| 23 = @yieldstmt
+| 24 = @errorstmt
+| 25 = @whenbranch
+;
+
+#keyset[parent,idx]
+exprs(
+  unique int id: @expr,
+  int kind: int ref,
+  int typeid: @type ref,
+  int parent: @exprparent ref,
+  int idx: int ref
+);
+
+exprsKotlinType(
+  unique int id: @expr ref,
+  int kttypeid: @kt_type ref
+);
+
+callableEnclosingExpr(
+  unique int id: @expr ref,
+  int callable_id: @callable ref
+);
+
+statementEnclosingExpr(
+  unique int id: @expr ref,
+  int statement_id: @stmt ref
+);
+
+isParenthesized(
+  unique int id: @expr ref,
+  int parentheses: int ref
+);
+
+case @expr.kind of
+   1  = @arrayaccess
+|  2  = @arraycreationexpr
+|  3  = @arrayinit
+|  4  = @assignexpr
+|  5  = @assignaddexpr
+|  6  = @assignsubexpr
+|  7  = @assignmulexpr
+|  8  = @assigndivexpr
+|  9  = @assignremexpr
+| 10  = @assignandexpr
+| 11  = @assignorexpr
+| 12  = @assignxorexpr
+| 13  = @assignlshiftexpr
+| 14  = @assignrshiftexpr
+| 15  = @assignurshiftexpr
+| 16  = @booleanliteral
+| 17  = @integerliteral
+| 18  = @longliteral
+| 19  = @floatingpointliteral
+| 20  = @doubleliteral
+| 21  = @characterliteral
+| 22  = @stringliteral
+| 23  = @nullliteral
+| 24  = @mulexpr
+| 25  = @divexpr
+| 26  = @remexpr
+| 27  = @addexpr
+| 28  = @subexpr
+| 29  = @lshiftexpr
+| 30  = @rshiftexpr
+| 31  = @urshiftexpr
+| 32  = @andbitexpr
+| 33  = @orbitexpr
+| 34  = @xorbitexpr
+| 35  = @andlogicalexpr
+| 36  = @orlogicalexpr
+| 37  = @ltexpr
+| 38  = @gtexpr
+| 39  = @leexpr
+| 40  = @geexpr
+| 41  = @eqexpr
+| 42  = @neexpr
+| 43  = @postincexpr
+| 44  = @postdecexpr
+| 45  = @preincexpr
+| 46  = @predecexpr
+| 47  = @minusexpr
+| 48  = @plusexpr
+| 49  = @bitnotexpr
+| 50  = @lognotexpr
+| 51  = @castexpr
+| 52  = @newexpr
+| 53  = @conditionalexpr
+| 54  = @parexpr         // deprecated
+| 55  = @instanceofexpr
+| 56  = @localvariabledeclexpr
+| 57  = @typeliteral
+| 58  = @thisaccess
+| 59  = @superaccess
+| 60  = @varaccess
+| 61  = @methodaccess
+| 62  = @unannotatedtypeaccess
+| 63  = @arraytypeaccess
+| 64  = @packageaccess
+| 65  = @wildcardtypeaccess
+| 66  = @declannotation
+| 67  = @uniontypeaccess
+| 68  = @lambdaexpr
+| 69  = @memberref
+| 70  = @annotatedtypeaccess
+| 71  = @typeannotation
+| 72  = @intersectiontypeaccess
+| 73  = @switchexpr
+| 74  = @errorexpr
+| 75  = @whenexpr
+| 76  = @getclassexpr
+| 77  = @safecastexpr
+| 78  = @implicitcastexpr
+| 79  = @implicitnotnullexpr
+| 80  = @implicitcoerciontounitexpr
+| 81  = @notinstanceofexpr
+| 82  = @stmtexpr
+| 83  = @stringtemplateexpr
+| 84  = @notnullexpr
+| 85  = @unsafecoerceexpr
+| 86  = @valueeqexpr
+| 87  = @valueneexpr
+| 88  = @propertyref
+| 89  = @recordpatternexpr
+;
+
+/** Holds if this `when` expression was written as an `if` expression. */
+when_if(unique int id: @whenexpr ref);
+
+/** Holds if this `when` branch was written as an `else` branch. */
+when_branch_else(unique int id: @whenbranch ref);
+
+@classinstancexpr = @newexpr | @lambdaexpr | @memberref | @propertyref
+
+@annotation = @declannotation | @typeannotation
+@typeaccess = @unannotatedtypeaccess | @annotatedtypeaccess
+
+@assignment = @assignexpr
+             | @assignop;
+
+@unaryassignment = @postincexpr
+                 | @postdecexpr
+                 | @preincexpr
+                 | @predecexpr;
+
+@assignop = @assignaddexpr
+             | @assignsubexpr
+             | @assignmulexpr
+             | @assigndivexpr
+             | @assignremexpr
+             | @assignandexpr
+             | @assignorexpr
+             | @assignxorexpr
+             | @assignlshiftexpr
+             | @assignrshiftexpr
+             | @assignurshiftexpr;
+
+@literal = @booleanliteral
+             | @integerliteral
+             | @longliteral
+             | @floatingpointliteral
+             | @doubleliteral
+             | @characterliteral
+             | @stringliteral
+             | @nullliteral;
+
+@binaryexpr = @mulexpr
+             | @divexpr
+             | @remexpr
+             | @addexpr
+             | @subexpr
+             | @lshiftexpr
+             | @rshiftexpr
+             | @urshiftexpr
+             | @andbitexpr
+             | @orbitexpr
+             | @xorbitexpr
+             | @andlogicalexpr
+             | @orlogicalexpr
+             | @ltexpr
+             | @gtexpr
+             | @leexpr
+             | @geexpr
+             | @eqexpr
+             | @neexpr
+             | @valueeqexpr
+             | @valueneexpr;
+
+@unaryexpr =   @postincexpr
+             | @postdecexpr
+             | @preincexpr
+             | @predecexpr
+             | @minusexpr
+             | @plusexpr
+             | @bitnotexpr
+             | @lognotexpr
+             | @notnullexpr;
+
+@caller =  @classinstancexpr
+         | @methodaccess
+         | @constructorinvocationstmt
+         | @superconstructorinvocationstmt;
+
+callableBinding(
+  unique int callerid: @caller ref,
+  int callee: @callable ref
+);
+
+memberRefBinding(
+  unique int id: @expr ref,
+  int callable: @callable ref
+);
+
+propertyRefGetBinding(
+  unique int id: @expr ref,
+  int getter: @callable ref
+);
+
+propertyRefFieldBinding(
+  unique int id: @expr ref,
+  int field: @field ref
+);
+
+propertyRefSetBinding(
+  unique int id: @expr ref,
+  int setter: @callable ref
+);
+
+@exprparent = @stmt | @expr | @whenbranch | @callable | @field | @fielddecl | @classorinterface | @param | @localvar | @typevariable;
+
+variableBinding(
+  unique int expr: @varaccess ref,
+  int variable: @variable ref
+);
+
+@variable = @localscopevariable | @field;
+
+@localscopevariable = @localvar | @param;
+
+localvars(
+  unique int id: @localvar,
+  string nodeName: string ref,
+  int typeid: @type ref,
+  int parentid: @localvariabledeclexpr ref
+);
+
+localvarsKotlinType(
+  unique int id: @localvar ref,
+  int kttypeid: @kt_type ref
+);
+
+@namedexprorstmt = @breakstmt
+                 | @continuestmt
+                 | @labeledstmt
+                 | @literal;
+
+namestrings(
+  string name: string ref,
+  string value: string ref,
+  unique int parent: @namedexprorstmt ref
+);
+
+/*
+ * Modules
+ */
+
+#keyset[name]
+modules(
+  unique int id: @module,
+  string name: string ref
+);
+
+isOpen(
+  int id: @module ref
+);
+
+#keyset[fileId]
+cumodule(
+  int fileId: @file ref,
+  int moduleId: @module ref
+);
+
+@directive = @requires
+           | @exports
+           | @opens
+           | @uses
+           | @provides
+
+#keyset[directive]
+directives(
+  int id: @module ref,
+  int directive: @directive ref
+);
+
+requires(
+  unique int id: @requires,
+  int target: @module ref
+);
+
+isTransitive(
+  int id: @requires ref
+);
+
+isStatic(
+  int id: @requires ref
+);
+
+exports(
+  unique int id: @exports,
+  int target: @package ref
+);
+
+exportsTo(
+  int id: @exports ref,
+  int target: @module ref
+);
+
+opens(
+  unique int id: @opens,
+  int target: @package ref
+);
+
+opensTo(
+  int id: @opens ref,
+  int target: @module ref
+);
+
+uses(
+  unique int id: @uses,
+  string serviceInterface: string ref
+);
+
+provides(
+  unique int id: @provides,
+  string serviceInterface: string ref
+);
+
+providesWith(
+  int id: @provides ref,
+  string serviceImpl: string ref
+);
+
+isNullDefaultCase(
+  int id: @case ref
+);
+
+/*
+ * Javadoc
+ */
+
+javadoc(
+  unique int id: @javadoc
+);
+
+isNormalComment(
+  int commentid : @javadoc ref
+);
+
+isEolComment(
+  int commentid : @javadoc ref
+);
+
+hasJavadoc(
+  int documentableid: @member ref,
+  int javadocid: @javadoc ref
+);
+
+#keyset[parentid,idx]
+javadocTag(
+  unique int id: @javadocTag,
+  string name: string ref,
+  int parentid: @javadocParent ref,
+  int idx: int ref
+);
+
+#keyset[parentid,idx]
+javadocText(
+  unique int id: @javadocText,
+  string text: string ref,
+  int parentid: @javadocParent ref,
+  int idx: int ref
+);
+
+@javadocParent = @javadoc | @javadocTag;
+@javadocElement = @javadocTag | @javadocText;
+
+@classorinterfaceorpackage = @classorinterface | @package;
+@classorinterfaceorcallable = @classorinterface | @callable;
+@boundedtype = @typevariable | @wildcard;
+@reftype = @classorinterface | @array | @boundedtype | @errortype;
+@classorarray = @classorinterface | @array;
+@type = @primitive | @reftype;
+@callable = @method | @constructor;
+
+/** A program element that has a name. */
+@element = @package | @modifier | @annotation | @errortype |
+           @locatableElement;
+
+@locatableElement = @file | @primitive | @classorinterface | @method | @constructor | @param | @exception | @field |
+                    @boundedtype | @array | @localvar | @expr | @stmt | @import | @fielddecl | @kt_type | @kt_type_alias |
+                    @kt_property;
+
+@modifiable = @member_modifiable| @param | @localvar | @typevariable;
+
+@member_modifiable = @classorinterface | @method | @constructor | @field | @kt_property;
+
+@member = @method | @constructor | @field | @reftype ;
+
+/** A program element that has a location. */
+@locatable = @typebound | @javadoc | @javadocTag | @javadocText | @xmllocatable | @ktcomment |
+             @locatableElement;
+
+@top = @element | @locatable | @folder;
+
+/*
+ * XML Files
+ */
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+/*
+ * configuration files with key value pairs
+ */
+
+configs(
+  unique int id: @config
+);
+
+configNames(
+  unique int id: @configName,
+  int config: @config ref,
+  string name: string ref
+);
+
+configValues(
+  unique int id: @configValue,
+  int config: @config ref,
+  string value: string ref
+);
+
+configLocations(
+  int locatable: @configLocatable ref,
+  int location: @location_default ref
+);
+
+@configLocatable = @config | @configName | @configValue;
+
+ktComments(
+  unique int id: @ktcomment,
+  int kind: int ref,
+  string text : string ref
+)
+
+ktCommentSections(
+  unique int id: @ktcommentsection,
+  int comment: @ktcomment ref,
+  string content : string ref
+)
+
+ktCommentSectionNames(
+  unique int id: @ktcommentsection ref,
+  string name : string ref
+)
+
+ktCommentSectionSubjectNames(
+  unique int id: @ktcommentsection ref,
+  string subjectname : string ref
+)
+
+#keyset[id, owner]
+ktCommentOwners(
+  int id: @ktcomment ref,
+  int owner: @top ref
+)
+
+ktExtensionFunctions(
+  unique int id: @method ref,
+  int typeid: @type ref,
+  int kttypeid: @kt_type ref
+)
+
+ktProperties(
+  unique int id: @kt_property,
+  string nodeName: string ref
+)
+
+ktPropertyGetters(
+  unique int id: @kt_property ref,
+  int getter: @method ref
+)
+
+ktPropertySetters(
+  unique int id: @kt_property ref,
+  int setter: @method ref
+)
+
+ktPropertyBackingFields(
+  unique int id: @kt_property ref,
+  int backingField: @field ref
+)
+
+ktSyntheticBody(
+  unique int id: @callable ref,
+  int kind: int ref
+  // 1: ENUM_VALUES
+  // 2: ENUM_VALUEOF
+  // 3: ENUM_ENTRIES
+)
+
+ktLocalFunction(
+  unique int id: @method ref
+)
+
+ktInitializerAssignment(
+  unique int id: @assignexpr ref
+)
+
+ktPropertyDelegates(
+  unique int id: @kt_property ref,
+  unique int variableId: @variable ref
+)
+
+/**
+ * If `id` is a compiler generated element, then the kind indicates the
+ * reason that the compiler generated it.
+ * See `Element.compilerGeneratedReason()` for an explanation of what
+ * each `kind` means.
+ */
+compiler_generated(
+  unique int id: @element ref,
+  int kind: int ref
+)
+
+ktFunctionOriginalNames(
+  unique int id: @method ref,
+  string name: string ref
+)
+
+ktDataClasses(
+  unique int id: @classorinterface ref
+)
diff --git a/java/downgrades/9f6026c400996c13842974b24f076a486ad1f69c/upgrade.properties b/java/downgrades/9f6026c400996c13842974b24f076a486ad1f69c/upgrade.properties
new file mode 100644
index 00000000000..cfc9417d13e
--- /dev/null
+++ b/java/downgrades/9f6026c400996c13842974b24f076a486ad1f69c/upgrade.properties
@@ -0,0 +1,3 @@
+description: Remove Java 25 compact source files support by removing `isImplicitClass` table
+compatibility: partial
+isImplicitClass.rel: delete
diff --git a/java/kotlin-extractor/src/main/kotlin/ExternalDeclExtractor.kt b/java/kotlin-extractor/src/main/kotlin/ExternalDeclExtractor.kt
index 43cfad2f621..0a9e8df8073 100644
--- a/java/kotlin-extractor/src/main/kotlin/ExternalDeclExtractor.kt
+++ b/java/kotlin-extractor/src/main/kotlin/ExternalDeclExtractor.kt
@@ -1,5 +1,6 @@
 package com.github.codeql
 
+import com.github.codeql.utils.ClassInstanceStack
 import com.github.codeql.utils.isExternalFileClassMember
 import com.semmle.extractor.java.OdasaOutput
 import com.semmle.util.data.StringDigestor
@@ -18,6 +19,7 @@ class ExternalDeclExtractor(
     val compression: Compression,
     val invocationTrapFile: String,
     val sourceFilePath: String,
+    val classInstanceStack: ClassInstanceStack,
     val primitiveTypeMapping: PrimitiveTypeMapping,
     val pluginContext: IrPluginContext,
     val globalExtensionState: KotlinExtractorGlobalState,
@@ -163,6 +165,7 @@ class ExternalDeclExtractor(
                                 binaryPath,
                                 manager,
                                 this,
+                                classInstanceStack,
                                 primitiveTypeMapping,
                                 pluginContext,
                                 KotlinFileExtractor.DeclarationStack(),
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt b/java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt
index 1fc8ee37fc0..9f524de737e 100644
--- a/java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt
+++ b/java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt
@@ -1,5 +1,6 @@
 package com.github.codeql
 
+import com.github.codeql.utils.ClassInstanceStack
 import com.github.codeql.utils.versions.usesK2
 import com.semmle.util.files.FileUtil
 import com.semmle.util.trap.pathtransformers.PathTransformer
@@ -151,6 +152,7 @@ class KotlinExtractorExtension(
             }
             val compression = getCompression(logger)
 
+            val classInstanceStack = ClassInstanceStack()
             val primitiveTypeMapping = PrimitiveTypeMapping(logger, pluginContext)
             // FIXME: FileUtil expects a static global logger
             // which should be provided by SLF4J's factory facility. For now we set it here.
@@ -182,6 +184,7 @@ class KotlinExtractorExtension(
                     trapDir,
                     srcDir,
                     file,
+                    classInstanceStack,
                     primitiveTypeMapping,
                     pluginContext,
                     globalExtensionState
@@ -358,6 +361,7 @@ private fun doFile(
     dbTrapDir: File,
     dbSrcDir: File,
     srcFile: IrFile,
+    classInstanceStack: ClassInstanceStack,
     primitiveTypeMapping: PrimitiveTypeMapping,
     pluginContext: IrPluginContext,
     globalExtensionState: KotlinExtractorGlobalState
@@ -415,6 +419,7 @@ private fun doFile(
                         compression,
                         invocationTrapFile,
                         srcFilePath,
+                        classInstanceStack,
                         primitiveTypeMapping,
                         pluginContext,
                         globalExtensionState,
@@ -429,6 +434,7 @@ private fun doFile(
                         srcFilePath,
                         null,
                         externalDeclExtractor,
+                        classInstanceStack,
                         primitiveTypeMapping,
                         pluginContext,
                         KotlinFileExtractor.DeclarationStack(),
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt b/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
index 376736611d1..72c766bb082 100644
--- a/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
+++ b/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
@@ -62,6 +62,7 @@ open class KotlinFileExtractor(
     val filePath: String,
     dependencyCollector: OdasaOutput.TrapFileManager?,
     externalClassExtractor: ExternalDeclExtractor,
+    classInstanceStack: ClassInstanceStack,
     primitiveTypeMapping: PrimitiveTypeMapping,
     pluginContext: IrPluginContext,
     val declarationStack: DeclarationStack,
@@ -72,6 +73,7 @@ open class KotlinFileExtractor(
         tw,
         dependencyCollector,
         externalClassExtractor,
+        classInstanceStack,
         primitiveTypeMapping,
         pluginContext,
         globalExtensionState
@@ -496,12 +498,17 @@ open class KotlinFileExtractor(
             }
 
             extractClassModifiers(c, id)
-            extractClassSupertypes(
-                c,
-                id,
-                if (argsIncludingOuterClasses == null) ExtractSupertypesMode.Raw
-                else ExtractSupertypesMode.Specialised(argsIncludingOuterClasses)
-            )
+            classInstanceStack.push(c)
+            try {
+                extractClassSupertypes(
+                    c,
+                    id,
+                    if (argsIncludingOuterClasses == null) ExtractSupertypesMode.Raw
+                    else ExtractSupertypesMode.Specialised(argsIncludingOuterClasses)
+                )
+            } finally {
+                classInstanceStack.pop()
+            }
 
             val locId = getLocation(c, argsIncludingOuterClasses)
             tw.writeHasLocation(id, locId)
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt b/java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt
index 2f87c77f8ee..83cbec771fc 100644
--- a/java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt
+++ b/java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt
@@ -49,6 +49,7 @@ open class KotlinUsesExtractor(
     open val tw: TrapWriter,
     val dependencyCollector: OdasaOutput.TrapFileManager?,
     val externalClassExtractor: ExternalDeclExtractor,
+    val classInstanceStack: ClassInstanceStack,
     val primitiveTypeMapping: PrimitiveTypeMapping,
     val pluginContext: IrPluginContext,
     val globalExtensionState: KotlinExtractorGlobalState
@@ -182,6 +183,7 @@ open class KotlinUsesExtractor(
                 filePath,
                 dependencyCollector,
                 externalClassExtractor,
+                classInstanceStack,
                 primitiveTypeMapping,
                 pluginContext,
                 newDeclarationStack,
@@ -199,6 +201,7 @@ open class KotlinUsesExtractor(
             clsFile.path,
             dependencyCollector,
             externalClassExtractor,
+            classInstanceStack,
             primitiveTypeMapping,
             pluginContext,
             newDeclarationStack,
@@ -537,6 +540,19 @@ open class KotlinUsesExtractor(
         return Pair(p?.first ?: c, p?.second ?: argsIncludingOuterClassesBeforeReplacement)
     }
 
+    private fun avoidInfiniteRecursion(
+        pair: Pair<IrClass, List<IrTypeArgument>?>
+    ): Pair<IrClass, List<IrTypeArgument>?> {
+        val c = pair.first
+        val args = pair.second
+        if (args != null && args.isNotEmpty() && classInstanceStack.possiblyCyclicExtraction(c, args)) {
+            logger.warn("Making use of ${c.name} a raw type to avoid infinite recursion")
+            return Pair(c, null)
+        } else {
+            return pair
+        }
+    }
+
     // `typeArgs` can be null to describe a raw generic type.
     // For non-generic types it will be zero-length list.
     private fun addClassLabel(
@@ -545,7 +561,7 @@ open class KotlinUsesExtractor(
         inReceiverContext: Boolean = false
     ): TypeResult<DbClassorinterface> {
         val replaced =
-            tryReplaceType(cBeforeReplacement, argsIncludingOuterClassesBeforeReplacement)
+            avoidInfiniteRecursion(tryReplaceType(cBeforeReplacement, argsIncludingOuterClassesBeforeReplacement))
         val replacedClass = replaced.first
         val replacedArgsIncludingOuterClasses = replaced.second
 
diff --git a/java/kotlin-extractor/src/main/kotlin/utils/ClassInstanceStack.kt b/java/kotlin-extractor/src/main/kotlin/utils/ClassInstanceStack.kt
new file mode 100644
index 00000000000..fdd0deb5151
--- /dev/null
+++ b/java/kotlin-extractor/src/main/kotlin/utils/ClassInstanceStack.kt
@@ -0,0 +1,47 @@
+package com.github.codeql.utils
+
+import java.util.Stack
+import org.jetbrains.kotlin.ir.declarations.IrClass
+import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
+import org.jetbrains.kotlin.ir.types.*
+
+class ClassInstanceStack {
+    private val stack: Stack<IrClass> = Stack()
+
+    fun push(c: IrClass) = stack.push(c)
+    fun pop() = stack.pop()
+
+    private fun checkTypeArgs(sym: IrClassSymbol, args: List<IrTypeArgument>): Boolean {
+        for (arg in args) {
+            if (arg is IrTypeProjection) {
+                if (checkType(sym, arg.type)) {
+                    return true
+                }
+            }
+        }
+        return false
+    }
+
+    private fun checkType(sym: IrClassSymbol, type: IrType): Boolean {
+        if (type is IrSimpleType) {
+            val decl = type.classifier.owner
+            if (decl.symbol == sym) {
+                return true
+            }
+            if (checkTypeArgs(sym, type.arguments)) {
+                return true
+            }
+        }
+        return false
+    }
+
+    fun possiblyCyclicExtraction(classToCheck: IrClass, args: List<IrTypeArgument>): Boolean {
+        for (c in stack) {
+            if (c.symbol == classToCheck.symbol && checkTypeArgs(c.symbol, args)) {
+                return true
+            }
+        }
+        return false
+    }
+}
+
diff --git a/java/ql/integration-tests/java/buildless-dependency-different-repository/test.py b/java/ql/integration-tests/java/buildless-dependency-different-repository/test.py
index 6e0e201d9a2..a74fd05be8f 100644
--- a/java/ql/integration-tests/java/buildless-dependency-different-repository/test.py
+++ b/java/ql/integration-tests/java/buildless-dependency-different-repository/test.py
@@ -1,12 +1,29 @@
 import subprocess
 import logging
+import time
+import socket
+
+
+def wait_for_port(port, process, timeout=100):
+    start = time.time()
+    while time.time() - start < timeout:
+        # Check if process died
+        if process.poll() is not None:
+            raise RuntimeError(f"Server process exited with code {process.returncode}")
+        try:
+            with socket.create_connection(("localhost", port), timeout=1):
+                return True
+        except (socket.timeout, ConnectionRefusedError, OSError):
+            time.sleep(0.2)
+    raise RuntimeError(f"Port {port} not ready within {timeout}s")
 
 
 def test(codeql, java):
-    # Each of these serves the "repo" and "repo2" directories on http://localhost:924[89]
-    repo_server_process = subprocess.Popen(["python3", "-m", "http.server", "9428"], cwd="repo")
-    repo_server_process2 = subprocess.Popen(["python3", "-m", "http.server", "9429"], cwd="repo2")
+    repo_server_process = subprocess.Popen(["python3", "-m", "http.server", "9428", "-b", "localhost"], cwd="repo", stderr=subprocess.PIPE, stdout=subprocess.PIPE)
+    repo_server_process2 = subprocess.Popen(["python3", "-m", "http.server", "9429", "-b", "localhost"], cwd="repo2", stderr=subprocess.PIPE, stdout=subprocess.PIPE)
     try:
+        wait_for_port(9428, repo_server_process)
+        wait_for_port(9429, repo_server_process2)
         codeql.database.create(
             extractor_option="buildless=true",
             _env={"CODEQL_EXTRACTOR_JAVA_OPTION_BUILDLESS_CLASSPATH_FROM_BUILD_FILES": "true"},
diff --git a/java/ql/integration-tests/java/buildless-erroneous/DatabaseQualityDiagnostics.expected b/java/ql/integration-tests/java/buildless-erroneous/DatabaseQualityDiagnostics.expected
index e50a800d25c..a22cf324a38 100644
--- a/java/ql/integration-tests/java/buildless-erroneous/DatabaseQualityDiagnostics.expected
+++ b/java/ql/integration-tests/java/buildless-erroneous/DatabaseQualityDiagnostics.expected
@@ -1,6 +1,6 @@
 diagnosticAttributes
-| Scanning Java code completed successfully, but the scan encountered issues. This may be caused by problems identifying dependencies or use of generated source code, among other reasons -- see other CodeQL diagnostics reported on the CodeQL status page for more details of possible causes. Addressing these warnings is advisable to avoid false-positive or missing results. If they cannot be addressed, consider scanning Java using either the `autobuild` or `manual` [build modes](https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages#comparison-of-the-build-modes). | visibilityCliSummaryTable | true |
-| Scanning Java code completed successfully, but the scan encountered issues. This may be caused by problems identifying dependencies or use of generated source code, among other reasons -- see other CodeQL diagnostics reported on the CodeQL status page for more details of possible causes. Addressing these warnings is advisable to avoid false-positive or missing results. If they cannot be addressed, consider scanning Java using either the `autobuild` or `manual` [build modes](https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages#comparison-of-the-build-modes). | visibilityStatusPage | true |
-| Scanning Java code completed successfully, but the scan encountered issues. This may be caused by problems identifying dependencies or use of generated source code, among other reasons -- see other CodeQL diagnostics reported on the CodeQL status page for more details of possible causes. Addressing these warnings is advisable to avoid false-positive or missing results. If they cannot be addressed, consider scanning Java using either the `autobuild` or `manual` [build modes](https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages#comparison-of-the-build-modes). | visibilityTelemetry | true |
+| Scanning Java code completed successfully, but the scan encountered issues. This may be caused by problems identifying dependencies or use of generated source code. Some metrics of the database quality are: Percentage of calls with call target: 20 % (threshold 85 %). Percentage of expressions with known type: 14 % (threshold 85 %). Ideally these metrics should be above their thresholds. Addressing these issues is advisable to avoid false-positives or missing results. If they cannot be addressed, consider scanning Java using either the `autobuild` or `manual` [build modes](https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages#comparison-of-the-build-modes). | visibilityCliSummaryTable | true |
+| Scanning Java code completed successfully, but the scan encountered issues. This may be caused by problems identifying dependencies or use of generated source code. Some metrics of the database quality are: Percentage of calls with call target: 20 % (threshold 85 %). Percentage of expressions with known type: 14 % (threshold 85 %). Ideally these metrics should be above their thresholds. Addressing these issues is advisable to avoid false-positives or missing results. If they cannot be addressed, consider scanning Java using either the `autobuild` or `manual` [build modes](https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages#comparison-of-the-build-modes). | visibilityStatusPage | true |
+| Scanning Java code completed successfully, but the scan encountered issues. This may be caused by problems identifying dependencies or use of generated source code. Some metrics of the database quality are: Percentage of calls with call target: 20 % (threshold 85 %). Percentage of expressions with known type: 14 % (threshold 85 %). Ideally these metrics should be above their thresholds. Addressing these issues is advisable to avoid false-positives or missing results. If they cannot be addressed, consider scanning Java using either the `autobuild` or `manual` [build modes](https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages#comparison-of-the-build-modes). | visibilityTelemetry | true |
 #select
-| Scanning Java code completed successfully, but the scan encountered issues. This may be caused by problems identifying dependencies or use of generated source code, among other reasons -- see other CodeQL diagnostics reported on the CodeQL status page for more details of possible causes. Addressing these warnings is advisable to avoid false-positive or missing results. If they cannot be addressed, consider scanning Java using either the `autobuild` or `manual` [build modes](https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages#comparison-of-the-build-modes). | Scanning Java code completed successfully, but the scan encountered issues. This may be caused by problems identifying dependencies or use of generated source code, among other reasons -- see other CodeQL diagnostics reported on the CodeQL status page for more details of possible causes. Addressing these warnings is advisable to avoid false-positive or missing results. If they cannot be addressed, consider scanning Java using either the `autobuild` or `manual` [build modes](https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages#comparison-of-the-build-modes). | 1 |
+| Scanning Java code completed successfully, but the scan encountered issues. This may be caused by problems identifying dependencies or use of generated source code. Some metrics of the database quality are: Percentage of calls with call target: 20 % (threshold 85 %). Percentage of expressions with known type: 14 % (threshold 85 %). Ideally these metrics should be above their thresholds. Addressing these issues is advisable to avoid false-positives or missing results. If they cannot be addressed, consider scanning Java using either the `autobuild` or `manual` [build modes](https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages#comparison-of-the-build-modes). | Scanning Java code completed successfully, but the scan encountered issues. This may be caused by problems identifying dependencies or use of generated source code. Some metrics of the database quality are: Percentage of calls with call target: 20 % (threshold 85 %). Percentage of expressions with known type: 14 % (threshold 85 %). Ideally these metrics should be above their thresholds. Addressing these issues is advisable to avoid false-positives or missing results. If they cannot be addressed, consider scanning Java using either the `autobuild` or `manual` [build modes](https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages#comparison-of-the-build-modes). | 1 |
diff --git a/java/ql/integration-tests/java/buildless-erroneous/ExtractorInformation.expected b/java/ql/integration-tests/java/buildless-erroneous/ExtractorInformation.expected
index 0a45568a536..b43963e4aca 100644
--- a/java/ql/integration-tests/java/buildless-erroneous/ExtractorInformation.expected
+++ b/java/ql/integration-tests/java/buildless-erroneous/ExtractorInformation.expected
@@ -1,4 +1,4 @@
-| Annotation processors enabled: true | 1 |
+| Annotation processors enabled: false | 1 |
 | Number of calls with call target | 1 |
 | Number of calls with missing call target | 4 |
 | Number of diagnostics from CodeQL Java extractor with severity 5 | 10 |
@@ -15,5 +15,3 @@
 | Total number of diagnostics from CodeQL Java extractor | 12 |
 | Total number of lines | 13 |
 | Total number of lines with extension java | 13 |
-| Used annotation processor: lombok.launch.AnnotationProcessorHider$AnnotationProcessor | 1 |
-| Used annotation processor: lombok.launch.AnnotationProcessorHider$ClaimingProcessor | 1 |
diff --git a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLFalseAspNetCore/UseCookiePolicyCallback/RequireSSL.expected b/java/ql/integration-tests/java/evaluation-to-constant-errortype/ConstantExpAppearsNonConstant.expected
similarity index 100%
rename from csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLFalseAspNetCore/UseCookiePolicyCallback/RequireSSL.expected
rename to java/ql/integration-tests/java/evaluation-to-constant-errortype/ConstantExpAppearsNonConstant.expected
diff --git a/java/ql/integration-tests/java/evaluation-to-constant-errortype/ConstantExpAppearsNonConstant.qlref b/java/ql/integration-tests/java/evaluation-to-constant-errortype/ConstantExpAppearsNonConstant.qlref
new file mode 100644
index 00000000000..6d2b25768e5
--- /dev/null
+++ b/java/ql/integration-tests/java/evaluation-to-constant-errortype/ConstantExpAppearsNonConstant.qlref
@@ -0,0 +1,2 @@
+query: Likely Bugs/Arithmetic/ConstantExpAppearsNonConstant.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/java/ql/integration-tests/java/evaluation-to-constant-errortype/Test.java b/java/ql/integration-tests/java/evaluation-to-constant-errortype/Test.java
new file mode 100644
index 00000000000..913c7817c7f
--- /dev/null
+++ b/java/ql/integration-tests/java/evaluation-to-constant-errortype/Test.java
@@ -0,0 +1,7 @@
+class Test {
+  public static void updateFlashlights(Minecraft mc){
+    if(mc.world != null){
+
+    }
+   }
+}
\ No newline at end of file
diff --git a/java/ql/integration-tests/java/evaluation-to-constant-errortype/test.py b/java/ql/integration-tests/java/evaluation-to-constant-errortype/test.py
new file mode 100644
index 00000000000..759e4cf8b82
--- /dev/null
+++ b/java/ql/integration-tests/java/evaluation-to-constant-errortype/test.py
@@ -0,0 +1,2 @@
+def test(codeql, java):
+    codeql.database.create(build_mode="none")
\ No newline at end of file
diff --git a/java/ql/integration-tests/java/lambda-expression-buildless-recovery/ExtractionErrors.expected b/java/ql/integration-tests/java/lambda-expression-buildless-recovery/ExtractionErrors.expected
new file mode 100644
index 00000000000..c9e472ebeb6
--- /dev/null
+++ b/java/ql/integration-tests/java/lambda-expression-buildless-recovery/ExtractionErrors.expected
@@ -0,0 +1,3 @@
+| Frontend errors in file:  (2 errors during annotation processing) | 2 |
+| Frontend errors in file: Test.java (7 javac errors) | 2 |
+| Unknown errors in file: Test.java (5) | 2 |
diff --git a/java/ql/integration-tests/java/lambda-expression-buildless-recovery/ExtractionErrors.qlref b/java/ql/integration-tests/java/lambda-expression-buildless-recovery/ExtractionErrors.qlref
new file mode 100644
index 00000000000..488db09ab05
--- /dev/null
+++ b/java/ql/integration-tests/java/lambda-expression-buildless-recovery/ExtractionErrors.qlref
@@ -0,0 +1 @@
+Diagnostics/ExtractionErrors.ql
diff --git a/java/ql/integration-tests/java/lambda-expression-buildless-recovery/Test.java b/java/ql/integration-tests/java/lambda-expression-buildless-recovery/Test.java
new file mode 100644
index 00000000000..e1df4c2a42f
--- /dev/null
+++ b/java/ql/integration-tests/java/lambda-expression-buildless-recovery/Test.java
@@ -0,0 +1,35 @@
+// The import below is intentionally commented out to test buildless recovery.
+// import java.util.stream.Stream;
+
+public class LambdaBuildlessRecoveryTest {
+
+    private Stream<String> getStringStream() {
+        return getStringStream();
+    }
+
+    public void testSimpleLambdaExpression() {
+        int unused = 0;
+        Stream<String> s = getStringStream();
+        Stream<String> mapped = s.map(x -> x);
+        mapped.forEach(System.out::println);
+    }
+
+    public void testLambdaWithBlockBody() {
+        int unused = 42;
+        Stream<String> s = getStringStream();
+        Stream<String> filtered = s.filter(item -> {
+            int unused = 42;
+            String proc = item.toUpperCase();
+            return proc.length() > 0;
+        });
+        filtered.forEach(System.out::println);
+    }
+
+    public void testVariableCapture() {
+        int unused = 99;
+        String prefix = "proc_";
+        Stream<String> s = getStringStream();
+        Stream<String> result = s.map(item -> prefix + item);
+        result.forEach(System.out::println);
+    }
+}
diff --git a/java/ql/integration-tests/java/lambda-expression-buildless-recovery/test.py b/java/ql/integration-tests/java/lambda-expression-buildless-recovery/test.py
new file mode 100755
index 00000000000..773127096a7
--- /dev/null
+++ b/java/ql/integration-tests/java/lambda-expression-buildless-recovery/test.py
@@ -0,0 +1,5 @@
+def test(codeql, java, use_java_17):
+    codeql.database.create(
+        build_mode="none",
+        source_root="."
+    )
\ No newline at end of file
diff --git a/java/ql/integration-tests/java/lambda-expression-buildless-recovery/unused_variable.expected b/java/ql/integration-tests/java/lambda-expression-buildless-recovery/unused_variable.expected
new file mode 100644
index 00000000000..282d65e7e63
--- /dev/null
+++ b/java/ql/integration-tests/java/lambda-expression-buildless-recovery/unused_variable.expected
@@ -0,0 +1,4 @@
+| Test.java:11:9:11:23 | int unused |
+| Test.java:18:9:18:24 | int unused |
+| Test.java:21:13:21:28 | int unused |
+| Test.java:29:9:29:24 | int unused |
\ No newline at end of file
diff --git a/java/ql/integration-tests/java/lambda-expression-buildless-recovery/unused_variable.ql b/java/ql/integration-tests/java/lambda-expression-buildless-recovery/unused_variable.ql
new file mode 100644
index 00000000000..cba463c0827
--- /dev/null
+++ b/java/ql/integration-tests/java/lambda-expression-buildless-recovery/unused_variable.ql
@@ -0,0 +1,5 @@
+import java
+
+from LocalVariableDecl v
+where not exists(v.getAnAccess()) and exists(v.getFile().getRelativePath())
+select v
diff --git a/java/ql/integration-tests/java/maven-add-exports-module-flags/pom.xml b/java/ql/integration-tests/java/maven-add-exports-module-flags/pom.xml
new file mode 100644
index 00000000000..94f5f90981e
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-add-exports-module-flags/pom.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>com.example</groupId>
+  <artifactId>maven-add-exports-module-flags</artifactId>
+  <version>1.0-SNAPSHOT</version>
+
+  <name>maven-add-exports-module-flags</name>
+  <description>Test case: Project using --add-exports. Autobuilder should detect this and use --source/--target.</description>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <java.version>11</java.version>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.11.0</version>
+        <configuration>
+          <source>${java.version}</source>
+          <target>${java.version}</target>
+          <compilerArgs>
+            <arg>--add-exports</arg>
+            <arg>jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg>
+            <arg>--add-exports</arg>
+            <arg>jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg>
+            <arg>--add-exports</arg>
+            <arg>jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED</arg>
+            <arg>--add-exports</arg>
+            <arg>jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</arg>
+          </compilerArgs>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/java/ql/integration-tests/java/maven-add-exports-module-flags/source_archive.expected b/java/ql/integration-tests/java/maven-add-exports-module-flags/source_archive.expected
new file mode 100644
index 00000000000..3d84bfa09ab
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-add-exports-module-flags/source_archive.expected
@@ -0,0 +1,3 @@
+pom.xml
+src/main/java/com/example/CompilerUser.java
+target/maven-archiver/pom.properties
diff --git a/java/ql/integration-tests/java/maven-add-exports-module-flags/src/main/java/com/example/CompilerUser.java b/java/ql/integration-tests/java/maven-add-exports-module-flags/src/main/java/com/example/CompilerUser.java
new file mode 100644
index 00000000000..13685d097a4
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-add-exports-module-flags/src/main/java/com/example/CompilerUser.java
@@ -0,0 +1,15 @@
+package com.example;
+
+import com.sun.tools.javac.api.JavacTool;
+
+/**
+ * Simple class that uses JDK compiler internals.
+ * This requires --add-exports flags to compile.
+ */
+public class CompilerUser {
+    public static void main(String[] args) {
+        // Use JavacTool from jdk.compiler module
+        JavacTool tool = JavacTool.create();
+        System.out.println("Compiler tool: " + tool.getClass().getName());
+    }
+}
diff --git a/java/ql/integration-tests/java/maven-add-exports-module-flags/test.py b/java/ql/integration-tests/java/maven-add-exports-module-flags/test.py
new file mode 100644
index 00000000000..73c4b1415a1
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-add-exports-module-flags/test.py
@@ -0,0 +1,2 @@
+def test(codeql, java, actions_toolchains_file):
+    codeql.database.create(_env={"LGTM_INDEX_MAVEN_TOOLCHAINS_FILE": str(actions_toolchains_file)})
diff --git a/java/ql/integration-tests/java/maven-execution-specific-java-version/pom.xml b/java/ql/integration-tests/java/maven-execution-specific-java-version/pom.xml
new file mode 100644
index 00000000000..fca47a5ba6d
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-execution-specific-java-version/pom.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>com.example</groupId>
+  <artifactId>maven-execution-specific-java-version</artifactId>
+  <version>1.0-SNAPSHOT</version>
+
+  <name>maven-execution-specific-java-version</name>
+  <description>Test case: Project with execution-specific Java versions (Java 11 for main, Java 17 for test). Maven.java should detect the highest version (17) and use it for compilation.</description>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.13.0</version>
+        <executions>
+          <!-- Compilation for src/main/java -->
+          <execution>
+            <id>default-compile</id>
+            <phase>compile</phase>
+            <goals>
+              <goal>compile</goal>
+            </goals>
+            <configuration>
+              <release>11</release> <!-- Java 11 for main -->
+            </configuration>
+          </execution>
+
+          <!-- Compilation for src/test/java -->
+          <execution>
+            <id>default-testCompile</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>testCompile</goal>
+            </goals>
+            <configuration>
+              <release>17</release> <!-- Java 17 for test -->
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/java/ql/integration-tests/java/maven-execution-specific-java-version/source_archive.expected b/java/ql/integration-tests/java/maven-execution-specific-java-version/source_archive.expected
new file mode 100644
index 00000000000..16e83f3a7f6
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-execution-specific-java-version/source_archive.expected
@@ -0,0 +1,4 @@
+pom.xml
+src/main/java/com/example/App.java
+src/test/java/com/example/AppTest.java
+target/maven-archiver/pom.properties
diff --git a/java/ql/integration-tests/java/maven-execution-specific-java-version/src/main/java/com/example/App.java b/java/ql/integration-tests/java/maven-execution-specific-java-version/src/main/java/com/example/App.java
new file mode 100644
index 00000000000..74ddfe58348
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-execution-specific-java-version/src/main/java/com/example/App.java
@@ -0,0 +1,12 @@
+package com.example;
+
+public class App {
+    public static void main(String[] args) {
+        var message = "Hello World! Running on Java " + System.getProperty("java.version");
+        System.out.println(message);
+    }
+
+    public String getMessage() {
+        return "Hello from App";
+    }
+}
diff --git a/java/ql/integration-tests/java/maven-execution-specific-java-version/src/test/java/com/example/AppTest.java b/java/ql/integration-tests/java/maven-execution-specific-java-version/src/test/java/com/example/AppTest.java
new file mode 100644
index 00000000000..4f8e04f7d78
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-execution-specific-java-version/src/test/java/com/example/AppTest.java
@@ -0,0 +1,11 @@
+package com.example;
+
+public class AppTest {
+    public static void main(String[] args) {
+        var text = """
+            Hello
+            World
+            """;
+        System.out.println(text.strip());
+    }
+}
diff --git a/java/ql/integration-tests/java/maven-execution-specific-java-version/test.py b/java/ql/integration-tests/java/maven-execution-specific-java-version/test.py
new file mode 100644
index 00000000000..73c4b1415a1
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-execution-specific-java-version/test.py
@@ -0,0 +1,2 @@
+def test(codeql, java, actions_toolchains_file):
+    codeql.database.create(_env={"LGTM_INDEX_MAVEN_TOOLCHAINS_FILE": str(actions_toolchains_file)})
diff --git a/java/ql/integration-tests/java/maven-java16-with-higher-jdk/pom.xml b/java/ql/integration-tests/java/maven-java16-with-higher-jdk/pom.xml
new file mode 100644
index 00000000000..e6a09518d8f
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-java16-with-higher-jdk/pom.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>com.example</groupId>
+  <artifactId>maven-java16-with-higher-jdk</artifactId>
+  <version>1.0-SNAPSHOT</version>
+
+  <name>maven-java16-with-higher-jdk</name>
+  <description>Test case: Java 16 target when only Java 17+ is available.</description>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <java.version>16</java.version>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.11.0</version>
+        <configuration>
+          <release>${java.version}</release>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/java/ql/integration-tests/java/maven-java16-with-higher-jdk/source_archive.expected b/java/ql/integration-tests/java/maven-java16-with-higher-jdk/source_archive.expected
new file mode 100644
index 00000000000..eb5dbc368ee
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-java16-with-higher-jdk/source_archive.expected
@@ -0,0 +1,3 @@
+pom.xml
+src/main/java/com/example/App.java
+target/maven-archiver/pom.properties
diff --git a/java/ql/integration-tests/java/maven-java16-with-higher-jdk/src/main/java/com/example/App.java b/java/ql/integration-tests/java/maven-java16-with-higher-jdk/src/main/java/com/example/App.java
new file mode 100644
index 00000000000..707e579ad68
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-java16-with-higher-jdk/src/main/java/com/example/App.java
@@ -0,0 +1,15 @@
+package com.example;
+
+import java.util.List;
+
+/**
+ * Simple class using Java 16 features (e.g.,records).
+ */
+public class App {
+    public static void main(String[] args) {
+        Person person = new Person("Bob", 42);
+        System.out.println(person);
+    }
+}
+
+record Person(String name, int age) {}
diff --git a/java/ql/integration-tests/java/maven-java16-with-higher-jdk/test.py b/java/ql/integration-tests/java/maven-java16-with-higher-jdk/test.py
new file mode 100644
index 00000000000..73c4b1415a1
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-java16-with-higher-jdk/test.py
@@ -0,0 +1,2 @@
+def test(codeql, java, actions_toolchains_file):
+    codeql.database.create(_env={"LGTM_INDEX_MAVEN_TOOLCHAINS_FILE": str(actions_toolchains_file)})
diff --git a/java/ql/integration-tests/java/maven-java8-java11-dependency/pom.xml b/java/ql/integration-tests/java/maven-java8-java11-dependency/pom.xml
new file mode 100644
index 00000000000..f50a3aadd23
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-java8-java11-dependency/pom.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>com.example</groupId>
+  <artifactId>maven-java8-java11-dependency</artifactId>
+  <version>1.0-SNAPSHOT</version>
+
+  <name>maven-java8-java11-dependency</name>
+  <description>Test case: Java 8 project with dependency requiring Java 11+</description>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <dependencies>
+    <!-- TestNG 7.7.0 is compiled with Java 11 (class file version 55.0) -->
+    <dependency>
+      <groupId>org.testng</groupId>
+      <artifactId>testng</artifactId>
+      <version>7.7.0</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.8.0</version>
+      </plugin>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.22.1</version>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/java/ql/integration-tests/java/maven-java8-java11-dependency/source_archive.expected b/java/ql/integration-tests/java/maven-java8-java11-dependency/source_archive.expected
new file mode 100644
index 00000000000..5088f76cc38
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-java8-java11-dependency/source_archive.expected
@@ -0,0 +1,4 @@
+pom.xml
+src/main/java/com/example/Calculator.java
+src/test/java/com/example/CalculatorTest.java
+target/maven-archiver/pom.properties
diff --git a/java/ql/integration-tests/java/maven-java8-java11-dependency/src/main/java/com/example/Calculator.java b/java/ql/integration-tests/java/maven-java8-java11-dependency/src/main/java/com/example/Calculator.java
new file mode 100644
index 00000000000..4cc529e4f0f
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-java8-java11-dependency/src/main/java/com/example/Calculator.java
@@ -0,0 +1,11 @@
+package com.example;
+
+public class Calculator {
+    public int add(int a, int b) {
+        return a + b;
+    }
+
+    public int multiply(int a, int b) {
+        return a * b;
+    }
+}
diff --git a/java/ql/integration-tests/java/maven-java8-java11-dependency/src/test/java/com/example/CalculatorTest.java b/java/ql/integration-tests/java/maven-java8-java11-dependency/src/test/java/com/example/CalculatorTest.java
new file mode 100644
index 00000000000..821330a32cc
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-java8-java11-dependency/src/test/java/com/example/CalculatorTest.java
@@ -0,0 +1,21 @@
+package com.example;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+/**
+ * Test class using TestNG 7.7.0 which requires Java 11+.
+ */
+public class CalculatorTest {
+    @Test
+    public void testAdd() {
+        Calculator calc = new Calculator();
+        Assert.assertEquals(calc.add(2, 3), 5);
+    }
+
+    @Test
+    public void testMultiply() {
+        Calculator calc = new Calculator();
+        Assert.assertEquals(calc.multiply(3, 4), 12);
+    }
+}
diff --git a/java/ql/integration-tests/java/maven-java8-java11-dependency/test.py b/java/ql/integration-tests/java/maven-java8-java11-dependency/test.py
new file mode 100644
index 00000000000..73c4b1415a1
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-java8-java11-dependency/test.py
@@ -0,0 +1,2 @@
+def test(codeql, java, actions_toolchains_file):
+    codeql.database.create(_env={"LGTM_INDEX_MAVEN_TOOLCHAINS_FILE": str(actions_toolchains_file)})
diff --git a/java/ql/integration-tests/java/maven-multimodule-test-java-version/main-module/pom.xml b/java/ql/integration-tests/java/maven-multimodule-test-java-version/main-module/pom.xml
new file mode 100644
index 00000000000..39586e4e0ab
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-multimodule-test-java-version/main-module/pom.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>com.example</groupId>
+    <artifactId>maven-multimodule-test-java-version</artifactId>
+    <version>1.0</version>
+  </parent>
+  <artifactId>main-module</artifactId>
+</project>
diff --git a/java/ql/integration-tests/java/maven-multimodule-test-java-version/main-module/src/main/java/com/example/App.java b/java/ql/integration-tests/java/maven-multimodule-test-java-version/main-module/src/main/java/com/example/App.java
new file mode 100644
index 00000000000..d2397803d55
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-multimodule-test-java-version/main-module/src/main/java/com/example/App.java
@@ -0,0 +1,7 @@
+package com.example;
+
+public class App {
+    public static void main(String[] args) {
+        System.out.println("Hello World!");
+    }
+}
\ No newline at end of file
diff --git a/java/ql/integration-tests/java/maven-multimodule-test-java-version/pom.xml b/java/ql/integration-tests/java/maven-multimodule-test-java-version/pom.xml
new file mode 100644
index 00000000000..ea5f8b5b03b
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-multimodule-test-java-version/pom.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.example</groupId>
+  <artifactId>maven-multimodule-test-java-version</artifactId>
+  <version>1.0</version>
+  <packaging>pom</packaging>
+
+  <properties>
+    <maven.compiler.release>17</maven.compiler.release>
+  </properties>
+
+  <modules>
+    <module>main-module</module>
+    <module>test-module</module>
+  </modules>
+</project>
diff --git a/java/ql/integration-tests/java/maven-multimodule-test-java-version/source_archive.expected b/java/ql/integration-tests/java/maven-multimodule-test-java-version/source_archive.expected
new file mode 100644
index 00000000000..08385ca91a0
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-multimodule-test-java-version/source_archive.expected
@@ -0,0 +1,7 @@
+main-module/pom.xml
+main-module/src/main/java/com/example/App.java
+main-module/target/maven-archiver/pom.properties
+pom.xml
+test-module/pom.xml
+test-module/src/main/java/com/example/tests/TestUtils.java
+test-module/target/maven-archiver/pom.properties
diff --git a/java/ql/integration-tests/java/maven-multimodule-test-java-version/test-module/pom.xml b/java/ql/integration-tests/java/maven-multimodule-test-java-version/test-module/pom.xml
new file mode 100644
index 00000000000..5895a91b2c1
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-multimodule-test-java-version/test-module/pom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>com.example</groupId>
+    <artifactId>maven-multimodule-test-java-version</artifactId>
+    <version>1.0</version>
+  </parent>
+  <artifactId>test-module</artifactId>
+
+  <properties>
+    <maven.compiler.release>21</maven.compiler.release>
+  </properties>
+</project>
diff --git a/java/ql/integration-tests/java/maven-multimodule-test-java-version/test-module/src/main/java/com/example/tests/TestUtils.java b/java/ql/integration-tests/java/maven-multimodule-test-java-version/test-module/src/main/java/com/example/tests/TestUtils.java
new file mode 100644
index 00000000000..30e83856200
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-multimodule-test-java-version/test-module/src/main/java/com/example/tests/TestUtils.java
@@ -0,0 +1,12 @@
+package com.example.tests;
+
+// Requires Java 21: switch with pattern matching and guards
+public class TestUtils {
+    public static String analyze(Object obj) {
+        return switch (obj) {
+            case String s when s.length() > 5 -> "long";
+            case String s -> "short";
+            default -> "other";
+        };
+    }
+}
\ No newline at end of file
diff --git a/java/ql/integration-tests/java/maven-multimodule-test-java-version/test.py b/java/ql/integration-tests/java/maven-multimodule-test-java-version/test.py
new file mode 100644
index 00000000000..73c4b1415a1
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-multimodule-test-java-version/test.py
@@ -0,0 +1,2 @@
+def test(codeql, java, actions_toolchains_file):
+    codeql.database.create(_env={"LGTM_INDEX_MAVEN_TOOLCHAINS_FILE": str(actions_toolchains_file)})
diff --git a/java/ql/integration-tests/java/maven-wrapper-missing-properties/mvnw b/java/ql/integration-tests/java/maven-wrapper-missing-properties/mvnw
new file mode 100755
index 00000000000..b7f064624f8
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-wrapper-missing-properties/mvnw
@@ -0,0 +1,287 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Apache Maven Wrapper startup batch script, version 3.1.1
+#
+# Required ENV vars:
+# ------------------
+#   JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
+#     e.g. to debug Maven itself, use
+#       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+  if [ -f /usr/local/etc/mavenrc ] ; then
+    . /usr/local/etc/mavenrc
+  fi
+
+  if [ -f /etc/mavenrc ] ; then
+    . /etc/mavenrc
+  fi
+
+  if [ -f "$HOME/.mavenrc" ] ; then
+    . "$HOME/.mavenrc"
+  fi
+
+fi
+
+# OS specific support.  $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+  CYGWIN*) cygwin=true ;;
+  MINGW*) mingw=true;;
+  Darwin*) darwin=true
+    # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+    # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+    if [ -z "$JAVA_HOME" ]; then
+      if [ -x "/usr/libexec/java_home" ]; then
+        JAVA_HOME="`/usr/libexec/java_home`"; export JAVA_HOME
+      else
+        JAVA_HOME="/Library/Java/Home"; export JAVA_HOME
+      fi
+    fi
+    ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+  if [ -r /etc/gentoo-release ] ; then
+    JAVA_HOME=`java-config --jre-home`
+  fi
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+  javaExecutable="`which javac`"
+  if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+    # readlink(1) is not available as standard on Solaris 10.
+    readLink=`which readlink`
+    if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+      if $darwin ; then
+        javaHome="`dirname \"$javaExecutable\"`"
+        javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+      else
+        javaExecutable="`readlink -f \"$javaExecutable\"`"
+      fi
+      javaHome="`dirname \"$javaExecutable\"`"
+      javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+      JAVA_HOME="$javaHome"
+      export JAVA_HOME
+    fi
+  fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+  if [ -n "$JAVA_HOME"  ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+      # IBM's JDK on AIX uses strange locations for the executables
+      JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+      JAVACMD="$JAVA_HOME/bin/java"
+    fi
+  else
+    JAVACMD="`\\unset -f command; \\command -v java`"
+  fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+  echo "Error: JAVA_HOME is not defined correctly." >&2
+  echo "  We cannot execute $JAVACMD" >&2
+  exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+  echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+  if [ -z "$1" ]
+  then
+    echo "Path not specified to find_maven_basedir"
+    return 1
+  fi
+
+  basedir="$1"
+  wdir="$1"
+  while [ "$wdir" != '/' ] ; do
+    if [ -d "$wdir"/.mvn ] ; then
+      basedir=$wdir
+      break
+    fi
+    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+    if [ -d "${wdir}" ]; then
+      wdir=`cd "$wdir/.."; pwd`
+    fi
+    # end of workaround
+  done
+  printf '%s' "$(cd "$basedir"; pwd)"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+  if [ -f "$1" ]; then
+    echo "$(tr -s '\n' ' ' < "$1")"
+  fi
+}
+
+BASE_DIR=$(find_maven_basedir "$(dirname $0)")
+if [ -z "$BASE_DIR" ]; then
+  exit 1;
+fi
+
+MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR
+if [ "$MVNW_VERBOSE" = true ]; then
+  echo $MAVEN_PROJECTBASEDIR
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Found .mvn/wrapper/maven-wrapper.jar"
+    fi
+else
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+    fi
+    if [ -n "$MVNW_REPOURL" ]; then
+      wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar"
+    else
+      wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar"
+    fi
+    while IFS="=" read key value; do
+      case "$key" in (wrapperUrl) wrapperUrl="$value"; break ;;
+      esac
+    done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Downloading from: $wrapperUrl"
+    fi
+    wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+    if $cygwin; then
+      wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
+    fi
+
+    if command -v wget > /dev/null; then
+        QUIET="--quiet"
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found wget ... using wget"
+          QUIET=""
+        fi
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            wget $QUIET "$wrapperUrl" -O "$wrapperJarPath"
+        else
+            wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath"
+        fi
+        [ $? -eq 0 ] || rm -f "$wrapperJarPath"
+    elif command -v curl > /dev/null; then
+        QUIET="--silent"
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found curl ... using curl"
+          QUIET=""
+        fi
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L
+        else
+            curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L
+        fi
+        [ $? -eq 0 ] || rm -f "$wrapperJarPath"
+    else
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Falling back to using Java to download"
+        fi
+        javaSource="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+        javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class"
+        # For Cygwin, switch paths to Windows format before running javac
+        if $cygwin; then
+          javaSource=`cygpath --path --windows "$javaSource"`
+          javaClass=`cygpath --path --windows "$javaClass"`
+        fi
+        if [ -e "$javaSource" ]; then
+            if [ ! -e "$javaClass" ]; then
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Compiling MavenWrapperDownloader.java ..."
+                fi
+                # Compiling the Java class
+                ("$JAVA_HOME/bin/javac" "$javaSource")
+            fi
+            if [ -e "$javaClass" ]; then
+                # Running the downloader
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Running MavenWrapperDownloader.java ..."
+                fi
+                ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+            fi
+        fi
+    fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+  [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+    MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+# Provide a "standardized" way to retrieve the CLI args that will
+# work with both Windows and non-Windows executions.
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
+export MAVEN_CMD_LINE_ARGS
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+  $MAVEN_OPTS \
+  $MAVEN_DEBUG_OPTS \
+  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+  "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/java/ql/integration-tests/java/maven-wrapper-missing-properties/mvnw.cmd b/java/ql/integration-tests/java/maven-wrapper-missing-properties/mvnw.cmd
new file mode 100644
index 00000000000..474c9d6b74c
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-wrapper-missing-properties/mvnw.cmd
@@ -0,0 +1,187 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements.  See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership.  The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License.  You may obtain a copy of the License at
+@REM
+@REM    http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied.  See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Apache Maven Wrapper startup batch script, version 3.1.1
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM     e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %*
+if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %*
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar"
+
+FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+    IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Found %WRAPPER_JAR%
+    )
+) else (
+    if not "%MVNW_REPOURL%" == "" (
+        SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar"
+    )
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Couldn't find %WRAPPER_JAR%, downloading it ...
+        echo Downloading from: %WRAPPER_URL%
+    )
+
+    powershell -Command "&{"^
+		"$webclient = new-object System.Net.WebClient;"^
+		"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+		"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+		"}"^
+		"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^
+		"}"
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Finished downloading %WRAPPER_JAR%
+    )
+)
+@REM End of extension
+
+@REM Provide a "standardized" way to retrieve the CLI args that will
+@REM work with both Windows and non-Windows executions.
+set MAVEN_CMD_LINE_ARGS=%*
+
+%MAVEN_JAVA_EXE% ^
+  %JVM_CONFIG_MAVEN_PROPS% ^
+  %MAVEN_OPTS% ^
+  %MAVEN_DEBUG_OPTS% ^
+  -classpath %WRAPPER_JAR% ^
+  "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
+  %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat"
+if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%"=="on" pause
+
+if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE%
+
+cmd /C exit /B %ERROR_CODE%
diff --git a/java/ql/integration-tests/java/maven-wrapper-missing-properties/pom.xml b/java/ql/integration-tests/java/maven-wrapper-missing-properties/pom.xml
new file mode 100644
index 00000000000..17dfd04484f
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-wrapper-missing-properties/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.example</groupId>
+    <artifactId>maven-wrapper-missing-properties-test</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+    <properties>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/java/ql/integration-tests/java/maven-wrapper-missing-properties/source_archive.expected b/java/ql/integration-tests/java/maven-wrapper-missing-properties/source_archive.expected
new file mode 100644
index 00000000000..6ea990c4d1b
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-wrapper-missing-properties/source_archive.expected
@@ -0,0 +1,4 @@
+.mvn/wrapper/maven-wrapper.properties
+pom.xml
+src/main/java/com/example/Hello.java
+target/maven-archiver/pom.properties
diff --git a/java/ql/integration-tests/java/maven-wrapper-missing-properties/src/main/java/com/example/Hello.java b/java/ql/integration-tests/java/maven-wrapper-missing-properties/src/main/java/com/example/Hello.java
new file mode 100644
index 00000000000..0d2931004a0
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-wrapper-missing-properties/src/main/java/com/example/Hello.java
@@ -0,0 +1,7 @@
+package com.example;
+
+public class Hello {
+    public static void main(String[] args) {
+        System.out.println("Hello, World!");
+    }
+}
diff --git a/java/ql/integration-tests/java/maven-wrapper-missing-properties/test.py b/java/ql/integration-tests/java/maven-wrapper-missing-properties/test.py
new file mode 100644
index 00000000000..ef93712d879
--- /dev/null
+++ b/java/ql/integration-tests/java/maven-wrapper-missing-properties/test.py
@@ -0,0 +1,2 @@
+def test(codeql, java):
+    codeql.database.create(build_mode="autobuild")
diff --git a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/FormsTrue/RequireSSL.expected b/java/ql/integration-tests/java/maven_3_fetch_maven_4_wrapper/ExtractionErrors.expected
similarity index 100%
rename from csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/FormsTrue/RequireSSL.expected
rename to java/ql/integration-tests/java/maven_3_fetch_maven_4_wrapper/ExtractionErrors.expected
diff --git a/java/ql/integration-tests/java/maven_3_fetch_maven_4_wrapper/ExtractionErrors.qlref b/java/ql/integration-tests/java/maven_3_fetch_maven_4_wrapper/ExtractionErrors.qlref
new file mode 100644
index 00000000000..5e501b2469d
--- /dev/null
+++ b/java/ql/integration-tests/java/maven_3_fetch_maven_4_wrapper/ExtractionErrors.qlref
@@ -0,0 +1 @@
+Diagnostics/ExtractionErrors.ql
\ No newline at end of file
diff --git a/java/ql/integration-tests/java/maven_3_fetch_maven_4_wrapper/app/.mvn/wrapper/maven-wrapper.properties b/java/ql/integration-tests/java/maven_3_fetch_maven_4_wrapper/app/.mvn/wrapper/maven-wrapper.properties
new file mode 100644
index 00000000000..c0bcafe984f
--- /dev/null
+++ b/java/ql/integration-tests/java/maven_3_fetch_maven_4_wrapper/app/.mvn/wrapper/maven-wrapper.properties
@@ -0,0 +1,3 @@
+wrapperVersion=3.3.4
+distributionType=only-script
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip
diff --git a/java/ql/integration-tests/java/maven_3_fetch_maven_4_wrapper/app/mvnw b/java/ql/integration-tests/java/maven_3_fetch_maven_4_wrapper/app/mvnw
new file mode 100755
index 00000000000..bd8896bf221
--- /dev/null
+++ b/java/ql/integration-tests/java/maven_3_fetch_maven_4_wrapper/app/mvnw
@@ -0,0 +1,295 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Apache Maven Wrapper startup batch script, version 3.3.4
+#
+# Optional ENV vars
+# -----------------
+#   JAVA_HOME - location of a JDK home dir, required when download maven via java source
+#   MVNW_REPOURL - repo url base for downloading maven distribution
+#   MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
+#   MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output
+# ----------------------------------------------------------------------------
+
+set -euf
+[ "${MVNW_VERBOSE-}" != debug ] || set -x
+
+# OS specific support.
+native_path() { printf %s\\n "$1"; }
+case "$(uname)" in
+CYGWIN* | MINGW*)
+  [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")"
+  native_path() { cygpath --path --windows "$1"; }
+  ;;
+esac
+
+# set JAVACMD and JAVACCMD
+set_java_home() {
+  # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched
+  if [ -n "${JAVA_HOME-}" ]; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ]; then
+      # IBM's JDK on AIX uses strange locations for the executables
+      JAVACMD="$JAVA_HOME/jre/sh/java"
+      JAVACCMD="$JAVA_HOME/jre/sh/javac"
+    else
+      JAVACMD="$JAVA_HOME/bin/java"
+      JAVACCMD="$JAVA_HOME/bin/javac"
+
+      if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then
+        echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2
+        echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2
+        return 1
+      fi
+    fi
+  else
+    JAVACMD="$(
+      'set' +e
+      'unset' -f command 2>/dev/null
+      'command' -v java
+    )" || :
+    JAVACCMD="$(
+      'set' +e
+      'unset' -f command 2>/dev/null
+      'command' -v javac
+    )" || :
+
+    if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then
+      echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2
+      return 1
+    fi
+  fi
+}
+
+# hash string like Java String::hashCode
+hash_string() {
+  str="${1:-}" h=0
+  while [ -n "$str" ]; do
+    char="${str%"${str#?}"}"
+    h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296))
+    str="${str#?}"
+  done
+  printf %x\\n $h
+}
+
+verbose() { :; }
+[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; }
+
+die() {
+  printf %s\\n "$1" >&2
+  exit 1
+}
+
+trim() {
+  # MWRAPPER-139:
+  #   Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds.
+  #   Needed for removing poorly interpreted newline sequences when running in more
+  #   exotic environments such as mingw bash on Windows.
+  printf "%s" "${1}" | tr -d '[:space:]'
+}
+
+scriptDir="$(dirname "$0")"
+scriptName="$(basename "$0")"
+
+# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties
+while IFS="=" read -r key value; do
+  case "${key-}" in
+  distributionUrl) distributionUrl=$(trim "${value-}") ;;
+  distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;;
+  esac
+done <"$scriptDir/.mvn/wrapper/maven-wrapper.properties"
+[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties"
+
+case "${distributionUrl##*/}" in
+maven-mvnd-*bin.*)
+  MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/
+  case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in
+  *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;;
+  :Darwin*x86_64) distributionPlatform=darwin-amd64 ;;
+  :Darwin*arm64) distributionPlatform=darwin-aarch64 ;;
+  :Linux*x86_64*) distributionPlatform=linux-amd64 ;;
+  *)
+    echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2
+    distributionPlatform=linux-amd64
+    ;;
+  esac
+  distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip"
+  ;;
+maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;;
+*) MVN_CMD="mvn${scriptName#mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;;
+esac
+
+# apply MVNW_REPOURL and calculate MAVEN_HOME
+# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
+[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}"
+distributionUrlName="${distributionUrl##*/}"
+distributionUrlNameMain="${distributionUrlName%.*}"
+distributionUrlNameMain="${distributionUrlNameMain%-bin}"
+MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}"
+MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")"
+
+exec_maven() {
+  unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || :
+  exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD"
+}
+
+if [ -d "$MAVEN_HOME" ]; then
+  verbose "found existing MAVEN_HOME at $MAVEN_HOME"
+  exec_maven "$@"
+fi
+
+case "${distributionUrl-}" in
+*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;;
+*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;;
+esac
+
+# prepare tmp dir
+if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then
+  clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; }
+  trap clean HUP INT TERM EXIT
+else
+  die "cannot create temp dir"
+fi
+
+mkdir -p -- "${MAVEN_HOME%/*}"
+
+# Download and Install Apache Maven
+verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
+verbose "Downloading from: $distributionUrl"
+verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
+
+# select .zip or .tar.gz
+if ! command -v unzip >/dev/null; then
+  distributionUrl="${distributionUrl%.zip}.tar.gz"
+  distributionUrlName="${distributionUrl##*/}"
+fi
+
+# verbose opt
+__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR=''
+[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v
+
+# normalize http auth
+case "${MVNW_PASSWORD:+has-password}" in
+'') MVNW_USERNAME='' MVNW_PASSWORD='' ;;
+has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;;
+esac
+
+if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then
+  verbose "Found wget ... using wget"
+  wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl"
+elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then
+  verbose "Found curl ... using curl"
+  curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl"
+elif set_java_home; then
+  verbose "Falling back to use Java to download"
+  javaSource="$TMP_DOWNLOAD_DIR/Downloader.java"
+  targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName"
+  cat >"$javaSource" <<-END
+	public class Downloader extends java.net.Authenticator
+	{
+	  protected java.net.PasswordAuthentication getPasswordAuthentication()
+	  {
+	    return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() );
+	  }
+	  public static void main( String[] args ) throws Exception
+	  {
+	    setDefault( new Downloader() );
+	    java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() );
+	  }
+	}
+	END
+  # For Cygwin/MinGW, switch paths to Windows format before running javac and java
+  verbose " - Compiling Downloader.java ..."
+  "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java"
+  verbose " - Running Downloader.java ..."
+  "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")"
+fi
+
+# If specified, validate the SHA-256 sum of the Maven distribution zip file
+if [ -n "${distributionSha256Sum-}" ]; then
+  distributionSha256Result=false
+  if [ "$MVN_CMD" = mvnd.sh ]; then
+    echo "Checksum validation is not supported for maven-mvnd." >&2
+    echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
+    exit 1
+  elif command -v sha256sum >/dev/null; then
+    if echo "$distributionSha256Sum  $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c - >/dev/null 2>&1; then
+      distributionSha256Result=true
+    fi
+  elif command -v shasum >/dev/null; then
+    if echo "$distributionSha256Sum  $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then
+      distributionSha256Result=true
+    fi
+  else
+    echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2
+    echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
+    exit 1
+  fi
+  if [ $distributionSha256Result = false ]; then
+    echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2
+    echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2
+    exit 1
+  fi
+fi
+
+# unzip and move
+if command -v unzip >/dev/null; then
+  unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip"
+else
+  tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar"
+fi
+
+# Find the actual extracted directory name (handles snapshots where filename != directory name)
+actualDistributionDir=""
+
+# First try the expected directory name (for regular distributions)
+if [ -d "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" ]; then
+  if [ -f "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/bin/$MVN_CMD" ]; then
+    actualDistributionDir="$distributionUrlNameMain"
+  fi
+fi
+
+# If not found, search for any directory with the Maven executable (for snapshots)
+if [ -z "$actualDistributionDir" ]; then
+  # enable globbing to iterate over items
+  set +f
+  for dir in "$TMP_DOWNLOAD_DIR"/*; do
+    if [ -d "$dir" ]; then
+      if [ -f "$dir/bin/$MVN_CMD" ]; then
+        actualDistributionDir="$(basename "$dir")"
+        break
+      fi
+    fi
+  done
+  set -f
+fi
+
+if [ -z "$actualDistributionDir" ]; then
+  verbose "Contents of $TMP_DOWNLOAD_DIR:"
+  verbose "$(ls -la "$TMP_DOWNLOAD_DIR")"
+  die "Could not find Maven distribution directory in extracted archive"
+fi
+
+verbose "Found extracted Maven distribution directory: $actualDistributionDir"
+printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$actualDistributionDir/mvnw.url"
+mv -- "$TMP_DOWNLOAD_DIR/$actualDistributionDir" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME"
+
+clean || :
+exec_maven "$@"
diff --git a/java/ql/integration-tests/java/maven_3_fetch_maven_4_wrapper/app/mvnw.cmd b/java/ql/integration-tests/java/maven_3_fetch_maven_4_wrapper/app/mvnw.cmd
new file mode 100644
index 00000000000..92450f93273
--- /dev/null
+++ b/java/ql/integration-tests/java/maven_3_fetch_maven_4_wrapper/app/mvnw.cmd
@@ -0,0 +1,189 @@
+<# : batch portion
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements.  See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership.  The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License.  You may obtain a copy of the License at
+@REM
+@REM    http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied.  See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Apache Maven Wrapper startup batch script, version 3.3.4
+@REM
+@REM Optional ENV vars
+@REM   MVNW_REPOURL - repo url base for downloading maven distribution
+@REM   MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
+@REM   MVNW_VERBOSE - true: enable verbose log; others: silence the output
+@REM ----------------------------------------------------------------------------
+
+@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0)
+@SET __MVNW_CMD__=
+@SET __MVNW_ERROR__=
+@SET __MVNW_PSMODULEP_SAVE=%PSModulePath%
+@SET PSModulePath=
+@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @(
+  IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B)
+)
+@SET PSModulePath=%__MVNW_PSMODULEP_SAVE%
+@SET __MVNW_PSMODULEP_SAVE=
+@SET __MVNW_ARG0_NAME__=
+@SET MVNW_USERNAME=
+@SET MVNW_PASSWORD=
+@IF NOT "%__MVNW_CMD__%"=="" ("%__MVNW_CMD__%" %*)
+@echo Cannot start maven from wrapper >&2 && exit /b 1
+@GOTO :EOF
+: end batch / begin powershell #>
+
+$ErrorActionPreference = "Stop"
+if ($env:MVNW_VERBOSE -eq "true") {
+  $VerbosePreference = "Continue"
+}
+
+# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties
+$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl
+if (!$distributionUrl) {
+  Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties"
+}
+
+switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) {
+  "maven-mvnd-*" {
+    $USE_MVND = $true
+    $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip"
+    $MVN_CMD = "mvnd.cmd"
+    break
+  }
+  default {
+    $USE_MVND = $false
+    $MVN_CMD = $script -replace '^mvnw','mvn'
+    break
+  }
+}
+
+# apply MVNW_REPOURL and calculate MAVEN_HOME
+# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
+if ($env:MVNW_REPOURL) {
+  $MVNW_REPO_PATTERN = if ($USE_MVND -eq $False) { "/org/apache/maven/" } else { "/maven/mvnd/" }
+  $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace "^.*$MVNW_REPO_PATTERN",'')"
+}
+$distributionUrlName = $distributionUrl -replace '^.*/',''
+$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$',''
+
+$MAVEN_M2_PATH = "$HOME/.m2"
+if ($env:MAVEN_USER_HOME) {
+  $MAVEN_M2_PATH = "$env:MAVEN_USER_HOME"
+}
+
+if (-not (Test-Path -Path $MAVEN_M2_PATH)) {
+    New-Item -Path $MAVEN_M2_PATH -ItemType Directory | Out-Null
+}
+
+$MAVEN_WRAPPER_DISTS = $null
+if ((Get-Item $MAVEN_M2_PATH).Target[0] -eq $null) {
+  $MAVEN_WRAPPER_DISTS = "$MAVEN_M2_PATH/wrapper/dists"
+} else {
+  $MAVEN_WRAPPER_DISTS = (Get-Item $MAVEN_M2_PATH).Target[0] + "/wrapper/dists"
+}
+
+$MAVEN_HOME_PARENT = "$MAVEN_WRAPPER_DISTS/$distributionUrlNameMain"
+$MAVEN_HOME_NAME = ([System.Security.Cryptography.SHA256]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join ''
+$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME"
+
+if (Test-Path -Path "$MAVEN_HOME" -PathType Container) {
+  Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME"
+  Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
+  exit $?
+}
+
+if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) {
+  Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl"
+}
+
+# prepare tmp dir
+$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile
+$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir"
+$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null
+trap {
+  if ($TMP_DOWNLOAD_DIR.Exists) {
+    try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
+    catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
+  }
+}
+
+New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null
+
+# Download and Install Apache Maven
+Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
+Write-Verbose "Downloading from: $distributionUrl"
+Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
+
+$webclient = New-Object System.Net.WebClient
+if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) {
+  $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD)
+}
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null
+
+# If specified, validate the SHA-256 sum of the Maven distribution zip file
+$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum
+if ($distributionSha256Sum) {
+  if ($USE_MVND) {
+    Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties."
+  }
+  Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash
+  if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) {
+    Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property."
+  }
+}
+
+# unzip and move
+Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null
+
+# Find the actual extracted directory name (handles snapshots where filename != directory name)
+$actualDistributionDir = ""
+
+# First try the expected directory name (for regular distributions)
+$expectedPath = Join-Path "$TMP_DOWNLOAD_DIR" "$distributionUrlNameMain"
+$expectedMvnPath = Join-Path "$expectedPath" "bin/$MVN_CMD"
+if ((Test-Path -Path $expectedPath -PathType Container) -and (Test-Path -Path $expectedMvnPath -PathType Leaf)) {
+  $actualDistributionDir = $distributionUrlNameMain
+}
+
+# If not found, search for any directory with the Maven executable (for snapshots)
+if (!$actualDistributionDir) {
+  Get-ChildItem -Path "$TMP_DOWNLOAD_DIR" -Directory | ForEach-Object {
+    $testPath = Join-Path $_.FullName "bin/$MVN_CMD"
+    if (Test-Path -Path $testPath -PathType Leaf) {
+      $actualDistributionDir = $_.Name
+    }
+  }
+}
+
+if (!$actualDistributionDir) {
+  Write-Error "Could not find Maven distribution directory in extracted archive"
+}
+
+Write-Verbose "Found extracted Maven distribution directory: $actualDistributionDir"
+Rename-Item -Path "$TMP_DOWNLOAD_DIR/$actualDistributionDir" -NewName $MAVEN_HOME_NAME | Out-Null
+try {
+  Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null
+} catch {
+  if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) {
+    Write-Error "fail to move MAVEN_HOME"
+  }
+} finally {
+  try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
+  catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
+}
+
+Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
diff --git a/java/ql/integration-tests/java/maven_3_fetch_maven_4_wrapper/app/pom.xml b/java/ql/integration-tests/java/maven_3_fetch_maven_4_wrapper/app/pom.xml
new file mode 100644
index 00000000000..2d203a7dcba
--- /dev/null
+++ b/java/ql/integration-tests/java/maven_3_fetch_maven_4_wrapper/app/pom.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.example</groupId>
+    <artifactId>maven3-fetch-maven4-wrapper-test</artifactId>
+    <version>1.0.0</version>
+    <packaging>jar</packaging>
+
+    <name>Maven 3 Fetch Maven 4 Wrapper Test</name>
+    <description>Integration test for Maven 3 system trying to fetch Maven 4 wrapper binary</description>
+
+    <properties>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <!-- No dependencies needed for this test -->
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.11.0</version>
+                <configuration>
+                    <source>11</source>
+                    <target>11</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/java/ql/integration-tests/java/maven_3_fetch_maven_4_wrapper/app/src/main/java/testmaven/Test.java b/java/ql/integration-tests/java/maven_3_fetch_maven_4_wrapper/app/src/main/java/testmaven/Test.java
new file mode 100644
index 00000000000..79a9aa9a064
--- /dev/null
+++ b/java/ql/integration-tests/java/maven_3_fetch_maven_4_wrapper/app/src/main/java/testmaven/Test.java
@@ -0,0 +1,10 @@
+package testmaven;
+
+public class Test {
+    public static void main(String[] args) {
+        System.out.println("Test");
+    }
+
+    public void trivial() {
+    }
+}
diff --git a/java/ql/integration-tests/java/maven_3_fetch_maven_4_wrapper/methods.expected b/java/ql/integration-tests/java/maven_3_fetch_maven_4_wrapper/methods.expected
new file mode 100644
index 00000000000..0f1a4ca9dfb
--- /dev/null
+++ b/java/ql/integration-tests/java/maven_3_fetch_maven_4_wrapper/methods.expected
@@ -0,0 +1,2 @@
+| app/src/main/java/testmaven/Test.java:4:24:4:27 | main |
+| app/src/main/java/testmaven/Test.java:8:17:8:23 | trivial |
diff --git a/java/ql/integration-tests/java/maven_3_fetch_maven_4_wrapper/methods.ql b/java/ql/integration-tests/java/maven_3_fetch_maven_4_wrapper/methods.ql
new file mode 100644
index 00000000000..9d32c93e69c
--- /dev/null
+++ b/java/ql/integration-tests/java/maven_3_fetch_maven_4_wrapper/methods.ql
@@ -0,0 +1,5 @@
+import java
+
+from Method m
+where exists(m.getFile().getRelativePath())
+select m
diff --git a/java/ql/integration-tests/java/maven_3_fetch_maven_4_wrapper/test.py b/java/ql/integration-tests/java/maven_3_fetch_maven_4_wrapper/test.py
new file mode 100644
index 00000000000..666691824b9
--- /dev/null
+++ b/java/ql/integration-tests/java/maven_3_fetch_maven_4_wrapper/test.py
@@ -0,0 +1,20 @@
+import os
+import tarfile
+import tempfile
+import pathlib
+from fixtures.util import download_file_cached
+
+def test_maven3_fetch_maven4_wrapper(codeql, java, use_java_17, cache):
+    maven_url = "https://archive.apache.org/dist/maven/maven-3/3.6.0/binaries/apache-maven-3.6.0-bin.tar.gz"
+    maven_archive = download_file_cached(maven_url, "apache-maven-3.6.0-bin.tar.gz", cache)
+
+    temp_dir = pathlib.Path(tempfile.mkdtemp())
+    with tarfile.open(maven_archive, "r:gz") as tar:
+        tar.extractall(temp_dir, filter='data')
+
+    # Set maven_home_path to the extracted directory
+    maven_home_path = temp_dir / "apache-maven-3.6.0"
+
+    codeql.database.create(source_root="app",
+                           build_mode="autobuild",
+                           _env={"MAVEN_USER_HOME": str(maven_home_path)})
\ No newline at end of file
diff --git a/java/ql/integration-tests/java/query-suite/java-code-quality-extended.qls.expected b/java/ql/integration-tests/java/query-suite/java-code-quality-extended.qls.expected
index 7a1a986b2aa..6d0319431d6 100644
--- a/java/ql/integration-tests/java/query-suite/java-code-quality-extended.qls.expected
+++ b/java/ql/integration-tests/java/query-suite/java-code-quality-extended.qls.expected
@@ -1,61 +1,120 @@
 ql/java/ql/src/Advisory/Declarations/MissingOverrideAnnotation.ql
+ql/java/ql/src/Advisory/Declarations/NonFinalImmutableField.ql
+ql/java/ql/src/Advisory/Declarations/NonPrivateField.ql
 ql/java/ql/src/Advisory/Documentation/ImpossibleJavadocThrows.ql
 ql/java/ql/src/Advisory/Documentation/SpuriousJavadocParam.ql
+ql/java/ql/src/Advisory/Java Objects/AvoidCloneMethodAccess.ql
+ql/java/ql/src/Advisory/Java Objects/AvoidCloneOverride.ql
+ql/java/ql/src/Advisory/Java Objects/AvoidCloneableInterface.ql
+ql/java/ql/src/Advisory/Java Objects/AvoidFinalizeOverride.ql
+ql/java/ql/src/Advisory/Naming/NamingConventionsConstants.ql
+ql/java/ql/src/Advisory/Naming/NamingConventionsMethods.ql
+ql/java/ql/src/Advisory/Naming/NamingConventionsPackages.ql
+ql/java/ql/src/Advisory/Naming/NamingConventionsRefTypes.ql
+ql/java/ql/src/Advisory/Naming/NamingConventionsVariables.ql
+ql/java/ql/src/Advisory/Statements/MissingDefaultInSwitch.ql
+ql/java/ql/src/Advisory/Statements/OneStatementPerLine.ql
+ql/java/ql/src/Advisory/Statements/TerminateIfElseIfWithElse.ql
+ql/java/ql/src/Advisory/Types/GenericsConstructor.ql
+ql/java/ql/src/Advisory/Types/GenericsReturnType.ql
+ql/java/ql/src/Advisory/Types/GenericsVariable.ql
 ql/java/ql/src/Compatibility/JDK9/JdkInternalAccess.ql
 ql/java/ql/src/Compatibility/JDK9/UnderscoreIdentifier.ql
+ql/java/ql/src/DeadCode/DeadClass.ql
+ql/java/ql/src/DeadCode/DeadEnumConstant.ql
+ql/java/ql/src/DeadCode/DeadField.ql
+ql/java/ql/src/DeadCode/DeadMethod.ql
 ql/java/ql/src/DeadCode/UselessParameter.ql
 ql/java/ql/src/Language Abuse/EmptyMethod.ql
 ql/java/ql/src/Language Abuse/IterableIterator.ql
 ql/java/ql/src/Language Abuse/LabelInSwitch.ql
+ql/java/ql/src/Language Abuse/OverridePackagePrivate.ql
+ql/java/ql/src/Language Abuse/TypeVarExtendsFinalType.ql
 ql/java/ql/src/Language Abuse/TypeVariableHidesType.ql
 ql/java/ql/src/Language Abuse/UselessNullCheck.ql
 ql/java/ql/src/Language Abuse/UselessTypeTest.ql
 ql/java/ql/src/Language Abuse/WrappedIterator.ql
+ql/java/ql/src/Likely Bugs/Arithmetic/BadAbsOfRandom.ql
 ql/java/ql/src/Likely Bugs/Arithmetic/ConstantExpAppearsNonConstant.ql
 ql/java/ql/src/Likely Bugs/Arithmetic/IntMultToLong.ql
 ql/java/ql/src/Likely Bugs/Arithmetic/LShiftLargerThanTypeWidth.ql
+ql/java/ql/src/Likely Bugs/Arithmetic/MultiplyRemainder.ql
+ql/java/ql/src/Likely Bugs/Arithmetic/RandomUsedOnce.ql
 ql/java/ql/src/Likely Bugs/Arithmetic/WhitespaceContradictsPrecedence.ql
+ql/java/ql/src/Likely Bugs/Cloning/MissingCallToSuperClone.ql
+ql/java/ql/src/Likely Bugs/Cloning/MissingMethodClone.ql
 ql/java/ql/src/Likely Bugs/Collections/ArrayIndexOutOfBounds.ql
 ql/java/ql/src/Likely Bugs/Collections/ContainsTypeMismatch.ql
+ql/java/ql/src/Likely Bugs/Collections/IteratorRemoveMayFail.ql
 ql/java/ql/src/Likely Bugs/Collections/ReadOnlyContainer.ql
 ql/java/ql/src/Likely Bugs/Collections/RemoveTypeMismatch.ql
 ql/java/ql/src/Likely Bugs/Collections/WriteOnlyContainer.ql
 ql/java/ql/src/Likely Bugs/Comparison/CompareIdenticalValues.ql
+ql/java/ql/src/Likely Bugs/Comparison/CovariantCompareTo.ql
+ql/java/ql/src/Likely Bugs/Comparison/CovariantEquals.ql
 ql/java/ql/src/Likely Bugs/Comparison/EqualsArray.ql
 ql/java/ql/src/Likely Bugs/Comparison/HashedButNoHash.ql
 ql/java/ql/src/Likely Bugs/Comparison/IncomparableEquals.ql
+ql/java/ql/src/Likely Bugs/Comparison/InconsistentCompareTo.ql
 ql/java/ql/src/Likely Bugs/Comparison/InconsistentEqualsHashCode.ql
 ql/java/ql/src/Likely Bugs/Comparison/MissingInstanceofInEquals.ql
 ql/java/ql/src/Likely Bugs/Comparison/RefEqBoxed.ql
+ql/java/ql/src/Likely Bugs/Comparison/StringComparison.ql
 ql/java/ql/src/Likely Bugs/Comparison/UselessComparisonTest.ql
 ql/java/ql/src/Likely Bugs/Comparison/WrongNanComparison.ql
+ql/java/ql/src/Likely Bugs/Concurrency/CallsToConditionWait.ql
 ql/java/ql/src/Likely Bugs/Concurrency/CallsToRunnableRun.ql
+ql/java/ql/src/Likely Bugs/Concurrency/DateFormatThreadUnsafe.ql
 ql/java/ql/src/Likely Bugs/Concurrency/DoubleCheckedLocking.ql
 ql/java/ql/src/Likely Bugs/Concurrency/DoubleCheckedLockingWithInitRace.ql
+ql/java/ql/src/Likely Bugs/Concurrency/Escaping.ql
+ql/java/ql/src/Likely Bugs/Concurrency/FutileSynchOnField.ql
 ql/java/ql/src/Likely Bugs/Concurrency/NonSynchronizedOverride.ql
+ql/java/ql/src/Likely Bugs/Concurrency/NotifyNotNotifyAll.ql
+ql/java/ql/src/Likely Bugs/Concurrency/SafePublication.ql
 ql/java/ql/src/Likely Bugs/Concurrency/ScheduledThreadPoolExecutorZeroThread.ql
+ql/java/ql/src/Likely Bugs/Concurrency/SleepWithLock.ql
+ql/java/ql/src/Likely Bugs/Concurrency/StartInConstructor.ql
 ql/java/ql/src/Likely Bugs/Concurrency/SynchOnBoxedType.ql
 ql/java/ql/src/Likely Bugs/Concurrency/SynchSetUnsynchGet.ql
+ql/java/ql/src/Likely Bugs/Concurrency/SynchWriteObject.ql
+ql/java/ql/src/Likely Bugs/Concurrency/ThreadSafe.ql
+ql/java/ql/src/Likely Bugs/Finalization/NullifiedSuperFinalize.ql
+ql/java/ql/src/Likely Bugs/Frameworks/JUnit/BadSuiteMethod.ql
 ql/java/ql/src/Likely Bugs/Frameworks/JUnit/JUnit5MissingNestedAnnotation.ql
+ql/java/ql/src/Likely Bugs/Frameworks/Swing/BadlyOverriddenAdapter.ql
 ql/java/ql/src/Likely Bugs/Inheritance/NoNonFinalInConstructor.ql
 ql/java/ql/src/Likely Bugs/Likely Typos/ContainerSizeCmpZero.ql
 ql/java/ql/src/Likely Bugs/Likely Typos/ContradictoryTypeChecks.ql
+ql/java/ql/src/Likely Bugs/Likely Typos/DangerousNonCircuitLogic.ql
+ql/java/ql/src/Likely Bugs/Likely Typos/EqualsTypo.ql
+ql/java/ql/src/Likely Bugs/Likely Typos/HashCodeTypo.ql
 ql/java/ql/src/Likely Bugs/Likely Typos/MissingFormatArg.ql
 ql/java/ql/src/Likely Bugs/Likely Typos/MissingSpaceTypo.ql
 ql/java/ql/src/Likely Bugs/Likely Typos/SelfAssignment.ql
 ql/java/ql/src/Likely Bugs/Likely Typos/StringBufferCharInit.ql
 ql/java/ql/src/Likely Bugs/Likely Typos/SuspiciousDateFormat.ql
+ql/java/ql/src/Likely Bugs/Likely Typos/ToStringTypo.ql
 ql/java/ql/src/Likely Bugs/Likely Typos/UnusedFormatArg.ql
 ql/java/ql/src/Likely Bugs/Nullness/NullAlways.ql
 ql/java/ql/src/Likely Bugs/Nullness/NullExprDeref.ql
 ql/java/ql/src/Likely Bugs/Nullness/NullMaybe.ql
+ql/java/ql/src/Likely Bugs/Reflection/AnnotationPresentCheck.ql
 ql/java/ql/src/Likely Bugs/Resource Leaks/CloseReader.ql
 ql/java/ql/src/Likely Bugs/Resource Leaks/CloseSql.ql
 ql/java/ql/src/Likely Bugs/Resource Leaks/CloseWriter.ql
+ql/java/ql/src/Likely Bugs/Serialization/IncorrectSerialVersionUID.ql
+ql/java/ql/src/Likely Bugs/Serialization/IncorrectSerializableMethods.ql
+ql/java/ql/src/Likely Bugs/Serialization/MissingVoidConstructorOnExternalizable.ql
+ql/java/ql/src/Likely Bugs/Serialization/MissingVoidConstructorsOnSerializable.ql
+ql/java/ql/src/Likely Bugs/Serialization/NonSerializableInnerClass.ql
+ql/java/ql/src/Likely Bugs/Serialization/ReadResolveObject.ql
 ql/java/ql/src/Likely Bugs/Statements/ContinueInFalseLoop.ql
+ql/java/ql/src/Likely Bugs/Statements/MissingEnumInSwitch.ql
 ql/java/ql/src/Likely Bugs/Statements/PartiallyMaskedCatch.ql
 ql/java/ql/src/Likely Bugs/Statements/UseBraces.ql
 ql/java/ql/src/Likely Bugs/Termination/ConstantLoopCondition.ql
+ql/java/ql/src/Likely Bugs/Termination/SpinOnField.ql
 ql/java/ql/src/Performance/InefficientEmptyStringTest.ql
 ql/java/ql/src/Performance/InefficientKeySetIterator.ql
 ql/java/ql/src/Performance/InefficientOutputStream.ql
@@ -64,6 +123,7 @@ ql/java/ql/src/Performance/InnerClassCouldBeStatic.ql
 ql/java/ql/src/Performance/NewStringString.ql
 ql/java/ql/src/Performance/StringReplaceAllWithNonRegex.ql
 ql/java/ql/src/Violations of Best Practice/Boxed Types/BoxedVariable.ql
+ql/java/ql/src/Violations of Best Practice/Dead Code/CreatesEmptyZip.ql
 ql/java/ql/src/Violations of Best Practice/Dead Code/DeadRefTypes.ql
 ql/java/ql/src/Violations of Best Practice/Dead Code/InterfaceCannotBeImplemented.ql
 ql/java/ql/src/Violations of Best Practice/Dead Code/UnreadLocal.ql
@@ -73,14 +133,21 @@ ql/java/ql/src/Violations of Best Practice/Exception Handling/IgnoreExceptionalR
 ql/java/ql/src/Violations of Best Practice/Exception Handling/NumberFormatException.ql
 ql/java/ql/src/Violations of Best Practice/Implementation Hiding/AbstractToConcreteCollection.ql
 ql/java/ql/src/Violations of Best Practice/Implementation Hiding/ExposeRepresentation.ql
+ql/java/ql/src/Violations of Best Practice/Implementation Hiding/GetClassGetResource.ql
+ql/java/ql/src/Violations of Best Practice/Implementation Hiding/VisibleForTestingAbuse.ql
 ql/java/ql/src/Violations of Best Practice/Naming Conventions/AmbiguousOuterSuper.ql
 ql/java/ql/src/Violations of Best Practice/Naming Conventions/ConfusingMethodNames.ql
 ql/java/ql/src/Violations of Best Practice/Naming Conventions/ConfusingOverloading.ql
+ql/java/ql/src/Violations of Best Practice/Naming Conventions/FieldMasksSuperField.ql
 ql/java/ql/src/Violations of Best Practice/Naming Conventions/LocalShadowsFieldConfusing.ql
 ql/java/ql/src/Violations of Best Practice/Naming Conventions/SameNameAsSuper.ql
 ql/java/ql/src/Violations of Best Practice/Records/IgnoredSerializationMembersOfRecordClass.ql
 ql/java/ql/src/Violations of Best Practice/SpecialCharactersInLiterals/NonExplicitControlAndWhitespaceCharsInLiterals.ql
+ql/java/ql/src/Violations of Best Practice/Testing/ExcessivePublicMethodMocking.ql
+ql/java/ql/src/Violations of Best Practice/Undesirable Calls/CallsToRunFinalizersOnExit.ql
 ql/java/ql/src/Violations of Best Practice/Undesirable Calls/CallsToStringToString.ql
+ql/java/ql/src/Violations of Best Practice/Undesirable Calls/CallsToSystemExit.ql
 ql/java/ql/src/Violations of Best Practice/Undesirable Calls/DefaultToString.ql
 ql/java/ql/src/Violations of Best Practice/Undesirable Calls/DoNotCallFinalize.ql
+ql/java/ql/src/Violations of Best Practice/Undesirable Calls/NextFromIterator.ql
 ql/java/ql/src/Violations of Best Practice/Undesirable Calls/PrintLnArray.ql
diff --git a/java/ql/integration-tests/java/query-suite/java-code-quality.qls.expected b/java/ql/integration-tests/java/query-suite/java-code-quality.qls.expected
index 17253dbe0f8..56e2daa58ce 100644
--- a/java/ql/integration-tests/java/query-suite/java-code-quality.qls.expected
+++ b/java/ql/integration-tests/java/query-suite/java-code-quality.qls.expected
@@ -30,10 +30,13 @@ ql/java/ql/src/Likely Bugs/Comparison/WrongNanComparison.ql
 ql/java/ql/src/Likely Bugs/Concurrency/CallsToRunnableRun.ql
 ql/java/ql/src/Likely Bugs/Concurrency/DoubleCheckedLocking.ql
 ql/java/ql/src/Likely Bugs/Concurrency/DoubleCheckedLockingWithInitRace.ql
+ql/java/ql/src/Likely Bugs/Concurrency/Escaping.ql
 ql/java/ql/src/Likely Bugs/Concurrency/NonSynchronizedOverride.ql
+ql/java/ql/src/Likely Bugs/Concurrency/SafePublication.ql
 ql/java/ql/src/Likely Bugs/Concurrency/ScheduledThreadPoolExecutorZeroThread.ql
 ql/java/ql/src/Likely Bugs/Concurrency/SynchOnBoxedType.ql
 ql/java/ql/src/Likely Bugs/Concurrency/SynchSetUnsynchGet.ql
+ql/java/ql/src/Likely Bugs/Concurrency/ThreadSafe.ql
 ql/java/ql/src/Likely Bugs/Frameworks/JUnit/JUnit5MissingNestedAnnotation.ql
 ql/java/ql/src/Likely Bugs/Inheritance/NoNonFinalInConstructor.ql
 ql/java/ql/src/Likely Bugs/Likely Typos/ContainerSizeCmpZero.ql
@@ -71,6 +74,7 @@ ql/java/ql/src/Violations of Best Practice/Exception Handling/IgnoreExceptionalR
 ql/java/ql/src/Violations of Best Practice/Exception Handling/NumberFormatException.ql
 ql/java/ql/src/Violations of Best Practice/Implementation Hiding/AbstractToConcreteCollection.ql
 ql/java/ql/src/Violations of Best Practice/Implementation Hiding/ExposeRepresentation.ql
+ql/java/ql/src/Violations of Best Practice/Implementation Hiding/VisibleForTestingAbuse.ql
 ql/java/ql/src/Violations of Best Practice/Naming Conventions/AmbiguousOuterSuper.ql
 ql/java/ql/src/Violations of Best Practice/Naming Conventions/ConfusingMethodNames.ql
 ql/java/ql/src/Violations of Best Practice/Naming Conventions/ConfusingOverloading.ql
@@ -78,6 +82,7 @@ ql/java/ql/src/Violations of Best Practice/Naming Conventions/LocalShadowsFieldC
 ql/java/ql/src/Violations of Best Practice/Naming Conventions/SameNameAsSuper.ql
 ql/java/ql/src/Violations of Best Practice/Records/IgnoredSerializationMembersOfRecordClass.ql
 ql/java/ql/src/Violations of Best Practice/SpecialCharactersInLiterals/NonExplicitControlAndWhitespaceCharsInLiterals.ql
+ql/java/ql/src/Violations of Best Practice/Testing/ExcessivePublicMethodMocking.ql
 ql/java/ql/src/Violations of Best Practice/Undesirable Calls/CallsToStringToString.ql
 ql/java/ql/src/Violations of Best Practice/Undesirable Calls/DefaultToString.ql
 ql/java/ql/src/Violations of Best Practice/Undesirable Calls/DoNotCallFinalize.ql
diff --git a/java/ql/integration-tests/java/query-suite/java-code-scanning.qls.expected b/java/ql/integration-tests/java/query-suite/java-code-scanning.qls.expected
index 3290e0d84b0..dd67b7df413 100644
--- a/java/ql/integration-tests/java/query-suite/java-code-scanning.qls.expected
+++ b/java/ql/integration-tests/java/query-suite/java-code-scanning.qls.expected
@@ -21,12 +21,14 @@ ql/java/ql/src/Security/CWE/CWE-094/JexlInjection.ql
 ql/java/ql/src/Security/CWE/CWE-094/MvelInjection.ql
 ql/java/ql/src/Security/CWE/CWE-094/SpelInjection.ql
 ql/java/ql/src/Security/CWE/CWE-094/TemplateInjection.ql
+ql/java/ql/src/Security/CWE/CWE-1004/SensitiveCookieNotHttpOnly.ql
 ql/java/ql/src/Security/CWE/CWE-1104/MavenPomDependsOnBintray.ql
 ql/java/ql/src/Security/CWE/CWE-113/NettyResponseSplitting.ql
 ql/java/ql/src/Security/CWE/CWE-113/ResponseSplitting.ql
 ql/java/ql/src/Security/CWE/CWE-1204/StaticInitializationVector.ql
 ql/java/ql/src/Security/CWE/CWE-134/ExternallyControlledFormatString.ql
 ql/java/ql/src/Security/CWE/CWE-200/SpringBootActuators.ql
+ql/java/ql/src/Security/CWE/CWE-200/SpringBootActuatorsConfig/SpringBootActuatorsConfig.ql
 ql/java/ql/src/Security/CWE/CWE-209/SensitiveDataExposureThroughErrorMessage.ql
 ql/java/ql/src/Security/CWE/CWE-209/StackTraceExposure.ql
 ql/java/ql/src/Security/CWE/CWE-266/IntentUriPermissionManipulation.ql
diff --git a/java/ql/integration-tests/java/query-suite/java-security-and-quality.qls.expected b/java/ql/integration-tests/java/query-suite/java-security-and-quality.qls.expected
index f4317f8e2a5..7e4401bcce9 100644
--- a/java/ql/integration-tests/java/query-suite/java-security-and-quality.qls.expected
+++ b/java/ql/integration-tests/java/query-suite/java-security-and-quality.qls.expected
@@ -127,6 +127,7 @@ ql/java/ql/src/Security/CWE/CWE-094/JexlInjection.ql
 ql/java/ql/src/Security/CWE/CWE-094/MvelInjection.ql
 ql/java/ql/src/Security/CWE/CWE-094/SpelInjection.ql
 ql/java/ql/src/Security/CWE/CWE-094/TemplateInjection.ql
+ql/java/ql/src/Security/CWE/CWE-1004/SensitiveCookieNotHttpOnly.ql
 ql/java/ql/src/Security/CWE/CWE-1104/MavenPomDependsOnBintray.ql
 ql/java/ql/src/Security/CWE/CWE-113/NettyResponseSplitting.ql
 ql/java/ql/src/Security/CWE/CWE-113/ResponseSplitting.ql
@@ -143,6 +144,7 @@ ql/java/ql/src/Security/CWE/CWE-200/AndroidSensitiveTextField.ql
 ql/java/ql/src/Security/CWE/CWE-200/AndroidWebViewSettingsAllowsContentAccess.ql
 ql/java/ql/src/Security/CWE/CWE-200/AndroidWebViewSettingsFileAccess.ql
 ql/java/ql/src/Security/CWE/CWE-200/SpringBootActuators.ql
+ql/java/ql/src/Security/CWE/CWE-200/SpringBootActuatorsConfig/SpringBootActuatorsConfig.ql
 ql/java/ql/src/Security/CWE/CWE-200/TempDirLocalInformationDisclosure.ql
 ql/java/ql/src/Security/CWE/CWE-209/SensitiveDataExposureThroughErrorMessage.ql
 ql/java/ql/src/Security/CWE/CWE-209/StackTraceExposure.ql
diff --git a/java/ql/integration-tests/java/query-suite/java-security-extended.qls.expected b/java/ql/integration-tests/java/query-suite/java-security-extended.qls.expected
index 209777cf4d9..b2981db13c2 100644
--- a/java/ql/integration-tests/java/query-suite/java-security-extended.qls.expected
+++ b/java/ql/integration-tests/java/query-suite/java-security-extended.qls.expected
@@ -30,6 +30,7 @@ ql/java/ql/src/Security/CWE/CWE-094/JexlInjection.ql
 ql/java/ql/src/Security/CWE/CWE-094/MvelInjection.ql
 ql/java/ql/src/Security/CWE/CWE-094/SpelInjection.ql
 ql/java/ql/src/Security/CWE/CWE-094/TemplateInjection.ql
+ql/java/ql/src/Security/CWE/CWE-1004/SensitiveCookieNotHttpOnly.ql
 ql/java/ql/src/Security/CWE/CWE-1104/MavenPomDependsOnBintray.ql
 ql/java/ql/src/Security/CWE/CWE-113/NettyResponseSplitting.ql
 ql/java/ql/src/Security/CWE/CWE-113/ResponseSplitting.ql
@@ -46,6 +47,7 @@ ql/java/ql/src/Security/CWE/CWE-200/AndroidSensitiveTextField.ql
 ql/java/ql/src/Security/CWE/CWE-200/AndroidWebViewSettingsAllowsContentAccess.ql
 ql/java/ql/src/Security/CWE/CWE-200/AndroidWebViewSettingsFileAccess.ql
 ql/java/ql/src/Security/CWE/CWE-200/SpringBootActuators.ql
+ql/java/ql/src/Security/CWE/CWE-200/SpringBootActuatorsConfig/SpringBootActuatorsConfig.ql
 ql/java/ql/src/Security/CWE/CWE-200/TempDirLocalInformationDisclosure.ql
 ql/java/ql/src/Security/CWE/CWE-209/SensitiveDataExposureThroughErrorMessage.ql
 ql/java/ql/src/Security/CWE/CWE-209/StackTraceExposure.ql
diff --git a/java/ql/integration-tests/java/query-suite/not_included_in_qls.expected b/java/ql/integration-tests/java/query-suite/not_included_in_qls.expected
index 1f58e51ad80..8045226ace4 100644
--- a/java/ql/integration-tests/java/query-suite/not_included_in_qls.expected
+++ b/java/ql/integration-tests/java/query-suite/not_included_in_qls.expected
@@ -1,25 +1,8 @@
-ql/java/ql/src/Advisory/Declarations/NonFinalImmutableField.ql
-ql/java/ql/src/Advisory/Declarations/NonPrivateField.ql
 ql/java/ql/src/Advisory/Documentation/MissingJavadocMethods.ql
 ql/java/ql/src/Advisory/Documentation/MissingJavadocParameters.ql
 ql/java/ql/src/Advisory/Documentation/MissingJavadocReturnValues.ql
 ql/java/ql/src/Advisory/Documentation/MissingJavadocThrows.ql
 ql/java/ql/src/Advisory/Documentation/MissingJavadocTypes.ql
-ql/java/ql/src/Advisory/Java Objects/AvoidCloneMethodAccess.ql
-ql/java/ql/src/Advisory/Java Objects/AvoidCloneOverride.ql
-ql/java/ql/src/Advisory/Java Objects/AvoidCloneableInterface.ql
-ql/java/ql/src/Advisory/Java Objects/AvoidFinalizeOverride.ql
-ql/java/ql/src/Advisory/Naming/NamingConventionsConstants.ql
-ql/java/ql/src/Advisory/Naming/NamingConventionsMethods.ql
-ql/java/ql/src/Advisory/Naming/NamingConventionsPackages.ql
-ql/java/ql/src/Advisory/Naming/NamingConventionsRefTypes.ql
-ql/java/ql/src/Advisory/Naming/NamingConventionsVariables.ql
-ql/java/ql/src/Advisory/Statements/MissingDefaultInSwitch.ql
-ql/java/ql/src/Advisory/Statements/OneStatementPerLine.ql
-ql/java/ql/src/Advisory/Statements/TerminateIfElseIfWithElse.ql
-ql/java/ql/src/Advisory/Types/GenericsConstructor.ql
-ql/java/ql/src/Advisory/Types/GenericsReturnType.ql
-ql/java/ql/src/Advisory/Types/GenericsVariable.ql
 ql/java/ql/src/AlertSuppression.ql
 ql/java/ql/src/AlertSuppressionAnnotations.ql
 ql/java/ql/src/Architecture/Dependencies/MutualDependency.ql
@@ -31,10 +14,6 @@ ql/java/ql/src/Architecture/Refactoring Opportunities/HubClasses.ql
 ql/java/ql/src/Architecture/Refactoring Opportunities/InappropriateIntimacy.ql
 ql/java/ql/src/Complexity/BlockWithTooManyStatements.ql
 ql/java/ql/src/Complexity/ComplexCondition.ql
-ql/java/ql/src/DeadCode/DeadClass.ql
-ql/java/ql/src/DeadCode/DeadEnumConstant.ql
-ql/java/ql/src/DeadCode/DeadField.ql
-ql/java/ql/src/DeadCode/DeadMethod.ql
 ql/java/ql/src/DeadCode/FLinesOfDeadCode.ql
 ql/java/ql/src/Frameworks/JavaEE/EJB/EjbContainerInterference.ql
 ql/java/ql/src/Frameworks/JavaEE/EJB/EjbFileIO.ql
@@ -66,7 +45,6 @@ ql/java/ql/src/Frameworks/Spring/XML Configuration Errors/MissingSetters.ql
 ql/java/ql/src/Language Abuse/CastThisToTypeParameter.ql
 ql/java/ql/src/Language Abuse/DubiousDowncastOfThis.ql
 ql/java/ql/src/Language Abuse/DubiousTypeTestOfThis.ql
-ql/java/ql/src/Language Abuse/EmptyStatement.ql
 ql/java/ql/src/Language Abuse/EnumIdentifier.ql
 ql/java/ql/src/Language Abuse/ImplementsAnnotation.ql
 ql/java/ql/src/Language Abuse/MissedTernaryOpportunity.ql
@@ -187,7 +165,6 @@ ql/java/ql/src/Violations of Best Practice/Magic Constants/MagicNumbersUseConsta
 ql/java/ql/src/Violations of Best Practice/Magic Constants/MagicStringsUseConstant.ql
 ql/java/ql/src/Violations of Best Practice/Naming Conventions/ConfusingOverridesNames.ql
 ql/java/ql/src/Violations of Best Practice/Naming Conventions/LocalShadowsField.ql
-ql/java/ql/src/Violations of Best Practice/Undesirable Calls/CallsToSystemExit.ql
 ql/java/ql/src/Violations of Best Practice/Undesirable Calls/GarbageCollection.ql
 ql/java/ql/src/Violations of Best Practice/legacy/AutoBoxing.ql
 ql/java/ql/src/Violations of Best Practice/legacy/FinallyMayNotComplete.ql
@@ -196,7 +173,6 @@ ql/java/ql/src/Violations of Best Practice/legacy/ParameterAssignment.ql
 ql/java/ql/src/Violations of Best Practice/legacy/UnnecessaryCast.ql
 ql/java/ql/src/Violations of Best Practice/legacy/UnnecessaryImport.ql
 ql/java/ql/src/definitions.ql
-ql/java/ql/src/experimental/Security/CWE/CWE-016/InsecureSpringActuatorConfig.ql
 ql/java/ql/src/experimental/Security/CWE/CWE-020/Log4jJndiInjection.ql
 ql/java/ql/src/experimental/Security/CWE/CWE-036/OpenStream.ql
 ql/java/ql/src/experimental/Security/CWE/CWE-073/FilePathInjection.ql
@@ -214,7 +190,6 @@ ql/java/ql/src/experimental/Security/CWE/CWE-094/ScriptInjection.ql
 ql/java/ql/src/experimental/Security/CWE/CWE-094/SpringImplicitViewManipulation.ql
 ql/java/ql/src/experimental/Security/CWE/CWE-094/SpringViewManipulation.ql
 ql/java/ql/src/experimental/Security/CWE/CWE-1004/InsecureTomcatConfig.ql
-ql/java/ql/src/experimental/Security/CWE/CWE-1004/SensitiveCookieNotHttpOnly.ql
 ql/java/ql/src/experimental/Security/CWE/CWE-200/InsecureWebResourceResponse.ql
 ql/java/ql/src/experimental/Security/CWE/CWE-200/SensitiveAndroidFileLeak.ql
 ql/java/ql/src/experimental/Security/CWE/CWE-208/PossibleTimingAttackAgainstSignature.ql
@@ -253,14 +228,25 @@ ql/java/ql/src/experimental/Security/CWE/CWE-665/InsecureRmiJmxEnvironmentConfig
 ql/java/ql/src/experimental/Security/CWE/CWE-755/NFEAndroidDoS.ql
 ql/java/ql/src/experimental/Security/CWE/CWE-759/HashWithoutSalt.ql
 ql/java/ql/src/experimental/Security/CWE/CWE-939/IncorrectURLVerification.ql
-ql/java/ql/src/experimental/quantum/Analysis/InsecureNonceSource.ql
-ql/java/ql/src/experimental/quantum/Analysis/KnownWeakKDFIterationCount.ql
-ql/java/ql/src/experimental/quantum/Analysis/ReusedNonce.ql
-ql/java/ql/src/experimental/quantum/Analysis/UnknownKDFIterationCount.ql
+ql/java/ql/src/experimental/quantum/Examples/BadMacOrderDecryptThenMac.ql
+ql/java/ql/src/experimental/quantum/Examples/BadMacOrderDecryptToMac.ql
+ql/java/ql/src/experimental/quantum/Examples/BadMacOrderMacOnEncryptPlaintext.ql
 ql/java/ql/src/experimental/quantum/Examples/BrokenCrypto.ql
+ql/java/ql/src/experimental/quantum/Examples/InsecureIVorNonceSource.ql
+ql/java/ql/src/experimental/quantum/Examples/NonAESGCMCipher.ql
+ql/java/ql/src/experimental/quantum/Examples/ReusedNonce.ql
 ql/java/ql/src/experimental/quantum/Examples/TestAESGCMNonce.ql
 ql/java/ql/src/experimental/quantum/Examples/TestCipher.ql
 ql/java/ql/src/experimental/quantum/Examples/TestHash.ql
+ql/java/ql/src/experimental/quantum/Examples/UnknownHash.ql
+ql/java/ql/src/experimental/quantum/Examples/UnknownIVorNonceSource.ql
+ql/java/ql/src/experimental/quantum/Examples/UnknownKDFIterationCount.ql
+ql/java/ql/src/experimental/quantum/Examples/WeakAsymmetricKeyGenSize.ql
+ql/java/ql/src/experimental/quantum/Examples/WeakBlockModes.ql
+ql/java/ql/src/experimental/quantum/Examples/WeakHash.ql
+ql/java/ql/src/experimental/quantum/Examples/WeakKDFIterationCount.ql
+ql/java/ql/src/experimental/quantum/Examples/WeakKDFKeySize.ql
+ql/java/ql/src/experimental/quantum/Examples/WeakSymmetricCipher.ql
 ql/java/ql/src/experimental/quantum/InventorySlices/KnownAsymmetricAlgorithm.ql
 ql/java/ql/src/experimental/quantum/InventorySlices/KnownAsymmetricCipherAlgorithm.ql
 ql/java/ql/src/experimental/quantum/InventorySlices/KnownAsymmetricOperationAlgorithm.ql
@@ -285,10 +271,6 @@ ql/java/ql/src/external/MostlyDuplicateMethod.ql
 ql/java/ql/src/external/MostlySimilarFile.ql
 ql/java/ql/src/filters/ClassifyFiles.ql
 ql/java/ql/src/meta/frameworks/Coverage.ql
-ql/java/ql/src/meta/ssa/AmbiguousToString.ql
-ql/java/ql/src/meta/ssa/TooFewPhiInputs.ql
-ql/java/ql/src/meta/ssa/UncertainDefWithoutPrior.ql
-ql/java/ql/src/meta/ssa/UseWithoutUniqueSsaVariable.ql
 ql/java/ql/src/utils/modelconverter/ExtractNeutrals.ql
 ql/java/ql/src/utils/modelconverter/ExtractSinks.ql
 ql/java/ql/src/utils/modelconverter/ExtractSources.ql
diff --git a/java/ql/integration-tests/kotlin/all-platforms/recursive_interfaces/somepkg/IfaceA.java b/java/ql/integration-tests/kotlin/all-platforms/recursive_interfaces/somepkg/IfaceA.java
new file mode 100644
index 00000000000..b8ffc44dada
--- /dev/null
+++ b/java/ql/integration-tests/kotlin/all-platforms/recursive_interfaces/somepkg/IfaceA.java
@@ -0,0 +1,4 @@
+
+package somepkg;
+
+public interface IfaceA<T> extends IfaceB<T> {}
diff --git a/java/ql/integration-tests/kotlin/all-platforms/recursive_interfaces/somepkg/IfaceB.java b/java/ql/integration-tests/kotlin/all-platforms/recursive_interfaces/somepkg/IfaceB.java
new file mode 100644
index 00000000000..6c45ba3dcb3
--- /dev/null
+++ b/java/ql/integration-tests/kotlin/all-platforms/recursive_interfaces/somepkg/IfaceB.java
@@ -0,0 +1,4 @@
+
+package somepkg;
+
+public interface IfaceB<T> extends IfaceC<IfaceA<IfaceB<T>>> {}
diff --git a/java/ql/integration-tests/kotlin/all-platforms/recursive_interfaces/somepkg/IfaceC.java b/java/ql/integration-tests/kotlin/all-platforms/recursive_interfaces/somepkg/IfaceC.java
new file mode 100644
index 00000000000..e75348f1c26
--- /dev/null
+++ b/java/ql/integration-tests/kotlin/all-platforms/recursive_interfaces/somepkg/IfaceC.java
@@ -0,0 +1,4 @@
+
+package somepkg;
+
+public interface IfaceC<T> {}
diff --git a/java/ql/integration-tests/kotlin/all-platforms/recursive_interfaces/somepkg/IfaceZ.java b/java/ql/integration-tests/kotlin/all-platforms/recursive_interfaces/somepkg/IfaceZ.java
new file mode 100644
index 00000000000..b46c132b0e0
--- /dev/null
+++ b/java/ql/integration-tests/kotlin/all-platforms/recursive_interfaces/somepkg/IfaceZ.java
@@ -0,0 +1,6 @@
+
+package somepkg;
+
+public interface IfaceZ {
+    public <T> IfaceA<String> someFun();
+}
diff --git a/java/ql/integration-tests/kotlin/all-platforms/recursive_interfaces/test.kt b/java/ql/integration-tests/kotlin/all-platforms/recursive_interfaces/test.kt
new file mode 100644
index 00000000000..55767ae75f3
--- /dev/null
+++ b/java/ql/integration-tests/kotlin/all-platforms/recursive_interfaces/test.kt
@@ -0,0 +1,5 @@
+package mypkg
+
+import somepkg.IfaceZ
+
+class SomeClass(private val myVal: IfaceZ) { }
diff --git a/java/ql/integration-tests/kotlin/all-platforms/recursive_interfaces/test.py b/java/ql/integration-tests/kotlin/all-platforms/recursive_interfaces/test.py
new file mode 100644
index 00000000000..daa246c8c7c
--- /dev/null
+++ b/java/ql/integration-tests/kotlin/all-platforms/recursive_interfaces/test.py
@@ -0,0 +1,6 @@
+import commands
+
+def test(codeql, java_full):
+    codeql.database.create(
+        command=["kotlinc somepkg/IfaceA.java somepkg/IfaceB.java somepkg/IfaceC.java somepkg/IfaceZ.java test.kt"]
+    )
diff --git a/java/ql/integration-tests/kotlin/all-platforms/recursive_interfaces/types.expected b/java/ql/integration-tests/kotlin/all-platforms/recursive_interfaces/types.expected
new file mode 100644
index 00000000000..cf39c2a5457
--- /dev/null
+++ b/java/ql/integration-tests/kotlin/all-platforms/recursive_interfaces/types.expected
@@ -0,0 +1,19 @@
+| file:///!unknown-binary-location/somepkg/IfaceA.class:0:0:0:0 | IfaceA |
+| file:///!unknown-binary-location/somepkg/IfaceA.class:0:0:0:0 | IfaceA<> |
+| file:///!unknown-binary-location/somepkg/IfaceA.class:0:0:0:0 | IfaceA<IfaceB<>> |
+| file:///!unknown-binary-location/somepkg/IfaceA.class:0:0:0:0 | IfaceA<IfaceB<String>> |
+| file:///!unknown-binary-location/somepkg/IfaceA.class:0:0:0:0 | IfaceA<IfaceB<T>> |
+| file:///!unknown-binary-location/somepkg/IfaceA.class:0:0:0:0 | IfaceA<IfaceB> |
+| file:///!unknown-binary-location/somepkg/IfaceA.class:0:0:0:0 | IfaceA<String> |
+| file:///!unknown-binary-location/somepkg/IfaceB.class:0:0:0:0 | IfaceB |
+| file:///!unknown-binary-location/somepkg/IfaceB.class:0:0:0:0 | IfaceB<> |
+| file:///!unknown-binary-location/somepkg/IfaceB.class:0:0:0:0 | IfaceB<IfaceB> |
+| file:///!unknown-binary-location/somepkg/IfaceB.class:0:0:0:0 | IfaceB<String> |
+| file:///!unknown-binary-location/somepkg/IfaceB.class:0:0:0:0 | IfaceB<T> |
+| file:///!unknown-binary-location/somepkg/IfaceC.class:0:0:0:0 | IfaceC |
+| file:///!unknown-binary-location/somepkg/IfaceC.class:0:0:0:0 | IfaceC<> |
+| file:///!unknown-binary-location/somepkg/IfaceC.class:0:0:0:0 | IfaceC<IfaceA<IfaceB<>>> |
+| file:///!unknown-binary-location/somepkg/IfaceC.class:0:0:0:0 | IfaceC<IfaceA<IfaceB<String>>> |
+| file:///!unknown-binary-location/somepkg/IfaceC.class:0:0:0:0 | IfaceC<IfaceA<IfaceB<T>>> |
+| file:///!unknown-binary-location/somepkg/IfaceC.class:0:0:0:0 | IfaceC<IfaceA<IfaceB>> |
+| file:///!unknown-binary-location/somepkg/IfaceZ.class:0:0:0:0 | IfaceZ |
diff --git a/java/ql/integration-tests/kotlin/all-platforms/recursive_interfaces/types.ql b/java/ql/integration-tests/kotlin/all-platforms/recursive_interfaces/types.ql
new file mode 100644
index 00000000000..fad3645276c
--- /dev/null
+++ b/java/ql/integration-tests/kotlin/all-platforms/recursive_interfaces/types.ql
@@ -0,0 +1,5 @@
+import java
+
+from Type t
+where t.getName().matches("Iface%")
+select t
diff --git a/java/ql/lib/CHANGELOG.md b/java/ql/lib/CHANGELOG.md
index e15d695efea..e261dbee59e 100644
--- a/java/ql/lib/CHANGELOG.md
+++ b/java/ql/lib/CHANGELOG.md
@@ -1,3 +1,46 @@
+## 7.7.3
+
+No user-facing changes.
+
+## 7.7.2
+
+### Minor Analysis Improvements
+
+* Fields of certain objects are considered tainted if the object is tainted. This holds, for example, for objects that occur directly as sources in the active threat model (for instance, a remote flow source). This has now been amended to also include array types, such that if an array like `MyPojo[]` is a source, then fields of a tainted `MyPojo` are now also considered tainted.
+
+## 7.7.1
+
+No user-facing changes.
+
+## 7.7.0
+
+### New Features
+
+* The Java extractor and QL libraries now support Java 25.
+* Added support for Java 25 compact source files (JEP 512). The new predicate `Class.isImplicit()` identifies classes that are implicitly declared when using compact source files, and the new predicate `CompilationUnit.isCompactSourceFile()` identifies compilation units that contain compact source files.
+* Added support for Java 25 module import declarations.
+* Add `ModuleImportDeclaration` class.
+
+### Minor Analysis Improvements
+
+* Improved support for various assertion libraries, in particular JUnit. This affects the control-flow graph slightly, and in turn affects several queries (mainly quality queries). Most queries should see improved precision (new true positives and fewer false positives), in particular `java/constant-comparison`, `java/index-out-of-bounds`, `java/dereferenced-value-may-be-null`, and `java/useless-null-check`. Some medium precision queries like `java/toctou-race-condition` and `java/unreleased-lock` may see mixed result changes (both slight improvements and slight regressions).
+* Added taint flow model for `java.crypto.KDF`.
+* Added taint flow model for `java.lang.ScopedValue`.
+
+## 7.6.1
+
+No user-facing changes.
+
+## 7.6.0
+
+### Major Analysis Improvements
+
+* Added library models for the relevant method calls under `jakarta.servlet.ServletRequest` and `jakarta.servlet.http.HttpServletRequest` as remote flow sources.
+
+### Minor Analysis Improvements
+
+* Guard implication logic involving wrapper methods has been improved. In particular, this means fewer false positives for `java/dereferenced-value-may-be-null`.
+
 ## 7.5.0
 
 ### New Features
diff --git a/java/ql/lib/change-notes/2025-07-28-guardwrappers.md b/java/ql/lib/change-notes/2025-07-28-guardwrappers.md
deleted file mode 100644
index cf976fe7789..00000000000
--- a/java/ql/lib/change-notes/2025-07-28-guardwrappers.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* Guard implication logic involving wrapper methods has been improved. In particular, this means fewer false positives for `java/dereferenced-value-may-be-null`.
diff --git a/java/ql/lib/change-notes/released/7.6.0.md b/java/ql/lib/change-notes/released/7.6.0.md
new file mode 100644
index 00000000000..6c7a1c3338c
--- /dev/null
+++ b/java/ql/lib/change-notes/released/7.6.0.md
@@ -0,0 +1,9 @@
+## 7.6.0
+
+### Major Analysis Improvements
+
+* Added library models for the relevant method calls under `jakarta.servlet.ServletRequest` and `jakarta.servlet.http.HttpServletRequest` as remote flow sources.
+
+### Minor Analysis Improvements
+
+* Guard implication logic involving wrapper methods has been improved. In particular, this means fewer false positives for `java/dereferenced-value-may-be-null`.
diff --git a/java/ql/lib/change-notes/released/7.6.1.md b/java/ql/lib/change-notes/released/7.6.1.md
new file mode 100644
index 00000000000..fd15c208d88
--- /dev/null
+++ b/java/ql/lib/change-notes/released/7.6.1.md
@@ -0,0 +1,3 @@
+## 7.6.1
+
+No user-facing changes.
diff --git a/java/ql/lib/change-notes/released/7.7.0.md b/java/ql/lib/change-notes/released/7.7.0.md
new file mode 100644
index 00000000000..f33b45cd74d
--- /dev/null
+++ b/java/ql/lib/change-notes/released/7.7.0.md
@@ -0,0 +1,14 @@
+## 7.7.0
+
+### New Features
+
+* The Java extractor and QL libraries now support Java 25.
+* Added support for Java 25 compact source files (JEP 512). The new predicate `Class.isImplicit()` identifies classes that are implicitly declared when using compact source files, and the new predicate `CompilationUnit.isCompactSourceFile()` identifies compilation units that contain compact source files.
+* Added support for Java 25 module import declarations.
+* Add `ModuleImportDeclaration` class.
+
+### Minor Analysis Improvements
+
+* Improved support for various assertion libraries, in particular JUnit. This affects the control-flow graph slightly, and in turn affects several queries (mainly quality queries). Most queries should see improved precision (new true positives and fewer false positives), in particular `java/constant-comparison`, `java/index-out-of-bounds`, `java/dereferenced-value-may-be-null`, and `java/useless-null-check`. Some medium precision queries like `java/toctou-race-condition` and `java/unreleased-lock` may see mixed result changes (both slight improvements and slight regressions).
+* Added taint flow model for `java.crypto.KDF`.
+* Added taint flow model for `java.lang.ScopedValue`.
diff --git a/java/ql/lib/change-notes/released/7.7.1.md b/java/ql/lib/change-notes/released/7.7.1.md
new file mode 100644
index 00000000000..7349fc621cc
--- /dev/null
+++ b/java/ql/lib/change-notes/released/7.7.1.md
@@ -0,0 +1,3 @@
+## 7.7.1
+
+No user-facing changes.
diff --git a/java/ql/lib/change-notes/released/7.7.2.md b/java/ql/lib/change-notes/released/7.7.2.md
new file mode 100644
index 00000000000..43d4f94b816
--- /dev/null
+++ b/java/ql/lib/change-notes/released/7.7.2.md
@@ -0,0 +1,5 @@
+## 7.7.2
+
+### Minor Analysis Improvements
+
+* Fields of certain objects are considered tainted if the object is tainted. This holds, for example, for objects that occur directly as sources in the active threat model (for instance, a remote flow source). This has now been amended to also include array types, such that if an array like `MyPojo[]` is a source, then fields of a tainted `MyPojo` are now also considered tainted.
diff --git a/java/ql/lib/change-notes/released/7.7.3.md b/java/ql/lib/change-notes/released/7.7.3.md
new file mode 100644
index 00000000000..d03e3181a52
--- /dev/null
+++ b/java/ql/lib/change-notes/released/7.7.3.md
@@ -0,0 +1,3 @@
+## 7.7.3
+
+No user-facing changes.
diff --git a/java/ql/lib/codeql-pack.release.yml b/java/ql/lib/codeql-pack.release.yml
index 7ed5cb290ca..6856106e771 100644
--- a/java/ql/lib/codeql-pack.release.yml
+++ b/java/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 7.5.0
+lastReleaseVersion: 7.7.3
diff --git a/java/ql/lib/config/semmlecode.dbscheme b/java/ql/lib/config/semmlecode.dbscheme
index 1b8f5f4c747..9f6026c4009 100644
--- a/java/ql/lib/config/semmlecode.dbscheme
+++ b/java/ql/lib/config/semmlecode.dbscheme
@@ -537,6 +537,10 @@ isLocalClassOrInterface(
   int parent: @localtypedeclstmt ref
 );
 
+isImplicitClass(
+  unique int classid: @classorinterface ref
+);
+
 isDefConstr(
   int constructorid: @constructor ref
 );
diff --git a/java/ql/lib/config/semmlecode.dbscheme.stats b/java/ql/lib/config/semmlecode.dbscheme.stats
index 650c4649439..d530051f3a4 100644
--- a/java/ql/lib/config/semmlecode.dbscheme.stats
+++ b/java/ql/lib/config/semmlecode.dbscheme.stats
@@ -13986,6 +13986,17 @@
                 </dep>
             </dependencies>
         </relation>
+        <relation>
+            <name>isImplicitClass</name>
+            <cardinality>4</cardinality>
+            <columnsizes>
+                <e>
+                    <k>classid</k>
+                    <v>4</v>
+                </e>
+            </columnsizes>
+            <dependencies/>
+        </relation>
         <relation>
             <name>isDefConstr</name>
             <cardinality>139376</cardinality>
diff --git a/java/ql/lib/experimental/quantum/JCA.qll b/java/ql/lib/experimental/quantum/JCA.qll
index dc86c463750..c0ddd1ae7fa 100644
--- a/java/ql/lib/experimental/quantum/JCA.qll
+++ b/java/ql/lib/experimental/quantum/JCA.qll
@@ -18,23 +18,18 @@ module JCAModel {
 
   abstract class KeyAgreementAlgorithmValueConsumer extends Crypto::AlgorithmValueConsumer { }
 
+  abstract class SignatureAlgorithmValueConsumer extends Crypto::AlgorithmValueConsumer { }
+
+  abstract class MacAlgorithmValueConsumer extends Crypto::AlgorithmValueConsumer { }
+
   // TODO: Verify that the PBEWith% case works correctly
   bindingset[algo]
   predicate cipher_names(string algo) {
     algo.toUpperCase()
         .matches([
             "AES", "AESWrap", "AESWrapPad", "ARCFOUR", "Blowfish", "ChaCha20", "ChaCha20-Poly1305",
-            "DES", "DESede", "DESedeWrap", "ECIES", "PBEWith%", "RC2", "RC4", "RC5", "RSA"
-          ].toUpperCase())
-  }
-
-  // TODO: Verify that the CFB% case works correctly
-  bindingset[mode]
-  predicate cipher_modes(string mode) {
-    mode.toUpperCase()
-        .matches([
-            "NONE", "CBC", "CCM", "CFB", "CFB%", "CTR", "CTS", "ECB", "GCM", "KW", "KWP", "OFB",
-            "OFB%", "PCBC"
+            "DES", "DESede", "DESedeWrap", "ECIES", "PBEWith%", "RC2", "RC4", "RC5", "RSA",
+            "Skipjack", "Idea"
           ].toUpperCase())
   }
 
@@ -50,11 +45,7 @@ module JCAModel {
   }
 
   bindingset[hash]
-  predicate hash_names(string hash) {
-    hash.toUpperCase()
-        .matches(["SHA-%", "SHA3-%", "BLAKE2b%", "BLAKE2s%", "MD5", "RIPEMD160", "Whirlpool"]
-              .toUpperCase())
-  }
+  predicate hash_names(string hash) { exists(hash_name_to_type_known(hash, _)) }
 
   bindingset[kdf]
   predicate kdf_names(string kdf) {
@@ -96,13 +87,26 @@ module JCAModel {
     name.toUpperCase()
         .matches([
             "HMAC%", "AESCMAC", "DESCMAC", "GMAC", "Poly1305", "SipHash", "BLAKE2BMAC",
-            "HMACRIPEMD160"
+            "HMACRIPEMD160", "%CMAC"
           ].toUpperCase())
   }
 
+  /**
+   * Names that match known signature algorithms.
+   * https://docs.oracle.com/en/java/javase/25/docs/specs/security/standard-names.html
+   */
+  bindingset[name]
+  predicate signature_names(string name) {
+    name.toUpperCase().splitAt("WITH", 1).matches(["RSA%", "ECDSA%", "DSA%"])
+    or
+    name.toUpperCase()
+        .matches(["RSASSA-PSS", "ED25519", "ED448", "EDDSA", "ML-DSA%", "HSS/LMS", "DSA"])
+  }
+
   bindingset[name]
   predicate key_agreement_names(string name) {
-    name.toUpperCase().matches(["DH", "EDH", "ECDH", "X25519", "X448"].toUpperCase())
+    name.toUpperCase()
+        .matches(["DH", "EDH", "ECDH", "X25519", "X448", "ML-KEM%", "XDH"].toUpperCase())
   }
 
   bindingset[name]
@@ -117,41 +121,47 @@ module JCAModel {
     // TODO: add additional
   }
 
-  bindingset[name]
-  Crypto::HashType hash_name_to_type_known(string name, int digestLength) {
-    name = "SHA-1" and result instanceof Crypto::SHA1 and digestLength = 160
-    or
-    name = ["SHA-256", "SHA-384", "SHA-512"] and
-    result instanceof Crypto::SHA2 and
-    digestLength = name.splitAt("-", 1).toInt()
-    or
-    name = ["SHA3-224", "SHA3-256", "SHA3-384", "SHA3-512"] and
-    result instanceof Crypto::SHA3 and
-    digestLength = name.splitAt("-", 1).toInt()
-    or
-    (
-      name.matches("BLAKE2b%") and
-      result instanceof Crypto::BLAKE2B
+  bindingset[nameRaw]
+  Crypto::HashType hash_name_to_type_known(string nameRaw, int digestLength) {
+    exists(string name | name = nameRaw.toUpperCase() |
+      name in ["SHA-1", "SHA1"] and result instanceof Crypto::SHA1 and digestLength = 160
       or
-      name = "BLAKE2s" and result instanceof Crypto::BLAKE2S
-    ) and
-    (
-      if exists(name.indexOf("-"))
-      then name.splitAt("-", 1).toInt() = digestLength
-      else digestLength = 512
+      name in ["SHA-256", "SHA-224", "SHA-384", "SHA-512", "SHA224", "SHA256", "SHA384", "SHA512"] and
+      result instanceof Crypto::SHA2 and
+      digestLength = name.replaceAll("-", "").splitAt("SHA", 1).toInt()
+      or
+      name in ["SHA-512/224", "SHA-512/256", "SHA512/224", "SHA512/256"] and
+      result instanceof Crypto::SHA2 and
+      digestLength = name.replaceAll("-", "").splitAt("SHA-512/", 1).toInt()
+      or
+      name in ["SHA3-224", "SHA3-256", "SHA3-384", "SHA3-512", "SHA3256", "SHA3384", "SHA3512"] and
+      result instanceof Crypto::SHA3 and
+      digestLength = name.replaceAll("-", "").splitAt("SHA3", 1).toInt()
+      or
+      (
+        name.toUpperCase().matches("BLAKE2B%") and
+        result instanceof Crypto::BLAKE2B
+        or
+        name.toUpperCase() = "BLAKE2S" and result instanceof Crypto::BLAKE2S
+      ) and
+      (
+        if exists(name.indexOf("-"))
+        then name.splitAt("-", 1).toInt() = digestLength
+        else digestLength = 512
+      )
+      or
+      name = "MD5" and
+      result instanceof Crypto::MD5 and
+      digestLength = 128
+      or
+      name = "RIPEMD160" and
+      result instanceof Crypto::RIPEMD160 and
+      digestLength = 160
+      or
+      name = "WHIRLPOOL" and
+      result instanceof Crypto::WHIRLPOOL and
+      digestLength = 512 // TODO: verify
     )
-    or
-    name = "MD5" and
-    result instanceof Crypto::MD5 and
-    digestLength = 128
-    or
-    name = "RIPEMD160" and
-    result instanceof Crypto::RIPEMD160 and
-    digestLength = 160
-    or
-    name = "Whirlpool" and
-    result instanceof Crypto::WHIRLPOOL and
-    digestLength = 512 // TODO: verify
   }
 
   bindingset[name]
@@ -171,6 +181,14 @@ module JCAModel {
     type = KeyOpAlg::SIV() and name = "SIV"
     or
     type = KeyOpAlg::OCB() and name = "OCB"
+    or
+    type = KeyOpAlg::CFB() and name = "CFB"
+    or
+    type = KeyOpAlg::OFB() and name = "OFB"
+    or
+    type = KeyOpAlg::PCBC() and name = "PCBC"
+    or
+    type = KeyOpAlg::KWP() and name = "KWP"
   }
 
   bindingset[name]
@@ -179,7 +197,8 @@ module JCAModel {
       upper.matches("AES%") and
       type = KeyOpAlg::TSymmetricCipher(KeyOpAlg::AES())
       or
-      upper = "DES" and
+      // NOTE: there is DES and DESede
+      upper.matches("DES%") and
       type = KeyOpAlg::TSymmetricCipher(KeyOpAlg::DES())
       or
       upper = "TRIPLEDES" and
@@ -194,6 +213,9 @@ module JCAModel {
       upper = "CHACHA20" and
       type = KeyOpAlg::TSymmetricCipher(KeyOpAlg::CHACHA20())
       or
+      upper = "RC2" and
+      type = KeyOpAlg::TSymmetricCipher(KeyOpAlg::RC2())
+      or
       upper = "RC4" and
       type = KeyOpAlg::TSymmetricCipher(KeyOpAlg::RC4())
       or
@@ -202,15 +224,15 @@ module JCAModel {
       or
       upper = "RSA" and
       type = KeyOpAlg::TAsymmetricCipher(KeyOpAlg::RSA())
+      or
+      upper = "SKIPJACK" and
+      type = KeyOpAlg::TSymmetricCipher(KeyOpAlg::SKIPJACK())
+      or
+      upper = "BLOWFISH" and
+      type = KeyOpAlg::TSymmetricCipher(KeyOpAlg::BLOWFISH())
     )
   }
 
-  bindingset[name]
-  predicate mac_name_to_mac_type_known(Crypto::TMacType type, string name) {
-    type = Crypto::HMAC() and
-    name.toUpperCase().matches("HMAC%")
-  }
-
   bindingset[name]
   predicate key_agreement_name_to_type_known(Crypto::TKeyAgreementType type, string name) {
     type = Crypto::DH() and
@@ -220,13 +242,48 @@ module JCAModel {
     name.toUpperCase() = "EDH"
     or
     type = Crypto::ECDH() and
-    name.toUpperCase() in ["ECDH", "X25519", "X448"]
+    name.toUpperCase() in ["ECDH", "X25519", "X448", "XDH"]
+    or
+    type = Crypto::OtherKeyAgreementType() and
+    name.toUpperCase().matches("ML-KEM%")
   }
 
   /**
-   * A `StringLiteral` in the `"ALG/MODE/PADDING"` or `"ALG"` format
+   * Maps a signature algorithm name to its type, if known.
+   * see https://docs.oracle.com/en/java/javase/25/docs/specs/security/standard-names.html
    */
-  class CipherStringLiteral extends StringLiteral {
+  bindingset[name]
+  predicate signature_name_to_type_known(Crypto::KeyOpAlg::TAlgorithm type, string name) {
+    name.toUpperCase().splitAt("with".toUpperCase(), 1).matches("RSA%") and
+    type = KeyOpAlg::TAsymmetricCipher(KeyOpAlg::RSA())
+    or
+    name.toUpperCase().splitAt("with".toUpperCase(), 1).matches("ECDSA%") and
+    type = KeyOpAlg::TSignature(KeyOpAlg::ECDSA())
+    or
+    name.toUpperCase().splitAt("with".toUpperCase(), 1).matches("DSA%") and
+    type = KeyOpAlg::TSignature(KeyOpAlg::DSA())
+    or
+    name.toUpperCase() = "RSASSA-PSS" and type = KeyOpAlg::TAsymmetricCipher(KeyOpAlg::RSA())
+    or
+    name.toUpperCase().matches(["EDDSA", "ED25519", "ED448"]) and
+    type = KeyOpAlg::TSignature(KeyOpAlg::EDDSA())
+    or
+    name.toUpperCase().matches("ML-DSA%") and type = KeyOpAlg::TSignature(KeyOpAlg::DSA())
+    or
+    name.toUpperCase() = "HSS/LMS" and type = KeyOpAlg::TSignature(KeyOpAlg::HSS_LMS())
+    or
+    name.toUpperCase() = "DSA" and type = KeyOpAlg::TSignature(KeyOpAlg::DSA())
+  }
+
+  bindingset[name]
+  Crypto::HashType signature_name_to_hash_type_known(string name, int digestLength) {
+    result = hash_name_to_type_known(name.splitAt("with", 0), digestLength)
+  }
+
+  /**
+   * A `JavaConstant` in the `"ALG/MODE/PADDING"` or `"ALG"` format
+   */
+  class CipherStringLiteral extends JavaConstant {
     CipherStringLiteral() { cipher_names(this.getValue().splitAt("/")) }
 
     string getAlgorithmName() { result = this.getValue().splitAt("/", 0) }
@@ -269,7 +326,7 @@ module JCAModel {
   }
 
   /**
-   * Data-flow configuration modelling flow from a cipher string literal to a cipher algorithm consumer.
+   * Data-flow configuration modeling flow from a cipher string literal to a cipher algorithm consumer.
    */
   private module CipherAlgorithmStringToCipherConsumerConfig implements DataFlow::ConfigSig {
     predicate isSource(DataFlow::Node src) { src.asExpr() instanceof CipherStringLiteral }
@@ -351,7 +408,7 @@ module JCAModel {
     override KeyOpAlg::AlgorithmType getAlgorithmType() {
       if cipher_name_to_type_known(_, super.getAlgorithmName())
       then cipher_name_to_type_known(result, super.getAlgorithmName())
-      else result instanceof KeyOpAlg::TUnknownKeyOperationAlgorithmType
+      else result instanceof KeyOpAlg::TOtherKeyOperationAlgorithmType
     }
 
     override int getKeySizeFixed() {
@@ -385,7 +442,7 @@ module JCAModel {
 
     override string getRawHashAlgorithmName() { result = super.getPadding() }
 
-    override Crypto::THashType getHashFamily() { result = hash_name_to_type_known(hashName, _) }
+    override Crypto::THashType getHashType() { result = hash_name_to_type_known(hashName, _) }
 
     override int getFixedDigestLength() { exists(hash_name_to_type_known(hashName, result)) }
   }
@@ -404,9 +461,7 @@ module JCAModel {
    * For example, in `Cipher.getInstance(algorithm)`, this class represents `algorithm`.
    */
   class CipherGetInstanceAlgorithmArg extends CipherAlgorithmValueConsumer instanceof Expr {
-    CipherGetInstanceCall call;
-
-    CipherGetInstanceAlgorithmArg() { this = call.getAlgorithmArg() }
+    CipherGetInstanceAlgorithmArg() { this = any(CipherGetInstanceCall call).getAlgorithmArg() }
 
     override Crypto::ConsumerInputDataFlowNode getInputNode() { result.asExpr() = this }
 
@@ -657,29 +712,23 @@ module JCAModel {
     abstract DataFlow::Node getInputNode();
   }
 
+  // TODO: for all parametert specs, I think they can be set through the constructor
+  // and through setter methods
   class IvParameterSpecInstance extends NonceParameterInstantiation {
     IvParameterSpecInstance() {
-      this.(ClassInstanceExpr)
-          .getConstructedType()
-          .hasQualifiedName("javax.crypto.spec", "IvParameterSpec")
+      super.getConstructedType().hasQualifiedName("javax.crypto.spec", "IvParameterSpec")
     }
 
-    override DataFlow::Node getInputNode() {
-      result.asExpr() = this.(ClassInstanceExpr).getArgument(0)
-    }
+    override DataFlow::Node getInputNode() { result.asExpr() = super.getArgument(0) }
   }
 
   // TODO: this also specifies the tag length for GCM
   class GCMParameterSpecInstance extends NonceParameterInstantiation {
     GCMParameterSpecInstance() {
-      this.(ClassInstanceExpr)
-          .getConstructedType()
-          .hasQualifiedName("javax.crypto.spec", "GCMParameterSpec")
+      super.getConstructedType().hasQualifiedName("javax.crypto.spec", "GCMParameterSpec")
     }
 
-    override DataFlow::Node getInputNode() {
-      result.asExpr() = this.(ClassInstanceExpr).getArgument(1)
-    }
+    override DataFlow::Node getInputNode() { result.asExpr() = super.getArgument(1) }
   }
 
   class IvParameterSpecGetIvCall extends MethodCall {
@@ -805,7 +854,7 @@ module JCAModel {
    * Flow from a known hash algorithm name to a `MessageDigest.getInstance(sink)` call.
    */
   module KnownHashAlgorithmLiteralToMessageDigestConfig implements DataFlow::ConfigSig {
-    predicate isSource(DataFlow::Node src) { hash_names(src.asExpr().(StringLiteral).getValue()) }
+    predicate isSource(DataFlow::Node src) { hash_names(src.asExpr().(JavaConstant).getValue()) }
 
     predicate isSink(DataFlow::Node sink) {
       exists(HashAlgorithmValueConsumer consumer | sink = consumer.getInputNode())
@@ -815,20 +864,20 @@ module JCAModel {
   module KnownHashAlgorithmLiteralToMessageDigestFlow =
     DataFlow::Global<KnownHashAlgorithmLiteralToMessageDigestConfig>;
 
-  class KnownHashAlgorithm extends Crypto::HashAlgorithmInstance instanceof StringLiteral {
+  class KnownHashAlgorithm extends Crypto::HashAlgorithmInstance instanceof JavaConstant {
     HashAlgorithmValueConsumer consumer;
 
     KnownHashAlgorithm() {
-      hash_names(this.getValue()) and
+      hash_names(super.getValue()) and
       KnownHashAlgorithmLiteralToMessageDigestFlow::flow(DataFlow::exprNode(this),
         consumer.getInputNode())
     }
 
     HashAlgorithmValueConsumer getConsumer() { result = consumer }
 
-    override string getRawHashAlgorithmName() { result = this.(StringLiteral).getValue() }
+    override string getRawHashAlgorithmName() { result = super.getValue() }
 
-    override Crypto::THashType getHashFamily() {
+    override Crypto::THashType getHashType() {
       result = hash_name_to_type_known(this.getRawHashAlgorithmName(), _)
     }
 
@@ -925,9 +974,7 @@ module JCAModel {
 
   class DHGenParameterSpecInstance extends KeyGeneratorParameterSpecClassInstanceExpr {
     DHGenParameterSpecInstance() {
-      this.(ClassInstanceExpr)
-          .getConstructedType()
-          .hasQualifiedName("javax.crypto.spec", "DHGenParameterSpec")
+      super.getConstructedType().hasQualifiedName("javax.crypto.spec", "DHGenParameterSpec")
     }
 
     Expr getPrimeSizeArg() { result = this.getArgument(0) }
@@ -937,9 +984,7 @@ module JCAModel {
 
   class DSAParameterSpecInstance extends KeyGeneratorParameterSpecClassInstanceExpr {
     DSAParameterSpecInstance() {
-      this.(ClassInstanceExpr)
-          .getConstructedType()
-          .hasQualifiedName("java.security.spec", "DSAParameterSpec")
+      super.getConstructedType().hasQualifiedName("java.security.spec", "DSAParameterSpec")
     }
 
     Expr getPArg() { result = this.getArgument(0) }
@@ -951,9 +996,7 @@ module JCAModel {
 
   class ECGenParameterSpecInstance extends KeyGeneratorParameterSpecClassInstanceExpr {
     ECGenParameterSpecInstance() {
-      this.(ClassInstanceExpr)
-          .getConstructedType()
-          .hasQualifiedName("java.security.spec", "ECGenParameterSpec")
+      super.getConstructedType().hasQualifiedName("java.security.spec", "ECGenParameterSpec")
     }
 
     Expr getCurveNameArg() { result = this.getArgument(0) }
@@ -963,9 +1006,7 @@ module JCAModel {
 
   class RSAGenParameterSpecInstance extends KeyGeneratorParameterSpecClassInstanceExpr {
     RSAGenParameterSpecInstance() {
-      this.(ClassInstanceExpr)
-          .getConstructedType()
-          .hasQualifiedName("java.security.spec", "RSAGenParameterSpec")
+      super.getConstructedType().hasQualifiedName("java.security.spec", "RSAGenParameterSpec")
     }
 
     Expr getKeySizeArg() { result = this.getArgument(0) }
@@ -989,16 +1030,15 @@ module JCAModel {
 
   class ECGenParameterSpecClassInstanceExpr extends KeyGeneratorParameterSpecClassInstanceExpr {
     ECGenParameterSpecClassInstanceExpr() {
-      this.(ClassInstanceExpr)
-          .getConstructedType()
-          .hasQualifiedName("java.security.spec", "ECGenParameterSpec")
+      super.getConstructedType().hasQualifiedName("java.security.spec", "ECGenParameterSpec")
     }
 
     Expr getAlgorithmArg() { result = this.getArgument(0) }
   }
 
   class KeyGenerationAlgorithmValueConsumer extends CipherAlgorithmValueConsumer,
-    KeyAgreementAlgorithmValueConsumer, EllipticCurveAlgorithmValueConsumer instanceof Expr
+    KeyAgreementAlgorithmValueConsumer, EllipticCurveAlgorithmValueConsumer,
+    SignatureAlgorithmValueConsumer instanceof Expr
   {
     KeyGeneratorGetInstanceCall instantiationCall;
 
@@ -1025,7 +1065,8 @@ module JCAModel {
     override Crypto::AlgorithmInstance getAKnownAlgorithmSource() {
       result.(CipherStringLiteralAlgorithmInstance).getConsumer() = this or
       result.(KeyAgreementStringLiteralAlgorithmInstance).getConsumer() = this or
-      result.(EllipticCurveStringLiteralInstance).getConsumer() = this
+      result.(EllipticCurveStringLiteralInstance).getConsumer() = this or
+      result.(SignatureStringLiteralAlgorithmInstance).getConsumer() = this
     }
 
     KeyGeneratorGetInstanceCall getInstantiationCall() { result = instantiationCall }
@@ -1169,7 +1210,7 @@ module JCAModel {
   }
 
   module KDFAlgorithmStringToGetInstanceConfig implements DataFlow::ConfigSig {
-    predicate isSource(DataFlow::Node src) { kdf_names(src.asExpr().(StringLiteral).getValue()) }
+    predicate isSource(DataFlow::Node src) { kdf_names(src.asExpr().(JavaConstant).getValue()) }
 
     predicate isSink(DataFlow::Node sink) {
       exists(SecretKeyFactoryGetInstanceCall call | sink.asExpr() = call.getAlgorithmArg())
@@ -1210,7 +1251,7 @@ module JCAModel {
     predicate isIntermediate() { none() }
   }
 
-  class KdfAlgorithmStringLiteral extends Crypto::KeyDerivationAlgorithmInstance instanceof StringLiteral
+  class KdfAlgorithmStringLiteral extends Crypto::KeyDerivationAlgorithmInstance instanceof JavaConstant
   {
     SecretKeyFactoryKDFAlgorithmValueConsumer consumer;
 
@@ -1228,37 +1269,86 @@ module JCAModel {
     SecretKeyFactoryKDFAlgorithmValueConsumer getConsumer() { result = consumer }
   }
 
-  class Pbkdf2AlgorithmStringLiteral extends KdfAlgorithmStringLiteral,
-    Crypto::Pbkdf2AlgorithmInstance, Crypto::HmacAlgorithmInstance, Crypto::HashAlgorithmInstance,
-    Crypto::AlgorithmValueConsumer
+  class Pbkdf2WithHmac_KeyOperationAlgorithmStringLiteral extends Crypto::KeyOperationAlgorithmInstance instanceof KdfAlgorithmStringLiteral
   {
-    Pbkdf2AlgorithmStringLiteral() { super.getKdfType() instanceof Crypto::PBKDF2 }
-
-    override Crypto::ConsumerInputDataFlowNode getInputNode() { none() }
-
-    override Crypto::AlgorithmInstance getAKnownAlgorithmSource() { result = this }
-
-    override Crypto::THashType getHashFamily() {
-      result = hash_name_to_type_known(this.getRawHashAlgorithmName(), _)
+    Pbkdf2WithHmac_KeyOperationAlgorithmStringLiteral() {
+      this.(JavaConstant).getValue().toUpperCase().matches("PBKDF2WithHmac%".toUpperCase())
     }
 
-    override int getFixedDigestLength() {
-      exists(hash_name_to_type_known(this.getRawHashAlgorithmName(), result))
+    override Crypto::KeyOpAlg::AlgorithmType getAlgorithmType() {
+      result = KeyOpAlg::TMac(KeyOpAlg::HMAC())
     }
 
-    override string getRawMacAlgorithmName() {
-      result = super.getRawKdfAlgorithmName().splitAt("PBKDF2With", 1)
+    override Crypto::ConsumerInputDataFlowNode getKeySizeConsumer() {
+      // TODO: trace to any key size initializer?
+      none()
     }
 
-    override string getRawHashAlgorithmName() {
-      result = super.getRawKdfAlgorithmName().splitAt("WithHmac", 1)
+    override int getKeySizeFixed() {
+      // TODO: are there known fixed key sizes to consider?
+      none()
     }
 
-    override Crypto::MacType getMacType() { result = Crypto::HMAC() }
+    override Crypto::ModeOfOperationAlgorithmInstance getModeOfOperationAlgorithm() { none() }
 
-    override Crypto::AlgorithmValueConsumer getHmacAlgorithmValueConsumer() { result = this }
+    override Crypto::PaddingAlgorithmInstance getPaddingAlgorithm() { none() }
 
-    override Crypto::AlgorithmValueConsumer getHashAlgorithmValueConsumer() { result = this }
+    override string getRawAlgorithmName() { result = this.(JavaConstant).getValue() }
+  }
+
+  class Pbkdf2WithHmac_HashAlgorithmStringLiteral extends Crypto::HashAlgorithmInstance instanceof Pbkdf2WithHmac_KeyOperationAlgorithmStringLiteral
+  {
+    string hashName;
+
+    Pbkdf2WithHmac_HashAlgorithmStringLiteral() {
+      hashName = this.(JavaConstant).getValue().splitAt("WithHmac", 1)
+    }
+
+    override string getRawHashAlgorithmName() { result = this.(JavaConstant).getValue() }
+
+    override Crypto::THashType getHashType() { result = hash_name_to_type_known(hashName, _) }
+
+    override int getFixedDigestLength() { exists(hash_name_to_type_known(hashName, result)) }
+  }
+
+  //TODO: handle PBE "with" cases
+  class Pbkdf2WithHmac_Pbkdf2AlgorithmInstance extends Crypto::Pbkdf2AlgorithmInstance,
+    KdfAlgorithmStringLiteral, // this is a parent already, but extending to have immediate access to 'getConsumer()'
+    Pbkdf2WithHmac_KeyOperationAlgorithmStringLiteral
+  {
+    override Crypto::AlgorithmValueConsumer getHmacAlgorithmValueConsumer() {
+      result = this.getConsumer()
+    }
+  }
+
+  // NOTE: must use instanceof to avoid non-monotonic recursion
+  class Pbkdf2WithHmac_HmacAlgorithmInstance extends Crypto::HmacAlgorithmInstance instanceof Pbkdf2WithHmac_KeyOperationAlgorithmStringLiteral
+  {
+    override Crypto::AlgorithmValueConsumer getHashAlgorithmValueConsumer() {
+      result = this.(KdfAlgorithmStringLiteral).getConsumer()
+    }
+
+    override int getKeySizeFixed() {
+      // already defined by parent key operation algorithm, but extending an instance
+      // still requires we override this method
+      result = super.getKeySizeFixed()
+    }
+
+    override Crypto::ConsumerInputDataFlowNode getKeySizeConsumer() {
+      // already defined by parent key operation algorithm, but extending an instance
+      // still requires we override this method
+      result = super.getKeySizeConsumer()
+    }
+
+    override string getRawAlgorithmName() {
+      // already defined by parent key operation algorithm, but extending an instance
+      // still requires we override this method
+      result = super.getRawAlgorithmName()
+    }
+
+    override Crypto::KeyOpAlg::AlgorithmType getAlgorithmType() {
+      result = KeyOpAlg::TMac(KeyOpAlg::HMAC())
+    }
   }
 
   class SecretKeyFactoryKDFAlgorithmValueConsumer extends Crypto::AlgorithmValueConsumer instanceof Expr
@@ -1328,12 +1418,12 @@ module JCAModel {
     GetInstanceInitUseFlowAnalysis<KeyAgreementGetInstanceCall, KeyAgreementInitCall,
       KeyAgreementCall>;
 
-  class KeyAgreementStringLiteral extends StringLiteral {
+  class KeyAgreementStringLiteral extends JavaConstant {
     KeyAgreementStringLiteral() { key_agreement_names(this.getValue()) }
   }
 
   /**
-   * Data-flow configuration modelling flow from a key agreement string literal to a key agreement algorithm consumer.
+   * Data-flow configuration modeling flow from a key agreement string literal to a key agreement algorithm consumer.
    */
   private module KeyAgreementAlgorithmStringToConsumerConfig implements DataFlow::ConfigSig {
     predicate isSource(DataFlow::Node src) { src.asExpr() instanceof KeyAgreementStringLiteral }
@@ -1446,7 +1536,7 @@ module JCAModel {
    */
 
   module MacKnownAlgorithmToConsumerConfig implements DataFlow::ConfigSig {
-    predicate isSource(DataFlow::Node src) { mac_names(src.asExpr().(StringLiteral).getValue()) }
+    predicate isSource(DataFlow::Node src) { mac_names(src.asExpr().(JavaConstant).getValue()) }
 
     predicate isSink(DataFlow::Node sink) {
       exists(MacGetInstanceCall call | sink.asExpr() = call.getAlgorithmArg())
@@ -1480,7 +1570,7 @@ module JCAModel {
 
   module MacInitCallToMacOperationFlow = DataFlow::Global<MacInitCallToMacOperationFlowConfig>;
 
-  class KnownMacAlgorithm extends Crypto::MacAlgorithmInstance instanceof StringLiteral {
+  class KnownMacAlgorithm extends Crypto::KeyOperationAlgorithmInstance instanceof JavaConstant {
     MacGetInstanceAlgorithmValueConsumer consumer;
 
     KnownMacAlgorithm() {
@@ -1490,13 +1580,78 @@ module JCAModel {
 
     MacGetInstanceAlgorithmValueConsumer getConsumer() { result = consumer }
 
-    override string getRawMacAlgorithmName() { result = super.getValue() }
+    override string getRawAlgorithmName() { result = super.getValue() }
 
-    override Crypto::MacType getMacType() {
-      if mac_name_to_mac_type_known(_, super.getValue())
-      then mac_name_to_mac_type_known(result, super.getValue())
-      else result = Crypto::OtherMacType()
+    override Crypto::KeyOpAlg::AlgorithmType getAlgorithmType() {
+      if super.getValue().toUpperCase().matches("HMAC%")
+      then result = KeyOpAlg::TMac(KeyOpAlg::HMAC())
+      else
+        if super.getValue().toUpperCase().matches("%CMAC%")
+        then result = KeyOpAlg::TMac(KeyOpAlg::CMAC())
+        else result = KeyOpAlg::TMac(KeyOpAlg::OtherMacAlgorithmType())
     }
+
+    override Crypto::ConsumerInputDataFlowNode getKeySizeConsumer() {
+      // TODO: trace to any key size initializer?
+      none()
+    }
+
+    override int getKeySizeFixed() {
+      // TODO: are there known fixed key sizes to consider?
+      none()
+    }
+
+    override Crypto::ModeOfOperationAlgorithmInstance getModeOfOperationAlgorithm() { none() }
+
+    override Crypto::PaddingAlgorithmInstance getPaddingAlgorithm() { none() }
+  }
+
+  class KnownHmacAlgorithmInstance extends Crypto::HmacAlgorithmInstance instanceof KnownMacAlgorithm
+  {
+    override Crypto::AlgorithmValueConsumer getHashAlgorithmValueConsumer() {
+      result = this.(KnownMacAlgorithm).getConsumer()
+    }
+
+    override int getKeySizeFixed() {
+      // already defined by parent key operation algorithm, but extending an instance
+      // still requires we override this method
+      result = super.getKeySizeFixed()
+    }
+
+    override Crypto::ConsumerInputDataFlowNode getKeySizeConsumer() {
+      // already defined by parent key operation algorithm, but extending an instance
+      // still requires we override this method
+      result = super.getKeySizeConsumer()
+    }
+
+    override string getRawAlgorithmName() {
+      // already defined by parent key operation algorithm, but extending an instance
+      // still requires we override this method
+      result = super.getRawAlgorithmName()
+    }
+
+    override Crypto::KeyOpAlg::AlgorithmType getAlgorithmType() {
+      result = KeyOpAlg::TMac(KeyOpAlg::HMAC())
+    }
+  }
+
+  class KnownMacHashAlgorithm extends Crypto::HashAlgorithmInstance instanceof KnownMacAlgorithm,
+    JavaConstant
+  {
+    Crypto::THashType hashType;
+    int digestLength;
+
+    KnownMacHashAlgorithm() {
+      super.getValue().toUpperCase().matches("HMAC%") and
+      hashType =
+        hash_name_to_type_known(super.getValue().toUpperCase().splitAt("HMAC", 1), digestLength)
+    }
+
+    override string getRawHashAlgorithmName() { result = super.getValue() }
+
+    override Crypto::THashType getHashType() { result = hashType }
+
+    override int getFixedDigestLength() { result = digestLength }
   }
 
   class MacGetInstanceCall extends MethodCall {
@@ -1528,7 +1683,9 @@ module JCAModel {
     }
   }
 
-  class MacGetInstanceAlgorithmValueConsumer extends Crypto::AlgorithmValueConsumer {
+  class MacGetInstanceAlgorithmValueConsumer extends MacAlgorithmValueConsumer,
+    HashAlgorithmValueConsumer
+  {
     MacGetInstanceAlgorithmValueConsumer() { this = any(MacGetInstanceCall c).getAlgorithmArg() }
 
     override Crypto::ConsumerInputDataFlowNode getInputNode() { result.asExpr() = this }
@@ -1538,7 +1695,7 @@ module JCAModel {
     }
   }
 
-  class MacOperationCall extends Crypto::MacOperationInstance instanceof MethodCall {
+  class MacOperationCall extends MethodCall {
     Expr output;
 
     MacOperationCall() {
@@ -1548,30 +1705,263 @@ module JCAModel {
         or
         super.getMethod().hasStringSignature("doFinal(byte[], int)") and
         this.getArgument(0) = output
+        or
+        super.getMethod().hasStringSignature("update(byte[])") and this = output
       )
     }
 
+    predicate isIntermediate() { super.getMethod().getName() = "update" }
+
+    Expr getOutput() { result = output }
+
+    Expr getInput() {
+      super.getMethod().hasStringSignature("doFinal(byte[])") and result = this.getArgument(0)
+      or
+      super.getMethod().hasStringSignature("update(byte[])") and result = this.getArgument(0)
+    }
+  }
+
+  module MacFlowAnalysisImpl =
+    GetInstanceInitUseFlowAnalysis<MacGetInstanceCall, MacInitCall, MacOperationCall>;
+
+  class MacOperationInstance extends Crypto::MacOperationInstance instanceof MacOperationCall {
+    MacOperationInstance() { not super.isIntermediate() }
+
+    MacGetInstanceCall getInstantiationCall() {
+      result = MacFlowAnalysisImpl::getInstantiationFromUse(this, _, _)
+    }
+
+    MacInitCall getInitCall() { result = MacFlowAnalysisImpl::getInitFromUse(this, _, _) }
+
+    override Crypto::ConsumerInputDataFlowNode getInputConsumer() {
+      result.asExpr() = super.getInput() or
+      result.asExpr() = MacFlowAnalysisImpl::getAnIntermediateUseFromFinalUse(this, _, _).getInput()
+    }
+
     override Crypto::AlgorithmValueConsumer getAnAlgorithmValueConsumer() {
-      exists(MacGetInstanceCall instantiation |
-        instantiation.getOperation() = this and result = instantiation.getAlgorithmArg()
-      )
+      result = this.getInstantiationCall().getAlgorithmArg()
     }
 
     override Crypto::ConsumerInputDataFlowNode getKeyConsumer() {
-      exists(MacGetInstanceCall instantiation, MacInitCall initCall |
-        instantiation.getOperation() = this and
-        initCall.getOperation() = this and
-        instantiation.getInitCall() = initCall and
-        result.asExpr() = initCall.getKeyArg()
+      result.asExpr() = this.getInitCall().getKeyArg()
+    }
+
+    override Crypto::ArtifactOutputDataFlowNode getOutputArtifact() {
+      result.asExpr() = super.getOutput() or
+      result.asExpr() =
+        MacFlowAnalysisImpl::getAnIntermediateUseFromFinalUse(this, _, _).getOutput()
+    }
+
+    override Crypto::AlgorithmValueConsumer getHashAlgorithmValueConsumer() {
+      result = this.getInstantiationCall().getAlgorithmArg()
+    }
+
+    override predicate hasHashAlgorithmConsumer() {
+      // TODO: do we consider that these operations have no hash and that it is only associated to the mac algorithm node?
+      // in JCA that seems to be correct, but would removing the hash consumer here break things generally?
+      this.getHashAlgorithmValueConsumer()
+          .getAKnownAlgorithmSource()
+          .(Crypto::KeyOperationAlgorithmInstance)
+          .getAlgorithmType() = KeyOpAlg::TMac(KeyOpAlg::HMAC())
+    }
+
+    override Crypto::KeyOperationSubtype getKeyOperationSubtype() {
+      result instanceof Crypto::TMacMode
+    }
+
+    override Crypto::ConsumerInputDataFlowNode getNonceConsumer() { none() }
+  }
+
+  /**
+   * Signatures
+   */
+  module SignatureKnownAlgorithmToConsumerConfig implements DataFlow::ConfigSig {
+    predicate isSource(DataFlow::Node src) { src.asExpr() instanceof SignatureStringLiteral }
+
+    predicate isSink(DataFlow::Node sink) {
+      sink = any(SignatureAlgorithmValueConsumer call).getInputNode()
+    }
+  }
+
+  module SignatureKnownAlgorithmToConsumerFlow =
+    TaintTracking::Global<SignatureKnownAlgorithmToConsumerConfig>;
+
+  class SignatureGetInstanceCall extends MethodCall {
+    SignatureGetInstanceCall() {
+      this.getCallee().hasQualifiedName("java.security", "Signature", "getInstance")
+    }
+
+    Expr getAlgorithmArg() { result = this.getArgument(0) }
+  }
+
+  class SignatureGetInstanceAlgorithmValueConsumer extends SignatureAlgorithmValueConsumer instanceof Expr
+  {
+    SignatureGetInstanceAlgorithmValueConsumer() {
+      this = any(SignatureGetInstanceCall c).getAlgorithmArg()
+    }
+
+    override Crypto::ConsumerInputDataFlowNode getInputNode() { result.asExpr() = this }
+
+    override Crypto::AlgorithmInstance getAKnownAlgorithmSource() {
+      result.(SignatureStringLiteralAlgorithmInstance).getConsumer() = this
+    }
+  }
+
+  class SignatureStringLiteral extends JavaConstant {
+    SignatureStringLiteral() { signature_names(this.getValue()) }
+  }
+
+  class SignatureStringLiteralAlgorithmInstance extends Crypto::KeyOperationAlgorithmInstance instanceof SignatureStringLiteral
+  {
+    SignatureAlgorithmValueConsumer consumer;
+
+    SignatureStringLiteralAlgorithmInstance() {
+      SignatureKnownAlgorithmToConsumerFlow::flow(DataFlow::exprNode(this), consumer.getInputNode())
+    }
+
+    SignatureAlgorithmValueConsumer getConsumer() { result = consumer }
+
+    override string getRawAlgorithmName() { result = super.getValue() }
+
+    override Crypto::KeyOpAlg::AlgorithmType getAlgorithmType() {
+      if signature_name_to_type_known(_, super.getValue())
+      then signature_name_to_type_known(result, super.getValue())
+      else result = Crypto::KeyOpAlg::TOtherKeyOperationAlgorithmType()
+    }
+
+    override Crypto::ConsumerInputDataFlowNode getKeySizeConsumer() {
+      // TODO: trace to any key size initializer?
+      none()
+    }
+
+    override int getKeySizeFixed() {
+      // TODO: are there known fixed key sizes to consider?
+      none()
+    }
+
+    override Crypto::ModeOfOperationAlgorithmInstance getModeOfOperationAlgorithm() { none() }
+
+    override Crypto::PaddingAlgorithmInstance getPaddingAlgorithm() { none() }
+  }
+
+  class SignatureHashAlgorithmInstance extends Crypto::HashAlgorithmInstance instanceof SignatureStringLiteralAlgorithmInstance
+  {
+    Crypto::THashType hashType;
+    int digestLength;
+
+    SignatureHashAlgorithmInstance() {
+      hashType = signature_name_to_hash_type_known(this.(JavaConstant).getValue(), digestLength)
+    }
+
+    override string getRawHashAlgorithmName() { result = this.(JavaConstant).getValue() }
+
+    override Crypto::THashType getHashType() { result = hashType }
+
+    override int getFixedDigestLength() { result = digestLength }
+  }
+
+  class SignatureInitCall extends MethodCall {
+    SignatureInitCall() {
+      this.getCallee().hasQualifiedName("java.security", "Signature", ["initSign", "initVerify"])
+    }
+
+    Expr getKeyArg() {
+      result = this.getArgument(0)
+      // TODO: verify can take in a certificate too?
+    }
+  }
+
+  class SignatureOperationCall extends MethodCall {
+    SignatureOperationCall() {
+      this.getMethod().hasQualifiedName("java.security", "Signature", ["update", "sign", "verify"])
+    }
+
+    predicate isIntermediate() { super.getMethod().getName() = "update" }
+
+    Expr getMsgInput() { result = this.getArgument(0) and this.getMethod().getName() = "update" }
+
+    Expr getSignatureOutput() {
+      // no args, the signature is returned
+      result = this and this.getMethod().getName() = "sign" and not exists(this.getArgument(0))
+      or
+      // with args, the signature is written to the arg
+      result = this.getArgument(0) and this.getMethod().getName() = "sign"
+    }
+
+    Expr getSignatureInput() {
+      result = this.getArgument(0) and this.getMethod().getName() = "verify"
+    }
+
+    Crypto::KeyOperationSubtype getSubtype() {
+      result instanceof Crypto::TSignMode and this.getMethod().getName() = "sign"
+      or
+      result instanceof Crypto::TVerifyMode and this.getMethod().getName() = "verify"
+    }
+  }
+
+  class SignatureOperationInstance extends Crypto::SignatureOperationInstance instanceof SignatureOperationCall
+  {
+    SignatureOperationInstance() {
+      // exclude update (only include sign and verify)
+      not super.isIntermediate()
+    }
+
+    SignatureGetInstanceCall getInstantiationCall() {
+      result = SignatureFlowAnalysisImpl::getInstantiationFromUse(this, _, _)
+    }
+
+    SignatureInitCall getInitCall() {
+      result = SignatureFlowAnalysisImpl::getInitFromUse(this, _, _)
+    }
+
+    override Crypto::ConsumerInputDataFlowNode getInputConsumer() {
+      result.asExpr() = super.getMsgInput() or
+      result.asExpr() =
+        SignatureFlowAnalysisImpl::getAnIntermediateUseFromFinalUse(this, _, _).getMsgInput()
+    }
+
+    override Crypto::ConsumerInputDataFlowNode getKeyConsumer() {
+      result.asExpr() = this.getInitCall().getKeyArg()
+    }
+
+    override Crypto::AlgorithmValueConsumer getAnAlgorithmValueConsumer() {
+      result = this.getInstantiationCall().getAlgorithmArg()
+    }
+
+    override Crypto::ArtifactOutputDataFlowNode getOutputArtifact() {
+      result.asExpr() = super.getSignatureOutput() or
+      result.asExpr() =
+        SignatureFlowAnalysisImpl::getAnIntermediateUseFromFinalUse(this, _, _).getSignatureOutput()
+    }
+
+    override Crypto::AlgorithmValueConsumer getHashAlgorithmValueConsumer() {
+      // TODO: RSASSA-PSS literal sets hashes differently, through a ParameterSpec
+      result = this.getInstantiationCall().getAlgorithmArg()
+    }
+
+    override predicate hasHashAlgorithmConsumer() {
+      // All jca signature algorithms specify a hash unless explicitly set as "NONEwith..."
+      exists(SignatureStringLiteralAlgorithmInstance i |
+        i.getConsumer() = this.getAnAlgorithmValueConsumer() and
+        not i.getRawAlgorithmName().toUpperCase().matches("NONEwith%".toUpperCase())
       )
     }
 
-    override Crypto::ConsumerInputDataFlowNode getMessageConsumer() {
-      result.asExpr() = super.getArgument(0) and
-      super.getMethod().getParameterType(0).hasName("byte[]")
+    override Crypto::KeyOperationSubtype getKeyOperationSubtype() { result = super.getSubtype() }
+
+    override Crypto::ConsumerInputDataFlowNode getNonceConsumer() { none() }
+
+    override Crypto::ConsumerInputDataFlowNode getSignatureConsumer() {
+      result.asExpr() = super.getSignatureInput() or
+      result.asExpr() =
+        SignatureFlowAnalysisImpl::getAnIntermediateUseFromFinalUse(this, _, _).getSignatureInput()
     }
   }
 
+  module SignatureFlowAnalysisImpl =
+    GetInstanceInitUseFlowAnalysis<SignatureGetInstanceCall, SignatureInitCall,
+      SignatureOperationCall>;
+
   /*
    * Elliptic Curves (EC)
    */
@@ -1586,7 +1976,7 @@ module JCAModel {
 
   module EllipticCurveStringToConsumerFlow = DataFlow::Global<EllipticCurveStringToConsumerConfig>;
 
-  class EllipticCurveStringLiteral extends StringLiteral {
+  class EllipticCurveStringLiteral extends JavaConstant {
     EllipticCurveStringLiteral() { elliptic_curve_names(this.getValue()) }
   }
 
@@ -1600,7 +1990,7 @@ module JCAModel {
 
     override string getRawEllipticCurveName() { result = super.getValue() }
 
-    override Crypto::EllipticCurveFamilyType getEllipticCurveFamilyType() {
+    override Crypto::EllipticCurveType getEllipticCurveType() {
       if
         Crypto::ellipticCurveNameToKnownKeySizeAndFamilyMapping(this.getRawEllipticCurveName(), _, _)
       then
diff --git a/java/ql/lib/experimental/quantum/Language.qll b/java/ql/lib/experimental/quantum/Language.qll
index 975a8ad8e1f..bcc8b62ca87 100644
--- a/java/ql/lib/experimental/quantum/Language.qll
+++ b/java/ql/lib/experimental/quantum/Language.qll
@@ -30,7 +30,7 @@ module CryptoInput implements InputSig<Language::Location> {
   class UnknownLocation = UnknownDefaultLocation;
 
   string locationToFileBaseNameAndLineNumberString(Location location) {
-    result = location.getFile().getBaseName() + ":" + location.getStartLine()
+    result = location.toString()
   }
 
   LocatableElement dfn_to_element(DataFlow::Node node) {
@@ -55,7 +55,18 @@ final class DefaultRemoteFlowSource = RemoteFlowSource;
 
 private class GenericUnreferencedParameterSource extends Crypto::GenericUnreferencedParameterSource {
   GenericUnreferencedParameterSource() {
-    exists(Parameter p | this = p and not exists(p.getAnArgument()))
+    exists(Parameter p |
+      this = p and
+      not exists(p.getAnArgument())
+      // or
+      // // TODO: this is test code which causes regression in unit tests, but will
+      // // find sources where ordinarily a source might be missing
+      // // If all calls to a function occur in a test file, ignore those calls
+      // // and consider the parameter to the function a potential source as well.
+      // forall(Call testCall | testCall.getCallee() = p.getCallable() |
+      //   testCall.getFile().getBaseName().toUpperCase().matches("%TEST%")
+      // )
+    )
   }
 
   override predicate flowsTo(Crypto::FlowAwareElement other) {
@@ -93,8 +104,54 @@ private class GenericRemoteDataSource extends Crypto::GenericRemoteDataSource {
   override string getAdditionalDescription() { result = this.toString() }
 }
 
-private class ConstantDataSource extends Crypto::GenericConstantSourceInstance instanceof Literal {
-  ConstantDataSource() {
+import semmle.code.java.frameworks.Properties
+private import semmle.code.configfiles.ConfigFiles
+
+/**
+ * A class to represent constants in Java code, either literals or
+ * values retrieved from properties files.
+ * Java CodeQL does not consider the values of known properties to be literals,
+ * hence we need to model both literals and property calls.
+ */
+class JavaConstant extends Expr {
+  string value;
+
+  JavaConstant() {
+    // If arg 0 in a getProperty call, consider it a literal only if
+    // we haven't resolved it to a known property value, otherwise
+    // use the resolved config value.
+    // If getProperty is used, always assume the default value is potentially used.
+    // CAVEAT/ASSUMPTION: this assumes the literal is immediately known at arg0
+    // of a getProperty call.
+    // also if the properties file is reloaded in a way where the reloaded file
+    // wouldn't have the property but the original does, we would erroneously
+    // consider the literal to be mapped to that property value.
+    exists(ConfigPair p, PropertiesGetPropertyMethodCall c |
+      c.getArgument(0).(Literal).getValue() = p.getNameElement().getName() and
+      value = p.getValueElement().getValue() and
+      this = c
+    )
+    or
+    // in this case, the property value is not known, use the literal property name as the value
+    exists(PropertiesGetPropertyMethodCall c |
+      value = c.getArgument(0).(Literal).getValue() and
+      not exists(ConfigPair p |
+        c.getArgument(0).(Literal).getValue() = p.getNameElement().getName()
+      ) and
+      this = c
+    )
+    or
+    // in this case, there is not propery getter, we just have a literal
+    not exists(PropertiesGetPropertyMethodCall c | c.getArgument(0) = this) and
+    value = this.(Literal).getValue()
+  }
+
+  string getValue() { result = value }
+}
+
+private class ConstantDataSourceLiteral extends Crypto::GenericConstantSourceInstance instanceof JavaConstant
+{
+  ConstantDataSourceLiteral() {
     // TODO: this is an API specific workaround for JCA, as 'EC' is a constant that may be used
     // where typical algorithms are specified, but EC specifically means set up a
     // default curve container, that will later be specified explicitly (or if not a default)
@@ -112,8 +169,22 @@ private class ConstantDataSource extends Crypto::GenericConstantSourceInstance i
   override string getAdditionalDescription() { result = this.toString() }
 }
 
+private class ConstantDataSourceArrayInitializer extends Crypto::GenericConstantSourceInstance instanceof ArrayInit
+{
+  ConstantDataSourceArrayInitializer() { this.getAnInit() instanceof Literal }
+
+  override DataFlow::Node getOutputNode() { result.asExpr() = this }
+
+  override predicate flowsTo(Crypto::FlowAwareElement other) {
+    // TODO: separate config to avoid blowing up data-flow analysis
+    GenericDataSourceFlow::flow(this.getOutputNode(), other.getInputNode())
+  }
+
+  override string getAdditionalDescription() { result = this.toString() }
+}
+
 /**
- * An instance of random number generation, modelled as the expression
+ * An instance of random number generation, modeled as the expression
  * tied to an output node (i.e., the result of the source of randomness)
  */
 abstract class RandomnessInstance extends Crypto::RandomNumberGenerationInstance {
@@ -215,7 +286,7 @@ module ArtifactFlowConfig implements DataFlow::ConfigSig {
 
 module GenericDataSourceFlow = TaintTracking::Global<GenericDataSourceFlowConfig>;
 
-module ArtifactFlow = DataFlow::Global<ArtifactFlowConfig>;
+module ArtifactFlow = TaintTracking::Global<ArtifactFlowConfig>;
 
 // Import library-specific modeling
 import JCA
diff --git a/java/ql/lib/ext/jakarta.servlet.http.model.yml b/java/ql/lib/ext/jakarta.servlet.http.model.yml
index 5a83b1ac08d..fabbe4a3eb0 100644
--- a/java/ql/lib/ext/jakarta.servlet.http.model.yml
+++ b/java/ql/lib/ext/jakarta.servlet.http.model.yml
@@ -4,3 +4,15 @@ extensions:
       extensible: sourceModel
     data:
       - ["jakarta.servlet.http", "HttpServletRequest", True, "getServletPath", "", "", "ReturnValue", "remote", "manual"]
+      - ["jakarta.servlet.http", "HttpServletRequest", False, "getHeader", "(String)", "", "ReturnValue", "remote", "manual"]
+      - ["jakarta.servlet.http", "HttpServletRequest", False, "getHeaderNames", "()", "", "ReturnValue", "remote", "manual"]
+      - ["jakarta.servlet.http", "HttpServletRequest", False, "getHeaders", "(String)", "", "ReturnValue", "remote", "manual"]
+      - ["jakarta.servlet.http", "HttpServletRequest", False, "getParameter", "(String)", "", "ReturnValue", "remote", "manual"]
+      - ["jakarta.servlet.http", "HttpServletRequest", False, "getParameterMap", "()", "", "ReturnValue", "remote", "manual"]
+      - ["jakarta.servlet.http", "HttpServletRequest", False, "getParameterNames", "()", "", "ReturnValue", "remote", "manual"]
+      - ["jakarta.servlet.http", "HttpServletRequest", False, "getParameterValues", "(String)", "", "ReturnValue", "remote", "manual"]
+      - ["jakarta.servlet.http", "HttpServletRequest", False, "getPathInfo", "()", "", "ReturnValue", "remote", "manual"]
+      - ["jakarta.servlet.http", "HttpServletRequest", False, "getQueryString", "()", "", "ReturnValue", "remote", "manual"]
+      - ["jakarta.servlet.http", "HttpServletRequest", False, "getRemoteUser", "()", "", "ReturnValue", "remote", "manual"]
+      - ["jakarta.servlet.http", "HttpServletRequest", False, "getRequestURI", "()", "", "ReturnValue", "remote", "manual"]
+      - ["jakarta.servlet.http", "HttpServletRequest", False, "getRequestURL", "()", "", "ReturnValue", "remote", "manual"]
diff --git a/java/ql/lib/ext/jakarta.servlet.model.yml b/java/ql/lib/ext/jakarta.servlet.model.yml
index be2feeb3c37..ad1a38bb4bf 100644
--- a/java/ql/lib/ext/jakarta.servlet.model.yml
+++ b/java/ql/lib/ext/jakarta.servlet.model.yml
@@ -1,4 +1,14 @@
 extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: sourceModel
+    data:
+      - ["jakarta.servlet", "ServletRequest", False, "getInputStream", "()", "", "ReturnValue", "remote", "manual"]
+      - ["jakarta.servlet", "ServletRequest", False, "getParameter", "(String)", "", "ReturnValue", "remote", "manual"]
+      - ["jakarta.servlet", "ServletRequest", False, "getParameterMap", "()", "", "ReturnValue", "remote", "manual"]
+      - ["jakarta.servlet", "ServletRequest", False, "getParameterNames", "()", "", "ReturnValue", "remote", "manual"]
+      - ["jakarta.servlet", "ServletRequest", False, "getParameterValues", "(String)", "", "ReturnValue", "remote", "manual"]
+      - ["jakarta.servlet", "ServletRequest", False, "getReader", "()", "", "ReturnValue", "remote", "manual"]
   - addsTo:
       pack: codeql/java-all
       extensible: sinkModel
diff --git a/java/ql/lib/ext/java.lang.scoped.model.yml b/java/ql/lib/ext/java.lang.scoped.model.yml
new file mode 100644
index 00000000000..3eeae5a5b1f
--- /dev/null
+++ b/java/ql/lib/ext/java.lang.scoped.model.yml
@@ -0,0 +1,19 @@
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["java.lang", "ScopedValue", False, "where", "(ScopedValue,Object)", "", "Argument[1]", "Argument[0].SyntheticField[java.lang.ScopedValue.boundValue]", "value", "manual"]
+      - ["java.lang", "ScopedValue", True, "get", "()", "", "Argument[this].SyntheticField[java.lang.ScopedValue.boundValue]", "ReturnValue", "value", "manual"]
+      - ["java.lang", "ScopedValue", False, "where", "(ScopedValue,Object)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["java.lang", "ScopedValue$Carrier", False, "where", "(ScopedValue,Object)", "", "Argument[1]", "Argument[0].SyntheticField[java.lang.ScopedValue.boundValue]", "value", "manual"]
+      - ["java.lang", "ScopedValue$Carrier", False, "where", "(ScopedValue,Object)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["java.lang", "ScopedValue$Carrier", False, "run", "(Runnable)", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["java.lang", "ScopedValue$Carrier", False, "call", "(Callable)", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["java.lang", "ScopedValue", "newInstance", "()", "summary", "manual"]
+      - ["java.lang", "ScopedValue", "isBound", "()", "summary", "manual"]
\ No newline at end of file
diff --git a/java/ql/lib/ext/javax.crypto.model.yml b/java/ql/lib/ext/javax.crypto.model.yml
index 2b3bfc1abe8..0a2d43fce17 100644
--- a/java/ql/lib/ext/javax.crypto.model.yml
+++ b/java/ql/lib/ext/javax.crypto.model.yml
@@ -7,6 +7,21 @@ extensions:
       - ["javax.crypto", "Cipher", True, "init", "(int,Key,AlgorithmParameterSpec,SecureRandom)", "", "Argument[2]", "encryption-iv", "manual"]
       - ["javax.crypto", "Cipher", False, "unwrap", "(byte[],String,int)", "", "Argument[0]", "credentials-key", "hq-generated"]
       - ["javax.crypto", "CipherSpi", True, "engineUnwrap", "(byte[],String,int)", "", "Argument[0]", "credentials-key", "hq-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: summaryModel
+    data:
+      - ["javax.crypto", "KDF", False, "getInstance", "(String)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.crypto.KDF.algorithm]", "value", "manual"]
+      - ["javax.crypto", "KDF", False, "getInstance", "(String,Provider)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.crypto.KDF.algorithm]", "value", "manual"]
+      - ["javax.crypto", "KDF", False, "getInstance", "(String,String)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.crypto.KDF.algorithm]", "value", "manual"]
+      - ["javax.crypto", "KDF", False, "getInstance", "(String,KDFParameters)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.crypto.KDF.algorithm]", "value", "manual"]
+      - ["javax.crypto", "KDF", False, "getInstance", "(String,KDFParameters,Provider)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.crypto.KDF.algorithm]", "value", "manual"]
+      - ["javax.crypto", "KDF", False, "getInstance", "(String,KDFParameters,String)", "", "Argument[0]", "ReturnValue.SyntheticField[javax.crypto.KDF.algorithm]", "value", "manual"]
+      - ["javax.crypto", "KDF", True, "getAlgorithm", "()", "", "Argument[this].SyntheticField[javax.crypto.KDF.algorithm]", "ReturnValue", "value", "manual"]
+      - ["javax.crypto", "KDF", True, "getProvider", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["javax.crypto", "KDF", True, "deriveKey", "(String,AlgorithmParameterSpec)", "", "Argument[1]", "ReturnValue", "taint", "manual"]
+      - ["javax.crypto", "KDF", True, "deriveData", "(AlgorithmParameterSpec)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["javax.crypto", "SecretKey", True, "getEncoded", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
diff --git a/java/ql/lib/ext/javax.crypto.spec.model.yml b/java/ql/lib/ext/javax.crypto.spec.model.yml
index d2b7dbc99b8..e51c27c5088 100644
--- a/java/ql/lib/ext/javax.crypto.spec.model.yml
+++ b/java/ql/lib/ext/javax.crypto.spec.model.yml
@@ -7,6 +7,21 @@ extensions:
       - ["javax.crypto.spec", "GCMParameterSpec", True, "GCMParameterSpec", "", "", "Argument[1]", "Argument[this]", "taint", "manual"]
       - ["javax.crypto.spec", "RC2ParameterSpec", True, "RC2ParameterSpec", "", "", "Argument[1]", "Argument[this]", "taint", "manual"]
       - ["javax.crypto.spec", "RC5ParameterSpec", True, "RC5ParameterSpec", "", "", "Argument[3]", "Argument[this]", "taint", "manual"]
+      - ["javax.crypto.spec", "HKDFParameterSpec$Builder", True, "addIKM", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["javax.crypto.spec", "HKDFParameterSpec$Builder", True, "addIKM", "(byte[])", "", "Argument[this]", "ReturnValue", "value", "manual"]
+      - ["javax.crypto.spec", "HKDFParameterSpec$Builder", True, "addIKM", "(SecretKey)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["javax.crypto.spec", "HKDFParameterSpec$Builder", True, "addIKM", "(SecretKey)", "", "Argument[this]", "ReturnValue", "value", "manual"]
+      - ["javax.crypto.spec", "HKDFParameterSpec$Builder", True, "addSalt", "(byte[])", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["javax.crypto.spec", "HKDFParameterSpec$Builder", True, "addSalt", "(byte[])", "", "Argument[this]", "ReturnValue", "value", "manual"]
+      - ["javax.crypto.spec", "HKDFParameterSpec$Builder", True, "addSalt", "(SecretKey)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["javax.crypto.spec", "HKDFParameterSpec$Builder", True, "addSalt", "(SecretKey)", "", "Argument[this]", "ReturnValue", "value", "manual"]
+      - ["javax.crypto.spec", "HKDFParameterSpec$Builder", True, "thenExpand", "(byte[],int)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["javax.crypto.spec", "HKDFParameterSpec$Builder", True, "thenExpand", "(byte[],int)", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["javax.crypto.spec", "HKDFParameterSpec$Builder", True, "thenExpand", "(byte[],int)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["javax.crypto.spec", "HKDFParameterSpec", False, "expandOnly", "(SecretKey,byte[],int)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["javax.crypto.spec", "HKDFParameterSpec", False, "expandOnly", "(SecretKey,byte[],int)", "", "Argument[1]", "ReturnValue", "taint", "manual"]
+      - ["javax.crypto.spec", "SecretKeySpec", False, "SecretKeySpec", "(byte[],String)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["javax.crypto.spec", "SecretKeySpec", False, "SecretKeySpec", "(byte[],int,int,String)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
   - addsTo:
       pack: codeql/java-all
       extensible: sinkModel
diff --git a/java/ql/lib/printAst.ql b/java/ql/lib/printAst.ql
index cd72403de90..8ea0efaed5f 100644
--- a/java/ql/lib/printAst.ql
+++ b/java/ql/lib/printAst.ql
@@ -18,8 +18,8 @@ external string selectedSourceFile();
 
 class PrintAstConfigurationOverride extends PrintAstConfiguration {
   /**
-   * Holds if the location matches the selected file in the VS Code extension and
-   * the element is `fromSource`.
+   * Holds if the location `l` matches the selected file in the VS Code extension and
+   * the element `e` is `fromSource`.
    */
   override predicate shouldPrint(Element e, Location l) {
     super.shouldPrint(e, l) and
diff --git a/java/ql/lib/qlpack.yml b/java/ql/lib/qlpack.yml
index 0e69cc38681..bcfc194a4cb 100644
--- a/java/ql/lib/qlpack.yml
+++ b/java/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/java-all
-version: 7.5.1-dev
+version: 7.7.4-dev
 groups: java
 dbscheme: config/semmlecode.dbscheme
 extractor: java
diff --git a/java/ql/lib/semmle/code/configfiles/ConfigFiles.qll b/java/ql/lib/semmle/code/configfiles/ConfigFiles.qll
index 0c69f45c56f..1655ed2d648 100644
--- a/java/ql/lib/semmle/code/configfiles/ConfigFiles.qll
+++ b/java/ql/lib/semmle/code/configfiles/ConfigFiles.qll
@@ -70,7 +70,12 @@ class ConfigValue extends @configValue, ConfigLocatable {
   override string toString() { result = this.getValue() }
 }
 
+/** A `.properties` file. */
+class PropertiesFile extends File {
+  PropertiesFile() { this.getExtension() = "properties" }
+}
+
 /** A Java property is a name-value pair in a `.properties` file. */
 class JavaProperty extends ConfigPair {
-  JavaProperty() { this.getFile().getExtension() = "properties" }
+  JavaProperty() { this.getFile() instanceof PropertiesFile }
 }
diff --git a/java/ql/lib/semmle/code/java/CompilationUnit.qll b/java/ql/lib/semmle/code/java/CompilationUnit.qll
index 546c3d26ea3..5b26828b47c 100644
--- a/java/ql/lib/semmle/code/java/CompilationUnit.qll
+++ b/java/ql/lib/semmle/code/java/CompilationUnit.qll
@@ -33,5 +33,13 @@ class CompilationUnit extends Element, File {
    */
   Module getModule() { cumodule(this, result) }
 
+  /**
+   * Holds if this compilation unit represents a compact source file.
+   * A compact source file contains an implicitly declared top-level class.
+   */
+  predicate isCompactSourceFile() {
+    exists(Class c | c.getCompilationUnit() = this and c.isImplicit())
+  }
+
   override string getAPrimaryQlClass() { result = "CompilationUnit" }
 }
diff --git a/java/ql/lib/semmle/code/java/Concurrency.qll b/java/ql/lib/semmle/code/java/Concurrency.qll
index 0e510db3443..da2783bc308 100644
--- a/java/ql/lib/semmle/code/java/Concurrency.qll
+++ b/java/ql/lib/semmle/code/java/Concurrency.qll
@@ -2,6 +2,57 @@ overlay[local?]
 module;
 
 import java
+import semmle.code.java.frameworks.Mockito
+
+/**
+ * A Java type representing a lock.
+ * We identify a lock type as one that has both `lock` and `unlock` methods.
+ */
+class LockType extends RefType {
+  LockType() {
+    this.getAMethod().hasName("lock") and
+    this.getAMethod().hasName("unlock")
+  }
+
+  /** Gets a method that is locking this lock type. */
+  private Method getLockMethod() {
+    result.getDeclaringType() = this and
+    result.hasName(["lock", "lockInterruptibly", "tryLock"])
+  }
+
+  /** Gets a method that is unlocking this lock type. */
+  private Method getUnlockMethod() {
+    result.getDeclaringType() = this and
+    result.hasName("unlock")
+  }
+
+  /** Gets an `isHeldByCurrentThread` method of this lock type. */
+  private Method getIsHeldByCurrentThreadMethod() {
+    result.getDeclaringType() = this and
+    result.hasName("isHeldByCurrentThread")
+  }
+
+  /** Gets a call to a method that is locking this lock type. */
+  MethodCall getLockAccess() {
+    result.getMethod() = this.getLockMethod() and
+    // Not part of a Mockito verification call
+    not result instanceof MockitoVerifiedMethodCall
+  }
+
+  /** Gets a call to a method that is unlocking this lock type. */
+  MethodCall getUnlockAccess() {
+    result.getMethod() = this.getUnlockMethod() and
+    // Not part of a Mockito verification call
+    not result instanceof MockitoVerifiedMethodCall
+  }
+
+  /** Gets a call to a method that checks if the lock is held by the current thread. */
+  MethodCall getIsHeldByCurrentThreadAccess() {
+    result.getMethod() = this.getIsHeldByCurrentThreadMethod() and
+    // Not part of a Mockito verification call
+    not result instanceof MockitoVerifiedMethodCall
+  }
+}
 
 /**
  * Holds if `e` is synchronized by a local synchronized statement `sync` on the variable `v`.
@@ -26,7 +77,8 @@ predicate locallySynchronizedOnThis(Expr e, RefType thisType) {
 }
 
 /**
- * Holds if `e` is synchronized by a `synchronized` modifier on the enclosing (static) method.
+ * Holds if `e` is synchronized by a `synchronized` modifier on the enclosing (static) method
+ * declared in the type `classType`.
  */
 predicate locallySynchronizedOnClass(Expr e, RefType classType) {
   exists(SynchronizedCallable c | c = e.getEnclosingCallable() |
@@ -48,3 +100,136 @@ class SynchronizedCallable extends Callable {
     )
   }
 }
+
+/**
+ * This module provides predicates, chiefly `locallyMonitors`, to check if a given expression is synchronized on a specific monitor.
+ */
+module Monitors {
+  /**
+   * A monitor is any object that is used to synchronize access to a shared resource.
+   * This includes locks as well as variables used in synchronized blocks (including `this`).
+   */
+  newtype TMonitor =
+    /** Either a lock or a variable used in a synchronized block. */
+    TVariableMonitor(Variable v) {
+      v.getType() instanceof LockType or locallySynchronizedOn(_, _, v)
+    } or
+    /** An instance reference used as a monitor. */
+    TInstanceMonitor(RefType thisType) { locallySynchronizedOnThis(_, thisType) } or
+    /** A class used as a monitor. */
+    TClassMonitor(RefType classType) { locallySynchronizedOnClass(_, classType) }
+
+  /**
+   * A monitor is any object that is used to synchronize access to a shared resource.
+   * This includes locks as well as variables used in synchronized blocks (including `this`).
+   */
+  class Monitor extends TMonitor {
+    /** Gets the location of this monitor. */
+    abstract Location getLocation();
+
+    /** Gets a textual representation of this element. */
+    abstract string toString();
+  }
+
+  /**
+   * A variable used as a monitor.
+   * The variable is either a lock or is used in a synchronized block.
+   * E.g `synchronized (m) { ... }` or `m.lock();`
+   */
+  class VariableMonitor extends Monitor, TVariableMonitor {
+    override Location getLocation() { result = this.getVariable().getLocation() }
+
+    override string toString() { result = "VariableMonitor(" + this.getVariable().toString() + ")" }
+
+    /** Gets the variable being used as a monitor. */
+    Variable getVariable() { this = TVariableMonitor(result) }
+  }
+
+  /**
+   * An instance reference used as a monitor.
+   * Either via `synchronized (this) { ... }` or by marking a non-static method as `synchronized`.
+   */
+  class InstanceMonitor extends Monitor, TInstanceMonitor {
+    override Location getLocation() { result = this.getThisType().getLocation() }
+
+    override string toString() { result = "InstanceMonitor(" + this.getThisType().toString() + ")" }
+
+    /** Gets the instance reference being used as a monitor. */
+    RefType getThisType() { this = TInstanceMonitor(result) }
+  }
+
+  /**
+   * A class used as a monitor.
+   * This is achieved by marking a static method as `synchronized`.
+   */
+  class ClassMonitor extends Monitor, TClassMonitor {
+    override Location getLocation() { result = this.getClassType().getLocation() }
+
+    override string toString() { result = "ClassMonitor(" + this.getClassType().toString() + ")" }
+
+    /** Gets the class being used as a monitor. */
+    RefType getClassType() { this = TClassMonitor(result) }
+  }
+
+  /** Holds if the expression `e` is synchronized on the monitor `m`. */
+  predicate locallyMonitors(Expr e, Monitor m) {
+    exists(Variable v | v = m.(VariableMonitor).getVariable() |
+      locallyLockedOn(e, v)
+      or
+      locallySynchronizedOn(e, _, v)
+    )
+    or
+    locallySynchronizedOnThis(e, m.(InstanceMonitor).getThisType())
+    or
+    locallySynchronizedOnClass(e, m.(ClassMonitor).getClassType())
+  }
+
+  /** Gets the control flow node that must dominate `e` when `e` is synchronized on a lock. */
+  ControlFlowNode getNodeToBeDominated(Expr e) {
+    // If `e` is the LHS of an assignment, use the control flow node for the assignment
+    exists(Assignment asgn | asgn.getDest() = e | result = asgn.getControlFlowNode())
+    or
+    // if `e` is not the LHS of an assignment, use the default control flow node
+    not exists(Assignment asgn | asgn.getDest() = e) and
+    result = e.getControlFlowNode()
+  }
+
+  /** A field storing a lock. */
+  class LockField extends Field {
+    LockField() { this.getType() instanceof LockType }
+
+    /** Gets a call to a method locking the lock stored in this field. */
+    MethodCall getLockCall() {
+      result.getQualifier() = this.getRepresentative().getAnAccess() and
+      result = this.getType().(LockType).getLockAccess()
+    }
+
+    /** Gets a call to a method unlocking the lock stored in this field. */
+    MethodCall getUnlockCall() {
+      result.getQualifier() = this.getRepresentative().getAnAccess() and
+      result = this.getType().(LockType).getUnlockAccess()
+    }
+
+    /**
+     * Gets a variable representing this field.
+     * It can be the field itself or a local variable initialized to the field.
+     */
+    private Variable getRepresentative() {
+      result = this
+      or
+      result.getInitializer() = this.getAnAccess()
+    }
+  }
+
+  /** Holds if `e` is synchronized on the `Lock` `lock` by a locking call. */
+  predicate locallyLockedOn(Expr e, LockField lock) {
+    exists(MethodCall lockCall, MethodCall unlockCall |
+      lockCall = lock.getLockCall() and
+      unlockCall = lock.getUnlockCall()
+    |
+      dominates(lockCall.getControlFlowNode(), unlockCall.getControlFlowNode()) and
+      dominates(lockCall.getControlFlowNode(), getNodeToBeDominated(e)) and
+      postDominates(unlockCall.getControlFlowNode(), getNodeToBeDominated(e))
+    )
+  }
+}
diff --git a/java/ql/lib/semmle/code/java/ConflictingAccess.qll b/java/ql/lib/semmle/code/java/ConflictingAccess.qll
new file mode 100644
index 00000000000..ceff3e4ffa3
--- /dev/null
+++ b/java/ql/lib/semmle/code/java/ConflictingAccess.qll
@@ -0,0 +1,286 @@
+/**
+ * Provides classes and predicates for detecting conflicting accesses in the sense of the Java Memory Model.
+ */
+overlay[local?]
+module;
+
+import java
+import Concurrency
+
+/** Provides predicates, chiefly `isModifying`, to check if a given expression modifies a shared resource. */
+module Modification {
+  import semmle.code.java.dataflow.FlowSummary
+
+  /** Holds if the field access `a` modifies a shared resource. */
+  predicate isModifying(FieldAccess a) {
+    a.isVarWrite()
+    or
+    exists(Call c | c.(MethodCall).getQualifier() = a | isModifyingCall(c))
+    or
+    exists(ArrayAccess aa, Assignment asa | aa.getArray() = a | asa.getDest() = aa)
+  }
+
+  /** Holds if the call `c` modifies a shared resource. */
+  predicate isModifyingCall(Call c) {
+    exists(SummarizedCallable sc, string output | sc.getACall() = c |
+      sc.propagatesFlow(_, output, _, _) and
+      output.matches("Argument[this]%")
+    )
+  }
+}
+
+/** Holds if the type `t` is thread-safe. */
+predicate isThreadSafeType(Type t) {
+  t.(RefType).getSourceDeclaration().getName().matches(["Atomic%", "Concurrent%"])
+  or
+  t.(RefType).getSourceDeclaration().getName() = "ThreadLocal"
+  or
+  // Anything in `java.util.concurrent` is thread safe.
+  // See https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/package-summary.html#MemoryVisibility
+  t.(RefType).getPackage().getName() = "java.util.concurrent"
+  or
+  t instanceof ClassAnnotatedAsThreadSafe
+}
+
+/** Holds if the expression `e` is a thread-safe initializer. */
+private predicate isThreadSafeInitializer(Expr e) {
+  exists(string name |
+    e.(Call).getCallee().getSourceDeclaration().hasQualifiedName("java.util", "Collections", name)
+  |
+    name.matches("synchronized%")
+  )
+}
+
+/**
+ * A field that is exposed to potential data races.
+ * We require the field to be in a class that is annotated as `@ThreadSafe`.
+ */
+class ExposedField extends Field {
+  ExposedField() {
+    this.getDeclaringType() instanceof ClassAnnotatedAsThreadSafe and
+    not this.isVolatile() and
+    // field is not a lock
+    not this.getType() instanceof LockType and
+    // field is not thread-safe
+    not isThreadSafeType(this.getType()) and
+    not isThreadSafeType(this.getInitializer().getType()) and
+    // the initializer guarantees thread safety
+    not isThreadSafeInitializer(this.getInitializer())
+  }
+}
+
+/**
+ * A field access that is exposed to potential data races.
+ * We require the field to be in a class that is annotated as `@ThreadSafe`.
+ */
+class ExposedFieldAccess extends FieldAccess {
+  ExposedFieldAccess() {
+    // access is to an exposed field
+    this.getField() instanceof ExposedField and
+    // access is not the initializer of the field
+    not this.(VarWrite).getASource() = this.getField().getInitializer() and
+    // access not in a constructor
+    not this.getEnclosingCallable() = this.getField().getDeclaringType().getAConstructor() and
+    // not a field on a local variable
+    not this.getQualifier+().(VarAccess).getVariable() instanceof LocalVariableDecl and
+    // not the variable mentioned in a synchronized statement
+    not this = any(SynchronizedStmt sync).getExpr()
+  }
+}
+
+/**
+ * A class annotated as `@ThreadSafe`.
+ * Provides predicates to check for concurrency issues.
+ */
+class ClassAnnotatedAsThreadSafe extends Class {
+  ClassAnnotatedAsThreadSafe() { this.getAnAnnotation().getType().getName() = "ThreadSafe" }
+
+  // We wish to find conflicting accesses that are reachable from public methods
+  // and to know which monitors protect them.
+  //
+  // It is very easy and natural to write a predicate for conflicting accesses,
+  // but that would be binary, and hence not suited for reachability analysis.
+  //
+  // It is also easy to state that all accesses to a field are protected by a single monitor,
+  // but that would require a forall, which is not suited for recursion.
+  // (The recursion occurs for example as you traverse the access path and keep requiring that all tails are protected.)
+  //
+  // We therefore use a dual solution:
+  // - We write a unary recursive predicate for accesses that are not protected by any monitor.
+  //   Any such write access, reachable from a public method, is conflicting with itself.
+  //   And any such read will be conflicting with any publicly reachable write access (locked or not).
+  //
+  // - We project the above predicate down to fields, so we can find fields with unprotected accesses.
+  // - From this we can derive a unary recursive predicate for fields whose accesses are protected by exactly one monitor.
+  //   The predicate tracks the monitor.
+  //   If such a field has two accesses protected by different monitors, we have a concurrency issue.
+  //   This can be determined by simple counting at the end of the recursion.
+  //   Technically, we only have a concurrency issue if there is a write access,
+  //   but if you are locking your reads with different locks, you likely made a typo.
+  //
+  // - From the above, we can derive a unary recursive predicate for fields whose accesses are protected by at least one monitor.
+  //   This predicate tracks all the monitors that protect accesses to the field.
+  //   This is combined with a predicate that checks if any access escapes a given monitor.
+  //   If all the monitors that protect accesses to a field are escaped by at least one access,
+  //   we have a concurrency issue.
+  //   This can be determined by a single forall at the end of the recursion.
+  //
+  // With this formulation we avoid binary predicates and foralls in recursion.
+  //
+  // Cases where a field access is not protected by any monitor
+  /**
+   * Holds if the field access `a` to the field `f` is not protected by any monitor, and it can be reached via the expression `e` in the method `m`.
+   * We maintain the invariant that `m = e.getEnclosingCallable()`.
+   */
+  private predicate unlockedAccess(
+    ExposedField f, Expr e, Method m, ExposedFieldAccess a, boolean write
+  ) {
+    m.getDeclaringType() = this and
+    (
+      // base case
+      f.getDeclaringType() = this and
+      m = e.getEnclosingCallable() and
+      a.getField() = f and
+      a = e and
+      (if Modification::isModifying(a) then write = true else write = false)
+      or
+      // recursive case
+      exists(MethodCall c, Expr e0, Method m0 | this.unlockedAccess(f, e0, m0, a, write) |
+        m = c.getEnclosingCallable() and
+        not m0.isPublic() and
+        c.getCallee().getSourceDeclaration() = m0 and
+        c = e and
+        not Monitors::locallyMonitors(e0, _)
+      )
+    )
+  }
+
+  /** Holds if the class has an unlocked access to the field `f` via the expression `e` in the method `m`. */
+  private predicate hasUnlockedAccess(ExposedField f, Expr e, Method m, boolean write) {
+    this.unlockedAccess(f, e, m, _, write)
+  }
+
+  /** Holds if the field access `a` to the field `f` is not protected by any monitor, and it can be reached via the expression `e` in the public method `m`. */
+  predicate unlockedPublicAccess(
+    ExposedField f, Expr e, Method m, ExposedFieldAccess a, boolean write
+  ) {
+    this.unlockedAccess(f, e, m, a, write) and
+    m.isPublic() and
+    not Monitors::locallyMonitors(e, _)
+  }
+
+  /** Holds if the class has an unlocked access to the field `f` via the expression `e` in the public method `m`. */
+  private predicate hasUnlockedPublicAccess(ExposedField f, Expr e, Method m, boolean write) {
+    this.unlockedPublicAccess(f, e, m, _, write)
+  }
+
+  // Cases where all accesses to a field are protected by exactly one monitor
+  //
+  /**
+   * Holds if the class has an access, locked by exactly one monitor, to the field `f` via the expression `e` in the method `m`.
+   */
+  private predicate hasOnelockedAccess(
+    ExposedField f, Expr e, Method m, boolean write, Monitors::Monitor monitor
+  ) {
+    //base
+    this.hasUnlockedAccess(f, e, m, write) and
+    Monitors::locallyMonitors(e, monitor)
+    or
+    // recursive case
+    exists(MethodCall c, Method m0 | this.hasOnelockedAccess(f, _, m0, write, monitor) |
+      m = c.getEnclosingCallable() and
+      not m0.isPublic() and
+      c.getCallee().getSourceDeclaration() = m0 and
+      c = e and
+      // consider allowing idempotent monitors
+      not Monitors::locallyMonitors(e, _) and
+      m.getDeclaringType() = this
+    )
+  }
+
+  /** Holds if the class has an access, locked by exactly one monitor, to the field `f` via the expression `e` in the public method `m`. */
+  private predicate hasOnelockedPublicAccess(
+    ExposedField f, Expr e, Method m, boolean write, Monitors::Monitor monitor
+  ) {
+    this.hasOnelockedAccess(f, e, m, write, monitor) and
+    m.isPublic() and
+    not this.hasUnlockedPublicAccess(f, e, m, write)
+  }
+
+  /** Holds if the field `f` has more than one access, all locked by a single monitor, but different monitors are used. */
+  predicate singleMonitorMismatch(ExposedField f) {
+    2 <= strictcount(Monitors::Monitor monitor | this.hasOnelockedPublicAccess(f, _, _, _, monitor))
+  }
+
+  // Cases where all accesses to a field are protected by at least one monitor
+  //
+  /** Holds if the class has an access, locked by at least one monitor, to the field `f` via the expression `e` in the method `m`. */
+  private predicate hasOnepluslockedAccess(
+    ExposedField f, Expr e, Method m, boolean write, Monitors::Monitor monitor
+  ) {
+    //base
+    this.hasOnelockedAccess(f, e, m, write, monitor) and
+    not this.singleMonitorMismatch(f) and
+    not this.hasUnlockedPublicAccess(f, _, _, _)
+    or
+    // recursive case
+    exists(MethodCall c, Method m0, Monitors::Monitor monitor0 |
+      this.hasOnepluslockedAccess(f, _, m0, write, monitor0) and
+      m = c.getEnclosingCallable() and
+      not m0.isPublic() and
+      c.getCallee().getSourceDeclaration() = m0 and
+      c = e and
+      m.getDeclaringType() = this
+    |
+      monitor = monitor0
+      or
+      Monitors::locallyMonitors(e, monitor)
+    )
+  }
+
+  /** Holds if the class has a write access to the field `f` that can be reached via a public method. */
+  predicate hasPublicWriteAccess(ExposedField f) {
+    this.hasUnlockedPublicAccess(f, _, _, true)
+    or
+    this.hasOnelockedPublicAccess(f, _, _, true, _)
+    or
+    exists(Method m | m.getDeclaringType() = this and m.isPublic() |
+      this.hasOnepluslockedAccess(f, _, m, true, _)
+    )
+  }
+
+  /** Holds if the class has an access, not protected by the monitor `m`, to the field `f` via the expression `e` in the method `m`. */
+  private predicate escapesMonitor(
+    ExposedField f, Expr e, Method m, boolean write, Monitors::Monitor monitor
+  ) {
+    //base
+    this.hasOnepluslockedAccess(f, _, _, _, monitor) and
+    this.hasUnlockedAccess(f, e, m, write) and
+    not Monitors::locallyMonitors(e, monitor)
+    or
+    // recursive case
+    exists(MethodCall c, Method m0 | this.escapesMonitor(f, _, m0, write, monitor) |
+      m = c.getEnclosingCallable() and
+      not m0.isPublic() and
+      c.getCallee().getSourceDeclaration() = m0 and
+      c = e and
+      not Monitors::locallyMonitors(e, monitor) and
+      m.getDeclaringType() = this
+    )
+  }
+
+  /** Holds if the class has an access, not protected by the monitor `m`, to the field `f` via the expression `e` in the public method `m`. */
+  private predicate escapesMonitorPublic(
+    ExposedField f, Expr e, Method m, boolean write, Monitors::Monitor monitor
+  ) {
+    this.escapesMonitor(f, e, m, write, monitor) and
+    m.isPublic()
+  }
+
+  /** Holds if no monitor protects all accesses to the field `f`. */
+  predicate notFullyMonitored(ExposedField f) {
+    forex(Monitors::Monitor monitor | this.hasOnepluslockedAccess(f, _, _, _, monitor) |
+      this.escapesMonitorPublic(f, _, _, _, monitor)
+    )
+  }
+}
diff --git a/java/ql/lib/semmle/code/java/ControlFlowGraph.qll b/java/ql/lib/semmle/code/java/ControlFlowGraph.qll
index 612bca35a60..a31101888da 100644
--- a/java/ql/lib/semmle/code/java/ControlFlowGraph.qll
+++ b/java/ql/lib/semmle/code/java/ControlFlowGraph.qll
@@ -82,6 +82,7 @@ module;
  */
 
 import java
+private import codeql.controlflow.SuccessorType
 private import codeql.util.Boolean
 private import Completion
 private import controlflow.internal.Preconditions
@@ -124,6 +125,28 @@ module ControlFlow {
       result = succ(this, NormalCompletion())
     }
 
+    /** Gets an immediate successor of this node of a given type, if any. */
+    Node getASuccessor(SuccessorType t) {
+      result = branchSuccessor(this, t.(BooleanSuccessor).getValue())
+      or
+      exists(Completion completion |
+        result = succ(this, completion) and
+        not result = branchSuccessor(this, _)
+      |
+        completion = NormalCompletion() and t instanceof DirectSuccessor
+        or
+        completion = ReturnCompletion() and t instanceof ReturnSuccessor
+        or
+        completion = BreakCompletion(_) and t instanceof BreakSuccessor
+        or
+        completion = YieldCompletion(_) and t instanceof BreakSuccessor
+        or
+        completion = ContinueCompletion(_) and t instanceof ContinueSuccessor
+        or
+        completion = ThrowCompletion(_) and t instanceof ExceptionSuccessor
+      )
+    }
+
     /** Gets the basic block that contains this node. */
     BasicBlock getBasicBlock() { result.getANode() = this }
 
@@ -347,12 +370,28 @@ private module ControlFlowGraphImpl {
     )
   }
 
+  private predicate methodMayThrow(Method m, ThrowableType t) {
+    exists(AstNode n |
+      t = n.(ThrowStmt).getThrownExceptionType() and
+      not n.(ThrowStmt).getParent() = any(Method m0).getBody()
+      or
+      uncheckedExceptionFromMethod(n, t)
+    |
+      n.getEnclosingStmt().getEnclosingCallable() = m and
+      not exists(TryStmt try |
+        exists(try.getACatchClause()) and try.getBlock() = n.getEnclosingStmt().getEnclosingStmt*()
+      )
+    )
+  }
+
   /**
-   * Bind `t` to an unchecked exception that may occur in a precondition check.
+   * Bind `t` to an unchecked exception that may occur in a precondition check or guard wrapper.
    */
   private predicate uncheckedExceptionFromMethod(MethodCall ma, ThrowableType t) {
-    conditionCheckArgument(ma, _, _) and
+    (methodCallChecksArgument(ma) or methodCallUnconditionallyThrows(ma)) and
     (t instanceof TypeError or t instanceof TypeRuntimeException)
+    or
+    methodMayThrow(ma.getMethod().getSourceDeclaration(), t)
   }
 
   /**
@@ -570,6 +609,7 @@ private module ControlFlowGraphImpl {
    * Gets a `MethodCall` that always throws an exception or calls `exit`.
    */
   private MethodCall nonReturningMethodCall() {
+    methodCallUnconditionallyThrows(result) or
     result.getMethod().getSourceDeclaration() = nonReturningMethod() or
     result = likelyNonReturningMethod().getAnAccess()
   }
diff --git a/java/ql/lib/semmle/code/java/Conversions.qll b/java/ql/lib/semmle/code/java/Conversions.qll
index 76b74fd1eb7..779eb7620be 100644
--- a/java/ql/lib/semmle/code/java/Conversions.qll
+++ b/java/ql/lib/semmle/code/java/Conversions.qll
@@ -100,12 +100,12 @@ class InvocationConversionContext extends ConversionSite {
  * See the Java Language Specification, Section 5.4.
  */
 class StringConversionContext extends ConversionSite {
-  AddExpr a;
-
   StringConversionContext() {
-    a.getAnOperand() = this and
-    not this.getType() instanceof TypeString and
-    a.getAnOperand().getType() instanceof TypeString
+    exists(AddExpr a |
+      a.getAnOperand() = this and
+      not this.getType() instanceof TypeString and
+      a.getAnOperand().getType() instanceof TypeString
+    )
   }
 
   override Type getConversionTarget() { result instanceof TypeString }
diff --git a/java/ql/lib/semmle/code/java/Import.qll b/java/ql/lib/semmle/code/java/Import.qll
index aed04115555..03480727735 100644
--- a/java/ql/lib/semmle/code/java/Import.qll
+++ b/java/ql/lib/semmle/code/java/Import.qll
@@ -154,3 +154,35 @@ class ImportStaticTypeMember extends Import {
 
   override string getAPrimaryQlClass() { result = "ImportStaticTypeMember" }
 }
+
+/**
+ * A module import declaration, which imports an entire module.
+ *
+ * For example, `import module java.base;` makes all packages exported
+ * by the `java.base` module available, and through those packages,
+ * the types they declare become accessible.
+ */
+class ModuleImportDeclaration extends Import {
+  ModuleImportDeclaration() { imports(this, _, _, 6) }
+
+  /** Gets the name of the imported module. */
+  string getModuleName() { imports(this, _, result, _) }
+
+  /** Gets the imported module. */
+  Module getModule() { result.getName() = this.getModuleName() }
+
+  /** Gets an exported package from the imported module. */
+  Package getAnImportedPackage() {
+    exists(ExportsDirective exports |
+      exports = this.getModule().getADirective() and
+      result = exports.getExportedPackage()
+    )
+  }
+
+  /** Gets a type from a package that is accessible through this module import. */
+  RefType getAnImportedType() { result.getPackage() = this.getAnImportedPackage() }
+
+  override string toString() { result = "import module " + this.getModuleName() }
+
+  override string getAPrimaryQlClass() { result = "ModuleImportDeclaration" }
+}
diff --git a/java/ql/lib/semmle/code/java/Member.qll b/java/ql/lib/semmle/code/java/Member.qll
index 1e814117e9e..17fe696972f 100644
--- a/java/ql/lib/semmle/code/java/Member.qll
+++ b/java/ql/lib/semmle/code/java/Member.qll
@@ -256,7 +256,15 @@ class Callable extends StmtParent, Member, @callable {
   Exception getAnException() { exceptions(result, _, this) }
 
   /** Gets an exception type that occurs in the `throws` clause of this callable. */
-  RefType getAThrownExceptionType() { result = this.getAnException().getType() }
+  RefType getAThrownExceptionType() {
+    result = this.getAnException().getType()
+    or
+    exists(Annotation a |
+      this.getAnAnnotation() = a and
+      a.getType().hasQualifiedName("kotlin.jvm", "Throws") and
+      a.getATypeArrayValue(_) = result
+    )
+  }
 
   /** Gets a call site that references this callable. */
   Call getAReference() { result.getCallee() = this }
@@ -840,6 +848,9 @@ class Field extends Member, ExprParent, @field, Variable {
   override string getAPrimaryQlClass() { result = "Field" }
 }
 
+overlay[local]
+private class DiscardableField extends DiscardableReferableLocatable, @field { }
+
 /** An instance field. */
 class InstanceField extends Field {
   InstanceField() { not this.isStatic() }
diff --git a/java/ql/lib/semmle/code/java/Overlay.qll b/java/ql/lib/semmle/code/java/Overlay.qll
index 1d1a3896ba7..b5f7264eb3d 100644
--- a/java/ql/lib/semmle/code/java/Overlay.qll
+++ b/java/ql/lib/semmle/code/java/Overlay.qll
@@ -18,7 +18,7 @@ predicate isOverlay() { databaseMetadata("isOverlay", "true") }
 overlay[local]
 string getRawFile(@locatable el) {
   exists(@location loc, @file file |
-    hasLocation(el, loc) and
+    (hasLocation(el, loc) or xmllocations(el, loc)) and
     locations_default(loc, file, _, _, _, _) and
     files(file, result)
   )
@@ -73,40 +73,60 @@ private predicate discardReferableLocatable(@locatable el) {
   )
 }
 
+/** Gets the raw file for a configLocatable. */
 overlay[local]
-private predicate baseConfigLocatable(@configLocatable l) { not isOverlay() and exists(l) }
+private string getRawFileForConfig(@configLocatable el) {
+  exists(@location loc, @file file |
+    configLocations(el, loc) and
+    locations_default(loc, file, _, _, _, _) and
+    files(file, result)
+  )
+}
 
 overlay[local]
-private predicate overlayHasConfigLocatables() {
+private string baseConfigLocatable(@configLocatable el) {
+  not isOverlay() and result = getRawFileForConfig(el)
+}
+
+overlay[local]
+private predicate overlayConfigExtracted(string file) {
   isOverlay() and
-  exists(@configLocatable el)
+  exists(@configLocatable el | file = getRawFileForConfig(el))
 }
 
 overlay[discard_entity]
 private predicate discardBaseConfigLocatable(@configLocatable el) {
-  // The properties extractor is currently not incremental, so if
-  // the overlay contains any config locatables, the overlay should
-  // contain a full extraction and all config locatables from base
-  // should be discarded.
-  baseConfigLocatable(el) and overlayHasConfigLocatables()
+  overlayChangedFiles(baseConfigLocatable(el))
+  or
+  // The config extractor is currently not incremental and may extract more
+  // property files than those included in overlayChangedFiles.
+  overlayConfigExtracted(baseConfigLocatable(el))
+}
+
+/**
+ * An `@xmllocatable` that should be discarded in the base variant if its file is
+ * extracted in the overlay variant.
+ */
+overlay[local]
+abstract class DiscardableXmlLocatable extends @xmllocatable {
+  /** Gets the raw file for an xmllocatable in base. */
+  string getRawFileInBase() { not isOverlay() and result = getRawFile(this) }
+
+  /** Gets a textual representation of this discardable xmllocatable. */
+  string toString() { none() }
 }
 
 overlay[local]
-private predicate baseXmlLocatable(@xmllocatable l) {
-  not isOverlay() and not files(l, _) and not xmlNs(l, _, _, _)
-}
-
-overlay[local]
-private predicate overlayHasXmlLocatable() {
+private predicate overlayXmlExtracted(string file) {
   isOverlay() and
-  exists(@xmllocatable l | not files(l, _) and not xmlNs(l, _, _, _))
+  exists(@xmllocatable el | not files(el, _) and not xmlNs(el, _, _, _) and file = getRawFile(el))
 }
 
 overlay[discard_entity]
-private predicate discardBaseXmlLocatable(@xmllocatable el) {
-  // The XML extractor is currently not incremental, so if
-  // the overlay contains any XML locatables, the overlay should
-  // contain a full extraction and all XML locatables from base
-  // should be discarded.
-  baseXmlLocatable(el) and overlayHasXmlLocatable()
+private predicate discardXmlLocatable(@xmllocatable el) {
+  overlayChangedFiles(el.(DiscardableXmlLocatable).getRawFileInBase())
+  or
+  // The XML extractor is currently not incremental and may extract more
+  // XML files than those included in overlayChangedFiles.
+  overlayXmlExtracted(el.(DiscardableXmlLocatable).getRawFileInBase())
 }
diff --git a/java/ql/lib/semmle/code/java/Statement.qll b/java/ql/lib/semmle/code/java/Statement.qll
index a4872a32c91..2aea8b006ae 100644
--- a/java/ql/lib/semmle/code/java/Statement.qll
+++ b/java/ql/lib/semmle/code/java/Statement.qll
@@ -291,7 +291,7 @@ class TryStmt extends Stmt, @trystmt {
   CatchClause getACatchClause() { result.getParent() = this }
 
   /**
-   * Gets the `catch` clause at the specified (zero-based) position
+   * Gets the `catch` clause at the specified (zero-based) position `index`
    * in this `try` statement.
    */
   CatchClause getCatchClause(int index) {
@@ -305,7 +305,7 @@ class TryStmt extends Stmt, @trystmt {
   /** Gets a resource variable declaration, if any. */
   LocalVariableDeclStmt getAResourceDecl() { result.getParent() = this and result.getIndex() <= -3 }
 
-  /** Gets the resource variable declaration at the specified position in this `try` statement. */
+  /** Gets the resource variable declaration at the specified position `index` in this `try` statement. */
   LocalVariableDeclStmt getResourceDecl(int index) {
     result = this.getAResourceDecl() and
     index = -3 - result.getIndex()
@@ -314,7 +314,7 @@ class TryStmt extends Stmt, @trystmt {
   /** Gets a resource expression, if any. */
   VarAccess getAResourceExpr() { result.getParent() = this and result.getIndex() <= -3 }
 
-  /** Gets the resource expression at the specified position in this `try` statement. */
+  /** Gets the resource expression at the specified position `index` in this `try` statement. */
   VarAccess getResourceExpr(int index) {
     result = this.getAResourceExpr() and
     index = -3 - result.getIndex()
@@ -323,7 +323,7 @@ class TryStmt extends Stmt, @trystmt {
   /** Gets a resource in this `try` statement, if any. */
   ExprParent getAResource() { result = this.getAResourceDecl() or result = this.getAResourceExpr() }
 
-  /** Gets the resource at the specified position in this `try` statement. */
+  /** Gets the resource at the specified position `index` in this `try` statement. */
   ExprParent getResource(int index) {
     result = this.getResourceDecl(index) or result = this.getResourceExpr(index)
   }
diff --git a/java/ql/lib/semmle/code/java/Type.qll b/java/ql/lib/semmle/code/java/Type.qll
index dd646e74285..ef5cc5d941c 100644
--- a/java/ql/lib/semmle/code/java/Type.qll
+++ b/java/ql/lib/semmle/code/java/Type.qll
@@ -15,6 +15,7 @@ module;
 import Member
 import Modifier
 import JDK
+private import semmle.code.java.Overlay
 
 /**
  * Holds if reference type `t` is an immediate super-type of `sub`.
@@ -699,6 +700,15 @@ class Class extends ClassOrInterface {
   /** Holds if this class is an anonymous class. */
   predicate isAnonymous() { isAnonymClass(this.getSourceDeclaration(), _) }
 
+  /** Holds if this class is an implicit class (compact source file). */
+  predicate isImplicit() { isImplicitClass(this.getSourceDeclaration()) }
+
+  /** Holds if this is an auxiliary program element generated by the compiler. */
+  override predicate isCompilerGenerated() {
+    super.isCompilerGenerated() or
+    this.isImplicit()
+  }
+
   /**
    * Gets an annotation that applies to this class.
    *
@@ -998,6 +1008,10 @@ class ClassOrInterface extends RefType, @classorinterface {
   CompanionObject getCompanionObject() { type_companion_object(this, _, result) }
 }
 
+overlay[local]
+private class DiscardableClassOrInterface extends DiscardableReferableLocatable, @classorinterface {
+}
+
 private string getAPublicObjectMethodSignature() {
   exists(Method m |
     m.getDeclaringType() instanceof TypeObject and
diff --git a/java/ql/lib/semmle/code/java/controlflow/BasicBlocks.qll b/java/ql/lib/semmle/code/java/controlflow/BasicBlocks.qll
index e974f711ec4..f214cbbd0b1 100644
--- a/java/ql/lib/semmle/code/java/controlflow/BasicBlocks.qll
+++ b/java/ql/lib/semmle/code/java/controlflow/BasicBlocks.qll
@@ -7,10 +7,9 @@ module;
 import java
 import Dominance
 private import codeql.controlflow.BasicBlock as BB
+private import codeql.controlflow.SuccessorType
 
 private module Input implements BB::InputSig<Location> {
-  import SuccessorType
-
   /** Hold if `t` represents a conditional successor type. */
   predicate successorTypeIsCondition(SuccessorType t) { none() }
 
@@ -23,20 +22,8 @@ private module Input implements BB::InputSig<Location> {
   /** Gets the CFG scope in which this node occurs. */
   CfgScope nodeGetCfgScope(Node node) { node.getEnclosingCallable() = result }
 
-  private Node getASpecificSuccessor(Node node, SuccessorType t) {
-    node.(ConditionNode).getABranchSuccessor(t.(BooleanSuccessor).getValue()) = result
-    or
-    node.getAnExceptionSuccessor() = result and t instanceof ExceptionSuccessor
-  }
-
   /** Gets an immediate successor of this node. */
-  Node nodeGetASuccessor(Node node, SuccessorType t) {
-    result = getASpecificSuccessor(node, t)
-    or
-    node.getASuccessor() = result and
-    t instanceof NormalSuccessor and
-    not result = getASpecificSuccessor(node, _)
-  }
+  Node nodeGetASuccessor(Node node, SuccessorType t) { result = node.getASuccessor(t) }
 
   /**
    * Holds if `node` represents an entry node to be used when calculating
@@ -96,7 +83,17 @@ class BasicBlock extends BbImpl::BasicBlock {
   predicate strictlyDominates(BasicBlock bb) { super.strictlyDominates(bb) }
 
   /** Gets an immediate successor of this basic block of a given type, if any. */
-  BasicBlock getASuccessor(Input::SuccessorType t) { result = super.getASuccessor(t) }
+  BasicBlock getASuccessor(SuccessorType t) { result = super.getASuccessor(t) }
+
+  BasicBlock getASuccessor() { result = super.getASuccessor() }
+
+  BasicBlock getImmediateDominator() { result = super.getImmediateDominator() }
+
+  predicate inDominanceFrontier(BasicBlock df) { super.inDominanceFrontier(df) }
+
+  predicate strictlyPostDominates(BasicBlock bb) { super.strictlyPostDominates(bb) }
+
+  predicate postDominates(BasicBlock bb) { super.postDominates(bb) }
 
   /**
    * DEPRECATED: Use `getASuccessor` instead.
@@ -145,3 +142,15 @@ class BasicBlock extends BbImpl::BasicBlock {
 class ExitBlock extends BasicBlock {
   ExitBlock() { this.getLastNode() instanceof ControlFlow::ExitNode }
 }
+
+private class BasicBlockAlias = BasicBlock;
+
+module Cfg implements BB::CfgSig<Location> {
+  class ControlFlowNode = BbImpl::ControlFlowNode;
+
+  class BasicBlock = BasicBlockAlias;
+
+  class EntryBasicBlock extends BasicBlock instanceof BbImpl::EntryBasicBlock { }
+
+  predicate dominatingEdge(BasicBlock bb1, BasicBlock bb2) { BbImpl::dominatingEdge(bb1, bb2) }
+}
diff --git a/java/ql/lib/semmle/code/java/controlflow/ControlFlowReachability.qll b/java/ql/lib/semmle/code/java/controlflow/ControlFlowReachability.qll
new file mode 100644
index 00000000000..9fe6b9b0b1d
--- /dev/null
+++ b/java/ql/lib/semmle/code/java/controlflow/ControlFlowReachability.qll
@@ -0,0 +1,60 @@
+/**
+ * Provides an implementation of local (intraprocedural) control flow reachability.
+ */
+overlay[local?]
+module;
+
+import java
+private import codeql.controlflow.ControlFlowReachability
+private import semmle.code.java.dataflow.SSA as SSA
+private import semmle.code.java.controlflow.Guards as Guards
+
+private module ControlFlowInput implements InputSig<Location, ControlFlowNode, BasicBlock> {
+  private import java as J
+
+  AstNode getEnclosingAstNode(ControlFlowNode node) { node.getAstNode() = result }
+
+  class AstNode = ExprParent;
+
+  AstNode getParent(AstNode node) {
+    result = node.(Expr).getParent() or
+    result = node.(Stmt).getParent()
+  }
+
+  class FinallyBlock extends AstNode {
+    FinallyBlock() { any(TryStmt try).getFinally() = this }
+  }
+
+  class Expr = J::Expr;
+
+  class SourceVariable = SSA::SsaSourceVariable;
+
+  class SsaDefinition = SSA::SsaVariable;
+
+  class SsaExplicitWrite extends SsaDefinition instanceof SSA::SsaExplicitUpdate {
+    Expr getValue() {
+      super.getDefiningExpr().(VariableAssign).getSource() = result or
+      super.getDefiningExpr().(AssignOp) = result
+    }
+  }
+
+  class SsaPhiDefinition = SSA::SsaPhiNode;
+
+  class SsaUncertainWrite extends SsaDefinition instanceof SSA::SsaUncertainImplicitUpdate {
+    SsaDefinition getPriorDefinition() { result = super.getPriorDef() }
+  }
+
+  class GuardValue = Guards::GuardValue;
+
+  predicate ssaControlsBranchEdge(SsaDefinition def, BasicBlock bb1, BasicBlock bb2, GuardValue v) {
+    Guards::Guards_v3::ssaControlsBranchEdge(def, bb1, bb2, v)
+  }
+
+  predicate ssaControls(SsaDefinition def, BasicBlock bb, GuardValue v) {
+    Guards::Guards_v3::ssaControls(def, bb, v)
+  }
+
+  import Guards::Guards_v3::InternalUtil
+}
+
+module ControlFlowReachability = Make<Location, Cfg, ControlFlowInput>;
diff --git a/java/ql/lib/semmle/code/java/controlflow/Guards.qll b/java/ql/lib/semmle/code/java/controlflow/Guards.qll
index c33658cb67b..7bc53226b81 100644
--- a/java/ql/lib/semmle/code/java/controlflow/Guards.qll
+++ b/java/ql/lib/semmle/code/java/controlflow/Guards.qll
@@ -139,19 +139,13 @@ private predicate isNonFallThroughPredecessor(SwitchCase sc, ControlFlowNode pre
   )
 }
 
-private module GuardsInput implements SharedGuards::InputSig<Location> {
+private module GuardsInput implements SharedGuards::InputSig<Location, ControlFlowNode, BasicBlock> {
   private import java as J
+  private import semmle.code.java.dataflow.internal.BaseSSA
   private import semmle.code.java.dataflow.NullGuards as NullGuards
-  import SuccessorType
-
-  class ControlFlowNode = J::ControlFlowNode;
 
   class NormalExitNode = ControlFlow::NormalExitNode;
 
-  class BasicBlock = J::BasicBlock;
-
-  predicate dominatingEdge(BasicBlock bb1, BasicBlock bb2) { J::dominatingEdge(bb1, bb2) }
-
   class AstNode = ExprParent;
 
   class Expr = J::Expr;
@@ -216,6 +210,12 @@ private module GuardsInput implements SharedGuards::InputSig<Location> {
         f.isFinal() and
         f.getInitializer() = NullGuards::baseNotNullExpr()
       )
+      or
+      exists(CatchClause cc, LocalVariableDeclExpr decl, BaseSsaUpdate v |
+        decl = cc.getVariable() and
+        decl = v.getDefiningExpr() and
+        this = v.getAUse()
+      )
     }
   }
 
@@ -375,7 +375,7 @@ private module GuardsInput implements SharedGuards::InputSig<Location> {
   }
 }
 
-private module GuardsImpl = SharedGuards::Make<Location, GuardsInput>;
+private module GuardsImpl = SharedGuards::Make<Location, Cfg, GuardsInput>;
 
 private module LogicInputCommon {
   private import semmle.code.java.dataflow.NullGuards as NullGuards
@@ -395,11 +395,13 @@ private module LogicInputCommon {
   predicate additionalImpliesStep(
     GuardsImpl::PreGuard g1, GuardValue v1, GuardsImpl::PreGuard g2, GuardValue v2
   ) {
-    exists(MethodCall check, int argIndex |
+    exists(MethodCall check |
       g1 = check and
-      v1.getDualValue().isThrowsException() and
-      conditionCheckArgument(check, argIndex, v2.asBooleanValue()) and
-      g2 = check.getArgument(argIndex)
+      v1.getDualValue().isThrowsException()
+    |
+      methodCallChecksBoolean(check, g2, v2.asBooleanValue())
+      or
+      methodCallChecksNotNull(check, g2) and v2.isNonNullValue()
     )
   }
 }
@@ -413,21 +415,21 @@ private module LogicInput_v1 implements GuardsImpl::LogicInputSig {
     GuardsInput::Expr getARead() { result = this.getAUse() }
   }
 
-  class SsaWriteDefinition extends SsaDefinition instanceof BaseSsaUpdate {
-    GuardsInput::Expr getDefinition() {
+  class SsaExplicitWrite extends SsaDefinition instanceof BaseSsaUpdate {
+    GuardsInput::Expr getValue() {
       super.getDefiningExpr().(VariableAssign).getSource() = result or
       super.getDefiningExpr().(AssignOp) = result
     }
   }
 
-  class SsaPhiNode extends SsaDefinition instanceof BaseSsaPhiNode {
+  class SsaPhiDefinition extends SsaDefinition instanceof BaseSsaPhiNode {
     predicate hasInputFromBlock(SsaDefinition inp, BasicBlock bb) {
       super.hasInputFromBlock(inp, bb)
     }
   }
 
-  predicate parameterDefinition(Parameter p, SsaDefinition def) {
-    def.(BaseSsaImplicitInit).isParameterDefinition(p)
+  class SsaParameterInit extends SsaDefinition instanceof BaseSsaImplicitInit {
+    Parameter getParameter() { super.isParameterDefinition(result) }
   }
 
   predicate additionalNullCheck = LogicInputCommon::additionalNullCheck/4;
@@ -444,21 +446,21 @@ private module LogicInput_v2 implements GuardsImpl::LogicInputSig {
     GuardsInput::Expr getARead() { result = this.getAUse() }
   }
 
-  class SsaWriteDefinition extends SsaDefinition instanceof SSA::SsaExplicitUpdate {
-    GuardsInput::Expr getDefinition() {
+  class SsaExplicitWrite extends SsaDefinition instanceof SSA::SsaExplicitUpdate {
+    GuardsInput::Expr getValue() {
       super.getDefiningExpr().(VariableAssign).getSource() = result or
       super.getDefiningExpr().(AssignOp) = result
     }
   }
 
-  class SsaPhiNode extends SsaDefinition instanceof SSA::SsaPhiNode {
+  class SsaPhiDefinition extends SsaDefinition instanceof SSA::SsaPhiNode {
     predicate hasInputFromBlock(SsaDefinition inp, BasicBlock bb) {
       super.hasInputFromBlock(inp, bb)
     }
   }
 
-  predicate parameterDefinition(Parameter p, SsaDefinition def) {
-    def.(SSA::SsaImplicitInit).isParameterDefinition(p)
+  class SsaParameterInit extends SsaDefinition instanceof SSA::SsaImplicitInit {
+    Parameter getParameter() { super.isParameterDefinition(result) }
   }
 
   predicate additionalNullCheck = LogicInputCommon::additionalNullCheck/4;
@@ -490,12 +492,6 @@ module Guards_v2 = GuardsImpl::Logic<LogicInput_v2>;
 /** INTERNAL: Don't use. */
 module Guards_v3 = GuardsImpl::Logic<LogicInput_v3>;
 
-/** INTERNAL: Don't use. */
-predicate implies_v3(Guard g1, boolean b1, Guard g2, boolean b2) {
-  Guards_v3::boolImplies(g1, any(GuardValue v | v.asBooleanValue() = b1), g2,
-    any(GuardValue v | v.asBooleanValue() = b2))
-}
-
 /**
  * A guard. This may be any expression whose value determines subsequent
  * control flow. It may also be a switch case, which as a guard is considered
diff --git a/java/ql/lib/semmle/code/java/controlflow/SuccessorType.qll b/java/ql/lib/semmle/code/java/controlflow/SuccessorType.qll
deleted file mode 100644
index feabc47552f..00000000000
--- a/java/ql/lib/semmle/code/java/controlflow/SuccessorType.qll
+++ /dev/null
@@ -1,74 +0,0 @@
-/**
- * Provides different types of control flow successor types.
- */
-overlay[local?]
-module;
-
-import java
-private import codeql.util.Boolean
-
-private newtype TSuccessorType =
-  TNormalSuccessor() or
-  TBooleanSuccessor(Boolean branch) or
-  TExceptionSuccessor()
-
-/** The type of a control flow successor. */
-class SuccessorType extends TSuccessorType {
-  /** Gets a textual representation of successor type. */
-  string toString() { result = "SuccessorType" }
-}
-
-/** A normal control flow successor. */
-class NormalSuccessor extends SuccessorType, TNormalSuccessor { }
-
-/**
- * An exceptional control flow successor.
- *
- * This marks control flow edges that are taken when an exception is thrown.
- */
-class ExceptionSuccessor extends SuccessorType, TExceptionSuccessor { }
-
-/**
- * A conditional control flow successor.
- *
- * This currently only includes boolean successors (`BooleanSuccessor`).
- */
-class ConditionalSuccessor extends SuccessorType, TBooleanSuccessor {
-  /** Gets the Boolean value of this successor. */
-  boolean getValue() { this = TBooleanSuccessor(result) }
-}
-
-/**
- * A Boolean control flow successor.
- *
- * For example, this program fragment:
- *
- * ```java
- * if (x < 0)
- *     return 0;
- * else
- *     return 1;
- * ```
- *
- * has a control flow graph containing Boolean successors:
- *
- * ```
- *        if
- *        |
- *      x < 0
- *       / \
- *      /   \
- *     /     \
- *  true    false
- *    |        \
- * return 0   return 1
- * ```
- */
-class BooleanSuccessor = ConditionalSuccessor;
-
-/**
- * A nullness control flow successor. This is currently unused for Java.
- */
-class NullnessSuccessor extends ConditionalSuccessor {
-  NullnessSuccessor() { none() }
-}
diff --git a/java/ql/lib/semmle/code/java/controlflow/internal/Preconditions.qll b/java/ql/lib/semmle/code/java/controlflow/internal/Preconditions.qll
index a0d2e4ef03e..cc8ee539a5b 100644
--- a/java/ql/lib/semmle/code/java/controlflow/internal/Preconditions.qll
+++ b/java/ql/lib/semmle/code/java/controlflow/internal/Preconditions.qll
@@ -1,5 +1,5 @@
 /**
- * Provides predicates for identifying precondition checks like
+ * Provides predicates for identifying precondition and assertion checks like
  * `com.google.common.base.Preconditions` and
  * `org.apache.commons.lang3.Validate`.
  */
@@ -9,99 +9,150 @@ module;
 import java
 
 /**
+ * Holds if `m` is a method that checks that its argument at position `arg` is
+ * equal to true and throws otherwise.
+ */
+private predicate methodCheckTrue(Method m, int arg) {
+  arg = 0 and
+  (
+    m.hasQualifiedName("com.google.common.base", "Preconditions", ["checkArgument", "checkState"]) or
+    m.hasQualifiedName("com.google.common.base", "Verify", "verify") or
+    m.hasQualifiedName("org.apache.commons.lang3", "Validate", ["isTrue", "validState"]) or
+    m.hasQualifiedName("org.junit.jupiter.api", "Assertions", "assertTrue") or
+    m.hasQualifiedName("org.junit.jupiter.api", "Assumptions", "assumeTrue") or
+    m.hasQualifiedName("org.testng", "Assert", "assertTrue")
+  )
+  or
+  m.getParameter(arg).getType() instanceof BooleanType and
+  (
+    m.hasQualifiedName("org.junit", "Assert", "assertTrue") or
+    m.hasQualifiedName("org.junit", "Assume", "assumeTrue") or
+    m.hasQualifiedName("junit.framework", _, "assertTrue")
+  )
+}
+
+/**
+ * Holds if `m` is a method that checks that its argument at position `arg` is
+ * equal to false and throws otherwise.
+ */
+private predicate methodCheckFalse(Method m, int arg) {
+  arg = 0 and
+  (
+    m.hasQualifiedName("org.junit.jupiter.api", "Assertions", "assertFalse") or
+    m.hasQualifiedName("org.junit.jupiter.api", "Assumptions", "assumeFalse") or
+    m.hasQualifiedName("org.testng", "Assert", "assertFalse")
+  )
+  or
+  m.getParameter(arg).getType() instanceof BooleanType and
+  (
+    m.hasQualifiedName("org.junit", "Assert", "assertFalse") or
+    m.hasQualifiedName("org.junit", "Assume", "assumeFalse") or
+    m.hasQualifiedName("junit.framework", _, "assertFalse")
+  )
+}
+
+/**
+ * Holds if `m` is a method that checks that its argument at position `arg` is
+ * not null and throws otherwise.
+ */
+private predicate methodCheckNotNull(Method m, int arg) {
+  arg = 0 and
+  (
+    m.hasQualifiedName("com.google.common.base", "Preconditions", "checkNotNull") or
+    m.hasQualifiedName("com.google.common.base", "Verify", "verifyNotNull") or
+    m.hasQualifiedName("org.apache.commons.lang3", "Validate", "notNull") or
+    m.hasQualifiedName("java.util", "Objects", "requireNonNull") or
+    m.hasQualifiedName("org.junit.jupiter.api", "Assertions", "assertNotNull") or
+    m.hasQualifiedName("org.junit", "Assume", "assumeNotNull") or // vararg
+    m.hasQualifiedName("org.testng", "Assert", "assertNotNull")
+  )
+  or
+  arg = m.getNumberOfParameters() - 1 and
+  (
+    m.hasQualifiedName("org.junit", "Assert", "assertNotNull") or
+    m.hasQualifiedName("junit.framework", _, "assertNotNull")
+  )
+}
+
+/**
+ * Holds if `m` is a method that checks that its argument at position `arg`
+ * satisfies a property specified by another argument and throws otherwise.
+ */
+private predicate methodCheckThat(Method m, int arg) {
+  m.getParameter(arg).getType().getErasure() instanceof TypeObject and
+  (
+    m.hasQualifiedName("org.hamcrest", "MatcherAssert", "assertThat") or
+    m.hasQualifiedName("org.junit", "Assert", "assertThat") or
+    m.hasQualifiedName("org.junit", "Assume", "assumeThat")
+  )
+}
+
+/** Holds if `m` is a method that unconditionally throws. */
+private predicate methodUnconditionallyThrows(Method m) {
+  m.hasQualifiedName("org.junit.jupiter.api", "Assertions", "fail") or
+  m.hasQualifiedName("org.junit", "Assert", "fail") or
+  m.hasQualifiedName("junit.framework", _, "fail") or
+  m.hasQualifiedName("org.testng", "Assert", "fail")
+}
+
+/**
+ * Holds if `mc` is a call to a method that checks that its argument `arg` is
+ * equal to `checkTrue` and throws otherwise.
+ */
+predicate methodCallChecksBoolean(MethodCall mc, Expr arg, boolean checkTrue) {
+  exists(int pos | mc.getArgument(pos) = arg |
+    methodCheckTrue(mc.getMethod().getSourceDeclaration(), pos) and checkTrue = true
+    or
+    methodCheckFalse(mc.getMethod().getSourceDeclaration(), pos) and checkTrue = false
+  )
+}
+
+/**
+ * Holds if `mc` is a call to a method that checks that its argument `arg` is
+ * not null and throws otherwise.
+ */
+predicate methodCallChecksNotNull(MethodCall mc, Expr arg) {
+  exists(int pos | mc.getArgument(pos) = arg |
+    methodCheckNotNull(mc.getMethod().getSourceDeclaration(), pos)
+    or
+    methodCheckThat(mc.getMethod().getSourceDeclaration(), pos) and
+    mc.getAnArgument().(MethodCall).getMethod().getName() = "notNullValue"
+  )
+}
+
+/**
+ * Holds if `mc` is a call to a method that checks one of its arguments in some
+ * way and possibly throws.
+ */
+predicate methodCallChecksArgument(MethodCall mc) {
+  methodCallChecksBoolean(mc, _, _) or
+  methodCallChecksNotNull(mc, _)
+}
+
+/** Holds if `mc` is a call to a method that unconditionally throws. */
+predicate methodCallUnconditionallyThrows(MethodCall mc) {
+  methodUnconditionallyThrows(mc.getMethod().getSourceDeclaration()) or
+  exists(BooleanLiteral b | methodCallChecksBoolean(mc, b, b.getBooleanValue().booleanNot()))
+}
+
+/**
+ * DEPRECATED: Use `methodCallChecksBoolean` instead.
+ *
  * Holds if `m` is a non-overridable method that checks that its zero-indexed `argument`
  * is equal to `checkTrue` and throws otherwise.
  */
-predicate conditionCheckMethodArgument(Method m, int argument, boolean checkTrue) {
-  condtionCheckMethodGooglePreconditions(m, checkTrue) and argument = 0
+deprecated predicate conditionCheckMethodArgument(Method m, int argument, boolean checkTrue) {
+  methodCheckTrue(m, argument) and checkTrue = true
   or
-  conditionCheckMethodApacheCommonsLang3Validate(m, checkTrue) and argument = 0
-  or
-  condtionCheckMethodTestingFramework(m, argument, checkTrue)
-  or
-  exists(Parameter p, MethodCall ma, int argIndex, boolean ct, Expr arg |
-    p = m.getParameter(argument) and
-    not m.isOverridable() and
-    m.getBody().getStmt(0).(ExprStmt).getExpr() = ma and
-    conditionCheckArgument(ma, argIndex, ct) and
-    ma.getArgument(argIndex) = arg and
-    (
-      arg.(LogNotExpr).getExpr().(VarAccess).getVariable() = p and
-      checkTrue = ct.booleanNot()
-      or
-      arg.(VarAccess).getVariable() = p and checkTrue = ct
-    )
-  )
-  or
-  exists(Parameter p, IfStmt ifstmt, Expr cond |
-    p = m.getParameter(argument) and
-    not m.isOverridable() and
-    p.getType() instanceof BooleanType and
-    m.getBody().getStmt(0) = ifstmt and
-    ifstmt.getCondition() = cond and
-    (
-      cond.(LogNotExpr).getExpr().(VarAccess).getVariable() = p and checkTrue = true
-      or
-      cond.(VarAccess).getVariable() = p and checkTrue = false
-    ) and
-    (
-      ifstmt.getThen() instanceof ThrowStmt or
-      ifstmt.getThen().(SingletonBlock).getStmt() instanceof ThrowStmt
-    )
-  )
-}
-
-private predicate condtionCheckMethodGooglePreconditions(Method m, boolean checkTrue) {
-  m.getDeclaringType().hasQualifiedName("com.google.common.base", "Preconditions") and
-  checkTrue = true and
-  (m.hasName("checkArgument") or m.hasName("checkState"))
-}
-
-private predicate conditionCheckMethodApacheCommonsLang3Validate(Method m, boolean checkTrue) {
-  m.getDeclaringType().hasQualifiedName("org.apache.commons.lang3", "Validate") and
-  checkTrue = true and
-  (m.hasName("isTrue") or m.hasName("validState"))
-}
-
-/**
- * Holds if `m` is a non-overridable testing framework method that checks that its first argument
- * is equal to `checkTrue` and throws otherwise.
- */
-private predicate condtionCheckMethodTestingFramework(Method m, int argument, boolean checkTrue) {
-  argument = 0 and
-  (
-    m.getDeclaringType().hasQualifiedName("org.junit", "Assume") and
-    checkTrue = true and
-    m.hasName("assumeTrue")
-    or
-    m.getDeclaringType().hasQualifiedName("org.junit.jupiter.api", "Assertions") and
-    (
-      checkTrue = true and m.hasName("assertTrue")
-      or
-      checkTrue = false and m.hasName("assertFalse")
-    )
-    or
-    m.getDeclaringType().hasQualifiedName("org.junit.jupiter.api", "Assumptions") and
-    (
-      checkTrue = true and m.hasName("assumeTrue")
-      or
-      checkTrue = false and m.hasName("assumeFalse")
-    )
-  )
-  or
-  m.getDeclaringType().hasQualifiedName(["org.junit", "org.testng"], "Assert") and
-  m.getParameter(argument).getType() instanceof BooleanType and
-  (
-    checkTrue = true and m.hasName("assertTrue")
-    or
-    checkTrue = false and m.hasName("assertFalse")
-  )
+  methodCheckFalse(m, argument) and checkTrue = false
 }
 
 /**
+ * DEPRECATED: Use `methodCallChecksBoolean` instead.
+ *
  * Holds if `ma` is an access to a non-overridable method that checks that its
  * zero-indexed `argument` is equal to `checkTrue` and throws otherwise.
  */
-predicate conditionCheckArgument(MethodCall ma, int argument, boolean checkTrue) {
+deprecated predicate conditionCheckArgument(MethodCall ma, int argument, boolean checkTrue) {
   conditionCheckMethodArgument(ma.getMethod().getSourceDeclaration(), argument, checkTrue)
 }
diff --git a/java/ql/lib/semmle/code/java/dataflow/DataFlow.qll b/java/ql/lib/semmle/code/java/dataflow/DataFlow.qll
index 54eb809c7b9..c99a8a5a58e 100644
--- a/java/ql/lib/semmle/code/java/dataflow/DataFlow.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/DataFlow.qll
@@ -10,6 +10,6 @@ import java
 module DataFlow {
   private import semmle.code.java.dataflow.internal.DataFlowImplSpecific
   private import codeql.dataflow.DataFlow
-  import DataFlowMake<Location, JavaDataFlow>
+  import DataFlowMakeOverlay<Location, JavaDataFlow>
   import Public
 }
diff --git a/java/ql/lib/semmle/code/java/dataflow/IntegerGuards.qll b/java/ql/lib/semmle/code/java/dataflow/IntegerGuards.qll
index 042fd5194f2..ea2bce01e15 100644
--- a/java/ql/lib/semmle/code/java/dataflow/IntegerGuards.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/IntegerGuards.qll
@@ -10,7 +10,7 @@ private import RangeUtils
 private import RangeAnalysis
 
 /** Gets an expression that might have the value `i`. */
-private Expr exprWithIntValue(int i) {
+deprecated private Expr exprWithIntValue(int i) {
   result.(ConstantIntegerExpr).getIntValue() = i or
   result.(ChooseExpr).getAResultExpr() = exprWithIntValue(i)
 }
@@ -19,11 +19,11 @@ private Expr exprWithIntValue(int i) {
  * An expression for which the predicate `integerGuard` is relevant.
  * This includes `VarRead` and `MethodCall`.
  */
-class IntComparableExpr extends Expr {
+deprecated class IntComparableExpr extends Expr {
   IntComparableExpr() { this instanceof VarRead or this instanceof MethodCall }
 
   /** Gets an integer that is directly assigned to the expression in case of a variable; or zero. */
-  int relevantInt() {
+  deprecated int relevantInt() {
     exists(SsaExplicitUpdate ssa, SsaSourceVariable v |
       this = v.getAnAccess() and
       ssa.getSourceVariable() = v and
@@ -55,6 +55,9 @@ private predicate comparison(ComparisonExpr comp, boolean branch, Expr e1, Expr
  * Holds if `guard` evaluating to `branch` ensures that:
  * `e <= k` when `upper = true`
  * `e >= k` when `upper = false`
+ *
+ * Does _not_ include the constant comparison case where the guard directly
+ * ensures `e == k`.
  */
 pragma[nomagic]
 predicate rangeGuard(Expr guard, boolean branch, Expr e, int k, boolean upper) {
@@ -62,7 +65,8 @@ predicate rangeGuard(Expr guard, boolean branch, Expr e, int k, boolean upper) {
     eqtest = guard and
     eqtest.hasOperands(e, c) and
     bounded(c, any(ZeroBound zb), k, upper, _) and
-    branch = eqtest.polarity()
+    branch = eqtest.polarity() and
+    not c instanceof ConstantIntegerExpr
   )
   or
   exists(Expr c, int val, boolean strict, int d |
@@ -87,6 +91,30 @@ predicate rangeGuard(Expr guard, boolean branch, Expr e, int k, boolean upper) {
 }
 
 /**
+ * Gets an expression that directly tests whether a given expression, `e`, is
+ * non-zero.
+ */
+Expr nonZeroGuard(Expr e, boolean branch) {
+  exists(EqualityTest eqtest, boolean polarity, int k |
+    eqtest = result and
+    eqtest.hasOperands(e, any(ConstantIntegerExpr c | c.getIntValue() = k)) and
+    polarity = eqtest.polarity()
+  |
+    k = 0 and branch = polarity.booleanNot()
+    or
+    k != 0 and branch = polarity
+  )
+  or
+  exists(int val, boolean upper | rangeGuard(result, branch, e, val, upper) |
+    upper = true and val < 0 // e <= val < 0  ==>  e != 0
+    or
+    upper = false and val > 0 // e >= val > 0  ==>  e != 0
+  )
+}
+
+/**
+ * DEPRECATED.
+ *
  * An expression that directly tests whether a given expression is equal to `k` or not.
  * The set of `k`s is restricted to those that are relevant for the expression or
  * have a direct comparison with the expression.
@@ -95,7 +123,7 @@ predicate rangeGuard(Expr guard, boolean branch, Expr e, int k, boolean upper) {
  * is true, and different from `k` if `is_k` is false.
  */
 pragma[nomagic]
-Expr integerGuard(IntComparableExpr e, boolean branch, int k, boolean is_k) {
+deprecated Expr integerGuard(IntComparableExpr e, boolean branch, int k, boolean is_k) {
   exists(EqualityTest eqtest, boolean polarity |
     eqtest = result and
     eqtest.hasOperands(e, any(ConstantIntegerExpr c | c.getIntValue() = k)) and
@@ -119,13 +147,15 @@ Expr integerGuard(IntComparableExpr e, boolean branch, int k, boolean is_k) {
 }
 
 /**
+ * DEPRECATED: Use `rangeGuard` instead.
+ *
  * A guard that splits the values of a variable into one range with an upper bound of `k-1`
  * and one with a lower bound of `k`.
  *
  * If `branch_with_lower_bound_k` is true then `result` is equivalent to `k <= x`
  * and if it is false then `result` is equivalent to `k > x`.
  */
-Expr intBoundGuard(VarRead x, boolean branch_with_lower_bound_k, int k) {
+deprecated Expr intBoundGuard(VarRead x, boolean branch_with_lower_bound_k, int k) {
   exists(ComparisonExpr comp, ConstantIntegerExpr c, int val |
     comp = result and
     comp.hasOperands(x, c) and
diff --git a/java/ql/lib/semmle/code/java/dataflow/Nullness.qll b/java/ql/lib/semmle/code/java/dataflow/Nullness.qll
index 02f228d17db..c9f5ad4f781 100644
--- a/java/ql/lib/semmle/code/java/dataflow/Nullness.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/Nullness.qll
@@ -9,49 +9,31 @@
 overlay[local?]
 module;
 
-/*
- * Implementation details:
- *
- * The three exported predicates, `nullDeref`, `alwaysNullDeref`, and
- * `superfluousNullGuard`, compute potential null dereferences, definite null
- * dereferences, and superfluous null checks, respectively.  The bulk of the
- * library supports `nullDeref`, while the latter two are fairly simple in
- * comparison.
- *
- * The NPE (NullPointerException) candidates are computed by
- * `nullDerefCandidate` and consist of three parts: A variable definition that
- * might be null as computed by `varMaybeNull`, a dereference that can cause a
- * NPE as computed by `firstVarDereferenceInBlock`, and a control flow path
- * between the two points.  The path is computed by `varMaybeNullInBlock`,
- * which is the transitive closure of the step relation `nullVarStep`
- * originating in a definition given by `varMaybeNull`.  The step relation
- * `nullVarStep` is essentially just the successor relation on basic blocks
- * restricted to exclude edges along which the variable cannot be null.
- *
- * The step relation `nullVarStep` is then reused twice to produce two
- * refinements of the path reachability predicate `varMaybeNullInBlock` in
- * order to prune impossible paths that would otherwise lead to a potential
- * NPE.  These two refinements are `varMaybeNullInBlock_corrCond` and
- * `varMaybeNullInBlock_trackVar` and are described in further detail below.
- */
-
 import java
 private import SSA
 private import semmle.code.java.controlflow.Guards
-private import RangeUtils
 private import IntegerGuards
 private import NullGuards
 private import semmle.code.java.Collections
-private import semmle.code.java.frameworks.Assertions
+private import semmle.code.java.controlflow.internal.Preconditions
+private import semmle.code.java.controlflow.ControlFlowReachability
 
 /** Gets an expression that may be `null`. */
-Expr nullExpr() {
-  result instanceof NullLiteral or
-  result.(ChooseExpr).getAResultExpr() = nullExpr() or
-  result.(AssignExpr).getSource() = nullExpr() or
-  result.(CastExpr).getExpr() = nullExpr() or
-  result.(ImplicitCastExpr).getExpr() = nullExpr() or
-  result instanceof SafeCastExpr
+Expr nullExpr() { result = nullExpr(_) }
+
+/** Gets an expression that may be `null`. */
+private Expr nullExpr(Expr reason) {
+  result instanceof NullLiteral and reason = result
+  or
+  result.(ChooseExpr).getAResultExpr() = nullExpr(reason)
+  or
+  result.(AssignExpr).getSource() = nullExpr(reason)
+  or
+  result.(CastExpr).getExpr() = nullExpr(reason)
+  or
+  result.(ImplicitCastExpr).getExpr() = nullExpr(reason)
+  or
+  result instanceof SafeCastExpr and reason = result
 }
 
 /** An expression of a boxed type that is implicitly unboxed. */
@@ -137,58 +119,29 @@ private ControlFlowNode varDereference(SsaVariable v, VarAccess va) {
 }
 
 /**
- * A `ControlFlowNode` that ensures that the SSA variable is not null in any
- * subsequent use, either by dereferencing it or by an assertion.
- */
-private ControlFlowNode ensureNotNull(SsaVariable v) {
-  result = varDereference(v, _)
-  or
-  exists(AssertTrueMethod m | result.asCall() = m.getACheck(directNullGuard(v, true, false)))
-  or
-  exists(AssertFalseMethod m | result.asCall() = m.getACheck(directNullGuard(v, false, false)))
-  or
-  exists(AssertNotNullMethod m | result.asCall() = m.getACheck(v.getAUse()))
-  or
-  exists(AssertThatMethod m, MethodCall ma |
-    result.asCall() = m.getACheck(v.getAUse()) and ma.getControlFlowNode() = result
-  |
-    ma.getAnArgument().(MethodCall).getMethod().getName() = "notNullValue"
-  )
-}
-
-/**
- * A variable dereference that cannot be reached by a `null` value, because of an earlier
- * dereference or assertion in the same `BasicBlock`.
- */
-private predicate unreachableVarDereference(BasicBlock bb, SsaVariable v, ControlFlowNode varDeref) {
-  exists(ControlFlowNode n, int i, int j |
-    (n = ensureNotNull(v) or assertFail(bb, n)) and
-    varDeref = varDereference(v, _) and
-    bb.getNode(i) = n and
-    bb.getNode(j) = varDeref and
-    i < j
-  )
-}
-
-/**
- * The first dereference of a variable in a given `BasicBlock` excluding those dereferences
- * that are preceded by a not-null assertion or a trivially failing assertion.
+ * The first dereference of a variable in a given `BasicBlock`.
  */
 private predicate firstVarDereferenceInBlock(BasicBlock bb, SsaVariable v, VarAccess va) {
   exists(ControlFlowNode n |
     varDereference(v, va) = n and
     n.getBasicBlock() = bb and
-    not unreachableVarDereference(bb, v, n)
+    n =
+      min(ControlFlowNode n0, int i |
+        varDereference(v, _) = n0 and bb.getNode(i) = n0
+      |
+        n0 order by i
+      )
   )
 }
 
 /** A variable suspected of being `null`. */
-private predicate varMaybeNull(SsaVariable v, string msg, Expr reason) {
+private predicate varMaybeNull(SsaVariable v, ControlFlowNode node, string msg, Expr reason) {
   // A variable compared to null might be null.
   exists(Expr e |
     reason = e and
     msg = "as suggested by $@ null guard" and
     guardSuggestsVarMaybeNull(e, v) and
+    node = v.getCfgNode() and
     not v instanceof SsaPhiNode and
     not clearlyNotNull(v) and
     // Comparisons in finally blocks are excluded since missing exception edges in the CFG could otherwise yield FPs.
@@ -204,6 +157,7 @@ private predicate varMaybeNull(SsaVariable v, string msg, Expr reason) {
   // A parameter might be null if there is a null argument somewhere.
   exists(Parameter p, Expr arg |
     v.(SsaImplicitInit).isParameterDefinition(p) and
+    node = v.getCfgNode() and
     p.getAnArgument() = arg and
     reason = arg and
     msg = "because of $@ null argument" and
@@ -214,7 +168,7 @@ private predicate varMaybeNull(SsaVariable v, string msg, Expr reason) {
   // If the source of a variable is null then the variable may be null.
   exists(VariableAssign def |
     v.(SsaExplicitUpdate).getDefiningExpr() = def and
-    def.getSource() = nullExpr() and
+    def.getSource() = nullExpr(node.asExpr()) and
     reason = def and
     msg = "because of $@ assignment"
   )
@@ -236,7 +190,7 @@ private Expr nonEmptyExpr() {
     // ...or it is guarded by a condition proving its length to be non-zero.
     exists(ConditionBlock cond, boolean branch, FieldAccess length |
       cond.controls(result.getBasicBlock(), branch) and
-      cond.getCondition() = integerGuard(length, branch, 0, false) and
+      cond.getCondition() = nonZeroGuard(length, branch) and
       length.getField().hasName("length") and
       length.getQualifier() = v.getAUse()
     )
@@ -266,7 +220,7 @@ private Expr nonEmptyExpr() {
       or
       // ...or a check on its `size`.
       exists(MethodCall size |
-        c = integerGuard(size, branch, 0, false) and
+        c = nonZeroGuard(size, branch) and
         size.getMethod().hasName("size") and
         size.getQualifier() = v.getAUse()
       )
@@ -294,536 +248,29 @@ private predicate impossibleEdge(BasicBlock bb1, BasicBlock bb2) {
   )
 }
 
-/** A control flow edge that leaves a finally-block. */
-private predicate leavingFinally(BasicBlock bb1, BasicBlock bb2, boolean normaledge) {
-  exists(TryStmt try, BlockStmt finally |
-    try.getFinally() = finally and
-    bb1.getASuccessor() = bb2 and
-    bb1.getFirstNode().getEnclosingStmt().getEnclosingStmt*() = finally and
-    not bb2.getFirstNode().getEnclosingStmt().getEnclosingStmt*() = finally and
-    if bb1.getLastNode().getANormalSuccessor() = bb2.getFirstNode()
-    then normaledge = true
-    else normaledge = false
-  )
+private module NullnessConfig implements ControlFlowReachability::ConfigSig {
+  predicate source(ControlFlowNode node, SsaVariable def) { varMaybeNull(def, node, _, _) }
+
+  predicate sink(ControlFlowNode node, SsaVariable def) { varDereference(def, _) = node }
+
+  predicate barrierValue(GuardValue gv) { gv.isNullness(false) }
+
+  predicate barrierEdge(BasicBlock bb1, BasicBlock bb2) { impossibleEdge(bb1, bb2) }
+
+  predicate uncertainFlow() { none() }
 }
 
-private predicate ssaSourceVarMaybeNull(SsaSourceVariable v) {
-  varMaybeNull(v.getAnSsaVariable(), _, _)
-}
+private module NullnessFlow = ControlFlowReachability::Flow<NullnessConfig>;
 
 /**
- * The step relation for propagating that a given SSA variable might be `null` in a given `BasicBlock`.
- *
- * If `midssa` is null in `mid` then `ssa` might be null in `bb`. The SSA variables share the same
- * `SsaSourceVariable`.
- *
- * A boolean flag tracks whether a non-normal completion is waiting to resume upon the exit of a finally-block.
- * If the flag is set, then the normal edge out of the finally-block is prohibited, but if it is not set then
- * no knowledge is assumed of any potentially waiting completions. `midstoredcompletion` is the flag before
- * the step and `storedcompletion` is the flag after the step.
- */
-private predicate nullVarStep(
-  SsaVariable midssa, BasicBlock mid, boolean midstoredcompletion, SsaVariable ssa, BasicBlock bb,
-  boolean storedcompletion
-) {
-  exists(SsaSourceVariable v |
-    ssaSourceVarMaybeNull(v) and
-    midssa.getSourceVariable() = v
-  |
-    ssa.(SsaPhiNode).getAPhiInput() = midssa and ssa.getBasicBlock() = bb
-    or
-    ssa = midssa and
-    not exists(SsaPhiNode phi | phi.getSourceVariable() = v and phi.getBasicBlock() = bb)
-  ) and
-  (midstoredcompletion = true or midstoredcompletion = false) and
-  midssa.isLiveAtEndOfBlock(mid) and
-  not ensureNotNull(midssa).getBasicBlock() = mid and
-  not assertFail(mid, _) and
-  bb = mid.getASuccessor() and
-  not impossibleEdge(mid, bb) and
-  not nullGuardControlsBranchEdge(midssa, false, mid, bb) and
-  not (leavingFinally(mid, bb, true) and midstoredcompletion = true) and
-  if bb.getFirstNode().asStmt() = any(TryStmt try | | try.getFinally())
-  then
-    if bb.getFirstNode() = mid.getLastNode().getANormalSuccessor()
-    then storedcompletion = false
-    else storedcompletion = true
-  else
-    if leavingFinally(mid, bb, _)
-    then storedcompletion = false
-    else storedcompletion = midstoredcompletion
-}
-
-/**
- * The transitive closure of `nullVarStep` originating from `varMaybeNull`. That is, those `BasicBlock`s
- * for which the SSA variable is suspected of being `null`.
- */
-private predicate varMaybeNullInBlock(
-  SsaVariable ssa, SsaSourceVariable v, BasicBlock bb, boolean storedcompletion
-) {
-  varMaybeNull(ssa, _, _) and
-  bb = ssa.getBasicBlock() and
-  storedcompletion = false and
-  v = ssa.getSourceVariable()
-  or
-  exists(BasicBlock mid, SsaVariable midssa, boolean midstoredcompletion |
-    varMaybeNullInBlock(midssa, v, mid, midstoredcompletion) and
-    nullVarStep(midssa, mid, midstoredcompletion, ssa, bb, storedcompletion)
-  )
-}
-
-/**
- * Holds if `v` is a source variable that might reach a potential `null`
- * dereference.
- */
-private predicate nullDerefCandidateVariable(SsaSourceVariable v) {
-  exists(SsaVariable ssa, BasicBlock bb |
-    firstVarDereferenceInBlock(bb, ssa, _) and
-    varMaybeNullInBlock(ssa, v, bb, _)
-  )
-}
-
-private predicate varMaybeNullInBlock_origin(
-  SsaVariable origin, SsaVariable ssa, BasicBlock bb, boolean storedcompletion
-) {
-  nullDerefCandidateVariable(ssa.getSourceVariable()) and
-  varMaybeNull(ssa, _, _) and
-  bb = ssa.getBasicBlock() and
-  storedcompletion = false and
-  origin = ssa
-  or
-  exists(BasicBlock mid, SsaVariable midssa, boolean midstoredcompletion |
-    varMaybeNullInBlock_origin(origin, midssa, mid, midstoredcompletion) and
-    nullVarStep(midssa, mid, midstoredcompletion, ssa, bb, storedcompletion)
-  )
-}
-
-/**
- * A potential `null` dereference. That is, the first dereference of a variable in a block
- * where it is suspected of being `null`.
- */
-private predicate nullDerefCandidate(SsaVariable origin, VarAccess va) {
-  exists(SsaVariable ssa, BasicBlock bb |
-    firstVarDereferenceInBlock(bb, ssa, va) and
-    varMaybeNullInBlock_origin(origin, ssa, bb, _)
-  )
-}
-
-/*
- * In the following, the potential `null` dereference candidates are pruned by proving that
- * a `NullPointerException` (NPE) cannot occur. This is done by pruning the control-flow paths
- * that lead to the NPE candidate in two ways:
- *
- * 1. For each set of correlated conditions that are passed by the path, consistent
- *    branches must be taken. For example, the following code is safe due to the two tests on
- *    `flag` begin correlated.
- *    ```
- *    x = null;
- *    if (flag) x = new A();
- *    if (flag) x.m();
- *    ```
- *
- * 2. For each other variable that changes its value alongside the potential NPE candidate,
- *    the passed conditions must be consistent with its value. For example, the following
- *    code is safe due to the value of `t`.
- *    ```
- *    x = null;
- *    t = null;
- *    if (...) { x = new A(); t = new B(); }
- *    if (t != null) x.m();
- *    ```
- *    We call such a variable a _tracking variable_ as it tracks the null-ness of `x`.
- */
-
-/** A variable that is assigned `null` if the given condition takes the given branch. */
-private predicate varConditionallyNull(SsaExplicitUpdate v, ConditionBlock cond, boolean branch) {
-  exists(ConditionalExpr condexpr |
-    v.getDefiningExpr().(VariableAssign).getSource() = condexpr and
-    condexpr.getCondition() = cond.getCondition()
-  |
-    condexpr.getBranchExpr(branch) = nullExpr() and
-    not condexpr.getBranchExpr(branch.booleanNot()) = nullExpr()
-  )
-  or
-  v.getDefiningExpr().(VariableAssign).getSource() = nullExpr() and
-  cond.controls(v.getBasicBlock(), branch)
-}
-
-/**
- * A condition that might be useful in proving an NPE candidate safe.
- *
- * This is a condition along the path that found the NPE candidate.
- */
-private predicate interestingCond(SsaSourceVariable npecand, ConditionBlock cond) {
-  nullDerefCandidateVariable(npecand) and
-  (
-    varMaybeNullInBlock(_, npecand, cond, _) or
-    varConditionallyNull(npecand.getAnSsaVariable(), cond, _)
-  ) and
-  not cond.getCondition().(Expr).getAChildExpr*() = npecand.getAnAccess()
-}
-
-pragma[nomagic]
-private ConditionBlock ssaIntegerGuard(SsaVariable v, boolean branch, int k, boolean is_k) {
-  result.getCondition() = integerGuard(v.getAUse(), branch, k, is_k)
-}
-
-pragma[nomagic]
-private ConditionBlock ssaIntBoundGuard(SsaVariable v, boolean branch_with_lower_bound_k, int k) {
-  result.getCondition() = intBoundGuard(v.getAUse(), branch_with_lower_bound_k, k)
-}
-
-pragma[nomagic]
-private ConditionBlock ssaEnumConstEquality(SsaVariable v, boolean polarity, EnumConstant c) {
-  result.getCondition() = enumConstEquality(v.getAUse(), polarity, c)
-}
-
-private predicate conditionChecksNull(ConditionBlock cond, SsaVariable v, boolean branchIsNull) {
-  nullGuardControlsBranchEdge(v, true, cond, cond.getTestSuccessor(branchIsNull)) and
-  nullGuardControlsBranchEdge(v, false, cond, cond.getTestSuccessor(branchIsNull.booleanNot()))
-}
-
-/** A pair of correlated conditions for a given NPE candidate. */
-private predicate correlatedConditions(
-  SsaSourceVariable npecand, ConditionBlock cond1, ConditionBlock cond2, boolean inverted
-) {
-  interestingCond(npecand, cond1) and
-  interestingCond(npecand, cond2) and
-  cond1 != cond2 and
-  (
-    exists(SsaVariable v |
-      cond1.getCondition() = v.getAUse() and
-      cond2.getCondition() = v.getAUse() and
-      inverted = false
-    )
-    or
-    exists(SsaVariable v, boolean branch1, boolean branch2 |
-      conditionChecksNull(cond1, v, branch1) and
-      conditionChecksNull(cond2, v, branch2) and
-      inverted = branch1.booleanXor(branch2)
-    )
-    or
-    exists(SsaVariable v, int k, boolean branch1, boolean branch2 |
-      cond1 = ssaIntegerGuard(v, branch1, k, true) and
-      cond1 = ssaIntegerGuard(v, branch1.booleanNot(), k, false) and
-      cond2 = ssaIntegerGuard(v, branch2, k, true) and
-      cond2 = ssaIntegerGuard(v, branch2.booleanNot(), k, false) and
-      inverted = branch1.booleanXor(branch2)
-    )
-    or
-    exists(SsaVariable v, int k, boolean branch1, boolean branch2 |
-      cond1 = ssaIntBoundGuard(v, branch1, k) and
-      cond2 = ssaIntBoundGuard(v, branch2, k) and
-      inverted = branch1.booleanXor(branch2)
-    )
-    or
-    exists(SsaVariable v, EnumConstant c, boolean pol1, boolean pol2 |
-      cond1 = ssaEnumConstEquality(v, pol1, c) and
-      cond2 = ssaEnumConstEquality(v, pol2, c) and
-      inverted = pol1.booleanXor(pol2)
-    )
-    or
-    exists(SsaVariable v, RefType type |
-      cond1.getCondition() = instanceofExpr(v, type) and
-      cond2.getCondition() = instanceofExpr(v, type) and
-      inverted = false
-    )
-    or
-    exists(SsaVariable v1, SsaVariable v2, boolean branch1, boolean branch2 |
-      cond1.getCondition() = varEqualityTestExpr(v1, v2, branch1) and
-      cond2.getCondition() = varEqualityTestExpr(v1, v2, branch2) and
-      inverted = branch1.booleanXor(branch2)
-    )
-  )
-}
-
-/**
- * This is again the transitive closure of `nullVarStep` similarly to `varMaybeNullInBlock`, but
- * this time restricted based on pairs of correlated conditions consistent with `cond1`
- * evaluating to `branch`.
- */
-private predicate varMaybeNullInBlock_corrCond(
-  SsaVariable origin, SsaVariable ssa, BasicBlock bb, boolean storedcompletion,
-  ConditionBlock cond1, boolean branch
-) {
-  exists(SsaSourceVariable npecand | npecand = ssa.getSourceVariable() |
-    nullDerefCandidateVariable(npecand) and correlatedConditions(npecand, cond1, _, _)
-  ) and
-  (
-    varConditionallyNull(ssa, cond1, branch)
-    or
-    not varConditionallyNull(ssa, cond1, _) and
-    (branch = true or branch = false)
-  ) and
-  varMaybeNull(ssa, _, _) and
-  bb = ssa.getBasicBlock() and
-  storedcompletion = false and
-  origin = ssa
-  or
-  exists(BasicBlock mid, SsaVariable midssa, boolean midstoredcompletion |
-    varMaybeNullInBlock_corrCond(origin, midssa, mid, midstoredcompletion, cond1, branch) and
-    (
-      cond1 = mid and cond1.getTestSuccessor(branch) = bb
-      or
-      exists(ConditionBlock cond2, boolean inverted, boolean branch2 |
-        cond2 = mid and
-        correlatedConditions(_, cond1, cond2, inverted) and
-        cond2.getTestSuccessor(branch2) = bb and
-        branch = branch2.booleanXor(inverted)
-      )
-      or
-      cond1 != mid and
-      not exists(ConditionBlock cond2 | cond2 = mid and correlatedConditions(_, cond1, cond2, _))
-    ) and
-    nullVarStep(midssa, mid, midstoredcompletion, ssa, bb, storedcompletion)
-  )
-}
-
-/*
- * A tracking variable has its possible values divided into two sets, A and B, for
- * which we can attribute at least one direct assignment to be contained in either
- * A or B.
- * Four kinds are supported:
- * - null: A means null and B means non-null.
- * - boolean: A means true and B means false.
- * - enum: A means a specific enum constant and B means any other value.
- * - int: A means a specific integer value and B means any other value.
- */
-
-private newtype TrackVarKind =
-  TrackVarKindNull() or
-  TrackVarKindBool() or
-  TrackVarKindEnum() or
-  TrackVarKindInt()
-
-/** A variable that might be relevant as a tracking variable for the NPE candidate. */
-private predicate trackingVar(
-  SsaSourceVariable npecand, SsaExplicitUpdate trackssa, SsaSourceVariable trackvar,
-  TrackVarKind kind, Expr init
-) {
-  exists(ConditionBlock cond |
-    interestingCond(npecand, cond) and
-    varMaybeNullInBlock(_, npecand, cond, _) and
-    cond.getCondition().(Expr).getAChildExpr*() = trackvar.getAnAccess() and
-    trackssa.getSourceVariable() = trackvar and
-    trackssa.getDefiningExpr().(VariableAssign).getSource() = init
-  |
-    init instanceof NullLiteral and kind = TrackVarKindNull()
-    or
-    init = clearlyNotNullExpr() and kind = TrackVarKindNull()
-    or
-    init instanceof BooleanLiteral and kind = TrackVarKindBool()
-    or
-    init.(VarAccess).getVariable() instanceof EnumConstant and kind = TrackVarKindEnum()
-    or
-    exists(init.(ConstantIntegerExpr).getIntValue()) and kind = TrackVarKindInt()
-  )
-}
-
-/** Gets an expression that tests the value of a given tracking variable. */
-private Expr trackingVarGuard(
-  SsaVariable trackssa, SsaSourceVariable trackvar, TrackVarKind kind, boolean branch, boolean isA
-) {
-  exists(Expr init | trackingVar(_, trackssa, trackvar, kind, init) |
-    result = basicNullGuard(trackvar.getAnAccess(), branch, isA) and
-    kind = TrackVarKindNull()
-    or
-    result = trackvar.getAnAccess() and
-    kind = TrackVarKindBool() and
-    (branch = true or branch = false) and
-    isA = branch
-    or
-    exists(boolean polarity, EnumConstant c, EnumConstant initc |
-      initc.getAnAccess() = init and
-      kind = TrackVarKindEnum() and
-      result = enumConstEquality(trackvar.getAnAccess(), polarity, c) and
-      (
-        initc = c and branch = polarity.booleanNot() and isA = false
-        or
-        initc = c and branch = polarity and isA = true
-        or
-        initc != c and branch = polarity and isA = false
-      )
-    )
-    or
-    exists(int k |
-      init.(ConstantIntegerExpr).getIntValue() = k and
-      kind = TrackVarKindInt()
-    |
-      result = integerGuard(trackvar.getAnAccess(), branch, k, isA)
-      or
-      exists(int k2 |
-        result = integerGuard(trackvar.getAnAccess(), branch.booleanNot(), k2, true) and
-        isA = false and
-        k2 != k
-      )
-      or
-      exists(int bound, boolean branch_with_lower_bound |
-        result = intBoundGuard(trackvar.getAnAccess(), branch_with_lower_bound, bound) and
-        isA = false
-      |
-        branch = branch_with_lower_bound and k < bound
-        or
-        branch = branch_with_lower_bound.booleanNot() and bound <= k
-      )
-    )
-  )
-  or
-  exists(EqualityTest eqtest, boolean branch0, boolean polarity, BooleanLiteral boollit |
-    eqtest = result and
-    eqtest.hasOperands(trackingVarGuard(trackssa, trackvar, kind, branch0, isA), boollit) and
-    eqtest.polarity() = polarity and
-    branch = branch0.booleanXor(polarity).booleanXor(boollit.getBooleanValue())
-  )
-}
-
-/** An update to a tracking variable that is contained fully in either A or B. */
-private predicate isReset(
-  SsaVariable trackssa, SsaSourceVariable trackvar, TrackVarKind kind, SsaExplicitUpdate update,
-  boolean isA
-) {
-  exists(Expr init, Expr e |
-    trackingVar(_, trackssa, trackvar, kind, init) and
-    update.getSourceVariable() = trackvar and
-    e = update.getDefiningExpr().(VariableAssign).getSource()
-  |
-    e instanceof NullLiteral and kind = TrackVarKindNull() and isA = true
-    or
-    e = clearlyNotNullExpr() and kind = TrackVarKindNull() and isA = false
-    or
-    e.(BooleanLiteral).getBooleanValue() = isA and kind = TrackVarKindBool()
-    or
-    e.(VarAccess).getVariable().(EnumConstant) = init.(VarAccess).getVariable() and
-    kind = TrackVarKindEnum() and
-    isA = true
-    or
-    e.(VarAccess).getVariable().(EnumConstant) != init.(VarAccess).getVariable() and
-    kind = TrackVarKindEnum() and
-    isA = false
-    or
-    e.(ConstantIntegerExpr).getIntValue() = init.(ConstantIntegerExpr).getIntValue() and
-    kind = TrackVarKindInt() and
-    isA = true
-    or
-    e.(ConstantIntegerExpr).getIntValue() != init.(ConstantIntegerExpr).getIntValue() and
-    kind = TrackVarKindInt() and
-    isA = false
-  )
-}
-
-/** The abstract value of the tracked variable. */
-private newtype TrackedValue =
-  TrackedValueA() or
-  TrackedValueB() or
-  TrackedValueUnknown()
-
-private TrackedValue trackValAorB(boolean isA) {
-  isA = true and result = TrackedValueA()
-  or
-  isA = false and result = TrackedValueB()
-}
-
-/** A control flow edge passing through a condition that implies a specific value for a tracking variable. */
-private predicate stepImplies(
-  BasicBlock bb1, BasicBlock bb2, SsaVariable trackssa, SsaSourceVariable trackvar,
-  TrackVarKind kind, boolean isA
-) {
-  exists(ConditionBlock cond, boolean branch |
-    cond = bb1 and
-    cond.getTestSuccessor(branch) = bb2 and
-    cond.getCondition() = trackingVarGuard(trackssa, trackvar, kind, branch, isA)
-  )
-}
-
-/**
- * This is again the transitive closure of `nullVarStep` similarly to `varMaybeNullInBlock`, but
- * this time restricted based on a tracking variable.
- */
-private predicate varMaybeNullInBlock_trackVar(
-  SsaVariable origin, SsaVariable ssa, BasicBlock bb, boolean storedcompletion,
-  SsaVariable trackssa, SsaSourceVariable trackvar, TrackVarKind kind, TrackedValue trackvalue
-) {
-  exists(SsaSourceVariable npecand | npecand = ssa.getSourceVariable() |
-    nullDerefCandidateVariable(npecand) and trackingVar(npecand, trackssa, trackvar, kind, _)
-  ) and
-  (
-    exists(SsaVariable init, boolean isA |
-      init.getSourceVariable() = trackvar and
-      init.isLiveAtEndOfBlock(bb) and
-      isReset(trackssa, trackvar, kind, init, isA) and
-      trackvalue = trackValAorB(isA)
-    )
-    or
-    trackvalue = TrackedValueUnknown() and
-    not exists(SsaVariable init |
-      init.getSourceVariable() = trackvar and
-      init.isLiveAtEndOfBlock(bb) and
-      isReset(trackssa, trackvar, kind, init, _)
-    )
-  ) and
-  varMaybeNull(ssa, _, _) and
-  bb = ssa.getBasicBlock() and
-  storedcompletion = false and
-  origin = ssa
-  or
-  exists(BasicBlock mid, SsaVariable midssa, boolean midstoredcompletion, TrackedValue trackvalue0 |
-    varMaybeNullInBlock_trackVar(origin, midssa, mid, midstoredcompletion, trackssa, trackvar, kind,
-      trackvalue0) and
-    nullVarStep(midssa, mid, midstoredcompletion, ssa, bb, storedcompletion) and
-    (
-      trackvalue0 = TrackedValueUnknown()
-      or
-      // A step that implies a value that contradicts the current value is not allowed.
-      exists(boolean isA | trackvalue0 = trackValAorB(isA) |
-        not stepImplies(mid, bb, trackssa, trackvar, kind, isA.booleanNot())
-      )
-    ) and
-    (
-      // If no update occurs then the tracked value is unchanged unless the step implies a given value via a condition.
-      not exists(SsaUpdate update |
-        update.getSourceVariable() = trackvar and
-        update.getBasicBlock() = bb
-      ) and
-      (
-        exists(boolean isA | stepImplies(mid, bb, trackssa, trackvar, kind, isA) |
-          trackvalue = trackValAorB(isA)
-        )
-        or
-        not stepImplies(mid, bb, trackssa, trackvar, kind, _) and trackvalue = trackvalue0
-      )
-      or
-      // If an update occurs then the tracked value is set accordingly.
-      exists(SsaUpdate update |
-        update.getSourceVariable() = trackvar and
-        update.getBasicBlock() = bb
-      |
-        exists(boolean isA | isReset(trackssa, trackvar, kind, update, isA) |
-          trackvalue = trackValAorB(isA)
-        )
-        or
-        not isReset(trackssa, trackvar, kind, update, _) and trackvalue = TrackedValueUnknown()
-      )
-    )
-  )
-}
-
-/**
- * A potential `null` dereference that has not been proven safe.
+ * Holds if the dereference of `v` at `va` might be `null`.
  */
 predicate nullDeref(SsaSourceVariable v, VarAccess va, string msg, Expr reason) {
-  exists(SsaVariable origin, SsaVariable ssa, BasicBlock bb |
-    nullDerefCandidate(origin, va) and
-    varMaybeNull(origin, msg, reason) and
+  exists(SsaVariable origin, SsaVariable ssa, ControlFlowNode src, ControlFlowNode sink |
+    varMaybeNull(origin, src, msg, reason) and
+    NullnessFlow::flow(src, origin, sink, ssa) and
     ssa.getSourceVariable() = v and
-    firstVarDereferenceInBlock(bb, ssa, va) and
-    forall(ConditionBlock cond | correlatedConditions(v, cond, _, _) |
-      varMaybeNullInBlock_corrCond(origin, ssa, bb, _, cond, _)
-    ) and
-    forall(SsaVariable guardssa, SsaSourceVariable guardvar, TrackVarKind kind |
-      trackingVar(v, guardssa, guardvar, kind, _)
-    |
-      varMaybeNullInBlock_trackVar(origin, ssa, bb, _, guardssa, guardvar, kind, _)
-    )
+    varDereference(ssa, va) = sink
   )
 }
 
diff --git a/java/ql/lib/semmle/code/java/dataflow/SSA.qll b/java/ql/lib/semmle/code/java/dataflow/SSA.qll
index dd902b70e35..40da9a4e94d 100644
--- a/java/ql/lib/semmle/code/java/dataflow/SSA.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/SSA.qll
@@ -253,17 +253,18 @@ class SsaImplicitUpdate extends SsaUpdate {
     or
     if this.hasImplicitQualifierUpdate()
     then
-      if exists(this.getANonLocalUpdate())
+      if isNonLocal(this)
       then result = "nonlocal + nonlocal qualifier"
       else result = "nonlocal qualifier"
     else (
-      exists(this.getANonLocalUpdate()) and result = "nonlocal"
+      isNonLocal(this) and result = "nonlocal"
     )
   }
 
   /**
    * Gets a reachable `FieldWrite` that might represent this ssa update, if any.
    */
+  overlay[global]
   FieldWrite getANonLocalUpdate() {
     exists(SsaSourceField f, Callable setter |
       relevantFieldUpdate(setter, f.getField(), result) and
@@ -287,6 +288,11 @@ class SsaImplicitUpdate extends SsaUpdate {
   }
 }
 
+overlay[global]
+private predicate isNonLocalImpl(SsaImplicitUpdate su) { exists(su.getANonLocalUpdate()) }
+
+private predicate isNonLocal(SsaImplicitUpdate su) = forceLocal(isNonLocalImpl/1)(su)
+
 /**
  * An SSA variable that represents an uncertain implicit update of the value.
  * This is a `Call` that might reach a non-local update of the field or one of
@@ -330,6 +336,9 @@ class SsaPhiNode extends SsaVariable instanceof PhiNode {
   /** Gets an input to the phi node defining the SSA variable. */
   SsaVariable getAPhiInput() { this.hasInputFromBlock(result, _) }
 
+  /** Gets an input to the phi node defining the SSA variable. */
+  SsaVariable getAnInput() { this.hasInputFromBlock(result, _) }
+
   /** Holds if `inp` is an input to the phi node along the edge originating in `bb`. */
   predicate hasInputFromBlock(SsaVariable inp, BasicBlock bb) {
     phiHasInputFromBlock(this, inp, bb)
diff --git a/java/ql/lib/semmle/code/java/dataflow/TaintTracking.qll b/java/ql/lib/semmle/code/java/dataflow/TaintTracking.qll
index 159604a95bd..34c7b717428 100644
--- a/java/ql/lib/semmle/code/java/dataflow/TaintTracking.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/TaintTracking.qll
@@ -13,5 +13,5 @@ module TaintTracking {
   private import semmle.code.java.dataflow.internal.DataFlowImplSpecific
   private import semmle.code.java.dataflow.internal.TaintTrackingImplSpecific
   private import codeql.dataflow.TaintTracking
-  import TaintFlowMake<Location, JavaDataFlow, JavaTaintTracking>
+  import TaintFlowMakeOverlay<Location, JavaDataFlow, JavaTaintTracking>
 }
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/BaseSSA.qll b/java/ql/lib/semmle/code/java/dataflow/internal/BaseSSA.qll
index 5c0fbb88d66..5a818d18b85 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/BaseSSA.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/BaseSSA.qll
@@ -157,17 +157,7 @@ private module BaseSsaImpl {
 
 private import BaseSsaImpl
 
-private module SsaInput implements SsaImplCommon::InputSig<Location> {
-  private import java as J
-
-  class BasicBlock = J::BasicBlock;
-
-  class ControlFlowNode = J::ControlFlowNode;
-
-  BasicBlock getImmediateBasicBlockDominator(BasicBlock bb) { result.immediatelyDominates(bb) }
-
-  BasicBlock getABasicBlockSuccessor(BasicBlock bb) { result = bb.getASuccessor() }
-
+private module SsaInput implements SsaImplCommon::InputSig<Location, BasicBlock> {
   class SourceVariable = BaseSsaSourceVariable;
 
   /**
@@ -199,7 +189,7 @@ private module SsaInput implements SsaImplCommon::InputSig<Location> {
   }
 }
 
-private module Impl = SsaImplCommon::Make<Location, SsaInput>;
+private module Impl = SsaImplCommon::Make<Location, Cfg, SsaInput>;
 
 private import Cached
 
@@ -376,6 +366,9 @@ class BaseSsaPhiNode extends BaseSsaVariable instanceof Impl::PhiNode {
   /** Gets an input to the phi node defining the SSA variable. */
   BaseSsaVariable getAPhiInput() { this.hasInputFromBlock(result, _) }
 
+  /** Gets an input to the phi node defining the SSA variable. */
+  BaseSsaVariable getAnInput() { this.hasInputFromBlock(result, _) }
+
   /** Holds if `inp` is an input to the phi node along the edge originating in `bb`. */
   predicate hasInputFromBlock(BaseSsaVariable inp, BasicBlock bb) {
     phiHasInputFromBlock(this, inp, bb)
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/ContainerFlow.qll b/java/ql/lib/semmle/code/java/dataflow/internal/ContainerFlow.qll
index f9313959226..5af24642477 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/ContainerFlow.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/ContainerFlow.qll
@@ -470,7 +470,8 @@ private predicate enhancedForStmtStep(Node node1, Node node2, Type containerType
 }
 
 /**
- * Holds if the step from `node1` to `node2` reads a value from an array.
+ * Holds if the step from `node1` to `node2` reads a value from an array, where
+ * the elements are of type `elemType`.
  * This covers ordinary array reads as well as array iteration through enhanced
  * `for` statements.
  */
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImplSpecific.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImplSpecific.qll
index 65034ee08b9..97f5020142e 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImplSpecific.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImplSpecific.qll
@@ -6,6 +6,7 @@ module;
 
 private import semmle.code.Location
 private import codeql.dataflow.DataFlow
+private import semmle.code.java.Overlay
 
 module Private {
   import DataFlowPrivate
@@ -29,4 +30,6 @@ module JavaDataFlow implements InputSig<Location> {
   predicate mayBenefitFromCallContext = Private::mayBenefitFromCallContext/1;
 
   predicate viableImplInCallContext = Private::viableImplInCallContext/2;
+
+  predicate isEvaluatingInOverlay = isOverlay/0;
 }
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowPrivate.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowPrivate.qll
index 8b9087ecbdc..1721569e45a 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowPrivate.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowPrivate.qll
@@ -69,28 +69,10 @@ private predicate closureFlowStep(Expr e1, Expr e2) {
   )
 }
 
-private module CaptureInput implements VariableCapture::InputSig<Location> {
+private module CaptureInput implements VariableCapture::InputSig<Location, BasicBlock> {
   private import java as J
 
-  class BasicBlock instanceof J::BasicBlock {
-    string toString() { result = super.toString() }
-
-    ControlFlowNode getNode(int i) { result = super.getNode(i) }
-
-    int length() { result = super.length() }
-
-    Callable getEnclosingCallable() { result = super.getEnclosingCallable() }
-
-    Location getLocation() { result = super.getLocation() }
-  }
-
-  class ControlFlowNode = J::ControlFlowNode;
-
-  BasicBlock getImmediateBasicBlockDominator(BasicBlock bb) {
-    result.(J::BasicBlock).immediatelyDominates(bb)
-  }
-
-  BasicBlock getABasicBlockSuccessor(BasicBlock bb) { result = bb.(J::BasicBlock).getASuccessor() }
+  Callable basicBlockGetEnclosingCallable(BasicBlock bb) { result = bb.getEnclosingCallable() }
 
   //TODO: support capture of `this` in lambdas
   class CapturedVariable instanceof LocalScopeVariable {
@@ -165,7 +147,7 @@ class CapturedVariable = CaptureInput::CapturedVariable;
 
 class CapturedParameter = CaptureInput::CapturedParameter;
 
-module CaptureFlow = VariableCapture::Flow<Location, CaptureInput>;
+module CaptureFlow = VariableCapture::Flow<Location, Cfg, CaptureInput>;
 
 private CaptureFlow::ClosureNode asClosureNode(Node n) {
   result = n.(CaptureNode).getSynthesizedCaptureNode()
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowUtil.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowUtil.qll
index ab2f7f89cb4..23e9f680c97 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowUtil.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowUtil.qll
@@ -83,6 +83,7 @@ overlay[caller?]
 pragma[inline]
 predicate localFlow(Node node1, Node node2) { node1 = node2 or localFlowStepPlus(node1, node2) }
 
+overlay[caller?]
 private predicate localFlowStepPlus(Node node1, Node node2) = fastTC(localFlowStep/2)(node1, node2)
 
 /**
@@ -263,8 +264,8 @@ class Content extends TContent {
 
   /**
    * Holds if this element is at the specified location.
-   * The location spans column `startcolumn` of line `startline` to
-   * column `endcolumn` of line `endline` in file `filepath`.
+   * The location spans column `sc` of line `sl` to
+   * column `ec` of line `el` in file `path`.
    * For more information, see
    * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
    */
@@ -362,8 +363,8 @@ class ContentSet instanceof Content {
 
   /**
    * Holds if this element is at the specified location.
-   * The location spans column `startcolumn` of line `startline` to
-   * column `endcolumn` of line `endline` in file `filepath`.
+   * The location spans column `sc` of line `sl` to
+   * column `ec` of line `el` in file `path`.
    * For more information, see
    * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
    */
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImpl.qll b/java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImpl.qll
index a2d25cadd88..8dc28ea2f60 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImpl.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImpl.qll
@@ -132,7 +132,7 @@ private module TypesInput implements Impl::Private::TypesInputSig {
     exists(rk)
   }
 
-  DataFlowType getSourceType(Input::SourceBase source, Impl::Private::SummaryComponent sc) {
+  DataFlowType getSourceType(Input::SourceBase source, Impl::Private::SummaryComponentStack s) {
     none()
   }
 
@@ -144,7 +144,9 @@ private module StepsInput implements Impl::Private::StepsInputSig {
     sc = viableCallable(result).asSummarizedCallable()
   }
 
-  Node getSourceNode(Input::SourceBase source, Impl::Private::SummaryComponent sc) { none() }
+  DataFlowCallable getSourceNodeEnclosingCallable(Input::SourceBase source) { none() }
+
+  Node getSourceNode(Input::SourceBase source, Impl::Private::SummaryComponentStack s) { none() }
 
   Node getSinkNode(Input::SinkBase sink, Impl::Private::SummaryComponent sc) { none() }
 }
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/SsaImpl.qll b/java/ql/lib/semmle/code/java/dataflow/internal/SsaImpl.qll
index 5a6c5ff6339..275a0afafc0 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/SsaImpl.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/SsaImpl.qll
@@ -157,26 +157,21 @@ private predicate hasEntryDef(TrackedVar v, BasicBlock b) {
 }
 
 /** Holds if `n` might update the locally tracked variable `v`. */
+overlay[global]
 pragma[nomagic]
-private predicate uncertainVariableUpdate(TrackedVar v, ControlFlowNode n, BasicBlock b, int i) {
+private predicate uncertainVariableUpdateImpl(TrackedVar v, ControlFlowNode n, BasicBlock b, int i) {
   exists(Call c | c = n.asCall() | updatesNamedField(c, v, _)) and
   b.getNode(i) = n and
   hasDominanceInformation(b)
   or
-  uncertainVariableUpdate(v.getQualifier(), n, b, i)
+  uncertainVariableUpdateImpl(v.getQualifier(), n, b, i)
 }
 
-private module SsaInput implements SsaImplCommon::InputSig<Location> {
-  private import java as J
-
-  class BasicBlock = J::BasicBlock;
-
-  class ControlFlowNode = J::ControlFlowNode;
-
-  BasicBlock getImmediateBasicBlockDominator(BasicBlock bb) { result.immediatelyDominates(bb) }
-
-  BasicBlock getABasicBlockSuccessor(BasicBlock bb) { result = bb.getASuccessor() }
+/** Holds if `n` might update the locally tracked variable `v`. */
+predicate uncertainVariableUpdate(TrackedVar v, ControlFlowNode n, BasicBlock b, int i) =
+  forceLocal(uncertainVariableUpdateImpl/4)(v, n, b, i)
 
+private module SsaInput implements SsaImplCommon::InputSig<Location, BasicBlock> {
   class SourceVariable = SsaSourceVariable;
 
   /**
@@ -218,7 +213,7 @@ private module SsaInput implements SsaImplCommon::InputSig<Location> {
   }
 }
 
-import SsaImplCommon::Make<Location, SsaInput> as Impl
+import SsaImplCommon::Make<Location, Cfg, SsaInput> as Impl
 
 final class Definition = Impl::Definition;
 
@@ -345,6 +340,7 @@ private module Cached {
    *   Constructor --(intraInstanceCallEdge)-->+ Method(setter of this.f)
    * ```
    */
+  overlay[global]
   private predicate intraInstanceCallEdge(Callable c1, Method m2) {
     exists(MethodCall ma, RefType t1 |
       ma.getCaller() = c1 and
@@ -365,6 +361,7 @@ private module Cached {
     )
   }
 
+  overlay[global]
   private Callable tgt(Call c) {
     result = viableImpl_v2(c)
     or
@@ -374,11 +371,13 @@ private module Cached {
   }
 
   /** Holds if `(c1,c2)` is an edge in the call graph. */
+  overlay[global]
   private predicate callEdge(Callable c1, Callable c2) {
     exists(Call c | c.getCaller() = c1 and c2 = tgt(c))
   }
 
   /** Holds if `(c1,c2)` is an edge in the call graph excluding `intraInstanceCallEdge`. */
+  overlay[global]
   private predicate crossInstanceCallEdge(Callable c1, Callable c2) {
     callEdge(c1, c2) and not intraInstanceCallEdge(c1, c2)
   }
@@ -392,6 +391,7 @@ private module Cached {
     relevantFieldUpdate(_, f.getField(), _)
   }
 
+  overlay[global]
   private predicate source(Call call, TrackedField f, Field field, Callable c, boolean fresh) {
     relevantCall(call, f) and
     field = f.getField() and
@@ -405,9 +405,11 @@ private module Cached {
    * `fresh` indicates whether the instance `this` in `c` has been freshly
    * allocated along the call-chain.
    */
+  overlay[global]
   private newtype TCallableNode =
     MkCallableNode(Callable c, boolean fresh) { source(_, _, _, c, fresh) or edge(_, c, fresh) }
 
+  overlay[global]
   private predicate edge(TCallableNode n, Callable c2, boolean f2) {
     exists(Callable c1, boolean f1 | n = MkCallableNode(c1, f1) |
       intraInstanceCallEdge(c1, c2) and f2 = f1
@@ -417,6 +419,7 @@ private module Cached {
     )
   }
 
+  overlay[global]
   private predicate edge(TCallableNode n1, TCallableNode n2) {
     exists(Callable c2, boolean f2 |
       edge(n1, c2, f2) and
@@ -424,6 +427,7 @@ private module Cached {
     )
   }
 
+  overlay[global]
   pragma[noinline]
   private predicate source(Call call, TrackedField f, Field field, TCallableNode n) {
     exists(Callable c, boolean fresh |
@@ -432,24 +436,28 @@ private module Cached {
     )
   }
 
+  overlay[global]
   private predicate sink(Callable c, Field f, TCallableNode n) {
     setsOwnField(c, f) and n = MkCallableNode(c, false)
     or
     setsOtherField(c, f) and n = MkCallableNode(c, _)
   }
 
+  overlay[global]
   private predicate prunedNode(TCallableNode n) {
     sink(_, _, n)
     or
     exists(TCallableNode mid | edge(n, mid) and prunedNode(mid))
   }
 
+  overlay[global]
   private predicate prunedEdge(TCallableNode n1, TCallableNode n2) {
     prunedNode(n1) and
     prunedNode(n2) and
     edge(n1, n2)
   }
 
+  overlay[global]
   private predicate edgePlus(TCallableNode c1, TCallableNode c2) = fastTC(prunedEdge/2)(c1, c2)
 
   /**
@@ -457,6 +465,7 @@ private module Cached {
    * where `f` and `call` share the same enclosing callable in which a
    * `FieldRead` of `f` is reachable from `call`.
    */
+  overlay[global]
   pragma[noopt]
   private predicate updatesNamedFieldImpl(Call call, TrackedField f, Callable setter) {
     exists(TCallableNode src, TCallableNode sink, Field field |
@@ -467,11 +476,13 @@ private module Cached {
   }
 
   bindingset[call, f]
+  overlay[global]
   pragma[inline_late]
   private predicate updatesNamedField0(Call call, TrackedField f, Callable setter) {
     updatesNamedField(call, f, setter)
   }
 
+  overlay[global]
   cached
   predicate defUpdatesNamedField(SsaImplicitUpdate def, TrackedField f, Callable setter) {
     f = def.getSourceVariable() and
@@ -562,14 +573,20 @@ private module Cached {
 
     cached // nothing is actually cached
     module BarrierGuard<guardChecksSig/3 guardChecks> {
-      private predicate guardChecksAdjTypes(
-        DataFlowIntegrationInput::Guard g, DataFlowIntegrationInput::Expr e, Guards::GuardValue val
+      private predicate guardChecksAdjTypes(Guards::Guards_v3::Guard g, Expr e, boolean branch) {
+        guardChecks(g, e, branch)
+      }
+
+      private predicate guardChecksWithWrappers(
+        DataFlowIntegrationInput::Guard g, Definition def, Guards::GuardValue val, Unit state
       ) {
-        guardChecks(g, e, val.asBooleanValue())
+        Guards::Guards_v3::ValidationWrapper<guardChecksAdjTypes/3>::guardChecksDef(g, def, val) and
+        exists(state)
       }
 
       private Node getABarrierNodeImpl() {
-        result = DataFlowIntegrationImpl::BarrierGuard<guardChecksAdjTypes/3>::getABarrierNode()
+        result =
+          DataFlowIntegrationImpl::BarrierGuardDefWithState<Unit, guardChecksWithWrappers/4>::getABarrierNode(_)
       }
 
       predicate getABarrierNode = getABarrierNodeImpl/0;
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/TaintTrackingUtil.qll b/java/ql/lib/semmle/code/java/dataflow/internal/TaintTrackingUtil.qll
index 40e361ed158..5f1d6b66af5 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/TaintTrackingUtil.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/TaintTrackingUtil.qll
@@ -278,21 +278,23 @@ private predicate inputStreamWrapper(Constructor c, int argi) {
 
 /** An object construction that preserves the data flow status of any of its arguments. */
 private predicate constructorStep(Expr tracked, ConstructorCall sink, string model) {
-  exists(int argi | sink.getArgument(argi) = tracked |
+  exists(int argi | sink.getArgument(pragma[only_bind_into](argi)) = tracked |
     // wrappers constructed by extension
     exists(Constructor c, Parameter p, SuperConstructorInvocationStmt sup |
       c = sink.getConstructor() and
-      p = c.getParameter(argi) and
+      p = c.getParameter(pragma[only_bind_into](argi)) and
       sup.getEnclosingCallable() = c and
       constructorStep(p.getAnAccess(), sup, model)
     )
     or
     // a custom InputStream that wraps a tainted data source is tainted
     model = "inputStreamWrapper" and
-    inputStreamWrapper(sink.getConstructor(), argi)
+    inputStreamWrapper(sink.getConstructor(), pragma[only_bind_into](argi))
     or
     model = "TaintPreservingCallable" and
-    sink.getConstructor().(TaintPreservingCallable).returnsTaintFrom(argToParam(sink, argi))
+    sink.getConstructor()
+        .(TaintPreservingCallable)
+        .returnsTaintFrom(argToParam(sink, pragma[only_bind_into](argi)))
   )
 }
 
@@ -653,6 +655,8 @@ private SrcRefType entrypointType() {
   )
   or
   result = entrypointType().getAField().getType().(RefType).getSourceDeclaration()
+  or
+  result = entrypointType().(Array).getElementType().(RefType).getSourceDeclaration()
 }
 
 private predicate entrypointFieldStep(DataFlow::Node src, DataFlow::Node sink) {
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/SignAnalysisSpecific.qll b/java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/SignAnalysisSpecific.qll
index 8789661af7d..6363b8f7ed3 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/SignAnalysisSpecific.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/SignAnalysisSpecific.qll
@@ -204,7 +204,7 @@ private module Impl {
   /** Gets the character value of expression `e`. */
   string getCharValue(Expr e) { result = e.(CharacterLiteral).getValue() }
 
-  /** Gets the constant `float` value of non-`ConstantIntegerExpr` expressions. */
+  /** Gets the constant `float` value of non-`ConstantIntegerExpr` expression `e`. */
   float getNonIntegerValue(Expr e) {
     result = e.(LongLiteral).getValue().toFloat() or
     result = e.(FloatLiteral).getValue().toFloat() or
@@ -256,12 +256,12 @@ private module Impl {
     exists(EnhancedForStmt for | def = for.getVariable())
   }
 
-  /** Returns the operand of the operation if `def` is a decrement. */
+  /** Returns the operand of the operation if `e` is a decrement. */
   Expr getDecrementOperand(Element e) {
     result = e.(PostDecExpr).getExpr() or result = e.(PreDecExpr).getExpr()
   }
 
-  /** Returns the operand of the operation if `def` is an increment. */
+  /** Returns the operand of the operation if `e` is an increment. */
   Expr getIncrementOperand(Element e) {
     result = e.(PostIncExpr).getExpr() or result = e.(PreIncExpr).getExpr()
   }
diff --git a/java/ql/lib/semmle/code/java/dispatch/DispatchFlow.qll b/java/ql/lib/semmle/code/java/dispatch/DispatchFlow.qll
index a9988e920c6..bd293eed6b3 100644
--- a/java/ql/lib/semmle/code/java/dispatch/DispatchFlow.qll
+++ b/java/ql/lib/semmle/code/java/dispatch/DispatchFlow.qll
@@ -5,8 +5,6 @@
  * data flow check for lambdas, anonymous classes, and other sufficiently
  * private classes where all object instantiations are accounted for.
  */
-overlay[local?]
-module;
 
 import java
 private import VirtualDispatch
diff --git a/java/ql/lib/semmle/code/java/dispatch/ObjFlow.qll b/java/ql/lib/semmle/code/java/dispatch/ObjFlow.qll
index 86915f80274..a3da9118acc 100644
--- a/java/ql/lib/semmle/code/java/dispatch/ObjFlow.qll
+++ b/java/ql/lib/semmle/code/java/dispatch/ObjFlow.qll
@@ -6,8 +6,6 @@
  * The set of dispatch targets for `Object.toString()` calls are reduced based
  * on possible data flow from objects of more specific types to the qualifier.
  */
-overlay[local?]
-module;
 
 import java
 private import VirtualDispatch
diff --git a/java/ql/lib/semmle/code/java/dispatch/VirtualDispatch.qll b/java/ql/lib/semmle/code/java/dispatch/VirtualDispatch.qll
index 877a62fb945..78bf1ad0bdc 100644
--- a/java/ql/lib/semmle/code/java/dispatch/VirtualDispatch.qll
+++ b/java/ql/lib/semmle/code/java/dispatch/VirtualDispatch.qll
@@ -2,8 +2,6 @@
  * Provides predicates for reasoning about runtime call targets through virtual
  * dispatch.
  */
-overlay[local?]
-module;
 
 import java
 import semmle.code.java.dataflow.TypeFlow
diff --git a/java/ql/lib/semmle/code/java/dispatch/internal/Unification.qll b/java/ql/lib/semmle/code/java/dispatch/internal/Unification.qll
index cd585de58e4..6c92f7298d9 100644
--- a/java/ql/lib/semmle/code/java/dispatch/internal/Unification.qll
+++ b/java/ql/lib/semmle/code/java/dispatch/internal/Unification.qll
@@ -1,8 +1,6 @@
 /**
  * Provides a module to check whether two `ParameterizedType`s are unifiable.
  */
-overlay[local?]
-module;
 
 import java
 
diff --git a/java/ql/lib/semmle/code/java/frameworks/Assertions.qll b/java/ql/lib/semmle/code/java/frameworks/Assertions.qll
index 9849be5f360..49afcb7a3e1 100644
--- a/java/ql/lib/semmle/code/java/frameworks/Assertions.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/Assertions.qll
@@ -1,4 +1,6 @@
 /**
+ * DEPRECATED.
+ *
  * A library providing uniform access to various assertion frameworks.
  *
  * Currently supports `org.junit.Assert`, `junit.framework.*`,
@@ -6,7 +8,7 @@
  * and `java.util.Objects`.
  */
 overlay[local?]
-module;
+deprecated module;
 
 import java
 
diff --git a/java/ql/lib/semmle/code/java/frameworks/Mockito.qll b/java/ql/lib/semmle/code/java/frameworks/Mockito.qll
index 1a8d987a38e..a8559060d30 100644
--- a/java/ql/lib/semmle/code/java/frameworks/Mockito.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/Mockito.qll
@@ -223,10 +223,10 @@ class MockitoInjectedField extends MockitoAnnotatedField {
         // If there is no initializer for this field, and there is a most mockable constructor,
         // then we are doing a parameterized injection of mocks into a most mockable constructor.
         result = mockInjectedClass.getAMostMockableConstructor()
-      else
-        if this.usingPropertyInjection()
-        then
-          // We will call the no-arg constructor if the field wasn't initialized.
+      else (
+        this.usingPropertyInjection() and
+        // We will call the no-arg constructor if the field wasn't initialized.
+        (
           not exists(this.getInitializer()) and
           result = mockInjectedClass.getNoArgsConstructor()
           or
@@ -241,9 +241,8 @@ class MockitoInjectedField extends MockitoAnnotatedField {
             // once, but we instead assume that there are sufficient mocks to go around.
             mockedField.getType().(RefType).getAnAncestor() = result.getParameterType(0)
           )
-        else
-          // There's no instance, and no no-arg constructor we can call, so injection fails.
-          none()
+        )
+      )
     )
   }
 
@@ -253,18 +252,16 @@ class MockitoInjectedField extends MockitoAnnotatedField {
    * Field injection only occurs if property injection and not constructor injection is used.
    */
   Field getASetField() {
-    if this.usingPropertyInjection()
-    then
-      result = this.getMockInjectedClass().getASetField() and
-      exists(MockitoMockedField mockedField |
-        mockedField.getDeclaringType() = this.getDeclaringType() and
-        mockedField.isValid()
-      |
-        // We make a simplifying assumption here - in theory, each mock can only be injected
-        // once, but we instead assume that there are sufficient mocks to go around.
-        mockedField.getType().(RefType).getAnAncestor() = result.getType()
-      )
-    else none()
+    this.usingPropertyInjection() and
+    result = this.getMockInjectedClass().getASetField() and
+    exists(MockitoMockedField mockedField |
+      mockedField.getDeclaringType() = this.getDeclaringType() and
+      mockedField.isValid()
+    |
+      // We make a simplifying assumption here - in theory, each mock can only be injected
+      // once, but we instead assume that there are sufficient mocks to go around.
+      mockedField.getType().(RefType).getAnAncestor() = result.getType()
+    )
   }
 }
 
diff --git a/java/ql/lib/semmle/code/java/frameworks/android/ExternalStorage.qll b/java/ql/lib/semmle/code/java/frameworks/android/ExternalStorage.qll
index c07ddea6dba..6dd49fc7ff6 100644
--- a/java/ql/lib/semmle/code/java/frameworks/android/ExternalStorage.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/android/ExternalStorage.qll
@@ -20,8 +20,10 @@ private predicate externalStorageFlowStep(DataFlow::Node node1, DataFlow::Node n
   node2.asExpr().(FieldRead).getField().getInitializer() = node1.asExpr()
 }
 
-private predicate externalStorageFlow(DataFlow::Node node1, DataFlow::Node node2) {
-  externalStorageFlowStep*(node1, node2)
+private predicate externalStorageDirFlowsTo(DataFlow::Node n) {
+  sourceNode(n, "android-external-storage-dir")
+  or
+  exists(DataFlow::Node mid | externalStorageDirFlowsTo(mid) and externalStorageFlowStep(mid, n))
 }
 
 /**
@@ -29,9 +31,8 @@ private predicate externalStorageFlow(DataFlow::Node node1, DataFlow::Node node2
  * This is controllable by third-party applications, so is treated as a remote flow source.
  */
 predicate androidExternalStorageSource(DataFlow::Node n) {
-  exists(DataFlow::Node externalDir, DirectFileReadExpr read |
-    sourceNode(externalDir, "android-external-storage-dir") and
+  exists(DirectFileReadExpr read |
     n.asExpr() = read and
-    externalStorageFlow(externalDir, DataFlow::exprNode(read.getFileExpr()))
+    externalStorageDirFlowsTo(DataFlow::exprNode(read.getFileExpr()))
   )
 }
diff --git a/java/ql/lib/semmle/code/java/frameworks/javaee/ejb/EJB.qll b/java/ql/lib/semmle/code/java/frameworks/javaee/ejb/EJB.qll
index 2b003b3c94e..d59976c0c6c 100644
--- a/java/ql/lib/semmle/code/java/frameworks/javaee/ejb/EJB.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/javaee/ejb/EJB.qll
@@ -35,14 +35,14 @@ class SessionEjb extends EJB {
     // Either the EJB does not declare any business interfaces explicitly
     // and implements a single interface candidate,
     // which is then considered to be the business interface...
-    count(this.getAnExplicitBusinessInterface()) = 0 and
+    not exists(this.getAnExplicitBusinessInterface()) and
     count(this.getAnImplementedBusinessInterfaceCandidate()) = 1 and
     result = this.getAnImplementedBusinessInterfaceCandidate()
     or
     // ...or each business interface needs to be declared explicitly.
     (
       count(this.getAnImplementedBusinessInterfaceCandidate()) != 1 or
-      count(this.getAnExplicitBusinessInterface()) != 0
+      exists(this.getAnExplicitBusinessInterface())
     ) and
     result = this.getAnExplicitBusinessInterface()
   }
diff --git a/java/ql/lib/semmle/code/java/regex/RegexFlowConfigs.qll b/java/ql/lib/semmle/code/java/regex/RegexFlowConfigs.qll
index 6a934bdd578..929fa2d6c91 100644
--- a/java/ql/lib/semmle/code/java/regex/RegexFlowConfigs.qll
+++ b/java/ql/lib/semmle/code/java/regex/RegexFlowConfigs.qll
@@ -163,6 +163,12 @@ private module RegexFlowConfig implements DataFlow::ConfigSig {
 
 private module RegexFlow = DataFlow::Global<RegexFlowConfig>;
 
+private predicate usedAsRegexImpl(StringLiteral regex, string mode, boolean match_full_string) {
+  RegexFlow::flow(DataFlow::exprNode(regex), _) and
+  mode = "None" and // TODO: proper mode detection
+  (if matchesFullString(regex) then match_full_string = true else match_full_string = false)
+}
+
 /**
  * Holds if `regex` is used as a regex, with the mode `mode` (if known).
  * If regex mode is not known, `mode` will be `"None"`.
@@ -170,11 +176,9 @@ private module RegexFlow = DataFlow::Global<RegexFlowConfig>;
  * As an optimisation, only regexes containing an infinite repitition quatifier (`+`, `*`, or `{x,}`)
  * and therefore may be relevant for ReDoS queries are considered.
  */
-predicate usedAsRegex(StringLiteral regex, string mode, boolean match_full_string) {
-  RegexFlow::flow(DataFlow::exprNode(regex), _) and
-  mode = "None" and // TODO: proper mode detection
-  (if matchesFullString(regex) then match_full_string = true else match_full_string = false)
-}
+overlay[local]
+predicate usedAsRegex(StringLiteral regex, string mode, boolean match_full_string) =
+  forceLocal(usedAsRegexImpl/3)(regex, mode, match_full_string)
 
 /**
  * Holds if `regex` is used as a regular expression that is matched against a full string,
diff --git a/java/ql/lib/semmle/code/java/security/ArbitraryApkInstallationQuery.qll b/java/ql/lib/semmle/code/java/security/ArbitraryApkInstallationQuery.qll
index 8c833bb79d6..e907a9ffeaa 100644
--- a/java/ql/lib/semmle/code/java/security/ArbitraryApkInstallationQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/ArbitraryApkInstallationQuery.qll
@@ -25,8 +25,6 @@ module ApkInstallationConfig implements DataFlow::ConfigSig {
   }
 
   predicate observeDiffInformedIncrementalMode() { any() }
-
-  Location getASelectedSourceLocation(DataFlow::Node sink) { none() }
 }
 
 module ApkInstallationFlow = DataFlow::Global<ApkInstallationConfig>;
diff --git a/java/ql/lib/semmle/code/java/security/ArithmeticCommon.qll b/java/ql/lib/semmle/code/java/security/ArithmeticCommon.qll
index e0d6ff305c3..4f4c20a5263 100644
--- a/java/ql/lib/semmle/code/java/security/ArithmeticCommon.qll
+++ b/java/ql/lib/semmle/code/java/security/ArithmeticCommon.qll
@@ -20,16 +20,16 @@ predicate narrowerThanOrEqualTo(ArithExpr exp, NumType numType) {
   exists(CastingExpr cast | cast.getAChildExpr() = exp | numType.widerThanOrEqualTo(cast.getType()))
 }
 
-private Guard sizeGuard(SsaVariable v, boolean branch, boolean upper) {
+private Guard sizeGuard(Expr e, boolean branch, boolean upper) {
   exists(ComparisonExpr comp | comp = result |
-    comp.getLesserOperand() = ssaRead(v, 0) and
+    comp.getLesserOperand() = e and
     (
       branch = true and upper = true
       or
       branch = false and upper = false
     )
     or
-    comp.getGreaterOperand() = ssaRead(v, 0) and
+    comp.getGreaterOperand() = e and
     (
       branch = true and upper = false
       or
@@ -38,7 +38,7 @@ private Guard sizeGuard(SsaVariable v, boolean branch, boolean upper) {
     or
     exists(MethodCall ma |
       ma.getMethod() instanceof MethodAbs and
-      ma.getArgument(0) = ssaRead(v, 0) and
+      ma.getArgument(0) = e and
       (
         comp.getLesserOperand() = ma and branch = true
         or
@@ -49,7 +49,7 @@ private Guard sizeGuard(SsaVariable v, boolean branch, boolean upper) {
     or
     // overflow test
     exists(AddExpr add, VarRead use, Expr pos |
-      use = ssaRead(v, 0) and
+      use = e and
       add.hasOperands(use, pos) and
       positive(use) and
       positive(pos) and
@@ -65,70 +65,38 @@ private Guard sizeGuard(SsaVariable v, boolean branch, boolean upper) {
     )
   )
   or
-  result.isEquality(ssaRead(v, 0), _, branch) and
+  result.isEquality(e, _, branch) and
   (upper = true or upper = false)
-  or
-  exists(MethodCall call, Method m, int ix |
-    call = result and
-    call.getArgument(ix) = ssaRead(v, 0) and
-    call.getMethod().getSourceDeclaration() = m and
-    m = customSizeGuard(ix, branch, upper)
-  )
 }
 
-private Guard derivedSizeGuard(SsaVariable v, boolean branch, boolean upper) {
-  result = sizeGuard(v, branch, upper) or
-  exists(boolean branch0 | implies_v3(result, branch, derivedSizeGuard(v, branch0, upper), branch0))
+private predicate sizeGuardLessThan(Guard g, Expr e, boolean branch) {
+  g = sizeGuard(e, branch, true)
 }
 
-private Method customSizeGuard(int index, boolean retval, boolean upper) {
-  exists(Parameter p, SsaImplicitInit v |
-    result.getReturnType().(PrimitiveType).hasName("boolean") and
-    not result.isOverridable() and
-    p.getCallable() = result and
-    not p.isVarargs() and
-    p.getType() instanceof NumericOrCharType and
-    p.getPosition() = index and
-    v.isParameterDefinition(p) and
-    forex(ReturnStmt ret |
-      ret.getEnclosingCallable() = result and
-      exists(Expr res | res = ret.getResult() |
-        not res.(BooleanLiteral).getBooleanValue() = retval.booleanNot()
-      )
-    |
-      ret.getResult() = derivedSizeGuard(v, retval, upper)
-    )
-  )
+private predicate sizeGuardGreaterThan(Guard g, Expr e, boolean branch) {
+  g = sizeGuard(e, branch, false)
 }
 
 /**
- * Holds if `e` is bounded in a way that is likely to prevent overflow.
+ * Holds if `n` is bounded in a way that is likely to prevent overflow.
  */
-predicate guardedLessThanSomething(Expr e) {
-  exists(SsaVariable v, Guard guard, boolean branch |
-    e = v.getAUse() and
-    guard = sizeGuard(v.getAPhiInputOrPriorDef*(), branch, true) and
-    guard.controls(e.getBasicBlock(), branch)
-  )
+predicate guardedLessThanSomething(DataFlow::Node n) {
+  DataFlow::BarrierGuard<sizeGuardLessThan/3>::getABarrierNode() = n
   or
-  negative(e)
+  negative(n.asExpr())
   or
-  e.(MethodCall).getMethod() instanceof MethodMathMin
+  n.asExpr().(MethodCall).getMethod() instanceof MethodMathMin
 }
 
 /**
  * Holds if `e` is bounded in a way that is likely to prevent underflow.
  */
-predicate guardedGreaterThanSomething(Expr e) {
-  exists(SsaVariable v, Guard guard, boolean branch |
-    e = v.getAUse() and
-    guard = sizeGuard(v.getAPhiInputOrPriorDef*(), branch, false) and
-    guard.controls(e.getBasicBlock(), branch)
-  )
+predicate guardedGreaterThanSomething(DataFlow::Node n) {
+  DataFlow::BarrierGuard<sizeGuardGreaterThan/3>::getABarrierNode() = n
   or
-  positive(e)
+  positive(n.asExpr())
   or
-  e.(MethodCall).getMethod() instanceof MethodMathMax
+  n.asExpr().(MethodCall).getMethod() instanceof MethodMathMax
 }
 
 /** Holds if `e` occurs in a context where it will be upcast to a wider type. */
@@ -182,7 +150,7 @@ private predicate unlikelyNode(DataFlow::Node n) {
 /** Holds if `n` is likely guarded against overflow. */
 predicate overflowBarrier(DataFlow::Node n) {
   n.getType() instanceof BooleanType or
-  guardedLessThanSomething(n.asExpr()) or
+  guardedLessThanSomething(n) or
   unlikelyNode(n) or
   upcastToWiderType(n.asExpr()) or
   overflowIrrelevant(n.asExpr())
@@ -191,7 +159,7 @@ predicate overflowBarrier(DataFlow::Node n) {
 /** Holds if `n` is likely guarded against underflow. */
 predicate underflowBarrier(DataFlow::Node n) {
   n.getType() instanceof BooleanType or
-  guardedGreaterThanSomething(n.asExpr()) or
+  guardedGreaterThanSomething(n) or
   unlikelyNode(n) or
   upcastToWiderType(n.asExpr()) or
   overflowIrrelevant(n.asExpr())
@@ -210,7 +178,6 @@ predicate overflowSink(ArithExpr exp, VarAccess use) {
     exp instanceof PostIncExpr or
     exp instanceof MulExpr
   ) and
-  not guardedLessThanSomething(use) and
   // Exclude widening conversions of tainted values due to binary numeric promotion (JLS 5.6.2)
   // unless there is an enclosing cast down to a narrower type.
   narrowerThanOrEqualTo(exp, use.getType()) and
@@ -230,7 +197,6 @@ predicate underflowSink(ArithExpr exp, VarAccess use) {
     exp instanceof PostDecExpr or
     exp instanceof MulExpr
   ) and
-  not guardedGreaterThanSomething(use) and
   // Exclude widening conversions of tainted values due to binary numeric promotion (JLS 5.6.2)
   // unless there is an enclosing cast down to a narrower type.
   narrowerThanOrEqualTo(exp, use.getType()) and
diff --git a/java/ql/lib/semmle/code/java/security/ArithmeticTaintedQuery.qll b/java/ql/lib/semmle/code/java/security/ArithmeticTaintedQuery.qll
index fbb8509f48f..65e73f84149 100644
--- a/java/ql/lib/semmle/code/java/security/ArithmeticTaintedQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/ArithmeticTaintedQuery.qll
@@ -19,7 +19,9 @@ module ArithmeticOverflowConfig implements DataFlow::ConfigSig {
   }
 
   Location getASelectedSinkLocation(DataFlow::Node sink) {
-    exists(ArithExpr exp | result = exp.getLocation() | overflowSink(exp, sink.asExpr()))
+    exists(ArithExpr exp | result = [exp.getLocation(), sink.getLocation()] |
+      overflowSink(exp, sink.asExpr())
+    )
   }
 }
 
@@ -43,7 +45,9 @@ module ArithmeticUnderflowConfig implements DataFlow::ConfigSig {
   }
 
   Location getASelectedSinkLocation(DataFlow::Node sink) {
-    exists(ArithExpr exp | result = exp.getLocation() | underflowSink(exp, sink.asExpr()))
+    exists(ArithExpr exp | result = [exp.getLocation(), sink.getLocation()] |
+      underflowSink(exp, sink.asExpr())
+    )
   }
 }
 
diff --git a/java/ql/lib/semmle/code/java/security/ArithmeticUncontrolledQuery.qll b/java/ql/lib/semmle/code/java/security/ArithmeticUncontrolledQuery.qll
index 6b7b337ad65..3c1ceaddc2f 100644
--- a/java/ql/lib/semmle/code/java/security/ArithmeticUncontrolledQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/ArithmeticUncontrolledQuery.qll
@@ -25,7 +25,9 @@ module ArithmeticUncontrolledOverflowConfig implements DataFlow::ConfigSig {
   }
 
   Location getASelectedSinkLocation(DataFlow::Node sink) {
-    exists(ArithExpr exp | result = exp.getLocation() | overflowSink(exp, sink.asExpr()))
+    exists(ArithExpr exp | result = [exp.getLocation(), sink.getLocation()] |
+      overflowSink(exp, sink.asExpr())
+    )
   }
 }
 
@@ -46,7 +48,9 @@ module ArithmeticUncontrolledUnderflowConfig implements DataFlow::ConfigSig {
   }
 
   Location getASelectedSinkLocation(DataFlow::Node sink) {
-    exists(ArithExpr exp | result = exp.getLocation() | underflowSink(exp, sink.asExpr()))
+    exists(ArithExpr exp | result = [exp.getLocation(), sink.getLocation()] |
+      underflowSink(exp, sink.asExpr())
+    )
   }
 }
 
diff --git a/java/ql/lib/semmle/code/java/security/BrokenCryptoAlgorithmQuery.qll b/java/ql/lib/semmle/code/java/security/BrokenCryptoAlgorithmQuery.qll
index 4f9e39b23f2..60f1e179397 100644
--- a/java/ql/lib/semmle/code/java/security/BrokenCryptoAlgorithmQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/BrokenCryptoAlgorithmQuery.qll
@@ -12,6 +12,7 @@ private class ShortStringLiteral extends StringLiteral {
 /**
  * A string literal that may refer to a broken or risky cryptographic algorithm.
  */
+overlay[local?]
 class BrokenAlgoLiteral extends ShortStringLiteral {
   BrokenAlgoLiteral() {
     this.getValue().regexpMatch(getInsecureAlgorithmRegex()) and
@@ -35,7 +36,11 @@ module InsecureCryptoConfig implements DataFlow::ConfigSig {
   predicate observeDiffInformedIncrementalMode() { any() }
 
   Location getASelectedSinkLocation(DataFlow::Node sink) {
-    exists(CryptoAlgoSpec c | sink.asExpr() = c.getAlgoSpec() | result = c.getLocation())
+    exists(CryptoAlgoSpec c | sink.asExpr() = c.getAlgoSpec() |
+      result = c.getLocation()
+      or
+      result = sink.getLocation()
+    )
   }
 }
 
diff --git a/java/ql/lib/semmle/code/java/security/CleartextStorageAndroidFilesystemQuery.qll b/java/ql/lib/semmle/code/java/security/CleartextStorageAndroidFilesystemQuery.qll
index 98acdbc1c55..89867398148 100644
--- a/java/ql/lib/semmle/code/java/security/CleartextStorageAndroidFilesystemQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/CleartextStorageAndroidFilesystemQuery.qll
@@ -55,7 +55,7 @@ private predicate isVarargs(Argument arg, DataFlow::ImplicitVarargsArray varargs
   arg.isVararg() and arg.getCall() = varargs.getCall()
 }
 
-/** Holds if `store` closes `file`. */
+/** Holds if `closeCall` closes `file`. */
 private predicate closesFile(DataFlow::Node file, Call closeCall) {
   closeCall.getCallee() instanceof CloseFileMethod and
   if closeCall.getCallee().isStatic()
diff --git a/java/ql/lib/semmle/code/java/security/CommandLineQuery.qll b/java/ql/lib/semmle/code/java/security/CommandLineQuery.qll
index a1c75f93802..b6b9d02e289 100644
--- a/java/ql/lib/semmle/code/java/security/CommandLineQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/CommandLineQuery.qll
@@ -63,10 +63,14 @@ module InputToArgumentToExecFlowConfig implements DataFlow::ConfigSig {
   // only to prevent overlapping results between two queries.
   predicate observeDiffInformedIncrementalMode() { any() }
 
-  // All queries use the argument as the primary location and do not use the
-  // sink as an associated location.
+  // ExecTainted.ql queries use the argument as the primary location;
+  // ExecUnescaped.ql does not (used to prevent overlapping results).
   Location getASelectedSinkLocation(DataFlow::Node sink) {
-    exists(Expr argument | argumentToExec(argument, sink) | result = argument.getLocation())
+    exists(Expr argument | argumentToExec(argument, sink) |
+      result = argument.getLocation()
+      or
+      result = sink.getLocation()
+    )
   }
 }
 
diff --git a/java/ql/lib/semmle/code/java/security/ConditionalBypassQuery.qll b/java/ql/lib/semmle/code/java/security/ConditionalBypassQuery.qll
index 31457036937..babf129f19e 100644
--- a/java/ql/lib/semmle/code/java/security/ConditionalBypassQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/ConditionalBypassQuery.qll
@@ -51,7 +51,7 @@ module ConditionalBypassFlowConfig implements DataFlow::ConfigSig {
   predicate observeDiffInformedIncrementalMode() { any() }
 
   Location getASelectedSinkLocation(DataFlow::Node sink) {
-    exists(MethodCall m, Expr e | result = [m, e].getLocation() |
+    exists(MethodCall m, Expr e | result = [[m, e].getLocation(), sink.getLocation()] |
       conditionControlsMethod(m, e) and
       sink.asExpr() = e
     )
diff --git a/java/ql/lib/semmle/code/java/security/FileWritable.qll b/java/ql/lib/semmle/code/java/security/FileWritable.qll
index d1833bf64d4..a5efad31bcb 100644
--- a/java/ql/lib/semmle/code/java/security/FileWritable.qll
+++ b/java/ql/lib/semmle/code/java/security/FileWritable.qll
@@ -89,7 +89,7 @@ private VarAccess getFileForPathConversion(Expr pathExpr) {
 }
 
 /**
- * Holds if `fileAccess` is used in the `setWorldWritableExpr` to set the file to be world writable.
+ * Holds if `fileAccess` is used in the `setWorldWritable` to set the file to be world writable.
  */
 private predicate fileSetWorldWritable(VarAccess fileAccess, Expr setWorldWritable) {
   // Calls to `File.setWritable(.., false)`.
diff --git a/java/ql/lib/semmle/code/java/security/ImproperValidationOfArrayConstructionCodeSpecifiedQuery.qll b/java/ql/lib/semmle/code/java/security/ImproperValidationOfArrayConstructionCodeSpecifiedQuery.qll
index e952971c389..97a6d159bc9 100644
--- a/java/ql/lib/semmle/code/java/security/ImproperValidationOfArrayConstructionCodeSpecifiedQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/ImproperValidationOfArrayConstructionCodeSpecifiedQuery.qll
@@ -22,7 +22,10 @@ module BoundedFlowSourceConfig implements DataFlow::ConfigSig {
 
   Location getASelectedSinkLocation(DataFlow::Node sink) {
     exists(ArrayCreationExpr arrayCreation, CheckableArrayAccess arrayAccess |
-      result = [arrayCreation, arrayAccess.getIndexExpr()].getLocation() and
+      result = [arrayCreation, arrayAccess.getIndexExpr()].getLocation()
+      or
+      result = sink.getLocation()
+    |
       arrayAccess.canThrowOutOfBoundsDueToEmptyArray(sink.asExpr(), arrayCreation)
     )
   }
diff --git a/java/ql/lib/semmle/code/java/security/ImproperValidationOfArrayConstructionQuery.qll b/java/ql/lib/semmle/code/java/security/ImproperValidationOfArrayConstructionQuery.qll
index 913d50b3159..74b8af7e588 100644
--- a/java/ql/lib/semmle/code/java/security/ImproperValidationOfArrayConstructionQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/ImproperValidationOfArrayConstructionQuery.qll
@@ -19,7 +19,10 @@ module ImproperValidationOfArrayConstructionConfig implements DataFlow::ConfigSi
 
   Location getASelectedSinkLocation(DataFlow::Node sink) {
     exists(ArrayCreationExpr arrayCreation, CheckableArrayAccess arrayAccess |
-      result = [arrayCreation, arrayAccess.getIndexExpr()].getLocation() and
+      result = [arrayCreation, arrayAccess.getIndexExpr()].getLocation()
+      or
+      result = sink.getLocation()
+    |
       arrayAccess.canThrowOutOfBoundsDueToEmptyArray(sink.asExpr(), arrayCreation)
     )
   }
diff --git a/java/ql/lib/semmle/code/java/security/MaybeBrokenCryptoAlgorithmQuery.qll b/java/ql/lib/semmle/code/java/security/MaybeBrokenCryptoAlgorithmQuery.qll
index 57622b367f3..22c7320a55a 100644
--- a/java/ql/lib/semmle/code/java/security/MaybeBrokenCryptoAlgorithmQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/MaybeBrokenCryptoAlgorithmQuery.qll
@@ -81,7 +81,9 @@ module InsecureCryptoConfig implements DataFlow::ConfigSig {
   predicate observeDiffInformedIncrementalMode() { any() }
 
   Location getASelectedSinkLocation(DataFlow::Node sink) {
-    exists(CryptoAlgoSpec c | result = c.getLocation() | sink.asExpr() = c.getAlgoSpec())
+    exists(CryptoAlgoSpec c | result = sink.getLocation() or result = c.getLocation() |
+      sink.asExpr() = c.getAlgoSpec()
+    )
   }
 }
 
diff --git a/java/ql/lib/semmle/code/java/security/NumericCastTaintedQuery.qll b/java/ql/lib/semmle/code/java/security/NumericCastTaintedQuery.qll
index bfe22c69e64..841ff4f8515 100644
--- a/java/ql/lib/semmle/code/java/security/NumericCastTaintedQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/NumericCastTaintedQuery.qll
@@ -106,8 +106,9 @@ module NumericCastFlowConfig implements DataFlow::ConfigSig {
   predicate observeDiffInformedIncrementalMode() { any() }
 
   Location getASelectedSinkLocation(DataFlow::Node sink) {
-    exists(NumericNarrowingCastExpr cast |
-      cast.getExpr() = sink.asExpr() and
+    exists(NumericNarrowingCastExpr cast | cast.getExpr() = sink.asExpr() |
+      result = sink.getLocation()
+      or
       result = cast.getLocation()
     )
   }
diff --git a/java/ql/lib/semmle/code/java/security/PathSanitizer.qll b/java/ql/lib/semmle/code/java/security/PathSanitizer.qll
index e789d3c4778..da6f242bde5 100644
--- a/java/ql/lib/semmle/code/java/security/PathSanitizer.qll
+++ b/java/ql/lib/semmle/code/java/security/PathSanitizer.qll
@@ -13,33 +13,6 @@ private import semmle.code.java.dataflow.Nullness
 /** A sanitizer that protects against path injection vulnerabilities. */
 abstract class PathInjectionSanitizer extends DataFlow::Node { }
 
-/**
- * Provides a set of nodes validated by a method that uses a validation guard.
- */
-private module ValidationMethod<DataFlow::guardChecksSig/3 validationGuard> {
-  /** Gets a node that is safely guarded by a method that uses the given guard check. */
-  DataFlow::Node getAValidatedNode() {
-    exists(MethodCall ma, int pos, VarRead rv |
-      validationMethod(ma.getMethod(), pos) and
-      ma.getArgument(pos) = rv and
-      adjacentUseUseSameVar(rv, result.asExpr()) and
-      ma.getBasicBlock().dominates(result.asExpr().getBasicBlock())
-    )
-  }
-
-  /**
-   * Holds if `m` validates its `arg`th parameter by using `validationGuard`.
-   */
-  private predicate validationMethod(Method m, int arg) {
-    exists(Guard g, SsaImplicitInit var, ControlFlow::NormalExitNode normexit, boolean branch |
-      validationGuard(g, var.getAUse(), branch) and
-      var.isParameterDefinition(m.getParameter(arg)) and
-      normexit.getEnclosingCallable() = m and
-      g.controls(normexit.getBasicBlock(), branch)
-    )
-  }
-}
-
 /**
  * Holds if `g` is guard that compares a path to a trusted value.
  */
@@ -68,8 +41,6 @@ private predicate exactPathMatchGuard(Guard g, Expr e, boolean branch) {
 class ExactPathMatchSanitizer extends PathInjectionSanitizer {
   ExactPathMatchSanitizer() {
     this = DataFlow::BarrierGuard<exactPathMatchGuard/3>::getABarrierNode()
-    or
-    this = ValidationMethod<exactPathMatchGuard/3>::getAValidatedNode()
   }
 }
 
@@ -120,8 +91,7 @@ private predicate allowedPrefixGuard(Guard g, Expr e, boolean branch) {
 
 private class AllowedPrefixSanitizer extends PathInjectionSanitizer {
   AllowedPrefixSanitizer() {
-    this = DataFlow::BarrierGuard<allowedPrefixGuard/3>::getABarrierNode() or
-    this = ValidationMethod<allowedPrefixGuard/3>::getAValidatedNode()
+    this = DataFlow::BarrierGuard<allowedPrefixGuard/3>::getABarrierNode()
   }
 }
 
@@ -139,10 +109,7 @@ private predicate dotDotCheckGuard(Guard g, Expr e, boolean branch) {
 }
 
 private class DotDotCheckSanitizer extends PathInjectionSanitizer {
-  DotDotCheckSanitizer() {
-    this = DataFlow::BarrierGuard<dotDotCheckGuard/3>::getABarrierNode() or
-    this = ValidationMethod<dotDotCheckGuard/3>::getAValidatedNode()
-  }
+  DotDotCheckSanitizer() { this = DataFlow::BarrierGuard<dotDotCheckGuard/3>::getABarrierNode() }
 }
 
 private class BlockListGuard extends PathGuard instanceof MethodCall {
@@ -179,10 +146,7 @@ private predicate blockListGuard(Guard g, Expr e, boolean branch) {
 }
 
 private class BlockListSanitizer extends PathInjectionSanitizer {
-  BlockListSanitizer() {
-    this = DataFlow::BarrierGuard<blockListGuard/3>::getABarrierNode() or
-    this = ValidationMethod<blockListGuard/3>::getAValidatedNode()
-  }
+  BlockListSanitizer() { this = DataFlow::BarrierGuard<blockListGuard/3>::getABarrierNode() }
 }
 
 private class ConstantOrRegex extends Expr {
@@ -368,7 +332,6 @@ private class FileConstructorChildArgumentStep extends AdditionalTaintStep {
       n2.asExpr() = constrCall
     |
       not n1 = DataFlow::BarrierGuard<pathTraversalGuard/3>::getABarrierNode() and
-      not n1 = ValidationMethod<pathTraversalGuard/3>::getAValidatedNode() and
       not TaintTracking::localExprTaint(any(PathNormalizeSanitizer p), n1.asExpr())
       or
       DataFlow::localExprFlow(nullExpr(), constrCall.getArgument(0))
@@ -546,7 +509,6 @@ private predicate directoryCharactersGuard(Guard g, Expr e, boolean branch) {
 private class DirectoryCharactersSanitizer extends PathInjectionSanitizer {
   DirectoryCharactersSanitizer() {
     this.asExpr() instanceof ReplaceDirectoryCharactersSanitizer or
-    this = DataFlow::BarrierGuard<directoryCharactersGuard/3>::getABarrierNode() or
-    this = ValidationMethod<directoryCharactersGuard/3>::getAValidatedNode()
+    this = DataFlow::BarrierGuard<directoryCharactersGuard/3>::getABarrierNode()
   }
 }
diff --git a/java/ql/lib/semmle/code/java/security/RequestForgery.qll b/java/ql/lib/semmle/code/java/security/RequestForgery.qll
index 5eb35c05cd4..dc15ad943bc 100644
--- a/java/ql/lib/semmle/code/java/security/RequestForgery.qll
+++ b/java/ql/lib/semmle/code/java/security/RequestForgery.qll
@@ -164,3 +164,24 @@ private class HostComparisonSanitizer extends RequestForgerySanitizer {
     this = DataFlow::BarrierGuard<isHostComparisonSanitizer/3>::getABarrierNode()
   }
 }
+
+/**
+ * A qualifier in a call to a `.matches()` method that is a sanitizer for URL redirects.
+ *
+ * Matches any method call where the method is named `matches`.
+ */
+private predicate isMatchesSanitizer(Guard guard, Expr e, boolean branch) {
+  guard =
+    any(MethodCall method |
+      method.getMethod().getName() = "matches" and
+      e = method.getQualifier() and
+      branch = true
+    )
+}
+
+/**
+ * A qualifier in a call to `.matches()` that is a sanitizer for URL redirects.
+ */
+private class MatchesSanitizer extends RequestForgerySanitizer {
+  MatchesSanitizer() { this = DataFlow::BarrierGuard<isMatchesSanitizer/3>::getABarrierNode() }
+}
diff --git a/java/ql/lib/semmle/code/java/security/SpringBootActuatorsConfigQuery.qll b/java/ql/lib/semmle/code/java/security/SpringBootActuatorsConfigQuery.qll
new file mode 100644
index 00000000000..163cd46d5d8
--- /dev/null
+++ b/java/ql/lib/semmle/code/java/security/SpringBootActuatorsConfigQuery.qll
@@ -0,0 +1,128 @@
+/** Provides classes and predicates to reason about Spring Boot actuators exposed in configuration files. */
+overlay[local?]
+module;
+
+import java
+private import semmle.code.configfiles.ConfigFiles
+private import semmle.code.xml.MavenPom
+
+/** The parent node of the `org.springframework.boot` group. */
+private class SpringBootParent extends Parent {
+  SpringBootParent() { this.getGroup().getValue() = "org.springframework.boot" }
+}
+
+/** A `Pom` with a Spring Boot parent node. */
+private class SpringBootPom extends Pom {
+  SpringBootPom() { this.getParentElement() instanceof SpringBootParent }
+
+  /** Holds if the Spring Boot Security module is used in the project. */
+  predicate isSpringBootSecurityUsed() {
+    this.getADependency().getArtifact().getValue() = "spring-boot-starter-security"
+  }
+}
+
+/** A dependency with artifactId `spring-boot-starter-actuator`. */
+class SpringBootStarterActuatorDependency extends Dependency {
+  SpringBootStarterActuatorDependency() {
+    this.getArtifact().getValue() = "spring-boot-starter-actuator"
+  }
+}
+
+/** The Spring Boot configuration property `management.security.enabled`. */
+private class ManagementSecurityEnabledProperty extends JavaProperty {
+  ManagementSecurityEnabledProperty() {
+    this.getNameElement().getName() = "management.security.enabled"
+  }
+
+  /** Gets the whitespace-trimmed value of this property. */
+  string getValue() { result = this.getValueElement().getValue().trim() }
+
+  /** Holds if `management.security.enabled` is set to `false`. */
+  predicate hasSecurityDisabled() { this.getValue() = "false" }
+}
+
+/**
+ * The Spring Boot configuration property `management.endpoints.web.exposure.include`
+ * or `management.endpoints.web.expose`.
+ */
+private class ManagementEndpointsExposeProperty extends JavaProperty {
+  ManagementEndpointsExposeProperty() {
+    this.getNameElement().getName() = "management.endpoints.web." + ["exposure.include", "expose"]
+  }
+
+  /** Gets the whitespace-trimmed value of this property. */
+  string getValue() { result = this.getValueElement().getValue().trim() }
+}
+
+private newtype TOption =
+  TNone() or
+  TSome(JavaProperty jp)
+
+/**
+ * An option type that is either a singleton `None` or a `Some` wrapping
+ * the `JavaProperty` type.
+ */
+class JavaPropertyOption extends TOption {
+  /** Gets a textual representation of this element. */
+  string toString() {
+    this = TNone() and result = "(none)"
+    or
+    result = this.asSome().toString()
+  }
+
+  /** Gets the location of this element. */
+  Location getLocation() { result = this.asSome().getLocation() }
+
+  /** Gets the wrapped element, if any. */
+  JavaProperty asSome() { this = TSome(result) }
+
+  /** Holds if this option is the singleton `None`. */
+  predicate isNone() { this = TNone() }
+}
+
+/**
+ * Holds if `JavaPropertyOption` jpOption of a repository using `SpringBootStarterActuatorDependency`
+ * d exposes sensitive Spring Boot Actuator endpoints.
+ */
+predicate exposesSensitiveEndpoint(
+  SpringBootStarterActuatorDependency d, JavaPropertyOption jpOption
+) {
+  exists(PropertiesFile propFile, SpringBootPom pom |
+    d = pom.getADependency() and
+    not pom.isSpringBootSecurityUsed() and
+    propFile
+        .getParentContainer()
+        .getAbsolutePath()
+        .matches(pom.getFile().getParentContainer().getAbsolutePath() + "%") and // in the same sub-directory
+    exists(string springBootVersion |
+      springBootVersion = pom.getParentElement().getVersionString()
+    |
+      springBootVersion.regexpMatch("1\\.[0-4].*") and // version 1.0, 1.1, ..., 1.4
+      not exists(ManagementSecurityEnabledProperty ep | ep.getFile() = propFile) and
+      jpOption.isNone()
+      or
+      springBootVersion.regexpMatch("1\\.[0-5].*") and // version 1.0, 1.1, ..., 1.5
+      exists(ManagementSecurityEnabledProperty ep |
+        ep.hasSecurityDisabled() and ep.getFile() = propFile and ep = jpOption.asSome()
+      )
+      or
+      springBootVersion.matches(["2.%", "3.%"]) and //version 2.x and 3.x
+      exists(ManagementEndpointsExposeProperty ep |
+        ep.getFile() = propFile and
+        ep = jpOption.asSome() and
+        (
+          // all endpoints are exposed
+          ep.getValue() = "*"
+          or
+          // version 2.x: exposes health and info only by default
+          springBootVersion.matches("2.%") and
+          not ep.getValue() = ["health", "info"]
+          or
+          // version 3.x: exposes health only by default
+          springBootVersion.matches("3.%") and
+          not ep.getValue() = "health"
+        )
+      )
+    )
+  )
+}
diff --git a/java/ql/lib/semmle/code/java/security/StaticInitializationVectorQuery.qll b/java/ql/lib/semmle/code/java/security/StaticInitializationVectorQuery.qll
index 282133ec5c6..a0377599054 100644
--- a/java/ql/lib/semmle/code/java/security/StaticInitializationVectorQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/StaticInitializationVectorQuery.qll
@@ -33,6 +33,7 @@ private class StaticByteArrayCreation extends ArrayCreationExpr {
 }
 
 /** An expression that updates `array`. */
+overlay[local?]
 private class ArrayUpdate extends Expr {
   Expr array;
 
diff --git a/java/ql/lib/semmle/code/java/security/TaintedEnvironmentVariableQuery.qll b/java/ql/lib/semmle/code/java/security/TaintedEnvironmentVariableQuery.qll
index d972b59986a..2bc9dba92f0 100644
--- a/java/ql/lib/semmle/code/java/security/TaintedEnvironmentVariableQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/TaintedEnvironmentVariableQuery.qll
@@ -40,8 +40,6 @@ module ExecTaintedEnvironmentConfig implements DataFlow::ConfigSig {
   }
 
   predicate observeDiffInformedIncrementalMode() { any() }
-
-  Location getASelectedSourceLocation(DataFlow::Node source) { none() }
 }
 
 /**
diff --git a/java/ql/lib/semmle/code/java/security/TaintedPermissionsCheckQuery.qll b/java/ql/lib/semmle/code/java/security/TaintedPermissionsCheckQuery.qll
index bbec7d4f4e6..7113c7036e4 100644
--- a/java/ql/lib/semmle/code/java/security/TaintedPermissionsCheckQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/TaintedPermissionsCheckQuery.qll
@@ -63,8 +63,9 @@ module TaintedPermissionsCheckFlowConfig implements DataFlow::ConfigSig {
   predicate observeDiffInformedIncrementalMode() { any() }
 
   Location getASelectedSinkLocation(DataFlow::Node sink) {
-    exists(PermissionsConstruction p |
-      sink.asExpr() = p.getInput() and
+    exists(PermissionsConstruction p | sink.asExpr() = p.getInput() |
+      result = sink.getLocation()
+      or
       result = p.getLocation()
     )
   }
diff --git a/java/ql/lib/semmle/code/java/security/TempDirLocalInformationDisclosureQuery.qll b/java/ql/lib/semmle/code/java/security/TempDirLocalInformationDisclosureQuery.qll
index 098362f2bd5..0ae1d7e4df0 100644
--- a/java/ql/lib/semmle/code/java/security/TempDirLocalInformationDisclosureQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/TempDirLocalInformationDisclosureQuery.qll
@@ -147,8 +147,6 @@ module TempDirSystemGetPropertyToCreateConfig implements DataFlow::ConfigSig {
   }
 
   predicate observeDiffInformedIncrementalMode() { any() }
-
-  Location getASelectedSinkLocation(DataFlow::Node sink) { none() }
 }
 
 /**
diff --git a/java/ql/lib/semmle/code/java/security/TempDirUtils.qll b/java/ql/lib/semmle/code/java/security/TempDirUtils.qll
index 3d1623fa334..21e289ef1ad 100644
--- a/java/ql/lib/semmle/code/java/security/TempDirUtils.qll
+++ b/java/ql/lib/semmle/code/java/security/TempDirUtils.qll
@@ -26,7 +26,8 @@ class MethodFileCreateTempFile extends Method {
 }
 
 /**
- * Holds if `expDest` is some constructor call `new java.io.File(expSource)`, where the specific `File` constructor being used has `paramCount` parameters.
+ * Holds if `expSource` is an argument to a constructor call `exprDest` (constructor from `java.io.File`), where
+ * the specific `File` constructor being used has `paramCount` parameters.
  */
 predicate isFileConstructorArgument(Expr expSource, Expr exprDest, int paramCount) {
   exists(ConstructorCall construtorCall |
diff --git a/java/ql/lib/semmle/code/java/security/UnsafeDeserializationQuery.qll b/java/ql/lib/semmle/code/java/security/UnsafeDeserializationQuery.qll
index ce0f649eff3..dc771a46606 100644
--- a/java/ql/lib/semmle/code/java/security/UnsafeDeserializationQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/UnsafeDeserializationQuery.qll
@@ -313,6 +313,8 @@ private module UnsafeDeserializationConfig implements DataFlow::ConfigSig {
   predicate observeDiffInformedIncrementalMode() { any() }
 
   Location getASelectedSinkLocation(DataFlow::Node sink) {
+    result = sink.(UnsafeDeserializationSink).getLocation()
+    or
     result = sink.(UnsafeDeserializationSink).getMethodCall().getLocation()
   }
 }
@@ -552,7 +554,7 @@ private DataFlow::Node getASafelyConfiguredParser() {
 }
 
 /**
- * Holds if `parseMethodQualifierExpr` is a `jodd.json.JsonParser` instance that is configured unsafely
+ * Holds if `parserExpr` is a `jodd.json.JsonParser` instance that is configured unsafely
  * and which never appears to be configured safely.
  */
 private predicate joddJsonParserConfiguredUnsafely(Expr parserExpr) {
diff --git a/java/ql/lib/semmle/code/java/security/UrlForwardQuery.qll b/java/ql/lib/semmle/code/java/security/UrlForwardQuery.qll
index 7234b4c788f..895e824b3db 100644
--- a/java/ql/lib/semmle/code/java/security/UrlForwardQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/UrlForwardQuery.qll
@@ -69,6 +69,7 @@ private class FollowsBarrierPrefix extends UrlForwardBarrier {
   FollowsBarrierPrefix() { this.asExpr() = any(BarrierPrefix fp).getAnAppendedExpression() }
 }
 
+overlay[local?]
 private class BarrierPrefix extends InterestingPrefix {
   int offset;
 
diff --git a/java/ql/lib/semmle/code/java/security/WebviewDebuggingEnabledQuery.qll b/java/ql/lib/semmle/code/java/security/WebviewDebuggingEnabledQuery.qll
index 080a7bb482f..90e47521bf0 100644
--- a/java/ql/lib/semmle/code/java/security/WebviewDebuggingEnabledQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/WebviewDebuggingEnabledQuery.qll
@@ -46,12 +46,6 @@ module WebviewDebugEnabledConfig implements DataFlow::ConfigSig {
   }
 
   predicate observeDiffInformedIncrementalMode() { any() }
-
-  Location getASelectedSourceLocation(DataFlow::Node source) {
-    // This module is only used in `WebviewDebuggingEnabled.ql`, which doesn't
-    // select the source in any "$@" column.
-    none()
-  }
 }
 
 /**
diff --git a/java/ql/lib/semmle/code/xml/XML.qll b/java/ql/lib/semmle/code/xml/XML.qll
index e4073362fc6..d13a83e7798 100644
--- a/java/ql/lib/semmle/code/xml/XML.qll
+++ b/java/ql/lib/semmle/code/xml/XML.qll
@@ -6,6 +6,7 @@ module;
 
 import semmle.files.FileSystem
 private import codeql.xml.Xml
+private import semmle.code.java.Overlay
 
 private module Input implements InputSig<File, Location> {
   class XmlLocatableBase = @xmllocatable or @xmlnamespaceable;
@@ -69,3 +70,13 @@ private module Input implements InputSig<File, Location> {
 }
 
 import Make<File, Location, Input>
+
+private class DiscardableXmlAttribute extends DiscardableXmlLocatable, @xmlattribute { }
+
+private class DiscardableXmlElement extends DiscardableXmlLocatable, @xmlelement { }
+
+private class DiscardableXmlComment extends DiscardableXmlLocatable, @xmlcomment { }
+
+private class DiscardableXmlCharacters extends DiscardableXmlLocatable, @xmlcharacters { }
+
+private class DiscardableXmlDtd extends DiscardableXmlLocatable, @xmldtd { }
diff --git a/java/ql/lib/upgrades/1b8f5f4c747e4249f4731796ccaa0661c7434d8a/old.dbscheme b/java/ql/lib/upgrades/1b8f5f4c747e4249f4731796ccaa0661c7434d8a/old.dbscheme
new file mode 100644
index 00000000000..1b8f5f4c747
--- /dev/null
+++ b/java/ql/lib/upgrades/1b8f5f4c747e4249f4731796ccaa0661c7434d8a/old.dbscheme
@@ -0,0 +1,1236 @@
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   javac A.java B.java C.java
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   javac A.java B.java C.java
+     */
+    unique int id : @compilation,
+    int kind: int ref,
+    string cwd : string ref,
+    string name : string ref
+);
+
+case @compilation.kind of
+   1  = @javacompilation
+|  2  = @kotlincompilation
+;
+
+compilation_started(
+    int id : @compilation ref
+)
+
+compilation_info(
+    int id : @compilation ref,
+    string info_key: string ref,
+    string info_value: string ref
+)
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   javac A.java B.java C.java
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--javac-args`
+ * 2   | A.java
+ * 3   | B.java
+ * 4   | C.java
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@@@someFile` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   javac A.java B.java C.java
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | A.java
+ * 1   | B.java
+ * 2   | C.java
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * For each file recorded in `compilation_compiling_files`,
+ * there will be a corresponding row in
+ * `compilation_compiling_files_completed` once extraction
+ * of that file is complete. The `result` will indicate the
+ * extraction result:
+ *
+ *     0: Successfully extracted
+ *     1: Errors were encountered, but extraction recovered
+ *     2: Errors were encountered, and extraction could not recover
+ */
+#keyset[id, num]
+compilation_compiling_files_completed(
+    int id : @compilation ref,
+    int num : int ref,
+    int result : int ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * The `cpu_seconds` and `elapsed_seconds` are the CPU time and elapsed
+ * time (respectively) that the original compilation (not the extraction)
+ * took for compiler invocation `id`.
+ */
+compilation_compiler_times(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ * The `result` will indicate the extraction result:
+ *
+ *     0: Successfully extracted
+ *     1: Errors were encountered, but extraction recovered
+ *     2: Errors were encountered, and extraction could not recover
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref,
+    int result : int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    string generated_by: string ref, // TODO: Sync this with the other languages?
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location_default ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    unique int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/*
+ * External artifacts
+ */
+
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+sourceLocationPrefix(
+  string prefix : string ref
+);
+
+databaseMetadata(
+  string metadataKey : string ref,
+  string value : string ref
+);
+
+overlayChangedFiles(
+  string path: string ref
+);
+
+/*
+ * SMAP
+ */
+
+smap_header(
+  int outputFileId: @file ref,
+  string outputFilename: string ref,
+  string defaultStratum: string ref
+);
+
+smap_files(
+  int outputFileId: @file ref,
+  string stratum: string ref,
+  int inputFileNum: int ref,
+  string inputFileName: string ref,
+  int inputFileId: @file ref
+);
+
+smap_lines(
+  int outputFileId: @file ref,
+  string stratum: string ref,
+  int inputFileNum: int ref,
+  int inputStartLine: int ref,
+  int inputLineCount: int ref,
+  int outputStartLine: int ref,
+  int outputLineIncrement: int ref
+);
+
+/*
+ * Locations and files
+ */
+
+@location = @location_default ;
+
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+hasLocation(
+  int locatableid: @locatable ref,
+  int id: @location ref
+);
+
+@sourceline = @locatable ;
+
+#keyset[element_id]
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @folder | @file
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*
+ * Java
+ */
+
+cupackage(
+  unique int id: @file ref,
+  int packageid: @package ref
+);
+
+#keyset[fileid,keyName]
+jarManifestMain(
+  int fileid: @file ref,
+  string keyName: string ref,
+  string value: string ref
+);
+
+#keyset[fileid,entryName,keyName]
+jarManifestEntries(
+  int fileid: @file ref,
+  string entryName: string ref,
+  string keyName: string ref,
+  string value: string ref
+);
+
+packages(
+  unique int id: @package,
+  string nodeName: string ref
+);
+
+primitives(
+  unique int id: @primitive,
+  string nodeName: string ref
+);
+
+modifiers(
+  unique int id: @modifier,
+  string nodeName: string ref
+);
+
+/**
+ * An errortype is used when the extractor is unable to extract a type
+ * correctly for some reason.
+ */
+error_type(
+  unique int id: @errortype
+);
+
+classes_or_interfaces(
+  unique int id: @classorinterface,
+  string nodeName: string ref,
+  int parentid: @package ref,
+  int sourceid: @classorinterface ref
+);
+
+file_class(
+  int id: @classorinterface ref
+);
+
+class_object(
+  unique int id: @classorinterface ref,
+  unique int instance: @field ref
+);
+
+type_companion_object(
+  unique int id: @classorinterface ref,
+  unique int instance: @field ref,
+  unique int companion_object: @classorinterface ref
+);
+
+kt_nullable_types(
+  unique int id: @kt_nullable_type,
+  int classid: @reftype ref
+)
+
+kt_notnull_types(
+  unique int id: @kt_notnull_type,
+  int classid: @reftype ref
+)
+
+kt_type_alias(
+  unique int id: @kt_type_alias,
+  string name: string ref,
+  int kttypeid: @kt_type ref
+)
+
+@kt_type = @kt_nullable_type | @kt_notnull_type
+
+isInterface(
+  unique int id: @classorinterface ref
+);
+
+isRecord(
+  unique int id: @classorinterface ref
+);
+
+fielddecls(
+  unique int id: @fielddecl,
+  int parentid: @reftype ref
+);
+
+#keyset[fieldId] #keyset[fieldDeclId,pos]
+fieldDeclaredIn(
+  int fieldId: @field ref,
+  int fieldDeclId: @fielddecl ref,
+  int pos: int ref
+);
+
+fields(
+  unique int id: @field,
+  string nodeName: string ref,
+  int typeid: @type ref,
+  int parentid: @reftype ref
+);
+
+fieldsKotlinType(
+  unique int id: @field ref,
+  int kttypeid: @kt_type ref
+);
+
+constrs(
+  unique int id: @constructor,
+  string nodeName: string ref,
+  string signature: string ref,
+  int typeid: @type ref,
+  int parentid: @reftype ref,
+  int sourceid: @constructor ref
+);
+
+constrsKotlinType(
+  unique int id: @constructor ref,
+  int kttypeid: @kt_type ref
+);
+
+methods(
+  unique int id: @method,
+  string nodeName: string ref,
+  string signature: string ref,
+  int typeid: @type ref,
+  int parentid: @reftype ref,
+  int sourceid: @method ref
+);
+
+methodsKotlinType(
+  unique int id: @method ref,
+  int kttypeid: @kt_type ref
+);
+
+#keyset[parentid,pos]
+params(
+  unique int id: @param,
+  int typeid: @type ref,
+  int pos: int ref,
+  int parentid: @callable ref,
+  int sourceid: @param ref
+);
+
+paramsKotlinType(
+  unique int id: @param ref,
+  int kttypeid: @kt_type ref
+);
+
+paramName(
+  unique int id: @param ref,
+  string nodeName: string ref
+);
+
+isVarargsParam(
+  int param: @param ref
+);
+
+exceptions(
+  unique int id: @exception,
+  int typeid: @type ref,
+  int parentid: @callable ref
+);
+
+isAnnotType(
+  int interfaceid: @classorinterface ref
+);
+
+isAnnotElem(
+  int methodid: @method ref
+);
+
+annotValue(
+  int parentid: @annotation ref,
+  int id2: @method ref,
+  unique int value: @expr ref
+);
+
+isEnumType(
+  int classid: @classorinterface ref
+);
+
+isEnumConst(
+  int fieldid: @field ref
+);
+
+#keyset[parentid,pos]
+typeVars(
+  unique int id: @typevariable,
+  string nodeName: string ref,
+  int pos: int ref,
+  int parentid: @classorinterfaceorcallable ref
+);
+
+wildcards(
+  unique int id: @wildcard,
+  string nodeName: string ref,
+  int kind: int ref
+);
+
+#keyset[parentid,pos]
+typeBounds(
+  unique int id: @typebound,
+  int typeid: @reftype ref,
+  int pos: int ref,
+  int parentid: @boundedtype ref
+);
+
+#keyset[parentid,pos]
+typeArgs(
+  int argumentid: @reftype ref,
+  int pos: int ref,
+  int parentid: @classorinterfaceorcallable ref
+);
+
+isParameterized(
+  int memberid: @member ref
+);
+
+isRaw(
+  int memberid: @member ref
+);
+
+#keyset[classid] #keyset[parent]
+isAnonymClass(
+  int classid: @classorinterface ref,
+  int parent: @classinstancexpr ref
+);
+
+#keyset[typeid] #keyset[parent]
+isLocalClassOrInterface(
+  int typeid: @classorinterface ref,
+  int parent: @localtypedeclstmt ref
+);
+
+isDefConstr(
+  int constructorid: @constructor ref
+);
+
+#keyset[exprId]
+lambdaKind(
+  int exprId: @lambdaexpr ref,
+  int bodyKind: int ref
+);
+
+isCanonicalConstr(
+  int constructorid: @constructor ref
+);
+
+arrays(
+  unique int id: @array,
+  string nodeName: string ref,
+  int elementtypeid: @type ref,
+  int dimension: int ref,
+  int componenttypeid: @type ref
+);
+
+enclInReftype(
+  unique int child: @reftype ref,
+  int parent: @reftype ref
+);
+
+extendsReftype(
+  int id1: @reftype ref,
+  int id2: @classorinterface ref
+);
+
+implInterface(
+  int id1: @classorarray ref,
+  int id2: @classorinterface ref
+);
+
+permits(
+  int id1: @classorinterface ref,
+  int id2: @classorinterface ref
+);
+
+hasModifier(
+  int id1: @modifiable ref,
+  int id2: @modifier ref
+);
+
+imports(
+  unique int id: @import,
+  int holder: @classorinterfaceorpackage ref,
+  string name: string ref,
+  int kind: int ref
+);
+
+#keyset[parent,idx]
+stmts(
+  unique int id: @stmt,
+  int kind: int ref,
+  int parent: @stmtparent ref,
+  int idx: int ref,
+  int bodydecl: @callable ref
+);
+
+@stmtparent = @callable | @stmt | @switchexpr | @whenexpr| @stmtexpr;
+
+case @stmt.kind of
+  0 = @block
+| 1 = @ifstmt
+| 2 = @forstmt
+| 3 = @enhancedforstmt
+| 4 = @whilestmt
+| 5 = @dostmt
+| 6 = @trystmt
+| 7 = @switchstmt
+| 8 = @synchronizedstmt
+| 9 = @returnstmt
+| 10 = @throwstmt
+| 11 = @breakstmt
+| 12 = @continuestmt
+| 13 = @emptystmt
+| 14 = @exprstmt
+| 15 = @labeledstmt
+| 16 = @assertstmt
+| 17 = @localvariabledeclstmt
+| 18 = @localtypedeclstmt
+| 19 = @constructorinvocationstmt
+| 20 = @superconstructorinvocationstmt
+| 21 = @case
+| 22 = @catchclause
+| 23 = @yieldstmt
+| 24 = @errorstmt
+| 25 = @whenbranch
+;
+
+#keyset[parent,idx]
+exprs(
+  unique int id: @expr,
+  int kind: int ref,
+  int typeid: @type ref,
+  int parent: @exprparent ref,
+  int idx: int ref
+);
+
+exprsKotlinType(
+  unique int id: @expr ref,
+  int kttypeid: @kt_type ref
+);
+
+callableEnclosingExpr(
+  unique int id: @expr ref,
+  int callable_id: @callable ref
+);
+
+statementEnclosingExpr(
+  unique int id: @expr ref,
+  int statement_id: @stmt ref
+);
+
+isParenthesized(
+  unique int id: @expr ref,
+  int parentheses: int ref
+);
+
+case @expr.kind of
+   1  = @arrayaccess
+|  2  = @arraycreationexpr
+|  3  = @arrayinit
+|  4  = @assignexpr
+|  5  = @assignaddexpr
+|  6  = @assignsubexpr
+|  7  = @assignmulexpr
+|  8  = @assigndivexpr
+|  9  = @assignremexpr
+| 10  = @assignandexpr
+| 11  = @assignorexpr
+| 12  = @assignxorexpr
+| 13  = @assignlshiftexpr
+| 14  = @assignrshiftexpr
+| 15  = @assignurshiftexpr
+| 16  = @booleanliteral
+| 17  = @integerliteral
+| 18  = @longliteral
+| 19  = @floatingpointliteral
+| 20  = @doubleliteral
+| 21  = @characterliteral
+| 22  = @stringliteral
+| 23  = @nullliteral
+| 24  = @mulexpr
+| 25  = @divexpr
+| 26  = @remexpr
+| 27  = @addexpr
+| 28  = @subexpr
+| 29  = @lshiftexpr
+| 30  = @rshiftexpr
+| 31  = @urshiftexpr
+| 32  = @andbitexpr
+| 33  = @orbitexpr
+| 34  = @xorbitexpr
+| 35  = @andlogicalexpr
+| 36  = @orlogicalexpr
+| 37  = @ltexpr
+| 38  = @gtexpr
+| 39  = @leexpr
+| 40  = @geexpr
+| 41  = @eqexpr
+| 42  = @neexpr
+| 43  = @postincexpr
+| 44  = @postdecexpr
+| 45  = @preincexpr
+| 46  = @predecexpr
+| 47  = @minusexpr
+| 48  = @plusexpr
+| 49  = @bitnotexpr
+| 50  = @lognotexpr
+| 51  = @castexpr
+| 52  = @newexpr
+| 53  = @conditionalexpr
+| 54  = @parexpr         // deprecated
+| 55  = @instanceofexpr
+| 56  = @localvariabledeclexpr
+| 57  = @typeliteral
+| 58  = @thisaccess
+| 59  = @superaccess
+| 60  = @varaccess
+| 61  = @methodaccess
+| 62  = @unannotatedtypeaccess
+| 63  = @arraytypeaccess
+| 64  = @packageaccess
+| 65  = @wildcardtypeaccess
+| 66  = @declannotation
+| 67  = @uniontypeaccess
+| 68  = @lambdaexpr
+| 69  = @memberref
+| 70  = @annotatedtypeaccess
+| 71  = @typeannotation
+| 72  = @intersectiontypeaccess
+| 73  = @switchexpr
+| 74  = @errorexpr
+| 75  = @whenexpr
+| 76  = @getclassexpr
+| 77  = @safecastexpr
+| 78  = @implicitcastexpr
+| 79  = @implicitnotnullexpr
+| 80  = @implicitcoerciontounitexpr
+| 81  = @notinstanceofexpr
+| 82  = @stmtexpr
+| 83  = @stringtemplateexpr
+| 84  = @notnullexpr
+| 85  = @unsafecoerceexpr
+| 86  = @valueeqexpr
+| 87  = @valueneexpr
+| 88  = @propertyref
+| 89  = @recordpatternexpr
+;
+
+/** Holds if this `when` expression was written as an `if` expression. */
+when_if(unique int id: @whenexpr ref);
+
+/** Holds if this `when` branch was written as an `else` branch. */
+when_branch_else(unique int id: @whenbranch ref);
+
+@classinstancexpr = @newexpr | @lambdaexpr | @memberref | @propertyref
+
+@annotation = @declannotation | @typeannotation
+@typeaccess = @unannotatedtypeaccess | @annotatedtypeaccess
+
+@assignment = @assignexpr
+             | @assignop;
+
+@unaryassignment = @postincexpr
+                 | @postdecexpr
+                 | @preincexpr
+                 | @predecexpr;
+
+@assignop = @assignaddexpr
+             | @assignsubexpr
+             | @assignmulexpr
+             | @assigndivexpr
+             | @assignremexpr
+             | @assignandexpr
+             | @assignorexpr
+             | @assignxorexpr
+             | @assignlshiftexpr
+             | @assignrshiftexpr
+             | @assignurshiftexpr;
+
+@literal = @booleanliteral
+             | @integerliteral
+             | @longliteral
+             | @floatingpointliteral
+             | @doubleliteral
+             | @characterliteral
+             | @stringliteral
+             | @nullliteral;
+
+@binaryexpr = @mulexpr
+             | @divexpr
+             | @remexpr
+             | @addexpr
+             | @subexpr
+             | @lshiftexpr
+             | @rshiftexpr
+             | @urshiftexpr
+             | @andbitexpr
+             | @orbitexpr
+             | @xorbitexpr
+             | @andlogicalexpr
+             | @orlogicalexpr
+             | @ltexpr
+             | @gtexpr
+             | @leexpr
+             | @geexpr
+             | @eqexpr
+             | @neexpr
+             | @valueeqexpr
+             | @valueneexpr;
+
+@unaryexpr =   @postincexpr
+             | @postdecexpr
+             | @preincexpr
+             | @predecexpr
+             | @minusexpr
+             | @plusexpr
+             | @bitnotexpr
+             | @lognotexpr
+             | @notnullexpr;
+
+@caller =  @classinstancexpr
+         | @methodaccess
+         | @constructorinvocationstmt
+         | @superconstructorinvocationstmt;
+
+callableBinding(
+  unique int callerid: @caller ref,
+  int callee: @callable ref
+);
+
+memberRefBinding(
+  unique int id: @expr ref,
+  int callable: @callable ref
+);
+
+propertyRefGetBinding(
+  unique int id: @expr ref,
+  int getter: @callable ref
+);
+
+propertyRefFieldBinding(
+  unique int id: @expr ref,
+  int field: @field ref
+);
+
+propertyRefSetBinding(
+  unique int id: @expr ref,
+  int setter: @callable ref
+);
+
+@exprparent = @stmt | @expr | @whenbranch | @callable | @field | @fielddecl | @classorinterface | @param | @localvar | @typevariable;
+
+variableBinding(
+  unique int expr: @varaccess ref,
+  int variable: @variable ref
+);
+
+@variable = @localscopevariable | @field;
+
+@localscopevariable = @localvar | @param;
+
+localvars(
+  unique int id: @localvar,
+  string nodeName: string ref,
+  int typeid: @type ref,
+  int parentid: @localvariabledeclexpr ref
+);
+
+localvarsKotlinType(
+  unique int id: @localvar ref,
+  int kttypeid: @kt_type ref
+);
+
+@namedexprorstmt = @breakstmt
+                 | @continuestmt
+                 | @labeledstmt
+                 | @literal;
+
+namestrings(
+  string name: string ref,
+  string value: string ref,
+  unique int parent: @namedexprorstmt ref
+);
+
+/*
+ * Modules
+ */
+
+#keyset[name]
+modules(
+  unique int id: @module,
+  string name: string ref
+);
+
+isOpen(
+  int id: @module ref
+);
+
+#keyset[fileId]
+cumodule(
+  int fileId: @file ref,
+  int moduleId: @module ref
+);
+
+@directive = @requires
+           | @exports
+           | @opens
+           | @uses
+           | @provides
+
+#keyset[directive]
+directives(
+  int id: @module ref,
+  int directive: @directive ref
+);
+
+requires(
+  unique int id: @requires,
+  int target: @module ref
+);
+
+isTransitive(
+  int id: @requires ref
+);
+
+isStatic(
+  int id: @requires ref
+);
+
+exports(
+  unique int id: @exports,
+  int target: @package ref
+);
+
+exportsTo(
+  int id: @exports ref,
+  int target: @module ref
+);
+
+opens(
+  unique int id: @opens,
+  int target: @package ref
+);
+
+opensTo(
+  int id: @opens ref,
+  int target: @module ref
+);
+
+uses(
+  unique int id: @uses,
+  string serviceInterface: string ref
+);
+
+provides(
+  unique int id: @provides,
+  string serviceInterface: string ref
+);
+
+providesWith(
+  int id: @provides ref,
+  string serviceImpl: string ref
+);
+
+isNullDefaultCase(
+  int id: @case ref
+);
+
+/*
+ * Javadoc
+ */
+
+javadoc(
+  unique int id: @javadoc
+);
+
+isNormalComment(
+  int commentid : @javadoc ref
+);
+
+isEolComment(
+  int commentid : @javadoc ref
+);
+
+hasJavadoc(
+  int documentableid: @member ref,
+  int javadocid: @javadoc ref
+);
+
+#keyset[parentid,idx]
+javadocTag(
+  unique int id: @javadocTag,
+  string name: string ref,
+  int parentid: @javadocParent ref,
+  int idx: int ref
+);
+
+#keyset[parentid,idx]
+javadocText(
+  unique int id: @javadocText,
+  string text: string ref,
+  int parentid: @javadocParent ref,
+  int idx: int ref
+);
+
+@javadocParent = @javadoc | @javadocTag;
+@javadocElement = @javadocTag | @javadocText;
+
+@classorinterfaceorpackage = @classorinterface | @package;
+@classorinterfaceorcallable = @classorinterface | @callable;
+@boundedtype = @typevariable | @wildcard;
+@reftype = @classorinterface | @array | @boundedtype | @errortype;
+@classorarray = @classorinterface | @array;
+@type = @primitive | @reftype;
+@callable = @method | @constructor;
+
+/** A program element that has a name. */
+@element = @package | @modifier | @annotation | @errortype |
+           @locatableElement;
+
+@locatableElement = @file | @primitive | @classorinterface | @method | @constructor | @param | @exception | @field |
+                    @boundedtype | @array | @localvar | @expr | @stmt | @import | @fielddecl | @kt_type | @kt_type_alias |
+                    @kt_property;
+
+@modifiable = @member_modifiable| @param | @localvar | @typevariable;
+
+@member_modifiable = @classorinterface | @method | @constructor | @field | @kt_property;
+
+@member = @method | @constructor | @field | @reftype ;
+
+/** A program element that has a location. */
+@locatable = @typebound | @javadoc | @javadocTag | @javadocText | @xmllocatable | @ktcomment |
+             @locatableElement;
+
+@top = @element | @locatable | @folder;
+
+/*
+ * XML Files
+ */
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+/*
+ * configuration files with key value pairs
+ */
+
+configs(
+  unique int id: @config
+);
+
+configNames(
+  unique int id: @configName,
+  int config: @config ref,
+  string name: string ref
+);
+
+configValues(
+  unique int id: @configValue,
+  int config: @config ref,
+  string value: string ref
+);
+
+configLocations(
+  int locatable: @configLocatable ref,
+  int location: @location_default ref
+);
+
+@configLocatable = @config | @configName | @configValue;
+
+ktComments(
+  unique int id: @ktcomment,
+  int kind: int ref,
+  string text : string ref
+)
+
+ktCommentSections(
+  unique int id: @ktcommentsection,
+  int comment: @ktcomment ref,
+  string content : string ref
+)
+
+ktCommentSectionNames(
+  unique int id: @ktcommentsection ref,
+  string name : string ref
+)
+
+ktCommentSectionSubjectNames(
+  unique int id: @ktcommentsection ref,
+  string subjectname : string ref
+)
+
+#keyset[id, owner]
+ktCommentOwners(
+  int id: @ktcomment ref,
+  int owner: @top ref
+)
+
+ktExtensionFunctions(
+  unique int id: @method ref,
+  int typeid: @type ref,
+  int kttypeid: @kt_type ref
+)
+
+ktProperties(
+  unique int id: @kt_property,
+  string nodeName: string ref
+)
+
+ktPropertyGetters(
+  unique int id: @kt_property ref,
+  int getter: @method ref
+)
+
+ktPropertySetters(
+  unique int id: @kt_property ref,
+  int setter: @method ref
+)
+
+ktPropertyBackingFields(
+  unique int id: @kt_property ref,
+  int backingField: @field ref
+)
+
+ktSyntheticBody(
+  unique int id: @callable ref,
+  int kind: int ref
+  // 1: ENUM_VALUES
+  // 2: ENUM_VALUEOF
+  // 3: ENUM_ENTRIES
+)
+
+ktLocalFunction(
+  unique int id: @method ref
+)
+
+ktInitializerAssignment(
+  unique int id: @assignexpr ref
+)
+
+ktPropertyDelegates(
+  unique int id: @kt_property ref,
+  unique int variableId: @variable ref
+)
+
+/**
+ * If `id` is a compiler generated element, then the kind indicates the
+ * reason that the compiler generated it.
+ * See `Element.compilerGeneratedReason()` for an explanation of what
+ * each `kind` means.
+ */
+compiler_generated(
+  unique int id: @element ref,
+  int kind: int ref
+)
+
+ktFunctionOriginalNames(
+  unique int id: @method ref,
+  string name: string ref
+)
+
+ktDataClasses(
+  unique int id: @classorinterface ref
+)
diff --git a/java/ql/lib/upgrades/1b8f5f4c747e4249f4731796ccaa0661c7434d8a/semmlecode.dbscheme b/java/ql/lib/upgrades/1b8f5f4c747e4249f4731796ccaa0661c7434d8a/semmlecode.dbscheme
new file mode 100644
index 00000000000..9f6026c4009
--- /dev/null
+++ b/java/ql/lib/upgrades/1b8f5f4c747e4249f4731796ccaa0661c7434d8a/semmlecode.dbscheme
@@ -0,0 +1,1240 @@
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   javac A.java B.java C.java
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   javac A.java B.java C.java
+     */
+    unique int id : @compilation,
+    int kind: int ref,
+    string cwd : string ref,
+    string name : string ref
+);
+
+case @compilation.kind of
+   1  = @javacompilation
+|  2  = @kotlincompilation
+;
+
+compilation_started(
+    int id : @compilation ref
+)
+
+compilation_info(
+    int id : @compilation ref,
+    string info_key: string ref,
+    string info_value: string ref
+)
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   javac A.java B.java C.java
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--javac-args`
+ * 2   | A.java
+ * 3   | B.java
+ * 4   | C.java
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@@@someFile` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   javac A.java B.java C.java
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | A.java
+ * 1   | B.java
+ * 2   | C.java
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * For each file recorded in `compilation_compiling_files`,
+ * there will be a corresponding row in
+ * `compilation_compiling_files_completed` once extraction
+ * of that file is complete. The `result` will indicate the
+ * extraction result:
+ *
+ *     0: Successfully extracted
+ *     1: Errors were encountered, but extraction recovered
+ *     2: Errors were encountered, and extraction could not recover
+ */
+#keyset[id, num]
+compilation_compiling_files_completed(
+    int id : @compilation ref,
+    int num : int ref,
+    int result : int ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * The `cpu_seconds` and `elapsed_seconds` are the CPU time and elapsed
+ * time (respectively) that the original compilation (not the extraction)
+ * took for compiler invocation `id`.
+ */
+compilation_compiler_times(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ * The `result` will indicate the extraction result:
+ *
+ *     0: Successfully extracted
+ *     1: Errors were encountered, but extraction recovered
+ *     2: Errors were encountered, and extraction could not recover
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref,
+    int result : int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    string generated_by: string ref, // TODO: Sync this with the other languages?
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location_default ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    unique int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/*
+ * External artifacts
+ */
+
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+sourceLocationPrefix(
+  string prefix : string ref
+);
+
+databaseMetadata(
+  string metadataKey : string ref,
+  string value : string ref
+);
+
+overlayChangedFiles(
+  string path: string ref
+);
+
+/*
+ * SMAP
+ */
+
+smap_header(
+  int outputFileId: @file ref,
+  string outputFilename: string ref,
+  string defaultStratum: string ref
+);
+
+smap_files(
+  int outputFileId: @file ref,
+  string stratum: string ref,
+  int inputFileNum: int ref,
+  string inputFileName: string ref,
+  int inputFileId: @file ref
+);
+
+smap_lines(
+  int outputFileId: @file ref,
+  string stratum: string ref,
+  int inputFileNum: int ref,
+  int inputStartLine: int ref,
+  int inputLineCount: int ref,
+  int outputStartLine: int ref,
+  int outputLineIncrement: int ref
+);
+
+/*
+ * Locations and files
+ */
+
+@location = @location_default ;
+
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+hasLocation(
+  int locatableid: @locatable ref,
+  int id: @location ref
+);
+
+@sourceline = @locatable ;
+
+#keyset[element_id]
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @folder | @file
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*
+ * Java
+ */
+
+cupackage(
+  unique int id: @file ref,
+  int packageid: @package ref
+);
+
+#keyset[fileid,keyName]
+jarManifestMain(
+  int fileid: @file ref,
+  string keyName: string ref,
+  string value: string ref
+);
+
+#keyset[fileid,entryName,keyName]
+jarManifestEntries(
+  int fileid: @file ref,
+  string entryName: string ref,
+  string keyName: string ref,
+  string value: string ref
+);
+
+packages(
+  unique int id: @package,
+  string nodeName: string ref
+);
+
+primitives(
+  unique int id: @primitive,
+  string nodeName: string ref
+);
+
+modifiers(
+  unique int id: @modifier,
+  string nodeName: string ref
+);
+
+/**
+ * An errortype is used when the extractor is unable to extract a type
+ * correctly for some reason.
+ */
+error_type(
+  unique int id: @errortype
+);
+
+classes_or_interfaces(
+  unique int id: @classorinterface,
+  string nodeName: string ref,
+  int parentid: @package ref,
+  int sourceid: @classorinterface ref
+);
+
+file_class(
+  int id: @classorinterface ref
+);
+
+class_object(
+  unique int id: @classorinterface ref,
+  unique int instance: @field ref
+);
+
+type_companion_object(
+  unique int id: @classorinterface ref,
+  unique int instance: @field ref,
+  unique int companion_object: @classorinterface ref
+);
+
+kt_nullable_types(
+  unique int id: @kt_nullable_type,
+  int classid: @reftype ref
+)
+
+kt_notnull_types(
+  unique int id: @kt_notnull_type,
+  int classid: @reftype ref
+)
+
+kt_type_alias(
+  unique int id: @kt_type_alias,
+  string name: string ref,
+  int kttypeid: @kt_type ref
+)
+
+@kt_type = @kt_nullable_type | @kt_notnull_type
+
+isInterface(
+  unique int id: @classorinterface ref
+);
+
+isRecord(
+  unique int id: @classorinterface ref
+);
+
+fielddecls(
+  unique int id: @fielddecl,
+  int parentid: @reftype ref
+);
+
+#keyset[fieldId] #keyset[fieldDeclId,pos]
+fieldDeclaredIn(
+  int fieldId: @field ref,
+  int fieldDeclId: @fielddecl ref,
+  int pos: int ref
+);
+
+fields(
+  unique int id: @field,
+  string nodeName: string ref,
+  int typeid: @type ref,
+  int parentid: @reftype ref
+);
+
+fieldsKotlinType(
+  unique int id: @field ref,
+  int kttypeid: @kt_type ref
+);
+
+constrs(
+  unique int id: @constructor,
+  string nodeName: string ref,
+  string signature: string ref,
+  int typeid: @type ref,
+  int parentid: @reftype ref,
+  int sourceid: @constructor ref
+);
+
+constrsKotlinType(
+  unique int id: @constructor ref,
+  int kttypeid: @kt_type ref
+);
+
+methods(
+  unique int id: @method,
+  string nodeName: string ref,
+  string signature: string ref,
+  int typeid: @type ref,
+  int parentid: @reftype ref,
+  int sourceid: @method ref
+);
+
+methodsKotlinType(
+  unique int id: @method ref,
+  int kttypeid: @kt_type ref
+);
+
+#keyset[parentid,pos]
+params(
+  unique int id: @param,
+  int typeid: @type ref,
+  int pos: int ref,
+  int parentid: @callable ref,
+  int sourceid: @param ref
+);
+
+paramsKotlinType(
+  unique int id: @param ref,
+  int kttypeid: @kt_type ref
+);
+
+paramName(
+  unique int id: @param ref,
+  string nodeName: string ref
+);
+
+isVarargsParam(
+  int param: @param ref
+);
+
+exceptions(
+  unique int id: @exception,
+  int typeid: @type ref,
+  int parentid: @callable ref
+);
+
+isAnnotType(
+  int interfaceid: @classorinterface ref
+);
+
+isAnnotElem(
+  int methodid: @method ref
+);
+
+annotValue(
+  int parentid: @annotation ref,
+  int id2: @method ref,
+  unique int value: @expr ref
+);
+
+isEnumType(
+  int classid: @classorinterface ref
+);
+
+isEnumConst(
+  int fieldid: @field ref
+);
+
+#keyset[parentid,pos]
+typeVars(
+  unique int id: @typevariable,
+  string nodeName: string ref,
+  int pos: int ref,
+  int parentid: @classorinterfaceorcallable ref
+);
+
+wildcards(
+  unique int id: @wildcard,
+  string nodeName: string ref,
+  int kind: int ref
+);
+
+#keyset[parentid,pos]
+typeBounds(
+  unique int id: @typebound,
+  int typeid: @reftype ref,
+  int pos: int ref,
+  int parentid: @boundedtype ref
+);
+
+#keyset[parentid,pos]
+typeArgs(
+  int argumentid: @reftype ref,
+  int pos: int ref,
+  int parentid: @classorinterfaceorcallable ref
+);
+
+isParameterized(
+  int memberid: @member ref
+);
+
+isRaw(
+  int memberid: @member ref
+);
+
+#keyset[classid] #keyset[parent]
+isAnonymClass(
+  int classid: @classorinterface ref,
+  int parent: @classinstancexpr ref
+);
+
+#keyset[typeid] #keyset[parent]
+isLocalClassOrInterface(
+  int typeid: @classorinterface ref,
+  int parent: @localtypedeclstmt ref
+);
+
+isImplicitClass(
+  unique int classid: @classorinterface ref
+);
+
+isDefConstr(
+  int constructorid: @constructor ref
+);
+
+#keyset[exprId]
+lambdaKind(
+  int exprId: @lambdaexpr ref,
+  int bodyKind: int ref
+);
+
+isCanonicalConstr(
+  int constructorid: @constructor ref
+);
+
+arrays(
+  unique int id: @array,
+  string nodeName: string ref,
+  int elementtypeid: @type ref,
+  int dimension: int ref,
+  int componenttypeid: @type ref
+);
+
+enclInReftype(
+  unique int child: @reftype ref,
+  int parent: @reftype ref
+);
+
+extendsReftype(
+  int id1: @reftype ref,
+  int id2: @classorinterface ref
+);
+
+implInterface(
+  int id1: @classorarray ref,
+  int id2: @classorinterface ref
+);
+
+permits(
+  int id1: @classorinterface ref,
+  int id2: @classorinterface ref
+);
+
+hasModifier(
+  int id1: @modifiable ref,
+  int id2: @modifier ref
+);
+
+imports(
+  unique int id: @import,
+  int holder: @classorinterfaceorpackage ref,
+  string name: string ref,
+  int kind: int ref
+);
+
+#keyset[parent,idx]
+stmts(
+  unique int id: @stmt,
+  int kind: int ref,
+  int parent: @stmtparent ref,
+  int idx: int ref,
+  int bodydecl: @callable ref
+);
+
+@stmtparent = @callable | @stmt | @switchexpr | @whenexpr| @stmtexpr;
+
+case @stmt.kind of
+  0 = @block
+| 1 = @ifstmt
+| 2 = @forstmt
+| 3 = @enhancedforstmt
+| 4 = @whilestmt
+| 5 = @dostmt
+| 6 = @trystmt
+| 7 = @switchstmt
+| 8 = @synchronizedstmt
+| 9 = @returnstmt
+| 10 = @throwstmt
+| 11 = @breakstmt
+| 12 = @continuestmt
+| 13 = @emptystmt
+| 14 = @exprstmt
+| 15 = @labeledstmt
+| 16 = @assertstmt
+| 17 = @localvariabledeclstmt
+| 18 = @localtypedeclstmt
+| 19 = @constructorinvocationstmt
+| 20 = @superconstructorinvocationstmt
+| 21 = @case
+| 22 = @catchclause
+| 23 = @yieldstmt
+| 24 = @errorstmt
+| 25 = @whenbranch
+;
+
+#keyset[parent,idx]
+exprs(
+  unique int id: @expr,
+  int kind: int ref,
+  int typeid: @type ref,
+  int parent: @exprparent ref,
+  int idx: int ref
+);
+
+exprsKotlinType(
+  unique int id: @expr ref,
+  int kttypeid: @kt_type ref
+);
+
+callableEnclosingExpr(
+  unique int id: @expr ref,
+  int callable_id: @callable ref
+);
+
+statementEnclosingExpr(
+  unique int id: @expr ref,
+  int statement_id: @stmt ref
+);
+
+isParenthesized(
+  unique int id: @expr ref,
+  int parentheses: int ref
+);
+
+case @expr.kind of
+   1  = @arrayaccess
+|  2  = @arraycreationexpr
+|  3  = @arrayinit
+|  4  = @assignexpr
+|  5  = @assignaddexpr
+|  6  = @assignsubexpr
+|  7  = @assignmulexpr
+|  8  = @assigndivexpr
+|  9  = @assignremexpr
+| 10  = @assignandexpr
+| 11  = @assignorexpr
+| 12  = @assignxorexpr
+| 13  = @assignlshiftexpr
+| 14  = @assignrshiftexpr
+| 15  = @assignurshiftexpr
+| 16  = @booleanliteral
+| 17  = @integerliteral
+| 18  = @longliteral
+| 19  = @floatingpointliteral
+| 20  = @doubleliteral
+| 21  = @characterliteral
+| 22  = @stringliteral
+| 23  = @nullliteral
+| 24  = @mulexpr
+| 25  = @divexpr
+| 26  = @remexpr
+| 27  = @addexpr
+| 28  = @subexpr
+| 29  = @lshiftexpr
+| 30  = @rshiftexpr
+| 31  = @urshiftexpr
+| 32  = @andbitexpr
+| 33  = @orbitexpr
+| 34  = @xorbitexpr
+| 35  = @andlogicalexpr
+| 36  = @orlogicalexpr
+| 37  = @ltexpr
+| 38  = @gtexpr
+| 39  = @leexpr
+| 40  = @geexpr
+| 41  = @eqexpr
+| 42  = @neexpr
+| 43  = @postincexpr
+| 44  = @postdecexpr
+| 45  = @preincexpr
+| 46  = @predecexpr
+| 47  = @minusexpr
+| 48  = @plusexpr
+| 49  = @bitnotexpr
+| 50  = @lognotexpr
+| 51  = @castexpr
+| 52  = @newexpr
+| 53  = @conditionalexpr
+| 54  = @parexpr         // deprecated
+| 55  = @instanceofexpr
+| 56  = @localvariabledeclexpr
+| 57  = @typeliteral
+| 58  = @thisaccess
+| 59  = @superaccess
+| 60  = @varaccess
+| 61  = @methodaccess
+| 62  = @unannotatedtypeaccess
+| 63  = @arraytypeaccess
+| 64  = @packageaccess
+| 65  = @wildcardtypeaccess
+| 66  = @declannotation
+| 67  = @uniontypeaccess
+| 68  = @lambdaexpr
+| 69  = @memberref
+| 70  = @annotatedtypeaccess
+| 71  = @typeannotation
+| 72  = @intersectiontypeaccess
+| 73  = @switchexpr
+| 74  = @errorexpr
+| 75  = @whenexpr
+| 76  = @getclassexpr
+| 77  = @safecastexpr
+| 78  = @implicitcastexpr
+| 79  = @implicitnotnullexpr
+| 80  = @implicitcoerciontounitexpr
+| 81  = @notinstanceofexpr
+| 82  = @stmtexpr
+| 83  = @stringtemplateexpr
+| 84  = @notnullexpr
+| 85  = @unsafecoerceexpr
+| 86  = @valueeqexpr
+| 87  = @valueneexpr
+| 88  = @propertyref
+| 89  = @recordpatternexpr
+;
+
+/** Holds if this `when` expression was written as an `if` expression. */
+when_if(unique int id: @whenexpr ref);
+
+/** Holds if this `when` branch was written as an `else` branch. */
+when_branch_else(unique int id: @whenbranch ref);
+
+@classinstancexpr = @newexpr | @lambdaexpr | @memberref | @propertyref
+
+@annotation = @declannotation | @typeannotation
+@typeaccess = @unannotatedtypeaccess | @annotatedtypeaccess
+
+@assignment = @assignexpr
+             | @assignop;
+
+@unaryassignment = @postincexpr
+                 | @postdecexpr
+                 | @preincexpr
+                 | @predecexpr;
+
+@assignop = @assignaddexpr
+             | @assignsubexpr
+             | @assignmulexpr
+             | @assigndivexpr
+             | @assignremexpr
+             | @assignandexpr
+             | @assignorexpr
+             | @assignxorexpr
+             | @assignlshiftexpr
+             | @assignrshiftexpr
+             | @assignurshiftexpr;
+
+@literal = @booleanliteral
+             | @integerliteral
+             | @longliteral
+             | @floatingpointliteral
+             | @doubleliteral
+             | @characterliteral
+             | @stringliteral
+             | @nullliteral;
+
+@binaryexpr = @mulexpr
+             | @divexpr
+             | @remexpr
+             | @addexpr
+             | @subexpr
+             | @lshiftexpr
+             | @rshiftexpr
+             | @urshiftexpr
+             | @andbitexpr
+             | @orbitexpr
+             | @xorbitexpr
+             | @andlogicalexpr
+             | @orlogicalexpr
+             | @ltexpr
+             | @gtexpr
+             | @leexpr
+             | @geexpr
+             | @eqexpr
+             | @neexpr
+             | @valueeqexpr
+             | @valueneexpr;
+
+@unaryexpr =   @postincexpr
+             | @postdecexpr
+             | @preincexpr
+             | @predecexpr
+             | @minusexpr
+             | @plusexpr
+             | @bitnotexpr
+             | @lognotexpr
+             | @notnullexpr;
+
+@caller =  @classinstancexpr
+         | @methodaccess
+         | @constructorinvocationstmt
+         | @superconstructorinvocationstmt;
+
+callableBinding(
+  unique int callerid: @caller ref,
+  int callee: @callable ref
+);
+
+memberRefBinding(
+  unique int id: @expr ref,
+  int callable: @callable ref
+);
+
+propertyRefGetBinding(
+  unique int id: @expr ref,
+  int getter: @callable ref
+);
+
+propertyRefFieldBinding(
+  unique int id: @expr ref,
+  int field: @field ref
+);
+
+propertyRefSetBinding(
+  unique int id: @expr ref,
+  int setter: @callable ref
+);
+
+@exprparent = @stmt | @expr | @whenbranch | @callable | @field | @fielddecl | @classorinterface | @param | @localvar | @typevariable;
+
+variableBinding(
+  unique int expr: @varaccess ref,
+  int variable: @variable ref
+);
+
+@variable = @localscopevariable | @field;
+
+@localscopevariable = @localvar | @param;
+
+localvars(
+  unique int id: @localvar,
+  string nodeName: string ref,
+  int typeid: @type ref,
+  int parentid: @localvariabledeclexpr ref
+);
+
+localvarsKotlinType(
+  unique int id: @localvar ref,
+  int kttypeid: @kt_type ref
+);
+
+@namedexprorstmt = @breakstmt
+                 | @continuestmt
+                 | @labeledstmt
+                 | @literal;
+
+namestrings(
+  string name: string ref,
+  string value: string ref,
+  unique int parent: @namedexprorstmt ref
+);
+
+/*
+ * Modules
+ */
+
+#keyset[name]
+modules(
+  unique int id: @module,
+  string name: string ref
+);
+
+isOpen(
+  int id: @module ref
+);
+
+#keyset[fileId]
+cumodule(
+  int fileId: @file ref,
+  int moduleId: @module ref
+);
+
+@directive = @requires
+           | @exports
+           | @opens
+           | @uses
+           | @provides
+
+#keyset[directive]
+directives(
+  int id: @module ref,
+  int directive: @directive ref
+);
+
+requires(
+  unique int id: @requires,
+  int target: @module ref
+);
+
+isTransitive(
+  int id: @requires ref
+);
+
+isStatic(
+  int id: @requires ref
+);
+
+exports(
+  unique int id: @exports,
+  int target: @package ref
+);
+
+exportsTo(
+  int id: @exports ref,
+  int target: @module ref
+);
+
+opens(
+  unique int id: @opens,
+  int target: @package ref
+);
+
+opensTo(
+  int id: @opens ref,
+  int target: @module ref
+);
+
+uses(
+  unique int id: @uses,
+  string serviceInterface: string ref
+);
+
+provides(
+  unique int id: @provides,
+  string serviceInterface: string ref
+);
+
+providesWith(
+  int id: @provides ref,
+  string serviceImpl: string ref
+);
+
+isNullDefaultCase(
+  int id: @case ref
+);
+
+/*
+ * Javadoc
+ */
+
+javadoc(
+  unique int id: @javadoc
+);
+
+isNormalComment(
+  int commentid : @javadoc ref
+);
+
+isEolComment(
+  int commentid : @javadoc ref
+);
+
+hasJavadoc(
+  int documentableid: @member ref,
+  int javadocid: @javadoc ref
+);
+
+#keyset[parentid,idx]
+javadocTag(
+  unique int id: @javadocTag,
+  string name: string ref,
+  int parentid: @javadocParent ref,
+  int idx: int ref
+);
+
+#keyset[parentid,idx]
+javadocText(
+  unique int id: @javadocText,
+  string text: string ref,
+  int parentid: @javadocParent ref,
+  int idx: int ref
+);
+
+@javadocParent = @javadoc | @javadocTag;
+@javadocElement = @javadocTag | @javadocText;
+
+@classorinterfaceorpackage = @classorinterface | @package;
+@classorinterfaceorcallable = @classorinterface | @callable;
+@boundedtype = @typevariable | @wildcard;
+@reftype = @classorinterface | @array | @boundedtype | @errortype;
+@classorarray = @classorinterface | @array;
+@type = @primitive | @reftype;
+@callable = @method | @constructor;
+
+/** A program element that has a name. */
+@element = @package | @modifier | @annotation | @errortype |
+           @locatableElement;
+
+@locatableElement = @file | @primitive | @classorinterface | @method | @constructor | @param | @exception | @field |
+                    @boundedtype | @array | @localvar | @expr | @stmt | @import | @fielddecl | @kt_type | @kt_type_alias |
+                    @kt_property;
+
+@modifiable = @member_modifiable| @param | @localvar | @typevariable;
+
+@member_modifiable = @classorinterface | @method | @constructor | @field | @kt_property;
+
+@member = @method | @constructor | @field | @reftype ;
+
+/** A program element that has a location. */
+@locatable = @typebound | @javadoc | @javadocTag | @javadocText | @xmllocatable | @ktcomment |
+             @locatableElement;
+
+@top = @element | @locatable | @folder;
+
+/*
+ * XML Files
+ */
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+/*
+ * configuration files with key value pairs
+ */
+
+configs(
+  unique int id: @config
+);
+
+configNames(
+  unique int id: @configName,
+  int config: @config ref,
+  string name: string ref
+);
+
+configValues(
+  unique int id: @configValue,
+  int config: @config ref,
+  string value: string ref
+);
+
+configLocations(
+  int locatable: @configLocatable ref,
+  int location: @location_default ref
+);
+
+@configLocatable = @config | @configName | @configValue;
+
+ktComments(
+  unique int id: @ktcomment,
+  int kind: int ref,
+  string text : string ref
+)
+
+ktCommentSections(
+  unique int id: @ktcommentsection,
+  int comment: @ktcomment ref,
+  string content : string ref
+)
+
+ktCommentSectionNames(
+  unique int id: @ktcommentsection ref,
+  string name : string ref
+)
+
+ktCommentSectionSubjectNames(
+  unique int id: @ktcommentsection ref,
+  string subjectname : string ref
+)
+
+#keyset[id, owner]
+ktCommentOwners(
+  int id: @ktcomment ref,
+  int owner: @top ref
+)
+
+ktExtensionFunctions(
+  unique int id: @method ref,
+  int typeid: @type ref,
+  int kttypeid: @kt_type ref
+)
+
+ktProperties(
+  unique int id: @kt_property,
+  string nodeName: string ref
+)
+
+ktPropertyGetters(
+  unique int id: @kt_property ref,
+  int getter: @method ref
+)
+
+ktPropertySetters(
+  unique int id: @kt_property ref,
+  int setter: @method ref
+)
+
+ktPropertyBackingFields(
+  unique int id: @kt_property ref,
+  int backingField: @field ref
+)
+
+ktSyntheticBody(
+  unique int id: @callable ref,
+  int kind: int ref
+  // 1: ENUM_VALUES
+  // 2: ENUM_VALUEOF
+  // 3: ENUM_ENTRIES
+)
+
+ktLocalFunction(
+  unique int id: @method ref
+)
+
+ktInitializerAssignment(
+  unique int id: @assignexpr ref
+)
+
+ktPropertyDelegates(
+  unique int id: @kt_property ref,
+  unique int variableId: @variable ref
+)
+
+/**
+ * If `id` is a compiler generated element, then the kind indicates the
+ * reason that the compiler generated it.
+ * See `Element.compilerGeneratedReason()` for an explanation of what
+ * each `kind` means.
+ */
+compiler_generated(
+  unique int id: @element ref,
+  int kind: int ref
+)
+
+ktFunctionOriginalNames(
+  unique int id: @method ref,
+  string name: string ref
+)
+
+ktDataClasses(
+  unique int id: @classorinterface ref
+)
diff --git a/java/ql/lib/upgrades/1b8f5f4c747e4249f4731796ccaa0661c7434d8a/upgrade.properties b/java/ql/lib/upgrades/1b8f5f4c747e4249f4731796ccaa0661c7434d8a/upgrade.properties
new file mode 100644
index 00000000000..3ecad4ebaa4
--- /dev/null
+++ b/java/ql/lib/upgrades/1b8f5f4c747e4249f4731796ccaa0661c7434d8a/upgrade.properties
@@ -0,0 +1,2 @@
+description: Add support for Java 25 compact source files by introducing isImplicitClass table
+compatibility: full
diff --git a/java/ql/src/Advisory/Declarations/NonFinalImmutableField.ql b/java/ql/src/Advisory/Declarations/NonFinalImmutableField.ql
index 493168d80a7..1ca836ab231 100644
--- a/java/ql/src/Advisory/Declarations/NonFinalImmutableField.ql
+++ b/java/ql/src/Advisory/Declarations/NonFinalImmutableField.ql
@@ -7,7 +7,10 @@
  * @problem.severity recommendation
  * @precision medium
  * @id java/non-final-immutable-field
- * @tags reliability
+ * @tags quality
+ *       reliability
+ *       correctness
+ *       readability
  */
 
 import java
diff --git a/java/ql/src/Advisory/Declarations/NonPrivateField.ql b/java/ql/src/Advisory/Declarations/NonPrivateField.ql
index 30b18ec53fd..ca081f41ed6 100644
--- a/java/ql/src/Advisory/Declarations/NonPrivateField.ql
+++ b/java/ql/src/Advisory/Declarations/NonPrivateField.ql
@@ -6,7 +6,10 @@
  * @problem.severity recommendation
  * @precision medium
  * @id java/non-private-field
- * @tags maintainability
+ * @tags quality
+ *       maintainability
+ *       readability
+ *       complexity
  */
 
 import java
diff --git a/java/ql/src/Advisory/Documentation/MissingJavadocMethods.ql b/java/ql/src/Advisory/Documentation/MissingJavadocMethods.ql
index 49d90a595d3..3d4eacf7ee6 100644
--- a/java/ql/src/Advisory/Documentation/MissingJavadocMethods.ql
+++ b/java/ql/src/Advisory/Documentation/MissingJavadocMethods.ql
@@ -7,6 +7,7 @@
  * @precision medium
  * @id java/undocumented-function
  * @tags maintainability
+ *       readability
  */
 
 import java
diff --git a/java/ql/src/Advisory/Documentation/MissingJavadocParameters.ql b/java/ql/src/Advisory/Documentation/MissingJavadocParameters.ql
index ec4735e5e21..b81500ff303 100644
--- a/java/ql/src/Advisory/Documentation/MissingJavadocParameters.ql
+++ b/java/ql/src/Advisory/Documentation/MissingJavadocParameters.ql
@@ -7,6 +7,7 @@
  * @precision medium
  * @id java/undocumented-parameter
  * @tags maintainability
+ *       readability
  */
 
 import java
diff --git a/java/ql/src/Advisory/Documentation/MissingJavadocReturnValues.ql b/java/ql/src/Advisory/Documentation/MissingJavadocReturnValues.ql
index 6668fa6da33..87f5bf2a7ff 100644
--- a/java/ql/src/Advisory/Documentation/MissingJavadocReturnValues.ql
+++ b/java/ql/src/Advisory/Documentation/MissingJavadocReturnValues.ql
@@ -7,6 +7,7 @@
  * @precision medium
  * @id java/undocumented-return-value
  * @tags maintainability
+ *       readability
  */
 
 import java
diff --git a/java/ql/src/Advisory/Documentation/MissingJavadocThrows.ql b/java/ql/src/Advisory/Documentation/MissingJavadocThrows.ql
index 2b6b346062c..ea12c831239 100644
--- a/java/ql/src/Advisory/Documentation/MissingJavadocThrows.ql
+++ b/java/ql/src/Advisory/Documentation/MissingJavadocThrows.ql
@@ -7,6 +7,8 @@
  * @precision medium
  * @id java/undocumented-exception
  * @tags maintainability
+ *       readability
+ *       error-handling
  */
 
 import java
diff --git a/java/ql/src/Advisory/Documentation/MissingJavadocTypes.ql b/java/ql/src/Advisory/Documentation/MissingJavadocTypes.ql
index b9c5958623d..21ea91703f9 100644
--- a/java/ql/src/Advisory/Documentation/MissingJavadocTypes.ql
+++ b/java/ql/src/Advisory/Documentation/MissingJavadocTypes.ql
@@ -7,6 +7,7 @@
  * @precision medium
  * @id java/undocumented-type
  * @tags maintainability
+ *       readability
  */
 
 import java
diff --git a/java/ql/src/Advisory/Java Objects/AvoidCloneMethodAccess.ql b/java/ql/src/Advisory/Java Objects/AvoidCloneMethodAccess.ql
index e2e9b32feee..eb3b80f4720 100644
--- a/java/ql/src/Advisory/Java Objects/AvoidCloneMethodAccess.ql	
+++ b/java/ql/src/Advisory/Java Objects/AvoidCloneMethodAccess.ql	
@@ -6,7 +6,9 @@
  * @problem.severity recommendation
  * @precision medium
  * @id java/use-of-clone-method
- * @tags reliability
+ * @tags quality
+ *       reliability
+ *       correctness
  */
 
 import java
diff --git a/java/ql/src/Advisory/Java Objects/AvoidCloneOverride.ql b/java/ql/src/Advisory/Java Objects/AvoidCloneOverride.ql
index 45460ad15ed..482aecd8e03 100644
--- a/java/ql/src/Advisory/Java Objects/AvoidCloneOverride.ql	
+++ b/java/ql/src/Advisory/Java Objects/AvoidCloneOverride.ql	
@@ -6,7 +6,9 @@
  * @problem.severity recommendation
  * @precision medium
  * @id java/override-of-clone-method
- * @tags reliability
+ * @tags quality
+ *       reliability
+ *       correctness
  */
 
 import java
diff --git a/java/ql/src/Advisory/Java Objects/AvoidCloneableInterface.ql b/java/ql/src/Advisory/Java Objects/AvoidCloneableInterface.ql
index 02abef17130..a3ab822872d 100644
--- a/java/ql/src/Advisory/Java Objects/AvoidCloneableInterface.ql	
+++ b/java/ql/src/Advisory/Java Objects/AvoidCloneableInterface.ql	
@@ -6,7 +6,9 @@
  * @problem.severity recommendation
  * @precision medium
  * @id java/use-of-cloneable-interface
- * @tags reliability
+ * @tags quality
+ *       reliability
+ *       correctness
  */
 
 import java
diff --git a/java/ql/src/Advisory/Java Objects/AvoidFinalizeOverride.ql b/java/ql/src/Advisory/Java Objects/AvoidFinalizeOverride.ql
index 3b5ddefbb34..0d74c4281a2 100644
--- a/java/ql/src/Advisory/Java Objects/AvoidFinalizeOverride.ql	
+++ b/java/ql/src/Advisory/Java Objects/AvoidFinalizeOverride.ql	
@@ -5,7 +5,9 @@
  * @problem.severity recommendation
  * @precision medium
  * @id java/override-of-finalize-method
- * @tags reliability
+ * @tags quality
+ *       reliability
+ *       correctness
  */
 
 import java
diff --git a/java/ql/src/Advisory/Naming/NamingConventionsConstants.ql b/java/ql/src/Advisory/Naming/NamingConventionsConstants.ql
index 4ee4bfd27cf..bd079b6fc20 100644
--- a/java/ql/src/Advisory/Naming/NamingConventionsConstants.ql
+++ b/java/ql/src/Advisory/Naming/NamingConventionsConstants.ql
@@ -5,7 +5,9 @@
  * @problem.severity recommendation
  * @precision medium
  * @id java/misnamed-constant
- * @tags maintainability
+ * @tags quality
+ *       maintainability
+ *       readability
  */
 
 import java
diff --git a/java/ql/src/Advisory/Naming/NamingConventionsMethods.ql b/java/ql/src/Advisory/Naming/NamingConventionsMethods.ql
index a4347b783a0..90b3edd4bbc 100644
--- a/java/ql/src/Advisory/Naming/NamingConventionsMethods.ql
+++ b/java/ql/src/Advisory/Naming/NamingConventionsMethods.ql
@@ -5,7 +5,9 @@
  * @problem.severity recommendation
  * @precision medium
  * @id java/misnamed-function
- * @tags maintainability
+ * @tags quality
+ *       maintainability
+ *       readability
  */
 
 import java
diff --git a/java/ql/src/Advisory/Naming/NamingConventionsPackages.ql b/java/ql/src/Advisory/Naming/NamingConventionsPackages.ql
index 7d135b21fac..efd6207d66f 100644
--- a/java/ql/src/Advisory/Naming/NamingConventionsPackages.ql
+++ b/java/ql/src/Advisory/Naming/NamingConventionsPackages.ql
@@ -5,7 +5,9 @@
  * @problem.severity recommendation
  * @precision medium
  * @id java/misnamed-package
- * @tags maintainability
+ * @tags quality
+ *       maintainability
+ *       readability
  */
 
 import java
diff --git a/java/ql/src/Advisory/Naming/NamingConventionsRefTypes.ql b/java/ql/src/Advisory/Naming/NamingConventionsRefTypes.ql
index 6942eaab69a..5106b6e80b7 100644
--- a/java/ql/src/Advisory/Naming/NamingConventionsRefTypes.ql
+++ b/java/ql/src/Advisory/Naming/NamingConventionsRefTypes.ql
@@ -5,7 +5,9 @@
  * @problem.severity recommendation
  * @precision medium
  * @id java/misnamed-type
- * @tags maintainability
+ * @tags quality
+ *       maintainability
+ *       readability
  */
 
 import java
diff --git a/java/ql/src/Advisory/Naming/NamingConventionsVariables.ql b/java/ql/src/Advisory/Naming/NamingConventionsVariables.ql
index bafa2ec5b14..0d225aa1749 100644
--- a/java/ql/src/Advisory/Naming/NamingConventionsVariables.ql
+++ b/java/ql/src/Advisory/Naming/NamingConventionsVariables.ql
@@ -5,7 +5,9 @@
  * @problem.severity recommendation
  * @precision medium
  * @id java/misnamed-variable
- * @tags maintainability
+ * @tags quality
+ *       maintainability
+ *       readability
  */
 
 import java
diff --git a/java/ql/src/Advisory/Statements/MissingDefaultInSwitch.ql b/java/ql/src/Advisory/Statements/MissingDefaultInSwitch.ql
index eab8a596f0e..28387ab766b 100644
--- a/java/ql/src/Advisory/Statements/MissingDefaultInSwitch.ql
+++ b/java/ql/src/Advisory/Statements/MissingDefaultInSwitch.ql
@@ -6,7 +6,9 @@
  * @problem.severity recommendation
  * @precision medium
  * @id java/missing-default-in-switch
- * @tags reliability
+ * @tags quality
+ *       reliability
+ *       correctness
  *       external/cwe/cwe-478
  */
 
diff --git a/java/ql/src/Advisory/Statements/OneStatementPerLine.ql b/java/ql/src/Advisory/Statements/OneStatementPerLine.ql
index b4133761e27..2663cab57a9 100644
--- a/java/ql/src/Advisory/Statements/OneStatementPerLine.ql
+++ b/java/ql/src/Advisory/Statements/OneStatementPerLine.ql
@@ -5,7 +5,9 @@
  * @problem.severity recommendation
  * @precision medium
  * @id java/multiple-statements-on-same-line
- * @tags maintainability
+ * @tags quality
+ *       maintainability
+ *       readability
  */
 
 import java
diff --git a/java/ql/src/Advisory/Statements/TerminateIfElseIfWithElse.ql b/java/ql/src/Advisory/Statements/TerminateIfElseIfWithElse.ql
index 0172719094c..b15dd1c1746 100644
--- a/java/ql/src/Advisory/Statements/TerminateIfElseIfWithElse.ql
+++ b/java/ql/src/Advisory/Statements/TerminateIfElseIfWithElse.ql
@@ -6,7 +6,9 @@
  * @problem.severity recommendation
  * @precision medium
  * @id java/non-terminated-if-else-if-chain
- * @tags reliability
+ * @tags quality
+ *       reliability
+ *       correctness
  */
 
 import java
diff --git a/java/ql/src/Advisory/Types/GenericsConstructor.ql b/java/ql/src/Advisory/Types/GenericsConstructor.ql
index 411c2466290..4af9f93c86f 100644
--- a/java/ql/src/Advisory/Types/GenericsConstructor.ql
+++ b/java/ql/src/Advisory/Types/GenericsConstructor.ql
@@ -6,7 +6,10 @@
  * @problem.severity recommendation
  * @precision medium
  * @id java/raw-constructor-invocation
- * @tags maintainability
+ * @tags quality
+ *       maintainability
+ *       readability
+ *       correctness
  */
 
 import java
diff --git a/java/ql/src/Advisory/Types/GenericsReturnType.ql b/java/ql/src/Advisory/Types/GenericsReturnType.ql
index 0107f7953a2..4f17664902b 100644
--- a/java/ql/src/Advisory/Types/GenericsReturnType.ql
+++ b/java/ql/src/Advisory/Types/GenericsReturnType.ql
@@ -6,7 +6,10 @@
  * @problem.severity recommendation
  * @precision medium
  * @id java/raw-return-type
- * @tags maintainability
+ * @tags quality
+ *       maintainability
+ *       readability
+ *       correctness
  */
 
 import java
diff --git a/java/ql/src/Advisory/Types/GenericsVariable.ql b/java/ql/src/Advisory/Types/GenericsVariable.ql
index 8f5fb3c05c9..d686feae512 100644
--- a/java/ql/src/Advisory/Types/GenericsVariable.ql
+++ b/java/ql/src/Advisory/Types/GenericsVariable.ql
@@ -6,7 +6,10 @@
  * @problem.severity recommendation
  * @precision medium
  * @id java/raw-variable
- * @tags maintainability
+ * @tags quality
+ *       maintainability
+ *       readability
+ *       correctness
  */
 
 import java
diff --git a/java/ql/src/CHANGELOG.md b/java/ql/src/CHANGELOG.md
index 9d630f16f4b..ed02fdc5bb2 100644
--- a/java/ql/src/CHANGELOG.md
+++ b/java/ql/src/CHANGELOG.md
@@ -1,3 +1,54 @@
+## 1.9.0
+
+### New Queries
+
+* The `java/sensitive-cookie-not-httponly` query has been promoted from experimental to the main query pack.
+* Added a new query, `java/escaping`, to detect values escaping from classes marked as `@ThreadSafe`.
+* Added a new query, `java/not-threadsafe`, to detect data races in classes marked as `@ThreadSafe`.
+* Added a new query, `java/safe-publication`, to detect unsafe publication in classes marked as `@ThreadSafe`.
+
+### Minor Analysis Improvements
+
+* Calls to `String.matches` are now treated as sanitizers for the `java/ssrf` query.
+
+## 1.8.2
+
+No user-facing changes.
+
+## 1.8.1
+
+No user-facing changes.
+
+## 1.8.0
+
+### Major Analysis Improvements
+
+* The implementation of `java/dereferenced-value-may-be-null` has been completely replaced with a new general control-flow reachability library. This improves precision by reducing false positives. However, since the entire calculation has been reworked, there can be small corner cases where precision regressions might occur and new false positives may occur, but these cases should be rare.
+
+### Bug Fixes
+
+* The message for `java/diagnostic/database-quality` has been updated to include detailed database health metrics. Additionally, the threshold for reporting database health issues has been lowered from 95% to 85% (if any metric falls below this percentage). These changes are visible on the tool status page.
+
+## 1.7.0
+
+### New Queries
+
+* The query `java/insecure-spring-actuator-config` has been promoted from experimental to the main query pack as `java/spring-boot-exposed-actuators-config`. Its results will now appear by default. This query detects exposure of Spring Boot actuators through configuration files. It was originally submitted as an experimental query [by @luchua-bc](https://github.com/github/codeql/pull/5384).
+
+### Query Metadata Changes
+
+* The tag `maintainability` has been removed from `java/run-finalizers-on-exit` and the tags `quality`, `correctness`, and `performance` have been added.
+* The tag `maintainability` has been removed from `java/garbage-collection` and the tags `quality` and `correctness` have been added.
+
+### Minor Analysis Improvements
+
+* Fixed a bug that was causing false negatives in rare cases in the query `java/dereferenced-value-may-be-null`.
+* Removed the `java/empty-statement` query that was subsumed by the `java/empty-block` query.
+
+## 1.6.3
+
+No user-facing changes.
+
 ## 1.6.2
 
 No user-facing changes.
diff --git a/java/ql/src/DeadCode/DeadClass.ql b/java/ql/src/DeadCode/DeadClass.ql
index 23f08fec3b8..22ffad4f835 100644
--- a/java/ql/src/DeadCode/DeadClass.ql
+++ b/java/ql/src/DeadCode/DeadClass.ql
@@ -5,7 +5,8 @@
  * @problem.severity recommendation
  * @precision medium
  * @id java/dead-class
- * @tags maintainability
+ * @tags quality
+ *       maintainability
  *       useless-code
  *       external/cwe/cwe-561
  */
diff --git a/java/ql/src/DeadCode/DeadEnumConstant.ql b/java/ql/src/DeadCode/DeadEnumConstant.ql
index 19044994348..791c2b2a751 100644
--- a/java/ql/src/DeadCode/DeadEnumConstant.ql
+++ b/java/ql/src/DeadCode/DeadEnumConstant.ql
@@ -5,7 +5,8 @@
  * @problem.severity recommendation
  * @precision medium
  * @id java/dead-enum-constant
- * @tags maintainability
+ * @tags quality
+ *       maintainability
  *       useless-code
  *       external/cwe/cwe-561
  */
diff --git a/java/ql/src/DeadCode/DeadField.ql b/java/ql/src/DeadCode/DeadField.ql
index 7a8bca7ac7b..4dd0864bd15 100644
--- a/java/ql/src/DeadCode/DeadField.ql
+++ b/java/ql/src/DeadCode/DeadField.ql
@@ -5,7 +5,8 @@
  * @problem.severity recommendation
  * @precision medium
  * @id java/dead-field
- * @tags maintainability
+ * @tags quality
+ *       maintainability
  *       useless-code
  *       external/cwe/cwe-561
  */
diff --git a/java/ql/src/DeadCode/DeadMethod.ql b/java/ql/src/DeadCode/DeadMethod.ql
index 77401341b6c..ea01cbf4db9 100644
--- a/java/ql/src/DeadCode/DeadMethod.ql
+++ b/java/ql/src/DeadCode/DeadMethod.ql
@@ -5,7 +5,8 @@
  * @problem.severity recommendation
  * @precision medium
  * @id java/dead-function
- * @tags maintainability
+ * @tags quality
+ *       maintainability
  *       useless-code
  *       external/cwe/cwe-561
  */
diff --git a/java/ql/src/Language Abuse/EmptyStatement.java b/java/ql/src/Language Abuse/EmptyStatement.java
deleted file mode 100644
index 4f9b462a38f..00000000000
--- a/java/ql/src/Language Abuse/EmptyStatement.java	
+++ /dev/null
@@ -1,8 +0,0 @@
-public class Cart {
-	// AVOID: Empty statement
-	List<Item> items = new ArrayList<Cart>();;
-	public void applyDiscount(float discount) {
-		// AVOID: Empty statement as loop body
-		for (int i = 0; i < items.size(); items.get(i++).applyDiscount(discount));
-	}
-}
\ No newline at end of file
diff --git a/java/ql/src/Language Abuse/EmptyStatement.qhelp b/java/ql/src/Language Abuse/EmptyStatement.qhelp
deleted file mode 100644
index 700bd488dfc..00000000000
--- a/java/ql/src/Language Abuse/EmptyStatement.qhelp	
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE qhelp PUBLIC
-  "-//Semmle//qhelp//EN"
-  "qhelp.dtd">
-<qhelp>
-
-
-<overview>
-<p>An <em>empty statement</em> is a single semicolon <code>;</code> that does not
-terminate another statement. Such a statement hinders readability and has no effect on its own.</p>
-
-</overview>
-<recommendation>
-
-<p>Avoid empty statements. If a loop is intended to have an empty body, it is better
-to mark that fact explicitly by using a pair of braces <code>{}</code> containing an explanatory comment
-for the body, rather than a single semicolon.</p>
-
-</recommendation>
-<example>
-
-<p>In the following example, there is an empty statement on line 3, where an additional semicolon is
-used. On line 6, the <code>for</code> statement has an empty body because the condition is
-immediately followed by a semicolon. In this case, it is better to include a pair of braces <code>{}</code> containing
-an explanatory comment for the body instead.
-
-</p><sample src="EmptyStatement.java" />
-
-</example>
-<references>
-
-
-<li>
-Help - Eclipse Platform:
-<a href="https://help.eclipse.org/2020-12/advanced/content.jsp?topic=/org.eclipse.jdt.doc.user/reference/preferences/java/compiler/ref-preferences-errors-warnings.htm">Java Compiler Errors/Warnings Preferences</a>.
-</li>
-
-
-</references>
-</qhelp>
diff --git a/java/ql/src/Language Abuse/EmptyStatement.ql b/java/ql/src/Language Abuse/EmptyStatement.ql
deleted file mode 100644
index 36f61b862ac..00000000000
--- a/java/ql/src/Language Abuse/EmptyStatement.ql	
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @name Empty statement
- * @description An empty statement hinders readability.
- * @kind problem
- * @problem.severity recommendation
- * @precision low
- * @id java/empty-statement
- * @tags maintainability
- *       useless-code
- */
-
-import java
-
-from EmptyStmt empty, string action
-where
-  if exists(LoopStmt l | l.getBody() = empty)
-  then action = "turned into '{}'"
-  else action = "deleted"
-select empty, "This empty statement should be " + action + "."
diff --git a/java/ql/src/Language Abuse/OverridePackagePrivate.ql b/java/ql/src/Language Abuse/OverridePackagePrivate.ql
index d2866c76abc..66663e18c4b 100644
--- a/java/ql/src/Language Abuse/OverridePackagePrivate.ql	
+++ b/java/ql/src/Language Abuse/OverridePackagePrivate.ql	
@@ -6,8 +6,10 @@
  * @problem.severity warning
  * @precision medium
  * @id java/non-overriding-package-private
- * @tags maintainability
+ * @tags quality
+ *       maintainability
  *       readability
+ *       correctness
  */
 
 import java
diff --git a/java/ql/src/Language Abuse/TypeVarExtendsFinalType.ql b/java/ql/src/Language Abuse/TypeVarExtendsFinalType.ql
index 77c318bcb9e..13b77d10d06 100644
--- a/java/ql/src/Language Abuse/TypeVarExtendsFinalType.ql	
+++ b/java/ql/src/Language Abuse/TypeVarExtendsFinalType.ql	
@@ -7,9 +7,9 @@
  * @problem.severity warning
  * @precision medium
  * @id java/type-bound-extends-final
- * @tags maintainability
+ * @tags quality
+ *       maintainability
  *       readability
- *       types
  */
 
 import java
diff --git a/java/ql/src/Likely Bugs/Arithmetic/BadAbsOfRandom.ql b/java/ql/src/Likely Bugs/Arithmetic/BadAbsOfRandom.ql
index 26353891f41..2af66f5cfba 100644
--- a/java/ql/src/Likely Bugs/Arithmetic/BadAbsOfRandom.ql	
+++ b/java/ql/src/Likely Bugs/Arithmetic/BadAbsOfRandom.ql	
@@ -6,8 +6,9 @@
  * @problem.severity warning
  * @precision medium
  * @id java/abs-of-random
- * @tags reliability
- *       maintainability
+ * @tags quality
+ *       reliability
+ *       correctness
  */
 
 import java
diff --git a/java/ql/src/Likely Bugs/Arithmetic/ConstantExpAppearsNonConstant.ql b/java/ql/src/Likely Bugs/Arithmetic/ConstantExpAppearsNonConstant.ql
index 50f50862631..4bbeefaee6e 100644
--- a/java/ql/src/Likely Bugs/Arithmetic/ConstantExpAppearsNonConstant.ql	
+++ b/java/ql/src/Likely Bugs/Arithmetic/ConstantExpAppearsNonConstant.ql	
@@ -53,6 +53,7 @@ predicate isConstantExp(Expr e) {
 from Expr e
 where
   isConstantExp(e) and
+  not e.(TypeAccess).getType() instanceof ErrorType and
   exists(Expr child | e.getAChildExpr() = child |
     not isConstantExp(child) and
     not child instanceof Annotation
diff --git a/java/ql/src/Likely Bugs/Arithmetic/MultiplyRemainder.ql b/java/ql/src/Likely Bugs/Arithmetic/MultiplyRemainder.ql
index 8992d1753d9..ee1e1ca3fed 100644
--- a/java/ql/src/Likely Bugs/Arithmetic/MultiplyRemainder.ql	
+++ b/java/ql/src/Likely Bugs/Arithmetic/MultiplyRemainder.ql	
@@ -6,7 +6,9 @@
  * @problem.severity warning
  * @precision medium
  * @id java/multiplication-of-remainder
- * @tags maintainability
+ * @tags quality
+ *       maintainability
+ *       readability
  *       correctness
  */
 
diff --git a/java/ql/src/Likely Bugs/Arithmetic/RandomUsedOnce.ql b/java/ql/src/Likely Bugs/Arithmetic/RandomUsedOnce.ql
index a18df356899..7a81d366a6e 100644
--- a/java/ql/src/Likely Bugs/Arithmetic/RandomUsedOnce.ql	
+++ b/java/ql/src/Likely Bugs/Arithmetic/RandomUsedOnce.ql	
@@ -6,8 +6,9 @@
  * @problem.severity warning
  * @precision medium
  * @id java/random-used-once
- * @tags reliability
- *       maintainability
+ * @tags quality
+ *       reliability
+ *       correctness
  *       external/cwe/cwe-335
  */
 
diff --git a/java/ql/src/Likely Bugs/Cloning/MissingCallToSuperClone.ql b/java/ql/src/Likely Bugs/Cloning/MissingCallToSuperClone.ql
index 8c2f7b1d6f8..afc7c54bbad 100644
--- a/java/ql/src/Likely Bugs/Cloning/MissingCallToSuperClone.ql	
+++ b/java/ql/src/Likely Bugs/Cloning/MissingCallToSuperClone.ql	
@@ -7,8 +7,9 @@
  * @problem.severity error
  * @precision medium
  * @id java/missing-call-to-super-clone
- * @tags reliability
- *       maintainability
+ * @tags quality
+ *       reliability
+ *       correctness
  *       external/cwe/cwe-580
  */
 
diff --git a/java/ql/src/Likely Bugs/Cloning/MissingMethodClone.ql b/java/ql/src/Likely Bugs/Cloning/MissingMethodClone.ql
index 6d48a118e29..2542637b745 100644
--- a/java/ql/src/Likely Bugs/Cloning/MissingMethodClone.ql	
+++ b/java/ql/src/Likely Bugs/Cloning/MissingMethodClone.ql	
@@ -6,8 +6,9 @@
  * @problem.severity error
  * @precision medium
  * @id java/missing-clone-method
- * @tags reliability
- *       maintainability
+ * @tags quality
+ *       reliability
+ *       correctness
  */
 
 import java
diff --git a/java/ql/src/Likely Bugs/Collections/ContainsTypeMismatch.ql b/java/ql/src/Likely Bugs/Collections/ContainsTypeMismatch.ql
index 497aa10cb4d..92b257bbfc1 100644
--- a/java/ql/src/Likely Bugs/Collections/ContainsTypeMismatch.ql	
+++ b/java/ql/src/Likely Bugs/Collections/ContainsTypeMismatch.ql	
@@ -99,14 +99,14 @@ predicate containerAccess(string package, string type, int p, string signature,
 class MismatchedContainerAccess extends MethodCall {
   MismatchedContainerAccess() {
     exists(string package, string type, int i |
-      containerAccess(package, type, _, this.getCallee().getSignature(), i)
+      containerAccess(package, type, _, this.getCallee().getSignature(), pragma[only_bind_into](i))
     |
       this.getCallee()
           .getDeclaringType()
           .getSourceDeclaration()
           .getASourceSupertype*()
           .hasQualifiedName(package, type) and
-      this.getCallee().getParameter(i).getType() instanceof TypeObject
+      this.getCallee().getParameter(pragma[only_bind_into](i)).getType() instanceof TypeObject
     )
   }
 
diff --git a/java/ql/src/Likely Bugs/Collections/IteratorRemoveMayFail.ql b/java/ql/src/Likely Bugs/Collections/IteratorRemoveMayFail.ql
index 0308f68f231..09d686947e0 100644
--- a/java/ql/src/Likely Bugs/Collections/IteratorRemoveMayFail.ql	
+++ b/java/ql/src/Likely Bugs/Collections/IteratorRemoveMayFail.ql	
@@ -6,9 +6,9 @@
  * @problem.severity warning
  * @precision medium
  * @id java/iterator-remove-failure
- * @tags reliability
+ * @tags quality
+ *       reliability
  *       correctness
- *       logic
  */
 
 import java
diff --git a/java/ql/src/Likely Bugs/Collections/RemoveTypeMismatch.ql b/java/ql/src/Likely Bugs/Collections/RemoveTypeMismatch.ql
index 54548b122e4..8d45a93e3dd 100644
--- a/java/ql/src/Likely Bugs/Collections/RemoveTypeMismatch.ql	
+++ b/java/ql/src/Likely Bugs/Collections/RemoveTypeMismatch.ql	
@@ -69,14 +69,15 @@ predicate containerModification(string package, string type, int p, string signa
 class MismatchedContainerModification extends MethodCall {
   MismatchedContainerModification() {
     exists(string package, string type, int i |
-      containerModification(package, type, _, this.getCallee().getSignature(), i)
+      containerModification(package, type, _, this.getCallee().getSignature(),
+        pragma[only_bind_into](i))
     |
       this.getCallee()
           .getDeclaringType()
           .getASourceSupertype*()
           .getSourceDeclaration()
           .hasQualifiedName(package, type) and
-      this.getCallee().getParameter(i).getType() instanceof TypeObject
+      this.getCallee().getParameter(pragma[only_bind_into](i)).getType() instanceof TypeObject
     )
   }
 
diff --git a/java/ql/src/Likely Bugs/Comparison/CovariantCompareTo.ql b/java/ql/src/Likely Bugs/Comparison/CovariantCompareTo.ql
index de1e27073f6..6d55bfc6488 100644
--- a/java/ql/src/Likely Bugs/Comparison/CovariantCompareTo.ql	
+++ b/java/ql/src/Likely Bugs/Comparison/CovariantCompareTo.ql	
@@ -6,7 +6,8 @@
  * @problem.severity error
  * @precision medium
  * @id java/wrong-compareto-signature
- * @tags reliability
+ * @tags quality
+ *       reliability
  *       correctness
  */
 
diff --git a/java/ql/src/Likely Bugs/Comparison/CovariantEquals.ql b/java/ql/src/Likely Bugs/Comparison/CovariantEquals.ql
index 13f63f15a72..84018a513a5 100644
--- a/java/ql/src/Likely Bugs/Comparison/CovariantEquals.ql	
+++ b/java/ql/src/Likely Bugs/Comparison/CovariantEquals.ql	
@@ -6,7 +6,8 @@
  * @problem.severity error
  * @precision medium
  * @id java/wrong-equals-signature
- * @tags reliability
+ * @tags quality
+ *       reliability
  *       correctness
  */
 
diff --git a/java/ql/src/Likely Bugs/Comparison/HashedButNoHash.ql b/java/ql/src/Likely Bugs/Comparison/HashedButNoHash.ql
index f8b1cd85552..bb370bead3b 100644
--- a/java/ql/src/Likely Bugs/Comparison/HashedButNoHash.ql	
+++ b/java/ql/src/Likely Bugs/Comparison/HashedButNoHash.ql	
@@ -14,7 +14,7 @@
 import java
 import Equality
 
-/** A class that defines an `equals` method but no `hashCode` method. */
+/** Holds if `c` defines an `equals` method but no `hashCode` method. */
 predicate eqNoHash(Class c) {
   exists(Method m | m = c.getAMethod() |
     m instanceof EqualsMethod and
diff --git a/java/ql/src/Likely Bugs/Comparison/InconsistentCompareTo.ql b/java/ql/src/Likely Bugs/Comparison/InconsistentCompareTo.ql
index 8c5a7133e14..7592fe38266 100644
--- a/java/ql/src/Likely Bugs/Comparison/InconsistentCompareTo.ql	
+++ b/java/ql/src/Likely Bugs/Comparison/InconsistentCompareTo.ql	
@@ -6,7 +6,8 @@
  * @problem.severity warning
  * @precision medium
  * @id java/inconsistent-compareto-and-equals
- * @tags reliability
+ * @tags quality
+ *       reliability
  *       correctness
  */
 
diff --git a/java/ql/src/Likely Bugs/Comparison/StringComparison.ql b/java/ql/src/Likely Bugs/Comparison/StringComparison.ql
index 63d09e0f791..cfca2c8d7dd 100644
--- a/java/ql/src/Likely Bugs/Comparison/StringComparison.ql	
+++ b/java/ql/src/Likely Bugs/Comparison/StringComparison.ql	
@@ -6,7 +6,9 @@
  * @problem.severity warning
  * @precision medium
  * @id java/reference-equality-on-strings
- * @tags reliability
+ * @tags quality
+ *       reliability
+ *       correctness
  *       external/cwe/cwe-597
  */
 
diff --git a/java/ql/src/Likely Bugs/Concurrency/CallsToConditionWait.ql b/java/ql/src/Likely Bugs/Concurrency/CallsToConditionWait.ql
index bf163936115..b89d619fada 100644
--- a/java/ql/src/Likely Bugs/Concurrency/CallsToConditionWait.ql	
+++ b/java/ql/src/Likely Bugs/Concurrency/CallsToConditionWait.ql	
@@ -6,7 +6,8 @@
  * @problem.severity error
  * @precision medium
  * @id java/wait-on-condition-interface
- * @tags reliability
+ * @tags quality
+ *       reliability
  *       correctness
  *       concurrency
  *       external/cwe/cwe-662
diff --git a/java/ql/src/Likely Bugs/Concurrency/DateFormatThreadUnsafe.ql b/java/ql/src/Likely Bugs/Concurrency/DateFormatThreadUnsafe.ql
index 18683ac690f..0d87ca49bb2 100644
--- a/java/ql/src/Likely Bugs/Concurrency/DateFormatThreadUnsafe.ql	
+++ b/java/ql/src/Likely Bugs/Concurrency/DateFormatThreadUnsafe.ql	
@@ -6,7 +6,8 @@
  * @problem.severity warning
  * @precision medium
  * @id java/thread-unsafe-dateformat
- * @tags reliability
+ * @tags quality
+ *       reliability
  *       correctness
  *       concurrency
  */
diff --git a/java/ql/src/Likely Bugs/Concurrency/Escaping.qhelp b/java/ql/src/Likely Bugs/Concurrency/Escaping.qhelp
new file mode 100644
index 00000000000..a8a614dbe36
--- /dev/null
+++ b/java/ql/src/Likely Bugs/Concurrency/Escaping.qhelp	
@@ -0,0 +1,34 @@
+<!DOCTYPE qhelp PUBLIC
+  "-//Semmle//qhelp//EN"
+  "qhelp.dtd">
+<qhelp>
+
+
+<overview>
+<p>
+In a thread-safe class, non-final fields should generally be private (or possibly volatile) to ensure that they cannot be accessed by other threads in an unsafe manner.
+</p>
+
+</overview>
+<recommendation>
+
+<p>
+If the field does not change, mark it as <code>final</code>. If the field is mutable, mark it as <code>private</code> and provide properly synchronized accessors.</p>
+
+</recommendation>
+
+<references>
+
+
+<li>
+  Java Language Specification, chapter 17:
+  <a href="https://docs.oracle.com/javase/specs/jls/se8/html/jls-17.html#jls-17.4">Threads and Locks</a>.
+</li>
+<li>
+  Java concurrency package:
+  <a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/package-summary.html">java.util.concurrent</a>.
+</li>
+
+
+</references>
+</qhelp>
diff --git a/java/ql/src/Likely Bugs/Concurrency/Escaping.ql b/java/ql/src/Likely Bugs/Concurrency/Escaping.ql
new file mode 100644
index 00000000000..a2f3e0f7b46
--- /dev/null
+++ b/java/ql/src/Likely Bugs/Concurrency/Escaping.ql	
@@ -0,0 +1,26 @@
+/**
+ * @name Escaping
+ * @description In a thread-safe class, care should be taken to avoid exposing mutable state.
+ * @kind problem
+ * @problem.severity warning
+ * @precision high
+ * @id java/escaping
+ * @tags quality
+ *       reliability
+ *       concurrency
+ */
+
+import java
+import semmle.code.java.ConflictingAccess
+
+from Field f, ClassAnnotatedAsThreadSafe c
+where
+  f = c.getAField() and
+  not f.isFinal() and // final fields do not change
+  not f.isPrivate() and
+  // We believe that protected fields are also dangerous
+  // Volatile fields cannot cause data races, but it is dubious to allow changes.
+  // For now, we ignore volatile fields, but there are likely bugs to be caught here.
+  not f.isVolatile()
+select f, "The class $@ is marked as thread-safe, but this field is potentially escaping.", c,
+  c.getName()
diff --git a/java/ql/src/Likely Bugs/Concurrency/FutileSynchOnField.ql b/java/ql/src/Likely Bugs/Concurrency/FutileSynchOnField.ql
index 7c1875dfe3e..5d816ad8cf9 100644
--- a/java/ql/src/Likely Bugs/Concurrency/FutileSynchOnField.ql	
+++ b/java/ql/src/Likely Bugs/Concurrency/FutileSynchOnField.ql	
@@ -6,7 +6,8 @@
  * @problem.severity error
  * @precision medium
  * @id java/unsafe-sync-on-field
- * @tags reliability
+ * @tags quality
+ *       reliability
  *       correctness
  *       concurrency
  *       language-features
diff --git a/java/ql/src/Likely Bugs/Concurrency/NotifyNotNotifyAll.ql b/java/ql/src/Likely Bugs/Concurrency/NotifyNotNotifyAll.ql
index 047e6853011..e21b816f168 100644
--- a/java/ql/src/Likely Bugs/Concurrency/NotifyNotNotifyAll.ql	
+++ b/java/ql/src/Likely Bugs/Concurrency/NotifyNotNotifyAll.ql	
@@ -6,7 +6,8 @@
  * @problem.severity warning
  * @precision medium
  * @id java/notify-instead-of-notify-all
- * @tags reliability
+ * @tags quality
+ *       reliability
  *       correctness
  *       concurrency
  *       external/cwe/cwe-662
diff --git a/java/ql/src/Likely Bugs/Concurrency/NotifyWithoutSynch.ql b/java/ql/src/Likely Bugs/Concurrency/NotifyWithoutSynch.ql
index 89dbedd0253..48f547575ee 100644
--- a/java/ql/src/Likely Bugs/Concurrency/NotifyWithoutSynch.ql	
+++ b/java/ql/src/Likely Bugs/Concurrency/NotifyWithoutSynch.ql	
@@ -78,7 +78,7 @@ private predicate synchronizedThisAccess(MethodCall ma, Type thisType) {
 
 /**
  * Auxiliary predicate for `unsynchronizedVarAccess`. Holds if
- * there is an enclosing `synchronized` statement on the variable.
+ * there is an enclosing `synchronized` statement on the variable access `x`.
  */
 predicate synchronizedVarAccess(VarAccess x) {
   exists(SynchronizedStmt s, VarAccess y |
diff --git a/java/ql/src/Likely Bugs/Concurrency/SafePublication.java b/java/ql/src/Likely Bugs/Concurrency/SafePublication.java
new file mode 100644
index 00000000000..76980412e8c
--- /dev/null
+++ b/java/ql/src/Likely Bugs/Concurrency/SafePublication.java	
@@ -0,0 +1,17 @@
+public class SafePublication {
+    private volatile Object value;
+    private final int server_id;
+
+    public SafePublication() {
+        value = new Object(); // Safely published as volatile
+        server_id = 1; // Safely published as final
+    }
+
+    public synchronized Object getValue() {
+        return value;
+    }
+
+    public int getServerId() {
+        return server_id;
+    }
+}
\ No newline at end of file
diff --git a/java/ql/src/Likely Bugs/Concurrency/SafePublication.qhelp b/java/ql/src/Likely Bugs/Concurrency/SafePublication.qhelp
new file mode 100644
index 00000000000..4b422530411
--- /dev/null
+++ b/java/ql/src/Likely Bugs/Concurrency/SafePublication.qhelp	
@@ -0,0 +1,57 @@
+<!DOCTYPE qhelp PUBLIC
+  "-//Semmle//qhelp//EN"
+  "qhelp.dtd">
+<qhelp>
+
+
+<overview>
+<p>
+In a thread-safe class, values must be published safely to avoid inconsistent or unexpected behavior caused by visibility issues between threads. If a value is not safely published, one thread may see a stale or partially constructed value written by another thread, leading to subtle concurrency bugs.
+</p>
+<p>
+In particular, values of primitive types should not be initialised to anything but their default values (which for <code>Object</code> is <code>null</code>) unless this happens in a static context.
+</p>
+<p>
+Techniques for safe publication include:
+</p>
+<ul>
+<li>Using synchronized blocks or methods to ensure that a value is fully constructed before it is published.</li>
+<li>Using volatile fields to ensure visibility of changes across threads.</li>
+<li>Using thread-safe collections or classes that provide built-in synchronization, such as are found in <code>java.util.concurrent</code>.</li>
+<li>Using the <code>final</code> keyword to ensure that a reference to an object is safely published when the object is constructed.</li>
+</ul>
+
+</overview>
+<recommendation>
+
+<p>
+Choose a safe publication technique that fits your use case. If the value only needs to be written once, say for a singleton, consider using the <code>final</code> keyword. If the value is mutable and needs to be shared across threads, consider using synchronized blocks or methods, or using a thread-safe collection from <code>java.util.concurrent</code>.
+</p>
+
+</recommendation>
+<example>
+
+<p>In the following example, the values of <code>value</code> and <code>server_id</code> are not safely published. The constructor creates a new object and assigns it to the field <code>value</code>. However, the field is not declared as <code>volatile</code> or <code>final</code>, and there are no synchronization mechanisms in place to ensure that the value is fully constructed before it is published. A different thread may see the default value <code>null</code>. Similarly, the field <code>server_id</code> may be observed to be <code>0</code>.</p>
+
+<sample src="UnsafePublication.java" />
+
+<p>To fix this example, we declare the field <code>value</code> as volatile. This will ensure that all changes to the field are visible to all threads. The field <code>server_id</code> is only meant to be written once, so we only need the write inside the constructor to be visible to other threads; declaring it <code>final</code> guarantees this:</p>
+
+<sample src="SafePublication.java" />
+
+</example>
+<references>
+
+
+<li>
+  Java Language Specification, chapter 17:
+  <a href="https://docs.oracle.com/javase/specs/jls/se8/html/jls-17.html#jls-17.4">Threads and Locks</a>.
+</li>
+<li>
+  Java concurrency package:
+  <a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/package-summary.html">java.util.concurrent</a>.
+</li>
+
+
+</references>
+</qhelp>
diff --git a/java/ql/src/Likely Bugs/Concurrency/SafePublication.ql b/java/ql/src/Likely Bugs/Concurrency/SafePublication.ql
new file mode 100644
index 00000000000..5e2a89ce372
--- /dev/null
+++ b/java/ql/src/Likely Bugs/Concurrency/SafePublication.ql	
@@ -0,0 +1,93 @@
+/**
+ * @name Safe publication
+ * @description A field of a thread-safe class is not safely published.
+ * @kind problem
+ * @problem.severity warning
+ * @precision high
+ * @id java/safe-publication
+ * @tags quality
+ *       reliability
+ *       concurrency
+ */
+
+import java
+import semmle.code.java.ConflictingAccess
+
+/**
+ * Holds if `v` should be the default value for the field `f`.
+ * That is, `v` is an initial (or constructor) assignment of `f`.
+ */
+predicate shouldBeDefaultValueFor(Field f, Expr v) {
+  v = f.getAnAssignedValue() and
+  (
+    v = f.getInitializer()
+    or
+    v.getEnclosingCallable() = f.getDeclaringType().getAConstructor()
+  )
+}
+
+/**
+ * Gets the default value for the field `f`.
+ * See https://docs.oracle.com/javase/tutorial/java/nutsandbolts/datatypes.html
+ * for the default values of the primitive types.
+ * The default value for non-primitive types is null.
+ */
+bindingset[result]
+Expr getDefaultValue(Field f) {
+  f.getType().hasName("byte") and result.(IntegerLiteral).getIntValue() = 0
+  or
+  f.getType().hasName("short") and result.(IntegerLiteral).getIntValue() = 0
+  or
+  f.getType().hasName("int") and result.(IntegerLiteral).getIntValue() = 0
+  or
+  f.getType().hasName("long") and
+  (
+    result.(LongLiteral).getValue() = "0" or
+    result.(IntegerLiteral).getValue() = "0"
+  )
+  or
+  f.getType().hasName("float") and result.(FloatLiteral).getValue() = "0.0"
+  or
+  f.getType().hasName("double") and result.(DoubleLiteral).getValue() = "0.0"
+  or
+  f.getType().hasName("char") and result.(CharacterLiteral).getCodePointValue() = 0
+  or
+  f.getType().hasName("boolean") and result.(BooleanLiteral).getBooleanValue() = false
+  or
+  not f.getType().getName() in [
+      "byte", "short", "int", "long", "float", "double", "char", "boolean"
+    ] and
+  result instanceof NullLiteral
+}
+
+/**
+ * Holds if all constructor or initial assignments (if any) are to the default value.
+ * That is, assignments by the declaration:
+ *   int x = 0; OK
+ *   int x = 3; not OK
+ * or inside a constructor:
+ *   public c(a) {
+ *     x = 0; OK
+ *     x = 3; not OK
+ *     x = a; not OK
+ *   }
+ */
+predicate isAssignedDefaultValue(Field f) {
+  forall(Expr v | shouldBeDefaultValueFor(f, v) | v = getDefaultValue(f))
+}
+
+predicate isSafelyPublished(Field f) {
+  f.isFinal() or // NOTE: For non-primitive types, 'final' alone does not guarantee safe publication unless the object is immutable or safely constructed. Consider reviewing the handling of non-primitive fields for safe publication.
+  f.isStatic() or
+  f.isVolatile() or
+  isThreadSafeType(f.getType()) or
+  isThreadSafeType(f.getInitializer().getType()) or
+  isAssignedDefaultValue(f)
+}
+
+from Field f, ClassAnnotatedAsThreadSafe c
+where
+  f = c.getAField() and
+  not isSafelyPublished(f)
+select f, "The class $@ is marked as thread-safe, but this field is not safely published.", c,
+  c.getName()
diff --git a/java/ql/src/Likely Bugs/Concurrency/SleepWithLock.ql b/java/ql/src/Likely Bugs/Concurrency/SleepWithLock.ql
index 417e426b786..70a3a901ade 100644
--- a/java/ql/src/Likely Bugs/Concurrency/SleepWithLock.ql	
+++ b/java/ql/src/Likely Bugs/Concurrency/SleepWithLock.ql	
@@ -6,9 +6,11 @@
  * @problem.severity error
  * @precision medium
  * @id java/sleep-with-lock-held
- * @tags reliability
+ * @tags quality
+ *       reliability
  *       correctness
  *       concurrency
+ *       performance
  *       external/cwe/cwe-833
  */
 
diff --git a/java/ql/src/Likely Bugs/Concurrency/StartInConstructor.ql b/java/ql/src/Likely Bugs/Concurrency/StartInConstructor.ql
index cb971a5f109..700b1fab896 100644
--- a/java/ql/src/Likely Bugs/Concurrency/StartInConstructor.ql	
+++ b/java/ql/src/Likely Bugs/Concurrency/StartInConstructor.ql	
@@ -7,13 +7,18 @@
  * @problem.severity warning
  * @precision medium
  * @id java/thread-start-in-constructor
- * @tags reliability
+ * @tags quality
+ *       reliability
  *       correctness
  *       concurrency
  */
 
 import java
 
+private predicate hasASubclass(RefType t) {
+  exists(RefType sub | sub != t | sub.getAnAncestor() = t)
+}
+
 /**
  * Holds if this type is either `final` or
  * `private` and without subtypes.
@@ -23,7 +28,11 @@ private predicate cannotBeExtended(RefType t) {
   or
   // If the class is private, all possible subclasses are known.
   t.isPrivate() and
-  not exists(RefType sub | sub != t | sub.getAnAncestor() = t)
+  not hasASubclass(t)
+  or
+  // If the class only has private constructors, all possible subclasses are known.
+  forex(Constructor c | c.getDeclaringType() = t | c.isPrivate()) and
+  not hasASubclass(t)
 }
 
 from MethodCall m, Constructor c, Class clazz
diff --git a/java/ql/src/Likely Bugs/Concurrency/SynchWriteObject.ql b/java/ql/src/Likely Bugs/Concurrency/SynchWriteObject.ql
index 3eaa6743699..1842076a71b 100644
--- a/java/ql/src/Likely Bugs/Concurrency/SynchWriteObject.ql	
+++ b/java/ql/src/Likely Bugs/Concurrency/SynchWriteObject.ql	
@@ -6,10 +6,10 @@
  * @problem.severity warning
  * @precision medium
  * @id java/inconsistent-sync-writeobject
- * @tags reliability
+ * @tags quality
+ *       reliability
  *       correctness
  *       concurrency
- *       language-features
  *       external/cwe/cwe-662
  */
 
diff --git a/java/ql/src/Likely Bugs/Concurrency/ThreadSafe.qhelp b/java/ql/src/Likely Bugs/Concurrency/ThreadSafe.qhelp
new file mode 100644
index 00000000000..cafcb3cdd79
--- /dev/null
+++ b/java/ql/src/Likely Bugs/Concurrency/ThreadSafe.qhelp	
@@ -0,0 +1,33 @@
+<!DOCTYPE qhelp PUBLIC
+  "-//Semmle//qhelp//EN"
+  "qhelp.dtd">
+<qhelp>
+
+
+<overview>
+<p>
+In a thread-safe class, all field accesses that can be caused by calls to public methods must be properly synchronized.</p>
+
+</overview>
+<recommendation>
+
+<p>
+Protect the field access with a lock. Alternatively mark the field as <code>volatile</code> if the write operation is atomic. You can also choose to use a data type that guarantees atomic access. If the field is immutable, mark it as <code>final</code>.</p>
+
+</recommendation>
+
+<references>
+
+
+<li>
+  Java Language Specification, chapter 17:
+  <a href="https://docs.oracle.com/javase/specs/jls/se8/html/jls-17.html#jls-17.4">Threads and Locks</a>.
+</li>
+<li>
+  Java concurrency package:
+  <a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/package-summary.html">java.util.concurrent</a>.
+</li>
+
+
+</references>
+</qhelp>
diff --git a/java/ql/src/Likely Bugs/Concurrency/ThreadSafe.ql b/java/ql/src/Likely Bugs/Concurrency/ThreadSafe.ql
new file mode 100644
index 00000000000..fafa4701ed2
--- /dev/null
+++ b/java/ql/src/Likely Bugs/Concurrency/ThreadSafe.ql	
@@ -0,0 +1,51 @@
+/**
+ * @name Not thread-safe
+ * @description This class is not thread-safe. It is annotated as `@ThreadSafe`, but it has a
+ *              conflicting access to a field that is not synchronized with the same monitor.
+ * @kind problem
+ * @problem.severity warning
+ * @precision high
+ * @id java/not-threadsafe
+ * @tags quality
+ *       reliability
+ *       concurrency
+ */
+
+import java
+import semmle.code.java.ConflictingAccess
+
+predicate unmonitoredAccess(ExposedFieldAccess a, string msg, Expr entry, string entry_desc) {
+  exists(ClassAnnotatedAsThreadSafe cls, ExposedField f |
+    cls.unlockedPublicAccess(f, entry, _, a, true)
+    or
+    cls.unlockedPublicAccess(f, entry, _, a, false) and
+    cls.hasPublicWriteAccess(f)
+  ) and
+  msg =
+    "This field access (publicly accessible via $@) is not protected by any monitor, but the class is annotated as @ThreadSafe." and
+  entry_desc = "this expression"
+}
+
+predicate notFullyMonitoredField(
+  ExposedField f, string msg, ClassAnnotatedAsThreadSafe cls, string cls_name
+) {
+  (
+    // Technically there has to be a write access for a conflict to exist.
+    // But if you are locking your reads with different locks, you likely made a typo,
+    // so in this case we alert without requiring `cls.has_public_write_access(f)`
+    cls.singleMonitorMismatch(f)
+    or
+    cls.notFullyMonitored(f) and
+    cls.hasPublicWriteAccess(f)
+  ) and
+  msg =
+    "This field is not properly synchronized in that no single monitor covers all accesses, but the class $@ is annotated as @ThreadSafe." and
+  cls_name = cls.getName()
+}
+
+from Top alert_element, Top alert_context, string alert_msg, string context_desc
+where
+  unmonitoredAccess(alert_element, alert_msg, alert_context, context_desc)
+  or
+  notFullyMonitoredField(alert_element, alert_msg, alert_context, context_desc)
+select alert_element, alert_msg, alert_context, context_desc
diff --git a/java/ql/src/Likely Bugs/Concurrency/UnreleasedLock.ql b/java/ql/src/Likely Bugs/Concurrency/UnreleasedLock.ql
index 118593e31fe..c7d33eff4a9 100644
--- a/java/ql/src/Likely Bugs/Concurrency/UnreleasedLock.ql	
+++ b/java/ql/src/Likely Bugs/Concurrency/UnreleasedLock.ql	
@@ -16,47 +16,7 @@
 import java
 import semmle.code.java.controlflow.Guards
 import semmle.code.java.dataflow.SSA
-import semmle.code.java.frameworks.Mockito
-
-class LockType extends RefType {
-  LockType() {
-    this.getAMethod().hasName("lock") and
-    this.getAMethod().hasName("unlock")
-  }
-
-  Method getLockMethod() {
-    result.getDeclaringType() = this and
-    (result.hasName("lock") or result.hasName("tryLock"))
-  }
-
-  Method getUnlockMethod() {
-    result.getDeclaringType() = this and
-    result.hasName("unlock")
-  }
-
-  Method getIsHeldByCurrentThreadMethod() {
-    result.getDeclaringType() = this and
-    result.hasName("isHeldByCurrentThread")
-  }
-
-  MethodCall getLockAccess() {
-    result.getMethod() = this.getLockMethod() and
-    // Not part of a Mockito verification call
-    not result instanceof MockitoVerifiedMethodCall
-  }
-
-  MethodCall getUnlockAccess() {
-    result.getMethod() = this.getUnlockMethod() and
-    // Not part of a Mockito verification call
-    not result instanceof MockitoVerifiedMethodCall
-  }
-
-  MethodCall getIsHeldByCurrentThreadAccess() {
-    result.getMethod() = this.getIsHeldByCurrentThreadMethod() and
-    // Not part of a Mockito verification call
-    not result instanceof MockitoVerifiedMethodCall
-  }
-}
+import semmle.code.java.Concurrency
 
 predicate lockBlock(LockType t, BasicBlock b, int locks) {
   locks = strictcount(int i | b.getNode(i).asExpr() = t.getLockAccess())
diff --git a/java/ql/src/Likely Bugs/Concurrency/UnsafePublication.java b/java/ql/src/Likely Bugs/Concurrency/UnsafePublication.java
new file mode 100644
index 00000000000..0b7ea330981
--- /dev/null
+++ b/java/ql/src/Likely Bugs/Concurrency/UnsafePublication.java	
@@ -0,0 +1,17 @@
+public class UnsafePublication {
+    private Object value;
+    private int server_id;
+
+    public UnsafePublication() {
+        value = new Object(); // Not safely published, other threads may see the default value null
+        server_id = 1; // Not safely published, other threads may see the default value 0
+    }
+
+    public Object getValue() {
+        return value;
+    }
+
+    public int getServerId() {
+        return server_id;
+    }
+}
\ No newline at end of file
diff --git a/java/ql/src/Likely Bugs/Finalization/NullifiedSuperFinalize.ql b/java/ql/src/Likely Bugs/Finalization/NullifiedSuperFinalize.ql
index 19bac66e028..07fb27d5a53 100644
--- a/java/ql/src/Likely Bugs/Finalization/NullifiedSuperFinalize.ql	
+++ b/java/ql/src/Likely Bugs/Finalization/NullifiedSuperFinalize.ql	
@@ -6,8 +6,9 @@
  * @problem.severity error
  * @precision medium
  * @id java/missing-super-finalize
- * @tags reliability
- *       maintainability
+ * @tags quality
+ *       reliability
+ *       correctness
  *       external/cwe/cwe-568
  */
 
diff --git a/java/ql/src/Likely Bugs/Frameworks/JUnit/BadSuiteMethod.ql b/java/ql/src/Likely Bugs/Frameworks/JUnit/BadSuiteMethod.ql
index 2b6ae1125dd..fb82f330c22 100644
--- a/java/ql/src/Likely Bugs/Frameworks/JUnit/BadSuiteMethod.ql	
+++ b/java/ql/src/Likely Bugs/Frameworks/JUnit/BadSuiteMethod.ql	
@@ -6,9 +6,9 @@
  * @problem.severity warning
  * @precision medium
  * @id java/wrong-junit-suite-signature
- * @tags testability
- *       maintainability
- *       frameworks/junit
+ * @tags quality
+ *       reliability
+ *       correctness
  */
 
 import java
diff --git a/java/ql/src/Likely Bugs/Frameworks/Swing/BadlyOverriddenAdapter.ql b/java/ql/src/Likely Bugs/Frameworks/Swing/BadlyOverriddenAdapter.ql
index 3d4f6270734..6a2db4b695f 100644
--- a/java/ql/src/Likely Bugs/Frameworks/Swing/BadlyOverriddenAdapter.ql	
+++ b/java/ql/src/Likely Bugs/Frameworks/Swing/BadlyOverriddenAdapter.ql	
@@ -7,9 +7,9 @@
  * @problem.severity warning
  * @precision medium
  * @id java/wrong-swing-event-adapter-signature
- * @tags reliability
- *       maintainability
- *       frameworks/swing
+ * @tags quality
+ *       reliability
+ *       correctness
  */
 
 import java
@@ -24,14 +24,20 @@ class Adapter extends Class {
   }
 }
 
-from Class c, Adapter adapter, Method m
-where
+pragma[nomagic]
+predicate candidate(Class c, Adapter adapter, Method m, string name) {
   adapter = c.getASupertype() and
   c = m.getDeclaringType() and
-  exists(Method original | adapter = original.getDeclaringType() | m.getName() = original.getName()) and
-  not exists(Method overridden | adapter = overridden.getDeclaringType() | m.overrides(overridden)) and
+  name = m.getName() and
   // The method is not used for any other purpose.
   not exists(MethodCall ma | ma.getMethod() = m)
+}
+
+from Class c, Adapter adapter, Method m, string name
+where
+  candidate(c, adapter, m, name) and
+  exists(Method original | adapter = original.getDeclaringType() | name = original.getName()) and
+  not exists(Method overridden | adapter = overridden.getDeclaringType() | m.overrides(overridden))
 select m,
   "Method " + m.getName() + " attempts to override a method in " + adapter.getName() +
     ", but does not have the same argument types. " + m.getName() +
diff --git a/java/ql/src/Likely Bugs/Likely Typos/DangerousNonCircuitLogic.ql b/java/ql/src/Likely Bugs/Likely Typos/DangerousNonCircuitLogic.ql
index 8d9409059f8..c93e5fe91a1 100644
--- a/java/ql/src/Likely Bugs/Likely Typos/DangerousNonCircuitLogic.ql	
+++ b/java/ql/src/Likely Bugs/Likely Typos/DangerousNonCircuitLogic.ql	
@@ -7,7 +7,9 @@
  * @problem.severity warning
  * @precision medium
  * @id java/non-short-circuit-evaluation
- * @tags reliability
+ * @tags quality
+ *       reliability
+ *       correctness
  *       readability
  *       external/cwe/cwe-691
  */
diff --git a/java/ql/src/Likely Bugs/Likely Typos/EqualsTypo.ql b/java/ql/src/Likely Bugs/Likely Typos/EqualsTypo.ql
index 585306be958..d5a117fc2da 100644
--- a/java/ql/src/Likely Bugs/Likely Typos/EqualsTypo.ql	
+++ b/java/ql/src/Likely Bugs/Likely Typos/EqualsTypo.ql	
@@ -5,9 +5,10 @@
  * @problem.severity warning
  * @precision medium
  * @id java/equals-typo
- * @tags maintainability
+ * @tags quality
+ *       reliability
+ *       correctness
  *       readability
- *       naming
  */
 
 import java
diff --git a/java/ql/src/Likely Bugs/Likely Typos/HashCodeTypo.ql b/java/ql/src/Likely Bugs/Likely Typos/HashCodeTypo.ql
index 7a69f9f7953..e75f9f337fd 100644
--- a/java/ql/src/Likely Bugs/Likely Typos/HashCodeTypo.ql	
+++ b/java/ql/src/Likely Bugs/Likely Typos/HashCodeTypo.ql	
@@ -5,9 +5,10 @@
  * @problem.severity warning
  * @precision medium
  * @id java/hashcode-typo
- * @tags maintainability
+ * @tags quality
+ *       reliability
+ *       correctness
  *       readability
- *       naming
  */
 
 import java
diff --git a/java/ql/src/Likely Bugs/Likely Typos/SelfAssignment.ql b/java/ql/src/Likely Bugs/Likely Typos/SelfAssignment.ql
index 8116a906910..fe2286aad1d 100644
--- a/java/ql/src/Likely Bugs/Likely Typos/SelfAssignment.ql	
+++ b/java/ql/src/Likely Bugs/Likely Typos/SelfAssignment.ql	
@@ -13,6 +13,7 @@
 
 import java
 
+pragma[nomagic]
 predicate toCompare(VarAccess left, VarAccess right) {
   exists(AssignExpr assign | assign.getDest() = left and assign.getSource() = right)
   or
@@ -29,9 +30,10 @@ predicate local(RefType enclosingType, VarAccess v) {
   not exists(v.getQualifier()) and enclosingType = v.getEnclosingCallable().getDeclaringType()
 }
 
+pragma[nomagic]
 predicate sameVariable(VarAccess left, VarAccess right) {
   toCompare(left, right) and
-  left.getVariable() = right.getVariable() and
+  pragma[only_bind_out](left.getVariable()) = pragma[only_bind_out](right.getVariable()) and
   (
     exists(Expr q1, Expr q2 |
       q1 = left.getQualifier() and
@@ -39,7 +41,10 @@ predicate sameVariable(VarAccess left, VarAccess right) {
       q2 = right.getQualifier()
     )
     or
-    exists(RefType enclosingType | local(enclosingType, left) and local(enclosingType, right))
+    exists(RefType enclosingType |
+      local(enclosingType, pragma[only_bind_out](left)) and
+      local(enclosingType, pragma[only_bind_out](right))
+    )
   )
 }
 
diff --git a/java/ql/src/Likely Bugs/Likely Typos/ToStringTypo.ql b/java/ql/src/Likely Bugs/Likely Typos/ToStringTypo.ql
index 928d9f5a7cc..a4d46ec69e0 100644
--- a/java/ql/src/Likely Bugs/Likely Typos/ToStringTypo.ql	
+++ b/java/ql/src/Likely Bugs/Likely Typos/ToStringTypo.ql	
@@ -5,9 +5,10 @@
  * @problem.severity warning
  * @precision medium
  * @id java/tostring-typo
- * @tags maintainability
+ * @tags quality
+ *       reliability
+ *       correctness
  *       readability
- *       naming
  */
 
 import java
diff --git a/java/ql/src/Likely Bugs/Reflection/AnnotationPresentCheck.ql b/java/ql/src/Likely Bugs/Reflection/AnnotationPresentCheck.ql
index 0bfb4b45a5a..8b75b8c9786 100644
--- a/java/ql/src/Likely Bugs/Reflection/AnnotationPresentCheck.ql	
+++ b/java/ql/src/Likely Bugs/Reflection/AnnotationPresentCheck.ql	
@@ -6,8 +6,9 @@
  * @problem.severity error
  * @precision medium
  * @id java/ineffective-annotation-present-check
- * @tags correctness
- *       logic
+ * @tags quality
+ *       reliability
+ *       correctness
  */
 
 import java
diff --git a/java/ql/src/Likely Bugs/Serialization/IncorrectSerialVersionUID.ql b/java/ql/src/Likely Bugs/Serialization/IncorrectSerialVersionUID.ql
index af86d90d690..813db75526e 100644
--- a/java/ql/src/Likely Bugs/Serialization/IncorrectSerialVersionUID.ql	
+++ b/java/ql/src/Likely Bugs/Serialization/IncorrectSerialVersionUID.ql	
@@ -6,9 +6,9 @@
  * @problem.severity warning
  * @precision medium
  * @id java/incorrect-serial-version-uid
- * @tags reliability
- *       maintainability
- *       language-features
+ * @tags quality
+ *       reliability
+ *       correctness
  */
 
 import java
diff --git a/java/ql/src/Likely Bugs/Serialization/IncorrectSerializableMethods.ql b/java/ql/src/Likely Bugs/Serialization/IncorrectSerializableMethods.ql
index 815245d1a7d..0fbf52d207e 100644
--- a/java/ql/src/Likely Bugs/Serialization/IncorrectSerializableMethods.ql	
+++ b/java/ql/src/Likely Bugs/Serialization/IncorrectSerializableMethods.ql	
@@ -6,9 +6,9 @@
  * @problem.severity warning
  * @precision medium
  * @id java/wrong-object-serialization-signature
- * @tags reliability
- *       maintainability
- *       language-features
+ * @tags quality
+ *       reliability
+ *       correctness
  */
 
 import java
diff --git a/java/ql/src/Likely Bugs/Serialization/MissingVoidConstructorOnExternalizable.ql b/java/ql/src/Likely Bugs/Serialization/MissingVoidConstructorOnExternalizable.ql
index 44c92634fe0..47bb0640b5e 100644
--- a/java/ql/src/Likely Bugs/Serialization/MissingVoidConstructorOnExternalizable.ql	
+++ b/java/ql/src/Likely Bugs/Serialization/MissingVoidConstructorOnExternalizable.ql	
@@ -6,9 +6,9 @@
  * @problem.severity warning
  * @precision medium
  * @id java/missing-no-arg-constructor-on-externalizable
- * @tags reliability
- *       maintainability
- *       language-features
+ * @tags quality
+ *       reliability
+ *       correctness
  */
 
 import java
diff --git a/java/ql/src/Likely Bugs/Serialization/MissingVoidConstructorsOnSerializable.ql b/java/ql/src/Likely Bugs/Serialization/MissingVoidConstructorsOnSerializable.ql
index 651908b0b86..c38a074529d 100644
--- a/java/ql/src/Likely Bugs/Serialization/MissingVoidConstructorsOnSerializable.ql	
+++ b/java/ql/src/Likely Bugs/Serialization/MissingVoidConstructorsOnSerializable.ql	
@@ -7,9 +7,9 @@
  * @problem.severity warning
  * @precision medium
  * @id java/missing-no-arg-constructor-on-serializable
- * @tags reliability
- *       maintainability
- *       language-features
+ * @tags quality
+ *       reliability
+ *       correctness
  */
 
 import java
diff --git a/java/ql/src/Likely Bugs/Serialization/NonSerializableInnerClass.ql b/java/ql/src/Likely Bugs/Serialization/NonSerializableInnerClass.ql
index 8081c551eed..520dba86c41 100644
--- a/java/ql/src/Likely Bugs/Serialization/NonSerializableInnerClass.ql	
+++ b/java/ql/src/Likely Bugs/Serialization/NonSerializableInnerClass.ql	
@@ -6,9 +6,9 @@
  * @problem.severity warning
  * @precision medium
  * @id java/non-serializable-inner-class
- * @tags reliability
- *       maintainability
- *       language-features
+ * @tags quality
+ *       reliability
+ *       correctness
  */
 
 import java
diff --git a/java/ql/src/Likely Bugs/Serialization/ReadResolveObject.ql b/java/ql/src/Likely Bugs/Serialization/ReadResolveObject.ql
index 64e5a483362..629e601f469 100644
--- a/java/ql/src/Likely Bugs/Serialization/ReadResolveObject.ql	
+++ b/java/ql/src/Likely Bugs/Serialization/ReadResolveObject.ql	
@@ -7,9 +7,9 @@
  * @problem.severity warning
  * @precision medium
  * @id java/wrong-readresolve-signature
- * @tags reliability
- *       maintainability
- *       language-features
+ * @tags quality
+ *       reliability
+ *       correctness
  */
 
 import java
diff --git a/java/ql/src/Likely Bugs/Statements/MissingEnumInSwitch.ql b/java/ql/src/Likely Bugs/Statements/MissingEnumInSwitch.ql
index d1cdb8bdfbb..0e6584bb4e5 100644
--- a/java/ql/src/Likely Bugs/Statements/MissingEnumInSwitch.ql	
+++ b/java/ql/src/Likely Bugs/Statements/MissingEnumInSwitch.ql	
@@ -6,8 +6,9 @@
  * @problem.severity warning
  * @precision medium
  * @id java/missing-case-in-switch
- * @tags reliability
- *       readability
+ * @tags quality
+ *       reliability
+ *       correctness
  *       external/cwe/cwe-478
  */
 
diff --git a/java/ql/src/Likely Bugs/Termination/SpinOnField.ql b/java/ql/src/Likely Bugs/Termination/SpinOnField.ql
index 8675bbd418b..7cfb2308c96 100644
--- a/java/ql/src/Likely Bugs/Termination/SpinOnField.ql	
+++ b/java/ql/src/Likely Bugs/Termination/SpinOnField.ql	
@@ -6,9 +6,11 @@
  * @problem.severity warning
  * @precision medium
  * @id java/spin-on-field
- * @tags efficiency
+ * @tags quality
+ *       reliability
  *       correctness
  *       concurrency
+ *       performance
  */
 
 import java
@@ -33,8 +35,8 @@ class Empty extends Stmt {
 class EmptyLoop extends Stmt {
   EmptyLoop() {
     exists(ForStmt stmt | stmt = this |
-      count(stmt.getAnInit()) = 0 and
-      count(stmt.getAnUpdate()) = 0 and
+      not exists(stmt.getAnInit()) and
+      not exists(stmt.getAnUpdate()) and
       stmt.getStmt() instanceof Empty
     )
     or
diff --git a/java/ql/src/Security/CWE/CWE-020/OverlyLargeRange.ql b/java/ql/src/Security/CWE/CWE-020/OverlyLargeRange.ql
index b8ea3e52dbd..5762785949e 100644
--- a/java/ql/src/Security/CWE/CWE-020/OverlyLargeRange.ql
+++ b/java/ql/src/Security/CWE/CWE-020/OverlyLargeRange.ql
@@ -4,7 +4,7 @@
  *              This may allow an attacker to bypass a filter or sanitizer.
  * @kind problem
  * @problem.severity warning
- * @security-severity 5.0
+ * @security-severity 4.0
  * @precision high
  * @id java/overly-large-range
  * @tags correctness
diff --git a/java/ql/src/experimental/Security/CWE/CWE-1004/SensitiveCookieNotHttpOnly.java b/java/ql/src/Security/CWE/CWE-1004/SensitiveCookieNotHttpOnly.java
similarity index 100%
rename from java/ql/src/experimental/Security/CWE/CWE-1004/SensitiveCookieNotHttpOnly.java
rename to java/ql/src/Security/CWE/CWE-1004/SensitiveCookieNotHttpOnly.java
diff --git a/java/ql/src/experimental/Security/CWE/CWE-1004/SensitiveCookieNotHttpOnly.qhelp b/java/ql/src/Security/CWE/CWE-1004/SensitiveCookieNotHttpOnly.qhelp
similarity index 58%
rename from java/ql/src/experimental/Security/CWE/CWE-1004/SensitiveCookieNotHttpOnly.qhelp
rename to java/ql/src/Security/CWE/CWE-1004/SensitiveCookieNotHttpOnly.qhelp
index ee3e8a4181a..71e016510e2 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-1004/SensitiveCookieNotHttpOnly.qhelp
+++ b/java/ql/src/Security/CWE/CWE-1004/SensitiveCookieNotHttpOnly.qhelp
@@ -2,11 +2,13 @@
 <qhelp>
 
   <overview>
-    <p>Cross-Site Scripting (XSS) is categorized as one of the OWASP Top 10 Security Vulnerabilities. The <code>HttpOnly</code> flag directs compatible browsers to prevent client-side script from accessing cookies. Including the <code>HttpOnly</code> flag in the Set-Cookie HTTP response header for a sensitive cookie helps mitigate the risk associated with XSS where an attacker's script code attempts to read the contents of a cookie and exfiltrate information obtained.</p>
+    <p>Cookies without the <code>HttpOnly</code> flag set are accessible to client-side scripts (such as JavaScript) running in the same origin. 
+In case of a Cross-Site Scripting (XSS) vulnerability, the cookie can be stolen by a malicious script.
+If a sensitive cookie does not need to be accessed directly by client-side scripts, the <code>HttpOnly</code> flag should be set.</p>
   </overview>
 
   <recommendation>
-    <p>Use the <code>HttpOnly</code> flag when generating a cookie containing sensitive information to help mitigate the risk of client side script accessing the protected cookie.</p>
+    <p>Use the <code>HttpOnly</code> flag when generating a cookie containing sensitive information to help mitigate the risk of client-side scripts accessing the protected cookie.</p>
   </recommendation>
 
   <example>
@@ -23,5 +25,6 @@
       OWASP:
       <a href="https://owasp.org/www-community/HttpOnly">HttpOnly</a>
     </li>
+    <li>MDN: <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Reference/Headers/Set-Cookie#httponly">Set-Cookie HttpOnly</a>.</li>
   </references>
 </qhelp>
diff --git a/java/ql/src/experimental/Security/CWE/CWE-1004/SensitiveCookieNotHttpOnly.ql b/java/ql/src/Security/CWE/CWE-1004/SensitiveCookieNotHttpOnly.ql
similarity index 67%
rename from java/ql/src/experimental/Security/CWE/CWE-1004/SensitiveCookieNotHttpOnly.ql
rename to java/ql/src/Security/CWE/CWE-1004/SensitiveCookieNotHttpOnly.ql
index fa5237d32bb..494e851a533 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-1004/SensitiveCookieNotHttpOnly.ql
+++ b/java/ql/src/Security/CWE/CWE-1004/SensitiveCookieNotHttpOnly.ql
@@ -1,13 +1,13 @@
 /**
  * @name Sensitive cookies without the HttpOnly response header set
- * @description Sensitive cookies without the 'HttpOnly' flag set leaves session cookies vulnerable to
+ * @description A sensitive cookie without the 'HttpOnly' flag set may be vulnerable to
  *              an XSS attack.
  * @kind path-problem
  * @problem.severity warning
- * @precision medium
+ * @precision high
+ * @security-severity 5.0
  * @id java/sensitive-cookie-not-httponly
  * @tags security
- *       experimental
  *       external/cwe/cwe-1004
  */
 
@@ -15,16 +15,15 @@
  * Sketch of the structure of this query: we track cookie names that appear to be sensitive
  * (e.g. `session` or `token`) to a `ServletResponse.addHeader(...)` or `.addCookie(...)`
  * method that does not set the `httpOnly` flag. Subsidiary configurations
- * `MatchesHttpOnlyConfiguration` and `SetHttpOnlyInCookieConfiguration` are used to establish
+ * `MatchesHttpOnlyToRawHeaderConfig` and `SetHttpOnlyInCookieConfig` are used to establish
  * when the `httpOnly` flag is likely to have been set, before configuration
- * `MissingHttpOnlyConfiguration` establishes that a non-`httpOnly` cookie has a sensitive-seeming name.
+ * `MissingHttpOnlyConfig` establishes that a non-`httpOnly` cookie has a sensitive-seeming name.
  */
 
 import java
 import semmle.code.java.dataflow.FlowSteps
 import semmle.code.java.frameworks.Servlets
 import semmle.code.java.dataflow.TaintTracking
-import MissingHttpOnlyFlow::PathGraph
 
 /** Gets a regular expression for matching common names of sensitive cookies. */
 string getSensitiveCookieNameRegex() { result = "(?i).*(auth|session|token|key|credential).*" }
@@ -50,8 +49,8 @@ class SensitiveCookieNameExpr extends Expr {
 }
 
 /** A method call that sets a `Set-Cookie` header. */
-class SetCookieMethodCall extends MethodCall {
-  SetCookieMethodCall() {
+class SetCookieRawHeaderMethodCall extends MethodCall {
+  SetCookieRawHeaderMethodCall() {
     (
       this.getMethod() instanceof ResponseAddHeaderMethod or
       this.getMethod() instanceof ResponseSetHeaderMethod
@@ -62,19 +61,19 @@ class SetCookieMethodCall extends MethodCall {
 
 /**
  * A taint configuration tracking flow from the text `httponly` to argument 1 of
- * `SetCookieMethodCall`.
+ * `SetCookieRawHeaderMethodCall`.
  */
-module MatchesHttpOnlyConfig implements DataFlow::ConfigSig {
+module MatchesHttpOnlyToRawHeaderConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) {
     source.asExpr().(CompileTimeConstantExpr).getStringValue().toLowerCase().matches("%httponly%")
   }
 
   predicate isSink(DataFlow::Node sink) {
-    sink.asExpr() = any(SetCookieMethodCall ma).getArgument(1)
+    sink.asExpr() = any(SetCookieRawHeaderMethodCall ma).getArgument(1)
   }
 }
 
-module MatchesHttpOnlyFlow = TaintTracking::Global<MatchesHttpOnlyConfig>;
+module MatchesHttpOnlyToRawHeaderFlow = TaintTracking::Global<MatchesHttpOnlyToRawHeaderConfig>;
 
 /** A class descended from `javax.servlet.http.Cookie`. */
 class CookieClass extends RefType {
@@ -103,29 +102,11 @@ predicate removesCookie(MethodCall ma) {
 }
 
 /**
- * Holds if the MethodCall `ma` is a test method call indicated by:
- *    a) in a test directory such as `src/test/java`
- *    b) in a test package whose name has the word `test`
- *    c) in a test class whose name has the word `test`
- *    d) in a test class implementing a test framework such as JUnit or TestNG
+ * A taint configuration tracking the flow of a cookie that has had the
+ * `HttpOnly` flag set, or has been removed, to a `ServletResponse.addCookie`
+ * call.
  */
-predicate isTestMethod(MethodCall ma) {
-  exists(Method m |
-    m = ma.getEnclosingCallable() and
-    (
-      m.getDeclaringType().getName().toLowerCase().matches("%test%") or // Simple check to exclude test classes to reduce FPs
-      m.getDeclaringType().getPackage().getName().toLowerCase().matches("%test%") or // Simple check to exclude classes in test packages to reduce FPs
-      exists(m.getLocation().getFile().getAbsolutePath().indexOf("/src/test/java")) or //  Match test directory structure of build tools like maven
-      m instanceof TestMethod // Test method of a test case implementing a test framework such as JUnit or TestNG
-    )
-  )
-}
-
-/**
- * A taint configuration tracking flow of a method that sets the `HttpOnly` flag,
- * or one that removes a cookie, to a `ServletResponse.addCookie` call.
- */
-module SetHttpOnlyOrRemovesCookieConfig implements DataFlow::ConfigSig {
+module SetHttpOnlyOrRemovesCookieToAddCookieConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) {
     source.asExpr() =
       any(MethodCall ma | setsCookieHttpOnly(ma) or removesCookie(ma)).getQualifier()
@@ -137,25 +118,25 @@ module SetHttpOnlyOrRemovesCookieConfig implements DataFlow::ConfigSig {
   }
 }
 
-module SetHttpOnlyOrRemovesCookieFlow = TaintTracking::Global<SetHttpOnlyOrRemovesCookieConfig>;
+module SetHttpOnlyOrRemovesCookieToAddCookieFlow =
+  TaintTracking::Global<SetHttpOnlyOrRemovesCookieToAddCookieConfig>;
 
 /**
- * A cookie that is added to an HTTP response and which doesn't have `httpOnly` set, used as a sink
- * in `MissingHttpOnlyConfiguration`.
+ * A cookie that is added to an HTTP response and which doesn't have `HttpOnly` set, used as a sink
+ * in `MissingHttpOnlyConfig`.
  */
-class CookieResponseSink extends DataFlow::ExprNode {
-  CookieResponseSink() {
+class CookieResponseWithoutHttpOnlySink extends DataFlow::ExprNode {
+  CookieResponseWithoutHttpOnlySink() {
     exists(MethodCall ma |
       (
         ma.getMethod() instanceof ResponseAddCookieMethod and
         this.getExpr() = ma.getArgument(0) and
-        not SetHttpOnlyOrRemovesCookieFlow::flowTo(this)
+        not SetHttpOnlyOrRemovesCookieToAddCookieFlow::flowTo(this)
         or
-        ma instanceof SetCookieMethodCall and
+        ma instanceof SetCookieRawHeaderMethodCall and
         this.getExpr() = ma.getArgument(1) and
-        not MatchesHttpOnlyFlow::flowTo(this) // response.addHeader("Set-Cookie", "token=" +authId + ";HttpOnly;Secure")
-      ) and
-      not isTestMethod(ma) // Test class or method
+        not MatchesHttpOnlyToRawHeaderFlow::flowTo(this) // response.addHeader("Set-Cookie", "token=" +authId + ";HttpOnly;Secure")
+      )
     )
   }
 }
@@ -178,15 +159,21 @@ predicate setsHttpOnlyInNewCookie(ClassInstanceExpr cie) {
 
 /**
  * A taint configuration tracking flow from a sensitive cookie without the `HttpOnly` flag
- * set to its HTTP response.
+ * set to an HTTP response.
+ *
+ * Tracks string literals containing sensitive names (`SensitiveCookieNameExpr`), to an `addCookie` call (as a `Cookie` object)
+ * or an `addHeader` call (as a string) (`CookieResponseWithoutHttpOnlySink`).
+ *
+ * Passes through `Cookie` constructors and `toString` calls.
  */
 module MissingHttpOnlyConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { source.asExpr() instanceof SensitiveCookieNameExpr }
 
-  predicate isSink(DataFlow::Node sink) { sink instanceof CookieResponseSink }
+  predicate isSink(DataFlow::Node sink) { sink instanceof CookieResponseWithoutHttpOnlySink }
 
   predicate isBarrier(DataFlow::Node node) {
     // JAX-RS's `new NewCookie("session-access-key", accessKey, "/", null, null, 0, true, true)` and similar
+    // Cookie constructors that set the `HttpOnly` flag are considered barriers to the flow of sensitive names.
     setsHttpOnlyInNewCookie(node.asExpr())
   }
 
@@ -212,13 +199,8 @@ module MissingHttpOnlyConfig implements DataFlow::ConfigSig {
 
 module MissingHttpOnlyFlow = TaintTracking::Global<MissingHttpOnlyConfig>;
 
-deprecated query predicate problems(
-  DataFlow::Node sinkNode, MissingHttpOnlyFlow::PathNode source, MissingHttpOnlyFlow::PathNode sink,
-  string message1, DataFlow::Node sourceNode, string message2
-) {
-  MissingHttpOnlyFlow::flowPath(source, sink) and
-  sinkNode = sink.getNode() and
-  message1 = "$@ doesn't have the HttpOnly flag set." and
-  sourceNode = source.getNode() and
-  message2 = "This sensitive cookie"
-}
+import MissingHttpOnlyFlow::PathGraph
+
+from MissingHttpOnlyFlow::PathNode source, MissingHttpOnlyFlow::PathNode sink
+where MissingHttpOnlyFlow::flowPath(source, sink)
+select sink, source, sink, "$@ doesn't have the HttpOnly flag set.", source, "This sensitive cookie"
diff --git a/java/ql/src/Security/CWE/CWE-200/SpringBootActuatorsConfig/SpringBootActuatorsConfig.qhelp b/java/ql/src/Security/CWE/CWE-200/SpringBootActuatorsConfig/SpringBootActuatorsConfig.qhelp
new file mode 100644
index 00000000000..d3e79e88ed7
--- /dev/null
+++ b/java/ql/src/Security/CWE/CWE-200/SpringBootActuatorsConfig/SpringBootActuatorsConfig.qhelp
@@ -0,0 +1,39 @@
+<!DOCTYPE qhelp PUBLIC "-//Semmle//qhelp//EN" "qhelp.dtd">
+<qhelp>
+  <overview>
+    <p>Spring Boot includes features called actuators that let you monitor and interact with your web
+    application. Exposing unprotected actuator endpoints through configuration files can lead to
+    information disclosure or even to remote code execution.</p>
+  </overview>
+
+  <recommendation>
+    <p>Since actuator endpoints may contain sensitive information, carefully consider when to expose them,
+    and secure them as you would any sensitive URL. If you need to expose actuator endpoints, use Spring
+    Security, which secures actuators by default, or define a custom security configuration.
+    </p>
+  </recommendation>
+
+  <example>
+    <p>The following examples show <code>application.properties</code> configurations that expose sensitive
+    actuator endpoints.</p>
+    <sample src="application_bad.properties" />
+
+    <p>The below configurations ensure that sensitive actuator endpoints are not exposed.</p>
+    <sample src="application_good.properties" />
+
+    <p>To use Spring Security, which secures actuators by default, add the <code>spring-boot-starter-security</code>
+    dependency in your Maven <code>pom.xml</code> file.</p>
+    <sample src="pom_good.xml" />
+  </example>
+
+  <references>
+    <li>
+      Spring Boot Reference Documentation:
+      <a href="https://docs.spring.io/spring-boot/reference/actuator/endpoints.html">Endpoints</a>.
+    </li>
+    <li>
+      HackerOne Report:
+      <a href="https://hackerone.com/reports/862589">Spring Actuator endpoints publicly available, leading to account takeover</a>
+    </li>
+  </references>
+</qhelp>
diff --git a/java/ql/src/Security/CWE/CWE-200/SpringBootActuatorsConfig/SpringBootActuatorsConfig.ql b/java/ql/src/Security/CWE/CWE-200/SpringBootActuatorsConfig/SpringBootActuatorsConfig.ql
new file mode 100644
index 00000000000..562298257a7
--- /dev/null
+++ b/java/ql/src/Security/CWE/CWE-200/SpringBootActuatorsConfig/SpringBootActuatorsConfig.ql
@@ -0,0 +1,20 @@
+/**
+ * @name Exposed Spring Boot actuators in configuration file
+ * @description Exposing Spring Boot actuators through configuration files may lead to information leak from
+ *              the internal application, or even to remote code execution.
+ * @kind problem
+ * @problem.severity error
+ * @security-severity 6.5
+ * @precision high
+ * @id java/spring-boot-exposed-actuators-config
+ * @tags security
+ *       external/cwe/cwe-200
+ */
+
+import java
+import semmle.code.xml.MavenPom
+import semmle.code.java.security.SpringBootActuatorsConfigQuery
+
+from SpringBootStarterActuatorDependency d, JavaPropertyOption jpOption
+where exposesSensitiveEndpoint(d, jpOption)
+select d, "Insecure Spring Boot actuator $@ exposes sensitive endpoints.", jpOption, "configuration"
diff --git a/java/ql/src/Security/CWE/CWE-200/SpringBootActuatorsConfig/application_bad.properties b/java/ql/src/Security/CWE/CWE-200/SpringBootActuatorsConfig/application_bad.properties
new file mode 100644
index 00000000000..ccf1cb67881
--- /dev/null
+++ b/java/ql/src/Security/CWE/CWE-200/SpringBootActuatorsConfig/application_bad.properties
@@ -0,0 +1,10 @@
+# vulnerable configuration (Spring Boot 1.0 - 1.4): exposes endpoints by default
+
+# vulnerable configuration (Spring Boot 1.5): false value exposes endpoints
+management.security.enabled=false
+
+# vulnerable configuration (Spring Boot 2.x): exposes all endpoints
+management.endpoints.web.exposure.include=*
+
+# vulnerable configuration (Spring Boot 3.x): exposes all endpoints
+management.endpoints.web.exposure.include=*
diff --git a/java/ql/src/Security/CWE/CWE-200/SpringBootActuatorsConfig/application_good.properties b/java/ql/src/Security/CWE/CWE-200/SpringBootActuatorsConfig/application_good.properties
new file mode 100644
index 00000000000..1af2b7b0228
--- /dev/null
+++ b/java/ql/src/Security/CWE/CWE-200/SpringBootActuatorsConfig/application_good.properties
@@ -0,0 +1,11 @@
+# safe configuration (Spring Boot 1.0 - 1.4)
+management.security.enabled=true
+
+# safe configuration (Spring Boot 1.5+)
+management.security.enabled=true
+
+# safe configuration (Spring Boot 2.x): exposes health and info only by default
+management.endpoints.web.exposure.include=health,info
+
+# safe configuration (Spring Boot 3.x): exposes health only by default
+management.endpoints.web.exposure.include=health
diff --git a/java/ql/src/Security/CWE/CWE-200/SpringBootActuatorsConfig/pom_good.xml b/java/ql/src/Security/CWE/CWE-200/SpringBootActuatorsConfig/pom_good.xml
new file mode 100644
index 00000000000..32fad44591e
--- /dev/null
+++ b/java/ql/src/Security/CWE/CWE-200/SpringBootActuatorsConfig/pom_good.xml
@@ -0,0 +1,12 @@
+...
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+
+        <!-- GOOD: Enable Spring Security -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
+...
diff --git a/java/ql/src/Security/CWE/CWE-327/BrokenCryptoAlgorithm.qhelp b/java/ql/src/Security/CWE/CWE-327/BrokenCryptoAlgorithm.qhelp
index 1d8e8db6798..35b37b9f814 100644
--- a/java/ql/src/Security/CWE/CWE-327/BrokenCryptoAlgorithm.qhelp
+++ b/java/ql/src/Security/CWE/CWE-327/BrokenCryptoAlgorithm.qhelp
@@ -3,11 +3,15 @@
   "qhelp.dtd">
 <qhelp>
 <overview>
-<p>Using broken or weak cryptographic algorithms can leave data vulnerable to being decrypted.</p>
+<p>Using broken or weak cryptographic algorithms may compromise security guarantees such as confidentiality, integrity, and authenticity.</p>
 
-<p>Many cryptographic algorithms provided by cryptography libraries are known to be weak, or 
-flawed. Using such an algorithm means that an attacker may be able to easily decrypt the encrypted
-data.</p>
+<p>Many cryptographic algorithms are known to be weak or flawed. The security guarantees of a system often rely on the underlying cryptography, so using a weak algorithm can have severe consequences. For example:
+</p>
+<ul>
+  <li>If a weak encryption algorithm is used, an attacker may be able to decrypt sensitive data.</li>
+  <li>If a weak hashing algorithm is used to protect data integrity, an attacker may be able to craft a malicious input that has the same hash as a benign one.</li>
+  <li>If a weak algorithm is used for digital signatures, an attacker may be able to forge signatures and impersonate legitimate users.</li>
+</ul>
 
 </overview>
 <recommendation>
diff --git a/java/ql/src/Security/CWE/CWE-614/InsecureCookie.ql b/java/ql/src/Security/CWE/CWE-614/InsecureCookie.ql
index b8d64d22e29..44107281feb 100644
--- a/java/ql/src/Security/CWE/CWE-614/InsecureCookie.ql
+++ b/java/ql/src/Security/CWE/CWE-614/InsecureCookie.ql
@@ -4,7 +4,7 @@
  *              interception.
  * @kind problem
  * @problem.severity error
- * @security-severity 5.0
+ * @security-severity 4.0
  * @precision high
  * @id java/insecure-cookie
  * @tags security
diff --git a/java/ql/src/Telemetry/DatabaseQualityDiagnostics.ql b/java/ql/src/Telemetry/DatabaseQualityDiagnostics.ql
index 6bbe1d11ee1..ad58b90bc95 100644
--- a/java/ql/src/Telemetry/DatabaseQualityDiagnostics.ql
+++ b/java/ql/src/Telemetry/DatabaseQualityDiagnostics.ql
@@ -8,26 +8,39 @@
 import java
 import DatabaseQuality
 
+private predicate diagnostic(string msg, float value, float threshold) {
+  CallTargetStatsReport::percentageOfOk(msg, value) and
+  threshold = 85
+  or
+  ExprTypeStatsReport::percentageOfOk(msg, value) and
+  threshold = 85
+}
+
 private newtype TDbQualityDiagnostic =
   TTheDbQualityDiagnostic() {
-    exists(float percentageGood |
-      CallTargetStatsReport::percentageOfOk(_, percentageGood)
-      or
-      ExprTypeStatsReport::percentageOfOk(_, percentageGood)
-    |
-      percentageGood < 95
+    exists(float percentageGood, float threshold |
+      diagnostic(_, percentageGood, threshold) and
+      percentageGood < threshold
     )
   }
 
+private string getDbHealth() {
+  result =
+    strictconcat(string msg, float value, float threshold |
+      diagnostic(msg, value, threshold)
+    |
+      msg + ": " + value.floor() + " % (threshold " + threshold.floor() + " %)", ". "
+    )
+}
+
 class DbQualityDiagnostic extends TDbQualityDiagnostic {
   string toString() {
     result =
       "Scanning Java code completed successfully, but the scan encountered issues. " +
-        "This may be caused by problems identifying dependencies or use of generated source code, among other reasons -- "
-        +
-        "see other CodeQL diagnostics reported on the CodeQL status page for more details of possible causes. "
-        +
-        "Addressing these warnings is advisable to avoid false-positive or missing results. If they cannot be addressed, consider scanning Java "
+        "This may be caused by problems identifying dependencies or use of generated source code. " +
+        "Some metrics of the database quality are: " + getDbHealth() + ". " +
+        "Ideally these metrics should be above their thresholds. " +
+        "Addressing these issues is advisable to avoid false-positives or missing results. If they cannot be addressed, consider scanning Java "
         +
         "using either the `autobuild` or `manual` [build modes](https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages#comparison-of-the-build-modes)."
   }
diff --git a/java/ql/src/Violations of Best Practice/Dead Code/CreatesEmptyZip.ql b/java/ql/src/Violations of Best Practice/Dead Code/CreatesEmptyZip.ql
index a2b6afbbeee..beea4bba5d5 100644
--- a/java/ql/src/Violations of Best Practice/Dead Code/CreatesEmptyZip.ql	
+++ b/java/ql/src/Violations of Best Practice/Dead Code/CreatesEmptyZip.ql	
@@ -6,8 +6,9 @@
  * @problem.severity warning
  * @precision medium
  * @id java/empty-zip-file-entry
- * @tags reliability
- *       readability
+ * @tags quality
+ *       reliability
+ *       correctness
  */
 
 import java
diff --git a/java/ql/src/Violations of Best Practice/Dead Code/DeadLocals.qll b/java/ql/src/Violations of Best Practice/Dead Code/DeadLocals.qll
index 26c5ed66a86..5afab52c37e 100644
--- a/java/ql/src/Violations of Best Practice/Dead Code/DeadLocals.qll	
+++ b/java/ql/src/Violations of Best Practice/Dead Code/DeadLocals.qll	
@@ -4,7 +4,7 @@
 
 import java
 import semmle.code.java.dataflow.SSA
-private import semmle.code.java.frameworks.Assertions
+private import semmle.code.java.controlflow.internal.Preconditions
 
 private predicate emptyDecl(LocalVariableDeclExpr decl) {
   not exists(decl.getInit()) and
@@ -22,7 +22,19 @@ predicate deadLocal(VariableUpdate upd) {
 /**
  * A dead variable update that is expected to be dead as indicated by an assertion.
  */
-predicate expectedDead(VariableUpdate upd) { assertFail(upd.getBasicBlock(), _) }
+predicate expectedDead(VariableUpdate upd) {
+  exists(BasicBlock bb, ControlFlowNode n |
+    bb = upd.getBasicBlock() and
+    bb = n.getBasicBlock()
+  |
+    methodCallUnconditionallyThrows(n.asExpr())
+    or
+    exists(AssertStmt a |
+      n.asExpr() = a.getExpr() and
+      a.getExpr().(BooleanLiteral).getBooleanValue() = false
+    )
+  )
+}
 
 /**
  * A dead update that is overwritten by a live update.
diff --git a/java/ql/src/Violations of Best Practice/Implementation Hiding/GetClassGetResource.ql b/java/ql/src/Violations of Best Practice/Implementation Hiding/GetClassGetResource.ql
index 7f52c495835..61e928b8c70 100644
--- a/java/ql/src/Violations of Best Practice/Implementation Hiding/GetClassGetResource.ql	
+++ b/java/ql/src/Violations of Best Practice/Implementation Hiding/GetClassGetResource.ql	
@@ -6,8 +6,9 @@
  * @problem.severity warning
  * @precision medium
  * @id java/unsafe-get-resource
- * @tags reliability
- *       maintainability
+ * @tags quality
+ *       reliability
+ *       correctness
  */
 
 import java
diff --git a/java/ql/src/Violations of Best Practice/Implementation Hiding/VisibleForTestingAbuse.md b/java/ql/src/Violations of Best Practice/Implementation Hiding/VisibleForTestingAbuse.md
new file mode 100644
index 00000000000..bcf10901549
--- /dev/null
+++ b/java/ql/src/Violations of Best Practice/Implementation Hiding/VisibleForTestingAbuse.md	
@@ -0,0 +1,36 @@
+## Overview
+
+Accessing class members annotated with `@VisibleForTesting` from production code goes against the intention of the annotation and may indicate programmer error.
+
+The `@VisibleForTesting` annotation serves to increase visibility of methods, fields or classes for the purposes of testing. Accessing these annotated elements in production code (not test code) abuses the intention of the annotation.
+
+## Recommendation
+
+Only access methods, fields or classes annotated with `@VisibleForTesting` from test code. If the visibility of the methods, fields or classes should generally be relaxed, use Java language access modifiers.
+
+## Example
+
+```java
+public class Annotated {
+    @VisibleForTesting static int f() { return 42; }
+}
+
+/* src/test/java/Test.java */
+int i = Annotated.f(); // COMPLIANT
+
+/* src/main/Source.java */
+int i = Annotated.f(); // NON_COMPLIANT
+```
+
+## Implementation notes
+
+This rule alerts on any implementation of the annotation `VisibleForTesting`, regardless of where it is provided from.
+
+The rule also uses the following logic to determine what an abuse of the annotation is:
+
+  1. If a public or protected member/type is annotated with `@VisibleForTesting`, it's assumed that package-private access is enough for production code. Therefore the rule alerts when a public or protected member/type annotated with `@VisibleForTesting` is used outside of its declaring package.
+  2. If a package-private member/type is annotated with `@VisibleForTesting`, it's assumed that private access is enough for production code. Therefore the rule alerts when a package-private member/type annotated with `@VisibleForTesting` is used outside its declaring class.
+
+## References
+- Javadoc: [AssertJ VisibleForTesting](https://javadoc.io/doc/org.assertj/assertj-core/latest/org.assertj.core/org/assertj/core/util/VisibleForTesting.html).
+- Javadoc: [JetBrains VisibleForTesting](https://javadoc.io/doc/org.jetbrains/annotations/22.0.0/org/jetbrains/annotations/VisibleForTesting.html).
diff --git a/java/ql/src/Violations of Best Practice/Implementation Hiding/VisibleForTestingAbuse.ql b/java/ql/src/Violations of Best Practice/Implementation Hiding/VisibleForTestingAbuse.ql
new file mode 100644
index 00000000000..c882d3f629b
--- /dev/null
+++ b/java/ql/src/Violations of Best Practice/Implementation Hiding/VisibleForTestingAbuse.ql	
@@ -0,0 +1,112 @@
+/**
+ * @id java/visible-for-testing-abuse
+ * @name Use of VisibleForTesting in production code
+ * @description Accessing methods, fields or classes annotated with `@VisibleForTesting` from
+ *              production code goes against the intention of the annotation and may indicate
+ *              programmer error.
+ * @kind problem
+ * @precision high
+ * @problem.severity warning
+ * @tags quality
+ *       maintainability
+ *       readability
+ */
+
+import java
+
+/**
+ * Holds if a `Callable` is within the same type hierarchy as `RefType`
+ * (including through lambdas, inner classes, and outer classes).
+ */
+predicate isWithinType(Callable c, RefType t) {
+  // Either the callable is in the target type, or they share a common enclosing type
+  c.getDeclaringType().getEnclosingType*() = t.getEnclosingType*()
+}
+
+/**
+ * Holds if `e` is within the same package as `t`.
+ */
+predicate isWithinPackage(Expr e, RefType t) {
+  e.getCompilationUnit().getPackage() = t.getPackage()
+}
+
+/**
+ * Holds if a callable or any of its enclosing callables is annotated with @VisibleForTesting.
+ */
+predicate isWithinVisibleForTestingContext(Callable c) {
+  c.getAnAnnotation().getType().hasName("VisibleForTesting")
+  or
+  isWithinVisibleForTestingContext(c.getEnclosingCallable())
+}
+
+/**
+ * Holds if `e` is within a test method context, including lambda expressions
+ * within test methods and nested lambdas.
+ */
+private predicate isWithinTest(Expr e) {
+  e.getEnclosingCallable() instanceof LikelyTestMethod
+  or
+  exists(Method lambda, LambdaExpr lambdaExpr |
+    lambda = lambdaExpr.asMethod() and
+    lambda.getEnclosingCallable*() instanceof LikelyTestMethod and
+    e.getEnclosingCallable() = lambda
+  )
+}
+
+from Annotatable annotated, Expr e
+where
+  annotated.getAnAnnotation().getType().hasName("VisibleForTesting") and
+  (
+    // field access
+    e =
+      any(FieldAccess v |
+        v.getField() = annotated and
+        // depending on the visibility of the field, using the annotation to abuse the visibility may/may not be occurring
+        (
+          // if its package protected report when its used outside its class because it should have been private (class only permitted)
+          v.getField().isPackageProtected() and
+          not isWithinType(v.getEnclosingCallable(), v.getField().getDeclaringType())
+          or
+          // if public or protected report when its used outside its package because package protected should have been enough (package only permitted)
+          (v.getField().isPublic() or v.getField().isProtected()) and
+          not isWithinPackage(v, v.getField().getDeclaringType())
+        )
+      )
+    or
+    // method access
+    e =
+      any(MethodCall c |
+        c.getMethod() = annotated and
+        // depending on the visibility of the method, using the annotation to abuse the visibility may/may not be occurring
+        (
+          // if its package protected report when its used outside its class because it should have been private (class only permitted)
+          c.getMethod().isPackageProtected() and
+          not isWithinType(c.getEnclosingCallable(), c.getMethod().getDeclaringType())
+          or
+          // if public or protected report when its used outside its package because package protected should have been enough (package only permitted)
+          (c.getMethod().isPublic() or c.getMethod().isProtected()) and
+          not isWithinPackage(c, c.getMethod().getDeclaringType())
+        )
+      )
+    or
+    // Class instantiation - report if used outside appropriate scope
+    e =
+      any(ClassInstanceExpr c |
+        c.getConstructedType() = annotated and
+        (
+          c.getConstructedType().isPublic() and not isWithinPackage(c, c.getConstructedType())
+          or
+          c.getConstructedType().hasNoModifier() and
+          c.getConstructedType() instanceof NestedClass and
+          not isWithinType(c.getEnclosingCallable(), c.getConstructedType())
+        )
+      )
+  ) and
+  // not in a test where use is appropriate
+  not isWithinTest(e) and
+  // not when the accessing method or any enclosing method is @VisibleForTesting (test-to-test communication)
+  not isWithinVisibleForTestingContext(e.getEnclosingCallable()) and
+  // not when used in annotation contexts
+  not e.getParent*() instanceof Annotation
+select e, "Access of $@ annotated with VisibleForTesting found in production code.", annotated,
+  "element"
diff --git a/java/ql/src/Violations of Best Practice/Magic Constants/MagicConstants.qll b/java/ql/src/Violations of Best Practice/Magic Constants/MagicConstants.qll
index dc5b4eada8d..c94a4fb58bf 100644
--- a/java/ql/src/Violations of Best Practice/Magic Constants/MagicConstants.qll	
+++ b/java/ql/src/Violations of Best Practice/Magic Constants/MagicConstants.qll	
@@ -105,7 +105,7 @@ private predicate valueOccurrenceCount(string value, int n, string context) {
   n > 20
 }
 
-private predicate occurenceCount(Literal lit, string value, int n, string context) {
+private predicate occurrenceCount(Literal lit, string value, int n, string context) {
   valueOccurrenceCount(value, n, context) and
   value = lit.getValue() and
   nonTrivialValue(_, lit, context)
@@ -119,7 +119,7 @@ private predicate check(Literal lit, string value, int n, string context, Compil
   // Check that the literal is nontrivial
   not trivial(lit) and
   // Check that it is repeated a number of times
-  occurenceCount(lit, value, n, context) and
+  occurrenceCount(lit, value, n, context) and
   n > 20 and
   f = lit.getCompilationUnit()
 }
diff --git a/java/ql/src/Violations of Best Practice/Naming Conventions/ConfusingOverloading.ql b/java/ql/src/Violations of Best Practice/Naming Conventions/ConfusingOverloading.ql
index ca002fc654a..0a1e8785b4e 100644
--- a/java/ql/src/Violations of Best Practice/Naming Conventions/ConfusingOverloading.ql	
+++ b/java/ql/src/Violations of Best Practice/Naming Conventions/ConfusingOverloading.ql	
@@ -48,7 +48,7 @@ private predicate overloadedMethodsMostSpecific(Method n, Method m) {
 private predicate whitelist(string name) { name = "visit" }
 
 /**
- * Method `m` has name `name`, number of parameters `numParams`
+ * Method `m` has name `name`, number of parameters `numParam`
  * and is declared in `t` or inherited from a supertype of `t`.
  */
 pragma[nomagic]
@@ -66,8 +66,8 @@ private predicate candidateMethod(RefType t, Method m, string name, int numParam
 predicate paramTypePair(Type t1, Type t2) {
   exists(Method n, Method m, int i |
     overloadedMethodsMostSpecific(n, m) and
-    t1 = n.getParameterType(i) and
-    t2 = m.getParameterType(i)
+    t1 = n.getParameterType(pragma[only_bind_into](i)) and
+    t2 = m.getParameterType(pragma[only_bind_into](i))
   )
 }
 
@@ -93,6 +93,7 @@ predicate potentiallyConfusingTypesRefTypes(RefType t1, RefType t2) {
 }
 
 // then check hasSubtypeOrInstantiation
+pragma[nomagic]
 predicate potentiallyConfusingTypes(Type t1, Type t2) {
   potentiallyConfusingTypesSimple(t1, t2)
   or
diff --git a/java/ql/src/Violations of Best Practice/Naming Conventions/FieldMasksSuperField.ql b/java/ql/src/Violations of Best Practice/Naming Conventions/FieldMasksSuperField.ql
index faf64b0ae5e..e45ba34b5e5 100644
--- a/java/ql/src/Violations of Best Practice/Naming Conventions/FieldMasksSuperField.ql	
+++ b/java/ql/src/Violations of Best Practice/Naming Conventions/FieldMasksSuperField.ql	
@@ -7,8 +7,10 @@
  * @problem.severity warning
  * @precision medium
  * @id java/field-masks-super-field
- * @tags maintainability
+ * @tags quality
+ *       maintainability
  *       readability
+ *       correctness
  */
 
 import java
diff --git a/java/ql/src/Violations of Best Practice/Testing/ExcessivePublicMethodMocking.md b/java/ql/src/Violations of Best Practice/Testing/ExcessivePublicMethodMocking.md
new file mode 100644
index 00000000000..d932df25116
--- /dev/null
+++ b/java/ql/src/Violations of Best Practice/Testing/ExcessivePublicMethodMocking.md	
@@ -0,0 +1,52 @@
+## Overview
+
+Mocking methods of a class is necessary for unit tests to run without overhead caused by expensive I/O operations. However, when a unit test ends up mocking all public methods of a class, it may indicate that the test is too complicated, possibly because it is trying to test multiple things at once. Such extensive mocking is likely a signal that the scope of the unit test is reaching beyond a single unit of functionality.
+
+## Recommendation
+
+It is best to contain the scope of a single unit test to a single unit of functionality. For example, a unit test may aim to test a series of data-transforming functions that depend on an ORM class. Even though the functions may be semantically related with one another, it is better to create a unit test for each function.
+
+## Example
+
+The following example mocks all methods of an ORM class named `EmployeeRecord`, and tests four functions against them. Since the scope of the unit test harbors all four of them, all of the methods provided by the class are mocked.
+
+```java
+public class EmployeeRecord {
+  public int add(Employee employee) { ... }
+
+  public Employee get(String name) { ... }
+
+  public int update(Employee employee, String newName) { ... }
+
+  public int delete(Employee employee) { ... }
+}
+
+public class TestORM {
+  @Test
+  public void nonCompliant() {
+    Employee sampleEmployee = new Employee("John Doe");
+    EmployeeRecord employeeRecordMock = mock(EmployeeRecord.class);  // NON_COMPLIANT: Mocked class has all of its public methods used in the test
+    when(employeeRecordMock.add(sampleEmployee)).thenReturn(0);                   // Mocked EmployeeRecord.add
+    when(employeeRecordMock.get("John Doe")).thenReturn(sampleEmployee);          // Mocked EmployeeRecord.get
+    when(employeeRecordMock.update(sampleEmployee, "Jane Doe")).thenReturn(0);    // Mocked EmployeeRecord.update
+    when(employeeRecordMock.delete(sampleEmployee)).thenReturn(0);                // Mocked EmployeeRecord.delete
+  }
+
+  @Test
+  public void compliant() {
+    Employee sampleEmployee = new Employee("John Doe");
+    EmployeeRecord employeeRecordMock = mock(EmployeeRecord.class); // COMPLIANT: Only some of the public methods belonging to the mocked object are used
+    when(employeeRecordMock.add(sampleEmployee)).thenReturn(0);                // Mocked EmployeeRecord.add
+    when(employeeRecordMock.update(sampleEmployee, "Jane Doe")).thenReturn(0); // Mocked EmployeeRecord.update
+  }
+
+}
+```
+
+## Implementation Notes
+
+JUnit provides two different ways of mocking a method call: `when(mockedObject.methodToMock(...)).thenReturn(...)` and `doReturn(...).when(mockedObject).methodToMock(...)`. Both forms are taken into account by the query.
+
+## References
+
+- Baeldung: [Best Practices for Unit Testing in Java](https://www.baeldung.com/java-unit-testing-best-practices).
diff --git a/java/ql/src/Violations of Best Practice/Testing/ExcessivePublicMethodMocking.ql b/java/ql/src/Violations of Best Practice/Testing/ExcessivePublicMethodMocking.ql
new file mode 100644
index 00000000000..a566d6162d2
--- /dev/null
+++ b/java/ql/src/Violations of Best Practice/Testing/ExcessivePublicMethodMocking.ql	
@@ -0,0 +1,80 @@
+/**
+ * @id java/excessive-public-method-mocking
+ * @previous-id java/mocking-all-non-private-methods-means-unit-test-is-too-big
+ * @name Mocking all public methods of a class may indicate the unit test is testing too much
+ * @description Mocking all public methods provided by a class might indicate the unit test
+ *              aims to test too many things.
+ * @kind problem
+ * @precision high
+ * @problem.severity recommendation
+ * @tags quality
+ *       maintainability
+ *       readability
+ */
+
+import java
+
+/**
+ * A call to Mockito's `mock` method.
+ */
+class MockitoMockCall extends MethodCall {
+  MockitoMockCall() { this.getMethod().hasQualifiedName("org.mockito", "Mockito", "mock") }
+
+  /**
+   * Gets the type that this call intends to mock. For example:
+   * ```java
+   * EmployeeRecord employeeRecordMock = mock(EmployeeRecord.class);
+   * ```
+   * This predicate gets the class `EmployeeRecord` in the above example.
+   */
+  Type getMockedType() { result = this.getAnArgument().(TypeLiteral).getReferencedType() }
+}
+
+/**
+ * A method call that mocks a target method in a JUnit test. For example:
+ * ```java
+ * EmployeeRecord employeeRecordMock = mock(EmployeeRecord.class);
+ * when(employeeRecordMock.add(sampleEmployee)).thenReturn(0); // Mocked EmployeeRecord.add
+ * doReturn(0).when(employeeRecordMock).add(sampleEmployee);   // Mocked EmployeeRecord.add
+ * ```
+ * This class captures the call to `add` which mocks the equivalent method of the class `EmployeeRecord`.
+ */
+class MockitoMockingMethodCall extends MethodCall {
+  MockitoMockCall mockCall;
+
+  MockitoMockingMethodCall() {
+    /* 1. The qualifier originates from the mock call. */
+    this.getQualifier().getControlFlowNode().getAPredecessor+() = mockCall.getControlFlowNode() and
+    /* 2. The mocked method can be found in the class being mocked with the mock call. */
+    mockCall.getMockedType().(ClassOrInterface).getAMethod() = this.getMethod()
+  }
+
+  /**
+   * Gets the call to Mockito's `mock` from which the qualifier, the mocked object, originates.
+   */
+  MockitoMockCall getMockitoMockCall() { result = mockCall }
+}
+
+/*
+ * The following from-where-select embodies this pseudocode:
+ * - Find a JUnit4TestMethod which:
+ *   - for a class that it mocks with a call to `mock`,
+ *     - for all methods that the class has, there is a method that this test method mocks.
+ */
+
+from JUnit4TestMethod testMethod, ClassOrInterface mockedClassOrInterface
+where
+  exists(MockitoMockCall mockCall |
+    mockCall.getEnclosingCallable() = testMethod and
+    mockedClassOrInterface = mockCall.getMockedType() and
+    // Only flag classes with multiple public methods (2 or more)
+    strictcount(Method m | m = mockedClassOrInterface.getAMethod() and m.isPublic()) > 1 and
+    forex(Method method | method = mockedClassOrInterface.getAMethod() and method.isPublic() |
+      exists(MockitoMockingMethodCall mockedMethod |
+        mockedMethod.getMockitoMockCall() = mockCall and
+        mockedMethod.getMethod() = method
+      )
+    )
+  )
+select testMethod, "This test method mocks all public methods of a $@.", mockedClassOrInterface,
+  "class or an interface"
diff --git a/java/ql/src/Violations of Best Practice/Undesirable Calls/CallsToRunFinalizersOnExit.ql b/java/ql/src/Violations of Best Practice/Undesirable Calls/CallsToRunFinalizersOnExit.ql
index c2ffe45b520..568be1805e6 100644
--- a/java/ql/src/Violations of Best Practice/Undesirable Calls/CallsToRunFinalizersOnExit.ql	
+++ b/java/ql/src/Violations of Best Practice/Undesirable Calls/CallsToRunFinalizersOnExit.ql	
@@ -7,8 +7,11 @@
  * @problem.severity error
  * @precision medium
  * @id java/run-finalizers-on-exit
- * @tags reliability
- *       maintainability
+ * @previous-id java/do-not-use-finalizers
+ * @tags quality
+ *       reliability
+ *       correctness
+ *       performance
  */
 
 import java
diff --git a/java/ql/src/Violations of Best Practice/Undesirable Calls/CallsToSystemExit.java b/java/ql/src/Violations of Best Practice/Undesirable Calls/CallsToSystemExit.java
index da7277aa25c..50e0fb1cbda 100644
--- a/java/ql/src/Violations of Best Practice/Undesirable Calls/CallsToSystemExit.java	
+++ b/java/ql/src/Violations of Best Practice/Undesirable Calls/CallsToSystemExit.java	
@@ -4,7 +4,7 @@ class FileOutput {
         try {
             output.write(s.getBytes());
         } catch (IOException e) {
-            System.exit(1);
+            System.exit(1); // BAD: Should handle or propagate error instead of exiting
         }
         return true;
     }
@@ -16,9 +16,30 @@ class Action {
         // ...
         // Perform tasks ...
         // ...
-        System.exit(0);
+        System.exit(0); // BAD: Should return status or throw exception
     }
     public static void main(String[] args) {
-        new Action(args).run();
+        new Action().run();
     }
-}
\ No newline at end of file
+}
+
+// Good example: Proper error handling
+class BetterAction {
+    public int run() throws Exception {
+        // ...
+        // Perform tasks ...
+        // ...
+        return 0; // Return status instead of calling System.exit
+    }
+    
+    public static void main(String[] args) {
+        try {
+            BetterAction action = new BetterAction();
+            int exitCode = action.run();
+            System.exit(exitCode); // GOOD: Exit from main method
+        } catch (Exception e) {
+            System.err.println("Error: " + e.getMessage());
+            System.exit(1); // GOOD: Exit from main method on error
+        }
+    }
+}
diff --git a/java/ql/src/Violations of Best Practice/Undesirable Calls/CallsToSystemExit.qhelp b/java/ql/src/Violations of Best Practice/Undesirable Calls/CallsToSystemExit.qhelp
index e4d4fa7a7f0..6992a734607 100644
--- a/java/ql/src/Violations of Best Practice/Undesirable Calls/CallsToSystemExit.qhelp	
+++ b/java/ql/src/Violations of Best Practice/Undesirable Calls/CallsToSystemExit.qhelp	
@@ -13,17 +13,20 @@ program state from being written to disk consistently.</p>
 
 <p>It is sometimes considered acceptable to call <code>System.exit</code>
 from a program's <code>main</code> method in order to indicate the overall exit status
-of the program. Such calls are an exception to this rule.</p>
+of the program. The <code>main</code> method should be the primary place
+where exit conditions are handled, as it represents the natural termination point
+of the application. Such calls are an exception to this rule.</p>
 
 </overview>
 <recommendation>
 
-<p>It is usually preferable to use a different mechanism for reporting
-failure conditions. Consider returning a special value (perhaps
-<code>null</code>) that users of the current method check for and
-recover from appropriately. Alternatively, throw a suitable exception, which 
-unwinds the stack and allows properly written code to clean up after itself,
-while leaving other threads undisturbed.</p>
+<p>Instead of calling <code>System.exit</code> from non-main methods, prefer to propagate
+errors upward to the <code>main</code> method where they can be handled appropriately.
+Consider returning a special value (perhaps <code>null</code>) that users of the current 
+method check for and recover from appropriately. Alternatively, throw a suitable exception, 
+which unwinds the stack and allows properly written code to clean up after itself,
+while leaving other threads undisturbed. The <code>main</code> method can then catch
+these exceptions and decide whether to exit the program and with what exit code.</p>
 
 </recommendation>
 <example>
@@ -38,12 +41,14 @@ upwards and be handled by a method that knows how to recover.</p>
 <p>Problem 2 is more subtle. In this example, there is just one entry point to
 the program (the <code>main</code> method), which constructs an
 <code>Action</code> and performs it. <code>Action.run</code> calls
-<code>System.exit</code> to indicate successful completion. Consider,
-however, how this code might be integrated in an application server that
-constructs <code>Action</code> instances and calls
+<code>System.exit</code> to indicate successful completion. Instead, the 
+<code>run</code> method should return a status code or throw an exception
+on failure, allowing the <code>main</code> method to decide whether to exit
+and with what exit code. Consider how this code might be integrated in an 
+application server that constructs <code>Action</code> instances and calls
 <code>run</code> on them without going through <code>main</code>.
 The fact that <code>run</code> terminates the JVM instead of returning its
-exit code as an integer makes that use-case impossible.</p>
+exit code makes that use-case impossible.</p>
   
 <sample src="CallsToSystemExit.java" />
 
diff --git a/java/ql/src/Violations of Best Practice/Undesirable Calls/CallsToSystemExit.ql b/java/ql/src/Violations of Best Practice/Undesirable Calls/CallsToSystemExit.ql
index 93d7911694c..52f82218c33 100644
--- a/java/ql/src/Violations of Best Practice/Undesirable Calls/CallsToSystemExit.ql	
+++ b/java/ql/src/Violations of Best Practice/Undesirable Calls/CallsToSystemExit.ql	
@@ -4,26 +4,80 @@
  *              reuse and prevent important cleanup steps from running.
  * @kind problem
  * @problem.severity warning
- * @precision low
+ * @precision medium
  * @id java/jvm-exit
- * @tags reliability
- *       maintainability
+ * @previous-id java/jvm-exit-prevents-cleanup-and-reuse
+ * @tags quality
+ *       reliability
+ *       correctness
  *       external/cwe/cwe-382
  */
 
 import java
 
-from Method m, MethodCall sysexitCall, Method sysexit, Class system
-where
-  sysexitCall = m.getACallSite(sysexit) and
-  (sysexit.hasName("exit") or sysexit.hasName("halt")) and
-  sysexit.getDeclaringType() = system and
-  (
-    system.hasQualifiedName("java.lang", "System") or
-    system.hasQualifiedName("java.lang", "Runtime")
-  ) and
-  m.fromSource() and
-  not m instanceof MainMethod
-select sysexitCall,
-  "Avoid calls to " + sysexit.getDeclaringType().getName() + "." + sysexit.getName() +
-    "() as this makes code harder to reuse."
+/**
+ * A `Method` which, when called, causes the JVM to exit or halt.
+ *
+ * Explicitly includes these methods from the java standard library:
+ *   - `java.lang.System.exit`
+ *   - `java.lang.Runtime.halt`
+ *   - `java.lang.Runtime.exit`
+ */
+class ExitOrHaltMethod extends Method {
+  ExitOrHaltMethod() {
+    exists(Class system | this.getDeclaringType() = system |
+      this.hasName("exit") and
+      system.hasQualifiedName("java.lang", ["System", "Runtime"])
+      or
+      this.hasName("halt") and
+      system.hasQualifiedName("java.lang", "Runtime")
+    )
+  }
+}
+
+/** A `MethodCall` to an `ExitOrHaltMethod`, which causes the JVM to exit abruptly. */
+class ExitOrHaltMethodCall extends MethodCall {
+  ExitOrHaltMethodCall() {
+    exists(ExitOrHaltMethod exitMethod | this.getMethod() = exitMethod |
+      exists(SourceMethodNotMainOrTest srcMethod | this = srcMethod.getACallSite(exitMethod))
+    )
+  }
+}
+
+/**
+ * An intentional `MethodCall` to a system or runtime "exit" method, such as for
+ * functions which exist for the purpose of exiting the program. Assumes that an exit method
+ * call within a method is intentional if the exit code is passed from a parameter of the
+ * enclosing method.
+ */
+class IntentionalExitMethodCall extends ExitOrHaltMethodCall {
+  IntentionalExitMethodCall() {
+    this.getMethod().hasName("exit") and
+    this.getAnArgument() = this.getEnclosingCallable().getAParameter().getAnAccess()
+  }
+}
+
+/**
+ * A `Method` that is defined in source code and is not a `MainMethod` or a `LikelyTestMethod`.
+ */
+class SourceMethodNotMainOrTest extends Method {
+  SourceMethodNotMainOrTest() {
+    this.fromSource() and
+    not this instanceof MainMethod and
+    not (
+      this.getEnclosingCallable*() instanceof LikelyTestMethod
+      or
+      this.getDeclaringType()
+          .getEnclosingType*()
+          .(LocalClassOrInterface)
+          .getLocalTypeDeclStmt()
+          .getEnclosingCallable() instanceof LikelyTestMethod
+    )
+  }
+}
+
+from ExitOrHaltMethodCall mc
+where not mc instanceof IntentionalExitMethodCall
+select mc,
+  "Avoid calls to " + mc.getMethod().getDeclaringType().getName() + "." + mc.getMethod().getName() +
+    "() as this prevents runtime cleanup and makes code harder to reuse."
diff --git a/java/ql/src/Violations of Best Practice/Undesirable Calls/GarbageCollection.ql b/java/ql/src/Violations of Best Practice/Undesirable Calls/GarbageCollection.ql
index 1067bdcb6dc..620177cc58c 100644
--- a/java/ql/src/Violations of Best Practice/Undesirable Calls/GarbageCollection.ql	
+++ b/java/ql/src/Violations of Best Practice/Undesirable Calls/GarbageCollection.ql	
@@ -6,8 +6,10 @@
  * @problem.severity recommendation
  * @precision low
  * @id java/garbage-collection
- * @tags reliability
- *       maintainability
+ * @previous-id java/do-not-use-finalizers
+ * @tags quality
+ *       reliability
+ *       correctness
  */
 
 import java
diff --git a/java/ql/src/Violations of Best Practice/Undesirable Calls/NextFromIterator.ql b/java/ql/src/Violations of Best Practice/Undesirable Calls/NextFromIterator.ql
index ebdf5576198..31c0d0821e2 100644
--- a/java/ql/src/Violations of Best Practice/Undesirable Calls/NextFromIterator.ql	
+++ b/java/ql/src/Violations of Best Practice/Undesirable Calls/NextFromIterator.ql	
@@ -6,7 +6,8 @@
  * @problem.severity warning
  * @precision medium
  * @id java/iterator-hasnext-calls-next
- * @tags reliability
+ * @tags quality
+ *       reliability
  *       correctness
  */
 
diff --git a/java/ql/src/change-notes/2025-10-22-adjust-query-severity.md b/java/ql/src/change-notes/2025-10-22-adjust-query-severity.md
new file mode 100644
index 00000000000..61cc9402a78
--- /dev/null
+++ b/java/ql/src/change-notes/2025-10-22-adjust-query-severity.md
@@ -0,0 +1,5 @@
+---
+category: queryMetadata
+---
+* Reduced the `security-severity` score of the `java/overly-large-range` query from 5.0 to 4.0 to better reflect its impact.
+* Reduced the `security-severity` score of the `java/insecure-cookie` query from 5.0 to 4.0 to better reflect its impact.
\ No newline at end of file
diff --git a/java/ql/src/change-notes/2025-11-13-maven-default-java-17 b/java/ql/src/change-notes/2025-11-13-maven-default-java-17
new file mode 100644
index 00000000000..26425b103ab
--- /dev/null
+++ b/java/ql/src/change-notes/2025-11-13-maven-default-java-17
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* Java analysis now selects the Java version to use informed by Maven POM files across all project modules. It also tries to use Java 17 or higher for all Maven projects if possible, for improved build compatibility.
\ No newline at end of file
diff --git a/java/ql/src/change-notes/released/1.6.3.md b/java/ql/src/change-notes/released/1.6.3.md
new file mode 100644
index 00000000000..a000ecf7025
--- /dev/null
+++ b/java/ql/src/change-notes/released/1.6.3.md
@@ -0,0 +1,3 @@
+## 1.6.3
+
+No user-facing changes.
diff --git a/java/ql/src/change-notes/released/1.7.0.md b/java/ql/src/change-notes/released/1.7.0.md
new file mode 100644
index 00000000000..f0485614fc3
--- /dev/null
+++ b/java/ql/src/change-notes/released/1.7.0.md
@@ -0,0 +1,15 @@
+## 1.7.0
+
+### New Queries
+
+* The query `java/insecure-spring-actuator-config` has been promoted from experimental to the main query pack as `java/spring-boot-exposed-actuators-config`. Its results will now appear by default. This query detects exposure of Spring Boot actuators through configuration files. It was originally submitted as an experimental query [by @luchua-bc](https://github.com/github/codeql/pull/5384).
+
+### Query Metadata Changes
+
+* The tag `maintainability` has been removed from `java/run-finalizers-on-exit` and the tags `quality`, `correctness`, and `performance` have been added.
+* The tag `maintainability` has been removed from `java/garbage-collection` and the tags `quality` and `correctness` have been added.
+
+### Minor Analysis Improvements
+
+* Fixed a bug that was causing false negatives in rare cases in the query `java/dereferenced-value-may-be-null`.
+* Removed the `java/empty-statement` query that was subsumed by the `java/empty-block` query.
diff --git a/java/ql/src/change-notes/released/1.8.0.md b/java/ql/src/change-notes/released/1.8.0.md
new file mode 100644
index 00000000000..f8da72566e2
--- /dev/null
+++ b/java/ql/src/change-notes/released/1.8.0.md
@@ -0,0 +1,9 @@
+## 1.8.0
+
+### Major Analysis Improvements
+
+* The implementation of `java/dereferenced-value-may-be-null` has been completely replaced with a new general control-flow reachability library. This improves precision by reducing false positives. However, since the entire calculation has been reworked, there can be small corner cases where precision regressions might occur and new false positives may occur, but these cases should be rare.
+
+### Bug Fixes
+
+* The message for `java/diagnostic/database-quality` has been updated to include detailed database health metrics. Additionally, the threshold for reporting database health issues has been lowered from 95% to 85% (if any metric falls below this percentage). These changes are visible on the tool status page.
diff --git a/java/ql/src/change-notes/released/1.8.1.md b/java/ql/src/change-notes/released/1.8.1.md
new file mode 100644
index 00000000000..0b1a7cdad10
--- /dev/null
+++ b/java/ql/src/change-notes/released/1.8.1.md
@@ -0,0 +1,3 @@
+## 1.8.1
+
+No user-facing changes.
diff --git a/java/ql/src/change-notes/released/1.8.2.md b/java/ql/src/change-notes/released/1.8.2.md
new file mode 100644
index 00000000000..12e641fd720
--- /dev/null
+++ b/java/ql/src/change-notes/released/1.8.2.md
@@ -0,0 +1,3 @@
+## 1.8.2
+
+No user-facing changes.
diff --git a/java/ql/src/change-notes/released/1.9.0.md b/java/ql/src/change-notes/released/1.9.0.md
new file mode 100644
index 00000000000..82977276fe2
--- /dev/null
+++ b/java/ql/src/change-notes/released/1.9.0.md
@@ -0,0 +1,12 @@
+## 1.9.0
+
+### New Queries
+
+* The `java/sensitive-cookie-not-httponly` query has been promoted from experimental to the main query pack.
+* Added a new query, `java/escaping`, to detect values escaping from classes marked as `@ThreadSafe`.
+* Added a new query, `java/not-threadsafe`, to detect data races in classes marked as `@ThreadSafe`.
+* Added a new query, `java/safe-publication`, to detect unsafe publication in classes marked as `@ThreadSafe`.
+
+### Minor Analysis Improvements
+
+* Calls to `String.matches` are now treated as sanitizers for the `java/ssrf` query.
diff --git a/java/ql/src/codeql-pack.release.yml b/java/ql/src/codeql-pack.release.yml
index 5f5beb68311..df17dc3a366 100644
--- a/java/ql/src/codeql-pack.release.yml
+++ b/java/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.6.2
+lastReleaseVersion: 1.9.0
diff --git a/java/ql/src/experimental/Security/CWE/CWE-016/InsecureSpringActuatorConfig.qhelp b/java/ql/src/experimental/Security/CWE/CWE-016/InsecureSpringActuatorConfig.qhelp
deleted file mode 100644
index e201156728a..00000000000
--- a/java/ql/src/experimental/Security/CWE/CWE-016/InsecureSpringActuatorConfig.qhelp
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE qhelp PUBLIC "-//Semmle//qhelp//EN" "qhelp.dtd">
-<qhelp>
-  <overview>
-    <p>Spring Boot is a popular framework that facilitates the development of stand-alone applications
-and micro services. Spring Boot Actuator helps to expose production-ready support features against 
-Spring Boot applications.</p>
-
-    <p>Endpoints of Spring Boot Actuator allow to monitor and interact with a Spring Boot application. 
-Exposing unprotected actuator endpoints through configuration files can lead to information disclosure 
-or even remote code execution vulnerability.</p>
-
-    <p>Rather than programmatically permitting endpoint requests or enforcing access control, frequently
-developers simply leave management endpoints publicly accessible in the application configuration file 
-<code>application.properties</code> without enforcing access control through Spring Security.</p>
-  </overview>
-
-  <recommendation>
-    <p>Declare the Spring Boot Starter Security module in XML configuration or programmatically enforce 
-security checks on management endpoints using Spring Security. Otherwise accessing management endpoints 
-on a different HTTP port other than the port that the web application is listening on also helps to 
-improve the security.</p>
-  </recommendation>
-
-  <example>
-    <p>The following examples show both 'BAD' and 'GOOD' configurations. In the 'BAD' configuration, 
-no security module is declared and sensitive management endpoints are exposed. In the 'GOOD' configuration, 
-security is enforced and only endpoints requiring exposure are exposed.</p>
-    <sample src="pom_good.xml" />
-    <sample src="pom_bad.xml" />
-    <sample src="application.properties" />
-  </example>
-
-  <references>
-    <li>
-      Spring Boot documentation:
-      <a href="https://docs.spring.io/spring-boot/docs/current/reference/html/production-ready-features.html">Spring Boot Actuator: Production-ready Features</a>
-    </li>
-    <li>
-      VERACODE Blog:
-      <a href="https://www.veracode.com/blog/research/exploiting-spring-boot-actuators">Exploiting Spring Boot Actuators</a>
-    </li>
-    <li>
-      HackerOne Report:
-      <a href="https://hackerone.com/reports/862589">Spring Actuator endpoints publicly available, leading to account takeover</a>
-    </li>
-  </references>
-</qhelp>
diff --git a/java/ql/src/experimental/Security/CWE/CWE-016/InsecureSpringActuatorConfig.ql b/java/ql/src/experimental/Security/CWE/CWE-016/InsecureSpringActuatorConfig.ql
deleted file mode 100644
index b21aa82e8ba..00000000000
--- a/java/ql/src/experimental/Security/CWE/CWE-016/InsecureSpringActuatorConfig.ql
+++ /dev/null
@@ -1,121 +0,0 @@
-/**
- * @name Insecure Spring Boot Actuator Configuration
- * @description Exposed Spring Boot Actuator through configuration files without declarative or procedural
- *              security enforcement leads to information leak or even remote code execution.
- * @kind problem
- * @problem.severity error
- * @precision high
- * @id java/insecure-spring-actuator-config
- * @tags security
- *       experimental
- *       external/cwe/cwe-016
- */
-
-/*
- * Note this query requires properties files to be indexed before it can produce results.
- * If creating your own database with the CodeQL CLI, you should run
- * `codeql database index-files --language=properties ...`
- * If using lgtm.com, you should add `properties_files: true` to the index block of your
- * lgtm.yml file (see https://lgtm.com/help/lgtm/java-extraction)
- */
-
-import java
-import semmle.code.configfiles.ConfigFiles
-import semmle.code.xml.MavenPom
-
-/** The parent node of the `org.springframework.boot` group. */
-class SpringBootParent extends Parent {
-  SpringBootParent() { this.getGroup().getValue() = "org.springframework.boot" }
-}
-
-/** Class of Spring Boot dependencies. */
-class SpringBootPom extends Pom {
-  SpringBootPom() { this.getParentElement() instanceof SpringBootParent }
-
-  /** Holds if the Spring Boot Actuator module `spring-boot-starter-actuator` is used in the project. */
-  predicate isSpringBootActuatorUsed() {
-    this.getADependency().getArtifact().getValue() = "spring-boot-starter-actuator"
-  }
-
-  /**
-   * Holds if the Spring Boot Security module is used in the project, which brings in other security
-   * related libraries.
-   */
-  predicate isSpringBootSecurityUsed() {
-    this.getADependency().getArtifact().getValue() = "spring-boot-starter-security"
-  }
-}
-
-/** The properties file `application.properties`. */
-class ApplicationProperties extends ConfigPair {
-  ApplicationProperties() { this.getFile().getBaseName() = "application.properties" }
-}
-
-/** The configuration property `management.security.enabled`. */
-class ManagementSecurityConfig extends ApplicationProperties {
-  ManagementSecurityConfig() { this.getNameElement().getName() = "management.security.enabled" }
-
-  /** Gets the whitespace-trimmed value of this property. */
-  string getValue() { result = this.getValueElement().getValue().trim() }
-
-  /** Holds if `management.security.enabled` is set to `false`. */
-  predicate hasSecurityDisabled() { this.getValue() = "false" }
-
-  /** Holds if `management.security.enabled` is set to `true`. */
-  predicate hasSecurityEnabled() { this.getValue() = "true" }
-}
-
-/** The configuration property `management.endpoints.web.exposure.include`. */
-class ManagementEndPointInclude extends ApplicationProperties {
-  ManagementEndPointInclude() {
-    this.getNameElement().getName() = "management.endpoints.web.exposure.include"
-  }
-
-  /** Gets the whitespace-trimmed value of this property. */
-  string getValue() { result = this.getValueElement().getValue().trim() }
-}
-
-/**
- * Holds if `ApplicationProperties` ap of a repository managed by `SpringBootPom` pom
- * has a vulnerable configuration of Spring Boot Actuator management endpoints.
- */
-predicate hasConfidentialEndPointExposed(SpringBootPom pom, ApplicationProperties ap) {
-  pom.isSpringBootActuatorUsed() and
-  not pom.isSpringBootSecurityUsed() and
-  ap.getFile()
-      .getParentContainer()
-      .getAbsolutePath()
-      .matches(pom.getFile().getParentContainer().getAbsolutePath() + "%") and // in the same sub-directory
-  exists(string springBootVersion | springBootVersion = pom.getParentElement().getVersionString() |
-    springBootVersion.regexpMatch("1\\.[0-4].*") and // version 1.0, 1.1, ..., 1.4
-    not exists(ManagementSecurityConfig me |
-      me.hasSecurityEnabled() and me.getFile() = ap.getFile()
-    )
-    or
-    springBootVersion.matches("1.5%") and // version 1.5
-    exists(ManagementSecurityConfig me | me.hasSecurityDisabled() and me.getFile() = ap.getFile())
-    or
-    springBootVersion.matches("2.%") and //version 2.x
-    exists(ManagementEndPointInclude mi |
-      mi.getFile() = ap.getFile() and
-      (
-        mi.getValue() = "*" // all endpoints are enabled
-        or
-        mi.getValue()
-            .matches([
-                "%dump%", "%trace%", "%logfile%", "%shutdown%", "%startup%", "%mappings%", "%env%",
-                "%beans%", "%sessions%"
-              ]) // confidential endpoints to check although all endpoints apart from '/health' and '/info' are considered sensitive by Spring
-      )
-    )
-  )
-}
-
-deprecated query predicate problems(Dependency d, string message) {
-  exists(SpringBootPom pom |
-    hasConfidentialEndPointExposed(pom, _) and
-    d = pom.getADependency() and
-    d.getArtifact().getValue() = "spring-boot-starter-actuator"
-  ) and
-  message = "Insecure configuration of Spring Boot Actuator exposes sensitive endpoints."
-}
diff --git a/java/ql/src/experimental/Security/CWE/CWE-016/application.properties b/java/ql/src/experimental/Security/CWE/CWE-016/application.properties
deleted file mode 100644
index 4f5defdd948..00000000000
--- a/java/ql/src/experimental/Security/CWE/CWE-016/application.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-#management.endpoints.web.base-path=/admin
-
-
-#### BAD: All management endpoints are accessible #### 
-# vulnerable configuration (spring boot 1.0 - 1.4): exposes actuators by default
-
-# vulnerable configuration (spring boot 1.5+): requires value false to expose sensitive actuators
-management.security.enabled=false
-
-# vulnerable configuration (spring boot 2+): exposes health and info only by default, here overridden to expose everything
-management.endpoints.web.exposure.include=*
-
-
-#### GOOD: All management endpoints have access control #### 
-# safe configuration (spring boot 1.0 - 1.4): exposes actuators by default
-management.security.enabled=true
-
-# safe configuration (spring boot 1.5+): requires value false to expose sensitive actuators
-management.security.enabled=true
-
-# safe configuration (spring boot 2+): exposes health and info only by default, here overridden to expose one additional endpoint which we assume is intentional and safe.
-management.endpoints.web.exposure.include=beans,info,health
diff --git a/java/ql/src/experimental/quantum/Analysis/ArtifactReuse.qll b/java/ql/src/experimental/quantum/Analysis/ArtifactReuse.qll
deleted file mode 100644
index 88598e61589..00000000000
--- a/java/ql/src/experimental/quantum/Analysis/ArtifactReuse.qll
+++ /dev/null
@@ -1,70 +0,0 @@
-import java
-import semmle.code.java.dataflow.DataFlow
-import experimental.quantum.Language
-
-/**
- * Flow from any function that appears to return a value
- * to an artifact node.
- * NOTE: TODO: need to handle call by refernece for now. Need to re-evaluate (see notes below)
- * Such functions may be 'wrappers' for some derived value.
- */
-private module WrapperConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) {
-    exists(Call c |
-      c = source.asExpr()
-      // not handling references yet, I think we want to flat say references are only ok
-      // if I know the source, otherwise, it has to be through an additional flow step, which
-      // we filter as a source, i.e., references are only allowed as sources only,
-      // no inferrece? Not sure if that would work
-      //or
-      //   source.(DataFlow::PostUpdateNode).getPreUpdateNode().asExpr() = c.getAnArgument()
-    ) and
-    // Filter out sources that are known additional flow steps, as these are likely not the
-    // kind of wrapper source we are looking for.
-    not exists(AdditionalFlowInputStep s | s.getOutput() = source)
-  }
-
-  // Flow through additional flow steps
-  predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
-    node1.(AdditionalFlowInputStep).getOutput() = node2
-  }
-
-  predicate isSink(DataFlow::Node sink) { sink.asExpr() = any(Crypto::ArtifactNode i).asElement() }
-}
-
-module WrapperFlow = DataFlow::Global<WrapperConfig>;
-
-/**
- * Using a set approach to determine if reuse of an artifact exists.
- * This predicate produces a set of 'wrappers' that flow to the artifact node.
- * This set can be compared with the set to another artifact node to determine if they are the same.
- */
-private DataFlow::Node getWrapperSet(Crypto::NonceArtifactNode a) {
-  WrapperFlow::flow(result, DataFlow::exprNode(a.asElement()))
-  or
-  result.asExpr() = a.getSourceElement()
-}
-
-/**
- * Two different artifact nodes are considered reuse if any of the following conditions are met:
- * 1. The source for artifact `a` and artifact `b` are the same and the source is a literal.
- * 2. The source for artifact `a` and artifact `b` are not the same and the source is a literal of the same value.
- * 3. For all 'wrappers' that return the source of artifact `a`, and that wrapper also exists for artifact `b`.
- * 4. For all 'wrappers' that return the source of artifact `b`, and that wrapper also exists for artifact `a`.
- */
-predicate isArtifactReuse(Crypto::ArtifactNode a, Crypto::ArtifactNode b) {
-  a != b and
-  (
-    a.getSourceElement() = b.getSourceElement() and a.getSourceElement() instanceof Literal
-    or
-    a.getSourceElement().(Literal).getValue() = b.getSourceElement().(Literal).getValue()
-    or
-    forex(DataFlow::Node e | e = getWrapperSet(a) |
-      exists(DataFlow::Node e2 | e2 = getWrapperSet(b) | e = e2)
-    )
-    or
-    forex(DataFlow::Node e | e = getWrapperSet(b) |
-      exists(DataFlow::Node e2 | e2 = getWrapperSet(a) | e = e2)
-    )
-  )
-}
diff --git a/java/ql/src/experimental/quantum/Analysis/InsecureNonceSource.ql b/java/ql/src/experimental/quantum/Analysis/InsecureNonceSource.ql
deleted file mode 100644
index f00621d4d2b..00000000000
--- a/java/ql/src/experimental/quantum/Analysis/InsecureNonceSource.ql
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @name Insecure nonce at a cipher operation
- * @id java/quantum/insecure-nonce
- * @description A nonce is generated from a source that is not secure. This can lead to
- *              vulnerabilities such as replay attacks or key recovery.
- * @kind problem
- * @problem.severity error
- * @precision high
- * @tags quantum
- *       experimental
- */
-
-import experimental.quantum.Language
-
-predicate isInsecureNonceSource(Crypto::NonceArtifactNode n, Crypto::NodeBase src) {
-  src = n.getSourceNode() and
-  not src.asElement() instanceof SecureRandomnessInstance
-}
-
-from Crypto::KeyOperationNode op, Crypto::NodeBase src
-where isInsecureNonceSource(op.getANonce(), src)
-select op, "Operation uses insecure nonce source $@", src, src.toString()
diff --git a/java/ql/src/experimental/quantum/Analysis/KnownWeakKDFIterationCount.ql b/java/ql/src/experimental/quantum/Analysis/KnownWeakKDFIterationCount.ql
deleted file mode 100644
index 2dd5b0b006b..00000000000
--- a/java/ql/src/experimental/quantum/Analysis/KnownWeakKDFIterationCount.ql
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * @name Weak known key derivation function iteration count
- * @description Detects key derivation operations with a known weak iteration count.
- * @id java/quantum/weak-kdf-iteration-count
- * @kind problem
- * @problem.severity error
- * @precision high
- * @tags quantum
- *       experimental
- */
-
-import java
-import experimental.quantum.Language
-
-from Crypto::KeyDerivationOperationNode op, Literal l
-where
-  op.getIterationCount().asElement() = l and
-  l.getValue().toInt() < 100000
-select op, "Key derivation operation configures iteration count below 100k: $@", l,
-  l.getValue().toString()
diff --git a/java/ql/src/experimental/quantum/Analysis/ReusedNonce.ql b/java/ql/src/experimental/quantum/Analysis/ReusedNonce.ql
deleted file mode 100644
index ed2872bb67e..00000000000
--- a/java/ql/src/experimental/quantum/Analysis/ReusedNonce.ql
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * @name Reuse of cryptographic nonce
- * @description Reuse of nonce in cryptographic operations can lead to vulnerabilities.
- * @id java/quantum/reused-nonce
- * @kind problem
- * @problem.severity error
- * @precision medium
- * @tags quantum
- *       experimental
- */
-
-import java
-import ArtifactReuse
-
-from Crypto::NonceArtifactNode nonce1, Crypto::NonceArtifactNode nonce2
-where isArtifactReuse(nonce1, nonce2)
-select nonce1, "Reuse with nonce $@", nonce2, nonce2.toString()
diff --git a/java/ql/src/experimental/quantum/Examples/ArtifactReuse.qll b/java/ql/src/experimental/quantum/Examples/ArtifactReuse.qll
new file mode 100644
index 00000000000..776510b52ad
--- /dev/null
+++ b/java/ql/src/experimental/quantum/Examples/ArtifactReuse.qll
@@ -0,0 +1,102 @@
+import java
+import semmle.code.java.dataflow.DataFlow
+import experimental.quantum.Language
+
+/**
+ * Flow from any function that appears to return a value
+ * to an artifact node.
+ * NOTE: TODO: need to handle call by refernece for now. Need to re-evaluate (see notes below)
+ * Such functions may be 'wrappers' for some derived value.
+ */
+private module ArtifactGeneratingWrapperConfig implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) {
+    source.asExpr() instanceof Call and
+    // not handling references yet, I think we want to flat say references are only ok
+    // if I know the source, otherwise, it has to be through an additional flow step, which
+    // we filter as a source, i.e., references are only allowed as sources only,
+    // no inferrece? Not sure if that would work
+    // Filter out sources that are known additional flow steps, as these are likely not the
+    // kind of wrapper source we are looking for.
+    not exists(AdditionalFlowInputStep s | s.getOutput() = source)
+  }
+
+  // Flow through additional flow steps
+  predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
+    node1.(AdditionalFlowInputStep).getOutput() = node2
+  }
+
+  predicate isSink(DataFlow::Node sink) { sink.asExpr() = any(Crypto::ArtifactNode i).asElement() }
+}
+
+module ArtifactGeneratingWrapperFlow = TaintTracking::Global<ArtifactGeneratingWrapperConfig>;
+
+/**
+ * Using a set approach to determine if reuse of an artifact exists.
+ * This predicate produces a set of 'wrappers' that flow to the artifact node.
+ * This set can be compared with the set to another artifact node to determine if they are the same.
+ */
+private DataFlow::Node getGeneratingWrapperSet(Crypto::NonceArtifactNode a) {
+  ArtifactGeneratingWrapperFlow::flow(result, DataFlow::exprNode(a.asElement()))
+  or
+  result.asExpr() = a.getSourceElement()
+}
+
+private predicate ancestorOfArtifact(
+  Crypto::ArtifactNode a, Callable enclosingCallable, ControlFlow::Node midOrTarget
+) {
+  a.asElement().(Expr).getEnclosingCallable() = enclosingCallable and
+  (
+    midOrTarget.asExpr() = a.asElement() or
+    midOrTarget.asExpr().(Call).getCallee().calls*(a.asElement().(Expr).getEnclosingCallable())
+  )
+}
+
+/**
+ * Two different artifact nodes are considered reuse if any of the following conditions are met:
+ * 1. The source for artifact `a` and artifact `b` are the same and the source is a literal.
+ * 2. The source for artifact `a` and artifact `b` are not the same and the source is a literal of the same value.
+ * 3. For all 'wrappers' that return the source of artifact `a`, and each wrapper also exists for artifact `b`.
+ * 4. For all 'wrappers' that return the source of artifact `b`, and each wrapper also exists for artifact `a`.
+ *
+ * The above conditions determine that the use of the IV is from the same source, but the use may
+ * be on separate code paths that do not occur sequentially. We must therefore also find a common callable ancestor
+ * for both uses, and in that ancestor, there must be control flow from the call or use of one to the call or use of the other.
+ * Note that if no shared ancestor callable exists, it means the flow is more nuanced and ignore the shared ancestor
+ * use flow.
+ */
+predicate isArtifactReuse(Crypto::ArtifactNode a, Crypto::ArtifactNode b) {
+  a != b and
+  (
+    a.getSourceElement() = b.getSourceElement() and a.getSourceElement() instanceof Literal
+    or
+    a.getSourceElement().(Literal).getValue() = b.getSourceElement().(Literal).getValue()
+    or
+    forex(DataFlow::Node e | e = getGeneratingWrapperSet(a) |
+      exists(DataFlow::Node e2 | e2 = getGeneratingWrapperSet(b) | e = e2)
+    )
+    or
+    forex(DataFlow::Node e | e = getGeneratingWrapperSet(b) |
+      exists(DataFlow::Node e2 | e2 = getGeneratingWrapperSet(a) | e = e2)
+    )
+  ) and
+  // If there is a common parent, there is control flow between the two uses in the parent
+  // TODO: this logic needs to be examined/revisited to ensure it is correct
+  (
+    exists(Callable commonParent |
+      ancestorOfArtifact(a, commonParent, _) and
+      ancestorOfArtifact(b, commonParent, _)
+    )
+    implies
+    exists(Callable commonParent, ControlFlow::Node aMid, ControlFlow::Node bMid |
+      ancestorOfArtifact(a, commonParent, aMid) and
+      ancestorOfArtifact(b, commonParent, bMid) and
+      a instanceof Crypto::NonceArtifactNode and
+      b instanceof Crypto::NonceArtifactNode and
+      (
+        aMid.getASuccessor*() = bMid
+        or
+        bMid.getASuccessor*() = aMid
+      )
+    )
+  )
+}
diff --git a/java/ql/src/experimental/quantum/Examples/BadMacOrder.qll b/java/ql/src/experimental/quantum/Examples/BadMacOrder.qll
new file mode 100644
index 00000000000..6d944661621
--- /dev/null
+++ b/java/ql/src/experimental/quantum/Examples/BadMacOrder.qll
@@ -0,0 +1,336 @@
+import java
+import experimental.quantum.Language
+import codeql.util.Option
+
+/**
+ * Holds when the src node is the output artifact of a decrypt operation
+ * that flows to the input artifact of a mac operation.
+ */
+predicate isDecryptToMacFlow(ArtifactFlow::PathNode src, ArtifactFlow::PathNode sink) {
+  // Simply flow from decrypt output to a mac input
+  ArtifactFlow::flowPath(src, sink) and
+  exists(Crypto::CipherOperationNode cipherOp |
+    cipherOp.getKeyOperationSubtype() = Crypto::TDecryptMode() and
+    cipherOp.getAnOutputArtifact().asElement() = src.getNode().asExpr()
+  ) and
+  exists(Crypto::MacOperationNode macOp |
+    macOp.getAnInputArtifact().asElement() = sink.getNode().asExpr()
+  )
+}
+
+/**
+ * Experimental interface for graph generation, supply the
+ * node to determine if a issue exists, and if so
+ * the graph can add a property on the node.
+ */
+predicate isDecryptToMacNode(Crypto::ArtifactNode node) {
+  exists(ArtifactFlow::PathNode src |
+    isDecryptToMacFlow(src, _) and
+    node.asElement() = src.getNode().asExpr()
+  )
+}
+
+predicate isDecryptThenMacFlow(DecryptThenMacFlow::PathNode src, DecryptThenMacFlow::PathNode sink) {
+  DecryptThenMacFlow::flowPath(src, sink)
+}
+
+/**
+ * Holds when the src node is used as plaintext input to both
+ * an encryption operation and a mac operation, via the
+ * argument represented by InterimArg.
+ */
+predicate isPlaintextInEncryptionAndMac(
+  PlaintextUseAsMacAndCipherInputFlow::PathNode src,
+  PlaintextUseAsMacAndCipherInputFlow::PathNode sink, EncryptOrMacCallArg arg
+) {
+  PlaintextUseAsMacAndCipherInputFlow::flowPath(src, sink) and
+  arg = sink.getState().asSome() and
+  // the above pathing adds flow steps that may not have consideration for the calling context
+  // TODO: this is something we want to look into to improving, but for now
+  // we can filter bad flows with one additional flow check, that the source goes to both
+  // src and sink through a generic flow
+  // note that the flow path above ensures src gets to the interim arg, so we just need to
+  // verify the source to sink.
+  // TODO: having to copy the generic data flow config into a use-use variant
+  // should we fix this at the language level to allow use use more intuitively?
+  // Seems to be a common issue.
+  GenericDataSourceFlowUseUseFlow::flow(src.getNode(), sink.getNode())
+}
+
+/**
+ * A copy of GenericDataSourceFlow but with use-use flows enabled by removing the barrier out
+ */
+module GenericDataSourceFlowUseUseConfig implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) {
+    source = any(Crypto::GenericSourceInstance i).getOutputNode()
+  }
+
+  predicate isSink(DataFlow::Node sink) {
+    sink = any(Crypto::FlowAwareElement other).getInputNode()
+  }
+
+  predicate isBarrierIn(DataFlow::Node node) {
+    node = any(Crypto::FlowAwareElement element).getOutputNode()
+  }
+
+  predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
+    node1.(AdditionalFlowInputStep).getOutput() = node2
+    or
+    exists(MethodCall m |
+      m.getMethod().hasQualifiedName("java.lang", "String", "getBytes") and
+      node1.asExpr() = m.getQualifier() and
+      node2.asExpr() = m
+    )
+  }
+}
+
+module GenericDataSourceFlowUseUseFlow = TaintTracking::Global<GenericDataSourceFlowUseUseConfig>;
+
+module WrapperArgFlowConfig implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) {
+    // Start from a parameter and not a call to avoid flow going out of
+    // the call. We want to flow down a call, so start from a parameter
+    // and barrier flows through returns
+    exists(Method m | m.getParameter(_) = source.asParameter())
+  }
+
+  predicate isSink(DataFlow::Node sink) {
+    exists(Crypto::CipherOperationNode cipherOp |
+      cipherOp.getAnInputArtifact().asElement() = sink.asExpr()
+    )
+    or
+    exists(Crypto::MacOperationNode macOp | macOp.getAnInputArtifact().asElement() = sink.asExpr())
+  }
+
+  predicate isBarrierIn(DataFlow::Node node) {
+    node = any(Crypto::FlowAwareElement element).getOutputNode()
+  }
+
+  predicate isBarrierOut(DataFlow::Node node) {
+    // stop all flow out of a call return
+    // TODO: this might be too strict and remove taint flow, need to reassess
+    node.asExpr() instanceof Call or
+    node = any(Crypto::FlowAwareElement element).getInputNode()
+  }
+
+  predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
+    node1.(AdditionalFlowInputStep).getOutput() = node2
+    or
+    exists(MethodCall m |
+      m.getMethod().hasQualifiedName("java.lang", "String", "getBytes") and
+      node1.asExpr() = m.getQualifier() and
+      node2.asExpr() = m
+    )
+  }
+}
+
+module WrapperArgFlow = TaintTracking::Global<WrapperArgFlowConfig>;
+
+predicate encryptWrapperArg(DataFlow::Node n, DataFlow::Node sink) {
+  exists(Crypto::CipherOperationNode cipherOp |
+    cipherOp.getKeyOperationSubtype() = Crypto::TEncryptMode() and
+    cipherOp.getAnInputArtifact().asElement() = sink.asExpr()
+  ) and
+  (
+    exists(Parameter p, DataFlow::Node src |
+      p = src.asParameter() and
+      WrapperArgFlow::flow(src, sink) and
+      n.asExpr() = p.getAnArgument()
+    )
+    or
+    n = sink // the call the target operation is considered a wrapper arg to itself
+  )
+}
+
+predicate decryptWrapperArg(DataFlow::Node n, DataFlow::Node sink) {
+  exists(Crypto::CipherOperationNode cipherOp |
+    cipherOp.getKeyOperationSubtype() = Crypto::TDecryptMode() and
+    cipherOp.getAnInputArtifact().asElement() = sink.asExpr()
+  ) and
+  (
+    exists(Parameter p, DataFlow::Node src |
+      p = src.asParameter() and
+      WrapperArgFlow::flow(src, sink) and
+      n.asExpr() = p.getAnArgument()
+    )
+    or
+    n = sink // the call the target operation is considered a wrapper arg to itself
+  )
+}
+
+predicate macWrapperArg(DataFlow::Node n, DataFlow::Node sink) {
+  exists(Crypto::MacOperationNode macOp | macOp.getAnInputArtifact().asElement() = sink.asExpr()) and
+  (
+    exists(Parameter p, DataFlow::Node src |
+      p = src.asParameter() and
+      WrapperArgFlow::flow(src, sink) and
+      n.asExpr() = p.getAnArgument()
+    )
+    or
+    n = sink // the call the target operation is considered a wrapper arg to itself
+  )
+}
+
+module ArgToEncryptOrMacConfig implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) { exists(Call c | c.getAnArgument() = source.asExpr()) }
+
+  predicate isSink(DataFlow::Node sink) { encryptOrMacSink(sink) }
+
+  // Don't go in to a known out node, this will prevent the plaintext
+  // from tracing out of cipher operations for example, we just want to trace
+  // the plaintext to uses.
+  // NOTE: we are not using a barrier out on input nodes, because
+  // that would remove 'use-use' flows, which we need
+  predicate isBarrierIn(DataFlow::Node node) {
+    node = any(Crypto::FlowAwareElement element).getOutputNode()
+  }
+
+  predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
+    node1.(AdditionalFlowInputStep).getOutput() = node2
+    or
+    exists(MethodCall m |
+      m.getMethod().hasQualifiedName("java.lang", "String", "getBytes") and
+      node1.asExpr() = m.getQualifier() and
+      node2.asExpr() = m
+    )
+  }
+}
+
+module ArgToEncryptOrMacFlow = TaintTracking::Global<ArgToEncryptOrMacConfig>;
+
+/**
+ * Target sinks for this query are either encryption operations or mac operation message inputs
+ */
+predicate encryptOrMacSink(DataFlow::Node n) {
+  exists(Crypto::CipherOperationNode cipherOp |
+    cipherOp.getKeyOperationSubtype() = Crypto::TEncryptMode() and
+    cipherOp.getAnInputArtifact().asElement() = n.asExpr()
+  )
+  or
+  exists(Crypto::MacOperationNode macOp | macOp.getAnInputArtifact().asElement() = n.asExpr())
+}
+
+/**
+ * Target sinks for decryption operations
+ */
+predicate decryptSink(DataFlow::Node n) {
+  exists(Crypto::CipherOperationNode cipherOp |
+    cipherOp.getKeyOperationSubtype() = Crypto::TDecryptMode() and
+    cipherOp.getAnInputArtifact().asElement() = n.asExpr()
+  )
+}
+
+class EncryptOrMacCallArg extends DataFlow::Node {
+  boolean isEncryption;
+
+  EncryptOrMacCallArg() {
+    exists(Crypto::CipherOperationNode cipherOp |
+      cipherOp.getKeyOperationSubtype() = Crypto::TEncryptMode() and
+      cipherOp.getAnInputArtifact().asElement() = this.asExpr()
+    ) and
+    isEncryption = true
+    or
+    exists(Crypto::MacOperationNode macOp | macOp.getAnInputArtifact().asElement() = this.asExpr()) and
+    isEncryption = false
+  }
+
+  predicate isEncryption() { isEncryption = true }
+
+  predicate isMac() { isEncryption = false }
+}
+
+module PlaintextUseAsMacAndCipherInputConfig implements DataFlow::StateConfigSig {
+  class FlowState = Option<EncryptOrMacCallArg>::Option;
+
+  // TODO: can we approximate a message source better?
+  predicate isSource(DataFlow::Node source, FlowState state) {
+    // TODO: can we find the 'closest' parameter to the sinks?
+    // i.e., use a generic source if we have it, but also isolate the
+    // lowest level in the flow to the closest parameter node in the call graph?
+    exists(Crypto::GenericSourceNode other |
+      other.asElement() = CryptoInput::dfn_to_element(source)
+    ) and
+    state.isNone()
+  }
+
+  predicate isSink(DataFlow::Node sink, FlowState state) {
+    sink.(EncryptOrMacCallArg).isMac() and state.asSome().isEncryption()
+    or
+    sink.(EncryptOrMacCallArg).isEncryption() and state.asSome().isMac()
+  }
+
+  predicate isBarrierOut(DataFlow::Node node, FlowState state) {
+    // Stop at the first sink for now
+    isSink(node, state)
+  }
+
+  // Don't go in to a known out node, this will prevent the plaintext
+  // from tracing out of cipher operations for example, we just want to trace
+  // the plaintext to uses.
+  // NOTE: we are not using a barrier out on input nodes, because
+  // that would remove 'use-use' flows, which we need
+  predicate isBarrierIn(DataFlow::Node node) {
+    node = any(Crypto::FlowAwareElement element).getOutputNode()
+  }
+
+  predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
+    node1.(AdditionalFlowInputStep).getOutput() = node2
+    or
+    exists(MethodCall m |
+      m.getMethod().hasQualifiedName("java.lang", "String", "getBytes") and
+      node1.asExpr() = m.getQualifier() and
+      node2.asExpr() = m
+    )
+  }
+
+  predicate isAdditionalFlowStep(
+    DataFlow::Node node1, FlowState state1, DataFlow::Node node2, FlowState state2
+  ) {
+    // TODO: should we consider isSome cases?
+    state1.isNone() and
+    (
+      encryptWrapperArg(node2, node1)
+      or
+      macWrapperArg(node2, node1)
+    ) and
+    state2.asSome() = node1
+  }
+}
+
+module PlaintextUseAsMacAndCipherInputFlow =
+  TaintTracking::GlobalWithState<PlaintextUseAsMacAndCipherInputConfig>;
+
+module DecryptThenMacConfig implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) {
+    exists(Crypto::CipherOperationNode cipherOp |
+      cipherOp.getKeyOperationSubtype() = Crypto::TDecryptMode() and
+      cipherOp.getAnInputArtifact().asElement() = source.asExpr()
+    )
+  }
+
+  predicate isSink(DataFlow::Node sink) {
+    exists(Crypto::MacOperationNode macOp | macOp.getAnInputArtifact().asElement() = sink.asExpr())
+  }
+
+  // Don't go in to a known out node, prevents
+  // from tracing out of an operation
+  // NOTE: we are not using a barrier out on input nodes, because
+  // that would remove 'use-use' flows, which we need
+  predicate isBarrierIn(DataFlow::Node node) {
+    node = any(Crypto::FlowAwareElement element).getOutputNode()
+  }
+
+  predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
+    node1.(AdditionalFlowInputStep).getOutput() = node2
+    or
+    exists(MethodCall m |
+      m.getMethod().hasQualifiedName("java.lang", "String", "getBytes") and
+      node1.asExpr() = m.getQualifier() and
+      node2.asExpr() = m
+    )
+    or
+    decryptWrapperArg(node2, node1)
+  }
+}
+
+module DecryptThenMacFlow = TaintTracking::Global<DecryptThenMacConfig>;
diff --git a/java/ql/src/experimental/quantum/Examples/BadMacOrderDecryptThenMac.ql b/java/ql/src/experimental/quantum/Examples/BadMacOrderDecryptThenMac.ql
new file mode 100644
index 00000000000..21b0be29ed5
--- /dev/null
+++ b/java/ql/src/experimental/quantum/Examples/BadMacOrderDecryptThenMac.ql
@@ -0,0 +1,19 @@
+/**
+ * @name Bad MAC order: decrypt then mac
+ * @description Decryption on cipher text, then MAC on cipher text, is incorrect order
+ * @id java/quantum/examples/bad-mac-order-decrypt-then-mac
+ * @kind path-problem
+ * @problem.severity error
+ * @tags quantum
+ *       experimental
+ */
+
+import java
+import BadMacOrder
+import DecryptThenMacFlow::PathGraph
+
+from DecryptThenMacFlow::PathNode src, DecryptThenMacFlow::PathNode sink
+where isDecryptThenMacFlow(src, sink)
+select sink, src, sink,
+  "Incorrect decryption and MAC order: " +
+    "Decryption of cipher text occurs before validation of MAC on cipher text."
diff --git a/java/ql/src/experimental/quantum/Examples/BadMacOrderDecryptToMac.ql b/java/ql/src/experimental/quantum/Examples/BadMacOrderDecryptToMac.ql
new file mode 100644
index 00000000000..fb9d8795b4d
--- /dev/null
+++ b/java/ql/src/experimental/quantum/Examples/BadMacOrderDecryptToMac.ql
@@ -0,0 +1,18 @@
+/**
+ * @name Bad MAC order: decrypt to mac
+ * @description MAC should be on a cipher, not a raw message
+ * @id java/quantum/examples/bad-mac-order-decrypt-to-mac
+ * @kind path-problem
+ * @problem.severity error
+ * @tags quantum
+ *       experimental
+ */
+
+import java
+import ArtifactFlow::PathGraph
+import BadMacOrder
+
+from ArtifactFlow::PathNode src, ArtifactFlow::PathNode sink
+where isDecryptToMacFlow(src, sink)
+select sink, src, sink,
+  "Incorrect decryption and MAC order: decryption output plaintext flows to MAC message input."
diff --git a/java/ql/src/experimental/quantum/Examples/BadMacOrderMacOnEncryptPlaintext.ql b/java/ql/src/experimental/quantum/Examples/BadMacOrderMacOnEncryptPlaintext.ql
new file mode 100644
index 00000000000..7644167c589
--- /dev/null
+++ b/java/ql/src/experimental/quantum/Examples/BadMacOrderMacOnEncryptPlaintext.ql
@@ -0,0 +1,21 @@
+/**
+ * @name Bad MAC order: Mac and Encryption share the same plaintext
+ * @description MAC should be on a cipher, not a raw message
+ * @id java/quantum/examples/bad-mac-order-encrypt-plaintext-also-in-mac
+ * @kind path-problem
+ * @problem.severity error
+ * @tags quantum
+ *       experimental
+ */
+
+import java
+import BadMacOrder
+import PlaintextUseAsMacAndCipherInputFlow::PathGraph
+
+from
+  PlaintextUseAsMacAndCipherInputFlow::PathNode src,
+  PlaintextUseAsMacAndCipherInputFlow::PathNode sink, EncryptOrMacCallArg arg
+where isPlaintextInEncryptionAndMac(src, sink, arg)
+select sink, src, sink,
+  "Incorrect MAC usage: Encryption plaintext also used for MAC. Flow shows plaintext to final use through intermediate mac or encryption operation here $@",
+  arg.asExpr(), arg.asExpr().toString()
diff --git a/java/ql/src/experimental/quantum/Examples/BrokenCrypto.ql b/java/ql/src/experimental/quantum/Examples/BrokenCrypto.ql
index 7291ea554a5..b449f118bc3 100644
--- a/java/ql/src/experimental/quantum/Examples/BrokenCrypto.ql
+++ b/java/ql/src/experimental/quantum/Examples/BrokenCrypto.ql
@@ -4,7 +4,6 @@
  * @kind problem
  * @problem.severity warning
  * @security-severity 7.5
- * @precision high
  * @id java/weak-cryptographic-algorithm-new-model
  * @tags security
  *       external/cwe/cwe-327
@@ -12,7 +11,7 @@
  */
 
 //THIS QUERY IS A REPLICA OF: https://github.com/github/codeql/blob/main/java/ql/src/Security/CWE/CWE-327/BrokenCryptoAlgorithm.ql
-//but uses the **NEW MODELLING**
+//but uses the **NEW MODELING**
 import experimental.quantum.Language
 
 /**
diff --git a/java/ql/src/experimental/quantum/Examples/InsecureIVorNonceSource.ql b/java/ql/src/experimental/quantum/Examples/InsecureIVorNonceSource.ql
new file mode 100644
index 00000000000..1c35d50a2d9
--- /dev/null
+++ b/java/ql/src/experimental/quantum/Examples/InsecureIVorNonceSource.ql
@@ -0,0 +1,88 @@
+/**
+ * @name Insecure nonce/iv (static value or weak random source)
+ * @id java/quantum/examples/insecure-iv-or-nonce
+ * @description A nonce/iv is generated from a source that is not secure. This can lead to
+ *              vulnerabilities such as replay attacks or key recovery. Insecure generation
+ *              is any static nonce, or any known insecure source for a nonce/iv if
+ *              the value is used for an encryption operation (decryption operations are ignored
+ *              as the nonce/iv would be provided alongside the ciphertext).
+ * @kind path-problem
+ * @problem.severity error
+ * @tags quantum
+ *       experimental
+ */
+
+import experimental.quantum.Language
+
+module NonceSrcFlowConfig implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) {
+    source = any(Crypto::GenericSourceInstance i).getOutputNode() or
+    source = any(Crypto::ArtifactInstance artifact).getOutputNode()
+  }
+
+  predicate isSink(DataFlow::Node sink) {
+    exists(Crypto::NonceArtifactNode nonce | sink.asExpr() = nonce.asElement())
+  }
+
+  predicate isBarrierOut(DataFlow::Node node) {
+    node = any(Crypto::FlowAwareElement element).getInputNode()
+  }
+
+  predicate isBarrierIn(DataFlow::Node node) {
+    node = any(Crypto::FlowAwareElement element).getOutputNode()
+  }
+
+  predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
+    node1.(AdditionalFlowInputStep).getOutput() = node2
+    or
+    exists(MethodCall m |
+      m.getMethod().hasQualifiedName("java.lang", "String", "getBytes") and
+      node1.asExpr() = m.getQualifier() and
+      node2.asExpr() = m
+    )
+  }
+}
+
+module NonceSrcFlow = TaintTracking::Global<NonceSrcFlowConfig>;
+
+import NonceSrcFlow::PathGraph
+
+from
+  Crypto::NonceArtifactNode nonce, Crypto::NodeBase src, Crypto::NodeBase op, string msg,
+  NonceSrcFlow::PathNode srcNode, NonceSrcFlow::PathNode sinkNode
+where
+  nonce.getSourceNode() = src and
+  // NOTE: null nonces should be handled seaparately, often used for default values prior to initialization
+  // failure to initialize should, in practice, lead to a NullPointerException, which is a separate concern
+  // however there may be APIs where NULL uses a default nonce or action.
+  not src.asElement() instanceof NullLiteral and
+  (
+    // Case 1: Any constant nonce/iv is bad, regardless of how it is used
+    src.asElement() instanceof Crypto::GenericConstantSourceInstance and
+    op = nonce and // binding op but not using it
+    msg = "Nonce or IV uses constant source $@"
+    or
+    // Case 2: The nonce has a non-random source and there is no known operation for the nonce
+    //         assume it is used for encryption
+    not src.asElement() instanceof SecureRandomnessInstance and
+    not src.asElement() instanceof Crypto::GenericConstantSourceInstance and
+    not exists(Crypto::CipherOperationNode o | o.getANonce() = nonce) and
+    op = nonce and // binding op, but not using it
+    msg =
+      "Nonce or IV uses insecure source $@ with no observed nonce usage (assuming could be for encryption)."
+    or
+    // Case 3: The nonce has a non-random source and is used in an encryption operation
+    not src.asElement() instanceof SecureRandomnessInstance and
+    not src.asElement() instanceof Crypto::GenericConstantSourceInstance and
+    op.(Crypto::CipherOperationNode).getANonce() = nonce and
+    (
+      op.(Crypto::CipherOperationNode).getKeyOperationSubtype() instanceof Crypto::TEncryptMode
+      or
+      op.(Crypto::CipherOperationNode).getKeyOperationSubtype() instanceof Crypto::TWrapMode
+    ) and
+    msg = "Nonce or IV uses insecure source $@ at encryption operation $@"
+  ) and
+  srcNode.getNode().asExpr() = src.asElement() and
+  sinkNode.getNode().asExpr() = nonce.asElement() and
+  NonceSrcFlow::flowPath(srcNode, sinkNode)
+select sinkNode, srcNode, sinkNode, msg, src, src.toString(), op, op.toString()
diff --git a/java/ql/src/experimental/quantum/Examples/NonAESGCMCipher.ql b/java/ql/src/experimental/quantum/Examples/NonAESGCMCipher.ql
new file mode 100644
index 00000000000..affe7917cf2
--- /dev/null
+++ b/java/ql/src/experimental/quantum/Examples/NonAESGCMCipher.ql
@@ -0,0 +1,24 @@
+/**
+ * @name Cipher not AES-GCM mode
+ * @id java/quantum/examples/non-aes-gcm
+ * @description An AES cipher is in use without GCM
+ * @kind problem
+ * @problem.severity error
+ * @tags quantum
+ *       experimental
+ */
+
+import experimental.quantum.Language
+
+class NonAESGCMAlgorithmNode extends Crypto::KeyOperationAlgorithmNode {
+  NonAESGCMAlgorithmNode() {
+    this.getAlgorithmType() = Crypto::KeyOpAlg::TSymmetricCipher(Crypto::KeyOpAlg::AES()) and
+    this.getModeOfOperation().getModeType() != Crypto::KeyOpAlg::GCM()
+  }
+}
+
+from Crypto::KeyOperationNode op, Crypto::KeyOperationOutputNode codeNode
+where
+  op.getAKnownAlgorithm() instanceof NonAESGCMAlgorithmNode and
+  codeNode = op.getAnOutputArtifact()
+select op, "Non-AES-GCM instance."
diff --git a/java/ql/src/experimental/quantum/Examples/ReusedNonce.ql b/java/ql/src/experimental/quantum/Examples/ReusedNonce.ql
new file mode 100644
index 00000000000..54eddd8fc06
--- /dev/null
+++ b/java/ql/src/experimental/quantum/Examples/ReusedNonce.ql
@@ -0,0 +1,88 @@
+/**
+ * @name Reuse of cryptographic nonce
+ * @description Reuse of nonce in cryptographic operations can lead to vulnerabilities.
+ * @id java/quantum/examples/reused-nonce
+ * @kind path-problem
+ * @problem.severity error
+ * @tags quantum
+ *       experimental
+ */
+
+import java
+import ArtifactReuse
+
+module NonceSrcFlowConfig implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) {
+    source = any(Crypto::GenericSourceInstance i).getOutputNode() or
+    source = any(Crypto::ArtifactInstance artifact).getOutputNode()
+  }
+
+  predicate isSink(DataFlow::Node sink) {
+    exists(Crypto::NonceArtifactNode nonce | sink.asExpr() = nonce.asElement())
+  }
+
+  predicate isBarrierOut(DataFlow::Node node) {
+    node = any(Crypto::FlowAwareElement element).getInputNode()
+  }
+
+  predicate isBarrierIn(DataFlow::Node node) {
+    node = any(Crypto::FlowAwareElement element).getOutputNode()
+  }
+
+  predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
+    node1.(AdditionalFlowInputStep).getOutput() = node2
+    or
+    exists(MethodCall m |
+      m.getMethod().hasQualifiedName("java.lang", "String", "getBytes") and
+      node1.asExpr() = m.getQualifier() and
+      node2.asExpr() = m
+    )
+  }
+}
+
+module NonceSrcFlow = TaintTracking::Global<NonceSrcFlowConfig>;
+
+import NonceSrcFlow::PathGraph
+
+from
+  Crypto::NonceArtifactNode nonce1, Crypto::NonceArtifactNode nonce2, Crypto::NodeBase src,
+  NonceSrcFlow::PathNode srcNode, NonceSrcFlow::PathNode sinkNode
+where
+  isArtifactReuse(nonce1, nonce2) and
+  // NOTE: in general we may not know a source, but see possible reuse,
+  // we are not detecting these cases here (only where the source is the same).
+  src = nonce1.getSourceNode() and
+  src = nonce2.getSourceNode() and
+  // Null literals are typically used for initialization, and if two 'nulls'
+  // are reused, it is likely an uninitialization path that would result in a NullPointerException.
+  not src.asElement() instanceof NullLiteral and
+  // if the nonce is used in an encryption and decryption, ignore that reuse
+  not exists(Crypto::CipherOperationNode op1, Crypto::CipherOperationNode op2 |
+    op1 != op2 and
+    op1.getANonce() = nonce1 and
+    op2.getANonce() = nonce2 and
+    (
+      (
+        op1.getKeyOperationSubtype() instanceof Crypto::TEncryptMode or
+        op1.getKeyOperationSubtype() instanceof Crypto::TWrapMode
+      ) and
+      (
+        op2.getKeyOperationSubtype() instanceof Crypto::TDecryptMode or
+        op2.getKeyOperationSubtype() instanceof Crypto::TUnwrapMode
+      )
+      or
+      (
+        op2.getKeyOperationSubtype() instanceof Crypto::TEncryptMode or
+        op2.getKeyOperationSubtype() instanceof Crypto::TWrapMode
+      ) and
+      (
+        op1.getKeyOperationSubtype() instanceof Crypto::TDecryptMode or
+        op1.getKeyOperationSubtype() instanceof Crypto::TUnwrapMode
+      )
+    )
+  ) and
+  srcNode.getNode().asExpr() = src.asElement() and
+  sinkNode.getNode().asExpr() = nonce1.asElement() and
+  NonceSrcFlow::flowPath(srcNode, sinkNode)
+select sinkNode, srcNode, sinkNode, "Nonce source is reused, see alternate sink $@", nonce2,
+  nonce2.toString()
diff --git a/java/ql/src/experimental/quantum/Examples/UnknownHash.ql b/java/ql/src/experimental/quantum/Examples/UnknownHash.ql
new file mode 100644
index 00000000000..32d8fa3b753
--- /dev/null
+++ b/java/ql/src/experimental/quantum/Examples/UnknownHash.ql
@@ -0,0 +1,19 @@
+/**
+ * @name Unknown hashes
+ * @description Finds uses of cryptographic hashing algorithms of unknown type.
+ * @id java/quantum/examples/unknown-hash
+ * @kind problem
+ * @problem.severity error
+ * @tags quantum
+ *       experimental
+ */
+
+import java
+import experimental.quantum.Language
+
+from Crypto::HashAlgorithmNode alg
+where
+  not exists(alg.getHashType())
+  or
+  alg.getHashType() = Crypto::OtherHashType()
+select alg, "Use of unknown hash algorithm."
diff --git a/java/ql/src/experimental/quantum/Examples/UnknownIVorNonceSource.ql b/java/ql/src/experimental/quantum/Examples/UnknownIVorNonceSource.ql
new file mode 100644
index 00000000000..3537fca594a
--- /dev/null
+++ b/java/ql/src/experimental/quantum/Examples/UnknownIVorNonceSource.ql
@@ -0,0 +1,35 @@
+/**
+ * @name Unknown nonce/iv source
+ * @id java/quantum/examples/unknown-iv-or-nonce-source
+ * @description A nonce/iv is generated from a source that is not secure. Failure to initialize
+ *              an IV or nonce properly can lead to vulnerabilities such as replay attacks or key recovery.
+ *              IV may be unknown at a decryption operation (IV would be provided alongside the ciphertext).
+ *              These cases are ignored.
+ * @kind problem
+ * @problem.severity error
+ * @tags quantum
+ *       experimental
+ */
+
+import experimental.quantum.Language
+
+from Crypto::NonceArtifactNode nonce, Crypto::NodeBase op, string msg
+where
+  not exists(nonce.getSourceNode()) and
+  (
+    // Nonce not associated with any known cipher operation, assume unknown as insecure
+    not exists(Crypto::CipherOperationNode o | o.getANonce() = nonce) and
+    op = nonce and
+    msg =
+      "Unknown IV/Nonce initialization source with no observed nonce usage (assuming could be for encryption)."
+    or
+    // Nonce associated cipher operation where the mode is not explicitly encryption
+    op.(Crypto::CipherOperationNode).getANonce() = nonce and
+    (
+      op.(Crypto::CipherOperationNode).getKeyOperationSubtype() instanceof Crypto::TEncryptMode
+      or
+      op.(Crypto::CipherOperationNode).getKeyOperationSubtype() instanceof Crypto::TWrapMode
+    ) and
+    msg = "Unknown IV/Nonce initialization source at encryption operation $@"
+  )
+select nonce, msg, op, op.toString()
diff --git a/java/ql/src/experimental/quantum/Analysis/UnknownKDFIterationCount.ql b/java/ql/src/experimental/quantum/Examples/UnknownKDFIterationCount.ql
similarity index 87%
rename from java/ql/src/experimental/quantum/Analysis/UnknownKDFIterationCount.ql
rename to java/ql/src/experimental/quantum/Examples/UnknownKDFIterationCount.ql
index 21bca11cc1a..3f8f1306a1d 100644
--- a/java/ql/src/experimental/quantum/Analysis/UnknownKDFIterationCount.ql
+++ b/java/ql/src/experimental/quantum/Examples/UnknownKDFIterationCount.ql
@@ -1,10 +1,9 @@
 /**
  * @name Unknown key derivation function iteration count
  * @description Detects key derivation operations with an unknown iteration count.
- * @id java/quantum/unknown-kdf-iteration-count
+ * @id java/quantum/examples/unknown-kdf-iteration-count
  * @kind problem
- * @precision medium
- * @severity warning
+ * @problem.severity error
  * @tags quantum
  *       experimental
  */
diff --git a/java/ql/src/experimental/quantum/Examples/WeakAsymmetricKeyGenSize.ql b/java/ql/src/experimental/quantum/Examples/WeakAsymmetricKeyGenSize.ql
new file mode 100644
index 00000000000..ee81e7bd6d0
--- /dev/null
+++ b/java/ql/src/experimental/quantum/Examples/WeakAsymmetricKeyGenSize.ql
@@ -0,0 +1,69 @@
+/**
+ * @name Weak Asymmetric Key Size
+ * @id java/quantum/examples/weak-asymmetric-key-gen-size
+ * @description An asymmetric key of known size is less than 2048 bits for any non-elliptic curve key operation.
+ * @kind path-problem
+ * @problem.severity error
+ * @tags quantum
+ *       experimental
+ */
+
+import java
+import experimental.quantum.Language
+
+module KeySizeFlowConfig implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) {
+    source = any(Crypto::GenericSourceInstance i).getOutputNode() or
+    source = any(Crypto::ArtifactInstance artifact).getOutputNode()
+  }
+
+  predicate isSink(DataFlow::Node sink) {
+    exists(Crypto::KeyCreationOperationNode kgen |
+      sink = kgen.getKeySizeConsumer().getConsumer().getInputNode()
+    )
+  }
+
+  predicate isBarrierOut(DataFlow::Node node) {
+    node = any(Crypto::FlowAwareElement element).getInputNode()
+  }
+
+  predicate isBarrierIn(DataFlow::Node node) {
+    node = any(Crypto::FlowAwareElement element).getOutputNode()
+  }
+
+  predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
+    node1.(AdditionalFlowInputStep).getOutput() = node2
+    or
+    exists(MethodCall m |
+      m.getMethod().hasQualifiedName("java.lang", "String", "getBytes") and
+      node1.asExpr() = m.getQualifier() and
+      node2.asExpr() = m
+    )
+  }
+}
+
+module KeySizeFlow = TaintTracking::Global<KeySizeFlowConfig>;
+
+import KeySizeFlow::PathGraph
+
+from
+  Crypto::KeyCreationOperationNode keygen, int keySize, Crypto::AlgorithmNode alg,
+  KeySizeFlow::PathNode srcNode, KeySizeFlow::PathNode sinkNode
+where
+  // ASSUMPTION/NOTE: if the key size is set on a key creation, but the key creation itself is not observed
+  // (i.e., the size is initialized but the operation not observed) currently we will not
+  // detect the size. A key creation operation currently must be observed.
+  keygen.getAKeySizeSource().asElement().(Literal).getValue().toInt() = keySize and
+  // NOTE: if algorithm is not known (doesn't bind) we need a separate query
+  // Also note the algorithm may also be re-specified at a use of the key
+  alg = keygen.getAKnownAlgorithm() and
+  not alg instanceof Crypto::EllipticCurveNode and // Elliptic curve sizes are handled separately and are more tied directly to the algorithm
+  not alg.(Crypto::KeyAgreementAlgorithmNode).getKeyAgreementType() = Crypto::ECDH() and // ECDH key sizes should be handled with elliptic curves
+  alg instanceof Crypto::AsymmetricAlgorithmNode and
+  keySize < 2048 and
+  srcNode.getNode().asExpr() = keygen.getAKeySizeSource().asElement() and
+  sinkNode.getNode() = keygen.getKeySizeConsumer().getConsumer().getInputNode() and
+  KeySizeFlow::flowPath(srcNode, sinkNode)
+select sinkNode, srcNode, sinkNode,
+  "Use of weak asymmetric key size (" + keySize.toString() + " bits) for algorithm $@", alg,
+  alg.getAlgorithmName()
diff --git a/java/ql/src/experimental/quantum/Examples/WeakBlockModes.ql b/java/ql/src/experimental/quantum/Examples/WeakBlockModes.ql
new file mode 100644
index 00000000000..c5fb224ea1f
--- /dev/null
+++ b/java/ql/src/experimental/quantum/Examples/WeakBlockModes.ql
@@ -0,0 +1,32 @@
+/**
+ * @name Weak AES Block mode
+ * @id java/quantum/examples/weak-block-modes
+ * @description An AES cipher is in use with an insecure block mode
+ * @kind problem
+ * @problem.severity error
+ * @tags quantum
+ *       experimental
+ */
+
+import java
+import experimental.quantum.Language
+
+class WeakAESBlockModeAlgNode extends Crypto::KeyOperationAlgorithmNode {
+  Crypto::ModeOfOperationAlgorithmNode mode;
+
+  WeakAESBlockModeAlgNode() {
+    this.getAlgorithmType() = Crypto::KeyOpAlg::TSymmetricCipher(Crypto::KeyOpAlg::AES()) and
+    mode = super.getModeOfOperation() and
+    (
+      mode.getModeType() = Crypto::KeyOpAlg::ECB() or
+      mode.getModeType() = Crypto::KeyOpAlg::CFB() or
+      mode.getModeType() = Crypto::KeyOpAlg::OFB() or
+      mode.getModeType() = Crypto::KeyOpAlg::CTR()
+    )
+  }
+
+  Crypto::ModeOfOperationAlgorithmNode getMode() { result = mode }
+}
+
+from WeakAESBlockModeAlgNode alg
+select alg, "Weak AES block mode instance $@.", alg.getMode(), alg.getMode().toString()
diff --git a/java/ql/src/experimental/quantum/Examples/WeakHash.ql b/java/ql/src/experimental/quantum/Examples/WeakHash.ql
new file mode 100644
index 00000000000..cb61c2f860a
--- /dev/null
+++ b/java/ql/src/experimental/quantum/Examples/WeakHash.ql
@@ -0,0 +1,16 @@
+/**
+ * @name Weak hashes
+ * @description Finds uses of cryptographic hashing algorithms that are unapproved or otherwise weak.
+ * @id java/quantum/examples/weak-hash
+ * @kind problem
+ * @problem.severity error
+ * @tags external/cwe/cwe-327
+ *       quantum
+ *       experimental
+ */
+
+import WeakHash
+
+from Crypto::HashAlgorithmNode alg, Crypto::HashType htype, string msg
+where isUnapprovedHash(alg, htype, msg)
+select alg, msg
diff --git a/java/ql/src/experimental/quantum/Examples/WeakHash.qll b/java/ql/src/experimental/quantum/Examples/WeakHash.qll
new file mode 100644
index 00000000000..add6cc870ae
--- /dev/null
+++ b/java/ql/src/experimental/quantum/Examples/WeakHash.qll
@@ -0,0 +1,23 @@
+import experimental.quantum.Language
+
+predicate isUnapprovedHash(Crypto::HashAlgorithmNode alg, Crypto::HashType htype, string msg) {
+  htype = alg.getHashType() and
+  (
+    (htype != Crypto::SHA2() and htype != Crypto::SHA3()) and
+    msg = "Use of unapproved hash algorithm or API: " + htype.toString() + "."
+    or
+    (htype = Crypto::SHA2() or htype = Crypto::SHA3()) and
+    not exists(alg.getDigestLength()) and
+    msg =
+      "Use of approved hash algorithm or API type " + htype.toString() + " but unknown digest size."
+    or
+    exists(int digestLength |
+      digestLength = alg.getDigestLength() and
+      (htype = Crypto::SHA2() or htype = Crypto::SHA3()) and
+      digestLength < 256 and
+      msg =
+        "Use of approved hash algorithm or API type " + htype.toString() + " but weak digest size ("
+          + digestLength + ")."
+    )
+  )
+}
diff --git a/java/ql/src/experimental/quantum/Examples/WeakKDFIterationCount.ql b/java/ql/src/experimental/quantum/Examples/WeakKDFIterationCount.ql
new file mode 100644
index 00000000000..98f97335eae
--- /dev/null
+++ b/java/ql/src/experimental/quantum/Examples/WeakKDFIterationCount.ql
@@ -0,0 +1,59 @@
+/**
+ * @name Weak known key derivation function iteration count
+ * @description Detects key derivation operations with a known weak iteration count.
+ * @id java/quantum/examples/weak-kdf-iteration-count
+ * @kind path-problem
+ * @problem.severity error
+ * @tags quantum
+ *       experimental
+ */
+
+import java
+import experimental.quantum.Language
+
+module IterationCountConfig implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) {
+    source = any(Crypto::GenericSourceInstance i).getOutputNode() or
+    source = any(Crypto::ArtifactInstance artifact).getOutputNode()
+  }
+
+  predicate isSink(DataFlow::Node sink) {
+    exists(Crypto::KeyDerivationOperationInstance kdev |
+      sink = kdev.getIterationCountConsumer().getConsumer().getInputNode()
+    )
+  }
+
+  predicate isBarrierOut(DataFlow::Node node) {
+    node = any(Crypto::FlowAwareElement element).getInputNode()
+  }
+
+  predicate isBarrierIn(DataFlow::Node node) {
+    node = any(Crypto::FlowAwareElement element).getOutputNode()
+  }
+
+  predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
+    node1.(AdditionalFlowInputStep).getOutput() = node2
+    or
+    exists(MethodCall m |
+      m.getMethod().hasQualifiedName("java.lang", "String", "getBytes") and
+      node1.asExpr() = m.getQualifier() and
+      node2.asExpr() = m
+    )
+  }
+}
+
+module IterationCountFlow = TaintTracking::Global<IterationCountConfig>;
+
+import IterationCountFlow::PathGraph
+
+from
+  Crypto::KeyDerivationOperationNode op, Literal l, IterationCountFlow::PathNode srcNode,
+  IterationCountFlow::PathNode sinkNode
+where
+  op.getIterationCount().asElement() = l and
+  l.getValue().toInt() < 100000 and
+  srcNode.getNode().asExpr() = l and
+  sinkNode.getNode() = op.getIterationCountConsumer().getConsumer().getInputNode() and
+  IterationCountFlow::flowPath(srcNode, sinkNode)
+select sinkNode, srcNode, sinkNode,
+  "Key derivation operation configures iteration count below 100k: $@", l, l.getValue().toString()
diff --git a/java/ql/src/experimental/quantum/Examples/WeakKDFKeySize.ql b/java/ql/src/experimental/quantum/Examples/WeakKDFKeySize.ql
new file mode 100644
index 00000000000..3d0be43392f
--- /dev/null
+++ b/java/ql/src/experimental/quantum/Examples/WeakKDFKeySize.ql
@@ -0,0 +1,59 @@
+/**
+ * @name Weak known key derivation function output length
+ * @description Detects key derivation operations with a known weak output length
+ * @id java/quantum/examples/weak-kdf-key-size
+ * @kind path-problem
+ * @problem.severity error
+ * @tags quantum
+ *       experimental
+ */
+
+import java
+import experimental.quantum.Language
+
+module KeySizeConfig implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) {
+    source = any(Crypto::GenericSourceInstance i).getOutputNode() or
+    source = any(Crypto::ArtifactInstance artifact).getOutputNode()
+  }
+
+  predicate isSink(DataFlow::Node sink) {
+    exists(Crypto::KeyDerivationOperationInstance kdev |
+      sink = kdev.getKeySizeConsumer().getConsumer().getInputNode()
+    )
+  }
+
+  predicate isBarrierOut(DataFlow::Node node) {
+    node = any(Crypto::FlowAwareElement element).getInputNode()
+  }
+
+  predicate isBarrierIn(DataFlow::Node node) {
+    node = any(Crypto::FlowAwareElement element).getOutputNode()
+  }
+
+  predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
+    node1.(AdditionalFlowInputStep).getOutput() = node2
+    or
+    exists(MethodCall m |
+      m.getMethod().hasQualifiedName("java.lang", "String", "getBytes") and
+      node1.asExpr() = m.getQualifier() and
+      node2.asExpr() = m
+    )
+  }
+}
+
+module KeySizeFlow = TaintTracking::Global<KeySizeConfig>;
+
+import KeySizeFlow::PathGraph
+
+from
+  Crypto::KeyDerivationOperationNode op, Literal l, KeySizeFlow::PathNode srcNode,
+  KeySizeFlow::PathNode sinkNode
+where
+  op.getOutputKeySize().asElement() = l and
+  l.getValue().toInt() < 256 and
+  srcNode.getNode().asExpr() = l and
+  sinkNode.getNode() = op.getKeySizeConsumer().getConsumer().getInputNode() and
+  KeySizeFlow::flowPath(srcNode, sinkNode)
+select sinkNode, srcNode, sinkNode,
+  "Key derivation operation configures output key length below 256: $@", l, l.getValue().toString()
diff --git a/java/ql/src/experimental/quantum/Examples/WeakSymmetricCipher.ql b/java/ql/src/experimental/quantum/Examples/WeakSymmetricCipher.ql
new file mode 100644
index 00000000000..fe08599b660
--- /dev/null
+++ b/java/ql/src/experimental/quantum/Examples/WeakSymmetricCipher.ql
@@ -0,0 +1,16 @@
+/**
+ * @name Weak symmetric ciphers
+ * @description Finds uses of cryptographic symmetric cipher algorithms that are unapproved or otherwise weak.
+ * @id java/quantum/examples/weak-ciphers
+ * @kind problem
+ * @problem.severity error
+ * @tags external/cwe/cwe-327
+ *       quantum
+ *       experimental
+ */
+
+import WeakSymmetricCipher
+
+from Crypto::KeyOperationAlgorithmNode alg, string msg
+where isUnapprovedSymmetricCipher(alg, msg)
+select alg, msg
diff --git a/java/ql/src/experimental/quantum/Examples/WeakSymmetricCipher.qll b/java/ql/src/experimental/quantum/Examples/WeakSymmetricCipher.qll
new file mode 100644
index 00000000000..29493b24071
--- /dev/null
+++ b/java/ql/src/experimental/quantum/Examples/WeakSymmetricCipher.qll
@@ -0,0 +1,25 @@
+import experimental.quantum.Language
+import Crypto::KeyOpAlg as KeyOpAlg
+
+/**
+ * Holds when the given symmetric cipher algorithm is unapproved or weak.
+ */
+predicate isUnapprovedSymmetricCipher(Crypto::KeyOperationAlgorithmNode alg, string msg) {
+  exists(KeyOpAlg::AlgorithmType algType |
+    algType = alg.getAlgorithmType() and
+    msg = "Use of unapproved symmetric cipher algorithm or API: " + algType.toString() + "." and
+    algType != KeyOpAlg::TSymmetricCipher(KeyOpAlg::AES()) and
+    algType instanceof KeyOpAlg::TSymmetricCipher
+  )
+  // NOTE: an org could decide to disallow very specific algorithms as well, shown below
+  // (
+  //   algType = KeyOpAlg::TSymmetricCipher(KeyOpAlg::DES()) or
+  //   algType = KeyOpAlg::TSymmetricCipher(KeyOpAlg::TRIPLE_DES()) or
+  //   algType = KeyOpAlg::TSymmetricCipher(KeyOpAlg::DOUBLE_DES()) or
+  //   algType = KeyOpAlg::TSymmetricCipher(KeyOpAlg::RC2()) or
+  //   algType = KeyOpAlg::TSymmetricCipher(KeyOpAlg::RC4()) or
+  //   algType = KeyOpAlg::TSymmetricCipher(KeyOpAlg::IDEA()) or
+  //   algType = KeyOpAlg::TSymmetricCipher(KeyOpAlg::BLOWFISH()) or
+  //   algType = KeyOpAlg::TSymmetricCipher(KeyOpAlg::SKIPJACK())
+  // )
+}
diff --git a/java/ql/src/meta/ssa/AmbiguousToString.ql b/java/ql/src/meta/ssa/AmbiguousToString.ql
deleted file mode 100644
index 817685cf609..00000000000
--- a/java/ql/src/meta/ssa/AmbiguousToString.ql
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * @name An SSA variable without a unique 'toString()'
- * @description An ambiguous 'toString()' indicates overlap in the defining
- *              sub-classes of 'SsaVariable'.
- * @kind problem
- * @problem.severity error
- * @id java/consistency/non-unique-ssa-tostring
- * @tags consistency
- */
-
-import java
-import semmle.code.java.dataflow.SSA
-
-predicate noToString(SsaVariable v) { not exists(v.toString()) }
-
-predicate multipleToString(SsaVariable v) { 1 < count(v.toString()) }
-
-from SsaVariable ssa, ControlFlowNode n, Variable v, string problem
-where
-  (
-    noToString(ssa) and problem = "SSA variable without 'toString()' for "
-    or
-    multipleToString(ssa) and problem = "SSA variable with multiple 'toString()' results for "
-  ) and
-  n = ssa.getCfgNode() and
-  v = ssa.getSourceVariable().getVariable()
-select n, problem + v
diff --git a/java/ql/src/meta/ssa/TooFewPhiInputs.ql b/java/ql/src/meta/ssa/TooFewPhiInputs.ql
deleted file mode 100644
index 3bf75a91856..00000000000
--- a/java/ql/src/meta/ssa/TooFewPhiInputs.ql
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * @name A phi node without two or more inputs
- * @description A phi node should have at least two inputs.
- * @kind problem
- * @problem.severity error
- * @id java/consistency/too-few-phi-inputs
- * @tags consistency
- */
-
-import java
-import semmle.code.java.dataflow.SSA
-
-from SsaPhiNode phi, int inputs
-where
-  inputs = count(SsaVariable v | v = phi.getAPhiInput()) and
-  inputs < 2
-select phi, "Phi node for " + phi.getSourceVariable() + " has only " + inputs + " inputs."
diff --git a/java/ql/src/meta/ssa/UncertainDefWithoutPrior.ql b/java/ql/src/meta/ssa/UncertainDefWithoutPrior.ql
deleted file mode 100644
index 1979c218ac2..00000000000
--- a/java/ql/src/meta/ssa/UncertainDefWithoutPrior.ql
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * @name An uncertain SSA update without a prior definition
- * @description An uncertain SSA update may retain its previous value
- *              and should therefore have a prior definition.
- * @kind problem
- * @problem.severity error
- * @id java/consistency/uncertain-ssa-update-without-prior-def
- * @tags consistency
- */
-
-import java
-import semmle.code.java.dataflow.SSA
-
-predicate live(SsaVariable v) {
-  exists(v.getAUse())
-  or
-  exists(SsaPhiNode phi | live(phi) and phi.getAPhiInput() = v)
-  or
-  exists(SsaUncertainImplicitUpdate upd | live(upd) and upd.getPriorDef() = v)
-}
-
-from SsaUncertainImplicitUpdate upd
-where
-  live(upd) and
-  not exists(upd.getPriorDef())
-select upd, "No prior definition of " + upd
diff --git a/java/ql/src/meta/ssa/UseWithoutUniqueSsaVariable.ql b/java/ql/src/meta/ssa/UseWithoutUniqueSsaVariable.ql
deleted file mode 100644
index 76f6ee37fb1..00000000000
--- a/java/ql/src/meta/ssa/UseWithoutUniqueSsaVariable.ql
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * @name A variable use without a unique SSA variable
- * @description Every variable use that is sufficiently trackable
- *              should have a unique associated SSA variable.
- * @kind problem
- * @problem.severity error
- * @id java/consistency/use-without-unique-ssa-variable
- * @tags consistency
- */
-
-import java
-import semmle.code.java.dataflow.SSA
-
-class SsaConvertibleReadAccess extends VarRead {
-  SsaConvertibleReadAccess() {
-    this.getEnclosingCallable().getBody().getBasicBlock().getASuccessor*() = this.getBasicBlock() and
-    (
-      not exists(this.getQualifier())
-      or
-      this.getVariable() instanceof LocalScopeVariable
-      or
-      this.getVariable().(Field).isStatic()
-      or
-      exists(Expr q | q = this.getQualifier() |
-        q instanceof ThisAccess or
-        q instanceof SuperAccess or
-        q instanceof SsaConvertibleReadAccess
-      )
-    )
-  }
-}
-
-predicate accessWithoutSourceVariable(SsaConvertibleReadAccess va) {
-  not exists(SsaSourceVariable v | v.getAnAccess() = va)
-}
-
-predicate readAccessWithoutSsaVariable(SsaConvertibleReadAccess va) {
-  not exists(SsaVariable v | v.getAUse() = va)
-}
-
-predicate readAccessWithAmbiguousSsaVariable(SsaConvertibleReadAccess va) {
-  1 < strictcount(SsaVariable v | v.getAUse() = va)
-}
-
-from SsaConvertibleReadAccess va, string problem
-where
-  accessWithoutSourceVariable(va) and problem = "No source variable"
-  or
-  readAccessWithoutSsaVariable(va) and problem = "No SSA variable"
-  or
-  readAccessWithAmbiguousSsaVariable(va) and problem = "Multiple SSA variables"
-select va, problem
diff --git a/java/ql/src/qlpack.yml b/java/ql/src/qlpack.yml
index aa899419ad9..98f0bdd5710 100644
--- a/java/ql/src/qlpack.yml
+++ b/java/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/java-queries
-version: 1.6.3-dev
+version: 1.9.1-dev
 groups:
   - java
   - queries
diff --git a/java/ql/src/utils/flowtestcasegenerator/FlowTestCase.qll b/java/ql/src/utils/flowtestcasegenerator/FlowTestCase.qll
index af0f501621a..5ab1584f866 100644
--- a/java/ql/src/utils/flowtestcasegenerator/FlowTestCase.qll
+++ b/java/ql/src/utils/flowtestcasegenerator/FlowTestCase.qll
@@ -253,7 +253,7 @@ class TestCase extends TTestCase {
 
   /**
    * Returns a call to `source()` wrapped in `newWith` methods as needed according to `input`.
-   * For example, if the input specification is `ArrayElement of MapValue of Argument[0]`, this
+   * For example, if the `stack` is `Argument[0].MapValue.ArrayElement`, this
    * will return `newWithMapValue(newWithArrayElement(source()))`.
    */
   string getInput(SummaryComponentStack stack) {
@@ -269,7 +269,7 @@ class TestCase extends TTestCase {
 
   /**
    * Returns `out` wrapped in `get` methods as needed according to `output`.
-   * For example, if the output specification is `ArrayElement of MapValue of Argument[0]`, this
+   * For example, if the `componentStack` is `Argument[0].MapValue.ArrayElement`, this
    * will return `getArrayElement(getMapValue(out))`.
    */
   string getOutput(SummaryComponentStack componentStack) {
diff --git a/java/ql/test-kotlin1/library-tests/java-kotlin-collection-type-generic-methods/test.expected b/java/ql/test-kotlin1/library-tests/java-kotlin-collection-type-generic-methods/test.expected
index b901340b964..a56980d10ac 100644
--- a/java/ql/test-kotlin1/library-tests/java-kotlin-collection-type-generic-methods/test.expected
+++ b/java/ql/test-kotlin1/library-tests/java-kotlin-collection-type-generic-methods/test.expected
@@ -16,30 +16,6 @@ methodWithDuplicate
 | AbstractCollection<E> | removeAll | Collection<?> |
 | AbstractCollection<E> | retainAll | Collection<?> |
 | AbstractCollection<E> | toArray | T[] |
-| AbstractCollection<Entry<K,V>> | add | Entry<K,V> |
-| AbstractCollection<Entry<K,V>> | addAll | Collection<? extends Entry<K,V>> |
-| AbstractCollection<Entry<K,V>> | contains | Object |
-| AbstractCollection<Entry<K,V>> | containsAll | Collection<?> |
-| AbstractCollection<Entry<K,V>> | remove | Object |
-| AbstractCollection<Entry<K,V>> | removeAll | Collection<?> |
-| AbstractCollection<Entry<K,V>> | retainAll | Collection<?> |
-| AbstractCollection<Entry<K,V>> | toArray | T[] |
-| AbstractCollection<K> | add | K |
-| AbstractCollection<K> | addAll | Collection<? extends K> |
-| AbstractCollection<K> | contains | Object |
-| AbstractCollection<K> | containsAll | Collection<?> |
-| AbstractCollection<K> | remove | Object |
-| AbstractCollection<K> | removeAll | Collection<?> |
-| AbstractCollection<K> | retainAll | Collection<?> |
-| AbstractCollection<K> | toArray | T[] |
-| AbstractCollection<Runnable> | add | Runnable |
-| AbstractCollection<Runnable> | addAll | Collection<? extends Runnable> |
-| AbstractCollection<Runnable> | contains | Object |
-| AbstractCollection<Runnable> | containsAll | Collection<?> |
-| AbstractCollection<Runnable> | remove | Object |
-| AbstractCollection<Runnable> | removeAll | Collection<?> |
-| AbstractCollection<Runnable> | retainAll | Collection<?> |
-| AbstractCollection<Runnable> | toArray | T[] |
 | AbstractCollection<String> | add | String |
 | AbstractCollection<String> | addAll | Collection<? extends String> |
 | AbstractCollection<String> | contains | Object |
@@ -56,14 +32,6 @@ methodWithDuplicate
 | AbstractCollection<T> | removeAll | Collection<?> |
 | AbstractCollection<T> | retainAll | Collection<?> |
 | AbstractCollection<T> | toArray | T[] |
-| AbstractCollection<V> | add | V |
-| AbstractCollection<V> | addAll | Collection<? extends V> |
-| AbstractCollection<V> | contains | Object |
-| AbstractCollection<V> | containsAll | Collection<?> |
-| AbstractCollection<V> | remove | Object |
-| AbstractCollection<V> | removeAll | Collection<?> |
-| AbstractCollection<V> | retainAll | Collection<?> |
-| AbstractCollection<V> | toArray | T[] |
 | AbstractList | add | E |
 | AbstractList | add | int |
 | AbstractList | addAll | Collection<? extends E> |
@@ -103,14 +71,14 @@ methodWithDuplicate
 | AbstractMap | put | V |
 | AbstractMap | putAll | Map<? extends K,? extends V> |
 | AbstractMap | remove | Object |
-| AbstractMap<Identity,Entry<?>> | containsKey | Object |
-| AbstractMap<Identity,Entry<?>> | containsValue | Object |
-| AbstractMap<Identity,Entry<?>> | equals | Object |
-| AbstractMap<Identity,Entry<?>> | get | Object |
-| AbstractMap<Identity,Entry<?>> | put | Entry<?> |
-| AbstractMap<Identity,Entry<?>> | put | Identity |
-| AbstractMap<Identity,Entry<?>> | putAll | Map<? extends Identity,? extends Entry<?>> |
-| AbstractMap<Identity,Entry<?>> | remove | Object |
+| AbstractMap<Identity,Object> | containsKey | Object |
+| AbstractMap<Identity,Object> | containsValue | Object |
+| AbstractMap<Identity,Object> | equals | Object |
+| AbstractMap<Identity,Object> | get | Object |
+| AbstractMap<Identity,Object> | put | Identity |
+| AbstractMap<Identity,Object> | put | Object |
+| AbstractMap<Identity,Object> | putAll | Map<? extends Identity,? extends Object> |
+| AbstractMap<Identity,Object> | remove | Object |
 | AbstractMap<K,V> | containsKey | Object |
 | AbstractMap<K,V> | containsValue | Object |
 | AbstractMap<K,V> | equals | Object |
@@ -179,17 +147,6 @@ methodWithDuplicate
 | Collection<K> | retainAll | Collection<?> |
 | Collection<K> | toArray | IntFunction<T[]> |
 | Collection<K> | toArray | T[] |
-| Collection<Runnable> | add | Runnable |
-| Collection<Runnable> | addAll | Collection<? extends Runnable> |
-| Collection<Runnable> | contains | Object |
-| Collection<Runnable> | containsAll | Collection<?> |
-| Collection<Runnable> | equals | Object |
-| Collection<Runnable> | remove | Object |
-| Collection<Runnable> | removeAll | Collection<?> |
-| Collection<Runnable> | removeIf | Predicate<? super Runnable> |
-| Collection<Runnable> | retainAll | Collection<?> |
-| Collection<Runnable> | toArray | IntFunction<T[]> |
-| Collection<Runnable> | toArray | T[] |
 | Collection<String> | add | String |
 | Collection<String> | addAll | Collection<? extends String> |
 | Collection<String> | contains | Object |
@@ -332,37 +289,36 @@ methodWithDuplicate
 | Map | replace | K |
 | Map | replace | V |
 | Map | replaceAll | BiFunction<? super K,? super V,? extends V> |
-| Map<Identity,Entry<?>> | compute | BiFunction<? super Identity,? super Entry<?>,? extends Entry<?>> |
-| Map<Identity,Entry<?>> | compute | Identity |
-| Map<Identity,Entry<?>> | computeIfAbsent | Function<? super Identity,? extends Entry<?>> |
-| Map<Identity,Entry<?>> | computeIfAbsent | Identity |
-| Map<Identity,Entry<?>> | computeIfPresent | BiFunction<? super Identity,? super Entry<?>,? extends Entry<?>> |
-| Map<Identity,Entry<?>> | computeIfPresent | Identity |
-| Map<Identity,Entry<?>> | containsKey | Object |
-| Map<Identity,Entry<?>> | containsValue | Object |
-| Map<Identity,Entry<?>> | copyOf | Map<? extends K,? extends V> |
-| Map<Identity,Entry<?>> | entry | K |
-| Map<Identity,Entry<?>> | entry | V |
-| Map<Identity,Entry<?>> | equals | Object |
-| Map<Identity,Entry<?>> | forEach | BiConsumer<? super Identity,? super Entry<?>> |
-| Map<Identity,Entry<?>> | get | Object |
-| Map<Identity,Entry<?>> | getOrDefault | Entry<?> |
-| Map<Identity,Entry<?>> | getOrDefault | Object |
-| Map<Identity,Entry<?>> | merge | BiFunction<? super Entry<?>,? super Entry<?>,? extends Entry<?>> |
-| Map<Identity,Entry<?>> | merge | Entry<?> |
-| Map<Identity,Entry<?>> | merge | Identity |
-| Map<Identity,Entry<?>> | of | K |
-| Map<Identity,Entry<?>> | of | V |
-| Map<Identity,Entry<?>> | ofEntries | Entry<? extends K,? extends V>[] |
-| Map<Identity,Entry<?>> | put | Entry<?> |
-| Map<Identity,Entry<?>> | put | Identity |
-| Map<Identity,Entry<?>> | putAll | Map<? extends Identity,? extends Entry<?>> |
-| Map<Identity,Entry<?>> | putIfAbsent | Entry<?> |
-| Map<Identity,Entry<?>> | putIfAbsent | Identity |
-| Map<Identity,Entry<?>> | remove | Object |
-| Map<Identity,Entry<?>> | replace | Entry<?> |
-| Map<Identity,Entry<?>> | replace | Identity |
-| Map<Identity,Entry<?>> | replaceAll | BiFunction<? super Identity,? super Entry<?>,? extends Entry<?>> |
+| Map<Identity,Object> | compute | BiFunction<? super Identity,? super Object,? extends Object> |
+| Map<Identity,Object> | compute | Identity |
+| Map<Identity,Object> | computeIfAbsent | Function<? super Identity,? extends Object> |
+| Map<Identity,Object> | computeIfAbsent | Identity |
+| Map<Identity,Object> | computeIfPresent | BiFunction<? super Identity,? super Object,? extends Object> |
+| Map<Identity,Object> | computeIfPresent | Identity |
+| Map<Identity,Object> | containsKey | Object |
+| Map<Identity,Object> | containsValue | Object |
+| Map<Identity,Object> | copyOf | Map<? extends K,? extends V> |
+| Map<Identity,Object> | entry | K |
+| Map<Identity,Object> | entry | V |
+| Map<Identity,Object> | equals | Object |
+| Map<Identity,Object> | forEach | BiConsumer<? super Identity,? super Object> |
+| Map<Identity,Object> | get | Object |
+| Map<Identity,Object> | getOrDefault | Object |
+| Map<Identity,Object> | merge | BiFunction<? super Object,? super Object,? extends Object> |
+| Map<Identity,Object> | merge | Identity |
+| Map<Identity,Object> | merge | Object |
+| Map<Identity,Object> | of | K |
+| Map<Identity,Object> | of | V |
+| Map<Identity,Object> | ofEntries | Entry<? extends K,? extends V>[] |
+| Map<Identity,Object> | put | Identity |
+| Map<Identity,Object> | put | Object |
+| Map<Identity,Object> | putAll | Map<? extends Identity,? extends Object> |
+| Map<Identity,Object> | putIfAbsent | Identity |
+| Map<Identity,Object> | putIfAbsent | Object |
+| Map<Identity,Object> | remove | Object |
+| Map<Identity,Object> | replace | Identity |
+| Map<Identity,Object> | replace | Object |
+| Map<Identity,Object> | replaceAll | BiFunction<? super Identity,? super Object,? extends Object> |
 | Map<K,V> | compute | BiFunction<? super K,? super V,? extends V> |
 | Map<K,V> | compute | K |
 | Map<K,V> | computeIfAbsent | Function<? super K,? extends V> |
diff --git a/java/ql/test-kotlin1/library-tests/reflection/reflection.expected b/java/ql/test-kotlin1/library-tests/reflection/reflection.expected
index 7ce456cdcbb..3bc2f9ce67d 100644
--- a/java/ql/test-kotlin1/library-tests/reflection/reflection.expected
+++ b/java/ql/test-kotlin1/library-tests/reflection/reflection.expected
@@ -289,6 +289,7 @@ compGenerated
 | file://<external>/LongProgression.class:0:0:0:0 | spliterator | Forwarder for a Kotlin class inheriting an interface default method |
 | file://<external>/LongRange.class:0:0:0:0 | forEach | Forwarder for a Kotlin class inheriting an interface default method |
 | file://<external>/LongRange.class:0:0:0:0 | spliterator | Forwarder for a Kotlin class inheriting an interface default method |
+| file://<external>/String.class:0:0:0:0 | getChars | Forwarder for a Kotlin class inheriting an interface default method |
 | file://<external>/String.class:0:0:0:0 | isEmpty | Forwarder for a Kotlin class inheriting an interface default method |
 | reflection.kt:7:49:7:54 | new Function2<Ccc,Integer,Double>(...) { ... } | The class around a local function, a lambda, or a function reference |
 | reflection.kt:10:38:10:42 | new KProperty1<C,Integer>(...) { ... } | The class around a local function, a lambda, or a function reference |
diff --git a/java/ql/test-kotlin2/library-tests/java-kotlin-collection-type-generic-methods/test.expected b/java/ql/test-kotlin2/library-tests/java-kotlin-collection-type-generic-methods/test.expected
index 03e86e2d2a1..2495c1fc157 100644
--- a/java/ql/test-kotlin2/library-tests/java-kotlin-collection-type-generic-methods/test.expected
+++ b/java/ql/test-kotlin2/library-tests/java-kotlin-collection-type-generic-methods/test.expected
@@ -16,30 +16,6 @@ methodWithDuplicate
 | AbstractCollection<E> | removeAll | Collection<?> |
 | AbstractCollection<E> | retainAll | Collection<?> |
 | AbstractCollection<E> | toArray | T[] |
-| AbstractCollection<Entry<K,V>> | add | Entry<K,V> |
-| AbstractCollection<Entry<K,V>> | addAll | Collection<? extends Entry<K,V>> |
-| AbstractCollection<Entry<K,V>> | contains | Object |
-| AbstractCollection<Entry<K,V>> | containsAll | Collection<?> |
-| AbstractCollection<Entry<K,V>> | remove | Object |
-| AbstractCollection<Entry<K,V>> | removeAll | Collection<?> |
-| AbstractCollection<Entry<K,V>> | retainAll | Collection<?> |
-| AbstractCollection<Entry<K,V>> | toArray | T[] |
-| AbstractCollection<K> | add | K |
-| AbstractCollection<K> | addAll | Collection<? extends K> |
-| AbstractCollection<K> | contains | Object |
-| AbstractCollection<K> | containsAll | Collection<?> |
-| AbstractCollection<K> | remove | Object |
-| AbstractCollection<K> | removeAll | Collection<?> |
-| AbstractCollection<K> | retainAll | Collection<?> |
-| AbstractCollection<K> | toArray | T[] |
-| AbstractCollection<Runnable> | add | Runnable |
-| AbstractCollection<Runnable> | addAll | Collection<? extends Runnable> |
-| AbstractCollection<Runnable> | contains | Object |
-| AbstractCollection<Runnable> | containsAll | Collection<?> |
-| AbstractCollection<Runnable> | remove | Object |
-| AbstractCollection<Runnable> | removeAll | Collection<?> |
-| AbstractCollection<Runnable> | retainAll | Collection<?> |
-| AbstractCollection<Runnable> | toArray | T[] |
 | AbstractCollection<String> | add | String |
 | AbstractCollection<String> | addAll | Collection<? extends String> |
 | AbstractCollection<String> | contains | Object |
@@ -56,14 +32,6 @@ methodWithDuplicate
 | AbstractCollection<T> | removeAll | Collection<?> |
 | AbstractCollection<T> | retainAll | Collection<?> |
 | AbstractCollection<T> | toArray | T[] |
-| AbstractCollection<V> | add | V |
-| AbstractCollection<V> | addAll | Collection<? extends V> |
-| AbstractCollection<V> | contains | Object |
-| AbstractCollection<V> | containsAll | Collection<?> |
-| AbstractCollection<V> | remove | Object |
-| AbstractCollection<V> | removeAll | Collection<?> |
-| AbstractCollection<V> | retainAll | Collection<?> |
-| AbstractCollection<V> | toArray | T[] |
 | AbstractList | add | E |
 | AbstractList | add | int |
 | AbstractList | addAll | Collection<? extends E> |
@@ -103,14 +71,14 @@ methodWithDuplicate
 | AbstractMap | put | V |
 | AbstractMap | putAll | Map<? extends K,? extends V> |
 | AbstractMap | remove | Object |
-| AbstractMap<Identity,Entry<?>> | containsKey | Object |
-| AbstractMap<Identity,Entry<?>> | containsValue | Object |
-| AbstractMap<Identity,Entry<?>> | equals | Object |
-| AbstractMap<Identity,Entry<?>> | get | Object |
-| AbstractMap<Identity,Entry<?>> | put | Entry<?> |
-| AbstractMap<Identity,Entry<?>> | put | Identity |
-| AbstractMap<Identity,Entry<?>> | putAll | Map<? extends Identity,? extends Entry<?>> |
-| AbstractMap<Identity,Entry<?>> | remove | Object |
+| AbstractMap<Identity,Object> | containsKey | Object |
+| AbstractMap<Identity,Object> | containsValue | Object |
+| AbstractMap<Identity,Object> | equals | Object |
+| AbstractMap<Identity,Object> | get | Object |
+| AbstractMap<Identity,Object> | put | Identity |
+| AbstractMap<Identity,Object> | put | Object |
+| AbstractMap<Identity,Object> | putAll | Map<? extends Identity,? extends Object> |
+| AbstractMap<Identity,Object> | remove | Object |
 | AbstractMap<K,V> | containsKey | Object |
 | AbstractMap<K,V> | containsValue | Object |
 | AbstractMap<K,V> | equals | Object |
@@ -176,16 +144,6 @@ methodWithDuplicate
 | Collection<K> | retainAll | Collection<?> |
 | Collection<K> | toArray | IntFunction<T[]> |
 | Collection<K> | toArray | T[] |
-| Collection<Runnable> | add | Runnable |
-| Collection<Runnable> | addAll | Collection<? extends Runnable> |
-| Collection<Runnable> | contains | Object |
-| Collection<Runnable> | containsAll | Collection<?> |
-| Collection<Runnable> | remove | Object |
-| Collection<Runnable> | removeAll | Collection<?> |
-| Collection<Runnable> | removeIf | Predicate<? super Runnable> |
-| Collection<Runnable> | retainAll | Collection<?> |
-| Collection<Runnable> | toArray | IntFunction<T[]> |
-| Collection<Runnable> | toArray | T[] |
 | Collection<String> | add | String |
 | Collection<String> | addAll | Collection<? extends String> |
 | Collection<String> | contains | Object |
@@ -325,36 +283,35 @@ methodWithDuplicate
 | Map | replace | K |
 | Map | replace | V |
 | Map | replaceAll | BiFunction<? super K,? super V,? extends V> |
-| Map<Identity,Entry<?>> | compute | BiFunction<? super Identity,? super Entry<?>,? extends Entry<?>> |
-| Map<Identity,Entry<?>> | compute | Identity |
-| Map<Identity,Entry<?>> | computeIfAbsent | Function<? super Identity,? extends Entry<?>> |
-| Map<Identity,Entry<?>> | computeIfAbsent | Identity |
-| Map<Identity,Entry<?>> | computeIfPresent | BiFunction<? super Identity,? super Entry<?>,? extends Entry<?>> |
-| Map<Identity,Entry<?>> | computeIfPresent | Identity |
-| Map<Identity,Entry<?>> | containsKey | Object |
-| Map<Identity,Entry<?>> | containsValue | Object |
-| Map<Identity,Entry<?>> | copyOf | Map<? extends K,? extends V> |
-| Map<Identity,Entry<?>> | entry | K |
-| Map<Identity,Entry<?>> | entry | V |
-| Map<Identity,Entry<?>> | forEach | BiConsumer<? super Identity,? super Entry<?>> |
-| Map<Identity,Entry<?>> | get | Object |
-| Map<Identity,Entry<?>> | getOrDefault | Entry<?> |
-| Map<Identity,Entry<?>> | getOrDefault | Object |
-| Map<Identity,Entry<?>> | merge | BiFunction<? super Entry<?>,? super Entry<?>,? extends Entry<?>> |
-| Map<Identity,Entry<?>> | merge | Entry<?> |
-| Map<Identity,Entry<?>> | merge | Identity |
-| Map<Identity,Entry<?>> | of | K |
-| Map<Identity,Entry<?>> | of | V |
-| Map<Identity,Entry<?>> | ofEntries | Entry<? extends K,? extends V>[] |
-| Map<Identity,Entry<?>> | put | Entry<?> |
-| Map<Identity,Entry<?>> | put | Identity |
-| Map<Identity,Entry<?>> | putAll | Map<? extends Identity,? extends Entry<?>> |
-| Map<Identity,Entry<?>> | putIfAbsent | Entry<?> |
-| Map<Identity,Entry<?>> | putIfAbsent | Identity |
-| Map<Identity,Entry<?>> | remove | Object |
-| Map<Identity,Entry<?>> | replace | Entry<?> |
-| Map<Identity,Entry<?>> | replace | Identity |
-| Map<Identity,Entry<?>> | replaceAll | BiFunction<? super Identity,? super Entry<?>,? extends Entry<?>> |
+| Map<Identity,Object> | compute | BiFunction<? super Identity,? super Object,? extends Object> |
+| Map<Identity,Object> | compute | Identity |
+| Map<Identity,Object> | computeIfAbsent | Function<? super Identity,? extends Object> |
+| Map<Identity,Object> | computeIfAbsent | Identity |
+| Map<Identity,Object> | computeIfPresent | BiFunction<? super Identity,? super Object,? extends Object> |
+| Map<Identity,Object> | computeIfPresent | Identity |
+| Map<Identity,Object> | containsKey | Object |
+| Map<Identity,Object> | containsValue | Object |
+| Map<Identity,Object> | copyOf | Map<? extends K,? extends V> |
+| Map<Identity,Object> | entry | K |
+| Map<Identity,Object> | entry | V |
+| Map<Identity,Object> | forEach | BiConsumer<? super Identity,? super Object> |
+| Map<Identity,Object> | get | Object |
+| Map<Identity,Object> | getOrDefault | Object |
+| Map<Identity,Object> | merge | BiFunction<? super Object,? super Object,? extends Object> |
+| Map<Identity,Object> | merge | Identity |
+| Map<Identity,Object> | merge | Object |
+| Map<Identity,Object> | of | K |
+| Map<Identity,Object> | of | V |
+| Map<Identity,Object> | ofEntries | Entry<? extends K,? extends V>[] |
+| Map<Identity,Object> | put | Identity |
+| Map<Identity,Object> | put | Object |
+| Map<Identity,Object> | putAll | Map<? extends Identity,? extends Object> |
+| Map<Identity,Object> | putIfAbsent | Identity |
+| Map<Identity,Object> | putIfAbsent | Object |
+| Map<Identity,Object> | remove | Object |
+| Map<Identity,Object> | replace | Identity |
+| Map<Identity,Object> | replace | Object |
+| Map<Identity,Object> | replaceAll | BiFunction<? super Identity,? super Object,? extends Object> |
 | Map<K,V> | compute | BiFunction<? super K,? super V,? extends V> |
 | Map<K,V> | compute | K |
 | Map<K,V> | computeIfAbsent | Function<? super K,? extends V> |
diff --git a/java/ql/test-kotlin2/library-tests/nested_types/test.kt b/java/ql/test-kotlin2/library-tests/nested_types/test.kt
new file mode 100644
index 00000000000..7d5e2280b92
--- /dev/null
+++ b/java/ql/test-kotlin2/library-tests/nested_types/test.kt
@@ -0,0 +1,16 @@
+
+import java.util.Stack;
+
+// Diagnostic Matches: %Making use of Stack a raw type to avoid infinite recursion%
+
+class MyType
+
+fun foo1(x: List<List<List<List<MyType>>>>) { }
+
+fun foo2(x: Stack<Stack<Stack<Stack<MyType>>>>) { }
+
+class MkT<T> { }
+
+fun foo3(x: MkT<MkT<MkT<MkT<MyType>>>>) { }
+
+
diff --git a/java/ql/test-kotlin2/library-tests/nested_types/types.expected b/java/ql/test-kotlin2/library-tests/nested_types/types.expected
new file mode 100644
index 00000000000..ec2e407b8b7
--- /dev/null
+++ b/java/ql/test-kotlin2/library-tests/nested_types/types.expected
@@ -0,0 +1,13 @@
+| file:///!unknown-binary-location/MkT.class:0:0:0:0 | MkT<MkT<MkT<MkT<MyType>>>> |
+| file:///!unknown-binary-location/MkT.class:0:0:0:0 | MkT<MkT<MkT<MyType>>> |
+| file:///!unknown-binary-location/MkT.class:0:0:0:0 | MkT<MkT<MyType>> |
+| file:///!unknown-binary-location/MkT.class:0:0:0:0 | MkT<MyType> |
+| file:///modules/java.base/java/util/List.class:0:0:0:0 | List<? extends List<? extends List<? extends List<MyType>>>> |
+| file:///modules/java.base/java/util/List.class:0:0:0:0 | List<? extends List<? extends List<MyType>>> |
+| file:///modules/java.base/java/util/List.class:0:0:0:0 | List<? extends List<MyType>> |
+| file:///modules/java.base/java/util/List.class:0:0:0:0 | List<MyType> |
+| file:///modules/java.base/java/util/List.class:0:0:0:0 | List<Stack<MyType>> |
+| file:///modules/java.base/java/util/Stack.class:0:0:0:0 | Stack<MyType> |
+| file:///modules/java.base/java/util/Stack.class:0:0:0:0 | Stack<Stack<MyType>> |
+| file:///modules/java.base/java/util/Stack.class:0:0:0:0 | Stack<Stack<Stack<MyType>>> |
+| file:///modules/java.base/java/util/Stack.class:0:0:0:0 | Stack<Stack<Stack<Stack<MyType>>>> |
diff --git a/java/ql/test-kotlin2/library-tests/nested_types/types.ql b/java/ql/test-kotlin2/library-tests/nested_types/types.ql
new file mode 100644
index 00000000000..3499ae037c7
--- /dev/null
+++ b/java/ql/test-kotlin2/library-tests/nested_types/types.ql
@@ -0,0 +1,7 @@
+import java
+
+from Type t
+where
+  t.getName().matches("%MyType%") and
+  t.getName().matches(["List<%", "Stack<%", "MkT<%"])
+select t
diff --git a/java/ql/test-kotlin2/library-tests/reflection/reflection.expected b/java/ql/test-kotlin2/library-tests/reflection/reflection.expected
index 4074866da65..b5de2b1adea 100644
--- a/java/ql/test-kotlin2/library-tests/reflection/reflection.expected
+++ b/java/ql/test-kotlin2/library-tests/reflection/reflection.expected
@@ -329,6 +329,7 @@ compGenerated
 | file://<external>/SignStyle.class:0:0:0:0 | getEntries | Default property accessor |
 | file://<external>/StackWalker$ExtendedOption.class:0:0:0:0 | getEntries | Default property accessor |
 | file://<external>/StackWalker$Option.class:0:0:0:0 | getEntries | Default property accessor |
+| file://<external>/String.class:0:0:0:0 | getChars | Forwarder for a Kotlin class inheriting an interface default method |
 | file://<external>/String.class:0:0:0:0 | isEmpty | Forwarder for a Kotlin class inheriting an interface default method |
 | file://<external>/TextStyle.class:0:0:0:0 | getEntries | Default property accessor |
 | file://<external>/Thread$State.class:0:0:0:0 | getEntries | Default property accessor |
diff --git a/java/ql/test/experimental/library-tests/quantum/jca/AesWrapAndPBEWith.java b/java/ql/test/experimental/library-tests/quantum/jca/AesWrapAndPBEWith.java
new file mode 100644
index 00000000000..775f02280b5
--- /dev/null
+++ b/java/ql/test/experimental/library-tests/quantum/jca/AesWrapAndPBEWith.java
@@ -0,0 +1,226 @@
+package com.example.crypto.algorithms;
+
+//import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import java.security.*;
+import javax.crypto.Cipher;
+import javax.crypto.KeyGenerator;
+import javax.crypto.SecretKey;
+import javax.crypto.SecretKeyFactory;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.PBEKeySpec;
+import javax.crypto.spec.SecretKeySpec;
+import java.security.SecureRandom;
+import java.util.Arrays;
+import java.util.Base64;
+
+/**
+ * AesWrapAndPBEWithTest demonstrates key wrapping and password-based encryption
+ * using various transformations.
+ *
+ * This file includes:
+ *
+ * 1. AESWrap Examples: - secureAESWrap(): Uses a randomly generated wrapping
+ * key. - insecureAESWrap(): Uses a fixed, hard-coded wrapping key.
+ *
+ * 2. PBEWith Examples: - insecurePBEExample(): Uses the legacy
+ * PBEWithMD5AndDES. - securePBEExample(): Uses PBKDF2WithHmacSHA256. -
+ * additionalPBEExample(): Uses PBEWithSHA256And128BitAES-CBC-BC. -
+ * additionalPBEExample2(): Uses PBEWithSHA1And128BitAES-CBC-BC.
+ *
+ * 3. Dynamic PBE Encryption: - dynamicPBEEncryption(): Chooses the PBE
+ * transformation based on a configuration string.
+ *
+ * Best Practices: - Use secure random keys and salts. - Avoid legacy algorithms
+ * like PBEWithMD5AndDES. - Prefer modern KDFs (PBKDF2WithHmacSHA256) and secure
+ * provider-specific PBE transformations.
+ *
+ * SAST/CBOM Notes: - Insecure examples (PBEWithMD5AndDES, fixed keys) should be
+ * flagged. - Secure examples use random salt, high iteration counts, and strong
+ * algorithms.
+ */
+public class AesWrapAndPBEWith {
+
+    // static {
+    //     // Register BouncyCastle as a provider.
+    //     Security.addProvider(new BouncyCastleProvider());
+    // }
+    // ===========================
+    // 1. AESWrap Examples
+    // ===========================
+    /**
+     * Secure AES key wrapping. Generates a random 256-bit wrapping key to wrap
+     * a target AES key.
+     *
+     * @return The wrapped key (Base64-encoded).
+     * @throws Exception if an error occurs.
+     */
+    public String secureAESWrap() throws Exception {
+        KeyGenerator kg = KeyGenerator.getInstance("AES");
+        kg.init(256, new SecureRandom());
+        SecretKey wrappingKey = kg.generateKey();
+
+        kg.init(128, new SecureRandom());
+        SecretKey targetKey = kg.generateKey();
+
+        Cipher cipher = Cipher.getInstance("AESWrap");
+        cipher.init(Cipher.WRAP_MODE, wrappingKey);
+        byte[] wrappedKey = cipher.wrap(targetKey);
+
+        return Base64.getEncoder().encodeToString(wrappedKey);
+    }
+
+    /**
+     * Insecure AES key wrapping. Uses a fixed (hard-coded) wrapping key.
+     *
+     * @return The wrapped key (Base64-encoded).
+     * @throws Exception if an error occurs.
+     */
+    public String insecureAESWrap() throws Exception {
+        byte[] fixedKeyBytes = new byte[32];
+        Arrays.fill(fixedKeyBytes, (byte) 0x01);
+        SecretKey wrappingKey = new SecretKeySpec(fixedKeyBytes, "AES");
+
+        KeyGenerator kg = KeyGenerator.getInstance("AES");
+        kg.init(128, new SecureRandom());
+        SecretKey targetKey = kg.generateKey();
+
+        Cipher cipher = Cipher.getInstance("AESWrap");
+        cipher.init(Cipher.WRAP_MODE, wrappingKey);
+        byte[] wrappedKey = cipher.wrap(targetKey);
+
+        return Base64.getEncoder().encodeToString(wrappedKey);
+    }
+
+    // ===========================
+    // 2. PBEWith Examples
+    // ===========================
+    /**
+     * Insecure PBE example using PBEWithMD5AndDES.
+     *
+     * @param password The input password.
+     * @return The derived key (Base64-encoded).
+     * @throws Exception if key derivation fails.
+     */
+    public String insecurePBEExample(String password) throws Exception {
+        byte[] salt = new byte[8];
+        Arrays.fill(salt, (byte) 0x00); // Fixed salt (insecure)
+        PBEKeySpec spec = new PBEKeySpec(password.toCharArray(), salt, 1000, 64);
+        SecretKeyFactory factory = SecretKeyFactory.getInstance("PBEWithMD5AndDES");
+        byte[] keyBytes = factory.generateSecret(spec).getEncoded();
+        return Base64.getEncoder().encodeToString(keyBytes);
+    }
+
+    /**
+     * Secure PBE example using PBKDF2WithHmacSHA256.
+     *
+     * @param password The input password.
+     * @return The derived 256-bit AES key (Base64-encoded).
+     * @throws Exception if key derivation fails.
+     */
+    public String securePBEExample(String password) throws Exception {
+        byte[] salt = new byte[16];
+        new SecureRandom().nextBytes(salt);
+        PBEKeySpec spec = new PBEKeySpec(password.toCharArray(), salt, 10000, 256);
+        SecretKeyFactory factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256");
+        byte[] keyBytes = factory.generateSecret(spec).getEncoded();
+        SecretKey aesKey = new SecretKeySpec(keyBytes, "AES");
+        return Base64.getEncoder().encodeToString(aesKey.getEncoded());
+    }
+
+    /**
+     * Additional PBE example using PBEWithSHA256And128BitAES-CBC-BC.
+     *
+     * @param password The input password.
+     * @param plaintext The plaintext to encrypt.
+     * @return The IV concatenated with ciphertext (Base64-encoded).
+     * @throws Exception if key derivation or encryption fails.
+     */
+    public String additionalPBEExample(String password, String plaintext) throws Exception {
+        byte[] salt = new byte[16];
+        new SecureRandom().nextBytes(salt);
+        PBEKeySpec spec = new PBEKeySpec(password.toCharArray(), salt, 10000, 128);
+        SecretKeyFactory factory = SecretKeyFactory.getInstance("PBEWithSHA256And128BitAES-CBC-BC");
+        SecretKey pbeKey = factory.generateSecret(spec);
+        SecretKey aesKey = new SecretKeySpec(pbeKey.getEncoded(), "AES");
+
+        Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
+        byte[] iv = new byte[16];
+        new SecureRandom().nextBytes(iv);
+        IvParameterSpec ivSpec = new IvParameterSpec(iv);
+        cipher.init(Cipher.ENCRYPT_MODE, aesKey, ivSpec);
+        byte[] ciphertext = cipher.doFinal(plaintext.getBytes());
+        byte[] output = concatenate(iv, ciphertext);
+        return Base64.getEncoder().encodeToString(output);
+    }
+
+    /**
+     * Additional PBE example using PBEWithSHA1And128BitAES-CBC-BC. This is less
+     * preferred than PBKDF2WithHmacSHA256 but demonstrates another variant.
+     *
+     * @param password The input password.
+     * @param plaintext The plaintext to encrypt.
+     * @return The IV concatenated with ciphertext (Base64-encoded).
+     * @throws Exception if key derivation or encryption fails.
+     */
+    public String additionalPBEExample2(String password, String plaintext) throws Exception {
+        byte[] salt = new byte[16];
+        new SecureRandom().nextBytes(salt);
+        PBEKeySpec spec = new PBEKeySpec(password.toCharArray(), salt, 10000, 128);
+        SecretKeyFactory factory = SecretKeyFactory.getInstance("PBEWithSHA1And128BitAES-CBC-BC");
+        SecretKey pbeKey = factory.generateSecret(spec);
+        SecretKey aesKey = new SecretKeySpec(pbeKey.getEncoded(), "AES");
+
+        Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
+        byte[] iv = new byte[16];
+        new SecureRandom().nextBytes(iv);
+        IvParameterSpec ivSpec = new IvParameterSpec(iv);
+        cipher.init(Cipher.ENCRYPT_MODE, aesKey, ivSpec);
+        byte[] ciphertext = cipher.doFinal(plaintext.getBytes());
+        byte[] output = concatenate(iv, ciphertext);
+        return Base64.getEncoder().encodeToString(output);
+    }
+
+    // ===========================
+    // 3. Dynamic PBE Encryption
+    // ===========================
+    /**
+     * Dynamically selects a PBE transformation based on a configuration string.
+     *
+     * Acceptable values: - "PBKDF2": Uses PBKDF2WithHmacSHA256. - "SHA256AES":
+     * Uses PBEWithSHA256And128BitAES-CBC-BC. - "SHA1AES": Uses
+     * PBEWithSHA1And128BitAES-CBC-BC. - Otherwise, falls back to insecure
+     * PBEWithMD5AndDES.
+     *
+     * @param config The configuration string.
+     * @param password The input password.
+     * @param plaintext The plaintext to encrypt.
+     * @return The Base64-encoded encrypted output.
+     * @throws Exception if an error occurs.
+     */
+    public String dynamicPBEEncryption(String config, String password, String plaintext) throws Exception {
+        if ("PBKDF2".equalsIgnoreCase(config)) {
+            return securePBEExample(password);
+        } else if ("SHA256AES".equalsIgnoreCase(config)) {
+            return additionalPBEExample(password, plaintext);
+        } else if ("SHA1AES".equalsIgnoreCase(config)) {
+            return additionalPBEExample2(password, plaintext);
+        } else {
+            // Fallback insecure option.
+            return insecurePBEExample(password);
+        }
+    }
+
+    // ===========================
+    // Helper Methods
+    // ===========================
+    /**
+     * Concatenates two byte arrays.
+     */
+    private byte[] concatenate(byte[] a, byte[] b) {
+        byte[] result = new byte[a.length + b.length];
+        System.arraycopy(a, 0, result, 0, a.length);
+        System.arraycopy(b, 0, result, a.length, b.length);
+        return result;
+    }
+
+}
diff --git a/java/ql/test/experimental/library-tests/quantum/jca/AsymmetricEncryptionMacHybridCryptosystem.java b/java/ql/test/experimental/library-tests/quantum/jca/AsymmetricEncryptionMacHybridCryptosystem.java
new file mode 100644
index 00000000000..8f844ba8620
--- /dev/null
+++ b/java/ql/test/experimental/library-tests/quantum/jca/AsymmetricEncryptionMacHybridCryptosystem.java
@@ -0,0 +1,324 @@
+package com.example.crypto.algorithms;
+
+// import org.bouncycastle.jce.provider.BouncyCastleProvider;
+// import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider;
+import java.security.*;
+import java.security.spec.ECGenParameterSpec;
+import java.util.Arrays;
+import java.util.Base64;
+import javax.crypto.Cipher;
+import javax.crypto.KeyAgreement;
+import javax.crypto.KeyGenerator;
+import javax.crypto.Mac;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.GCMParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+
+/**
+ * AsymmetricEncryptionMacHybridCryptosystem demonstrates hybrid cryptosystems
+ * that combine asymmetric encryption with a MAC.
+ *
+ * Flows: 1. RSA-OAEP + HMAC: - Secure Flow: Uses 2048-bit RSA-OAEP (with
+ * SHA256andMGF1Padding) to encapsulate a freshly generated AES key; then
+ * encrypts using AES-GCM with a random nonce and computes HMAC-SHA256 over the
+ * ciphertext. - Insecure Flow: Uses 1024-bit RSA (RSA/ECB/PKCS1Padding),
+ * AES-GCM with a fixed IV, and HMAC-SHA1.
+ *
+ * 2. ECIES + HMAC: - Secure Flow: Uses ephemeral ECDH key pairs (secp256r1);
+ * derives a shared secret and applies a simple KDF (SHA-256) to derive a
+ * 128-bit AES key; then uses AES-GCM with a random nonce and computes
+ * HMAC-SHA256. - Insecure Flow: Reuses a static EC key pair, directly truncates
+ * the shared secret without a proper KDF, uses a fixed IV, and computes
+ * HMAC-SHA1.
+ *
+ * 3. Dynamic Hybrid Selection: - Chooses between flows based on a configuration
+ * string.
+ *
+ * SAST/CBOM Notes: - Secure flows use proper ephemeral key generation, secure
+ * key sizes, KDF usage, and random nonces/IVs. - Insecure flows (static key
+ * reuse, fixed nonces, weak key sizes, raw shared secret truncation, and
+ * deprecated algorithms) should be flagged.
+ */
+public class AsymmetricEncryptionMacHybridCryptosystem {
+
+    // static {
+    //     Security.addProvider(new BouncyCastleProvider());
+    //     Security.addProvider(new BouncyCastlePQCProvider());
+    // }
+    // ---------- Result Class ----------
+    public static class HybridResult {
+
+        private final byte[] encapsulatedKey;
+        private final byte[] ciphertext;
+        private final byte[] mac;
+
+        public HybridResult(byte[] encapsulatedKey, byte[] ciphertext, byte[] mac) {
+            this.encapsulatedKey = encapsulatedKey;
+            this.ciphertext = ciphertext;
+            this.mac = mac;
+        }
+
+        public byte[] getEncapsulatedKey() {
+            return encapsulatedKey;
+        }
+
+        public byte[] getCiphertext() {
+            return ciphertext;
+        }
+
+        public byte[] getMac() {
+            return mac;
+        }
+
+        public String toBase64String() {
+            return "EncapsulatedKey: " + Base64.getEncoder().encodeToString(encapsulatedKey)
+                    + "\nCiphertext: " + Base64.getEncoder().encodeToString(ciphertext)
+                    + "\nMAC: " + Base64.getEncoder().encodeToString(mac);
+        }
+    }
+
+    // ---------- Helper Methods ----------
+    /**
+     * Generates an ephemeral ECDH key pair on secp256r1.
+     */
+    public KeyPair generateECDHKeyPair() throws Exception {
+        KeyPairGenerator kpg = KeyPairGenerator.getInstance("EC", "BC");
+        kpg.initialize(new ECGenParameterSpec("secp256r1"), new SecureRandom());
+        return kpg.generateKeyPair();
+    }
+
+    /**
+     * Generates an ephemeral X25519 key pair.
+     */
+    public KeyPair generateX25519KeyPair() throws Exception {
+        KeyPairGenerator kpg = KeyPairGenerator.getInstance("X25519", "BC");
+        kpg.initialize(255, new SecureRandom());
+        return kpg.generateKeyPair();
+    }
+
+    /**
+     * Derives a shared secret using the provided key agreement algorithm.
+     *
+     * @param privateKey The private key.
+     * @param publicKey The corresponding public key.
+     * @param algorithm The key agreement algorithm (e.g., "ECDH" or "X25519").
+     * @return The shared secret.
+     */
+    public byte[] deriveSharedSecret(PrivateKey privateKey, PublicKey publicKey, String algorithm) throws Exception {
+        KeyAgreement ka = KeyAgreement.getInstance(algorithm, "BC");
+        ka.init(privateKey);
+        ka.doPhase(publicKey, true);
+        return ka.generateSecret();
+    }
+
+    /**
+     * A simple KDF that hashes the input with SHA-256 and returns the first
+     * numBytes.
+     *
+     * @param input The input byte array.
+     * @param numBytes The desired number of output bytes.
+     * @return The derived key material.
+     */
+    public byte[] simpleKDF(byte[] input, int numBytes) throws Exception {
+        MessageDigest digest = MessageDigest.getInstance("SHA-256");
+        byte[] hash = digest.digest(input);
+        return Arrays.copyOf(hash, numBytes);
+    }
+
+    /**
+     * Concatenates two byte arrays.
+     */
+    public byte[] concatenate(byte[] a, byte[] b) {
+        byte[] result = new byte[a.length + b.length];
+        System.arraycopy(a, 0, result, 0, a.length);
+        System.arraycopy(b, 0, result, a.length, b.length);
+        return result;
+    }
+
+    // =====================================================
+    // 1. RSA-OAEP + HMAC Hybrid Cryptosystem
+    // =====================================================
+    /**
+     * Generates a secure 2048-bit RSA key pair.
+     */
+    public KeyPair generateRSAKeyPairGood() throws Exception {
+        KeyPairGenerator kpg = KeyPairGenerator.getInstance("RSA");
+        kpg.initialize(2048);
+        return kpg.generateKeyPair();
+    }
+
+    /**
+     * Generates an insecure 1024-bit RSA key pair.
+     */
+    public KeyPair generateRSAKeyPairBad() throws Exception {
+        KeyPairGenerator kpg = KeyPairGenerator.getInstance("RSA");
+        kpg.initialize(1024);
+        return kpg.generateKeyPair();
+    }
+
+    /**
+     * Secure hybrid encryption using RSA-OAEP + HMAC-SHA256.
+     */
+    public HybridResult secureRSAHybridEncryption(byte[] plaintext) throws Exception {
+        KeyPair rsaKP = generateRSAKeyPairGood();
+        SecretKey aesKey = generateAESKey();
+
+        Cipher rsaCipher = Cipher.getInstance("RSA/ECB/OAEPWithSHA-256AndMGF1Padding");
+        rsaCipher.init(Cipher.WRAP_MODE, rsaKP.getPublic());
+        byte[] encapsulatedKey = rsaCipher.wrap(aesKey);
+
+        byte[] iv = new byte[12];
+        new SecureRandom().nextBytes(iv);
+        Cipher aesCipher = Cipher.getInstance("AES/GCM/NoPadding");
+        aesCipher.init(Cipher.ENCRYPT_MODE, aesKey, new GCMParameterSpec(128, iv));
+        byte[] ciphertext = aesCipher.doFinal(plaintext);
+        byte[] fullCiphertext = concatenate(iv, ciphertext);
+
+        byte[] macKey = generateAESKey().getEncoded();
+        byte[] mac = secureHMACSHA256(new String(fullCiphertext), macKey);
+
+        return new HybridResult(encapsulatedKey, fullCiphertext, mac);
+    }
+
+    /**
+     * Insecure hybrid encryption using RSA/ECB/PKCS1Padding + HMAC-SHA1.
+     */
+    public HybridResult insecureRSAHybridEncryption(byte[] plaintext) throws Exception {
+        KeyPair rsaKP = generateRSAKeyPairBad();
+        SecretKey aesKey = generateAESKey();
+
+        Cipher rsaCipher = Cipher.getInstance("RSA/ECB/PKCS1Padding");
+        rsaCipher.init(Cipher.WRAP_MODE, rsaKP.getPublic());
+        byte[] encapsulatedKey = rsaCipher.wrap(aesKey);
+
+        byte[] fixedIV = new byte[12]; // All zeros
+        Cipher aesCipher = Cipher.getInstance("AES/GCM/NoPadding");
+        aesCipher.init(Cipher.ENCRYPT_MODE, aesKey, new GCMParameterSpec(128, fixedIV));
+        byte[] ciphertext = aesCipher.doFinal(plaintext);
+        byte[] fullCiphertext = concatenate(fixedIV, ciphertext);
+
+        byte[] macKey = generateAESKey().getEncoded();
+        byte[] mac = insecureHMACSHA1(new String(fullCiphertext), macKey);
+
+        return new HybridResult(encapsulatedKey, fullCiphertext, mac);
+    }
+
+    // =====================================================
+    // 2. ECIES + HMAC Hybrid Cryptosystem
+    // =====================================================
+    /**
+     * Secure hybrid encryption using ECIES (via ECDH) + HMAC-SHA256.
+     */
+    public HybridResult secureECIESHybridEncryption(byte[] plaintext) throws Exception {
+        KeyPair aliceKP = generateECDHKeyPair();
+        KeyPair bobKP = generateECDHKeyPair();
+        byte[] sharedSecret = deriveSharedSecret(aliceKP.getPrivate(), bobKP.getPublic(), "ECDH");
+        byte[] aesKeyBytes = simpleKDF(sharedSecret, 16);
+        SecretKey aesKey = new SecretKeySpec(aesKeyBytes, "AES");
+
+        byte[] iv = new byte[12];
+        new SecureRandom().nextBytes(iv);
+        Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
+        cipher.init(Cipher.ENCRYPT_MODE, aesKey, new GCMParameterSpec(128, iv));
+        byte[] ciphertext = cipher.doFinal(plaintext);
+        byte[] fullCiphertext = concatenate(iv, ciphertext);
+
+        byte[] macKey = generateAESKey().getEncoded();
+        byte[] mac = secureHMACSHA256(new String(fullCiphertext), macKey);
+
+        byte[] ephemeralPubKey = aliceKP.getPublic().getEncoded();
+
+        return new HybridResult(ephemeralPubKey, fullCiphertext, mac);
+    }
+
+    /**
+     * Insecure hybrid encryption using ECIES (via ECDH) + HMAC-SHA1.
+     */
+    public HybridResult insecureECIESHybridEncryption(byte[] plaintext) throws Exception {
+        KeyPair staticKP = generateECDHKeyPair();
+        byte[] sharedSecret = deriveSharedSecret(staticKP.getPrivate(), staticKP.getPublic(), "ECDH");
+        byte[] aesKeyBytes = Arrays.copyOf(sharedSecret, 16);
+        SecretKey aesKey = new SecretKeySpec(aesKeyBytes, "AES");
+
+        byte[] fixedIV = new byte[12]; // Fixed IV
+        Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
+        cipher.init(Cipher.ENCRYPT_MODE, aesKey, new GCMParameterSpec(128, fixedIV));
+        byte[] ciphertext = cipher.doFinal(plaintext);
+        byte[] fullCiphertext = concatenate(fixedIV, ciphertext);
+
+        byte[] macKey = generateAESKey().getEncoded();
+        byte[] mac = insecureHMACSHA1(new String(fullCiphertext), macKey);
+
+        byte[] staticPubKey = staticKP.getPublic().getEncoded();
+
+        return new HybridResult(staticPubKey, fullCiphertext, mac);
+    }
+
+    // =====================================================
+    // 3. Dynamic Hybrid Selection
+    // =====================================================
+    /**
+     * Dynamically selects a hybrid encryption flow based on configuration.
+     * SAST: Dynamic selection introduces risk if insecure defaults are chosen.
+     *
+     * @param config The configuration string ("secureRSA", "insecureRSA",
+     * "secureECIES", "insecureECIES").
+     * @param plaintext The plaintext to encrypt.
+     * @return A Base64-encoded string representation of the hybrid encryption
+     * result.
+     * @throws Exception if an error occurs.
+     */
+    public String dynamicHybridEncryption(String config, byte[] plaintext) throws Exception {
+        HybridResult result;
+        if ("secureRSA".equalsIgnoreCase(config)) {
+            result = secureRSAHybridEncryption(plaintext);
+        } else if ("insecureRSA".equalsIgnoreCase(config)) {
+            result = insecureRSAHybridEncryption(plaintext);
+        } else if ("secureECIES".equalsIgnoreCase(config)) {
+            result = secureECIESHybridEncryption(plaintext);
+        } else if ("insecureECIES".equalsIgnoreCase(config)) {
+            result = insecureECIESHybridEncryption(plaintext);
+        } else {
+            // Fallback to insecure RSA hybrid encryption.
+            result = insecureRSAHybridEncryption(plaintext);
+        }
+        return result.toBase64String();
+    }
+
+    // =====================================================
+    // 4. Helper Methods for HMAC and Symmetric Encryption
+    // =====================================================
+    /**
+     * Secure HMAC using HMAC-SHA256. SAST: HMAC-SHA256 is secure.
+     */
+    public byte[] secureHMACSHA256(String message, byte[] key) throws Exception {
+        Mac mac = Mac.getInstance("HmacSHA256", "BC");
+        SecretKey secretKey = new SecretKeySpec(key, "HmacSHA256");
+        mac.init(secretKey);
+        return mac.doFinal(message.getBytes());
+    }
+
+    /**
+     * Insecure HMAC using HMAC-SHA1. SAST: HMAC-SHA1 is deprecated and
+     * insecure.
+     */
+    public byte[] insecureHMACSHA1(String message, byte[] key) throws Exception {
+        Mac mac = Mac.getInstance("HmacSHA1", "BC");
+        SecretKey secretKey = new SecretKeySpec(key, "HmacSHA1");
+        mac.init(secretKey);
+        return mac.doFinal(message.getBytes());
+    }
+
+    // =====================================================
+    // 5. Helper Methods for Key/Nonce Generation
+    // =====================================================
+    /**
+     * Generates a secure 256-bit AES key. SAST: Uses SecureRandom for key
+     * generation.
+     */
+    public SecretKey generateAESKey() throws Exception {
+        KeyGenerator kg = KeyGenerator.getInstance("AES");
+        kg.init(256, new SecureRandom());
+        return kg.generateKey();
+    }
+}
diff --git a/java/ql/test/experimental/library-tests/quantum/jca/ChainedEncryptionTest.java b/java/ql/test/experimental/library-tests/quantum/jca/ChainedEncryptionTest.java
new file mode 100644
index 00000000000..2190921937e
--- /dev/null
+++ b/java/ql/test/experimental/library-tests/quantum/jca/ChainedEncryptionTest.java
@@ -0,0 +1,146 @@
+package com.example.crypto.algorithms;
+
+// import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import java.security.*;
+import java.util.Arrays;
+import javax.crypto.Cipher;
+import javax.crypto.KeyGenerator;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.GCMParameterSpec;
+import javax.crypto.spec.IvParameterSpec;
+
+public class ChainedEncryptionTest {
+
+    // static {
+    //     Security.addProvider(new BouncyCastleProvider());
+    // }
+    // Encrypts using AES-GCM. Returns IV concatenated with ciphertext.
+    public static byte[] encryptAESGCM(SecretKey key, byte[] plaintext) throws Exception {
+        Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
+        byte[] iv = new byte[12]; // 12-byte nonce for AES-GCM
+        new SecureRandom().nextBytes(iv);
+        GCMParameterSpec spec = new GCMParameterSpec(128, iv);
+        cipher.init(Cipher.ENCRYPT_MODE, key, spec);
+        byte[] ciphertext = cipher.doFinal(plaintext);
+        return concat(iv, ciphertext);
+    }
+
+    // Decrypts AES-GCM ciphertext where IV is prepended.
+    public static byte[] decryptAESGCM(SecretKey key, byte[] ivCiphertext) throws Exception {
+        byte[] iv = Arrays.copyOfRange(ivCiphertext, 0, 12);
+        byte[] ciphertext = Arrays.copyOfRange(ivCiphertext, 12, ivCiphertext.length);
+        Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
+        GCMParameterSpec spec = new GCMParameterSpec(128, iv);
+        cipher.init(Cipher.DECRYPT_MODE, key, spec);
+        return cipher.doFinal(ciphertext);
+    }
+
+    // Encrypts using ChaCha20-Poly1305. Returns nonce concatenated with ciphertext.
+    public static byte[] encryptChaCha20Poly1305(SecretKey key, byte[] plaintext) throws Exception {
+        Cipher cipher = Cipher.getInstance("ChaCha20-Poly1305", "BC");
+        byte[] nonce = new byte[12]; // 12-byte nonce for ChaCha20-Poly1305
+        new SecureRandom().nextBytes(nonce);
+        cipher.init(Cipher.ENCRYPT_MODE, key, new IvParameterSpec(nonce));
+        byte[] ciphertext = cipher.doFinal(plaintext);
+        return concat(nonce, ciphertext);
+    }
+
+    // Decrypts ChaCha20-Poly1305 ciphertext where nonce is prepended.
+    public static byte[] decryptChaCha20Poly1305(SecretKey key, byte[] nonceCiphertext) throws Exception {
+        byte[] nonce = Arrays.copyOfRange(nonceCiphertext, 0, 12);
+        byte[] ciphertext = Arrays.copyOfRange(nonceCiphertext, 12, nonceCiphertext.length);
+        Cipher cipher = Cipher.getInstance("ChaCha20-Poly1305", "BC");
+        cipher.init(Cipher.DECRYPT_MODE, key, new IvParameterSpec(nonce));
+        return cipher.doFinal(ciphertext);
+    }
+
+    // Helper method to concatenate two byte arrays.
+    private static byte[] concat(byte[] a, byte[] b) {
+        byte[] result = new byte[a.length + b.length];
+        System.arraycopy(a, 0, result, 0, a.length);
+        System.arraycopy(b, 0, result, a.length, b.length);
+        return result;
+    }
+
+    /**
+     * Performs chained encryption and decryption in one function. First,
+     * plaintext is encrypted with AES-GCM (inner layer), then that ciphertext
+     * is encrypted with ChaCha20-Poly1305 (outer layer). The decryption process
+     * reverses these steps.
+     *
+     * @param plaintext The input plaintext.
+     * @return The decrypted plaintext as a String.
+     * @throws Exception if any cryptographic operation fails.
+     */
+    public static String chainEncryptDecrypt(String plaintext) throws Exception {
+        byte[] plainBytes = plaintext.getBytes("UTF-8");
+
+        // Generate keys for inner and outer encryption.
+        KeyGenerator aesGen = KeyGenerator.getInstance("AES");
+        aesGen.init(256, new SecureRandom());
+        SecretKey innerKey = aesGen.generateKey();
+
+        KeyGenerator chachaGen = KeyGenerator.getInstance("ChaCha20", "BC");
+        chachaGen.init(256, new SecureRandom());
+        SecretKey outerKey = chachaGen.generateKey();
+
+        // Inner Encryption with AES-GCM.
+        byte[] aesIV = new byte[12]; // Random 12-byte IV.
+        new SecureRandom().nextBytes(aesIV);
+        Cipher aesCipher = Cipher.getInstance("AES/GCM/NoPadding");
+        GCMParameterSpec gcmSpec = new GCMParameterSpec(128, aesIV);
+        aesCipher.init(Cipher.ENCRYPT_MODE, innerKey, gcmSpec);
+        byte[] innerCiphertext = aesCipher.doFinal(plainBytes);
+
+        // Outer Encryption with ChaCha20-Poly1305.
+        byte[] chachaNonce = new byte[12]; // Random 12-byte nonce.
+        new SecureRandom().nextBytes(chachaNonce);
+        Cipher chachaCipher = Cipher.getInstance("ChaCha20-Poly1305", "BC");
+        chachaCipher.init(Cipher.ENCRYPT_MODE, outerKey, new IvParameterSpec(chachaNonce));
+        byte[] outerCiphertext = chachaCipher.doFinal(innerCiphertext);
+
+        // Outer Decryption.
+        Cipher chachaDec = Cipher.getInstance("ChaCha20-Poly1305", "BC");
+        chachaDec.init(Cipher.DECRYPT_MODE, outerKey, new IvParameterSpec(chachaNonce));
+        byte[] decryptedInnerCiphertext = chachaDec.doFinal(outerCiphertext);
+
+        // Inner Decryption.
+        Cipher aesDec = Cipher.getInstance("AES/GCM/NoPadding");
+        aesDec.init(Cipher.DECRYPT_MODE, innerKey, new GCMParameterSpec(128, aesIV));
+        byte[] decryptedPlaintext = aesDec.doFinal(decryptedInnerCiphertext);
+
+        return new String(decryptedPlaintext, "UTF-8");
+    }
+
+    public static void main(String[] args) throws Exception {
+        // Generate a 256-bit AES key for the first (inner) encryption.
+        KeyGenerator aesGen = KeyGenerator.getInstance("AES");
+        aesGen.init(256, new SecureRandom());
+        SecretKey aesKey = aesGen.generateKey();
+
+        // Generate a 256-bit key for ChaCha20-Poly1305 (outer encryption).
+        KeyGenerator chaChaGen = KeyGenerator.getInstance("ChaCha20");
+        chaChaGen.init(256, new SecureRandom());
+        SecretKey chaChaKey = chaChaGen.generateKey();
+
+        String originalText = "This is a secret message.";
+        byte[] plaintext = originalText.getBytes();
+
+        // Step 1: Encrypt plaintext with AES-GCM.
+        byte[] innerCiphertext = encryptAESGCM(aesKey, plaintext);
+
+        // Step 2: Encrypt the AES-GCM ciphertext with ChaCha20-Poly1305.
+        byte[] outerCiphertext = encryptChaCha20Poly1305(chaChaKey, innerCiphertext);
+
+        // Now, decrypt in reverse order.
+        // Step 3: Decrypt the outer layer (ChaCha20-Poly1305).
+        byte[] decryptedInnerCiphertext = decryptChaCha20Poly1305(chaChaKey, outerCiphertext);
+
+        // Step 4: Decrypt the inner layer (AES-GCM).
+        byte[] decryptedPlaintext = decryptAESGCM(aesKey, decryptedInnerCiphertext);
+
+        System.out.println("Original: " + originalText);
+        System.out.println("Decrypted: " + new String(decryptedPlaintext));
+    }
+
+}
diff --git a/java/ql/test/experimental/library-tests/quantum/jca/Digest.java b/java/ql/test/experimental/library-tests/quantum/jca/Digest.java
new file mode 100644
index 00000000000..412bf578ac1
--- /dev/null
+++ b/java/ql/test/experimental/library-tests/quantum/jca/Digest.java
@@ -0,0 +1,256 @@
+package com.example.crypto.artifacts;
+
+// import org.bouncycastle.jce.provider.BouncyCastleProvider;
+
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+import java.util.Arrays;
+import java.util.Base64;
+import javax.crypto.Cipher;
+import javax.crypto.KeyGenerator;
+import javax.crypto.Mac;
+import javax.crypto.SecretKey;
+import javax.crypto.SecretKeyFactory;
+import javax.crypto.spec.PBEKeySpec;
+import javax.crypto.spec.SecretKeySpec;
+
+/**
+ * DigestTestCase demonstrates the further use of cryptographic digests
+ * as inputs to more complex cryptosystems. In real-world applications,
+ * digest outputs are often used as keys, key material for key derivation,
+ * or as identifiers. This file shows several flows:
+ *
+ * 1. Basic digest generation using SHA-256 (secure) and MD5/SHA-1 (insecure).
+ * 2. Unsalted versus salted digest for password input.
+ * 3. PBKDF2 for secure key derivation.
+ * 4. Using a digest as direct key material for AES encryption (processDigest).
+ * 5. Using a digest as an identifier (alternativeDigestFlow).
+ * 6. **Further Use**: Deriving two separate keys (one for encryption and one
+ * for MAC)
+ * from a digest via PBKDF2 and using them in an authenticated encryption flow.
+ *
+ * SAST/CBOM notes:
+ * - Secure algorithms (e.g. SHA-256, HMAC-SHA256, PBKDF2WithHmacSHA256) are
+ * acceptable.
+ * - Insecure functions (e.g. MD5, SHA-1) and unsalted password digests are
+ * flagged.
+ * - Using a raw digest directly as key material is ambiguous unless produced by
+ * a proper KDF.
+ */
+public class Digest {
+
+    // static {
+    //     Security.addProvider(new BouncyCastleProvider());
+    // }
+
+    // ---------- Digest Generation Flows ----------
+
+    /**
+     * Secure digest generation using SHA-256.
+     * SAST: SHA-256 is secure.
+     */
+    public void simpleHashing() throws Exception {
+        MessageDigest digest = MessageDigest.getInstance("SHA-256");
+        byte[] hash = digest.digest("Simple Test Data".getBytes());
+        processDigest(hash);
+    }
+
+    /**
+     * Insecure digest generation using MD5.
+     * SAST: MD5 is deprecated and insecure.
+     */
+    public void insecureMD5Hashing() throws Exception {
+        MessageDigest md5Digest = MessageDigest.getInstance("MD5");
+        byte[] hash = md5Digest.digest("Weak Hash Example".getBytes());
+        processDigest(hash);
+    }
+
+    /**
+     * Insecure unsalted password hashing using SHA-256.
+     * SAST: Unsalted password hashing is vulnerable to rainbow table attacks.
+     */
+    public void insecureUnsaltedPasswordHashing(String password) throws Exception {
+        MessageDigest sha256Digest = MessageDigest.getInstance("SHA-256");
+        byte[] hash = sha256Digest.digest(password.getBytes());
+        processDigest(hash);
+    }
+
+    /**
+     * Secure salted hashing using SHA-256.
+     * SAST: Salting the input improves security.
+     */
+    public void secureSaltedHashing(String password) throws Exception {
+        byte[] salt = generateSalt(16);
+        MessageDigest digest = MessageDigest.getInstance("SHA-256");
+        digest.update(salt);
+        byte[] hash = digest.digest(password.getBytes());
+        processDigest(hash);
+    }
+
+    /**
+     * Secure key derivation using PBKDF2 with HMAC-SHA256.
+     * SAST: PBKDF2 with sufficient iterations is recommended.
+     */
+    public void securePBKDF2Hashing(String password) throws Exception {
+        byte[] salt = generateSalt(16);
+        PBEKeySpec spec = new PBEKeySpec(password.toCharArray(), salt, 10000, 256);
+        SecretKeyFactory factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256");
+        byte[] hash = factory.generateSecret(spec).getEncoded();
+        processDigest(hash);
+    }
+
+    /**
+     * Insecure digest generation using SHA-1.
+     * SAST: SHA-1 is deprecated due to collision vulnerabilities.
+     */
+    public void insecureRawSHA1Hashing(String input) throws Exception {
+        MessageDigest sha1Digest = MessageDigest.getInstance("SHA-1");
+        byte[] hash = sha1Digest.digest(input.getBytes());
+        processDigest(hash);
+    }
+
+    /**
+     * Secure MAC computation using HMAC-SHA256.
+     * SAST: HMAC-SHA256 is considered secure.
+     */
+    public void secureHMACHashing(String input, byte[] key) throws Exception {
+        Mac hmac = Mac.getInstance("HmacSHA256");
+        SecretKey secretKey = new SecretKeySpec(key, "HmacSHA256");
+        hmac.init(secretKey);
+        byte[] hash = hmac.doFinal(input.getBytes());
+        processDigest(hash);
+    }
+
+    // ---------- Further Use of Digest Outputs ----------
+
+    /**
+     * Processes the digest by using it directly as key material for AES encryption.
+     * SAST: Using a raw digest as key material is acceptable only if the digest is
+     * produced
+     * via a secure KDF. This method is ambiguous if the digest is from an insecure
+     * function.
+     *
+     * @param digest The computed digest.
+     * @throws Exception if encryption fails.
+     */
+    public void processDigest(byte[] digest) throws Exception {
+        // Derive a 128-bit AES key from the digest.
+        SecretKey key = new SecretKeySpec(digest, 0, 16, "AES");
+        Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
+        cipher.init(Cipher.ENCRYPT_MODE, key, new SecureRandom());
+        byte[] encryptedData = cipher.doFinal("Sensitive Data".getBytes());
+        storeEncryptedDigest(encryptedData);
+    }
+
+    /**
+     * Alternative flow: Uses the digest as an identifier (e.g., checksum) and
+     * encrypts it.
+     * SAST: Using a digest as an identifier is common; encryption must use secure
+     * primitives.
+     *
+     * @param digest The computed digest.
+     * @throws Exception if encryption fails.
+     */
+    public void alternativeDigestFlow(byte[] digest) throws Exception {
+        byte[] identifier = Base64.getEncoder().encode(digest);
+        encryptAndSend(identifier);
+    }
+
+    /**
+     * Further use: Derives two separate keys from a digest using PBKDF2,
+     * then uses one key for encryption and the other for computing a MAC over the
+     * ciphertext.
+     *
+     * SAST: This approach of key derivation and splitting is acceptable if PBKDF2
+     * is used securely.
+     *
+     * @param digest The input digest (must be generated from a secure source).
+     * @throws Exception if key derivation or encryption fails.
+     */
+    public void furtherUseDigestForKeyDerivation(byte[] digest) throws Exception {
+        // Treat the digest (in Base64) as a password input to PBKDF2.
+        String digestAsPassword = Base64.getEncoder().encodeToString(digest);
+        byte[] salt = generateSalt(16);
+        // Derive 256 bits (32 bytes) of key material.
+        PBEKeySpec spec = new PBEKeySpec(digestAsPassword.toCharArray(), salt, 10000, 256);
+        SecretKeyFactory factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256");
+        byte[] keyMaterial = factory.generateSecret(spec).getEncoded();
+        // Split into two 128-bit keys.
+        byte[] encryptionKeyBytes = Arrays.copyOfRange(keyMaterial, 0, 16);
+        byte[] macKeyBytes = Arrays.copyOfRange(keyMaterial, 16, 32);
+        SecretKey encryptionKey = new SecretKeySpec(encryptionKeyBytes, "AES");
+        SecretKey macKey = new SecretKeySpec(macKeyBytes, "HmacSHA256");
+
+        // Encrypt sample data using the derived encryption key.
+        Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
+        cipher.init(Cipher.ENCRYPT_MODE, encryptionKey, new SecureRandom());
+        byte[] ciphertext = cipher.doFinal("Further Use Test Data".getBytes());
+
+        // Compute HMAC over the ciphertext using the derived MAC key.
+        Mac mac = Mac.getInstance("HmacSHA256");
+        mac.init(macKey);
+        byte[] computedMac = mac.doFinal(ciphertext);
+
+        // In production, these outputs would be securely stored or transmitted.
+        byte[] output = new byte[ciphertext.length + computedMac.length];
+        System.arraycopy(ciphertext, 0, output, 0, ciphertext.length);
+        System.arraycopy(computedMac, 0, output, ciphertext.length, computedMac.length);
+        storeEncryptedDigest(output);
+    }
+
+    /**
+     * Encrypts data using AES-GCM and simulates secure transmission or storage.
+     * SAST: Uses a securely generated AES key.
+     *
+     * @param data The data to encrypt.
+     * @throws Exception if encryption fails.
+     */
+    public void encryptAndSend(byte[] data) throws Exception {
+        Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
+        SecretKey key = generateAESKey();
+        cipher.init(Cipher.ENCRYPT_MODE, key, new SecureRandom());
+        byte[] encryptedData = cipher.doFinal(data);
+        storeEncryptedDigest(encryptedData);
+    }
+
+    /**
+     * Simulates secure storage or transmission of an encrypted digest.
+     * SAST: In production, this method would implement secure storage/transmission.
+     *
+     * @param encryptedDigest The encrypted digest.
+     */
+    public void storeEncryptedDigest(byte[] encryptedDigest) {
+        // For static analysis purposes, this method represents a secure output
+        // mechanism.
+        String stored = Base64.getEncoder().encodeToString(encryptedDigest);
+    }
+
+    // ---------- Helper Methods ----------
+
+    /**
+     * Generates a secure 256-bit AES key.
+     * SAST: Key generation uses a strong RNG.
+     *
+     * @return A SecretKey for AES.
+     * @throws NoSuchAlgorithmException if AES is unsupported.
+     */
+    private SecretKey generateAESKey() throws NoSuchAlgorithmException {
+        KeyGenerator keyGen = KeyGenerator.getInstance("AES");
+        keyGen.init(256);
+        return keyGen.generateKey();
+    }
+
+    /**
+     * Generates a random salt of the specified length using SecureRandom.
+     * SAST: Salting is essential for secure digest computations.
+     *
+     * @param length The salt length.
+     * @return A byte array representing the salt.
+     */
+    private byte[] generateSalt(int length) {
+        byte[] salt = new byte[length];
+        new SecureRandom().nextBytes(salt);
+        return salt;
+    }
+}
diff --git a/java/ql/test/experimental/library-tests/quantum/jca/EllipticCurve1.java b/java/ql/test/experimental/library-tests/quantum/jca/EllipticCurve1.java
new file mode 100644
index 00000000000..71481b7e7a9
--- /dev/null
+++ b/java/ql/test/experimental/library-tests/quantum/jca/EllipticCurve1.java
@@ -0,0 +1,155 @@
+package com.example.crypto.algorithms;
+
+// import org.bouncycastle.jce.provider.BouncyCastleProvider;
+
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.util.Base64;
+
+/**
+ * EllipticCurve1 demonstrates generating EC key pairs for various curve
+ * categories.
+ *
+ * Curve categories covered:
+ * - NIST: e.g., secp256r1, secp384r1, secp521r1.
+ * - SEC: e.g., secp256k1 (from the Standards for Efficient Cryptography, SEC2).
+ * - BRAINPOOL: e.g., brainpoolP256r1.
+ * - CURVE25519: for key agreement (X25519) or signatures (Ed25519).
+ * - CURVE448: for key agreement (X448).
+ * - C2: Binary curves; for example, sect163r2 (if available).
+ * - SM2: Chinese SM2 curve, often named sm2p256v1.
+ * - ES: Elliptic curve signature based on EdDSA, here using Ed25519.
+ * - OtherEllipticCurveType: A fallback (using secp256r1).
+ *
+ * Best practices:
+ * - Use ephemeral key generation with a strong RNG.
+ * - Select curves from secure families (e.g., NIST, Brainpool, Curve25519/448,
+ * SM2).
+ * - Use a crypto provider (e.g., BouncyCastle) that supports the desired
+ * curves.
+ *
+ * In a production environment, the curve type may be externally configured.
+ */
+public class EllipticCurve1 {
+
+    // static {
+    //     // Register the BouncyCastle provider to access a wide range of curves.
+    //     Security.addProvider(new BouncyCastleProvider());
+    // }
+
+    /**
+     * Generates a key pair using a NIST curve (e.g., secp256r1).
+     */
+    public KeyPair generateNISTKeyPair() throws Exception {
+        KeyPairGenerator kpg = KeyPairGenerator.getInstance("EC", "BC");
+        // secp256r1 is widely used (also known as P-256)
+        kpg.initialize(new java.security.spec.ECGenParameterSpec("secp256r1"));
+        return kpg.generateKeyPair();
+    }
+
+    /**
+     * Generates a key pair using a SEC curve (e.g., secp256k1).
+     */
+    public KeyPair generateSECCurveKeyPair() throws Exception {
+        KeyPairGenerator kpg = KeyPairGenerator.getInstance("EC", "BC");
+        // secp256k1 is commonly used in Bitcoin and other blockchain applications.
+        kpg.initialize(new java.security.spec.ECGenParameterSpec("secp256k1"));
+        return kpg.generateKeyPair();
+    }
+
+    /**
+     * Generates a key pair using a Brainpool curve (e.g., brainpoolP256r1).
+     */
+    public KeyPair generateBrainpoolKeyPair() throws Exception {
+        KeyPairGenerator kpg = KeyPairGenerator.getInstance("EC", "BC");
+        // "brainpoolP256r1" is a commonly recommended Brainpool curve.
+        kpg.initialize(new java.security.spec.ECGenParameterSpec("brainpoolP256r1"));
+        return kpg.generateKeyPair();
+    }
+
+    /**
+     * Generates an X25519 key pair (for key agreement).
+     */
+    public KeyPair generateCurve25519KeyPair() throws Exception {
+        KeyPairGenerator kpg = KeyPairGenerator.getInstance("X25519", "BC");
+        // No further parameters are needed for X25519.
+        return kpg.generateKeyPair();
+    }
+
+    /**
+     * Generates an X448 key pair (for key agreement).
+     */
+    public KeyPair generateCurve448KeyPair() throws Exception {
+        KeyPairGenerator kpg = KeyPairGenerator.getInstance("X448", "BC");
+        return kpg.generateKeyPair();
+    }
+
+    /**
+     * Generates a key pair for a binary (C2) curve.
+     * Example: sect163r2 is a binary field curve.
+     */
+    public KeyPair generateC2CurveKeyPair() throws Exception {
+        KeyPairGenerator kpg = KeyPairGenerator.getInstance("EC", "BC");
+        // "sect163r2" is one of the binary field curves supported by BouncyCastle.
+        kpg.initialize(new java.security.spec.ECGenParameterSpec("sect163r2"));
+        return kpg.generateKeyPair();
+    }
+
+    /**
+     * Generates a key pair for the SM2 curve.
+     * SM2 is a Chinese cryptographic standard.
+     */
+    public KeyPair generateSM2KeyPair() throws Exception {
+        KeyPairGenerator kpg = KeyPairGenerator.getInstance("EC", "BC");
+        // "sm2p256v1" is the standard SM2 curve.
+        kpg.initialize(new java.security.spec.ECGenParameterSpec("sm2p256v1"));
+        return kpg.generateKeyPair();
+    }
+
+    /**
+     * Generates a key pair for ES (Elliptic curve signature using EdDSA).
+     * This example uses Ed25519.
+     */
+    public KeyPair generateESKeyPair() throws Exception {
+        KeyPairGenerator kpg = KeyPairGenerator.getInstance("Ed25519", "BC");
+        return kpg.generateKeyPair();
+    }
+
+    /**
+     * Generates a key pair for an "Other" elliptic curve type.
+     * This serves as a fallback example (using secp256r1).
+     */
+    public KeyPair generateOtherEllipticCurveKeyPair() throws Exception {
+        return generateNISTKeyPair(); // Fallback to secp256r1
+    }
+
+    /**
+     * Main method demonstrating key pair generation for various curve types.
+     */
+    public static void main(String[] args) {
+        try {
+            EllipticCurve1 examples = new EllipticCurve1();
+            System.out.println("NIST (secp256r1): " +
+                    Base64.getEncoder().encodeToString(examples.generateNISTKeyPair().getPublic().getEncoded()));
+            System.out.println("SEC (secp256k1): " +
+                    Base64.getEncoder().encodeToString(examples.generateSECCurveKeyPair().getPublic().getEncoded()));
+            System.out.println("Brainpool (brainpoolP256r1): " +
+                    Base64.getEncoder().encodeToString(examples.generateBrainpoolKeyPair().getPublic().getEncoded()));
+            System.out.println("Curve25519 (X25519): " +
+                    Base64.getEncoder().encodeToString(examples.generateCurve25519KeyPair().getPublic().getEncoded()));
+            System.out.println("Curve448 (X448): " +
+                    Base64.getEncoder().encodeToString(examples.generateCurve448KeyPair().getPublic().getEncoded()));
+            System.out.println("C2 (sect163r2): " +
+                    Base64.getEncoder().encodeToString(examples.generateC2CurveKeyPair().getPublic().getEncoded()));
+            System.out.println("SM2 (sm2p256v1): " +
+                    Base64.getEncoder().encodeToString(examples.generateSM2KeyPair().getPublic().getEncoded()));
+            System.out.println("ES (Ed25519): " +
+                    Base64.getEncoder().encodeToString(examples.generateESKeyPair().getPublic().getEncoded()));
+            System.out.println("Other (Fallback, secp256r1): " +
+                    Base64.getEncoder()
+                            .encodeToString(examples.generateOtherEllipticCurveKeyPair().getPublic().getEncoded()));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/java/ql/test/experimental/library-tests/quantum/jca/EllipticCurve2.java b/java/ql/test/experimental/library-tests/quantum/jca/EllipticCurve2.java
new file mode 100644
index 00000000000..41def510f18
--- /dev/null
+++ b/java/ql/test/experimental/library-tests/quantum/jca/EllipticCurve2.java
@@ -0,0 +1,272 @@
+package com.example.crypto.algorithms;
+
+//import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import java.security.*;
+import java.security.spec.ECGenParameterSpec;
+import java.util.Arrays;
+import java.util.Base64;
+import javax.crypto.Cipher;
+import javax.crypto.KeyAgreement;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.GCMParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+
+/**
+ * EllipticCurve2 demonstrates real-world uses of elliptic curve algorithms,
+ * including key pair generation, key agreement (ECDH), digital signatures
+ * (ECDSA, EdDSA), and a simple simulation of ECIES (using ECDH + AES-GCM).
+ *
+ * Curve types shown include: - NIST (e.g., secp256r1) - SEC (e.g., secp256k1) -
+ * Brainpool (e.g., brainpoolP256r1) - CURVE25519 (for X25519 key agreement) -
+ * ES (e.g., Ed25519 for signatures) - Other fallback (e.g., secp256r1 for
+ * "OtherEllipticCurveType")
+ *
+ * Best practices: - Use ephemeral keys and a strong RNG. - Use proper key
+ * agreement (with a KDF if needed) and digital signature schemes. - Avoid
+ * static key reuse or using weak curves.
+ *
+ * SAST/CBOM considerations: - Secure implementations use ephemeral keys and
+ * modern curves. - Insecure practices (e.g., static keys or reusing keys) must
+ * be flagged.
+ */
+public class EllipticCurve2 {
+
+    // static {
+    //     // Register BouncyCastle provider for additional curves and algorithms.
+    //     Security.addProvider(new BouncyCastleProvider());
+    // }
+    // ----------------------------
+    // 1. Key Pair Generation Examples
+    // ----------------------------
+    /**
+     * Generates a key pair using a NIST curve (secp256r1).
+     */
+    public KeyPair generateNISTKeyPair() throws Exception {
+        KeyPairGenerator kpg = KeyPairGenerator.getInstance("EC", "BC");
+        kpg.initialize(new ECGenParameterSpec("secp256r1"), new SecureRandom());
+        return kpg.generateKeyPair();
+    }
+
+    /**
+     * Generates a key pair using a SEC curve (secp256k1).
+     */
+    public KeyPair generateSECCurveKeyPair() throws Exception {
+        KeyPairGenerator kpg = KeyPairGenerator.getInstance("EC", "BC");
+        kpg.initialize(new ECGenParameterSpec("secp256k1"), new SecureRandom());
+        return kpg.generateKeyPair();
+    }
+
+    /**
+     * Generates a key pair using a Brainpool curve (brainpoolP256r1).
+     */
+    public KeyPair generateBrainpoolKeyPair() throws Exception {
+        KeyPairGenerator kpg = KeyPairGenerator.getInstance("EC", "BC");
+        kpg.initialize(new ECGenParameterSpec("brainpoolP256r1"), new SecureRandom());
+        return kpg.generateKeyPair();
+    }
+
+    /**
+     * Generates an X25519 key pair.
+     */
+    public KeyPair generateX25519KeyPair() throws Exception {
+        KeyPairGenerator kpg = KeyPairGenerator.getInstance("X25519", "BC");
+        return kpg.generateKeyPair();
+    }
+
+    /**
+     * Generates an Ed25519 key pair (used for signatures).
+     */
+    public KeyPair generateEd25519KeyPair() throws Exception {
+        KeyPairGenerator kpg = KeyPairGenerator.getInstance("Ed25519", "BC");
+        return kpg.generateKeyPair();
+    }
+
+    /**
+     * Generates a key pair for "OtherEllipticCurveType" as a fallback (using
+     * secp256r1).
+     */
+    public KeyPair generateOtherEllipticCurveKeyPair() throws Exception {
+        return generateNISTKeyPair();
+    }
+
+    // ----------------------------
+    // 2. Key Agreement (ECDH) Examples
+    // ----------------------------
+    /**
+     * Performs ECDH key agreement using two ephemeral NIST key pairs. Secure
+     * Example: Uses ephemeral keys and a strong RNG.
+     *
+     * @return The shared secret.
+     */
+    public byte[] performECDHKeyAgreement() throws Exception {
+        KeyPair aliceKP = generateNISTKeyPair();
+        KeyPair bobKP = generateNISTKeyPair();
+
+        KeyAgreement ka = KeyAgreement.getInstance("ECDH", "BC");
+        ka.init(aliceKP.getPrivate());
+        ka.doPhase(bobKP.getPublic(), true);
+        return ka.generateSecret();
+    }
+
+    /**
+     * Insecure ECDH Example: Uses a static key pair for both parties. SAST:
+     * Reusing the same key pair eliminates forward secrecy and is insecure.
+     *
+     * @return The (insecure) shared secret.
+     */
+    public byte[] insecureECDHKeyAgreement() throws Exception {
+        KeyPair staticKP = generateNISTKeyPair();
+        KeyAgreement ka = KeyAgreement.getInstance("ECDH", "BC");
+        ka.init(staticKP.getPrivate());
+        ka.doPhase(staticKP.getPublic(), true);
+        return ka.generateSecret();
+    }
+
+    // ----------------------------
+    // 3. Digital Signature Examples
+    // ----------------------------
+    /**
+     * Generates an ECDSA signature using a NIST key pair. Secure Example.
+     *
+     * @param message The message to sign.
+     * @return The signature.
+     */
+    public byte[] generateECDSASignature(byte[] message) throws Exception {
+        KeyPair kp = generateNISTKeyPair();
+        Signature signature = Signature.getInstance("SHA256withECDSA", "BC");
+        signature.initSign(kp.getPrivate());
+        signature.update(message);
+        return signature.sign();
+    }
+
+    /**
+     * Verifies an ECDSA signature using the corresponding NIST key pair.
+     *
+     * @param message The original message.
+     * @param signatureBytes The signature to verify.
+     * @param kp The key pair used for signing.
+     * @return True if the signature is valid.
+     */
+    public boolean verifyECDSASignature(byte[] message, byte[] signatureBytes, KeyPair kp) throws Exception {
+        Signature signature = Signature.getInstance("SHA256withECDSA", "BC");
+        signature.initVerify(kp.getPublic());
+        signature.update(message);
+        return signature.verify(signatureBytes);
+    }
+
+    /**
+     * Generates an Ed25519 signature. Secure Example: Ed25519 is a modern,
+     * high-performance signature scheme.
+     *
+     * @param message The message to sign.
+     * @return The signature.
+     */
+    public byte[] generateEd25519Signature(byte[] message) throws Exception {
+        KeyPair kp = generateEd25519KeyPair();
+        Signature signature = Signature.getInstance("Ed25519", "BC");
+        signature.initSign(kp.getPrivate());
+        signature.update(message);
+        return signature.sign();
+    }
+
+    /**
+     * Verifies an Ed25519 signature.
+     *
+     * @param message The original message.
+     * @param signatureBytes The signature to verify.
+     * @param kp The key pair used for signing.
+     * @return True if the signature is valid.
+     */
+    public boolean verifyEd25519Signature(byte[] message, byte[] signatureBytes, KeyPair kp) throws Exception {
+        Signature signature = Signature.getInstance("Ed25519", "BC");
+        signature.initVerify(kp.getPublic());
+        signature.update(message);
+        return signature.verify(signatureBytes);
+    }
+
+    // ----------------------------
+    // 4. ECIES-like Encryption (ECDH + AES-GCM)
+    // ----------------------------
+    /**
+     * A simple simulation of ECIES using ECDH for key agreement and AES-GCM for
+     * encryption. Secure Example: Uses ephemeral ECDH key pairs, a KDF to
+     * derive a symmetric key, and AES-GCM with a random nonce.
+     *
+     * @param plaintext The plaintext to encrypt.
+     * @return The concatenation of the ephemeral public key, IV, and ciphertext
+     * (Base64-encoded).
+     * @throws Exception if encryption fails.
+     */
+    public String eciesEncryptionExample(byte[] plaintext) throws Exception {
+        // Generate ephemeral key pairs for two parties.
+        KeyPair senderKP = generateNISTKeyPair();
+        KeyPair receiverKP = generateNISTKeyPair();
+
+        // Perform ECDH key agreement.
+        KeyAgreement ka = KeyAgreement.getInstance("ECDH", "BC");
+        ka.init(senderKP.getPrivate());
+        ka.doPhase(receiverKP.getPublic(), true);
+        byte[] sharedSecret = ka.generateSecret();
+
+        // Derive a symmetric key from the shared secret using SHA-256 (first 16 bytes
+        // for AES-128).
+        MessageDigest digest = MessageDigest.getInstance("SHA-256");
+        byte[] derivedKey = digest.digest(sharedSecret);
+        derivedKey = Arrays.copyOf(derivedKey, 16);
+        SecretKey aesKey = new SecretKeySpec(derivedKey, "AES");
+
+        // Encrypt plaintext using AES-GCM with a random nonce.
+        Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
+        byte[] iv = new byte[12];
+        new SecureRandom().nextBytes(iv);
+        GCMParameterSpec spec = new GCMParameterSpec(128, iv);
+        cipher.init(Cipher.ENCRYPT_MODE, aesKey, spec);
+        byte[] ciphertext = cipher.doFinal(plaintext);
+
+        // For ECIES, include the sender's ephemeral public key with the output.
+        byte[] senderPub = senderKP.getPublic().getEncoded();
+        byte[] output = concatenate(senderPub, concatenate(iv, ciphertext));
+
+        return Base64.getEncoder().encodeToString(output);
+    }
+
+    // ----------------------------
+    // 5. Main Method for Demonstration
+    // ----------------------------
+    public static void main(String[] args) {
+        try {
+            EllipticCurve2 test = new EllipticCurve2();
+
+            // Key Agreement Example:
+            byte[] sharedSecret = test.performECDHKeyAgreement();
+            System.out.println("ECDH Shared Secret (Base64): " + Base64.getEncoder().encodeToString(sharedSecret));
+
+            // ECDSA Signature Example:
+            byte[] message = "Test message for ECDSA".getBytes();
+            KeyPair nistKP = test.generateNISTKeyPair();
+            byte[] ecdsaSig = test.generateECDSASignature(message);
+            boolean validSig = test.verifyECDSASignature(message, ecdsaSig, nistKP);
+            System.out.println("ECDSA Signature valid? " + validSig);
+
+            // Ed25519 Signature Example:
+            byte[] edSig = test.generateEd25519Signature(message);
+            KeyPair edKP = test.generateEd25519KeyPair();
+            boolean validEdSig = test.verifyEd25519Signature(message, edSig, edKP);
+            System.out.println("Ed25519 Signature valid? " + validEdSig);
+
+            // ECIES-like Encryption Example:
+            String eciesOutput = test.eciesEncryptionExample("Secret ECIES Message".getBytes());
+            System.out.println("ECIES-like Encrypted Output (Base64): " + eciesOutput);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private byte[] concatenate(byte[] a, byte[] b) {
+        byte[] result = new byte[a.length + b.length];
+        System.arraycopy(a, 0, result, 0, a.length);
+        System.arraycopy(b, 0, result, a.length, b.length);
+        return result;
+    }
+}
diff --git a/java/ql/test/experimental/library-tests/quantum/jca/Encryption1.java b/java/ql/test/experimental/library-tests/quantum/jca/Encryption1.java
new file mode 100644
index 00000000000..74b2070d13e
--- /dev/null
+++ b/java/ql/test/experimental/library-tests/quantum/jca/Encryption1.java
@@ -0,0 +1,182 @@
+package com.example.crypto.algorithms;
+
+//import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import java.security.*;
+import java.util.Base64;
+import javax.crypto.Cipher;
+import javax.crypto.KeyGenerator;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.GCMParameterSpec;
+
+/**
+ * This class demonstrates several encryption schemes along with SAST/CBOM
+ * classification notes.
+ *
+ * Methods include:
+ *
+ * 1. simpleAESEncryption: Uses AES in GCM mode.
+ * - CBOM: AES-GCM is classified as secure (Parent: AEAD).
+ * - SAST: Secure symmetric encryption pattern; safe when used properly.
+ *
+ * 2. insecureAESWithECB: Uses AES in ECB mode.
+ * - CBOM: AES-ECB is classified as insecure (Parent: SymmetricEncryption).
+ * - SAST: Insecure encryption pattern; flagged as vulnerable due to lack of IV
+ * and predictable structure.
+ *
+ * 3. rsaOaepEncryption / rsaOaepDecryption: Use RSA with OAEP padding.
+ * - CBOM: RSA-OAEP is classified as secure for public-key encryption (Parent:
+ * Hybrid Cryptosystem).
+ * - SAST: Secure for small payloads/key encapsulation; must only encrypt small
+ * data blocks.
+ *
+ * 4. rsaKemEncryption: Demonstrates a key encapsulation mechanism (KEM) using
+ * RSA-OAEP.
+ * - CBOM: RSA-KEM is recognized as secure (Parent: RSA-OAEP based KEM).
+ * - SAST: Secure when used to encapsulate symmetric keys in a hybrid system.
+ *
+ * 5. hybridEncryption: Combines RSA-OAEP for key encapsulation with AES-GCM for
+ * data encryption.
+ * - CBOM: Hybrid encryption (Parent: RSA-OAEP + AES-GCM) is classified as
+ * secure.
+ * - SAST: Secure hybrid encryption pattern; recommended for large data
+ * encryption.
+ */
+public class Encryption1 {
+
+    // static {
+    //     Security.addProvider(new BouncyCastleProvider());
+    // }
+
+    /**
+     * Simple AES-GCM encryption.
+     *
+     * SAST/CBOM Notes:
+     * - Algorithm: AES/GCM/NoPadding with a 256-bit key.
+     * - Parent Classification: AEAD (Authenticated Encryption with Associated
+     * Data).
+     * - SAST: Considered safe when properly implemented (uses IV and tag).
+     */
+    public void simpleAESEncryption() throws Exception {
+        KeyGenerator keyGen = KeyGenerator.getInstance("AES");
+        keyGen.init(256); // 256-bit AES key.
+        SecretKey key = keyGen.generateKey();
+        Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
+        byte[] iv = new byte[12]; // 12-byte IV recommended for GCM.
+        new SecureRandom().nextBytes(iv);
+        GCMParameterSpec gcmSpec = new GCMParameterSpec(128, iv); // 128-bit authentication tag.
+        cipher.init(Cipher.ENCRYPT_MODE, key, gcmSpec);
+        byte[] encryptedData = cipher.doFinal("Sensitive Data".getBytes());
+        System.out.println("AES-GCM Encrypted Data: " + Base64.getEncoder().encodeToString(encryptedData));
+    }
+
+    /**
+     * Insecure AES encryption using ECB mode.
+     *
+     * SAST/CBOM Notes:
+     * - Algorithm: AES/ECB/NoPadding with a 256-bit key.
+     * - Parent Classification: SymmetricEncryption (ECB mode is inherently
+     * insecure).
+     * - SAST: Flagged as vulnerable; ECB mode does not use an IV and reveals data
+     * patterns.
+     */
+    public void insecureAESWithECB() throws Exception {
+        KeyGenerator keyGen = KeyGenerator.getInstance("AES");
+        keyGen.init(256); // 256-bit AES key.
+        SecretKey key = keyGen.generateKey();
+        // AES/ECB mode is insecure due to the deterministic nature of the block cipher
+        // without an IV.
+        Cipher cipher = Cipher.getInstance("AES/ECB/NoPadding");
+        cipher.init(Cipher.ENCRYPT_MODE, key);
+        byte[] encryptedData = cipher.doFinal("Sensitive Data".getBytes());
+        System.out.println("AES-ECB Encrypted Data (Insecure): " + Base64.getEncoder().encodeToString(encryptedData));
+    }
+
+    /**
+     * RSA encryption using OAEP with SHA-256 and MGF1 padding.
+     *
+     * SAST/CBOM Notes:
+     * - Algorithm: RSA/ECB/OAEPWithSHA-256AndMGF1Padding.
+     * - Parent Classification: Hybrid Cryptosystem. RSA-OAEP is commonly used in
+     * hybrid schemes.
+     * - SAST: Secure for encrypting small payloads or for key encapsulation;
+     * caution when encrypting large data.
+     */
+    public void rsaOaepEncryption(PublicKey publicKey, String data) throws Exception {
+        Cipher cipher = Cipher.getInstance("RSA/ECB/OAEPWithSHA-256AndMGF1Padding");
+        cipher.init(Cipher.ENCRYPT_MODE, publicKey);
+        byte[] encryptedData = cipher.doFinal(data.getBytes());
+        System.out.println("RSA-OAEP Encrypted Data: " + Base64.getEncoder().encodeToString(encryptedData));
+    }
+
+    /**
+     * RSA decryption using OAEP with SHA-256 and MGF1 padding.
+     *
+     * SAST/CBOM Notes:
+     * - Algorithm: RSA/ECB/OAEPWithSHA-256AndMGF1Padding.
+     * - Parent Classification: Hybrid Cryptosystem.
+     * - SAST: Secure when used with the correct corresponding private key.
+     */
+    public void rsaOaepDecryption(PrivateKey privateKey, byte[] encryptedData) throws Exception {
+        Cipher cipher = Cipher.getInstance("RSA/ECB/OAEPWithSHA-256AndMGF1Padding");
+        cipher.init(Cipher.DECRYPT_MODE, privateKey);
+        byte[] decryptedData = cipher.doFinal(encryptedData);
+        System.out.println("Decrypted RSA-OAEP Data: " + new String(decryptedData));
+    }
+
+    /**
+     * RSA-KEM encryption: encapsulates an AES key using RSA-OAEP.
+     *
+     * SAST/CBOM Notes:
+     * - Algorithm: RSA-OAEP used as a Key Encapsulation Mechanism (KEM) for an AES
+     * key.
+     * - Parent Classification: RSA-OAEP based KEM.
+     * - SAST: Recognized as a secure key encapsulation pattern; used as part of
+     * hybrid encryption schemes.
+     */
+    public void rsaKemEncryption(PublicKey rsaPublicKey) throws Exception {
+        KeyGenerator keyGen = KeyGenerator.getInstance("AES");
+        keyGen.init(256); // 256-bit AES key.
+        SecretKey aesKey = keyGen.generateKey();
+
+        Cipher rsaCipher = Cipher.getInstance("RSA/ECB/OAEPWithSHA-256AndMGF1Padding");
+        rsaCipher.init(Cipher.ENCRYPT_MODE, rsaPublicKey);
+        byte[] encryptedAesKey = rsaCipher.doFinal(aesKey.getEncoded());
+
+        System.out.println("RSA-KEM Encrypted AES Key: " + Base64.getEncoder().encodeToString(encryptedAesKey));
+    }
+
+    /**
+     * Hybrid encryption: combines RSA-OAEP for key encapsulation with AES-GCM for
+     * data encryption.
+     *
+     * SAST/CBOM Notes:
+     * - Algorithms: RSA-OAEP (for encrypting the AES key) and AES-GCM (for
+     * encrypting the data).
+     * - Parent Classification: Hybrid Cryptosystem (RSA-OAEP + AES-GCM).
+     * - SAST: This pattern is considered secure when implemented correctly;
+     * recommended for large data encryption.
+     */
+    public void hybridEncryption(PublicKey rsaPublicKey, String data) throws Exception {
+        // Generate a 256-bit AES key for symmetric encryption.
+        KeyGenerator keyGen = KeyGenerator.getInstance("AES");
+        keyGen.init(256);
+        SecretKey aesKey = keyGen.generateKey();
+
+        // Encrypt the AES key using RSA-OAEP.
+        Cipher rsaCipher = Cipher.getInstance("RSA/ECB/OAEPWithSHA-256AndMGF1Padding");
+        rsaCipher.init(Cipher.ENCRYPT_MODE, rsaPublicKey);
+        byte[] encryptedAesKey = rsaCipher.doFinal(aesKey.getEncoded());
+
+        // Encrypt the actual data using AES-GCM.
+        Cipher aesCipher = Cipher.getInstance("AES/GCM/NoPadding");
+        byte[] iv = new byte[12]; // 12-byte IV recommended for GCM.
+        new SecureRandom().nextBytes(iv);
+        GCMParameterSpec gcmSpec = new GCMParameterSpec(128, iv);
+        aesCipher.init(Cipher.ENCRYPT_MODE, aesKey, gcmSpec);
+        byte[] encryptedData = aesCipher.doFinal(data.getBytes());
+
+        System.out.println(
+                "Hybrid Encryption - Encrypted AES Key: " + Base64.getEncoder().encodeToString(encryptedAesKey));
+        System.out.println("Hybrid Encryption - Encrypted Data: " + Base64.getEncoder().encodeToString(encryptedData));
+    }
+}
diff --git a/java/ql/test/experimental/library-tests/quantum/jca/Encryption2.java b/java/ql/test/experimental/library-tests/quantum/jca/Encryption2.java
new file mode 100644
index 00000000000..edcfa030204
--- /dev/null
+++ b/java/ql/test/experimental/library-tests/quantum/jca/Encryption2.java
@@ -0,0 +1,179 @@
+package com.example.crypto.algorithms;
+
+//import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import java.security.*;
+import java.security.spec.ECGenParameterSpec;
+import java.util.Arrays;
+import java.util.Base64;
+import javax.crypto.Cipher;
+import javax.crypto.KeyAgreement;
+import javax.crypto.Mac;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.GCMParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+
+/**
+ * This class demonstrates encryption schemes using elliptic-curve
+ * Diffie-Hellman (ECDH) and hybrid encryption methods, including a post-quantum
+ * hybrid scheme.
+ *
+ * SAST/CBOM Classification:
+ *
+ * 1. EC Key Generation & ECDH Key Agreement: - Parent Classification:
+ * Asymmetric Key Generation / Key Agreement. - SAST: Secure when using
+ * established curves (secp256r1) and reputable providers (BouncyCastle).
+ *
+ * 2. ECDH Hybrid Encryption: - Parent Classification: Hybrid Cryptosystem (ECDH
+ * + AEAD). - SAST: Uses ECDH for key agreement and AES/GCM for encryption.
+ * However, the derivation of an AES key by applying a single SHA-256 hash to
+ * the shared secret may be flagged as a weak key derivation method. A dedicated
+ * KDF (e.g., HKDF) is recommended.
+ *
+ * 3. Post-Quantum Hybrid Encryption: - Parent Classification: Hybrid
+ * Cryptosystem (Classical ECDH + Post-Quantum Secret + KDF + AEAD). - SAST:
+ * Combining classical and post-quantum components is advanced and secure if
+ * implemented properly. The custom HKDF expand function provided here is
+ * simplistic and may be flagged in a CBOM analysis; a standard HKDF library
+ * should be used in production.
+ */
+public class Encryption2 {
+
+    // static {
+    //     Security.addProvider(new BouncyCastleProvider());
+    // }
+    /**
+     * Generates an Elliptic Curve (EC) key pair using the secp256r1 curve.
+     *
+     * SAST/CBOM Notes: - Algorithm: EC key pair generation. - Parent
+     * Classification: Asymmetric Key Generation. - SAST: Considered secure when
+     * using strong randomness and a reputable provider.
+     *
+     * @return an EC KeyPair.
+     */
+    public KeyPair generateECKeyPair() throws Exception {
+        KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("EC", "BC");
+        keyPairGenerator.initialize(new ECGenParameterSpec("secp256r1"), new SecureRandom());
+        return keyPairGenerator.generateKeyPair();
+    }
+
+    /**
+     * Derives a shared secret using Elliptic Curve Diffie-Hellman (ECDH).
+     *
+     * SAST/CBOM Notes: - Algorithm: ECDH key agreement. - Parent
+     * Classification: Asymmetric Key Agreement. - SAST: Secure when both
+     * parties use strong EC keys and proper randomness.
+     *
+     * @param privateKey the private key of one party.
+     * @param publicKey the public key of the other party.
+     * @return the derived shared secret as a byte array.
+     */
+    public byte[] deriveSharedSecret(PrivateKey privateKey, PublicKey publicKey) throws Exception {
+        KeyAgreement keyAgreement = KeyAgreement.getInstance("ECDH", "BC");
+        keyAgreement.init(privateKey);
+        keyAgreement.doPhase(publicKey, true);
+        return keyAgreement.generateSecret();
+    }
+
+    /**
+     * Performs hybrid encryption using ECDH to derive a shared secret, then
+     * derives an AES key by hashing the shared secret with SHA-256, and finally
+     * encrypts the data with AES-GCM.
+     *
+     * SAST/CBOM Notes: - Parent Classification: Hybrid Cryptosystem (ECDH +
+     * AES-GCM). - SAST: While ECDH and AES-GCM are secure, the key derivation
+     * method here (a single SHA-256 hash) is not as robust as using a dedicated
+     * KDF. This approach may be flagged and is recommended for improvement.
+     *
+     * @param recipientPublicKey the recipient's public EC key.
+     * @param data the plaintext data to encrypt.
+     */
+    public void ecdhHybridEncryption(PublicKey recipientPublicKey, String data) throws Exception {
+        // Generate an ephemeral EC key pair for the sender.
+        KeyPair senderKeyPair = generateECKeyPair();
+        // Derive the shared secret using ECDH.
+        byte[] sharedSecret = deriveSharedSecret(senderKeyPair.getPrivate(), recipientPublicKey);
+
+        // Derive an AES key by hashing the shared secret with SHA-256.
+        // SAST Note: Using a direct hash for key derivation is simplistic and may be
+        // flagged.
+        MessageDigest sha256 = MessageDigest.getInstance("SHA-256");
+        byte[] aesKeyBytes = sha256.digest(sharedSecret);
+        // Use the first 16 bytes (128 bits) as the AES key.
+        SecretKey aesKey = new SecretKeySpec(aesKeyBytes, 0, 16, "AES");
+
+        // Encrypt the data using AES-GCM.
+        Cipher aesCipher = Cipher.getInstance("AES/GCM/NoPadding");
+        byte[] iv = new byte[12]; // 12-byte IV recommended for GCM.
+        new SecureRandom().nextBytes(iv);
+        GCMParameterSpec gcmSpec = new GCMParameterSpec(128, iv); // 128-bit authentication tag.
+        aesCipher.init(Cipher.ENCRYPT_MODE, aesKey, gcmSpec);
+        byte[] encryptedData = aesCipher.doFinal(data.getBytes());
+
+        System.out.println(
+                "ECDH Hybrid Encryption - Encrypted Data: " + Base64.getEncoder().encodeToString(encryptedData));
+    }
+
+    /**
+     * Performs post-quantum hybrid encryption by combining a classical
+     * ECDH-derived secret with a post-quantum shared secret. The two secrets
+     * are combined using a custom HKDF expansion, and the derived key is used
+     * to encrypt data with AES-GCM.
+     *
+     * SAST/CBOM Notes: - Parent Classification: Hybrid Cryptosystem (Classical
+     * ECDH + Post-Quantum Secret + KDF + AES-GCM). - SAST: The combination of
+     * classical and post-quantum secrets is a modern approach. However, the
+     * custom HKDF expand function is simplistic and may be flagged as insecure.
+     * Use a standard HKDF implementation in production.
+     *
+     * @param ecPublicKey the recipient's EC public key.
+     * @param pqSharedSecret the post-quantum shared secret from a separate
+     * algorithm.
+     */
+    public void postQuantumHybridEncryption(PublicKey ecPublicKey, byte[] pqSharedSecret) throws Exception {
+        // Step 1: Perform classical ECDH key agreement to derive a shared secret.
+        byte[] ecdhSharedSecret = deriveSharedSecret(generateECKeyPair().getPrivate(), ecPublicKey);
+
+        // Step 2: Combine the ECDH secret and the post-quantum secret using a
+        // simplified HKDF expansion.
+        // SAST Note: This custom HKDF implementation is minimal and does not follow the
+        // full HKDF spec.
+        byte[] combinedSecret = hkdfExpand(ecdhSharedSecret, pqSharedSecret, 32);
+        // Use the first 16 bytes as the AES key (128-bit key).
+        SecretKey aesKey = new SecretKeySpec(combinedSecret, 0, 16, "AES");
+
+        // Step 3: Encrypt the data using AES-GCM.
+        Cipher aesCipher = Cipher.getInstance("AES/GCM/NoPadding");
+        byte[] iv = new byte[12]; // 12-byte IV recommended for GCM.
+        new SecureRandom().nextBytes(iv);
+        GCMParameterSpec gcmSpec = new GCMParameterSpec(128, iv);
+        aesCipher.init(Cipher.ENCRYPT_MODE, aesKey, gcmSpec);
+        byte[] encryptedData = aesCipher.doFinal("Post-Quantum Hybrid Encryption Data".getBytes());
+
+        System.out.println("Post-Quantum Hybrid Encryption - Encrypted Data: "
+                + Base64.getEncoder().encodeToString(encryptedData));
+    }
+
+    /**
+     * A simplified HKDF expansion function that uses HMAC-SHA256 to derive a
+     * key of a desired length.
+     *
+     * SAST/CBOM Notes: - Parent Classification: Key Derivation Function (KDF).
+     * - SAST: Custom KDF implementations are risky if not thoroughly vetted.
+     * This simple HKDF expand function lacks the full HKDF mechanism (e.g.,
+     * multiple iterations, info, and context parameters) and may be flagged. It
+     * is recommended to use a standardized HKDF library.
+     *
+     * @param inputKey the input key material.
+     * @param salt a salt value (here, the post-quantum shared secret is used as
+     * the salt).
+     * @param length the desired length of the derived key.
+     * @return a derived key of the specified length.
+     */
+    private byte[] hkdfExpand(byte[] inputKey, byte[] salt, int length) throws Exception {
+        Mac hmac = Mac.getInstance("HmacSHA256");
+        SecretKey secretKey = new SecretKeySpec(salt, "HmacSHA256");
+        hmac.init(secretKey);
+        byte[] extractedKey = hmac.doFinal(inputKey);
+        return Arrays.copyOf(extractedKey, length);
+    }
+}
diff --git a/java/ql/test/experimental/library-tests/quantum/jca/Hash.java b/java/ql/test/experimental/library-tests/quantum/jca/Hash.java
new file mode 100644
index 00000000000..d4e6985eac6
--- /dev/null
+++ b/java/ql/test/experimental/library-tests/quantum/jca/Hash.java
@@ -0,0 +1,313 @@
+package com.example.crypto.algorithms;
+
+// import org.bouncycastle.crypto.digests.SHA3Digest;
+// import org.bouncycastle.crypto.digests.Blake2bDigest;
+// import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.security.*;
+import java.util.Base64;
+import java.util.Properties;
+import javax.crypto.Mac;
+import javax.crypto.SecretKey;
+import javax.crypto.SecretKeyFactory;
+import javax.crypto.spec.SecretKeySpec;
+import javax.crypto.spec.PBEKeySpec;
+
+/**
+ * This class demonstrates various hashing, HMAC, and password hashing
+ * techniques.
+ *
+ * SAST/CBOM Classification Notes:
+ *
+ * 1. simpleSHA256Hash: - Parent Classification: Cryptographic Hash Function. -
+ * SAST: Uses SHA-256, which is widely regarded as secure.
+ *
+ * 2. insecureMD5Hash: - Parent Classification: Cryptographic Hash Function. -
+ * SAST: MD5 is cryptographically broken and should be flagged as insecure.
+ *
+ * 3. hashWithBouncyCastleSHA3: - Parent Classification: Cryptographic Hash
+ * Function (SHA3). - SAST: Uses SHA3-256 from BouncyCastle; considered secure.
+ *
+ * 4. hashWithBouncyCastleBlake2b: - Parent Classification: Cryptographic Hash
+ * Function (BLAKE2). - SAST: Uses BLAKE2b-512; considered secure if used
+ * correctly.
+ *
+ * 5. hashAndSign & verifyHashSignature: - Parent Classification: Digital
+ * Signature (RSA-based). - SAST: Uses SHA256withRSA for signing and
+ * verification; secure if key management is proper.
+ *
+ * 6. hashForDataIntegrityCheck: - Parent Classification: Data Integrity Check.
+ * - SAST: Uses SHA-256 to verify integrity; considered secure.
+ *
+ * 7. hashWithVariousAlgorithms: - Parent Classification: Cryptographic Hash
+ * Function. - SAST: Iterates through multiple algorithms; insecure algorithms
+ * (MD5, SHA-1) may be flagged.
+ *
+ * 8. hmacWithVariousAlgorithms: - Parent Classification: Message Authentication
+ * Code (MAC). - SAST: Iterates through various HMAC algorithms; HmacSHA1 is
+ * considered weaker than SHA256 and above.
+ *
+ * 9. hashForPasswordStorage: - Parent Classification: Password-Based Key
+ * Derivation Function (PBKDF). - SAST: Uses PBKDF2WithHmacSHA256 with salt and
+ * iteration count; considered secure, though iteration counts should be
+ * reviewed against current standards.
+ *
+ * 10. hashFromUnknownConfig: - Parent Classification: Dynamic Cryptographic
+ * Hash Function. - SAST: Loading the hash algorithm from an external
+ * configuration introduces risk of misconfiguration.
+ *
+ * 11. insecureHashBasedRNG: - Parent Classification: Pseudo-Random Number
+ * Generator (PRNG) using hash. - SAST: Uses a fixed seed with various hash
+ * algorithms; flagged as insecure due to predictability.
+ */
+public class Hash {
+
+    // static {
+    //     Security.addProvider(new BouncyCastleProvider());
+    // }
+    /**
+     * Computes a SHA-256 hash of static test data.
+     *
+     * CBOM/SAST Classification: - Uses SHA-256: Classified as secure.
+     */
+    public void simpleSHA256Hash() throws Exception {
+        MessageDigest digest = MessageDigest.getInstance("SHA-256");
+        byte[] hash = digest.digest("Simple Test Data".getBytes());
+        System.out.println("SHA-256 Hash: " + Base64.getEncoder().encodeToString(hash));
+    }
+
+    /**
+     * Computes an MD5 hash of static data.
+     *
+     * CBOM/SAST Classification: - Uses MD5: Classified as insecure. - SAST: MD5
+     * is deprecated for cryptographic purposes due to collision
+     * vulnerabilities.
+     */
+    public void insecureMD5Hash() throws Exception {
+        MessageDigest md5Digest = MessageDigest.getInstance("MD5");
+        byte[] hash = md5Digest.digest("Weak Hash Example".getBytes());
+        System.out.println("MD5 Hash (Insecure): " + Base64.getEncoder().encodeToString(hash));
+    }
+
+    // /**
+    //  * Computes a SHA3-256 hash using BouncyCastle's SHA3Digest.
+    //  *
+    //  * CBOM/SAST Classification:
+    //  * - Uses SHA3-256: Classified as secure.
+    //  * - SAST: BouncyCastle's implementation is considered reliable.
+    //  */
+    // public void hashWithBouncyCastleSHA3(String input) {
+    //     SHA3Digest digest = new SHA3Digest(256);
+    //     byte[] inputBytes = input.getBytes();
+    //     digest.update(inputBytes, 0, inputBytes.length);
+    //     byte[] hash = new byte[digest.getDigestSize()];
+    //     digest.doFinal(hash, 0);
+    //     System.out.println("SHA3-256 (BC) Hash: " + Base64.getEncoder().encodeToString(hash));
+    // }
+    // /**
+    //  * Computes a BLAKE2b-512 hash using BouncyCastle's Blake2bDigest.
+    //  *
+    //  * CBOM/SAST Classification:
+    //  * - Uses BLAKE2b-512: Classified as secure.
+    //  * - SAST: BLAKE2b is modern and fast, considered secure when used correctly.
+    //  */
+    // public void hashWithBouncyCastleBlake2b(String input) {
+    //     Blake2bDigest digest = new Blake2bDigest(512);
+    //     byte[] inputBytes = input.getBytes();
+    //     digest.update(inputBytes, 0, inputBytes.length);
+    //     byte[] hash = new byte[digest.getDigestSize()];
+    //     digest.doFinal(hash, 0);
+    //     System.out.println("BLAKE2b-512 (BC) Hash: " + Base64.getEncoder().encodeToString(hash));
+    // }
+    /**
+     * Signs the hash of the input using SHA256withRSA.
+     *
+     * CBOM/SAST Classification: - Digital Signature (RSA): Classified as secure
+     * if keys are managed correctly. - SAST: The combination of SHA256 and RSA
+     * is a standard and secure pattern.
+     *
+     * @param input The input data to be signed.
+     * @param privateKey The RSA private key used for signing.
+     */
+    public void hashAndSign(String input, PrivateKey privateKey) throws Exception {
+        Signature signature = Signature.getInstance("SHA256withRSA");
+        signature.initSign(privateKey);
+        signature.update(input.getBytes());
+        byte[] signedData = signature.sign();
+        System.out.println("Signed Hash: " + Base64.getEncoder().encodeToString(signedData));
+    }
+
+    /**
+     * Verifies the signature of the input data.
+     *
+     * CBOM/SAST Classification: - Digital Signature Verification: Classified as
+     * secure when using SHA256withRSA. - SAST: Should correctly verify that the
+     * signed hash matches the input.
+     *
+     * @param input The original input data.
+     * @param signedHash The signed hash to verify.
+     * @param publicKey The RSA public key corresponding to the private key that
+     * signed the data.
+     * @return true if the signature is valid, false otherwise.
+     */
+    public boolean verifyHashSignature(String input, byte[] signedHash, PublicKey publicKey) throws Exception {
+        Signature signature = Signature.getInstance("SHA256withRSA");
+        signature.initVerify(publicKey);
+        signature.update(input.getBytes());
+        return signature.verify(signedHash);
+    }
+
+    /**
+     * Computes a SHA-256 hash for data integrity checking and compares it with
+     * an expected hash.
+     *
+     * CBOM/SAST Classification: - Data Integrity: Uses SHA-256 for integrity
+     * checks, which is secure. - SAST: A correct implementation for verifying
+     * data has not been tampered with.
+     *
+     * @param data The input data.
+     * @param expectedHash The expected Base64-encoded hash.
+     */
+    public void hashForDataIntegrityCheck(String data, String expectedHash) throws Exception {
+        MessageDigest digest = MessageDigest.getInstance("SHA-256");
+        byte[] hash = digest.digest(data.getBytes());
+        String computedHash = Base64.getEncoder().encodeToString(hash);
+        System.out.println("Computed Hash: " + computedHash);
+        System.out.println("Validation: " + (computedHash.equals(expectedHash) ? "Pass" : "Fail"));
+    }
+
+    /**
+     * Computes hashes of the input data using various algorithms.
+     *
+     * CBOM/SAST Classification: - Cryptographic Hash Functions: Iterates
+     * through multiple hash functions. - SAST: While many are secure (e.g.,
+     * SHA-256, SHA-512, SHA3), MD5 and SHA-1 are insecure and should be flagged
+     * if used in security-critical contexts.
+     *
+     * @param input The input data to hash.
+     */
+    public void hashWithVariousAlgorithms(String input) throws Exception {
+        String[] algorithms = {"SHA-1", "SHA-224", "SHA-256", "SHA-384", "SHA-512", "SHA3-256", "SHA3-512",
+            "BLAKE2B-512", "BLAKE2S-256", "MD5"};
+        for (String algorithm : algorithms) {
+            MessageDigest digest = MessageDigest.getInstance(algorithm);
+            byte[] hash = digest.digest(input.getBytes());
+            System.out.println(algorithm + " Hash: " + Base64.getEncoder().encodeToString(hash));
+        }
+    }
+
+    /**
+     * Computes HMACs of the input data using various algorithms.
+     *
+     * CBOM/SAST Classification: - Message Authentication Code (MAC): Iterates
+     * through different HMAC algorithms. - SAST: HmacSHA256, HmacSHA384,
+     * HmacSHA512, HmacSHA3-256, and HmacSHA3-512 are secure; HmacSHA1 is
+     * considered less secure and may be flagged.
+     *
+     * @param input The input data.
+     * @param key The secret key used for HMAC computation.
+     */
+    public void hmacWithVariousAlgorithms(String input, byte[] key) throws Exception {
+        String[] algorithms = {"HmacSHA1", "HmacSHA256", "HmacSHA384", "HmacSHA512", "HmacSHA3-256", "HmacSHA3-512"};
+        for (String algorithm : algorithms) {
+            Mac mac = Mac.getInstance(algorithm);
+            SecretKey secretKey = new SecretKeySpec(key, algorithm);
+            mac.init(secretKey);
+            byte[] hmac = mac.doFinal(input.getBytes());
+            System.out.println(algorithm + " HMAC: " + Base64.getEncoder().encodeToString(hmac));
+        }
+    }
+
+    /**
+     * Computes a PBKDF2 hash for password storage.
+     *
+     * CBOM/SAST Classification: - Password-Based Key Derivation Function
+     * (PBKDF): Uses PBKDF2WithHmacSHA256. - SAST: Considered secure when using
+     * a strong salt and an appropriate iteration count. Note: The iteration
+     * count (10000) should be reviewed against current security standards.
+     *
+     * @param password The password to hash.
+     */
+    public void hashForPasswordStorage(String password) throws Exception {
+        byte[] salt = generateSecureSalt(16);
+        // 10,000 iterations and a 256-bit derived key.
+        PBEKeySpec spec = new PBEKeySpec(password.toCharArray(), salt, 10000, 256);
+        SecretKeyFactory factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256");
+        byte[] hash = factory.generateSecret(spec).getEncoded();
+        System.out.println("PBKDF2 Hash: " + Base64.getEncoder().encodeToString(hash));
+    }
+
+    /**
+     * Dynamically loads a hash algorithm from configuration and computes a
+     * hash.
+     *
+     * CBOM/SAST Classification: - Dynamic Cryptographic Hash Selection:
+     * Algorithm is loaded from a config file. - SAST: May be flagged as risky
+     * because an insecure or unintended algorithm might be chosen.
+     */
+    public void hashFromUnknownConfig() throws Exception {
+        String algorithm = loadHashAlgorithmFromConfig("config.properties");
+        MessageDigest digest = MessageDigest.getInstance(algorithm);
+        byte[] hash = digest.digest("Config-based Hashing".getBytes());
+        System.out.println("Dynamically Loaded Hash Algorithm (" + algorithm + "): "
+                + Base64.getEncoder().encodeToString(hash));
+    }
+
+    /**
+     * Demonstrates an insecure method for generating pseudo-random bytes by
+     * using a fixed seed with hash algorithms.
+     *
+     * CBOM/SAST Classification: - Insecure RNG: Uses a fixed seed with various
+     * hash algorithms. - SAST: This approach is insecure because it produces
+     * predictable output and should be flagged.
+     */
+    public void insecureHashBasedRNG() throws Exception {
+        String[] algorithms = {"SHA-256", "SHA-512", "SHA3-256", "SHA3-512"};
+        for (String algorithm : algorithms) {
+            MessageDigest digest = MessageDigest.getInstance(algorithm);
+            byte[] seed = "fixed-seed".getBytes(); // Fixed seed: insecure and predictable.
+            digest.update(seed);
+            byte[] pseudoRandomBytes = digest.digest();
+            System.out.println("Insecure RNG using " + algorithm + ": "
+                    + Base64.getEncoder().encodeToString(pseudoRandomBytes));
+        }
+    }
+
+    /**
+     * Loads the hash algorithm from an external configuration file.
+     *
+     * CBOM/SAST Classification: - Dynamic Configuration: External config
+     * loading. - SAST: The use of external configuration may introduce risks if
+     * the config file is compromised.
+     *
+     * @param configPath Path to the configuration file.
+     * @return The hash algorithm to be used (default is SHA-256).
+     */
+    private String loadHashAlgorithmFromConfig(String configPath) {
+        Properties properties = new Properties();
+        try (FileInputStream fis = new FileInputStream(configPath)) {
+            properties.load(fis);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return properties.getProperty("hash.algorithm", "SHA-256");
+    }
+
+    /**
+     * Generates a secure salt using a cryptographically strong random number
+     * generator.
+     *
+     * CBOM/SAST Classification: - Secure Salt Generation: Uses SecureRandom. -
+     * SAST: This is a best-practice approach for generating salts for password
+     * hashing.
+     *
+     * @param length The desired salt length.
+     * @return A byte array representing the salt.
+     */
+    private byte[] generateSecureSalt(int length) {
+        byte[] salt = new byte[length];
+        new SecureRandom().nextBytes(salt);
+        return salt;
+    }
+}
diff --git a/java/ql/test/experimental/library-tests/quantum/jca/IVArtifact.java b/java/ql/test/experimental/library-tests/quantum/jca/IVArtifact.java
new file mode 100644
index 00000000000..dfd94d82358
--- /dev/null
+++ b/java/ql/test/experimental/library-tests/quantum/jca/IVArtifact.java
@@ -0,0 +1,285 @@
+package com.example.crypto.artifacts;
+
+// import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import javax.crypto.Cipher;
+import javax.crypto.KeyGenerator;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.GCMParameterSpec;
+import java.security.*;
+import java.util.Base64;
+import java.util.random.*;
+import java.util.Properties;
+import java.util.Random;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.Arrays;
+
+public class IVArtifact {
+
+    // static {
+    //     Security.addProvider(new BouncyCastleProvider()); // Ensure BouncyCastle is available
+    // }
+    /**
+     * Simple Case: Generates a secure IV and encrypts with
+     * AES/CBC/PKCS5Padding.
+     */
+    public void simpleIVEncryption() throws Exception {
+        SecretKey key = generateAESKey();
+        IvParameterSpec ivSpec = new IvParameterSpec(secureIV(16));
+        Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
+        cipher.init(Cipher.ENCRYPT_MODE, key, ivSpec);
+        byte[] ciphertext = cipher.doFinal("Simple Test Data".getBytes());
+    }
+
+    public void encryptWithIV(byte[] plaintext, SecretKey key, IvParameterSpec ivSpec, String cipherAlgorithm)
+            throws Exception {
+        Cipher cipher = Cipher.getInstance(cipherAlgorithm);
+        cipher.init(Cipher.ENCRYPT_MODE, key, ivSpec);
+        byte[] ciphertext = cipher.doFinal(plaintext);
+    }
+
+    public void complexIVFlow() {
+        IvParameterSpec ivSpec = new IvParameterSpec(useSecureMethod() ? secureIV(16) : insecureIV(16));
+        processIV(ivSpec);
+
+        // Example dynamic cipher selection with IV usage
+        String cipherAlgorithm = loadCipherAlgorithm();
+        try {
+            encryptWithIV("Sensitive Data".getBytes(), generateAESKey(), ivSpec, cipherAlgorithm);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private boolean useSecureMethod() {
+        return System.currentTimeMillis() % 2 == 0;
+    }
+
+    private void processIV(IvParameterSpec ivSpec) {
+        String ivBase64 = Base64.getEncoder().encodeToString(ivSpec.getIV());
+    }
+
+    private String loadCipherAlgorithm() {
+        Properties properties = new Properties();
+        try {
+            properties.load(new FileInputStream("crypto-config.properties"));
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return properties.getProperty("cipher.algorithm", "AES/CBC/PKCS5Padding");
+    }
+
+    private SecretKey generateAESKey() throws NoSuchAlgorithmException {
+        KeyGenerator keyGen = KeyGenerator.getInstance("AES");
+        keyGen.init(256);
+        return keyGen.generateKey();
+    }
+
+    private byte[] secureIV(int length) {
+        byte[] iv = new byte[length];
+        new SecureRandom().nextBytes(iv);
+        return iv;
+    }
+
+    private byte[] insecureIV(int length) {
+        byte[] iv = new byte[length];
+        new Random().nextBytes(iv);
+        return iv;
+    }
+
+    // -------------------------------
+    // 1. Direct Fixed IV Usage
+    // -------------------------------
+    /**
+     * Encrypts plaintext using AES-GCM with a fixed IV (all zeros). This is an
+     * insecure practice as IV reuse in AES-GCM undermines confidentiality and
+     * integrity.
+     *
+     * @param key The AES key.
+     * @param plaintext The plaintext to encrypt.
+     * @return The ciphertext.
+     * @throws Exception if encryption fails.
+     */
+    public byte[] encryptWithFixedIV(SecretKey key, byte[] plaintext) throws Exception {
+        Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
+        byte[] fixedIV = new byte[12]; // 12-byte fixed IV (all zeros)
+        GCMParameterSpec spec = new GCMParameterSpec(128, fixedIV);
+        cipher.init(Cipher.ENCRYPT_MODE, key, spec);
+        return cipher.doFinal(plaintext);
+    }
+
+    // -------------------------------
+    // 2. Cached IV Usage
+    // -------------------------------
+    // Cache an IV for reuse in multiple encryptions (insecure)
+    private byte[] cachedIV = null;
+
+    /**
+     * Encrypts plaintext using AES-GCM with an IV cached from the first call.
+     * Reusing the same IV across multiple encryptions is insecure.
+     *
+     * @param key The AES key.
+     * @param plaintext The plaintext to encrypt.
+     * @return The ciphertext.
+     * @throws Exception if encryption fails.
+     */
+    public byte[] encryptWithCachedIV(SecretKey key, byte[] plaintext) throws Exception {
+        if (cachedIV == null) {
+            cachedIV = new byte[12];
+            new SecureRandom().nextBytes(cachedIV);
+        }
+        Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
+        GCMParameterSpec spec = new GCMParameterSpec(128, cachedIV);
+        cipher.init(Cipher.ENCRYPT_MODE, key, spec);
+        return cipher.doFinal(plaintext);
+    }
+
+    // -------------------------------
+    // 3. Indirect IV Reuse via Deterministic Derivation
+    // -------------------------------
+    /**
+     * Encrypts plaintext using AES-GCM with an IV derived deterministically
+     * from a constant. This method computes a SHA-256 hash of a constant string
+     * and uses the first 12 bytes as the IV. Such derived IVs are fixed and
+     * must not be reused.
+     *
+     * @param key The AES key.
+     * @param plaintext The plaintext to encrypt.
+     * @return The ciphertext.
+     * @throws Exception if encryption fails.
+     */
+    public byte[] encryptWithDerivedIV(SecretKey key, byte[] plaintext) throws Exception {
+        MessageDigest digest = MessageDigest.getInstance("SHA-256");
+        byte[] constantHash = digest.digest("fixedConstant".getBytes("UTF-8"));
+        byte[] derivedIV = Arrays.copyOf(constantHash, 12); // Deterministically derived IV
+        Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
+        GCMParameterSpec spec = new GCMParameterSpec(128, derivedIV);
+        cipher.init(Cipher.ENCRYPT_MODE, key, spec);
+        return cipher.doFinal(plaintext);
+    }
+
+    // -------------------------------
+    // 4. Reusing a Single IV Across Multiple Messages
+    // -------------------------------
+    /**
+     * Encrypts an array of plaintext messages using AES-GCM with the same IV
+     * for every message. Reusing an IV across messages is insecure in
+     * authenticated encryption schemes.
+     *
+     * @param key The AES key.
+     * @param plaintexts An array of plaintext messages.
+     * @return An array of ciphertexts.
+     * @throws Exception if encryption fails.
+     */
+    public byte[][] encryptMultipleMessagesWithSameIV(SecretKey key, byte[][] plaintexts) throws Exception {
+        byte[] iv = new byte[12];
+        new SecureRandom().nextBytes(iv); // Generate once and reuse
+        byte[][] ciphertexts = new byte[plaintexts.length][];
+        for (int i = 0; i < plaintexts.length; i++) {
+            Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
+            GCMParameterSpec spec = new GCMParameterSpec(128, iv);
+            cipher.init(Cipher.ENCRYPT_MODE, key, spec);
+            ciphertexts[i] = cipher.doFinal(plaintexts[i]);
+        }
+        return ciphertexts;
+    }
+
+    /**
+     * Encrypts the given plaintext using AES-GCM with the provided key and IV.
+     *
+     * @param key The AES key.
+     * @param ivSpec The IV specification.
+     * @param plaintext The plaintext to encrypt.
+     * @return The ciphertext (IV is not prepended here for clarity).
+     * @throws Exception if encryption fails.
+     */
+    public byte[] encrypt(SecretKey key, IvParameterSpec ivSpec, byte[] plaintext) throws Exception {
+        Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
+        // Use 128-bit authentication tag length.
+        GCMParameterSpec spec = new GCMParameterSpec(128, ivSpec.getIV());
+        cipher.init(Cipher.ENCRYPT_MODE, key, spec);
+        return cipher.doFinal(plaintext);
+    }
+
+    /**
+     * Example 1: Reuses the same IvParameterSpec object across two encryption
+     * calls.
+     *
+     * @param key The AES key.
+     * @param plaintext The plaintext to encrypt.
+     * @return An array containing two ciphertexts generated with the same
+     * IvParameterSpec.
+     * @throws Exception if encryption fails.
+     */
+    public byte[][] encryptUsingSameIvParameterSpec(SecretKey key, byte[] plaintext) throws Exception {
+        // Fixed IV (all zeros for demonstration purposes; insecure in production)
+        byte[] fixedIV = new byte[12];
+        IvParameterSpec fixedIvSpec = new IvParameterSpec(fixedIV);
+        // Encrypt the plaintext twice using the same IvParameterSpec.
+        byte[] ciphertext1 = encrypt(key, fixedIvSpec, plaintext);
+        byte[] ciphertext2 = encrypt(key, fixedIvSpec, plaintext);
+        return new byte[][]{ciphertext1, ciphertext2};
+    }
+
+    /**
+     * Example 2: Creates two different IvParameterSpec objects that share the
+     * same underlying IV array.
+     *
+     * @param key The AES key.
+     * @param plaintext The plaintext to encrypt.
+     * @return An array containing two ciphertexts generated with two
+     * IvParameterSpec objects constructed from the same IV array.
+     * @throws Exception if encryption fails.
+     */
+    public byte[][] encryptUsingDifferentIvSpecSameIVArray(SecretKey key, byte[] plaintext) throws Exception {
+        // Create a fixed IV array (all zeros for demonstration; insecure in production)
+        byte[] fixedIV = new byte[12];
+        // Create two distinct IvParameterSpec objects from the same IV array reference.
+        IvParameterSpec ivSpec1 = new IvParameterSpec(fixedIV);
+        IvParameterSpec ivSpec2 = new IvParameterSpec(fixedIV);
+        // Encrypt the plaintext twice.
+        byte[] ciphertext1 = encrypt(key, ivSpec1, plaintext);
+        byte[] ciphertext2 = encrypt(key, ivSpec2, plaintext);
+        return new byte[][]{ciphertext1, ciphertext2};
+    }
+
+    // -------------------------------
+    // Main Method for Demonstration
+    // -------------------------------
+    public static void main(String[] args) {
+        try {
+            IVArtifact test = new IVArtifact();
+            KeyGenerator kg = KeyGenerator.getInstance("AES");
+            kg.init(256, new SecureRandom());
+            SecretKey key = kg.generateKey();
+            byte[] plaintext = "Sensitive Data".getBytes();
+
+            // Example 1: Fixed IV usage
+            byte[] fixedIVCipher1 = test.encryptWithFixedIV(key, plaintext);
+            byte[] fixedIVCipher2 = test.encryptWithFixedIV(key, plaintext);
+            System.out.println("Fixed IV Encryption 1: " + Base64.getEncoder().encodeToString(fixedIVCipher1));
+            System.out.println("Fixed IV Encryption 2: " + Base64.getEncoder().encodeToString(fixedIVCipher2));
+
+            // Example 2: Cached IV usage
+            byte[] cachedIVCipher1 = test.encryptWithCachedIV(key, plaintext);
+            byte[] cachedIVCipher2 = test.encryptWithCachedIV(key, plaintext);
+            System.out.println("Cached IV Encryption 1: " + Base64.getEncoder().encodeToString(cachedIVCipher1));
+            System.out.println("Cached IV Encryption 2: " + Base64.getEncoder().encodeToString(cachedIVCipher2));
+
+            // Example 3: Indirect IV (derived)
+            byte[] derivedIVCipher = test.encryptWithDerivedIV(key, plaintext);
+            System.out.println("Derived IV Encryption: " + Base64.getEncoder().encodeToString(derivedIVCipher));
+
+            // Example 4: Reusing the same IV across multiple messages
+            byte[][] messages = {"Message One".getBytes(), "Message Two".getBytes(), "Message Three".getBytes()};
+            byte[][] multiCiphers = test.encryptMultipleMessagesWithSameIV(key, messages);
+            for (int i = 0; i < multiCiphers.length; i++) {
+                System.out.println("Multi-message Encryption " + (i + 1) + ": "
+                        + Base64.getEncoder().encodeToString(multiCiphers[i]));
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/java/ql/test/experimental/library-tests/quantum/jca/KeyAgreementHybridCryptosystem.java b/java/ql/test/experimental/library-tests/quantum/jca/KeyAgreementHybridCryptosystem.java
new file mode 100644
index 00000000000..6f9bd06b4e7
--- /dev/null
+++ b/java/ql/test/experimental/library-tests/quantum/jca/KeyAgreementHybridCryptosystem.java
@@ -0,0 +1,272 @@
+package com.example.crypto.algorithms;
+
+// import org.bouncycastle.jce.provider.BouncyCastleProvider;
+// import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider;
+import java.security.*;
+import java.security.spec.ECGenParameterSpec;
+import java.util.Arrays;
+import java.util.Base64;
+import javax.crypto.Cipher;
+import javax.crypto.KeyAgreement;
+import javax.crypto.KeyGenerator;
+import javax.crypto.Mac;
+import javax.crypto.SecretKey;
+import javax.crypto.SecretKeyFactory;
+import javax.crypto.spec.GCMParameterSpec;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.PBEKeySpec;
+import javax.crypto.spec.SecretKeySpec;
+
+/**
+ * KeyAgreementHybridCryptosystem demonstrates two hybrid cryptosystems:
+ *
+ * 1. ECDH + AES-GCM: - Secure Flow: Uses ephemeral ECDH key pairs on secp256r1,
+ * applies a simple KDF (SHA-256) to derive a 128-bit AES key, and uses AES-GCM
+ * with a random 12-byte nonce. - Insecure Flow: Reuses a static key pair, uses
+ * raw shared secret truncation, and employs a fixed (zero) IV.
+ *
+ * 2. X25519 + ChaCha20-Poly1305: - Secure Flow: Uses ephemeral X25519 key
+ * pairs, applies a KDF (SHA-256) to derive a 256-bit key, and uses
+ * ChaCha20-Poly1305 with a random nonce. - Insecure Flow: Reuses a static key
+ * pair, directly truncates the shared secret without a proper KDF, and uses a
+ * fixed nonce.
+ *
+ * SAST/CBOM Notes: - Secure flows use proper ephemeral key generation, a simple
+ * KDF, and random nonces. - Insecure flows use static keys, fixed nonces, and
+ * raw shared secret truncation.
+ */
+public class KeyAgreementHybridCryptosystem {
+
+    // static {
+    //     Security.addProvider(new BouncyCastleProvider());
+    //     Security.addProvider(new BouncyCastlePQCProvider());
+    // }
+    // ---------- Helper Methods ----------
+    /**
+     * Generates an ephemeral ECDH key pair on secp256r1.
+     */
+    public KeyPair generateECDHKeyPair() throws Exception {
+        KeyPairGenerator kpg = KeyPairGenerator.getInstance("EC", "BC");
+        kpg.initialize(new ECGenParameterSpec("secp256r1"), new SecureRandom());
+        return kpg.generateKeyPair();
+    }
+
+    /**
+     * Generates an ephemeral X25519 key pair.
+     */
+    public KeyPair generateX25519KeyPair() throws Exception {
+        KeyPairGenerator kpg = KeyPairGenerator.getInstance("X25519", "BC");
+        kpg.initialize(255, new SecureRandom());
+        return kpg.generateKeyPair();
+    }
+
+    /**
+     * Derives a shared secret using the provided key agreement algorithm.
+     */
+    public byte[] deriveSharedSecret(PrivateKey privateKey, PublicKey publicKey, String algorithm) throws Exception {
+        KeyAgreement ka = KeyAgreement.getInstance(algorithm, "BC");
+        ka.init(privateKey);
+        ka.doPhase(publicKey, true);
+        return ka.generateSecret();
+    }
+
+    /**
+     * A simple KDF that hashes the input with SHA-256 and returns the first
+     * numBytes.
+     */
+    public byte[] simpleKDF(byte[] input, int numBytes) throws Exception {
+        MessageDigest digest = MessageDigest.getInstance("SHA-256");
+        byte[] hash = digest.digest(input);
+        return Arrays.copyOf(hash, numBytes);
+    }
+
+    /**
+     * Concatenates two byte arrays.
+     */
+    public byte[] concatenate(byte[] a, byte[] b) {
+        byte[] result = new byte[a.length + b.length];
+        System.arraycopy(a, 0, result, 0, a.length);
+        System.arraycopy(b, 0, result, a.length, b.length);
+        return result;
+    }
+
+    // ===============================================
+    // 1. ECDH + AES-GCM Flows
+    // ===============================================
+    /**
+     * Secure hybrid encryption using ECDH and AES-GCM. Uses ephemeral key
+     * pairs, applies a simple KDF to derive a 128-bit AES key, and uses AES-GCM
+     * with a random 12-byte nonce.
+     */
+    public byte[] secureECDH_AESGCMEncryption(byte[] plaintext) throws Exception {
+        KeyPair aliceKP = generateECDHKeyPair();
+        KeyPair bobKP = generateECDHKeyPair();
+        byte[] aliceSecret = deriveSharedSecret(aliceKP.getPrivate(), bobKP.getPublic(), "ECDH");
+        byte[] aesKeyBytes = simpleKDF(aliceSecret, 16);
+        SecretKey aesKey = new SecretKeySpec(aesKeyBytes, "AES");
+
+        Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
+        byte[] iv = new byte[12];
+        new SecureRandom().nextBytes(iv);
+        GCMParameterSpec spec = new GCMParameterSpec(128, iv);
+        cipher.init(Cipher.ENCRYPT_MODE, aesKey, spec);
+        byte[] ciphertext = cipher.doFinal(plaintext);
+
+        return concatenate(iv, ciphertext);
+    }
+
+    /**
+     * Insecure hybrid encryption using ECDH and AES-GCM. Reuses a static key
+     * pair, uses raw shared secret truncation without a proper KDF, and employs
+     * a fixed IV (all zeros).
+     */
+    public byte[] insecureECDH_AESGCMEncryption(byte[] plaintext) throws Exception {
+        KeyPair staticKP = generateECDHKeyPair();
+        byte[] sharedSecret = deriveSharedSecret(staticKP.getPrivate(), staticKP.getPublic(), "ECDH");
+        byte[] aesKeyBytes = Arrays.copyOf(sharedSecret, 16);
+        SecretKey aesKey = new SecretKeySpec(aesKeyBytes, "AES");
+
+        byte[] fixedIV = new byte[12]; // fixed IV (all zeros)
+        Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
+        GCMParameterSpec spec = new GCMParameterSpec(128, fixedIV);
+        cipher.init(Cipher.ENCRYPT_MODE, aesKey, spec);
+        byte[] ciphertext = cipher.doFinal(plaintext);
+
+        return concatenate(fixedIV, ciphertext);
+    }
+
+    // ===============================================
+    // 2. X25519 + ChaCha20-Poly1305 Flows
+    // ===============================================
+    /**
+     * Secure hybrid encryption using X25519 and ChaCha20-Poly1305. Uses
+     * ephemeral key pairs, applies a KDF (SHA-256) to derive a 256-bit key, and
+     * uses ChaCha20-Poly1305 with a random 12-byte nonce.
+     */
+    public byte[] secureX25519_Chacha20Poly1305Encryption(byte[] plaintext) throws Exception {
+        KeyPair aliceKP = generateX25519KeyPair();
+        KeyPair bobKP = generateX25519KeyPair();
+        byte[] sharedSecret = deriveSharedSecret(aliceKP.getPrivate(), bobKP.getPublic(), "X25519");
+        byte[] chachaKeyBytes = MessageDigest.getInstance("SHA-256").digest(sharedSecret);
+        SecretKey chachaKey = new SecretKeySpec(chachaKeyBytes, "ChaCha20");
+
+        Cipher cipher = Cipher.getInstance("ChaCha20-Poly1305", "BC");
+        byte[] nonce = new byte[12];
+        new SecureRandom().nextBytes(nonce);
+        cipher.init(Cipher.ENCRYPT_MODE, chachaKey, new IvParameterSpec(nonce));
+        byte[] ciphertext = cipher.doFinal(plaintext);
+
+        return concatenate(nonce, ciphertext);
+    }
+
+    /**
+     * Insecure hybrid encryption using X25519 and ChaCha20-Poly1305. Reuses a
+     * static key pair, directly truncates the shared secret without a proper
+     * KDF, and employs a fixed nonce.
+     */
+    public byte[] insecureX25519_Chacha20Poly1305Encryption(byte[] plaintext) throws Exception {
+        KeyPair staticKP = generateX25519KeyPair();
+        byte[] sharedSecret = deriveSharedSecret(staticKP.getPrivate(), staticKP.getPublic(), "X25519");
+        byte[] chachaKeyBytes = Arrays.copyOf(sharedSecret, 32);
+        SecretKey chachaKey = new SecretKeySpec(chachaKeyBytes, "ChaCha20");
+
+        byte[] fixedNonce = new byte[12]; // fixed nonce (all zeros)
+        Cipher cipher = Cipher.getInstance("ChaCha20-Poly1305", "BC");
+        cipher.init(Cipher.ENCRYPT_MODE, chachaKey, new IvParameterSpec(fixedNonce));
+        byte[] ciphertext = cipher.doFinal(plaintext);
+
+        return concatenate(fixedNonce, ciphertext);
+    }
+
+    // ===============================================
+    // 3. Dynamic Hybrid Selection
+    // ===============================================
+    /**
+     * Dynamically selects a hybrid encryption flow based on a configuration
+     * property. If the config is unknown, defaults to an insecure flow.
+     */
+    public String dynamicHybridEncryption(String config, byte[] plaintext) throws Exception {
+        byte[] result;
+        if ("secureECDH".equalsIgnoreCase(config)) {
+            result = secureECDH_AESGCMEncryption(plaintext);
+        } else if ("insecureECDH".equalsIgnoreCase(config)) {
+            result = insecureECDH_AESGCMEncryption(plaintext);
+        } else if ("secureX25519".equalsIgnoreCase(config)) {
+            result = secureX25519_Chacha20Poly1305Encryption(plaintext);
+        } else if ("insecureX25519".equalsIgnoreCase(config)) {
+            result = insecureX25519_Chacha20Poly1305Encryption(plaintext);
+        } else {
+            // Fallback to insecure ECDH flow.
+            result = insecureECDH_AESGCMEncryption(plaintext);
+        }
+        return Base64.getEncoder().encodeToString(result);
+    }
+
+    // ===============================================
+    // 4. Further Key Derivation from Symmetric Keys
+    // ===============================================
+    /**
+     * Derives two keys from a symmetric key using PBKDF2, then uses one key for
+     * AES-GCM encryption and the other for computing a MAC over the ciphertext.
+     */
+    public byte[] furtherUseSymmetricKeyForKeyDerivation(SecretKey key, byte[] plaintext) throws Exception {
+        String keyAsString = Base64.getEncoder().encodeToString(key.getEncoded());
+        byte[] salt = generateSalt(16);
+        PBEKeySpec spec = new PBEKeySpec(keyAsString.toCharArray(), salt, 10000, 256);
+        SecretKeyFactory factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256");
+        byte[] derived = factory.generateSecret(spec).getEncoded();
+        byte[] encKeyBytes = Arrays.copyOfRange(derived, 0, 16);
+        byte[] macKeyBytes = Arrays.copyOfRange(derived, 16, 32);
+        SecretKey encryptionKey = new SecretKeySpec(encKeyBytes, "AES");
+        SecretKey derivedMacKey = new SecretKeySpec(macKeyBytes, "HmacSHA256");
+
+        Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
+        byte[] iv = new byte[12];
+        new SecureRandom().nextBytes(iv);
+        GCMParameterSpec specGcm = new GCMParameterSpec(128, iv);
+        cipher.init(Cipher.ENCRYPT_MODE, encryptionKey, specGcm);
+        byte[] ciphertext = cipher.doFinal(plaintext);
+
+        Mac mac = Mac.getInstance("HmacSHA256");
+        mac.init(derivedMacKey);
+        byte[] computedMac = mac.doFinal(ciphertext);
+
+        byte[] output = new byte[ciphertext.length + computedMac.length];
+        System.arraycopy(ciphertext, 0, output, 0, ciphertext.length);
+        System.arraycopy(computedMac, 0, output, ciphertext.length, computedMac.length);
+        storeOutput(output);
+        return output;
+    }
+
+    // ===============================================
+    // 5. Output/Storage Methods
+    // ===============================================
+    /**
+     * Stores the output securely.
+     */
+    public void storeOutput(byte[] output) {
+        String stored = Base64.getEncoder().encodeToString(output);
+        // In production, this value would be stored or transmitted securely.
+    }
+
+    // ===============================================
+    // 6. Helper Methods for Key/Nonce Generation
+    // ===============================================
+    /**
+     * Generates a secure 256-bit AES key.
+     */
+    public SecretKey generateAESKey() throws Exception {
+        KeyGenerator kg = KeyGenerator.getInstance("AES");
+        kg.init(256, new SecureRandom());
+        return kg.generateKey();
+    }
+
+    /**
+     * Generates a random salt.
+     */
+    private byte[] generateSalt(int length) {
+        byte[] salt = new byte[length];
+        new SecureRandom().nextBytes(salt);
+        return salt;
+    }
+}
diff --git a/java/ql/test/experimental/library-tests/quantum/jca/KeyArtifact.java b/java/ql/test/experimental/library-tests/quantum/jca/KeyArtifact.java
new file mode 100644
index 00000000000..4c80246050a
--- /dev/null
+++ b/java/ql/test/experimental/library-tests/quantum/jca/KeyArtifact.java
@@ -0,0 +1,85 @@
+package com.example.crypto.artifacts;
+
+// import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import java.io.FileInputStream;
+import java.security.*;
+import java.security.spec.*;
+import java.util.Properties;
+import javax.crypto.KeyGenerator;
+import javax.crypto.SecretKey;
+
+public class KeyArtifact {
+
+    // static {
+    //     Security.addProvider(new BouncyCastleProvider());
+    // }
+    public void generateSymmetricKeys() throws NoSuchAlgorithmException {
+        // AES Key Generation (Default Provider)
+        KeyGenerator keyGen = KeyGenerator.getInstance("AES");
+        keyGen.init(256);
+        SecretKey aesKeyJDK = keyGen.generateKey();
+
+        // AES Key Generation (BouncyCastle)
+        keyGen = KeyGenerator.getInstance("AES");
+        keyGen.init(256);
+        SecretKey aesKeyBC = keyGen.generateKey();
+    }
+
+    public void generateAsymmetricKeys() throws NoSuchAlgorithmException {
+        // RSA Key Generation (JDK Default)
+        KeyPairGenerator keyPairGen = KeyPairGenerator.getInstance("RSA");
+        keyPairGen.initialize(2048);
+        KeyPair rsaPairJDK = keyPairGen.generateKeyPair();
+
+        // RSA Key Generation (BouncyCastle)
+        keyPairGen = KeyPairGenerator.getInstance("RSA");
+        keyPairGen.initialize(2048);
+        KeyPair rsaPairBC = keyPairGen.generateKeyPair();
+
+        // EC Key Generation
+        keyPairGen = KeyPairGenerator.getInstance("EC");
+        keyPairGen.initialize(256);
+        KeyPair ecPair = keyPairGen.generateKeyPair();
+    }
+
+    public void importExportRSAKeys(KeyPair keyPair) throws NoSuchAlgorithmException, InvalidKeySpecException {
+        // Export Public Key
+        byte[] pubKeyBytes = keyPair.getPublic().getEncoded();
+        X509EncodedKeySpec pubKeySpec = new X509EncodedKeySpec(pubKeyBytes);
+        KeyFactory keyFactory = KeyFactory.getInstance("RSA");
+        PublicKey importedPubKey = keyFactory.generatePublic(pubKeySpec);
+
+        // Export Private Key
+        byte[] privKeyBytes = keyPair.getPrivate().getEncoded();
+        PKCS8EncodedKeySpec privKeySpec = new PKCS8EncodedKeySpec(privKeyBytes);
+        PrivateKey importedPrivKey = keyFactory.generatePrivate(privKeySpec);
+    }
+
+    public void dynamicAlgorithmSelection() throws Exception {
+        // Load algorithm from configuration
+        Properties properties = new Properties();
+        properties.load(new FileInputStream("crypto-config.properties"));
+        String algorithm = properties.getProperty("key.algorithm", "AES");
+
+        KeyGenerator keyGen = KeyGenerator.getInstance(algorithm);
+        keyGen.init(256);
+        SecretKey dynamicKey = keyGen.generateKey();
+    }
+
+    public KeyPair generateKeyPair(String algorithm) throws NoSuchAlgorithmException {
+        // Wrapper for Key Generation
+        KeyPairGenerator keyPairGen = KeyPairGenerator.getInstance(algorithm);
+        keyPairGen.initialize(2048);
+        return keyPairGen.generateKeyPair();
+    }
+
+    public void keySelectionFromArray() throws NoSuchAlgorithmException {
+        // Selecting Algorithm Dynamically from an Array
+        String[] algorithms = {"RSA", "EC", "Ed25519"};
+        KeyPair[] keyPairs = new KeyPair[algorithms.length];
+
+        for (int i = 0; i < algorithms.length; i++) {
+            keyPairs[i] = generateKeyPair(algorithms[i]);
+        }
+    }
+}
diff --git a/java/ql/test/experimental/library-tests/quantum/jca/KeyDerivation1.java b/java/ql/test/experimental/library-tests/quantum/jca/KeyDerivation1.java
new file mode 100644
index 00000000000..a97f02f18c1
--- /dev/null
+++ b/java/ql/test/experimental/library-tests/quantum/jca/KeyDerivation1.java
@@ -0,0 +1,368 @@
+package com.example.crypto.algorithms;
+
+// import org.bouncycastle.crypto.generators.Argon2BytesGenerator;
+// import org.bouncycastle.crypto.params.Argon2Parameters;
+// import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.security.MessageDigest;
+import java.security.SecureRandom;
+import java.util.Arrays;
+import java.util.Base64;
+import java.util.Properties;
+import javax.crypto.Mac;
+import javax.crypto.SecretKey;
+import javax.crypto.SecretKeyFactory;
+import javax.crypto.spec.PBEKeySpec;
+import javax.crypto.spec.SecretKeySpec;
+
+/**
+ * This class demonstrates multiple key derivation functions (KDFs) including
+ * PBKDF2, scrypt, Argon2, raw hash derivation, HKDF, and dynamic algorithm
+ * selection.
+ *
+ * SAST/CBOM Classification Notes:
+ *
+ * 1. PBKDF2 Examples: - Parent Classification: Password-Based Key Derivation
+ * Function (PBKDF). - SAST: * pbkdf2DerivationBasic: Uses PBKDF2WithHmacSHA256
+ * with 10,000 iterations - acceptable if parameters meet current standards. *
+ * pbkdf2LowIteration: Uses only 10 iterations, flagged as insecure due to
+ * insufficient iteration count. * pbkdf2HighIteration: Uses 1,000,000
+ * iterations - secure (though performance may be impacted). * pbkdf2HmacSHA1:
+ * Uses PBKDF2WithHmacSHA1 - flagged as weaker compared to SHA-256, though
+ * sometimes seen in legacy systems. * pbkdf2HmacSHA512: Uses
+ * PBKDF2WithHmacSHA512 - classified as secure.
+ *
+ * 2. Scrypt Examples: - Parent Classification: Memory-Hard Key Derivation
+ * Function. - SAST: * scryptWeak: Uses weak parameters (n=1024, r=1, p=1) -
+ * flagged as insecure. * scryptStrong: Uses stronger parameters (n=16384, r=8,
+ * p=1) - considered secure.
+ *
+ * 3. Argon2 Examples: - Parent Classification: Memory-Hard Key Derivation
+ * Function (Argon2id). - SAST: * argon2Derivation: Uses moderate memory and
+ * iterations - considered secure. * argon2HighMemory: Uses high memory (128MB)
+ * and more iterations - secure, though resource intensive.
+ *
+ * 4. Insecure Raw Hash Derivation: - Parent Classification: Raw Hash Usage for
+ * Key Derivation. - SAST: Using a single SHA-256 hash as a key and then using
+ * it with insecure AES/ECB mode is highly discouraged.
+ *
+ * 5. HKDF Examples: - Parent Classification: Key Derivation Function (HKDF). -
+ * SAST: The provided HKDF implementation is simplistic (single-block expansion)
+ * and may be flagged.
+ *
+ * 6. Multi-Step Hybrid Derivation: - Parent Classification: Composite KDF
+ * (PBKDF2 followed by HKDF). - SAST: Combining two KDFs is acceptable if done
+ * carefully; however, custom implementations should be reviewed.
+ *
+ * 7. Dynamic KDF Selection: - Parent Classification: Dynamic/Configurable Key
+ * Derivation. - SAST: Loading KDF parameters from configuration introduces
+ * ambiguity and risk if misconfigured.
+ */
+public class KeyDerivation1 {
+
+    // static {
+    //     Security.addProvider(new BouncyCastleProvider());
+    // }
+    //////////////////////////////////////
+    // 1. PBKDF2 EXAMPLES
+    //////////////////////////////////////
+
+    /**
+     * Basic PBKDF2 derivation using PBKDF2WithHmacSHA256.
+     *
+     * SAST/CBOM:
+     * - Parent: PBKDF2.
+     * - Uses 10,000 iterations with a 256-bit key; generally acceptable.
+     */
+    public void pbkdf2DerivationBasic(String password) throws Exception {
+        byte[] salt = generateSalt(16);
+        PBEKeySpec spec = new PBEKeySpec(password.toCharArray(), salt, 10000, 256);
+        SecretKeyFactory factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256");
+        byte[] key = factory.generateSecret(spec).getEncoded();
+        System.out.println("PBKDF2 (Basic) Key: " + Base64.getEncoder().encodeToString(key));
+    }
+
+    /**
+     * PBKDF2 derivation with a very low iteration count.
+     *
+     * SAST/CBOM: - Parent: PBKDF2. - Iteration count is only 10, which is far
+     * below acceptable security standards. - Flagged as insecure.
+     */
+    public void pbkdf2LowIteration(String password) throws Exception {
+        byte[] salt = generateSalt(16);
+        PBEKeySpec spec = new PBEKeySpec(password.toCharArray(), salt, 10, 256); // Very low iteration count.
+        SecretKeyFactory factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256");
+        byte[] key = factory.generateSecret(spec).getEncoded();
+        System.out.println("PBKDF2 (Low Iteration) Key (Insecure): " + Base64.getEncoder().encodeToString(key));
+    }
+
+    /**
+     * PBKDF2 derivation with a high iteration count.
+     *
+     * SAST/CBOM: - Parent: PBKDF2. - Uses 1,000,000 iterations; this is secure
+     * but may impact performance.
+     */
+    public void pbkdf2HighIteration(String password) throws Exception {
+        byte[] salt = generateSalt(16);
+        PBEKeySpec spec = new PBEKeySpec(password.toCharArray(), salt, 1_000_000, 256);
+        SecretKeyFactory factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256");
+        byte[] key = factory.generateSecret(spec).getEncoded();
+        System.out.println("PBKDF2 (High Iteration) Key: " + Base64.getEncoder().encodeToString(key));
+    }
+
+    /**
+     * PBKDF2 derivation using HmacSHA1.
+     *
+     * SAST/CBOM: - Parent: PBKDF2. - Uses HMAC-SHA1, which is considered weaker
+     * than SHA-256; may be acceptable only for legacy systems.
+     */
+    public void pbkdf2HmacSHA1(String password) throws Exception {
+        byte[] salt = generateSalt(16);
+        PBEKeySpec spec = new PBEKeySpec(password.toCharArray(), salt, 80000, 256);
+        SecretKeyFactory factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA1");
+        byte[] key = factory.generateSecret(spec).getEncoded();
+        System.out.println("PBKDF2 (HmacSHA1) Key: " + Base64.getEncoder().encodeToString(key));
+    }
+
+    /**
+     * PBKDF2 derivation using HmacSHA512.
+     *
+     * SAST/CBOM: - Parent: PBKDF2. - Uses HMAC-SHA512 with 160,000 iterations;
+     * classified as secure.
+     */
+    public void pbkdf2HmacSHA512(String password) throws Exception {
+        byte[] salt = generateSalt(16);
+        PBEKeySpec spec = new PBEKeySpec(password.toCharArray(), salt, 160000, 256);
+        SecretKeyFactory factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA512");
+        byte[] key = factory.generateSecret(spec).getEncoded();
+        System.out.println("PBKDF2 (HmacSHA512) Key: " + Base64.getEncoder().encodeToString(key));
+    }
+
+    //////////////////////////////////////
+    // 2. SCRYPT EXAMPLES
+    //////////////////////////////////////
+
+    /**
+     * Scrypt derivation with weak parameters.
+     *
+     * SAST/CBOM:
+     * - Parent: Scrypt.
+     * - Parameters (n=1024, r=1, p=1) are too weak and should be flagged as
+     * insecure.
+     */
+    public void scryptWeak(String password) throws Exception {
+        byte[] salt = generateSalt(16);
+        // Weak parameters: low work factor.
+        PBEKeySpec spec = new PBEKeySpec(password.toCharArray(), salt, 1024, 128);
+        SecretKeyFactory factory = SecretKeyFactory.getInstance("SCRYPT");
+        byte[] key = factory.generateSecret(spec).getEncoded();
+        System.out.println("scrypt (Weak) Key: " + Base64.getEncoder().encodeToString(key));
+    }
+
+    /**
+     * Scrypt derivation with stronger parameters.
+     *
+     * SAST/CBOM: - Parent: Scrypt. - Parameters (n=16384, r=8, p=1) provide a
+     * secure work factor.
+     */
+    public void scryptStrong(String password) throws Exception {
+        byte[] salt = generateSalt(16);
+        // Strong parameters for scrypt.
+        PBEKeySpec spec = new PBEKeySpec(password.toCharArray(), salt, 16384, 256);
+        SecretKeyFactory factory = SecretKeyFactory.getInstance("SCRYPT");
+        byte[] key = factory.generateSecret(spec).getEncoded();
+        System.out.println("scrypt (Strong) Key: " + Base64.getEncoder().encodeToString(key));
+    }
+
+    //////////////////////////////////////
+    // 3. ARGON2 EXAMPLES
+    //////////////////////////////////////
+
+    // /**
+    //  * Argon2 derivation using Argon2id with moderate memory and iterations.
+    //  *
+    //  * SAST/CBOM:
+    //  * - Parent: Argon2 (Memory-Hard KDF).
+    //  * - Parameters: memory=65536 KB, iterations=2, parallelism=2; considered
+    //  * secure.
+    //  */
+    // public void argon2Derivation(String password) throws Exception {
+    //     byte[] salt = generateSalt(16);
+    //     Argon2Parameters.Builder builder = new Argon2Parameters.Builder(Argon2Parameters.ARGON2_id)
+    //             .withSalt(salt)
+    //             .withParallelism(2)
+    //             .withMemoryAsKB(65536)
+    //             .withIterations(2);
+
+    //     Argon2BytesGenerator gen = new Argon2BytesGenerator();
+    //     gen.init(builder.build());
+    //     byte[] hash = new byte[32];
+    //     gen.generateBytes(password.getBytes(), hash, 0, hash.length);
+    //     System.out.println("Argon2 Key: " + Base64.getEncoder().encodeToString(hash));
+    // }
+
+    // /**
+    //  * Argon2 derivation with high memory and more iterations.
+    //  *
+    //  * SAST/CBOM:
+    //  * - Parent: Argon2.
+    //  * - Uses high memory (131072 KB = 128MB) and 5 iterations; secure but resource
+    //  * intensive.
+    //  */
+    // public void argon2HighMemory(String password) throws Exception {
+    //     byte[] salt = generateSalt(16);
+    //     Argon2Parameters.Builder builder = new Argon2Parameters.Builder(Argon2Parameters.ARGON2_id)
+    //             .withSalt(salt)
+    //             .withParallelism(4)
+    //             .withMemoryAsKB(131072) // 128MB of memory.
+    //             .withIterations(5);
+
+    //     Argon2BytesGenerator gen = new Argon2BytesGenerator();
+    //     gen.init(builder.build());
+    //     byte[] hash = new byte[64];
+    //     gen.generateBytes(password.getBytes(), hash, 0, hash.length);
+    //     System.out.println("Argon2 (High Memory) Key: " + Base64.getEncoder().encodeToString(hash));
+    // }
+
+    //////////////////////////////////////
+    // 4. INSECURE RAW HASH EXAMPLES
+    //////////////////////////////////////
+
+    /**
+     * Derives a key by directly hashing input with SHA-256 and uses it for
+     * encryption.
+     *
+     * SAST/CBOM:
+     * - Parent: Raw Hash-Based Key Derivation.
+     * - This approach is insecure since it uses a raw hash as a key and then uses
+     * AES in ECB mode,
+     * which is vulnerable to pattern analysis.
+     */
+    public void insecureRawSHA256Derivation(String input) throws Exception {
+        MessageDigest digest = MessageDigest.getInstance("SHA-256");
+        byte[] derivedKey = digest.digest(input.getBytes());
+        System.out.println("Insecure Raw SHA-256 Key: " + Base64.getEncoder().encodeToString(derivedKey));
+
+        // Insecure usage: AES/ECB mode is used with a key derived from a raw hash.
+        SecretKey key = new SecretKeySpec(derivedKey, 0, 16, "AES");
+        javax.crypto.Cipher cipher = javax.crypto.Cipher.getInstance("AES/ECB/NoPadding");
+        cipher.init(javax.crypto.Cipher.ENCRYPT_MODE, key);
+        byte[] ciphertext = cipher.doFinal("SampleData16Bytes".getBytes());
+        System.out.println("Insecurely Encrypted Data with Raw-SHA256 Key: "
+                + Base64.getEncoder().encodeToString(ciphertext));
+    }
+
+    //////////////////////////////////////
+    // 5. HKDF EXAMPLES
+    //////////////////////////////////////
+
+    /**
+     * Derives a key using a simple HKDF expansion based on HMAC-SHA256.
+     *
+     * SAST/CBOM:
+     * - Parent: HKDF.
+     * - The implementation uses a single-block (simplistic) expansion and may be
+     * flagged.
+     * A full, standard HKDF implementation is recommended.
+     */
+    public void hkdfDerivation(byte[] ikm) throws Exception {
+        byte[] salt = generateSalt(32);
+        byte[] derivedKey = hkdfExpand(ikm, salt, 32);
+        System.out.println("HKDF Derived Key: " + Base64.getEncoder().encodeToString(derivedKey));
+    }
+
+    /**
+     * Multi-step hybrid derivation: first using PBKDF2, then applying HKDF
+     * expansion.
+     *
+     * SAST/CBOM: - Parent: Composite KDF. - Combining PBKDF2 and HKDF is a
+     * non-standard approach and may be flagged; ensure that each step meets
+     * security requirements.
+     */
+    public void multiStepHybridDerivation(String password, byte[] sharedSecret) throws Exception {
+        byte[] pbkdf2Key = derivePBKDF2Key(password);
+        byte[] finalKey = hkdfExpand(sharedSecret, pbkdf2Key, 32);
+        System.out.println("Multi-Step Hybrid Key: " + Base64.getEncoder().encodeToString(finalKey));
+    }
+
+    //////////////////////////////////////
+    // 6. DYNAMIC ALGORITHM SELECTION (AMBIGUOUS CASE)
+    //////////////////////////////////////
+
+    /**
+     * Dynamically selects a KDF algorithm based on external configuration.
+     *
+     * SAST/CBOM:
+     * - Parent: Dynamic/Configurable Key Derivation.
+     * - Loading the algorithm and parameters from a config file introduces risk if
+     * the configuration is compromised
+     * or misconfigured.
+     */
+    public void dynamicKDFSelection(String password, String configPath) throws Exception {
+        Properties props = new Properties();
+        try (FileInputStream fis = new FileInputStream(configPath)) {
+            props.load(fis);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        String kdfAlg = props.getProperty("kdf.alg", "PBKDF2WithHmacSHA256");
+        int iterations = Integer.parseInt(props.getProperty("kdf.iterations", "10000"));
+        int keySize = Integer.parseInt(props.getProperty("kdf.keySize", "256"));
+
+        byte[] salt = generateSalt(16);
+        PBEKeySpec spec = new PBEKeySpec(password.toCharArray(), salt, iterations, keySize);
+        SecretKeyFactory factory = SecretKeyFactory.getInstance(kdfAlg);
+        byte[] derived = factory.generateSecret(spec).getEncoded();
+        System.out.println("Dynamically Selected KDF (" + kdfAlg + ") Key: "
+                + Base64.getEncoder().encodeToString(derived));
+    }
+
+    //////////////////////////////////////
+    // HELPER METHODS
+    //////////////////////////////////////
+
+    /**
+     * Helper method to derive a PBKDF2 key with PBKDF2WithHmacSHA256.
+     *
+     * SAST/CBOM:
+     * - Parent: PBKDF2 helper.
+     */
+    private byte[] derivePBKDF2Key(String password) throws Exception {
+        byte[] salt = generateSalt(16);
+        PBEKeySpec spec = new PBEKeySpec(password.toCharArray(), salt, 10000, 256);
+        SecretKeyFactory factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256");
+        return factory.generateSecret(spec).getEncoded();
+    }
+
+    /**
+     * A simplistic HKDF expansion function using HMAC-SHA256.
+     *
+     * SAST/CBOM: - Parent: HKDF. - Uses a single-block expansion
+     * ("hkdf-expansion") which is non-standard and may be flagged.
+     */
+    private byte[] hkdfExpand(byte[] ikm, byte[] salt, int length) throws Exception {
+        Mac hmac = Mac.getInstance("HmacSHA256");
+        SecretKey secretKey = new SecretKeySpec(salt, "HmacSHA256");
+        hmac.init(secretKey);
+        byte[] prk = hmac.doFinal(ikm); // Extraction step.
+
+        // Single-block expansion (non-standard; for full HKDF, multiple iterations may
+        // be necessary)
+        hmac.init(new SecretKeySpec(prk, "HmacSHA256"));
+        byte[] okm = hmac.doFinal("hkdf-expansion".getBytes());
+        return Arrays.copyOf(okm, length);
+    }
+
+    /**
+     * Generates a secure random salt of the specified length.
+     *
+     * SAST/CBOM: - Parent: Secure Random Salt Generation. - Uses SecureRandom;
+     * considered best practice.
+     */
+    private byte[] generateSalt(int length) {
+        byte[] salt = new byte[length];
+        new SecureRandom().nextBytes(salt);
+        return salt;
+    }
+}
diff --git a/java/ql/test/experimental/library-tests/quantum/jca/KeyEncapsulation.java b/java/ql/test/experimental/library-tests/quantum/jca/KeyEncapsulation.java
new file mode 100644
index 00000000000..df787496d77
--- /dev/null
+++ b/java/ql/test/experimental/library-tests/quantum/jca/KeyEncapsulation.java
@@ -0,0 +1,229 @@
+package com.example.crypto.algorithms;
+
+// import org.bouncycastle.jce.provider.BouncyCastleProvider;
+// import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider;
+// import org.bouncycastle.pqc.jcajce.spec.KyberParameterSpec;
+// import org.bouncycastle.util.Strings;
+import java.security.*;
+import java.security.spec.ECGenParameterSpec;
+import java.util.Base64;
+import javax.crypto.Cipher;
+import javax.crypto.KeyAgreement;
+import javax.crypto.KeyGenerator;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.GCMParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+
+/**
+ * Demonstrates various Key Encapsulation Mechanisms (KEMs), including:
+ *
+ * 1) RSA-KEM (emulated using RSA-OAEP for ephemeral key wrapping) - CBOM/SAST:
+ * Classified as a Hybrid Cryptosystem (public-key based key encapsulation).
+ * While RSA-OAEP is secure, using it to emulate KEM (without a standard scheme)
+ * may be flagged.
+ *
+ * 2) ECIES (Elliptic Curve Integrated Encryption Scheme) - CBOM/SAST:
+ * Classified as a Hybrid Cryptosystem (KEM+DEM) based on ECDH and AES. Note:
+ * Directly using the raw ECDH shared secret as key material is insecure in
+ * production.
+ *
+ * 3) Kyber (Post-Quantum KEM using BouncyCastle PQC) - CBOM/SAST: Classified as
+ * a Post-Quantum Key Encapsulation mechanism. This is modern and secure when
+ * using standardized parameters.
+ *
+ * 4) Basic ephemeral flows that mimic KEM logic using ephemeral ECDH. -
+ * CBOM/SAST: Classified as a simple KEM mimic based on ephemeral ECDH.
+ */
+public class KeyEncapsulation {
+
+    // static {
+    //     // Adding both classical and PQC providers.
+    //     Security.addProvider(new BouncyCastleProvider());
+    //     Security.addProvider(new BouncyCastlePQCProvider());
+    // }
+    //////////////////////////////////////
+    // 1. RSA-KEM-Like Flow
+    //////////////////////////////////////
+
+    /**
+     * Emulates RSA-KEM by using RSA-OAEP to wrap a random AES key.
+     *
+     * SAST/CBOM Classification:
+     * - Parent: Hybrid Cryptosystem (RSA-OAEP based key encapsulation).
+     * - Note: Although RSA-OAEP is secure, using it to "wrap" an ephemeral key is a
+     * non-standard KEM pattern.
+     *
+     * @param rsaPub The RSA public key of the recipient.
+     */
+    public void rsaKEMEncapsulation(PublicKey rsaPub) throws Exception {
+        // 1) Generate an ephemeral AES key (symmetric key for data encryption)
+        KeyGenerator keyGen = KeyGenerator.getInstance("AES");
+        keyGen.init(256); // 256-bit AES key.
+        SecretKey aesKey = keyGen.generateKey();
+        System.out.println("Ephemeral AES Key: " + Base64.getEncoder().encodeToString(aesKey.getEncoded()));
+
+        // 2) Encrypt (wrap) the ephemeral AES key with RSA-OAEP.
+        // SAST Note: This RSA-OAEP wrapping is used to encapsulate the AES key.
+        Cipher rsaCipher = Cipher.getInstance("RSA/ECB/OAEPWithSHA-256AndMGF1Padding");
+        rsaCipher.init(Cipher.ENCRYPT_MODE, rsaPub);
+        byte[] wrappedKey = rsaCipher.doFinal(aesKey.getEncoded());
+        System.out.println("RSA-KEM Encapsulated AES Key: " + Base64.getEncoder().encodeToString(wrappedKey));
+
+        // 3) Example usage: Encrypt data with the ephemeral AES key using AES-GCM.
+        Cipher aesCipher = Cipher.getInstance("AES/GCM/NoPadding");
+        byte[] iv = new byte[12]; // Standard IV length for GCM.
+        new SecureRandom().nextBytes(iv);
+        GCMParameterSpec gcmSpec = new GCMParameterSpec(128, iv);
+        aesCipher.init(Cipher.ENCRYPT_MODE, aesKey, gcmSpec);
+        byte[] ciphertext = aesCipher.doFinal("KEM-based encryption".getBytes());
+        System.out.println("AES-GCM ciphertext: " + Base64.getEncoder().encodeToString(ciphertext));
+    }
+
+    /**
+     * Performs RSA decapsulation by decrypting the wrapped AES key.
+     *
+     * SAST/CBOM Classification: - Parent: Hybrid Cryptosystem (RSA-OAEP based
+     * key decapsulation). - Note: Secure when used with matching RSA key pairs.
+     *
+     * @param rsaPriv The RSA private key corresponding to the public key used.
+     * @param wrappedKey The RSA-wrapped ephemeral AES key.
+     */
+    public void rsaKEMDecapsulation(PrivateKey rsaPriv, byte[] wrappedKey) throws Exception {
+        Cipher rsaCipher = Cipher.getInstance("RSA/ECB/OAEPWithSHA-256AndMGF1Padding");
+        rsaCipher.init(Cipher.DECRYPT_MODE, rsaPriv);
+        byte[] aesKeyBytes = rsaCipher.doFinal(wrappedKey);
+        SecretKey aesKey = new SecretKeySpec(aesKeyBytes, "AES");
+        System.out.println("RSA-KEM Decapsulated AES Key: " + Base64.getEncoder().encodeToString(aesKey.getEncoded()));
+    }
+
+    //////////////////////////////////////
+    // 2. ECIES Example
+    //////////////////////////////////////
+
+    /**
+     * Implements a simplified ECIES flow using ephemeral ECDH and AES-GCM.
+     *
+     * SAST/CBOM Classification:
+     * - Parent: Hybrid Cryptosystem (ECIES: ECDH-based key encapsulation + DEM).
+     * - Note: Directly using the raw ECDH shared secret as key material is
+     * insecure.
+     * In practice, a proper KDF must be applied.
+     *
+     * @param ecPub The recipient's EC public key.
+     */
+    public void eciesEncapsulation(PublicKey ecPub) throws Exception {
+        // Generate an ephemeral EC key pair.
+        KeyPairGenerator kpg = KeyPairGenerator.getInstance("EC");
+        kpg.initialize(new ECGenParameterSpec("secp256r1"), new SecureRandom());
+        KeyPair ephemeralEC = kpg.generateKeyPair();
+
+        // Perform ECDH key agreement to derive the shared secret.
+        KeyAgreement ka = KeyAgreement.getInstance("ECDH");
+        ka.init(ephemeralEC.getPrivate());
+        ka.doPhase(ecPub, true);
+        byte[] sharedSecret = ka.generateSecret();
+        System.out.println("ECIES ephemeral ECDH Secret: " + Base64.getEncoder().encodeToString(sharedSecret));
+
+        // For demonstration only: directly use part of the shared secret as an AES key.
+        // SAST Note: This is insecure; a proper key derivation function (KDF) must be
+        // used.
+        SecretKey aesKey = new SecretKeySpec(sharedSecret, 0, 16, "AES");
+
+        // Encrypt the message using AES-GCM.
+        Cipher aesCipher = Cipher.getInstance("AES/GCM/NoPadding");
+        byte[] iv = new byte[12];
+        new SecureRandom().nextBytes(iv);
+        aesCipher.init(Cipher.ENCRYPT_MODE, aesKey, new GCMParameterSpec(128, iv));
+        byte[] ciphertext = aesCipher.doFinal("ECIES message".getBytes());
+
+        // The ephemeral public key (ephemeralEC.getPublic()) is transmitted as part of
+        // the output.
+        System.out.println(
+                "ECIES ephemeral public: " + Base64.getEncoder().encodeToString(ephemeralEC.getPublic().getEncoded()));
+        System.out.println("ECIES ciphertext: " + Base64.getEncoder().encodeToString(ciphertext));
+    }
+
+    //////////////////////////////////////
+    // 3. Kyber Example (Post-Quantum KEM)
+    //////////////////////////////////////
+
+    // /**
+    //  * Demonstrates a Kyber-based encapsulation using BouncyCastle's PQC provider.
+    //  *
+    //  * SAST/CBOM Classification:
+    //  * - Parent: Post-Quantum KEM.
+    //  * - Note: Kyber is a modern, post-quantum secure KEM. This example uses
+    //  * Kyber-512.
+    //  *
+    //  * @param kyberRecipientKP The recipient's Kyber key pair.
+    //  */
+    // public void kyberEncapsulate(KeyPair kyberRecipientKP) throws Exception {
+    //     // Use an ephemeral label for demonstration.
+    //     byte[] ephemeralLabel = Strings.toByteArray("Kyber-KEM-Label");
+    //     Cipher kemCipher = Cipher.getInstance("Kyber", "BCPQC");
+    //     kemCipher.init(Cipher.ENCRYPT_MODE, kyberRecipientKP.getPublic(), new SecureRandom());
+    //     byte[] ciphertext = kemCipher.doFinal(ephemeralLabel);
+    //     System.out.println("Kyber ciphertext: " + Base64.getEncoder().encodeToString(ciphertext));
+    // }
+
+    //////////////////////////////////////
+    // 4. Basic Ephemeral Flows That Mimic KEM
+    //////////////////////////////////////
+
+    /**
+     * Uses ephemeral ECDH to derive a shared secret that mimics a KEM.
+     *
+     * SAST/CBOM Classification:
+     * - Parent: Ephemeral Key Agreement (mimicking KEM).
+     * - Note: This simple approach demonstrates the concept of using ephemeral keys
+     * to derive a secret.
+     * In a full scheme, the ephemeral public key would also be transmitted.
+     *
+     * @param recipientPubKey The recipient's public key.
+     */
+    public void ephemeralECDHMimicKEM(PublicKey recipientPubKey) throws Exception {
+        KeyPairGenerator kpg = KeyPairGenerator.getInstance("EC");
+        kpg.initialize(new ECGenParameterSpec("secp256r1"));
+        KeyPair ephemeralKP = kpg.generateKeyPair();
+        KeyAgreement ka = KeyAgreement.getInstance("ECDH");
+        ka.init(ephemeralKP.getPrivate());
+        ka.doPhase(recipientPubKey, true);
+        byte[] sharedSecret = ka.generateSecret();
+        System.out.println(
+                "Ephemeral ECDH shared secret (mimics KEM): " + Base64.getEncoder().encodeToString(sharedSecret));
+        // In a full implementation, the ephemeral public key and the shared secret are
+        // used together.
+    }
+
+    //////////////////////////////////////
+    // Test / Demo Method
+    //////////////////////////////////////
+
+    /**
+     * Demonstrates each of the key encapsulation flows.
+     */
+    public void runKeyEncapsulationDemos() throws Exception {
+        // 1) RSA-KEM-like Flow:
+        KeyPairGenerator rsaKpg = KeyPairGenerator.getInstance("RSA");
+        rsaKpg.initialize(2048);
+        KeyPair rsaKP = rsaKpg.generateKeyPair();
+        rsaKEMEncapsulation(rsaKP.getPublic());
+
+        // 2) ECIES Example:
+        KeyPairGenerator ecKpg = KeyPairGenerator.getInstance("EC");
+        ecKpg.initialize(new ECGenParameterSpec("secp256r1"));
+        KeyPair ecKP = ecKpg.generateKeyPair();
+        eciesEncapsulation(ecKP.getPublic());
+
+        // // 3) Kyber Example (Post-Quantum KEM):
+        // KeyPairGenerator kyberKpg = KeyPairGenerator.getInstance("Kyber", "BCPQC");
+        // kyberKpg.initialize(KyberParameterSpec.kyber512);
+        // KeyPair kyberKP = kyberKpg.generateKeyPair();
+        // kyberEncapsulate(kyberKP);
+        // 4) Ephemeral ECDH Mimic KEM:
+        // For demonstration, we use an EC key pair and mimic KEM by deriving a shared
+        // secret.
+        KeyPair ephemeralEC = ecKpg.generateKeyPair();
+        ephemeralECDHMimicKEM(ephemeralEC.getPublic());
+    }
+}
diff --git a/java/ql/test/experimental/library-tests/quantum/jca/KeyExchange.java b/java/ql/test/experimental/library-tests/quantum/jca/KeyExchange.java
new file mode 100644
index 00000000000..ef4d5b94c86
--- /dev/null
+++ b/java/ql/test/experimental/library-tests/quantum/jca/KeyExchange.java
@@ -0,0 +1,330 @@
+package com.example.crypto.algorithms;
+
+// import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import java.security.*;
+import java.security.spec.ECGenParameterSpec;
+import java.util.Arrays;
+import java.util.Base64;
+import javax.crypto.KeyAgreement;
+
+/**
+ * Demonstrates various Key Exchange mechanisms using standard Java and
+ * BouncyCastle:
+ *
+ * 1) Classic DH (Diffie-Hellman) with multiple key sizes: - 512-bit:
+ * Insecure/deprecated (flagged as unsafe by SAST). - 2048-bit: Standard secure
+ * level. - 4096-bit: High-security (but can be slow).
+ *
+ * 2) ECDH (using secp256r1): - Classified as a secure elliptic-curve key
+ * exchange.
+ *
+ * 3) X25519: - A modern and efficient elliptic-curve key exchange protocol.
+ *
+ * 4) X448: - Provides a higher security level for key exchange.
+ *
+ * In addition, the class now includes a nuanced insecure example that
+ * demonstrates: - Reusing static key pairs instead of generating fresh
+ * ephemeral keys. - Using weak parameters (512-bit DH) in a key exchange.
+ *
+ * The runAllExchanges() method demonstrates generating keys for each algorithm,
+ * deriving shared secrets, and comparing safe vs. insecure practices.
+ */
+public class KeyExchange {
+
+    // static {
+    //     // Add the BouncyCastle provider to support additional algorithms.
+    //     Security.addProvider(new BouncyCastleProvider());
+    // }
+    //////////////////////////////////////////
+    // 1. Classic DH (Diffie-Hellman)
+    //////////////////////////////////////////
+
+    /**
+     * Generates a standard Diffie-Hellman key pair using a 2048-bit modulus.
+     *
+     * CBOM/SAST Classification:
+     * - Parent: Classic Diffie-Hellman Key Exchange.
+     * - 2048-bit is considered secure and is widely accepted.
+     *
+     * @return A 2048-bit DH KeyPair.
+     */
+    public KeyPair generateDHKeyPair() throws Exception {
+        KeyPairGenerator dhKpg = KeyPairGenerator.getInstance("DH");
+        dhKpg.initialize(2048);
+        return dhKpg.generateKeyPair();
+    }
+
+    /**
+     * Generates a deprecated/unsafe Diffie-Hellman key pair using a 512-bit
+     * modulus.
+     *
+     * CBOM/SAST Classification: - Parent: Classic Diffie-Hellman Key Exchange.
+     * - 512-bit DH is considered insecure and should be flagged by SAST tools.
+     *
+     * @return A 512-bit (insecure) DH KeyPair.
+     */
+    public KeyPair generateDHDeprecated() throws Exception {
+        KeyPairGenerator dhKpg = KeyPairGenerator.getInstance("DH");
+        // 512 bits is considered insecure/deprecated.
+        dhKpg.initialize(512);
+        return dhKpg.generateKeyPair();
+    }
+
+    /**
+     * Generates a high-security Diffie-Hellman key pair using a 4096-bit
+     * modulus.
+     *
+     * CBOM/SAST Classification: - Parent: Classic Diffie-Hellman Key Exchange.
+     * - 4096-bit DH offers high security, though it may be slower in practice.
+     *
+     * @return A 4096-bit DH KeyPair.
+     */
+    public KeyPair generateDHHighSecurity() throws Exception {
+        KeyPairGenerator dhKpg = KeyPairGenerator.getInstance("DH");
+        dhKpg.initialize(4096);
+        return dhKpg.generateKeyPair();
+    }
+
+    /**
+     * Derives a shared secret from a DH key pair.
+     *
+     * CBOM/SAST Classification: - Parent: Classic Diffie-Hellman Key Exchange.
+     * - Properly deriving the shared secret is secure if using a safe key size.
+     *
+     * @param privateKey The private key of one party.
+     * @param publicKey The public key of the other party.
+     * @return The derived shared secret as a byte array.
+     */
+    public byte[] deriveDHSecret(PrivateKey privateKey, PublicKey publicKey) throws Exception {
+        KeyAgreement ka = KeyAgreement.getInstance("DH");
+        ka.init(privateKey);
+        ka.doPhase(publicKey, true);
+        return ka.generateSecret();
+    }
+
+    //////////////////////////////////////////
+    // 2. ECDH (secp256r1)
+    //////////////////////////////////////////
+
+    /**
+     * Generates an Elliptic Curve Diffie-Hellman key pair using the secp256r1
+     * curve.
+     *
+     * CBOM/SAST Classification:
+     * - Parent: Elliptic Curve Diffie-Hellman (ECDH).
+     * - secp256r1 is widely regarded as secure and efficient.
+     *
+     * @return An ECDH KeyPair on secp256r1.
+     */
+    public KeyPair generateECDHKeyPair() throws Exception {
+        KeyPairGenerator ecKpg = KeyPairGenerator.getInstance("EC", "BC");
+        ecKpg.initialize(new ECGenParameterSpec("secp256r1"), new SecureRandom());
+        return ecKpg.generateKeyPair();
+    }
+
+    /**
+     * Derives a shared secret using ECDH.
+     *
+     * CBOM/SAST Classification: - Parent: Elliptic Curve Diffie-Hellman (ECDH).
+     * - Secure when using appropriate curves and proper randomness.
+     *
+     * @param privateKey The ECDH private key.
+     * @param publicKey The corresponding public key.
+     * @return The derived ECDH shared secret.
+     */
+    public byte[] deriveECDHSecret(PrivateKey privateKey, PublicKey publicKey) throws Exception {
+        KeyAgreement ka = KeyAgreement.getInstance("ECDH", "BC");
+        ka.init(privateKey);
+        ka.doPhase(publicKey, true);
+        return ka.generateSecret();
+    }
+
+    //////////////////////////////////////////
+    // 3. X25519
+    //////////////////////////////////////////
+
+    /**
+     * Generates an ephemeral X25519 key pair.
+     *
+     * CBOM/SAST Classification:
+     * - Parent: Modern Elliptic-Curve Key Exchange.
+     * - X25519 is considered secure and efficient.
+     *
+     * @return An X25519 KeyPair.
+     */
+    public KeyPair generateX25519KeyPair() throws Exception {
+        KeyPairGenerator kpg = KeyPairGenerator.getInstance("X25519", "BC");
+        // X25519 key size is fixed; the parameter (255) is a reference value.
+        kpg.initialize(255, new SecureRandom());
+        return kpg.generateKeyPair();
+    }
+
+    /**
+     * Derives a shared secret using the X25519 key agreement.
+     *
+     * CBOM/SAST Classification: - Parent: Modern Elliptic-Curve Key Exchange. -
+     * X25519 is highly recommended for its security and efficiency.
+     *
+     * @param privateKey The X25519 private key.
+     * @param publicKey The corresponding public key.
+     * @return The derived X25519 shared secret.
+     */
+    public byte[] deriveX25519Secret(PrivateKey privateKey, PublicKey publicKey) throws Exception {
+        KeyAgreement ka = KeyAgreement.getInstance("X25519", "BC");
+        ka.init(privateKey);
+        ka.doPhase(publicKey, true);
+        return ka.generateSecret();
+    }
+
+    //////////////////////////////////////////
+    // 4. X448
+    //////////////////////////////////////////
+
+    /**
+     * Generates an ephemeral X448 key pair.
+     *
+     * CBOM/SAST Classification:
+     * - Parent: Modern Elliptic-Curve Key Exchange.
+     * - X448 provides a higher security margin than X25519.
+     *
+     * @return An X448 KeyPair.
+     */
+    public KeyPair generateX448KeyPair() throws Exception {
+        KeyPairGenerator kpg = KeyPairGenerator.getInstance("X448", "BC");
+        // X448 key size is fixed; the parameter (448) is the curve parameter.
+        kpg.initialize(448, new SecureRandom());
+        return kpg.generateKeyPair();
+    }
+
+    /**
+     * Derives a shared secret using the X448 key agreement.
+     *
+     * CBOM/SAST Classification: - Parent: Modern Elliptic-Curve Key Exchange. -
+     * X448 is considered secure and suitable for high-security applications.
+     *
+     * @param privateKey The X448 private key.
+     * @param publicKey The corresponding public key.
+     * @return The derived X448 shared secret.
+     */
+    public byte[] deriveX448Secret(PrivateKey privateKey, PublicKey publicKey) throws Exception {
+        KeyAgreement ka = KeyAgreement.getInstance("X448", "BC");
+        ka.init(privateKey);
+        ka.doPhase(publicKey, true);
+        return ka.generateSecret();
+    }
+
+    //////////////////////////////////////////
+    // 5. Nuanced Insecure Key Exchange Example
+    //////////////////////////////////////////
+
+    /**
+     * Demonstrates a nuanced example of insecure key exchange by:
+     * - Using deprecated DH parameters (512-bit).
+     * - Reusing static (non-ephemeral) keys.
+     *
+     * SAST/CBOM Classification:
+     * - Parent: Insecure Key Exchange Patterns.
+     * - Issues:
+     * * 512-bit DH is weak and vulnerable to attacks.
+     * * Reusing a static key pair across sessions eliminates forward secrecy.
+     * * Reusing an ECDH key pair for both sides results in predictable shared
+     * secrets.
+     */
+    public void insecureKeyExchangeExample() throws Exception {
+        System.out.println("\n--- Insecure Key Exchange Example ---");
+
+        // Example 1: Using weak 512-bit DH with static key reuse.
+        KeyPair staticDHKeyPair = generateDHDeprecated();
+        // Reusing the same static DH key pair for both parties.
+        byte[] staticDHSecret = deriveDHSecret(staticDHKeyPair.getPrivate(), staticDHKeyPair.getPublic());
+        System.out.println("Static DH (512-bit) shared secret (reused): "
+                + Base64.getEncoder().encodeToString(staticDHSecret));
+        // SAST Note: 512-bit DH is considered insecure and static key reuse prevents
+        // forward secrecy.
+
+        // Example 2: Reusing an ECDH key pair instead of generating fresh ephemeral
+        // keys.
+        KeyPair reusedECDHKeyPair = generateECDHKeyPair();
+        // Using the same key pair for both sides leads to a shared secret that is
+        // easily derived.
+        byte[] reusedECDHSecret = deriveECDHSecret(reusedECDHKeyPair.getPrivate(), reusedECDHKeyPair.getPublic());
+        System.out.println("Reused ECDH shared secret: "
+                + Base64.getEncoder().encodeToString(reusedECDHSecret));
+        // SAST Note: Proper key exchange requires fresh ephemeral keys for each session
+        // to ensure forward secrecy.
+    }
+
+    //////////////////////////////////////////
+    // 6. runAllExchanges() Demo Method
+    //////////////////////////////////////////
+
+    /**
+     * Demonstrates key exchange flows for various algorithms, including both secure
+     * and insecure examples.
+     *
+     * CBOM/SAST Classification:
+     * - Exercises both safe configurations (e.g., DH with 2048/4096-bit, ECDH,
+     * X25519, X448)
+     * and insecure configurations (e.g., DH with 512-bit, static key reuse).
+     */
+    public void runAllExchanges() throws Exception {
+        System.out.println("--- Running Secure Key Exchanges ---");
+
+        // ============ DEPRECATED / UNSAFE DH (512 bits) ============
+        KeyPair dhDep1 = generateDHDeprecated();
+        KeyPair dhDep2 = generateDHDeprecated();
+        byte[] dhDepSecret1 = deriveDHSecret(dhDep1.getPrivate(), dhDep2.getPublic());
+        byte[] dhDepSecret2 = deriveDHSecret(dhDep2.getPrivate(), dhDep1.getPublic());
+        System.out.println("DH(512) K1->K2: " + Base64.getEncoder().encodeToString(dhDepSecret1));
+        System.out.println("DH(512) K2->K1: " + Base64.getEncoder().encodeToString(dhDepSecret2));
+        System.out.println("DH(512) match? " + Arrays.equals(dhDepSecret1, dhDepSecret2));
+
+        // ============ DH (2048 bits) Standard ============
+        KeyPair dhKP1 = generateDHKeyPair();
+        KeyPair dhKP2 = generateDHKeyPair();
+        byte[] dhSecret1 = deriveDHSecret(dhKP1.getPrivate(), dhKP2.getPublic());
+        byte[] dhSecret2 = deriveDHSecret(dhKP2.getPrivate(), dhKP1.getPublic());
+        System.out.println("DH(2048) K1->K2: " + Base64.getEncoder().encodeToString(dhSecret1));
+        System.out.println("DH(2048) K2->K1: " + Base64.getEncoder().encodeToString(dhSecret2));
+        System.out.println("DH(2048) match? " + Arrays.equals(dhSecret1, dhSecret2));
+
+        // ============ DH (4096 bits) High-Security ============
+        KeyPair dhHigh1 = generateDHHighSecurity();
+        KeyPair dhHigh2 = generateDHHighSecurity();
+        byte[] dhHighSecret1 = deriveDHSecret(dhHigh1.getPrivate(), dhHigh2.getPublic());
+        byte[] dhHighSecret2 = deriveDHSecret(dhHigh2.getPrivate(), dhHigh1.getPublic());
+        System.out.println("DH(4096) K1->K2: " + Base64.getEncoder().encodeToString(dhHighSecret1));
+        System.out.println("DH(4096) K2->K1: " + Base64.getEncoder().encodeToString(dhHighSecret2));
+        System.out.println("DH(4096) match? " + Arrays.equals(dhHighSecret1, dhHighSecret2));
+
+        // ============ ECDH (secp256r1) ============
+        KeyPair ecKP1 = generateECDHKeyPair();
+        KeyPair ecKP2 = generateECDHKeyPair();
+        byte[] ecdhSecret1 = deriveECDHSecret(ecKP1.getPrivate(), ecKP2.getPublic());
+        byte[] ecdhSecret2 = deriveECDHSecret(ecKP2.getPrivate(), ecKP1.getPublic());
+        System.out.println("ECDH K1->K2: " + Base64.getEncoder().encodeToString(ecdhSecret1));
+        System.out.println("ECDH K2->K1: " + Base64.getEncoder().encodeToString(ecdhSecret2));
+        System.out.println("ECDH match? " + Arrays.equals(ecdhSecret1, ecdhSecret2));
+
+        // ============ X25519 ============
+        KeyPair x25519KP1 = generateX25519KeyPair();
+        KeyPair x25519KP2 = generateX25519KeyPair();
+        byte[] x25519Secret1 = deriveX25519Secret(x25519KP1.getPrivate(), x25519KP2.getPublic());
+        byte[] x25519Secret2 = deriveX25519Secret(x25519KP2.getPrivate(), x25519KP1.getPublic());
+        System.out.println("X25519 K1->K2: " + Base64.getEncoder().encodeToString(x25519Secret1));
+        System.out.println("X25519 K2->K1: " + Base64.getEncoder().encodeToString(x25519Secret2));
+        System.out.println("X25519 match? " + Arrays.equals(x25519Secret1, x25519Secret2));
+
+        // ============ X448 ============
+        KeyPair x448KP1 = generateX448KeyPair();
+        KeyPair x448KP2 = generateX448KeyPair();
+        byte[] x448Secret1 = deriveX448Secret(x448KP1.getPrivate(), x448KP2.getPublic());
+        byte[] x448Secret2 = deriveX448Secret(x448KP2.getPrivate(), x448KP1.getPublic());
+        System.out.println("X448 K1->K2: " + Base64.getEncoder().encodeToString(x448Secret1));
+        System.out.println("X448 K2->K1: " + Base64.getEncoder().encodeToString(x448Secret2));
+        System.out.println("X448 match? " + Arrays.equals(x448Secret1, x448Secret2));
+
+        // ============ Insecure Key Exchange Example ============
+        insecureKeyExchangeExample();
+    }
+}
diff --git a/java/ql/test/experimental/library-tests/quantum/jca/MACOperation.java b/java/ql/test/experimental/library-tests/quantum/jca/MACOperation.java
new file mode 100644
index 00000000000..ae55b52bcfc
--- /dev/null
+++ b/java/ql/test/experimental/library-tests/quantum/jca/MACOperation.java
@@ -0,0 +1,249 @@
+package com.example.crypto.algorithms;
+
+// import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import java.security.*;
+import java.util.Arrays;
+import java.util.Base64;
+import javax.crypto.Cipher;
+import javax.crypto.KeyGenerator;
+import javax.crypto.Mac;
+import javax.crypto.SecretKey;
+import javax.crypto.SecretKeyFactory;
+import javax.crypto.spec.PBEKeySpec;
+import javax.crypto.spec.SecretKeySpec;
+
+/**
+ * MACOperation demonstrates various Message Authentication Code (MAC)
+ * operations and further use of MAC outputs as inputs into higher-level
+ * cryptosystems.
+ *
+ * Flows include:
+ *
+ * 1. Secure HMAC-SHA2 (HMAC-SHA256) - a widely accepted MAC. 2. Secure
+ * HMAC-SHA3 (HMAC-SHA3-256) - an alternative using the SHA-3 family. 3. Secure
+ * Poly1305 MAC - using BouncyCastle's implementation. 4. Secure GMAC - using
+ * AES-GCM's authentication tag in a dedicated MAC mode. 5. Secure KMAC - using
+ * KMAC128 (from the SHA-3 family).
+ *
+ * Insecure examples include:
+ *
+ * 6. Insecure HMAC-SHA1 - which is deprecated.
+ *
+ * Further flows:
+ *
+ * A. processMACOutput: Uses the MAC output directly as key material for AES
+ * encryption. (Note: This is acceptable only if the MAC is produced by a secure
+ * function.)
+ *
+ * B. alternativeMACFlow: Uses the MAC output as an identifier that is then
+ * encrypted.
+ *
+ * C. furtherUseMACForKeyDerivation: Uses PBKDF2 to split a MAC output into two
+ * keys, one for encryption and one for MACing ciphertext.
+ *
+ * SAST/CBOM Notes: - Secure MAC algorithms (HMAC-SHA256, HMAC-SHA3-256,
+ * Poly1305, GMAC, KMAC128) are acceptable if used correctly. - HMAC-SHA1 is
+ * flagged as insecure. - Using a raw MAC output directly as key material is
+ * ambiguous unless the MAC is produced by a secure KDF.
+ */
+public class MACOperation {
+
+    // static {
+    //     Security.addProvider(new BouncyCastleProvider());
+    // }
+    // ---------- MAC Operations ----------
+    /**
+     * Secure MAC using HMAC-SHA256. SAST: HMAC-SHA256 is widely considered
+     * secure.
+     */
+    public byte[] secureHMACSHA256(String message, byte[] key) throws Exception {
+        Mac mac = Mac.getInstance("HmacSHA256", "BC");
+        SecretKey secretKey = new SecretKeySpec(key, "HmacSHA256");
+        mac.init(secretKey);
+        return mac.doFinal(message.getBytes());
+    }
+
+    /**
+     * Secure MAC using HMAC-SHA3-256. SAST: HMAC-SHA3 is a modern alternative
+     * from the SHA-3 family.
+     */
+    public byte[] secureHMACSHA3(String message, byte[] key) throws Exception {
+        Mac mac = Mac.getInstance("HmacSHA3-256", "BC");
+        SecretKey secretKey = new SecretKeySpec(key, "HmacSHA3-256");
+        mac.init(secretKey);
+        return mac.doFinal(message.getBytes());
+    }
+
+    /**
+     * Secure MAC using Poly1305. SAST: Poly1305 is secure when used with a
+     * one-time key from a cipher (e.g. ChaCha20).
+     */
+    public byte[] securePoly1305(String message, byte[] key) throws Exception {
+        Mac mac = Mac.getInstance("Poly1305", "BC");
+        SecretKey secretKey = new SecretKeySpec(key, "Poly1305");
+        mac.init(secretKey);
+        return mac.doFinal(message.getBytes());
+    }
+
+    /**
+     * Secure MAC using GMAC. SAST: GMAC (the MAC part of AES-GCM) is secure
+     * when used correctly.
+     */
+    public byte[] secureGMAC(String message, byte[] key) throws Exception {
+        // For GMAC, we use the GMac algorithm as provided by BC.
+        Mac mac = Mac.getInstance("GMac", "BC");
+        // Initialize the key for GMAC; key should be appropriate for the underlying
+        // block cipher.
+        SecretKey secretKey = new SecretKeySpec(key, "AES");
+        mac.init(secretKey);
+        return mac.doFinal(message.getBytes());
+    }
+
+    /**
+     * Secure MAC using KMAC128. SAST: KMAC128 is part of the SHA-3 family and
+     * is secure when used properly.
+     */
+    public byte[] secureKMAC(String message, byte[] key) throws Exception {
+        Mac mac = Mac.getInstance("KMAC128", "BC");
+        SecretKey secretKey = new SecretKeySpec(key, "KMAC128");
+        mac.init(secretKey);
+        return mac.doFinal(message.getBytes());
+    }
+
+    /**
+     * Insecure MAC using HMAC-SHA1. SAST: HMAC-SHA1 is considered deprecated
+     * and weak.
+     */
+    public byte[] insecureHMACSHA1(String message, byte[] key) throws Exception {
+        Mac mac = Mac.getInstance("HmacSHA1", "BC");
+        SecretKey secretKey = new SecretKeySpec(key, "HmacSHA1");
+        mac.init(secretKey);
+        return mac.doFinal(message.getBytes());
+    }
+
+    // ---------- Further Use of MAC Outputs ----------
+    /**
+     * Processes the MAC output by using it as key material for AES encryption.
+     * SAST: Using a raw MAC output as key material is acceptable only if the
+     * MAC was produced by a secure function; otherwise, this is ambiguous.
+     *
+     * @param macOutput The computed MAC output.
+     * @throws Exception if encryption fails.
+     */
+    public void processMACOutput(byte[] macOutput) throws Exception {
+        // Derive a 128-bit AES key from the MAC output.
+        SecretKey key = new SecretKeySpec(macOutput, 0, 16, "AES");
+        Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
+        cipher.init(Cipher.ENCRYPT_MODE, key, new SecureRandom());
+        byte[] encryptedData = cipher.doFinal("Sensitive Data".getBytes());
+        storeEncryptedMAC(encryptedData);
+    }
+
+    /**
+     * Alternative flow: Uses the MAC output as an identifier and then encrypts
+     * it. SAST: Using a MAC as an identifier is common; subsequent encryption
+     * must be secure.
+     *
+     * @param macOutput The computed MAC output.
+     * @throws Exception if encryption fails.
+     */
+    public void alternativeMACFlow(byte[] macOutput) throws Exception {
+        byte[] identifier = Base64.getEncoder().encode(macOutput);
+        encryptAndSend(identifier);
+    }
+
+    /**
+     * Further use: Derives two separate keys from the MAC output using PBKDF2,
+     * then uses one key for encryption and one for computing an additional MAC
+     * over the ciphertext.
+     *
+     * SAST: This key-splitting technique is acceptable if PBKDF2 is used
+     * securely.
+     *
+     * @param macOutput The MAC output to derive keys from.
+     * @throws Exception if key derivation or encryption fails.
+     */
+    public void furtherUseMACForKeyDerivation(byte[] macOutput) throws Exception {
+        // Use the Base64 representation of the MAC as the password input to PBKDF2.
+        String macAsPassword = Base64.getEncoder().encodeToString(macOutput);
+        byte[] salt = generateSalt(16);
+        PBEKeySpec spec = new PBEKeySpec(macAsPassword.toCharArray(), salt, 10000, 256);
+        SecretKeyFactory factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256");
+        byte[] keyMaterial = factory.generateSecret(spec).getEncoded();
+        // Split into two 128-bit keys.
+        byte[] encryptionKeyBytes = Arrays.copyOfRange(keyMaterial, 0, 16);
+        byte[] macKeyBytes = Arrays.copyOfRange(keyMaterial, 16, 32);
+        SecretKey encryptionKey = new SecretKeySpec(encryptionKeyBytes, "AES");
+        SecretKey derivedMacKey = new SecretKeySpec(macKeyBytes, "HmacSHA256");
+
+        // Encrypt some sample data using the derived encryption key.
+        Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
+        cipher.init(Cipher.ENCRYPT_MODE, encryptionKey, new SecureRandom());
+        byte[] ciphertext = cipher.doFinal("Further Use Test Data".getBytes());
+
+        // Compute HMAC over the ciphertext using the derived MAC key.
+        Mac mac = Mac.getInstance("HmacSHA256");
+        mac.init(derivedMacKey);
+        byte[] computedMac = mac.doFinal(ciphertext);
+
+        // Concatenate the ciphertext and MAC for further use.
+        byte[] output = new byte[ciphertext.length + computedMac.length];
+        System.arraycopy(ciphertext, 0, output, 0, ciphertext.length);
+        System.arraycopy(computedMac, 0, output, ciphertext.length, computedMac.length);
+        storeEncryptedMAC(output);
+    }
+
+    // ---------- Output/Storage Methods ----------
+    /**
+     * Simulates secure storage or transmission of an encrypted MAC output.
+     * SAST: In production, storage and transmission must be protected.
+     *
+     * @param encryptedMAC The encrypted MAC output.
+     */
+    public void storeEncryptedMAC(byte[] encryptedMAC) {
+        String stored = Base64.getEncoder().encodeToString(encryptedMAC);
+        // In production, this string would be securely stored or transmitted.
+    }
+
+    /**
+     * Encrypts data using AES-GCM and simulates secure transmission. SAST: Uses
+     * a securely generated AES key.
+     *
+     * @param data The data to encrypt.
+     * @throws Exception if encryption fails.
+     */
+    public void encryptAndSend(byte[] data) throws Exception {
+        Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
+        SecretKey key = generateAESKey();
+        cipher.init(Cipher.ENCRYPT_MODE, key, new SecureRandom());
+        byte[] encryptedData = cipher.doFinal(data);
+        storeEncryptedMAC(encryptedData);
+    }
+
+    // ---------- Helper Methods ----------
+    /**
+     * Generates a secure 256-bit AES key. SAST: Uses a strong RNG for key
+     * generation.
+     *
+     * @return A SecretKey for AES.
+     * @throws NoSuchAlgorithmException if AES is unsupported.
+     */
+    private SecretKey generateAESKey() throws NoSuchAlgorithmException {
+        KeyGenerator keyGen = KeyGenerator.getInstance("AES");
+        keyGen.init(256);
+        return keyGen.generateKey();
+    }
+
+    /**
+     * Generates a random salt of the specified length using SecureRandom. SAST:
+     * Salting is essential for secure key derivation.
+     *
+     * @param length The salt length.
+     * @return A byte array representing the salt.
+     */
+    private byte[] generateSalt(int length) {
+        byte[] salt = new byte[length];
+        new SecureRandom().nextBytes(salt);
+        return salt;
+    }
+}
diff --git a/java/ql/test/experimental/library-tests/quantum/jca/Nonce.java b/java/ql/test/experimental/library-tests/quantum/jca/Nonce.java
new file mode 100644
index 00000000000..c99113d7a01
--- /dev/null
+++ b/java/ql/test/experimental/library-tests/quantum/jca/Nonce.java
@@ -0,0 +1,114 @@
+package com.example.crypto.artifacts;
+
+// import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import javax.crypto.KeyGenerator;
+import javax.crypto.Mac;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.GCMParameterSpec;
+import javax.crypto.Cipher;
+import java.security.*;
+import java.util.Base64;
+import java.util.Random;
+
+public class Nonce {
+
+    // static {
+    //     Security.addProvider(new BouncyCastleProvider()); // Ensure BouncyCastle is available
+    // }
+    /**
+     * Simple Case: Generates a secure nonce and uses it in HMAC.
+     */
+    public void simpleNonceUsage() throws Exception {
+        byte[] nonce = secureNonce(16);
+        SecretKey key = generateHmacKey();
+        Mac mac = Mac.getInstance("HmacSHA256");
+        mac.init(key);
+        mac.update(nonce);
+        byte[] macResult = mac.doFinal("Simple Test Data".getBytes());
+    }
+
+    /**
+     * Incorrect: Hardcoded, reused nonce in encryption, leading to predictable
+     * output.
+     */
+    public void hardcodedNonceReuse() throws Exception {
+        byte[] nonce = "BADNONCEBADNONCE".getBytes(); // HARDCODED NONCE REUSED!
+        SecretKey key = generateHmacKey();
+        Mac mac = Mac.getInstance("HmacSHA256");
+        mac.init(key);
+        mac.update(nonce);
+        byte[] macResult = mac.doFinal("Sensitive Data".getBytes());
+    }
+
+    /**
+     * Incorrect: Reusing a nonce with AES-GCM, which can lead to catastrophic
+     * security failures.
+     */
+    public void insecureNonceReuseGCM(SecretKey key, byte[] plaintext) throws Exception {
+        byte[] nonce = getReusedNonce(12); // SAME NONCE REUSED!
+        GCMParameterSpec gcmSpec = new GCMParameterSpec(128, nonce);
+        Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
+        cipher.init(Cipher.ENCRYPT_MODE, key, gcmSpec);
+        byte[] ciphertext = cipher.doFinal(plaintext);
+    }
+
+    /**
+     * Secure Case: Proper unique nonce usage in AES-GCM.
+     */
+    public void secureNonceUsageGCM(SecretKey key, byte[] plaintext) throws Exception {
+        byte[] nonce = secureNonce(12);
+        GCMParameterSpec gcmSpec = new GCMParameterSpec(128, nonce);
+        Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
+        cipher.init(Cipher.ENCRYPT_MODE, key, gcmSpec);
+        byte[] ciphertext = cipher.doFinal(plaintext);
+    }
+
+    public void complexNonceFlow() {
+        byte[] nonce = useSecureMethod() ? secureNonce(16) : insecureNonce(16);
+        processNonce(nonce);
+        try {
+            useNonceInMac(nonce, generateHmacKey(), "HmacSHA256");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void useNonceInMac(byte[] nonce, SecretKey key, String macAlgorithm) throws Exception {
+        Mac mac = Mac.getInstance(macAlgorithm);
+        mac.init(key);
+        mac.update(nonce);
+        byte[] macResult = mac.doFinal("Sensitive Data".getBytes());
+    }
+
+    private boolean useSecureMethod() {
+        return System.currentTimeMillis() % 2 == 0;
+    }
+
+    private void processNonce(byte[] nonce) {
+        String nonceBase64 = Base64.getEncoder().encodeToString(nonce);
+    }
+
+    private SecretKey generateHmacKey() throws NoSuchAlgorithmException {
+        KeyGenerator keyGen = KeyGenerator.getInstance("HmacSHA256");
+        return keyGen.generateKey();
+    }
+
+    private byte[] secureNonce(int length) {
+        byte[] nonce = new byte[length];
+        new SecureRandom().nextBytes(nonce);
+        return nonce;
+    }
+
+    private byte[] insecureNonce(int length) {
+        byte[] nonce = new byte[length];
+        new Random().nextBytes(nonce);
+        return nonce;
+    }
+
+    /**
+     * Incorrect: A nonce that is stored and reused across multiple encryptions.
+     */
+    private byte[] getReusedNonce(int length) {
+        return "BADNONCEBADNONCE".getBytes(); // Fixed nonce reuse across calls
+    }
+}
diff --git a/java/ql/test/experimental/library-tests/quantum/jca/PrngTest.java b/java/ql/test/experimental/library-tests/quantum/jca/PrngTest.java
new file mode 100644
index 00000000000..313c4fd4e87
--- /dev/null
+++ b/java/ql/test/experimental/library-tests/quantum/jca/PrngTest.java
@@ -0,0 +1,156 @@
+package com.example.crypto.algorithms;
+
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+import java.util.Random;
+import javax.crypto.SecretKey;
+import javax.crypto.KeyGenerator;
+
+/**
+ * PrngTest demonstrates various approaches for generating random data using
+ * PRNG/RNG APIs.
+ *
+ * It covers: 1) Secure random generation using SecureRandom (default and
+ * getInstanceStrong). 2) Insecure random generation using java.util.Random. 3)
+ * Flawed PRNG usage by setting a fixed seed. 4) Dynamic PRNG selection based on
+ * configuration. 5) Usage of random data as nonces/IVs in symmetric encryption.
+ *
+ * SAST/CBOM Notes: - SecureRandom (and SecureRandom.getInstanceStrong) are
+ * recommended. - java.util.Random is not suitable for cryptographic purposes. -
+ * Re-seeding or using a fixed seed with SecureRandom makes it predictable. -
+ * IVs and nonces must be unique for each operation; reusing fixed values is
+ * insecure.
+ */
+public class PrngTest {
+
+    // ---------- Secure Random Generation ----------
+    /**
+     * Generates random bytes using the default SecureRandom. SAST: SecureRandom
+     * is recommended for cryptographically secure random data.
+     *
+     * @param numBytes Number of bytes to generate.
+     * @return A byte array of random data.
+     */
+    public byte[] generateSecureRandomBytes(int numBytes) {
+        SecureRandom secureRandom = new SecureRandom();
+        byte[] bytes = new byte[numBytes];
+        secureRandom.nextBytes(bytes);
+        return bytes;
+    }
+
+    /**
+     * Generates random bytes using SecureRandom.getInstanceStrong(). SAST:
+     * getInstanceStrong() returns a strong RNG (may block in some
+     * environments).
+     *
+     * @param numBytes Number of bytes to generate.
+     * @return A byte array of random data.
+     * @throws NoSuchAlgorithmException if a strong RNG is not available.
+     */
+    public byte[] generateSecureRandomBytesStrong(int numBytes) throws NoSuchAlgorithmException {
+        SecureRandom secureRandom = SecureRandom.getInstanceStrong();
+        byte[] bytes = new byte[numBytes];
+        secureRandom.nextBytes(bytes);
+        return bytes;
+    }
+
+    // ---------- Insecure Random Generation ----------
+    /**
+     * Generates random bytes using java.util.Random. SAST: java.util.Random is
+     * predictable and insecure for cryptographic purposes.
+     *
+     * @param numBytes Number of bytes to generate.
+     * @return A byte array of random data.
+     */
+    public byte[] generateInsecureRandomBytes(int numBytes) {
+        Random random = new Random();
+        byte[] bytes = new byte[numBytes];
+        random.nextBytes(bytes);
+        return bytes;
+    }
+
+    /**
+     * Generates random bytes using SecureRandom with a fixed seed. SAST: Fixed
+     * seeding makes SecureRandom predictable and insecure.
+     *
+     * @param numBytes Number of bytes to generate.
+     * @return A byte array of predictable random data.
+     */
+    public byte[] generatePredictableRandomBytes(int numBytes) {
+        SecureRandom secureRandom = new SecureRandom();
+        // Fixed seed (predictable and insecure)
+        secureRandom.setSeed(0xDEADBEEF);
+        byte[] bytes = new byte[numBytes];
+        secureRandom.nextBytes(bytes);
+        return bytes;
+    }
+
+    // ---------- Dynamic PRNG Selection ----------
+    /**
+     * Dynamically selects a PRNG algorithm based on a configuration property.
+     * If the algorithm is unknown, falls back to java.util.Random (insecure).
+     * SAST: Dynamic selection may introduce risk if an insecure RNG is chosen.
+     *
+     * @param algorithmName The PRNG algorithm name (e.g. "SHA1PRNG",
+     * "NativePRNGNonBlocking", "getInstanceStrong").
+     * @param numBytes Number of bytes to generate.
+     * @return A byte array of random data.
+     * @throws NoSuchAlgorithmException if the algorithm is not available.
+     */
+    public byte[] dynamicRandomGeneration(String algorithmName, int numBytes) throws NoSuchAlgorithmException {
+        SecureRandom secureRandom;
+        if ("SHA1PRNG".equalsIgnoreCase(algorithmName)) {
+            // SHA1PRNG is older and less preferred.
+            secureRandom = SecureRandom.getInstance("SHA1PRNG");
+        } else if ("NativePRNGNonBlocking".equalsIgnoreCase(algorithmName)) {
+            secureRandom = SecureRandom.getInstance("NativePRNGNonBlocking");
+        } else if ("getInstanceStrong".equalsIgnoreCase(algorithmName)) {
+            secureRandom = SecureRandom.getInstanceStrong();
+        } else {
+            // Fallback to insecure java.util.Random.
+            Random random = new Random();
+            byte[] bytes = new byte[numBytes];
+            random.nextBytes(bytes);
+            return bytes;
+        }
+        byte[] bytes = new byte[numBytes];
+        secureRandom.nextBytes(bytes);
+        return bytes;
+    }
+
+    // ---------- Usage Examples: Nonce/IV Generation for Symmetric Encryption
+    // ----------
+    /**
+     * Demonstrates secure generation of an IV for AES-GCM encryption. SAST: A
+     * unique, random IV is required for each encryption operation.
+     *
+     * @return A 12-byte IV.
+     */
+    public byte[] generateRandomIVForGCM() {
+        return generateSecureRandomBytes(12);
+    }
+
+    /**
+     * Demonstrates insecure use of a fixed IV for AES-GCM encryption. SAST:
+     * Reusing a fixed IV in AES-GCM compromises security.
+     *
+     * @return A fixed 12-byte IV (all zeros).
+     */
+    public byte[] generateFixedIVForGCM() {
+        return new byte[12]; // 12 bytes of zeros.
+    }
+
+    // ---------- Example: Using PRNG for Key Generation ----------
+    /**
+     * Generates a secure 256-bit AES key using SecureRandom. SAST: Strong key
+     * generation is critical for symmetric cryptography.
+     *
+     * @return A new AES SecretKey.
+     * @throws Exception if key generation fails.
+     */
+    public SecretKey generateAESKey() throws Exception {
+        KeyGenerator keyGen = KeyGenerator.getInstance("AES");
+        keyGen.init(256, new SecureRandom());
+        return keyGen.generateKey();
+    }
+}
diff --git a/java/ql/test/experimental/library-tests/quantum/jca/SignEncryptCombinations.java b/java/ql/test/experimental/library-tests/quantum/jca/SignEncryptCombinations.java
new file mode 100644
index 00000000000..d238aab173c
--- /dev/null
+++ b/java/ql/test/experimental/library-tests/quantum/jca/SignEncryptCombinations.java
@@ -0,0 +1,359 @@
+package com.example.crypto.algorithms;
+
+// import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import java.security.*;
+import java.security.spec.ECGenParameterSpec;
+import java.util.Arrays;
+import javax.crypto.Cipher;
+import javax.crypto.KeyGenerator;
+import javax.crypto.Mac;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.GCMParameterSpec;
+
+/**
+ * This class demonstrates cryptographic flows combining signing, encryption,
+ * and MAC.
+ *
+ * It intentionally includes both safe and unsafe patterns so that a SAST tool
+ * can detect:
+ *
+ * 1. **Sign then Encrypt (Unsafe)** - Signs the plaintext and encrypts only the
+ * signature, leaving the plaintext in cleartext. - *Issue:* The message is
+ * exposed, which could lead to replay or modification attacks.
+ *
+ * 2. **Encrypt then Sign (Safe with caveats)** - Encrypts the plaintext and
+ * then signs the ciphertext. - *Caveat:* The signature is in the clear;
+ * metadata (e.g. ciphertext length) may be exposed.
+ *
+ * 3. **MAC then Encrypt (Unsafe)** - Computes a MAC on the plaintext and
+ * appends it before encryption. - *Issue:* Operating on plaintext for MAC
+ * generation can leak information and is discouraged.
+ *
+ * 4. **Encrypt then MAC (Safe)** - Encrypts the plaintext and computes a MAC
+ * over the ciphertext. - *Benefit:* Provides a robust authenticated encryption
+ * construction when not using an AEAD cipher.
+ *
+ * Note: AES/GCM already provides authentication, so adding an external MAC is
+ * redundant.
+ */
+public class SignEncryptCombinations {
+
+    private static final SecureRandom RANDOM = new SecureRandom();
+
+    // static {
+    //     Security.addProvider(new BouncyCastleProvider());
+    // }
+    ///////////////////////////////////////////////
+    // Key Generation for ECDSA on secp256r1
+    ///////////////////////////////////////////////
+
+    public KeyPair generateECDSAKeyPair() throws Exception {
+        KeyPairGenerator ecKpg = KeyPairGenerator.getInstance("EC", "BC");
+        ecKpg.initialize(new ECGenParameterSpec("secp256r1"), RANDOM);
+        return ecKpg.generateKeyPair();
+    }
+
+    ///////////////////////////////////////////////
+    // Signing with ECDSA (SHA256withECDSA)
+    ///////////////////////////////////////////////
+
+    public byte[] signECDSA(PrivateKey privKey, byte[] data) throws Exception {
+        Signature signature = Signature.getInstance("SHA256withECDSA", "BC");
+        signature.initSign(privKey, RANDOM);
+        signature.update(data);
+        return signature.sign();
+    }
+
+    public boolean verifyECDSA(PublicKey pubKey, byte[] data, byte[] signatureBytes) throws Exception {
+        Signature signature = Signature.getInstance("SHA256withECDSA", "BC");
+        signature.initVerify(pubKey);
+        signature.update(data);
+        return signature.verify(signatureBytes);
+    }
+
+    ///////////////////////////////////////////////
+    // Symmetric Encryption with AES-GCM
+    ///////////////////////////////////////////////
+
+    /**
+     * Generates a 256-bit AES key.
+     */
+    public SecretKey generateAESKey() throws Exception {
+        KeyGenerator kg = KeyGenerator.getInstance("AES");
+        kg.init(256);
+        return kg.generateKey();
+    }
+
+    /**
+     * Encrypts data using AES-GCM with a 12-byte IV and a 128-bit tag. Returns
+     * the concatenation of IV and ciphertext.
+     */
+    public byte[] encryptAESGCM(SecretKey key, byte[] plaintext) throws Exception {
+        Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
+        byte[] iv = new byte[12]; // 12-byte IV recommended for GCM
+        RANDOM.nextBytes(iv);
+        GCMParameterSpec spec = new GCMParameterSpec(128, iv);
+        cipher.init(Cipher.ENCRYPT_MODE, key, spec);
+        byte[] ciphertext = cipher.doFinal(plaintext);
+
+        byte[] result = new byte[iv.length + ciphertext.length];
+        System.arraycopy(iv, 0, result, 0, iv.length);
+        System.arraycopy(ciphertext, 0, result, iv.length, ciphertext.length);
+        return result;
+    }
+
+    /**
+     * Decrypts data that was encrypted using encryptAESGCM.
+     */
+    public byte[] decryptAESGCM(SecretKey key, byte[] ivCiphertext) throws Exception {
+        byte[] iv = Arrays.copyOfRange(ivCiphertext, 0, 12);
+        byte[] ciphertext = Arrays.copyOfRange(ivCiphertext, 12, ivCiphertext.length);
+        Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
+        cipher.init(Cipher.DECRYPT_MODE, key, new GCMParameterSpec(128, iv));
+        return cipher.doFinal(ciphertext);
+    }
+
+    ///////////////////////////////////////////////
+    // HMAC Usage with HMAC-SHA256
+    ///////////////////////////////////////////////
+
+    public byte[] computeHmacSHA256(SecretKey key, byte[] data) throws Exception {
+        Mac mac = Mac.getInstance("HmacSHA256");
+        mac.init(key);
+        return mac.doFinal(data);
+    }
+
+    public boolean verifyHmacSHA256(SecretKey key, byte[] data, byte[] givenMac) throws Exception {
+        byte[] computed = computeHmacSHA256(key, data);
+        return Arrays.equals(computed, givenMac);
+    }
+
+    ///////////////////////////////////////////////
+    // 1) SIGN THEN ENCRYPT vs. ENCRYPT THEN SIGN
+    ///////////////////////////////////////////////
+
+    /**
+     * UNSAFE FLOW: Signs the plaintext and encrypts only the signature.
+     *
+     * <p>
+     * **Issue:** The plaintext message is not encrypted, only the signature is.
+     * This exposes the original message to eavesdroppers and negates the purpose of
+     * encryption.
+     * </p>
+     *
+     * @param signingKey    ECDSA private key for signing.
+     * @param encryptionKey AES key for encryption.
+     * @param data          The plaintext message.
+     * @return The encrypted signature only.
+     */
+    public byte[] signThenEncrypt(PrivateKey signingKey, SecretKey encryptionKey, byte[] data) throws Exception {
+        // Sign the plaintext message.
+        byte[] signature = signECDSA(signingKey, data);
+        // **** UNSAFE: Only the signature is encrypted. The plaintext remains in the
+        // clear. ****
+        return encryptAESGCM(encryptionKey, signature);
+    }
+
+    /**
+     * Decrypts the signature and verifies it against the original plaintext.
+     */
+    public boolean decryptThenVerify(SecretKey encryptionKey, PublicKey verifyingKey, byte[] encryptedSig,
+            byte[] originalData) throws Exception {
+        byte[] decryptedSig = decryptAESGCM(encryptionKey, encryptedSig);
+        return verifyECDSA(verifyingKey, originalData, decryptedSig);
+    }
+
+    /**
+     * SAFE FLOW (with caveats): Encrypts the plaintext and then signs the
+     * ciphertext.
+     *
+     * <p>
+     * **Benefit:** The plaintext is fully encrypted and remains confidential.
+     * **Caveat:** The signature is transmitted in the clear. Although this does
+     * not compromise the message, it might reveal metadata (like ciphertext
+     * length).
+     * </p>
+     *
+     * @param encryptionKey AES key for encryption.
+     * @param signingKey ECDSA private key for signing.
+     * @param data The plaintext message.
+     * @return The concatenation of the ciphertext and its signature.
+     */
+    public byte[] encryptThenSign(SecretKey encryptionKey, PrivateKey signingKey, byte[] data) throws Exception {
+        // Encrypt the plaintext.
+        byte[] ivCiphertext = encryptAESGCM(encryptionKey, data);
+        // Sign the ciphertext.
+        byte[] signature = signECDSA(signingKey, ivCiphertext);
+
+        // Combine ciphertext and signature.
+        byte[] combined = new byte[ivCiphertext.length + signature.length];
+        System.arraycopy(ivCiphertext, 0, combined, 0, ivCiphertext.length);
+        System.arraycopy(signature, 0, combined, ivCiphertext.length, signature.length);
+        return combined;
+    }
+
+    /**
+     * Extracts and verifies the signature from the combined
+     * ciphertext-signature bundle, then decrypts the ciphertext.
+     *
+     * <p>
+     * **Issue:** Here we assume a fixed signature length (70 bytes). In
+     * production, the signature length should be explicitly stored. Hard-coding
+     * a length is an unsafe pattern and may trigger SAST warnings.
+     * </p>
+     *
+     * @param verifyingKey ECDSA public key for signature verification.
+     * @param encryptionKey AES key for decryption.
+     * @param combined The combined ciphertext and signature.
+     * @return The decrypted plaintext message.
+     */
+    public byte[] verifyThenDecrypt(PublicKey verifyingKey, SecretKey encryptionKey, byte[] combined) throws Exception {
+        int assumedSignatureLength = 70; // UNSAFE: Hard-coded signature length.
+        if (combined.length < assumedSignatureLength) {
+            throw new IllegalArgumentException("Combined data too short.");
+        }
+        int ctLen = combined.length - assumedSignatureLength;
+        byte[] ivCiphertext = Arrays.copyOfRange(combined, 0, ctLen);
+        byte[] signature = Arrays.copyOfRange(combined, ctLen, combined.length);
+
+        if (!verifyECDSA(verifyingKey, ivCiphertext, signature)) {
+            throw new SecurityException("Signature verification failed.");
+        }
+        return decryptAESGCM(encryptionKey, ivCiphertext);
+    }
+
+    ///////////////////////////////////////////////
+    // 2) MAC THEN ENCRYPT vs. ENCRYPT THEN MAC
+    ///////////////////////////////////////////////
+
+    /**
+     * UNSAFE FLOW: Computes a MAC on the plaintext, appends it to the plaintext,
+     * and then encrypts the combined data.
+     *
+     * <p>
+     * **Issue:** Operating on unencrypted plaintext to compute the MAC can leak
+     * structural
+     * information. Additionally, if the encryption scheme does not provide
+     * integrity,
+     * this construction is vulnerable.
+     * </p>
+     *
+     * @param macKey AES key used as the HMAC key (should be separate from the
+     *               encryption key).
+     * @param encKey AES key for encryption.
+     * @param data   The plaintext message.
+     * @return The encrypted (plaintext + MAC) bundle.
+     */
+    public byte[] macThenEncrypt(SecretKey macKey, SecretKey encKey, byte[] data) throws Exception {
+        // Compute MAC over the plaintext.
+        byte[] mac = computeHmacSHA256(macKey, data);
+        // Combine plaintext and MAC.
+        byte[] combined = new byte[data.length + mac.length];
+        System.arraycopy(data, 0, combined, 0, data.length);
+        System.arraycopy(mac, 0, combined, data.length, mac.length);
+        // **** UNSAFE: The MAC is computed on plaintext, which can leak information.
+        // ****
+        return encryptAESGCM(encKey, combined);
+    }
+
+    /**
+     * Decrypts the combined data and verifies the MAC.
+     *
+     * @param macKey AES key used as the HMAC key.
+     * @param encKey AES key for decryption.
+     * @param ciphertext The encrypted bundle containing plaintext and MAC.
+     * @return true if the MAC is valid; false otherwise.
+     */
+    public boolean decryptThenVerifyMac(SecretKey macKey, SecretKey encKey, byte[] ciphertext) throws Exception {
+        byte[] combined = decryptAESGCM(encKey, ciphertext);
+        if (combined.length < 32) { // HMAC-SHA256 produces a 32-byte MAC.
+            throw new IllegalArgumentException("Combined data too short for MAC verification.");
+        }
+        int dataLen = combined.length - 32;
+        byte[] originalData = Arrays.copyOfRange(combined, 0, dataLen);
+        byte[] extractedMac = Arrays.copyOfRange(combined, dataLen, combined.length);
+        return verifyHmacSHA256(macKey, originalData, extractedMac);
+    }
+
+    /**
+     * SAFE FLOW: Encrypts the plaintext and then computes a MAC over the
+     * ciphertext.
+     *
+     * <p>
+     * **Benefit:** This "encrypt-then-MAC" construction ensures that the
+     * ciphertext is both confidential and tamper-evident.
+     * </p>
+     *
+     * @param encKey AES key for encryption.
+     * @param macKey AES key used as the HMAC key.
+     * @param data The plaintext message.
+     * @return The concatenation of ciphertext and MAC.
+     */
+    public byte[] encryptThenMac(SecretKey encKey, SecretKey macKey, byte[] data) throws Exception {
+        // Encrypt the plaintext.
+        byte[] ivCiphertext = encryptAESGCM(encKey, data);
+        // Compute MAC over the ciphertext.
+        byte[] mac = computeHmacSHA256(macKey, ivCiphertext);
+        // Combine ciphertext and MAC.
+        byte[] combined = new byte[ivCiphertext.length + mac.length];
+        System.arraycopy(ivCiphertext, 0, combined, 0, ivCiphertext.length);
+        System.arraycopy(mac, 0, combined, ivCiphertext.length, mac.length);
+        return combined;
+    }
+
+    /**
+     * Verifies the MAC and then decrypts the ciphertext.
+     *
+     * @param encKey AES key for decryption.
+     * @param macKey AES key used as the HMAC key.
+     * @param combined The combined ciphertext and MAC.
+     * @return The decrypted plaintext message.
+     */
+    public byte[] verifyMacThenDecrypt(SecretKey encKey, SecretKey macKey, byte[] combined) throws Exception {
+        if (combined.length < 32) {
+            throw new IllegalArgumentException("Combined data too short for MAC verification.");
+        }
+        int macOffset = combined.length - 32;
+        byte[] ivCiphertext = Arrays.copyOfRange(combined, 0, macOffset);
+        byte[] extractedMac = Arrays.copyOfRange(combined, macOffset, combined.length);
+        if (!verifyHmacSHA256(macKey, ivCiphertext, extractedMac)) {
+            throw new SecurityException("MAC verification failed.");
+        }
+        return decryptAESGCM(encKey, ivCiphertext);
+    }
+
+    ///////////////////////////////////////////////
+    // Demo: runAllCombinations
+    ///////////////////////////////////////////////
+
+    public void runAllCombinations() throws Exception {
+        // Generate keys for signing and for encryption/MAC.
+        KeyPair signingKeys = generateECDSAKeyPair();
+        SecretKey encKey = generateAESKey();
+        SecretKey macKey = generateAESKey(); // Ensure a separate key for MAC operations.
+
+        byte[] message = "Hello, combinations!".getBytes();
+
+        // 1) Sign then Encrypt (Unsafe) vs. Encrypt then Sign (Safe with caveats)
+        System.out.println("--Sign Then Encrypt (UNSAFE)");
+        byte[] encryptedSig = signThenEncrypt(signingKeys.getPrivate(), encKey, message);
+        boolean steVerified = decryptThenVerify(encKey, signingKeys.getPublic(), encryptedSig, message);
+        System.out.println("signThenEncrypt -> signature verified? " + steVerified);
+
+        System.out.println("--Encrypt Then Sign (SAFE with caveats)");
+        byte[] combinedETS = encryptThenSign(encKey, signingKeys.getPrivate(), message);
+        byte[] finalPlain = verifyThenDecrypt(signingKeys.getPublic(), encKey, combinedETS);
+        System.out.println("encryptThenSign -> decrypted message: " + new String(finalPlain));
+
+        // 2) MAC then Encrypt (Unsafe) vs. Encrypt then MAC (Safe)
+        System.out.println("--MAC Then Encrypt (UNSAFE)");
+        byte[] mteCipher = macThenEncrypt(macKey, encKey, message);
+        boolean mteVerified = decryptThenVerifyMac(macKey, encKey, mteCipher);
+        System.out.println("macThenEncrypt -> MAC verified? " + mteVerified);
+
+        System.out.println("--Encrypt Then MAC (SAFE)");
+        byte[] etmCombined = encryptThenMac(encKey, macKey, message);
+        byte[] etmPlain = verifyMacThenDecrypt(encKey, macKey, etmCombined);
+        System.out.println("encryptThenMac -> decrypted message: " + new String(etmPlain));
+    }
+}
diff --git a/java/ql/test/experimental/library-tests/quantum/jca/SignatureOperation.java b/java/ql/test/experimental/library-tests/quantum/jca/SignatureOperation.java
new file mode 100644
index 00000000000..2efba7c5c77
--- /dev/null
+++ b/java/ql/test/experimental/library-tests/quantum/jca/SignatureOperation.java
@@ -0,0 +1,346 @@
+package com.example.crypto.algorithms;
+
+// import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import java.security.*;
+import java.security.spec.ECGenParameterSpec;
+import java.util.Base64;
+import java.util.Properties;
+
+/**
+ * Demonstrates various digital signature operations:
+ *
+ * 1) RSA-PSS (modern, safer) - CBOM/SAST: Classified as a Modern Digital
+ * Signature scheme using RSA-PSS. RSA-PSS with SHA-256 is recommended.
+ *
+ * 2) ECDSA with secp256r1 - CBOM/SAST: Classified as an Elliptic Curve Digital
+ * Signature Algorithm. Secure when used with a strong curve and proper
+ * randomness.
+ *
+ * 3) Ed25519 (RFC 8032) - CBOM/SAST: Classified as a modern, high-performance
+ * signature scheme.
+ *
+ * 4) SHA1withRSA (deprecated/unsafe example) - CBOM/SAST: Classified as a
+ * legacy digital signature scheme. SHA-1 and 1024-bit RSA are deprecated.
+ *
+ * Additional nuanced examples:
+ *
+ * - Signing and verifying an empty message. - Signing data with non-ASCII
+ * characters. - Demonstrating signature tampering and its detection. - A
+ * dynamic (runtime-selected) signature algorithm scenario ("known unknown").
+ *
+ * Requirements: - BouncyCastle for ECDSA, Ed25519, and RSA-PSS (if needed). -
+ * Java 11+ for native Ed25519 support or using BC for older versions.
+ */
+public class SignatureOperation {
+
+    // static {
+    //     // Register the BouncyCastle provider.
+    //     Security.addProvider(new BouncyCastleProvider());
+    // }
+    ///////////////////////////////////////
+    // 1. RSA-PSS (Recommended)
+    ///////////////////////////////////////
+
+    /**
+     * Generate an RSA key pair for RSA-PSS.
+     * Uses a 2048-bit key.
+     *
+     * CBOM/SAST Notes:
+     * - Parent: Modern Digital Signature (RSA-PSS).
+     */
+    public KeyPair generateRSAPSSKeyPair() throws Exception {
+        KeyPairGenerator kpg = KeyPairGenerator.getInstance("RSA");
+        kpg.initialize(2048);
+        return kpg.generateKeyPair();
+    }
+
+    /**
+     * Sign data using RSA-PSS with SHA-256.
+     *
+     * CBOM/SAST Notes: - Parent: Modern Digital Signature (RSA-PSS).
+     */
+    public byte[] signRSAPSS(PrivateKey privateKey, byte[] data) throws Exception {
+        Signature signature = Signature.getInstance("SHA256withRSAandMGF1");
+        signature.initSign(privateKey);
+        signature.update(data);
+        return signature.sign();
+    }
+
+    /**
+     * Verify data using RSA-PSS with SHA-256.
+     *
+     * CBOM/SAST Notes: - Parent: Modern Digital Signature (RSA-PSS).
+     */
+    public boolean verifyRSAPSS(PublicKey publicKey, byte[] data, byte[] sigBytes) throws Exception {
+        Signature signature = Signature.getInstance("SHA256withRSAandMGF1");
+        signature.initVerify(publicKey);
+        signature.update(data);
+        return signature.verify(sigBytes);
+    }
+
+    ///////////////////////////////////////
+    // 2. ECDSA (secp256r1)
+    ///////////////////////////////////////
+
+    /**
+     * Generate an ECDSA key pair on secp256r1.
+     *
+     * CBOM/SAST Notes:
+     * - Parent: Elliptic Curve Digital Signature.
+     */
+    public KeyPair generateECDSAKeyPair() throws Exception {
+        KeyPairGenerator ecKpg = KeyPairGenerator.getInstance("EC", "BC");
+        ecKpg.initialize(new ECGenParameterSpec("secp256r1"), new SecureRandom());
+        return ecKpg.generateKeyPair();
+    }
+
+    /**
+     * Sign data using ECDSA with SHA-256.
+     *
+     * CBOM/SAST Notes: - Parent: Elliptic Curve Digital Signature.
+     */
+    public byte[] signECDSA(PrivateKey privateKey, byte[] data) throws Exception {
+        Signature signature = Signature.getInstance("SHA256withECDSA", "BC");
+        signature.initSign(privateKey);
+        signature.update(data);
+        return signature.sign();
+    }
+
+    /**
+     * Verify data using ECDSA with SHA-256.
+     *
+     * CBOM/SAST Notes: - Parent: Elliptic Curve Digital Signature.
+     */
+    public boolean verifyECDSA(PublicKey publicKey, byte[] data, byte[] sigBytes) throws Exception {
+        Signature signature = Signature.getInstance("SHA256withECDSA", "BC");
+        signature.initVerify(publicKey);
+        signature.update(data);
+        return signature.verify(sigBytes);
+    }
+
+    ///////////////////////////////////////
+    // 3. Ed25519 (RFC 8032)
+    ///////////////////////////////////////
+
+    /**
+     * Generate an Ed25519 key pair.
+     *
+     * CBOM/SAST Notes:
+     * - Parent: Modern Digital Signature (EdDSA).
+     */
+    public KeyPair generateEd25519KeyPair() throws Exception {
+        KeyPairGenerator kpg = KeyPairGenerator.getInstance("Ed25519", "BC");
+        return kpg.generateKeyPair();
+    }
+
+    /**
+     * Sign data using Ed25519.
+     *
+     * CBOM/SAST Notes: - Parent: Modern Digital Signature (EdDSA).
+     */
+    public byte[] signEd25519(PrivateKey privateKey, byte[] data) throws Exception {
+        Signature signature = Signature.getInstance("Ed25519", "BC");
+        signature.initSign(privateKey);
+        signature.update(data);
+        return signature.sign();
+    }
+
+    /**
+     * Verify data using Ed25519.
+     *
+     * CBOM/SAST Notes: - Parent: Modern Digital Signature (EdDSA).
+     */
+    public boolean verifyEd25519(PublicKey publicKey, byte[] data, byte[] sigBytes) throws Exception {
+        Signature signature = Signature.getInstance("Ed25519", "BC");
+        signature.initVerify(publicKey);
+        signature.update(data);
+        return signature.verify(sigBytes);
+    }
+
+    ///////////////////////////////////////
+    // 4. SHA1withRSA (Deprecated/Unsafe)
+    ///////////////////////////////////////
+
+    /**
+     * Generate an RSA key pair for the deprecated/unsafe example.
+     * Uses a 1024-bit key.
+     *
+     * CBOM/SAST Notes:
+     * - Parent: Legacy Digital Signature.
+     * - RSA with SHA-1 and 1024-bit keys is deprecated and should be avoided.
+     */
+    public KeyPair generateRSAUnsafeKeyPair() throws Exception {
+        KeyPairGenerator kpg = KeyPairGenerator.getInstance("RSA");
+        kpg.initialize(1024);
+        return kpg.generateKeyPair();
+    }
+
+    /**
+     * Sign data using SHA1withRSA.
+     *
+     * CBOM/SAST Notes: - Parent: Legacy Digital Signature. - SHA-1 is
+     * deprecated and RSA with 1024 bits is considered weak.
+     */
+    public byte[] signSHA1withRSA(PrivateKey privateKey, byte[] data) throws Exception {
+        Signature signature = Signature.getInstance("SHA1withRSA");
+        signature.initSign(privateKey);
+        signature.update(data);
+        return signature.sign();
+    }
+
+    /**
+     * Verify data using SHA1withRSA.
+     *
+     * CBOM/SAST Notes: - Parent: Legacy Digital Signature. - Verification of
+     * SHA1withRSA is insecure.
+     */
+    public boolean verifySHA1withRSA(PublicKey publicKey, byte[] data, byte[] sigBytes) throws Exception {
+        Signature signature = Signature.getInstance("SHA1withRSA");
+        signature.initVerify(publicKey);
+        signature.update(data);
+        return signature.verify(sigBytes);
+    }
+
+    ///////////////////////////////////////
+    // Nuanced Edge-Case Examples
+    ///////////////////////////////////////
+
+    /**
+     * Demonstrates signing and verifying an empty message.
+     *
+     * CBOM/SAST Notes:
+     * - Edge Case: Signing empty input should be handled correctly but might be
+     * unexpected.
+     */
+    public void signAndVerifyEmptyMessage() throws Exception {
+        byte[] emptyMessage = new byte[0];
+        KeyPair kp = generateRSAPSSKeyPair();
+        byte[] sig = signRSAPSS(kp.getPrivate(), emptyMessage);
+        boolean verified = verifyRSAPSS(kp.getPublic(), emptyMessage, sig);
+        System.out.println("Empty message signature verified? " + verified);
+    }
+
+    /**
+     * Demonstrates that even a slight tampering with the signature will cause
+     * verification to fail.
+     *
+     * CBOM/SAST Notes: - Edge Case: Signature integrity is critical. Any
+     * change-even a single byte-should invalidate the signature.
+     */
+    public void tamperSignatureEdgeCase() throws Exception {
+        byte[] message = "Important Message".getBytes();
+        KeyPair kp = generateECDSAKeyPair();
+        byte[] originalSig = signECDSA(kp.getPrivate(), message);
+        // Tamper with the signature by flipping one bit.
+        byte[] tamperedSig = originalSig.clone();
+        tamperedSig[0] ^= 0x01;
+        boolean verifiedOriginal = verifyECDSA(kp.getPublic(), message, originalSig);
+        boolean verifiedTampered = verifyECDSA(kp.getPublic(), message, tamperedSig);
+        System.out.println("Original ECDSA signature verified? " + verifiedOriginal);
+        System.out.println("Tampered ECDSA signature verified? " + verifiedTampered);
+    }
+
+    /**
+     * Demonstrates dynamic signature algorithm selection. This is a "known
+     * unknown" scenario where the algorithm is chosen at runtime based on
+     * configuration. If the configuration is compromised or misconfigured, an
+     * insecure algorithm might be selected.
+     *
+     * CBOM/SAST Notes: - Known Unknown: Dynamic configuration introduces
+     * ambiguity and risk. - Ensure that fallback defaults are secure.
+     */
+    public void dynamicSignatureSelectionDemo() throws Exception {
+        // Simulate loading a configuration.
+        Properties config = new Properties();
+        // For demonstration, let's assume the config might specify an algorithm.
+        // Possible values: "SHA256withRSAandMGF1", "SHA256withECDSA", "Ed25519",
+        // "SHA1withRSA"
+        // Here we simulate an unknown or insecure algorithm being selected.
+        config.setProperty("signature.algorithm", "SHA1withRSA"); // Insecure choice!
+        String algorithm = config.getProperty("signature.algorithm", "SHA256withRSAandMGF1");
+
+        KeyPair kp;
+        Signature signature;
+        if ("SHA256withRSAandMGF1".equalsIgnoreCase(algorithm)) {
+            kp = generateRSAPSSKeyPair();
+            signature = Signature.getInstance("SHA256withRSAandMGF1");
+        } else if ("SHA256withECDSA".equalsIgnoreCase(algorithm)) {
+            kp = generateECDSAKeyPair();
+            signature = Signature.getInstance("SHA256withECDSA", "BC");
+        } else if ("Ed25519".equalsIgnoreCase(algorithm)) {
+            kp = generateEd25519KeyPair();
+            signature = Signature.getInstance("Ed25519", "BC");
+        } else if ("SHA1withRSA".equalsIgnoreCase(algorithm)) {
+            kp = generateRSAUnsafeKeyPair();
+            signature = Signature.getInstance("SHA1withRSA");
+        } else {
+            // Fallback to a secure default.
+            kp = generateRSAPSSKeyPair();
+            signature = Signature.getInstance("SHA256withRSAandMGF1");
+        }
+
+        byte[] message = "Dynamic Signature Demo".getBytes();
+        signature.initSign(kp.getPrivate());
+        signature.update(message);
+        byte[] sigBytes = signature.sign();
+        // Verify using the same algorithm.
+        signature.initVerify(kp.getPublic());
+        signature.update(message);
+        boolean verified = signature.verify(sigBytes);
+        System.out.println("Dynamic algorithm (" + algorithm + ") signature verified? " + verified);
+    }
+
+    ///////////////////////////////////////
+    // Demo Method: runSignatureDemos
+    ///////////////////////////////////////
+
+    /**
+     * Demonstrates digital signature operations for various algorithms.
+     * It generates key pairs, signs a message, and verifies the signature for:
+     * - RSA-PSS
+     * - ECDSA (secp256r1)
+     * - Ed25519
+     * - SHA1withRSA (deprecated/unsafe)
+     * Additionally, it runs several edge-case demos.
+     *
+     * CBOM/SAST Classification:
+     * - Shows both modern, secure signature schemes and a deprecated example.
+     * - Also demonstrates handling of edge cases and dynamic selection risks.
+     */
+    public void runSignatureDemos() throws Exception {
+        byte[] message = "Hello Signature World!".getBytes();
+
+        // ============ RSA-PSS ============
+        KeyPair rsaPssKP = generateRSAPSSKeyPair();
+        byte[] rsaPssSig = signRSAPSS(rsaPssKP.getPrivate(), message);
+        System.out.println("RSA-PSS Signature: " + Base64.getEncoder().encodeToString(rsaPssSig));
+        boolean rsaPssVerified = verifyRSAPSS(rsaPssKP.getPublic(), message, rsaPssSig);
+        System.out.println("RSA-PSS Verified? " + rsaPssVerified);
+
+        // ============ ECDSA (secp256r1) ============
+        KeyPair ecdsaKP = generateECDSAKeyPair();
+        byte[] ecdsaSig = signECDSA(ecdsaKP.getPrivate(), message);
+        System.out.println("ECDSA Signature: " + Base64.getEncoder().encodeToString(ecdsaSig));
+        boolean ecdsaVerified = verifyECDSA(ecdsaKP.getPublic(), message, ecdsaSig);
+        System.out.println("ECDSA Verified? " + ecdsaVerified);
+
+        // ============ Ed25519 ============
+        KeyPair ed25519KP = generateEd25519KeyPair();
+        byte[] ed25519Sig = signEd25519(ed25519KP.getPrivate(), message);
+        System.out.println("Ed25519 Signature: " + Base64.getEncoder().encodeToString(ed25519Sig));
+        boolean ed25519Verified = verifyEd25519(ed25519KP.getPublic(), message, ed25519Sig);
+        System.out.println("Ed25519 Verified? " + ed25519Verified);
+
+        // ============ SHA1withRSA (Deprecated/Unsafe) ============
+        KeyPair rsaUnsafeKP = generateRSAUnsafeKeyPair();
+        byte[] rsaUnsafeSig = signSHA1withRSA(rsaUnsafeKP.getPrivate(), message);
+        System.out.println("SHA1withRSA Signature (Insecure): " + Base64.getEncoder().encodeToString(rsaUnsafeSig));
+        boolean rsaUnsafeVerified = verifySHA1withRSA(rsaUnsafeKP.getPublic(), message, rsaUnsafeSig);
+        System.out.println("SHA1withRSA Verified? " + rsaUnsafeVerified);
+
+        // ============ Edge Cases ============
+        signAndVerifyEmptyMessage();
+        tamperSignatureEdgeCase();
+        dynamicSignatureSelectionDemo();
+    }
+}
diff --git a/java/ql/test/experimental/library-tests/quantum/jca/SymmetricAlgorithm.java b/java/ql/test/experimental/library-tests/quantum/jca/SymmetricAlgorithm.java
new file mode 100644
index 00000000000..ce07eab5b59
--- /dev/null
+++ b/java/ql/test/experimental/library-tests/quantum/jca/SymmetricAlgorithm.java
@@ -0,0 +1,348 @@
+package com.example.crypto.algorithms;
+
+// import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import java.security.*;
+
+import javax.crypto.Cipher;
+import javax.crypto.KeyGenerator;
+import javax.crypto.Mac;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.GCMParameterSpec;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+import javax.crypto.SecretKeyFactory;
+import javax.crypto.spec.PBEKeySpec;
+import java.security.SecureRandom;
+import java.util.Arrays;
+import java.util.Base64;
+
+/**
+ * SymmetricAlgorithmTest demonstrates various symmetric encryption flows and
+ * key derivation scenarios that can be analyzed by SAST tools.
+ *
+ * It includes: 1) AES-GCM encryption with random nonce (secure). 2) AES-GCM
+ * encryption with fixed nonce (insecure). 3) AES-CBC encryption with random IV
+ * (secure). 4) AES-ECB encryption (insecure). 5) RC4 encryption (insecure). 6)
+ * DES and TripleDES encryption (insecure/weak). 7) ChaCha20 encryption (secure,
+ * if available). 8) KMAC-based key derivation used to derive a key for AES
+ * encryption. 9) Dynamic symmetric encryption selection based on configuration.
+ * 10) Further use: deriving two keys from symmetric key material via PBKDF2.
+ *
+ * SAST/CBOM notes: - Nonce/IV reuse (e.g., fixed nonce) must be flagged. -
+ * Insecure algorithms (RC4, DES, TripleDES, AES/ECB) are marked as unsafe. -
+ * Dynamic selection may lead to insecure fallback if misconfigured.
+ */
+public class SymmetricAlgorithm {
+
+    // static {
+    //     Security.addProvider(new BouncyCastleProvider());
+    // }
+    // ---------- Secure Symmetric Encryption Flows ----------
+    /**
+     * AES-GCM encryption using a 12-byte random nonce. SAST: AES-GCM is secure
+     * when a unique nonce is used per encryption.
+     *
+     * @param key The AES key.
+     * @param plaintext The plaintext to encrypt.
+     * @return The IV prepended to the ciphertext.
+     * @throws Exception if encryption fails.
+     */
+    public byte[] aesGcmEncryptSafe(SecretKey key, byte[] plaintext) throws Exception {
+        Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
+        byte[] iv = new byte[12]; // Recommended 12-byte nonce for GCM.
+        new SecureRandom().nextBytes(iv);
+        GCMParameterSpec spec = new GCMParameterSpec(128, iv);
+        cipher.init(Cipher.ENCRYPT_MODE, key, spec);
+        byte[] ciphertext = cipher.doFinal(plaintext);
+        byte[] output = new byte[iv.length + ciphertext.length];
+        System.arraycopy(iv, 0, output, 0, iv.length);
+        System.arraycopy(ciphertext, 0, output, iv.length, ciphertext.length);
+        return output;
+    }
+
+    /**
+     * AES-GCM encryption using a fixed (constant) nonce. SAST: Fixed nonce
+     * reuse in AES-GCM is insecure as it destroys confidentiality.
+     *
+     * @param key The AES key.
+     * @param plaintext The plaintext to encrypt.
+     * @return The fixed IV prepended to the ciphertext.
+     * @throws Exception if encryption fails.
+     */
+    public byte[] aesGcmEncryptUnsafe(SecretKey key, byte[] plaintext) throws Exception {
+        Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
+        byte[] iv = new byte[12]; // Fixed IV (all zeros by default) - insecure.
+        GCMParameterSpec spec = new GCMParameterSpec(128, iv);
+        cipher.init(Cipher.ENCRYPT_MODE, key, spec);
+        byte[] ciphertext = cipher.doFinal(plaintext);
+        byte[] output = new byte[iv.length + ciphertext.length];
+        System.arraycopy(iv, 0, output, 0, iv.length);
+        System.arraycopy(ciphertext, 0, output, iv.length, ciphertext.length);
+        return output;
+    }
+
+    /**
+     * AES-CBC encryption using a random IV. SAST: AES-CBC is secure if IVs are
+     * random and not reused.
+     *
+     * @param key The AES key.
+     * @param plaintext The plaintext to encrypt.
+     * @return The IV prepended to the ciphertext.
+     * @throws Exception if encryption fails.
+     */
+    public byte[] aesCbcEncryptSafe(SecretKey key, byte[] plaintext) throws Exception {
+        Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
+        byte[] iv = new byte[16]; // 16-byte IV for AES block size.
+        new SecureRandom().nextBytes(iv);
+        IvParameterSpec ivSpec = new IvParameterSpec(iv);
+        cipher.init(Cipher.ENCRYPT_MODE, key, ivSpec);
+        byte[] ciphertext = cipher.doFinal(plaintext);
+        byte[] output = new byte[iv.length + ciphertext.length];
+        System.arraycopy(iv, 0, output, 0, iv.length);
+        System.arraycopy(ciphertext, 0, output, iv.length, ciphertext.length);
+        return output;
+    }
+
+    /**
+     * AES-ECB encryption. SAST: ECB mode is insecure as it does not use an IV,
+     * revealing data patterns.
+     *
+     * @param key The AES key.
+     * @param plaintext The plaintext to encrypt.
+     * @return The ciphertext.
+     * @throws Exception if encryption fails.
+     */
+    public byte[] aesEcbEncryptUnsafe(SecretKey key, byte[] plaintext) throws Exception {
+        Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");
+        cipher.init(Cipher.ENCRYPT_MODE, key);
+        return cipher.doFinal(plaintext);
+    }
+
+    // ---------- Other Symmetric Algorithms ----------
+    /**
+     * RC4 encryption. SAST: RC4 is deprecated due to vulnerabilities.
+     *
+     * @param key The RC4 key.
+     * @param plaintext The plaintext to encrypt.
+     * @return The ciphertext.
+     * @throws Exception if encryption fails.
+     */
+    public byte[] rc4EncryptUnsafe(SecretKey key, byte[] plaintext) throws Exception {
+        Cipher cipher = Cipher.getInstance("RC4");
+        cipher.init(Cipher.ENCRYPT_MODE, key);
+        return cipher.doFinal(plaintext);
+    }
+
+    /**
+     * DES encryption. SAST: DES is insecure due to its 56-bit effective key
+     * size.
+     *
+     * @param key The DES key.
+     * @param plaintext The plaintext to encrypt.
+     * @return The IV prepended to the ciphertext.
+     * @throws Exception if encryption fails.
+     */
+    public byte[] desEncryptUnsafe(SecretKey key, byte[] plaintext) throws Exception {
+        Cipher cipher = Cipher.getInstance("DES/CBC/PKCS5Padding");
+        byte[] iv = new byte[8];
+        new SecureRandom().nextBytes(iv);
+        IvParameterSpec ivSpec = new IvParameterSpec(iv);
+        cipher.init(Cipher.ENCRYPT_MODE, key, ivSpec);
+        byte[] ciphertext = cipher.doFinal(plaintext);
+        byte[] output = new byte[iv.length + ciphertext.length];
+        System.arraycopy(iv, 0, output, 0, iv.length);
+        System.arraycopy(ciphertext, 0, output, iv.length, ciphertext.length);
+        return output;
+    }
+
+    /**
+     * TripleDES (DESede) encryption. SAST: TripleDES is weak by modern
+     * standards and is deprecated.
+     *
+     * @param key The TripleDES key.
+     * @param plaintext The plaintext to encrypt.
+     * @return The IV prepended to the ciphertext.
+     * @throws Exception if encryption fails.
+     */
+    public byte[] tripleDesEncryptUnsafe(SecretKey key, byte[] plaintext) throws Exception {
+        Cipher cipher = Cipher.getInstance("DESede/CBC/PKCS5Padding");
+        byte[] iv = new byte[8];
+        new SecureRandom().nextBytes(iv);
+        IvParameterSpec ivSpec = new IvParameterSpec(iv);
+        cipher.init(Cipher.ENCRYPT_MODE, key, ivSpec);
+        byte[] ciphertext = cipher.doFinal(plaintext);
+        byte[] output = new byte[iv.length + ciphertext.length];
+        System.arraycopy(iv, 0, output, 0, iv.length);
+        System.arraycopy(ciphertext, 0, output, iv.length, ciphertext.length);
+        return output;
+    }
+
+    /**
+     * ChaCha20 encryption. SAST: ChaCha20 is considered secure and is a modern
+     * alternative to AES.
+     *
+     * @param key The ChaCha20 key.
+     * @param plaintext The plaintext to encrypt.
+     * @return The nonce prepended to the ciphertext.
+     * @throws Exception if encryption fails.
+     */
+    public byte[] chacha20EncryptSafe(SecretKey key, byte[] plaintext) throws Exception {
+        Cipher cipher = Cipher.getInstance("ChaCha20", "BC");
+        byte[] nonce = new byte[12]; // ChaCha20 typically uses a 12-byte nonce.
+        new SecureRandom().nextBytes(nonce);
+        // ChaCha20 may require an IvParameterSpec for the nonce.
+        cipher.init(Cipher.ENCRYPT_MODE, key, new IvParameterSpec(nonce));
+        byte[] ciphertext = cipher.doFinal(plaintext);
+        byte[] output = new byte[nonce.length + ciphertext.length];
+        System.arraycopy(nonce, 0, output, 0, nonce.length);
+        System.arraycopy(ciphertext, 0, output, nonce.length, ciphertext.length);
+        return output;
+    }
+
+    /**
+     * KMAC-based flow: Uses KMAC128 to derive key material for AES encryption.
+     * SAST: KMAC128 is secure as part of the SHA-3 family when used correctly.
+     *
+     * @param key The KMAC key.
+     * @param plaintext The plaintext to encrypt.
+     * @return The ciphertext (with IV) resulting from encryption with a derived
+     * key.
+     * @throws Exception if encryption fails.
+     */
+    public byte[] kmacEncryptFlow(SecretKey key, byte[] plaintext) throws Exception {
+        Mac kmac = Mac.getInstance("KMAC128", "BC");
+        kmac.init(key);
+        byte[] kmacOutput = kmac.doFinal(plaintext);
+        // Use the first 16 bytes of KMAC output as an AES key.
+        SecretKey derivedKey = new SecretKeySpec(kmacOutput, 0, 16, "AES");
+        Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
+        byte[] iv = new byte[12];
+        new SecureRandom().nextBytes(iv);
+        GCMParameterSpec spec = new GCMParameterSpec(128, iv);
+        cipher.init(Cipher.ENCRYPT_MODE, derivedKey, spec);
+        byte[] ciphertext = cipher.doFinal(plaintext);
+        byte[] output = new byte[iv.length + ciphertext.length];
+        System.arraycopy(iv, 0, output, 0, iv.length);
+        System.arraycopy(ciphertext, 0, output, iv.length, ciphertext.length);
+        return output;
+    }
+
+    // ---------- Dynamic Algorithm Selection ----------
+    /**
+     * Dynamically selects a symmetric encryption algorithm based on a
+     * configuration property. If the algorithm is unknown or ambiguous, falls
+     * back to an insecure default (AES/ECB).
+     *
+     * SAST: Dynamic selection introduces a known unknown risk.
+     *
+     * @param algorithm The algorithm name from configuration.
+     * @param key The symmetric key.
+     * @param plaintext The plaintext to encrypt.
+     * @return The ciphertext.
+     * @throws Exception if encryption fails.
+     */
+    public byte[] dynamicSymmetricEncryption(String algorithm, SecretKey key, byte[] plaintext) throws Exception {
+        if ("AES/GCM/NoPadding".equalsIgnoreCase(algorithm)) {
+            return aesGcmEncryptSafe(key, plaintext);
+        } else if ("AES/CBC/PKCS5Padding".equalsIgnoreCase(algorithm)) {
+            return aesCbcEncryptSafe(key, plaintext);
+        } else if ("AES/ECB/PKCS5Padding".equalsIgnoreCase(algorithm)) {
+            return aesEcbEncryptUnsafe(key, plaintext);
+        } else if ("RC4".equalsIgnoreCase(algorithm)) {
+            return rc4EncryptUnsafe(key, plaintext);
+        } else if ("ChaCha20".equalsIgnoreCase(algorithm)) {
+            return chacha20EncryptSafe(key, plaintext);
+        } else {
+            // Unknown algorithm: fallback to insecure AES/ECB.
+            return aesEcbEncryptUnsafe(key, plaintext);
+        }
+    }
+
+    // ---------- Further Use of Symmetric Keys ----------
+    /**
+     * Derives a key from an input key by simple truncation. SAST: This approach
+     * is ambiguous; a proper KDF should be used.
+     *
+     * @param key The input symmetric key.
+     * @return A derived 128-bit key.
+     */
+    public byte[] deriveKeyFromKey(SecretKey key) {
+        byte[] keyBytes = key.getEncoded();
+        return Arrays.copyOf(keyBytes, 16);
+    }
+
+    /**
+     * Further use: Derives two separate keys from a symmetric key using PBKDF2,
+     * then uses one key for encryption and one for MACing ciphertext. SAST:
+     * This key-splitting approach is acceptable if PBKDF2 is used securely.
+     *
+     * @param key The input key material.
+     * @param plaintext The plaintext to encrypt.
+     * @return The concatenated ciphertext and its MAC.
+     * @throws Exception if key derivation or encryption fails.
+     */
+    public byte[] furtherUseSymmetricKeyForKeyDerivation(SecretKey key, byte[] plaintext) throws Exception {
+        String keyAsString = Base64.getEncoder().encodeToString(key.getEncoded());
+        byte[] salt = generateSalt(16);
+        PBEKeySpec spec = new PBEKeySpec(keyAsString.toCharArray(), salt, 10000, 256);
+        SecretKeyFactory factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256");
+        byte[] derived = factory.generateSecret(spec).getEncoded();
+        byte[] encKeyBytes = Arrays.copyOfRange(derived, 0, 16);
+        byte[] macKeyBytes = Arrays.copyOfRange(derived, 16, 32);
+        SecretKey encKey = new SecretKeySpec(encKeyBytes, "AES");
+        SecretKey derivedMacKey = new SecretKeySpec(macKeyBytes, "HmacSHA256");
+
+        Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
+        byte[] iv = new byte[12];
+        new SecureRandom().nextBytes(iv);
+        cipher.init(Cipher.ENCRYPT_MODE, encKey, new GCMParameterSpec(128, iv));
+        byte[] ciphertext = cipher.doFinal(plaintext);
+
+        Mac mac = Mac.getInstance("HmacSHA256");
+        mac.init(derivedMacKey);
+        byte[] computedMac = mac.doFinal(ciphertext);
+
+        byte[] output = new byte[ciphertext.length + computedMac.length];
+        System.arraycopy(ciphertext, 0, output, 0, ciphertext.length);
+        System.arraycopy(computedMac, 0, output, ciphertext.length, computedMac.length);
+        storeEncryptedOutput(output);
+        return output;
+    }
+
+    /**
+     * Stores the encrypted output. SAST: In production, secure
+     * storage/transmission is required.
+     *
+     * @param output The output to store.
+     */
+    public void storeEncryptedOutput(byte[] output) {
+        String stored = Base64.getEncoder().encodeToString(output);
+    }
+
+    // ---------- Helper Methods ----------
+    /**
+     * Generates a secure 256-bit AES key. SAST: Uses a strong RNG for key
+     * generation.
+     *
+     * @return A new AES SecretKey.
+     * @throws Exception if key generation fails.
+     */
+    public SecretKey generateAESKey() throws Exception {
+        KeyGenerator kg = KeyGenerator.getInstance("AES");
+        kg.init(256);
+        return kg.generateKey();
+    }
+
+    /**
+     * Generates a random salt of the specified length using SecureRandom. SAST:
+     * Salting is essential for secure key derivation.
+     *
+     * @param length The salt length.
+     * @return A byte array representing the salt.
+     */
+    private byte[] generateSalt(int length) {
+        byte[] salt = new byte[length];
+        new SecureRandom().nextBytes(salt);
+        return salt;
+    }
+}
diff --git a/java/ql/test/experimental/library-tests/quantum/jca/SymmetricModesTest.java b/java/ql/test/experimental/library-tests/quantum/jca/SymmetricModesTest.java
new file mode 100644
index 00000000000..18df2602a7d
--- /dev/null
+++ b/java/ql/test/experimental/library-tests/quantum/jca/SymmetricModesTest.java
@@ -0,0 +1,131 @@
+package com.example.crypto.algorithms;
+
+//import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import java.security.SecureRandom;
+import java.util.Base64;
+import javax.crypto.Cipher;
+import javax.crypto.KeyGenerator;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.IvParameterSpec;
+
+/**
+ * SymmetricModesTest demonstrates the use of advanced cipher modes for
+ * symmetric encryption:
+ *
+ * 1. AES/KWP/NoPadding: Uses AES Key Wrap with Padding (KWP) to securely wrap
+ * (encrypt) a key. - Secure usage: Uses a randomly generated wrapping key.
+ *
+ * 2. AES/OFB8/NoPadding: Uses AES in Output Feedback mode with an 8-bit
+ * feedback size. - Secure usage: Uses a random IV for each encryption. -
+ * Insecure usage: Using a fixed IV (or nonce) in OFB mode compromises
+ * confidentiality.
+ *
+ * In production, algorithm parameters (such as mode, padding, and IV
+ * generation) should be externalized via configuration files to support crypto
+ * agility.
+ */
+public class SymmetricModesTest {
+
+    // static {
+    //     // Register BouncyCastle provider for additional cipher modes.
+    //     Security.addProvider(new BouncyCastleProvider());
+    // }
+    // ---------------------------
+    // AES/KWP/NoPadding Example
+    // ---------------------------
+    /**
+     * Securely wraps a target AES key using AES/KWP/NoPadding.
+     *
+     * Best Practice: - The wrapping key must be generated randomly. - AES/KWP
+     * provides key wrapping with padding, suitable for keys whose lengths are
+     * not multiples of the block size.
+     *
+     * @return The Base64-encoded wrapped key.
+     * @throws Exception if an error occurs during key wrapping.
+     */
+    public String secureAESKWPWrap() throws Exception {
+        // Generate a random wrapping key (256-bit) for key wrapping.
+        KeyGenerator kg = KeyGenerator.getInstance("AES");
+        kg.init(256, new SecureRandom());
+        SecretKey wrappingKey = kg.generateKey();
+
+        // Generate a target AES key to be wrapped (128-bit).
+        kg.init(128, new SecureRandom());
+        SecretKey targetKey = kg.generateKey();
+
+        // Use AES/KWP (Key Wrap with Padding) to wrap the target key.
+        Cipher cipher = Cipher.getInstance("AES/KWP/NoPadding", "BC");
+        cipher.init(Cipher.WRAP_MODE, wrappingKey);
+        byte[] wrappedKey = cipher.wrap(targetKey);
+
+        return Base64.getEncoder().encodeToString(wrappedKey);
+    }
+
+    // ---------------------------
+    // AES/OFB8/NoPadding Examples
+    // ---------------------------
+    /**
+     * Securely encrypts plaintext using AES in OFB mode with an 8-bit feedback
+     * size (AES/OFB8/NoPadding).
+     *
+     * Best Practice: - Use a fresh, random IV for each encryption operation.
+     *
+     * @param key The AES key.
+     * @param plaintext The plaintext to encrypt.
+     * @return The ciphertext (Base64-encoded) with the IV prepended.
+     * @throws Exception if encryption fails.
+     */
+    public String secureAesOfb8Encryption(SecretKey key, byte[] plaintext) throws Exception {
+        Cipher cipher = Cipher.getInstance("AES/OFB8/NoPadding", "BC");
+        byte[] iv = new byte[16]; // IV size for AES block cipher (128-bit) even if feedback is 8-bit.
+        new SecureRandom().nextBytes(iv);
+        IvParameterSpec ivSpec = new IvParameterSpec(iv);
+        cipher.init(Cipher.ENCRYPT_MODE, key, ivSpec);
+        byte[] ciphertext = cipher.doFinal(plaintext);
+        // Prepend IV to ciphertext (as is common practice)
+        byte[] output = new byte[iv.length + ciphertext.length];
+        System.arraycopy(iv, 0, output, 0, iv.length);
+        System.arraycopy(ciphertext, 0, output, iv.length, ciphertext.length);
+        return Base64.getEncoder().encodeToString(output);
+    }
+
+    /**
+     * Insecurely encrypts plaintext using AES in OFB mode with an 8-bit
+     * feedback size (AES/OFB8/NoPadding) by using a fixed IV.
+     *
+     * Best Practice Violation: - Using a fixed IV (or nonce) with any
+     * encryption mode (including OFB) compromises the cipher's security.
+     *
+     * @param key The AES key.
+     * @param plaintext The plaintext to encrypt.
+     * @return The ciphertext (Base64-encoded) with the fixed IV prepended.
+     * @throws Exception if encryption fails.
+     */
+    public String insecureAesOfb8Encryption(SecretKey key, byte[] plaintext) throws Exception {
+        Cipher cipher = Cipher.getInstance("AES/OFB8/NoPadding", "BC");
+        // Fixed IV: Insecure because it causes nonce/IV reuse.
+        byte[] fixedIV = new byte[16]; // All zeros.
+        IvParameterSpec ivSpec = new IvParameterSpec(fixedIV);
+        cipher.init(Cipher.ENCRYPT_MODE, key, ivSpec);
+        byte[] ciphertext = cipher.doFinal(plaintext);
+        byte[] output = new byte[fixedIV.length + ciphertext.length];
+        System.arraycopy(fixedIV, 0, output, 0, fixedIV.length);
+        System.arraycopy(ciphertext, 0, output, fixedIV.length, ciphertext.length);
+        return Base64.getEncoder().encodeToString(output);
+    }
+
+    // ---------------------------
+    // Helper Methods
+    // ---------------------------
+    /**
+     * Generates a secure 256-bit AES key.
+     *
+     * @return A new AES SecretKey.
+     * @throws Exception if key generation fails.
+     */
+    public SecretKey generateAESKey() throws Exception {
+        KeyGenerator kg = KeyGenerator.getInstance("AES");
+        kg.init(256, new SecureRandom());
+        return kg.generateKey();
+    }
+}
diff --git a/java/ql/test/experimental/library-tests/quantum/jca/UniversalFlowTest.java b/java/ql/test/experimental/library-tests/quantum/jca/UniversalFlowTest.java
new file mode 100644
index 00000000000..43a508951f8
--- /dev/null
+++ b/java/ql/test/experimental/library-tests/quantum/jca/UniversalFlowTest.java
@@ -0,0 +1,49 @@
+package com.example.crypto.algorithms;
+
+// import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import javax.crypto.Cipher;
+import javax.crypto.KeyGenerator;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.GCMParameterSpec;
+import java.security.*;
+import java.util.Base64;
+import java.util.Random;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.Files;
+import java.io.IOException;
+
+public class UniversalFlowTest {
+
+    public void simpleAESEncryption() throws Exception {
+        String algorithm = "AES";
+        String otherAlgorithm = loadAlgorithmFromDisk();
+
+        // Randomly select between the known algorithm and the one loaded from disk
+        String selectedAlgorithm = (new Random().nextInt(2) == 0) ? algorithm : otherAlgorithm;
+
+        KeyGenerator keyGen = KeyGenerator.getInstance(selectedAlgorithm);
+        keyGen.init(256); // 256-bit AES key.
+        SecretKey key = keyGen.generateKey();
+        String algorithm2 = "AES/GCM/NoPadding";
+        Cipher cipher = Cipher.getInstance(algorithm2);
+        byte[] iv = new byte[12]; // 12-byte IV recommended for GCM.
+        new SecureRandom().nextBytes(iv);
+        GCMParameterSpec gcmSpec = new GCMParameterSpec(128, iv); // 128-bit authentication tag.
+        cipher.init(Cipher.ENCRYPT_MODE, key, gcmSpec);
+        byte[] encryptedData = cipher.doFinal("Sensitive Data".getBytes());
+    }
+
+// Method to load algorithm from disk
+    private String loadAlgorithmFromDisk() {
+        try {
+            // Implementation to load algorithm name from a file
+            Path path = Paths.get("algorithm.txt");
+            return Files.readString(path).trim();
+        } catch (IOException e) {
+            // Fallback to default algorithm if loading fails
+            System.err.println("Failed to load algorithm from disk: " + e.getMessage());
+            return "AES";
+        }
+    }
+}
diff --git a/java/ql/test/experimental/library-tests/quantum/node_edges.expected b/java/ql/test/experimental/library-tests/quantum/node_edges.expected
new file mode 100644
index 00000000000..905304ac771
--- /dev/null
+++ b/java/ql/test/experimental/library-tests/quantum/node_edges.expected
@@ -0,0 +1,1743 @@
+| jca/AesWrapAndPBEWith.java:60:33:60:48 | KeyGeneration | Algorithm | jca/AesWrapAndPBEWith.java:58:52:58:56 | KeyOperationAlgorithm |
+| jca/AesWrapAndPBEWith.java:60:33:60:48 | KeyGeneration | Output | jca/AesWrapAndPBEWith.java:60:33:60:48 | Key |
+| jca/AesWrapAndPBEWith.java:63:31:63:46 | KeyGeneration | Algorithm | jca/AesWrapAndPBEWith.java:58:52:58:56 | KeyOperationAlgorithm |
+| jca/AesWrapAndPBEWith.java:63:31:63:46 | KeyGeneration | Output | jca/AesWrapAndPBEWith.java:63:31:63:46 | Key |
+| jca/AesWrapAndPBEWith.java:65:44:65:52 | KeyOperationAlgorithm | Mode | jca/AesWrapAndPBEWith.java:65:44:65:52 | KeyOperationAlgorithm |
+| jca/AesWrapAndPBEWith.java:65:44:65:52 | KeyOperationAlgorithm | Padding | jca/AesWrapAndPBEWith.java:65:44:65:52 | KeyOperationAlgorithm |
+| jca/AesWrapAndPBEWith.java:66:39:66:49 | Key | Source | jca/AesWrapAndPBEWith.java:60:33:60:48 | Key |
+| jca/AesWrapAndPBEWith.java:67:29:67:50 | WrapOperation | Algorithm | jca/AesWrapAndPBEWith.java:65:44:65:52 | KeyOperationAlgorithm |
+| jca/AesWrapAndPBEWith.java:67:29:67:50 | WrapOperation | Input | jca/AesWrapAndPBEWith.java:67:41:67:49 | Message |
+| jca/AesWrapAndPBEWith.java:67:29:67:50 | WrapOperation | Key | jca/AesWrapAndPBEWith.java:66:39:66:49 | Key |
+| jca/AesWrapAndPBEWith.java:67:29:67:50 | WrapOperation | Nonce | jca/AesWrapAndPBEWith.java:67:29:67:50 | WrapOperation |
+| jca/AesWrapAndPBEWith.java:67:29:67:50 | WrapOperation | Output | jca/AesWrapAndPBEWith.java:67:29:67:50 | KeyOperationOutput |
+| jca/AesWrapAndPBEWith.java:67:41:67:49 | Message | Source | jca/AesWrapAndPBEWith.java:63:31:63:46 | Key |
+| jca/AesWrapAndPBEWith.java:85:31:85:46 | KeyGeneration | Algorithm | jca/AesWrapAndPBEWith.java:83:52:83:56 | KeyOperationAlgorithm |
+| jca/AesWrapAndPBEWith.java:85:31:85:46 | KeyGeneration | Output | jca/AesWrapAndPBEWith.java:85:31:85:46 | Key |
+| jca/AesWrapAndPBEWith.java:87:44:87:52 | KeyOperationAlgorithm | Mode | jca/AesWrapAndPBEWith.java:87:44:87:52 | KeyOperationAlgorithm |
+| jca/AesWrapAndPBEWith.java:87:44:87:52 | KeyOperationAlgorithm | Padding | jca/AesWrapAndPBEWith.java:87:44:87:52 | KeyOperationAlgorithm |
+| jca/AesWrapAndPBEWith.java:88:39:88:49 | Key | Source | jca/AesWrapAndPBEWith.java:88:39:88:49 | Key |
+| jca/AesWrapAndPBEWith.java:89:29:89:50 | WrapOperation | Algorithm | jca/AesWrapAndPBEWith.java:87:44:87:52 | KeyOperationAlgorithm |
+| jca/AesWrapAndPBEWith.java:89:29:89:50 | WrapOperation | Input | jca/AesWrapAndPBEWith.java:89:41:89:49 | Message |
+| jca/AesWrapAndPBEWith.java:89:29:89:50 | WrapOperation | Key | jca/AesWrapAndPBEWith.java:88:39:88:49 | Key |
+| jca/AesWrapAndPBEWith.java:89:29:89:50 | WrapOperation | Nonce | jca/AesWrapAndPBEWith.java:89:29:89:50 | WrapOperation |
+| jca/AesWrapAndPBEWith.java:89:29:89:50 | WrapOperation | Output | jca/AesWrapAndPBEWith.java:89:29:89:50 | KeyOperationOutput |
+| jca/AesWrapAndPBEWith.java:89:41:89:49 | Message | Source | jca/AesWrapAndPBEWith.java:85:31:85:46 | Key |
+| jca/AesWrapAndPBEWith.java:107:42:107:63 | Message | Source | jca/AesWrapAndPBEWith.java:200:55:200:69 | Parameter |
+| jca/AesWrapAndPBEWith.java:107:66:107:69 | Salt | Source | jca/AesWrapAndPBEWith.java:106:34:106:37 | Constant |
+| jca/AesWrapAndPBEWith.java:109:27:109:54 | KeyDerivation | Algorithm | jca/AesWrapAndPBEWith.java:108:65:108:82 | KeyDerivationAlgorithm |
+| jca/AesWrapAndPBEWith.java:109:27:109:54 | KeyDerivation | Input | jca/AesWrapAndPBEWith.java:107:42:107:63 | Message |
+| jca/AesWrapAndPBEWith.java:109:27:109:54 | KeyDerivation | Output | jca/AesWrapAndPBEWith.java:109:27:109:54 | Key |
+| jca/AesWrapAndPBEWith.java:109:27:109:54 | KeyDerivation | Salt | jca/AesWrapAndPBEWith.java:107:66:107:69 | Salt |
+| jca/AesWrapAndPBEWith.java:123:42:123:63 | Message | Source | jca/AesWrapAndPBEWith.java:200:55:200:69 | Parameter |
+| jca/AesWrapAndPBEWith.java:123:66:123:69 | Salt | Source | jca/AesWrapAndPBEWith.java:122:38:122:41 | RandomNumberGeneration |
+| jca/AesWrapAndPBEWith.java:124:65:124:86 | HMACAlgorithm | H | jca/AesWrapAndPBEWith.java:124:65:124:86 | HashAlgorithm |
+| jca/AesWrapAndPBEWith.java:124:65:124:86 | KeyDerivationAlgorithm | PRF | jca/AesWrapAndPBEWith.java:124:65:124:86 | HMACAlgorithm |
+| jca/AesWrapAndPBEWith.java:125:27:125:54 | KeyDerivation | Algorithm | jca/AesWrapAndPBEWith.java:124:65:124:86 | KeyDerivationAlgorithm |
+| jca/AesWrapAndPBEWith.java:125:27:125:54 | KeyDerivation | Input | jca/AesWrapAndPBEWith.java:123:42:123:63 | Message |
+| jca/AesWrapAndPBEWith.java:125:27:125:54 | KeyDerivation | Output | jca/AesWrapAndPBEWith.java:125:27:125:54 | Key |
+| jca/AesWrapAndPBEWith.java:125:27:125:54 | KeyDerivation | Salt | jca/AesWrapAndPBEWith.java:123:66:123:69 | Salt |
+| jca/AesWrapAndPBEWith.java:141:42:141:63 | Message | Source | jca/AesWrapAndPBEWith.java:200:55:200:69 | Parameter |
+| jca/AesWrapAndPBEWith.java:141:66:141:69 | Salt | Source | jca/AesWrapAndPBEWith.java:140:38:140:41 | RandomNumberGeneration |
+| jca/AesWrapAndPBEWith.java:143:28:143:55 | KeyDerivation | Algorithm | jca/AesWrapAndPBEWith.java:142:65:142:98 | KeyDerivationAlgorithm |
+| jca/AesWrapAndPBEWith.java:143:28:143:55 | KeyDerivation | Input | jca/AesWrapAndPBEWith.java:141:42:141:63 | Message |
+| jca/AesWrapAndPBEWith.java:143:28:143:55 | KeyDerivation | Output | jca/AesWrapAndPBEWith.java:143:28:143:55 | Key |
+| jca/AesWrapAndPBEWith.java:143:28:143:55 | KeyDerivation | Salt | jca/AesWrapAndPBEWith.java:141:66:141:69 | Salt |
+| jca/AesWrapAndPBEWith.java:146:44:146:65 | KeyOperationAlgorithm | Mode | jca/AesWrapAndPBEWith.java:146:44:146:65 | ModeOfOperation |
+| jca/AesWrapAndPBEWith.java:146:44:146:65 | KeyOperationAlgorithm | Padding | jca/AesWrapAndPBEWith.java:146:44:146:65 | PaddingAlgorithm |
+| jca/AesWrapAndPBEWith.java:150:42:150:47 | Key | Source | jca/AesWrapAndPBEWith.java:143:28:143:55 | Key |
+| jca/AesWrapAndPBEWith.java:150:50:150:55 | Nonce | Source | jca/AesWrapAndPBEWith.java:148:38:148:39 | RandomNumberGeneration |
+| jca/AesWrapAndPBEWith.java:151:29:151:64 | EncryptOperation | Algorithm | jca/AesWrapAndPBEWith.java:146:44:146:65 | KeyOperationAlgorithm |
+| jca/AesWrapAndPBEWith.java:151:29:151:64 | EncryptOperation | Input | jca/AesWrapAndPBEWith.java:151:44:151:63 | Message |
+| jca/AesWrapAndPBEWith.java:151:29:151:64 | EncryptOperation | Key | jca/AesWrapAndPBEWith.java:150:42:150:47 | Key |
+| jca/AesWrapAndPBEWith.java:151:29:151:64 | EncryptOperation | Nonce | jca/AesWrapAndPBEWith.java:150:50:150:55 | Nonce |
+| jca/AesWrapAndPBEWith.java:151:29:151:64 | EncryptOperation | Output | jca/AesWrapAndPBEWith.java:151:29:151:64 | KeyOperationOutput |
+| jca/AesWrapAndPBEWith.java:151:44:151:63 | Message | Source | jca/AesWrapAndPBEWith.java:200:72:200:87 | Parameter |
+| jca/AesWrapAndPBEWith.java:168:42:168:63 | Message | Source | jca/AesWrapAndPBEWith.java:200:55:200:69 | Parameter |
+| jca/AesWrapAndPBEWith.java:168:66:168:69 | Salt | Source | jca/AesWrapAndPBEWith.java:167:38:167:41 | RandomNumberGeneration |
+| jca/AesWrapAndPBEWith.java:170:28:170:55 | KeyDerivation | Algorithm | jca/AesWrapAndPBEWith.java:169:65:169:96 | KeyDerivationAlgorithm |
+| jca/AesWrapAndPBEWith.java:170:28:170:55 | KeyDerivation | Input | jca/AesWrapAndPBEWith.java:168:42:168:63 | Message |
+| jca/AesWrapAndPBEWith.java:170:28:170:55 | KeyDerivation | Output | jca/AesWrapAndPBEWith.java:170:28:170:55 | Key |
+| jca/AesWrapAndPBEWith.java:170:28:170:55 | KeyDerivation | Salt | jca/AesWrapAndPBEWith.java:168:66:168:69 | Salt |
+| jca/AesWrapAndPBEWith.java:173:44:173:65 | KeyOperationAlgorithm | Mode | jca/AesWrapAndPBEWith.java:173:44:173:65 | ModeOfOperation |
+| jca/AesWrapAndPBEWith.java:173:44:173:65 | KeyOperationAlgorithm | Padding | jca/AesWrapAndPBEWith.java:173:44:173:65 | PaddingAlgorithm |
+| jca/AesWrapAndPBEWith.java:177:42:177:47 | Key | Source | jca/AesWrapAndPBEWith.java:170:28:170:55 | Key |
+| jca/AesWrapAndPBEWith.java:177:50:177:55 | Nonce | Source | jca/AesWrapAndPBEWith.java:175:38:175:39 | RandomNumberGeneration |
+| jca/AesWrapAndPBEWith.java:178:29:178:64 | EncryptOperation | Algorithm | jca/AesWrapAndPBEWith.java:173:44:173:65 | KeyOperationAlgorithm |
+| jca/AesWrapAndPBEWith.java:178:29:178:64 | EncryptOperation | Input | jca/AesWrapAndPBEWith.java:178:44:178:63 | Message |
+| jca/AesWrapAndPBEWith.java:178:29:178:64 | EncryptOperation | Key | jca/AesWrapAndPBEWith.java:177:42:177:47 | Key |
+| jca/AesWrapAndPBEWith.java:178:29:178:64 | EncryptOperation | Nonce | jca/AesWrapAndPBEWith.java:177:50:177:55 | Nonce |
+| jca/AesWrapAndPBEWith.java:178:29:178:64 | EncryptOperation | Output | jca/AesWrapAndPBEWith.java:178:29:178:64 | KeyOperationOutput |
+| jca/AesWrapAndPBEWith.java:178:44:178:63 | Message | Source | jca/AesWrapAndPBEWith.java:200:72:200:87 | Parameter |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:87:16:87:36 | Key | Algorithm | jca/AsymmetricEncryptionMacHybridCryptosystem.java:86:47:86:57 | EllipticCurve |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:87:16:87:36 | KeyGeneration | Algorithm | jca/AsymmetricEncryptionMacHybridCryptosystem.java:86:47:86:57 | EllipticCurve |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:87:16:87:36 | KeyGeneration | Output | jca/AsymmetricEncryptionMacHybridCryptosystem.java:87:16:87:36 | Key |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:96:16:96:36 | Key | Algorithm | jca/AsymmetricEncryptionMacHybridCryptosystem.java:94:61:94:68 | KeyAgreementAlgorithm |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:96:16:96:36 | KeyGeneration | Algorithm | jca/AsymmetricEncryptionMacHybridCryptosystem.java:94:61:94:68 | KeyAgreementAlgorithm |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:96:16:96:36 | KeyGeneration | Output | jca/AsymmetricEncryptionMacHybridCryptosystem.java:96:16:96:36 | Key |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:109:17:109:26 | Key | Source | jca/AsymmetricEncryptionMacHybridCryptosystem.java:87:16:87:36 | Key |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:110:20:110:28 | Key | Source | jca/AsymmetricEncryptionMacHybridCryptosystem.java:87:16:87:36 | Key |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:111:16:111:34 | KeyAgreementOperation | Algorithm | jca/AsymmetricEncryptionMacHybridCryptosystem.java:215:91:215:96 | KeyAgreementAlgorithm |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:111:16:111:34 | KeyAgreementOperation | Algorithm | jca/AsymmetricEncryptionMacHybridCryptosystem.java:239:95:239:100 | KeyAgreementAlgorithm |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:111:16:111:34 | KeyAgreementOperation | Output | jca/AsymmetricEncryptionMacHybridCryptosystem.java:111:16:111:34 | SharedSecret |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:111:16:111:34 | KeyAgreementOperation | PeerKey | jca/AsymmetricEncryptionMacHybridCryptosystem.java:110:20:110:28 | Key |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:111:16:111:34 | KeyAgreementOperation | ServerKey | jca/AsymmetricEncryptionMacHybridCryptosystem.java:109:17:109:26 | Key |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:111:16:111:34 | SharedSecret | Source | jca/AsymmetricEncryptionMacHybridCryptosystem.java:111:16:111:34 | SharedSecret |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:124:23:124:42 | Digest | Source | jca/AsymmetricEncryptionMacHybridCryptosystem.java:124:23:124:42 | Digest |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:124:23:124:42 | HashOperation | Algorithm | jca/AsymmetricEncryptionMacHybridCryptosystem.java:123:58:123:66 | HashAlgorithm |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:124:23:124:42 | HashOperation | Digest | jca/AsymmetricEncryptionMacHybridCryptosystem.java:124:23:124:42 | Digest |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:124:23:124:42 | HashOperation | Message | jca/AsymmetricEncryptionMacHybridCryptosystem.java:124:37:124:41 | Message |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:124:37:124:41 | Message | Source | jca/AsymmetricEncryptionMacHybridCryptosystem.java:111:16:111:34 | SharedSecret |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:147:16:147:36 | Key | Algorithm | jca/AsymmetricEncryptionMacHybridCryptosystem.java:145:61:145:65 | KeyOperationAlgorithm |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:147:16:147:36 | KeyGeneration | Algorithm | jca/AsymmetricEncryptionMacHybridCryptosystem.java:145:61:145:65 | KeyOperationAlgorithm |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:147:16:147:36 | KeyGeneration | Output | jca/AsymmetricEncryptionMacHybridCryptosystem.java:147:16:147:36 | Key |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:156:16:156:36 | Key | Algorithm | jca/AsymmetricEncryptionMacHybridCryptosystem.java:154:61:154:65 | KeyOperationAlgorithm |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:156:16:156:36 | KeyGeneration | Algorithm | jca/AsymmetricEncryptionMacHybridCryptosystem.java:154:61:154:65 | KeyOperationAlgorithm |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:156:16:156:36 | KeyGeneration | Output | jca/AsymmetricEncryptionMacHybridCryptosystem.java:156:16:156:36 | Key |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:166:47:166:85 | KeyOperationAlgorithm | Mode | jca/AsymmetricEncryptionMacHybridCryptosystem.java:166:47:166:85 | ModeOfOperation |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:166:47:166:85 | KeyOperationAlgorithm | Padding | jca/AsymmetricEncryptionMacHybridCryptosystem.java:166:47:166:85 | PaddingAlgorithm |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:166:47:166:85 | PaddingAlgorithm | MD | jca/AsymmetricEncryptionMacHybridCryptosystem.java:166:47:166:85 | HashAlgorithm |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:166:47:166:85 | PaddingAlgorithm | MGF1Hash | jca/AsymmetricEncryptionMacHybridCryptosystem.java:166:47:166:85 | PaddingAlgorithm |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:167:42:167:58 | Key | Source | jca/AsymmetricEncryptionMacHybridCryptosystem.java:147:16:147:36 | Key |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:168:34:168:55 | WrapOperation | Algorithm | jca/AsymmetricEncryptionMacHybridCryptosystem.java:166:47:166:85 | KeyOperationAlgorithm |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:168:34:168:55 | WrapOperation | Input | jca/AsymmetricEncryptionMacHybridCryptosystem.java:168:49:168:54 | Message |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:168:34:168:55 | WrapOperation | Key | jca/AsymmetricEncryptionMacHybridCryptosystem.java:167:42:167:58 | Key |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:168:34:168:55 | WrapOperation | Nonce | jca/AsymmetricEncryptionMacHybridCryptosystem.java:168:34:168:55 | WrapOperation |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:168:34:168:55 | WrapOperation | Output | jca/AsymmetricEncryptionMacHybridCryptosystem.java:168:34:168:55 | KeyOperationOutput |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:168:49:168:54 | Message | Source | jca/AsymmetricEncryptionMacHybridCryptosystem.java:322:16:322:31 | Key |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:172:47:172:65 | KeyOperationAlgorithm | Mode | jca/AsymmetricEncryptionMacHybridCryptosystem.java:172:47:172:65 | ModeOfOperation |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:172:47:172:65 | KeyOperationAlgorithm | Padding | jca/AsymmetricEncryptionMacHybridCryptosystem.java:172:47:172:65 | PaddingAlgorithm |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:173:45:173:50 | Key | Source | jca/AsymmetricEncryptionMacHybridCryptosystem.java:173:45:173:50 | Key |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:173:53:173:81 | Nonce | Source | jca/AsymmetricEncryptionMacHybridCryptosystem.java:171:38:171:39 | RandomNumberGeneration |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:174:29:174:56 | EncryptOperation | Algorithm | jca/AsymmetricEncryptionMacHybridCryptosystem.java:172:47:172:65 | KeyOperationAlgorithm |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:174:29:174:56 | EncryptOperation | Input | jca/AsymmetricEncryptionMacHybridCryptosystem.java:174:47:174:55 | Message |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:174:29:174:56 | EncryptOperation | Key | jca/AsymmetricEncryptionMacHybridCryptosystem.java:173:45:173:50 | Key |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:174:29:174:56 | EncryptOperation | Nonce | jca/AsymmetricEncryptionMacHybridCryptosystem.java:173:53:173:81 | Nonce |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:174:29:174:56 | EncryptOperation | Output | jca/AsymmetricEncryptionMacHybridCryptosystem.java:174:29:174:56 | KeyOperationOutput |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:174:47:174:55 | Message | Source | jca/AsymmetricEncryptionMacHybridCryptosystem.java:271:58:271:73 | Parameter |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:190:47:190:68 | KeyOperationAlgorithm | Mode | jca/AsymmetricEncryptionMacHybridCryptosystem.java:190:47:190:68 | ModeOfOperation |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:190:47:190:68 | KeyOperationAlgorithm | Padding | jca/AsymmetricEncryptionMacHybridCryptosystem.java:190:47:190:68 | PaddingAlgorithm |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:191:42:191:58 | Key | Source | jca/AsymmetricEncryptionMacHybridCryptosystem.java:156:16:156:36 | Key |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:192:34:192:55 | WrapOperation | Algorithm | jca/AsymmetricEncryptionMacHybridCryptosystem.java:190:47:190:68 | KeyOperationAlgorithm |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:192:34:192:55 | WrapOperation | Input | jca/AsymmetricEncryptionMacHybridCryptosystem.java:192:49:192:54 | Message |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:192:34:192:55 | WrapOperation | Key | jca/AsymmetricEncryptionMacHybridCryptosystem.java:191:42:191:58 | Key |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:192:34:192:55 | WrapOperation | Nonce | jca/AsymmetricEncryptionMacHybridCryptosystem.java:192:34:192:55 | WrapOperation |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:192:34:192:55 | WrapOperation | Output | jca/AsymmetricEncryptionMacHybridCryptosystem.java:192:34:192:55 | KeyOperationOutput |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:192:49:192:54 | Message | Source | jca/AsymmetricEncryptionMacHybridCryptosystem.java:322:16:322:31 | Key |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:195:47:195:65 | KeyOperationAlgorithm | Mode | jca/AsymmetricEncryptionMacHybridCryptosystem.java:195:47:195:65 | ModeOfOperation |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:195:47:195:65 | KeyOperationAlgorithm | Padding | jca/AsymmetricEncryptionMacHybridCryptosystem.java:195:47:195:65 | PaddingAlgorithm |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:196:45:196:50 | Key | Source | jca/AsymmetricEncryptionMacHybridCryptosystem.java:196:45:196:50 | Key |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:196:53:196:86 | Nonce | Source | jca/AsymmetricEncryptionMacHybridCryptosystem.java:196:53:196:86 | Nonce |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:197:29:197:56 | EncryptOperation | Algorithm | jca/AsymmetricEncryptionMacHybridCryptosystem.java:195:47:195:65 | KeyOperationAlgorithm |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:197:29:197:56 | EncryptOperation | Input | jca/AsymmetricEncryptionMacHybridCryptosystem.java:197:47:197:55 | Message |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:197:29:197:56 | EncryptOperation | Key | jca/AsymmetricEncryptionMacHybridCryptosystem.java:196:45:196:50 | Key |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:197:29:197:56 | EncryptOperation | Nonce | jca/AsymmetricEncryptionMacHybridCryptosystem.java:196:53:196:86 | Nonce |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:197:29:197:56 | EncryptOperation | Output | jca/AsymmetricEncryptionMacHybridCryptosystem.java:197:29:197:56 | KeyOperationOutput |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:197:47:197:55 | Message | Source | jca/AsymmetricEncryptionMacHybridCryptosystem.java:271:58:271:73 | Parameter |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:221:44:221:62 | KeyOperationAlgorithm | Mode | jca/AsymmetricEncryptionMacHybridCryptosystem.java:221:44:221:62 | ModeOfOperation |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:221:44:221:62 | KeyOperationAlgorithm | Padding | jca/AsymmetricEncryptionMacHybridCryptosystem.java:221:44:221:62 | PaddingAlgorithm |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:222:42:222:47 | Key | Source | jca/AsymmetricEncryptionMacHybridCryptosystem.java:222:42:222:47 | Key |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:222:50:222:78 | Nonce | Source | jca/AsymmetricEncryptionMacHybridCryptosystem.java:220:38:220:39 | RandomNumberGeneration |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:223:29:223:53 | EncryptOperation | Algorithm | jca/AsymmetricEncryptionMacHybridCryptosystem.java:221:44:221:62 | KeyOperationAlgorithm |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:223:29:223:53 | EncryptOperation | Input | jca/AsymmetricEncryptionMacHybridCryptosystem.java:223:44:223:52 | Message |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:223:29:223:53 | EncryptOperation | Key | jca/AsymmetricEncryptionMacHybridCryptosystem.java:222:42:222:47 | Key |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:223:29:223:53 | EncryptOperation | Nonce | jca/AsymmetricEncryptionMacHybridCryptosystem.java:222:50:222:78 | Nonce |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:223:29:223:53 | EncryptOperation | Output | jca/AsymmetricEncryptionMacHybridCryptosystem.java:223:29:223:53 | KeyOperationOutput |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:223:44:223:52 | Message | Source | jca/AsymmetricEncryptionMacHybridCryptosystem.java:271:58:271:73 | Parameter |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:244:44:244:62 | KeyOperationAlgorithm | Mode | jca/AsymmetricEncryptionMacHybridCryptosystem.java:244:44:244:62 | ModeOfOperation |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:244:44:244:62 | KeyOperationAlgorithm | Padding | jca/AsymmetricEncryptionMacHybridCryptosystem.java:244:44:244:62 | PaddingAlgorithm |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:245:42:245:47 | Key | Source | jca/AsymmetricEncryptionMacHybridCryptosystem.java:245:42:245:47 | Key |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:245:50:245:83 | Nonce | Source | jca/AsymmetricEncryptionMacHybridCryptosystem.java:245:50:245:83 | Nonce |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:246:29:246:53 | EncryptOperation | Algorithm | jca/AsymmetricEncryptionMacHybridCryptosystem.java:244:44:244:62 | KeyOperationAlgorithm |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:246:29:246:53 | EncryptOperation | Input | jca/AsymmetricEncryptionMacHybridCryptosystem.java:246:44:246:52 | Message |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:246:29:246:53 | EncryptOperation | Key | jca/AsymmetricEncryptionMacHybridCryptosystem.java:245:42:245:47 | Key |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:246:29:246:53 | EncryptOperation | Nonce | jca/AsymmetricEncryptionMacHybridCryptosystem.java:245:50:245:83 | Nonce |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:246:29:246:53 | EncryptOperation | Output | jca/AsymmetricEncryptionMacHybridCryptosystem.java:246:29:246:53 | KeyOperationOutput |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:246:44:246:52 | Message | Source | jca/AsymmetricEncryptionMacHybridCryptosystem.java:271:58:271:73 | Parameter |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:295:35:295:46 | HMACAlgorithm | H | jca/AsymmetricEncryptionMacHybridCryptosystem.java:295:35:295:46 | HashAlgorithm |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:297:18:297:26 | Key | Source | jca/AsymmetricEncryptionMacHybridCryptosystem.java:322:16:322:31 | Key |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:298:16:298:46 | MACOperation | Algorithm | jca/AsymmetricEncryptionMacHybridCryptosystem.java:295:35:295:46 | HMACAlgorithm |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:298:16:298:46 | MACOperation | HashAlgorithm | jca/AsymmetricEncryptionMacHybridCryptosystem.java:295:35:295:46 | HashAlgorithm |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:298:16:298:46 | MACOperation | Input | jca/AsymmetricEncryptionMacHybridCryptosystem.java:298:28:298:45 | Message |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:298:16:298:46 | MACOperation | Key | jca/AsymmetricEncryptionMacHybridCryptosystem.java:297:18:297:26 | Key |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:298:16:298:46 | MACOperation | Message | jca/AsymmetricEncryptionMacHybridCryptosystem.java:298:28:298:45 | Message |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:298:16:298:46 | MACOperation | Nonce | jca/AsymmetricEncryptionMacHybridCryptosystem.java:298:16:298:46 | MACOperation |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:298:16:298:46 | MACOperation | Output | jca/AsymmetricEncryptionMacHybridCryptosystem.java:298:16:298:46 | KeyOperationOutput |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:298:28:298:45 | Message | Source | jca/AsymmetricEncryptionMacHybridCryptosystem.java:171:38:171:39 | RandomNumberGeneration |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:298:28:298:45 | Message | Source | jca/AsymmetricEncryptionMacHybridCryptosystem.java:174:29:174:56 | KeyOperationOutput |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:298:28:298:45 | Message | Source | jca/AsymmetricEncryptionMacHybridCryptosystem.java:220:38:220:39 | RandomNumberGeneration |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:298:28:298:45 | Message | Source | jca/AsymmetricEncryptionMacHybridCryptosystem.java:223:29:223:53 | KeyOperationOutput |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:306:35:306:44 | HMACAlgorithm | H | jca/AsymmetricEncryptionMacHybridCryptosystem.java:306:35:306:44 | HashAlgorithm |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:308:18:308:26 | Key | Source | jca/AsymmetricEncryptionMacHybridCryptosystem.java:322:16:322:31 | Key |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:309:16:309:46 | MACOperation | Algorithm | jca/AsymmetricEncryptionMacHybridCryptosystem.java:306:35:306:44 | HMACAlgorithm |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:309:16:309:46 | MACOperation | HashAlgorithm | jca/AsymmetricEncryptionMacHybridCryptosystem.java:306:35:306:44 | HashAlgorithm |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:309:16:309:46 | MACOperation | Input | jca/AsymmetricEncryptionMacHybridCryptosystem.java:309:28:309:45 | Message |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:309:16:309:46 | MACOperation | Key | jca/AsymmetricEncryptionMacHybridCryptosystem.java:308:18:308:26 | Key |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:309:16:309:46 | MACOperation | Message | jca/AsymmetricEncryptionMacHybridCryptosystem.java:309:28:309:45 | Message |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:309:16:309:46 | MACOperation | Nonce | jca/AsymmetricEncryptionMacHybridCryptosystem.java:309:16:309:46 | MACOperation |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:309:16:309:46 | MACOperation | Output | jca/AsymmetricEncryptionMacHybridCryptosystem.java:309:16:309:46 | KeyOperationOutput |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:309:28:309:45 | Message | Source | jca/AsymmetricEncryptionMacHybridCryptosystem.java:197:29:197:56 | KeyOperationOutput |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:309:28:309:45 | Message | Source | jca/AsymmetricEncryptionMacHybridCryptosystem.java:246:29:246:53 | KeyOperationOutput |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:322:16:322:31 | KeyGeneration | Algorithm | jca/AsymmetricEncryptionMacHybridCryptosystem.java:320:52:320:56 | KeyOperationAlgorithm |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:322:16:322:31 | KeyGeneration | Output | jca/AsymmetricEncryptionMacHybridCryptosystem.java:322:16:322:31 | Key |
+| jca/ChainedEncryptionTest.java:19:44:19:62 | KeyOperationAlgorithm | Mode | jca/ChainedEncryptionTest.java:19:44:19:62 | ModeOfOperation |
+| jca/ChainedEncryptionTest.java:19:44:19:62 | KeyOperationAlgorithm | Padding | jca/ChainedEncryptionTest.java:19:44:19:62 | PaddingAlgorithm |
+| jca/ChainedEncryptionTest.java:23:42:23:44 | Key | Source | jca/ChainedEncryptionTest.java:119:28:119:47 | Key |
+| jca/ChainedEncryptionTest.java:23:47:23:50 | Nonce | Source | jca/ChainedEncryptionTest.java:21:38:21:39 | RandomNumberGeneration |
+| jca/ChainedEncryptionTest.java:24:29:24:53 | EncryptOperation | Algorithm | jca/ChainedEncryptionTest.java:19:44:19:62 | KeyOperationAlgorithm |
+| jca/ChainedEncryptionTest.java:24:29:24:53 | EncryptOperation | Input | jca/ChainedEncryptionTest.java:24:44:24:52 | Message |
+| jca/ChainedEncryptionTest.java:24:29:24:53 | EncryptOperation | Key | jca/ChainedEncryptionTest.java:23:42:23:44 | Key |
+| jca/ChainedEncryptionTest.java:24:29:24:53 | EncryptOperation | Nonce | jca/ChainedEncryptionTest.java:23:47:23:50 | Nonce |
+| jca/ChainedEncryptionTest.java:24:29:24:53 | EncryptOperation | Output | jca/ChainedEncryptionTest.java:24:29:24:53 | KeyOperationOutput |
+| jca/ChainedEncryptionTest.java:24:44:24:52 | Message | Source | jca/ChainedEncryptionTest.java:126:31:126:57 | Constant |
+| jca/ChainedEncryptionTest.java:32:44:32:62 | KeyOperationAlgorithm | Mode | jca/ChainedEncryptionTest.java:32:44:32:62 | ModeOfOperation |
+| jca/ChainedEncryptionTest.java:32:44:32:62 | KeyOperationAlgorithm | Padding | jca/ChainedEncryptionTest.java:32:44:32:62 | PaddingAlgorithm |
+| jca/ChainedEncryptionTest.java:34:42:34:44 | Key | Source | jca/ChainedEncryptionTest.java:119:28:119:47 | Key |
+| jca/ChainedEncryptionTest.java:34:47:34:50 | Nonce | Source | jca/ChainedEncryptionTest.java:54:16:54:41 | KeyOperationOutput |
+| jca/ChainedEncryptionTest.java:35:16:35:41 | DecryptOperation | Algorithm | jca/ChainedEncryptionTest.java:32:44:32:62 | KeyOperationAlgorithm |
+| jca/ChainedEncryptionTest.java:35:16:35:41 | DecryptOperation | Input | jca/ChainedEncryptionTest.java:35:31:35:40 | Message |
+| jca/ChainedEncryptionTest.java:35:16:35:41 | DecryptOperation | Key | jca/ChainedEncryptionTest.java:34:42:34:44 | Key |
+| jca/ChainedEncryptionTest.java:35:16:35:41 | DecryptOperation | Nonce | jca/ChainedEncryptionTest.java:34:47:34:50 | Nonce |
+| jca/ChainedEncryptionTest.java:35:16:35:41 | DecryptOperation | Output | jca/ChainedEncryptionTest.java:35:16:35:41 | KeyOperationOutput |
+| jca/ChainedEncryptionTest.java:35:31:35:40 | Message | Source | jca/ChainedEncryptionTest.java:54:16:54:41 | KeyOperationOutput |
+| jca/ChainedEncryptionTest.java:40:44:40:62 | KeyOperationAlgorithm | Mode | jca/ChainedEncryptionTest.java:40:44:40:62 | KeyOperationAlgorithm |
+| jca/ChainedEncryptionTest.java:40:44:40:62 | KeyOperationAlgorithm | Padding | jca/ChainedEncryptionTest.java:40:44:40:62 | KeyOperationAlgorithm |
+| jca/ChainedEncryptionTest.java:43:42:43:44 | Key | Source | jca/ChainedEncryptionTest.java:124:31:124:53 | Key |
+| jca/ChainedEncryptionTest.java:43:47:43:72 | Nonce | Source | jca/ChainedEncryptionTest.java:42:38:42:42 | RandomNumberGeneration |
+| jca/ChainedEncryptionTest.java:44:29:44:53 | EncryptOperation | Algorithm | jca/ChainedEncryptionTest.java:40:44:40:62 | KeyOperationAlgorithm |
+| jca/ChainedEncryptionTest.java:44:29:44:53 | EncryptOperation | Input | jca/ChainedEncryptionTest.java:44:44:44:52 | Message |
+| jca/ChainedEncryptionTest.java:44:29:44:53 | EncryptOperation | Key | jca/ChainedEncryptionTest.java:43:42:43:44 | Key |
+| jca/ChainedEncryptionTest.java:44:29:44:53 | EncryptOperation | Nonce | jca/ChainedEncryptionTest.java:43:47:43:72 | Nonce |
+| jca/ChainedEncryptionTest.java:44:29:44:53 | EncryptOperation | Output | jca/ChainedEncryptionTest.java:44:29:44:53 | KeyOperationOutput |
+| jca/ChainedEncryptionTest.java:44:44:44:52 | Message | Source | jca/ChainedEncryptionTest.java:21:38:21:39 | RandomNumberGeneration |
+| jca/ChainedEncryptionTest.java:44:44:44:52 | Message | Source | jca/ChainedEncryptionTest.java:24:29:24:53 | KeyOperationOutput |
+| jca/ChainedEncryptionTest.java:52:44:52:62 | KeyOperationAlgorithm | Mode | jca/ChainedEncryptionTest.java:52:44:52:62 | KeyOperationAlgorithm |
+| jca/ChainedEncryptionTest.java:52:44:52:62 | KeyOperationAlgorithm | Padding | jca/ChainedEncryptionTest.java:52:44:52:62 | KeyOperationAlgorithm |
+| jca/ChainedEncryptionTest.java:53:42:53:44 | Key | Source | jca/ChainedEncryptionTest.java:124:31:124:53 | Key |
+| jca/ChainedEncryptionTest.java:53:47:53:72 | Nonce | Source | jca/ChainedEncryptionTest.java:42:38:42:42 | RandomNumberGeneration |
+| jca/ChainedEncryptionTest.java:53:47:53:72 | Nonce | Source | jca/ChainedEncryptionTest.java:44:29:44:53 | KeyOperationOutput |
+| jca/ChainedEncryptionTest.java:54:16:54:41 | DecryptOperation | Algorithm | jca/ChainedEncryptionTest.java:52:44:52:62 | KeyOperationAlgorithm |
+| jca/ChainedEncryptionTest.java:54:16:54:41 | DecryptOperation | Input | jca/ChainedEncryptionTest.java:54:31:54:40 | Message |
+| jca/ChainedEncryptionTest.java:54:16:54:41 | DecryptOperation | Key | jca/ChainedEncryptionTest.java:53:42:53:44 | Key |
+| jca/ChainedEncryptionTest.java:54:16:54:41 | DecryptOperation | Nonce | jca/ChainedEncryptionTest.java:53:47:53:72 | Nonce |
+| jca/ChainedEncryptionTest.java:54:16:54:41 | DecryptOperation | Output | jca/ChainedEncryptionTest.java:54:16:54:41 | KeyOperationOutput |
+| jca/ChainedEncryptionTest.java:54:31:54:40 | Message | Source | jca/ChainedEncryptionTest.java:42:38:42:42 | RandomNumberGeneration |
+| jca/ChainedEncryptionTest.java:54:31:54:40 | Message | Source | jca/ChainedEncryptionTest.java:44:29:44:53 | KeyOperationOutput |
+| jca/ChainedEncryptionTest.java:81:30:81:49 | KeyGeneration | Algorithm | jca/ChainedEncryptionTest.java:79:56:79:60 | KeyOperationAlgorithm |
+| jca/ChainedEncryptionTest.java:81:30:81:49 | KeyGeneration | Output | jca/ChainedEncryptionTest.java:81:30:81:49 | Key |
+| jca/ChainedEncryptionTest.java:85:30:85:52 | KeyGeneration | Algorithm | jca/ChainedEncryptionTest.java:83:59:83:68 | KeyOperationAlgorithm |
+| jca/ChainedEncryptionTest.java:85:30:85:52 | KeyGeneration | Output | jca/ChainedEncryptionTest.java:85:30:85:52 | Key |
+| jca/ChainedEncryptionTest.java:90:47:90:65 | KeyOperationAlgorithm | Mode | jca/ChainedEncryptionTest.java:90:47:90:65 | ModeOfOperation |
+| jca/ChainedEncryptionTest.java:90:47:90:65 | KeyOperationAlgorithm | Padding | jca/ChainedEncryptionTest.java:90:47:90:65 | PaddingAlgorithm |
+| jca/ChainedEncryptionTest.java:92:45:92:52 | Key | Source | jca/ChainedEncryptionTest.java:81:30:81:49 | Key |
+| jca/ChainedEncryptionTest.java:92:55:92:61 | Nonce | Source | jca/ChainedEncryptionTest.java:89:38:89:42 | RandomNumberGeneration |
+| jca/ChainedEncryptionTest.java:93:34:93:62 | EncryptOperation | Algorithm | jca/ChainedEncryptionTest.java:90:47:90:65 | KeyOperationAlgorithm |
+| jca/ChainedEncryptionTest.java:93:34:93:62 | EncryptOperation | Input | jca/ChainedEncryptionTest.java:93:52:93:61 | Message |
+| jca/ChainedEncryptionTest.java:93:34:93:62 | EncryptOperation | Key | jca/ChainedEncryptionTest.java:92:45:92:52 | Key |
+| jca/ChainedEncryptionTest.java:93:34:93:62 | EncryptOperation | Nonce | jca/ChainedEncryptionTest.java:92:55:92:61 | Nonce |
+| jca/ChainedEncryptionTest.java:93:34:93:62 | EncryptOperation | Output | jca/ChainedEncryptionTest.java:93:34:93:62 | KeyOperationOutput |
+| jca/ChainedEncryptionTest.java:93:52:93:61 | Message | Source | jca/ChainedEncryptionTest.java:75:46:75:61 | Parameter |
+| jca/ChainedEncryptionTest.java:98:50:98:68 | KeyOperationAlgorithm | Mode | jca/ChainedEncryptionTest.java:98:50:98:68 | KeyOperationAlgorithm |
+| jca/ChainedEncryptionTest.java:98:50:98:68 | KeyOperationAlgorithm | Padding | jca/ChainedEncryptionTest.java:98:50:98:68 | KeyOperationAlgorithm |
+| jca/ChainedEncryptionTest.java:99:48:99:55 | Key | Source | jca/ChainedEncryptionTest.java:85:30:85:52 | Key |
+| jca/ChainedEncryptionTest.java:99:58:99:89 | Nonce | Source | jca/ChainedEncryptionTest.java:97:38:97:48 | RandomNumberGeneration |
+| jca/ChainedEncryptionTest.java:100:34:100:70 | EncryptOperation | Algorithm | jca/ChainedEncryptionTest.java:98:50:98:68 | KeyOperationAlgorithm |
+| jca/ChainedEncryptionTest.java:100:34:100:70 | EncryptOperation | Input | jca/ChainedEncryptionTest.java:100:55:100:69 | Message |
+| jca/ChainedEncryptionTest.java:100:34:100:70 | EncryptOperation | Key | jca/ChainedEncryptionTest.java:99:48:99:55 | Key |
+| jca/ChainedEncryptionTest.java:100:34:100:70 | EncryptOperation | Nonce | jca/ChainedEncryptionTest.java:99:58:99:89 | Nonce |
+| jca/ChainedEncryptionTest.java:100:34:100:70 | EncryptOperation | Output | jca/ChainedEncryptionTest.java:100:34:100:70 | KeyOperationOutput |
+| jca/ChainedEncryptionTest.java:100:55:100:69 | Message | Source | jca/ChainedEncryptionTest.java:93:34:93:62 | KeyOperationOutput |
+| jca/ChainedEncryptionTest.java:103:47:103:65 | KeyOperationAlgorithm | Mode | jca/ChainedEncryptionTest.java:103:47:103:65 | KeyOperationAlgorithm |
+| jca/ChainedEncryptionTest.java:103:47:103:65 | KeyOperationAlgorithm | Padding | jca/ChainedEncryptionTest.java:103:47:103:65 | KeyOperationAlgorithm |
+| jca/ChainedEncryptionTest.java:104:45:104:52 | Key | Source | jca/ChainedEncryptionTest.java:104:45:104:52 | Key |
+| jca/ChainedEncryptionTest.java:104:55:104:86 | Nonce | Source | jca/ChainedEncryptionTest.java:97:38:97:48 | RandomNumberGeneration |
+| jca/ChainedEncryptionTest.java:105:43:105:76 | DecryptOperation | Algorithm | jca/ChainedEncryptionTest.java:103:47:103:65 | KeyOperationAlgorithm |
+| jca/ChainedEncryptionTest.java:105:43:105:76 | DecryptOperation | Input | jca/ChainedEncryptionTest.java:105:61:105:75 | Message |
+| jca/ChainedEncryptionTest.java:105:43:105:76 | DecryptOperation | Key | jca/ChainedEncryptionTest.java:104:45:104:52 | Key |
+| jca/ChainedEncryptionTest.java:105:43:105:76 | DecryptOperation | Nonce | jca/ChainedEncryptionTest.java:104:55:104:86 | Nonce |
+| jca/ChainedEncryptionTest.java:105:43:105:76 | DecryptOperation | Output | jca/ChainedEncryptionTest.java:105:43:105:76 | KeyOperationOutput |
+| jca/ChainedEncryptionTest.java:105:61:105:75 | Message | Source | jca/ChainedEncryptionTest.java:100:34:100:70 | KeyOperationOutput |
+| jca/ChainedEncryptionTest.java:108:44:108:62 | KeyOperationAlgorithm | Mode | jca/ChainedEncryptionTest.java:108:44:108:62 | ModeOfOperation |
+| jca/ChainedEncryptionTest.java:108:44:108:62 | KeyOperationAlgorithm | Padding | jca/ChainedEncryptionTest.java:108:44:108:62 | PaddingAlgorithm |
+| jca/ChainedEncryptionTest.java:109:42:109:49 | Key | Source | jca/ChainedEncryptionTest.java:109:42:109:49 | Key |
+| jca/ChainedEncryptionTest.java:109:52:109:83 | Nonce | Source | jca/ChainedEncryptionTest.java:89:38:89:42 | RandomNumberGeneration |
+| jca/ChainedEncryptionTest.java:110:37:110:76 | DecryptOperation | Algorithm | jca/ChainedEncryptionTest.java:108:44:108:62 | KeyOperationAlgorithm |
+| jca/ChainedEncryptionTest.java:110:37:110:76 | DecryptOperation | Input | jca/ChainedEncryptionTest.java:110:52:110:75 | Message |
+| jca/ChainedEncryptionTest.java:110:37:110:76 | DecryptOperation | Key | jca/ChainedEncryptionTest.java:109:42:109:49 | Key |
+| jca/ChainedEncryptionTest.java:110:37:110:76 | DecryptOperation | Nonce | jca/ChainedEncryptionTest.java:109:52:109:83 | Nonce |
+| jca/ChainedEncryptionTest.java:110:37:110:76 | DecryptOperation | Output | jca/ChainedEncryptionTest.java:110:37:110:76 | KeyOperationOutput |
+| jca/ChainedEncryptionTest.java:110:52:110:75 | Message | Source | jca/ChainedEncryptionTest.java:105:43:105:76 | KeyOperationOutput |
+| jca/ChainedEncryptionTest.java:119:28:119:47 | KeyGeneration | Algorithm | jca/ChainedEncryptionTest.java:117:56:117:60 | KeyOperationAlgorithm |
+| jca/ChainedEncryptionTest.java:119:28:119:47 | KeyGeneration | Output | jca/ChainedEncryptionTest.java:119:28:119:47 | Key |
+| jca/ChainedEncryptionTest.java:124:31:124:53 | KeyGeneration | Algorithm | jca/ChainedEncryptionTest.java:122:59:122:68 | KeyOperationAlgorithm |
+| jca/ChainedEncryptionTest.java:124:31:124:53 | KeyGeneration | Output | jca/ChainedEncryptionTest.java:124:31:124:53 | Key |
+| jca/Digest.java:55:23:55:66 | Digest | Source | jca/Digest.java:55:23:55:66 | Digest |
+| jca/Digest.java:55:23:55:66 | HashOperation | Algorithm | jca/Digest.java:54:58:54:66 | HashAlgorithm |
+| jca/Digest.java:55:23:55:66 | HashOperation | Digest | jca/Digest.java:55:23:55:66 | Digest |
+| jca/Digest.java:55:23:55:66 | HashOperation | Message | jca/Digest.java:55:37:55:65 | Message |
+| jca/Digest.java:55:37:55:65 | Message | Source | jca/Digest.java:55:37:55:54 | Constant |
+| jca/Digest.java:65:23:65:70 | Digest | Source | jca/Digest.java:65:23:65:70 | Digest |
+| jca/Digest.java:65:23:65:70 | HashOperation | Algorithm | jca/Digest.java:64:61:64:65 | HashAlgorithm |
+| jca/Digest.java:65:23:65:70 | HashOperation | Digest | jca/Digest.java:65:23:65:70 | Digest |
+| jca/Digest.java:65:23:65:70 | HashOperation | Message | jca/Digest.java:65:40:65:69 | Message |
+| jca/Digest.java:65:40:65:69 | Message | Source | jca/Digest.java:65:40:65:58 | Constant |
+| jca/Digest.java:75:23:75:62 | Digest | Source | jca/Digest.java:75:23:75:62 | Digest |
+| jca/Digest.java:75:23:75:62 | HashOperation | Algorithm | jca/Digest.java:74:64:74:72 | HashAlgorithm |
+| jca/Digest.java:75:23:75:62 | HashOperation | Digest | jca/Digest.java:75:23:75:62 | Digest |
+| jca/Digest.java:75:23:75:62 | HashOperation | Message | jca/Digest.java:75:43:75:61 | Message |
+| jca/Digest.java:75:43:75:61 | Message | Source | jca/Digest.java:73:49:73:63 | Parameter |
+| jca/Digest.java:86:23:86:26 | Message | Source | jca/Digest.java:253:38:253:41 | RandomNumberGeneration |
+| jca/Digest.java:87:23:87:56 | Digest | Source | jca/Digest.java:87:23:87:56 | Digest |
+| jca/Digest.java:87:23:87:56 | HashOperation | Algorithm | jca/Digest.java:85:58:85:66 | HashAlgorithm |
+| jca/Digest.java:87:23:87:56 | HashOperation | Digest | jca/Digest.java:87:23:87:56 | Digest |
+| jca/Digest.java:87:23:87:56 | HashOperation | Message | jca/Digest.java:86:23:86:26 | Message |
+| jca/Digest.java:87:23:87:56 | HashOperation | Message | jca/Digest.java:87:37:87:55 | Message |
+| jca/Digest.java:87:37:87:55 | Message | Source | jca/Digest.java:83:37:83:51 | Parameter |
+| jca/Digest.java:97:42:97:63 | Message | Source | jca/Digest.java:95:37:95:51 | Parameter |
+| jca/Digest.java:97:66:97:69 | Salt | Source | jca/Digest.java:253:38:253:41 | RandomNumberGeneration |
+| jca/Digest.java:98:65:98:86 | HMACAlgorithm | H | jca/Digest.java:98:65:98:86 | HashAlgorithm |
+| jca/Digest.java:98:65:98:86 | KeyDerivationAlgorithm | PRF | jca/Digest.java:98:65:98:86 | HMACAlgorithm |
+| jca/Digest.java:99:23:99:50 | KeyDerivation | Algorithm | jca/Digest.java:98:65:98:86 | KeyDerivationAlgorithm |
+| jca/Digest.java:99:23:99:50 | KeyDerivation | Input | jca/Digest.java:97:42:97:63 | Message |
+| jca/Digest.java:99:23:99:50 | KeyDerivation | Output | jca/Digest.java:99:23:99:50 | Key |
+| jca/Digest.java:99:23:99:50 | KeyDerivation | Salt | jca/Digest.java:97:66:97:69 | Salt |
+| jca/Digest.java:109:23:109:57 | Digest | Source | jca/Digest.java:109:23:109:57 | Digest |
+| jca/Digest.java:109:23:109:57 | HashOperation | Algorithm | jca/Digest.java:108:62:108:68 | HashAlgorithm |
+| jca/Digest.java:109:23:109:57 | HashOperation | Digest | jca/Digest.java:109:23:109:57 | Digest |
+| jca/Digest.java:109:23:109:57 | HashOperation | Message | jca/Digest.java:109:41:109:56 | Message |
+| jca/Digest.java:109:41:109:56 | Message | Source | jca/Digest.java:107:40:107:51 | Parameter |
+| jca/Digest.java:118:36:118:47 | HMACAlgorithm | H | jca/Digest.java:118:36:118:47 | HashAlgorithm |
+| jca/Digest.java:120:19:120:27 | Key | Source | jca/Digest.java:117:49:117:58 | Parameter |
+| jca/Digest.java:121:23:121:52 | MACOperation | Algorithm | jca/Digest.java:118:36:118:47 | HMACAlgorithm |
+| jca/Digest.java:121:23:121:52 | MACOperation | HashAlgorithm | jca/Digest.java:118:36:118:47 | HashAlgorithm |
+| jca/Digest.java:121:23:121:52 | MACOperation | Input | jca/Digest.java:121:36:121:51 | Message |
+| jca/Digest.java:121:23:121:52 | MACOperation | Key | jca/Digest.java:120:19:120:27 | Key |
+| jca/Digest.java:121:23:121:52 | MACOperation | Message | jca/Digest.java:121:36:121:51 | Message |
+| jca/Digest.java:121:23:121:52 | MACOperation | Nonce | jca/Digest.java:121:23:121:52 | MACOperation |
+| jca/Digest.java:121:23:121:52 | MACOperation | Output | jca/Digest.java:121:23:121:52 | KeyOperationOutput |
+| jca/Digest.java:121:36:121:51 | Message | Source | jca/Digest.java:117:35:117:46 | Parameter |
+| jca/Digest.java:140:44:140:62 | KeyOperationAlgorithm | Mode | jca/Digest.java:140:44:140:62 | ModeOfOperation |
+| jca/Digest.java:140:44:140:62 | KeyOperationAlgorithm | Padding | jca/Digest.java:140:44:140:62 | PaddingAlgorithm |
+| jca/Digest.java:141:42:141:44 | Key | Source | jca/Digest.java:55:23:55:66 | Digest |
+| jca/Digest.java:141:42:141:44 | Key | Source | jca/Digest.java:65:23:65:70 | Digest |
+| jca/Digest.java:141:42:141:44 | Key | Source | jca/Digest.java:75:23:75:62 | Digest |
+| jca/Digest.java:141:42:141:44 | Key | Source | jca/Digest.java:87:23:87:56 | Digest |
+| jca/Digest.java:141:42:141:44 | Key | Source | jca/Digest.java:99:23:99:50 | Key |
+| jca/Digest.java:141:42:141:44 | Key | Source | jca/Digest.java:109:23:109:57 | Digest |
+| jca/Digest.java:141:42:141:44 | Key | Source | jca/Digest.java:121:23:121:52 | KeyOperationOutput |
+| jca/Digest.java:142:32:142:74 | EncryptOperation | Algorithm | jca/Digest.java:140:44:140:62 | KeyOperationAlgorithm |
+| jca/Digest.java:142:32:142:74 | EncryptOperation | Input | jca/Digest.java:142:47:142:73 | Message |
+| jca/Digest.java:142:32:142:74 | EncryptOperation | Key | jca/Digest.java:141:42:141:44 | Key |
+| jca/Digest.java:142:32:142:74 | EncryptOperation | Nonce | jca/Digest.java:142:32:142:74 | EncryptOperation |
+| jca/Digest.java:142:32:142:74 | EncryptOperation | Output | jca/Digest.java:142:32:142:74 | KeyOperationOutput |
+| jca/Digest.java:142:47:142:73 | Message | Source | jca/Digest.java:142:47:142:62 | Constant |
+| jca/Digest.java:176:42:176:71 | Message | Source | jca/Digest.java:171:50:171:62 | Parameter |
+| jca/Digest.java:176:74:176:77 | Salt | Source | jca/Digest.java:253:38:253:41 | RandomNumberGeneration |
+| jca/Digest.java:177:65:177:86 | HMACAlgorithm | H | jca/Digest.java:177:65:177:86 | HashAlgorithm |
+| jca/Digest.java:177:65:177:86 | KeyDerivationAlgorithm | PRF | jca/Digest.java:177:65:177:86 | HMACAlgorithm |
+| jca/Digest.java:178:30:178:57 | KeyDerivation | Algorithm | jca/Digest.java:177:65:177:86 | KeyDerivationAlgorithm |
+| jca/Digest.java:178:30:178:57 | KeyDerivation | Input | jca/Digest.java:176:42:176:71 | Message |
+| jca/Digest.java:178:30:178:57 | KeyDerivation | Output | jca/Digest.java:178:30:178:57 | Key |
+| jca/Digest.java:178:30:178:57 | KeyDerivation | Salt | jca/Digest.java:176:74:176:77 | Salt |
+| jca/Digest.java:186:44:186:62 | KeyOperationAlgorithm | Mode | jca/Digest.java:186:44:186:62 | ModeOfOperation |
+| jca/Digest.java:186:44:186:62 | KeyOperationAlgorithm | Padding | jca/Digest.java:186:44:186:62 | PaddingAlgorithm |
+| jca/Digest.java:187:42:187:54 | Key | Source | jca/Digest.java:187:42:187:54 | Key |
+| jca/Digest.java:188:29:188:78 | EncryptOperation | Algorithm | jca/Digest.java:186:44:186:62 | KeyOperationAlgorithm |
+| jca/Digest.java:188:29:188:78 | EncryptOperation | Input | jca/Digest.java:188:44:188:77 | Message |
+| jca/Digest.java:188:29:188:78 | EncryptOperation | Key | jca/Digest.java:187:42:187:54 | Key |
+| jca/Digest.java:188:29:188:78 | EncryptOperation | Nonce | jca/Digest.java:188:29:188:78 | EncryptOperation |
+| jca/Digest.java:188:29:188:78 | EncryptOperation | Output | jca/Digest.java:188:29:188:78 | KeyOperationOutput |
+| jca/Digest.java:188:44:188:77 | Message | Source | jca/Digest.java:188:44:188:66 | Constant |
+| jca/Digest.java:191:35:191:46 | HMACAlgorithm | H | jca/Digest.java:191:35:191:46 | HashAlgorithm |
+| jca/Digest.java:192:18:192:23 | Key | Source | jca/Digest.java:192:18:192:23 | Key |
+| jca/Digest.java:193:30:193:52 | MACOperation | Algorithm | jca/Digest.java:191:35:191:46 | HMACAlgorithm |
+| jca/Digest.java:193:30:193:52 | MACOperation | HashAlgorithm | jca/Digest.java:191:35:191:46 | HashAlgorithm |
+| jca/Digest.java:193:30:193:52 | MACOperation | Input | jca/Digest.java:193:42:193:51 | Message |
+| jca/Digest.java:193:30:193:52 | MACOperation | Key | jca/Digest.java:192:18:192:23 | Key |
+| jca/Digest.java:193:30:193:52 | MACOperation | Message | jca/Digest.java:193:42:193:51 | Message |
+| jca/Digest.java:193:30:193:52 | MACOperation | Nonce | jca/Digest.java:193:30:193:52 | MACOperation |
+| jca/Digest.java:193:30:193:52 | MACOperation | Output | jca/Digest.java:193:30:193:52 | KeyOperationOutput |
+| jca/Digest.java:193:42:193:51 | Message | Source | jca/Digest.java:188:29:188:78 | KeyOperationOutput |
+| jca/Digest.java:210:44:210:62 | KeyOperationAlgorithm | Mode | jca/Digest.java:210:44:210:62 | ModeOfOperation |
+| jca/Digest.java:210:44:210:62 | KeyOperationAlgorithm | Padding | jca/Digest.java:210:44:210:62 | PaddingAlgorithm |
+| jca/Digest.java:212:42:212:44 | Key | Source | jca/Digest.java:241:16:241:35 | Key |
+| jca/Digest.java:213:32:213:51 | EncryptOperation | Algorithm | jca/Digest.java:210:44:210:62 | KeyOperationAlgorithm |
+| jca/Digest.java:213:32:213:51 | EncryptOperation | Input | jca/Digest.java:213:47:213:50 | Message |
+| jca/Digest.java:213:32:213:51 | EncryptOperation | Key | jca/Digest.java:212:42:212:44 | Key |
+| jca/Digest.java:213:32:213:51 | EncryptOperation | Nonce | jca/Digest.java:213:32:213:51 | EncryptOperation |
+| jca/Digest.java:213:32:213:51 | EncryptOperation | Output | jca/Digest.java:213:32:213:51 | KeyOperationOutput |
+| jca/Digest.java:213:47:213:50 | Message | Source | jca/Digest.java:155:39:155:51 | Parameter |
+| jca/Digest.java:241:16:241:35 | KeyGeneration | Algorithm | jca/Digest.java:239:56:239:60 | KeyOperationAlgorithm |
+| jca/Digest.java:241:16:241:35 | KeyGeneration | Output | jca/Digest.java:241:16:241:35 | Key |
+| jca/EllipticCurve1.java:47:16:47:36 | Key | Algorithm | jca/EllipticCurve1.java:46:66:46:76 | EllipticCurve |
+| jca/EllipticCurve1.java:47:16:47:36 | KeyGeneration | Algorithm | jca/EllipticCurve1.java:46:66:46:76 | EllipticCurve |
+| jca/EllipticCurve1.java:47:16:47:36 | KeyGeneration | Output | jca/EllipticCurve1.java:47:16:47:36 | Key |
+| jca/EllipticCurve1.java:57:16:57:36 | Key | Algorithm | jca/EllipticCurve1.java:56:66:56:76 | EllipticCurve |
+| jca/EllipticCurve1.java:57:16:57:36 | KeyGeneration | Algorithm | jca/EllipticCurve1.java:56:66:56:76 | EllipticCurve |
+| jca/EllipticCurve1.java:57:16:57:36 | KeyGeneration | Output | jca/EllipticCurve1.java:57:16:57:36 | Key |
+| jca/EllipticCurve1.java:67:16:67:36 | Key | Algorithm | jca/EllipticCurve1.java:66:66:66:82 | EllipticCurve |
+| jca/EllipticCurve1.java:67:16:67:36 | KeyGeneration | Algorithm | jca/EllipticCurve1.java:66:66:66:82 | EllipticCurve |
+| jca/EllipticCurve1.java:67:16:67:36 | KeyGeneration | Output | jca/EllipticCurve1.java:67:16:67:36 | Key |
+| jca/EllipticCurve1.java:76:16:76:36 | Key | Algorithm | jca/EllipticCurve1.java:74:61:74:68 | KeyAgreementAlgorithm |
+| jca/EllipticCurve1.java:76:16:76:36 | KeyGeneration | Algorithm | jca/EllipticCurve1.java:74:61:74:68 | KeyAgreementAlgorithm |
+| jca/EllipticCurve1.java:76:16:76:36 | KeyGeneration | Output | jca/EllipticCurve1.java:76:16:76:36 | Key |
+| jca/EllipticCurve1.java:84:16:84:36 | Key | Algorithm | jca/EllipticCurve1.java:83:61:83:66 | KeyAgreementAlgorithm |
+| jca/EllipticCurve1.java:84:16:84:36 | KeyGeneration | Algorithm | jca/EllipticCurve1.java:83:61:83:66 | KeyAgreementAlgorithm |
+| jca/EllipticCurve1.java:84:16:84:36 | KeyGeneration | Output | jca/EllipticCurve1.java:84:16:84:36 | Key |
+| jca/EllipticCurve1.java:95:16:95:36 | Key | Algorithm | jca/EllipticCurve1.java:94:66:94:76 | EllipticCurve |
+| jca/EllipticCurve1.java:95:16:95:36 | KeyGeneration | Algorithm | jca/EllipticCurve1.java:94:66:94:76 | EllipticCurve |
+| jca/EllipticCurve1.java:95:16:95:36 | KeyGeneration | Output | jca/EllipticCurve1.java:95:16:95:36 | Key |
+| jca/EllipticCurve1.java:106:16:106:36 | Key | Algorithm | jca/EllipticCurve1.java:105:66:105:76 | Constant |
+| jca/EllipticCurve1.java:106:16:106:36 | KeyGeneration | Algorithm | jca/EllipticCurve1.java:105:66:105:76 | Constant |
+| jca/EllipticCurve1.java:106:16:106:36 | KeyGeneration | Output | jca/EllipticCurve1.java:106:16:106:36 | Key |
+| jca/EllipticCurve1.java:114:61:114:69 | KeyOperationAlgorithm | Mode | jca/EllipticCurve1.java:114:61:114:69 | KeyOperationAlgorithm |
+| jca/EllipticCurve1.java:114:61:114:69 | KeyOperationAlgorithm | Padding | jca/EllipticCurve1.java:114:61:114:69 | KeyOperationAlgorithm |
+| jca/EllipticCurve1.java:115:16:115:36 | Key | Algorithm | jca/EllipticCurve1.java:114:61:114:69 | KeyOperationAlgorithm |
+| jca/EllipticCurve1.java:115:16:115:36 | KeyGeneration | Algorithm | jca/EllipticCurve1.java:114:61:114:69 | KeyOperationAlgorithm |
+| jca/EllipticCurve1.java:115:16:115:36 | KeyGeneration | Output | jca/EllipticCurve1.java:115:16:115:36 | Key |
+| jca/EllipticCurve2.java:47:16:47:36 | Key | Algorithm | jca/EllipticCurve2.java:46:47:46:57 | EllipticCurve |
+| jca/EllipticCurve2.java:47:16:47:36 | KeyGeneration | Algorithm | jca/EllipticCurve2.java:46:47:46:57 | EllipticCurve |
+| jca/EllipticCurve2.java:47:16:47:36 | KeyGeneration | Output | jca/EllipticCurve2.java:47:16:47:36 | Key |
+| jca/EllipticCurve2.java:56:16:56:36 | Key | Algorithm | jca/EllipticCurve2.java:55:47:55:57 | EllipticCurve |
+| jca/EllipticCurve2.java:56:16:56:36 | KeyGeneration | Algorithm | jca/EllipticCurve2.java:55:47:55:57 | EllipticCurve |
+| jca/EllipticCurve2.java:56:16:56:36 | KeyGeneration | Output | jca/EllipticCurve2.java:56:16:56:36 | Key |
+| jca/EllipticCurve2.java:65:16:65:36 | Key | Algorithm | jca/EllipticCurve2.java:64:47:64:63 | EllipticCurve |
+| jca/EllipticCurve2.java:65:16:65:36 | KeyGeneration | Algorithm | jca/EllipticCurve2.java:64:47:64:63 | EllipticCurve |
+| jca/EllipticCurve2.java:65:16:65:36 | KeyGeneration | Output | jca/EllipticCurve2.java:65:16:65:36 | Key |
+| jca/EllipticCurve2.java:73:16:73:36 | Key | Algorithm | jca/EllipticCurve2.java:72:61:72:68 | KeyAgreementAlgorithm |
+| jca/EllipticCurve2.java:73:16:73:36 | KeyGeneration | Algorithm | jca/EllipticCurve2.java:72:61:72:68 | KeyAgreementAlgorithm |
+| jca/EllipticCurve2.java:73:16:73:36 | KeyGeneration | Output | jca/EllipticCurve2.java:73:16:73:36 | Key |
+| jca/EllipticCurve2.java:80:61:80:69 | KeyOperationAlgorithm | Mode | jca/EllipticCurve2.java:80:61:80:69 | KeyOperationAlgorithm |
+| jca/EllipticCurve2.java:80:61:80:69 | KeyOperationAlgorithm | Padding | jca/EllipticCurve2.java:80:61:80:69 | KeyOperationAlgorithm |
+| jca/EllipticCurve2.java:81:16:81:36 | Key | Algorithm | jca/EllipticCurve2.java:80:61:80:69 | KeyOperationAlgorithm |
+| jca/EllipticCurve2.java:81:16:81:36 | KeyGeneration | Algorithm | jca/EllipticCurve2.java:80:61:80:69 | KeyOperationAlgorithm |
+| jca/EllipticCurve2.java:81:16:81:36 | KeyGeneration | Output | jca/EllipticCurve2.java:81:16:81:36 | Key |
+| jca/EllipticCurve2.java:106:17:106:36 | Key | Source | jca/EllipticCurve2.java:47:16:47:36 | Key |
+| jca/EllipticCurve2.java:107:20:107:36 | Key | Source | jca/EllipticCurve2.java:47:16:47:36 | Key |
+| jca/EllipticCurve2.java:108:16:108:34 | KeyAgreementOperation | Algorithm | jca/EllipticCurve2.java:105:52:105:57 | KeyAgreementAlgorithm |
+| jca/EllipticCurve2.java:108:16:108:34 | KeyAgreementOperation | Output | jca/EllipticCurve2.java:108:16:108:34 | SharedSecret |
+| jca/EllipticCurve2.java:108:16:108:34 | KeyAgreementOperation | PeerKey | jca/EllipticCurve2.java:107:20:107:36 | Key |
+| jca/EllipticCurve2.java:108:16:108:34 | KeyAgreementOperation | ServerKey | jca/EllipticCurve2.java:106:17:106:36 | Key |
+| jca/EllipticCurve2.java:108:16:108:34 | SharedSecret | Source | jca/EllipticCurve2.java:108:16:108:34 | SharedSecret |
+| jca/EllipticCurve2.java:120:17:120:37 | Key | Source | jca/EllipticCurve2.java:47:16:47:36 | Key |
+| jca/EllipticCurve2.java:121:20:121:39 | Key | Source | jca/EllipticCurve2.java:47:16:47:36 | Key |
+| jca/EllipticCurve2.java:122:16:122:34 | KeyAgreementOperation | Algorithm | jca/EllipticCurve2.java:119:52:119:57 | KeyAgreementAlgorithm |
+| jca/EllipticCurve2.java:122:16:122:34 | KeyAgreementOperation | Output | jca/EllipticCurve2.java:122:16:122:34 | SharedSecret |
+| jca/EllipticCurve2.java:122:16:122:34 | KeyAgreementOperation | PeerKey | jca/EllipticCurve2.java:121:20:121:39 | Key |
+| jca/EllipticCurve2.java:122:16:122:34 | KeyAgreementOperation | ServerKey | jca/EllipticCurve2.java:120:17:120:37 | Key |
+| jca/EllipticCurve2.java:122:16:122:34 | SharedSecret | Source | jca/EllipticCurve2.java:122:16:122:34 | SharedSecret |
+| jca/EllipticCurve2.java:136:53:136:69 | KeyOperationAlgorithm | Mode | jca/EllipticCurve2.java:136:53:136:69 | KeyOperationAlgorithm |
+| jca/EllipticCurve2.java:136:53:136:69 | KeyOperationAlgorithm | Padding | jca/EllipticCurve2.java:136:53:136:69 | KeyOperationAlgorithm |
+| jca/EllipticCurve2.java:137:28:137:42 | Key | Source | jca/EllipticCurve2.java:47:16:47:36 | Key |
+| jca/EllipticCurve2.java:138:26:138:32 | Message | Source | jca/EllipticCurve2.java:245:30:245:53 | Constant |
+| jca/EllipticCurve2.java:139:16:139:31 | SignOperation | Algorithm | jca/EllipticCurve2.java:136:53:136:69 | KeyOperationAlgorithm |
+| jca/EllipticCurve2.java:139:16:139:31 | SignOperation | HashAlgorithm | jca/EllipticCurve2.java:136:53:136:69 | HashAlgorithm |
+| jca/EllipticCurve2.java:139:16:139:31 | SignOperation | Input | jca/EllipticCurve2.java:138:26:138:32 | Message |
+| jca/EllipticCurve2.java:139:16:139:31 | SignOperation | Key | jca/EllipticCurve2.java:137:28:137:42 | Key |
+| jca/EllipticCurve2.java:139:16:139:31 | SignOperation | Output | jca/EllipticCurve2.java:139:16:139:31 | SignatureOutput |
+| jca/EllipticCurve2.java:151:53:151:69 | KeyOperationAlgorithm | Mode | jca/EllipticCurve2.java:151:53:151:69 | KeyOperationAlgorithm |
+| jca/EllipticCurve2.java:151:53:151:69 | KeyOperationAlgorithm | Padding | jca/EllipticCurve2.java:151:53:151:69 | KeyOperationAlgorithm |
+| jca/EllipticCurve2.java:152:30:152:43 | Key | Source | jca/EllipticCurve2.java:47:16:47:36 | Key |
+| jca/EllipticCurve2.java:153:26:153:32 | Message | Source | jca/EllipticCurve2.java:245:30:245:53 | Constant |
+| jca/EllipticCurve2.java:154:16:154:47 | VerifyOperation | Algorithm | jca/EllipticCurve2.java:151:53:151:69 | KeyOperationAlgorithm |
+| jca/EllipticCurve2.java:154:16:154:47 | VerifyOperation | HashAlgorithm | jca/EllipticCurve2.java:151:53:151:69 | HashAlgorithm |
+| jca/EllipticCurve2.java:154:16:154:47 | VerifyOperation | Input | jca/EllipticCurve2.java:153:26:153:32 | Message |
+| jca/EllipticCurve2.java:154:16:154:47 | VerifyOperation | Key | jca/EllipticCurve2.java:152:30:152:43 | Key |
+| jca/EllipticCurve2.java:154:16:154:47 | VerifyOperation | Signature | jca/EllipticCurve2.java:154:33:154:46 | SignatureInput |
+| jca/EllipticCurve2.java:154:33:154:46 | SignatureInput | Source | jca/EllipticCurve2.java:139:16:139:31 | SignatureOutput |
+| jca/EllipticCurve2.java:166:53:166:61 | KeyOperationAlgorithm | Mode | jca/EllipticCurve2.java:166:53:166:61 | KeyOperationAlgorithm |
+| jca/EllipticCurve2.java:166:53:166:61 | KeyOperationAlgorithm | Padding | jca/EllipticCurve2.java:166:53:166:61 | KeyOperationAlgorithm |
+| jca/EllipticCurve2.java:167:28:167:42 | Key | Source | jca/EllipticCurve2.java:81:16:81:36 | Key |
+| jca/EllipticCurve2.java:168:26:168:32 | Message | Source | jca/EllipticCurve2.java:245:30:245:53 | Constant |
+| jca/EllipticCurve2.java:169:16:169:31 | SignOperation | Algorithm | jca/EllipticCurve2.java:166:53:166:61 | KeyOperationAlgorithm |
+| jca/EllipticCurve2.java:169:16:169:31 | SignOperation | HashAlgorithm | jca/EllipticCurve2.java:169:16:169:31 | SignOperation |
+| jca/EllipticCurve2.java:169:16:169:31 | SignOperation | Input | jca/EllipticCurve2.java:168:26:168:32 | Message |
+| jca/EllipticCurve2.java:169:16:169:31 | SignOperation | Key | jca/EllipticCurve2.java:167:28:167:42 | Key |
+| jca/EllipticCurve2.java:169:16:169:31 | SignOperation | Output | jca/EllipticCurve2.java:169:16:169:31 | SignatureOutput |
+| jca/EllipticCurve2.java:181:53:181:61 | KeyOperationAlgorithm | Mode | jca/EllipticCurve2.java:181:53:181:61 | KeyOperationAlgorithm |
+| jca/EllipticCurve2.java:181:53:181:61 | KeyOperationAlgorithm | Padding | jca/EllipticCurve2.java:181:53:181:61 | KeyOperationAlgorithm |
+| jca/EllipticCurve2.java:182:30:182:43 | Key | Source | jca/EllipticCurve2.java:81:16:81:36 | Key |
+| jca/EllipticCurve2.java:183:26:183:32 | Message | Source | jca/EllipticCurve2.java:245:30:245:53 | Constant |
+| jca/EllipticCurve2.java:184:16:184:47 | VerifyOperation | Algorithm | jca/EllipticCurve2.java:181:53:181:61 | KeyOperationAlgorithm |
+| jca/EllipticCurve2.java:184:16:184:47 | VerifyOperation | HashAlgorithm | jca/EllipticCurve2.java:184:16:184:47 | VerifyOperation |
+| jca/EllipticCurve2.java:184:16:184:47 | VerifyOperation | Input | jca/EllipticCurve2.java:183:26:183:32 | Message |
+| jca/EllipticCurve2.java:184:16:184:47 | VerifyOperation | Key | jca/EllipticCurve2.java:182:30:182:43 | Key |
+| jca/EllipticCurve2.java:184:16:184:47 | VerifyOperation | Signature | jca/EllipticCurve2.java:184:33:184:46 | SignatureInput |
+| jca/EllipticCurve2.java:184:33:184:46 | SignatureInput | Source | jca/EllipticCurve2.java:169:16:169:31 | SignatureOutput |
+| jca/EllipticCurve2.java:207:17:207:37 | Key | Source | jca/EllipticCurve2.java:47:16:47:36 | Key |
+| jca/EllipticCurve2.java:208:20:208:41 | Key | Source | jca/EllipticCurve2.java:47:16:47:36 | Key |
+| jca/EllipticCurve2.java:209:31:209:49 | KeyAgreementOperation | Algorithm | jca/EllipticCurve2.java:206:52:206:57 | KeyAgreementAlgorithm |
+| jca/EllipticCurve2.java:209:31:209:49 | KeyAgreementOperation | Output | jca/EllipticCurve2.java:209:31:209:49 | SharedSecret |
+| jca/EllipticCurve2.java:209:31:209:49 | KeyAgreementOperation | PeerKey | jca/EllipticCurve2.java:208:20:208:41 | Key |
+| jca/EllipticCurve2.java:209:31:209:49 | KeyAgreementOperation | ServerKey | jca/EllipticCurve2.java:207:17:207:37 | Key |
+| jca/EllipticCurve2.java:209:31:209:49 | SharedSecret | Source | jca/EllipticCurve2.java:209:31:209:49 | SharedSecret |
+| jca/EllipticCurve2.java:214:29:214:55 | Digest | Source | jca/EllipticCurve2.java:214:29:214:55 | Digest |
+| jca/EllipticCurve2.java:214:29:214:55 | HashOperation | Algorithm | jca/EllipticCurve2.java:213:58:213:66 | HashAlgorithm |
+| jca/EllipticCurve2.java:214:29:214:55 | HashOperation | Digest | jca/EllipticCurve2.java:214:29:214:55 | Digest |
+| jca/EllipticCurve2.java:214:29:214:55 | HashOperation | Message | jca/EllipticCurve2.java:214:43:214:54 | Message |
+| jca/EllipticCurve2.java:214:43:214:54 | Message | Source | jca/EllipticCurve2.java:209:31:209:49 | SharedSecret |
+| jca/EllipticCurve2.java:219:44:219:62 | KeyOperationAlgorithm | Mode | jca/EllipticCurve2.java:219:44:219:62 | ModeOfOperation |
+| jca/EllipticCurve2.java:219:44:219:62 | KeyOperationAlgorithm | Padding | jca/EllipticCurve2.java:219:44:219:62 | PaddingAlgorithm |
+| jca/EllipticCurve2.java:223:42:223:47 | Key | Source | jca/EllipticCurve2.java:223:42:223:47 | Key |
+| jca/EllipticCurve2.java:223:50:223:53 | Nonce | Source | jca/EllipticCurve2.java:221:38:221:39 | RandomNumberGeneration |
+| jca/EllipticCurve2.java:224:29:224:53 | EncryptOperation | Algorithm | jca/EllipticCurve2.java:219:44:219:62 | KeyOperationAlgorithm |
+| jca/EllipticCurve2.java:224:29:224:53 | EncryptOperation | Input | jca/EllipticCurve2.java:224:44:224:52 | Message |
+| jca/EllipticCurve2.java:224:29:224:53 | EncryptOperation | Key | jca/EllipticCurve2.java:223:42:223:47 | Key |
+| jca/EllipticCurve2.java:224:29:224:53 | EncryptOperation | Nonce | jca/EllipticCurve2.java:223:50:223:53 | Nonce |
+| jca/EllipticCurve2.java:224:29:224:53 | EncryptOperation | Output | jca/EllipticCurve2.java:224:29:224:53 | KeyOperationOutput |
+| jca/EllipticCurve2.java:224:44:224:52 | Message | Source | jca/EllipticCurve2.java:258:62:258:83 | Constant |
+| jca/Encryption1.java:62:25:62:44 | KeyGeneration | Algorithm | jca/Encryption1.java:60:56:60:60 | KeyOperationAlgorithm |
+| jca/Encryption1.java:62:25:62:44 | KeyGeneration | Output | jca/Encryption1.java:62:25:62:44 | Key |
+| jca/Encryption1.java:63:44:63:62 | KeyOperationAlgorithm | Mode | jca/Encryption1.java:63:44:63:62 | ModeOfOperation |
+| jca/Encryption1.java:63:44:63:62 | KeyOperationAlgorithm | Padding | jca/Encryption1.java:63:44:63:62 | PaddingAlgorithm |
+| jca/Encryption1.java:67:42:67:44 | Key | Source | jca/Encryption1.java:62:25:62:44 | Key |
+| jca/Encryption1.java:67:47:67:53 | Nonce | Source | jca/Encryption1.java:65:38:65:39 | RandomNumberGeneration |
+| jca/Encryption1.java:68:32:68:74 | EncryptOperation | Algorithm | jca/Encryption1.java:63:44:63:62 | KeyOperationAlgorithm |
+| jca/Encryption1.java:68:32:68:74 | EncryptOperation | Input | jca/Encryption1.java:68:47:68:73 | Message |
+| jca/Encryption1.java:68:32:68:74 | EncryptOperation | Key | jca/Encryption1.java:67:42:67:44 | Key |
+| jca/Encryption1.java:68:32:68:74 | EncryptOperation | Nonce | jca/Encryption1.java:67:47:67:53 | Nonce |
+| jca/Encryption1.java:68:32:68:74 | EncryptOperation | Output | jca/Encryption1.java:68:32:68:74 | KeyOperationOutput |
+| jca/Encryption1.java:68:47:68:73 | Message | Source | jca/Encryption1.java:68:47:68:62 | Constant |
+| jca/Encryption1.java:85:25:85:44 | KeyGeneration | Algorithm | jca/Encryption1.java:83:56:83:60 | KeyOperationAlgorithm |
+| jca/Encryption1.java:85:25:85:44 | KeyGeneration | Output | jca/Encryption1.java:85:25:85:44 | Key |
+| jca/Encryption1.java:88:44:88:62 | KeyOperationAlgorithm | Mode | jca/Encryption1.java:88:44:88:62 | ModeOfOperation |
+| jca/Encryption1.java:88:44:88:62 | KeyOperationAlgorithm | Padding | jca/Encryption1.java:88:44:88:62 | PaddingAlgorithm |
+| jca/Encryption1.java:89:42:89:44 | Key | Source | jca/Encryption1.java:85:25:85:44 | Key |
+| jca/Encryption1.java:90:32:90:74 | EncryptOperation | Algorithm | jca/Encryption1.java:88:44:88:62 | KeyOperationAlgorithm |
+| jca/Encryption1.java:90:32:90:74 | EncryptOperation | Input | jca/Encryption1.java:90:47:90:73 | Message |
+| jca/Encryption1.java:90:32:90:74 | EncryptOperation | Key | jca/Encryption1.java:89:42:89:44 | Key |
+| jca/Encryption1.java:90:32:90:74 | EncryptOperation | Nonce | jca/Encryption1.java:90:32:90:74 | EncryptOperation |
+| jca/Encryption1.java:90:32:90:74 | EncryptOperation | Output | jca/Encryption1.java:90:32:90:74 | KeyOperationOutput |
+| jca/Encryption1.java:90:47:90:73 | Message | Source | jca/Encryption1.java:90:47:90:62 | Constant |
+| jca/Encryption1.java:105:44:105:82 | KeyOperationAlgorithm | Mode | jca/Encryption1.java:105:44:105:82 | ModeOfOperation |
+| jca/Encryption1.java:105:44:105:82 | KeyOperationAlgorithm | Padding | jca/Encryption1.java:105:44:105:82 | PaddingAlgorithm |
+| jca/Encryption1.java:105:44:105:82 | PaddingAlgorithm | MD | jca/Encryption1.java:105:44:105:82 | HashAlgorithm |
+| jca/Encryption1.java:105:44:105:82 | PaddingAlgorithm | MGF1Hash | jca/Encryption1.java:105:44:105:82 | PaddingAlgorithm |
+| jca/Encryption1.java:106:42:106:50 | Key | Source | jca/Encryption1.java:104:35:104:53 | Parameter |
+| jca/Encryption1.java:107:32:107:62 | EncryptOperation | Algorithm | jca/Encryption1.java:105:44:105:82 | KeyOperationAlgorithm |
+| jca/Encryption1.java:107:32:107:62 | EncryptOperation | Input | jca/Encryption1.java:107:47:107:61 | Message |
+| jca/Encryption1.java:107:32:107:62 | EncryptOperation | Key | jca/Encryption1.java:106:42:106:50 | Key |
+| jca/Encryption1.java:107:32:107:62 | EncryptOperation | Nonce | jca/Encryption1.java:107:32:107:62 | EncryptOperation |
+| jca/Encryption1.java:107:32:107:62 | EncryptOperation | Output | jca/Encryption1.java:107:32:107:62 | KeyOperationOutput |
+| jca/Encryption1.java:107:47:107:61 | Message | Source | jca/Encryption1.java:104:56:104:66 | Parameter |
+| jca/Encryption1.java:120:44:120:82 | KeyOperationAlgorithm | Mode | jca/Encryption1.java:120:44:120:82 | ModeOfOperation |
+| jca/Encryption1.java:120:44:120:82 | KeyOperationAlgorithm | Padding | jca/Encryption1.java:120:44:120:82 | PaddingAlgorithm |
+| jca/Encryption1.java:120:44:120:82 | PaddingAlgorithm | MD | jca/Encryption1.java:120:44:120:82 | HashAlgorithm |
+| jca/Encryption1.java:120:44:120:82 | PaddingAlgorithm | MGF1Hash | jca/Encryption1.java:120:44:120:82 | PaddingAlgorithm |
+| jca/Encryption1.java:121:42:121:51 | Key | Source | jca/Encryption1.java:119:35:119:55 | Parameter |
+| jca/Encryption1.java:122:32:122:60 | DecryptOperation | Algorithm | jca/Encryption1.java:120:44:120:82 | KeyOperationAlgorithm |
+| jca/Encryption1.java:122:32:122:60 | DecryptOperation | Input | jca/Encryption1.java:122:47:122:59 | Message |
+| jca/Encryption1.java:122:32:122:60 | DecryptOperation | Key | jca/Encryption1.java:121:42:121:51 | Key |
+| jca/Encryption1.java:122:32:122:60 | DecryptOperation | Nonce | jca/Encryption1.java:122:32:122:60 | DecryptOperation |
+| jca/Encryption1.java:122:32:122:60 | DecryptOperation | Output | jca/Encryption1.java:122:32:122:60 | KeyOperationOutput |
+| jca/Encryption1.java:122:47:122:59 | Message | Source | jca/Encryption1.java:119:58:119:77 | Parameter |
+| jca/Encryption1.java:139:28:139:47 | KeyGeneration | Algorithm | jca/Encryption1.java:137:56:137:60 | KeyOperationAlgorithm |
+| jca/Encryption1.java:139:28:139:47 | KeyGeneration | Output | jca/Encryption1.java:139:28:139:47 | Key |
+| jca/Encryption1.java:141:47:141:85 | KeyOperationAlgorithm | Mode | jca/Encryption1.java:141:47:141:85 | ModeOfOperation |
+| jca/Encryption1.java:141:47:141:85 | KeyOperationAlgorithm | Padding | jca/Encryption1.java:141:47:141:85 | PaddingAlgorithm |
+| jca/Encryption1.java:141:47:141:85 | PaddingAlgorithm | MD | jca/Encryption1.java:141:47:141:85 | HashAlgorithm |
+| jca/Encryption1.java:141:47:141:85 | PaddingAlgorithm | MGF1Hash | jca/Encryption1.java:141:47:141:85 | PaddingAlgorithm |
+| jca/Encryption1.java:142:45:142:56 | Key | Source | jca/Encryption1.java:136:34:136:55 | Parameter |
+| jca/Encryption1.java:143:34:143:71 | EncryptOperation | Algorithm | jca/Encryption1.java:141:47:141:85 | KeyOperationAlgorithm |
+| jca/Encryption1.java:143:34:143:71 | EncryptOperation | Input | jca/Encryption1.java:143:52:143:70 | Message |
+| jca/Encryption1.java:143:34:143:71 | EncryptOperation | Key | jca/Encryption1.java:142:45:142:56 | Key |
+| jca/Encryption1.java:143:34:143:71 | EncryptOperation | Nonce | jca/Encryption1.java:143:34:143:71 | EncryptOperation |
+| jca/Encryption1.java:143:34:143:71 | EncryptOperation | Output | jca/Encryption1.java:143:34:143:71 | KeyOperationOutput |
+| jca/Encryption1.java:143:52:143:70 | Message | Source | jca/Encryption1.java:139:28:139:47 | Key |
+| jca/Encryption1.java:163:28:163:47 | KeyGeneration | Algorithm | jca/Encryption1.java:161:56:161:60 | KeyOperationAlgorithm |
+| jca/Encryption1.java:163:28:163:47 | KeyGeneration | Output | jca/Encryption1.java:163:28:163:47 | Key |
+| jca/Encryption1.java:166:47:166:85 | KeyOperationAlgorithm | Mode | jca/Encryption1.java:166:47:166:85 | ModeOfOperation |
+| jca/Encryption1.java:166:47:166:85 | KeyOperationAlgorithm | Padding | jca/Encryption1.java:166:47:166:85 | PaddingAlgorithm |
+| jca/Encryption1.java:166:47:166:85 | PaddingAlgorithm | MD | jca/Encryption1.java:166:47:166:85 | HashAlgorithm |
+| jca/Encryption1.java:166:47:166:85 | PaddingAlgorithm | MGF1Hash | jca/Encryption1.java:166:47:166:85 | PaddingAlgorithm |
+| jca/Encryption1.java:167:45:167:56 | Key | Source | jca/Encryption1.java:159:34:159:55 | Parameter |
+| jca/Encryption1.java:168:34:168:71 | EncryptOperation | Algorithm | jca/Encryption1.java:166:47:166:85 | KeyOperationAlgorithm |
+| jca/Encryption1.java:168:34:168:71 | EncryptOperation | Input | jca/Encryption1.java:168:52:168:70 | Message |
+| jca/Encryption1.java:168:34:168:71 | EncryptOperation | Key | jca/Encryption1.java:167:45:167:56 | Key |
+| jca/Encryption1.java:168:34:168:71 | EncryptOperation | Nonce | jca/Encryption1.java:168:34:168:71 | EncryptOperation |
+| jca/Encryption1.java:168:34:168:71 | EncryptOperation | Output | jca/Encryption1.java:168:34:168:71 | KeyOperationOutput |
+| jca/Encryption1.java:168:52:168:70 | Message | Source | jca/Encryption1.java:163:28:163:47 | Key |
+| jca/Encryption1.java:171:47:171:65 | KeyOperationAlgorithm | Mode | jca/Encryption1.java:171:47:171:65 | ModeOfOperation |
+| jca/Encryption1.java:171:47:171:65 | KeyOperationAlgorithm | Padding | jca/Encryption1.java:171:47:171:65 | PaddingAlgorithm |
+| jca/Encryption1.java:175:45:175:50 | Key | Source | jca/Encryption1.java:163:28:163:47 | Key |
+| jca/Encryption1.java:175:53:175:59 | Nonce | Source | jca/Encryption1.java:173:38:173:39 | RandomNumberGeneration |
+| jca/Encryption1.java:176:32:176:65 | EncryptOperation | Algorithm | jca/Encryption1.java:171:47:171:65 | KeyOperationAlgorithm |
+| jca/Encryption1.java:176:32:176:65 | EncryptOperation | Input | jca/Encryption1.java:176:50:176:64 | Message |
+| jca/Encryption1.java:176:32:176:65 | EncryptOperation | Key | jca/Encryption1.java:175:45:175:50 | Key |
+| jca/Encryption1.java:176:32:176:65 | EncryptOperation | Nonce | jca/Encryption1.java:175:53:175:59 | Nonce |
+| jca/Encryption1.java:176:32:176:65 | EncryptOperation | Output | jca/Encryption1.java:176:32:176:65 | KeyOperationOutput |
+| jca/Encryption1.java:176:50:176:64 | Message | Source | jca/Encryption1.java:159:58:159:68 | Parameter |
+| jca/Encryption2.java:56:16:56:49 | Key | Algorithm | jca/Encryption2.java:55:60:55:70 | EllipticCurve |
+| jca/Encryption2.java:56:16:56:49 | KeyGeneration | Algorithm | jca/Encryption2.java:55:60:55:70 | EllipticCurve |
+| jca/Encryption2.java:56:16:56:49 | KeyGeneration | Output | jca/Encryption2.java:56:16:56:49 | Key |
+| jca/Encryption2.java:72:27:72:36 | Key | Source | jca/Encryption2.java:56:16:56:49 | Key |
+| jca/Encryption2.java:73:30:73:38 | Key | Source | jca/Encryption2.java:90:38:90:65 | Parameter |
+| jca/Encryption2.java:73:30:73:38 | Key | Source | jca/Encryption2.java:132:45:132:65 | Parameter |
+| jca/Encryption2.java:74:16:74:44 | KeyAgreementOperation | Algorithm | jca/Encryption2.java:71:62:71:67 | KeyAgreementAlgorithm |
+| jca/Encryption2.java:74:16:74:44 | KeyAgreementOperation | Output | jca/Encryption2.java:74:16:74:44 | SharedSecret |
+| jca/Encryption2.java:74:16:74:44 | KeyAgreementOperation | PeerKey | jca/Encryption2.java:73:30:73:38 | Key |
+| jca/Encryption2.java:74:16:74:44 | KeyAgreementOperation | ServerKey | jca/Encryption2.java:72:27:72:36 | Key |
+| jca/Encryption2.java:74:16:74:44 | SharedSecret | Source | jca/Encryption2.java:74:16:74:44 | SharedSecret |
+| jca/Encryption2.java:100:30:100:56 | Digest | Source | jca/Encryption2.java:100:30:100:56 | Digest |
+| jca/Encryption2.java:100:30:100:56 | HashOperation | Algorithm | jca/Encryption2.java:99:58:99:66 | HashAlgorithm |
+| jca/Encryption2.java:100:30:100:56 | HashOperation | Digest | jca/Encryption2.java:100:30:100:56 | Digest |
+| jca/Encryption2.java:100:30:100:56 | HashOperation | Message | jca/Encryption2.java:100:44:100:55 | Message |
+| jca/Encryption2.java:100:44:100:55 | Message | Source | jca/Encryption2.java:74:16:74:44 | SharedSecret |
+| jca/Encryption2.java:105:47:105:65 | KeyOperationAlgorithm | Mode | jca/Encryption2.java:105:47:105:65 | ModeOfOperation |
+| jca/Encryption2.java:105:47:105:65 | KeyOperationAlgorithm | Padding | jca/Encryption2.java:105:47:105:65 | PaddingAlgorithm |
+| jca/Encryption2.java:109:45:109:50 | Key | Source | jca/Encryption2.java:100:30:100:56 | Digest |
+| jca/Encryption2.java:109:53:109:59 | Nonce | Source | jca/Encryption2.java:107:38:107:39 | RandomNumberGeneration |
+| jca/Encryption2.java:110:32:110:65 | EncryptOperation | Algorithm | jca/Encryption2.java:105:47:105:65 | KeyOperationAlgorithm |
+| jca/Encryption2.java:110:32:110:65 | EncryptOperation | Input | jca/Encryption2.java:110:50:110:64 | Message |
+| jca/Encryption2.java:110:32:110:65 | EncryptOperation | Key | jca/Encryption2.java:109:45:109:50 | Key |
+| jca/Encryption2.java:110:32:110:65 | EncryptOperation | Nonce | jca/Encryption2.java:109:53:109:59 | Nonce |
+| jca/Encryption2.java:110:32:110:65 | EncryptOperation | Output | jca/Encryption2.java:110:32:110:65 | KeyOperationOutput |
+| jca/Encryption2.java:110:50:110:64 | Message | Source | jca/Encryption2.java:90:68:90:78 | Parameter |
+| jca/Encryption2.java:145:47:145:65 | KeyOperationAlgorithm | Mode | jca/Encryption2.java:145:47:145:65 | ModeOfOperation |
+| jca/Encryption2.java:145:47:145:65 | KeyOperationAlgorithm | Padding | jca/Encryption2.java:145:47:145:65 | PaddingAlgorithm |
+| jca/Encryption2.java:149:45:149:50 | Key | Source | jca/Encryption2.java:149:45:149:50 | Key |
+| jca/Encryption2.java:149:53:149:59 | Nonce | Source | jca/Encryption2.java:147:38:147:39 | RandomNumberGeneration |
+| jca/Encryption2.java:150:32:150:98 | EncryptOperation | Algorithm | jca/Encryption2.java:145:47:145:65 | KeyOperationAlgorithm |
+| jca/Encryption2.java:150:32:150:98 | EncryptOperation | Input | jca/Encryption2.java:150:50:150:97 | Message |
+| jca/Encryption2.java:150:32:150:98 | EncryptOperation | Key | jca/Encryption2.java:149:45:149:50 | Key |
+| jca/Encryption2.java:150:32:150:98 | EncryptOperation | Nonce | jca/Encryption2.java:149:53:149:59 | Nonce |
+| jca/Encryption2.java:150:32:150:98 | EncryptOperation | Output | jca/Encryption2.java:150:32:150:98 | KeyOperationOutput |
+| jca/Encryption2.java:150:50:150:97 | Message | Source | jca/Encryption2.java:150:50:150:86 | Constant |
+| jca/Encryption2.java:173:36:173:47 | HMACAlgorithm | H | jca/Encryption2.java:173:36:173:47 | HashAlgorithm |
+| jca/Encryption2.java:175:19:175:27 | Key | Source | jca/Encryption2.java:132:68:132:88 | Parameter |
+| jca/Encryption2.java:176:31:176:52 | MACOperation | Algorithm | jca/Encryption2.java:173:36:173:47 | HMACAlgorithm |
+| jca/Encryption2.java:176:31:176:52 | MACOperation | HashAlgorithm | jca/Encryption2.java:173:36:173:47 | HashAlgorithm |
+| jca/Encryption2.java:176:31:176:52 | MACOperation | Input | jca/Encryption2.java:176:44:176:51 | Message |
+| jca/Encryption2.java:176:31:176:52 | MACOperation | Key | jca/Encryption2.java:175:19:175:27 | Key |
+| jca/Encryption2.java:176:31:176:52 | MACOperation | Message | jca/Encryption2.java:176:44:176:51 | Message |
+| jca/Encryption2.java:176:31:176:52 | MACOperation | Nonce | jca/Encryption2.java:176:31:176:52 | MACOperation |
+| jca/Encryption2.java:176:31:176:52 | MACOperation | Output | jca/Encryption2.java:176:31:176:52 | KeyOperationOutput |
+| jca/Encryption2.java:176:44:176:51 | Message | Source | jca/Encryption2.java:74:16:74:44 | SharedSecret |
+| jca/Hash.java:76:23:76:66 | Digest | Source | jca/Hash.java:76:23:76:66 | Digest |
+| jca/Hash.java:76:23:76:66 | HashOperation | Algorithm | jca/Hash.java:75:58:75:66 | HashAlgorithm |
+| jca/Hash.java:76:23:76:66 | HashOperation | Digest | jca/Hash.java:76:23:76:66 | Digest |
+| jca/Hash.java:76:23:76:66 | HashOperation | Message | jca/Hash.java:76:37:76:65 | Message |
+| jca/Hash.java:76:37:76:65 | Message | Source | jca/Hash.java:76:37:76:54 | Constant |
+| jca/Hash.java:89:23:89:70 | Digest | Source | jca/Hash.java:89:23:89:70 | Digest |
+| jca/Hash.java:89:23:89:70 | HashOperation | Algorithm | jca/Hash.java:88:61:88:65 | HashAlgorithm |
+| jca/Hash.java:89:23:89:70 | HashOperation | Digest | jca/Hash.java:89:23:89:70 | Digest |
+| jca/Hash.java:89:23:89:70 | HashOperation | Message | jca/Hash.java:89:40:89:69 | Message |
+| jca/Hash.java:89:40:89:69 | Message | Source | jca/Hash.java:89:40:89:58 | Constant |
+| jca/Hash.java:134:53:134:67 | KeyOperationAlgorithm | Mode | jca/Hash.java:134:53:134:67 | KeyOperationAlgorithm |
+| jca/Hash.java:134:53:134:67 | KeyOperationAlgorithm | Padding | jca/Hash.java:134:53:134:67 | KeyOperationAlgorithm |
+| jca/Hash.java:135:28:135:37 | Key | Source | jca/Hash.java:133:43:133:63 | Parameter |
+| jca/Hash.java:136:26:136:41 | Message | Source | jca/Hash.java:133:29:133:40 | Parameter |
+| jca/Hash.java:137:29:137:44 | SignOperation | Algorithm | jca/Hash.java:134:53:134:67 | KeyOperationAlgorithm |
+| jca/Hash.java:137:29:137:44 | SignOperation | HashAlgorithm | jca/Hash.java:134:53:134:67 | HashAlgorithm |
+| jca/Hash.java:137:29:137:44 | SignOperation | Input | jca/Hash.java:136:26:136:41 | Message |
+| jca/Hash.java:137:29:137:44 | SignOperation | Key | jca/Hash.java:135:28:135:37 | Key |
+| jca/Hash.java:137:29:137:44 | SignOperation | Output | jca/Hash.java:137:29:137:44 | SignatureOutput |
+| jca/Hash.java:155:53:155:67 | KeyOperationAlgorithm | Mode | jca/Hash.java:155:53:155:67 | KeyOperationAlgorithm |
+| jca/Hash.java:155:53:155:67 | KeyOperationAlgorithm | Padding | jca/Hash.java:155:53:155:67 | KeyOperationAlgorithm |
+| jca/Hash.java:156:30:156:38 | Key | Source | jca/Hash.java:154:73:154:91 | Parameter |
+| jca/Hash.java:157:26:157:41 | Message | Source | jca/Hash.java:154:40:154:51 | Parameter |
+| jca/Hash.java:158:16:158:43 | VerifyOperation | Algorithm | jca/Hash.java:155:53:155:67 | KeyOperationAlgorithm |
+| jca/Hash.java:158:16:158:43 | VerifyOperation | HashAlgorithm | jca/Hash.java:155:53:155:67 | HashAlgorithm |
+| jca/Hash.java:158:16:158:43 | VerifyOperation | Input | jca/Hash.java:157:26:157:41 | Message |
+| jca/Hash.java:158:16:158:43 | VerifyOperation | Key | jca/Hash.java:156:30:156:38 | Key |
+| jca/Hash.java:158:16:158:43 | VerifyOperation | Signature | jca/Hash.java:158:33:158:42 | SignatureInput |
+| jca/Hash.java:158:33:158:42 | SignatureInput | Source | jca/Hash.java:154:54:154:70 | Parameter |
+| jca/Hash.java:174:23:174:52 | Digest | Source | jca/Hash.java:174:23:174:52 | Digest |
+| jca/Hash.java:174:23:174:52 | HashOperation | Algorithm | jca/Hash.java:173:58:173:66 | HashAlgorithm |
+| jca/Hash.java:174:23:174:52 | HashOperation | Digest | jca/Hash.java:174:23:174:52 | Digest |
+| jca/Hash.java:174:23:174:52 | HashOperation | Message | jca/Hash.java:174:37:174:51 | Message |
+| jca/Hash.java:174:37:174:51 | Message | Source | jca/Hash.java:172:43:172:53 | Parameter |
+| jca/Hash.java:195:27:195:57 | Digest | Source | jca/Hash.java:195:27:195:57 | Digest |
+| jca/Hash.java:195:27:195:57 | HashOperation | Algorithm | jca/Hash.java:191:31:192:48 | Constant |
+| jca/Hash.java:195:27:195:57 | HashOperation | Algorithm | jca/Hash.java:191:32:191:38 | HashAlgorithm |
+| jca/Hash.java:195:27:195:57 | HashOperation | Algorithm | jca/Hash.java:191:41:191:49 | HashAlgorithm |
+| jca/Hash.java:195:27:195:57 | HashOperation | Algorithm | jca/Hash.java:191:52:191:60 | HashAlgorithm |
+| jca/Hash.java:195:27:195:57 | HashOperation | Algorithm | jca/Hash.java:191:63:191:71 | HashAlgorithm |
+| jca/Hash.java:195:27:195:57 | HashOperation | Algorithm | jca/Hash.java:191:74:191:82 | HashAlgorithm |
+| jca/Hash.java:195:27:195:57 | HashOperation | Algorithm | jca/Hash.java:191:85:191:94 | HashAlgorithm |
+| jca/Hash.java:195:27:195:57 | HashOperation | Algorithm | jca/Hash.java:191:97:191:106 | HashAlgorithm |
+| jca/Hash.java:195:27:195:57 | HashOperation | Algorithm | jca/Hash.java:192:13:192:25 | HashAlgorithm |
+| jca/Hash.java:195:27:195:57 | HashOperation | Algorithm | jca/Hash.java:192:43:192:47 | HashAlgorithm |
+| jca/Hash.java:195:27:195:57 | HashOperation | Digest | jca/Hash.java:195:27:195:57 | Digest |
+| jca/Hash.java:195:27:195:57 | HashOperation | Message | jca/Hash.java:195:41:195:56 | Message |
+| jca/Hash.java:195:41:195:56 | Message | Source | jca/Hash.java:190:43:190:54 | Parameter |
+| jca/Hash.java:212:32:212:41 | HMACAlgorithm | H | jca/Hash.java:212:32:212:41 | HashAlgorithm |
+| jca/Hash.java:212:32:212:41 | HMACAlgorithm | H | jca/Hash.java:212:44:212:55 | HashAlgorithm |
+| jca/Hash.java:212:32:212:41 | HMACAlgorithm | H | jca/Hash.java:212:58:212:69 | HashAlgorithm |
+| jca/Hash.java:212:32:212:41 | HMACAlgorithm | H | jca/Hash.java:212:72:212:83 | HashAlgorithm |
+| jca/Hash.java:212:32:212:41 | HMACAlgorithm | H | jca/Hash.java:212:86:212:99 | HashAlgorithm |
+| jca/Hash.java:212:32:212:41 | HMACAlgorithm | H | jca/Hash.java:212:102:212:115 | HashAlgorithm |
+| jca/Hash.java:212:44:212:55 | HMACAlgorithm | H | jca/Hash.java:212:32:212:41 | HashAlgorithm |
+| jca/Hash.java:212:44:212:55 | HMACAlgorithm | H | jca/Hash.java:212:44:212:55 | HashAlgorithm |
+| jca/Hash.java:212:44:212:55 | HMACAlgorithm | H | jca/Hash.java:212:58:212:69 | HashAlgorithm |
+| jca/Hash.java:212:44:212:55 | HMACAlgorithm | H | jca/Hash.java:212:72:212:83 | HashAlgorithm |
+| jca/Hash.java:212:44:212:55 | HMACAlgorithm | H | jca/Hash.java:212:86:212:99 | HashAlgorithm |
+| jca/Hash.java:212:44:212:55 | HMACAlgorithm | H | jca/Hash.java:212:102:212:115 | HashAlgorithm |
+| jca/Hash.java:212:58:212:69 | HMACAlgorithm | H | jca/Hash.java:212:32:212:41 | HashAlgorithm |
+| jca/Hash.java:212:58:212:69 | HMACAlgorithm | H | jca/Hash.java:212:44:212:55 | HashAlgorithm |
+| jca/Hash.java:212:58:212:69 | HMACAlgorithm | H | jca/Hash.java:212:58:212:69 | HashAlgorithm |
+| jca/Hash.java:212:58:212:69 | HMACAlgorithm | H | jca/Hash.java:212:72:212:83 | HashAlgorithm |
+| jca/Hash.java:212:58:212:69 | HMACAlgorithm | H | jca/Hash.java:212:86:212:99 | HashAlgorithm |
+| jca/Hash.java:212:58:212:69 | HMACAlgorithm | H | jca/Hash.java:212:102:212:115 | HashAlgorithm |
+| jca/Hash.java:212:72:212:83 | HMACAlgorithm | H | jca/Hash.java:212:32:212:41 | HashAlgorithm |
+| jca/Hash.java:212:72:212:83 | HMACAlgorithm | H | jca/Hash.java:212:44:212:55 | HashAlgorithm |
+| jca/Hash.java:212:72:212:83 | HMACAlgorithm | H | jca/Hash.java:212:58:212:69 | HashAlgorithm |
+| jca/Hash.java:212:72:212:83 | HMACAlgorithm | H | jca/Hash.java:212:72:212:83 | HashAlgorithm |
+| jca/Hash.java:212:72:212:83 | HMACAlgorithm | H | jca/Hash.java:212:86:212:99 | HashAlgorithm |
+| jca/Hash.java:212:72:212:83 | HMACAlgorithm | H | jca/Hash.java:212:102:212:115 | HashAlgorithm |
+| jca/Hash.java:212:86:212:99 | HMACAlgorithm | H | jca/Hash.java:212:32:212:41 | HashAlgorithm |
+| jca/Hash.java:212:86:212:99 | HMACAlgorithm | H | jca/Hash.java:212:44:212:55 | HashAlgorithm |
+| jca/Hash.java:212:86:212:99 | HMACAlgorithm | H | jca/Hash.java:212:58:212:69 | HashAlgorithm |
+| jca/Hash.java:212:86:212:99 | HMACAlgorithm | H | jca/Hash.java:212:72:212:83 | HashAlgorithm |
+| jca/Hash.java:212:86:212:99 | HMACAlgorithm | H | jca/Hash.java:212:86:212:99 | HashAlgorithm |
+| jca/Hash.java:212:86:212:99 | HMACAlgorithm | H | jca/Hash.java:212:102:212:115 | HashAlgorithm |
+| jca/Hash.java:212:102:212:115 | HMACAlgorithm | H | jca/Hash.java:212:32:212:41 | HashAlgorithm |
+| jca/Hash.java:212:102:212:115 | HMACAlgorithm | H | jca/Hash.java:212:44:212:55 | HashAlgorithm |
+| jca/Hash.java:212:102:212:115 | HMACAlgorithm | H | jca/Hash.java:212:58:212:69 | HashAlgorithm |
+| jca/Hash.java:212:102:212:115 | HMACAlgorithm | H | jca/Hash.java:212:72:212:83 | HashAlgorithm |
+| jca/Hash.java:212:102:212:115 | HMACAlgorithm | H | jca/Hash.java:212:86:212:99 | HashAlgorithm |
+| jca/Hash.java:212:102:212:115 | HMACAlgorithm | H | jca/Hash.java:212:102:212:115 | HashAlgorithm |
+| jca/Hash.java:216:22:216:30 | Key | Source | jca/Hash.java:211:57:211:66 | Parameter |
+| jca/Hash.java:217:27:217:55 | MACOperation | Algorithm | jca/Hash.java:212:31:212:116 | Constant |
+| jca/Hash.java:217:27:217:55 | MACOperation | Algorithm | jca/Hash.java:212:32:212:41 | HMACAlgorithm |
+| jca/Hash.java:217:27:217:55 | MACOperation | Algorithm | jca/Hash.java:212:44:212:55 | HMACAlgorithm |
+| jca/Hash.java:217:27:217:55 | MACOperation | Algorithm | jca/Hash.java:212:58:212:69 | HMACAlgorithm |
+| jca/Hash.java:217:27:217:55 | MACOperation | Algorithm | jca/Hash.java:212:72:212:83 | HMACAlgorithm |
+| jca/Hash.java:217:27:217:55 | MACOperation | Algorithm | jca/Hash.java:212:86:212:99 | HMACAlgorithm |
+| jca/Hash.java:217:27:217:55 | MACOperation | Algorithm | jca/Hash.java:212:102:212:115 | HMACAlgorithm |
+| jca/Hash.java:217:27:217:55 | MACOperation | HashAlgorithm | jca/Hash.java:212:32:212:41 | HashAlgorithm |
+| jca/Hash.java:217:27:217:55 | MACOperation | HashAlgorithm | jca/Hash.java:212:44:212:55 | HashAlgorithm |
+| jca/Hash.java:217:27:217:55 | MACOperation | HashAlgorithm | jca/Hash.java:212:58:212:69 | HashAlgorithm |
+| jca/Hash.java:217:27:217:55 | MACOperation | HashAlgorithm | jca/Hash.java:212:72:212:83 | HashAlgorithm |
+| jca/Hash.java:217:27:217:55 | MACOperation | HashAlgorithm | jca/Hash.java:212:86:212:99 | HashAlgorithm |
+| jca/Hash.java:217:27:217:55 | MACOperation | HashAlgorithm | jca/Hash.java:212:102:212:115 | HashAlgorithm |
+| jca/Hash.java:217:27:217:55 | MACOperation | Input | jca/Hash.java:217:39:217:54 | Message |
+| jca/Hash.java:217:27:217:55 | MACOperation | Key | jca/Hash.java:216:22:216:30 | Key |
+| jca/Hash.java:217:27:217:55 | MACOperation | Message | jca/Hash.java:217:39:217:54 | Message |
+| jca/Hash.java:217:27:217:55 | MACOperation | Nonce | jca/Hash.java:217:27:217:55 | MACOperation |
+| jca/Hash.java:217:27:217:55 | MACOperation | Output | jca/Hash.java:217:27:217:55 | KeyOperationOutput |
+| jca/Hash.java:217:39:217:54 | Message | Source | jca/Hash.java:211:43:211:54 | Parameter |
+| jca/Hash.java:235:42:235:63 | Message | Source | jca/Hash.java:232:40:232:54 | Parameter |
+| jca/Hash.java:235:66:235:69 | Salt | Source | jca/Hash.java:310:38:310:41 | RandomNumberGeneration |
+| jca/Hash.java:236:65:236:86 | HMACAlgorithm | H | jca/Hash.java:236:65:236:86 | HashAlgorithm |
+| jca/Hash.java:236:65:236:86 | KeyDerivationAlgorithm | PRF | jca/Hash.java:236:65:236:86 | HMACAlgorithm |
+| jca/Hash.java:237:23:237:50 | KeyDerivation | Algorithm | jca/Hash.java:236:65:236:86 | KeyDerivationAlgorithm |
+| jca/Hash.java:237:23:237:50 | KeyDerivation | Input | jca/Hash.java:235:42:235:63 | Message |
+| jca/Hash.java:237:23:237:50 | KeyDerivation | Output | jca/Hash.java:237:23:237:50 | Key |
+| jca/Hash.java:237:23:237:50 | KeyDerivation | Salt | jca/Hash.java:235:66:235:69 | Salt |
+| jca/Hash.java:252:23:252:70 | Digest | Source | jca/Hash.java:252:23:252:70 | Digest |
+| jca/Hash.java:252:23:252:70 | HashOperation | Algorithm | jca/Hash.java:294:16:294:66 | Constant |
+| jca/Hash.java:252:23:252:70 | HashOperation | Algorithm | jca/Hash.java:294:16:294:66 | LocalData |
+| jca/Hash.java:252:23:252:70 | HashOperation | Algorithm | jca/Hash.java:294:57:294:65 | HashAlgorithm |
+| jca/Hash.java:252:23:252:70 | HashOperation | Digest | jca/Hash.java:252:23:252:70 | Digest |
+| jca/Hash.java:252:23:252:70 | HashOperation | Message | jca/Hash.java:252:37:252:69 | Message |
+| jca/Hash.java:252:37:252:69 | Message | Source | jca/Hash.java:252:37:252:58 | Constant |
+| jca/Hash.java:270:27:270:30 | Message | Source | jca/Hash.java:269:27:269:38 | Constant |
+| jca/Hash.java:271:40:271:54 | Digest | Source | jca/Hash.java:271:40:271:54 | Digest |
+| jca/Hash.java:271:40:271:54 | HashOperation | Algorithm | jca/Hash.java:266:31:266:76 | Constant |
+| jca/Hash.java:271:40:271:54 | HashOperation | Algorithm | jca/Hash.java:266:32:266:40 | HashAlgorithm |
+| jca/Hash.java:271:40:271:54 | HashOperation | Algorithm | jca/Hash.java:266:43:266:51 | HashAlgorithm |
+| jca/Hash.java:271:40:271:54 | HashOperation | Algorithm | jca/Hash.java:266:54:266:63 | HashAlgorithm |
+| jca/Hash.java:271:40:271:54 | HashOperation | Algorithm | jca/Hash.java:266:66:266:75 | HashAlgorithm |
+| jca/Hash.java:271:40:271:54 | HashOperation | Digest | jca/Hash.java:271:40:271:54 | Digest |
+| jca/Hash.java:271:40:271:54 | HashOperation | Message | jca/Hash.java:270:27:270:30 | Message |
+| jca/IVArtifact.java:30:44:30:65 | KeyOperationAlgorithm | Mode | jca/IVArtifact.java:30:44:30:65 | ModeOfOperation |
+| jca/IVArtifact.java:30:44:30:65 | KeyOperationAlgorithm | Padding | jca/IVArtifact.java:30:44:30:65 | PaddingAlgorithm |
+| jca/IVArtifact.java:31:42:31:44 | Key | Source | jca/IVArtifact.java:76:16:76:35 | Key |
+| jca/IVArtifact.java:31:47:31:52 | Nonce | Source | jca/IVArtifact.java:81:38:81:39 | RandomNumberGeneration |
+| jca/IVArtifact.java:32:29:32:73 | EncryptOperation | Algorithm | jca/IVArtifact.java:30:44:30:65 | KeyOperationAlgorithm |
+| jca/IVArtifact.java:32:29:32:73 | EncryptOperation | Input | jca/IVArtifact.java:32:44:32:72 | Message |
+| jca/IVArtifact.java:32:29:32:73 | EncryptOperation | Key | jca/IVArtifact.java:31:42:31:44 | Key |
+| jca/IVArtifact.java:32:29:32:73 | EncryptOperation | Nonce | jca/IVArtifact.java:31:47:31:52 | Nonce |
+| jca/IVArtifact.java:32:29:32:73 | EncryptOperation | Output | jca/IVArtifact.java:32:29:32:73 | KeyOperationOutput |
+| jca/IVArtifact.java:32:44:32:72 | Message | Source | jca/IVArtifact.java:32:44:32:61 | Constant |
+| jca/IVArtifact.java:38:42:38:44 | Key | Source | jca/IVArtifact.java:76:16:76:35 | Key |
+| jca/IVArtifact.java:38:47:38:52 | Nonce | Source | jca/IVArtifact.java:81:38:81:39 | RandomNumberGeneration |
+| jca/IVArtifact.java:38:47:38:52 | Nonce | Source | jca/IVArtifact.java:87:32:87:33 | RandomNumberGeneration |
+| jca/IVArtifact.java:39:29:39:53 | EncryptOperation | Algorithm | jca/IVArtifact.java:70:16:70:81 | Constant |
+| jca/IVArtifact.java:39:29:39:53 | EncryptOperation | Algorithm | jca/IVArtifact.java:70:16:70:81 | LocalData |
+| jca/IVArtifact.java:39:29:39:53 | EncryptOperation | Algorithm | jca/IVArtifact.java:70:59:70:80 | KeyOperationAlgorithm |
+| jca/IVArtifact.java:39:29:39:53 | EncryptOperation | Input | jca/IVArtifact.java:39:44:39:52 | Message |
+| jca/IVArtifact.java:39:29:39:53 | EncryptOperation | Key | jca/IVArtifact.java:38:42:38:44 | Key |
+| jca/IVArtifact.java:39:29:39:53 | EncryptOperation | Nonce | jca/IVArtifact.java:38:47:38:52 | Nonce |
+| jca/IVArtifact.java:39:29:39:53 | EncryptOperation | Output | jca/IVArtifact.java:39:29:39:53 | KeyOperationOutput |
+| jca/IVArtifact.java:39:44:39:52 | Message | Source | jca/IVArtifact.java:49:27:49:42 | Constant |
+| jca/IVArtifact.java:70:59:70:80 | KeyOperationAlgorithm | Mode | jca/IVArtifact.java:70:59:70:80 | ModeOfOperation |
+| jca/IVArtifact.java:70:59:70:80 | KeyOperationAlgorithm | Padding | jca/IVArtifact.java:70:59:70:80 | PaddingAlgorithm |
+| jca/IVArtifact.java:76:16:76:35 | KeyGeneration | Algorithm | jca/IVArtifact.java:74:56:74:60 | KeyOperationAlgorithm |
+| jca/IVArtifact.java:76:16:76:35 | KeyGeneration | Output | jca/IVArtifact.java:76:16:76:35 | Key |
+| jca/IVArtifact.java:105:44:105:62 | KeyOperationAlgorithm | Mode | jca/IVArtifact.java:105:44:105:62 | ModeOfOperation |
+| jca/IVArtifact.java:105:44:105:62 | KeyOperationAlgorithm | Padding | jca/IVArtifact.java:105:44:105:62 | PaddingAlgorithm |
+| jca/IVArtifact.java:108:42:108:44 | Key | Source | jca/IVArtifact.java:255:29:255:44 | Key |
+| jca/IVArtifact.java:108:47:108:50 | Nonce | Source | jca/IVArtifact.java:108:47:108:50 | Nonce |
+| jca/IVArtifact.java:109:16:109:40 | EncryptOperation | Algorithm | jca/IVArtifact.java:105:44:105:62 | KeyOperationAlgorithm |
+| jca/IVArtifact.java:109:16:109:40 | EncryptOperation | Input | jca/IVArtifact.java:109:31:109:39 | Message |
+| jca/IVArtifact.java:109:16:109:40 | EncryptOperation | Key | jca/IVArtifact.java:108:42:108:44 | Key |
+| jca/IVArtifact.java:109:16:109:40 | EncryptOperation | Nonce | jca/IVArtifact.java:108:47:108:50 | Nonce |
+| jca/IVArtifact.java:109:16:109:40 | EncryptOperation | Output | jca/IVArtifact.java:109:16:109:40 | KeyOperationOutput |
+| jca/IVArtifact.java:109:31:109:39 | Message | Source | jca/IVArtifact.java:256:32:256:47 | Constant |
+| jca/IVArtifact.java:132:44:132:62 | KeyOperationAlgorithm | Mode | jca/IVArtifact.java:132:44:132:62 | ModeOfOperation |
+| jca/IVArtifact.java:132:44:132:62 | KeyOperationAlgorithm | Padding | jca/IVArtifact.java:132:44:132:62 | PaddingAlgorithm |
+| jca/IVArtifact.java:134:42:134:44 | Key | Source | jca/IVArtifact.java:255:29:255:44 | Key |
+| jca/IVArtifact.java:134:47:134:50 | Nonce | Source | jca/IVArtifact.java:116:31:116:34 | Constant |
+| jca/IVArtifact.java:134:47:134:50 | Nonce | Source | jca/IVArtifact.java:130:42:130:49 | RandomNumberGeneration |
+| jca/IVArtifact.java:135:16:135:40 | EncryptOperation | Algorithm | jca/IVArtifact.java:132:44:132:62 | KeyOperationAlgorithm |
+| jca/IVArtifact.java:135:16:135:40 | EncryptOperation | Input | jca/IVArtifact.java:135:31:135:39 | Message |
+| jca/IVArtifact.java:135:16:135:40 | EncryptOperation | Key | jca/IVArtifact.java:134:42:134:44 | Key |
+| jca/IVArtifact.java:135:16:135:40 | EncryptOperation | Nonce | jca/IVArtifact.java:134:47:134:50 | Nonce |
+| jca/IVArtifact.java:135:16:135:40 | EncryptOperation | Output | jca/IVArtifact.java:135:16:135:40 | KeyOperationOutput |
+| jca/IVArtifact.java:135:31:135:39 | Message | Source | jca/IVArtifact.java:256:32:256:47 | Constant |
+| jca/IVArtifact.java:154:31:154:78 | Digest | Source | jca/IVArtifact.java:154:31:154:78 | Digest |
+| jca/IVArtifact.java:154:31:154:78 | HashOperation | Algorithm | jca/IVArtifact.java:153:58:153:66 | HashAlgorithm |
+| jca/IVArtifact.java:154:31:154:78 | HashOperation | Digest | jca/IVArtifact.java:154:31:154:78 | Digest |
+| jca/IVArtifact.java:154:31:154:78 | HashOperation | Message | jca/IVArtifact.java:154:45:154:77 | Message |
+| jca/IVArtifact.java:154:45:154:77 | Message | Source | jca/IVArtifact.java:154:45:154:59 | Constant |
+| jca/IVArtifact.java:156:44:156:62 | KeyOperationAlgorithm | Mode | jca/IVArtifact.java:156:44:156:62 | ModeOfOperation |
+| jca/IVArtifact.java:156:44:156:62 | KeyOperationAlgorithm | Padding | jca/IVArtifact.java:156:44:156:62 | PaddingAlgorithm |
+| jca/IVArtifact.java:158:42:158:44 | Key | Source | jca/IVArtifact.java:255:29:255:44 | Key |
+| jca/IVArtifact.java:158:47:158:50 | Nonce | Source | jca/IVArtifact.java:154:31:154:78 | Digest |
+| jca/IVArtifact.java:159:16:159:40 | EncryptOperation | Algorithm | jca/IVArtifact.java:156:44:156:62 | KeyOperationAlgorithm |
+| jca/IVArtifact.java:159:16:159:40 | EncryptOperation | Input | jca/IVArtifact.java:159:31:159:39 | Message |
+| jca/IVArtifact.java:159:16:159:40 | EncryptOperation | Key | jca/IVArtifact.java:158:42:158:44 | Key |
+| jca/IVArtifact.java:159:16:159:40 | EncryptOperation | Nonce | jca/IVArtifact.java:158:47:158:50 | Nonce |
+| jca/IVArtifact.java:159:16:159:40 | EncryptOperation | Output | jca/IVArtifact.java:159:16:159:40 | KeyOperationOutput |
+| jca/IVArtifact.java:159:31:159:39 | Message | Source | jca/IVArtifact.java:256:32:256:47 | Constant |
+| jca/IVArtifact.java:180:48:180:66 | KeyOperationAlgorithm | Mode | jca/IVArtifact.java:180:48:180:66 | ModeOfOperation |
+| jca/IVArtifact.java:180:48:180:66 | KeyOperationAlgorithm | Padding | jca/IVArtifact.java:180:48:180:66 | PaddingAlgorithm |
+| jca/IVArtifact.java:182:46:182:48 | Key | Source | jca/IVArtifact.java:255:29:255:44 | Key |
+| jca/IVArtifact.java:182:51:182:54 | Nonce | Source | jca/IVArtifact.java:177:38:177:39 | RandomNumberGeneration |
+| jca/IVArtifact.java:183:30:183:58 | EncryptOperation | Algorithm | jca/IVArtifact.java:180:48:180:66 | KeyOperationAlgorithm |
+| jca/IVArtifact.java:183:30:183:58 | EncryptOperation | Input | jca/IVArtifact.java:183:45:183:57 | Message |
+| jca/IVArtifact.java:183:30:183:58 | EncryptOperation | Key | jca/IVArtifact.java:182:46:182:48 | Key |
+| jca/IVArtifact.java:183:30:183:58 | EncryptOperation | Nonce | jca/IVArtifact.java:182:51:182:54 | Nonce |
+| jca/IVArtifact.java:183:30:183:58 | EncryptOperation | Output | jca/IVArtifact.java:183:30:183:58 | KeyOperationOutput |
+| jca/IVArtifact.java:183:45:183:57 | Message | Source | jca/IVArtifact.java:275:34:275:46 | Constant |
+| jca/IVArtifact.java:183:45:183:57 | Message | Source | jca/IVArtifact.java:275:60:275:72 | Constant |
+| jca/IVArtifact.java:183:45:183:57 | Message | Source | jca/IVArtifact.java:275:86:275:100 | Constant |
+| jca/IVArtifact.java:198:44:198:62 | KeyOperationAlgorithm | Mode | jca/IVArtifact.java:198:44:198:62 | ModeOfOperation |
+| jca/IVArtifact.java:198:44:198:62 | KeyOperationAlgorithm | Padding | jca/IVArtifact.java:198:44:198:62 | PaddingAlgorithm |
+| jca/IVArtifact.java:201:42:201:44 | Key | Source | jca/IVArtifact.java:215:53:215:65 | Parameter |
+| jca/IVArtifact.java:201:42:201:44 | Key | Source | jca/IVArtifact.java:235:60:235:72 | Parameter |
+| jca/IVArtifact.java:201:47:201:50 | Nonce | Source | jca/IVArtifact.java:201:47:201:50 | Nonce |
+| jca/IVArtifact.java:202:16:202:40 | EncryptOperation | Algorithm | jca/IVArtifact.java:198:44:198:62 | KeyOperationAlgorithm |
+| jca/IVArtifact.java:202:16:202:40 | EncryptOperation | Input | jca/IVArtifact.java:202:31:202:39 | Message |
+| jca/IVArtifact.java:202:16:202:40 | EncryptOperation | Key | jca/IVArtifact.java:201:42:201:44 | Key |
+| jca/IVArtifact.java:202:16:202:40 | EncryptOperation | Nonce | jca/IVArtifact.java:201:47:201:50 | Nonce |
+| jca/IVArtifact.java:202:16:202:40 | EncryptOperation | Output | jca/IVArtifact.java:202:16:202:40 | KeyOperationOutput |
+| jca/IVArtifact.java:202:31:202:39 | Message | Source | jca/IVArtifact.java:215:68:215:83 | Parameter |
+| jca/IVArtifact.java:202:31:202:39 | Message | Source | jca/IVArtifact.java:235:75:235:90 | Parameter |
+| jca/IVArtifact.java:255:29:255:44 | KeyGeneration | Algorithm | jca/IVArtifact.java:253:56:253:60 | KeyOperationAlgorithm |
+| jca/IVArtifact.java:255:29:255:44 | KeyGeneration | Output | jca/IVArtifact.java:255:29:255:44 | Key |
+| jca/KeyAgreementHybridCryptosystem.java:51:16:51:36 | Key | Algorithm | jca/KeyAgreementHybridCryptosystem.java:50:47:50:57 | EllipticCurve |
+| jca/KeyAgreementHybridCryptosystem.java:51:16:51:36 | KeyGeneration | Algorithm | jca/KeyAgreementHybridCryptosystem.java:50:47:50:57 | EllipticCurve |
+| jca/KeyAgreementHybridCryptosystem.java:51:16:51:36 | KeyGeneration | Output | jca/KeyAgreementHybridCryptosystem.java:51:16:51:36 | Key |
+| jca/KeyAgreementHybridCryptosystem.java:60:16:60:36 | Key | Algorithm | jca/KeyAgreementHybridCryptosystem.java:58:61:58:68 | KeyAgreementAlgorithm |
+| jca/KeyAgreementHybridCryptosystem.java:60:16:60:36 | KeyGeneration | Algorithm | jca/KeyAgreementHybridCryptosystem.java:58:61:58:68 | KeyAgreementAlgorithm |
+| jca/KeyAgreementHybridCryptosystem.java:60:16:60:36 | KeyGeneration | Output | jca/KeyAgreementHybridCryptosystem.java:60:16:60:36 | Key |
+| jca/KeyAgreementHybridCryptosystem.java:68:17:68:26 | Key | Source | jca/KeyAgreementHybridCryptosystem.java:51:16:51:36 | Key |
+| jca/KeyAgreementHybridCryptosystem.java:68:17:68:26 | Key | Source | jca/KeyAgreementHybridCryptosystem.java:60:16:60:36 | Key |
+| jca/KeyAgreementHybridCryptosystem.java:69:20:69:28 | Key | Source | jca/KeyAgreementHybridCryptosystem.java:51:16:51:36 | Key |
+| jca/KeyAgreementHybridCryptosystem.java:69:20:69:28 | Key | Source | jca/KeyAgreementHybridCryptosystem.java:60:16:60:36 | Key |
+| jca/KeyAgreementHybridCryptosystem.java:70:16:70:34 | KeyAgreementOperation | Algorithm | jca/KeyAgreementHybridCryptosystem.java:104:90:104:95 | KeyAgreementAlgorithm |
+| jca/KeyAgreementHybridCryptosystem.java:70:16:70:34 | KeyAgreementOperation | Algorithm | jca/KeyAgreementHybridCryptosystem.java:125:95:125:100 | KeyAgreementAlgorithm |
+| jca/KeyAgreementHybridCryptosystem.java:70:16:70:34 | KeyAgreementOperation | Algorithm | jca/KeyAgreementHybridCryptosystem.java:149:91:149:98 | KeyAgreementAlgorithm |
+| jca/KeyAgreementHybridCryptosystem.java:70:16:70:34 | KeyAgreementOperation | Algorithm | jca/KeyAgreementHybridCryptosystem.java:169:95:169:102 | KeyAgreementAlgorithm |
+| jca/KeyAgreementHybridCryptosystem.java:70:16:70:34 | KeyAgreementOperation | Output | jca/KeyAgreementHybridCryptosystem.java:70:16:70:34 | SharedSecret |
+| jca/KeyAgreementHybridCryptosystem.java:70:16:70:34 | KeyAgreementOperation | PeerKey | jca/KeyAgreementHybridCryptosystem.java:69:20:69:28 | Key |
+| jca/KeyAgreementHybridCryptosystem.java:70:16:70:34 | KeyAgreementOperation | ServerKey | jca/KeyAgreementHybridCryptosystem.java:68:17:68:26 | Key |
+| jca/KeyAgreementHybridCryptosystem.java:70:16:70:34 | SharedSecret | Source | jca/KeyAgreementHybridCryptosystem.java:70:16:70:34 | SharedSecret |
+| jca/KeyAgreementHybridCryptosystem.java:79:23:79:42 | Digest | Source | jca/KeyAgreementHybridCryptosystem.java:79:23:79:42 | Digest |
+| jca/KeyAgreementHybridCryptosystem.java:79:23:79:42 | HashOperation | Algorithm | jca/KeyAgreementHybridCryptosystem.java:78:58:78:66 | HashAlgorithm |
+| jca/KeyAgreementHybridCryptosystem.java:79:23:79:42 | HashOperation | Digest | jca/KeyAgreementHybridCryptosystem.java:79:23:79:42 | Digest |
+| jca/KeyAgreementHybridCryptosystem.java:79:23:79:42 | HashOperation | Message | jca/KeyAgreementHybridCryptosystem.java:79:37:79:41 | Message |
+| jca/KeyAgreementHybridCryptosystem.java:79:37:79:41 | Message | Source | jca/KeyAgreementHybridCryptosystem.java:70:16:70:34 | SharedSecret |
+| jca/KeyAgreementHybridCryptosystem.java:108:44:108:62 | KeyOperationAlgorithm | Mode | jca/KeyAgreementHybridCryptosystem.java:108:44:108:62 | ModeOfOperation |
+| jca/KeyAgreementHybridCryptosystem.java:108:44:108:62 | KeyOperationAlgorithm | Padding | jca/KeyAgreementHybridCryptosystem.java:108:44:108:62 | PaddingAlgorithm |
+| jca/KeyAgreementHybridCryptosystem.java:112:42:112:47 | Key | Source | jca/KeyAgreementHybridCryptosystem.java:112:42:112:47 | Key |
+| jca/KeyAgreementHybridCryptosystem.java:112:50:112:53 | Nonce | Source | jca/KeyAgreementHybridCryptosystem.java:110:38:110:39 | RandomNumberGeneration |
+| jca/KeyAgreementHybridCryptosystem.java:113:29:113:53 | EncryptOperation | Algorithm | jca/KeyAgreementHybridCryptosystem.java:108:44:108:62 | KeyOperationAlgorithm |
+| jca/KeyAgreementHybridCryptosystem.java:113:29:113:53 | EncryptOperation | Input | jca/KeyAgreementHybridCryptosystem.java:113:44:113:52 | Message |
+| jca/KeyAgreementHybridCryptosystem.java:113:29:113:53 | EncryptOperation | Key | jca/KeyAgreementHybridCryptosystem.java:112:42:112:47 | Key |
+| jca/KeyAgreementHybridCryptosystem.java:113:29:113:53 | EncryptOperation | Nonce | jca/KeyAgreementHybridCryptosystem.java:112:50:112:53 | Nonce |
+| jca/KeyAgreementHybridCryptosystem.java:113:29:113:53 | EncryptOperation | Output | jca/KeyAgreementHybridCryptosystem.java:113:29:113:53 | KeyOperationOutput |
+| jca/KeyAgreementHybridCryptosystem.java:113:44:113:52 | Message | Source | jca/KeyAgreementHybridCryptosystem.java:188:58:188:73 | Parameter |
+| jca/KeyAgreementHybridCryptosystem.java:130:44:130:62 | KeyOperationAlgorithm | Mode | jca/KeyAgreementHybridCryptosystem.java:130:44:130:62 | ModeOfOperation |
+| jca/KeyAgreementHybridCryptosystem.java:130:44:130:62 | KeyOperationAlgorithm | Padding | jca/KeyAgreementHybridCryptosystem.java:130:44:130:62 | PaddingAlgorithm |
+| jca/KeyAgreementHybridCryptosystem.java:132:42:132:47 | Key | Source | jca/KeyAgreementHybridCryptosystem.java:132:42:132:47 | Key |
+| jca/KeyAgreementHybridCryptosystem.java:132:50:132:53 | Nonce | Source | jca/KeyAgreementHybridCryptosystem.java:132:50:132:53 | Nonce |
+| jca/KeyAgreementHybridCryptosystem.java:133:29:133:53 | EncryptOperation | Algorithm | jca/KeyAgreementHybridCryptosystem.java:130:44:130:62 | KeyOperationAlgorithm |
+| jca/KeyAgreementHybridCryptosystem.java:133:29:133:53 | EncryptOperation | Input | jca/KeyAgreementHybridCryptosystem.java:133:44:133:52 | Message |
+| jca/KeyAgreementHybridCryptosystem.java:133:29:133:53 | EncryptOperation | Key | jca/KeyAgreementHybridCryptosystem.java:132:42:132:47 | Key |
+| jca/KeyAgreementHybridCryptosystem.java:133:29:133:53 | EncryptOperation | Nonce | jca/KeyAgreementHybridCryptosystem.java:132:50:132:53 | Nonce |
+| jca/KeyAgreementHybridCryptosystem.java:133:29:133:53 | EncryptOperation | Output | jca/KeyAgreementHybridCryptosystem.java:133:29:133:53 | KeyOperationOutput |
+| jca/KeyAgreementHybridCryptosystem.java:133:44:133:52 | Message | Source | jca/KeyAgreementHybridCryptosystem.java:188:58:188:73 | Parameter |
+| jca/KeyAgreementHybridCryptosystem.java:150:33:150:89 | Digest | Source | jca/KeyAgreementHybridCryptosystem.java:150:33:150:89 | Digest |
+| jca/KeyAgreementHybridCryptosystem.java:150:33:150:89 | HashOperation | Algorithm | jca/KeyAgreementHybridCryptosystem.java:150:59:150:67 | HashAlgorithm |
+| jca/KeyAgreementHybridCryptosystem.java:150:33:150:89 | HashOperation | Digest | jca/KeyAgreementHybridCryptosystem.java:150:33:150:89 | Digest |
+| jca/KeyAgreementHybridCryptosystem.java:150:33:150:89 | HashOperation | Message | jca/KeyAgreementHybridCryptosystem.java:150:77:150:88 | Message |
+| jca/KeyAgreementHybridCryptosystem.java:150:77:150:88 | Message | Source | jca/KeyAgreementHybridCryptosystem.java:70:16:70:34 | SharedSecret |
+| jca/KeyAgreementHybridCryptosystem.java:153:44:153:62 | KeyOperationAlgorithm | Mode | jca/KeyAgreementHybridCryptosystem.java:153:44:153:62 | KeyOperationAlgorithm |
+| jca/KeyAgreementHybridCryptosystem.java:153:44:153:62 | KeyOperationAlgorithm | Padding | jca/KeyAgreementHybridCryptosystem.java:153:44:153:62 | KeyOperationAlgorithm |
+| jca/KeyAgreementHybridCryptosystem.java:156:42:156:50 | Key | Source | jca/KeyAgreementHybridCryptosystem.java:150:33:150:89 | Digest |
+| jca/KeyAgreementHybridCryptosystem.java:156:53:156:78 | Nonce | Source | jca/KeyAgreementHybridCryptosystem.java:155:38:155:42 | RandomNumberGeneration |
+| jca/KeyAgreementHybridCryptosystem.java:157:29:157:53 | EncryptOperation | Algorithm | jca/KeyAgreementHybridCryptosystem.java:153:44:153:62 | KeyOperationAlgorithm |
+| jca/KeyAgreementHybridCryptosystem.java:157:29:157:53 | EncryptOperation | Input | jca/KeyAgreementHybridCryptosystem.java:157:44:157:52 | Message |
+| jca/KeyAgreementHybridCryptosystem.java:157:29:157:53 | EncryptOperation | Key | jca/KeyAgreementHybridCryptosystem.java:156:42:156:50 | Key |
+| jca/KeyAgreementHybridCryptosystem.java:157:29:157:53 | EncryptOperation | Nonce | jca/KeyAgreementHybridCryptosystem.java:156:53:156:78 | Nonce |
+| jca/KeyAgreementHybridCryptosystem.java:157:29:157:53 | EncryptOperation | Output | jca/KeyAgreementHybridCryptosystem.java:157:29:157:53 | KeyOperationOutput |
+| jca/KeyAgreementHybridCryptosystem.java:157:44:157:52 | Message | Source | jca/KeyAgreementHybridCryptosystem.java:188:58:188:73 | Parameter |
+| jca/KeyAgreementHybridCryptosystem.java:174:44:174:62 | KeyOperationAlgorithm | Mode | jca/KeyAgreementHybridCryptosystem.java:174:44:174:62 | KeyOperationAlgorithm |
+| jca/KeyAgreementHybridCryptosystem.java:174:44:174:62 | KeyOperationAlgorithm | Padding | jca/KeyAgreementHybridCryptosystem.java:174:44:174:62 | KeyOperationAlgorithm |
+| jca/KeyAgreementHybridCryptosystem.java:175:42:175:50 | Key | Source | jca/KeyAgreementHybridCryptosystem.java:175:42:175:50 | Key |
+| jca/KeyAgreementHybridCryptosystem.java:175:53:175:83 | Nonce | Source | jca/KeyAgreementHybridCryptosystem.java:175:53:175:83 | Nonce |
+| jca/KeyAgreementHybridCryptosystem.java:176:29:176:53 | EncryptOperation | Algorithm | jca/KeyAgreementHybridCryptosystem.java:174:44:174:62 | KeyOperationAlgorithm |
+| jca/KeyAgreementHybridCryptosystem.java:176:29:176:53 | EncryptOperation | Input | jca/KeyAgreementHybridCryptosystem.java:176:44:176:52 | Message |
+| jca/KeyAgreementHybridCryptosystem.java:176:29:176:53 | EncryptOperation | Key | jca/KeyAgreementHybridCryptosystem.java:175:42:175:50 | Key |
+| jca/KeyAgreementHybridCryptosystem.java:176:29:176:53 | EncryptOperation | Nonce | jca/KeyAgreementHybridCryptosystem.java:175:53:175:83 | Nonce |
+| jca/KeyAgreementHybridCryptosystem.java:176:29:176:53 | EncryptOperation | Output | jca/KeyAgreementHybridCryptosystem.java:176:29:176:53 | KeyOperationOutput |
+| jca/KeyAgreementHybridCryptosystem.java:176:44:176:52 | Message | Source | jca/KeyAgreementHybridCryptosystem.java:188:58:188:73 | Parameter |
+| jca/KeyAgreementHybridCryptosystem.java:215:42:215:66 | Message | Source | jca/KeyAgreementHybridCryptosystem.java:212:58:212:70 | Parameter |
+| jca/KeyAgreementHybridCryptosystem.java:215:69:215:72 | Salt | Source | jca/KeyAgreementHybridCryptosystem.java:269:38:269:41 | RandomNumberGeneration |
+| jca/KeyAgreementHybridCryptosystem.java:216:65:216:86 | HMACAlgorithm | H | jca/KeyAgreementHybridCryptosystem.java:216:65:216:86 | HashAlgorithm |
+| jca/KeyAgreementHybridCryptosystem.java:216:65:216:86 | KeyDerivationAlgorithm | PRF | jca/KeyAgreementHybridCryptosystem.java:216:65:216:86 | HMACAlgorithm |
+| jca/KeyAgreementHybridCryptosystem.java:217:26:217:53 | KeyDerivation | Algorithm | jca/KeyAgreementHybridCryptosystem.java:216:65:216:86 | KeyDerivationAlgorithm |
+| jca/KeyAgreementHybridCryptosystem.java:217:26:217:53 | KeyDerivation | Input | jca/KeyAgreementHybridCryptosystem.java:215:42:215:66 | Message |
+| jca/KeyAgreementHybridCryptosystem.java:217:26:217:53 | KeyDerivation | Output | jca/KeyAgreementHybridCryptosystem.java:217:26:217:53 | Key |
+| jca/KeyAgreementHybridCryptosystem.java:217:26:217:53 | KeyDerivation | Salt | jca/KeyAgreementHybridCryptosystem.java:215:69:215:72 | Salt |
+| jca/KeyAgreementHybridCryptosystem.java:223:44:223:62 | KeyOperationAlgorithm | Mode | jca/KeyAgreementHybridCryptosystem.java:223:44:223:62 | ModeOfOperation |
+| jca/KeyAgreementHybridCryptosystem.java:223:44:223:62 | KeyOperationAlgorithm | Padding | jca/KeyAgreementHybridCryptosystem.java:223:44:223:62 | PaddingAlgorithm |
+| jca/KeyAgreementHybridCryptosystem.java:227:42:227:54 | Key | Source | jca/KeyAgreementHybridCryptosystem.java:227:42:227:54 | Key |
+| jca/KeyAgreementHybridCryptosystem.java:227:57:227:63 | Nonce | Source | jca/KeyAgreementHybridCryptosystem.java:225:38:225:39 | RandomNumberGeneration |
+| jca/KeyAgreementHybridCryptosystem.java:228:29:228:53 | EncryptOperation | Algorithm | jca/KeyAgreementHybridCryptosystem.java:223:44:223:62 | KeyOperationAlgorithm |
+| jca/KeyAgreementHybridCryptosystem.java:228:29:228:53 | EncryptOperation | Input | jca/KeyAgreementHybridCryptosystem.java:228:44:228:52 | Message |
+| jca/KeyAgreementHybridCryptosystem.java:228:29:228:53 | EncryptOperation | Key | jca/KeyAgreementHybridCryptosystem.java:227:42:227:54 | Key |
+| jca/KeyAgreementHybridCryptosystem.java:228:29:228:53 | EncryptOperation | Nonce | jca/KeyAgreementHybridCryptosystem.java:227:57:227:63 | Nonce |
+| jca/KeyAgreementHybridCryptosystem.java:228:29:228:53 | EncryptOperation | Output | jca/KeyAgreementHybridCryptosystem.java:228:29:228:53 | KeyOperationOutput |
+| jca/KeyAgreementHybridCryptosystem.java:228:44:228:52 | Message | Source | jca/KeyAgreementHybridCryptosystem.java:212:73:212:88 | Parameter |
+| jca/KeyAgreementHybridCryptosystem.java:230:35:230:46 | HMACAlgorithm | H | jca/KeyAgreementHybridCryptosystem.java:230:35:230:46 | HashAlgorithm |
+| jca/KeyAgreementHybridCryptosystem.java:231:18:231:30 | Key | Source | jca/KeyAgreementHybridCryptosystem.java:231:18:231:30 | Key |
+| jca/KeyAgreementHybridCryptosystem.java:232:30:232:52 | MACOperation | Algorithm | jca/KeyAgreementHybridCryptosystem.java:230:35:230:46 | HMACAlgorithm |
+| jca/KeyAgreementHybridCryptosystem.java:232:30:232:52 | MACOperation | HashAlgorithm | jca/KeyAgreementHybridCryptosystem.java:230:35:230:46 | HashAlgorithm |
+| jca/KeyAgreementHybridCryptosystem.java:232:30:232:52 | MACOperation | Input | jca/KeyAgreementHybridCryptosystem.java:232:42:232:51 | Message |
+| jca/KeyAgreementHybridCryptosystem.java:232:30:232:52 | MACOperation | Key | jca/KeyAgreementHybridCryptosystem.java:231:18:231:30 | Key |
+| jca/KeyAgreementHybridCryptosystem.java:232:30:232:52 | MACOperation | Message | jca/KeyAgreementHybridCryptosystem.java:232:42:232:51 | Message |
+| jca/KeyAgreementHybridCryptosystem.java:232:30:232:52 | MACOperation | Nonce | jca/KeyAgreementHybridCryptosystem.java:232:30:232:52 | MACOperation |
+| jca/KeyAgreementHybridCryptosystem.java:232:30:232:52 | MACOperation | Output | jca/KeyAgreementHybridCryptosystem.java:232:30:232:52 | KeyOperationOutput |
+| jca/KeyAgreementHybridCryptosystem.java:232:42:232:51 | Message | Source | jca/KeyAgreementHybridCryptosystem.java:228:29:228:53 | KeyOperationOutput |
+| jca/KeyAgreementHybridCryptosystem.java:261:16:261:31 | KeyGeneration | Algorithm | jca/KeyAgreementHybridCryptosystem.java:259:52:259:56 | KeyOperationAlgorithm |
+| jca/KeyAgreementHybridCryptosystem.java:261:16:261:31 | KeyGeneration | Output | jca/KeyAgreementHybridCryptosystem.java:261:16:261:31 | Key |
+| jca/KeyArtifact.java:20:31:20:50 | KeyGeneration | Algorithm | jca/KeyArtifact.java:18:56:18:60 | KeyOperationAlgorithm |
+| jca/KeyArtifact.java:20:31:20:50 | KeyGeneration | Output | jca/KeyArtifact.java:20:31:20:50 | Key |
+| jca/KeyArtifact.java:25:30:25:49 | KeyGeneration | Algorithm | jca/KeyArtifact.java:23:43:23:47 | KeyOperationAlgorithm |
+| jca/KeyArtifact.java:25:30:25:49 | KeyGeneration | Output | jca/KeyArtifact.java:25:30:25:49 | Key |
+| jca/KeyArtifact.java:32:30:32:57 | Key | Algorithm | jca/KeyArtifact.java:30:68:30:72 | KeyOperationAlgorithm |
+| jca/KeyArtifact.java:32:30:32:57 | KeyGeneration | Algorithm | jca/KeyArtifact.java:30:68:30:72 | KeyOperationAlgorithm |
+| jca/KeyArtifact.java:32:30:32:57 | KeyGeneration | Output | jca/KeyArtifact.java:32:30:32:57 | Key |
+| jca/KeyArtifact.java:37:29:37:56 | Key | Algorithm | jca/KeyArtifact.java:35:51:35:55 | KeyOperationAlgorithm |
+| jca/KeyArtifact.java:37:29:37:56 | KeyGeneration | Algorithm | jca/KeyArtifact.java:35:51:35:55 | KeyOperationAlgorithm |
+| jca/KeyArtifact.java:37:29:37:56 | KeyGeneration | Output | jca/KeyArtifact.java:37:29:37:56 | Key |
+| jca/KeyArtifact.java:42:26:42:53 | Key | Algorithm | jca/KeyArtifact.java:42:26:42:53 | Key |
+| jca/KeyArtifact.java:42:26:42:53 | KeyGeneration | Algorithm | jca/KeyArtifact.java:42:26:42:53 | KeyGeneration |
+| jca/KeyArtifact.java:42:26:42:53 | KeyGeneration | Output | jca/KeyArtifact.java:42:26:42:53 | Key |
+| jca/KeyArtifact.java:66:32:66:51 | KeyGeneration | Algorithm | jca/KeyArtifact.java:62:28:62:73 | Constant |
+| jca/KeyArtifact.java:66:32:66:51 | KeyGeneration | Algorithm | jca/KeyArtifact.java:62:28:62:73 | LocalData |
+| jca/KeyArtifact.java:66:32:66:51 | KeyGeneration | Algorithm | jca/KeyArtifact.java:62:68:62:72 | KeyOperationAlgorithm |
+| jca/KeyArtifact.java:66:32:66:51 | KeyGeneration | Output | jca/KeyArtifact.java:66:32:66:51 | Key |
+| jca/KeyArtifact.java:73:16:73:43 | Key | Algorithm | jca/KeyArtifact.java:78:31:78:54 | Constant |
+| jca/KeyArtifact.java:73:16:73:43 | Key | Algorithm | jca/KeyArtifact.java:78:32:78:36 | KeyOperationAlgorithm |
+| jca/KeyArtifact.java:73:16:73:43 | Key | Algorithm | jca/KeyArtifact.java:78:45:78:53 | KeyOperationAlgorithm |
+| jca/KeyArtifact.java:73:16:73:43 | KeyGeneration | Algorithm | jca/KeyArtifact.java:78:31:78:54 | Constant |
+| jca/KeyArtifact.java:73:16:73:43 | KeyGeneration | Algorithm | jca/KeyArtifact.java:78:32:78:36 | KeyOperationAlgorithm |
+| jca/KeyArtifact.java:73:16:73:43 | KeyGeneration | Algorithm | jca/KeyArtifact.java:78:45:78:53 | KeyOperationAlgorithm |
+| jca/KeyArtifact.java:73:16:73:43 | KeyGeneration | Output | jca/KeyArtifact.java:73:16:73:43 | Key |
+| jca/KeyArtifact.java:78:45:78:53 | KeyOperationAlgorithm | Mode | jca/KeyArtifact.java:78:45:78:53 | KeyOperationAlgorithm |
+| jca/KeyArtifact.java:78:45:78:53 | KeyOperationAlgorithm | Padding | jca/KeyArtifact.java:78:45:78:53 | KeyOperationAlgorithm |
+| jca/KeyDerivation1.java:80:42:80:63 | Message | Source | jca/KeyDerivation1.java:78:39:78:53 | Parameter |
+| jca/KeyDerivation1.java:80:66:80:69 | Salt | Source | jca/KeyDerivation1.java:365:38:365:41 | RandomNumberGeneration |
+| jca/KeyDerivation1.java:81:65:81:86 | HMACAlgorithm | H | jca/KeyDerivation1.java:81:65:81:86 | HashAlgorithm |
+| jca/KeyDerivation1.java:81:65:81:86 | KeyDerivationAlgorithm | PRF | jca/KeyDerivation1.java:81:65:81:86 | HMACAlgorithm |
+| jca/KeyDerivation1.java:82:22:82:49 | KeyDerivation | Algorithm | jca/KeyDerivation1.java:81:65:81:86 | KeyDerivationAlgorithm |
+| jca/KeyDerivation1.java:82:22:82:49 | KeyDerivation | Input | jca/KeyDerivation1.java:80:42:80:63 | Message |
+| jca/KeyDerivation1.java:82:22:82:49 | KeyDerivation | Output | jca/KeyDerivation1.java:82:22:82:49 | Key |
+| jca/KeyDerivation1.java:82:22:82:49 | KeyDerivation | Salt | jca/KeyDerivation1.java:80:66:80:69 | Salt |
+| jca/KeyDerivation1.java:94:42:94:63 | Message | Source | jca/KeyDerivation1.java:92:36:92:50 | Parameter |
+| jca/KeyDerivation1.java:94:66:94:69 | Salt | Source | jca/KeyDerivation1.java:365:38:365:41 | RandomNumberGeneration |
+| jca/KeyDerivation1.java:95:65:95:86 | HMACAlgorithm | H | jca/KeyDerivation1.java:95:65:95:86 | HashAlgorithm |
+| jca/KeyDerivation1.java:95:65:95:86 | KeyDerivationAlgorithm | PRF | jca/KeyDerivation1.java:95:65:95:86 | HMACAlgorithm |
+| jca/KeyDerivation1.java:96:22:96:49 | KeyDerivation | Algorithm | jca/KeyDerivation1.java:95:65:95:86 | KeyDerivationAlgorithm |
+| jca/KeyDerivation1.java:96:22:96:49 | KeyDerivation | Input | jca/KeyDerivation1.java:94:42:94:63 | Message |
+| jca/KeyDerivation1.java:96:22:96:49 | KeyDerivation | Output | jca/KeyDerivation1.java:96:22:96:49 | Key |
+| jca/KeyDerivation1.java:96:22:96:49 | KeyDerivation | Salt | jca/KeyDerivation1.java:94:66:94:69 | Salt |
+| jca/KeyDerivation1.java:108:42:108:63 | Message | Source | jca/KeyDerivation1.java:106:37:106:51 | Parameter |
+| jca/KeyDerivation1.java:108:66:108:69 | Salt | Source | jca/KeyDerivation1.java:365:38:365:41 | RandomNumberGeneration |
+| jca/KeyDerivation1.java:109:65:109:86 | HMACAlgorithm | H | jca/KeyDerivation1.java:109:65:109:86 | HashAlgorithm |
+| jca/KeyDerivation1.java:109:65:109:86 | KeyDerivationAlgorithm | PRF | jca/KeyDerivation1.java:109:65:109:86 | HMACAlgorithm |
+| jca/KeyDerivation1.java:110:22:110:49 | KeyDerivation | Algorithm | jca/KeyDerivation1.java:109:65:109:86 | KeyDerivationAlgorithm |
+| jca/KeyDerivation1.java:110:22:110:49 | KeyDerivation | Input | jca/KeyDerivation1.java:108:42:108:63 | Message |
+| jca/KeyDerivation1.java:110:22:110:49 | KeyDerivation | Output | jca/KeyDerivation1.java:110:22:110:49 | Key |
+| jca/KeyDerivation1.java:110:22:110:49 | KeyDerivation | Salt | jca/KeyDerivation1.java:108:66:108:69 | Salt |
+| jca/KeyDerivation1.java:122:42:122:63 | Message | Source | jca/KeyDerivation1.java:120:32:120:46 | Parameter |
+| jca/KeyDerivation1.java:122:66:122:69 | Salt | Source | jca/KeyDerivation1.java:365:38:365:41 | RandomNumberGeneration |
+| jca/KeyDerivation1.java:123:65:123:84 | HMACAlgorithm | H | jca/KeyDerivation1.java:123:65:123:84 | HashAlgorithm |
+| jca/KeyDerivation1.java:123:65:123:84 | KeyDerivationAlgorithm | PRF | jca/KeyDerivation1.java:123:65:123:84 | HMACAlgorithm |
+| jca/KeyDerivation1.java:124:22:124:49 | KeyDerivation | Algorithm | jca/KeyDerivation1.java:123:65:123:84 | KeyDerivationAlgorithm |
+| jca/KeyDerivation1.java:124:22:124:49 | KeyDerivation | Input | jca/KeyDerivation1.java:122:42:122:63 | Message |
+| jca/KeyDerivation1.java:124:22:124:49 | KeyDerivation | Output | jca/KeyDerivation1.java:124:22:124:49 | Key |
+| jca/KeyDerivation1.java:124:22:124:49 | KeyDerivation | Salt | jca/KeyDerivation1.java:122:66:122:69 | Salt |
+| jca/KeyDerivation1.java:136:42:136:63 | Message | Source | jca/KeyDerivation1.java:134:34:134:48 | Parameter |
+| jca/KeyDerivation1.java:136:66:136:69 | Salt | Source | jca/KeyDerivation1.java:365:38:365:41 | RandomNumberGeneration |
+| jca/KeyDerivation1.java:137:65:137:86 | HMACAlgorithm | H | jca/KeyDerivation1.java:137:65:137:86 | HashAlgorithm |
+| jca/KeyDerivation1.java:137:65:137:86 | KeyDerivationAlgorithm | PRF | jca/KeyDerivation1.java:137:65:137:86 | HMACAlgorithm |
+| jca/KeyDerivation1.java:138:22:138:49 | KeyDerivation | Algorithm | jca/KeyDerivation1.java:137:65:137:86 | KeyDerivationAlgorithm |
+| jca/KeyDerivation1.java:138:22:138:49 | KeyDerivation | Input | jca/KeyDerivation1.java:136:42:136:63 | Message |
+| jca/KeyDerivation1.java:138:22:138:49 | KeyDerivation | Output | jca/KeyDerivation1.java:138:22:138:49 | Key |
+| jca/KeyDerivation1.java:138:22:138:49 | KeyDerivation | Salt | jca/KeyDerivation1.java:136:66:136:69 | Salt |
+| jca/KeyDerivation1.java:157:42:157:63 | Message | Source | jca/KeyDerivation1.java:154:28:154:42 | Parameter |
+| jca/KeyDerivation1.java:157:66:157:69 | Salt | Source | jca/KeyDerivation1.java:365:38:365:41 | RandomNumberGeneration |
+| jca/KeyDerivation1.java:159:22:159:49 | KeyDerivation | Algorithm | jca/KeyDerivation1.java:158:65:158:72 | Constant |
+| jca/KeyDerivation1.java:159:22:159:49 | KeyDerivation | Input | jca/KeyDerivation1.java:157:42:157:63 | Message |
+| jca/KeyDerivation1.java:159:22:159:49 | KeyDerivation | Output | jca/KeyDerivation1.java:159:22:159:49 | Key |
+| jca/KeyDerivation1.java:159:22:159:49 | KeyDerivation | Salt | jca/KeyDerivation1.java:157:66:157:69 | Salt |
+| jca/KeyDerivation1.java:172:42:172:63 | Message | Source | jca/KeyDerivation1.java:169:30:169:44 | Parameter |
+| jca/KeyDerivation1.java:172:66:172:69 | Salt | Source | jca/KeyDerivation1.java:365:38:365:41 | RandomNumberGeneration |
+| jca/KeyDerivation1.java:174:22:174:49 | KeyDerivation | Algorithm | jca/KeyDerivation1.java:173:65:173:72 | Constant |
+| jca/KeyDerivation1.java:174:22:174:49 | KeyDerivation | Input | jca/KeyDerivation1.java:172:42:172:63 | Message |
+| jca/KeyDerivation1.java:174:22:174:49 | KeyDerivation | Output | jca/KeyDerivation1.java:174:22:174:49 | Key |
+| jca/KeyDerivation1.java:174:22:174:49 | KeyDerivation | Salt | jca/KeyDerivation1.java:172:66:172:69 | Salt |
+| jca/KeyDerivation1.java:244:29:244:59 | Digest | Source | jca/KeyDerivation1.java:244:29:244:59 | Digest |
+| jca/KeyDerivation1.java:244:29:244:59 | HashOperation | Algorithm | jca/KeyDerivation1.java:243:58:243:66 | HashAlgorithm |
+| jca/KeyDerivation1.java:244:29:244:59 | HashOperation | Digest | jca/KeyDerivation1.java:244:29:244:59 | Digest |
+| jca/KeyDerivation1.java:244:29:244:59 | HashOperation | Message | jca/KeyDerivation1.java:244:43:244:58 | Message |
+| jca/KeyDerivation1.java:244:43:244:58 | Message | Source | jca/KeyDerivation1.java:242:45:242:56 | Parameter |
+| jca/KeyDerivation1.java:249:70:249:88 | KeyOperationAlgorithm | Mode | jca/KeyDerivation1.java:249:70:249:88 | ModeOfOperation |
+| jca/KeyDerivation1.java:249:70:249:88 | KeyOperationAlgorithm | Padding | jca/KeyDerivation1.java:249:70:249:88 | PaddingAlgorithm |
+| jca/KeyDerivation1.java:250:55:250:57 | Key | Source | jca/KeyDerivation1.java:244:29:244:59 | Digest |
+| jca/KeyDerivation1.java:251:29:251:74 | EncryptOperation | Algorithm | jca/KeyDerivation1.java:249:70:249:88 | KeyOperationAlgorithm |
+| jca/KeyDerivation1.java:251:29:251:74 | EncryptOperation | Input | jca/KeyDerivation1.java:251:44:251:73 | Message |
+| jca/KeyDerivation1.java:251:29:251:74 | EncryptOperation | Key | jca/KeyDerivation1.java:250:55:250:57 | Key |
+| jca/KeyDerivation1.java:251:29:251:74 | EncryptOperation | Nonce | jca/KeyDerivation1.java:251:29:251:74 | EncryptOperation |
+| jca/KeyDerivation1.java:251:29:251:74 | EncryptOperation | Output | jca/KeyDerivation1.java:251:29:251:74 | KeyOperationOutput |
+| jca/KeyDerivation1.java:251:44:251:73 | Message | Source | jca/KeyDerivation1.java:251:44:251:62 | Constant |
+| jca/KeyDerivation1.java:309:54:309:75 | HMACAlgorithm | H | jca/KeyDerivation1.java:309:54:309:75 | HashAlgorithm |
+| jca/KeyDerivation1.java:309:54:309:75 | KeyDerivationAlgorithm | PRF | jca/KeyDerivation1.java:309:54:309:75 | HMACAlgorithm |
+| jca/KeyDerivation1.java:314:42:314:63 | Message | Source | jca/KeyDerivation1.java:302:37:302:51 | Parameter |
+| jca/KeyDerivation1.java:314:66:314:69 | Salt | Source | jca/KeyDerivation1.java:365:38:365:41 | RandomNumberGeneration |
+| jca/KeyDerivation1.java:316:26:316:53 | KeyDerivation | Algorithm | jca/KeyDerivation1.java:309:25:309:76 | Constant |
+| jca/KeyDerivation1.java:316:26:316:53 | KeyDerivation | Algorithm | jca/KeyDerivation1.java:309:25:309:76 | LocalData |
+| jca/KeyDerivation1.java:316:26:316:53 | KeyDerivation | Algorithm | jca/KeyDerivation1.java:309:54:309:75 | KeyDerivationAlgorithm |
+| jca/KeyDerivation1.java:316:26:316:53 | KeyDerivation | Input | jca/KeyDerivation1.java:314:42:314:63 | Message |
+| jca/KeyDerivation1.java:316:26:316:53 | KeyDerivation | Output | jca/KeyDerivation1.java:316:26:316:53 | Key |
+| jca/KeyDerivation1.java:316:26:316:53 | KeyDerivation | Salt | jca/KeyDerivation1.java:314:66:314:69 | Salt |
+| jca/KeyDerivation1.java:333:42:333:63 | Message | Source | jca/KeyDerivation1.java:283:43:283:57 | Parameter |
+| jca/KeyDerivation1.java:333:66:333:69 | Salt | Source | jca/KeyDerivation1.java:365:38:365:41 | RandomNumberGeneration |
+| jca/KeyDerivation1.java:334:65:334:86 | HMACAlgorithm | H | jca/KeyDerivation1.java:334:65:334:86 | HashAlgorithm |
+| jca/KeyDerivation1.java:334:65:334:86 | KeyDerivationAlgorithm | PRF | jca/KeyDerivation1.java:334:65:334:86 | HMACAlgorithm |
+| jca/KeyDerivation1.java:335:16:335:43 | KeyDerivation | Algorithm | jca/KeyDerivation1.java:334:65:334:86 | KeyDerivationAlgorithm |
+| jca/KeyDerivation1.java:335:16:335:43 | KeyDerivation | Input | jca/KeyDerivation1.java:333:42:333:63 | Message |
+| jca/KeyDerivation1.java:335:16:335:43 | KeyDerivation | Output | jca/KeyDerivation1.java:335:16:335:43 | Key |
+| jca/KeyDerivation1.java:335:16:335:43 | KeyDerivation | Salt | jca/KeyDerivation1.java:333:66:333:69 | Salt |
+| jca/KeyDerivation1.java:345:36:345:47 | HMACAlgorithm | H | jca/KeyDerivation1.java:345:36:345:47 | HashAlgorithm |
+| jca/KeyDerivation1.java:347:19:347:27 | Key | Source | jca/KeyDerivation1.java:335:16:335:43 | Key |
+| jca/KeyDerivation1.java:347:19:347:27 | Key | Source | jca/KeyDerivation1.java:365:38:365:41 | RandomNumberGeneration |
+| jca/KeyDerivation1.java:348:22:348:38 | MACOperation | Algorithm | jca/KeyDerivation1.java:345:36:345:47 | HMACAlgorithm |
+| jca/KeyDerivation1.java:348:22:348:38 | MACOperation | HashAlgorithm | jca/KeyDerivation1.java:345:36:345:47 | HashAlgorithm |
+| jca/KeyDerivation1.java:348:22:348:38 | MACOperation | Input | jca/KeyDerivation1.java:348:35:348:37 | Message |
+| jca/KeyDerivation1.java:348:22:348:38 | MACOperation | Key | jca/KeyDerivation1.java:347:19:347:27 | Key |
+| jca/KeyDerivation1.java:348:22:348:38 | MACOperation | Message | jca/KeyDerivation1.java:348:35:348:37 | Message |
+| jca/KeyDerivation1.java:348:22:348:38 | MACOperation | Nonce | jca/KeyDerivation1.java:348:22:348:38 | MACOperation |
+| jca/KeyDerivation1.java:348:22:348:38 | MACOperation | Output | jca/KeyDerivation1.java:348:22:348:38 | KeyOperationOutput |
+| jca/KeyDerivation1.java:348:35:348:37 | Message | Source | jca/KeyDerivation1.java:269:32:269:41 | Parameter |
+| jca/KeyDerivation1.java:348:35:348:37 | Message | Source | jca/KeyDerivation1.java:283:60:283:78 | Parameter |
+| jca/KeyDerivation1.java:352:19:352:54 | Key | Source | jca/KeyDerivation1.java:348:22:348:38 | KeyOperationOutput |
+| jca/KeyDerivation1.java:353:22:353:62 | MACOperation | Algorithm | jca/KeyDerivation1.java:345:36:345:47 | HMACAlgorithm |
+| jca/KeyDerivation1.java:353:22:353:62 | MACOperation | HashAlgorithm | jca/KeyDerivation1.java:345:36:345:47 | HashAlgorithm |
+| jca/KeyDerivation1.java:353:22:353:62 | MACOperation | Input | jca/KeyDerivation1.java:353:35:353:61 | Message |
+| jca/KeyDerivation1.java:353:22:353:62 | MACOperation | Key | jca/KeyDerivation1.java:347:19:347:27 | Key |
+| jca/KeyDerivation1.java:353:22:353:62 | MACOperation | Key | jca/KeyDerivation1.java:352:19:352:54 | Key |
+| jca/KeyDerivation1.java:353:22:353:62 | MACOperation | Message | jca/KeyDerivation1.java:353:35:353:61 | Message |
+| jca/KeyDerivation1.java:353:22:353:62 | MACOperation | Nonce | jca/KeyDerivation1.java:353:22:353:62 | MACOperation |
+| jca/KeyDerivation1.java:353:22:353:62 | MACOperation | Output | jca/KeyDerivation1.java:353:22:353:62 | KeyOperationOutput |
+| jca/KeyDerivation1.java:353:35:353:61 | Message | Source | jca/KeyDerivation1.java:353:35:353:50 | Constant |
+| jca/KeyEncapsulation.java:62:28:62:47 | KeyGeneration | Algorithm | jca/KeyEncapsulation.java:60:56:60:60 | KeyOperationAlgorithm |
+| jca/KeyEncapsulation.java:62:28:62:47 | KeyGeneration | Output | jca/KeyEncapsulation.java:62:28:62:47 | Key |
+| jca/KeyEncapsulation.java:67:47:67:85 | KeyOperationAlgorithm | Mode | jca/KeyEncapsulation.java:67:47:67:85 | ModeOfOperation |
+| jca/KeyEncapsulation.java:67:47:67:85 | KeyOperationAlgorithm | Padding | jca/KeyEncapsulation.java:67:47:67:85 | PaddingAlgorithm |
+| jca/KeyEncapsulation.java:67:47:67:85 | PaddingAlgorithm | MD | jca/KeyEncapsulation.java:67:47:67:85 | HashAlgorithm |
+| jca/KeyEncapsulation.java:67:47:67:85 | PaddingAlgorithm | MGF1Hash | jca/KeyEncapsulation.java:67:47:67:85 | PaddingAlgorithm |
+| jca/KeyEncapsulation.java:68:45:68:50 | Key | Source | jca/KeyEncapsulation.java:209:25:209:48 | Key |
+| jca/KeyEncapsulation.java:69:29:69:66 | EncryptOperation | Algorithm | jca/KeyEncapsulation.java:67:47:67:85 | KeyOperationAlgorithm |
+| jca/KeyEncapsulation.java:69:29:69:66 | EncryptOperation | Input | jca/KeyEncapsulation.java:69:47:69:65 | Message |
+| jca/KeyEncapsulation.java:69:29:69:66 | EncryptOperation | Key | jca/KeyEncapsulation.java:68:45:68:50 | Key |
+| jca/KeyEncapsulation.java:69:29:69:66 | EncryptOperation | Nonce | jca/KeyEncapsulation.java:69:29:69:66 | EncryptOperation |
+| jca/KeyEncapsulation.java:69:29:69:66 | EncryptOperation | Output | jca/KeyEncapsulation.java:69:29:69:66 | KeyOperationOutput |
+| jca/KeyEncapsulation.java:69:47:69:65 | Message | Source | jca/KeyEncapsulation.java:62:28:62:47 | Key |
+| jca/KeyEncapsulation.java:73:47:73:65 | KeyOperationAlgorithm | Mode | jca/KeyEncapsulation.java:73:47:73:65 | ModeOfOperation |
+| jca/KeyEncapsulation.java:73:47:73:65 | KeyOperationAlgorithm | Padding | jca/KeyEncapsulation.java:73:47:73:65 | PaddingAlgorithm |
+| jca/KeyEncapsulation.java:77:45:77:50 | Key | Source | jca/KeyEncapsulation.java:62:28:62:47 | Key |
+| jca/KeyEncapsulation.java:77:53:77:59 | Nonce | Source | jca/KeyEncapsulation.java:75:38:75:39 | RandomNumberGeneration |
+| jca/KeyEncapsulation.java:78:29:78:80 | EncryptOperation | Algorithm | jca/KeyEncapsulation.java:73:47:73:65 | KeyOperationAlgorithm |
+| jca/KeyEncapsulation.java:78:29:78:80 | EncryptOperation | Input | jca/KeyEncapsulation.java:78:47:78:79 | Message |
+| jca/KeyEncapsulation.java:78:29:78:80 | EncryptOperation | Key | jca/KeyEncapsulation.java:77:45:77:50 | Key |
+| jca/KeyEncapsulation.java:78:29:78:80 | EncryptOperation | Nonce | jca/KeyEncapsulation.java:77:53:77:59 | Nonce |
+| jca/KeyEncapsulation.java:78:29:78:80 | EncryptOperation | Output | jca/KeyEncapsulation.java:78:29:78:80 | KeyOperationOutput |
+| jca/KeyEncapsulation.java:78:47:78:79 | Message | Source | jca/KeyEncapsulation.java:78:47:78:68 | Constant |
+| jca/KeyEncapsulation.java:92:47:92:85 | KeyOperationAlgorithm | Mode | jca/KeyEncapsulation.java:92:47:92:85 | ModeOfOperation |
+| jca/KeyEncapsulation.java:92:47:92:85 | KeyOperationAlgorithm | Padding | jca/KeyEncapsulation.java:92:47:92:85 | PaddingAlgorithm |
+| jca/KeyEncapsulation.java:92:47:92:85 | PaddingAlgorithm | MD | jca/KeyEncapsulation.java:92:47:92:85 | HashAlgorithm |
+| jca/KeyEncapsulation.java:92:47:92:85 | PaddingAlgorithm | MGF1Hash | jca/KeyEncapsulation.java:92:47:92:85 | PaddingAlgorithm |
+| jca/KeyEncapsulation.java:93:45:93:51 | Key | Source | jca/KeyEncapsulation.java:91:37:91:54 | Parameter |
+| jca/KeyEncapsulation.java:94:30:94:58 | DecryptOperation | Algorithm | jca/KeyEncapsulation.java:92:47:92:85 | KeyOperationAlgorithm |
+| jca/KeyEncapsulation.java:94:30:94:58 | DecryptOperation | Input | jca/KeyEncapsulation.java:94:48:94:57 | Message |
+| jca/KeyEncapsulation.java:94:30:94:58 | DecryptOperation | Key | jca/KeyEncapsulation.java:93:45:93:51 | Key |
+| jca/KeyEncapsulation.java:94:30:94:58 | DecryptOperation | Nonce | jca/KeyEncapsulation.java:94:30:94:58 | DecryptOperation |
+| jca/KeyEncapsulation.java:94:30:94:58 | DecryptOperation | Output | jca/KeyEncapsulation.java:94:30:94:58 | KeyOperationOutput |
+| jca/KeyEncapsulation.java:94:48:94:57 | Message | Source | jca/KeyEncapsulation.java:91:57:91:73 | Parameter |
+| jca/KeyEncapsulation.java:118:31:118:51 | Key | Algorithm | jca/KeyEncapsulation.java:117:47:117:57 | EllipticCurve |
+| jca/KeyEncapsulation.java:118:31:118:51 | KeyGeneration | Algorithm | jca/KeyEncapsulation.java:117:47:117:57 | EllipticCurve |
+| jca/KeyEncapsulation.java:118:31:118:51 | KeyGeneration | Output | jca/KeyEncapsulation.java:118:31:118:51 | Key |
+| jca/KeyEncapsulation.java:122:17:122:40 | Key | Source | jca/KeyEncapsulation.java:118:31:118:51 | Key |
+| jca/KeyEncapsulation.java:123:20:123:24 | Key | Source | jca/KeyEncapsulation.java:215:24:215:46 | Key |
+| jca/KeyEncapsulation.java:124:31:124:49 | KeyAgreementOperation | Algorithm | jca/KeyEncapsulation.java:121:52:121:57 | KeyAgreementAlgorithm |
+| jca/KeyEncapsulation.java:124:31:124:49 | KeyAgreementOperation | Output | jca/KeyEncapsulation.java:124:31:124:49 | SharedSecret |
+| jca/KeyEncapsulation.java:124:31:124:49 | KeyAgreementOperation | PeerKey | jca/KeyEncapsulation.java:123:20:123:24 | Key |
+| jca/KeyEncapsulation.java:124:31:124:49 | KeyAgreementOperation | ServerKey | jca/KeyEncapsulation.java:122:17:122:40 | Key |
+| jca/KeyEncapsulation.java:124:31:124:49 | SharedSecret | Source | jca/KeyEncapsulation.java:124:31:124:49 | SharedSecret |
+| jca/KeyEncapsulation.java:133:47:133:65 | KeyOperationAlgorithm | Mode | jca/KeyEncapsulation.java:133:47:133:65 | ModeOfOperation |
+| jca/KeyEncapsulation.java:133:47:133:65 | KeyOperationAlgorithm | Padding | jca/KeyEncapsulation.java:133:47:133:65 | PaddingAlgorithm |
+| jca/KeyEncapsulation.java:136:45:136:50 | Key | Source | jca/KeyEncapsulation.java:124:31:124:49 | SharedSecret |
+| jca/KeyEncapsulation.java:136:53:136:81 | Nonce | Source | jca/KeyEncapsulation.java:135:38:135:39 | RandomNumberGeneration |
+| jca/KeyEncapsulation.java:137:29:137:73 | EncryptOperation | Algorithm | jca/KeyEncapsulation.java:133:47:133:65 | KeyOperationAlgorithm |
+| jca/KeyEncapsulation.java:137:29:137:73 | EncryptOperation | Input | jca/KeyEncapsulation.java:137:47:137:72 | Message |
+| jca/KeyEncapsulation.java:137:29:137:73 | EncryptOperation | Key | jca/KeyEncapsulation.java:136:45:136:50 | Key |
+| jca/KeyEncapsulation.java:137:29:137:73 | EncryptOperation | Nonce | jca/KeyEncapsulation.java:136:53:136:81 | Nonce |
+| jca/KeyEncapsulation.java:137:29:137:73 | EncryptOperation | Output | jca/KeyEncapsulation.java:137:29:137:73 | KeyOperationOutput |
+| jca/KeyEncapsulation.java:137:47:137:72 | Message | Source | jca/KeyEncapsulation.java:137:47:137:61 | Constant |
+| jca/KeyEncapsulation.java:187:31:187:51 | Key | Algorithm | jca/KeyEncapsulation.java:186:47:186:57 | EllipticCurve |
+| jca/KeyEncapsulation.java:187:31:187:51 | KeyGeneration | Algorithm | jca/KeyEncapsulation.java:186:47:186:57 | EllipticCurve |
+| jca/KeyEncapsulation.java:187:31:187:51 | KeyGeneration | Output | jca/KeyEncapsulation.java:187:31:187:51 | Key |
+| jca/KeyEncapsulation.java:189:17:189:40 | Key | Source | jca/KeyEncapsulation.java:187:31:187:51 | Key |
+| jca/KeyEncapsulation.java:190:20:190:34 | Key | Source | jca/KeyEncapsulation.java:226:31:226:53 | Key |
+| jca/KeyEncapsulation.java:191:31:191:49 | KeyAgreementOperation | Algorithm | jca/KeyEncapsulation.java:188:52:188:57 | KeyAgreementAlgorithm |
+| jca/KeyEncapsulation.java:191:31:191:49 | KeyAgreementOperation | Output | jca/KeyEncapsulation.java:191:31:191:49 | SharedSecret |
+| jca/KeyEncapsulation.java:191:31:191:49 | KeyAgreementOperation | PeerKey | jca/KeyEncapsulation.java:190:20:190:34 | Key |
+| jca/KeyEncapsulation.java:191:31:191:49 | KeyAgreementOperation | ServerKey | jca/KeyEncapsulation.java:189:17:189:40 | Key |
+| jca/KeyEncapsulation.java:191:31:191:49 | SharedSecret | Source | jca/KeyEncapsulation.java:191:31:191:49 | SharedSecret |
+| jca/KeyEncapsulation.java:209:25:209:48 | Key | Algorithm | jca/KeyEncapsulation.java:207:64:207:68 | KeyOperationAlgorithm |
+| jca/KeyEncapsulation.java:209:25:209:48 | KeyGeneration | Algorithm | jca/KeyEncapsulation.java:207:64:207:68 | KeyOperationAlgorithm |
+| jca/KeyEncapsulation.java:209:25:209:48 | KeyGeneration | Output | jca/KeyEncapsulation.java:209:25:209:48 | Key |
+| jca/KeyEncapsulation.java:215:24:215:46 | Key | Algorithm | jca/KeyEncapsulation.java:214:49:214:59 | EllipticCurve |
+| jca/KeyEncapsulation.java:215:24:215:46 | KeyGeneration | Algorithm | jca/KeyEncapsulation.java:214:49:214:59 | EllipticCurve |
+| jca/KeyEncapsulation.java:215:24:215:46 | KeyGeneration | Output | jca/KeyEncapsulation.java:215:24:215:46 | Key |
+| jca/KeyEncapsulation.java:226:31:226:53 | Key | Algorithm | jca/KeyEncapsulation.java:214:49:214:59 | EllipticCurve |
+| jca/KeyEncapsulation.java:226:31:226:53 | KeyGeneration | Algorithm | jca/KeyEncapsulation.java:214:49:214:59 | EllipticCurve |
+| jca/KeyEncapsulation.java:226:31:226:53 | KeyGeneration | Output | jca/KeyEncapsulation.java:226:31:226:53 | Key |
+| jca/KeyExchange.java:54:16:54:38 | Key | Algorithm | jca/KeyExchange.java:52:63:52:66 | KeyAgreementAlgorithm |
+| jca/KeyExchange.java:54:16:54:38 | KeyGeneration | Algorithm | jca/KeyExchange.java:52:63:52:66 | KeyAgreementAlgorithm |
+| jca/KeyExchange.java:54:16:54:38 | KeyGeneration | Output | jca/KeyExchange.java:54:16:54:38 | Key |
+| jca/KeyExchange.java:70:16:70:38 | Key | Algorithm | jca/KeyExchange.java:67:63:67:66 | KeyAgreementAlgorithm |
+| jca/KeyExchange.java:70:16:70:38 | KeyGeneration | Algorithm | jca/KeyExchange.java:67:63:67:66 | KeyAgreementAlgorithm |
+| jca/KeyExchange.java:70:16:70:38 | KeyGeneration | Output | jca/KeyExchange.java:70:16:70:38 | Key |
+| jca/KeyExchange.java:85:16:85:38 | Key | Algorithm | jca/KeyExchange.java:83:63:83:66 | KeyAgreementAlgorithm |
+| jca/KeyExchange.java:85:16:85:38 | KeyGeneration | Algorithm | jca/KeyExchange.java:83:63:83:66 | KeyAgreementAlgorithm |
+| jca/KeyExchange.java:85:16:85:38 | KeyGeneration | Output | jca/KeyExchange.java:85:16:85:38 | Key |
+| jca/KeyExchange.java:100:17:100:26 | Key | Source | jca/KeyExchange.java:54:16:54:38 | Key |
+| jca/KeyExchange.java:100:17:100:26 | Key | Source | jca/KeyExchange.java:70:16:70:38 | Key |
+| jca/KeyExchange.java:100:17:100:26 | Key | Source | jca/KeyExchange.java:85:16:85:38 | Key |
+| jca/KeyExchange.java:101:20:101:28 | Key | Source | jca/KeyExchange.java:54:16:54:38 | Key |
+| jca/KeyExchange.java:101:20:101:28 | Key | Source | jca/KeyExchange.java:70:16:70:38 | Key |
+| jca/KeyExchange.java:101:20:101:28 | Key | Source | jca/KeyExchange.java:85:16:85:38 | Key |
+| jca/KeyExchange.java:102:16:102:34 | KeyAgreementOperation | Algorithm | jca/KeyExchange.java:99:52:99:55 | KeyAgreementAlgorithm |
+| jca/KeyExchange.java:102:16:102:34 | KeyAgreementOperation | Output | jca/KeyExchange.java:102:16:102:34 | SharedSecret |
+| jca/KeyExchange.java:102:16:102:34 | KeyAgreementOperation | PeerKey | jca/KeyExchange.java:101:20:101:28 | Key |
+| jca/KeyExchange.java:102:16:102:34 | KeyAgreementOperation | ServerKey | jca/KeyExchange.java:100:17:100:26 | Key |
+| jca/KeyExchange.java:102:16:102:34 | SharedSecret | Source | jca/KeyExchange.java:102:16:102:34 | SharedSecret |
+| jca/KeyExchange.java:122:16:122:38 | Key | Algorithm | jca/KeyExchange.java:121:49:121:59 | EllipticCurve |
+| jca/KeyExchange.java:122:16:122:38 | KeyGeneration | Algorithm | jca/KeyExchange.java:121:49:121:59 | EllipticCurve |
+| jca/KeyExchange.java:122:16:122:38 | KeyGeneration | Output | jca/KeyExchange.java:122:16:122:38 | Key |
+| jca/KeyExchange.java:137:17:137:26 | Key | Source | jca/KeyExchange.java:122:16:122:38 | Key |
+| jca/KeyExchange.java:138:20:138:28 | Key | Source | jca/KeyExchange.java:122:16:122:38 | Key |
+| jca/KeyExchange.java:139:16:139:34 | KeyAgreementOperation | Algorithm | jca/KeyExchange.java:136:52:136:57 | KeyAgreementAlgorithm |
+| jca/KeyExchange.java:139:16:139:34 | KeyAgreementOperation | Output | jca/KeyExchange.java:139:16:139:34 | SharedSecret |
+| jca/KeyExchange.java:139:16:139:34 | KeyAgreementOperation | PeerKey | jca/KeyExchange.java:138:20:138:28 | Key |
+| jca/KeyExchange.java:139:16:139:34 | KeyAgreementOperation | ServerKey | jca/KeyExchange.java:137:17:137:26 | Key |
+| jca/KeyExchange.java:139:16:139:34 | SharedSecret | Source | jca/KeyExchange.java:139:16:139:34 | SharedSecret |
+| jca/KeyExchange.java:159:16:159:36 | Key | Algorithm | jca/KeyExchange.java:156:61:156:68 | KeyAgreementAlgorithm |
+| jca/KeyExchange.java:159:16:159:36 | KeyGeneration | Algorithm | jca/KeyExchange.java:156:61:156:68 | KeyAgreementAlgorithm |
+| jca/KeyExchange.java:159:16:159:36 | KeyGeneration | Output | jca/KeyExchange.java:159:16:159:36 | Key |
+| jca/KeyExchange.java:174:17:174:26 | Key | Source | jca/KeyExchange.java:159:16:159:36 | Key |
+| jca/KeyExchange.java:175:20:175:28 | Key | Source | jca/KeyExchange.java:159:16:159:36 | Key |
+| jca/KeyExchange.java:176:16:176:34 | KeyAgreementOperation | Algorithm | jca/KeyExchange.java:173:52:173:59 | KeyAgreementAlgorithm |
+| jca/KeyExchange.java:176:16:176:34 | KeyAgreementOperation | Output | jca/KeyExchange.java:176:16:176:34 | SharedSecret |
+| jca/KeyExchange.java:176:16:176:34 | KeyAgreementOperation | PeerKey | jca/KeyExchange.java:175:20:175:28 | Key |
+| jca/KeyExchange.java:176:16:176:34 | KeyAgreementOperation | ServerKey | jca/KeyExchange.java:174:17:174:26 | Key |
+| jca/KeyExchange.java:176:16:176:34 | SharedSecret | Source | jca/KeyExchange.java:176:16:176:34 | SharedSecret |
+| jca/KeyExchange.java:196:16:196:36 | Key | Algorithm | jca/KeyExchange.java:193:61:193:66 | KeyAgreementAlgorithm |
+| jca/KeyExchange.java:196:16:196:36 | KeyGeneration | Algorithm | jca/KeyExchange.java:193:61:193:66 | KeyAgreementAlgorithm |
+| jca/KeyExchange.java:196:16:196:36 | KeyGeneration | Output | jca/KeyExchange.java:196:16:196:36 | Key |
+| jca/KeyExchange.java:211:17:211:26 | Key | Source | jca/KeyExchange.java:196:16:196:36 | Key |
+| jca/KeyExchange.java:212:20:212:28 | Key | Source | jca/KeyExchange.java:196:16:196:36 | Key |
+| jca/KeyExchange.java:213:16:213:34 | KeyAgreementOperation | Algorithm | jca/KeyExchange.java:210:52:210:57 | KeyAgreementAlgorithm |
+| jca/KeyExchange.java:213:16:213:34 | KeyAgreementOperation | Output | jca/KeyExchange.java:213:16:213:34 | SharedSecret |
+| jca/KeyExchange.java:213:16:213:34 | KeyAgreementOperation | PeerKey | jca/KeyExchange.java:212:20:212:28 | Key |
+| jca/KeyExchange.java:213:16:213:34 | KeyAgreementOperation | ServerKey | jca/KeyExchange.java:211:17:211:26 | Key |
+| jca/KeyExchange.java:213:16:213:34 | SharedSecret | Source | jca/KeyExchange.java:213:16:213:34 | SharedSecret |
+| jca/MACOperation.java:60:35:60:46 | HMACAlgorithm | H | jca/MACOperation.java:60:35:60:46 | HashAlgorithm |
+| jca/MACOperation.java:62:18:62:26 | Key | Source | jca/MACOperation.java:59:52:59:61 | Parameter |
+| jca/MACOperation.java:63:16:63:46 | MACOperation | Algorithm | jca/MACOperation.java:60:35:60:46 | HMACAlgorithm |
+| jca/MACOperation.java:63:16:63:46 | MACOperation | HashAlgorithm | jca/MACOperation.java:60:35:60:46 | HashAlgorithm |
+| jca/MACOperation.java:63:16:63:46 | MACOperation | Input | jca/MACOperation.java:63:28:63:45 | Message |
+| jca/MACOperation.java:63:16:63:46 | MACOperation | Key | jca/MACOperation.java:62:18:62:26 | Key |
+| jca/MACOperation.java:63:16:63:46 | MACOperation | Message | jca/MACOperation.java:63:28:63:45 | Message |
+| jca/MACOperation.java:63:16:63:46 | MACOperation | Nonce | jca/MACOperation.java:63:16:63:46 | MACOperation |
+| jca/MACOperation.java:63:16:63:46 | MACOperation | Output | jca/MACOperation.java:63:16:63:46 | KeyOperationOutput |
+| jca/MACOperation.java:63:28:63:45 | Message | Source | jca/MACOperation.java:59:36:59:49 | Parameter |
+| jca/MACOperation.java:71:35:71:48 | HMACAlgorithm | H | jca/MACOperation.java:71:35:71:48 | HashAlgorithm |
+| jca/MACOperation.java:73:18:73:26 | Key | Source | jca/MACOperation.java:70:50:70:59 | Parameter |
+| jca/MACOperation.java:74:16:74:46 | MACOperation | Algorithm | jca/MACOperation.java:71:35:71:48 | HMACAlgorithm |
+| jca/MACOperation.java:74:16:74:46 | MACOperation | HashAlgorithm | jca/MACOperation.java:71:35:71:48 | HashAlgorithm |
+| jca/MACOperation.java:74:16:74:46 | MACOperation | Input | jca/MACOperation.java:74:28:74:45 | Message |
+| jca/MACOperation.java:74:16:74:46 | MACOperation | Key | jca/MACOperation.java:73:18:73:26 | Key |
+| jca/MACOperation.java:74:16:74:46 | MACOperation | Message | jca/MACOperation.java:74:28:74:45 | Message |
+| jca/MACOperation.java:74:16:74:46 | MACOperation | Nonce | jca/MACOperation.java:74:16:74:46 | MACOperation |
+| jca/MACOperation.java:74:16:74:46 | MACOperation | Output | jca/MACOperation.java:74:16:74:46 | KeyOperationOutput |
+| jca/MACOperation.java:74:28:74:45 | Message | Source | jca/MACOperation.java:70:34:70:47 | Parameter |
+| jca/MACOperation.java:82:35:82:44 | KeyOperationAlgorithm | Mode | jca/MACOperation.java:82:35:82:44 | KeyOperationAlgorithm |
+| jca/MACOperation.java:82:35:82:44 | KeyOperationAlgorithm | Padding | jca/MACOperation.java:82:35:82:44 | KeyOperationAlgorithm |
+| jca/MACOperation.java:84:18:84:26 | Key | Source | jca/MACOperation.java:81:50:81:59 | Parameter |
+| jca/MACOperation.java:85:16:85:46 | MACOperation | Algorithm | jca/MACOperation.java:82:35:82:44 | KeyOperationAlgorithm |
+| jca/MACOperation.java:85:16:85:46 | MACOperation | HashAlgorithm | jca/MACOperation.java:85:16:85:46 | MACOperation |
+| jca/MACOperation.java:85:16:85:46 | MACOperation | Input | jca/MACOperation.java:85:28:85:45 | Message |
+| jca/MACOperation.java:85:16:85:46 | MACOperation | Key | jca/MACOperation.java:84:18:84:26 | Key |
+| jca/MACOperation.java:85:16:85:46 | MACOperation | Message | jca/MACOperation.java:85:28:85:45 | Message |
+| jca/MACOperation.java:85:16:85:46 | MACOperation | Nonce | jca/MACOperation.java:85:16:85:46 | MACOperation |
+| jca/MACOperation.java:85:16:85:46 | MACOperation | Output | jca/MACOperation.java:85:16:85:46 | KeyOperationOutput |
+| jca/MACOperation.java:85:28:85:45 | Message | Source | jca/MACOperation.java:81:34:81:47 | Parameter |
+| jca/MACOperation.java:94:35:94:40 | KeyOperationAlgorithm | Mode | jca/MACOperation.java:94:35:94:40 | KeyOperationAlgorithm |
+| jca/MACOperation.java:94:35:94:40 | KeyOperationAlgorithm | Padding | jca/MACOperation.java:94:35:94:40 | KeyOperationAlgorithm |
+| jca/MACOperation.java:98:18:98:26 | Key | Source | jca/MACOperation.java:92:46:92:55 | Parameter |
+| jca/MACOperation.java:99:16:99:46 | MACOperation | Algorithm | jca/MACOperation.java:94:35:94:40 | KeyOperationAlgorithm |
+| jca/MACOperation.java:99:16:99:46 | MACOperation | HashAlgorithm | jca/MACOperation.java:99:16:99:46 | MACOperation |
+| jca/MACOperation.java:99:16:99:46 | MACOperation | Input | jca/MACOperation.java:99:28:99:45 | Message |
+| jca/MACOperation.java:99:16:99:46 | MACOperation | Key | jca/MACOperation.java:98:18:98:26 | Key |
+| jca/MACOperation.java:99:16:99:46 | MACOperation | Message | jca/MACOperation.java:99:28:99:45 | Message |
+| jca/MACOperation.java:99:16:99:46 | MACOperation | Nonce | jca/MACOperation.java:99:16:99:46 | MACOperation |
+| jca/MACOperation.java:99:16:99:46 | MACOperation | Output | jca/MACOperation.java:99:16:99:46 | KeyOperationOutput |
+| jca/MACOperation.java:99:28:99:45 | Message | Source | jca/MACOperation.java:92:30:92:43 | Parameter |
+| jca/MACOperation.java:109:18:109:26 | Key | Source | jca/MACOperation.java:106:46:106:55 | Parameter |
+| jca/MACOperation.java:110:16:110:46 | MACOperation | Algorithm | jca/MACOperation.java:107:35:107:43 | Constant |
+| jca/MACOperation.java:110:16:110:46 | MACOperation | HashAlgorithm | jca/MACOperation.java:110:16:110:46 | MACOperation |
+| jca/MACOperation.java:110:16:110:46 | MACOperation | Input | jca/MACOperation.java:110:28:110:45 | Message |
+| jca/MACOperation.java:110:16:110:46 | MACOperation | Key | jca/MACOperation.java:109:18:109:26 | Key |
+| jca/MACOperation.java:110:16:110:46 | MACOperation | Message | jca/MACOperation.java:110:28:110:45 | Message |
+| jca/MACOperation.java:110:16:110:46 | MACOperation | Nonce | jca/MACOperation.java:110:16:110:46 | MACOperation |
+| jca/MACOperation.java:110:16:110:46 | MACOperation | Output | jca/MACOperation.java:110:16:110:46 | KeyOperationOutput |
+| jca/MACOperation.java:110:28:110:45 | Message | Source | jca/MACOperation.java:106:30:106:43 | Parameter |
+| jca/MACOperation.java:118:35:118:44 | HMACAlgorithm | H | jca/MACOperation.java:118:35:118:44 | HashAlgorithm |
+| jca/MACOperation.java:120:18:120:26 | Key | Source | jca/MACOperation.java:117:52:117:61 | Parameter |
+| jca/MACOperation.java:121:16:121:46 | MACOperation | Algorithm | jca/MACOperation.java:118:35:118:44 | HMACAlgorithm |
+| jca/MACOperation.java:121:16:121:46 | MACOperation | HashAlgorithm | jca/MACOperation.java:118:35:118:44 | HashAlgorithm |
+| jca/MACOperation.java:121:16:121:46 | MACOperation | Input | jca/MACOperation.java:121:28:121:45 | Message |
+| jca/MACOperation.java:121:16:121:46 | MACOperation | Key | jca/MACOperation.java:120:18:120:26 | Key |
+| jca/MACOperation.java:121:16:121:46 | MACOperation | Message | jca/MACOperation.java:121:28:121:45 | Message |
+| jca/MACOperation.java:121:16:121:46 | MACOperation | Nonce | jca/MACOperation.java:121:16:121:46 | MACOperation |
+| jca/MACOperation.java:121:16:121:46 | MACOperation | Output | jca/MACOperation.java:121:16:121:46 | KeyOperationOutput |
+| jca/MACOperation.java:121:28:121:45 | Message | Source | jca/MACOperation.java:117:36:117:49 | Parameter |
+| jca/MACOperation.java:136:44:136:62 | KeyOperationAlgorithm | Mode | jca/MACOperation.java:136:44:136:62 | ModeOfOperation |
+| jca/MACOperation.java:136:44:136:62 | KeyOperationAlgorithm | Padding | jca/MACOperation.java:136:44:136:62 | PaddingAlgorithm |
+| jca/MACOperation.java:137:42:137:44 | Key | Source | jca/MACOperation.java:133:34:133:49 | Parameter |
+| jca/MACOperation.java:138:32:138:74 | EncryptOperation | Algorithm | jca/MACOperation.java:136:44:136:62 | KeyOperationAlgorithm |
+| jca/MACOperation.java:138:32:138:74 | EncryptOperation | Input | jca/MACOperation.java:138:47:138:73 | Message |
+| jca/MACOperation.java:138:32:138:74 | EncryptOperation | Key | jca/MACOperation.java:137:42:137:44 | Key |
+| jca/MACOperation.java:138:32:138:74 | EncryptOperation | Nonce | jca/MACOperation.java:138:32:138:74 | EncryptOperation |
+| jca/MACOperation.java:138:32:138:74 | EncryptOperation | Output | jca/MACOperation.java:138:32:138:74 | KeyOperationOutput |
+| jca/MACOperation.java:138:47:138:73 | Message | Source | jca/MACOperation.java:138:47:138:62 | Constant |
+| jca/MACOperation.java:170:42:170:68 | Message | Source | jca/MACOperation.java:166:47:166:62 | Parameter |
+| jca/MACOperation.java:170:71:170:74 | Salt | Source | jca/MACOperation.java:246:38:246:41 | RandomNumberGeneration |
+| jca/MACOperation.java:171:65:171:86 | HMACAlgorithm | H | jca/MACOperation.java:171:65:171:86 | HashAlgorithm |
+| jca/MACOperation.java:171:65:171:86 | KeyDerivationAlgorithm | PRF | jca/MACOperation.java:171:65:171:86 | HMACAlgorithm |
+| jca/MACOperation.java:172:30:172:57 | KeyDerivation | Algorithm | jca/MACOperation.java:171:65:171:86 | KeyDerivationAlgorithm |
+| jca/MACOperation.java:172:30:172:57 | KeyDerivation | Input | jca/MACOperation.java:170:42:170:68 | Message |
+| jca/MACOperation.java:172:30:172:57 | KeyDerivation | Output | jca/MACOperation.java:172:30:172:57 | Key |
+| jca/MACOperation.java:172:30:172:57 | KeyDerivation | Salt | jca/MACOperation.java:170:71:170:74 | Salt |
+| jca/MACOperation.java:180:44:180:62 | KeyOperationAlgorithm | Mode | jca/MACOperation.java:180:44:180:62 | ModeOfOperation |
+| jca/MACOperation.java:180:44:180:62 | KeyOperationAlgorithm | Padding | jca/MACOperation.java:180:44:180:62 | PaddingAlgorithm |
+| jca/MACOperation.java:181:42:181:54 | Key | Source | jca/MACOperation.java:181:42:181:54 | Key |
+| jca/MACOperation.java:182:29:182:78 | EncryptOperation | Algorithm | jca/MACOperation.java:180:44:180:62 | KeyOperationAlgorithm |
+| jca/MACOperation.java:182:29:182:78 | EncryptOperation | Input | jca/MACOperation.java:182:44:182:77 | Message |
+| jca/MACOperation.java:182:29:182:78 | EncryptOperation | Key | jca/MACOperation.java:181:42:181:54 | Key |
+| jca/MACOperation.java:182:29:182:78 | EncryptOperation | Nonce | jca/MACOperation.java:182:29:182:78 | EncryptOperation |
+| jca/MACOperation.java:182:29:182:78 | EncryptOperation | Output | jca/MACOperation.java:182:29:182:78 | KeyOperationOutput |
+| jca/MACOperation.java:182:44:182:77 | Message | Source | jca/MACOperation.java:182:44:182:66 | Constant |
+| jca/MACOperation.java:185:35:185:46 | HMACAlgorithm | H | jca/MACOperation.java:185:35:185:46 | HashAlgorithm |
+| jca/MACOperation.java:186:18:186:30 | Key | Source | jca/MACOperation.java:186:18:186:30 | Key |
+| jca/MACOperation.java:187:30:187:52 | MACOperation | Algorithm | jca/MACOperation.java:185:35:185:46 | HMACAlgorithm |
+| jca/MACOperation.java:187:30:187:52 | MACOperation | HashAlgorithm | jca/MACOperation.java:185:35:185:46 | HashAlgorithm |
+| jca/MACOperation.java:187:30:187:52 | MACOperation | Input | jca/MACOperation.java:187:42:187:51 | Message |
+| jca/MACOperation.java:187:30:187:52 | MACOperation | Key | jca/MACOperation.java:186:18:186:30 | Key |
+| jca/MACOperation.java:187:30:187:52 | MACOperation | Message | jca/MACOperation.java:187:42:187:51 | Message |
+| jca/MACOperation.java:187:30:187:52 | MACOperation | Nonce | jca/MACOperation.java:187:30:187:52 | MACOperation |
+| jca/MACOperation.java:187:30:187:52 | MACOperation | Output | jca/MACOperation.java:187:30:187:52 | KeyOperationOutput |
+| jca/MACOperation.java:187:42:187:51 | Message | Source | jca/MACOperation.java:182:29:182:78 | KeyOperationOutput |
+| jca/MACOperation.java:216:44:216:62 | KeyOperationAlgorithm | Mode | jca/MACOperation.java:216:44:216:62 | ModeOfOperation |
+| jca/MACOperation.java:216:44:216:62 | KeyOperationAlgorithm | Padding | jca/MACOperation.java:216:44:216:62 | PaddingAlgorithm |
+| jca/MACOperation.java:218:42:218:44 | Key | Source | jca/MACOperation.java:234:16:234:35 | Key |
+| jca/MACOperation.java:219:32:219:51 | EncryptOperation | Algorithm | jca/MACOperation.java:216:44:216:62 | KeyOperationAlgorithm |
+| jca/MACOperation.java:219:32:219:51 | EncryptOperation | Input | jca/MACOperation.java:219:47:219:50 | Message |
+| jca/MACOperation.java:219:32:219:51 | EncryptOperation | Key | jca/MACOperation.java:218:42:218:44 | Key |
+| jca/MACOperation.java:219:32:219:51 | EncryptOperation | Nonce | jca/MACOperation.java:219:32:219:51 | EncryptOperation |
+| jca/MACOperation.java:219:32:219:51 | EncryptOperation | Output | jca/MACOperation.java:219:32:219:51 | KeyOperationOutput |
+| jca/MACOperation.java:219:47:219:50 | Message | Source | jca/MACOperation.java:150:36:150:51 | Parameter |
+| jca/MACOperation.java:234:16:234:35 | KeyGeneration | Algorithm | jca/MACOperation.java:232:56:232:60 | KeyOperationAlgorithm |
+| jca/MACOperation.java:234:16:234:35 | KeyGeneration | Output | jca/MACOperation.java:234:16:234:35 | Key |
+| jca/Nonce.java:24:35:24:46 | HMACAlgorithm | H | jca/Nonce.java:24:35:24:46 | HashAlgorithm |
+| jca/Nonce.java:25:18:25:20 | Key | Source | jca/Nonce.java:93:16:93:35 | Key |
+| jca/Nonce.java:26:20:26:24 | Message | Source | jca/Nonce.java:98:38:98:42 | RandomNumberGeneration |
+| jca/Nonce.java:27:28:27:69 | MACOperation | Algorithm | jca/Nonce.java:24:35:24:46 | HMACAlgorithm |
+| jca/Nonce.java:27:28:27:69 | MACOperation | HashAlgorithm | jca/Nonce.java:24:35:24:46 | HashAlgorithm |
+| jca/Nonce.java:27:28:27:69 | MACOperation | Input | jca/Nonce.java:26:20:26:24 | Message |
+| jca/Nonce.java:27:28:27:69 | MACOperation | Input | jca/Nonce.java:27:40:27:68 | Message |
+| jca/Nonce.java:27:28:27:69 | MACOperation | Key | jca/Nonce.java:25:18:25:20 | Key |
+| jca/Nonce.java:27:28:27:69 | MACOperation | Message | jca/Nonce.java:26:20:26:24 | Message |
+| jca/Nonce.java:27:28:27:69 | MACOperation | Message | jca/Nonce.java:27:40:27:68 | Message |
+| jca/Nonce.java:27:28:27:69 | MACOperation | Nonce | jca/Nonce.java:27:28:27:69 | MACOperation |
+| jca/Nonce.java:27:28:27:69 | MACOperation | Output | jca/Nonce.java:27:28:27:69 | KeyOperationOutput |
+| jca/Nonce.java:27:40:27:68 | Message | Source | jca/Nonce.java:27:40:27:57 | Constant |
+| jca/Nonce.java:37:35:37:46 | HMACAlgorithm | H | jca/Nonce.java:37:35:37:46 | HashAlgorithm |
+| jca/Nonce.java:38:18:38:20 | Key | Source | jca/Nonce.java:93:16:93:35 | Key |
+| jca/Nonce.java:39:20:39:24 | Message | Source | jca/Nonce.java:35:24:35:41 | Constant |
+| jca/Nonce.java:40:28:40:67 | MACOperation | Algorithm | jca/Nonce.java:37:35:37:46 | HMACAlgorithm |
+| jca/Nonce.java:40:28:40:67 | MACOperation | HashAlgorithm | jca/Nonce.java:37:35:37:46 | HashAlgorithm |
+| jca/Nonce.java:40:28:40:67 | MACOperation | Input | jca/Nonce.java:39:20:39:24 | Message |
+| jca/Nonce.java:40:28:40:67 | MACOperation | Input | jca/Nonce.java:40:40:40:66 | Message |
+| jca/Nonce.java:40:28:40:67 | MACOperation | Key | jca/Nonce.java:38:18:38:20 | Key |
+| jca/Nonce.java:40:28:40:67 | MACOperation | Message | jca/Nonce.java:39:20:39:24 | Message |
+| jca/Nonce.java:40:28:40:67 | MACOperation | Message | jca/Nonce.java:40:40:40:66 | Message |
+| jca/Nonce.java:40:28:40:67 | MACOperation | Nonce | jca/Nonce.java:40:28:40:67 | MACOperation |
+| jca/Nonce.java:40:28:40:67 | MACOperation | Output | jca/Nonce.java:40:28:40:67 | KeyOperationOutput |
+| jca/Nonce.java:40:40:40:66 | Message | Source | jca/Nonce.java:40:40:40:55 | Constant |
+| jca/Nonce.java:50:44:50:62 | KeyOperationAlgorithm | Mode | jca/Nonce.java:50:44:50:62 | ModeOfOperation |
+| jca/Nonce.java:50:44:50:62 | KeyOperationAlgorithm | Padding | jca/Nonce.java:50:44:50:62 | PaddingAlgorithm |
+| jca/Nonce.java:51:42:51:44 | Key | Source | jca/Nonce.java:47:39:47:51 | Parameter |
+| jca/Nonce.java:51:47:51:53 | Nonce | Source | jca/Nonce.java:112:16:112:33 | Constant |
+| jca/Nonce.java:52:29:52:53 | EncryptOperation | Algorithm | jca/Nonce.java:50:44:50:62 | KeyOperationAlgorithm |
+| jca/Nonce.java:52:29:52:53 | EncryptOperation | Input | jca/Nonce.java:52:44:52:52 | Message |
+| jca/Nonce.java:52:29:52:53 | EncryptOperation | Key | jca/Nonce.java:51:42:51:44 | Key |
+| jca/Nonce.java:52:29:52:53 | EncryptOperation | Nonce | jca/Nonce.java:51:47:51:53 | Nonce |
+| jca/Nonce.java:52:29:52:53 | EncryptOperation | Output | jca/Nonce.java:52:29:52:53 | KeyOperationOutput |
+| jca/Nonce.java:52:44:52:52 | Message | Source | jca/Nonce.java:47:54:47:69 | Parameter |
+| jca/Nonce.java:61:44:61:62 | KeyOperationAlgorithm | Mode | jca/Nonce.java:61:44:61:62 | ModeOfOperation |
+| jca/Nonce.java:61:44:61:62 | KeyOperationAlgorithm | Padding | jca/Nonce.java:61:44:61:62 | PaddingAlgorithm |
+| jca/Nonce.java:62:42:62:44 | Key | Source | jca/Nonce.java:58:37:58:49 | Parameter |
+| jca/Nonce.java:62:47:62:53 | Nonce | Source | jca/Nonce.java:98:38:98:42 | RandomNumberGeneration |
+| jca/Nonce.java:63:29:63:53 | EncryptOperation | Algorithm | jca/Nonce.java:61:44:61:62 | KeyOperationAlgorithm |
+| jca/Nonce.java:63:29:63:53 | EncryptOperation | Input | jca/Nonce.java:63:44:63:52 | Message |
+| jca/Nonce.java:63:29:63:53 | EncryptOperation | Key | jca/Nonce.java:62:42:62:44 | Key |
+| jca/Nonce.java:63:29:63:53 | EncryptOperation | Nonce | jca/Nonce.java:62:47:62:53 | Nonce |
+| jca/Nonce.java:63:29:63:53 | EncryptOperation | Output | jca/Nonce.java:63:29:63:53 | KeyOperationOutput |
+| jca/Nonce.java:63:44:63:52 | Message | Source | jca/Nonce.java:58:52:58:67 | Parameter |
+| jca/Nonce.java:70:53:70:64 | HMACAlgorithm | H | jca/Nonce.java:70:53:70:64 | HashAlgorithm |
+| jca/Nonce.java:78:18:78:20 | Key | Source | jca/Nonce.java:93:16:93:35 | Key |
+| jca/Nonce.java:79:20:79:24 | Message | Source | jca/Nonce.java:98:38:98:42 | RandomNumberGeneration |
+| jca/Nonce.java:79:20:79:24 | Message | Source | jca/Nonce.java:104:32:104:36 | RandomNumberGeneration |
+| jca/Nonce.java:80:28:80:67 | MACOperation | Algorithm | jca/Nonce.java:70:53:70:64 | HMACAlgorithm |
+| jca/Nonce.java:80:28:80:67 | MACOperation | HashAlgorithm | jca/Nonce.java:70:53:70:64 | HashAlgorithm |
+| jca/Nonce.java:80:28:80:67 | MACOperation | Input | jca/Nonce.java:79:20:79:24 | Message |
+| jca/Nonce.java:80:28:80:67 | MACOperation | Input | jca/Nonce.java:80:40:80:66 | Message |
+| jca/Nonce.java:80:28:80:67 | MACOperation | Key | jca/Nonce.java:78:18:78:20 | Key |
+| jca/Nonce.java:80:28:80:67 | MACOperation | Message | jca/Nonce.java:79:20:79:24 | Message |
+| jca/Nonce.java:80:28:80:67 | MACOperation | Message | jca/Nonce.java:80:40:80:66 | Message |
+| jca/Nonce.java:80:28:80:67 | MACOperation | Nonce | jca/Nonce.java:80:28:80:67 | MACOperation |
+| jca/Nonce.java:80:28:80:67 | MACOperation | Output | jca/Nonce.java:80:28:80:67 | KeyOperationOutput |
+| jca/Nonce.java:80:40:80:66 | Message | Source | jca/Nonce.java:80:40:80:55 | Constant |
+| jca/Nonce.java:93:16:93:35 | KeyGeneration | Algorithm | jca/Nonce.java:92:56:92:67 | Constant |
+| jca/Nonce.java:93:16:93:35 | KeyGeneration | Output | jca/Nonce.java:93:16:93:35 | Key |
+| jca/PrngTest.java:154:16:154:35 | KeyGeneration | Algorithm | jca/PrngTest.java:152:56:152:60 | KeyOperationAlgorithm |
+| jca/PrngTest.java:154:16:154:35 | KeyGeneration | Output | jca/PrngTest.java:154:16:154:35 | Key |
+| jca/SignEncryptCombinations.java:53:16:53:38 | Key | Algorithm | jca/SignEncryptCombinations.java:52:49:52:59 | EllipticCurve |
+| jca/SignEncryptCombinations.java:53:16:53:38 | KeyGeneration | Algorithm | jca/SignEncryptCombinations.java:52:49:52:59 | EllipticCurve |
+| jca/SignEncryptCombinations.java:53:16:53:38 | KeyGeneration | Output | jca/SignEncryptCombinations.java:53:16:53:38 | Key |
+| jca/SignEncryptCombinations.java:61:53:61:69 | KeyOperationAlgorithm | Mode | jca/SignEncryptCombinations.java:61:53:61:69 | KeyOperationAlgorithm |
+| jca/SignEncryptCombinations.java:61:53:61:69 | KeyOperationAlgorithm | Padding | jca/SignEncryptCombinations.java:61:53:61:69 | KeyOperationAlgorithm |
+| jca/SignEncryptCombinations.java:62:28:62:34 | Key | Source | jca/SignEncryptCombinations.java:53:16:53:38 | Key |
+| jca/SignEncryptCombinations.java:63:26:63:29 | Message | Source | jca/SignEncryptCombinations.java:94:26:94:27 | RandomNumberGeneration |
+| jca/SignEncryptCombinations.java:63:26:63:29 | Message | Source | jca/SignEncryptCombinations.java:97:29:97:53 | KeyOperationOutput |
+| jca/SignEncryptCombinations.java:63:26:63:29 | Message | Source | jca/SignEncryptCombinations.java:335:26:335:47 | Constant |
+| jca/SignEncryptCombinations.java:64:16:64:31 | SignOperation | Algorithm | jca/SignEncryptCombinations.java:61:53:61:69 | KeyOperationAlgorithm |
+| jca/SignEncryptCombinations.java:64:16:64:31 | SignOperation | HashAlgorithm | jca/SignEncryptCombinations.java:61:53:61:69 | HashAlgorithm |
+| jca/SignEncryptCombinations.java:64:16:64:31 | SignOperation | Input | jca/SignEncryptCombinations.java:63:26:63:29 | Message |
+| jca/SignEncryptCombinations.java:64:16:64:31 | SignOperation | Key | jca/SignEncryptCombinations.java:62:28:62:34 | Key |
+| jca/SignEncryptCombinations.java:64:16:64:31 | SignOperation | Output | jca/SignEncryptCombinations.java:64:16:64:31 | SignatureOutput |
+| jca/SignEncryptCombinations.java:68:53:68:69 | KeyOperationAlgorithm | Mode | jca/SignEncryptCombinations.java:68:53:68:69 | KeyOperationAlgorithm |
+| jca/SignEncryptCombinations.java:68:53:68:69 | KeyOperationAlgorithm | Padding | jca/SignEncryptCombinations.java:68:53:68:69 | KeyOperationAlgorithm |
+| jca/SignEncryptCombinations.java:69:30:69:35 | Key | Source | jca/SignEncryptCombinations.java:53:16:53:38 | Key |
+| jca/SignEncryptCombinations.java:70:26:70:29 | Message | Source | jca/SignEncryptCombinations.java:64:16:64:31 | SignatureOutput |
+| jca/SignEncryptCombinations.java:70:26:70:29 | Message | Source | jca/SignEncryptCombinations.java:94:26:94:27 | RandomNumberGeneration |
+| jca/SignEncryptCombinations.java:70:26:70:29 | Message | Source | jca/SignEncryptCombinations.java:97:29:97:53 | KeyOperationOutput |
+| jca/SignEncryptCombinations.java:70:26:70:29 | Message | Source | jca/SignEncryptCombinations.java:335:26:335:47 | Constant |
+| jca/SignEncryptCombinations.java:71:16:71:47 | VerifyOperation | Algorithm | jca/SignEncryptCombinations.java:68:53:68:69 | KeyOperationAlgorithm |
+| jca/SignEncryptCombinations.java:71:16:71:47 | VerifyOperation | HashAlgorithm | jca/SignEncryptCombinations.java:68:53:68:69 | HashAlgorithm |
+| jca/SignEncryptCombinations.java:71:16:71:47 | VerifyOperation | Input | jca/SignEncryptCombinations.java:70:26:70:29 | Message |
+| jca/SignEncryptCombinations.java:71:16:71:47 | VerifyOperation | Key | jca/SignEncryptCombinations.java:69:30:69:35 | Key |
+| jca/SignEncryptCombinations.java:71:16:71:47 | VerifyOperation | Signature | jca/SignEncryptCombinations.java:71:33:71:46 | SignatureInput |
+| jca/SignEncryptCombinations.java:71:33:71:46 | SignatureInput | Source | jca/SignEncryptCombinations.java:64:16:64:31 | SignatureOutput |
+| jca/SignEncryptCombinations.java:71:33:71:46 | SignatureInput | Source | jca/SignEncryptCombinations.java:94:26:94:27 | RandomNumberGeneration |
+| jca/SignEncryptCombinations.java:71:33:71:46 | SignatureInput | Source | jca/SignEncryptCombinations.java:97:29:97:53 | KeyOperationOutput |
+| jca/SignEncryptCombinations.java:71:33:71:46 | SignatureInput | Source | jca/SignEncryptCombinations.java:113:16:113:41 | KeyOperationOutput |
+| jca/SignEncryptCombinations.java:84:16:84:31 | KeyGeneration | Algorithm | jca/SignEncryptCombinations.java:82:52:82:56 | KeyOperationAlgorithm |
+| jca/SignEncryptCombinations.java:84:16:84:31 | KeyGeneration | Output | jca/SignEncryptCombinations.java:84:16:84:31 | Key |
+| jca/SignEncryptCombinations.java:92:44:92:62 | KeyOperationAlgorithm | Mode | jca/SignEncryptCombinations.java:92:44:92:62 | ModeOfOperation |
+| jca/SignEncryptCombinations.java:92:44:92:62 | KeyOperationAlgorithm | Padding | jca/SignEncryptCombinations.java:92:44:92:62 | PaddingAlgorithm |
+| jca/SignEncryptCombinations.java:96:42:96:44 | Key | Source | jca/SignEncryptCombinations.java:84:16:84:31 | Key |
+| jca/SignEncryptCombinations.java:96:47:96:50 | Nonce | Source | jca/SignEncryptCombinations.java:94:26:94:27 | RandomNumberGeneration |
+| jca/SignEncryptCombinations.java:97:29:97:53 | EncryptOperation | Algorithm | jca/SignEncryptCombinations.java:92:44:92:62 | KeyOperationAlgorithm |
+| jca/SignEncryptCombinations.java:97:29:97:53 | EncryptOperation | Input | jca/SignEncryptCombinations.java:97:44:97:52 | Message |
+| jca/SignEncryptCombinations.java:97:29:97:53 | EncryptOperation | Key | jca/SignEncryptCombinations.java:96:42:96:44 | Key |
+| jca/SignEncryptCombinations.java:97:29:97:53 | EncryptOperation | Nonce | jca/SignEncryptCombinations.java:96:47:96:50 | Nonce |
+| jca/SignEncryptCombinations.java:97:29:97:53 | EncryptOperation | Output | jca/SignEncryptCombinations.java:97:29:97:53 | KeyOperationOutput |
+| jca/SignEncryptCombinations.java:97:44:97:52 | Message | Source | jca/SignEncryptCombinations.java:64:16:64:31 | SignatureOutput |
+| jca/SignEncryptCombinations.java:97:44:97:52 | Message | Source | jca/SignEncryptCombinations.java:123:16:123:32 | KeyOperationOutput |
+| jca/SignEncryptCombinations.java:97:44:97:52 | Message | Source | jca/SignEncryptCombinations.java:335:26:335:47 | Constant |
+| jca/SignEncryptCombinations.java:111:44:111:62 | KeyOperationAlgorithm | Mode | jca/SignEncryptCombinations.java:111:44:111:62 | ModeOfOperation |
+| jca/SignEncryptCombinations.java:111:44:111:62 | KeyOperationAlgorithm | Padding | jca/SignEncryptCombinations.java:111:44:111:62 | PaddingAlgorithm |
+| jca/SignEncryptCombinations.java:112:42:112:44 | Key | Source | jca/SignEncryptCombinations.java:84:16:84:31 | Key |
+| jca/SignEncryptCombinations.java:112:47:112:75 | Nonce | Source | jca/SignEncryptCombinations.java:64:16:64:31 | SignatureOutput |
+| jca/SignEncryptCombinations.java:112:47:112:75 | Nonce | Source | jca/SignEncryptCombinations.java:94:26:94:27 | RandomNumberGeneration |
+| jca/SignEncryptCombinations.java:112:47:112:75 | Nonce | Source | jca/SignEncryptCombinations.java:97:29:97:53 | KeyOperationOutput |
+| jca/SignEncryptCombinations.java:112:47:112:75 | Nonce | Source | jca/SignEncryptCombinations.java:123:16:123:32 | KeyOperationOutput |
+| jca/SignEncryptCombinations.java:113:16:113:41 | DecryptOperation | Algorithm | jca/SignEncryptCombinations.java:111:44:111:62 | KeyOperationAlgorithm |
+| jca/SignEncryptCombinations.java:113:16:113:41 | DecryptOperation | Input | jca/SignEncryptCombinations.java:113:31:113:40 | Message |
+| jca/SignEncryptCombinations.java:113:16:113:41 | DecryptOperation | Key | jca/SignEncryptCombinations.java:112:42:112:44 | Key |
+| jca/SignEncryptCombinations.java:113:16:113:41 | DecryptOperation | Nonce | jca/SignEncryptCombinations.java:112:47:112:75 | Nonce |
+| jca/SignEncryptCombinations.java:113:16:113:41 | DecryptOperation | Output | jca/SignEncryptCombinations.java:113:16:113:41 | KeyOperationOutput |
+| jca/SignEncryptCombinations.java:113:31:113:40 | Message | Source | jca/SignEncryptCombinations.java:64:16:64:31 | SignatureOutput |
+| jca/SignEncryptCombinations.java:113:31:113:40 | Message | Source | jca/SignEncryptCombinations.java:94:26:94:27 | RandomNumberGeneration |
+| jca/SignEncryptCombinations.java:113:31:113:40 | Message | Source | jca/SignEncryptCombinations.java:97:29:97:53 | KeyOperationOutput |
+| jca/SignEncryptCombinations.java:113:31:113:40 | Message | Source | jca/SignEncryptCombinations.java:123:16:123:32 | KeyOperationOutput |
+| jca/SignEncryptCombinations.java:121:35:121:46 | HMACAlgorithm | H | jca/SignEncryptCombinations.java:121:35:121:46 | HashAlgorithm |
+| jca/SignEncryptCombinations.java:122:18:122:20 | Key | Source | jca/SignEncryptCombinations.java:84:16:84:31 | Key |
+| jca/SignEncryptCombinations.java:123:16:123:32 | MACOperation | Algorithm | jca/SignEncryptCombinations.java:121:35:121:46 | HMACAlgorithm |
+| jca/SignEncryptCombinations.java:123:16:123:32 | MACOperation | HashAlgorithm | jca/SignEncryptCombinations.java:121:35:121:46 | HashAlgorithm |
+| jca/SignEncryptCombinations.java:123:16:123:32 | MACOperation | Input | jca/SignEncryptCombinations.java:123:28:123:31 | Message |
+| jca/SignEncryptCombinations.java:123:16:123:32 | MACOperation | Key | jca/SignEncryptCombinations.java:122:18:122:20 | Key |
+| jca/SignEncryptCombinations.java:123:16:123:32 | MACOperation | Message | jca/SignEncryptCombinations.java:123:28:123:31 | Message |
+| jca/SignEncryptCombinations.java:123:16:123:32 | MACOperation | Nonce | jca/SignEncryptCombinations.java:123:16:123:32 | MACOperation |
+| jca/SignEncryptCombinations.java:123:16:123:32 | MACOperation | Output | jca/SignEncryptCombinations.java:123:16:123:32 | KeyOperationOutput |
+| jca/SignEncryptCombinations.java:123:28:123:31 | Message | Source | jca/SignEncryptCombinations.java:94:26:94:27 | RandomNumberGeneration |
+| jca/SignEncryptCombinations.java:123:28:123:31 | Message | Source | jca/SignEncryptCombinations.java:97:29:97:53 | KeyOperationOutput |
+| jca/SignEncryptCombinations.java:123:28:123:31 | Message | Source | jca/SignEncryptCombinations.java:113:16:113:41 | KeyOperationOutput |
+| jca/SignEncryptCombinations.java:123:28:123:31 | Message | Source | jca/SignEncryptCombinations.java:123:16:123:32 | KeyOperationOutput |
+| jca/SignEncryptCombinations.java:123:28:123:31 | Message | Source | jca/SignEncryptCombinations.java:335:26:335:47 | Constant |
+| jca/SignatureOperation.java:54:16:54:36 | Key | Algorithm | jca/SignatureOperation.java:52:61:52:65 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:54:16:54:36 | KeyGeneration | Algorithm | jca/SignatureOperation.java:52:61:52:65 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:54:16:54:36 | KeyGeneration | Output | jca/SignatureOperation.java:54:16:54:36 | Key |
+| jca/SignatureOperation.java:63:53:63:74 | KeyOperationAlgorithm | Mode | jca/SignatureOperation.java:63:53:63:74 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:63:53:63:74 | KeyOperationAlgorithm | Padding | jca/SignatureOperation.java:63:53:63:74 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:64:28:64:37 | Key | Source | jca/SignatureOperation.java:54:16:54:36 | Key |
+| jca/SignatureOperation.java:65:26:65:29 | Message | Source | jca/SignatureOperation.java:311:26:311:49 | Constant |
+| jca/SignatureOperation.java:66:16:66:31 | SignOperation | Algorithm | jca/SignatureOperation.java:63:53:63:74 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:66:16:66:31 | SignOperation | HashAlgorithm | jca/SignatureOperation.java:63:53:63:74 | HashAlgorithm |
+| jca/SignatureOperation.java:66:16:66:31 | SignOperation | Input | jca/SignatureOperation.java:65:26:65:29 | Message |
+| jca/SignatureOperation.java:66:16:66:31 | SignOperation | Key | jca/SignatureOperation.java:64:28:64:37 | Key |
+| jca/SignatureOperation.java:66:16:66:31 | SignOperation | Output | jca/SignatureOperation.java:66:16:66:31 | SignatureOutput |
+| jca/SignatureOperation.java:75:53:75:74 | KeyOperationAlgorithm | Mode | jca/SignatureOperation.java:75:53:75:74 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:75:53:75:74 | KeyOperationAlgorithm | Padding | jca/SignatureOperation.java:75:53:75:74 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:76:30:76:38 | Key | Source | jca/SignatureOperation.java:54:16:54:36 | Key |
+| jca/SignatureOperation.java:77:26:77:29 | Message | Source | jca/SignatureOperation.java:311:26:311:49 | Constant |
+| jca/SignatureOperation.java:78:16:78:41 | VerifyOperation | Algorithm | jca/SignatureOperation.java:75:53:75:74 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:78:16:78:41 | VerifyOperation | HashAlgorithm | jca/SignatureOperation.java:75:53:75:74 | HashAlgorithm |
+| jca/SignatureOperation.java:78:16:78:41 | VerifyOperation | Input | jca/SignatureOperation.java:77:26:77:29 | Message |
+| jca/SignatureOperation.java:78:16:78:41 | VerifyOperation | Key | jca/SignatureOperation.java:76:30:76:38 | Key |
+| jca/SignatureOperation.java:78:16:78:41 | VerifyOperation | Signature | jca/SignatureOperation.java:78:33:78:40 | SignatureInput |
+| jca/SignatureOperation.java:78:33:78:40 | SignatureInput | Source | jca/SignatureOperation.java:66:16:66:31 | SignatureOutput |
+| jca/SignatureOperation.java:94:16:94:38 | Key | Algorithm | jca/SignatureOperation.java:93:49:93:59 | EllipticCurve |
+| jca/SignatureOperation.java:94:16:94:38 | KeyGeneration | Algorithm | jca/SignatureOperation.java:93:49:93:59 | EllipticCurve |
+| jca/SignatureOperation.java:94:16:94:38 | KeyGeneration | Output | jca/SignatureOperation.java:94:16:94:38 | Key |
+| jca/SignatureOperation.java:103:53:103:69 | KeyOperationAlgorithm | Mode | jca/SignatureOperation.java:103:53:103:69 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:103:53:103:69 | KeyOperationAlgorithm | Padding | jca/SignatureOperation.java:103:53:103:69 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:104:28:104:37 | Key | Source | jca/SignatureOperation.java:94:16:94:38 | Key |
+| jca/SignatureOperation.java:105:26:105:29 | Message | Source | jca/SignatureOperation.java:231:26:231:44 | Constant |
+| jca/SignatureOperation.java:105:26:105:29 | Message | Source | jca/SignatureOperation.java:311:26:311:49 | Constant |
+| jca/SignatureOperation.java:106:16:106:31 | SignOperation | Algorithm | jca/SignatureOperation.java:103:53:103:69 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:106:16:106:31 | SignOperation | HashAlgorithm | jca/SignatureOperation.java:103:53:103:69 | HashAlgorithm |
+| jca/SignatureOperation.java:106:16:106:31 | SignOperation | Input | jca/SignatureOperation.java:105:26:105:29 | Message |
+| jca/SignatureOperation.java:106:16:106:31 | SignOperation | Key | jca/SignatureOperation.java:104:28:104:37 | Key |
+| jca/SignatureOperation.java:106:16:106:31 | SignOperation | Output | jca/SignatureOperation.java:106:16:106:31 | SignatureOutput |
+| jca/SignatureOperation.java:115:53:115:69 | KeyOperationAlgorithm | Mode | jca/SignatureOperation.java:115:53:115:69 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:115:53:115:69 | KeyOperationAlgorithm | Padding | jca/SignatureOperation.java:115:53:115:69 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:116:30:116:38 | Key | Source | jca/SignatureOperation.java:94:16:94:38 | Key |
+| jca/SignatureOperation.java:117:26:117:29 | Message | Source | jca/SignatureOperation.java:231:26:231:44 | Constant |
+| jca/SignatureOperation.java:117:26:117:29 | Message | Source | jca/SignatureOperation.java:311:26:311:49 | Constant |
+| jca/SignatureOperation.java:118:16:118:41 | VerifyOperation | Algorithm | jca/SignatureOperation.java:115:53:115:69 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:118:16:118:41 | VerifyOperation | HashAlgorithm | jca/SignatureOperation.java:115:53:115:69 | HashAlgorithm |
+| jca/SignatureOperation.java:118:16:118:41 | VerifyOperation | Input | jca/SignatureOperation.java:117:26:117:29 | Message |
+| jca/SignatureOperation.java:118:16:118:41 | VerifyOperation | Key | jca/SignatureOperation.java:116:30:116:38 | Key |
+| jca/SignatureOperation.java:118:16:118:41 | VerifyOperation | Signature | jca/SignatureOperation.java:118:33:118:40 | SignatureInput |
+| jca/SignatureOperation.java:118:33:118:40 | SignatureInput | Source | jca/SignatureOperation.java:106:16:106:31 | SignatureOutput |
+| jca/SignatureOperation.java:118:33:118:40 | SignatureInput | Source | jca/SignatureOperation.java:236:27:236:30 | Constant |
+| jca/SignatureOperation.java:132:61:132:69 | KeyOperationAlgorithm | Mode | jca/SignatureOperation.java:132:61:132:69 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:132:61:132:69 | KeyOperationAlgorithm | Padding | jca/SignatureOperation.java:132:61:132:69 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:133:16:133:36 | Key | Algorithm | jca/SignatureOperation.java:132:61:132:69 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:133:16:133:36 | KeyGeneration | Algorithm | jca/SignatureOperation.java:132:61:132:69 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:133:16:133:36 | KeyGeneration | Output | jca/SignatureOperation.java:133:16:133:36 | Key |
+| jca/SignatureOperation.java:142:53:142:61 | KeyOperationAlgorithm | Mode | jca/SignatureOperation.java:142:53:142:61 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:142:53:142:61 | KeyOperationAlgorithm | Padding | jca/SignatureOperation.java:142:53:142:61 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:143:28:143:37 | Key | Source | jca/SignatureOperation.java:133:16:133:36 | Key |
+| jca/SignatureOperation.java:144:26:144:29 | Message | Source | jca/SignatureOperation.java:311:26:311:49 | Constant |
+| jca/SignatureOperation.java:145:16:145:31 | SignOperation | Algorithm | jca/SignatureOperation.java:142:53:142:61 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:145:16:145:31 | SignOperation | HashAlgorithm | jca/SignatureOperation.java:145:16:145:31 | SignOperation |
+| jca/SignatureOperation.java:145:16:145:31 | SignOperation | Input | jca/SignatureOperation.java:144:26:144:29 | Message |
+| jca/SignatureOperation.java:145:16:145:31 | SignOperation | Key | jca/SignatureOperation.java:143:28:143:37 | Key |
+| jca/SignatureOperation.java:145:16:145:31 | SignOperation | Output | jca/SignatureOperation.java:145:16:145:31 | SignatureOutput |
+| jca/SignatureOperation.java:154:53:154:61 | KeyOperationAlgorithm | Mode | jca/SignatureOperation.java:154:53:154:61 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:154:53:154:61 | KeyOperationAlgorithm | Padding | jca/SignatureOperation.java:154:53:154:61 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:155:30:155:38 | Key | Source | jca/SignatureOperation.java:133:16:133:36 | Key |
+| jca/SignatureOperation.java:156:26:156:29 | Message | Source | jca/SignatureOperation.java:311:26:311:49 | Constant |
+| jca/SignatureOperation.java:157:16:157:41 | VerifyOperation | Algorithm | jca/SignatureOperation.java:154:53:154:61 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:157:16:157:41 | VerifyOperation | HashAlgorithm | jca/SignatureOperation.java:157:16:157:41 | VerifyOperation |
+| jca/SignatureOperation.java:157:16:157:41 | VerifyOperation | Input | jca/SignatureOperation.java:156:26:156:29 | Message |
+| jca/SignatureOperation.java:157:16:157:41 | VerifyOperation | Key | jca/SignatureOperation.java:155:30:155:38 | Key |
+| jca/SignatureOperation.java:157:16:157:41 | VerifyOperation | Signature | jca/SignatureOperation.java:157:33:157:40 | SignatureInput |
+| jca/SignatureOperation.java:157:33:157:40 | SignatureInput | Source | jca/SignatureOperation.java:145:16:145:31 | SignatureOutput |
+| jca/SignatureOperation.java:175:16:175:36 | Key | Algorithm | jca/SignatureOperation.java:173:61:173:65 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:175:16:175:36 | KeyGeneration | Algorithm | jca/SignatureOperation.java:173:61:173:65 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:175:16:175:36 | KeyGeneration | Output | jca/SignatureOperation.java:175:16:175:36 | Key |
+| jca/SignatureOperation.java:185:53:185:65 | KeyOperationAlgorithm | Mode | jca/SignatureOperation.java:185:53:185:65 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:185:53:185:65 | KeyOperationAlgorithm | Padding | jca/SignatureOperation.java:185:53:185:65 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:186:28:186:37 | Key | Source | jca/SignatureOperation.java:175:16:175:36 | Key |
+| jca/SignatureOperation.java:187:26:187:29 | Message | Source | jca/SignatureOperation.java:311:26:311:49 | Constant |
+| jca/SignatureOperation.java:188:16:188:31 | SignOperation | Algorithm | jca/SignatureOperation.java:185:53:185:65 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:188:16:188:31 | SignOperation | HashAlgorithm | jca/SignatureOperation.java:185:53:185:65 | HashAlgorithm |
+| jca/SignatureOperation.java:188:16:188:31 | SignOperation | Input | jca/SignatureOperation.java:187:26:187:29 | Message |
+| jca/SignatureOperation.java:188:16:188:31 | SignOperation | Key | jca/SignatureOperation.java:186:28:186:37 | Key |
+| jca/SignatureOperation.java:188:16:188:31 | SignOperation | Output | jca/SignatureOperation.java:188:16:188:31 | SignatureOutput |
+| jca/SignatureOperation.java:198:53:198:65 | KeyOperationAlgorithm | Mode | jca/SignatureOperation.java:198:53:198:65 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:198:53:198:65 | KeyOperationAlgorithm | Padding | jca/SignatureOperation.java:198:53:198:65 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:199:30:199:38 | Key | Source | jca/SignatureOperation.java:175:16:175:36 | Key |
+| jca/SignatureOperation.java:200:26:200:29 | Message | Source | jca/SignatureOperation.java:311:26:311:49 | Constant |
+| jca/SignatureOperation.java:201:16:201:41 | VerifyOperation | Algorithm | jca/SignatureOperation.java:198:53:198:65 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:201:16:201:41 | VerifyOperation | HashAlgorithm | jca/SignatureOperation.java:198:53:198:65 | HashAlgorithm |
+| jca/SignatureOperation.java:201:16:201:41 | VerifyOperation | Input | jca/SignatureOperation.java:200:26:200:29 | Message |
+| jca/SignatureOperation.java:201:16:201:41 | VerifyOperation | Key | jca/SignatureOperation.java:199:30:199:38 | Key |
+| jca/SignatureOperation.java:201:16:201:41 | VerifyOperation | Signature | jca/SignatureOperation.java:201:33:201:40 | SignatureInput |
+| jca/SignatureOperation.java:201:33:201:40 | SignatureInput | Source | jca/SignatureOperation.java:188:16:188:31 | SignatureOutput |
+| jca/SignatureOperation.java:266:47:266:68 | KeyOperationAlgorithm | Mode | jca/SignatureOperation.java:266:47:266:68 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:266:47:266:68 | KeyOperationAlgorithm | Padding | jca/SignatureOperation.java:266:47:266:68 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:269:47:269:63 | KeyOperationAlgorithm | Mode | jca/SignatureOperation.java:269:47:269:63 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:269:47:269:63 | KeyOperationAlgorithm | Padding | jca/SignatureOperation.java:269:47:269:63 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:272:47:272:55 | KeyOperationAlgorithm | Mode | jca/SignatureOperation.java:272:47:272:55 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:272:47:272:55 | KeyOperationAlgorithm | Padding | jca/SignatureOperation.java:272:47:272:55 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:275:47:275:59 | KeyOperationAlgorithm | Mode | jca/SignatureOperation.java:275:47:275:59 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:275:47:275:59 | KeyOperationAlgorithm | Padding | jca/SignatureOperation.java:275:47:275:59 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:279:47:279:68 | KeyOperationAlgorithm | Mode | jca/SignatureOperation.java:279:47:279:68 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:279:47:279:68 | KeyOperationAlgorithm | Padding | jca/SignatureOperation.java:279:47:279:68 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:283:28:283:42 | Key | Source | jca/SignatureOperation.java:54:16:54:36 | Key |
+| jca/SignatureOperation.java:283:28:283:42 | Key | Source | jca/SignatureOperation.java:94:16:94:38 | Key |
+| jca/SignatureOperation.java:283:28:283:42 | Key | Source | jca/SignatureOperation.java:133:16:133:36 | Key |
+| jca/SignatureOperation.java:283:28:283:42 | Key | Source | jca/SignatureOperation.java:175:16:175:36 | Key |
+| jca/SignatureOperation.java:284:26:284:32 | Message | Source | jca/SignatureOperation.java:282:26:282:49 | Constant |
+| jca/SignatureOperation.java:285:27:285:42 | SignOperation | Algorithm | jca/SignatureOperation.java:266:47:266:68 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:285:27:285:42 | SignOperation | Algorithm | jca/SignatureOperation.java:269:47:269:63 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:285:27:285:42 | SignOperation | Algorithm | jca/SignatureOperation.java:272:47:272:55 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:285:27:285:42 | SignOperation | Algorithm | jca/SignatureOperation.java:275:47:275:59 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:285:27:285:42 | SignOperation | Algorithm | jca/SignatureOperation.java:279:47:279:68 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:285:27:285:42 | SignOperation | HashAlgorithm | jca/SignatureOperation.java:266:47:266:68 | HashAlgorithm |
+| jca/SignatureOperation.java:285:27:285:42 | SignOperation | HashAlgorithm | jca/SignatureOperation.java:269:47:269:63 | HashAlgorithm |
+| jca/SignatureOperation.java:285:27:285:42 | SignOperation | HashAlgorithm | jca/SignatureOperation.java:275:47:275:59 | HashAlgorithm |
+| jca/SignatureOperation.java:285:27:285:42 | SignOperation | HashAlgorithm | jca/SignatureOperation.java:279:47:279:68 | HashAlgorithm |
+| jca/SignatureOperation.java:285:27:285:42 | SignOperation | Input | jca/SignatureOperation.java:284:26:284:32 | Message |
+| jca/SignatureOperation.java:285:27:285:42 | SignOperation | Key | jca/SignatureOperation.java:283:28:283:42 | Key |
+| jca/SignatureOperation.java:285:27:285:42 | SignOperation | Output | jca/SignatureOperation.java:285:27:285:42 | SignatureOutput |
+| jca/SignatureOperation.java:287:30:287:43 | Key | Source | jca/SignatureOperation.java:54:16:54:36 | Key |
+| jca/SignatureOperation.java:287:30:287:43 | Key | Source | jca/SignatureOperation.java:94:16:94:38 | Key |
+| jca/SignatureOperation.java:287:30:287:43 | Key | Source | jca/SignatureOperation.java:133:16:133:36 | Key |
+| jca/SignatureOperation.java:287:30:287:43 | Key | Source | jca/SignatureOperation.java:175:16:175:36 | Key |
+| jca/SignatureOperation.java:288:26:288:32 | Message | Source | jca/SignatureOperation.java:288:26:288:32 | Message |
+| jca/SignatureOperation.java:289:28:289:53 | VerifyOperation | Algorithm | jca/SignatureOperation.java:266:47:266:68 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:289:28:289:53 | VerifyOperation | Algorithm | jca/SignatureOperation.java:269:47:269:63 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:289:28:289:53 | VerifyOperation | Algorithm | jca/SignatureOperation.java:272:47:272:55 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:289:28:289:53 | VerifyOperation | Algorithm | jca/SignatureOperation.java:275:47:275:59 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:289:28:289:53 | VerifyOperation | Algorithm | jca/SignatureOperation.java:279:47:279:68 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:289:28:289:53 | VerifyOperation | HashAlgorithm | jca/SignatureOperation.java:266:47:266:68 | HashAlgorithm |
+| jca/SignatureOperation.java:289:28:289:53 | VerifyOperation | HashAlgorithm | jca/SignatureOperation.java:269:47:269:63 | HashAlgorithm |
+| jca/SignatureOperation.java:289:28:289:53 | VerifyOperation | HashAlgorithm | jca/SignatureOperation.java:275:47:275:59 | HashAlgorithm |
+| jca/SignatureOperation.java:289:28:289:53 | VerifyOperation | HashAlgorithm | jca/SignatureOperation.java:279:47:279:68 | HashAlgorithm |
+| jca/SignatureOperation.java:289:28:289:53 | VerifyOperation | Input | jca/SignatureOperation.java:284:26:284:32 | Message |
+| jca/SignatureOperation.java:289:28:289:53 | VerifyOperation | Input | jca/SignatureOperation.java:288:26:288:32 | Message |
+| jca/SignatureOperation.java:289:28:289:53 | VerifyOperation | Key | jca/SignatureOperation.java:283:28:283:42 | Key |
+| jca/SignatureOperation.java:289:28:289:53 | VerifyOperation | Key | jca/SignatureOperation.java:287:30:287:43 | Key |
+| jca/SignatureOperation.java:289:28:289:53 | VerifyOperation | Signature | jca/SignatureOperation.java:289:45:289:52 | SignatureInput |
+| jca/SignatureOperation.java:289:45:289:52 | SignatureInput | Source | jca/SignatureOperation.java:285:27:285:42 | SignatureOutput |
+| jca/SymmetricAlgorithm.java:51:44:51:62 | KeyOperationAlgorithm | Mode | jca/SymmetricAlgorithm.java:51:44:51:62 | ModeOfOperation |
+| jca/SymmetricAlgorithm.java:51:44:51:62 | KeyOperationAlgorithm | Padding | jca/SymmetricAlgorithm.java:51:44:51:62 | PaddingAlgorithm |
+| jca/SymmetricAlgorithm.java:55:42:55:44 | Key | Source | jca/SymmetricAlgorithm.java:244:64:244:76 | Parameter |
+| jca/SymmetricAlgorithm.java:55:47:55:50 | Nonce | Source | jca/SymmetricAlgorithm.java:53:38:53:39 | RandomNumberGeneration |
+| jca/SymmetricAlgorithm.java:56:29:56:53 | EncryptOperation | Algorithm | jca/SymmetricAlgorithm.java:51:44:51:62 | KeyOperationAlgorithm |
+| jca/SymmetricAlgorithm.java:56:29:56:53 | EncryptOperation | Input | jca/SymmetricAlgorithm.java:56:44:56:52 | Message |
+| jca/SymmetricAlgorithm.java:56:29:56:53 | EncryptOperation | Key | jca/SymmetricAlgorithm.java:55:42:55:44 | Key |
+| jca/SymmetricAlgorithm.java:56:29:56:53 | EncryptOperation | Nonce | jca/SymmetricAlgorithm.java:55:47:55:50 | Nonce |
+| jca/SymmetricAlgorithm.java:56:29:56:53 | EncryptOperation | Output | jca/SymmetricAlgorithm.java:56:29:56:53 | KeyOperationOutput |
+| jca/SymmetricAlgorithm.java:56:44:56:52 | Message | Source | jca/SymmetricAlgorithm.java:244:79:244:94 | Parameter |
+| jca/SymmetricAlgorithm.java:73:44:73:62 | KeyOperationAlgorithm | Mode | jca/SymmetricAlgorithm.java:73:44:73:62 | ModeOfOperation |
+| jca/SymmetricAlgorithm.java:73:44:73:62 | KeyOperationAlgorithm | Padding | jca/SymmetricAlgorithm.java:73:44:73:62 | PaddingAlgorithm |
+| jca/SymmetricAlgorithm.java:76:42:76:44 | Key | Source | jca/SymmetricAlgorithm.java:72:39:72:51 | Parameter |
+| jca/SymmetricAlgorithm.java:76:47:76:50 | Nonce | Source | jca/SymmetricAlgorithm.java:76:47:76:50 | Nonce |
+| jca/SymmetricAlgorithm.java:77:29:77:53 | EncryptOperation | Algorithm | jca/SymmetricAlgorithm.java:73:44:73:62 | KeyOperationAlgorithm |
+| jca/SymmetricAlgorithm.java:77:29:77:53 | EncryptOperation | Input | jca/SymmetricAlgorithm.java:77:44:77:52 | Message |
+| jca/SymmetricAlgorithm.java:77:29:77:53 | EncryptOperation | Key | jca/SymmetricAlgorithm.java:76:42:76:44 | Key |
+| jca/SymmetricAlgorithm.java:77:29:77:53 | EncryptOperation | Nonce | jca/SymmetricAlgorithm.java:76:47:76:50 | Nonce |
+| jca/SymmetricAlgorithm.java:77:29:77:53 | EncryptOperation | Output | jca/SymmetricAlgorithm.java:77:29:77:53 | KeyOperationOutput |
+| jca/SymmetricAlgorithm.java:77:44:77:52 | Message | Source | jca/SymmetricAlgorithm.java:72:54:72:69 | Parameter |
+| jca/SymmetricAlgorithm.java:94:44:94:65 | KeyOperationAlgorithm | Mode | jca/SymmetricAlgorithm.java:94:44:94:65 | ModeOfOperation |
+| jca/SymmetricAlgorithm.java:94:44:94:65 | KeyOperationAlgorithm | Padding | jca/SymmetricAlgorithm.java:94:44:94:65 | PaddingAlgorithm |
+| jca/SymmetricAlgorithm.java:98:42:98:44 | Key | Source | jca/SymmetricAlgorithm.java:244:64:244:76 | Parameter |
+| jca/SymmetricAlgorithm.java:98:47:98:52 | Nonce | Source | jca/SymmetricAlgorithm.java:96:38:96:39 | RandomNumberGeneration |
+| jca/SymmetricAlgorithm.java:99:29:99:53 | EncryptOperation | Algorithm | jca/SymmetricAlgorithm.java:94:44:94:65 | KeyOperationAlgorithm |
+| jca/SymmetricAlgorithm.java:99:29:99:53 | EncryptOperation | Input | jca/SymmetricAlgorithm.java:99:44:99:52 | Message |
+| jca/SymmetricAlgorithm.java:99:29:99:53 | EncryptOperation | Key | jca/SymmetricAlgorithm.java:98:42:98:44 | Key |
+| jca/SymmetricAlgorithm.java:99:29:99:53 | EncryptOperation | Nonce | jca/SymmetricAlgorithm.java:98:47:98:52 | Nonce |
+| jca/SymmetricAlgorithm.java:99:29:99:53 | EncryptOperation | Output | jca/SymmetricAlgorithm.java:99:29:99:53 | KeyOperationOutput |
+| jca/SymmetricAlgorithm.java:99:44:99:52 | Message | Source | jca/SymmetricAlgorithm.java:244:79:244:94 | Parameter |
+| jca/SymmetricAlgorithm.java:116:44:116:65 | KeyOperationAlgorithm | Mode | jca/SymmetricAlgorithm.java:116:44:116:65 | ModeOfOperation |
+| jca/SymmetricAlgorithm.java:116:44:116:65 | KeyOperationAlgorithm | Padding | jca/SymmetricAlgorithm.java:116:44:116:65 | PaddingAlgorithm |
+| jca/SymmetricAlgorithm.java:117:42:117:44 | Key | Source | jca/SymmetricAlgorithm.java:244:64:244:76 | Parameter |
+| jca/SymmetricAlgorithm.java:118:16:118:40 | EncryptOperation | Algorithm | jca/SymmetricAlgorithm.java:116:44:116:65 | KeyOperationAlgorithm |
+| jca/SymmetricAlgorithm.java:118:16:118:40 | EncryptOperation | Input | jca/SymmetricAlgorithm.java:118:31:118:39 | Message |
+| jca/SymmetricAlgorithm.java:118:16:118:40 | EncryptOperation | Key | jca/SymmetricAlgorithm.java:117:42:117:44 | Key |
+| jca/SymmetricAlgorithm.java:118:16:118:40 | EncryptOperation | Nonce | jca/SymmetricAlgorithm.java:118:16:118:40 | EncryptOperation |
+| jca/SymmetricAlgorithm.java:118:16:118:40 | EncryptOperation | Output | jca/SymmetricAlgorithm.java:118:16:118:40 | KeyOperationOutput |
+| jca/SymmetricAlgorithm.java:118:31:118:39 | Message | Source | jca/SymmetricAlgorithm.java:244:79:244:94 | Parameter |
+| jca/SymmetricAlgorithm.java:131:44:131:48 | KeyOperationAlgorithm | Mode | jca/SymmetricAlgorithm.java:131:44:131:48 | KeyOperationAlgorithm |
+| jca/SymmetricAlgorithm.java:131:44:131:48 | KeyOperationAlgorithm | Padding | jca/SymmetricAlgorithm.java:131:44:131:48 | KeyOperationAlgorithm |
+| jca/SymmetricAlgorithm.java:132:42:132:44 | Key | Source | jca/SymmetricAlgorithm.java:244:64:244:76 | Parameter |
+| jca/SymmetricAlgorithm.java:133:16:133:40 | EncryptOperation | Algorithm | jca/SymmetricAlgorithm.java:131:44:131:48 | KeyOperationAlgorithm |
+| jca/SymmetricAlgorithm.java:133:16:133:40 | EncryptOperation | Input | jca/SymmetricAlgorithm.java:133:31:133:39 | Message |
+| jca/SymmetricAlgorithm.java:133:16:133:40 | EncryptOperation | Key | jca/SymmetricAlgorithm.java:132:42:132:44 | Key |
+| jca/SymmetricAlgorithm.java:133:16:133:40 | EncryptOperation | Nonce | jca/SymmetricAlgorithm.java:133:16:133:40 | EncryptOperation |
+| jca/SymmetricAlgorithm.java:133:16:133:40 | EncryptOperation | Output | jca/SymmetricAlgorithm.java:133:16:133:40 | KeyOperationOutput |
+| jca/SymmetricAlgorithm.java:133:31:133:39 | Message | Source | jca/SymmetricAlgorithm.java:244:79:244:94 | Parameter |
+| jca/SymmetricAlgorithm.java:146:44:146:65 | KeyOperationAlgorithm | Mode | jca/SymmetricAlgorithm.java:146:44:146:65 | ModeOfOperation |
+| jca/SymmetricAlgorithm.java:146:44:146:65 | KeyOperationAlgorithm | Padding | jca/SymmetricAlgorithm.java:146:44:146:65 | PaddingAlgorithm |
+| jca/SymmetricAlgorithm.java:150:42:150:44 | Key | Source | jca/SymmetricAlgorithm.java:145:36:145:48 | Parameter |
+| jca/SymmetricAlgorithm.java:150:47:150:52 | Nonce | Source | jca/SymmetricAlgorithm.java:148:38:148:39 | RandomNumberGeneration |
+| jca/SymmetricAlgorithm.java:151:29:151:53 | EncryptOperation | Algorithm | jca/SymmetricAlgorithm.java:146:44:146:65 | KeyOperationAlgorithm |
+| jca/SymmetricAlgorithm.java:151:29:151:53 | EncryptOperation | Input | jca/SymmetricAlgorithm.java:151:44:151:52 | Message |
+| jca/SymmetricAlgorithm.java:151:29:151:53 | EncryptOperation | Key | jca/SymmetricAlgorithm.java:150:42:150:44 | Key |
+| jca/SymmetricAlgorithm.java:151:29:151:53 | EncryptOperation | Nonce | jca/SymmetricAlgorithm.java:150:47:150:52 | Nonce |
+| jca/SymmetricAlgorithm.java:151:29:151:53 | EncryptOperation | Output | jca/SymmetricAlgorithm.java:151:29:151:53 | KeyOperationOutput |
+| jca/SymmetricAlgorithm.java:151:44:151:52 | Message | Source | jca/SymmetricAlgorithm.java:145:51:145:66 | Parameter |
+| jca/SymmetricAlgorithm.java:168:44:168:68 | KeyOperationAlgorithm | Mode | jca/SymmetricAlgorithm.java:168:44:168:68 | ModeOfOperation |
+| jca/SymmetricAlgorithm.java:168:44:168:68 | KeyOperationAlgorithm | Padding | jca/SymmetricAlgorithm.java:168:44:168:68 | PaddingAlgorithm |
+| jca/SymmetricAlgorithm.java:172:42:172:44 | Key | Source | jca/SymmetricAlgorithm.java:167:42:167:54 | Parameter |
+| jca/SymmetricAlgorithm.java:172:47:172:52 | Nonce | Source | jca/SymmetricAlgorithm.java:170:38:170:39 | RandomNumberGeneration |
+| jca/SymmetricAlgorithm.java:173:29:173:53 | EncryptOperation | Algorithm | jca/SymmetricAlgorithm.java:168:44:168:68 | KeyOperationAlgorithm |
+| jca/SymmetricAlgorithm.java:173:29:173:53 | EncryptOperation | Input | jca/SymmetricAlgorithm.java:173:44:173:52 | Message |
+| jca/SymmetricAlgorithm.java:173:29:173:53 | EncryptOperation | Key | jca/SymmetricAlgorithm.java:172:42:172:44 | Key |
+| jca/SymmetricAlgorithm.java:173:29:173:53 | EncryptOperation | Nonce | jca/SymmetricAlgorithm.java:172:47:172:52 | Nonce |
+| jca/SymmetricAlgorithm.java:173:29:173:53 | EncryptOperation | Output | jca/SymmetricAlgorithm.java:173:29:173:53 | KeyOperationOutput |
+| jca/SymmetricAlgorithm.java:173:44:173:52 | Message | Source | jca/SymmetricAlgorithm.java:167:57:167:72 | Parameter |
+| jca/SymmetricAlgorithm.java:190:44:190:53 | KeyOperationAlgorithm | Mode | jca/SymmetricAlgorithm.java:190:44:190:53 | KeyOperationAlgorithm |
+| jca/SymmetricAlgorithm.java:190:44:190:53 | KeyOperationAlgorithm | Padding | jca/SymmetricAlgorithm.java:190:44:190:53 | KeyOperationAlgorithm |
+| jca/SymmetricAlgorithm.java:194:42:194:44 | Key | Source | jca/SymmetricAlgorithm.java:244:64:244:76 | Parameter |
+| jca/SymmetricAlgorithm.java:194:47:194:72 | Nonce | Source | jca/SymmetricAlgorithm.java:192:38:192:42 | RandomNumberGeneration |
+| jca/SymmetricAlgorithm.java:195:29:195:53 | EncryptOperation | Algorithm | jca/SymmetricAlgorithm.java:190:44:190:53 | KeyOperationAlgorithm |
+| jca/SymmetricAlgorithm.java:195:29:195:53 | EncryptOperation | Input | jca/SymmetricAlgorithm.java:195:44:195:52 | Message |
+| jca/SymmetricAlgorithm.java:195:29:195:53 | EncryptOperation | Key | jca/SymmetricAlgorithm.java:194:42:194:44 | Key |
+| jca/SymmetricAlgorithm.java:195:29:195:53 | EncryptOperation | Nonce | jca/SymmetricAlgorithm.java:194:47:194:72 | Nonce |
+| jca/SymmetricAlgorithm.java:195:29:195:53 | EncryptOperation | Output | jca/SymmetricAlgorithm.java:195:29:195:53 | KeyOperationOutput |
+| jca/SymmetricAlgorithm.java:195:44:195:52 | Message | Source | jca/SymmetricAlgorithm.java:244:79:244:94 | Parameter |
+| jca/SymmetricAlgorithm.java:214:19:214:21 | Key | Source | jca/SymmetricAlgorithm.java:212:35:212:47 | Parameter |
+| jca/SymmetricAlgorithm.java:215:29:215:51 | MACOperation | Algorithm | jca/SymmetricAlgorithm.java:213:36:213:44 | Constant |
+| jca/SymmetricAlgorithm.java:215:29:215:51 | MACOperation | HashAlgorithm | jca/SymmetricAlgorithm.java:215:29:215:51 | MACOperation |
+| jca/SymmetricAlgorithm.java:215:29:215:51 | MACOperation | Input | jca/SymmetricAlgorithm.java:215:42:215:50 | Message |
+| jca/SymmetricAlgorithm.java:215:29:215:51 | MACOperation | Key | jca/SymmetricAlgorithm.java:214:19:214:21 | Key |
+| jca/SymmetricAlgorithm.java:215:29:215:51 | MACOperation | Message | jca/SymmetricAlgorithm.java:215:42:215:50 | Message |
+| jca/SymmetricAlgorithm.java:215:29:215:51 | MACOperation | Nonce | jca/SymmetricAlgorithm.java:215:29:215:51 | MACOperation |
+| jca/SymmetricAlgorithm.java:215:29:215:51 | MACOperation | Output | jca/SymmetricAlgorithm.java:215:29:215:51 | KeyOperationOutput |
+| jca/SymmetricAlgorithm.java:215:42:215:50 | Message | Source | jca/SymmetricAlgorithm.java:212:50:212:65 | Parameter |
+| jca/SymmetricAlgorithm.java:218:44:218:62 | KeyOperationAlgorithm | Mode | jca/SymmetricAlgorithm.java:218:44:218:62 | ModeOfOperation |
+| jca/SymmetricAlgorithm.java:218:44:218:62 | KeyOperationAlgorithm | Padding | jca/SymmetricAlgorithm.java:218:44:218:62 | PaddingAlgorithm |
+| jca/SymmetricAlgorithm.java:222:42:222:51 | Key | Source | jca/SymmetricAlgorithm.java:215:29:215:51 | KeyOperationOutput |
+| jca/SymmetricAlgorithm.java:222:54:222:57 | Nonce | Source | jca/SymmetricAlgorithm.java:220:38:220:39 | RandomNumberGeneration |
+| jca/SymmetricAlgorithm.java:223:29:223:53 | EncryptOperation | Algorithm | jca/SymmetricAlgorithm.java:218:44:218:62 | KeyOperationAlgorithm |
+| jca/SymmetricAlgorithm.java:223:29:223:53 | EncryptOperation | Input | jca/SymmetricAlgorithm.java:223:44:223:52 | Message |
+| jca/SymmetricAlgorithm.java:223:29:223:53 | EncryptOperation | Key | jca/SymmetricAlgorithm.java:222:42:222:51 | Key |
+| jca/SymmetricAlgorithm.java:223:29:223:53 | EncryptOperation | Nonce | jca/SymmetricAlgorithm.java:222:54:222:57 | Nonce |
+| jca/SymmetricAlgorithm.java:223:29:223:53 | EncryptOperation | Output | jca/SymmetricAlgorithm.java:223:29:223:53 | KeyOperationOutput |
+| jca/SymmetricAlgorithm.java:223:44:223:52 | Message | Source | jca/SymmetricAlgorithm.java:223:44:223:52 | Message |
+| jca/SymmetricAlgorithm.java:287:42:287:66 | Message | Source | jca/SymmetricAlgorithm.java:284:58:284:70 | Parameter |
+| jca/SymmetricAlgorithm.java:287:69:287:72 | Salt | Source | jca/SymmetricAlgorithm.java:345:38:345:41 | RandomNumberGeneration |
+| jca/SymmetricAlgorithm.java:288:65:288:86 | HMACAlgorithm | H | jca/SymmetricAlgorithm.java:288:65:288:86 | HashAlgorithm |
+| jca/SymmetricAlgorithm.java:288:65:288:86 | KeyDerivationAlgorithm | PRF | jca/SymmetricAlgorithm.java:288:65:288:86 | HMACAlgorithm |
+| jca/SymmetricAlgorithm.java:289:26:289:53 | KeyDerivation | Algorithm | jca/SymmetricAlgorithm.java:288:65:288:86 | KeyDerivationAlgorithm |
+| jca/SymmetricAlgorithm.java:289:26:289:53 | KeyDerivation | Input | jca/SymmetricAlgorithm.java:287:42:287:66 | Message |
+| jca/SymmetricAlgorithm.java:289:26:289:53 | KeyDerivation | Output | jca/SymmetricAlgorithm.java:289:26:289:53 | Key |
+| jca/SymmetricAlgorithm.java:289:26:289:53 | KeyDerivation | Salt | jca/SymmetricAlgorithm.java:287:69:287:72 | Salt |
+| jca/SymmetricAlgorithm.java:295:44:295:62 | KeyOperationAlgorithm | Mode | jca/SymmetricAlgorithm.java:295:44:295:62 | ModeOfOperation |
+| jca/SymmetricAlgorithm.java:295:44:295:62 | KeyOperationAlgorithm | Padding | jca/SymmetricAlgorithm.java:295:44:295:62 | PaddingAlgorithm |
+| jca/SymmetricAlgorithm.java:298:42:298:47 | Key | Source | jca/SymmetricAlgorithm.java:298:42:298:47 | Key |
+| jca/SymmetricAlgorithm.java:298:50:298:78 | Nonce | Source | jca/SymmetricAlgorithm.java:297:38:297:39 | RandomNumberGeneration |
+| jca/SymmetricAlgorithm.java:299:29:299:53 | EncryptOperation | Algorithm | jca/SymmetricAlgorithm.java:295:44:295:62 | KeyOperationAlgorithm |
+| jca/SymmetricAlgorithm.java:299:29:299:53 | EncryptOperation | Input | jca/SymmetricAlgorithm.java:299:44:299:52 | Message |
+| jca/SymmetricAlgorithm.java:299:29:299:53 | EncryptOperation | Key | jca/SymmetricAlgorithm.java:298:42:298:47 | Key |
+| jca/SymmetricAlgorithm.java:299:29:299:53 | EncryptOperation | Nonce | jca/SymmetricAlgorithm.java:298:50:298:78 | Nonce |
+| jca/SymmetricAlgorithm.java:299:29:299:53 | EncryptOperation | Output | jca/SymmetricAlgorithm.java:299:29:299:53 | KeyOperationOutput |
+| jca/SymmetricAlgorithm.java:299:44:299:52 | Message | Source | jca/SymmetricAlgorithm.java:284:73:284:88 | Parameter |
+| jca/SymmetricAlgorithm.java:301:35:301:46 | HMACAlgorithm | H | jca/SymmetricAlgorithm.java:301:35:301:46 | HashAlgorithm |
+| jca/SymmetricAlgorithm.java:302:18:302:30 | Key | Source | jca/SymmetricAlgorithm.java:302:18:302:30 | Key |
+| jca/SymmetricAlgorithm.java:303:30:303:52 | MACOperation | Algorithm | jca/SymmetricAlgorithm.java:301:35:301:46 | HMACAlgorithm |
+| jca/SymmetricAlgorithm.java:303:30:303:52 | MACOperation | HashAlgorithm | jca/SymmetricAlgorithm.java:301:35:301:46 | HashAlgorithm |
+| jca/SymmetricAlgorithm.java:303:30:303:52 | MACOperation | Input | jca/SymmetricAlgorithm.java:303:42:303:51 | Message |
+| jca/SymmetricAlgorithm.java:303:30:303:52 | MACOperation | Key | jca/SymmetricAlgorithm.java:302:18:302:30 | Key |
+| jca/SymmetricAlgorithm.java:303:30:303:52 | MACOperation | Message | jca/SymmetricAlgorithm.java:303:42:303:51 | Message |
+| jca/SymmetricAlgorithm.java:303:30:303:52 | MACOperation | Nonce | jca/SymmetricAlgorithm.java:303:30:303:52 | MACOperation |
+| jca/SymmetricAlgorithm.java:303:30:303:52 | MACOperation | Output | jca/SymmetricAlgorithm.java:303:30:303:52 | KeyOperationOutput |
+| jca/SymmetricAlgorithm.java:303:42:303:51 | Message | Source | jca/SymmetricAlgorithm.java:299:29:299:53 | KeyOperationOutput |
+| jca/SymmetricAlgorithm.java:333:16:333:31 | KeyGeneration | Algorithm | jca/SymmetricAlgorithm.java:331:52:331:56 | KeyOperationAlgorithm |
+| jca/SymmetricAlgorithm.java:333:16:333:31 | KeyGeneration | Output | jca/SymmetricAlgorithm.java:333:16:333:31 | Key |
+| jca/SymmetricModesTest.java:50:33:50:48 | KeyGeneration | Algorithm | jca/SymmetricModesTest.java:48:52:48:56 | KeyOperationAlgorithm |
+| jca/SymmetricModesTest.java:50:33:50:48 | KeyGeneration | Output | jca/SymmetricModesTest.java:50:33:50:48 | Key |
+| jca/SymmetricModesTest.java:54:31:54:46 | KeyGeneration | Algorithm | jca/SymmetricModesTest.java:48:52:48:56 | KeyOperationAlgorithm |
+| jca/SymmetricModesTest.java:54:31:54:46 | KeyGeneration | Output | jca/SymmetricModesTest.java:54:31:54:46 | Key |
+| jca/SymmetricModesTest.java:57:44:57:62 | KeyOperationAlgorithm | Mode | jca/SymmetricModesTest.java:57:44:57:62 | ModeOfOperation |
+| jca/SymmetricModesTest.java:57:44:57:62 | KeyOperationAlgorithm | Padding | jca/SymmetricModesTest.java:57:44:57:62 | PaddingAlgorithm |
+| jca/SymmetricModesTest.java:58:39:58:49 | Key | Source | jca/SymmetricModesTest.java:50:33:50:48 | Key |
+| jca/SymmetricModesTest.java:59:29:59:50 | WrapOperation | Algorithm | jca/SymmetricModesTest.java:57:44:57:62 | KeyOperationAlgorithm |
+| jca/SymmetricModesTest.java:59:29:59:50 | WrapOperation | Input | jca/SymmetricModesTest.java:59:41:59:49 | Message |
+| jca/SymmetricModesTest.java:59:29:59:50 | WrapOperation | Key | jca/SymmetricModesTest.java:58:39:58:49 | Key |
+| jca/SymmetricModesTest.java:59:29:59:50 | WrapOperation | Nonce | jca/SymmetricModesTest.java:59:29:59:50 | WrapOperation |
+| jca/SymmetricModesTest.java:59:29:59:50 | WrapOperation | Output | jca/SymmetricModesTest.java:59:29:59:50 | KeyOperationOutput |
+| jca/SymmetricModesTest.java:59:41:59:49 | Message | Source | jca/SymmetricModesTest.java:54:31:54:46 | Key |
+| jca/SymmetricModesTest.java:79:44:79:63 | KeyOperationAlgorithm | Mode | jca/SymmetricModesTest.java:79:44:79:63 | ModeOfOperation |
+| jca/SymmetricModesTest.java:79:44:79:63 | KeyOperationAlgorithm | Padding | jca/SymmetricModesTest.java:79:44:79:63 | PaddingAlgorithm |
+| jca/SymmetricModesTest.java:83:42:83:44 | Key | Source | jca/SymmetricModesTest.java:78:43:78:55 | Parameter |
+| jca/SymmetricModesTest.java:83:47:83:52 | Nonce | Source | jca/SymmetricModesTest.java:81:38:81:39 | RandomNumberGeneration |
+| jca/SymmetricModesTest.java:84:29:84:53 | EncryptOperation | Algorithm | jca/SymmetricModesTest.java:79:44:79:63 | KeyOperationAlgorithm |
+| jca/SymmetricModesTest.java:84:29:84:53 | EncryptOperation | Input | jca/SymmetricModesTest.java:84:44:84:52 | Message |
+| jca/SymmetricModesTest.java:84:29:84:53 | EncryptOperation | Key | jca/SymmetricModesTest.java:83:42:83:44 | Key |
+| jca/SymmetricModesTest.java:84:29:84:53 | EncryptOperation | Nonce | jca/SymmetricModesTest.java:83:47:83:52 | Nonce |
+| jca/SymmetricModesTest.java:84:29:84:53 | EncryptOperation | Output | jca/SymmetricModesTest.java:84:29:84:53 | KeyOperationOutput |
+| jca/SymmetricModesTest.java:84:44:84:52 | Message | Source | jca/SymmetricModesTest.java:78:58:78:73 | Parameter |
+| jca/SymmetricModesTest.java:105:44:105:63 | KeyOperationAlgorithm | Mode | jca/SymmetricModesTest.java:105:44:105:63 | ModeOfOperation |
+| jca/SymmetricModesTest.java:105:44:105:63 | KeyOperationAlgorithm | Padding | jca/SymmetricModesTest.java:105:44:105:63 | PaddingAlgorithm |
+| jca/SymmetricModesTest.java:109:42:109:44 | Key | Source | jca/SymmetricModesTest.java:104:45:104:57 | Parameter |
+| jca/SymmetricModesTest.java:109:47:109:52 | Nonce | Source | jca/SymmetricModesTest.java:109:47:109:52 | Nonce |
+| jca/SymmetricModesTest.java:110:29:110:53 | EncryptOperation | Algorithm | jca/SymmetricModesTest.java:105:44:105:63 | KeyOperationAlgorithm |
+| jca/SymmetricModesTest.java:110:29:110:53 | EncryptOperation | Input | jca/SymmetricModesTest.java:110:44:110:52 | Message |
+| jca/SymmetricModesTest.java:110:29:110:53 | EncryptOperation | Key | jca/SymmetricModesTest.java:109:42:109:44 | Key |
+| jca/SymmetricModesTest.java:110:29:110:53 | EncryptOperation | Nonce | jca/SymmetricModesTest.java:109:47:109:52 | Nonce |
+| jca/SymmetricModesTest.java:110:29:110:53 | EncryptOperation | Output | jca/SymmetricModesTest.java:110:29:110:53 | KeyOperationOutput |
+| jca/SymmetricModesTest.java:110:44:110:52 | Message | Source | jca/SymmetricModesTest.java:104:60:104:75 | Parameter |
+| jca/SymmetricModesTest.java:129:16:129:31 | KeyGeneration | Algorithm | jca/SymmetricModesTest.java:127:52:127:56 | KeyOperationAlgorithm |
+| jca/SymmetricModesTest.java:129:16:129:31 | KeyGeneration | Output | jca/SymmetricModesTest.java:129:16:129:31 | Key |
+| jca/UniversalFlowTest.java:27:25:27:44 | KeyGeneration | Algorithm | jca/UniversalFlowTest.java:19:28:19:32 | KeyOperationAlgorithm |
+| jca/UniversalFlowTest.java:27:25:27:44 | KeyGeneration | Algorithm | jca/UniversalFlowTest.java:46:20:46:24 | KeyOperationAlgorithm |
+| jca/UniversalFlowTest.java:27:25:27:44 | KeyGeneration | Output | jca/UniversalFlowTest.java:27:25:27:44 | Key |
+| jca/UniversalFlowTest.java:28:29:28:47 | KeyOperationAlgorithm | Mode | jca/UniversalFlowTest.java:28:29:28:47 | ModeOfOperation |
+| jca/UniversalFlowTest.java:28:29:28:47 | KeyOperationAlgorithm | Padding | jca/UniversalFlowTest.java:28:29:28:47 | PaddingAlgorithm |
+| jca/UniversalFlowTest.java:33:42:33:44 | Key | Source | jca/UniversalFlowTest.java:27:25:27:44 | Key |
+| jca/UniversalFlowTest.java:33:47:33:53 | Nonce | Source | jca/UniversalFlowTest.java:31:38:31:39 | RandomNumberGeneration |
+| jca/UniversalFlowTest.java:34:32:34:74 | EncryptOperation | Algorithm | jca/UniversalFlowTest.java:28:29:28:47 | KeyOperationAlgorithm |
+| jca/UniversalFlowTest.java:34:32:34:74 | EncryptOperation | Input | jca/UniversalFlowTest.java:34:47:34:73 | Message |
+| jca/UniversalFlowTest.java:34:32:34:74 | EncryptOperation | Key | jca/UniversalFlowTest.java:33:42:33:44 | Key |
+| jca/UniversalFlowTest.java:34:32:34:74 | EncryptOperation | Nonce | jca/UniversalFlowTest.java:33:47:33:53 | Nonce |
+| jca/UniversalFlowTest.java:34:32:34:74 | EncryptOperation | Output | jca/UniversalFlowTest.java:34:32:34:74 | KeyOperationOutput |
+| jca/UniversalFlowTest.java:34:47:34:73 | Message | Source | jca/UniversalFlowTest.java:34:47:34:62 | Constant |
diff --git a/java/ql/test/experimental/library-tests/quantum/node_edges.ql b/java/ql/test/experimental/library-tests/quantum/node_edges.ql
new file mode 100644
index 00000000000..4c9afb6c8ff
--- /dev/null
+++ b/java/ql/test/experimental/library-tests/quantum/node_edges.ql
@@ -0,0 +1,5 @@
+import java
+import experimental.quantum.Language
+
+from Crypto::NodeBase n, string key
+select n, key, n.getChild(key)
diff --git a/java/ql/test/experimental/library-tests/quantum/node_properties.expected b/java/ql/test/experimental/library-tests/quantum/node_properties.expected
new file mode 100644
index 00000000000..20c7276cc4f
--- /dev/null
+++ b/java/ql/test/experimental/library-tests/quantum/node_properties.expected
@@ -0,0 +1,1765 @@
+| jca/AesWrapAndPBEWith.java:58:52:58:56 | KeyOperationAlgorithm | KeySize | Constant:128 | jca/AesWrapAndPBEWith.java:62:17:62:19 | jca/AesWrapAndPBEWith.java:62:17:62:19 |
+| jca/AesWrapAndPBEWith.java:58:52:58:56 | KeyOperationAlgorithm | KeySize | Constant:256 | jca/AesWrapAndPBEWith.java:59:17:59:19 | jca/AesWrapAndPBEWith.java:59:17:59:19 |
+| jca/AesWrapAndPBEWith.java:58:52:58:56 | KeyOperationAlgorithm | Name | AES | jca/AesWrapAndPBEWith.java:58:52:58:56 | jca/AesWrapAndPBEWith.java:58:52:58:56 |
+| jca/AesWrapAndPBEWith.java:58:52:58:56 | KeyOperationAlgorithm | RawName | AES | jca/AesWrapAndPBEWith.java:58:52:58:56 | jca/AesWrapAndPBEWith.java:58:52:58:56 |
+| jca/AesWrapAndPBEWith.java:58:52:58:56 | KeyOperationAlgorithm | Structure | Block | jca/AesWrapAndPBEWith.java:58:52:58:56 | jca/AesWrapAndPBEWith.java:58:52:58:56 |
+| jca/AesWrapAndPBEWith.java:59:17:59:19 | Constant | Description | 256 | jca/AesWrapAndPBEWith.java:59:17:59:19 | jca/AesWrapAndPBEWith.java:59:17:59:19 |
+| jca/AesWrapAndPBEWith.java:60:33:60:48 | Key | KeyType | Symmetric | jca/AesWrapAndPBEWith.java:60:33:60:48 | jca/AesWrapAndPBEWith.java:60:33:60:48 |
+| jca/AesWrapAndPBEWith.java:62:17:62:19 | Constant | Description | 128 | jca/AesWrapAndPBEWith.java:62:17:62:19 | jca/AesWrapAndPBEWith.java:62:17:62:19 |
+| jca/AesWrapAndPBEWith.java:63:31:63:46 | Key | KeyType | Symmetric | jca/AesWrapAndPBEWith.java:63:31:63:46 | jca/AesWrapAndPBEWith.java:63:31:63:46 |
+| jca/AesWrapAndPBEWith.java:65:44:65:52 | KeyOperationAlgorithm | Name | AES | jca/AesWrapAndPBEWith.java:65:44:65:52 | jca/AesWrapAndPBEWith.java:65:44:65:52 |
+| jca/AesWrapAndPBEWith.java:65:44:65:52 | KeyOperationAlgorithm | RawName | AESWrap | jca/AesWrapAndPBEWith.java:65:44:65:52 | jca/AesWrapAndPBEWith.java:65:44:65:52 |
+| jca/AesWrapAndPBEWith.java:65:44:65:52 | KeyOperationAlgorithm | Structure | Block | jca/AesWrapAndPBEWith.java:65:44:65:52 | jca/AesWrapAndPBEWith.java:65:44:65:52 |
+| jca/AesWrapAndPBEWith.java:66:39:66:49 | Key | KeyType | Unknown | jca/AesWrapAndPBEWith.java:66:39:66:49 | jca/AesWrapAndPBEWith.java:66:39:66:49 |
+| jca/AesWrapAndPBEWith.java:67:29:67:50 | WrapOperation | KeyOperationSubtype | Wrap | jca/AesWrapAndPBEWith.java:67:29:67:50 | jca/AesWrapAndPBEWith.java:67:29:67:50 |
+| jca/AesWrapAndPBEWith.java:83:52:83:56 | KeyOperationAlgorithm | KeySize | Constant:128 | jca/AesWrapAndPBEWith.java:84:17:84:19 | jca/AesWrapAndPBEWith.java:84:17:84:19 |
+| jca/AesWrapAndPBEWith.java:83:52:83:56 | KeyOperationAlgorithm | Name | AES | jca/AesWrapAndPBEWith.java:83:52:83:56 | jca/AesWrapAndPBEWith.java:83:52:83:56 |
+| jca/AesWrapAndPBEWith.java:83:52:83:56 | KeyOperationAlgorithm | RawName | AES | jca/AesWrapAndPBEWith.java:83:52:83:56 | jca/AesWrapAndPBEWith.java:83:52:83:56 |
+| jca/AesWrapAndPBEWith.java:83:52:83:56 | KeyOperationAlgorithm | Structure | Block | jca/AesWrapAndPBEWith.java:83:52:83:56 | jca/AesWrapAndPBEWith.java:83:52:83:56 |
+| jca/AesWrapAndPBEWith.java:84:17:84:19 | Constant | Description | 128 | jca/AesWrapAndPBEWith.java:84:17:84:19 | jca/AesWrapAndPBEWith.java:84:17:84:19 |
+| jca/AesWrapAndPBEWith.java:85:31:85:46 | Key | KeyType | Symmetric | jca/AesWrapAndPBEWith.java:85:31:85:46 | jca/AesWrapAndPBEWith.java:85:31:85:46 |
+| jca/AesWrapAndPBEWith.java:87:44:87:52 | KeyOperationAlgorithm | Name | AES | jca/AesWrapAndPBEWith.java:87:44:87:52 | jca/AesWrapAndPBEWith.java:87:44:87:52 |
+| jca/AesWrapAndPBEWith.java:87:44:87:52 | KeyOperationAlgorithm | RawName | AESWrap | jca/AesWrapAndPBEWith.java:87:44:87:52 | jca/AesWrapAndPBEWith.java:87:44:87:52 |
+| jca/AesWrapAndPBEWith.java:87:44:87:52 | KeyOperationAlgorithm | Structure | Block | jca/AesWrapAndPBEWith.java:87:44:87:52 | jca/AesWrapAndPBEWith.java:87:44:87:52 |
+| jca/AesWrapAndPBEWith.java:88:39:88:49 | Key | KeyType | Unknown | jca/AesWrapAndPBEWith.java:88:39:88:49 | jca/AesWrapAndPBEWith.java:88:39:88:49 |
+| jca/AesWrapAndPBEWith.java:89:29:89:50 | WrapOperation | KeyOperationSubtype | Wrap | jca/AesWrapAndPBEWith.java:89:29:89:50 | jca/AesWrapAndPBEWith.java:89:29:89:50 |
+| jca/AesWrapAndPBEWith.java:106:34:106:37 | Constant | Description | 0x00 | jca/AesWrapAndPBEWith.java:106:34:106:37 | jca/AesWrapAndPBEWith.java:106:34:106:37 |
+| jca/AesWrapAndPBEWith.java:107:72:107:75 | Constant | Description | 1000 | jca/AesWrapAndPBEWith.java:107:72:107:75 | jca/AesWrapAndPBEWith.java:107:72:107:75 |
+| jca/AesWrapAndPBEWith.java:107:78:107:79 | Constant | Description | 64 | jca/AesWrapAndPBEWith.java:107:78:107:79 | jca/AesWrapAndPBEWith.java:107:78:107:79 |
+| jca/AesWrapAndPBEWith.java:108:65:108:82 | KeyDerivationAlgorithm | Name | PBEWithMD5AndDES | jca/AesWrapAndPBEWith.java:108:65:108:82 | jca/AesWrapAndPBEWith.java:108:65:108:82 |
+| jca/AesWrapAndPBEWith.java:108:65:108:82 | KeyDerivationAlgorithm | RawName | PBEWithMD5AndDES | jca/AesWrapAndPBEWith.java:108:65:108:82 | jca/AesWrapAndPBEWith.java:108:65:108:82 |
+| jca/AesWrapAndPBEWith.java:109:27:109:54 | Key | KeyType | Symmetric | jca/AesWrapAndPBEWith.java:109:27:109:54 | jca/AesWrapAndPBEWith.java:109:27:109:54 |
+| jca/AesWrapAndPBEWith.java:109:27:109:54 | KeyDerivation | Iterations | Constant:1000 | jca/AesWrapAndPBEWith.java:107:72:107:75 | jca/AesWrapAndPBEWith.java:107:72:107:75 |
+| jca/AesWrapAndPBEWith.java:109:27:109:54 | KeyDerivation | KeySize | Constant:64 | jca/AesWrapAndPBEWith.java:107:78:107:79 | jca/AesWrapAndPBEWith.java:107:78:107:79 |
+| jca/AesWrapAndPBEWith.java:122:38:122:41 | RandomNumberGeneration | Description | java.security.SecureRandom | jca/AesWrapAndPBEWith.java:122:38:122:41 | jca/AesWrapAndPBEWith.java:122:38:122:41 |
+| jca/AesWrapAndPBEWith.java:123:72:123:76 | Constant | Description | 10000 | jca/AesWrapAndPBEWith.java:123:72:123:76 | jca/AesWrapAndPBEWith.java:123:72:123:76 |
+| jca/AesWrapAndPBEWith.java:123:79:123:81 | Constant | Description | 256 | jca/AesWrapAndPBEWith.java:123:79:123:81 | jca/AesWrapAndPBEWith.java:123:79:123:81 |
+| jca/AesWrapAndPBEWith.java:124:65:124:86 | HMACAlgorithm | Name | HMAC | jca/AesWrapAndPBEWith.java:124:65:124:86 | jca/AesWrapAndPBEWith.java:124:65:124:86 |
+| jca/AesWrapAndPBEWith.java:124:65:124:86 | HMACAlgorithm | RawName | PBKDF2WithHmacSHA256 | jca/AesWrapAndPBEWith.java:124:65:124:86 | jca/AesWrapAndPBEWith.java:124:65:124:86 |
+| jca/AesWrapAndPBEWith.java:124:65:124:86 | HashAlgorithm | DigestSize | 256 | jca/AesWrapAndPBEWith.java:124:65:124:86 | jca/AesWrapAndPBEWith.java:124:65:124:86 |
+| jca/AesWrapAndPBEWith.java:124:65:124:86 | HashAlgorithm | Name | SHA2 | jca/AesWrapAndPBEWith.java:124:65:124:86 | jca/AesWrapAndPBEWith.java:124:65:124:86 |
+| jca/AesWrapAndPBEWith.java:124:65:124:86 | HashAlgorithm | RawName | PBKDF2WithHmacSHA256 | jca/AesWrapAndPBEWith.java:124:65:124:86 | jca/AesWrapAndPBEWith.java:124:65:124:86 |
+| jca/AesWrapAndPBEWith.java:124:65:124:86 | KeyDerivationAlgorithm | Name | PBKDF2WithHmacSHA256 | jca/AesWrapAndPBEWith.java:124:65:124:86 | jca/AesWrapAndPBEWith.java:124:65:124:86 |
+| jca/AesWrapAndPBEWith.java:124:65:124:86 | KeyDerivationAlgorithm | RawName | PBKDF2WithHmacSHA256 | jca/AesWrapAndPBEWith.java:124:65:124:86 | jca/AesWrapAndPBEWith.java:124:65:124:86 |
+| jca/AesWrapAndPBEWith.java:125:27:125:54 | Key | KeyType | Symmetric | jca/AesWrapAndPBEWith.java:125:27:125:54 | jca/AesWrapAndPBEWith.java:125:27:125:54 |
+| jca/AesWrapAndPBEWith.java:125:27:125:54 | KeyDerivation | Iterations | Constant:10000 | jca/AesWrapAndPBEWith.java:123:72:123:76 | jca/AesWrapAndPBEWith.java:123:72:123:76 |
+| jca/AesWrapAndPBEWith.java:125:27:125:54 | KeyDerivation | KeySize | Constant:256 | jca/AesWrapAndPBEWith.java:123:79:123:81 | jca/AesWrapAndPBEWith.java:123:79:123:81 |
+| jca/AesWrapAndPBEWith.java:140:38:140:41 | RandomNumberGeneration | Description | java.security.SecureRandom | jca/AesWrapAndPBEWith.java:140:38:140:41 | jca/AesWrapAndPBEWith.java:140:38:140:41 |
+| jca/AesWrapAndPBEWith.java:141:72:141:76 | Constant | Description | 10000 | jca/AesWrapAndPBEWith.java:141:72:141:76 | jca/AesWrapAndPBEWith.java:141:72:141:76 |
+| jca/AesWrapAndPBEWith.java:141:79:141:81 | Constant | Description | 128 | jca/AesWrapAndPBEWith.java:141:79:141:81 | jca/AesWrapAndPBEWith.java:141:79:141:81 |
+| jca/AesWrapAndPBEWith.java:142:65:142:98 | KeyDerivationAlgorithm | Name | PBEWithSHA256And128BitAES-CBC-BC | jca/AesWrapAndPBEWith.java:142:65:142:98 | jca/AesWrapAndPBEWith.java:142:65:142:98 |
+| jca/AesWrapAndPBEWith.java:142:65:142:98 | KeyDerivationAlgorithm | RawName | PBEWithSHA256And128BitAES-CBC-BC | jca/AesWrapAndPBEWith.java:142:65:142:98 | jca/AesWrapAndPBEWith.java:142:65:142:98 |
+| jca/AesWrapAndPBEWith.java:143:28:143:55 | Key | KeyType | Symmetric | jca/AesWrapAndPBEWith.java:143:28:143:55 | jca/AesWrapAndPBEWith.java:143:28:143:55 |
+| jca/AesWrapAndPBEWith.java:143:28:143:55 | KeyDerivation | Iterations | Constant:10000 | jca/AesWrapAndPBEWith.java:141:72:141:76 | jca/AesWrapAndPBEWith.java:141:72:141:76 |
+| jca/AesWrapAndPBEWith.java:143:28:143:55 | KeyDerivation | KeySize | Constant:128 | jca/AesWrapAndPBEWith.java:141:79:141:81 | jca/AesWrapAndPBEWith.java:141:79:141:81 |
+| jca/AesWrapAndPBEWith.java:146:44:146:65 | KeyOperationAlgorithm | Name | AES | jca/AesWrapAndPBEWith.java:146:44:146:65 | jca/AesWrapAndPBEWith.java:146:44:146:65 |
+| jca/AesWrapAndPBEWith.java:146:44:146:65 | KeyOperationAlgorithm | RawName | AES/CBC/PKCS5Padding | jca/AesWrapAndPBEWith.java:146:44:146:65 | jca/AesWrapAndPBEWith.java:146:44:146:65 |
+| jca/AesWrapAndPBEWith.java:146:44:146:65 | KeyOperationAlgorithm | Structure | Block | jca/AesWrapAndPBEWith.java:146:44:146:65 | jca/AesWrapAndPBEWith.java:146:44:146:65 |
+| jca/AesWrapAndPBEWith.java:146:44:146:65 | ModeOfOperation | Name | CBC | jca/AesWrapAndPBEWith.java:146:44:146:65 | jca/AesWrapAndPBEWith.java:146:44:146:65 |
+| jca/AesWrapAndPBEWith.java:146:44:146:65 | ModeOfOperation | RawName | CBC | jca/AesWrapAndPBEWith.java:146:44:146:65 | jca/AesWrapAndPBEWith.java:146:44:146:65 |
+| jca/AesWrapAndPBEWith.java:146:44:146:65 | PaddingAlgorithm | Name | PKCS7 | jca/AesWrapAndPBEWith.java:146:44:146:65 | jca/AesWrapAndPBEWith.java:146:44:146:65 |
+| jca/AesWrapAndPBEWith.java:146:44:146:65 | PaddingAlgorithm | RawName | PKCS5Padding | jca/AesWrapAndPBEWith.java:146:44:146:65 | jca/AesWrapAndPBEWith.java:146:44:146:65 |
+| jca/AesWrapAndPBEWith.java:148:38:148:39 | RandomNumberGeneration | Description | java.security.SecureRandom | jca/AesWrapAndPBEWith.java:148:38:148:39 | jca/AesWrapAndPBEWith.java:148:38:148:39 |
+| jca/AesWrapAndPBEWith.java:150:42:150:47 | Key | KeyType | Unknown | jca/AesWrapAndPBEWith.java:150:42:150:47 | jca/AesWrapAndPBEWith.java:150:42:150:47 |
+| jca/AesWrapAndPBEWith.java:151:29:151:64 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/AesWrapAndPBEWith.java:151:29:151:64 | jca/AesWrapAndPBEWith.java:151:29:151:64 |
+| jca/AesWrapAndPBEWith.java:167:38:167:41 | RandomNumberGeneration | Description | java.security.SecureRandom | jca/AesWrapAndPBEWith.java:167:38:167:41 | jca/AesWrapAndPBEWith.java:167:38:167:41 |
+| jca/AesWrapAndPBEWith.java:168:72:168:76 | Constant | Description | 10000 | jca/AesWrapAndPBEWith.java:168:72:168:76 | jca/AesWrapAndPBEWith.java:168:72:168:76 |
+| jca/AesWrapAndPBEWith.java:168:79:168:81 | Constant | Description | 128 | jca/AesWrapAndPBEWith.java:168:79:168:81 | jca/AesWrapAndPBEWith.java:168:79:168:81 |
+| jca/AesWrapAndPBEWith.java:169:65:169:96 | KeyDerivationAlgorithm | Name | PBEWithSHA1And128BitAES-CBC-BC | jca/AesWrapAndPBEWith.java:169:65:169:96 | jca/AesWrapAndPBEWith.java:169:65:169:96 |
+| jca/AesWrapAndPBEWith.java:169:65:169:96 | KeyDerivationAlgorithm | RawName | PBEWithSHA1And128BitAES-CBC-BC | jca/AesWrapAndPBEWith.java:169:65:169:96 | jca/AesWrapAndPBEWith.java:169:65:169:96 |
+| jca/AesWrapAndPBEWith.java:170:28:170:55 | Key | KeyType | Symmetric | jca/AesWrapAndPBEWith.java:170:28:170:55 | jca/AesWrapAndPBEWith.java:170:28:170:55 |
+| jca/AesWrapAndPBEWith.java:170:28:170:55 | KeyDerivation | Iterations | Constant:10000 | jca/AesWrapAndPBEWith.java:168:72:168:76 | jca/AesWrapAndPBEWith.java:168:72:168:76 |
+| jca/AesWrapAndPBEWith.java:170:28:170:55 | KeyDerivation | KeySize | Constant:128 | jca/AesWrapAndPBEWith.java:168:79:168:81 | jca/AesWrapAndPBEWith.java:168:79:168:81 |
+| jca/AesWrapAndPBEWith.java:173:44:173:65 | KeyOperationAlgorithm | Name | AES | jca/AesWrapAndPBEWith.java:173:44:173:65 | jca/AesWrapAndPBEWith.java:173:44:173:65 |
+| jca/AesWrapAndPBEWith.java:173:44:173:65 | KeyOperationAlgorithm | RawName | AES/CBC/PKCS5Padding | jca/AesWrapAndPBEWith.java:173:44:173:65 | jca/AesWrapAndPBEWith.java:173:44:173:65 |
+| jca/AesWrapAndPBEWith.java:173:44:173:65 | KeyOperationAlgorithm | Structure | Block | jca/AesWrapAndPBEWith.java:173:44:173:65 | jca/AesWrapAndPBEWith.java:173:44:173:65 |
+| jca/AesWrapAndPBEWith.java:173:44:173:65 | ModeOfOperation | Name | CBC | jca/AesWrapAndPBEWith.java:173:44:173:65 | jca/AesWrapAndPBEWith.java:173:44:173:65 |
+| jca/AesWrapAndPBEWith.java:173:44:173:65 | ModeOfOperation | RawName | CBC | jca/AesWrapAndPBEWith.java:173:44:173:65 | jca/AesWrapAndPBEWith.java:173:44:173:65 |
+| jca/AesWrapAndPBEWith.java:173:44:173:65 | PaddingAlgorithm | Name | PKCS7 | jca/AesWrapAndPBEWith.java:173:44:173:65 | jca/AesWrapAndPBEWith.java:173:44:173:65 |
+| jca/AesWrapAndPBEWith.java:173:44:173:65 | PaddingAlgorithm | RawName | PKCS5Padding | jca/AesWrapAndPBEWith.java:173:44:173:65 | jca/AesWrapAndPBEWith.java:173:44:173:65 |
+| jca/AesWrapAndPBEWith.java:175:38:175:39 | RandomNumberGeneration | Description | java.security.SecureRandom | jca/AesWrapAndPBEWith.java:175:38:175:39 | jca/AesWrapAndPBEWith.java:175:38:175:39 |
+| jca/AesWrapAndPBEWith.java:177:42:177:47 | Key | KeyType | Unknown | jca/AesWrapAndPBEWith.java:177:42:177:47 | jca/AesWrapAndPBEWith.java:177:42:177:47 |
+| jca/AesWrapAndPBEWith.java:178:29:178:64 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/AesWrapAndPBEWith.java:178:29:178:64 | jca/AesWrapAndPBEWith.java:178:29:178:64 |
+| jca/AesWrapAndPBEWith.java:200:55:200:69 | Parameter | Description | password | jca/AesWrapAndPBEWith.java:200:55:200:69 | jca/AesWrapAndPBEWith.java:200:55:200:69 |
+| jca/AesWrapAndPBEWith.java:200:72:200:87 | Parameter | Description | plaintext | jca/AesWrapAndPBEWith.java:200:72:200:87 | jca/AesWrapAndPBEWith.java:200:72:200:87 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:86:47:86:57 | EllipticCurve | CurveType | SEC | jca/AsymmetricEncryptionMacHybridCryptosystem.java:86:47:86:57 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:86:47:86:57 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:86:47:86:57 | EllipticCurve | KeySize | 256 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:86:47:86:57 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:86:47:86:57 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:86:47:86:57 | EllipticCurve | Name | secp256r1 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:86:47:86:57 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:86:47:86:57 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:86:47:86:57 | EllipticCurve | ParsedName | secp256r1 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:86:47:86:57 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:86:47:86:57 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:86:47:86:57 | EllipticCurve | RawName | secp256r1 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:86:47:86:57 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:86:47:86:57 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:87:16:87:36 | Key | KeyType | Asymmetric | jca/AsymmetricEncryptionMacHybridCryptosystem.java:87:16:87:36 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:87:16:87:36 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:94:61:94:68 | KeyAgreementAlgorithm | Name | X25519 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:94:61:94:68 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:94:61:94:68 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:94:61:94:68 | KeyAgreementAlgorithm | RawName | X25519 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:94:61:94:68 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:94:61:94:68 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:95:24:95:26 | Constant | Description | 255 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:95:24:95:26 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:95:24:95:26 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:96:16:96:36 | Key | KeyType | Asymmetric | jca/AsymmetricEncryptionMacHybridCryptosystem.java:96:16:96:36 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:96:16:96:36 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:109:17:109:26 | Key | KeyType | Unknown | jca/AsymmetricEncryptionMacHybridCryptosystem.java:109:17:109:26 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:109:17:109:26 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:110:20:110:28 | Key | KeyType | Unknown | jca/AsymmetricEncryptionMacHybridCryptosystem.java:110:20:110:28 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:110:20:110:28 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:123:58:123:66 | HashAlgorithm | DigestSize | 256 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:123:58:123:66 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:123:58:123:66 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:123:58:123:66 | HashAlgorithm | Name | SHA2 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:123:58:123:66 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:123:58:123:66 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:123:58:123:66 | HashAlgorithm | RawName | SHA-256 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:123:58:123:66 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:123:58:123:66 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:145:61:145:65 | KeyOperationAlgorithm | KeySize | Constant:2048 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:146:24:146:27 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:146:24:146:27 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:145:61:145:65 | KeyOperationAlgorithm | Name | RSA | jca/AsymmetricEncryptionMacHybridCryptosystem.java:145:61:145:65 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:145:61:145:65 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:145:61:145:65 | KeyOperationAlgorithm | RawName | RSA | jca/AsymmetricEncryptionMacHybridCryptosystem.java:145:61:145:65 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:145:61:145:65 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:146:24:146:27 | Constant | Description | 2048 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:146:24:146:27 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:146:24:146:27 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:147:16:147:36 | Key | KeyType | Asymmetric | jca/AsymmetricEncryptionMacHybridCryptosystem.java:147:16:147:36 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:147:16:147:36 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:154:61:154:65 | KeyOperationAlgorithm | KeySize | Constant:1024 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:155:24:155:27 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:155:24:155:27 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:154:61:154:65 | KeyOperationAlgorithm | Name | RSA | jca/AsymmetricEncryptionMacHybridCryptosystem.java:154:61:154:65 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:154:61:154:65 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:154:61:154:65 | KeyOperationAlgorithm | RawName | RSA | jca/AsymmetricEncryptionMacHybridCryptosystem.java:154:61:154:65 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:154:61:154:65 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:155:24:155:27 | Constant | Description | 1024 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:155:24:155:27 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:155:24:155:27 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:156:16:156:36 | Key | KeyType | Asymmetric | jca/AsymmetricEncryptionMacHybridCryptosystem.java:156:16:156:36 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:156:16:156:36 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:166:47:166:85 | HashAlgorithm | DigestSize | 256 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:166:47:166:85 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:166:47:166:85 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:166:47:166:85 | HashAlgorithm | Name | SHA2 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:166:47:166:85 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:166:47:166:85 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:166:47:166:85 | HashAlgorithm | RawName | OAEPWithSHA-256AndMGF1Padding | jca/AsymmetricEncryptionMacHybridCryptosystem.java:166:47:166:85 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:166:47:166:85 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:166:47:166:85 | KeyOperationAlgorithm | Name | RSA | jca/AsymmetricEncryptionMacHybridCryptosystem.java:166:47:166:85 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:166:47:166:85 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:166:47:166:85 | KeyOperationAlgorithm | RawName | RSA/ECB/OAEPWithSHA-256AndMGF1Padding | jca/AsymmetricEncryptionMacHybridCryptosystem.java:166:47:166:85 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:166:47:166:85 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:166:47:166:85 | ModeOfOperation | Name | ECB | jca/AsymmetricEncryptionMacHybridCryptosystem.java:166:47:166:85 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:166:47:166:85 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:166:47:166:85 | ModeOfOperation | RawName | ECB | jca/AsymmetricEncryptionMacHybridCryptosystem.java:166:47:166:85 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:166:47:166:85 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:166:47:166:85 | PaddingAlgorithm | Name | OAEP | jca/AsymmetricEncryptionMacHybridCryptosystem.java:166:47:166:85 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:166:47:166:85 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:166:47:166:85 | PaddingAlgorithm | RawName | OAEPWithSHA-256AndMGF1Padding | jca/AsymmetricEncryptionMacHybridCryptosystem.java:166:47:166:85 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:166:47:166:85 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:167:42:167:58 | Key | KeyType | Unknown | jca/AsymmetricEncryptionMacHybridCryptosystem.java:167:42:167:58 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:167:42:167:58 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:168:34:168:55 | WrapOperation | KeyOperationSubtype | Wrap | jca/AsymmetricEncryptionMacHybridCryptosystem.java:168:34:168:55 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:168:34:168:55 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:171:38:171:39 | RandomNumberGeneration | Description | java.security.SecureRandom | jca/AsymmetricEncryptionMacHybridCryptosystem.java:171:38:171:39 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:171:38:171:39 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:172:47:172:65 | KeyOperationAlgorithm | Name | AES | jca/AsymmetricEncryptionMacHybridCryptosystem.java:172:47:172:65 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:172:47:172:65 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:172:47:172:65 | KeyOperationAlgorithm | RawName | AES/GCM/NoPadding | jca/AsymmetricEncryptionMacHybridCryptosystem.java:172:47:172:65 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:172:47:172:65 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:172:47:172:65 | KeyOperationAlgorithm | Structure | Block | jca/AsymmetricEncryptionMacHybridCryptosystem.java:172:47:172:65 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:172:47:172:65 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:172:47:172:65 | ModeOfOperation | Name | GCM | jca/AsymmetricEncryptionMacHybridCryptosystem.java:172:47:172:65 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:172:47:172:65 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:172:47:172:65 | ModeOfOperation | RawName | GCM | jca/AsymmetricEncryptionMacHybridCryptosystem.java:172:47:172:65 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:172:47:172:65 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:172:47:172:65 | PaddingAlgorithm | Name | UnknownPadding | jca/AsymmetricEncryptionMacHybridCryptosystem.java:172:47:172:65 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:172:47:172:65 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:172:47:172:65 | PaddingAlgorithm | RawName | NoPadding | jca/AsymmetricEncryptionMacHybridCryptosystem.java:172:47:172:65 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:172:47:172:65 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:173:45:173:50 | Key | KeyType | Unknown | jca/AsymmetricEncryptionMacHybridCryptosystem.java:173:45:173:50 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:173:45:173:50 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:174:29:174:56 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/AsymmetricEncryptionMacHybridCryptosystem.java:174:29:174:56 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:174:29:174:56 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:190:47:190:68 | KeyOperationAlgorithm | Name | RSA | jca/AsymmetricEncryptionMacHybridCryptosystem.java:190:47:190:68 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:190:47:190:68 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:190:47:190:68 | KeyOperationAlgorithm | RawName | RSA/ECB/PKCS1Padding | jca/AsymmetricEncryptionMacHybridCryptosystem.java:190:47:190:68 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:190:47:190:68 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:190:47:190:68 | ModeOfOperation | Name | ECB | jca/AsymmetricEncryptionMacHybridCryptosystem.java:190:47:190:68 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:190:47:190:68 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:190:47:190:68 | ModeOfOperation | RawName | ECB | jca/AsymmetricEncryptionMacHybridCryptosystem.java:190:47:190:68 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:190:47:190:68 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:190:47:190:68 | PaddingAlgorithm | Name | UnknownPadding | jca/AsymmetricEncryptionMacHybridCryptosystem.java:190:47:190:68 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:190:47:190:68 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:190:47:190:68 | PaddingAlgorithm | RawName | PKCS1Padding | jca/AsymmetricEncryptionMacHybridCryptosystem.java:190:47:190:68 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:190:47:190:68 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:191:42:191:58 | Key | KeyType | Unknown | jca/AsymmetricEncryptionMacHybridCryptosystem.java:191:42:191:58 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:191:42:191:58 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:192:34:192:55 | WrapOperation | KeyOperationSubtype | Wrap | jca/AsymmetricEncryptionMacHybridCryptosystem.java:192:34:192:55 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:192:34:192:55 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:195:47:195:65 | KeyOperationAlgorithm | Name | AES | jca/AsymmetricEncryptionMacHybridCryptosystem.java:195:47:195:65 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:195:47:195:65 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:195:47:195:65 | KeyOperationAlgorithm | RawName | AES/GCM/NoPadding | jca/AsymmetricEncryptionMacHybridCryptosystem.java:195:47:195:65 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:195:47:195:65 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:195:47:195:65 | KeyOperationAlgorithm | Structure | Block | jca/AsymmetricEncryptionMacHybridCryptosystem.java:195:47:195:65 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:195:47:195:65 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:195:47:195:65 | ModeOfOperation | Name | GCM | jca/AsymmetricEncryptionMacHybridCryptosystem.java:195:47:195:65 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:195:47:195:65 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:195:47:195:65 | ModeOfOperation | RawName | GCM | jca/AsymmetricEncryptionMacHybridCryptosystem.java:195:47:195:65 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:195:47:195:65 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:195:47:195:65 | PaddingAlgorithm | Name | UnknownPadding | jca/AsymmetricEncryptionMacHybridCryptosystem.java:195:47:195:65 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:195:47:195:65 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:195:47:195:65 | PaddingAlgorithm | RawName | NoPadding | jca/AsymmetricEncryptionMacHybridCryptosystem.java:195:47:195:65 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:195:47:195:65 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:196:45:196:50 | Key | KeyType | Unknown | jca/AsymmetricEncryptionMacHybridCryptosystem.java:196:45:196:50 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:196:45:196:50 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:197:29:197:56 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/AsymmetricEncryptionMacHybridCryptosystem.java:197:29:197:56 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:197:29:197:56 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:215:91:215:96 | KeyAgreementAlgorithm | Name | ECDH | jca/AsymmetricEncryptionMacHybridCryptosystem.java:215:91:215:96 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:215:91:215:96 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:215:91:215:96 | KeyAgreementAlgorithm | RawName | ECDH | jca/AsymmetricEncryptionMacHybridCryptosystem.java:215:91:215:96 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:215:91:215:96 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:220:38:220:39 | RandomNumberGeneration | Description | java.security.SecureRandom | jca/AsymmetricEncryptionMacHybridCryptosystem.java:220:38:220:39 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:220:38:220:39 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:221:44:221:62 | KeyOperationAlgorithm | Name | AES | jca/AsymmetricEncryptionMacHybridCryptosystem.java:221:44:221:62 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:221:44:221:62 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:221:44:221:62 | KeyOperationAlgorithm | RawName | AES/GCM/NoPadding | jca/AsymmetricEncryptionMacHybridCryptosystem.java:221:44:221:62 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:221:44:221:62 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:221:44:221:62 | KeyOperationAlgorithm | Structure | Block | jca/AsymmetricEncryptionMacHybridCryptosystem.java:221:44:221:62 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:221:44:221:62 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:221:44:221:62 | ModeOfOperation | Name | GCM | jca/AsymmetricEncryptionMacHybridCryptosystem.java:221:44:221:62 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:221:44:221:62 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:221:44:221:62 | ModeOfOperation | RawName | GCM | jca/AsymmetricEncryptionMacHybridCryptosystem.java:221:44:221:62 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:221:44:221:62 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:221:44:221:62 | PaddingAlgorithm | Name | UnknownPadding | jca/AsymmetricEncryptionMacHybridCryptosystem.java:221:44:221:62 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:221:44:221:62 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:221:44:221:62 | PaddingAlgorithm | RawName | NoPadding | jca/AsymmetricEncryptionMacHybridCryptosystem.java:221:44:221:62 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:221:44:221:62 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:222:42:222:47 | Key | KeyType | Unknown | jca/AsymmetricEncryptionMacHybridCryptosystem.java:222:42:222:47 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:222:42:222:47 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:223:29:223:53 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/AsymmetricEncryptionMacHybridCryptosystem.java:223:29:223:53 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:223:29:223:53 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:239:95:239:100 | KeyAgreementAlgorithm | Name | ECDH | jca/AsymmetricEncryptionMacHybridCryptosystem.java:239:95:239:100 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:239:95:239:100 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:239:95:239:100 | KeyAgreementAlgorithm | RawName | ECDH | jca/AsymmetricEncryptionMacHybridCryptosystem.java:239:95:239:100 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:239:95:239:100 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:244:44:244:62 | KeyOperationAlgorithm | Name | AES | jca/AsymmetricEncryptionMacHybridCryptosystem.java:244:44:244:62 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:244:44:244:62 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:244:44:244:62 | KeyOperationAlgorithm | RawName | AES/GCM/NoPadding | jca/AsymmetricEncryptionMacHybridCryptosystem.java:244:44:244:62 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:244:44:244:62 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:244:44:244:62 | KeyOperationAlgorithm | Structure | Block | jca/AsymmetricEncryptionMacHybridCryptosystem.java:244:44:244:62 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:244:44:244:62 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:244:44:244:62 | ModeOfOperation | Name | GCM | jca/AsymmetricEncryptionMacHybridCryptosystem.java:244:44:244:62 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:244:44:244:62 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:244:44:244:62 | ModeOfOperation | RawName | GCM | jca/AsymmetricEncryptionMacHybridCryptosystem.java:244:44:244:62 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:244:44:244:62 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:244:44:244:62 | PaddingAlgorithm | Name | UnknownPadding | jca/AsymmetricEncryptionMacHybridCryptosystem.java:244:44:244:62 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:244:44:244:62 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:244:44:244:62 | PaddingAlgorithm | RawName | NoPadding | jca/AsymmetricEncryptionMacHybridCryptosystem.java:244:44:244:62 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:244:44:244:62 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:245:42:245:47 | Key | KeyType | Unknown | jca/AsymmetricEncryptionMacHybridCryptosystem.java:245:42:245:47 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:245:42:245:47 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:246:29:246:53 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/AsymmetricEncryptionMacHybridCryptosystem.java:246:29:246:53 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:246:29:246:53 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:271:58:271:73 | Parameter | Description | plaintext | jca/AsymmetricEncryptionMacHybridCryptosystem.java:271:58:271:73 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:271:58:271:73 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:295:35:295:46 | HMACAlgorithm | Name | HMAC | jca/AsymmetricEncryptionMacHybridCryptosystem.java:295:35:295:46 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:295:35:295:46 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:295:35:295:46 | HMACAlgorithm | RawName | HmacSHA256 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:295:35:295:46 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:295:35:295:46 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:295:35:295:46 | HashAlgorithm | DigestSize | 256 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:295:35:295:46 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:295:35:295:46 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:295:35:295:46 | HashAlgorithm | Name | SHA2 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:295:35:295:46 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:295:35:295:46 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:295:35:295:46 | HashAlgorithm | RawName | HmacSHA256 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:295:35:295:46 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:295:35:295:46 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:297:18:297:26 | Key | KeyType | Unknown | jca/AsymmetricEncryptionMacHybridCryptosystem.java:297:18:297:26 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:297:18:297:26 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:298:16:298:46 | MACOperation | KeyOperationSubtype | Mac | jca/AsymmetricEncryptionMacHybridCryptosystem.java:298:16:298:46 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:298:16:298:46 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:306:35:306:44 | HMACAlgorithm | Name | HMAC | jca/AsymmetricEncryptionMacHybridCryptosystem.java:306:35:306:44 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:306:35:306:44 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:306:35:306:44 | HMACAlgorithm | RawName | HmacSHA1 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:306:35:306:44 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:306:35:306:44 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:306:35:306:44 | HashAlgorithm | DigestSize | 160 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:306:35:306:44 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:306:35:306:44 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:306:35:306:44 | HashAlgorithm | Name | SHA1 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:306:35:306:44 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:306:35:306:44 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:306:35:306:44 | HashAlgorithm | RawName | HmacSHA1 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:306:35:306:44 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:306:35:306:44 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:308:18:308:26 | Key | KeyType | Unknown | jca/AsymmetricEncryptionMacHybridCryptosystem.java:308:18:308:26 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:308:18:308:26 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:309:16:309:46 | MACOperation | KeyOperationSubtype | Mac | jca/AsymmetricEncryptionMacHybridCryptosystem.java:309:16:309:46 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:309:16:309:46 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:320:52:320:56 | KeyOperationAlgorithm | KeySize | Constant:256 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:321:17:321:19 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:321:17:321:19 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:320:52:320:56 | KeyOperationAlgorithm | Name | AES | jca/AsymmetricEncryptionMacHybridCryptosystem.java:320:52:320:56 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:320:52:320:56 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:320:52:320:56 | KeyOperationAlgorithm | RawName | AES | jca/AsymmetricEncryptionMacHybridCryptosystem.java:320:52:320:56 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:320:52:320:56 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:320:52:320:56 | KeyOperationAlgorithm | Structure | Block | jca/AsymmetricEncryptionMacHybridCryptosystem.java:320:52:320:56 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:320:52:320:56 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:321:17:321:19 | Constant | Description | 256 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:321:17:321:19 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:321:17:321:19 |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:322:16:322:31 | Key | KeyType | Symmetric | jca/AsymmetricEncryptionMacHybridCryptosystem.java:322:16:322:31 | jca/AsymmetricEncryptionMacHybridCryptosystem.java:322:16:322:31 |
+| jca/ChainedEncryptionTest.java:19:44:19:62 | KeyOperationAlgorithm | Name | AES | jca/ChainedEncryptionTest.java:19:44:19:62 | jca/ChainedEncryptionTest.java:19:44:19:62 |
+| jca/ChainedEncryptionTest.java:19:44:19:62 | KeyOperationAlgorithm | RawName | AES/GCM/NoPadding | jca/ChainedEncryptionTest.java:19:44:19:62 | jca/ChainedEncryptionTest.java:19:44:19:62 |
+| jca/ChainedEncryptionTest.java:19:44:19:62 | KeyOperationAlgorithm | Structure | Block | jca/ChainedEncryptionTest.java:19:44:19:62 | jca/ChainedEncryptionTest.java:19:44:19:62 |
+| jca/ChainedEncryptionTest.java:19:44:19:62 | ModeOfOperation | Name | GCM | jca/ChainedEncryptionTest.java:19:44:19:62 | jca/ChainedEncryptionTest.java:19:44:19:62 |
+| jca/ChainedEncryptionTest.java:19:44:19:62 | ModeOfOperation | RawName | GCM | jca/ChainedEncryptionTest.java:19:44:19:62 | jca/ChainedEncryptionTest.java:19:44:19:62 |
+| jca/ChainedEncryptionTest.java:19:44:19:62 | PaddingAlgorithm | Name | UnknownPadding | jca/ChainedEncryptionTest.java:19:44:19:62 | jca/ChainedEncryptionTest.java:19:44:19:62 |
+| jca/ChainedEncryptionTest.java:19:44:19:62 | PaddingAlgorithm | RawName | NoPadding | jca/ChainedEncryptionTest.java:19:44:19:62 | jca/ChainedEncryptionTest.java:19:44:19:62 |
+| jca/ChainedEncryptionTest.java:21:38:21:39 | RandomNumberGeneration | Description | java.security.SecureRandom | jca/ChainedEncryptionTest.java:21:38:21:39 | jca/ChainedEncryptionTest.java:21:38:21:39 |
+| jca/ChainedEncryptionTest.java:23:42:23:44 | Key | KeyType | Unknown | jca/ChainedEncryptionTest.java:23:42:23:44 | jca/ChainedEncryptionTest.java:23:42:23:44 |
+| jca/ChainedEncryptionTest.java:24:29:24:53 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/ChainedEncryptionTest.java:24:29:24:53 | jca/ChainedEncryptionTest.java:24:29:24:53 |
+| jca/ChainedEncryptionTest.java:32:44:32:62 | KeyOperationAlgorithm | Name | AES | jca/ChainedEncryptionTest.java:32:44:32:62 | jca/ChainedEncryptionTest.java:32:44:32:62 |
+| jca/ChainedEncryptionTest.java:32:44:32:62 | KeyOperationAlgorithm | RawName | AES/GCM/NoPadding | jca/ChainedEncryptionTest.java:32:44:32:62 | jca/ChainedEncryptionTest.java:32:44:32:62 |
+| jca/ChainedEncryptionTest.java:32:44:32:62 | KeyOperationAlgorithm | Structure | Block | jca/ChainedEncryptionTest.java:32:44:32:62 | jca/ChainedEncryptionTest.java:32:44:32:62 |
+| jca/ChainedEncryptionTest.java:32:44:32:62 | ModeOfOperation | Name | GCM | jca/ChainedEncryptionTest.java:32:44:32:62 | jca/ChainedEncryptionTest.java:32:44:32:62 |
+| jca/ChainedEncryptionTest.java:32:44:32:62 | ModeOfOperation | RawName | GCM | jca/ChainedEncryptionTest.java:32:44:32:62 | jca/ChainedEncryptionTest.java:32:44:32:62 |
+| jca/ChainedEncryptionTest.java:32:44:32:62 | PaddingAlgorithm | Name | UnknownPadding | jca/ChainedEncryptionTest.java:32:44:32:62 | jca/ChainedEncryptionTest.java:32:44:32:62 |
+| jca/ChainedEncryptionTest.java:32:44:32:62 | PaddingAlgorithm | RawName | NoPadding | jca/ChainedEncryptionTest.java:32:44:32:62 | jca/ChainedEncryptionTest.java:32:44:32:62 |
+| jca/ChainedEncryptionTest.java:34:42:34:44 | Key | KeyType | Unknown | jca/ChainedEncryptionTest.java:34:42:34:44 | jca/ChainedEncryptionTest.java:34:42:34:44 |
+| jca/ChainedEncryptionTest.java:35:16:35:41 | DecryptOperation | KeyOperationSubtype | Decrypt | jca/ChainedEncryptionTest.java:35:16:35:41 | jca/ChainedEncryptionTest.java:35:16:35:41 |
+| jca/ChainedEncryptionTest.java:40:44:40:62 | KeyOperationAlgorithm | Name | Unknown | jca/ChainedEncryptionTest.java:40:44:40:62 | jca/ChainedEncryptionTest.java:40:44:40:62 |
+| jca/ChainedEncryptionTest.java:40:44:40:62 | KeyOperationAlgorithm | RawName | ChaCha20-Poly1305 | jca/ChainedEncryptionTest.java:40:44:40:62 | jca/ChainedEncryptionTest.java:40:44:40:62 |
+| jca/ChainedEncryptionTest.java:42:38:42:42 | RandomNumberGeneration | Description | java.security.SecureRandom | jca/ChainedEncryptionTest.java:42:38:42:42 | jca/ChainedEncryptionTest.java:42:38:42:42 |
+| jca/ChainedEncryptionTest.java:43:42:43:44 | Key | KeyType | Unknown | jca/ChainedEncryptionTest.java:43:42:43:44 | jca/ChainedEncryptionTest.java:43:42:43:44 |
+| jca/ChainedEncryptionTest.java:44:29:44:53 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/ChainedEncryptionTest.java:44:29:44:53 | jca/ChainedEncryptionTest.java:44:29:44:53 |
+| jca/ChainedEncryptionTest.java:52:44:52:62 | KeyOperationAlgorithm | Name | Unknown | jca/ChainedEncryptionTest.java:52:44:52:62 | jca/ChainedEncryptionTest.java:52:44:52:62 |
+| jca/ChainedEncryptionTest.java:52:44:52:62 | KeyOperationAlgorithm | RawName | ChaCha20-Poly1305 | jca/ChainedEncryptionTest.java:52:44:52:62 | jca/ChainedEncryptionTest.java:52:44:52:62 |
+| jca/ChainedEncryptionTest.java:53:42:53:44 | Key | KeyType | Unknown | jca/ChainedEncryptionTest.java:53:42:53:44 | jca/ChainedEncryptionTest.java:53:42:53:44 |
+| jca/ChainedEncryptionTest.java:54:16:54:41 | DecryptOperation | KeyOperationSubtype | Decrypt | jca/ChainedEncryptionTest.java:54:16:54:41 | jca/ChainedEncryptionTest.java:54:16:54:41 |
+| jca/ChainedEncryptionTest.java:75:46:75:61 | Parameter | Description | plaintext | jca/ChainedEncryptionTest.java:75:46:75:61 | jca/ChainedEncryptionTest.java:75:46:75:61 |
+| jca/ChainedEncryptionTest.java:79:56:79:60 | KeyOperationAlgorithm | KeySize | Constant:256 | jca/ChainedEncryptionTest.java:80:21:80:23 | jca/ChainedEncryptionTest.java:80:21:80:23 |
+| jca/ChainedEncryptionTest.java:79:56:79:60 | KeyOperationAlgorithm | Name | AES | jca/ChainedEncryptionTest.java:79:56:79:60 | jca/ChainedEncryptionTest.java:79:56:79:60 |
+| jca/ChainedEncryptionTest.java:79:56:79:60 | KeyOperationAlgorithm | RawName | AES | jca/ChainedEncryptionTest.java:79:56:79:60 | jca/ChainedEncryptionTest.java:79:56:79:60 |
+| jca/ChainedEncryptionTest.java:79:56:79:60 | KeyOperationAlgorithm | Structure | Block | jca/ChainedEncryptionTest.java:79:56:79:60 | jca/ChainedEncryptionTest.java:79:56:79:60 |
+| jca/ChainedEncryptionTest.java:80:21:80:23 | Constant | Description | 256 | jca/ChainedEncryptionTest.java:80:21:80:23 | jca/ChainedEncryptionTest.java:80:21:80:23 |
+| jca/ChainedEncryptionTest.java:81:30:81:49 | Key | KeyType | Symmetric | jca/ChainedEncryptionTest.java:81:30:81:49 | jca/ChainedEncryptionTest.java:81:30:81:49 |
+| jca/ChainedEncryptionTest.java:83:59:83:68 | KeyOperationAlgorithm | KeySize | 256 | jca/ChainedEncryptionTest.java:83:59:83:68 | jca/ChainedEncryptionTest.java:83:59:83:68 |
+| jca/ChainedEncryptionTest.java:83:59:83:68 | KeyOperationAlgorithm | KeySize | Constant:256 | jca/ChainedEncryptionTest.java:84:24:84:26 | jca/ChainedEncryptionTest.java:84:24:84:26 |
+| jca/ChainedEncryptionTest.java:83:59:83:68 | KeyOperationAlgorithm | Name | ChaCha20 | jca/ChainedEncryptionTest.java:83:59:83:68 | jca/ChainedEncryptionTest.java:83:59:83:68 |
+| jca/ChainedEncryptionTest.java:83:59:83:68 | KeyOperationAlgorithm | RawName | ChaCha20 | jca/ChainedEncryptionTest.java:83:59:83:68 | jca/ChainedEncryptionTest.java:83:59:83:68 |
+| jca/ChainedEncryptionTest.java:83:59:83:68 | KeyOperationAlgorithm | Structure | Stream | jca/ChainedEncryptionTest.java:83:59:83:68 | jca/ChainedEncryptionTest.java:83:59:83:68 |
+| jca/ChainedEncryptionTest.java:84:24:84:26 | Constant | Description | 256 | jca/ChainedEncryptionTest.java:84:24:84:26 | jca/ChainedEncryptionTest.java:84:24:84:26 |
+| jca/ChainedEncryptionTest.java:85:30:85:52 | Key | KeyType | Symmetric | jca/ChainedEncryptionTest.java:85:30:85:52 | jca/ChainedEncryptionTest.java:85:30:85:52 |
+| jca/ChainedEncryptionTest.java:89:38:89:42 | RandomNumberGeneration | Description | java.security.SecureRandom | jca/ChainedEncryptionTest.java:89:38:89:42 | jca/ChainedEncryptionTest.java:89:38:89:42 |
+| jca/ChainedEncryptionTest.java:90:47:90:65 | KeyOperationAlgorithm | Name | AES | jca/ChainedEncryptionTest.java:90:47:90:65 | jca/ChainedEncryptionTest.java:90:47:90:65 |
+| jca/ChainedEncryptionTest.java:90:47:90:65 | KeyOperationAlgorithm | RawName | AES/GCM/NoPadding | jca/ChainedEncryptionTest.java:90:47:90:65 | jca/ChainedEncryptionTest.java:90:47:90:65 |
+| jca/ChainedEncryptionTest.java:90:47:90:65 | KeyOperationAlgorithm | Structure | Block | jca/ChainedEncryptionTest.java:90:47:90:65 | jca/ChainedEncryptionTest.java:90:47:90:65 |
+| jca/ChainedEncryptionTest.java:90:47:90:65 | ModeOfOperation | Name | GCM | jca/ChainedEncryptionTest.java:90:47:90:65 | jca/ChainedEncryptionTest.java:90:47:90:65 |
+| jca/ChainedEncryptionTest.java:90:47:90:65 | ModeOfOperation | RawName | GCM | jca/ChainedEncryptionTest.java:90:47:90:65 | jca/ChainedEncryptionTest.java:90:47:90:65 |
+| jca/ChainedEncryptionTest.java:90:47:90:65 | PaddingAlgorithm | Name | UnknownPadding | jca/ChainedEncryptionTest.java:90:47:90:65 | jca/ChainedEncryptionTest.java:90:47:90:65 |
+| jca/ChainedEncryptionTest.java:90:47:90:65 | PaddingAlgorithm | RawName | NoPadding | jca/ChainedEncryptionTest.java:90:47:90:65 | jca/ChainedEncryptionTest.java:90:47:90:65 |
+| jca/ChainedEncryptionTest.java:92:45:92:52 | Key | KeyType | Unknown | jca/ChainedEncryptionTest.java:92:45:92:52 | jca/ChainedEncryptionTest.java:92:45:92:52 |
+| jca/ChainedEncryptionTest.java:93:34:93:62 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/ChainedEncryptionTest.java:93:34:93:62 | jca/ChainedEncryptionTest.java:93:34:93:62 |
+| jca/ChainedEncryptionTest.java:97:38:97:48 | RandomNumberGeneration | Description | java.security.SecureRandom | jca/ChainedEncryptionTest.java:97:38:97:48 | jca/ChainedEncryptionTest.java:97:38:97:48 |
+| jca/ChainedEncryptionTest.java:98:50:98:68 | KeyOperationAlgorithm | Name | Unknown | jca/ChainedEncryptionTest.java:98:50:98:68 | jca/ChainedEncryptionTest.java:98:50:98:68 |
+| jca/ChainedEncryptionTest.java:98:50:98:68 | KeyOperationAlgorithm | RawName | ChaCha20-Poly1305 | jca/ChainedEncryptionTest.java:98:50:98:68 | jca/ChainedEncryptionTest.java:98:50:98:68 |
+| jca/ChainedEncryptionTest.java:99:48:99:55 | Key | KeyType | Unknown | jca/ChainedEncryptionTest.java:99:48:99:55 | jca/ChainedEncryptionTest.java:99:48:99:55 |
+| jca/ChainedEncryptionTest.java:100:34:100:70 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/ChainedEncryptionTest.java:100:34:100:70 | jca/ChainedEncryptionTest.java:100:34:100:70 |
+| jca/ChainedEncryptionTest.java:103:47:103:65 | KeyOperationAlgorithm | Name | Unknown | jca/ChainedEncryptionTest.java:103:47:103:65 | jca/ChainedEncryptionTest.java:103:47:103:65 |
+| jca/ChainedEncryptionTest.java:103:47:103:65 | KeyOperationAlgorithm | RawName | ChaCha20-Poly1305 | jca/ChainedEncryptionTest.java:103:47:103:65 | jca/ChainedEncryptionTest.java:103:47:103:65 |
+| jca/ChainedEncryptionTest.java:104:45:104:52 | Key | KeyType | Unknown | jca/ChainedEncryptionTest.java:104:45:104:52 | jca/ChainedEncryptionTest.java:104:45:104:52 |
+| jca/ChainedEncryptionTest.java:105:43:105:76 | DecryptOperation | KeyOperationSubtype | Decrypt | jca/ChainedEncryptionTest.java:105:43:105:76 | jca/ChainedEncryptionTest.java:105:43:105:76 |
+| jca/ChainedEncryptionTest.java:108:44:108:62 | KeyOperationAlgorithm | Name | AES | jca/ChainedEncryptionTest.java:108:44:108:62 | jca/ChainedEncryptionTest.java:108:44:108:62 |
+| jca/ChainedEncryptionTest.java:108:44:108:62 | KeyOperationAlgorithm | RawName | AES/GCM/NoPadding | jca/ChainedEncryptionTest.java:108:44:108:62 | jca/ChainedEncryptionTest.java:108:44:108:62 |
+| jca/ChainedEncryptionTest.java:108:44:108:62 | KeyOperationAlgorithm | Structure | Block | jca/ChainedEncryptionTest.java:108:44:108:62 | jca/ChainedEncryptionTest.java:108:44:108:62 |
+| jca/ChainedEncryptionTest.java:108:44:108:62 | ModeOfOperation | Name | GCM | jca/ChainedEncryptionTest.java:108:44:108:62 | jca/ChainedEncryptionTest.java:108:44:108:62 |
+| jca/ChainedEncryptionTest.java:108:44:108:62 | ModeOfOperation | RawName | GCM | jca/ChainedEncryptionTest.java:108:44:108:62 | jca/ChainedEncryptionTest.java:108:44:108:62 |
+| jca/ChainedEncryptionTest.java:108:44:108:62 | PaddingAlgorithm | Name | UnknownPadding | jca/ChainedEncryptionTest.java:108:44:108:62 | jca/ChainedEncryptionTest.java:108:44:108:62 |
+| jca/ChainedEncryptionTest.java:108:44:108:62 | PaddingAlgorithm | RawName | NoPadding | jca/ChainedEncryptionTest.java:108:44:108:62 | jca/ChainedEncryptionTest.java:108:44:108:62 |
+| jca/ChainedEncryptionTest.java:109:42:109:49 | Key | KeyType | Unknown | jca/ChainedEncryptionTest.java:109:42:109:49 | jca/ChainedEncryptionTest.java:109:42:109:49 |
+| jca/ChainedEncryptionTest.java:110:37:110:76 | DecryptOperation | KeyOperationSubtype | Decrypt | jca/ChainedEncryptionTest.java:110:37:110:76 | jca/ChainedEncryptionTest.java:110:37:110:76 |
+| jca/ChainedEncryptionTest.java:117:56:117:60 | KeyOperationAlgorithm | KeySize | Constant:256 | jca/ChainedEncryptionTest.java:118:21:118:23 | jca/ChainedEncryptionTest.java:118:21:118:23 |
+| jca/ChainedEncryptionTest.java:117:56:117:60 | KeyOperationAlgorithm | Name | AES | jca/ChainedEncryptionTest.java:117:56:117:60 | jca/ChainedEncryptionTest.java:117:56:117:60 |
+| jca/ChainedEncryptionTest.java:117:56:117:60 | KeyOperationAlgorithm | RawName | AES | jca/ChainedEncryptionTest.java:117:56:117:60 | jca/ChainedEncryptionTest.java:117:56:117:60 |
+| jca/ChainedEncryptionTest.java:117:56:117:60 | KeyOperationAlgorithm | Structure | Block | jca/ChainedEncryptionTest.java:117:56:117:60 | jca/ChainedEncryptionTest.java:117:56:117:60 |
+| jca/ChainedEncryptionTest.java:118:21:118:23 | Constant | Description | 256 | jca/ChainedEncryptionTest.java:118:21:118:23 | jca/ChainedEncryptionTest.java:118:21:118:23 |
+| jca/ChainedEncryptionTest.java:119:28:119:47 | Key | KeyType | Symmetric | jca/ChainedEncryptionTest.java:119:28:119:47 | jca/ChainedEncryptionTest.java:119:28:119:47 |
+| jca/ChainedEncryptionTest.java:122:59:122:68 | KeyOperationAlgorithm | KeySize | 256 | jca/ChainedEncryptionTest.java:122:59:122:68 | jca/ChainedEncryptionTest.java:122:59:122:68 |
+| jca/ChainedEncryptionTest.java:122:59:122:68 | KeyOperationAlgorithm | KeySize | Constant:256 | jca/ChainedEncryptionTest.java:123:24:123:26 | jca/ChainedEncryptionTest.java:123:24:123:26 |
+| jca/ChainedEncryptionTest.java:122:59:122:68 | KeyOperationAlgorithm | Name | ChaCha20 | jca/ChainedEncryptionTest.java:122:59:122:68 | jca/ChainedEncryptionTest.java:122:59:122:68 |
+| jca/ChainedEncryptionTest.java:122:59:122:68 | KeyOperationAlgorithm | RawName | ChaCha20 | jca/ChainedEncryptionTest.java:122:59:122:68 | jca/ChainedEncryptionTest.java:122:59:122:68 |
+| jca/ChainedEncryptionTest.java:122:59:122:68 | KeyOperationAlgorithm | Structure | Stream | jca/ChainedEncryptionTest.java:122:59:122:68 | jca/ChainedEncryptionTest.java:122:59:122:68 |
+| jca/ChainedEncryptionTest.java:123:24:123:26 | Constant | Description | 256 | jca/ChainedEncryptionTest.java:123:24:123:26 | jca/ChainedEncryptionTest.java:123:24:123:26 |
+| jca/ChainedEncryptionTest.java:124:31:124:53 | Key | KeyType | Symmetric | jca/ChainedEncryptionTest.java:124:31:124:53 | jca/ChainedEncryptionTest.java:124:31:124:53 |
+| jca/ChainedEncryptionTest.java:126:31:126:57 | Constant | Description | "This is a secret message." | jca/ChainedEncryptionTest.java:126:31:126:57 | jca/ChainedEncryptionTest.java:126:31:126:57 |
+| jca/Digest.java:54:58:54:66 | HashAlgorithm | DigestSize | 256 | jca/Digest.java:54:58:54:66 | jca/Digest.java:54:58:54:66 |
+| jca/Digest.java:54:58:54:66 | HashAlgorithm | Name | SHA2 | jca/Digest.java:54:58:54:66 | jca/Digest.java:54:58:54:66 |
+| jca/Digest.java:54:58:54:66 | HashAlgorithm | RawName | SHA-256 | jca/Digest.java:54:58:54:66 | jca/Digest.java:54:58:54:66 |
+| jca/Digest.java:55:37:55:54 | Constant | Description | "Simple Test Data" | jca/Digest.java:55:37:55:54 | jca/Digest.java:55:37:55:54 |
+| jca/Digest.java:64:61:64:65 | HashAlgorithm | DigestSize | 128 | jca/Digest.java:64:61:64:65 | jca/Digest.java:64:61:64:65 |
+| jca/Digest.java:64:61:64:65 | HashAlgorithm | Name | MD5 | jca/Digest.java:64:61:64:65 | jca/Digest.java:64:61:64:65 |
+| jca/Digest.java:64:61:64:65 | HashAlgorithm | RawName | MD5 | jca/Digest.java:64:61:64:65 | jca/Digest.java:64:61:64:65 |
+| jca/Digest.java:65:40:65:58 | Constant | Description | "Weak Hash Example" | jca/Digest.java:65:40:65:58 | jca/Digest.java:65:40:65:58 |
+| jca/Digest.java:73:49:73:63 | Parameter | Description | password | jca/Digest.java:73:49:73:63 | jca/Digest.java:73:49:73:63 |
+| jca/Digest.java:74:64:74:72 | HashAlgorithm | DigestSize | 256 | jca/Digest.java:74:64:74:72 | jca/Digest.java:74:64:74:72 |
+| jca/Digest.java:74:64:74:72 | HashAlgorithm | Name | SHA2 | jca/Digest.java:74:64:74:72 | jca/Digest.java:74:64:74:72 |
+| jca/Digest.java:74:64:74:72 | HashAlgorithm | RawName | SHA-256 | jca/Digest.java:74:64:74:72 | jca/Digest.java:74:64:74:72 |
+| jca/Digest.java:83:37:83:51 | Parameter | Description | password | jca/Digest.java:83:37:83:51 | jca/Digest.java:83:37:83:51 |
+| jca/Digest.java:85:58:85:66 | HashAlgorithm | DigestSize | 256 | jca/Digest.java:85:58:85:66 | jca/Digest.java:85:58:85:66 |
+| jca/Digest.java:85:58:85:66 | HashAlgorithm | Name | SHA2 | jca/Digest.java:85:58:85:66 | jca/Digest.java:85:58:85:66 |
+| jca/Digest.java:85:58:85:66 | HashAlgorithm | RawName | SHA-256 | jca/Digest.java:85:58:85:66 | jca/Digest.java:85:58:85:66 |
+| jca/Digest.java:95:37:95:51 | Parameter | Description | password | jca/Digest.java:95:37:95:51 | jca/Digest.java:95:37:95:51 |
+| jca/Digest.java:97:72:97:76 | Constant | Description | 10000 | jca/Digest.java:97:72:97:76 | jca/Digest.java:97:72:97:76 |
+| jca/Digest.java:97:79:97:81 | Constant | Description | 256 | jca/Digest.java:97:79:97:81 | jca/Digest.java:97:79:97:81 |
+| jca/Digest.java:98:65:98:86 | HMACAlgorithm | Name | HMAC | jca/Digest.java:98:65:98:86 | jca/Digest.java:98:65:98:86 |
+| jca/Digest.java:98:65:98:86 | HMACAlgorithm | RawName | PBKDF2WithHmacSHA256 | jca/Digest.java:98:65:98:86 | jca/Digest.java:98:65:98:86 |
+| jca/Digest.java:98:65:98:86 | HashAlgorithm | DigestSize | 256 | jca/Digest.java:98:65:98:86 | jca/Digest.java:98:65:98:86 |
+| jca/Digest.java:98:65:98:86 | HashAlgorithm | Name | SHA2 | jca/Digest.java:98:65:98:86 | jca/Digest.java:98:65:98:86 |
+| jca/Digest.java:98:65:98:86 | HashAlgorithm | RawName | PBKDF2WithHmacSHA256 | jca/Digest.java:98:65:98:86 | jca/Digest.java:98:65:98:86 |
+| jca/Digest.java:98:65:98:86 | KeyDerivationAlgorithm | Name | PBKDF2WithHmacSHA256 | jca/Digest.java:98:65:98:86 | jca/Digest.java:98:65:98:86 |
+| jca/Digest.java:98:65:98:86 | KeyDerivationAlgorithm | RawName | PBKDF2WithHmacSHA256 | jca/Digest.java:98:65:98:86 | jca/Digest.java:98:65:98:86 |
+| jca/Digest.java:99:23:99:50 | Key | KeyType | Symmetric | jca/Digest.java:99:23:99:50 | jca/Digest.java:99:23:99:50 |
+| jca/Digest.java:99:23:99:50 | KeyDerivation | Iterations | Constant:10000 | jca/Digest.java:97:72:97:76 | jca/Digest.java:97:72:97:76 |
+| jca/Digest.java:99:23:99:50 | KeyDerivation | KeySize | Constant:256 | jca/Digest.java:97:79:97:81 | jca/Digest.java:97:79:97:81 |
+| jca/Digest.java:107:40:107:51 | Parameter | Description | input | jca/Digest.java:107:40:107:51 | jca/Digest.java:107:40:107:51 |
+| jca/Digest.java:108:62:108:68 | HashAlgorithm | DigestSize | 160 | jca/Digest.java:108:62:108:68 | jca/Digest.java:108:62:108:68 |
+| jca/Digest.java:108:62:108:68 | HashAlgorithm | Name | SHA1 | jca/Digest.java:108:62:108:68 | jca/Digest.java:108:62:108:68 |
+| jca/Digest.java:108:62:108:68 | HashAlgorithm | RawName | SHA-1 | jca/Digest.java:108:62:108:68 | jca/Digest.java:108:62:108:68 |
+| jca/Digest.java:117:35:117:46 | Parameter | Description | input | jca/Digest.java:117:35:117:46 | jca/Digest.java:117:35:117:46 |
+| jca/Digest.java:117:49:117:58 | Parameter | Description | key | jca/Digest.java:117:49:117:58 | jca/Digest.java:117:49:117:58 |
+| jca/Digest.java:118:36:118:47 | HMACAlgorithm | Name | HMAC | jca/Digest.java:118:36:118:47 | jca/Digest.java:118:36:118:47 |
+| jca/Digest.java:118:36:118:47 | HMACAlgorithm | RawName | HmacSHA256 | jca/Digest.java:118:36:118:47 | jca/Digest.java:118:36:118:47 |
+| jca/Digest.java:118:36:118:47 | HashAlgorithm | DigestSize | 256 | jca/Digest.java:118:36:118:47 | jca/Digest.java:118:36:118:47 |
+| jca/Digest.java:118:36:118:47 | HashAlgorithm | Name | SHA2 | jca/Digest.java:118:36:118:47 | jca/Digest.java:118:36:118:47 |
+| jca/Digest.java:118:36:118:47 | HashAlgorithm | RawName | HmacSHA256 | jca/Digest.java:118:36:118:47 | jca/Digest.java:118:36:118:47 |
+| jca/Digest.java:120:19:120:27 | Key | KeyType | Unknown | jca/Digest.java:120:19:120:27 | jca/Digest.java:120:19:120:27 |
+| jca/Digest.java:121:23:121:52 | MACOperation | KeyOperationSubtype | Mac | jca/Digest.java:121:23:121:52 | jca/Digest.java:121:23:121:52 |
+| jca/Digest.java:140:44:140:62 | KeyOperationAlgorithm | Name | AES | jca/Digest.java:140:44:140:62 | jca/Digest.java:140:44:140:62 |
+| jca/Digest.java:140:44:140:62 | KeyOperationAlgorithm | RawName | AES/GCM/NoPadding | jca/Digest.java:140:44:140:62 | jca/Digest.java:140:44:140:62 |
+| jca/Digest.java:140:44:140:62 | KeyOperationAlgorithm | Structure | Block | jca/Digest.java:140:44:140:62 | jca/Digest.java:140:44:140:62 |
+| jca/Digest.java:140:44:140:62 | ModeOfOperation | Name | GCM | jca/Digest.java:140:44:140:62 | jca/Digest.java:140:44:140:62 |
+| jca/Digest.java:140:44:140:62 | ModeOfOperation | RawName | GCM | jca/Digest.java:140:44:140:62 | jca/Digest.java:140:44:140:62 |
+| jca/Digest.java:140:44:140:62 | PaddingAlgorithm | Name | UnknownPadding | jca/Digest.java:140:44:140:62 | jca/Digest.java:140:44:140:62 |
+| jca/Digest.java:140:44:140:62 | PaddingAlgorithm | RawName | NoPadding | jca/Digest.java:140:44:140:62 | jca/Digest.java:140:44:140:62 |
+| jca/Digest.java:141:42:141:44 | Key | KeyType | Unknown | jca/Digest.java:141:42:141:44 | jca/Digest.java:141:42:141:44 |
+| jca/Digest.java:142:32:142:74 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/Digest.java:142:32:142:74 | jca/Digest.java:142:32:142:74 |
+| jca/Digest.java:142:47:142:62 | Constant | Description | "Sensitive Data" | jca/Digest.java:142:47:142:62 | jca/Digest.java:142:47:142:62 |
+| jca/Digest.java:155:39:155:51 | Parameter | Description | digest | jca/Digest.java:155:39:155:51 | jca/Digest.java:155:39:155:51 |
+| jca/Digest.java:171:50:171:62 | Parameter | Description | digest | jca/Digest.java:171:50:171:62 | jca/Digest.java:171:50:171:62 |
+| jca/Digest.java:176:80:176:84 | Constant | Description | 10000 | jca/Digest.java:176:80:176:84 | jca/Digest.java:176:80:176:84 |
+| jca/Digest.java:176:87:176:89 | Constant | Description | 256 | jca/Digest.java:176:87:176:89 | jca/Digest.java:176:87:176:89 |
+| jca/Digest.java:177:65:177:86 | HMACAlgorithm | Name | HMAC | jca/Digest.java:177:65:177:86 | jca/Digest.java:177:65:177:86 |
+| jca/Digest.java:177:65:177:86 | HMACAlgorithm | RawName | PBKDF2WithHmacSHA256 | jca/Digest.java:177:65:177:86 | jca/Digest.java:177:65:177:86 |
+| jca/Digest.java:177:65:177:86 | HashAlgorithm | DigestSize | 256 | jca/Digest.java:177:65:177:86 | jca/Digest.java:177:65:177:86 |
+| jca/Digest.java:177:65:177:86 | HashAlgorithm | Name | SHA2 | jca/Digest.java:177:65:177:86 | jca/Digest.java:177:65:177:86 |
+| jca/Digest.java:177:65:177:86 | HashAlgorithm | RawName | PBKDF2WithHmacSHA256 | jca/Digest.java:177:65:177:86 | jca/Digest.java:177:65:177:86 |
+| jca/Digest.java:177:65:177:86 | KeyDerivationAlgorithm | Name | PBKDF2WithHmacSHA256 | jca/Digest.java:177:65:177:86 | jca/Digest.java:177:65:177:86 |
+| jca/Digest.java:177:65:177:86 | KeyDerivationAlgorithm | RawName | PBKDF2WithHmacSHA256 | jca/Digest.java:177:65:177:86 | jca/Digest.java:177:65:177:86 |
+| jca/Digest.java:178:30:178:57 | Key | KeyType | Symmetric | jca/Digest.java:178:30:178:57 | jca/Digest.java:178:30:178:57 |
+| jca/Digest.java:178:30:178:57 | KeyDerivation | Iterations | Constant:10000 | jca/Digest.java:176:80:176:84 | jca/Digest.java:176:80:176:84 |
+| jca/Digest.java:178:30:178:57 | KeyDerivation | KeySize | Constant:256 | jca/Digest.java:176:87:176:89 | jca/Digest.java:176:87:176:89 |
+| jca/Digest.java:186:44:186:62 | KeyOperationAlgorithm | Name | AES | jca/Digest.java:186:44:186:62 | jca/Digest.java:186:44:186:62 |
+| jca/Digest.java:186:44:186:62 | KeyOperationAlgorithm | RawName | AES/GCM/NoPadding | jca/Digest.java:186:44:186:62 | jca/Digest.java:186:44:186:62 |
+| jca/Digest.java:186:44:186:62 | KeyOperationAlgorithm | Structure | Block | jca/Digest.java:186:44:186:62 | jca/Digest.java:186:44:186:62 |
+| jca/Digest.java:186:44:186:62 | ModeOfOperation | Name | GCM | jca/Digest.java:186:44:186:62 | jca/Digest.java:186:44:186:62 |
+| jca/Digest.java:186:44:186:62 | ModeOfOperation | RawName | GCM | jca/Digest.java:186:44:186:62 | jca/Digest.java:186:44:186:62 |
+| jca/Digest.java:186:44:186:62 | PaddingAlgorithm | Name | UnknownPadding | jca/Digest.java:186:44:186:62 | jca/Digest.java:186:44:186:62 |
+| jca/Digest.java:186:44:186:62 | PaddingAlgorithm | RawName | NoPadding | jca/Digest.java:186:44:186:62 | jca/Digest.java:186:44:186:62 |
+| jca/Digest.java:187:42:187:54 | Key | KeyType | Unknown | jca/Digest.java:187:42:187:54 | jca/Digest.java:187:42:187:54 |
+| jca/Digest.java:188:29:188:78 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/Digest.java:188:29:188:78 | jca/Digest.java:188:29:188:78 |
+| jca/Digest.java:188:44:188:66 | Constant | Description | "Further Use Test Data" | jca/Digest.java:188:44:188:66 | jca/Digest.java:188:44:188:66 |
+| jca/Digest.java:191:35:191:46 | HMACAlgorithm | Name | HMAC | jca/Digest.java:191:35:191:46 | jca/Digest.java:191:35:191:46 |
+| jca/Digest.java:191:35:191:46 | HMACAlgorithm | RawName | HmacSHA256 | jca/Digest.java:191:35:191:46 | jca/Digest.java:191:35:191:46 |
+| jca/Digest.java:191:35:191:46 | HashAlgorithm | DigestSize | 256 | jca/Digest.java:191:35:191:46 | jca/Digest.java:191:35:191:46 |
+| jca/Digest.java:191:35:191:46 | HashAlgorithm | Name | SHA2 | jca/Digest.java:191:35:191:46 | jca/Digest.java:191:35:191:46 |
+| jca/Digest.java:191:35:191:46 | HashAlgorithm | RawName | HmacSHA256 | jca/Digest.java:191:35:191:46 | jca/Digest.java:191:35:191:46 |
+| jca/Digest.java:192:18:192:23 | Key | KeyType | Unknown | jca/Digest.java:192:18:192:23 | jca/Digest.java:192:18:192:23 |
+| jca/Digest.java:193:30:193:52 | MACOperation | KeyOperationSubtype | Mac | jca/Digest.java:193:30:193:52 | jca/Digest.java:193:30:193:52 |
+| jca/Digest.java:210:44:210:62 | KeyOperationAlgorithm | Name | AES | jca/Digest.java:210:44:210:62 | jca/Digest.java:210:44:210:62 |
+| jca/Digest.java:210:44:210:62 | KeyOperationAlgorithm | RawName | AES/GCM/NoPadding | jca/Digest.java:210:44:210:62 | jca/Digest.java:210:44:210:62 |
+| jca/Digest.java:210:44:210:62 | KeyOperationAlgorithm | Structure | Block | jca/Digest.java:210:44:210:62 | jca/Digest.java:210:44:210:62 |
+| jca/Digest.java:210:44:210:62 | ModeOfOperation | Name | GCM | jca/Digest.java:210:44:210:62 | jca/Digest.java:210:44:210:62 |
+| jca/Digest.java:210:44:210:62 | ModeOfOperation | RawName | GCM | jca/Digest.java:210:44:210:62 | jca/Digest.java:210:44:210:62 |
+| jca/Digest.java:210:44:210:62 | PaddingAlgorithm | Name | UnknownPadding | jca/Digest.java:210:44:210:62 | jca/Digest.java:210:44:210:62 |
+| jca/Digest.java:210:44:210:62 | PaddingAlgorithm | RawName | NoPadding | jca/Digest.java:210:44:210:62 | jca/Digest.java:210:44:210:62 |
+| jca/Digest.java:212:42:212:44 | Key | KeyType | Unknown | jca/Digest.java:212:42:212:44 | jca/Digest.java:212:42:212:44 |
+| jca/Digest.java:213:32:213:51 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/Digest.java:213:32:213:51 | jca/Digest.java:213:32:213:51 |
+| jca/Digest.java:239:56:239:60 | KeyOperationAlgorithm | KeySize | Constant:256 | jca/Digest.java:240:21:240:23 | jca/Digest.java:240:21:240:23 |
+| jca/Digest.java:239:56:239:60 | KeyOperationAlgorithm | Name | AES | jca/Digest.java:239:56:239:60 | jca/Digest.java:239:56:239:60 |
+| jca/Digest.java:239:56:239:60 | KeyOperationAlgorithm | RawName | AES | jca/Digest.java:239:56:239:60 | jca/Digest.java:239:56:239:60 |
+| jca/Digest.java:239:56:239:60 | KeyOperationAlgorithm | Structure | Block | jca/Digest.java:239:56:239:60 | jca/Digest.java:239:56:239:60 |
+| jca/Digest.java:240:21:240:23 | Constant | Description | 256 | jca/Digest.java:240:21:240:23 | jca/Digest.java:240:21:240:23 |
+| jca/Digest.java:241:16:241:35 | Key | KeyType | Symmetric | jca/Digest.java:241:16:241:35 | jca/Digest.java:241:16:241:35 |
+| jca/Digest.java:253:38:253:41 | RandomNumberGeneration | Description | java.security.SecureRandom | jca/Digest.java:253:38:253:41 | jca/Digest.java:253:38:253:41 |
+| jca/EllipticCurve1.java:46:66:46:76 | EllipticCurve | CurveType | SEC | jca/EllipticCurve1.java:46:66:46:76 | jca/EllipticCurve1.java:46:66:46:76 |
+| jca/EllipticCurve1.java:46:66:46:76 | EllipticCurve | KeySize | 256 | jca/EllipticCurve1.java:46:66:46:76 | jca/EllipticCurve1.java:46:66:46:76 |
+| jca/EllipticCurve1.java:46:66:46:76 | EllipticCurve | Name | secp256r1 | jca/EllipticCurve1.java:46:66:46:76 | jca/EllipticCurve1.java:46:66:46:76 |
+| jca/EllipticCurve1.java:46:66:46:76 | EllipticCurve | ParsedName | secp256r1 | jca/EllipticCurve1.java:46:66:46:76 | jca/EllipticCurve1.java:46:66:46:76 |
+| jca/EllipticCurve1.java:46:66:46:76 | EllipticCurve | RawName | secp256r1 | jca/EllipticCurve1.java:46:66:46:76 | jca/EllipticCurve1.java:46:66:46:76 |
+| jca/EllipticCurve1.java:47:16:47:36 | Key | KeyType | Asymmetric | jca/EllipticCurve1.java:47:16:47:36 | jca/EllipticCurve1.java:47:16:47:36 |
+| jca/EllipticCurve1.java:56:66:56:76 | EllipticCurve | CurveType | SEC | jca/EllipticCurve1.java:56:66:56:76 | jca/EllipticCurve1.java:56:66:56:76 |
+| jca/EllipticCurve1.java:56:66:56:76 | EllipticCurve | KeySize | 256 | jca/EllipticCurve1.java:56:66:56:76 | jca/EllipticCurve1.java:56:66:56:76 |
+| jca/EllipticCurve1.java:56:66:56:76 | EllipticCurve | Name | secp256k1 | jca/EllipticCurve1.java:56:66:56:76 | jca/EllipticCurve1.java:56:66:56:76 |
+| jca/EllipticCurve1.java:56:66:56:76 | EllipticCurve | ParsedName | secp256k1 | jca/EllipticCurve1.java:56:66:56:76 | jca/EllipticCurve1.java:56:66:56:76 |
+| jca/EllipticCurve1.java:56:66:56:76 | EllipticCurve | RawName | secp256k1 | jca/EllipticCurve1.java:56:66:56:76 | jca/EllipticCurve1.java:56:66:56:76 |
+| jca/EllipticCurve1.java:57:16:57:36 | Key | KeyType | Asymmetric | jca/EllipticCurve1.java:57:16:57:36 | jca/EllipticCurve1.java:57:16:57:36 |
+| jca/EllipticCurve1.java:66:66:66:82 | EllipticCurve | CurveType | BRAINPOOL | jca/EllipticCurve1.java:66:66:66:82 | jca/EllipticCurve1.java:66:66:66:82 |
+| jca/EllipticCurve1.java:66:66:66:82 | EllipticCurve | KeySize | 256 | jca/EllipticCurve1.java:66:66:66:82 | jca/EllipticCurve1.java:66:66:66:82 |
+| jca/EllipticCurve1.java:66:66:66:82 | EllipticCurve | Name | brainpoolP256r1 | jca/EllipticCurve1.java:66:66:66:82 | jca/EllipticCurve1.java:66:66:66:82 |
+| jca/EllipticCurve1.java:66:66:66:82 | EllipticCurve | ParsedName | brainpoolP256r1 | jca/EllipticCurve1.java:66:66:66:82 | jca/EllipticCurve1.java:66:66:66:82 |
+| jca/EllipticCurve1.java:66:66:66:82 | EllipticCurve | RawName | brainpoolP256r1 | jca/EllipticCurve1.java:66:66:66:82 | jca/EllipticCurve1.java:66:66:66:82 |
+| jca/EllipticCurve1.java:67:16:67:36 | Key | KeyType | Asymmetric | jca/EllipticCurve1.java:67:16:67:36 | jca/EllipticCurve1.java:67:16:67:36 |
+| jca/EllipticCurve1.java:74:61:74:68 | KeyAgreementAlgorithm | Name | X25519 | jca/EllipticCurve1.java:74:61:74:68 | jca/EllipticCurve1.java:74:61:74:68 |
+| jca/EllipticCurve1.java:74:61:74:68 | KeyAgreementAlgorithm | RawName | X25519 | jca/EllipticCurve1.java:74:61:74:68 | jca/EllipticCurve1.java:74:61:74:68 |
+| jca/EllipticCurve1.java:76:16:76:36 | Key | KeyType | Asymmetric | jca/EllipticCurve1.java:76:16:76:36 | jca/EllipticCurve1.java:76:16:76:36 |
+| jca/EllipticCurve1.java:83:61:83:66 | KeyAgreementAlgorithm | Name | X448 | jca/EllipticCurve1.java:83:61:83:66 | jca/EllipticCurve1.java:83:61:83:66 |
+| jca/EllipticCurve1.java:83:61:83:66 | KeyAgreementAlgorithm | RawName | X448 | jca/EllipticCurve1.java:83:61:83:66 | jca/EllipticCurve1.java:83:61:83:66 |
+| jca/EllipticCurve1.java:84:16:84:36 | Key | KeyType | Asymmetric | jca/EllipticCurve1.java:84:16:84:36 | jca/EllipticCurve1.java:84:16:84:36 |
+| jca/EllipticCurve1.java:94:66:94:76 | EllipticCurve | CurveType | SEC | jca/EllipticCurve1.java:94:66:94:76 | jca/EllipticCurve1.java:94:66:94:76 |
+| jca/EllipticCurve1.java:94:66:94:76 | EllipticCurve | KeySize | 163 | jca/EllipticCurve1.java:94:66:94:76 | jca/EllipticCurve1.java:94:66:94:76 |
+| jca/EllipticCurve1.java:94:66:94:76 | EllipticCurve | Name | sect163r2 | jca/EllipticCurve1.java:94:66:94:76 | jca/EllipticCurve1.java:94:66:94:76 |
+| jca/EllipticCurve1.java:94:66:94:76 | EllipticCurve | ParsedName | sect163r2 | jca/EllipticCurve1.java:94:66:94:76 | jca/EllipticCurve1.java:94:66:94:76 |
+| jca/EllipticCurve1.java:94:66:94:76 | EllipticCurve | RawName | sect163r2 | jca/EllipticCurve1.java:94:66:94:76 | jca/EllipticCurve1.java:94:66:94:76 |
+| jca/EllipticCurve1.java:95:16:95:36 | Key | KeyType | Asymmetric | jca/EllipticCurve1.java:95:16:95:36 | jca/EllipticCurve1.java:95:16:95:36 |
+| jca/EllipticCurve1.java:105:66:105:76 | Constant | Description | "sm2p256v1" | jca/EllipticCurve1.java:105:66:105:76 | jca/EllipticCurve1.java:105:66:105:76 |
+| jca/EllipticCurve1.java:106:16:106:36 | Key | KeyType | Asymmetric | jca/EllipticCurve1.java:106:16:106:36 | jca/EllipticCurve1.java:106:16:106:36 |
+| jca/EllipticCurve1.java:114:61:114:69 | KeyOperationAlgorithm | Name | EDSA | jca/EllipticCurve1.java:114:61:114:69 | jca/EllipticCurve1.java:114:61:114:69 |
+| jca/EllipticCurve1.java:114:61:114:69 | KeyOperationAlgorithm | RawName | Ed25519 | jca/EllipticCurve1.java:114:61:114:69 | jca/EllipticCurve1.java:114:61:114:69 |
+| jca/EllipticCurve1.java:115:16:115:36 | Key | KeyType | Asymmetric | jca/EllipticCurve1.java:115:16:115:36 | jca/EllipticCurve1.java:115:16:115:36 |
+| jca/EllipticCurve2.java:46:47:46:57 | EllipticCurve | CurveType | SEC | jca/EllipticCurve2.java:46:47:46:57 | jca/EllipticCurve2.java:46:47:46:57 |
+| jca/EllipticCurve2.java:46:47:46:57 | EllipticCurve | KeySize | 256 | jca/EllipticCurve2.java:46:47:46:57 | jca/EllipticCurve2.java:46:47:46:57 |
+| jca/EllipticCurve2.java:46:47:46:57 | EllipticCurve | Name | secp256r1 | jca/EllipticCurve2.java:46:47:46:57 | jca/EllipticCurve2.java:46:47:46:57 |
+| jca/EllipticCurve2.java:46:47:46:57 | EllipticCurve | ParsedName | secp256r1 | jca/EllipticCurve2.java:46:47:46:57 | jca/EllipticCurve2.java:46:47:46:57 |
+| jca/EllipticCurve2.java:46:47:46:57 | EllipticCurve | RawName | secp256r1 | jca/EllipticCurve2.java:46:47:46:57 | jca/EllipticCurve2.java:46:47:46:57 |
+| jca/EllipticCurve2.java:47:16:47:36 | Key | KeyType | Asymmetric | jca/EllipticCurve2.java:47:16:47:36 | jca/EllipticCurve2.java:47:16:47:36 |
+| jca/EllipticCurve2.java:55:47:55:57 | EllipticCurve | CurveType | SEC | jca/EllipticCurve2.java:55:47:55:57 | jca/EllipticCurve2.java:55:47:55:57 |
+| jca/EllipticCurve2.java:55:47:55:57 | EllipticCurve | KeySize | 256 | jca/EllipticCurve2.java:55:47:55:57 | jca/EllipticCurve2.java:55:47:55:57 |
+| jca/EllipticCurve2.java:55:47:55:57 | EllipticCurve | Name | secp256k1 | jca/EllipticCurve2.java:55:47:55:57 | jca/EllipticCurve2.java:55:47:55:57 |
+| jca/EllipticCurve2.java:55:47:55:57 | EllipticCurve | ParsedName | secp256k1 | jca/EllipticCurve2.java:55:47:55:57 | jca/EllipticCurve2.java:55:47:55:57 |
+| jca/EllipticCurve2.java:55:47:55:57 | EllipticCurve | RawName | secp256k1 | jca/EllipticCurve2.java:55:47:55:57 | jca/EllipticCurve2.java:55:47:55:57 |
+| jca/EllipticCurve2.java:56:16:56:36 | Key | KeyType | Asymmetric | jca/EllipticCurve2.java:56:16:56:36 | jca/EllipticCurve2.java:56:16:56:36 |
+| jca/EllipticCurve2.java:64:47:64:63 | EllipticCurve | CurveType | BRAINPOOL | jca/EllipticCurve2.java:64:47:64:63 | jca/EllipticCurve2.java:64:47:64:63 |
+| jca/EllipticCurve2.java:64:47:64:63 | EllipticCurve | KeySize | 256 | jca/EllipticCurve2.java:64:47:64:63 | jca/EllipticCurve2.java:64:47:64:63 |
+| jca/EllipticCurve2.java:64:47:64:63 | EllipticCurve | Name | brainpoolP256r1 | jca/EllipticCurve2.java:64:47:64:63 | jca/EllipticCurve2.java:64:47:64:63 |
+| jca/EllipticCurve2.java:64:47:64:63 | EllipticCurve | ParsedName | brainpoolP256r1 | jca/EllipticCurve2.java:64:47:64:63 | jca/EllipticCurve2.java:64:47:64:63 |
+| jca/EllipticCurve2.java:64:47:64:63 | EllipticCurve | RawName | brainpoolP256r1 | jca/EllipticCurve2.java:64:47:64:63 | jca/EllipticCurve2.java:64:47:64:63 |
+| jca/EllipticCurve2.java:65:16:65:36 | Key | KeyType | Asymmetric | jca/EllipticCurve2.java:65:16:65:36 | jca/EllipticCurve2.java:65:16:65:36 |
+| jca/EllipticCurve2.java:72:61:72:68 | KeyAgreementAlgorithm | Name | X25519 | jca/EllipticCurve2.java:72:61:72:68 | jca/EllipticCurve2.java:72:61:72:68 |
+| jca/EllipticCurve2.java:72:61:72:68 | KeyAgreementAlgorithm | RawName | X25519 | jca/EllipticCurve2.java:72:61:72:68 | jca/EllipticCurve2.java:72:61:72:68 |
+| jca/EllipticCurve2.java:73:16:73:36 | Key | KeyType | Asymmetric | jca/EllipticCurve2.java:73:16:73:36 | jca/EllipticCurve2.java:73:16:73:36 |
+| jca/EllipticCurve2.java:80:61:80:69 | KeyOperationAlgorithm | Name | EDSA | jca/EllipticCurve2.java:80:61:80:69 | jca/EllipticCurve2.java:80:61:80:69 |
+| jca/EllipticCurve2.java:80:61:80:69 | KeyOperationAlgorithm | RawName | Ed25519 | jca/EllipticCurve2.java:80:61:80:69 | jca/EllipticCurve2.java:80:61:80:69 |
+| jca/EllipticCurve2.java:81:16:81:36 | Key | KeyType | Asymmetric | jca/EllipticCurve2.java:81:16:81:36 | jca/EllipticCurve2.java:81:16:81:36 |
+| jca/EllipticCurve2.java:105:52:105:57 | KeyAgreementAlgorithm | Name | ECDH | jca/EllipticCurve2.java:105:52:105:57 | jca/EllipticCurve2.java:105:52:105:57 |
+| jca/EllipticCurve2.java:105:52:105:57 | KeyAgreementAlgorithm | RawName | ECDH | jca/EllipticCurve2.java:105:52:105:57 | jca/EllipticCurve2.java:105:52:105:57 |
+| jca/EllipticCurve2.java:106:17:106:36 | Key | KeyType | Unknown | jca/EllipticCurve2.java:106:17:106:36 | jca/EllipticCurve2.java:106:17:106:36 |
+| jca/EllipticCurve2.java:107:20:107:36 | Key | KeyType | Unknown | jca/EllipticCurve2.java:107:20:107:36 | jca/EllipticCurve2.java:107:20:107:36 |
+| jca/EllipticCurve2.java:119:52:119:57 | KeyAgreementAlgorithm | Name | ECDH | jca/EllipticCurve2.java:119:52:119:57 | jca/EllipticCurve2.java:119:52:119:57 |
+| jca/EllipticCurve2.java:119:52:119:57 | KeyAgreementAlgorithm | RawName | ECDH | jca/EllipticCurve2.java:119:52:119:57 | jca/EllipticCurve2.java:119:52:119:57 |
+| jca/EllipticCurve2.java:120:17:120:37 | Key | KeyType | Unknown | jca/EllipticCurve2.java:120:17:120:37 | jca/EllipticCurve2.java:120:17:120:37 |
+| jca/EllipticCurve2.java:121:20:121:39 | Key | KeyType | Unknown | jca/EllipticCurve2.java:121:20:121:39 | jca/EllipticCurve2.java:121:20:121:39 |
+| jca/EllipticCurve2.java:136:53:136:69 | HashAlgorithm | DigestSize | 256 | jca/EllipticCurve2.java:136:53:136:69 | jca/EllipticCurve2.java:136:53:136:69 |
+| jca/EllipticCurve2.java:136:53:136:69 | HashAlgorithm | Name | SHA2 | jca/EllipticCurve2.java:136:53:136:69 | jca/EllipticCurve2.java:136:53:136:69 |
+| jca/EllipticCurve2.java:136:53:136:69 | HashAlgorithm | RawName | SHA256withECDSA | jca/EllipticCurve2.java:136:53:136:69 | jca/EllipticCurve2.java:136:53:136:69 |
+| jca/EllipticCurve2.java:136:53:136:69 | KeyOperationAlgorithm | Name | ECDSA | jca/EllipticCurve2.java:136:53:136:69 | jca/EllipticCurve2.java:136:53:136:69 |
+| jca/EllipticCurve2.java:136:53:136:69 | KeyOperationAlgorithm | RawName | SHA256withECDSA | jca/EllipticCurve2.java:136:53:136:69 | jca/EllipticCurve2.java:136:53:136:69 |
+| jca/EllipticCurve2.java:137:28:137:42 | Key | KeyType | Unknown | jca/EllipticCurve2.java:137:28:137:42 | jca/EllipticCurve2.java:137:28:137:42 |
+| jca/EllipticCurve2.java:139:16:139:31 | SignOperation | KeyOperationSubtype | Sign | jca/EllipticCurve2.java:139:16:139:31 | jca/EllipticCurve2.java:139:16:139:31 |
+| jca/EllipticCurve2.java:151:53:151:69 | HashAlgorithm | DigestSize | 256 | jca/EllipticCurve2.java:151:53:151:69 | jca/EllipticCurve2.java:151:53:151:69 |
+| jca/EllipticCurve2.java:151:53:151:69 | HashAlgorithm | Name | SHA2 | jca/EllipticCurve2.java:151:53:151:69 | jca/EllipticCurve2.java:151:53:151:69 |
+| jca/EllipticCurve2.java:151:53:151:69 | HashAlgorithm | RawName | SHA256withECDSA | jca/EllipticCurve2.java:151:53:151:69 | jca/EllipticCurve2.java:151:53:151:69 |
+| jca/EllipticCurve2.java:151:53:151:69 | KeyOperationAlgorithm | Name | ECDSA | jca/EllipticCurve2.java:151:53:151:69 | jca/EllipticCurve2.java:151:53:151:69 |
+| jca/EllipticCurve2.java:151:53:151:69 | KeyOperationAlgorithm | RawName | SHA256withECDSA | jca/EllipticCurve2.java:151:53:151:69 | jca/EllipticCurve2.java:151:53:151:69 |
+| jca/EllipticCurve2.java:152:30:152:43 | Key | KeyType | Unknown | jca/EllipticCurve2.java:152:30:152:43 | jca/EllipticCurve2.java:152:30:152:43 |
+| jca/EllipticCurve2.java:154:16:154:47 | VerifyOperation | KeyOperationSubtype | Verify | jca/EllipticCurve2.java:154:16:154:47 | jca/EllipticCurve2.java:154:16:154:47 |
+| jca/EllipticCurve2.java:166:53:166:61 | KeyOperationAlgorithm | Name | EDSA | jca/EllipticCurve2.java:166:53:166:61 | jca/EllipticCurve2.java:166:53:166:61 |
+| jca/EllipticCurve2.java:166:53:166:61 | KeyOperationAlgorithm | RawName | Ed25519 | jca/EllipticCurve2.java:166:53:166:61 | jca/EllipticCurve2.java:166:53:166:61 |
+| jca/EllipticCurve2.java:167:28:167:42 | Key | KeyType | Unknown | jca/EllipticCurve2.java:167:28:167:42 | jca/EllipticCurve2.java:167:28:167:42 |
+| jca/EllipticCurve2.java:169:16:169:31 | SignOperation | KeyOperationSubtype | Sign | jca/EllipticCurve2.java:169:16:169:31 | jca/EllipticCurve2.java:169:16:169:31 |
+| jca/EllipticCurve2.java:181:53:181:61 | KeyOperationAlgorithm | Name | EDSA | jca/EllipticCurve2.java:181:53:181:61 | jca/EllipticCurve2.java:181:53:181:61 |
+| jca/EllipticCurve2.java:181:53:181:61 | KeyOperationAlgorithm | RawName | Ed25519 | jca/EllipticCurve2.java:181:53:181:61 | jca/EllipticCurve2.java:181:53:181:61 |
+| jca/EllipticCurve2.java:182:30:182:43 | Key | KeyType | Unknown | jca/EllipticCurve2.java:182:30:182:43 | jca/EllipticCurve2.java:182:30:182:43 |
+| jca/EllipticCurve2.java:184:16:184:47 | VerifyOperation | KeyOperationSubtype | Verify | jca/EllipticCurve2.java:184:16:184:47 | jca/EllipticCurve2.java:184:16:184:47 |
+| jca/EllipticCurve2.java:206:52:206:57 | KeyAgreementAlgorithm | Name | ECDH | jca/EllipticCurve2.java:206:52:206:57 | jca/EllipticCurve2.java:206:52:206:57 |
+| jca/EllipticCurve2.java:206:52:206:57 | KeyAgreementAlgorithm | RawName | ECDH | jca/EllipticCurve2.java:206:52:206:57 | jca/EllipticCurve2.java:206:52:206:57 |
+| jca/EllipticCurve2.java:207:17:207:37 | Key | KeyType | Unknown | jca/EllipticCurve2.java:207:17:207:37 | jca/EllipticCurve2.java:207:17:207:37 |
+| jca/EllipticCurve2.java:208:20:208:41 | Key | KeyType | Unknown | jca/EllipticCurve2.java:208:20:208:41 | jca/EllipticCurve2.java:208:20:208:41 |
+| jca/EllipticCurve2.java:213:58:213:66 | HashAlgorithm | DigestSize | 256 | jca/EllipticCurve2.java:213:58:213:66 | jca/EllipticCurve2.java:213:58:213:66 |
+| jca/EllipticCurve2.java:213:58:213:66 | HashAlgorithm | Name | SHA2 | jca/EllipticCurve2.java:213:58:213:66 | jca/EllipticCurve2.java:213:58:213:66 |
+| jca/EllipticCurve2.java:213:58:213:66 | HashAlgorithm | RawName | SHA-256 | jca/EllipticCurve2.java:213:58:213:66 | jca/EllipticCurve2.java:213:58:213:66 |
+| jca/EllipticCurve2.java:219:44:219:62 | KeyOperationAlgorithm | Name | AES | jca/EllipticCurve2.java:219:44:219:62 | jca/EllipticCurve2.java:219:44:219:62 |
+| jca/EllipticCurve2.java:219:44:219:62 | KeyOperationAlgorithm | RawName | AES/GCM/NoPadding | jca/EllipticCurve2.java:219:44:219:62 | jca/EllipticCurve2.java:219:44:219:62 |
+| jca/EllipticCurve2.java:219:44:219:62 | KeyOperationAlgorithm | Structure | Block | jca/EllipticCurve2.java:219:44:219:62 | jca/EllipticCurve2.java:219:44:219:62 |
+| jca/EllipticCurve2.java:219:44:219:62 | ModeOfOperation | Name | GCM | jca/EllipticCurve2.java:219:44:219:62 | jca/EllipticCurve2.java:219:44:219:62 |
+| jca/EllipticCurve2.java:219:44:219:62 | ModeOfOperation | RawName | GCM | jca/EllipticCurve2.java:219:44:219:62 | jca/EllipticCurve2.java:219:44:219:62 |
+| jca/EllipticCurve2.java:219:44:219:62 | PaddingAlgorithm | Name | UnknownPadding | jca/EllipticCurve2.java:219:44:219:62 | jca/EllipticCurve2.java:219:44:219:62 |
+| jca/EllipticCurve2.java:219:44:219:62 | PaddingAlgorithm | RawName | NoPadding | jca/EllipticCurve2.java:219:44:219:62 | jca/EllipticCurve2.java:219:44:219:62 |
+| jca/EllipticCurve2.java:221:38:221:39 | RandomNumberGeneration | Description | java.security.SecureRandom | jca/EllipticCurve2.java:221:38:221:39 | jca/EllipticCurve2.java:221:38:221:39 |
+| jca/EllipticCurve2.java:223:42:223:47 | Key | KeyType | Unknown | jca/EllipticCurve2.java:223:42:223:47 | jca/EllipticCurve2.java:223:42:223:47 |
+| jca/EllipticCurve2.java:224:29:224:53 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/EllipticCurve2.java:224:29:224:53 | jca/EllipticCurve2.java:224:29:224:53 |
+| jca/EllipticCurve2.java:245:30:245:53 | Constant | Description | "Test message for ECDSA" | jca/EllipticCurve2.java:245:30:245:53 | jca/EllipticCurve2.java:245:30:245:53 |
+| jca/EllipticCurve2.java:258:62:258:83 | Constant | Description | "Secret ECIES Message" | jca/EllipticCurve2.java:258:62:258:83 | jca/EllipticCurve2.java:258:62:258:83 |
+| jca/Encryption1.java:60:56:60:60 | KeyOperationAlgorithm | KeySize | Constant:256 | jca/Encryption1.java:61:21:61:23 | jca/Encryption1.java:61:21:61:23 |
+| jca/Encryption1.java:60:56:60:60 | KeyOperationAlgorithm | Name | AES | jca/Encryption1.java:60:56:60:60 | jca/Encryption1.java:60:56:60:60 |
+| jca/Encryption1.java:60:56:60:60 | KeyOperationAlgorithm | RawName | AES | jca/Encryption1.java:60:56:60:60 | jca/Encryption1.java:60:56:60:60 |
+| jca/Encryption1.java:60:56:60:60 | KeyOperationAlgorithm | Structure | Block | jca/Encryption1.java:60:56:60:60 | jca/Encryption1.java:60:56:60:60 |
+| jca/Encryption1.java:61:21:61:23 | Constant | Description | 256 | jca/Encryption1.java:61:21:61:23 | jca/Encryption1.java:61:21:61:23 |
+| jca/Encryption1.java:62:25:62:44 | Key | KeyType | Symmetric | jca/Encryption1.java:62:25:62:44 | jca/Encryption1.java:62:25:62:44 |
+| jca/Encryption1.java:63:44:63:62 | KeyOperationAlgorithm | Name | AES | jca/Encryption1.java:63:44:63:62 | jca/Encryption1.java:63:44:63:62 |
+| jca/Encryption1.java:63:44:63:62 | KeyOperationAlgorithm | RawName | AES/GCM/NoPadding | jca/Encryption1.java:63:44:63:62 | jca/Encryption1.java:63:44:63:62 |
+| jca/Encryption1.java:63:44:63:62 | KeyOperationAlgorithm | Structure | Block | jca/Encryption1.java:63:44:63:62 | jca/Encryption1.java:63:44:63:62 |
+| jca/Encryption1.java:63:44:63:62 | ModeOfOperation | Name | GCM | jca/Encryption1.java:63:44:63:62 | jca/Encryption1.java:63:44:63:62 |
+| jca/Encryption1.java:63:44:63:62 | ModeOfOperation | RawName | GCM | jca/Encryption1.java:63:44:63:62 | jca/Encryption1.java:63:44:63:62 |
+| jca/Encryption1.java:63:44:63:62 | PaddingAlgorithm | Name | UnknownPadding | jca/Encryption1.java:63:44:63:62 | jca/Encryption1.java:63:44:63:62 |
+| jca/Encryption1.java:63:44:63:62 | PaddingAlgorithm | RawName | NoPadding | jca/Encryption1.java:63:44:63:62 | jca/Encryption1.java:63:44:63:62 |
+| jca/Encryption1.java:65:38:65:39 | RandomNumberGeneration | Description | java.security.SecureRandom | jca/Encryption1.java:65:38:65:39 | jca/Encryption1.java:65:38:65:39 |
+| jca/Encryption1.java:67:42:67:44 | Key | KeyType | Unknown | jca/Encryption1.java:67:42:67:44 | jca/Encryption1.java:67:42:67:44 |
+| jca/Encryption1.java:68:32:68:74 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/Encryption1.java:68:32:68:74 | jca/Encryption1.java:68:32:68:74 |
+| jca/Encryption1.java:68:47:68:62 | Constant | Description | "Sensitive Data" | jca/Encryption1.java:68:47:68:62 | jca/Encryption1.java:68:47:68:62 |
+| jca/Encryption1.java:83:56:83:60 | KeyOperationAlgorithm | KeySize | Constant:256 | jca/Encryption1.java:84:21:84:23 | jca/Encryption1.java:84:21:84:23 |
+| jca/Encryption1.java:83:56:83:60 | KeyOperationAlgorithm | Name | AES | jca/Encryption1.java:83:56:83:60 | jca/Encryption1.java:83:56:83:60 |
+| jca/Encryption1.java:83:56:83:60 | KeyOperationAlgorithm | RawName | AES | jca/Encryption1.java:83:56:83:60 | jca/Encryption1.java:83:56:83:60 |
+| jca/Encryption1.java:83:56:83:60 | KeyOperationAlgorithm | Structure | Block | jca/Encryption1.java:83:56:83:60 | jca/Encryption1.java:83:56:83:60 |
+| jca/Encryption1.java:84:21:84:23 | Constant | Description | 256 | jca/Encryption1.java:84:21:84:23 | jca/Encryption1.java:84:21:84:23 |
+| jca/Encryption1.java:85:25:85:44 | Key | KeyType | Symmetric | jca/Encryption1.java:85:25:85:44 | jca/Encryption1.java:85:25:85:44 |
+| jca/Encryption1.java:88:44:88:62 | KeyOperationAlgorithm | Name | AES | jca/Encryption1.java:88:44:88:62 | jca/Encryption1.java:88:44:88:62 |
+| jca/Encryption1.java:88:44:88:62 | KeyOperationAlgorithm | RawName | AES/ECB/NoPadding | jca/Encryption1.java:88:44:88:62 | jca/Encryption1.java:88:44:88:62 |
+| jca/Encryption1.java:88:44:88:62 | KeyOperationAlgorithm | Structure | Block | jca/Encryption1.java:88:44:88:62 | jca/Encryption1.java:88:44:88:62 |
+| jca/Encryption1.java:88:44:88:62 | ModeOfOperation | Name | ECB | jca/Encryption1.java:88:44:88:62 | jca/Encryption1.java:88:44:88:62 |
+| jca/Encryption1.java:88:44:88:62 | ModeOfOperation | RawName | ECB | jca/Encryption1.java:88:44:88:62 | jca/Encryption1.java:88:44:88:62 |
+| jca/Encryption1.java:88:44:88:62 | PaddingAlgorithm | Name | UnknownPadding | jca/Encryption1.java:88:44:88:62 | jca/Encryption1.java:88:44:88:62 |
+| jca/Encryption1.java:88:44:88:62 | PaddingAlgorithm | RawName | NoPadding | jca/Encryption1.java:88:44:88:62 | jca/Encryption1.java:88:44:88:62 |
+| jca/Encryption1.java:89:42:89:44 | Key | KeyType | Unknown | jca/Encryption1.java:89:42:89:44 | jca/Encryption1.java:89:42:89:44 |
+| jca/Encryption1.java:90:32:90:74 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/Encryption1.java:90:32:90:74 | jca/Encryption1.java:90:32:90:74 |
+| jca/Encryption1.java:90:47:90:62 | Constant | Description | "Sensitive Data" | jca/Encryption1.java:90:47:90:62 | jca/Encryption1.java:90:47:90:62 |
+| jca/Encryption1.java:104:35:104:53 | Parameter | Description | publicKey | jca/Encryption1.java:104:35:104:53 | jca/Encryption1.java:104:35:104:53 |
+| jca/Encryption1.java:104:56:104:66 | Parameter | Description | data | jca/Encryption1.java:104:56:104:66 | jca/Encryption1.java:104:56:104:66 |
+| jca/Encryption1.java:105:44:105:82 | HashAlgorithm | DigestSize | 256 | jca/Encryption1.java:105:44:105:82 | jca/Encryption1.java:105:44:105:82 |
+| jca/Encryption1.java:105:44:105:82 | HashAlgorithm | Name | SHA2 | jca/Encryption1.java:105:44:105:82 | jca/Encryption1.java:105:44:105:82 |
+| jca/Encryption1.java:105:44:105:82 | HashAlgorithm | RawName | OAEPWithSHA-256AndMGF1Padding | jca/Encryption1.java:105:44:105:82 | jca/Encryption1.java:105:44:105:82 |
+| jca/Encryption1.java:105:44:105:82 | KeyOperationAlgorithm | Name | RSA | jca/Encryption1.java:105:44:105:82 | jca/Encryption1.java:105:44:105:82 |
+| jca/Encryption1.java:105:44:105:82 | KeyOperationAlgorithm | RawName | RSA/ECB/OAEPWithSHA-256AndMGF1Padding | jca/Encryption1.java:105:44:105:82 | jca/Encryption1.java:105:44:105:82 |
+| jca/Encryption1.java:105:44:105:82 | ModeOfOperation | Name | ECB | jca/Encryption1.java:105:44:105:82 | jca/Encryption1.java:105:44:105:82 |
+| jca/Encryption1.java:105:44:105:82 | ModeOfOperation | RawName | ECB | jca/Encryption1.java:105:44:105:82 | jca/Encryption1.java:105:44:105:82 |
+| jca/Encryption1.java:105:44:105:82 | PaddingAlgorithm | Name | OAEP | jca/Encryption1.java:105:44:105:82 | jca/Encryption1.java:105:44:105:82 |
+| jca/Encryption1.java:105:44:105:82 | PaddingAlgorithm | RawName | OAEPWithSHA-256AndMGF1Padding | jca/Encryption1.java:105:44:105:82 | jca/Encryption1.java:105:44:105:82 |
+| jca/Encryption1.java:106:42:106:50 | Key | KeyType | Unknown | jca/Encryption1.java:106:42:106:50 | jca/Encryption1.java:106:42:106:50 |
+| jca/Encryption1.java:107:32:107:62 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/Encryption1.java:107:32:107:62 | jca/Encryption1.java:107:32:107:62 |
+| jca/Encryption1.java:119:35:119:55 | Parameter | Description | privateKey | jca/Encryption1.java:119:35:119:55 | jca/Encryption1.java:119:35:119:55 |
+| jca/Encryption1.java:119:58:119:77 | Parameter | Description | encryptedData | jca/Encryption1.java:119:58:119:77 | jca/Encryption1.java:119:58:119:77 |
+| jca/Encryption1.java:120:44:120:82 | HashAlgorithm | DigestSize | 256 | jca/Encryption1.java:120:44:120:82 | jca/Encryption1.java:120:44:120:82 |
+| jca/Encryption1.java:120:44:120:82 | HashAlgorithm | Name | SHA2 | jca/Encryption1.java:120:44:120:82 | jca/Encryption1.java:120:44:120:82 |
+| jca/Encryption1.java:120:44:120:82 | HashAlgorithm | RawName | OAEPWithSHA-256AndMGF1Padding | jca/Encryption1.java:120:44:120:82 | jca/Encryption1.java:120:44:120:82 |
+| jca/Encryption1.java:120:44:120:82 | KeyOperationAlgorithm | Name | RSA | jca/Encryption1.java:120:44:120:82 | jca/Encryption1.java:120:44:120:82 |
+| jca/Encryption1.java:120:44:120:82 | KeyOperationAlgorithm | RawName | RSA/ECB/OAEPWithSHA-256AndMGF1Padding | jca/Encryption1.java:120:44:120:82 | jca/Encryption1.java:120:44:120:82 |
+| jca/Encryption1.java:120:44:120:82 | ModeOfOperation | Name | ECB | jca/Encryption1.java:120:44:120:82 | jca/Encryption1.java:120:44:120:82 |
+| jca/Encryption1.java:120:44:120:82 | ModeOfOperation | RawName | ECB | jca/Encryption1.java:120:44:120:82 | jca/Encryption1.java:120:44:120:82 |
+| jca/Encryption1.java:120:44:120:82 | PaddingAlgorithm | Name | OAEP | jca/Encryption1.java:120:44:120:82 | jca/Encryption1.java:120:44:120:82 |
+| jca/Encryption1.java:120:44:120:82 | PaddingAlgorithm | RawName | OAEPWithSHA-256AndMGF1Padding | jca/Encryption1.java:120:44:120:82 | jca/Encryption1.java:120:44:120:82 |
+| jca/Encryption1.java:121:42:121:51 | Key | KeyType | Unknown | jca/Encryption1.java:121:42:121:51 | jca/Encryption1.java:121:42:121:51 |
+| jca/Encryption1.java:122:32:122:60 | DecryptOperation | KeyOperationSubtype | Decrypt | jca/Encryption1.java:122:32:122:60 | jca/Encryption1.java:122:32:122:60 |
+| jca/Encryption1.java:136:34:136:55 | Parameter | Description | rsaPublicKey | jca/Encryption1.java:136:34:136:55 | jca/Encryption1.java:136:34:136:55 |
+| jca/Encryption1.java:137:56:137:60 | KeyOperationAlgorithm | KeySize | Constant:256 | jca/Encryption1.java:138:21:138:23 | jca/Encryption1.java:138:21:138:23 |
+| jca/Encryption1.java:137:56:137:60 | KeyOperationAlgorithm | Name | AES | jca/Encryption1.java:137:56:137:60 | jca/Encryption1.java:137:56:137:60 |
+| jca/Encryption1.java:137:56:137:60 | KeyOperationAlgorithm | RawName | AES | jca/Encryption1.java:137:56:137:60 | jca/Encryption1.java:137:56:137:60 |
+| jca/Encryption1.java:137:56:137:60 | KeyOperationAlgorithm | Structure | Block | jca/Encryption1.java:137:56:137:60 | jca/Encryption1.java:137:56:137:60 |
+| jca/Encryption1.java:138:21:138:23 | Constant | Description | 256 | jca/Encryption1.java:138:21:138:23 | jca/Encryption1.java:138:21:138:23 |
+| jca/Encryption1.java:139:28:139:47 | Key | KeyType | Symmetric | jca/Encryption1.java:139:28:139:47 | jca/Encryption1.java:139:28:139:47 |
+| jca/Encryption1.java:141:47:141:85 | HashAlgorithm | DigestSize | 256 | jca/Encryption1.java:141:47:141:85 | jca/Encryption1.java:141:47:141:85 |
+| jca/Encryption1.java:141:47:141:85 | HashAlgorithm | Name | SHA2 | jca/Encryption1.java:141:47:141:85 | jca/Encryption1.java:141:47:141:85 |
+| jca/Encryption1.java:141:47:141:85 | HashAlgorithm | RawName | OAEPWithSHA-256AndMGF1Padding | jca/Encryption1.java:141:47:141:85 | jca/Encryption1.java:141:47:141:85 |
+| jca/Encryption1.java:141:47:141:85 | KeyOperationAlgorithm | Name | RSA | jca/Encryption1.java:141:47:141:85 | jca/Encryption1.java:141:47:141:85 |
+| jca/Encryption1.java:141:47:141:85 | KeyOperationAlgorithm | RawName | RSA/ECB/OAEPWithSHA-256AndMGF1Padding | jca/Encryption1.java:141:47:141:85 | jca/Encryption1.java:141:47:141:85 |
+| jca/Encryption1.java:141:47:141:85 | ModeOfOperation | Name | ECB | jca/Encryption1.java:141:47:141:85 | jca/Encryption1.java:141:47:141:85 |
+| jca/Encryption1.java:141:47:141:85 | ModeOfOperation | RawName | ECB | jca/Encryption1.java:141:47:141:85 | jca/Encryption1.java:141:47:141:85 |
+| jca/Encryption1.java:141:47:141:85 | PaddingAlgorithm | Name | OAEP | jca/Encryption1.java:141:47:141:85 | jca/Encryption1.java:141:47:141:85 |
+| jca/Encryption1.java:141:47:141:85 | PaddingAlgorithm | RawName | OAEPWithSHA-256AndMGF1Padding | jca/Encryption1.java:141:47:141:85 | jca/Encryption1.java:141:47:141:85 |
+| jca/Encryption1.java:142:45:142:56 | Key | KeyType | Unknown | jca/Encryption1.java:142:45:142:56 | jca/Encryption1.java:142:45:142:56 |
+| jca/Encryption1.java:143:34:143:71 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/Encryption1.java:143:34:143:71 | jca/Encryption1.java:143:34:143:71 |
+| jca/Encryption1.java:159:34:159:55 | Parameter | Description | rsaPublicKey | jca/Encryption1.java:159:34:159:55 | jca/Encryption1.java:159:34:159:55 |
+| jca/Encryption1.java:159:58:159:68 | Parameter | Description | data | jca/Encryption1.java:159:58:159:68 | jca/Encryption1.java:159:58:159:68 |
+| jca/Encryption1.java:161:56:161:60 | KeyOperationAlgorithm | KeySize | Constant:256 | jca/Encryption1.java:162:21:162:23 | jca/Encryption1.java:162:21:162:23 |
+| jca/Encryption1.java:161:56:161:60 | KeyOperationAlgorithm | Name | AES | jca/Encryption1.java:161:56:161:60 | jca/Encryption1.java:161:56:161:60 |
+| jca/Encryption1.java:161:56:161:60 | KeyOperationAlgorithm | RawName | AES | jca/Encryption1.java:161:56:161:60 | jca/Encryption1.java:161:56:161:60 |
+| jca/Encryption1.java:161:56:161:60 | KeyOperationAlgorithm | Structure | Block | jca/Encryption1.java:161:56:161:60 | jca/Encryption1.java:161:56:161:60 |
+| jca/Encryption1.java:162:21:162:23 | Constant | Description | 256 | jca/Encryption1.java:162:21:162:23 | jca/Encryption1.java:162:21:162:23 |
+| jca/Encryption1.java:163:28:163:47 | Key | KeyType | Symmetric | jca/Encryption1.java:163:28:163:47 | jca/Encryption1.java:163:28:163:47 |
+| jca/Encryption1.java:166:47:166:85 | HashAlgorithm | DigestSize | 256 | jca/Encryption1.java:166:47:166:85 | jca/Encryption1.java:166:47:166:85 |
+| jca/Encryption1.java:166:47:166:85 | HashAlgorithm | Name | SHA2 | jca/Encryption1.java:166:47:166:85 | jca/Encryption1.java:166:47:166:85 |
+| jca/Encryption1.java:166:47:166:85 | HashAlgorithm | RawName | OAEPWithSHA-256AndMGF1Padding | jca/Encryption1.java:166:47:166:85 | jca/Encryption1.java:166:47:166:85 |
+| jca/Encryption1.java:166:47:166:85 | KeyOperationAlgorithm | Name | RSA | jca/Encryption1.java:166:47:166:85 | jca/Encryption1.java:166:47:166:85 |
+| jca/Encryption1.java:166:47:166:85 | KeyOperationAlgorithm | RawName | RSA/ECB/OAEPWithSHA-256AndMGF1Padding | jca/Encryption1.java:166:47:166:85 | jca/Encryption1.java:166:47:166:85 |
+| jca/Encryption1.java:166:47:166:85 | ModeOfOperation | Name | ECB | jca/Encryption1.java:166:47:166:85 | jca/Encryption1.java:166:47:166:85 |
+| jca/Encryption1.java:166:47:166:85 | ModeOfOperation | RawName | ECB | jca/Encryption1.java:166:47:166:85 | jca/Encryption1.java:166:47:166:85 |
+| jca/Encryption1.java:166:47:166:85 | PaddingAlgorithm | Name | OAEP | jca/Encryption1.java:166:47:166:85 | jca/Encryption1.java:166:47:166:85 |
+| jca/Encryption1.java:166:47:166:85 | PaddingAlgorithm | RawName | OAEPWithSHA-256AndMGF1Padding | jca/Encryption1.java:166:47:166:85 | jca/Encryption1.java:166:47:166:85 |
+| jca/Encryption1.java:167:45:167:56 | Key | KeyType | Unknown | jca/Encryption1.java:167:45:167:56 | jca/Encryption1.java:167:45:167:56 |
+| jca/Encryption1.java:168:34:168:71 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/Encryption1.java:168:34:168:71 | jca/Encryption1.java:168:34:168:71 |
+| jca/Encryption1.java:171:47:171:65 | KeyOperationAlgorithm | Name | AES | jca/Encryption1.java:171:47:171:65 | jca/Encryption1.java:171:47:171:65 |
+| jca/Encryption1.java:171:47:171:65 | KeyOperationAlgorithm | RawName | AES/GCM/NoPadding | jca/Encryption1.java:171:47:171:65 | jca/Encryption1.java:171:47:171:65 |
+| jca/Encryption1.java:171:47:171:65 | KeyOperationAlgorithm | Structure | Block | jca/Encryption1.java:171:47:171:65 | jca/Encryption1.java:171:47:171:65 |
+| jca/Encryption1.java:171:47:171:65 | ModeOfOperation | Name | GCM | jca/Encryption1.java:171:47:171:65 | jca/Encryption1.java:171:47:171:65 |
+| jca/Encryption1.java:171:47:171:65 | ModeOfOperation | RawName | GCM | jca/Encryption1.java:171:47:171:65 | jca/Encryption1.java:171:47:171:65 |
+| jca/Encryption1.java:171:47:171:65 | PaddingAlgorithm | Name | UnknownPadding | jca/Encryption1.java:171:47:171:65 | jca/Encryption1.java:171:47:171:65 |
+| jca/Encryption1.java:171:47:171:65 | PaddingAlgorithm | RawName | NoPadding | jca/Encryption1.java:171:47:171:65 | jca/Encryption1.java:171:47:171:65 |
+| jca/Encryption1.java:173:38:173:39 | RandomNumberGeneration | Description | java.security.SecureRandom | jca/Encryption1.java:173:38:173:39 | jca/Encryption1.java:173:38:173:39 |
+| jca/Encryption1.java:175:45:175:50 | Key | KeyType | Unknown | jca/Encryption1.java:175:45:175:50 | jca/Encryption1.java:175:45:175:50 |
+| jca/Encryption1.java:176:32:176:65 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/Encryption1.java:176:32:176:65 | jca/Encryption1.java:176:32:176:65 |
+| jca/Encryption2.java:55:60:55:70 | EllipticCurve | CurveType | SEC | jca/Encryption2.java:55:60:55:70 | jca/Encryption2.java:55:60:55:70 |
+| jca/Encryption2.java:55:60:55:70 | EllipticCurve | KeySize | 256 | jca/Encryption2.java:55:60:55:70 | jca/Encryption2.java:55:60:55:70 |
+| jca/Encryption2.java:55:60:55:70 | EllipticCurve | Name | secp256r1 | jca/Encryption2.java:55:60:55:70 | jca/Encryption2.java:55:60:55:70 |
+| jca/Encryption2.java:55:60:55:70 | EllipticCurve | ParsedName | secp256r1 | jca/Encryption2.java:55:60:55:70 | jca/Encryption2.java:55:60:55:70 |
+| jca/Encryption2.java:55:60:55:70 | EllipticCurve | RawName | secp256r1 | jca/Encryption2.java:55:60:55:70 | jca/Encryption2.java:55:60:55:70 |
+| jca/Encryption2.java:56:16:56:49 | Key | KeyType | Asymmetric | jca/Encryption2.java:56:16:56:49 | jca/Encryption2.java:56:16:56:49 |
+| jca/Encryption2.java:71:62:71:67 | KeyAgreementAlgorithm | Name | ECDH | jca/Encryption2.java:71:62:71:67 | jca/Encryption2.java:71:62:71:67 |
+| jca/Encryption2.java:71:62:71:67 | KeyAgreementAlgorithm | RawName | ECDH | jca/Encryption2.java:71:62:71:67 | jca/Encryption2.java:71:62:71:67 |
+| jca/Encryption2.java:72:27:72:36 | Key | KeyType | Unknown | jca/Encryption2.java:72:27:72:36 | jca/Encryption2.java:72:27:72:36 |
+| jca/Encryption2.java:73:30:73:38 | Key | KeyType | Unknown | jca/Encryption2.java:73:30:73:38 | jca/Encryption2.java:73:30:73:38 |
+| jca/Encryption2.java:90:38:90:65 | Parameter | Description | recipientPublicKey | jca/Encryption2.java:90:38:90:65 | jca/Encryption2.java:90:38:90:65 |
+| jca/Encryption2.java:90:68:90:78 | Parameter | Description | data | jca/Encryption2.java:90:68:90:78 | jca/Encryption2.java:90:68:90:78 |
+| jca/Encryption2.java:99:58:99:66 | HashAlgorithm | DigestSize | 256 | jca/Encryption2.java:99:58:99:66 | jca/Encryption2.java:99:58:99:66 |
+| jca/Encryption2.java:99:58:99:66 | HashAlgorithm | Name | SHA2 | jca/Encryption2.java:99:58:99:66 | jca/Encryption2.java:99:58:99:66 |
+| jca/Encryption2.java:99:58:99:66 | HashAlgorithm | RawName | SHA-256 | jca/Encryption2.java:99:58:99:66 | jca/Encryption2.java:99:58:99:66 |
+| jca/Encryption2.java:105:47:105:65 | KeyOperationAlgorithm | Name | AES | jca/Encryption2.java:105:47:105:65 | jca/Encryption2.java:105:47:105:65 |
+| jca/Encryption2.java:105:47:105:65 | KeyOperationAlgorithm | RawName | AES/GCM/NoPadding | jca/Encryption2.java:105:47:105:65 | jca/Encryption2.java:105:47:105:65 |
+| jca/Encryption2.java:105:47:105:65 | KeyOperationAlgorithm | Structure | Block | jca/Encryption2.java:105:47:105:65 | jca/Encryption2.java:105:47:105:65 |
+| jca/Encryption2.java:105:47:105:65 | ModeOfOperation | Name | GCM | jca/Encryption2.java:105:47:105:65 | jca/Encryption2.java:105:47:105:65 |
+| jca/Encryption2.java:105:47:105:65 | ModeOfOperation | RawName | GCM | jca/Encryption2.java:105:47:105:65 | jca/Encryption2.java:105:47:105:65 |
+| jca/Encryption2.java:105:47:105:65 | PaddingAlgorithm | Name | UnknownPadding | jca/Encryption2.java:105:47:105:65 | jca/Encryption2.java:105:47:105:65 |
+| jca/Encryption2.java:105:47:105:65 | PaddingAlgorithm | RawName | NoPadding | jca/Encryption2.java:105:47:105:65 | jca/Encryption2.java:105:47:105:65 |
+| jca/Encryption2.java:107:38:107:39 | RandomNumberGeneration | Description | java.security.SecureRandom | jca/Encryption2.java:107:38:107:39 | jca/Encryption2.java:107:38:107:39 |
+| jca/Encryption2.java:109:45:109:50 | Key | KeyType | Unknown | jca/Encryption2.java:109:45:109:50 | jca/Encryption2.java:109:45:109:50 |
+| jca/Encryption2.java:110:32:110:65 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/Encryption2.java:110:32:110:65 | jca/Encryption2.java:110:32:110:65 |
+| jca/Encryption2.java:132:45:132:65 | Parameter | Description | ecPublicKey | jca/Encryption2.java:132:45:132:65 | jca/Encryption2.java:132:45:132:65 |
+| jca/Encryption2.java:132:68:132:88 | Parameter | Description | pqSharedSecret | jca/Encryption2.java:132:68:132:88 | jca/Encryption2.java:132:68:132:88 |
+| jca/Encryption2.java:145:47:145:65 | KeyOperationAlgorithm | Name | AES | jca/Encryption2.java:145:47:145:65 | jca/Encryption2.java:145:47:145:65 |
+| jca/Encryption2.java:145:47:145:65 | KeyOperationAlgorithm | RawName | AES/GCM/NoPadding | jca/Encryption2.java:145:47:145:65 | jca/Encryption2.java:145:47:145:65 |
+| jca/Encryption2.java:145:47:145:65 | KeyOperationAlgorithm | Structure | Block | jca/Encryption2.java:145:47:145:65 | jca/Encryption2.java:145:47:145:65 |
+| jca/Encryption2.java:145:47:145:65 | ModeOfOperation | Name | GCM | jca/Encryption2.java:145:47:145:65 | jca/Encryption2.java:145:47:145:65 |
+| jca/Encryption2.java:145:47:145:65 | ModeOfOperation | RawName | GCM | jca/Encryption2.java:145:47:145:65 | jca/Encryption2.java:145:47:145:65 |
+| jca/Encryption2.java:145:47:145:65 | PaddingAlgorithm | Name | UnknownPadding | jca/Encryption2.java:145:47:145:65 | jca/Encryption2.java:145:47:145:65 |
+| jca/Encryption2.java:145:47:145:65 | PaddingAlgorithm | RawName | NoPadding | jca/Encryption2.java:145:47:145:65 | jca/Encryption2.java:145:47:145:65 |
+| jca/Encryption2.java:147:38:147:39 | RandomNumberGeneration | Description | java.security.SecureRandom | jca/Encryption2.java:147:38:147:39 | jca/Encryption2.java:147:38:147:39 |
+| jca/Encryption2.java:149:45:149:50 | Key | KeyType | Unknown | jca/Encryption2.java:149:45:149:50 | jca/Encryption2.java:149:45:149:50 |
+| jca/Encryption2.java:150:32:150:98 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/Encryption2.java:150:32:150:98 | jca/Encryption2.java:150:32:150:98 |
+| jca/Encryption2.java:150:50:150:86 | Constant | Description | "Post-Quantum Hybrid Encryption Data" | jca/Encryption2.java:150:50:150:86 | jca/Encryption2.java:150:50:150:86 |
+| jca/Encryption2.java:173:36:173:47 | HMACAlgorithm | Name | HMAC | jca/Encryption2.java:173:36:173:47 | jca/Encryption2.java:173:36:173:47 |
+| jca/Encryption2.java:173:36:173:47 | HMACAlgorithm | RawName | HmacSHA256 | jca/Encryption2.java:173:36:173:47 | jca/Encryption2.java:173:36:173:47 |
+| jca/Encryption2.java:173:36:173:47 | HashAlgorithm | DigestSize | 256 | jca/Encryption2.java:173:36:173:47 | jca/Encryption2.java:173:36:173:47 |
+| jca/Encryption2.java:173:36:173:47 | HashAlgorithm | Name | SHA2 | jca/Encryption2.java:173:36:173:47 | jca/Encryption2.java:173:36:173:47 |
+| jca/Encryption2.java:173:36:173:47 | HashAlgorithm | RawName | HmacSHA256 | jca/Encryption2.java:173:36:173:47 | jca/Encryption2.java:173:36:173:47 |
+| jca/Encryption2.java:175:19:175:27 | Key | KeyType | Unknown | jca/Encryption2.java:175:19:175:27 | jca/Encryption2.java:175:19:175:27 |
+| jca/Encryption2.java:176:31:176:52 | MACOperation | KeyOperationSubtype | Mac | jca/Encryption2.java:176:31:176:52 | jca/Encryption2.java:176:31:176:52 |
+| jca/Hash.java:75:58:75:66 | HashAlgorithm | DigestSize | 256 | jca/Hash.java:75:58:75:66 | jca/Hash.java:75:58:75:66 |
+| jca/Hash.java:75:58:75:66 | HashAlgorithm | Name | SHA2 | jca/Hash.java:75:58:75:66 | jca/Hash.java:75:58:75:66 |
+| jca/Hash.java:75:58:75:66 | HashAlgorithm | RawName | SHA-256 | jca/Hash.java:75:58:75:66 | jca/Hash.java:75:58:75:66 |
+| jca/Hash.java:76:37:76:54 | Constant | Description | "Simple Test Data" | jca/Hash.java:76:37:76:54 | jca/Hash.java:76:37:76:54 |
+| jca/Hash.java:88:61:88:65 | HashAlgorithm | DigestSize | 128 | jca/Hash.java:88:61:88:65 | jca/Hash.java:88:61:88:65 |
+| jca/Hash.java:88:61:88:65 | HashAlgorithm | Name | MD5 | jca/Hash.java:88:61:88:65 | jca/Hash.java:88:61:88:65 |
+| jca/Hash.java:88:61:88:65 | HashAlgorithm | RawName | MD5 | jca/Hash.java:88:61:88:65 | jca/Hash.java:88:61:88:65 |
+| jca/Hash.java:89:40:89:58 | Constant | Description | "Weak Hash Example" | jca/Hash.java:89:40:89:58 | jca/Hash.java:89:40:89:58 |
+| jca/Hash.java:133:29:133:40 | Parameter | Description | input | jca/Hash.java:133:29:133:40 | jca/Hash.java:133:29:133:40 |
+| jca/Hash.java:133:43:133:63 | Parameter | Description | privateKey | jca/Hash.java:133:43:133:63 | jca/Hash.java:133:43:133:63 |
+| jca/Hash.java:134:53:134:67 | HashAlgorithm | DigestSize | 256 | jca/Hash.java:134:53:134:67 | jca/Hash.java:134:53:134:67 |
+| jca/Hash.java:134:53:134:67 | HashAlgorithm | Name | SHA2 | jca/Hash.java:134:53:134:67 | jca/Hash.java:134:53:134:67 |
+| jca/Hash.java:134:53:134:67 | HashAlgorithm | RawName | SHA256withRSA | jca/Hash.java:134:53:134:67 | jca/Hash.java:134:53:134:67 |
+| jca/Hash.java:134:53:134:67 | KeyOperationAlgorithm | Name | RSA | jca/Hash.java:134:53:134:67 | jca/Hash.java:134:53:134:67 |
+| jca/Hash.java:134:53:134:67 | KeyOperationAlgorithm | RawName | SHA256withRSA | jca/Hash.java:134:53:134:67 | jca/Hash.java:134:53:134:67 |
+| jca/Hash.java:135:28:135:37 | Key | KeyType | Unknown | jca/Hash.java:135:28:135:37 | jca/Hash.java:135:28:135:37 |
+| jca/Hash.java:137:29:137:44 | SignOperation | KeyOperationSubtype | Sign | jca/Hash.java:137:29:137:44 | jca/Hash.java:137:29:137:44 |
+| jca/Hash.java:154:40:154:51 | Parameter | Description | input | jca/Hash.java:154:40:154:51 | jca/Hash.java:154:40:154:51 |
+| jca/Hash.java:154:54:154:70 | Parameter | Description | signedHash | jca/Hash.java:154:54:154:70 | jca/Hash.java:154:54:154:70 |
+| jca/Hash.java:154:73:154:91 | Parameter | Description | publicKey | jca/Hash.java:154:73:154:91 | jca/Hash.java:154:73:154:91 |
+| jca/Hash.java:155:53:155:67 | HashAlgorithm | DigestSize | 256 | jca/Hash.java:155:53:155:67 | jca/Hash.java:155:53:155:67 |
+| jca/Hash.java:155:53:155:67 | HashAlgorithm | Name | SHA2 | jca/Hash.java:155:53:155:67 | jca/Hash.java:155:53:155:67 |
+| jca/Hash.java:155:53:155:67 | HashAlgorithm | RawName | SHA256withRSA | jca/Hash.java:155:53:155:67 | jca/Hash.java:155:53:155:67 |
+| jca/Hash.java:155:53:155:67 | KeyOperationAlgorithm | Name | RSA | jca/Hash.java:155:53:155:67 | jca/Hash.java:155:53:155:67 |
+| jca/Hash.java:155:53:155:67 | KeyOperationAlgorithm | RawName | SHA256withRSA | jca/Hash.java:155:53:155:67 | jca/Hash.java:155:53:155:67 |
+| jca/Hash.java:156:30:156:38 | Key | KeyType | Unknown | jca/Hash.java:156:30:156:38 | jca/Hash.java:156:30:156:38 |
+| jca/Hash.java:158:16:158:43 | VerifyOperation | KeyOperationSubtype | Verify | jca/Hash.java:158:16:158:43 | jca/Hash.java:158:16:158:43 |
+| jca/Hash.java:172:43:172:53 | Parameter | Description | data | jca/Hash.java:172:43:172:53 | jca/Hash.java:172:43:172:53 |
+| jca/Hash.java:173:58:173:66 | HashAlgorithm | DigestSize | 256 | jca/Hash.java:173:58:173:66 | jca/Hash.java:173:58:173:66 |
+| jca/Hash.java:173:58:173:66 | HashAlgorithm | Name | SHA2 | jca/Hash.java:173:58:173:66 | jca/Hash.java:173:58:173:66 |
+| jca/Hash.java:173:58:173:66 | HashAlgorithm | RawName | SHA-256 | jca/Hash.java:173:58:173:66 | jca/Hash.java:173:58:173:66 |
+| jca/Hash.java:190:43:190:54 | Parameter | Description | input | jca/Hash.java:190:43:190:54 | jca/Hash.java:190:43:190:54 |
+| jca/Hash.java:191:31:192:48 | Constant | Description | {...} | jca/Hash.java:191:31:192:48 | jca/Hash.java:191:31:192:48 |
+| jca/Hash.java:191:32:191:38 | HashAlgorithm | DigestSize | 160 | jca/Hash.java:191:32:191:38 | jca/Hash.java:191:32:191:38 |
+| jca/Hash.java:191:32:191:38 | HashAlgorithm | Name | SHA1 | jca/Hash.java:191:32:191:38 | jca/Hash.java:191:32:191:38 |
+| jca/Hash.java:191:32:191:38 | HashAlgorithm | RawName | SHA-1 | jca/Hash.java:191:32:191:38 | jca/Hash.java:191:32:191:38 |
+| jca/Hash.java:191:41:191:49 | HashAlgorithm | DigestSize | 224 | jca/Hash.java:191:41:191:49 | jca/Hash.java:191:41:191:49 |
+| jca/Hash.java:191:41:191:49 | HashAlgorithm | Name | SHA2 | jca/Hash.java:191:41:191:49 | jca/Hash.java:191:41:191:49 |
+| jca/Hash.java:191:41:191:49 | HashAlgorithm | RawName | SHA-224 | jca/Hash.java:191:41:191:49 | jca/Hash.java:191:41:191:49 |
+| jca/Hash.java:191:52:191:60 | HashAlgorithm | DigestSize | 256 | jca/Hash.java:191:52:191:60 | jca/Hash.java:191:52:191:60 |
+| jca/Hash.java:191:52:191:60 | HashAlgorithm | Name | SHA2 | jca/Hash.java:191:52:191:60 | jca/Hash.java:191:52:191:60 |
+| jca/Hash.java:191:52:191:60 | HashAlgorithm | RawName | SHA-256 | jca/Hash.java:191:52:191:60 | jca/Hash.java:191:52:191:60 |
+| jca/Hash.java:191:63:191:71 | HashAlgorithm | DigestSize | 384 | jca/Hash.java:191:63:191:71 | jca/Hash.java:191:63:191:71 |
+| jca/Hash.java:191:63:191:71 | HashAlgorithm | Name | SHA2 | jca/Hash.java:191:63:191:71 | jca/Hash.java:191:63:191:71 |
+| jca/Hash.java:191:63:191:71 | HashAlgorithm | RawName | SHA-384 | jca/Hash.java:191:63:191:71 | jca/Hash.java:191:63:191:71 |
+| jca/Hash.java:191:74:191:82 | HashAlgorithm | DigestSize | 512 | jca/Hash.java:191:74:191:82 | jca/Hash.java:191:74:191:82 |
+| jca/Hash.java:191:74:191:82 | HashAlgorithm | Name | SHA2 | jca/Hash.java:191:74:191:82 | jca/Hash.java:191:74:191:82 |
+| jca/Hash.java:191:74:191:82 | HashAlgorithm | RawName | SHA-512 | jca/Hash.java:191:74:191:82 | jca/Hash.java:191:74:191:82 |
+| jca/Hash.java:191:85:191:94 | HashAlgorithm | DigestSize | 256 | jca/Hash.java:191:85:191:94 | jca/Hash.java:191:85:191:94 |
+| jca/Hash.java:191:85:191:94 | HashAlgorithm | Name | SHA3 | jca/Hash.java:191:85:191:94 | jca/Hash.java:191:85:191:94 |
+| jca/Hash.java:191:85:191:94 | HashAlgorithm | RawName | SHA3-256 | jca/Hash.java:191:85:191:94 | jca/Hash.java:191:85:191:94 |
+| jca/Hash.java:191:97:191:106 | HashAlgorithm | DigestSize | 512 | jca/Hash.java:191:97:191:106 | jca/Hash.java:191:97:191:106 |
+| jca/Hash.java:191:97:191:106 | HashAlgorithm | Name | SHA3 | jca/Hash.java:191:97:191:106 | jca/Hash.java:191:97:191:106 |
+| jca/Hash.java:191:97:191:106 | HashAlgorithm | RawName | SHA3-512 | jca/Hash.java:191:97:191:106 | jca/Hash.java:191:97:191:106 |
+| jca/Hash.java:192:13:192:25 | HashAlgorithm | DigestSize | 512 | jca/Hash.java:192:13:192:25 | jca/Hash.java:192:13:192:25 |
+| jca/Hash.java:192:13:192:25 | HashAlgorithm | Name | BLAKE2B | jca/Hash.java:192:13:192:25 | jca/Hash.java:192:13:192:25 |
+| jca/Hash.java:192:13:192:25 | HashAlgorithm | RawName | BLAKE2B-512 | jca/Hash.java:192:13:192:25 | jca/Hash.java:192:13:192:25 |
+| jca/Hash.java:192:43:192:47 | HashAlgorithm | DigestSize | 128 | jca/Hash.java:192:43:192:47 | jca/Hash.java:192:43:192:47 |
+| jca/Hash.java:192:43:192:47 | HashAlgorithm | Name | MD5 | jca/Hash.java:192:43:192:47 | jca/Hash.java:192:43:192:47 |
+| jca/Hash.java:192:43:192:47 | HashAlgorithm | RawName | MD5 | jca/Hash.java:192:43:192:47 | jca/Hash.java:192:43:192:47 |
+| jca/Hash.java:211:43:211:54 | Parameter | Description | input | jca/Hash.java:211:43:211:54 | jca/Hash.java:211:43:211:54 |
+| jca/Hash.java:211:57:211:66 | Parameter | Description | key | jca/Hash.java:211:57:211:66 | jca/Hash.java:211:57:211:66 |
+| jca/Hash.java:212:31:212:116 | Constant | Description | {...} | jca/Hash.java:212:31:212:116 | jca/Hash.java:212:31:212:116 |
+| jca/Hash.java:212:32:212:41 | HMACAlgorithm | Name | HMAC | jca/Hash.java:212:32:212:41 | jca/Hash.java:212:32:212:41 |
+| jca/Hash.java:212:32:212:41 | HMACAlgorithm | RawName | HmacSHA1 | jca/Hash.java:212:32:212:41 | jca/Hash.java:212:32:212:41 |
+| jca/Hash.java:212:32:212:41 | HashAlgorithm | DigestSize | 160 | jca/Hash.java:212:32:212:41 | jca/Hash.java:212:32:212:41 |
+| jca/Hash.java:212:32:212:41 | HashAlgorithm | Name | SHA1 | jca/Hash.java:212:32:212:41 | jca/Hash.java:212:32:212:41 |
+| jca/Hash.java:212:32:212:41 | HashAlgorithm | RawName | HmacSHA1 | jca/Hash.java:212:32:212:41 | jca/Hash.java:212:32:212:41 |
+| jca/Hash.java:212:44:212:55 | HMACAlgorithm | Name | HMAC | jca/Hash.java:212:44:212:55 | jca/Hash.java:212:44:212:55 |
+| jca/Hash.java:212:44:212:55 | HMACAlgorithm | RawName | HmacSHA256 | jca/Hash.java:212:44:212:55 | jca/Hash.java:212:44:212:55 |
+| jca/Hash.java:212:44:212:55 | HashAlgorithm | DigestSize | 256 | jca/Hash.java:212:44:212:55 | jca/Hash.java:212:44:212:55 |
+| jca/Hash.java:212:44:212:55 | HashAlgorithm | Name | SHA2 | jca/Hash.java:212:44:212:55 | jca/Hash.java:212:44:212:55 |
+| jca/Hash.java:212:44:212:55 | HashAlgorithm | RawName | HmacSHA256 | jca/Hash.java:212:44:212:55 | jca/Hash.java:212:44:212:55 |
+| jca/Hash.java:212:58:212:69 | HMACAlgorithm | Name | HMAC | jca/Hash.java:212:58:212:69 | jca/Hash.java:212:58:212:69 |
+| jca/Hash.java:212:58:212:69 | HMACAlgorithm | RawName | HmacSHA384 | jca/Hash.java:212:58:212:69 | jca/Hash.java:212:58:212:69 |
+| jca/Hash.java:212:58:212:69 | HashAlgorithm | DigestSize | 384 | jca/Hash.java:212:58:212:69 | jca/Hash.java:212:58:212:69 |
+| jca/Hash.java:212:58:212:69 | HashAlgorithm | Name | SHA2 | jca/Hash.java:212:58:212:69 | jca/Hash.java:212:58:212:69 |
+| jca/Hash.java:212:58:212:69 | HashAlgorithm | RawName | HmacSHA384 | jca/Hash.java:212:58:212:69 | jca/Hash.java:212:58:212:69 |
+| jca/Hash.java:212:72:212:83 | HMACAlgorithm | Name | HMAC | jca/Hash.java:212:72:212:83 | jca/Hash.java:212:72:212:83 |
+| jca/Hash.java:212:72:212:83 | HMACAlgorithm | RawName | HmacSHA512 | jca/Hash.java:212:72:212:83 | jca/Hash.java:212:72:212:83 |
+| jca/Hash.java:212:72:212:83 | HashAlgorithm | DigestSize | 512 | jca/Hash.java:212:72:212:83 | jca/Hash.java:212:72:212:83 |
+| jca/Hash.java:212:72:212:83 | HashAlgorithm | Name | SHA2 | jca/Hash.java:212:72:212:83 | jca/Hash.java:212:72:212:83 |
+| jca/Hash.java:212:72:212:83 | HashAlgorithm | RawName | HmacSHA512 | jca/Hash.java:212:72:212:83 | jca/Hash.java:212:72:212:83 |
+| jca/Hash.java:212:86:212:99 | HMACAlgorithm | Name | HMAC | jca/Hash.java:212:86:212:99 | jca/Hash.java:212:86:212:99 |
+| jca/Hash.java:212:86:212:99 | HMACAlgorithm | RawName | HmacSHA3-256 | jca/Hash.java:212:86:212:99 | jca/Hash.java:212:86:212:99 |
+| jca/Hash.java:212:86:212:99 | HashAlgorithm | DigestSize | 256 | jca/Hash.java:212:86:212:99 | jca/Hash.java:212:86:212:99 |
+| jca/Hash.java:212:86:212:99 | HashAlgorithm | Name | SHA3 | jca/Hash.java:212:86:212:99 | jca/Hash.java:212:86:212:99 |
+| jca/Hash.java:212:86:212:99 | HashAlgorithm | RawName | HmacSHA3-256 | jca/Hash.java:212:86:212:99 | jca/Hash.java:212:86:212:99 |
+| jca/Hash.java:212:102:212:115 | HMACAlgorithm | Name | HMAC | jca/Hash.java:212:102:212:115 | jca/Hash.java:212:102:212:115 |
+| jca/Hash.java:212:102:212:115 | HMACAlgorithm | RawName | HmacSHA3-512 | jca/Hash.java:212:102:212:115 | jca/Hash.java:212:102:212:115 |
+| jca/Hash.java:212:102:212:115 | HashAlgorithm | DigestSize | 512 | jca/Hash.java:212:102:212:115 | jca/Hash.java:212:102:212:115 |
+| jca/Hash.java:212:102:212:115 | HashAlgorithm | Name | SHA3 | jca/Hash.java:212:102:212:115 | jca/Hash.java:212:102:212:115 |
+| jca/Hash.java:212:102:212:115 | HashAlgorithm | RawName | HmacSHA3-512 | jca/Hash.java:212:102:212:115 | jca/Hash.java:212:102:212:115 |
+| jca/Hash.java:216:22:216:30 | Key | KeyType | Unknown | jca/Hash.java:216:22:216:30 | jca/Hash.java:216:22:216:30 |
+| jca/Hash.java:217:27:217:55 | MACOperation | KeyOperationSubtype | Mac | jca/Hash.java:217:27:217:55 | jca/Hash.java:217:27:217:55 |
+| jca/Hash.java:232:40:232:54 | Parameter | Description | password | jca/Hash.java:232:40:232:54 | jca/Hash.java:232:40:232:54 |
+| jca/Hash.java:235:72:235:76 | Constant | Description | 10000 | jca/Hash.java:235:72:235:76 | jca/Hash.java:235:72:235:76 |
+| jca/Hash.java:235:79:235:81 | Constant | Description | 256 | jca/Hash.java:235:79:235:81 | jca/Hash.java:235:79:235:81 |
+| jca/Hash.java:236:65:236:86 | HMACAlgorithm | Name | HMAC | jca/Hash.java:236:65:236:86 | jca/Hash.java:236:65:236:86 |
+| jca/Hash.java:236:65:236:86 | HMACAlgorithm | RawName | PBKDF2WithHmacSHA256 | jca/Hash.java:236:65:236:86 | jca/Hash.java:236:65:236:86 |
+| jca/Hash.java:236:65:236:86 | HashAlgorithm | DigestSize | 256 | jca/Hash.java:236:65:236:86 | jca/Hash.java:236:65:236:86 |
+| jca/Hash.java:236:65:236:86 | HashAlgorithm | Name | SHA2 | jca/Hash.java:236:65:236:86 | jca/Hash.java:236:65:236:86 |
+| jca/Hash.java:236:65:236:86 | HashAlgorithm | RawName | PBKDF2WithHmacSHA256 | jca/Hash.java:236:65:236:86 | jca/Hash.java:236:65:236:86 |
+| jca/Hash.java:236:65:236:86 | KeyDerivationAlgorithm | Name | PBKDF2WithHmacSHA256 | jca/Hash.java:236:65:236:86 | jca/Hash.java:236:65:236:86 |
+| jca/Hash.java:236:65:236:86 | KeyDerivationAlgorithm | RawName | PBKDF2WithHmacSHA256 | jca/Hash.java:236:65:236:86 | jca/Hash.java:236:65:236:86 |
+| jca/Hash.java:237:23:237:50 | Key | KeyType | Symmetric | jca/Hash.java:237:23:237:50 | jca/Hash.java:237:23:237:50 |
+| jca/Hash.java:237:23:237:50 | KeyDerivation | Iterations | Constant:10000 | jca/Hash.java:235:72:235:76 | jca/Hash.java:235:72:235:76 |
+| jca/Hash.java:237:23:237:50 | KeyDerivation | KeySize | Constant:256 | jca/Hash.java:235:79:235:81 | jca/Hash.java:235:79:235:81 |
+| jca/Hash.java:252:37:252:58 | Constant | Description | "Config-based Hashing" | jca/Hash.java:252:37:252:58 | jca/Hash.java:252:37:252:58 |
+| jca/Hash.java:266:31:266:76 | Constant | Description | {...} | jca/Hash.java:266:31:266:76 | jca/Hash.java:266:31:266:76 |
+| jca/Hash.java:266:32:266:40 | HashAlgorithm | DigestSize | 256 | jca/Hash.java:266:32:266:40 | jca/Hash.java:266:32:266:40 |
+| jca/Hash.java:266:32:266:40 | HashAlgorithm | Name | SHA2 | jca/Hash.java:266:32:266:40 | jca/Hash.java:266:32:266:40 |
+| jca/Hash.java:266:32:266:40 | HashAlgorithm | RawName | SHA-256 | jca/Hash.java:266:32:266:40 | jca/Hash.java:266:32:266:40 |
+| jca/Hash.java:266:43:266:51 | HashAlgorithm | DigestSize | 512 | jca/Hash.java:266:43:266:51 | jca/Hash.java:266:43:266:51 |
+| jca/Hash.java:266:43:266:51 | HashAlgorithm | Name | SHA2 | jca/Hash.java:266:43:266:51 | jca/Hash.java:266:43:266:51 |
+| jca/Hash.java:266:43:266:51 | HashAlgorithm | RawName | SHA-512 | jca/Hash.java:266:43:266:51 | jca/Hash.java:266:43:266:51 |
+| jca/Hash.java:266:54:266:63 | HashAlgorithm | DigestSize | 256 | jca/Hash.java:266:54:266:63 | jca/Hash.java:266:54:266:63 |
+| jca/Hash.java:266:54:266:63 | HashAlgorithm | Name | SHA3 | jca/Hash.java:266:54:266:63 | jca/Hash.java:266:54:266:63 |
+| jca/Hash.java:266:54:266:63 | HashAlgorithm | RawName | SHA3-256 | jca/Hash.java:266:54:266:63 | jca/Hash.java:266:54:266:63 |
+| jca/Hash.java:266:66:266:75 | HashAlgorithm | DigestSize | 512 | jca/Hash.java:266:66:266:75 | jca/Hash.java:266:66:266:75 |
+| jca/Hash.java:266:66:266:75 | HashAlgorithm | Name | SHA3 | jca/Hash.java:266:66:266:75 | jca/Hash.java:266:66:266:75 |
+| jca/Hash.java:266:66:266:75 | HashAlgorithm | RawName | SHA3-512 | jca/Hash.java:266:66:266:75 | jca/Hash.java:266:66:266:75 |
+| jca/Hash.java:269:27:269:38 | Constant | Description | "fixed-seed" | jca/Hash.java:269:27:269:38 | jca/Hash.java:269:27:269:38 |
+| jca/Hash.java:294:16:294:66 | Constant | Description | getProperty(...) | jca/Hash.java:294:16:294:66 | jca/Hash.java:294:16:294:66 |
+| jca/Hash.java:294:16:294:66 | LocalData | Description | getProperty(...) | jca/Hash.java:294:16:294:66 | jca/Hash.java:294:16:294:66 |
+| jca/Hash.java:294:57:294:65 | HashAlgorithm | DigestSize | 256 | jca/Hash.java:294:57:294:65 | jca/Hash.java:294:57:294:65 |
+| jca/Hash.java:294:57:294:65 | HashAlgorithm | Name | SHA2 | jca/Hash.java:294:57:294:65 | jca/Hash.java:294:57:294:65 |
+| jca/Hash.java:294:57:294:65 | HashAlgorithm | RawName | SHA-256 | jca/Hash.java:294:57:294:65 | jca/Hash.java:294:57:294:65 |
+| jca/Hash.java:310:38:310:41 | RandomNumberGeneration | Description | java.security.SecureRandom | jca/Hash.java:310:38:310:41 | jca/Hash.java:310:38:310:41 |
+| jca/IVArtifact.java:30:44:30:65 | KeyOperationAlgorithm | Name | AES | jca/IVArtifact.java:30:44:30:65 | jca/IVArtifact.java:30:44:30:65 |
+| jca/IVArtifact.java:30:44:30:65 | KeyOperationAlgorithm | RawName | AES/CBC/PKCS5Padding | jca/IVArtifact.java:30:44:30:65 | jca/IVArtifact.java:30:44:30:65 |
+| jca/IVArtifact.java:30:44:30:65 | KeyOperationAlgorithm | Structure | Block | jca/IVArtifact.java:30:44:30:65 | jca/IVArtifact.java:30:44:30:65 |
+| jca/IVArtifact.java:30:44:30:65 | ModeOfOperation | Name | CBC | jca/IVArtifact.java:30:44:30:65 | jca/IVArtifact.java:30:44:30:65 |
+| jca/IVArtifact.java:30:44:30:65 | ModeOfOperation | RawName | CBC | jca/IVArtifact.java:30:44:30:65 | jca/IVArtifact.java:30:44:30:65 |
+| jca/IVArtifact.java:30:44:30:65 | PaddingAlgorithm | Name | PKCS7 | jca/IVArtifact.java:30:44:30:65 | jca/IVArtifact.java:30:44:30:65 |
+| jca/IVArtifact.java:30:44:30:65 | PaddingAlgorithm | RawName | PKCS5Padding | jca/IVArtifact.java:30:44:30:65 | jca/IVArtifact.java:30:44:30:65 |
+| jca/IVArtifact.java:31:42:31:44 | Key | KeyType | Unknown | jca/IVArtifact.java:31:42:31:44 | jca/IVArtifact.java:31:42:31:44 |
+| jca/IVArtifact.java:32:29:32:73 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/IVArtifact.java:32:29:32:73 | jca/IVArtifact.java:32:29:32:73 |
+| jca/IVArtifact.java:32:44:32:61 | Constant | Description | "Simple Test Data" | jca/IVArtifact.java:32:44:32:61 | jca/IVArtifact.java:32:44:32:61 |
+| jca/IVArtifact.java:38:42:38:44 | Key | KeyType | Unknown | jca/IVArtifact.java:38:42:38:44 | jca/IVArtifact.java:38:42:38:44 |
+| jca/IVArtifact.java:39:29:39:53 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/IVArtifact.java:39:29:39:53 | jca/IVArtifact.java:39:29:39:53 |
+| jca/IVArtifact.java:49:27:49:42 | Constant | Description | "Sensitive Data" | jca/IVArtifact.java:49:27:49:42 | jca/IVArtifact.java:49:27:49:42 |
+| jca/IVArtifact.java:70:16:70:81 | Constant | Description | getProperty(...) | jca/IVArtifact.java:70:16:70:81 | jca/IVArtifact.java:70:16:70:81 |
+| jca/IVArtifact.java:70:16:70:81 | LocalData | Description | getProperty(...) | jca/IVArtifact.java:70:16:70:81 | jca/IVArtifact.java:70:16:70:81 |
+| jca/IVArtifact.java:70:59:70:80 | KeyOperationAlgorithm | Name | AES | jca/IVArtifact.java:70:59:70:80 | jca/IVArtifact.java:70:59:70:80 |
+| jca/IVArtifact.java:70:59:70:80 | KeyOperationAlgorithm | RawName | AES/CBC/PKCS5Padding | jca/IVArtifact.java:70:59:70:80 | jca/IVArtifact.java:70:59:70:80 |
+| jca/IVArtifact.java:70:59:70:80 | KeyOperationAlgorithm | Structure | Block | jca/IVArtifact.java:70:59:70:80 | jca/IVArtifact.java:70:59:70:80 |
+| jca/IVArtifact.java:70:59:70:80 | ModeOfOperation | Name | CBC | jca/IVArtifact.java:70:59:70:80 | jca/IVArtifact.java:70:59:70:80 |
+| jca/IVArtifact.java:70:59:70:80 | ModeOfOperation | RawName | CBC | jca/IVArtifact.java:70:59:70:80 | jca/IVArtifact.java:70:59:70:80 |
+| jca/IVArtifact.java:70:59:70:80 | PaddingAlgorithm | Name | PKCS7 | jca/IVArtifact.java:70:59:70:80 | jca/IVArtifact.java:70:59:70:80 |
+| jca/IVArtifact.java:70:59:70:80 | PaddingAlgorithm | RawName | PKCS5Padding | jca/IVArtifact.java:70:59:70:80 | jca/IVArtifact.java:70:59:70:80 |
+| jca/IVArtifact.java:74:56:74:60 | KeyOperationAlgorithm | KeySize | Constant:256 | jca/IVArtifact.java:75:21:75:23 | jca/IVArtifact.java:75:21:75:23 |
+| jca/IVArtifact.java:74:56:74:60 | KeyOperationAlgorithm | Name | AES | jca/IVArtifact.java:74:56:74:60 | jca/IVArtifact.java:74:56:74:60 |
+| jca/IVArtifact.java:74:56:74:60 | KeyOperationAlgorithm | RawName | AES | jca/IVArtifact.java:74:56:74:60 | jca/IVArtifact.java:74:56:74:60 |
+| jca/IVArtifact.java:74:56:74:60 | KeyOperationAlgorithm | Structure | Block | jca/IVArtifact.java:74:56:74:60 | jca/IVArtifact.java:74:56:74:60 |
+| jca/IVArtifact.java:75:21:75:23 | Constant | Description | 256 | jca/IVArtifact.java:75:21:75:23 | jca/IVArtifact.java:75:21:75:23 |
+| jca/IVArtifact.java:76:16:76:35 | Key | KeyType | Symmetric | jca/IVArtifact.java:76:16:76:35 | jca/IVArtifact.java:76:16:76:35 |
+| jca/IVArtifact.java:81:38:81:39 | RandomNumberGeneration | Description | java.security.SecureRandom | jca/IVArtifact.java:81:38:81:39 | jca/IVArtifact.java:81:38:81:39 |
+| jca/IVArtifact.java:87:32:87:33 | RandomNumberGeneration | Description | java.util.Random | jca/IVArtifact.java:87:32:87:33 | jca/IVArtifact.java:87:32:87:33 |
+| jca/IVArtifact.java:105:44:105:62 | KeyOperationAlgorithm | Name | AES | jca/IVArtifact.java:105:44:105:62 | jca/IVArtifact.java:105:44:105:62 |
+| jca/IVArtifact.java:105:44:105:62 | KeyOperationAlgorithm | RawName | AES/GCM/NoPadding | jca/IVArtifact.java:105:44:105:62 | jca/IVArtifact.java:105:44:105:62 |
+| jca/IVArtifact.java:105:44:105:62 | KeyOperationAlgorithm | Structure | Block | jca/IVArtifact.java:105:44:105:62 | jca/IVArtifact.java:105:44:105:62 |
+| jca/IVArtifact.java:105:44:105:62 | ModeOfOperation | Name | GCM | jca/IVArtifact.java:105:44:105:62 | jca/IVArtifact.java:105:44:105:62 |
+| jca/IVArtifact.java:105:44:105:62 | ModeOfOperation | RawName | GCM | jca/IVArtifact.java:105:44:105:62 | jca/IVArtifact.java:105:44:105:62 |
+| jca/IVArtifact.java:105:44:105:62 | PaddingAlgorithm | Name | UnknownPadding | jca/IVArtifact.java:105:44:105:62 | jca/IVArtifact.java:105:44:105:62 |
+| jca/IVArtifact.java:105:44:105:62 | PaddingAlgorithm | RawName | NoPadding | jca/IVArtifact.java:105:44:105:62 | jca/IVArtifact.java:105:44:105:62 |
+| jca/IVArtifact.java:108:42:108:44 | Key | KeyType | Unknown | jca/IVArtifact.java:108:42:108:44 | jca/IVArtifact.java:108:42:108:44 |
+| jca/IVArtifact.java:109:16:109:40 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/IVArtifact.java:109:16:109:40 | jca/IVArtifact.java:109:16:109:40 |
+| jca/IVArtifact.java:116:31:116:34 | Constant | Description | null | jca/IVArtifact.java:116:31:116:34 | jca/IVArtifact.java:116:31:116:34 |
+| jca/IVArtifact.java:130:42:130:49 | RandomNumberGeneration | Description | java.security.SecureRandom | jca/IVArtifact.java:130:42:130:49 | jca/IVArtifact.java:130:42:130:49 |
+| jca/IVArtifact.java:132:44:132:62 | KeyOperationAlgorithm | Name | AES | jca/IVArtifact.java:132:44:132:62 | jca/IVArtifact.java:132:44:132:62 |
+| jca/IVArtifact.java:132:44:132:62 | KeyOperationAlgorithm | RawName | AES/GCM/NoPadding | jca/IVArtifact.java:132:44:132:62 | jca/IVArtifact.java:132:44:132:62 |
+| jca/IVArtifact.java:132:44:132:62 | KeyOperationAlgorithm | Structure | Block | jca/IVArtifact.java:132:44:132:62 | jca/IVArtifact.java:132:44:132:62 |
+| jca/IVArtifact.java:132:44:132:62 | ModeOfOperation | Name | GCM | jca/IVArtifact.java:132:44:132:62 | jca/IVArtifact.java:132:44:132:62 |
+| jca/IVArtifact.java:132:44:132:62 | ModeOfOperation | RawName | GCM | jca/IVArtifact.java:132:44:132:62 | jca/IVArtifact.java:132:44:132:62 |
+| jca/IVArtifact.java:132:44:132:62 | PaddingAlgorithm | Name | UnknownPadding | jca/IVArtifact.java:132:44:132:62 | jca/IVArtifact.java:132:44:132:62 |
+| jca/IVArtifact.java:132:44:132:62 | PaddingAlgorithm | RawName | NoPadding | jca/IVArtifact.java:132:44:132:62 | jca/IVArtifact.java:132:44:132:62 |
+| jca/IVArtifact.java:134:42:134:44 | Key | KeyType | Unknown | jca/IVArtifact.java:134:42:134:44 | jca/IVArtifact.java:134:42:134:44 |
+| jca/IVArtifact.java:135:16:135:40 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/IVArtifact.java:135:16:135:40 | jca/IVArtifact.java:135:16:135:40 |
+| jca/IVArtifact.java:153:58:153:66 | HashAlgorithm | DigestSize | 256 | jca/IVArtifact.java:153:58:153:66 | jca/IVArtifact.java:153:58:153:66 |
+| jca/IVArtifact.java:153:58:153:66 | HashAlgorithm | Name | SHA2 | jca/IVArtifact.java:153:58:153:66 | jca/IVArtifact.java:153:58:153:66 |
+| jca/IVArtifact.java:153:58:153:66 | HashAlgorithm | RawName | SHA-256 | jca/IVArtifact.java:153:58:153:66 | jca/IVArtifact.java:153:58:153:66 |
+| jca/IVArtifact.java:154:45:154:59 | Constant | Description | "fixedConstant" | jca/IVArtifact.java:154:45:154:59 | jca/IVArtifact.java:154:45:154:59 |
+| jca/IVArtifact.java:156:44:156:62 | KeyOperationAlgorithm | Name | AES | jca/IVArtifact.java:156:44:156:62 | jca/IVArtifact.java:156:44:156:62 |
+| jca/IVArtifact.java:156:44:156:62 | KeyOperationAlgorithm | RawName | AES/GCM/NoPadding | jca/IVArtifact.java:156:44:156:62 | jca/IVArtifact.java:156:44:156:62 |
+| jca/IVArtifact.java:156:44:156:62 | KeyOperationAlgorithm | Structure | Block | jca/IVArtifact.java:156:44:156:62 | jca/IVArtifact.java:156:44:156:62 |
+| jca/IVArtifact.java:156:44:156:62 | ModeOfOperation | Name | GCM | jca/IVArtifact.java:156:44:156:62 | jca/IVArtifact.java:156:44:156:62 |
+| jca/IVArtifact.java:156:44:156:62 | ModeOfOperation | RawName | GCM | jca/IVArtifact.java:156:44:156:62 | jca/IVArtifact.java:156:44:156:62 |
+| jca/IVArtifact.java:156:44:156:62 | PaddingAlgorithm | Name | UnknownPadding | jca/IVArtifact.java:156:44:156:62 | jca/IVArtifact.java:156:44:156:62 |
+| jca/IVArtifact.java:156:44:156:62 | PaddingAlgorithm | RawName | NoPadding | jca/IVArtifact.java:156:44:156:62 | jca/IVArtifact.java:156:44:156:62 |
+| jca/IVArtifact.java:158:42:158:44 | Key | KeyType | Unknown | jca/IVArtifact.java:158:42:158:44 | jca/IVArtifact.java:158:42:158:44 |
+| jca/IVArtifact.java:159:16:159:40 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/IVArtifact.java:159:16:159:40 | jca/IVArtifact.java:159:16:159:40 |
+| jca/IVArtifact.java:177:38:177:39 | RandomNumberGeneration | Description | java.security.SecureRandom | jca/IVArtifact.java:177:38:177:39 | jca/IVArtifact.java:177:38:177:39 |
+| jca/IVArtifact.java:180:48:180:66 | KeyOperationAlgorithm | Name | AES | jca/IVArtifact.java:180:48:180:66 | jca/IVArtifact.java:180:48:180:66 |
+| jca/IVArtifact.java:180:48:180:66 | KeyOperationAlgorithm | RawName | AES/GCM/NoPadding | jca/IVArtifact.java:180:48:180:66 | jca/IVArtifact.java:180:48:180:66 |
+| jca/IVArtifact.java:180:48:180:66 | KeyOperationAlgorithm | Structure | Block | jca/IVArtifact.java:180:48:180:66 | jca/IVArtifact.java:180:48:180:66 |
+| jca/IVArtifact.java:180:48:180:66 | ModeOfOperation | Name | GCM | jca/IVArtifact.java:180:48:180:66 | jca/IVArtifact.java:180:48:180:66 |
+| jca/IVArtifact.java:180:48:180:66 | ModeOfOperation | RawName | GCM | jca/IVArtifact.java:180:48:180:66 | jca/IVArtifact.java:180:48:180:66 |
+| jca/IVArtifact.java:180:48:180:66 | PaddingAlgorithm | Name | UnknownPadding | jca/IVArtifact.java:180:48:180:66 | jca/IVArtifact.java:180:48:180:66 |
+| jca/IVArtifact.java:180:48:180:66 | PaddingAlgorithm | RawName | NoPadding | jca/IVArtifact.java:180:48:180:66 | jca/IVArtifact.java:180:48:180:66 |
+| jca/IVArtifact.java:182:46:182:48 | Key | KeyType | Unknown | jca/IVArtifact.java:182:46:182:48 | jca/IVArtifact.java:182:46:182:48 |
+| jca/IVArtifact.java:183:30:183:58 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/IVArtifact.java:183:30:183:58 | jca/IVArtifact.java:183:30:183:58 |
+| jca/IVArtifact.java:198:44:198:62 | KeyOperationAlgorithm | Name | AES | jca/IVArtifact.java:198:44:198:62 | jca/IVArtifact.java:198:44:198:62 |
+| jca/IVArtifact.java:198:44:198:62 | KeyOperationAlgorithm | RawName | AES/GCM/NoPadding | jca/IVArtifact.java:198:44:198:62 | jca/IVArtifact.java:198:44:198:62 |
+| jca/IVArtifact.java:198:44:198:62 | KeyOperationAlgorithm | Structure | Block | jca/IVArtifact.java:198:44:198:62 | jca/IVArtifact.java:198:44:198:62 |
+| jca/IVArtifact.java:198:44:198:62 | ModeOfOperation | Name | GCM | jca/IVArtifact.java:198:44:198:62 | jca/IVArtifact.java:198:44:198:62 |
+| jca/IVArtifact.java:198:44:198:62 | ModeOfOperation | RawName | GCM | jca/IVArtifact.java:198:44:198:62 | jca/IVArtifact.java:198:44:198:62 |
+| jca/IVArtifact.java:198:44:198:62 | PaddingAlgorithm | Name | UnknownPadding | jca/IVArtifact.java:198:44:198:62 | jca/IVArtifact.java:198:44:198:62 |
+| jca/IVArtifact.java:198:44:198:62 | PaddingAlgorithm | RawName | NoPadding | jca/IVArtifact.java:198:44:198:62 | jca/IVArtifact.java:198:44:198:62 |
+| jca/IVArtifact.java:201:42:201:44 | Key | KeyType | Unknown | jca/IVArtifact.java:201:42:201:44 | jca/IVArtifact.java:201:42:201:44 |
+| jca/IVArtifact.java:202:16:202:40 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/IVArtifact.java:202:16:202:40 | jca/IVArtifact.java:202:16:202:40 |
+| jca/IVArtifact.java:215:53:215:65 | Parameter | Description | key | jca/IVArtifact.java:215:53:215:65 | jca/IVArtifact.java:215:53:215:65 |
+| jca/IVArtifact.java:215:68:215:83 | Parameter | Description | plaintext | jca/IVArtifact.java:215:68:215:83 | jca/IVArtifact.java:215:68:215:83 |
+| jca/IVArtifact.java:235:60:235:72 | Parameter | Description | key | jca/IVArtifact.java:235:60:235:72 | jca/IVArtifact.java:235:60:235:72 |
+| jca/IVArtifact.java:235:75:235:90 | Parameter | Description | plaintext | jca/IVArtifact.java:235:75:235:90 | jca/IVArtifact.java:235:75:235:90 |
+| jca/IVArtifact.java:253:56:253:60 | KeyOperationAlgorithm | KeySize | Constant:256 | jca/IVArtifact.java:254:21:254:23 | jca/IVArtifact.java:254:21:254:23 |
+| jca/IVArtifact.java:253:56:253:60 | KeyOperationAlgorithm | Name | AES | jca/IVArtifact.java:253:56:253:60 | jca/IVArtifact.java:253:56:253:60 |
+| jca/IVArtifact.java:253:56:253:60 | KeyOperationAlgorithm | RawName | AES | jca/IVArtifact.java:253:56:253:60 | jca/IVArtifact.java:253:56:253:60 |
+| jca/IVArtifact.java:253:56:253:60 | KeyOperationAlgorithm | Structure | Block | jca/IVArtifact.java:253:56:253:60 | jca/IVArtifact.java:253:56:253:60 |
+| jca/IVArtifact.java:254:21:254:23 | Constant | Description | 256 | jca/IVArtifact.java:254:21:254:23 | jca/IVArtifact.java:254:21:254:23 |
+| jca/IVArtifact.java:255:29:255:44 | Key | KeyType | Symmetric | jca/IVArtifact.java:255:29:255:44 | jca/IVArtifact.java:255:29:255:44 |
+| jca/IVArtifact.java:256:32:256:47 | Constant | Description | "Sensitive Data" | jca/IVArtifact.java:256:32:256:47 | jca/IVArtifact.java:256:32:256:47 |
+| jca/IVArtifact.java:275:34:275:46 | Constant | Description | "Message One" | jca/IVArtifact.java:275:34:275:46 | jca/IVArtifact.java:275:34:275:46 |
+| jca/IVArtifact.java:275:60:275:72 | Constant | Description | "Message Two" | jca/IVArtifact.java:275:60:275:72 | jca/IVArtifact.java:275:60:275:72 |
+| jca/IVArtifact.java:275:86:275:100 | Constant | Description | "Message Three" | jca/IVArtifact.java:275:86:275:100 | jca/IVArtifact.java:275:86:275:100 |
+| jca/KeyAgreementHybridCryptosystem.java:50:47:50:57 | EllipticCurve | CurveType | SEC | jca/KeyAgreementHybridCryptosystem.java:50:47:50:57 | jca/KeyAgreementHybridCryptosystem.java:50:47:50:57 |
+| jca/KeyAgreementHybridCryptosystem.java:50:47:50:57 | EllipticCurve | KeySize | 256 | jca/KeyAgreementHybridCryptosystem.java:50:47:50:57 | jca/KeyAgreementHybridCryptosystem.java:50:47:50:57 |
+| jca/KeyAgreementHybridCryptosystem.java:50:47:50:57 | EllipticCurve | Name | secp256r1 | jca/KeyAgreementHybridCryptosystem.java:50:47:50:57 | jca/KeyAgreementHybridCryptosystem.java:50:47:50:57 |
+| jca/KeyAgreementHybridCryptosystem.java:50:47:50:57 | EllipticCurve | ParsedName | secp256r1 | jca/KeyAgreementHybridCryptosystem.java:50:47:50:57 | jca/KeyAgreementHybridCryptosystem.java:50:47:50:57 |
+| jca/KeyAgreementHybridCryptosystem.java:50:47:50:57 | EllipticCurve | RawName | secp256r1 | jca/KeyAgreementHybridCryptosystem.java:50:47:50:57 | jca/KeyAgreementHybridCryptosystem.java:50:47:50:57 |
+| jca/KeyAgreementHybridCryptosystem.java:51:16:51:36 | Key | KeyType | Asymmetric | jca/KeyAgreementHybridCryptosystem.java:51:16:51:36 | jca/KeyAgreementHybridCryptosystem.java:51:16:51:36 |
+| jca/KeyAgreementHybridCryptosystem.java:58:61:58:68 | KeyAgreementAlgorithm | Name | X25519 | jca/KeyAgreementHybridCryptosystem.java:58:61:58:68 | jca/KeyAgreementHybridCryptosystem.java:58:61:58:68 |
+| jca/KeyAgreementHybridCryptosystem.java:58:61:58:68 | KeyAgreementAlgorithm | RawName | X25519 | jca/KeyAgreementHybridCryptosystem.java:58:61:58:68 | jca/KeyAgreementHybridCryptosystem.java:58:61:58:68 |
+| jca/KeyAgreementHybridCryptosystem.java:59:24:59:26 | Constant | Description | 255 | jca/KeyAgreementHybridCryptosystem.java:59:24:59:26 | jca/KeyAgreementHybridCryptosystem.java:59:24:59:26 |
+| jca/KeyAgreementHybridCryptosystem.java:60:16:60:36 | Key | KeyType | Asymmetric | jca/KeyAgreementHybridCryptosystem.java:60:16:60:36 | jca/KeyAgreementHybridCryptosystem.java:60:16:60:36 |
+| jca/KeyAgreementHybridCryptosystem.java:68:17:68:26 | Key | KeyType | Unknown | jca/KeyAgreementHybridCryptosystem.java:68:17:68:26 | jca/KeyAgreementHybridCryptosystem.java:68:17:68:26 |
+| jca/KeyAgreementHybridCryptosystem.java:69:20:69:28 | Key | KeyType | Unknown | jca/KeyAgreementHybridCryptosystem.java:69:20:69:28 | jca/KeyAgreementHybridCryptosystem.java:69:20:69:28 |
+| jca/KeyAgreementHybridCryptosystem.java:78:58:78:66 | HashAlgorithm | DigestSize | 256 | jca/KeyAgreementHybridCryptosystem.java:78:58:78:66 | jca/KeyAgreementHybridCryptosystem.java:78:58:78:66 |
+| jca/KeyAgreementHybridCryptosystem.java:78:58:78:66 | HashAlgorithm | Name | SHA2 | jca/KeyAgreementHybridCryptosystem.java:78:58:78:66 | jca/KeyAgreementHybridCryptosystem.java:78:58:78:66 |
+| jca/KeyAgreementHybridCryptosystem.java:78:58:78:66 | HashAlgorithm | RawName | SHA-256 | jca/KeyAgreementHybridCryptosystem.java:78:58:78:66 | jca/KeyAgreementHybridCryptosystem.java:78:58:78:66 |
+| jca/KeyAgreementHybridCryptosystem.java:104:90:104:95 | KeyAgreementAlgorithm | Name | ECDH | jca/KeyAgreementHybridCryptosystem.java:104:90:104:95 | jca/KeyAgreementHybridCryptosystem.java:104:90:104:95 |
+| jca/KeyAgreementHybridCryptosystem.java:104:90:104:95 | KeyAgreementAlgorithm | RawName | ECDH | jca/KeyAgreementHybridCryptosystem.java:104:90:104:95 | jca/KeyAgreementHybridCryptosystem.java:104:90:104:95 |
+| jca/KeyAgreementHybridCryptosystem.java:108:44:108:62 | KeyOperationAlgorithm | Name | AES | jca/KeyAgreementHybridCryptosystem.java:108:44:108:62 | jca/KeyAgreementHybridCryptosystem.java:108:44:108:62 |
+| jca/KeyAgreementHybridCryptosystem.java:108:44:108:62 | KeyOperationAlgorithm | RawName | AES/GCM/NoPadding | jca/KeyAgreementHybridCryptosystem.java:108:44:108:62 | jca/KeyAgreementHybridCryptosystem.java:108:44:108:62 |
+| jca/KeyAgreementHybridCryptosystem.java:108:44:108:62 | KeyOperationAlgorithm | Structure | Block | jca/KeyAgreementHybridCryptosystem.java:108:44:108:62 | jca/KeyAgreementHybridCryptosystem.java:108:44:108:62 |
+| jca/KeyAgreementHybridCryptosystem.java:108:44:108:62 | ModeOfOperation | Name | GCM | jca/KeyAgreementHybridCryptosystem.java:108:44:108:62 | jca/KeyAgreementHybridCryptosystem.java:108:44:108:62 |
+| jca/KeyAgreementHybridCryptosystem.java:108:44:108:62 | ModeOfOperation | RawName | GCM | jca/KeyAgreementHybridCryptosystem.java:108:44:108:62 | jca/KeyAgreementHybridCryptosystem.java:108:44:108:62 |
+| jca/KeyAgreementHybridCryptosystem.java:108:44:108:62 | PaddingAlgorithm | Name | UnknownPadding | jca/KeyAgreementHybridCryptosystem.java:108:44:108:62 | jca/KeyAgreementHybridCryptosystem.java:108:44:108:62 |
+| jca/KeyAgreementHybridCryptosystem.java:108:44:108:62 | PaddingAlgorithm | RawName | NoPadding | jca/KeyAgreementHybridCryptosystem.java:108:44:108:62 | jca/KeyAgreementHybridCryptosystem.java:108:44:108:62 |
+| jca/KeyAgreementHybridCryptosystem.java:110:38:110:39 | RandomNumberGeneration | Description | java.security.SecureRandom | jca/KeyAgreementHybridCryptosystem.java:110:38:110:39 | jca/KeyAgreementHybridCryptosystem.java:110:38:110:39 |
+| jca/KeyAgreementHybridCryptosystem.java:112:42:112:47 | Key | KeyType | Unknown | jca/KeyAgreementHybridCryptosystem.java:112:42:112:47 | jca/KeyAgreementHybridCryptosystem.java:112:42:112:47 |
+| jca/KeyAgreementHybridCryptosystem.java:113:29:113:53 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/KeyAgreementHybridCryptosystem.java:113:29:113:53 | jca/KeyAgreementHybridCryptosystem.java:113:29:113:53 |
+| jca/KeyAgreementHybridCryptosystem.java:125:95:125:100 | KeyAgreementAlgorithm | Name | ECDH | jca/KeyAgreementHybridCryptosystem.java:125:95:125:100 | jca/KeyAgreementHybridCryptosystem.java:125:95:125:100 |
+| jca/KeyAgreementHybridCryptosystem.java:125:95:125:100 | KeyAgreementAlgorithm | RawName | ECDH | jca/KeyAgreementHybridCryptosystem.java:125:95:125:100 | jca/KeyAgreementHybridCryptosystem.java:125:95:125:100 |
+| jca/KeyAgreementHybridCryptosystem.java:130:44:130:62 | KeyOperationAlgorithm | Name | AES | jca/KeyAgreementHybridCryptosystem.java:130:44:130:62 | jca/KeyAgreementHybridCryptosystem.java:130:44:130:62 |
+| jca/KeyAgreementHybridCryptosystem.java:130:44:130:62 | KeyOperationAlgorithm | RawName | AES/GCM/NoPadding | jca/KeyAgreementHybridCryptosystem.java:130:44:130:62 | jca/KeyAgreementHybridCryptosystem.java:130:44:130:62 |
+| jca/KeyAgreementHybridCryptosystem.java:130:44:130:62 | KeyOperationAlgorithm | Structure | Block | jca/KeyAgreementHybridCryptosystem.java:130:44:130:62 | jca/KeyAgreementHybridCryptosystem.java:130:44:130:62 |
+| jca/KeyAgreementHybridCryptosystem.java:130:44:130:62 | ModeOfOperation | Name | GCM | jca/KeyAgreementHybridCryptosystem.java:130:44:130:62 | jca/KeyAgreementHybridCryptosystem.java:130:44:130:62 |
+| jca/KeyAgreementHybridCryptosystem.java:130:44:130:62 | ModeOfOperation | RawName | GCM | jca/KeyAgreementHybridCryptosystem.java:130:44:130:62 | jca/KeyAgreementHybridCryptosystem.java:130:44:130:62 |
+| jca/KeyAgreementHybridCryptosystem.java:130:44:130:62 | PaddingAlgorithm | Name | UnknownPadding | jca/KeyAgreementHybridCryptosystem.java:130:44:130:62 | jca/KeyAgreementHybridCryptosystem.java:130:44:130:62 |
+| jca/KeyAgreementHybridCryptosystem.java:130:44:130:62 | PaddingAlgorithm | RawName | NoPadding | jca/KeyAgreementHybridCryptosystem.java:130:44:130:62 | jca/KeyAgreementHybridCryptosystem.java:130:44:130:62 |
+| jca/KeyAgreementHybridCryptosystem.java:132:42:132:47 | Key | KeyType | Unknown | jca/KeyAgreementHybridCryptosystem.java:132:42:132:47 | jca/KeyAgreementHybridCryptosystem.java:132:42:132:47 |
+| jca/KeyAgreementHybridCryptosystem.java:133:29:133:53 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/KeyAgreementHybridCryptosystem.java:133:29:133:53 | jca/KeyAgreementHybridCryptosystem.java:133:29:133:53 |
+| jca/KeyAgreementHybridCryptosystem.java:149:91:149:98 | KeyAgreementAlgorithm | Name | X25519 | jca/KeyAgreementHybridCryptosystem.java:149:91:149:98 | jca/KeyAgreementHybridCryptosystem.java:149:91:149:98 |
+| jca/KeyAgreementHybridCryptosystem.java:149:91:149:98 | KeyAgreementAlgorithm | RawName | X25519 | jca/KeyAgreementHybridCryptosystem.java:149:91:149:98 | jca/KeyAgreementHybridCryptosystem.java:149:91:149:98 |
+| jca/KeyAgreementHybridCryptosystem.java:150:59:150:67 | HashAlgorithm | DigestSize | 256 | jca/KeyAgreementHybridCryptosystem.java:150:59:150:67 | jca/KeyAgreementHybridCryptosystem.java:150:59:150:67 |
+| jca/KeyAgreementHybridCryptosystem.java:150:59:150:67 | HashAlgorithm | Name | SHA2 | jca/KeyAgreementHybridCryptosystem.java:150:59:150:67 | jca/KeyAgreementHybridCryptosystem.java:150:59:150:67 |
+| jca/KeyAgreementHybridCryptosystem.java:150:59:150:67 | HashAlgorithm | RawName | SHA-256 | jca/KeyAgreementHybridCryptosystem.java:150:59:150:67 | jca/KeyAgreementHybridCryptosystem.java:150:59:150:67 |
+| jca/KeyAgreementHybridCryptosystem.java:153:44:153:62 | KeyOperationAlgorithm | Name | Unknown | jca/KeyAgreementHybridCryptosystem.java:153:44:153:62 | jca/KeyAgreementHybridCryptosystem.java:153:44:153:62 |
+| jca/KeyAgreementHybridCryptosystem.java:153:44:153:62 | KeyOperationAlgorithm | RawName | ChaCha20-Poly1305 | jca/KeyAgreementHybridCryptosystem.java:153:44:153:62 | jca/KeyAgreementHybridCryptosystem.java:153:44:153:62 |
+| jca/KeyAgreementHybridCryptosystem.java:155:38:155:42 | RandomNumberGeneration | Description | java.security.SecureRandom | jca/KeyAgreementHybridCryptosystem.java:155:38:155:42 | jca/KeyAgreementHybridCryptosystem.java:155:38:155:42 |
+| jca/KeyAgreementHybridCryptosystem.java:156:42:156:50 | Key | KeyType | Unknown | jca/KeyAgreementHybridCryptosystem.java:156:42:156:50 | jca/KeyAgreementHybridCryptosystem.java:156:42:156:50 |
+| jca/KeyAgreementHybridCryptosystem.java:157:29:157:53 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/KeyAgreementHybridCryptosystem.java:157:29:157:53 | jca/KeyAgreementHybridCryptosystem.java:157:29:157:53 |
+| jca/KeyAgreementHybridCryptosystem.java:169:95:169:102 | KeyAgreementAlgorithm | Name | X25519 | jca/KeyAgreementHybridCryptosystem.java:169:95:169:102 | jca/KeyAgreementHybridCryptosystem.java:169:95:169:102 |
+| jca/KeyAgreementHybridCryptosystem.java:169:95:169:102 | KeyAgreementAlgorithm | RawName | X25519 | jca/KeyAgreementHybridCryptosystem.java:169:95:169:102 | jca/KeyAgreementHybridCryptosystem.java:169:95:169:102 |
+| jca/KeyAgreementHybridCryptosystem.java:174:44:174:62 | KeyOperationAlgorithm | Name | Unknown | jca/KeyAgreementHybridCryptosystem.java:174:44:174:62 | jca/KeyAgreementHybridCryptosystem.java:174:44:174:62 |
+| jca/KeyAgreementHybridCryptosystem.java:174:44:174:62 | KeyOperationAlgorithm | RawName | ChaCha20-Poly1305 | jca/KeyAgreementHybridCryptosystem.java:174:44:174:62 | jca/KeyAgreementHybridCryptosystem.java:174:44:174:62 |
+| jca/KeyAgreementHybridCryptosystem.java:175:42:175:50 | Key | KeyType | Unknown | jca/KeyAgreementHybridCryptosystem.java:175:42:175:50 | jca/KeyAgreementHybridCryptosystem.java:175:42:175:50 |
+| jca/KeyAgreementHybridCryptosystem.java:176:29:176:53 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/KeyAgreementHybridCryptosystem.java:176:29:176:53 | jca/KeyAgreementHybridCryptosystem.java:176:29:176:53 |
+| jca/KeyAgreementHybridCryptosystem.java:188:58:188:73 | Parameter | Description | plaintext | jca/KeyAgreementHybridCryptosystem.java:188:58:188:73 | jca/KeyAgreementHybridCryptosystem.java:188:58:188:73 |
+| jca/KeyAgreementHybridCryptosystem.java:212:58:212:70 | Parameter | Description | key | jca/KeyAgreementHybridCryptosystem.java:212:58:212:70 | jca/KeyAgreementHybridCryptosystem.java:212:58:212:70 |
+| jca/KeyAgreementHybridCryptosystem.java:212:73:212:88 | Parameter | Description | plaintext | jca/KeyAgreementHybridCryptosystem.java:212:73:212:88 | jca/KeyAgreementHybridCryptosystem.java:212:73:212:88 |
+| jca/KeyAgreementHybridCryptosystem.java:215:75:215:79 | Constant | Description | 10000 | jca/KeyAgreementHybridCryptosystem.java:215:75:215:79 | jca/KeyAgreementHybridCryptosystem.java:215:75:215:79 |
+| jca/KeyAgreementHybridCryptosystem.java:215:82:215:84 | Constant | Description | 256 | jca/KeyAgreementHybridCryptosystem.java:215:82:215:84 | jca/KeyAgreementHybridCryptosystem.java:215:82:215:84 |
+| jca/KeyAgreementHybridCryptosystem.java:216:65:216:86 | HMACAlgorithm | Name | HMAC | jca/KeyAgreementHybridCryptosystem.java:216:65:216:86 | jca/KeyAgreementHybridCryptosystem.java:216:65:216:86 |
+| jca/KeyAgreementHybridCryptosystem.java:216:65:216:86 | HMACAlgorithm | RawName | PBKDF2WithHmacSHA256 | jca/KeyAgreementHybridCryptosystem.java:216:65:216:86 | jca/KeyAgreementHybridCryptosystem.java:216:65:216:86 |
+| jca/KeyAgreementHybridCryptosystem.java:216:65:216:86 | HashAlgorithm | DigestSize | 256 | jca/KeyAgreementHybridCryptosystem.java:216:65:216:86 | jca/KeyAgreementHybridCryptosystem.java:216:65:216:86 |
+| jca/KeyAgreementHybridCryptosystem.java:216:65:216:86 | HashAlgorithm | Name | SHA2 | jca/KeyAgreementHybridCryptosystem.java:216:65:216:86 | jca/KeyAgreementHybridCryptosystem.java:216:65:216:86 |
+| jca/KeyAgreementHybridCryptosystem.java:216:65:216:86 | HashAlgorithm | RawName | PBKDF2WithHmacSHA256 | jca/KeyAgreementHybridCryptosystem.java:216:65:216:86 | jca/KeyAgreementHybridCryptosystem.java:216:65:216:86 |
+| jca/KeyAgreementHybridCryptosystem.java:216:65:216:86 | KeyDerivationAlgorithm | Name | PBKDF2WithHmacSHA256 | jca/KeyAgreementHybridCryptosystem.java:216:65:216:86 | jca/KeyAgreementHybridCryptosystem.java:216:65:216:86 |
+| jca/KeyAgreementHybridCryptosystem.java:216:65:216:86 | KeyDerivationAlgorithm | RawName | PBKDF2WithHmacSHA256 | jca/KeyAgreementHybridCryptosystem.java:216:65:216:86 | jca/KeyAgreementHybridCryptosystem.java:216:65:216:86 |
+| jca/KeyAgreementHybridCryptosystem.java:217:26:217:53 | Key | KeyType | Symmetric | jca/KeyAgreementHybridCryptosystem.java:217:26:217:53 | jca/KeyAgreementHybridCryptosystem.java:217:26:217:53 |
+| jca/KeyAgreementHybridCryptosystem.java:217:26:217:53 | KeyDerivation | Iterations | Constant:10000 | jca/KeyAgreementHybridCryptosystem.java:215:75:215:79 | jca/KeyAgreementHybridCryptosystem.java:215:75:215:79 |
+| jca/KeyAgreementHybridCryptosystem.java:217:26:217:53 | KeyDerivation | KeySize | Constant:256 | jca/KeyAgreementHybridCryptosystem.java:215:82:215:84 | jca/KeyAgreementHybridCryptosystem.java:215:82:215:84 |
+| jca/KeyAgreementHybridCryptosystem.java:223:44:223:62 | KeyOperationAlgorithm | Name | AES | jca/KeyAgreementHybridCryptosystem.java:223:44:223:62 | jca/KeyAgreementHybridCryptosystem.java:223:44:223:62 |
+| jca/KeyAgreementHybridCryptosystem.java:223:44:223:62 | KeyOperationAlgorithm | RawName | AES/GCM/NoPadding | jca/KeyAgreementHybridCryptosystem.java:223:44:223:62 | jca/KeyAgreementHybridCryptosystem.java:223:44:223:62 |
+| jca/KeyAgreementHybridCryptosystem.java:223:44:223:62 | KeyOperationAlgorithm | Structure | Block | jca/KeyAgreementHybridCryptosystem.java:223:44:223:62 | jca/KeyAgreementHybridCryptosystem.java:223:44:223:62 |
+| jca/KeyAgreementHybridCryptosystem.java:223:44:223:62 | ModeOfOperation | Name | GCM | jca/KeyAgreementHybridCryptosystem.java:223:44:223:62 | jca/KeyAgreementHybridCryptosystem.java:223:44:223:62 |
+| jca/KeyAgreementHybridCryptosystem.java:223:44:223:62 | ModeOfOperation | RawName | GCM | jca/KeyAgreementHybridCryptosystem.java:223:44:223:62 | jca/KeyAgreementHybridCryptosystem.java:223:44:223:62 |
+| jca/KeyAgreementHybridCryptosystem.java:223:44:223:62 | PaddingAlgorithm | Name | UnknownPadding | jca/KeyAgreementHybridCryptosystem.java:223:44:223:62 | jca/KeyAgreementHybridCryptosystem.java:223:44:223:62 |
+| jca/KeyAgreementHybridCryptosystem.java:223:44:223:62 | PaddingAlgorithm | RawName | NoPadding | jca/KeyAgreementHybridCryptosystem.java:223:44:223:62 | jca/KeyAgreementHybridCryptosystem.java:223:44:223:62 |
+| jca/KeyAgreementHybridCryptosystem.java:225:38:225:39 | RandomNumberGeneration | Description | java.security.SecureRandom | jca/KeyAgreementHybridCryptosystem.java:225:38:225:39 | jca/KeyAgreementHybridCryptosystem.java:225:38:225:39 |
+| jca/KeyAgreementHybridCryptosystem.java:227:42:227:54 | Key | KeyType | Unknown | jca/KeyAgreementHybridCryptosystem.java:227:42:227:54 | jca/KeyAgreementHybridCryptosystem.java:227:42:227:54 |
+| jca/KeyAgreementHybridCryptosystem.java:228:29:228:53 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/KeyAgreementHybridCryptosystem.java:228:29:228:53 | jca/KeyAgreementHybridCryptosystem.java:228:29:228:53 |
+| jca/KeyAgreementHybridCryptosystem.java:230:35:230:46 | HMACAlgorithm | Name | HMAC | jca/KeyAgreementHybridCryptosystem.java:230:35:230:46 | jca/KeyAgreementHybridCryptosystem.java:230:35:230:46 |
+| jca/KeyAgreementHybridCryptosystem.java:230:35:230:46 | HMACAlgorithm | RawName | HmacSHA256 | jca/KeyAgreementHybridCryptosystem.java:230:35:230:46 | jca/KeyAgreementHybridCryptosystem.java:230:35:230:46 |
+| jca/KeyAgreementHybridCryptosystem.java:230:35:230:46 | HashAlgorithm | DigestSize | 256 | jca/KeyAgreementHybridCryptosystem.java:230:35:230:46 | jca/KeyAgreementHybridCryptosystem.java:230:35:230:46 |
+| jca/KeyAgreementHybridCryptosystem.java:230:35:230:46 | HashAlgorithm | Name | SHA2 | jca/KeyAgreementHybridCryptosystem.java:230:35:230:46 | jca/KeyAgreementHybridCryptosystem.java:230:35:230:46 |
+| jca/KeyAgreementHybridCryptosystem.java:230:35:230:46 | HashAlgorithm | RawName | HmacSHA256 | jca/KeyAgreementHybridCryptosystem.java:230:35:230:46 | jca/KeyAgreementHybridCryptosystem.java:230:35:230:46 |
+| jca/KeyAgreementHybridCryptosystem.java:231:18:231:30 | Key | KeyType | Unknown | jca/KeyAgreementHybridCryptosystem.java:231:18:231:30 | jca/KeyAgreementHybridCryptosystem.java:231:18:231:30 |
+| jca/KeyAgreementHybridCryptosystem.java:232:30:232:52 | MACOperation | KeyOperationSubtype | Mac | jca/KeyAgreementHybridCryptosystem.java:232:30:232:52 | jca/KeyAgreementHybridCryptosystem.java:232:30:232:52 |
+| jca/KeyAgreementHybridCryptosystem.java:259:52:259:56 | KeyOperationAlgorithm | KeySize | Constant:256 | jca/KeyAgreementHybridCryptosystem.java:260:17:260:19 | jca/KeyAgreementHybridCryptosystem.java:260:17:260:19 |
+| jca/KeyAgreementHybridCryptosystem.java:259:52:259:56 | KeyOperationAlgorithm | Name | AES | jca/KeyAgreementHybridCryptosystem.java:259:52:259:56 | jca/KeyAgreementHybridCryptosystem.java:259:52:259:56 |
+| jca/KeyAgreementHybridCryptosystem.java:259:52:259:56 | KeyOperationAlgorithm | RawName | AES | jca/KeyAgreementHybridCryptosystem.java:259:52:259:56 | jca/KeyAgreementHybridCryptosystem.java:259:52:259:56 |
+| jca/KeyAgreementHybridCryptosystem.java:259:52:259:56 | KeyOperationAlgorithm | Structure | Block | jca/KeyAgreementHybridCryptosystem.java:259:52:259:56 | jca/KeyAgreementHybridCryptosystem.java:259:52:259:56 |
+| jca/KeyAgreementHybridCryptosystem.java:260:17:260:19 | Constant | Description | 256 | jca/KeyAgreementHybridCryptosystem.java:260:17:260:19 | jca/KeyAgreementHybridCryptosystem.java:260:17:260:19 |
+| jca/KeyAgreementHybridCryptosystem.java:261:16:261:31 | Key | KeyType | Symmetric | jca/KeyAgreementHybridCryptosystem.java:261:16:261:31 | jca/KeyAgreementHybridCryptosystem.java:261:16:261:31 |
+| jca/KeyAgreementHybridCryptosystem.java:269:38:269:41 | RandomNumberGeneration | Description | java.security.SecureRandom | jca/KeyAgreementHybridCryptosystem.java:269:38:269:41 | jca/KeyAgreementHybridCryptosystem.java:269:38:269:41 |
+| jca/KeyArtifact.java:18:56:18:60 | KeyOperationAlgorithm | KeySize | Constant:256 | jca/KeyArtifact.java:19:21:19:23 | jca/KeyArtifact.java:19:21:19:23 |
+| jca/KeyArtifact.java:18:56:18:60 | KeyOperationAlgorithm | Name | AES | jca/KeyArtifact.java:18:56:18:60 | jca/KeyArtifact.java:18:56:18:60 |
+| jca/KeyArtifact.java:18:56:18:60 | KeyOperationAlgorithm | RawName | AES | jca/KeyArtifact.java:18:56:18:60 | jca/KeyArtifact.java:18:56:18:60 |
+| jca/KeyArtifact.java:18:56:18:60 | KeyOperationAlgorithm | Structure | Block | jca/KeyArtifact.java:18:56:18:60 | jca/KeyArtifact.java:18:56:18:60 |
+| jca/KeyArtifact.java:19:21:19:23 | Constant | Description | 256 | jca/KeyArtifact.java:19:21:19:23 | jca/KeyArtifact.java:19:21:19:23 |
+| jca/KeyArtifact.java:20:31:20:50 | Key | KeyType | Symmetric | jca/KeyArtifact.java:20:31:20:50 | jca/KeyArtifact.java:20:31:20:50 |
+| jca/KeyArtifact.java:23:43:23:47 | KeyOperationAlgorithm | KeySize | Constant:256 | jca/KeyArtifact.java:24:21:24:23 | jca/KeyArtifact.java:24:21:24:23 |
+| jca/KeyArtifact.java:23:43:23:47 | KeyOperationAlgorithm | Name | AES | jca/KeyArtifact.java:23:43:23:47 | jca/KeyArtifact.java:23:43:23:47 |
+| jca/KeyArtifact.java:23:43:23:47 | KeyOperationAlgorithm | RawName | AES | jca/KeyArtifact.java:23:43:23:47 | jca/KeyArtifact.java:23:43:23:47 |
+| jca/KeyArtifact.java:23:43:23:47 | KeyOperationAlgorithm | Structure | Block | jca/KeyArtifact.java:23:43:23:47 | jca/KeyArtifact.java:23:43:23:47 |
+| jca/KeyArtifact.java:24:21:24:23 | Constant | Description | 256 | jca/KeyArtifact.java:24:21:24:23 | jca/KeyArtifact.java:24:21:24:23 |
+| jca/KeyArtifact.java:25:30:25:49 | Key | KeyType | Symmetric | jca/KeyArtifact.java:25:30:25:49 | jca/KeyArtifact.java:25:30:25:49 |
+| jca/KeyArtifact.java:30:68:30:72 | KeyOperationAlgorithm | KeySize | Constant:2048 | jca/KeyArtifact.java:31:31:31:34 | jca/KeyArtifact.java:31:31:31:34 |
+| jca/KeyArtifact.java:30:68:30:72 | KeyOperationAlgorithm | Name | RSA | jca/KeyArtifact.java:30:68:30:72 | jca/KeyArtifact.java:30:68:30:72 |
+| jca/KeyArtifact.java:30:68:30:72 | KeyOperationAlgorithm | RawName | RSA | jca/KeyArtifact.java:30:68:30:72 | jca/KeyArtifact.java:30:68:30:72 |
+| jca/KeyArtifact.java:31:31:31:34 | Constant | Description | 2048 | jca/KeyArtifact.java:31:31:31:34 | jca/KeyArtifact.java:31:31:31:34 |
+| jca/KeyArtifact.java:32:30:32:57 | Key | KeyType | Asymmetric | jca/KeyArtifact.java:32:30:32:57 | jca/KeyArtifact.java:32:30:32:57 |
+| jca/KeyArtifact.java:35:51:35:55 | KeyOperationAlgorithm | KeySize | Constant:2048 | jca/KeyArtifact.java:36:31:36:34 | jca/KeyArtifact.java:36:31:36:34 |
+| jca/KeyArtifact.java:35:51:35:55 | KeyOperationAlgorithm | Name | RSA | jca/KeyArtifact.java:35:51:35:55 | jca/KeyArtifact.java:35:51:35:55 |
+| jca/KeyArtifact.java:35:51:35:55 | KeyOperationAlgorithm | RawName | RSA | jca/KeyArtifact.java:35:51:35:55 | jca/KeyArtifact.java:35:51:35:55 |
+| jca/KeyArtifact.java:36:31:36:34 | Constant | Description | 2048 | jca/KeyArtifact.java:36:31:36:34 | jca/KeyArtifact.java:36:31:36:34 |
+| jca/KeyArtifact.java:37:29:37:56 | Key | KeyType | Asymmetric | jca/KeyArtifact.java:37:29:37:56 | jca/KeyArtifact.java:37:29:37:56 |
+| jca/KeyArtifact.java:41:31:41:33 | Constant | Description | 256 | jca/KeyArtifact.java:41:31:41:33 | jca/KeyArtifact.java:41:31:41:33 |
+| jca/KeyArtifact.java:42:26:42:53 | Key | KeyType | Asymmetric | jca/KeyArtifact.java:42:26:42:53 | jca/KeyArtifact.java:42:26:42:53 |
+| jca/KeyArtifact.java:62:28:62:73 | Constant | Description | getProperty(...) | jca/KeyArtifact.java:62:28:62:73 | jca/KeyArtifact.java:62:28:62:73 |
+| jca/KeyArtifact.java:62:28:62:73 | LocalData | Description | getProperty(...) | jca/KeyArtifact.java:62:28:62:73 | jca/KeyArtifact.java:62:28:62:73 |
+| jca/KeyArtifact.java:62:68:62:72 | KeyOperationAlgorithm | KeySize | Constant:256 | jca/KeyArtifact.java:65:21:65:23 | jca/KeyArtifact.java:65:21:65:23 |
+| jca/KeyArtifact.java:62:68:62:72 | KeyOperationAlgorithm | Name | AES | jca/KeyArtifact.java:62:68:62:72 | jca/KeyArtifact.java:62:68:62:72 |
+| jca/KeyArtifact.java:62:68:62:72 | KeyOperationAlgorithm | RawName | AES | jca/KeyArtifact.java:62:68:62:72 | jca/KeyArtifact.java:62:68:62:72 |
+| jca/KeyArtifact.java:62:68:62:72 | KeyOperationAlgorithm | Structure | Block | jca/KeyArtifact.java:62:68:62:72 | jca/KeyArtifact.java:62:68:62:72 |
+| jca/KeyArtifact.java:65:21:65:23 | Constant | Description | 256 | jca/KeyArtifact.java:65:21:65:23 | jca/KeyArtifact.java:65:21:65:23 |
+| jca/KeyArtifact.java:66:32:66:51 | Key | KeyType | Symmetric | jca/KeyArtifact.java:66:32:66:51 | jca/KeyArtifact.java:66:32:66:51 |
+| jca/KeyArtifact.java:72:31:72:34 | Constant | Description | 2048 | jca/KeyArtifact.java:72:31:72:34 | jca/KeyArtifact.java:72:31:72:34 |
+| jca/KeyArtifact.java:73:16:73:43 | Key | KeyType | Asymmetric | jca/KeyArtifact.java:73:16:73:43 | jca/KeyArtifact.java:73:16:73:43 |
+| jca/KeyArtifact.java:78:31:78:54 | Constant | Description | {...} | jca/KeyArtifact.java:78:31:78:54 | jca/KeyArtifact.java:78:31:78:54 |
+| jca/KeyArtifact.java:78:32:78:36 | KeyOperationAlgorithm | KeySize | Constant:2048 | jca/KeyArtifact.java:72:31:72:34 | jca/KeyArtifact.java:72:31:72:34 |
+| jca/KeyArtifact.java:78:32:78:36 | KeyOperationAlgorithm | Name | RSA | jca/KeyArtifact.java:78:32:78:36 | jca/KeyArtifact.java:78:32:78:36 |
+| jca/KeyArtifact.java:78:32:78:36 | KeyOperationAlgorithm | RawName | RSA | jca/KeyArtifact.java:78:32:78:36 | jca/KeyArtifact.java:78:32:78:36 |
+| jca/KeyArtifact.java:78:45:78:53 | KeyOperationAlgorithm | Name | EDSA | jca/KeyArtifact.java:78:45:78:53 | jca/KeyArtifact.java:78:45:78:53 |
+| jca/KeyArtifact.java:78:45:78:53 | KeyOperationAlgorithm | RawName | Ed25519 | jca/KeyArtifact.java:78:45:78:53 | jca/KeyArtifact.java:78:45:78:53 |
+| jca/KeyDerivation1.java:78:39:78:53 | Parameter | Description | password | jca/KeyDerivation1.java:78:39:78:53 | jca/KeyDerivation1.java:78:39:78:53 |
+| jca/KeyDerivation1.java:80:72:80:76 | Constant | Description | 10000 | jca/KeyDerivation1.java:80:72:80:76 | jca/KeyDerivation1.java:80:72:80:76 |
+| jca/KeyDerivation1.java:80:79:80:81 | Constant | Description | 256 | jca/KeyDerivation1.java:80:79:80:81 | jca/KeyDerivation1.java:80:79:80:81 |
+| jca/KeyDerivation1.java:81:65:81:86 | HMACAlgorithm | Name | HMAC | jca/KeyDerivation1.java:81:65:81:86 | jca/KeyDerivation1.java:81:65:81:86 |
+| jca/KeyDerivation1.java:81:65:81:86 | HMACAlgorithm | RawName | PBKDF2WithHmacSHA256 | jca/KeyDerivation1.java:81:65:81:86 | jca/KeyDerivation1.java:81:65:81:86 |
+| jca/KeyDerivation1.java:81:65:81:86 | HashAlgorithm | DigestSize | 256 | jca/KeyDerivation1.java:81:65:81:86 | jca/KeyDerivation1.java:81:65:81:86 |
+| jca/KeyDerivation1.java:81:65:81:86 | HashAlgorithm | Name | SHA2 | jca/KeyDerivation1.java:81:65:81:86 | jca/KeyDerivation1.java:81:65:81:86 |
+| jca/KeyDerivation1.java:81:65:81:86 | HashAlgorithm | RawName | PBKDF2WithHmacSHA256 | jca/KeyDerivation1.java:81:65:81:86 | jca/KeyDerivation1.java:81:65:81:86 |
+| jca/KeyDerivation1.java:81:65:81:86 | KeyDerivationAlgorithm | Name | PBKDF2WithHmacSHA256 | jca/KeyDerivation1.java:81:65:81:86 | jca/KeyDerivation1.java:81:65:81:86 |
+| jca/KeyDerivation1.java:81:65:81:86 | KeyDerivationAlgorithm | RawName | PBKDF2WithHmacSHA256 | jca/KeyDerivation1.java:81:65:81:86 | jca/KeyDerivation1.java:81:65:81:86 |
+| jca/KeyDerivation1.java:82:22:82:49 | Key | KeyType | Symmetric | jca/KeyDerivation1.java:82:22:82:49 | jca/KeyDerivation1.java:82:22:82:49 |
+| jca/KeyDerivation1.java:82:22:82:49 | KeyDerivation | Iterations | Constant:10000 | jca/KeyDerivation1.java:80:72:80:76 | jca/KeyDerivation1.java:80:72:80:76 |
+| jca/KeyDerivation1.java:82:22:82:49 | KeyDerivation | KeySize | Constant:256 | jca/KeyDerivation1.java:80:79:80:81 | jca/KeyDerivation1.java:80:79:80:81 |
+| jca/KeyDerivation1.java:92:36:92:50 | Parameter | Description | password | jca/KeyDerivation1.java:92:36:92:50 | jca/KeyDerivation1.java:92:36:92:50 |
+| jca/KeyDerivation1.java:94:72:94:73 | Constant | Description | 10 | jca/KeyDerivation1.java:94:72:94:73 | jca/KeyDerivation1.java:94:72:94:73 |
+| jca/KeyDerivation1.java:94:76:94:78 | Constant | Description | 256 | jca/KeyDerivation1.java:94:76:94:78 | jca/KeyDerivation1.java:94:76:94:78 |
+| jca/KeyDerivation1.java:95:65:95:86 | HMACAlgorithm | Name | HMAC | jca/KeyDerivation1.java:95:65:95:86 | jca/KeyDerivation1.java:95:65:95:86 |
+| jca/KeyDerivation1.java:95:65:95:86 | HMACAlgorithm | RawName | PBKDF2WithHmacSHA256 | jca/KeyDerivation1.java:95:65:95:86 | jca/KeyDerivation1.java:95:65:95:86 |
+| jca/KeyDerivation1.java:95:65:95:86 | HashAlgorithm | DigestSize | 256 | jca/KeyDerivation1.java:95:65:95:86 | jca/KeyDerivation1.java:95:65:95:86 |
+| jca/KeyDerivation1.java:95:65:95:86 | HashAlgorithm | Name | SHA2 | jca/KeyDerivation1.java:95:65:95:86 | jca/KeyDerivation1.java:95:65:95:86 |
+| jca/KeyDerivation1.java:95:65:95:86 | HashAlgorithm | RawName | PBKDF2WithHmacSHA256 | jca/KeyDerivation1.java:95:65:95:86 | jca/KeyDerivation1.java:95:65:95:86 |
+| jca/KeyDerivation1.java:95:65:95:86 | KeyDerivationAlgorithm | Name | PBKDF2WithHmacSHA256 | jca/KeyDerivation1.java:95:65:95:86 | jca/KeyDerivation1.java:95:65:95:86 |
+| jca/KeyDerivation1.java:95:65:95:86 | KeyDerivationAlgorithm | RawName | PBKDF2WithHmacSHA256 | jca/KeyDerivation1.java:95:65:95:86 | jca/KeyDerivation1.java:95:65:95:86 |
+| jca/KeyDerivation1.java:96:22:96:49 | Key | KeyType | Symmetric | jca/KeyDerivation1.java:96:22:96:49 | jca/KeyDerivation1.java:96:22:96:49 |
+| jca/KeyDerivation1.java:96:22:96:49 | KeyDerivation | Iterations | Constant:10 | jca/KeyDerivation1.java:94:72:94:73 | jca/KeyDerivation1.java:94:72:94:73 |
+| jca/KeyDerivation1.java:96:22:96:49 | KeyDerivation | KeySize | Constant:256 | jca/KeyDerivation1.java:94:76:94:78 | jca/KeyDerivation1.java:94:76:94:78 |
+| jca/KeyDerivation1.java:106:37:106:51 | Parameter | Description | password | jca/KeyDerivation1.java:106:37:106:51 | jca/KeyDerivation1.java:106:37:106:51 |
+| jca/KeyDerivation1.java:108:72:108:80 | Constant | Description | 1_000_000 | jca/KeyDerivation1.java:108:72:108:80 | jca/KeyDerivation1.java:108:72:108:80 |
+| jca/KeyDerivation1.java:108:83:108:85 | Constant | Description | 256 | jca/KeyDerivation1.java:108:83:108:85 | jca/KeyDerivation1.java:108:83:108:85 |
+| jca/KeyDerivation1.java:109:65:109:86 | HMACAlgorithm | Name | HMAC | jca/KeyDerivation1.java:109:65:109:86 | jca/KeyDerivation1.java:109:65:109:86 |
+| jca/KeyDerivation1.java:109:65:109:86 | HMACAlgorithm | RawName | PBKDF2WithHmacSHA256 | jca/KeyDerivation1.java:109:65:109:86 | jca/KeyDerivation1.java:109:65:109:86 |
+| jca/KeyDerivation1.java:109:65:109:86 | HashAlgorithm | DigestSize | 256 | jca/KeyDerivation1.java:109:65:109:86 | jca/KeyDerivation1.java:109:65:109:86 |
+| jca/KeyDerivation1.java:109:65:109:86 | HashAlgorithm | Name | SHA2 | jca/KeyDerivation1.java:109:65:109:86 | jca/KeyDerivation1.java:109:65:109:86 |
+| jca/KeyDerivation1.java:109:65:109:86 | HashAlgorithm | RawName | PBKDF2WithHmacSHA256 | jca/KeyDerivation1.java:109:65:109:86 | jca/KeyDerivation1.java:109:65:109:86 |
+| jca/KeyDerivation1.java:109:65:109:86 | KeyDerivationAlgorithm | Name | PBKDF2WithHmacSHA256 | jca/KeyDerivation1.java:109:65:109:86 | jca/KeyDerivation1.java:109:65:109:86 |
+| jca/KeyDerivation1.java:109:65:109:86 | KeyDerivationAlgorithm | RawName | PBKDF2WithHmacSHA256 | jca/KeyDerivation1.java:109:65:109:86 | jca/KeyDerivation1.java:109:65:109:86 |
+| jca/KeyDerivation1.java:110:22:110:49 | Key | KeyType | Symmetric | jca/KeyDerivation1.java:110:22:110:49 | jca/KeyDerivation1.java:110:22:110:49 |
+| jca/KeyDerivation1.java:110:22:110:49 | KeyDerivation | Iterations | Constant:1_000_000 | jca/KeyDerivation1.java:108:72:108:80 | jca/KeyDerivation1.java:108:72:108:80 |
+| jca/KeyDerivation1.java:110:22:110:49 | KeyDerivation | KeySize | Constant:256 | jca/KeyDerivation1.java:108:83:108:85 | jca/KeyDerivation1.java:108:83:108:85 |
+| jca/KeyDerivation1.java:120:32:120:46 | Parameter | Description | password | jca/KeyDerivation1.java:120:32:120:46 | jca/KeyDerivation1.java:120:32:120:46 |
+| jca/KeyDerivation1.java:122:72:122:76 | Constant | Description | 80000 | jca/KeyDerivation1.java:122:72:122:76 | jca/KeyDerivation1.java:122:72:122:76 |
+| jca/KeyDerivation1.java:122:79:122:81 | Constant | Description | 256 | jca/KeyDerivation1.java:122:79:122:81 | jca/KeyDerivation1.java:122:79:122:81 |
+| jca/KeyDerivation1.java:123:65:123:84 | HMACAlgorithm | Name | HMAC | jca/KeyDerivation1.java:123:65:123:84 | jca/KeyDerivation1.java:123:65:123:84 |
+| jca/KeyDerivation1.java:123:65:123:84 | HMACAlgorithm | RawName | PBKDF2WithHmacSHA1 | jca/KeyDerivation1.java:123:65:123:84 | jca/KeyDerivation1.java:123:65:123:84 |
+| jca/KeyDerivation1.java:123:65:123:84 | HashAlgorithm | DigestSize | 160 | jca/KeyDerivation1.java:123:65:123:84 | jca/KeyDerivation1.java:123:65:123:84 |
+| jca/KeyDerivation1.java:123:65:123:84 | HashAlgorithm | Name | SHA1 | jca/KeyDerivation1.java:123:65:123:84 | jca/KeyDerivation1.java:123:65:123:84 |
+| jca/KeyDerivation1.java:123:65:123:84 | HashAlgorithm | RawName | PBKDF2WithHmacSHA1 | jca/KeyDerivation1.java:123:65:123:84 | jca/KeyDerivation1.java:123:65:123:84 |
+| jca/KeyDerivation1.java:123:65:123:84 | KeyDerivationAlgorithm | Name | PBKDF2WithHmacSHA1 | jca/KeyDerivation1.java:123:65:123:84 | jca/KeyDerivation1.java:123:65:123:84 |
+| jca/KeyDerivation1.java:123:65:123:84 | KeyDerivationAlgorithm | RawName | PBKDF2WithHmacSHA1 | jca/KeyDerivation1.java:123:65:123:84 | jca/KeyDerivation1.java:123:65:123:84 |
+| jca/KeyDerivation1.java:124:22:124:49 | Key | KeyType | Symmetric | jca/KeyDerivation1.java:124:22:124:49 | jca/KeyDerivation1.java:124:22:124:49 |
+| jca/KeyDerivation1.java:124:22:124:49 | KeyDerivation | Iterations | Constant:80000 | jca/KeyDerivation1.java:122:72:122:76 | jca/KeyDerivation1.java:122:72:122:76 |
+| jca/KeyDerivation1.java:124:22:124:49 | KeyDerivation | KeySize | Constant:256 | jca/KeyDerivation1.java:122:79:122:81 | jca/KeyDerivation1.java:122:79:122:81 |
+| jca/KeyDerivation1.java:134:34:134:48 | Parameter | Description | password | jca/KeyDerivation1.java:134:34:134:48 | jca/KeyDerivation1.java:134:34:134:48 |
+| jca/KeyDerivation1.java:136:72:136:77 | Constant | Description | 160000 | jca/KeyDerivation1.java:136:72:136:77 | jca/KeyDerivation1.java:136:72:136:77 |
+| jca/KeyDerivation1.java:136:80:136:82 | Constant | Description | 256 | jca/KeyDerivation1.java:136:80:136:82 | jca/KeyDerivation1.java:136:80:136:82 |
+| jca/KeyDerivation1.java:137:65:137:86 | HMACAlgorithm | Name | HMAC | jca/KeyDerivation1.java:137:65:137:86 | jca/KeyDerivation1.java:137:65:137:86 |
+| jca/KeyDerivation1.java:137:65:137:86 | HMACAlgorithm | RawName | PBKDF2WithHmacSHA512 | jca/KeyDerivation1.java:137:65:137:86 | jca/KeyDerivation1.java:137:65:137:86 |
+| jca/KeyDerivation1.java:137:65:137:86 | HashAlgorithm | DigestSize | 512 | jca/KeyDerivation1.java:137:65:137:86 | jca/KeyDerivation1.java:137:65:137:86 |
+| jca/KeyDerivation1.java:137:65:137:86 | HashAlgorithm | Name | SHA2 | jca/KeyDerivation1.java:137:65:137:86 | jca/KeyDerivation1.java:137:65:137:86 |
+| jca/KeyDerivation1.java:137:65:137:86 | HashAlgorithm | RawName | PBKDF2WithHmacSHA512 | jca/KeyDerivation1.java:137:65:137:86 | jca/KeyDerivation1.java:137:65:137:86 |
+| jca/KeyDerivation1.java:137:65:137:86 | KeyDerivationAlgorithm | Name | PBKDF2WithHmacSHA512 | jca/KeyDerivation1.java:137:65:137:86 | jca/KeyDerivation1.java:137:65:137:86 |
+| jca/KeyDerivation1.java:137:65:137:86 | KeyDerivationAlgorithm | RawName | PBKDF2WithHmacSHA512 | jca/KeyDerivation1.java:137:65:137:86 | jca/KeyDerivation1.java:137:65:137:86 |
+| jca/KeyDerivation1.java:138:22:138:49 | Key | KeyType | Symmetric | jca/KeyDerivation1.java:138:22:138:49 | jca/KeyDerivation1.java:138:22:138:49 |
+| jca/KeyDerivation1.java:138:22:138:49 | KeyDerivation | Iterations | Constant:160000 | jca/KeyDerivation1.java:136:72:136:77 | jca/KeyDerivation1.java:136:72:136:77 |
+| jca/KeyDerivation1.java:138:22:138:49 | KeyDerivation | KeySize | Constant:256 | jca/KeyDerivation1.java:136:80:136:82 | jca/KeyDerivation1.java:136:80:136:82 |
+| jca/KeyDerivation1.java:154:28:154:42 | Parameter | Description | password | jca/KeyDerivation1.java:154:28:154:42 | jca/KeyDerivation1.java:154:28:154:42 |
+| jca/KeyDerivation1.java:157:72:157:75 | Constant | Description | 1024 | jca/KeyDerivation1.java:157:72:157:75 | jca/KeyDerivation1.java:157:72:157:75 |
+| jca/KeyDerivation1.java:157:78:157:80 | Constant | Description | 128 | jca/KeyDerivation1.java:157:78:157:80 | jca/KeyDerivation1.java:157:78:157:80 |
+| jca/KeyDerivation1.java:158:65:158:72 | Constant | Description | "SCRYPT" | jca/KeyDerivation1.java:158:65:158:72 | jca/KeyDerivation1.java:158:65:158:72 |
+| jca/KeyDerivation1.java:159:22:159:49 | Key | KeyType | Symmetric | jca/KeyDerivation1.java:159:22:159:49 | jca/KeyDerivation1.java:159:22:159:49 |
+| jca/KeyDerivation1.java:159:22:159:49 | KeyDerivation | Iterations | Constant:1024 | jca/KeyDerivation1.java:157:72:157:75 | jca/KeyDerivation1.java:157:72:157:75 |
+| jca/KeyDerivation1.java:159:22:159:49 | KeyDerivation | KeySize | Constant:128 | jca/KeyDerivation1.java:157:78:157:80 | jca/KeyDerivation1.java:157:78:157:80 |
+| jca/KeyDerivation1.java:169:30:169:44 | Parameter | Description | password | jca/KeyDerivation1.java:169:30:169:44 | jca/KeyDerivation1.java:169:30:169:44 |
+| jca/KeyDerivation1.java:172:72:172:76 | Constant | Description | 16384 | jca/KeyDerivation1.java:172:72:172:76 | jca/KeyDerivation1.java:172:72:172:76 |
+| jca/KeyDerivation1.java:172:79:172:81 | Constant | Description | 256 | jca/KeyDerivation1.java:172:79:172:81 | jca/KeyDerivation1.java:172:79:172:81 |
+| jca/KeyDerivation1.java:173:65:173:72 | Constant | Description | "SCRYPT" | jca/KeyDerivation1.java:173:65:173:72 | jca/KeyDerivation1.java:173:65:173:72 |
+| jca/KeyDerivation1.java:174:22:174:49 | Key | KeyType | Symmetric | jca/KeyDerivation1.java:174:22:174:49 | jca/KeyDerivation1.java:174:22:174:49 |
+| jca/KeyDerivation1.java:174:22:174:49 | KeyDerivation | Iterations | Constant:16384 | jca/KeyDerivation1.java:172:72:172:76 | jca/KeyDerivation1.java:172:72:172:76 |
+| jca/KeyDerivation1.java:174:22:174:49 | KeyDerivation | KeySize | Constant:256 | jca/KeyDerivation1.java:172:79:172:81 | jca/KeyDerivation1.java:172:79:172:81 |
+| jca/KeyDerivation1.java:242:45:242:56 | Parameter | Description | input | jca/KeyDerivation1.java:242:45:242:56 | jca/KeyDerivation1.java:242:45:242:56 |
+| jca/KeyDerivation1.java:243:58:243:66 | HashAlgorithm | DigestSize | 256 | jca/KeyDerivation1.java:243:58:243:66 | jca/KeyDerivation1.java:243:58:243:66 |
+| jca/KeyDerivation1.java:243:58:243:66 | HashAlgorithm | Name | SHA2 | jca/KeyDerivation1.java:243:58:243:66 | jca/KeyDerivation1.java:243:58:243:66 |
+| jca/KeyDerivation1.java:243:58:243:66 | HashAlgorithm | RawName | SHA-256 | jca/KeyDerivation1.java:243:58:243:66 | jca/KeyDerivation1.java:243:58:243:66 |
+| jca/KeyDerivation1.java:249:70:249:88 | KeyOperationAlgorithm | Name | AES | jca/KeyDerivation1.java:249:70:249:88 | jca/KeyDerivation1.java:249:70:249:88 |
+| jca/KeyDerivation1.java:249:70:249:88 | KeyOperationAlgorithm | RawName | AES/ECB/NoPadding | jca/KeyDerivation1.java:249:70:249:88 | jca/KeyDerivation1.java:249:70:249:88 |
+| jca/KeyDerivation1.java:249:70:249:88 | KeyOperationAlgorithm | Structure | Block | jca/KeyDerivation1.java:249:70:249:88 | jca/KeyDerivation1.java:249:70:249:88 |
+| jca/KeyDerivation1.java:249:70:249:88 | ModeOfOperation | Name | ECB | jca/KeyDerivation1.java:249:70:249:88 | jca/KeyDerivation1.java:249:70:249:88 |
+| jca/KeyDerivation1.java:249:70:249:88 | ModeOfOperation | RawName | ECB | jca/KeyDerivation1.java:249:70:249:88 | jca/KeyDerivation1.java:249:70:249:88 |
+| jca/KeyDerivation1.java:249:70:249:88 | PaddingAlgorithm | Name | UnknownPadding | jca/KeyDerivation1.java:249:70:249:88 | jca/KeyDerivation1.java:249:70:249:88 |
+| jca/KeyDerivation1.java:249:70:249:88 | PaddingAlgorithm | RawName | NoPadding | jca/KeyDerivation1.java:249:70:249:88 | jca/KeyDerivation1.java:249:70:249:88 |
+| jca/KeyDerivation1.java:250:55:250:57 | Key | KeyType | Unknown | jca/KeyDerivation1.java:250:55:250:57 | jca/KeyDerivation1.java:250:55:250:57 |
+| jca/KeyDerivation1.java:251:29:251:74 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/KeyDerivation1.java:251:29:251:74 | jca/KeyDerivation1.java:251:29:251:74 |
+| jca/KeyDerivation1.java:251:44:251:62 | Constant | Description | "SampleData16Bytes" | jca/KeyDerivation1.java:251:44:251:62 | jca/KeyDerivation1.java:251:44:251:62 |
+| jca/KeyDerivation1.java:269:32:269:41 | Parameter | Description | ikm | jca/KeyDerivation1.java:269:32:269:41 | jca/KeyDerivation1.java:269:32:269:41 |
+| jca/KeyDerivation1.java:283:43:283:57 | Parameter | Description | password | jca/KeyDerivation1.java:283:43:283:57 | jca/KeyDerivation1.java:283:43:283:57 |
+| jca/KeyDerivation1.java:283:60:283:78 | Parameter | Description | sharedSecret | jca/KeyDerivation1.java:283:60:283:78 | jca/KeyDerivation1.java:283:60:283:78 |
+| jca/KeyDerivation1.java:302:37:302:51 | Parameter | Description | password | jca/KeyDerivation1.java:302:37:302:51 | jca/KeyDerivation1.java:302:37:302:51 |
+| jca/KeyDerivation1.java:309:25:309:76 | Constant | Description | getProperty(...) | jca/KeyDerivation1.java:309:25:309:76 | jca/KeyDerivation1.java:309:25:309:76 |
+| jca/KeyDerivation1.java:309:25:309:76 | LocalData | Description | getProperty(...) | jca/KeyDerivation1.java:309:25:309:76 | jca/KeyDerivation1.java:309:25:309:76 |
+| jca/KeyDerivation1.java:309:54:309:75 | HMACAlgorithm | Name | HMAC | jca/KeyDerivation1.java:309:54:309:75 | jca/KeyDerivation1.java:309:54:309:75 |
+| jca/KeyDerivation1.java:309:54:309:75 | HMACAlgorithm | RawName | PBKDF2WithHmacSHA256 | jca/KeyDerivation1.java:309:54:309:75 | jca/KeyDerivation1.java:309:54:309:75 |
+| jca/KeyDerivation1.java:309:54:309:75 | HashAlgorithm | DigestSize | 256 | jca/KeyDerivation1.java:309:54:309:75 | jca/KeyDerivation1.java:309:54:309:75 |
+| jca/KeyDerivation1.java:309:54:309:75 | HashAlgorithm | Name | SHA2 | jca/KeyDerivation1.java:309:54:309:75 | jca/KeyDerivation1.java:309:54:309:75 |
+| jca/KeyDerivation1.java:309:54:309:75 | HashAlgorithm | RawName | PBKDF2WithHmacSHA256 | jca/KeyDerivation1.java:309:54:309:75 | jca/KeyDerivation1.java:309:54:309:75 |
+| jca/KeyDerivation1.java:309:54:309:75 | KeyDerivationAlgorithm | Name | PBKDF2WithHmacSHA256 | jca/KeyDerivation1.java:309:54:309:75 | jca/KeyDerivation1.java:309:54:309:75 |
+| jca/KeyDerivation1.java:309:54:309:75 | KeyDerivationAlgorithm | RawName | PBKDF2WithHmacSHA256 | jca/KeyDerivation1.java:309:54:309:75 | jca/KeyDerivation1.java:309:54:309:75 |
+| jca/KeyDerivation1.java:310:43:310:86 | Constant | Description | getProperty(...) | jca/KeyDerivation1.java:310:43:310:86 | jca/KeyDerivation1.java:310:43:310:86 |
+| jca/KeyDerivation1.java:310:43:310:86 | LocalData | Description | getProperty(...) | jca/KeyDerivation1.java:310:43:310:86 | jca/KeyDerivation1.java:310:43:310:86 |
+| jca/KeyDerivation1.java:311:40:311:78 | Constant | Description | getProperty(...) | jca/KeyDerivation1.java:311:40:311:78 | jca/KeyDerivation1.java:311:40:311:78 |
+| jca/KeyDerivation1.java:311:40:311:78 | LocalData | Description | getProperty(...) | jca/KeyDerivation1.java:311:40:311:78 | jca/KeyDerivation1.java:311:40:311:78 |
+| jca/KeyDerivation1.java:316:26:316:53 | Key | KeyType | Symmetric | jca/KeyDerivation1.java:316:26:316:53 | jca/KeyDerivation1.java:316:26:316:53 |
+| jca/KeyDerivation1.java:316:26:316:53 | KeyDerivation | Iterations | Constant:getProperty(...) | jca/KeyDerivation1.java:310:43:310:86 | jca/KeyDerivation1.java:310:43:310:86 |
+| jca/KeyDerivation1.java:316:26:316:53 | KeyDerivation | Iterations | LocalData:getProperty(...) | jca/KeyDerivation1.java:310:43:310:86 | jca/KeyDerivation1.java:310:43:310:86 |
+| jca/KeyDerivation1.java:316:26:316:53 | KeyDerivation | KeySize | Constant:getProperty(...) | jca/KeyDerivation1.java:311:40:311:78 | jca/KeyDerivation1.java:311:40:311:78 |
+| jca/KeyDerivation1.java:316:26:316:53 | KeyDerivation | KeySize | LocalData:getProperty(...) | jca/KeyDerivation1.java:311:40:311:78 | jca/KeyDerivation1.java:311:40:311:78 |
+| jca/KeyDerivation1.java:333:72:333:76 | Constant | Description | 10000 | jca/KeyDerivation1.java:333:72:333:76 | jca/KeyDerivation1.java:333:72:333:76 |
+| jca/KeyDerivation1.java:333:79:333:81 | Constant | Description | 256 | jca/KeyDerivation1.java:333:79:333:81 | jca/KeyDerivation1.java:333:79:333:81 |
+| jca/KeyDerivation1.java:334:65:334:86 | HMACAlgorithm | Name | HMAC | jca/KeyDerivation1.java:334:65:334:86 | jca/KeyDerivation1.java:334:65:334:86 |
+| jca/KeyDerivation1.java:334:65:334:86 | HMACAlgorithm | RawName | PBKDF2WithHmacSHA256 | jca/KeyDerivation1.java:334:65:334:86 | jca/KeyDerivation1.java:334:65:334:86 |
+| jca/KeyDerivation1.java:334:65:334:86 | HashAlgorithm | DigestSize | 256 | jca/KeyDerivation1.java:334:65:334:86 | jca/KeyDerivation1.java:334:65:334:86 |
+| jca/KeyDerivation1.java:334:65:334:86 | HashAlgorithm | Name | SHA2 | jca/KeyDerivation1.java:334:65:334:86 | jca/KeyDerivation1.java:334:65:334:86 |
+| jca/KeyDerivation1.java:334:65:334:86 | HashAlgorithm | RawName | PBKDF2WithHmacSHA256 | jca/KeyDerivation1.java:334:65:334:86 | jca/KeyDerivation1.java:334:65:334:86 |
+| jca/KeyDerivation1.java:334:65:334:86 | KeyDerivationAlgorithm | Name | PBKDF2WithHmacSHA256 | jca/KeyDerivation1.java:334:65:334:86 | jca/KeyDerivation1.java:334:65:334:86 |
+| jca/KeyDerivation1.java:334:65:334:86 | KeyDerivationAlgorithm | RawName | PBKDF2WithHmacSHA256 | jca/KeyDerivation1.java:334:65:334:86 | jca/KeyDerivation1.java:334:65:334:86 |
+| jca/KeyDerivation1.java:335:16:335:43 | Key | KeyType | Symmetric | jca/KeyDerivation1.java:335:16:335:43 | jca/KeyDerivation1.java:335:16:335:43 |
+| jca/KeyDerivation1.java:335:16:335:43 | KeyDerivation | Iterations | Constant:10000 | jca/KeyDerivation1.java:333:72:333:76 | jca/KeyDerivation1.java:333:72:333:76 |
+| jca/KeyDerivation1.java:335:16:335:43 | KeyDerivation | KeySize | Constant:256 | jca/KeyDerivation1.java:333:79:333:81 | jca/KeyDerivation1.java:333:79:333:81 |
+| jca/KeyDerivation1.java:345:36:345:47 | HMACAlgorithm | Name | HMAC | jca/KeyDerivation1.java:345:36:345:47 | jca/KeyDerivation1.java:345:36:345:47 |
+| jca/KeyDerivation1.java:345:36:345:47 | HMACAlgorithm | RawName | HmacSHA256 | jca/KeyDerivation1.java:345:36:345:47 | jca/KeyDerivation1.java:345:36:345:47 |
+| jca/KeyDerivation1.java:345:36:345:47 | HashAlgorithm | DigestSize | 256 | jca/KeyDerivation1.java:345:36:345:47 | jca/KeyDerivation1.java:345:36:345:47 |
+| jca/KeyDerivation1.java:345:36:345:47 | HashAlgorithm | Name | SHA2 | jca/KeyDerivation1.java:345:36:345:47 | jca/KeyDerivation1.java:345:36:345:47 |
+| jca/KeyDerivation1.java:345:36:345:47 | HashAlgorithm | RawName | HmacSHA256 | jca/KeyDerivation1.java:345:36:345:47 | jca/KeyDerivation1.java:345:36:345:47 |
+| jca/KeyDerivation1.java:347:19:347:27 | Key | KeyType | Unknown | jca/KeyDerivation1.java:347:19:347:27 | jca/KeyDerivation1.java:347:19:347:27 |
+| jca/KeyDerivation1.java:348:22:348:38 | MACOperation | KeyOperationSubtype | Mac | jca/KeyDerivation1.java:348:22:348:38 | jca/KeyDerivation1.java:348:22:348:38 |
+| jca/KeyDerivation1.java:352:19:352:54 | Key | KeyType | Unknown | jca/KeyDerivation1.java:352:19:352:54 | jca/KeyDerivation1.java:352:19:352:54 |
+| jca/KeyDerivation1.java:353:22:353:62 | MACOperation | KeyOperationSubtype | Mac | jca/KeyDerivation1.java:353:22:353:62 | jca/KeyDerivation1.java:353:22:353:62 |
+| jca/KeyDerivation1.java:353:35:353:50 | Constant | Description | "hkdf-expansion" | jca/KeyDerivation1.java:353:35:353:50 | jca/KeyDerivation1.java:353:35:353:50 |
+| jca/KeyDerivation1.java:365:38:365:41 | RandomNumberGeneration | Description | java.security.SecureRandom | jca/KeyDerivation1.java:365:38:365:41 | jca/KeyDerivation1.java:365:38:365:41 |
+| jca/KeyEncapsulation.java:60:56:60:60 | KeyOperationAlgorithm | KeySize | Constant:256 | jca/KeyEncapsulation.java:61:21:61:23 | jca/KeyEncapsulation.java:61:21:61:23 |
+| jca/KeyEncapsulation.java:60:56:60:60 | KeyOperationAlgorithm | Name | AES | jca/KeyEncapsulation.java:60:56:60:60 | jca/KeyEncapsulation.java:60:56:60:60 |
+| jca/KeyEncapsulation.java:60:56:60:60 | KeyOperationAlgorithm | RawName | AES | jca/KeyEncapsulation.java:60:56:60:60 | jca/KeyEncapsulation.java:60:56:60:60 |
+| jca/KeyEncapsulation.java:60:56:60:60 | KeyOperationAlgorithm | Structure | Block | jca/KeyEncapsulation.java:60:56:60:60 | jca/KeyEncapsulation.java:60:56:60:60 |
+| jca/KeyEncapsulation.java:61:21:61:23 | Constant | Description | 256 | jca/KeyEncapsulation.java:61:21:61:23 | jca/KeyEncapsulation.java:61:21:61:23 |
+| jca/KeyEncapsulation.java:62:28:62:47 | Key | KeyType | Symmetric | jca/KeyEncapsulation.java:62:28:62:47 | jca/KeyEncapsulation.java:62:28:62:47 |
+| jca/KeyEncapsulation.java:67:47:67:85 | HashAlgorithm | DigestSize | 256 | jca/KeyEncapsulation.java:67:47:67:85 | jca/KeyEncapsulation.java:67:47:67:85 |
+| jca/KeyEncapsulation.java:67:47:67:85 | HashAlgorithm | Name | SHA2 | jca/KeyEncapsulation.java:67:47:67:85 | jca/KeyEncapsulation.java:67:47:67:85 |
+| jca/KeyEncapsulation.java:67:47:67:85 | HashAlgorithm | RawName | OAEPWithSHA-256AndMGF1Padding | jca/KeyEncapsulation.java:67:47:67:85 | jca/KeyEncapsulation.java:67:47:67:85 |
+| jca/KeyEncapsulation.java:67:47:67:85 | KeyOperationAlgorithm | Name | RSA | jca/KeyEncapsulation.java:67:47:67:85 | jca/KeyEncapsulation.java:67:47:67:85 |
+| jca/KeyEncapsulation.java:67:47:67:85 | KeyOperationAlgorithm | RawName | RSA/ECB/OAEPWithSHA-256AndMGF1Padding | jca/KeyEncapsulation.java:67:47:67:85 | jca/KeyEncapsulation.java:67:47:67:85 |
+| jca/KeyEncapsulation.java:67:47:67:85 | ModeOfOperation | Name | ECB | jca/KeyEncapsulation.java:67:47:67:85 | jca/KeyEncapsulation.java:67:47:67:85 |
+| jca/KeyEncapsulation.java:67:47:67:85 | ModeOfOperation | RawName | ECB | jca/KeyEncapsulation.java:67:47:67:85 | jca/KeyEncapsulation.java:67:47:67:85 |
+| jca/KeyEncapsulation.java:67:47:67:85 | PaddingAlgorithm | Name | OAEP | jca/KeyEncapsulation.java:67:47:67:85 | jca/KeyEncapsulation.java:67:47:67:85 |
+| jca/KeyEncapsulation.java:67:47:67:85 | PaddingAlgorithm | RawName | OAEPWithSHA-256AndMGF1Padding | jca/KeyEncapsulation.java:67:47:67:85 | jca/KeyEncapsulation.java:67:47:67:85 |
+| jca/KeyEncapsulation.java:68:45:68:50 | Key | KeyType | Unknown | jca/KeyEncapsulation.java:68:45:68:50 | jca/KeyEncapsulation.java:68:45:68:50 |
+| jca/KeyEncapsulation.java:69:29:69:66 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/KeyEncapsulation.java:69:29:69:66 | jca/KeyEncapsulation.java:69:29:69:66 |
+| jca/KeyEncapsulation.java:73:47:73:65 | KeyOperationAlgorithm | Name | AES | jca/KeyEncapsulation.java:73:47:73:65 | jca/KeyEncapsulation.java:73:47:73:65 |
+| jca/KeyEncapsulation.java:73:47:73:65 | KeyOperationAlgorithm | RawName | AES/GCM/NoPadding | jca/KeyEncapsulation.java:73:47:73:65 | jca/KeyEncapsulation.java:73:47:73:65 |
+| jca/KeyEncapsulation.java:73:47:73:65 | KeyOperationAlgorithm | Structure | Block | jca/KeyEncapsulation.java:73:47:73:65 | jca/KeyEncapsulation.java:73:47:73:65 |
+| jca/KeyEncapsulation.java:73:47:73:65 | ModeOfOperation | Name | GCM | jca/KeyEncapsulation.java:73:47:73:65 | jca/KeyEncapsulation.java:73:47:73:65 |
+| jca/KeyEncapsulation.java:73:47:73:65 | ModeOfOperation | RawName | GCM | jca/KeyEncapsulation.java:73:47:73:65 | jca/KeyEncapsulation.java:73:47:73:65 |
+| jca/KeyEncapsulation.java:73:47:73:65 | PaddingAlgorithm | Name | UnknownPadding | jca/KeyEncapsulation.java:73:47:73:65 | jca/KeyEncapsulation.java:73:47:73:65 |
+| jca/KeyEncapsulation.java:73:47:73:65 | PaddingAlgorithm | RawName | NoPadding | jca/KeyEncapsulation.java:73:47:73:65 | jca/KeyEncapsulation.java:73:47:73:65 |
+| jca/KeyEncapsulation.java:75:38:75:39 | RandomNumberGeneration | Description | java.security.SecureRandom | jca/KeyEncapsulation.java:75:38:75:39 | jca/KeyEncapsulation.java:75:38:75:39 |
+| jca/KeyEncapsulation.java:77:45:77:50 | Key | KeyType | Unknown | jca/KeyEncapsulation.java:77:45:77:50 | jca/KeyEncapsulation.java:77:45:77:50 |
+| jca/KeyEncapsulation.java:78:29:78:80 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/KeyEncapsulation.java:78:29:78:80 | jca/KeyEncapsulation.java:78:29:78:80 |
+| jca/KeyEncapsulation.java:78:47:78:68 | Constant | Description | "KEM-based encryption" | jca/KeyEncapsulation.java:78:47:78:68 | jca/KeyEncapsulation.java:78:47:78:68 |
+| jca/KeyEncapsulation.java:91:37:91:54 | Parameter | Description | rsaPriv | jca/KeyEncapsulation.java:91:37:91:54 | jca/KeyEncapsulation.java:91:37:91:54 |
+| jca/KeyEncapsulation.java:91:57:91:73 | Parameter | Description | wrappedKey | jca/KeyEncapsulation.java:91:57:91:73 | jca/KeyEncapsulation.java:91:57:91:73 |
+| jca/KeyEncapsulation.java:92:47:92:85 | HashAlgorithm | DigestSize | 256 | jca/KeyEncapsulation.java:92:47:92:85 | jca/KeyEncapsulation.java:92:47:92:85 |
+| jca/KeyEncapsulation.java:92:47:92:85 | HashAlgorithm | Name | SHA2 | jca/KeyEncapsulation.java:92:47:92:85 | jca/KeyEncapsulation.java:92:47:92:85 |
+| jca/KeyEncapsulation.java:92:47:92:85 | HashAlgorithm | RawName | OAEPWithSHA-256AndMGF1Padding | jca/KeyEncapsulation.java:92:47:92:85 | jca/KeyEncapsulation.java:92:47:92:85 |
+| jca/KeyEncapsulation.java:92:47:92:85 | KeyOperationAlgorithm | Name | RSA | jca/KeyEncapsulation.java:92:47:92:85 | jca/KeyEncapsulation.java:92:47:92:85 |
+| jca/KeyEncapsulation.java:92:47:92:85 | KeyOperationAlgorithm | RawName | RSA/ECB/OAEPWithSHA-256AndMGF1Padding | jca/KeyEncapsulation.java:92:47:92:85 | jca/KeyEncapsulation.java:92:47:92:85 |
+| jca/KeyEncapsulation.java:92:47:92:85 | ModeOfOperation | Name | ECB | jca/KeyEncapsulation.java:92:47:92:85 | jca/KeyEncapsulation.java:92:47:92:85 |
+| jca/KeyEncapsulation.java:92:47:92:85 | ModeOfOperation | RawName | ECB | jca/KeyEncapsulation.java:92:47:92:85 | jca/KeyEncapsulation.java:92:47:92:85 |
+| jca/KeyEncapsulation.java:92:47:92:85 | PaddingAlgorithm | Name | OAEP | jca/KeyEncapsulation.java:92:47:92:85 | jca/KeyEncapsulation.java:92:47:92:85 |
+| jca/KeyEncapsulation.java:92:47:92:85 | PaddingAlgorithm | RawName | OAEPWithSHA-256AndMGF1Padding | jca/KeyEncapsulation.java:92:47:92:85 | jca/KeyEncapsulation.java:92:47:92:85 |
+| jca/KeyEncapsulation.java:93:45:93:51 | Key | KeyType | Unknown | jca/KeyEncapsulation.java:93:45:93:51 | jca/KeyEncapsulation.java:93:45:93:51 |
+| jca/KeyEncapsulation.java:94:30:94:58 | DecryptOperation | KeyOperationSubtype | Decrypt | jca/KeyEncapsulation.java:94:30:94:58 | jca/KeyEncapsulation.java:94:30:94:58 |
+| jca/KeyEncapsulation.java:117:47:117:57 | EllipticCurve | CurveType | SEC | jca/KeyEncapsulation.java:117:47:117:57 | jca/KeyEncapsulation.java:117:47:117:57 |
+| jca/KeyEncapsulation.java:117:47:117:57 | EllipticCurve | KeySize | 256 | jca/KeyEncapsulation.java:117:47:117:57 | jca/KeyEncapsulation.java:117:47:117:57 |
+| jca/KeyEncapsulation.java:117:47:117:57 | EllipticCurve | Name | secp256r1 | jca/KeyEncapsulation.java:117:47:117:57 | jca/KeyEncapsulation.java:117:47:117:57 |
+| jca/KeyEncapsulation.java:117:47:117:57 | EllipticCurve | ParsedName | secp256r1 | jca/KeyEncapsulation.java:117:47:117:57 | jca/KeyEncapsulation.java:117:47:117:57 |
+| jca/KeyEncapsulation.java:117:47:117:57 | EllipticCurve | RawName | secp256r1 | jca/KeyEncapsulation.java:117:47:117:57 | jca/KeyEncapsulation.java:117:47:117:57 |
+| jca/KeyEncapsulation.java:118:31:118:51 | Key | KeyType | Asymmetric | jca/KeyEncapsulation.java:118:31:118:51 | jca/KeyEncapsulation.java:118:31:118:51 |
+| jca/KeyEncapsulation.java:121:52:121:57 | KeyAgreementAlgorithm | Name | ECDH | jca/KeyEncapsulation.java:121:52:121:57 | jca/KeyEncapsulation.java:121:52:121:57 |
+| jca/KeyEncapsulation.java:121:52:121:57 | KeyAgreementAlgorithm | RawName | ECDH | jca/KeyEncapsulation.java:121:52:121:57 | jca/KeyEncapsulation.java:121:52:121:57 |
+| jca/KeyEncapsulation.java:122:17:122:40 | Key | KeyType | Unknown | jca/KeyEncapsulation.java:122:17:122:40 | jca/KeyEncapsulation.java:122:17:122:40 |
+| jca/KeyEncapsulation.java:123:20:123:24 | Key | KeyType | Unknown | jca/KeyEncapsulation.java:123:20:123:24 | jca/KeyEncapsulation.java:123:20:123:24 |
+| jca/KeyEncapsulation.java:133:47:133:65 | KeyOperationAlgorithm | Name | AES | jca/KeyEncapsulation.java:133:47:133:65 | jca/KeyEncapsulation.java:133:47:133:65 |
+| jca/KeyEncapsulation.java:133:47:133:65 | KeyOperationAlgorithm | RawName | AES/GCM/NoPadding | jca/KeyEncapsulation.java:133:47:133:65 | jca/KeyEncapsulation.java:133:47:133:65 |
+| jca/KeyEncapsulation.java:133:47:133:65 | KeyOperationAlgorithm | Structure | Block | jca/KeyEncapsulation.java:133:47:133:65 | jca/KeyEncapsulation.java:133:47:133:65 |
+| jca/KeyEncapsulation.java:133:47:133:65 | ModeOfOperation | Name | GCM | jca/KeyEncapsulation.java:133:47:133:65 | jca/KeyEncapsulation.java:133:47:133:65 |
+| jca/KeyEncapsulation.java:133:47:133:65 | ModeOfOperation | RawName | GCM | jca/KeyEncapsulation.java:133:47:133:65 | jca/KeyEncapsulation.java:133:47:133:65 |
+| jca/KeyEncapsulation.java:133:47:133:65 | PaddingAlgorithm | Name | UnknownPadding | jca/KeyEncapsulation.java:133:47:133:65 | jca/KeyEncapsulation.java:133:47:133:65 |
+| jca/KeyEncapsulation.java:133:47:133:65 | PaddingAlgorithm | RawName | NoPadding | jca/KeyEncapsulation.java:133:47:133:65 | jca/KeyEncapsulation.java:133:47:133:65 |
+| jca/KeyEncapsulation.java:135:38:135:39 | RandomNumberGeneration | Description | java.security.SecureRandom | jca/KeyEncapsulation.java:135:38:135:39 | jca/KeyEncapsulation.java:135:38:135:39 |
+| jca/KeyEncapsulation.java:136:45:136:50 | Key | KeyType | Unknown | jca/KeyEncapsulation.java:136:45:136:50 | jca/KeyEncapsulation.java:136:45:136:50 |
+| jca/KeyEncapsulation.java:137:29:137:73 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/KeyEncapsulation.java:137:29:137:73 | jca/KeyEncapsulation.java:137:29:137:73 |
+| jca/KeyEncapsulation.java:137:47:137:61 | Constant | Description | "ECIES message" | jca/KeyEncapsulation.java:137:47:137:61 | jca/KeyEncapsulation.java:137:47:137:61 |
+| jca/KeyEncapsulation.java:186:47:186:57 | EllipticCurve | CurveType | SEC | jca/KeyEncapsulation.java:186:47:186:57 | jca/KeyEncapsulation.java:186:47:186:57 |
+| jca/KeyEncapsulation.java:186:47:186:57 | EllipticCurve | KeySize | 256 | jca/KeyEncapsulation.java:186:47:186:57 | jca/KeyEncapsulation.java:186:47:186:57 |
+| jca/KeyEncapsulation.java:186:47:186:57 | EllipticCurve | Name | secp256r1 | jca/KeyEncapsulation.java:186:47:186:57 | jca/KeyEncapsulation.java:186:47:186:57 |
+| jca/KeyEncapsulation.java:186:47:186:57 | EllipticCurve | ParsedName | secp256r1 | jca/KeyEncapsulation.java:186:47:186:57 | jca/KeyEncapsulation.java:186:47:186:57 |
+| jca/KeyEncapsulation.java:186:47:186:57 | EllipticCurve | RawName | secp256r1 | jca/KeyEncapsulation.java:186:47:186:57 | jca/KeyEncapsulation.java:186:47:186:57 |
+| jca/KeyEncapsulation.java:187:31:187:51 | Key | KeyType | Asymmetric | jca/KeyEncapsulation.java:187:31:187:51 | jca/KeyEncapsulation.java:187:31:187:51 |
+| jca/KeyEncapsulation.java:188:52:188:57 | KeyAgreementAlgorithm | Name | ECDH | jca/KeyEncapsulation.java:188:52:188:57 | jca/KeyEncapsulation.java:188:52:188:57 |
+| jca/KeyEncapsulation.java:188:52:188:57 | KeyAgreementAlgorithm | RawName | ECDH | jca/KeyEncapsulation.java:188:52:188:57 | jca/KeyEncapsulation.java:188:52:188:57 |
+| jca/KeyEncapsulation.java:189:17:189:40 | Key | KeyType | Unknown | jca/KeyEncapsulation.java:189:17:189:40 | jca/KeyEncapsulation.java:189:17:189:40 |
+| jca/KeyEncapsulation.java:190:20:190:34 | Key | KeyType | Unknown | jca/KeyEncapsulation.java:190:20:190:34 | jca/KeyEncapsulation.java:190:20:190:34 |
+| jca/KeyEncapsulation.java:207:64:207:68 | KeyOperationAlgorithm | KeySize | Constant:2048 | jca/KeyEncapsulation.java:208:27:208:30 | jca/KeyEncapsulation.java:208:27:208:30 |
+| jca/KeyEncapsulation.java:207:64:207:68 | KeyOperationAlgorithm | Name | RSA | jca/KeyEncapsulation.java:207:64:207:68 | jca/KeyEncapsulation.java:207:64:207:68 |
+| jca/KeyEncapsulation.java:207:64:207:68 | KeyOperationAlgorithm | RawName | RSA | jca/KeyEncapsulation.java:207:64:207:68 | jca/KeyEncapsulation.java:207:64:207:68 |
+| jca/KeyEncapsulation.java:208:27:208:30 | Constant | Description | 2048 | jca/KeyEncapsulation.java:208:27:208:30 | jca/KeyEncapsulation.java:208:27:208:30 |
+| jca/KeyEncapsulation.java:209:25:209:48 | Key | KeyType | Asymmetric | jca/KeyEncapsulation.java:209:25:209:48 | jca/KeyEncapsulation.java:209:25:209:48 |
+| jca/KeyEncapsulation.java:214:49:214:59 | EllipticCurve | CurveType | SEC | jca/KeyEncapsulation.java:214:49:214:59 | jca/KeyEncapsulation.java:214:49:214:59 |
+| jca/KeyEncapsulation.java:214:49:214:59 | EllipticCurve | KeySize | 256 | jca/KeyEncapsulation.java:214:49:214:59 | jca/KeyEncapsulation.java:214:49:214:59 |
+| jca/KeyEncapsulation.java:214:49:214:59 | EllipticCurve | Name | secp256r1 | jca/KeyEncapsulation.java:214:49:214:59 | jca/KeyEncapsulation.java:214:49:214:59 |
+| jca/KeyEncapsulation.java:214:49:214:59 | EllipticCurve | ParsedName | secp256r1 | jca/KeyEncapsulation.java:214:49:214:59 | jca/KeyEncapsulation.java:214:49:214:59 |
+| jca/KeyEncapsulation.java:214:49:214:59 | EllipticCurve | RawName | secp256r1 | jca/KeyEncapsulation.java:214:49:214:59 | jca/KeyEncapsulation.java:214:49:214:59 |
+| jca/KeyEncapsulation.java:215:24:215:46 | Key | KeyType | Asymmetric | jca/KeyEncapsulation.java:215:24:215:46 | jca/KeyEncapsulation.java:215:24:215:46 |
+| jca/KeyEncapsulation.java:226:31:226:53 | Key | KeyType | Asymmetric | jca/KeyEncapsulation.java:226:31:226:53 | jca/KeyEncapsulation.java:226:31:226:53 |
+| jca/KeyExchange.java:52:63:52:66 | KeyAgreementAlgorithm | Name | DH | jca/KeyExchange.java:52:63:52:66 | jca/KeyExchange.java:52:63:52:66 |
+| jca/KeyExchange.java:52:63:52:66 | KeyAgreementAlgorithm | RawName | DH | jca/KeyExchange.java:52:63:52:66 | jca/KeyExchange.java:52:63:52:66 |
+| jca/KeyExchange.java:53:26:53:29 | Constant | Description | 2048 | jca/KeyExchange.java:53:26:53:29 | jca/KeyExchange.java:53:26:53:29 |
+| jca/KeyExchange.java:54:16:54:38 | Key | KeyType | Asymmetric | jca/KeyExchange.java:54:16:54:38 | jca/KeyExchange.java:54:16:54:38 |
+| jca/KeyExchange.java:67:63:67:66 | KeyAgreementAlgorithm | Name | DH | jca/KeyExchange.java:67:63:67:66 | jca/KeyExchange.java:67:63:67:66 |
+| jca/KeyExchange.java:67:63:67:66 | KeyAgreementAlgorithm | RawName | DH | jca/KeyExchange.java:67:63:67:66 | jca/KeyExchange.java:67:63:67:66 |
+| jca/KeyExchange.java:69:26:69:28 | Constant | Description | 512 | jca/KeyExchange.java:69:26:69:28 | jca/KeyExchange.java:69:26:69:28 |
+| jca/KeyExchange.java:70:16:70:38 | Key | KeyType | Asymmetric | jca/KeyExchange.java:70:16:70:38 | jca/KeyExchange.java:70:16:70:38 |
+| jca/KeyExchange.java:83:63:83:66 | KeyAgreementAlgorithm | Name | DH | jca/KeyExchange.java:83:63:83:66 | jca/KeyExchange.java:83:63:83:66 |
+| jca/KeyExchange.java:83:63:83:66 | KeyAgreementAlgorithm | RawName | DH | jca/KeyExchange.java:83:63:83:66 | jca/KeyExchange.java:83:63:83:66 |
+| jca/KeyExchange.java:84:26:84:29 | Constant | Description | 4096 | jca/KeyExchange.java:84:26:84:29 | jca/KeyExchange.java:84:26:84:29 |
+| jca/KeyExchange.java:85:16:85:38 | Key | KeyType | Asymmetric | jca/KeyExchange.java:85:16:85:38 | jca/KeyExchange.java:85:16:85:38 |
+| jca/KeyExchange.java:99:52:99:55 | KeyAgreementAlgorithm | Name | DH | jca/KeyExchange.java:99:52:99:55 | jca/KeyExchange.java:99:52:99:55 |
+| jca/KeyExchange.java:99:52:99:55 | KeyAgreementAlgorithm | RawName | DH | jca/KeyExchange.java:99:52:99:55 | jca/KeyExchange.java:99:52:99:55 |
+| jca/KeyExchange.java:100:17:100:26 | Key | KeyType | Unknown | jca/KeyExchange.java:100:17:100:26 | jca/KeyExchange.java:100:17:100:26 |
+| jca/KeyExchange.java:101:20:101:28 | Key | KeyType | Unknown | jca/KeyExchange.java:101:20:101:28 | jca/KeyExchange.java:101:20:101:28 |
+| jca/KeyExchange.java:121:49:121:59 | EllipticCurve | CurveType | SEC | jca/KeyExchange.java:121:49:121:59 | jca/KeyExchange.java:121:49:121:59 |
+| jca/KeyExchange.java:121:49:121:59 | EllipticCurve | KeySize | 256 | jca/KeyExchange.java:121:49:121:59 | jca/KeyExchange.java:121:49:121:59 |
+| jca/KeyExchange.java:121:49:121:59 | EllipticCurve | Name | secp256r1 | jca/KeyExchange.java:121:49:121:59 | jca/KeyExchange.java:121:49:121:59 |
+| jca/KeyExchange.java:121:49:121:59 | EllipticCurve | ParsedName | secp256r1 | jca/KeyExchange.java:121:49:121:59 | jca/KeyExchange.java:121:49:121:59 |
+| jca/KeyExchange.java:121:49:121:59 | EllipticCurve | RawName | secp256r1 | jca/KeyExchange.java:121:49:121:59 | jca/KeyExchange.java:121:49:121:59 |
+| jca/KeyExchange.java:122:16:122:38 | Key | KeyType | Asymmetric | jca/KeyExchange.java:122:16:122:38 | jca/KeyExchange.java:122:16:122:38 |
+| jca/KeyExchange.java:136:52:136:57 | KeyAgreementAlgorithm | Name | ECDH | jca/KeyExchange.java:136:52:136:57 | jca/KeyExchange.java:136:52:136:57 |
+| jca/KeyExchange.java:136:52:136:57 | KeyAgreementAlgorithm | RawName | ECDH | jca/KeyExchange.java:136:52:136:57 | jca/KeyExchange.java:136:52:136:57 |
+| jca/KeyExchange.java:137:17:137:26 | Key | KeyType | Unknown | jca/KeyExchange.java:137:17:137:26 | jca/KeyExchange.java:137:17:137:26 |
+| jca/KeyExchange.java:138:20:138:28 | Key | KeyType | Unknown | jca/KeyExchange.java:138:20:138:28 | jca/KeyExchange.java:138:20:138:28 |
+| jca/KeyExchange.java:156:61:156:68 | KeyAgreementAlgorithm | Name | X25519 | jca/KeyExchange.java:156:61:156:68 | jca/KeyExchange.java:156:61:156:68 |
+| jca/KeyExchange.java:156:61:156:68 | KeyAgreementAlgorithm | RawName | X25519 | jca/KeyExchange.java:156:61:156:68 | jca/KeyExchange.java:156:61:156:68 |
+| jca/KeyExchange.java:158:24:158:26 | Constant | Description | 255 | jca/KeyExchange.java:158:24:158:26 | jca/KeyExchange.java:158:24:158:26 |
+| jca/KeyExchange.java:159:16:159:36 | Key | KeyType | Asymmetric | jca/KeyExchange.java:159:16:159:36 | jca/KeyExchange.java:159:16:159:36 |
+| jca/KeyExchange.java:173:52:173:59 | KeyAgreementAlgorithm | Name | X25519 | jca/KeyExchange.java:173:52:173:59 | jca/KeyExchange.java:173:52:173:59 |
+| jca/KeyExchange.java:173:52:173:59 | KeyAgreementAlgorithm | RawName | X25519 | jca/KeyExchange.java:173:52:173:59 | jca/KeyExchange.java:173:52:173:59 |
+| jca/KeyExchange.java:174:17:174:26 | Key | KeyType | Unknown | jca/KeyExchange.java:174:17:174:26 | jca/KeyExchange.java:174:17:174:26 |
+| jca/KeyExchange.java:175:20:175:28 | Key | KeyType | Unknown | jca/KeyExchange.java:175:20:175:28 | jca/KeyExchange.java:175:20:175:28 |
+| jca/KeyExchange.java:193:61:193:66 | KeyAgreementAlgorithm | Name | X448 | jca/KeyExchange.java:193:61:193:66 | jca/KeyExchange.java:193:61:193:66 |
+| jca/KeyExchange.java:193:61:193:66 | KeyAgreementAlgorithm | RawName | X448 | jca/KeyExchange.java:193:61:193:66 | jca/KeyExchange.java:193:61:193:66 |
+| jca/KeyExchange.java:195:24:195:26 | Constant | Description | 448 | jca/KeyExchange.java:195:24:195:26 | jca/KeyExchange.java:195:24:195:26 |
+| jca/KeyExchange.java:196:16:196:36 | Key | KeyType | Asymmetric | jca/KeyExchange.java:196:16:196:36 | jca/KeyExchange.java:196:16:196:36 |
+| jca/KeyExchange.java:210:52:210:57 | KeyAgreementAlgorithm | Name | X448 | jca/KeyExchange.java:210:52:210:57 | jca/KeyExchange.java:210:52:210:57 |
+| jca/KeyExchange.java:210:52:210:57 | KeyAgreementAlgorithm | RawName | X448 | jca/KeyExchange.java:210:52:210:57 | jca/KeyExchange.java:210:52:210:57 |
+| jca/KeyExchange.java:211:17:211:26 | Key | KeyType | Unknown | jca/KeyExchange.java:211:17:211:26 | jca/KeyExchange.java:211:17:211:26 |
+| jca/KeyExchange.java:212:20:212:28 | Key | KeyType | Unknown | jca/KeyExchange.java:212:20:212:28 | jca/KeyExchange.java:212:20:212:28 |
+| jca/MACOperation.java:59:36:59:49 | Parameter | Description | message | jca/MACOperation.java:59:36:59:49 | jca/MACOperation.java:59:36:59:49 |
+| jca/MACOperation.java:59:52:59:61 | Parameter | Description | key | jca/MACOperation.java:59:52:59:61 | jca/MACOperation.java:59:52:59:61 |
+| jca/MACOperation.java:60:35:60:46 | HMACAlgorithm | Name | HMAC | jca/MACOperation.java:60:35:60:46 | jca/MACOperation.java:60:35:60:46 |
+| jca/MACOperation.java:60:35:60:46 | HMACAlgorithm | RawName | HmacSHA256 | jca/MACOperation.java:60:35:60:46 | jca/MACOperation.java:60:35:60:46 |
+| jca/MACOperation.java:60:35:60:46 | HashAlgorithm | DigestSize | 256 | jca/MACOperation.java:60:35:60:46 | jca/MACOperation.java:60:35:60:46 |
+| jca/MACOperation.java:60:35:60:46 | HashAlgorithm | Name | SHA2 | jca/MACOperation.java:60:35:60:46 | jca/MACOperation.java:60:35:60:46 |
+| jca/MACOperation.java:60:35:60:46 | HashAlgorithm | RawName | HmacSHA256 | jca/MACOperation.java:60:35:60:46 | jca/MACOperation.java:60:35:60:46 |
+| jca/MACOperation.java:62:18:62:26 | Key | KeyType | Unknown | jca/MACOperation.java:62:18:62:26 | jca/MACOperation.java:62:18:62:26 |
+| jca/MACOperation.java:63:16:63:46 | MACOperation | KeyOperationSubtype | Mac | jca/MACOperation.java:63:16:63:46 | jca/MACOperation.java:63:16:63:46 |
+| jca/MACOperation.java:70:34:70:47 | Parameter | Description | message | jca/MACOperation.java:70:34:70:47 | jca/MACOperation.java:70:34:70:47 |
+| jca/MACOperation.java:70:50:70:59 | Parameter | Description | key | jca/MACOperation.java:70:50:70:59 | jca/MACOperation.java:70:50:70:59 |
+| jca/MACOperation.java:71:35:71:48 | HMACAlgorithm | Name | HMAC | jca/MACOperation.java:71:35:71:48 | jca/MACOperation.java:71:35:71:48 |
+| jca/MACOperation.java:71:35:71:48 | HMACAlgorithm | RawName | HmacSHA3-256 | jca/MACOperation.java:71:35:71:48 | jca/MACOperation.java:71:35:71:48 |
+| jca/MACOperation.java:71:35:71:48 | HashAlgorithm | DigestSize | 256 | jca/MACOperation.java:71:35:71:48 | jca/MACOperation.java:71:35:71:48 |
+| jca/MACOperation.java:71:35:71:48 | HashAlgorithm | Name | SHA3 | jca/MACOperation.java:71:35:71:48 | jca/MACOperation.java:71:35:71:48 |
+| jca/MACOperation.java:71:35:71:48 | HashAlgorithm | RawName | HmacSHA3-256 | jca/MACOperation.java:71:35:71:48 | jca/MACOperation.java:71:35:71:48 |
+| jca/MACOperation.java:73:18:73:26 | Key | KeyType | Unknown | jca/MACOperation.java:73:18:73:26 | jca/MACOperation.java:73:18:73:26 |
+| jca/MACOperation.java:74:16:74:46 | MACOperation | KeyOperationSubtype | Mac | jca/MACOperation.java:74:16:74:46 | jca/MACOperation.java:74:16:74:46 |
+| jca/MACOperation.java:81:34:81:47 | Parameter | Description | message | jca/MACOperation.java:81:34:81:47 | jca/MACOperation.java:81:34:81:47 |
+| jca/MACOperation.java:81:50:81:59 | Parameter | Description | key | jca/MACOperation.java:81:50:81:59 | jca/MACOperation.java:81:50:81:59 |
+| jca/MACOperation.java:82:35:82:44 | KeyOperationAlgorithm | Name | UnknownMac | jca/MACOperation.java:82:35:82:44 | jca/MACOperation.java:82:35:82:44 |
+| jca/MACOperation.java:82:35:82:44 | KeyOperationAlgorithm | RawName | Poly1305 | jca/MACOperation.java:82:35:82:44 | jca/MACOperation.java:82:35:82:44 |
+| jca/MACOperation.java:84:18:84:26 | Key | KeyType | Unknown | jca/MACOperation.java:84:18:84:26 | jca/MACOperation.java:84:18:84:26 |
+| jca/MACOperation.java:85:16:85:46 | MACOperation | KeyOperationSubtype | Mac | jca/MACOperation.java:85:16:85:46 | jca/MACOperation.java:85:16:85:46 |
+| jca/MACOperation.java:92:30:92:43 | Parameter | Description | message | jca/MACOperation.java:92:30:92:43 | jca/MACOperation.java:92:30:92:43 |
+| jca/MACOperation.java:92:46:92:55 | Parameter | Description | key | jca/MACOperation.java:92:46:92:55 | jca/MACOperation.java:92:46:92:55 |
+| jca/MACOperation.java:94:35:94:40 | KeyOperationAlgorithm | Name | UnknownMac | jca/MACOperation.java:94:35:94:40 | jca/MACOperation.java:94:35:94:40 |
+| jca/MACOperation.java:94:35:94:40 | KeyOperationAlgorithm | RawName | GMac | jca/MACOperation.java:94:35:94:40 | jca/MACOperation.java:94:35:94:40 |
+| jca/MACOperation.java:98:18:98:26 | Key | KeyType | Unknown | jca/MACOperation.java:98:18:98:26 | jca/MACOperation.java:98:18:98:26 |
+| jca/MACOperation.java:99:16:99:46 | MACOperation | KeyOperationSubtype | Mac | jca/MACOperation.java:99:16:99:46 | jca/MACOperation.java:99:16:99:46 |
+| jca/MACOperation.java:106:30:106:43 | Parameter | Description | message | jca/MACOperation.java:106:30:106:43 | jca/MACOperation.java:106:30:106:43 |
+| jca/MACOperation.java:106:46:106:55 | Parameter | Description | key | jca/MACOperation.java:106:46:106:55 | jca/MACOperation.java:106:46:106:55 |
+| jca/MACOperation.java:107:35:107:43 | Constant | Description | "KMAC128" | jca/MACOperation.java:107:35:107:43 | jca/MACOperation.java:107:35:107:43 |
+| jca/MACOperation.java:109:18:109:26 | Key | KeyType | Unknown | jca/MACOperation.java:109:18:109:26 | jca/MACOperation.java:109:18:109:26 |
+| jca/MACOperation.java:110:16:110:46 | MACOperation | KeyOperationSubtype | Mac | jca/MACOperation.java:110:16:110:46 | jca/MACOperation.java:110:16:110:46 |
+| jca/MACOperation.java:117:36:117:49 | Parameter | Description | message | jca/MACOperation.java:117:36:117:49 | jca/MACOperation.java:117:36:117:49 |
+| jca/MACOperation.java:117:52:117:61 | Parameter | Description | key | jca/MACOperation.java:117:52:117:61 | jca/MACOperation.java:117:52:117:61 |
+| jca/MACOperation.java:118:35:118:44 | HMACAlgorithm | Name | HMAC | jca/MACOperation.java:118:35:118:44 | jca/MACOperation.java:118:35:118:44 |
+| jca/MACOperation.java:118:35:118:44 | HMACAlgorithm | RawName | HmacSHA1 | jca/MACOperation.java:118:35:118:44 | jca/MACOperation.java:118:35:118:44 |
+| jca/MACOperation.java:118:35:118:44 | HashAlgorithm | DigestSize | 160 | jca/MACOperation.java:118:35:118:44 | jca/MACOperation.java:118:35:118:44 |
+| jca/MACOperation.java:118:35:118:44 | HashAlgorithm | Name | SHA1 | jca/MACOperation.java:118:35:118:44 | jca/MACOperation.java:118:35:118:44 |
+| jca/MACOperation.java:118:35:118:44 | HashAlgorithm | RawName | HmacSHA1 | jca/MACOperation.java:118:35:118:44 | jca/MACOperation.java:118:35:118:44 |
+| jca/MACOperation.java:120:18:120:26 | Key | KeyType | Unknown | jca/MACOperation.java:120:18:120:26 | jca/MACOperation.java:120:18:120:26 |
+| jca/MACOperation.java:121:16:121:46 | MACOperation | KeyOperationSubtype | Mac | jca/MACOperation.java:121:16:121:46 | jca/MACOperation.java:121:16:121:46 |
+| jca/MACOperation.java:133:34:133:49 | Parameter | Description | macOutput | jca/MACOperation.java:133:34:133:49 | jca/MACOperation.java:133:34:133:49 |
+| jca/MACOperation.java:136:44:136:62 | KeyOperationAlgorithm | Name | AES | jca/MACOperation.java:136:44:136:62 | jca/MACOperation.java:136:44:136:62 |
+| jca/MACOperation.java:136:44:136:62 | KeyOperationAlgorithm | RawName | AES/GCM/NoPadding | jca/MACOperation.java:136:44:136:62 | jca/MACOperation.java:136:44:136:62 |
+| jca/MACOperation.java:136:44:136:62 | KeyOperationAlgorithm | Structure | Block | jca/MACOperation.java:136:44:136:62 | jca/MACOperation.java:136:44:136:62 |
+| jca/MACOperation.java:136:44:136:62 | ModeOfOperation | Name | GCM | jca/MACOperation.java:136:44:136:62 | jca/MACOperation.java:136:44:136:62 |
+| jca/MACOperation.java:136:44:136:62 | ModeOfOperation | RawName | GCM | jca/MACOperation.java:136:44:136:62 | jca/MACOperation.java:136:44:136:62 |
+| jca/MACOperation.java:136:44:136:62 | PaddingAlgorithm | Name | UnknownPadding | jca/MACOperation.java:136:44:136:62 | jca/MACOperation.java:136:44:136:62 |
+| jca/MACOperation.java:136:44:136:62 | PaddingAlgorithm | RawName | NoPadding | jca/MACOperation.java:136:44:136:62 | jca/MACOperation.java:136:44:136:62 |
+| jca/MACOperation.java:137:42:137:44 | Key | KeyType | Unknown | jca/MACOperation.java:137:42:137:44 | jca/MACOperation.java:137:42:137:44 |
+| jca/MACOperation.java:138:32:138:74 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/MACOperation.java:138:32:138:74 | jca/MACOperation.java:138:32:138:74 |
+| jca/MACOperation.java:138:47:138:62 | Constant | Description | "Sensitive Data" | jca/MACOperation.java:138:47:138:62 | jca/MACOperation.java:138:47:138:62 |
+| jca/MACOperation.java:150:36:150:51 | Parameter | Description | macOutput | jca/MACOperation.java:150:36:150:51 | jca/MACOperation.java:150:36:150:51 |
+| jca/MACOperation.java:166:47:166:62 | Parameter | Description | macOutput | jca/MACOperation.java:166:47:166:62 | jca/MACOperation.java:166:47:166:62 |
+| jca/MACOperation.java:170:77:170:81 | Constant | Description | 10000 | jca/MACOperation.java:170:77:170:81 | jca/MACOperation.java:170:77:170:81 |
+| jca/MACOperation.java:170:84:170:86 | Constant | Description | 256 | jca/MACOperation.java:170:84:170:86 | jca/MACOperation.java:170:84:170:86 |
+| jca/MACOperation.java:171:65:171:86 | HMACAlgorithm | Name | HMAC | jca/MACOperation.java:171:65:171:86 | jca/MACOperation.java:171:65:171:86 |
+| jca/MACOperation.java:171:65:171:86 | HMACAlgorithm | RawName | PBKDF2WithHmacSHA256 | jca/MACOperation.java:171:65:171:86 | jca/MACOperation.java:171:65:171:86 |
+| jca/MACOperation.java:171:65:171:86 | HashAlgorithm | DigestSize | 256 | jca/MACOperation.java:171:65:171:86 | jca/MACOperation.java:171:65:171:86 |
+| jca/MACOperation.java:171:65:171:86 | HashAlgorithm | Name | SHA2 | jca/MACOperation.java:171:65:171:86 | jca/MACOperation.java:171:65:171:86 |
+| jca/MACOperation.java:171:65:171:86 | HashAlgorithm | RawName | PBKDF2WithHmacSHA256 | jca/MACOperation.java:171:65:171:86 | jca/MACOperation.java:171:65:171:86 |
+| jca/MACOperation.java:171:65:171:86 | KeyDerivationAlgorithm | Name | PBKDF2WithHmacSHA256 | jca/MACOperation.java:171:65:171:86 | jca/MACOperation.java:171:65:171:86 |
+| jca/MACOperation.java:171:65:171:86 | KeyDerivationAlgorithm | RawName | PBKDF2WithHmacSHA256 | jca/MACOperation.java:171:65:171:86 | jca/MACOperation.java:171:65:171:86 |
+| jca/MACOperation.java:172:30:172:57 | Key | KeyType | Symmetric | jca/MACOperation.java:172:30:172:57 | jca/MACOperation.java:172:30:172:57 |
+| jca/MACOperation.java:172:30:172:57 | KeyDerivation | Iterations | Constant:10000 | jca/MACOperation.java:170:77:170:81 | jca/MACOperation.java:170:77:170:81 |
+| jca/MACOperation.java:172:30:172:57 | KeyDerivation | KeySize | Constant:256 | jca/MACOperation.java:170:84:170:86 | jca/MACOperation.java:170:84:170:86 |
+| jca/MACOperation.java:180:44:180:62 | KeyOperationAlgorithm | Name | AES | jca/MACOperation.java:180:44:180:62 | jca/MACOperation.java:180:44:180:62 |
+| jca/MACOperation.java:180:44:180:62 | KeyOperationAlgorithm | RawName | AES/GCM/NoPadding | jca/MACOperation.java:180:44:180:62 | jca/MACOperation.java:180:44:180:62 |
+| jca/MACOperation.java:180:44:180:62 | KeyOperationAlgorithm | Structure | Block | jca/MACOperation.java:180:44:180:62 | jca/MACOperation.java:180:44:180:62 |
+| jca/MACOperation.java:180:44:180:62 | ModeOfOperation | Name | GCM | jca/MACOperation.java:180:44:180:62 | jca/MACOperation.java:180:44:180:62 |
+| jca/MACOperation.java:180:44:180:62 | ModeOfOperation | RawName | GCM | jca/MACOperation.java:180:44:180:62 | jca/MACOperation.java:180:44:180:62 |
+| jca/MACOperation.java:180:44:180:62 | PaddingAlgorithm | Name | UnknownPadding | jca/MACOperation.java:180:44:180:62 | jca/MACOperation.java:180:44:180:62 |
+| jca/MACOperation.java:180:44:180:62 | PaddingAlgorithm | RawName | NoPadding | jca/MACOperation.java:180:44:180:62 | jca/MACOperation.java:180:44:180:62 |
+| jca/MACOperation.java:181:42:181:54 | Key | KeyType | Unknown | jca/MACOperation.java:181:42:181:54 | jca/MACOperation.java:181:42:181:54 |
+| jca/MACOperation.java:182:29:182:78 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/MACOperation.java:182:29:182:78 | jca/MACOperation.java:182:29:182:78 |
+| jca/MACOperation.java:182:44:182:66 | Constant | Description | "Further Use Test Data" | jca/MACOperation.java:182:44:182:66 | jca/MACOperation.java:182:44:182:66 |
+| jca/MACOperation.java:185:35:185:46 | HMACAlgorithm | Name | HMAC | jca/MACOperation.java:185:35:185:46 | jca/MACOperation.java:185:35:185:46 |
+| jca/MACOperation.java:185:35:185:46 | HMACAlgorithm | RawName | HmacSHA256 | jca/MACOperation.java:185:35:185:46 | jca/MACOperation.java:185:35:185:46 |
+| jca/MACOperation.java:185:35:185:46 | HashAlgorithm | DigestSize | 256 | jca/MACOperation.java:185:35:185:46 | jca/MACOperation.java:185:35:185:46 |
+| jca/MACOperation.java:185:35:185:46 | HashAlgorithm | Name | SHA2 | jca/MACOperation.java:185:35:185:46 | jca/MACOperation.java:185:35:185:46 |
+| jca/MACOperation.java:185:35:185:46 | HashAlgorithm | RawName | HmacSHA256 | jca/MACOperation.java:185:35:185:46 | jca/MACOperation.java:185:35:185:46 |
+| jca/MACOperation.java:186:18:186:30 | Key | KeyType | Unknown | jca/MACOperation.java:186:18:186:30 | jca/MACOperation.java:186:18:186:30 |
+| jca/MACOperation.java:187:30:187:52 | MACOperation | KeyOperationSubtype | Mac | jca/MACOperation.java:187:30:187:52 | jca/MACOperation.java:187:30:187:52 |
+| jca/MACOperation.java:216:44:216:62 | KeyOperationAlgorithm | Name | AES | jca/MACOperation.java:216:44:216:62 | jca/MACOperation.java:216:44:216:62 |
+| jca/MACOperation.java:216:44:216:62 | KeyOperationAlgorithm | RawName | AES/GCM/NoPadding | jca/MACOperation.java:216:44:216:62 | jca/MACOperation.java:216:44:216:62 |
+| jca/MACOperation.java:216:44:216:62 | KeyOperationAlgorithm | Structure | Block | jca/MACOperation.java:216:44:216:62 | jca/MACOperation.java:216:44:216:62 |
+| jca/MACOperation.java:216:44:216:62 | ModeOfOperation | Name | GCM | jca/MACOperation.java:216:44:216:62 | jca/MACOperation.java:216:44:216:62 |
+| jca/MACOperation.java:216:44:216:62 | ModeOfOperation | RawName | GCM | jca/MACOperation.java:216:44:216:62 | jca/MACOperation.java:216:44:216:62 |
+| jca/MACOperation.java:216:44:216:62 | PaddingAlgorithm | Name | UnknownPadding | jca/MACOperation.java:216:44:216:62 | jca/MACOperation.java:216:44:216:62 |
+| jca/MACOperation.java:216:44:216:62 | PaddingAlgorithm | RawName | NoPadding | jca/MACOperation.java:216:44:216:62 | jca/MACOperation.java:216:44:216:62 |
+| jca/MACOperation.java:218:42:218:44 | Key | KeyType | Unknown | jca/MACOperation.java:218:42:218:44 | jca/MACOperation.java:218:42:218:44 |
+| jca/MACOperation.java:219:32:219:51 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/MACOperation.java:219:32:219:51 | jca/MACOperation.java:219:32:219:51 |
+| jca/MACOperation.java:232:56:232:60 | KeyOperationAlgorithm | KeySize | Constant:256 | jca/MACOperation.java:233:21:233:23 | jca/MACOperation.java:233:21:233:23 |
+| jca/MACOperation.java:232:56:232:60 | KeyOperationAlgorithm | Name | AES | jca/MACOperation.java:232:56:232:60 | jca/MACOperation.java:232:56:232:60 |
+| jca/MACOperation.java:232:56:232:60 | KeyOperationAlgorithm | RawName | AES | jca/MACOperation.java:232:56:232:60 | jca/MACOperation.java:232:56:232:60 |
+| jca/MACOperation.java:232:56:232:60 | KeyOperationAlgorithm | Structure | Block | jca/MACOperation.java:232:56:232:60 | jca/MACOperation.java:232:56:232:60 |
+| jca/MACOperation.java:233:21:233:23 | Constant | Description | 256 | jca/MACOperation.java:233:21:233:23 | jca/MACOperation.java:233:21:233:23 |
+| jca/MACOperation.java:234:16:234:35 | Key | KeyType | Symmetric | jca/MACOperation.java:234:16:234:35 | jca/MACOperation.java:234:16:234:35 |
+| jca/MACOperation.java:246:38:246:41 | RandomNumberGeneration | Description | java.security.SecureRandom | jca/MACOperation.java:246:38:246:41 | jca/MACOperation.java:246:38:246:41 |
+| jca/Nonce.java:24:35:24:46 | HMACAlgorithm | Name | HMAC | jca/Nonce.java:24:35:24:46 | jca/Nonce.java:24:35:24:46 |
+| jca/Nonce.java:24:35:24:46 | HMACAlgorithm | RawName | HmacSHA256 | jca/Nonce.java:24:35:24:46 | jca/Nonce.java:24:35:24:46 |
+| jca/Nonce.java:24:35:24:46 | HashAlgorithm | DigestSize | 256 | jca/Nonce.java:24:35:24:46 | jca/Nonce.java:24:35:24:46 |
+| jca/Nonce.java:24:35:24:46 | HashAlgorithm | Name | SHA2 | jca/Nonce.java:24:35:24:46 | jca/Nonce.java:24:35:24:46 |
+| jca/Nonce.java:24:35:24:46 | HashAlgorithm | RawName | HmacSHA256 | jca/Nonce.java:24:35:24:46 | jca/Nonce.java:24:35:24:46 |
+| jca/Nonce.java:25:18:25:20 | Key | KeyType | Unknown | jca/Nonce.java:25:18:25:20 | jca/Nonce.java:25:18:25:20 |
+| jca/Nonce.java:27:28:27:69 | MACOperation | KeyOperationSubtype | Mac | jca/Nonce.java:27:28:27:69 | jca/Nonce.java:27:28:27:69 |
+| jca/Nonce.java:27:40:27:57 | Constant | Description | "Simple Test Data" | jca/Nonce.java:27:40:27:57 | jca/Nonce.java:27:40:27:57 |
+| jca/Nonce.java:35:24:35:41 | Constant | Description | "BADNONCEBADNONCE" | jca/Nonce.java:35:24:35:41 | jca/Nonce.java:35:24:35:41 |
+| jca/Nonce.java:37:35:37:46 | HMACAlgorithm | Name | HMAC | jca/Nonce.java:37:35:37:46 | jca/Nonce.java:37:35:37:46 |
+| jca/Nonce.java:37:35:37:46 | HMACAlgorithm | RawName | HmacSHA256 | jca/Nonce.java:37:35:37:46 | jca/Nonce.java:37:35:37:46 |
+| jca/Nonce.java:37:35:37:46 | HashAlgorithm | DigestSize | 256 | jca/Nonce.java:37:35:37:46 | jca/Nonce.java:37:35:37:46 |
+| jca/Nonce.java:37:35:37:46 | HashAlgorithm | Name | SHA2 | jca/Nonce.java:37:35:37:46 | jca/Nonce.java:37:35:37:46 |
+| jca/Nonce.java:37:35:37:46 | HashAlgorithm | RawName | HmacSHA256 | jca/Nonce.java:37:35:37:46 | jca/Nonce.java:37:35:37:46 |
+| jca/Nonce.java:38:18:38:20 | Key | KeyType | Unknown | jca/Nonce.java:38:18:38:20 | jca/Nonce.java:38:18:38:20 |
+| jca/Nonce.java:40:28:40:67 | MACOperation | KeyOperationSubtype | Mac | jca/Nonce.java:40:28:40:67 | jca/Nonce.java:40:28:40:67 |
+| jca/Nonce.java:40:40:40:55 | Constant | Description | "Sensitive Data" | jca/Nonce.java:40:40:40:55 | jca/Nonce.java:40:40:40:55 |
+| jca/Nonce.java:47:39:47:51 | Parameter | Description | key | jca/Nonce.java:47:39:47:51 | jca/Nonce.java:47:39:47:51 |
+| jca/Nonce.java:47:54:47:69 | Parameter | Description | plaintext | jca/Nonce.java:47:54:47:69 | jca/Nonce.java:47:54:47:69 |
+| jca/Nonce.java:50:44:50:62 | KeyOperationAlgorithm | Name | AES | jca/Nonce.java:50:44:50:62 | jca/Nonce.java:50:44:50:62 |
+| jca/Nonce.java:50:44:50:62 | KeyOperationAlgorithm | RawName | AES/GCM/NoPadding | jca/Nonce.java:50:44:50:62 | jca/Nonce.java:50:44:50:62 |
+| jca/Nonce.java:50:44:50:62 | KeyOperationAlgorithm | Structure | Block | jca/Nonce.java:50:44:50:62 | jca/Nonce.java:50:44:50:62 |
+| jca/Nonce.java:50:44:50:62 | ModeOfOperation | Name | GCM | jca/Nonce.java:50:44:50:62 | jca/Nonce.java:50:44:50:62 |
+| jca/Nonce.java:50:44:50:62 | ModeOfOperation | RawName | GCM | jca/Nonce.java:50:44:50:62 | jca/Nonce.java:50:44:50:62 |
+| jca/Nonce.java:50:44:50:62 | PaddingAlgorithm | Name | UnknownPadding | jca/Nonce.java:50:44:50:62 | jca/Nonce.java:50:44:50:62 |
+| jca/Nonce.java:50:44:50:62 | PaddingAlgorithm | RawName | NoPadding | jca/Nonce.java:50:44:50:62 | jca/Nonce.java:50:44:50:62 |
+| jca/Nonce.java:51:42:51:44 | Key | KeyType | Unknown | jca/Nonce.java:51:42:51:44 | jca/Nonce.java:51:42:51:44 |
+| jca/Nonce.java:52:29:52:53 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/Nonce.java:52:29:52:53 | jca/Nonce.java:52:29:52:53 |
+| jca/Nonce.java:58:37:58:49 | Parameter | Description | key | jca/Nonce.java:58:37:58:49 | jca/Nonce.java:58:37:58:49 |
+| jca/Nonce.java:58:52:58:67 | Parameter | Description | plaintext | jca/Nonce.java:58:52:58:67 | jca/Nonce.java:58:52:58:67 |
+| jca/Nonce.java:61:44:61:62 | KeyOperationAlgorithm | Name | AES | jca/Nonce.java:61:44:61:62 | jca/Nonce.java:61:44:61:62 |
+| jca/Nonce.java:61:44:61:62 | KeyOperationAlgorithm | RawName | AES/GCM/NoPadding | jca/Nonce.java:61:44:61:62 | jca/Nonce.java:61:44:61:62 |
+| jca/Nonce.java:61:44:61:62 | KeyOperationAlgorithm | Structure | Block | jca/Nonce.java:61:44:61:62 | jca/Nonce.java:61:44:61:62 |
+| jca/Nonce.java:61:44:61:62 | ModeOfOperation | Name | GCM | jca/Nonce.java:61:44:61:62 | jca/Nonce.java:61:44:61:62 |
+| jca/Nonce.java:61:44:61:62 | ModeOfOperation | RawName | GCM | jca/Nonce.java:61:44:61:62 | jca/Nonce.java:61:44:61:62 |
+| jca/Nonce.java:61:44:61:62 | PaddingAlgorithm | Name | UnknownPadding | jca/Nonce.java:61:44:61:62 | jca/Nonce.java:61:44:61:62 |
+| jca/Nonce.java:61:44:61:62 | PaddingAlgorithm | RawName | NoPadding | jca/Nonce.java:61:44:61:62 | jca/Nonce.java:61:44:61:62 |
+| jca/Nonce.java:62:42:62:44 | Key | KeyType | Unknown | jca/Nonce.java:62:42:62:44 | jca/Nonce.java:62:42:62:44 |
+| jca/Nonce.java:63:29:63:53 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/Nonce.java:63:29:63:53 | jca/Nonce.java:63:29:63:53 |
+| jca/Nonce.java:70:53:70:64 | HMACAlgorithm | Name | HMAC | jca/Nonce.java:70:53:70:64 | jca/Nonce.java:70:53:70:64 |
+| jca/Nonce.java:70:53:70:64 | HMACAlgorithm | RawName | HmacSHA256 | jca/Nonce.java:70:53:70:64 | jca/Nonce.java:70:53:70:64 |
+| jca/Nonce.java:70:53:70:64 | HashAlgorithm | DigestSize | 256 | jca/Nonce.java:70:53:70:64 | jca/Nonce.java:70:53:70:64 |
+| jca/Nonce.java:70:53:70:64 | HashAlgorithm | Name | SHA2 | jca/Nonce.java:70:53:70:64 | jca/Nonce.java:70:53:70:64 |
+| jca/Nonce.java:70:53:70:64 | HashAlgorithm | RawName | HmacSHA256 | jca/Nonce.java:70:53:70:64 | jca/Nonce.java:70:53:70:64 |
+| jca/Nonce.java:78:18:78:20 | Key | KeyType | Unknown | jca/Nonce.java:78:18:78:20 | jca/Nonce.java:78:18:78:20 |
+| jca/Nonce.java:80:28:80:67 | MACOperation | KeyOperationSubtype | Mac | jca/Nonce.java:80:28:80:67 | jca/Nonce.java:80:28:80:67 |
+| jca/Nonce.java:80:40:80:55 | Constant | Description | "Sensitive Data" | jca/Nonce.java:80:40:80:55 | jca/Nonce.java:80:40:80:55 |
+| jca/Nonce.java:92:56:92:67 | Constant | Description | "HmacSHA256" | jca/Nonce.java:92:56:92:67 | jca/Nonce.java:92:56:92:67 |
+| jca/Nonce.java:93:16:93:35 | Key | KeyType | Symmetric | jca/Nonce.java:93:16:93:35 | jca/Nonce.java:93:16:93:35 |
+| jca/Nonce.java:98:38:98:42 | RandomNumberGeneration | Description | java.security.SecureRandom | jca/Nonce.java:98:38:98:42 | jca/Nonce.java:98:38:98:42 |
+| jca/Nonce.java:104:32:104:36 | RandomNumberGeneration | Description | java.util.Random | jca/Nonce.java:104:32:104:36 | jca/Nonce.java:104:32:104:36 |
+| jca/Nonce.java:112:16:112:33 | Constant | Description | "BADNONCEBADNONCE" | jca/Nonce.java:112:16:112:33 | jca/Nonce.java:112:16:112:33 |
+| jca/PrngTest.java:152:56:152:60 | KeyOperationAlgorithm | KeySize | Constant:256 | jca/PrngTest.java:153:21:153:23 | jca/PrngTest.java:153:21:153:23 |
+| jca/PrngTest.java:152:56:152:60 | KeyOperationAlgorithm | Name | AES | jca/PrngTest.java:152:56:152:60 | jca/PrngTest.java:152:56:152:60 |
+| jca/PrngTest.java:152:56:152:60 | KeyOperationAlgorithm | RawName | AES | jca/PrngTest.java:152:56:152:60 | jca/PrngTest.java:152:56:152:60 |
+| jca/PrngTest.java:152:56:152:60 | KeyOperationAlgorithm | Structure | Block | jca/PrngTest.java:152:56:152:60 | jca/PrngTest.java:152:56:152:60 |
+| jca/PrngTest.java:153:21:153:23 | Constant | Description | 256 | jca/PrngTest.java:153:21:153:23 | jca/PrngTest.java:153:21:153:23 |
+| jca/PrngTest.java:154:16:154:35 | Key | KeyType | Symmetric | jca/PrngTest.java:154:16:154:35 | jca/PrngTest.java:154:16:154:35 |
+| jca/SignEncryptCombinations.java:52:49:52:59 | EllipticCurve | CurveType | SEC | jca/SignEncryptCombinations.java:52:49:52:59 | jca/SignEncryptCombinations.java:52:49:52:59 |
+| jca/SignEncryptCombinations.java:52:49:52:59 | EllipticCurve | KeySize | 256 | jca/SignEncryptCombinations.java:52:49:52:59 | jca/SignEncryptCombinations.java:52:49:52:59 |
+| jca/SignEncryptCombinations.java:52:49:52:59 | EllipticCurve | Name | secp256r1 | jca/SignEncryptCombinations.java:52:49:52:59 | jca/SignEncryptCombinations.java:52:49:52:59 |
+| jca/SignEncryptCombinations.java:52:49:52:59 | EllipticCurve | ParsedName | secp256r1 | jca/SignEncryptCombinations.java:52:49:52:59 | jca/SignEncryptCombinations.java:52:49:52:59 |
+| jca/SignEncryptCombinations.java:52:49:52:59 | EllipticCurve | RawName | secp256r1 | jca/SignEncryptCombinations.java:52:49:52:59 | jca/SignEncryptCombinations.java:52:49:52:59 |
+| jca/SignEncryptCombinations.java:53:16:53:38 | Key | KeyType | Asymmetric | jca/SignEncryptCombinations.java:53:16:53:38 | jca/SignEncryptCombinations.java:53:16:53:38 |
+| jca/SignEncryptCombinations.java:61:53:61:69 | HashAlgorithm | DigestSize | 256 | jca/SignEncryptCombinations.java:61:53:61:69 | jca/SignEncryptCombinations.java:61:53:61:69 |
+| jca/SignEncryptCombinations.java:61:53:61:69 | HashAlgorithm | Name | SHA2 | jca/SignEncryptCombinations.java:61:53:61:69 | jca/SignEncryptCombinations.java:61:53:61:69 |
+| jca/SignEncryptCombinations.java:61:53:61:69 | HashAlgorithm | RawName | SHA256withECDSA | jca/SignEncryptCombinations.java:61:53:61:69 | jca/SignEncryptCombinations.java:61:53:61:69 |
+| jca/SignEncryptCombinations.java:61:53:61:69 | KeyOperationAlgorithm | Name | ECDSA | jca/SignEncryptCombinations.java:61:53:61:69 | jca/SignEncryptCombinations.java:61:53:61:69 |
+| jca/SignEncryptCombinations.java:61:53:61:69 | KeyOperationAlgorithm | RawName | SHA256withECDSA | jca/SignEncryptCombinations.java:61:53:61:69 | jca/SignEncryptCombinations.java:61:53:61:69 |
+| jca/SignEncryptCombinations.java:62:28:62:34 | Key | KeyType | Unknown | jca/SignEncryptCombinations.java:62:28:62:34 | jca/SignEncryptCombinations.java:62:28:62:34 |
+| jca/SignEncryptCombinations.java:64:16:64:31 | SignOperation | KeyOperationSubtype | Sign | jca/SignEncryptCombinations.java:64:16:64:31 | jca/SignEncryptCombinations.java:64:16:64:31 |
+| jca/SignEncryptCombinations.java:68:53:68:69 | HashAlgorithm | DigestSize | 256 | jca/SignEncryptCombinations.java:68:53:68:69 | jca/SignEncryptCombinations.java:68:53:68:69 |
+| jca/SignEncryptCombinations.java:68:53:68:69 | HashAlgorithm | Name | SHA2 | jca/SignEncryptCombinations.java:68:53:68:69 | jca/SignEncryptCombinations.java:68:53:68:69 |
+| jca/SignEncryptCombinations.java:68:53:68:69 | HashAlgorithm | RawName | SHA256withECDSA | jca/SignEncryptCombinations.java:68:53:68:69 | jca/SignEncryptCombinations.java:68:53:68:69 |
+| jca/SignEncryptCombinations.java:68:53:68:69 | KeyOperationAlgorithm | Name | ECDSA | jca/SignEncryptCombinations.java:68:53:68:69 | jca/SignEncryptCombinations.java:68:53:68:69 |
+| jca/SignEncryptCombinations.java:68:53:68:69 | KeyOperationAlgorithm | RawName | SHA256withECDSA | jca/SignEncryptCombinations.java:68:53:68:69 | jca/SignEncryptCombinations.java:68:53:68:69 |
+| jca/SignEncryptCombinations.java:69:30:69:35 | Key | KeyType | Unknown | jca/SignEncryptCombinations.java:69:30:69:35 | jca/SignEncryptCombinations.java:69:30:69:35 |
+| jca/SignEncryptCombinations.java:71:16:71:47 | VerifyOperation | KeyOperationSubtype | Verify | jca/SignEncryptCombinations.java:71:16:71:47 | jca/SignEncryptCombinations.java:71:16:71:47 |
+| jca/SignEncryptCombinations.java:82:52:82:56 | KeyOperationAlgorithm | KeySize | Constant:256 | jca/SignEncryptCombinations.java:83:17:83:19 | jca/SignEncryptCombinations.java:83:17:83:19 |
+| jca/SignEncryptCombinations.java:82:52:82:56 | KeyOperationAlgorithm | Name | AES | jca/SignEncryptCombinations.java:82:52:82:56 | jca/SignEncryptCombinations.java:82:52:82:56 |
+| jca/SignEncryptCombinations.java:82:52:82:56 | KeyOperationAlgorithm | RawName | AES | jca/SignEncryptCombinations.java:82:52:82:56 | jca/SignEncryptCombinations.java:82:52:82:56 |
+| jca/SignEncryptCombinations.java:82:52:82:56 | KeyOperationAlgorithm | Structure | Block | jca/SignEncryptCombinations.java:82:52:82:56 | jca/SignEncryptCombinations.java:82:52:82:56 |
+| jca/SignEncryptCombinations.java:83:17:83:19 | Constant | Description | 256 | jca/SignEncryptCombinations.java:83:17:83:19 | jca/SignEncryptCombinations.java:83:17:83:19 |
+| jca/SignEncryptCombinations.java:84:16:84:31 | Key | KeyType | Symmetric | jca/SignEncryptCombinations.java:84:16:84:31 | jca/SignEncryptCombinations.java:84:16:84:31 |
+| jca/SignEncryptCombinations.java:92:44:92:62 | KeyOperationAlgorithm | Name | AES | jca/SignEncryptCombinations.java:92:44:92:62 | jca/SignEncryptCombinations.java:92:44:92:62 |
+| jca/SignEncryptCombinations.java:92:44:92:62 | KeyOperationAlgorithm | RawName | AES/GCM/NoPadding | jca/SignEncryptCombinations.java:92:44:92:62 | jca/SignEncryptCombinations.java:92:44:92:62 |
+| jca/SignEncryptCombinations.java:92:44:92:62 | KeyOperationAlgorithm | Structure | Block | jca/SignEncryptCombinations.java:92:44:92:62 | jca/SignEncryptCombinations.java:92:44:92:62 |
+| jca/SignEncryptCombinations.java:92:44:92:62 | ModeOfOperation | Name | GCM | jca/SignEncryptCombinations.java:92:44:92:62 | jca/SignEncryptCombinations.java:92:44:92:62 |
+| jca/SignEncryptCombinations.java:92:44:92:62 | ModeOfOperation | RawName | GCM | jca/SignEncryptCombinations.java:92:44:92:62 | jca/SignEncryptCombinations.java:92:44:92:62 |
+| jca/SignEncryptCombinations.java:92:44:92:62 | PaddingAlgorithm | Name | UnknownPadding | jca/SignEncryptCombinations.java:92:44:92:62 | jca/SignEncryptCombinations.java:92:44:92:62 |
+| jca/SignEncryptCombinations.java:92:44:92:62 | PaddingAlgorithm | RawName | NoPadding | jca/SignEncryptCombinations.java:92:44:92:62 | jca/SignEncryptCombinations.java:92:44:92:62 |
+| jca/SignEncryptCombinations.java:94:26:94:27 | RandomNumberGeneration | Description | java.security.SecureRandom | jca/SignEncryptCombinations.java:94:26:94:27 | jca/SignEncryptCombinations.java:94:26:94:27 |
+| jca/SignEncryptCombinations.java:96:42:96:44 | Key | KeyType | Unknown | jca/SignEncryptCombinations.java:96:42:96:44 | jca/SignEncryptCombinations.java:96:42:96:44 |
+| jca/SignEncryptCombinations.java:97:29:97:53 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/SignEncryptCombinations.java:97:29:97:53 | jca/SignEncryptCombinations.java:97:29:97:53 |
+| jca/SignEncryptCombinations.java:111:44:111:62 | KeyOperationAlgorithm | Name | AES | jca/SignEncryptCombinations.java:111:44:111:62 | jca/SignEncryptCombinations.java:111:44:111:62 |
+| jca/SignEncryptCombinations.java:111:44:111:62 | KeyOperationAlgorithm | RawName | AES/GCM/NoPadding | jca/SignEncryptCombinations.java:111:44:111:62 | jca/SignEncryptCombinations.java:111:44:111:62 |
+| jca/SignEncryptCombinations.java:111:44:111:62 | KeyOperationAlgorithm | Structure | Block | jca/SignEncryptCombinations.java:111:44:111:62 | jca/SignEncryptCombinations.java:111:44:111:62 |
+| jca/SignEncryptCombinations.java:111:44:111:62 | ModeOfOperation | Name | GCM | jca/SignEncryptCombinations.java:111:44:111:62 | jca/SignEncryptCombinations.java:111:44:111:62 |
+| jca/SignEncryptCombinations.java:111:44:111:62 | ModeOfOperation | RawName | GCM | jca/SignEncryptCombinations.java:111:44:111:62 | jca/SignEncryptCombinations.java:111:44:111:62 |
+| jca/SignEncryptCombinations.java:111:44:111:62 | PaddingAlgorithm | Name | UnknownPadding | jca/SignEncryptCombinations.java:111:44:111:62 | jca/SignEncryptCombinations.java:111:44:111:62 |
+| jca/SignEncryptCombinations.java:111:44:111:62 | PaddingAlgorithm | RawName | NoPadding | jca/SignEncryptCombinations.java:111:44:111:62 | jca/SignEncryptCombinations.java:111:44:111:62 |
+| jca/SignEncryptCombinations.java:112:42:112:44 | Key | KeyType | Unknown | jca/SignEncryptCombinations.java:112:42:112:44 | jca/SignEncryptCombinations.java:112:42:112:44 |
+| jca/SignEncryptCombinations.java:113:16:113:41 | DecryptOperation | KeyOperationSubtype | Decrypt | jca/SignEncryptCombinations.java:113:16:113:41 | jca/SignEncryptCombinations.java:113:16:113:41 |
+| jca/SignEncryptCombinations.java:121:35:121:46 | HMACAlgorithm | Name | HMAC | jca/SignEncryptCombinations.java:121:35:121:46 | jca/SignEncryptCombinations.java:121:35:121:46 |
+| jca/SignEncryptCombinations.java:121:35:121:46 | HMACAlgorithm | RawName | HmacSHA256 | jca/SignEncryptCombinations.java:121:35:121:46 | jca/SignEncryptCombinations.java:121:35:121:46 |
+| jca/SignEncryptCombinations.java:121:35:121:46 | HashAlgorithm | DigestSize | 256 | jca/SignEncryptCombinations.java:121:35:121:46 | jca/SignEncryptCombinations.java:121:35:121:46 |
+| jca/SignEncryptCombinations.java:121:35:121:46 | HashAlgorithm | Name | SHA2 | jca/SignEncryptCombinations.java:121:35:121:46 | jca/SignEncryptCombinations.java:121:35:121:46 |
+| jca/SignEncryptCombinations.java:121:35:121:46 | HashAlgorithm | RawName | HmacSHA256 | jca/SignEncryptCombinations.java:121:35:121:46 | jca/SignEncryptCombinations.java:121:35:121:46 |
+| jca/SignEncryptCombinations.java:122:18:122:20 | Key | KeyType | Unknown | jca/SignEncryptCombinations.java:122:18:122:20 | jca/SignEncryptCombinations.java:122:18:122:20 |
+| jca/SignEncryptCombinations.java:123:16:123:32 | MACOperation | KeyOperationSubtype | Mac | jca/SignEncryptCombinations.java:123:16:123:32 | jca/SignEncryptCombinations.java:123:16:123:32 |
+| jca/SignEncryptCombinations.java:335:26:335:47 | Constant | Description | "Hello, combinations!" | jca/SignEncryptCombinations.java:335:26:335:47 | jca/SignEncryptCombinations.java:335:26:335:47 |
+| jca/SignatureOperation.java:52:61:52:65 | KeyOperationAlgorithm | KeySize | Constant:2048 | jca/SignatureOperation.java:53:24:53:27 | jca/SignatureOperation.java:53:24:53:27 |
+| jca/SignatureOperation.java:52:61:52:65 | KeyOperationAlgorithm | Name | RSA | jca/SignatureOperation.java:52:61:52:65 | jca/SignatureOperation.java:52:61:52:65 |
+| jca/SignatureOperation.java:52:61:52:65 | KeyOperationAlgorithm | RawName | RSA | jca/SignatureOperation.java:52:61:52:65 | jca/SignatureOperation.java:52:61:52:65 |
+| jca/SignatureOperation.java:53:24:53:27 | Constant | Description | 2048 | jca/SignatureOperation.java:53:24:53:27 | jca/SignatureOperation.java:53:24:53:27 |
+| jca/SignatureOperation.java:54:16:54:36 | Key | KeyType | Asymmetric | jca/SignatureOperation.java:54:16:54:36 | jca/SignatureOperation.java:54:16:54:36 |
+| jca/SignatureOperation.java:63:53:63:74 | HashAlgorithm | DigestSize | 256 | jca/SignatureOperation.java:63:53:63:74 | jca/SignatureOperation.java:63:53:63:74 |
+| jca/SignatureOperation.java:63:53:63:74 | HashAlgorithm | Name | SHA2 | jca/SignatureOperation.java:63:53:63:74 | jca/SignatureOperation.java:63:53:63:74 |
+| jca/SignatureOperation.java:63:53:63:74 | HashAlgorithm | RawName | SHA256withRSAandMGF1 | jca/SignatureOperation.java:63:53:63:74 | jca/SignatureOperation.java:63:53:63:74 |
+| jca/SignatureOperation.java:63:53:63:74 | KeyOperationAlgorithm | Name | RSA | jca/SignatureOperation.java:63:53:63:74 | jca/SignatureOperation.java:63:53:63:74 |
+| jca/SignatureOperation.java:63:53:63:74 | KeyOperationAlgorithm | RawName | SHA256withRSAandMGF1 | jca/SignatureOperation.java:63:53:63:74 | jca/SignatureOperation.java:63:53:63:74 |
+| jca/SignatureOperation.java:64:28:64:37 | Key | KeyType | Unknown | jca/SignatureOperation.java:64:28:64:37 | jca/SignatureOperation.java:64:28:64:37 |
+| jca/SignatureOperation.java:66:16:66:31 | SignOperation | KeyOperationSubtype | Sign | jca/SignatureOperation.java:66:16:66:31 | jca/SignatureOperation.java:66:16:66:31 |
+| jca/SignatureOperation.java:75:53:75:74 | HashAlgorithm | DigestSize | 256 | jca/SignatureOperation.java:75:53:75:74 | jca/SignatureOperation.java:75:53:75:74 |
+| jca/SignatureOperation.java:75:53:75:74 | HashAlgorithm | Name | SHA2 | jca/SignatureOperation.java:75:53:75:74 | jca/SignatureOperation.java:75:53:75:74 |
+| jca/SignatureOperation.java:75:53:75:74 | HashAlgorithm | RawName | SHA256withRSAandMGF1 | jca/SignatureOperation.java:75:53:75:74 | jca/SignatureOperation.java:75:53:75:74 |
+| jca/SignatureOperation.java:75:53:75:74 | KeyOperationAlgorithm | Name | RSA | jca/SignatureOperation.java:75:53:75:74 | jca/SignatureOperation.java:75:53:75:74 |
+| jca/SignatureOperation.java:75:53:75:74 | KeyOperationAlgorithm | RawName | SHA256withRSAandMGF1 | jca/SignatureOperation.java:75:53:75:74 | jca/SignatureOperation.java:75:53:75:74 |
+| jca/SignatureOperation.java:76:30:76:38 | Key | KeyType | Unknown | jca/SignatureOperation.java:76:30:76:38 | jca/SignatureOperation.java:76:30:76:38 |
+| jca/SignatureOperation.java:78:16:78:41 | VerifyOperation | KeyOperationSubtype | Verify | jca/SignatureOperation.java:78:16:78:41 | jca/SignatureOperation.java:78:16:78:41 |
+| jca/SignatureOperation.java:93:49:93:59 | EllipticCurve | CurveType | SEC | jca/SignatureOperation.java:93:49:93:59 | jca/SignatureOperation.java:93:49:93:59 |
+| jca/SignatureOperation.java:93:49:93:59 | EllipticCurve | KeySize | 256 | jca/SignatureOperation.java:93:49:93:59 | jca/SignatureOperation.java:93:49:93:59 |
+| jca/SignatureOperation.java:93:49:93:59 | EllipticCurve | Name | secp256r1 | jca/SignatureOperation.java:93:49:93:59 | jca/SignatureOperation.java:93:49:93:59 |
+| jca/SignatureOperation.java:93:49:93:59 | EllipticCurve | ParsedName | secp256r1 | jca/SignatureOperation.java:93:49:93:59 | jca/SignatureOperation.java:93:49:93:59 |
+| jca/SignatureOperation.java:93:49:93:59 | EllipticCurve | RawName | secp256r1 | jca/SignatureOperation.java:93:49:93:59 | jca/SignatureOperation.java:93:49:93:59 |
+| jca/SignatureOperation.java:94:16:94:38 | Key | KeyType | Asymmetric | jca/SignatureOperation.java:94:16:94:38 | jca/SignatureOperation.java:94:16:94:38 |
+| jca/SignatureOperation.java:103:53:103:69 | HashAlgorithm | DigestSize | 256 | jca/SignatureOperation.java:103:53:103:69 | jca/SignatureOperation.java:103:53:103:69 |
+| jca/SignatureOperation.java:103:53:103:69 | HashAlgorithm | Name | SHA2 | jca/SignatureOperation.java:103:53:103:69 | jca/SignatureOperation.java:103:53:103:69 |
+| jca/SignatureOperation.java:103:53:103:69 | HashAlgorithm | RawName | SHA256withECDSA | jca/SignatureOperation.java:103:53:103:69 | jca/SignatureOperation.java:103:53:103:69 |
+| jca/SignatureOperation.java:103:53:103:69 | KeyOperationAlgorithm | Name | ECDSA | jca/SignatureOperation.java:103:53:103:69 | jca/SignatureOperation.java:103:53:103:69 |
+| jca/SignatureOperation.java:103:53:103:69 | KeyOperationAlgorithm | RawName | SHA256withECDSA | jca/SignatureOperation.java:103:53:103:69 | jca/SignatureOperation.java:103:53:103:69 |
+| jca/SignatureOperation.java:104:28:104:37 | Key | KeyType | Unknown | jca/SignatureOperation.java:104:28:104:37 | jca/SignatureOperation.java:104:28:104:37 |
+| jca/SignatureOperation.java:106:16:106:31 | SignOperation | KeyOperationSubtype | Sign | jca/SignatureOperation.java:106:16:106:31 | jca/SignatureOperation.java:106:16:106:31 |
+| jca/SignatureOperation.java:115:53:115:69 | HashAlgorithm | DigestSize | 256 | jca/SignatureOperation.java:115:53:115:69 | jca/SignatureOperation.java:115:53:115:69 |
+| jca/SignatureOperation.java:115:53:115:69 | HashAlgorithm | Name | SHA2 | jca/SignatureOperation.java:115:53:115:69 | jca/SignatureOperation.java:115:53:115:69 |
+| jca/SignatureOperation.java:115:53:115:69 | HashAlgorithm | RawName | SHA256withECDSA | jca/SignatureOperation.java:115:53:115:69 | jca/SignatureOperation.java:115:53:115:69 |
+| jca/SignatureOperation.java:115:53:115:69 | KeyOperationAlgorithm | Name | ECDSA | jca/SignatureOperation.java:115:53:115:69 | jca/SignatureOperation.java:115:53:115:69 |
+| jca/SignatureOperation.java:115:53:115:69 | KeyOperationAlgorithm | RawName | SHA256withECDSA | jca/SignatureOperation.java:115:53:115:69 | jca/SignatureOperation.java:115:53:115:69 |
+| jca/SignatureOperation.java:116:30:116:38 | Key | KeyType | Unknown | jca/SignatureOperation.java:116:30:116:38 | jca/SignatureOperation.java:116:30:116:38 |
+| jca/SignatureOperation.java:118:16:118:41 | VerifyOperation | KeyOperationSubtype | Verify | jca/SignatureOperation.java:118:16:118:41 | jca/SignatureOperation.java:118:16:118:41 |
+| jca/SignatureOperation.java:132:61:132:69 | KeyOperationAlgorithm | Name | EDSA | jca/SignatureOperation.java:132:61:132:69 | jca/SignatureOperation.java:132:61:132:69 |
+| jca/SignatureOperation.java:132:61:132:69 | KeyOperationAlgorithm | RawName | Ed25519 | jca/SignatureOperation.java:132:61:132:69 | jca/SignatureOperation.java:132:61:132:69 |
+| jca/SignatureOperation.java:133:16:133:36 | Key | KeyType | Asymmetric | jca/SignatureOperation.java:133:16:133:36 | jca/SignatureOperation.java:133:16:133:36 |
+| jca/SignatureOperation.java:142:53:142:61 | KeyOperationAlgorithm | Name | EDSA | jca/SignatureOperation.java:142:53:142:61 | jca/SignatureOperation.java:142:53:142:61 |
+| jca/SignatureOperation.java:142:53:142:61 | KeyOperationAlgorithm | RawName | Ed25519 | jca/SignatureOperation.java:142:53:142:61 | jca/SignatureOperation.java:142:53:142:61 |
+| jca/SignatureOperation.java:143:28:143:37 | Key | KeyType | Unknown | jca/SignatureOperation.java:143:28:143:37 | jca/SignatureOperation.java:143:28:143:37 |
+| jca/SignatureOperation.java:145:16:145:31 | SignOperation | KeyOperationSubtype | Sign | jca/SignatureOperation.java:145:16:145:31 | jca/SignatureOperation.java:145:16:145:31 |
+| jca/SignatureOperation.java:154:53:154:61 | KeyOperationAlgorithm | Name | EDSA | jca/SignatureOperation.java:154:53:154:61 | jca/SignatureOperation.java:154:53:154:61 |
+| jca/SignatureOperation.java:154:53:154:61 | KeyOperationAlgorithm | RawName | Ed25519 | jca/SignatureOperation.java:154:53:154:61 | jca/SignatureOperation.java:154:53:154:61 |
+| jca/SignatureOperation.java:155:30:155:38 | Key | KeyType | Unknown | jca/SignatureOperation.java:155:30:155:38 | jca/SignatureOperation.java:155:30:155:38 |
+| jca/SignatureOperation.java:157:16:157:41 | VerifyOperation | KeyOperationSubtype | Verify | jca/SignatureOperation.java:157:16:157:41 | jca/SignatureOperation.java:157:16:157:41 |
+| jca/SignatureOperation.java:173:61:173:65 | KeyOperationAlgorithm | KeySize | Constant:1024 | jca/SignatureOperation.java:174:24:174:27 | jca/SignatureOperation.java:174:24:174:27 |
+| jca/SignatureOperation.java:173:61:173:65 | KeyOperationAlgorithm | Name | RSA | jca/SignatureOperation.java:173:61:173:65 | jca/SignatureOperation.java:173:61:173:65 |
+| jca/SignatureOperation.java:173:61:173:65 | KeyOperationAlgorithm | RawName | RSA | jca/SignatureOperation.java:173:61:173:65 | jca/SignatureOperation.java:173:61:173:65 |
+| jca/SignatureOperation.java:174:24:174:27 | Constant | Description | 1024 | jca/SignatureOperation.java:174:24:174:27 | jca/SignatureOperation.java:174:24:174:27 |
+| jca/SignatureOperation.java:175:16:175:36 | Key | KeyType | Asymmetric | jca/SignatureOperation.java:175:16:175:36 | jca/SignatureOperation.java:175:16:175:36 |
+| jca/SignatureOperation.java:185:53:185:65 | HashAlgorithm | DigestSize | 160 | jca/SignatureOperation.java:185:53:185:65 | jca/SignatureOperation.java:185:53:185:65 |
+| jca/SignatureOperation.java:185:53:185:65 | HashAlgorithm | Name | SHA1 | jca/SignatureOperation.java:185:53:185:65 | jca/SignatureOperation.java:185:53:185:65 |
+| jca/SignatureOperation.java:185:53:185:65 | HashAlgorithm | RawName | SHA1withRSA | jca/SignatureOperation.java:185:53:185:65 | jca/SignatureOperation.java:185:53:185:65 |
+| jca/SignatureOperation.java:185:53:185:65 | KeyOperationAlgorithm | Name | RSA | jca/SignatureOperation.java:185:53:185:65 | jca/SignatureOperation.java:185:53:185:65 |
+| jca/SignatureOperation.java:185:53:185:65 | KeyOperationAlgorithm | RawName | SHA1withRSA | jca/SignatureOperation.java:185:53:185:65 | jca/SignatureOperation.java:185:53:185:65 |
+| jca/SignatureOperation.java:186:28:186:37 | Key | KeyType | Unknown | jca/SignatureOperation.java:186:28:186:37 | jca/SignatureOperation.java:186:28:186:37 |
+| jca/SignatureOperation.java:188:16:188:31 | SignOperation | KeyOperationSubtype | Sign | jca/SignatureOperation.java:188:16:188:31 | jca/SignatureOperation.java:188:16:188:31 |
+| jca/SignatureOperation.java:198:53:198:65 | HashAlgorithm | DigestSize | 160 | jca/SignatureOperation.java:198:53:198:65 | jca/SignatureOperation.java:198:53:198:65 |
+| jca/SignatureOperation.java:198:53:198:65 | HashAlgorithm | Name | SHA1 | jca/SignatureOperation.java:198:53:198:65 | jca/SignatureOperation.java:198:53:198:65 |
+| jca/SignatureOperation.java:198:53:198:65 | HashAlgorithm | RawName | SHA1withRSA | jca/SignatureOperation.java:198:53:198:65 | jca/SignatureOperation.java:198:53:198:65 |
+| jca/SignatureOperation.java:198:53:198:65 | KeyOperationAlgorithm | Name | RSA | jca/SignatureOperation.java:198:53:198:65 | jca/SignatureOperation.java:198:53:198:65 |
+| jca/SignatureOperation.java:198:53:198:65 | KeyOperationAlgorithm | RawName | SHA1withRSA | jca/SignatureOperation.java:198:53:198:65 | jca/SignatureOperation.java:198:53:198:65 |
+| jca/SignatureOperation.java:199:30:199:38 | Key | KeyType | Unknown | jca/SignatureOperation.java:199:30:199:38 | jca/SignatureOperation.java:199:30:199:38 |
+| jca/SignatureOperation.java:201:16:201:41 | VerifyOperation | KeyOperationSubtype | Verify | jca/SignatureOperation.java:201:16:201:41 | jca/SignatureOperation.java:201:16:201:41 |
+| jca/SignatureOperation.java:231:26:231:44 | Constant | Description | "Important Message" | jca/SignatureOperation.java:231:26:231:44 | jca/SignatureOperation.java:231:26:231:44 |
+| jca/SignatureOperation.java:236:27:236:30 | Constant | Description | 0x01 | jca/SignatureOperation.java:236:27:236:30 | jca/SignatureOperation.java:236:27:236:30 |
+| jca/SignatureOperation.java:266:47:266:68 | HashAlgorithm | DigestSize | 256 | jca/SignatureOperation.java:266:47:266:68 | jca/SignatureOperation.java:266:47:266:68 |
+| jca/SignatureOperation.java:266:47:266:68 | HashAlgorithm | Name | SHA2 | jca/SignatureOperation.java:266:47:266:68 | jca/SignatureOperation.java:266:47:266:68 |
+| jca/SignatureOperation.java:266:47:266:68 | HashAlgorithm | RawName | SHA256withRSAandMGF1 | jca/SignatureOperation.java:266:47:266:68 | jca/SignatureOperation.java:266:47:266:68 |
+| jca/SignatureOperation.java:266:47:266:68 | KeyOperationAlgorithm | Name | RSA | jca/SignatureOperation.java:266:47:266:68 | jca/SignatureOperation.java:266:47:266:68 |
+| jca/SignatureOperation.java:266:47:266:68 | KeyOperationAlgorithm | RawName | SHA256withRSAandMGF1 | jca/SignatureOperation.java:266:47:266:68 | jca/SignatureOperation.java:266:47:266:68 |
+| jca/SignatureOperation.java:269:47:269:63 | HashAlgorithm | DigestSize | 256 | jca/SignatureOperation.java:269:47:269:63 | jca/SignatureOperation.java:269:47:269:63 |
+| jca/SignatureOperation.java:269:47:269:63 | HashAlgorithm | Name | SHA2 | jca/SignatureOperation.java:269:47:269:63 | jca/SignatureOperation.java:269:47:269:63 |
+| jca/SignatureOperation.java:269:47:269:63 | HashAlgorithm | RawName | SHA256withECDSA | jca/SignatureOperation.java:269:47:269:63 | jca/SignatureOperation.java:269:47:269:63 |
+| jca/SignatureOperation.java:269:47:269:63 | KeyOperationAlgorithm | Name | ECDSA | jca/SignatureOperation.java:269:47:269:63 | jca/SignatureOperation.java:269:47:269:63 |
+| jca/SignatureOperation.java:269:47:269:63 | KeyOperationAlgorithm | RawName | SHA256withECDSA | jca/SignatureOperation.java:269:47:269:63 | jca/SignatureOperation.java:269:47:269:63 |
+| jca/SignatureOperation.java:272:47:272:55 | KeyOperationAlgorithm | Name | EDSA | jca/SignatureOperation.java:272:47:272:55 | jca/SignatureOperation.java:272:47:272:55 |
+| jca/SignatureOperation.java:272:47:272:55 | KeyOperationAlgorithm | RawName | Ed25519 | jca/SignatureOperation.java:272:47:272:55 | jca/SignatureOperation.java:272:47:272:55 |
+| jca/SignatureOperation.java:275:47:275:59 | HashAlgorithm | DigestSize | 160 | jca/SignatureOperation.java:275:47:275:59 | jca/SignatureOperation.java:275:47:275:59 |
+| jca/SignatureOperation.java:275:47:275:59 | HashAlgorithm | Name | SHA1 | jca/SignatureOperation.java:275:47:275:59 | jca/SignatureOperation.java:275:47:275:59 |
+| jca/SignatureOperation.java:275:47:275:59 | HashAlgorithm | RawName | SHA1withRSA | jca/SignatureOperation.java:275:47:275:59 | jca/SignatureOperation.java:275:47:275:59 |
+| jca/SignatureOperation.java:275:47:275:59 | KeyOperationAlgorithm | Name | RSA | jca/SignatureOperation.java:275:47:275:59 | jca/SignatureOperation.java:275:47:275:59 |
+| jca/SignatureOperation.java:275:47:275:59 | KeyOperationAlgorithm | RawName | SHA1withRSA | jca/SignatureOperation.java:275:47:275:59 | jca/SignatureOperation.java:275:47:275:59 |
+| jca/SignatureOperation.java:279:47:279:68 | HashAlgorithm | DigestSize | 256 | jca/SignatureOperation.java:279:47:279:68 | jca/SignatureOperation.java:279:47:279:68 |
+| jca/SignatureOperation.java:279:47:279:68 | HashAlgorithm | Name | SHA2 | jca/SignatureOperation.java:279:47:279:68 | jca/SignatureOperation.java:279:47:279:68 |
+| jca/SignatureOperation.java:279:47:279:68 | HashAlgorithm | RawName | SHA256withRSAandMGF1 | jca/SignatureOperation.java:279:47:279:68 | jca/SignatureOperation.java:279:47:279:68 |
+| jca/SignatureOperation.java:279:47:279:68 | KeyOperationAlgorithm | Name | RSA | jca/SignatureOperation.java:279:47:279:68 | jca/SignatureOperation.java:279:47:279:68 |
+| jca/SignatureOperation.java:279:47:279:68 | KeyOperationAlgorithm | RawName | SHA256withRSAandMGF1 | jca/SignatureOperation.java:279:47:279:68 | jca/SignatureOperation.java:279:47:279:68 |
+| jca/SignatureOperation.java:282:26:282:49 | Constant | Description | "Dynamic Signature Demo" | jca/SignatureOperation.java:282:26:282:49 | jca/SignatureOperation.java:282:26:282:49 |
+| jca/SignatureOperation.java:283:28:283:42 | Key | KeyType | Unknown | jca/SignatureOperation.java:283:28:283:42 | jca/SignatureOperation.java:283:28:283:42 |
+| jca/SignatureOperation.java:285:27:285:42 | SignOperation | KeyOperationSubtype | Sign | jca/SignatureOperation.java:285:27:285:42 | jca/SignatureOperation.java:285:27:285:42 |
+| jca/SignatureOperation.java:287:30:287:43 | Key | KeyType | Unknown | jca/SignatureOperation.java:287:30:287:43 | jca/SignatureOperation.java:287:30:287:43 |
+| jca/SignatureOperation.java:289:28:289:53 | VerifyOperation | KeyOperationSubtype | Verify | jca/SignatureOperation.java:289:28:289:53 | jca/SignatureOperation.java:289:28:289:53 |
+| jca/SignatureOperation.java:311:26:311:49 | Constant | Description | "Hello Signature World!" | jca/SignatureOperation.java:311:26:311:49 | jca/SignatureOperation.java:311:26:311:49 |
+| jca/SymmetricAlgorithm.java:51:44:51:62 | KeyOperationAlgorithm | Name | AES | jca/SymmetricAlgorithm.java:51:44:51:62 | jca/SymmetricAlgorithm.java:51:44:51:62 |
+| jca/SymmetricAlgorithm.java:51:44:51:62 | KeyOperationAlgorithm | RawName | AES/GCM/NoPadding | jca/SymmetricAlgorithm.java:51:44:51:62 | jca/SymmetricAlgorithm.java:51:44:51:62 |
+| jca/SymmetricAlgorithm.java:51:44:51:62 | KeyOperationAlgorithm | Structure | Block | jca/SymmetricAlgorithm.java:51:44:51:62 | jca/SymmetricAlgorithm.java:51:44:51:62 |
+| jca/SymmetricAlgorithm.java:51:44:51:62 | ModeOfOperation | Name | GCM | jca/SymmetricAlgorithm.java:51:44:51:62 | jca/SymmetricAlgorithm.java:51:44:51:62 |
+| jca/SymmetricAlgorithm.java:51:44:51:62 | ModeOfOperation | RawName | GCM | jca/SymmetricAlgorithm.java:51:44:51:62 | jca/SymmetricAlgorithm.java:51:44:51:62 |
+| jca/SymmetricAlgorithm.java:51:44:51:62 | PaddingAlgorithm | Name | UnknownPadding | jca/SymmetricAlgorithm.java:51:44:51:62 | jca/SymmetricAlgorithm.java:51:44:51:62 |
+| jca/SymmetricAlgorithm.java:51:44:51:62 | PaddingAlgorithm | RawName | NoPadding | jca/SymmetricAlgorithm.java:51:44:51:62 | jca/SymmetricAlgorithm.java:51:44:51:62 |
+| jca/SymmetricAlgorithm.java:53:38:53:39 | RandomNumberGeneration | Description | java.security.SecureRandom | jca/SymmetricAlgorithm.java:53:38:53:39 | jca/SymmetricAlgorithm.java:53:38:53:39 |
+| jca/SymmetricAlgorithm.java:55:42:55:44 | Key | KeyType | Unknown | jca/SymmetricAlgorithm.java:55:42:55:44 | jca/SymmetricAlgorithm.java:55:42:55:44 |
+| jca/SymmetricAlgorithm.java:56:29:56:53 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/SymmetricAlgorithm.java:56:29:56:53 | jca/SymmetricAlgorithm.java:56:29:56:53 |
+| jca/SymmetricAlgorithm.java:72:39:72:51 | Parameter | Description | key | jca/SymmetricAlgorithm.java:72:39:72:51 | jca/SymmetricAlgorithm.java:72:39:72:51 |
+| jca/SymmetricAlgorithm.java:72:54:72:69 | Parameter | Description | plaintext | jca/SymmetricAlgorithm.java:72:54:72:69 | jca/SymmetricAlgorithm.java:72:54:72:69 |
+| jca/SymmetricAlgorithm.java:73:44:73:62 | KeyOperationAlgorithm | Name | AES | jca/SymmetricAlgorithm.java:73:44:73:62 | jca/SymmetricAlgorithm.java:73:44:73:62 |
+| jca/SymmetricAlgorithm.java:73:44:73:62 | KeyOperationAlgorithm | RawName | AES/GCM/NoPadding | jca/SymmetricAlgorithm.java:73:44:73:62 | jca/SymmetricAlgorithm.java:73:44:73:62 |
+| jca/SymmetricAlgorithm.java:73:44:73:62 | KeyOperationAlgorithm | Structure | Block | jca/SymmetricAlgorithm.java:73:44:73:62 | jca/SymmetricAlgorithm.java:73:44:73:62 |
+| jca/SymmetricAlgorithm.java:73:44:73:62 | ModeOfOperation | Name | GCM | jca/SymmetricAlgorithm.java:73:44:73:62 | jca/SymmetricAlgorithm.java:73:44:73:62 |
+| jca/SymmetricAlgorithm.java:73:44:73:62 | ModeOfOperation | RawName | GCM | jca/SymmetricAlgorithm.java:73:44:73:62 | jca/SymmetricAlgorithm.java:73:44:73:62 |
+| jca/SymmetricAlgorithm.java:73:44:73:62 | PaddingAlgorithm | Name | UnknownPadding | jca/SymmetricAlgorithm.java:73:44:73:62 | jca/SymmetricAlgorithm.java:73:44:73:62 |
+| jca/SymmetricAlgorithm.java:73:44:73:62 | PaddingAlgorithm | RawName | NoPadding | jca/SymmetricAlgorithm.java:73:44:73:62 | jca/SymmetricAlgorithm.java:73:44:73:62 |
+| jca/SymmetricAlgorithm.java:76:42:76:44 | Key | KeyType | Unknown | jca/SymmetricAlgorithm.java:76:42:76:44 | jca/SymmetricAlgorithm.java:76:42:76:44 |
+| jca/SymmetricAlgorithm.java:77:29:77:53 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/SymmetricAlgorithm.java:77:29:77:53 | jca/SymmetricAlgorithm.java:77:29:77:53 |
+| jca/SymmetricAlgorithm.java:94:44:94:65 | KeyOperationAlgorithm | Name | AES | jca/SymmetricAlgorithm.java:94:44:94:65 | jca/SymmetricAlgorithm.java:94:44:94:65 |
+| jca/SymmetricAlgorithm.java:94:44:94:65 | KeyOperationAlgorithm | RawName | AES/CBC/PKCS5Padding | jca/SymmetricAlgorithm.java:94:44:94:65 | jca/SymmetricAlgorithm.java:94:44:94:65 |
+| jca/SymmetricAlgorithm.java:94:44:94:65 | KeyOperationAlgorithm | Structure | Block | jca/SymmetricAlgorithm.java:94:44:94:65 | jca/SymmetricAlgorithm.java:94:44:94:65 |
+| jca/SymmetricAlgorithm.java:94:44:94:65 | ModeOfOperation | Name | CBC | jca/SymmetricAlgorithm.java:94:44:94:65 | jca/SymmetricAlgorithm.java:94:44:94:65 |
+| jca/SymmetricAlgorithm.java:94:44:94:65 | ModeOfOperation | RawName | CBC | jca/SymmetricAlgorithm.java:94:44:94:65 | jca/SymmetricAlgorithm.java:94:44:94:65 |
+| jca/SymmetricAlgorithm.java:94:44:94:65 | PaddingAlgorithm | Name | PKCS7 | jca/SymmetricAlgorithm.java:94:44:94:65 | jca/SymmetricAlgorithm.java:94:44:94:65 |
+| jca/SymmetricAlgorithm.java:94:44:94:65 | PaddingAlgorithm | RawName | PKCS5Padding | jca/SymmetricAlgorithm.java:94:44:94:65 | jca/SymmetricAlgorithm.java:94:44:94:65 |
+| jca/SymmetricAlgorithm.java:96:38:96:39 | RandomNumberGeneration | Description | java.security.SecureRandom | jca/SymmetricAlgorithm.java:96:38:96:39 | jca/SymmetricAlgorithm.java:96:38:96:39 |
+| jca/SymmetricAlgorithm.java:98:42:98:44 | Key | KeyType | Unknown | jca/SymmetricAlgorithm.java:98:42:98:44 | jca/SymmetricAlgorithm.java:98:42:98:44 |
+| jca/SymmetricAlgorithm.java:99:29:99:53 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/SymmetricAlgorithm.java:99:29:99:53 | jca/SymmetricAlgorithm.java:99:29:99:53 |
+| jca/SymmetricAlgorithm.java:116:44:116:65 | KeyOperationAlgorithm | Name | AES | jca/SymmetricAlgorithm.java:116:44:116:65 | jca/SymmetricAlgorithm.java:116:44:116:65 |
+| jca/SymmetricAlgorithm.java:116:44:116:65 | KeyOperationAlgorithm | RawName | AES/ECB/PKCS5Padding | jca/SymmetricAlgorithm.java:116:44:116:65 | jca/SymmetricAlgorithm.java:116:44:116:65 |
+| jca/SymmetricAlgorithm.java:116:44:116:65 | KeyOperationAlgorithm | Structure | Block | jca/SymmetricAlgorithm.java:116:44:116:65 | jca/SymmetricAlgorithm.java:116:44:116:65 |
+| jca/SymmetricAlgorithm.java:116:44:116:65 | ModeOfOperation | Name | ECB | jca/SymmetricAlgorithm.java:116:44:116:65 | jca/SymmetricAlgorithm.java:116:44:116:65 |
+| jca/SymmetricAlgorithm.java:116:44:116:65 | ModeOfOperation | RawName | ECB | jca/SymmetricAlgorithm.java:116:44:116:65 | jca/SymmetricAlgorithm.java:116:44:116:65 |
+| jca/SymmetricAlgorithm.java:116:44:116:65 | PaddingAlgorithm | Name | PKCS7 | jca/SymmetricAlgorithm.java:116:44:116:65 | jca/SymmetricAlgorithm.java:116:44:116:65 |
+| jca/SymmetricAlgorithm.java:116:44:116:65 | PaddingAlgorithm | RawName | PKCS5Padding | jca/SymmetricAlgorithm.java:116:44:116:65 | jca/SymmetricAlgorithm.java:116:44:116:65 |
+| jca/SymmetricAlgorithm.java:117:42:117:44 | Key | KeyType | Unknown | jca/SymmetricAlgorithm.java:117:42:117:44 | jca/SymmetricAlgorithm.java:117:42:117:44 |
+| jca/SymmetricAlgorithm.java:118:16:118:40 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/SymmetricAlgorithm.java:118:16:118:40 | jca/SymmetricAlgorithm.java:118:16:118:40 |
+| jca/SymmetricAlgorithm.java:131:44:131:48 | KeyOperationAlgorithm | Name | RC4 | jca/SymmetricAlgorithm.java:131:44:131:48 | jca/SymmetricAlgorithm.java:131:44:131:48 |
+| jca/SymmetricAlgorithm.java:131:44:131:48 | KeyOperationAlgorithm | RawName | RC4 | jca/SymmetricAlgorithm.java:131:44:131:48 | jca/SymmetricAlgorithm.java:131:44:131:48 |
+| jca/SymmetricAlgorithm.java:131:44:131:48 | KeyOperationAlgorithm | Structure | Stream | jca/SymmetricAlgorithm.java:131:44:131:48 | jca/SymmetricAlgorithm.java:131:44:131:48 |
+| jca/SymmetricAlgorithm.java:132:42:132:44 | Key | KeyType | Unknown | jca/SymmetricAlgorithm.java:132:42:132:44 | jca/SymmetricAlgorithm.java:132:42:132:44 |
+| jca/SymmetricAlgorithm.java:133:16:133:40 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/SymmetricAlgorithm.java:133:16:133:40 | jca/SymmetricAlgorithm.java:133:16:133:40 |
+| jca/SymmetricAlgorithm.java:145:36:145:48 | Parameter | Description | key | jca/SymmetricAlgorithm.java:145:36:145:48 | jca/SymmetricAlgorithm.java:145:36:145:48 |
+| jca/SymmetricAlgorithm.java:145:51:145:66 | Parameter | Description | plaintext | jca/SymmetricAlgorithm.java:145:51:145:66 | jca/SymmetricAlgorithm.java:145:51:145:66 |
+| jca/SymmetricAlgorithm.java:146:44:146:65 | KeyOperationAlgorithm | KeySize | 56 | jca/SymmetricAlgorithm.java:146:44:146:65 | jca/SymmetricAlgorithm.java:146:44:146:65 |
+| jca/SymmetricAlgorithm.java:146:44:146:65 | KeyOperationAlgorithm | Name | DES | jca/SymmetricAlgorithm.java:146:44:146:65 | jca/SymmetricAlgorithm.java:146:44:146:65 |
+| jca/SymmetricAlgorithm.java:146:44:146:65 | KeyOperationAlgorithm | RawName | DES/CBC/PKCS5Padding | jca/SymmetricAlgorithm.java:146:44:146:65 | jca/SymmetricAlgorithm.java:146:44:146:65 |
+| jca/SymmetricAlgorithm.java:146:44:146:65 | KeyOperationAlgorithm | Structure | Block | jca/SymmetricAlgorithm.java:146:44:146:65 | jca/SymmetricAlgorithm.java:146:44:146:65 |
+| jca/SymmetricAlgorithm.java:146:44:146:65 | ModeOfOperation | Name | CBC | jca/SymmetricAlgorithm.java:146:44:146:65 | jca/SymmetricAlgorithm.java:146:44:146:65 |
+| jca/SymmetricAlgorithm.java:146:44:146:65 | ModeOfOperation | RawName | CBC | jca/SymmetricAlgorithm.java:146:44:146:65 | jca/SymmetricAlgorithm.java:146:44:146:65 |
+| jca/SymmetricAlgorithm.java:146:44:146:65 | PaddingAlgorithm | Name | PKCS7 | jca/SymmetricAlgorithm.java:146:44:146:65 | jca/SymmetricAlgorithm.java:146:44:146:65 |
+| jca/SymmetricAlgorithm.java:146:44:146:65 | PaddingAlgorithm | RawName | PKCS5Padding | jca/SymmetricAlgorithm.java:146:44:146:65 | jca/SymmetricAlgorithm.java:146:44:146:65 |
+| jca/SymmetricAlgorithm.java:148:38:148:39 | RandomNumberGeneration | Description | java.security.SecureRandom | jca/SymmetricAlgorithm.java:148:38:148:39 | jca/SymmetricAlgorithm.java:148:38:148:39 |
+| jca/SymmetricAlgorithm.java:150:42:150:44 | Key | KeyType | Unknown | jca/SymmetricAlgorithm.java:150:42:150:44 | jca/SymmetricAlgorithm.java:150:42:150:44 |
+| jca/SymmetricAlgorithm.java:151:29:151:53 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/SymmetricAlgorithm.java:151:29:151:53 | jca/SymmetricAlgorithm.java:151:29:151:53 |
+| jca/SymmetricAlgorithm.java:167:42:167:54 | Parameter | Description | key | jca/SymmetricAlgorithm.java:167:42:167:54 | jca/SymmetricAlgorithm.java:167:42:167:54 |
+| jca/SymmetricAlgorithm.java:167:57:167:72 | Parameter | Description | plaintext | jca/SymmetricAlgorithm.java:167:57:167:72 | jca/SymmetricAlgorithm.java:167:57:167:72 |
+| jca/SymmetricAlgorithm.java:168:44:168:68 | KeyOperationAlgorithm | KeySize | 56 | jca/SymmetricAlgorithm.java:168:44:168:68 | jca/SymmetricAlgorithm.java:168:44:168:68 |
+| jca/SymmetricAlgorithm.java:168:44:168:68 | KeyOperationAlgorithm | Name | DES | jca/SymmetricAlgorithm.java:168:44:168:68 | jca/SymmetricAlgorithm.java:168:44:168:68 |
+| jca/SymmetricAlgorithm.java:168:44:168:68 | KeyOperationAlgorithm | RawName | DESede/CBC/PKCS5Padding | jca/SymmetricAlgorithm.java:168:44:168:68 | jca/SymmetricAlgorithm.java:168:44:168:68 |
+| jca/SymmetricAlgorithm.java:168:44:168:68 | KeyOperationAlgorithm | Structure | Block | jca/SymmetricAlgorithm.java:168:44:168:68 | jca/SymmetricAlgorithm.java:168:44:168:68 |
+| jca/SymmetricAlgorithm.java:168:44:168:68 | ModeOfOperation | Name | CBC | jca/SymmetricAlgorithm.java:168:44:168:68 | jca/SymmetricAlgorithm.java:168:44:168:68 |
+| jca/SymmetricAlgorithm.java:168:44:168:68 | ModeOfOperation | RawName | CBC | jca/SymmetricAlgorithm.java:168:44:168:68 | jca/SymmetricAlgorithm.java:168:44:168:68 |
+| jca/SymmetricAlgorithm.java:168:44:168:68 | PaddingAlgorithm | Name | PKCS7 | jca/SymmetricAlgorithm.java:168:44:168:68 | jca/SymmetricAlgorithm.java:168:44:168:68 |
+| jca/SymmetricAlgorithm.java:168:44:168:68 | PaddingAlgorithm | RawName | PKCS5Padding | jca/SymmetricAlgorithm.java:168:44:168:68 | jca/SymmetricAlgorithm.java:168:44:168:68 |
+| jca/SymmetricAlgorithm.java:170:38:170:39 | RandomNumberGeneration | Description | java.security.SecureRandom | jca/SymmetricAlgorithm.java:170:38:170:39 | jca/SymmetricAlgorithm.java:170:38:170:39 |
+| jca/SymmetricAlgorithm.java:172:42:172:44 | Key | KeyType | Unknown | jca/SymmetricAlgorithm.java:172:42:172:44 | jca/SymmetricAlgorithm.java:172:42:172:44 |
+| jca/SymmetricAlgorithm.java:173:29:173:53 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/SymmetricAlgorithm.java:173:29:173:53 | jca/SymmetricAlgorithm.java:173:29:173:53 |
+| jca/SymmetricAlgorithm.java:190:44:190:53 | KeyOperationAlgorithm | KeySize | 256 | jca/SymmetricAlgorithm.java:190:44:190:53 | jca/SymmetricAlgorithm.java:190:44:190:53 |
+| jca/SymmetricAlgorithm.java:190:44:190:53 | KeyOperationAlgorithm | Name | ChaCha20 | jca/SymmetricAlgorithm.java:190:44:190:53 | jca/SymmetricAlgorithm.java:190:44:190:53 |
+| jca/SymmetricAlgorithm.java:190:44:190:53 | KeyOperationAlgorithm | RawName | ChaCha20 | jca/SymmetricAlgorithm.java:190:44:190:53 | jca/SymmetricAlgorithm.java:190:44:190:53 |
+| jca/SymmetricAlgorithm.java:190:44:190:53 | KeyOperationAlgorithm | Structure | Stream | jca/SymmetricAlgorithm.java:190:44:190:53 | jca/SymmetricAlgorithm.java:190:44:190:53 |
+| jca/SymmetricAlgorithm.java:192:38:192:42 | RandomNumberGeneration | Description | java.security.SecureRandom | jca/SymmetricAlgorithm.java:192:38:192:42 | jca/SymmetricAlgorithm.java:192:38:192:42 |
+| jca/SymmetricAlgorithm.java:194:42:194:44 | Key | KeyType | Unknown | jca/SymmetricAlgorithm.java:194:42:194:44 | jca/SymmetricAlgorithm.java:194:42:194:44 |
+| jca/SymmetricAlgorithm.java:195:29:195:53 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/SymmetricAlgorithm.java:195:29:195:53 | jca/SymmetricAlgorithm.java:195:29:195:53 |
+| jca/SymmetricAlgorithm.java:212:35:212:47 | Parameter | Description | key | jca/SymmetricAlgorithm.java:212:35:212:47 | jca/SymmetricAlgorithm.java:212:35:212:47 |
+| jca/SymmetricAlgorithm.java:212:50:212:65 | Parameter | Description | plaintext | jca/SymmetricAlgorithm.java:212:50:212:65 | jca/SymmetricAlgorithm.java:212:50:212:65 |
+| jca/SymmetricAlgorithm.java:213:36:213:44 | Constant | Description | "KMAC128" | jca/SymmetricAlgorithm.java:213:36:213:44 | jca/SymmetricAlgorithm.java:213:36:213:44 |
+| jca/SymmetricAlgorithm.java:214:19:214:21 | Key | KeyType | Unknown | jca/SymmetricAlgorithm.java:214:19:214:21 | jca/SymmetricAlgorithm.java:214:19:214:21 |
+| jca/SymmetricAlgorithm.java:215:29:215:51 | MACOperation | KeyOperationSubtype | Mac | jca/SymmetricAlgorithm.java:215:29:215:51 | jca/SymmetricAlgorithm.java:215:29:215:51 |
+| jca/SymmetricAlgorithm.java:218:44:218:62 | KeyOperationAlgorithm | Name | AES | jca/SymmetricAlgorithm.java:218:44:218:62 | jca/SymmetricAlgorithm.java:218:44:218:62 |
+| jca/SymmetricAlgorithm.java:218:44:218:62 | KeyOperationAlgorithm | RawName | AES/GCM/NoPadding | jca/SymmetricAlgorithm.java:218:44:218:62 | jca/SymmetricAlgorithm.java:218:44:218:62 |
+| jca/SymmetricAlgorithm.java:218:44:218:62 | KeyOperationAlgorithm | Structure | Block | jca/SymmetricAlgorithm.java:218:44:218:62 | jca/SymmetricAlgorithm.java:218:44:218:62 |
+| jca/SymmetricAlgorithm.java:218:44:218:62 | ModeOfOperation | Name | GCM | jca/SymmetricAlgorithm.java:218:44:218:62 | jca/SymmetricAlgorithm.java:218:44:218:62 |
+| jca/SymmetricAlgorithm.java:218:44:218:62 | ModeOfOperation | RawName | GCM | jca/SymmetricAlgorithm.java:218:44:218:62 | jca/SymmetricAlgorithm.java:218:44:218:62 |
+| jca/SymmetricAlgorithm.java:218:44:218:62 | PaddingAlgorithm | Name | UnknownPadding | jca/SymmetricAlgorithm.java:218:44:218:62 | jca/SymmetricAlgorithm.java:218:44:218:62 |
+| jca/SymmetricAlgorithm.java:218:44:218:62 | PaddingAlgorithm | RawName | NoPadding | jca/SymmetricAlgorithm.java:218:44:218:62 | jca/SymmetricAlgorithm.java:218:44:218:62 |
+| jca/SymmetricAlgorithm.java:220:38:220:39 | RandomNumberGeneration | Description | java.security.SecureRandom | jca/SymmetricAlgorithm.java:220:38:220:39 | jca/SymmetricAlgorithm.java:220:38:220:39 |
+| jca/SymmetricAlgorithm.java:222:42:222:51 | Key | KeyType | Unknown | jca/SymmetricAlgorithm.java:222:42:222:51 | jca/SymmetricAlgorithm.java:222:42:222:51 |
+| jca/SymmetricAlgorithm.java:223:29:223:53 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/SymmetricAlgorithm.java:223:29:223:53 | jca/SymmetricAlgorithm.java:223:29:223:53 |
+| jca/SymmetricAlgorithm.java:244:64:244:76 | Parameter | Description | key | jca/SymmetricAlgorithm.java:244:64:244:76 | jca/SymmetricAlgorithm.java:244:64:244:76 |
+| jca/SymmetricAlgorithm.java:244:79:244:94 | Parameter | Description | plaintext | jca/SymmetricAlgorithm.java:244:79:244:94 | jca/SymmetricAlgorithm.java:244:79:244:94 |
+| jca/SymmetricAlgorithm.java:284:58:284:70 | Parameter | Description | key | jca/SymmetricAlgorithm.java:284:58:284:70 | jca/SymmetricAlgorithm.java:284:58:284:70 |
+| jca/SymmetricAlgorithm.java:284:73:284:88 | Parameter | Description | plaintext | jca/SymmetricAlgorithm.java:284:73:284:88 | jca/SymmetricAlgorithm.java:284:73:284:88 |
+| jca/SymmetricAlgorithm.java:287:75:287:79 | Constant | Description | 10000 | jca/SymmetricAlgorithm.java:287:75:287:79 | jca/SymmetricAlgorithm.java:287:75:287:79 |
+| jca/SymmetricAlgorithm.java:287:82:287:84 | Constant | Description | 256 | jca/SymmetricAlgorithm.java:287:82:287:84 | jca/SymmetricAlgorithm.java:287:82:287:84 |
+| jca/SymmetricAlgorithm.java:288:65:288:86 | HMACAlgorithm | Name | HMAC | jca/SymmetricAlgorithm.java:288:65:288:86 | jca/SymmetricAlgorithm.java:288:65:288:86 |
+| jca/SymmetricAlgorithm.java:288:65:288:86 | HMACAlgorithm | RawName | PBKDF2WithHmacSHA256 | jca/SymmetricAlgorithm.java:288:65:288:86 | jca/SymmetricAlgorithm.java:288:65:288:86 |
+| jca/SymmetricAlgorithm.java:288:65:288:86 | HashAlgorithm | DigestSize | 256 | jca/SymmetricAlgorithm.java:288:65:288:86 | jca/SymmetricAlgorithm.java:288:65:288:86 |
+| jca/SymmetricAlgorithm.java:288:65:288:86 | HashAlgorithm | Name | SHA2 | jca/SymmetricAlgorithm.java:288:65:288:86 | jca/SymmetricAlgorithm.java:288:65:288:86 |
+| jca/SymmetricAlgorithm.java:288:65:288:86 | HashAlgorithm | RawName | PBKDF2WithHmacSHA256 | jca/SymmetricAlgorithm.java:288:65:288:86 | jca/SymmetricAlgorithm.java:288:65:288:86 |
+| jca/SymmetricAlgorithm.java:288:65:288:86 | KeyDerivationAlgorithm | Name | PBKDF2WithHmacSHA256 | jca/SymmetricAlgorithm.java:288:65:288:86 | jca/SymmetricAlgorithm.java:288:65:288:86 |
+| jca/SymmetricAlgorithm.java:288:65:288:86 | KeyDerivationAlgorithm | RawName | PBKDF2WithHmacSHA256 | jca/SymmetricAlgorithm.java:288:65:288:86 | jca/SymmetricAlgorithm.java:288:65:288:86 |
+| jca/SymmetricAlgorithm.java:289:26:289:53 | Key | KeyType | Symmetric | jca/SymmetricAlgorithm.java:289:26:289:53 | jca/SymmetricAlgorithm.java:289:26:289:53 |
+| jca/SymmetricAlgorithm.java:289:26:289:53 | KeyDerivation | Iterations | Constant:10000 | jca/SymmetricAlgorithm.java:287:75:287:79 | jca/SymmetricAlgorithm.java:287:75:287:79 |
+| jca/SymmetricAlgorithm.java:289:26:289:53 | KeyDerivation | KeySize | Constant:256 | jca/SymmetricAlgorithm.java:287:82:287:84 | jca/SymmetricAlgorithm.java:287:82:287:84 |
+| jca/SymmetricAlgorithm.java:295:44:295:62 | KeyOperationAlgorithm | Name | AES | jca/SymmetricAlgorithm.java:295:44:295:62 | jca/SymmetricAlgorithm.java:295:44:295:62 |
+| jca/SymmetricAlgorithm.java:295:44:295:62 | KeyOperationAlgorithm | RawName | AES/GCM/NoPadding | jca/SymmetricAlgorithm.java:295:44:295:62 | jca/SymmetricAlgorithm.java:295:44:295:62 |
+| jca/SymmetricAlgorithm.java:295:44:295:62 | KeyOperationAlgorithm | Structure | Block | jca/SymmetricAlgorithm.java:295:44:295:62 | jca/SymmetricAlgorithm.java:295:44:295:62 |
+| jca/SymmetricAlgorithm.java:295:44:295:62 | ModeOfOperation | Name | GCM | jca/SymmetricAlgorithm.java:295:44:295:62 | jca/SymmetricAlgorithm.java:295:44:295:62 |
+| jca/SymmetricAlgorithm.java:295:44:295:62 | ModeOfOperation | RawName | GCM | jca/SymmetricAlgorithm.java:295:44:295:62 | jca/SymmetricAlgorithm.java:295:44:295:62 |
+| jca/SymmetricAlgorithm.java:295:44:295:62 | PaddingAlgorithm | Name | UnknownPadding | jca/SymmetricAlgorithm.java:295:44:295:62 | jca/SymmetricAlgorithm.java:295:44:295:62 |
+| jca/SymmetricAlgorithm.java:295:44:295:62 | PaddingAlgorithm | RawName | NoPadding | jca/SymmetricAlgorithm.java:295:44:295:62 | jca/SymmetricAlgorithm.java:295:44:295:62 |
+| jca/SymmetricAlgorithm.java:297:38:297:39 | RandomNumberGeneration | Description | java.security.SecureRandom | jca/SymmetricAlgorithm.java:297:38:297:39 | jca/SymmetricAlgorithm.java:297:38:297:39 |
+| jca/SymmetricAlgorithm.java:298:42:298:47 | Key | KeyType | Unknown | jca/SymmetricAlgorithm.java:298:42:298:47 | jca/SymmetricAlgorithm.java:298:42:298:47 |
+| jca/SymmetricAlgorithm.java:299:29:299:53 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/SymmetricAlgorithm.java:299:29:299:53 | jca/SymmetricAlgorithm.java:299:29:299:53 |
+| jca/SymmetricAlgorithm.java:301:35:301:46 | HMACAlgorithm | Name | HMAC | jca/SymmetricAlgorithm.java:301:35:301:46 | jca/SymmetricAlgorithm.java:301:35:301:46 |
+| jca/SymmetricAlgorithm.java:301:35:301:46 | HMACAlgorithm | RawName | HmacSHA256 | jca/SymmetricAlgorithm.java:301:35:301:46 | jca/SymmetricAlgorithm.java:301:35:301:46 |
+| jca/SymmetricAlgorithm.java:301:35:301:46 | HashAlgorithm | DigestSize | 256 | jca/SymmetricAlgorithm.java:301:35:301:46 | jca/SymmetricAlgorithm.java:301:35:301:46 |
+| jca/SymmetricAlgorithm.java:301:35:301:46 | HashAlgorithm | Name | SHA2 | jca/SymmetricAlgorithm.java:301:35:301:46 | jca/SymmetricAlgorithm.java:301:35:301:46 |
+| jca/SymmetricAlgorithm.java:301:35:301:46 | HashAlgorithm | RawName | HmacSHA256 | jca/SymmetricAlgorithm.java:301:35:301:46 | jca/SymmetricAlgorithm.java:301:35:301:46 |
+| jca/SymmetricAlgorithm.java:302:18:302:30 | Key | KeyType | Unknown | jca/SymmetricAlgorithm.java:302:18:302:30 | jca/SymmetricAlgorithm.java:302:18:302:30 |
+| jca/SymmetricAlgorithm.java:303:30:303:52 | MACOperation | KeyOperationSubtype | Mac | jca/SymmetricAlgorithm.java:303:30:303:52 | jca/SymmetricAlgorithm.java:303:30:303:52 |
+| jca/SymmetricAlgorithm.java:331:52:331:56 | KeyOperationAlgorithm | KeySize | Constant:256 | jca/SymmetricAlgorithm.java:332:17:332:19 | jca/SymmetricAlgorithm.java:332:17:332:19 |
+| jca/SymmetricAlgorithm.java:331:52:331:56 | KeyOperationAlgorithm | Name | AES | jca/SymmetricAlgorithm.java:331:52:331:56 | jca/SymmetricAlgorithm.java:331:52:331:56 |
+| jca/SymmetricAlgorithm.java:331:52:331:56 | KeyOperationAlgorithm | RawName | AES | jca/SymmetricAlgorithm.java:331:52:331:56 | jca/SymmetricAlgorithm.java:331:52:331:56 |
+| jca/SymmetricAlgorithm.java:331:52:331:56 | KeyOperationAlgorithm | Structure | Block | jca/SymmetricAlgorithm.java:331:52:331:56 | jca/SymmetricAlgorithm.java:331:52:331:56 |
+| jca/SymmetricAlgorithm.java:332:17:332:19 | Constant | Description | 256 | jca/SymmetricAlgorithm.java:332:17:332:19 | jca/SymmetricAlgorithm.java:332:17:332:19 |
+| jca/SymmetricAlgorithm.java:333:16:333:31 | Key | KeyType | Symmetric | jca/SymmetricAlgorithm.java:333:16:333:31 | jca/SymmetricAlgorithm.java:333:16:333:31 |
+| jca/SymmetricAlgorithm.java:345:38:345:41 | RandomNumberGeneration | Description | java.security.SecureRandom | jca/SymmetricAlgorithm.java:345:38:345:41 | jca/SymmetricAlgorithm.java:345:38:345:41 |
+| jca/SymmetricModesTest.java:48:52:48:56 | KeyOperationAlgorithm | KeySize | Constant:128 | jca/SymmetricModesTest.java:53:17:53:19 | jca/SymmetricModesTest.java:53:17:53:19 |
+| jca/SymmetricModesTest.java:48:52:48:56 | KeyOperationAlgorithm | KeySize | Constant:256 | jca/SymmetricModesTest.java:49:17:49:19 | jca/SymmetricModesTest.java:49:17:49:19 |
+| jca/SymmetricModesTest.java:48:52:48:56 | KeyOperationAlgorithm | Name | AES | jca/SymmetricModesTest.java:48:52:48:56 | jca/SymmetricModesTest.java:48:52:48:56 |
+| jca/SymmetricModesTest.java:48:52:48:56 | KeyOperationAlgorithm | RawName | AES | jca/SymmetricModesTest.java:48:52:48:56 | jca/SymmetricModesTest.java:48:52:48:56 |
+| jca/SymmetricModesTest.java:48:52:48:56 | KeyOperationAlgorithm | Structure | Block | jca/SymmetricModesTest.java:48:52:48:56 | jca/SymmetricModesTest.java:48:52:48:56 |
+| jca/SymmetricModesTest.java:49:17:49:19 | Constant | Description | 256 | jca/SymmetricModesTest.java:49:17:49:19 | jca/SymmetricModesTest.java:49:17:49:19 |
+| jca/SymmetricModesTest.java:50:33:50:48 | Key | KeyType | Symmetric | jca/SymmetricModesTest.java:50:33:50:48 | jca/SymmetricModesTest.java:50:33:50:48 |
+| jca/SymmetricModesTest.java:53:17:53:19 | Constant | Description | 128 | jca/SymmetricModesTest.java:53:17:53:19 | jca/SymmetricModesTest.java:53:17:53:19 |
+| jca/SymmetricModesTest.java:54:31:54:46 | Key | KeyType | Symmetric | jca/SymmetricModesTest.java:54:31:54:46 | jca/SymmetricModesTest.java:54:31:54:46 |
+| jca/SymmetricModesTest.java:57:44:57:62 | KeyOperationAlgorithm | Name | AES | jca/SymmetricModesTest.java:57:44:57:62 | jca/SymmetricModesTest.java:57:44:57:62 |
+| jca/SymmetricModesTest.java:57:44:57:62 | KeyOperationAlgorithm | RawName | AES/KWP/NoPadding | jca/SymmetricModesTest.java:57:44:57:62 | jca/SymmetricModesTest.java:57:44:57:62 |
+| jca/SymmetricModesTest.java:57:44:57:62 | KeyOperationAlgorithm | Structure | Block | jca/SymmetricModesTest.java:57:44:57:62 | jca/SymmetricModesTest.java:57:44:57:62 |
+| jca/SymmetricModesTest.java:57:44:57:62 | ModeOfOperation | RawName | KWP | jca/SymmetricModesTest.java:57:44:57:62 | jca/SymmetricModesTest.java:57:44:57:62 |
+| jca/SymmetricModesTest.java:57:44:57:62 | PaddingAlgorithm | Name | UnknownPadding | jca/SymmetricModesTest.java:57:44:57:62 | jca/SymmetricModesTest.java:57:44:57:62 |
+| jca/SymmetricModesTest.java:57:44:57:62 | PaddingAlgorithm | RawName | NoPadding | jca/SymmetricModesTest.java:57:44:57:62 | jca/SymmetricModesTest.java:57:44:57:62 |
+| jca/SymmetricModesTest.java:58:39:58:49 | Key | KeyType | Unknown | jca/SymmetricModesTest.java:58:39:58:49 | jca/SymmetricModesTest.java:58:39:58:49 |
+| jca/SymmetricModesTest.java:59:29:59:50 | WrapOperation | KeyOperationSubtype | Wrap | jca/SymmetricModesTest.java:59:29:59:50 | jca/SymmetricModesTest.java:59:29:59:50 |
+| jca/SymmetricModesTest.java:78:43:78:55 | Parameter | Description | key | jca/SymmetricModesTest.java:78:43:78:55 | jca/SymmetricModesTest.java:78:43:78:55 |
+| jca/SymmetricModesTest.java:78:58:78:73 | Parameter | Description | plaintext | jca/SymmetricModesTest.java:78:58:78:73 | jca/SymmetricModesTest.java:78:58:78:73 |
+| jca/SymmetricModesTest.java:79:44:79:63 | KeyOperationAlgorithm | Name | AES | jca/SymmetricModesTest.java:79:44:79:63 | jca/SymmetricModesTest.java:79:44:79:63 |
+| jca/SymmetricModesTest.java:79:44:79:63 | KeyOperationAlgorithm | RawName | AES/OFB8/NoPadding | jca/SymmetricModesTest.java:79:44:79:63 | jca/SymmetricModesTest.java:79:44:79:63 |
+| jca/SymmetricModesTest.java:79:44:79:63 | KeyOperationAlgorithm | Structure | Block | jca/SymmetricModesTest.java:79:44:79:63 | jca/SymmetricModesTest.java:79:44:79:63 |
+| jca/SymmetricModesTest.java:79:44:79:63 | ModeOfOperation | RawName | OFB8 | jca/SymmetricModesTest.java:79:44:79:63 | jca/SymmetricModesTest.java:79:44:79:63 |
+| jca/SymmetricModesTest.java:79:44:79:63 | PaddingAlgorithm | Name | UnknownPadding | jca/SymmetricModesTest.java:79:44:79:63 | jca/SymmetricModesTest.java:79:44:79:63 |
+| jca/SymmetricModesTest.java:79:44:79:63 | PaddingAlgorithm | RawName | NoPadding | jca/SymmetricModesTest.java:79:44:79:63 | jca/SymmetricModesTest.java:79:44:79:63 |
+| jca/SymmetricModesTest.java:81:38:81:39 | RandomNumberGeneration | Description | java.security.SecureRandom | jca/SymmetricModesTest.java:81:38:81:39 | jca/SymmetricModesTest.java:81:38:81:39 |
+| jca/SymmetricModesTest.java:83:42:83:44 | Key | KeyType | Unknown | jca/SymmetricModesTest.java:83:42:83:44 | jca/SymmetricModesTest.java:83:42:83:44 |
+| jca/SymmetricModesTest.java:84:29:84:53 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/SymmetricModesTest.java:84:29:84:53 | jca/SymmetricModesTest.java:84:29:84:53 |
+| jca/SymmetricModesTest.java:104:45:104:57 | Parameter | Description | key | jca/SymmetricModesTest.java:104:45:104:57 | jca/SymmetricModesTest.java:104:45:104:57 |
+| jca/SymmetricModesTest.java:104:60:104:75 | Parameter | Description | plaintext | jca/SymmetricModesTest.java:104:60:104:75 | jca/SymmetricModesTest.java:104:60:104:75 |
+| jca/SymmetricModesTest.java:105:44:105:63 | KeyOperationAlgorithm | Name | AES | jca/SymmetricModesTest.java:105:44:105:63 | jca/SymmetricModesTest.java:105:44:105:63 |
+| jca/SymmetricModesTest.java:105:44:105:63 | KeyOperationAlgorithm | RawName | AES/OFB8/NoPadding | jca/SymmetricModesTest.java:105:44:105:63 | jca/SymmetricModesTest.java:105:44:105:63 |
+| jca/SymmetricModesTest.java:105:44:105:63 | KeyOperationAlgorithm | Structure | Block | jca/SymmetricModesTest.java:105:44:105:63 | jca/SymmetricModesTest.java:105:44:105:63 |
+| jca/SymmetricModesTest.java:105:44:105:63 | ModeOfOperation | RawName | OFB8 | jca/SymmetricModesTest.java:105:44:105:63 | jca/SymmetricModesTest.java:105:44:105:63 |
+| jca/SymmetricModesTest.java:105:44:105:63 | PaddingAlgorithm | Name | UnknownPadding | jca/SymmetricModesTest.java:105:44:105:63 | jca/SymmetricModesTest.java:105:44:105:63 |
+| jca/SymmetricModesTest.java:105:44:105:63 | PaddingAlgorithm | RawName | NoPadding | jca/SymmetricModesTest.java:105:44:105:63 | jca/SymmetricModesTest.java:105:44:105:63 |
+| jca/SymmetricModesTest.java:109:42:109:44 | Key | KeyType | Unknown | jca/SymmetricModesTest.java:109:42:109:44 | jca/SymmetricModesTest.java:109:42:109:44 |
+| jca/SymmetricModesTest.java:110:29:110:53 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/SymmetricModesTest.java:110:29:110:53 | jca/SymmetricModesTest.java:110:29:110:53 |
+| jca/SymmetricModesTest.java:127:52:127:56 | KeyOperationAlgorithm | KeySize | Constant:256 | jca/SymmetricModesTest.java:128:17:128:19 | jca/SymmetricModesTest.java:128:17:128:19 |
+| jca/SymmetricModesTest.java:127:52:127:56 | KeyOperationAlgorithm | Name | AES | jca/SymmetricModesTest.java:127:52:127:56 | jca/SymmetricModesTest.java:127:52:127:56 |
+| jca/SymmetricModesTest.java:127:52:127:56 | KeyOperationAlgorithm | RawName | AES | jca/SymmetricModesTest.java:127:52:127:56 | jca/SymmetricModesTest.java:127:52:127:56 |
+| jca/SymmetricModesTest.java:127:52:127:56 | KeyOperationAlgorithm | Structure | Block | jca/SymmetricModesTest.java:127:52:127:56 | jca/SymmetricModesTest.java:127:52:127:56 |
+| jca/SymmetricModesTest.java:128:17:128:19 | Constant | Description | 256 | jca/SymmetricModesTest.java:128:17:128:19 | jca/SymmetricModesTest.java:128:17:128:19 |
+| jca/SymmetricModesTest.java:129:16:129:31 | Key | KeyType | Symmetric | jca/SymmetricModesTest.java:129:16:129:31 | jca/SymmetricModesTest.java:129:16:129:31 |
+| jca/UniversalFlowTest.java:19:28:19:32 | KeyOperationAlgorithm | KeySize | Constant:256 | jca/UniversalFlowTest.java:26:21:26:23 | jca/UniversalFlowTest.java:26:21:26:23 |
+| jca/UniversalFlowTest.java:19:28:19:32 | KeyOperationAlgorithm | Name | AES | jca/UniversalFlowTest.java:19:28:19:32 | jca/UniversalFlowTest.java:19:28:19:32 |
+| jca/UniversalFlowTest.java:19:28:19:32 | KeyOperationAlgorithm | RawName | AES | jca/UniversalFlowTest.java:19:28:19:32 | jca/UniversalFlowTest.java:19:28:19:32 |
+| jca/UniversalFlowTest.java:19:28:19:32 | KeyOperationAlgorithm | Structure | Block | jca/UniversalFlowTest.java:19:28:19:32 | jca/UniversalFlowTest.java:19:28:19:32 |
+| jca/UniversalFlowTest.java:26:21:26:23 | Constant | Description | 256 | jca/UniversalFlowTest.java:26:21:26:23 | jca/UniversalFlowTest.java:26:21:26:23 |
+| jca/UniversalFlowTest.java:27:25:27:44 | Key | KeyType | Symmetric | jca/UniversalFlowTest.java:27:25:27:44 | jca/UniversalFlowTest.java:27:25:27:44 |
+| jca/UniversalFlowTest.java:28:29:28:47 | KeyOperationAlgorithm | Name | AES | jca/UniversalFlowTest.java:28:29:28:47 | jca/UniversalFlowTest.java:28:29:28:47 |
+| jca/UniversalFlowTest.java:28:29:28:47 | KeyOperationAlgorithm | RawName | AES/GCM/NoPadding | jca/UniversalFlowTest.java:28:29:28:47 | jca/UniversalFlowTest.java:28:29:28:47 |
+| jca/UniversalFlowTest.java:28:29:28:47 | KeyOperationAlgorithm | Structure | Block | jca/UniversalFlowTest.java:28:29:28:47 | jca/UniversalFlowTest.java:28:29:28:47 |
+| jca/UniversalFlowTest.java:28:29:28:47 | ModeOfOperation | Name | GCM | jca/UniversalFlowTest.java:28:29:28:47 | jca/UniversalFlowTest.java:28:29:28:47 |
+| jca/UniversalFlowTest.java:28:29:28:47 | ModeOfOperation | RawName | GCM | jca/UniversalFlowTest.java:28:29:28:47 | jca/UniversalFlowTest.java:28:29:28:47 |
+| jca/UniversalFlowTest.java:28:29:28:47 | PaddingAlgorithm | Name | UnknownPadding | jca/UniversalFlowTest.java:28:29:28:47 | jca/UniversalFlowTest.java:28:29:28:47 |
+| jca/UniversalFlowTest.java:28:29:28:47 | PaddingAlgorithm | RawName | NoPadding | jca/UniversalFlowTest.java:28:29:28:47 | jca/UniversalFlowTest.java:28:29:28:47 |
+| jca/UniversalFlowTest.java:31:38:31:39 | RandomNumberGeneration | Description | java.security.SecureRandom | jca/UniversalFlowTest.java:31:38:31:39 | jca/UniversalFlowTest.java:31:38:31:39 |
+| jca/UniversalFlowTest.java:33:42:33:44 | Key | KeyType | Unknown | jca/UniversalFlowTest.java:33:42:33:44 | jca/UniversalFlowTest.java:33:42:33:44 |
+| jca/UniversalFlowTest.java:34:32:34:74 | EncryptOperation | KeyOperationSubtype | Encrypt | jca/UniversalFlowTest.java:34:32:34:74 | jca/UniversalFlowTest.java:34:32:34:74 |
+| jca/UniversalFlowTest.java:34:47:34:62 | Constant | Description | "Sensitive Data" | jca/UniversalFlowTest.java:34:47:34:62 | jca/UniversalFlowTest.java:34:47:34:62 |
+| jca/UniversalFlowTest.java:46:20:46:24 | KeyOperationAlgorithm | KeySize | Constant:256 | jca/UniversalFlowTest.java:26:21:26:23 | jca/UniversalFlowTest.java:26:21:26:23 |
+| jca/UniversalFlowTest.java:46:20:46:24 | KeyOperationAlgorithm | Name | AES | jca/UniversalFlowTest.java:46:20:46:24 | jca/UniversalFlowTest.java:46:20:46:24 |
+| jca/UniversalFlowTest.java:46:20:46:24 | KeyOperationAlgorithm | RawName | AES | jca/UniversalFlowTest.java:46:20:46:24 | jca/UniversalFlowTest.java:46:20:46:24 |
+| jca/UniversalFlowTest.java:46:20:46:24 | KeyOperationAlgorithm | Structure | Block | jca/UniversalFlowTest.java:46:20:46:24 | jca/UniversalFlowTest.java:46:20:46:24 |
diff --git a/java/ql/test/experimental/library-tests/quantum/node_properties.ql b/java/ql/test/experimental/library-tests/quantum/node_properties.ql
new file mode 100644
index 00000000000..79514611e67
--- /dev/null
+++ b/java/ql/test/experimental/library-tests/quantum/node_properties.ql
@@ -0,0 +1,6 @@
+import java
+import experimental.quantum.Language
+
+from Crypto::NodeBase n, string key, string value, Location location
+where n.properties(key, value, location)
+select n, key, value, location
diff --git a/java/ql/test/experimental/library-tests/quantum/nodes.expected b/java/ql/test/experimental/library-tests/quantum/nodes.expected
new file mode 100644
index 00000000000..b9661aaf64f
--- /dev/null
+++ b/java/ql/test/experimental/library-tests/quantum/nodes.expected
@@ -0,0 +1,1510 @@
+| jca/AesWrapAndPBEWith.java:58:52:58:56 | KeyOperationAlgorithm |
+| jca/AesWrapAndPBEWith.java:59:17:59:19 | Constant |
+| jca/AesWrapAndPBEWith.java:60:33:60:48 | Key |
+| jca/AesWrapAndPBEWith.java:60:33:60:48 | KeyGeneration |
+| jca/AesWrapAndPBEWith.java:62:17:62:19 | Constant |
+| jca/AesWrapAndPBEWith.java:63:31:63:46 | Key |
+| jca/AesWrapAndPBEWith.java:63:31:63:46 | KeyGeneration |
+| jca/AesWrapAndPBEWith.java:65:44:65:52 | KeyOperationAlgorithm |
+| jca/AesWrapAndPBEWith.java:66:39:66:49 | Key |
+| jca/AesWrapAndPBEWith.java:67:29:67:50 | KeyOperationOutput |
+| jca/AesWrapAndPBEWith.java:67:29:67:50 | WrapOperation |
+| jca/AesWrapAndPBEWith.java:67:41:67:49 | Message |
+| jca/AesWrapAndPBEWith.java:83:52:83:56 | KeyOperationAlgorithm |
+| jca/AesWrapAndPBEWith.java:84:17:84:19 | Constant |
+| jca/AesWrapAndPBEWith.java:85:31:85:46 | Key |
+| jca/AesWrapAndPBEWith.java:85:31:85:46 | KeyGeneration |
+| jca/AesWrapAndPBEWith.java:87:44:87:52 | KeyOperationAlgorithm |
+| jca/AesWrapAndPBEWith.java:88:39:88:49 | Key |
+| jca/AesWrapAndPBEWith.java:89:29:89:50 | KeyOperationOutput |
+| jca/AesWrapAndPBEWith.java:89:29:89:50 | WrapOperation |
+| jca/AesWrapAndPBEWith.java:89:41:89:49 | Message |
+| jca/AesWrapAndPBEWith.java:106:34:106:37 | Constant |
+| jca/AesWrapAndPBEWith.java:107:42:107:63 | Message |
+| jca/AesWrapAndPBEWith.java:107:66:107:69 | Salt |
+| jca/AesWrapAndPBEWith.java:107:72:107:75 | Constant |
+| jca/AesWrapAndPBEWith.java:107:78:107:79 | Constant |
+| jca/AesWrapAndPBEWith.java:108:65:108:82 | KeyDerivationAlgorithm |
+| jca/AesWrapAndPBEWith.java:109:27:109:54 | Key |
+| jca/AesWrapAndPBEWith.java:109:27:109:54 | KeyDerivation |
+| jca/AesWrapAndPBEWith.java:122:38:122:41 | RandomNumberGeneration |
+| jca/AesWrapAndPBEWith.java:123:42:123:63 | Message |
+| jca/AesWrapAndPBEWith.java:123:66:123:69 | Salt |
+| jca/AesWrapAndPBEWith.java:123:72:123:76 | Constant |
+| jca/AesWrapAndPBEWith.java:123:79:123:81 | Constant |
+| jca/AesWrapAndPBEWith.java:124:65:124:86 | HMACAlgorithm |
+| jca/AesWrapAndPBEWith.java:124:65:124:86 | HashAlgorithm |
+| jca/AesWrapAndPBEWith.java:124:65:124:86 | KeyDerivationAlgorithm |
+| jca/AesWrapAndPBEWith.java:125:27:125:54 | Key |
+| jca/AesWrapAndPBEWith.java:125:27:125:54 | KeyDerivation |
+| jca/AesWrapAndPBEWith.java:140:38:140:41 | RandomNumberGeneration |
+| jca/AesWrapAndPBEWith.java:141:42:141:63 | Message |
+| jca/AesWrapAndPBEWith.java:141:66:141:69 | Salt |
+| jca/AesWrapAndPBEWith.java:141:72:141:76 | Constant |
+| jca/AesWrapAndPBEWith.java:141:79:141:81 | Constant |
+| jca/AesWrapAndPBEWith.java:142:65:142:98 | KeyDerivationAlgorithm |
+| jca/AesWrapAndPBEWith.java:143:28:143:55 | Key |
+| jca/AesWrapAndPBEWith.java:143:28:143:55 | KeyDerivation |
+| jca/AesWrapAndPBEWith.java:146:44:146:65 | KeyOperationAlgorithm |
+| jca/AesWrapAndPBEWith.java:146:44:146:65 | ModeOfOperation |
+| jca/AesWrapAndPBEWith.java:146:44:146:65 | PaddingAlgorithm |
+| jca/AesWrapAndPBEWith.java:148:38:148:39 | RandomNumberGeneration |
+| jca/AesWrapAndPBEWith.java:150:42:150:47 | Key |
+| jca/AesWrapAndPBEWith.java:150:50:150:55 | Nonce |
+| jca/AesWrapAndPBEWith.java:151:29:151:64 | EncryptOperation |
+| jca/AesWrapAndPBEWith.java:151:29:151:64 | KeyOperationOutput |
+| jca/AesWrapAndPBEWith.java:151:44:151:63 | Message |
+| jca/AesWrapAndPBEWith.java:167:38:167:41 | RandomNumberGeneration |
+| jca/AesWrapAndPBEWith.java:168:42:168:63 | Message |
+| jca/AesWrapAndPBEWith.java:168:66:168:69 | Salt |
+| jca/AesWrapAndPBEWith.java:168:72:168:76 | Constant |
+| jca/AesWrapAndPBEWith.java:168:79:168:81 | Constant |
+| jca/AesWrapAndPBEWith.java:169:65:169:96 | KeyDerivationAlgorithm |
+| jca/AesWrapAndPBEWith.java:170:28:170:55 | Key |
+| jca/AesWrapAndPBEWith.java:170:28:170:55 | KeyDerivation |
+| jca/AesWrapAndPBEWith.java:173:44:173:65 | KeyOperationAlgorithm |
+| jca/AesWrapAndPBEWith.java:173:44:173:65 | ModeOfOperation |
+| jca/AesWrapAndPBEWith.java:173:44:173:65 | PaddingAlgorithm |
+| jca/AesWrapAndPBEWith.java:175:38:175:39 | RandomNumberGeneration |
+| jca/AesWrapAndPBEWith.java:177:42:177:47 | Key |
+| jca/AesWrapAndPBEWith.java:177:50:177:55 | Nonce |
+| jca/AesWrapAndPBEWith.java:178:29:178:64 | EncryptOperation |
+| jca/AesWrapAndPBEWith.java:178:29:178:64 | KeyOperationOutput |
+| jca/AesWrapAndPBEWith.java:178:44:178:63 | Message |
+| jca/AesWrapAndPBEWith.java:200:55:200:69 | Parameter |
+| jca/AesWrapAndPBEWith.java:200:72:200:87 | Parameter |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:86:47:86:57 | EllipticCurve |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:87:16:87:36 | Key |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:87:16:87:36 | KeyGeneration |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:94:61:94:68 | KeyAgreementAlgorithm |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:95:24:95:26 | Constant |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:96:16:96:36 | Key |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:96:16:96:36 | KeyGeneration |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:109:17:109:26 | Key |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:110:20:110:28 | Key |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:111:16:111:34 | KeyAgreementOperation |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:111:16:111:34 | SharedSecret |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:123:58:123:66 | HashAlgorithm |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:124:23:124:42 | Digest |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:124:23:124:42 | HashOperation |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:124:37:124:41 | Message |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:145:61:145:65 | KeyOperationAlgorithm |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:146:24:146:27 | Constant |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:147:16:147:36 | Key |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:147:16:147:36 | KeyGeneration |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:154:61:154:65 | KeyOperationAlgorithm |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:155:24:155:27 | Constant |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:156:16:156:36 | Key |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:156:16:156:36 | KeyGeneration |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:166:47:166:85 | HashAlgorithm |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:166:47:166:85 | KeyOperationAlgorithm |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:166:47:166:85 | ModeOfOperation |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:166:47:166:85 | PaddingAlgorithm |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:167:42:167:58 | Key |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:168:34:168:55 | KeyOperationOutput |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:168:34:168:55 | WrapOperation |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:168:49:168:54 | Message |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:171:38:171:39 | RandomNumberGeneration |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:172:47:172:65 | KeyOperationAlgorithm |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:172:47:172:65 | ModeOfOperation |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:172:47:172:65 | PaddingAlgorithm |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:173:45:173:50 | Key |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:173:53:173:81 | Nonce |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:174:29:174:56 | EncryptOperation |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:174:29:174:56 | KeyOperationOutput |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:174:47:174:55 | Message |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:190:47:190:68 | KeyOperationAlgorithm |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:190:47:190:68 | ModeOfOperation |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:190:47:190:68 | PaddingAlgorithm |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:191:42:191:58 | Key |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:192:34:192:55 | KeyOperationOutput |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:192:34:192:55 | WrapOperation |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:192:49:192:54 | Message |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:195:47:195:65 | KeyOperationAlgorithm |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:195:47:195:65 | ModeOfOperation |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:195:47:195:65 | PaddingAlgorithm |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:196:45:196:50 | Key |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:196:53:196:86 | Nonce |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:197:29:197:56 | EncryptOperation |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:197:29:197:56 | KeyOperationOutput |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:197:47:197:55 | Message |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:215:91:215:96 | KeyAgreementAlgorithm |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:220:38:220:39 | RandomNumberGeneration |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:221:44:221:62 | KeyOperationAlgorithm |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:221:44:221:62 | ModeOfOperation |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:221:44:221:62 | PaddingAlgorithm |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:222:42:222:47 | Key |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:222:50:222:78 | Nonce |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:223:29:223:53 | EncryptOperation |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:223:29:223:53 | KeyOperationOutput |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:223:44:223:52 | Message |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:239:95:239:100 | KeyAgreementAlgorithm |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:244:44:244:62 | KeyOperationAlgorithm |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:244:44:244:62 | ModeOfOperation |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:244:44:244:62 | PaddingAlgorithm |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:245:42:245:47 | Key |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:245:50:245:83 | Nonce |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:246:29:246:53 | EncryptOperation |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:246:29:246:53 | KeyOperationOutput |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:246:44:246:52 | Message |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:271:58:271:73 | Parameter |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:295:35:295:46 | HMACAlgorithm |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:295:35:295:46 | HashAlgorithm |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:297:18:297:26 | Key |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:298:16:298:46 | KeyOperationOutput |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:298:16:298:46 | MACOperation |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:298:28:298:45 | Message |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:306:35:306:44 | HMACAlgorithm |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:306:35:306:44 | HashAlgorithm |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:308:18:308:26 | Key |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:309:16:309:46 | KeyOperationOutput |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:309:16:309:46 | MACOperation |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:309:28:309:45 | Message |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:320:52:320:56 | KeyOperationAlgorithm |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:321:17:321:19 | Constant |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:322:16:322:31 | Key |
+| jca/AsymmetricEncryptionMacHybridCryptosystem.java:322:16:322:31 | KeyGeneration |
+| jca/ChainedEncryptionTest.java:19:44:19:62 | KeyOperationAlgorithm |
+| jca/ChainedEncryptionTest.java:19:44:19:62 | ModeOfOperation |
+| jca/ChainedEncryptionTest.java:19:44:19:62 | PaddingAlgorithm |
+| jca/ChainedEncryptionTest.java:21:38:21:39 | RandomNumberGeneration |
+| jca/ChainedEncryptionTest.java:23:42:23:44 | Key |
+| jca/ChainedEncryptionTest.java:23:47:23:50 | Nonce |
+| jca/ChainedEncryptionTest.java:24:29:24:53 | EncryptOperation |
+| jca/ChainedEncryptionTest.java:24:29:24:53 | KeyOperationOutput |
+| jca/ChainedEncryptionTest.java:24:44:24:52 | Message |
+| jca/ChainedEncryptionTest.java:32:44:32:62 | KeyOperationAlgorithm |
+| jca/ChainedEncryptionTest.java:32:44:32:62 | ModeOfOperation |
+| jca/ChainedEncryptionTest.java:32:44:32:62 | PaddingAlgorithm |
+| jca/ChainedEncryptionTest.java:34:42:34:44 | Key |
+| jca/ChainedEncryptionTest.java:34:47:34:50 | Nonce |
+| jca/ChainedEncryptionTest.java:35:16:35:41 | DecryptOperation |
+| jca/ChainedEncryptionTest.java:35:16:35:41 | KeyOperationOutput |
+| jca/ChainedEncryptionTest.java:35:31:35:40 | Message |
+| jca/ChainedEncryptionTest.java:40:44:40:62 | KeyOperationAlgorithm |
+| jca/ChainedEncryptionTest.java:42:38:42:42 | RandomNumberGeneration |
+| jca/ChainedEncryptionTest.java:43:42:43:44 | Key |
+| jca/ChainedEncryptionTest.java:43:47:43:72 | Nonce |
+| jca/ChainedEncryptionTest.java:44:29:44:53 | EncryptOperation |
+| jca/ChainedEncryptionTest.java:44:29:44:53 | KeyOperationOutput |
+| jca/ChainedEncryptionTest.java:44:44:44:52 | Message |
+| jca/ChainedEncryptionTest.java:52:44:52:62 | KeyOperationAlgorithm |
+| jca/ChainedEncryptionTest.java:53:42:53:44 | Key |
+| jca/ChainedEncryptionTest.java:53:47:53:72 | Nonce |
+| jca/ChainedEncryptionTest.java:54:16:54:41 | DecryptOperation |
+| jca/ChainedEncryptionTest.java:54:16:54:41 | KeyOperationOutput |
+| jca/ChainedEncryptionTest.java:54:31:54:40 | Message |
+| jca/ChainedEncryptionTest.java:75:46:75:61 | Parameter |
+| jca/ChainedEncryptionTest.java:79:56:79:60 | KeyOperationAlgorithm |
+| jca/ChainedEncryptionTest.java:80:21:80:23 | Constant |
+| jca/ChainedEncryptionTest.java:81:30:81:49 | Key |
+| jca/ChainedEncryptionTest.java:81:30:81:49 | KeyGeneration |
+| jca/ChainedEncryptionTest.java:83:59:83:68 | KeyOperationAlgorithm |
+| jca/ChainedEncryptionTest.java:84:24:84:26 | Constant |
+| jca/ChainedEncryptionTest.java:85:30:85:52 | Key |
+| jca/ChainedEncryptionTest.java:85:30:85:52 | KeyGeneration |
+| jca/ChainedEncryptionTest.java:89:38:89:42 | RandomNumberGeneration |
+| jca/ChainedEncryptionTest.java:90:47:90:65 | KeyOperationAlgorithm |
+| jca/ChainedEncryptionTest.java:90:47:90:65 | ModeOfOperation |
+| jca/ChainedEncryptionTest.java:90:47:90:65 | PaddingAlgorithm |
+| jca/ChainedEncryptionTest.java:92:45:92:52 | Key |
+| jca/ChainedEncryptionTest.java:92:55:92:61 | Nonce |
+| jca/ChainedEncryptionTest.java:93:34:93:62 | EncryptOperation |
+| jca/ChainedEncryptionTest.java:93:34:93:62 | KeyOperationOutput |
+| jca/ChainedEncryptionTest.java:93:52:93:61 | Message |
+| jca/ChainedEncryptionTest.java:97:38:97:48 | RandomNumberGeneration |
+| jca/ChainedEncryptionTest.java:98:50:98:68 | KeyOperationAlgorithm |
+| jca/ChainedEncryptionTest.java:99:48:99:55 | Key |
+| jca/ChainedEncryptionTest.java:99:58:99:89 | Nonce |
+| jca/ChainedEncryptionTest.java:100:34:100:70 | EncryptOperation |
+| jca/ChainedEncryptionTest.java:100:34:100:70 | KeyOperationOutput |
+| jca/ChainedEncryptionTest.java:100:55:100:69 | Message |
+| jca/ChainedEncryptionTest.java:103:47:103:65 | KeyOperationAlgorithm |
+| jca/ChainedEncryptionTest.java:104:45:104:52 | Key |
+| jca/ChainedEncryptionTest.java:104:55:104:86 | Nonce |
+| jca/ChainedEncryptionTest.java:105:43:105:76 | DecryptOperation |
+| jca/ChainedEncryptionTest.java:105:43:105:76 | KeyOperationOutput |
+| jca/ChainedEncryptionTest.java:105:61:105:75 | Message |
+| jca/ChainedEncryptionTest.java:108:44:108:62 | KeyOperationAlgorithm |
+| jca/ChainedEncryptionTest.java:108:44:108:62 | ModeOfOperation |
+| jca/ChainedEncryptionTest.java:108:44:108:62 | PaddingAlgorithm |
+| jca/ChainedEncryptionTest.java:109:42:109:49 | Key |
+| jca/ChainedEncryptionTest.java:109:52:109:83 | Nonce |
+| jca/ChainedEncryptionTest.java:110:37:110:76 | DecryptOperation |
+| jca/ChainedEncryptionTest.java:110:37:110:76 | KeyOperationOutput |
+| jca/ChainedEncryptionTest.java:110:52:110:75 | Message |
+| jca/ChainedEncryptionTest.java:117:56:117:60 | KeyOperationAlgorithm |
+| jca/ChainedEncryptionTest.java:118:21:118:23 | Constant |
+| jca/ChainedEncryptionTest.java:119:28:119:47 | Key |
+| jca/ChainedEncryptionTest.java:119:28:119:47 | KeyGeneration |
+| jca/ChainedEncryptionTest.java:122:59:122:68 | KeyOperationAlgorithm |
+| jca/ChainedEncryptionTest.java:123:24:123:26 | Constant |
+| jca/ChainedEncryptionTest.java:124:31:124:53 | Key |
+| jca/ChainedEncryptionTest.java:124:31:124:53 | KeyGeneration |
+| jca/ChainedEncryptionTest.java:126:31:126:57 | Constant |
+| jca/Digest.java:54:58:54:66 | HashAlgorithm |
+| jca/Digest.java:55:23:55:66 | Digest |
+| jca/Digest.java:55:23:55:66 | HashOperation |
+| jca/Digest.java:55:37:55:54 | Constant |
+| jca/Digest.java:55:37:55:65 | Message |
+| jca/Digest.java:64:61:64:65 | HashAlgorithm |
+| jca/Digest.java:65:23:65:70 | Digest |
+| jca/Digest.java:65:23:65:70 | HashOperation |
+| jca/Digest.java:65:40:65:58 | Constant |
+| jca/Digest.java:65:40:65:69 | Message |
+| jca/Digest.java:73:49:73:63 | Parameter |
+| jca/Digest.java:74:64:74:72 | HashAlgorithm |
+| jca/Digest.java:75:23:75:62 | Digest |
+| jca/Digest.java:75:23:75:62 | HashOperation |
+| jca/Digest.java:75:43:75:61 | Message |
+| jca/Digest.java:83:37:83:51 | Parameter |
+| jca/Digest.java:85:58:85:66 | HashAlgorithm |
+| jca/Digest.java:86:23:86:26 | Message |
+| jca/Digest.java:87:23:87:56 | Digest |
+| jca/Digest.java:87:23:87:56 | HashOperation |
+| jca/Digest.java:87:37:87:55 | Message |
+| jca/Digest.java:95:37:95:51 | Parameter |
+| jca/Digest.java:97:42:97:63 | Message |
+| jca/Digest.java:97:66:97:69 | Salt |
+| jca/Digest.java:97:72:97:76 | Constant |
+| jca/Digest.java:97:79:97:81 | Constant |
+| jca/Digest.java:98:65:98:86 | HMACAlgorithm |
+| jca/Digest.java:98:65:98:86 | HashAlgorithm |
+| jca/Digest.java:98:65:98:86 | KeyDerivationAlgorithm |
+| jca/Digest.java:99:23:99:50 | Key |
+| jca/Digest.java:99:23:99:50 | KeyDerivation |
+| jca/Digest.java:107:40:107:51 | Parameter |
+| jca/Digest.java:108:62:108:68 | HashAlgorithm |
+| jca/Digest.java:109:23:109:57 | Digest |
+| jca/Digest.java:109:23:109:57 | HashOperation |
+| jca/Digest.java:109:41:109:56 | Message |
+| jca/Digest.java:117:35:117:46 | Parameter |
+| jca/Digest.java:117:49:117:58 | Parameter |
+| jca/Digest.java:118:36:118:47 | HMACAlgorithm |
+| jca/Digest.java:118:36:118:47 | HashAlgorithm |
+| jca/Digest.java:120:19:120:27 | Key |
+| jca/Digest.java:121:23:121:52 | KeyOperationOutput |
+| jca/Digest.java:121:23:121:52 | MACOperation |
+| jca/Digest.java:121:36:121:51 | Message |
+| jca/Digest.java:140:44:140:62 | KeyOperationAlgorithm |
+| jca/Digest.java:140:44:140:62 | ModeOfOperation |
+| jca/Digest.java:140:44:140:62 | PaddingAlgorithm |
+| jca/Digest.java:141:42:141:44 | Key |
+| jca/Digest.java:142:32:142:74 | EncryptOperation |
+| jca/Digest.java:142:32:142:74 | KeyOperationOutput |
+| jca/Digest.java:142:47:142:62 | Constant |
+| jca/Digest.java:142:47:142:73 | Message |
+| jca/Digest.java:155:39:155:51 | Parameter |
+| jca/Digest.java:171:50:171:62 | Parameter |
+| jca/Digest.java:176:42:176:71 | Message |
+| jca/Digest.java:176:74:176:77 | Salt |
+| jca/Digest.java:176:80:176:84 | Constant |
+| jca/Digest.java:176:87:176:89 | Constant |
+| jca/Digest.java:177:65:177:86 | HMACAlgorithm |
+| jca/Digest.java:177:65:177:86 | HashAlgorithm |
+| jca/Digest.java:177:65:177:86 | KeyDerivationAlgorithm |
+| jca/Digest.java:178:30:178:57 | Key |
+| jca/Digest.java:178:30:178:57 | KeyDerivation |
+| jca/Digest.java:186:44:186:62 | KeyOperationAlgorithm |
+| jca/Digest.java:186:44:186:62 | ModeOfOperation |
+| jca/Digest.java:186:44:186:62 | PaddingAlgorithm |
+| jca/Digest.java:187:42:187:54 | Key |
+| jca/Digest.java:188:29:188:78 | EncryptOperation |
+| jca/Digest.java:188:29:188:78 | KeyOperationOutput |
+| jca/Digest.java:188:44:188:66 | Constant |
+| jca/Digest.java:188:44:188:77 | Message |
+| jca/Digest.java:191:35:191:46 | HMACAlgorithm |
+| jca/Digest.java:191:35:191:46 | HashAlgorithm |
+| jca/Digest.java:192:18:192:23 | Key |
+| jca/Digest.java:193:30:193:52 | KeyOperationOutput |
+| jca/Digest.java:193:30:193:52 | MACOperation |
+| jca/Digest.java:193:42:193:51 | Message |
+| jca/Digest.java:210:44:210:62 | KeyOperationAlgorithm |
+| jca/Digest.java:210:44:210:62 | ModeOfOperation |
+| jca/Digest.java:210:44:210:62 | PaddingAlgorithm |
+| jca/Digest.java:212:42:212:44 | Key |
+| jca/Digest.java:213:32:213:51 | EncryptOperation |
+| jca/Digest.java:213:32:213:51 | KeyOperationOutput |
+| jca/Digest.java:213:47:213:50 | Message |
+| jca/Digest.java:239:56:239:60 | KeyOperationAlgorithm |
+| jca/Digest.java:240:21:240:23 | Constant |
+| jca/Digest.java:241:16:241:35 | Key |
+| jca/Digest.java:241:16:241:35 | KeyGeneration |
+| jca/Digest.java:253:38:253:41 | RandomNumberGeneration |
+| jca/EllipticCurve1.java:46:66:46:76 | EllipticCurve |
+| jca/EllipticCurve1.java:47:16:47:36 | Key |
+| jca/EllipticCurve1.java:47:16:47:36 | KeyGeneration |
+| jca/EllipticCurve1.java:56:66:56:76 | EllipticCurve |
+| jca/EllipticCurve1.java:57:16:57:36 | Key |
+| jca/EllipticCurve1.java:57:16:57:36 | KeyGeneration |
+| jca/EllipticCurve1.java:66:66:66:82 | EllipticCurve |
+| jca/EllipticCurve1.java:67:16:67:36 | Key |
+| jca/EllipticCurve1.java:67:16:67:36 | KeyGeneration |
+| jca/EllipticCurve1.java:74:61:74:68 | KeyAgreementAlgorithm |
+| jca/EllipticCurve1.java:76:16:76:36 | Key |
+| jca/EllipticCurve1.java:76:16:76:36 | KeyGeneration |
+| jca/EllipticCurve1.java:83:61:83:66 | KeyAgreementAlgorithm |
+| jca/EllipticCurve1.java:84:16:84:36 | Key |
+| jca/EllipticCurve1.java:84:16:84:36 | KeyGeneration |
+| jca/EllipticCurve1.java:94:66:94:76 | EllipticCurve |
+| jca/EllipticCurve1.java:95:16:95:36 | Key |
+| jca/EllipticCurve1.java:95:16:95:36 | KeyGeneration |
+| jca/EllipticCurve1.java:105:66:105:76 | Constant |
+| jca/EllipticCurve1.java:106:16:106:36 | Key |
+| jca/EllipticCurve1.java:106:16:106:36 | KeyGeneration |
+| jca/EllipticCurve1.java:114:61:114:69 | KeyOperationAlgorithm |
+| jca/EllipticCurve1.java:115:16:115:36 | Key |
+| jca/EllipticCurve1.java:115:16:115:36 | KeyGeneration |
+| jca/EllipticCurve2.java:46:47:46:57 | EllipticCurve |
+| jca/EllipticCurve2.java:47:16:47:36 | Key |
+| jca/EllipticCurve2.java:47:16:47:36 | KeyGeneration |
+| jca/EllipticCurve2.java:55:47:55:57 | EllipticCurve |
+| jca/EllipticCurve2.java:56:16:56:36 | Key |
+| jca/EllipticCurve2.java:56:16:56:36 | KeyGeneration |
+| jca/EllipticCurve2.java:64:47:64:63 | EllipticCurve |
+| jca/EllipticCurve2.java:65:16:65:36 | Key |
+| jca/EllipticCurve2.java:65:16:65:36 | KeyGeneration |
+| jca/EllipticCurve2.java:72:61:72:68 | KeyAgreementAlgorithm |
+| jca/EllipticCurve2.java:73:16:73:36 | Key |
+| jca/EllipticCurve2.java:73:16:73:36 | KeyGeneration |
+| jca/EllipticCurve2.java:80:61:80:69 | KeyOperationAlgorithm |
+| jca/EllipticCurve2.java:81:16:81:36 | Key |
+| jca/EllipticCurve2.java:81:16:81:36 | KeyGeneration |
+| jca/EllipticCurve2.java:105:52:105:57 | KeyAgreementAlgorithm |
+| jca/EllipticCurve2.java:106:17:106:36 | Key |
+| jca/EllipticCurve2.java:107:20:107:36 | Key |
+| jca/EllipticCurve2.java:108:16:108:34 | KeyAgreementOperation |
+| jca/EllipticCurve2.java:108:16:108:34 | SharedSecret |
+| jca/EllipticCurve2.java:119:52:119:57 | KeyAgreementAlgorithm |
+| jca/EllipticCurve2.java:120:17:120:37 | Key |
+| jca/EllipticCurve2.java:121:20:121:39 | Key |
+| jca/EllipticCurve2.java:122:16:122:34 | KeyAgreementOperation |
+| jca/EllipticCurve2.java:122:16:122:34 | SharedSecret |
+| jca/EllipticCurve2.java:136:53:136:69 | HashAlgorithm |
+| jca/EllipticCurve2.java:136:53:136:69 | KeyOperationAlgorithm |
+| jca/EllipticCurve2.java:137:28:137:42 | Key |
+| jca/EllipticCurve2.java:138:26:138:32 | Message |
+| jca/EllipticCurve2.java:139:16:139:31 | SignOperation |
+| jca/EllipticCurve2.java:139:16:139:31 | SignatureOutput |
+| jca/EllipticCurve2.java:151:53:151:69 | HashAlgorithm |
+| jca/EllipticCurve2.java:151:53:151:69 | KeyOperationAlgorithm |
+| jca/EllipticCurve2.java:152:30:152:43 | Key |
+| jca/EllipticCurve2.java:153:26:153:32 | Message |
+| jca/EllipticCurve2.java:154:16:154:47 | VerifyOperation |
+| jca/EllipticCurve2.java:154:33:154:46 | SignatureInput |
+| jca/EllipticCurve2.java:166:53:166:61 | KeyOperationAlgorithm |
+| jca/EllipticCurve2.java:167:28:167:42 | Key |
+| jca/EllipticCurve2.java:168:26:168:32 | Message |
+| jca/EllipticCurve2.java:169:16:169:31 | SignOperation |
+| jca/EllipticCurve2.java:169:16:169:31 | SignatureOutput |
+| jca/EllipticCurve2.java:181:53:181:61 | KeyOperationAlgorithm |
+| jca/EllipticCurve2.java:182:30:182:43 | Key |
+| jca/EllipticCurve2.java:183:26:183:32 | Message |
+| jca/EllipticCurve2.java:184:16:184:47 | VerifyOperation |
+| jca/EllipticCurve2.java:184:33:184:46 | SignatureInput |
+| jca/EllipticCurve2.java:206:52:206:57 | KeyAgreementAlgorithm |
+| jca/EllipticCurve2.java:207:17:207:37 | Key |
+| jca/EllipticCurve2.java:208:20:208:41 | Key |
+| jca/EllipticCurve2.java:209:31:209:49 | KeyAgreementOperation |
+| jca/EllipticCurve2.java:209:31:209:49 | SharedSecret |
+| jca/EllipticCurve2.java:213:58:213:66 | HashAlgorithm |
+| jca/EllipticCurve2.java:214:29:214:55 | Digest |
+| jca/EllipticCurve2.java:214:29:214:55 | HashOperation |
+| jca/EllipticCurve2.java:214:43:214:54 | Message |
+| jca/EllipticCurve2.java:219:44:219:62 | KeyOperationAlgorithm |
+| jca/EllipticCurve2.java:219:44:219:62 | ModeOfOperation |
+| jca/EllipticCurve2.java:219:44:219:62 | PaddingAlgorithm |
+| jca/EllipticCurve2.java:221:38:221:39 | RandomNumberGeneration |
+| jca/EllipticCurve2.java:223:42:223:47 | Key |
+| jca/EllipticCurve2.java:223:50:223:53 | Nonce |
+| jca/EllipticCurve2.java:224:29:224:53 | EncryptOperation |
+| jca/EllipticCurve2.java:224:29:224:53 | KeyOperationOutput |
+| jca/EllipticCurve2.java:224:44:224:52 | Message |
+| jca/EllipticCurve2.java:245:30:245:53 | Constant |
+| jca/EllipticCurve2.java:258:62:258:83 | Constant |
+| jca/Encryption1.java:60:56:60:60 | KeyOperationAlgorithm |
+| jca/Encryption1.java:61:21:61:23 | Constant |
+| jca/Encryption1.java:62:25:62:44 | Key |
+| jca/Encryption1.java:62:25:62:44 | KeyGeneration |
+| jca/Encryption1.java:63:44:63:62 | KeyOperationAlgorithm |
+| jca/Encryption1.java:63:44:63:62 | ModeOfOperation |
+| jca/Encryption1.java:63:44:63:62 | PaddingAlgorithm |
+| jca/Encryption1.java:65:38:65:39 | RandomNumberGeneration |
+| jca/Encryption1.java:67:42:67:44 | Key |
+| jca/Encryption1.java:67:47:67:53 | Nonce |
+| jca/Encryption1.java:68:32:68:74 | EncryptOperation |
+| jca/Encryption1.java:68:32:68:74 | KeyOperationOutput |
+| jca/Encryption1.java:68:47:68:62 | Constant |
+| jca/Encryption1.java:68:47:68:73 | Message |
+| jca/Encryption1.java:83:56:83:60 | KeyOperationAlgorithm |
+| jca/Encryption1.java:84:21:84:23 | Constant |
+| jca/Encryption1.java:85:25:85:44 | Key |
+| jca/Encryption1.java:85:25:85:44 | KeyGeneration |
+| jca/Encryption1.java:88:44:88:62 | KeyOperationAlgorithm |
+| jca/Encryption1.java:88:44:88:62 | ModeOfOperation |
+| jca/Encryption1.java:88:44:88:62 | PaddingAlgorithm |
+| jca/Encryption1.java:89:42:89:44 | Key |
+| jca/Encryption1.java:90:32:90:74 | EncryptOperation |
+| jca/Encryption1.java:90:32:90:74 | KeyOperationOutput |
+| jca/Encryption1.java:90:47:90:62 | Constant |
+| jca/Encryption1.java:90:47:90:73 | Message |
+| jca/Encryption1.java:104:35:104:53 | Parameter |
+| jca/Encryption1.java:104:56:104:66 | Parameter |
+| jca/Encryption1.java:105:44:105:82 | HashAlgorithm |
+| jca/Encryption1.java:105:44:105:82 | KeyOperationAlgorithm |
+| jca/Encryption1.java:105:44:105:82 | ModeOfOperation |
+| jca/Encryption1.java:105:44:105:82 | PaddingAlgorithm |
+| jca/Encryption1.java:106:42:106:50 | Key |
+| jca/Encryption1.java:107:32:107:62 | EncryptOperation |
+| jca/Encryption1.java:107:32:107:62 | KeyOperationOutput |
+| jca/Encryption1.java:107:47:107:61 | Message |
+| jca/Encryption1.java:119:35:119:55 | Parameter |
+| jca/Encryption1.java:119:58:119:77 | Parameter |
+| jca/Encryption1.java:120:44:120:82 | HashAlgorithm |
+| jca/Encryption1.java:120:44:120:82 | KeyOperationAlgorithm |
+| jca/Encryption1.java:120:44:120:82 | ModeOfOperation |
+| jca/Encryption1.java:120:44:120:82 | PaddingAlgorithm |
+| jca/Encryption1.java:121:42:121:51 | Key |
+| jca/Encryption1.java:122:32:122:60 | DecryptOperation |
+| jca/Encryption1.java:122:32:122:60 | KeyOperationOutput |
+| jca/Encryption1.java:122:47:122:59 | Message |
+| jca/Encryption1.java:136:34:136:55 | Parameter |
+| jca/Encryption1.java:137:56:137:60 | KeyOperationAlgorithm |
+| jca/Encryption1.java:138:21:138:23 | Constant |
+| jca/Encryption1.java:139:28:139:47 | Key |
+| jca/Encryption1.java:139:28:139:47 | KeyGeneration |
+| jca/Encryption1.java:141:47:141:85 | HashAlgorithm |
+| jca/Encryption1.java:141:47:141:85 | KeyOperationAlgorithm |
+| jca/Encryption1.java:141:47:141:85 | ModeOfOperation |
+| jca/Encryption1.java:141:47:141:85 | PaddingAlgorithm |
+| jca/Encryption1.java:142:45:142:56 | Key |
+| jca/Encryption1.java:143:34:143:71 | EncryptOperation |
+| jca/Encryption1.java:143:34:143:71 | KeyOperationOutput |
+| jca/Encryption1.java:143:52:143:70 | Message |
+| jca/Encryption1.java:159:34:159:55 | Parameter |
+| jca/Encryption1.java:159:58:159:68 | Parameter |
+| jca/Encryption1.java:161:56:161:60 | KeyOperationAlgorithm |
+| jca/Encryption1.java:162:21:162:23 | Constant |
+| jca/Encryption1.java:163:28:163:47 | Key |
+| jca/Encryption1.java:163:28:163:47 | KeyGeneration |
+| jca/Encryption1.java:166:47:166:85 | HashAlgorithm |
+| jca/Encryption1.java:166:47:166:85 | KeyOperationAlgorithm |
+| jca/Encryption1.java:166:47:166:85 | ModeOfOperation |
+| jca/Encryption1.java:166:47:166:85 | PaddingAlgorithm |
+| jca/Encryption1.java:167:45:167:56 | Key |
+| jca/Encryption1.java:168:34:168:71 | EncryptOperation |
+| jca/Encryption1.java:168:34:168:71 | KeyOperationOutput |
+| jca/Encryption1.java:168:52:168:70 | Message |
+| jca/Encryption1.java:171:47:171:65 | KeyOperationAlgorithm |
+| jca/Encryption1.java:171:47:171:65 | ModeOfOperation |
+| jca/Encryption1.java:171:47:171:65 | PaddingAlgorithm |
+| jca/Encryption1.java:173:38:173:39 | RandomNumberGeneration |
+| jca/Encryption1.java:175:45:175:50 | Key |
+| jca/Encryption1.java:175:53:175:59 | Nonce |
+| jca/Encryption1.java:176:32:176:65 | EncryptOperation |
+| jca/Encryption1.java:176:32:176:65 | KeyOperationOutput |
+| jca/Encryption1.java:176:50:176:64 | Message |
+| jca/Encryption2.java:55:60:55:70 | EllipticCurve |
+| jca/Encryption2.java:56:16:56:49 | Key |
+| jca/Encryption2.java:56:16:56:49 | KeyGeneration |
+| jca/Encryption2.java:71:62:71:67 | KeyAgreementAlgorithm |
+| jca/Encryption2.java:72:27:72:36 | Key |
+| jca/Encryption2.java:73:30:73:38 | Key |
+| jca/Encryption2.java:74:16:74:44 | KeyAgreementOperation |
+| jca/Encryption2.java:74:16:74:44 | SharedSecret |
+| jca/Encryption2.java:90:38:90:65 | Parameter |
+| jca/Encryption2.java:90:68:90:78 | Parameter |
+| jca/Encryption2.java:99:58:99:66 | HashAlgorithm |
+| jca/Encryption2.java:100:30:100:56 | Digest |
+| jca/Encryption2.java:100:30:100:56 | HashOperation |
+| jca/Encryption2.java:100:44:100:55 | Message |
+| jca/Encryption2.java:105:47:105:65 | KeyOperationAlgorithm |
+| jca/Encryption2.java:105:47:105:65 | ModeOfOperation |
+| jca/Encryption2.java:105:47:105:65 | PaddingAlgorithm |
+| jca/Encryption2.java:107:38:107:39 | RandomNumberGeneration |
+| jca/Encryption2.java:109:45:109:50 | Key |
+| jca/Encryption2.java:109:53:109:59 | Nonce |
+| jca/Encryption2.java:110:32:110:65 | EncryptOperation |
+| jca/Encryption2.java:110:32:110:65 | KeyOperationOutput |
+| jca/Encryption2.java:110:50:110:64 | Message |
+| jca/Encryption2.java:132:45:132:65 | Parameter |
+| jca/Encryption2.java:132:68:132:88 | Parameter |
+| jca/Encryption2.java:145:47:145:65 | KeyOperationAlgorithm |
+| jca/Encryption2.java:145:47:145:65 | ModeOfOperation |
+| jca/Encryption2.java:145:47:145:65 | PaddingAlgorithm |
+| jca/Encryption2.java:147:38:147:39 | RandomNumberGeneration |
+| jca/Encryption2.java:149:45:149:50 | Key |
+| jca/Encryption2.java:149:53:149:59 | Nonce |
+| jca/Encryption2.java:150:32:150:98 | EncryptOperation |
+| jca/Encryption2.java:150:32:150:98 | KeyOperationOutput |
+| jca/Encryption2.java:150:50:150:86 | Constant |
+| jca/Encryption2.java:150:50:150:97 | Message |
+| jca/Encryption2.java:173:36:173:47 | HMACAlgorithm |
+| jca/Encryption2.java:173:36:173:47 | HashAlgorithm |
+| jca/Encryption2.java:175:19:175:27 | Key |
+| jca/Encryption2.java:176:31:176:52 | KeyOperationOutput |
+| jca/Encryption2.java:176:31:176:52 | MACOperation |
+| jca/Encryption2.java:176:44:176:51 | Message |
+| jca/Hash.java:75:58:75:66 | HashAlgorithm |
+| jca/Hash.java:76:23:76:66 | Digest |
+| jca/Hash.java:76:23:76:66 | HashOperation |
+| jca/Hash.java:76:37:76:54 | Constant |
+| jca/Hash.java:76:37:76:65 | Message |
+| jca/Hash.java:88:61:88:65 | HashAlgorithm |
+| jca/Hash.java:89:23:89:70 | Digest |
+| jca/Hash.java:89:23:89:70 | HashOperation |
+| jca/Hash.java:89:40:89:58 | Constant |
+| jca/Hash.java:89:40:89:69 | Message |
+| jca/Hash.java:133:29:133:40 | Parameter |
+| jca/Hash.java:133:43:133:63 | Parameter |
+| jca/Hash.java:134:53:134:67 | HashAlgorithm |
+| jca/Hash.java:134:53:134:67 | KeyOperationAlgorithm |
+| jca/Hash.java:135:28:135:37 | Key |
+| jca/Hash.java:136:26:136:41 | Message |
+| jca/Hash.java:137:29:137:44 | SignOperation |
+| jca/Hash.java:137:29:137:44 | SignatureOutput |
+| jca/Hash.java:154:40:154:51 | Parameter |
+| jca/Hash.java:154:54:154:70 | Parameter |
+| jca/Hash.java:154:73:154:91 | Parameter |
+| jca/Hash.java:155:53:155:67 | HashAlgorithm |
+| jca/Hash.java:155:53:155:67 | KeyOperationAlgorithm |
+| jca/Hash.java:156:30:156:38 | Key |
+| jca/Hash.java:157:26:157:41 | Message |
+| jca/Hash.java:158:16:158:43 | VerifyOperation |
+| jca/Hash.java:158:33:158:42 | SignatureInput |
+| jca/Hash.java:172:43:172:53 | Parameter |
+| jca/Hash.java:173:58:173:66 | HashAlgorithm |
+| jca/Hash.java:174:23:174:52 | Digest |
+| jca/Hash.java:174:23:174:52 | HashOperation |
+| jca/Hash.java:174:37:174:51 | Message |
+| jca/Hash.java:190:43:190:54 | Parameter |
+| jca/Hash.java:191:31:192:48 | Constant |
+| jca/Hash.java:191:32:191:38 | HashAlgorithm |
+| jca/Hash.java:191:41:191:49 | HashAlgorithm |
+| jca/Hash.java:191:52:191:60 | HashAlgorithm |
+| jca/Hash.java:191:63:191:71 | HashAlgorithm |
+| jca/Hash.java:191:74:191:82 | HashAlgorithm |
+| jca/Hash.java:191:85:191:94 | HashAlgorithm |
+| jca/Hash.java:191:97:191:106 | HashAlgorithm |
+| jca/Hash.java:192:13:192:25 | HashAlgorithm |
+| jca/Hash.java:192:43:192:47 | HashAlgorithm |
+| jca/Hash.java:195:27:195:57 | Digest |
+| jca/Hash.java:195:27:195:57 | HashOperation |
+| jca/Hash.java:195:41:195:56 | Message |
+| jca/Hash.java:211:43:211:54 | Parameter |
+| jca/Hash.java:211:57:211:66 | Parameter |
+| jca/Hash.java:212:31:212:116 | Constant |
+| jca/Hash.java:212:32:212:41 | HMACAlgorithm |
+| jca/Hash.java:212:32:212:41 | HashAlgorithm |
+| jca/Hash.java:212:44:212:55 | HMACAlgorithm |
+| jca/Hash.java:212:44:212:55 | HashAlgorithm |
+| jca/Hash.java:212:58:212:69 | HMACAlgorithm |
+| jca/Hash.java:212:58:212:69 | HashAlgorithm |
+| jca/Hash.java:212:72:212:83 | HMACAlgorithm |
+| jca/Hash.java:212:72:212:83 | HashAlgorithm |
+| jca/Hash.java:212:86:212:99 | HMACAlgorithm |
+| jca/Hash.java:212:86:212:99 | HashAlgorithm |
+| jca/Hash.java:212:102:212:115 | HMACAlgorithm |
+| jca/Hash.java:212:102:212:115 | HashAlgorithm |
+| jca/Hash.java:216:22:216:30 | Key |
+| jca/Hash.java:217:27:217:55 | KeyOperationOutput |
+| jca/Hash.java:217:27:217:55 | MACOperation |
+| jca/Hash.java:217:39:217:54 | Message |
+| jca/Hash.java:232:40:232:54 | Parameter |
+| jca/Hash.java:235:42:235:63 | Message |
+| jca/Hash.java:235:66:235:69 | Salt |
+| jca/Hash.java:235:72:235:76 | Constant |
+| jca/Hash.java:235:79:235:81 | Constant |
+| jca/Hash.java:236:65:236:86 | HMACAlgorithm |
+| jca/Hash.java:236:65:236:86 | HashAlgorithm |
+| jca/Hash.java:236:65:236:86 | KeyDerivationAlgorithm |
+| jca/Hash.java:237:23:237:50 | Key |
+| jca/Hash.java:237:23:237:50 | KeyDerivation |
+| jca/Hash.java:252:23:252:70 | Digest |
+| jca/Hash.java:252:23:252:70 | HashOperation |
+| jca/Hash.java:252:37:252:58 | Constant |
+| jca/Hash.java:252:37:252:69 | Message |
+| jca/Hash.java:266:31:266:76 | Constant |
+| jca/Hash.java:266:32:266:40 | HashAlgorithm |
+| jca/Hash.java:266:43:266:51 | HashAlgorithm |
+| jca/Hash.java:266:54:266:63 | HashAlgorithm |
+| jca/Hash.java:266:66:266:75 | HashAlgorithm |
+| jca/Hash.java:269:27:269:38 | Constant |
+| jca/Hash.java:270:27:270:30 | Message |
+| jca/Hash.java:271:40:271:54 | Digest |
+| jca/Hash.java:271:40:271:54 | HashOperation |
+| jca/Hash.java:294:16:294:66 | Constant |
+| jca/Hash.java:294:16:294:66 | LocalData |
+| jca/Hash.java:294:57:294:65 | HashAlgorithm |
+| jca/Hash.java:310:38:310:41 | RandomNumberGeneration |
+| jca/IVArtifact.java:30:44:30:65 | KeyOperationAlgorithm |
+| jca/IVArtifact.java:30:44:30:65 | ModeOfOperation |
+| jca/IVArtifact.java:30:44:30:65 | PaddingAlgorithm |
+| jca/IVArtifact.java:31:42:31:44 | Key |
+| jca/IVArtifact.java:31:47:31:52 | Nonce |
+| jca/IVArtifact.java:32:29:32:73 | EncryptOperation |
+| jca/IVArtifact.java:32:29:32:73 | KeyOperationOutput |
+| jca/IVArtifact.java:32:44:32:61 | Constant |
+| jca/IVArtifact.java:32:44:32:72 | Message |
+| jca/IVArtifact.java:38:42:38:44 | Key |
+| jca/IVArtifact.java:38:47:38:52 | Nonce |
+| jca/IVArtifact.java:39:29:39:53 | EncryptOperation |
+| jca/IVArtifact.java:39:29:39:53 | KeyOperationOutput |
+| jca/IVArtifact.java:39:44:39:52 | Message |
+| jca/IVArtifact.java:49:27:49:42 | Constant |
+| jca/IVArtifact.java:70:16:70:81 | Constant |
+| jca/IVArtifact.java:70:16:70:81 | LocalData |
+| jca/IVArtifact.java:70:59:70:80 | KeyOperationAlgorithm |
+| jca/IVArtifact.java:70:59:70:80 | ModeOfOperation |
+| jca/IVArtifact.java:70:59:70:80 | PaddingAlgorithm |
+| jca/IVArtifact.java:74:56:74:60 | KeyOperationAlgorithm |
+| jca/IVArtifact.java:75:21:75:23 | Constant |
+| jca/IVArtifact.java:76:16:76:35 | Key |
+| jca/IVArtifact.java:76:16:76:35 | KeyGeneration |
+| jca/IVArtifact.java:81:38:81:39 | RandomNumberGeneration |
+| jca/IVArtifact.java:87:32:87:33 | RandomNumberGeneration |
+| jca/IVArtifact.java:105:44:105:62 | KeyOperationAlgorithm |
+| jca/IVArtifact.java:105:44:105:62 | ModeOfOperation |
+| jca/IVArtifact.java:105:44:105:62 | PaddingAlgorithm |
+| jca/IVArtifact.java:108:42:108:44 | Key |
+| jca/IVArtifact.java:108:47:108:50 | Nonce |
+| jca/IVArtifact.java:109:16:109:40 | EncryptOperation |
+| jca/IVArtifact.java:109:16:109:40 | KeyOperationOutput |
+| jca/IVArtifact.java:109:31:109:39 | Message |
+| jca/IVArtifact.java:116:31:116:34 | Constant |
+| jca/IVArtifact.java:130:42:130:49 | RandomNumberGeneration |
+| jca/IVArtifact.java:132:44:132:62 | KeyOperationAlgorithm |
+| jca/IVArtifact.java:132:44:132:62 | ModeOfOperation |
+| jca/IVArtifact.java:132:44:132:62 | PaddingAlgorithm |
+| jca/IVArtifact.java:134:42:134:44 | Key |
+| jca/IVArtifact.java:134:47:134:50 | Nonce |
+| jca/IVArtifact.java:135:16:135:40 | EncryptOperation |
+| jca/IVArtifact.java:135:16:135:40 | KeyOperationOutput |
+| jca/IVArtifact.java:135:31:135:39 | Message |
+| jca/IVArtifact.java:153:58:153:66 | HashAlgorithm |
+| jca/IVArtifact.java:154:31:154:78 | Digest |
+| jca/IVArtifact.java:154:31:154:78 | HashOperation |
+| jca/IVArtifact.java:154:45:154:59 | Constant |
+| jca/IVArtifact.java:154:45:154:77 | Message |
+| jca/IVArtifact.java:156:44:156:62 | KeyOperationAlgorithm |
+| jca/IVArtifact.java:156:44:156:62 | ModeOfOperation |
+| jca/IVArtifact.java:156:44:156:62 | PaddingAlgorithm |
+| jca/IVArtifact.java:158:42:158:44 | Key |
+| jca/IVArtifact.java:158:47:158:50 | Nonce |
+| jca/IVArtifact.java:159:16:159:40 | EncryptOperation |
+| jca/IVArtifact.java:159:16:159:40 | KeyOperationOutput |
+| jca/IVArtifact.java:159:31:159:39 | Message |
+| jca/IVArtifact.java:177:38:177:39 | RandomNumberGeneration |
+| jca/IVArtifact.java:180:48:180:66 | KeyOperationAlgorithm |
+| jca/IVArtifact.java:180:48:180:66 | ModeOfOperation |
+| jca/IVArtifact.java:180:48:180:66 | PaddingAlgorithm |
+| jca/IVArtifact.java:182:46:182:48 | Key |
+| jca/IVArtifact.java:182:51:182:54 | Nonce |
+| jca/IVArtifact.java:183:30:183:58 | EncryptOperation |
+| jca/IVArtifact.java:183:30:183:58 | KeyOperationOutput |
+| jca/IVArtifact.java:183:45:183:57 | Message |
+| jca/IVArtifact.java:198:44:198:62 | KeyOperationAlgorithm |
+| jca/IVArtifact.java:198:44:198:62 | ModeOfOperation |
+| jca/IVArtifact.java:198:44:198:62 | PaddingAlgorithm |
+| jca/IVArtifact.java:201:42:201:44 | Key |
+| jca/IVArtifact.java:201:47:201:50 | Nonce |
+| jca/IVArtifact.java:202:16:202:40 | EncryptOperation |
+| jca/IVArtifact.java:202:16:202:40 | KeyOperationOutput |
+| jca/IVArtifact.java:202:31:202:39 | Message |
+| jca/IVArtifact.java:215:53:215:65 | Parameter |
+| jca/IVArtifact.java:215:68:215:83 | Parameter |
+| jca/IVArtifact.java:235:60:235:72 | Parameter |
+| jca/IVArtifact.java:235:75:235:90 | Parameter |
+| jca/IVArtifact.java:253:56:253:60 | KeyOperationAlgorithm |
+| jca/IVArtifact.java:254:21:254:23 | Constant |
+| jca/IVArtifact.java:255:29:255:44 | Key |
+| jca/IVArtifact.java:255:29:255:44 | KeyGeneration |
+| jca/IVArtifact.java:256:32:256:47 | Constant |
+| jca/IVArtifact.java:275:34:275:46 | Constant |
+| jca/IVArtifact.java:275:60:275:72 | Constant |
+| jca/IVArtifact.java:275:86:275:100 | Constant |
+| jca/KeyAgreementHybridCryptosystem.java:50:47:50:57 | EllipticCurve |
+| jca/KeyAgreementHybridCryptosystem.java:51:16:51:36 | Key |
+| jca/KeyAgreementHybridCryptosystem.java:51:16:51:36 | KeyGeneration |
+| jca/KeyAgreementHybridCryptosystem.java:58:61:58:68 | KeyAgreementAlgorithm |
+| jca/KeyAgreementHybridCryptosystem.java:59:24:59:26 | Constant |
+| jca/KeyAgreementHybridCryptosystem.java:60:16:60:36 | Key |
+| jca/KeyAgreementHybridCryptosystem.java:60:16:60:36 | KeyGeneration |
+| jca/KeyAgreementHybridCryptosystem.java:68:17:68:26 | Key |
+| jca/KeyAgreementHybridCryptosystem.java:69:20:69:28 | Key |
+| jca/KeyAgreementHybridCryptosystem.java:70:16:70:34 | KeyAgreementOperation |
+| jca/KeyAgreementHybridCryptosystem.java:70:16:70:34 | SharedSecret |
+| jca/KeyAgreementHybridCryptosystem.java:78:58:78:66 | HashAlgorithm |
+| jca/KeyAgreementHybridCryptosystem.java:79:23:79:42 | Digest |
+| jca/KeyAgreementHybridCryptosystem.java:79:23:79:42 | HashOperation |
+| jca/KeyAgreementHybridCryptosystem.java:79:37:79:41 | Message |
+| jca/KeyAgreementHybridCryptosystem.java:104:90:104:95 | KeyAgreementAlgorithm |
+| jca/KeyAgreementHybridCryptosystem.java:108:44:108:62 | KeyOperationAlgorithm |
+| jca/KeyAgreementHybridCryptosystem.java:108:44:108:62 | ModeOfOperation |
+| jca/KeyAgreementHybridCryptosystem.java:108:44:108:62 | PaddingAlgorithm |
+| jca/KeyAgreementHybridCryptosystem.java:110:38:110:39 | RandomNumberGeneration |
+| jca/KeyAgreementHybridCryptosystem.java:112:42:112:47 | Key |
+| jca/KeyAgreementHybridCryptosystem.java:112:50:112:53 | Nonce |
+| jca/KeyAgreementHybridCryptosystem.java:113:29:113:53 | EncryptOperation |
+| jca/KeyAgreementHybridCryptosystem.java:113:29:113:53 | KeyOperationOutput |
+| jca/KeyAgreementHybridCryptosystem.java:113:44:113:52 | Message |
+| jca/KeyAgreementHybridCryptosystem.java:125:95:125:100 | KeyAgreementAlgorithm |
+| jca/KeyAgreementHybridCryptosystem.java:130:44:130:62 | KeyOperationAlgorithm |
+| jca/KeyAgreementHybridCryptosystem.java:130:44:130:62 | ModeOfOperation |
+| jca/KeyAgreementHybridCryptosystem.java:130:44:130:62 | PaddingAlgorithm |
+| jca/KeyAgreementHybridCryptosystem.java:132:42:132:47 | Key |
+| jca/KeyAgreementHybridCryptosystem.java:132:50:132:53 | Nonce |
+| jca/KeyAgreementHybridCryptosystem.java:133:29:133:53 | EncryptOperation |
+| jca/KeyAgreementHybridCryptosystem.java:133:29:133:53 | KeyOperationOutput |
+| jca/KeyAgreementHybridCryptosystem.java:133:44:133:52 | Message |
+| jca/KeyAgreementHybridCryptosystem.java:149:91:149:98 | KeyAgreementAlgorithm |
+| jca/KeyAgreementHybridCryptosystem.java:150:33:150:89 | Digest |
+| jca/KeyAgreementHybridCryptosystem.java:150:33:150:89 | HashOperation |
+| jca/KeyAgreementHybridCryptosystem.java:150:59:150:67 | HashAlgorithm |
+| jca/KeyAgreementHybridCryptosystem.java:150:77:150:88 | Message |
+| jca/KeyAgreementHybridCryptosystem.java:153:44:153:62 | KeyOperationAlgorithm |
+| jca/KeyAgreementHybridCryptosystem.java:155:38:155:42 | RandomNumberGeneration |
+| jca/KeyAgreementHybridCryptosystem.java:156:42:156:50 | Key |
+| jca/KeyAgreementHybridCryptosystem.java:156:53:156:78 | Nonce |
+| jca/KeyAgreementHybridCryptosystem.java:157:29:157:53 | EncryptOperation |
+| jca/KeyAgreementHybridCryptosystem.java:157:29:157:53 | KeyOperationOutput |
+| jca/KeyAgreementHybridCryptosystem.java:157:44:157:52 | Message |
+| jca/KeyAgreementHybridCryptosystem.java:169:95:169:102 | KeyAgreementAlgorithm |
+| jca/KeyAgreementHybridCryptosystem.java:174:44:174:62 | KeyOperationAlgorithm |
+| jca/KeyAgreementHybridCryptosystem.java:175:42:175:50 | Key |
+| jca/KeyAgreementHybridCryptosystem.java:175:53:175:83 | Nonce |
+| jca/KeyAgreementHybridCryptosystem.java:176:29:176:53 | EncryptOperation |
+| jca/KeyAgreementHybridCryptosystem.java:176:29:176:53 | KeyOperationOutput |
+| jca/KeyAgreementHybridCryptosystem.java:176:44:176:52 | Message |
+| jca/KeyAgreementHybridCryptosystem.java:188:58:188:73 | Parameter |
+| jca/KeyAgreementHybridCryptosystem.java:212:58:212:70 | Parameter |
+| jca/KeyAgreementHybridCryptosystem.java:212:73:212:88 | Parameter |
+| jca/KeyAgreementHybridCryptosystem.java:215:42:215:66 | Message |
+| jca/KeyAgreementHybridCryptosystem.java:215:69:215:72 | Salt |
+| jca/KeyAgreementHybridCryptosystem.java:215:75:215:79 | Constant |
+| jca/KeyAgreementHybridCryptosystem.java:215:82:215:84 | Constant |
+| jca/KeyAgreementHybridCryptosystem.java:216:65:216:86 | HMACAlgorithm |
+| jca/KeyAgreementHybridCryptosystem.java:216:65:216:86 | HashAlgorithm |
+| jca/KeyAgreementHybridCryptosystem.java:216:65:216:86 | KeyDerivationAlgorithm |
+| jca/KeyAgreementHybridCryptosystem.java:217:26:217:53 | Key |
+| jca/KeyAgreementHybridCryptosystem.java:217:26:217:53 | KeyDerivation |
+| jca/KeyAgreementHybridCryptosystem.java:223:44:223:62 | KeyOperationAlgorithm |
+| jca/KeyAgreementHybridCryptosystem.java:223:44:223:62 | ModeOfOperation |
+| jca/KeyAgreementHybridCryptosystem.java:223:44:223:62 | PaddingAlgorithm |
+| jca/KeyAgreementHybridCryptosystem.java:225:38:225:39 | RandomNumberGeneration |
+| jca/KeyAgreementHybridCryptosystem.java:227:42:227:54 | Key |
+| jca/KeyAgreementHybridCryptosystem.java:227:57:227:63 | Nonce |
+| jca/KeyAgreementHybridCryptosystem.java:228:29:228:53 | EncryptOperation |
+| jca/KeyAgreementHybridCryptosystem.java:228:29:228:53 | KeyOperationOutput |
+| jca/KeyAgreementHybridCryptosystem.java:228:44:228:52 | Message |
+| jca/KeyAgreementHybridCryptosystem.java:230:35:230:46 | HMACAlgorithm |
+| jca/KeyAgreementHybridCryptosystem.java:230:35:230:46 | HashAlgorithm |
+| jca/KeyAgreementHybridCryptosystem.java:231:18:231:30 | Key |
+| jca/KeyAgreementHybridCryptosystem.java:232:30:232:52 | KeyOperationOutput |
+| jca/KeyAgreementHybridCryptosystem.java:232:30:232:52 | MACOperation |
+| jca/KeyAgreementHybridCryptosystem.java:232:42:232:51 | Message |
+| jca/KeyAgreementHybridCryptosystem.java:259:52:259:56 | KeyOperationAlgorithm |
+| jca/KeyAgreementHybridCryptosystem.java:260:17:260:19 | Constant |
+| jca/KeyAgreementHybridCryptosystem.java:261:16:261:31 | Key |
+| jca/KeyAgreementHybridCryptosystem.java:261:16:261:31 | KeyGeneration |
+| jca/KeyAgreementHybridCryptosystem.java:269:38:269:41 | RandomNumberGeneration |
+| jca/KeyArtifact.java:18:56:18:60 | KeyOperationAlgorithm |
+| jca/KeyArtifact.java:19:21:19:23 | Constant |
+| jca/KeyArtifact.java:20:31:20:50 | Key |
+| jca/KeyArtifact.java:20:31:20:50 | KeyGeneration |
+| jca/KeyArtifact.java:23:43:23:47 | KeyOperationAlgorithm |
+| jca/KeyArtifact.java:24:21:24:23 | Constant |
+| jca/KeyArtifact.java:25:30:25:49 | Key |
+| jca/KeyArtifact.java:25:30:25:49 | KeyGeneration |
+| jca/KeyArtifact.java:30:68:30:72 | KeyOperationAlgorithm |
+| jca/KeyArtifact.java:31:31:31:34 | Constant |
+| jca/KeyArtifact.java:32:30:32:57 | Key |
+| jca/KeyArtifact.java:32:30:32:57 | KeyGeneration |
+| jca/KeyArtifact.java:35:51:35:55 | KeyOperationAlgorithm |
+| jca/KeyArtifact.java:36:31:36:34 | Constant |
+| jca/KeyArtifact.java:37:29:37:56 | Key |
+| jca/KeyArtifact.java:37:29:37:56 | KeyGeneration |
+| jca/KeyArtifact.java:41:31:41:33 | Constant |
+| jca/KeyArtifact.java:42:26:42:53 | Key |
+| jca/KeyArtifact.java:42:26:42:53 | KeyGeneration |
+| jca/KeyArtifact.java:62:28:62:73 | Constant |
+| jca/KeyArtifact.java:62:28:62:73 | LocalData |
+| jca/KeyArtifact.java:62:68:62:72 | KeyOperationAlgorithm |
+| jca/KeyArtifact.java:65:21:65:23 | Constant |
+| jca/KeyArtifact.java:66:32:66:51 | Key |
+| jca/KeyArtifact.java:66:32:66:51 | KeyGeneration |
+| jca/KeyArtifact.java:72:31:72:34 | Constant |
+| jca/KeyArtifact.java:73:16:73:43 | Key |
+| jca/KeyArtifact.java:73:16:73:43 | KeyGeneration |
+| jca/KeyArtifact.java:78:31:78:54 | Constant |
+| jca/KeyArtifact.java:78:32:78:36 | KeyOperationAlgorithm |
+| jca/KeyArtifact.java:78:45:78:53 | KeyOperationAlgorithm |
+| jca/KeyDerivation1.java:78:39:78:53 | Parameter |
+| jca/KeyDerivation1.java:80:42:80:63 | Message |
+| jca/KeyDerivation1.java:80:66:80:69 | Salt |
+| jca/KeyDerivation1.java:80:72:80:76 | Constant |
+| jca/KeyDerivation1.java:80:79:80:81 | Constant |
+| jca/KeyDerivation1.java:81:65:81:86 | HMACAlgorithm |
+| jca/KeyDerivation1.java:81:65:81:86 | HashAlgorithm |
+| jca/KeyDerivation1.java:81:65:81:86 | KeyDerivationAlgorithm |
+| jca/KeyDerivation1.java:82:22:82:49 | Key |
+| jca/KeyDerivation1.java:82:22:82:49 | KeyDerivation |
+| jca/KeyDerivation1.java:92:36:92:50 | Parameter |
+| jca/KeyDerivation1.java:94:42:94:63 | Message |
+| jca/KeyDerivation1.java:94:66:94:69 | Salt |
+| jca/KeyDerivation1.java:94:72:94:73 | Constant |
+| jca/KeyDerivation1.java:94:76:94:78 | Constant |
+| jca/KeyDerivation1.java:95:65:95:86 | HMACAlgorithm |
+| jca/KeyDerivation1.java:95:65:95:86 | HashAlgorithm |
+| jca/KeyDerivation1.java:95:65:95:86 | KeyDerivationAlgorithm |
+| jca/KeyDerivation1.java:96:22:96:49 | Key |
+| jca/KeyDerivation1.java:96:22:96:49 | KeyDerivation |
+| jca/KeyDerivation1.java:106:37:106:51 | Parameter |
+| jca/KeyDerivation1.java:108:42:108:63 | Message |
+| jca/KeyDerivation1.java:108:66:108:69 | Salt |
+| jca/KeyDerivation1.java:108:72:108:80 | Constant |
+| jca/KeyDerivation1.java:108:83:108:85 | Constant |
+| jca/KeyDerivation1.java:109:65:109:86 | HMACAlgorithm |
+| jca/KeyDerivation1.java:109:65:109:86 | HashAlgorithm |
+| jca/KeyDerivation1.java:109:65:109:86 | KeyDerivationAlgorithm |
+| jca/KeyDerivation1.java:110:22:110:49 | Key |
+| jca/KeyDerivation1.java:110:22:110:49 | KeyDerivation |
+| jca/KeyDerivation1.java:120:32:120:46 | Parameter |
+| jca/KeyDerivation1.java:122:42:122:63 | Message |
+| jca/KeyDerivation1.java:122:66:122:69 | Salt |
+| jca/KeyDerivation1.java:122:72:122:76 | Constant |
+| jca/KeyDerivation1.java:122:79:122:81 | Constant |
+| jca/KeyDerivation1.java:123:65:123:84 | HMACAlgorithm |
+| jca/KeyDerivation1.java:123:65:123:84 | HashAlgorithm |
+| jca/KeyDerivation1.java:123:65:123:84 | KeyDerivationAlgorithm |
+| jca/KeyDerivation1.java:124:22:124:49 | Key |
+| jca/KeyDerivation1.java:124:22:124:49 | KeyDerivation |
+| jca/KeyDerivation1.java:134:34:134:48 | Parameter |
+| jca/KeyDerivation1.java:136:42:136:63 | Message |
+| jca/KeyDerivation1.java:136:66:136:69 | Salt |
+| jca/KeyDerivation1.java:136:72:136:77 | Constant |
+| jca/KeyDerivation1.java:136:80:136:82 | Constant |
+| jca/KeyDerivation1.java:137:65:137:86 | HMACAlgorithm |
+| jca/KeyDerivation1.java:137:65:137:86 | HashAlgorithm |
+| jca/KeyDerivation1.java:137:65:137:86 | KeyDerivationAlgorithm |
+| jca/KeyDerivation1.java:138:22:138:49 | Key |
+| jca/KeyDerivation1.java:138:22:138:49 | KeyDerivation |
+| jca/KeyDerivation1.java:154:28:154:42 | Parameter |
+| jca/KeyDerivation1.java:157:42:157:63 | Message |
+| jca/KeyDerivation1.java:157:66:157:69 | Salt |
+| jca/KeyDerivation1.java:157:72:157:75 | Constant |
+| jca/KeyDerivation1.java:157:78:157:80 | Constant |
+| jca/KeyDerivation1.java:158:65:158:72 | Constant |
+| jca/KeyDerivation1.java:159:22:159:49 | Key |
+| jca/KeyDerivation1.java:159:22:159:49 | KeyDerivation |
+| jca/KeyDerivation1.java:169:30:169:44 | Parameter |
+| jca/KeyDerivation1.java:172:42:172:63 | Message |
+| jca/KeyDerivation1.java:172:66:172:69 | Salt |
+| jca/KeyDerivation1.java:172:72:172:76 | Constant |
+| jca/KeyDerivation1.java:172:79:172:81 | Constant |
+| jca/KeyDerivation1.java:173:65:173:72 | Constant |
+| jca/KeyDerivation1.java:174:22:174:49 | Key |
+| jca/KeyDerivation1.java:174:22:174:49 | KeyDerivation |
+| jca/KeyDerivation1.java:242:45:242:56 | Parameter |
+| jca/KeyDerivation1.java:243:58:243:66 | HashAlgorithm |
+| jca/KeyDerivation1.java:244:29:244:59 | Digest |
+| jca/KeyDerivation1.java:244:29:244:59 | HashOperation |
+| jca/KeyDerivation1.java:244:43:244:58 | Message |
+| jca/KeyDerivation1.java:249:70:249:88 | KeyOperationAlgorithm |
+| jca/KeyDerivation1.java:249:70:249:88 | ModeOfOperation |
+| jca/KeyDerivation1.java:249:70:249:88 | PaddingAlgorithm |
+| jca/KeyDerivation1.java:250:55:250:57 | Key |
+| jca/KeyDerivation1.java:251:29:251:74 | EncryptOperation |
+| jca/KeyDerivation1.java:251:29:251:74 | KeyOperationOutput |
+| jca/KeyDerivation1.java:251:44:251:62 | Constant |
+| jca/KeyDerivation1.java:251:44:251:73 | Message |
+| jca/KeyDerivation1.java:269:32:269:41 | Parameter |
+| jca/KeyDerivation1.java:283:43:283:57 | Parameter |
+| jca/KeyDerivation1.java:283:60:283:78 | Parameter |
+| jca/KeyDerivation1.java:302:37:302:51 | Parameter |
+| jca/KeyDerivation1.java:309:25:309:76 | Constant |
+| jca/KeyDerivation1.java:309:25:309:76 | LocalData |
+| jca/KeyDerivation1.java:309:54:309:75 | HMACAlgorithm |
+| jca/KeyDerivation1.java:309:54:309:75 | HashAlgorithm |
+| jca/KeyDerivation1.java:309:54:309:75 | KeyDerivationAlgorithm |
+| jca/KeyDerivation1.java:310:43:310:86 | Constant |
+| jca/KeyDerivation1.java:310:43:310:86 | LocalData |
+| jca/KeyDerivation1.java:311:40:311:78 | Constant |
+| jca/KeyDerivation1.java:311:40:311:78 | LocalData |
+| jca/KeyDerivation1.java:314:42:314:63 | Message |
+| jca/KeyDerivation1.java:314:66:314:69 | Salt |
+| jca/KeyDerivation1.java:316:26:316:53 | Key |
+| jca/KeyDerivation1.java:316:26:316:53 | KeyDerivation |
+| jca/KeyDerivation1.java:333:42:333:63 | Message |
+| jca/KeyDerivation1.java:333:66:333:69 | Salt |
+| jca/KeyDerivation1.java:333:72:333:76 | Constant |
+| jca/KeyDerivation1.java:333:79:333:81 | Constant |
+| jca/KeyDerivation1.java:334:65:334:86 | HMACAlgorithm |
+| jca/KeyDerivation1.java:334:65:334:86 | HashAlgorithm |
+| jca/KeyDerivation1.java:334:65:334:86 | KeyDerivationAlgorithm |
+| jca/KeyDerivation1.java:335:16:335:43 | Key |
+| jca/KeyDerivation1.java:335:16:335:43 | KeyDerivation |
+| jca/KeyDerivation1.java:345:36:345:47 | HMACAlgorithm |
+| jca/KeyDerivation1.java:345:36:345:47 | HashAlgorithm |
+| jca/KeyDerivation1.java:347:19:347:27 | Key |
+| jca/KeyDerivation1.java:348:22:348:38 | KeyOperationOutput |
+| jca/KeyDerivation1.java:348:22:348:38 | MACOperation |
+| jca/KeyDerivation1.java:348:35:348:37 | Message |
+| jca/KeyDerivation1.java:352:19:352:54 | Key |
+| jca/KeyDerivation1.java:353:22:353:62 | KeyOperationOutput |
+| jca/KeyDerivation1.java:353:22:353:62 | MACOperation |
+| jca/KeyDerivation1.java:353:35:353:50 | Constant |
+| jca/KeyDerivation1.java:353:35:353:61 | Message |
+| jca/KeyDerivation1.java:365:38:365:41 | RandomNumberGeneration |
+| jca/KeyEncapsulation.java:60:56:60:60 | KeyOperationAlgorithm |
+| jca/KeyEncapsulation.java:61:21:61:23 | Constant |
+| jca/KeyEncapsulation.java:62:28:62:47 | Key |
+| jca/KeyEncapsulation.java:62:28:62:47 | KeyGeneration |
+| jca/KeyEncapsulation.java:67:47:67:85 | HashAlgorithm |
+| jca/KeyEncapsulation.java:67:47:67:85 | KeyOperationAlgorithm |
+| jca/KeyEncapsulation.java:67:47:67:85 | ModeOfOperation |
+| jca/KeyEncapsulation.java:67:47:67:85 | PaddingAlgorithm |
+| jca/KeyEncapsulation.java:68:45:68:50 | Key |
+| jca/KeyEncapsulation.java:69:29:69:66 | EncryptOperation |
+| jca/KeyEncapsulation.java:69:29:69:66 | KeyOperationOutput |
+| jca/KeyEncapsulation.java:69:47:69:65 | Message |
+| jca/KeyEncapsulation.java:73:47:73:65 | KeyOperationAlgorithm |
+| jca/KeyEncapsulation.java:73:47:73:65 | ModeOfOperation |
+| jca/KeyEncapsulation.java:73:47:73:65 | PaddingAlgorithm |
+| jca/KeyEncapsulation.java:75:38:75:39 | RandomNumberGeneration |
+| jca/KeyEncapsulation.java:77:45:77:50 | Key |
+| jca/KeyEncapsulation.java:77:53:77:59 | Nonce |
+| jca/KeyEncapsulation.java:78:29:78:80 | EncryptOperation |
+| jca/KeyEncapsulation.java:78:29:78:80 | KeyOperationOutput |
+| jca/KeyEncapsulation.java:78:47:78:68 | Constant |
+| jca/KeyEncapsulation.java:78:47:78:79 | Message |
+| jca/KeyEncapsulation.java:91:37:91:54 | Parameter |
+| jca/KeyEncapsulation.java:91:57:91:73 | Parameter |
+| jca/KeyEncapsulation.java:92:47:92:85 | HashAlgorithm |
+| jca/KeyEncapsulation.java:92:47:92:85 | KeyOperationAlgorithm |
+| jca/KeyEncapsulation.java:92:47:92:85 | ModeOfOperation |
+| jca/KeyEncapsulation.java:92:47:92:85 | PaddingAlgorithm |
+| jca/KeyEncapsulation.java:93:45:93:51 | Key |
+| jca/KeyEncapsulation.java:94:30:94:58 | DecryptOperation |
+| jca/KeyEncapsulation.java:94:30:94:58 | KeyOperationOutput |
+| jca/KeyEncapsulation.java:94:48:94:57 | Message |
+| jca/KeyEncapsulation.java:117:47:117:57 | EllipticCurve |
+| jca/KeyEncapsulation.java:118:31:118:51 | Key |
+| jca/KeyEncapsulation.java:118:31:118:51 | KeyGeneration |
+| jca/KeyEncapsulation.java:121:52:121:57 | KeyAgreementAlgorithm |
+| jca/KeyEncapsulation.java:122:17:122:40 | Key |
+| jca/KeyEncapsulation.java:123:20:123:24 | Key |
+| jca/KeyEncapsulation.java:124:31:124:49 | KeyAgreementOperation |
+| jca/KeyEncapsulation.java:124:31:124:49 | SharedSecret |
+| jca/KeyEncapsulation.java:133:47:133:65 | KeyOperationAlgorithm |
+| jca/KeyEncapsulation.java:133:47:133:65 | ModeOfOperation |
+| jca/KeyEncapsulation.java:133:47:133:65 | PaddingAlgorithm |
+| jca/KeyEncapsulation.java:135:38:135:39 | RandomNumberGeneration |
+| jca/KeyEncapsulation.java:136:45:136:50 | Key |
+| jca/KeyEncapsulation.java:136:53:136:81 | Nonce |
+| jca/KeyEncapsulation.java:137:29:137:73 | EncryptOperation |
+| jca/KeyEncapsulation.java:137:29:137:73 | KeyOperationOutput |
+| jca/KeyEncapsulation.java:137:47:137:61 | Constant |
+| jca/KeyEncapsulation.java:137:47:137:72 | Message |
+| jca/KeyEncapsulation.java:186:47:186:57 | EllipticCurve |
+| jca/KeyEncapsulation.java:187:31:187:51 | Key |
+| jca/KeyEncapsulation.java:187:31:187:51 | KeyGeneration |
+| jca/KeyEncapsulation.java:188:52:188:57 | KeyAgreementAlgorithm |
+| jca/KeyEncapsulation.java:189:17:189:40 | Key |
+| jca/KeyEncapsulation.java:190:20:190:34 | Key |
+| jca/KeyEncapsulation.java:191:31:191:49 | KeyAgreementOperation |
+| jca/KeyEncapsulation.java:191:31:191:49 | SharedSecret |
+| jca/KeyEncapsulation.java:207:64:207:68 | KeyOperationAlgorithm |
+| jca/KeyEncapsulation.java:208:27:208:30 | Constant |
+| jca/KeyEncapsulation.java:209:25:209:48 | Key |
+| jca/KeyEncapsulation.java:209:25:209:48 | KeyGeneration |
+| jca/KeyEncapsulation.java:214:49:214:59 | EllipticCurve |
+| jca/KeyEncapsulation.java:215:24:215:46 | Key |
+| jca/KeyEncapsulation.java:215:24:215:46 | KeyGeneration |
+| jca/KeyEncapsulation.java:226:31:226:53 | Key |
+| jca/KeyEncapsulation.java:226:31:226:53 | KeyGeneration |
+| jca/KeyExchange.java:52:63:52:66 | KeyAgreementAlgorithm |
+| jca/KeyExchange.java:53:26:53:29 | Constant |
+| jca/KeyExchange.java:54:16:54:38 | Key |
+| jca/KeyExchange.java:54:16:54:38 | KeyGeneration |
+| jca/KeyExchange.java:67:63:67:66 | KeyAgreementAlgorithm |
+| jca/KeyExchange.java:69:26:69:28 | Constant |
+| jca/KeyExchange.java:70:16:70:38 | Key |
+| jca/KeyExchange.java:70:16:70:38 | KeyGeneration |
+| jca/KeyExchange.java:83:63:83:66 | KeyAgreementAlgorithm |
+| jca/KeyExchange.java:84:26:84:29 | Constant |
+| jca/KeyExchange.java:85:16:85:38 | Key |
+| jca/KeyExchange.java:85:16:85:38 | KeyGeneration |
+| jca/KeyExchange.java:99:52:99:55 | KeyAgreementAlgorithm |
+| jca/KeyExchange.java:100:17:100:26 | Key |
+| jca/KeyExchange.java:101:20:101:28 | Key |
+| jca/KeyExchange.java:102:16:102:34 | KeyAgreementOperation |
+| jca/KeyExchange.java:102:16:102:34 | SharedSecret |
+| jca/KeyExchange.java:121:49:121:59 | EllipticCurve |
+| jca/KeyExchange.java:122:16:122:38 | Key |
+| jca/KeyExchange.java:122:16:122:38 | KeyGeneration |
+| jca/KeyExchange.java:136:52:136:57 | KeyAgreementAlgorithm |
+| jca/KeyExchange.java:137:17:137:26 | Key |
+| jca/KeyExchange.java:138:20:138:28 | Key |
+| jca/KeyExchange.java:139:16:139:34 | KeyAgreementOperation |
+| jca/KeyExchange.java:139:16:139:34 | SharedSecret |
+| jca/KeyExchange.java:156:61:156:68 | KeyAgreementAlgorithm |
+| jca/KeyExchange.java:158:24:158:26 | Constant |
+| jca/KeyExchange.java:159:16:159:36 | Key |
+| jca/KeyExchange.java:159:16:159:36 | KeyGeneration |
+| jca/KeyExchange.java:173:52:173:59 | KeyAgreementAlgorithm |
+| jca/KeyExchange.java:174:17:174:26 | Key |
+| jca/KeyExchange.java:175:20:175:28 | Key |
+| jca/KeyExchange.java:176:16:176:34 | KeyAgreementOperation |
+| jca/KeyExchange.java:176:16:176:34 | SharedSecret |
+| jca/KeyExchange.java:193:61:193:66 | KeyAgreementAlgorithm |
+| jca/KeyExchange.java:195:24:195:26 | Constant |
+| jca/KeyExchange.java:196:16:196:36 | Key |
+| jca/KeyExchange.java:196:16:196:36 | KeyGeneration |
+| jca/KeyExchange.java:210:52:210:57 | KeyAgreementAlgorithm |
+| jca/KeyExchange.java:211:17:211:26 | Key |
+| jca/KeyExchange.java:212:20:212:28 | Key |
+| jca/KeyExchange.java:213:16:213:34 | KeyAgreementOperation |
+| jca/KeyExchange.java:213:16:213:34 | SharedSecret |
+| jca/MACOperation.java:59:36:59:49 | Parameter |
+| jca/MACOperation.java:59:52:59:61 | Parameter |
+| jca/MACOperation.java:60:35:60:46 | HMACAlgorithm |
+| jca/MACOperation.java:60:35:60:46 | HashAlgorithm |
+| jca/MACOperation.java:62:18:62:26 | Key |
+| jca/MACOperation.java:63:16:63:46 | KeyOperationOutput |
+| jca/MACOperation.java:63:16:63:46 | MACOperation |
+| jca/MACOperation.java:63:28:63:45 | Message |
+| jca/MACOperation.java:70:34:70:47 | Parameter |
+| jca/MACOperation.java:70:50:70:59 | Parameter |
+| jca/MACOperation.java:71:35:71:48 | HMACAlgorithm |
+| jca/MACOperation.java:71:35:71:48 | HashAlgorithm |
+| jca/MACOperation.java:73:18:73:26 | Key |
+| jca/MACOperation.java:74:16:74:46 | KeyOperationOutput |
+| jca/MACOperation.java:74:16:74:46 | MACOperation |
+| jca/MACOperation.java:74:28:74:45 | Message |
+| jca/MACOperation.java:81:34:81:47 | Parameter |
+| jca/MACOperation.java:81:50:81:59 | Parameter |
+| jca/MACOperation.java:82:35:82:44 | KeyOperationAlgorithm |
+| jca/MACOperation.java:84:18:84:26 | Key |
+| jca/MACOperation.java:85:16:85:46 | KeyOperationOutput |
+| jca/MACOperation.java:85:16:85:46 | MACOperation |
+| jca/MACOperation.java:85:28:85:45 | Message |
+| jca/MACOperation.java:92:30:92:43 | Parameter |
+| jca/MACOperation.java:92:46:92:55 | Parameter |
+| jca/MACOperation.java:94:35:94:40 | KeyOperationAlgorithm |
+| jca/MACOperation.java:98:18:98:26 | Key |
+| jca/MACOperation.java:99:16:99:46 | KeyOperationOutput |
+| jca/MACOperation.java:99:16:99:46 | MACOperation |
+| jca/MACOperation.java:99:28:99:45 | Message |
+| jca/MACOperation.java:106:30:106:43 | Parameter |
+| jca/MACOperation.java:106:46:106:55 | Parameter |
+| jca/MACOperation.java:107:35:107:43 | Constant |
+| jca/MACOperation.java:109:18:109:26 | Key |
+| jca/MACOperation.java:110:16:110:46 | KeyOperationOutput |
+| jca/MACOperation.java:110:16:110:46 | MACOperation |
+| jca/MACOperation.java:110:28:110:45 | Message |
+| jca/MACOperation.java:117:36:117:49 | Parameter |
+| jca/MACOperation.java:117:52:117:61 | Parameter |
+| jca/MACOperation.java:118:35:118:44 | HMACAlgorithm |
+| jca/MACOperation.java:118:35:118:44 | HashAlgorithm |
+| jca/MACOperation.java:120:18:120:26 | Key |
+| jca/MACOperation.java:121:16:121:46 | KeyOperationOutput |
+| jca/MACOperation.java:121:16:121:46 | MACOperation |
+| jca/MACOperation.java:121:28:121:45 | Message |
+| jca/MACOperation.java:133:34:133:49 | Parameter |
+| jca/MACOperation.java:136:44:136:62 | KeyOperationAlgorithm |
+| jca/MACOperation.java:136:44:136:62 | ModeOfOperation |
+| jca/MACOperation.java:136:44:136:62 | PaddingAlgorithm |
+| jca/MACOperation.java:137:42:137:44 | Key |
+| jca/MACOperation.java:138:32:138:74 | EncryptOperation |
+| jca/MACOperation.java:138:32:138:74 | KeyOperationOutput |
+| jca/MACOperation.java:138:47:138:62 | Constant |
+| jca/MACOperation.java:138:47:138:73 | Message |
+| jca/MACOperation.java:150:36:150:51 | Parameter |
+| jca/MACOperation.java:166:47:166:62 | Parameter |
+| jca/MACOperation.java:170:42:170:68 | Message |
+| jca/MACOperation.java:170:71:170:74 | Salt |
+| jca/MACOperation.java:170:77:170:81 | Constant |
+| jca/MACOperation.java:170:84:170:86 | Constant |
+| jca/MACOperation.java:171:65:171:86 | HMACAlgorithm |
+| jca/MACOperation.java:171:65:171:86 | HashAlgorithm |
+| jca/MACOperation.java:171:65:171:86 | KeyDerivationAlgorithm |
+| jca/MACOperation.java:172:30:172:57 | Key |
+| jca/MACOperation.java:172:30:172:57 | KeyDerivation |
+| jca/MACOperation.java:180:44:180:62 | KeyOperationAlgorithm |
+| jca/MACOperation.java:180:44:180:62 | ModeOfOperation |
+| jca/MACOperation.java:180:44:180:62 | PaddingAlgorithm |
+| jca/MACOperation.java:181:42:181:54 | Key |
+| jca/MACOperation.java:182:29:182:78 | EncryptOperation |
+| jca/MACOperation.java:182:29:182:78 | KeyOperationOutput |
+| jca/MACOperation.java:182:44:182:66 | Constant |
+| jca/MACOperation.java:182:44:182:77 | Message |
+| jca/MACOperation.java:185:35:185:46 | HMACAlgorithm |
+| jca/MACOperation.java:185:35:185:46 | HashAlgorithm |
+| jca/MACOperation.java:186:18:186:30 | Key |
+| jca/MACOperation.java:187:30:187:52 | KeyOperationOutput |
+| jca/MACOperation.java:187:30:187:52 | MACOperation |
+| jca/MACOperation.java:187:42:187:51 | Message |
+| jca/MACOperation.java:216:44:216:62 | KeyOperationAlgorithm |
+| jca/MACOperation.java:216:44:216:62 | ModeOfOperation |
+| jca/MACOperation.java:216:44:216:62 | PaddingAlgorithm |
+| jca/MACOperation.java:218:42:218:44 | Key |
+| jca/MACOperation.java:219:32:219:51 | EncryptOperation |
+| jca/MACOperation.java:219:32:219:51 | KeyOperationOutput |
+| jca/MACOperation.java:219:47:219:50 | Message |
+| jca/MACOperation.java:232:56:232:60 | KeyOperationAlgorithm |
+| jca/MACOperation.java:233:21:233:23 | Constant |
+| jca/MACOperation.java:234:16:234:35 | Key |
+| jca/MACOperation.java:234:16:234:35 | KeyGeneration |
+| jca/MACOperation.java:246:38:246:41 | RandomNumberGeneration |
+| jca/Nonce.java:24:35:24:46 | HMACAlgorithm |
+| jca/Nonce.java:24:35:24:46 | HashAlgorithm |
+| jca/Nonce.java:25:18:25:20 | Key |
+| jca/Nonce.java:26:20:26:24 | Message |
+| jca/Nonce.java:27:28:27:69 | KeyOperationOutput |
+| jca/Nonce.java:27:28:27:69 | MACOperation |
+| jca/Nonce.java:27:40:27:57 | Constant |
+| jca/Nonce.java:27:40:27:68 | Message |
+| jca/Nonce.java:35:24:35:41 | Constant |
+| jca/Nonce.java:37:35:37:46 | HMACAlgorithm |
+| jca/Nonce.java:37:35:37:46 | HashAlgorithm |
+| jca/Nonce.java:38:18:38:20 | Key |
+| jca/Nonce.java:39:20:39:24 | Message |
+| jca/Nonce.java:40:28:40:67 | KeyOperationOutput |
+| jca/Nonce.java:40:28:40:67 | MACOperation |
+| jca/Nonce.java:40:40:40:55 | Constant |
+| jca/Nonce.java:40:40:40:66 | Message |
+| jca/Nonce.java:47:39:47:51 | Parameter |
+| jca/Nonce.java:47:54:47:69 | Parameter |
+| jca/Nonce.java:50:44:50:62 | KeyOperationAlgorithm |
+| jca/Nonce.java:50:44:50:62 | ModeOfOperation |
+| jca/Nonce.java:50:44:50:62 | PaddingAlgorithm |
+| jca/Nonce.java:51:42:51:44 | Key |
+| jca/Nonce.java:51:47:51:53 | Nonce |
+| jca/Nonce.java:52:29:52:53 | EncryptOperation |
+| jca/Nonce.java:52:29:52:53 | KeyOperationOutput |
+| jca/Nonce.java:52:44:52:52 | Message |
+| jca/Nonce.java:58:37:58:49 | Parameter |
+| jca/Nonce.java:58:52:58:67 | Parameter |
+| jca/Nonce.java:61:44:61:62 | KeyOperationAlgorithm |
+| jca/Nonce.java:61:44:61:62 | ModeOfOperation |
+| jca/Nonce.java:61:44:61:62 | PaddingAlgorithm |
+| jca/Nonce.java:62:42:62:44 | Key |
+| jca/Nonce.java:62:47:62:53 | Nonce |
+| jca/Nonce.java:63:29:63:53 | EncryptOperation |
+| jca/Nonce.java:63:29:63:53 | KeyOperationOutput |
+| jca/Nonce.java:63:44:63:52 | Message |
+| jca/Nonce.java:70:53:70:64 | HMACAlgorithm |
+| jca/Nonce.java:70:53:70:64 | HashAlgorithm |
+| jca/Nonce.java:78:18:78:20 | Key |
+| jca/Nonce.java:79:20:79:24 | Message |
+| jca/Nonce.java:80:28:80:67 | KeyOperationOutput |
+| jca/Nonce.java:80:28:80:67 | MACOperation |
+| jca/Nonce.java:80:40:80:55 | Constant |
+| jca/Nonce.java:80:40:80:66 | Message |
+| jca/Nonce.java:92:56:92:67 | Constant |
+| jca/Nonce.java:93:16:93:35 | Key |
+| jca/Nonce.java:93:16:93:35 | KeyGeneration |
+| jca/Nonce.java:98:38:98:42 | RandomNumberGeneration |
+| jca/Nonce.java:104:32:104:36 | RandomNumberGeneration |
+| jca/Nonce.java:112:16:112:33 | Constant |
+| jca/PrngTest.java:152:56:152:60 | KeyOperationAlgorithm |
+| jca/PrngTest.java:153:21:153:23 | Constant |
+| jca/PrngTest.java:154:16:154:35 | Key |
+| jca/PrngTest.java:154:16:154:35 | KeyGeneration |
+| jca/SignEncryptCombinations.java:52:49:52:59 | EllipticCurve |
+| jca/SignEncryptCombinations.java:53:16:53:38 | Key |
+| jca/SignEncryptCombinations.java:53:16:53:38 | KeyGeneration |
+| jca/SignEncryptCombinations.java:61:53:61:69 | HashAlgorithm |
+| jca/SignEncryptCombinations.java:61:53:61:69 | KeyOperationAlgorithm |
+| jca/SignEncryptCombinations.java:62:28:62:34 | Key |
+| jca/SignEncryptCombinations.java:63:26:63:29 | Message |
+| jca/SignEncryptCombinations.java:64:16:64:31 | SignOperation |
+| jca/SignEncryptCombinations.java:64:16:64:31 | SignatureOutput |
+| jca/SignEncryptCombinations.java:68:53:68:69 | HashAlgorithm |
+| jca/SignEncryptCombinations.java:68:53:68:69 | KeyOperationAlgorithm |
+| jca/SignEncryptCombinations.java:69:30:69:35 | Key |
+| jca/SignEncryptCombinations.java:70:26:70:29 | Message |
+| jca/SignEncryptCombinations.java:71:16:71:47 | VerifyOperation |
+| jca/SignEncryptCombinations.java:71:33:71:46 | SignatureInput |
+| jca/SignEncryptCombinations.java:82:52:82:56 | KeyOperationAlgorithm |
+| jca/SignEncryptCombinations.java:83:17:83:19 | Constant |
+| jca/SignEncryptCombinations.java:84:16:84:31 | Key |
+| jca/SignEncryptCombinations.java:84:16:84:31 | KeyGeneration |
+| jca/SignEncryptCombinations.java:92:44:92:62 | KeyOperationAlgorithm |
+| jca/SignEncryptCombinations.java:92:44:92:62 | ModeOfOperation |
+| jca/SignEncryptCombinations.java:92:44:92:62 | PaddingAlgorithm |
+| jca/SignEncryptCombinations.java:94:26:94:27 | RandomNumberGeneration |
+| jca/SignEncryptCombinations.java:96:42:96:44 | Key |
+| jca/SignEncryptCombinations.java:96:47:96:50 | Nonce |
+| jca/SignEncryptCombinations.java:97:29:97:53 | EncryptOperation |
+| jca/SignEncryptCombinations.java:97:29:97:53 | KeyOperationOutput |
+| jca/SignEncryptCombinations.java:97:44:97:52 | Message |
+| jca/SignEncryptCombinations.java:111:44:111:62 | KeyOperationAlgorithm |
+| jca/SignEncryptCombinations.java:111:44:111:62 | ModeOfOperation |
+| jca/SignEncryptCombinations.java:111:44:111:62 | PaddingAlgorithm |
+| jca/SignEncryptCombinations.java:112:42:112:44 | Key |
+| jca/SignEncryptCombinations.java:112:47:112:75 | Nonce |
+| jca/SignEncryptCombinations.java:113:16:113:41 | DecryptOperation |
+| jca/SignEncryptCombinations.java:113:16:113:41 | KeyOperationOutput |
+| jca/SignEncryptCombinations.java:113:31:113:40 | Message |
+| jca/SignEncryptCombinations.java:121:35:121:46 | HMACAlgorithm |
+| jca/SignEncryptCombinations.java:121:35:121:46 | HashAlgorithm |
+| jca/SignEncryptCombinations.java:122:18:122:20 | Key |
+| jca/SignEncryptCombinations.java:123:16:123:32 | KeyOperationOutput |
+| jca/SignEncryptCombinations.java:123:16:123:32 | MACOperation |
+| jca/SignEncryptCombinations.java:123:28:123:31 | Message |
+| jca/SignEncryptCombinations.java:335:26:335:47 | Constant |
+| jca/SignatureOperation.java:52:61:52:65 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:53:24:53:27 | Constant |
+| jca/SignatureOperation.java:54:16:54:36 | Key |
+| jca/SignatureOperation.java:54:16:54:36 | KeyGeneration |
+| jca/SignatureOperation.java:63:53:63:74 | HashAlgorithm |
+| jca/SignatureOperation.java:63:53:63:74 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:64:28:64:37 | Key |
+| jca/SignatureOperation.java:65:26:65:29 | Message |
+| jca/SignatureOperation.java:66:16:66:31 | SignOperation |
+| jca/SignatureOperation.java:66:16:66:31 | SignatureOutput |
+| jca/SignatureOperation.java:75:53:75:74 | HashAlgorithm |
+| jca/SignatureOperation.java:75:53:75:74 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:76:30:76:38 | Key |
+| jca/SignatureOperation.java:77:26:77:29 | Message |
+| jca/SignatureOperation.java:78:16:78:41 | VerifyOperation |
+| jca/SignatureOperation.java:78:33:78:40 | SignatureInput |
+| jca/SignatureOperation.java:93:49:93:59 | EllipticCurve |
+| jca/SignatureOperation.java:94:16:94:38 | Key |
+| jca/SignatureOperation.java:94:16:94:38 | KeyGeneration |
+| jca/SignatureOperation.java:103:53:103:69 | HashAlgorithm |
+| jca/SignatureOperation.java:103:53:103:69 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:104:28:104:37 | Key |
+| jca/SignatureOperation.java:105:26:105:29 | Message |
+| jca/SignatureOperation.java:106:16:106:31 | SignOperation |
+| jca/SignatureOperation.java:106:16:106:31 | SignatureOutput |
+| jca/SignatureOperation.java:115:53:115:69 | HashAlgorithm |
+| jca/SignatureOperation.java:115:53:115:69 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:116:30:116:38 | Key |
+| jca/SignatureOperation.java:117:26:117:29 | Message |
+| jca/SignatureOperation.java:118:16:118:41 | VerifyOperation |
+| jca/SignatureOperation.java:118:33:118:40 | SignatureInput |
+| jca/SignatureOperation.java:132:61:132:69 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:133:16:133:36 | Key |
+| jca/SignatureOperation.java:133:16:133:36 | KeyGeneration |
+| jca/SignatureOperation.java:142:53:142:61 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:143:28:143:37 | Key |
+| jca/SignatureOperation.java:144:26:144:29 | Message |
+| jca/SignatureOperation.java:145:16:145:31 | SignOperation |
+| jca/SignatureOperation.java:145:16:145:31 | SignatureOutput |
+| jca/SignatureOperation.java:154:53:154:61 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:155:30:155:38 | Key |
+| jca/SignatureOperation.java:156:26:156:29 | Message |
+| jca/SignatureOperation.java:157:16:157:41 | VerifyOperation |
+| jca/SignatureOperation.java:157:33:157:40 | SignatureInput |
+| jca/SignatureOperation.java:173:61:173:65 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:174:24:174:27 | Constant |
+| jca/SignatureOperation.java:175:16:175:36 | Key |
+| jca/SignatureOperation.java:175:16:175:36 | KeyGeneration |
+| jca/SignatureOperation.java:185:53:185:65 | HashAlgorithm |
+| jca/SignatureOperation.java:185:53:185:65 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:186:28:186:37 | Key |
+| jca/SignatureOperation.java:187:26:187:29 | Message |
+| jca/SignatureOperation.java:188:16:188:31 | SignOperation |
+| jca/SignatureOperation.java:188:16:188:31 | SignatureOutput |
+| jca/SignatureOperation.java:198:53:198:65 | HashAlgorithm |
+| jca/SignatureOperation.java:198:53:198:65 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:199:30:199:38 | Key |
+| jca/SignatureOperation.java:200:26:200:29 | Message |
+| jca/SignatureOperation.java:201:16:201:41 | VerifyOperation |
+| jca/SignatureOperation.java:201:33:201:40 | SignatureInput |
+| jca/SignatureOperation.java:231:26:231:44 | Constant |
+| jca/SignatureOperation.java:236:27:236:30 | Constant |
+| jca/SignatureOperation.java:266:47:266:68 | HashAlgorithm |
+| jca/SignatureOperation.java:266:47:266:68 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:269:47:269:63 | HashAlgorithm |
+| jca/SignatureOperation.java:269:47:269:63 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:272:47:272:55 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:275:47:275:59 | HashAlgorithm |
+| jca/SignatureOperation.java:275:47:275:59 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:279:47:279:68 | HashAlgorithm |
+| jca/SignatureOperation.java:279:47:279:68 | KeyOperationAlgorithm |
+| jca/SignatureOperation.java:282:26:282:49 | Constant |
+| jca/SignatureOperation.java:283:28:283:42 | Key |
+| jca/SignatureOperation.java:284:26:284:32 | Message |
+| jca/SignatureOperation.java:285:27:285:42 | SignOperation |
+| jca/SignatureOperation.java:285:27:285:42 | SignatureOutput |
+| jca/SignatureOperation.java:287:30:287:43 | Key |
+| jca/SignatureOperation.java:288:26:288:32 | Message |
+| jca/SignatureOperation.java:289:28:289:53 | VerifyOperation |
+| jca/SignatureOperation.java:289:45:289:52 | SignatureInput |
+| jca/SignatureOperation.java:311:26:311:49 | Constant |
+| jca/SymmetricAlgorithm.java:51:44:51:62 | KeyOperationAlgorithm |
+| jca/SymmetricAlgorithm.java:51:44:51:62 | ModeOfOperation |
+| jca/SymmetricAlgorithm.java:51:44:51:62 | PaddingAlgorithm |
+| jca/SymmetricAlgorithm.java:53:38:53:39 | RandomNumberGeneration |
+| jca/SymmetricAlgorithm.java:55:42:55:44 | Key |
+| jca/SymmetricAlgorithm.java:55:47:55:50 | Nonce |
+| jca/SymmetricAlgorithm.java:56:29:56:53 | EncryptOperation |
+| jca/SymmetricAlgorithm.java:56:29:56:53 | KeyOperationOutput |
+| jca/SymmetricAlgorithm.java:56:44:56:52 | Message |
+| jca/SymmetricAlgorithm.java:72:39:72:51 | Parameter |
+| jca/SymmetricAlgorithm.java:72:54:72:69 | Parameter |
+| jca/SymmetricAlgorithm.java:73:44:73:62 | KeyOperationAlgorithm |
+| jca/SymmetricAlgorithm.java:73:44:73:62 | ModeOfOperation |
+| jca/SymmetricAlgorithm.java:73:44:73:62 | PaddingAlgorithm |
+| jca/SymmetricAlgorithm.java:76:42:76:44 | Key |
+| jca/SymmetricAlgorithm.java:76:47:76:50 | Nonce |
+| jca/SymmetricAlgorithm.java:77:29:77:53 | EncryptOperation |
+| jca/SymmetricAlgorithm.java:77:29:77:53 | KeyOperationOutput |
+| jca/SymmetricAlgorithm.java:77:44:77:52 | Message |
+| jca/SymmetricAlgorithm.java:94:44:94:65 | KeyOperationAlgorithm |
+| jca/SymmetricAlgorithm.java:94:44:94:65 | ModeOfOperation |
+| jca/SymmetricAlgorithm.java:94:44:94:65 | PaddingAlgorithm |
+| jca/SymmetricAlgorithm.java:96:38:96:39 | RandomNumberGeneration |
+| jca/SymmetricAlgorithm.java:98:42:98:44 | Key |
+| jca/SymmetricAlgorithm.java:98:47:98:52 | Nonce |
+| jca/SymmetricAlgorithm.java:99:29:99:53 | EncryptOperation |
+| jca/SymmetricAlgorithm.java:99:29:99:53 | KeyOperationOutput |
+| jca/SymmetricAlgorithm.java:99:44:99:52 | Message |
+| jca/SymmetricAlgorithm.java:116:44:116:65 | KeyOperationAlgorithm |
+| jca/SymmetricAlgorithm.java:116:44:116:65 | ModeOfOperation |
+| jca/SymmetricAlgorithm.java:116:44:116:65 | PaddingAlgorithm |
+| jca/SymmetricAlgorithm.java:117:42:117:44 | Key |
+| jca/SymmetricAlgorithm.java:118:16:118:40 | EncryptOperation |
+| jca/SymmetricAlgorithm.java:118:16:118:40 | KeyOperationOutput |
+| jca/SymmetricAlgorithm.java:118:31:118:39 | Message |
+| jca/SymmetricAlgorithm.java:131:44:131:48 | KeyOperationAlgorithm |
+| jca/SymmetricAlgorithm.java:132:42:132:44 | Key |
+| jca/SymmetricAlgorithm.java:133:16:133:40 | EncryptOperation |
+| jca/SymmetricAlgorithm.java:133:16:133:40 | KeyOperationOutput |
+| jca/SymmetricAlgorithm.java:133:31:133:39 | Message |
+| jca/SymmetricAlgorithm.java:145:36:145:48 | Parameter |
+| jca/SymmetricAlgorithm.java:145:51:145:66 | Parameter |
+| jca/SymmetricAlgorithm.java:146:44:146:65 | KeyOperationAlgorithm |
+| jca/SymmetricAlgorithm.java:146:44:146:65 | ModeOfOperation |
+| jca/SymmetricAlgorithm.java:146:44:146:65 | PaddingAlgorithm |
+| jca/SymmetricAlgorithm.java:148:38:148:39 | RandomNumberGeneration |
+| jca/SymmetricAlgorithm.java:150:42:150:44 | Key |
+| jca/SymmetricAlgorithm.java:150:47:150:52 | Nonce |
+| jca/SymmetricAlgorithm.java:151:29:151:53 | EncryptOperation |
+| jca/SymmetricAlgorithm.java:151:29:151:53 | KeyOperationOutput |
+| jca/SymmetricAlgorithm.java:151:44:151:52 | Message |
+| jca/SymmetricAlgorithm.java:167:42:167:54 | Parameter |
+| jca/SymmetricAlgorithm.java:167:57:167:72 | Parameter |
+| jca/SymmetricAlgorithm.java:168:44:168:68 | KeyOperationAlgorithm |
+| jca/SymmetricAlgorithm.java:168:44:168:68 | ModeOfOperation |
+| jca/SymmetricAlgorithm.java:168:44:168:68 | PaddingAlgorithm |
+| jca/SymmetricAlgorithm.java:170:38:170:39 | RandomNumberGeneration |
+| jca/SymmetricAlgorithm.java:172:42:172:44 | Key |
+| jca/SymmetricAlgorithm.java:172:47:172:52 | Nonce |
+| jca/SymmetricAlgorithm.java:173:29:173:53 | EncryptOperation |
+| jca/SymmetricAlgorithm.java:173:29:173:53 | KeyOperationOutput |
+| jca/SymmetricAlgorithm.java:173:44:173:52 | Message |
+| jca/SymmetricAlgorithm.java:190:44:190:53 | KeyOperationAlgorithm |
+| jca/SymmetricAlgorithm.java:192:38:192:42 | RandomNumberGeneration |
+| jca/SymmetricAlgorithm.java:194:42:194:44 | Key |
+| jca/SymmetricAlgorithm.java:194:47:194:72 | Nonce |
+| jca/SymmetricAlgorithm.java:195:29:195:53 | EncryptOperation |
+| jca/SymmetricAlgorithm.java:195:29:195:53 | KeyOperationOutput |
+| jca/SymmetricAlgorithm.java:195:44:195:52 | Message |
+| jca/SymmetricAlgorithm.java:212:35:212:47 | Parameter |
+| jca/SymmetricAlgorithm.java:212:50:212:65 | Parameter |
+| jca/SymmetricAlgorithm.java:213:36:213:44 | Constant |
+| jca/SymmetricAlgorithm.java:214:19:214:21 | Key |
+| jca/SymmetricAlgorithm.java:215:29:215:51 | KeyOperationOutput |
+| jca/SymmetricAlgorithm.java:215:29:215:51 | MACOperation |
+| jca/SymmetricAlgorithm.java:215:42:215:50 | Message |
+| jca/SymmetricAlgorithm.java:218:44:218:62 | KeyOperationAlgorithm |
+| jca/SymmetricAlgorithm.java:218:44:218:62 | ModeOfOperation |
+| jca/SymmetricAlgorithm.java:218:44:218:62 | PaddingAlgorithm |
+| jca/SymmetricAlgorithm.java:220:38:220:39 | RandomNumberGeneration |
+| jca/SymmetricAlgorithm.java:222:42:222:51 | Key |
+| jca/SymmetricAlgorithm.java:222:54:222:57 | Nonce |
+| jca/SymmetricAlgorithm.java:223:29:223:53 | EncryptOperation |
+| jca/SymmetricAlgorithm.java:223:29:223:53 | KeyOperationOutput |
+| jca/SymmetricAlgorithm.java:223:44:223:52 | Message |
+| jca/SymmetricAlgorithm.java:244:64:244:76 | Parameter |
+| jca/SymmetricAlgorithm.java:244:79:244:94 | Parameter |
+| jca/SymmetricAlgorithm.java:284:58:284:70 | Parameter |
+| jca/SymmetricAlgorithm.java:284:73:284:88 | Parameter |
+| jca/SymmetricAlgorithm.java:287:42:287:66 | Message |
+| jca/SymmetricAlgorithm.java:287:69:287:72 | Salt |
+| jca/SymmetricAlgorithm.java:287:75:287:79 | Constant |
+| jca/SymmetricAlgorithm.java:287:82:287:84 | Constant |
+| jca/SymmetricAlgorithm.java:288:65:288:86 | HMACAlgorithm |
+| jca/SymmetricAlgorithm.java:288:65:288:86 | HashAlgorithm |
+| jca/SymmetricAlgorithm.java:288:65:288:86 | KeyDerivationAlgorithm |
+| jca/SymmetricAlgorithm.java:289:26:289:53 | Key |
+| jca/SymmetricAlgorithm.java:289:26:289:53 | KeyDerivation |
+| jca/SymmetricAlgorithm.java:295:44:295:62 | KeyOperationAlgorithm |
+| jca/SymmetricAlgorithm.java:295:44:295:62 | ModeOfOperation |
+| jca/SymmetricAlgorithm.java:295:44:295:62 | PaddingAlgorithm |
+| jca/SymmetricAlgorithm.java:297:38:297:39 | RandomNumberGeneration |
+| jca/SymmetricAlgorithm.java:298:42:298:47 | Key |
+| jca/SymmetricAlgorithm.java:298:50:298:78 | Nonce |
+| jca/SymmetricAlgorithm.java:299:29:299:53 | EncryptOperation |
+| jca/SymmetricAlgorithm.java:299:29:299:53 | KeyOperationOutput |
+| jca/SymmetricAlgorithm.java:299:44:299:52 | Message |
+| jca/SymmetricAlgorithm.java:301:35:301:46 | HMACAlgorithm |
+| jca/SymmetricAlgorithm.java:301:35:301:46 | HashAlgorithm |
+| jca/SymmetricAlgorithm.java:302:18:302:30 | Key |
+| jca/SymmetricAlgorithm.java:303:30:303:52 | KeyOperationOutput |
+| jca/SymmetricAlgorithm.java:303:30:303:52 | MACOperation |
+| jca/SymmetricAlgorithm.java:303:42:303:51 | Message |
+| jca/SymmetricAlgorithm.java:331:52:331:56 | KeyOperationAlgorithm |
+| jca/SymmetricAlgorithm.java:332:17:332:19 | Constant |
+| jca/SymmetricAlgorithm.java:333:16:333:31 | Key |
+| jca/SymmetricAlgorithm.java:333:16:333:31 | KeyGeneration |
+| jca/SymmetricAlgorithm.java:345:38:345:41 | RandomNumberGeneration |
+| jca/SymmetricModesTest.java:48:52:48:56 | KeyOperationAlgorithm |
+| jca/SymmetricModesTest.java:49:17:49:19 | Constant |
+| jca/SymmetricModesTest.java:50:33:50:48 | Key |
+| jca/SymmetricModesTest.java:50:33:50:48 | KeyGeneration |
+| jca/SymmetricModesTest.java:53:17:53:19 | Constant |
+| jca/SymmetricModesTest.java:54:31:54:46 | Key |
+| jca/SymmetricModesTest.java:54:31:54:46 | KeyGeneration |
+| jca/SymmetricModesTest.java:57:44:57:62 | KeyOperationAlgorithm |
+| jca/SymmetricModesTest.java:57:44:57:62 | ModeOfOperation |
+| jca/SymmetricModesTest.java:57:44:57:62 | PaddingAlgorithm |
+| jca/SymmetricModesTest.java:58:39:58:49 | Key |
+| jca/SymmetricModesTest.java:59:29:59:50 | KeyOperationOutput |
+| jca/SymmetricModesTest.java:59:29:59:50 | WrapOperation |
+| jca/SymmetricModesTest.java:59:41:59:49 | Message |
+| jca/SymmetricModesTest.java:78:43:78:55 | Parameter |
+| jca/SymmetricModesTest.java:78:58:78:73 | Parameter |
+| jca/SymmetricModesTest.java:79:44:79:63 | KeyOperationAlgorithm |
+| jca/SymmetricModesTest.java:79:44:79:63 | ModeOfOperation |
+| jca/SymmetricModesTest.java:79:44:79:63 | PaddingAlgorithm |
+| jca/SymmetricModesTest.java:81:38:81:39 | RandomNumberGeneration |
+| jca/SymmetricModesTest.java:83:42:83:44 | Key |
+| jca/SymmetricModesTest.java:83:47:83:52 | Nonce |
+| jca/SymmetricModesTest.java:84:29:84:53 | EncryptOperation |
+| jca/SymmetricModesTest.java:84:29:84:53 | KeyOperationOutput |
+| jca/SymmetricModesTest.java:84:44:84:52 | Message |
+| jca/SymmetricModesTest.java:104:45:104:57 | Parameter |
+| jca/SymmetricModesTest.java:104:60:104:75 | Parameter |
+| jca/SymmetricModesTest.java:105:44:105:63 | KeyOperationAlgorithm |
+| jca/SymmetricModesTest.java:105:44:105:63 | ModeOfOperation |
+| jca/SymmetricModesTest.java:105:44:105:63 | PaddingAlgorithm |
+| jca/SymmetricModesTest.java:109:42:109:44 | Key |
+| jca/SymmetricModesTest.java:109:47:109:52 | Nonce |
+| jca/SymmetricModesTest.java:110:29:110:53 | EncryptOperation |
+| jca/SymmetricModesTest.java:110:29:110:53 | KeyOperationOutput |
+| jca/SymmetricModesTest.java:110:44:110:52 | Message |
+| jca/SymmetricModesTest.java:127:52:127:56 | KeyOperationAlgorithm |
+| jca/SymmetricModesTest.java:128:17:128:19 | Constant |
+| jca/SymmetricModesTest.java:129:16:129:31 | Key |
+| jca/SymmetricModesTest.java:129:16:129:31 | KeyGeneration |
+| jca/UniversalFlowTest.java:19:28:19:32 | KeyOperationAlgorithm |
+| jca/UniversalFlowTest.java:26:21:26:23 | Constant |
+| jca/UniversalFlowTest.java:27:25:27:44 | Key |
+| jca/UniversalFlowTest.java:27:25:27:44 | KeyGeneration |
+| jca/UniversalFlowTest.java:28:29:28:47 | KeyOperationAlgorithm |
+| jca/UniversalFlowTest.java:28:29:28:47 | ModeOfOperation |
+| jca/UniversalFlowTest.java:28:29:28:47 | PaddingAlgorithm |
+| jca/UniversalFlowTest.java:31:38:31:39 | RandomNumberGeneration |
+| jca/UniversalFlowTest.java:33:42:33:44 | Key |
+| jca/UniversalFlowTest.java:33:47:33:53 | Nonce |
+| jca/UniversalFlowTest.java:34:32:34:74 | EncryptOperation |
+| jca/UniversalFlowTest.java:34:32:34:74 | KeyOperationOutput |
+| jca/UniversalFlowTest.java:34:47:34:62 | Constant |
+| jca/UniversalFlowTest.java:34:47:34:73 | Message |
+| jca/UniversalFlowTest.java:46:20:46:24 | KeyOperationAlgorithm |
diff --git a/java/ql/test/experimental/library-tests/quantum/nodes.ql b/java/ql/test/experimental/library-tests/quantum/nodes.ql
new file mode 100644
index 00000000000..e080ce7297a
--- /dev/null
+++ b/java/ql/test/experimental/library-tests/quantum/nodes.ql
@@ -0,0 +1,5 @@
+import java
+import experimental.quantum.Language
+
+from Crypto::NodeBase n
+select n
diff --git a/java/ql/test/experimental/query-tests/quantum/examples/BadMacUse/BadMacOrderDecryptThenMac.expected b/java/ql/test/experimental/query-tests/quantum/examples/BadMacUse/BadMacOrderDecryptThenMac.expected
new file mode 100644
index 00000000000..ba74f3dffce
--- /dev/null
+++ b/java/ql/test/experimental/query-tests/quantum/examples/BadMacUse/BadMacOrderDecryptThenMac.expected
@@ -0,0 +1,36 @@
+#select
+| BadMacUse.java:152:42:152:51 | ciphertext | BadMacUse.java:92:31:92:35 | bytes : byte[] | BadMacUse.java:152:42:152:51 | ciphertext | Incorrect decryption and MAC order: Decryption of cipher text occurs before validation of MAC on cipher text. |
+edges
+| BadMacUse.java:84:42:84:53 | bytes : byte[] | BadMacUse.java:92:31:92:35 | bytes : byte[] | provenance |  |
+| BadMacUse.java:92:31:92:35 | bytes : byte[] | BadMacUse.java:100:39:100:48 | ciphertext : byte[] | provenance | Config |
+| BadMacUse.java:92:31:92:35 | bytes : byte[] | BadMacUse.java:100:39:100:48 | ciphertext : byte[] | provenance | Config |
+| BadMacUse.java:92:31:92:35 | bytes : byte[] | BadMacUse.java:108:39:108:47 | plaintext : byte[] | provenance | Config |
+| BadMacUse.java:92:31:92:35 | bytes : byte[] | BadMacUse.java:108:39:108:47 | plaintext : byte[] | provenance | Config |
+| BadMacUse.java:92:31:92:35 | bytes : byte[] | BadMacUse.java:118:52:118:60 | plaintext : byte[] | provenance | Config |
+| BadMacUse.java:92:31:92:35 | bytes : byte[] | BadMacUse.java:118:52:118:60 | plaintext : byte[] | provenance | Config |
+| BadMacUse.java:92:31:92:35 | bytes : byte[] | BadMacUse.java:146:48:146:57 | ciphertext : byte[] | provenance | Config |
+| BadMacUse.java:92:31:92:35 | bytes : byte[] | BadMacUse.java:146:48:146:57 | ciphertext : byte[] | provenance | Config |
+| BadMacUse.java:99:39:99:55 | ciphertext : byte[] | BadMacUse.java:100:39:100:48 | ciphertext : byte[] | provenance |  |
+| BadMacUse.java:100:39:100:48 | ciphertext : byte[] | BadMacUse.java:84:42:84:53 | bytes : byte[] | provenance |  |
+| BadMacUse.java:100:39:100:48 | ciphertext : byte[] | BadMacUse.java:84:42:84:53 | bytes : byte[] | provenance |  |
+| BadMacUse.java:108:39:108:47 | plaintext : byte[] | BadMacUse.java:84:42:84:53 | bytes : byte[] | provenance |  |
+| BadMacUse.java:118:52:118:60 | plaintext : byte[] | BadMacUse.java:84:42:84:53 | bytes : byte[] | provenance |  |
+| BadMacUse.java:146:48:146:57 | ciphertext : byte[] | BadMacUse.java:99:39:99:55 | ciphertext : byte[] | provenance |  |
+| BadMacUse.java:146:48:146:57 | ciphertext : byte[] | BadMacUse.java:152:42:152:51 | ciphertext | provenance |  |
+nodes
+| BadMacUse.java:84:42:84:53 | bytes : byte[] | semmle.label | bytes : byte[] |
+| BadMacUse.java:92:31:92:35 | bytes : byte[] | semmle.label | bytes : byte[] |
+| BadMacUse.java:92:31:92:35 | bytes : byte[] | semmle.label | bytes : byte[] |
+| BadMacUse.java:99:39:99:55 | ciphertext : byte[] | semmle.label | ciphertext : byte[] |
+| BadMacUse.java:100:39:100:48 | ciphertext : byte[] | semmle.label | ciphertext : byte[] |
+| BadMacUse.java:100:39:100:48 | ciphertext : byte[] | semmle.label | ciphertext : byte[] |
+| BadMacUse.java:108:39:108:47 | plaintext : byte[] | semmle.label | plaintext : byte[] |
+| BadMacUse.java:118:52:118:60 | plaintext : byte[] | semmle.label | plaintext : byte[] |
+| BadMacUse.java:146:48:146:57 | ciphertext : byte[] | semmle.label | ciphertext : byte[] |
+| BadMacUse.java:152:42:152:51 | ciphertext | semmle.label | ciphertext |
+subpaths
+testFailures
+| BadMacUse.java:50:56:50:65 | // $Source | Missing result: Source |
+| BadMacUse.java:63:118:63:127 | // $Source | Missing result: Source |
+| BadMacUse.java:92:31:92:35 | bytes : byte[] | Unexpected result: Source |
+| BadMacUse.java:146:95:146:104 | // $Source | Missing result: Source |
diff --git a/java/ql/test/experimental/query-tests/quantum/examples/BadMacUse/BadMacOrderDecryptThenMac.qlref b/java/ql/test/experimental/query-tests/quantum/examples/BadMacUse/BadMacOrderDecryptThenMac.qlref
new file mode 100644
index 00000000000..811a6cbac13
--- /dev/null
+++ b/java/ql/test/experimental/query-tests/quantum/examples/BadMacUse/BadMacOrderDecryptThenMac.qlref
@@ -0,0 +1,4 @@
+query: experimental/quantum/Examples/BadMacOrderDecryptThenMac.ql
+postprocess:
+  - utils/test/PrettyPrintModels.ql
+  - utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/java/ql/test/experimental/query-tests/quantum/examples/BadMacUse/BadMacOrderDecryptToMac.expected b/java/ql/test/experimental/query-tests/quantum/examples/BadMacUse/BadMacOrderDecryptToMac.expected
new file mode 100644
index 00000000000..f73f0f25e0a
--- /dev/null
+++ b/java/ql/test/experimental/query-tests/quantum/examples/BadMacUse/BadMacOrderDecryptToMac.expected
@@ -0,0 +1,37 @@
+#select
+| BadMacUse.java:56:42:56:50 | plaintext | BadMacUse.java:50:28:50:53 | doFinal(...) : byte[] | BadMacUse.java:56:42:56:50 | plaintext | Incorrect decryption and MAC order: decryption output plaintext flows to MAC message input. |
+| BadMacUse.java:124:42:124:51 | ciphertext | BadMacUse.java:92:16:92:36 | doFinal(...) : byte[] | BadMacUse.java:124:42:124:51 | ciphertext | Incorrect decryption and MAC order: decryption output plaintext flows to MAC message input. |
+edges
+| BadMacUse.java:27:29:27:53 | doFinal(...) : byte[] | BadMacUse.java:32:42:32:51 | ciphertext | provenance |  |
+| BadMacUse.java:50:28:50:53 | doFinal(...) : byte[] | BadMacUse.java:56:42:56:50 | plaintext | provenance |  |
+| BadMacUse.java:84:83:84:91 | iv : byte[] | BadMacUse.java:90:63:90:64 | iv : byte[] | provenance |  |
+| BadMacUse.java:90:43:90:65 | new IvParameterSpec(...) : IvParameterSpec | BadMacUse.java:91:42:91:56 | ivParameterSpec | provenance | Sink:MaD:1 |
+| BadMacUse.java:90:63:90:64 | iv : byte[] | BadMacUse.java:90:43:90:65 | new IvParameterSpec(...) : IvParameterSpec | provenance | Config |
+| BadMacUse.java:90:63:90:64 | iv : byte[] | BadMacUse.java:90:43:90:65 | new IvParameterSpec(...) : IvParameterSpec | provenance | MaD:2 |
+| BadMacUse.java:92:16:92:36 | doFinal(...) : byte[] | BadMacUse.java:118:29:118:106 | cipherOperationWrapper(...) : byte[] | provenance |  |
+| BadMacUse.java:117:38:117:39 | iv : byte[] | BadMacUse.java:118:83:118:84 | iv : byte[] | provenance |  |
+| BadMacUse.java:118:29:118:106 | cipherOperationWrapper(...) : byte[] | BadMacUse.java:124:42:124:51 | ciphertext | provenance |  |
+| BadMacUse.java:118:83:118:84 | iv : byte[] | BadMacUse.java:84:83:84:91 | iv : byte[] | provenance |  |
+models
+| 1 | Sink: javax.crypto; Cipher; true; init; (int,Key,AlgorithmParameterSpec); ; Argument[2]; encryption-iv; manual |
+| 2 | Summary: javax.crypto.spec; IvParameterSpec; true; IvParameterSpec; ; ; Argument[0]; Argument[this]; taint; manual |
+nodes
+| BadMacUse.java:27:29:27:53 | doFinal(...) : byte[] | semmle.label | doFinal(...) : byte[] |
+| BadMacUse.java:32:42:32:51 | ciphertext | semmle.label | ciphertext |
+| BadMacUse.java:50:28:50:53 | doFinal(...) : byte[] | semmle.label | doFinal(...) : byte[] |
+| BadMacUse.java:56:42:56:50 | plaintext | semmle.label | plaintext |
+| BadMacUse.java:84:83:84:91 | iv : byte[] | semmle.label | iv : byte[] |
+| BadMacUse.java:90:43:90:65 | new IvParameterSpec(...) : IvParameterSpec | semmle.label | new IvParameterSpec(...) : IvParameterSpec |
+| BadMacUse.java:90:63:90:64 | iv : byte[] | semmle.label | iv : byte[] |
+| BadMacUse.java:91:42:91:56 | ivParameterSpec | semmle.label | ivParameterSpec |
+| BadMacUse.java:92:16:92:36 | doFinal(...) : byte[] | semmle.label | doFinal(...) : byte[] |
+| BadMacUse.java:117:38:117:39 | iv : byte[] | semmle.label | iv : byte[] |
+| BadMacUse.java:118:29:118:106 | cipherOperationWrapper(...) : byte[] | semmle.label | cipherOperationWrapper(...) : byte[] |
+| BadMacUse.java:118:83:118:84 | iv : byte[] | semmle.label | iv : byte[] |
+| BadMacUse.java:124:42:124:51 | ciphertext | semmle.label | ciphertext |
+subpaths
+testFailures
+| BadMacUse.java:63:118:63:127 | // $Source | Missing result: Source |
+| BadMacUse.java:92:16:92:36 | doFinal(...) : byte[] | Unexpected result: Source |
+| BadMacUse.java:124:42:124:51 | ciphertext | Unexpected result: Alert |
+| BadMacUse.java:146:95:146:104 | // $Source | Missing result: Source |
diff --git a/java/ql/test/experimental/query-tests/quantum/examples/BadMacUse/BadMacOrderDecryptToMac.qlref b/java/ql/test/experimental/query-tests/quantum/examples/BadMacUse/BadMacOrderDecryptToMac.qlref
new file mode 100644
index 00000000000..6ee58d93681
--- /dev/null
+++ b/java/ql/test/experimental/query-tests/quantum/examples/BadMacUse/BadMacOrderDecryptToMac.qlref
@@ -0,0 +1,4 @@
+query: experimental/quantum/Examples/BadMacOrderDecryptToMac.ql
+postprocess:
+  - utils/test/PrettyPrintModels.ql
+  - utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/java/ql/test/experimental/query-tests/quantum/examples/BadMacUse/BadMacOrderMacOnEncryptPlaintext.expected b/java/ql/test/experimental/query-tests/quantum/examples/BadMacUse/BadMacOrderMacOnEncryptPlaintext.expected
new file mode 100644
index 00000000000..ea427361361
--- /dev/null
+++ b/java/ql/test/experimental/query-tests/quantum/examples/BadMacUse/BadMacOrderMacOnEncryptPlaintext.expected
@@ -0,0 +1,51 @@
+#select
+| BadMacUse.java:76:44:76:52 | plaintext | BadMacUse.java:63:82:63:97 | plaintext : byte[] | BadMacUse.java:76:44:76:52 | plaintext | Incorrect MAC usage: Encryption plaintext also used for MAC. Flow shows plaintext to final use through intermediate mac or encryption operation here $@ | BadMacUse.java:71:42:71:50 | plaintext | plaintext |
+| BadMacUse.java:152:42:152:51 | ciphertext | BadMacUse.java:139:79:139:90 | input : byte[] | BadMacUse.java:152:42:152:51 | ciphertext | Incorrect MAC usage: Encryption plaintext also used for MAC. Flow shows plaintext to final use through intermediate mac or encryption operation here $@ | BadMacUse.java:92:31:92:35 | bytes | bytes |
+edges
+| BadMacUse.java:63:82:63:97 | plaintext : byte[] | BadMacUse.java:71:42:71:50 | plaintext : byte[] | provenance |  |
+| BadMacUse.java:71:42:71:50 | plaintext : byte[] | BadMacUse.java:71:42:71:50 | plaintext : byte[] | provenance | Config |
+| BadMacUse.java:71:42:71:50 | plaintext : byte[] | BadMacUse.java:76:44:76:52 | plaintext | provenance |  |
+| BadMacUse.java:84:42:84:53 | bytes : byte[] | BadMacUse.java:92:31:92:35 | bytes : byte[] | provenance |  |
+| BadMacUse.java:84:42:84:53 | bytes : byte[] [[]] : Object | BadMacUse.java:92:31:92:35 | bytes : byte[] [[]] : Object | provenance |  |
+| BadMacUse.java:92:31:92:35 | bytes : byte[] | BadMacUse.java:146:48:146:57 | ciphertext : byte[] | provenance | Config |
+| BadMacUse.java:92:31:92:35 | bytes : byte[] [[]] : Object | BadMacUse.java:146:48:146:57 | ciphertext : byte[] | provenance | Config |
+| BadMacUse.java:99:39:99:55 | ciphertext : byte[] [[]] : Object | BadMacUse.java:100:39:100:48 | ciphertext : byte[] [[]] : Object | provenance |  |
+| BadMacUse.java:100:39:100:48 | ciphertext : byte[] [[]] : Object | BadMacUse.java:84:42:84:53 | bytes : byte[] [[]] : Object | provenance |  |
+| BadMacUse.java:107:39:107:54 | plaintext : byte[] | BadMacUse.java:108:39:108:47 | plaintext : byte[] | provenance |  |
+| BadMacUse.java:108:39:108:47 | plaintext : byte[] | BadMacUse.java:84:42:84:53 | bytes : byte[] | provenance |  |
+| BadMacUse.java:114:92:114:107 | plaintext : byte[] | BadMacUse.java:118:52:118:60 | plaintext : byte[] | provenance |  |
+| BadMacUse.java:118:52:118:60 | plaintext : byte[] | BadMacUse.java:84:42:84:53 | bytes : byte[] | provenance |  |
+| BadMacUse.java:139:79:139:90 | input : byte[] | BadMacUse.java:142:48:142:52 | input : byte[] | provenance |  |
+| BadMacUse.java:142:29:142:82 | copyOfRange(...) : byte[] [[]] : Object | BadMacUse.java:146:48:146:57 | ciphertext : byte[] [[]] : Object | provenance |  |
+| BadMacUse.java:142:48:142:52 | input : byte[] | BadMacUse.java:142:29:142:82 | copyOfRange(...) : byte[] [[]] : Object | provenance | MaD:1 |
+| BadMacUse.java:146:48:146:57 | ciphertext : byte[] | BadMacUse.java:152:42:152:51 | ciphertext | provenance |  |
+| BadMacUse.java:146:48:146:57 | ciphertext : byte[] [[]] : Object | BadMacUse.java:99:39:99:55 | ciphertext : byte[] [[]] : Object | provenance |  |
+models
+| 1 | Summary: java.util; Arrays; false; copyOfRange; ; ; Argument[0].ArrayElement; ReturnValue.ArrayElement; value; manual |
+nodes
+| BadMacUse.java:63:82:63:97 | plaintext : byte[] | semmle.label | plaintext : byte[] |
+| BadMacUse.java:71:42:71:50 | plaintext : byte[] | semmle.label | plaintext : byte[] |
+| BadMacUse.java:71:42:71:50 | plaintext : byte[] | semmle.label | plaintext : byte[] |
+| BadMacUse.java:76:44:76:52 | plaintext | semmle.label | plaintext |
+| BadMacUse.java:84:42:84:53 | bytes : byte[] | semmle.label | bytes : byte[] |
+| BadMacUse.java:84:42:84:53 | bytes : byte[] [[]] : Object | semmle.label | bytes : byte[] [[]] : Object |
+| BadMacUse.java:92:31:92:35 | bytes : byte[] | semmle.label | bytes : byte[] |
+| BadMacUse.java:92:31:92:35 | bytes : byte[] [[]] : Object | semmle.label | bytes : byte[] [[]] : Object |
+| BadMacUse.java:99:39:99:55 | ciphertext : byte[] [[]] : Object | semmle.label | ciphertext : byte[] [[]] : Object |
+| BadMacUse.java:100:39:100:48 | ciphertext : byte[] [[]] : Object | semmle.label | ciphertext : byte[] [[]] : Object |
+| BadMacUse.java:107:39:107:54 | plaintext : byte[] | semmle.label | plaintext : byte[] |
+| BadMacUse.java:108:39:108:47 | plaintext : byte[] | semmle.label | plaintext : byte[] |
+| BadMacUse.java:114:92:114:107 | plaintext : byte[] | semmle.label | plaintext : byte[] |
+| BadMacUse.java:118:52:118:60 | plaintext : byte[] | semmle.label | plaintext : byte[] |
+| BadMacUse.java:139:79:139:90 | input : byte[] | semmle.label | input : byte[] |
+| BadMacUse.java:142:29:142:82 | copyOfRange(...) : byte[] [[]] : Object | semmle.label | copyOfRange(...) : byte[] [[]] : Object |
+| BadMacUse.java:142:48:142:52 | input : byte[] | semmle.label | input : byte[] |
+| BadMacUse.java:146:48:146:57 | ciphertext : byte[] | semmle.label | ciphertext : byte[] |
+| BadMacUse.java:146:48:146:57 | ciphertext : byte[] [[]] : Object | semmle.label | ciphertext : byte[] [[]] : Object |
+| BadMacUse.java:152:42:152:51 | ciphertext | semmle.label | ciphertext |
+subpaths
+testFailures
+| BadMacUse.java:50:56:50:65 | // $Source | Missing result: Source |
+| BadMacUse.java:139:79:139:90 | input : byte[] | Unexpected result: Source |
+| BadMacUse.java:146:95:146:104 | // $Source | Missing result: Source |
+| BadMacUse.java:152:42:152:51 | ciphertext | Unexpected result: Alert |
diff --git a/java/ql/test/experimental/query-tests/quantum/examples/BadMacUse/BadMacOrderMacOnEncryptPlaintext.qlref b/java/ql/test/experimental/query-tests/quantum/examples/BadMacUse/BadMacOrderMacOnEncryptPlaintext.qlref
new file mode 100644
index 00000000000..f094aa14a46
--- /dev/null
+++ b/java/ql/test/experimental/query-tests/quantum/examples/BadMacUse/BadMacOrderMacOnEncryptPlaintext.qlref
@@ -0,0 +1,4 @@
+query: experimental/quantum/Examples/BadMacOrderMacOnEncryptPlaintext.ql
+postprocess:
+  - utils/test/PrettyPrintModels.ql
+  - utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/java/ql/test/experimental/query-tests/quantum/examples/BadMacUse/BadMacUse.java b/java/ql/test/experimental/query-tests/quantum/examples/BadMacUse/BadMacUse.java
new file mode 100644
index 00000000000..5c442d4bca7
--- /dev/null
+++ b/java/ql/test/experimental/query-tests/quantum/examples/BadMacUse/BadMacUse.java
@@ -0,0 +1,158 @@
+
+import java.security.*;
+import java.util.Arrays;
+import javax.crypto.Cipher;
+import javax.crypto.Mac;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+
+class BadMacUse {
+
+    private byte[] generateSalt(int length) {
+        byte[] salt = new byte[length];
+        new SecureRandom().nextBytes(salt);
+        return salt;
+    }
+
+    public void CipherThenMac(byte[] encryptionKeyBytes, byte[] macKeyBytes) throws Exception {
+        // Create keys directly from provided byte arrays
+        SecretKey encryptionKey = new SecretKeySpec(encryptionKeyBytes, "AES");
+        SecretKey macKey = new SecretKeySpec(macKeyBytes, "HmacSHA256");
+
+        // Encrypt some sample data using the encryption key
+        Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
+        cipher.init(Cipher.ENCRYPT_MODE, encryptionKey, new SecureRandom());
+        byte[] plaintext = "Further Use Test Data".getBytes();
+        byte[] ciphertext = cipher.doFinal(plaintext);
+
+        // Compute HMAC over the ciphertext using the MAC key
+        Mac mac = Mac.getInstance("HmacSHA256");
+        mac.init(macKey);
+        byte[] computedMac = mac.doFinal(ciphertext);
+
+        // Concatenate ciphertext and MAC
+        byte[] output = new byte[ciphertext.length + computedMac.length];
+        System.arraycopy(ciphertext, 0, output, 0, ciphertext.length);
+        System.arraycopy(computedMac, 0, output, ciphertext.length, computedMac.length);
+    }
+
+    public void BadDecryptThenMacOnPlaintextVerify(byte[] encryptionKeyBytes, byte[] macKeyBytes, byte[] input) throws Exception {
+        // Split input into ciphertext and MAC
+        int macLength = 32; // HMAC-SHA256 output length
+        byte[] ciphertext = Arrays.copyOfRange(input, 0, input.length - macLength);
+        byte[] receivedMac = Arrays.copyOfRange(input, input.length - macLength, input.length);
+
+        // Decrypt first (unsafe)
+        SecretKey encryptionKey = new SecretKeySpec(encryptionKeyBytes, "AES");
+        Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
+        cipher.init(Cipher.DECRYPT_MODE, encryptionKey, new SecureRandom());
+        byte[] plaintext = cipher.doFinal(ciphertext); // $Source
+
+        // Now verify MAC (too late)
+        SecretKey macKey = new SecretKeySpec(macKeyBytes, "HmacSHA256");
+        Mac mac = Mac.getInstance("HmacSHA256");
+        mac.init(macKey);
+        byte[] computedMac = mac.doFinal(plaintext); // $Alert[java/quantum/examples/bad-mac-order-decrypt-to-mac] 
+
+        if (!MessageDigest.isEqual(receivedMac, computedMac)) {
+            throw new SecurityException("MAC verification failed");
+        }
+    }
+
+    public void BadMacOnPlaintext(byte[] encryptionKeyBytes, byte[] macKeyBytes, byte[] plaintext) throws Exception {// $Source
+        // Create keys directly from provided byte arrays
+        SecretKey encryptionKey = new SecretKeySpec(encryptionKeyBytes, "AES");
+        SecretKey macKey = new SecretKeySpec(macKeyBytes, "HmacSHA256");
+
+        // BAD Compute MAC over plaintext (not ciphertext)
+        Mac mac = Mac.getInstance("HmacSHA256");
+        mac.init(macKey);
+        byte[] computedMac = mac.doFinal(plaintext); // Integrity not tied to encrypted data
+
+        // Encrypt the plaintext
+        Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
+        cipher.init(Cipher.ENCRYPT_MODE, encryptionKey, new SecureRandom());
+        byte[] ciphertext = cipher.doFinal(plaintext); // $Alert[java/quantum/examples/bad-mac-order-encrypt-plaintext-also-in-mac]
+
+        // Concatenate ciphertext and MAC
+        byte[] output = new byte[ciphertext.length + computedMac.length];
+        System.arraycopy(ciphertext, 0, output, 0, ciphertext.length);
+        System.arraycopy(computedMac, 0, output, ciphertext.length, computedMac.length);
+    }
+
+    public byte[] cipherOperationWrapper(byte[] bytes, byte[] encryptionKeyBytes, byte[] iv, int mode)
+            throws Exception {
+
+        Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
+        SecretKeySpec secretKeySpec = new SecretKeySpec(encryptionKeyBytes, "AES");
+
+        IvParameterSpec ivParameterSpec = new IvParameterSpec(iv);
+        cipher.init(mode, secretKeySpec, ivParameterSpec);
+        return cipher.doFinal(bytes);
+    }
+
+    /**
+     * A use of the cipher operation wrapper for decryption to throw off the
+     * analysis
+     */
+    public byte[] decryptUsingWrapper(byte[] ciphertext, byte[] encryptionKeyBytes, byte[] iv) throws Exception {
+        return cipherOperationWrapper(ciphertext, encryptionKeyBytes, iv, Cipher.DECRYPT_MODE);
+    }
+
+    /**
+     * A use of the cipher operation wrapper for encryption to throw off the
+     * analysis
+     */
+    public byte[] encryptUsingWrapper(byte[] plaintext, byte[] encryptionKeyBytes, byte[] iv) throws Exception {
+        return cipherOperationWrapper(plaintext, encryptionKeyBytes, iv, Cipher.ENCRYPT_MODE);
+    }
+
+    /**
+     * Encrypt then mac using the wrapper function
+     */
+    public byte[] falsePositiveDecryptToMac(byte[] encryptionKeyBytes, byte[] macKeyBytes, byte[] plaintext) throws Exception {
+        // Encrypt the plaintext
+        byte[] iv = new byte[16];
+        new SecureRandom().nextBytes(iv);
+        byte[] ciphertext = cipherOperationWrapper(plaintext, encryptionKeyBytes, iv, Cipher.ENCRYPT_MODE);
+
+        // Compute HMAC over the ciphertext using the MAC key
+        SecretKey macKey = new SecretKeySpec(macKeyBytes, "HmacSHA256");
+        Mac mac = Mac.getInstance("HmacSHA256");
+        mac.init(macKey);
+        byte[] computedMac = mac.doFinal(ciphertext); // False Positive
+
+        // Concatenate ciphertext and MAC
+        byte[] output = new byte[ciphertext.length + computedMac.length];
+        System.arraycopy(ciphertext, 0, output, 0, ciphertext.length);
+        System.arraycopy(computedMac, 0, output, ciphertext.length, computedMac.length);
+        return output;
+    }
+
+
+    /**
+     * Correct inputs to a decrypt and MAC operation, but the ordering is unsafe. 
+     * The function decrypts THEN computes the MAC on the plaintext.
+     * It should have the MAC computed on the ciphertext first.
+     */
+    public void decryptThenMac(byte[] encryptionKeyBytes, byte[] macKeyBytes, byte[] input) throws Exception {
+        // Split input into ciphertext and MAC
+        int macLength = 32; // HMAC-SHA256 output length
+        byte[] ciphertext = Arrays.copyOfRange(input, 0, input.length - macLength);
+        byte[] receivedMac = Arrays.copyOfRange(input, input.length - macLength, input.length);
+
+        // Decrypt first (unsafe)
+        byte[] plaintext = decryptUsingWrapper(ciphertext, encryptionKeyBytes, new byte[16]); // $Source
+
+        // Now verify MAC (too late)
+        SecretKey macKey = new SecretKeySpec(macKeyBytes, "HmacSHA256");
+        Mac mac = Mac.getInstance("HmacSHA256");
+        mac.init(macKey);
+        byte[] computedMac = mac.doFinal(ciphertext); // $Alert[java/quantum/examples/bad-mac-order-decrypt-then-mac], False positive for Plaintext reuse
+
+        if (!MessageDigest.isEqual(receivedMac, computedMac)) {
+            throw new SecurityException("MAC verification failed");
+        }
+    }
+}
diff --git a/java/ql/test/experimental/query-tests/quantum/examples/InsecureOrUnknownNonceSource/InsecureIVorNonceSource.expected b/java/ql/test/experimental/query-tests/quantum/examples/InsecureOrUnknownNonceSource/InsecureIVorNonceSource.expected
new file mode 100644
index 00000000000..3ad1b08e476
--- /dev/null
+++ b/java/ql/test/experimental/query-tests/quantum/examples/InsecureOrUnknownNonceSource/InsecureIVorNonceSource.expected
@@ -0,0 +1,130 @@
+#select
+| InsecureIVorNonceSource.java:20:51:20:56 | ivSpec | InsecureIVorNonceSource.java:14:21:14:81 | {...} : byte[] | InsecureIVorNonceSource.java:20:51:20:56 | ivSpec | Nonce or IV uses constant source $@ | InsecureIVorNonceSource.java:14:21:14:81 | Constant | Constant | InsecureIVorNonceSource.java:20:51:20:56 | Nonce | Nonce |
+| InsecureIVorNonceSource.java:49:51:49:56 | ivSpec | InsecureIVorNonceSource.java:42:21:42:21 | 1 : Number | InsecureIVorNonceSource.java:49:51:49:56 | ivSpec | Nonce or IV uses constant source $@ | InsecureIVorNonceSource.java:42:21:42:21 | Constant | Constant | InsecureIVorNonceSource.java:49:51:49:56 | Nonce | Nonce |
+| InsecureIVorNonceSource.java:65:51:65:56 | ivSpec | InsecureIVorNonceSource.java:57:13:57:62 | {...} : byte[] | InsecureIVorNonceSource.java:65:51:65:56 | ivSpec | Nonce or IV uses constant source $@ | InsecureIVorNonceSource.java:57:13:57:62 | Constant | Constant | InsecureIVorNonceSource.java:65:51:65:56 | Nonce | Nonce |
+| InsecureIVorNonceSource.java:65:51:65:56 | ivSpec | InsecureIVorNonceSource.java:58:13:58:63 | {...} : byte[] | InsecureIVorNonceSource.java:65:51:65:56 | ivSpec | Nonce or IV uses constant source $@ | InsecureIVorNonceSource.java:58:13:58:63 | Constant | Constant | InsecureIVorNonceSource.java:65:51:65:56 | Nonce | Nonce |
+| InsecureIVorNonceSource.java:81:51:81:56 | ivSpec | InsecureIVorNonceSource.java:73:13:73:73 | {...} : byte[] | InsecureIVorNonceSource.java:81:51:81:56 | ivSpec | Nonce or IV uses constant source $@ | InsecureIVorNonceSource.java:73:13:73:73 | Constant | Constant | InsecureIVorNonceSource.java:81:51:81:56 | Nonce | Nonce |
+| InsecureIVorNonceSource.java:81:51:81:56 | ivSpec | InsecureIVorNonceSource.java:74:13:74:74 | {...} : byte[] | InsecureIVorNonceSource.java:81:51:81:56 | ivSpec | Nonce or IV uses constant source $@ | InsecureIVorNonceSource.java:74:13:74:74 | Constant | Constant | InsecureIVorNonceSource.java:81:51:81:56 | Nonce | Nonce |
+| InsecureIVorNonceSource.java:206:51:206:56 | ivSpec | InsecureIVorNonceSource.java:194:26:194:30 | bytes : byte[] | InsecureIVorNonceSource.java:206:51:206:56 | ivSpec | Nonce or IV uses insecure source $@ at encryption operation $@ | InsecureIVorNonceSource.java:194:26:194:30 | RandomNumberGeneration | RandomNumberGeneration | InsecureIVorNonceSource.java:208:16:208:31 | EncryptOperation | EncryptOperation |
+edges
+| InsecureIVorNonceSource.java:14:21:14:81 | {...} : byte[] | InsecureIVorNonceSource.java:16:61:16:62 | iv : byte[] | provenance |  |
+| InsecureIVorNonceSource.java:16:35:16:63 | new GCMParameterSpec(...) : GCMParameterSpec | InsecureIVorNonceSource.java:20:51:20:56 | ivSpec | provenance | Sink:MaD:1 |
+| InsecureIVorNonceSource.java:16:61:16:62 | iv : byte[] | InsecureIVorNonceSource.java:16:35:16:63 | new GCMParameterSpec(...) : GCMParameterSpec | provenance | Config |
+| InsecureIVorNonceSource.java:16:61:16:62 | iv : byte[] | InsecureIVorNonceSource.java:16:35:16:63 | new GCMParameterSpec(...) : GCMParameterSpec | provenance | MaD:4 |
+| InsecureIVorNonceSource.java:42:13:42:14 | iv [post update] : byte[] [[]] : Number | InsecureIVorNonceSource.java:45:54:45:55 | iv : byte[] [[]] : Number | provenance |  |
+| InsecureIVorNonceSource.java:42:21:42:21 | 1 : Number | InsecureIVorNonceSource.java:42:13:42:14 | iv [post update] : byte[] [[]] : Number | provenance |  |
+| InsecureIVorNonceSource.java:45:34:45:56 | new IvParameterSpec(...) : IvParameterSpec | InsecureIVorNonceSource.java:49:51:49:56 | ivSpec | provenance | Sink:MaD:1 |
+| InsecureIVorNonceSource.java:45:54:45:55 | iv : byte[] [[]] : Number | InsecureIVorNonceSource.java:45:34:45:56 | new IvParameterSpec(...) : IvParameterSpec | provenance | Config |
+| InsecureIVorNonceSource.java:56:30:59:9 | {...} : byte[][] [[]] : byte[] | InsecureIVorNonceSource.java:61:61:61:69 | staticIvs : byte[][] [[]] : byte[] | provenance |  |
+| InsecureIVorNonceSource.java:57:13:57:62 | {...} : byte[] | InsecureIVorNonceSource.java:56:30:59:9 | {...} : byte[][] [[]] : byte[] | provenance |  |
+| InsecureIVorNonceSource.java:58:13:58:63 | {...} : byte[] | InsecureIVorNonceSource.java:56:30:59:9 | {...} : byte[][] [[]] : byte[] | provenance |  |
+| InsecureIVorNonceSource.java:61:35:61:73 | new GCMParameterSpec(...) : GCMParameterSpec | InsecureIVorNonceSource.java:65:51:65:56 | ivSpec | provenance | Sink:MaD:1 |
+| InsecureIVorNonceSource.java:61:61:61:69 | staticIvs : byte[][] [[]] : byte[] | InsecureIVorNonceSource.java:61:61:61:72 | ...[...] : byte[] | provenance |  |
+| InsecureIVorNonceSource.java:61:61:61:72 | ...[...] : byte[] | InsecureIVorNonceSource.java:61:35:61:73 | new GCMParameterSpec(...) : GCMParameterSpec | provenance | Config |
+| InsecureIVorNonceSource.java:61:61:61:72 | ...[...] : byte[] | InsecureIVorNonceSource.java:61:35:61:73 | new GCMParameterSpec(...) : GCMParameterSpec | provenance | MaD:4 |
+| InsecureIVorNonceSource.java:72:30:75:9 | {...} : byte[][] [[]] : byte[] | InsecureIVorNonceSource.java:77:61:77:69 | staticIvs : byte[][] [[]] : byte[] | provenance |  |
+| InsecureIVorNonceSource.java:73:13:73:73 | {...} : byte[] | InsecureIVorNonceSource.java:72:30:75:9 | {...} : byte[][] [[]] : byte[] | provenance |  |
+| InsecureIVorNonceSource.java:74:13:74:74 | {...} : byte[] | InsecureIVorNonceSource.java:72:30:75:9 | {...} : byte[][] [[]] : byte[] | provenance |  |
+| InsecureIVorNonceSource.java:77:35:77:73 | new GCMParameterSpec(...) : GCMParameterSpec | InsecureIVorNonceSource.java:81:51:81:56 | ivSpec | provenance | Sink:MaD:1 |
+| InsecureIVorNonceSource.java:77:61:77:69 | staticIvs : byte[][] [[]] : byte[] | InsecureIVorNonceSource.java:77:61:77:72 | ...[...] : byte[] | provenance |  |
+| InsecureIVorNonceSource.java:77:61:77:72 | ...[...] : byte[] | InsecureIVorNonceSource.java:77:35:77:73 | new GCMParameterSpec(...) : GCMParameterSpec | provenance | Config |
+| InsecureIVorNonceSource.java:77:61:77:72 | ...[...] : byte[] | InsecureIVorNonceSource.java:77:35:77:73 | new GCMParameterSpec(...) : GCMParameterSpec | provenance | MaD:4 |
+| InsecureIVorNonceSource.java:107:26:107:27 | iv : byte[] | InsecureIVorNonceSource.java:109:61:109:62 | iv : byte[] | provenance |  |
+| InsecureIVorNonceSource.java:109:35:109:63 | new GCMParameterSpec(...) : GCMParameterSpec | InsecureIVorNonceSource.java:113:51:113:56 | ivSpec | provenance | Sink:MaD:1 |
+| InsecureIVorNonceSource.java:109:61:109:62 | iv : byte[] | InsecureIVorNonceSource.java:109:35:109:63 | new GCMParameterSpec(...) : GCMParameterSpec | provenance | Config |
+| InsecureIVorNonceSource.java:109:61:109:62 | iv : byte[] | InsecureIVorNonceSource.java:109:35:109:63 | new GCMParameterSpec(...) : GCMParameterSpec | provenance | MaD:4 |
+| InsecureIVorNonceSource.java:123:13:123:14 | iv [post update] : byte[] [[]] : Number | InsecureIVorNonceSource.java:126:61:126:62 | iv : byte[] [[]] : Number | provenance |  |
+| InsecureIVorNonceSource.java:123:21:123:43 | (...)... : Number | InsecureIVorNonceSource.java:123:13:123:14 | iv [post update] : byte[] [[]] : Number | provenance |  |
+| InsecureIVorNonceSource.java:123:28:123:43 | nextInt(...) : Number | InsecureIVorNonceSource.java:123:21:123:43 | (...)... : Number | provenance |  |
+| InsecureIVorNonceSource.java:126:35:126:63 | new GCMParameterSpec(...) : GCMParameterSpec | InsecureIVorNonceSource.java:130:51:130:56 | ivSpec | provenance | Sink:MaD:1 |
+| InsecureIVorNonceSource.java:126:61:126:62 | iv : byte[] [[]] : Number | InsecureIVorNonceSource.java:126:35:126:63 | new GCMParameterSpec(...) : GCMParameterSpec | provenance | Config |
+| InsecureIVorNonceSource.java:138:52:138:62 | randomBytes : byte[] | InsecureIVorNonceSource.java:141:26:141:36 | randomBytes : byte[] | provenance |  |
+| InsecureIVorNonceSource.java:141:26:141:36 | randomBytes : byte[] | InsecureIVorNonceSource.java:141:42:141:43 | iv [post update] : byte[] | provenance | MaD:2 |
+| InsecureIVorNonceSource.java:141:42:141:43 | iv [post update] : byte[] | InsecureIVorNonceSource.java:143:61:143:62 | iv : byte[] | provenance |  |
+| InsecureIVorNonceSource.java:143:35:143:63 | new GCMParameterSpec(...) : GCMParameterSpec | InsecureIVorNonceSource.java:147:51:147:56 | ivSpec | provenance | Sink:MaD:1 |
+| InsecureIVorNonceSource.java:143:61:143:62 | iv : byte[] | InsecureIVorNonceSource.java:143:35:143:63 | new GCMParameterSpec(...) : GCMParameterSpec | provenance | Config |
+| InsecureIVorNonceSource.java:143:61:143:62 | iv : byte[] | InsecureIVorNonceSource.java:143:35:143:63 | new GCMParameterSpec(...) : GCMParameterSpec | provenance | MaD:4 |
+| InsecureIVorNonceSource.java:155:52:155:62 | randomBytes : byte[] | InsecureIVorNonceSource.java:158:28:158:38 | randomBytes : byte[] | provenance |  |
+| InsecureIVorNonceSource.java:158:14:158:43 | copyOf(...) : byte[] [[]] : Object | InsecureIVorNonceSource.java:160:61:160:62 | iv : byte[] [[]] : Object | provenance |  |
+| InsecureIVorNonceSource.java:158:28:158:38 | randomBytes : byte[] | InsecureIVorNonceSource.java:158:14:158:43 | copyOf(...) : byte[] [[]] : Object | provenance | MaD:3 |
+| InsecureIVorNonceSource.java:160:35:160:63 | new GCMParameterSpec(...) : GCMParameterSpec | InsecureIVorNonceSource.java:164:51:164:56 | ivSpec | provenance | Sink:MaD:1 |
+| InsecureIVorNonceSource.java:160:61:160:62 | iv : byte[] [[]] : Object | InsecureIVorNonceSource.java:160:35:160:63 | new GCMParameterSpec(...) : GCMParameterSpec | provenance | Config |
+| InsecureIVorNonceSource.java:174:52:174:62 | randomBytes : byte[] | InsecureIVorNonceSource.java:175:16:175:26 | randomBytes : byte[] | provenance |  |
+| InsecureIVorNonceSource.java:175:16:175:26 | randomBytes : byte[] | InsecureIVorNonceSource.java:180:21:180:32 | generate(...) : byte[] | provenance |  |
+| InsecureIVorNonceSource.java:180:21:180:32 | generate(...) : byte[] | InsecureIVorNonceSource.java:182:54:182:55 | iv : byte[] | provenance |  |
+| InsecureIVorNonceSource.java:182:34:182:56 | new IvParameterSpec(...) : IvParameterSpec | InsecureIVorNonceSource.java:186:51:186:56 | ivSpec | provenance | Sink:MaD:1 |
+| InsecureIVorNonceSource.java:182:54:182:55 | iv : byte[] | InsecureIVorNonceSource.java:182:34:182:56 | new IvParameterSpec(...) : IvParameterSpec | provenance | Config |
+| InsecureIVorNonceSource.java:182:54:182:55 | iv : byte[] | InsecureIVorNonceSource.java:182:34:182:56 | new IvParameterSpec(...) : IvParameterSpec | provenance | MaD:5 |
+| InsecureIVorNonceSource.java:194:26:194:30 | bytes : byte[] | InsecureIVorNonceSource.java:195:16:195:20 | bytes : byte[] | provenance |  |
+| InsecureIVorNonceSource.java:195:16:195:20 | bytes : byte[] | InsecureIVorNonceSource.java:200:21:200:51 | generateInsecureRandomBytes(...) : byte[] | provenance |  |
+| InsecureIVorNonceSource.java:200:21:200:51 | generateInsecureRandomBytes(...) : byte[] | InsecureIVorNonceSource.java:202:54:202:55 | iv : byte[] | provenance |  |
+| InsecureIVorNonceSource.java:202:34:202:56 | new IvParameterSpec(...) : IvParameterSpec | InsecureIVorNonceSource.java:206:51:206:56 | ivSpec | provenance | Sink:MaD:1 |
+| InsecureIVorNonceSource.java:202:54:202:55 | iv : byte[] | InsecureIVorNonceSource.java:202:34:202:56 | new IvParameterSpec(...) : IvParameterSpec | provenance | Config |
+| InsecureIVorNonceSource.java:202:54:202:55 | iv : byte[] | InsecureIVorNonceSource.java:202:34:202:56 | new IvParameterSpec(...) : IvParameterSpec | provenance | MaD:5 |
+models
+| 1 | Sink: javax.crypto; Cipher; true; init; (int,Key,AlgorithmParameterSpec); ; Argument[2]; encryption-iv; manual |
+| 2 | Summary: java.lang; System; false; arraycopy; ; ; Argument[0]; Argument[2]; taint; manual |
+| 3 | Summary: java.util; Arrays; false; copyOf; ; ; Argument[0].ArrayElement; ReturnValue.ArrayElement; value; manual |
+| 4 | Summary: javax.crypto.spec; GCMParameterSpec; true; GCMParameterSpec; ; ; Argument[1]; Argument[this]; taint; manual |
+| 5 | Summary: javax.crypto.spec; IvParameterSpec; true; IvParameterSpec; ; ; Argument[0]; Argument[this]; taint; manual |
+nodes
+| InsecureIVorNonceSource.java:14:21:14:81 | {...} : byte[] | semmle.label | {...} : byte[] |
+| InsecureIVorNonceSource.java:16:35:16:63 | new GCMParameterSpec(...) : GCMParameterSpec | semmle.label | new GCMParameterSpec(...) : GCMParameterSpec |
+| InsecureIVorNonceSource.java:16:61:16:62 | iv : byte[] | semmle.label | iv : byte[] |
+| InsecureIVorNonceSource.java:20:51:20:56 | ivSpec | semmle.label | ivSpec |
+| InsecureIVorNonceSource.java:42:13:42:14 | iv [post update] : byte[] [[]] : Number | semmle.label | iv [post update] : byte[] [[]] : Number |
+| InsecureIVorNonceSource.java:42:21:42:21 | 1 : Number | semmle.label | 1 : Number |
+| InsecureIVorNonceSource.java:45:34:45:56 | new IvParameterSpec(...) : IvParameterSpec | semmle.label | new IvParameterSpec(...) : IvParameterSpec |
+| InsecureIVorNonceSource.java:45:54:45:55 | iv : byte[] [[]] : Number | semmle.label | iv : byte[] [[]] : Number |
+| InsecureIVorNonceSource.java:49:51:49:56 | ivSpec | semmle.label | ivSpec |
+| InsecureIVorNonceSource.java:56:30:59:9 | {...} : byte[][] [[]] : byte[] | semmle.label | {...} : byte[][] [[]] : byte[] |
+| InsecureIVorNonceSource.java:57:13:57:62 | {...} : byte[] | semmle.label | {...} : byte[] |
+| InsecureIVorNonceSource.java:58:13:58:63 | {...} : byte[] | semmle.label | {...} : byte[] |
+| InsecureIVorNonceSource.java:61:35:61:73 | new GCMParameterSpec(...) : GCMParameterSpec | semmle.label | new GCMParameterSpec(...) : GCMParameterSpec |
+| InsecureIVorNonceSource.java:61:61:61:69 | staticIvs : byte[][] [[]] : byte[] | semmle.label | staticIvs : byte[][] [[]] : byte[] |
+| InsecureIVorNonceSource.java:61:61:61:72 | ...[...] : byte[] | semmle.label | ...[...] : byte[] |
+| InsecureIVorNonceSource.java:65:51:65:56 | ivSpec | semmle.label | ivSpec |
+| InsecureIVorNonceSource.java:72:30:75:9 | {...} : byte[][] [[]] : byte[] | semmle.label | {...} : byte[][] [[]] : byte[] |
+| InsecureIVorNonceSource.java:73:13:73:73 | {...} : byte[] | semmle.label | {...} : byte[] |
+| InsecureIVorNonceSource.java:74:13:74:74 | {...} : byte[] | semmle.label | {...} : byte[] |
+| InsecureIVorNonceSource.java:77:35:77:73 | new GCMParameterSpec(...) : GCMParameterSpec | semmle.label | new GCMParameterSpec(...) : GCMParameterSpec |
+| InsecureIVorNonceSource.java:77:61:77:69 | staticIvs : byte[][] [[]] : byte[] | semmle.label | staticIvs : byte[][] [[]] : byte[] |
+| InsecureIVorNonceSource.java:77:61:77:72 | ...[...] : byte[] | semmle.label | ...[...] : byte[] |
+| InsecureIVorNonceSource.java:81:51:81:56 | ivSpec | semmle.label | ivSpec |
+| InsecureIVorNonceSource.java:107:26:107:27 | iv : byte[] | semmle.label | iv : byte[] |
+| InsecureIVorNonceSource.java:109:35:109:63 | new GCMParameterSpec(...) : GCMParameterSpec | semmle.label | new GCMParameterSpec(...) : GCMParameterSpec |
+| InsecureIVorNonceSource.java:109:61:109:62 | iv : byte[] | semmle.label | iv : byte[] |
+| InsecureIVorNonceSource.java:113:51:113:56 | ivSpec | semmle.label | ivSpec |
+| InsecureIVorNonceSource.java:123:13:123:14 | iv [post update] : byte[] [[]] : Number | semmle.label | iv [post update] : byte[] [[]] : Number |
+| InsecureIVorNonceSource.java:123:21:123:43 | (...)... : Number | semmle.label | (...)... : Number |
+| InsecureIVorNonceSource.java:123:28:123:43 | nextInt(...) : Number | semmle.label | nextInt(...) : Number |
+| InsecureIVorNonceSource.java:126:35:126:63 | new GCMParameterSpec(...) : GCMParameterSpec | semmle.label | new GCMParameterSpec(...) : GCMParameterSpec |
+| InsecureIVorNonceSource.java:126:61:126:62 | iv : byte[] [[]] : Number | semmle.label | iv : byte[] [[]] : Number |
+| InsecureIVorNonceSource.java:130:51:130:56 | ivSpec | semmle.label | ivSpec |
+| InsecureIVorNonceSource.java:138:52:138:62 | randomBytes : byte[] | semmle.label | randomBytes : byte[] |
+| InsecureIVorNonceSource.java:141:26:141:36 | randomBytes : byte[] | semmle.label | randomBytes : byte[] |
+| InsecureIVorNonceSource.java:141:42:141:43 | iv [post update] : byte[] | semmle.label | iv [post update] : byte[] |
+| InsecureIVorNonceSource.java:143:35:143:63 | new GCMParameterSpec(...) : GCMParameterSpec | semmle.label | new GCMParameterSpec(...) : GCMParameterSpec |
+| InsecureIVorNonceSource.java:143:61:143:62 | iv : byte[] | semmle.label | iv : byte[] |
+| InsecureIVorNonceSource.java:147:51:147:56 | ivSpec | semmle.label | ivSpec |
+| InsecureIVorNonceSource.java:155:52:155:62 | randomBytes : byte[] | semmle.label | randomBytes : byte[] |
+| InsecureIVorNonceSource.java:158:14:158:43 | copyOf(...) : byte[] [[]] : Object | semmle.label | copyOf(...) : byte[] [[]] : Object |
+| InsecureIVorNonceSource.java:158:28:158:38 | randomBytes : byte[] | semmle.label | randomBytes : byte[] |
+| InsecureIVorNonceSource.java:160:35:160:63 | new GCMParameterSpec(...) : GCMParameterSpec | semmle.label | new GCMParameterSpec(...) : GCMParameterSpec |
+| InsecureIVorNonceSource.java:160:61:160:62 | iv : byte[] [[]] : Object | semmle.label | iv : byte[] [[]] : Object |
+| InsecureIVorNonceSource.java:164:51:164:56 | ivSpec | semmle.label | ivSpec |
+| InsecureIVorNonceSource.java:174:52:174:62 | randomBytes : byte[] | semmle.label | randomBytes : byte[] |
+| InsecureIVorNonceSource.java:175:16:175:26 | randomBytes : byte[] | semmle.label | randomBytes : byte[] |
+| InsecureIVorNonceSource.java:180:21:180:32 | generate(...) : byte[] | semmle.label | generate(...) : byte[] |
+| InsecureIVorNonceSource.java:182:34:182:56 | new IvParameterSpec(...) : IvParameterSpec | semmle.label | new IvParameterSpec(...) : IvParameterSpec |
+| InsecureIVorNonceSource.java:182:54:182:55 | iv : byte[] | semmle.label | iv : byte[] |
+| InsecureIVorNonceSource.java:186:51:186:56 | ivSpec | semmle.label | ivSpec |
+| InsecureIVorNonceSource.java:194:26:194:30 | bytes : byte[] | semmle.label | bytes : byte[] |
+| InsecureIVorNonceSource.java:195:16:195:20 | bytes : byte[] | semmle.label | bytes : byte[] |
+| InsecureIVorNonceSource.java:200:21:200:51 | generateInsecureRandomBytes(...) : byte[] | semmle.label | generateInsecureRandomBytes(...) : byte[] |
+| InsecureIVorNonceSource.java:202:34:202:56 | new IvParameterSpec(...) : IvParameterSpec | semmle.label | new IvParameterSpec(...) : IvParameterSpec |
+| InsecureIVorNonceSource.java:202:54:202:55 | iv : byte[] | semmle.label | iv : byte[] |
+| InsecureIVorNonceSource.java:206:51:206:56 | ivSpec | semmle.label | ivSpec |
+subpaths
+testFailures
+| InsecureIVorNonceSource.java:42:21:42:21 | 1 : Number | Unexpected result: Source |
diff --git a/java/ql/test/experimental/query-tests/quantum/examples/InsecureOrUnknownNonceSource/InsecureIVorNonceSource.java b/java/ql/test/experimental/query-tests/quantum/examples/InsecureOrUnknownNonceSource/InsecureIVorNonceSource.java
new file mode 100644
index 00000000000..549c56dbd98
--- /dev/null
+++ b/java/ql/test/experimental/query-tests/quantum/examples/InsecureOrUnknownNonceSource/InsecureIVorNonceSource.java
@@ -0,0 +1,210 @@
+import javax.crypto.Cipher;
+import javax.crypto.spec.GCMParameterSpec;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+import java.util.Random;
+
+import java.security.SecureRandom;
+import java.util.Arrays;
+
+public class InsecureIVorNonceSource {
+
+    // BAD: AES-GCM with static IV from a byte array
+    public byte[] encryptWithStaticIvByteArrayWithInitializer(byte[] key, byte[] plaintext) throws Exception {
+        byte[] iv = new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5 }; // $Source
+
+        GCMParameterSpec ivSpec = new GCMParameterSpec(128, iv);
+        SecretKeySpec keySpec = new SecretKeySpec(key, "AES");
+
+        Cipher cipher = Cipher.getInstance("AES/GCM/PKCS5PADDING");
+        cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec); // $Alert[java/quantum/examples/insecure-iv-or-nonce]
+        cipher.update(plaintext);
+        return cipher.doFinal();
+    }
+
+    // BAD: AES-GCM with static IV from zero-initialized byte array
+    public byte[] encryptWithZeroStaticIvByteArray(byte[] key, byte[] plaintext) throws Exception {
+        byte[] iv = new byte[16]; 
+
+        GCMParameterSpec ivSpec = new GCMParameterSpec(128, iv);
+        SecretKeySpec keySpec = new SecretKeySpec(key, "AES");
+
+        Cipher cipher = Cipher.getInstance("AES/GCM/PKCS5PADDING");
+        cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec); // $Alert[java/quantum/examples/unknown-iv-or-nonce-source]
+        cipher.update(plaintext);
+        return cipher.doFinal();
+    }
+
+    // BAD: AES-CBC with static IV from 1-initialized byte array
+    public byte[] encryptWithStaticIvByteArray(byte[] key, byte[] plaintext) throws Exception {
+        byte[] iv = new byte[16]; 
+        for (byte i = 0; i < iv.length; i++) {
+            iv[i] = 1;
+        }
+
+        IvParameterSpec ivSpec = new IvParameterSpec(iv);
+        SecretKeySpec keySpec = new SecretKeySpec(key, "AES");
+
+        Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5PADDING");
+        cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec); // $Alert[java/quantum/examples/insecure-iv-or-nonce]
+        cipher.update(plaintext);
+        return cipher.doFinal();
+    }
+
+    // BAD: AES-GCM with static IV from a multidimensional byte array
+    public byte[] encryptWithOneOfStaticIvs01(byte[] key, byte[] plaintext) throws Exception {
+        byte[][] staticIvs = new byte[][] {
+            { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5 }, // $Source
+            { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 42 } // $Source
+        }; 
+
+        GCMParameterSpec ivSpec = new GCMParameterSpec(128, staticIvs[1]);
+        SecretKeySpec keySpec = new SecretKeySpec(key, "AES");
+
+        Cipher cipher = Cipher.getInstance("AES/GCM/PKCS5PADDING");
+        cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec); // $Alert[java/quantum/examples/insecure-iv-or-nonce]
+        cipher.update(plaintext);
+        return cipher.doFinal();
+    }
+
+    // BAD: AES-GCM with static IV from a multidimensional byte array
+    public byte[] encryptWithOneOfStaticIvs02(byte[] key, byte[] plaintext) throws Exception {
+        byte[][] staticIvs = new byte[][] {
+            new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5 }, // $Source
+            new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 42 } // $Source
+        }; 
+
+        GCMParameterSpec ivSpec = new GCMParameterSpec(128, staticIvs[1]);
+        SecretKeySpec keySpec = new SecretKeySpec(key, "AES");
+
+        Cipher cipher = Cipher.getInstance("AES/GCM/PKCS5PADDING");
+        cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec); // $Alert[java/quantum/examples/insecure-iv-or-nonce]
+        cipher.update(plaintext);
+        return cipher.doFinal();
+    }
+
+    // BAD: AES-GCM with static IV from a zero-initialized multidimensional byte array
+    public byte[] encryptWithOneOfStaticZeroIvs(byte[] key, byte[] plaintext) throws Exception {
+        byte[][] ivs = new byte[][] {
+            new byte[8], 
+            new byte[16] 
+        };
+
+        GCMParameterSpec ivSpec = new GCMParameterSpec(128, ivs[1]);
+        SecretKeySpec keySpec = new SecretKeySpec(key, "AES");
+
+        Cipher cipher = Cipher.getInstance("AES/GCM/PKCS5PADDING");
+        cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec); // $Alert[java/quantum/examples/unknown-iv-or-nonce-source]
+        cipher.update(plaintext);
+        return cipher.doFinal();
+    }
+
+    // GOOD: AES-GCM with a random IV
+    public byte[] encryptWithRandomIv(byte[] key, byte[] plaintext) throws Exception {
+        byte[] iv = new byte[16];
+
+        SecureRandom random = SecureRandom.getInstanceStrong();
+        random.nextBytes(iv);
+
+        GCMParameterSpec ivSpec = new GCMParameterSpec(128, iv);
+        SecretKeySpec keySpec = new SecretKeySpec(key, "AES");
+
+        Cipher cipher = Cipher.getInstance("AES/GCM/PKCS5PADDING");
+        cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec);
+        cipher.update(plaintext);
+        return cipher.doFinal();
+    }
+
+    // GOOD: AES-GCM with a random IV
+    public byte[] encryptWithRandomIvByteByByte(byte[] key, byte[] plaintext) throws Exception {
+        SecureRandom random = SecureRandom.getInstanceStrong();
+        byte[] iv = new byte[16];
+        for (int i = 0; i < iv.length; i++) {
+            iv[i] = (byte) random.nextInt();
+        }
+
+        GCMParameterSpec ivSpec = new GCMParameterSpec(128, iv);
+        SecretKeySpec keySpec = new SecretKeySpec(key, "AES");
+
+        Cipher cipher = Cipher.getInstance("AES/GCM/PKCS5PADDING");
+        cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec);
+        cipher.update(plaintext);
+        return cipher.doFinal();
+    }
+
+    // GOOD: AES-GCM with a random IV
+    public byte[] encryptWithRandomIvWithSystemArrayCopy(byte[] key, byte[] plaintext) throws Exception {
+        byte[] randomBytes = new byte[16];
+        SecureRandom.getInstanceStrong().nextBytes(randomBytes);
+
+        byte[] iv = new byte[16];
+        System.arraycopy(randomBytes, 0, iv, 0, 16);
+
+        GCMParameterSpec ivSpec = new GCMParameterSpec(128, iv);
+        SecretKeySpec keySpec = new SecretKeySpec(key, "AES");
+
+        Cipher cipher = Cipher.getInstance("AES/GCM/PKCS5PADDING");
+        cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec);
+        cipher.update(plaintext);
+        return cipher.doFinal();
+    }
+
+    // GOOD: AES-GCM with a random IV
+    public byte[] encryptWithRandomIvWithArraysCopy(byte[] key, byte[] plaintext) throws Exception {
+        byte[] randomBytes = new byte[16];
+        SecureRandom.getInstanceStrong().nextBytes(randomBytes);
+
+        byte[] iv = new byte[16];
+        iv = Arrays.copyOf(randomBytes, 16);
+
+        GCMParameterSpec ivSpec = new GCMParameterSpec(128, iv);
+        SecretKeySpec keySpec = new SecretKeySpec(key, "AES");
+
+        Cipher cipher = Cipher.getInstance("AES/GCM/PKCS5PADDING");
+        cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec);
+        cipher.update(plaintext);
+        return cipher.doFinal();
+    }
+
+    public byte[] generate(int size) throws Exception { 
+        if (size == 0) { 
+            return new byte[0];
+        }
+        byte[] randomBytes = new byte[size];
+        SecureRandom.getInstanceStrong().nextBytes(randomBytes);
+        return randomBytes;
+    }
+
+    // GOOD: AES-CBC with a random IV
+    public byte[] encryptWithGeneratedIvByteArray(byte[] key, byte[] plaintext) throws Exception {
+        byte[] iv = generate(16);
+
+        IvParameterSpec ivSpec = new IvParameterSpec(iv);
+        SecretKeySpec keySpec = new SecretKeySpec(key, "AES");
+
+        Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5PADDING");
+        cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec); 
+        cipher.update(plaintext);
+        return cipher.doFinal();
+    }
+
+    public byte[] generateInsecureRandomBytes(int numBytes) {
+        Random random = new Random();
+        byte[] bytes = new byte[numBytes];
+        random.nextBytes(bytes); // $Source
+        return bytes;
+    }
+
+    // BAD: AES-CBC with an insecure random IV
+    public byte[] encryptWithGeneratedIvByteArrayInsecure(byte[] key, byte[] plaintext) throws Exception {
+        byte[] iv = generateInsecureRandomBytes(16);
+
+        IvParameterSpec ivSpec = new IvParameterSpec(iv);
+        SecretKeySpec keySpec = new SecretKeySpec(key, "AES");
+
+        Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5PADDING");
+        cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec);  // $Alert[java/quantum/examples/insecure-iv-or-nonce]]
+        cipher.update(plaintext);
+        return cipher.doFinal();
+    }
+}
diff --git a/java/ql/test/experimental/query-tests/quantum/examples/InsecureOrUnknownNonceSource/InsecureIVorNonceSource.qlref b/java/ql/test/experimental/query-tests/quantum/examples/InsecureOrUnknownNonceSource/InsecureIVorNonceSource.qlref
new file mode 100644
index 00000000000..1b26475bb35
--- /dev/null
+++ b/java/ql/test/experimental/query-tests/quantum/examples/InsecureOrUnknownNonceSource/InsecureIVorNonceSource.qlref
@@ -0,0 +1,4 @@
+query: experimental/quantum/Examples/InsecureIVorNonceSource.ql
+postprocess:
+  - utils/test/PrettyPrintModels.ql
+  - utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/java/ql/test/experimental/query-tests/quantum/examples/InsecureOrUnknownNonceSource/UnknownIVorNonceSource.expected b/java/ql/test/experimental/query-tests/quantum/examples/InsecureOrUnknownNonceSource/UnknownIVorNonceSource.expected
new file mode 100644
index 00000000000..3759e19826b
--- /dev/null
+++ b/java/ql/test/experimental/query-tests/quantum/examples/InsecureOrUnknownNonceSource/UnknownIVorNonceSource.expected
@@ -0,0 +1,2 @@
+| InsecureIVorNonceSource.java:33:51:33:56 | Nonce | Unknown IV/Nonce initialization source at encryption operation $@ | InsecureIVorNonceSource.java:35:16:35:31 | EncryptOperation | EncryptOperation |
+| InsecureIVorNonceSource.java:97:51:97:56 | Nonce | Unknown IV/Nonce initialization source at encryption operation $@ | InsecureIVorNonceSource.java:99:16:99:31 | EncryptOperation | EncryptOperation |
diff --git a/java/ql/test/experimental/query-tests/quantum/examples/InsecureOrUnknownNonceSource/UnknownIVorNonceSource.qlref b/java/ql/test/experimental/query-tests/quantum/examples/InsecureOrUnknownNonceSource/UnknownIVorNonceSource.qlref
new file mode 100644
index 00000000000..8bdc38026ad
--- /dev/null
+++ b/java/ql/test/experimental/query-tests/quantum/examples/InsecureOrUnknownNonceSource/UnknownIVorNonceSource.qlref
@@ -0,0 +1,4 @@
+query: experimental/quantum/Examples/UnknownIVorNonceSource.ql
+postprocess:
+  - utils/test/PrettyPrintModels.ql
+  - utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/java/ql/test/experimental/query-tests/quantum/examples/NonceReuse/NonceReuse.expected b/java/ql/test/experimental/query-tests/quantum/examples/NonceReuse/NonceReuse.expected
new file mode 100644
index 00000000000..ab2ca44ada4
--- /dev/null
+++ b/java/ql/test/experimental/query-tests/quantum/examples/NonceReuse/NonceReuse.expected
@@ -0,0 +1,94 @@
+#select
+| Test.java:40:47:40:52 | ivSpec | Test.java:19:38:19:40 | val : byte[] | Test.java:40:47:40:52 | ivSpec | Nonce source is reused, see alternate sink $@ | Test.java:49:47:49:52 | Nonce | Nonce |
+| Test.java:49:47:49:52 | ivSpec | Test.java:19:38:19:40 | val : byte[] | Test.java:49:47:49:52 | ivSpec | Nonce source is reused, see alternate sink $@ | Test.java:40:47:40:52 | Nonce | Nonce |
+| Test.java:76:48:76:54 | ivSpec1 | Test.java:19:38:19:40 | val : byte[] | Test.java:76:48:76:54 | ivSpec1 | Nonce source is reused, see alternate sink $@ | Test.java:82:49:82:55 | Nonce | Nonce |
+| Test.java:82:49:82:55 | ivSpec2 | Test.java:19:38:19:40 | val : byte[] | Test.java:82:49:82:55 | ivSpec2 | Nonce source is reused, see alternate sink $@ | Test.java:76:48:76:54 | Nonce | Nonce |
+edges
+| Test.java:19:38:19:40 | val : byte[] | Test.java:20:16:20:18 | val : byte[] | provenance |  |
+| Test.java:20:16:20:18 | val : byte[] | Test.java:25:15:25:33 | getRandomWrapper1(...) : byte[] | provenance |  |
+| Test.java:20:16:20:18 | val : byte[] | Test.java:32:15:32:33 | getRandomWrapper1(...) : byte[] | provenance |  |
+| Test.java:25:15:25:33 | getRandomWrapper1(...) : byte[] | Test.java:26:16:26:18 | val : byte[] | provenance |  |
+| Test.java:25:15:25:33 | getRandomWrapper1(...) : byte[] | Test.java:27:16:27:18 | val : byte[] | provenance |  |
+| Test.java:26:16:26:18 | val : byte[] | Test.java:36:32:36:40 | iv : byte[] | provenance |  |
+| Test.java:27:16:27:18 | val : byte[] | Test.java:45:21:45:40 | getRandomWrapper2A(...) : byte[] | provenance |  |
+| Test.java:32:15:32:33 | getRandomWrapper1(...) : byte[] | Test.java:33:16:33:18 | val : byte[] | provenance |  |
+| Test.java:33:16:33:18 | val : byte[] | Test.java:54:21:54:40 | getRandomWrapper2b(...) : byte[] | provenance |  |
+| Test.java:33:16:33:18 | val : byte[] | Test.java:63:21:63:40 | getRandomWrapper2b(...) : byte[] | provenance |  |
+| Test.java:33:16:33:18 | val : byte[] | Test.java:72:21:72:40 | getRandomWrapper2b(...) : byte[] | provenance |  |
+| Test.java:36:32:36:40 | iv : byte[] | Test.java:37:54:37:55 | iv : byte[] | provenance |  |
+| Test.java:37:34:37:56 | new IvParameterSpec(...) : IvParameterSpec | Test.java:40:47:40:52 | ivSpec | provenance | Sink:MaD:1 |
+| Test.java:37:54:37:55 | iv : byte[] | Test.java:37:34:37:56 | new IvParameterSpec(...) : IvParameterSpec | provenance | Config |
+| Test.java:37:54:37:55 | iv : byte[] | Test.java:37:34:37:56 | new IvParameterSpec(...) : IvParameterSpec | provenance | MaD:2 |
+| Test.java:45:21:45:40 | getRandomWrapper2A(...) : byte[] | Test.java:46:54:46:55 | iv : byte[] | provenance |  |
+| Test.java:46:34:46:56 | new IvParameterSpec(...) : IvParameterSpec | Test.java:49:47:49:52 | ivSpec | provenance | Sink:MaD:1 |
+| Test.java:46:54:46:55 | iv : byte[] | Test.java:46:34:46:56 | new IvParameterSpec(...) : IvParameterSpec | provenance | Config |
+| Test.java:46:54:46:55 | iv : byte[] | Test.java:46:34:46:56 | new IvParameterSpec(...) : IvParameterSpec | provenance | MaD:2 |
+| Test.java:54:21:54:40 | getRandomWrapper2b(...) : byte[] | Test.java:55:54:55:55 | iv : byte[] | provenance |  |
+| Test.java:55:34:55:56 | new IvParameterSpec(...) : IvParameterSpec | Test.java:58:47:58:52 | ivSpec | provenance | Sink:MaD:1 |
+| Test.java:55:54:55:55 | iv : byte[] | Test.java:55:34:55:56 | new IvParameterSpec(...) : IvParameterSpec | provenance | Config |
+| Test.java:55:54:55:55 | iv : byte[] | Test.java:55:34:55:56 | new IvParameterSpec(...) : IvParameterSpec | provenance | MaD:2 |
+| Test.java:63:21:63:40 | getRandomWrapper2b(...) : byte[] | Test.java:64:54:64:55 | iv : byte[] | provenance |  |
+| Test.java:64:34:64:56 | new IvParameterSpec(...) : IvParameterSpec | Test.java:67:47:67:52 | ivSpec | provenance | Sink:MaD:1 |
+| Test.java:64:54:64:55 | iv : byte[] | Test.java:64:34:64:56 | new IvParameterSpec(...) : IvParameterSpec | provenance | Config |
+| Test.java:64:54:64:55 | iv : byte[] | Test.java:64:34:64:56 | new IvParameterSpec(...) : IvParameterSpec | provenance | MaD:2 |
+| Test.java:72:21:72:40 | getRandomWrapper2b(...) : byte[] | Test.java:73:55:73:56 | iv : byte[] | provenance |  |
+| Test.java:73:35:73:57 | new IvParameterSpec(...) : IvParameterSpec | Test.java:76:48:76:54 | ivSpec1 | provenance | Sink:MaD:1 |
+| Test.java:73:55:73:56 | iv : byte[] | Test.java:73:35:73:57 | new IvParameterSpec(...) : IvParameterSpec | provenance | Config |
+| Test.java:73:55:73:56 | iv : byte[] | Test.java:73:35:73:57 | new IvParameterSpec(...) : IvParameterSpec | provenance | MaD:2 |
+| Test.java:73:55:73:56 | iv : byte[] | Test.java:79:55:79:56 | iv : byte[] | provenance |  |
+| Test.java:79:35:79:57 | new IvParameterSpec(...) : IvParameterSpec | Test.java:82:49:82:55 | ivSpec2 | provenance | Sink:MaD:1 |
+| Test.java:79:55:79:56 | iv : byte[] | Test.java:79:35:79:57 | new IvParameterSpec(...) : IvParameterSpec | provenance | Config |
+| Test.java:79:55:79:56 | iv : byte[] | Test.java:79:35:79:57 | new IvParameterSpec(...) : IvParameterSpec | provenance | MaD:2 |
+| Test.java:88:38:88:39 | iv : byte[] | Test.java:89:54:89:55 | iv : byte[] | provenance |  |
+| Test.java:89:34:89:56 | new IvParameterSpec(...) : IvParameterSpec | Test.java:93:51:93:56 | ivSpec | provenance | Sink:MaD:1 |
+| Test.java:89:34:89:56 | new IvParameterSpec(...) : IvParameterSpec | Test.java:96:51:96:56 | ivSpec | provenance | Sink:MaD:1 |
+| Test.java:89:54:89:55 | iv : byte[] | Test.java:89:34:89:56 | new IvParameterSpec(...) : IvParameterSpec | provenance | Config |
+| Test.java:89:54:89:55 | iv : byte[] | Test.java:89:34:89:56 | new IvParameterSpec(...) : IvParameterSpec | provenance | MaD:2 |
+| Test.java:103:38:103:39 | iv : byte[] | Test.java:104:54:104:55 | iv : byte[] | provenance |  |
+| Test.java:104:34:104:56 | new IvParameterSpec(...) : IvParameterSpec | Test.java:107:47:107:52 | ivSpec | provenance | Sink:MaD:1 |
+| Test.java:104:54:104:55 | iv : byte[] | Test.java:104:34:104:56 | new IvParameterSpec(...) : IvParameterSpec | provenance | Config |
+| Test.java:104:54:104:55 | iv : byte[] | Test.java:104:34:104:56 | new IvParameterSpec(...) : IvParameterSpec | provenance | MaD:2 |
+models
+| 1 | Sink: javax.crypto; Cipher; true; init; (int,Key,AlgorithmParameterSpec); ; Argument[2]; encryption-iv; manual |
+| 2 | Summary: javax.crypto.spec; IvParameterSpec; true; IvParameterSpec; ; ; Argument[0]; Argument[this]; taint; manual |
+nodes
+| Test.java:19:38:19:40 | val : byte[] | semmle.label | val : byte[] |
+| Test.java:20:16:20:18 | val : byte[] | semmle.label | val : byte[] |
+| Test.java:25:15:25:33 | getRandomWrapper1(...) : byte[] | semmle.label | getRandomWrapper1(...) : byte[] |
+| Test.java:26:16:26:18 | val : byte[] | semmle.label | val : byte[] |
+| Test.java:27:16:27:18 | val : byte[] | semmle.label | val : byte[] |
+| Test.java:32:15:32:33 | getRandomWrapper1(...) : byte[] | semmle.label | getRandomWrapper1(...) : byte[] |
+| Test.java:33:16:33:18 | val : byte[] | semmle.label | val : byte[] |
+| Test.java:36:32:36:40 | iv : byte[] | semmle.label | iv : byte[] |
+| Test.java:37:34:37:56 | new IvParameterSpec(...) : IvParameterSpec | semmle.label | new IvParameterSpec(...) : IvParameterSpec |
+| Test.java:37:54:37:55 | iv : byte[] | semmle.label | iv : byte[] |
+| Test.java:40:47:40:52 | ivSpec | semmle.label | ivSpec |
+| Test.java:45:21:45:40 | getRandomWrapper2A(...) : byte[] | semmle.label | getRandomWrapper2A(...) : byte[] |
+| Test.java:46:34:46:56 | new IvParameterSpec(...) : IvParameterSpec | semmle.label | new IvParameterSpec(...) : IvParameterSpec |
+| Test.java:46:54:46:55 | iv : byte[] | semmle.label | iv : byte[] |
+| Test.java:49:47:49:52 | ivSpec | semmle.label | ivSpec |
+| Test.java:54:21:54:40 | getRandomWrapper2b(...) : byte[] | semmle.label | getRandomWrapper2b(...) : byte[] |
+| Test.java:55:34:55:56 | new IvParameterSpec(...) : IvParameterSpec | semmle.label | new IvParameterSpec(...) : IvParameterSpec |
+| Test.java:55:54:55:55 | iv : byte[] | semmle.label | iv : byte[] |
+| Test.java:58:47:58:52 | ivSpec | semmle.label | ivSpec |
+| Test.java:63:21:63:40 | getRandomWrapper2b(...) : byte[] | semmle.label | getRandomWrapper2b(...) : byte[] |
+| Test.java:64:34:64:56 | new IvParameterSpec(...) : IvParameterSpec | semmle.label | new IvParameterSpec(...) : IvParameterSpec |
+| Test.java:64:54:64:55 | iv : byte[] | semmle.label | iv : byte[] |
+| Test.java:67:47:67:52 | ivSpec | semmle.label | ivSpec |
+| Test.java:72:21:72:40 | getRandomWrapper2b(...) : byte[] | semmle.label | getRandomWrapper2b(...) : byte[] |
+| Test.java:73:35:73:57 | new IvParameterSpec(...) : IvParameterSpec | semmle.label | new IvParameterSpec(...) : IvParameterSpec |
+| Test.java:73:55:73:56 | iv : byte[] | semmle.label | iv : byte[] |
+| Test.java:76:48:76:54 | ivSpec1 | semmle.label | ivSpec1 |
+| Test.java:79:35:79:57 | new IvParameterSpec(...) : IvParameterSpec | semmle.label | new IvParameterSpec(...) : IvParameterSpec |
+| Test.java:79:55:79:56 | iv : byte[] | semmle.label | iv : byte[] |
+| Test.java:82:49:82:55 | ivSpec2 | semmle.label | ivSpec2 |
+| Test.java:88:38:88:39 | iv : byte[] | semmle.label | iv : byte[] |
+| Test.java:89:34:89:56 | new IvParameterSpec(...) : IvParameterSpec | semmle.label | new IvParameterSpec(...) : IvParameterSpec |
+| Test.java:89:54:89:55 | iv : byte[] | semmle.label | iv : byte[] |
+| Test.java:93:51:93:56 | ivSpec | semmle.label | ivSpec |
+| Test.java:96:51:96:56 | ivSpec | semmle.label | ivSpec |
+| Test.java:103:38:103:39 | iv : byte[] | semmle.label | iv : byte[] |
+| Test.java:104:34:104:56 | new IvParameterSpec(...) : IvParameterSpec | semmle.label | new IvParameterSpec(...) : IvParameterSpec |
+| Test.java:104:54:104:55 | iv : byte[] | semmle.label | iv : byte[] |
+| Test.java:107:47:107:52 | ivSpec | semmle.label | ivSpec |
+subpaths
diff --git a/java/ql/test/experimental/query-tests/quantum/examples/NonceReuse/NonceReuse.qlref b/java/ql/test/experimental/query-tests/quantum/examples/NonceReuse/NonceReuse.qlref
new file mode 100644
index 00000000000..9658a376bb9
--- /dev/null
+++ b/java/ql/test/experimental/query-tests/quantum/examples/NonceReuse/NonceReuse.qlref
@@ -0,0 +1,2 @@
+query: experimental/quantum/Examples/ReusedNonce.ql
+postprocess: utils/test/PrettyPrintModels.ql
diff --git a/java/ql/test/experimental/query-tests/quantum/examples/NonceReuse/Test.java b/java/ql/test/experimental/query-tests/quantum/examples/NonceReuse/Test.java
new file mode 100644
index 00000000000..e384143db08
--- /dev/null
+++ b/java/ql/test/experimental/query-tests/quantum/examples/NonceReuse/Test.java
@@ -0,0 +1,123 @@
+package com.example.crypto.artifacts;
+
+import java.security.*;
+import javax.crypto.Cipher;
+import javax.crypto.KeyGenerator;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.IvParameterSpec;
+
+public class Test {
+
+    public static SecretKey generateAESKey() throws Exception {
+        KeyGenerator keyGen = KeyGenerator.getInstance("AES");
+        keyGen.init(256);
+        return keyGen.generateKey();
+    }
+
+    private static byte[] getRandomWrapper1() throws Exception {
+        byte[] val = new byte[16];
+        new SecureRandom().nextBytes(val);
+        return val;
+    }
+
+    private static byte[] getRandomWrapper2A() throws Exception {
+        byte[] val;
+        val = getRandomWrapper1();
+        funcA1(val);
+        return val;
+    }
+
+    private static byte[] getRandomWrapper2b() throws Exception {
+        byte[] val;
+        val = getRandomWrapper1();
+        return val;
+    }
+
+    private static void funcA1(byte[] iv) throws Exception {
+        IvParameterSpec ivSpec = new IvParameterSpec(iv);
+        Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
+        SecretKey key = generateAESKey();
+        cipher.init(Cipher.ENCRYPT_MODE, key, ivSpec); // BAD: Reuse of `iv` in funcB1
+        byte[] ciphertext = cipher.doFinal("Simple Test Data".getBytes());
+    }
+
+    private static void funcB1() throws Exception {
+        byte[] iv = getRandomWrapper2A();
+        IvParameterSpec ivSpec = new IvParameterSpec(iv);
+        Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
+        SecretKey key = generateAESKey();
+        cipher.init(Cipher.ENCRYPT_MODE, key, ivSpec); // BAD: Reuse of `iv` in funcA1
+        byte[] ciphertext = cipher.doFinal("Simple Test Data".getBytes());
+    }
+
+    private static void funcA2() throws Exception {
+        byte[] iv = getRandomWrapper2b();
+        IvParameterSpec ivSpec = new IvParameterSpec(iv);
+        Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
+        SecretKey key = generateAESKey();
+        cipher.init(Cipher.ENCRYPT_MODE, key, ivSpec); // GOOD
+        byte[] ciphertext = cipher.doFinal("Simple Test Data".getBytes());
+    }
+
+    private static void funcB2() throws Exception {
+        byte[] iv = getRandomWrapper2b();
+        IvParameterSpec ivSpec = new IvParameterSpec(iv);
+        Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
+        SecretKey key = generateAESKey();
+        cipher.init(Cipher.ENCRYPT_MODE, key, ivSpec); // GOOD
+        byte[] ciphertext = cipher.doFinal("Simple Test Data".getBytes());
+    }
+
+    private static void funcA3() throws Exception {
+        byte[] iv = getRandomWrapper2b();
+        IvParameterSpec ivSpec1 = new IvParameterSpec(iv);
+        Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
+        SecretKey key1 = generateAESKey();
+        cipher.init(Cipher.ENCRYPT_MODE, key1, ivSpec1); // BAD: reuse of `iv` below
+        byte[] ciphertext = cipher.doFinal("Simple Test Data".getBytes());
+
+        IvParameterSpec ivSpec2 = new IvParameterSpec(iv);
+        Cipher cipher2 = Cipher.getInstance("AES/CBC/PKCS5Padding");
+        SecretKey key2 = generateAESKey();
+        cipher2.init(Cipher.ENCRYPT_MODE, key2, ivSpec2); // BAD: Reuse of `iv` above
+        byte[] ciphertext2 = cipher2.doFinal("Simple Test Data".getBytes());
+    }
+
+    public void falsePositive1() throws Exception {
+        byte[] iv = null;
+        new SecureRandom().nextBytes(iv);
+        IvParameterSpec ivSpec = new IvParameterSpec(iv);
+        Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
+        SecretKey key = generateAESKey();
+        if (iv != null) {
+            cipher.init(Cipher.ENCRYPT_MODE, key, ivSpec); // GOOD
+            byte[] ciphertext = cipher.doFinal("Simple Test Data".getBytes());
+        } else if(iv.length > 0) {
+            cipher.init(Cipher.ENCRYPT_MODE, key, ivSpec); // GOOD
+            byte[] ciphertext = cipher.doFinal("Simple Test Data".getBytes());
+        }
+    }
+
+    public void falsePositive2() throws Exception {
+        byte[] iv = null;
+        new SecureRandom().nextBytes(iv);
+        IvParameterSpec ivSpec = new IvParameterSpec(iv);
+        Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
+        SecretKey key = generateAESKey();
+        cipher.init(Cipher.ENCRYPT_MODE, key, ivSpec); // GOOD
+        byte[] ciphertext = cipher.doFinal("Simple Test Data".getBytes());
+
+        cipher.init(Cipher.DECRYPT_MODE, key, ivSpec); // GOOD
+        byte[] decryptedData = cipher.doFinal(ciphertext);
+    }
+
+    public static void main(String[] args) {
+        try {
+            funcA2();
+            funcB1();
+            funcB2();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownAsymmetricKeySize/InsufficientAsymmetricKeySize.java b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownAsymmetricKeySize/InsufficientAsymmetricKeySize.java
new file mode 100644
index 00000000000..c330bf82a05
--- /dev/null
+++ b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownAsymmetricKeySize/InsufficientAsymmetricKeySize.java
@@ -0,0 +1,28 @@
+import java.security.*;
+public class InsufficientAsymmetricKeySize{
+    public static void test() throws Exception{
+        KeyPairGenerator keyPairGen1 = KeyPairGenerator.getInstance("RSA");
+        keyPairGen1.initialize(1024); // $Alert[java/quantum/examples/weak-asymmetric-key-gen-size]
+        keyPairGen1.generateKeyPair();
+
+        KeyPairGenerator keyPairGen2 = KeyPairGenerator.getInstance("DSA");
+        keyPairGen2.initialize(1024); // $Alert[java/quantum/examples/weak-asymmetric-key-gen-size]
+        keyPairGen2.generateKeyPair();
+
+        KeyPairGenerator keyPairGen3 = KeyPairGenerator.getInstance("DH");
+        keyPairGen3.initialize(1024); // $Alert[java/quantum/examples/weak-asymmetric-key-gen-size]
+        keyPairGen3.generateKeyPair();
+
+        KeyPairGenerator keyPairGen4 = KeyPairGenerator.getInstance("RSA");
+        keyPairGen4.initialize(2048); // GOOD
+        keyPairGen4.generateKeyPair();
+
+        KeyPairGenerator keyPairGen5 = KeyPairGenerator.getInstance("DSA");
+        keyPairGen5.initialize(2048); // GOOD
+        keyPairGen5.generateKeyPair();
+
+        KeyPairGenerator keyPairGen6 = KeyPairGenerator.getInstance("DH");
+        keyPairGen6.initialize(2048); // GOOD
+        keyPairGen6.generateKeyPair();
+    }
+}
\ No newline at end of file
diff --git a/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownAsymmetricKeySize/WeakAsymmetricKeyGenSize.expected b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownAsymmetricKeySize/WeakAsymmetricKeyGenSize.expected
new file mode 100644
index 00000000000..26dc1bfad24
--- /dev/null
+++ b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownAsymmetricKeySize/WeakAsymmetricKeyGenSize.expected
@@ -0,0 +1,13 @@
+edges
+nodes
+| InsufficientAsymmetricKeySize.java:5:32:5:35 | 1024 | semmle.label | 1024 |
+| InsufficientAsymmetricKeySize.java:9:32:9:35 | 1024 | semmle.label | 1024 |
+| InsufficientAsymmetricKeySize.java:13:32:13:35 | 1024 | semmle.label | 1024 |
+| InsufficientAsymmetricKeySize.java:17:32:17:35 | 2048 | semmle.label | 2048 |
+| InsufficientAsymmetricKeySize.java:21:32:21:35 | 2048 | semmle.label | 2048 |
+| InsufficientAsymmetricKeySize.java:25:32:25:35 | 2048 | semmle.label | 2048 |
+subpaths
+#select
+| InsufficientAsymmetricKeySize.java:5:32:5:35 | 1024 | InsufficientAsymmetricKeySize.java:5:32:5:35 | 1024 | InsufficientAsymmetricKeySize.java:5:32:5:35 | 1024 | Use of weak asymmetric key size (1024 bits) for algorithm $@ | InsufficientAsymmetricKeySize.java:4:69:4:73 | KeyOperationAlgorithm | RSA |
+| InsufficientAsymmetricKeySize.java:9:32:9:35 | 1024 | InsufficientAsymmetricKeySize.java:9:32:9:35 | 1024 | InsufficientAsymmetricKeySize.java:9:32:9:35 | 1024 | Use of weak asymmetric key size (1024 bits) for algorithm $@ | InsufficientAsymmetricKeySize.java:8:69:8:73 | KeyOperationAlgorithm | DSA |
+| InsufficientAsymmetricKeySize.java:13:32:13:35 | 1024 | InsufficientAsymmetricKeySize.java:13:32:13:35 | 1024 | InsufficientAsymmetricKeySize.java:13:32:13:35 | 1024 | Use of weak asymmetric key size (1024 bits) for algorithm $@ | InsufficientAsymmetricKeySize.java:12:69:12:72 | KeyAgreementAlgorithm | DH |
diff --git a/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownAsymmetricKeySize/WeakAsymmetricKeyGenSize.qlref b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownAsymmetricKeySize/WeakAsymmetricKeyGenSize.qlref
new file mode 100644
index 00000000000..085cf3e0b2a
--- /dev/null
+++ b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownAsymmetricKeySize/WeakAsymmetricKeyGenSize.qlref
@@ -0,0 +1,4 @@
+query: experimental/quantum/Examples/WeakAsymmetricKeyGenSize.ql
+postprocess:
+  - utils/test/PrettyPrintModels.ql
+  - utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownBlockMode/Test.java b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownBlockMode/Test.java
new file mode 100644
index 00000000000..0c8b3b6691d
--- /dev/null
+++ b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownBlockMode/Test.java
@@ -0,0 +1,57 @@
+import javax.crypto.Cipher;
+import javax.crypto.KeyGenerator;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.IvParameterSpec;
+
+public class Test {
+    public static void main(String[] args) throws Exception {
+        SecretKey key = KeyGenerator.getInstance("AES").generateKey();
+        IvParameterSpec iv = new IvParameterSpec(new byte[16]);
+        byte[] data = "SensitiveData".getBytes();
+
+        // Insecure block mode: ECB
+        Cipher cipherECB = Cipher.getInstance("AES/ECB/PKCS5Padding"); // $Alert
+        cipherECB.init(Cipher.ENCRYPT_MODE, key);
+        byte[] ecbEncrypted = cipherECB.doFinal(data);
+        System.out.println("ECB encrypted: " + bytesToHex(ecbEncrypted));
+
+        // Insecure block mode: CFB
+        Cipher cipherCFB = Cipher.getInstance("AES/CFB/PKCS5Padding"); // $Alert
+        cipherCFB.init(Cipher.ENCRYPT_MODE, key, iv);
+        byte[] cfbEncrypted = cipherCFB.doFinal(data);
+        System.out.println("CFB encrypted: " + bytesToHex(cfbEncrypted));
+
+        // Insecure block mode: OFB
+        Cipher cipherOFB = Cipher.getInstance("AES/OFB/PKCS5Padding"); // $Alert
+        cipherOFB.init(Cipher.ENCRYPT_MODE, key, iv);
+        byte[] ofbEncrypted = cipherOFB.doFinal(data);
+        System.out.println("OFB encrypted: " + bytesToHex(ofbEncrypted));
+
+        // Insecure block mode: CTR
+        Cipher cipherCTR = Cipher.getInstance("AES/CTR/NoPadding"); // $Alert
+        cipherCTR.init(Cipher.ENCRYPT_MODE, key, iv);
+        byte[] ctrEncrypted = cipherCTR.doFinal(data);
+        System.out.println("CTR encrypted: " + bytesToHex(ctrEncrypted));
+
+        // Secure block mode: CBC with random IV
+        IvParameterSpec randomIv = new IvParameterSpec(KeyGenerator.getInstance("AES").generateKey().getEncoded());
+        Cipher cipherCBCRandomIV = Cipher.getInstance("AES/CBC/PKCS5Padding");
+        cipherCBCRandomIV.init(Cipher.ENCRYPT_MODE, key, randomIv);
+        byte[] cbcRandomIVEncrypted = cipherCBCRandomIV.doFinal(data);
+        System.out.println("CBC (random IV) encrypted: " + bytesToHex(cbcRandomIVEncrypted));
+
+        // Secure block mode: GCM (authenticated encryption)
+        IvParameterSpec gcmIv = new IvParameterSpec(new byte[12]);
+        Cipher cipherGCM = Cipher.getInstance("AES/GCM/NoPadding");
+        cipherGCM.init(Cipher.ENCRYPT_MODE, key, gcmIv);
+        byte[] gcmEncrypted = cipherGCM.doFinal(data);
+        System.out.println("GCM encrypted: " + bytesToHex(gcmEncrypted));
+    }
+
+    private static String bytesToHex(byte[] bytes) {
+        StringBuilder sb = new StringBuilder();
+        for (byte b : bytes)
+            sb.append(String.format("%02x", b));
+        return sb.toString();
+    }
+}
\ No newline at end of file
diff --git a/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownBlockMode/WeakBlockMode.expected b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownBlockMode/WeakBlockMode.expected
new file mode 100644
index 00000000000..859a138d3eb
--- /dev/null
+++ b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownBlockMode/WeakBlockMode.expected
@@ -0,0 +1,4 @@
+| Test.java:13:47:13:68 | KeyOperationAlgorithm | Weak AES block mode instance $@. | Test.java:13:47:13:68 | ModeOfOperation | ModeOfOperation |
+| Test.java:19:47:19:68 | KeyOperationAlgorithm | Weak AES block mode instance $@. | Test.java:19:47:19:68 | ModeOfOperation | ModeOfOperation |
+| Test.java:25:47:25:68 | KeyOperationAlgorithm | Weak AES block mode instance $@. | Test.java:25:47:25:68 | ModeOfOperation | ModeOfOperation |
+| Test.java:31:47:31:65 | KeyOperationAlgorithm | Weak AES block mode instance $@. | Test.java:31:47:31:65 | ModeOfOperation | ModeOfOperation |
diff --git a/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownBlockMode/WeakBlockMode.qlref b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownBlockMode/WeakBlockMode.qlref
new file mode 100644
index 00000000000..ec8500ddda7
--- /dev/null
+++ b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownBlockMode/WeakBlockMode.qlref
@@ -0,0 +1,4 @@
+query: experimental/quantum/Examples/WeakBlockModes.ql
+postprocess:
+  - utils/test/PrettyPrintModels.ql
+  - utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownHash/WeakHash.expected b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownHash/WeakHash.expected
new file mode 100644
index 00000000000..77eadf06cd3
--- /dev/null
+++ b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownHash/WeakHash.expected
@@ -0,0 +1,4 @@
+| WeakHashing.java:15:55:15:83 | HashAlgorithm | Use of unapproved hash algorithm or API: MD5. |
+| WeakHashing.java:18:56:18:95 | HashAlgorithm | Use of unapproved hash algorithm or API: MD5. |
+| WeakHashing.java:21:86:21:90 | HashAlgorithm | Use of unapproved hash algorithm or API: MD5. |
+| WeakHashing.java:24:56:24:62 | HashAlgorithm | Use of unapproved hash algorithm or API: SHA1. |
diff --git a/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownHash/WeakHash.qlref b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownHash/WeakHash.qlref
new file mode 100644
index 00000000000..c5faee88aba
--- /dev/null
+++ b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownHash/WeakHash.qlref
@@ -0,0 +1,4 @@
+query: experimental/quantum/Examples/WeakHash.ql
+postprocess:
+  - utils/test/PrettyPrintModels.ql
+  - utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownHash/WeakHashing.java b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownHash/WeakHashing.java
new file mode 100644
index 00000000000..cc3b9a859d1
--- /dev/null
+++ b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownHash/WeakHashing.java
@@ -0,0 +1,50 @@
+package test.cwe327.semmle.tests;
+
+import java.util.Properties;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+public class WeakHashing {
+    void hashing() throws NoSuchAlgorithmException, IOException {
+        java.util.Properties props = new java.util.Properties();
+        props.load(new FileInputStream("example.properties"));
+
+        // BAD: Using a weak hashing algorithm even with a secure default
+        MessageDigest bad = MessageDigest.getInstance(props.getProperty("hashAlg1")); // $Alert[java/quantum/examples/weak-hash]
+
+        // BAD: Using a weak hashing algorithm even with a secure default
+        MessageDigest bad2 = MessageDigest.getInstance(props.getProperty("hashAlg1", "SHA-256")); // $Alert[java/quantum/examples/weak-hash]
+
+        // BAD: Using a strong hashing algorithm but with a weak default
+        MessageDigest bad3 = MessageDigest.getInstance(props.getProperty("hashAlg2", "MD5")); // $Alert[java/quantum/examples/weak-hash]
+
+        // BAD: Using a weak hash
+        MessageDigest bad4 = MessageDigest.getInstance("SHA-1"); // $Alert[java/quantum/examples/weak-hash]
+
+        // BAD: Property does not exist and default (used value) is unknown
+        MessageDigest bad5 = MessageDigest.getInstance(props.getProperty("non-existent_property", "non-existent_default")); // $Alert[java/quantum/examples/unknown-hash]
+
+        java.util.Properties props2 = new java.util.Properties();
+
+        props2.load(new FileInputStream("unobserved-file.properties"));
+
+        // BAD: "hashAlg2" is not visible in the file loaded for props2, should be an unknown 
+        // FALSE NEGATIVE for unknown hash
+        MessageDigest bad6 = MessageDigest.getInstance(props2.getProperty("hashAlg2", "SHA-256")); // $Alert[java/quantum/examples/unknown-hash]
+
+        // GOOD: Using a strong hashing algorithm
+        MessageDigest ok = MessageDigest.getInstance(props.getProperty("hashAlg2"));
+
+        // BAD?: Property does not exist (considered unknown) and but default is secure
+        MessageDigest ok2 = MessageDigest.getInstance(props.getProperty("non-existent-property", "SHA-256")); // $Alert[java/quantum/examples/unknown-hash]
+
+        // GOOD: Using a strong hashing algorithm
+        MessageDigest ok3 = MessageDigest.getInstance("SHA3-512");
+
+         // GOOD: Using a strong hashing algorithm
+        MessageDigest ok4 = MessageDigest.getInstance("SHA384");
+
+    }
+}
diff --git a/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownHash/example.properties b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownHash/example.properties
new file mode 100644
index 00000000000..512e8090bee
--- /dev/null
+++ b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownHash/example.properties
@@ -0,0 +1,2 @@
+hashAlg1=MD5
+hashAlg2=SHA-256
\ No newline at end of file
diff --git a/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownKDFIterationCount/Test.java b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownKDFIterationCount/Test.java
new file mode 100644
index 00000000000..13f6d03ec72
--- /dev/null
+++ b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownKDFIterationCount/Test.java
@@ -0,0 +1,63 @@
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.security.MessageDigest;
+import java.security.SecureRandom;
+import java.util.Arrays;
+import java.util.Base64;
+import java.util.Properties;
+import javax.crypto.Mac;
+import javax.crypto.SecretKey;
+import javax.crypto.SecretKeyFactory;
+import javax.crypto.spec.PBEKeySpec;
+import javax.crypto.spec.SecretKeySpec;
+
+public class Test {
+
+    public static byte[] generateSalt(int length) {
+        SecureRandom random = new SecureRandom();
+        byte[] salt = new byte[length];
+        random.nextBytes(salt);
+        return salt;
+    }
+
+    /**
+     * PBKDF2 derivation with a very low iteration count.
+     *
+     * SAST/CBOM: - Parent: PBKDF2. - Iteration count is only 10, which is far
+     * below acceptable security standards. - Flagged as insecure.
+     */
+    public void pbkdf2LowIteration(String password) throws Exception {
+        byte[] salt = generateSalt(16);
+        int iterationCount = 10; // $Source
+        PBEKeySpec spec = new PBEKeySpec(password.toCharArray(), salt, iterationCount, 256); // $Alert[java/quantum/examples/weak-kdf-iteration-count]
+        SecretKeyFactory factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256");
+        byte[] key = factory.generateSecret(spec).getEncoded();
+    }
+
+    /**
+     * PBKDF2 derivation with a very low iteration count.
+     *
+     * SAST/CBOM: - Parent: PBKDF2. - Iteration count is only 10, which is far
+     * below acceptable security standards. - Flagged as insecure.
+     */
+    public void pbkdf2LowIteration(String password, int iterationCount) throws Exception { // $Source
+        byte[] salt = generateSalt(16);
+        PBEKeySpec spec = new PBEKeySpec(password.toCharArray(), salt, iterationCount, 256); // $Alert[java/quantum/examples/unknown-kdf-iteration-count]
+        SecretKeyFactory factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256");
+        byte[] key = factory.generateSecret(spec).getEncoded();
+    }
+
+    /**
+     * PBKDF2 derivation with a high iteration count.
+     *
+     * SAST/CBOM: - Parent: PBKDF2. - Uses 1,000,000 iterations; this is secure
+     * but may impact performance.
+     */
+    public void pbkdf2HighIteration(String password) throws Exception {
+        byte[] salt = generateSalt(16);
+        int iterationCount = 1_000_000; 
+        PBEKeySpec spec = new PBEKeySpec(password.toCharArray(), salt, iterationCount, 256); 
+        SecretKeyFactory factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256");
+        byte[] key = factory.generateSecret(spec).getEncoded();
+    }
+}
\ No newline at end of file
diff --git a/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownKDFIterationCount/UnknownKDFIterationCount.expected b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownKDFIterationCount/UnknownKDFIterationCount.expected
new file mode 100644
index 00000000000..472d7909049
--- /dev/null
+++ b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownKDFIterationCount/UnknownKDFIterationCount.expected
@@ -0,0 +1,5 @@
+#select
+| Test.java:47:22:47:49 | KeyDerivation | Key derivation operation with unknown iteration: $@ | Test.java:43:53:43:70 | iterationCount | iterationCount |
+testFailures
+| Test.java:45:94:45:153 | // $Alert[java/quantum/examples/unknown-kdf-iteration-count] | Missing result: Alert[java/quantum/examples/unknown-kdf-iteration-count] |
+| Test.java:47:22:47:49 | Key derivation operation with unknown iteration: $@ | Unexpected result: Alert |
diff --git a/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownKDFIterationCount/UnknownKDFIterationCount.qlref b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownKDFIterationCount/UnknownKDFIterationCount.qlref
new file mode 100644
index 00000000000..a285aac54ad
--- /dev/null
+++ b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownKDFIterationCount/UnknownKDFIterationCount.qlref
@@ -0,0 +1,4 @@
+query: experimental/quantum/Examples/UnknownKDFIterationCount.ql
+postprocess:
+  - utils/test/PrettyPrintModels.ql
+  - utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownKDFIterationCount/WeakKDFIterationCount.expected b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownKDFIterationCount/WeakKDFIterationCount.expected
new file mode 100644
index 00000000000..3567afd0322
--- /dev/null
+++ b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownKDFIterationCount/WeakKDFIterationCount.expected
@@ -0,0 +1,16 @@
+#select
+| Test.java:32:72:32:85 | iterationCount | Test.java:31:30:31:31 | 10 : Number | Test.java:32:72:32:85 | iterationCount | Key derivation operation configures iteration count below 100k: $@ | Test.java:31:30:31:31 | 10 | 10 |
+edges
+| Test.java:31:30:31:31 | 10 : Number | Test.java:32:72:32:85 | iterationCount | provenance |  |
+| Test.java:43:53:43:70 | iterationCount : Number | Test.java:45:72:45:85 | iterationCount | provenance |  |
+| Test.java:58:30:58:38 | 1_000_000 : Number | Test.java:59:72:59:85 | iterationCount | provenance |  |
+nodes
+| Test.java:31:30:31:31 | 10 : Number | semmle.label | 10 : Number |
+| Test.java:32:72:32:85 | iterationCount | semmle.label | iterationCount |
+| Test.java:43:53:43:70 | iterationCount : Number | semmle.label | iterationCount : Number |
+| Test.java:45:72:45:85 | iterationCount | semmle.label | iterationCount |
+| Test.java:58:30:58:38 | 1_000_000 : Number | semmle.label | 1_000_000 : Number |
+| Test.java:59:72:59:85 | iterationCount | semmle.label | iterationCount |
+subpaths
+testFailures
+| Test.java:43:92:43:101 | // $Source | Missing result: Source |
diff --git a/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownKDFIterationCount/WeakKDFIterationCount.qlref b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownKDFIterationCount/WeakKDFIterationCount.qlref
new file mode 100644
index 00000000000..1145083bf0d
--- /dev/null
+++ b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownKDFIterationCount/WeakKDFIterationCount.qlref
@@ -0,0 +1,4 @@
+query: experimental/quantum/Examples/WeakKDFIterationCount.ql
+postprocess:
+  - utils/test/PrettyPrintModels.ql
+  - utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownKDFKeySize/Test.java b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownKDFKeySize/Test.java
new file mode 100644
index 00000000000..21619c8c574
--- /dev/null
+++ b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownKDFKeySize/Test.java
@@ -0,0 +1,42 @@
+import java.security.SecureRandom;
+import javax.crypto.SecretKeyFactory;
+import javax.crypto.spec.PBEKeySpec;
+
+public class Test {
+
+    public static byte[] generateSalt(int length) {
+        SecureRandom random = new SecureRandom();
+        byte[] salt = new byte[length];
+        random.nextBytes(salt);
+        return salt;
+    }
+
+    /**
+     * PBKDF2 derivation with a weak key size.
+     *
+     * SAST/CBOM: - Parent: PBKDF2. - Key size is only 64 bits, which is far below acceptable security standards.
+     * - Flagged as insecure.
+     */
+    public void pbkdf2WeakKeySize(String password) throws Exception {
+        byte[] salt = generateSalt(16);
+        int iterationCount = 100_000;
+        int keySize = 64; // $Source
+        PBEKeySpec spec = new PBEKeySpec(password.toCharArray(), salt, iterationCount, keySize); // $Alert[java/quantum/examples/weak-kdf-key-size]
+        SecretKeyFactory factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256");
+        byte[] key = factory.generateSecret(spec).getEncoded();
+    }
+
+    /**
+     * PBKDF2 derivation with a secure key size.
+     *
+     * SAST/CBOM: - Parent: PBKDF2. - Key size is 256 bits, which meets modern security standards.
+     */
+    public void pbkdf2SecureKeySize(String password) throws Exception {
+        byte[] salt = generateSalt(16);
+        int iterationCount = 100_000;
+        int keySize = 256;
+        PBEKeySpec spec = new PBEKeySpec(password.toCharArray(), salt, iterationCount, keySize);
+        SecretKeyFactory factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256");
+        byte[] key = factory.generateSecret(spec).getEncoded();
+    }
+}
\ No newline at end of file
diff --git a/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownKDFKeySize/WeakKDFKeySize.expected b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownKDFKeySize/WeakKDFKeySize.expected
new file mode 100644
index 00000000000..63df79a9f9b
--- /dev/null
+++ b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownKDFKeySize/WeakKDFKeySize.expected
@@ -0,0 +1,11 @@
+#select
+| Test.java:24:88:24:94 | keySize | Test.java:23:23:23:24 | 64 : Number | Test.java:24:88:24:94 | keySize | Key derivation operation configures output key length below 256: $@ | Test.java:23:23:23:24 | 64 | 64 |
+edges
+| Test.java:23:23:23:24 | 64 : Number | Test.java:24:88:24:94 | keySize | provenance |  |
+| Test.java:37:23:37:25 | 256 : Number | Test.java:38:88:38:94 | keySize | provenance |  |
+nodes
+| Test.java:23:23:23:24 | 64 : Number | semmle.label | 64 : Number |
+| Test.java:24:88:24:94 | keySize | semmle.label | keySize |
+| Test.java:37:23:37:25 | 256 : Number | semmle.label | 256 : Number |
+| Test.java:38:88:38:94 | keySize | semmle.label | keySize |
+subpaths
diff --git a/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownKDFKeySize/WeakKDFKeySize.qlref b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownKDFKeySize/WeakKDFKeySize.qlref
new file mode 100644
index 00000000000..2b2b1228de2
--- /dev/null
+++ b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownKDFKeySize/WeakKDFKeySize.qlref
@@ -0,0 +1,4 @@
+query: experimental/quantum/Examples/WeakKDFKeySize.ql
+postprocess:
+  - utils/test/PrettyPrintModels.ql
+  - utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownSymmetricCipher/Test.java b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownSymmetricCipher/Test.java
new file mode 100644
index 00000000000..fde9f9a24d1
--- /dev/null
+++ b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownSymmetricCipher/Test.java
@@ -0,0 +1,81 @@
+import javax.crypto.Cipher;
+import javax.crypto.KeyGenerator;
+import javax.crypto.SecretKey;
+import java.security.Key;
+import java.security.NoSuchAlgorithmException;
+import javax.crypto.SecretKeyFactory;
+
+public class Test {
+    public static void main(String[] args) throws Exception {
+        byte[] data = "Sensitive Data".getBytes();
+
+        // BAD: DES (unsafe)
+        KeyGenerator desKeyGen = KeyGenerator.getInstance("DES"); // $Alert
+        SecretKey desKey = desKeyGen.generateKey();
+        Cipher desCipher = Cipher.getInstance("DES"); // $Alert
+        desCipher.init(Cipher.ENCRYPT_MODE, desKey);
+        byte[] desEncrypted = desCipher.doFinal(data);
+
+        // BAD: DESede (Triple DES, considered weak)
+        KeyGenerator desedeKeyGen = KeyGenerator.getInstance("DESede"); // $Alert
+        SecretKey desedeKey = desedeKeyGen.generateKey();
+        Cipher desedeCipher = Cipher.getInstance("DESede"); // $Alert
+        desedeCipher.init(Cipher.ENCRYPT_MODE, desedeKey);
+        byte[] desedeEncrypted = desedeCipher.doFinal(data);
+
+        // BAD: Blowfish (considered weak)
+        KeyGenerator blowfishKeyGen = KeyGenerator.getInstance("Blowfish"); // $Alert
+        SecretKey blowfishKey = blowfishKeyGen.generateKey();
+        Cipher blowfishCipher = Cipher.getInstance("Blowfish"); // $Alert
+        blowfishCipher.init(Cipher.ENCRYPT_MODE, blowfishKey);
+        byte[] blowfishEncrypted = blowfishCipher.doFinal(data);
+
+        // BAD: RC2 (unsafe)
+        KeyGenerator rc2KeyGen = KeyGenerator.getInstance("RC2"); // $Alert
+        SecretKey rc2Key = rc2KeyGen.generateKey();
+        Cipher rc2Cipher = Cipher.getInstance("RC2"); // $Alert
+        rc2Cipher.init(Cipher.ENCRYPT_MODE, rc2Key);
+        byte[] rc2Encrypted = rc2Cipher.doFinal(data);
+
+        // BAD: RC4 (stream cipher, unsafe)
+        KeyGenerator rc4KeyGen = KeyGenerator.getInstance("RC4"); // $Alert
+        SecretKey rc4Key = rc4KeyGen.generateKey();
+        Cipher rc4Cipher = Cipher.getInstance("RC4"); // $Alert
+        rc4Cipher.init(Cipher.ENCRYPT_MODE, rc4Key);
+        byte[] rc4Encrypted = rc4Cipher.doFinal(data);
+
+        // BAD: IDEA (considered weak)
+        KeyGenerator ideaKeyGen = KeyGenerator.getInstance("IDEA"); // $Alert
+        SecretKey ideaKey = ideaKeyGen.generateKey();
+        Cipher ideaCipher = Cipher.getInstance("IDEA"); // $Alert
+        ideaCipher.init(Cipher.ENCRYPT_MODE, ideaKey);
+        byte[] ideaEncrypted = ideaCipher.doFinal(data);
+
+        // BAD: Skipjack (unsafe)
+        KeyGenerator skipjackKeyGen = KeyGenerator.getInstance("Skipjack"); // $Alert
+        SecretKey skipjackKey = skipjackKeyGen.generateKey();
+        Cipher skipjackCipher = Cipher.getInstance("Skipjack"); // $Alert
+        skipjackCipher.init(Cipher.ENCRYPT_MODE, skipjackKey);
+        byte[] skipjackEncrypted = skipjackCipher.doFinal(data);
+
+        // GOOD: AES (safe)
+        KeyGenerator aesKeyGen = KeyGenerator.getInstance("AES");
+        SecretKey aesKey = aesKeyGen.generateKey();
+        Cipher aesCipher = Cipher.getInstance("AES");
+        aesCipher.init(Cipher.ENCRYPT_MODE, aesKey);
+        byte[] aesEncrypted = aesCipher.doFinal(data);
+
+        // GOOD: AES with CBC mode and PKCS5Padding
+        Cipher aesCbcCipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
+        aesCbcCipher.init(Cipher.ENCRYPT_MODE, aesKey);
+        byte[] aesCbcEncrypted = aesCbcCipher.doFinal(data);
+
+        // GOOD: AES with GCM mode (authenticated encryption)
+        Cipher aesGcmCipher = Cipher.getInstance("AES/GCM/NoPadding");
+        aesGcmCipher.init(Cipher.ENCRYPT_MODE, aesKey);
+        byte[] aesGcmEncrypted = aesGcmCipher.doFinal(data);
+
+        // GOOD: not a symmetric cipher (Sanity check)
+        SecretKeyFactory factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256");
+    }
+}
\ No newline at end of file
diff --git a/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownSymmetricCipher/WeakSymmetricCipher.expected b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownSymmetricCipher/WeakSymmetricCipher.expected
new file mode 100644
index 00000000000..3ba5071e026
--- /dev/null
+++ b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownSymmetricCipher/WeakSymmetricCipher.expected
@@ -0,0 +1,14 @@
+| Test.java:13:59:13:63 | KeyOperationAlgorithm | Use of unapproved symmetric cipher algorithm or API: DES. |
+| Test.java:15:47:15:51 | KeyOperationAlgorithm | Use of unapproved symmetric cipher algorithm or API: DES. |
+| Test.java:20:62:20:69 | KeyOperationAlgorithm | Use of unapproved symmetric cipher algorithm or API: DES. |
+| Test.java:22:50:22:57 | KeyOperationAlgorithm | Use of unapproved symmetric cipher algorithm or API: DES. |
+| Test.java:27:64:27:73 | KeyOperationAlgorithm | Use of unapproved symmetric cipher algorithm or API: Blowfish. |
+| Test.java:29:52:29:61 | KeyOperationAlgorithm | Use of unapproved symmetric cipher algorithm or API: Blowfish. |
+| Test.java:34:59:34:63 | KeyOperationAlgorithm | Use of unapproved symmetric cipher algorithm or API: RC2. |
+| Test.java:36:47:36:51 | KeyOperationAlgorithm | Use of unapproved symmetric cipher algorithm or API: RC2. |
+| Test.java:41:59:41:63 | KeyOperationAlgorithm | Use of unapproved symmetric cipher algorithm or API: RC4. |
+| Test.java:43:47:43:51 | KeyOperationAlgorithm | Use of unapproved symmetric cipher algorithm or API: RC4. |
+| Test.java:48:60:48:65 | KeyOperationAlgorithm | Use of unapproved symmetric cipher algorithm or API: IDEA. |
+| Test.java:50:48:50:53 | KeyOperationAlgorithm | Use of unapproved symmetric cipher algorithm or API: IDEA. |
+| Test.java:55:64:55:73 | KeyOperationAlgorithm | Use of unapproved symmetric cipher algorithm or API: Skipjack. |
+| Test.java:57:52:57:61 | KeyOperationAlgorithm | Use of unapproved symmetric cipher algorithm or API: Skipjack. |
diff --git a/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownSymmetricCipher/WeakSymmetricCipher.qlref b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownSymmetricCipher/WeakSymmetricCipher.qlref
new file mode 100644
index 00000000000..d27fed11bfc
--- /dev/null
+++ b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownSymmetricCipher/WeakSymmetricCipher.qlref
@@ -0,0 +1,4 @@
+query: experimental/quantum/Examples/WeakSymmetricCipher.ql
+postprocess:
+  - utils/test/PrettyPrintModels.ql
+  - utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/java/ql/test/experimental/query-tests/security/CWE-016/InsecureSpringActuatorConfig.expected b/java/ql/test/experimental/query-tests/security/CWE-016/InsecureSpringActuatorConfig.expected
deleted file mode 100644
index 48630293985..00000000000
--- a/java/ql/test/experimental/query-tests/security/CWE-016/InsecureSpringActuatorConfig.expected
+++ /dev/null
@@ -1 +0,0 @@
-| pom.xml:29:9:32:22 | dependency | Insecure configuration of Spring Boot Actuator exposes sensitive endpoints. |
diff --git a/java/ql/test/experimental/query-tests/security/CWE-016/InsecureSpringActuatorConfig.qlref b/java/ql/test/experimental/query-tests/security/CWE-016/InsecureSpringActuatorConfig.qlref
deleted file mode 100644
index 9cd12d5e4fb..00000000000
--- a/java/ql/test/experimental/query-tests/security/CWE-016/InsecureSpringActuatorConfig.qlref
+++ /dev/null
@@ -1 +0,0 @@
-experimental/Security/CWE/CWE-016/InsecureSpringActuatorConfig.ql
\ No newline at end of file
diff --git a/java/ql/test/experimental/query-tests/security/CWE-016/SensitiveInfo.java b/java/ql/test/experimental/query-tests/security/CWE-016/SensitiveInfo.java
deleted file mode 100644
index a3ff69c1b81..00000000000
--- a/java/ql/test/experimental/query-tests/security/CWE-016/SensitiveInfo.java
+++ /dev/null
@@ -1,13 +0,0 @@
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@Controller
-public class SensitiveInfo {
-	@RequestMapping
-	public void handleLogin(@RequestParam String username, @RequestParam String password) throws Exception {
-		if (!username.equals("") && password.equals("")) {
-			//Blank processing
-		}
-	}
-}
\ No newline at end of file
diff --git a/java/ql/test/experimental/query-tests/security/CWE-016/application.properties b/java/ql/test/experimental/query-tests/security/CWE-016/application.properties
deleted file mode 100644
index 797906a3ca3..00000000000
--- a/java/ql/test/experimental/query-tests/security/CWE-016/application.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-#management.endpoints.web.base-path=/admin
-
-# vulnerable configuration (spring boot 1.0 - 1.4): exposes actuators by default
-
-# vulnerable configuration (spring boot 1.5+): requires value false to expose sensitive actuators
-management.security.enabled=false
-
-# vulnerable configuration (spring boot 2+): exposes health and info only by default, here overridden to expose everything
-management.endpoints.web.exposure.include=*
-management.endpoints.web.exposure.exclude=beans
-
-management.endpoint.shutdown.enabled=true
-
-management.endpoint.health.show-details=when_authorized
\ No newline at end of file
diff --git a/java/ql/test/experimental/query-tests/security/CWE-1004/SensitiveCookieNotHttpOnly.qlref b/java/ql/test/experimental/query-tests/security/CWE-1004/SensitiveCookieNotHttpOnly.qlref
deleted file mode 100644
index 9c7ce3d6329..00000000000
--- a/java/ql/test/experimental/query-tests/security/CWE-1004/SensitiveCookieNotHttpOnly.qlref
+++ /dev/null
@@ -1,2 +0,0 @@
-query: experimental/Security/CWE/CWE-1004/SensitiveCookieNotHttpOnly.ql
-postprocess: utils/test/PrettyPrintModels.ql
diff --git a/java/ql/test/experimental/query-tests/security/CWE-1004/options b/java/ql/test/experimental/query-tests/security/CWE-1004/options
deleted file mode 100644
index 00e92689af5..00000000000
--- a/java/ql/test/experimental/query-tests/security/CWE-1004/options
+++ /dev/null
@@ -1 +0,0 @@
-// semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/servlet-api-2.4:${testdir}/../../../../stubs/jsr311-api-1.1.1:${testdir}/../../../../stubs/springframework-5.8.x
diff --git a/java/ql/test/library-tests/compact-source-files/CompactSourceAnalysis.expected b/java/ql/test/library-tests/compact-source-files/CompactSourceAnalysis.expected
new file mode 100644
index 00000000000..05db00aa26d
--- /dev/null
+++ b/java/ql/test/library-tests/compact-source-files/CompactSourceAnalysis.expected
@@ -0,0 +1 @@
+| Test.java:0:0:0:0 | Test | Test.java:1:1:1:1 | Test | Compact source file 'Test' contains implicit class 'Test' |
diff --git a/java/ql/test/library-tests/compact-source-files/CompactSourceAnalysis.ql b/java/ql/test/library-tests/compact-source-files/CompactSourceAnalysis.ql
new file mode 100644
index 00000000000..ae6700f64cd
--- /dev/null
+++ b/java/ql/test/library-tests/compact-source-files/CompactSourceAnalysis.ql
@@ -0,0 +1,9 @@
+import java
+
+from CompilationUnit cu, Class c
+where
+  cu.isCompactSourceFile() and
+  c.getCompilationUnit() = cu and
+  c.isImplicit()
+select cu, c,
+  "Compact source file '" + cu.getName() + "' contains implicit class '" + c.getName() + "'"
diff --git a/java/ql/test/library-tests/compact-source-files/CompactSourceDetection.expected b/java/ql/test/library-tests/compact-source-files/CompactSourceDetection.expected
new file mode 100644
index 00000000000..0aebdddfb87
--- /dev/null
+++ b/java/ql/test/library-tests/compact-source-files/CompactSourceDetection.expected
@@ -0,0 +1 @@
+| Test.java:0:0:0:0 | Test |
diff --git a/java/ql/test/library-tests/compact-source-files/CompactSourceDetection.ql b/java/ql/test/library-tests/compact-source-files/CompactSourceDetection.ql
new file mode 100644
index 00000000000..3cf2633c897
--- /dev/null
+++ b/java/ql/test/library-tests/compact-source-files/CompactSourceDetection.ql
@@ -0,0 +1,5 @@
+import java
+
+from CompilationUnit cu
+where cu.isCompactSourceFile()
+select cu
diff --git a/java/ql/test/library-tests/compact-source-files/ImplicitClassDetection.expected b/java/ql/test/library-tests/compact-source-files/ImplicitClassDetection.expected
new file mode 100644
index 00000000000..61dcdd8a17f
--- /dev/null
+++ b/java/ql/test/library-tests/compact-source-files/ImplicitClassDetection.expected
@@ -0,0 +1,2 @@
+| Test.java:1:1:1:1 | Test | implicit |
+| Test.java:25:7:25:16 | NotCompact | not implicit |
diff --git a/java/ql/test/library-tests/compact-source-files/ImplicitClassDetection.ql b/java/ql/test/library-tests/compact-source-files/ImplicitClassDetection.ql
new file mode 100644
index 00000000000..f1c6b4a27c7
--- /dev/null
+++ b/java/ql/test/library-tests/compact-source-files/ImplicitClassDetection.ql
@@ -0,0 +1,7 @@
+import java
+
+from Class c, string res
+where
+  exists(c.getCompilationUnit().getRelativePath()) and
+  if c.isImplicit() then res = "implicit" else res = "not implicit"
+select c, res
diff --git a/java/ql/test/library-tests/compact-source-files/MethodInCompactSource.expected b/java/ql/test/library-tests/compact-source-files/MethodInCompactSource.expected
new file mode 100644
index 00000000000..3c7b45f500e
--- /dev/null
+++ b/java/ql/test/library-tests/compact-source-files/MethodInCompactSource.expected
@@ -0,0 +1,7 @@
+| Test.java:1:1:1:1 | <clinit> | in compact source |
+| Test.java:1:1:1:1 | <obinit> | in compact source |
+| Test.java:5:6:5:9 | main | in compact source |
+| Test.java:11:6:11:16 | processData | in compact source |
+| Test.java:16:14:16:31 | updatePrivateField | in compact source |
+| Test.java:21:13:21:28 | testStaticAccess | in compact source |
+| Test.java:27:10:27:25 | methodNotCompact | NOT in compact source |
diff --git a/java/ql/test/library-tests/compact-source-files/MethodInCompactSource.ql b/java/ql/test/library-tests/compact-source-files/MethodInCompactSource.ql
new file mode 100644
index 00000000000..c5e5bbc80e0
--- /dev/null
+++ b/java/ql/test/library-tests/compact-source-files/MethodInCompactSource.ql
@@ -0,0 +1,8 @@
+import java
+
+from Method m, Class c, string res
+where
+  c = m.getDeclaringType() and
+  exists(c.getCompilationUnit().getRelativePath()) and
+  if c.isImplicit() then res = "in compact source" else res = "NOT in compact source"
+select m, res
diff --git a/java/ql/test/library-tests/compact-source-files/PrintAst.expected b/java/ql/test/library-tests/compact-source-files/PrintAst.expected
new file mode 100644
index 00000000000..7f39470ff0c
--- /dev/null
+++ b/java/ql/test/library-tests/compact-source-files/PrintAst.expected
@@ -0,0 +1,45 @@
+Test.java:
+#    0| [CompilationUnit] Test
+#    1|   1: [Class] Test
+#    1|     4: [FieldDeclaration] int instanceField;
+#    1|       -1: [TypeAccess] int
+#    1|       0: [IntegerLiteral] 10
+#    2|     5: [FieldDeclaration] int STATIC_CONSTANT;
+#    2|       -1: [TypeAccess] int
+#    2|       0: [IntegerLiteral] 42
+#    3|     6: [FieldDeclaration] String privateField;
+#    3|       -1: [TypeAccess] String
+#    3|       0: [StringLiteral] "data"
+#    5|     7: [Method] main
+#    5|       3: [TypeAccess] void
+#    5|       5: [BlockStmt] { ... }
+#    6|         0: [ExprStmt] <Expr>;
+#    6|           0: [MethodCall] processData(...)
+#    7|         1: [ExprStmt] <Expr>;
+#    7|           0: [MethodCall] testStaticAccess(...)
+#   11|     8: [Method] processData
+#   11|       3: [TypeAccess] void
+#   11|       5: [BlockStmt] { ... }
+#   12|         0: [ExprStmt] <Expr>;
+#   12|           0: [PostIncExpr] ...++
+#   12|             0: [VarAccess] instanceField
+#   13|         1: [ExprStmt] <Expr>;
+#   13|           0: [MethodCall] updatePrivateField(...)
+#   16|     9: [Method] updatePrivateField
+#   16|       3: [TypeAccess] void
+#   16|       5: [BlockStmt] { ... }
+#   17|         0: [ExprStmt] <Expr>;
+#   17|           0: [AssignExpr] ...=...
+#   17|             0: [VarAccess] privateField
+#   17|             1: [StringLiteral] "updated"
+#   21|     10: [Method] testStaticAccess
+#   21|       3: [TypeAccess] void
+#   21|       5: [BlockStmt] { ... }
+#   22|         0: [ExprStmt] <Expr>;
+#   22|           0: [MethodCall] println(...)
+#   22|             -1: [TypeAccess] IO
+#   22|             0: [StringLiteral] "Static access test"
+#   25|     11: [Class] NotCompact
+#   27|       2: [Method] methodNotCompact
+#   27|         3: [TypeAccess] void
+#   27|         5: [BlockStmt] { ... }
diff --git a/java/ql/test/library-tests/compact-source-files/PrintAst.qlref b/java/ql/test/library-tests/compact-source-files/PrintAst.qlref
new file mode 100644
index 00000000000..f391eb5e463
--- /dev/null
+++ b/java/ql/test/library-tests/compact-source-files/PrintAst.qlref
@@ -0,0 +1 @@
+semmle/code/java/PrintAst.ql
diff --git a/java/ql/test/library-tests/compact-source-files/Test.java b/java/ql/test/library-tests/compact-source-files/Test.java
new file mode 100644
index 00000000000..6159073c216
--- /dev/null
+++ b/java/ql/test/library-tests/compact-source-files/Test.java
@@ -0,0 +1,29 @@
+int instanceField = 10;
+static final int STATIC_CONSTANT = 42;
+private String privateField = "data";
+
+void main() {
+    processData();
+    testStaticAccess();
+}
+
+// Test instance methods
+void processData() {
+    instanceField++;
+    updatePrivateField();
+}
+
+private void updatePrivateField() {
+    privateField = "updated";
+}
+
+// Test static method access
+static void testStaticAccess() {
+    IO.println("Static access test");
+}
+
+class NotCompact {
+//Test explict class
+    void methodNotCompact() {
+    }
+}
\ No newline at end of file
diff --git a/java/ql/test/library-tests/compact-source-files/options b/java/ql/test/library-tests/compact-source-files/options
new file mode 100644
index 00000000000..db1dc01e53b
--- /dev/null
+++ b/java/ql/test/library-tests/compact-source-files/options
@@ -0,0 +1 @@
+//semmle-extractor-options: --javac-args --release 25 --enable-preview
diff --git a/java/ql/test/library-tests/dataflow/entrypoint-types/EntryPointTypesTest.java b/java/ql/test/library-tests/dataflow/entrypoint-types/EntryPointTypesTest.java
index 983cb72ffb2..52d26974373 100644
--- a/java/ql/test/library-tests/dataflow/entrypoint-types/EntryPointTypesTest.java
+++ b/java/ql/test/library-tests/dataflow/entrypoint-types/EntryPointTypesTest.java
@@ -41,6 +41,10 @@ public class EntryPointTypesTest {
         public String safeField;
     }
 
+    static class ArrayElemObject {
+        public String field;
+    }
+
     private static void sink(String sink) {}
 
     public static void test(TestObject source) {
@@ -70,4 +74,8 @@ public class EntryPointTypesTest {
         UnrelatedObject unrelated = (UnrelatedObject) subtypeSource.getField8();
         sink(unrelated.safeField); // Safe
     }
+
+    public static void testArray(ArrayElemObject[] source) {
+        sink(source[0].field); // $hasTaintFlow
+    }
 }
diff --git a/java/ql/test/library-tests/dataflow/kdf/KDFDataflowTest.java b/java/ql/test/library-tests/dataflow/kdf/KDFDataflowTest.java
new file mode 100644
index 00000000000..460cb2b309f
--- /dev/null
+++ b/java/ql/test/library-tests/dataflow/kdf/KDFDataflowTest.java
@@ -0,0 +1,87 @@
+import javax.crypto.KDF;
+import javax.crypto.spec.HKDFParameterSpec;
+
+public class KDFDataflowTest {
+    public static String source(String label) {
+        return "tainted";
+    }
+
+    public static void sink(Object o) {}
+
+    public static void main(String[] args) throws Exception {
+        String userInput = source("");
+        byte[] taintedBytes = userInput.getBytes();
+
+        testBuilderPattern(taintedBytes);
+        testSeparateBuilder(taintedBytes);
+        testKDFWithSalt(taintedBytes);
+        testStaticParameterSpec(taintedBytes);
+        testCleanUsage();
+    }
+
+    public static void testBuilderPattern(byte[] taintedIKM) throws Exception {
+        HKDFParameterSpec.Builder builder = HKDFParameterSpec.ofExtract();
+        builder.addIKM(taintedIKM);
+        HKDFParameterSpec spec = builder.thenExpand("info".getBytes(), 32);
+
+        KDF kdf = KDF.getInstance("HKDF-SHA256");
+        byte[] result = kdf.deriveData(spec);
+        sink(result); // $ hasTaintFlow
+    }
+
+    public static void testSeparateBuilder(byte[] taintedIKM) throws Exception {
+        HKDFParameterSpec.Builder builder1 = HKDFParameterSpec.ofExtract();
+        HKDFParameterSpec.Builder builder2 = builder1.addIKM(taintedIKM);
+        HKDFParameterSpec spec = builder2.thenExpand("info".getBytes(), 32);
+
+        KDF kdf = KDF.getInstance("HKDF-SHA256");
+        byte[] result = kdf.deriveData(spec);
+        sink(result); // $ hasTaintFlow
+    }
+
+    public static void testKDFWithSalt(byte[] taintedIKM) throws Exception {
+        HKDFParameterSpec.Builder builder = HKDFParameterSpec.ofExtract();
+        builder.addIKM(taintedIKM);
+        builder.addSalt("sensitive-salt".getBytes());
+        HKDFParameterSpec spec = builder.thenExpand("info".getBytes(), 32);
+
+        KDF kdf = KDF.getInstance("HKDF-SHA256");
+        byte[] result = kdf.deriveData(spec);
+        sink(result); // $ hasTaintFlow
+    }
+
+    public static void testStaticParameterSpec(byte[] taintedIKM) throws Exception {
+        javax.crypto.spec.SecretKeySpec secretKey = new javax.crypto.spec.SecretKeySpec(taintedIKM, "AES");
+        HKDFParameterSpec spec = HKDFParameterSpec.expandOnly(
+            secretKey, "info".getBytes(), 32);
+
+        KDF kdf = KDF.getInstance("HKDF-SHA256");
+        byte[] result = kdf.deriveData(spec);
+        sink(result); // $ hasTaintFlow
+    }
+
+    public static void testCleanUsage() throws Exception {
+        byte[] cleanKeyMaterial = "static-key-material".getBytes();
+
+        HKDFParameterSpec.Builder builder = HKDFParameterSpec.ofExtract();
+        builder.addIKM(cleanKeyMaterial);
+        HKDFParameterSpec spec = builder.thenExpand("info".getBytes(), 32);
+
+        KDF kdf = KDF.getInstance("HKDF-SHA256");
+        byte[] cleanResult = kdf.deriveData(spec);
+        sink(cleanResult); // Safe - no taint
+    }
+
+    public static void testThenExpand(byte[] cleanIKM) throws Exception {
+        String userInput = source("");
+        byte[] taintedInfo = userInput.getBytes();
+
+        HKDFParameterSpec.Builder builder = HKDFParameterSpec.ofExtract();
+        builder.addIKM(cleanIKM);
+        HKDFParameterSpec spec = builder.thenExpand(taintedInfo, 32);
+
+        KDF kdf = KDF.getInstance("HKDF-SHA256");
+        byte[] result = kdf.deriveData(spec);
+        sink(result); // $ hasTaintFlow
+    }
+}
\ No newline at end of file
diff --git a/java/ql/test/library-tests/dataflow/kdf/options b/java/ql/test/library-tests/dataflow/kdf/options
new file mode 100644
index 00000000000..f4edc64c017
--- /dev/null
+++ b/java/ql/test/library-tests/dataflow/kdf/options
@@ -0,0 +1 @@
+//semmle-extractor-options: --javac-args --enable-preview --release 25
\ No newline at end of file
diff --git a/java/ql/test/library-tests/dataflow/kdf/test.expected b/java/ql/test/library-tests/dataflow/kdf/test.expected
new file mode 100644
index 00000000000..cab9b4bc054
--- /dev/null
+++ b/java/ql/test/library-tests/dataflow/kdf/test.expected
@@ -0,0 +1,105 @@
+models
+| 1 | Summary: java.lang; String; false; getBytes; ; ; Argument[this]; ReturnValue; taint; manual |
+| 2 | Summary: javax.crypto.spec; HKDFParameterSpec$Builder; true; addIKM; (byte[]); ; Argument[0]; Argument[this]; taint; manual |
+| 3 | Summary: javax.crypto.spec; HKDFParameterSpec$Builder; true; addIKM; (byte[]); ; Argument[this]; ReturnValue; value; manual |
+| 4 | Summary: javax.crypto.spec; HKDFParameterSpec$Builder; true; thenExpand; (byte[],int); ; Argument[0]; ReturnValue; taint; manual |
+| 5 | Summary: javax.crypto.spec; HKDFParameterSpec$Builder; true; thenExpand; (byte[],int); ; Argument[this]; ReturnValue; taint; manual |
+| 6 | Summary: javax.crypto.spec; HKDFParameterSpec; false; expandOnly; (SecretKey,byte[],int); ; Argument[0]; ReturnValue; taint; manual |
+| 7 | Summary: javax.crypto.spec; SecretKeySpec; false; SecretKeySpec; (byte[],String); ; Argument[0]; Argument[this]; taint; manual |
+| 8 | Summary: javax.crypto; KDF; true; deriveData; (AlgorithmParameterSpec); ; Argument[0]; ReturnValue; taint; manual |
+edges
+| KDFDataflowTest.java:12:28:12:37 | source(...) : String | KDFDataflowTest.java:13:31:13:39 | userInput : String | provenance |  |
+| KDFDataflowTest.java:13:31:13:39 | userInput : String | KDFDataflowTest.java:13:31:13:50 | getBytes(...) : byte[] | provenance | MaD:1 |
+| KDFDataflowTest.java:13:31:13:50 | getBytes(...) : byte[] | KDFDataflowTest.java:15:28:15:39 | taintedBytes : byte[] | provenance |  |
+| KDFDataflowTest.java:13:31:13:50 | getBytes(...) : byte[] | KDFDataflowTest.java:16:29:16:40 | taintedBytes : byte[] | provenance |  |
+| KDFDataflowTest.java:13:31:13:50 | getBytes(...) : byte[] | KDFDataflowTest.java:17:25:17:36 | taintedBytes : byte[] | provenance |  |
+| KDFDataflowTest.java:13:31:13:50 | getBytes(...) : byte[] | KDFDataflowTest.java:18:33:18:44 | taintedBytes : byte[] | provenance |  |
+| KDFDataflowTest.java:15:28:15:39 | taintedBytes : byte[] | KDFDataflowTest.java:22:43:22:59 | taintedIKM : byte[] | provenance |  |
+| KDFDataflowTest.java:16:29:16:40 | taintedBytes : byte[] | KDFDataflowTest.java:32:44:32:60 | taintedIKM : byte[] | provenance |  |
+| KDFDataflowTest.java:17:25:17:36 | taintedBytes : byte[] | KDFDataflowTest.java:42:40:42:56 | taintedIKM : byte[] | provenance |  |
+| KDFDataflowTest.java:18:33:18:44 | taintedBytes : byte[] | KDFDataflowTest.java:53:48:53:64 | taintedIKM : byte[] | provenance |  |
+| KDFDataflowTest.java:22:43:22:59 | taintedIKM : byte[] | KDFDataflowTest.java:24:24:24:33 | taintedIKM : byte[] | provenance |  |
+| KDFDataflowTest.java:24:9:24:15 | builder [post update] : Builder | KDFDataflowTest.java:25:34:25:40 | builder : Builder | provenance |  |
+| KDFDataflowTest.java:24:24:24:33 | taintedIKM : byte[] | KDFDataflowTest.java:24:9:24:15 | builder [post update] : Builder | provenance | MaD:2 |
+| KDFDataflowTest.java:25:34:25:40 | builder : Builder | KDFDataflowTest.java:25:34:25:74 | thenExpand(...) : ExtractThenExpand | provenance | MaD:5 |
+| KDFDataflowTest.java:25:34:25:74 | thenExpand(...) : ExtractThenExpand | KDFDataflowTest.java:28:40:28:43 | spec : ExtractThenExpand | provenance |  |
+| KDFDataflowTest.java:28:25:28:44 | deriveData(...) : byte[] | KDFDataflowTest.java:29:14:29:19 | result | provenance |  |
+| KDFDataflowTest.java:28:40:28:43 | spec : ExtractThenExpand | KDFDataflowTest.java:28:25:28:44 | deriveData(...) : byte[] | provenance | MaD:8 |
+| KDFDataflowTest.java:32:44:32:60 | taintedIKM : byte[] | KDFDataflowTest.java:34:62:34:71 | taintedIKM : byte[] | provenance |  |
+| KDFDataflowTest.java:34:46:34:72 | addIKM(...) : Builder | KDFDataflowTest.java:35:34:35:41 | builder2 : Builder | provenance |  |
+| KDFDataflowTest.java:34:62:34:71 | taintedIKM : byte[] | KDFDataflowTest.java:34:46:34:72 | addIKM(...) : Builder | provenance | MaD:2+MaD:3 |
+| KDFDataflowTest.java:35:34:35:41 | builder2 : Builder | KDFDataflowTest.java:35:34:35:75 | thenExpand(...) : ExtractThenExpand | provenance | MaD:5 |
+| KDFDataflowTest.java:35:34:35:75 | thenExpand(...) : ExtractThenExpand | KDFDataflowTest.java:38:40:38:43 | spec : ExtractThenExpand | provenance |  |
+| KDFDataflowTest.java:38:25:38:44 | deriveData(...) : byte[] | KDFDataflowTest.java:39:14:39:19 | result | provenance |  |
+| KDFDataflowTest.java:38:40:38:43 | spec : ExtractThenExpand | KDFDataflowTest.java:38:25:38:44 | deriveData(...) : byte[] | provenance | MaD:8 |
+| KDFDataflowTest.java:42:40:42:56 | taintedIKM : byte[] | KDFDataflowTest.java:44:24:44:33 | taintedIKM : byte[] | provenance |  |
+| KDFDataflowTest.java:44:9:44:15 | builder [post update] : Builder | KDFDataflowTest.java:46:34:46:40 | builder : Builder | provenance |  |
+| KDFDataflowTest.java:44:24:44:33 | taintedIKM : byte[] | KDFDataflowTest.java:44:9:44:15 | builder [post update] : Builder | provenance | MaD:2 |
+| KDFDataflowTest.java:46:34:46:40 | builder : Builder | KDFDataflowTest.java:46:34:46:74 | thenExpand(...) : ExtractThenExpand | provenance | MaD:5 |
+| KDFDataflowTest.java:46:34:46:74 | thenExpand(...) : ExtractThenExpand | KDFDataflowTest.java:49:40:49:43 | spec : ExtractThenExpand | provenance |  |
+| KDFDataflowTest.java:49:25:49:44 | deriveData(...) : byte[] | KDFDataflowTest.java:50:14:50:19 | result | provenance |  |
+| KDFDataflowTest.java:49:40:49:43 | spec : ExtractThenExpand | KDFDataflowTest.java:49:25:49:44 | deriveData(...) : byte[] | provenance | MaD:8 |
+| KDFDataflowTest.java:53:48:53:64 | taintedIKM : byte[] | KDFDataflowTest.java:54:89:54:98 | taintedIKM : byte[] | provenance |  |
+| KDFDataflowTest.java:54:53:54:106 | new SecretKeySpec(...) : SecretKeySpec | KDFDataflowTest.java:56:13:56:21 | secretKey : SecretKeySpec | provenance |  |
+| KDFDataflowTest.java:54:89:54:98 | taintedIKM : byte[] | KDFDataflowTest.java:54:53:54:106 | new SecretKeySpec(...) : SecretKeySpec | provenance | MaD:7 |
+| KDFDataflowTest.java:55:34:56:45 | expandOnly(...) : Expand | KDFDataflowTest.java:59:40:59:43 | spec : Expand | provenance |  |
+| KDFDataflowTest.java:56:13:56:21 | secretKey : SecretKeySpec | KDFDataflowTest.java:55:34:56:45 | expandOnly(...) : Expand | provenance | MaD:6 |
+| KDFDataflowTest.java:59:25:59:44 | deriveData(...) : byte[] | KDFDataflowTest.java:60:14:60:19 | result | provenance |  |
+| KDFDataflowTest.java:59:40:59:43 | spec : Expand | KDFDataflowTest.java:59:25:59:44 | deriveData(...) : byte[] | provenance | MaD:8 |
+| KDFDataflowTest.java:76:28:76:37 | source(...) : String | KDFDataflowTest.java:77:30:77:38 | userInput : String | provenance |  |
+| KDFDataflowTest.java:77:30:77:38 | userInput : String | KDFDataflowTest.java:77:30:77:49 | getBytes(...) : byte[] | provenance | MaD:1 |
+| KDFDataflowTest.java:77:30:77:49 | getBytes(...) : byte[] | KDFDataflowTest.java:81:53:81:63 | taintedInfo : byte[] | provenance |  |
+| KDFDataflowTest.java:81:34:81:68 | thenExpand(...) : ExtractThenExpand | KDFDataflowTest.java:84:40:84:43 | spec : ExtractThenExpand | provenance |  |
+| KDFDataflowTest.java:81:53:81:63 | taintedInfo : byte[] | KDFDataflowTest.java:81:34:81:68 | thenExpand(...) : ExtractThenExpand | provenance | MaD:4 |
+| KDFDataflowTest.java:84:25:84:44 | deriveData(...) : byte[] | KDFDataflowTest.java:85:14:85:19 | result | provenance |  |
+| KDFDataflowTest.java:84:40:84:43 | spec : ExtractThenExpand | KDFDataflowTest.java:84:25:84:44 | deriveData(...) : byte[] | provenance | MaD:8 |
+nodes
+| KDFDataflowTest.java:12:28:12:37 | source(...) : String | semmle.label | source(...) : String |
+| KDFDataflowTest.java:13:31:13:39 | userInput : String | semmle.label | userInput : String |
+| KDFDataflowTest.java:13:31:13:50 | getBytes(...) : byte[] | semmle.label | getBytes(...) : byte[] |
+| KDFDataflowTest.java:15:28:15:39 | taintedBytes : byte[] | semmle.label | taintedBytes : byte[] |
+| KDFDataflowTest.java:16:29:16:40 | taintedBytes : byte[] | semmle.label | taintedBytes : byte[] |
+| KDFDataflowTest.java:17:25:17:36 | taintedBytes : byte[] | semmle.label | taintedBytes : byte[] |
+| KDFDataflowTest.java:18:33:18:44 | taintedBytes : byte[] | semmle.label | taintedBytes : byte[] |
+| KDFDataflowTest.java:22:43:22:59 | taintedIKM : byte[] | semmle.label | taintedIKM : byte[] |
+| KDFDataflowTest.java:24:9:24:15 | builder [post update] : Builder | semmle.label | builder [post update] : Builder |
+| KDFDataflowTest.java:24:24:24:33 | taintedIKM : byte[] | semmle.label | taintedIKM : byte[] |
+| KDFDataflowTest.java:25:34:25:40 | builder : Builder | semmle.label | builder : Builder |
+| KDFDataflowTest.java:25:34:25:74 | thenExpand(...) : ExtractThenExpand | semmle.label | thenExpand(...) : ExtractThenExpand |
+| KDFDataflowTest.java:28:25:28:44 | deriveData(...) : byte[] | semmle.label | deriveData(...) : byte[] |
+| KDFDataflowTest.java:28:40:28:43 | spec : ExtractThenExpand | semmle.label | spec : ExtractThenExpand |
+| KDFDataflowTest.java:29:14:29:19 | result | semmle.label | result |
+| KDFDataflowTest.java:32:44:32:60 | taintedIKM : byte[] | semmle.label | taintedIKM : byte[] |
+| KDFDataflowTest.java:34:46:34:72 | addIKM(...) : Builder | semmle.label | addIKM(...) : Builder |
+| KDFDataflowTest.java:34:62:34:71 | taintedIKM : byte[] | semmle.label | taintedIKM : byte[] |
+| KDFDataflowTest.java:35:34:35:41 | builder2 : Builder | semmle.label | builder2 : Builder |
+| KDFDataflowTest.java:35:34:35:75 | thenExpand(...) : ExtractThenExpand | semmle.label | thenExpand(...) : ExtractThenExpand |
+| KDFDataflowTest.java:38:25:38:44 | deriveData(...) : byte[] | semmle.label | deriveData(...) : byte[] |
+| KDFDataflowTest.java:38:40:38:43 | spec : ExtractThenExpand | semmle.label | spec : ExtractThenExpand |
+| KDFDataflowTest.java:39:14:39:19 | result | semmle.label | result |
+| KDFDataflowTest.java:42:40:42:56 | taintedIKM : byte[] | semmle.label | taintedIKM : byte[] |
+| KDFDataflowTest.java:44:9:44:15 | builder [post update] : Builder | semmle.label | builder [post update] : Builder |
+| KDFDataflowTest.java:44:24:44:33 | taintedIKM : byte[] | semmle.label | taintedIKM : byte[] |
+| KDFDataflowTest.java:46:34:46:40 | builder : Builder | semmle.label | builder : Builder |
+| KDFDataflowTest.java:46:34:46:74 | thenExpand(...) : ExtractThenExpand | semmle.label | thenExpand(...) : ExtractThenExpand |
+| KDFDataflowTest.java:49:25:49:44 | deriveData(...) : byte[] | semmle.label | deriveData(...) : byte[] |
+| KDFDataflowTest.java:49:40:49:43 | spec : ExtractThenExpand | semmle.label | spec : ExtractThenExpand |
+| KDFDataflowTest.java:50:14:50:19 | result | semmle.label | result |
+| KDFDataflowTest.java:53:48:53:64 | taintedIKM : byte[] | semmle.label | taintedIKM : byte[] |
+| KDFDataflowTest.java:54:53:54:106 | new SecretKeySpec(...) : SecretKeySpec | semmle.label | new SecretKeySpec(...) : SecretKeySpec |
+| KDFDataflowTest.java:54:89:54:98 | taintedIKM : byte[] | semmle.label | taintedIKM : byte[] |
+| KDFDataflowTest.java:55:34:56:45 | expandOnly(...) : Expand | semmle.label | expandOnly(...) : Expand |
+| KDFDataflowTest.java:56:13:56:21 | secretKey : SecretKeySpec | semmle.label | secretKey : SecretKeySpec |
+| KDFDataflowTest.java:59:25:59:44 | deriveData(...) : byte[] | semmle.label | deriveData(...) : byte[] |
+| KDFDataflowTest.java:59:40:59:43 | spec : Expand | semmle.label | spec : Expand |
+| KDFDataflowTest.java:60:14:60:19 | result | semmle.label | result |
+| KDFDataflowTest.java:76:28:76:37 | source(...) : String | semmle.label | source(...) : String |
+| KDFDataflowTest.java:77:30:77:38 | userInput : String | semmle.label | userInput : String |
+| KDFDataflowTest.java:77:30:77:49 | getBytes(...) : byte[] | semmle.label | getBytes(...) : byte[] |
+| KDFDataflowTest.java:81:34:81:68 | thenExpand(...) : ExtractThenExpand | semmle.label | thenExpand(...) : ExtractThenExpand |
+| KDFDataflowTest.java:81:53:81:63 | taintedInfo : byte[] | semmle.label | taintedInfo : byte[] |
+| KDFDataflowTest.java:84:25:84:44 | deriveData(...) : byte[] | semmle.label | deriveData(...) : byte[] |
+| KDFDataflowTest.java:84:40:84:43 | spec : ExtractThenExpand | semmle.label | spec : ExtractThenExpand |
+| KDFDataflowTest.java:85:14:85:19 | result | semmle.label | result |
+subpaths
+testFailures
diff --git a/java/ql/test/library-tests/dataflow/kdf/test.ql b/java/ql/test/library-tests/dataflow/kdf/test.ql
new file mode 100644
index 00000000000..b2ffe7d9a67
--- /dev/null
+++ b/java/ql/test/library-tests/dataflow/kdf/test.ql
@@ -0,0 +1,3 @@
+import utils.test.InlineFlowTest
+import TaintFlowTest<DefaultFlowConfig>
+import TaintFlow::PathGraph
diff --git a/java/ql/test/library-tests/dataflow/scoped-values/ScopedValueFlowTest.java b/java/ql/test/library-tests/dataflow/scoped-values/ScopedValueFlowTest.java
new file mode 100644
index 00000000000..2df07ae2f32
--- /dev/null
+++ b/java/ql/test/library-tests/dataflow/scoped-values/ScopedValueFlowTest.java
@@ -0,0 +1,44 @@
+import java.lang.ScopedValue;
+
+public class ScopedValueFlowTest {
+    private static final ScopedValue<String> USER_CONTEXT = ScopedValue.newInstance();
+    private static final ScopedValue<String> SESSION_ID = ScopedValue.newInstance();
+
+    public static String source(String label) {
+        return "tainted";
+    }
+
+    public static void sink(String value) {}
+
+    public static void main(String[] args) {
+        String userInput = source("");
+
+        // Test 1: Basic scoped value binding and retrieval
+        ScopedValue.where(USER_CONTEXT, userInput)
+            .run(() -> {
+                String value = USER_CONTEXT.get();
+                sink(value); // $ hasTaintFlow
+            });
+
+        // Test 2: Multiple scoped value bindings with chaining
+        ScopedValue.where(USER_CONTEXT, userInput)
+            .where(SESSION_ID, "safe-one")
+            .run(() -> {
+                String user = USER_CONTEXT.get();
+                String session = SESSION_ID.get();
+                sink(user); // $ hasTaintFlow
+                sink(session); // safe - should NOT have taint flow
+            });
+
+        ScopedValue.where(USER_CONTEXT, userInput)
+            .run(() -> {
+                String outer = USER_CONTEXT.get();
+                ScopedValue.where(USER_CONTEXT, "safe-two")
+                    .run(() -> {
+                        String inner = USER_CONTEXT.get();
+                        sink(inner); // $ SPURIOUS: hasTaintFlow
+                    });
+                sink(outer); // $ hasTaintFlow
+            });
+    }
+}
\ No newline at end of file
diff --git a/java/ql/test/library-tests/dataflow/scoped-values/options b/java/ql/test/library-tests/dataflow/scoped-values/options
new file mode 100644
index 00000000000..c793109355a
--- /dev/null
+++ b/java/ql/test/library-tests/dataflow/scoped-values/options
@@ -0,0 +1 @@
+//semmle-extractor-options: --javac-args -source 25 -target 25 --enable-preview
\ No newline at end of file
diff --git a/java/ql/test/library-tests/dataflow/scoped-values/test.expected b/java/ql/test/library-tests/dataflow/scoped-values/test.expected
new file mode 100644
index 00000000000..a617a94188e
--- /dev/null
+++ b/java/ql/test/library-tests/dataflow/scoped-values/test.expected
@@ -0,0 +1,48 @@
+models
+| 1 | Summary: java.lang; ScopedValue; false; where; (ScopedValue,Object); ; Argument[1]; Argument[0].SyntheticField[java.lang.ScopedValue.boundValue]; value; manual |
+| 2 | Summary: java.lang; ScopedValue; true; get; (); ; Argument[this].SyntheticField[java.lang.ScopedValue.boundValue]; ReturnValue; value; manual |
+edges
+| ScopedValueFlowTest.java:4:46:4:57 | USER_CONTEXT : ScopedValue [java.lang.ScopedValue.boundValue] : String | ScopedValueFlowTest.java:19:32:19:43 | USER_CONTEXT : ScopedValue [java.lang.ScopedValue.boundValue] : String | provenance |  |
+| ScopedValueFlowTest.java:4:46:4:57 | USER_CONTEXT : ScopedValue [java.lang.ScopedValue.boundValue] : String | ScopedValueFlowTest.java:27:31:27:42 | USER_CONTEXT : ScopedValue [java.lang.ScopedValue.boundValue] : String | provenance |  |
+| ScopedValueFlowTest.java:4:46:4:57 | USER_CONTEXT : ScopedValue [java.lang.ScopedValue.boundValue] : String | ScopedValueFlowTest.java:35:32:35:43 | USER_CONTEXT : ScopedValue [java.lang.ScopedValue.boundValue] : String | provenance |  |
+| ScopedValueFlowTest.java:4:46:4:57 | USER_CONTEXT : ScopedValue [java.lang.ScopedValue.boundValue] : String | ScopedValueFlowTest.java:38:40:38:51 | USER_CONTEXT : ScopedValue [java.lang.ScopedValue.boundValue] : String | provenance |  |
+| ScopedValueFlowTest.java:14:28:14:37 | source(...) : String | ScopedValueFlowTest.java:17:41:17:49 | userInput : String | provenance |  |
+| ScopedValueFlowTest.java:14:28:14:37 | source(...) : String | ScopedValueFlowTest.java:24:41:24:49 | userInput : String | provenance |  |
+| ScopedValueFlowTest.java:14:28:14:37 | source(...) : String | ScopedValueFlowTest.java:33:41:33:49 | userInput : String | provenance |  |
+| ScopedValueFlowTest.java:17:27:17:38 | USER_CONTEXT [post update] : ScopedValue [java.lang.ScopedValue.boundValue] : String | ScopedValueFlowTest.java:4:46:4:57 | USER_CONTEXT : ScopedValue [java.lang.ScopedValue.boundValue] : String | provenance |  |
+| ScopedValueFlowTest.java:17:41:17:49 | userInput : String | ScopedValueFlowTest.java:17:27:17:38 | USER_CONTEXT [post update] : ScopedValue [java.lang.ScopedValue.boundValue] : String | provenance | MaD:1 |
+| ScopedValueFlowTest.java:19:32:19:43 | USER_CONTEXT : ScopedValue [java.lang.ScopedValue.boundValue] : String | ScopedValueFlowTest.java:19:32:19:49 | get(...) : String | provenance | MaD:2 |
+| ScopedValueFlowTest.java:19:32:19:49 | get(...) : String | ScopedValueFlowTest.java:20:22:20:26 | value | provenance |  |
+| ScopedValueFlowTest.java:24:27:24:38 | USER_CONTEXT [post update] : ScopedValue [java.lang.ScopedValue.boundValue] : String | ScopedValueFlowTest.java:4:46:4:57 | USER_CONTEXT : ScopedValue [java.lang.ScopedValue.boundValue] : String | provenance |  |
+| ScopedValueFlowTest.java:24:41:24:49 | userInput : String | ScopedValueFlowTest.java:24:27:24:38 | USER_CONTEXT [post update] : ScopedValue [java.lang.ScopedValue.boundValue] : String | provenance | MaD:1 |
+| ScopedValueFlowTest.java:27:31:27:42 | USER_CONTEXT : ScopedValue [java.lang.ScopedValue.boundValue] : String | ScopedValueFlowTest.java:27:31:27:48 | get(...) : String | provenance | MaD:2 |
+| ScopedValueFlowTest.java:27:31:27:48 | get(...) : String | ScopedValueFlowTest.java:29:22:29:25 | user | provenance |  |
+| ScopedValueFlowTest.java:33:27:33:38 | USER_CONTEXT [post update] : ScopedValue [java.lang.ScopedValue.boundValue] : String | ScopedValueFlowTest.java:4:46:4:57 | USER_CONTEXT : ScopedValue [java.lang.ScopedValue.boundValue] : String | provenance |  |
+| ScopedValueFlowTest.java:33:41:33:49 | userInput : String | ScopedValueFlowTest.java:33:27:33:38 | USER_CONTEXT [post update] : ScopedValue [java.lang.ScopedValue.boundValue] : String | provenance | MaD:1 |
+| ScopedValueFlowTest.java:35:32:35:43 | USER_CONTEXT : ScopedValue [java.lang.ScopedValue.boundValue] : String | ScopedValueFlowTest.java:35:32:35:49 | get(...) : String | provenance | MaD:2 |
+| ScopedValueFlowTest.java:35:32:35:49 | get(...) : String | ScopedValueFlowTest.java:41:22:41:26 | outer | provenance |  |
+| ScopedValueFlowTest.java:38:40:38:51 | USER_CONTEXT : ScopedValue [java.lang.ScopedValue.boundValue] : String | ScopedValueFlowTest.java:38:40:38:57 | get(...) : String | provenance | MaD:2 |
+| ScopedValueFlowTest.java:38:40:38:57 | get(...) : String | ScopedValueFlowTest.java:39:30:39:34 | inner | provenance |  |
+nodes
+| ScopedValueFlowTest.java:4:46:4:57 | USER_CONTEXT : ScopedValue [java.lang.ScopedValue.boundValue] : String | semmle.label | USER_CONTEXT : ScopedValue [java.lang.ScopedValue.boundValue] : String |
+| ScopedValueFlowTest.java:14:28:14:37 | source(...) : String | semmle.label | source(...) : String |
+| ScopedValueFlowTest.java:17:27:17:38 | USER_CONTEXT [post update] : ScopedValue [java.lang.ScopedValue.boundValue] : String | semmle.label | USER_CONTEXT [post update] : ScopedValue [java.lang.ScopedValue.boundValue] : String |
+| ScopedValueFlowTest.java:17:41:17:49 | userInput : String | semmle.label | userInput : String |
+| ScopedValueFlowTest.java:19:32:19:43 | USER_CONTEXT : ScopedValue [java.lang.ScopedValue.boundValue] : String | semmle.label | USER_CONTEXT : ScopedValue [java.lang.ScopedValue.boundValue] : String |
+| ScopedValueFlowTest.java:19:32:19:49 | get(...) : String | semmle.label | get(...) : String |
+| ScopedValueFlowTest.java:20:22:20:26 | value | semmle.label | value |
+| ScopedValueFlowTest.java:24:27:24:38 | USER_CONTEXT [post update] : ScopedValue [java.lang.ScopedValue.boundValue] : String | semmle.label | USER_CONTEXT [post update] : ScopedValue [java.lang.ScopedValue.boundValue] : String |
+| ScopedValueFlowTest.java:24:41:24:49 | userInput : String | semmle.label | userInput : String |
+| ScopedValueFlowTest.java:27:31:27:42 | USER_CONTEXT : ScopedValue [java.lang.ScopedValue.boundValue] : String | semmle.label | USER_CONTEXT : ScopedValue [java.lang.ScopedValue.boundValue] : String |
+| ScopedValueFlowTest.java:27:31:27:48 | get(...) : String | semmle.label | get(...) : String |
+| ScopedValueFlowTest.java:29:22:29:25 | user | semmle.label | user |
+| ScopedValueFlowTest.java:33:27:33:38 | USER_CONTEXT [post update] : ScopedValue [java.lang.ScopedValue.boundValue] : String | semmle.label | USER_CONTEXT [post update] : ScopedValue [java.lang.ScopedValue.boundValue] : String |
+| ScopedValueFlowTest.java:33:41:33:49 | userInput : String | semmle.label | userInput : String |
+| ScopedValueFlowTest.java:35:32:35:43 | USER_CONTEXT : ScopedValue [java.lang.ScopedValue.boundValue] : String | semmle.label | USER_CONTEXT : ScopedValue [java.lang.ScopedValue.boundValue] : String |
+| ScopedValueFlowTest.java:35:32:35:49 | get(...) : String | semmle.label | get(...) : String |
+| ScopedValueFlowTest.java:38:40:38:51 | USER_CONTEXT : ScopedValue [java.lang.ScopedValue.boundValue] : String | semmle.label | USER_CONTEXT : ScopedValue [java.lang.ScopedValue.boundValue] : String |
+| ScopedValueFlowTest.java:38:40:38:57 | get(...) : String | semmle.label | get(...) : String |
+| ScopedValueFlowTest.java:39:30:39:34 | inner | semmle.label | inner |
+| ScopedValueFlowTest.java:41:22:41:26 | outer | semmle.label | outer |
+subpaths
+testFailures
diff --git a/java/ql/test/library-tests/dataflow/scoped-values/test.ql b/java/ql/test/library-tests/dataflow/scoped-values/test.ql
new file mode 100644
index 00000000000..14dfc550b73
--- /dev/null
+++ b/java/ql/test/library-tests/dataflow/scoped-values/test.ql
@@ -0,0 +1,4 @@
+import java
+import utils.test.InlineFlowTest
+import TaintFlowTest<DefaultFlowConfig>
+import TaintFlow::PathGraph
diff --git a/java/ql/test/library-tests/flexible-constructors/FlexibleConstructors.java b/java/ql/test/library-tests/flexible-constructors/FlexibleConstructors.java
new file mode 100644
index 00000000000..bcd9a26f7b1
--- /dev/null
+++ b/java/ql/test/library-tests/flexible-constructors/FlexibleConstructors.java
@@ -0,0 +1,95 @@
+class A {
+    A(String msg) {
+        System.out.println("A: " + msg);
+    }
+}
+
+class B extends A {
+    B(String input) {
+        var msg = input.trim().toUpperCase();
+        super(msg);
+    }
+}
+
+class C {
+    private final int x;
+
+    C(int x) {
+        if (x < 0) throw new IllegalArgumentException();
+        super();
+        this.x = x;
+    }
+}
+
+record R(String name, int score) {
+    public R(String name) {
+        var score = name.length();
+        this(name, score);
+    }
+}
+
+class Outer {
+    private final String prefix = "outer";
+
+    class Inner {
+        private String full;
+
+        Inner(String suffix) {
+            var combined = prefix + "_" + suffix;
+            super();
+            this.full = combined;
+        }
+    }
+}
+
+class D {
+    private final String value;
+    private final int length;
+
+    D(String input) {
+        var processed = input.toLowerCase();
+        value = processed;
+        this.length = processed.length();
+        super();
+    }
+}
+
+class E extends A {
+    private boolean isValid;
+    private String processed;
+
+    E(String data) {
+        var temp = data != null ? data.trim() : "";
+        this.processed = temp;
+        isValid = !temp.isEmpty();
+        super(temp);
+    }
+}
+
+class F {
+    private int x;
+    private final int y;
+    private int sum;
+
+    F(int a, int b) {
+        x = a;
+        this.y = b;
+        this.sum = a + b;
+        super();
+    }
+}
+
+class G {
+    private String instance_val;
+
+    {
+        instance_val = "instance";
+    }
+
+    G(String input) {
+        var tmp = input != null ? input : "default";
+        var string = tmp + "_initialized";
+        super();
+        this.instance_val = string;
+    }
+}
diff --git a/java/ql/test/library-tests/flexible-constructors/InstanceInitializerCalls.expected b/java/ql/test/library-tests/flexible-constructors/InstanceInitializerCalls.expected
new file mode 100644
index 00000000000..75a112fe208
--- /dev/null
+++ b/java/ql/test/library-tests/flexible-constructors/InstanceInitializerCalls.expected
@@ -0,0 +1,2 @@
+| FlexibleConstructors.java:31:7:31:11 | <Expr>; | 1 | <obinit> | Instance initializer call at index 1 |
+| FlexibleConstructors.java:89:5:89:5 | <Expr>; | 3 | <obinit> | Instance initializer call at index 3 |
diff --git a/java/ql/test/library-tests/flexible-constructors/InstanceInitializerCalls.ql b/java/ql/test/library-tests/flexible-constructors/InstanceInitializerCalls.ql
new file mode 100644
index 00000000000..286137fc452
--- /dev/null
+++ b/java/ql/test/library-tests/flexible-constructors/InstanceInitializerCalls.ql
@@ -0,0 +1,8 @@
+import java
+
+from MethodCall call, Method m
+where
+  call.getMethod() = m and
+  m.getName() = "<obinit>"
+select call.getEnclosingStmt(), call.getEnclosingStmt().getIndex(), call.getMethod().getName(),
+  "Instance initializer call at index " + call.getEnclosingStmt().getIndex()
diff --git a/java/ql/test/library-tests/flexible-constructors/PrettyPrint.expected b/java/ql/test/library-tests/flexible-constructors/PrettyPrint.expected
new file mode 100644
index 00000000000..d90e8b8f831
--- /dev/null
+++ b/java/ql/test/library-tests/flexible-constructors/PrettyPrint.expected
@@ -0,0 +1,125 @@
+| FlexibleConstructors.java:1:7:1:7 | A | 0 | class A { |
+| FlexibleConstructors.java:1:7:1:7 | A | 1 |   A(String msg) { |
+| FlexibleConstructors.java:1:7:1:7 | A | 2 |     super(); |
+| FlexibleConstructors.java:1:7:1:7 | A | 3 |     System.out.println("A: " + msg); |
+| FlexibleConstructors.java:1:7:1:7 | A | 4 |   } |
+| FlexibleConstructors.java:1:7:1:7 | A | 5 | } |
+| FlexibleConstructors.java:7:7:7:7 | B | 0 | class B { |
+| FlexibleConstructors.java:7:7:7:7 | B | 1 |   B(String input) { |
+| FlexibleConstructors.java:7:7:7:7 | B | 2 |     var msg = input.trim().toUpperCase(); |
+| FlexibleConstructors.java:7:7:7:7 | B | 3 |     super(msg); |
+| FlexibleConstructors.java:7:7:7:7 | B | 4 |   } |
+| FlexibleConstructors.java:7:7:7:7 | B | 5 | } |
+| FlexibleConstructors.java:14:7:14:7 | C | 0 | class C { |
+| FlexibleConstructors.java:14:7:14:7 | C | 1 |   private final int x; |
+| FlexibleConstructors.java:14:7:14:7 | C | 2 |  |
+| FlexibleConstructors.java:14:7:14:7 | C | 3 |   C(int x) { |
+| FlexibleConstructors.java:14:7:14:7 | C | 4 |     if (x < 0) |
+| FlexibleConstructors.java:14:7:14:7 | C | 5 |       throw new IllegalArgumentException(); |
+| FlexibleConstructors.java:14:7:14:7 | C | 6 |     super(); |
+| FlexibleConstructors.java:14:7:14:7 | C | 7 |     this.x = x; |
+| FlexibleConstructors.java:14:7:14:7 | C | 8 |   } |
+| FlexibleConstructors.java:14:7:14:7 | C | 9 | } |
+| FlexibleConstructors.java:24:8:24:8 | R | 0 | final class R { |
+| FlexibleConstructors.java:24:8:24:8 | R | 1 |   public final boolean equals(Object p0) { <missing body> } |
+| FlexibleConstructors.java:24:8:24:8 | R | 2 |  |
+| FlexibleConstructors.java:24:8:24:8 | R | 3 |   public final int hashCode() { <missing body> } |
+| FlexibleConstructors.java:24:8:24:8 | R | 4 |  |
+| FlexibleConstructors.java:24:8:24:8 | R | 5 |   public String name() { <missing body> } |
+| FlexibleConstructors.java:24:8:24:8 | R | 6 |  |
+| FlexibleConstructors.java:24:8:24:8 | R | 7 |   public int score() { <missing body> } |
+| FlexibleConstructors.java:24:8:24:8 | R | 8 |  |
+| FlexibleConstructors.java:24:8:24:8 | R | 9 |   public final String toString() { <missing body> } |
+| FlexibleConstructors.java:24:8:24:8 | R | 10 |  |
+| FlexibleConstructors.java:24:8:24:8 | R | 11 |   R(String name, int score) { |
+| FlexibleConstructors.java:24:8:24:8 | R | 12 |     super(); |
+| FlexibleConstructors.java:24:8:24:8 | R | 13 |     this.name = name; |
+| FlexibleConstructors.java:24:8:24:8 | R | 14 |     this.score = score; |
+| FlexibleConstructors.java:24:8:24:8 | R | 15 |   } |
+| FlexibleConstructors.java:24:8:24:8 | R | 16 |  |
+| FlexibleConstructors.java:24:8:24:8 | R | 17 |   private final String name; |
+| FlexibleConstructors.java:24:8:24:8 | R | 18 |  |
+| FlexibleConstructors.java:24:8:24:8 | R | 19 |   private final int score; |
+| FlexibleConstructors.java:24:8:24:8 | R | 20 |  |
+| FlexibleConstructors.java:24:8:24:8 | R | 21 |   public R(String name) { |
+| FlexibleConstructors.java:24:8:24:8 | R | 22 |     var score = name.length(); |
+| FlexibleConstructors.java:24:8:24:8 | R | 23 |     this(name, score); |
+| FlexibleConstructors.java:24:8:24:8 | R | 24 |   } |
+| FlexibleConstructors.java:24:8:24:8 | R | 25 | } |
+| FlexibleConstructors.java:31:7:31:11 | Outer | 0 | class Outer { |
+| FlexibleConstructors.java:31:7:31:11 | Outer | 1 |   private void <obinit>() { |
+| FlexibleConstructors.java:31:7:31:11 | Outer | 2 |     prefix = "outer"; |
+| FlexibleConstructors.java:31:7:31:11 | Outer | 3 |   } |
+| FlexibleConstructors.java:31:7:31:11 | Outer | 4 |  |
+| FlexibleConstructors.java:31:7:31:11 | Outer | 5 |   Outer() { |
+| FlexibleConstructors.java:31:7:31:11 | Outer | 6 |     super(); |
+| FlexibleConstructors.java:31:7:31:11 | Outer | 7 |     <obinit>(); |
+| FlexibleConstructors.java:31:7:31:11 | Outer | 8 |   } |
+| FlexibleConstructors.java:31:7:31:11 | Outer | 9 |  |
+| FlexibleConstructors.java:31:7:31:11 | Outer | 10 |   private final String prefix; |
+| FlexibleConstructors.java:31:7:31:11 | Outer | 11 |  |
+| FlexibleConstructors.java:31:7:31:11 | Outer | 12 |   class Inner { |
+| FlexibleConstructors.java:31:7:31:11 | Outer | 13 |     private String full; |
+| FlexibleConstructors.java:31:7:31:11 | Outer | 14 |    |
+| FlexibleConstructors.java:31:7:31:11 | Outer | 15 |     Inner(String suffix) { |
+| FlexibleConstructors.java:31:7:31:11 | Outer | 16 |       var combined = prefix + "_" + suffix; |
+| FlexibleConstructors.java:31:7:31:11 | Outer | 17 |       super(); |
+| FlexibleConstructors.java:31:7:31:11 | Outer | 18 |       this.full = combined; |
+| FlexibleConstructors.java:31:7:31:11 | Outer | 19 |     } |
+| FlexibleConstructors.java:31:7:31:11 | Outer | 20 |   } |
+| FlexibleConstructors.java:31:7:31:11 | Outer | 21 | } |
+| FlexibleConstructors.java:45:7:45:7 | D | 0 | class D { |
+| FlexibleConstructors.java:45:7:45:7 | D | 1 |   private final String value; |
+| FlexibleConstructors.java:45:7:45:7 | D | 2 |  |
+| FlexibleConstructors.java:45:7:45:7 | D | 3 |   private final int length; |
+| FlexibleConstructors.java:45:7:45:7 | D | 4 |  |
+| FlexibleConstructors.java:45:7:45:7 | D | 5 |   D(String input) { |
+| FlexibleConstructors.java:45:7:45:7 | D | 6 |     var processed = input.toLowerCase(); |
+| FlexibleConstructors.java:45:7:45:7 | D | 7 |     value = processed; |
+| FlexibleConstructors.java:45:7:45:7 | D | 8 |     this.length = processed.length(); |
+| FlexibleConstructors.java:45:7:45:7 | D | 9 |     super(); |
+| FlexibleConstructors.java:45:7:45:7 | D | 10 |   } |
+| FlexibleConstructors.java:45:7:45:7 | D | 11 | } |
+| FlexibleConstructors.java:57:7:57:7 | E | 0 | class E { |
+| FlexibleConstructors.java:57:7:57:7 | E | 1 |   private boolean isValid; |
+| FlexibleConstructors.java:57:7:57:7 | E | 2 |  |
+| FlexibleConstructors.java:57:7:57:7 | E | 3 |   private String processed; |
+| FlexibleConstructors.java:57:7:57:7 | E | 4 |  |
+| FlexibleConstructors.java:57:7:57:7 | E | 5 |   E(String data) { |
+| FlexibleConstructors.java:57:7:57:7 | E | 6 |     var temp = data != null ? data.trim() : ""; |
+| FlexibleConstructors.java:57:7:57:7 | E | 7 |     this.processed = temp; |
+| FlexibleConstructors.java:57:7:57:7 | E | 8 |     isValid = !temp.isEmpty(); |
+| FlexibleConstructors.java:57:7:57:7 | E | 9 |     super(temp); |
+| FlexibleConstructors.java:57:7:57:7 | E | 10 |   } |
+| FlexibleConstructors.java:57:7:57:7 | E | 11 | } |
+| FlexibleConstructors.java:69:7:69:7 | F | 0 | class F { |
+| FlexibleConstructors.java:69:7:69:7 | F | 1 |   private int x; |
+| FlexibleConstructors.java:69:7:69:7 | F | 2 |  |
+| FlexibleConstructors.java:69:7:69:7 | F | 3 |   private final int y; |
+| FlexibleConstructors.java:69:7:69:7 | F | 4 |  |
+| FlexibleConstructors.java:69:7:69:7 | F | 5 |   private int sum; |
+| FlexibleConstructors.java:69:7:69:7 | F | 6 |  |
+| FlexibleConstructors.java:69:7:69:7 | F | 7 |   F(int a, int b) { |
+| FlexibleConstructors.java:69:7:69:7 | F | 8 |     x = a; |
+| FlexibleConstructors.java:69:7:69:7 | F | 9 |     this.y = b; |
+| FlexibleConstructors.java:69:7:69:7 | F | 10 |     this.sum = a + b; |
+| FlexibleConstructors.java:69:7:69:7 | F | 11 |     super(); |
+| FlexibleConstructors.java:69:7:69:7 | F | 12 |   } |
+| FlexibleConstructors.java:69:7:69:7 | F | 13 | } |
+| FlexibleConstructors.java:82:7:82:7 | G | 0 | class G { |
+| FlexibleConstructors.java:82:7:82:7 | G | 1 |   private void <obinit>() { |
+| FlexibleConstructors.java:82:7:82:7 | G | 2 |     { |
+| FlexibleConstructors.java:82:7:82:7 | G | 3 |       instance_val = "instance"; |
+| FlexibleConstructors.java:82:7:82:7 | G | 4 |     } |
+| FlexibleConstructors.java:82:7:82:7 | G | 5 |   } |
+| FlexibleConstructors.java:82:7:82:7 | G | 6 |  |
+| FlexibleConstructors.java:82:7:82:7 | G | 7 |   private String instance_val; |
+| FlexibleConstructors.java:82:7:82:7 | G | 8 |  |
+| FlexibleConstructors.java:82:7:82:7 | G | 9 |   G(String input) { |
+| FlexibleConstructors.java:82:7:82:7 | G | 10 |     var tmp = input != null ? input : "default"; |
+| FlexibleConstructors.java:82:7:82:7 | G | 11 |     var string = tmp + "_initialized"; |
+| FlexibleConstructors.java:82:7:82:7 | G | 12 |     super(); |
+| FlexibleConstructors.java:82:7:82:7 | G | 13 |     <obinit>(); |
+| FlexibleConstructors.java:82:7:82:7 | G | 14 |     this.instance_val = string; |
+| FlexibleConstructors.java:82:7:82:7 | G | 15 |   } |
+| FlexibleConstructors.java:82:7:82:7 | G | 16 | } |
diff --git a/java/ql/test/library-tests/flexible-constructors/PrettyPrint.ql b/java/ql/test/library-tests/flexible-constructors/PrettyPrint.ql
new file mode 100644
index 00000000000..59ae62effd1
--- /dev/null
+++ b/java/ql/test/library-tests/flexible-constructors/PrettyPrint.ql
@@ -0,0 +1,5 @@
+import semmle.code.java.PrettyPrintAst
+
+from ClassOrInterface cori, string s, int line
+where pp(cori, s, line) and cori.fromSource()
+select cori, line, s
diff --git a/java/ql/test/library-tests/flexible-constructors/PrintAst.expected b/java/ql/test/library-tests/flexible-constructors/PrintAst.expected
new file mode 100644
index 00000000000..e8071db72f7
--- /dev/null
+++ b/java/ql/test/library-tests/flexible-constructors/PrintAst.expected
@@ -0,0 +1,213 @@
+FlexibleConstructors.java:
+#    0| [CompilationUnit] FlexibleConstructors
+#    1|   1: [Class] A
+#    2|     1: [Constructor] A
+#-----|       4: (Parameters)
+#    2|         0: [Parameter] msg
+#    2|           0: [TypeAccess] String
+#    2|       5: [BlockStmt] { ... }
+#    3|         1: [ExprStmt] <Expr>;
+#    3|           0: [MethodCall] println(...)
+#    3|             -1: [VarAccess] System.out
+#    3|               -1: [TypeAccess] System
+#    3|             0: [AddExpr] ... + ...
+#    3|               0: [StringLiteral] "A: "
+#    3|               1: [VarAccess] msg
+#    7|   2: [Class] B
+#-----|     -1: (Base Types)
+#    7|       -1: [TypeAccess] A
+#    8|     1: [Constructor] B
+#-----|       4: (Parameters)
+#    8|         0: [Parameter] input
+#    8|           0: [TypeAccess] String
+#    8|       5: [BlockStmt] { ... }
+#    9|         0: [LocalVariableDeclStmt] var ...;
+#    9|           1: [LocalVariableDeclExpr] msg
+#    9|             0: [MethodCall] toUpperCase(...)
+#    9|               -1: [MethodCall] trim(...)
+#    9|                 -1: [VarAccess] input
+#   10|         1: [SuperConstructorInvocationStmt] super(...)
+#   10|           0: [VarAccess] msg
+#   14|   3: [Class] C
+#   15|     1: [FieldDeclaration] int x;
+#   15|       -1: [TypeAccess] int
+#   17|     2: [Constructor] C
+#-----|       4: (Parameters)
+#   17|         0: [Parameter] x
+#   17|           0: [TypeAccess] int
+#   17|       5: [BlockStmt] { ... }
+#   18|         0: [IfStmt] if (...)
+#   18|           0: [LTExpr] ... < ...
+#   18|             0: [VarAccess] x
+#   18|             1: [IntegerLiteral] 0
+#   18|           1: [ThrowStmt] throw ...
+#   18|             0: [ClassInstanceExpr] new IllegalArgumentException(...)
+#   18|               -3: [TypeAccess] IllegalArgumentException
+#   19|         1: [SuperConstructorInvocationStmt] super(...)
+#   20|         2: [ExprStmt] <Expr>;
+#   20|           0: [AssignExpr] ...=...
+#   20|             0: [VarAccess] this.x
+#   20|               -1: [ThisAccess] this
+#   20|             1: [VarAccess] x
+#   24|   4: [Class] R
+#   24|     2: [FieldDeclaration] String name;
+#   24|     3: [FieldDeclaration] int score;
+#   25|     4: [Constructor] R
+#-----|       4: (Parameters)
+#   25|         0: [Parameter] name
+#   25|           0: [TypeAccess] String
+#   25|       5: [BlockStmt] { ... }
+#   26|         0: [LocalVariableDeclStmt] var ...;
+#   26|           1: [LocalVariableDeclExpr] score
+#   26|             0: [MethodCall] length(...)
+#   26|               -1: [VarAccess] name
+#   27|         1: [ThisConstructorInvocationStmt] this(...)
+#   27|           0: [VarAccess] name
+#   27|           1: [VarAccess] score
+#   31|   5: [Class] Outer
+#   32|     3: [FieldDeclaration] String prefix;
+#   32|       -1: [TypeAccess] String
+#   32|       0: [StringLiteral] "outer"
+#   34|     4: [Class] Inner
+#   35|       1: [FieldDeclaration] String full;
+#   35|         -1: [TypeAccess] String
+#   37|       2: [Constructor] Inner
+#-----|         4: (Parameters)
+#   37|           0: [Parameter] suffix
+#   37|             0: [TypeAccess] String
+#   37|         5: [BlockStmt] { ... }
+#   38|           0: [LocalVariableDeclStmt] var ...;
+#   38|             1: [LocalVariableDeclExpr] combined
+#   38|               0: [AddExpr] ... + ...
+#   38|                 0: [AddExpr] ... + ...
+#   38|                   0: [VarAccess] prefix
+#   38|                   1: [StringLiteral] "_"
+#   38|                 1: [VarAccess] suffix
+#   39|           1: [SuperConstructorInvocationStmt] super(...)
+#   40|           2: [ExprStmt] <Expr>;
+#   40|             0: [AssignExpr] ...=...
+#   40|               0: [VarAccess] this.full
+#   40|                 -1: [ThisAccess] this
+#   40|               1: [VarAccess] combined
+#   45|   6: [Class] D
+#   46|     1: [FieldDeclaration] String value;
+#   46|       -1: [TypeAccess] String
+#   47|     2: [FieldDeclaration] int length;
+#   47|       -1: [TypeAccess] int
+#   49|     3: [Constructor] D
+#-----|       4: (Parameters)
+#   49|         0: [Parameter] input
+#   49|           0: [TypeAccess] String
+#   49|       5: [BlockStmt] { ... }
+#   50|         0: [LocalVariableDeclStmt] var ...;
+#   50|           1: [LocalVariableDeclExpr] processed
+#   50|             0: [MethodCall] toLowerCase(...)
+#   50|               -1: [VarAccess] input
+#   51|         1: [ExprStmt] <Expr>;
+#   51|           0: [AssignExpr] ...=...
+#   51|             0: [VarAccess] value
+#   51|             1: [VarAccess] processed
+#   52|         2: [ExprStmt] <Expr>;
+#   52|           0: [AssignExpr] ...=...
+#   52|             0: [VarAccess] this.length
+#   52|               -1: [ThisAccess] this
+#   52|             1: [MethodCall] length(...)
+#   52|               -1: [VarAccess] processed
+#   53|         3: [SuperConstructorInvocationStmt] super(...)
+#   57|   7: [Class] E
+#-----|     -1: (Base Types)
+#   57|       -1: [TypeAccess] A
+#   58|     1: [FieldDeclaration] boolean isValid;
+#   58|       -1: [TypeAccess] boolean
+#   59|     2: [FieldDeclaration] String processed;
+#   59|       -1: [TypeAccess] String
+#   61|     3: [Constructor] E
+#-----|       4: (Parameters)
+#   61|         0: [Parameter] data
+#   61|           0: [TypeAccess] String
+#   61|       5: [BlockStmt] { ... }
+#   62|         0: [LocalVariableDeclStmt] var ...;
+#   62|           1: [LocalVariableDeclExpr] temp
+#   62|             0: [ConditionalExpr] ...?...:...
+#   62|               0: [NEExpr] ... != ...
+#   62|                 0: [VarAccess] data
+#   62|                 1: [NullLiteral] null
+#   62|               1: [MethodCall] trim(...)
+#   62|                 -1: [VarAccess] data
+#   62|               2: [StringLiteral] ""
+#   63|         1: [ExprStmt] <Expr>;
+#   63|           0: [AssignExpr] ...=...
+#   63|             0: [VarAccess] this.processed
+#   63|               -1: [ThisAccess] this
+#   63|             1: [VarAccess] temp
+#   64|         2: [ExprStmt] <Expr>;
+#   64|           0: [AssignExpr] ...=...
+#   64|             0: [VarAccess] isValid
+#   64|             1: [LogNotExpr] !...
+#   64|               0: [MethodCall] isEmpty(...)
+#   64|                 -1: [VarAccess] temp
+#   65|         3: [SuperConstructorInvocationStmt] super(...)
+#   65|           0: [VarAccess] temp
+#   69|   8: [Class] F
+#   70|     1: [FieldDeclaration] int x;
+#   70|       -1: [TypeAccess] int
+#   71|     2: [FieldDeclaration] int y;
+#   71|       -1: [TypeAccess] int
+#   72|     3: [FieldDeclaration] int sum;
+#   72|       -1: [TypeAccess] int
+#   74|     4: [Constructor] F
+#-----|       4: (Parameters)
+#   74|         0: [Parameter] a
+#   74|           0: [TypeAccess] int
+#   74|         1: [Parameter] b
+#   74|           0: [TypeAccess] int
+#   74|       5: [BlockStmt] { ... }
+#   75|         0: [ExprStmt] <Expr>;
+#   75|           0: [AssignExpr] ...=...
+#   75|             0: [VarAccess] x
+#   75|             1: [VarAccess] a
+#   76|         1: [ExprStmt] <Expr>;
+#   76|           0: [AssignExpr] ...=...
+#   76|             0: [VarAccess] this.y
+#   76|               -1: [ThisAccess] this
+#   76|             1: [VarAccess] b
+#   77|         2: [ExprStmt] <Expr>;
+#   77|           0: [AssignExpr] ...=...
+#   77|             0: [VarAccess] this.sum
+#   77|               -1: [ThisAccess] this
+#   77|             1: [AddExpr] ... + ...
+#   77|               0: [VarAccess] a
+#   77|               1: [VarAccess] b
+#   78|         3: [SuperConstructorInvocationStmt] super(...)
+#   82|   9: [Class] G
+#   83|     2: [FieldDeclaration] String instance_val;
+#   83|       -1: [TypeAccess] String
+#   85|     3: [BlockStmt] { ... }
+#   86|       0: [ExprStmt] <Expr>;
+#   86|         0: [AssignExpr] ...=...
+#   86|           0: [VarAccess] instance_val
+#   86|           1: [StringLiteral] "instance"
+#   89|     4: [Constructor] G
+#-----|       4: (Parameters)
+#   89|         0: [Parameter] input
+#   89|           0: [TypeAccess] String
+#   89|       5: [BlockStmt] { ... }
+#   90|         0: [LocalVariableDeclStmt] var ...;
+#   90|           1: [LocalVariableDeclExpr] tmp
+#   90|             0: [ConditionalExpr] ...?...:...
+#   90|               0: [NEExpr] ... != ...
+#   90|                 0: [VarAccess] input
+#   90|                 1: [NullLiteral] null
+#   90|               1: [VarAccess] input
+#   90|               2: [StringLiteral] "default"
+#   91|         1: [LocalVariableDeclStmt] var ...;
+#   91|           1: [LocalVariableDeclExpr] string
+#   91|             0: [AddExpr] ... + ...
+#   91|               0: [VarAccess] tmp
+#   91|               1: [StringLiteral] "_initialized"
+#   92|         2: [SuperConstructorInvocationStmt] super(...)
+#   93|         4: [ExprStmt] <Expr>;
+#   93|           0: [AssignExpr] ...=...
+#   93|             0: [VarAccess] this.instance_val
+#   93|               -1: [ThisAccess] this
+#   93|             1: [VarAccess] string
diff --git a/java/ql/test/library-tests/flexible-constructors/PrintAst.qlref b/java/ql/test/library-tests/flexible-constructors/PrintAst.qlref
new file mode 100644
index 00000000000..c7fd5faf239
--- /dev/null
+++ b/java/ql/test/library-tests/flexible-constructors/PrintAst.qlref
@@ -0,0 +1 @@
+semmle/code/java/PrintAst.ql
\ No newline at end of file
diff --git a/java/ql/test/library-tests/flexible-constructors/SuperPredecessor.expected b/java/ql/test/library-tests/flexible-constructors/SuperPredecessor.expected
new file mode 100644
index 00000000000..dba8b4acf98
--- /dev/null
+++ b/java/ql/test/library-tests/flexible-constructors/SuperPredecessor.expected
@@ -0,0 +1,7 @@
+| FlexibleConstructors.java:10:15:10:17 | msg | FlexibleConstructors.java:10:9:10:19 | super(...) | predecessor of explicit super() |
+| FlexibleConstructors.java:18:13:18:17 | ... < ... | FlexibleConstructors.java:19:9:19:16 | super(...) | predecessor of explicit super() |
+| FlexibleConstructors.java:38:17:38:48 | combined | FlexibleConstructors.java:39:13:39:20 | super(...) | predecessor of explicit super() |
+| FlexibleConstructors.java:52:9:52:40 | ...=... | FlexibleConstructors.java:53:9:53:16 | super(...) | predecessor of explicit super() |
+| FlexibleConstructors.java:65:15:65:18 | temp | FlexibleConstructors.java:65:9:65:20 | super(...) | predecessor of explicit super() |
+| FlexibleConstructors.java:77:9:77:24 | ...=... | FlexibleConstructors.java:78:9:78:16 | super(...) | predecessor of explicit super() |
+| FlexibleConstructors.java:91:13:91:41 | string | FlexibleConstructors.java:92:9:92:16 | super(...) | predecessor of explicit super() |
diff --git a/java/ql/test/library-tests/flexible-constructors/SuperPredecessor.ql b/java/ql/test/library-tests/flexible-constructors/SuperPredecessor.ql
new file mode 100644
index 00000000000..2a291c5e82a
--- /dev/null
+++ b/java/ql/test/library-tests/flexible-constructors/SuperPredecessor.ql
@@ -0,0 +1,11 @@
+import java
+
+from ControlFlowNode pred, ControlFlowNode supNode, SuperConstructorInvocationStmt sc
+where
+  supNode.asStmt() = sc and
+  pred.getASuccessor() = supNode and
+  pred != supNode and
+  not pred.asStmt() instanceof BlockStmt and
+  exists(sc.getEnclosingCallable().getFile().getRelativePath()) and
+  sc.getLocation().getEndColumn() > sc.getLocation().getStartColumn()
+select pred, sc, "predecessor of explicit super()"
diff --git a/java/ql/test/library-tests/flexible-constructors/options b/java/ql/test/library-tests/flexible-constructors/options
new file mode 100644
index 00000000000..db1dc01e53b
--- /dev/null
+++ b/java/ql/test/library-tests/flexible-constructors/options
@@ -0,0 +1 @@
+//semmle-extractor-options: --javac-args --release 25 --enable-preview
diff --git a/java/ql/test/library-tests/guards/Guards.java b/java/ql/test/library-tests/guards/Guards.java
index aca64d6f64d..689795038c6 100644
--- a/java/ql/test/library-tests/guards/Guards.java
+++ b/java/ql/test/library-tests/guards/Guards.java
@@ -26,7 +26,7 @@ public class Guards {
     }
     int sz = a != null ? a.length : 0;
     for (int i = 0; i < sz; i++) {
-      chk(); // $ guarded='a != null:true' guarded='i < sz:true' guarded='sz:not 0' guarded='...?...:...:not 0' guarded='a.length:not 0' guarded='a:not null'
+      chk(); // $ guarded='a != null:true' guarded='i < sz:true' guarded='sz:Lower bound 1' guarded='...?...:...:Lower bound 1' guarded='a.length:Lower bound 1' guarded='a:not null'
       int e = a[i];
       if (e > 2) break;
     }
@@ -136,11 +136,11 @@ public class Guards {
         found = true;
       }
       if (found) {
-        chk(); // $ guarded=found:true guarded='i < a.length:true'
+        chk(); // $ guarded=found:true guarded='i < a.length:true' guarded='a.length:Lower bound 1'
       }
     }
     if (found) {
-      chk(); // $ guarded=found:true guarded='i < a.length:false'
+      chk(); // $ guarded=found:true guarded='i < a.length:false' guarded='i:Lower bound 0'
     }
   }
 
diff --git a/java/ql/test/library-tests/guards/GuardsInline.expected b/java/ql/test/library-tests/guards/GuardsInline.expected
index a76e2629cde..b0bd3b04c62 100644
--- a/java/ql/test/library-tests/guards/GuardsInline.expected
+++ b/java/ql/test/library-tests/guards/GuardsInline.expected
@@ -8,12 +8,12 @@
 | Guards.java:25:7:25:11 | chk(...) | b:false |
 | Guards.java:25:7:25:11 | chk(...) | g(1):true |
 | Guards.java:25:7:25:11 | chk(...) | g(2):false |
-| Guards.java:29:7:29:11 | chk(...) | '...?...:...:not 0' |
+| Guards.java:29:7:29:11 | chk(...) | '...?...:...:Lower bound 1' |
 | Guards.java:29:7:29:11 | chk(...) | 'a != null:true' |
-| Guards.java:29:7:29:11 | chk(...) | 'a.length:not 0' |
+| Guards.java:29:7:29:11 | chk(...) | 'a.length:Lower bound 1' |
 | Guards.java:29:7:29:11 | chk(...) | 'a:not null' |
 | Guards.java:29:7:29:11 | chk(...) | 'i < sz:true' |
-| Guards.java:29:7:29:11 | chk(...) | 'sz:not 0' |
+| Guards.java:29:7:29:11 | chk(...) | 'sz:Lower bound 1' |
 | Guards.java:39:9:39:13 | chk(...) | 's:bar' |
 | Guards.java:39:9:39:13 | chk(...) | 's:match "bar"' |
 | Guards.java:42:9:42:13 | chk(...) | 's:foo' |
@@ -85,9 +85,11 @@
 | Guards.java:127:7:127:11 | chk(...) | 'o != null:false' |
 | Guards.java:127:7:127:11 | chk(...) | 'o:null' |
 | Guards.java:127:7:127:11 | chk(...) | g(1):false |
+| Guards.java:139:9:139:13 | chk(...) | 'a.length:Lower bound 1' |
 | Guards.java:139:9:139:13 | chk(...) | 'i < a.length:true' |
 | Guards.java:139:9:139:13 | chk(...) | found:true |
 | Guards.java:143:7:143:11 | chk(...) | 'i < a.length:false' |
+| Guards.java:143:7:143:11 | chk(...) | 'i:Lower bound 0' |
 | Guards.java:143:7:143:11 | chk(...) | found:true |
 | Guards.java:173:7:173:11 | chk(...) | 's:not null' |
 | Guards.java:173:7:173:11 | chk(...) | testNotNull1(...):true |
diff --git a/java/ql/test/library-tests/guards/guardspreconditions.expected b/java/ql/test/library-tests/guards/guardspreconditions.expected
index 2d4597f0282..042fc2a05bf 100644
--- a/java/ql/test/library-tests/guards/guardspreconditions.expected
+++ b/java/ql/test/library-tests/guards/guardspreconditions.expected
@@ -1,35 +1,19 @@
 | Preconditions.java:8:9:8:31 | assertTrue(...) | exception | Preconditions.java:7:10:7:14 | Exceptional Exit |
 | Preconditions.java:8:9:8:31 | assertTrue(...) | no exception | Preconditions.java:9:9:9:18 | <Expr>; |
-| Preconditions.java:13:9:13:32 | assertTrue(...) | exception | Preconditions.java:12:10:12:14 | Exceptional Exit |
-| Preconditions.java:13:9:13:32 | assertTrue(...) | no exception | Preconditions.java:14:9:14:18 | <Expr>; |
 | Preconditions.java:18:9:18:33 | assertFalse(...) | exception | Preconditions.java:17:10:17:14 | Exceptional Exit |
 | Preconditions.java:18:9:18:33 | assertFalse(...) | no exception | Preconditions.java:19:9:19:18 | <Expr>; |
-| Preconditions.java:23:9:23:32 | assertFalse(...) | exception | Preconditions.java:22:10:22:14 | Exceptional Exit |
-| Preconditions.java:23:9:23:32 | assertFalse(...) | no exception | Preconditions.java:24:9:24:18 | <Expr>; |
 | Preconditions.java:28:9:28:41 | assertTrue(...) | exception | Preconditions.java:27:10:27:14 | Exceptional Exit |
 | Preconditions.java:28:9:28:41 | assertTrue(...) | no exception | Preconditions.java:29:9:29:18 | <Expr>; |
-| Preconditions.java:33:9:33:42 | assertTrue(...) | exception | Preconditions.java:32:10:32:14 | Exceptional Exit |
-| Preconditions.java:33:9:33:42 | assertTrue(...) | no exception | Preconditions.java:34:9:34:18 | <Expr>; |
 | Preconditions.java:38:9:38:43 | assertFalse(...) | exception | Preconditions.java:37:10:37:14 | Exceptional Exit |
 | Preconditions.java:38:9:38:43 | assertFalse(...) | no exception | Preconditions.java:39:9:39:18 | <Expr>; |
-| Preconditions.java:43:9:43:42 | assertFalse(...) | exception | Preconditions.java:42:10:42:14 | Exceptional Exit |
-| Preconditions.java:43:9:43:42 | assertFalse(...) | no exception | Preconditions.java:44:9:44:18 | <Expr>; |
 | Preconditions.java:48:9:48:35 | assertTrue(...) | exception | Preconditions.java:47:10:47:14 | Exceptional Exit |
 | Preconditions.java:48:9:48:35 | assertTrue(...) | no exception | Preconditions.java:49:9:49:18 | <Expr>; |
-| Preconditions.java:53:9:53:36 | assertTrue(...) | exception | Preconditions.java:52:10:52:15 | Exceptional Exit |
-| Preconditions.java:53:9:53:36 | assertTrue(...) | no exception | Preconditions.java:54:9:54:18 | <Expr>; |
 | Preconditions.java:58:9:58:37 | assertFalse(...) | exception | Preconditions.java:57:10:57:15 | Exceptional Exit |
 | Preconditions.java:58:9:58:37 | assertFalse(...) | no exception | Preconditions.java:59:9:59:18 | <Expr>; |
-| Preconditions.java:63:9:63:36 | assertFalse(...) | exception | Preconditions.java:62:10:62:15 | Exceptional Exit |
-| Preconditions.java:63:9:63:36 | assertFalse(...) | no exception | Preconditions.java:64:9:64:18 | <Expr>; |
 | Preconditions.java:68:9:68:45 | assertTrue(...) | exception | Preconditions.java:67:10:67:15 | Exceptional Exit |
 | Preconditions.java:68:9:68:45 | assertTrue(...) | no exception | Preconditions.java:69:9:69:18 | <Expr>; |
-| Preconditions.java:73:9:73:46 | assertTrue(...) | exception | Preconditions.java:72:10:72:15 | Exceptional Exit |
-| Preconditions.java:73:9:73:46 | assertTrue(...) | no exception | Preconditions.java:74:9:74:18 | <Expr>; |
 | Preconditions.java:78:9:78:47 | assertFalse(...) | exception | Preconditions.java:77:10:77:15 | Exceptional Exit |
 | Preconditions.java:78:9:78:47 | assertFalse(...) | no exception | Preconditions.java:79:9:79:18 | <Expr>; |
-| Preconditions.java:83:9:83:46 | assertFalse(...) | exception | Preconditions.java:82:10:82:15 | Exceptional Exit |
-| Preconditions.java:83:9:83:46 | assertFalse(...) | no exception | Preconditions.java:84:9:84:18 | <Expr>; |
 | Preconditions.java:88:9:88:15 | t(...) | exception | Preconditions.java:87:10:87:15 | Exceptional Exit |
 | Preconditions.java:88:9:88:15 | t(...) | no exception | Preconditions.java:89:9:89:18 | <Expr>; |
 | Preconditions.java:93:9:93:16 | t(...) | exception | Preconditions.java:92:10:92:15 | Exceptional Exit |
diff --git a/java/ql/test/library-tests/module-import-declarations/ImportedPackage.expected b/java/ql/test/library-tests/module-import-declarations/ImportedPackage.expected
new file mode 100644
index 00000000000..64eef687011
--- /dev/null
+++ b/java/ql/test/library-tests/module-import-declarations/ImportedPackage.expected
@@ -0,0 +1,61 @@
+| java.base | java.io |
+| java.base | java.lang |
+| java.base | java.lang.annotation |
+| java.base | java.lang.classfile |
+| java.base | java.lang.classfile.attribute |
+| java.base | java.lang.classfile.constantpool |
+| java.base | java.lang.classfile.instruction |
+| java.base | java.lang.constant |
+| java.base | java.lang.foreign |
+| java.base | java.lang.invoke |
+| java.base | java.lang.module |
+| java.base | java.lang.ref |
+| java.base | java.lang.reflect |
+| java.base | java.lang.runtime |
+| java.base | java.math |
+| java.base | java.net |
+| java.base | java.net.spi |
+| java.base | java.nio |
+| java.base | java.nio.channels |
+| java.base | java.nio.channels.spi |
+| java.base | java.nio.charset |
+| java.base | java.nio.charset.spi |
+| java.base | java.nio.file |
+| java.base | java.nio.file.attribute |
+| java.base | java.nio.file.spi |
+| java.base | java.security |
+| java.base | java.security.cert |
+| java.base | java.security.interfaces |
+| java.base | java.security.spec |
+| java.base | java.text |
+| java.base | java.text.spi |
+| java.base | java.time |
+| java.base | java.time.chrono |
+| java.base | java.time.format |
+| java.base | java.time.temporal |
+| java.base | java.time.zone |
+| java.base | java.util |
+| java.base | java.util.concurrent |
+| java.base | java.util.concurrent.atomic |
+| java.base | java.util.concurrent.locks |
+| java.base | java.util.function |
+| java.base | java.util.jar |
+| java.base | java.util.random |
+| java.base | java.util.regex |
+| java.base | java.util.spi |
+| java.base | java.util.stream |
+| java.base | java.util.zip |
+| java.base | javax.crypto |
+| java.base | javax.crypto.interfaces |
+| java.base | javax.crypto.spec |
+| java.base | javax.net |
+| java.base | javax.net.ssl |
+| java.base | javax.security.auth |
+| java.base | javax.security.auth.callback |
+| java.base | javax.security.auth.login |
+| java.base | javax.security.auth.spi |
+| java.base | javax.security.auth.x500 |
+| java.base | javax.security.cert |
+| java.base | jdk.internal.event |
+| java.base | jdk.internal.javac |
+| java.base | jdk.internal.vm.vector |
diff --git a/java/ql/test/library-tests/module-import-declarations/ImportedPackage.ql b/java/ql/test/library-tests/module-import-declarations/ImportedPackage.ql
new file mode 100644
index 00000000000..797cabfd546
--- /dev/null
+++ b/java/ql/test/library-tests/module-import-declarations/ImportedPackage.ql
@@ -0,0 +1,4 @@
+import java
+
+from ModuleImportDeclaration mid
+select mid.getModuleName(), mid.getAnImportedPackage().getName()
diff --git a/java/ql/test/library-tests/module-import-declarations/ImportedType.expected b/java/ql/test/library-tests/module-import-declarations/ImportedType.expected
new file mode 100644
index 00000000000..cf9064b6052
--- /dev/null
+++ b/java/ql/test/library-tests/module-import-declarations/ImportedType.expected
@@ -0,0 +1,1513 @@
+| java.base | java.io.BufferedReader |
+| java.base | java.io.BufferedWriter |
+| java.base | java.io.Closeable |
+| java.base | java.io.File |
+| java.base | java.io.FileDescriptor |
+| java.base | java.io.FileFilter |
+| java.base | java.io.FileNotFoundException |
+| java.base | java.io.FilenameFilter |
+| java.base | java.io.FilterOutputStream |
+| java.base | java.io.Flushable |
+| java.base | java.io.IOException |
+| java.base | java.io.InputStream |
+| java.base | java.io.InvalidObjectException |
+| java.base | java.io.ObjectStreamException |
+| java.base | java.io.OutputStream |
+| java.base | java.io.PrintStream |
+| java.base | java.io.PrintWriter |
+| java.base | java.io.Reader |
+| java.base | java.io.Serializable |
+| java.base | java.io.SyncFailedException |
+| java.base | java.io.UnsupportedEncodingException |
+| java.base | java.io.Writer |
+| java.base | java.lang.A |
+| java.base | java.lang.AbstractStringBuilder |
+| java.base | java.lang.Appendable |
+| java.base | java.lang.AutoCloseable |
+| java.base | java.lang.Boolean |
+| java.base | java.lang.CharSequence |
+| java.base | java.lang.Character |
+| java.base | java.lang.Class |
+| java.base | java.lang.Class<> |
+| java.base | java.lang.Class<? extends Annotation> |
+| java.base | java.lang.Class<? extends FileAttributeView> |
+| java.base | java.lang.Class<? extends Throwable> |
+| java.base | java.lang.Class<? extends U> |
+| java.base | java.lang.Class<? super T> |
+| java.base | java.lang.Class<?> |
+| java.base | java.lang.Class<A> |
+| java.base | java.lang.Class<AccessFlag> |
+| java.base | java.lang.Class<AccessMode> |
+| java.base | java.lang.Class<Boolean> |
+| java.base | java.lang.Class<CRLReason> |
+| java.base | java.lang.Class<Category> |
+| java.base | java.lang.Class<Character> |
+| java.base | java.lang.Class<Characteristics> |
+| java.base | java.lang.Class<ChronoField> |
+| java.base | java.lang.Class<ChronoUnit> |
+| java.base | java.lang.Class<ClassFileFormatVersion> |
+| java.base | java.lang.Class<ClassOption> |
+| java.base | java.lang.Class<DayOfWeek> |
+| java.base | java.lang.Class<Double> |
+| java.base | java.lang.Class<E> |
+| java.base | java.lang.Class<ElementType> |
+| java.base | java.lang.Class<FilteringMode> |
+| java.base | java.lang.Class<Float> |
+| java.base | java.lang.Class<FormatStyle> |
+| java.base | java.lang.Class<Integer> |
+| java.base | java.lang.Class<IsoCountryCode> |
+| java.base | java.lang.Class<IsoEra> |
+| java.base | java.lang.Class<Kind> |
+| java.base | java.lang.Class<LinkOption> |
+| java.base | java.lang.Class<Location> |
+| java.base | java.lang.Class<Long> |
+| java.base | java.lang.Class<Modifier> |
+| java.base | java.lang.Class<Month> |
+| java.base | java.lang.Class<ResolverStyle> |
+| java.base | java.lang.Class<RetentionPolicy> |
+| java.base | java.lang.Class<State> |
+| java.base | java.lang.Class<T> |
+| java.base | java.lang.Class<TextStyle> |
+| java.base | java.lang.Class<TimeDefinition> |
+| java.base | java.lang.Class<TimeUnit> |
+| java.base | java.lang.Class<Type> |
+| java.base | java.lang.Class<U> |
+| java.base | java.lang.Class<V> |
+| java.base | java.lang.Class<Void> |
+| java.base | java.lang.ClassFormatError |
+| java.base | java.lang.ClassLoader |
+| java.base | java.lang.ClassNotFoundException |
+| java.base | java.lang.CloneNotSupportedException |
+| java.base | java.lang.Cloneable |
+| java.base | java.lang.Comparable |
+| java.base | java.lang.Comparable<> |
+| java.base | java.lang.Comparable<? super K> |
+| java.base | java.lang.Comparable<? super T> |
+| java.base | java.lang.Comparable<? super U> |
+| java.base | java.lang.Comparable<? super V> |
+| java.base | java.lang.Comparable<AccessFlag> |
+| java.base | java.lang.Comparable<AccessMode> |
+| java.base | java.lang.Comparable<BigInteger> |
+| java.base | java.lang.Comparable<Boolean> |
+| java.base | java.lang.Comparable<ByteBuffer> |
+| java.base | java.lang.Comparable<CRLReason> |
+| java.base | java.lang.Comparable<Category> |
+| java.base | java.lang.Comparable<CharBuffer> |
+| java.base | java.lang.Comparable<Character> |
+| java.base | java.lang.Comparable<Characteristics> |
+| java.base | java.lang.Comparable<Charset> |
+| java.base | java.lang.Comparable<ChronoField> |
+| java.base | java.lang.Comparable<ChronoLocalDate> |
+| java.base | java.lang.Comparable<ChronoLocalDateTime<?>> |
+| java.base | java.lang.Comparable<ChronoUnit> |
+| java.base | java.lang.Comparable<ChronoZonedDateTime<?>> |
+| java.base | java.lang.Comparable<Chronology> |
+| java.base | java.lang.Comparable<ClassFileFormatVersion> |
+| java.base | java.lang.Comparable<ClassOption> |
+| java.base | java.lang.Comparable<Date> |
+| java.base | java.lang.Comparable<DayOfWeek> |
+| java.base | java.lang.Comparable<Double> |
+| java.base | java.lang.Comparable<DoubleBuffer> |
+| java.base | java.lang.Comparable<Duration> |
+| java.base | java.lang.Comparable<E> |
+| java.base | java.lang.Comparable<ElementType> |
+| java.base | java.lang.Comparable<Exports> |
+| java.base | java.lang.Comparable<File> |
+| java.base | java.lang.Comparable<FileTime> |
+| java.base | java.lang.Comparable<FilteringMode> |
+| java.base | java.lang.Comparable<Float> |
+| java.base | java.lang.Comparable<FloatBuffer> |
+| java.base | java.lang.Comparable<FormatStyle> |
+| java.base | java.lang.Comparable<Instant> |
+| java.base | java.lang.Comparable<IntBuffer> |
+| java.base | java.lang.Comparable<Integer> |
+| java.base | java.lang.Comparable<IsoCountryCode> |
+| java.base | java.lang.Comparable<IsoEra> |
+| java.base | java.lang.Comparable<Kind> |
+| java.base | java.lang.Comparable<LinkOption> |
+| java.base | java.lang.Comparable<LocalTime> |
+| java.base | java.lang.Comparable<Location> |
+| java.base | java.lang.Comparable<Long> |
+| java.base | java.lang.Comparable<LongBuffer> |
+| java.base | java.lang.Comparable<Modifier> |
+| java.base | java.lang.Comparable<ModuleDescriptor> |
+| java.base | java.lang.Comparable<Month> |
+| java.base | java.lang.Comparable<OffsetDateTime> |
+| java.base | java.lang.Comparable<OffsetTime> |
+| java.base | java.lang.Comparable<Opens> |
+| java.base | java.lang.Comparable<Path> |
+| java.base | java.lang.Comparable<ProcessHandle> |
+| java.base | java.lang.Comparable<Provides> |
+| java.base | java.lang.Comparable<Requires> |
+| java.base | java.lang.Comparable<ResolverStyle> |
+| java.base | java.lang.Comparable<RetentionPolicy> |
+| java.base | java.lang.Comparable<ShortBuffer> |
+| java.base | java.lang.Comparable<State> |
+| java.base | java.lang.Comparable<String> |
+| java.base | java.lang.Comparable<StringBuffer> |
+| java.base | java.lang.Comparable<StringBuilder> |
+| java.base | java.lang.Comparable<T> |
+| java.base | java.lang.Comparable<TextStyle> |
+| java.base | java.lang.Comparable<TimeDefinition> |
+| java.base | java.lang.Comparable<TimeUnit> |
+| java.base | java.lang.Comparable<Type> |
+| java.base | java.lang.Comparable<URI> |
+| java.base | java.lang.Comparable<Version> |
+| java.base | java.lang.Comparable<ZoneOffset> |
+| java.base | java.lang.Comparable<ZoneOffsetTransition> |
+| java.base | java.lang.Deprecated |
+| java.base | java.lang.Double |
+| java.base | java.lang.E |
+| java.base | java.lang.Enum |
+| java.base | java.lang.Enum$EnumDesc |
+| java.base | java.lang.Enum$EnumDesc<> |
+| java.base | java.lang.Enum$EnumDesc<AccessFlag> |
+| java.base | java.lang.Enum$EnumDesc<AccessMode> |
+| java.base | java.lang.Enum$EnumDesc<CRLReason> |
+| java.base | java.lang.Enum$EnumDesc<Category> |
+| java.base | java.lang.Enum$EnumDesc<Characteristics> |
+| java.base | java.lang.Enum$EnumDesc<ChronoField> |
+| java.base | java.lang.Enum$EnumDesc<ChronoUnit> |
+| java.base | java.lang.Enum$EnumDesc<ClassFileFormatVersion> |
+| java.base | java.lang.Enum$EnumDesc<ClassOption> |
+| java.base | java.lang.Enum$EnumDesc<DayOfWeek> |
+| java.base | java.lang.Enum$EnumDesc<E> |
+| java.base | java.lang.Enum$EnumDesc<ElementType> |
+| java.base | java.lang.Enum$EnumDesc<FilteringMode> |
+| java.base | java.lang.Enum$EnumDesc<FormatStyle> |
+| java.base | java.lang.Enum$EnumDesc<IsoCountryCode> |
+| java.base | java.lang.Enum$EnumDesc<IsoEra> |
+| java.base | java.lang.Enum$EnumDesc<Kind> |
+| java.base | java.lang.Enum$EnumDesc<LinkOption> |
+| java.base | java.lang.Enum$EnumDesc<Location> |
+| java.base | java.lang.Enum$EnumDesc<Modifier> |
+| java.base | java.lang.Enum$EnumDesc<Month> |
+| java.base | java.lang.Enum$EnumDesc<ResolverStyle> |
+| java.base | java.lang.Enum$EnumDesc<RetentionPolicy> |
+| java.base | java.lang.Enum$EnumDesc<State> |
+| java.base | java.lang.Enum$EnumDesc<TextStyle> |
+| java.base | java.lang.Enum$EnumDesc<TimeDefinition> |
+| java.base | java.lang.Enum$EnumDesc<TimeUnit> |
+| java.base | java.lang.Enum$EnumDesc<Type> |
+| java.base | java.lang.Enum<> |
+| java.base | java.lang.Enum<AccessFlag> |
+| java.base | java.lang.Enum<AccessMode> |
+| java.base | java.lang.Enum<CRLReason> |
+| java.base | java.lang.Enum<Category> |
+| java.base | java.lang.Enum<Characteristics> |
+| java.base | java.lang.Enum<ChronoField> |
+| java.base | java.lang.Enum<ChronoUnit> |
+| java.base | java.lang.Enum<ClassFileFormatVersion> |
+| java.base | java.lang.Enum<ClassOption> |
+| java.base | java.lang.Enum<DayOfWeek> |
+| java.base | java.lang.Enum<E> |
+| java.base | java.lang.Enum<ElementType> |
+| java.base | java.lang.Enum<FilteringMode> |
+| java.base | java.lang.Enum<FormatStyle> |
+| java.base | java.lang.Enum<IsoCountryCode> |
+| java.base | java.lang.Enum<IsoEra> |
+| java.base | java.lang.Enum<Kind> |
+| java.base | java.lang.Enum<LinkOption> |
+| java.base | java.lang.Enum<Location> |
+| java.base | java.lang.Enum<Modifier> |
+| java.base | java.lang.Enum<Month> |
+| java.base | java.lang.Enum<ResolverStyle> |
+| java.base | java.lang.Enum<RetentionPolicy> |
+| java.base | java.lang.Enum<State> |
+| java.base | java.lang.Enum<T> |
+| java.base | java.lang.Enum<TextStyle> |
+| java.base | java.lang.Enum<TimeDefinition> |
+| java.base | java.lang.Enum<TimeUnit> |
+| java.base | java.lang.Enum<Type> |
+| java.base | java.lang.Error |
+| java.base | java.lang.Exception |
+| java.base | java.lang.Float |
+| java.base | java.lang.FunctionalInterface |
+| java.base | java.lang.IllegalAccessException |
+| java.base | java.lang.IllegalArgumentException |
+| java.base | java.lang.IllegalStateException |
+| java.base | java.lang.InstantiationException |
+| java.base | java.lang.Integer |
+| java.base | java.lang.InterruptedException |
+| java.base | java.lang.Iterable |
+| java.base | java.lang.Iterable<> |
+| java.base | java.lang.Iterable<? extends Attribute> |
+| java.base | java.lang.Iterable<? extends Callable<T>> |
+| java.base | java.lang.Iterable<? extends Certificate> |
+| java.base | java.lang.Iterable<? extends CharSequence> |
+| java.base | java.lang.Iterable<? extends E> |
+| java.base | java.lang.Iterable<? extends OpenOption> |
+| java.base | java.lang.Iterable<? extends Principal> |
+| java.base | java.lang.Iterable<? extends X509CRLEntry> |
+| java.base | java.lang.Iterable<?> |
+| java.base | java.lang.Iterable<AccessFlag> |
+| java.base | java.lang.Iterable<Attribute> |
+| java.base | java.lang.Iterable<Character> |
+| java.base | java.lang.Iterable<Characteristics> |
+| java.base | java.lang.Iterable<Chronology> |
+| java.base | java.lang.Iterable<Class<?>> |
+| java.base | java.lang.Iterable<ClassDesc> |
+| java.base | java.lang.Iterable<Configuration> |
+| java.base | java.lang.Iterable<ConstantDesc> |
+| java.base | java.lang.Iterable<E> |
+| java.base | java.lang.Iterable<Entry<K,V>> |
+| java.base | java.lang.Iterable<Entry<Object,Object>> |
+| java.base | java.lang.Iterable<Era> |
+| java.base | java.lang.Iterable<Exports> |
+| java.base | java.lang.Iterable<F> |
+| java.base | java.lang.Iterable<FileStore> |
+| java.base | java.lang.Iterable<FileSystemProvider> |
+| java.base | java.lang.Iterable<Future<T>> |
+| java.base | java.lang.Iterable<Integer> |
+| java.base | java.lang.Iterable<InterfaceAddress> |
+| java.base | java.lang.Iterable<K> |
+| java.base | java.lang.Iterable<LanguageRange> |
+| java.base | java.lang.Iterable<List<?>> |
+| java.base | java.lang.Iterable<Locale> |
+| java.base | java.lang.Iterable<Location> |
+| java.base | java.lang.Iterable<MemoryLayout> |
+| java.base | java.lang.Iterable<Modifier> |
+| java.base | java.lang.Iterable<Module> |
+| java.base | java.lang.Iterable<ModuleLayer> |
+| java.base | java.lang.Iterable<ModuleReference> |
+| java.base | java.lang.Iterable<Number> |
+| java.base | java.lang.Iterable<Object> |
+| java.base | java.lang.Iterable<Opens> |
+| java.base | java.lang.Iterable<Path> |
+| java.base | java.lang.Iterable<Principal> |
+| java.base | java.lang.Iterable<Provides> |
+| java.base | java.lang.Iterable<Requires> |
+| java.base | java.lang.Iterable<ResolvedModule> |
+| java.base | java.lang.Iterable<Runnable> |
+| java.base | java.lang.Iterable<Service> |
+| java.base | java.lang.Iterable<String> |
+| java.base | java.lang.Iterable<T> |
+| java.base | java.lang.Iterable<TemporalField> |
+| java.base | java.lang.Iterable<TemporalUnit> |
+| java.base | java.lang.Iterable<V> |
+| java.base | java.lang.Iterable<WatchEvent<?>> |
+| java.base | java.lang.Iterable<ZoneOffset> |
+| java.base | java.lang.Iterable<ZoneOffsetTransition> |
+| java.base | java.lang.Iterable<ZoneOffsetTransitionRule> |
+| java.base | java.lang.LinkageError |
+| java.base | java.lang.Long |
+| java.base | java.lang.Module |
+| java.base | java.lang.ModuleLayer |
+| java.base | java.lang.ModuleLayer$Controller |
+| java.base | java.lang.NamedPackage |
+| java.base | java.lang.NoSuchFieldException |
+| java.base | java.lang.NoSuchMethodException |
+| java.base | java.lang.Number |
+| java.base | java.lang.NumberFormatException |
+| java.base | java.lang.Object |
+| java.base | java.lang.Package |
+| java.base | java.lang.Process |
+| java.base | java.lang.ProcessHandle |
+| java.base | java.lang.ProcessHandle$Info |
+| java.base | java.lang.R |
+| java.base | java.lang.Readable |
+| java.base | java.lang.Record |
+| java.base | java.lang.ReflectiveOperationException |
+| java.base | java.lang.Runnable |
+| java.base | java.lang.Runtime |
+| java.base | java.lang.Runtime$Version |
+| java.base | java.lang.RuntimeException |
+| java.base | java.lang.SafeVarargs |
+| java.base | java.lang.SecurityException |
+| java.base | java.lang.StackTraceElement |
+| java.base | java.lang.String |
+| java.base | java.lang.StringBuffer |
+| java.base | java.lang.StringBuilder |
+| java.base | java.lang.T |
+| java.base | java.lang.Thread |
+| java.base | java.lang.Thread$Builder |
+| java.base | java.lang.Thread$Builder$OfPlatform |
+| java.base | java.lang.Thread$Builder$OfVirtual |
+| java.base | java.lang.Thread$State |
+| java.base | java.lang.Thread$UncaughtExceptionHandler |
+| java.base | java.lang.ThreadBuilders |
+| java.base | java.lang.ThreadBuilders$BaseThreadBuilder |
+| java.base | java.lang.ThreadBuilders$PlatformThreadBuilder |
+| java.base | java.lang.ThreadBuilders$VirtualThreadBuilder |
+| java.base | java.lang.ThreadGroup |
+| java.base | java.lang.Throwable |
+| java.base | java.lang.TypeNotPresentException |
+| java.base | java.lang.U |
+| java.base | java.lang.Void |
+| java.base | java.lang.annotation.Annotation |
+| java.base | java.lang.annotation.Documented |
+| java.base | java.lang.annotation.ElementType |
+| java.base | java.lang.annotation.Retention |
+| java.base | java.lang.annotation.RetentionPolicy |
+| java.base | java.lang.annotation.Target |
+| java.base | java.lang.constant.AsTypeMethodHandleDesc |
+| java.base | java.lang.constant.ClassDesc |
+| java.base | java.lang.constant.Constable |
+| java.base | java.lang.constant.ConstantDesc |
+| java.base | java.lang.constant.DirectMethodHandleDesc |
+| java.base | java.lang.constant.DirectMethodHandleDesc$Kind |
+| java.base | java.lang.constant.DynamicConstantDesc |
+| java.base | java.lang.constant.DynamicConstantDesc<> |
+| java.base | java.lang.constant.DynamicConstantDesc<AccessFlag> |
+| java.base | java.lang.constant.DynamicConstantDesc<AccessMode> |
+| java.base | java.lang.constant.DynamicConstantDesc<Boolean> |
+| java.base | java.lang.constant.DynamicConstantDesc<CRLReason> |
+| java.base | java.lang.constant.DynamicConstantDesc<Category> |
+| java.base | java.lang.constant.DynamicConstantDesc<Character> |
+| java.base | java.lang.constant.DynamicConstantDesc<Characteristics> |
+| java.base | java.lang.constant.DynamicConstantDesc<ChronoField> |
+| java.base | java.lang.constant.DynamicConstantDesc<ChronoUnit> |
+| java.base | java.lang.constant.DynamicConstantDesc<Class<?>> |
+| java.base | java.lang.constant.DynamicConstantDesc<ClassFileFormatVersion> |
+| java.base | java.lang.constant.DynamicConstantDesc<ClassOption> |
+| java.base | java.lang.constant.DynamicConstantDesc<DayOfWeek> |
+| java.base | java.lang.constant.DynamicConstantDesc<E> |
+| java.base | java.lang.constant.DynamicConstantDesc<ElementType> |
+| java.base | java.lang.constant.DynamicConstantDesc<FilteringMode> |
+| java.base | java.lang.constant.DynamicConstantDesc<FormatStyle> |
+| java.base | java.lang.constant.DynamicConstantDesc<IsoCountryCode> |
+| java.base | java.lang.constant.DynamicConstantDesc<IsoEra> |
+| java.base | java.lang.constant.DynamicConstantDesc<Kind> |
+| java.base | java.lang.constant.DynamicConstantDesc<LinkOption> |
+| java.base | java.lang.constant.DynamicConstantDesc<Location> |
+| java.base | java.lang.constant.DynamicConstantDesc<MethodHandle> |
+| java.base | java.lang.constant.DynamicConstantDesc<Modifier> |
+| java.base | java.lang.constant.DynamicConstantDesc<Month> |
+| java.base | java.lang.constant.DynamicConstantDesc<ResolverStyle> |
+| java.base | java.lang.constant.DynamicConstantDesc<RetentionPolicy> |
+| java.base | java.lang.constant.DynamicConstantDesc<State> |
+| java.base | java.lang.constant.DynamicConstantDesc<T> |
+| java.base | java.lang.constant.DynamicConstantDesc<TextStyle> |
+| java.base | java.lang.constant.DynamicConstantDesc<TimeDefinition> |
+| java.base | java.lang.constant.DynamicConstantDesc<TimeUnit> |
+| java.base | java.lang.constant.DynamicConstantDesc<Type> |
+| java.base | java.lang.constant.DynamicConstantDesc<VarHandle> |
+| java.base | java.lang.constant.MethodHandleDesc |
+| java.base | java.lang.constant.MethodTypeDesc |
+| java.base | java.lang.constant.T |
+| java.base | java.lang.foreign.AddressLayout |
+| java.base | java.lang.foreign.Arena |
+| java.base | java.lang.foreign.GroupLayout |
+| java.base | java.lang.foreign.MemoryLayout |
+| java.base | java.lang.foreign.MemoryLayout$PathElement |
+| java.base | java.lang.foreign.MemorySegment |
+| java.base | java.lang.foreign.MemorySegment$Scope |
+| java.base | java.lang.foreign.PaddingLayout |
+| java.base | java.lang.foreign.SegmentAllocator |
+| java.base | java.lang.foreign.SequenceLayout |
+| java.base | java.lang.foreign.StructLayout |
+| java.base | java.lang.foreign.UnionLayout |
+| java.base | java.lang.foreign.ValueLayout |
+| java.base | java.lang.foreign.ValueLayout$OfBoolean |
+| java.base | java.lang.foreign.ValueLayout$OfByte |
+| java.base | java.lang.foreign.ValueLayout$OfChar |
+| java.base | java.lang.foreign.ValueLayout$OfDouble |
+| java.base | java.lang.foreign.ValueLayout$OfFloat |
+| java.base | java.lang.foreign.ValueLayout$OfInt |
+| java.base | java.lang.foreign.ValueLayout$OfLong |
+| java.base | java.lang.foreign.ValueLayout$OfShort |
+| java.base | java.lang.invoke.BoundMethodHandle |
+| java.base | java.lang.invoke.DelegatingMethodHandle |
+| java.base | java.lang.invoke.DirectMethodHandle |
+| java.base | java.lang.invoke.DirectMethodHandle$Accessor |
+| java.base | java.lang.invoke.DirectMethodHandle$Constructor |
+| java.base | java.lang.invoke.DirectMethodHandle$Interface |
+| java.base | java.lang.invoke.DirectMethodHandle$Special |
+| java.base | java.lang.invoke.DirectMethodHandle$StaticAccessor |
+| java.base | java.lang.invoke.F |
+| java.base | java.lang.invoke.IndirectVarHandle |
+| java.base | java.lang.invoke.LambdaForm |
+| java.base | java.lang.invoke.LazyInitializingVarHandle |
+| java.base | java.lang.invoke.M |
+| java.base | java.lang.invoke.MethodHandle |
+| java.base | java.lang.invoke.MethodHandleImpl |
+| java.base | java.lang.invoke.MethodHandleImpl$AsVarargsCollector |
+| java.base | java.lang.invoke.MethodHandleImpl$CountingWrapper |
+| java.base | java.lang.invoke.MethodHandleImpl$IntrinsicMethodHandle |
+| java.base | java.lang.invoke.MethodHandleImpl$WrappedMember |
+| java.base | java.lang.invoke.MethodHandleInfo |
+| java.base | java.lang.invoke.MethodHandles |
+| java.base | java.lang.invoke.MethodHandles$Lookup |
+| java.base | java.lang.invoke.MethodHandles$Lookup$ClassOption |
+| java.base | java.lang.invoke.MethodType |
+| java.base | java.lang.invoke.NativeMethodHandle |
+| java.base | java.lang.invoke.SegmentVarHandle |
+| java.base | java.lang.invoke.T |
+| java.base | java.lang.invoke.TypeDescriptor |
+| java.base | java.lang.invoke.TypeDescriptor$OfField |
+| java.base | java.lang.invoke.TypeDescriptor$OfField<> |
+| java.base | java.lang.invoke.TypeDescriptor$OfField<Class<?>> |
+| java.base | java.lang.invoke.TypeDescriptor$OfField<ClassDesc> |
+| java.base | java.lang.invoke.TypeDescriptor$OfField<F> |
+| java.base | java.lang.invoke.TypeDescriptor$OfMethod |
+| java.base | java.lang.invoke.TypeDescriptor$OfMethod<> |
+| java.base | java.lang.invoke.TypeDescriptor$OfMethod<Class<?>,MethodType> |
+| java.base | java.lang.invoke.TypeDescriptor$OfMethod<ClassDesc,MethodTypeDesc> |
+| java.base | java.lang.invoke.VarForm |
+| java.base | java.lang.invoke.VarHandle |
+| java.base | java.lang.invoke.VarHandle$AccessMode |
+| java.base | java.lang.invoke.VarHandle$VarHandleDesc |
+| java.base | java.lang.invoke.VarHandleBooleans |
+| java.base | java.lang.invoke.VarHandleBooleans$Array |
+| java.base | java.lang.invoke.VarHandleBooleans$FieldInstanceReadOnly |
+| java.base | java.lang.invoke.VarHandleBooleans$FieldInstanceReadWrite |
+| java.base | java.lang.invoke.VarHandleBooleans$FieldStaticReadOnly |
+| java.base | java.lang.invoke.VarHandleBooleans$FieldStaticReadWrite |
+| java.base | java.lang.invoke.VarHandleByteArrayAsChars |
+| java.base | java.lang.invoke.VarHandleByteArrayAsChars$ArrayHandle |
+| java.base | java.lang.invoke.VarHandleByteArrayAsChars$ByteArrayViewVarHandle |
+| java.base | java.lang.invoke.VarHandleByteArrayAsChars$ByteBufferHandle |
+| java.base | java.lang.invoke.VarHandleByteArrayAsDoubles |
+| java.base | java.lang.invoke.VarHandleByteArrayAsDoubles$ArrayHandle |
+| java.base | java.lang.invoke.VarHandleByteArrayAsDoubles$ByteArrayViewVarHandle |
+| java.base | java.lang.invoke.VarHandleByteArrayAsDoubles$ByteBufferHandle |
+| java.base | java.lang.invoke.VarHandleByteArrayAsFloats |
+| java.base | java.lang.invoke.VarHandleByteArrayAsFloats$ArrayHandle |
+| java.base | java.lang.invoke.VarHandleByteArrayAsFloats$ByteArrayViewVarHandle |
+| java.base | java.lang.invoke.VarHandleByteArrayAsFloats$ByteBufferHandle |
+| java.base | java.lang.invoke.VarHandleByteArrayAsInts |
+| java.base | java.lang.invoke.VarHandleByteArrayAsInts$ArrayHandle |
+| java.base | java.lang.invoke.VarHandleByteArrayAsInts$ByteArrayViewVarHandle |
+| java.base | java.lang.invoke.VarHandleByteArrayAsInts$ByteBufferHandle |
+| java.base | java.lang.invoke.VarHandleByteArrayAsLongs |
+| java.base | java.lang.invoke.VarHandleByteArrayAsLongs$ArrayHandle |
+| java.base | java.lang.invoke.VarHandleByteArrayAsLongs$ByteArrayViewVarHandle |
+| java.base | java.lang.invoke.VarHandleByteArrayAsLongs$ByteBufferHandle |
+| java.base | java.lang.invoke.VarHandleByteArrayAsShorts |
+| java.base | java.lang.invoke.VarHandleByteArrayAsShorts$ArrayHandle |
+| java.base | java.lang.invoke.VarHandleByteArrayAsShorts$ByteArrayViewVarHandle |
+| java.base | java.lang.invoke.VarHandleByteArrayAsShorts$ByteBufferHandle |
+| java.base | java.lang.invoke.VarHandleByteArrayBase |
+| java.base | java.lang.invoke.VarHandleBytes |
+| java.base | java.lang.invoke.VarHandleBytes$Array |
+| java.base | java.lang.invoke.VarHandleBytes$FieldInstanceReadOnly |
+| java.base | java.lang.invoke.VarHandleBytes$FieldInstanceReadWrite |
+| java.base | java.lang.invoke.VarHandleBytes$FieldStaticReadOnly |
+| java.base | java.lang.invoke.VarHandleBytes$FieldStaticReadWrite |
+| java.base | java.lang.invoke.VarHandleChars |
+| java.base | java.lang.invoke.VarHandleChars$Array |
+| java.base | java.lang.invoke.VarHandleChars$FieldInstanceReadOnly |
+| java.base | java.lang.invoke.VarHandleChars$FieldInstanceReadWrite |
+| java.base | java.lang.invoke.VarHandleChars$FieldStaticReadOnly |
+| java.base | java.lang.invoke.VarHandleChars$FieldStaticReadWrite |
+| java.base | java.lang.invoke.VarHandleDoubles |
+| java.base | java.lang.invoke.VarHandleDoubles$Array |
+| java.base | java.lang.invoke.VarHandleDoubles$FieldInstanceReadOnly |
+| java.base | java.lang.invoke.VarHandleDoubles$FieldInstanceReadWrite |
+| java.base | java.lang.invoke.VarHandleDoubles$FieldStaticReadOnly |
+| java.base | java.lang.invoke.VarHandleDoubles$FieldStaticReadWrite |
+| java.base | java.lang.invoke.VarHandleFloats |
+| java.base | java.lang.invoke.VarHandleFloats$Array |
+| java.base | java.lang.invoke.VarHandleFloats$FieldInstanceReadOnly |
+| java.base | java.lang.invoke.VarHandleFloats$FieldInstanceReadWrite |
+| java.base | java.lang.invoke.VarHandleFloats$FieldStaticReadOnly |
+| java.base | java.lang.invoke.VarHandleFloats$FieldStaticReadWrite |
+| java.base | java.lang.invoke.VarHandleInts |
+| java.base | java.lang.invoke.VarHandleInts$Array |
+| java.base | java.lang.invoke.VarHandleInts$FieldInstanceReadOnly |
+| java.base | java.lang.invoke.VarHandleInts$FieldInstanceReadWrite |
+| java.base | java.lang.invoke.VarHandleInts$FieldStaticReadOnly |
+| java.base | java.lang.invoke.VarHandleInts$FieldStaticReadWrite |
+| java.base | java.lang.invoke.VarHandleLongs |
+| java.base | java.lang.invoke.VarHandleLongs$Array |
+| java.base | java.lang.invoke.VarHandleLongs$FieldInstanceReadOnly |
+| java.base | java.lang.invoke.VarHandleLongs$FieldInstanceReadWrite |
+| java.base | java.lang.invoke.VarHandleLongs$FieldStaticReadOnly |
+| java.base | java.lang.invoke.VarHandleLongs$FieldStaticReadWrite |
+| java.base | java.lang.invoke.VarHandleReferences |
+| java.base | java.lang.invoke.VarHandleReferences$Array |
+| java.base | java.lang.invoke.VarHandleReferences$FieldInstanceReadOnly |
+| java.base | java.lang.invoke.VarHandleReferences$FieldInstanceReadWrite |
+| java.base | java.lang.invoke.VarHandleReferences$FieldStaticReadOnly |
+| java.base | java.lang.invoke.VarHandleReferences$FieldStaticReadWrite |
+| java.base | java.lang.invoke.VarHandleShorts |
+| java.base | java.lang.invoke.VarHandleShorts$Array |
+| java.base | java.lang.invoke.VarHandleShorts$FieldInstanceReadOnly |
+| java.base | java.lang.invoke.VarHandleShorts$FieldInstanceReadWrite |
+| java.base | java.lang.invoke.VarHandleShorts$FieldStaticReadOnly |
+| java.base | java.lang.invoke.VarHandleShorts$FieldStaticReadWrite |
+| java.base | java.lang.module.Configuration |
+| java.base | java.lang.module.ModuleDescriptor |
+| java.base | java.lang.module.ModuleDescriptor$Builder |
+| java.base | java.lang.module.ModuleDescriptor$Exports |
+| java.base | java.lang.module.ModuleDescriptor$Exports$Modifier |
+| java.base | java.lang.module.ModuleDescriptor$Modifier |
+| java.base | java.lang.module.ModuleDescriptor$Opens |
+| java.base | java.lang.module.ModuleDescriptor$Opens$Modifier |
+| java.base | java.lang.module.ModuleDescriptor$Provides |
+| java.base | java.lang.module.ModuleDescriptor$Requires |
+| java.base | java.lang.module.ModuleDescriptor$Requires$Modifier |
+| java.base | java.lang.module.ModuleDescriptor$Version |
+| java.base | java.lang.module.ModuleFinder |
+| java.base | java.lang.module.ModuleReader |
+| java.base | java.lang.module.ModuleReference |
+| java.base | java.lang.module.ResolvedModule |
+| java.base | java.lang.ref.Cleaner |
+| java.base | java.lang.ref.Cleaner$Cleanable |
+| java.base | java.lang.reflect.AccessFlag |
+| java.base | java.lang.reflect.AccessFlag$Location |
+| java.base | java.lang.reflect.AccessibleObject |
+| java.base | java.lang.reflect.AnnotatedElement |
+| java.base | java.lang.reflect.AnnotatedType |
+| java.base | java.lang.reflect.ClassFileFormatVersion |
+| java.base | java.lang.reflect.Constructor |
+| java.base | java.lang.reflect.Constructor<> |
+| java.base | java.lang.reflect.Constructor<?> |
+| java.base | java.lang.reflect.Constructor<T> |
+| java.base | java.lang.reflect.D |
+| java.base | java.lang.reflect.Executable |
+| java.base | java.lang.reflect.Field |
+| java.base | java.lang.reflect.GenericDeclaration |
+| java.base | java.lang.reflect.InvocationTargetException |
+| java.base | java.lang.reflect.Member |
+| java.base | java.lang.reflect.Method |
+| java.base | java.lang.reflect.Parameter |
+| java.base | java.lang.reflect.RecordComponent |
+| java.base | java.lang.reflect.T |
+| java.base | java.lang.reflect.Type |
+| java.base | java.lang.reflect.TypeVariable |
+| java.base | java.lang.reflect.TypeVariable<> |
+| java.base | java.lang.reflect.TypeVariable<?> |
+| java.base | java.lang.reflect.TypeVariable<Class> |
+| java.base | java.lang.reflect.TypeVariable<Constructor> |
+| java.base | java.lang.reflect.TypeVariable<Method> |
+| java.base | java.math.BigInteger |
+| java.base | java.net.ContentHandler |
+| java.base | java.net.ContentHandlerFactory |
+| java.base | java.net.FileNameMap |
+| java.base | java.net.Inet4Address |
+| java.base | java.net.Inet6Address |
+| java.base | java.net.InetAddress |
+| java.base | java.net.InterfaceAddress |
+| java.base | java.net.MalformedURLException |
+| java.base | java.net.NetworkInterface |
+| java.base | java.net.Proxy |
+| java.base | java.net.Proxy$Type |
+| java.base | java.net.SocketAddress |
+| java.base | java.net.SocketException |
+| java.base | java.net.URI |
+| java.base | java.net.URISyntaxException |
+| java.base | java.net.URL |
+| java.base | java.net.URLConnection |
+| java.base | java.net.URLStreamHandler |
+| java.base | java.net.URLStreamHandlerFactory |
+| java.base | java.net.UnknownHostException |
+| java.base | java.nio.Buffer |
+| java.base | java.nio.ByteBuffer |
+| java.base | java.nio.ByteBufferAsCharBufferB |
+| java.base | java.nio.ByteBufferAsCharBufferL |
+| java.base | java.nio.ByteBufferAsCharBufferRB |
+| java.base | java.nio.ByteBufferAsCharBufferRL |
+| java.base | java.nio.ByteBufferAsDoubleBufferB |
+| java.base | java.nio.ByteBufferAsDoubleBufferL |
+| java.base | java.nio.ByteBufferAsDoubleBufferRB |
+| java.base | java.nio.ByteBufferAsDoubleBufferRL |
+| java.base | java.nio.ByteBufferAsFloatBufferB |
+| java.base | java.nio.ByteBufferAsFloatBufferL |
+| java.base | java.nio.ByteBufferAsFloatBufferRB |
+| java.base | java.nio.ByteBufferAsFloatBufferRL |
+| java.base | java.nio.ByteBufferAsIntBufferB |
+| java.base | java.nio.ByteBufferAsIntBufferL |
+| java.base | java.nio.ByteBufferAsIntBufferRB |
+| java.base | java.nio.ByteBufferAsIntBufferRL |
+| java.base | java.nio.ByteBufferAsLongBufferB |
+| java.base | java.nio.ByteBufferAsLongBufferL |
+| java.base | java.nio.ByteBufferAsLongBufferRB |
+| java.base | java.nio.ByteBufferAsLongBufferRL |
+| java.base | java.nio.ByteBufferAsShortBufferB |
+| java.base | java.nio.ByteBufferAsShortBufferL |
+| java.base | java.nio.ByteBufferAsShortBufferRB |
+| java.base | java.nio.ByteBufferAsShortBufferRL |
+| java.base | java.nio.ByteOrder |
+| java.base | java.nio.CharBuffer |
+| java.base | java.nio.DirectByteBuffer |
+| java.base | java.nio.DirectByteBufferR |
+| java.base | java.nio.DirectCharBufferRS |
+| java.base | java.nio.DirectCharBufferRU |
+| java.base | java.nio.DirectCharBufferS |
+| java.base | java.nio.DirectCharBufferU |
+| java.base | java.nio.DirectDoubleBufferRS |
+| java.base | java.nio.DirectDoubleBufferRU |
+| java.base | java.nio.DirectDoubleBufferS |
+| java.base | java.nio.DirectDoubleBufferU |
+| java.base | java.nio.DirectFloatBufferRS |
+| java.base | java.nio.DirectFloatBufferRU |
+| java.base | java.nio.DirectFloatBufferS |
+| java.base | java.nio.DirectFloatBufferU |
+| java.base | java.nio.DirectIntBufferRS |
+| java.base | java.nio.DirectIntBufferRU |
+| java.base | java.nio.DirectIntBufferS |
+| java.base | java.nio.DirectIntBufferU |
+| java.base | java.nio.DirectLongBufferRS |
+| java.base | java.nio.DirectLongBufferRU |
+| java.base | java.nio.DirectLongBufferS |
+| java.base | java.nio.DirectLongBufferU |
+| java.base | java.nio.DirectShortBufferRS |
+| java.base | java.nio.DirectShortBufferRU |
+| java.base | java.nio.DirectShortBufferS |
+| java.base | java.nio.DirectShortBufferU |
+| java.base | java.nio.DoubleBuffer |
+| java.base | java.nio.FloatBuffer |
+| java.base | java.nio.HeapByteBuffer |
+| java.base | java.nio.HeapByteBufferR |
+| java.base | java.nio.HeapCharBuffer |
+| java.base | java.nio.HeapCharBufferR |
+| java.base | java.nio.HeapDoubleBuffer |
+| java.base | java.nio.HeapDoubleBufferR |
+| java.base | java.nio.HeapFloatBuffer |
+| java.base | java.nio.HeapFloatBufferR |
+| java.base | java.nio.HeapIntBuffer |
+| java.base | java.nio.HeapIntBufferR |
+| java.base | java.nio.HeapLongBuffer |
+| java.base | java.nio.HeapLongBufferR |
+| java.base | java.nio.HeapShortBuffer |
+| java.base | java.nio.HeapShortBufferR |
+| java.base | java.nio.IntBuffer |
+| java.base | java.nio.LongBuffer |
+| java.base | java.nio.MappedByteBuffer |
+| java.base | java.nio.ShortBuffer |
+| java.base | java.nio.StringCharBuffer |
+| java.base | java.nio.channels.A |
+| java.base | java.nio.channels.AsynchronousChannel |
+| java.base | java.nio.channels.AsynchronousCloseException |
+| java.base | java.nio.channels.AsynchronousFileChannel |
+| java.base | java.nio.channels.ByteChannel |
+| java.base | java.nio.channels.Channel |
+| java.base | java.nio.channels.ClosedChannelException |
+| java.base | java.nio.channels.CompletionHandler |
+| java.base | java.nio.channels.CompletionHandler<> |
+| java.base | java.nio.channels.CompletionHandler<FileLock,? super A> |
+| java.base | java.nio.channels.CompletionHandler<Integer,? super A> |
+| java.base | java.nio.channels.FileChannel |
+| java.base | java.nio.channels.FileChannel$MapMode |
+| java.base | java.nio.channels.FileLock |
+| java.base | java.nio.channels.GatheringByteChannel |
+| java.base | java.nio.channels.InterruptibleChannel |
+| java.base | java.nio.channels.ReadableByteChannel |
+| java.base | java.nio.channels.ScatteringByteChannel |
+| java.base | java.nio.channels.SeekableByteChannel |
+| java.base | java.nio.channels.V |
+| java.base | java.nio.channels.WritableByteChannel |
+| java.base | java.nio.channels.spi.AbstractInterruptibleChannel |
+| java.base | java.nio.charset.CharacterCodingException |
+| java.base | java.nio.charset.Charset |
+| java.base | java.nio.charset.CharsetDecoder |
+| java.base | java.nio.charset.CharsetEncoder |
+| java.base | java.nio.charset.CoderResult |
+| java.base | java.nio.charset.CodingErrorAction |
+| java.base | java.nio.file.AccessMode |
+| java.base | java.nio.file.CopyOption |
+| java.base | java.nio.file.DirectoryStream |
+| java.base | java.nio.file.DirectoryStream$Filter |
+| java.base | java.nio.file.DirectoryStream$Filter<? super Path> |
+| java.base | java.nio.file.DirectoryStream<> |
+| java.base | java.nio.file.DirectoryStream<Path> |
+| java.base | java.nio.file.FileStore |
+| java.base | java.nio.file.FileSystem |
+| java.base | java.nio.file.LinkOption |
+| java.base | java.nio.file.OpenOption |
+| java.base | java.nio.file.Path |
+| java.base | java.nio.file.PathMatcher |
+| java.base | java.nio.file.T |
+| java.base | java.nio.file.V |
+| java.base | java.nio.file.WatchEvent |
+| java.base | java.nio.file.WatchEvent$Kind |
+| java.base | java.nio.file.WatchEvent$Kind<> |
+| java.base | java.nio.file.WatchEvent$Kind<?> |
+| java.base | java.nio.file.WatchEvent$Kind<T> |
+| java.base | java.nio.file.WatchEvent$Modifier |
+| java.base | java.nio.file.WatchEvent<?> |
+| java.base | java.nio.file.WatchKey |
+| java.base | java.nio.file.WatchService |
+| java.base | java.nio.file.Watchable |
+| java.base | java.nio.file.attribute.AttributeView |
+| java.base | java.nio.file.attribute.BasicFileAttributes |
+| java.base | java.nio.file.attribute.FileAttribute |
+| java.base | java.nio.file.attribute.FileAttribute<?> |
+| java.base | java.nio.file.attribute.FileAttributeView |
+| java.base | java.nio.file.attribute.FileStoreAttributeView |
+| java.base | java.nio.file.attribute.FileTime |
+| java.base | java.nio.file.attribute.GroupPrincipal |
+| java.base | java.nio.file.attribute.T |
+| java.base | java.nio.file.attribute.UserPrincipal |
+| java.base | java.nio.file.attribute.UserPrincipalLookupService |
+| java.base | java.nio.file.spi.A |
+| java.base | java.nio.file.spi.FileSystemProvider |
+| java.base | java.nio.file.spi.V |
+| java.base | java.security.AccessControlContext |
+| java.base | java.security.AccessControlException |
+| java.base | java.security.AlgorithmParameters |
+| java.base | java.security.AlgorithmParametersSpi |
+| java.base | java.security.AsymmetricKey |
+| java.base | java.security.CodeSigner |
+| java.base | java.security.CodeSource |
+| java.base | java.security.DEREncodable |
+| java.base | java.security.DomainCombiner |
+| java.base | java.security.GeneralSecurityException |
+| java.base | java.security.Guard |
+| java.base | java.security.InvalidAlgorithmParameterException |
+| java.base | java.security.InvalidKeyException |
+| java.base | java.security.Key |
+| java.base | java.security.KeyException |
+| java.base | java.security.KeyPair |
+| java.base | java.security.NoSuchAlgorithmException |
+| java.base | java.security.NoSuchProviderException |
+| java.base | java.security.PEMRecord |
+| java.base | java.security.Permission |
+| java.base | java.security.PermissionCollection |
+| java.base | java.security.Principal |
+| java.base | java.security.PrivateKey |
+| java.base | java.security.PrivilegedAction |
+| java.base | java.security.PrivilegedAction<> |
+| java.base | java.security.PrivilegedAction<T> |
+| java.base | java.security.PrivilegedActionException |
+| java.base | java.security.PrivilegedExceptionAction |
+| java.base | java.security.PrivilegedExceptionAction<> |
+| java.base | java.security.PrivilegedExceptionAction<T> |
+| java.base | java.security.ProtectionDomain |
+| java.base | java.security.Provider |
+| java.base | java.security.Provider$Service |
+| java.base | java.security.PublicKey |
+| java.base | java.security.SecureRandom |
+| java.base | java.security.SecureRandomParameters |
+| java.base | java.security.SecureRandomSpi |
+| java.base | java.security.SignatureException |
+| java.base | java.security.T |
+| java.base | java.security.Timestamp |
+| java.base | java.security.cert.CRL |
+| java.base | java.security.cert.CRLException |
+| java.base | java.security.cert.CRLReason |
+| java.base | java.security.cert.CertPath |
+| java.base | java.security.cert.Certificate |
+| java.base | java.security.cert.CertificateEncodingException |
+| java.base | java.security.cert.CertificateException |
+| java.base | java.security.cert.CertificateExpiredException |
+| java.base | java.security.cert.CertificateNotYetValidException |
+| java.base | java.security.cert.CertificateParsingException |
+| java.base | java.security.cert.X509CRL |
+| java.base | java.security.cert.X509CRLEntry |
+| java.base | java.security.cert.X509Certificate |
+| java.base | java.security.cert.X509Extension |
+| java.base | java.security.spec.AlgorithmParameterSpec |
+| java.base | java.security.spec.EncodedKeySpec |
+| java.base | java.security.spec.InvalidKeySpecException |
+| java.base | java.security.spec.InvalidParameterSpecException |
+| java.base | java.security.spec.KeySpec |
+| java.base | java.security.spec.PKCS8EncodedKeySpec |
+| java.base | java.security.spec.X509EncodedKeySpec |
+| java.base | java.text.AttributedCharacterIterator |
+| java.base | java.text.AttributedCharacterIterator$Attribute |
+| java.base | java.text.CharacterIterator |
+| java.base | java.text.FieldPosition |
+| java.base | java.text.Format |
+| java.base | java.text.Format$Field |
+| java.base | java.text.ParseException |
+| java.base | java.text.ParsePosition |
+| java.base | java.time.Clock |
+| java.base | java.time.DayOfWeek |
+| java.base | java.time.Duration |
+| java.base | java.time.Instant |
+| java.base | java.time.InstantSource |
+| java.base | java.time.LocalDate |
+| java.base | java.time.LocalDateTime |
+| java.base | java.time.LocalTime |
+| java.base | java.time.Month |
+| java.base | java.time.OffsetDateTime |
+| java.base | java.time.OffsetTime |
+| java.base | java.time.Period |
+| java.base | java.time.R |
+| java.base | java.time.ZoneId |
+| java.base | java.time.ZoneOffset |
+| java.base | java.time.ZoneRegion |
+| java.base | java.time.ZonedDateTime |
+| java.base | java.time.chrono.AbstractChronology |
+| java.base | java.time.chrono.ChronoLocalDate |
+| java.base | java.time.chrono.ChronoLocalDateTime |
+| java.base | java.time.chrono.ChronoLocalDateTime<> |
+| java.base | java.time.chrono.ChronoLocalDateTime<? extends ChronoLocalDate> |
+| java.base | java.time.chrono.ChronoLocalDateTime<?> |
+| java.base | java.time.chrono.ChronoLocalDateTime<D> |
+| java.base | java.time.chrono.ChronoLocalDateTime<LocalDate> |
+| java.base | java.time.chrono.ChronoPeriod |
+| java.base | java.time.chrono.ChronoZonedDateTime |
+| java.base | java.time.chrono.ChronoZonedDateTime<> |
+| java.base | java.time.chrono.ChronoZonedDateTime<? extends ChronoLocalDate> |
+| java.base | java.time.chrono.ChronoZonedDateTime<?> |
+| java.base | java.time.chrono.ChronoZonedDateTime<D> |
+| java.base | java.time.chrono.ChronoZonedDateTime<LocalDate> |
+| java.base | java.time.chrono.Chronology |
+| java.base | java.time.chrono.D |
+| java.base | java.time.chrono.Era |
+| java.base | java.time.chrono.IsoChronology |
+| java.base | java.time.chrono.IsoEra |
+| java.base | java.time.chrono.R |
+| java.base | java.time.format.DateTimeFormatter |
+| java.base | java.time.format.DecimalStyle |
+| java.base | java.time.format.FormatStyle |
+| java.base | java.time.format.ResolverStyle |
+| java.base | java.time.format.T |
+| java.base | java.time.format.TextStyle |
+| java.base | java.time.temporal.ChronoField |
+| java.base | java.time.temporal.ChronoUnit |
+| java.base | java.time.temporal.R |
+| java.base | java.time.temporal.Temporal |
+| java.base | java.time.temporal.TemporalAccessor |
+| java.base | java.time.temporal.TemporalAdjuster |
+| java.base | java.time.temporal.TemporalAmount |
+| java.base | java.time.temporal.TemporalField |
+| java.base | java.time.temporal.TemporalQuery |
+| java.base | java.time.temporal.TemporalQuery<> |
+| java.base | java.time.temporal.TemporalQuery<?> |
+| java.base | java.time.temporal.TemporalQuery<Boolean> |
+| java.base | java.time.temporal.TemporalQuery<Period> |
+| java.base | java.time.temporal.TemporalQuery<R> |
+| java.base | java.time.temporal.TemporalQuery<T> |
+| java.base | java.time.temporal.TemporalUnit |
+| java.base | java.time.temporal.ValueRange |
+| java.base | java.time.zone.ZoneOffsetTransition |
+| java.base | java.time.zone.ZoneOffsetTransitionRule |
+| java.base | java.time.zone.ZoneOffsetTransitionRule$TimeDefinition |
+| java.base | java.time.zone.ZoneRules |
+| java.base | java.util.Collection |
+| java.base | java.util.Collection<> |
+| java.base | java.util.Collection<? extends Attribute> |
+| java.base | java.util.Collection<? extends Callable<T>> |
+| java.base | java.util.Collection<? extends Certificate> |
+| java.base | java.util.Collection<? extends E> |
+| java.base | java.util.Collection<? extends OpenOption> |
+| java.base | java.util.Collection<? extends Principal> |
+| java.base | java.util.Collection<? extends X509CRLEntry> |
+| java.base | java.util.Collection<?> |
+| java.base | java.util.Collection<AccessFlag> |
+| java.base | java.util.Collection<Attribute> |
+| java.base | java.util.Collection<Character> |
+| java.base | java.util.Collection<Characteristics> |
+| java.base | java.util.Collection<Chronology> |
+| java.base | java.util.Collection<Class<?>> |
+| java.base | java.util.Collection<ClassDesc> |
+| java.base | java.util.Collection<Configuration> |
+| java.base | java.util.Collection<ConstantDesc> |
+| java.base | java.util.Collection<E> |
+| java.base | java.util.Collection<Entry<K,V>> |
+| java.base | java.util.Collection<Entry<Object,Object>> |
+| java.base | java.util.Collection<Era> |
+| java.base | java.util.Collection<Exports> |
+| java.base | java.util.Collection<F> |
+| java.base | java.util.Collection<FileSystemProvider> |
+| java.base | java.util.Collection<Future<T>> |
+| java.base | java.util.Collection<Integer> |
+| java.base | java.util.Collection<InterfaceAddress> |
+| java.base | java.util.Collection<K> |
+| java.base | java.util.Collection<LanguageRange> |
+| java.base | java.util.Collection<List<?>> |
+| java.base | java.util.Collection<Locale> |
+| java.base | java.util.Collection<Location> |
+| java.base | java.util.Collection<MemoryLayout> |
+| java.base | java.util.Collection<Modifier> |
+| java.base | java.util.Collection<Module> |
+| java.base | java.util.Collection<ModuleLayer> |
+| java.base | java.util.Collection<ModuleReference> |
+| java.base | java.util.Collection<Number> |
+| java.base | java.util.Collection<Object> |
+| java.base | java.util.Collection<Opens> |
+| java.base | java.util.Collection<Principal> |
+| java.base | java.util.Collection<Provides> |
+| java.base | java.util.Collection<Requires> |
+| java.base | java.util.Collection<ResolvedModule> |
+| java.base | java.util.Collection<Runnable> |
+| java.base | java.util.Collection<Service> |
+| java.base | java.util.Collection<String> |
+| java.base | java.util.Collection<T> |
+| java.base | java.util.Collection<TemporalField> |
+| java.base | java.util.Collection<TemporalUnit> |
+| java.base | java.util.Collection<V> |
+| java.base | java.util.Collection<WatchEvent<?>> |
+| java.base | java.util.Collection<ZoneOffset> |
+| java.base | java.util.Collection<ZoneOffsetTransition> |
+| java.base | java.util.Collection<ZoneOffsetTransitionRule> |
+| java.base | java.util.Comparator |
+| java.base | java.util.Comparator<> |
+| java.base | java.util.Comparator<? super Double> |
+| java.base | java.util.Comparator<? super E> |
+| java.base | java.util.Comparator<? super Integer> |
+| java.base | java.util.Comparator<? super K> |
+| java.base | java.util.Comparator<? super Long> |
+| java.base | java.util.Comparator<? super T> |
+| java.base | java.util.Comparator<? super U> |
+| java.base | java.util.Comparator<? super V> |
+| java.base | java.util.Comparator<ChronoLocalDate> |
+| java.base | java.util.Comparator<ChronoLocalDateTime<?>> |
+| java.base | java.util.Comparator<ChronoZonedDateTime<?>> |
+| java.base | java.util.Comparator<Entry<K,V>> |
+| java.base | java.util.Comparator<OffsetDateTime> |
+| java.base | java.util.Comparator<String> |
+| java.base | java.util.Comparator<T> |
+| java.base | java.util.Date |
+| java.base | java.util.Dictionary |
+| java.base | java.util.Dictionary<K,V> |
+| java.base | java.util.Dictionary<Object,Object> |
+| java.base | java.util.DoubleSummaryStatistics |
+| java.base | java.util.E |
+| java.base | java.util.Enumeration |
+| java.base | java.util.Enumeration<> |
+| java.base | java.util.Enumeration<?> |
+| java.base | java.util.Enumeration<InetAddress> |
+| java.base | java.util.Enumeration<K> |
+| java.base | java.util.Enumeration<NetworkInterface> |
+| java.base | java.util.Enumeration<Object> |
+| java.base | java.util.Enumeration<Permission> |
+| java.base | java.util.Enumeration<URL> |
+| java.base | java.util.Enumeration<V> |
+| java.base | java.util.Hashtable |
+| java.base | java.util.Hashtable<Object,Object> |
+| java.base | java.util.IntSummaryStatistics |
+| java.base | java.util.InvalidPropertiesFormatException |
+| java.base | java.util.Iterator |
+| java.base | java.util.Iterator<> |
+| java.base | java.util.Iterator<Double> |
+| java.base | java.util.Iterator<E> |
+| java.base | java.util.Iterator<Integer> |
+| java.base | java.util.Iterator<Long> |
+| java.base | java.util.Iterator<Path> |
+| java.base | java.util.Iterator<String> |
+| java.base | java.util.Iterator<T> |
+| java.base | java.util.K |
+| java.base | java.util.List |
+| java.base | java.util.List<> |
+| java.base | java.util.List<? extends Certificate> |
+| java.base | java.util.List<?> |
+| java.base | java.util.List<Class<?>> |
+| java.base | java.util.List<ClassDesc> |
+| java.base | java.util.List<Configuration> |
+| java.base | java.util.List<ConstantDesc> |
+| java.base | java.util.List<E> |
+| java.base | java.util.List<Era> |
+| java.base | java.util.List<F> |
+| java.base | java.util.List<FileSystemProvider> |
+| java.base | java.util.List<Future<T>> |
+| java.base | java.util.List<Integer> |
+| java.base | java.util.List<InterfaceAddress> |
+| java.base | java.util.List<LanguageRange> |
+| java.base | java.util.List<Locale> |
+| java.base | java.util.List<MemoryLayout> |
+| java.base | java.util.List<ModuleLayer> |
+| java.base | java.util.List<Number> |
+| java.base | java.util.List<Runnable> |
+| java.base | java.util.List<String> |
+| java.base | java.util.List<T> |
+| java.base | java.util.List<TemporalUnit> |
+| java.base | java.util.List<WatchEvent<?>> |
+| java.base | java.util.List<ZoneOffset> |
+| java.base | java.util.List<ZoneOffsetTransition> |
+| java.base | java.util.List<ZoneOffsetTransitionRule> |
+| java.base | java.util.ListIterator |
+| java.base | java.util.ListIterator<> |
+| java.base | java.util.ListIterator<E> |
+| java.base | java.util.Locale |
+| java.base | java.util.Locale$Category |
+| java.base | java.util.Locale$FilteringMode |
+| java.base | java.util.Locale$IsoCountryCode |
+| java.base | java.util.Locale$IsoCountryCode$1 |
+| java.base | java.util.Locale$IsoCountryCode$2 |
+| java.base | java.util.Locale$IsoCountryCode$3 |
+| java.base | java.util.Locale$LanguageRange |
+| java.base | java.util.LongSummaryStatistics |
+| java.base | java.util.Map |
+| java.base | java.util.Map$Entry |
+| java.base | java.util.Map$Entry<> |
+| java.base | java.util.Map$Entry<? extends K,? extends V> |
+| java.base | java.util.Map$Entry<K,V> |
+| java.base | java.util.Map$Entry<Object,Object> |
+| java.base | java.util.Map<> |
+| java.base | java.util.Map<? extends K,? extends V> |
+| java.base | java.util.Map<? extends Object,? extends Object> |
+| java.base | java.util.Map<?,?> |
+| java.base | java.util.Map<Attribute,Object> |
+| java.base | java.util.Map<K,V> |
+| java.base | java.util.Map<Object,Object> |
+| java.base | java.util.Map<String,?> |
+| java.base | java.util.Map<String,Charset> |
+| java.base | java.util.Map<String,List<String>> |
+| java.base | java.util.Map<String,Object> |
+| java.base | java.util.Map<String,String> |
+| java.base | java.util.Map<TemporalField,Long> |
+| java.base | java.util.Map<Thread,StackTraceElement[]> |
+| java.base | java.util.MissingResourceException |
+| java.base | java.util.Optional |
+| java.base | java.util.Optional<> |
+| java.base | java.util.Optional<? extends ConstantDesc> |
+| java.base | java.util.Optional<? extends T> |
+| java.base | java.util.Optional<? extends U> |
+| java.base | java.util.Optional<ByteBuffer> |
+| java.base | java.util.Optional<ClassDesc> |
+| java.base | java.util.Optional<Double> |
+| java.base | java.util.Optional<Duration> |
+| java.base | java.util.Optional<DynamicConstantDesc<Boolean>> |
+| java.base | java.util.Optional<DynamicConstantDesc<Character>> |
+| java.base | java.util.Optional<EnumDesc<AccessFlag>> |
+| java.base | java.util.Optional<EnumDesc<AccessMode>> |
+| java.base | java.util.Optional<EnumDesc<CRLReason>> |
+| java.base | java.util.Optional<EnumDesc<Category>> |
+| java.base | java.util.Optional<EnumDesc<Characteristics>> |
+| java.base | java.util.Optional<EnumDesc<ChronoField>> |
+| java.base | java.util.Optional<EnumDesc<ChronoUnit>> |
+| java.base | java.util.Optional<EnumDesc<ClassFileFormatVersion>> |
+| java.base | java.util.Optional<EnumDesc<ClassOption>> |
+| java.base | java.util.Optional<EnumDesc<DayOfWeek>> |
+| java.base | java.util.Optional<EnumDesc<E>> |
+| java.base | java.util.Optional<EnumDesc<ElementType>> |
+| java.base | java.util.Optional<EnumDesc<FilteringMode>> |
+| java.base | java.util.Optional<EnumDesc<FormatStyle>> |
+| java.base | java.util.Optional<EnumDesc<IsoCountryCode>> |
+| java.base | java.util.Optional<EnumDesc<IsoEra>> |
+| java.base | java.util.Optional<EnumDesc<Kind>> |
+| java.base | java.util.Optional<EnumDesc<LinkOption>> |
+| java.base | java.util.Optional<EnumDesc<Location>> |
+| java.base | java.util.Optional<EnumDesc<Modifier>> |
+| java.base | java.util.Optional<EnumDesc<Month>> |
+| java.base | java.util.Optional<EnumDesc<ResolverStyle>> |
+| java.base | java.util.Optional<EnumDesc<RetentionPolicy>> |
+| java.base | java.util.Optional<EnumDesc<State>> |
+| java.base | java.util.Optional<EnumDesc<TextStyle>> |
+| java.base | java.util.Optional<EnumDesc<TimeDefinition>> |
+| java.base | java.util.Optional<EnumDesc<TimeUnit>> |
+| java.base | java.util.Optional<EnumDesc<Type>> |
+| java.base | java.util.Optional<Float> |
+| java.base | java.util.Optional<InputStream> |
+| java.base | java.util.Optional<Instant> |
+| java.base | java.util.Optional<Integer> |
+| java.base | java.util.Optional<Long> |
+| java.base | java.util.Optional<MemoryLayout> |
+| java.base | java.util.Optional<MemorySegment> |
+| java.base | java.util.Optional<MethodHandleDesc> |
+| java.base | java.util.Optional<MethodTypeDesc> |
+| java.base | java.util.Optional<Module> |
+| java.base | java.util.Optional<ModuleReference> |
+| java.base | java.util.Optional<Object> |
+| java.base | java.util.Optional<ProcessHandle> |
+| java.base | java.util.Optional<ResolvedModule> |
+| java.base | java.util.Optional<String> |
+| java.base | java.util.Optional<String[]> |
+| java.base | java.util.Optional<T> |
+| java.base | java.util.Optional<U> |
+| java.base | java.util.Optional<URI> |
+| java.base | java.util.Optional<VarHandleDesc> |
+| java.base | java.util.Optional<Version> |
+| java.base | java.util.OptionalDouble |
+| java.base | java.util.OptionalInt |
+| java.base | java.util.OptionalLong |
+| java.base | java.util.PrimitiveIterator |
+| java.base | java.util.PrimitiveIterator$OfDouble |
+| java.base | java.util.PrimitiveIterator$OfInt |
+| java.base | java.util.PrimitiveIterator$OfLong |
+| java.base | java.util.PrimitiveIterator<Double,DoubleConsumer> |
+| java.base | java.util.PrimitiveIterator<Integer,IntConsumer> |
+| java.base | java.util.PrimitiveIterator<Long,LongConsumer> |
+| java.base | java.util.Properties |
+| java.base | java.util.Random |
+| java.base | java.util.SequencedCollection |
+| java.base | java.util.SequencedCollection<> |
+| java.base | java.util.SequencedCollection<? extends Certificate> |
+| java.base | java.util.SequencedCollection<?> |
+| java.base | java.util.SequencedCollection<Class<?>> |
+| java.base | java.util.SequencedCollection<ClassDesc> |
+| java.base | java.util.SequencedCollection<Configuration> |
+| java.base | java.util.SequencedCollection<ConstantDesc> |
+| java.base | java.util.SequencedCollection<E> |
+| java.base | java.util.SequencedCollection<Entry<K,V>> |
+| java.base | java.util.SequencedCollection<Era> |
+| java.base | java.util.SequencedCollection<F> |
+| java.base | java.util.SequencedCollection<FileSystemProvider> |
+| java.base | java.util.SequencedCollection<Future<T>> |
+| java.base | java.util.SequencedCollection<Integer> |
+| java.base | java.util.SequencedCollection<InterfaceAddress> |
+| java.base | java.util.SequencedCollection<K> |
+| java.base | java.util.SequencedCollection<LanguageRange> |
+| java.base | java.util.SequencedCollection<Locale> |
+| java.base | java.util.SequencedCollection<MemoryLayout> |
+| java.base | java.util.SequencedCollection<ModuleLayer> |
+| java.base | java.util.SequencedCollection<Number> |
+| java.base | java.util.SequencedCollection<Runnable> |
+| java.base | java.util.SequencedCollection<String> |
+| java.base | java.util.SequencedCollection<T> |
+| java.base | java.util.SequencedCollection<TemporalUnit> |
+| java.base | java.util.SequencedCollection<V> |
+| java.base | java.util.SequencedCollection<WatchEvent<?>> |
+| java.base | java.util.SequencedCollection<ZoneOffset> |
+| java.base | java.util.SequencedCollection<ZoneOffsetTransition> |
+| java.base | java.util.SequencedCollection<ZoneOffsetTransitionRule> |
+| java.base | java.util.SequencedMap |
+| java.base | java.util.SequencedMap<> |
+| java.base | java.util.SequencedMap<K,V> |
+| java.base | java.util.SequencedMap<String,Charset> |
+| java.base | java.util.SequencedSet |
+| java.base | java.util.SequencedSet<> |
+| java.base | java.util.SequencedSet<Entry<K,V>> |
+| java.base | java.util.SequencedSet<K> |
+| java.base | java.util.Set |
+| java.base | java.util.Set<> |
+| java.base | java.util.Set<? extends Attribute> |
+| java.base | java.util.Set<? extends OpenOption> |
+| java.base | java.util.Set<? extends Principal> |
+| java.base | java.util.Set<? extends X509CRLEntry> |
+| java.base | java.util.Set<?> |
+| java.base | java.util.Set<AccessFlag> |
+| java.base | java.util.Set<Attribute> |
+| java.base | java.util.Set<Character> |
+| java.base | java.util.Set<Characteristics> |
+| java.base | java.util.Set<Chronology> |
+| java.base | java.util.Set<E> |
+| java.base | java.util.Set<Entry<K,V>> |
+| java.base | java.util.Set<Entry<Object,Object>> |
+| java.base | java.util.Set<Exports> |
+| java.base | java.util.Set<K> |
+| java.base | java.util.Set<Locale> |
+| java.base | java.util.Set<Location> |
+| java.base | java.util.Set<Modifier> |
+| java.base | java.util.Set<Module> |
+| java.base | java.util.Set<ModuleReference> |
+| java.base | java.util.Set<Object> |
+| java.base | java.util.Set<Opens> |
+| java.base | java.util.Set<Principal> |
+| java.base | java.util.Set<Provides> |
+| java.base | java.util.Set<Requires> |
+| java.base | java.util.Set<ResolvedModule> |
+| java.base | java.util.Set<Service> |
+| java.base | java.util.Set<String> |
+| java.base | java.util.Set<T> |
+| java.base | java.util.Set<TemporalField> |
+| java.base | java.util.SortedMap |
+| java.base | java.util.SortedMap<> |
+| java.base | java.util.SortedMap<String,Charset> |
+| java.base | java.util.Spliterator |
+| java.base | java.util.Spliterator$OfDouble |
+| java.base | java.util.Spliterator$OfInt |
+| java.base | java.util.Spliterator$OfLong |
+| java.base | java.util.Spliterator$OfPrimitive |
+| java.base | java.util.Spliterator$OfPrimitive<> |
+| java.base | java.util.Spliterator$OfPrimitive<Double,DoubleConsumer,OfDouble> |
+| java.base | java.util.Spliterator$OfPrimitive<Integer,IntConsumer,OfInt> |
+| java.base | java.util.Spliterator$OfPrimitive<Long,LongConsumer,OfLong> |
+| java.base | java.util.Spliterator<> |
+| java.base | java.util.Spliterator<Double> |
+| java.base | java.util.Spliterator<E> |
+| java.base | java.util.Spliterator<Integer> |
+| java.base | java.util.Spliterator<Long> |
+| java.base | java.util.Spliterator<MemorySegment> |
+| java.base | java.util.Spliterator<Path> |
+| java.base | java.util.Spliterator<T> |
+| java.base | java.util.T |
+| java.base | java.util.T_CONS |
+| java.base | java.util.T_SPLITR |
+| java.base | java.util.U |
+| java.base | java.util.V |
+| java.base | java.util.X |
+| java.base | java.util.concurrent.Callable |
+| java.base | java.util.concurrent.Callable<> |
+| java.base | java.util.concurrent.Callable<T> |
+| java.base | java.util.concurrent.CompletableFuture |
+| java.base | java.util.concurrent.CompletableFuture<> |
+| java.base | java.util.concurrent.CompletableFuture<?> |
+| java.base | java.util.concurrent.CompletableFuture<Object> |
+| java.base | java.util.concurrent.CompletableFuture<Process> |
+| java.base | java.util.concurrent.CompletableFuture<ProcessHandle> |
+| java.base | java.util.concurrent.CompletableFuture<T> |
+| java.base | java.util.concurrent.CompletableFuture<U> |
+| java.base | java.util.concurrent.CompletableFuture<V> |
+| java.base | java.util.concurrent.CompletableFuture<Void> |
+| java.base | java.util.concurrent.CompletionException |
+| java.base | java.util.concurrent.CompletionStage |
+| java.base | java.util.concurrent.CompletionStage<> |
+| java.base | java.util.concurrent.CompletionStage<? extends T> |
+| java.base | java.util.concurrent.CompletionStage<? extends U> |
+| java.base | java.util.concurrent.CompletionStage<?> |
+| java.base | java.util.concurrent.CompletionStage<Object> |
+| java.base | java.util.concurrent.CompletionStage<Process> |
+| java.base | java.util.concurrent.CompletionStage<ProcessHandle> |
+| java.base | java.util.concurrent.CompletionStage<T> |
+| java.base | java.util.concurrent.CompletionStage<U> |
+| java.base | java.util.concurrent.CompletionStage<V> |
+| java.base | java.util.concurrent.CompletionStage<Void> |
+| java.base | java.util.concurrent.ExecutionException |
+| java.base | java.util.concurrent.Executor |
+| java.base | java.util.concurrent.ExecutorService |
+| java.base | java.util.concurrent.Future |
+| java.base | java.util.concurrent.Future$State |
+| java.base | java.util.concurrent.Future<> |
+| java.base | java.util.concurrent.Future<?> |
+| java.base | java.util.concurrent.Future<FileLock> |
+| java.base | java.util.concurrent.Future<Integer> |
+| java.base | java.util.concurrent.Future<Object> |
+| java.base | java.util.concurrent.Future<Process> |
+| java.base | java.util.concurrent.Future<ProcessHandle> |
+| java.base | java.util.concurrent.Future<T> |
+| java.base | java.util.concurrent.Future<U> |
+| java.base | java.util.concurrent.Future<V> |
+| java.base | java.util.concurrent.Future<Void> |
+| java.base | java.util.concurrent.T |
+| java.base | java.util.concurrent.ThreadFactory |
+| java.base | java.util.concurrent.TimeUnit |
+| java.base | java.util.concurrent.TimeoutException |
+| java.base | java.util.concurrent.U |
+| java.base | java.util.concurrent.V |
+| java.base | java.util.function.BiConsumer |
+| java.base | java.util.function.BiConsumer<> |
+| java.base | java.util.function.BiConsumer<? super K,? super V> |
+| java.base | java.util.function.BiConsumer<? super Object,? super Object> |
+| java.base | java.util.function.BiConsumer<? super T,? super Consumer<R>> |
+| java.base | java.util.function.BiConsumer<? super T,? super DoubleConsumer> |
+| java.base | java.util.function.BiConsumer<? super T,? super IntConsumer> |
+| java.base | java.util.function.BiConsumer<? super T,? super LongConsumer> |
+| java.base | java.util.function.BiConsumer<? super T,? super Throwable> |
+| java.base | java.util.function.BiConsumer<? super T,? super U> |
+| java.base | java.util.function.BiConsumer<A,Downstream<? super R>> |
+| java.base | java.util.function.BiConsumer<A,T> |
+| java.base | java.util.function.BiConsumer<R,? super T> |
+| java.base | java.util.function.BiConsumer<R,R> |
+| java.base | java.util.function.BiConsumer<R,T> |
+| java.base | java.util.function.BiConsumer<Void,Downstream<? super R>> |
+| java.base | java.util.function.BiFunction |
+| java.base | java.util.function.BiFunction<> |
+| java.base | java.util.function.BiFunction<? super K,? super V,? extends V> |
+| java.base | java.util.function.BiFunction<? super Object,? super Object,? extends Object> |
+| java.base | java.util.function.BiFunction<? super Object,? super Object,?> |
+| java.base | java.util.function.BiFunction<? super T,? super U,? extends V> |
+| java.base | java.util.function.BiFunction<? super T,Throwable,? extends U> |
+| java.base | java.util.function.BiFunction<? super V,? super V,? extends V> |
+| java.base | java.util.function.BiFunction<A,A,A> |
+| java.base | java.util.function.BiFunction<R,R,R> |
+| java.base | java.util.function.BiFunction<String,List<Number>,RuntimeException> |
+| java.base | java.util.function.BiFunction<String,List<Number>,V> |
+| java.base | java.util.function.BiFunction<T,T,T> |
+| java.base | java.util.function.BiFunction<T,T,V> |
+| java.base | java.util.function.BiFunction<T,U,V> |
+| java.base | java.util.function.BiFunction<U,? super T,U> |
+| java.base | java.util.function.BiFunction<U,U,U> |
+| java.base | java.util.function.BinaryOperator |
+| java.base | java.util.function.BinaryOperator<> |
+| java.base | java.util.function.BinaryOperator<A> |
+| java.base | java.util.function.BinaryOperator<R> |
+| java.base | java.util.function.BinaryOperator<T> |
+| java.base | java.util.function.BinaryOperator<U> |
+| java.base | java.util.function.Consumer |
+| java.base | java.util.function.Consumer<> |
+| java.base | java.util.function.Consumer<? super Double> |
+| java.base | java.util.function.Consumer<? super E> |
+| java.base | java.util.function.Consumer<? super Integer> |
+| java.base | java.util.function.Consumer<? super Long> |
+| java.base | java.util.function.Consumer<? super Path> |
+| java.base | java.util.function.Consumer<? super T> |
+| java.base | java.util.function.Consumer<MemorySegment> |
+| java.base | java.util.function.Consumer<R> |
+| java.base | java.util.function.Consumer<T> |
+| java.base | java.util.function.DoubleBinaryOperator |
+| java.base | java.util.function.DoubleConsumer |
+| java.base | java.util.function.DoubleFunction |
+| java.base | java.util.function.DoubleFunction<> |
+| java.base | java.util.function.DoubleFunction<? extends DoubleStream> |
+| java.base | java.util.function.DoubleFunction<? extends U> |
+| java.base | java.util.function.DoublePredicate |
+| java.base | java.util.function.DoubleSupplier |
+| java.base | java.util.function.DoubleToIntFunction |
+| java.base | java.util.function.DoubleToLongFunction |
+| java.base | java.util.function.DoubleUnaryOperator |
+| java.base | java.util.function.Function |
+| java.base | java.util.function.Function<> |
+| java.base | java.util.function.Function<? super K,? extends V> |
+| java.base | java.util.function.Function<? super LayoutPath,? extends V> |
+| java.base | java.util.function.Function<? super Object,? extends Object> |
+| java.base | java.util.function.Function<? super Object,?> |
+| java.base | java.util.function.Function<? super R,? extends V> |
+| java.base | java.util.function.Function<? super RuntimeException,? extends V> |
+| java.base | java.util.function.Function<? super String,? extends R> |
+| java.base | java.util.function.Function<? super T,? extends CompletionStage<U>> |
+| java.base | java.util.function.Function<? super T,? extends DoubleStream> |
+| java.base | java.util.function.Function<? super T,? extends IntStream> |
+| java.base | java.util.function.Function<? super T,? extends LongStream> |
+| java.base | java.util.function.Function<? super T,? extends Optional<? extends U>> |
+| java.base | java.util.function.Function<? super T,? extends R> |
+| java.base | java.util.function.Function<? super T,? extends Stream<? extends R>> |
+| java.base | java.util.function.Function<? super T,? extends U> |
+| java.base | java.util.function.Function<? super T,? extends V> |
+| java.base | java.util.function.Function<? super T,U> |
+| java.base | java.util.function.Function<? super V,? extends LayoutPath> |
+| java.base | java.util.function.Function<? super V,? extends T> |
+| java.base | java.util.function.Function<A,R> |
+| java.base | java.util.function.Function<E,E> |
+| java.base | java.util.function.Function<LayoutPath,LayoutPath> |
+| java.base | java.util.function.Function<LayoutPath,V> |
+| java.base | java.util.function.Function<String,ClassLoader> |
+| java.base | java.util.function.Function<T,T> |
+| java.base | java.util.function.Function<T,V> |
+| java.base | java.util.function.Function<Throwable,? extends CompletionStage<T>> |
+| java.base | java.util.function.Function<Throwable,? extends CompletionStage> |
+| java.base | java.util.function.Function<Throwable,? extends T> |
+| java.base | java.util.function.Function<V,LayoutPath> |
+| java.base | java.util.function.Function<V,R> |
+| java.base | java.util.function.Function<V,T> |
+| java.base | java.util.function.IntBinaryOperator |
+| java.base | java.util.function.IntConsumer |
+| java.base | java.util.function.IntFunction |
+| java.base | java.util.function.IntFunction<> |
+| java.base | java.util.function.IntFunction<? extends IntStream> |
+| java.base | java.util.function.IntFunction<? extends U> |
+| java.base | java.util.function.IntFunction<A[]> |
+| java.base | java.util.function.IntFunction<T[]> |
+| java.base | java.util.function.IntPredicate |
+| java.base | java.util.function.IntSupplier |
+| java.base | java.util.function.IntToDoubleFunction |
+| java.base | java.util.function.IntToLongFunction |
+| java.base | java.util.function.IntUnaryOperator |
+| java.base | java.util.function.LongBinaryOperator |
+| java.base | java.util.function.LongConsumer |
+| java.base | java.util.function.LongFunction |
+| java.base | java.util.function.LongFunction<> |
+| java.base | java.util.function.LongFunction<? extends LongStream> |
+| java.base | java.util.function.LongFunction<? extends U> |
+| java.base | java.util.function.LongPredicate |
+| java.base | java.util.function.LongSupplier |
+| java.base | java.util.function.LongToDoubleFunction |
+| java.base | java.util.function.LongToIntFunction |
+| java.base | java.util.function.LongUnaryOperator |
+| java.base | java.util.function.ObjDoubleConsumer |
+| java.base | java.util.function.ObjDoubleConsumer<> |
+| java.base | java.util.function.ObjDoubleConsumer<R> |
+| java.base | java.util.function.ObjIntConsumer |
+| java.base | java.util.function.ObjIntConsumer<> |
+| java.base | java.util.function.ObjIntConsumer<R> |
+| java.base | java.util.function.ObjLongConsumer |
+| java.base | java.util.function.ObjLongConsumer<> |
+| java.base | java.util.function.ObjLongConsumer<R> |
+| java.base | java.util.function.Predicate |
+| java.base | java.util.function.Predicate<> |
+| java.base | java.util.function.Predicate<? super E> |
+| java.base | java.util.function.Predicate<? super T> |
+| java.base | java.util.function.Predicate<T> |
+| java.base | java.util.function.R |
+| java.base | java.util.function.Supplier |
+| java.base | java.util.function.Supplier<> |
+| java.base | java.util.function.Supplier<? extends Optional<? extends T>> |
+| java.base | java.util.function.Supplier<? extends T> |
+| java.base | java.util.function.Supplier<? extends X> |
+| java.base | java.util.function.Supplier<A> |
+| java.base | java.util.function.Supplier<R> |
+| java.base | java.util.function.Supplier<Set<String>> |
+| java.base | java.util.function.Supplier<U> |
+| java.base | java.util.function.T |
+| java.base | java.util.function.ToDoubleFunction |
+| java.base | java.util.function.ToDoubleFunction<> |
+| java.base | java.util.function.ToDoubleFunction<? super T> |
+| java.base | java.util.function.ToIntFunction |
+| java.base | java.util.function.ToIntFunction<> |
+| java.base | java.util.function.ToIntFunction<? super T> |
+| java.base | java.util.function.ToLongFunction |
+| java.base | java.util.function.ToLongFunction<> |
+| java.base | java.util.function.ToLongFunction<? super T> |
+| java.base | java.util.function.U |
+| java.base | java.util.function.UnaryOperator |
+| java.base | java.util.function.UnaryOperator<> |
+| java.base | java.util.function.UnaryOperator<E> |
+| java.base | java.util.function.UnaryOperator<LayoutPath> |
+| java.base | java.util.function.UnaryOperator<T> |
+| java.base | java.util.function.V |
+| java.base | java.util.random.RandomGenerator |
+| java.base | java.util.stream.A |
+| java.base | java.util.stream.BaseStream |
+| java.base | java.util.stream.BaseStream<> |
+| java.base | java.util.stream.BaseStream<? extends R,Stream<? extends R>> |
+| java.base | java.util.stream.BaseStream<? extends T,Stream<? extends T>> |
+| java.base | java.util.stream.BaseStream<Double,DoubleStream> |
+| java.base | java.util.stream.BaseStream<Double,Stream<Double>> |
+| java.base | java.util.stream.BaseStream<E,Stream<E>> |
+| java.base | java.util.stream.BaseStream<InetAddress,Stream<InetAddress>> |
+| java.base | java.util.stream.BaseStream<Integer,IntStream> |
+| java.base | java.util.stream.BaseStream<Integer,Stream<Integer>> |
+| java.base | java.util.stream.BaseStream<LocalDate,Stream<LocalDate>> |
+| java.base | java.util.stream.BaseStream<Locale,Stream<Locale>> |
+| java.base | java.util.stream.BaseStream<Long,LongStream> |
+| java.base | java.util.stream.BaseStream<Long,Stream<Long>> |
+| java.base | java.util.stream.BaseStream<MemorySegment,Stream<MemorySegment>> |
+| java.base | java.util.stream.BaseStream<NetworkInterface,Stream<NetworkInterface>> |
+| java.base | java.util.stream.BaseStream<Permission,Stream<Permission>> |
+| java.base | java.util.stream.BaseStream<ProcessHandle,Stream<ProcessHandle>> |
+| java.base | java.util.stream.BaseStream<R,Stream<R>> |
+| java.base | java.util.stream.BaseStream<String,Stream<String>> |
+| java.base | java.util.stream.BaseStream<T,Stream<T>> |
+| java.base | java.util.stream.BaseStream<T,Stream> |
+| java.base | java.util.stream.BaseStream<U,Stream<U>> |
+| java.base | java.util.stream.BaseStream<URL,Stream<URL>> |
+| java.base | java.util.stream.Collector |
+| java.base | java.util.stream.Collector$Characteristics |
+| java.base | java.util.stream.Collector<> |
+| java.base | java.util.stream.Collector<? super T,A,R> |
+| java.base | java.util.stream.Collector<T,A,R> |
+| java.base | java.util.stream.Collector<T,R,R> |
+| java.base | java.util.stream.DoubleStream |
+| java.base | java.util.stream.DoubleStream$Builder |
+| java.base | java.util.stream.DoubleStream$DoubleMapMultiConsumer |
+| java.base | java.util.stream.Gatherer |
+| java.base | java.util.stream.Gatherer$Downstream |
+| java.base | java.util.stream.Gatherer$Downstream<? super R> |
+| java.base | java.util.stream.Gatherer$Integrator |
+| java.base | java.util.stream.Gatherer$Integrator$Greedy |
+| java.base | java.util.stream.Gatherer$Integrator$Greedy<> |
+| java.base | java.util.stream.Gatherer$Integrator$Greedy<A,T,R> |
+| java.base | java.util.stream.Gatherer$Integrator<> |
+| java.base | java.util.stream.Gatherer$Integrator<A,T,R> |
+| java.base | java.util.stream.Gatherer$Integrator<Void,T,R> |
+| java.base | java.util.stream.Gatherer<> |
+| java.base | java.util.stream.Gatherer<? super R,?,? extends RR> |
+| java.base | java.util.stream.Gatherer<? super T,?,R> |
+| java.base | java.util.stream.Gatherer<T,?,RR> |
+| java.base | java.util.stream.Gatherer<T,A,R> |
+| java.base | java.util.stream.Gatherer<T,Void,R> |
+| java.base | java.util.stream.IntStream |
+| java.base | java.util.stream.IntStream$Builder |
+| java.base | java.util.stream.IntStream$IntMapMultiConsumer |
+| java.base | java.util.stream.LongStream |
+| java.base | java.util.stream.LongStream$Builder |
+| java.base | java.util.stream.LongStream$LongMapMultiConsumer |
+| java.base | java.util.stream.R |
+| java.base | java.util.stream.RR |
+| java.base | java.util.stream.S |
+| java.base | java.util.stream.Stream |
+| java.base | java.util.stream.Stream$Builder |
+| java.base | java.util.stream.Stream$Builder<> |
+| java.base | java.util.stream.Stream$Builder<T> |
+| java.base | java.util.stream.Stream<> |
+| java.base | java.util.stream.Stream<? extends R> |
+| java.base | java.util.stream.Stream<? extends T> |
+| java.base | java.util.stream.Stream<Double> |
+| java.base | java.util.stream.Stream<E> |
+| java.base | java.util.stream.Stream<InetAddress> |
+| java.base | java.util.stream.Stream<Integer> |
+| java.base | java.util.stream.Stream<LocalDate> |
+| java.base | java.util.stream.Stream<Locale> |
+| java.base | java.util.stream.Stream<Long> |
+| java.base | java.util.stream.Stream<MemorySegment> |
+| java.base | java.util.stream.Stream<NetworkInterface> |
+| java.base | java.util.stream.Stream<Permission> |
+| java.base | java.util.stream.Stream<ProcessHandle> |
+| java.base | java.util.stream.Stream<R> |
+| java.base | java.util.stream.Stream<String> |
+| java.base | java.util.stream.Stream<T> |
+| java.base | java.util.stream.Stream<U> |
+| java.base | java.util.stream.Stream<URL> |
+| java.base | java.util.stream.T |
+| java.base | java.util.stream.U |
+| java.base | javax.crypto.BadPaddingException |
+| java.base | javax.crypto.Cipher |
+| java.base | javax.crypto.CipherSpi |
+| java.base | javax.crypto.EncryptedPrivateKeyInfo |
+| java.base | javax.crypto.ExemptionMechanism |
+| java.base | javax.crypto.ExemptionMechanismException |
+| java.base | javax.crypto.ExemptionMechanismSpi |
+| java.base | javax.crypto.IllegalBlockSizeException |
+| java.base | javax.crypto.NoSuchPaddingException |
+| java.base | javax.crypto.ShortBufferException |
+| java.base | javax.security.auth.DestroyFailedException |
+| java.base | javax.security.auth.Destroyable |
+| java.base | javax.security.auth.Subject |
+| java.base | javax.security.auth.T |
+| java.base | javax.security.auth.x500.X500Principal |
+| java.base | jdk.internal.javac.Restricted+Annotation |
diff --git a/java/ql/test/library-tests/module-import-declarations/ImportedType.ql b/java/ql/test/library-tests/module-import-declarations/ImportedType.ql
new file mode 100644
index 00000000000..4dfe43084ec
--- /dev/null
+++ b/java/ql/test/library-tests/module-import-declarations/ImportedType.ql
@@ -0,0 +1,4 @@
+import java
+
+from ModuleImportDeclaration mid
+select mid.getModuleName(), mid.getAnImportedType().getQualifiedName()
diff --git a/java/ql/test/library-tests/module-import-declarations/Test.java b/java/ql/test/library-tests/module-import-declarations/Test.java
new file mode 100644
index 00000000000..ed6d3dfe664
--- /dev/null
+++ b/java/ql/test/library-tests/module-import-declarations/Test.java
@@ -0,0 +1,6 @@
+import module java.base;
+
+class Test {
+    public static void main(String[] args) {
+    }
+}
\ No newline at end of file
diff --git a/java/ql/test/library-tests/module-import-declarations/options b/java/ql/test/library-tests/module-import-declarations/options
new file mode 100644
index 00000000000..b510fdce0df
--- /dev/null
+++ b/java/ql/test/library-tests/module-import-declarations/options
@@ -0,0 +1 @@
+//semmle-extractor-options: --javac-args --release 25 --enable-preview
\ No newline at end of file
diff --git a/java/ql/test/query-tests/CallsToSystemExit/CallsToSystemExit.expected b/java/ql/test/query-tests/CallsToSystemExit/CallsToSystemExit.expected
new file mode 100644
index 00000000000..cad6d0097c7
--- /dev/null
+++ b/java/ql/test/query-tests/CallsToSystemExit/CallsToSystemExit.expected
@@ -0,0 +1,6 @@
+| ExampleRuntimeExit.java:22:17:22:44 | exit(...) | Avoid calls to Runtime.exit() as this prevents runtime cleanup and makes code harder to reuse. |
+| ExampleRuntimeExit.java:25:17:25:44 | exit(...) | Avoid calls to Runtime.exit() as this prevents runtime cleanup and makes code harder to reuse. |
+| ExampleRuntimeHalt.java:18:17:18:44 | halt(...) | Avoid calls to Runtime.halt() as this prevents runtime cleanup and makes code harder to reuse. |
+| ExampleRuntimeHalt.java:21:17:21:44 | halt(...) | Avoid calls to Runtime.halt() as this prevents runtime cleanup and makes code harder to reuse. |
+| ExampleSystemExit.java:22:17:22:30 | exit(...) | Avoid calls to System.exit() as this prevents runtime cleanup and makes code harder to reuse. |
+| ExampleSystemExit.java:25:17:25:30 | exit(...) | Avoid calls to System.exit() as this prevents runtime cleanup and makes code harder to reuse. |
diff --git a/java/ql/test/query-tests/CallsToSystemExit/CallsToSystemExit.qlref b/java/ql/test/query-tests/CallsToSystemExit/CallsToSystemExit.qlref
new file mode 100644
index 00000000000..4561fcfcfd0
--- /dev/null
+++ b/java/ql/test/query-tests/CallsToSystemExit/CallsToSystemExit.qlref
@@ -0,0 +1,2 @@
+query: Violations of Best Practice/Undesirable Calls/CallsToSystemExit.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test/query-tests/CallsToSystemExit/ExampleRuntimeExit.java b/java/ql/test/query-tests/CallsToSystemExit/ExampleRuntimeExit.java
new file mode 100644
index 00000000000..13fd53b1141
--- /dev/null
+++ b/java/ql/test/query-tests/CallsToSystemExit/ExampleRuntimeExit.java
@@ -0,0 +1,37 @@
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+public class ExampleRuntimeExit {
+
+    public static void main(String[] args) {
+        Action action = new Action();
+        try {
+            action.run();
+        } catch (Exception e) {
+            printUsageAndExit(e.getMessage(), 1);
+        }
+        Runtime.getRuntime().exit(0); // COMPLIANT
+    }
+
+    static class Action {
+        public void run() {
+            try {
+                FileOutputStream fos = new FileOutputStream("output.txt");
+                fos.write("Hello, World!".getBytes());
+                fos.close();
+                Runtime.getRuntime().exit(0); // $ Alert
+            } catch (IOException e) {
+                e.printStackTrace();
+                Runtime.getRuntime().exit(1); // $ Alert
+            } catch (Exception e) {
+                // re-throw the exception
+                throw e;
+            }
+        }
+    }
+
+    protected static void printUsageAndExit(final String message, final int exitCode) {
+        System.err.println("Usage: <example_cmd> <example_args> : " + message);
+        Runtime.getRuntime().exit(exitCode); // COMPLIANT
+    }
+}
diff --git a/java/ql/test/query-tests/CallsToSystemExit/ExampleRuntimeHalt.java b/java/ql/test/query-tests/CallsToSystemExit/ExampleRuntimeHalt.java
new file mode 100644
index 00000000000..b1d4be04f20
--- /dev/null
+++ b/java/ql/test/query-tests/CallsToSystemExit/ExampleRuntimeHalt.java
@@ -0,0 +1,25 @@
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+public class ExampleRuntimeHalt {
+
+    public static void main(String[] args) {
+        Action action = new Action();
+        action.run();
+        Runtime.getRuntime().halt(0); // COMPLIANT
+    }
+
+    static class Action {
+        public void run() {
+            try {
+                FileOutputStream fos = new FileOutputStream("output.txt");
+                fos.write("Hello, World!".getBytes());
+                fos.close();
+                Runtime.getRuntime().halt(0); // $ Alert
+            } catch (IOException e) {
+                e.printStackTrace();
+                Runtime.getRuntime().halt(1); // $ Alert
+            }
+        }
+    }
+}
diff --git a/java/ql/test/query-tests/CallsToSystemExit/ExampleSystemExit.java b/java/ql/test/query-tests/CallsToSystemExit/ExampleSystemExit.java
new file mode 100644
index 00000000000..dece6e689ba
--- /dev/null
+++ b/java/ql/test/query-tests/CallsToSystemExit/ExampleSystemExit.java
@@ -0,0 +1,37 @@
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+public class ExampleSystemExit {
+
+    public static void main(String[] args) {
+        Action action = new Action();
+        try {
+            action.run();
+        } catch (Exception e) {
+            printUsageAndExit(e.getMessage(), 1);
+        }
+        System.exit(0); // COMPLIANT
+    }
+
+    static class Action {
+        public void run() {
+            try {
+                FileOutputStream fos = new FileOutputStream("output.txt");
+                fos.write("Hello, World!".getBytes());
+                fos.close();
+                System.exit(0); // $ Alert
+            } catch (IOException e) {
+                e.printStackTrace();
+                System.exit(1); // $ Alert
+            } catch (Exception e) {
+                // re-throw the exception
+                throw e;
+            }
+        }
+    }
+
+    protected static void printUsageAndExit(final String message, final int exitCode) {
+        System.err.println("Usage: <example_cmd> <example_args> : " + message);
+        System.exit(exitCode); // COMPLIANT
+    }
+}
diff --git a/java/ql/test/query-tests/CallsToSystemExit/LocalClassInTestMethod.java b/java/ql/test/query-tests/CallsToSystemExit/LocalClassInTestMethod.java
new file mode 100644
index 00000000000..459f944d798
--- /dev/null
+++ b/java/ql/test/query-tests/CallsToSystemExit/LocalClassInTestMethod.java
@@ -0,0 +1,26 @@
+public class LocalClassInTestMethod {
+    public void testNestedCase() {
+        class OuterLocalClass {
+            void func() {
+                class NestedLocalClass {
+                    void nestedMethod() {
+                        System.exit(4);
+                        Runtime.getRuntime().halt(5);
+                    }
+                }
+            }
+        }
+        OuterLocalClass outer = new OuterLocalClass();
+        outer.func();
+    }
+    public void testNestedCase2() {
+        class OuterLocalClass {
+            class NestedLocalClass {
+                void nestedMethod() {
+                    System.exit(4);
+                    Runtime.getRuntime().halt(5);
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/java/ql/test/query-tests/Escaping/Escaping.expected b/java/ql/test/query-tests/Escaping/Escaping.expected
new file mode 100644
index 00000000000..e066b29dae4
--- /dev/null
+++ b/java/ql/test/query-tests/Escaping/Escaping.expected
@@ -0,0 +1,3 @@
+| Escaping.java:3:7:3:7 | x | The class $@ is marked as thread-safe, but this field is potentially escaping. | Escaping.java:2:14:2:21 | Escaping | Escaping |
+| Escaping.java:4:14:4:14 | y | The class $@ is marked as thread-safe, but this field is potentially escaping. | Escaping.java:2:14:2:21 | Escaping | Escaping |
+| Escaping.java:9:18:9:18 | b | The class $@ is marked as thread-safe, but this field is potentially escaping. | Escaping.java:2:14:2:21 | Escaping | Escaping |
diff --git a/java/ql/test/query-tests/Escaping/Escaping.java b/java/ql/test/query-tests/Escaping/Escaping.java
new file mode 100644
index 00000000000..9d3b568369a
--- /dev/null
+++ b/java/ql/test/query-tests/Escaping/Escaping.java
@@ -0,0 +1,17 @@
+@ThreadSafe
+public class Escaping {
+  int x;  //$ Alert
+  public int y = 0;  //$ Alert
+  private int z = 3;
+  final int w = 0;
+  public final int u = 4;
+  private final long a = 5;
+  protected long b = 0;  //$ Alert
+  protected final long c = 0L;
+  volatile long d = 3;
+  protected volatile long e = 3L;
+
+  public void methodLocal() {
+    int i;
+  }
+}
\ No newline at end of file
diff --git a/java/ql/test/query-tests/Escaping/Escaping.qlref b/java/ql/test/query-tests/Escaping/Escaping.qlref
new file mode 100644
index 00000000000..846d88a1e0a
--- /dev/null
+++ b/java/ql/test/query-tests/Escaping/Escaping.qlref
@@ -0,0 +1,2 @@
+query: Likely Bugs/Concurrency/Escaping.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/java/ql/test/query-tests/Escaping/ThreadSafe.java b/java/ql/test/query-tests/Escaping/ThreadSafe.java
new file mode 100644
index 00000000000..1a4534cc78f
--- /dev/null
+++ b/java/ql/test/query-tests/Escaping/ThreadSafe.java
@@ -0,0 +1,2 @@
+public @interface ThreadSafe {
+}
\ No newline at end of file
diff --git a/java/ql/test/query-tests/ExcessivePublicMethodMocking/Employee.java b/java/ql/test/query-tests/ExcessivePublicMethodMocking/Employee.java
new file mode 100644
index 00000000000..70a0091ec37
--- /dev/null
+++ b/java/ql/test/query-tests/ExcessivePublicMethodMocking/Employee.java
@@ -0,0 +1,10 @@
+/**
+ * Underlying data type of the ORM class and functions.
+ */
+public class Employee {
+  Employee(String name) {
+    this.name = name;
+  }
+
+  String name;
+}
diff --git a/java/ql/test/query-tests/ExcessivePublicMethodMocking/EmployeeRecord.java b/java/ql/test/query-tests/ExcessivePublicMethodMocking/EmployeeRecord.java
new file mode 100644
index 00000000000..4aa40d97ec3
--- /dev/null
+++ b/java/ql/test/query-tests/ExcessivePublicMethodMocking/EmployeeRecord.java
@@ -0,0 +1,26 @@
+/**
+ * Sample ORM class for the type `Employee`.
+ */
+public class EmployeeRecord {
+  public int add(Employee employee) {
+    return 1;
+  }
+
+  public Employee get(String name) {
+    return new Employee("Sample");
+  }
+
+  public int update(Employee employee, String newName) {
+    return 1;
+  }
+
+  public int delete(Employee employee) {
+    return 1;
+  }
+
+  private void f() { }
+
+  private void g() { }
+
+  private void h() { }
+}
diff --git a/java/ql/test/query-tests/ExcessivePublicMethodMocking/EmployeeStatus.java b/java/ql/test/query-tests/ExcessivePublicMethodMocking/EmployeeStatus.java
new file mode 100644
index 00000000000..3b581bb39ef
--- /dev/null
+++ b/java/ql/test/query-tests/ExcessivePublicMethodMocking/EmployeeStatus.java
@@ -0,0 +1,9 @@
+/**
+ * Simple class with a single public method to test the edge case.
+ * When this single method is mocked, it means ALL public methods are mocked.
+ */
+public class EmployeeStatus {
+    public String getStatus() {
+        return "active";
+    }
+}
diff --git a/java/ql/test/query-tests/ExcessivePublicMethodMocking/ExcessivePublicMethodMocking.expected b/java/ql/test/query-tests/ExcessivePublicMethodMocking/ExcessivePublicMethodMocking.expected
new file mode 100644
index 00000000000..d3e95329380
--- /dev/null
+++ b/java/ql/test/query-tests/ExcessivePublicMethodMocking/ExcessivePublicMethodMocking.expected
@@ -0,0 +1,2 @@
+| TestORM.java:34:15:34:27 | nonCompliant1 | This test method mocks all public methods of a $@. | EmployeeRecord.java:4:14:4:27 | EmployeeRecord | class or an interface |
+| TestORM.java:47:15:47:27 | nonCompliant2 | This test method mocks all public methods of a $@. | EmployeeRecord.java:4:14:4:27 | EmployeeRecord | class or an interface |
diff --git a/java/ql/test/query-tests/ExcessivePublicMethodMocking/ExcessivePublicMethodMocking.qlref b/java/ql/test/query-tests/ExcessivePublicMethodMocking/ExcessivePublicMethodMocking.qlref
new file mode 100644
index 00000000000..81a94913518
--- /dev/null
+++ b/java/ql/test/query-tests/ExcessivePublicMethodMocking/ExcessivePublicMethodMocking.qlref
@@ -0,0 +1,2 @@
+query: Violations of Best Practice/Testing/ExcessivePublicMethodMocking.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test/query-tests/ExcessivePublicMethodMocking/TestORM.java b/java/ql/test/query-tests/ExcessivePublicMethodMocking/TestORM.java
new file mode 100644
index 00000000000..eadf0151506
--- /dev/null
+++ b/java/ql/test/query-tests/ExcessivePublicMethodMocking/TestORM.java
@@ -0,0 +1,65 @@
+import org.junit.Test;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.doReturn;
+
+public class TestORM {
+  /**
+   * Test of form `when(mockedObject.methodToBeMocked()).thenReturn(someVal)`.
+   */
+  @Test
+  public void compliant1() {
+    Employee sampleEmployee = new Employee("John Doe");
+    EmployeeRecord employeeRecordMock = mock(EmployeeRecord.class); // COMPLIANT: Only some of the public methods belonging to the mocked object are used
+    when(employeeRecordMock.add(sampleEmployee)).thenReturn(0); // Mocked EmployeeRecord.add
+    when(employeeRecordMock.update(sampleEmployee, "Jane Doe")).thenReturn(0); // Mocked EmployeeRecord.update
+  }
+
+  /**
+   * Test of form `doReturn(someVal).when(mockedObject).methodToBeMocked()`.
+   */
+  @Test
+  public void compliant2() {
+    Employee sampleEmployee = new Employee("John Doe");
+    EmployeeRecord employeeRecordMock = mock(EmployeeRecord.class); // COMPLIANT: Only some of the public methods belonging to the mocked object are used
+    doReturn(0).when(employeeRecordMock).add(sampleEmployee); // Mocked EmployeeRecord.add
+    doReturn(0).when(employeeRecordMock).get("John Doe"); // Mocked EmployeeRecord.get
+    doReturn(0).when(employeeRecordMock).delete(sampleEmployee); // Mocked EmployeeRecord.delete
+  }
+
+  /**
+   * Test of form `when(mockedObject.methodToBeMocked()).thenReturn(someVal)`.
+   */
+  @Test
+  public void nonCompliant1() { // $ Alert
+    Employee sampleEmployee = new Employee("John Doe");
+    EmployeeRecord employeeRecordMock = mock(EmployeeRecord.class); // NON_COMPLIANT: All public methods of the mocked object are used
+    when(employeeRecordMock.add(sampleEmployee)).thenReturn(0); // Mocked EmployeeRecord.add
+    when(employeeRecordMock.get("John Doe")).thenReturn(sampleEmployee); // Mocked EmployeeRecord.get
+    when(employeeRecordMock.update(sampleEmployee, "Jane Doe")).thenReturn(0); // Mocked EmployeeRecord.update
+    when(employeeRecordMock.delete(sampleEmployee)).thenReturn(0); // Mocked EmployeeRecord.delete
+  }
+
+  /**
+   * Test of form `doReturn(someVal).when(mockedObject).methodToBeMocked()`.
+   */
+  @Test
+  public void nonCompliant2() { // $ Alert
+    Employee sampleEmployee = new Employee("John Doe");
+    EmployeeRecord employeeRecordMock = mock(EmployeeRecord.class); // NON_COMPLIANT: All public methods of the mocked object are used
+    doReturn(0).when(employeeRecordMock).add(sampleEmployee); // Mocked EmployeeRecord.add
+    doReturn(0).when(employeeRecordMock).get("John Doe"); // Mocked EmployeeRecord.get
+    doReturn(0).when(employeeRecordMock).update(sampleEmployee, "Jane Doe"); // Mocked EmployeeRecord.update
+    doReturn(0).when(employeeRecordMock).delete(sampleEmployee); // Mocked EmployeeRecord.delete
+  }
+
+  /**
+   * Edge case: Class with single public method - should NOT be flagged.
+   * When there's only one public method, mocking it doesn't indicate a "too big" test.
+   */
+  @Test
+  public void compliantSingleMethod() {
+    EmployeeStatus statusMock = mock(EmployeeStatus.class); // COMPLIANT: Single public method, no choice but to mock it if needed
+    when(statusMock.getStatus()).thenReturn("inactive"); // Mocked EmployeeStatus.getStatus (the only public method, but that's OK)
+  }
+}
diff --git a/java/ql/test/query-tests/ExcessivePublicMethodMocking/options b/java/ql/test/query-tests/ExcessivePublicMethodMocking/options
new file mode 100644
index 00000000000..8dbd14d41c1
--- /dev/null
+++ b/java/ql/test/query-tests/ExcessivePublicMethodMocking/options
@@ -0,0 +1 @@
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../stubs/junit-4.13:${testdir}/../../stubs/mockito-5.14
diff --git a/java/ql/test/query-tests/Nullness/A.java b/java/ql/test/query-tests/Nullness/A.java
index 2a3f36da4b1..065fffdbd3f 100644
--- a/java/ql/test/query-tests/Nullness/A.java
+++ b/java/ql/test/query-tests/Nullness/A.java
@@ -301,7 +301,7 @@ public class A {
   public void assertThatTest() {
     Object assertThat_ok1 = maybe() ? null : new Object();
     assertThat(assertThat_ok1, notNullValue());
-    assertThat_ok1.toString();
+    assertThat_ok1.toString(); // OK
   }
 
   private boolean m;
diff --git a/java/ql/test/query-tests/Nullness/B.java b/java/ql/test/query-tests/Nullness/B.java
index 99bd6f4a1ba..1234b53d59b 100644
--- a/java/ql/test/query-tests/Nullness/B.java
+++ b/java/ql/test/query-tests/Nullness/B.java
@@ -276,7 +276,7 @@ public class B {
     int[] a = null;
     if (iters > 0) a = new int[iters];
     for (int i = 0; i < iters; ++i)
-      a[i] = 0; // NPE - false positive
+      a[i] = 0; // OK
 
     if (iters > 0) {
       String last = null;
@@ -289,7 +289,7 @@ public class B {
       throw new RuntimeException();
     }
     for (int i = 0; i < iters; ++i) {
-      b[i] = 0; // NPE - false positive
+      b[i] = 0; // OK
     }
   }
 
@@ -331,7 +331,7 @@ public class B {
       x = new Object();
     }
     if(y instanceof String) {
-      x.hashCode(); // OK
+      x.hashCode(); // Spurious NPE - false positive
     }
   }
 
@@ -341,7 +341,7 @@ public class B {
       x = new Object();
     }
     if(!(y instanceof String)) {
-      x.hashCode(); // OK
+      x.hashCode(); // Spurious NPE - false positive
     }
   }
 
@@ -351,7 +351,7 @@ public class B {
       x = new Object();
     }
     if(y == z) {
-      x.hashCode(); // OK
+      x.hashCode(); // Spurious NPE - false positive
     }
 
     Object x2 = null;
@@ -359,7 +359,7 @@ public class B {
       x2 = new Object();
     }
     if(y != z) {
-      x2.hashCode(); // OK
+      x2.hashCode(); // Spurious NPE - false positive
     }
 
     Object x3 = null;
@@ -367,7 +367,7 @@ public class B {
       x3 = new Object();
     }
     if(!(y == z)) {
-      x3.hashCode(); // OK
+      x3.hashCode(); // Spurious NPE - false positive
     }
   }
 
@@ -417,7 +417,7 @@ public class B {
         x = null;
       }
       if (!b) {
-        x.hashCode(); // NPE - false negative
+        x.hashCode(); // NPE
       }
       // flow can loop around from one iteration to the next
     }
@@ -436,4 +436,125 @@ public class B {
       }
     }
   }
+
+  public void loopCorrTest1(int[] a) {
+    boolean ready = a.length > 7;
+    Object x = new Object();
+    for (int i = 0; i < a.length; i++) {
+      // condition correlates with itself through iterations when ready isn't updated
+      if (!ready) {
+        x = null;
+      } else {
+        x.hashCode(); // OK
+      }
+      if ((a[i] & 1) != 0) {
+        ready = (a[i] & 2) != 0;
+        x = new Object();
+      }
+    }
+  }
+
+  public void loopCorrTest2(boolean[] a) {
+    Object x = new Object();
+    boolean cur = a[0];
+    for (int i = 1; i < a.length; i++) {
+      boolean prev = cur;
+      cur = a[i];
+      if (!prev) {
+        // correctly guarded by !cur from the _previous_ iteration
+        x.hashCode(); // Spurious NPE - false positive
+      } else {
+        x = new Object();
+      }
+      if (cur) {
+        x = null;
+      }
+    }
+  }
+
+  public void loopCorrTest3(String[] ss) {
+    Object x = null;
+    Object t = null;
+    for (String s : ss) {
+      if (t == null) {
+        t = s;
+      } else {
+        if (t instanceof String) {
+          x = new Object();
+          t = new Object();
+        }
+        // correctly guarded by t: null -> String -> Object
+        x.hashCode(); // Spurious NPE - false positive
+      }
+    }
+  }
+
+  public void initCorr(boolean b) {
+    Object o2 = b ? null : "";
+    if (b)
+      o2 = "";
+    else
+      o2.hashCode(); // OK
+  }
+
+  public void complexLoopTest(int[] xs, int[] ys) {
+    int len = ys != null ? ys.length : 0;
+    for (int i = 0, j = 0; i < xs.length; i++) {
+      if (j < len && ys[j] == 42) { // OK
+        j++;
+      } else if (j > 0) {
+        ys[0]++; // OK
+      }
+    }
+  }
+
+  public void trackTest(Object o, int n) {
+    boolean isnull = o == null;
+    int c = -1;
+    if (maybe) { }
+    if (c == 100) { return; }
+    o.hashCode(); // NPE
+  }
+
+  public void testFinally(int[] xs, int[] ys) {
+    if (xs.length == 0) return;
+    if (ys.length == 0) return;
+    String s1 = null;
+    String s2 = null;
+    for (int x : xs) {
+      try {
+        if (x == 0) { break; }
+        s1 = "1";
+        for (int y : ys) {
+          if (y == 0) { break; }
+          s2 = "2";
+        }
+      } finally {
+      }
+      s1.hashCode(); // OK
+      s2.hashCode(); // NPE
+    }
+    s1.hashCode(); // NPE - false negative, Java CFG lacks proper edge label
+  }
+
+  public void lenCheck(int[] xs, int n, int t) {
+    if (n > 42) return;
+    if (maybe) {}
+    if (n > 0 && (xs == null || xs.length < n)) {
+      return;
+    }
+    if (maybe) {}
+    if (n > 21) return;
+    if (maybe) {}
+    for (int i = 0; i < n; ++i) {
+      xs[i]++; // OK
+    }
+  }
+
+  public void rangetest(int n) {
+    String s = null;
+    if (n < 0 || n > 10) s = "A";
+    if (n > 100) s.hashCode(); // OK
+    if (n == 42) s.hashCode(); // OK
+  }
 }
diff --git a/java/ql/test/query-tests/Nullness/C.java b/java/ql/test/query-tests/Nullness/C.java
index 9424cbe71f2..881185abd23 100644
--- a/java/ql/test/query-tests/Nullness/C.java
+++ b/java/ql/test/query-tests/Nullness/C.java
@@ -97,7 +97,7 @@ public class C {
       arr2 = new int[arr1.length];
     }
     for (int i = 0; i < arr1.length; i++)
-      arr2[i] = arr1[i]; // NPE - false positive
+      arr2[i] = arr1[i]; // OK
   }
 
   public void ex8(int x, int lim) {
@@ -107,7 +107,7 @@ public class C {
     while (!stop) {
       int j = 0;
       while (!stop && j < lim) {
-        int step = (j * obj.hashCode()) % 10; // NPE - false positive
+        int step = (j * obj.hashCode()) % 10; // OK
         if (step == 0) {
           obj.hashCode();
           i += 1;
@@ -134,7 +134,7 @@ public class C {
       cond = true;
     }
     if (cond) {
-      obj2.hashCode(); // NPE - false positive
+      obj2.hashCode(); // OK
     }
   }
 
@@ -185,7 +185,7 @@ public class C {
         b = true;
       } else if (a[i] == 2) {
         verifyBool(b);
-        obj.hashCode(); // NPE - false positive
+        obj.hashCode(); // OK
       }
     }
   }
diff --git a/java/ql/test/query-tests/Nullness/NullMaybe.expected b/java/ql/test/query-tests/Nullness/NullMaybe.expected
index 9f2920293b0..89209bd3a71 100644
--- a/java/ql/test/query-tests/Nullness/NullMaybe.expected
+++ b/java/ql/test/query-tests/Nullness/NullMaybe.expected
@@ -15,20 +15,24 @@
 | B.java:118:5:118:7 | obj | Variable $@ may be null at this access as suggested by $@ null guard. | B.java:117:27:117:36 | obj | obj | B.java:119:13:119:23 | ... != ... | this |
 | B.java:133:5:133:7 | obj | Variable $@ may be null at this access because of $@ assignment. | B.java:128:5:128:22 | Object obj | obj | B.java:128:12:128:21 | obj | this |
 | B.java:190:7:190:7 | o | Variable $@ may be null at this access because of $@ assignment. | B.java:178:5:178:20 | Object o | o | B.java:186:5:186:12 | ...=... | this |
-| B.java:279:7:279:7 | a | Variable $@ may be null at this access because of $@ assignment. | B.java:276:5:276:19 | int[] a | a | B.java:276:11:276:18 | a | this |
-| B.java:292:7:292:7 | b | Variable $@ may be null at this access because of $@ assignment. | B.java:287:5:287:44 | int[] b | b | B.java:287:11:287:43 | b | this |
+| B.java:334:7:334:7 | x | Variable $@ may be null at this access because of $@ assignment. | B.java:329:5:329:20 | Object x | x | B.java:329:12:329:19 | x | this |
+| B.java:344:7:344:7 | x | Variable $@ may be null at this access because of $@ assignment. | B.java:339:5:339:20 | Object x | x | B.java:339:12:339:19 | x | this |
+| B.java:354:7:354:7 | x | Variable $@ may be null at this access because of $@ assignment. | B.java:349:5:349:20 | Object x | x | B.java:349:12:349:19 | x | this |
+| B.java:362:7:362:8 | x2 | Variable $@ may be null at this access because of $@ assignment. | B.java:357:5:357:21 | Object x2 | x2 | B.java:357:12:357:20 | x2 | this |
+| B.java:370:7:370:8 | x3 | Variable $@ may be null at this access because of $@ assignment. | B.java:365:5:365:21 | Object x3 | x3 | B.java:365:12:365:20 | x3 | this |
 | B.java:408:7:408:7 | x | Variable $@ may be null at this access as suggested by $@ null guard. | B.java:374:23:374:30 | x | x | B.java:375:23:375:31 | ... != ... | this |
+| B.java:420:9:420:9 | x | Variable $@ may be null at this access because of $@ assignment. | B.java:413:5:413:28 | Object x | x | B.java:417:9:417:16 | ...=... | this |
+| B.java:465:9:465:9 | x | Variable $@ may be null at this access because of $@ assignment. | B.java:458:5:458:28 | Object x | x | B.java:470:9:470:16 | ...=... | this |
+| B.java:487:9:487:9 | x | Variable $@ may be null at this access because of $@ assignment. | B.java:476:5:476:20 | Object x | x | B.java:476:12:476:19 | x | this |
+| B.java:516:5:516:5 | o | Variable $@ may be null at this access as suggested by $@ null guard. | B.java:511:25:511:32 | o | o | B.java:512:22:512:30 | ... == ... | this |
+| B.java:535:7:535:8 | s2 | Variable $@ may be null at this access because of $@ assignment. | B.java:523:5:523:21 | String s2 | s2 | B.java:523:12:523:20 | s2 | this |
 | C.java:9:44:9:45 | a2 | Variable $@ may be null at this access as suggested by $@ null guard. | C.java:6:5:6:23 | long[][] a2 | a2 | C.java:7:34:7:54 | ... != ... | this |
 | C.java:9:44:9:45 | a2 | Variable $@ may be null at this access because of $@ assignment. | C.java:6:5:6:23 | long[][] a2 | a2 | C.java:6:14:6:22 | a2 | this |
 | C.java:10:17:10:18 | a3 | Variable $@ may be null at this access as suggested by $@ null guard. | C.java:8:5:8:21 | long[] a3 | a3 | C.java:9:38:9:58 | ... != ... | this |
 | C.java:10:17:10:18 | a3 | Variable $@ may be null at this access because of $@ assignment. | C.java:8:5:8:21 | long[] a3 | a3 | C.java:8:12:8:20 | a3 | this |
 | C.java:21:7:21:8 | s1 | Variable $@ may be null at this access because of $@ assignment. | C.java:14:5:14:30 | String s1 | s1 | C.java:17:7:17:24 | ...=... | this |
 | C.java:51:7:51:11 | slice | Variable $@ may be null at this access because of $@ assignment. | C.java:43:5:43:30 | List<String> slice | slice | C.java:43:18:43:29 | slice | this |
-| C.java:100:7:100:10 | arr2 | Variable $@ may be null at this access because of $@ assignment. | C.java:95:5:95:22 | int[] arr2 | arr2 | C.java:95:11:95:21 | arr2 | this |
-| C.java:110:25:110:27 | obj | Variable $@ may be null at this access because of $@ assignment. | C.java:106:5:106:30 | Object obj | obj | C.java:118:13:118:22 | ...=... | this |
-| C.java:137:7:137:10 | obj2 | Variable $@ may be null at this access as suggested by $@ null guard. | C.java:131:5:131:23 | Object obj2 | obj2 | C.java:132:9:132:20 | ... != ... | this |
 | C.java:144:15:144:15 | a | Variable $@ may be null at this access as suggested by $@ null guard. | C.java:141:20:141:26 | a | a | C.java:142:13:142:21 | ... == ... | this |
-| C.java:188:9:188:11 | obj | Variable $@ may be null at this access because of $@ assignment. | C.java:181:5:181:22 | Object obj | obj | C.java:181:12:181:21 | obj | this |
 | C.java:219:9:219:10 | o1 | Variable $@ may be null at this access as suggested by $@ null guard. | C.java:212:20:212:28 | o1 | o1 | C.java:213:9:213:18 | ... == ... | this |
 | C.java:233:7:233:8 | xs | Variable $@ may be null at this access because of $@ assignment. | C.java:231:5:231:56 | int[] xs | xs | C.java:231:11:231:55 | xs | this |
 | F.java:11:5:11:7 | obj | Variable $@ may be null at this access as suggested by $@ null guard. | F.java:8:18:8:27 | obj | obj | F.java:9:9:9:19 | ... == ... | this |
diff --git a/java/ql/test/query-tests/SafePublication/SafePublication.expected b/java/ql/test/query-tests/SafePublication/SafePublication.expected
new file mode 100644
index 00000000000..fbb54ff7b8c
--- /dev/null
+++ b/java/ql/test/query-tests/SafePublication/SafePublication.expected
@@ -0,0 +1,7 @@
+| SafePublication.java:5:9:5:9 | z | The class $@ is marked as thread-safe, but this field is not safely published. | SafePublication.java:2:14:2:28 | SafePublication | SafePublication |
+| SafePublication.java:6:9:6:9 | w | The class $@ is marked as thread-safe, but this field is not safely published. | SafePublication.java:2:14:2:28 | SafePublication | SafePublication |
+| SafePublication.java:7:9:7:9 | u | The class $@ is marked as thread-safe, but this field is not safely published. | SafePublication.java:2:14:2:28 | SafePublication | SafePublication |
+| SafePublication.java:11:10:11:10 | d | The class $@ is marked as thread-safe, but this field is not safely published. | SafePublication.java:2:14:2:28 | SafePublication | SafePublication |
+| SafePublication.java:12:10:12:10 | e | The class $@ is marked as thread-safe, but this field is not safely published. | SafePublication.java:2:14:2:28 | SafePublication | SafePublication |
+| SafePublication.java:14:11:14:13 | arr | The class $@ is marked as thread-safe, but this field is not safely published. | SafePublication.java:2:14:2:28 | SafePublication | SafePublication |
+| SafePublication.java:17:10:17:11 | cc | The class $@ is marked as thread-safe, but this field is not safely published. | SafePublication.java:2:14:2:28 | SafePublication | SafePublication |
diff --git a/java/ql/test/query-tests/SafePublication/SafePublication.java b/java/ql/test/query-tests/SafePublication/SafePublication.java
new file mode 100644
index 00000000000..9c1d031987b
--- /dev/null
+++ b/java/ql/test/query-tests/SafePublication/SafePublication.java
@@ -0,0 +1,29 @@
+@ThreadSafe
+public class SafePublication {
+    int x;
+    int y = 0;
+    int z = 3;   //$ Alert
+    int w;       //$ Alert
+    int u;       //$ Alert
+    long a;
+    long b = 0;
+    long c = 0L;
+    long d = 3;  //$ Alert
+    long e = 3L; //$ Alert
+
+    int[] arr = new int[3]; //$ Alert
+    float f = 0.0f;
+    double dd = 00.0d;
+    char cc = 'a';  //$ Alert
+    char ok = '\u0000';
+
+ public SafePublication(int a) {
+    x = 0;
+    w = 3; // not ok
+    u = a; // not ok
+  }
+
+  public void methodLocal() {
+    int i;
+  }
+}
\ No newline at end of file
diff --git a/java/ql/test/query-tests/SafePublication/SafePublication.qlref b/java/ql/test/query-tests/SafePublication/SafePublication.qlref
new file mode 100644
index 00000000000..51bf2ced966
--- /dev/null
+++ b/java/ql/test/query-tests/SafePublication/SafePublication.qlref
@@ -0,0 +1,2 @@
+query: Likely Bugs/Concurrency/SafePublication.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/java/ql/test/query-tests/SafePublication/ThreadSafe.java b/java/ql/test/query-tests/SafePublication/ThreadSafe.java
new file mode 100644
index 00000000000..1a4534cc78f
--- /dev/null
+++ b/java/ql/test/query-tests/SafePublication/ThreadSafe.java
@@ -0,0 +1,2 @@
+public @interface ThreadSafe {
+}
\ No newline at end of file
diff --git a/java/ql/test/query-tests/StartInConstructor/Test.java b/java/ql/test/query-tests/StartInConstructor/Test.java
index 4c5a57d8b4b..ae8148af787 100644
--- a/java/ql/test/query-tests/StartInConstructor/Test.java
+++ b/java/ql/test/query-tests/StartInConstructor/Test.java
@@ -30,4 +30,18 @@ public class Test {
 		}
 		
 	}
-}
\ No newline at end of file
+
+	public static class AllPrivateConstructors {
+		Thread myThread;
+
+		private AllPrivateConstructors() {
+			myThread = new Thread("myThread");
+			// OK - class cannot be extended outside this file, and is not in fact extended
+			myThread.start();
+		}
+
+		public static AllPrivateConstructors create() {
+			return new AllPrivateConstructors();
+		}
+	}
+}
diff --git a/java/ql/test/query-tests/ThreadSafe/ThreadSafe.expected b/java/ql/test/query-tests/ThreadSafe/ThreadSafe.expected
new file mode 100644
index 00000000000..3d73caaffe5
--- /dev/null
+++ b/java/ql/test/query-tests/ThreadSafe/ThreadSafe.expected
@@ -0,0 +1,45 @@
+| examples/C.java:14:9:14:14 | this.y | This field access (publicly accessible via $@) is not protected by any monitor, but the class is annotated as @ThreadSafe. | examples/C.java:14:9:14:14 | this.y | this expression |
+| examples/C.java:15:9:15:14 | this.y | This field access (publicly accessible via $@) is not protected by any monitor, but the class is annotated as @ThreadSafe. | examples/C.java:15:9:15:14 | this.y | this expression |
+| examples/C.java:16:9:16:14 | this.y | This field access (publicly accessible via $@) is not protected by any monitor, but the class is annotated as @ThreadSafe. | examples/C.java:16:9:16:14 | this.y | this expression |
+| examples/C.java:16:18:16:23 | this.y | This field access (publicly accessible via $@) is not protected by any monitor, but the class is annotated as @ThreadSafe. | examples/C.java:16:18:16:23 | this.y | this expression |
+| examples/C.java:20:9:20:14 | this.y | This field access (publicly accessible via $@) is not protected by any monitor, but the class is annotated as @ThreadSafe. | examples/C.java:20:9:20:14 | this.y | this expression |
+| examples/C.java:21:9:21:14 | this.y | This field access (publicly accessible via $@) is not protected by any monitor, but the class is annotated as @ThreadSafe. | examples/C.java:21:9:21:14 | this.y | this expression |
+| examples/C.java:22:9:22:14 | this.y | This field access (publicly accessible via $@) is not protected by any monitor, but the class is annotated as @ThreadSafe. | examples/C.java:22:9:22:14 | this.y | this expression |
+| examples/C.java:22:18:22:23 | this.y | This field access (publicly accessible via $@) is not protected by any monitor, but the class is annotated as @ThreadSafe. | examples/C.java:22:18:22:23 | this.y | this expression |
+| examples/C.java:26:9:26:14 | this.y | This field access (publicly accessible via $@) is not protected by any monitor, but the class is annotated as @ThreadSafe. | examples/C.java:26:9:26:14 | this.y | this expression |
+| examples/C.java:30:13:30:13 | y | This field access (publicly accessible via $@) is not protected by any monitor, but the class is annotated as @ThreadSafe. | examples/C.java:30:13:30:13 | y | this expression |
+| examples/C.java:33:9:33:9 | y | This field access (publicly accessible via $@) is not protected by any monitor, but the class is annotated as @ThreadSafe. | examples/C.java:33:9:33:9 | y | this expression |
+| examples/DeepPaths.java:8:17:8:17 | y | This field is not properly synchronized in that no single monitor covers all accesses, but the class $@ is annotated as @ThreadSafe. | examples/DeepPaths.java:7:14:7:22 | DeepPaths | DeepPaths |
+| examples/FaultyTurnstileExample.java:18:5:18:9 | count | This field access (publicly accessible via $@) is not protected by any monitor, but the class is annotated as @ThreadSafe. | examples/FaultyTurnstileExample.java:18:5:18:9 | count | this expression |
+| examples/FaultyTurnstileExample.java:26:15:26:19 | count | This field is not properly synchronized in that no single monitor covers all accesses, but the class $@ is annotated as @ThreadSafe. | examples/FaultyTurnstileExample.java:23:7:23:29 | FaultyTurnstileExample2 | FaultyTurnstileExample2 |
+| examples/FlawedSemaphore.java:15:14:15:18 | state | This field access (publicly accessible via $@) is not protected by any monitor, but the class is annotated as @ThreadSafe. | examples/FlawedSemaphore.java:15:14:15:18 | state | this expression |
+| examples/FlawedSemaphore.java:18:7:18:11 | state | This field access (publicly accessible via $@) is not protected by any monitor, but the class is annotated as @ThreadSafe. | examples/FlawedSemaphore.java:18:7:18:11 | state | this expression |
+| examples/LockExample.java:18:15:18:20 | length | This field is not properly synchronized in that no single monitor covers all accesses, but the class $@ is annotated as @ThreadSafe. | examples/LockExample.java:14:14:14:24 | LockExample | LockExample |
+| examples/LockExample.java:19:15:19:31 | notRelatedToOther | This field is not properly synchronized in that no single monitor covers all accesses, but the class $@ is annotated as @ThreadSafe. | examples/LockExample.java:14:14:14:24 | LockExample | LockExample |
+| examples/LockExample.java:20:17:20:23 | content | This field is not properly synchronized in that no single monitor covers all accesses, but the class $@ is annotated as @ThreadSafe. | examples/LockExample.java:14:14:14:24 | LockExample | LockExample |
+| examples/LockExample.java:44:5:44:10 | length | This field access (publicly accessible via $@) is not protected by any monitor, but the class is annotated as @ThreadSafe. | examples/LockExample.java:44:5:44:10 | length | this expression |
+| examples/LockExample.java:45:5:45:11 | content | This field access (publicly accessible via $@) is not protected by any monitor, but the class is annotated as @ThreadSafe. | examples/LockExample.java:45:5:45:11 | content | this expression |
+| examples/LockExample.java:45:13:45:18 | length | This field access (publicly accessible via $@) is not protected by any monitor, but the class is annotated as @ThreadSafe. | examples/LockExample.java:45:13:45:18 | length | this expression |
+| examples/LockExample.java:49:5:49:10 | length | This field access (publicly accessible via $@) is not protected by any monitor, but the class is annotated as @ThreadSafe. | examples/LockExample.java:49:5:49:10 | length | this expression |
+| examples/LockExample.java:62:5:62:10 | length | This field access (publicly accessible via $@) is not protected by any monitor, but the class is annotated as @ThreadSafe. | examples/LockExample.java:62:5:62:10 | length | this expression |
+| examples/LockExample.java:65:5:65:11 | content | This field access (publicly accessible via $@) is not protected by any monitor, but the class is annotated as @ThreadSafe. | examples/LockExample.java:65:5:65:11 | content | this expression |
+| examples/LockExample.java:65:13:65:18 | length | This field access (publicly accessible via $@) is not protected by any monitor, but the class is annotated as @ThreadSafe. | examples/LockExample.java:65:13:65:18 | length | this expression |
+| examples/LockExample.java:69:5:69:10 | length | This field access (publicly accessible via $@) is not protected by any monitor, but the class is annotated as @ThreadSafe. | examples/LockExample.java:69:5:69:10 | length | this expression |
+| examples/LockExample.java:71:5:71:11 | content | This field access (publicly accessible via $@) is not protected by any monitor, but the class is annotated as @ThreadSafe. | examples/LockExample.java:71:5:71:11 | content | this expression |
+| examples/LockExample.java:71:13:71:18 | length | This field access (publicly accessible via $@) is not protected by any monitor, but the class is annotated as @ThreadSafe. | examples/LockExample.java:71:13:71:18 | length | this expression |
+| examples/LockExample.java:76:5:76:10 | length | This field access (publicly accessible via $@) is not protected by any monitor, but the class is annotated as @ThreadSafe. | examples/LockExample.java:76:5:76:10 | length | this expression |
+| examples/LockExample.java:79:5:79:11 | content | This field access (publicly accessible via $@) is not protected by any monitor, but the class is annotated as @ThreadSafe. | examples/LockExample.java:79:5:79:11 | content | this expression |
+| examples/LockExample.java:79:13:79:18 | length | This field access (publicly accessible via $@) is not protected by any monitor, but the class is annotated as @ThreadSafe. | examples/LockExample.java:79:13:79:18 | length | this expression |
+| examples/LockExample.java:112:5:112:21 | notRelatedToOther | This field access (publicly accessible via $@) is not protected by any monitor, but the class is annotated as @ThreadSafe. | examples/LockExample.java:112:5:112:21 | notRelatedToOther | this expression |
+| examples/LockExample.java:119:5:119:21 | notRelatedToOther | This field access (publicly accessible via $@) is not protected by any monitor, but the class is annotated as @ThreadSafe. | examples/LockExample.java:119:5:119:21 | notRelatedToOther | this expression |
+| examples/LockExample.java:124:5:124:21 | notRelatedToOther | This field access (publicly accessible via $@) is not protected by any monitor, but the class is annotated as @ThreadSafe. | examples/LockExample.java:124:5:124:21 | notRelatedToOther | this expression |
+| examples/LockExample.java:145:5:145:21 | notRelatedToOther | This field access (publicly accessible via $@) is not protected by any monitor, but the class is annotated as @ThreadSafe. | examples/LockExample.java:145:5:145:21 | notRelatedToOther | this expression |
+| examples/LockExample.java:153:5:153:21 | notRelatedToOther | This field access (publicly accessible via $@) is not protected by any monitor, but the class is annotated as @ThreadSafe. | examples/LockExample.java:153:5:153:21 | notRelatedToOther | this expression |
+| examples/ManyLocks.java:8:17:8:17 | y | This field is not properly synchronized in that no single monitor covers all accesses, but the class $@ is annotated as @ThreadSafe. | examples/ManyLocks.java:7:14:7:22 | ManyLocks | ManyLocks |
+| examples/SyncLstExample.java:45:5:45:7 | lst | This field access (publicly accessible via $@) is not protected by any monitor, but the class is annotated as @ThreadSafe. | examples/SyncLstExample.java:45:5:45:7 | lst | this expression |
+| examples/SyncStackExample.java:37:5:37:7 | stc | This field access (publicly accessible via $@) is not protected by any monitor, but the class is annotated as @ThreadSafe. | examples/SyncStackExample.java:37:5:37:7 | stc | this expression |
+| examples/SynchronizedAndLock.java:10:17:10:22 | length | This field is not properly synchronized in that no single monitor covers all accesses, but the class $@ is annotated as @ThreadSafe. | examples/SynchronizedAndLock.java:7:14:7:32 | SynchronizedAndLock | SynchronizedAndLock |
+| examples/Test.java:52:5:52:10 | this.y | This field access (publicly accessible via $@) is not protected by any monitor, but the class is annotated as @ThreadSafe. | examples/Test.java:24:5:24:18 | setYPrivate(...) | this expression |
+| examples/Test.java:60:5:60:10 | this.y | This field access (publicly accessible via $@) is not protected by any monitor, but the class is annotated as @ThreadSafe. | examples/Test.java:60:5:60:10 | this.y | this expression |
+| examples/Test.java:74:5:74:10 | this.y | This field access (publicly accessible via $@) is not protected by any monitor, but the class is annotated as @ThreadSafe. | examples/Test.java:74:5:74:10 | this.y | this expression |
+| examples/Test.java:74:14:74:14 | y | This field access (publicly accessible via $@) is not protected by any monitor, but the class is annotated as @ThreadSafe. | examples/Test.java:74:14:74:14 | y | this expression |
diff --git a/java/ql/test/query-tests/ThreadSafe/ThreadSafe.qlref b/java/ql/test/query-tests/ThreadSafe/ThreadSafe.qlref
new file mode 100644
index 00000000000..eba9a674554
--- /dev/null
+++ b/java/ql/test/query-tests/ThreadSafe/ThreadSafe.qlref
@@ -0,0 +1,2 @@
+query: Likely Bugs/Concurrency/ThreadSafe.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/java/ql/test/query-tests/ThreadSafe/examples/Alias.java b/java/ql/test/query-tests/ThreadSafe/examples/Alias.java
new file mode 100644
index 00000000000..802bae2fbb3
--- /dev/null
+++ b/java/ql/test/query-tests/ThreadSafe/examples/Alias.java
@@ -0,0 +1,21 @@
+package examples;
+
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
+@ThreadSafe
+public class Alias {
+    private int y;
+
+    private final ReentrantLock lock = new ReentrantLock();
+
+    public void notMismatch() {
+        final ReentrantLock lock = this.lock;
+        lock.lock();
+        try {
+            y = 42;
+        } finally {
+            this.lock.unlock();
+        }
+    }
+}
\ No newline at end of file
diff --git a/java/ql/test/query-tests/ThreadSafe/examples/App.java b/java/ql/test/query-tests/ThreadSafe/examples/App.java
new file mode 100644
index 00000000000..1c085ee6179
--- /dev/null
+++ b/java/ql/test/query-tests/ThreadSafe/examples/App.java
@@ -0,0 +1,14 @@
+/*
+ * This Java source file was generated by the Gradle 'init' task.
+ */
+package examples;
+
+public class App {
+    public String getGreeting() {
+        return "Hello World!";
+    }
+
+    public static void main(String[] args) {
+        System.out.println(new App().getGreeting());
+    }
+}
diff --git a/java/ql/test/query-tests/ThreadSafe/examples/C.java b/java/ql/test/query-tests/ThreadSafe/examples/C.java
new file mode 100644
index 00000000000..92c6b82800c
--- /dev/null
+++ b/java/ql/test/query-tests/ThreadSafe/examples/C.java
@@ -0,0 +1,72 @@
+package examples;
+
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
+@ThreadSafe
+public class C {
+
+    private int y;
+    private Lock lock = new ReentrantLock();
+    private Lock lock2 = new ReentrantLock();
+
+    public void m() {
+        this.y = 0; // $ Alert
+        this.y += 1; // $ Alert
+        this.y = this.y - 1; // $ Alert
+    }
+
+    public void n4() {
+        this.y = 0; // $ Alert
+        this.y += 1; // $ Alert
+        this.y = this.y - 1; // $ Alert
+    }
+
+    public void setY(int y) {
+        this.y = y; // $ Alert
+    }
+
+    public void test() {
+        if (y == 0) { // $ Alert
+            lock.lock();
+        }
+        y = 0; // $ Alert
+        lock.unlock();
+    }
+
+    public void n() {
+        this.lock.lock();
+        this.y = 0;
+        this.y += 1;
+        this.y = this.y - 1;
+        this.lock.unlock();
+    }
+
+    public void callTestLock2() {
+        lock2.lock();
+        setY(1);
+        lock2.unlock();
+    }
+
+    public void n2() {
+        lock.lock();
+        this.y = 0;
+        this.y += 1;
+        this.y = this.y - 1;
+        lock.unlock();
+    }
+
+    public void n3() {
+        lock.lock();
+        y = 0;
+        y += 1;
+        y = y - 1;
+        lock.unlock(); 
+    }
+
+    public void callTest() {
+        lock.lock();
+        setY(1);
+        lock.unlock();
+    }
+}
\ No newline at end of file
diff --git a/java/ql/test/query-tests/ThreadSafe/examples/DeepPaths.java b/java/ql/test/query-tests/ThreadSafe/examples/DeepPaths.java
new file mode 100644
index 00000000000..095087a5018
--- /dev/null
+++ b/java/ql/test/query-tests/ThreadSafe/examples/DeepPaths.java
@@ -0,0 +1,61 @@
+package examples;
+
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
+@ThreadSafe
+public class DeepPaths {
+    private int y; // $ Alert
+
+    private final Lock lock1 = new ReentrantLock();
+    private final Lock lock2 = new ReentrantLock();
+    private final Lock lock3 = new ReentrantLock();
+
+    public void layer1Locked() {
+        lock1.lock();
+        this.layer2Locked();
+        lock1.unlock();
+    }
+
+    private void layer2Locked() {
+        lock2.lock();
+        this.layer3Unlocked();
+        lock2.unlock();
+    }
+
+    private void layer3Locked() {
+        lock3.lock();
+        y++;
+        lock3.unlock();
+    }
+
+    public void layer1Skip() {
+        lock2.lock();
+        this.layer3Locked();
+        lock2.unlock();
+    }
+
+    public void layer1Indirect() {
+        this.layer2();
+    }
+
+    private void layer2() {
+        this.layer2Locked();
+    }
+
+    public void layer1Unlocked() {
+        this.layer2Unlocked();
+    }
+
+    private void layer2Unlocked() {
+        this.layer3();
+    }
+
+    private void layer3() {
+        this.layer3Locked();
+    }
+
+    private void layer3Unlocked() {
+        y++;
+    }
+}
diff --git a/java/ql/test/query-tests/ThreadSafe/examples/FaultyTurnstileExample.java b/java/ql/test/query-tests/ThreadSafe/examples/FaultyTurnstileExample.java
new file mode 100644
index 00000000000..20b258135f6
--- /dev/null
+++ b/java/ql/test/query-tests/ThreadSafe/examples/FaultyTurnstileExample.java
@@ -0,0 +1,40 @@
+package examples;
+
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
+@ThreadSafe
+class FaultyTurnstileExample {
+  private Lock lock = new ReentrantLock();
+  private int count = 0;
+
+  public void inc() {
+    lock.lock();
+    count++; // $ MISSING: Alert
+    lock.unlock();
+  }
+
+  public void dec() {
+    count--; // $ Alert
+  }
+}
+
+@ThreadSafe
+class FaultyTurnstileExample2 {
+  private Lock lock1 = new ReentrantLock();
+  private Lock lock2 = new ReentrantLock();
+  private int count = 0; // $ Alert
+
+  public void inc() {
+    lock1.lock();
+    count++;
+    lock1.unlock();
+  }
+
+  public void dec() {
+    lock2.lock();
+    count--;
+    lock2.unlock();
+  }
+}
+
diff --git a/java/ql/test/query-tests/ThreadSafe/examples/FlawedSemaphore.java b/java/ql/test/query-tests/ThreadSafe/examples/FlawedSemaphore.java
new file mode 100644
index 00000000000..a73b45e60ed
--- /dev/null
+++ b/java/ql/test/query-tests/ThreadSafe/examples/FlawedSemaphore.java
@@ -0,0 +1,30 @@
+package examples;
+
+@ThreadSafe
+public class FlawedSemaphore {
+  private final int capacity;
+  private int state;
+
+  public FlawedSemaphore(int c) {
+    capacity = c;
+    state = 0;
+  }
+
+  public void acquire() {
+    try {
+      while (state == capacity) { // $ Alert
+        this.wait();
+      }
+      state++; // $ Alert
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+    }
+  }
+
+  public void release() {
+    synchronized (this) {
+      state--; // State can become negative
+      this.notifyAll();
+    }
+  }
+}
diff --git a/java/ql/test/query-tests/ThreadSafe/examples/LockCorrect.java b/java/ql/test/query-tests/ThreadSafe/examples/LockCorrect.java
new file mode 100644
index 00000000000..9c6c5abce56
--- /dev/null
+++ b/java/ql/test/query-tests/ThreadSafe/examples/LockCorrect.java
@@ -0,0 +1,51 @@
+package examples;
+
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
+@ThreadSafe
+public class LockCorrect {
+  private Lock lock1 = new ReentrantLock();
+
+  private int length = 0;
+  private int notRelatedToOther = 10;
+  private int[] content  = new int[10];
+  private int thisSynchronized = 0;
+
+  public void add(int value) {
+    lock1.lock();
+    length++;
+    content[length] = value;
+    lock1.unlock();
+  }
+
+  public void removeCorrect() {
+    lock1.lock();
+    content[length] = 0;
+    length--;
+    lock1.unlock();
+  }
+
+  public void synchronizedOnLock1() {
+    synchronized(lock1) {
+      notRelatedToOther++;
+    }
+  }
+
+  public void synchronizedOnLock12() {
+    synchronized(lock1) {
+      notRelatedToOther++;
+    }
+  }
+
+  public synchronized void x() {
+    thisSynchronized++;
+  }
+
+  public void x1() {
+    synchronized(this) {
+      thisSynchronized++;
+    }
+  }
+
+}
diff --git a/java/ql/test/query-tests/ThreadSafe/examples/LockExample.java b/java/ql/test/query-tests/ThreadSafe/examples/LockExample.java
new file mode 100644
index 00000000000..1e1792d0d2e
--- /dev/null
+++ b/java/ql/test/query-tests/ThreadSafe/examples/LockExample.java
@@ -0,0 +1,156 @@
+// This example shows that we only get one alert "per concurrency problem":
+// For each problematic variable, we get one alert at the earliest conflicting write.
+// If the variable is involved in several different monitors, we get an alert for each monitor that
+// is not correctly used.
+// A single alert can have many related locations, since each conflicting access which is not
+// properly synchronized is a related location.
+// This leads to many lines in the .expected file.
+package examples;
+
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
+@ThreadSafe
+public class LockExample {
+  private Lock lock1 = new ReentrantLock();
+  private Lock lock2 = new ReentrantLock();
+
+  private int length = 0; // $ Alert
+  private int notRelatedToOther = 10; // $ Alert
+  private int[] content  = new int[10]; // $ Alert
+
+  public void add(int value) {
+    lock1.lock();
+    length++;
+    content[length] = value;
+    lock1.unlock();
+  }
+
+  public void removeCorrect() {
+    lock1.lock();
+    length--;
+    content[length] = 0;
+    lock1.unlock();
+  }
+
+  public void notTheSameLockAsAdd() { // use locks, but different ones
+    lock2.lock();
+    length--;
+    content[length] = 0;
+    lock2.unlock();
+  }
+
+  public void noLock() { // no locks
+    length--; // $ Alert
+    content[length] = 0; // $ Alert
+  }
+
+  public void fieldUpdatedOutsideOfLock() { // adjusts length without lock
+    length--; // $ Alert
+
+    lock1.lock();
+    content[length] = 0;
+    lock1.unlock();
+  }
+
+  public synchronized void synchronizedLock() { // no locks, but with synchronized
+    length--;
+    content[length] = 0;
+  }
+
+  public void onlyLocked() { // never unlocked, only locked
+    length--; // $ Alert
+
+    lock1.lock();
+    content[length] = 0; // $ Alert
+  }
+
+  public void onlyUnlocked() { // never locked, only unlocked
+    length--; // $ Alert
+
+    content[length] = 0; // $ Alert
+    lock1.unlock();
+  }
+
+  public void notSameLock() {
+    length--; // $ Alert
+
+    lock2.lock();// Not the same lock
+    content[length] = 0; // $ Alert
+    lock1.unlock();
+  }
+
+  public void updateCount() {
+    lock2.lock();
+    notRelatedToOther++;
+    lock2.unlock();
+  }
+
+  public void updateCountTwiceCorrect() {
+    lock2.lock();
+    notRelatedToOther++;
+    lock2.unlock();
+    lock1.lock();
+    notRelatedToOther++;
+    lock1.unlock();
+  }
+
+  public void updateCountTwiceDifferentLocks() {
+    lock2.lock();
+    notRelatedToOther++;
+    lock2.unlock();
+    lock1.lock();
+    notRelatedToOther++;
+    lock2.unlock();
+  }
+
+  public void updateCountTwiceLock() {
+    lock2.lock();
+    notRelatedToOther++;
+    lock2.unlock();
+    lock1.lock();
+    notRelatedToOther++; // $ Alert
+  }
+
+  public void updateCountTwiceUnLock() {
+    lock2.lock();
+    notRelatedToOther++;
+    lock2.unlock();
+    notRelatedToOther++; // $ Alert
+    lock1.unlock();
+  }
+
+  public void synchronizedNonRelatedOutside() {
+    notRelatedToOther++; // $ Alert
+
+    synchronized(this) {
+      length++;
+    }
+  }
+
+  public void synchronizedNonRelatedOutside2() {
+    int x = 0;
+    x++;
+
+    synchronized(this) {
+      length++;
+    }
+  }
+
+  public void synchronizedNonRelatedOutside3() {
+    synchronized(this) {
+      length++;
+    }
+
+    notRelatedToOther = 1; // $ Alert
+  }
+
+  public void synchronizedNonRelatedOutside4() {
+    synchronized(lock1) {
+      length++;
+    }
+
+    notRelatedToOther = 1; // $ Alert
+  }
+
+}
diff --git a/java/ql/test/query-tests/ThreadSafe/examples/LoopyCallGraph.java b/java/ql/test/query-tests/ThreadSafe/examples/LoopyCallGraph.java
new file mode 100644
index 00000000000..caea22ac851
--- /dev/null
+++ b/java/ql/test/query-tests/ThreadSafe/examples/LoopyCallGraph.java
@@ -0,0 +1,33 @@
+package examples;
+
+import java.util.Random;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
+@ThreadSafe
+public class LoopyCallGraph {
+  private Lock lock = new ReentrantLock();
+  private int count = 0;
+  private Random random = new Random();
+
+  public void entry() {
+    if (random.nextBoolean()) {
+      increase();  // this could look like an unprotected path to a call to dec()
+    } else {
+      lock.lock();
+      dec();
+      lock.unlock();
+    }
+  }
+
+  private void increase() {
+    lock.lock();
+    count = 10;
+    lock.unlock();
+    entry();  // this could look like an unprotected path to a call to dec()
+  }
+
+  private void dec() {
+    count--;
+  }
+}
\ No newline at end of file
diff --git a/java/ql/test/query-tests/ThreadSafe/examples/ManyLocks.java b/java/ql/test/query-tests/ThreadSafe/examples/ManyLocks.java
new file mode 100644
index 00000000000..a7e19b3424b
--- /dev/null
+++ b/java/ql/test/query-tests/ThreadSafe/examples/ManyLocks.java
@@ -0,0 +1,37 @@
+package examples;
+
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
+@ThreadSafe
+public class ManyLocks {
+    private int y; // $ Alert
+
+    private final Lock lock1 = new ReentrantLock();
+    private final Lock lock2 = new ReentrantLock();
+    private final Lock lock3 = new ReentrantLock();
+
+    public void inc() {
+        lock1.lock();
+        lock2.lock();
+        y++;
+        lock2.unlock();
+        lock1.unlock();
+    }
+
+    public void dec() {
+        lock2.lock();
+        lock3.lock();
+        y--;
+        lock3.unlock();
+        lock2.unlock();
+    }
+
+    public void reset() {
+        lock1.lock();
+        lock3.lock();
+        y = 0;
+        lock3.unlock();
+        lock1.unlock();
+    }
+}
\ No newline at end of file
diff --git a/java/ql/test/query-tests/ThreadSafe/examples/SyncLstExample.java b/java/ql/test/query-tests/ThreadSafe/examples/SyncLstExample.java
new file mode 100644
index 00000000000..04bc1c3c454
--- /dev/null
+++ b/java/ql/test/query-tests/ThreadSafe/examples/SyncLstExample.java
@@ -0,0 +1,47 @@
+package examples;
+
+import java.util.List;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
+@ThreadSafe
+public class SyncLstExample<T> {
+  private Lock lock = new ReentrantLock();
+  private List<T> lst;
+
+  public SyncLstExample(List<T> lst) {
+    this.lst = lst;
+  }
+
+  public void add(T item) {
+    lock.lock();
+    lst.add(item);
+    lock.unlock();
+  }
+
+  public void remove(int i) {
+    lock.lock();
+    lst.remove(i);
+    lock.unlock();
+  }
+}
+
+@ThreadSafe
+class FaultySyncLstExample<T> {
+  private Lock lock = new ReentrantLock();
+  private List<T> lst;
+
+  public FaultySyncLstExample(List<T> lst) {
+    this.lst = lst;
+  }
+
+  public void add(T item) {
+    lock.lock();
+    lst.add(item);
+    lock.unlock();
+  }
+
+  public void remove(int i) {
+    lst.remove(i); // $ Alert
+  }
+}
diff --git a/java/ql/test/query-tests/ThreadSafe/examples/SyncStackExample.java b/java/ql/test/query-tests/ThreadSafe/examples/SyncStackExample.java
new file mode 100644
index 00000000000..31e8cebee3e
--- /dev/null
+++ b/java/ql/test/query-tests/ThreadSafe/examples/SyncStackExample.java
@@ -0,0 +1,39 @@
+package examples;
+
+import java.util.Stack;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
+@ThreadSafe
+public class SyncStackExample<T> {
+  private Lock lock = new ReentrantLock();
+  private Stack<T> stc = new Stack<T>();
+
+  public void push(T item) {
+    lock.lock();
+    stc.push(item);
+    lock.unlock();
+  }
+
+  public void pop() {
+    lock.lock();
+    stc.pop();
+    lock.unlock();
+  }
+}
+
+@ThreadSafe
+class FaultySyncStackExample<T> {
+  private Lock lock = new ReentrantLock();
+  private Stack<T> stc = new Stack<T>();
+
+  public void push(T item) {
+    lock.lock();
+    stc.push(item);
+    lock.unlock();
+  }
+
+  public void pop() {
+    stc.pop(); // $ Alert
+  }
+}
diff --git a/java/ql/test/query-tests/ThreadSafe/examples/SynchronizedAndLock.java b/java/ql/test/query-tests/ThreadSafe/examples/SynchronizedAndLock.java
new file mode 100644
index 00000000000..52b35a84bb7
--- /dev/null
+++ b/java/ql/test/query-tests/ThreadSafe/examples/SynchronizedAndLock.java
@@ -0,0 +1,21 @@
+package examples;
+
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
+@ThreadSafe
+public class SynchronizedAndLock {
+    private Lock lock = new ReentrantLock();
+
+    private int length = 0; // $ Alert
+
+    public void add(int value) {
+        lock.lock();
+        length++;
+        lock.unlock();
+    }
+
+    public synchronized void subtract() {
+        length--;
+    }
+}
diff --git a/java/ql/test/query-tests/ThreadSafe/examples/Test.java b/java/ql/test/query-tests/ThreadSafe/examples/Test.java
new file mode 100644
index 00000000000..e6b0567ef89
--- /dev/null
+++ b/java/ql/test/query-tests/ThreadSafe/examples/Test.java
@@ -0,0 +1,76 @@
+package examples;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
+@ThreadSafe
+public class Test {
+  /**
+   * Escaping field due to public visibility.
+   */
+  int publicField;
+  
+  private int y;
+  final int immutableField = 1;
+
+  // As of the below examples with synchronized as well. Except the incorrectly placed lock.
+
+  private Lock lock = new ReentrantLock();
+
+  /**
+   * Calls the a method where y field escapes.
+   * @param y
+   */
+  public void setYAgainInCorrect(int t) {
+    setYPrivate(t);
+  }
+
+  /**
+   * Locks the method where y field escapes.
+   * @param y
+   */
+  public void setYAgainCorrect(int y) {
+    lock.lock();
+    setYPrivate(y);
+    lock.unlock();
+  }
+
+  /**
+   * No escaping y field. Locks the y before assignment.
+   * @param y
+   */
+  public void setYCorrect(int y) {
+    lock.lock();
+    this.y = y;
+    lock.unlock();
+  }
+
+  /**
+   * No direct escaping, since it method is private. Only escaping if another public method uses this.
+   * @param y
+   */
+  private void setYPrivate(int y) {
+    this.y = y; // $ Alert
+  }
+
+  /**
+   * Incorrectly locks y.
+   * @param y
+   */
+  public void setYWrongLock(int y) {
+    this.y = y; // $ Alert
+    lock.lock();
+    lock.unlock();
+  }
+
+  public synchronized int getImmutableField() {
+    return immutableField;
+  }
+
+  public synchronized int getImmutableField2() {
+    return immutableField;
+  }
+
+  public void testMethod() {
+    this.y = y + 2; // $ Alert
+  }
+}
diff --git a/java/ql/test/query-tests/ThreadSafe/examples/Test2.java b/java/ql/test/query-tests/ThreadSafe/examples/Test2.java
new file mode 100644
index 00000000000..731af5ecf67
--- /dev/null
+++ b/java/ql/test/query-tests/ThreadSafe/examples/Test2.java
@@ -0,0 +1,22 @@
+package examples;
+
+import java.util.ArrayList;
+
+// Note: Not marked as thread-safe
+// We inherit from this in Test3Super.java
+public class Test2 {
+  int x;
+  protected ArrayList<String> lst = new ArrayList<>();
+
+  public Test2() {
+    this.x = 0;
+  }
+
+  public void changeX() {
+    this.x = x + 1;
+  }
+
+  public void changeLst() {
+    lst.add("Hello");
+  }
+}
diff --git a/java/ql/test/query-tests/ThreadSafe/examples/Test3Super.java b/java/ql/test/query-tests/ThreadSafe/examples/Test3Super.java
new file mode 100644
index 00000000000..5a48e20bc05
--- /dev/null
+++ b/java/ql/test/query-tests/ThreadSafe/examples/Test3Super.java
@@ -0,0 +1,17 @@
+package examples;
+
+@ThreadSafe
+public class Test3Super extends Test2 {  // We might want an alert here for the inherited unsafe methods.
+
+  public Test3Super() {
+    super.x = 0;
+  }
+
+  public void y() {
+    super.x = 0;  //$ MISSING: Alert
+  }
+
+  public void yLst() {
+    super.lst.add("Hello!");  //$ MISSING: Alert
+  }
+}
diff --git a/java/ql/test/query-tests/ThreadSafe/examples/ThreadSafe.java b/java/ql/test/query-tests/ThreadSafe/examples/ThreadSafe.java
new file mode 100644
index 00000000000..fc0a645c442
--- /dev/null
+++ b/java/ql/test/query-tests/ThreadSafe/examples/ThreadSafe.java
@@ -0,0 +1,4 @@
+package examples;
+
+public @interface ThreadSafe {
+}
\ No newline at end of file
diff --git a/java/ql/test/query-tests/ThreadSafe/examples/TurnstileExample.java b/java/ql/test/query-tests/ThreadSafe/examples/TurnstileExample.java
new file mode 100644
index 00000000000..90ea98a77d9
--- /dev/null
+++ b/java/ql/test/query-tests/ThreadSafe/examples/TurnstileExample.java
@@ -0,0 +1,23 @@
+package examples;
+
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
+@ThreadSafe
+public class TurnstileExample {
+  private Lock lock = new ReentrantLock();
+  private int count = 0;
+
+  public void inc() {
+    Lock l = lock;
+    l.lock();
+    count++;
+    l.unlock();
+  }
+
+  public void dec() {
+    lock.lock();
+    count--;
+    lock.unlock();
+  }
+}
\ No newline at end of file
diff --git a/java/ql/test/query-tests/VisibleForTestingAbuse/VisibleForTestingAbuse.expected b/java/ql/test/query-tests/VisibleForTestingAbuse/VisibleForTestingAbuse.expected
new file mode 100644
index 00000000000..61f5b0ffc57
--- /dev/null
+++ b/java/ql/test/query-tests/VisibleForTestingAbuse/VisibleForTestingAbuse.expected
@@ -0,0 +1,17 @@
+| packageone/SourcePackage.java:9:21:9:32 | Annotated.m1 | Access of $@ annotated with VisibleForTesting found in production code. | packagetwo/Annotated.java:9:29:9:30 | m1 | element |
+| packageone/SourcePackage.java:10:21:10:32 | Annotated.m2 | Access of $@ annotated with VisibleForTesting found in production code. | packagetwo/Annotated.java:11:26:11:27 | m2 | element |
+| packageone/SourcePackage.java:16:18:16:36 | fPublic(...) | Access of $@ annotated with VisibleForTesting found in production code. | packagetwo/Annotated.java:26:23:26:29 | fPublic | element |
+| packageone/SourcePackage.java:17:18:17:39 | fProtected(...) | Access of $@ annotated with VisibleForTesting found in production code. | packagetwo/Annotated.java:31:26:31:35 | fProtected | element |
+| packageone/SourcePackage.java:25:31:25:42 | Annotated.m1 | Access of $@ annotated with VisibleForTesting found in production code. | packagetwo/Annotated.java:9:29:9:30 | m1 | element |
+| packageone/SourcePackage.java:26:31:26:42 | Annotated.m2 | Access of $@ annotated with VisibleForTesting found in production code. | packagetwo/Annotated.java:11:26:11:27 | m2 | element |
+| packageone/SourcePackage.java:29:28:29:46 | fPublic(...) | Access of $@ annotated with VisibleForTesting found in production code. | packagetwo/Annotated.java:26:23:26:29 | fPublic | element |
+| packageone/SourcePackage.java:30:28:30:49 | fProtected(...) | Access of $@ annotated with VisibleForTesting found in production code. | packagetwo/Annotated.java:31:26:31:35 | fProtected | element |
+| packageone/SourcePackage.java:34:23:34:34 | Annotated.m1 | Access of $@ annotated with VisibleForTesting found in production code. | packagetwo/Annotated.java:9:29:9:30 | m1 | element |
+| packageone/SourcePackage.java:35:30:35:41 | Annotated.m1 | Access of $@ annotated with VisibleForTesting found in production code. | packagetwo/Annotated.java:9:29:9:30 | m1 | element |
+| packageone/SourcePackage.java:36:31:36:42 | Annotated.m1 | Access of $@ annotated with VisibleForTesting found in production code. | packagetwo/Annotated.java:9:29:9:30 | m1 | element |
+| packageone/SourcePackage.java:37:33:37:44 | Annotated.m1 | Access of $@ annotated with VisibleForTesting found in production code. | packagetwo/Annotated.java:9:29:9:30 | m1 | element |
+| packagetwo/Source.java:8:20:8:30 | Annotated.m | Access of $@ annotated with VisibleForTesting found in production code. | packagetwo/Annotated.java:7:19:7:19 | m | element |
+| packagetwo/Source.java:14:17:14:29 | f(...) | Access of $@ annotated with VisibleForTesting found in production code. | packagetwo/Annotated.java:16:16:16:16 | f | element |
+| packagetwo/Source.java:20:28:20:47 | new AnnotatedClass(...) | Access of $@ annotated with VisibleForTesting found in production code. | packageone/AnnotatedClass.java:4:14:4:27 | AnnotatedClass | element |
+| packagetwo/Source.java:24:30:24:40 | Annotated.m | Access of $@ annotated with VisibleForTesting found in production code. | packagetwo/Annotated.java:7:19:7:19 | m | element |
+| packagetwo/Source.java:28:27:28:39 | f(...) | Access of $@ annotated with VisibleForTesting found in production code. | packagetwo/Annotated.java:16:16:16:16 | f | element |
\ No newline at end of file
diff --git a/java/ql/test/query-tests/VisibleForTestingAbuse/VisibleForTestingAbuse.qlref b/java/ql/test/query-tests/VisibleForTestingAbuse/VisibleForTestingAbuse.qlref
new file mode 100644
index 00000000000..57947f80431
--- /dev/null
+++ b/java/ql/test/query-tests/VisibleForTestingAbuse/VisibleForTestingAbuse.qlref
@@ -0,0 +1,2 @@
+query: Violations of Best Practice/Implementation Hiding/VisibleForTestingAbuse.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test/query-tests/VisibleForTestingAbuse/packageone/AnnotatedClass.java b/java/ql/test/query-tests/VisibleForTestingAbuse/packageone/AnnotatedClass.java
new file mode 100644
index 00000000000..1fdbea1571e
--- /dev/null
+++ b/java/ql/test/query-tests/VisibleForTestingAbuse/packageone/AnnotatedClass.java
@@ -0,0 +1,6 @@
+package packageone;
+
+@VisibleForTesting
+public class AnnotatedClass {
+    public AnnotatedClass() {}
+}
diff --git a/java/ql/test/query-tests/VisibleForTestingAbuse/packageone/SourcePackage.java b/java/ql/test/query-tests/VisibleForTestingAbuse/packageone/SourcePackage.java
new file mode 100644
index 00000000000..7826f5e1ee0
--- /dev/null
+++ b/java/ql/test/query-tests/VisibleForTestingAbuse/packageone/SourcePackage.java
@@ -0,0 +1,38 @@
+package packageone;
+
+import packagetwo.Annotated;
+
+public class SourcePackage extends Annotated {
+    void f() {
+        // Fields - cross-package access (only accessible ones)
+        // String s = Annotated.m; // Cannot access package-private from different package
+        String s1 = Annotated.m1; // $ Alert
+        String s2 = Annotated.m2; // $ Alert
+        // String s3 = Annotated.m3; // Cannot access private field
+        
+        // Methods - cross-package access (only accessible ones)
+        // int i = Annotated.f(); // Cannot access package-private from different package
+        // int i1 = Annotated.fPrivate(); // Cannot access private method
+        int i2 = Annotated.fPublic(); // $ Alert
+        int i3 = Annotated.fProtected(); // $ Alert
+        
+        // Same package class
+        AnnotatedClass a = new AnnotatedClass(); // COMPLIANT - same package
+        
+        // Lambda usage - cross-package (only accessible members)
+        Runnable lambda = () -> {
+            // String lambdaS = Annotated.m; // Cannot access package-private
+            String lambdaS1 = Annotated.m1; // $ Alert
+            String lambdaS2 = Annotated.m2; // $ Alert
+            
+            // int lambdaI = Annotated.f(); // Cannot access package-private
+            int lambdaI2 = Annotated.fPublic(); // $ Alert
+            int lambdaI3 = Annotated.fProtected(); // $ Alert
+        };
+        lambda.run();
+    }
+    String myField1 = Annotated.m1; // $ Alert
+    public String myField2 = Annotated.m1; // $ Alert
+    private String myField3 = Annotated.m1; // $ Alert
+    protected String myField4 = Annotated.m1; // $ Alert
+}
diff --git a/java/ql/test/query-tests/VisibleForTestingAbuse/packageone/SourcePackage1.java b/java/ql/test/query-tests/VisibleForTestingAbuse/packageone/SourcePackage1.java
new file mode 100644
index 00000000000..d47aa167b46
--- /dev/null
+++ b/java/ql/test/query-tests/VisibleForTestingAbuse/packageone/SourcePackage1.java
@@ -0,0 +1,22 @@
+package packageone;
+
+import packagetwo.Annotated;
+
+public class SourcePackage1 extends Annotated {
+    @VisibleForTesting
+    public void f() {
+
+        String s1 = Annotated.m1;
+        String s2 = Annotated.m2;
+
+        int i2 = Annotated.fPublic();
+        int i3 = Annotated.fProtected();
+
+        Runnable lambda = () -> {
+            String lambdaS1 = Annotated.m1;
+            String lambdaS2 = Annotated.m2;
+            int lambdaI2 = Annotated.fPublic();
+            int lambdaI3 = Annotated.fProtected();
+        };
+    }
+}
diff --git a/java/ql/test/query-tests/VisibleForTestingAbuse/packageone/VisibleForTesting.java b/java/ql/test/query-tests/VisibleForTestingAbuse/packageone/VisibleForTesting.java
new file mode 100644
index 00000000000..28aedbf4e53
--- /dev/null
+++ b/java/ql/test/query-tests/VisibleForTestingAbuse/packageone/VisibleForTesting.java
@@ -0,0 +1,4 @@
+package packageone;
+
+public @interface VisibleForTesting {
+}
diff --git a/java/ql/test/query-tests/VisibleForTestingAbuse/packagetwo/Annotated.java b/java/ql/test/query-tests/VisibleForTestingAbuse/packagetwo/Annotated.java
new file mode 100644
index 00000000000..ad5dbed3f9b
--- /dev/null
+++ b/java/ql/test/query-tests/VisibleForTestingAbuse/packagetwo/Annotated.java
@@ -0,0 +1,92 @@
+package packagetwo;
+
+import packageone.*;
+
+public class Annotated {
+    @VisibleForTesting
+    static String m;
+    @VisibleForTesting
+    static protected String m1;
+    @VisibleForTesting
+    static public String m2;
+    @VisibleForTesting
+    static private String m3;
+
+    @VisibleForTesting
+    static int f() {
+        return 1;
+    }
+
+    @VisibleForTesting
+    static private int fPrivate() {
+        return 1;
+    }
+
+    @VisibleForTesting
+    static public int fPublic() {
+        return 1;
+    }
+
+    @VisibleForTesting
+    static protected int fProtected() {
+        return 1;
+    }
+
+    private static void resetPriorities() {
+        String priority = m;
+        String priority1 = m1;
+        String priority2 = m2;
+        String priority3 = m3;
+
+        int result = f();
+        int resultPrivate = fPrivate();
+        int resultPublic = fPublic();
+        int resultProtected = fProtected();
+    }
+
+    private static void resetPriorities2() {
+        Runnable task = () -> {
+            String priority = m;
+            String priority1 = m1;
+            String priority2 = m2;
+            String priority3 = m3;
+
+            int result = f();
+            int resultPrivate = fPrivate();
+            int resultPublic = fPublic();
+            int resultProtected = fProtected();
+        };
+        task.run();
+    }
+
+    private static class InnerClass {
+        void useVisibleForMembers() {
+            String field = m;
+            String field1 = m1;
+            String field2 = m2;
+            String field3 = m3;
+
+            int method = f();
+            int methodPrivate = fPrivate();
+            int methodPublic = fPublic();
+            int methodProtected = fProtected();
+        }
+    }
+
+    @VisibleForTesting
+    static class InnerTestClass {
+        @VisibleForTesting
+        int getSize() {
+            return 42;
+        }
+        
+        @VisibleForTesting
+        private String data;
+    }
+    
+    private void useInnerClass() {
+        InnerTestClass inner = new InnerTestClass();
+        int size = inner.getSize();
+        String value = inner.data;
+    }
+}
diff --git a/java/ql/test/query-tests/VisibleForTestingAbuse/packagetwo/Source.java b/java/ql/test/query-tests/VisibleForTestingAbuse/packagetwo/Source.java
new file mode 100644
index 00000000000..94a5cccfd43
--- /dev/null
+++ b/java/ql/test/query-tests/VisibleForTestingAbuse/packagetwo/Source.java
@@ -0,0 +1,34 @@
+package packagetwo;
+
+import packageone.*;
+
+public class Source {
+    void f() {
+        // Fields
+        String s = Annotated.m; // $ Alert
+        String s1 = Annotated.m1; // COMPLIANT - same package
+        String s2 = Annotated.m2;
+        // String s3 = Annotated.m3; // Cannot access private field
+        
+        // Methods
+        int i = Annotated.f(); // $ Alert
+        // int i1 = Annotated.fPrivate(); // Cannot access private method
+        int i2 = Annotated.fPublic();
+        int i3 = Annotated.fProtected();
+        
+        // Other class
+        AnnotatedClass a = new AnnotatedClass(); // $ Alert
+        
+        // Lambda usage
+        Runnable lambda = () -> {
+            String lambdaS = Annotated.m; // $ Alert
+            String lambdaS1 = Annotated.m1;
+            String lambdaS2 = Annotated.m2;
+            
+            int lambdaI = Annotated.f(); // $ Alert
+            int lambdaI2 = Annotated.fPublic();
+            int lambdaI3 = Annotated.fProtected();
+        };
+        lambda.run();
+    }
+}
diff --git a/java/ql/test/query-tests/VisibleForTestingAbuse/packagetwo/Test.java b/java/ql/test/query-tests/VisibleForTestingAbuse/packagetwo/Test.java
new file mode 100644
index 00000000000..b861d921e9a
--- /dev/null
+++ b/java/ql/test/query-tests/VisibleForTestingAbuse/packagetwo/Test.java
@@ -0,0 +1,34 @@
+package packagetwo;
+
+import packageone.*;
+
+public class Test {
+    void f() {
+        // Fields
+        String s = Annotated.m; // COMPLIANT
+        String s1 = Annotated.m1; // COMPLIANT
+        String s2 = Annotated.m2; // COMPLIANT
+        // String s3 = Annotated.m3; // Cannot access private field
+        
+        // Methods
+        int i = Annotated.f(); // COMPLIANT
+        // int i1 = Annotated.fPrivate(); // Cannot access private method
+        int i2 = Annotated.fPublic(); // COMPLIANT
+        int i3 = Annotated.fProtected(); // COMPLIANT
+        
+        // Other class
+        AnnotatedClass a = new AnnotatedClass(); // COMPLIANT
+        
+        // Lambda usage
+        Runnable lambda = () -> {
+            String lambdaS = Annotated.m; // COMPLIANT
+            String lambdaS1 = Annotated.m1; // COMPLIANT
+            String lambdaS2 = Annotated.m2; // COMPLIANT
+            
+            int lambdaI = Annotated.f(); // COMPLIANT
+            int lambdaI2 = Annotated.fPublic(); // COMPLIANT
+            int lambdaI3 = Annotated.fProtected(); // COMPLIANT
+        };
+        lambda.run();
+    }
+}
diff --git a/java/ql/test/query-tests/VisibleForTestingAbuse/packagetwo/UseWithinAnnotation.java b/java/ql/test/query-tests/VisibleForTestingAbuse/packagetwo/UseWithinAnnotation.java
new file mode 100644
index 00000000000..f6cdb32d53c
--- /dev/null
+++ b/java/ql/test/query-tests/VisibleForTestingAbuse/packagetwo/UseWithinAnnotation.java
@@ -0,0 +1,18 @@
+package packagetwo;
+
+import packageone.*;
+
+@interface Range {
+    int min() default 0;
+    int max() default 100;
+}
+
+public class UseWithinAnnotation {
+    @VisibleForTesting
+    static final int MAX_LISTING_LENGTH_MIN = 1;
+    @VisibleForTesting
+    static final int MAX_LISTING_LENGTH_MAX = 1000;
+
+    @Range(min = MAX_LISTING_LENGTH_MIN, max = MAX_LISTING_LENGTH_MAX)
+    private int maxListingLength = MAX_LISTING_LENGTH_MAX;
+}
diff --git a/java/ql/test/experimental/query-tests/security/CWE-1004/SensitiveCookieNotHttpOnly.expected b/java/ql/test/query-tests/security/CWE-1004/SensitiveCookieNotHttpOnly.expected
similarity index 93%
rename from java/ql/test/experimental/query-tests/security/CWE-1004/SensitiveCookieNotHttpOnly.expected
rename to java/ql/test/query-tests/security/CWE-1004/SensitiveCookieNotHttpOnly.expected
index caecb52fe45..f00a00c7258 100644
--- a/java/ql/test/experimental/query-tests/security/CWE-1004/SensitiveCookieNotHttpOnly.expected
+++ b/java/ql/test/query-tests/security/CWE-1004/SensitiveCookieNotHttpOnly.expected
@@ -1,3 +1,14 @@
+#select
+| SensitiveCookieNotHttpOnly.java:31:28:31:36 | jwtCookie | SensitiveCookieNotHttpOnly.java:24:33:24:43 | "jwt_token" : String | SensitiveCookieNotHttpOnly.java:31:28:31:36 | jwtCookie | $@ doesn't have the HttpOnly flag set. | SensitiveCookieNotHttpOnly.java:24:33:24:43 | "jwt_token" : String | This sensitive cookie |
+| SensitiveCookieNotHttpOnly.java:42:42:42:69 | ... + ... | SensitiveCookieNotHttpOnly.java:42:42:42:49 | "token=" : String | SensitiveCookieNotHttpOnly.java:42:42:42:69 | ... + ... | $@ doesn't have the HttpOnly flag set. | SensitiveCookieNotHttpOnly.java:42:42:42:49 | "token=" : String | This sensitive cookie |
+| SensitiveCookieNotHttpOnly.java:42:42:42:69 | ... + ... | SensitiveCookieNotHttpOnly.java:42:42:42:57 | ... + ... : String | SensitiveCookieNotHttpOnly.java:42:42:42:69 | ... + ... | $@ doesn't have the HttpOnly flag set. | SensitiveCookieNotHttpOnly.java:42:42:42:57 | ... + ... : String | This sensitive cookie |
+| SensitiveCookieNotHttpOnly.java:42:42:42:69 | ... + ... | SensitiveCookieNotHttpOnly.java:42:42:42:69 | ... + ... | SensitiveCookieNotHttpOnly.java:42:42:42:69 | ... + ... | $@ doesn't have the HttpOnly flag set. | SensitiveCookieNotHttpOnly.java:42:42:42:69 | ... + ... | This sensitive cookie |
+| SensitiveCookieNotHttpOnly.java:52:42:52:124 | toString(...) | SensitiveCookieNotHttpOnly.java:52:56:52:75 | "session-access-key" : String | SensitiveCookieNotHttpOnly.java:52:42:52:124 | toString(...) | $@ doesn't have the HttpOnly flag set. | SensitiveCookieNotHttpOnly.java:52:56:52:75 | "session-access-key" : String | This sensitive cookie |
+| SensitiveCookieNotHttpOnly.java:65:42:65:47 | keyStr | SensitiveCookieNotHttpOnly.java:63:51:63:70 | "session-access-key" : String | SensitiveCookieNotHttpOnly.java:65:42:65:47 | keyStr | $@ doesn't have the HttpOnly flag set. | SensitiveCookieNotHttpOnly.java:63:51:63:70 | "session-access-key" : String | This sensitive cookie |
+| SensitiveCookieNotHttpOnly.java:71:42:71:50 | secString | SensitiveCookieNotHttpOnly.java:70:28:70:35 | "token=" : String | SensitiveCookieNotHttpOnly.java:71:42:71:50 | secString | $@ doesn't have the HttpOnly flag set. | SensitiveCookieNotHttpOnly.java:70:28:70:35 | "token=" : String | This sensitive cookie |
+| SensitiveCookieNotHttpOnly.java:71:42:71:50 | secString | SensitiveCookieNotHttpOnly.java:70:28:70:43 | ... + ... : String | SensitiveCookieNotHttpOnly.java:71:42:71:50 | secString | $@ doesn't have the HttpOnly flag set. | SensitiveCookieNotHttpOnly.java:70:28:70:43 | ... + ... : String | This sensitive cookie |
+| SensitiveCookieNotHttpOnly.java:71:42:71:50 | secString | SensitiveCookieNotHttpOnly.java:70:28:70:55 | ... + ... : String | SensitiveCookieNotHttpOnly.java:71:42:71:50 | secString | $@ doesn't have the HttpOnly flag set. | SensitiveCookieNotHttpOnly.java:70:28:70:55 | ... + ... : String | This sensitive cookie |
+| SensitiveCookieNotHttpOnly.java:111:28:111:33 | cookie | SensitiveCookieNotHttpOnly.java:88:35:88:51 | "Presto-UI-Token" : String | SensitiveCookieNotHttpOnly.java:111:28:111:33 | cookie | $@ doesn't have the HttpOnly flag set. | SensitiveCookieNotHttpOnly.java:88:35:88:51 | "Presto-UI-Token" : String | This sensitive cookie |
 edges
 | SensitiveCookieNotHttpOnly.java:24:33:24:43 | "jwt_token" : String | SensitiveCookieNotHttpOnly.java:25:39:25:52 | tokenCookieStr : String | provenance |  |
 | SensitiveCookieNotHttpOnly.java:25:28:25:64 | new Cookie(...) : Cookie | SensitiveCookieNotHttpOnly.java:31:28:31:36 | jwtCookie | provenance | Sink:MaD:1 |
@@ -53,15 +64,4 @@ nodes
 | SensitiveCookieNotHttpOnly.java:91:16:91:21 | cookie : Cookie | semmle.label | cookie : Cookie |
 | SensitiveCookieNotHttpOnly.java:110:25:110:64 | createAuthenticationCookie(...) : Cookie | semmle.label | createAuthenticationCookie(...) : Cookie |
 | SensitiveCookieNotHttpOnly.java:111:28:111:33 | cookie | semmle.label | cookie |
-problems
-| SensitiveCookieNotHttpOnly.java:31:28:31:36 | jwtCookie | SensitiveCookieNotHttpOnly.java:24:33:24:43 | "jwt_token" : String | SensitiveCookieNotHttpOnly.java:31:28:31:36 | jwtCookie | $@ doesn't have the HttpOnly flag set. | SensitiveCookieNotHttpOnly.java:24:33:24:43 | "jwt_token" | This sensitive cookie |
-| SensitiveCookieNotHttpOnly.java:42:42:42:69 | ... + ... | SensitiveCookieNotHttpOnly.java:42:42:42:49 | "token=" : String | SensitiveCookieNotHttpOnly.java:42:42:42:69 | ... + ... | $@ doesn't have the HttpOnly flag set. | SensitiveCookieNotHttpOnly.java:42:42:42:49 | "token=" | This sensitive cookie |
-| SensitiveCookieNotHttpOnly.java:42:42:42:69 | ... + ... | SensitiveCookieNotHttpOnly.java:42:42:42:57 | ... + ... : String | SensitiveCookieNotHttpOnly.java:42:42:42:69 | ... + ... | $@ doesn't have the HttpOnly flag set. | SensitiveCookieNotHttpOnly.java:42:42:42:57 | ... + ... | This sensitive cookie |
-| SensitiveCookieNotHttpOnly.java:42:42:42:69 | ... + ... | SensitiveCookieNotHttpOnly.java:42:42:42:69 | ... + ... | SensitiveCookieNotHttpOnly.java:42:42:42:69 | ... + ... | $@ doesn't have the HttpOnly flag set. | SensitiveCookieNotHttpOnly.java:42:42:42:69 | ... + ... | This sensitive cookie |
-| SensitiveCookieNotHttpOnly.java:52:42:52:124 | toString(...) | SensitiveCookieNotHttpOnly.java:52:56:52:75 | "session-access-key" : String | SensitiveCookieNotHttpOnly.java:52:42:52:124 | toString(...) | $@ doesn't have the HttpOnly flag set. | SensitiveCookieNotHttpOnly.java:52:56:52:75 | "session-access-key" | This sensitive cookie |
-| SensitiveCookieNotHttpOnly.java:65:42:65:47 | keyStr | SensitiveCookieNotHttpOnly.java:63:51:63:70 | "session-access-key" : String | SensitiveCookieNotHttpOnly.java:65:42:65:47 | keyStr | $@ doesn't have the HttpOnly flag set. | SensitiveCookieNotHttpOnly.java:63:51:63:70 | "session-access-key" | This sensitive cookie |
-| SensitiveCookieNotHttpOnly.java:71:42:71:50 | secString | SensitiveCookieNotHttpOnly.java:70:28:70:35 | "token=" : String | SensitiveCookieNotHttpOnly.java:71:42:71:50 | secString | $@ doesn't have the HttpOnly flag set. | SensitiveCookieNotHttpOnly.java:70:28:70:35 | "token=" | This sensitive cookie |
-| SensitiveCookieNotHttpOnly.java:71:42:71:50 | secString | SensitiveCookieNotHttpOnly.java:70:28:70:43 | ... + ... : String | SensitiveCookieNotHttpOnly.java:71:42:71:50 | secString | $@ doesn't have the HttpOnly flag set. | SensitiveCookieNotHttpOnly.java:70:28:70:43 | ... + ... | This sensitive cookie |
-| SensitiveCookieNotHttpOnly.java:71:42:71:50 | secString | SensitiveCookieNotHttpOnly.java:70:28:70:55 | ... + ... : String | SensitiveCookieNotHttpOnly.java:71:42:71:50 | secString | $@ doesn't have the HttpOnly flag set. | SensitiveCookieNotHttpOnly.java:70:28:70:55 | ... + ... | This sensitive cookie |
-| SensitiveCookieNotHttpOnly.java:111:28:111:33 | cookie | SensitiveCookieNotHttpOnly.java:88:35:88:51 | "Presto-UI-Token" : String | SensitiveCookieNotHttpOnly.java:111:28:111:33 | cookie | $@ doesn't have the HttpOnly flag set. | SensitiveCookieNotHttpOnly.java:88:35:88:51 | "Presto-UI-Token" | This sensitive cookie |
 subpaths
diff --git a/java/ql/test/experimental/query-tests/security/CWE-1004/SensitiveCookieNotHttpOnly.java b/java/ql/test/query-tests/security/CWE-1004/SensitiveCookieNotHttpOnly.java
similarity index 92%
rename from java/ql/test/experimental/query-tests/security/CWE-1004/SensitiveCookieNotHttpOnly.java
rename to java/ql/test/query-tests/security/CWE-1004/SensitiveCookieNotHttpOnly.java
index 627575c8403..91f8f3ad4ce 100644
--- a/java/ql/test/experimental/query-tests/security/CWE-1004/SensitiveCookieNotHttpOnly.java
+++ b/java/ql/test/query-tests/security/CWE-1004/SensitiveCookieNotHttpOnly.java
@@ -21,14 +21,14 @@ class SensitiveCookieNotHttpOnly {
 
     // BAD - Tests adding a sensitive cookie without the `HttpOnly` flag set.
     public void addCookie2(String jwt_token, String userId, HttpServletRequest request, HttpServletResponse response) {
-        String tokenCookieStr = "jwt_token";
+        String tokenCookieStr = "jwt_token"; // $Source
         Cookie jwtCookie = new Cookie(tokenCookieStr, jwt_token);
         Cookie userIdCookie = new Cookie("user_id", userId);
         jwtCookie.setPath("/");
         userIdCookie.setPath("/");
         jwtCookie.setMaxAge(3600*24*7);
         userIdCookie.setMaxAge(3600*24*7);
-        response.addCookie(jwtCookie);
+        response.addCookie(jwtCookie); // $Alert
         response.addCookie(userIdCookie);
     }
 
@@ -39,7 +39,7 @@ class SensitiveCookieNotHttpOnly {
 
     // BAD - Tests set a sensitive cookie header without the `HttpOnly` flag set.
     public void addCookie4(String authId, HttpServletRequest request, HttpServletResponse response) {
-        response.addHeader("Set-Cookie", "token=" +authId + ";Secure");
+        response.addHeader("Set-Cookie", "token=" +authId + ";Secure"); // $Alert
     }
     
     // GOOD - Tests set a sensitive cookie header using the class `javax.ws.rs.core.Cookie` with the `HttpOnly` flag set through string concatenation.
@@ -49,7 +49,7 @@ class SensitiveCookieNotHttpOnly {
 
     // BAD - Tests set a sensitive cookie header using the class `javax.ws.rs.core.Cookie` without the `HttpOnly` flag set.
     public void addCookie6(String accessKey, HttpServletRequest request, HttpServletResponse response) {
-        response.setHeader("Set-Cookie", new NewCookie("session-access-key", accessKey, "/", null, null, 0, true).toString());
+        response.setHeader("Set-Cookie", new NewCookie("session-access-key", accessKey, "/", null, null, 0, true).toString()); // $Alert
     }
 
     // GOOD - Tests set a sensitive cookie header using the class `javax.ws.rs.core.Cookie` with the `HttpOnly` flag set through the constructor.
@@ -60,15 +60,15 @@ class SensitiveCookieNotHttpOnly {
 
     // BAD - Tests set a sensitive cookie header using the class `javax.ws.rs.core.Cookie` without the `HttpOnly` flag set.
     public void addCookie8(String accessKey, HttpServletRequest request, HttpServletResponse response) {
-        NewCookie accessKeyCookie = new NewCookie("session-access-key", accessKey, "/", null, 0, null, 86400, true);
+        NewCookie accessKeyCookie = new NewCookie("session-access-key", accessKey, "/", null, 0, null, 86400, true);  // $Source
         String keyStr = accessKeyCookie.toString();
-        response.setHeader("Set-Cookie", keyStr);
+        response.setHeader("Set-Cookie", keyStr); // $Alert
     }
 
     // BAD - Tests set a sensitive cookie header using a variable without the `HttpOnly` flag set.
     public void addCookie9(String authId, HttpServletRequest request, HttpServletResponse response) {
-        String secString = "token=" +authId + ";Secure";
-        response.addHeader("Set-Cookie", secString);
+        String secString = "token=" +authId + ";Secure";  // $Source
+        response.addHeader("Set-Cookie", secString); // $Alert
     }
 
     // GOOD - Tests set a sensitive cookie header with the `HttpOnly` flag set using `String.format(...)`.
@@ -85,7 +85,7 @@ class SensitiveCookieNotHttpOnly {
     }
 
     public Cookie createAuthenticationCookie(HttpServletRequest request, String jwt) {
-        String PRESTO_UI_COOKIE = "Presto-UI-Token";
+        String PRESTO_UI_COOKIE = "Presto-UI-Token"; // $Source
         Cookie cookie = new Cookie(PRESTO_UI_COOKIE, jwt);
         cookie.setPath("/ui");
         return cookie;
@@ -108,7 +108,7 @@ class SensitiveCookieNotHttpOnly {
     // BAD - Tests set a sensitive cookie header without the `HttpOnly` flag set using a wrapper method.
     public void addCookie12(HttpServletRequest request, HttpServletResponse response, String jwt) {
         Cookie cookie = createAuthenticationCookie(request, jwt);
-        response.addCookie(cookie);
+        response.addCookie(cookie); // $Alert
     }
 
     // GOOD - Tests remove a sensitive cookie header without the `HttpOnly` flag set using a wrapper method.
@@ -141,7 +141,7 @@ class SensitiveCookieNotHttpOnly {
     // This example is missed because the `cookie.setHttpOnly` call in `createCookie` is thought to maybe set the HTTP-only flag, and the `cookie`
     // object flows to this `addCookie` call.
     public void addCookie15(HttpServletRequest request, HttpServletResponse response, String refreshToken) {
-        response.addCookie(createCookie("refresh_token", refreshToken, false));
+        response.addCookie(createCookie("refresh_token", refreshToken, false)); // $MISSING:Alert
     }
 
     // GOOD - CSRF token doesn't need to have the `HttpOnly` flag set.
diff --git a/java/ql/test/query-tests/security/CWE-1004/SensitiveCookieNotHttpOnly.qlref b/java/ql/test/query-tests/security/CWE-1004/SensitiveCookieNotHttpOnly.qlref
new file mode 100644
index 00000000000..fd347f0adf8
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-1004/SensitiveCookieNotHttpOnly.qlref
@@ -0,0 +1,4 @@
+query: Security/CWE/CWE-1004/SensitiveCookieNotHttpOnly.ql
+postprocess: 
+- utils/test/InlineExpectationsTestQuery.ql
+- utils/test/PrettyPrintModels.ql
\ No newline at end of file
diff --git a/java/ql/test/query-tests/security/CWE-1004/options b/java/ql/test/query-tests/security/CWE-1004/options
new file mode 100644
index 00000000000..0db0b6e7242
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-1004/options
@@ -0,0 +1 @@
+// semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/servlet-api-2.4:${testdir}/../../../stubs/jsr311-api-1.1.1:${testdir}/../../../stubs/springframework-5.8.x
diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/SpringBootActuatorsConfig.expected b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/SpringBootActuatorsConfig.expected
new file mode 100644
index 00000000000..8845d970df2
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/SpringBootActuatorsConfig.expected
@@ -0,0 +1,8 @@
+| Version1.0.x-1.4.x/bad/default/pom.xml:29:9:32:22 | dependency | Insecure Spring Boot actuator $@ exposes sensitive endpoints. | file://:0:0:0:0 | (none) | configuration |
+| Version1.0.x-1.4.x/bad/false/pom.xml:29:9:32:22 | dependency | Insecure Spring Boot actuator $@ exposes sensitive endpoints. | Version1.0.x-1.4.x/bad/false/application.properties:2:1:2:33 | management.security.enabled=false | configuration |
+| Version1.5.x/bad/pom.xml:29:9:32:22 | dependency | Insecure Spring Boot actuator $@ exposes sensitive endpoints. | Version1.5.x/bad/application.properties:2:1:2:33 | management.security.enabled=false | configuration |
+| Version2.x/bad/expose/pom.xml:29:9:32:22 | dependency | Insecure Spring Boot actuator $@ exposes sensitive endpoints. | Version2.x/bad/expose/application.properties:2:1:2:33 | management.endpoints.web.expose=* | configuration |
+| Version2.x/bad/exposure-include/all-exposed/pom.xml:29:9:32:22 | dependency | Insecure Spring Boot actuator $@ exposes sensitive endpoints. | Version2.x/bad/exposure-include/all-exposed/application.properties:2:1:2:43 | management.endpoints.web.exposure.include=* | configuration |
+| Version2.x/bad/exposure-include/some-exposed/pom.xml:29:9:32:22 | dependency | Insecure Spring Boot actuator $@ exposes sensitive endpoints. | Version2.x/bad/exposure-include/some-exposed/application.properties:2:1:2:59 | management.endpoints.web.exposure.include=health,info,beans | configuration |
+| Version3.x/bad/all-exposed/pom.xml:29:9:32:22 | dependency | Insecure Spring Boot actuator $@ exposes sensitive endpoints. | Version3.x/bad/all-exposed/application.properties:2:1:2:43 | management.endpoints.web.exposure.include=* | configuration |
+| Version3.x/bad/some-exposed/pom.xml:29:9:32:22 | dependency | Insecure Spring Boot actuator $@ exposes sensitive endpoints. | Version3.x/bad/some-exposed/application.properties:2:1:2:59 | management.endpoints.web.exposure.include=health,info,beans | configuration |
diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/SpringBootActuatorsConfig.qlref b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/SpringBootActuatorsConfig.qlref
new file mode 100644
index 00000000000..eec8ba18ae1
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/SpringBootActuatorsConfig.qlref
@@ -0,0 +1,2 @@
+query: Security/CWE/CWE-200/SpringBootActuatorsConfig/SpringBootActuatorsConfig.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.0.x-1.4.x/bad/default/application.properties b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.0.x-1.4.x/bad/default/application.properties
new file mode 100644
index 00000000000..a41bbc9fdca
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.0.x-1.4.x/bad/default/application.properties
@@ -0,0 +1 @@
+# vulnerable configuration (spring boot 1.0 - 1.4): exposes actuators by default
\ No newline at end of file
diff --git a/java/ql/src/experimental/Security/CWE/CWE-016/pom_bad.xml b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.0.x-1.4.x/bad/default/pom.xml
similarity index 93%
rename from java/ql/src/experimental/Security/CWE/CWE-016/pom_bad.xml
rename to java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.0.x-1.4.x/bad/default/pom.xml
index 9dd5c9c188b..83c7d2685f3 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-016/pom_bad.xml
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.0.x-1.4.x/bad/default/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.3.8.RELEASE</version>
+        <version>1.2.6.RELEASE</version>
         <relativePath/>
     </parent>
 
@@ -29,18 +29,15 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
+        </dependency> <!-- $ Alert -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-devtools</artifactId>
         </dependency>
-
-        <!-- BAD: No Spring Security enabled -->
         <!-- dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>
         </dependency -->
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-test</artifactId>
diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.0.x-1.4.x/bad/false/application.properties b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.0.x-1.4.x/bad/false/application.properties
new file mode 100644
index 00000000000..621b859214c
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.0.x-1.4.x/bad/false/application.properties
@@ -0,0 +1,2 @@
+# vulnerable configuration (spring boot 1.0 - 1.4): exposes actuators by default
+management.security.enabled=false
\ No newline at end of file
diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.0.x-1.4.x/bad/false/pom.xml b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.0.x-1.4.x/bad/false/pom.xml
new file mode 100644
index 00000000000..83c7d2685f3
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.0.x-1.4.x/bad/false/pom.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>spring-boot-actuator-app</groupId>
+    <artifactId>spring-boot-actuator-app</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
+
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>1.2.6.RELEASE</version>
+        <relativePath/>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency> <!-- $ Alert -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+        </dependency>
+        <!-- dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-test</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.0.x-1.4.x/good/application.properties b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.0.x-1.4.x/good/application.properties
new file mode 100644
index 00000000000..6cadc4c756d
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.0.x-1.4.x/good/application.properties
@@ -0,0 +1,2 @@
+# safe configuration (spring boot 1.0 - 1.4): exposes actuators by default
+management.security.enabled=true
\ No newline at end of file
diff --git a/java/ql/src/experimental/Security/CWE/CWE-016/pom_good.xml b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.0.x-1.4.x/good/pom.xml
similarity index 94%
rename from java/ql/src/experimental/Security/CWE/CWE-016/pom_good.xml
rename to java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.0.x-1.4.x/good/pom.xml
index 89f577f21e5..452d4b69c35 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-016/pom_good.xml
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.0.x-1.4.x/good/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.3.8.RELEASE</version>
+        <version>1.2.6.RELEASE</version>
         <relativePath/>
     </parent>
 
@@ -34,13 +34,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-devtools</artifactId>
         </dependency>
-
-        <!-- GOOD: Enable Spring Security -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-test</artifactId>
diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.5.x/bad/application.properties b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.5.x/bad/application.properties
new file mode 100644
index 00000000000..f1e8f6587d0
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.5.x/bad/application.properties
@@ -0,0 +1,2 @@
+# safe configuration (spring boot 1.5+): requires value false to expose sensitive actuators
+management.security.enabled=false
\ No newline at end of file
diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.5.x/bad/pom.xml b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.5.x/bad/pom.xml
new file mode 100644
index 00000000000..aa1a4bcaf05
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.5.x/bad/pom.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>spring-boot-actuator-app</groupId>
+    <artifactId>spring-boot-actuator-app</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
+
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>1.5.6.RELEASE</version>
+        <relativePath/>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency> <!-- $ Alert -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+        </dependency>
+        <!-- dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-test</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.5.x/good/application.properties b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.5.x/good/application.properties
new file mode 100644
index 00000000000..bec45a22b82
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.5.x/good/application.properties
@@ -0,0 +1,2 @@
+# vulnerable configuration (spring boot 1.5+): requires value false to expose sensitive actuators
+management.security.enabled=true
\ No newline at end of file
diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.5.x/good/pom.xml b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.5.x/good/pom.xml
new file mode 100644
index 00000000000..39b46bef7e4
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.5.x/good/pom.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>spring-boot-actuator-app</groupId>
+    <artifactId>spring-boot-actuator-app</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
+
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>1.5.6.RELEASE</version>
+        <relativePath/>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-test</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version2.x/bad/expose/application.properties b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version2.x/bad/expose/application.properties
new file mode 100644
index 00000000000..338b1fb3a9c
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version2.x/bad/expose/application.properties
@@ -0,0 +1,2 @@
+# vulnerable configuration (spring boot 2.0.0.RC1): exposes health and info only by default, here overridden to expose everything
+management.endpoints.web.expose=*
\ No newline at end of file
diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version2.x/bad/expose/pom.xml b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version2.x/bad/expose/pom.xml
new file mode 100644
index 00000000000..c22f08d7e7e
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version2.x/bad/expose/pom.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>spring-boot-actuator-app</groupId>
+    <artifactId>spring-boot-actuator-app</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
+
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.2.6.RELEASE</version>
+        <relativePath/>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency> <!-- $ Alert -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+        </dependency>
+        <!-- dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-test</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version2.x/bad/exposure-include/all-exposed/application.properties b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version2.x/bad/exposure-include/all-exposed/application.properties
new file mode 100644
index 00000000000..bbc1915b05e
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version2.x/bad/exposure-include/all-exposed/application.properties
@@ -0,0 +1,2 @@
+# vulnerable configuration (spring boot 2+): exposes health and info only by default, here overridden to expose everything
+management.endpoints.web.exposure.include=*
\ No newline at end of file
diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version2.x/bad/exposure-include/all-exposed/pom.xml b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version2.x/bad/exposure-include/all-exposed/pom.xml
new file mode 100644
index 00000000000..c22f08d7e7e
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version2.x/bad/exposure-include/all-exposed/pom.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>spring-boot-actuator-app</groupId>
+    <artifactId>spring-boot-actuator-app</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
+
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.2.6.RELEASE</version>
+        <relativePath/>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency> <!-- $ Alert -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+        </dependency>
+        <!-- dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-test</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version2.x/bad/exposure-include/some-exposed/application.properties b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version2.x/bad/exposure-include/some-exposed/application.properties
new file mode 100644
index 00000000000..1f29407c192
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version2.x/bad/exposure-include/some-exposed/application.properties
@@ -0,0 +1,2 @@
+# vulnerable configuration (spring boot 2+): exposes health and info only by default, here overridden to also expose beans
+management.endpoints.web.exposure.include=health,info,beans
\ No newline at end of file
diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version2.x/bad/exposure-include/some-exposed/pom.xml b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version2.x/bad/exposure-include/some-exposed/pom.xml
new file mode 100644
index 00000000000..c22f08d7e7e
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version2.x/bad/exposure-include/some-exposed/pom.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>spring-boot-actuator-app</groupId>
+    <artifactId>spring-boot-actuator-app</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
+
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.2.6.RELEASE</version>
+        <relativePath/>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency> <!-- $ Alert -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+        </dependency>
+        <!-- dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-test</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version2.x/good/application.properties b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version2.x/good/application.properties
new file mode 100644
index 00000000000..f7e0c1b43ac
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version2.x/good/application.properties
@@ -0,0 +1,2 @@
+# safe configuration (spring boot 2+): exposes health and info only by default
+management.endpoints.web.exposure.include=info,health
\ No newline at end of file
diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version2.x/good/pom.xml b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version2.x/good/pom.xml
new file mode 100644
index 00000000000..e65ebf04701
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version2.x/good/pom.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>spring-boot-actuator-app</groupId>
+    <artifactId>spring-boot-actuator-app</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
+
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.2.6.RELEASE</version>
+        <relativePath/>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-test</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version3.x/bad/all-exposed/application.properties b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version3.x/bad/all-exposed/application.properties
new file mode 100644
index 00000000000..c5570065bae
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version3.x/bad/all-exposed/application.properties
@@ -0,0 +1,2 @@
+# vulnerable configuration (spring boot 3+): exposes health only by default, here overridden to expose everything
+management.endpoints.web.exposure.include=*
\ No newline at end of file
diff --git a/java/ql/test/experimental/query-tests/security/CWE-016/pom.xml b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version3.x/bad/all-exposed/pom.xml
similarity index 95%
rename from java/ql/test/experimental/query-tests/security/CWE-016/pom.xml
rename to java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version3.x/bad/all-exposed/pom.xml
index a9d5fa920c8..12dab1d9421 100644
--- a/java/ql/test/experimental/query-tests/security/CWE-016/pom.xml
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version3.x/bad/all-exposed/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.3.8.RELEASE</version>
+        <version>3.3.5</version>
         <relativePath/>
     </parent>
 
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
+        </dependency> <!-- $ Alert -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-devtools</artifactId>
diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version3.x/bad/some-exposed/application.properties b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version3.x/bad/some-exposed/application.properties
new file mode 100644
index 00000000000..27d08eac74f
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version3.x/bad/some-exposed/application.properties
@@ -0,0 +1,2 @@
+# vulnerable configuration (spring boot 3+): exposes health only by default, here overridden to also expose info and beans
+management.endpoints.web.exposure.include=health,info,beans
\ No newline at end of file
diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version3.x/bad/some-exposed/pom.xml b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version3.x/bad/some-exposed/pom.xml
new file mode 100644
index 00000000000..12dab1d9421
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version3.x/bad/some-exposed/pom.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>spring-boot-actuator-app</groupId>
+    <artifactId>spring-boot-actuator-app</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
+
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>3.3.5</version>
+        <relativePath/>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency> <!-- $ Alert -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+        </dependency>
+        <!-- dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-test</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version3.x/good/application.properties b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version3.x/good/application.properties
new file mode 100644
index 00000000000..8ba56eadc35
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version3.x/good/application.properties
@@ -0,0 +1,2 @@
+# safe configuration (spring boot 3+): exposes health only by default.
+management.endpoints.web.exposure.include=health
\ No newline at end of file
diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version3.x/good/pom.xml b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version3.x/good/pom.xml
new file mode 100644
index 00000000000..a8103e681e4
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version3.x/good/pom.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>spring-boot-actuator-app</groupId>
+    <artifactId>spring-boot-actuator-app</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
+
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>3.3.5</version>
+        <relativePath/>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-test</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/java/ql/test/experimental/query-tests/security/CWE-016/options b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/options
similarity index 62%
rename from java/ql/test/experimental/query-tests/security/CWE-016/options
rename to java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/options
index 2ce7a4743cd..ab29fd4e46f 100644
--- a/java/ql/test/experimental/query-tests/security/CWE-016/options
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.8.x
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../../../stubs/springframework-5.8.x
diff --git a/java/ql/test/query-tests/security/CWE-918/SanitizationTests.java b/java/ql/test/query-tests/security/CWE-918/SanitizationTests.java
index 03a61cfcf97..f32de324a1d 100644
--- a/java/ql/test/query-tests/security/CWE-918/SanitizationTests.java
+++ b/java/ql/test/query-tests/security/CWE-918/SanitizationTests.java
@@ -119,8 +119,26 @@ public class SanitizationTests extends HttpServlet {
             String unsafeUri10 = String.format("%s://%s:%s%s", "http", "myserver.com", "80", request.getParameter("baduri10")); // $ Source
             HttpRequest unsafer10 = HttpRequest.newBuilder(new URI(unsafeUri10)).build(); // $ Alert
             client.send(unsafer10, null); // $ Alert
+
+            // GOOD: sanitisation by regexp validation
+            String param10 = request.getParameter("uri10");
+            if (param10.matches("[a-zA-Z0-9_-]+")) {
+                HttpRequest r10 = HttpRequest.newBuilder(new URI(param10)).build();
+                client.send(r10, null);
+            }
+            
+            String param11 = request.getParameter("uri11");
+            validate(param11);
+            HttpRequest r11 = HttpRequest.newBuilder(new URI(param11)).build();
+            client.send(r11, null);
         } catch (Exception e) {
             // TODO: handle exception
         }
     }
+
+    private void validate(String s) {
+        if (!s.matches("[a-zA-Z0-9_-]+")) {
+            throw new IllegalArgumentException("Invalid ID");
+        }
+    }
 }
diff --git a/java/ql/test/stubs/junit-4.13/LICENSE-junit.txt b/java/ql/test/stubs/junit-4.13/LICENSE-junit.txt
new file mode 100644
index 00000000000..fb686291a05
--- /dev/null
+++ b/java/ql/test/stubs/junit-4.13/LICENSE-junit.txt
@@ -0,0 +1,214 @@
+JUnit
+
+Eclipse Public License - v 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
+CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+      a) in the case of the initial Contributor, the initial code and
+         documentation distributed under this Agreement, and
+      b) in the case of each subsequent Contributor:
+
+      i) changes to the Program, and
+
+      ii) additions to the Program;
+
+      where such changes and/or additions to the Program originate from and are
+distributed by that particular Contributor. A Contribution 'originates' from a
+Contributor if it was added to the Program by such Contributor itself or anyone
+acting on such Contributor's behalf. Contributions do not include additions to
+the Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii) are
+not derivative works of the Program. 
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents " mean patent claims licensable by a Contributor which are
+necessarily infringed by the use or sale of its Contribution alone or when
+combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement,
+including all Contributors.
+
+2. GRANT OF RIGHTS
+
+      a) Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide, royalty-free copyright license to
+reproduce, prepare derivative works of, publicly display, publicly perform,
+distribute and sublicense the Contribution of such Contributor, if any, and
+such derivative works, in source code and object code form.
+
+      b) Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide, royalty-free patent license under
+Licensed Patents to make, use, sell, offer to sell, import and otherwise
+transfer the Contribution of such Contributor, if any, in source code and
+object code form. This patent license shall apply to the combination of the
+Contribution and the Program if, at the time the Contribution is added by the
+Contributor, such addition of the Contribution causes such combination to be
+covered by the Licensed Patents. The patent license shall not apply to any
+other combinations which include the Contribution. No hardware per se is
+licensed hereunder. 
+
+      c) Recipient understands that although each Contributor grants the
+licenses to its Contributions set forth herein, no assurances are provided by
+any Contributor that the Program does not infringe the patent or other
+intellectual property rights of any other entity. Each Contributor disclaims
+any liability to Recipient for claims brought by any other entity based on
+infringement of intellectual property rights or otherwise. As a condition to
+exercising the rights and licenses granted hereunder, each Recipient hereby
+assumes sole responsibility to secure any other intellectual property rights
+needed, if any. For example, if a third party patent license is required to
+allow Recipient to distribute the Program, it is Recipient's responsibility to
+acquire that license before distributing the Program.
+
+      d) Each Contributor represents that to its knowledge it has sufficient
+copyright rights in its Contribution, if any, to grant the copyright license
+set forth in this Agreement. 
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under
+its own license agreement, provided that:
+
+      a) it complies with the terms and conditions of this Agreement; and
+
+      b) its license agreement:
+
+      i) effectively disclaims on behalf of all Contributors all warranties and
+conditions, express and implied, including warranties or conditions of title
+and non-infringement, and implied warranties or conditions of merchantability
+and fitness for a particular purpose; 
+
+      ii) effectively excludes on behalf of all Contributors all liability for
+damages, including direct, indirect, special, incidental and consequential
+damages, such as lost profits; 
+
+      iii) states that any provisions which differ from this Agreement are
+offered by that Contributor alone and not by any other party; and
+
+      iv) states that source code for the Program is available from such
+Contributor, and informs licensees how to obtain it in a reasonable manner on
+or through a medium customarily used for software exchange. 
+
+When the Program is made available in source code form:
+
+      a) it must be made available under this Agreement; and 
+
+      b) a copy of this Agreement must be included with each copy of the
+Program. 
+
+Contributors may not remove or alter any copyright notices contained within the
+Program.
+
+Each Contributor must identify itself as the originator of its Contribution, if
+any, in a manner that reasonably allows subsequent Recipients to identify the
+originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with
+respect to end users, business partners and the like. While this license is
+intended to facilitate the commercial use of the Program, the Contributor who
+includes the Program in a commercial product offering should do so in a manner
+which does not create potential liability for other Contributors. Therefore, if
+a Contributor includes the Program in a commercial product offering, such
+Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
+every other Contributor ("Indemnified Contributor") against any losses, damages
+and costs (collectively "Losses") arising from claims, lawsuits and other legal
+actions brought by a third party against the Indemnified Contributor to the
+extent caused by the acts or omissions of such Commercial Contributor in
+connection with its distribution of the Program in a commercial product
+offering. The obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In order
+to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
+Contributor in writing of such claim, and b) allow the Commercial Contributor
+to control, and cooperate with the Commercial Contributor in, the defense and
+any related settlement negotiations. The Indemnified Contributor may
+participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product
+offering, Product X. That Contributor is then a Commercial Contributor. If that
+Commercial Contributor then makes performance claims, or offers warranties
+related to Product X, those performance claims and warranties are such
+Commercial Contributor's responsibility alone. Under this section, the
+Commercial Contributor would have to defend claims against the other
+Contributors related to those performance claims and warranties, and if a court
+requires any other Contributor to pay any damages as a result, the Commercial
+Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
+IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each
+Recipient is solely responsible for determining the appropriateness of using
+and distributing the Program and assumes all risks associated with its exercise
+of rights under this Agreement, including but not limited to the risks and
+costs of program errors, compliance with applicable laws, damage to or loss of
+data, programs or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
+CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
+PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
+GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable
+law, it shall not affect the validity or enforceability of the remainder of the
+terms of this Agreement, and without further action by the parties hereto, such
+provision shall be reformed to the minimum extent necessary to make such
+provision valid and enforceable.
+
+If Recipient institutes patent litigation against any
+entity (including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other software or
+hardware) infringes such Recipient's patent(s), then such Recipient's rights
+granted under Section 2(b) shall terminate as of the date such litigation is
+filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to
+comply with any of the material terms or conditions of this Agreement and does
+not cure such failure in a reasonable period of time after becoming aware of
+such noncompliance. If all Recipient's rights under this Agreement terminate,
+Recipient agrees to cease use and distribution of the Program as soon as
+reasonably practicable. However, Recipient's obligations under this Agreement
+and any licenses granted by Recipient relating to the Program shall continue
+and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in
+order to avoid inconsistency the Agreement is copyrighted and may only be
+modified in the following manner. The Agreement Steward reserves the right to
+publish new versions (including revisions) of this Agreement from time to time.
+No one other than the Agreement Steward has the right to modify this Agreement.
+The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to
+serve as the Agreement Steward to a suitable separate entity. Each new version
+of the Agreement will be given a distinguishing version number. The Program
+(including Contributions) may always be distributed subject to the version of
+the Agreement under which it was received. In addition, after a new version of
+the Agreement is published, Contributor may elect to distribute the Program
+(including its Contributions) under the new version. Except as expressly stated
+in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
+the intellectual property of any Contributor under this Agreement, whether
+expressly, by implication, estoppel or otherwise. All rights in the Program not
+expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the
+intellectual property laws of the United States of America. No party to this
+Agreement will bring a legal action under this Agreement more than one year
+after the cause of action arose. Each party waives its rights to a jury trial
+in any resulting litigation. 
+
diff --git a/java/ql/test/stubs/junit-4.13/org/junit/Assert.java b/java/ql/test/stubs/junit-4.13/org/junit/Assert.java
new file mode 100644
index 00000000000..cbd86acdb81
--- /dev/null
+++ b/java/ql/test/stubs/junit-4.13/org/junit/Assert.java
@@ -0,0 +1,472 @@
+package org.junit;
+
+import org.junit.function.ThrowingRunnable;
+
+//BSD License
+//
+//Copyright (c) 2000-2006, www.hamcrest.org
+//All rights reserved.
+//
+//Redistribution and use in source and binary forms, with or without
+//modification, are permitted provided that the following conditions are met:
+//
+//Redistributions of source code must retain the above copyright notice, this list of
+//conditions and the following disclaimer. Redistributions in binary form must reproduce
+//the above copyright notice, this list of conditions and the following disclaimer in
+//the documentation and/or other materials provided with the distribution.
+//
+//Neither the name of Hamcrest nor the names of its contributors may be used to endorse
+//or promote products derived from this software without specific prior written
+//permission.
+//
+//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+//EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+//OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+//SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+//TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+//BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+//CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+//WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+//DAMAGE.
+
+/*
+ * MODIFIED version of JUnit 4.13 as available at
+ *   https://search.maven.org/remotecontent?filepath=junit/junit/4.13/junit-4.13-sources.jar
+ * Only parts of this file have been retained for test purposes.
+ */
+
+public class Assert {
+  /**
+   * Asserts that a condition is true. If it isn't it throws an
+   * {@link AssertionError} with the given message.
+   *
+   * @param message   the identifying message for the {@link AssertionError}
+   *                  (<code>null</code>
+   *                  okay)
+   * @param condition condition to be checked
+   */
+  static public void assertTrue(String message, boolean condition) {
+    return;
+  }
+
+  /**
+   * Asserts that a condition is true. If it isn't it throws an
+   * {@link AssertionError} without a message.
+   *
+   * @param condition condition to be checked
+   */
+  static public void assertTrue(boolean condition) {
+    return;
+  }
+
+  /**
+   * Asserts that a condition is false. If it isn't it throws an
+   * {@link AssertionError} with the given message.
+   *
+   * @param message   the identifying message for the {@link AssertionError}
+   *                  (<code>null</code>
+   *                  okay)
+   * @param condition condition to be checked
+   */
+  static public void assertFalse(String message, boolean condition) {
+    return;
+  }
+
+  /**
+   * Asserts that a condition is false. If it isn't it throws an
+   * {@link AssertionError} without a message.
+   *
+   * @param condition condition to be checked
+   */
+  static public void assertFalse(boolean condition) {
+    return;
+  }
+
+  /**
+   * Fails a test with the given message.
+   *
+   * @param message the identifying message for the {@link AssertionError}
+   *                (<code>null</code>
+   *                okay)
+   * @see AssertionError
+   */
+  static public void fail(String message) {
+    if (message == null) {
+      throw new AssertionError();
+    }
+    throw new AssertionError(message);
+  }
+
+  /**
+   * Asserts that an object isn't null. If it is an {@link AssertionError} is
+   * thrown with the given message.
+   *
+   * @param message the identifying message for the {@link AssertionError}
+   *                (<code>null</code>
+   *                okay)
+   * @param object  Object to check or <code>null</code>
+   */
+  static public void assertNotNull(String message, Object object) {
+    return;
+  }
+
+  /**
+   * Asserts that an object isn't null. If it is an {@link AssertionError} is
+   * thrown.
+   *
+   * @param object Object to check or <code>null</code>
+   */
+  static public void assertNotNull(Object object) {
+    return;
+  }
+
+  /**
+   * Asserts that an object is null. If it is not, an {@link AssertionError}
+   * is thrown with the given message.
+   *
+   * @param message the identifying message for the {@link AssertionError}
+   *                (<code>null</code>
+   *                okay)
+   * @param object  Object to check or <code>null</code>
+   */
+  static public void assertNull(String message, Object object) {
+    return;
+  }
+
+  /**
+   * Asserts that an object is null. If it isn't an {@link AssertionError} is
+   * thrown.
+   *
+   * @param object Object to check or <code>null</code>
+   */
+  static public void assertNull(Object object) {
+    return;
+  }
+
+  private static boolean equalsRegardingNull(Object expected, Object actual) {
+    if (expected == null) {
+      return actual == null;
+    }
+
+    return isEquals(expected, actual);
+  }
+
+  private static boolean isEquals(Object expected, Object actual) {
+    return expected.equals(actual);
+  }
+
+  /**
+   * Asserts that two doubles are equal to within a positive delta.
+   * If they are not, an {@link AssertionError} is thrown with the given
+   * message. If the expected value is infinity then the delta value is
+   * ignored. NaNs are considered equal:
+   * <code>assertEquals(Double.NaN, Double.NaN, *)</code> passes
+   *
+   * @param message  the identifying message for the {@link AssertionError}
+   *                 (<code>null</code>
+   *                 okay)
+   * @param expected expected value
+   * @param actual   the value to check against <code>expected</code>
+   * @param delta    the maximum delta between <code>expected</code> and
+   *                 <code>actual</code> for which both numbers are still
+   *                 considered equal.
+   */
+  public static void assertEquals(String message, double expected,
+      double actual, double delta) {
+    return;
+  }
+
+  private static void failNotEquals(String message, Object expected,
+      Object actual) {
+    fail(format(message, expected, actual));
+  }
+
+  static String format(String message, Object expected, Object actual) {
+    String formatted = "";
+    if (message != null && !"".equals(message)) {
+      formatted = message + " ";
+    }
+    String expectedString = String.valueOf(expected);
+    String actualString = String.valueOf(actual);
+    if (equalsRegardingNull(expectedString, actualString)) {
+      return formatted + "expected: "
+          + formatClassAndValue(expected, expectedString)
+          + " but was: " + formatClassAndValue(actual, actualString);
+    } else {
+      return formatted + "expected:<" + expectedString + "> but was:<"
+          + actualString + ">";
+    }
+  }
+
+  private static String formatClass(Class<?> value) {
+      String className = value.getCanonicalName();
+      return className == null ? value.getName() : className;
+  }
+
+  private static String formatClassAndValue(Object value, String valueString) {
+    String className = value == null ? "null" : value.getClass().getName();
+    return className + "<" + valueString + ">";
+  }
+
+  /**
+   * Asserts that two floats are equal to within a positive delta.
+   * If they are not, an {@link AssertionError} is thrown with the given
+   * message. If the expected value is infinity then the delta value is
+   * ignored. NaNs are considered equal:
+   * <code>assertEquals(Float.NaN, Float.NaN, *)</code> passes
+   *
+   * @param message  the identifying message for the {@link AssertionError}
+   *                 (<code>null</code>
+   *                 okay)
+   * @param expected expected value
+   * @param actual   the value to check against <code>expected</code>
+   * @param delta    the maximum delta between <code>expected</code> and
+   *                 <code>actual</code> for which both numbers are still
+   *                 considered equal.
+   */
+  public static void assertEquals(String message, float expected, float actual,
+      float delta) {
+    if (floatIsDifferent(expected, actual, delta)) {
+      failNotEquals(message, Float.valueOf(expected), Float.valueOf(actual));
+    }
+  }
+
+  private static boolean doubleIsDifferent(double d1, double d2, double delta) {
+    if (Double.compare(d1, d2) == 0) {
+      return false;
+    }
+    if ((Math.abs(d1 - d2) <= delta)) {
+      return false;
+    }
+
+    return true;
+  }
+
+  private static boolean floatIsDifferent(float f1, float f2, float delta) {
+    if (Float.compare(f1, f2) == 0) {
+      return false;
+    }
+    if ((Math.abs(f1 - f2) <= delta)) {
+      return false;
+    }
+
+    return true;
+  }
+
+  /**
+   * Asserts that two longs are equal. If they are not, an
+   * {@link AssertionError} is thrown.
+   *
+   * @param expected expected long value.
+   * @param actual   actual long value
+   */
+  public static void assertEquals(long expected, long actual) {
+    assertEquals(null, expected, actual);
+  }
+
+  /**
+   * Asserts that two longs are equal. If they are not, an
+   * {@link AssertionError} is thrown with the given message.
+   *
+   * @param message  the identifying message for the {@link AssertionError}
+   *                 (<code>null</code>
+   *                 okay)
+   * @param expected long expected value.
+   * @param actual   long actual value
+   */
+  public static void assertEquals(String message, long expected, long actual) {
+    if (expected != actual) {
+      failNotEquals(message, Long.valueOf(expected), Long.valueOf(actual));
+    }
+  }
+
+  /**
+   * @deprecated Use
+   *             <code>assertEquals(double expected, double actual, double
+   * delta)</code> instead
+   */
+  @Deprecated
+  public static void assertEquals(double expected, double actual) {
+    assertEquals(null, expected, actual);
+  }
+
+  /**
+   * @deprecated Use
+   *             <code>assertEquals(String message, double expected, double
+   * actual, double delta)</code> instead
+   */
+  @Deprecated
+  public static void assertEquals(String message, double expected,
+      double actual) {
+    fail("Use assertEquals(expected, actual, delta) to compare " +
+        "floating-point numbers");
+  }
+
+  /**
+   * Asserts that two doubles are equal to within a positive delta.
+   * If they are not, an {@link AssertionError} is thrown. If the expected
+   * value is infinity then the delta value is ignored.NaNs are considered
+   * equal: <code>assertEquals(Double.NaN, Double.NaN, *)</code> passes
+   *
+   * @param expected expected value
+   * @param actual   the value to check against <code>expected</code>
+   * @param delta    the maximum delta between <code>expected</code> and
+   *                 <code>actual</code> for which both numbers are still
+   *                 considered equal.
+   */
+  public static void assertEquals(double expected, double actual,
+      double delta) {
+    assertEquals(null, expected, actual, delta);
+  }
+
+  /**
+   * Asserts that two floats are equal to within a positive delta.
+   * If they are not, an {@link AssertionError} is thrown. If the expected
+   * value is infinity then the delta value is ignored. NaNs are considered
+   * equal: <code>assertEquals(Float.NaN, Float.NaN, *)</code> passes
+   *
+   * @param expected expected value
+   * @param actual   the value to check against <code>expected</code>
+   * @param delta    the maximum delta between <code>expected</code> and
+   *                 <code>actual</code> for which both numbers are still
+   *                 considered equal.
+   */
+  public static void assertEquals(float expected, float actual, float delta) {
+    assertEquals(null, expected, actual, delta);
+  }
+
+  /**
+   * Asserts that two objects are equal. If they are not, an
+   * {@link AssertionError} without a message is thrown. If
+   * <code>expected</code> and <code>actual</code> are <code>null</code>,
+   * they are considered equal.
+   *
+   * @param expected expected value
+   * @param actual   the value to check against <code>expected</code>
+   */
+  public static void assertEquals(Object expected, Object actual) {
+    assertEquals(null, expected, actual);
+  }
+
+  public static void assertEquals(String message, Object expected,
+      Object actual) {
+  }
+
+  public static void assertNotEquals(String message, Object unexpected, Object actual) {
+    return;
+  }
+
+  public static void assertNotEquals(Object unexpected, Object actual) {
+    assertNotEquals(null, unexpected, actual);
+  }
+
+  public static void assertNotEquals(String message, long unexpected, long actual) {
+    return;
+  }
+
+  public static void assertNotEquals(long unexpected, long actual) {
+    assertNotEquals(null, unexpected, actual);
+  }
+
+  public static void assertNotEquals(String message, double unexpected, double actual, double delta) {
+    return;
+  }
+
+  public static void assertNotEquals(double unexpected, double actual, double delta) {
+    assertNotEquals(null, unexpected, actual, delta);
+  }
+
+  public static void assertNotEquals(String message, float unexpected, float actual, float delta) {
+    return;
+  }
+
+  public static void assertNotEquals(float unexpected, float actual, float delta) {
+    assertNotEquals(null, unexpected, actual, delta);
+  }
+
+  public static void assertNotSame(String message, Object unexpected, Object actual) {
+    return;
+  }
+
+  public static void assertNotSame(Object unexpected, Object actual) {
+    assertNotSame(null, unexpected, actual);
+  }
+
+  public static void assertSame(String message, Object expected, Object actual) {
+    return;
+  }
+
+  public static void assertSame(Object expected, Object actual) {
+    assertSame(null, expected, actual);
+  }
+
+  /**
+   * Asserts that {@code runnable} throws an exception of type {@code expectedThrowable} when
+   * executed. If it does, the exception object is returned. If it does not throw an exception, an
+   * {@link AssertionError} is thrown. If it throws the wrong type of exception, an {@code
+   * AssertionError} is thrown describing the mismatch; the exception that was actually thrown can
+   * be obtained by calling {@link AssertionError#getCause}.
+   *
+   * @param expectedThrowable the expected type of the exception
+   * @param runnable       a function that is expected to throw an exception when executed
+   * @return the exception thrown by {@code runnable}
+   * @since 4.13
+   */
+  public static <T extends Throwable> T assertThrows(Class<T> expectedThrowable,
+          ThrowingRunnable runnable) {
+      return assertThrows(null, expectedThrowable, runnable);
+  }
+
+  /**
+   * Asserts that {@code runnable} throws an exception of type {@code expectedThrowable} when
+   * executed. If it does, the exception object is returned. If it does not throw an exception, an
+   * {@link AssertionError} is thrown. If it throws the wrong type of exception, an {@code
+   * AssertionError} is thrown describing the mismatch; the exception that was actually thrown can
+   * be obtained by calling {@link AssertionError#getCause}.
+   *
+   * @param message the identifying message for the {@link AssertionError} (<code>null</code>
+   * okay)
+   * @param expectedThrowable the expected type of the exception
+   * @param runnable a function that is expected to throw an exception when executed
+   * @return the exception thrown by {@code runnable}
+   * @since 4.13
+   */
+  public static <T extends Throwable> T assertThrows(String message, Class<T> expectedThrowable,
+          ThrowingRunnable runnable) {
+      try {
+          runnable.run();
+      } catch (Throwable actualThrown) {
+          if (expectedThrowable.isInstance(actualThrown)) {
+              @SuppressWarnings("unchecked") T retVal = (T) actualThrown;
+              return retVal;
+          } else {
+              String expected = formatClass(expectedThrowable);
+              Class<? extends Throwable> actualThrowable = actualThrown.getClass();
+              String actual = formatClass(actualThrowable);
+              if (expected.equals(actual)) {
+                  // There must be multiple class loaders. Add the identity hash code so the message
+                  // doesn't say "expected: java.lang.String<my.package.MyException> ..."
+                  expected += "@" + Integer.toHexString(System.identityHashCode(expectedThrowable));
+                  actual += "@" + Integer.toHexString(System.identityHashCode(actualThrowable));
+              }
+              String mismatchMessage = buildPrefix(message)
+                      + format("unexpected exception type thrown;", expected, actual);
+
+              // The AssertionError(String, Throwable) ctor is only available on JDK7.
+              AssertionError assertionError = new AssertionError(mismatchMessage);
+              assertionError.initCause(actualThrown);
+              throw assertionError;
+          }
+      }
+      String notThrownMessage = buildPrefix(message) + String
+              .format("expected %s to be thrown, but nothing was thrown",
+                      formatClass(expectedThrowable));
+      throw new AssertionError(notThrownMessage);
+  }
+
+  private static String buildPrefix(String message) {
+      return message != null && message.length() != 0 ? message + ": " : "";
+  }
+
+}
diff --git a/java/ql/test/stubs/junit-4.13/org/junit/Test.java b/java/ql/test/stubs/junit-4.13/org/junit/Test.java
new file mode 100644
index 00000000000..8356b546d79
--- /dev/null
+++ b/java/ql/test/stubs/junit-4.13/org/junit/Test.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2015-2018 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * http://www.eclipse.org/legal/epl-v20.html
+ */
+
+/*
+ * MODIFIED version of junit-jupiter-api 5.2.0 as available at
+ *   https://search.maven.org/classic/remotecontent?filepath=org/junit/jupiter/junit-jupiter-api/5.2.0/junit-jupiter-api-5.2.0-sources.jar
+ * Only parts of this file have been retained for test purposes.
+ */
+
+package org.junit;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.ANNOTATION_TYPE, ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface Test {}
diff --git a/java/ql/test/stubs/junit-4.13/org/junit/function/ThrowingRunnable.java b/java/ql/test/stubs/junit-4.13/org/junit/function/ThrowingRunnable.java
new file mode 100644
index 00000000000..d0eb782ccd3
--- /dev/null
+++ b/java/ql/test/stubs/junit-4.13/org/junit/function/ThrowingRunnable.java
@@ -0,0 +1,14 @@
+package org.junit.function;
+
+/**
+ * This interface facilitates the use of
+ * {@link org.junit.Assert#assertThrows(Class, ThrowingRunnable)} from Java 8. It allows method
+ * references to void methods (that declare checked exceptions) to be passed directly into
+ * {@code assertThrows}
+ * without wrapping. It is not meant to be implemented directly.
+ *
+ * @since 4.13
+ */
+public interface ThrowingRunnable {
+    void run() throws Throwable;
+}
diff --git a/java/ql/test/stubs/mockito-5.14/org/mockito/ArgumentMatchers.java b/java/ql/test/stubs/mockito-5.14/org/mockito/ArgumentMatchers.java
new file mode 100644
index 00000000000..84004de2ac3
--- /dev/null
+++ b/java/ql/test/stubs/mockito-5.14/org/mockito/ArgumentMatchers.java
@@ -0,0 +1,4 @@
+package org.mockito;
+
+public class ArgumentMatchers {
+}
diff --git a/java/ql/test/stubs/mockito-5.14/org/mockito/MockSettings.java b/java/ql/test/stubs/mockito-5.14/org/mockito/MockSettings.java
new file mode 100644
index 00000000000..f6e46d610e7
--- /dev/null
+++ b/java/ql/test/stubs/mockito-5.14/org/mockito/MockSettings.java
@@ -0,0 +1,10 @@
+/*
+ * Copyright (c) 2007 Mockito contributors
+ * This program is made available under the terms of the MIT License.
+ */
+package org.mockito;
+
+import java.io.Serializable;
+
+public interface MockSettings extends Serializable {
+}
\ No newline at end of file
diff --git a/java/ql/test/stubs/mockito-5.14/org/mockito/Mockito.java b/java/ql/test/stubs/mockito-5.14/org/mockito/Mockito.java
new file mode 100644
index 00000000000..e4d5a06a247
--- /dev/null
+++ b/java/ql/test/stubs/mockito-5.14/org/mockito/Mockito.java
@@ -0,0 +1,216 @@
+/*
+ * Copyright (c) 2007 Mockito contributors
+ * This program is made available under the terms of the MIT License.
+ */
+package org.mockito;
+
+import org.mockito.ArgumentMatchers;
+import org.mockito.MockSettings;
+import org.mockito.internal.creation.MockSettingsImpl;
+import org.mockito.stubbing.Answer;
+import org.mockito.stubbing.OngoingStubbing;
+import org.mockito.internal.MockitoCore;
+import org.mockito.MockSettings;
+import org.mockito.stubbing.Stubber;
+
+public class Mockito extends ArgumentMatchers {
+  static final MockitoCore MOCKITO_CORE = new MockitoCore();
+
+  public static MockSettings withSettings() {
+    return new MockSettings() {
+    };
+  }
+
+  /**
+   * Creates a mock object of the requested class or interface.
+   * <p>
+   * See examples in javadoc for the {@link Mockito} class.
+   *
+   * @param reified don't pass any values to it. It's a trick to detect the
+   *                class/interface you
+   *                want to mock.
+   * @return the mock object.
+   * @since 4.10.0
+   */
+  @SafeVarargs
+  public static <T> T mock(T... reified) {
+    return mock(withSettings(), reified);
+  }
+
+  /**
+   * Creates a mock object of the requested class or interface with the given
+   * default answer.
+   * <p>
+   * See examples in javadoc for the {@link Mockito} class.
+   *
+   * @param defaultAnswer the default answer to use.
+   * @param reified       don't pass any values to it. It's a trick to detect the
+   *                      class/interface you
+   *                      want to mock.
+   * @return the mock object.
+   * @since 5.1.0
+   */
+  @SafeVarargs
+  public static <T> T mock(@SuppressWarnings("rawtypes") Answer defaultAnswer, T... reified) {
+    return mock(new Answer<T>() {
+    }, reified);
+  }
+
+  /**
+   * Creates a mock object of the requested class or interface with the given
+   * name.
+   * <p>
+   * See examples in javadoc for the {@link Mockito} class.
+   *
+   * @param name    the mock name to use.
+   * @param reified don't pass any values to it. It's a trick to detect the
+   *                class/interface you
+   *                want to mock.
+   * @return the mock object.
+   * @since 5.1.0
+   */
+  @SafeVarargs
+  public static <T> T mock(String name, T... reified) {
+    return mock(withSettings(), reified);
+  }
+
+  /**
+   * Creates a mock object of the requested class or interface with the given
+   * settings.
+   * <p>
+   * See examples in javadoc for the {@link Mockito} class.
+   *
+   * @param settings the mock settings to use.
+   * @param reified  don't pass any values to it. It's a trick to detect the
+   *                 class/interface you
+   *                 want to mock.
+   * @return the mock object.
+   * @since 5.1.0
+   */
+  @SafeVarargs
+  public static <T> T mock(MockSettings settings, T... reified) {
+    if (reified == null || reified.length > 0) {
+      throw new IllegalArgumentException(
+          "Please don't pass any values here. Java will detect class automagically.");
+    }
+
+    return mock(getClassOf(reified), settings);
+  }
+
+  /**
+   * Creates mock object of given class or interface.
+   * <p>
+   * See examples in javadoc for {@link Mockito} class
+   *
+   * @param classToMock class or interface to mock
+   * @return mock object
+   */
+  public static <T> T mock(Class<T> classToMock) {
+    return mock(classToMock, withSettings());
+  }
+
+  /**
+   * Specifies mock name. Naming mocks can be helpful for debugging - the name is
+   * used in all verification errors.
+   * <p>
+   * Beware that naming mocks is not a solution for complex code which uses too
+   * many mocks or collaborators.
+   * <b>If you have too many mocks then refactor the code</b> so that it's easy to
+   * test/debug without necessity of naming mocks.
+   * <p>
+   * <b>If you use <code>&#064;Mock</code> annotation then you've got naming mocks
+   * for free!</b> <code>&#064;Mock</code> uses field name as mock name.
+   * {@link Mock Read more.}
+   * <p>
+   *
+   * See examples in javadoc for {@link Mockito} class
+   *
+   * @param classToMock class or interface to mock
+   * @param name        of the mock
+   * @return mock object
+   */
+  public static <T> T mock(Class<T> classToMock, String name) {
+    return mock(classToMock, new Answer<T>() {
+    });
+  }
+
+  /**
+   * Creates mock with a specified strategy for its answers to interactions.
+   * It's quite an advanced feature and typically you don't need it to write
+   * decent tests.
+   * However it can be helpful when working with legacy systems.
+   * <p>
+   * It is the default answer so it will be used <b>only when you don't</b> stub
+   * the method call.
+   *
+   * <pre class="code">
+   * <code class="java">
+   *   Foo mock = mock(Foo.class, RETURNS_SMART_NULLS);
+   *   Foo mockTwo = mock(Foo.class, new YourOwnAnswer());
+   * </code>
+   * </pre>
+   *
+   * <p>
+   * See examples in javadoc for {@link Mockito} class
+   * </p>
+   *
+   * @param classToMock   class or interface to mock
+   * @param defaultAnswer default answer for un-stubbed methods
+   *
+   * @return mock object
+   */
+  public static <T> T mock(Class<T> classToMock, Answer defaultAnswer) {
+    return mock(classToMock, new Answer<T>() {
+    });
+  }
+
+  /**
+   * Creates a mock with some non-standard settings.
+   * <p>
+   * The number of configuration points for a mock will grow,
+   * so we need a fluent way to introduce new configuration without adding more
+   * and more overloaded Mockito.mock() methods.
+   * Hence {@link MockSettings}.
+   * 
+   * <pre class="code">
+   * <code class="java">
+   *   Listener mock = mock(Listener.class, withSettings()
+   *     .name("firstListner").defaultBehavior(RETURNS_SMART_NULLS));
+   *   );
+   * </code>
+   * </pre>
+   * 
+   * <b>Use it carefully and occasionally</b>. What might be reason your test
+   * needs non-standard mocks?
+   * Is the code under test so complicated that it requires non-standard mocks?
+   * Wouldn't you prefer to refactor the code under test, so that it is testable
+   * in a simple way?
+   * <p>
+   * See also {@link Mockito#withSettings()}
+   * <p>
+   * See examples in javadoc for {@link Mockito} class
+   *
+   * @param classToMock  class or interface to mock
+   * @param mockSettings additional mock settings
+   * @return mock object
+   */
+  public static <T> T mock(Class<T> classToMock, MockSettings mockSettings) {
+    return MOCKITO_CORE.mock(classToMock, mockSettings);
+  }
+
+  private static <T> Class<T> getClassOf(T[] array) {
+    return (Class<T>) array.getClass().getComponentType();
+  }
+
+  public static <T> OngoingStubbing<T> when(T methodCall) {
+    return MOCKITO_CORE.when(methodCall);
+  }
+
+  public static Stubber doReturn(Object toBeReturned) {
+    return null;
+  }
+
+  public static Stubber doReturn(Object toBeReturned, Object... toBeReturnedNext) {
+    return null;
+  }
+}
diff --git a/java/ql/test/stubs/mockito-5.14/org/mockito/internal/MockitoCore.java b/java/ql/test/stubs/mockito-5.14/org/mockito/internal/MockitoCore.java
new file mode 100644
index 00000000000..0ae8790a6d3
--- /dev/null
+++ b/java/ql/test/stubs/mockito-5.14/org/mockito/internal/MockitoCore.java
@@ -0,0 +1,28 @@
+package org.mockito.internal;
+
+import org.mockito.MockSettings;
+import org.mockito.internal.creation.MockSettingsImpl;
+import org.mockito.internal.progress.MockingProgress;
+import org.mockito.stubbing.OngoingStubbing;
+import org.mockito.mock.MockCreationSettings;
+import static org.mockito.internal.util.MockUtil.createMock;
+
+public class MockitoCore {
+  public <T> T mock(Class<T> typeToMock, MockSettings settings) {
+    MockSettingsImpl impl = (MockSettingsImpl) settings;
+    MockCreationSettings<T> creationSettings = impl.build(typeToMock);
+    T mock = createMock(creationSettings);
+    return mock;
+  }
+
+  public <T> OngoingStubbing<T> when(T methodCall) {
+    MockingProgress mockingProgress = new MockingProgress() {
+      @Override
+      public OngoingStubbing<?> pullOngoingStubbing() {
+        return null;
+      }
+    };
+    OngoingStubbing<T> stubbing = (OngoingStubbing<T>) mockingProgress.pullOngoingStubbing();
+    return stubbing;
+  }
+}
\ No newline at end of file
diff --git a/java/ql/test/stubs/mockito-5.14/org/mockito/internal/creation/MockSettingsImpl.java b/java/ql/test/stubs/mockito-5.14/org/mockito/internal/creation/MockSettingsImpl.java
new file mode 100644
index 00000000000..c1e9083f4de
--- /dev/null
+++ b/java/ql/test/stubs/mockito-5.14/org/mockito/internal/creation/MockSettingsImpl.java
@@ -0,0 +1,14 @@
+package org.mockito.internal.creation;
+
+import org.mockito.MockSettings;
+import org.mockito.mock.MockCreationSettings;
+
+public class MockSettingsImpl<T> implements MockSettings {
+  public <T2> MockCreationSettings<T2> build(Class<T2> typeToMock) {
+    return new MockCreationSettings<T2>() {
+      public String getMockMaker() {
+        return null;
+      }
+    };
+  }
+}
diff --git a/java/ql/test/stubs/mockito-5.14/org/mockito/internal/handler/MockHandlerFactory.java b/java/ql/test/stubs/mockito-5.14/org/mockito/internal/handler/MockHandlerFactory.java
new file mode 100644
index 00000000000..17dc3dcd618
--- /dev/null
+++ b/java/ql/test/stubs/mockito-5.14/org/mockito/internal/handler/MockHandlerFactory.java
@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2007 Mockito contributors
+ * This program is made available under the terms of the MIT License.
+ */
+package org.mockito.internal.handler;
+
+import org.mockito.mock.MockCreationSettings;
+import org.mockito.invocation.MockHandler;
+
+public final class MockHandlerFactory {
+    public static <T> MockHandler<T> createMockHandler(MockCreationSettings<T> settings) {
+        return new MockHandlerImpl<T>();
+    }
+}
\ No newline at end of file
diff --git a/java/ql/test/stubs/mockito-5.14/org/mockito/internal/handler/MockHandlerImpl.java b/java/ql/test/stubs/mockito-5.14/org/mockito/internal/handler/MockHandlerImpl.java
new file mode 100644
index 00000000000..dd1dfc68dc3
--- /dev/null
+++ b/java/ql/test/stubs/mockito-5.14/org/mockito/internal/handler/MockHandlerImpl.java
@@ -0,0 +1,10 @@
+/*
+ * Copyright (c) 2007 Mockito contributors
+ * This program is made available under the terms of the MIT License.
+ */
+package org.mockito.internal.handler;
+
+import org.mockito.invocation.MockHandler;
+
+public class MockHandlerImpl<T> implements MockHandler<T> {
+}
\ No newline at end of file
diff --git a/java/ql/test/stubs/mockito-5.14/org/mockito/internal/progress/MockingProgress.java b/java/ql/test/stubs/mockito-5.14/org/mockito/internal/progress/MockingProgress.java
new file mode 100644
index 00000000000..d52a9631b68
--- /dev/null
+++ b/java/ql/test/stubs/mockito-5.14/org/mockito/internal/progress/MockingProgress.java
@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) 2007 Mockito contributors
+ * This program is made available under the terms of the MIT License.
+ */
+package org.mockito.internal.progress;
+
+import org.mockito.stubbing.OngoingStubbing;
+
+public interface MockingProgress {
+  OngoingStubbing<?> pullOngoingStubbing();
+}
\ No newline at end of file
diff --git a/java/ql/test/stubs/mockito-5.14/org/mockito/internal/util/MockUtil.java b/java/ql/test/stubs/mockito-5.14/org/mockito/internal/util/MockUtil.java
new file mode 100644
index 00000000000..8a975ffe119
--- /dev/null
+++ b/java/ql/test/stubs/mockito-5.14/org/mockito/internal/util/MockUtil.java
@@ -0,0 +1,18 @@
+package org.mockito.internal.util;
+
+import org.mockito.mock.MockCreationSettings;
+import org.mockito.plugins.MockMaker;
+import org.mockito.invocation.MockHandler;
+import static org.mockito.internal.handler.MockHandlerFactory.createMockHandler;
+
+public class MockUtil {
+    public static <T> T createMock(MockCreationSettings<T> settings) {
+        MockMaker mockMaker = getMockMaker(settings.getMockMaker());
+        MockHandler mockHandler = createMockHandler(settings);
+        return mockMaker.createMock(settings, mockHandler);
+    }
+
+    public static MockMaker getMockMaker(String mockMaker) {
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/java/ql/test/stubs/mockito-5.14/org/mockito/invocation/MockHandler.java b/java/ql/test/stubs/mockito-5.14/org/mockito/invocation/MockHandler.java
new file mode 100644
index 00000000000..d667c375929
--- /dev/null
+++ b/java/ql/test/stubs/mockito-5.14/org/mockito/invocation/MockHandler.java
@@ -0,0 +1,10 @@
+/*
+ * Copyright (c) 2007 Mockito contributors
+ * This program is made available under the terms of the MIT License.
+ */
+package org.mockito.invocation;
+
+import java.io.Serializable;
+
+public interface MockHandler<T> extends Serializable {
+}
\ No newline at end of file
diff --git a/java/ql/test/stubs/mockito-5.14/org/mockito/mock/MockCreationSettings.java b/java/ql/test/stubs/mockito-5.14/org/mockito/mock/MockCreationSettings.java
new file mode 100644
index 00000000000..86788eda5f1
--- /dev/null
+++ b/java/ql/test/stubs/mockito-5.14/org/mockito/mock/MockCreationSettings.java
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2007 Mockito contributors
+ * This program is made available under the terms of the MIT License.
+ */
+package org.mockito.mock;
+
+public interface MockCreationSettings<T> {
+  String getMockMaker();
+}
diff --git a/java/ql/test/stubs/mockito-5.14/org/mockito/plugins/MockMaker.java b/java/ql/test/stubs/mockito-5.14/org/mockito/plugins/MockMaker.java
new file mode 100644
index 00000000000..d7b06ab96f5
--- /dev/null
+++ b/java/ql/test/stubs/mockito-5.14/org/mockito/plugins/MockMaker.java
@@ -0,0 +1,8 @@
+package org.mockito.plugins;
+
+import org.mockito.mock.MockCreationSettings;
+import org.mockito.invocation.MockHandler;
+
+public interface MockMaker {
+  <T> T createMock(MockCreationSettings<T> settings, MockHandler handler);
+}
\ No newline at end of file
diff --git a/java/ql/test/stubs/mockito-5.14/org/mockito/stubbing/Answer.java b/java/ql/test/stubs/mockito-5.14/org/mockito/stubbing/Answer.java
new file mode 100644
index 00000000000..60828a66c52
--- /dev/null
+++ b/java/ql/test/stubs/mockito-5.14/org/mockito/stubbing/Answer.java
@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) 2007 Mockito contributors
+ * This program is made available under the terms of the MIT License.
+ */
+package org.mockito.stubbing;
+
+public interface Answer<T> { }
\ No newline at end of file
diff --git a/java/ql/test/stubs/mockito-5.14/org/mockito/stubbing/OngoingStubbing.java b/java/ql/test/stubs/mockito-5.14/org/mockito/stubbing/OngoingStubbing.java
new file mode 100644
index 00000000000..3fb5e659f04
--- /dev/null
+++ b/java/ql/test/stubs/mockito-5.14/org/mockito/stubbing/OngoingStubbing.java
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2007 Mockito contributors
+ * This program is made available under the terms of the MIT License.
+ */
+package org.mockito.stubbing;
+
+public interface OngoingStubbing<T> {
+  OngoingStubbing<T> thenReturn(T value);
+}
\ No newline at end of file
diff --git a/java/ql/test/stubs/mockito-5.14/org/mockito/stubbing/Stubber.java b/java/ql/test/stubs/mockito-5.14/org/mockito/stubbing/Stubber.java
new file mode 100644
index 00000000000..eccca0c2c38
--- /dev/null
+++ b/java/ql/test/stubs/mockito-5.14/org/mockito/stubbing/Stubber.java
@@ -0,0 +1,5 @@
+package org.mockito.stubbing;
+
+public interface Stubber {
+  <T> T when(T mock);
+}
\ No newline at end of file
diff --git a/javascript/documentation/library-customization.rst b/javascript/documentation/library-customization.rst
index b06e5b5cab1..0960da8a112 100644
--- a/javascript/documentation/library-customization.rst
+++ b/javascript/documentation/library-customization.rst
@@ -178,7 +178,7 @@ added by extending ``Dataflow::SourceNode::Range``. Some of its subclasses can s
 extended. For example, ``DataFlow::ModuleImportNode`` models module imports, and ``DataFlow::ClassNode`` models
 class definitions. The former provides default implementations covering CommonJS, AMD, and ECMAScript
 2015 modules, while the latter handles ECMAScript 2015 classes, as well as traditional function-based
-classes. You can extend their corresponding ``::Range`` classes to add support for other module or
+classes. You can extend their corresponding ``::Range`` classes to add support for other module or
 class systems.
 
 Type inference
diff --git a/javascript/downgrades/76a926a00d5f3bc199c203a1437796fd7b2835ba/old.dbscheme b/javascript/downgrades/76a926a00d5f3bc199c203a1437796fd7b2835ba/old.dbscheme
new file mode 100644
index 00000000000..76a926a00d5
--- /dev/null
+++ b/javascript/downgrades/76a926a00d5f3bc199c203a1437796fd7b2835ba/old.dbscheme
@@ -0,0 +1,1204 @@
+/*** Standard fragments ***/
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- JavaScript-specific part -*/
+
+@location = @location_default
+
+@sourceline = @locatable;
+
+filetype(
+  int file: @file ref,
+  string filetype: string ref
+)
+
+// top-level code fragments
+toplevels (unique int id: @toplevel,
+           int kind: int ref);
+
+is_externs (int toplevel: @toplevel ref);
+
+case @toplevel.kind of
+   0 = @script
+|  1 = @inline_script
+|  2 = @event_handler
+|  3 = @javascript_url
+|  4 = @template_toplevel;
+
+is_module (int tl: @toplevel ref);
+is_nodejs (int tl: @toplevel ref);
+is_es2015_module (int tl: @toplevel ref);
+is_closure_module (int tl: @toplevel ref);
+
+@xml_node_with_code = @xmlelement | @xmlattribute | @template_placeholder_tag;
+toplevel_parent_xml_node(
+  unique int toplevel: @toplevel ref,
+  int xmlnode: @xml_node_with_code ref);
+
+xml_element_parent_expression(
+  unique int xmlnode: @xmlelement ref,
+  int expression: @expr ref,
+  int index: int ref);
+
+// statements
+#keyset[parent, idx]
+stmts (unique int id: @stmt,
+       int kind: int ref,
+       int parent: @stmt_parent ref,
+       int idx: int ref,
+       varchar(900) tostring: string ref);
+
+stmt_containers (unique int stmt: @stmt ref,
+       int container: @stmt_container ref);
+
+jump_targets (unique int jump: @stmt ref,
+       int target: @stmt ref);
+
+@stmt_parent = @stmt | @toplevel | @function_expr | @arrow_function_expr | @static_initializer;
+@stmt_container = @toplevel | @function | @namespace_declaration | @external_module_declaration | @global_augmentation_declaration;
+
+case @stmt.kind of
+   0 = @empty_stmt
+|  1 = @block_stmt
+|  2 = @expr_stmt
+|  3 = @if_stmt
+|  4 = @labeled_stmt
+|  5 = @break_stmt
+|  6 = @continue_stmt
+|  7 = @with_stmt
+|  8 = @switch_stmt
+|  9 = @return_stmt
+| 10 = @throw_stmt
+| 11 = @try_stmt
+| 12 = @while_stmt
+| 13 = @do_while_stmt
+| 14 = @for_stmt
+| 15 = @for_in_stmt
+| 16 = @debugger_stmt
+| 17 = @function_decl_stmt
+| 18 = @var_decl_stmt
+| 19 = @case
+| 20 = @catch_clause
+| 21 = @for_of_stmt
+| 22 = @const_decl_stmt
+| 23 = @let_stmt
+| 24 = @legacy_let_stmt
+| 25 = @for_each_stmt
+| 26 = @class_decl_stmt
+| 27 = @import_declaration
+| 28 = @export_all_declaration
+| 29 = @export_default_declaration
+| 30 = @export_named_declaration
+| 31 = @namespace_declaration
+| 32 = @import_equals_declaration
+| 33 = @export_assign_declaration
+| 34 = @interface_declaration
+| 35 = @type_alias_declaration
+| 36 = @enum_declaration
+| 37 = @external_module_declaration
+| 38 = @export_as_namespace_declaration
+| 39 = @global_augmentation_declaration
+| 40 = @using_decl_stmt
+;
+
+@decl_stmt = @var_decl_stmt | @const_decl_stmt | @let_stmt | @legacy_let_stmt | @using_decl_stmt;
+
+@export_declaration = @export_all_declaration | @export_default_declaration | @export_named_declaration;
+
+@namespace_definition = @namespace_declaration | @enum_declaration;
+@type_definition = @class_definition | @interface_declaration | @enum_declaration | @type_alias_declaration | @enum_member;
+
+is_instantiated(unique int decl: @namespace_declaration ref);
+
+@declarable_node = @decl_stmt | @namespace_declaration | @class_decl_stmt | @function_decl_stmt | @enum_declaration | @external_module_declaration | @global_augmentation_declaration | @field;
+has_declare_keyword(unique int stmt: @declarable_node ref);
+
+is_for_await_of(unique int forof: @for_of_stmt ref);
+
+// expressions
+#keyset[parent, idx]
+exprs (unique int id: @expr,
+       int kind: int ref,
+       int parent: @expr_parent ref,
+       int idx: int ref,
+       varchar(900) tostring: string ref);
+
+literals (varchar(900) value: string ref,
+       varchar(900) raw: string ref,
+       unique int expr: @expr_or_type ref);
+
+enclosing_stmt (unique int expr: @expr_or_type ref,
+       int stmt: @stmt ref);
+
+expr_containers (unique int expr: @expr_or_type ref,
+       int container: @stmt_container ref);
+
+array_size (unique int ae: @arraylike ref,
+       int sz: int ref);
+
+is_delegating (int yield: @yield_expr ref);
+
+@expr_or_stmt = @expr | @stmt;
+@expr_or_type = @expr | @typeexpr;
+@expr_parent = @expr_or_stmt | @property | @function_typeexpr;
+@arraylike = @array_expr | @array_pattern;
+@type_annotation = @typeexpr | @jsdoc_type_expr;
+@node_in_stmt_container = @cfg_node | @type_annotation | @toplevel;
+
+case @expr.kind of
+   0 = @label
+|  1 = @null_literal
+|  2 = @boolean_literal
+|  3 = @number_literal
+|  4 = @string_literal
+|  5 = @regexp_literal
+|  6 = @this_expr
+|  7 = @array_expr
+|  8 = @obj_expr
+|  9 = @function_expr
+| 10 = @seq_expr
+| 11 = @conditional_expr
+| 12 = @new_expr
+| 13 = @call_expr
+| 14 = @dot_expr
+| 15 = @index_expr
+| 16 = @neg_expr
+| 17 = @plus_expr
+| 18 = @log_not_expr
+| 19 = @bit_not_expr
+| 20 = @typeof_expr
+| 21 = @void_expr
+| 22 = @delete_expr
+| 23 = @eq_expr
+| 24 = @neq_expr
+| 25 = @eqq_expr
+| 26 = @neqq_expr
+| 27 = @lt_expr
+| 28 = @le_expr
+| 29 = @gt_expr
+| 30 = @ge_expr
+| 31 = @lshift_expr
+| 32 = @rshift_expr
+| 33 = @urshift_expr
+| 34 = @add_expr
+| 35 = @sub_expr
+| 36 = @mul_expr
+| 37 = @div_expr
+| 38 = @mod_expr
+| 39 = @bitor_expr
+| 40 = @xor_expr
+| 41 = @bitand_expr
+| 42 = @in_expr
+| 43 = @instanceof_expr
+| 44 = @logand_expr
+| 45 = @logor_expr
+| 47 = @assign_expr
+| 48 = @assign_add_expr
+| 49 = @assign_sub_expr
+| 50 = @assign_mul_expr
+| 51 = @assign_div_expr
+| 52 = @assign_mod_expr
+| 53 = @assign_lshift_expr
+| 54 = @assign_rshift_expr
+| 55 = @assign_urshift_expr
+| 56 = @assign_or_expr
+| 57 = @assign_xor_expr
+| 58 = @assign_and_expr
+| 59 = @preinc_expr
+| 60 = @postinc_expr
+| 61 = @predec_expr
+| 62 = @postdec_expr
+| 63 = @par_expr
+| 64 = @var_declarator
+| 65 = @arrow_function_expr
+| 66 = @spread_element
+| 67 = @array_pattern
+| 68 = @object_pattern
+| 69 = @yield_expr
+| 70 = @tagged_template_expr
+| 71 = @template_literal
+| 72 = @template_element
+| 73 = @array_comprehension_expr
+| 74 = @generator_expr
+| 75 = @for_in_comprehension_block
+| 76 = @for_of_comprehension_block
+| 77 = @legacy_letexpr
+| 78 = @var_decl
+| 79 = @proper_varaccess
+| 80 = @class_expr
+| 81 = @super_expr
+| 82 = @newtarget_expr
+| 83 = @named_import_specifier
+| 84 = @import_default_specifier
+| 85 = @import_namespace_specifier
+| 86 = @named_export_specifier
+| 87 = @exp_expr
+| 88 = @assign_exp_expr
+| 89 = @jsx_element
+| 90 = @jsx_qualified_name
+| 91 = @jsx_empty_expr
+| 92 = @await_expr
+| 93 = @function_sent_expr
+| 94 = @decorator
+| 95 = @export_default_specifier
+| 96 = @export_namespace_specifier
+| 97 = @bind_expr
+| 98 = @external_module_reference
+| 99 = @dynamic_import
+| 100 = @expression_with_type_arguments
+| 101 = @prefix_type_assertion
+| 102 = @as_type_assertion
+| 103 = @export_varaccess
+| 104 = @decorator_list
+| 105 = @non_null_assertion
+| 106 = @bigint_literal
+| 107 = @nullishcoalescing_expr
+| 108 = @e4x_xml_anyname
+| 109 = @e4x_xml_static_attribute_selector
+| 110 = @e4x_xml_dynamic_attribute_selector
+| 111 = @e4x_xml_filter_expression
+| 112 = @e4x_xml_static_qualident
+| 113 = @e4x_xml_dynamic_qualident
+| 114 = @e4x_xml_dotdotexpr
+| 115 = @import_meta_expr
+| 116 = @assignlogandexpr
+| 117 = @assignlogorexpr
+| 118 = @assignnullishcoalescingexpr
+| 119 = @template_pipe_ref
+| 120 = @generated_code_expr
+| 121 = @satisfies_expr
+;
+
+@varaccess = @proper_varaccess | @export_varaccess;
+@varref = @var_decl | @varaccess;
+
+@identifier = @label | @varref | @type_identifier;
+
+@literal = @null_literal | @boolean_literal | @number_literal | @string_literal | @regexp_literal | @bigint_literal;
+
+@propaccess = @dot_expr | @index_expr;
+
+@invokeexpr = @new_expr | @call_expr;
+
+@unaryexpr = @neg_expr | @plus_expr | @log_not_expr | @bit_not_expr | @typeof_expr | @void_expr | @delete_expr | @spread_element;
+
+@equality_test = @eq_expr | @neq_expr | @eqq_expr | @neqq_expr;
+
+@comparison = @equality_test | @lt_expr | @le_expr | @gt_expr | @ge_expr;
+
+@binaryexpr = @comparison | @lshift_expr | @rshift_expr | @urshift_expr | @add_expr | @sub_expr | @mul_expr | @div_expr | @mod_expr | @exp_expr | @bitor_expr | @xor_expr | @bitand_expr | @in_expr | @instanceof_expr | @logand_expr | @logor_expr | @nullishcoalescing_expr;
+
+@assignment = @assign_expr | @assign_add_expr | @assign_sub_expr | @assign_mul_expr | @assign_div_expr | @assign_mod_expr | @assign_exp_expr | @assign_lshift_expr | @assign_rshift_expr | @assign_urshift_expr | @assign_or_expr | @assign_xor_expr | @assign_and_expr | @assignlogandexpr | @assignlogorexpr | @assignnullishcoalescingexpr;
+
+@updateexpr = @preinc_expr | @postinc_expr | @predec_expr | @postdec_expr;
+
+@pattern = @varref | @array_pattern | @object_pattern;
+
+@comprehension_expr = @array_comprehension_expr | @generator_expr;
+
+@comprehension_block = @for_in_comprehension_block | @for_of_comprehension_block;
+
+@import_specifier = @named_import_specifier | @import_default_specifier | @import_namespace_specifier;
+
+@exportspecifier = @named_export_specifier | @export_default_specifier | @export_namespace_specifier;
+
+@type_keyword_operand = @import_declaration | @export_declaration | @import_specifier;
+
+@type_assertion = @as_type_assertion | @prefix_type_assertion;
+
+@class_definition = @class_decl_stmt | @class_expr;
+@interface_definition = @interface_declaration | @interface_typeexpr;
+@class_or_interface = @class_definition | @interface_definition;
+
+@lexical_decl = @var_decl | @type_decl;
+@lexical_access = @varaccess | @local_type_access | @local_var_type_access | @local_namespace_access;
+@lexical_ref = @lexical_decl | @lexical_access;
+
+@e4x_xml_attribute_selector = @e4x_xml_static_attribute_selector | @e4x_xml_dynamic_attribute_selector;
+@e4x_xml_qualident = @e4x_xml_static_qualident | @e4x_xml_dynamic_qualident;
+
+expr_contains_template_tag_location(
+  int expr: @expr ref,
+  int location: @location ref
+);
+
+@template_placeholder_tag_parent = @xmlelement | @xmlattribute | @file;
+
+template_placeholder_tag_info(
+  unique int node: @template_placeholder_tag,
+  int parentNode: @template_placeholder_tag_parent ref,
+  varchar(900) raw: string ref
+);
+
+// scopes
+scopes (unique int id: @scope,
+        int kind: int ref);
+
+case @scope.kind of
+   0 = @global_scope
+|  1 = @function_scope
+|  2 = @catch_scope
+|  3 = @module_scope
+|  4 = @block_scope
+|  5 = @for_scope
+|  6 = @for_in_scope // for-of scopes work the same as for-in scopes
+|  7 = @comprehension_block_scope
+|  8 = @class_expr_scope
+|  9 = @namespace_scope
+| 10 = @class_decl_scope
+| 11 = @interface_scope
+| 12 = @type_alias_scope
+| 13 = @mapped_type_scope
+| 14 = @enum_scope
+| 15 = @external_module_scope
+| 16 = @conditional_type_scope;
+
+scopenodes (unique int node: @ast_node ref,
+            int scope: @scope ref);
+
+scopenesting (unique int inner: @scope ref,
+              int outer: @scope ref);
+
+// functions
+@function = @function_decl_stmt | @function_expr | @arrow_function_expr;
+
+@parameterized = @function | @catch_clause;
+@type_parameterized = @function | @class_or_interface | @type_alias_declaration | @mapped_typeexpr | @infer_typeexpr;
+
+is_generator (int fun: @function ref);
+has_rest_parameter (int fun: @function ref);
+is_async (int fun: @function ref);
+
+// variables and lexically scoped type names
+#keyset[scope, name]
+variables (unique int id: @variable,
+           varchar(900) name: string ref,
+           int scope: @scope ref);
+
+#keyset[scope, name]
+local_type_names (unique int id: @local_type_name,
+                  varchar(900) name: string ref,
+                  int scope: @scope ref);
+
+#keyset[scope, name]
+local_namespace_names (unique int id: @local_namespace_name,
+                       varchar(900) name: string ref,
+                       int scope: @scope ref);
+
+is_arguments_object (int id: @variable ref);
+
+@lexical_name = @variable | @local_type_name | @local_namespace_name;
+
+@bind_id = @varaccess | @local_var_type_access;
+bind (unique int id: @bind_id ref,
+      int decl: @variable ref);
+
+decl (unique int id: @var_decl ref,
+      int decl: @variable ref);
+
+@typebind_id = @local_type_access | @export_varaccess;
+typebind (unique int id: @typebind_id ref,
+          int decl: @local_type_name ref);
+
+@typedecl_id = @type_decl | @var_decl;
+typedecl (unique int id: @typedecl_id ref,
+          int decl: @local_type_name ref);
+
+namespacedecl (unique int id: @var_decl ref,
+               int decl: @local_namespace_name ref);
+
+@namespacebind_id = @local_namespace_access | @export_varaccess;
+namespacebind (unique int id: @namespacebind_id ref,
+               int decl: @local_namespace_name ref);
+
+
+// properties in object literals, property patterns in object patterns, and method declarations in classes
+#keyset[parent, index]
+properties (unique int id: @property,
+            int parent: @property_parent ref,
+            int index: int ref,
+            int kind: int ref,
+            varchar(900) tostring: string ref);
+
+case @property.kind of
+  0 = @value_property
+| 1 = @property_getter
+| 2 = @property_setter
+| 3 = @jsx_attribute
+| 4 = @function_call_signature
+| 5 = @constructor_call_signature
+| 6 = @index_signature
+| 7 = @enum_member
+| 8 = @proper_field
+| 9 = @parameter_field
+| 10 = @static_initializer
+;
+
+@property_parent = @obj_expr | @object_pattern | @class_definition | @jsx_element | @interface_definition | @enum_declaration;
+@property_accessor = @property_getter | @property_setter;
+@call_signature = @function_call_signature | @constructor_call_signature;
+@field = @proper_field | @parameter_field;
+@field_or_vardeclarator = @field | @var_declarator;
+
+is_computed (int id: @property ref);
+is_method   (int id: @property ref);
+is_static   (int id: @property ref);
+is_abstract_member (int id: @property ref);
+is_const_enum (int id: @enum_declaration ref);
+is_abstract_class (int id: @class_decl_stmt ref);
+
+has_public_keyword (int id: @property ref);
+has_private_keyword (int id: @property ref);
+has_protected_keyword (int id: @property ref);
+has_readonly_keyword (int id: @property ref);
+has_type_keyword (int id: @type_keyword_operand ref);
+is_optional_member (int id: @property ref);
+has_definite_assignment_assertion (int id: @field_or_vardeclarator ref);
+is_optional_parameter_declaration (unique int parameter: @pattern ref);
+
+#keyset[constructor, param_index]
+parameter_fields(
+  unique int field: @parameter_field ref,
+  int constructor: @function_expr ref,
+  int param_index: int ref
+);
+
+// types
+#keyset[parent, idx]
+typeexprs (
+  unique int id: @typeexpr,
+  int kind: int ref,
+  int parent: @typeexpr_parent ref,
+  int idx: int ref,
+  varchar(900) tostring: string ref
+);
+
+case @typeexpr.kind of
+  0 = @local_type_access
+| 1 = @type_decl
+| 2 = @keyword_typeexpr
+| 3 = @string_literal_typeexpr
+| 4 = @number_literal_typeexpr
+| 5 = @boolean_literal_typeexpr
+| 6 = @array_typeexpr
+| 7 = @union_typeexpr
+| 8 = @indexed_access_typeexpr
+| 9 = @intersection_typeexpr
+| 10 = @parenthesized_typeexpr
+| 11 = @tuple_typeexpr
+| 12 = @keyof_typeexpr
+| 13 = @qualified_type_access
+| 14 = @generic_typeexpr
+| 15 = @type_label
+| 16 = @typeof_typeexpr
+| 17 = @local_var_type_access
+| 18 = @qualified_var_type_access
+| 19 = @this_var_type_access
+| 20 = @predicate_typeexpr
+| 21 = @interface_typeexpr
+| 22 = @type_parameter
+| 23 = @plain_function_typeexpr
+| 24 = @constructor_typeexpr
+| 25 = @local_namespace_access
+| 26 = @qualified_namespace_access
+| 27 = @mapped_typeexpr
+| 28 = @conditional_typeexpr
+| 29 = @infer_typeexpr
+| 30 = @import_type_access
+| 31 = @import_namespace_access
+| 32 = @import_var_type_access
+| 33 = @optional_typeexpr
+| 34 = @rest_typeexpr
+| 35 = @bigint_literal_typeexpr
+| 36 = @readonly_typeexpr
+| 37 = @template_literal_typeexpr
+;
+
+@typeref = @typeaccess | @type_decl;
+@type_identifier = @type_decl | @local_type_access | @type_label | @local_var_type_access | @local_namespace_access;
+@typeexpr_parent = @expr | @stmt | @property | @typeexpr;
+@literal_typeexpr = @string_literal_typeexpr | @number_literal_typeexpr | @boolean_literal_typeexpr | @bigint_literal_typeexpr;
+@typeaccess = @local_type_access | @qualified_type_access | @import_type_access;
+@vartypeaccess = @local_var_type_access | @qualified_var_type_access | @this_var_type_access | @import_var_type_access;
+@namespace_access = @local_namespace_access | @qualified_namespace_access | @import_namespace_access;
+@import_typeexpr = @import_type_access | @import_namespace_access | @import_var_type_access;
+
+@function_typeexpr = @plain_function_typeexpr | @constructor_typeexpr;
+
+// types
+types (
+  unique int id: @type,
+  int kind: int ref,
+  varchar(900) tostring: string ref
+);
+
+#keyset[parent, idx]
+type_child (
+  int child: @type ref,
+  int parent: @type ref,
+  int idx: int ref
+);
+
+case @type.kind of
+  0 = @any_type
+| 1 = @string_type
+| 2 = @number_type
+| 3 = @union_type
+| 4 = @true_type
+| 5 = @false_type
+| 6 = @type_reference
+| 7 = @object_type
+| 8 = @canonical_type_variable_type
+| 9 = @typeof_type
+| 10 = @void_type
+| 11 = @undefined_type
+| 12 = @null_type
+| 13 = @never_type
+| 14 = @plain_symbol_type
+| 15 = @unique_symbol_type
+| 16 = @objectkeyword_type
+| 17 = @intersection_type
+| 18 = @tuple_type
+| 19 = @lexical_type_variable_type
+| 20 = @this_type
+| 21 = @number_literal_type
+| 22 = @string_literal_type
+| 23 = @unknown_type
+| 24 = @bigint_type
+| 25 = @bigint_literal_type
+;
+
+@boolean_literal_type = @true_type | @false_type;
+@symbol_type = @plain_symbol_type | @unique_symbol_type;
+@union_or_intersection_type = @union_type | @intersection_type;
+@typevariable_type = @canonical_type_variable_type | @lexical_type_variable_type;
+
+has_asserts_keyword(int node: @predicate_typeexpr ref);
+
+@typed_ast_node = @expr | @typeexpr | @function;
+ast_node_type(
+  unique int node: @typed_ast_node ref,
+  int typ: @type ref);
+
+declared_function_signature(
+  unique int node: @function ref,
+  int sig: @signature_type ref
+);
+
+invoke_expr_signature(
+  unique int node: @invokeexpr ref,
+  int sig: @signature_type ref
+);
+
+invoke_expr_overload_index(
+  unique int node: @invokeexpr ref,
+  int index: int ref
+);
+
+symbols (
+  unique int id: @symbol,
+  int kind: int ref,
+  varchar(900) name: string ref
+);
+
+symbol_parent (
+  unique int symbol: @symbol ref,
+  int parent: @symbol ref
+);
+
+symbol_module (
+  int symbol: @symbol ref,
+  varchar(900) moduleName: string ref
+);
+
+symbol_global (
+  int symbol: @symbol ref,
+  varchar(900) globalName: string ref
+);
+
+case @symbol.kind of
+  0 = @root_symbol
+| 1 = @member_symbol
+| 2 = @other_symbol
+;
+
+@type_with_symbol = @type_reference | @typevariable_type | @typeof_type | @unique_symbol_type;
+@ast_node_with_symbol = @type_definition | @namespace_definition | @toplevel | @typeaccess | @namespace_access | @var_decl | @function | @invokeexpr | @import_declaration | @external_module_reference | @external_module_declaration;
+
+ast_node_symbol(
+  unique int node: @ast_node_with_symbol ref,
+  int symbol: @symbol ref);
+
+type_symbol(
+  unique int typ: @type_with_symbol ref,
+  int symbol: @symbol ref);
+
+#keyset[typ, name]
+type_property(
+  int typ: @type ref,
+  varchar(900) name: string ref,
+  int propertyType: @type ref);
+
+type_alias(
+  unique int aliasType: @type ref,
+  int underlyingType: @type ref);
+
+@literal_type = @string_literal_type | @number_literal_type | @boolean_literal_type | @bigint_literal_type;
+@type_with_literal_value = @string_literal_type | @number_literal_type | @bigint_literal_type;
+type_literal_value(
+  unique int typ: @type_with_literal_value ref,
+  varchar(900) value: string ref);
+
+signature_types (
+  unique int id: @signature_type,
+  int kind: int ref,
+  varchar(900) tostring: string ref,
+  int type_parameters: int ref,
+  int required_params: int ref
+);
+
+is_abstract_signature(
+  unique int sig: @signature_type ref
+);
+
+signature_rest_parameter(
+  unique int sig: @signature_type ref,
+  int rest_param_arra_type: @type ref
+);
+
+case @signature_type.kind of
+  0 = @function_signature_type
+| 1 = @constructor_signature_type
+;
+
+#keyset[typ, kind, index]
+type_contains_signature (
+  int typ: @type ref,
+  int kind: int ref,  // constructor/call/index
+  int index: int ref, // ordering of overloaded signatures
+  int sig: @signature_type ref
+);
+
+#keyset[parent, index]
+signature_contains_type (
+  int child: @type ref,
+  int parent: @signature_type ref,
+  int index: int ref
+);
+
+#keyset[sig, index]
+signature_parameter_name (
+  int sig: @signature_type ref,
+  int index: int ref,
+  varchar(900) name: string ref
+);
+
+number_index_type (
+  unique int baseType: @type ref,
+  int propertyType: @type ref
+);
+
+string_index_type (
+  unique int baseType: @type ref,
+  int propertyType: @type ref
+);
+
+base_type_names(
+  int typeName: @symbol ref,
+  int baseTypeName: @symbol ref
+);
+
+self_types(
+  int typeName: @symbol ref,
+  int selfType: @type_reference ref
+);
+
+tuple_type_min_length(
+  unique int typ: @type ref,
+  int minLength: int ref
+);
+
+tuple_type_rest_index(
+  unique int typ: @type ref,
+  int index: int ref
+);
+
+// comments
+comments (unique int id: @comment,
+          int kind: int ref,
+          int toplevel: @toplevel ref,
+          varchar(900) text: string ref,
+          varchar(900) tostring: string ref);
+
+case @comment.kind of
+  0 = @slashslash_comment
+| 1 = @slashstar_comment
+| 2 = @doc_comment
+| 3 = @html_comment_start
+| 4 = @htmlcommentend;
+
+@html_comment = @html_comment_start | @htmlcommentend;
+@line_comment = @slashslash_comment | @html_comment;
+@block_comment = @slashstar_comment | @doc_comment;
+
+// source lines
+lines (unique int id: @line,
+       int toplevel: @toplevel ref,
+       varchar(900) text: string ref,
+       varchar(2) terminator: string ref);
+indentation (int file: @file ref,
+            int lineno: int ref,
+            varchar(1) indentChar: string ref,
+            int indentDepth: int ref);
+
+// JavaScript parse errors
+js_parse_errors (unique int id: @js_parse_error,
+        int toplevel: @toplevel ref,
+        varchar(900) message: string ref,
+        varchar(900) line: string ref);
+
+// regular expressions
+#keyset[parent, idx]
+regexpterm (unique int id: @regexpterm,
+        int kind: int ref,
+        int parent: @regexpparent ref,
+        int idx: int ref,
+        varchar(900) tostring: string ref);
+
+@regexpparent = @regexpterm | @regexp_literal | @string_literal | @add_expr;
+
+case @regexpterm.kind of
+   0 = @regexp_alt
+|  1 = @regexp_seq
+|  2 = @regexp_caret
+|  3 = @regexp_dollar
+|  4 = @regexp_wordboundary
+|  5 = @regexp_nonwordboundary
+|  6 = @regexp_positive_lookahead
+|  7 = @regexp_negative_lookahead
+|  8 = @regexp_star
+|  9 = @regexp_plus
+| 10 = @regexp_opt
+| 11 = @regexp_range
+| 12 = @regexp_dot
+| 13 = @regexp_group
+| 14 = @regexp_normal_constant
+| 15 = @regexp_hex_escape
+| 16 = @regexp_unicode_escape
+| 17 = @regexp_dec_escape
+| 18 = @regexp_oct_escape
+| 19 = @regexp_ctrl_escape
+| 20 = @regexp_char_class_escape
+| 21 = @regexp_id_escape
+| 22 = @regexp_backref
+| 23 = @regexp_char_class
+| 24 = @regexp_char_range
+| 25 = @regexp_positive_lookbehind
+| 26 = @regexp_negative_lookbehind
+| 27 = @regexp_unicode_property_escape
+| 28 = @regexp_quoted_string
+| 29 = @regexp_intersection
+| 30 = @regexp_subtraction;
+
+regexp_parse_errors (unique int id: @regexp_parse_error,
+    int regexp: @regexpterm ref,
+    varchar(900) message: string ref);
+
+@regexp_quantifier = @regexp_star | @regexp_plus | @regexp_opt | @regexp_range;
+@regexp_escape = @regexp_char_escape | @regexp_char_class_escape | @regexp_unicode_property_escape;
+@regexp_char_escape = @regexp_hex_escape | @regexp_unicode_escape | @regexp_dec_escape | @regexp_oct_escape | @regexp_ctrl_escape | @regexp_id_escape;
+@regexp_constant = @regexp_normal_constant | @regexp_char_escape;
+@regexp_lookahead = @regexp_positive_lookahead | @regexp_negative_lookahead;
+@regexp_lookbehind = @regexp_positive_lookbehind | @regexp_negative_lookbehind;
+@regexp_subpattern = @regexp_lookahead | @regexp_lookbehind;
+@regexp_anchor = @regexp_dollar | @regexp_caret;
+
+is_greedy (int id: @regexp_quantifier ref);
+range_quantifier_lower_bound (unique int id: @regexp_range ref, int lo: int ref);
+range_quantifier_upper_bound (unique int id: @regexp_range ref, int hi: int ref);
+is_capture (unique int id: @regexp_group ref, int number: int ref);
+is_named_capture (unique int id: @regexp_group ref, string name: string ref);
+is_inverted (int id: @regexp_char_class ref);
+regexp_const_value (unique int id: @regexp_constant ref, varchar(1) value: string ref);
+char_class_escape (unique int id: @regexp_char_class_escape ref, varchar(1) value: string ref);
+backref (unique int id: @regexp_backref ref, int value: int ref);
+named_backref (unique int id: @regexp_backref ref, string name: string ref);
+unicode_property_escapename (unique int id: @regexp_unicode_property_escape ref, string name: string ref);
+unicode_property_escapevalue (unique int id: @regexp_unicode_property_escape ref, string value: string ref);
+
+// tokens
+#keyset[toplevel, idx]
+tokeninfo (unique int id: @token,
+    int kind: int ref,
+    int toplevel: @toplevel ref,
+    int idx: int ref,
+    varchar(900) value: string ref);
+
+case @token.kind of
+  0 = @token_eof
+| 1 = @token_null_literal
+| 2 = @token_boolean_literal
+| 3 = @token_numeric_literal
+| 4 = @token_string_literal
+| 5 = @token_regular_expression
+| 6 = @token_identifier
+| 7 = @token_keyword
+| 8 = @token_punctuator;
+
+// associate comments with the token immediately following them (which may be EOF)
+next_token (int comment: @comment ref, int token: @token ref);
+
+// JSON
+#keyset[parent, idx]
+json (unique int id: @json_value,
+      int kind: int ref,
+      int parent: @json_parent ref,
+      int idx: int ref,
+      varchar(900) tostring: string ref);
+
+json_literals (varchar(900) value: string ref,
+      varchar(900) raw: string ref,
+      unique int expr: @json_value ref);
+
+json_properties (int obj: @json_object ref,
+      varchar(900) property: string ref,
+      int value: @json_value ref);
+
+json_errors (unique int id: @json_parse_error,
+      varchar(900) message: string ref);
+
+json_locations(unique int locatable: @json_locatable ref,
+      int location: @location_default ref);
+
+case @json_value.kind of
+  0 = @json_null
+| 1 = @json_boolean
+| 2 = @json_number
+| 3 = @json_string
+| 4 = @json_array
+| 5 = @json_object;
+
+@json_parent = @json_object | @json_array | @file;
+
+@json_locatable = @json_value | @json_parse_error;
+
+// locations
+@ast_node = @toplevel | @stmt | @expr | @property | @typeexpr;
+
+@locatable = @file
+    | @ast_node
+    | @comment
+    | @line
+    | @js_parse_error | @regexp_parse_error
+    | @regexpterm
+    | @json_locatable
+    | @token
+    | @cfg_node
+    | @jsdoc | @jsdoc_type_expr | @jsdoc_tag
+    | @yaml_locatable
+    | @xmllocatable
+    | @configLocatable
+    | @template_placeholder_tag;
+
+hasLocation (unique int locatable: @locatable ref,
+    int location: @location ref);
+
+// CFG
+entry_cfg_node (unique int id: @entry_node, int container: @stmt_container ref);
+exit_cfg_node (unique int id: @exit_node, int container: @stmt_container ref);
+guard_node (unique int id: @guard_node, int kind: int ref, int test: @expr ref);
+case @guard_node.kind of
+  0 = @falsy_guard
+| 1 = @truthy_guard;
+@condition_guard = @falsy_guard | @truthy_guard;
+
+@synthetic_cfg_node = @entry_node | @exit_node | @guard_node;
+@cfg_node = @synthetic_cfg_node | @expr_parent;
+
+successor (int pred: @cfg_node ref, int succ: @cfg_node ref);
+
+// JSDoc comments
+jsdoc (unique int id: @jsdoc, varchar(900) description: string ref, int comment: @comment ref);
+#keyset[parent, idx]
+jsdoc_tags (unique int id: @jsdoc_tag, varchar(900) title: string ref,
+            int parent: @jsdoc ref, int idx: int ref, varchar(900) tostring: string ref);
+jsdoc_tag_descriptions (unique int tag: @jsdoc_tag ref, varchar(900) text: string ref);
+jsdoc_tag_names (unique int tag: @jsdoc_tag ref, varchar(900) text: string ref);
+
+#keyset[parent, idx]
+jsdoc_type_exprs (unique int id: @jsdoc_type_expr,
+                  int kind: int ref,
+                  int parent: @jsdoc_type_expr_parent ref,
+                  int idx: int ref,
+                  varchar(900) tostring: string ref);
+case @jsdoc_type_expr.kind of
+    0 = @jsdoc_any_type_expr
+|   1 = @jsdoc_null_type_expr
+|   2 = @jsdoc_undefined_type_expr
+|   3 = @jsdoc_unknown_type_expr
+|   4 = @jsdoc_void_type_expr
+|   5 = @jsdoc_identifier_type_expr
+|   6 = @jsdoc_applied_type_expr
+|   7 = @jsdoc_nullable_type_expr
+|   8 = @jsdoc_non_nullable_type_expr
+|   9 = @jsdoc_record_type_expr
+|  10 = @jsdoc_array_type_expr
+|  11 = @jsdoc_union_type_expr
+|  12 = @jsdoc_function_type_expr
+|  13 = @jsdoc_optional_type_expr
+|  14 = @jsdoc_rest_type_expr
+|  15 = @jsdoc_qualified_type_expr
+;
+
+#keyset[id, idx]
+jsdoc_record_field_name (int id: @jsdoc_record_type_expr ref, int idx: int ref, varchar(900) name: string ref);
+jsdoc_prefix_qualifier (int id: @jsdoc_type_expr ref);
+jsdoc_has_new_parameter (int fn: @jsdoc_function_type_expr ref);
+
+@jsdoc_type_expr_parent = @jsdoc_type_expr | @jsdoc_tag;
+
+jsdoc_errors (unique int id: @jsdoc_error, int tag: @jsdoc_tag ref, varchar(900) message: string ref, varchar(900) tostring: string ref);
+
+@dataflownode = @expr | @function_decl_stmt | @class_decl_stmt | @namespace_declaration | @enum_declaration | @property;
+
+@optionalchainable = @call_expr | @propaccess;
+
+isOptionalChaining(int id: @optionalchainable ref);
+
+/**
+ * The time taken for the extraction of a file.
+ * This table contains non-deterministic content.
+ *
+ * The sum of the `time` column for each (`file`, `timerKind`) pair
+ * is the total time taken for extraction of `file`.  The `extractionPhase`
+ * column provides a granular view of the extraction time of the file.
+ */
+extraction_time(
+  int file : @file ref,
+  // see `com.semmle.js.extractor.ExtractionMetrics.ExtractionPhase`.
+  int extractionPhase: int ref,
+  // 0 for the elapsed CPU time in nanoseconds, 1 for the elapsed wallclock time in nanoseconds
+  int timerKind: int ref,
+  float time: float ref
+)
+
+/**
+* Non-timing related data for the extraction of a single file.
+* This table contains non-deterministic content.
+*/
+extraction_data(
+  int file : @file ref,
+  // the absolute path to the cache file
+  varchar(900) cacheFile: string ref,
+  boolean fromCache: boolean ref,
+  int length: int ref
+)
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error;
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+/*- Configuration files with key value pairs -*/
+
+configs(
+  unique int id: @config
+);
+
+configNames(
+  unique int id: @configName,
+  int config: @config ref,
+  string name: string ref
+);
+
+configValues(
+  unique int id: @configValue,
+  int config: @config ref,
+  string value: string ref
+);
+
+configLocations(
+  int locatable: @configLocatable ref,
+  int location: @location_default ref
+);
+
+@configLocatable = @config | @configName | @configValue;
+
+/*- Database metadata -*/
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+overlayChangedFiles(
+  string path: string ref
+);
diff --git a/javascript/downgrades/76a926a00d5f3bc199c203a1437796fd7b2835ba/semmlecode.javascript.dbscheme b/javascript/downgrades/76a926a00d5f3bc199c203a1437796fd7b2835ba/semmlecode.javascript.dbscheme
new file mode 100644
index 00000000000..ccefb5e2d49
--- /dev/null
+++ b/javascript/downgrades/76a926a00d5f3bc199c203a1437796fd7b2835ba/semmlecode.javascript.dbscheme
@@ -0,0 +1,1194 @@
+/*** Standard fragments ***/
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- JavaScript-specific part -*/
+
+@location = @location_default
+
+@sourceline = @locatable;
+
+filetype(
+  int file: @file ref,
+  string filetype: string ref
+)
+
+// top-level code fragments
+toplevels (unique int id: @toplevel,
+           int kind: int ref);
+
+is_externs (int toplevel: @toplevel ref);
+
+case @toplevel.kind of
+   0 = @script
+|  1 = @inline_script
+|  2 = @event_handler
+|  3 = @javascript_url
+|  4 = @template_toplevel;
+
+is_module (int tl: @toplevel ref);
+is_nodejs (int tl: @toplevel ref);
+is_es2015_module (int tl: @toplevel ref);
+is_closure_module (int tl: @toplevel ref);
+
+@xml_node_with_code = @xmlelement | @xmlattribute | @template_placeholder_tag;
+toplevel_parent_xml_node(
+  unique int toplevel: @toplevel ref,
+  int xmlnode: @xml_node_with_code ref);
+
+xml_element_parent_expression(
+  unique int xmlnode: @xmlelement ref,
+  int expression: @expr ref,
+  int index: int ref);
+
+// statements
+#keyset[parent, idx]
+stmts (unique int id: @stmt,
+       int kind: int ref,
+       int parent: @stmt_parent ref,
+       int idx: int ref,
+       varchar(900) tostring: string ref);
+
+stmt_containers (unique int stmt: @stmt ref,
+       int container: @stmt_container ref);
+
+jump_targets (unique int jump: @stmt ref,
+       int target: @stmt ref);
+
+@stmt_parent = @stmt | @toplevel | @function_expr | @arrow_function_expr | @static_initializer;
+@stmt_container = @toplevel | @function | @namespace_declaration | @external_module_declaration | @global_augmentation_declaration;
+
+case @stmt.kind of
+   0 = @empty_stmt
+|  1 = @block_stmt
+|  2 = @expr_stmt
+|  3 = @if_stmt
+|  4 = @labeled_stmt
+|  5 = @break_stmt
+|  6 = @continue_stmt
+|  7 = @with_stmt
+|  8 = @switch_stmt
+|  9 = @return_stmt
+| 10 = @throw_stmt
+| 11 = @try_stmt
+| 12 = @while_stmt
+| 13 = @do_while_stmt
+| 14 = @for_stmt
+| 15 = @for_in_stmt
+| 16 = @debugger_stmt
+| 17 = @function_decl_stmt
+| 18 = @var_decl_stmt
+| 19 = @case
+| 20 = @catch_clause
+| 21 = @for_of_stmt
+| 22 = @const_decl_stmt
+| 23 = @let_stmt
+| 24 = @legacy_let_stmt
+| 25 = @for_each_stmt
+| 26 = @class_decl_stmt
+| 27 = @import_declaration
+| 28 = @export_all_declaration
+| 29 = @export_default_declaration
+| 30 = @export_named_declaration
+| 31 = @namespace_declaration
+| 32 = @import_equals_declaration
+| 33 = @export_assign_declaration
+| 34 = @interface_declaration
+| 35 = @type_alias_declaration
+| 36 = @enum_declaration
+| 37 = @external_module_declaration
+| 38 = @export_as_namespace_declaration
+| 39 = @global_augmentation_declaration
+| 40 = @using_decl_stmt
+;
+
+@decl_stmt = @var_decl_stmt | @const_decl_stmt | @let_stmt | @legacy_let_stmt | @using_decl_stmt;
+
+@export_declaration = @export_all_declaration | @export_default_declaration | @export_named_declaration;
+
+@namespace_definition = @namespace_declaration | @enum_declaration;
+@type_definition = @class_definition | @interface_declaration | @enum_declaration | @type_alias_declaration | @enum_member;
+
+is_instantiated(unique int decl: @namespace_declaration ref);
+
+@declarable_node = @decl_stmt | @namespace_declaration | @class_decl_stmt | @function_decl_stmt | @enum_declaration | @external_module_declaration | @global_augmentation_declaration | @field;
+has_declare_keyword(unique int stmt: @declarable_node ref);
+
+is_for_await_of(unique int forof: @for_of_stmt ref);
+
+// expressions
+#keyset[parent, idx]
+exprs (unique int id: @expr,
+       int kind: int ref,
+       int parent: @expr_parent ref,
+       int idx: int ref,
+       varchar(900) tostring: string ref);
+
+literals (varchar(900) value: string ref,
+       varchar(900) raw: string ref,
+       unique int expr: @expr_or_type ref);
+
+enclosing_stmt (unique int expr: @expr_or_type ref,
+       int stmt: @stmt ref);
+
+expr_containers (unique int expr: @expr_or_type ref,
+       int container: @stmt_container ref);
+
+array_size (unique int ae: @arraylike ref,
+       int sz: int ref);
+
+is_delegating (int yield: @yield_expr ref);
+
+@expr_or_stmt = @expr | @stmt;
+@expr_or_type = @expr | @typeexpr;
+@expr_parent = @expr_or_stmt | @property | @function_typeexpr;
+@arraylike = @array_expr | @array_pattern;
+@type_annotation = @typeexpr | @jsdoc_type_expr;
+@node_in_stmt_container = @cfg_node | @type_annotation | @toplevel;
+
+case @expr.kind of
+   0 = @label
+|  1 = @null_literal
+|  2 = @boolean_literal
+|  3 = @number_literal
+|  4 = @string_literal
+|  5 = @regexp_literal
+|  6 = @this_expr
+|  7 = @array_expr
+|  8 = @obj_expr
+|  9 = @function_expr
+| 10 = @seq_expr
+| 11 = @conditional_expr
+| 12 = @new_expr
+| 13 = @call_expr
+| 14 = @dot_expr
+| 15 = @index_expr
+| 16 = @neg_expr
+| 17 = @plus_expr
+| 18 = @log_not_expr
+| 19 = @bit_not_expr
+| 20 = @typeof_expr
+| 21 = @void_expr
+| 22 = @delete_expr
+| 23 = @eq_expr
+| 24 = @neq_expr
+| 25 = @eqq_expr
+| 26 = @neqq_expr
+| 27 = @lt_expr
+| 28 = @le_expr
+| 29 = @gt_expr
+| 30 = @ge_expr
+| 31 = @lshift_expr
+| 32 = @rshift_expr
+| 33 = @urshift_expr
+| 34 = @add_expr
+| 35 = @sub_expr
+| 36 = @mul_expr
+| 37 = @div_expr
+| 38 = @mod_expr
+| 39 = @bitor_expr
+| 40 = @xor_expr
+| 41 = @bitand_expr
+| 42 = @in_expr
+| 43 = @instanceof_expr
+| 44 = @logand_expr
+| 45 = @logor_expr
+| 47 = @assign_expr
+| 48 = @assign_add_expr
+| 49 = @assign_sub_expr
+| 50 = @assign_mul_expr
+| 51 = @assign_div_expr
+| 52 = @assign_mod_expr
+| 53 = @assign_lshift_expr
+| 54 = @assign_rshift_expr
+| 55 = @assign_urshift_expr
+| 56 = @assign_or_expr
+| 57 = @assign_xor_expr
+| 58 = @assign_and_expr
+| 59 = @preinc_expr
+| 60 = @postinc_expr
+| 61 = @predec_expr
+| 62 = @postdec_expr
+| 63 = @par_expr
+| 64 = @var_declarator
+| 65 = @arrow_function_expr
+| 66 = @spread_element
+| 67 = @array_pattern
+| 68 = @object_pattern
+| 69 = @yield_expr
+| 70 = @tagged_template_expr
+| 71 = @template_literal
+| 72 = @template_element
+| 73 = @array_comprehension_expr
+| 74 = @generator_expr
+| 75 = @for_in_comprehension_block
+| 76 = @for_of_comprehension_block
+| 77 = @legacy_letexpr
+| 78 = @var_decl
+| 79 = @proper_varaccess
+| 80 = @class_expr
+| 81 = @super_expr
+| 82 = @newtarget_expr
+| 83 = @named_import_specifier
+| 84 = @import_default_specifier
+| 85 = @import_namespace_specifier
+| 86 = @named_export_specifier
+| 87 = @exp_expr
+| 88 = @assign_exp_expr
+| 89 = @jsx_element
+| 90 = @jsx_qualified_name
+| 91 = @jsx_empty_expr
+| 92 = @await_expr
+| 93 = @function_sent_expr
+| 94 = @decorator
+| 95 = @export_default_specifier
+| 96 = @export_namespace_specifier
+| 97 = @bind_expr
+| 98 = @external_module_reference
+| 99 = @dynamic_import
+| 100 = @expression_with_type_arguments
+| 101 = @prefix_type_assertion
+| 102 = @as_type_assertion
+| 103 = @export_varaccess
+| 104 = @decorator_list
+| 105 = @non_null_assertion
+| 106 = @bigint_literal
+| 107 = @nullishcoalescing_expr
+| 108 = @e4x_xml_anyname
+| 109 = @e4x_xml_static_attribute_selector
+| 110 = @e4x_xml_dynamic_attribute_selector
+| 111 = @e4x_xml_filter_expression
+| 112 = @e4x_xml_static_qualident
+| 113 = @e4x_xml_dynamic_qualident
+| 114 = @e4x_xml_dotdotexpr
+| 115 = @import_meta_expr
+| 116 = @assignlogandexpr
+| 117 = @assignlogorexpr
+| 118 = @assignnullishcoalescingexpr
+| 119 = @template_pipe_ref
+| 120 = @generated_code_expr
+| 121 = @satisfies_expr
+;
+
+@varaccess = @proper_varaccess | @export_varaccess;
+@varref = @var_decl | @varaccess;
+
+@identifier = @label | @varref | @type_identifier;
+
+@literal = @null_literal | @boolean_literal | @number_literal | @string_literal | @regexp_literal | @bigint_literal;
+
+@propaccess = @dot_expr | @index_expr;
+
+@invokeexpr = @new_expr | @call_expr;
+
+@unaryexpr = @neg_expr | @plus_expr | @log_not_expr | @bit_not_expr | @typeof_expr | @void_expr | @delete_expr | @spread_element;
+
+@equality_test = @eq_expr | @neq_expr | @eqq_expr | @neqq_expr;
+
+@comparison = @equality_test | @lt_expr | @le_expr | @gt_expr | @ge_expr;
+
+@binaryexpr = @comparison | @lshift_expr | @rshift_expr | @urshift_expr | @add_expr | @sub_expr | @mul_expr | @div_expr | @mod_expr | @exp_expr | @bitor_expr | @xor_expr | @bitand_expr | @in_expr | @instanceof_expr | @logand_expr | @logor_expr | @nullishcoalescing_expr;
+
+@assignment = @assign_expr | @assign_add_expr | @assign_sub_expr | @assign_mul_expr | @assign_div_expr | @assign_mod_expr | @assign_exp_expr | @assign_lshift_expr | @assign_rshift_expr | @assign_urshift_expr | @assign_or_expr | @assign_xor_expr | @assign_and_expr | @assignlogandexpr | @assignlogorexpr | @assignnullishcoalescingexpr;
+
+@updateexpr = @preinc_expr | @postinc_expr | @predec_expr | @postdec_expr;
+
+@pattern = @varref | @array_pattern | @object_pattern;
+
+@comprehension_expr = @array_comprehension_expr | @generator_expr;
+
+@comprehension_block = @for_in_comprehension_block | @for_of_comprehension_block;
+
+@import_specifier = @named_import_specifier | @import_default_specifier | @import_namespace_specifier;
+
+@exportspecifier = @named_export_specifier | @export_default_specifier | @export_namespace_specifier;
+
+@type_keyword_operand = @import_declaration | @export_declaration | @import_specifier;
+
+@type_assertion = @as_type_assertion | @prefix_type_assertion;
+
+@class_definition = @class_decl_stmt | @class_expr;
+@interface_definition = @interface_declaration | @interface_typeexpr;
+@class_or_interface = @class_definition | @interface_definition;
+
+@lexical_decl = @var_decl | @type_decl;
+@lexical_access = @varaccess | @local_type_access | @local_var_type_access | @local_namespace_access;
+@lexical_ref = @lexical_decl | @lexical_access;
+
+@e4x_xml_attribute_selector = @e4x_xml_static_attribute_selector | @e4x_xml_dynamic_attribute_selector;
+@e4x_xml_qualident = @e4x_xml_static_qualident | @e4x_xml_dynamic_qualident;
+
+expr_contains_template_tag_location(
+  int expr: @expr ref,
+  int location: @location ref
+);
+
+@template_placeholder_tag_parent = @xmlelement | @xmlattribute | @file;
+
+template_placeholder_tag_info(
+  unique int node: @template_placeholder_tag,
+  int parentNode: @template_placeholder_tag_parent ref,
+  varchar(900) raw: string ref
+);
+
+// scopes
+scopes (unique int id: @scope,
+        int kind: int ref);
+
+case @scope.kind of
+   0 = @global_scope
+|  1 = @function_scope
+|  2 = @catch_scope
+|  3 = @module_scope
+|  4 = @block_scope
+|  5 = @for_scope
+|  6 = @for_in_scope // for-of scopes work the same as for-in scopes
+|  7 = @comprehension_block_scope
+|  8 = @class_expr_scope
+|  9 = @namespace_scope
+| 10 = @class_decl_scope
+| 11 = @interface_scope
+| 12 = @type_alias_scope
+| 13 = @mapped_type_scope
+| 14 = @enum_scope
+| 15 = @external_module_scope
+| 16 = @conditional_type_scope;
+
+scopenodes (unique int node: @ast_node ref,
+            int scope: @scope ref);
+
+scopenesting (unique int inner: @scope ref,
+              int outer: @scope ref);
+
+// functions
+@function = @function_decl_stmt | @function_expr | @arrow_function_expr;
+
+@parameterized = @function | @catch_clause;
+@type_parameterized = @function | @class_or_interface | @type_alias_declaration | @mapped_typeexpr | @infer_typeexpr;
+
+is_generator (int fun: @function ref);
+has_rest_parameter (int fun: @function ref);
+is_async (int fun: @function ref);
+
+// variables and lexically scoped type names
+#keyset[scope, name]
+variables (unique int id: @variable,
+           varchar(900) name: string ref,
+           int scope: @scope ref);
+
+#keyset[scope, name]
+local_type_names (unique int id: @local_type_name,
+                  varchar(900) name: string ref,
+                  int scope: @scope ref);
+
+#keyset[scope, name]
+local_namespace_names (unique int id: @local_namespace_name,
+                       varchar(900) name: string ref,
+                       int scope: @scope ref);
+
+is_arguments_object (int id: @variable ref);
+
+@lexical_name = @variable | @local_type_name | @local_namespace_name;
+
+@bind_id = @varaccess | @local_var_type_access;
+bind (unique int id: @bind_id ref,
+      int decl: @variable ref);
+
+decl (unique int id: @var_decl ref,
+      int decl: @variable ref);
+
+@typebind_id = @local_type_access | @export_varaccess;
+typebind (unique int id: @typebind_id ref,
+          int decl: @local_type_name ref);
+
+@typedecl_id = @type_decl | @var_decl;
+typedecl (unique int id: @typedecl_id ref,
+          int decl: @local_type_name ref);
+
+namespacedecl (unique int id: @var_decl ref,
+               int decl: @local_namespace_name ref);
+
+@namespacebind_id = @local_namespace_access | @export_varaccess;
+namespacebind (unique int id: @namespacebind_id ref,
+               int decl: @local_namespace_name ref);
+
+
+// properties in object literals, property patterns in object patterns, and method declarations in classes
+#keyset[parent, index]
+properties (unique int id: @property,
+            int parent: @property_parent ref,
+            int index: int ref,
+            int kind: int ref,
+            varchar(900) tostring: string ref);
+
+case @property.kind of
+  0 = @value_property
+| 1 = @property_getter
+| 2 = @property_setter
+| 3 = @jsx_attribute
+| 4 = @function_call_signature
+| 5 = @constructor_call_signature
+| 6 = @index_signature
+| 7 = @enum_member
+| 8 = @proper_field
+| 9 = @parameter_field
+| 10 = @static_initializer
+;
+
+@property_parent = @obj_expr | @object_pattern | @class_definition | @jsx_element | @interface_definition | @enum_declaration;
+@property_accessor = @property_getter | @property_setter;
+@call_signature = @function_call_signature | @constructor_call_signature;
+@field = @proper_field | @parameter_field;
+@field_or_vardeclarator = @field | @var_declarator;
+
+is_computed (int id: @property ref);
+is_method   (int id: @property ref);
+is_static   (int id: @property ref);
+is_abstract_member (int id: @property ref);
+is_const_enum (int id: @enum_declaration ref);
+is_abstract_class (int id: @class_decl_stmt ref);
+
+has_public_keyword (int id: @property ref);
+has_private_keyword (int id: @property ref);
+has_protected_keyword (int id: @property ref);
+has_readonly_keyword (int id: @property ref);
+has_type_keyword (int id: @type_keyword_operand ref);
+is_optional_member (int id: @property ref);
+has_definite_assignment_assertion (int id: @field_or_vardeclarator ref);
+is_optional_parameter_declaration (unique int parameter: @pattern ref);
+
+#keyset[constructor, param_index]
+parameter_fields(
+  unique int field: @parameter_field ref,
+  int constructor: @function_expr ref,
+  int param_index: int ref
+);
+
+// types
+#keyset[parent, idx]
+typeexprs (
+  unique int id: @typeexpr,
+  int kind: int ref,
+  int parent: @typeexpr_parent ref,
+  int idx: int ref,
+  varchar(900) tostring: string ref
+);
+
+case @typeexpr.kind of
+  0 = @local_type_access
+| 1 = @type_decl
+| 2 = @keyword_typeexpr
+| 3 = @string_literal_typeexpr
+| 4 = @number_literal_typeexpr
+| 5 = @boolean_literal_typeexpr
+| 6 = @array_typeexpr
+| 7 = @union_typeexpr
+| 8 = @indexed_access_typeexpr
+| 9 = @intersection_typeexpr
+| 10 = @parenthesized_typeexpr
+| 11 = @tuple_typeexpr
+| 12 = @keyof_typeexpr
+| 13 = @qualified_type_access
+| 14 = @generic_typeexpr
+| 15 = @type_label
+| 16 = @typeof_typeexpr
+| 17 = @local_var_type_access
+| 18 = @qualified_var_type_access
+| 19 = @this_var_type_access
+| 20 = @predicate_typeexpr
+| 21 = @interface_typeexpr
+| 22 = @type_parameter
+| 23 = @plain_function_typeexpr
+| 24 = @constructor_typeexpr
+| 25 = @local_namespace_access
+| 26 = @qualified_namespace_access
+| 27 = @mapped_typeexpr
+| 28 = @conditional_typeexpr
+| 29 = @infer_typeexpr
+| 30 = @import_type_access
+| 31 = @import_namespace_access
+| 32 = @import_var_type_access
+| 33 = @optional_typeexpr
+| 34 = @rest_typeexpr
+| 35 = @bigint_literal_typeexpr
+| 36 = @readonly_typeexpr
+| 37 = @template_literal_typeexpr
+;
+
+@typeref = @typeaccess | @type_decl;
+@type_identifier = @type_decl | @local_type_access | @type_label | @local_var_type_access | @local_namespace_access;
+@typeexpr_parent = @expr | @stmt | @property | @typeexpr;
+@literal_typeexpr = @string_literal_typeexpr | @number_literal_typeexpr | @boolean_literal_typeexpr | @bigint_literal_typeexpr;
+@typeaccess = @local_type_access | @qualified_type_access | @import_type_access;
+@vartypeaccess = @local_var_type_access | @qualified_var_type_access | @this_var_type_access | @import_var_type_access;
+@namespace_access = @local_namespace_access | @qualified_namespace_access | @import_namespace_access;
+@import_typeexpr = @import_type_access | @import_namespace_access | @import_var_type_access;
+
+@function_typeexpr = @plain_function_typeexpr | @constructor_typeexpr;
+
+// types
+types (
+  unique int id: @type,
+  int kind: int ref,
+  varchar(900) tostring: string ref
+);
+
+#keyset[parent, idx]
+type_child (
+  int child: @type ref,
+  int parent: @type ref,
+  int idx: int ref
+);
+
+case @type.kind of
+  0 = @any_type
+| 1 = @string_type
+| 2 = @number_type
+| 3 = @union_type
+| 4 = @true_type
+| 5 = @false_type
+| 6 = @type_reference
+| 7 = @object_type
+| 8 = @canonical_type_variable_type
+| 9 = @typeof_type
+| 10 = @void_type
+| 11 = @undefined_type
+| 12 = @null_type
+| 13 = @never_type
+| 14 = @plain_symbol_type
+| 15 = @unique_symbol_type
+| 16 = @objectkeyword_type
+| 17 = @intersection_type
+| 18 = @tuple_type
+| 19 = @lexical_type_variable_type
+| 20 = @this_type
+| 21 = @number_literal_type
+| 22 = @string_literal_type
+| 23 = @unknown_type
+| 24 = @bigint_type
+| 25 = @bigint_literal_type
+;
+
+@boolean_literal_type = @true_type | @false_type;
+@symbol_type = @plain_symbol_type | @unique_symbol_type;
+@union_or_intersection_type = @union_type | @intersection_type;
+@typevariable_type = @canonical_type_variable_type | @lexical_type_variable_type;
+
+has_asserts_keyword(int node: @predicate_typeexpr ref);
+
+@typed_ast_node = @expr | @typeexpr | @function;
+ast_node_type(
+  unique int node: @typed_ast_node ref,
+  int typ: @type ref);
+
+declared_function_signature(
+  unique int node: @function ref,
+  int sig: @signature_type ref
+);
+
+invoke_expr_signature(
+  unique int node: @invokeexpr ref,
+  int sig: @signature_type ref
+);
+
+invoke_expr_overload_index(
+  unique int node: @invokeexpr ref,
+  int index: int ref
+);
+
+symbols (
+  unique int id: @symbol,
+  int kind: int ref,
+  varchar(900) name: string ref
+);
+
+symbol_parent (
+  unique int symbol: @symbol ref,
+  int parent: @symbol ref
+);
+
+symbol_module (
+  int symbol: @symbol ref,
+  varchar(900) moduleName: string ref
+);
+
+symbol_global (
+  int symbol: @symbol ref,
+  varchar(900) globalName: string ref
+);
+
+case @symbol.kind of
+  0 = @root_symbol
+| 1 = @member_symbol
+| 2 = @other_symbol
+;
+
+@type_with_symbol = @type_reference | @typevariable_type | @typeof_type | @unique_symbol_type;
+@ast_node_with_symbol = @type_definition | @namespace_definition | @toplevel | @typeaccess | @namespace_access | @var_decl | @function | @invokeexpr | @import_declaration | @external_module_reference | @external_module_declaration;
+
+ast_node_symbol(
+  unique int node: @ast_node_with_symbol ref,
+  int symbol: @symbol ref);
+
+type_symbol(
+  unique int typ: @type_with_symbol ref,
+  int symbol: @symbol ref);
+
+#keyset[typ, name]
+type_property(
+  int typ: @type ref,
+  varchar(900) name: string ref,
+  int propertyType: @type ref);
+
+type_alias(
+  unique int aliasType: @type ref,
+  int underlyingType: @type ref);
+
+@literal_type = @string_literal_type | @number_literal_type | @boolean_literal_type | @bigint_literal_type;
+@type_with_literal_value = @string_literal_type | @number_literal_type | @bigint_literal_type;
+type_literal_value(
+  unique int typ: @type_with_literal_value ref,
+  varchar(900) value: string ref);
+
+signature_types (
+  unique int id: @signature_type,
+  int kind: int ref,
+  varchar(900) tostring: string ref,
+  int type_parameters: int ref,
+  int required_params: int ref
+);
+
+is_abstract_signature(
+  unique int sig: @signature_type ref
+);
+
+signature_rest_parameter(
+  unique int sig: @signature_type ref,
+  int rest_param_arra_type: @type ref
+);
+
+case @signature_type.kind of
+  0 = @function_signature_type
+| 1 = @constructor_signature_type
+;
+
+#keyset[typ, kind, index]
+type_contains_signature (
+  int typ: @type ref,
+  int kind: int ref,  // constructor/call/index
+  int index: int ref, // ordering of overloaded signatures
+  int sig: @signature_type ref
+);
+
+#keyset[parent, index]
+signature_contains_type (
+  int child: @type ref,
+  int parent: @signature_type ref,
+  int index: int ref
+);
+
+#keyset[sig, index]
+signature_parameter_name (
+  int sig: @signature_type ref,
+  int index: int ref,
+  varchar(900) name: string ref
+);
+
+number_index_type (
+  unique int baseType: @type ref,
+  int propertyType: @type ref
+);
+
+string_index_type (
+  unique int baseType: @type ref,
+  int propertyType: @type ref
+);
+
+base_type_names(
+  int typeName: @symbol ref,
+  int baseTypeName: @symbol ref
+);
+
+self_types(
+  int typeName: @symbol ref,
+  int selfType: @type_reference ref
+);
+
+tuple_type_min_length(
+  unique int typ: @type ref,
+  int minLength: int ref
+);
+
+tuple_type_rest_index(
+  unique int typ: @type ref,
+  int index: int ref
+);
+
+// comments
+comments (unique int id: @comment,
+          int kind: int ref,
+          int toplevel: @toplevel ref,
+          varchar(900) text: string ref,
+          varchar(900) tostring: string ref);
+
+case @comment.kind of
+  0 = @slashslash_comment
+| 1 = @slashstar_comment
+| 2 = @doc_comment
+| 3 = @html_comment_start
+| 4 = @htmlcommentend;
+
+@html_comment = @html_comment_start | @htmlcommentend;
+@line_comment = @slashslash_comment | @html_comment;
+@block_comment = @slashstar_comment | @doc_comment;
+
+// source lines
+lines (unique int id: @line,
+       int toplevel: @toplevel ref,
+       varchar(900) text: string ref,
+       varchar(2) terminator: string ref);
+indentation (int file: @file ref,
+            int lineno: int ref,
+            varchar(1) indentChar: string ref,
+            int indentDepth: int ref);
+
+// JavaScript parse errors
+js_parse_errors (unique int id: @js_parse_error,
+        int toplevel: @toplevel ref,
+        varchar(900) message: string ref,
+        varchar(900) line: string ref);
+
+// regular expressions
+#keyset[parent, idx]
+regexpterm (unique int id: @regexpterm,
+        int kind: int ref,
+        int parent: @regexpparent ref,
+        int idx: int ref,
+        varchar(900) tostring: string ref);
+
+@regexpparent = @regexpterm | @regexp_literal | @string_literal | @add_expr;
+
+case @regexpterm.kind of
+   0 = @regexp_alt
+|  1 = @regexp_seq
+|  2 = @regexp_caret
+|  3 = @regexp_dollar
+|  4 = @regexp_wordboundary
+|  5 = @regexp_nonwordboundary
+|  6 = @regexp_positive_lookahead
+|  7 = @regexp_negative_lookahead
+|  8 = @regexp_star
+|  9 = @regexp_plus
+| 10 = @regexp_opt
+| 11 = @regexp_range
+| 12 = @regexp_dot
+| 13 = @regexp_group
+| 14 = @regexp_normal_constant
+| 15 = @regexp_hex_escape
+| 16 = @regexp_unicode_escape
+| 17 = @regexp_dec_escape
+| 18 = @regexp_oct_escape
+| 19 = @regexp_ctrl_escape
+| 20 = @regexp_char_class_escape
+| 21 = @regexp_id_escape
+| 22 = @regexp_backref
+| 23 = @regexp_char_class
+| 24 = @regexp_char_range
+| 25 = @regexp_positive_lookbehind
+| 26 = @regexp_negative_lookbehind
+| 27 = @regexp_unicode_property_escape
+| 28 = @regexp_quoted_string
+| 29 = @regexp_intersection
+| 30 = @regexp_subtraction;
+
+regexp_parse_errors (unique int id: @regexp_parse_error,
+    int regexp: @regexpterm ref,
+    varchar(900) message: string ref);
+
+@regexp_quantifier = @regexp_star | @regexp_plus | @regexp_opt | @regexp_range;
+@regexp_escape = @regexp_char_escape | @regexp_char_class_escape | @regexp_unicode_property_escape;
+@regexp_char_escape = @regexp_hex_escape | @regexp_unicode_escape | @regexp_dec_escape | @regexp_oct_escape | @regexp_ctrl_escape | @regexp_id_escape;
+@regexp_constant = @regexp_normal_constant | @regexp_char_escape;
+@regexp_lookahead = @regexp_positive_lookahead | @regexp_negative_lookahead;
+@regexp_lookbehind = @regexp_positive_lookbehind | @regexp_negative_lookbehind;
+@regexp_subpattern = @regexp_lookahead | @regexp_lookbehind;
+@regexp_anchor = @regexp_dollar | @regexp_caret;
+
+is_greedy (int id: @regexp_quantifier ref);
+range_quantifier_lower_bound (unique int id: @regexp_range ref, int lo: int ref);
+range_quantifier_upper_bound (unique int id: @regexp_range ref, int hi: int ref);
+is_capture (unique int id: @regexp_group ref, int number: int ref);
+is_named_capture (unique int id: @regexp_group ref, string name: string ref);
+is_inverted (int id: @regexp_char_class ref);
+regexp_const_value (unique int id: @regexp_constant ref, varchar(1) value: string ref);
+char_class_escape (unique int id: @regexp_char_class_escape ref, varchar(1) value: string ref);
+backref (unique int id: @regexp_backref ref, int value: int ref);
+named_backref (unique int id: @regexp_backref ref, string name: string ref);
+unicode_property_escapename (unique int id: @regexp_unicode_property_escape ref, string name: string ref);
+unicode_property_escapevalue (unique int id: @regexp_unicode_property_escape ref, string value: string ref);
+
+// tokens
+#keyset[toplevel, idx]
+tokeninfo (unique int id: @token,
+    int kind: int ref,
+    int toplevel: @toplevel ref,
+    int idx: int ref,
+    varchar(900) value: string ref);
+
+case @token.kind of
+  0 = @token_eof
+| 1 = @token_null_literal
+| 2 = @token_boolean_literal
+| 3 = @token_numeric_literal
+| 4 = @token_string_literal
+| 5 = @token_regular_expression
+| 6 = @token_identifier
+| 7 = @token_keyword
+| 8 = @token_punctuator;
+
+// associate comments with the token immediately following them (which may be EOF)
+next_token (int comment: @comment ref, int token: @token ref);
+
+// JSON
+#keyset[parent, idx]
+json (unique int id: @json_value,
+      int kind: int ref,
+      int parent: @json_parent ref,
+      int idx: int ref,
+      varchar(900) tostring: string ref);
+
+json_literals (varchar(900) value: string ref,
+      varchar(900) raw: string ref,
+      unique int expr: @json_value ref);
+
+json_properties (int obj: @json_object ref,
+      varchar(900) property: string ref,
+      int value: @json_value ref);
+
+json_errors (unique int id: @json_parse_error,
+      varchar(900) message: string ref);
+
+json_locations(unique int locatable: @json_locatable ref,
+      int location: @location_default ref);
+
+case @json_value.kind of
+  0 = @json_null
+| 1 = @json_boolean
+| 2 = @json_number
+| 3 = @json_string
+| 4 = @json_array
+| 5 = @json_object;
+
+@json_parent = @json_object | @json_array | @file;
+
+@json_locatable = @json_value | @json_parse_error;
+
+// locations
+@ast_node = @toplevel | @stmt | @expr | @property | @typeexpr;
+
+@locatable = @file
+    | @ast_node
+    | @comment
+    | @line
+    | @js_parse_error | @regexp_parse_error
+    | @regexpterm
+    | @json_locatable
+    | @token
+    | @cfg_node
+    | @jsdoc | @jsdoc_type_expr | @jsdoc_tag
+    | @yaml_locatable
+    | @xmllocatable
+    | @configLocatable
+    | @template_placeholder_tag;
+
+hasLocation (unique int locatable: @locatable ref,
+    int location: @location ref);
+
+// CFG
+entry_cfg_node (unique int id: @entry_node, int container: @stmt_container ref);
+exit_cfg_node (unique int id: @exit_node, int container: @stmt_container ref);
+guard_node (unique int id: @guard_node, int kind: int ref, int test: @expr ref);
+case @guard_node.kind of
+  0 = @falsy_guard
+| 1 = @truthy_guard;
+@condition_guard = @falsy_guard | @truthy_guard;
+
+@synthetic_cfg_node = @entry_node | @exit_node | @guard_node;
+@cfg_node = @synthetic_cfg_node | @expr_parent;
+
+successor (int pred: @cfg_node ref, int succ: @cfg_node ref);
+
+// JSDoc comments
+jsdoc (unique int id: @jsdoc, varchar(900) description: string ref, int comment: @comment ref);
+#keyset[parent, idx]
+jsdoc_tags (unique int id: @jsdoc_tag, varchar(900) title: string ref,
+            int parent: @jsdoc ref, int idx: int ref, varchar(900) tostring: string ref);
+jsdoc_tag_descriptions (unique int tag: @jsdoc_tag ref, varchar(900) text: string ref);
+jsdoc_tag_names (unique int tag: @jsdoc_tag ref, varchar(900) text: string ref);
+
+#keyset[parent, idx]
+jsdoc_type_exprs (unique int id: @jsdoc_type_expr,
+                  int kind: int ref,
+                  int parent: @jsdoc_type_expr_parent ref,
+                  int idx: int ref,
+                  varchar(900) tostring: string ref);
+case @jsdoc_type_expr.kind of
+    0 = @jsdoc_any_type_expr
+|   1 = @jsdoc_null_type_expr
+|   2 = @jsdoc_undefined_type_expr
+|   3 = @jsdoc_unknown_type_expr
+|   4 = @jsdoc_void_type_expr
+|   5 = @jsdoc_identifier_type_expr
+|   6 = @jsdoc_applied_type_expr
+|   7 = @jsdoc_nullable_type_expr
+|   8 = @jsdoc_non_nullable_type_expr
+|   9 = @jsdoc_record_type_expr
+|  10 = @jsdoc_array_type_expr
+|  11 = @jsdoc_union_type_expr
+|  12 = @jsdoc_function_type_expr
+|  13 = @jsdoc_optional_type_expr
+|  14 = @jsdoc_rest_type_expr
+|  15 = @jsdoc_qualified_type_expr
+;
+
+#keyset[id, idx]
+jsdoc_record_field_name (int id: @jsdoc_record_type_expr ref, int idx: int ref, varchar(900) name: string ref);
+jsdoc_prefix_qualifier (int id: @jsdoc_type_expr ref);
+jsdoc_has_new_parameter (int fn: @jsdoc_function_type_expr ref);
+
+@jsdoc_type_expr_parent = @jsdoc_type_expr | @jsdoc_tag;
+
+jsdoc_errors (unique int id: @jsdoc_error, int tag: @jsdoc_tag ref, varchar(900) message: string ref, varchar(900) tostring: string ref);
+
+@dataflownode = @expr | @function_decl_stmt | @class_decl_stmt | @namespace_declaration | @enum_declaration | @property;
+
+@optionalchainable = @call_expr | @propaccess;
+
+isOptionalChaining(int id: @optionalchainable ref);
+
+/**
+ * The time taken for the extraction of a file.
+ * This table contains non-deterministic content.
+ *
+ * The sum of the `time` column for each (`file`, `timerKind`) pair
+ * is the total time taken for extraction of `file`.  The `extractionPhase`
+ * column provides a granular view of the extraction time of the file.
+ */
+extraction_time(
+  int file : @file ref,
+  // see `com.semmle.js.extractor.ExtractionMetrics.ExtractionPhase`.
+  int extractionPhase: int ref,
+  // 0 for the elapsed CPU time in nanoseconds, 1 for the elapsed wallclock time in nanoseconds
+  int timerKind: int ref,
+  float time: float ref
+)
+
+/**
+* Non-timing related data for the extraction of a single file.
+* This table contains non-deterministic content.
+*/
+extraction_data(
+  int file : @file ref,
+  // the absolute path to the cache file
+  varchar(900) cacheFile: string ref,
+  boolean fromCache: boolean ref,
+  int length: int ref
+)
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error;
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+/*- Configuration files with key value pairs -*/
+
+configs(
+  unique int id: @config
+);
+
+configNames(
+  unique int id: @configName,
+  int config: @config ref,
+  string name: string ref
+);
+
+configValues(
+  unique int id: @configValue,
+  int config: @config ref,
+  string value: string ref
+);
+
+configLocations(
+  int locatable: @configLocatable ref,
+  int location: @location_default ref
+);
+
+@configLocatable = @config | @configName | @configValue;
diff --git a/javascript/downgrades/76a926a00d5f3bc199c203a1437796fd7b2835ba/upgrade.properties b/javascript/downgrades/76a926a00d5f3bc199c203a1437796fd7b2835ba/upgrade.properties
new file mode 100644
index 00000000000..bae98029d4b
--- /dev/null
+++ b/javascript/downgrades/76a926a00d5f3bc199c203a1437796fd7b2835ba/upgrade.properties
@@ -0,0 +1,5 @@
+description: downgrade overlay relations
+compatibility: full
+
+databaseMetadata.rel: delete
+overlayChangedFiles.rel: delete
diff --git a/javascript/downgrades/80b2bc24189307c5fd178dc2da95b45bcdb117f7/old.dbscheme b/javascript/downgrades/80b2bc24189307c5fd178dc2da95b45bcdb117f7/old.dbscheme
new file mode 100644
index 00000000000..80b2bc24189
--- /dev/null
+++ b/javascript/downgrades/80b2bc24189307c5fd178dc2da95b45bcdb117f7/old.dbscheme
@@ -0,0 +1,1205 @@
+/*** Standard fragments ***/
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- JavaScript-specific part -*/
+
+@location = @location_default
+
+@sourceline = @locatable;
+
+filetype(
+  int file: @file ref,
+  string filetype: string ref
+)
+
+// top-level code fragments
+toplevels (unique int id: @toplevel,
+           int kind: int ref);
+
+is_externs (int toplevel: @toplevel ref);
+
+case @toplevel.kind of
+   0 = @script
+|  1 = @inline_script
+|  2 = @event_handler
+|  3 = @javascript_url
+|  4 = @template_toplevel;
+
+is_module (int tl: @toplevel ref);
+is_nodejs (int tl: @toplevel ref);
+is_es2015_module (int tl: @toplevel ref);
+is_closure_module (int tl: @toplevel ref);
+
+@xml_node_with_code = @xmlelement | @xmlattribute | @template_placeholder_tag;
+toplevel_parent_xml_node(
+  unique int toplevel: @toplevel ref,
+  int xmlnode: @xml_node_with_code ref);
+
+xml_element_parent_expression(
+  unique int xmlnode: @xmlelement ref,
+  int expression: @expr ref,
+  int index: int ref);
+
+// statements
+#keyset[parent, idx]
+stmts (unique int id: @stmt,
+       int kind: int ref,
+       int parent: @stmt_parent ref,
+       int idx: int ref,
+       varchar(900) tostring: string ref);
+
+stmt_containers (unique int stmt: @stmt ref,
+       int container: @stmt_container ref);
+
+jump_targets (unique int jump: @stmt ref,
+       int target: @stmt ref);
+
+@stmt_parent = @stmt | @toplevel | @function_expr | @arrow_function_expr | @static_initializer;
+@stmt_container = @toplevel | @function | @namespace_declaration | @external_module_declaration | @global_augmentation_declaration;
+
+case @stmt.kind of
+   0 = @empty_stmt
+|  1 = @block_stmt
+|  2 = @expr_stmt
+|  3 = @if_stmt
+|  4 = @labeled_stmt
+|  5 = @break_stmt
+|  6 = @continue_stmt
+|  7 = @with_stmt
+|  8 = @switch_stmt
+|  9 = @return_stmt
+| 10 = @throw_stmt
+| 11 = @try_stmt
+| 12 = @while_stmt
+| 13 = @do_while_stmt
+| 14 = @for_stmt
+| 15 = @for_in_stmt
+| 16 = @debugger_stmt
+| 17 = @function_decl_stmt
+| 18 = @var_decl_stmt
+| 19 = @case
+| 20 = @catch_clause
+| 21 = @for_of_stmt
+| 22 = @const_decl_stmt
+| 23 = @let_stmt
+| 24 = @legacy_let_stmt
+| 25 = @for_each_stmt
+| 26 = @class_decl_stmt
+| 27 = @import_declaration
+| 28 = @export_all_declaration
+| 29 = @export_default_declaration
+| 30 = @export_named_declaration
+| 31 = @namespace_declaration
+| 32 = @import_equals_declaration
+| 33 = @export_assign_declaration
+| 34 = @interface_declaration
+| 35 = @type_alias_declaration
+| 36 = @enum_declaration
+| 37 = @external_module_declaration
+| 38 = @export_as_namespace_declaration
+| 39 = @global_augmentation_declaration
+| 40 = @using_decl_stmt
+;
+
+@decl_stmt = @var_decl_stmt | @const_decl_stmt | @let_stmt | @legacy_let_stmt | @using_decl_stmt;
+
+@export_declaration = @export_all_declaration | @export_default_declaration | @export_named_declaration;
+
+@namespace_definition = @namespace_declaration | @enum_declaration;
+@type_definition = @class_definition | @interface_declaration | @enum_declaration | @type_alias_declaration | @enum_member;
+
+is_instantiated(unique int decl: @namespace_declaration ref);
+
+@declarable_node = @decl_stmt | @namespace_declaration | @class_decl_stmt | @function_decl_stmt | @enum_declaration | @external_module_declaration | @global_augmentation_declaration | @field;
+has_declare_keyword(unique int stmt: @declarable_node ref);
+
+is_for_await_of(unique int forof: @for_of_stmt ref);
+
+// expressions
+#keyset[parent, idx]
+exprs (unique int id: @expr,
+       int kind: int ref,
+       int parent: @expr_parent ref,
+       int idx: int ref,
+       varchar(900) tostring: string ref);
+
+literals (varchar(900) value: string ref,
+       varchar(900) raw: string ref,
+       unique int expr: @expr_or_type ref);
+
+enclosing_stmt (unique int expr: @expr_or_type ref,
+       int stmt: @stmt ref);
+
+expr_containers (unique int expr: @expr_or_type ref,
+       int container: @stmt_container ref);
+
+array_size (unique int ae: @arraylike ref,
+       int sz: int ref);
+
+is_delegating (int yield: @yield_expr ref);
+
+@expr_or_stmt = @expr | @stmt;
+@expr_or_type = @expr | @typeexpr;
+@expr_parent = @expr_or_stmt | @property | @function_typeexpr;
+@arraylike = @array_expr | @array_pattern;
+@type_annotation = @typeexpr | @jsdoc_type_expr;
+@node_in_stmt_container = @cfg_node | @type_annotation | @toplevel;
+
+case @expr.kind of
+   0 = @label
+|  1 = @null_literal
+|  2 = @boolean_literal
+|  3 = @number_literal
+|  4 = @string_literal
+|  5 = @regexp_literal
+|  6 = @this_expr
+|  7 = @array_expr
+|  8 = @obj_expr
+|  9 = @function_expr
+| 10 = @seq_expr
+| 11 = @conditional_expr
+| 12 = @new_expr
+| 13 = @call_expr
+| 14 = @dot_expr
+| 15 = @index_expr
+| 16 = @neg_expr
+| 17 = @plus_expr
+| 18 = @log_not_expr
+| 19 = @bit_not_expr
+| 20 = @typeof_expr
+| 21 = @void_expr
+| 22 = @delete_expr
+| 23 = @eq_expr
+| 24 = @neq_expr
+| 25 = @eqq_expr
+| 26 = @neqq_expr
+| 27 = @lt_expr
+| 28 = @le_expr
+| 29 = @gt_expr
+| 30 = @ge_expr
+| 31 = @lshift_expr
+| 32 = @rshift_expr
+| 33 = @urshift_expr
+| 34 = @add_expr
+| 35 = @sub_expr
+| 36 = @mul_expr
+| 37 = @div_expr
+| 38 = @mod_expr
+| 39 = @bitor_expr
+| 40 = @xor_expr
+| 41 = @bitand_expr
+| 42 = @in_expr
+| 43 = @instanceof_expr
+| 44 = @logand_expr
+| 45 = @logor_expr
+| 47 = @assign_expr
+| 48 = @assign_add_expr
+| 49 = @assign_sub_expr
+| 50 = @assign_mul_expr
+| 51 = @assign_div_expr
+| 52 = @assign_mod_expr
+| 53 = @assign_lshift_expr
+| 54 = @assign_rshift_expr
+| 55 = @assign_urshift_expr
+| 56 = @assign_or_expr
+| 57 = @assign_xor_expr
+| 58 = @assign_and_expr
+| 59 = @preinc_expr
+| 60 = @postinc_expr
+| 61 = @predec_expr
+| 62 = @postdec_expr
+| 63 = @par_expr
+| 64 = @var_declarator
+| 65 = @arrow_function_expr
+| 66 = @spread_element
+| 67 = @array_pattern
+| 68 = @object_pattern
+| 69 = @yield_expr
+| 70 = @tagged_template_expr
+| 71 = @template_literal
+| 72 = @template_element
+| 73 = @array_comprehension_expr
+| 74 = @generator_expr
+| 75 = @for_in_comprehension_block
+| 76 = @for_of_comprehension_block
+| 77 = @legacy_letexpr
+| 78 = @var_decl
+| 79 = @proper_varaccess
+| 80 = @class_expr
+| 81 = @super_expr
+| 82 = @newtarget_expr
+| 83 = @named_import_specifier
+| 84 = @import_default_specifier
+| 85 = @import_namespace_specifier
+| 86 = @named_export_specifier
+| 87 = @exp_expr
+| 88 = @assign_exp_expr
+| 89 = @jsx_element
+| 90 = @jsx_qualified_name
+| 91 = @jsx_empty_expr
+| 92 = @await_expr
+| 93 = @function_sent_expr
+| 94 = @decorator
+| 95 = @export_default_specifier
+| 96 = @export_namespace_specifier
+| 97 = @bind_expr
+| 98 = @external_module_reference
+| 99 = @dynamic_import
+| 100 = @expression_with_type_arguments
+| 101 = @prefix_type_assertion
+| 102 = @as_type_assertion
+| 103 = @export_varaccess
+| 104 = @decorator_list
+| 105 = @non_null_assertion
+| 106 = @bigint_literal
+| 107 = @nullishcoalescing_expr
+| 108 = @e4x_xml_anyname
+| 109 = @e4x_xml_static_attribute_selector
+| 110 = @e4x_xml_dynamic_attribute_selector
+| 111 = @e4x_xml_filter_expression
+| 112 = @e4x_xml_static_qualident
+| 113 = @e4x_xml_dynamic_qualident
+| 114 = @e4x_xml_dotdotexpr
+| 115 = @import_meta_expr
+| 116 = @assignlogandexpr
+| 117 = @assignlogorexpr
+| 118 = @assignnullishcoalescingexpr
+| 119 = @template_pipe_ref
+| 120 = @generated_code_expr
+| 121 = @satisfies_expr
+;
+
+@varaccess = @proper_varaccess | @export_varaccess;
+@varref = @var_decl | @varaccess;
+
+@identifier = @label | @varref | @type_identifier;
+
+@literal = @null_literal | @boolean_literal | @number_literal | @string_literal | @regexp_literal | @bigint_literal;
+
+@propaccess = @dot_expr | @index_expr;
+
+@invokeexpr = @new_expr | @call_expr;
+
+@unaryexpr = @neg_expr | @plus_expr | @log_not_expr | @bit_not_expr | @typeof_expr | @void_expr | @delete_expr | @spread_element;
+
+@equality_test = @eq_expr | @neq_expr | @eqq_expr | @neqq_expr;
+
+@comparison = @equality_test | @lt_expr | @le_expr | @gt_expr | @ge_expr;
+
+@binaryexpr = @comparison | @lshift_expr | @rshift_expr | @urshift_expr | @add_expr | @sub_expr | @mul_expr | @div_expr | @mod_expr | @exp_expr | @bitor_expr | @xor_expr | @bitand_expr | @in_expr | @instanceof_expr | @logand_expr | @logor_expr | @nullishcoalescing_expr;
+
+@assignment = @assign_expr | @assign_add_expr | @assign_sub_expr | @assign_mul_expr | @assign_div_expr | @assign_mod_expr | @assign_exp_expr | @assign_lshift_expr | @assign_rshift_expr | @assign_urshift_expr | @assign_or_expr | @assign_xor_expr | @assign_and_expr | @assignlogandexpr | @assignlogorexpr | @assignnullishcoalescingexpr;
+
+@updateexpr = @preinc_expr | @postinc_expr | @predec_expr | @postdec_expr;
+
+@pattern = @varref | @array_pattern | @object_pattern;
+
+@comprehension_expr = @array_comprehension_expr | @generator_expr;
+
+@comprehension_block = @for_in_comprehension_block | @for_of_comprehension_block;
+
+@import_specifier = @named_import_specifier | @import_default_specifier | @import_namespace_specifier;
+
+@exportspecifier = @named_export_specifier | @export_default_specifier | @export_namespace_specifier;
+
+@type_keyword_operand = @import_declaration | @export_declaration | @import_specifier;
+
+@type_assertion = @as_type_assertion | @prefix_type_assertion;
+
+@class_definition = @class_decl_stmt | @class_expr;
+@interface_definition = @interface_declaration | @interface_typeexpr;
+@class_or_interface = @class_definition | @interface_definition;
+
+@lexical_decl = @var_decl | @type_decl;
+@lexical_access = @varaccess | @local_type_access | @local_var_type_access | @local_namespace_access;
+@lexical_ref = @lexical_decl | @lexical_access;
+
+@e4x_xml_attribute_selector = @e4x_xml_static_attribute_selector | @e4x_xml_dynamic_attribute_selector;
+@e4x_xml_qualident = @e4x_xml_static_qualident | @e4x_xml_dynamic_qualident;
+
+expr_contains_template_tag_location(
+  int expr: @expr ref,
+  int location: @location ref
+);
+
+@template_placeholder_tag_parent = @xmlelement | @xmlattribute | @file;
+
+template_placeholder_tag_info(
+  unique int node: @template_placeholder_tag,
+  int parentNode: @template_placeholder_tag_parent ref,
+  varchar(900) raw: string ref
+);
+
+// scopes
+scopes (unique int id: @scope,
+        int kind: int ref);
+
+case @scope.kind of
+   0 = @global_scope
+|  1 = @function_scope
+|  2 = @catch_scope
+|  3 = @module_scope
+|  4 = @block_scope
+|  5 = @for_scope
+|  6 = @for_in_scope // for-of scopes work the same as for-in scopes
+|  7 = @comprehension_block_scope
+|  8 = @class_expr_scope
+|  9 = @namespace_scope
+| 10 = @class_decl_scope
+| 11 = @interface_scope
+| 12 = @type_alias_scope
+| 13 = @mapped_type_scope
+| 14 = @enum_scope
+| 15 = @external_module_scope
+| 16 = @conditional_type_scope;
+
+scopenodes (unique int node: @ast_node ref,
+            int scope: @scope ref);
+
+scopenesting (unique int inner: @scope ref,
+              int outer: @scope ref);
+
+// functions
+@function = @function_decl_stmt | @function_expr | @arrow_function_expr;
+
+@parameterized = @function | @catch_clause;
+@type_parameterized = @function | @class_or_interface | @type_alias_declaration | @mapped_typeexpr | @infer_typeexpr;
+
+is_generator (int fun: @function ref);
+has_rest_parameter (int fun: @function ref);
+is_async (int fun: @function ref);
+
+// variables and lexically scoped type names
+#keyset[scope, name]
+variables (unique int id: @variable,
+           varchar(900) name: string ref,
+           int scope: @scope ref);
+
+#keyset[scope, name]
+local_type_names (unique int id: @local_type_name,
+                  varchar(900) name: string ref,
+                  int scope: @scope ref);
+
+#keyset[scope, name]
+local_namespace_names (unique int id: @local_namespace_name,
+                       varchar(900) name: string ref,
+                       int scope: @scope ref);
+
+is_arguments_object (int id: @variable ref);
+
+@lexical_name = @variable | @local_type_name | @local_namespace_name;
+
+@bind_id = @varaccess | @local_var_type_access;
+bind (unique int id: @bind_id ref,
+      int decl: @variable ref);
+
+decl (unique int id: @var_decl ref,
+      int decl: @variable ref);
+
+@typebind_id = @local_type_access | @export_varaccess;
+typebind (unique int id: @typebind_id ref,
+          int decl: @local_type_name ref);
+
+@typedecl_id = @type_decl | @var_decl;
+typedecl (unique int id: @typedecl_id ref,
+          int decl: @local_type_name ref);
+
+namespacedecl (unique int id: @var_decl ref,
+               int decl: @local_namespace_name ref);
+
+@namespacebind_id = @local_namespace_access | @export_varaccess;
+namespacebind (unique int id: @namespacebind_id ref,
+               int decl: @local_namespace_name ref);
+
+
+// properties in object literals, property patterns in object patterns, and method declarations in classes
+#keyset[parent, index]
+properties (unique int id: @property,
+            int parent: @property_parent ref,
+            int index: int ref,
+            int kind: int ref,
+            varchar(900) tostring: string ref);
+
+case @property.kind of
+  0 = @value_property
+| 1 = @property_getter
+| 2 = @property_setter
+| 3 = @jsx_attribute
+| 4 = @function_call_signature
+| 5 = @constructor_call_signature
+| 6 = @index_signature
+| 7 = @enum_member
+| 8 = @proper_field
+| 9 = @parameter_field
+| 10 = @static_initializer
+;
+
+@property_parent = @obj_expr | @object_pattern | @class_definition | @jsx_element | @interface_definition | @enum_declaration;
+@property_accessor = @property_getter | @property_setter;
+@call_signature = @function_call_signature | @constructor_call_signature;
+@field = @proper_field | @parameter_field;
+@field_or_vardeclarator = @field | @var_declarator;
+
+is_computed (int id: @property ref);
+is_method   (int id: @property ref);
+is_static   (int id: @property ref);
+is_abstract_member (int id: @property ref);
+is_const_enum (int id: @enum_declaration ref);
+is_abstract_class (int id: @class_decl_stmt ref);
+
+has_public_keyword (int id: @property ref);
+has_private_keyword (int id: @property ref);
+has_protected_keyword (int id: @property ref);
+has_readonly_keyword (int id: @property ref);
+has_type_keyword (int id: @type_keyword_operand ref);
+has_defer_keyword (int id: @import_declaration ref);
+is_optional_member (int id: @property ref);
+has_definite_assignment_assertion (int id: @field_or_vardeclarator ref);
+is_optional_parameter_declaration (unique int parameter: @pattern ref);
+
+#keyset[constructor, param_index]
+parameter_fields(
+  unique int field: @parameter_field ref,
+  int constructor: @function_expr ref,
+  int param_index: int ref
+);
+
+// types
+#keyset[parent, idx]
+typeexprs (
+  unique int id: @typeexpr,
+  int kind: int ref,
+  int parent: @typeexpr_parent ref,
+  int idx: int ref,
+  varchar(900) tostring: string ref
+);
+
+case @typeexpr.kind of
+  0 = @local_type_access
+| 1 = @type_decl
+| 2 = @keyword_typeexpr
+| 3 = @string_literal_typeexpr
+| 4 = @number_literal_typeexpr
+| 5 = @boolean_literal_typeexpr
+| 6 = @array_typeexpr
+| 7 = @union_typeexpr
+| 8 = @indexed_access_typeexpr
+| 9 = @intersection_typeexpr
+| 10 = @parenthesized_typeexpr
+| 11 = @tuple_typeexpr
+| 12 = @keyof_typeexpr
+| 13 = @qualified_type_access
+| 14 = @generic_typeexpr
+| 15 = @type_label
+| 16 = @typeof_typeexpr
+| 17 = @local_var_type_access
+| 18 = @qualified_var_type_access
+| 19 = @this_var_type_access
+| 20 = @predicate_typeexpr
+| 21 = @interface_typeexpr
+| 22 = @type_parameter
+| 23 = @plain_function_typeexpr
+| 24 = @constructor_typeexpr
+| 25 = @local_namespace_access
+| 26 = @qualified_namespace_access
+| 27 = @mapped_typeexpr
+| 28 = @conditional_typeexpr
+| 29 = @infer_typeexpr
+| 30 = @import_type_access
+| 31 = @import_namespace_access
+| 32 = @import_var_type_access
+| 33 = @optional_typeexpr
+| 34 = @rest_typeexpr
+| 35 = @bigint_literal_typeexpr
+| 36 = @readonly_typeexpr
+| 37 = @template_literal_typeexpr
+;
+
+@typeref = @typeaccess | @type_decl;
+@type_identifier = @type_decl | @local_type_access | @type_label | @local_var_type_access | @local_namespace_access;
+@typeexpr_parent = @expr | @stmt | @property | @typeexpr;
+@literal_typeexpr = @string_literal_typeexpr | @number_literal_typeexpr | @boolean_literal_typeexpr | @bigint_literal_typeexpr;
+@typeaccess = @local_type_access | @qualified_type_access | @import_type_access;
+@vartypeaccess = @local_var_type_access | @qualified_var_type_access | @this_var_type_access | @import_var_type_access;
+@namespace_access = @local_namespace_access | @qualified_namespace_access | @import_namespace_access;
+@import_typeexpr = @import_type_access | @import_namespace_access | @import_var_type_access;
+
+@function_typeexpr = @plain_function_typeexpr | @constructor_typeexpr;
+
+// types
+types (
+  unique int id: @type,
+  int kind: int ref,
+  varchar(900) tostring: string ref
+);
+
+#keyset[parent, idx]
+type_child (
+  int child: @type ref,
+  int parent: @type ref,
+  int idx: int ref
+);
+
+case @type.kind of
+  0 = @any_type
+| 1 = @string_type
+| 2 = @number_type
+| 3 = @union_type
+| 4 = @true_type
+| 5 = @false_type
+| 6 = @type_reference
+| 7 = @object_type
+| 8 = @canonical_type_variable_type
+| 9 = @typeof_type
+| 10 = @void_type
+| 11 = @undefined_type
+| 12 = @null_type
+| 13 = @never_type
+| 14 = @plain_symbol_type
+| 15 = @unique_symbol_type
+| 16 = @objectkeyword_type
+| 17 = @intersection_type
+| 18 = @tuple_type
+| 19 = @lexical_type_variable_type
+| 20 = @this_type
+| 21 = @number_literal_type
+| 22 = @string_literal_type
+| 23 = @unknown_type
+| 24 = @bigint_type
+| 25 = @bigint_literal_type
+;
+
+@boolean_literal_type = @true_type | @false_type;
+@symbol_type = @plain_symbol_type | @unique_symbol_type;
+@union_or_intersection_type = @union_type | @intersection_type;
+@typevariable_type = @canonical_type_variable_type | @lexical_type_variable_type;
+
+has_asserts_keyword(int node: @predicate_typeexpr ref);
+
+@typed_ast_node = @expr | @typeexpr | @function;
+ast_node_type(
+  unique int node: @typed_ast_node ref,
+  int typ: @type ref);
+
+declared_function_signature(
+  unique int node: @function ref,
+  int sig: @signature_type ref
+);
+
+invoke_expr_signature(
+  unique int node: @invokeexpr ref,
+  int sig: @signature_type ref
+);
+
+invoke_expr_overload_index(
+  unique int node: @invokeexpr ref,
+  int index: int ref
+);
+
+symbols (
+  unique int id: @symbol,
+  int kind: int ref,
+  varchar(900) name: string ref
+);
+
+symbol_parent (
+  unique int symbol: @symbol ref,
+  int parent: @symbol ref
+);
+
+symbol_module (
+  int symbol: @symbol ref,
+  varchar(900) moduleName: string ref
+);
+
+symbol_global (
+  int symbol: @symbol ref,
+  varchar(900) globalName: string ref
+);
+
+case @symbol.kind of
+  0 = @root_symbol
+| 1 = @member_symbol
+| 2 = @other_symbol
+;
+
+@type_with_symbol = @type_reference | @typevariable_type | @typeof_type | @unique_symbol_type;
+@ast_node_with_symbol = @type_definition | @namespace_definition | @toplevel | @typeaccess | @namespace_access | @var_decl | @function | @invokeexpr | @import_declaration | @external_module_reference | @external_module_declaration;
+
+ast_node_symbol(
+  unique int node: @ast_node_with_symbol ref,
+  int symbol: @symbol ref);
+
+type_symbol(
+  unique int typ: @type_with_symbol ref,
+  int symbol: @symbol ref);
+
+#keyset[typ, name]
+type_property(
+  int typ: @type ref,
+  varchar(900) name: string ref,
+  int propertyType: @type ref);
+
+type_alias(
+  unique int aliasType: @type ref,
+  int underlyingType: @type ref);
+
+@literal_type = @string_literal_type | @number_literal_type | @boolean_literal_type | @bigint_literal_type;
+@type_with_literal_value = @string_literal_type | @number_literal_type | @bigint_literal_type;
+type_literal_value(
+  unique int typ: @type_with_literal_value ref,
+  varchar(900) value: string ref);
+
+signature_types (
+  unique int id: @signature_type,
+  int kind: int ref,
+  varchar(900) tostring: string ref,
+  int type_parameters: int ref,
+  int required_params: int ref
+);
+
+is_abstract_signature(
+  unique int sig: @signature_type ref
+);
+
+signature_rest_parameter(
+  unique int sig: @signature_type ref,
+  int rest_param_arra_type: @type ref
+);
+
+case @signature_type.kind of
+  0 = @function_signature_type
+| 1 = @constructor_signature_type
+;
+
+#keyset[typ, kind, index]
+type_contains_signature (
+  int typ: @type ref,
+  int kind: int ref,  // constructor/call/index
+  int index: int ref, // ordering of overloaded signatures
+  int sig: @signature_type ref
+);
+
+#keyset[parent, index]
+signature_contains_type (
+  int child: @type ref,
+  int parent: @signature_type ref,
+  int index: int ref
+);
+
+#keyset[sig, index]
+signature_parameter_name (
+  int sig: @signature_type ref,
+  int index: int ref,
+  varchar(900) name: string ref
+);
+
+number_index_type (
+  unique int baseType: @type ref,
+  int propertyType: @type ref
+);
+
+string_index_type (
+  unique int baseType: @type ref,
+  int propertyType: @type ref
+);
+
+base_type_names(
+  int typeName: @symbol ref,
+  int baseTypeName: @symbol ref
+);
+
+self_types(
+  int typeName: @symbol ref,
+  int selfType: @type_reference ref
+);
+
+tuple_type_min_length(
+  unique int typ: @type ref,
+  int minLength: int ref
+);
+
+tuple_type_rest_index(
+  unique int typ: @type ref,
+  int index: int ref
+);
+
+// comments
+comments (unique int id: @comment,
+          int kind: int ref,
+          int toplevel: @toplevel ref,
+          varchar(900) text: string ref,
+          varchar(900) tostring: string ref);
+
+case @comment.kind of
+  0 = @slashslash_comment
+| 1 = @slashstar_comment
+| 2 = @doc_comment
+| 3 = @html_comment_start
+| 4 = @htmlcommentend;
+
+@html_comment = @html_comment_start | @htmlcommentend;
+@line_comment = @slashslash_comment | @html_comment;
+@block_comment = @slashstar_comment | @doc_comment;
+
+// source lines
+lines (unique int id: @line,
+       int toplevel: @toplevel ref,
+       varchar(900) text: string ref,
+       varchar(2) terminator: string ref);
+indentation (int file: @file ref,
+            int lineno: int ref,
+            varchar(1) indentChar: string ref,
+            int indentDepth: int ref);
+
+// JavaScript parse errors
+js_parse_errors (unique int id: @js_parse_error,
+        int toplevel: @toplevel ref,
+        varchar(900) message: string ref,
+        varchar(900) line: string ref);
+
+// regular expressions
+#keyset[parent, idx]
+regexpterm (unique int id: @regexpterm,
+        int kind: int ref,
+        int parent: @regexpparent ref,
+        int idx: int ref,
+        varchar(900) tostring: string ref);
+
+@regexpparent = @regexpterm | @regexp_literal | @string_literal | @add_expr;
+
+case @regexpterm.kind of
+   0 = @regexp_alt
+|  1 = @regexp_seq
+|  2 = @regexp_caret
+|  3 = @regexp_dollar
+|  4 = @regexp_wordboundary
+|  5 = @regexp_nonwordboundary
+|  6 = @regexp_positive_lookahead
+|  7 = @regexp_negative_lookahead
+|  8 = @regexp_star
+|  9 = @regexp_plus
+| 10 = @regexp_opt
+| 11 = @regexp_range
+| 12 = @regexp_dot
+| 13 = @regexp_group
+| 14 = @regexp_normal_constant
+| 15 = @regexp_hex_escape
+| 16 = @regexp_unicode_escape
+| 17 = @regexp_dec_escape
+| 18 = @regexp_oct_escape
+| 19 = @regexp_ctrl_escape
+| 20 = @regexp_char_class_escape
+| 21 = @regexp_id_escape
+| 22 = @regexp_backref
+| 23 = @regexp_char_class
+| 24 = @regexp_char_range
+| 25 = @regexp_positive_lookbehind
+| 26 = @regexp_negative_lookbehind
+| 27 = @regexp_unicode_property_escape
+| 28 = @regexp_quoted_string
+| 29 = @regexp_intersection
+| 30 = @regexp_subtraction;
+
+regexp_parse_errors (unique int id: @regexp_parse_error,
+    int regexp: @regexpterm ref,
+    varchar(900) message: string ref);
+
+@regexp_quantifier = @regexp_star | @regexp_plus | @regexp_opt | @regexp_range;
+@regexp_escape = @regexp_char_escape | @regexp_char_class_escape | @regexp_unicode_property_escape;
+@regexp_char_escape = @regexp_hex_escape | @regexp_unicode_escape | @regexp_dec_escape | @regexp_oct_escape | @regexp_ctrl_escape | @regexp_id_escape;
+@regexp_constant = @regexp_normal_constant | @regexp_char_escape;
+@regexp_lookahead = @regexp_positive_lookahead | @regexp_negative_lookahead;
+@regexp_lookbehind = @regexp_positive_lookbehind | @regexp_negative_lookbehind;
+@regexp_subpattern = @regexp_lookahead | @regexp_lookbehind;
+@regexp_anchor = @regexp_dollar | @regexp_caret;
+
+is_greedy (int id: @regexp_quantifier ref);
+range_quantifier_lower_bound (unique int id: @regexp_range ref, int lo: int ref);
+range_quantifier_upper_bound (unique int id: @regexp_range ref, int hi: int ref);
+is_capture (unique int id: @regexp_group ref, int number: int ref);
+is_named_capture (unique int id: @regexp_group ref, string name: string ref);
+is_inverted (int id: @regexp_char_class ref);
+regexp_const_value (unique int id: @regexp_constant ref, varchar(1) value: string ref);
+char_class_escape (unique int id: @regexp_char_class_escape ref, varchar(1) value: string ref);
+backref (unique int id: @regexp_backref ref, int value: int ref);
+named_backref (unique int id: @regexp_backref ref, string name: string ref);
+unicode_property_escapename (unique int id: @regexp_unicode_property_escape ref, string name: string ref);
+unicode_property_escapevalue (unique int id: @regexp_unicode_property_escape ref, string value: string ref);
+
+// tokens
+#keyset[toplevel, idx]
+tokeninfo (unique int id: @token,
+    int kind: int ref,
+    int toplevel: @toplevel ref,
+    int idx: int ref,
+    varchar(900) value: string ref);
+
+case @token.kind of
+  0 = @token_eof
+| 1 = @token_null_literal
+| 2 = @token_boolean_literal
+| 3 = @token_numeric_literal
+| 4 = @token_string_literal
+| 5 = @token_regular_expression
+| 6 = @token_identifier
+| 7 = @token_keyword
+| 8 = @token_punctuator;
+
+// associate comments with the token immediately following them (which may be EOF)
+next_token (int comment: @comment ref, int token: @token ref);
+
+// JSON
+#keyset[parent, idx]
+json (unique int id: @json_value,
+      int kind: int ref,
+      int parent: @json_parent ref,
+      int idx: int ref,
+      varchar(900) tostring: string ref);
+
+json_literals (varchar(900) value: string ref,
+      varchar(900) raw: string ref,
+      unique int expr: @json_value ref);
+
+json_properties (int obj: @json_object ref,
+      varchar(900) property: string ref,
+      int value: @json_value ref);
+
+json_errors (unique int id: @json_parse_error,
+      varchar(900) message: string ref);
+
+json_locations(unique int locatable: @json_locatable ref,
+      int location: @location_default ref);
+
+case @json_value.kind of
+  0 = @json_null
+| 1 = @json_boolean
+| 2 = @json_number
+| 3 = @json_string
+| 4 = @json_array
+| 5 = @json_object;
+
+@json_parent = @json_object | @json_array | @file;
+
+@json_locatable = @json_value | @json_parse_error;
+
+// locations
+@ast_node = @toplevel | @stmt | @expr | @property | @typeexpr;
+
+@locatable = @file
+    | @ast_node
+    | @comment
+    | @line
+    | @js_parse_error | @regexp_parse_error
+    | @regexpterm
+    | @json_locatable
+    | @token
+    | @cfg_node
+    | @jsdoc | @jsdoc_type_expr | @jsdoc_tag
+    | @yaml_locatable
+    | @xmllocatable
+    | @configLocatable
+    | @template_placeholder_tag;
+
+hasLocation (unique int locatable: @locatable ref,
+    int location: @location ref);
+
+// CFG
+entry_cfg_node (unique int id: @entry_node, int container: @stmt_container ref);
+exit_cfg_node (unique int id: @exit_node, int container: @stmt_container ref);
+guard_node (unique int id: @guard_node, int kind: int ref, int test: @expr ref);
+case @guard_node.kind of
+  0 = @falsy_guard
+| 1 = @truthy_guard;
+@condition_guard = @falsy_guard | @truthy_guard;
+
+@synthetic_cfg_node = @entry_node | @exit_node | @guard_node;
+@cfg_node = @synthetic_cfg_node | @expr_parent;
+
+successor (int pred: @cfg_node ref, int succ: @cfg_node ref);
+
+// JSDoc comments
+jsdoc (unique int id: @jsdoc, varchar(900) description: string ref, int comment: @comment ref);
+#keyset[parent, idx]
+jsdoc_tags (unique int id: @jsdoc_tag, varchar(900) title: string ref,
+            int parent: @jsdoc ref, int idx: int ref, varchar(900) tostring: string ref);
+jsdoc_tag_descriptions (unique int tag: @jsdoc_tag ref, varchar(900) text: string ref);
+jsdoc_tag_names (unique int tag: @jsdoc_tag ref, varchar(900) text: string ref);
+
+#keyset[parent, idx]
+jsdoc_type_exprs (unique int id: @jsdoc_type_expr,
+                  int kind: int ref,
+                  int parent: @jsdoc_type_expr_parent ref,
+                  int idx: int ref,
+                  varchar(900) tostring: string ref);
+case @jsdoc_type_expr.kind of
+    0 = @jsdoc_any_type_expr
+|   1 = @jsdoc_null_type_expr
+|   2 = @jsdoc_undefined_type_expr
+|   3 = @jsdoc_unknown_type_expr
+|   4 = @jsdoc_void_type_expr
+|   5 = @jsdoc_identifier_type_expr
+|   6 = @jsdoc_applied_type_expr
+|   7 = @jsdoc_nullable_type_expr
+|   8 = @jsdoc_non_nullable_type_expr
+|   9 = @jsdoc_record_type_expr
+|  10 = @jsdoc_array_type_expr
+|  11 = @jsdoc_union_type_expr
+|  12 = @jsdoc_function_type_expr
+|  13 = @jsdoc_optional_type_expr
+|  14 = @jsdoc_rest_type_expr
+|  15 = @jsdoc_qualified_type_expr
+;
+
+#keyset[id, idx]
+jsdoc_record_field_name (int id: @jsdoc_record_type_expr ref, int idx: int ref, varchar(900) name: string ref);
+jsdoc_prefix_qualifier (int id: @jsdoc_type_expr ref);
+jsdoc_has_new_parameter (int fn: @jsdoc_function_type_expr ref);
+
+@jsdoc_type_expr_parent = @jsdoc_type_expr | @jsdoc_tag;
+
+jsdoc_errors (unique int id: @jsdoc_error, int tag: @jsdoc_tag ref, varchar(900) message: string ref, varchar(900) tostring: string ref);
+
+@dataflownode = @expr | @function_decl_stmt | @class_decl_stmt | @namespace_declaration | @enum_declaration | @property;
+
+@optionalchainable = @call_expr | @propaccess;
+
+isOptionalChaining(int id: @optionalchainable ref);
+
+/**
+ * The time taken for the extraction of a file.
+ * This table contains non-deterministic content.
+ *
+ * The sum of the `time` column for each (`file`, `timerKind`) pair
+ * is the total time taken for extraction of `file`.  The `extractionPhase`
+ * column provides a granular view of the extraction time of the file.
+ */
+extraction_time(
+  int file : @file ref,
+  // see `com.semmle.js.extractor.ExtractionMetrics.ExtractionPhase`.
+  int extractionPhase: int ref,
+  // 0 for the elapsed CPU time in nanoseconds, 1 for the elapsed wallclock time in nanoseconds
+  int timerKind: int ref,
+  float time: float ref
+)
+
+/**
+* Non-timing related data for the extraction of a single file.
+* This table contains non-deterministic content.
+*/
+extraction_data(
+  int file : @file ref,
+  // the absolute path to the cache file
+  varchar(900) cacheFile: string ref,
+  boolean fromCache: boolean ref,
+  int length: int ref
+)
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error;
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+/*- Configuration files with key value pairs -*/
+
+configs(
+  unique int id: @config
+);
+
+configNames(
+  unique int id: @configName,
+  int config: @config ref,
+  string name: string ref
+);
+
+configValues(
+  unique int id: @configValue,
+  int config: @config ref,
+  string value: string ref
+);
+
+configLocations(
+  int locatable: @configLocatable ref,
+  int location: @location_default ref
+);
+
+@configLocatable = @config | @configName | @configValue;
+
+/*- Database metadata -*/
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+overlayChangedFiles(
+  string path: string ref
+);
diff --git a/javascript/downgrades/80b2bc24189307c5fd178dc2da95b45bcdb117f7/semmlecode.javascript.dbscheme b/javascript/downgrades/80b2bc24189307c5fd178dc2da95b45bcdb117f7/semmlecode.javascript.dbscheme
new file mode 100644
index 00000000000..76a926a00d5
--- /dev/null
+++ b/javascript/downgrades/80b2bc24189307c5fd178dc2da95b45bcdb117f7/semmlecode.javascript.dbscheme
@@ -0,0 +1,1204 @@
+/*** Standard fragments ***/
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- JavaScript-specific part -*/
+
+@location = @location_default
+
+@sourceline = @locatable;
+
+filetype(
+  int file: @file ref,
+  string filetype: string ref
+)
+
+// top-level code fragments
+toplevels (unique int id: @toplevel,
+           int kind: int ref);
+
+is_externs (int toplevel: @toplevel ref);
+
+case @toplevel.kind of
+   0 = @script
+|  1 = @inline_script
+|  2 = @event_handler
+|  3 = @javascript_url
+|  4 = @template_toplevel;
+
+is_module (int tl: @toplevel ref);
+is_nodejs (int tl: @toplevel ref);
+is_es2015_module (int tl: @toplevel ref);
+is_closure_module (int tl: @toplevel ref);
+
+@xml_node_with_code = @xmlelement | @xmlattribute | @template_placeholder_tag;
+toplevel_parent_xml_node(
+  unique int toplevel: @toplevel ref,
+  int xmlnode: @xml_node_with_code ref);
+
+xml_element_parent_expression(
+  unique int xmlnode: @xmlelement ref,
+  int expression: @expr ref,
+  int index: int ref);
+
+// statements
+#keyset[parent, idx]
+stmts (unique int id: @stmt,
+       int kind: int ref,
+       int parent: @stmt_parent ref,
+       int idx: int ref,
+       varchar(900) tostring: string ref);
+
+stmt_containers (unique int stmt: @stmt ref,
+       int container: @stmt_container ref);
+
+jump_targets (unique int jump: @stmt ref,
+       int target: @stmt ref);
+
+@stmt_parent = @stmt | @toplevel | @function_expr | @arrow_function_expr | @static_initializer;
+@stmt_container = @toplevel | @function | @namespace_declaration | @external_module_declaration | @global_augmentation_declaration;
+
+case @stmt.kind of
+   0 = @empty_stmt
+|  1 = @block_stmt
+|  2 = @expr_stmt
+|  3 = @if_stmt
+|  4 = @labeled_stmt
+|  5 = @break_stmt
+|  6 = @continue_stmt
+|  7 = @with_stmt
+|  8 = @switch_stmt
+|  9 = @return_stmt
+| 10 = @throw_stmt
+| 11 = @try_stmt
+| 12 = @while_stmt
+| 13 = @do_while_stmt
+| 14 = @for_stmt
+| 15 = @for_in_stmt
+| 16 = @debugger_stmt
+| 17 = @function_decl_stmt
+| 18 = @var_decl_stmt
+| 19 = @case
+| 20 = @catch_clause
+| 21 = @for_of_stmt
+| 22 = @const_decl_stmt
+| 23 = @let_stmt
+| 24 = @legacy_let_stmt
+| 25 = @for_each_stmt
+| 26 = @class_decl_stmt
+| 27 = @import_declaration
+| 28 = @export_all_declaration
+| 29 = @export_default_declaration
+| 30 = @export_named_declaration
+| 31 = @namespace_declaration
+| 32 = @import_equals_declaration
+| 33 = @export_assign_declaration
+| 34 = @interface_declaration
+| 35 = @type_alias_declaration
+| 36 = @enum_declaration
+| 37 = @external_module_declaration
+| 38 = @export_as_namespace_declaration
+| 39 = @global_augmentation_declaration
+| 40 = @using_decl_stmt
+;
+
+@decl_stmt = @var_decl_stmt | @const_decl_stmt | @let_stmt | @legacy_let_stmt | @using_decl_stmt;
+
+@export_declaration = @export_all_declaration | @export_default_declaration | @export_named_declaration;
+
+@namespace_definition = @namespace_declaration | @enum_declaration;
+@type_definition = @class_definition | @interface_declaration | @enum_declaration | @type_alias_declaration | @enum_member;
+
+is_instantiated(unique int decl: @namespace_declaration ref);
+
+@declarable_node = @decl_stmt | @namespace_declaration | @class_decl_stmt | @function_decl_stmt | @enum_declaration | @external_module_declaration | @global_augmentation_declaration | @field;
+has_declare_keyword(unique int stmt: @declarable_node ref);
+
+is_for_await_of(unique int forof: @for_of_stmt ref);
+
+// expressions
+#keyset[parent, idx]
+exprs (unique int id: @expr,
+       int kind: int ref,
+       int parent: @expr_parent ref,
+       int idx: int ref,
+       varchar(900) tostring: string ref);
+
+literals (varchar(900) value: string ref,
+       varchar(900) raw: string ref,
+       unique int expr: @expr_or_type ref);
+
+enclosing_stmt (unique int expr: @expr_or_type ref,
+       int stmt: @stmt ref);
+
+expr_containers (unique int expr: @expr_or_type ref,
+       int container: @stmt_container ref);
+
+array_size (unique int ae: @arraylike ref,
+       int sz: int ref);
+
+is_delegating (int yield: @yield_expr ref);
+
+@expr_or_stmt = @expr | @stmt;
+@expr_or_type = @expr | @typeexpr;
+@expr_parent = @expr_or_stmt | @property | @function_typeexpr;
+@arraylike = @array_expr | @array_pattern;
+@type_annotation = @typeexpr | @jsdoc_type_expr;
+@node_in_stmt_container = @cfg_node | @type_annotation | @toplevel;
+
+case @expr.kind of
+   0 = @label
+|  1 = @null_literal
+|  2 = @boolean_literal
+|  3 = @number_literal
+|  4 = @string_literal
+|  5 = @regexp_literal
+|  6 = @this_expr
+|  7 = @array_expr
+|  8 = @obj_expr
+|  9 = @function_expr
+| 10 = @seq_expr
+| 11 = @conditional_expr
+| 12 = @new_expr
+| 13 = @call_expr
+| 14 = @dot_expr
+| 15 = @index_expr
+| 16 = @neg_expr
+| 17 = @plus_expr
+| 18 = @log_not_expr
+| 19 = @bit_not_expr
+| 20 = @typeof_expr
+| 21 = @void_expr
+| 22 = @delete_expr
+| 23 = @eq_expr
+| 24 = @neq_expr
+| 25 = @eqq_expr
+| 26 = @neqq_expr
+| 27 = @lt_expr
+| 28 = @le_expr
+| 29 = @gt_expr
+| 30 = @ge_expr
+| 31 = @lshift_expr
+| 32 = @rshift_expr
+| 33 = @urshift_expr
+| 34 = @add_expr
+| 35 = @sub_expr
+| 36 = @mul_expr
+| 37 = @div_expr
+| 38 = @mod_expr
+| 39 = @bitor_expr
+| 40 = @xor_expr
+| 41 = @bitand_expr
+| 42 = @in_expr
+| 43 = @instanceof_expr
+| 44 = @logand_expr
+| 45 = @logor_expr
+| 47 = @assign_expr
+| 48 = @assign_add_expr
+| 49 = @assign_sub_expr
+| 50 = @assign_mul_expr
+| 51 = @assign_div_expr
+| 52 = @assign_mod_expr
+| 53 = @assign_lshift_expr
+| 54 = @assign_rshift_expr
+| 55 = @assign_urshift_expr
+| 56 = @assign_or_expr
+| 57 = @assign_xor_expr
+| 58 = @assign_and_expr
+| 59 = @preinc_expr
+| 60 = @postinc_expr
+| 61 = @predec_expr
+| 62 = @postdec_expr
+| 63 = @par_expr
+| 64 = @var_declarator
+| 65 = @arrow_function_expr
+| 66 = @spread_element
+| 67 = @array_pattern
+| 68 = @object_pattern
+| 69 = @yield_expr
+| 70 = @tagged_template_expr
+| 71 = @template_literal
+| 72 = @template_element
+| 73 = @array_comprehension_expr
+| 74 = @generator_expr
+| 75 = @for_in_comprehension_block
+| 76 = @for_of_comprehension_block
+| 77 = @legacy_letexpr
+| 78 = @var_decl
+| 79 = @proper_varaccess
+| 80 = @class_expr
+| 81 = @super_expr
+| 82 = @newtarget_expr
+| 83 = @named_import_specifier
+| 84 = @import_default_specifier
+| 85 = @import_namespace_specifier
+| 86 = @named_export_specifier
+| 87 = @exp_expr
+| 88 = @assign_exp_expr
+| 89 = @jsx_element
+| 90 = @jsx_qualified_name
+| 91 = @jsx_empty_expr
+| 92 = @await_expr
+| 93 = @function_sent_expr
+| 94 = @decorator
+| 95 = @export_default_specifier
+| 96 = @export_namespace_specifier
+| 97 = @bind_expr
+| 98 = @external_module_reference
+| 99 = @dynamic_import
+| 100 = @expression_with_type_arguments
+| 101 = @prefix_type_assertion
+| 102 = @as_type_assertion
+| 103 = @export_varaccess
+| 104 = @decorator_list
+| 105 = @non_null_assertion
+| 106 = @bigint_literal
+| 107 = @nullishcoalescing_expr
+| 108 = @e4x_xml_anyname
+| 109 = @e4x_xml_static_attribute_selector
+| 110 = @e4x_xml_dynamic_attribute_selector
+| 111 = @e4x_xml_filter_expression
+| 112 = @e4x_xml_static_qualident
+| 113 = @e4x_xml_dynamic_qualident
+| 114 = @e4x_xml_dotdotexpr
+| 115 = @import_meta_expr
+| 116 = @assignlogandexpr
+| 117 = @assignlogorexpr
+| 118 = @assignnullishcoalescingexpr
+| 119 = @template_pipe_ref
+| 120 = @generated_code_expr
+| 121 = @satisfies_expr
+;
+
+@varaccess = @proper_varaccess | @export_varaccess;
+@varref = @var_decl | @varaccess;
+
+@identifier = @label | @varref | @type_identifier;
+
+@literal = @null_literal | @boolean_literal | @number_literal | @string_literal | @regexp_literal | @bigint_literal;
+
+@propaccess = @dot_expr | @index_expr;
+
+@invokeexpr = @new_expr | @call_expr;
+
+@unaryexpr = @neg_expr | @plus_expr | @log_not_expr | @bit_not_expr | @typeof_expr | @void_expr | @delete_expr | @spread_element;
+
+@equality_test = @eq_expr | @neq_expr | @eqq_expr | @neqq_expr;
+
+@comparison = @equality_test | @lt_expr | @le_expr | @gt_expr | @ge_expr;
+
+@binaryexpr = @comparison | @lshift_expr | @rshift_expr | @urshift_expr | @add_expr | @sub_expr | @mul_expr | @div_expr | @mod_expr | @exp_expr | @bitor_expr | @xor_expr | @bitand_expr | @in_expr | @instanceof_expr | @logand_expr | @logor_expr | @nullishcoalescing_expr;
+
+@assignment = @assign_expr | @assign_add_expr | @assign_sub_expr | @assign_mul_expr | @assign_div_expr | @assign_mod_expr | @assign_exp_expr | @assign_lshift_expr | @assign_rshift_expr | @assign_urshift_expr | @assign_or_expr | @assign_xor_expr | @assign_and_expr | @assignlogandexpr | @assignlogorexpr | @assignnullishcoalescingexpr;
+
+@updateexpr = @preinc_expr | @postinc_expr | @predec_expr | @postdec_expr;
+
+@pattern = @varref | @array_pattern | @object_pattern;
+
+@comprehension_expr = @array_comprehension_expr | @generator_expr;
+
+@comprehension_block = @for_in_comprehension_block | @for_of_comprehension_block;
+
+@import_specifier = @named_import_specifier | @import_default_specifier | @import_namespace_specifier;
+
+@exportspecifier = @named_export_specifier | @export_default_specifier | @export_namespace_specifier;
+
+@type_keyword_operand = @import_declaration | @export_declaration | @import_specifier;
+
+@type_assertion = @as_type_assertion | @prefix_type_assertion;
+
+@class_definition = @class_decl_stmt | @class_expr;
+@interface_definition = @interface_declaration | @interface_typeexpr;
+@class_or_interface = @class_definition | @interface_definition;
+
+@lexical_decl = @var_decl | @type_decl;
+@lexical_access = @varaccess | @local_type_access | @local_var_type_access | @local_namespace_access;
+@lexical_ref = @lexical_decl | @lexical_access;
+
+@e4x_xml_attribute_selector = @e4x_xml_static_attribute_selector | @e4x_xml_dynamic_attribute_selector;
+@e4x_xml_qualident = @e4x_xml_static_qualident | @e4x_xml_dynamic_qualident;
+
+expr_contains_template_tag_location(
+  int expr: @expr ref,
+  int location: @location ref
+);
+
+@template_placeholder_tag_parent = @xmlelement | @xmlattribute | @file;
+
+template_placeholder_tag_info(
+  unique int node: @template_placeholder_tag,
+  int parentNode: @template_placeholder_tag_parent ref,
+  varchar(900) raw: string ref
+);
+
+// scopes
+scopes (unique int id: @scope,
+        int kind: int ref);
+
+case @scope.kind of
+   0 = @global_scope
+|  1 = @function_scope
+|  2 = @catch_scope
+|  3 = @module_scope
+|  4 = @block_scope
+|  5 = @for_scope
+|  6 = @for_in_scope // for-of scopes work the same as for-in scopes
+|  7 = @comprehension_block_scope
+|  8 = @class_expr_scope
+|  9 = @namespace_scope
+| 10 = @class_decl_scope
+| 11 = @interface_scope
+| 12 = @type_alias_scope
+| 13 = @mapped_type_scope
+| 14 = @enum_scope
+| 15 = @external_module_scope
+| 16 = @conditional_type_scope;
+
+scopenodes (unique int node: @ast_node ref,
+            int scope: @scope ref);
+
+scopenesting (unique int inner: @scope ref,
+              int outer: @scope ref);
+
+// functions
+@function = @function_decl_stmt | @function_expr | @arrow_function_expr;
+
+@parameterized = @function | @catch_clause;
+@type_parameterized = @function | @class_or_interface | @type_alias_declaration | @mapped_typeexpr | @infer_typeexpr;
+
+is_generator (int fun: @function ref);
+has_rest_parameter (int fun: @function ref);
+is_async (int fun: @function ref);
+
+// variables and lexically scoped type names
+#keyset[scope, name]
+variables (unique int id: @variable,
+           varchar(900) name: string ref,
+           int scope: @scope ref);
+
+#keyset[scope, name]
+local_type_names (unique int id: @local_type_name,
+                  varchar(900) name: string ref,
+                  int scope: @scope ref);
+
+#keyset[scope, name]
+local_namespace_names (unique int id: @local_namespace_name,
+                       varchar(900) name: string ref,
+                       int scope: @scope ref);
+
+is_arguments_object (int id: @variable ref);
+
+@lexical_name = @variable | @local_type_name | @local_namespace_name;
+
+@bind_id = @varaccess | @local_var_type_access;
+bind (unique int id: @bind_id ref,
+      int decl: @variable ref);
+
+decl (unique int id: @var_decl ref,
+      int decl: @variable ref);
+
+@typebind_id = @local_type_access | @export_varaccess;
+typebind (unique int id: @typebind_id ref,
+          int decl: @local_type_name ref);
+
+@typedecl_id = @type_decl | @var_decl;
+typedecl (unique int id: @typedecl_id ref,
+          int decl: @local_type_name ref);
+
+namespacedecl (unique int id: @var_decl ref,
+               int decl: @local_namespace_name ref);
+
+@namespacebind_id = @local_namespace_access | @export_varaccess;
+namespacebind (unique int id: @namespacebind_id ref,
+               int decl: @local_namespace_name ref);
+
+
+// properties in object literals, property patterns in object patterns, and method declarations in classes
+#keyset[parent, index]
+properties (unique int id: @property,
+            int parent: @property_parent ref,
+            int index: int ref,
+            int kind: int ref,
+            varchar(900) tostring: string ref);
+
+case @property.kind of
+  0 = @value_property
+| 1 = @property_getter
+| 2 = @property_setter
+| 3 = @jsx_attribute
+| 4 = @function_call_signature
+| 5 = @constructor_call_signature
+| 6 = @index_signature
+| 7 = @enum_member
+| 8 = @proper_field
+| 9 = @parameter_field
+| 10 = @static_initializer
+;
+
+@property_parent = @obj_expr | @object_pattern | @class_definition | @jsx_element | @interface_definition | @enum_declaration;
+@property_accessor = @property_getter | @property_setter;
+@call_signature = @function_call_signature | @constructor_call_signature;
+@field = @proper_field | @parameter_field;
+@field_or_vardeclarator = @field | @var_declarator;
+
+is_computed (int id: @property ref);
+is_method   (int id: @property ref);
+is_static   (int id: @property ref);
+is_abstract_member (int id: @property ref);
+is_const_enum (int id: @enum_declaration ref);
+is_abstract_class (int id: @class_decl_stmt ref);
+
+has_public_keyword (int id: @property ref);
+has_private_keyword (int id: @property ref);
+has_protected_keyword (int id: @property ref);
+has_readonly_keyword (int id: @property ref);
+has_type_keyword (int id: @type_keyword_operand ref);
+is_optional_member (int id: @property ref);
+has_definite_assignment_assertion (int id: @field_or_vardeclarator ref);
+is_optional_parameter_declaration (unique int parameter: @pattern ref);
+
+#keyset[constructor, param_index]
+parameter_fields(
+  unique int field: @parameter_field ref,
+  int constructor: @function_expr ref,
+  int param_index: int ref
+);
+
+// types
+#keyset[parent, idx]
+typeexprs (
+  unique int id: @typeexpr,
+  int kind: int ref,
+  int parent: @typeexpr_parent ref,
+  int idx: int ref,
+  varchar(900) tostring: string ref
+);
+
+case @typeexpr.kind of
+  0 = @local_type_access
+| 1 = @type_decl
+| 2 = @keyword_typeexpr
+| 3 = @string_literal_typeexpr
+| 4 = @number_literal_typeexpr
+| 5 = @boolean_literal_typeexpr
+| 6 = @array_typeexpr
+| 7 = @union_typeexpr
+| 8 = @indexed_access_typeexpr
+| 9 = @intersection_typeexpr
+| 10 = @parenthesized_typeexpr
+| 11 = @tuple_typeexpr
+| 12 = @keyof_typeexpr
+| 13 = @qualified_type_access
+| 14 = @generic_typeexpr
+| 15 = @type_label
+| 16 = @typeof_typeexpr
+| 17 = @local_var_type_access
+| 18 = @qualified_var_type_access
+| 19 = @this_var_type_access
+| 20 = @predicate_typeexpr
+| 21 = @interface_typeexpr
+| 22 = @type_parameter
+| 23 = @plain_function_typeexpr
+| 24 = @constructor_typeexpr
+| 25 = @local_namespace_access
+| 26 = @qualified_namespace_access
+| 27 = @mapped_typeexpr
+| 28 = @conditional_typeexpr
+| 29 = @infer_typeexpr
+| 30 = @import_type_access
+| 31 = @import_namespace_access
+| 32 = @import_var_type_access
+| 33 = @optional_typeexpr
+| 34 = @rest_typeexpr
+| 35 = @bigint_literal_typeexpr
+| 36 = @readonly_typeexpr
+| 37 = @template_literal_typeexpr
+;
+
+@typeref = @typeaccess | @type_decl;
+@type_identifier = @type_decl | @local_type_access | @type_label | @local_var_type_access | @local_namespace_access;
+@typeexpr_parent = @expr | @stmt | @property | @typeexpr;
+@literal_typeexpr = @string_literal_typeexpr | @number_literal_typeexpr | @boolean_literal_typeexpr | @bigint_literal_typeexpr;
+@typeaccess = @local_type_access | @qualified_type_access | @import_type_access;
+@vartypeaccess = @local_var_type_access | @qualified_var_type_access | @this_var_type_access | @import_var_type_access;
+@namespace_access = @local_namespace_access | @qualified_namespace_access | @import_namespace_access;
+@import_typeexpr = @import_type_access | @import_namespace_access | @import_var_type_access;
+
+@function_typeexpr = @plain_function_typeexpr | @constructor_typeexpr;
+
+// types
+types (
+  unique int id: @type,
+  int kind: int ref,
+  varchar(900) tostring: string ref
+);
+
+#keyset[parent, idx]
+type_child (
+  int child: @type ref,
+  int parent: @type ref,
+  int idx: int ref
+);
+
+case @type.kind of
+  0 = @any_type
+| 1 = @string_type
+| 2 = @number_type
+| 3 = @union_type
+| 4 = @true_type
+| 5 = @false_type
+| 6 = @type_reference
+| 7 = @object_type
+| 8 = @canonical_type_variable_type
+| 9 = @typeof_type
+| 10 = @void_type
+| 11 = @undefined_type
+| 12 = @null_type
+| 13 = @never_type
+| 14 = @plain_symbol_type
+| 15 = @unique_symbol_type
+| 16 = @objectkeyword_type
+| 17 = @intersection_type
+| 18 = @tuple_type
+| 19 = @lexical_type_variable_type
+| 20 = @this_type
+| 21 = @number_literal_type
+| 22 = @string_literal_type
+| 23 = @unknown_type
+| 24 = @bigint_type
+| 25 = @bigint_literal_type
+;
+
+@boolean_literal_type = @true_type | @false_type;
+@symbol_type = @plain_symbol_type | @unique_symbol_type;
+@union_or_intersection_type = @union_type | @intersection_type;
+@typevariable_type = @canonical_type_variable_type | @lexical_type_variable_type;
+
+has_asserts_keyword(int node: @predicate_typeexpr ref);
+
+@typed_ast_node = @expr | @typeexpr | @function;
+ast_node_type(
+  unique int node: @typed_ast_node ref,
+  int typ: @type ref);
+
+declared_function_signature(
+  unique int node: @function ref,
+  int sig: @signature_type ref
+);
+
+invoke_expr_signature(
+  unique int node: @invokeexpr ref,
+  int sig: @signature_type ref
+);
+
+invoke_expr_overload_index(
+  unique int node: @invokeexpr ref,
+  int index: int ref
+);
+
+symbols (
+  unique int id: @symbol,
+  int kind: int ref,
+  varchar(900) name: string ref
+);
+
+symbol_parent (
+  unique int symbol: @symbol ref,
+  int parent: @symbol ref
+);
+
+symbol_module (
+  int symbol: @symbol ref,
+  varchar(900) moduleName: string ref
+);
+
+symbol_global (
+  int symbol: @symbol ref,
+  varchar(900) globalName: string ref
+);
+
+case @symbol.kind of
+  0 = @root_symbol
+| 1 = @member_symbol
+| 2 = @other_symbol
+;
+
+@type_with_symbol = @type_reference | @typevariable_type | @typeof_type | @unique_symbol_type;
+@ast_node_with_symbol = @type_definition | @namespace_definition | @toplevel | @typeaccess | @namespace_access | @var_decl | @function | @invokeexpr | @import_declaration | @external_module_reference | @external_module_declaration;
+
+ast_node_symbol(
+  unique int node: @ast_node_with_symbol ref,
+  int symbol: @symbol ref);
+
+type_symbol(
+  unique int typ: @type_with_symbol ref,
+  int symbol: @symbol ref);
+
+#keyset[typ, name]
+type_property(
+  int typ: @type ref,
+  varchar(900) name: string ref,
+  int propertyType: @type ref);
+
+type_alias(
+  unique int aliasType: @type ref,
+  int underlyingType: @type ref);
+
+@literal_type = @string_literal_type | @number_literal_type | @boolean_literal_type | @bigint_literal_type;
+@type_with_literal_value = @string_literal_type | @number_literal_type | @bigint_literal_type;
+type_literal_value(
+  unique int typ: @type_with_literal_value ref,
+  varchar(900) value: string ref);
+
+signature_types (
+  unique int id: @signature_type,
+  int kind: int ref,
+  varchar(900) tostring: string ref,
+  int type_parameters: int ref,
+  int required_params: int ref
+);
+
+is_abstract_signature(
+  unique int sig: @signature_type ref
+);
+
+signature_rest_parameter(
+  unique int sig: @signature_type ref,
+  int rest_param_arra_type: @type ref
+);
+
+case @signature_type.kind of
+  0 = @function_signature_type
+| 1 = @constructor_signature_type
+;
+
+#keyset[typ, kind, index]
+type_contains_signature (
+  int typ: @type ref,
+  int kind: int ref,  // constructor/call/index
+  int index: int ref, // ordering of overloaded signatures
+  int sig: @signature_type ref
+);
+
+#keyset[parent, index]
+signature_contains_type (
+  int child: @type ref,
+  int parent: @signature_type ref,
+  int index: int ref
+);
+
+#keyset[sig, index]
+signature_parameter_name (
+  int sig: @signature_type ref,
+  int index: int ref,
+  varchar(900) name: string ref
+);
+
+number_index_type (
+  unique int baseType: @type ref,
+  int propertyType: @type ref
+);
+
+string_index_type (
+  unique int baseType: @type ref,
+  int propertyType: @type ref
+);
+
+base_type_names(
+  int typeName: @symbol ref,
+  int baseTypeName: @symbol ref
+);
+
+self_types(
+  int typeName: @symbol ref,
+  int selfType: @type_reference ref
+);
+
+tuple_type_min_length(
+  unique int typ: @type ref,
+  int minLength: int ref
+);
+
+tuple_type_rest_index(
+  unique int typ: @type ref,
+  int index: int ref
+);
+
+// comments
+comments (unique int id: @comment,
+          int kind: int ref,
+          int toplevel: @toplevel ref,
+          varchar(900) text: string ref,
+          varchar(900) tostring: string ref);
+
+case @comment.kind of
+  0 = @slashslash_comment
+| 1 = @slashstar_comment
+| 2 = @doc_comment
+| 3 = @html_comment_start
+| 4 = @htmlcommentend;
+
+@html_comment = @html_comment_start | @htmlcommentend;
+@line_comment = @slashslash_comment | @html_comment;
+@block_comment = @slashstar_comment | @doc_comment;
+
+// source lines
+lines (unique int id: @line,
+       int toplevel: @toplevel ref,
+       varchar(900) text: string ref,
+       varchar(2) terminator: string ref);
+indentation (int file: @file ref,
+            int lineno: int ref,
+            varchar(1) indentChar: string ref,
+            int indentDepth: int ref);
+
+// JavaScript parse errors
+js_parse_errors (unique int id: @js_parse_error,
+        int toplevel: @toplevel ref,
+        varchar(900) message: string ref,
+        varchar(900) line: string ref);
+
+// regular expressions
+#keyset[parent, idx]
+regexpterm (unique int id: @regexpterm,
+        int kind: int ref,
+        int parent: @regexpparent ref,
+        int idx: int ref,
+        varchar(900) tostring: string ref);
+
+@regexpparent = @regexpterm | @regexp_literal | @string_literal | @add_expr;
+
+case @regexpterm.kind of
+   0 = @regexp_alt
+|  1 = @regexp_seq
+|  2 = @regexp_caret
+|  3 = @regexp_dollar
+|  4 = @regexp_wordboundary
+|  5 = @regexp_nonwordboundary
+|  6 = @regexp_positive_lookahead
+|  7 = @regexp_negative_lookahead
+|  8 = @regexp_star
+|  9 = @regexp_plus
+| 10 = @regexp_opt
+| 11 = @regexp_range
+| 12 = @regexp_dot
+| 13 = @regexp_group
+| 14 = @regexp_normal_constant
+| 15 = @regexp_hex_escape
+| 16 = @regexp_unicode_escape
+| 17 = @regexp_dec_escape
+| 18 = @regexp_oct_escape
+| 19 = @regexp_ctrl_escape
+| 20 = @regexp_char_class_escape
+| 21 = @regexp_id_escape
+| 22 = @regexp_backref
+| 23 = @regexp_char_class
+| 24 = @regexp_char_range
+| 25 = @regexp_positive_lookbehind
+| 26 = @regexp_negative_lookbehind
+| 27 = @regexp_unicode_property_escape
+| 28 = @regexp_quoted_string
+| 29 = @regexp_intersection
+| 30 = @regexp_subtraction;
+
+regexp_parse_errors (unique int id: @regexp_parse_error,
+    int regexp: @regexpterm ref,
+    varchar(900) message: string ref);
+
+@regexp_quantifier = @regexp_star | @regexp_plus | @regexp_opt | @regexp_range;
+@regexp_escape = @regexp_char_escape | @regexp_char_class_escape | @regexp_unicode_property_escape;
+@regexp_char_escape = @regexp_hex_escape | @regexp_unicode_escape | @regexp_dec_escape | @regexp_oct_escape | @regexp_ctrl_escape | @regexp_id_escape;
+@regexp_constant = @regexp_normal_constant | @regexp_char_escape;
+@regexp_lookahead = @regexp_positive_lookahead | @regexp_negative_lookahead;
+@regexp_lookbehind = @regexp_positive_lookbehind | @regexp_negative_lookbehind;
+@regexp_subpattern = @regexp_lookahead | @regexp_lookbehind;
+@regexp_anchor = @regexp_dollar | @regexp_caret;
+
+is_greedy (int id: @regexp_quantifier ref);
+range_quantifier_lower_bound (unique int id: @regexp_range ref, int lo: int ref);
+range_quantifier_upper_bound (unique int id: @regexp_range ref, int hi: int ref);
+is_capture (unique int id: @regexp_group ref, int number: int ref);
+is_named_capture (unique int id: @regexp_group ref, string name: string ref);
+is_inverted (int id: @regexp_char_class ref);
+regexp_const_value (unique int id: @regexp_constant ref, varchar(1) value: string ref);
+char_class_escape (unique int id: @regexp_char_class_escape ref, varchar(1) value: string ref);
+backref (unique int id: @regexp_backref ref, int value: int ref);
+named_backref (unique int id: @regexp_backref ref, string name: string ref);
+unicode_property_escapename (unique int id: @regexp_unicode_property_escape ref, string name: string ref);
+unicode_property_escapevalue (unique int id: @regexp_unicode_property_escape ref, string value: string ref);
+
+// tokens
+#keyset[toplevel, idx]
+tokeninfo (unique int id: @token,
+    int kind: int ref,
+    int toplevel: @toplevel ref,
+    int idx: int ref,
+    varchar(900) value: string ref);
+
+case @token.kind of
+  0 = @token_eof
+| 1 = @token_null_literal
+| 2 = @token_boolean_literal
+| 3 = @token_numeric_literal
+| 4 = @token_string_literal
+| 5 = @token_regular_expression
+| 6 = @token_identifier
+| 7 = @token_keyword
+| 8 = @token_punctuator;
+
+// associate comments with the token immediately following them (which may be EOF)
+next_token (int comment: @comment ref, int token: @token ref);
+
+// JSON
+#keyset[parent, idx]
+json (unique int id: @json_value,
+      int kind: int ref,
+      int parent: @json_parent ref,
+      int idx: int ref,
+      varchar(900) tostring: string ref);
+
+json_literals (varchar(900) value: string ref,
+      varchar(900) raw: string ref,
+      unique int expr: @json_value ref);
+
+json_properties (int obj: @json_object ref,
+      varchar(900) property: string ref,
+      int value: @json_value ref);
+
+json_errors (unique int id: @json_parse_error,
+      varchar(900) message: string ref);
+
+json_locations(unique int locatable: @json_locatable ref,
+      int location: @location_default ref);
+
+case @json_value.kind of
+  0 = @json_null
+| 1 = @json_boolean
+| 2 = @json_number
+| 3 = @json_string
+| 4 = @json_array
+| 5 = @json_object;
+
+@json_parent = @json_object | @json_array | @file;
+
+@json_locatable = @json_value | @json_parse_error;
+
+// locations
+@ast_node = @toplevel | @stmt | @expr | @property | @typeexpr;
+
+@locatable = @file
+    | @ast_node
+    | @comment
+    | @line
+    | @js_parse_error | @regexp_parse_error
+    | @regexpterm
+    | @json_locatable
+    | @token
+    | @cfg_node
+    | @jsdoc | @jsdoc_type_expr | @jsdoc_tag
+    | @yaml_locatable
+    | @xmllocatable
+    | @configLocatable
+    | @template_placeholder_tag;
+
+hasLocation (unique int locatable: @locatable ref,
+    int location: @location ref);
+
+// CFG
+entry_cfg_node (unique int id: @entry_node, int container: @stmt_container ref);
+exit_cfg_node (unique int id: @exit_node, int container: @stmt_container ref);
+guard_node (unique int id: @guard_node, int kind: int ref, int test: @expr ref);
+case @guard_node.kind of
+  0 = @falsy_guard
+| 1 = @truthy_guard;
+@condition_guard = @falsy_guard | @truthy_guard;
+
+@synthetic_cfg_node = @entry_node | @exit_node | @guard_node;
+@cfg_node = @synthetic_cfg_node | @expr_parent;
+
+successor (int pred: @cfg_node ref, int succ: @cfg_node ref);
+
+// JSDoc comments
+jsdoc (unique int id: @jsdoc, varchar(900) description: string ref, int comment: @comment ref);
+#keyset[parent, idx]
+jsdoc_tags (unique int id: @jsdoc_tag, varchar(900) title: string ref,
+            int parent: @jsdoc ref, int idx: int ref, varchar(900) tostring: string ref);
+jsdoc_tag_descriptions (unique int tag: @jsdoc_tag ref, varchar(900) text: string ref);
+jsdoc_tag_names (unique int tag: @jsdoc_tag ref, varchar(900) text: string ref);
+
+#keyset[parent, idx]
+jsdoc_type_exprs (unique int id: @jsdoc_type_expr,
+                  int kind: int ref,
+                  int parent: @jsdoc_type_expr_parent ref,
+                  int idx: int ref,
+                  varchar(900) tostring: string ref);
+case @jsdoc_type_expr.kind of
+    0 = @jsdoc_any_type_expr
+|   1 = @jsdoc_null_type_expr
+|   2 = @jsdoc_undefined_type_expr
+|   3 = @jsdoc_unknown_type_expr
+|   4 = @jsdoc_void_type_expr
+|   5 = @jsdoc_identifier_type_expr
+|   6 = @jsdoc_applied_type_expr
+|   7 = @jsdoc_nullable_type_expr
+|   8 = @jsdoc_non_nullable_type_expr
+|   9 = @jsdoc_record_type_expr
+|  10 = @jsdoc_array_type_expr
+|  11 = @jsdoc_union_type_expr
+|  12 = @jsdoc_function_type_expr
+|  13 = @jsdoc_optional_type_expr
+|  14 = @jsdoc_rest_type_expr
+|  15 = @jsdoc_qualified_type_expr
+;
+
+#keyset[id, idx]
+jsdoc_record_field_name (int id: @jsdoc_record_type_expr ref, int idx: int ref, varchar(900) name: string ref);
+jsdoc_prefix_qualifier (int id: @jsdoc_type_expr ref);
+jsdoc_has_new_parameter (int fn: @jsdoc_function_type_expr ref);
+
+@jsdoc_type_expr_parent = @jsdoc_type_expr | @jsdoc_tag;
+
+jsdoc_errors (unique int id: @jsdoc_error, int tag: @jsdoc_tag ref, varchar(900) message: string ref, varchar(900) tostring: string ref);
+
+@dataflownode = @expr | @function_decl_stmt | @class_decl_stmt | @namespace_declaration | @enum_declaration | @property;
+
+@optionalchainable = @call_expr | @propaccess;
+
+isOptionalChaining(int id: @optionalchainable ref);
+
+/**
+ * The time taken for the extraction of a file.
+ * This table contains non-deterministic content.
+ *
+ * The sum of the `time` column for each (`file`, `timerKind`) pair
+ * is the total time taken for extraction of `file`.  The `extractionPhase`
+ * column provides a granular view of the extraction time of the file.
+ */
+extraction_time(
+  int file : @file ref,
+  // see `com.semmle.js.extractor.ExtractionMetrics.ExtractionPhase`.
+  int extractionPhase: int ref,
+  // 0 for the elapsed CPU time in nanoseconds, 1 for the elapsed wallclock time in nanoseconds
+  int timerKind: int ref,
+  float time: float ref
+)
+
+/**
+* Non-timing related data for the extraction of a single file.
+* This table contains non-deterministic content.
+*/
+extraction_data(
+  int file : @file ref,
+  // the absolute path to the cache file
+  varchar(900) cacheFile: string ref,
+  boolean fromCache: boolean ref,
+  int length: int ref
+)
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error;
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+/*- Configuration files with key value pairs -*/
+
+configs(
+  unique int id: @config
+);
+
+configNames(
+  unique int id: @configName,
+  int config: @config ref,
+  string name: string ref
+);
+
+configValues(
+  unique int id: @configValue,
+  int config: @config ref,
+  string value: string ref
+);
+
+configLocations(
+  int locatable: @configLocatable ref,
+  int location: @location_default ref
+);
+
+@configLocatable = @config | @configName | @configValue;
+
+/*- Database metadata -*/
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+overlayChangedFiles(
+  string path: string ref
+);
diff --git a/javascript/downgrades/80b2bc24189307c5fd178dc2da95b45bcdb117f7/upgrade.properties b/javascript/downgrades/80b2bc24189307c5fd178dc2da95b45bcdb117f7/upgrade.properties
new file mode 100644
index 00000000000..6ebac3d9a45
--- /dev/null
+++ b/javascript/downgrades/80b2bc24189307c5fd178dc2da95b45bcdb117f7/upgrade.properties
@@ -0,0 +1,4 @@
+description: add support for deferred imports
+compatibility: partial
+
+has_defer_keyword.rel: delete
diff --git a/javascript/extractor/lib/typescript/package-lock.json b/javascript/extractor/lib/typescript/package-lock.json
index 389cc1d2a5b..68923719ff8 100644
--- a/javascript/extractor/lib/typescript/package-lock.json
+++ b/javascript/extractor/lib/typescript/package-lock.json
@@ -6,24 +6,25 @@
         "": {
             "name": "typescript-parser-wrapper",
             "dependencies": {
-                "typescript": "^5.8.2"
+                "typescript": "5.9"
             },
             "devDependencies": {
-                "@types/node": "18.15.3"
+                "@types/node": "^24.3.1"
             }
         },
         "node_modules/@types/node": {
-            "version": "18.15.3",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.3.tgz",
-            "integrity": "sha512-p6ua9zBxz5otCmbpb5D3U4B5Nanw6Pk3PPyX05xnxbB/fRv71N7CPmORg7uAD5P70T0xmx1pzAx/FUfa5X+3cw==",
+            "version": "24.3.1",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-24.3.1.tgz",
+            "integrity": "sha512-3vXmQDXy+woz+gnrTvuvNrPzekOi+Ds0ReMxw0LzBiK3a+1k0kQn9f2NWk+lgD4rJehFUmYy2gMhJ2ZI+7YP9g==",
             "dev": true,
-            "license": "MIT"
+            "dependencies": {
+                "undici-types": "~7.10.0"
+            }
         },
         "node_modules/typescript": {
-            "version": "5.8.2",
-            "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.2.tgz",
-            "integrity": "sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ==",
-            "license": "Apache-2.0",
+            "version": "5.9.2",
+            "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.2.tgz",
+            "integrity": "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==",
             "bin": {
                 "tsc": "bin/tsc",
                 "tsserver": "bin/tsserver"
@@ -31,6 +32,12 @@
             "engines": {
                 "node": ">=14.17"
             }
+        },
+        "node_modules/undici-types": {
+            "version": "7.10.0",
+            "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.10.0.tgz",
+            "integrity": "sha512-t5Fy/nfn+14LuOc2KNYg75vZqClpAiqscVvMygNnlsHBFpSXdJaYtXMcdNLpl/Qvc3P2cB3s6lOV51nqsFq4ag==",
+            "dev": true
         }
     }
 }
diff --git a/javascript/extractor/lib/typescript/package.json b/javascript/extractor/lib/typescript/package.json
index 7e0c5fd160d..f23f197e870 100644
--- a/javascript/extractor/lib/typescript/package.json
+++ b/javascript/extractor/lib/typescript/package.json
@@ -2,7 +2,7 @@
     "name": "typescript-parser-wrapper",
     "private": true,
     "dependencies": {
-        "typescript": "^5.8.2"
+        "typescript": "5.9"
     },
     "scripts": {
         "build": "tsc --project tsconfig.json",
@@ -12,6 +12,6 @@
         "watch": "tsc -p . -w --sourceMap"
     },
     "devDependencies": {
-        "@types/node": "18.15.3"
+        "@types/node": "^24.3.1"
     }
 }
diff --git a/javascript/extractor/lib/typescript/src/main.ts b/javascript/extractor/lib/typescript/src/main.ts
index aa69642e04b..0630213c743 100644
--- a/javascript/extractor/lib/typescript/src/main.ts
+++ b/javascript/extractor/lib/typescript/src/main.ts
@@ -267,6 +267,7 @@ const astProperties: string[] = [
     "parameterName",
     "parameters",
     "parseDiagnostics",
+    "phaseModifier",
     "properties",
     "propertyName",
     "qualifier",
diff --git a/javascript/extractor/src/com/semmle/jcorn/Parser.java b/javascript/extractor/src/com/semmle/jcorn/Parser.java
index 9c2eeb9e241..63f49e14891 100644
--- a/javascript/extractor/src/com/semmle/jcorn/Parser.java
+++ b/javascript/extractor/src/com/semmle/jcorn/Parser.java
@@ -61,6 +61,7 @@ import com.semmle.js.ast.IfStatement;
 import com.semmle.js.ast.ImportDeclaration;
 import com.semmle.js.ast.ImportDefaultSpecifier;
 import com.semmle.js.ast.ImportNamespaceSpecifier;
+import com.semmle.js.ast.ImportPhaseModifier;
 import com.semmle.js.ast.ImportSpecifier;
 import com.semmle.js.ast.LabeledStatement;
 import com.semmle.js.ast.Literal;
@@ -3587,6 +3588,7 @@ public class Parser {
   }
 
   protected ImportDeclaration parseImportRest(SourceLocation loc) {
+    ImportPhaseModifier[] phaseModifier = { ImportPhaseModifier.NONE };
     List<ImportSpecifier> specifiers;
     Literal source;
     // import '...'
@@ -3594,27 +3596,32 @@ public class Parser {
       specifiers = new ArrayList<ImportSpecifier>();
       source = (Literal) this.parseExprAtom(null);
     } else {
-      specifiers = this.parseImportSpecifiers();
+      specifiers = this.parseImportSpecifiers(phaseModifier);
       this.expectContextual("from");
       if (this.type != TokenType.string) this.unexpected();
       source = (Literal) this.parseExprAtom(null);
     }
     Expression attributes = this.parseImportOrExportAttributesAndSemicolon();
     if (specifiers == null) return null;
-    return this.finishNode(new ImportDeclaration(loc, specifiers, source, attributes));
+    return this.finishNode(new ImportDeclaration(loc, specifiers, source, attributes, phaseModifier[0]));
   }
 
   // Parses a comma-separated list of module imports.
-  protected List<ImportSpecifier> parseImportSpecifiers() {
+  protected List<ImportSpecifier> parseImportSpecifiers(ImportPhaseModifier[] phaseModifier) {
     List<ImportSpecifier> nodes = new ArrayList<ImportSpecifier>();
     boolean first = true;
     if (this.type == TokenType.name) {
       // import defaultObj, { x, y as z } from '...'
       SourceLocation loc = new SourceLocation(this.startLoc);
       Identifier local = this.parseIdent(false);
-      this.checkLVal(local, true, null);
-      nodes.add(this.finishNode(new ImportDefaultSpecifier(loc, local)));
-      if (!this.eat(TokenType.comma)) return nodes;
+      // Parse `import defer *` as the beginning of a deferred import, instead of a default import specifier
+      if (this.type == TokenType.star && local.getName().equals("defer")) {
+        phaseModifier[0] = ImportPhaseModifier.DEFER;
+      } else {
+        this.checkLVal(local, true, null);
+        nodes.add(this.finishNode(new ImportDefaultSpecifier(loc, local)));
+        if (!this.eat(TokenType.comma)) return nodes;
+      }
     }
     if (this.type == TokenType.star) {
       SourceLocation loc = new SourceLocation(this.startLoc);
@@ -3647,7 +3654,7 @@ public class Parser {
     if (this.type == TokenType.string) {
       // Arbitrary Module Namespace Identifiers
       // e.g. `import { "Foo::new" as Foo_new } from "./foo.wasm"`
-      Expression string = this.parseExprAtom(null);    
+      Expression string = this.parseExprAtom(null);
       String str = ((Literal)string).getStringValue();
       imported = this.finishNode(new Identifier(loc, str));
       // only makes sense if there is a local identifier
diff --git a/javascript/extractor/src/com/semmle/jcorn/flow/FlowParser.java b/javascript/extractor/src/com/semmle/jcorn/flow/FlowParser.java
index 1213c15d99f..cb2dad0f978 100644
--- a/javascript/extractor/src/com/semmle/jcorn/flow/FlowParser.java
+++ b/javascript/extractor/src/com/semmle/jcorn/flow/FlowParser.java
@@ -14,6 +14,7 @@ import com.semmle.js.ast.Expression;
 import com.semmle.js.ast.ExpressionStatement;
 import com.semmle.js.ast.FieldDefinition;
 import com.semmle.js.ast.Identifier;
+import com.semmle.js.ast.ImportPhaseModifier;
 import com.semmle.js.ast.ImportSpecifier;
 import com.semmle.js.ast.Literal;
 import com.semmle.js.ast.MethodDefinition;
@@ -1064,13 +1065,13 @@ public class FlowParser extends ESNextParser {
   }
 
   @Override
-  protected List<ImportSpecifier> parseImportSpecifiers() {
+  protected List<ImportSpecifier> parseImportSpecifiers(ImportPhaseModifier[] phaseModifier) {
     String kind = null;
     if (flow()) {
       kind = flowParseImportSpecifiers();
     }
 
-    List<ImportSpecifier> specs = super.parseImportSpecifiers();
+    List<ImportSpecifier> specs = super.parseImportSpecifiers(phaseModifier);
     if (kind != null || specs.isEmpty()) return null;
     return specs;
   }
diff --git a/javascript/extractor/src/com/semmle/js/ast/ImportDeclaration.java b/javascript/extractor/src/com/semmle/js/ast/ImportDeclaration.java
index e672afcb471..86f8743b9e4 100644
--- a/javascript/extractor/src/com/semmle/js/ast/ImportDeclaration.java
+++ b/javascript/extractor/src/com/semmle/js/ast/ImportDeclaration.java
@@ -26,11 +26,11 @@ public class ImportDeclaration extends Statement implements INodeWithSymbol {
 
   private int symbol = -1;
 
-  private boolean hasTypeKeyword;
+  private ImportPhaseModifier phaseModifier;
 
   public ImportDeclaration(
       SourceLocation loc, List<ImportSpecifier> specifiers, Literal source, Expression attributes) {
-    this(loc, specifiers, source, attributes, false);
+    this(loc, specifiers, source, attributes, ImportPhaseModifier.NONE);
   }
 
   public ImportDeclaration(
@@ -38,12 +38,12 @@ public class ImportDeclaration extends Statement implements INodeWithSymbol {
       List<ImportSpecifier> specifiers,
       Literal source,
       Expression attributes,
-      boolean hasTypeKeyword) {
+      ImportPhaseModifier phaseModifier) {
     super("ImportDeclaration", loc);
     this.specifiers = specifiers;
     this.source = source;
     this.attributes = attributes;
-    this.hasTypeKeyword = hasTypeKeyword;
+    this.phaseModifier = phaseModifier;
   }
 
   public Literal getSource() {
@@ -79,6 +79,15 @@ public class ImportDeclaration extends Statement implements INodeWithSymbol {
 
   /** Returns true if this is an <code>import type</code> declaration. */
   public boolean hasTypeKeyword() {
-    return hasTypeKeyword;
+    return phaseModifier == ImportPhaseModifier.TYPE;
+  }
+
+  /** Returns true if this is an <code>import defer</code> declaration. */
+  public boolean hasDeferKeyword() {
+    return phaseModifier == ImportPhaseModifier.DEFER;
+  }
+
+  public ImportPhaseModifier getPhaseModifier() {
+    return phaseModifier;
   }
 }
diff --git a/javascript/extractor/src/com/semmle/js/ast/ImportPhaseModifier.java b/javascript/extractor/src/com/semmle/js/ast/ImportPhaseModifier.java
new file mode 100644
index 00000000000..40777b23b60
--- /dev/null
+++ b/javascript/extractor/src/com/semmle/js/ast/ImportPhaseModifier.java
@@ -0,0 +1,10 @@
+package com.semmle.js.ast;
+
+/**
+ * A keyword that may appear on import declarations.
+ */
+public enum ImportPhaseModifier {
+    NONE,
+    DEFER,
+    TYPE,
+}
diff --git a/javascript/extractor/src/com/semmle/js/ast/NodeCopier.java b/javascript/extractor/src/com/semmle/js/ast/NodeCopier.java
index c216e0c1185..ae5676950df 100644
--- a/javascript/extractor/src/com/semmle/js/ast/NodeCopier.java
+++ b/javascript/extractor/src/com/semmle/js/ast/NodeCopier.java
@@ -564,7 +564,7 @@ public class NodeCopier implements Visitor<Void, INode> {
         copy(nd.getSpecifiers()),
         copy(nd.getSource()),
         copy(nd.getAttributes()),
-        nd.hasTypeKeyword());
+        nd.getPhaseModifier());
   }
 
   @Override
diff --git a/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java b/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java
index 5625a9f1211..a2f006e3239 100644
--- a/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java
+++ b/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java
@@ -1833,6 +1833,9 @@ public class ASTExtractor {
       if (nd.hasTypeKeyword()) {
         trapwriter.addTuple("has_type_keyword", lbl);
       }
+      if (nd.hasDeferKeyword()) {
+        trapwriter.addTuple("has_defer_keyword", lbl);
+      }
       return lbl;
     }
 
diff --git a/javascript/extractor/src/com/semmle/js/extractor/AutoBuild.java b/javascript/extractor/src/com/semmle/js/extractor/AutoBuild.java
index 08dac06c4d9..416fa237e97 100644
--- a/javascript/extractor/src/com/semmle/js/extractor/AutoBuild.java
+++ b/javascript/extractor/src/com/semmle/js/extractor/AutoBuild.java
@@ -465,10 +465,11 @@ public class AutoBuild {
       try {
         CompletableFuture<?> sourceFuture = extractSource();
         sourceFuture.join(); // wait for source extraction to complete
-        if (hasSeenCode()) { // don't bother with the externs if no code was seen
+        if (hasSeenCode() && !isOverlayChangeMode()) { // don't bother with the externs if no code was seen or in overlay change mode
           extractExterns();
         }
         extractXml();
+        writeOverlayMetadata();
       } catch (OutOfMemoryError oom) {
         System.err.println("Out of memory while extracting the project.");
         return 137; // the CodeQL CLI will interpret this as an out-of-memory error
@@ -488,27 +489,44 @@ public class AutoBuild {
         diagnosticsToClose.forEach(DiagnosticWriter::close);
       }
 
-      if (!hasSeenCode()) {
+      // Fail extraction if no relevant files were found.
+      boolean seenRelevantFiles = EnvironmentVariables.isActionsExtractor()
+        ? seenFiles // assume all files are relevant for Actions extractor
+        : hasSeenCode();
+      if (!seenRelevantFiles) {
         if (seenFiles) {
           warn("Only found JavaScript or TypeScript files that were empty or contained syntax errors.");
         } else {
           warn("No JavaScript or TypeScript code found.");
         }
-        // ensuring that the finalize steps detects that no code was seen.
+        // Ensuring that the finalize steps detects that no code was seen.
+        // This is necessary to ensure we don't produce an overlay-base database without externs.
         Path srcFolder = Paths.get(EnvironmentVariables.getWipDatabase(), "src");
         try {
-          // Non-recursive delete because "src/" should be empty.
-          FileUtil8.delete(srcFolder);
+          FileUtil8.recursiveDelete(srcFolder);
         } catch (NoSuchFileException e) {
           Exceptions.ignore(e, "the directory did not exist");
-        } catch (DirectoryNotEmptyException e) {
-          Exceptions.ignore(e, "just leave the directory if it is not empty");
         }
         return 0;
       }
     return 0;
   }
 
+  private void writeOverlayMetadata() {
+    String file = getEnvVar("CODEQL_EXTRACTOR_JAVASCRIPT_OVERLAY_BASE_METADATA_OUT");
+    if (file == null) {
+      // no overlay metadata file specified, so nothing to do
+      return;
+    }
+    // Write an empty string to the file as we currently have no metadata to emit.
+    // The file must be created for the database to recognized as an overlay base.
+    try {
+      Files.writeString(Paths.get(file), "", StandardCharsets.UTF_8);
+    } catch (IOException e) {
+      throw new ResourceError("Could not write overlay metadata to " + file, e);
+    }
+  }
+
   /**
    * A kind of error that can happen during extraction of JavaScript or TypeScript
    * code.
@@ -734,6 +752,17 @@ public class AutoBuild {
     List<Path> tsconfigFiles = new ArrayList<>();
     findFilesToExtract(defaultExtractor, filesToExtract, tsconfigFiles);
 
+    OverlayChanges overlay = getOverlayChanges();
+    if (overlay != null) {
+      Set<Path> changedFiles = overlay.changes.stream()
+          .map(file -> Paths.get(file).toAbsolutePath())
+          .collect(Collectors.toSet());
+      int before = filesToExtract.size();
+      filesToExtract.retainAll(changedFiles);
+      int after = filesToExtract.size();
+      System.out.println("Overlay filter removed " + (before - after) + " out of " + before + " files from extraction.");
+    }
+
     tsconfigFiles = tsconfigFiles.stream()
          .sorted(PATH_ORDERING)
          .collect(Collectors.toList());
@@ -1338,6 +1367,18 @@ protected DependencyInstallationResult preparePackagesAndDependencies(Set<Path>
     }
   }
 
+  private boolean isOverlayChangeMode() {
+    return getEnvVar("CODEQL_EXTRACTOR_JAVASCRIPT_OVERLAY_CHANGES") != null;
+  }
+
+  private OverlayChanges getOverlayChanges() throws IOException {
+    String jsonFile = getEnvVar("CODEQL_EXTRACTOR_JAVASCRIPT_OVERLAY_CHANGES");
+    if (jsonFile == null) {
+      return null;
+    }
+    return new Gson().fromJson(Files.newBufferedReader(Paths.get(jsonFile)), OverlayChanges.class);
+  }
+
   public static void main(String[] args) {
     try {
       System.exit(new AutoBuild().run());
diff --git a/javascript/extractor/src/com/semmle/js/extractor/EnvironmentVariables.java b/javascript/extractor/src/com/semmle/js/extractor/EnvironmentVariables.java
index 39dfa70b285..f2ac4227589 100644
--- a/javascript/extractor/src/com/semmle/js/extractor/EnvironmentVariables.java
+++ b/javascript/extractor/src/com/semmle/js/extractor/EnvironmentVariables.java
@@ -18,6 +18,9 @@ public class EnvironmentVariables {
   public static final String CODEQL_EXTRACTOR_JAVASCRIPT_WIP_DATABASE_ENV_VAR =
       "CODEQL_EXTRACTOR_JAVASCRIPT_WIP_DATABASE";
 
+  public static final String CODEQL_EXTRACTOR_ACTIONS_WIP_DATABASE_ENV_VAR =
+      "CODEQL_EXTRACTOR_ACTIONS_WIP_DATABASE";
+
   public static final String CODEQL_DIST_ENV_VAR = "CODEQL_DIST";
 
   /**
@@ -94,4 +97,8 @@ public class EnvironmentVariables {
   public static String getWipDatabase() {
     return Env.systemEnv().getNonEmpty(CODEQL_EXTRACTOR_JAVASCRIPT_WIP_DATABASE_ENV_VAR);
   }
+
+  public static boolean isActionsExtractor() {
+    return Env.systemEnv().getNonEmpty(CODEQL_EXTRACTOR_ACTIONS_WIP_DATABASE_ENV_VAR) != null;
+  }
 }
diff --git a/javascript/extractor/src/com/semmle/js/extractor/OverlayChanges.java b/javascript/extractor/src/com/semmle/js/extractor/OverlayChanges.java
new file mode 100644
index 00000000000..25cae238920
--- /dev/null
+++ b/javascript/extractor/src/com/semmle/js/extractor/OverlayChanges.java
@@ -0,0 +1,7 @@
+package com.semmle.js.extractor;
+
+import java.util.List;
+
+public class OverlayChanges {
+    public List<String> changes;
+}
diff --git a/javascript/extractor/src/com/semmle/ts/extractor/TypeScriptASTConverter.java b/javascript/extractor/src/com/semmle/ts/extractor/TypeScriptASTConverter.java
index a3e031845a2..0c013f906b2 100644
--- a/javascript/extractor/src/com/semmle/ts/extractor/TypeScriptASTConverter.java
+++ b/javascript/extractor/src/com/semmle/ts/extractor/TypeScriptASTConverter.java
@@ -52,6 +52,7 @@ import com.semmle.js.ast.IfStatement;
 import com.semmle.js.ast.ImportDeclaration;
 import com.semmle.js.ast.ImportDefaultSpecifier;
 import com.semmle.js.ast.ImportNamespaceSpecifier;
+import com.semmle.js.ast.ImportPhaseModifier;
 import com.semmle.js.ast.ImportSpecifier;
 import com.semmle.js.ast.InvokeExpression;
 import com.semmle.js.ast.LabeledStatement;
@@ -1404,7 +1405,7 @@ public class TypeScriptASTConverter {
     Literal src = tryConvertChild(node, "moduleSpecifier", Literal.class);
     Expression attributes = convertChild(node, "attributes");
     List<ImportSpecifier> specifiers = new ArrayList<>();
-    boolean hasTypeKeyword = false;
+    ImportPhaseModifier phaseModifier = ImportPhaseModifier.NONE;
     if (hasChild(node, "importClause")) {
       JsonObject importClause = node.get("importClause").getAsJsonObject();
       if (hasChild(importClause, "name")) {
@@ -1418,10 +1419,22 @@ public class TypeScriptASTConverter {
           specifiers.addAll(convertChildren(namedBindings, "elements"));
         }
       }
-      hasTypeKeyword = importClause.get("isTypeOnly").getAsBoolean();
+      if (hasChild(importClause, "phaseModifier")) {
+        String name = metadata.getSyntaxKindName(importClause.get("phaseModifier").getAsInt());
+        switch (name) {
+          case "DeferKeyword": {
+            phaseModifier = ImportPhaseModifier.DEFER;
+            break;
+          }
+          case "TypeKeyword": {
+            phaseModifier = ImportPhaseModifier.TYPE;
+            break;
+          }
+        }
+      }
     }
     ImportDeclaration importDecl =
-        new ImportDeclaration(loc, specifiers, src, attributes, hasTypeKeyword);
+        new ImportDeclaration(loc, specifiers, src, attributes, phaseModifier);
     attachSymbolInformation(importDecl, node);
     return importDecl;
   }
diff --git a/javascript/ql/integration-tests/diagnostics/syntax-error/good.js b/javascript/ql/integration-tests/diagnostics/syntax-error/good.js
new file mode 100644
index 00000000000..7b0bfcf5c25
--- /dev/null
+++ b/javascript/ql/integration-tests/diagnostics/syntax-error/good.js
@@ -0,0 +1,2 @@
+// Ensure at least one file without errors is included, as extraction fails otherwise.
+console.log("Hello")
diff --git a/javascript/ql/integration-tests/query-suite/javascript-code-quality-extended.qls.expected b/javascript/ql/integration-tests/query-suite/javascript-code-quality-extended.qls.expected
index 6894a776b37..c9407089189 100644
--- a/javascript/ql/integration-tests/query-suite/javascript-code-quality-extended.qls.expected
+++ b/javascript/ql/integration-tests/query-suite/javascript-code-quality-extended.qls.expected
@@ -4,6 +4,9 @@ ql/javascript/ql/src/AngularJS/IncompatibleService.ql
 ql/javascript/ql/src/AngularJS/MissingExplicitInjection.ql
 ql/javascript/ql/src/AngularJS/RepeatedInjection.ql
 ql/javascript/ql/src/AngularJS/UseNgSrc.ql
+ql/javascript/ql/src/Comments/CommentedOutCode.ql
+ql/javascript/ql/src/Comments/TodoComments.ql
+ql/javascript/ql/src/DOM/Alert.ql
 ql/javascript/ql/src/DOM/DuplicateAttributes.ql
 ql/javascript/ql/src/DOM/MalformedIdAttribute.ql
 ql/javascript/ql/src/DOM/PseudoEval.ql
@@ -20,11 +23,13 @@ ql/javascript/ql/src/Declarations/IneffectiveParameterType.ql
 ql/javascript/ql/src/Declarations/MissingThisQualifier.ql
 ql/javascript/ql/src/Declarations/MissingVarDecl.ql
 ql/javascript/ql/src/Declarations/MixedStaticInstanceThisAccess.ql
+ql/javascript/ql/src/Declarations/RedeclaredVariable.ql
 ql/javascript/ql/src/Declarations/SuspiciousMethodNameDeclaration.ql
 ql/javascript/ql/src/Declarations/TemporalDeadZone.ql
 ql/javascript/ql/src/Declarations/UniqueParameterNames.ql
 ql/javascript/ql/src/Declarations/UniquePropertyNames.ql
 ql/javascript/ql/src/Declarations/UnreachableMethodOverloads.ql
+ql/javascript/ql/src/Declarations/UnusedParameter.ql
 ql/javascript/ql/src/Declarations/UnusedVariable.ql
 ql/javascript/ql/src/Expressions/ComparisonWithNaN.ql
 ql/javascript/ql/src/Expressions/DuplicateCondition.ql
@@ -48,9 +53,12 @@ ql/javascript/ql/src/Expressions/UnclearOperatorPrecedence.ql
 ql/javascript/ql/src/Expressions/UnknownDirective.ql
 ql/javascript/ql/src/Expressions/UnneededDefensiveProgramming.ql
 ql/javascript/ql/src/Expressions/WhitespaceContradictsPrecedence.ql
+ql/javascript/ql/src/LanguageFeatures/ArgumentsCallerCallee.ql
 ql/javascript/ql/src/LanguageFeatures/BadTypeof.ql
 ql/javascript/ql/src/LanguageFeatures/ConditionalComments.ql
+ql/javascript/ql/src/LanguageFeatures/DebuggerStatement.ql
 ql/javascript/ql/src/LanguageFeatures/DeleteVar.ql
+ql/javascript/ql/src/LanguageFeatures/Eval.ql
 ql/javascript/ql/src/LanguageFeatures/ExpressionClosures.ql
 ql/javascript/ql/src/LanguageFeatures/ForInComprehensionBlocks.ql
 ql/javascript/ql/src/LanguageFeatures/IllegalInvocation.ql
@@ -63,7 +71,6 @@ ql/javascript/ql/src/LanguageFeatures/SemicolonInsertion.ql
 ql/javascript/ql/src/LanguageFeatures/SetterReturn.ql
 ql/javascript/ql/src/LanguageFeatures/SpuriousArguments.ql
 ql/javascript/ql/src/LanguageFeatures/StrictModeCallStackIntrospection.ql
-ql/javascript/ql/src/LanguageFeatures/SyntaxError.ql
 ql/javascript/ql/src/LanguageFeatures/TemplateSyntaxInStringLiteral.ql
 ql/javascript/ql/src/LanguageFeatures/ThisBeforeSuper.ql
 ql/javascript/ql/src/LanguageFeatures/UnusedIndexVariable.ql
@@ -71,6 +78,7 @@ ql/javascript/ql/src/LanguageFeatures/WithStatement.ql
 ql/javascript/ql/src/LanguageFeatures/YieldInNonGenerator.ql
 ql/javascript/ql/src/NodeJS/InvalidExport.ql
 ql/javascript/ql/src/NodeJS/MissingExports.ql
+ql/javascript/ql/src/Performance/ReassignParameterAndUseArguments.ql
 ql/javascript/ql/src/Quality/UnhandledErrorInStreamPipeline.ql
 ql/javascript/ql/src/React/DirectStateMutation.ql
 ql/javascript/ql/src/React/InconsistentStateUpdate.ql
@@ -78,6 +86,7 @@ ql/javascript/ql/src/React/UnsupportedStateUpdateInLifecycleMethod.ql
 ql/javascript/ql/src/React/UnusedOrUndefinedStateProperty.ql
 ql/javascript/ql/src/RegExp/BackrefBeforeGroup.ql
 ql/javascript/ql/src/RegExp/BackrefIntoNegativeLookahead.ql
+ql/javascript/ql/src/RegExp/BackspaceEscape.ql
 ql/javascript/ql/src/RegExp/DuplicateCharacterInCharacterClass.ql
 ql/javascript/ql/src/RegExp/EmptyCharacterClass.ql
 ql/javascript/ql/src/RegExp/RegExpAlwaysMatches.ql
@@ -86,7 +95,9 @@ ql/javascript/ql/src/RegExp/UnmatchableCaret.ql
 ql/javascript/ql/src/RegExp/UnmatchableDollar.ql
 ql/javascript/ql/src/Statements/DanglingElse.ql
 ql/javascript/ql/src/Statements/IgnoreArrayResult.ql
+ql/javascript/ql/src/Statements/ImplicitReturn.ql
 ql/javascript/ql/src/Statements/InconsistentLoopOrientation.ql
+ql/javascript/ql/src/Statements/InconsistentReturn.ql
 ql/javascript/ql/src/Statements/LabelInCase.ql
 ql/javascript/ql/src/Statements/LoopIterationSkippedDueToShifting.ql
 ql/javascript/ql/src/Statements/MisleadingIndentationAfterControlStmt.ql
diff --git a/javascript/ql/integration-tests/query-suite/javascript-code-quality.qls.expected b/javascript/ql/integration-tests/query-suite/javascript-code-quality.qls.expected
index 6894a776b37..b550c2c8249 100644
--- a/javascript/ql/integration-tests/query-suite/javascript-code-quality.qls.expected
+++ b/javascript/ql/integration-tests/query-suite/javascript-code-quality.qls.expected
@@ -63,7 +63,6 @@ ql/javascript/ql/src/LanguageFeatures/SemicolonInsertion.ql
 ql/javascript/ql/src/LanguageFeatures/SetterReturn.ql
 ql/javascript/ql/src/LanguageFeatures/SpuriousArguments.ql
 ql/javascript/ql/src/LanguageFeatures/StrictModeCallStackIntrospection.ql
-ql/javascript/ql/src/LanguageFeatures/SyntaxError.ql
 ql/javascript/ql/src/LanguageFeatures/TemplateSyntaxInStringLiteral.ql
 ql/javascript/ql/src/LanguageFeatures/ThisBeforeSuper.ql
 ql/javascript/ql/src/LanguageFeatures/UnusedIndexVariable.ql
diff --git a/javascript/ql/integration-tests/query-suite/javascript-code-scanning.qls.expected b/javascript/ql/integration-tests/query-suite/javascript-code-scanning.qls.expected
index 652ac0ebc1b..0c417e661c7 100644
--- a/javascript/ql/integration-tests/query-suite/javascript-code-scanning.qls.expected
+++ b/javascript/ql/integration-tests/query-suite/javascript-code-scanning.qls.expected
@@ -83,5 +83,6 @@ ql/javascript/ql/src/Security/CWE-915/PrototypePollutingFunction.ql
 ql/javascript/ql/src/Security/CWE-915/PrototypePollutingMergeCall.ql
 ql/javascript/ql/src/Security/CWE-916/InsufficientPasswordHash.ql
 ql/javascript/ql/src/Security/CWE-918/RequestForgery.ql
+ql/javascript/ql/src/Security/CWE-942/CorsPermissiveConfiguration.ql
 ql/javascript/ql/src/Summary/LinesOfCode.ql
 ql/javascript/ql/src/Summary/LinesOfUserCode.ql
diff --git a/javascript/ql/integration-tests/query-suite/javascript-security-and-quality.qls.expected b/javascript/ql/integration-tests/query-suite/javascript-security-and-quality.qls.expected
index dd587768308..f87cd2bf505 100644
--- a/javascript/ql/integration-tests/query-suite/javascript-security-and-quality.qls.expected
+++ b/javascript/ql/integration-tests/query-suite/javascript-security-and-quality.qls.expected
@@ -184,6 +184,7 @@ ql/javascript/ql/src/Security/CWE-915/PrototypePollutingMergeCall.ql
 ql/javascript/ql/src/Security/CWE-916/InsufficientPasswordHash.ql
 ql/javascript/ql/src/Security/CWE-918/ClientSideRequestForgery.ql
 ql/javascript/ql/src/Security/CWE-918/RequestForgery.ql
+ql/javascript/ql/src/Security/CWE-942/CorsPermissiveConfiguration.ql
 ql/javascript/ql/src/Statements/DanglingElse.ql
 ql/javascript/ql/src/Statements/IgnoreArrayResult.ql
 ql/javascript/ql/src/Statements/InconsistentLoopOrientation.ql
diff --git a/javascript/ql/integration-tests/query-suite/javascript-security-extended.qls.expected b/javascript/ql/integration-tests/query-suite/javascript-security-extended.qls.expected
index 9b7cfd22ed6..ac5e0e2c498 100644
--- a/javascript/ql/integration-tests/query-suite/javascript-security-extended.qls.expected
+++ b/javascript/ql/integration-tests/query-suite/javascript-security-extended.qls.expected
@@ -99,5 +99,6 @@ ql/javascript/ql/src/Security/CWE-915/PrototypePollutingMergeCall.ql
 ql/javascript/ql/src/Security/CWE-916/InsufficientPasswordHash.ql
 ql/javascript/ql/src/Security/CWE-918/ClientSideRequestForgery.ql
 ql/javascript/ql/src/Security/CWE-918/RequestForgery.ql
+ql/javascript/ql/src/Security/CWE-942/CorsPermissiveConfiguration.ql
 ql/javascript/ql/src/Summary/LinesOfCode.ql
 ql/javascript/ql/src/Summary/LinesOfUserCode.ql
diff --git a/javascript/ql/integration-tests/query-suite/not_included_in_qls.expected b/javascript/ql/integration-tests/query-suite/not_included_in_qls.expected
index 1b119f60c75..46317e8800f 100644
--- a/javascript/ql/integration-tests/query-suite/not_included_in_qls.expected
+++ b/javascript/ql/integration-tests/query-suite/not_included_in_qls.expected
@@ -1,18 +1,13 @@
 ql/javascript/ql/src/AlertSuppression.ql
 ql/javascript/ql/src/AngularJS/DeadAngularJSEventListener.ql
 ql/javascript/ql/src/AngularJS/UnusedAngularDependency.ql
-ql/javascript/ql/src/Comments/CommentedOutCode.ql
 ql/javascript/ql/src/Comments/FCommentedOutCode.ql
-ql/javascript/ql/src/Comments/TodoComments.ql
-ql/javascript/ql/src/DOM/Alert.ql
 ql/javascript/ql/src/DOM/AmbiguousIdAttribute.ql
 ql/javascript/ql/src/DOM/ConflictingAttributes.ql
 ql/javascript/ql/src/DOM/TargetBlank.ql
 ql/javascript/ql/src/Declarations/DeadStoreOfGlobal.ql
-ql/javascript/ql/src/Declarations/RedeclaredVariable.ql
 ql/javascript/ql/src/Declarations/TooManyParameters.ql
 ql/javascript/ql/src/Declarations/UnstableCyclicImport.ql
-ql/javascript/ql/src/Declarations/UnusedParameter.ql
 ql/javascript/ql/src/Declarations/UnusedProperty.ql
 ql/javascript/ql/src/Electron/EnablingNodeIntegration.ql
 ql/javascript/ql/src/Expressions/BitwiseSignCheck.ql
@@ -21,10 +16,7 @@ ql/javascript/ql/src/Expressions/MisspelledIdentifier.ql
 ql/javascript/ql/src/JSDoc/BadParamTag.ql
 ql/javascript/ql/src/JSDoc/JSDocForNonExistentParameter.ql
 ql/javascript/ql/src/JSDoc/UndocumentedParameter.ql
-ql/javascript/ql/src/LanguageFeatures/ArgumentsCallerCallee.ql
-ql/javascript/ql/src/LanguageFeatures/DebuggerStatement.ql
 ql/javascript/ql/src/LanguageFeatures/EmptyArrayInit.ql
-ql/javascript/ql/src/LanguageFeatures/Eval.ql
 ql/javascript/ql/src/LanguageFeatures/JumpFromFinally.ql
 ql/javascript/ql/src/LanguageFeatures/SetterIgnoresParameter.ql
 ql/javascript/ql/src/LanguageFeatures/WrongExtensionJSON.ql
@@ -48,8 +40,6 @@ ql/javascript/ql/src/NodeJS/DubiousImport.ql
 ql/javascript/ql/src/NodeJS/UnresolvableImport.ql
 ql/javascript/ql/src/NodeJS/UnusedDependency.ql
 ql/javascript/ql/src/Performance/NonLocalForIn.ql
-ql/javascript/ql/src/Performance/ReassignParameterAndUseArguments.ql
-ql/javascript/ql/src/RegExp/BackspaceEscape.ql
 ql/javascript/ql/src/RegExp/MalformedRegExp.ql
 ql/javascript/ql/src/Security/CWE-020/ExternalAPIsUsedWithUntrustedData.ql
 ql/javascript/ql/src/Security/CWE-020/UntrustedDataToExternalAPI.ql
@@ -59,8 +49,6 @@ ql/javascript/ql/src/Security/CWE-798/HardcodedCredentials.ql
 ql/javascript/ql/src/Security/CWE-807/DifferentKindsComparisonBypass.ql
 ql/javascript/ql/src/Security/trest/test.ql
 ql/javascript/ql/src/Statements/EphemeralLoop.ql
-ql/javascript/ql/src/Statements/ImplicitReturn.ql
-ql/javascript/ql/src/Statements/InconsistentReturn.ql
 ql/javascript/ql/src/Statements/NestedLoopsSameVariable.ql
 ql/javascript/ql/src/Statements/ReturnOutsideFunction.ql
 ql/javascript/ql/src/Summary/TaintSinks.ql
@@ -75,7 +63,6 @@ ql/javascript/ql/src/experimental/Security/CWE-347/decodeJwtWithoutVerificationL
 ql/javascript/ql/src/experimental/Security/CWE-444/InsecureHttpParser.ql
 ql/javascript/ql/src/experimental/Security/CWE-522-DecompressionBombs/DecompressionBombs.ql
 ql/javascript/ql/src/experimental/Security/CWE-918/SSRF.ql
-ql/javascript/ql/src/experimental/Security/CWE-942/CorsPermissiveConfiguration.ql
 ql/javascript/ql/src/experimental/StandardLibrary/MultipleArgumentsToSetConstructor.ql
 ql/javascript/ql/src/experimental/heuristics/ql/src/Security/CWE-020/UntrustedDataToExternalAPI.ql
 ql/javascript/ql/src/experimental/heuristics/ql/src/Security/CWE-078/CommandInjection.ql
diff --git a/javascript/ql/lib/CHANGELOG.md b/javascript/ql/lib/CHANGELOG.md
index 93edd0d9f49..9f27fdae99c 100644
--- a/javascript/ql/lib/CHANGELOG.md
+++ b/javascript/ql/lib/CHANGELOG.md
@@ -1,3 +1,38 @@
+## 2.6.14
+
+No user-facing changes.
+
+## 2.6.13
+
+No user-facing changes.
+
+## 2.6.12
+
+### Minor Analysis Improvements
+
+* Added modeling of `GraphQLObjectType` resolver function parameters as remote sources.
+* Support for the [graphql](https://www.npmjs.com/package/graphql) library has been improved. Data flow from GraphQL query sources and variables to resolver function parameters is now tracked.
+* Added support for the `aws-sdk` and `@aws-sdk/client-dynamodb`, `@aws-sdk/client-athena`, `@aws-sdk/client-s3`, and `@aws-sdk/client-rds-data` packages.
+
+## 2.6.11
+
+### Minor Analysis Improvements
+
+* Added modeling for promisification libraries `@gar/promisify`, `es6-promisify`, `util.promisify`, `thenify-all`, `call-me-maybe`, `@google-cloud/promisify`, and `util-promisify`.
+* Data flow is now tracked through promisified user-defined functions. 
+
+## 2.6.10
+
+### Minor Analysis Improvements
+
+* Removed `libxmljs` as an XML bomb sink. The underlying libxml2 library now includes [entity reference loop detection](https://github.com/GNOME/libxml2/blob/0c948334a8f5c66d50e9f8992e62998017dc4fc6/NEWS#L905-L908) that prevents XML bomb attacks.
+
+## 2.6.9
+
+### Minor Analysis Improvements
+
+* Improved modeling of command-line argument parsing libraries [arg](https://www.npmjs.com/package/arg), [args](https://www.npmjs.com/package/args), [command-line-args](https://www.npmjs.com/package/command-line-args) and [commander](https://www.npmjs.com/package/commander)
+
 ## 2.6.8
 
 ### Minor Analysis Improvements
diff --git a/javascript/ql/lib/change-notes/released/2.6.10.md b/javascript/ql/lib/change-notes/released/2.6.10.md
new file mode 100644
index 00000000000..7b9859668cb
--- /dev/null
+++ b/javascript/ql/lib/change-notes/released/2.6.10.md
@@ -0,0 +1,5 @@
+## 2.6.10
+
+### Minor Analysis Improvements
+
+* Removed `libxmljs` as an XML bomb sink. The underlying libxml2 library now includes [entity reference loop detection](https://github.com/GNOME/libxml2/blob/0c948334a8f5c66d50e9f8992e62998017dc4fc6/NEWS#L905-L908) that prevents XML bomb attacks.
diff --git a/javascript/ql/lib/change-notes/released/2.6.11.md b/javascript/ql/lib/change-notes/released/2.6.11.md
new file mode 100644
index 00000000000..b9a47cae76c
--- /dev/null
+++ b/javascript/ql/lib/change-notes/released/2.6.11.md
@@ -0,0 +1,6 @@
+## 2.6.11
+
+### Minor Analysis Improvements
+
+* Added modeling for promisification libraries `@gar/promisify`, `es6-promisify`, `util.promisify`, `thenify-all`, `call-me-maybe`, `@google-cloud/promisify`, and `util-promisify`.
+* Data flow is now tracked through promisified user-defined functions. 
diff --git a/javascript/ql/lib/change-notes/released/2.6.12.md b/javascript/ql/lib/change-notes/released/2.6.12.md
new file mode 100644
index 00000000000..adc136621d8
--- /dev/null
+++ b/javascript/ql/lib/change-notes/released/2.6.12.md
@@ -0,0 +1,7 @@
+## 2.6.12
+
+### Minor Analysis Improvements
+
+* Added modeling of `GraphQLObjectType` resolver function parameters as remote sources.
+* Support for the [graphql](https://www.npmjs.com/package/graphql) library has been improved. Data flow from GraphQL query sources and variables to resolver function parameters is now tracked.
+* Added support for the `aws-sdk` and `@aws-sdk/client-dynamodb`, `@aws-sdk/client-athena`, `@aws-sdk/client-s3`, and `@aws-sdk/client-rds-data` packages.
diff --git a/javascript/ql/lib/change-notes/released/2.6.13.md b/javascript/ql/lib/change-notes/released/2.6.13.md
new file mode 100644
index 00000000000..475bfb69be9
--- /dev/null
+++ b/javascript/ql/lib/change-notes/released/2.6.13.md
@@ -0,0 +1,3 @@
+## 2.6.13
+
+No user-facing changes.
diff --git a/javascript/ql/lib/change-notes/released/2.6.14.md b/javascript/ql/lib/change-notes/released/2.6.14.md
new file mode 100644
index 00000000000..49a00b95efc
--- /dev/null
+++ b/javascript/ql/lib/change-notes/released/2.6.14.md
@@ -0,0 +1,3 @@
+## 2.6.14
+
+No user-facing changes.
diff --git a/javascript/ql/lib/change-notes/released/2.6.9.md b/javascript/ql/lib/change-notes/released/2.6.9.md
new file mode 100644
index 00000000000..6c80cc1db0d
--- /dev/null
+++ b/javascript/ql/lib/change-notes/released/2.6.9.md
@@ -0,0 +1,5 @@
+## 2.6.9
+
+### Minor Analysis Improvements
+
+* Improved modeling of command-line argument parsing libraries [arg](https://www.npmjs.com/package/arg), [args](https://www.npmjs.com/package/args), [command-line-args](https://www.npmjs.com/package/command-line-args) and [commander](https://www.npmjs.com/package/commander)
diff --git a/javascript/ql/lib/codeql-pack.release.yml b/javascript/ql/lib/codeql-pack.release.yml
index e3569f2b799..022aeff4e02 100644
--- a/javascript/ql/lib/codeql-pack.release.yml
+++ b/javascript/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.6.8
+lastReleaseVersion: 2.6.14
diff --git a/javascript/ql/lib/ext/apollo-server.model.yml b/javascript/ql/lib/ext/apollo-server.model.yml
index ffceb6a6d5a..aa9755265b2 100644
--- a/javascript/ql/lib/ext/apollo-server.model.yml
+++ b/javascript/ql/lib/ext/apollo-server.model.yml
@@ -5,6 +5,13 @@ extensions:
     data:
       - ["@apollo/server", "Member[ApolloServer,ApolloServerBase].Argument[0].AnyMember.AnyMember.AnyMember.Parameter[1]", "remote"]
 
+  - addsTo:
+      pack: codeql/javascript-all
+      extensible: sinkModel
+    data:
+      - ["@apollo/server", "Member[gql].Argument[0]", "sql-injection"]
+      - ["@apollo/server", "Member[ApolloServer,ApolloServerBase].Argument[0].Member[cors].Member[origin]", "cors-origin"]
+
   - addsTo:
       pack: codeql/javascript-all
       extensible: typeModel
@@ -13,3 +20,9 @@ extensions:
       - ["@apollo/server", "apollo-server-express", ""]
       - ["@apollo/server", "apollo-server-core", ""]
       - ["@apollo/server", "apollo-server", ""]
+      - ["@apollo/server", "@apollo/apollo-server-express", ""]
+      - ["@apollo/server", "apollo-server-express", ""]
+      - ["@apollo/server", "@apollo/server", ""]
+      - ["@apollo/server", "@apollo/apollo-server-core", ""]
+      - ["ApolloServer", "@apollo/server", "Member[ApolloServer]"]
+      - ["GraphQLApollo", "@apollo/server", "Member[gql]"]
diff --git a/javascript/ql/lib/ext/aws-sdk.model.yml b/javascript/ql/lib/ext/aws-sdk.model.yml
index eefa87fbe61..40fa4b8b703 100644
--- a/javascript/ql/lib/ext/aws-sdk.model.yml
+++ b/javascript/ql/lib/ext/aws-sdk.model.yml
@@ -1,8 +1,52 @@
 extensions:
+  - addsTo:
+      pack: codeql/javascript-all
+      extensible: typeModel
+    data:
+      - ["aws-sdk.Athena", "aws-sdk", "Member[Athena]"]
+      - ["aws-sdk.S3", "aws-sdk", "Member[S3]"]
+      - ["aws-sdk.RDSDataService", "aws-sdk", "Member[RDSDataService]"]
+      - ["aws-sdk.DynamoDB", "aws-sdk", "Member[DynamoDB]"]
+      - ["@aws-sdk/client.Client", "@aws-sdk/client-athena", "Member[AthenaClient]"]
+      - ["@aws-sdk/client.Client", "@aws-sdk/client-s3", "Member[S3Client]"]
+      - ["@aws-sdk/client.Client", "@aws-sdk/client-dynamodb", "Member[DynamoDBClient,DynamoDB]"]
+      - ["@aws-sdk/client.Client", "@aws-sdk/client-rds-data", "Member[RDSDataClient]"]
   - addsTo:
       pack: codeql/javascript-all
       extensible: sinkModel
     data:
-    - ["aws-sdk", "AnyMember.Argument[0].Member[secretAccessKey,accessKeyId]", "credentials-key"]
-    - ["aws-sdk", "AnyMember.Member[secretAccessKey,accessKeyId]", "credentials-key"]
-    - ["aws-sdk", "Member[Credentials].Argument[0,1]", "credentials-key"]
+      - ["aws-sdk", "AnyMember.Argument[0].Member[secretAccessKey,accessKeyId]", "credentials-key"]
+      - ["aws-sdk", "AnyMember.Member[secretAccessKey,accessKeyId]", "credentials-key"]
+      - ["aws-sdk", "Member[Credentials].Argument[0,1]", "credentials-key"]
+      - ["@aws-sdk/client.Client", "ReturnValue.Member[send].Argument[0]", "sql-injection"]
+      - ["aws-sdk.Athena", "ReturnValue.Member[startQueryExecution,createNamedQuery,updateNamedQuery].Argument[0].Member[QueryString]", "sql-injection"]
+      - ["aws-sdk.S3", "ReturnValue.Member[selectObjectContent].Argument[0].Member[Expression]", "sql-injection"]
+      - ["aws-sdk.RDSDataService", "ReturnValue.Member[executeStatement,batchExecuteStatement].Argument[0].Member[sql]", "sql-injection"]
+      - ["aws-sdk.RDSDataService", "ReturnValue.Member[batchExecuteStatement].Argument[0].Member[parameterSets].ArrayElement.Member[sql]", "sql-injection"]
+      - ["aws-sdk.DynamoDB", "ReturnValue.Member[executeStatement].Argument[0].Member[Statement]", "sql-injection"]
+      - ["aws-sdk.DynamoDB", "ReturnValue.Member[batchExecuteStatement].Argument[0].Member[Statements].ArrayElement.Member[Statement]", "sql-injection"]
+  - addsTo:
+      pack: codeql/javascript-all
+      extensible: summaryModel
+    data:
+      - ["@aws-sdk/client-athena", "Member[StartQueryExecutionCommand,CreateNamedQueryCommand,UpdateNamedQueryCommand]", "Argument[0].Member[QueryString]", "ReturnValue", "taint"]
+      - ["@aws-sdk/client-athena", "Member[CreatePreparedStatementCommand]", "Argument[0].Member[QueryStatement]", "ReturnValue", "taint"]
+      - ["@aws-sdk/client-s3", "Member[SelectObjectContentCommand]", "Argument[0].Member[Expression]", "ReturnValue", "taint"]
+      - ["@aws-sdk/client-rds-data", "Member[ExecuteStatementCommand,BatchExecuteStatementCommand]", "Argument[0].Member[sql]", "ReturnValue", "taint"]
+      - ["@aws-sdk/client-rds-data", "Member[BatchExecuteStatementCommand]", "Argument[0].Member[parameterSets].ArrayElement.Member[sql]", "ReturnValue", "taint"]
+      - ["@aws-sdk/client-rds-data", "Member[ExecuteSqlCommand]", "Argument[0].Member[sqlStatements]", "ReturnValue", "taint"]
+      - ["@aws-sdk/client-dynamodb", "Member[ExecuteStatementCommand]", "Argument[0].Member[Statement]", "ReturnValue", "taint"]
+      - ["@aws-sdk/client-dynamodb", "Member[BatchExecuteStatementCommand]", "Argument[0].Member[Statements].ArrayElement.Member[Statement]", "ReturnValue", "taint"]
+  - addsTo:
+      pack: codeql/javascript-all
+      extensible: sourceModel
+    data:
+      - ["@aws-sdk/client.Client", "ReturnValue.Member[send].ReturnValue.Awaited", "database-access-result"]
+      - ["aws-sdk.Athena", "ReturnValue.Member[getQueryResults].ReturnValue.Member[promise].ReturnValue.Awaited", "database-access-result"]
+      - ["aws-sdk.Athena", "ReturnValue.Member[getQueryResults].Argument[1].Parameter[1]", "database-access-result"]
+      - ["aws-sdk.S3", "ReturnValue.Member[getObject].ReturnValue.Member[promise].ReturnValue.Awaited", "database-access-result"]
+      - ["aws-sdk.S3", "ReturnValue.Member[getObject].Argument[1].Parameter[1]", "database-access-result"]
+      - ["aws-sdk.RDSDataService", "ReturnValue.Member[executeStatement,batchExecuteStatement].ReturnValue.Member[promise].ReturnValue.Awaited", "database-access-result"]
+      - ["aws-sdk.RDSDataService", "ReturnValue.Member[executeStatement,batchExecuteStatement].Argument[1].Parameter[1]", "database-access-result"]
+      - ["aws-sdk.DynamoDB", "ReturnValue.Member[executeStatement,batchExecuteStatement,query,scan,getItem,batchGetItem].ReturnValue.Member[promise].ReturnValue.Awaited", "database-access-result"]
+      - ["aws-sdk.DynamoDB", "ReturnValue.Member[executeStatement,batchExecuteStatement,query,scan,getItem,batchGetItem].Argument[1].Parameter[1]", "database-access-result"]
diff --git a/javascript/ql/lib/ext/call-me-maybe.model.yml b/javascript/ql/lib/ext/call-me-maybe.model.yml
new file mode 100644
index 00000000000..ceda3e8b092
--- /dev/null
+++ b/javascript/ql/lib/ext/call-me-maybe.model.yml
@@ -0,0 +1,6 @@
+extensions:
+  - addsTo:
+      pack: codeql/javascript-all
+      extensible: summaryModel
+    data:
+      - ["call-me-maybe", "", "Argument[1]", "ReturnValue", "value"]
diff --git a/javascript/ql/lib/ext/cors.model.yml b/javascript/ql/lib/ext/cors.model.yml
new file mode 100644
index 00000000000..31125d454b9
--- /dev/null
+++ b/javascript/ql/lib/ext/cors.model.yml
@@ -0,0 +1,6 @@
+extensions:
+  - addsTo:
+      pack: codeql/javascript-all
+      extensible: sinkModel
+    data:
+      - ["cors", "Argument[0].Member[origin]", "cors-origin"]
diff --git a/javascript/ql/lib/ext/graph-ql.model.yml b/javascript/ql/lib/ext/graph-ql.model.yml
new file mode 100644
index 00000000000..2ea1c41ed9f
--- /dev/null
+++ b/javascript/ql/lib/ext/graph-ql.model.yml
@@ -0,0 +1,11 @@
+extensions:
+  - addsTo:
+      pack: codeql/javascript-all
+      extensible: summaryModel
+    data:
+      - ["graphql", "Member[graphql]", "Argument[0].Member[source,variableValues]", "Argument[0].Member[rootValue].AnyMember.Parameter[0]", "taint"]
+  - addsTo:
+      pack: codeql/javascript-all
+      extensible: sourceModel
+    data:
+      - ["graphql", "Member[GraphQLObjectType].Argument[0].Member[fields].AnyMember.Member[resolve].Parameter[1]", "remote"]
diff --git a/javascript/ql/lib/javascript.qll b/javascript/ql/lib/javascript.qll
index 88e46c77453..ad9cfe009b5 100644
--- a/javascript/ql/lib/javascript.qll
+++ b/javascript/ql/lib/javascript.qll
@@ -146,3 +146,4 @@ import semmle.javascript.linters.JSLint
 import semmle.javascript.linters.Linting
 import semmle.javascript.security.dataflow.RemoteFlowSources
 import semmle.javascript.frameworks.UnderscoreDotString
+private import semmle.javascript.internal.Overlay
diff --git a/javascript/ql/lib/qlpack.yml b/javascript/ql/lib/qlpack.yml
index 39b1edfe98c..bd19febdfaa 100644
--- a/javascript/ql/lib/qlpack.yml
+++ b/javascript/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/javascript-all
-version: 2.6.9-dev
+version: 2.6.15-dev
 groups: javascript
 dbscheme: semmlecode.javascript.dbscheme
 extractor: javascript
@@ -23,3 +23,4 @@ dataExtensions:
   - semmle/javascript/security/domains/**/*.model.yml
   - ext/*.model.yml
 warnOnImplicitThis: true
+compileForOverlayEval: true
diff --git a/javascript/ql/lib/semmle/javascript/AST.qll b/javascript/ql/lib/semmle/javascript/AST.qll
index bcde7bbaf4a..db0a2e153d5 100644
--- a/javascript/ql/lib/semmle/javascript/AST.qll
+++ b/javascript/ql/lib/semmle/javascript/AST.qll
@@ -31,7 +31,7 @@ class AstNode extends @ast_node, NodeInStmtContainer {
 
   /** Gets the first token belonging to this element. */
   Token getFirstToken() {
-    exists(DbLocation l1, DbLocation l2, string filepath, int startline, int startcolumn |
+    exists(Location l1, Location l2, string filepath, int startline, int startcolumn |
       l1 = this.getLocation() and
       l2 = result.getLocation() and
       l1.hasLocationInfo(filepath, startline, startcolumn, _, _) and
@@ -41,7 +41,7 @@ class AstNode extends @ast_node, NodeInStmtContainer {
 
   /** Gets the last token belonging to this element. */
   Token getLastToken() {
-    exists(DbLocation l1, DbLocation l2, string filepath, int endline, int endcolumn |
+    exists(Location l1, Location l2, string filepath, int endline, int endcolumn |
       l1 = this.getLocation() and
       l2 = result.getLocation() and
       l1.hasLocationInfo(filepath, _, _, endline, endcolumn) and
diff --git a/javascript/ql/lib/semmle/javascript/ApiGraphs.qll b/javascript/ql/lib/semmle/javascript/ApiGraphs.qll
index 3bb04f2686b..1a96e25b3b9 100644
--- a/javascript/ql/lib/semmle/javascript/ApiGraphs.qll
+++ b/javascript/ql/lib/semmle/javascript/ApiGraphs.qll
@@ -822,7 +822,7 @@ module API {
           or
           // special case: from `require('m')` to an export of `prop` in `m`
           exists(Import imp, Module m, string prop |
-            pred = imp.getImportedModuleNode() and
+            pred = imp.getImportedModuleNodeStrict() and
             m = imp.getImportedModule() and
             lbl = Label::member(prop) and
             rhs = m.getAnExportedValue(prop)
@@ -1115,6 +1115,17 @@ module API {
           ref = awaited(call)
         )
         or
+        // Handle promisified object member access: promisify(obj).member should be treated as obj.member (promisified)
+        exists(
+          Promisify::PromisifyAllCall promisifiedObj, DataFlow::SourceNode originalObj,
+          string member
+        |
+          originalObj.flowsTo(promisifiedObj.getArgument(0)) and
+          use(base, originalObj) and
+          lbl = Label::member(member) and
+          ref = promisifiedObj.getAPropertyRead(member)
+        )
+        or
         decoratorDualEdge(base, lbl, ref)
         or
         decoratorUseEdge(base, lbl, ref)
@@ -1313,7 +1324,9 @@ module API {
       exists(DataFlow::TypeTracker t, StepSummary summary, DataFlow::SourceNode prev |
         prev = trackUseNode(nd, promisified, boundArgs, prop, t) and
         StepSummary::step(prev, res, summary) and
-        result = t.append(summary)
+        result = t.append(summary) and
+        // Block argument-passing into 'this' when it determines the call target
+        not summary = CallReceiverStep()
       )
     }
 
@@ -1337,7 +1350,7 @@ module API {
       result = nd.getALocalSource()
       or
       // additional backwards step from `require('m')` to `exports` or `module.exports` in m
-      exists(Import imp | imp.getImportedModuleNode() = trackDefNode(nd, t.continue()) |
+      exists(Import imp | imp.getImportedModuleNodeStrict() = trackDefNode(nd, t.continue()) |
         result = DataFlow::exportsVarNode(imp.getImportedModule())
         or
         result = DataFlow::moduleVarNode(imp.getImportedModule()).getAPropertyRead("exports")
@@ -1370,7 +1383,9 @@ module API {
       exists(DataFlow::TypeBackTracker t, StepSummary summary, DataFlow::Node next |
         next = trackDefNode(nd, t) and
         StepSummary::step(prev, next, summary) and
-        result = t.prepend(summary)
+        result = t.prepend(summary) and
+        // Block argument-passing steps from 'this' back to a receiver when it determines the call target
+        not summary = CallReceiverStep()
       )
     }
 
diff --git a/javascript/ql/lib/semmle/javascript/ES2015Modules.qll b/javascript/ql/lib/semmle/javascript/ES2015Modules.qll
index e7534449f55..e584697c1e4 100644
--- a/javascript/ql/lib/semmle/javascript/ES2015Modules.qll
+++ b/javascript/ql/lib/semmle/javascript/ES2015Modules.qll
@@ -137,20 +137,37 @@ class ImportDeclaration extends Stmt, Import, @import_declaration {
       is instanceof ImportNamespaceSpecifier and
       count(this.getASpecifier()) = 1
       or
-      // For compatibility with the non-standard implementation of default imports,
-      // treat default imports as namespace imports in cases where it can't cause ambiguity
-      // between named exports and the properties of a default-exported object.
-      not this.getImportedModule().(ES2015Module).hasBothNamedAndDefaultExports() and
-      is.getImportedName() = "default"
+      result = this.getAmbiguousDefaultImportNode()
     )
     or
     // `import { createServer } from 'http'`
     result = DataFlow::destructuredModuleImportNode(this)
   }
 
+  /**
+   * Gets the data flow node corresponding to the `foo` in `import foo from "somewhere"`.
+   *
+   * This refers to the default import, but some non-standard compilers will treat it as a namespace
+   * import. In order to support both interpretations, it is considered an "ambiguous default import".
+   *
+   * Note that renamed default imports, such as `import { default as foo } from "somewhere"`,
+   * are not considered ambiguous, and will not be reported by this predicate.
+   */
+  DataFlow::Node getAmbiguousDefaultImportNode() {
+    result = DataFlow::valueNode(this.getASpecifier().(ImportDefaultSpecifier))
+  }
+
   /** Holds if this is declared with the `type` keyword, so it only imports types. */
   predicate isTypeOnly() { has_type_keyword(this) }
 
+  /**
+   * Holds if this is declared with the `defer` keyword, for example:
+   * ```ts
+   * import defer * as f from "somewhere";
+   * ```
+   */
+  predicate isDeferredImport() { has_defer_keyword(this) }
+
   override string getAPrimaryQlClass() { result = "ImportDeclaration" }
 }
 
diff --git a/javascript/ql/lib/semmle/javascript/Files.qll b/javascript/ql/lib/semmle/javascript/Files.qll
index e717eb6def4..b9274d92eba 100644
--- a/javascript/ql/lib/semmle/javascript/Files.qll
+++ b/javascript/ql/lib/semmle/javascript/Files.qll
@@ -3,7 +3,6 @@
 import javascript
 private import NodeModuleResolutionImpl
 private import codeql.util.FileSystem
-private import internal.Locations
 
 private module FsInput implements InputSig {
   abstract class ContainerBase extends @container {
@@ -99,7 +98,7 @@ class File extends Container, Impl::File {
    *
    * Note that files have special locations starting and ending at line zero, column zero.
    */
-  DbLocation getLocation() { result = getLocatableLocation(this) }
+  Location getLocation() { hasLocation(this, result) }
 
   /** Gets the number of lines in this file. */
   int getNumberOfLines() { result = sum(int loc | numlines(this, loc, _, _) | loc) }
diff --git a/javascript/ql/lib/semmle/javascript/JSON.qll b/javascript/ql/lib/semmle/javascript/JSON.qll
index 714228e52b6..19fc3ec84d7 100644
--- a/javascript/ql/lib/semmle/javascript/JSON.qll
+++ b/javascript/ql/lib/semmle/javascript/JSON.qll
@@ -3,7 +3,6 @@
  */
 
 import javascript
-private import semmle.javascript.internal.Locations
 
 /**
  * A JSON-encoded value, which may be a primitive value, an array or an object.
@@ -33,7 +32,7 @@ class JsonValue extends @json_value, Locatable {
   override string toString() { json(this, _, _, _, result) }
 
   /** Gets the JSON file containing this value. */
-  File getJsonFile() { result = getLocatableLocation(this).getFile() }
+  File getJsonFile() { exists(Location loc | json_locations(this, loc) and result = loc.getFile()) }
 
   /** If this is an object, gets the value of property `name`. */
   JsonValue getPropValue(string name) { json_properties(this, name, result) }
diff --git a/javascript/ql/lib/semmle/javascript/Locations.qll b/javascript/ql/lib/semmle/javascript/Locations.qll
index ce323dfc14d..a3ad79ef93e 100644
--- a/javascript/ql/lib/semmle/javascript/Locations.qll
+++ b/javascript/ql/lib/semmle/javascript/Locations.qll
@@ -1,7 +1,6 @@
 /** Provides classes for working with locations and program elements that have locations. */
 
 import javascript
-private import internal.Locations
 
 /**
  * A location as given by a file, a start line, a start column,
@@ -11,31 +10,31 @@ private import internal.Locations
  *
  * For more information about locations see [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
  */
-class DbLocation extends TDbLocation {
+final class Location extends @location_default {
   /** Gets the file for this location. */
-  File getFile() { dbLocationInfo(this, result, _, _, _, _) }
+  File getFile() { locations_default(this, result, _, _, _, _) }
 
   /** Gets the 1-based line number (inclusive) where this location starts. */
-  int getStartLine() { dbLocationInfo(this, _, result, _, _, _) }
+  int getStartLine() { locations_default(this, _, result, _, _, _) }
 
   /** Gets the 1-based column number (inclusive) where this location starts. */
-  int getStartColumn() { dbLocationInfo(this, _, _, result, _, _) }
+  int getStartColumn() { locations_default(this, _, _, result, _, _) }
 
   /** Gets the 1-based line number (inclusive) where this location ends. */
-  int getEndLine() { dbLocationInfo(this, _, _, _, result, _) }
+  int getEndLine() { locations_default(this, _, _, _, result, _) }
 
   /** Gets the 1-based column number (inclusive) where this location ends. */
-  int getEndColumn() { dbLocationInfo(this, _, _, _, _, result) }
+  int getEndColumn() { locations_default(this, _, _, _, _, result) }
 
   /** Gets the number of lines covered by this location. */
   int getNumLines() { result = this.getEndLine() - this.getStartLine() + 1 }
 
   /** Holds if this location starts before location `that`. */
   pragma[inline]
-  predicate startsBefore(DbLocation that) {
-    exists(File f, int sl1, int sc1, int sl2, int sc2 |
-      dbLocationInfo(this, f, sl1, sc1, _, _) and
-      dbLocationInfo(that, f, sl2, sc2, _, _)
+  predicate startsBefore(Location that) {
+    exists(string f, int sl1, int sc1, int sl2, int sc2 |
+      this.hasLocationInfo(f, sl1, sc1, _, _) and
+      that.hasLocationInfo(f, sl2, sc2, _, _)
     |
       sl1 < sl2
       or
@@ -45,10 +44,10 @@ class DbLocation extends TDbLocation {
 
   /** Holds if this location ends after location `that`. */
   pragma[inline]
-  predicate endsAfter(DbLocation that) {
-    exists(File f, int el1, int ec1, int el2, int ec2 |
-      dbLocationInfo(this, f, _, _, el1, ec1) and
-      dbLocationInfo(that, f, _, _, el2, ec2)
+  predicate endsAfter(Location that) {
+    exists(string f, int el1, int ec1, int el2, int ec2 |
+      this.hasLocationInfo(f, _, _, el1, ec1) and
+      that.hasLocationInfo(f, _, _, el2, ec2)
     |
       el1 > el2
       or
@@ -60,10 +59,10 @@ class DbLocation extends TDbLocation {
    * Holds if this location contains location `that`, meaning that it starts
    * before and ends after it.
    */
-  predicate contains(DbLocation that) { this.startsBefore(that) and this.endsAfter(that) }
+  predicate contains(Location that) { this.startsBefore(that) and this.endsAfter(that) }
 
   /** Holds if this location is empty. */
-  predicate isEmpty() { exists(int l, int c | dbLocationInfo(this, _, l, c, l, c - 1)) }
+  predicate isEmpty() { exists(int l, int c | this.hasLocationInfo(_, l, c, l, c - 1)) }
 
   /** Gets a textual representation of this element. */
   string toString() { result = this.getFile().getBaseName() + ":" + this.getStartLine().toString() }
@@ -79,13 +78,19 @@ class DbLocation extends TDbLocation {
     string filepath, int startline, int startcolumn, int endline, int endcolumn
   ) {
     exists(File f |
-      dbLocationInfo(this, f, startline, startcolumn, endline, endcolumn) and
+      locations_default(this, f, startline, startcolumn, endline, endcolumn) and
       filepath = f.getAbsolutePath()
     )
   }
 }
 
-final class Location = LocationImpl;
+cached
+private Location getLocatableLocation(@locatable l) {
+  hasLocation(l, result) or
+  xmllocations(l, result) or
+  json_locations(l, result) or
+  yaml_locations(l, result)
+}
 
 /** A program element with a location. */
 class Locatable extends @locatable {
@@ -93,7 +98,7 @@ class Locatable extends @locatable {
   File getFile() { result = this.getLocation().getFile() }
 
   /** Gets this element's location. */
-  final DbLocation getLocation() { result = getLocatableLocation(this) }
+  final Location getLocation() { result = getLocatableLocation(this) }
 
   /**
    * Gets the line on which this element starts.
@@ -144,3 +149,8 @@ class Locatable extends @locatable {
    */
   string getAPrimaryQlClass() { result = "???" }
 }
+
+/**
+ * DEPRECATED. Use `Location` instead.
+ */
+deprecated class DbLocation = Location;
diff --git a/javascript/ql/lib/semmle/javascript/Modules.qll b/javascript/ql/lib/semmle/javascript/Modules.qll
index 3ddd5132d05..8b0330b708b 100644
--- a/javascript/ql/lib/semmle/javascript/Modules.qll
+++ b/javascript/ql/lib/semmle/javascript/Modules.qll
@@ -179,7 +179,42 @@ abstract class Import extends AstNode {
   }
 
   /**
-   * Gets the data flow node that the default import of this import is available at.
+   * Gets the data flow node corresponding to the imported module.
+   *
+   * For example:
+   * ```js
+   * // ES2015 style
+   * import * as foo from "fs"; // Gets the node for `foo`
+   * import { readSync } from "fs"; // Gets a node representing the destructured import
+   *
+   * // CommonJS style
+   * require("fs"); // Gets the return value
+   *
+   * // AMD style
+   * define(["fs"], function(fs) { // Gets the node for the `fs` parameter
+   * });
+   * ```
+   *
+   * For default imports, this gets two nodes: the default import node, and a node representing the imported module:
+   * ```js
+   * import foo from "fs"; // gets both `foo` and a node representing the imported module
+   * ```
+   * This behaviour is to support non-standard compilers that treat default imports
+   * as namespace imports. Use `getImportedModuleNodeStrict()` to avoid this behaviour in cases
+   * where it would cause ambiguous data flow.
    */
   abstract DataFlow::Node getImportedModuleNode();
+
+  /**
+   * Gets the same as `getImportedModuleNode()` except ambiguous default imports are excluded
+   * in cases where it would cause ambiguity between named exports and properties
+   * of a default export.
+   */
+  final DataFlow::Node getImportedModuleNodeStrict() {
+    result = this.getImportedModuleNode() and
+    not (
+      result = this.(ImportDeclaration).getAmbiguousDefaultImportNode() and
+      this.getImportedModule().(ES2015Module).hasBothNamedAndDefaultExports()
+    )
+  }
 }
diff --git a/javascript/ql/lib/semmle/javascript/Promises.qll b/javascript/ql/lib/semmle/javascript/Promises.qll
index 51411463efc..2feb92e2e55 100644
--- a/javascript/ql/lib/semmle/javascript/Promises.qll
+++ b/javascript/ql/lib/semmle/javascript/Promises.qll
@@ -727,8 +727,12 @@ module Promisify {
     PromisifyAllCall() {
       this =
         [
-          DataFlow::moduleMember("bluebird", "promisifyAll"),
-          DataFlow::moduleImport(["util-promisifyall", "pify"])
+          DataFlow::moduleMember(["bluebird", "@google-cloud/promisify", "es6-promisify"],
+            "promisifyAll"),
+          DataFlow::moduleMember("thenify-all", "withCallback"),
+          DataFlow::moduleImport([
+              "util-promisifyall", "pify", "thenify-all", "@gar/promisify", "util.promisify-all"
+            ])
         ].getACall()
     }
   }
@@ -741,11 +745,13 @@ module Promisify {
     PromisifyCall() {
       this = DataFlow::moduleImport(["util", "bluebird"]).getAMemberCall("promisify")
       or
-      this = DataFlow::moduleImport(["pify", "util.promisify"]).getACall()
+      this = DataFlow::moduleImport(["pify", "util.promisify", "util-promisify"]).getACall()
       or
-      this = DataFlow::moduleImport("thenify").getACall()
+      this = DataFlow::moduleImport(["thenify", "@gar/promisify", "es6-promisify"]).getACall()
       or
       this = DataFlow::moduleMember("thenify", "withCallback").getACall()
+      or
+      this = DataFlow::moduleMember("@google-cloud/promisify", "promisify").getACall()
     }
   }
 }
diff --git a/javascript/ql/lib/semmle/javascript/RestrictedLocations.qll b/javascript/ql/lib/semmle/javascript/RestrictedLocations.qll
index 05bcd8b3ddd..47ee41a4235 100644
--- a/javascript/ql/lib/semmle/javascript/RestrictedLocations.qll
+++ b/javascript/ql/lib/semmle/javascript/RestrictedLocations.qll
@@ -26,7 +26,7 @@ class FirstLineOf extends Locatable {
       then endcolumn = xc
       else
         endcolumn =
-          max(int c | any(DbLocation l).hasLocationInfo(filepath, startline, _, startline, c))
+          max(int c | any(Location l).hasLocationInfo(filepath, startline, _, startline, c))
     )
   }
 }
diff --git a/javascript/ql/lib/semmle/javascript/SSA.qll b/javascript/ql/lib/semmle/javascript/SSA.qll
index 2de42193743..a2c5bf1d34e 100644
--- a/javascript/ql/lib/semmle/javascript/SSA.qll
+++ b/javascript/ql/lib/semmle/javascript/SSA.qll
@@ -108,8 +108,8 @@ private module Internal {
    */
   cached
   newtype TSsaDefinition =
-    TExplicitDef(ReachableBasicBlock bb, int i, VarDef d, SsaSourceVariable v) {
-      bb.defAt(i, v, d) and
+    TExplicitDef(ReachableBasicBlock bb, int i, VarDef d, SsaSourceVariable v, VarRef lhs) {
+      bb.defAt(i, v, d, lhs) and
       (
         liveAfterDef(bb, i, v) or
         v.isCaptured()
@@ -412,17 +412,22 @@ class SsaVariable extends TSsaDefinition {
   /** Gets a textual representation of this element. */
   string toString() { result = this.getDefinition().prettyPrintRef() }
 
+  /** Gets the location of this SSA variable. */
+  Location getLocation() { result = this.getDefinition().getLocation() }
+
   /**
+   * DEPRECATED. Use `getLocation().hasLocationInfo()` instead.
+   *
    * Holds if this element is at the specified location.
    * The location spans column `startcolumn` of line `startline` to
    * column `endcolumn` of line `endline` in file `filepath`.
    * For more information, see
    * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
    */
-  predicate hasLocationInfo(
+  deprecated predicate hasLocationInfo(
     string filepath, int startline, int startcolumn, int endline, int endcolumn
   ) {
-    this.getDefinition().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
+    this.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
   }
 }
 
@@ -478,23 +483,22 @@ class SsaDefinition extends TSsaDefinition {
   string toString() { result = this.prettyPrintDef() }
 
   /**
+   * DEPRECATED. Use `getLocation().hasLocationInfo()` instead.
+   *
    * Holds if this element is at the specified location.
    * The location spans column `startcolumn` of line `startline` to
    * column `endcolumn` of line `endline` in file `filepath`.
    * For more information, see
    * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
    */
-  abstract predicate hasLocationInfo(
+  deprecated predicate hasLocationInfo(
     string filepath, int startline, int startcolumn, int endline, int endcolumn
-  );
+  ) {
+    this.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
+  }
 
   /** Gets the location of this element. */
-  final Location getLocation() {
-    exists(string filepath, int startline, int startcolumn, int endline, int endcolumn |
-      this.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn) and
-      result.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
-    )
-  }
+  Location getLocation() { result = this.getBasicBlock().getLocation() }
 
   /** Gets the function or toplevel to which this definition belongs. */
   StmtContainer getContainer() { result = this.getBasicBlock().getContainer() }
@@ -505,36 +509,34 @@ class SsaDefinition extends TSsaDefinition {
  */
 class SsaExplicitDefinition extends SsaDefinition, TExplicitDef {
   override predicate definesAt(ReachableBasicBlock bb, int i, SsaSourceVariable v) {
-    this = TExplicitDef(bb, i, _, v)
+    this = TExplicitDef(bb, i, _, v, _)
   }
 
   /** This SSA definition corresponds to the definition of `v` at `def`. */
-  predicate defines(VarDef def, SsaSourceVariable v) { this = TExplicitDef(_, _, def, v) }
+  predicate defines(VarDef def, SsaSourceVariable v) { this = TExplicitDef(_, _, def, v, _) }
 
   /** Gets the variable definition wrapped by this SSA definition. */
-  VarDef getDef() { this = TExplicitDef(_, _, result, _) }
+  VarDef getDef() { this = TExplicitDef(_, _, result, _, _) }
+
+  /** Gets the variable reference appearing on the left-hand side of this assignment. */
+  VarRef getLhs() { this = TExplicitDef(_, _, _, _, result) }
 
   /** Gets the basic block to which this definition belongs. */
   override ReachableBasicBlock getBasicBlock() { this.definesAt(result, _, _) }
 
-  override SsaSourceVariable getSourceVariable() { this = TExplicitDef(_, _, _, result) }
+  override SsaSourceVariable getSourceVariable() { this = TExplicitDef(_, _, _, result, _) }
 
   override VarDef getAContributingVarDef() { result = this.getDef() }
 
   override string prettyPrintRef() {
-    exists(int l, int c | this.hasLocationInfo(_, l, c, _, _) | result = "def@" + l + ":" + c)
+    exists(int l, int c | this.getLocation().hasLocationInfo(_, l, c, _, _) |
+      result = "def@" + l + ":" + c
+    )
   }
 
   override string prettyPrintDef() { result = this.getDef().toString() }
 
-  override predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    exists(Location loc |
-      pragma[only_bind_into](loc) = pragma[only_bind_into](this.getDef()).getLocation() and
-      loc.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
-    )
-  }
+  override Location getLocation() { result = this.getLhs().getLocation() }
 
   /**
    * Gets the data flow node representing the incoming value assigned at this definition,
@@ -557,21 +559,10 @@ abstract class SsaImplicitDefinition extends SsaDefinition {
   abstract string getKind();
 
   override string prettyPrintRef() {
-    exists(int l, int c | this.hasLocationInfo(_, l, c, _, _) |
+    exists(int l, int c | this.getLocation().hasLocationInfo(_, l, c, _, _) |
       result = this.getKind() + "@" + l + ":" + c
     )
   }
-
-  override predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    endline = startline and
-    endcolumn = startcolumn and
-    exists(Location loc |
-      pragma[only_bind_into](loc) = pragma[only_bind_into](this.getBasicBlock()).getLocation() and
-      loc.hasLocationInfo(filepath, startline, startcolumn, _, _)
-    )
-  }
 }
 
 /**
@@ -617,16 +608,6 @@ class SsaVariableCapture extends SsaImplicitDefinition, TCapture {
   override string getKind() { result = "capture" }
 
   override string prettyPrintDef() { result = "capture variable " + this.getSourceVariable() }
-
-  override predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    exists(ReachableBasicBlock bb, int i | this.definesAt(bb, i, _) |
-      bb.getNode(i)
-          .getLocation()
-          .hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
-    )
-  }
 }
 
 /**
@@ -747,13 +728,7 @@ class SsaRefinementNode extends SsaPseudoDefinition, TRefinement {
       this.getSourceVariable() + " = refine[" + this.getGuard() + "](" + this.ppInputs() + ")"
   }
 
-  override predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    this.getGuard()
-        .getLocation()
-        .hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
-  }
+  override Location getLocation() { result = this.getGuard().getLocation() }
 }
 
 module Ssa {
diff --git a/javascript/ql/lib/semmle/javascript/Tokens.qll b/javascript/ql/lib/semmle/javascript/Tokens.qll
index c6a9b05a3d1..c9eeef69dfb 100644
--- a/javascript/ql/lib/semmle/javascript/Tokens.qll
+++ b/javascript/ql/lib/semmle/javascript/Tokens.qll
@@ -4,6 +4,14 @@
 
 import javascript
 
+pragma[nomagic]
+private predicate adjacentTokens(Token token1, Token token2) {
+  exists(TopLevel top, int index |
+    tokeninfo(token1, _, top, index, _) and
+    tokeninfo(token2, _, top, index + 1, _)
+  )
+}
+
 /**
  * A token occurring in a piece of JavaScript source code.
  *
@@ -27,10 +35,7 @@ class Token extends Locatable, @token {
   string getValue() { tokeninfo(this, _, _, _, result) }
 
   /** Gets the token following this token inside the same toplevel structure, if any. */
-  Token getNextToken() {
-    this.getTopLevel() = result.getTopLevel() and
-    this.getIndex() + 1 = result.getIndex()
-  }
+  Token getNextToken() { adjacentTokens(this, result) }
 
   /** Gets the token preceding this token inside the same toplevel structure, if any. */
   Token getPreviousToken() { result.getNextToken() = this }
diff --git a/javascript/ql/lib/semmle/javascript/Variables.qll b/javascript/ql/lib/semmle/javascript/Variables.qll
index 2f9905f86e1..adc0ad5b9c8 100644
--- a/javascript/ql/lib/semmle/javascript/Variables.qll
+++ b/javascript/ql/lib/semmle/javascript/Variables.qll
@@ -353,9 +353,9 @@ class LocalVariable extends Variable {
    * If the variable has one or more declarations, the location of the first declaration is used.
    * If the variable has no declaration, the entry point of its declaring container is used.
    */
-  DbLocation getLocation() {
+  Location getLocation() {
     result =
-      min(DbLocation loc |
+      min(Location loc |
         loc = this.getADeclaration().getLocation()
       |
         loc order by loc.getStartLine(), loc.getStartColumn()
diff --git a/javascript/ql/lib/semmle/javascript/XML.qll b/javascript/ql/lib/semmle/javascript/XML.qll
index 2a351016fd1..54157809260 100644
--- a/javascript/ql/lib/semmle/javascript/XML.qll
+++ b/javascript/ql/lib/semmle/javascript/XML.qll
@@ -3,13 +3,12 @@
  */
 
 import semmle.files.FileSystem
-private import semmle.javascript.internal.Locations
 private import codeql.xml.Xml
 
-private module Input implements InputSig<File, DbLocation> {
+private module Input implements InputSig<File, Location> {
   class XmlLocatableBase = @xmllocatable or @xmlnamespaceable;
 
-  predicate xmllocations_(XmlLocatableBase e, DbLocation loc) { loc = getLocatableLocation(e) }
+  predicate xmllocations_(XmlLocatableBase e, Location loc) { xmllocations(e, loc) }
 
   class XmlParentBase = @xmlparent;
 
@@ -67,4 +66,4 @@ private module Input implements InputSig<File, DbLocation> {
   }
 }
 
-import Make<File, DbLocation, Input>
+import Make<File, Location, Input>
diff --git a/javascript/ql/lib/semmle/javascript/YAML.qll b/javascript/ql/lib/semmle/javascript/YAML.qll
index 24486b729c0..a312d78b6fb 100644
--- a/javascript/ql/lib/semmle/javascript/YAML.qll
+++ b/javascript/ql/lib/semmle/javascript/YAML.qll
@@ -9,8 +9,6 @@ import javascript
 private import codeql.yaml.Yaml as LibYaml
 
 private module YamlSig implements LibYaml::InputSig {
-  class Location = DbLocation;
-
   class LocatableBase extends @yaml_locatable, Locatable { }
 
   import javascript
diff --git a/javascript/ql/lib/semmle/javascript/dataflow/DataFlow.qll b/javascript/ql/lib/semmle/javascript/dataflow/DataFlow.qll
index df3d0d5ff8b..071d6d08433 100644
--- a/javascript/ql/lib/semmle/javascript/dataflow/DataFlow.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/DataFlow.qll
@@ -192,26 +192,6 @@ module DataFlow {
       FlowSteps::identityFunctionStep(result, this)
     }
 
-    /**
-     * Gets the type annotation describing the type of this node,
-     * provided that a static type could not be found.
-     *
-     * Doesn't take field types and function return types into account.
-     */
-    private TypeAnnotation getFallbackTypeAnnotation() {
-      exists(BindingPattern pattern |
-        this = valueNode(pattern) and
-        result = pattern.getTypeAnnotation()
-      )
-      or
-      result = this.getAPredecessor().getFallbackTypeAnnotation()
-      or
-      exists(DataFlow::ClassNode cls, string fieldName |
-        this = cls.getAReceiverNode().getAPropertyRead(fieldName) and
-        result = cls.getFieldTypeAnnotation(fieldName)
-      )
-    }
-
     private NameResolution::Node getNameResolutionNode() {
       this = valueNode(result)
       or
@@ -1932,6 +1912,7 @@ module DataFlow {
   deprecated import Configuration
   import TypeTracking
   import AdditionalFlowSteps
+  import PromisifyFlow
   import internal.FunctionWrapperSteps
   import internal.sharedlib.DataFlow
   import internal.BarrierGuards
diff --git a/javascript/ql/lib/semmle/javascript/dataflow/FlowSummary.qll b/javascript/ql/lib/semmle/javascript/dataflow/FlowSummary.qll
index c4a6e12b210..eb7160683a7 100644
--- a/javascript/ql/lib/semmle/javascript/dataflow/FlowSummary.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/FlowSummary.qll
@@ -17,10 +17,10 @@ private import semmle.javascript.dataflow.internal.DataFlowPrivate
  *
  * - The relevant call sites cannot be matched by the access path syntax, and require the full power of CodeQL.
  *   For example, complex overloading patterns might require more local reasoning at the call site.
- * - The input/output behaviour cannot be described statically in the access path syntax, but the relevant access paths
+ * - The input/output behavior cannot be described statically in the access path syntax, but the relevant access paths
  *   can be generated dynamically in CodeQL, based on the usages found in the codebase.
  *
- * Subclasses should bind `this` to a unique identifier for the function being modelled. There is no special
+ * Subclasses should bind `this` to a unique identifier for the function being modeled. There is no special
  * interpreation of the `this` value, it should just not clash with the `this`-value used by other classes.
  *
  * For example, this models flow through calls such as `require("my-library").myFunction()`:
diff --git a/javascript/ql/lib/semmle/javascript/dataflow/Portals.qll b/javascript/ql/lib/semmle/javascript/dataflow/Portals.qll
index a325a5e14f7..d8f29c707a6 100644
--- a/javascript/ql/lib/semmle/javascript/dataflow/Portals.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/Portals.qll
@@ -11,6 +11,7 @@
  *
  * The API of this library is not stable yet and may change.
  */
+deprecated module;
 
 import javascript
 
diff --git a/javascript/ql/lib/semmle/javascript/dataflow/PromisifyFlow.qll b/javascript/ql/lib/semmle/javascript/dataflow/PromisifyFlow.qll
new file mode 100644
index 00000000000..4389a3d031a
--- /dev/null
+++ b/javascript/ql/lib/semmle/javascript/dataflow/PromisifyFlow.qll
@@ -0,0 +1,29 @@
+/**
+ * Provides data flow steps for promisified user-defined function calls.
+ * This ensures that when you call a promisified user-defined function,
+ * arguments flow to the original function's parameters.
+ */
+
+private import javascript
+private import semmle.javascript.dataflow.AdditionalFlowSteps
+
+/**
+ * A data flow step from arguments of promisified user-defined function calls to
+ * the parameters of the original function.
+ */
+class PromisifiedUserFunctionArgumentFlow extends AdditionalFlowStep {
+  override predicate step(DataFlow::Node pred, DataFlow::Node succ) {
+    exists(
+      DataFlow::CallNode promisifiedCall, Promisify::PromisifyCall promisify,
+      DataFlow::FunctionNode originalFunc, int i
+    |
+      // The promisified call flows from a promisify result
+      promisify.flowsTo(promisifiedCall.getCalleeNode()) and
+      // The original function was promisified
+      originalFunc.flowsTo(promisify.getArgument(0)) and
+      // Argument i of the promisified call flows to parameter i of the original function
+      pred = promisifiedCall.getArgument(i) and
+      succ = originalFunc.getParameter(i)
+    )
+  }
+}
diff --git a/javascript/ql/lib/semmle/javascript/dataflow/Sources.qll b/javascript/ql/lib/semmle/javascript/dataflow/Sources.qll
index f861488a046..7503e5001e0 100644
--- a/javascript/ql/lib/semmle/javascript/dataflow/Sources.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/Sources.qll
@@ -334,6 +334,7 @@ module SourceNode {
         astNode instanceof Templating::PipeRefExpr or
         astNode instanceof Templating::TemplateVarRefExpr or
         astNode instanceof StringLiteral or
+        astNode instanceof TemplateLiteral or
         astNode instanceof TypeAssertion or
         astNode instanceof SatisfiesExpr
       )
diff --git a/javascript/ql/lib/semmle/javascript/dataflow/TypeTracking.qll b/javascript/ql/lib/semmle/javascript/dataflow/TypeTracking.qll
index 9e912a336f6..e4c8f162972 100644
--- a/javascript/ql/lib/semmle/javascript/dataflow/TypeTracking.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/TypeTracking.qll
@@ -65,6 +65,8 @@ class TypeTracker extends TTypeTracker {
     or
     step = CallStep() and result = MkTypeTracker(true, prop)
     or
+    step = CallReceiverStep() and result = MkTypeTracker(true, prop)
+    or
     step = ReturnStep() and hasCall = false and result = this
     or
     step = LoadStep(prop) and result = MkTypeTracker(hasCall, "")
@@ -238,6 +240,8 @@ class TypeBackTracker extends TTypeBackTracker {
     or
     step = CallStep() and hasReturn = false and result = this
     or
+    step = CallReceiverStep() and hasReturn = false and result = this
+    or
     step = ReturnStep() and result = MkTypeBackTracker(true, prop)
     or
     exists(string p | step = LoadStep(p) and prop = "" and result = MkTypeBackTracker(hasReturn, p))
diff --git a/javascript/ql/lib/semmle/javascript/dataflow/internal/BarrierGuards.qll b/javascript/ql/lib/semmle/javascript/dataflow/internal/BarrierGuards.qll
index 0af57ec0186..6dd0ebf0bb1 100644
--- a/javascript/ql/lib/semmle/javascript/dataflow/internal/BarrierGuards.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/internal/BarrierGuards.qll
@@ -386,34 +386,35 @@ module MakeStateBarrierGuard<
    */
   private class BarrierGuardFunction extends FinalFunction {
     DataFlow::ParameterNode sanitizedParameter;
-    BarrierGuard guard;
     boolean guardOutcome;
     FlowState state;
     int paramIndex;
 
     BarrierGuardFunction() {
-      barrierGuardIsRelevant(guard) and
-      exists(Expr e |
-        exists(Expr returnExpr |
-          returnExpr = guard.asExpr()
-          or
-          // ad hoc support for conjunctions:
-          getALogicalAndParent(guard) = returnExpr and guardOutcome = true
-          or
-          // ad hoc support for disjunctions:
-          getALogicalOrParent(guard) = returnExpr and guardOutcome = false
-        |
-          exists(SsaExplicitDefinition ssa |
-            ssa.getDef().getSource() = returnExpr and
-            ssa.getVariable().getAUse() = this.getAReturnedExpr()
-          )
-          or
-          returnExpr = this.getAReturnedExpr()
+      exists(BarrierGuard guard |
+        barrierGuardIsRelevant(guard) and
+        exists(Expr e |
+          exists(Expr returnExpr |
+            returnExpr = guard.asExpr()
+            or
+            // ad hoc support for conjunctions:
+            getALogicalAndParent(guard) = returnExpr and guardOutcome = true
+            or
+            // ad hoc support for disjunctions:
+            getALogicalOrParent(guard) = returnExpr and guardOutcome = false
+          |
+            exists(SsaExplicitDefinition ssa |
+              ssa.getDef().getSource() = returnExpr and
+              ssa.getVariable().getAUse() = this.getAReturnedExpr()
+            )
+            or
+            returnExpr = this.getAReturnedExpr()
+          ) and
+          sanitizedParameter.flowsToExpr(e) and
+          barrierGuardBlocksExpr(guard, guardOutcome, e, state)
         ) and
-        sanitizedParameter.flowsToExpr(e) and
-        barrierGuardBlocksExpr(guard, guardOutcome, e, state)
-      ) and
-      sanitizedParameter.getParameter() = this.getParameter(paramIndex)
+        sanitizedParameter.getParameter() = this.getParameter(paramIndex)
+      )
     }
 
     /**
diff --git a/javascript/ql/lib/semmle/javascript/dataflow/internal/DataFlowPrivate.qll b/javascript/ql/lib/semmle/javascript/dataflow/internal/DataFlowPrivate.qll
index 2fcc2acbd16..1a4051ccdf6 100644
--- a/javascript/ql/lib/semmle/javascript/dataflow/internal/DataFlowPrivate.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/internal/DataFlowPrivate.qll
@@ -408,12 +408,6 @@ class DataFlowCallable extends TDataFlowCallable {
 
   /** Gets the corresponding `LibraryCallable` if this is a library callable. */
   LibraryCallable asLibraryCallable() { this = MkLibraryCallable(result) }
-
-  int totalorder() {
-    result = TotalOrdering::astNodeId(this.asSourceCallable()).bitShiftLeft(1)
-    or
-    result = TotalOrdering::libraryCallableId(this.asLibraryCallable()).bitShiftLeft(1) + 1
-  }
 }
 
 /** A callable defined in library code, identified by a unique string. */
@@ -680,7 +674,7 @@ predicate neverSkipInPathGraph(Node node) {
   // Include the return-value expression
   node.asExpr() = any(Function f).getAReturnedExpr()
   or
-  // Include calls (which may have been modelled as steps)
+  // Include calls (which may have been modeled as steps)
   node.asExpr() instanceof InvokeExpr
   or
   // Include references to a variable
@@ -797,47 +791,6 @@ private newtype TDataFlowCall =
     FlowSummaryImpl::Private::summaryCallbackRange(c, receiver)
   }
 
-private module TotalOrdering {
-  private predicate astNodeRefl(AstNode x, AstNode y) { x = y }
-
-  int astNodeId(AstNode n) = equivalenceRelation(astNodeRefl/2)(n, result)
-
-  predicate dataFlowNodeId(DataFlow::Node node, int cls, int content) {
-    exists(AstNode n |
-      node = TValueNode(n) and cls = 1 and content = astNodeId(n)
-      or
-      node = TReflectiveCallNode(n, _) and cls = 2 and content = astNodeId(n)
-    )
-  }
-
-  predicate callId(DataFlowCall call, int cls, int child, int extra) {
-    exists(DataFlow::Node node |
-      call = MkOrdinaryCall(node) and dataFlowNodeId(node, cls - 1000, child) and extra = 0
-      or
-      call = MkPartialCall(node, _) and dataFlowNodeId(node, cls - 2000, child) and extra = 0
-      or
-      call = MkBoundCall(node, extra) and dataFlowNodeId(node, cls - 3000, child)
-      or
-      call = MkAccessorCall(node) and dataFlowNodeId(node, cls - 4000, child) and extra = 0
-    )
-    or
-    exists(Function f |
-      call = MkImpliedLambdaCall(f) and cls = 5000 and child = astNodeId(f) and extra = 0
-    )
-    or
-    exists(
-      FlowSummaryImpl::Public::SummarizedCallable c, FlowSummaryImpl::Private::SummaryNode receiver
-    |
-      call = MkSummaryCall(c, receiver) and
-      cls = 6000 and
-      c = rank[child](FlowSummaryImpl::Public::SummarizedCallable cs) and
-      extra = 0
-    )
-  }
-
-  int libraryCallableId(LibraryCallable callable) { callable = rank[result](LibraryCallable c) }
-}
-
 class DataFlowCall extends TDataFlowCall {
   DataFlowCallable getEnclosingCallable() { none() } // Overridden in subclass
 
@@ -861,15 +814,6 @@ class DataFlowCall extends TDataFlowCall {
   }
 
   Location getLocation() { none() } // Overridden in subclass
-
-  int totalorder() {
-    this =
-      rank[result](DataFlowCall call, int x, int y, int z |
-        TotalOrdering::callId(call, x, y, z)
-      |
-        call order by x, y, z
-      )
-  }
 }
 
 private class OrdinaryCall extends DataFlowCall, MkOrdinaryCall {
@@ -1159,7 +1103,7 @@ private predicate legacyBarrier(DataFlow::Node node) {
 pragma[nomagic]
 private predicate isBlockedLegacyNode(Node node) {
   // Ignore captured variable nodes for those variables that are handled by the captured-variable library.
-  // Note that some variables, such as top-level variables, are still modelled with these nodes (which will result in jump steps).
+  // Note that some variables, such as top-level variables, are still modeled with these nodes (which will result in jump steps).
   exists(LocalVariable variable |
     node = TCapturedVariableNode(variable) and
     variable = any(VariableCaptureConfig::CapturedVariable v).asLocalVariable()
@@ -1653,8 +1597,6 @@ abstract class NodeRegion extends Unit {
 
   /** Holds if this region contains `n`. */
   predicate contains(Node n) { none() }
-
-  int totalOrder() { none() }
 }
 
 /**
diff --git a/javascript/ql/lib/semmle/javascript/dataflow/internal/FlowSummaryPrivate.qll b/javascript/ql/lib/semmle/javascript/dataflow/internal/FlowSummaryPrivate.qll
index 31f5f16bbfb..a5131e4fd64 100644
--- a/javascript/ql/lib/semmle/javascript/dataflow/internal/FlowSummaryPrivate.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/internal/FlowSummaryPrivate.qll
@@ -94,6 +94,8 @@ private string encodeContentAux(ContentSet cs, string arg) {
     cs = ContentSet::iteratorElement() and result = "IteratorElement"
     or
     cs = ContentSet::iteratorError() and result = "IteratorError"
+    or
+    cs = ContentSet::anyProperty() and result = "AnyMember"
   )
   or
   cs = getPromiseContent(arg) and
@@ -148,7 +150,9 @@ private module FlowSummaryStepInput implements Private::StepsInputSig {
     )
   }
 
-  DataFlow::Node getSourceNode(SourceBase source, Private::SummaryComponent sc) { none() }
+  DataFlowCallable getSourceNodeEnclosingCallable(SourceBase source) { none() }
+
+  DataFlow::Node getSourceNode(SourceBase source, Private::SummaryComponentStack s) { none() }
 
   DataFlow::Node getSinkNode(SinkBase sink, Private::SummaryComponent sc) { none() }
 }
diff --git a/javascript/ql/lib/semmle/javascript/dataflow/internal/StepSummary.qll b/javascript/ql/lib/semmle/javascript/dataflow/internal/StepSummary.qll
index 2bcd89130a9..fed492074b6 100644
--- a/javascript/ql/lib/semmle/javascript/dataflow/internal/StepSummary.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/internal/StepSummary.qll
@@ -43,6 +43,7 @@ private module Cached {
     newtype TStepSummary =
       LevelStep() or
       CallStep() or
+      CallReceiverStep() or
       ReturnStep() or
       StoreStep(PropertyName prop) or
       LoadStep(PropertyName prop) or
@@ -101,6 +102,15 @@ private module Cached {
     )
   }
 
+  pragma[nomagic]
+  private predicate isReceiverForMethodDispatch(DataFlow::Node node) {
+    exists(DataFlow::SourceNode base, DataFlow::CallNode invoke |
+      node = invoke.getReceiver() and
+      base = node.getALocalSource() and
+      invoke.getCalleeNode() = base.getAPropertyRead()
+    )
+  }
+
   /**
    * INTERNAL: Use `TypeBackTracker.smallstep()` instead.
    */
@@ -116,7 +126,11 @@ private module Cached {
     or
     // Flow into function
     callStep(pred, succ) and
-    summary = CallStep()
+    (
+      if isReceiverForMethodDispatch(pred)
+      then summary = CallReceiverStep()
+      else summary = CallStep()
+    )
     or
     // Flow out of function
     returnStep(pred, succ) and
@@ -251,6 +265,8 @@ class StepSummary extends TStepSummary {
     or
     this instanceof CallStep and result = "call"
     or
+    this instanceof CallReceiverStep and result = "call-receiver"
+    or
     this instanceof ReturnStep and result = "return"
     or
     exists(string prop | this = StoreStep(prop) | result = "store " + prop)
diff --git a/javascript/ql/lib/semmle/javascript/dataflow/internal/VariableCapture.qll b/javascript/ql/lib/semmle/javascript/dataflow/internal/VariableCapture.qll
index 75f21bab38a..8edacdc2f0f 100644
--- a/javascript/ql/lib/semmle/javascript/dataflow/internal/VariableCapture.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/internal/VariableCapture.qll
@@ -4,7 +4,7 @@ private import semmle.javascript.dataflow.internal.VariableOrThis
 private import codeql.dataflow.VariableCapture
 private import semmle.javascript.dataflow.internal.sharedlib.DataFlowImplCommon as DataFlowImplCommon
 
-module VariableCaptureConfig implements InputSig<js::DbLocation> {
+module VariableCaptureConfig implements InputSig<js::Location, js::Cfg::BasicBlock> {
   private js::Function getLambdaFromVariable(js::LocalVariable variable) {
     result.getVariable() = variable
     or
@@ -106,10 +106,8 @@ module VariableCaptureConfig implements InputSig<js::DbLocation> {
     )
   }
 
-  class ControlFlowNode = js::ControlFlowNode;
-
-  class BasicBlock extends js::BasicBlock {
-    Callable getEnclosingCallable() { result = this.getContainer().getFunctionBoundary() }
+  Callable basicBlockGetEnclosingCallable(js::Cfg::BasicBlock bb) {
+    result = bb.getContainer().getFunctionBoundary()
   }
 
   class Callable extends js::StmtContainer {
@@ -125,7 +123,7 @@ module VariableCaptureConfig implements InputSig<js::DbLocation> {
 
   class Expr extends js::AST::ValueNode {
     /** Holds if the `i`th node of basic block `bb` evaluates this expression. */
-    predicate hasCfgNode(BasicBlock bb, int i) {
+    predicate hasCfgNode(js::Cfg::BasicBlock bb, int i) {
       // Note: this is overridden for FunctionDeclStmt
       bb.getNode(i) = this
     }
@@ -168,11 +166,11 @@ module VariableCaptureConfig implements InputSig<js::DbLocation> {
 
     string toString() { none() } // Overridden in subclass
 
-    js::DbLocation getLocation() { none() } // Overridden in subclass
+    js::Location getLocation() { none() } // Overridden in subclass
 
-    predicate hasCfgNode(BasicBlock bb, int i) { none() } // Overridden in subclass
+    predicate hasCfgNode(js::Cfg::BasicBlock bb, int i) { none() } // Overridden in subclass
 
-    // note: langauge-specific
+    // note: language-specific
     js::DataFlow::Node getSource() { none() } // Overridden in subclass
   }
 
@@ -186,7 +184,7 @@ module VariableCaptureConfig implements InputSig<js::DbLocation> {
     override string toString() { result = pattern.toString() }
 
     /** Gets the location of this write. */
-    override js::DbLocation getLocation() { result = pattern.getLocation() }
+    override js::Location getLocation() { result = pattern.getLocation() }
 
     override js::DataFlow::Node getSource() {
       // Note: there is not always an expression corresponding to the RHS of the assignment.
@@ -207,7 +205,7 @@ module VariableCaptureConfig implements InputSig<js::DbLocation> {
     }
 
     /** Holds if the `i`th node of basic block `bb` evaluates this expression. */
-    override predicate hasCfgNode(BasicBlock bb, int i) {
+    override predicate hasCfgNode(js::Cfg::BasicBlock bb, int i) {
       bb.getNode(i) = this.getCfgNodeOverride()
       or
       not exists(this.getCfgNodeOverride()) and
@@ -222,11 +220,11 @@ module VariableCaptureConfig implements InputSig<js::DbLocation> {
 
     override string toString() { result = "[implicit init] " + variable }
 
-    override js::DbLocation getLocation() { result = variable.getLocation() }
+    override js::Location getLocation() { result = variable.getLocation() }
 
     override CapturedVariable getVariable() { result = variable }
 
-    override predicate hasCfgNode(BasicBlock bb, int i) {
+    override predicate hasCfgNode(js::Cfg::BasicBlock bb, int i) {
       // 'i' would normally be bound to 0, but we lower it to -1 so FunctionDeclStmts can be evaluated
       // at index 0.
       any(js::SsaImplicitInit def).definesAt(bb, _, variable.asLocalVariable()) and i = -1
@@ -234,15 +232,9 @@ module VariableCaptureConfig implements InputSig<js::DbLocation> {
       bb.(js::EntryBasicBlock).getContainer() = variable.asThisContainer() and i = -1
     }
   }
-
-  BasicBlock getABasicBlockSuccessor(BasicBlock bb) { result = bb.getASuccessor() }
-
-  BasicBlock getImmediateBasicBlockDominator(BasicBlock bb) { result = bb.getImmediateDominator() }
-
-  predicate entryBlock(BasicBlock bb) { bb instanceof js::EntryBasicBlock }
 }
 
-module VariableCaptureOutput = Flow<js::DbLocation, VariableCaptureConfig>;
+module VariableCaptureOutput = Flow<js::Location, js::Cfg, VariableCaptureConfig>;
 
 js::DataFlow::Node getNodeFromClosureNode(VariableCaptureOutput::ClosureNode node) {
   result = TValueNode(node.(VariableCaptureOutput::ExprNode).getExpr())
@@ -288,9 +280,9 @@ private module Debug {
     relevantContainer(node1.getContainer())
   }
 
-  predicate readBB(VariableRead read, BasicBlock bb, int i) { read.hasCfgNode(bb, i) }
+  predicate readBB(VariableRead read, js::Cfg::BasicBlock bb, int i) { read.hasCfgNode(bb, i) }
 
-  predicate writeBB(VariableWrite write, BasicBlock bb, int i) { write.hasCfgNode(bb, i) }
+  predicate writeBB(VariableWrite write, js::Cfg::BasicBlock bb, int i) { write.hasCfgNode(bb, i) }
 
   int captureDegree(js::Function fun) {
     result = strictcount(CapturedVariable v | captures(fun, v))
diff --git a/javascript/ql/lib/semmle/javascript/dataflow/internal/VariableOrThis.qll b/javascript/ql/lib/semmle/javascript/dataflow/internal/VariableOrThis.qll
index 8309c0d639c..a517e0d91fd 100644
--- a/javascript/ql/lib/semmle/javascript/dataflow/internal/VariableOrThis.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/internal/VariableOrThis.qll
@@ -25,7 +25,7 @@ class LocalVariableOrThis extends TLocalVariableOrThis {
   }
 
   /** Gets the location of a declaration of this variable, or the declaring container if this is `this`. */
-  DbLocation getLocation() {
+  Location getLocation() {
     result = this.asLocalVariable().getLocation()
     or
     result = this.asThisContainer().getLocation()
@@ -95,7 +95,7 @@ abstract class ThisUse instanceof ControlFlowNode {
   string toString() { result = super.toString() }
 
   /** Gets the location of this use of `this`. */
-  DbLocation getLocation() { result = super.getLocation() }
+  Location getLocation() { result = super.getLocation() }
 }
 
 private predicate implicitThisUse(ControlFlowNode node, StmtContainer thisBinder) {
diff --git a/javascript/ql/lib/semmle/javascript/dataflow/internal/sharedlib/Ssa.qll b/javascript/ql/lib/semmle/javascript/dataflow/internal/sharedlib/Ssa.qll
index eef4dc08318..7e610c3c23c 100644
--- a/javascript/ql/lib/semmle/javascript/dataflow/internal/sharedlib/Ssa.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/internal/sharedlib/Ssa.qll
@@ -9,11 +9,7 @@ private import codeql.ssa.Ssa
 private import semmle.javascript.internal.BasicBlockInternal as BasicBlockInternal
 private import semmle.javascript.dataflow.internal.VariableOrThis
 
-module SsaConfig implements InputSig<js::DbLocation> {
-  class ControlFlowNode = js::ControlFlowNode;
-
-  class BasicBlock = js::BasicBlock;
-
+module SsaConfig implements InputSig<js::Location, js::Cfg::BasicBlock> {
   class SourceVariable extends LocalVariableOrThis {
     SourceVariable() { not this.isCaptured() }
   }
@@ -23,7 +19,7 @@ module SsaConfig implements InputSig<js::DbLocation> {
     result.getContainer() = container
   }
 
-  predicate variableWrite(BasicBlock bb, int i, SourceVariable v, boolean certain) {
+  predicate variableWrite(js::Cfg::BasicBlock bb, int i, SourceVariable v, boolean certain) {
     certain = true and
     (
       bb.defAt(i, v.asLocalVariable(), _)
@@ -34,20 +30,15 @@ module SsaConfig implements InputSig<js::DbLocation> {
     )
   }
 
-  predicate variableRead(BasicBlock bb, int i, SourceVariable v, boolean certain) {
+  predicate variableRead(js::Cfg::BasicBlock bb, int i, SourceVariable v, boolean certain) {
     bb.useAt(i, v.asLocalVariable(), _) and certain = true
     or
     certain = true and
     bb.getNode(i).(ThisUse).getBindingContainer() = v.asThisContainer()
   }
-
-  predicate getImmediateBasicBlockDominator = BasicBlockInternal::immediateDominator/1;
-
-  pragma[inline]
-  BasicBlock getABasicBlockSuccessor(BasicBlock bb) { result = bb.getASuccessor() }
 }
 
-import Make<js::DbLocation, SsaConfig>
+import Make<js::Location, js::Cfg, SsaConfig>
 
 module SsaDataflowInput implements DataFlowIntegrationInputSig {
   private import codeql.util.Boolean
@@ -55,7 +46,7 @@ module SsaDataflowInput implements DataFlowIntegrationInputSig {
   class Expr extends js::ControlFlowNode {
     Expr() { this = any(SsaConfig::SourceVariable v).getAUse() }
 
-    predicate hasCfgNode(js::BasicBlock bb, int i) { this = bb.getNode(i) }
+    predicate hasCfgNode(js::Cfg::BasicBlock bb, int i) { this = bb.getNode(i) }
   }
 
   predicate ssaDefHasSource(WriteDefinition def) {
@@ -82,7 +73,7 @@ module SsaDataflowInput implements DataFlowIntegrationInputSig {
      * Holds if the evaluation of this guard to `branch` corresponds to the edge
      * from `bb1` to `bb2`.
      */
-    predicate hasValueBranchEdge(js::BasicBlock bb1, js::BasicBlock bb2, GuardValue branch) {
+    predicate hasValueBranchEdge(js::Cfg::BasicBlock bb1, js::Cfg::BasicBlock bb2, GuardValue branch) {
       exists(js::ConditionGuardNode g |
         g.getTest() = this and
         bb1 = this.getBasicBlock() and
@@ -96,13 +87,15 @@ module SsaDataflowInput implements DataFlowIntegrationInputSig {
      * branch edge from `bb1` to `bb2`. That is, following the edge from
      * `bb1` to `bb2` implies that this guard evaluated to `branch`.
      */
-    predicate valueControlsBranchEdge(js::BasicBlock bb1, js::BasicBlock bb2, GuardValue branch) {
+    predicate valueControlsBranchEdge(
+      js::Cfg::BasicBlock bb1, js::Cfg::BasicBlock bb2, GuardValue branch
+    ) {
       this.hasValueBranchEdge(bb1, bb2, branch)
     }
   }
 
   pragma[inline]
-  predicate guardDirectlyControlsBlock(Guard guard, js::BasicBlock bb, GuardValue branch) {
+  predicate guardDirectlyControlsBlock(Guard guard, js::Cfg::BasicBlock bb, GuardValue branch) {
     exists(js::ConditionGuardNode g |
       g.getTest() = guard and
       g.dominates(bb) and
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/AngularJS/AngularJSCore.qll b/javascript/ql/lib/semmle/javascript/frameworks/AngularJS/AngularJSCore.qll
index 248a88e3d1c..41d14c1e3be 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/AngularJS/AngularJSCore.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/AngularJS/AngularJSCore.qll
@@ -23,46 +23,6 @@ DataFlow::SourceNode angular() {
   result = DataFlow::moduleImport("angular")
 }
 
-/**
- * Holds if `tl` appears to be a top-level using the AngularJS library.
- *
- * Should not depend on the `SourceNode` class.
- */
-pragma[nomagic]
-private predicate isAngularTopLevel(TopLevel tl) {
-  exists(Import imprt |
-    imprt.getTopLevel() = tl and
-    imprt.getImportedPathString() = "angular"
-  )
-  or
-  exists(GlobalVarAccess global |
-    global.getName() = "angular" and
-    global.getTopLevel() = tl
-  )
-}
-
-/**
- * Holds if `s` is a string in a top-level using the AngularJS library.
- *
- * Should not depend on the `SourceNode` class.
- */
-pragma[nomagic]
-private predicate isAngularString(Expr s) {
-  isAngularTopLevel(s.getTopLevel()) and
-  (
-    s instanceof StringLiteral or
-    s instanceof TemplateLiteral
-  )
-}
-
-/**
- * String literals in Angular code are often used as identifiers or references, so we
- * want to track them.
- */
-private class TrackStringsInAngularCode extends DataFlow::SourceNode::Range, DataFlow::ValueNode {
-  TrackStringsInAngularCode() { isAngularString(astNode) }
-}
-
 /**
  * Holds if `m` is of the form `angular.module("name", ...)`.
  */
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/AsyncPackage.qll b/javascript/ql/lib/semmle/javascript/frameworks/AsyncPackage.qll
index 4dc60d44765..db2487ce46a 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/AsyncPackage.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/AsyncPackage.qll
@@ -25,6 +25,18 @@ module AsyncPackage {
     result = member(name + "Series")
   }
 
+  /**
+   * Gets `Limit` or `Series` name variants for a given member name.
+   *
+   * For example, `memberNameVariant("map")` returns `map`, `mapLimit`, and `mapSeries`.
+   */
+  bindingset[name]
+  private string memberNameVariant(string name) {
+    result = name or
+    result = name + "Limit" or
+    result = name + "Series"
+  }
+
   /**
    * A call to `async.waterfall`.
    */
@@ -101,22 +113,47 @@ module AsyncPackage {
    */
   class IterationCall extends DataFlow::InvokeNode {
     string name;
+    int iteratorCallbackIndex;
+    int finalCallbackIndex;
 
     IterationCall() {
-      this = memberVariant(name).getACall() and
-      name =
-        [
-          "concat", "detect", "each", "eachOf", "forEach", "forEachOf", "every", "filter",
-          "groupBy", "map", "mapValues", "reduce", "reduceRight", "reject", "some", "sortBy",
-          "transform"
-        ]
+      (
+        (
+          name =
+            memberNameVariant([
+                "concat", "detect", "each", "eachOf", "forEach", "forEachOf", "every", "filter",
+                "groupBy", "map", "mapValues", "reject", "some", "sortBy",
+              ]) and
+          if name.matches("%Limit")
+          then (
+            iteratorCallbackIndex = 2 and finalCallbackIndex = 3
+          ) else (
+            iteratorCallbackIndex = 1 and finalCallbackIndex = 2
+          )
+        )
+        or
+        name = ["reduce", "reduceRight", "transform"] and
+        iteratorCallbackIndex = 2 and
+        finalCallbackIndex = 3
+      ) and
+      this = member(name).getACall()
     }
 
     /**
-     * Gets the name of the iteration call, without the `Limit` or `Series` suffix.
+     * Gets the name of the iteration call
      */
     string getName() { result = name }
 
+    /**
+     * Gets the iterator callback index
+     */
+    int getIteratorCallbackIndex() { result = iteratorCallbackIndex }
+
+    /**
+     * Gets the final callback index
+     */
+    int getFinalCallbackIndex() { result = finalCallbackIndex }
+
     /**
      * Gets the node holding the collection being iterated over.
      */
@@ -125,26 +162,33 @@ module AsyncPackage {
     /**
      * Gets the node holding the function being called for each element in the collection.
      */
-    DataFlow::Node getIteratorCallback() { result = this.getArgument(this.getNumArgument() - 2) }
+    DataFlow::FunctionNode getIteratorCallback() {
+      result = this.getCallback(iteratorCallbackIndex)
+    }
 
     /**
-     * Gets the node holding the function being invoked after iteration is complete.
+     * Gets the node holding the function being invoked after iteration is complete. (may not exist)
      */
-    DataFlow::Node getFinalCallback() { result = this.getArgument(this.getNumArgument() - 1) }
+    DataFlow::FunctionNode getFinalCallback() { result = this.getCallback(finalCallbackIndex) }
   }
 
-  /**
-   * A taint step from the collection into the iterator callback of an iteration call.
-   *
-   * For example: `data -> item` in `async.each(data, (item, cb) => {})`.
-   */
-  private class IterationInputTaintStep extends TaintTracking::SharedTaintStep {
-    override predicate step(DataFlow::Node pred, DataFlow::Node succ) {
-      exists(DataFlow::FunctionNode iteratee, IterationCall call |
-        iteratee = call.getIteratorCallback() and // Require a closure to avoid spurious call/return mismatch.
-        pred = call.getCollection() and // TODO: needs a flow summary to ensure ArrayElement content is unfolded
-        succ = iteratee.getParameter(0)
-      )
+  private class IterationCallFlowSummary extends DataFlow::SummarizedCallable {
+    private int callbackArgIndex;
+
+    IterationCallFlowSummary() {
+      this = "async.IteratorCall(callbackArgIndex=" + callbackArgIndex + ")" and
+      callbackArgIndex in [1 .. 3]
+    }
+
+    override DataFlow::InvokeNode getACallSimple() {
+      result instanceof IterationCall and
+      result.(IterationCall).getIteratorCallbackIndex() = callbackArgIndex
+    }
+
+    override predicate propagatesFlow(string input, string output, boolean preservesValue) {
+      preservesValue = true and
+      input = "Argument[0]." + ["ArrayElement", "SetElement", "IteratorElement", "AnyMember"] and
+      output = "Argument[" + callbackArgIndex + "].Parameter[0]"
     }
   }
 
@@ -152,14 +196,14 @@ module AsyncPackage {
    * A taint step from the return value of an iterator callback to the result of the iteration
    * call.
    *
-   * For example: `item + taint()` -> result` in `async.map(data, (item, cb) => cb(null, item + taint()), (err, result) => {})`.
+   * For example: `item + taint() -> result` in `async.map(data, (item, cb) => cb(null, item + taint()), (err, result) => {})`.
    */
   private class IterationOutputTaintStep extends TaintTracking::SharedTaintStep {
     override predicate step(DataFlow::Node pred, DataFlow::Node succ) {
       exists(
         DataFlow::FunctionNode iteratee, DataFlow::FunctionNode final, int i, IterationCall call
       |
-        iteratee = call.getIteratorCallback().getALocalSource() and
+        iteratee = call.getIteratorCallback() and
         final = call.getFinalCallback() and // Require a closure to avoid spurious call/return mismatch.
         pred = getLastParameter(iteratee).getACall().getArgument(i) and
         succ = final.getParameter(i) and
@@ -175,14 +219,18 @@ module AsyncPackage {
    *
    * For example: `data -> result` in `async.sortBy(data, orderingFn, (err, result) => {})`.
    */
-  private class IterationPreserveTaintStep extends TaintTracking::SharedTaintStep {
-    override predicate step(DataFlow::Node pred, DataFlow::Node succ) {
-      exists(DataFlow::FunctionNode final, IterationCall call |
-        final = call.getFinalCallback() and // Require a closure to avoid spurious call/return mismatch.
-        pred = call.getCollection() and
-        succ = final.getParameter(1) and
-        call.getName() = "sortBy"
-      )
+  private class IterationPreserveTaintStepFlowSummary extends DataFlow::SummarizedCallable {
+    IterationPreserveTaintStepFlowSummary() { this = "async.sortBy" }
+
+    override DataFlow::InvokeNode getACallSimple() {
+      result instanceof IterationCall and
+      result.(IterationCall).getName() = "sortBy"
+    }
+
+    override predicate propagatesFlow(string input, string output, boolean preservesValue) {
+      preservesValue = false and
+      input = "Argument[0]." + ["ArrayElement", "SetElement", "IteratorElement", "AnyMember"] and
+      output = "Argument[2].Parameter[1]"
     }
   }
 }
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/Babel.qll b/javascript/ql/lib/semmle/javascript/frameworks/Babel.qll
index 4b3f70b7772..9ca47fb4727 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/Babel.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/Babel.qll
@@ -141,16 +141,17 @@ module Babel {
    */
   deprecated private class BabelRootTransformedPathExpr extends PathExpr, Expr {
     RootImportConfig plugin;
-    string prefix;
     string mappedPrefix;
     string suffix;
 
     BabelRootTransformedPathExpr() {
       this instanceof PathExpr and
       plugin.appliesTo(this.getTopLevel()) and
-      prefix = this.getStringValue().regexpCapture("(.)/(.*)", 1) and
       suffix = this.getStringValue().regexpCapture("(.)/(.*)", 2) and
-      mappedPrefix = plugin.getRoot(prefix)
+      exists(string prefix |
+        prefix = this.getStringValue().regexpCapture("(.)/(.*)", 1) and
+        mappedPrefix = plugin.getRoot(prefix)
+      )
     }
 
     /** Gets the configuration that applies to this path. */
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/CommandLineArguments.qll b/javascript/ql/lib/semmle/javascript/frameworks/CommandLineArguments.qll
index 50beb04b887..cd8fa34a08e 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/CommandLineArguments.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/CommandLineArguments.qll
@@ -87,11 +87,43 @@ private class ArgsParseStep extends TaintTracking::SharedTaintStep {
   override predicate step(DataFlow::Node pred, DataFlow::Node succ) {
     exists(DataFlow::CallNode call |
       call = DataFlow::moduleMember("args", "parse").getACall() or
-      call = DataFlow::moduleImport(["yargs-parser", "minimist", "subarg"]).getACall()
+      call =
+        DataFlow::moduleImport(["yargs-parser", "minimist", "subarg", "yargs/yargs", "yargs"])
+            .getACall()
     |
       succ = call and
       pred = call.getArgument(0)
     )
+    or
+    exists(API::Node commanderNode | commanderNode = commander() |
+      pred = commanderNode.getMember(["parse", "parseAsync"]).getACall().getAnArgument() and
+      succ =
+        [
+          commanderNode.getMember("opts").getACall(), commanderNode.getAMember().asSource(),
+          commander()
+              .getMember("action")
+              .getACall()
+              .getArgument(0)
+              .(DataFlow::FunctionNode)
+              .getAParameter()
+        ]
+    )
+    or
+    exists(DataFlow::MethodCallNode methodCall | methodCall = yargs() |
+      pred = methodCall.getReceiver() and
+      succ = methodCall
+    )
+    or
+    exists(DataFlow::CallNode call, DataFlow::Node options |
+      call = DataFlow::moduleImport(["arg", "command-line-args"]).getACall() and
+      succ = call and
+      options = call.getArgument(1) and
+      exists(DataFlow::PropWrite write |
+        write.getBase() = options and
+        write.getPropertyName() = "argv" and
+        pred = write.getRhs()
+      )
+    )
   }
 }
 
@@ -115,7 +147,9 @@ private API::Node commander() {
  * Either directly imported as a module, or through some chained method call.
  */
 private DataFlow::SourceNode yargs() {
-  result = DataFlow::moduleImport("yargs")
+  result = DataFlow::moduleImport(["yargs", "yargs/yargs"])
+  or
+  result = DataFlow::moduleImport(["yargs", "yargs/yargs"]).getACall()
   or
   // script used to generate list of chained methods: https://gist.github.com/erik-krogh/f8afe952c0577f4b563a993e613269ba
   exists(string method |
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/Express.qll b/javascript/ql/lib/semmle/javascript/frameworks/Express.qll
index 8c016b3afe9..be3cb7b1ccb 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/Express.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/Express.qll
@@ -781,6 +781,40 @@ module Express {
     override RouteHandler getRouteHandler() { result = response.getRouteHandler() }
   }
 
+  /**
+   * A call to `res.json()` or `res.jsonp()`.
+   *
+   * This sets the `content-type` header.
+   */
+  private class ResponseJsonCall extends DataFlow::MethodCallNode, Http::HeaderDefinition {
+    private ResponseSource response;
+
+    ResponseJsonCall() { this = response.ref().getAMethodCall(["json", "jsonp"]) }
+
+    override RouteHandler getRouteHandler() { result = response.getRouteHandler() }
+
+    override string getAHeaderName() { result = "content-type" }
+
+    override predicate defines(string headerName, string headerValue) {
+      // Note: for `jsonp` the actual content-type header will be `text/javascript` or similar, but to avoid
+      // generating a spurious HTML injection sink, we treat it as `application/json` here.
+      headerName = "content-type" and headerValue = "application/json"
+    }
+  }
+
+  /**
+   * An argument passed to the `json` or `jsonp` method of an HTTP response object.
+   */
+  private class ResponseJsonCallArgument extends Http::ResponseSendArgument {
+    ResponseJsonCall call;
+
+    ResponseJsonCallArgument() { this = call.getArgument(0) }
+
+    override RouteHandler getRouteHandler() { result = call.getRouteHandler() }
+
+    override HeaderDefinition getAnAssociatedHeaderDefinition() { result = call }
+  }
+
   /**
    * An invocation of the `cookie` method on an HTTP response object.
    */
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/LodashUnderscore.qll b/javascript/ql/lib/semmle/javascript/frameworks/LodashUnderscore.qll
index 7c2e6aa37a5..20258622737 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/LodashUnderscore.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/LodashUnderscore.qll
@@ -341,6 +341,18 @@ module LodashUnderscore {
       preservesValue = true
     }
   }
+
+  private class LodashGroupBy extends DataFlow::SummarizedCallable {
+    LodashGroupBy() { this = "_.groupBy" }
+
+    override DataFlow::CallNode getACall() { result = member("groupBy").getACall() }
+
+    override predicate propagatesFlow(string input, string output, boolean preservesValue) {
+      input = "Argument[0]" and
+      output = ["Argument[1].Parameter[0]", "ReturnValue"] and
+      preservesValue = false
+    }
+  }
 }
 
 /**
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/React.qll b/javascript/ql/lib/semmle/javascript/frameworks/React.qll
index 3a361e70594..d55ace8636d 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/React.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/React.qll
@@ -311,14 +311,15 @@ class FunctionalComponent extends ReactComponent, Function {
 /**
  * A React/Preact component implemented as a class.
  */
-abstract private class SharedReactPreactClassComponent extends ReactComponent, ClassDefinition {
+abstract private class SharedReactPreactClassComponent extends ReactComponent instanceof ClassDefinition
+{
   override Function getInstanceMethod(string name) {
     result = ClassDefinition.super.getInstanceMethod(name)
   }
 
   override Function getStaticMethod(string name) {
     exists(MethodDeclaration decl |
-      decl = this.getMethod(name) and
+      decl = ClassDefinition.super.getMethod(name) and
       decl.isStatic() and
       result = decl.getBody()
     )
@@ -327,7 +328,8 @@ abstract private class SharedReactPreactClassComponent extends ReactComponent, C
   override DataFlow::SourceNode getADirectPropsAccess() {
     result = this.getAnInstanceReference().getAPropertyRead("props")
     or
-    result = DataFlow::parameterNode(this.getConstructor().getBody().getParameter(0))
+    result =
+      DataFlow::parameterNode(ClassDefinition.super.getConstructor().getBody().getParameter(0))
   }
 
   override AbstractValue getAbstractComponent() { result = AbstractInstance::of(this) }
@@ -340,7 +342,7 @@ abstract private class SharedReactPreactClassComponent extends ReactComponent, C
 
   override DataFlow::SourceNode getACandidateStateSource() {
     result = ReactComponent.super.getACandidateStateSource() or
-    result.flowsToExpr(this.getField("state").getInit())
+    result.flowsToExpr(ClassDefinition.super.getField("state").getInit())
   }
 
   override DataFlow::SourceNode getADefaultPropsSource() {
@@ -349,6 +351,17 @@ abstract private class SharedReactPreactClassComponent extends ReactComponent, C
       DataFlow::valueNode(this).(DataFlow::SourceNode).hasPropertyWrite("defaultProps", props)
     )
   }
+
+  /** Gets the expression denoting the super class of the defined class, if any. */
+  Expr getSuperClass() { result = ClassDefinition.super.getSuperClass() }
+
+  /**
+   * Gets the constructor of this class.
+   *
+   * Note that every class has a constructor: if no explicit constructor
+   * is declared, it has a synthetic default constructor.
+   */
+  ConstructorDeclaration getConstructor() { result = ClassDefinition.super.getConstructor() }
 }
 
 /**
@@ -362,7 +375,7 @@ abstract class ES2015Component extends SharedReactPreactClassComponent { }
  */
 private class DefiniteES2015Component extends ES2015Component {
   DefiniteES2015Component() {
-    exists(DataFlow::SourceNode sup | sup.flowsToExpr(this.getSuperClass()) |
+    exists(DataFlow::SourceNode sup | sup.flowsToExpr(this.(ClassDefinition).getSuperClass()) |
       exists(PropAccess access, string globalReactName |
         (globalReactName = "react" or globalReactName = "React") and
         access = sup.asExpr()
@@ -400,7 +413,7 @@ abstract class PreactComponent extends SharedReactPreactClassComponent {
  */
 private class DefinitePreactComponent extends PreactComponent {
   DefinitePreactComponent() {
-    exists(DataFlow::SourceNode sup | sup.flowsToExpr(this.getSuperClass()) |
+    exists(DataFlow::SourceNode sup | sup.flowsToExpr(this.(ClassDefinition).getSuperClass()) |
       exists(PropAccess access, string globalPreactName |
         (globalPreactName = "preact" or globalPreactName = "Preact") and
         access = sup.asExpr()
@@ -419,12 +432,11 @@ private class DefinitePreactComponent extends PreactComponent {
  * - extends class called `Component`
  * - has a `render` method that returns JSX or React elements.
  */
-private class HeuristicReactPreactComponent extends ClassDefinition, PreactComponent,
-  ES2015Component
-{
+private class HeuristicReactPreactComponent extends PreactComponent, ES2015Component {
   HeuristicReactPreactComponent() {
-    any(DataFlow::GlobalVarRefNode c | c.getName() = "Component").flowsToExpr(this.getSuperClass()) and
-    alwaysReturnsJsxOrReactElements(ClassDefinition.super.getInstanceMethod("render"))
+    any(DataFlow::GlobalVarRefNode c | c.getName() = "Component")
+        .flowsToExpr(this.(ClassDefinition).getSuperClass()) and
+    alwaysReturnsJsxOrReactElements(this.(ClassDefinition).getInstanceMethod("render"))
   }
 }
 
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/XmlParsers.qll b/javascript/ql/lib/semmle/javascript/frameworks/XmlParsers.qll
index a451182aa21..c0a783c1764 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/XmlParsers.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/XmlParsers.qll
@@ -49,9 +49,7 @@ module XML {
     override JS::Expr getSourceArgument() { result = this.getArgument(0) }
 
     override predicate resolvesEntities(EntityKind kind) {
-      // internal entities are always resolved
-      kind = InternalEntity()
-      or
+      not kind = InternalEntity() and
       // other entities are only resolved if the configuration option `noent` is set to `true`
       exists(JS::Expr noent |
         this.hasOptionArgument(1, "noent", noent) and
@@ -126,8 +124,9 @@ module XML {
     override JS::Expr getSourceArgument() { result = this.getArgument(0) }
 
     override predicate resolvesEntities(EntityKind kind) {
-      // entities are resolved by default
-      any()
+      // SAX parsers in libxmljs also inherit libxml2's protection against XML bombs
+      kind = ExternalEntity(_) or
+      kind = ParameterEntity(true)
     }
 
     override DataFlow::Node getAResult() {
@@ -149,8 +148,9 @@ module XML {
     override JS::Expr getSourceArgument() { result = this.getArgument(0) }
 
     override predicate resolvesEntities(EntityKind kind) {
-      // entities are resolved by default
-      any()
+      // SAX push parsers in libxmljs also inherit libxml2's protection against XML bombs
+      kind = ExternalEntity(_) or
+      kind = ParameterEntity(true)
     }
 
     override DataFlow::Node getAResult() {
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/data/internal/ApiGraphModelsExtensions.qll b/javascript/ql/lib/semmle/javascript/frameworks/data/internal/ApiGraphModelsExtensions.qll
index b86d7de457e..4969da43be3 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/data/internal/ApiGraphModelsExtensions.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/data/internal/ApiGraphModelsExtensions.qll
@@ -4,7 +4,7 @@
 
 /**
  * Holds if the value at `(type, path)` should be seen as a flow
- * source of the given `kind`.
+ * source of the given `kind` and `madId` is the data extension row number.
  *
  * The kind `remote` represents a general remote flow source.
  */
@@ -14,13 +14,14 @@ extensible predicate sourceModel(
 
 /**
  * Holds if the value at `(type, path)` should be seen as a sink
- * of the given `kind`.
+ * of the given `kind` and `madId` is the data extension row number.
  */
 extensible predicate sinkModel(string type, string path, string kind, QlBuiltins::ExtensionId madId);
 
 /**
  * Holds if in calls to `(type, path)`, the value referred to by `input`
- * can flow to the value referred to by `output`.
+ * can flow to the value referred to by `output` and `madId` is the data
+ * extension row number.
  *
  * `kind` should be either `value` or `taint`, for value-preserving or taint-preserving steps,
  * respectively.
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/data/internal/ApiGraphModelsSpecific.qll b/javascript/ql/lib/semmle/javascript/frameworks/data/internal/ApiGraphModelsSpecific.qll
index 5e9846e9ad5..f0d751ad31b 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/data/internal/ApiGraphModelsSpecific.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/data/internal/ApiGraphModelsSpecific.qll
@@ -35,7 +35,7 @@ class Location = JS::Location;
  * Type names have form `package.type` or just `package` if referring to the package export
  * object. If `package` contains a `.` character it must be enclosed in single quotes, such as `'package'.type`.
  *
- * A type name of form `(package)` may also be used when refering to the package export object.
+ * A type name of form `(package)` may also be used when referring to the package export object.
  * We allow this syntax as an alternative to the above, so models generated based on `EndpointNaming` look more consistent.
  * However, access paths are deliberately not parsed here, as we can not handle aliasing at this stage.
  * The model generator must explicitly generate the step between `(package)` and `(package).foo`, for example.
@@ -58,9 +58,11 @@ predicate parseTypeString(string rawType, string package, string qualifiedName)
 predicate isPackageUsed(string package) {
   package = "global"
   or
-  package = any(JS::Import imp).getImportedPathString()
+  // To simplify which dependencies are needed to construct DataFlow::Node, we don't want to rely on `Import` here.
+  // Just check all string literals.
+  package = any(JS::Expr imp).getStringValue()
   or
-  any(JS::TypeAnnotation t).hasUnderlyingType(package, _)
+  package = any(JS::StringLiteralTypeExpr t).getValue() // Can be used in `import("foo")`
   or
   exists(JS::PackageJson json | json.getPackageName() = package)
 }
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/xUnit.qll b/javascript/ql/lib/semmle/javascript/frameworks/xUnit.qll
index 92458cd87af..be64f243e46 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/xUnit.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/xUnit.qll
@@ -23,6 +23,8 @@ private predicate possiblyAttribute(Expr e, string name) {
   )
 }
 
+final private class FinalExpr = Expr;
+
 /**
  * A bracketed list of expressions.
  *
@@ -34,15 +36,22 @@ private predicate possiblyAttribute(Expr e, string name) {
  *
  * We also allow singleton lists, as in `[a][b]`.
  */
-abstract private class BracketedListOfExpressions extends Expr {
+abstract private class BracketedListOfExpressions extends FinalExpr {
   /** Gets the `i`th element expression of this list. */
   abstract Expr getElement(int i);
+
+  /** Gets the first token in this bracketed list of expressions */
+  Token getFirstToken() { result = Expr.super.getFirstToken() }
+
+  /** Gets the last token in this bracketed list of expressions */
+  Token getLastToken() { result = Expr.super.getLastToken() }
 }
 
 /**
  * An array expression viewed as a bracketed list of expressions.
  */
-private class ArrayExprIsABracketedListOfExpressions extends ArrayExpr, BracketedListOfExpressions {
+private class ArrayExprIsABracketedListOfExpressions extends BracketedListOfExpressions instanceof ArrayExpr
+{
   /** Gets the `i`th element of this array literal. */
   override Expr getElement(int i) { result = ArrayExpr.super.getElement(i) }
 }
diff --git a/javascript/ql/lib/semmle/javascript/internal/BasicBlockInternal.qll b/javascript/ql/lib/semmle/javascript/internal/BasicBlockInternal.qll
index c7ad2a1ada8..d8e4a18dfc1 100644
--- a/javascript/ql/lib/semmle/javascript/internal/BasicBlockInternal.qll
+++ b/javascript/ql/lib/semmle/javascript/internal/BasicBlockInternal.qll
@@ -6,6 +6,7 @@
 import javascript
 private import semmle.javascript.internal.StmtContainers
 private import semmle.javascript.internal.CachedStages
+private import codeql.controlflow.BasicBlock as BB
 
 /**
  * Holds if `nd` starts a new basic block.
@@ -67,11 +68,12 @@ private module Cached {
   }
 
   cached
-  predicate defAt(BasicBlock bb, int i, Variable v, VarDef d) {
-    exists(VarRef lhs |
+  predicate defAt(BasicBlock bb, int i, Variable v, VarDef d, VarRef lhs) {
+    (
       lhs = d.getTarget().(BindingPattern).getABindingVarRef() and
       v = lhs.getVariable()
-    |
+    ) and
+    (
       lhs = d.getTarget() and
       bbIndex(bb, d, i)
       or
@@ -148,7 +150,10 @@ module Public {
     predicate useAt(int i, Variable v, VarUse u) { useAt(this, i, v, u) }
 
     /** Holds if this basic block defines variable `v` in its `i`th node `d`. */
-    predicate defAt(int i, Variable v, VarDef d) { defAt(this, i, v, d) }
+    predicate defAt(int i, Variable v, VarDef d) { defAt(this, i, v, d, _) }
+
+    /** Holds if this basic block defines variable `v` in its `i`th node `d`, and `lhs` is the corresponding variable reference. */
+    predicate defAt(int i, Variable v, VarDef d, VarRef lhs) { defAt(this, i, v, d, lhs) }
 
     /**
      * Holds if `v` is live at entry to this basic block and `u` is a use of `v`
@@ -362,4 +367,62 @@ module Public {
       )
     }
   }
+
+  final private class FinalBasicBlock = BasicBlock;
+
+  module Cfg implements BB::CfgSig<Location> {
+    private import javascript as Js
+    private import codeql.controlflow.SuccessorType
+
+    class ControlFlowNode = Js::ControlFlowNode;
+
+    private predicate conditionSucc(BasicBlock bb1, BasicBlock bb2, boolean branch) {
+      exists(ConditionGuardNode g |
+        bb1 = g.getTest().getBasicBlock() and
+        bb2 = g.getBasicBlock() and
+        branch = g.getOutcome()
+      )
+    }
+
+    class BasicBlock extends FinalBasicBlock {
+      BasicBlock getASuccessor() { result = super.getASuccessor() }
+
+      BasicBlock getASuccessor(SuccessorType t) {
+        conditionSucc(this, result, t.(BooleanSuccessor).getValue())
+        or
+        result = super.getASuccessor() and
+        t instanceof DirectSuccessor and
+        not conditionSucc(this, result, _)
+      }
+
+      predicate strictlyDominates(BasicBlock bb) {
+        this.(ReachableBasicBlock).strictlyDominates(bb)
+      }
+
+      predicate dominates(BasicBlock bb) { this.(ReachableBasicBlock).dominates(bb) }
+
+      predicate inDominanceFrontier(BasicBlock df) {
+        df.(ReachableJoinBlock).inDominanceFrontierOf(this)
+      }
+
+      BasicBlock getImmediateDominator() { result = super.getImmediateDominator() }
+
+      predicate strictlyPostDominates(BasicBlock bb) {
+        this.(ReachableBasicBlock).strictlyPostDominates(bb)
+      }
+
+      predicate postDominates(BasicBlock bb) { this.(ReachableBasicBlock).postDominates(bb) }
+    }
+
+    class EntryBasicBlock extends BasicBlock {
+      EntryBasicBlock() { entryBB(this) }
+    }
+
+    pragma[nomagic]
+    predicate dominatingEdge(BasicBlock bb1, BasicBlock bb2) {
+      bb1.getASuccessor() = bb2 and
+      bb1 = bb2.getImmediateDominator() and
+      forall(BasicBlock pred | pred = bb2.getAPredecessor() and pred != bb1 | bb2.dominates(pred))
+    }
+  }
 }
diff --git a/javascript/ql/lib/semmle/javascript/internal/Locations.qll b/javascript/ql/lib/semmle/javascript/internal/Locations.qll
deleted file mode 100644
index d1dc8d403f7..00000000000
--- a/javascript/ql/lib/semmle/javascript/internal/Locations.qll
+++ /dev/null
@@ -1,171 +0,0 @@
-/** Provides classes for working with locations and program elements that have locations. */
-
-import javascript
-
-// Should _not_ be cached, as that would require the data flow stage to be evaluated
-// in order to evaluate the AST stage. Ideally, we would cache each injector separately,
-// but that's not possible. Instead, we cache all predicates that need the injectors
-// to be tuple numbered.
-newtype TLocation =
-  TDbLocation(@location loc) or
-  TSynthLocation(string filepath, int startline, int startcolumn, int endline, int endcolumn) {
-    any(SsaDefinition def).hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn) and
-    // avoid overlap with existing DB locations
-    not exists(File f |
-      locations_default(_, f, startline, startcolumn, endline, endcolumn) and
-      f.getAbsolutePath() = filepath
-    )
-  }
-
-/**
- * A location as given by a file, a start line, a start column,
- * an end line, and an end column.
- *
- * For more information about locations see [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
- */
-abstract class LocationImpl extends TLocation {
-  /** Gets the file for this location. */
-  abstract File getFile();
-
-  /** Gets the 1-based line number (inclusive) where this location starts. */
-  abstract int getStartLine();
-
-  /** Gets the 1-based column number (inclusive) where this location starts. */
-  abstract int getStartColumn();
-
-  /** Gets the 1-based line number (inclusive) where this location ends. */
-  abstract int getEndLine();
-
-  /** Gets the 1-based column number (inclusive) where this location ends. */
-  abstract int getEndColumn();
-
-  /** Gets the number of lines covered by this location. */
-  int getNumLines() { result = this.getEndLine() - this.getStartLine() + 1 }
-
-  /** Holds if this location starts before location `that`. */
-  pragma[inline]
-  predicate startsBefore(Location that) {
-    exists(string f, int sl1, int sc1, int sl2, int sc2 |
-      this.hasLocationInfo(f, sl1, sc1, _, _) and
-      that.hasLocationInfo(f, sl2, sc2, _, _)
-    |
-      sl1 < sl2
-      or
-      sl1 = sl2 and sc1 < sc2
-    )
-  }
-
-  /** Holds if this location ends after location `that`. */
-  pragma[inline]
-  predicate endsAfter(Location that) {
-    exists(string f, int el1, int ec1, int el2, int ec2 |
-      this.hasLocationInfo(f, _, _, el1, ec1) and
-      that.hasLocationInfo(f, _, _, el2, ec2)
-    |
-      el1 > el2
-      or
-      el1 = el2 and ec1 > ec2
-    )
-  }
-
-  /**
-   * Holds if this location contains location `that`, meaning that it starts
-   * before and ends after it.
-   */
-  predicate contains(Location that) { this.startsBefore(that) and this.endsAfter(that) }
-
-  /** Holds if this location is empty. */
-  predicate isEmpty() { exists(int l, int c | this.hasLocationInfo(_, l, c, l, c - 1)) }
-
-  /** Gets a textual representation of this element. */
-  string toString() { result = this.getFile().getBaseName() + ":" + this.getStartLine().toString() }
-
-  /**
-   * Holds if this element is at the specified location.
-   * The location spans column `startcolumn` of line `startline` to
-   * column `endcolumn` of line `endline` in file `filepath`.
-   * For more information, see
-   * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
-   */
-  abstract predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  );
-}
-
-class DbLocationImpl extends LocationImpl instanceof DbLocation {
-  override File getFile() { result = DbLocation.super.getFile() }
-
-  override int getStartLine() { result = DbLocation.super.getStartLine() }
-
-  override int getStartColumn() { result = DbLocation.super.getStartColumn() }
-
-  override int getEndLine() { result = DbLocation.super.getEndLine() }
-
-  override int getEndColumn() { result = DbLocation.super.getEndColumn() }
-
-  override predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    DbLocation.super.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
-  }
-}
-
-class SynthLocationImpl extends LocationImpl, TSynthLocation {
-  override File getFile() { synthLocationInfo(this, result.getAbsolutePath(), _, _, _, _) }
-
-  override int getStartLine() { synthLocationInfo(this, _, result, _, _, _) }
-
-  override int getStartColumn() { synthLocationInfo(this, _, _, result, _, _) }
-
-  override int getEndLine() { synthLocationInfo(this, _, _, _, result, _) }
-
-  override int getEndColumn() { synthLocationInfo(this, _, _, _, _, result) }
-
-  override predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    synthLocationInfo(this, filepath, startline, startcolumn, endline, endcolumn)
-  }
-}
-
-cached
-private module Cached {
-  cached
-  DbLocation getLocatableLocation(@locatable l) {
-    exists(@location loc |
-      hasLocation(l, loc) or
-      xmllocations(l, loc) or
-      json_locations(l, loc) or
-      yaml_locations(l, loc)
-    |
-      result = TDbLocation(loc)
-    )
-  }
-
-  cached
-  predicate dbLocationInfo(
-    DbLocation l, File f, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    exists(@location loc |
-      l = TDbLocation(loc) and
-      locations_default(loc, f, startline, startcolumn, endline, endcolumn)
-    )
-  }
-}
-
-import Cached
-
-cached
-private module CachedInDataFlowStage {
-  private import semmle.javascript.internal.CachedStages
-
-  cached
-  predicate synthLocationInfo(
-    SynthLocationImpl l, string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    Stages::DataFlowStage::ref() and
-    l = TSynthLocation(filepath, startline, startcolumn, endline, endcolumn)
-  }
-}
-
-private import CachedInDataFlowStage
diff --git a/javascript/ql/lib/semmle/javascript/internal/NameResolution.qll b/javascript/ql/lib/semmle/javascript/internal/NameResolution.qll
index b25c98fd693..43ae4ffd43e 100644
--- a/javascript/ql/lib/semmle/javascript/internal/NameResolution.qll
+++ b/javascript/ql/lib/semmle/javascript/internal/NameResolution.qll
@@ -73,6 +73,7 @@ module NameResolution {
    *
    * May also include some type-specific steps in cases where this is harmless when tracking values.
    */
+  pragma[nomagic]
   private predicate commonStep(Node node1, Node node2) {
     // Import paths are part of the graph and has an incoming edge from the imported module, if found.
     // This ensures we can also use the PathExpr as a source when working with external (unresolved) modules.
@@ -187,6 +188,7 @@ module NameResolution {
   /**
    * Holds if there is a read from `node1` to `node2` that accesses the member `name`.
    */
+  pragma[nomagic]
   predicate readStep(Node node1, string name, Node node2) {
     exists(QualifiedTypeAccess access |
       node1 = access.getQualifier() and
@@ -321,6 +323,7 @@ module NameResolution {
     /**
      * Gets the exported member of `mod` named `name`.
      */
+    pragma[nomagic]
     Node getModuleExport(ModuleLike mod, string name) {
       exists(ExportDeclaration exprt |
         mod = exprt.getContainer() and
@@ -362,6 +365,7 @@ module NameResolution {
      * Holds if `value` is stored in `target.prop`. Only needs to recognise assignments
      * that are also recognised by JSDoc tooling such as the Closure compiler.
      */
+    pragma[nomagic]
     private predicate storeToVariable(Expr value, string prop, LocalVariableLike target) {
       exists(AssignExpr assign |
         // target.name = value
@@ -374,6 +378,7 @@ module NameResolution {
     }
 
     /** Steps that only apply for this configuration. */
+    pragma[nomagic]
     private predicate specificStep(Node node1, Node node2) {
       exists(LexicalName var | S::isRelevantVariable(var) |
         node1.(LexicalDecl).getALexicalName() = var and
@@ -406,6 +411,7 @@ module NameResolution {
     /** Helps track flow from a particular set of source nodes. */
     module Track<nodeSig/1 isSource> {
       /** Gets the set of nodes reachable from `source`. */
+      pragma[nomagic]
       Node track(Node source) {
         isSource(source) and
         result = source
@@ -419,6 +425,7 @@ module NameResolution {
     /** Helps track flow from a particular set of source nodes. */
     module TrackNode<AstNodeSig Source> {
       /** Gets the set of nodes reachable from `source`. */
+      pragma[nomagic]
       Node track(Source source) {
         result = source
         or
@@ -482,6 +489,7 @@ module NameResolution {
    *
    * Unlike `trackModule`, this is intended to track uses of external packages.
    */
+  pragma[nomagic]
   predicate nodeRefersToModule(Node node, string mod, string qualifiedName) {
     exists(Expr path |
       path = any(Import imprt).getImportedPathExpr() or
diff --git a/javascript/ql/lib/semmle/javascript/internal/Overlay.qll b/javascript/ql/lib/semmle/javascript/internal/Overlay.qll
new file mode 100644
index 00000000000..a20ac1868e6
--- /dev/null
+++ b/javascript/ql/lib/semmle/javascript/internal/Overlay.qll
@@ -0,0 +1,30 @@
+private import javascript
+
+/** Holds if the database is an overlay. */
+overlay[local]
+private predicate isOverlay() { databaseMetadata("isOverlay", "true") }
+
+overlay[local]
+private string getFileFromEntity(@locatable node) {
+  exists(@location loc, @file file |
+    hasLocation(node, loc) and
+    locations_default(loc, file, _, _, _, _) and
+    files(file, result)
+  )
+}
+
+/** Holds if `file` was changed or deleted in the overlay. */
+overlay[local]
+private predicate discardFile(string file) { isOverlay() and overlayChangedFiles(file) }
+
+/** Holds if `node` is in the `file` and is part of the overlay base database. */
+overlay[local]
+private predicate discardableEntity(string file, @locatable node) {
+  not isOverlay() and file = getFileFromEntity(node)
+}
+
+/** Holds if `node` should be discarded, because it is part of the overlay base and is in a file that was also extracted as part of the overlay database. */
+overlay[discard_entity]
+private predicate discardEntity(@locatable node) {
+  exists(string file | discardableEntity(file, node) and discardFile(file))
+}
diff --git a/javascript/ql/lib/semmle/javascript/internal/TypeResolution.qll b/javascript/ql/lib/semmle/javascript/internal/TypeResolution.qll
index a158ed6421a..73885f83305 100644
--- a/javascript/ql/lib/semmle/javascript/internal/TypeResolution.qll
+++ b/javascript/ql/lib/semmle/javascript/internal/TypeResolution.qll
@@ -12,6 +12,7 @@ module TypeResolution {
    * We track through underlying types as an approximate way to handle calls to a type
    * that is a union/intersection involving functions.
    */
+  pragma[nomagic]
   Node trackUnderlyingFunctionType(Function fun) {
     result = fun
     or
@@ -139,6 +140,28 @@ module TypeResolution {
     )
   }
 
+  /**
+   * `ContentSet.getAReadContent` restricted to the content sets and contents relevant for type resolution.
+   */
+  pragma[nomagic]
+  private DataFlow::Content getAReadContentRestricted(DataFlow::ContentSet cs) {
+    valueReadStep(_, cs, _) and
+    result = cs.getAReadContent() and
+    typeMember(_, result, _)
+  }
+
+  /**
+   * `valueReadStep` where the `ContentSet` has been mapped to the set of relevant read-contents.
+   */
+  pragma[nomagic]
+  private predicate valueReadStepOnContent(Node object, DataFlow::Content content, Node member) {
+    exists(DataFlow::ContentSet contents |
+      valueReadStep(object, contents, member) and
+      content = getAReadContentRestricted(contents)
+    )
+  }
+
+  pragma[nomagic]
   predicate callTarget(InvokeExpr call, Function target) {
     exists(ClassDefinition cls |
       valueHasType(call.(NewExpr).getCallee(), trackClassValue(cls)) and
@@ -198,6 +221,7 @@ module TypeResolution {
     )
   }
 
+  pragma[nomagic]
   predicate contextualType(Node value, Node type) {
     exists(LocalVariableLike v |
       type = v.getADeclaration().getTypeAnnotation() and
@@ -239,6 +263,7 @@ module TypeResolution {
   /**
    * Holds if `value` has the given `type`.
    */
+  cached
   predicate valueHasType(Node value, Node type) {
     value.(BindingPattern).getTypeAnnotation() = type
     or
@@ -293,11 +318,18 @@ module TypeResolution {
     or
     exists(Node mid | valueHasType(mid, type) | ValueFlow::step(mid, value))
     or
-    exists(Node mid, Node midType, DataFlow::ContentSet contents, Node host |
-      valueReadStep(mid, contents, value) and
+    exists(DataFlow::Content content, Node host |
+      typeMemberHostRead(host, content, value) and
+      typeMember(host, content, type)
+    )
+  }
+
+  pragma[nomagic]
+  private predicate typeMemberHostRead(Node host, DataFlow::Content content, Node target) {
+    exists(Node mid, Node midType |
+      valueReadStepOnContent(mid, content, target) and
       valueHasType(mid, midType) and
-      typeMemberHostReaches(host, midType) and
-      typeMember(host, contents.getAReadContent(), type)
+      typeMemberHostReaches(host, midType)
     )
   }
 
@@ -309,6 +341,7 @@ module TypeResolution {
    * - a union type has the property if all its members have the property
    */
   module TrackMustProp<nodeSig/1 directlyHasProperty> {
+    pragma[nomagic]
     predicate hasProperty(Node node) {
       directlyHasProperty(node)
       or
@@ -341,6 +374,7 @@ module TypeResolution {
   }
 
   module ValueHasProperty<nodeSig/1 typeHasProperty> {
+    pragma[nomagic]
     predicate valueHasProperty(Node value) {
       exists(Node type |
         valueHasType(value, type) and
@@ -405,6 +439,7 @@ module TypeResolution {
   /**
    * Holds if `type` contains `string` or `any`, possibly wrapped in a promise.
    */
+  pragma[nomagic]
   predicate hasUnderlyingStringOrAnyType(Node type) {
     type.(TypeAnnotation).isStringy()
     or
diff --git a/javascript/ql/lib/semmle/javascript/internal/flow_summaries/Arrays.qll b/javascript/ql/lib/semmle/javascript/internal/flow_summaries/Arrays.qll
index 00fed9c4f09..6754d3db307 100644
--- a/javascript/ql/lib/semmle/javascript/internal/flow_summaries/Arrays.qll
+++ b/javascript/ql/lib/semmle/javascript/internal/flow_summaries/Arrays.qll
@@ -1,7 +1,7 @@
 /**
  * Contains a summary for relevant methods on arrays.
  *
- * Note that some of Array methods are modelled in `AmbiguousCoreMethods.qll`, and `toString` is special-cased elsewhere.
+ * Note that some of Array methods are modeled in `AmbiguousCoreMethods.qll`, and `toString` is special-cased elsewhere.
  */
 
 private import javascript
@@ -60,7 +60,7 @@ private predicate isForLoopVariable(Variable v) {
 
 private predicate isLikelyArrayIndex(Expr e) {
   // Require that 'e' is of type number and refers to a for-loop variable.
-  // TODO: This is here to mirror the old behaviour. Experiment with turning the 'and' into an 'or'.
+  // TODO: This is here to mirror the old behavior. Experiment with turning the 'and' into an 'or'.
   TTNumber() = unique(InferredType type | type = e.flow().analyze().getAType()) and
   isForLoopVariable(e.(VarAccess).getVariable())
   or
@@ -114,7 +114,7 @@ class ArrayConstructorSummary extends SummarizedCallable {
 /**
  * A call to `join` with a separator argument.
  *
- * Calls without separators are modelled in `StringConcatenation.qll`.
+ * Calls without separators are modeled in `StringConcatenation.qll`.
  */
 class Join extends SummarizedCallable {
   Join() { this = "Array#join" }
@@ -544,6 +544,25 @@ class ToSpliced extends SummarizedCallable {
   }
 }
 
+class With extends SummarizedCallable {
+  With() { this = "Array#with" }
+
+  override InstanceCall getACallSimple() { result.getMethodName() = "with" }
+
+  override predicate propagatesFlow(string input, string output, boolean preservesValue) {
+    preservesValue = true and
+    (
+      // Copy all elements from the original array to the new array
+      input = "Argument[this].WithArrayElement" and
+      output = "ReturnValue"
+      or
+      // Replace the value at the specified index
+      input = "Argument[1]" and
+      output = "ReturnValue.ArrayElement"
+    )
+  }
+}
+
 class ArrayCoercionPackage extends FunctionalPackageSummary {
   ArrayCoercionPackage() { this = "ArrayCoercionPackage" }
 
diff --git a/javascript/ql/lib/semmle/javascript/internal/flow_summaries/AsyncAwait.qll b/javascript/ql/lib/semmle/javascript/internal/flow_summaries/AsyncAwait.qll
index a39b0e6f43d..246ac0f19d0 100644
--- a/javascript/ql/lib/semmle/javascript/internal/flow_summaries/AsyncAwait.qll
+++ b/javascript/ql/lib/semmle/javascript/internal/flow_summaries/AsyncAwait.qll
@@ -8,7 +8,7 @@ private import semmle.javascript.dataflow.internal.AdditionalFlowInternal
 private import semmle.javascript.dataflow.internal.DataFlowPrivate
 
 /**
- * Steps modelling flow in an `async` function.
+ * Steps modeling flow in an `async` function.
  *
  * Note about promise-coercion and flattening:
  * - `await` preserves non-promise values, e.g. `await "foo"` is just `"foo"`.
diff --git a/javascript/ql/lib/semmle/javascript/internal/flow_summaries/FlowSummaryUtil.qll b/javascript/ql/lib/semmle/javascript/internal/flow_summaries/FlowSummaryUtil.qll
index a5df1d4716a..33f891935f4 100644
--- a/javascript/ql/lib/semmle/javascript/internal/flow_summaries/FlowSummaryUtil.qll
+++ b/javascript/ql/lib/semmle/javascript/internal/flow_summaries/FlowSummaryUtil.qll
@@ -49,3 +49,10 @@ string getAnArrayContent() {
   // Values stored at an unknown index
   result = "ArrayElement[?]"
 }
+
+/**
+ * Gets an argument position up to a certain limit.
+ *
+ * This can be used to generate flow summaries that should preserve such positions.
+ */
+int getAnArgumentPosition() { result = [0 .. 10] }
diff --git a/javascript/ql/lib/semmle/javascript/internal/flow_summaries/Generators.qll b/javascript/ql/lib/semmle/javascript/internal/flow_summaries/Generators.qll
index e187b5751cf..75815d00341 100644
--- a/javascript/ql/lib/semmle/javascript/internal/flow_summaries/Generators.qll
+++ b/javascript/ql/lib/semmle/javascript/internal/flow_summaries/Generators.qll
@@ -7,7 +7,7 @@ private import semmle.javascript.dataflow.internal.DataFlowNode
 private import semmle.javascript.dataflow.internal.AdditionalFlowInternal
 
 /**
- * Steps modelling flow out of a generator function:
+ * Steps modeling flow out of a generator function:
  * ```js
  * function* foo() {
  *   yield x;  // store 'x' in the return value's IteratorElement
diff --git a/javascript/ql/lib/semmle/javascript/internal/flow_summaries/Iterators.qll b/javascript/ql/lib/semmle/javascript/internal/flow_summaries/Iterators.qll
index e9937363c01..6b1a182a49b 100644
--- a/javascript/ql/lib/semmle/javascript/internal/flow_summaries/Iterators.qll
+++ b/javascript/ql/lib/semmle/javascript/internal/flow_summaries/Iterators.qll
@@ -1,5 +1,5 @@
 /**
- * Contains flow summaries and steps modelling flow through iterators.
+ * Contains flow summaries and steps modeling flow through iterators.
  */
 
 private import javascript
diff --git a/javascript/ql/lib/semmle/javascript/internal/flow_summaries/Maps.qll b/javascript/ql/lib/semmle/javascript/internal/flow_summaries/Maps.qll
index 61cc1d148c6..d9649d407c6 100644
--- a/javascript/ql/lib/semmle/javascript/internal/flow_summaries/Maps.qll
+++ b/javascript/ql/lib/semmle/javascript/internal/flow_summaries/Maps.qll
@@ -1,5 +1,5 @@
 /**
- * Contains flow summaries and steps modelling flow through `Map` objects.
+ * Contains flow summaries and steps modeling flow through `Map` objects.
  */
 
 private import javascript
diff --git a/javascript/ql/lib/semmle/javascript/internal/flow_summaries/Promises.qll b/javascript/ql/lib/semmle/javascript/internal/flow_summaries/Promises.qll
index 1122c38320a..74048f0e397 100644
--- a/javascript/ql/lib/semmle/javascript/internal/flow_summaries/Promises.qll
+++ b/javascript/ql/lib/semmle/javascript/internal/flow_summaries/Promises.qll
@@ -1,5 +1,5 @@
 /**
- * Contains flow summaries and steps modelling flow through `Promise` objects.
+ * Contains flow summaries and steps modeling flow through `Promise` objects.
  */
 
 private import javascript
@@ -368,3 +368,29 @@ private class PromiseWithResolversLike extends SummarizedCallable {
     )
   }
 }
+
+class PromiseTry extends DataFlow::SummarizedCallable {
+  PromiseTry() { this = "Promise.try()" }
+
+  override DataFlow::CallNode getACallSimple() {
+    result = promiseConstructorRef().getAMemberCall(["try", "attempt"])
+    or
+    result = DataFlow::moduleImport(["p-try", "es6-promise-try"]).getACall()
+  }
+
+  override predicate propagatesFlow(string input, string output, boolean preservesValue) {
+    preservesValue = true and
+    (
+      exists(int i | i = getAnArgumentPosition() |
+        input = "Argument[" + (i + 1) + "]" and
+        output = "Argument[0].Parameter[" + i + "]"
+      )
+      or
+      input = "Argument[0].ReturnValue" and
+      output = "ReturnValue.Awaited"
+      or
+      input = "Argument[0].ReturnValue[exception]" and
+      output = "ReturnValue.Awaited[error]"
+    )
+  }
+}
diff --git a/javascript/ql/lib/semmle/javascript/internal/flow_summaries/Sets.qll b/javascript/ql/lib/semmle/javascript/internal/flow_summaries/Sets.qll
index 34f7d222df8..6b4f089b38e 100644
--- a/javascript/ql/lib/semmle/javascript/internal/flow_summaries/Sets.qll
+++ b/javascript/ql/lib/semmle/javascript/internal/flow_summaries/Sets.qll
@@ -1,5 +1,5 @@
 /**
- * Contains flow summaries and steps modelling flow through `Set` objects.
+ * Contains flow summaries and steps modeling flow through `Set` objects.
  */
 
 private import javascript
diff --git a/javascript/ql/lib/semmle/javascript/internal/flow_summaries/Strings.qll b/javascript/ql/lib/semmle/javascript/internal/flow_summaries/Strings.qll
index d18e2181965..bf9442219a7 100644
--- a/javascript/ql/lib/semmle/javascript/internal/flow_summaries/Strings.qll
+++ b/javascript/ql/lib/semmle/javascript/internal/flow_summaries/Strings.qll
@@ -1,5 +1,5 @@
 /**
- * Contains flow summaries and steps modelling flow through string methods.
+ * Contains flow summaries and steps modeling flow through string methods.
  */
 
 private import javascript
@@ -73,7 +73,7 @@ class StringSplit extends SummarizedCallable {
  * These are of special significance when tracking a tainted URL suffix, such as `window.location.href`,
  * because the first element of the resulting array should not be considered tainted.
  *
- * This summary defaults to the same behaviour as the general `.split()` case, but it contains optional steps
+ * This summary defaults to the same behavior as the general `.split()` case, but it contains optional steps
  * and barriers named `tainted-url-suffix` that should be activated when tracking a tainted URL suffix.
  */
 class StringSplitHashOrQuestionMark extends SummarizedCallable {
diff --git a/javascript/ql/lib/semmle/javascript/security/CorsPermissiveConfigurationCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/CorsPermissiveConfigurationCustomizations.qll
new file mode 100644
index 00000000000..aed0e26a6b3
--- /dev/null
+++ b/javascript/ql/lib/semmle/javascript/security/CorsPermissiveConfigurationCustomizations.qll
@@ -0,0 +1,85 @@
+/**
+ * Provides default sources, sinks and sanitizers for reasoning about
+ * overly permissive CORS configurations, as well as
+ * extension points for adding your own.
+ */
+
+import javascript
+
+/** Module containing sources, sinks, and sanitizers for overly permissive CORS configurations. */
+module CorsPermissiveConfiguration {
+  private newtype TFlowState =
+    TTaint() or
+    TPermissive()
+
+  /** A flow state to associate with a tracked value. */
+  class FlowState extends TFlowState {
+    /** Gets a string representation of this flow state. */
+    string toString() {
+      this = TTaint() and result = "taint"
+      or
+      this = TPermissive() and result = "permissive"
+    }
+  }
+
+  /** Predicates for working with flow states. */
+  module FlowState {
+    /** A tainted value. */
+    FlowState taint() { result = TTaint() }
+
+    /** A permissive value (true, null, or "*"). */
+    FlowState permissive() { result = TPermissive() }
+  }
+
+  /**
+   * A data flow source for permissive CORS configuration.
+   */
+  abstract class Source extends DataFlow::Node { }
+
+  /**
+   * A data flow sink for permissive CORS configuration.
+   */
+  abstract class Sink extends DataFlow::Node { }
+
+  /**
+   * A sanitizer for permissive CORS configuration.
+   */
+  abstract class Sanitizer extends DataFlow::Node { }
+
+  /**
+   * An active threat-model source, considered as a flow source.
+   */
+  private class ActiveThreatModelSourceAsSource extends Source instanceof ActiveThreatModelSource {
+    ActiveThreatModelSourceAsSource() { not this instanceof ClientSideRemoteFlowSource }
+  }
+
+  /** An overly permissive value for `origin` configuration. */
+  class PermissiveValue extends Source {
+    PermissiveValue() {
+      this.mayHaveBooleanValue(true) or
+      this.asExpr() instanceof NullLiteral or
+      this.mayHaveStringValue("*")
+    }
+  }
+
+  /**
+   * The value of cors origin when initializing the application.
+   */
+  class CorsOriginSink extends Sink, DataFlow::ValueNode {
+    CorsOriginSink() { this = ModelOutput::getASinkNode("cors-origin").asSink() }
+  }
+
+  /**
+   * A sanitizer for CORS configurations where credentials are explicitly disabled.
+   * When credentials are false, using "*" for origin is a legitimate pattern.
+   */
+  private class CredentialsDisabledSanitizer extends Sanitizer {
+    CredentialsDisabledSanitizer() {
+      exists(DataFlow::SourceNode config, DataFlow::CallNode call |
+        call.getArgument(0).getALocalSource() = config and
+        this = config.getAPropertyWrite("origin").getRhs() and
+        config.getAPropertyWrite("credentials").getRhs().mayHaveBooleanValue(false)
+      )
+    }
+  }
+}
diff --git a/javascript/ql/lib/semmle/javascript/security/CorsPermissiveConfigurationQuery.qll b/javascript/ql/lib/semmle/javascript/security/CorsPermissiveConfigurationQuery.qll
new file mode 100644
index 00000000000..03d20578b0e
--- /dev/null
+++ b/javascript/ql/lib/semmle/javascript/security/CorsPermissiveConfigurationQuery.qll
@@ -0,0 +1,38 @@
+/**
+ * Provides a dataflow taint tracking configuration for reasoning
+ * about overly permissive CORS configurations.
+ *
+ * Note, for performance reasons: only import this file if
+ * `CorsPermissiveConfiguration::Configuration` is needed,
+ * otherwise `CorsPermissiveConfigurationCustomizations` should
+ * be imported instead.
+ */
+
+import javascript
+import CorsPermissiveConfigurationCustomizations::CorsPermissiveConfiguration
+private import CorsPermissiveConfigurationCustomizations::CorsPermissiveConfiguration as CorsPermissiveConfiguration
+
+/**
+ * A data flow configuration for overly permissive CORS configuration.
+ */
+module CorsPermissiveConfigurationConfig implements DataFlow::StateConfigSig {
+  class FlowState = CorsPermissiveConfiguration::FlowState;
+
+  predicate isSource(DataFlow::Node source, FlowState state) {
+    source instanceof PermissiveValue and state = FlowState::permissive()
+    or
+    source instanceof RemoteFlowSource and state = FlowState::taint()
+  }
+
+  predicate isSink(DataFlow::Node sink, FlowState state) {
+    sink instanceof CorsOriginSink and
+    state = [FlowState::taint(), FlowState::permissive()]
+  }
+
+  predicate isBarrier(DataFlow::Node node) { node instanceof Sanitizer }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
+}
+
+module CorsPermissiveConfigurationFlow =
+  TaintTracking::GlobalWithState<CorsPermissiveConfigurationConfig>;
diff --git a/javascript/ql/lib/semmle/javascript/security/TaintedUrlSuffixCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/TaintedUrlSuffixCustomizations.qll
index d4bce73be19..841f830f2bf 100644
--- a/javascript/ql/lib/semmle/javascript/security/TaintedUrlSuffixCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/TaintedUrlSuffixCustomizations.qll
@@ -76,7 +76,7 @@ module TaintedUrlSuffix {
     //
     //   x [tainted-url-suffix] --> x.split('#') [array element 1] [taint]
     //
-    // Technically we should also preverse tainted-url-suffix when entering the first array element of such
+    // Technically we should also preserve tainted-url-suffix when entering the first array element of such
     // a split, but this mostly leads to FPs since we currently don't track if the taint has been through URI-decoding.
     // (The query/fragment parts are often URI-decoded in practice, but not the other URL parts are not)
     state1.isTaintedUrlSuffix() and
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/CleartextLoggingCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/CleartextLoggingCustomizations.qll
index dbb775f99b5..a7bbc73ce03 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/CleartextLoggingCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/CleartextLoggingCustomizations.qll
@@ -247,10 +247,24 @@ module CleartextLogging {
       reduceCall.getABoundCallbackParameter(0, 1) = name
     |
       reduceCall.getReceiver+().(DataFlow::MethodCallNode).getMethodName() = "filter"
+      or
+      isArrayOfConstants(reduceCall.getReceiver+())
     )
     or
     exists(StringOps::RegExpTest test | test.getStringOperand().getALocalSource() = name)
     or
     exists(MembershipCandidate test | test.getAMemberNode().getALocalSource() = name)
   }
+
+  private predicate isArrayOfConstants(DataFlow::ArrayCreationNode array) {
+    forex(DataFlow::Node node |
+      node =
+        [
+          array.getAnElement(), array.getAPropertyWrite().getRhs(),
+          array.getAMethodCall("push").getArgument(0)
+        ]
+    |
+      exists(node.getStringValue())
+    )
+  }
 }
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/CommandInjectionQuery.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/CommandInjectionQuery.qll
index 7c013e1f4ac..228f2b8c72c 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/CommandInjectionQuery.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/CommandInjectionQuery.qll
@@ -34,8 +34,9 @@ module CommandInjectionConfig implements DataFlow::ConfigSig {
   predicate observeDiffInformedIncrementalMode() { any() }
 
   Location getASelectedSinkLocation(DataFlow::Node sink) {
-    exists(DataFlow::Node node |
-      isSinkWithHighlight(sink, node) and
+    exists(DataFlow::Node node | isSinkWithHighlight(sink, node) |
+      result = sink.getLocation()
+      or
       result = node.getLocation()
     )
   }
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/IndirectCommandInjectionQuery.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/IndirectCommandInjectionQuery.qll
index 87d85911a1b..6dbba8261fb 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/IndirectCommandInjectionQuery.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/IndirectCommandInjectionQuery.qll
@@ -30,8 +30,9 @@ module IndirectCommandInjectionConfig implements DataFlow::ConfigSig {
   predicate observeDiffInformedIncrementalMode() { any() }
 
   Location getASelectedSinkLocation(DataFlow::Node sink) {
-    exists(DataFlow::Node node |
-      isSinkWithHighlight(sink, node) and
+    exists(DataFlow::Node node | isSinkWithHighlight(sink, node) |
+      result = sink.getLocation()
+      or
       result = node.getLocation()
     )
   }
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/RegExpInjectionCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/RegExpInjectionCustomizations.qll
index 1c056935d40..5ee39219d26 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/RegExpInjectionCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/RegExpInjectionCustomizations.qll
@@ -5,6 +5,7 @@
  */
 
 import javascript
+private import codeql.threatmodels.ThreatModels
 
 module RegExpInjection {
   /**
@@ -32,19 +33,32 @@ module RegExpInjection {
 
   /**
    * An active threat-model source, considered as a flow source.
+   * Excludes environment variables by default - they require the "environment" threat model.
    */
   private class ActiveThreatModelSourceAsSource extends Source instanceof ActiveThreatModelSource {
-    ActiveThreatModelSourceAsSource() { not this.isClientSideSource() }
+    ActiveThreatModelSourceAsSource() {
+      not this.isClientSideSource() and
+      not this.(ThreatModelSource).getThreatModel() = "environment"
+    }
   }
 
-  private import IndirectCommandInjectionCustomizations
+  /**
+   * Environment variables as a source when the "environment" threat model is active.
+   */
+  private class EnvironmentVariableAsSource extends Source instanceof ThreatModelSource {
+    EnvironmentVariableAsSource() {
+      this.getThreatModel() = "environment" and
+      currentThreatModel("environment")
+    }
+
+    override string describe() { result = "environment variable" }
+  }
 
   /**
-   * A read of `process.env`, `process.argv`, and similar, considered as a flow source for regular
-   * expression injection.
+   * Command line arguments as a source for regular expression injection.
    */
-  class ArgvAsSource extends Source instanceof IndirectCommandInjection::Source {
-    override string describe() { result = IndirectCommandInjection::Source.super.describe() }
+  private class CommandLineArgumentAsSource extends Source instanceof CommandLineArguments {
+    override string describe() { result = "command-line argument" }
   }
 
   /**
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/RemotePropertyInjectionQuery.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/RemotePropertyInjectionQuery.qll
index 8f1f174d8ec..f338651b63d 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/RemotePropertyInjectionQuery.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/RemotePropertyInjectionQuery.qll
@@ -10,6 +10,7 @@
 
 import javascript
 import RemotePropertyInjectionCustomizations::RemotePropertyInjection
+private import semmle.javascript.DynamicPropertyAccess
 
 /**
  * A taint-tracking configuration for reasoning about remote property injection.
@@ -24,6 +25,10 @@ module RemotePropertyInjectionConfig implements DataFlow::ConfigSig {
     node = StringConcatenation::getRoot(any(ConstantString str).flow())
   }
 
+  predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
+    node1 = node2.(EnumeratedPropName).getSourceObject()
+  }
+
   predicate observeDiffInformedIncrementalMode() { any() }
 }
 
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/ShellCommandInjectionFromEnvironmentQuery.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/ShellCommandInjectionFromEnvironmentQuery.qll
index 1d396da5b20..e1dcdd339d9 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/ShellCommandInjectionFromEnvironmentQuery.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/ShellCommandInjectionFromEnvironmentQuery.qll
@@ -33,7 +33,7 @@ module ShellCommandInjectionFromEnvironmentConfig implements DataFlow::ConfigSig
   Location getASelectedSinkLocation(DataFlow::Node sink) {
     exists(DataFlow::Node node |
       isSinkWithHighlight(sink, node) and
-      result = node.getLocation()
+      result = [node.getLocation(), sink.getLocation()]
     )
   }
 }
diff --git a/javascript/ql/lib/semmle/javascript/security/regexp/PolynomialReDoSQuery.qll b/javascript/ql/lib/semmle/javascript/security/regexp/PolynomialReDoSQuery.qll
index e68fd5af415..d1baf9c4523 100644
--- a/javascript/ql/lib/semmle/javascript/security/regexp/PolynomialReDoSQuery.qll
+++ b/javascript/ql/lib/semmle/javascript/security/regexp/PolynomialReDoSQuery.qll
@@ -29,6 +29,8 @@ module PolynomialReDoSConfig implements DataFlow::ConfigSig {
   predicate observeDiffInformedIncrementalMode() { any() }
 
   Location getASelectedSinkLocation(DataFlow::Node sink) {
+    result = sink.(Sink).getLocation()
+    or
     result = sink.(Sink).getHighlight().getLocation()
     or
     result = sink.(Sink).getRegExp().getLocation()
diff --git a/javascript/ql/lib/semmlecode.javascript.dbscheme b/javascript/ql/lib/semmlecode.javascript.dbscheme
index ccefb5e2d49..80b2bc24189 100644
--- a/javascript/ql/lib/semmlecode.javascript.dbscheme
+++ b/javascript/ql/lib/semmlecode.javascript.dbscheme
@@ -516,6 +516,7 @@ has_private_keyword (int id: @property ref);
 has_protected_keyword (int id: @property ref);
 has_readonly_keyword (int id: @property ref);
 has_type_keyword (int id: @type_keyword_operand ref);
+has_defer_keyword (int id: @import_declaration ref);
 is_optional_member (int id: @property ref);
 has_definite_assignment_assertion (int id: @field_or_vardeclarator ref);
 is_optional_parameter_declaration (unique int parameter: @pattern ref);
@@ -1192,3 +1193,13 @@ configLocations(
 );
 
 @configLocatable = @config | @configName | @configValue;
+
+/*- Database metadata -*/
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+overlayChangedFiles(
+  string path: string ref
+);
diff --git a/javascript/ql/lib/semmlecode.javascript.dbscheme.stats b/javascript/ql/lib/semmlecode.javascript.dbscheme.stats
index 51889bd9286..dd86c7346ef 100644
--- a/javascript/ql/lib/semmlecode.javascript.dbscheme.stats
+++ b/javascript/ql/lib/semmlecode.javascript.dbscheme.stats
@@ -4319,6 +4319,17 @@
 <dependencies/>
 </relation>
 <relation>
+<name>has_defer_keyword</name>
+<cardinality>1000</cardinality>
+<columnsizes>
+<e>
+<k>id</k>
+<v>1000</v>
+</e>
+</columnsizes>
+<dependencies/>
+</relation>
+<relation>
 <name>is_optional_member</name>
 <cardinality>3668</cardinality>
 <columnsizes>
@@ -28260,5 +28271,52 @@
 </dep>
 </dependencies>
 </relation>
+<relation>
+<name>databaseMetadata</name>
+<cardinality>1</cardinality>
+<columnsizes>
+<e>
+<k>metadataKey</k>
+<v>1</v>
+</e>
+<e>
+<k>value</k>
+<v>1</v>
+</e>
+</columnsizes>
+<dependencies>
+<dep>
+<src>metadataKey</src>
+<trg>value</trg>
+<val>
+<hist>
+<budget>12</budget>
+<bs/>
+</hist>
+</val>
+</dep>
+<dep>
+<src>value</src>
+<trg>metadataKey</trg>
+<val>
+<hist>
+<budget>12</budget>
+<bs/>
+</hist>
+</val>
+</dep>
+</dependencies>
+</relation>
+<relation>
+<name>overlayChangedFiles</name>
+<cardinality>50</cardinality>
+<columnsizes>
+<e>
+<k>path</k>
+<v>50</v>
+</e>
+</columnsizes>
+<dependencies/>
+</relation>
 </stats>
 </dbstats>
diff --git a/javascript/ql/lib/upgrades/76a926a00d5f3bc199c203a1437796fd7b2835ba/old.dbscheme b/javascript/ql/lib/upgrades/76a926a00d5f3bc199c203a1437796fd7b2835ba/old.dbscheme
new file mode 100644
index 00000000000..76a926a00d5
--- /dev/null
+++ b/javascript/ql/lib/upgrades/76a926a00d5f3bc199c203a1437796fd7b2835ba/old.dbscheme
@@ -0,0 +1,1204 @@
+/*** Standard fragments ***/
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- JavaScript-specific part -*/
+
+@location = @location_default
+
+@sourceline = @locatable;
+
+filetype(
+  int file: @file ref,
+  string filetype: string ref
+)
+
+// top-level code fragments
+toplevels (unique int id: @toplevel,
+           int kind: int ref);
+
+is_externs (int toplevel: @toplevel ref);
+
+case @toplevel.kind of
+   0 = @script
+|  1 = @inline_script
+|  2 = @event_handler
+|  3 = @javascript_url
+|  4 = @template_toplevel;
+
+is_module (int tl: @toplevel ref);
+is_nodejs (int tl: @toplevel ref);
+is_es2015_module (int tl: @toplevel ref);
+is_closure_module (int tl: @toplevel ref);
+
+@xml_node_with_code = @xmlelement | @xmlattribute | @template_placeholder_tag;
+toplevel_parent_xml_node(
+  unique int toplevel: @toplevel ref,
+  int xmlnode: @xml_node_with_code ref);
+
+xml_element_parent_expression(
+  unique int xmlnode: @xmlelement ref,
+  int expression: @expr ref,
+  int index: int ref);
+
+// statements
+#keyset[parent, idx]
+stmts (unique int id: @stmt,
+       int kind: int ref,
+       int parent: @stmt_parent ref,
+       int idx: int ref,
+       varchar(900) tostring: string ref);
+
+stmt_containers (unique int stmt: @stmt ref,
+       int container: @stmt_container ref);
+
+jump_targets (unique int jump: @stmt ref,
+       int target: @stmt ref);
+
+@stmt_parent = @stmt | @toplevel | @function_expr | @arrow_function_expr | @static_initializer;
+@stmt_container = @toplevel | @function | @namespace_declaration | @external_module_declaration | @global_augmentation_declaration;
+
+case @stmt.kind of
+   0 = @empty_stmt
+|  1 = @block_stmt
+|  2 = @expr_stmt
+|  3 = @if_stmt
+|  4 = @labeled_stmt
+|  5 = @break_stmt
+|  6 = @continue_stmt
+|  7 = @with_stmt
+|  8 = @switch_stmt
+|  9 = @return_stmt
+| 10 = @throw_stmt
+| 11 = @try_stmt
+| 12 = @while_stmt
+| 13 = @do_while_stmt
+| 14 = @for_stmt
+| 15 = @for_in_stmt
+| 16 = @debugger_stmt
+| 17 = @function_decl_stmt
+| 18 = @var_decl_stmt
+| 19 = @case
+| 20 = @catch_clause
+| 21 = @for_of_stmt
+| 22 = @const_decl_stmt
+| 23 = @let_stmt
+| 24 = @legacy_let_stmt
+| 25 = @for_each_stmt
+| 26 = @class_decl_stmt
+| 27 = @import_declaration
+| 28 = @export_all_declaration
+| 29 = @export_default_declaration
+| 30 = @export_named_declaration
+| 31 = @namespace_declaration
+| 32 = @import_equals_declaration
+| 33 = @export_assign_declaration
+| 34 = @interface_declaration
+| 35 = @type_alias_declaration
+| 36 = @enum_declaration
+| 37 = @external_module_declaration
+| 38 = @export_as_namespace_declaration
+| 39 = @global_augmentation_declaration
+| 40 = @using_decl_stmt
+;
+
+@decl_stmt = @var_decl_stmt | @const_decl_stmt | @let_stmt | @legacy_let_stmt | @using_decl_stmt;
+
+@export_declaration = @export_all_declaration | @export_default_declaration | @export_named_declaration;
+
+@namespace_definition = @namespace_declaration | @enum_declaration;
+@type_definition = @class_definition | @interface_declaration | @enum_declaration | @type_alias_declaration | @enum_member;
+
+is_instantiated(unique int decl: @namespace_declaration ref);
+
+@declarable_node = @decl_stmt | @namespace_declaration | @class_decl_stmt | @function_decl_stmt | @enum_declaration | @external_module_declaration | @global_augmentation_declaration | @field;
+has_declare_keyword(unique int stmt: @declarable_node ref);
+
+is_for_await_of(unique int forof: @for_of_stmt ref);
+
+// expressions
+#keyset[parent, idx]
+exprs (unique int id: @expr,
+       int kind: int ref,
+       int parent: @expr_parent ref,
+       int idx: int ref,
+       varchar(900) tostring: string ref);
+
+literals (varchar(900) value: string ref,
+       varchar(900) raw: string ref,
+       unique int expr: @expr_or_type ref);
+
+enclosing_stmt (unique int expr: @expr_or_type ref,
+       int stmt: @stmt ref);
+
+expr_containers (unique int expr: @expr_or_type ref,
+       int container: @stmt_container ref);
+
+array_size (unique int ae: @arraylike ref,
+       int sz: int ref);
+
+is_delegating (int yield: @yield_expr ref);
+
+@expr_or_stmt = @expr | @stmt;
+@expr_or_type = @expr | @typeexpr;
+@expr_parent = @expr_or_stmt | @property | @function_typeexpr;
+@arraylike = @array_expr | @array_pattern;
+@type_annotation = @typeexpr | @jsdoc_type_expr;
+@node_in_stmt_container = @cfg_node | @type_annotation | @toplevel;
+
+case @expr.kind of
+   0 = @label
+|  1 = @null_literal
+|  2 = @boolean_literal
+|  3 = @number_literal
+|  4 = @string_literal
+|  5 = @regexp_literal
+|  6 = @this_expr
+|  7 = @array_expr
+|  8 = @obj_expr
+|  9 = @function_expr
+| 10 = @seq_expr
+| 11 = @conditional_expr
+| 12 = @new_expr
+| 13 = @call_expr
+| 14 = @dot_expr
+| 15 = @index_expr
+| 16 = @neg_expr
+| 17 = @plus_expr
+| 18 = @log_not_expr
+| 19 = @bit_not_expr
+| 20 = @typeof_expr
+| 21 = @void_expr
+| 22 = @delete_expr
+| 23 = @eq_expr
+| 24 = @neq_expr
+| 25 = @eqq_expr
+| 26 = @neqq_expr
+| 27 = @lt_expr
+| 28 = @le_expr
+| 29 = @gt_expr
+| 30 = @ge_expr
+| 31 = @lshift_expr
+| 32 = @rshift_expr
+| 33 = @urshift_expr
+| 34 = @add_expr
+| 35 = @sub_expr
+| 36 = @mul_expr
+| 37 = @div_expr
+| 38 = @mod_expr
+| 39 = @bitor_expr
+| 40 = @xor_expr
+| 41 = @bitand_expr
+| 42 = @in_expr
+| 43 = @instanceof_expr
+| 44 = @logand_expr
+| 45 = @logor_expr
+| 47 = @assign_expr
+| 48 = @assign_add_expr
+| 49 = @assign_sub_expr
+| 50 = @assign_mul_expr
+| 51 = @assign_div_expr
+| 52 = @assign_mod_expr
+| 53 = @assign_lshift_expr
+| 54 = @assign_rshift_expr
+| 55 = @assign_urshift_expr
+| 56 = @assign_or_expr
+| 57 = @assign_xor_expr
+| 58 = @assign_and_expr
+| 59 = @preinc_expr
+| 60 = @postinc_expr
+| 61 = @predec_expr
+| 62 = @postdec_expr
+| 63 = @par_expr
+| 64 = @var_declarator
+| 65 = @arrow_function_expr
+| 66 = @spread_element
+| 67 = @array_pattern
+| 68 = @object_pattern
+| 69 = @yield_expr
+| 70 = @tagged_template_expr
+| 71 = @template_literal
+| 72 = @template_element
+| 73 = @array_comprehension_expr
+| 74 = @generator_expr
+| 75 = @for_in_comprehension_block
+| 76 = @for_of_comprehension_block
+| 77 = @legacy_letexpr
+| 78 = @var_decl
+| 79 = @proper_varaccess
+| 80 = @class_expr
+| 81 = @super_expr
+| 82 = @newtarget_expr
+| 83 = @named_import_specifier
+| 84 = @import_default_specifier
+| 85 = @import_namespace_specifier
+| 86 = @named_export_specifier
+| 87 = @exp_expr
+| 88 = @assign_exp_expr
+| 89 = @jsx_element
+| 90 = @jsx_qualified_name
+| 91 = @jsx_empty_expr
+| 92 = @await_expr
+| 93 = @function_sent_expr
+| 94 = @decorator
+| 95 = @export_default_specifier
+| 96 = @export_namespace_specifier
+| 97 = @bind_expr
+| 98 = @external_module_reference
+| 99 = @dynamic_import
+| 100 = @expression_with_type_arguments
+| 101 = @prefix_type_assertion
+| 102 = @as_type_assertion
+| 103 = @export_varaccess
+| 104 = @decorator_list
+| 105 = @non_null_assertion
+| 106 = @bigint_literal
+| 107 = @nullishcoalescing_expr
+| 108 = @e4x_xml_anyname
+| 109 = @e4x_xml_static_attribute_selector
+| 110 = @e4x_xml_dynamic_attribute_selector
+| 111 = @e4x_xml_filter_expression
+| 112 = @e4x_xml_static_qualident
+| 113 = @e4x_xml_dynamic_qualident
+| 114 = @e4x_xml_dotdotexpr
+| 115 = @import_meta_expr
+| 116 = @assignlogandexpr
+| 117 = @assignlogorexpr
+| 118 = @assignnullishcoalescingexpr
+| 119 = @template_pipe_ref
+| 120 = @generated_code_expr
+| 121 = @satisfies_expr
+;
+
+@varaccess = @proper_varaccess | @export_varaccess;
+@varref = @var_decl | @varaccess;
+
+@identifier = @label | @varref | @type_identifier;
+
+@literal = @null_literal | @boolean_literal | @number_literal | @string_literal | @regexp_literal | @bigint_literal;
+
+@propaccess = @dot_expr | @index_expr;
+
+@invokeexpr = @new_expr | @call_expr;
+
+@unaryexpr = @neg_expr | @plus_expr | @log_not_expr | @bit_not_expr | @typeof_expr | @void_expr | @delete_expr | @spread_element;
+
+@equality_test = @eq_expr | @neq_expr | @eqq_expr | @neqq_expr;
+
+@comparison = @equality_test | @lt_expr | @le_expr | @gt_expr | @ge_expr;
+
+@binaryexpr = @comparison | @lshift_expr | @rshift_expr | @urshift_expr | @add_expr | @sub_expr | @mul_expr | @div_expr | @mod_expr | @exp_expr | @bitor_expr | @xor_expr | @bitand_expr | @in_expr | @instanceof_expr | @logand_expr | @logor_expr | @nullishcoalescing_expr;
+
+@assignment = @assign_expr | @assign_add_expr | @assign_sub_expr | @assign_mul_expr | @assign_div_expr | @assign_mod_expr | @assign_exp_expr | @assign_lshift_expr | @assign_rshift_expr | @assign_urshift_expr | @assign_or_expr | @assign_xor_expr | @assign_and_expr | @assignlogandexpr | @assignlogorexpr | @assignnullishcoalescingexpr;
+
+@updateexpr = @preinc_expr | @postinc_expr | @predec_expr | @postdec_expr;
+
+@pattern = @varref | @array_pattern | @object_pattern;
+
+@comprehension_expr = @array_comprehension_expr | @generator_expr;
+
+@comprehension_block = @for_in_comprehension_block | @for_of_comprehension_block;
+
+@import_specifier = @named_import_specifier | @import_default_specifier | @import_namespace_specifier;
+
+@exportspecifier = @named_export_specifier | @export_default_specifier | @export_namespace_specifier;
+
+@type_keyword_operand = @import_declaration | @export_declaration | @import_specifier;
+
+@type_assertion = @as_type_assertion | @prefix_type_assertion;
+
+@class_definition = @class_decl_stmt | @class_expr;
+@interface_definition = @interface_declaration | @interface_typeexpr;
+@class_or_interface = @class_definition | @interface_definition;
+
+@lexical_decl = @var_decl | @type_decl;
+@lexical_access = @varaccess | @local_type_access | @local_var_type_access | @local_namespace_access;
+@lexical_ref = @lexical_decl | @lexical_access;
+
+@e4x_xml_attribute_selector = @e4x_xml_static_attribute_selector | @e4x_xml_dynamic_attribute_selector;
+@e4x_xml_qualident = @e4x_xml_static_qualident | @e4x_xml_dynamic_qualident;
+
+expr_contains_template_tag_location(
+  int expr: @expr ref,
+  int location: @location ref
+);
+
+@template_placeholder_tag_parent = @xmlelement | @xmlattribute | @file;
+
+template_placeholder_tag_info(
+  unique int node: @template_placeholder_tag,
+  int parentNode: @template_placeholder_tag_parent ref,
+  varchar(900) raw: string ref
+);
+
+// scopes
+scopes (unique int id: @scope,
+        int kind: int ref);
+
+case @scope.kind of
+   0 = @global_scope
+|  1 = @function_scope
+|  2 = @catch_scope
+|  3 = @module_scope
+|  4 = @block_scope
+|  5 = @for_scope
+|  6 = @for_in_scope // for-of scopes work the same as for-in scopes
+|  7 = @comprehension_block_scope
+|  8 = @class_expr_scope
+|  9 = @namespace_scope
+| 10 = @class_decl_scope
+| 11 = @interface_scope
+| 12 = @type_alias_scope
+| 13 = @mapped_type_scope
+| 14 = @enum_scope
+| 15 = @external_module_scope
+| 16 = @conditional_type_scope;
+
+scopenodes (unique int node: @ast_node ref,
+            int scope: @scope ref);
+
+scopenesting (unique int inner: @scope ref,
+              int outer: @scope ref);
+
+// functions
+@function = @function_decl_stmt | @function_expr | @arrow_function_expr;
+
+@parameterized = @function | @catch_clause;
+@type_parameterized = @function | @class_or_interface | @type_alias_declaration | @mapped_typeexpr | @infer_typeexpr;
+
+is_generator (int fun: @function ref);
+has_rest_parameter (int fun: @function ref);
+is_async (int fun: @function ref);
+
+// variables and lexically scoped type names
+#keyset[scope, name]
+variables (unique int id: @variable,
+           varchar(900) name: string ref,
+           int scope: @scope ref);
+
+#keyset[scope, name]
+local_type_names (unique int id: @local_type_name,
+                  varchar(900) name: string ref,
+                  int scope: @scope ref);
+
+#keyset[scope, name]
+local_namespace_names (unique int id: @local_namespace_name,
+                       varchar(900) name: string ref,
+                       int scope: @scope ref);
+
+is_arguments_object (int id: @variable ref);
+
+@lexical_name = @variable | @local_type_name | @local_namespace_name;
+
+@bind_id = @varaccess | @local_var_type_access;
+bind (unique int id: @bind_id ref,
+      int decl: @variable ref);
+
+decl (unique int id: @var_decl ref,
+      int decl: @variable ref);
+
+@typebind_id = @local_type_access | @export_varaccess;
+typebind (unique int id: @typebind_id ref,
+          int decl: @local_type_name ref);
+
+@typedecl_id = @type_decl | @var_decl;
+typedecl (unique int id: @typedecl_id ref,
+          int decl: @local_type_name ref);
+
+namespacedecl (unique int id: @var_decl ref,
+               int decl: @local_namespace_name ref);
+
+@namespacebind_id = @local_namespace_access | @export_varaccess;
+namespacebind (unique int id: @namespacebind_id ref,
+               int decl: @local_namespace_name ref);
+
+
+// properties in object literals, property patterns in object patterns, and method declarations in classes
+#keyset[parent, index]
+properties (unique int id: @property,
+            int parent: @property_parent ref,
+            int index: int ref,
+            int kind: int ref,
+            varchar(900) tostring: string ref);
+
+case @property.kind of
+  0 = @value_property
+| 1 = @property_getter
+| 2 = @property_setter
+| 3 = @jsx_attribute
+| 4 = @function_call_signature
+| 5 = @constructor_call_signature
+| 6 = @index_signature
+| 7 = @enum_member
+| 8 = @proper_field
+| 9 = @parameter_field
+| 10 = @static_initializer
+;
+
+@property_parent = @obj_expr | @object_pattern | @class_definition | @jsx_element | @interface_definition | @enum_declaration;
+@property_accessor = @property_getter | @property_setter;
+@call_signature = @function_call_signature | @constructor_call_signature;
+@field = @proper_field | @parameter_field;
+@field_or_vardeclarator = @field | @var_declarator;
+
+is_computed (int id: @property ref);
+is_method   (int id: @property ref);
+is_static   (int id: @property ref);
+is_abstract_member (int id: @property ref);
+is_const_enum (int id: @enum_declaration ref);
+is_abstract_class (int id: @class_decl_stmt ref);
+
+has_public_keyword (int id: @property ref);
+has_private_keyword (int id: @property ref);
+has_protected_keyword (int id: @property ref);
+has_readonly_keyword (int id: @property ref);
+has_type_keyword (int id: @type_keyword_operand ref);
+is_optional_member (int id: @property ref);
+has_definite_assignment_assertion (int id: @field_or_vardeclarator ref);
+is_optional_parameter_declaration (unique int parameter: @pattern ref);
+
+#keyset[constructor, param_index]
+parameter_fields(
+  unique int field: @parameter_field ref,
+  int constructor: @function_expr ref,
+  int param_index: int ref
+);
+
+// types
+#keyset[parent, idx]
+typeexprs (
+  unique int id: @typeexpr,
+  int kind: int ref,
+  int parent: @typeexpr_parent ref,
+  int idx: int ref,
+  varchar(900) tostring: string ref
+);
+
+case @typeexpr.kind of
+  0 = @local_type_access
+| 1 = @type_decl
+| 2 = @keyword_typeexpr
+| 3 = @string_literal_typeexpr
+| 4 = @number_literal_typeexpr
+| 5 = @boolean_literal_typeexpr
+| 6 = @array_typeexpr
+| 7 = @union_typeexpr
+| 8 = @indexed_access_typeexpr
+| 9 = @intersection_typeexpr
+| 10 = @parenthesized_typeexpr
+| 11 = @tuple_typeexpr
+| 12 = @keyof_typeexpr
+| 13 = @qualified_type_access
+| 14 = @generic_typeexpr
+| 15 = @type_label
+| 16 = @typeof_typeexpr
+| 17 = @local_var_type_access
+| 18 = @qualified_var_type_access
+| 19 = @this_var_type_access
+| 20 = @predicate_typeexpr
+| 21 = @interface_typeexpr
+| 22 = @type_parameter
+| 23 = @plain_function_typeexpr
+| 24 = @constructor_typeexpr
+| 25 = @local_namespace_access
+| 26 = @qualified_namespace_access
+| 27 = @mapped_typeexpr
+| 28 = @conditional_typeexpr
+| 29 = @infer_typeexpr
+| 30 = @import_type_access
+| 31 = @import_namespace_access
+| 32 = @import_var_type_access
+| 33 = @optional_typeexpr
+| 34 = @rest_typeexpr
+| 35 = @bigint_literal_typeexpr
+| 36 = @readonly_typeexpr
+| 37 = @template_literal_typeexpr
+;
+
+@typeref = @typeaccess | @type_decl;
+@type_identifier = @type_decl | @local_type_access | @type_label | @local_var_type_access | @local_namespace_access;
+@typeexpr_parent = @expr | @stmt | @property | @typeexpr;
+@literal_typeexpr = @string_literal_typeexpr | @number_literal_typeexpr | @boolean_literal_typeexpr | @bigint_literal_typeexpr;
+@typeaccess = @local_type_access | @qualified_type_access | @import_type_access;
+@vartypeaccess = @local_var_type_access | @qualified_var_type_access | @this_var_type_access | @import_var_type_access;
+@namespace_access = @local_namespace_access | @qualified_namespace_access | @import_namespace_access;
+@import_typeexpr = @import_type_access | @import_namespace_access | @import_var_type_access;
+
+@function_typeexpr = @plain_function_typeexpr | @constructor_typeexpr;
+
+// types
+types (
+  unique int id: @type,
+  int kind: int ref,
+  varchar(900) tostring: string ref
+);
+
+#keyset[parent, idx]
+type_child (
+  int child: @type ref,
+  int parent: @type ref,
+  int idx: int ref
+);
+
+case @type.kind of
+  0 = @any_type
+| 1 = @string_type
+| 2 = @number_type
+| 3 = @union_type
+| 4 = @true_type
+| 5 = @false_type
+| 6 = @type_reference
+| 7 = @object_type
+| 8 = @canonical_type_variable_type
+| 9 = @typeof_type
+| 10 = @void_type
+| 11 = @undefined_type
+| 12 = @null_type
+| 13 = @never_type
+| 14 = @plain_symbol_type
+| 15 = @unique_symbol_type
+| 16 = @objectkeyword_type
+| 17 = @intersection_type
+| 18 = @tuple_type
+| 19 = @lexical_type_variable_type
+| 20 = @this_type
+| 21 = @number_literal_type
+| 22 = @string_literal_type
+| 23 = @unknown_type
+| 24 = @bigint_type
+| 25 = @bigint_literal_type
+;
+
+@boolean_literal_type = @true_type | @false_type;
+@symbol_type = @plain_symbol_type | @unique_symbol_type;
+@union_or_intersection_type = @union_type | @intersection_type;
+@typevariable_type = @canonical_type_variable_type | @lexical_type_variable_type;
+
+has_asserts_keyword(int node: @predicate_typeexpr ref);
+
+@typed_ast_node = @expr | @typeexpr | @function;
+ast_node_type(
+  unique int node: @typed_ast_node ref,
+  int typ: @type ref);
+
+declared_function_signature(
+  unique int node: @function ref,
+  int sig: @signature_type ref
+);
+
+invoke_expr_signature(
+  unique int node: @invokeexpr ref,
+  int sig: @signature_type ref
+);
+
+invoke_expr_overload_index(
+  unique int node: @invokeexpr ref,
+  int index: int ref
+);
+
+symbols (
+  unique int id: @symbol,
+  int kind: int ref,
+  varchar(900) name: string ref
+);
+
+symbol_parent (
+  unique int symbol: @symbol ref,
+  int parent: @symbol ref
+);
+
+symbol_module (
+  int symbol: @symbol ref,
+  varchar(900) moduleName: string ref
+);
+
+symbol_global (
+  int symbol: @symbol ref,
+  varchar(900) globalName: string ref
+);
+
+case @symbol.kind of
+  0 = @root_symbol
+| 1 = @member_symbol
+| 2 = @other_symbol
+;
+
+@type_with_symbol = @type_reference | @typevariable_type | @typeof_type | @unique_symbol_type;
+@ast_node_with_symbol = @type_definition | @namespace_definition | @toplevel | @typeaccess | @namespace_access | @var_decl | @function | @invokeexpr | @import_declaration | @external_module_reference | @external_module_declaration;
+
+ast_node_symbol(
+  unique int node: @ast_node_with_symbol ref,
+  int symbol: @symbol ref);
+
+type_symbol(
+  unique int typ: @type_with_symbol ref,
+  int symbol: @symbol ref);
+
+#keyset[typ, name]
+type_property(
+  int typ: @type ref,
+  varchar(900) name: string ref,
+  int propertyType: @type ref);
+
+type_alias(
+  unique int aliasType: @type ref,
+  int underlyingType: @type ref);
+
+@literal_type = @string_literal_type | @number_literal_type | @boolean_literal_type | @bigint_literal_type;
+@type_with_literal_value = @string_literal_type | @number_literal_type | @bigint_literal_type;
+type_literal_value(
+  unique int typ: @type_with_literal_value ref,
+  varchar(900) value: string ref);
+
+signature_types (
+  unique int id: @signature_type,
+  int kind: int ref,
+  varchar(900) tostring: string ref,
+  int type_parameters: int ref,
+  int required_params: int ref
+);
+
+is_abstract_signature(
+  unique int sig: @signature_type ref
+);
+
+signature_rest_parameter(
+  unique int sig: @signature_type ref,
+  int rest_param_arra_type: @type ref
+);
+
+case @signature_type.kind of
+  0 = @function_signature_type
+| 1 = @constructor_signature_type
+;
+
+#keyset[typ, kind, index]
+type_contains_signature (
+  int typ: @type ref,
+  int kind: int ref,  // constructor/call/index
+  int index: int ref, // ordering of overloaded signatures
+  int sig: @signature_type ref
+);
+
+#keyset[parent, index]
+signature_contains_type (
+  int child: @type ref,
+  int parent: @signature_type ref,
+  int index: int ref
+);
+
+#keyset[sig, index]
+signature_parameter_name (
+  int sig: @signature_type ref,
+  int index: int ref,
+  varchar(900) name: string ref
+);
+
+number_index_type (
+  unique int baseType: @type ref,
+  int propertyType: @type ref
+);
+
+string_index_type (
+  unique int baseType: @type ref,
+  int propertyType: @type ref
+);
+
+base_type_names(
+  int typeName: @symbol ref,
+  int baseTypeName: @symbol ref
+);
+
+self_types(
+  int typeName: @symbol ref,
+  int selfType: @type_reference ref
+);
+
+tuple_type_min_length(
+  unique int typ: @type ref,
+  int minLength: int ref
+);
+
+tuple_type_rest_index(
+  unique int typ: @type ref,
+  int index: int ref
+);
+
+// comments
+comments (unique int id: @comment,
+          int kind: int ref,
+          int toplevel: @toplevel ref,
+          varchar(900) text: string ref,
+          varchar(900) tostring: string ref);
+
+case @comment.kind of
+  0 = @slashslash_comment
+| 1 = @slashstar_comment
+| 2 = @doc_comment
+| 3 = @html_comment_start
+| 4 = @htmlcommentend;
+
+@html_comment = @html_comment_start | @htmlcommentend;
+@line_comment = @slashslash_comment | @html_comment;
+@block_comment = @slashstar_comment | @doc_comment;
+
+// source lines
+lines (unique int id: @line,
+       int toplevel: @toplevel ref,
+       varchar(900) text: string ref,
+       varchar(2) terminator: string ref);
+indentation (int file: @file ref,
+            int lineno: int ref,
+            varchar(1) indentChar: string ref,
+            int indentDepth: int ref);
+
+// JavaScript parse errors
+js_parse_errors (unique int id: @js_parse_error,
+        int toplevel: @toplevel ref,
+        varchar(900) message: string ref,
+        varchar(900) line: string ref);
+
+// regular expressions
+#keyset[parent, idx]
+regexpterm (unique int id: @regexpterm,
+        int kind: int ref,
+        int parent: @regexpparent ref,
+        int idx: int ref,
+        varchar(900) tostring: string ref);
+
+@regexpparent = @regexpterm | @regexp_literal | @string_literal | @add_expr;
+
+case @regexpterm.kind of
+   0 = @regexp_alt
+|  1 = @regexp_seq
+|  2 = @regexp_caret
+|  3 = @regexp_dollar
+|  4 = @regexp_wordboundary
+|  5 = @regexp_nonwordboundary
+|  6 = @regexp_positive_lookahead
+|  7 = @regexp_negative_lookahead
+|  8 = @regexp_star
+|  9 = @regexp_plus
+| 10 = @regexp_opt
+| 11 = @regexp_range
+| 12 = @regexp_dot
+| 13 = @regexp_group
+| 14 = @regexp_normal_constant
+| 15 = @regexp_hex_escape
+| 16 = @regexp_unicode_escape
+| 17 = @regexp_dec_escape
+| 18 = @regexp_oct_escape
+| 19 = @regexp_ctrl_escape
+| 20 = @regexp_char_class_escape
+| 21 = @regexp_id_escape
+| 22 = @regexp_backref
+| 23 = @regexp_char_class
+| 24 = @regexp_char_range
+| 25 = @regexp_positive_lookbehind
+| 26 = @regexp_negative_lookbehind
+| 27 = @regexp_unicode_property_escape
+| 28 = @regexp_quoted_string
+| 29 = @regexp_intersection
+| 30 = @regexp_subtraction;
+
+regexp_parse_errors (unique int id: @regexp_parse_error,
+    int regexp: @regexpterm ref,
+    varchar(900) message: string ref);
+
+@regexp_quantifier = @regexp_star | @regexp_plus | @regexp_opt | @regexp_range;
+@regexp_escape = @regexp_char_escape | @regexp_char_class_escape | @regexp_unicode_property_escape;
+@regexp_char_escape = @regexp_hex_escape | @regexp_unicode_escape | @regexp_dec_escape | @regexp_oct_escape | @regexp_ctrl_escape | @regexp_id_escape;
+@regexp_constant = @regexp_normal_constant | @regexp_char_escape;
+@regexp_lookahead = @regexp_positive_lookahead | @regexp_negative_lookahead;
+@regexp_lookbehind = @regexp_positive_lookbehind | @regexp_negative_lookbehind;
+@regexp_subpattern = @regexp_lookahead | @regexp_lookbehind;
+@regexp_anchor = @regexp_dollar | @regexp_caret;
+
+is_greedy (int id: @regexp_quantifier ref);
+range_quantifier_lower_bound (unique int id: @regexp_range ref, int lo: int ref);
+range_quantifier_upper_bound (unique int id: @regexp_range ref, int hi: int ref);
+is_capture (unique int id: @regexp_group ref, int number: int ref);
+is_named_capture (unique int id: @regexp_group ref, string name: string ref);
+is_inverted (int id: @regexp_char_class ref);
+regexp_const_value (unique int id: @regexp_constant ref, varchar(1) value: string ref);
+char_class_escape (unique int id: @regexp_char_class_escape ref, varchar(1) value: string ref);
+backref (unique int id: @regexp_backref ref, int value: int ref);
+named_backref (unique int id: @regexp_backref ref, string name: string ref);
+unicode_property_escapename (unique int id: @regexp_unicode_property_escape ref, string name: string ref);
+unicode_property_escapevalue (unique int id: @regexp_unicode_property_escape ref, string value: string ref);
+
+// tokens
+#keyset[toplevel, idx]
+tokeninfo (unique int id: @token,
+    int kind: int ref,
+    int toplevel: @toplevel ref,
+    int idx: int ref,
+    varchar(900) value: string ref);
+
+case @token.kind of
+  0 = @token_eof
+| 1 = @token_null_literal
+| 2 = @token_boolean_literal
+| 3 = @token_numeric_literal
+| 4 = @token_string_literal
+| 5 = @token_regular_expression
+| 6 = @token_identifier
+| 7 = @token_keyword
+| 8 = @token_punctuator;
+
+// associate comments with the token immediately following them (which may be EOF)
+next_token (int comment: @comment ref, int token: @token ref);
+
+// JSON
+#keyset[parent, idx]
+json (unique int id: @json_value,
+      int kind: int ref,
+      int parent: @json_parent ref,
+      int idx: int ref,
+      varchar(900) tostring: string ref);
+
+json_literals (varchar(900) value: string ref,
+      varchar(900) raw: string ref,
+      unique int expr: @json_value ref);
+
+json_properties (int obj: @json_object ref,
+      varchar(900) property: string ref,
+      int value: @json_value ref);
+
+json_errors (unique int id: @json_parse_error,
+      varchar(900) message: string ref);
+
+json_locations(unique int locatable: @json_locatable ref,
+      int location: @location_default ref);
+
+case @json_value.kind of
+  0 = @json_null
+| 1 = @json_boolean
+| 2 = @json_number
+| 3 = @json_string
+| 4 = @json_array
+| 5 = @json_object;
+
+@json_parent = @json_object | @json_array | @file;
+
+@json_locatable = @json_value | @json_parse_error;
+
+// locations
+@ast_node = @toplevel | @stmt | @expr | @property | @typeexpr;
+
+@locatable = @file
+    | @ast_node
+    | @comment
+    | @line
+    | @js_parse_error | @regexp_parse_error
+    | @regexpterm
+    | @json_locatable
+    | @token
+    | @cfg_node
+    | @jsdoc | @jsdoc_type_expr | @jsdoc_tag
+    | @yaml_locatable
+    | @xmllocatable
+    | @configLocatable
+    | @template_placeholder_tag;
+
+hasLocation (unique int locatable: @locatable ref,
+    int location: @location ref);
+
+// CFG
+entry_cfg_node (unique int id: @entry_node, int container: @stmt_container ref);
+exit_cfg_node (unique int id: @exit_node, int container: @stmt_container ref);
+guard_node (unique int id: @guard_node, int kind: int ref, int test: @expr ref);
+case @guard_node.kind of
+  0 = @falsy_guard
+| 1 = @truthy_guard;
+@condition_guard = @falsy_guard | @truthy_guard;
+
+@synthetic_cfg_node = @entry_node | @exit_node | @guard_node;
+@cfg_node = @synthetic_cfg_node | @expr_parent;
+
+successor (int pred: @cfg_node ref, int succ: @cfg_node ref);
+
+// JSDoc comments
+jsdoc (unique int id: @jsdoc, varchar(900) description: string ref, int comment: @comment ref);
+#keyset[parent, idx]
+jsdoc_tags (unique int id: @jsdoc_tag, varchar(900) title: string ref,
+            int parent: @jsdoc ref, int idx: int ref, varchar(900) tostring: string ref);
+jsdoc_tag_descriptions (unique int tag: @jsdoc_tag ref, varchar(900) text: string ref);
+jsdoc_tag_names (unique int tag: @jsdoc_tag ref, varchar(900) text: string ref);
+
+#keyset[parent, idx]
+jsdoc_type_exprs (unique int id: @jsdoc_type_expr,
+                  int kind: int ref,
+                  int parent: @jsdoc_type_expr_parent ref,
+                  int idx: int ref,
+                  varchar(900) tostring: string ref);
+case @jsdoc_type_expr.kind of
+    0 = @jsdoc_any_type_expr
+|   1 = @jsdoc_null_type_expr
+|   2 = @jsdoc_undefined_type_expr
+|   3 = @jsdoc_unknown_type_expr
+|   4 = @jsdoc_void_type_expr
+|   5 = @jsdoc_identifier_type_expr
+|   6 = @jsdoc_applied_type_expr
+|   7 = @jsdoc_nullable_type_expr
+|   8 = @jsdoc_non_nullable_type_expr
+|   9 = @jsdoc_record_type_expr
+|  10 = @jsdoc_array_type_expr
+|  11 = @jsdoc_union_type_expr
+|  12 = @jsdoc_function_type_expr
+|  13 = @jsdoc_optional_type_expr
+|  14 = @jsdoc_rest_type_expr
+|  15 = @jsdoc_qualified_type_expr
+;
+
+#keyset[id, idx]
+jsdoc_record_field_name (int id: @jsdoc_record_type_expr ref, int idx: int ref, varchar(900) name: string ref);
+jsdoc_prefix_qualifier (int id: @jsdoc_type_expr ref);
+jsdoc_has_new_parameter (int fn: @jsdoc_function_type_expr ref);
+
+@jsdoc_type_expr_parent = @jsdoc_type_expr | @jsdoc_tag;
+
+jsdoc_errors (unique int id: @jsdoc_error, int tag: @jsdoc_tag ref, varchar(900) message: string ref, varchar(900) tostring: string ref);
+
+@dataflownode = @expr | @function_decl_stmt | @class_decl_stmt | @namespace_declaration | @enum_declaration | @property;
+
+@optionalchainable = @call_expr | @propaccess;
+
+isOptionalChaining(int id: @optionalchainable ref);
+
+/**
+ * The time taken for the extraction of a file.
+ * This table contains non-deterministic content.
+ *
+ * The sum of the `time` column for each (`file`, `timerKind`) pair
+ * is the total time taken for extraction of `file`.  The `extractionPhase`
+ * column provides a granular view of the extraction time of the file.
+ */
+extraction_time(
+  int file : @file ref,
+  // see `com.semmle.js.extractor.ExtractionMetrics.ExtractionPhase`.
+  int extractionPhase: int ref,
+  // 0 for the elapsed CPU time in nanoseconds, 1 for the elapsed wallclock time in nanoseconds
+  int timerKind: int ref,
+  float time: float ref
+)
+
+/**
+* Non-timing related data for the extraction of a single file.
+* This table contains non-deterministic content.
+*/
+extraction_data(
+  int file : @file ref,
+  // the absolute path to the cache file
+  varchar(900) cacheFile: string ref,
+  boolean fromCache: boolean ref,
+  int length: int ref
+)
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error;
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+/*- Configuration files with key value pairs -*/
+
+configs(
+  unique int id: @config
+);
+
+configNames(
+  unique int id: @configName,
+  int config: @config ref,
+  string name: string ref
+);
+
+configValues(
+  unique int id: @configValue,
+  int config: @config ref,
+  string value: string ref
+);
+
+configLocations(
+  int locatable: @configLocatable ref,
+  int location: @location_default ref
+);
+
+@configLocatable = @config | @configName | @configValue;
+
+/*- Database metadata -*/
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+overlayChangedFiles(
+  string path: string ref
+);
diff --git a/javascript/ql/lib/upgrades/76a926a00d5f3bc199c203a1437796fd7b2835ba/semmlecode.javascript.dbscheme b/javascript/ql/lib/upgrades/76a926a00d5f3bc199c203a1437796fd7b2835ba/semmlecode.javascript.dbscheme
new file mode 100644
index 00000000000..80b2bc24189
--- /dev/null
+++ b/javascript/ql/lib/upgrades/76a926a00d5f3bc199c203a1437796fd7b2835ba/semmlecode.javascript.dbscheme
@@ -0,0 +1,1205 @@
+/*** Standard fragments ***/
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- JavaScript-specific part -*/
+
+@location = @location_default
+
+@sourceline = @locatable;
+
+filetype(
+  int file: @file ref,
+  string filetype: string ref
+)
+
+// top-level code fragments
+toplevels (unique int id: @toplevel,
+           int kind: int ref);
+
+is_externs (int toplevel: @toplevel ref);
+
+case @toplevel.kind of
+   0 = @script
+|  1 = @inline_script
+|  2 = @event_handler
+|  3 = @javascript_url
+|  4 = @template_toplevel;
+
+is_module (int tl: @toplevel ref);
+is_nodejs (int tl: @toplevel ref);
+is_es2015_module (int tl: @toplevel ref);
+is_closure_module (int tl: @toplevel ref);
+
+@xml_node_with_code = @xmlelement | @xmlattribute | @template_placeholder_tag;
+toplevel_parent_xml_node(
+  unique int toplevel: @toplevel ref,
+  int xmlnode: @xml_node_with_code ref);
+
+xml_element_parent_expression(
+  unique int xmlnode: @xmlelement ref,
+  int expression: @expr ref,
+  int index: int ref);
+
+// statements
+#keyset[parent, idx]
+stmts (unique int id: @stmt,
+       int kind: int ref,
+       int parent: @stmt_parent ref,
+       int idx: int ref,
+       varchar(900) tostring: string ref);
+
+stmt_containers (unique int stmt: @stmt ref,
+       int container: @stmt_container ref);
+
+jump_targets (unique int jump: @stmt ref,
+       int target: @stmt ref);
+
+@stmt_parent = @stmt | @toplevel | @function_expr | @arrow_function_expr | @static_initializer;
+@stmt_container = @toplevel | @function | @namespace_declaration | @external_module_declaration | @global_augmentation_declaration;
+
+case @stmt.kind of
+   0 = @empty_stmt
+|  1 = @block_stmt
+|  2 = @expr_stmt
+|  3 = @if_stmt
+|  4 = @labeled_stmt
+|  5 = @break_stmt
+|  6 = @continue_stmt
+|  7 = @with_stmt
+|  8 = @switch_stmt
+|  9 = @return_stmt
+| 10 = @throw_stmt
+| 11 = @try_stmt
+| 12 = @while_stmt
+| 13 = @do_while_stmt
+| 14 = @for_stmt
+| 15 = @for_in_stmt
+| 16 = @debugger_stmt
+| 17 = @function_decl_stmt
+| 18 = @var_decl_stmt
+| 19 = @case
+| 20 = @catch_clause
+| 21 = @for_of_stmt
+| 22 = @const_decl_stmt
+| 23 = @let_stmt
+| 24 = @legacy_let_stmt
+| 25 = @for_each_stmt
+| 26 = @class_decl_stmt
+| 27 = @import_declaration
+| 28 = @export_all_declaration
+| 29 = @export_default_declaration
+| 30 = @export_named_declaration
+| 31 = @namespace_declaration
+| 32 = @import_equals_declaration
+| 33 = @export_assign_declaration
+| 34 = @interface_declaration
+| 35 = @type_alias_declaration
+| 36 = @enum_declaration
+| 37 = @external_module_declaration
+| 38 = @export_as_namespace_declaration
+| 39 = @global_augmentation_declaration
+| 40 = @using_decl_stmt
+;
+
+@decl_stmt = @var_decl_stmt | @const_decl_stmt | @let_stmt | @legacy_let_stmt | @using_decl_stmt;
+
+@export_declaration = @export_all_declaration | @export_default_declaration | @export_named_declaration;
+
+@namespace_definition = @namespace_declaration | @enum_declaration;
+@type_definition = @class_definition | @interface_declaration | @enum_declaration | @type_alias_declaration | @enum_member;
+
+is_instantiated(unique int decl: @namespace_declaration ref);
+
+@declarable_node = @decl_stmt | @namespace_declaration | @class_decl_stmt | @function_decl_stmt | @enum_declaration | @external_module_declaration | @global_augmentation_declaration | @field;
+has_declare_keyword(unique int stmt: @declarable_node ref);
+
+is_for_await_of(unique int forof: @for_of_stmt ref);
+
+// expressions
+#keyset[parent, idx]
+exprs (unique int id: @expr,
+       int kind: int ref,
+       int parent: @expr_parent ref,
+       int idx: int ref,
+       varchar(900) tostring: string ref);
+
+literals (varchar(900) value: string ref,
+       varchar(900) raw: string ref,
+       unique int expr: @expr_or_type ref);
+
+enclosing_stmt (unique int expr: @expr_or_type ref,
+       int stmt: @stmt ref);
+
+expr_containers (unique int expr: @expr_or_type ref,
+       int container: @stmt_container ref);
+
+array_size (unique int ae: @arraylike ref,
+       int sz: int ref);
+
+is_delegating (int yield: @yield_expr ref);
+
+@expr_or_stmt = @expr | @stmt;
+@expr_or_type = @expr | @typeexpr;
+@expr_parent = @expr_or_stmt | @property | @function_typeexpr;
+@arraylike = @array_expr | @array_pattern;
+@type_annotation = @typeexpr | @jsdoc_type_expr;
+@node_in_stmt_container = @cfg_node | @type_annotation | @toplevel;
+
+case @expr.kind of
+   0 = @label
+|  1 = @null_literal
+|  2 = @boolean_literal
+|  3 = @number_literal
+|  4 = @string_literal
+|  5 = @regexp_literal
+|  6 = @this_expr
+|  7 = @array_expr
+|  8 = @obj_expr
+|  9 = @function_expr
+| 10 = @seq_expr
+| 11 = @conditional_expr
+| 12 = @new_expr
+| 13 = @call_expr
+| 14 = @dot_expr
+| 15 = @index_expr
+| 16 = @neg_expr
+| 17 = @plus_expr
+| 18 = @log_not_expr
+| 19 = @bit_not_expr
+| 20 = @typeof_expr
+| 21 = @void_expr
+| 22 = @delete_expr
+| 23 = @eq_expr
+| 24 = @neq_expr
+| 25 = @eqq_expr
+| 26 = @neqq_expr
+| 27 = @lt_expr
+| 28 = @le_expr
+| 29 = @gt_expr
+| 30 = @ge_expr
+| 31 = @lshift_expr
+| 32 = @rshift_expr
+| 33 = @urshift_expr
+| 34 = @add_expr
+| 35 = @sub_expr
+| 36 = @mul_expr
+| 37 = @div_expr
+| 38 = @mod_expr
+| 39 = @bitor_expr
+| 40 = @xor_expr
+| 41 = @bitand_expr
+| 42 = @in_expr
+| 43 = @instanceof_expr
+| 44 = @logand_expr
+| 45 = @logor_expr
+| 47 = @assign_expr
+| 48 = @assign_add_expr
+| 49 = @assign_sub_expr
+| 50 = @assign_mul_expr
+| 51 = @assign_div_expr
+| 52 = @assign_mod_expr
+| 53 = @assign_lshift_expr
+| 54 = @assign_rshift_expr
+| 55 = @assign_urshift_expr
+| 56 = @assign_or_expr
+| 57 = @assign_xor_expr
+| 58 = @assign_and_expr
+| 59 = @preinc_expr
+| 60 = @postinc_expr
+| 61 = @predec_expr
+| 62 = @postdec_expr
+| 63 = @par_expr
+| 64 = @var_declarator
+| 65 = @arrow_function_expr
+| 66 = @spread_element
+| 67 = @array_pattern
+| 68 = @object_pattern
+| 69 = @yield_expr
+| 70 = @tagged_template_expr
+| 71 = @template_literal
+| 72 = @template_element
+| 73 = @array_comprehension_expr
+| 74 = @generator_expr
+| 75 = @for_in_comprehension_block
+| 76 = @for_of_comprehension_block
+| 77 = @legacy_letexpr
+| 78 = @var_decl
+| 79 = @proper_varaccess
+| 80 = @class_expr
+| 81 = @super_expr
+| 82 = @newtarget_expr
+| 83 = @named_import_specifier
+| 84 = @import_default_specifier
+| 85 = @import_namespace_specifier
+| 86 = @named_export_specifier
+| 87 = @exp_expr
+| 88 = @assign_exp_expr
+| 89 = @jsx_element
+| 90 = @jsx_qualified_name
+| 91 = @jsx_empty_expr
+| 92 = @await_expr
+| 93 = @function_sent_expr
+| 94 = @decorator
+| 95 = @export_default_specifier
+| 96 = @export_namespace_specifier
+| 97 = @bind_expr
+| 98 = @external_module_reference
+| 99 = @dynamic_import
+| 100 = @expression_with_type_arguments
+| 101 = @prefix_type_assertion
+| 102 = @as_type_assertion
+| 103 = @export_varaccess
+| 104 = @decorator_list
+| 105 = @non_null_assertion
+| 106 = @bigint_literal
+| 107 = @nullishcoalescing_expr
+| 108 = @e4x_xml_anyname
+| 109 = @e4x_xml_static_attribute_selector
+| 110 = @e4x_xml_dynamic_attribute_selector
+| 111 = @e4x_xml_filter_expression
+| 112 = @e4x_xml_static_qualident
+| 113 = @e4x_xml_dynamic_qualident
+| 114 = @e4x_xml_dotdotexpr
+| 115 = @import_meta_expr
+| 116 = @assignlogandexpr
+| 117 = @assignlogorexpr
+| 118 = @assignnullishcoalescingexpr
+| 119 = @template_pipe_ref
+| 120 = @generated_code_expr
+| 121 = @satisfies_expr
+;
+
+@varaccess = @proper_varaccess | @export_varaccess;
+@varref = @var_decl | @varaccess;
+
+@identifier = @label | @varref | @type_identifier;
+
+@literal = @null_literal | @boolean_literal | @number_literal | @string_literal | @regexp_literal | @bigint_literal;
+
+@propaccess = @dot_expr | @index_expr;
+
+@invokeexpr = @new_expr | @call_expr;
+
+@unaryexpr = @neg_expr | @plus_expr | @log_not_expr | @bit_not_expr | @typeof_expr | @void_expr | @delete_expr | @spread_element;
+
+@equality_test = @eq_expr | @neq_expr | @eqq_expr | @neqq_expr;
+
+@comparison = @equality_test | @lt_expr | @le_expr | @gt_expr | @ge_expr;
+
+@binaryexpr = @comparison | @lshift_expr | @rshift_expr | @urshift_expr | @add_expr | @sub_expr | @mul_expr | @div_expr | @mod_expr | @exp_expr | @bitor_expr | @xor_expr | @bitand_expr | @in_expr | @instanceof_expr | @logand_expr | @logor_expr | @nullishcoalescing_expr;
+
+@assignment = @assign_expr | @assign_add_expr | @assign_sub_expr | @assign_mul_expr | @assign_div_expr | @assign_mod_expr | @assign_exp_expr | @assign_lshift_expr | @assign_rshift_expr | @assign_urshift_expr | @assign_or_expr | @assign_xor_expr | @assign_and_expr | @assignlogandexpr | @assignlogorexpr | @assignnullishcoalescingexpr;
+
+@updateexpr = @preinc_expr | @postinc_expr | @predec_expr | @postdec_expr;
+
+@pattern = @varref | @array_pattern | @object_pattern;
+
+@comprehension_expr = @array_comprehension_expr | @generator_expr;
+
+@comprehension_block = @for_in_comprehension_block | @for_of_comprehension_block;
+
+@import_specifier = @named_import_specifier | @import_default_specifier | @import_namespace_specifier;
+
+@exportspecifier = @named_export_specifier | @export_default_specifier | @export_namespace_specifier;
+
+@type_keyword_operand = @import_declaration | @export_declaration | @import_specifier;
+
+@type_assertion = @as_type_assertion | @prefix_type_assertion;
+
+@class_definition = @class_decl_stmt | @class_expr;
+@interface_definition = @interface_declaration | @interface_typeexpr;
+@class_or_interface = @class_definition | @interface_definition;
+
+@lexical_decl = @var_decl | @type_decl;
+@lexical_access = @varaccess | @local_type_access | @local_var_type_access | @local_namespace_access;
+@lexical_ref = @lexical_decl | @lexical_access;
+
+@e4x_xml_attribute_selector = @e4x_xml_static_attribute_selector | @e4x_xml_dynamic_attribute_selector;
+@e4x_xml_qualident = @e4x_xml_static_qualident | @e4x_xml_dynamic_qualident;
+
+expr_contains_template_tag_location(
+  int expr: @expr ref,
+  int location: @location ref
+);
+
+@template_placeholder_tag_parent = @xmlelement | @xmlattribute | @file;
+
+template_placeholder_tag_info(
+  unique int node: @template_placeholder_tag,
+  int parentNode: @template_placeholder_tag_parent ref,
+  varchar(900) raw: string ref
+);
+
+// scopes
+scopes (unique int id: @scope,
+        int kind: int ref);
+
+case @scope.kind of
+   0 = @global_scope
+|  1 = @function_scope
+|  2 = @catch_scope
+|  3 = @module_scope
+|  4 = @block_scope
+|  5 = @for_scope
+|  6 = @for_in_scope // for-of scopes work the same as for-in scopes
+|  7 = @comprehension_block_scope
+|  8 = @class_expr_scope
+|  9 = @namespace_scope
+| 10 = @class_decl_scope
+| 11 = @interface_scope
+| 12 = @type_alias_scope
+| 13 = @mapped_type_scope
+| 14 = @enum_scope
+| 15 = @external_module_scope
+| 16 = @conditional_type_scope;
+
+scopenodes (unique int node: @ast_node ref,
+            int scope: @scope ref);
+
+scopenesting (unique int inner: @scope ref,
+              int outer: @scope ref);
+
+// functions
+@function = @function_decl_stmt | @function_expr | @arrow_function_expr;
+
+@parameterized = @function | @catch_clause;
+@type_parameterized = @function | @class_or_interface | @type_alias_declaration | @mapped_typeexpr | @infer_typeexpr;
+
+is_generator (int fun: @function ref);
+has_rest_parameter (int fun: @function ref);
+is_async (int fun: @function ref);
+
+// variables and lexically scoped type names
+#keyset[scope, name]
+variables (unique int id: @variable,
+           varchar(900) name: string ref,
+           int scope: @scope ref);
+
+#keyset[scope, name]
+local_type_names (unique int id: @local_type_name,
+                  varchar(900) name: string ref,
+                  int scope: @scope ref);
+
+#keyset[scope, name]
+local_namespace_names (unique int id: @local_namespace_name,
+                       varchar(900) name: string ref,
+                       int scope: @scope ref);
+
+is_arguments_object (int id: @variable ref);
+
+@lexical_name = @variable | @local_type_name | @local_namespace_name;
+
+@bind_id = @varaccess | @local_var_type_access;
+bind (unique int id: @bind_id ref,
+      int decl: @variable ref);
+
+decl (unique int id: @var_decl ref,
+      int decl: @variable ref);
+
+@typebind_id = @local_type_access | @export_varaccess;
+typebind (unique int id: @typebind_id ref,
+          int decl: @local_type_name ref);
+
+@typedecl_id = @type_decl | @var_decl;
+typedecl (unique int id: @typedecl_id ref,
+          int decl: @local_type_name ref);
+
+namespacedecl (unique int id: @var_decl ref,
+               int decl: @local_namespace_name ref);
+
+@namespacebind_id = @local_namespace_access | @export_varaccess;
+namespacebind (unique int id: @namespacebind_id ref,
+               int decl: @local_namespace_name ref);
+
+
+// properties in object literals, property patterns in object patterns, and method declarations in classes
+#keyset[parent, index]
+properties (unique int id: @property,
+            int parent: @property_parent ref,
+            int index: int ref,
+            int kind: int ref,
+            varchar(900) tostring: string ref);
+
+case @property.kind of
+  0 = @value_property
+| 1 = @property_getter
+| 2 = @property_setter
+| 3 = @jsx_attribute
+| 4 = @function_call_signature
+| 5 = @constructor_call_signature
+| 6 = @index_signature
+| 7 = @enum_member
+| 8 = @proper_field
+| 9 = @parameter_field
+| 10 = @static_initializer
+;
+
+@property_parent = @obj_expr | @object_pattern | @class_definition | @jsx_element | @interface_definition | @enum_declaration;
+@property_accessor = @property_getter | @property_setter;
+@call_signature = @function_call_signature | @constructor_call_signature;
+@field = @proper_field | @parameter_field;
+@field_or_vardeclarator = @field | @var_declarator;
+
+is_computed (int id: @property ref);
+is_method   (int id: @property ref);
+is_static   (int id: @property ref);
+is_abstract_member (int id: @property ref);
+is_const_enum (int id: @enum_declaration ref);
+is_abstract_class (int id: @class_decl_stmt ref);
+
+has_public_keyword (int id: @property ref);
+has_private_keyword (int id: @property ref);
+has_protected_keyword (int id: @property ref);
+has_readonly_keyword (int id: @property ref);
+has_type_keyword (int id: @type_keyword_operand ref);
+has_defer_keyword (int id: @import_declaration ref);
+is_optional_member (int id: @property ref);
+has_definite_assignment_assertion (int id: @field_or_vardeclarator ref);
+is_optional_parameter_declaration (unique int parameter: @pattern ref);
+
+#keyset[constructor, param_index]
+parameter_fields(
+  unique int field: @parameter_field ref,
+  int constructor: @function_expr ref,
+  int param_index: int ref
+);
+
+// types
+#keyset[parent, idx]
+typeexprs (
+  unique int id: @typeexpr,
+  int kind: int ref,
+  int parent: @typeexpr_parent ref,
+  int idx: int ref,
+  varchar(900) tostring: string ref
+);
+
+case @typeexpr.kind of
+  0 = @local_type_access
+| 1 = @type_decl
+| 2 = @keyword_typeexpr
+| 3 = @string_literal_typeexpr
+| 4 = @number_literal_typeexpr
+| 5 = @boolean_literal_typeexpr
+| 6 = @array_typeexpr
+| 7 = @union_typeexpr
+| 8 = @indexed_access_typeexpr
+| 9 = @intersection_typeexpr
+| 10 = @parenthesized_typeexpr
+| 11 = @tuple_typeexpr
+| 12 = @keyof_typeexpr
+| 13 = @qualified_type_access
+| 14 = @generic_typeexpr
+| 15 = @type_label
+| 16 = @typeof_typeexpr
+| 17 = @local_var_type_access
+| 18 = @qualified_var_type_access
+| 19 = @this_var_type_access
+| 20 = @predicate_typeexpr
+| 21 = @interface_typeexpr
+| 22 = @type_parameter
+| 23 = @plain_function_typeexpr
+| 24 = @constructor_typeexpr
+| 25 = @local_namespace_access
+| 26 = @qualified_namespace_access
+| 27 = @mapped_typeexpr
+| 28 = @conditional_typeexpr
+| 29 = @infer_typeexpr
+| 30 = @import_type_access
+| 31 = @import_namespace_access
+| 32 = @import_var_type_access
+| 33 = @optional_typeexpr
+| 34 = @rest_typeexpr
+| 35 = @bigint_literal_typeexpr
+| 36 = @readonly_typeexpr
+| 37 = @template_literal_typeexpr
+;
+
+@typeref = @typeaccess | @type_decl;
+@type_identifier = @type_decl | @local_type_access | @type_label | @local_var_type_access | @local_namespace_access;
+@typeexpr_parent = @expr | @stmt | @property | @typeexpr;
+@literal_typeexpr = @string_literal_typeexpr | @number_literal_typeexpr | @boolean_literal_typeexpr | @bigint_literal_typeexpr;
+@typeaccess = @local_type_access | @qualified_type_access | @import_type_access;
+@vartypeaccess = @local_var_type_access | @qualified_var_type_access | @this_var_type_access | @import_var_type_access;
+@namespace_access = @local_namespace_access | @qualified_namespace_access | @import_namespace_access;
+@import_typeexpr = @import_type_access | @import_namespace_access | @import_var_type_access;
+
+@function_typeexpr = @plain_function_typeexpr | @constructor_typeexpr;
+
+// types
+types (
+  unique int id: @type,
+  int kind: int ref,
+  varchar(900) tostring: string ref
+);
+
+#keyset[parent, idx]
+type_child (
+  int child: @type ref,
+  int parent: @type ref,
+  int idx: int ref
+);
+
+case @type.kind of
+  0 = @any_type
+| 1 = @string_type
+| 2 = @number_type
+| 3 = @union_type
+| 4 = @true_type
+| 5 = @false_type
+| 6 = @type_reference
+| 7 = @object_type
+| 8 = @canonical_type_variable_type
+| 9 = @typeof_type
+| 10 = @void_type
+| 11 = @undefined_type
+| 12 = @null_type
+| 13 = @never_type
+| 14 = @plain_symbol_type
+| 15 = @unique_symbol_type
+| 16 = @objectkeyword_type
+| 17 = @intersection_type
+| 18 = @tuple_type
+| 19 = @lexical_type_variable_type
+| 20 = @this_type
+| 21 = @number_literal_type
+| 22 = @string_literal_type
+| 23 = @unknown_type
+| 24 = @bigint_type
+| 25 = @bigint_literal_type
+;
+
+@boolean_literal_type = @true_type | @false_type;
+@symbol_type = @plain_symbol_type | @unique_symbol_type;
+@union_or_intersection_type = @union_type | @intersection_type;
+@typevariable_type = @canonical_type_variable_type | @lexical_type_variable_type;
+
+has_asserts_keyword(int node: @predicate_typeexpr ref);
+
+@typed_ast_node = @expr | @typeexpr | @function;
+ast_node_type(
+  unique int node: @typed_ast_node ref,
+  int typ: @type ref);
+
+declared_function_signature(
+  unique int node: @function ref,
+  int sig: @signature_type ref
+);
+
+invoke_expr_signature(
+  unique int node: @invokeexpr ref,
+  int sig: @signature_type ref
+);
+
+invoke_expr_overload_index(
+  unique int node: @invokeexpr ref,
+  int index: int ref
+);
+
+symbols (
+  unique int id: @symbol,
+  int kind: int ref,
+  varchar(900) name: string ref
+);
+
+symbol_parent (
+  unique int symbol: @symbol ref,
+  int parent: @symbol ref
+);
+
+symbol_module (
+  int symbol: @symbol ref,
+  varchar(900) moduleName: string ref
+);
+
+symbol_global (
+  int symbol: @symbol ref,
+  varchar(900) globalName: string ref
+);
+
+case @symbol.kind of
+  0 = @root_symbol
+| 1 = @member_symbol
+| 2 = @other_symbol
+;
+
+@type_with_symbol = @type_reference | @typevariable_type | @typeof_type | @unique_symbol_type;
+@ast_node_with_symbol = @type_definition | @namespace_definition | @toplevel | @typeaccess | @namespace_access | @var_decl | @function | @invokeexpr | @import_declaration | @external_module_reference | @external_module_declaration;
+
+ast_node_symbol(
+  unique int node: @ast_node_with_symbol ref,
+  int symbol: @symbol ref);
+
+type_symbol(
+  unique int typ: @type_with_symbol ref,
+  int symbol: @symbol ref);
+
+#keyset[typ, name]
+type_property(
+  int typ: @type ref,
+  varchar(900) name: string ref,
+  int propertyType: @type ref);
+
+type_alias(
+  unique int aliasType: @type ref,
+  int underlyingType: @type ref);
+
+@literal_type = @string_literal_type | @number_literal_type | @boolean_literal_type | @bigint_literal_type;
+@type_with_literal_value = @string_literal_type | @number_literal_type | @bigint_literal_type;
+type_literal_value(
+  unique int typ: @type_with_literal_value ref,
+  varchar(900) value: string ref);
+
+signature_types (
+  unique int id: @signature_type,
+  int kind: int ref,
+  varchar(900) tostring: string ref,
+  int type_parameters: int ref,
+  int required_params: int ref
+);
+
+is_abstract_signature(
+  unique int sig: @signature_type ref
+);
+
+signature_rest_parameter(
+  unique int sig: @signature_type ref,
+  int rest_param_arra_type: @type ref
+);
+
+case @signature_type.kind of
+  0 = @function_signature_type
+| 1 = @constructor_signature_type
+;
+
+#keyset[typ, kind, index]
+type_contains_signature (
+  int typ: @type ref,
+  int kind: int ref,  // constructor/call/index
+  int index: int ref, // ordering of overloaded signatures
+  int sig: @signature_type ref
+);
+
+#keyset[parent, index]
+signature_contains_type (
+  int child: @type ref,
+  int parent: @signature_type ref,
+  int index: int ref
+);
+
+#keyset[sig, index]
+signature_parameter_name (
+  int sig: @signature_type ref,
+  int index: int ref,
+  varchar(900) name: string ref
+);
+
+number_index_type (
+  unique int baseType: @type ref,
+  int propertyType: @type ref
+);
+
+string_index_type (
+  unique int baseType: @type ref,
+  int propertyType: @type ref
+);
+
+base_type_names(
+  int typeName: @symbol ref,
+  int baseTypeName: @symbol ref
+);
+
+self_types(
+  int typeName: @symbol ref,
+  int selfType: @type_reference ref
+);
+
+tuple_type_min_length(
+  unique int typ: @type ref,
+  int minLength: int ref
+);
+
+tuple_type_rest_index(
+  unique int typ: @type ref,
+  int index: int ref
+);
+
+// comments
+comments (unique int id: @comment,
+          int kind: int ref,
+          int toplevel: @toplevel ref,
+          varchar(900) text: string ref,
+          varchar(900) tostring: string ref);
+
+case @comment.kind of
+  0 = @slashslash_comment
+| 1 = @slashstar_comment
+| 2 = @doc_comment
+| 3 = @html_comment_start
+| 4 = @htmlcommentend;
+
+@html_comment = @html_comment_start | @htmlcommentend;
+@line_comment = @slashslash_comment | @html_comment;
+@block_comment = @slashstar_comment | @doc_comment;
+
+// source lines
+lines (unique int id: @line,
+       int toplevel: @toplevel ref,
+       varchar(900) text: string ref,
+       varchar(2) terminator: string ref);
+indentation (int file: @file ref,
+            int lineno: int ref,
+            varchar(1) indentChar: string ref,
+            int indentDepth: int ref);
+
+// JavaScript parse errors
+js_parse_errors (unique int id: @js_parse_error,
+        int toplevel: @toplevel ref,
+        varchar(900) message: string ref,
+        varchar(900) line: string ref);
+
+// regular expressions
+#keyset[parent, idx]
+regexpterm (unique int id: @regexpterm,
+        int kind: int ref,
+        int parent: @regexpparent ref,
+        int idx: int ref,
+        varchar(900) tostring: string ref);
+
+@regexpparent = @regexpterm | @regexp_literal | @string_literal | @add_expr;
+
+case @regexpterm.kind of
+   0 = @regexp_alt
+|  1 = @regexp_seq
+|  2 = @regexp_caret
+|  3 = @regexp_dollar
+|  4 = @regexp_wordboundary
+|  5 = @regexp_nonwordboundary
+|  6 = @regexp_positive_lookahead
+|  7 = @regexp_negative_lookahead
+|  8 = @regexp_star
+|  9 = @regexp_plus
+| 10 = @regexp_opt
+| 11 = @regexp_range
+| 12 = @regexp_dot
+| 13 = @regexp_group
+| 14 = @regexp_normal_constant
+| 15 = @regexp_hex_escape
+| 16 = @regexp_unicode_escape
+| 17 = @regexp_dec_escape
+| 18 = @regexp_oct_escape
+| 19 = @regexp_ctrl_escape
+| 20 = @regexp_char_class_escape
+| 21 = @regexp_id_escape
+| 22 = @regexp_backref
+| 23 = @regexp_char_class
+| 24 = @regexp_char_range
+| 25 = @regexp_positive_lookbehind
+| 26 = @regexp_negative_lookbehind
+| 27 = @regexp_unicode_property_escape
+| 28 = @regexp_quoted_string
+| 29 = @regexp_intersection
+| 30 = @regexp_subtraction;
+
+regexp_parse_errors (unique int id: @regexp_parse_error,
+    int regexp: @regexpterm ref,
+    varchar(900) message: string ref);
+
+@regexp_quantifier = @regexp_star | @regexp_plus | @regexp_opt | @regexp_range;
+@regexp_escape = @regexp_char_escape | @regexp_char_class_escape | @regexp_unicode_property_escape;
+@regexp_char_escape = @regexp_hex_escape | @regexp_unicode_escape | @regexp_dec_escape | @regexp_oct_escape | @regexp_ctrl_escape | @regexp_id_escape;
+@regexp_constant = @regexp_normal_constant | @regexp_char_escape;
+@regexp_lookahead = @regexp_positive_lookahead | @regexp_negative_lookahead;
+@regexp_lookbehind = @regexp_positive_lookbehind | @regexp_negative_lookbehind;
+@regexp_subpattern = @regexp_lookahead | @regexp_lookbehind;
+@regexp_anchor = @regexp_dollar | @regexp_caret;
+
+is_greedy (int id: @regexp_quantifier ref);
+range_quantifier_lower_bound (unique int id: @regexp_range ref, int lo: int ref);
+range_quantifier_upper_bound (unique int id: @regexp_range ref, int hi: int ref);
+is_capture (unique int id: @regexp_group ref, int number: int ref);
+is_named_capture (unique int id: @regexp_group ref, string name: string ref);
+is_inverted (int id: @regexp_char_class ref);
+regexp_const_value (unique int id: @regexp_constant ref, varchar(1) value: string ref);
+char_class_escape (unique int id: @regexp_char_class_escape ref, varchar(1) value: string ref);
+backref (unique int id: @regexp_backref ref, int value: int ref);
+named_backref (unique int id: @regexp_backref ref, string name: string ref);
+unicode_property_escapename (unique int id: @regexp_unicode_property_escape ref, string name: string ref);
+unicode_property_escapevalue (unique int id: @regexp_unicode_property_escape ref, string value: string ref);
+
+// tokens
+#keyset[toplevel, idx]
+tokeninfo (unique int id: @token,
+    int kind: int ref,
+    int toplevel: @toplevel ref,
+    int idx: int ref,
+    varchar(900) value: string ref);
+
+case @token.kind of
+  0 = @token_eof
+| 1 = @token_null_literal
+| 2 = @token_boolean_literal
+| 3 = @token_numeric_literal
+| 4 = @token_string_literal
+| 5 = @token_regular_expression
+| 6 = @token_identifier
+| 7 = @token_keyword
+| 8 = @token_punctuator;
+
+// associate comments with the token immediately following them (which may be EOF)
+next_token (int comment: @comment ref, int token: @token ref);
+
+// JSON
+#keyset[parent, idx]
+json (unique int id: @json_value,
+      int kind: int ref,
+      int parent: @json_parent ref,
+      int idx: int ref,
+      varchar(900) tostring: string ref);
+
+json_literals (varchar(900) value: string ref,
+      varchar(900) raw: string ref,
+      unique int expr: @json_value ref);
+
+json_properties (int obj: @json_object ref,
+      varchar(900) property: string ref,
+      int value: @json_value ref);
+
+json_errors (unique int id: @json_parse_error,
+      varchar(900) message: string ref);
+
+json_locations(unique int locatable: @json_locatable ref,
+      int location: @location_default ref);
+
+case @json_value.kind of
+  0 = @json_null
+| 1 = @json_boolean
+| 2 = @json_number
+| 3 = @json_string
+| 4 = @json_array
+| 5 = @json_object;
+
+@json_parent = @json_object | @json_array | @file;
+
+@json_locatable = @json_value | @json_parse_error;
+
+// locations
+@ast_node = @toplevel | @stmt | @expr | @property | @typeexpr;
+
+@locatable = @file
+    | @ast_node
+    | @comment
+    | @line
+    | @js_parse_error | @regexp_parse_error
+    | @regexpterm
+    | @json_locatable
+    | @token
+    | @cfg_node
+    | @jsdoc | @jsdoc_type_expr | @jsdoc_tag
+    | @yaml_locatable
+    | @xmllocatable
+    | @configLocatable
+    | @template_placeholder_tag;
+
+hasLocation (unique int locatable: @locatable ref,
+    int location: @location ref);
+
+// CFG
+entry_cfg_node (unique int id: @entry_node, int container: @stmt_container ref);
+exit_cfg_node (unique int id: @exit_node, int container: @stmt_container ref);
+guard_node (unique int id: @guard_node, int kind: int ref, int test: @expr ref);
+case @guard_node.kind of
+  0 = @falsy_guard
+| 1 = @truthy_guard;
+@condition_guard = @falsy_guard | @truthy_guard;
+
+@synthetic_cfg_node = @entry_node | @exit_node | @guard_node;
+@cfg_node = @synthetic_cfg_node | @expr_parent;
+
+successor (int pred: @cfg_node ref, int succ: @cfg_node ref);
+
+// JSDoc comments
+jsdoc (unique int id: @jsdoc, varchar(900) description: string ref, int comment: @comment ref);
+#keyset[parent, idx]
+jsdoc_tags (unique int id: @jsdoc_tag, varchar(900) title: string ref,
+            int parent: @jsdoc ref, int idx: int ref, varchar(900) tostring: string ref);
+jsdoc_tag_descriptions (unique int tag: @jsdoc_tag ref, varchar(900) text: string ref);
+jsdoc_tag_names (unique int tag: @jsdoc_tag ref, varchar(900) text: string ref);
+
+#keyset[parent, idx]
+jsdoc_type_exprs (unique int id: @jsdoc_type_expr,
+                  int kind: int ref,
+                  int parent: @jsdoc_type_expr_parent ref,
+                  int idx: int ref,
+                  varchar(900) tostring: string ref);
+case @jsdoc_type_expr.kind of
+    0 = @jsdoc_any_type_expr
+|   1 = @jsdoc_null_type_expr
+|   2 = @jsdoc_undefined_type_expr
+|   3 = @jsdoc_unknown_type_expr
+|   4 = @jsdoc_void_type_expr
+|   5 = @jsdoc_identifier_type_expr
+|   6 = @jsdoc_applied_type_expr
+|   7 = @jsdoc_nullable_type_expr
+|   8 = @jsdoc_non_nullable_type_expr
+|   9 = @jsdoc_record_type_expr
+|  10 = @jsdoc_array_type_expr
+|  11 = @jsdoc_union_type_expr
+|  12 = @jsdoc_function_type_expr
+|  13 = @jsdoc_optional_type_expr
+|  14 = @jsdoc_rest_type_expr
+|  15 = @jsdoc_qualified_type_expr
+;
+
+#keyset[id, idx]
+jsdoc_record_field_name (int id: @jsdoc_record_type_expr ref, int idx: int ref, varchar(900) name: string ref);
+jsdoc_prefix_qualifier (int id: @jsdoc_type_expr ref);
+jsdoc_has_new_parameter (int fn: @jsdoc_function_type_expr ref);
+
+@jsdoc_type_expr_parent = @jsdoc_type_expr | @jsdoc_tag;
+
+jsdoc_errors (unique int id: @jsdoc_error, int tag: @jsdoc_tag ref, varchar(900) message: string ref, varchar(900) tostring: string ref);
+
+@dataflownode = @expr | @function_decl_stmt | @class_decl_stmt | @namespace_declaration | @enum_declaration | @property;
+
+@optionalchainable = @call_expr | @propaccess;
+
+isOptionalChaining(int id: @optionalchainable ref);
+
+/**
+ * The time taken for the extraction of a file.
+ * This table contains non-deterministic content.
+ *
+ * The sum of the `time` column for each (`file`, `timerKind`) pair
+ * is the total time taken for extraction of `file`.  The `extractionPhase`
+ * column provides a granular view of the extraction time of the file.
+ */
+extraction_time(
+  int file : @file ref,
+  // see `com.semmle.js.extractor.ExtractionMetrics.ExtractionPhase`.
+  int extractionPhase: int ref,
+  // 0 for the elapsed CPU time in nanoseconds, 1 for the elapsed wallclock time in nanoseconds
+  int timerKind: int ref,
+  float time: float ref
+)
+
+/**
+* Non-timing related data for the extraction of a single file.
+* This table contains non-deterministic content.
+*/
+extraction_data(
+  int file : @file ref,
+  // the absolute path to the cache file
+  varchar(900) cacheFile: string ref,
+  boolean fromCache: boolean ref,
+  int length: int ref
+)
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error;
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+/*- Configuration files with key value pairs -*/
+
+configs(
+  unique int id: @config
+);
+
+configNames(
+  unique int id: @configName,
+  int config: @config ref,
+  string name: string ref
+);
+
+configValues(
+  unique int id: @configValue,
+  int config: @config ref,
+  string value: string ref
+);
+
+configLocations(
+  int locatable: @configLocatable ref,
+  int location: @location_default ref
+);
+
+@configLocatable = @config | @configName | @configValue;
+
+/*- Database metadata -*/
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+overlayChangedFiles(
+  string path: string ref
+);
diff --git a/javascript/ql/lib/upgrades/76a926a00d5f3bc199c203a1437796fd7b2835ba/upgrade.properties b/javascript/ql/lib/upgrades/76a926a00d5f3bc199c203a1437796fd7b2835ba/upgrade.properties
new file mode 100644
index 00000000000..2acd37b6a3a
--- /dev/null
+++ b/javascript/ql/lib/upgrades/76a926a00d5f3bc199c203a1437796fd7b2835ba/upgrade.properties
@@ -0,0 +1,2 @@
+description: add support for deferred imports
+compatibility: backwards
diff --git a/javascript/ql/lib/upgrades/ccefb5e2d49318eea4aeafd4c6ae2af9f94ac72a/old.dbscheme b/javascript/ql/lib/upgrades/ccefb5e2d49318eea4aeafd4c6ae2af9f94ac72a/old.dbscheme
new file mode 100644
index 00000000000..ccefb5e2d49
--- /dev/null
+++ b/javascript/ql/lib/upgrades/ccefb5e2d49318eea4aeafd4c6ae2af9f94ac72a/old.dbscheme
@@ -0,0 +1,1194 @@
+/*** Standard fragments ***/
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- JavaScript-specific part -*/
+
+@location = @location_default
+
+@sourceline = @locatable;
+
+filetype(
+  int file: @file ref,
+  string filetype: string ref
+)
+
+// top-level code fragments
+toplevels (unique int id: @toplevel,
+           int kind: int ref);
+
+is_externs (int toplevel: @toplevel ref);
+
+case @toplevel.kind of
+   0 = @script
+|  1 = @inline_script
+|  2 = @event_handler
+|  3 = @javascript_url
+|  4 = @template_toplevel;
+
+is_module (int tl: @toplevel ref);
+is_nodejs (int tl: @toplevel ref);
+is_es2015_module (int tl: @toplevel ref);
+is_closure_module (int tl: @toplevel ref);
+
+@xml_node_with_code = @xmlelement | @xmlattribute | @template_placeholder_tag;
+toplevel_parent_xml_node(
+  unique int toplevel: @toplevel ref,
+  int xmlnode: @xml_node_with_code ref);
+
+xml_element_parent_expression(
+  unique int xmlnode: @xmlelement ref,
+  int expression: @expr ref,
+  int index: int ref);
+
+// statements
+#keyset[parent, idx]
+stmts (unique int id: @stmt,
+       int kind: int ref,
+       int parent: @stmt_parent ref,
+       int idx: int ref,
+       varchar(900) tostring: string ref);
+
+stmt_containers (unique int stmt: @stmt ref,
+       int container: @stmt_container ref);
+
+jump_targets (unique int jump: @stmt ref,
+       int target: @stmt ref);
+
+@stmt_parent = @stmt | @toplevel | @function_expr | @arrow_function_expr | @static_initializer;
+@stmt_container = @toplevel | @function | @namespace_declaration | @external_module_declaration | @global_augmentation_declaration;
+
+case @stmt.kind of
+   0 = @empty_stmt
+|  1 = @block_stmt
+|  2 = @expr_stmt
+|  3 = @if_stmt
+|  4 = @labeled_stmt
+|  5 = @break_stmt
+|  6 = @continue_stmt
+|  7 = @with_stmt
+|  8 = @switch_stmt
+|  9 = @return_stmt
+| 10 = @throw_stmt
+| 11 = @try_stmt
+| 12 = @while_stmt
+| 13 = @do_while_stmt
+| 14 = @for_stmt
+| 15 = @for_in_stmt
+| 16 = @debugger_stmt
+| 17 = @function_decl_stmt
+| 18 = @var_decl_stmt
+| 19 = @case
+| 20 = @catch_clause
+| 21 = @for_of_stmt
+| 22 = @const_decl_stmt
+| 23 = @let_stmt
+| 24 = @legacy_let_stmt
+| 25 = @for_each_stmt
+| 26 = @class_decl_stmt
+| 27 = @import_declaration
+| 28 = @export_all_declaration
+| 29 = @export_default_declaration
+| 30 = @export_named_declaration
+| 31 = @namespace_declaration
+| 32 = @import_equals_declaration
+| 33 = @export_assign_declaration
+| 34 = @interface_declaration
+| 35 = @type_alias_declaration
+| 36 = @enum_declaration
+| 37 = @external_module_declaration
+| 38 = @export_as_namespace_declaration
+| 39 = @global_augmentation_declaration
+| 40 = @using_decl_stmt
+;
+
+@decl_stmt = @var_decl_stmt | @const_decl_stmt | @let_stmt | @legacy_let_stmt | @using_decl_stmt;
+
+@export_declaration = @export_all_declaration | @export_default_declaration | @export_named_declaration;
+
+@namespace_definition = @namespace_declaration | @enum_declaration;
+@type_definition = @class_definition | @interface_declaration | @enum_declaration | @type_alias_declaration | @enum_member;
+
+is_instantiated(unique int decl: @namespace_declaration ref);
+
+@declarable_node = @decl_stmt | @namespace_declaration | @class_decl_stmt | @function_decl_stmt | @enum_declaration | @external_module_declaration | @global_augmentation_declaration | @field;
+has_declare_keyword(unique int stmt: @declarable_node ref);
+
+is_for_await_of(unique int forof: @for_of_stmt ref);
+
+// expressions
+#keyset[parent, idx]
+exprs (unique int id: @expr,
+       int kind: int ref,
+       int parent: @expr_parent ref,
+       int idx: int ref,
+       varchar(900) tostring: string ref);
+
+literals (varchar(900) value: string ref,
+       varchar(900) raw: string ref,
+       unique int expr: @expr_or_type ref);
+
+enclosing_stmt (unique int expr: @expr_or_type ref,
+       int stmt: @stmt ref);
+
+expr_containers (unique int expr: @expr_or_type ref,
+       int container: @stmt_container ref);
+
+array_size (unique int ae: @arraylike ref,
+       int sz: int ref);
+
+is_delegating (int yield: @yield_expr ref);
+
+@expr_or_stmt = @expr | @stmt;
+@expr_or_type = @expr | @typeexpr;
+@expr_parent = @expr_or_stmt | @property | @function_typeexpr;
+@arraylike = @array_expr | @array_pattern;
+@type_annotation = @typeexpr | @jsdoc_type_expr;
+@node_in_stmt_container = @cfg_node | @type_annotation | @toplevel;
+
+case @expr.kind of
+   0 = @label
+|  1 = @null_literal
+|  2 = @boolean_literal
+|  3 = @number_literal
+|  4 = @string_literal
+|  5 = @regexp_literal
+|  6 = @this_expr
+|  7 = @array_expr
+|  8 = @obj_expr
+|  9 = @function_expr
+| 10 = @seq_expr
+| 11 = @conditional_expr
+| 12 = @new_expr
+| 13 = @call_expr
+| 14 = @dot_expr
+| 15 = @index_expr
+| 16 = @neg_expr
+| 17 = @plus_expr
+| 18 = @log_not_expr
+| 19 = @bit_not_expr
+| 20 = @typeof_expr
+| 21 = @void_expr
+| 22 = @delete_expr
+| 23 = @eq_expr
+| 24 = @neq_expr
+| 25 = @eqq_expr
+| 26 = @neqq_expr
+| 27 = @lt_expr
+| 28 = @le_expr
+| 29 = @gt_expr
+| 30 = @ge_expr
+| 31 = @lshift_expr
+| 32 = @rshift_expr
+| 33 = @urshift_expr
+| 34 = @add_expr
+| 35 = @sub_expr
+| 36 = @mul_expr
+| 37 = @div_expr
+| 38 = @mod_expr
+| 39 = @bitor_expr
+| 40 = @xor_expr
+| 41 = @bitand_expr
+| 42 = @in_expr
+| 43 = @instanceof_expr
+| 44 = @logand_expr
+| 45 = @logor_expr
+| 47 = @assign_expr
+| 48 = @assign_add_expr
+| 49 = @assign_sub_expr
+| 50 = @assign_mul_expr
+| 51 = @assign_div_expr
+| 52 = @assign_mod_expr
+| 53 = @assign_lshift_expr
+| 54 = @assign_rshift_expr
+| 55 = @assign_urshift_expr
+| 56 = @assign_or_expr
+| 57 = @assign_xor_expr
+| 58 = @assign_and_expr
+| 59 = @preinc_expr
+| 60 = @postinc_expr
+| 61 = @predec_expr
+| 62 = @postdec_expr
+| 63 = @par_expr
+| 64 = @var_declarator
+| 65 = @arrow_function_expr
+| 66 = @spread_element
+| 67 = @array_pattern
+| 68 = @object_pattern
+| 69 = @yield_expr
+| 70 = @tagged_template_expr
+| 71 = @template_literal
+| 72 = @template_element
+| 73 = @array_comprehension_expr
+| 74 = @generator_expr
+| 75 = @for_in_comprehension_block
+| 76 = @for_of_comprehension_block
+| 77 = @legacy_letexpr
+| 78 = @var_decl
+| 79 = @proper_varaccess
+| 80 = @class_expr
+| 81 = @super_expr
+| 82 = @newtarget_expr
+| 83 = @named_import_specifier
+| 84 = @import_default_specifier
+| 85 = @import_namespace_specifier
+| 86 = @named_export_specifier
+| 87 = @exp_expr
+| 88 = @assign_exp_expr
+| 89 = @jsx_element
+| 90 = @jsx_qualified_name
+| 91 = @jsx_empty_expr
+| 92 = @await_expr
+| 93 = @function_sent_expr
+| 94 = @decorator
+| 95 = @export_default_specifier
+| 96 = @export_namespace_specifier
+| 97 = @bind_expr
+| 98 = @external_module_reference
+| 99 = @dynamic_import
+| 100 = @expression_with_type_arguments
+| 101 = @prefix_type_assertion
+| 102 = @as_type_assertion
+| 103 = @export_varaccess
+| 104 = @decorator_list
+| 105 = @non_null_assertion
+| 106 = @bigint_literal
+| 107 = @nullishcoalescing_expr
+| 108 = @e4x_xml_anyname
+| 109 = @e4x_xml_static_attribute_selector
+| 110 = @e4x_xml_dynamic_attribute_selector
+| 111 = @e4x_xml_filter_expression
+| 112 = @e4x_xml_static_qualident
+| 113 = @e4x_xml_dynamic_qualident
+| 114 = @e4x_xml_dotdotexpr
+| 115 = @import_meta_expr
+| 116 = @assignlogandexpr
+| 117 = @assignlogorexpr
+| 118 = @assignnullishcoalescingexpr
+| 119 = @template_pipe_ref
+| 120 = @generated_code_expr
+| 121 = @satisfies_expr
+;
+
+@varaccess = @proper_varaccess | @export_varaccess;
+@varref = @var_decl | @varaccess;
+
+@identifier = @label | @varref | @type_identifier;
+
+@literal = @null_literal | @boolean_literal | @number_literal | @string_literal | @regexp_literal | @bigint_literal;
+
+@propaccess = @dot_expr | @index_expr;
+
+@invokeexpr = @new_expr | @call_expr;
+
+@unaryexpr = @neg_expr | @plus_expr | @log_not_expr | @bit_not_expr | @typeof_expr | @void_expr | @delete_expr | @spread_element;
+
+@equality_test = @eq_expr | @neq_expr | @eqq_expr | @neqq_expr;
+
+@comparison = @equality_test | @lt_expr | @le_expr | @gt_expr | @ge_expr;
+
+@binaryexpr = @comparison | @lshift_expr | @rshift_expr | @urshift_expr | @add_expr | @sub_expr | @mul_expr | @div_expr | @mod_expr | @exp_expr | @bitor_expr | @xor_expr | @bitand_expr | @in_expr | @instanceof_expr | @logand_expr | @logor_expr | @nullishcoalescing_expr;
+
+@assignment = @assign_expr | @assign_add_expr | @assign_sub_expr | @assign_mul_expr | @assign_div_expr | @assign_mod_expr | @assign_exp_expr | @assign_lshift_expr | @assign_rshift_expr | @assign_urshift_expr | @assign_or_expr | @assign_xor_expr | @assign_and_expr | @assignlogandexpr | @assignlogorexpr | @assignnullishcoalescingexpr;
+
+@updateexpr = @preinc_expr | @postinc_expr | @predec_expr | @postdec_expr;
+
+@pattern = @varref | @array_pattern | @object_pattern;
+
+@comprehension_expr = @array_comprehension_expr | @generator_expr;
+
+@comprehension_block = @for_in_comprehension_block | @for_of_comprehension_block;
+
+@import_specifier = @named_import_specifier | @import_default_specifier | @import_namespace_specifier;
+
+@exportspecifier = @named_export_specifier | @export_default_specifier | @export_namespace_specifier;
+
+@type_keyword_operand = @import_declaration | @export_declaration | @import_specifier;
+
+@type_assertion = @as_type_assertion | @prefix_type_assertion;
+
+@class_definition = @class_decl_stmt | @class_expr;
+@interface_definition = @interface_declaration | @interface_typeexpr;
+@class_or_interface = @class_definition | @interface_definition;
+
+@lexical_decl = @var_decl | @type_decl;
+@lexical_access = @varaccess | @local_type_access | @local_var_type_access | @local_namespace_access;
+@lexical_ref = @lexical_decl | @lexical_access;
+
+@e4x_xml_attribute_selector = @e4x_xml_static_attribute_selector | @e4x_xml_dynamic_attribute_selector;
+@e4x_xml_qualident = @e4x_xml_static_qualident | @e4x_xml_dynamic_qualident;
+
+expr_contains_template_tag_location(
+  int expr: @expr ref,
+  int location: @location ref
+);
+
+@template_placeholder_tag_parent = @xmlelement | @xmlattribute | @file;
+
+template_placeholder_tag_info(
+  unique int node: @template_placeholder_tag,
+  int parentNode: @template_placeholder_tag_parent ref,
+  varchar(900) raw: string ref
+);
+
+// scopes
+scopes (unique int id: @scope,
+        int kind: int ref);
+
+case @scope.kind of
+   0 = @global_scope
+|  1 = @function_scope
+|  2 = @catch_scope
+|  3 = @module_scope
+|  4 = @block_scope
+|  5 = @for_scope
+|  6 = @for_in_scope // for-of scopes work the same as for-in scopes
+|  7 = @comprehension_block_scope
+|  8 = @class_expr_scope
+|  9 = @namespace_scope
+| 10 = @class_decl_scope
+| 11 = @interface_scope
+| 12 = @type_alias_scope
+| 13 = @mapped_type_scope
+| 14 = @enum_scope
+| 15 = @external_module_scope
+| 16 = @conditional_type_scope;
+
+scopenodes (unique int node: @ast_node ref,
+            int scope: @scope ref);
+
+scopenesting (unique int inner: @scope ref,
+              int outer: @scope ref);
+
+// functions
+@function = @function_decl_stmt | @function_expr | @arrow_function_expr;
+
+@parameterized = @function | @catch_clause;
+@type_parameterized = @function | @class_or_interface | @type_alias_declaration | @mapped_typeexpr | @infer_typeexpr;
+
+is_generator (int fun: @function ref);
+has_rest_parameter (int fun: @function ref);
+is_async (int fun: @function ref);
+
+// variables and lexically scoped type names
+#keyset[scope, name]
+variables (unique int id: @variable,
+           varchar(900) name: string ref,
+           int scope: @scope ref);
+
+#keyset[scope, name]
+local_type_names (unique int id: @local_type_name,
+                  varchar(900) name: string ref,
+                  int scope: @scope ref);
+
+#keyset[scope, name]
+local_namespace_names (unique int id: @local_namespace_name,
+                       varchar(900) name: string ref,
+                       int scope: @scope ref);
+
+is_arguments_object (int id: @variable ref);
+
+@lexical_name = @variable | @local_type_name | @local_namespace_name;
+
+@bind_id = @varaccess | @local_var_type_access;
+bind (unique int id: @bind_id ref,
+      int decl: @variable ref);
+
+decl (unique int id: @var_decl ref,
+      int decl: @variable ref);
+
+@typebind_id = @local_type_access | @export_varaccess;
+typebind (unique int id: @typebind_id ref,
+          int decl: @local_type_name ref);
+
+@typedecl_id = @type_decl | @var_decl;
+typedecl (unique int id: @typedecl_id ref,
+          int decl: @local_type_name ref);
+
+namespacedecl (unique int id: @var_decl ref,
+               int decl: @local_namespace_name ref);
+
+@namespacebind_id = @local_namespace_access | @export_varaccess;
+namespacebind (unique int id: @namespacebind_id ref,
+               int decl: @local_namespace_name ref);
+
+
+// properties in object literals, property patterns in object patterns, and method declarations in classes
+#keyset[parent, index]
+properties (unique int id: @property,
+            int parent: @property_parent ref,
+            int index: int ref,
+            int kind: int ref,
+            varchar(900) tostring: string ref);
+
+case @property.kind of
+  0 = @value_property
+| 1 = @property_getter
+| 2 = @property_setter
+| 3 = @jsx_attribute
+| 4 = @function_call_signature
+| 5 = @constructor_call_signature
+| 6 = @index_signature
+| 7 = @enum_member
+| 8 = @proper_field
+| 9 = @parameter_field
+| 10 = @static_initializer
+;
+
+@property_parent = @obj_expr | @object_pattern | @class_definition | @jsx_element | @interface_definition | @enum_declaration;
+@property_accessor = @property_getter | @property_setter;
+@call_signature = @function_call_signature | @constructor_call_signature;
+@field = @proper_field | @parameter_field;
+@field_or_vardeclarator = @field | @var_declarator;
+
+is_computed (int id: @property ref);
+is_method   (int id: @property ref);
+is_static   (int id: @property ref);
+is_abstract_member (int id: @property ref);
+is_const_enum (int id: @enum_declaration ref);
+is_abstract_class (int id: @class_decl_stmt ref);
+
+has_public_keyword (int id: @property ref);
+has_private_keyword (int id: @property ref);
+has_protected_keyword (int id: @property ref);
+has_readonly_keyword (int id: @property ref);
+has_type_keyword (int id: @type_keyword_operand ref);
+is_optional_member (int id: @property ref);
+has_definite_assignment_assertion (int id: @field_or_vardeclarator ref);
+is_optional_parameter_declaration (unique int parameter: @pattern ref);
+
+#keyset[constructor, param_index]
+parameter_fields(
+  unique int field: @parameter_field ref,
+  int constructor: @function_expr ref,
+  int param_index: int ref
+);
+
+// types
+#keyset[parent, idx]
+typeexprs (
+  unique int id: @typeexpr,
+  int kind: int ref,
+  int parent: @typeexpr_parent ref,
+  int idx: int ref,
+  varchar(900) tostring: string ref
+);
+
+case @typeexpr.kind of
+  0 = @local_type_access
+| 1 = @type_decl
+| 2 = @keyword_typeexpr
+| 3 = @string_literal_typeexpr
+| 4 = @number_literal_typeexpr
+| 5 = @boolean_literal_typeexpr
+| 6 = @array_typeexpr
+| 7 = @union_typeexpr
+| 8 = @indexed_access_typeexpr
+| 9 = @intersection_typeexpr
+| 10 = @parenthesized_typeexpr
+| 11 = @tuple_typeexpr
+| 12 = @keyof_typeexpr
+| 13 = @qualified_type_access
+| 14 = @generic_typeexpr
+| 15 = @type_label
+| 16 = @typeof_typeexpr
+| 17 = @local_var_type_access
+| 18 = @qualified_var_type_access
+| 19 = @this_var_type_access
+| 20 = @predicate_typeexpr
+| 21 = @interface_typeexpr
+| 22 = @type_parameter
+| 23 = @plain_function_typeexpr
+| 24 = @constructor_typeexpr
+| 25 = @local_namespace_access
+| 26 = @qualified_namespace_access
+| 27 = @mapped_typeexpr
+| 28 = @conditional_typeexpr
+| 29 = @infer_typeexpr
+| 30 = @import_type_access
+| 31 = @import_namespace_access
+| 32 = @import_var_type_access
+| 33 = @optional_typeexpr
+| 34 = @rest_typeexpr
+| 35 = @bigint_literal_typeexpr
+| 36 = @readonly_typeexpr
+| 37 = @template_literal_typeexpr
+;
+
+@typeref = @typeaccess | @type_decl;
+@type_identifier = @type_decl | @local_type_access | @type_label | @local_var_type_access | @local_namespace_access;
+@typeexpr_parent = @expr | @stmt | @property | @typeexpr;
+@literal_typeexpr = @string_literal_typeexpr | @number_literal_typeexpr | @boolean_literal_typeexpr | @bigint_literal_typeexpr;
+@typeaccess = @local_type_access | @qualified_type_access | @import_type_access;
+@vartypeaccess = @local_var_type_access | @qualified_var_type_access | @this_var_type_access | @import_var_type_access;
+@namespace_access = @local_namespace_access | @qualified_namespace_access | @import_namespace_access;
+@import_typeexpr = @import_type_access | @import_namespace_access | @import_var_type_access;
+
+@function_typeexpr = @plain_function_typeexpr | @constructor_typeexpr;
+
+// types
+types (
+  unique int id: @type,
+  int kind: int ref,
+  varchar(900) tostring: string ref
+);
+
+#keyset[parent, idx]
+type_child (
+  int child: @type ref,
+  int parent: @type ref,
+  int idx: int ref
+);
+
+case @type.kind of
+  0 = @any_type
+| 1 = @string_type
+| 2 = @number_type
+| 3 = @union_type
+| 4 = @true_type
+| 5 = @false_type
+| 6 = @type_reference
+| 7 = @object_type
+| 8 = @canonical_type_variable_type
+| 9 = @typeof_type
+| 10 = @void_type
+| 11 = @undefined_type
+| 12 = @null_type
+| 13 = @never_type
+| 14 = @plain_symbol_type
+| 15 = @unique_symbol_type
+| 16 = @objectkeyword_type
+| 17 = @intersection_type
+| 18 = @tuple_type
+| 19 = @lexical_type_variable_type
+| 20 = @this_type
+| 21 = @number_literal_type
+| 22 = @string_literal_type
+| 23 = @unknown_type
+| 24 = @bigint_type
+| 25 = @bigint_literal_type
+;
+
+@boolean_literal_type = @true_type | @false_type;
+@symbol_type = @plain_symbol_type | @unique_symbol_type;
+@union_or_intersection_type = @union_type | @intersection_type;
+@typevariable_type = @canonical_type_variable_type | @lexical_type_variable_type;
+
+has_asserts_keyword(int node: @predicate_typeexpr ref);
+
+@typed_ast_node = @expr | @typeexpr | @function;
+ast_node_type(
+  unique int node: @typed_ast_node ref,
+  int typ: @type ref);
+
+declared_function_signature(
+  unique int node: @function ref,
+  int sig: @signature_type ref
+);
+
+invoke_expr_signature(
+  unique int node: @invokeexpr ref,
+  int sig: @signature_type ref
+);
+
+invoke_expr_overload_index(
+  unique int node: @invokeexpr ref,
+  int index: int ref
+);
+
+symbols (
+  unique int id: @symbol,
+  int kind: int ref,
+  varchar(900) name: string ref
+);
+
+symbol_parent (
+  unique int symbol: @symbol ref,
+  int parent: @symbol ref
+);
+
+symbol_module (
+  int symbol: @symbol ref,
+  varchar(900) moduleName: string ref
+);
+
+symbol_global (
+  int symbol: @symbol ref,
+  varchar(900) globalName: string ref
+);
+
+case @symbol.kind of
+  0 = @root_symbol
+| 1 = @member_symbol
+| 2 = @other_symbol
+;
+
+@type_with_symbol = @type_reference | @typevariable_type | @typeof_type | @unique_symbol_type;
+@ast_node_with_symbol = @type_definition | @namespace_definition | @toplevel | @typeaccess | @namespace_access | @var_decl | @function | @invokeexpr | @import_declaration | @external_module_reference | @external_module_declaration;
+
+ast_node_symbol(
+  unique int node: @ast_node_with_symbol ref,
+  int symbol: @symbol ref);
+
+type_symbol(
+  unique int typ: @type_with_symbol ref,
+  int symbol: @symbol ref);
+
+#keyset[typ, name]
+type_property(
+  int typ: @type ref,
+  varchar(900) name: string ref,
+  int propertyType: @type ref);
+
+type_alias(
+  unique int aliasType: @type ref,
+  int underlyingType: @type ref);
+
+@literal_type = @string_literal_type | @number_literal_type | @boolean_literal_type | @bigint_literal_type;
+@type_with_literal_value = @string_literal_type | @number_literal_type | @bigint_literal_type;
+type_literal_value(
+  unique int typ: @type_with_literal_value ref,
+  varchar(900) value: string ref);
+
+signature_types (
+  unique int id: @signature_type,
+  int kind: int ref,
+  varchar(900) tostring: string ref,
+  int type_parameters: int ref,
+  int required_params: int ref
+);
+
+is_abstract_signature(
+  unique int sig: @signature_type ref
+);
+
+signature_rest_parameter(
+  unique int sig: @signature_type ref,
+  int rest_param_arra_type: @type ref
+);
+
+case @signature_type.kind of
+  0 = @function_signature_type
+| 1 = @constructor_signature_type
+;
+
+#keyset[typ, kind, index]
+type_contains_signature (
+  int typ: @type ref,
+  int kind: int ref,  // constructor/call/index
+  int index: int ref, // ordering of overloaded signatures
+  int sig: @signature_type ref
+);
+
+#keyset[parent, index]
+signature_contains_type (
+  int child: @type ref,
+  int parent: @signature_type ref,
+  int index: int ref
+);
+
+#keyset[sig, index]
+signature_parameter_name (
+  int sig: @signature_type ref,
+  int index: int ref,
+  varchar(900) name: string ref
+);
+
+number_index_type (
+  unique int baseType: @type ref,
+  int propertyType: @type ref
+);
+
+string_index_type (
+  unique int baseType: @type ref,
+  int propertyType: @type ref
+);
+
+base_type_names(
+  int typeName: @symbol ref,
+  int baseTypeName: @symbol ref
+);
+
+self_types(
+  int typeName: @symbol ref,
+  int selfType: @type_reference ref
+);
+
+tuple_type_min_length(
+  unique int typ: @type ref,
+  int minLength: int ref
+);
+
+tuple_type_rest_index(
+  unique int typ: @type ref,
+  int index: int ref
+);
+
+// comments
+comments (unique int id: @comment,
+          int kind: int ref,
+          int toplevel: @toplevel ref,
+          varchar(900) text: string ref,
+          varchar(900) tostring: string ref);
+
+case @comment.kind of
+  0 = @slashslash_comment
+| 1 = @slashstar_comment
+| 2 = @doc_comment
+| 3 = @html_comment_start
+| 4 = @htmlcommentend;
+
+@html_comment = @html_comment_start | @htmlcommentend;
+@line_comment = @slashslash_comment | @html_comment;
+@block_comment = @slashstar_comment | @doc_comment;
+
+// source lines
+lines (unique int id: @line,
+       int toplevel: @toplevel ref,
+       varchar(900) text: string ref,
+       varchar(2) terminator: string ref);
+indentation (int file: @file ref,
+            int lineno: int ref,
+            varchar(1) indentChar: string ref,
+            int indentDepth: int ref);
+
+// JavaScript parse errors
+js_parse_errors (unique int id: @js_parse_error,
+        int toplevel: @toplevel ref,
+        varchar(900) message: string ref,
+        varchar(900) line: string ref);
+
+// regular expressions
+#keyset[parent, idx]
+regexpterm (unique int id: @regexpterm,
+        int kind: int ref,
+        int parent: @regexpparent ref,
+        int idx: int ref,
+        varchar(900) tostring: string ref);
+
+@regexpparent = @regexpterm | @regexp_literal | @string_literal | @add_expr;
+
+case @regexpterm.kind of
+   0 = @regexp_alt
+|  1 = @regexp_seq
+|  2 = @regexp_caret
+|  3 = @regexp_dollar
+|  4 = @regexp_wordboundary
+|  5 = @regexp_nonwordboundary
+|  6 = @regexp_positive_lookahead
+|  7 = @regexp_negative_lookahead
+|  8 = @regexp_star
+|  9 = @regexp_plus
+| 10 = @regexp_opt
+| 11 = @regexp_range
+| 12 = @regexp_dot
+| 13 = @regexp_group
+| 14 = @regexp_normal_constant
+| 15 = @regexp_hex_escape
+| 16 = @regexp_unicode_escape
+| 17 = @regexp_dec_escape
+| 18 = @regexp_oct_escape
+| 19 = @regexp_ctrl_escape
+| 20 = @regexp_char_class_escape
+| 21 = @regexp_id_escape
+| 22 = @regexp_backref
+| 23 = @regexp_char_class
+| 24 = @regexp_char_range
+| 25 = @regexp_positive_lookbehind
+| 26 = @regexp_negative_lookbehind
+| 27 = @regexp_unicode_property_escape
+| 28 = @regexp_quoted_string
+| 29 = @regexp_intersection
+| 30 = @regexp_subtraction;
+
+regexp_parse_errors (unique int id: @regexp_parse_error,
+    int regexp: @regexpterm ref,
+    varchar(900) message: string ref);
+
+@regexp_quantifier = @regexp_star | @regexp_plus | @regexp_opt | @regexp_range;
+@regexp_escape = @regexp_char_escape | @regexp_char_class_escape | @regexp_unicode_property_escape;
+@regexp_char_escape = @regexp_hex_escape | @regexp_unicode_escape | @regexp_dec_escape | @regexp_oct_escape | @regexp_ctrl_escape | @regexp_id_escape;
+@regexp_constant = @regexp_normal_constant | @regexp_char_escape;
+@regexp_lookahead = @regexp_positive_lookahead | @regexp_negative_lookahead;
+@regexp_lookbehind = @regexp_positive_lookbehind | @regexp_negative_lookbehind;
+@regexp_subpattern = @regexp_lookahead | @regexp_lookbehind;
+@regexp_anchor = @regexp_dollar | @regexp_caret;
+
+is_greedy (int id: @regexp_quantifier ref);
+range_quantifier_lower_bound (unique int id: @regexp_range ref, int lo: int ref);
+range_quantifier_upper_bound (unique int id: @regexp_range ref, int hi: int ref);
+is_capture (unique int id: @regexp_group ref, int number: int ref);
+is_named_capture (unique int id: @regexp_group ref, string name: string ref);
+is_inverted (int id: @regexp_char_class ref);
+regexp_const_value (unique int id: @regexp_constant ref, varchar(1) value: string ref);
+char_class_escape (unique int id: @regexp_char_class_escape ref, varchar(1) value: string ref);
+backref (unique int id: @regexp_backref ref, int value: int ref);
+named_backref (unique int id: @regexp_backref ref, string name: string ref);
+unicode_property_escapename (unique int id: @regexp_unicode_property_escape ref, string name: string ref);
+unicode_property_escapevalue (unique int id: @regexp_unicode_property_escape ref, string value: string ref);
+
+// tokens
+#keyset[toplevel, idx]
+tokeninfo (unique int id: @token,
+    int kind: int ref,
+    int toplevel: @toplevel ref,
+    int idx: int ref,
+    varchar(900) value: string ref);
+
+case @token.kind of
+  0 = @token_eof
+| 1 = @token_null_literal
+| 2 = @token_boolean_literal
+| 3 = @token_numeric_literal
+| 4 = @token_string_literal
+| 5 = @token_regular_expression
+| 6 = @token_identifier
+| 7 = @token_keyword
+| 8 = @token_punctuator;
+
+// associate comments with the token immediately following them (which may be EOF)
+next_token (int comment: @comment ref, int token: @token ref);
+
+// JSON
+#keyset[parent, idx]
+json (unique int id: @json_value,
+      int kind: int ref,
+      int parent: @json_parent ref,
+      int idx: int ref,
+      varchar(900) tostring: string ref);
+
+json_literals (varchar(900) value: string ref,
+      varchar(900) raw: string ref,
+      unique int expr: @json_value ref);
+
+json_properties (int obj: @json_object ref,
+      varchar(900) property: string ref,
+      int value: @json_value ref);
+
+json_errors (unique int id: @json_parse_error,
+      varchar(900) message: string ref);
+
+json_locations(unique int locatable: @json_locatable ref,
+      int location: @location_default ref);
+
+case @json_value.kind of
+  0 = @json_null
+| 1 = @json_boolean
+| 2 = @json_number
+| 3 = @json_string
+| 4 = @json_array
+| 5 = @json_object;
+
+@json_parent = @json_object | @json_array | @file;
+
+@json_locatable = @json_value | @json_parse_error;
+
+// locations
+@ast_node = @toplevel | @stmt | @expr | @property | @typeexpr;
+
+@locatable = @file
+    | @ast_node
+    | @comment
+    | @line
+    | @js_parse_error | @regexp_parse_error
+    | @regexpterm
+    | @json_locatable
+    | @token
+    | @cfg_node
+    | @jsdoc | @jsdoc_type_expr | @jsdoc_tag
+    | @yaml_locatable
+    | @xmllocatable
+    | @configLocatable
+    | @template_placeholder_tag;
+
+hasLocation (unique int locatable: @locatable ref,
+    int location: @location ref);
+
+// CFG
+entry_cfg_node (unique int id: @entry_node, int container: @stmt_container ref);
+exit_cfg_node (unique int id: @exit_node, int container: @stmt_container ref);
+guard_node (unique int id: @guard_node, int kind: int ref, int test: @expr ref);
+case @guard_node.kind of
+  0 = @falsy_guard
+| 1 = @truthy_guard;
+@condition_guard = @falsy_guard | @truthy_guard;
+
+@synthetic_cfg_node = @entry_node | @exit_node | @guard_node;
+@cfg_node = @synthetic_cfg_node | @expr_parent;
+
+successor (int pred: @cfg_node ref, int succ: @cfg_node ref);
+
+// JSDoc comments
+jsdoc (unique int id: @jsdoc, varchar(900) description: string ref, int comment: @comment ref);
+#keyset[parent, idx]
+jsdoc_tags (unique int id: @jsdoc_tag, varchar(900) title: string ref,
+            int parent: @jsdoc ref, int idx: int ref, varchar(900) tostring: string ref);
+jsdoc_tag_descriptions (unique int tag: @jsdoc_tag ref, varchar(900) text: string ref);
+jsdoc_tag_names (unique int tag: @jsdoc_tag ref, varchar(900) text: string ref);
+
+#keyset[parent, idx]
+jsdoc_type_exprs (unique int id: @jsdoc_type_expr,
+                  int kind: int ref,
+                  int parent: @jsdoc_type_expr_parent ref,
+                  int idx: int ref,
+                  varchar(900) tostring: string ref);
+case @jsdoc_type_expr.kind of
+    0 = @jsdoc_any_type_expr
+|   1 = @jsdoc_null_type_expr
+|   2 = @jsdoc_undefined_type_expr
+|   3 = @jsdoc_unknown_type_expr
+|   4 = @jsdoc_void_type_expr
+|   5 = @jsdoc_identifier_type_expr
+|   6 = @jsdoc_applied_type_expr
+|   7 = @jsdoc_nullable_type_expr
+|   8 = @jsdoc_non_nullable_type_expr
+|   9 = @jsdoc_record_type_expr
+|  10 = @jsdoc_array_type_expr
+|  11 = @jsdoc_union_type_expr
+|  12 = @jsdoc_function_type_expr
+|  13 = @jsdoc_optional_type_expr
+|  14 = @jsdoc_rest_type_expr
+|  15 = @jsdoc_qualified_type_expr
+;
+
+#keyset[id, idx]
+jsdoc_record_field_name (int id: @jsdoc_record_type_expr ref, int idx: int ref, varchar(900) name: string ref);
+jsdoc_prefix_qualifier (int id: @jsdoc_type_expr ref);
+jsdoc_has_new_parameter (int fn: @jsdoc_function_type_expr ref);
+
+@jsdoc_type_expr_parent = @jsdoc_type_expr | @jsdoc_tag;
+
+jsdoc_errors (unique int id: @jsdoc_error, int tag: @jsdoc_tag ref, varchar(900) message: string ref, varchar(900) tostring: string ref);
+
+@dataflownode = @expr | @function_decl_stmt | @class_decl_stmt | @namespace_declaration | @enum_declaration | @property;
+
+@optionalchainable = @call_expr | @propaccess;
+
+isOptionalChaining(int id: @optionalchainable ref);
+
+/**
+ * The time taken for the extraction of a file.
+ * This table contains non-deterministic content.
+ *
+ * The sum of the `time` column for each (`file`, `timerKind`) pair
+ * is the total time taken for extraction of `file`.  The `extractionPhase`
+ * column provides a granular view of the extraction time of the file.
+ */
+extraction_time(
+  int file : @file ref,
+  // see `com.semmle.js.extractor.ExtractionMetrics.ExtractionPhase`.
+  int extractionPhase: int ref,
+  // 0 for the elapsed CPU time in nanoseconds, 1 for the elapsed wallclock time in nanoseconds
+  int timerKind: int ref,
+  float time: float ref
+)
+
+/**
+* Non-timing related data for the extraction of a single file.
+* This table contains non-deterministic content.
+*/
+extraction_data(
+  int file : @file ref,
+  // the absolute path to the cache file
+  varchar(900) cacheFile: string ref,
+  boolean fromCache: boolean ref,
+  int length: int ref
+)
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error;
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+/*- Configuration files with key value pairs -*/
+
+configs(
+  unique int id: @config
+);
+
+configNames(
+  unique int id: @configName,
+  int config: @config ref,
+  string name: string ref
+);
+
+configValues(
+  unique int id: @configValue,
+  int config: @config ref,
+  string value: string ref
+);
+
+configLocations(
+  int locatable: @configLocatable ref,
+  int location: @location_default ref
+);
+
+@configLocatable = @config | @configName | @configValue;
diff --git a/javascript/ql/lib/upgrades/ccefb5e2d49318eea4aeafd4c6ae2af9f94ac72a/semmlecode.javascript.dbscheme b/javascript/ql/lib/upgrades/ccefb5e2d49318eea4aeafd4c6ae2af9f94ac72a/semmlecode.javascript.dbscheme
new file mode 100644
index 00000000000..76a926a00d5
--- /dev/null
+++ b/javascript/ql/lib/upgrades/ccefb5e2d49318eea4aeafd4c6ae2af9f94ac72a/semmlecode.javascript.dbscheme
@@ -0,0 +1,1204 @@
+/*** Standard fragments ***/
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- JavaScript-specific part -*/
+
+@location = @location_default
+
+@sourceline = @locatable;
+
+filetype(
+  int file: @file ref,
+  string filetype: string ref
+)
+
+// top-level code fragments
+toplevels (unique int id: @toplevel,
+           int kind: int ref);
+
+is_externs (int toplevel: @toplevel ref);
+
+case @toplevel.kind of
+   0 = @script
+|  1 = @inline_script
+|  2 = @event_handler
+|  3 = @javascript_url
+|  4 = @template_toplevel;
+
+is_module (int tl: @toplevel ref);
+is_nodejs (int tl: @toplevel ref);
+is_es2015_module (int tl: @toplevel ref);
+is_closure_module (int tl: @toplevel ref);
+
+@xml_node_with_code = @xmlelement | @xmlattribute | @template_placeholder_tag;
+toplevel_parent_xml_node(
+  unique int toplevel: @toplevel ref,
+  int xmlnode: @xml_node_with_code ref);
+
+xml_element_parent_expression(
+  unique int xmlnode: @xmlelement ref,
+  int expression: @expr ref,
+  int index: int ref);
+
+// statements
+#keyset[parent, idx]
+stmts (unique int id: @stmt,
+       int kind: int ref,
+       int parent: @stmt_parent ref,
+       int idx: int ref,
+       varchar(900) tostring: string ref);
+
+stmt_containers (unique int stmt: @stmt ref,
+       int container: @stmt_container ref);
+
+jump_targets (unique int jump: @stmt ref,
+       int target: @stmt ref);
+
+@stmt_parent = @stmt | @toplevel | @function_expr | @arrow_function_expr | @static_initializer;
+@stmt_container = @toplevel | @function | @namespace_declaration | @external_module_declaration | @global_augmentation_declaration;
+
+case @stmt.kind of
+   0 = @empty_stmt
+|  1 = @block_stmt
+|  2 = @expr_stmt
+|  3 = @if_stmt
+|  4 = @labeled_stmt
+|  5 = @break_stmt
+|  6 = @continue_stmt
+|  7 = @with_stmt
+|  8 = @switch_stmt
+|  9 = @return_stmt
+| 10 = @throw_stmt
+| 11 = @try_stmt
+| 12 = @while_stmt
+| 13 = @do_while_stmt
+| 14 = @for_stmt
+| 15 = @for_in_stmt
+| 16 = @debugger_stmt
+| 17 = @function_decl_stmt
+| 18 = @var_decl_stmt
+| 19 = @case
+| 20 = @catch_clause
+| 21 = @for_of_stmt
+| 22 = @const_decl_stmt
+| 23 = @let_stmt
+| 24 = @legacy_let_stmt
+| 25 = @for_each_stmt
+| 26 = @class_decl_stmt
+| 27 = @import_declaration
+| 28 = @export_all_declaration
+| 29 = @export_default_declaration
+| 30 = @export_named_declaration
+| 31 = @namespace_declaration
+| 32 = @import_equals_declaration
+| 33 = @export_assign_declaration
+| 34 = @interface_declaration
+| 35 = @type_alias_declaration
+| 36 = @enum_declaration
+| 37 = @external_module_declaration
+| 38 = @export_as_namespace_declaration
+| 39 = @global_augmentation_declaration
+| 40 = @using_decl_stmt
+;
+
+@decl_stmt = @var_decl_stmt | @const_decl_stmt | @let_stmt | @legacy_let_stmt | @using_decl_stmt;
+
+@export_declaration = @export_all_declaration | @export_default_declaration | @export_named_declaration;
+
+@namespace_definition = @namespace_declaration | @enum_declaration;
+@type_definition = @class_definition | @interface_declaration | @enum_declaration | @type_alias_declaration | @enum_member;
+
+is_instantiated(unique int decl: @namespace_declaration ref);
+
+@declarable_node = @decl_stmt | @namespace_declaration | @class_decl_stmt | @function_decl_stmt | @enum_declaration | @external_module_declaration | @global_augmentation_declaration | @field;
+has_declare_keyword(unique int stmt: @declarable_node ref);
+
+is_for_await_of(unique int forof: @for_of_stmt ref);
+
+// expressions
+#keyset[parent, idx]
+exprs (unique int id: @expr,
+       int kind: int ref,
+       int parent: @expr_parent ref,
+       int idx: int ref,
+       varchar(900) tostring: string ref);
+
+literals (varchar(900) value: string ref,
+       varchar(900) raw: string ref,
+       unique int expr: @expr_or_type ref);
+
+enclosing_stmt (unique int expr: @expr_or_type ref,
+       int stmt: @stmt ref);
+
+expr_containers (unique int expr: @expr_or_type ref,
+       int container: @stmt_container ref);
+
+array_size (unique int ae: @arraylike ref,
+       int sz: int ref);
+
+is_delegating (int yield: @yield_expr ref);
+
+@expr_or_stmt = @expr | @stmt;
+@expr_or_type = @expr | @typeexpr;
+@expr_parent = @expr_or_stmt | @property | @function_typeexpr;
+@arraylike = @array_expr | @array_pattern;
+@type_annotation = @typeexpr | @jsdoc_type_expr;
+@node_in_stmt_container = @cfg_node | @type_annotation | @toplevel;
+
+case @expr.kind of
+   0 = @label
+|  1 = @null_literal
+|  2 = @boolean_literal
+|  3 = @number_literal
+|  4 = @string_literal
+|  5 = @regexp_literal
+|  6 = @this_expr
+|  7 = @array_expr
+|  8 = @obj_expr
+|  9 = @function_expr
+| 10 = @seq_expr
+| 11 = @conditional_expr
+| 12 = @new_expr
+| 13 = @call_expr
+| 14 = @dot_expr
+| 15 = @index_expr
+| 16 = @neg_expr
+| 17 = @plus_expr
+| 18 = @log_not_expr
+| 19 = @bit_not_expr
+| 20 = @typeof_expr
+| 21 = @void_expr
+| 22 = @delete_expr
+| 23 = @eq_expr
+| 24 = @neq_expr
+| 25 = @eqq_expr
+| 26 = @neqq_expr
+| 27 = @lt_expr
+| 28 = @le_expr
+| 29 = @gt_expr
+| 30 = @ge_expr
+| 31 = @lshift_expr
+| 32 = @rshift_expr
+| 33 = @urshift_expr
+| 34 = @add_expr
+| 35 = @sub_expr
+| 36 = @mul_expr
+| 37 = @div_expr
+| 38 = @mod_expr
+| 39 = @bitor_expr
+| 40 = @xor_expr
+| 41 = @bitand_expr
+| 42 = @in_expr
+| 43 = @instanceof_expr
+| 44 = @logand_expr
+| 45 = @logor_expr
+| 47 = @assign_expr
+| 48 = @assign_add_expr
+| 49 = @assign_sub_expr
+| 50 = @assign_mul_expr
+| 51 = @assign_div_expr
+| 52 = @assign_mod_expr
+| 53 = @assign_lshift_expr
+| 54 = @assign_rshift_expr
+| 55 = @assign_urshift_expr
+| 56 = @assign_or_expr
+| 57 = @assign_xor_expr
+| 58 = @assign_and_expr
+| 59 = @preinc_expr
+| 60 = @postinc_expr
+| 61 = @predec_expr
+| 62 = @postdec_expr
+| 63 = @par_expr
+| 64 = @var_declarator
+| 65 = @arrow_function_expr
+| 66 = @spread_element
+| 67 = @array_pattern
+| 68 = @object_pattern
+| 69 = @yield_expr
+| 70 = @tagged_template_expr
+| 71 = @template_literal
+| 72 = @template_element
+| 73 = @array_comprehension_expr
+| 74 = @generator_expr
+| 75 = @for_in_comprehension_block
+| 76 = @for_of_comprehension_block
+| 77 = @legacy_letexpr
+| 78 = @var_decl
+| 79 = @proper_varaccess
+| 80 = @class_expr
+| 81 = @super_expr
+| 82 = @newtarget_expr
+| 83 = @named_import_specifier
+| 84 = @import_default_specifier
+| 85 = @import_namespace_specifier
+| 86 = @named_export_specifier
+| 87 = @exp_expr
+| 88 = @assign_exp_expr
+| 89 = @jsx_element
+| 90 = @jsx_qualified_name
+| 91 = @jsx_empty_expr
+| 92 = @await_expr
+| 93 = @function_sent_expr
+| 94 = @decorator
+| 95 = @export_default_specifier
+| 96 = @export_namespace_specifier
+| 97 = @bind_expr
+| 98 = @external_module_reference
+| 99 = @dynamic_import
+| 100 = @expression_with_type_arguments
+| 101 = @prefix_type_assertion
+| 102 = @as_type_assertion
+| 103 = @export_varaccess
+| 104 = @decorator_list
+| 105 = @non_null_assertion
+| 106 = @bigint_literal
+| 107 = @nullishcoalescing_expr
+| 108 = @e4x_xml_anyname
+| 109 = @e4x_xml_static_attribute_selector
+| 110 = @e4x_xml_dynamic_attribute_selector
+| 111 = @e4x_xml_filter_expression
+| 112 = @e4x_xml_static_qualident
+| 113 = @e4x_xml_dynamic_qualident
+| 114 = @e4x_xml_dotdotexpr
+| 115 = @import_meta_expr
+| 116 = @assignlogandexpr
+| 117 = @assignlogorexpr
+| 118 = @assignnullishcoalescingexpr
+| 119 = @template_pipe_ref
+| 120 = @generated_code_expr
+| 121 = @satisfies_expr
+;
+
+@varaccess = @proper_varaccess | @export_varaccess;
+@varref = @var_decl | @varaccess;
+
+@identifier = @label | @varref | @type_identifier;
+
+@literal = @null_literal | @boolean_literal | @number_literal | @string_literal | @regexp_literal | @bigint_literal;
+
+@propaccess = @dot_expr | @index_expr;
+
+@invokeexpr = @new_expr | @call_expr;
+
+@unaryexpr = @neg_expr | @plus_expr | @log_not_expr | @bit_not_expr | @typeof_expr | @void_expr | @delete_expr | @spread_element;
+
+@equality_test = @eq_expr | @neq_expr | @eqq_expr | @neqq_expr;
+
+@comparison = @equality_test | @lt_expr | @le_expr | @gt_expr | @ge_expr;
+
+@binaryexpr = @comparison | @lshift_expr | @rshift_expr | @urshift_expr | @add_expr | @sub_expr | @mul_expr | @div_expr | @mod_expr | @exp_expr | @bitor_expr | @xor_expr | @bitand_expr | @in_expr | @instanceof_expr | @logand_expr | @logor_expr | @nullishcoalescing_expr;
+
+@assignment = @assign_expr | @assign_add_expr | @assign_sub_expr | @assign_mul_expr | @assign_div_expr | @assign_mod_expr | @assign_exp_expr | @assign_lshift_expr | @assign_rshift_expr | @assign_urshift_expr | @assign_or_expr | @assign_xor_expr | @assign_and_expr | @assignlogandexpr | @assignlogorexpr | @assignnullishcoalescingexpr;
+
+@updateexpr = @preinc_expr | @postinc_expr | @predec_expr | @postdec_expr;
+
+@pattern = @varref | @array_pattern | @object_pattern;
+
+@comprehension_expr = @array_comprehension_expr | @generator_expr;
+
+@comprehension_block = @for_in_comprehension_block | @for_of_comprehension_block;
+
+@import_specifier = @named_import_specifier | @import_default_specifier | @import_namespace_specifier;
+
+@exportspecifier = @named_export_specifier | @export_default_specifier | @export_namespace_specifier;
+
+@type_keyword_operand = @import_declaration | @export_declaration | @import_specifier;
+
+@type_assertion = @as_type_assertion | @prefix_type_assertion;
+
+@class_definition = @class_decl_stmt | @class_expr;
+@interface_definition = @interface_declaration | @interface_typeexpr;
+@class_or_interface = @class_definition | @interface_definition;
+
+@lexical_decl = @var_decl | @type_decl;
+@lexical_access = @varaccess | @local_type_access | @local_var_type_access | @local_namespace_access;
+@lexical_ref = @lexical_decl | @lexical_access;
+
+@e4x_xml_attribute_selector = @e4x_xml_static_attribute_selector | @e4x_xml_dynamic_attribute_selector;
+@e4x_xml_qualident = @e4x_xml_static_qualident | @e4x_xml_dynamic_qualident;
+
+expr_contains_template_tag_location(
+  int expr: @expr ref,
+  int location: @location ref
+);
+
+@template_placeholder_tag_parent = @xmlelement | @xmlattribute | @file;
+
+template_placeholder_tag_info(
+  unique int node: @template_placeholder_tag,
+  int parentNode: @template_placeholder_tag_parent ref,
+  varchar(900) raw: string ref
+);
+
+// scopes
+scopes (unique int id: @scope,
+        int kind: int ref);
+
+case @scope.kind of
+   0 = @global_scope
+|  1 = @function_scope
+|  2 = @catch_scope
+|  3 = @module_scope
+|  4 = @block_scope
+|  5 = @for_scope
+|  6 = @for_in_scope // for-of scopes work the same as for-in scopes
+|  7 = @comprehension_block_scope
+|  8 = @class_expr_scope
+|  9 = @namespace_scope
+| 10 = @class_decl_scope
+| 11 = @interface_scope
+| 12 = @type_alias_scope
+| 13 = @mapped_type_scope
+| 14 = @enum_scope
+| 15 = @external_module_scope
+| 16 = @conditional_type_scope;
+
+scopenodes (unique int node: @ast_node ref,
+            int scope: @scope ref);
+
+scopenesting (unique int inner: @scope ref,
+              int outer: @scope ref);
+
+// functions
+@function = @function_decl_stmt | @function_expr | @arrow_function_expr;
+
+@parameterized = @function | @catch_clause;
+@type_parameterized = @function | @class_or_interface | @type_alias_declaration | @mapped_typeexpr | @infer_typeexpr;
+
+is_generator (int fun: @function ref);
+has_rest_parameter (int fun: @function ref);
+is_async (int fun: @function ref);
+
+// variables and lexically scoped type names
+#keyset[scope, name]
+variables (unique int id: @variable,
+           varchar(900) name: string ref,
+           int scope: @scope ref);
+
+#keyset[scope, name]
+local_type_names (unique int id: @local_type_name,
+                  varchar(900) name: string ref,
+                  int scope: @scope ref);
+
+#keyset[scope, name]
+local_namespace_names (unique int id: @local_namespace_name,
+                       varchar(900) name: string ref,
+                       int scope: @scope ref);
+
+is_arguments_object (int id: @variable ref);
+
+@lexical_name = @variable | @local_type_name | @local_namespace_name;
+
+@bind_id = @varaccess | @local_var_type_access;
+bind (unique int id: @bind_id ref,
+      int decl: @variable ref);
+
+decl (unique int id: @var_decl ref,
+      int decl: @variable ref);
+
+@typebind_id = @local_type_access | @export_varaccess;
+typebind (unique int id: @typebind_id ref,
+          int decl: @local_type_name ref);
+
+@typedecl_id = @type_decl | @var_decl;
+typedecl (unique int id: @typedecl_id ref,
+          int decl: @local_type_name ref);
+
+namespacedecl (unique int id: @var_decl ref,
+               int decl: @local_namespace_name ref);
+
+@namespacebind_id = @local_namespace_access | @export_varaccess;
+namespacebind (unique int id: @namespacebind_id ref,
+               int decl: @local_namespace_name ref);
+
+
+// properties in object literals, property patterns in object patterns, and method declarations in classes
+#keyset[parent, index]
+properties (unique int id: @property,
+            int parent: @property_parent ref,
+            int index: int ref,
+            int kind: int ref,
+            varchar(900) tostring: string ref);
+
+case @property.kind of
+  0 = @value_property
+| 1 = @property_getter
+| 2 = @property_setter
+| 3 = @jsx_attribute
+| 4 = @function_call_signature
+| 5 = @constructor_call_signature
+| 6 = @index_signature
+| 7 = @enum_member
+| 8 = @proper_field
+| 9 = @parameter_field
+| 10 = @static_initializer
+;
+
+@property_parent = @obj_expr | @object_pattern | @class_definition | @jsx_element | @interface_definition | @enum_declaration;
+@property_accessor = @property_getter | @property_setter;
+@call_signature = @function_call_signature | @constructor_call_signature;
+@field = @proper_field | @parameter_field;
+@field_or_vardeclarator = @field | @var_declarator;
+
+is_computed (int id: @property ref);
+is_method   (int id: @property ref);
+is_static   (int id: @property ref);
+is_abstract_member (int id: @property ref);
+is_const_enum (int id: @enum_declaration ref);
+is_abstract_class (int id: @class_decl_stmt ref);
+
+has_public_keyword (int id: @property ref);
+has_private_keyword (int id: @property ref);
+has_protected_keyword (int id: @property ref);
+has_readonly_keyword (int id: @property ref);
+has_type_keyword (int id: @type_keyword_operand ref);
+is_optional_member (int id: @property ref);
+has_definite_assignment_assertion (int id: @field_or_vardeclarator ref);
+is_optional_parameter_declaration (unique int parameter: @pattern ref);
+
+#keyset[constructor, param_index]
+parameter_fields(
+  unique int field: @parameter_field ref,
+  int constructor: @function_expr ref,
+  int param_index: int ref
+);
+
+// types
+#keyset[parent, idx]
+typeexprs (
+  unique int id: @typeexpr,
+  int kind: int ref,
+  int parent: @typeexpr_parent ref,
+  int idx: int ref,
+  varchar(900) tostring: string ref
+);
+
+case @typeexpr.kind of
+  0 = @local_type_access
+| 1 = @type_decl
+| 2 = @keyword_typeexpr
+| 3 = @string_literal_typeexpr
+| 4 = @number_literal_typeexpr
+| 5 = @boolean_literal_typeexpr
+| 6 = @array_typeexpr
+| 7 = @union_typeexpr
+| 8 = @indexed_access_typeexpr
+| 9 = @intersection_typeexpr
+| 10 = @parenthesized_typeexpr
+| 11 = @tuple_typeexpr
+| 12 = @keyof_typeexpr
+| 13 = @qualified_type_access
+| 14 = @generic_typeexpr
+| 15 = @type_label
+| 16 = @typeof_typeexpr
+| 17 = @local_var_type_access
+| 18 = @qualified_var_type_access
+| 19 = @this_var_type_access
+| 20 = @predicate_typeexpr
+| 21 = @interface_typeexpr
+| 22 = @type_parameter
+| 23 = @plain_function_typeexpr
+| 24 = @constructor_typeexpr
+| 25 = @local_namespace_access
+| 26 = @qualified_namespace_access
+| 27 = @mapped_typeexpr
+| 28 = @conditional_typeexpr
+| 29 = @infer_typeexpr
+| 30 = @import_type_access
+| 31 = @import_namespace_access
+| 32 = @import_var_type_access
+| 33 = @optional_typeexpr
+| 34 = @rest_typeexpr
+| 35 = @bigint_literal_typeexpr
+| 36 = @readonly_typeexpr
+| 37 = @template_literal_typeexpr
+;
+
+@typeref = @typeaccess | @type_decl;
+@type_identifier = @type_decl | @local_type_access | @type_label | @local_var_type_access | @local_namespace_access;
+@typeexpr_parent = @expr | @stmt | @property | @typeexpr;
+@literal_typeexpr = @string_literal_typeexpr | @number_literal_typeexpr | @boolean_literal_typeexpr | @bigint_literal_typeexpr;
+@typeaccess = @local_type_access | @qualified_type_access | @import_type_access;
+@vartypeaccess = @local_var_type_access | @qualified_var_type_access | @this_var_type_access | @import_var_type_access;
+@namespace_access = @local_namespace_access | @qualified_namespace_access | @import_namespace_access;
+@import_typeexpr = @import_type_access | @import_namespace_access | @import_var_type_access;
+
+@function_typeexpr = @plain_function_typeexpr | @constructor_typeexpr;
+
+// types
+types (
+  unique int id: @type,
+  int kind: int ref,
+  varchar(900) tostring: string ref
+);
+
+#keyset[parent, idx]
+type_child (
+  int child: @type ref,
+  int parent: @type ref,
+  int idx: int ref
+);
+
+case @type.kind of
+  0 = @any_type
+| 1 = @string_type
+| 2 = @number_type
+| 3 = @union_type
+| 4 = @true_type
+| 5 = @false_type
+| 6 = @type_reference
+| 7 = @object_type
+| 8 = @canonical_type_variable_type
+| 9 = @typeof_type
+| 10 = @void_type
+| 11 = @undefined_type
+| 12 = @null_type
+| 13 = @never_type
+| 14 = @plain_symbol_type
+| 15 = @unique_symbol_type
+| 16 = @objectkeyword_type
+| 17 = @intersection_type
+| 18 = @tuple_type
+| 19 = @lexical_type_variable_type
+| 20 = @this_type
+| 21 = @number_literal_type
+| 22 = @string_literal_type
+| 23 = @unknown_type
+| 24 = @bigint_type
+| 25 = @bigint_literal_type
+;
+
+@boolean_literal_type = @true_type | @false_type;
+@symbol_type = @plain_symbol_type | @unique_symbol_type;
+@union_or_intersection_type = @union_type | @intersection_type;
+@typevariable_type = @canonical_type_variable_type | @lexical_type_variable_type;
+
+has_asserts_keyword(int node: @predicate_typeexpr ref);
+
+@typed_ast_node = @expr | @typeexpr | @function;
+ast_node_type(
+  unique int node: @typed_ast_node ref,
+  int typ: @type ref);
+
+declared_function_signature(
+  unique int node: @function ref,
+  int sig: @signature_type ref
+);
+
+invoke_expr_signature(
+  unique int node: @invokeexpr ref,
+  int sig: @signature_type ref
+);
+
+invoke_expr_overload_index(
+  unique int node: @invokeexpr ref,
+  int index: int ref
+);
+
+symbols (
+  unique int id: @symbol,
+  int kind: int ref,
+  varchar(900) name: string ref
+);
+
+symbol_parent (
+  unique int symbol: @symbol ref,
+  int parent: @symbol ref
+);
+
+symbol_module (
+  int symbol: @symbol ref,
+  varchar(900) moduleName: string ref
+);
+
+symbol_global (
+  int symbol: @symbol ref,
+  varchar(900) globalName: string ref
+);
+
+case @symbol.kind of
+  0 = @root_symbol
+| 1 = @member_symbol
+| 2 = @other_symbol
+;
+
+@type_with_symbol = @type_reference | @typevariable_type | @typeof_type | @unique_symbol_type;
+@ast_node_with_symbol = @type_definition | @namespace_definition | @toplevel | @typeaccess | @namespace_access | @var_decl | @function | @invokeexpr | @import_declaration | @external_module_reference | @external_module_declaration;
+
+ast_node_symbol(
+  unique int node: @ast_node_with_symbol ref,
+  int symbol: @symbol ref);
+
+type_symbol(
+  unique int typ: @type_with_symbol ref,
+  int symbol: @symbol ref);
+
+#keyset[typ, name]
+type_property(
+  int typ: @type ref,
+  varchar(900) name: string ref,
+  int propertyType: @type ref);
+
+type_alias(
+  unique int aliasType: @type ref,
+  int underlyingType: @type ref);
+
+@literal_type = @string_literal_type | @number_literal_type | @boolean_literal_type | @bigint_literal_type;
+@type_with_literal_value = @string_literal_type | @number_literal_type | @bigint_literal_type;
+type_literal_value(
+  unique int typ: @type_with_literal_value ref,
+  varchar(900) value: string ref);
+
+signature_types (
+  unique int id: @signature_type,
+  int kind: int ref,
+  varchar(900) tostring: string ref,
+  int type_parameters: int ref,
+  int required_params: int ref
+);
+
+is_abstract_signature(
+  unique int sig: @signature_type ref
+);
+
+signature_rest_parameter(
+  unique int sig: @signature_type ref,
+  int rest_param_arra_type: @type ref
+);
+
+case @signature_type.kind of
+  0 = @function_signature_type
+| 1 = @constructor_signature_type
+;
+
+#keyset[typ, kind, index]
+type_contains_signature (
+  int typ: @type ref,
+  int kind: int ref,  // constructor/call/index
+  int index: int ref, // ordering of overloaded signatures
+  int sig: @signature_type ref
+);
+
+#keyset[parent, index]
+signature_contains_type (
+  int child: @type ref,
+  int parent: @signature_type ref,
+  int index: int ref
+);
+
+#keyset[sig, index]
+signature_parameter_name (
+  int sig: @signature_type ref,
+  int index: int ref,
+  varchar(900) name: string ref
+);
+
+number_index_type (
+  unique int baseType: @type ref,
+  int propertyType: @type ref
+);
+
+string_index_type (
+  unique int baseType: @type ref,
+  int propertyType: @type ref
+);
+
+base_type_names(
+  int typeName: @symbol ref,
+  int baseTypeName: @symbol ref
+);
+
+self_types(
+  int typeName: @symbol ref,
+  int selfType: @type_reference ref
+);
+
+tuple_type_min_length(
+  unique int typ: @type ref,
+  int minLength: int ref
+);
+
+tuple_type_rest_index(
+  unique int typ: @type ref,
+  int index: int ref
+);
+
+// comments
+comments (unique int id: @comment,
+          int kind: int ref,
+          int toplevel: @toplevel ref,
+          varchar(900) text: string ref,
+          varchar(900) tostring: string ref);
+
+case @comment.kind of
+  0 = @slashslash_comment
+| 1 = @slashstar_comment
+| 2 = @doc_comment
+| 3 = @html_comment_start
+| 4 = @htmlcommentend;
+
+@html_comment = @html_comment_start | @htmlcommentend;
+@line_comment = @slashslash_comment | @html_comment;
+@block_comment = @slashstar_comment | @doc_comment;
+
+// source lines
+lines (unique int id: @line,
+       int toplevel: @toplevel ref,
+       varchar(900) text: string ref,
+       varchar(2) terminator: string ref);
+indentation (int file: @file ref,
+            int lineno: int ref,
+            varchar(1) indentChar: string ref,
+            int indentDepth: int ref);
+
+// JavaScript parse errors
+js_parse_errors (unique int id: @js_parse_error,
+        int toplevel: @toplevel ref,
+        varchar(900) message: string ref,
+        varchar(900) line: string ref);
+
+// regular expressions
+#keyset[parent, idx]
+regexpterm (unique int id: @regexpterm,
+        int kind: int ref,
+        int parent: @regexpparent ref,
+        int idx: int ref,
+        varchar(900) tostring: string ref);
+
+@regexpparent = @regexpterm | @regexp_literal | @string_literal | @add_expr;
+
+case @regexpterm.kind of
+   0 = @regexp_alt
+|  1 = @regexp_seq
+|  2 = @regexp_caret
+|  3 = @regexp_dollar
+|  4 = @regexp_wordboundary
+|  5 = @regexp_nonwordboundary
+|  6 = @regexp_positive_lookahead
+|  7 = @regexp_negative_lookahead
+|  8 = @regexp_star
+|  9 = @regexp_plus
+| 10 = @regexp_opt
+| 11 = @regexp_range
+| 12 = @regexp_dot
+| 13 = @regexp_group
+| 14 = @regexp_normal_constant
+| 15 = @regexp_hex_escape
+| 16 = @regexp_unicode_escape
+| 17 = @regexp_dec_escape
+| 18 = @regexp_oct_escape
+| 19 = @regexp_ctrl_escape
+| 20 = @regexp_char_class_escape
+| 21 = @regexp_id_escape
+| 22 = @regexp_backref
+| 23 = @regexp_char_class
+| 24 = @regexp_char_range
+| 25 = @regexp_positive_lookbehind
+| 26 = @regexp_negative_lookbehind
+| 27 = @regexp_unicode_property_escape
+| 28 = @regexp_quoted_string
+| 29 = @regexp_intersection
+| 30 = @regexp_subtraction;
+
+regexp_parse_errors (unique int id: @regexp_parse_error,
+    int regexp: @regexpterm ref,
+    varchar(900) message: string ref);
+
+@regexp_quantifier = @regexp_star | @regexp_plus | @regexp_opt | @regexp_range;
+@regexp_escape = @regexp_char_escape | @regexp_char_class_escape | @regexp_unicode_property_escape;
+@regexp_char_escape = @regexp_hex_escape | @regexp_unicode_escape | @regexp_dec_escape | @regexp_oct_escape | @regexp_ctrl_escape | @regexp_id_escape;
+@regexp_constant = @regexp_normal_constant | @regexp_char_escape;
+@regexp_lookahead = @regexp_positive_lookahead | @regexp_negative_lookahead;
+@regexp_lookbehind = @regexp_positive_lookbehind | @regexp_negative_lookbehind;
+@regexp_subpattern = @regexp_lookahead | @regexp_lookbehind;
+@regexp_anchor = @regexp_dollar | @regexp_caret;
+
+is_greedy (int id: @regexp_quantifier ref);
+range_quantifier_lower_bound (unique int id: @regexp_range ref, int lo: int ref);
+range_quantifier_upper_bound (unique int id: @regexp_range ref, int hi: int ref);
+is_capture (unique int id: @regexp_group ref, int number: int ref);
+is_named_capture (unique int id: @regexp_group ref, string name: string ref);
+is_inverted (int id: @regexp_char_class ref);
+regexp_const_value (unique int id: @regexp_constant ref, varchar(1) value: string ref);
+char_class_escape (unique int id: @regexp_char_class_escape ref, varchar(1) value: string ref);
+backref (unique int id: @regexp_backref ref, int value: int ref);
+named_backref (unique int id: @regexp_backref ref, string name: string ref);
+unicode_property_escapename (unique int id: @regexp_unicode_property_escape ref, string name: string ref);
+unicode_property_escapevalue (unique int id: @regexp_unicode_property_escape ref, string value: string ref);
+
+// tokens
+#keyset[toplevel, idx]
+tokeninfo (unique int id: @token,
+    int kind: int ref,
+    int toplevel: @toplevel ref,
+    int idx: int ref,
+    varchar(900) value: string ref);
+
+case @token.kind of
+  0 = @token_eof
+| 1 = @token_null_literal
+| 2 = @token_boolean_literal
+| 3 = @token_numeric_literal
+| 4 = @token_string_literal
+| 5 = @token_regular_expression
+| 6 = @token_identifier
+| 7 = @token_keyword
+| 8 = @token_punctuator;
+
+// associate comments with the token immediately following them (which may be EOF)
+next_token (int comment: @comment ref, int token: @token ref);
+
+// JSON
+#keyset[parent, idx]
+json (unique int id: @json_value,
+      int kind: int ref,
+      int parent: @json_parent ref,
+      int idx: int ref,
+      varchar(900) tostring: string ref);
+
+json_literals (varchar(900) value: string ref,
+      varchar(900) raw: string ref,
+      unique int expr: @json_value ref);
+
+json_properties (int obj: @json_object ref,
+      varchar(900) property: string ref,
+      int value: @json_value ref);
+
+json_errors (unique int id: @json_parse_error,
+      varchar(900) message: string ref);
+
+json_locations(unique int locatable: @json_locatable ref,
+      int location: @location_default ref);
+
+case @json_value.kind of
+  0 = @json_null
+| 1 = @json_boolean
+| 2 = @json_number
+| 3 = @json_string
+| 4 = @json_array
+| 5 = @json_object;
+
+@json_parent = @json_object | @json_array | @file;
+
+@json_locatable = @json_value | @json_parse_error;
+
+// locations
+@ast_node = @toplevel | @stmt | @expr | @property | @typeexpr;
+
+@locatable = @file
+    | @ast_node
+    | @comment
+    | @line
+    | @js_parse_error | @regexp_parse_error
+    | @regexpterm
+    | @json_locatable
+    | @token
+    | @cfg_node
+    | @jsdoc | @jsdoc_type_expr | @jsdoc_tag
+    | @yaml_locatable
+    | @xmllocatable
+    | @configLocatable
+    | @template_placeholder_tag;
+
+hasLocation (unique int locatable: @locatable ref,
+    int location: @location ref);
+
+// CFG
+entry_cfg_node (unique int id: @entry_node, int container: @stmt_container ref);
+exit_cfg_node (unique int id: @exit_node, int container: @stmt_container ref);
+guard_node (unique int id: @guard_node, int kind: int ref, int test: @expr ref);
+case @guard_node.kind of
+  0 = @falsy_guard
+| 1 = @truthy_guard;
+@condition_guard = @falsy_guard | @truthy_guard;
+
+@synthetic_cfg_node = @entry_node | @exit_node | @guard_node;
+@cfg_node = @synthetic_cfg_node | @expr_parent;
+
+successor (int pred: @cfg_node ref, int succ: @cfg_node ref);
+
+// JSDoc comments
+jsdoc (unique int id: @jsdoc, varchar(900) description: string ref, int comment: @comment ref);
+#keyset[parent, idx]
+jsdoc_tags (unique int id: @jsdoc_tag, varchar(900) title: string ref,
+            int parent: @jsdoc ref, int idx: int ref, varchar(900) tostring: string ref);
+jsdoc_tag_descriptions (unique int tag: @jsdoc_tag ref, varchar(900) text: string ref);
+jsdoc_tag_names (unique int tag: @jsdoc_tag ref, varchar(900) text: string ref);
+
+#keyset[parent, idx]
+jsdoc_type_exprs (unique int id: @jsdoc_type_expr,
+                  int kind: int ref,
+                  int parent: @jsdoc_type_expr_parent ref,
+                  int idx: int ref,
+                  varchar(900) tostring: string ref);
+case @jsdoc_type_expr.kind of
+    0 = @jsdoc_any_type_expr
+|   1 = @jsdoc_null_type_expr
+|   2 = @jsdoc_undefined_type_expr
+|   3 = @jsdoc_unknown_type_expr
+|   4 = @jsdoc_void_type_expr
+|   5 = @jsdoc_identifier_type_expr
+|   6 = @jsdoc_applied_type_expr
+|   7 = @jsdoc_nullable_type_expr
+|   8 = @jsdoc_non_nullable_type_expr
+|   9 = @jsdoc_record_type_expr
+|  10 = @jsdoc_array_type_expr
+|  11 = @jsdoc_union_type_expr
+|  12 = @jsdoc_function_type_expr
+|  13 = @jsdoc_optional_type_expr
+|  14 = @jsdoc_rest_type_expr
+|  15 = @jsdoc_qualified_type_expr
+;
+
+#keyset[id, idx]
+jsdoc_record_field_name (int id: @jsdoc_record_type_expr ref, int idx: int ref, varchar(900) name: string ref);
+jsdoc_prefix_qualifier (int id: @jsdoc_type_expr ref);
+jsdoc_has_new_parameter (int fn: @jsdoc_function_type_expr ref);
+
+@jsdoc_type_expr_parent = @jsdoc_type_expr | @jsdoc_tag;
+
+jsdoc_errors (unique int id: @jsdoc_error, int tag: @jsdoc_tag ref, varchar(900) message: string ref, varchar(900) tostring: string ref);
+
+@dataflownode = @expr | @function_decl_stmt | @class_decl_stmt | @namespace_declaration | @enum_declaration | @property;
+
+@optionalchainable = @call_expr | @propaccess;
+
+isOptionalChaining(int id: @optionalchainable ref);
+
+/**
+ * The time taken for the extraction of a file.
+ * This table contains non-deterministic content.
+ *
+ * The sum of the `time` column for each (`file`, `timerKind`) pair
+ * is the total time taken for extraction of `file`.  The `extractionPhase`
+ * column provides a granular view of the extraction time of the file.
+ */
+extraction_time(
+  int file : @file ref,
+  // see `com.semmle.js.extractor.ExtractionMetrics.ExtractionPhase`.
+  int extractionPhase: int ref,
+  // 0 for the elapsed CPU time in nanoseconds, 1 for the elapsed wallclock time in nanoseconds
+  int timerKind: int ref,
+  float time: float ref
+)
+
+/**
+* Non-timing related data for the extraction of a single file.
+* This table contains non-deterministic content.
+*/
+extraction_data(
+  int file : @file ref,
+  // the absolute path to the cache file
+  varchar(900) cacheFile: string ref,
+  boolean fromCache: boolean ref,
+  int length: int ref
+)
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error;
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+/*- Configuration files with key value pairs -*/
+
+configs(
+  unique int id: @config
+);
+
+configNames(
+  unique int id: @configName,
+  int config: @config ref,
+  string name: string ref
+);
+
+configValues(
+  unique int id: @configValue,
+  int config: @config ref,
+  string value: string ref
+);
+
+configLocations(
+  int locatable: @configLocatable ref,
+  int location: @location_default ref
+);
+
+@configLocatable = @config | @configName | @configValue;
+
+/*- Database metadata -*/
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+overlayChangedFiles(
+  string path: string ref
+);
diff --git a/javascript/ql/lib/upgrades/ccefb5e2d49318eea4aeafd4c6ae2af9f94ac72a/upgrade.properties b/javascript/ql/lib/upgrades/ccefb5e2d49318eea4aeafd4c6ae2af9f94ac72a/upgrade.properties
new file mode 100644
index 00000000000..4ff972031d7
--- /dev/null
+++ b/javascript/ql/lib/upgrades/ccefb5e2d49318eea4aeafd4c6ae2af9f94ac72a/upgrade.properties
@@ -0,0 +1,2 @@
+description: add overlay relations
+compatibility: full
diff --git a/javascript/ql/src/CHANGELOG.md b/javascript/ql/src/CHANGELOG.md
index 19314b8b774..4a453506818 100644
--- a/javascript/ql/src/CHANGELOG.md
+++ b/javascript/ql/src/CHANGELOG.md
@@ -1,3 +1,39 @@
+## 2.1.3
+
+No user-facing changes.
+
+## 2.1.2
+
+No user-facing changes.
+
+## 2.1.1
+
+No user-facing changes.
+
+## 2.1.0
+
+### Major Analysis Improvements
+
+* Added support for TypeScript 5.9
+* Added support for `import defer` syntax in JavaScript and TypeScript.
+
+### Minor Analysis Improvements
+
+* Data flow is now tracked through the `Promise.try` and `Array.prototype.with` functions.
+* Query `js/index-out-of-bounds` no longer produces a false-positive when a strictly-less-than check overrides a previous less-than-or-equal test.
+* The query `js/remote-property-injection` now detects property injection vulnerabilities through object enumeration patterns such as `Object.keys()`. 
+* The query "Permissive CORS configuration" (`js/cors-permissive-configuration`) has been promoted from experimental and is now part of the default security suite. Thank you to @maikypedia who [submitted the original experimental query](https://github.com/github/codeql/pull/14342)!
+
+## 2.0.3
+
+No user-facing changes.
+
+## 2.0.2
+
+### Minor Analysis Improvements
+
+* The `js/regex-injection` query no longer considers environment variables as sources by default. Environment variables can be re-enabled as sources by setting the threat model to include the "environment" category.
+
 ## 2.0.1
 
 No user-facing changes.
diff --git a/javascript/ql/src/Comments/CommentedOutCode.ql b/javascript/ql/src/Comments/CommentedOutCode.ql
index 2528172522d..460a3bc2133 100644
--- a/javascript/ql/src/Comments/CommentedOutCode.ql
+++ b/javascript/ql/src/Comments/CommentedOutCode.ql
@@ -4,9 +4,9 @@
  * @kind problem
  * @problem.severity recommendation
  * @id js/commented-out-code
- * @tags maintainability
- *       statistical
- *       non-attributable
+ * @tags quality
+ *       maintainability
+ *       readability
  * @precision medium
  */
 
diff --git a/javascript/ql/src/Comments/TodoComments.ql b/javascript/ql/src/Comments/TodoComments.ql
index 3d7f92cfbfc..487dde1f737 100644
--- a/javascript/ql/src/Comments/TodoComments.ql
+++ b/javascript/ql/src/Comments/TodoComments.ql
@@ -5,7 +5,9 @@
  * @kind problem
  * @problem.severity recommendation
  * @id js/todo-comment
- * @tags maintainability
+ * @tags quality
+ *       maintainability
+ *       readability
  *       external/cwe/cwe-546
  * @precision medium
  */
diff --git a/javascript/ql/src/DOM/Alert.ql b/javascript/ql/src/DOM/Alert.ql
index 97fd505d2f9..43218c439c1 100644
--- a/javascript/ql/src/DOM/Alert.ql
+++ b/javascript/ql/src/DOM/Alert.ql
@@ -4,7 +4,9 @@
  * @kind problem
  * @problem.severity recommendation
  * @id js/alert-call
- * @tags maintainability
+ * @tags quality
+ *       reliability
+ *       correctness
  *       external/cwe/cwe-489
  * @precision medium
  */
diff --git a/javascript/ql/src/Declarations/RedeclaredVariable.ql b/javascript/ql/src/Declarations/RedeclaredVariable.ql
index a48e4e5f65e..098cfdaffc4 100644
--- a/javascript/ql/src/Declarations/RedeclaredVariable.ql
+++ b/javascript/ql/src/Declarations/RedeclaredVariable.ql
@@ -4,7 +4,9 @@
  * @kind problem
  * @problem.severity recommendation
  * @id js/variable-redeclaration
- * @tags reliability
+ * @tags quality
+ *       reliability
+ *       correctness
  *       readability
  * @precision medium
  */
diff --git a/javascript/ql/src/Declarations/UnreachableMethodOverloads.ql b/javascript/ql/src/Declarations/UnreachableMethodOverloads.ql
index 912d58ab54c..0088af1a2c0 100644
--- a/javascript/ql/src/Declarations/UnreachableMethodOverloads.ql
+++ b/javascript/ql/src/Declarations/UnreachableMethodOverloads.ql
@@ -46,9 +46,7 @@ string getKind(MemberDeclaration m) {
  * A call-signature that originates from a MethodSignature in the AST.
  */
 private class MethodCallSig extends Function {
-  private MethodSignature signature;
-
-  MethodCallSig() { this = signature.getBody() }
+  MethodCallSig() { this = any(MethodSignature signature).getBody() }
 
   int getNumOptionalParameter() {
     result = count(Parameter p | p = this.getParameter(_) and p.isDeclaredOptional())
diff --git a/javascript/ql/src/Declarations/UnusedParameter.ql b/javascript/ql/src/Declarations/UnusedParameter.ql
index d48dc11ed2a..6cb84d2f7c1 100644
--- a/javascript/ql/src/Declarations/UnusedParameter.ql
+++ b/javascript/ql/src/Declarations/UnusedParameter.ql
@@ -4,7 +4,10 @@
  * @kind problem
  * @problem.severity recommendation
  * @id js/unused-parameter
- * @tags maintainability
+ * @tags quality
+ *       reliability
+ *       correctness
+ *       readability
  * @precision medium
  */
 
diff --git a/javascript/ql/src/Expressions/ExprHasNoEffect.qhelp b/javascript/ql/src/Expressions/ExprHasNoEffect.qhelp
index da9db7c2ac0..d9907689f8f 100644
--- a/javascript/ql/src/Expressions/ExprHasNoEffect.qhelp
+++ b/javascript/ql/src/Expressions/ExprHasNoEffect.qhelp
@@ -51,10 +51,4 @@ assign it an initial value, which also serves to document its expected type:
 <sample src="examples/ExprHasNoEffect-PseudoDeclGood.js"/>
 
 </example>
-<references>
-
-<li>JSLint Error Explanations: <a href="http://jslinterrors.com/expected-an-assignment-or-function-call">Expected an assignment or function call</a>.</li>
-
-
-</references>
 </qhelp>
diff --git a/javascript/ql/src/LanguageFeatures/ArgumentsCallerCallee.ql b/javascript/ql/src/LanguageFeatures/ArgumentsCallerCallee.ql
index 6354383f6c7..9bbf22eebaa 100644
--- a/javascript/ql/src/LanguageFeatures/ArgumentsCallerCallee.ql
+++ b/javascript/ql/src/LanguageFeatures/ArgumentsCallerCallee.ql
@@ -5,8 +5,9 @@
  * @kind problem
  * @problem.severity recommendation
  * @id js/call-stack-introspection
- * @tags maintainability
- *       language-features
+ * @tags quality
+ *       reliability
+ *       correctness
  * @precision medium
  */
 
diff --git a/javascript/ql/src/LanguageFeatures/DebuggerStatement.ql b/javascript/ql/src/LanguageFeatures/DebuggerStatement.ql
index 6ffca36df7c..a81f8e93051 100644
--- a/javascript/ql/src/LanguageFeatures/DebuggerStatement.ql
+++ b/javascript/ql/src/LanguageFeatures/DebuggerStatement.ql
@@ -4,9 +4,10 @@
  * @kind problem
  * @problem.severity recommendation
  * @id js/debugger-statement
- * @tags efficiency
- *       maintainability
- *       language-features
+ * @tags quality
+ *       reliability
+ *       correctness
+ *       performance
  *       external/cwe/cwe-489
  * @precision medium
  */
diff --git a/javascript/ql/src/LanguageFeatures/DeleteVar.qhelp b/javascript/ql/src/LanguageFeatures/DeleteVar.qhelp
index 79d7ec97035..69ccb83f083 100644
--- a/javascript/ql/src/LanguageFeatures/DeleteVar.qhelp
+++ b/javascript/ql/src/LanguageFeatures/DeleteVar.qhelp
@@ -35,11 +35,4 @@ function <code>compute</code> to the outside world):
 <sample src="examples/DeleteVarGood.js" />
 
 </example>
-<references>
-
-
-<li>JSLint Error Explanations: <a href="http://jslinterrors.com/only-properties-should-be-deleted">Only properties should be deleted</a>.</li>
-
-
-</references>
 </qhelp>
diff --git a/javascript/ql/src/LanguageFeatures/Eval.ql b/javascript/ql/src/LanguageFeatures/Eval.ql
index f1f753774c0..940ec716da7 100644
--- a/javascript/ql/src/LanguageFeatures/Eval.ql
+++ b/javascript/ql/src/LanguageFeatures/Eval.ql
@@ -5,8 +5,9 @@
  * @kind problem
  * @problem.severity recommendation
  * @id js/eval-call
- * @tags maintainability
- *       language-features
+ * @tags quality
+ *       reliability
+ *       correctness
  *       external/cwe/cwe-676
  * @precision medium
  */
diff --git a/javascript/ql/src/LanguageFeatures/LengthComparisonOffByOne.ql b/javascript/ql/src/LanguageFeatures/LengthComparisonOffByOne.ql
index 4f3815d6fc6..c5766d61cd6 100644
--- a/javascript/ql/src/LanguageFeatures/LengthComparisonOffByOne.ql
+++ b/javascript/ql/src/LanguageFeatures/LengthComparisonOffByOne.ql
@@ -33,6 +33,18 @@ ConditionGuardNode getLengthLEGuard(Variable index, Variable array) {
   )
 }
 
+/**
+ * Gets a condition that checks that `index` is less than `array.length`.
+ */
+ConditionGuardNode getLengthLTGuard(Variable index, Variable array) {
+  exists(RelationalComparison cmp | cmp instanceof GTExpr or cmp instanceof LTExpr |
+    cmp = result.getTest() and
+    result.getOutcome() = true and
+    cmp.getGreaterOperand() = arrayLen(array) and
+    cmp.getLesserOperand() = index.getAnAccess()
+  )
+}
+
 /**
  * Gets a condition that checks that `index` is not equal to `array.length`.
  */
@@ -62,7 +74,8 @@ where
   elementRead(ea, array, index, bb) and
   // and the read is guarded by the comparison
   cond.dominates(bb) and
-  // but the read is not guarded by another check that `index != array.length`
-  not getLengthNEGuard(index, array).dominates(bb)
+  // but the read is not guarded by another check that `index != array.length` or `index < array.length`
+  not getLengthNEGuard(index, array).dominates(bb) and
+  not getLengthLTGuard(index, array).dominates(bb)
 select cond.getTest(), "Off-by-one index comparison against length may lead to out-of-bounds $@.",
   ea, "read"
diff --git a/javascript/ql/src/LanguageFeatures/SyntaxError.ql b/javascript/ql/src/LanguageFeatures/SyntaxError.ql
index 0c9a69490f7..d4428c75774 100644
--- a/javascript/ql/src/LanguageFeatures/SyntaxError.ql
+++ b/javascript/ql/src/LanguageFeatures/SyntaxError.ql
@@ -4,8 +4,7 @@
  * @kind problem
  * @problem.severity recommendation
  * @id js/syntax-error
- * @tags quality
- *       reliability
+ * @tags reliability
  *       correctness
  *       language-features
  * @precision very-high
diff --git a/javascript/ql/src/Performance/ReassignParameterAndUseArguments.ql b/javascript/ql/src/Performance/ReassignParameterAndUseArguments.ql
index 0e54de5d7d8..7fddaa74592 100644
--- a/javascript/ql/src/Performance/ReassignParameterAndUseArguments.ql
+++ b/javascript/ql/src/Performance/ReassignParameterAndUseArguments.ql
@@ -5,8 +5,9 @@
  * @kind problem
  * @problem.severity recommendation
  * @id js/parameter-reassignment-with-arguments
- * @tags efficiency
- *       maintainability
+ * @tags quality
+ *       reliability
+ *       performance
  * @precision medium
  */
 
diff --git a/javascript/ql/src/RegExp/BackspaceEscape.ql b/javascript/ql/src/RegExp/BackspaceEscape.ql
index 054f46f06b6..cee6c7672ce 100644
--- a/javascript/ql/src/RegExp/BackspaceEscape.ql
+++ b/javascript/ql/src/RegExp/BackspaceEscape.ql
@@ -5,9 +5,10 @@
  * @kind problem
  * @problem.severity recommendation
  * @id js/regex/backspace-escape
- * @tags maintainability
+ * @tags quality
+ *       maintainability
  *       readability
- *       regular-expressions
+ *       correctness
  * @precision medium
  */
 
diff --git a/javascript/ql/src/Security/CWE-020/OverlyLargeRange.ql b/javascript/ql/src/Security/CWE-020/OverlyLargeRange.ql
index 582a8975c8f..c5435e34758 100644
--- a/javascript/ql/src/Security/CWE-020/OverlyLargeRange.ql
+++ b/javascript/ql/src/Security/CWE-020/OverlyLargeRange.ql
@@ -4,7 +4,7 @@
  *              This may allow an attacker to bypass a filter or sanitizer.
  * @kind problem
  * @problem.severity warning
- * @security-severity 5.0
+ * @security-severity 4.0
  * @precision high
  * @id js/overly-large-range
  * @tags correctness
diff --git a/javascript/ql/src/Security/CWE-079/XssThroughDom.ql b/javascript/ql/src/Security/CWE-079/XssThroughDom.ql
index e690e2bab28..fb8f32cbaca 100644
--- a/javascript/ql/src/Security/CWE-079/XssThroughDom.ql
+++ b/javascript/ql/src/Security/CWE-079/XssThroughDom.ql
@@ -4,7 +4,7 @@
  *              can lead to a cross-site scripting vulnerability.
  * @kind path-problem
  * @problem.severity warning
- * @security-severity 6.1
+ * @security-severity 7.8
  * @precision high
  * @id js/xss-through-dom
  * @tags security
diff --git a/javascript/ql/src/Security/CWE-116/IncompleteMultiCharacterSanitization.qhelp b/javascript/ql/src/Security/CWE-116/IncompleteMultiCharacterSanitization.qhelp
index 63f28578ec1..b5ef7781f36 100644
--- a/javascript/ql/src/Security/CWE-116/IncompleteMultiCharacterSanitization.qhelp
+++ b/javascript/ql/src/Security/CWE-116/IncompleteMultiCharacterSanitization.qhelp
@@ -108,7 +108,7 @@ str.replace(/\.\.\//g, "");
 </sample>
 
 <p>
-The regular expression attempts to strip out all occurences of <code>/../</code> from <code>str</code>.
+The regular expression attempts to strip out all occurrences of <code>/../</code> from <code>str</code>.
 This will not work as expected: for the string <code>/./.././</code>, for example, it will remove the single
 occurrence of <code>/../</code> in the middle, but the remainder of the string then becomes
 <code>/../</code>, which is another instance of the substring we were trying to remove.
diff --git a/javascript/ql/src/Security/CWE-327/BrokenCryptoAlgorithm.qhelp b/javascript/ql/src/Security/CWE-327/BrokenCryptoAlgorithm.qhelp
index e0ccf71572f..bdd1071b613 100644
--- a/javascript/ql/src/Security/CWE-327/BrokenCryptoAlgorithm.qhelp
+++ b/javascript/ql/src/Security/CWE-327/BrokenCryptoAlgorithm.qhelp
@@ -4,17 +4,34 @@
 <qhelp>
 	<overview>
 		<p>
-			Using broken or weak cryptographic algorithms can leave data
-			vulnerable to being decrypted or forged by an attacker.
+			Using broken or weak cryptographic algorithms may compromise
+			security guarantees such as confidentiality, integrity, and
+			authenticity.
 		</p>
 
 		<p>
-			Many cryptographic algorithms provided by cryptography
-			libraries are known to be weak, or flawed. Using such an
-			algorithm means that encrypted or hashed data is less
-			secure than it appears to be.
+			Many cryptographic algorithms are known to be weak or flawed. The
+			security guarantees of a system often rely on the underlying
+			cryptography, so using a weak algorithm can have severe consequences.
+			For example:
 		</p>
 
+		<ul>
+			<li>
+			If a weak encryption algorithm is used, an attacker may be able to
+			decrypt sensitive data.
+			</li>
+			<li>
+			If a weak hashing algorithm is used to protect data integrity, an
+			attacker may be able to craft a malicious input that has the same
+			hash as a benign one.
+			</li>
+			<li>
+			If a weak algorithm is used for digital signatures, an attacker may
+			be able to forge signatures and impersonate legitimate users.
+			</li>
+		</ul>
+
 	</overview>
 	<recommendation>
 
diff --git a/javascript/ql/src/Security/CWE-942/CorsPermissiveConfiguration.qhelp b/javascript/ql/src/Security/CWE-942/CorsPermissiveConfiguration.qhelp
new file mode 100644
index 00000000000..04796dfbc18
--- /dev/null
+++ b/javascript/ql/src/Security/CWE-942/CorsPermissiveConfiguration.qhelp
@@ -0,0 +1,73 @@
+<!DOCTYPE qhelp PUBLIC
+"-//Semmle//qhelp//EN"
+"qhelp.dtd">
+<qhelp>
+
+	<overview>
+		<p>
+
+			A server can use CORS (Cross-Origin Resource Sharing) to relax the 
+			restrictions imposed by the Same-Origin Policy, allowing controlled, secure
+			cross-origin requests when necessary.
+
+		</p>
+		<p>
+
+			A server with an overly permissive CORS configuration may inadvertently 
+			expose sensitive data or enable CSRF attacks, which allow attackers to trick
+			users into performing unwanted operations on websites they're authenticated to.
+
+		</p>
+	</overview>
+
+	<recommendation>
+		<p>
+
+			When the <code>origin</code> is set to <code>true</code>, the server 
+			accepts requests from any origin, potentially exposing the system to 
+			CSRF attacks. Use <code>false</code> as the origin value or implement a whitelist
+			of allowed origins instead.
+
+		</p>
+		<p>
+
+			When the <code>origin</code> is set to <code>null</code>, it can be 
+			exploited by an attacker who can deceive a user into making 
+			requests from a <code>null</code> origin, often hosted within a sandboxed iframe.
+
+		</p>
+		<p>
+
+			If the <code>origin</code> value is user-controlled, ensure that the data
+			is properly sanitized and validated against a whitelist of allowed origins.
+
+		</p>
+	</recommendation>
+
+	<example>
+		<p>
+
+			In the following example, <code>server_1</code> accepts requests from any origin
+			because the value of <code>origin</code> is set to <code>true</code>. 
+			<code>server_2</code> uses user-controlled data for the origin without validation.
+
+		</p>
+
+		<sample src="examples/CorsPermissiveConfigurationBad.js"/>
+
+		<p>
+
+			To fix these issues, <code>server_1</code> uses a restrictive CORS configuration
+			that is not vulnerable to CSRF attacks. <code>server_2</code> properly validates
+			user-controlled data against a whitelist before using it.
+
+		</p>
+
+		<sample src="examples/CorsPermissiveConfigurationGood.js"/>
+	</example>
+
+	<references>
+		<li>Mozilla Developer Network: <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Origin">CORS, Access-Control-Allow-Origin</a>.</li>
+		<li>W3C: <a href="https://w3c.github.io/webappsec-cors-for-developers/#resources">CORS for developers, Advice for Resource Owners</a>.</li>
+	</references>
+</qhelp>
diff --git a/javascript/ql/src/Security/CWE-942/CorsPermissiveConfiguration.ql b/javascript/ql/src/Security/CWE-942/CorsPermissiveConfiguration.ql
new file mode 100644
index 00000000000..1699129d2a0
--- /dev/null
+++ b/javascript/ql/src/Security/CWE-942/CorsPermissiveConfiguration.ql
@@ -0,0 +1,22 @@
+/**
+ * @name Permissive CORS configuration
+ * @description Cross-origin resource sharing (CORS) policy allows overly broad access.
+ * @kind path-problem
+ * @problem.severity warning
+ * @security-severity 6.0
+ * @precision high
+ * @id js/cors-permissive-configuration
+ * @tags security
+ *       external/cwe/cwe-942
+ */
+
+import javascript
+import semmle.javascript.security.CorsPermissiveConfigurationQuery as CorsQuery
+import CorsQuery::CorsPermissiveConfigurationFlow::PathGraph
+
+from
+  CorsQuery::CorsPermissiveConfigurationFlow::PathNode source,
+  CorsQuery::CorsPermissiveConfigurationFlow::PathNode sink
+where CorsQuery::CorsPermissiveConfigurationFlow::flowPath(source, sink)
+select sink.getNode(), source, sink, "CORS Origin allows broad access due to $@.", source.getNode(),
+  "permissive or user controlled value"
diff --git a/javascript/ql/src/experimental/Security/CWE-942/examples/CorsPermissiveConfigurationBad.js b/javascript/ql/src/Security/CWE-942/examples/CorsPermissiveConfigurationBad.js
similarity index 100%
rename from javascript/ql/src/experimental/Security/CWE-942/examples/CorsPermissiveConfigurationBad.js
rename to javascript/ql/src/Security/CWE-942/examples/CorsPermissiveConfigurationBad.js
diff --git a/javascript/ql/src/experimental/Security/CWE-942/examples/CorsPermissiveConfigurationGood.js b/javascript/ql/src/Security/CWE-942/examples/CorsPermissiveConfigurationGood.js
similarity index 100%
rename from javascript/ql/src/experimental/Security/CWE-942/examples/CorsPermissiveConfigurationGood.js
rename to javascript/ql/src/Security/CWE-942/examples/CorsPermissiveConfigurationGood.js
diff --git a/javascript/ql/src/Statements/ImplicitReturn.ql b/javascript/ql/src/Statements/ImplicitReturn.ql
index 9bc50f0798a..cf76ec61606 100644
--- a/javascript/ql/src/Statements/ImplicitReturn.ql
+++ b/javascript/ql/src/Statements/ImplicitReturn.ql
@@ -5,7 +5,10 @@
  * @kind problem
  * @problem.severity recommendation
  * @id js/implicit-return
- * @tags maintainability
+ * @tags quality
+ *       reliability
+ *       correctness
+ *       readability
  * @precision medium
  */
 
diff --git a/javascript/ql/src/Statements/InconsistentReturn.ql b/javascript/ql/src/Statements/InconsistentReturn.ql
index b6978301e02..a6e810d52bf 100644
--- a/javascript/ql/src/Statements/InconsistentReturn.ql
+++ b/javascript/ql/src/Statements/InconsistentReturn.ql
@@ -4,8 +4,10 @@
  * @kind problem
  * @problem.severity recommendation
  * @id js/mixed-returns
- * @tags reliability
- *       maintainability
+ * @tags quality
+ *       reliability
+ *       correctness
+ *       readability
  * @precision medium
  */
 
diff --git a/javascript/ql/src/change-notes/2025-10-22-adjust-query-severity.md b/javascript/ql/src/change-notes/2025-10-22-adjust-query-severity.md
new file mode 100644
index 00000000000..ca81037f44b
--- /dev/null
+++ b/javascript/ql/src/change-notes/2025-10-22-adjust-query-severity.md
@@ -0,0 +1,5 @@
+---
+category: queryMetadata
+---
+* Increased the `security-severity` score of the `js/xss-through-dom` query from 6.1 to 7.8 to align with other XSS queries.
+* Reduced the `security-severity` score of the `js/overly-large-range` query from 5.0 to 4.0 to better reflect its impact.
\ No newline at end of file
diff --git a/javascript/ql/src/change-notes/released/2.0.2.md b/javascript/ql/src/change-notes/released/2.0.2.md
new file mode 100644
index 00000000000..f2fc5c62f78
--- /dev/null
+++ b/javascript/ql/src/change-notes/released/2.0.2.md
@@ -0,0 +1,5 @@
+## 2.0.2
+
+### Minor Analysis Improvements
+
+* The `js/regex-injection` query no longer considers environment variables as sources by default. Environment variables can be re-enabled as sources by setting the threat model to include the "environment" category.
diff --git a/javascript/ql/src/change-notes/released/2.0.3.md b/javascript/ql/src/change-notes/released/2.0.3.md
new file mode 100644
index 00000000000..7bd669821d5
--- /dev/null
+++ b/javascript/ql/src/change-notes/released/2.0.3.md
@@ -0,0 +1,3 @@
+## 2.0.3
+
+No user-facing changes.
diff --git a/javascript/ql/src/change-notes/released/2.1.0.md b/javascript/ql/src/change-notes/released/2.1.0.md
new file mode 100644
index 00000000000..c95b5add20b
--- /dev/null
+++ b/javascript/ql/src/change-notes/released/2.1.0.md
@@ -0,0 +1,13 @@
+## 2.1.0
+
+### Major Analysis Improvements
+
+* Added support for TypeScript 5.9
+* Added support for `import defer` syntax in JavaScript and TypeScript.
+
+### Minor Analysis Improvements
+
+* Data flow is now tracked through the `Promise.try` and `Array.prototype.with` functions.
+* Query `js/index-out-of-bounds` no longer produces a false-positive when a strictly-less-than check overrides a previous less-than-or-equal test.
+* The query `js/remote-property-injection` now detects property injection vulnerabilities through object enumeration patterns such as `Object.keys()`. 
+* The query "Permissive CORS configuration" (`js/cors-permissive-configuration`) has been promoted from experimental and is now part of the default security suite. Thank you to @maikypedia who [submitted the original experimental query](https://github.com/github/codeql/pull/14342)!
diff --git a/javascript/ql/src/change-notes/released/2.1.1.md b/javascript/ql/src/change-notes/released/2.1.1.md
new file mode 100644
index 00000000000..f023e9166c2
--- /dev/null
+++ b/javascript/ql/src/change-notes/released/2.1.1.md
@@ -0,0 +1,3 @@
+## 2.1.1
+
+No user-facing changes.
diff --git a/javascript/ql/src/change-notes/released/2.1.2.md b/javascript/ql/src/change-notes/released/2.1.2.md
new file mode 100644
index 00000000000..6e72407c8c7
--- /dev/null
+++ b/javascript/ql/src/change-notes/released/2.1.2.md
@@ -0,0 +1,3 @@
+## 2.1.2
+
+No user-facing changes.
diff --git a/javascript/ql/src/change-notes/released/2.1.3.md b/javascript/ql/src/change-notes/released/2.1.3.md
new file mode 100644
index 00000000000..a1338012fcd
--- /dev/null
+++ b/javascript/ql/src/change-notes/released/2.1.3.md
@@ -0,0 +1,3 @@
+## 2.1.3
+
+No user-facing changes.
diff --git a/javascript/ql/src/codeql-pack.release.yml b/javascript/ql/src/codeql-pack.release.yml
index fe974a4dbf3..345fb0c73a4 100644
--- a/javascript/ql/src/codeql-pack.release.yml
+++ b/javascript/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.0.1
+lastReleaseVersion: 2.1.3
diff --git a/javascript/ql/src/experimental/Security/CWE-918/SSRF.js b/javascript/ql/src/experimental/Security/CWE-918/SSRF.js
index e39e9760441..7e47b6dfd17 100644
--- a/javascript/ql/src/experimental/Security/CWE-918/SSRF.js
+++ b/javascript/ql/src/experimental/Security/CWE-918/SSRF.js
@@ -1,7 +1,7 @@
 const axios = require('axios');
 
 export const handler = async (req, res, next) => {
-  const { target } = req.body;
+  const { target } = req.body;
 
   try {
     // BAD: `target` is controlled by the attacker
diff --git a/javascript/ql/src/experimental/Security/CWE-918/SSRF.qll b/javascript/ql/src/experimental/Security/CWE-918/SSRF.qll
index 03bc9f99038..380f594c21e 100644
--- a/javascript/ql/src/experimental/Security/CWE-918/SSRF.qll
+++ b/javascript/ql/src/experimental/Security/CWE-918/SSRF.qll
@@ -29,10 +29,6 @@ module SsrfConfig implements DataFlow::ConfigSig {
 
   predicate isBarrierOut(DataFlow::Node node) { strictSanitizingPrefixEdge(node, _) }
 
-  Location getASelectedSourceLocation(DataFlow::Node source) {
-    none() // Does not select the source
-  }
-
   predicate observeDiffInformedIncrementalMode() { any() }
 }
 
diff --git a/javascript/ql/src/experimental/Security/CWE-918/SSRFGood.js b/javascript/ql/src/experimental/Security/CWE-918/SSRFGood.js
index 10ab26e607b..e91c1131338 100644
--- a/javascript/ql/src/experimental/Security/CWE-918/SSRFGood.js
+++ b/javascript/ql/src/experimental/Security/CWE-918/SSRFGood.js
@@ -2,7 +2,7 @@ const axios = require('axios');
 const validator = require('validator');
 
 export const handler = async (req, res, next) => {
-  const { target } = req.body;
+  const { target } = req.body;
 
   if (!validator.isAlphanumeric(target)) {
     return next(new Error('Bad request'));
diff --git a/javascript/ql/src/experimental/Security/CWE-942/Apollo.qll b/javascript/ql/src/experimental/Security/CWE-942/Apollo.qll
deleted file mode 100644
index 983c0a8ac89..00000000000
--- a/javascript/ql/src/experimental/Security/CWE-942/Apollo.qll
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Provides classes for working with Apollo GraphQL connectors.
- */
-
-import javascript
-
-/** Provides classes modeling the apollo packages [@apollo/server](https://npmjs.com/package/@apollo/server`) */
-module Apollo {
-  /** Get a reference to the `ApolloServer` class. */
-  private API::Node apollo() {
-    result =
-      API::moduleImport([
-          "@apollo/server", "@apollo/apollo-server-express", "@apollo/apollo-server-core",
-          "apollo-server", "apollo-server-express"
-        ]).getMember("ApolloServer")
-  }
-
-  /** Gets a reference to the `gql` function that parses GraphQL strings. */
-  private API::Node gql() {
-    result =
-      API::moduleImport([
-          "@apollo/server", "@apollo/apollo-server-express", "@apollo/apollo-server-core",
-          "apollo-server", "apollo-server-express"
-        ]).getMember("gql")
-  }
-
-  /** An instantiation of an `ApolloServer`. */
-  class ApolloServer extends API::NewNode {
-    ApolloServer() { this = apollo().getAnInstantiation() }
-  }
-
-  /** A string that is interpreted as a GraphQL query by a `apollo` package. */
-  private class ApolloGraphQLString extends GraphQL::GraphQLString {
-    ApolloGraphQLString() { this = gql().getACall().getArgument(0) }
-  }
-}
diff --git a/javascript/ql/src/experimental/Security/CWE-942/Cors.qll b/javascript/ql/src/experimental/Security/CWE-942/Cors.qll
deleted file mode 100644
index cc190e6f429..00000000000
--- a/javascript/ql/src/experimental/Security/CWE-942/Cors.qll
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Provides classes for working with Cors connectors.
- */
-
-import javascript
-
-/** Provides classes modeling the [cors](https://npmjs.com/package/cors) library. */
-module Cors {
-  /**
-   * An expression that creates a new CORS configuration.
-   */
-  class Cors extends DataFlow::CallNode {
-    Cors() { this = DataFlow::moduleImport("cors").getAnInvocation() }
-
-    /** Get the options used to configure Cors */
-    DataFlow::Node getOptionsArgument() { result = this.getArgument(0) }
-
-    /** Holds if cors is using default configuration */
-    predicate isDefault() { this.getNumArgument() = 0 }
-
-    /** Gets the value of the `origin` option used to configure this Cors instance. */
-    DataFlow::Node getOrigin() { result = this.getOptionArgument(0, "origin") }
-  }
-}
diff --git a/javascript/ql/src/experimental/Security/CWE-942/CorsPermissiveConfiguration.qhelp b/javascript/ql/src/experimental/Security/CWE-942/CorsPermissiveConfiguration.qhelp
deleted file mode 100644
index fc79eee743b..00000000000
--- a/javascript/ql/src/experimental/Security/CWE-942/CorsPermissiveConfiguration.qhelp
+++ /dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE qhelp PUBLIC
-"-//Semmle//qhelp//EN"
-"qhelp.dtd">
-<qhelp>
-
-<overview>
-	<p>
-
-		A server can use <code>CORS</code> (Cross-Origin Resource Sharing) to relax the 
-        restrictions imposed by the <code>SOP</code> (Same-Origin Policy), allowing controlled, secure
-        cross-origin requests when necessary. 
-
-        A server with an overly permissive <code>CORS</code> configuration may inadvertently 
-        expose sensitive data or lead to <code>CSRF</code> which is an attack that allows attackers to trick
-        users into performing unwanted operations in websites they're authenticated to.
-
-	</p>
-
-</overview>
-
-<recommendation>
-	<p>
-
-		When the <code>origin</code> is set to <code>true</code>, it signifies that the server 
-        is accepting requests from <code>any</code> origin, potentially exposing the system to 
-        CSRF attacks. This can be fixed using <code>false</code> as origin value or using a whitelist.
-
-	</p>
-	<p>
-
-		On the other hand, if the <code>origin</code> is 
-        set to <code>null</code>, it can be exploited by an attacker to deceive a user into making 
-        requests from a <code>null</code> origin form, often hosted within a sandboxed iframe.
-
-	</p>
-
-    <p>
-
-		If the <code>origin</code> value is user controlled, make sure that the data
-        is properly sanitized.
-
-	</p>
-</recommendation>
-
-<example>
-	<p>
-
-		In the example below, the <code>server_1</code> accepts requests from any origin
-        since the value of <code>origin</code> is set to <code>true</code>. 
-		And <code>server_2</code>'s origin is user-controlled.
-
-	</p>
-
-	<sample src="examples/CorsPermissiveConfigurationBad.js"/>
-
-	<p>
-
-		In the example below, the <code>server_1</code> CORS is restrictive so it's not
-		vulnerable to CSRF attacks. And <code>server_2</code>'s is using properly sanitized
-		user-controlled data.
-
-	</p>
-
-	<sample src="examples/CorsPermissiveConfigurationGood.js"/>
-</example>
-
-<references>
-	<li>Mozilla Developer Network: <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Origin">CORS, Access-Control-Allow-Origin</a>.</li>
-	<li>W3C: <a href="https://w3c.github.io/webappsec-cors-for-developers/#resources">CORS for developers, Advice for Resource Owners</a></li>
-</references>
-</qhelp>
diff --git a/javascript/ql/src/experimental/Security/CWE-942/CorsPermissiveConfiguration.ql b/javascript/ql/src/experimental/Security/CWE-942/CorsPermissiveConfiguration.ql
deleted file mode 100644
index 87db66ad98d..00000000000
--- a/javascript/ql/src/experimental/Security/CWE-942/CorsPermissiveConfiguration.ql
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * @name overly CORS configuration
- * @description Misconfiguration of CORS HTTP headers allows CSRF attacks.
- * @kind path-problem
- * @problem.severity error
- * @security-severity 7.5
- * @precision high
- * @id js/cors-misconfiguration
- * @tags security
- *       external/cwe/cwe-942
- */
-
-import javascript
-import CorsPermissiveConfigurationQuery
-import CorsPermissiveConfigurationFlow::PathGraph
-
-from
-  CorsPermissiveConfigurationFlow::PathNode source, CorsPermissiveConfigurationFlow::PathNode sink
-where CorsPermissiveConfigurationFlow::flowPath(source, sink)
-select sink.getNode(), source, sink, "CORS Origin misconfiguration due to a $@.", source.getNode(),
-  "too permissive or user controlled value"
diff --git a/javascript/ql/src/experimental/Security/CWE-942/CorsPermissiveConfigurationCustomizations.qll b/javascript/ql/src/experimental/Security/CWE-942/CorsPermissiveConfigurationCustomizations.qll
deleted file mode 100644
index 8876373a3d2..00000000000
--- a/javascript/ql/src/experimental/Security/CWE-942/CorsPermissiveConfigurationCustomizations.qll
+++ /dev/null
@@ -1,141 +0,0 @@
-/**
- * Provides default sources, sinks and sanitizers for reasoning about
- * overly permissive CORS configurations, as well as
- * extension points for adding your own.
- */
-
-import javascript
-import Cors::Cors
-import Apollo::Apollo
-
-/** Module containing sources, sinks, and sanitizers for overly permissive CORS configurations. */
-module CorsPermissiveConfiguration {
-  private newtype TFlowState =
-    TTaint() or
-    TTrueOrNull() or
-    TWildcard()
-
-  /** A flow state to asociate with a tracked value. */
-  class FlowState extends TFlowState {
-    /** Gets a string representation of this flow state. */
-    string toString() {
-      this = TTaint() and result = "taint"
-      or
-      this = TTrueOrNull() and result = "true-or-null"
-      or
-      this = TWildcard() and result = "wildcard"
-    }
-
-    deprecated DataFlow::FlowLabel toFlowLabel() {
-      this = TTaint() and result.isTaint()
-      or
-      this = TTrueOrNull() and result instanceof TrueAndNull
-      or
-      this = TWildcard() and result instanceof Wildcard
-    }
-  }
-
-  /** Predicates for working with flow states. */
-  module FlowState {
-    deprecated FlowState fromFlowLabel(DataFlow::FlowLabel label) { result.toFlowLabel() = label }
-
-    /** A tainted value. */
-    FlowState taint() { result = TTaint() }
-
-    /** A `true` or `null` value. */
-    FlowState trueOrNull() { result = TTrueOrNull() }
-
-    /** A `"*"` value. */
-    FlowState wildcard() { result = TWildcard() }
-  }
-
-  /**
-   * A data flow source for permissive CORS configuration.
-   */
-  abstract class Source extends DataFlow::Node { }
-
-  /**
-   * A data flow sink for permissive CORS configuration.
-   */
-  abstract class Sink extends DataFlow::Node { }
-
-  /**
-   * A sanitizer for permissive CORS configuration.
-   */
-  abstract class Sanitizer extends DataFlow::Node { }
-
-  /**
-   * DEPRECATED: Use `ActiveThreatModelSource` from Concepts instead!
-   */
-  deprecated class RemoteFlowSourceAsSource = ActiveThreatModelSourceAsSource;
-
-  /**
-   * An active threat-model source, considered as a flow source.
-   */
-  private class ActiveThreatModelSourceAsSource extends Source instanceof ActiveThreatModelSource {
-    ActiveThreatModelSourceAsSource() { not this instanceof ClientSideRemoteFlowSource }
-  }
-
-  /** A flow label representing `true` and `null` values. */
-  abstract deprecated class TrueAndNull extends DataFlow::FlowLabel {
-    TrueAndNull() { this = "TrueAndNull" }
-  }
-
-  deprecated TrueAndNull truenullLabel() { any() }
-
-  /** A flow label representing `*` value. */
-  abstract deprecated class Wildcard extends DataFlow::FlowLabel {
-    Wildcard() { this = "Wildcard" }
-  }
-
-  deprecated Wildcard wildcardLabel() { any() }
-
-  /** An overly permissive value for `origin` (Apollo) */
-  class TrueNullValue extends Source {
-    TrueNullValue() { this.mayHaveBooleanValue(true) or this.asExpr() instanceof NullLiteral }
-  }
-
-  /** An overly permissive value for `origin` (Express) */
-  class WildcardValue extends Source {
-    WildcardValue() { this.mayHaveStringValue("*") }
-  }
-
-  /**
-   * The value of cors origin when initializing the application.
-   */
-  class CorsApolloServer extends Sink, DataFlow::ValueNode {
-    CorsApolloServer() {
-      exists(ApolloServer agql |
-        this =
-          agql.getOptionArgument(0, "cors").getALocalSource().getAPropertyWrite("origin").getRhs()
-      )
-    }
-  }
-
-  /**
-   * The value of cors origin when initializing the application.
-   */
-  class ExpressCors extends Sink, DataFlow::ValueNode {
-    ExpressCors() {
-      exists(CorsConfiguration config | this = config.getCorsConfiguration().getOrigin())
-    }
-  }
-
-  /**
-   * An express route setup configured with the `cors` package.
-   */
-  class CorsConfiguration extends DataFlow::MethodCallNode {
-    Cors corsConfig;
-
-    CorsConfiguration() {
-      exists(Express::RouteSetup setup | this = setup |
-        if setup.isUseCall()
-        then corsConfig = setup.getArgument(0)
-        else corsConfig = setup.getArgument(any(int i | i > 0))
-      )
-    }
-
-    /** Gets the expression that configures `cors` on this route setup. */
-    Cors getCorsConfiguration() { result = corsConfig }
-  }
-}
diff --git a/javascript/ql/src/experimental/Security/CWE-942/CorsPermissiveConfigurationQuery.qll b/javascript/ql/src/experimental/Security/CWE-942/CorsPermissiveConfigurationQuery.qll
deleted file mode 100644
index 3605a1adaa9..00000000000
--- a/javascript/ql/src/experimental/Security/CWE-942/CorsPermissiveConfigurationQuery.qll
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * Provides a dataflow taint tracking configuration for reasoning
- * about overly permissive CORS configurations.
- *
- * Note, for performance reasons: only import this file if
- * `CorsPermissiveConfiguration::Configuration` is needed,
- * otherwise `CorsPermissiveConfigurationCustomizations` should
- * be imported instead.
- */
-
-import javascript
-import CorsPermissiveConfigurationCustomizations::CorsPermissiveConfiguration
-private import CorsPermissiveConfigurationCustomizations::CorsPermissiveConfiguration as CorsPermissiveConfiguration
-
-/**
- * A data flow configuration for overly permissive CORS configuration.
- */
-module CorsPermissiveConfigurationConfig implements DataFlow::StateConfigSig {
-  class FlowState = CorsPermissiveConfiguration::FlowState;
-
-  predicate isSource(DataFlow::Node source, FlowState state) {
-    source instanceof TrueNullValue and state = FlowState::trueOrNull()
-    or
-    source instanceof WildcardValue and state = FlowState::wildcard()
-    or
-    source instanceof RemoteFlowSource and state = FlowState::taint()
-  }
-
-  predicate isSink(DataFlow::Node sink, FlowState state) {
-    sink instanceof CorsApolloServer and state = [FlowState::taint(), FlowState::trueOrNull()]
-    or
-    sink instanceof ExpressCors and state = [FlowState::taint(), FlowState::wildcard()]
-  }
-
-  predicate isBarrier(DataFlow::Node node) { node instanceof Sanitizer }
-
-  predicate observeDiffInformedIncrementalMode() { any() }
-}
-
-module CorsPermissiveConfigurationFlow =
-  TaintTracking::GlobalWithState<CorsPermissiveConfigurationConfig>;
-
-/**
- * DEPRECATED. Use the `CorsPermissiveConfigurationFlow` module instead.
- */
-deprecated class Configuration extends TaintTracking::Configuration {
-  Configuration() { this = "CorsPermissiveConfiguration" }
-
-  override predicate isSource(DataFlow::Node source, DataFlow::FlowLabel label) {
-    CorsPermissiveConfigurationConfig::isSource(source, FlowState::fromFlowLabel(label))
-  }
-
-  override predicate isSink(DataFlow::Node sink, DataFlow::FlowLabel label) {
-    CorsPermissiveConfigurationConfig::isSink(sink, FlowState::fromFlowLabel(label))
-  }
-
-  override predicate isSanitizer(DataFlow::Node node) {
-    super.isSanitizer(node) or
-    CorsPermissiveConfigurationConfig::isBarrier(node)
-  }
-}
-
-deprecated private class WildcardActivated extends DataFlow::FlowLabel, Wildcard {
-  WildcardActivated() { this = this }
-}
-
-deprecated private class TrueAndNullActivated extends DataFlow::FlowLabel, TrueAndNull {
-  TrueAndNullActivated() { this = this }
-}
diff --git a/javascript/ql/src/qlpack.yml b/javascript/ql/src/qlpack.yml
index c06711ab2ca..93dd9cf7ae7 100644
--- a/javascript/ql/src/qlpack.yml
+++ b/javascript/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/javascript-queries
-version: 2.0.2-dev
+version: 2.1.4-dev
 groups:
   - javascript
   - queries
diff --git a/csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/HttpCookiesTrue/RequireSSL.expected b/javascript/ql/test/ApiGraphs/explicit-this/VerifyAssertions.expected
similarity index 100%
rename from csharp/ql/test/experimental/Security Features/CWE-614/RequireSSLSystemWeb/HttpCookiesTrue/RequireSSL.expected
rename to javascript/ql/test/ApiGraphs/explicit-this/VerifyAssertions.expected
diff --git a/javascript/ql/test/ApiGraphs/explicit-this/VerifyAssertions.ql b/javascript/ql/test/ApiGraphs/explicit-this/VerifyAssertions.ql
new file mode 100644
index 00000000000..b9c54e26072
--- /dev/null
+++ b/javascript/ql/test/ApiGraphs/explicit-this/VerifyAssertions.ql
@@ -0,0 +1 @@
+import ApiGraphs.VerifyAssertions
diff --git a/javascript/ql/test/ApiGraphs/explicit-this/package.json b/javascript/ql/test/ApiGraphs/explicit-this/package.json
new file mode 100644
index 00000000000..f48acd62360
--- /dev/null
+++ b/javascript/ql/test/ApiGraphs/explicit-this/package.json
@@ -0,0 +1,6 @@
+{
+    "name": "explicit-this",
+    "dependencies": {
+        "something": "*"
+    }
+}
diff --git a/javascript/ql/test/ApiGraphs/explicit-this/tst.js b/javascript/ql/test/ApiGraphs/explicit-this/tst.js
new file mode 100644
index 00000000000..a3f5ecff21e
--- /dev/null
+++ b/javascript/ql/test/ApiGraphs/explicit-this/tst.js
@@ -0,0 +1,7 @@
+const lib = require('something');
+
+function f() {
+    this.two(); /** use=moduleImport("something").getMember("exports").getMember("one").getMember("two").getReturn() */
+}
+
+f.call(lib.one);
diff --git a/javascript/ql/test/experimental/FormParsers/RemoteFlowSource.expected b/javascript/ql/test/experimental/FormParsers/RemoteFlowSource.expected
index 4cd0cf23378..1d53bbb1b25 100644
--- a/javascript/ql/test/experimental/FormParsers/RemoteFlowSource.expected
+++ b/javascript/ql/test/experimental/FormParsers/RemoteFlowSource.expected
@@ -1,17 +1,17 @@
 edges
 | busybus.js:9:30:9:33 | file | busybus.js:13:23:13:23 | z | provenance |  |
 | busybus.js:9:36:9:39 | info | busybus.js:10:54:10:57 | info | provenance |  |
-| busybus.js:10:19:10:50 | { filen ... eType } | busybus.js:10:19:10:57 | encoding | provenance |  |
-| busybus.js:10:19:10:50 | { filen ... eType } | busybus.js:10:19:10:57 | filename | provenance |  |
-| busybus.js:10:19:10:50 | { filen ... eType } | busybus.js:10:19:10:57 | mimeType | provenance |  |
-| busybus.js:10:19:10:57 | encoding | busybus.js:12:28:12:35 | encoding | provenance |  |
-| busybus.js:10:19:10:57 | filename | busybus.js:12:18:12:25 | filename | provenance |  |
-| busybus.js:10:19:10:57 | mimeType | busybus.js:12:38:12:45 | mimeType | provenance |  |
+| busybus.js:10:19:10:50 | { filen ... eType } | busybus.js:10:21:10:28 | filename | provenance |  |
+| busybus.js:10:19:10:50 | { filen ... eType } | busybus.js:10:31:10:38 | encoding | provenance |  |
+| busybus.js:10:19:10:50 | { filen ... eType } | busybus.js:10:41:10:48 | mimeType | provenance |  |
+| busybus.js:10:21:10:28 | filename | busybus.js:12:18:12:25 | filename | provenance |  |
+| busybus.js:10:31:10:38 | encoding | busybus.js:12:28:12:35 | encoding | provenance |  |
+| busybus.js:10:41:10:48 | mimeType | busybus.js:12:38:12:45 | mimeType | provenance |  |
 | busybus.js:10:54:10:57 | info | busybus.js:10:19:10:50 | { filen ... eType } | provenance |  |
 | busybus.js:13:23:13:23 | z | busybus.js:13:31:13:36 | sink() | provenance |  |
 | busybus.js:15:30:15:33 | data | busybus.js:16:22:16:25 | data | provenance |  |
-| busybus.js:22:25:22:42 | data | busybus.js:23:26:23:29 | data | provenance |  |
-| busybus.js:22:32:22:42 | this.read() | busybus.js:22:25:22:42 | data | provenance |  |
+| busybus.js:22:25:22:28 | data | busybus.js:23:26:23:29 | data | provenance |  |
+| busybus.js:22:32:22:42 | this.read() | busybus.js:22:25:22:28 | data | provenance |  |
 | busybus.js:27:25:27:28 | name | busybus.js:28:18:28:21 | name | provenance |  |
 | busybus.js:27:31:27:33 | val | busybus.js:28:24:28:26 | val | provenance |  |
 | busybus.js:27:36:27:39 | info | busybus.js:28:29:28:32 | info | provenance |  |
@@ -19,10 +19,10 @@ edges
 | dicer.js:14:28:14:33 | header | dicer.js:16:22:16:27 | header | provenance |  |
 | dicer.js:16:22:16:27 | header | dicer.js:16:22:16:30 | header[h] | provenance |  |
 | dicer.js:19:26:19:29 | data | dicer.js:20:18:20:21 | data | provenance |  |
-| formidable.js:7:11:7:25 | [fields, files] | formidable.js:7:11:7:49 | fields | provenance |  |
-| formidable.js:7:11:7:25 | [fields, files] | formidable.js:7:11:7:49 | files | provenance |  |
-| formidable.js:7:11:7:49 | fields | formidable.js:8:10:8:15 | fields | provenance |  |
-| formidable.js:7:11:7:49 | files | formidable.js:8:18:8:22 | files | provenance |  |
+| formidable.js:7:11:7:25 | [fields, files] | formidable.js:7:12:7:17 | fields | provenance |  |
+| formidable.js:7:11:7:25 | [fields, files] | formidable.js:7:20:7:24 | files | provenance |  |
+| formidable.js:7:12:7:17 | fields | formidable.js:8:10:8:15 | fields | provenance |  |
+| formidable.js:7:20:7:24 | files | formidable.js:8:18:8:22 | files | provenance |  |
 | formidable.js:7:29:7:49 | await f ... se(req) | formidable.js:7:11:7:25 | [fields, files] | provenance |  |
 | formidable.js:7:35:7:49 | form.parse(req) | formidable.js:7:29:7:49 | await f ... se(req) | provenance |  |
 | formidable.js:9:27:9:34 | formname | formidable.js:10:14:10:21 | formname | provenance |  |
@@ -39,9 +39,9 @@ nodes
 | busybus.js:9:30:9:33 | file | semmle.label | file |
 | busybus.js:9:36:9:39 | info | semmle.label | info |
 | busybus.js:10:19:10:50 | { filen ... eType } | semmle.label | { filen ... eType } |
-| busybus.js:10:19:10:57 | encoding | semmle.label | encoding |
-| busybus.js:10:19:10:57 | filename | semmle.label | filename |
-| busybus.js:10:19:10:57 | mimeType | semmle.label | mimeType |
+| busybus.js:10:21:10:28 | filename | semmle.label | filename |
+| busybus.js:10:31:10:38 | encoding | semmle.label | encoding |
+| busybus.js:10:41:10:48 | mimeType | semmle.label | mimeType |
 | busybus.js:10:54:10:57 | info | semmle.label | info |
 | busybus.js:12:18:12:25 | filename | semmle.label | filename |
 | busybus.js:12:28:12:35 | encoding | semmle.label | encoding |
@@ -50,7 +50,7 @@ nodes
 | busybus.js:13:31:13:36 | sink() | semmle.label | sink() |
 | busybus.js:15:30:15:33 | data | semmle.label | data |
 | busybus.js:16:22:16:25 | data | semmle.label | data |
-| busybus.js:22:25:22:42 | data | semmle.label | data |
+| busybus.js:22:25:22:28 | data | semmle.label | data |
 | busybus.js:22:32:22:42 | this.read() | semmle.label | this.read() |
 | busybus.js:23:26:23:29 | data | semmle.label | data |
 | busybus.js:27:25:27:28 | name | semmle.label | name |
@@ -67,8 +67,8 @@ nodes
 | dicer.js:19:26:19:29 | data | semmle.label | data |
 | dicer.js:20:18:20:21 | data | semmle.label | data |
 | formidable.js:7:11:7:25 | [fields, files] | semmle.label | [fields, files] |
-| formidable.js:7:11:7:49 | fields | semmle.label | fields |
-| formidable.js:7:11:7:49 | files | semmle.label | files |
+| formidable.js:7:12:7:17 | fields | semmle.label | fields |
+| formidable.js:7:20:7:24 | files | semmle.label | files |
 | formidable.js:7:29:7:49 | await f ... se(req) | semmle.label | await f ... se(req) |
 | formidable.js:7:35:7:49 | form.parse(req) | semmle.label | form.parse(req) |
 | formidable.js:8:10:8:15 | fields | semmle.label | fields |
diff --git a/javascript/ql/test/experimental/Security/CWE-094-dataURL/CodeInjection.expected b/javascript/ql/test/experimental/Security/CWE-094-dataURL/CodeInjection.expected
index ab162e0b311..0385389e73c 100644
--- a/javascript/ql/test/experimental/Security/CWE-094-dataURL/CodeInjection.expected
+++ b/javascript/ql/test/experimental/Security/CWE-094-dataURL/CodeInjection.expected
@@ -1,33 +1,33 @@
 edges
-| test.js:5:11:5:44 | payload | test.js:6:30:6:36 | payload | provenance |  |
-| test.js:5:11:5:44 | payload | test.js:9:26:9:32 | payload | provenance |  |
-| test.js:5:21:5:44 | req.que ... rameter | test.js:5:11:5:44 | payload | provenance |  |
-| test.js:6:9:6:43 | payloadURL | test.js:7:16:7:25 | payloadURL | provenance |  |
-| test.js:6:22:6:43 | new URL ...  + sth) | test.js:6:9:6:43 | payloadURL | provenance |  |
+| test.js:5:11:5:17 | payload | test.js:6:30:6:36 | payload | provenance |  |
+| test.js:5:11:5:17 | payload | test.js:9:26:9:32 | payload | provenance |  |
+| test.js:5:21:5:44 | req.que ... rameter | test.js:5:11:5:17 | payload | provenance |  |
+| test.js:6:9:6:18 | payloadURL | test.js:7:16:7:25 | payloadURL | provenance |  |
+| test.js:6:22:6:43 | new URL ...  + sth) | test.js:6:9:6:18 | payloadURL | provenance |  |
 | test.js:6:30:6:36 | payload | test.js:6:30:6:42 | payload + sth | provenance |  |
 | test.js:6:30:6:42 | payload + sth | test.js:6:22:6:43 | new URL ...  + sth) | provenance | Config |
-| test.js:9:5:9:39 | payloadURL | test.js:10:16:10:25 | payloadURL | provenance |  |
-| test.js:9:18:9:39 | new URL ...  + sth) | test.js:9:5:9:39 | payloadURL | provenance |  |
+| test.js:9:5:9:14 | payloadURL | test.js:10:16:10:25 | payloadURL | provenance |  |
+| test.js:9:18:9:39 | new URL ...  + sth) | test.js:9:5:9:14 | payloadURL | provenance |  |
 | test.js:9:26:9:32 | payload | test.js:9:26:9:38 | payload + sth | provenance |  |
 | test.js:9:26:9:38 | payload + sth | test.js:9:18:9:39 | new URL ...  + sth) | provenance | Config |
-| test.js:17:11:17:44 | payload | test.js:18:18:18:24 | payload | provenance |  |
-| test.js:17:11:17:44 | payload | test.js:19:18:19:24 | payload | provenance |  |
-| test.js:17:21:17:44 | req.que ... rameter | test.js:17:11:17:44 | payload | provenance |  |
+| test.js:17:11:17:17 | payload | test.js:18:18:18:24 | payload | provenance |  |
+| test.js:17:11:17:17 | payload | test.js:19:18:19:24 | payload | provenance |  |
+| test.js:17:21:17:44 | req.que ... rameter | test.js:17:11:17:17 | payload | provenance |  |
 | test.js:19:18:19:24 | payload | test.js:19:18:19:30 | payload + sth | provenance |  |
 nodes
-| test.js:5:11:5:44 | payload | semmle.label | payload |
+| test.js:5:11:5:17 | payload | semmle.label | payload |
 | test.js:5:21:5:44 | req.que ... rameter | semmle.label | req.que ... rameter |
-| test.js:6:9:6:43 | payloadURL | semmle.label | payloadURL |
+| test.js:6:9:6:18 | payloadURL | semmle.label | payloadURL |
 | test.js:6:22:6:43 | new URL ...  + sth) | semmle.label | new URL ...  + sth) |
 | test.js:6:30:6:36 | payload | semmle.label | payload |
 | test.js:6:30:6:42 | payload + sth | semmle.label | payload + sth |
 | test.js:7:16:7:25 | payloadURL | semmle.label | payloadURL |
-| test.js:9:5:9:39 | payloadURL | semmle.label | payloadURL |
+| test.js:9:5:9:14 | payloadURL | semmle.label | payloadURL |
 | test.js:9:18:9:39 | new URL ...  + sth) | semmle.label | new URL ...  + sth) |
 | test.js:9:26:9:32 | payload | semmle.label | payload |
 | test.js:9:26:9:38 | payload + sth | semmle.label | payload + sth |
 | test.js:10:16:10:25 | payloadURL | semmle.label | payloadURL |
-| test.js:17:11:17:44 | payload | semmle.label | payload |
+| test.js:17:11:17:17 | payload | semmle.label | payload |
 | test.js:17:21:17:44 | req.que ... rameter | semmle.label | req.que ... rameter |
 | test.js:18:18:18:24 | payload | semmle.label | payload |
 | test.js:19:18:19:24 | payload | semmle.label | payload |
diff --git a/javascript/ql/test/experimental/Security/CWE-099/EnvValueAndKeyInjection/EnvValueAndKeyInjection.expected b/javascript/ql/test/experimental/Security/CWE-099/EnvValueAndKeyInjection/EnvValueAndKeyInjection.expected
index 40313cf964c..d54685c97be 100644
--- a/javascript/ql/test/experimental/Security/CWE-099/EnvValueAndKeyInjection/EnvValueAndKeyInjection.expected
+++ b/javascript/ql/test/experimental/Security/CWE-099/EnvValueAndKeyInjection/EnvValueAndKeyInjection.expected
@@ -1,28 +1,28 @@
 edges
-| test.js:5:9:5:28 | { EnvValue, EnvKey } | test.js:5:9:5:39 | EnvKey | provenance |  |
-| test.js:5:9:5:28 | { EnvValue, EnvKey } | test.js:5:9:5:39 | EnvValue | provenance |  |
-| test.js:5:9:5:39 | EnvKey | test.js:6:15:6:20 | EnvKey | provenance |  |
-| test.js:5:9:5:39 | EnvKey | test.js:7:15:7:20 | EnvKey | provenance |  |
-| test.js:5:9:5:39 | EnvValue | test.js:6:25:6:32 | EnvValue | provenance |  |
-| test.js:5:9:5:39 | EnvValue | test.js:7:25:7:32 | EnvValue | provenance |  |
+| test.js:5:9:5:28 | { EnvValue, EnvKey } | test.js:5:11:5:18 | EnvValue | provenance |  |
+| test.js:5:9:5:28 | { EnvValue, EnvKey } | test.js:5:21:5:26 | EnvKey | provenance |  |
+| test.js:5:11:5:18 | EnvValue | test.js:6:25:6:32 | EnvValue | provenance |  |
+| test.js:5:11:5:18 | EnvValue | test.js:7:25:7:32 | EnvValue | provenance |  |
+| test.js:5:21:5:26 | EnvKey | test.js:6:15:6:20 | EnvKey | provenance |  |
+| test.js:5:21:5:26 | EnvKey | test.js:7:15:7:20 | EnvKey | provenance |  |
 | test.js:5:32:5:39 | req.body | test.js:5:9:5:28 | { EnvValue, EnvKey } | provenance |  |
-| test.js:13:9:13:28 | { EnvValue, EnvKey } | test.js:13:9:13:39 | EnvKey | provenance |  |
-| test.js:13:9:13:28 | { EnvValue, EnvKey } | test.js:13:9:13:39 | EnvValue | provenance |  |
-| test.js:13:9:13:39 | EnvKey | test.js:15:15:15:20 | EnvKey | provenance |  |
-| test.js:13:9:13:39 | EnvValue | test.js:16:26:16:33 | EnvValue | provenance |  |
+| test.js:13:9:13:28 | { EnvValue, EnvKey } | test.js:13:11:13:18 | EnvValue | provenance |  |
+| test.js:13:9:13:28 | { EnvValue, EnvKey } | test.js:13:21:13:26 | EnvKey | provenance |  |
+| test.js:13:11:13:18 | EnvValue | test.js:16:26:16:33 | EnvValue | provenance |  |
+| test.js:13:21:13:26 | EnvKey | test.js:15:15:15:20 | EnvKey | provenance |  |
 | test.js:13:32:13:39 | req.body | test.js:13:9:13:28 | { EnvValue, EnvKey } | provenance |  |
 nodes
 | test.js:5:9:5:28 | { EnvValue, EnvKey } | semmle.label | { EnvValue, EnvKey } |
-| test.js:5:9:5:39 | EnvKey | semmle.label | EnvKey |
-| test.js:5:9:5:39 | EnvValue | semmle.label | EnvValue |
+| test.js:5:11:5:18 | EnvValue | semmle.label | EnvValue |
+| test.js:5:21:5:26 | EnvKey | semmle.label | EnvKey |
 | test.js:5:32:5:39 | req.body | semmle.label | req.body |
 | test.js:6:15:6:20 | EnvKey | semmle.label | EnvKey |
 | test.js:6:25:6:32 | EnvValue | semmle.label | EnvValue |
 | test.js:7:15:7:20 | EnvKey | semmle.label | EnvKey |
 | test.js:7:25:7:32 | EnvValue | semmle.label | EnvValue |
 | test.js:13:9:13:28 | { EnvValue, EnvKey } | semmle.label | { EnvValue, EnvKey } |
-| test.js:13:9:13:39 | EnvKey | semmle.label | EnvKey |
-| test.js:13:9:13:39 | EnvValue | semmle.label | EnvValue |
+| test.js:13:11:13:18 | EnvValue | semmle.label | EnvValue |
+| test.js:13:21:13:26 | EnvKey | semmle.label | EnvKey |
 | test.js:13:32:13:39 | req.body | semmle.label | req.body |
 | test.js:15:15:15:20 | EnvKey | semmle.label | EnvKey |
 | test.js:16:26:16:33 | EnvValue | semmle.label | EnvValue |
diff --git a/javascript/ql/test/experimental/Security/CWE-099/EnvValueInjection/EnvValueInjection.expected b/javascript/ql/test/experimental/Security/CWE-099/EnvValueInjection/EnvValueInjection.expected
index 87f6e5d4b86..5ba1884017f 100644
--- a/javascript/ql/test/experimental/Security/CWE-099/EnvValueInjection/EnvValueInjection.expected
+++ b/javascript/ql/test/experimental/Security/CWE-099/EnvValueInjection/EnvValueInjection.expected
@@ -1,12 +1,12 @@
 edges
-| test.js:4:9:4:20 | { EnvValue } | test.js:4:9:4:31 | EnvValue | provenance |  |
-| test.js:4:9:4:31 | EnvValue | test.js:5:35:5:42 | EnvValue | provenance |  |
-| test.js:4:9:4:31 | EnvValue | test.js:6:23:6:30 | EnvValue | provenance |  |
-| test.js:4:9:4:31 | EnvValue | test.js:7:22:7:29 | EnvValue | provenance |  |
+| test.js:4:9:4:20 | { EnvValue } | test.js:4:11:4:18 | EnvValue | provenance |  |
+| test.js:4:11:4:18 | EnvValue | test.js:5:35:5:42 | EnvValue | provenance |  |
+| test.js:4:11:4:18 | EnvValue | test.js:6:23:6:30 | EnvValue | provenance |  |
+| test.js:4:11:4:18 | EnvValue | test.js:7:22:7:29 | EnvValue | provenance |  |
 | test.js:4:24:4:31 | req.body | test.js:4:9:4:20 | { EnvValue } | provenance |  |
 nodes
 | test.js:4:9:4:20 | { EnvValue } | semmle.label | { EnvValue } |
-| test.js:4:9:4:31 | EnvValue | semmle.label | EnvValue |
+| test.js:4:11:4:18 | EnvValue | semmle.label | EnvValue |
 | test.js:4:24:4:31 | req.body | semmle.label | req.body |
 | test.js:5:35:5:42 | EnvValue | semmle.label | EnvValue |
 | test.js:6:23:6:30 | EnvValue | semmle.label | EnvValue |
diff --git a/javascript/ql/test/experimental/Security/CWE-347/localsource/decodeJwtWithoutVerificationLocalSource.expected b/javascript/ql/test/experimental/Security/CWE-347/localsource/decodeJwtWithoutVerificationLocalSource.expected
index 0f67cfc8513..09db119d078 100644
--- a/javascript/ql/test/experimental/Security/CWE-347/localsource/decodeJwtWithoutVerificationLocalSource.expected
+++ b/javascript/ql/test/experimental/Security/CWE-347/localsource/decodeJwtWithoutVerificationLocalSource.expected
@@ -1,74 +1,74 @@
 edges
-| JsonWebToken.js:13:11:13:28 | UserToken | JsonWebToken.js:16:28:16:36 | UserToken | provenance |  |
-| JsonWebToken.js:13:23:13:28 | aJwt() | JsonWebToken.js:13:11:13:28 | UserToken | provenance |  |
-| JsonWebToken.js:20:11:20:28 | UserToken | JsonWebToken.js:23:28:23:36 | UserToken | provenance |  |
-| JsonWebToken.js:20:11:20:28 | UserToken | JsonWebToken.js:24:28:24:36 | UserToken | provenance |  |
-| JsonWebToken.js:20:23:20:28 | aJwt() | JsonWebToken.js:20:11:20:28 | UserToken | provenance |  |
-| JsonWebToken.js:28:11:28:28 | UserToken | JsonWebToken.js:31:28:31:36 | UserToken | provenance |  |
-| JsonWebToken.js:28:23:28:28 | aJwt() | JsonWebToken.js:28:11:28:28 | UserToken | provenance |  |
-| JsonWebToken.js:35:11:35:28 | UserToken | JsonWebToken.js:38:28:38:36 | UserToken | provenance |  |
-| JsonWebToken.js:35:11:35:28 | UserToken | JsonWebToken.js:39:28:39:36 | UserToken | provenance |  |
-| JsonWebToken.js:35:23:35:28 | aJwt() | JsonWebToken.js:35:11:35:28 | UserToken | provenance |  |
-| JsonWebToken.js:43:11:43:28 | UserToken | JsonWebToken.js:46:28:46:36 | UserToken | provenance |  |
-| JsonWebToken.js:43:11:43:28 | UserToken | JsonWebToken.js:47:28:47:36 | UserToken | provenance |  |
-| JsonWebToken.js:43:23:43:28 | aJwt() | JsonWebToken.js:43:11:43:28 | UserToken | provenance |  |
-| jose.js:12:11:12:28 | UserToken | jose.js:15:20:15:28 | UserToken | provenance |  |
-| jose.js:12:23:12:28 | aJwt() | jose.js:12:11:12:28 | UserToken | provenance |  |
-| jose.js:19:11:19:28 | UserToken | jose.js:22:20:22:28 | UserToken | provenance |  |
-| jose.js:19:11:19:28 | UserToken | jose.js:23:26:23:34 | UserToken | provenance |  |
-| jose.js:19:23:19:28 | aJwt() | jose.js:19:11:19:28 | UserToken | provenance |  |
-| jose.js:27:11:27:28 | UserToken | jose.js:30:26:30:34 | UserToken | provenance |  |
-| jose.js:27:23:27:28 | aJwt() | jose.js:27:11:27:28 | UserToken | provenance |  |
-| jwtDecode.js:13:11:13:28 | UserToken | jwtDecode.js:17:16:17:24 | UserToken | provenance |  |
-| jwtDecode.js:13:23:13:28 | aJwt() | jwtDecode.js:13:11:13:28 | UserToken | provenance |  |
-| jwtSimple.js:13:11:13:28 | UserToken | jwtSimple.js:16:23:16:31 | UserToken | provenance |  |
-| jwtSimple.js:13:23:13:28 | aJwt() | jwtSimple.js:13:11:13:28 | UserToken | provenance |  |
-| jwtSimple.js:20:11:20:28 | UserToken | jwtSimple.js:23:23:23:31 | UserToken | provenance |  |
-| jwtSimple.js:20:11:20:28 | UserToken | jwtSimple.js:24:23:24:31 | UserToken | provenance |  |
-| jwtSimple.js:20:23:20:28 | aJwt() | jwtSimple.js:20:11:20:28 | UserToken | provenance |  |
-| jwtSimple.js:28:11:28:28 | UserToken | jwtSimple.js:31:23:31:31 | UserToken | provenance |  |
-| jwtSimple.js:28:11:28:28 | UserToken | jwtSimple.js:32:23:32:31 | UserToken | provenance |  |
-| jwtSimple.js:28:23:28:28 | aJwt() | jwtSimple.js:28:11:28:28 | UserToken | provenance |  |
+| JsonWebToken.js:13:11:13:19 | UserToken | JsonWebToken.js:16:28:16:36 | UserToken | provenance |  |
+| JsonWebToken.js:13:23:13:28 | aJwt() | JsonWebToken.js:13:11:13:19 | UserToken | provenance |  |
+| JsonWebToken.js:20:11:20:19 | UserToken | JsonWebToken.js:23:28:23:36 | UserToken | provenance |  |
+| JsonWebToken.js:20:11:20:19 | UserToken | JsonWebToken.js:24:28:24:36 | UserToken | provenance |  |
+| JsonWebToken.js:20:23:20:28 | aJwt() | JsonWebToken.js:20:11:20:19 | UserToken | provenance |  |
+| JsonWebToken.js:28:11:28:19 | UserToken | JsonWebToken.js:31:28:31:36 | UserToken | provenance |  |
+| JsonWebToken.js:28:23:28:28 | aJwt() | JsonWebToken.js:28:11:28:19 | UserToken | provenance |  |
+| JsonWebToken.js:35:11:35:19 | UserToken | JsonWebToken.js:38:28:38:36 | UserToken | provenance |  |
+| JsonWebToken.js:35:11:35:19 | UserToken | JsonWebToken.js:39:28:39:36 | UserToken | provenance |  |
+| JsonWebToken.js:35:23:35:28 | aJwt() | JsonWebToken.js:35:11:35:19 | UserToken | provenance |  |
+| JsonWebToken.js:43:11:43:19 | UserToken | JsonWebToken.js:46:28:46:36 | UserToken | provenance |  |
+| JsonWebToken.js:43:11:43:19 | UserToken | JsonWebToken.js:47:28:47:36 | UserToken | provenance |  |
+| JsonWebToken.js:43:23:43:28 | aJwt() | JsonWebToken.js:43:11:43:19 | UserToken | provenance |  |
+| jose.js:12:11:12:19 | UserToken | jose.js:15:20:15:28 | UserToken | provenance |  |
+| jose.js:12:23:12:28 | aJwt() | jose.js:12:11:12:19 | UserToken | provenance |  |
+| jose.js:19:11:19:19 | UserToken | jose.js:22:20:22:28 | UserToken | provenance |  |
+| jose.js:19:11:19:19 | UserToken | jose.js:23:26:23:34 | UserToken | provenance |  |
+| jose.js:19:23:19:28 | aJwt() | jose.js:19:11:19:19 | UserToken | provenance |  |
+| jose.js:27:11:27:19 | UserToken | jose.js:30:26:30:34 | UserToken | provenance |  |
+| jose.js:27:23:27:28 | aJwt() | jose.js:27:11:27:19 | UserToken | provenance |  |
+| jwtDecode.js:13:11:13:19 | UserToken | jwtDecode.js:17:16:17:24 | UserToken | provenance |  |
+| jwtDecode.js:13:23:13:28 | aJwt() | jwtDecode.js:13:11:13:19 | UserToken | provenance |  |
+| jwtSimple.js:13:11:13:19 | UserToken | jwtSimple.js:16:23:16:31 | UserToken | provenance |  |
+| jwtSimple.js:13:23:13:28 | aJwt() | jwtSimple.js:13:11:13:19 | UserToken | provenance |  |
+| jwtSimple.js:20:11:20:19 | UserToken | jwtSimple.js:23:23:23:31 | UserToken | provenance |  |
+| jwtSimple.js:20:11:20:19 | UserToken | jwtSimple.js:24:23:24:31 | UserToken | provenance |  |
+| jwtSimple.js:20:23:20:28 | aJwt() | jwtSimple.js:20:11:20:19 | UserToken | provenance |  |
+| jwtSimple.js:28:11:28:19 | UserToken | jwtSimple.js:31:23:31:31 | UserToken | provenance |  |
+| jwtSimple.js:28:11:28:19 | UserToken | jwtSimple.js:32:23:32:31 | UserToken | provenance |  |
+| jwtSimple.js:28:23:28:28 | aJwt() | jwtSimple.js:28:11:28:19 | UserToken | provenance |  |
 nodes
-| JsonWebToken.js:13:11:13:28 | UserToken | semmle.label | UserToken |
+| JsonWebToken.js:13:11:13:19 | UserToken | semmle.label | UserToken |
 | JsonWebToken.js:13:23:13:28 | aJwt() | semmle.label | aJwt() |
 | JsonWebToken.js:16:28:16:36 | UserToken | semmle.label | UserToken |
-| JsonWebToken.js:20:11:20:28 | UserToken | semmle.label | UserToken |
+| JsonWebToken.js:20:11:20:19 | UserToken | semmle.label | UserToken |
 | JsonWebToken.js:20:23:20:28 | aJwt() | semmle.label | aJwt() |
 | JsonWebToken.js:23:28:23:36 | UserToken | semmle.label | UserToken |
 | JsonWebToken.js:24:28:24:36 | UserToken | semmle.label | UserToken |
-| JsonWebToken.js:28:11:28:28 | UserToken | semmle.label | UserToken |
+| JsonWebToken.js:28:11:28:19 | UserToken | semmle.label | UserToken |
 | JsonWebToken.js:28:23:28:28 | aJwt() | semmle.label | aJwt() |
 | JsonWebToken.js:31:28:31:36 | UserToken | semmle.label | UserToken |
-| JsonWebToken.js:35:11:35:28 | UserToken | semmle.label | UserToken |
+| JsonWebToken.js:35:11:35:19 | UserToken | semmle.label | UserToken |
 | JsonWebToken.js:35:23:35:28 | aJwt() | semmle.label | aJwt() |
 | JsonWebToken.js:38:28:38:36 | UserToken | semmle.label | UserToken |
 | JsonWebToken.js:39:28:39:36 | UserToken | semmle.label | UserToken |
-| JsonWebToken.js:43:11:43:28 | UserToken | semmle.label | UserToken |
+| JsonWebToken.js:43:11:43:19 | UserToken | semmle.label | UserToken |
 | JsonWebToken.js:43:23:43:28 | aJwt() | semmle.label | aJwt() |
 | JsonWebToken.js:46:28:46:36 | UserToken | semmle.label | UserToken |
 | JsonWebToken.js:47:28:47:36 | UserToken | semmle.label | UserToken |
-| jose.js:12:11:12:28 | UserToken | semmle.label | UserToken |
+| jose.js:12:11:12:19 | UserToken | semmle.label | UserToken |
 | jose.js:12:23:12:28 | aJwt() | semmle.label | aJwt() |
 | jose.js:15:20:15:28 | UserToken | semmle.label | UserToken |
-| jose.js:19:11:19:28 | UserToken | semmle.label | UserToken |
+| jose.js:19:11:19:19 | UserToken | semmle.label | UserToken |
 | jose.js:19:23:19:28 | aJwt() | semmle.label | aJwt() |
 | jose.js:22:20:22:28 | UserToken | semmle.label | UserToken |
 | jose.js:23:26:23:34 | UserToken | semmle.label | UserToken |
-| jose.js:27:11:27:28 | UserToken | semmle.label | UserToken |
+| jose.js:27:11:27:19 | UserToken | semmle.label | UserToken |
 | jose.js:27:23:27:28 | aJwt() | semmle.label | aJwt() |
 | jose.js:30:26:30:34 | UserToken | semmle.label | UserToken |
-| jwtDecode.js:13:11:13:28 | UserToken | semmle.label | UserToken |
+| jwtDecode.js:13:11:13:19 | UserToken | semmle.label | UserToken |
 | jwtDecode.js:13:23:13:28 | aJwt() | semmle.label | aJwt() |
 | jwtDecode.js:17:16:17:24 | UserToken | semmle.label | UserToken |
-| jwtSimple.js:13:11:13:28 | UserToken | semmle.label | UserToken |
+| jwtSimple.js:13:11:13:19 | UserToken | semmle.label | UserToken |
 | jwtSimple.js:13:23:13:28 | aJwt() | semmle.label | aJwt() |
 | jwtSimple.js:16:23:16:31 | UserToken | semmle.label | UserToken |
-| jwtSimple.js:20:11:20:28 | UserToken | semmle.label | UserToken |
+| jwtSimple.js:20:11:20:19 | UserToken | semmle.label | UserToken |
 | jwtSimple.js:20:23:20:28 | aJwt() | semmle.label | aJwt() |
 | jwtSimple.js:23:23:23:31 | UserToken | semmle.label | UserToken |
 | jwtSimple.js:24:23:24:31 | UserToken | semmle.label | UserToken |
-| jwtSimple.js:28:11:28:28 | UserToken | semmle.label | UserToken |
+| jwtSimple.js:28:11:28:19 | UserToken | semmle.label | UserToken |
 | jwtSimple.js:28:23:28:28 | aJwt() | semmle.label | aJwt() |
 | jwtSimple.js:31:23:31:31 | UserToken | semmle.label | UserToken |
 | jwtSimple.js:32:23:32:31 | UserToken | semmle.label | UserToken |
diff --git a/javascript/ql/test/experimental/Security/CWE-347/remotesource/decodeJwtWithoutVerification.expected b/javascript/ql/test/experimental/Security/CWE-347/remotesource/decodeJwtWithoutVerification.expected
index bb6ca940759..364fbd76b00 100644
--- a/javascript/ql/test/experimental/Security/CWE-347/remotesource/decodeJwtWithoutVerification.expected
+++ b/javascript/ql/test/experimental/Security/CWE-347/remotesource/decodeJwtWithoutVerification.expected
@@ -1,50 +1,50 @@
 edges
-| JsonWebToken.js:10:11:10:47 | UserToken | JsonWebToken.js:13:28:13:36 | UserToken | provenance |  |
-| JsonWebToken.js:10:23:10:47 | req.hea ... ization | JsonWebToken.js:10:11:10:47 | UserToken | provenance |  |
-| JsonWebToken.js:17:11:17:47 | UserToken | JsonWebToken.js:20:28:20:36 | UserToken | provenance |  |
-| JsonWebToken.js:17:11:17:47 | UserToken | JsonWebToken.js:21:28:21:36 | UserToken | provenance |  |
-| JsonWebToken.js:17:23:17:47 | req.hea ... ization | JsonWebToken.js:17:11:17:47 | UserToken | provenance |  |
-| JsonWebToken.js:32:11:32:47 | UserToken | JsonWebToken.js:35:28:35:36 | UserToken | provenance |  |
-| JsonWebToken.js:32:23:32:47 | req.hea ... ization | JsonWebToken.js:32:11:32:47 | UserToken | provenance |  |
-| JsonWebToken.js:40:11:40:47 | UserToken | JsonWebToken.js:43:28:43:36 | UserToken | provenance |  |
-| JsonWebToken.js:40:23:40:47 | req.hea ... ization | JsonWebToken.js:40:11:40:47 | UserToken | provenance |  |
-| jose.js:11:11:11:47 | UserToken | jose.js:13:20:13:28 | UserToken | provenance |  |
-| jose.js:11:23:11:47 | req.hea ... ization | jose.js:11:11:11:47 | UserToken | provenance |  |
-| jose.js:24:11:24:47 | UserToken | jose.js:26:20:26:28 | UserToken | provenance |  |
-| jose.js:24:23:24:47 | req.hea ... ization | jose.js:24:11:24:47 | UserToken | provenance |  |
-| jwtDecode.js:11:11:11:47 | UserToken | jwtDecode.js:15:16:15:24 | UserToken | provenance |  |
-| jwtDecode.js:11:23:11:47 | req.hea ... ization | jwtDecode.js:11:11:11:47 | UserToken | provenance |  |
-| jwtSimple.js:10:11:10:47 | UserToken | jwtSimple.js:13:23:13:31 | UserToken | provenance |  |
-| jwtSimple.js:10:23:10:47 | req.hea ... ization | jwtSimple.js:10:11:10:47 | UserToken | provenance |  |
-| jwtSimple.js:25:11:25:47 | UserToken | jwtSimple.js:28:23:28:31 | UserToken | provenance |  |
-| jwtSimple.js:25:23:25:47 | req.hea ... ization | jwtSimple.js:25:11:25:47 | UserToken | provenance |  |
+| JsonWebToken.js:10:11:10:19 | UserToken | JsonWebToken.js:13:28:13:36 | UserToken | provenance |  |
+| JsonWebToken.js:10:23:10:47 | req.hea ... ization | JsonWebToken.js:10:11:10:19 | UserToken | provenance |  |
+| JsonWebToken.js:17:11:17:19 | UserToken | JsonWebToken.js:20:28:20:36 | UserToken | provenance |  |
+| JsonWebToken.js:17:11:17:19 | UserToken | JsonWebToken.js:21:28:21:36 | UserToken | provenance |  |
+| JsonWebToken.js:17:23:17:47 | req.hea ... ization | JsonWebToken.js:17:11:17:19 | UserToken | provenance |  |
+| JsonWebToken.js:32:11:32:19 | UserToken | JsonWebToken.js:35:28:35:36 | UserToken | provenance |  |
+| JsonWebToken.js:32:23:32:47 | req.hea ... ization | JsonWebToken.js:32:11:32:19 | UserToken | provenance |  |
+| JsonWebToken.js:40:11:40:19 | UserToken | JsonWebToken.js:43:28:43:36 | UserToken | provenance |  |
+| JsonWebToken.js:40:23:40:47 | req.hea ... ization | JsonWebToken.js:40:11:40:19 | UserToken | provenance |  |
+| jose.js:11:11:11:19 | UserToken | jose.js:13:20:13:28 | UserToken | provenance |  |
+| jose.js:11:23:11:47 | req.hea ... ization | jose.js:11:11:11:19 | UserToken | provenance |  |
+| jose.js:24:11:24:19 | UserToken | jose.js:26:20:26:28 | UserToken | provenance |  |
+| jose.js:24:23:24:47 | req.hea ... ization | jose.js:24:11:24:19 | UserToken | provenance |  |
+| jwtDecode.js:11:11:11:19 | UserToken | jwtDecode.js:15:16:15:24 | UserToken | provenance |  |
+| jwtDecode.js:11:23:11:47 | req.hea ... ization | jwtDecode.js:11:11:11:19 | UserToken | provenance |  |
+| jwtSimple.js:10:11:10:19 | UserToken | jwtSimple.js:13:23:13:31 | UserToken | provenance |  |
+| jwtSimple.js:10:23:10:47 | req.hea ... ization | jwtSimple.js:10:11:10:19 | UserToken | provenance |  |
+| jwtSimple.js:25:11:25:19 | UserToken | jwtSimple.js:28:23:28:31 | UserToken | provenance |  |
+| jwtSimple.js:25:23:25:47 | req.hea ... ization | jwtSimple.js:25:11:25:19 | UserToken | provenance |  |
 nodes
-| JsonWebToken.js:10:11:10:47 | UserToken | semmle.label | UserToken |
+| JsonWebToken.js:10:11:10:19 | UserToken | semmle.label | UserToken |
 | JsonWebToken.js:10:23:10:47 | req.hea ... ization | semmle.label | req.hea ... ization |
 | JsonWebToken.js:13:28:13:36 | UserToken | semmle.label | UserToken |
-| JsonWebToken.js:17:11:17:47 | UserToken | semmle.label | UserToken |
+| JsonWebToken.js:17:11:17:19 | UserToken | semmle.label | UserToken |
 | JsonWebToken.js:17:23:17:47 | req.hea ... ization | semmle.label | req.hea ... ization |
 | JsonWebToken.js:20:28:20:36 | UserToken | semmle.label | UserToken |
 | JsonWebToken.js:21:28:21:36 | UserToken | semmle.label | UserToken |
-| JsonWebToken.js:32:11:32:47 | UserToken | semmle.label | UserToken |
+| JsonWebToken.js:32:11:32:19 | UserToken | semmle.label | UserToken |
 | JsonWebToken.js:32:23:32:47 | req.hea ... ization | semmle.label | req.hea ... ization |
 | JsonWebToken.js:35:28:35:36 | UserToken | semmle.label | UserToken |
-| JsonWebToken.js:40:11:40:47 | UserToken | semmle.label | UserToken |
+| JsonWebToken.js:40:11:40:19 | UserToken | semmle.label | UserToken |
 | JsonWebToken.js:40:23:40:47 | req.hea ... ization | semmle.label | req.hea ... ization |
 | JsonWebToken.js:43:28:43:36 | UserToken | semmle.label | UserToken |
-| jose.js:11:11:11:47 | UserToken | semmle.label | UserToken |
+| jose.js:11:11:11:19 | UserToken | semmle.label | UserToken |
 | jose.js:11:23:11:47 | req.hea ... ization | semmle.label | req.hea ... ization |
 | jose.js:13:20:13:28 | UserToken | semmle.label | UserToken |
-| jose.js:24:11:24:47 | UserToken | semmle.label | UserToken |
+| jose.js:24:11:24:19 | UserToken | semmle.label | UserToken |
 | jose.js:24:23:24:47 | req.hea ... ization | semmle.label | req.hea ... ization |
 | jose.js:26:20:26:28 | UserToken | semmle.label | UserToken |
-| jwtDecode.js:11:11:11:47 | UserToken | semmle.label | UserToken |
+| jwtDecode.js:11:11:11:19 | UserToken | semmle.label | UserToken |
 | jwtDecode.js:11:23:11:47 | req.hea ... ization | semmle.label | req.hea ... ization |
 | jwtDecode.js:15:16:15:24 | UserToken | semmle.label | UserToken |
-| jwtSimple.js:10:11:10:47 | UserToken | semmle.label | UserToken |
+| jwtSimple.js:10:11:10:19 | UserToken | semmle.label | UserToken |
 | jwtSimple.js:10:23:10:47 | req.hea ... ization | semmle.label | req.hea ... ization |
 | jwtSimple.js:13:23:13:31 | UserToken | semmle.label | UserToken |
-| jwtSimple.js:25:11:25:47 | UserToken | semmle.label | UserToken |
+| jwtSimple.js:25:11:25:19 | UserToken | semmle.label | UserToken |
 | jwtSimple.js:25:23:25:47 | req.hea ... ization | semmle.label | req.hea ... ization |
 | jwtSimple.js:28:23:28:31 | UserToken | semmle.label | UserToken |
 subpaths
diff --git a/javascript/ql/test/experimental/Security/CWE-918/SSRF.expected b/javascript/ql/test/experimental/Security/CWE-918/SSRF.expected
index da02dc24848..8a0dabd4c59 100644
--- a/javascript/ql/test/experimental/Security/CWE-918/SSRF.expected
+++ b/javascript/ql/test/experimental/Security/CWE-918/SSRF.expected
@@ -1,6 +1,6 @@
 edges
-| check-domain.js:16:9:16:27 | url | check-domain.js:17:13:17:15 | url | provenance |  |
-| check-domain.js:16:15:16:27 | req.query.url | check-domain.js:16:9:16:27 | url | provenance |  |
+| check-domain.js:16:9:16:11 | url | check-domain.js:17:13:17:15 | url | provenance |  |
+| check-domain.js:16:15:16:27 | req.query.url | check-domain.js:16:9:16:11 | url | provenance |  |
 | check-middleware.js:9:27:9:43 | req.query.tainted | check-middleware.js:9:13:9:43 | "test.c ... tainted | provenance |  |
 | check-path.js:19:27:19:43 | req.query.tainted | check-path.js:19:13:19:43 | 'test.c ... tainted | provenance |  |
 | check-path.js:23:27:23:43 | req.query.tainted | check-path.js:23:13:23:45 | `/addre ... inted}` | provenance |  |
@@ -16,13 +16,13 @@ edges
 | check-validator.js:15:29:15:45 | req.query.tainted | check-validator.js:15:15:15:45 | "test.c ... tainted | provenance |  |
 | check-validator.js:27:29:27:45 | req.query.tainted | check-validator.js:27:15:27:45 | "test.c ... tainted | provenance |  |
 | check-validator.js:50:29:50:45 | req.query.tainted | check-validator.js:50:15:50:45 | "test.c ... tainted | provenance |  |
-| check-validator.js:54:9:54:37 | numberURL | check-validator.js:62:29:62:37 | numberURL | provenance |  |
-| check-validator.js:54:21:54:37 | req.query.tainted | check-validator.js:54:9:54:37 | numberURL | provenance |  |
+| check-validator.js:54:9:54:17 | numberURL | check-validator.js:62:29:62:37 | numberURL | provenance |  |
+| check-validator.js:54:21:54:37 | req.query.tainted | check-validator.js:54:9:54:17 | numberURL | provenance |  |
 | check-validator.js:59:29:59:45 | req.query.tainted | check-validator.js:59:15:59:45 | "test.c ... tainted | provenance |  |
 | check-validator.js:62:29:62:37 | numberURL | check-validator.js:62:15:62:37 | "test.c ... mberURL | provenance |  |
 | check-validator.js:68:29:68:45 | req.query.tainted | check-validator.js:68:15:68:45 | "test.c ... tainted | provenance |  |
 nodes
-| check-domain.js:16:9:16:27 | url | semmle.label | url |
+| check-domain.js:16:9:16:11 | url | semmle.label | url |
 | check-domain.js:16:15:16:27 | req.query.url | semmle.label | req.query.url |
 | check-domain.js:17:13:17:15 | url | semmle.label | url |
 | check-domain.js:26:15:26:27 | req.query.url | semmle.label | req.query.url |
@@ -56,7 +56,7 @@ nodes
 | check-validator.js:27:29:27:45 | req.query.tainted | semmle.label | req.query.tainted |
 | check-validator.js:50:15:50:45 | "test.c ... tainted | semmle.label | "test.c ... tainted |
 | check-validator.js:50:29:50:45 | req.query.tainted | semmle.label | req.query.tainted |
-| check-validator.js:54:9:54:37 | numberURL | semmle.label | numberURL |
+| check-validator.js:54:9:54:17 | numberURL | semmle.label | numberURL |
 | check-validator.js:54:21:54:37 | req.query.tainted | semmle.label | req.query.tainted |
 | check-validator.js:59:15:59:45 | "test.c ... tainted | semmle.label | "test.c ... tainted |
 | check-validator.js:59:29:59:45 | req.query.tainted | semmle.label | req.query.tainted |
diff --git a/javascript/ql/test/experimental/Security/CWE-942/CorsPermissiveConfiguration.expected b/javascript/ql/test/experimental/Security/CWE-942/CorsPermissiveConfiguration.expected
deleted file mode 100644
index 6c28b7105a1..00000000000
--- a/javascript/ql/test/experimental/Security/CWE-942/CorsPermissiveConfiguration.expected
+++ /dev/null
@@ -1,34 +0,0 @@
-edges
-| apollo-test.js:8:9:8:59 | user_origin | apollo-test.js:26:25:26:35 | user_origin | provenance |  |
-| apollo-test.js:8:9:8:59 | user_origin | apollo-test.js:26:25:26:35 | user_origin | provenance |  |
-| apollo-test.js:8:23:8:46 | url.par ... , true) | apollo-test.js:8:9:8:59 | user_origin | provenance |  |
-| apollo-test.js:8:23:8:46 | url.par ... , true) | apollo-test.js:8:9:8:59 | user_origin | provenance |  |
-| apollo-test.js:8:33:8:39 | req.url | apollo-test.js:8:23:8:46 | url.par ... , true) | provenance |  |
-| apollo-test.js:8:42:8:45 | true | apollo-test.js:8:23:8:46 | url.par ... , true) | provenance |  |
-| express-test.js:10:9:10:59 | user_origin | express-test.js:33:17:33:27 | user_origin | provenance |  |
-| express-test.js:10:23:10:46 | url.par ... , true) | express-test.js:10:9:10:59 | user_origin | provenance |  |
-| express-test.js:10:33:10:39 | req.url | express-test.js:10:23:10:46 | url.par ... , true) | provenance |  |
-nodes
-| apollo-test.js:8:9:8:59 | user_origin | semmle.label | user_origin |
-| apollo-test.js:8:9:8:59 | user_origin | semmle.label | user_origin |
-| apollo-test.js:8:23:8:46 | url.par ... , true) | semmle.label | url.par ... , true) |
-| apollo-test.js:8:23:8:46 | url.par ... , true) | semmle.label | url.par ... , true) |
-| apollo-test.js:8:33:8:39 | req.url | semmle.label | req.url |
-| apollo-test.js:8:42:8:45 | true | semmle.label | true |
-| apollo-test.js:11:25:11:28 | true | semmle.label | true |
-| apollo-test.js:21:25:21:28 | null | semmle.label | null |
-| apollo-test.js:26:25:26:35 | user_origin | semmle.label | user_origin |
-| apollo-test.js:26:25:26:35 | user_origin | semmle.label | user_origin |
-| express-test.js:10:9:10:59 | user_origin | semmle.label | user_origin |
-| express-test.js:10:23:10:46 | url.par ... , true) | semmle.label | url.par ... , true) |
-| express-test.js:10:33:10:39 | req.url | semmle.label | req.url |
-| express-test.js:26:17:26:19 | '*' | semmle.label | '*' |
-| express-test.js:33:17:33:27 | user_origin | semmle.label | user_origin |
-subpaths
-#select
-| apollo-test.js:11:25:11:28 | true | apollo-test.js:11:25:11:28 | true | apollo-test.js:11:25:11:28 | true | CORS Origin misconfiguration due to a $@. | apollo-test.js:11:25:11:28 | true | too permissive or user controlled value |
-| apollo-test.js:21:25:21:28 | null | apollo-test.js:21:25:21:28 | null | apollo-test.js:21:25:21:28 | null | CORS Origin misconfiguration due to a $@. | apollo-test.js:21:25:21:28 | null | too permissive or user controlled value |
-| apollo-test.js:26:25:26:35 | user_origin | apollo-test.js:8:33:8:39 | req.url | apollo-test.js:26:25:26:35 | user_origin | CORS Origin misconfiguration due to a $@. | apollo-test.js:8:33:8:39 | req.url | too permissive or user controlled value |
-| apollo-test.js:26:25:26:35 | user_origin | apollo-test.js:8:42:8:45 | true | apollo-test.js:26:25:26:35 | user_origin | CORS Origin misconfiguration due to a $@. | apollo-test.js:8:42:8:45 | true | too permissive or user controlled value |
-| express-test.js:26:17:26:19 | '*' | express-test.js:26:17:26:19 | '*' | express-test.js:26:17:26:19 | '*' | CORS Origin misconfiguration due to a $@. | express-test.js:26:17:26:19 | '*' | too permissive or user controlled value |
-| express-test.js:33:17:33:27 | user_origin | express-test.js:10:33:10:39 | req.url | express-test.js:33:17:33:27 | user_origin | CORS Origin misconfiguration due to a $@. | express-test.js:10:33:10:39 | req.url | too permissive or user controlled value |
diff --git a/javascript/ql/test/experimental/Security/CWE-942/CorsPermissiveConfiguration.qlref b/javascript/ql/test/experimental/Security/CWE-942/CorsPermissiveConfiguration.qlref
deleted file mode 100644
index 1e6a39679c0..00000000000
--- a/javascript/ql/test/experimental/Security/CWE-942/CorsPermissiveConfiguration.qlref
+++ /dev/null
@@ -1 +0,0 @@
-./experimental/Security/CWE-942/CorsPermissiveConfiguration.ql
\ No newline at end of file
diff --git a/javascript/ql/test/library-tests/CallGraphs/FullTest/tests.expected b/javascript/ql/test/library-tests/CallGraphs/FullTest/tests.expected
index 8185f693b22..1192c8ec8fb 100644
--- a/javascript/ql/test/library-tests/CallGraphs/FullTest/tests.expected
+++ b/javascript/ql/test/library-tests/CallGraphs/FullTest/tests.expected
@@ -50,15 +50,15 @@ test_getAFunctionValue
 | c.js:2:8:2:24 | function bar() {} | c.js:2:8:2:24 | function bar() {} |
 | classes.js:1:1:19:2 | (functi ... o();\\n}) | classes.js:1:2:19:1 | functio ... lo();\\n} |
 | classes.js:1:2:19:1 | functio ... lo();\\n} | classes.js:1:2:19:1 | functio ... lo();\\n} |
-| classes.js:2:3:10:3 | A | classes.js:2:11:2:10 | () {} |
 | classes.js:2:3:10:3 | class A ...   }\\n  } | classes.js:2:11:2:10 | () {} |
+| classes.js:2:9:2:9 | A | classes.js:2:11:2:10 | () {} |
 | classes.js:2:11:2:10 | () {} | classes.js:2:11:2:10 | () {} |
 | classes.js:3:10:5:5 | () {\\n   ... ;\\n    } | classes.js:3:10:5:5 | () {\\n   ... ;\\n    } |
 | classes.js:7:6:9:5 | () {\\n   ... ;\\n    } | classes.js:7:6:9:5 | () {\\n   ... ;\\n    } |
 | classes.js:8:7:8:16 | this.hello | classes.js:3:10:5:5 | () {\\n   ... ;\\n    } |
 | classes.js:8:7:8:16 | this.hello | classes.js:13:10:15:5 | () {\\n   ... ;\\n    } |
-| classes.js:12:3:16:3 | B | classes.js:12:21:12:20 | (...arg ... rgs); } |
 | classes.js:12:3:16:3 | class B ...   }\\n  } | classes.js:12:21:12:20 | (...arg ... rgs); } |
+| classes.js:12:9:12:9 | B | classes.js:12:21:12:20 | (...arg ... rgs); } |
 | classes.js:12:19:12:19 | A | classes.js:2:11:2:10 | () {} |
 | classes.js:12:21:12:20 | (...arg ... rgs); } | classes.js:12:21:12:20 | (...arg ... rgs); } |
 | classes.js:13:10:15:5 | () {\\n   ... ;\\n    } | classes.js:13:10:15:5 | () {\\n   ... ;\\n    } |
@@ -146,9 +146,9 @@ test_getAFunctionValue
 | tst.js:11:1:20:1 | functio ... \\tf();\\n} | tst.js:11:1:20:1 | functio ... \\tf();\\n} |
 | tst.js:11:12:11:12 | m | tst.js:2:9:2:21 | function() {} |
 | tst.js:11:12:11:12 | m | tst.js:2:9:2:21 | function() {} |
-| tst.js:12:6:12:6 | m | tst.js:2:9:2:21 | function() {} |
-| tst.js:12:6:12:27 | n | tst.js:2:9:2:21 | function() {} |
-| tst.js:12:6:12:27 | n | tst.js:12:15:12:27 | function() {} |
+| tst.js:12:6:12:6 | n | tst.js:2:9:2:21 | function() {} |
+| tst.js:12:6:12:6 | n | tst.js:12:15:12:27 | function() {} |
+| tst.js:12:6:12:27 | m | tst.js:2:9:2:21 | function() {} |
 | tst.js:12:10:12:10 | m | tst.js:2:9:2:21 | function() {} |
 | tst.js:12:10:12:10 | m | tst.js:2:9:2:21 | function() {} |
 | tst.js:12:10:12:10 | m | tst.js:2:9:2:21 | function() {} |
diff --git a/javascript/ql/test/library-tests/DataFlow/tests.expected b/javascript/ql/test/library-tests/DataFlow/tests.expected
index 26ba8c46a99..7ba6cbb60f3 100644
--- a/javascript/ql/test/library-tests/DataFlow/tests.expected
+++ b/javascript/ql/test/library-tests/DataFlow/tests.expected
@@ -19,8 +19,8 @@ basicBlock
 | arguments.js:1:2:12:1 | exceptional return of anonymous function | arguments.js:1:2:1:1 | entry node of functio ... , 3);\\n} |
 | arguments.js:1:2:12:1 | functio ... , 3);\\n} | arguments.js:1:1:1:0 | entry node of <toplevel> |
 | arguments.js:1:2:12:1 | return of anonymous function | arguments.js:1:2:1:1 | entry node of functio ... , 3);\\n} |
+| arguments.js:2:5:2:4 | arguments | arguments.js:2:5:2:4 | entry node of functio ... ;\\n    } |
 | arguments.js:2:5:2:4 | this | arguments.js:2:5:2:4 | entry node of functio ... ;\\n    } |
-| arguments.js:2:5:2:5 | arguments | arguments.js:2:5:2:4 | entry node of functio ... ;\\n    } |
 | arguments.js:2:5:10:5 | 'arguments' object of function f | arguments.js:2:5:2:4 | entry node of functio ... ;\\n    } |
 | arguments.js:2:5:10:5 | [function self-reference] functio ... ;\\n    } | arguments.js:2:5:2:4 | entry node of functio ... ;\\n    } |
 | arguments.js:2:5:10:5 | exceptional return of function f | arguments.js:2:5:2:4 | entry node of functio ... ;\\n    } |
@@ -44,7 +44,7 @@ basicBlock
 | arguments.js:5:25:5:36 | arguments[1] | arguments.js:2:5:2:4 | entry node of functio ... ;\\n    } |
 | arguments.js:5:35:5:35 | 1 | arguments.js:2:5:2:4 | entry node of functio ... ;\\n    } |
 | arguments.js:6:13:6:16 | args | arguments.js:2:5:2:4 | entry node of functio ... ;\\n    } |
-| arguments.js:6:13:6:28 | args | arguments.js:2:5:2:4 | entry node of functio ... ;\\n    } |
+| arguments.js:6:13:6:16 | args | arguments.js:2:5:2:4 | entry node of functio ... ;\\n    } |
 | arguments.js:6:13:6:28 | args = arguments | arguments.js:2:5:2:4 | entry node of functio ... ;\\n    } |
 | arguments.js:6:20:6:28 | arguments | arguments.js:2:5:2:4 | entry node of functio ... ;\\n    } |
 | arguments.js:7:13:7:20 | thirdArg | arguments.js:2:5:2:4 | entry node of functio ... ;\\n    } |
@@ -53,7 +53,7 @@ basicBlock
 | arguments.js:7:24:7:30 | args[2] | arguments.js:2:5:2:4 | entry node of functio ... ;\\n    } |
 | arguments.js:7:29:7:29 | 2 | arguments.js:2:5:2:4 | entry node of functio ... ;\\n    } |
 | arguments.js:8:9:8:17 | arguments | arguments.js:2:5:2:4 | entry node of functio ... ;\\n    } |
-| arguments.js:8:9:8:22 | arguments | arguments.js:2:5:2:4 | entry node of functio ... ;\\n    } |
+| arguments.js:8:9:8:17 | arguments | arguments.js:2:5:2:4 | entry node of functio ... ;\\n    } |
 | arguments.js:8:9:8:22 | arguments = {} | arguments.js:2:5:2:4 | entry node of functio ... ;\\n    } |
 | arguments.js:8:21:8:22 | {} | arguments.js:2:5:2:4 | entry node of functio ... ;\\n    } |
 | arguments.js:9:13:9:23 | notFirstArg | arguments.js:2:5:2:4 | entry node of functio ... ;\\n    } |
@@ -75,7 +75,7 @@ basicBlock
 | eval.js:1:1:5:1 | return of function k | eval.js:1:1:1:0 | entry node of functio ... eval`\\n} |
 | eval.js:1:10:1:10 | k | eval.js:1:1:1:0 | entry node of <toplevel> |
 | eval.js:2:7:2:7 | x | eval.js:1:1:1:0 | entry node of functio ... eval`\\n} |
-| eval.js:2:7:2:12 | x | eval.js:1:1:1:0 | entry node of functio ... eval`\\n} |
+| eval.js:2:7:2:7 | x | eval.js:1:1:1:0 | entry node of functio ... eval`\\n} |
 | eval.js:2:7:2:12 | x = 42 | eval.js:1:1:1:0 | entry node of functio ... eval`\\n} |
 | eval.js:2:11:2:12 | 42 | eval.js:1:1:1:0 | entry node of functio ... eval`\\n} |
 | eval.js:3:3:3:6 | eval | eval.js:1:1:1:0 | entry node of functio ... eval`\\n} |
@@ -122,23 +122,23 @@ basicBlock
 | sources.js:10:12:10:14 | key | sources.js:10:8:10:14 | let key |
 | sources.js:10:19:10:23 | array | sources.js:9:1:9:0 | entry node of functio ... ey; }\\n} |
 | sources.js:10:28:10:30 | key | sources.js:10:8:10:14 | let key |
-| sources.js:11:12:11:18 | key | sources.js:11:8:11:18 | let { key } |
 | sources.js:11:12:11:18 | { key } | sources.js:11:8:11:18 | let { key } |
 | sources.js:11:12:11:18 | { key } | sources.js:11:8:11:18 | let { key } |
 | sources.js:11:14:11:16 | key | sources.js:11:8:11:18 | let { key } |
 | sources.js:11:14:11:16 | key | sources.js:11:8:11:18 | let { key } |
 | sources.js:11:14:11:16 | key | sources.js:11:8:11:18 | let { key } |
 | sources.js:11:14:11:16 | key | sources.js:11:8:11:18 | let { key } |
+| sources.js:11:14:11:16 | key | sources.js:11:8:11:18 | let { key } |
 | sources.js:11:23:11:27 | array | sources.js:11:23:11:27 | array |
 | sources.js:11:32:11:34 | key | sources.js:11:8:11:18 | let { key } |
+| tst2.ts:1:1:1:0 | A | tst2.ts:1:1:1:0 | entry node of <toplevel> |
 | tst2.ts:1:1:1:0 | this | tst2.ts:1:1:1:0 | entry node of <toplevel> |
-| tst2.ts:1:1:1:1 | A | tst2.ts:1:1:1:0 | entry node of <toplevel> |
-| tst2.ts:1:8:5:1 | A | tst2.ts:1:1:1:0 | entry node of <toplevel> |
 | tst2.ts:1:8:5:1 | namespa ... lysed\\n} | tst2.ts:1:1:1:0 | entry node of <toplevel> |
 | tst2.ts:1:18:1:18 | A | tst2.ts:1:1:1:0 | entry node of <toplevel> |
 | tst2.ts:1:18:1:18 | A | tst2.ts:1:1:1:0 | entry node of <toplevel> |
+| tst2.ts:1:18:1:18 | A | tst2.ts:1:1:1:0 | entry node of <toplevel> |
+| tst2.ts:2:14:2:14 | x | tst2.ts:1:1:1:0 | entry node of <toplevel> |
 | tst2.ts:2:14:2:14 | x | tst2.ts:1:1:1:0 | entry node of <toplevel> |
-| tst2.ts:2:14:2:19 | x | tst2.ts:1:1:1:0 | entry node of <toplevel> |
 | tst2.ts:2:14:2:19 | x = 42 | tst2.ts:1:1:1:0 | entry node of <toplevel> |
 | tst2.ts:2:18:2:19 | 42 | tst2.ts:1:1:1:0 | entry node of <toplevel> |
 | tst2.ts:3:3:3:6 | setX | tst2.ts:1:1:1:0 | entry node of <toplevel> |
@@ -190,17 +190,17 @@ basicBlock
 | tst2.ts:15:11:15:30 | A.x satisfies number | tst2.ts:1:1:1:0 | entry node of <toplevel> |
 | tst2.ts:15:13:15:13 | x | tst2.ts:1:1:1:0 | entry node of <toplevel> |
 | tst.js:1:1:1:0 | this | tst.js:1:1:1:0 | entry node of <toplevel> |
-| tst.js:1:1:1:1 | x | tst.js:1:1:1:0 | entry node of <toplevel> |
+| tst.js:1:1:1:0 | x | tst.js:1:1:1:0 | entry node of <toplevel> |
 | tst.js:1:1:1:24 | import  ... m 'fs'; | tst.js:1:1:1:0 | entry node of <toplevel> |
 | tst.js:1:10:1:11 | fs | tst.js:1:1:1:0 | entry node of <toplevel> |
 | tst.js:1:10:1:11 | fs | tst.js:1:1:1:0 | entry node of <toplevel> |
 | tst.js:3:5:3:5 | x | tst.js:1:1:1:0 | entry node of <toplevel> |
 | tst.js:3:5:3:5 | x | tst.js:1:1:1:0 | entry node of <toplevel> |
-| tst.js:3:5:3:10 | x | tst.js:1:1:1:0 | entry node of <toplevel> |
+| tst.js:3:5:3:5 | x | tst.js:1:1:1:0 | entry node of <toplevel> |
 | tst.js:3:5:3:10 | x = 42 | tst.js:1:1:1:0 | entry node of <toplevel> |
 | tst.js:3:9:3:10 | 42 | tst.js:1:1:1:0 | entry node of <toplevel> |
 | tst.js:4:5:4:5 | y | tst.js:1:1:1:0 | entry node of <toplevel> |
-| tst.js:4:5:4:12 | y | tst.js:1:1:1:0 | entry node of <toplevel> |
+| tst.js:4:5:4:5 | y | tst.js:1:1:1:0 | entry node of <toplevel> |
 | tst.js:4:5:4:12 | y = "hi" | tst.js:1:1:1:0 | entry node of <toplevel> |
 | tst.js:4:9:4:12 | "hi" | tst.js:1:1:1:0 | entry node of <toplevel> |
 | tst.js:5:5:5:5 | z | tst.js:1:1:1:0 | entry node of <toplevel> |
@@ -220,13 +220,13 @@ basicBlock
 | tst.js:12:1:12:1 | x | tst.js:12:1:12:1 | guard: x is false |
 | tst.js:12:1:12:1 | x | tst.js:12:1:12:1 | guard: x is true |
 | tst.js:12:1:12:1 | x | tst.js:12:1:12:7 | x \|\| y; |
-| tst.js:12:1:12:1 | x | tst.js:12:1:12:7 | x \|\| y; |
 | tst.js:12:1:12:6 | x \|\| y | tst.js:12:1:12:7 | x \|\| y; |
+| tst.js:12:1:12:7 | x | tst.js:12:1:12:7 | x \|\| y; |
 | tst.js:12:6:12:6 | y | tst.js:12:1:12:1 | guard: x is false |
-| tst.js:13:1:13:1 | x | tst.js:13:1:13:6 | z = y; |
 | tst.js:13:1:13:1 | z | tst.js:13:1:13:6 | z = y; |
-| tst.js:13:1:13:5 | z | tst.js:13:1:13:6 | z = y; |
+| tst.js:13:1:13:1 | z | tst.js:13:1:13:6 | z = y; |
 | tst.js:13:1:13:5 | z = y | tst.js:13:1:13:6 | z = y; |
+| tst.js:13:1:13:6 | x | tst.js:13:1:13:6 | z = y; |
 | tst.js:13:5:13:5 | y | tst.js:13:1:13:6 | z = y; |
 | tst.js:14:1:14:1 | z | tst.js:13:1:13:6 | z = y; |
 | tst.js:14:1:14:9 | z ? x : y | tst.js:13:1:13:6 | z = y; |
@@ -254,16 +254,16 @@ basicBlock
 | tst.js:19:10:19:11 | "" | tst.js:17:7:17:25 | guard: Math.random() > 0.5 is false |
 | tst.js:20:4:20:8 | "arg" | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:22:5:22:20 | { readFileSync } | tst.js:16:1:20:10 | (functi ... "arg"); |
-| tst.js:22:5:22:25 | readFileSync | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:22:5:22:25 | { readF ...  } = fs | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:22:7:22:18 | readFileSync | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:22:7:22:18 | readFileSync | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:22:7:22:18 | readFileSync | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:22:7:22:18 | readFileSync | tst.js:16:1:20:10 | (functi ... "arg"); |
+| tst.js:22:7:22:18 | readFileSync | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:22:24:22:25 | fs | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:23:1:23:12 | readFileSync | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:25:1:25:3 | ++x | tst.js:16:1:20:10 | (functi ... "arg"); |
-| tst.js:25:1:25:3 | x | tst.js:16:1:20:10 | (functi ... "arg"); |
+| tst.js:25:3:25:3 | x | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:25:3:25:3 | x | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:26:1:26:1 | x | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:28:1:30:1 | (() =>\\n ... ables\\n) | tst.js:16:1:20:10 | (functi ... "arg"); |
@@ -290,7 +290,7 @@ basicBlock
 | tst.js:35:1:35:7 | g(true) | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:35:3:35:6 | true | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:37:5:37:5 | o | tst.js:16:1:20:10 | (functi ... "arg"); |
-| tst.js:37:5:42:1 | o | tst.js:16:1:20:10 | (functi ... "arg"); |
+| tst.js:37:5:37:5 | o | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:37:5:42:1 | o = {\\n  ... ;\\n  }\\n} | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:37:9:42:1 | {\\n  x:  ... ;\\n  }\\n} | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:38:3:38:3 | x | tst.js:16:1:20:10 | (functi ... "arg"); |
@@ -318,9 +318,9 @@ basicBlock
 | tst.js:46:1:46:11 | global = "" | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:46:10:46:11 | "" | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:47:1:47:6 | global | tst.js:16:1:20:10 | (functi ... "arg"); |
-| tst.js:49:1:54:1 | A | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:49:1:54:1 | class A ... `\\n  }\\n} | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:49:7:49:7 | A | tst.js:16:1:20:10 | (functi ... "arg"); |
+| tst.js:49:7:49:7 | A | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:49:17:49:17 | B | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:50:3:50:13 | constructor | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:50:3:53:3 | constru ... et`\\n  } | tst.js:16:1:20:10 | (functi ... "arg"); |
@@ -365,7 +365,7 @@ basicBlock
 | tst.js:66:7:66:25 | tmp = function.sent | tst.js:64:1:64:0 | entry node of functio ... lysed\\n} |
 | tst.js:66:13:66:25 | function.sent | tst.js:64:1:64:0 | entry node of functio ... lysed\\n} |
 | tst.js:68:5:68:8 | iter | tst.js:16:1:20:10 | (functi ... "arg"); |
-| tst.js:68:5:68:14 | iter | tst.js:16:1:20:10 | (functi ... "arg"); |
+| tst.js:68:5:68:8 | iter | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:68:5:68:14 | iter = h() | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:68:12:68:12 | h | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:68:12:68:14 | exceptional return of h() | tst.js:16:1:20:10 | (functi ... "arg"); |
@@ -424,33 +424,33 @@ basicBlock
 | tst.js:87:2:92:1 | exceptional return of anonymous function | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:87:2:92:1 | functio ...  + z;\\n} | tst.js:85:5:85:28 | vs2 = ( ...  o) v ) |
 | tst.js:87:2:92:1 | return of anonymous function | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
-| tst.js:87:11:87:24 | o | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
-| tst.js:87:11:87:24 | x | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:87:11:87:24 | { p: x, ...o } | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:87:13:87:13 | p | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:87:13:87:16 | p: x | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:87:13:87:16 | p: x | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:87:16:87:16 | x | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
+| tst.js:87:16:87:16 | x | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:87:22:87:22 | ...o | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:87:22:87:22 | o | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
+| tst.js:87:22:87:22 | o | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:88:7:88:14 | { q: y } | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
-| tst.js:88:7:88:18 | y | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:88:7:88:18 | { q: y } = o | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:88:9:88:9 | q | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:88:9:88:12 | q: y | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:88:9:88:12 | q: y | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:88:12:88:12 | y | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
+| tst.js:88:12:88:12 | y | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:88:18:88:18 | o | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:89:7:89:7 | z | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:89:7:89:7 | z | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:90:3:90:16 | ({ r: z } = o) | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:90:4:90:11 | { r: z } | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
-| tst.js:90:4:90:15 | z | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:90:4:90:15 | { r: z } = o | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:90:6:90:6 | r | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:90:6:90:9 | r: z | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:90:6:90:9 | r: z | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:90:9:90:9 | z | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
+| tst.js:90:9:90:9 | z | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:90:15:90:15 | o | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:91:10:91:10 | x | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:91:10:91:14 | x + y | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
@@ -479,15 +479,15 @@ basicBlock
 | tst.js:98:2:103:1 | functio ...  + z;\\n} | tst.js:85:5:85:28 | vs2 = ( ...  o) v ) |
 | tst.js:98:2:103:1 | return of anonymous function | tst.js:98:2:98:1 | entry node of functio ...  + z;\\n} |
 | tst.js:98:11:98:24 | [ x, ...rest ] | tst.js:98:2:98:1 | entry node of functio ...  + z;\\n} |
-| tst.js:98:11:98:24 | rest | tst.js:98:2:98:1 | entry node of functio ...  + z;\\n} |
-| tst.js:98:11:98:24 | x | tst.js:98:2:98:1 | entry node of functio ...  + z;\\n} |
+| tst.js:98:13:98:13 | x | tst.js:98:2:98:1 | entry node of functio ...  + z;\\n} |
 | tst.js:98:13:98:13 | x | tst.js:98:2:98:1 | entry node of functio ...  + z;\\n} |
 | tst.js:98:13:98:13 | x | tst.js:98:2:98:1 | entry node of functio ...  + z;\\n} |
 | tst.js:98:19:98:22 | ...rest | tst.js:98:2:98:1 | entry node of functio ...  + z;\\n} |
 | tst.js:98:19:98:22 | rest | tst.js:98:2:98:1 | entry node of functio ...  + z;\\n} |
+| tst.js:98:19:98:22 | rest | tst.js:98:2:98:1 | entry node of functio ...  + z;\\n} |
 | tst.js:99:7:99:11 | [ y ] | tst.js:98:2:98:1 | entry node of functio ...  + z;\\n} |
 | tst.js:99:7:99:18 | [ y ] = rest | tst.js:98:2:98:1 | entry node of functio ...  + z;\\n} |
-| tst.js:99:7:99:18 | y | tst.js:98:2:98:1 | entry node of functio ...  + z;\\n} |
+| tst.js:99:9:99:9 | y | tst.js:98:2:98:1 | entry node of functio ...  + z;\\n} |
 | tst.js:99:9:99:9 | y | tst.js:98:2:98:1 | entry node of functio ...  + z;\\n} |
 | tst.js:99:9:99:9 | y | tst.js:98:2:98:1 | entry node of functio ...  + z;\\n} |
 | tst.js:99:15:99:18 | rest | tst.js:98:2:98:1 | entry node of functio ...  + z;\\n} |
@@ -495,7 +495,7 @@ basicBlock
 | tst.js:100:7:100:7 | z | tst.js:98:2:98:1 | entry node of functio ...  + z;\\n} |
 | tst.js:101:3:101:9 | [ , z ] | tst.js:98:2:98:1 | entry node of functio ...  + z;\\n} |
 | tst.js:101:3:101:16 | [ , z ] = rest | tst.js:98:2:98:1 | entry node of functio ...  + z;\\n} |
-| tst.js:101:3:101:16 | z | tst.js:98:2:98:1 | entry node of functio ...  + z;\\n} |
+| tst.js:101:7:101:7 | z | tst.js:98:2:98:1 | entry node of functio ...  + z;\\n} |
 | tst.js:101:7:101:7 | z | tst.js:98:2:98:1 | entry node of functio ...  + z;\\n} |
 | tst.js:101:7:101:7 | z | tst.js:98:2:98:1 | entry node of functio ...  + z;\\n} |
 | tst.js:101:13:101:16 | rest | tst.js:98:2:98:1 | entry node of functio ...  + z;\\n} |
@@ -521,14 +521,13 @@ basicBlock
 | tst.js:107:2:113:1 | functio ...  v2c;\\n} | tst.js:107:1:113:3 | (functi ... 2c;\\n}); |
 | tst.js:107:2:113:1 | return of anonymous function | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
 | tst.js:108:6:108:32 | {v1a, v ...  = o1c} | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
-| tst.js:108:6:108:38 | v1a | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
-| tst.js:108:6:108:38 | v1b | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
-| tst.js:108:6:108:38 | v1c | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
 | tst.js:108:6:108:38 | {v1a, v ... } = o1d | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
 | tst.js:108:7:108:9 | v1a | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
 | tst.js:108:7:108:9 | v1a | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
 | tst.js:108:7:108:9 | v1a | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
 | tst.js:108:7:108:9 | v1a | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
+| tst.js:108:7:108:9 | v1a | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
+| tst.js:108:12:108:14 | v1b | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
 | tst.js:108:12:108:14 | v1b | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
 | tst.js:108:12:108:14 | v1b | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
 | tst.js:108:12:108:20 | v1b = o1b | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
@@ -536,6 +535,7 @@ basicBlock
 | tst.js:108:18:108:20 | o1b | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
 | tst.js:108:23:108:25 | v1c | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
 | tst.js:108:23:108:25 | v1c | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
+| tst.js:108:23:108:25 | v1c | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
 | tst.js:108:23:108:31 | v1c = o1c | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
 | tst.js:108:23:108:31 | v1c = o1c | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
 | tst.js:108:29:108:31 | o1c | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
@@ -547,16 +547,16 @@ basicBlock
 | tst.js:109:14:109:16 | v1c | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
 | tst.js:111:6:111:32 | [v2a, v ...  = o2c] | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
 | tst.js:111:6:111:38 | [v2a, v ... ] = o2d | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
-| tst.js:111:6:111:38 | v2a | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
-| tst.js:111:6:111:38 | v2b | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
-| tst.js:111:6:111:38 | v2c | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
 | tst.js:111:7:111:9 | v2a | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
 | tst.js:111:7:111:9 | v2a | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
+| tst.js:111:7:111:9 | v2a | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
+| tst.js:111:12:111:14 | v2b | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
 | tst.js:111:12:111:14 | v2b | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
 | tst.js:111:12:111:14 | v2b | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
 | tst.js:111:18:111:20 | o2b | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
 | tst.js:111:23:111:25 | v2c | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
 | tst.js:111:23:111:25 | v2c | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
+| tst.js:111:23:111:25 | v2c | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
 | tst.js:111:29:111:31 | o2c | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
 | tst.js:111:36:111:38 | o2d | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
 | tst.js:112:2:112:4 | v2a | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
@@ -946,9 +946,9 @@ enclosingExpr
 | tst.js:117:22:117:23 | x1 | tst.js:117:22:117:23 | x1 |
 flowStep
 | arguments.js:1:2:12:1 | functio ... , 3);\\n} | arguments.js:1:1:12:2 | (functi ...  3);\\n}) |
-| arguments.js:2:5:2:5 | arguments | arguments.js:4:28:4:36 | arguments |
-| arguments.js:2:5:2:5 | arguments | arguments.js:5:25:5:33 | arguments |
-| arguments.js:2:5:2:5 | arguments | arguments.js:6:20:6:28 | arguments |
+| arguments.js:2:5:2:4 | arguments | arguments.js:4:28:4:36 | arguments |
+| arguments.js:2:5:2:4 | arguments | arguments.js:5:25:5:33 | arguments |
+| arguments.js:2:5:2:4 | arguments | arguments.js:6:20:6:28 | arguments |
 | arguments.js:2:5:10:5 | 'arguments' object of function f | arguments.js:4:28:4:36 | arguments |
 | arguments.js:2:5:10:5 | 'arguments' object of function f | arguments.js:5:25:5:33 | arguments |
 | arguments.js:2:5:10:5 | 'arguments' object of function f | arguments.js:6:20:6:28 | arguments |
@@ -958,13 +958,13 @@ flowStep
 | arguments.js:2:14:2:14 | f | arguments.js:11:5:11:5 | f |
 | arguments.js:2:16:2:16 | x | arguments.js:2:16:2:16 | x |
 | arguments.js:2:16:2:16 | x | arguments.js:3:24:3:24 | x |
-| arguments.js:6:13:6:28 | args | arguments.js:7:24:7:27 | args |
-| arguments.js:6:20:6:28 | arguments | arguments.js:6:13:6:28 | args |
-| arguments.js:8:9:8:22 | arguments | arguments.js:9:27:9:35 | arguments |
-| arguments.js:8:21:8:22 | {} | arguments.js:8:9:8:22 | arguments |
+| arguments.js:6:13:6:16 | args | arguments.js:7:24:7:27 | args |
+| arguments.js:6:20:6:28 | arguments | arguments.js:6:13:6:16 | args |
+| arguments.js:8:9:8:17 | arguments | arguments.js:9:27:9:35 | arguments |
+| arguments.js:8:21:8:22 | {} | arguments.js:8:9:8:17 | arguments |
 | arguments.js:8:21:8:22 | {} | arguments.js:8:9:8:22 | arguments = {} |
-| eval.js:2:7:2:12 | x | eval.js:4:3:4:3 | x |
-| eval.js:2:11:2:12 | 42 | eval.js:2:7:2:12 | x |
+| eval.js:2:7:2:7 | x | eval.js:4:3:4:3 | x |
+| eval.js:2:11:2:12 | 42 | eval.js:2:7:2:7 | x |
 | sources.js:1:6:1:6 | x | sources.js:1:6:1:6 | x |
 | sources.js:1:6:1:6 | x | sources.js:1:11:1:11 | x |
 | sources.js:1:6:1:11 | x => x | sources.js:1:5:1:12 | (x => x) |
@@ -980,17 +980,17 @@ flowStep
 | sources.js:9:14:9:18 | array | sources.js:10:19:10:23 | array |
 | sources.js:9:14:9:18 | array | sources.js:11:23:11:27 | array |
 | sources.js:10:12:10:14 | key | sources.js:10:28:10:30 | key |
-| sources.js:11:12:11:18 | key | sources.js:11:32:11:34 | key |
-| sources.js:11:14:11:16 | key | sources.js:11:12:11:18 | key |
-| tst2.ts:1:1:1:1 | A | tst2.ts:1:18:1:18 | A |
-| tst2.ts:1:1:1:1 | A | tst2.ts:1:18:1:18 | A |
-| tst2.ts:1:8:5:1 | A | tst2.ts:1:18:1:18 | A |
-| tst2.ts:1:8:5:1 | A | tst2.ts:11:11:11:11 | A |
-| tst2.ts:1:8:5:1 | A | tst2.ts:15:11:15:11 | A |
-| tst2.ts:1:8:5:1 | namespa ... lysed\\n} | tst2.ts:1:8:5:1 | A |
+| sources.js:11:14:11:16 | key | sources.js:11:14:11:16 | key |
+| sources.js:11:14:11:16 | key | sources.js:11:32:11:34 | key |
+| tst2.ts:1:1:1:0 | A | tst2.ts:1:18:1:18 | A |
+| tst2.ts:1:1:1:0 | A | tst2.ts:1:18:1:18 | A |
+| tst2.ts:1:8:5:1 | namespa ... lysed\\n} | tst2.ts:1:18:1:18 | A |
+| tst2.ts:1:18:1:18 | A | tst2.ts:1:18:1:18 | A |
 | tst2.ts:1:18:1:18 | A | tst2.ts:7:1:7:0 | A |
-| tst2.ts:2:14:2:19 | x | tst2.ts:4:3:4:3 | x |
-| tst2.ts:2:18:2:19 | 42 | tst2.ts:2:14:2:19 | x |
+| tst2.ts:1:18:1:18 | A | tst2.ts:11:11:11:11 | A |
+| tst2.ts:1:18:1:18 | A | tst2.ts:15:11:15:11 | A |
+| tst2.ts:2:14:2:14 | x | tst2.ts:4:3:4:3 | x |
+| tst2.ts:2:18:2:19 | 42 | tst2.ts:2:14:2:14 | x |
 | tst2.ts:7:1:7:0 | A | tst2.ts:8:3:8:3 | A |
 | tst2.ts:7:1:9:1 | functio ... = 23;\\n} | tst2.ts:7:10:7:13 | setX |
 | tst2.ts:7:10:7:13 | setX | tst2.ts:3:3:3:6 | setX |
@@ -1001,43 +1001,43 @@ flowStep
 | tst2.ts:13:39:13:38 | args | tst2.ts:13:39:13:38 | args |
 | tst2.ts:13:39:13:38 | this | tst2.ts:13:39:13:38 | implicit 'this' |
 | tst2.ts:15:11:15:13 | A.x | tst2.ts:15:11:15:30 | A.x satisfies number |
-| tst.js:1:1:1:1 | x | tst.js:3:5:3:5 | x |
+| tst.js:1:1:1:0 | x | tst.js:3:5:3:5 | x |
 | tst.js:1:10:1:11 | fs | tst.js:1:10:1:11 | fs |
 | tst.js:1:10:1:11 | fs | tst.js:7:1:7:2 | fs |
 | tst.js:1:10:1:11 | fs | tst.js:22:24:22:25 | fs |
+| tst.js:3:5:3:5 | x | tst.js:3:5:3:5 | x |
+| tst.js:3:5:3:5 | x | tst.js:8:1:8:1 | x |
+| tst.js:3:5:3:5 | x | tst.js:9:2:9:2 | x |
+| tst.js:3:5:3:5 | x | tst.js:10:1:10:1 | x |
+| tst.js:3:5:3:5 | x | tst.js:11:1:11:1 | x |
+| tst.js:3:5:3:5 | x | tst.js:11:1:11:1 | x |
+| tst.js:3:5:3:5 | x | tst.js:11:1:11:1 | x |
 | tst.js:3:5:3:5 | x | tst.js:28:2:28:1 | x |
 | tst.js:3:5:3:5 | x | tst.js:32:1:32:0 | x |
-| tst.js:3:5:3:10 | x | tst.js:3:5:3:5 | x |
-| tst.js:3:5:3:10 | x | tst.js:8:1:8:1 | x |
-| tst.js:3:5:3:10 | x | tst.js:9:2:9:2 | x |
-| tst.js:3:5:3:10 | x | tst.js:10:1:10:1 | x |
-| tst.js:3:5:3:10 | x | tst.js:11:1:11:1 | x |
-| tst.js:3:5:3:10 | x | tst.js:11:1:11:1 | x |
-| tst.js:3:5:3:10 | x | tst.js:11:1:11:1 | x |
-| tst.js:3:9:3:10 | 42 | tst.js:3:5:3:10 | x |
-| tst.js:4:5:4:12 | y | tst.js:10:4:10:4 | y |
-| tst.js:4:5:4:12 | y | tst.js:11:6:11:6 | y |
-| tst.js:4:5:4:12 | y | tst.js:12:6:12:6 | y |
-| tst.js:4:5:4:12 | y | tst.js:13:5:13:5 | y |
-| tst.js:4:5:4:12 | y | tst.js:14:9:14:9 | y |
-| tst.js:4:5:4:12 | y | tst.js:105:6:105:6 | y |
-| tst.js:4:9:4:12 | "hi" | tst.js:4:5:4:12 | y |
+| tst.js:3:9:3:10 | 42 | tst.js:3:5:3:5 | x |
+| tst.js:4:5:4:5 | y | tst.js:10:4:10:4 | y |
+| tst.js:4:5:4:5 | y | tst.js:11:6:11:6 | y |
+| tst.js:4:5:4:5 | y | tst.js:12:6:12:6 | y |
+| tst.js:4:5:4:5 | y | tst.js:13:5:13:5 | y |
+| tst.js:4:5:4:5 | y | tst.js:14:9:14:9 | y |
+| tst.js:4:5:4:5 | y | tst.js:105:6:105:6 | y |
+| tst.js:4:9:4:12 | "hi" | tst.js:4:5:4:5 | y |
 | tst.js:9:2:9:2 | x | tst.js:9:1:9:3 | (x) |
 | tst.js:10:4:10:4 | y | tst.js:10:1:10:4 | x, y |
-| tst.js:11:1:11:1 | x | tst.js:12:1:12:1 | x |
-| tst.js:11:1:11:1 | x | tst.js:12:1:12:1 | x |
+| tst.js:11:1:11:1 | x | tst.js:12:1:12:7 | x |
+| tst.js:11:1:11:1 | x | tst.js:12:1:12:7 | x |
 | tst.js:11:6:11:6 | y | tst.js:11:1:11:6 | x && y |
-| tst.js:12:1:12:1 | x | tst.js:12:1:12:1 | x |
-| tst.js:12:1:12:1 | x | tst.js:12:1:12:1 | x |
-| tst.js:12:1:12:1 | x | tst.js:12:1:12:1 | x |
 | tst.js:12:1:12:1 | x | tst.js:12:1:12:6 | x \|\| y |
-| tst.js:12:1:12:1 | x | tst.js:13:1:13:1 | x |
-| tst.js:12:1:12:1 | x | tst.js:13:1:13:1 | x |
+| tst.js:12:1:12:1 | x | tst.js:13:1:13:6 | x |
+| tst.js:12:1:12:1 | x | tst.js:13:1:13:6 | x |
+| tst.js:12:1:12:7 | x | tst.js:12:1:12:1 | x |
+| tst.js:12:1:12:7 | x | tst.js:12:1:12:1 | x |
+| tst.js:12:1:12:7 | x | tst.js:12:1:12:1 | x |
 | tst.js:12:6:12:6 | y | tst.js:12:1:12:6 | x \|\| y |
-| tst.js:13:1:13:1 | x | tst.js:14:5:14:5 | x |
-| tst.js:13:1:13:1 | x | tst.js:25:3:25:3 | x |
-| tst.js:13:1:13:5 | z | tst.js:14:1:14:1 | z |
-| tst.js:13:5:13:5 | y | tst.js:13:1:13:5 | z |
+| tst.js:13:1:13:1 | z | tst.js:14:1:14:1 | z |
+| tst.js:13:1:13:6 | x | tst.js:14:5:14:5 | x |
+| tst.js:13:1:13:6 | x | tst.js:25:3:25:3 | x |
+| tst.js:13:5:13:5 | y | tst.js:13:1:13:1 | z |
 | tst.js:13:5:13:5 | y | tst.js:13:1:13:5 | z = y |
 | tst.js:14:5:14:5 | x | tst.js:14:1:14:9 | z ? x : y |
 | tst.js:14:9:14:9 | y | tst.js:14:1:14:9 | z ? x : y |
@@ -1049,14 +1049,14 @@ flowStep
 | tst.js:19:10:19:11 | "" | tst.js:16:1:20:9 | (functi ... ("arg") |
 | tst.js:19:10:19:11 | "" | tst.js:16:2:20:1 | return of function f |
 | tst.js:20:4:20:8 | "arg" | tst.js:16:13:16:13 | a |
-| tst.js:22:5:22:25 | readFileSync | tst.js:23:1:23:12 | readFileSync |
-| tst.js:22:7:22:18 | readFileSync | tst.js:22:5:22:25 | readFileSync |
+| tst.js:22:7:22:18 | readFileSync | tst.js:22:7:22:18 | readFileSync |
+| tst.js:22:7:22:18 | readFileSync | tst.js:23:1:23:12 | readFileSync |
 | tst.js:22:24:22:25 | fs | tst.js:22:5:22:20 | { readFileSync } |
-| tst.js:25:1:25:3 | x | tst.js:3:5:3:5 | x |
-| tst.js:25:1:25:3 | x | tst.js:26:1:26:1 | x |
-| tst.js:25:1:25:3 | x | tst.js:57:7:57:7 | x |
-| tst.js:25:1:25:3 | x | tst.js:58:11:58:11 | x |
-| tst.js:25:1:25:3 | x | tst.js:105:1:105:1 | x |
+| tst.js:25:3:25:3 | x | tst.js:3:5:3:5 | x |
+| tst.js:25:3:25:3 | x | tst.js:26:1:26:1 | x |
+| tst.js:25:3:25:3 | x | tst.js:57:7:57:7 | x |
+| tst.js:25:3:25:3 | x | tst.js:58:11:58:11 | x |
+| tst.js:25:3:25:3 | x | tst.js:105:1:105:1 | x |
 | tst.js:28:2:28:1 | x | tst.js:29:3:29:3 | x |
 | tst.js:28:2:29:3 | () =>\\n  x | tst.js:28:1:30:1 | (() =>\\n ... ables\\n) |
 | tst.js:29:3:29:3 | x | tst.js:28:1:30:3 | (() =>\\n ... les\\n)() |
@@ -1067,56 +1067,56 @@ flowStep
 | tst.js:32:10:32:10 | g | tst.js:60:1:60:1 | g |
 | tst.js:32:10:32:10 | g | tst.js:62:4:62:4 | g |
 | tst.js:33:10:33:10 | x | tst.js:32:1:34:1 | return of function g |
-| tst.js:37:5:42:1 | o | tst.js:43:1:43:1 | o |
-| tst.js:37:5:42:1 | o | tst.js:44:1:44:1 | o |
-| tst.js:37:5:42:1 | o | tst.js:61:3:61:3 | o |
-| tst.js:37:5:42:1 | o | tst.js:62:1:62:1 | o |
-| tst.js:37:5:42:1 | o | tst.js:77:15:77:15 | o |
-| tst.js:37:5:42:1 | o | tst.js:80:15:80:15 | o |
-| tst.js:37:5:42:1 | o | tst.js:83:23:83:23 | o |
-| tst.js:37:5:42:1 | o | tst.js:85:23:85:23 | o |
-| tst.js:37:9:42:1 | {\\n  x:  ... ;\\n  }\\n} | tst.js:37:5:42:1 | o |
+| tst.js:37:5:37:5 | o | tst.js:43:1:43:1 | o |
+| tst.js:37:5:37:5 | o | tst.js:44:1:44:1 | o |
+| tst.js:37:5:37:5 | o | tst.js:61:3:61:3 | o |
+| tst.js:37:5:37:5 | o | tst.js:62:1:62:1 | o |
+| tst.js:37:5:37:5 | o | tst.js:77:15:77:15 | o |
+| tst.js:37:5:37:5 | o | tst.js:80:15:80:15 | o |
+| tst.js:37:5:37:5 | o | tst.js:83:23:83:23 | o |
+| tst.js:37:5:37:5 | o | tst.js:85:23:85:23 | o |
+| tst.js:37:9:42:1 | {\\n  x:  ... ;\\n  }\\n} | tst.js:37:5:37:5 | o |
 | tst.js:39:4:39:3 | this | tst.js:40:5:40:8 | this |
 | tst.js:46:10:46:11 | "" | tst.js:46:1:46:11 | global = "" |
-| tst.js:49:1:54:1 | A | tst.js:55:1:55:1 | A |
-| tst.js:49:1:54:1 | class A ... `\\n  }\\n} | tst.js:49:1:54:1 | A |
+| tst.js:49:1:54:1 | class A ... `\\n  }\\n} | tst.js:49:7:49:7 | A |
+| tst.js:49:7:49:7 | A | tst.js:55:1:55:1 | A |
 | tst.js:50:14:50:13 | this | tst.js:51:5:51:9 | implicit 'this' |
 | tst.js:64:1:67:1 | functio ... lysed\\n} | tst.js:64:11:64:11 | h |
 | tst.js:64:11:64:11 | h | tst.js:68:12:68:12 | h |
-| tst.js:68:5:68:14 | iter | tst.js:69:1:69:4 | iter |
-| tst.js:68:12:68:14 | h() | tst.js:68:5:68:14 | iter |
+| tst.js:68:5:68:8 | iter | tst.js:69:1:69:4 | iter |
+| tst.js:68:12:68:14 | h() | tst.js:68:5:68:8 | iter |
 | tst.js:77:10:77:10 | i | tst.js:78:3:78:3 | i |
 | tst.js:80:10:80:10 | v | tst.js:81:3:81:3 | v |
 | tst.js:83:18:83:18 | v | tst.js:83:26:83:26 | v |
 | tst.js:85:18:85:18 | v | tst.js:85:26:85:26 | v |
 | tst.js:87:2:92:1 | functio ...  + z;\\n} | tst.js:87:1:92:2 | (functi ... + z;\\n}) |
-| tst.js:87:11:87:24 | o | tst.js:88:18:88:18 | o |
-| tst.js:87:11:87:24 | o | tst.js:90:15:90:15 | o |
-| tst.js:87:11:87:24 | x | tst.js:91:10:91:10 | x |
-| tst.js:87:13:87:16 | p: x | tst.js:87:11:87:24 | x |
-| tst.js:87:22:87:22 | ...o | tst.js:87:11:87:24 | o |
-| tst.js:88:7:88:18 | y | tst.js:91:14:91:14 | y |
-| tst.js:88:9:88:12 | q: y | tst.js:88:7:88:18 | y |
+| tst.js:87:13:87:16 | p: x | tst.js:87:16:87:16 | x |
+| tst.js:87:16:87:16 | x | tst.js:91:10:91:10 | x |
+| tst.js:87:22:87:22 | ...o | tst.js:87:22:87:22 | o |
+| tst.js:87:22:87:22 | o | tst.js:88:18:88:18 | o |
+| tst.js:87:22:87:22 | o | tst.js:90:15:90:15 | o |
+| tst.js:88:9:88:12 | q: y | tst.js:88:12:88:12 | y |
+| tst.js:88:12:88:12 | y | tst.js:91:14:91:14 | y |
 | tst.js:88:18:88:18 | o | tst.js:88:7:88:14 | { q: y } |
-| tst.js:90:4:90:15 | z | tst.js:91:18:91:18 | z |
 | tst.js:90:4:90:15 | { r: z } = o | tst.js:90:3:90:16 | ({ r: z } = o) |
-| tst.js:90:6:90:9 | r: z | tst.js:90:4:90:15 | z |
+| tst.js:90:6:90:9 | r: z | tst.js:90:9:90:9 | z |
+| tst.js:90:9:90:9 | z | tst.js:91:18:91:18 | z |
 | tst.js:90:15:90:15 | o | tst.js:90:4:90:11 | { r: z } |
 | tst.js:90:15:90:15 | o | tst.js:90:4:90:15 | { r: z } = o |
 | tst.js:91:10:91:18 | x + y + z | tst.js:87:1:96:2 | (functi ... r: 0\\n}) |
 | tst.js:91:10:91:18 | x + y + z | tst.js:87:2:92:1 | return of anonymous function |
 | tst.js:92:4:96:1 | {\\n  p:  ...  r: 0\\n} | tst.js:87:11:87:24 | { p: x, ...o } |
 | tst.js:98:2:103:1 | functio ...  + z;\\n} | tst.js:98:1:103:2 | (functi ... + z;\\n}) |
-| tst.js:98:11:98:24 | rest | tst.js:99:15:99:18 | rest |
-| tst.js:98:11:98:24 | rest | tst.js:101:13:101:16 | rest |
-| tst.js:98:11:98:24 | x | tst.js:102:10:102:10 | x |
-| tst.js:98:13:98:13 | x | tst.js:98:11:98:24 | x |
-| tst.js:98:19:98:22 | ...rest | tst.js:98:11:98:24 | rest |
-| tst.js:99:7:99:18 | y | tst.js:102:14:102:14 | y |
-| tst.js:99:9:99:9 | y | tst.js:99:7:99:18 | y |
+| tst.js:98:13:98:13 | x | tst.js:98:13:98:13 | x |
+| tst.js:98:13:98:13 | x | tst.js:102:10:102:10 | x |
+| tst.js:98:19:98:22 | ...rest | tst.js:98:19:98:22 | rest |
+| tst.js:98:19:98:22 | rest | tst.js:99:15:99:18 | rest |
+| tst.js:98:19:98:22 | rest | tst.js:101:13:101:16 | rest |
+| tst.js:99:9:99:9 | y | tst.js:99:9:99:9 | y |
+| tst.js:99:9:99:9 | y | tst.js:102:14:102:14 | y |
 | tst.js:99:15:99:18 | rest | tst.js:99:7:99:11 | [ y ] |
-| tst.js:101:3:101:16 | z | tst.js:102:18:102:18 | z |
-| tst.js:101:7:101:7 | z | tst.js:101:3:101:16 | z |
+| tst.js:101:7:101:7 | z | tst.js:101:7:101:7 | z |
+| tst.js:101:7:101:7 | z | tst.js:102:18:102:18 | z |
 | tst.js:101:13:101:16 | rest | tst.js:101:3:101:9 | [ , z ] |
 | tst.js:101:13:101:16 | rest | tst.js:101:3:101:16 | [ , z ] = rest |
 | tst.js:102:10:102:18 | x + y + z | tst.js:98:1:103:17 | (functi ... 3, 0 ]) |
@@ -1125,41 +1125,41 @@ flowStep
 | tst.js:105:1:105:1 | x | tst.js:105:1:105:6 | x ?? y |
 | tst.js:105:6:105:6 | y | tst.js:105:1:105:6 | x ?? y |
 | tst.js:107:2:113:1 | functio ...  v2c;\\n} | tst.js:107:1:113:2 | (functi ... v2c;\\n}) |
-| tst.js:108:6:108:38 | v1a | tst.js:109:2:109:4 | v1a |
-| tst.js:108:6:108:38 | v1b | tst.js:109:8:109:10 | v1b |
-| tst.js:108:6:108:38 | v1c | tst.js:109:14:109:16 | v1c |
-| tst.js:108:7:108:9 | v1a | tst.js:108:6:108:38 | v1a |
-| tst.js:108:12:108:20 | v1b = o1b | tst.js:108:6:108:38 | v1b |
-| tst.js:108:18:108:20 | o1b | tst.js:108:6:108:38 | v1b |
-| tst.js:108:23:108:31 | v1c = o1c | tst.js:108:6:108:38 | v1c |
-| tst.js:108:29:108:31 | o1c | tst.js:108:6:108:38 | v1c |
+| tst.js:108:7:108:9 | v1a | tst.js:108:7:108:9 | v1a |
+| tst.js:108:7:108:9 | v1a | tst.js:109:2:109:4 | v1a |
+| tst.js:108:12:108:14 | v1b | tst.js:109:8:109:10 | v1b |
+| tst.js:108:12:108:20 | v1b = o1b | tst.js:108:12:108:14 | v1b |
+| tst.js:108:18:108:20 | o1b | tst.js:108:12:108:14 | v1b |
+| tst.js:108:23:108:25 | v1c | tst.js:109:14:109:16 | v1c |
+| tst.js:108:23:108:31 | v1c = o1c | tst.js:108:23:108:25 | v1c |
+| tst.js:108:29:108:31 | o1c | tst.js:108:23:108:25 | v1c |
 | tst.js:108:36:108:38 | o1d | tst.js:108:6:108:32 | {v1a, v ...  = o1c} |
-| tst.js:111:6:111:38 | v2a | tst.js:112:2:112:4 | v2a |
-| tst.js:111:6:111:38 | v2b | tst.js:112:8:112:10 | v2b |
-| tst.js:111:6:111:38 | v2c | tst.js:112:14:112:16 | v2c |
-| tst.js:111:7:111:9 | v2a | tst.js:111:6:111:38 | v2a |
-| tst.js:111:12:111:14 | v2b | tst.js:111:6:111:38 | v2b |
-| tst.js:111:18:111:20 | o2b | tst.js:111:6:111:38 | v2b |
-| tst.js:111:23:111:25 | v2c | tst.js:111:6:111:38 | v2c |
-| tst.js:111:29:111:31 | o2c | tst.js:111:6:111:38 | v2c |
+| tst.js:111:7:111:9 | v2a | tst.js:111:7:111:9 | v2a |
+| tst.js:111:7:111:9 | v2a | tst.js:112:2:112:4 | v2a |
+| tst.js:111:12:111:14 | v2b | tst.js:111:12:111:14 | v2b |
+| tst.js:111:12:111:14 | v2b | tst.js:112:8:112:10 | v2b |
+| tst.js:111:18:111:20 | o2b | tst.js:111:12:111:14 | v2b |
+| tst.js:111:23:111:25 | v2c | tst.js:111:23:111:25 | v2c |
+| tst.js:111:23:111:25 | v2c | tst.js:112:14:112:16 | v2c |
+| tst.js:111:29:111:31 | o2c | tst.js:111:23:111:25 | v2c |
 | tst.js:111:36:111:38 | o2d | tst.js:111:6:111:32 | [v2a, v ...  = o2c] |
 | tst.js:115:1:115:12 | reflective call | tst.js:115:1:115:12 | Array.call() |
 getImmediatePredecessor
 | arguments.js:1:2:12:1 | functio ... , 3);\\n} | arguments.js:1:1:12:2 | (functi ...  3);\\n}) |
-| arguments.js:2:5:2:5 | arguments | arguments.js:4:28:4:36 | arguments |
-| arguments.js:2:5:2:5 | arguments | arguments.js:5:25:5:33 | arguments |
-| arguments.js:2:5:2:5 | arguments | arguments.js:6:20:6:28 | arguments |
+| arguments.js:2:5:2:4 | arguments | arguments.js:4:28:4:36 | arguments |
+| arguments.js:2:5:2:4 | arguments | arguments.js:5:25:5:33 | arguments |
+| arguments.js:2:5:2:4 | arguments | arguments.js:6:20:6:28 | arguments |
 | arguments.js:2:5:10:5 | functio ... ;\\n    } | arguments.js:2:14:2:14 | f |
 | arguments.js:2:14:2:14 | f | arguments.js:11:5:11:5 | f |
 | arguments.js:2:16:2:16 | x | arguments.js:2:16:2:16 | x |
 | arguments.js:2:16:2:16 | x | arguments.js:3:24:3:24 | x |
-| arguments.js:6:13:6:28 | args | arguments.js:7:24:7:27 | args |
-| arguments.js:6:20:6:28 | arguments | arguments.js:6:13:6:28 | args |
-| arguments.js:8:9:8:22 | arguments | arguments.js:9:27:9:35 | arguments |
-| arguments.js:8:21:8:22 | {} | arguments.js:8:9:8:22 | arguments |
+| arguments.js:6:13:6:16 | args | arguments.js:7:24:7:27 | args |
+| arguments.js:6:20:6:28 | arguments | arguments.js:6:13:6:16 | args |
+| arguments.js:8:9:8:17 | arguments | arguments.js:9:27:9:35 | arguments |
+| arguments.js:8:21:8:22 | {} | arguments.js:8:9:8:17 | arguments |
 | arguments.js:8:21:8:22 | {} | arguments.js:8:9:8:22 | arguments = {} |
-| eval.js:2:7:2:12 | x | eval.js:4:3:4:3 | x |
-| eval.js:2:11:2:12 | 42 | eval.js:2:7:2:12 | x |
+| eval.js:2:7:2:7 | x | eval.js:4:3:4:3 | x |
+| eval.js:2:11:2:12 | 42 | eval.js:2:7:2:7 | x |
 | sources.js:1:6:1:6 | x | sources.js:1:6:1:6 | x |
 | sources.js:1:6:1:6 | x | sources.js:1:11:1:11 | x |
 | sources.js:1:6:1:11 | x => x | sources.js:1:5:1:12 | (x => x) |
@@ -1173,14 +1173,14 @@ getImmediatePredecessor
 | sources.js:9:14:9:18 | array | sources.js:10:19:10:23 | array |
 | sources.js:9:14:9:18 | array | sources.js:11:23:11:27 | array |
 | sources.js:10:12:10:14 | key | sources.js:10:28:10:30 | key |
-| sources.js:11:12:11:18 | key | sources.js:11:32:11:34 | key |
-| sources.js:11:14:11:16 | key | sources.js:11:12:11:18 | key |
-| tst2.ts:1:1:1:1 | A | tst2.ts:1:18:1:18 | A |
-| tst2.ts:1:8:5:1 | A | tst2.ts:11:11:11:11 | A |
-| tst2.ts:1:8:5:1 | A | tst2.ts:15:11:15:11 | A |
-| tst2.ts:1:8:5:1 | namespa ... lysed\\n} | tst2.ts:1:8:5:1 | A |
-| tst2.ts:2:14:2:19 | x | tst2.ts:4:3:4:3 | x |
-| tst2.ts:2:18:2:19 | 42 | tst2.ts:2:14:2:19 | x |
+| sources.js:11:14:11:16 | key | sources.js:11:14:11:16 | key |
+| sources.js:11:14:11:16 | key | sources.js:11:32:11:34 | key |
+| tst2.ts:1:1:1:0 | A | tst2.ts:1:18:1:18 | A |
+| tst2.ts:1:8:5:1 | namespa ... lysed\\n} | tst2.ts:1:18:1:18 | A |
+| tst2.ts:1:18:1:18 | A | tst2.ts:11:11:11:11 | A |
+| tst2.ts:1:18:1:18 | A | tst2.ts:15:11:15:11 | A |
+| tst2.ts:2:14:2:14 | x | tst2.ts:4:3:4:3 | x |
+| tst2.ts:2:18:2:19 | 42 | tst2.ts:2:14:2:14 | x |
 | tst2.ts:7:1:7:0 | A | tst2.ts:8:3:8:3 | A |
 | tst2.ts:7:1:9:1 | functio ... = 23;\\n} | tst2.ts:7:10:7:13 | setX |
 | tst2.ts:7:10:7:13 | setX | tst2.ts:3:3:3:6 | setX |
@@ -1194,43 +1194,43 @@ getImmediatePredecessor
 | tst.js:1:10:1:11 | fs | tst.js:1:10:1:11 | fs |
 | tst.js:1:10:1:11 | fs | tst.js:7:1:7:2 | fs |
 | tst.js:1:10:1:11 | fs | tst.js:22:24:22:25 | fs |
-| tst.js:3:5:3:10 | x | tst.js:8:1:8:1 | x |
-| tst.js:3:5:3:10 | x | tst.js:9:2:9:2 | x |
-| tst.js:3:5:3:10 | x | tst.js:10:1:10:1 | x |
-| tst.js:3:5:3:10 | x | tst.js:11:1:11:1 | x |
-| tst.js:3:5:3:10 | x | tst.js:11:1:11:1 | x |
-| tst.js:3:5:3:10 | x | tst.js:11:1:11:1 | x |
-| tst.js:3:5:3:10 | x | tst.js:12:1:12:1 | x |
-| tst.js:3:5:3:10 | x | tst.js:13:1:13:1 | x |
-| tst.js:3:9:3:10 | 42 | tst.js:3:5:3:10 | x |
-| tst.js:4:5:4:12 | y | tst.js:10:4:10:4 | y |
-| tst.js:4:5:4:12 | y | tst.js:11:6:11:6 | y |
-| tst.js:4:5:4:12 | y | tst.js:12:6:12:6 | y |
-| tst.js:4:5:4:12 | y | tst.js:13:5:13:5 | y |
-| tst.js:4:5:4:12 | y | tst.js:14:9:14:9 | y |
-| tst.js:4:5:4:12 | y | tst.js:105:6:105:6 | y |
-| tst.js:4:9:4:12 | "hi" | tst.js:4:5:4:12 | y |
+| tst.js:3:5:3:5 | x | tst.js:8:1:8:1 | x |
+| tst.js:3:5:3:5 | x | tst.js:9:2:9:2 | x |
+| tst.js:3:5:3:5 | x | tst.js:10:1:10:1 | x |
+| tst.js:3:5:3:5 | x | tst.js:11:1:11:1 | x |
+| tst.js:3:5:3:5 | x | tst.js:11:1:11:1 | x |
+| tst.js:3:5:3:5 | x | tst.js:11:1:11:1 | x |
+| tst.js:3:5:3:5 | x | tst.js:12:1:12:7 | x |
+| tst.js:3:5:3:5 | x | tst.js:13:1:13:6 | x |
+| tst.js:3:9:3:10 | 42 | tst.js:3:5:3:5 | x |
+| tst.js:4:5:4:5 | y | tst.js:10:4:10:4 | y |
+| tst.js:4:5:4:5 | y | tst.js:11:6:11:6 | y |
+| tst.js:4:5:4:5 | y | tst.js:12:6:12:6 | y |
+| tst.js:4:5:4:5 | y | tst.js:13:5:13:5 | y |
+| tst.js:4:5:4:5 | y | tst.js:14:9:14:9 | y |
+| tst.js:4:5:4:5 | y | tst.js:105:6:105:6 | y |
+| tst.js:4:9:4:12 | "hi" | tst.js:4:5:4:5 | y |
 | tst.js:9:2:9:2 | x | tst.js:9:1:9:3 | (x) |
 | tst.js:10:4:10:4 | y | tst.js:10:1:10:4 | x, y |
-| tst.js:12:1:12:1 | x | tst.js:12:1:12:1 | x |
-| tst.js:12:1:12:1 | x | tst.js:12:1:12:1 | x |
-| tst.js:12:1:12:1 | x | tst.js:12:1:12:1 | x |
-| tst.js:13:1:13:1 | x | tst.js:14:5:14:5 | x |
-| tst.js:13:1:13:1 | x | tst.js:25:3:25:3 | x |
-| tst.js:13:1:13:5 | z | tst.js:14:1:14:1 | z |
-| tst.js:13:5:13:5 | y | tst.js:13:1:13:5 | z |
+| tst.js:12:1:12:7 | x | tst.js:12:1:12:1 | x |
+| tst.js:12:1:12:7 | x | tst.js:12:1:12:1 | x |
+| tst.js:12:1:12:7 | x | tst.js:12:1:12:1 | x |
+| tst.js:13:1:13:1 | z | tst.js:14:1:14:1 | z |
+| tst.js:13:1:13:6 | x | tst.js:14:5:14:5 | x |
+| tst.js:13:1:13:6 | x | tst.js:25:3:25:3 | x |
+| tst.js:13:5:13:5 | y | tst.js:13:1:13:1 | z |
 | tst.js:13:5:13:5 | y | tst.js:13:1:13:5 | z = y |
 | tst.js:16:2:20:1 | functio ... n "";\\n} | tst.js:16:1:20:2 | (functi ...  "";\\n}) |
 | tst.js:16:13:16:13 | a | tst.js:16:13:16:13 | a |
 | tst.js:16:13:16:13 | a | tst.js:18:12:18:12 | a |
 | tst.js:20:4:20:8 | "arg" | tst.js:16:13:16:13 | a |
-| tst.js:22:5:22:25 | readFileSync | tst.js:23:1:23:12 | readFileSync |
-| tst.js:22:7:22:18 | readFileSync | tst.js:22:5:22:25 | readFileSync |
+| tst.js:22:7:22:18 | readFileSync | tst.js:22:7:22:18 | readFileSync |
+| tst.js:22:7:22:18 | readFileSync | tst.js:23:1:23:12 | readFileSync |
 | tst.js:22:24:22:25 | fs | tst.js:22:5:22:20 | { readFileSync } |
-| tst.js:25:1:25:3 | x | tst.js:26:1:26:1 | x |
-| tst.js:25:1:25:3 | x | tst.js:57:7:57:7 | x |
-| tst.js:25:1:25:3 | x | tst.js:58:11:58:11 | x |
-| tst.js:25:1:25:3 | x | tst.js:105:1:105:1 | x |
+| tst.js:25:3:25:3 | x | tst.js:26:1:26:1 | x |
+| tst.js:25:3:25:3 | x | tst.js:57:7:57:7 | x |
+| tst.js:25:3:25:3 | x | tst.js:58:11:58:11 | x |
+| tst.js:25:3:25:3 | x | tst.js:105:1:105:1 | x |
 | tst.js:28:2:28:1 | x | tst.js:29:3:29:3 | x |
 | tst.js:28:2:29:3 | () =>\\n  x | tst.js:28:1:30:1 | (() =>\\n ... ables\\n) |
 | tst.js:29:3:29:3 | x | tst.js:28:1:30:3 | (() =>\\n ... les\\n)() |
@@ -1239,69 +1239,69 @@ getImmediatePredecessor
 | tst.js:32:10:32:10 | g | tst.js:35:1:35:1 | g |
 | tst.js:32:10:32:10 | g | tst.js:60:1:60:1 | g |
 | tst.js:32:10:32:10 | g | tst.js:62:4:62:4 | g |
-| tst.js:37:5:42:1 | o | tst.js:43:1:43:1 | o |
-| tst.js:37:5:42:1 | o | tst.js:44:1:44:1 | o |
-| tst.js:37:5:42:1 | o | tst.js:61:3:61:3 | o |
-| tst.js:37:5:42:1 | o | tst.js:62:1:62:1 | o |
-| tst.js:37:5:42:1 | o | tst.js:77:15:77:15 | o |
-| tst.js:37:5:42:1 | o | tst.js:80:15:80:15 | o |
-| tst.js:37:5:42:1 | o | tst.js:83:23:83:23 | o |
-| tst.js:37:5:42:1 | o | tst.js:85:23:85:23 | o |
-| tst.js:37:9:42:1 | {\\n  x:  ... ;\\n  }\\n} | tst.js:37:5:42:1 | o |
+| tst.js:37:5:37:5 | o | tst.js:43:1:43:1 | o |
+| tst.js:37:5:37:5 | o | tst.js:44:1:44:1 | o |
+| tst.js:37:5:37:5 | o | tst.js:61:3:61:3 | o |
+| tst.js:37:5:37:5 | o | tst.js:62:1:62:1 | o |
+| tst.js:37:5:37:5 | o | tst.js:77:15:77:15 | o |
+| tst.js:37:5:37:5 | o | tst.js:80:15:80:15 | o |
+| tst.js:37:5:37:5 | o | tst.js:83:23:83:23 | o |
+| tst.js:37:5:37:5 | o | tst.js:85:23:85:23 | o |
+| tst.js:37:9:42:1 | {\\n  x:  ... ;\\n  }\\n} | tst.js:37:5:37:5 | o |
 | tst.js:39:4:39:3 | this | tst.js:40:5:40:8 | this |
 | tst.js:46:10:46:11 | "" | tst.js:46:1:46:11 | global = "" |
-| tst.js:49:1:54:1 | A | tst.js:55:1:55:1 | A |
-| tst.js:49:1:54:1 | class A ... `\\n  }\\n} | tst.js:49:1:54:1 | A |
+| tst.js:49:1:54:1 | class A ... `\\n  }\\n} | tst.js:49:7:49:7 | A |
+| tst.js:49:7:49:7 | A | tst.js:55:1:55:1 | A |
 | tst.js:50:14:50:13 | this | tst.js:51:5:51:9 | implicit 'this' |
 | tst.js:64:1:67:1 | functio ... lysed\\n} | tst.js:64:11:64:11 | h |
 | tst.js:64:11:64:11 | h | tst.js:68:12:68:12 | h |
-| tst.js:68:5:68:14 | iter | tst.js:69:1:69:4 | iter |
-| tst.js:68:12:68:14 | h() | tst.js:68:5:68:14 | iter |
+| tst.js:68:5:68:8 | iter | tst.js:69:1:69:4 | iter |
+| tst.js:68:12:68:14 | h() | tst.js:68:5:68:8 | iter |
 | tst.js:77:10:77:10 | i | tst.js:78:3:78:3 | i |
 | tst.js:80:10:80:10 | v | tst.js:81:3:81:3 | v |
 | tst.js:83:18:83:18 | v | tst.js:83:26:83:26 | v |
 | tst.js:85:18:85:18 | v | tst.js:85:26:85:26 | v |
 | tst.js:87:2:92:1 | functio ...  + z;\\n} | tst.js:87:1:92:2 | (functi ... + z;\\n}) |
-| tst.js:87:11:87:24 | o | tst.js:88:18:88:18 | o |
-| tst.js:87:11:87:24 | o | tst.js:90:15:90:15 | o |
-| tst.js:87:11:87:24 | x | tst.js:91:10:91:10 | x |
-| tst.js:87:13:87:16 | p: x | tst.js:87:11:87:24 | x |
-| tst.js:87:22:87:22 | ...o | tst.js:87:11:87:24 | o |
-| tst.js:88:7:88:18 | y | tst.js:91:14:91:14 | y |
-| tst.js:88:9:88:12 | q: y | tst.js:88:7:88:18 | y |
+| tst.js:87:13:87:16 | p: x | tst.js:87:16:87:16 | x |
+| tst.js:87:16:87:16 | x | tst.js:91:10:91:10 | x |
+| tst.js:87:22:87:22 | ...o | tst.js:87:22:87:22 | o |
+| tst.js:87:22:87:22 | o | tst.js:88:18:88:18 | o |
+| tst.js:87:22:87:22 | o | tst.js:90:15:90:15 | o |
+| tst.js:88:9:88:12 | q: y | tst.js:88:12:88:12 | y |
+| tst.js:88:12:88:12 | y | tst.js:91:14:91:14 | y |
 | tst.js:88:18:88:18 | o | tst.js:88:7:88:14 | { q: y } |
-| tst.js:90:4:90:15 | z | tst.js:91:18:91:18 | z |
 | tst.js:90:4:90:15 | { r: z } = o | tst.js:90:3:90:16 | ({ r: z } = o) |
-| tst.js:90:6:90:9 | r: z | tst.js:90:4:90:15 | z |
+| tst.js:90:6:90:9 | r: z | tst.js:90:9:90:9 | z |
+| tst.js:90:9:90:9 | z | tst.js:91:18:91:18 | z |
 | tst.js:90:15:90:15 | o | tst.js:90:4:90:11 | { r: z } |
 | tst.js:90:15:90:15 | o | tst.js:90:4:90:15 | { r: z } = o |
 | tst.js:91:10:91:18 | x + y + z | tst.js:87:1:96:2 | (functi ... r: 0\\n}) |
 | tst.js:92:4:96:1 | {\\n  p:  ...  r: 0\\n} | tst.js:87:11:87:24 | { p: x, ...o } |
 | tst.js:98:2:103:1 | functio ...  + z;\\n} | tst.js:98:1:103:2 | (functi ... + z;\\n}) |
-| tst.js:98:11:98:24 | rest | tst.js:99:15:99:18 | rest |
-| tst.js:98:11:98:24 | rest | tst.js:101:13:101:16 | rest |
-| tst.js:98:11:98:24 | x | tst.js:102:10:102:10 | x |
-| tst.js:98:13:98:13 | x | tst.js:98:11:98:24 | x |
-| tst.js:98:19:98:22 | ...rest | tst.js:98:11:98:24 | rest |
-| tst.js:99:7:99:18 | y | tst.js:102:14:102:14 | y |
-| tst.js:99:9:99:9 | y | tst.js:99:7:99:18 | y |
+| tst.js:98:13:98:13 | x | tst.js:98:13:98:13 | x |
+| tst.js:98:13:98:13 | x | tst.js:102:10:102:10 | x |
+| tst.js:98:19:98:22 | ...rest | tst.js:98:19:98:22 | rest |
+| tst.js:98:19:98:22 | rest | tst.js:99:15:99:18 | rest |
+| tst.js:98:19:98:22 | rest | tst.js:101:13:101:16 | rest |
+| tst.js:99:9:99:9 | y | tst.js:99:9:99:9 | y |
+| tst.js:99:9:99:9 | y | tst.js:102:14:102:14 | y |
 | tst.js:99:15:99:18 | rest | tst.js:99:7:99:11 | [ y ] |
-| tst.js:101:3:101:16 | z | tst.js:102:18:102:18 | z |
-| tst.js:101:7:101:7 | z | tst.js:101:3:101:16 | z |
+| tst.js:101:7:101:7 | z | tst.js:101:7:101:7 | z |
+| tst.js:101:7:101:7 | z | tst.js:102:18:102:18 | z |
 | tst.js:101:13:101:16 | rest | tst.js:101:3:101:9 | [ , z ] |
 | tst.js:101:13:101:16 | rest | tst.js:101:3:101:16 | [ , z ] = rest |
 | tst.js:102:10:102:18 | x + y + z | tst.js:98:1:103:17 | (functi ... 3, 0 ]) |
 | tst.js:103:4:103:16 | [ 19, 23, 0 ] | tst.js:98:11:98:24 | [ x, ...rest ] |
 | tst.js:107:2:113:1 | functio ...  v2c;\\n} | tst.js:107:1:113:2 | (functi ... v2c;\\n}) |
-| tst.js:108:6:108:38 | v1a | tst.js:109:2:109:4 | v1a |
-| tst.js:108:6:108:38 | v1b | tst.js:109:8:109:10 | v1b |
-| tst.js:108:6:108:38 | v1c | tst.js:109:14:109:16 | v1c |
-| tst.js:108:7:108:9 | v1a | tst.js:108:6:108:38 | v1a |
+| tst.js:108:7:108:9 | v1a | tst.js:108:7:108:9 | v1a |
+| tst.js:108:7:108:9 | v1a | tst.js:109:2:109:4 | v1a |
+| tst.js:108:12:108:14 | v1b | tst.js:109:8:109:10 | v1b |
+| tst.js:108:23:108:25 | v1c | tst.js:109:14:109:16 | v1c |
 | tst.js:108:36:108:38 | o1d | tst.js:108:6:108:32 | {v1a, v ...  = o1c} |
-| tst.js:111:6:111:38 | v2a | tst.js:112:2:112:4 | v2a |
-| tst.js:111:6:111:38 | v2b | tst.js:112:8:112:10 | v2b |
-| tst.js:111:6:111:38 | v2c | tst.js:112:14:112:16 | v2c |
-| tst.js:111:7:111:9 | v2a | tst.js:111:6:111:38 | v2a |
+| tst.js:111:7:111:9 | v2a | tst.js:111:7:111:9 | v2a |
+| tst.js:111:7:111:9 | v2a | tst.js:112:2:112:4 | v2a |
+| tst.js:111:12:111:14 | v2b | tst.js:112:8:112:10 | v2b |
+| tst.js:111:23:111:25 | v2c | tst.js:112:14:112:16 | v2c |
 | tst.js:111:36:111:38 | o2d | tst.js:111:6:111:32 | [v2a, v ...  = o2c] |
 | tst.js:115:1:115:12 | reflective call | tst.js:115:1:115:12 | Array.call() |
 | tst.js:117:22:117:23 | x1 | tst.js:117:10:117:24 | Object.seal(x1) |
@@ -1340,7 +1340,7 @@ incomplete
 | arguments.js:11:5:11:14 | exceptional return of f(1, 2, 3) | call |
 | arguments.js:11:5:11:14 | f(1, 2, 3) | call |
 | eval.js:1:1:5:1 | exceptional return of function k | call |
-| eval.js:2:7:2:12 | x | eval |
+| eval.js:2:7:2:7 | x | eval |
 | eval.js:3:3:3:6 | eval | global |
 | eval.js:3:3:3:16 | eval("x = 23") | call |
 | eval.js:3:3:3:16 | exceptional return of eval("x = 23") | call |
@@ -1351,9 +1351,9 @@ incomplete
 | sources.js:9:1:12:1 | exceptional return of function foo | call |
 | sources.js:9:14:9:18 | array | call |
 | sources.js:10:12:10:14 | key | heap |
-| sources.js:11:12:11:18 | key | heap |
 | sources.js:11:14:11:16 | key | heap |
-| tst2.ts:2:14:2:19 | x | namespace |
+| sources.js:11:14:11:16 | key | heap |
+| tst2.ts:2:14:2:14 | x | namespace |
 | tst2.ts:3:3:3:8 | exceptional return of setX() | call |
 | tst2.ts:3:3:3:8 | setX() | call |
 | tst2.ts:7:1:9:1 | exceptional return of function setX | call |
@@ -1564,8 +1564,10 @@ sources
 | tst.js:50:14:53:3 | () {\\n   ... et`\\n  } |
 | tst.js:50:14:53:3 | return of constructor of class A |
 | tst.js:51:5:51:13 | super(42) |
+| tst.js:57:1:57:9 | `x: ${x}` |
 | tst.js:58:1:58:3 | tag |
 | tst.js:58:1:58:13 | tag `x: ${x}` |
+| tst.js:58:5:58:13 | `x: ${x}` |
 | tst.js:61:1:61:5 | ::o.m |
 | tst.js:61:3:61:5 | o.m |
 | tst.js:62:1:62:4 | o::g |
diff --git a/javascript/ql/test/library-tests/DefUse/DefUsePair.expected b/javascript/ql/test/library-tests/DefUse/DefUsePair.expected
index f029dd71b6c..fe8ec09345b 100644
--- a/javascript/ql/test/library-tests/DefUse/DefUsePair.expected
+++ b/javascript/ql/test/library-tests/DefUse/DefUsePair.expected
@@ -1,9 +1,9 @@
-| classes.js:7:5:8:5 | def@7:5 | classes.js:10:5:10:12 | LocalFoo |
+| classes.js:7:11:7:18 | def@7:11 | classes.js:10:5:10:12 | LocalFoo |
 | es2015.js:1:10:1:11 | def@1:10 | es2015.js:2:3:2:4 | fn |
 | es2015.js:5:16:5:16 | def@5:16 | es2015.js:5:32:5:32 | i |
 | es2015.js:5:16:5:16 | def@5:16 | es2015.js:5:34:5:34 | i |
 | es2015modules.js:1:10:1:12 | def@1:10 | es2015modules.js:4:3:4:5 | foo |
-| es2015modules.js:1:15:1:24 | def@1:15 | es2015modules.js:6:3:6:5 | baz |
+| es2015modules.js:1:22:1:24 | def@1:22 | es2015modules.js:6:3:6:5 | baz |
 | es2015modules.js:10:10:10:13 | def@10:10 | es2015modules.js:7:3:7:6 | quux |
 | es2015modules.js:15:17:15:17 | def@15:17 | es2015modules.js:12:1:12:1 | f |
 | es2015modules.js:16:25:16:25 | def@16:25 | es2015modules.js:13:1:13:1 | g |
@@ -14,17 +14,17 @@
 | fundecls.js:30:12:30:12 | def@30:12 | fundecls.js:28:3:28:3 | f |
 | fundecls.js:36:12:36:12 | def@36:12 | fundecls.js:35:3:35:3 | f |
 | fundecls.js:39:11:39:11 | def@39:11 | fundecls.js:40:7:40:7 | x |
-| fundecls.js:45:3:45:3 | phi@45:3 | fundecls.js:45:3:45:3 | f |
+| fundecls.js:45:3:45:6 | phi@45:3 | fundecls.js:45:3:45:3 | f |
 | fundecls.js:48:11:48:11 | def@48:11 | fundecls.js:50:7:50:7 | x |
 | tst.js:1:12:1:12 | def@1:12 | tst.js:3:12:3:12 | o |
 | tst.js:1:12:1:12 | def@1:12 | tst.js:5:16:5:16 | o |
-| tst.js:2:9:2:14 | def@2:9 | tst.js:8:17:8:17 | y |
-| tst.js:3:2:3:2 | phi@3:2 | tst.js:4:5:4:5 | i |
-| tst.js:5:2:5:2 | phi@5:2 | tst.js:7:6:7:6 | i |
-| tst.js:5:2:5:2 | phi@5:2 | tst.js:8:14:8:14 | z |
+| tst.js:2:9:2:9 | def@2:9 | tst.js:8:17:8:17 | y |
+| tst.js:3:2:4:6 | phi@3:2 | tst.js:4:5:4:5 | i |
+| tst.js:5:2:7:7 | phi@5:2 | tst.js:7:6:7:6 | i |
+| tst.js:5:2:7:7 | phi@5:2 | tst.js:8:14:8:14 | z |
 | tst.js:5:11:5:11 | def@5:11 | tst.js:6:7:6:7 | z |
-| tst.js:12:2:12:7 | def@12:2 | tst.js:14:9:14:9 | x |
+| tst.js:12:2:12:2 | def@12:2 | tst.js:14:9:14:9 | x |
 | tst.js:19:11:19:11 | def@19:11 | tst.js:18:9:18:9 | x |
-| tst.js:23:6:23:23 | def@23:6 | tst.js:24:2:24:2 | a |
-| tst.js:23:6:23:23 | def@23:6 | tst.js:24:6:24:6 | c |
+| tst.js:23:7:23:7 | def@23:7 | tst.js:24:2:24:2 | a |
+| tst.js:23:14:23:14 | def@23:14 | tst.js:24:6:24:6 | c |
 | tst.js:26:11:26:11 | def@26:11 | tst.js:27:2:27:2 | a |
diff --git a/javascript/ql/test/library-tests/FlowSummary/DataFlowConsistency.expected b/javascript/ql/test/library-tests/FlowSummary/DataFlowConsistency.expected
index f3b3ca527c3..51612c5b97a 100644
--- a/javascript/ql/test/library-tests/FlowSummary/DataFlowConsistency.expected
+++ b/javascript/ql/test/library-tests/FlowSummary/DataFlowConsistency.expected
@@ -20,21 +20,6 @@ reverseRead
 | tst.js:267:28:267:31 | map3 | Origin of readStep is missing a PostUpdateNode. |
 argHasPostUpdate
 postWithInFlow
-| file://:0:0:0:0 | [summary] to write: Argument[0] in _.tap | PostUpdateNode should not be the target of local flow. |
-| file://:0:0:0:0 | [summary] to write: Argument[1] in Array method with flow into callback | PostUpdateNode should not be the target of local flow. |
-| file://:0:0:0:0 | [summary] to write: Argument[1] in Array#filter | PostUpdateNode should not be the target of local flow. |
-| file://:0:0:0:0 | [summary] to write: Argument[1] in Array#find / Array#findLast | PostUpdateNode should not be the target of local flow. |
-| file://:0:0:0:0 | [summary] to write: Argument[1] in Array#flatMap | PostUpdateNode should not be the target of local flow. |
-| file://:0:0:0:0 | [summary] to write: Argument[1] in Array#forEach / Map#forEach / Set#forEach | PostUpdateNode should not be the target of local flow. |
-| file://:0:0:0:0 | [summary] to write: Argument[1] in Array#map | PostUpdateNode should not be the target of local flow. |
-| file://:0:0:0:0 | [summary] to write: Argument[1] in Array#reduce / Array#reduceRight | PostUpdateNode should not be the target of local flow. |
-| file://:0:0:0:0 | [summary] to write: Argument[2] in 'array.prototype.find' / 'array-find' | PostUpdateNode should not be the target of local flow. |
-| file://:0:0:0:0 | [summary] to write: Argument[2] in Array.from(arg, callback, [thisArg]) | PostUpdateNode should not be the target of local flow. |
-| file://:0:0:0:0 | [summary] to write: Argument[2] in _.reduce-like | PostUpdateNode should not be the target of local flow. |
-| file://:0:0:0:0 | [summary] to write: Argument[this] in Array#flatMap | PostUpdateNode should not be the target of local flow. |
-| file://:0:0:0:0 | [summary] to write: Argument[this] in Array#forEach / Map#forEach / Set#forEach | PostUpdateNode should not be the target of local flow. |
-| file://:0:0:0:0 | [summary] to write: Argument[this] in Array#map | PostUpdateNode should not be the target of local flow. |
-| file://:0:0:0:0 | [summary] to write: Argument[this] in Array#reduce / Array#reduceRight | PostUpdateNode should not be the target of local flow. |
 viableImplInCallContextTooLarge
 uniqueParameterNodeAtPosition
 uniqueParameterNodePosition
diff --git a/javascript/ql/test/library-tests/FlowSummary/test.ql b/javascript/ql/test/library-tests/FlowSummary/test.ql
index e8ca23a423c..0e40dcdadb0 100644
--- a/javascript/ql/test/library-tests/FlowSummary/test.ql
+++ b/javascript/ql/test/library-tests/FlowSummary/test.ql
@@ -8,7 +8,7 @@ DataFlow::CallNode getACall(string name) {
   result.getCalleeNode().getALocalSource() = DataFlow::globalVarRef(name)
 }
 
-module ConfigArg implements DataFlow::ConfigSig {
+module FlowConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node node) { node = getACall("source") }
 
   predicate isSink(DataFlow::Node node) { node = getACall("sink").getAnArgument() }
@@ -19,7 +19,7 @@ module ConfigArg implements DataFlow::ConfigSig {
   }
 }
 
-module Configuration = DataFlow::Global<ConfigArg>;
+module Flow = DataFlow::Global<FlowConfig>;
 
 class BasicBarrierGuard extends DataFlow::CallNode {
   BasicBarrierGuard() { this = getACall("isSafe") }
@@ -32,5 +32,5 @@ class BasicBarrierGuard extends DataFlow::CallNode {
 deprecated class ConsistencyConfig extends ConsistencyConfiguration {
   ConsistencyConfig() { this = "ConsistencyConfig" }
 
-  override DataFlow::Node getAnAlert() { Configuration::flow(_, result) }
+  override DataFlow::Node getAnAlert() { Flow::flow(_, result) }
 }
diff --git a/javascript/ql/test/library-tests/GlobalAccessPaths/GlobalAccessPaths.expected b/javascript/ql/test/library-tests/GlobalAccessPaths/GlobalAccessPaths.expected
index b216e18c71d..c6ca30cd329 100644
--- a/javascript/ql/test/library-tests/GlobalAccessPaths/GlobalAccessPaths.expected
+++ b/javascript/ql/test/library-tests/GlobalAccessPaths/GlobalAccessPaths.expected
@@ -9,22 +9,22 @@ test_getAReferenceTo
 | other_ns.js:4:9:4:10 | NS | NS |
 | other_ns.js:4:9:4:16 | NS \|\| {} | NS |
 | other_ns.js:6:1:6:8 | Conflict | Conflict |
-| test.js:2:7:2:17 | v | foo.bar |
+| test.js:2:7:2:7 | v | foo.bar |
 | test.js:2:11:2:13 | foo | foo |
 | test.js:2:11:2:17 | foo.bar | foo.bar |
 | test.js:3:3:3:3 | v | foo.bar |
 | test.js:3:3:3:7 | v.baz | foo.bar.baz |
 | test.js:4:7:4:24 | { baz, a, b: {c} } | foo.bar |
-| test.js:4:7:4:28 | c | foo.bar.b.c |
 | test.js:4:9:4:11 | baz | foo.bar.baz |
 | test.js:4:14:4:14 | a | foo.bar.a |
 | test.js:4:17:4:22 | b: {c} | foo.bar.b |
 | test.js:4:20:4:22 | {c} | foo.bar.b |
 | test.js:4:21:4:21 | c | foo.bar.b.c |
+| test.js:4:21:4:21 | c | foo.bar.b.c |
 | test.js:4:28:4:28 | v | foo.bar |
 | test.js:5:11:5:11 | c | foo.bar.b.c |
 | test.js:5:11:5:13 | c.d | foo.bar.b.c.d |
-| test.js:7:7:7:16 | w | window |
+| test.js:7:7:7:7 | w | window |
 | test.js:7:11:7:16 | window | window |
 | test.js:8:13:8:18 | window | window |
 | test.js:8:13:8:20 | window.x | x |
@@ -35,11 +35,11 @@ test_getAReferenceTo
 | test.js:10:13:10:13 | w | window |
 | test.js:10:13:10:15 | w.x | x |
 | test.js:10:13:10:17 | w.x.y | x.y |
-| test.js:12:7:12:25 | notUnique | foo.bar |
+| test.js:12:7:12:15 | notUnique | foo.bar |
 | test.js:12:19:12:21 | foo | foo |
 | test.js:12:19:12:25 | foo.bar | foo.bar |
 | test.js:13:7:13:15 | something | something |
-| test.js:14:5:14:23 | notUnique | bar.baz |
+| test.js:14:5:14:13 | notUnique | bar.baz |
 | test.js:14:5:14:23 | notUnique = bar.baz | bar.baz |
 | test.js:14:17:14:19 | bar | bar |
 | test.js:14:17:14:23 | bar.baz | bar.baz |
@@ -56,7 +56,7 @@ test_getAReferenceTo
 | test.js:33:7:33:18 | { bar = {} } | foo |
 | test.js:33:9:33:16 | bar = {} | foo.bar |
 | test.js:33:22:33:24 | foo | foo |
-| test.js:39:3:39:20 | lazyInit | foo.bar |
+| test.js:39:3:39:10 | lazyInit | foo.bar |
 | test.js:39:3:39:20 | lazyInit = foo.bar | foo.bar |
 | test.js:39:14:39:16 | foo | foo |
 | test.js:39:14:39:20 | foo.bar | foo.bar |
@@ -77,7 +77,7 @@ test_getAReferenceTo
 | test.js:68:11:68:34 | Object. ... ar).baz | foo.bar.baz |
 | test.js:68:23:68:25 | foo | foo |
 | test.js:68:23:68:29 | foo.bar | foo.bar |
-| test.js:69:6:69:15 | O | Object |
+| test.js:69:6:69:6 | O | Object |
 | test.js:69:10:69:15 | Object | Object |
 | test.js:70:11:70:11 | O | Object |
 | test.js:70:11:70:16 | O.seal | Object.seal |
diff --git a/javascript/ql/test/library-tests/Portals/PortalEntry.expected b/javascript/ql/test/library-tests/Portals/PortalEntry.expected
deleted file mode 100644
index b6f7ce88118..00000000000
--- a/javascript/ql/test/library-tests/Portals/PortalEntry.expected
+++ /dev/null
@@ -1,1715 +0,0 @@
-| (member Promise (root https://www.npmjs.com/package/bluebird)) | src/bluebird/index.js:9:19:9:25 | Promise | true |
-| (member default (root https://www.npmjs.com/package/m2)) | src/m2/main.js:6:16:16:1 | class { ...  y; }\\n} | true |
-| (member exec (instance (member Promise (root https://www.npmjs.com/package/bluebird)))) | src/bluebird/index.js:2:15:2:18 | exec | true |
-| (member f00 (member f00 (member f00 (member f00 (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (member f00 (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (member f00 (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (member f00 (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (member f00 (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (member f00 (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (member f00 (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (member f00 (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (member f00 (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (member f00 (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (member f00 (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (member f00 (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (member f00 (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (member f00 (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (member f00 (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (member f00 (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (member f00 (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (member f00 (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (member f00 (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (member f00 (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (member f00 (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (return (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (return (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (return (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (return (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (return (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (return (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (return (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (return (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (return (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (return (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (return (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (return (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (return (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (return (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (return (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (return (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (return (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (return (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (return (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (return (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (return (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (return (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (return (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (return (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (return (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (return (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (return (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member f00 (return (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (parameter 0 (parameter 0 (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (parameter 0 (parameter 0 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (parameter 0 (parameter 0 (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (parameter 0 (parameter 0 (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (parameter 0 (parameter 0 (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (parameter 0 (parameter 0 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (parameter 0 (parameter 0 (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (parameter 0 (parameter 0 (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (parameter 0 (parameter 0 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (parameter 0 (parameter 0 (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (parameter 0 (parameter 0 (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (parameter 0 (parameter 0 (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (parameter 0 (parameter 0 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (parameter 0 (parameter 0 (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (member f00 (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (member f00 (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (member f00 (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (member f00 (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (member f00 (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (member f00 (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (member f00 (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (member f00 (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (member f00 (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (member f00 (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (member f00 (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (member f00 (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (member f00 (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (member f00 (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (member f00 (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (member f00 (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (member f00 (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (member f00 (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (member f00 (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (member f00 (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (member f00 (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (member f00 (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (member f00 (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (member f00 (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (member f00 (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (parameter 0 (parameter 0 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (parameter 0 (parameter 0 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (parameter 0 (parameter 0 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (parameter 0 (parameter 0 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (parameter 0 (parameter 0 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (parameter 0 (parameter 0 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (parameter 0 (parameter 0 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (return (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (return (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (return (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (return (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (return (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (return (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (return (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (return (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (return (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (return (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (return (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (return (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (return (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (return (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (return (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (return (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (return (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (return (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (return (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (return (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (return (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (return (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (return (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (return (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (return (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (return (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (return (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member f00 (return (return (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (member foo (root https://www.npmjs.com/package/cyclic))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (member f00 (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (member f00 (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (member f00 (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (member f00 (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (member f00 (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (member f00 (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (member f00 (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (member f00 (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (member f00 (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (member f00 (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (member f00 (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (member f00 (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (return (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (return (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (return (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (return (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (return (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (return (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (return (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (return (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (return (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (return (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (return (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (return (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (return (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (return (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (return (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (return (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (return (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (return (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (return (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (return (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (return (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (return (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (return (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (parameter 0 (parameter 0 (return (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (member f00 (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (member f00 (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (member f00 (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (member f00 (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (member f00 (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (member f00 (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (member f00 (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (member f00 (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (member f00 (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (member f00 (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (member f00 (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (member f00 (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (member f00 (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (member f00 (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (member f00 (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (member f00 (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (member f00 (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (member f00 (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (member f00 (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (member f00 (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (member f00 (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (member f00 (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (member f00 (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (parameter 0 (parameter 0 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (parameter 0 (parameter 0 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (parameter 0 (parameter 0 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (parameter 0 (parameter 0 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (parameter 0 (parameter 0 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (parameter 0 (parameter 0 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (return (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (return (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (return (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (return (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (return (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (return (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (return (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (return (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (return (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (return (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (return (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (return (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (return (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (return (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (return (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (return (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (return (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (return (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (return (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (return (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (return (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (return (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (return (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (return (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (return (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (return (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (return (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member f00 (return (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (parameter 0 (parameter 0 (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (parameter 0 (parameter 0 (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (parameter 0 (parameter 0 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (parameter 0 (parameter 0 (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (parameter 0 (parameter 0 (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (parameter 0 (parameter 0 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (parameter 0 (parameter 0 (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (parameter 0 (parameter 0 (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (parameter 0 (parameter 0 (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (parameter 0 (parameter 0 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (parameter 0 (parameter 0 (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (parameter 0 (parameter 0 (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (parameter 0 (parameter 0 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (parameter 0 (parameter 0 (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (parameter 0 (parameter 0 (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (parameter 0 (parameter 0 (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (parameter 0 (parameter 0 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (parameter 0 (parameter 0 (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (parameter 0 (parameter 0 (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (parameter 0 (parameter 0 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (parameter 0 (parameter 0 (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (parameter 0 (parameter 0 (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (parameter 0 (parameter 0 (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (parameter 0 (parameter 0 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (parameter 0 (parameter 0 (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (member f00 (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (member f00 (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (member f00 (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (member f00 (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (member f00 (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (member f00 (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (member f00 (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (member f00 (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (member f00 (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (member f00 (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (member f00 (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (member f00 (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (member f00 (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (member f00 (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (member f00 (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (member f00 (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (member f00 (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (member f00 (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (member f00 (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (member f00 (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (member f00 (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (member f00 (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (member f00 (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (member f00 (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (member f00 (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (parameter 0 (parameter 0 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (parameter 0 (parameter 0 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (parameter 0 (parameter 0 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (parameter 0 (parameter 0 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (parameter 0 (parameter 0 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (parameter 0 (parameter 0 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (parameter 0 (parameter 0 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (return (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (return (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (return (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (return (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (return (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (return (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (return (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (return (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (return (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (return (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (return (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (return (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (return (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (return (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (return (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (return (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (return (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (return (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (return (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (return (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (return (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (return (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (return (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (return (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (return (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (return (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (return (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member f00 (return (return (return (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:5:11:5:13 | foo | true |
-| (member foo (root https://www.npmjs.com/package/cyclic)) | src/cyclic/index.js:10:15:10:17 | foo | true |
-| (member foo (root https://www.npmjs.com/package/m2)) | src/m2/main.js:1:8:4:1 | functio ... "hi";\\n} | true |
-| (member foo (root https://www.npmjs.com/package/m4)) | src/m4/index.js:1:15:1:28 | function(x) {} | true |
-| (member m (instance (member default (root https://www.npmjs.com/package/m2)))) | src/m2/main.js:11:4:13:3 | (x) {\\n  ... e);\\n  } | true |
-| (member name (instance (member default (root https://www.npmjs.com/package/m2)))) | src/m2/main.js:8:17:8:20 | name | true |
-| (member s (member default (root https://www.npmjs.com/package/m2))) | src/m2/main.js:15:11:15:27 | (y) { return y; } | true |
-| (member then (instance (member Promise (root https://www.npmjs.com/package/bluebird)))) | src/bluebird/index.js:5:26:7:1 | functio ... ull);\\n} | true |
-| (member x (parameter 0 (member foo (root https://www.npmjs.com/package/m2)))) | src/m3/tst2.js:5:10:5:10 | o | false |
-| (member y (member x (parameter 0 (member foo (root https://www.npmjs.com/package/m2))))) | src/m3/tst2.js:3:6:3:8 | "?" | false |
-| (member z (parameter 0 (member foo (root https://www.npmjs.com/package/m2)))) | src/m2/main.js:3:9:3:12 | "hi" | true |
-| (parameter 0 (member String (global))) | src/m5/index.js:5:33:5:50 | fs.readFileSync(f) | true |
-| (parameter 0 (member default (root https://www.npmjs.com/package/m2))) | src/m3/tst3.js:4:7:4:10 | "me" | false |
-| (parameter 0 (member default (root https://www.npmjs.com/package/m2))) | src/m3/tst3.js:5:7:5:10 | "me" | false |
-| (parameter 0 (member encode (root https://www.npmjs.com/package/base-64/base64.js))) | src/m5/index.js:5:26:5:51 | String( ... ync(f)) | false |
-| (parameter 0 (member foo (root https://www.npmjs.com/package/m2))) | src/m3/tst2.js:5:5:5:12 | { x: o } | false |
-| (parameter 0 (member log (member console (global)))) | src/m2/main.js:2:15:2:19 | p.x.y | true |
-| (parameter 0 (member log (member console (global)))) | src/m2/main.js:12:17:12:35 | x + " " + this.name | true |
-| (parameter 0 (member log (member console (global)))) | src/m3/index.js:3:43:3:61 | m1("Hello, world!") | true |
-| (parameter 0 (member m (instance (member default (root https://www.npmjs.com/package/m2))))) | src/m3/tst3.js:4:15:4:18 | "hi" | false |
-| (parameter 0 (member m (instance (member default (root https://www.npmjs.com/package/m2))))) | src/m3/tst3.js:4:15:4:18 | "hi" | true |
-| (parameter 0 (member m (member default (root https://www.npmjs.com/package/m2)))) | src/m3/tst3.js:2:5:2:8 | "hi" | false |
-| (parameter 0 (member m (return (member default (root https://www.npmjs.com/package/m2))))) | src/m3/tst3.js:4:15:4:18 | "hi" | false |
-| (parameter 0 (member readFileSync (root https://www.npmjs.com/package/fs))) | src/m5/index.js:5:49:5:49 | f | false |
-| (parameter 0 (member s (instance (member default (root https://www.npmjs.com/package/m2))))) | src/m3/tst3.js:5:15:5:21 | "there" | false |
-| (parameter 0 (member s (instance (member default (root https://www.npmjs.com/package/m2))))) | src/m3/tst3.js:5:15:5:21 | "there" | true |
-| (parameter 0 (member s (member default (root https://www.npmjs.com/package/m2)))) | src/m3/tst3.js:3:5:3:11 | "there" | false |
-| (parameter 0 (member s (return (member default (root https://www.npmjs.com/package/m2))))) | src/m3/tst3.js:5:15:5:21 | "there" | false |
-| (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (member f00 (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (member f00 (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (member f00 (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (member f00 (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (member f00 (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (member f00 (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (member f00 (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (member f00 (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (member f00 (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (member f00 (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (member f00 (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (member f00 (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (member f00 (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (member f00 (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (return (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (return (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (return (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (return (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (return (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (return (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (return (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (return (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (return (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (return (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (return (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (return (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (return (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (return (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (return (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (return (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (return (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (return (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (return (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (return (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (return (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (return (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (return (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (return (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (return (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (return (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (return (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member f00 (return (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (member f00 (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (member f00 (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (member f00 (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (member f00 (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (member f00 (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (member f00 (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (member f00 (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (member f00 (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (member f00 (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (member f00 (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (member f00 (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (member f00 (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (member f00 (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (member f00 (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (member f00 (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (member f00 (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (member f00 (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (member f00 (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (member f00 (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (member f00 (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (member f00 (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (member f00 (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (member f00 (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (member f00 (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (member f00 (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (return (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (return (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (return (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (return (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (return (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (return (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (return (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (return (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (return (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (return (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (return (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (return (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (return (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (return (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (return (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (return (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (return (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (return (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (return (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (return (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (return (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (return (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (return (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (return (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (return (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (return (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (return (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 0 (return (return (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:6:2:8 | foo | true |
-| (parameter 0 (parameter 1 (member then (instance (member Promise (root https://www.npmjs.com/package/bluebird)))))) | src/bluebird/index.js:6:12:6:15 | null | true |
-| (parameter 0 (root https://www.npmjs.com/package/m1)) | src/m3/index.js:3:46:3:60 | "Hello, world!" | false |
-| (return (member f00 (member f00 (member f00 (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (member f00 (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (member f00 (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (member f00 (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (member f00 (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (member f00 (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (member f00 (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (member f00 (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (member f00 (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (member f00 (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (member f00 (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (member f00 (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (member f00 (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (member f00 (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (member f00 (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (member f00 (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (member f00 (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (member f00 (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (member f00 (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (member f00 (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (member f00 (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (parameter 0 (parameter 0 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (parameter 0 (parameter 0 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (parameter 0 (parameter 0 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (parameter 0 (parameter 0 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (return (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (return (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (return (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (return (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (return (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (return (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (return (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (return (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (return (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (return (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (return (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (return (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (return (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (return (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (return (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (return (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (return (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (return (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (return (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (return (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (return (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (return (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (return (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (return (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (return (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (return (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (return (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member f00 (return (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (parameter 0 (parameter 0 (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (parameter 0 (parameter 0 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (parameter 0 (parameter 0 (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (parameter 0 (parameter 0 (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (parameter 0 (parameter 0 (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (parameter 0 (parameter 0 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (parameter 0 (parameter 0 (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (parameter 0 (parameter 0 (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (parameter 0 (parameter 0 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (parameter 0 (parameter 0 (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (parameter 0 (parameter 0 (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (parameter 0 (parameter 0 (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (parameter 0 (parameter 0 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (parameter 0 (parameter 0 (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (parameter 0 (parameter 0 (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (parameter 0 (parameter 0 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (parameter 0 (parameter 0 (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (parameter 0 (parameter 0 (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (parameter 0 (parameter 0 (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (parameter 0 (parameter 0 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (parameter 0 (parameter 0 (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (member f00 (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (member f00 (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (member f00 (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (member f00 (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (member f00 (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (member f00 (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (member f00 (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (member f00 (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (member f00 (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (member f00 (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (member f00 (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (member f00 (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (member f00 (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (member f00 (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (member f00 (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (member f00 (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (member f00 (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (member f00 (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (member f00 (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (member f00 (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (member f00 (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (member f00 (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (member f00 (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (member f00 (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (member f00 (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (parameter 0 (parameter 0 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (parameter 0 (parameter 0 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (parameter 0 (parameter 0 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (parameter 0 (parameter 0 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (parameter 0 (parameter 0 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (parameter 0 (parameter 0 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (parameter 0 (parameter 0 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (return (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (return (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (return (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (return (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (return (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (return (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (return (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (return (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (return (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (return (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (return (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (return (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (return (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (return (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (return (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (return (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (return (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (return (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (return (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (return (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (return (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (return (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (return (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (return (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (return (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (return (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (return (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member f00 (return (return (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member foo (root https://www.npmjs.com/package/cyclic))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (member s (member default (root https://www.npmjs.com/package/m2)))) | src/m2/main.js:15:24:15:24 | y | true |
-| (return (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (member f00 (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (member f00 (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (member f00 (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (member f00 (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (member f00 (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (member f00 (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (member f00 (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (member f00 (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (member f00 (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (member f00 (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (member f00 (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (member f00 (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (member f00 (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (member f00 (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (member f00 (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (member f00 (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (member f00 (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (member f00 (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (return (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (return (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (return (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (return (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (return (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (return (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (return (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (return (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (return (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (return (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (return (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (return (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (return (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (return (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (return (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (return (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (return (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (return (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (return (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (return (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (return (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (return (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (return (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (parameter 0 (parameter 0 (return (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (member f00 (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (member f00 (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (member f00 (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (member f00 (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (member f00 (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (member f00 (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (member f00 (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (member f00 (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (member f00 (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (member f00 (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (member f00 (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (member f00 (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (member f00 (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (member f00 (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (member f00 (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (member f00 (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (member f00 (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (member f00 (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (member f00 (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (member f00 (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (member f00 (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (member f00 (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (member f00 (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (parameter 0 (parameter 0 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (parameter 0 (parameter 0 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (parameter 0 (parameter 0 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (parameter 0 (parameter 0 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (parameter 0 (parameter 0 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (parameter 0 (parameter 0 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (return (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (return (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (return (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (return (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (return (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (return (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (return (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (return (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (return (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (return (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (return (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (return (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (return (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (return (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (return (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (return (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (return (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (return (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (return (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (return (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (return (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (return (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (return (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (return (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (return (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (return (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (return (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member f00 (return (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (member foo (root https://www.npmjs.com/package/cyclic)))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (parameter 0 (parameter 0 (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (parameter 0 (parameter 0 (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (parameter 0 (parameter 0 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (parameter 0 (parameter 0 (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (parameter 0 (parameter 0 (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (parameter 0 (parameter 0 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (parameter 0 (parameter 0 (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (parameter 0 (parameter 0 (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (parameter 0 (parameter 0 (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (parameter 0 (parameter 0 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (parameter 0 (parameter 0 (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (parameter 0 (parameter 0 (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (parameter 0 (parameter 0 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (parameter 0 (parameter 0 (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (parameter 0 (parameter 0 (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (parameter 0 (parameter 0 (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (parameter 0 (parameter 0 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (parameter 0 (parameter 0 (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (parameter 0 (parameter 0 (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (parameter 0 (parameter 0 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (parameter 0 (parameter 0 (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (parameter 0 (parameter 0 (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (parameter 0 (parameter 0 (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (parameter 0 (parameter 0 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (parameter 0 (parameter 0 (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (member f00 (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (member f00 (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (member f00 (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (member f00 (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (member f00 (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (member f00 (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (member f00 (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (member f00 (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (member f00 (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (member f00 (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (member f00 (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (member f00 (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (member f00 (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (member f00 (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (member f00 (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (member f00 (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (member f00 (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (member f00 (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (member f00 (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (member f00 (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (member f00 (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (member f00 (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (member f00 (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (member f00 (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (member f00 (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (member foo (root https://www.npmjs.com/package/cyclic))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (parameter 0 (parameter 0 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (parameter 0 (parameter 0 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (parameter 0 (parameter 0 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (parameter 0 (parameter 0 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (parameter 0 (parameter 0 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (parameter 0 (parameter 0 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (parameter 0 (parameter 0 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (return (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (return (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (return (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (return (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (return (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (return (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (return (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (return (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (return (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (return (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (return (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (return (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (return (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (return (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (return (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (return (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (return (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (return (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (return (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (return (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (return (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (return (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (return (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (return (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (return (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (return (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (return (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (return (return (return (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:3:10:3:12 | foo | true |
-| (return (root https://www.npmjs.com/package/m1)) | src/m1/index.js:1:25:1:25 | x | true |
-| (root https://www.npmjs.com/package/m1) | src/m1/index.js:1:18:1:25 | (x) => x | true |
diff --git a/javascript/ql/test/library-tests/Portals/PortalEntry.ql b/javascript/ql/test/library-tests/Portals/PortalEntry.ql
deleted file mode 100644
index 2e16b7bffb1..00000000000
--- a/javascript/ql/test/library-tests/Portals/PortalEntry.ql
+++ /dev/null
@@ -1,5 +0,0 @@
-import javascript
-import semmle.javascript.dataflow.Portals
-
-from Portal p, boolean escapes
-select p, p.getAnEntryNode(escapes), escapes
diff --git a/javascript/ql/test/library-tests/Portals/PortalExit.expected b/javascript/ql/test/library-tests/Portals/PortalExit.expected
deleted file mode 100644
index ed5a28d830e..00000000000
--- a/javascript/ql/test/library-tests/Portals/PortalExit.expected
+++ /dev/null
@@ -1,1060 +0,0 @@
-| (global) | src/bluebird/index.js:1:1:1:0 | this | true |
-| (global) | src/bluebird/tst.js:1:1:1:0 | this | true |
-| (global) | src/cyclic/index.js:1:1:1:0 | this | true |
-| (global) | src/m1/index.js:1:1:1:0 | this | true |
-| (global) | src/m2/main.js:1:1:1:0 | this | true |
-| (global) | src/m3/index.js:1:1:1:0 | this | true |
-| (global) | src/m3/tst2.js:1:1:1:0 | this | true |
-| (global) | src/m3/tst3.js:1:1:1:0 | this | true |
-| (global) | src/m3/tst.js:1:1:1:0 | this | true |
-| (global) | src/m4/index.js:1:1:1:0 | this | true |
-| (global) | src/m5/index.js:1:1:1:0 | this | true |
-| (instance (member Promise (root https://www.npmjs.com/package/bluebird))) | src/bluebird/index.js:1:1:1:0 | this | true |
-| (instance (member Promise (root https://www.npmjs.com/package/bluebird))) | src/bluebird/index.js:5:1:5:17 | Promise.prototype | true |
-| (instance (member Promise (root https://www.npmjs.com/package/bluebird))) | src/bluebird/index.js:5:26:5:25 | this | true |
-| (instance (member Promise (root https://www.npmjs.com/package/bluebird))) | src/bluebird/tst.js:2:9:2:21 | new Promise() | true |
-| (instance (member default (root https://www.npmjs.com/package/m2))) | src/m2/main.js:7:14:7:13 | this | true |
-| (instance (member default (root https://www.npmjs.com/package/m2))) | src/m2/main.js:11:4:11:3 | this | true |
-| (instance (member default (root https://www.npmjs.com/package/m2))) | src/m2/main.js:15:11:15:10 | this | true |
-| (instance (member default (root https://www.npmjs.com/package/m2))) | src/m3/tst3.js:4:1:4:11 | new A("me") | false |
-| (instance (member default (root https://www.npmjs.com/package/m2))) | src/m3/tst3.js:4:1:4:11 | new A("me") | true |
-| (instance (member default (root https://www.npmjs.com/package/m2))) | src/m3/tst3.js:5:1:5:11 | new A("me") | false |
-| (instance (member default (root https://www.npmjs.com/package/m2))) | src/m3/tst3.js:5:1:5:11 | new A("me") | true |
-| (member String (global)) | src/m5/index.js:5:26:5:31 | String | true |
-| (member console (global)) | src/m2/main.js:2:3:2:9 | console | true |
-| (member console (global)) | src/m2/main.js:12:5:12:11 | console | true |
-| (member console (global)) | src/m3/index.js:3:31:3:37 | console | true |
-| (member default (root https://www.npmjs.com/package/m2)) | src/m3/tst3.js:1:8:1:8 | A | false |
-| (member encode (root https://www.npmjs.com/package/base-64/base64.js)) | src/m5/index.js:5:12:5:24 | base64.encode | false |
-| (member foo (root https://www.npmjs.com/package/m2)) | src/m3/tst2.js:1:10:1:12 | foo | false |
-| (member log (member console (global))) | src/m2/main.js:2:3:2:13 | console.log | true |
-| (member log (member console (global))) | src/m2/main.js:12:5:12:15 | console.log | true |
-| (member log (member console (global))) | src/m3/index.js:3:31:3:41 | console.log | true |
-| (member m (instance (member default (root https://www.npmjs.com/package/m2)))) | src/m3/tst3.js:4:1:4:13 | new A("me").m | false |
-| (member m (instance (member default (root https://www.npmjs.com/package/m2)))) | src/m3/tst3.js:4:1:4:13 | new A("me").m | true |
-| (member m (member default (root https://www.npmjs.com/package/m2))) | src/m3/tst3.js:2:1:2:3 | A.m | false |
-| (member m (return (member default (root https://www.npmjs.com/package/m2)))) | src/m3/tst3.js:4:1:4:13 | new A("me").m | false |
-| (member name (instance (member default (root https://www.npmjs.com/package/m2)))) | src/m2/main.js:12:27:12:35 | this.name | true |
-| (member readFileSync (root https://www.npmjs.com/package/fs)) | src/m5/index.js:5:33:5:47 | fs.readFileSync | false |
-| (member s (instance (member default (root https://www.npmjs.com/package/m2)))) | src/m3/tst3.js:5:1:5:13 | new A("me").s | false |
-| (member s (instance (member default (root https://www.npmjs.com/package/m2)))) | src/m3/tst3.js:5:1:5:13 | new A("me").s | true |
-| (member s (member default (root https://www.npmjs.com/package/m2))) | src/m3/tst3.js:3:1:3:3 | A.s | false |
-| (member s (return (member default (root https://www.npmjs.com/package/m2)))) | src/m3/tst3.js:5:1:5:13 | new A("me").s | false |
-| (member x (parameter 0 (member foo (root https://www.npmjs.com/package/m2)))) | src/m2/main.js:2:15:2:17 | p.x | true |
-| (member y (member x (parameter 0 (member foo (root https://www.npmjs.com/package/m2))))) | src/m2/main.js:2:15:2:19 | p.x.y | true |
-| (parameter 0 (member Promise (root https://www.npmjs.com/package/bluebird))) | src/bluebird/index.js:1:18:1:21 | exec | true |
-| (parameter 0 (member f00 (member f00 (member f00 (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (member f00 (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (member f00 (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (member f00 (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (member f00 (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (member f00 (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (member f00 (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (member f00 (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (member f00 (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (member f00 (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (member f00 (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (member f00 (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (member f00 (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (member f00 (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (member f00 (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (member f00 (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (member f00 (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (member f00 (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (member f00 (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (member f00 (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (member f00 (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (parameter 0 (parameter 0 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (parameter 0 (parameter 0 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (parameter 0 (parameter 0 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (parameter 0 (parameter 0 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (return (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (return (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (return (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (return (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (return (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (return (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (return (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (return (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (return (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (return (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (return (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (return (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (return (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (return (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (return (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (return (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (return (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (return (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (return (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (return (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (return (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (return (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (return (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (return (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (return (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (return (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (return (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member f00 (return (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (parameter 0 (parameter 0 (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (parameter 0 (parameter 0 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (parameter 0 (parameter 0 (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (parameter 0 (parameter 0 (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (parameter 0 (parameter 0 (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (parameter 0 (parameter 0 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (parameter 0 (parameter 0 (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (parameter 0 (parameter 0 (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (parameter 0 (parameter 0 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (parameter 0 (parameter 0 (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (parameter 0 (parameter 0 (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (parameter 0 (parameter 0 (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (parameter 0 (parameter 0 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (parameter 0 (parameter 0 (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (parameter 0 (parameter 0 (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (parameter 0 (parameter 0 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (parameter 0 (parameter 0 (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (parameter 0 (parameter 0 (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (parameter 0 (parameter 0 (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (parameter 0 (parameter 0 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (parameter 0 (parameter 0 (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (member f00 (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (member f00 (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (member f00 (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (member f00 (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (member f00 (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (member f00 (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (member f00 (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (member f00 (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (member f00 (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (member f00 (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (member f00 (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (member f00 (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (member f00 (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (member f00 (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (member f00 (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (member f00 (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (member f00 (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (member f00 (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (member f00 (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (member f00 (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (member f00 (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (member f00 (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (member f00 (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (member f00 (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (member f00 (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (parameter 0 (parameter 0 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (parameter 0 (parameter 0 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (parameter 0 (parameter 0 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (parameter 0 (parameter 0 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (parameter 0 (parameter 0 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (parameter 0 (parameter 0 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (parameter 0 (parameter 0 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (return (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (return (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (return (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (return (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (return (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (return (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (return (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (return (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (return (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (return (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (return (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (return (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (return (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (return (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (return (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (return (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (return (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (return (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (return (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (return (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (return (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (return (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (return (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (return (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (return (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (return (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (return (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member f00 (return (return (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (member foo (root https://www.npmjs.com/package/m2))) | src/m2/main.js:1:21:1:21 | p | true |
-| (parameter 0 (member foo (root https://www.npmjs.com/package/m4))) | src/m4/index.js:1:24:1:24 | x | true |
-| (parameter 0 (member m (instance (member default (root https://www.npmjs.com/package/m2))))) | src/m2/main.js:11:5:11:5 | x | true |
-| (parameter 0 (member s (member default (root https://www.npmjs.com/package/m2)))) | src/m2/main.js:15:12:15:12 | y | true |
-| (parameter 0 (member then (instance (member Promise (root https://www.npmjs.com/package/bluebird))))) | src/bluebird/index.js:5:35:5:43 | fulfilled | true |
-| (parameter 0 (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (member f00 (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (member f00 (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (member f00 (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (member f00 (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (member f00 (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (member f00 (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (member f00 (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (member f00 (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (member f00 (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (member f00 (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (member f00 (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (member f00 (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (member f00 (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (member f00 (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (member f00 (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (member f00 (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (member f00 (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (member f00 (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (return (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (return (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (return (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (return (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (return (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (return (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (return (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (return (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (return (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (return (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (return (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (return (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (return (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (return (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (return (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (return (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (return (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (return (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (return (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (return (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (return (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (return (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (return (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (parameter 0 (parameter 0 (return (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (member f00 (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (member f00 (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (member f00 (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (member f00 (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (member f00 (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (member f00 (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (member f00 (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (member f00 (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (member f00 (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (member f00 (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (member f00 (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (member f00 (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (member f00 (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (member f00 (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (member f00 (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (member f00 (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (member f00 (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (member f00 (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (member f00 (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (member f00 (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (member f00 (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (member f00 (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (member f00 (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (parameter 0 (parameter 0 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (parameter 0 (parameter 0 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (parameter 0 (parameter 0 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (parameter 0 (parameter 0 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (parameter 0 (parameter 0 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (parameter 0 (parameter 0 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (return (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (return (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (return (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (return (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (return (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (return (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (return (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (return (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (return (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (return (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (return (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (return (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (return (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (return (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (return (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (return (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (return (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (return (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (return (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (return (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (return (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (return (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (return (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (return (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (return (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (return (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (return (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member f00 (return (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (parameter 0 (parameter 0 (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (parameter 0 (parameter 0 (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (parameter 0 (parameter 0 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (parameter 0 (parameter 0 (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (parameter 0 (parameter 0 (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (parameter 0 (parameter 0 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (parameter 0 (parameter 0 (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (parameter 0 (parameter 0 (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (parameter 0 (parameter 0 (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (parameter 0 (parameter 0 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (parameter 0 (parameter 0 (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (parameter 0 (parameter 0 (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (parameter 0 (parameter 0 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (parameter 0 (parameter 0 (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (parameter 0 (parameter 0 (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (parameter 0 (parameter 0 (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (parameter 0 (parameter 0 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (parameter 0 (parameter 0 (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (parameter 0 (parameter 0 (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (parameter 0 (parameter 0 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (parameter 0 (parameter 0 (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (parameter 0 (parameter 0 (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (parameter 0 (parameter 0 (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (parameter 0 (parameter 0 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (parameter 0 (parameter 0 (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (member f00 (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (member f00 (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (member f00 (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (member f00 (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (member f00 (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (member f00 (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (member f00 (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (member f00 (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (member f00 (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (member f00 (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (member f00 (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (member f00 (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (member f00 (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (member f00 (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (member f00 (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (member f00 (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (member f00 (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (member f00 (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (member f00 (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (member f00 (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (member f00 (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (member f00 (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (member f00 (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (member f00 (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (member f00 (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (parameter 0 (parameter 0 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (parameter 0 (parameter 0 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (parameter 0 (parameter 0 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (parameter 0 (parameter 0 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (parameter 0 (parameter 0 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (parameter 0 (parameter 0 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (parameter 0 (parameter 0 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (return (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (return (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (return (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (return (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (return (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (return (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (return (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (return (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (return (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (return (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (return (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (return (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (return (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (return (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (return (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (return (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (return (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (return (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (return (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (return (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (return (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (return (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (return (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (return (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (return (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (return (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (return (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (return (return (return (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:1:14:1:15 | cb | true |
-| (parameter 0 (root https://www.npmjs.com/package/m1)) | src/m1/index.js:1:19:1:19 | x | true |
-| (parameter 1 (member then (instance (member Promise (root https://www.npmjs.com/package/bluebird))))) | src/bluebird/index.js:5:46:5:53 | rejected | true |
-| (return (member String (global))) | src/m5/index.js:5:26:5:51 | String( ... ync(f)) | true |
-| (return (member default (root https://www.npmjs.com/package/m2))) | src/m3/tst3.js:4:1:4:11 | new A("me") | false |
-| (return (member default (root https://www.npmjs.com/package/m2))) | src/m3/tst3.js:5:1:5:11 | new A("me") | false |
-| (return (member encode (root https://www.npmjs.com/package/base-64/base64.js))) | src/m5/index.js:5:12:5:52 | base64. ... nc(f))) | false |
-| (return (member foo (root https://www.npmjs.com/package/m2))) | src/m3/tst2.js:5:1:5:13 | foo({ x: o }) | false |
-| (return (member log (member console (global)))) | src/m2/main.js:2:3:2:20 | console.log(p.x.y) | true |
-| (return (member log (member console (global)))) | src/m2/main.js:12:5:12:36 | console ... s.name) | true |
-| (return (member log (member console (global)))) | src/m3/index.js:3:31:3:62 | console ... rld!")) | true |
-| (return (member m (instance (member default (root https://www.npmjs.com/package/m2))))) | src/m3/tst3.js:4:1:4:19 | new A("me").m("hi") | false |
-| (return (member m (instance (member default (root https://www.npmjs.com/package/m2))))) | src/m3/tst3.js:4:1:4:19 | new A("me").m("hi") | true |
-| (return (member m (member default (root https://www.npmjs.com/package/m2)))) | src/m3/tst3.js:2:1:2:9 | A.m("hi") | false |
-| (return (member m (return (member default (root https://www.npmjs.com/package/m2))))) | src/m3/tst3.js:4:1:4:19 | new A("me").m("hi") | false |
-| (return (member readFileSync (root https://www.npmjs.com/package/fs))) | src/m5/index.js:5:33:5:50 | fs.readFileSync(f) | false |
-| (return (member s (instance (member default (root https://www.npmjs.com/package/m2))))) | src/m3/tst3.js:5:1:5:22 | new A(" ... there") | false |
-| (return (member s (instance (member default (root https://www.npmjs.com/package/m2))))) | src/m3/tst3.js:5:1:5:22 | new A(" ... there") | true |
-| (return (member s (member default (root https://www.npmjs.com/package/m2)))) | src/m3/tst3.js:3:1:3:12 | A.s("there") | false |
-| (return (member s (return (member default (root https://www.npmjs.com/package/m2))))) | src/m3/tst3.js:5:1:5:22 | new A(" ... there") | false |
-| (return (parameter 0 (member f00 (member f00 (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (member f00 (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (member f00 (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (member f00 (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (member f00 (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (member f00 (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (member f00 (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (member f00 (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (member f00 (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (member f00 (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (member f00 (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (member f00 (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (member f00 (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (member f00 (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (member f00 (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (member f00 (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (member f00 (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (member f00 (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (member f00 (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (member f00 (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (member f00 (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (member f00 (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (member f00 (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (parameter 0 (parameter 0 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (parameter 0 (parameter 0 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (parameter 0 (parameter 0 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (parameter 0 (parameter 0 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (parameter 0 (parameter 0 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (parameter 0 (parameter 0 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (return (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (return (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (return (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (return (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (return (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (return (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (return (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (return (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (return (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (return (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (return (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (return (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (return (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (return (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (return (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (return (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (return (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (return (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (return (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (return (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (return (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (return (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (return (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (return (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (return (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (return (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (return (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member f00 (return (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (parameter 0 (parameter 0 (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (member f00 (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (member f00 (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (member f00 (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (member f00 (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (member f00 (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (member f00 (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (member f00 (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (member f00 (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (member f00 (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (member f00 (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (member f00 (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (member f00 (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (member f00 (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (member f00 (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (member f00 (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (member f00 (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (member f00 (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (member f00 (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (member f00 (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (member f00 (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (member f00 (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (member f00 (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (member f00 (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (member f00 (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (member f00 (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (member f00 (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (member f00 (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (member f00 (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (member f00 (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (parameter 0 (parameter 0 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (parameter 0 (parameter 0 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (parameter 0 (parameter 0 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (parameter 0 (parameter 0 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (parameter 0 (parameter 0 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (parameter 0 (parameter 0 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (parameter 0 (parameter 0 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (parameter 0 (parameter 0 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (parameter 0 (parameter 0 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (parameter 0 (parameter 0 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (return (member f00 (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (return (member f00 (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (return (member f00 (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (return (member f00 (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (return (member f00 (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (return (member f00 (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (return (member f00 (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (return (member f00 (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (return (member f00 (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (return (member f00 (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (return (member f00 (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (return (member f00 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (return (parameter 0 (parameter 0 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (return (parameter 0 (parameter 0 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (return (parameter 0 (parameter 0 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (return (parameter 0 (parameter 0 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (return (parameter 0 (parameter 0 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (return (return (member f00 (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (return (return (member f00 (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (return (return (member f00 (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (return (return (member f00 (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (return (return (member f00 (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (return (return (parameter 0 (parameter 0 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (return (return (parameter 0 (parameter 0 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (return (return (return (member f00 (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (return (return (return (member f00 (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (return (return (return (parameter 0 (parameter 0 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (return (return (return (return (member f00 (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 0 (return (return (return (return (return (return (member foo (root https://www.npmjs.com/package/cyclic)))))))))) | src/cyclic/index.js:2:3:2:9 | cb(foo) | true |
-| (return (parameter 1 (member then (instance (member Promise (root https://www.npmjs.com/package/bluebird)))))) | src/bluebird/index.js:6:3:6:16 | rejected(null) | true |
-| (return (root https://www.npmjs.com/package/m1)) | src/m3/index.js:3:43:3:61 | m1("Hello, world!") | false |
-| (root https://www.npmjs.com/package/base-64/base64.js) | src/m5/index.js:2:14:2:41 | require ... 64.js") | false |
-| (root https://www.npmjs.com/package/fs) | src/m5/index.js:1:12:1:24 | require("fs") | false |
-| (root https://www.npmjs.com/package/m1) | src/m3/index.js:1:10:1:22 | require("m1") | false |
-| (root https://www.npmjs.com/package/m2) | src/m3/tst2.js:1:1:1:25 | import  ... m "m2"; | false |
-| (root https://www.npmjs.com/package/m2) | src/m3/tst3.js:1:1:1:19 | import A from "m2"; | false |
diff --git a/javascript/ql/test/library-tests/Portals/PortalExit.ql b/javascript/ql/test/library-tests/Portals/PortalExit.ql
deleted file mode 100644
index c8215261fd0..00000000000
--- a/javascript/ql/test/library-tests/Portals/PortalExit.ql
+++ /dev/null
@@ -1,5 +0,0 @@
-import javascript
-import semmle.javascript.dataflow.Portals
-
-from Portal p, boolean isRemote
-select p, p.getAnExitNode(isRemote), isRemote
diff --git a/javascript/ql/test/library-tests/Portals/src/bluebird/index.js b/javascript/ql/test/library-tests/Portals/src/bluebird/index.js
deleted file mode 100644
index 55534a29ee1..00000000000
--- a/javascript/ql/test/library-tests/Portals/src/bluebird/index.js
+++ /dev/null
@@ -1,9 +0,0 @@
-function Promise(exec) {
-  this.exec = exec;
-}
-
-Promise.prototype.then = function(fulfilled, rejected) {
-  rejected(null);
-};
-
-exports.Promise = Promise;
diff --git a/javascript/ql/test/library-tests/Portals/src/bluebird/package.json b/javascript/ql/test/library-tests/Portals/src/bluebird/package.json
deleted file mode 100644
index c87227dd781..00000000000
--- a/javascript/ql/test/library-tests/Portals/src/bluebird/package.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "name": "bluebird"
-}
diff --git a/javascript/ql/test/library-tests/Portals/src/bluebird/tst.js b/javascript/ql/test/library-tests/Portals/src/bluebird/tst.js
deleted file mode 100644
index 9de51f32583..00000000000
--- a/javascript/ql/test/library-tests/Portals/src/bluebird/tst.js
+++ /dev/null
@@ -1,2 +0,0 @@
-var Promise= require('./index').Promise;
-var p = new Promise();
diff --git a/javascript/ql/test/library-tests/Portals/src/cyclic/index.js b/javascript/ql/test/library-tests/Portals/src/cyclic/index.js
deleted file mode 100644
index cf6f60871ce..00000000000
--- a/javascript/ql/test/library-tests/Portals/src/cyclic/index.js
+++ /dev/null
@@ -1,10 +0,0 @@
-function foo(cb) {
-  cb(foo);
-  return foo;
-}
-foo.f00 = foo;
-
-foo(foo);
-foo(foo());
-
-exports.foo = foo;
diff --git a/javascript/ql/test/library-tests/Portals/src/cyclic/package.json b/javascript/ql/test/library-tests/Portals/src/cyclic/package.json
deleted file mode 100644
index f842eba9efd..00000000000
--- a/javascript/ql/test/library-tests/Portals/src/cyclic/package.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "name": "cyclic"
-}
diff --git a/javascript/ql/test/library-tests/Portals/src/m1/index.js b/javascript/ql/test/library-tests/Portals/src/m1/index.js
deleted file mode 100644
index b6996b7326d..00000000000
--- a/javascript/ql/test/library-tests/Portals/src/m1/index.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = (x) => x;
diff --git a/javascript/ql/test/library-tests/Portals/src/m1/package.json b/javascript/ql/test/library-tests/Portals/src/m1/package.json
deleted file mode 100644
index a055bb659b3..00000000000
--- a/javascript/ql/test/library-tests/Portals/src/m1/package.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "name": "m1"
-}
diff --git a/javascript/ql/test/library-tests/Portals/src/m2/main.js b/javascript/ql/test/library-tests/Portals/src/m2/main.js
deleted file mode 100644
index 43f42b1ff83..00000000000
--- a/javascript/ql/test/library-tests/Portals/src/m2/main.js
+++ /dev/null
@@ -1,16 +0,0 @@
-export function foo(p) {
-  console.log(p.x.y);
-  p.z = "hi";
-}
-
-export default class {
-  constructor(name) {
-    this.name = name;
-  }
-
-  m(x) {
-    console.log(x + " " + this.name);
-  }
-
-  static s(y) { return y; }
-};
diff --git a/javascript/ql/test/library-tests/Portals/src/m2/package.json b/javascript/ql/test/library-tests/Portals/src/m2/package.json
deleted file mode 100644
index 6a14139b8eb..00000000000
--- a/javascript/ql/test/library-tests/Portals/src/m2/package.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "name": "m2",
-  "main": "main.js"
-}
diff --git a/javascript/ql/test/library-tests/Portals/src/m3/index.js b/javascript/ql/test/library-tests/Portals/src/m3/index.js
deleted file mode 100644
index c677a0e8f86..00000000000
--- a/javascript/ql/test/library-tests/Portals/src/m3/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-var m1 = require("m1");
-
-module.exports = function() { console.log(m1("Hello, world!")); };
diff --git a/javascript/ql/test/library-tests/Portals/src/m3/package.json b/javascript/ql/test/library-tests/Portals/src/m3/package.json
deleted file mode 100644
index 6644e5c989c..00000000000
--- a/javascript/ql/test/library-tests/Portals/src/m3/package.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "client",
-  "private": true,
-  "dependencies": {
-    "m1": "*",
-    "m2": "*"
-  }
-}
diff --git a/javascript/ql/test/library-tests/Portals/src/m3/tst.js b/javascript/ql/test/library-tests/Portals/src/m3/tst.js
deleted file mode 100644
index dea4b2f9201..00000000000
--- a/javascript/ql/test/library-tests/Portals/src/m3/tst.js
+++ /dev/null
@@ -1 +0,0 @@
-require(".")();
diff --git a/javascript/ql/test/library-tests/Portals/src/m3/tst2.js b/javascript/ql/test/library-tests/Portals/src/m3/tst2.js
deleted file mode 100644
index ae963ef6458..00000000000
--- a/javascript/ql/test/library-tests/Portals/src/m3/tst2.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import { foo } from "m2";
-var o = {
-  y: "?"
-};
-foo({ x: o });
diff --git a/javascript/ql/test/library-tests/Portals/src/m3/tst3.js b/javascript/ql/test/library-tests/Portals/src/m3/tst3.js
deleted file mode 100644
index 33f1bce997b..00000000000
--- a/javascript/ql/test/library-tests/Portals/src/m3/tst3.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import A from "m2";
-A.m("hi");
-A.s("there");
-new A("me").m("hi");
-new A("me").s("there");
diff --git a/javascript/ql/test/library-tests/Portals/src/m4/index.js b/javascript/ql/test/library-tests/Portals/src/m4/index.js
deleted file mode 100644
index 71247fc87d9..00000000000
--- a/javascript/ql/test/library-tests/Portals/src/m4/index.js
+++ /dev/null
@@ -1 +0,0 @@
-exports.foo = function(x) {};
diff --git a/javascript/ql/test/library-tests/Portals/src/m4/package.json b/javascript/ql/test/library-tests/Portals/src/m4/package.json
deleted file mode 100644
index a3bb655cba4..00000000000
--- a/javascript/ql/test/library-tests/Portals/src/m4/package.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "name": "m4"
-}
diff --git a/javascript/ql/test/library-tests/Portals/src/m5/index.js b/javascript/ql/test/library-tests/Portals/src/m5/index.js
deleted file mode 100644
index cc467c97fb8..00000000000
--- a/javascript/ql/test/library-tests/Portals/src/m5/index.js
+++ /dev/null
@@ -1,6 +0,0 @@
-const fs = require("fs"),
-    base64 = require("base-64/base64.js");
-
-module.exports.readBase64 = function (f) {
-    return base64.encode(String(fs.readFileSync(f)));
-};
diff --git a/javascript/ql/test/library-tests/Portals/src/m5/package.json b/javascript/ql/test/library-tests/Portals/src/m5/package.json
deleted file mode 100644
index 90f440499e9..00000000000
--- a/javascript/ql/test/library-tests/Portals/src/m5/package.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "name": "m5",
-    "dependencies": {
-        "base-64": "*"
-    }
-}
diff --git a/javascript/ql/test/library-tests/SSA/GetRhsNode/GetRhsNode.expected b/javascript/ql/test/library-tests/SSA/GetRhsNode/GetRhsNode.expected
index e971020cdd6..fba49cf683b 100644
--- a/javascript/ql/test/library-tests/SSA/GetRhsNode/GetRhsNode.expected
+++ b/javascript/ql/test/library-tests/SSA/GetRhsNode/GetRhsNode.expected
@@ -1,14 +1,14 @@
-| tst.js:2:7:2:13 | a = g() | tst.js:2:7:2:7 | a | tst.js:2:11:2:13 | g() |
-| tst.js:4:7:4:24 | { propB: b } = g() | tst.js:4:16:4:16 | b | tst.js:4:9:4:16 | propB: b |
-| tst.js:6:7:6:34 | { propC ... } = g() | tst.js:6:16:6:16 | c | tst.js:6:9:6:16 | propC: c |
-| tst.js:6:7:6:34 | { propC ... } = g() | tst.js:6:26:6:26 | d | tst.js:6:19:6:26 | propD: d |
-| tst.js:8:7:8:41 | { array ... } = g() | tst.js:8:22:8:25 | elm1 | tst.js:8:22:8:25 | elm1 |
-| tst.js:8:7:8:41 | { array ... } = g() | tst.js:8:28:8:31 | elm2 | tst.js:8:28:8:31 | elm2 |
-| tst.js:17:3:17:22 | ({ propB: b }) = g() | tst.js:4:16:4:16 | b | tst.js:17:6:17:13 | propB: b |
-| tst.js:19:3:19:32 | ({ prop ... ) = g() | tst.js:6:16:6:16 | c | tst.js:19:6:19:13 | propC: c |
-| tst.js:19:3:19:32 | ({ prop ... ) = g() | tst.js:6:26:6:26 | d | tst.js:19:16:19:23 | propD: d |
-| tst.js:21:3:21:22 | [ elm1, elm2 ] = g() | tst.js:8:22:8:25 | elm1 | tst.js:21:5:21:8 | elm1 |
-| tst.js:21:3:21:22 | [ elm1, elm2 ] = g() | tst.js:8:28:8:31 | elm2 | tst.js:21:11:21:14 | elm2 |
-| tst.js:31:12:31:23 | [elm1, elm2] | tst.js:31:13:31:16 | elm1 | tst.js:31:13:31:16 | elm1 |
-| tst.js:31:12:31:23 | [elm1, elm2] | tst.js:31:19:31:22 | elm2 | tst.js:31:19:31:22 | elm2 |
-| tst.js:31:26:31:40 | { prop: value } | tst.js:31:34:31:38 | value | tst.js:31:28:31:38 | prop: value |
+| tst.js:2:7:2:7 | a = g() | tst.js:2:7:2:7 | a | tst.js:2:11:2:13 | g() |
+| tst.js:4:16:4:16 | { propB: b } = g() | tst.js:4:16:4:16 | b | tst.js:4:9:4:16 | propB: b |
+| tst.js:6:16:6:16 | { propC ... } = g() | tst.js:6:16:6:16 | c | tst.js:6:9:6:16 | propC: c |
+| tst.js:6:26:6:26 | { propC ... } = g() | tst.js:6:26:6:26 | d | tst.js:6:19:6:26 | propD: d |
+| tst.js:8:22:8:25 | { array ... } = g() | tst.js:8:22:8:25 | elm1 | tst.js:8:22:8:25 | elm1 |
+| tst.js:8:28:8:31 | { array ... } = g() | tst.js:8:28:8:31 | elm2 | tst.js:8:28:8:31 | elm2 |
+| tst.js:17:13:17:13 | ({ propB: b }) = g() | tst.js:4:16:4:16 | b | tst.js:17:6:17:13 | propB: b |
+| tst.js:19:13:19:13 | ({ prop ... ) = g() | tst.js:6:16:6:16 | c | tst.js:19:6:19:13 | propC: c |
+| tst.js:19:23:19:23 | ({ prop ... ) = g() | tst.js:6:26:6:26 | d | tst.js:19:16:19:23 | propD: d |
+| tst.js:21:5:21:8 | [ elm1, elm2 ] = g() | tst.js:8:22:8:25 | elm1 | tst.js:21:5:21:8 | elm1 |
+| tst.js:21:11:21:14 | [ elm1, elm2 ] = g() | tst.js:8:28:8:31 | elm2 | tst.js:21:11:21:14 | elm2 |
+| tst.js:31:13:31:16 | [elm1, elm2] | tst.js:31:13:31:16 | elm1 | tst.js:31:13:31:16 | elm1 |
+| tst.js:31:19:31:22 | [elm1, elm2] | tst.js:31:19:31:22 | elm2 | tst.js:31:19:31:22 | elm2 |
+| tst.js:31:34:31:38 | { prop: value } | tst.js:31:34:31:38 | value | tst.js:31:28:31:38 | prop: value |
diff --git a/javascript/ql/test/library-tests/SSA/SSADefinition/SSADefinition.expected b/javascript/ql/test/library-tests/SSA/SSADefinition/SSADefinition.expected
index 77536822831..9bc6c472374 100644
--- a/javascript/ql/test/library-tests/SSA/SSADefinition/SSADefinition.expected
+++ b/javascript/ql/test/library-tests/SSA/SSADefinition/SSADefinition.expected
@@ -1,39 +1,39 @@
-| tst.js:1:1:1:1 | implicit initialization of y |
+| tst.js:1:1:1:0 | implicit initialization of y |
 | tst.js:1:12:1:12 | x |
 | tst.js:3:7:3:7 | x = refine[guard: x is false](def@1:12) |
 | tst.js:3:7:3:7 | x = refine[guard: x is true](def@1:12) |
-| tst.js:4:5:4:9 | y = x |
-| tst.js:5:3:5:3 | x = phi(refine[guard: x is false]@3:7, refine[guard: x is true]@3:7) |
-| tst.js:5:3:5:3 | y = phi(def@4:5, implicitInit@1:1) |
-| tst.js:5:3:5:7 | z = y |
+| tst.js:4:5:4:5 | y = x |
+| tst.js:5:3:5:3 | z = y |
+| tst.js:5:3:5:8 | x = phi(refine[guard: x is false]@3:7, refine[guard: x is true]@3:7) |
+| tst.js:5:3:5:8 | y = phi(def@4:5, implicitInit@1:1) |
 | tst.js:6:10:6:10 | x = phi(phi@5:3, refine[guard: x is true]@6:10) |
 | tst.js:6:10:6:10 | x = refine[guard: x is true](phi@6:10) |
 | tst.js:6:10:6:10 | z = phi(def@5:3, def@7:5) |
-| tst.js:7:5:7:7 | z++ |
-| tst.js:11:1:11:1 | implicit initialization of x |
+| tst.js:7:5:7:5 | z++ |
+| tst.js:11:1:11:0 | implicit initialization of x |
 | tst.js:11:12:11:12 | x |
 | tst.js:12:3:12:2 | capture variable x |
-| tst.js:15:3:15:8 | x = 42 |
-| tst.js:18:1:18:1 | implicit initialization of x |
-| tst.js:19:7:19:11 | x = 0 |
+| tst.js:15:3:15:3 | x = 42 |
+| tst.js:18:1:18:0 | implicit initialization of x |
+| tst.js:19:7:19:7 | x = 0 |
+| tst.js:20:3:20:2 | capture variable x |
 | tst.js:20:3:20:2 | capture variable x |
 | tst.js:20:13:20:16 | iter |
-| tst.js:22:5:22:9 | capture variable x |
-| tst.js:25:7:25:18 | gen = iter() |
-| tst.js:27:3:27:5 | ++x |
-| tst.js:31:1:31:1 | implicit initialization of x |
-| tst.js:31:1:31:1 | implicit initialization of y |
+| tst.js:25:7:25:9 | gen = iter() |
+| tst.js:27:5:27:5 | ++x |
+| tst.js:31:1:31:0 | capture variable x |
+| tst.js:31:1:31:0 | implicit initialization of x |
+| tst.js:31:1:31:0 | implicit initialization of y |
 | tst.js:32:3:32:2 | capture variable x |
 | tst.js:32:3:32:2 | capture variable y |
 | tst.js:32:12:32:16 | inner |
-| tst.js:34:5:34:10 | x += y |
-| tst.js:36:7:36:11 | x = 0 |
-| tst.js:36:14:36:18 | y = 1 |
-| tst.js:37:3:37:9 | capture variable x |
-| tst.js:41:1:41:1 | implicit initialization of x |
-| tst.js:42:7:42:11 | x = 0 |
-| tst.js:42:14:42:18 | y = 1 |
-| tst.js:43:7:43:37 | inc = ( ...  */ ++x |
+| tst.js:34:5:34:5 | x += y |
+| tst.js:36:7:36:7 | x = 0 |
+| tst.js:36:14:36:14 | y = 1 |
+| tst.js:41:1:41:0 | capture variable x |
+| tst.js:41:1:41:0 | implicit initialization of x |
+| tst.js:42:7:42:7 | x = 0 |
+| tst.js:42:14:42:14 | y = 1 |
+| tst.js:43:7:43:9 | inc = ( ...  */ ++x |
 | tst.js:43:13:43:12 | capture variable x |
-| tst.js:43:35:43:37 | ++x |
-| tst.js:44:3:44:11 | capture variable x |
+| tst.js:43:37:43:37 | ++x |
diff --git a/javascript/ql/test/library-tests/StringConcatenation/StringOps.expected b/javascript/ql/test/library-tests/StringConcatenation/StringOps.expected
index fa1632d2757..c21fbad3292 100644
--- a/javascript/ql/test/library-tests/StringConcatenation/StringOps.expected
+++ b/javascript/ql/test/library-tests/StringConcatenation/StringOps.expected
@@ -6,26 +6,26 @@ concatenation
 | html-concat.js:3:14:3:26 | `<B>${x}</B>` |
 | html-concat.js:5:21:5:47 | `Hey <s ... trong>` |
 | html-concat.js:7:18:10:24 | `\\n    H ... m!</i>` |
-| html-concat.js:13:3:13:18 | buffer |
+| html-concat.js:13:3:13:8 | buffer |
 | html-concat.js:13:3:13:18 | buffer += '<li>' |
-| html-concat.js:14:3:14:13 | buffer |
+| html-concat.js:14:3:14:8 | buffer |
 | html-concat.js:14:3:14:13 | buffer += x |
-| html-concat.js:15:3:15:15 | buffer |
+| html-concat.js:15:3:15:8 | buffer |
 | html-concat.js:15:3:15:15 | buffer += '!' |
-| tst.js:3:3:3:12 | x |
+| tst.js:3:3:3:3 | x |
 | tst.js:3:3:3:12 | x += "two" |
-| tst.js:4:3:4:14 | x |
+| tst.js:4:3:4:3 | x |
 | tst.js:4:3:4:14 | x += "three" |
-| tst.js:5:3:5:13 | x |
+| tst.js:5:3:5:3 | x |
 | tst.js:5:3:5:13 | x += "four" |
-| tst.js:12:5:12:26 | x |
+| tst.js:12:5:12:5 | x |
 | tst.js:12:5:12:26 | x += "o ... + "two" |
 | tst.js:12:10:12:18 | "one" + y |
 | tst.js:12:10:12:26 | "one" + y + "two" |
-| tst.js:14:3:14:13 | x |
+| tst.js:14:3:14:3 | x |
 | tst.js:14:3:14:13 | x += "last" |
 | tst.js:19:11:19:23 | "one" + "two" |
-| tst.js:20:3:20:25 | x |
+| tst.js:20:3:20:3 | x |
 | tst.js:20:3:20:25 | x += (" ... "four") |
 | tst.js:20:9:20:24 | "three" + "four" |
 | tst.js:21:10:21:19 | x + "five" |
@@ -43,9 +43,9 @@ concatenation
 | tst.js:61:10:61:34 | `first  ... } last` |
 | tst.js:77:15:77:37 | ["one", ... three"] |
 | tst.js:79:12:79:23 | array.join() |
-| tst.js:87:5:87:14 | x |
+| tst.js:87:5:87:5 | x |
 | tst.js:87:5:87:14 | x += 'two' |
-| tst.js:89:3:89:14 | x |
+| tst.js:89:3:89:3 | x |
 | tst.js:89:3:89:14 | x += 'three' |
 | tst.js:95:7:95:30 | x.conca ... three') |
 | tst.js:104:11:104:23 | "foo" + "bar" |
@@ -262,31 +262,31 @@ concatenationNode
 | html-concat.js:8:13:8:13 | x |
 | html-concat.js:8:15:10:23 | .\\n    \\n ... um!</i> |
 | html-concat.js:13:3:13:8 | buffer |
-| html-concat.js:13:3:13:18 | buffer |
+| html-concat.js:13:3:13:8 | buffer |
 | html-concat.js:13:3:13:18 | buffer += '<li>' |
 | html-concat.js:13:13:13:18 | '<li>' |
 | html-concat.js:14:3:14:8 | buffer |
-| html-concat.js:14:3:14:13 | buffer |
+| html-concat.js:14:3:14:8 | buffer |
 | html-concat.js:14:3:14:13 | buffer += x |
 | html-concat.js:14:13:14:13 | x |
 | html-concat.js:15:3:15:8 | buffer |
-| html-concat.js:15:3:15:15 | buffer |
+| html-concat.js:15:3:15:8 | buffer |
 | html-concat.js:15:3:15:15 | buffer += '!' |
 | html-concat.js:15:13:15:15 | '!' |
 | tst.js:3:3:3:3 | x |
-| tst.js:3:3:3:12 | x |
+| tst.js:3:3:3:3 | x |
 | tst.js:3:3:3:12 | x += "two" |
 | tst.js:3:8:3:12 | "two" |
 | tst.js:4:3:4:3 | x |
-| tst.js:4:3:4:14 | x |
+| tst.js:4:3:4:3 | x |
 | tst.js:4:3:4:14 | x += "three" |
 | tst.js:4:8:4:14 | "three" |
 | tst.js:5:3:5:3 | x |
-| tst.js:5:3:5:13 | x |
+| tst.js:5:3:5:3 | x |
 | tst.js:5:3:5:13 | x += "four" |
 | tst.js:5:8:5:13 | "four" |
 | tst.js:12:5:12:5 | x |
-| tst.js:12:5:12:26 | x |
+| tst.js:12:5:12:5 | x |
 | tst.js:12:5:12:26 | x += "o ... + "two" |
 | tst.js:12:10:12:14 | "one" |
 | tst.js:12:10:12:18 | "one" + y |
@@ -294,14 +294,14 @@ concatenationNode
 | tst.js:12:18:12:18 | y |
 | tst.js:12:22:12:26 | "two" |
 | tst.js:14:3:14:3 | x |
-| tst.js:14:3:14:13 | x |
+| tst.js:14:3:14:3 | x |
 | tst.js:14:3:14:13 | x += "last" |
 | tst.js:14:8:14:13 | "last" |
 | tst.js:19:11:19:15 | "one" |
 | tst.js:19:11:19:23 | "one" + "two" |
 | tst.js:19:19:19:23 | "two" |
 | tst.js:20:3:20:3 | x |
-| tst.js:20:3:20:25 | x |
+| tst.js:20:3:20:3 | x |
 | tst.js:20:3:20:25 | x += (" ... "four") |
 | tst.js:20:8:20:25 | ("three" + "four") |
 | tst.js:20:9:20:15 | "three" |
@@ -349,11 +349,11 @@ concatenationNode
 | tst.js:77:30:77:36 | "three" |
 | tst.js:79:12:79:23 | array.join() |
 | tst.js:87:5:87:5 | x |
-| tst.js:87:5:87:14 | x |
+| tst.js:87:5:87:5 | x |
 | tst.js:87:5:87:14 | x += 'two' |
 | tst.js:87:10:87:14 | 'two' |
 | tst.js:89:3:89:3 | x |
-| tst.js:89:3:89:14 | x |
+| tst.js:89:3:89:3 | x |
 | tst.js:89:3:89:14 | x += 'three' |
 | tst.js:89:8:89:14 | 'three' |
 | tst.js:95:7:95:7 | x |
@@ -396,46 +396,46 @@ operand
 | html-concat.js:7:18:10:24 | `\\n    H ... m!</i>` | 0 | html-concat.js:7:19:8:10 | \\n    Hello  |
 | html-concat.js:7:18:10:24 | `\\n    H ... m!</i>` | 1 | html-concat.js:8:13:8:13 | x |
 | html-concat.js:7:18:10:24 | `\\n    H ... m!</i>` | 2 | html-concat.js:8:15:10:23 | .\\n    \\n ... um!</i> |
-| html-concat.js:13:3:13:18 | buffer | 0 | html-concat.js:13:3:13:8 | buffer |
-| html-concat.js:13:3:13:18 | buffer | 1 | html-concat.js:13:13:13:18 | '<li>' |
+| html-concat.js:13:3:13:8 | buffer | 0 | html-concat.js:13:3:13:8 | buffer |
+| html-concat.js:13:3:13:8 | buffer | 1 | html-concat.js:13:13:13:18 | '<li>' |
 | html-concat.js:13:3:13:18 | buffer += '<li>' | 0 | html-concat.js:13:3:13:8 | buffer |
 | html-concat.js:13:3:13:18 | buffer += '<li>' | 1 | html-concat.js:13:13:13:18 | '<li>' |
-| html-concat.js:14:3:14:13 | buffer | 0 | html-concat.js:14:3:14:8 | buffer |
-| html-concat.js:14:3:14:13 | buffer | 1 | html-concat.js:14:13:14:13 | x |
+| html-concat.js:14:3:14:8 | buffer | 0 | html-concat.js:14:3:14:8 | buffer |
+| html-concat.js:14:3:14:8 | buffer | 1 | html-concat.js:14:13:14:13 | x |
 | html-concat.js:14:3:14:13 | buffer += x | 0 | html-concat.js:14:3:14:8 | buffer |
 | html-concat.js:14:3:14:13 | buffer += x | 1 | html-concat.js:14:13:14:13 | x |
-| html-concat.js:15:3:15:15 | buffer | 0 | html-concat.js:15:3:15:8 | buffer |
-| html-concat.js:15:3:15:15 | buffer | 1 | html-concat.js:15:13:15:15 | '!' |
+| html-concat.js:15:3:15:8 | buffer | 0 | html-concat.js:15:3:15:8 | buffer |
+| html-concat.js:15:3:15:8 | buffer | 1 | html-concat.js:15:13:15:15 | '!' |
 | html-concat.js:15:3:15:15 | buffer += '!' | 0 | html-concat.js:15:3:15:8 | buffer |
 | html-concat.js:15:3:15:15 | buffer += '!' | 1 | html-concat.js:15:13:15:15 | '!' |
-| tst.js:3:3:3:12 | x | 0 | tst.js:3:3:3:3 | x |
-| tst.js:3:3:3:12 | x | 1 | tst.js:3:8:3:12 | "two" |
+| tst.js:3:3:3:3 | x | 0 | tst.js:3:3:3:3 | x |
+| tst.js:3:3:3:3 | x | 1 | tst.js:3:8:3:12 | "two" |
 | tst.js:3:3:3:12 | x += "two" | 0 | tst.js:3:3:3:3 | x |
 | tst.js:3:3:3:12 | x += "two" | 1 | tst.js:3:8:3:12 | "two" |
-| tst.js:4:3:4:14 | x | 0 | tst.js:4:3:4:3 | x |
-| tst.js:4:3:4:14 | x | 1 | tst.js:4:8:4:14 | "three" |
+| tst.js:4:3:4:3 | x | 0 | tst.js:4:3:4:3 | x |
+| tst.js:4:3:4:3 | x | 1 | tst.js:4:8:4:14 | "three" |
 | tst.js:4:3:4:14 | x += "three" | 0 | tst.js:4:3:4:3 | x |
 | tst.js:4:3:4:14 | x += "three" | 1 | tst.js:4:8:4:14 | "three" |
-| tst.js:5:3:5:13 | x | 0 | tst.js:5:3:5:3 | x |
-| tst.js:5:3:5:13 | x | 1 | tst.js:5:8:5:13 | "four" |
+| tst.js:5:3:5:3 | x | 0 | tst.js:5:3:5:3 | x |
+| tst.js:5:3:5:3 | x | 1 | tst.js:5:8:5:13 | "four" |
 | tst.js:5:3:5:13 | x += "four" | 0 | tst.js:5:3:5:3 | x |
 | tst.js:5:3:5:13 | x += "four" | 1 | tst.js:5:8:5:13 | "four" |
-| tst.js:12:5:12:26 | x | 0 | tst.js:12:5:12:5 | x |
-| tst.js:12:5:12:26 | x | 1 | tst.js:12:10:12:26 | "one" + y + "two" |
+| tst.js:12:5:12:5 | x | 0 | tst.js:12:5:12:5 | x |
+| tst.js:12:5:12:5 | x | 1 | tst.js:12:10:12:26 | "one" + y + "two" |
 | tst.js:12:5:12:26 | x += "o ... + "two" | 0 | tst.js:12:5:12:5 | x |
 | tst.js:12:5:12:26 | x += "o ... + "two" | 1 | tst.js:12:10:12:26 | "one" + y + "two" |
 | tst.js:12:10:12:18 | "one" + y | 0 | tst.js:12:10:12:14 | "one" |
 | tst.js:12:10:12:18 | "one" + y | 1 | tst.js:12:18:12:18 | y |
 | tst.js:12:10:12:26 | "one" + y + "two" | 0 | tst.js:12:10:12:18 | "one" + y |
 | tst.js:12:10:12:26 | "one" + y + "two" | 1 | tst.js:12:22:12:26 | "two" |
-| tst.js:14:3:14:13 | x | 0 | tst.js:14:3:14:3 | x |
-| tst.js:14:3:14:13 | x | 1 | tst.js:14:8:14:13 | "last" |
+| tst.js:14:3:14:3 | x | 0 | tst.js:14:3:14:3 | x |
+| tst.js:14:3:14:3 | x | 1 | tst.js:14:8:14:13 | "last" |
 | tst.js:14:3:14:13 | x += "last" | 0 | tst.js:14:3:14:3 | x |
 | tst.js:14:3:14:13 | x += "last" | 1 | tst.js:14:8:14:13 | "last" |
 | tst.js:19:11:19:23 | "one" + "two" | 0 | tst.js:19:11:19:15 | "one" |
 | tst.js:19:11:19:23 | "one" + "two" | 1 | tst.js:19:19:19:23 | "two" |
-| tst.js:20:3:20:25 | x | 0 | tst.js:20:3:20:3 | x |
-| tst.js:20:3:20:25 | x | 1 | tst.js:20:8:20:25 | ("three" + "four") |
+| tst.js:20:3:20:3 | x | 0 | tst.js:20:3:20:3 | x |
+| tst.js:20:3:20:3 | x | 1 | tst.js:20:8:20:25 | ("three" + "four") |
 | tst.js:20:3:20:25 | x += (" ... "four") | 0 | tst.js:20:3:20:3 | x |
 | tst.js:20:3:20:25 | x += (" ... "four") | 1 | tst.js:20:8:20:25 | ("three" + "four") |
 | tst.js:20:9:20:24 | "three" + "four" | 0 | tst.js:20:9:20:15 | "three" |
@@ -472,12 +472,12 @@ operand
 | tst.js:77:15:77:37 | ["one", ... three"] | 1 | tst.js:77:23:77:27 | "two" |
 | tst.js:77:15:77:37 | ["one", ... three"] | 2 | tst.js:77:30:77:36 | "three" |
 | tst.js:79:12:79:23 | array.join() | 0 | tst.js:77:15:77:37 | ["one", ... three"] |
-| tst.js:87:5:87:14 | x | 0 | tst.js:87:5:87:5 | x |
-| tst.js:87:5:87:14 | x | 1 | tst.js:87:10:87:14 | 'two' |
+| tst.js:87:5:87:5 | x | 0 | tst.js:87:5:87:5 | x |
+| tst.js:87:5:87:5 | x | 1 | tst.js:87:10:87:14 | 'two' |
 | tst.js:87:5:87:14 | x += 'two' | 0 | tst.js:87:5:87:5 | x |
 | tst.js:87:5:87:14 | x += 'two' | 1 | tst.js:87:10:87:14 | 'two' |
-| tst.js:89:3:89:14 | x | 0 | tst.js:89:3:89:3 | x |
-| tst.js:89:3:89:14 | x | 1 | tst.js:89:8:89:14 | 'three' |
+| tst.js:89:3:89:3 | x | 0 | tst.js:89:3:89:3 | x |
+| tst.js:89:3:89:3 | x | 1 | tst.js:89:8:89:14 | 'three' |
 | tst.js:89:3:89:14 | x += 'three' | 0 | tst.js:89:3:89:3 | x |
 | tst.js:89:3:89:14 | x += 'three' | 1 | tst.js:89:8:89:14 | 'three' |
 | tst.js:95:7:95:30 | x.conca ... three') | 0 | tst.js:95:7:95:7 | x |
@@ -553,7 +553,7 @@ htmlRoot
 | html-concat.js:3:14:3:26 | `<B>${x}</B>` |
 | html-concat.js:5:21:5:47 | `Hey <s ... trong>` |
 | html-concat.js:7:18:10:24 | `\\n    H ... m!</i>` |
-| html-concat.js:13:3:13:18 | buffer |
+| html-concat.js:13:3:13:8 | buffer |
 | html-concat.js:13:3:13:18 | buffer += '<li>' |
 htmlLeaf
 | html-concat.js:2:15:2:17 | <b> |
diff --git a/javascript/ql/test/library-tests/TripleDot/array-with.js b/javascript/ql/test/library-tests/TripleDot/array-with.js
new file mode 100644
index 00000000000..73c09a434ac
--- /dev/null
+++ b/javascript/ql/test/library-tests/TripleDot/array-with.js
@@ -0,0 +1,25 @@
+function t1() {
+    const arr = [1, 2, 3];
+    const newArr = arr.with(1, source('with.1'));
+    sink(newArr[1]); // $ hasValueFlow=with.1
+}
+
+function t2() {
+    const arr = [source('with.2.1'), 2, source('with.2.3')];
+    const newArr = arr.with(1, 'replaced');
+    sink(newArr[0]); // $ hasValueFlow=with.2.1
+    sink(newArr[2]); // $ hasValueFlow=with.2.3
+}
+
+function t3() {
+    const arr = [1, 2, 3];
+    const index = source('with.3.index');
+    const newArr = arr.with(index, 'new value');
+    // No assertions here as the index is tainted, not the value
+}
+
+function t4() {
+    const arr = [1, 2, 3];
+    const newArr = arr.with(1, source('with.4'));
+    sink(arr[1]); // This should NOT have value flow as with() returns a new array
+}
diff --git a/javascript/ql/test/library-tests/TripleDot/promise-try.js b/javascript/ql/test/library-tests/TripleDot/promise-try.js
new file mode 100644
index 00000000000..9c96ee73426
--- /dev/null
+++ b/javascript/ql/test/library-tests/TripleDot/promise-try.js
@@ -0,0 +1,29 @@
+async function t1() {
+    const promise = Promise.try(() => {
+        return source('try.1');
+    });
+    sink(await promise); // $ hasValueFlow=try.1
+}
+
+async function t2() {
+    const promise = Promise.try((x) => {
+        return x
+    }, source('try.2'));
+    sink(await promise); // $ hasValueFlow=try.2
+}
+
+async function t3() {
+    const promise = Promise.try((x) => {
+        throw x;
+    }, source('try.3'));
+    promise.catch(err => {
+        sink(err); // $ hasValueFlow=try.3
+    });
+}
+
+async function t4() {
+    const promise = Promise.try((x, y) => {
+        return y;
+    }, source('try.4.1'), source('try.4.2'));
+    sink(await promise); //  $ hasValueFlow=try.4.2
+}
diff --git a/javascript/ql/test/library-tests/TypeScript/ImportDefer/test-js.js b/javascript/ql/test/library-tests/TypeScript/ImportDefer/test-js.js
new file mode 100644
index 00000000000..a3a80435538
--- /dev/null
+++ b/javascript/ql/test/library-tests/TypeScript/ImportDefer/test-js.js
@@ -0,0 +1,3 @@
+import defer * as deferred from "somewhere";
+import * as normal from "somewhere";
+import defer from "somewhere";
diff --git a/javascript/ql/test/library-tests/TypeScript/ImportDefer/test.expected b/javascript/ql/test/library-tests/TypeScript/ImportDefer/test.expected
new file mode 100644
index 00000000000..c5d2d2e3f3d
--- /dev/null
+++ b/javascript/ql/test/library-tests/TypeScript/ImportDefer/test.expected
@@ -0,0 +1,2 @@
+| test-js.js:1:1:1:44 | import  ... where"; |
+| tst.ts:1:1:1:44 | import  ... where"; |
diff --git a/javascript/ql/test/library-tests/TypeScript/ImportDefer/test.ql b/javascript/ql/test/library-tests/TypeScript/ImportDefer/test.ql
new file mode 100644
index 00000000000..b512330a096
--- /dev/null
+++ b/javascript/ql/test/library-tests/TypeScript/ImportDefer/test.ql
@@ -0,0 +1,3 @@
+import javascript
+
+query predicate deferredImports(ImportDeclaration decl) { decl.isDeferredImport() }
diff --git a/javascript/ql/test/library-tests/TypeScript/ImportDefer/tst.ts b/javascript/ql/test/library-tests/TypeScript/ImportDefer/tst.ts
new file mode 100644
index 00000000000..513394b4c14
--- /dev/null
+++ b/javascript/ql/test/library-tests/TypeScript/ImportDefer/tst.ts
@@ -0,0 +1,4 @@
+import defer * as deferred from "somewhere";
+import type * as t from "somewhere";
+import * as normal from "somewhere";
+import defer from "somewhere";
diff --git a/javascript/ql/test/library-tests/TypeScript/RegressionTests/EmptyName/test.ts b/javascript/ql/test/library-tests/TypeScript/RegressionTests/EmptyName/test.ts
index 3082f40600f..8e25b67918a 100644
--- a/javascript/ql/test/library-tests/TypeScript/RegressionTests/EmptyName/test.ts
+++ b/javascript/ql/test/library-tests/TypeScript/RegressionTests/EmptyName/test.ts
@@ -1,9 +1,9 @@
 type Mapped<MK extends string = ''> = {
-        [mk in MK]: string
+        [mk in MK]: string
     };
 
 export function fn(ev: Mapped) {
-    const props: Mapped = {
-        ...ev
-    };
+    const props: Mapped = {
+        ...ev
+    };
 }
diff --git a/javascript/ql/test/library-tests/TypeScript/RegressionTests/SemicolonInName/test.ts b/javascript/ql/test/library-tests/TypeScript/RegressionTests/SemicolonInName/test.ts
index 1726e5abafb..a3ed2046836 100644
--- a/javascript/ql/test/library-tests/TypeScript/RegressionTests/SemicolonInName/test.ts
+++ b/javascript/ql/test/library-tests/TypeScript/RegressionTests/SemicolonInName/test.ts
@@ -1,9 +1,9 @@
 type Mapped<MK extends string = ';'> = {
-        [mk in MK]: string
+        [mk in MK]: string
     };
 
 export function fn(ev: Mapped) {
-    const props: Mapped = {
-        ...ev
-    };
+    const props: Mapped = {
+        ...ev
+    };
 }
diff --git a/javascript/ql/test/library-tests/frameworks/AsyncPackage/AsyncTaintTracking.expected b/javascript/ql/test/library-tests/frameworks/AsyncPackage/AsyncTaintTracking.expected
index 168f5ec5ace..95ee8fe452b 100644
--- a/javascript/ql/test/library-tests/frameworks/AsyncPackage/AsyncTaintTracking.expected
+++ b/javascript/ql/test/library-tests/frameworks/AsyncPackage/AsyncTaintTracking.expected
@@ -1,12 +1,24 @@
 legacyDataFlowDifference
-| each.js:11:9:11:16 | source() | each.js:13:12:13:15 | item | only flow with OLD data flow library |
-| map.js:10:13:10:20 | source() | map.js:12:14:12:17 | item | only flow with OLD data flow library |
-| map.js:26:13:26:20 | source() | map.js:28:27:28:32 | result | only flow with OLD data flow library |
-| sortBy.js:10:22:10:29 | source() | sortBy.js:12:27:12:32 | result | only flow with OLD data flow library |
+| each.js:11:9:11:16 | source() | each.js:13:12:13:15 | item | only flow with NEW data flow library |
+| map.js:14:13:14:20 | source() | map.js:16:14:16:17 | item | only flow with NEW data flow library |
+| map.js:30:13:30:20 | source() | map.js:32:27:32:32 | result | only flow with NEW data flow library |
+| map.js:40:13:40:20 | source() | map.js:11:10:11:10 | x | only flow with NEW data flow library |
+| map.js:42:12:42:19 | source() | map.js:11:10:11:10 | x | only flow with NEW data flow library |
+| map.js:44:16:44:23 | source() | map.js:11:10:11:10 | x | only flow with NEW data flow library |
+| map.js:46:18:46:25 | source() | map.js:11:10:11:10 | x | only flow with NEW data flow library |
+| sortBy.js:10:22:10:29 | source() | sortBy.js:12:27:12:32 | result | only flow with NEW data flow library |
 #select
-| map.js:20:19:20:26 | source() | map.js:23:27:23:32 | result |
-| waterfall.js:8:30:8:37 | source() | waterfall.js:11:12:11:16 | taint |
-| waterfall.js:8:30:8:37 | source() | waterfall.js:20:10:20:14 | taint |
-| waterfall.js:28:18:28:25 | source() | waterfall.js:39:10:39:12 | err |
-| waterfall.js:46:22:46:29 | source() | waterfall.js:49:12:49:16 | taint |
-| waterfall.js:46:22:46:29 | source() | waterfall.js:55:10:55:14 | taint |
+| each.js:11:9:11:16 | source() | each.js:13:12:13:15 | item |
+| map.js:14:13:14:20 | source() | map.js:16:14:16:17 | item |
+| map.js:24:19:24:26 | source() | map.js:27:27:27:32 | result |
+| map.js:30:13:30:20 | source() | map.js:32:27:32:32 | result |
+| map.js:40:13:40:20 | source() | map.js:11:10:11:10 | x |
+| map.js:42:12:42:19 | source() | map.js:11:10:11:10 | x |
+| map.js:44:16:44:23 | source() | map.js:11:10:11:10 | x |
+| map.js:46:18:46:25 | source() | map.js:11:10:11:10 | x |
+| sortBy.js:10:22:10:29 | source() | sortBy.js:12:27:12:32 | result |
+| waterfall.js:16:30:16:37 | source() | waterfall.js:19:12:19:16 | taint |
+| waterfall.js:16:30:16:37 | source() | waterfall.js:28:10:28:14 | taint |
+| waterfall.js:36:18:36:25 | source() | waterfall.js:47:10:47:12 | err |
+| waterfall.js:54:22:54:29 | source() | waterfall.js:57:12:57:16 | taint |
+| waterfall.js:54:22:54:29 | source() | waterfall.js:63:10:63:14 | taint |
diff --git a/javascript/ql/test/library-tests/frameworks/AsyncPackage/map.js b/javascript/ql/test/library-tests/frameworks/AsyncPackage/map.js
index ed7e64b01fa..b1e9ecc883b 100644
--- a/javascript/ql/test/library-tests/frameworks/AsyncPackage/map.js
+++ b/javascript/ql/test/library-tests/frameworks/AsyncPackage/map.js
@@ -7,6 +7,10 @@ function sink(x) {
     console.log(x)
 }
 
+function call_sink(x) {
+    sink(x)
+}
+
 async_.map([source()],
     (item, cb) => {
         sink(item), // NOT OK
@@ -32,3 +36,12 @@ async_.map(['safe'],
     (item, cb) => cb(null, item),
     (err, result) => sink(result) // OK
 );
+
+async_.map([source()], call_sink) // NOT OK
+
+async_.map(source().prop, call_sink) // NOT OK
+
+async_.map({a: source()}, call_sink) // NOT OK
+
+async_.mapLimit([source()], 1, call_sink) // NOT OK
+
diff --git a/javascript/ql/test/library-tests/frameworks/AsyncPackage/waterfall.js b/javascript/ql/test/library-tests/frameworks/AsyncPackage/waterfall.js
index 439ac48674a..8554d048d98 100644
--- a/javascript/ql/test/library-tests/frameworks/AsyncPackage/waterfall.js
+++ b/javascript/ql/test/library-tests/frameworks/AsyncPackage/waterfall.js
@@ -1,7 +1,15 @@
 let async_ = require('async');
 let waterfall = require('a-sync-waterfall');
 
-var source, sink, somethingWrong;
+function source() {
+    return 'TAINT'
+}
+
+function sink(x) {
+    console.log(x)
+}
+
+var somethingWrong;
 
 async_.waterfall([
     function(callback) {
diff --git a/javascript/ql/test/library-tests/frameworks/Electron/tests.expected b/javascript/ql/test/library-tests/frameworks/Electron/tests.expected
index 72fb0a737b8..a51c8e632b1 100644
--- a/javascript/ql/test/library-tests/frameworks/Electron/tests.expected
+++ b/javascript/ql/test/library-tests/frameworks/Electron/tests.expected
@@ -1,7 +1,7 @@
 browserObject
-| electron.js:3:5:3:48 | bw |
+| electron.js:3:5:3:6 | bw |
 | electron.js:3:10:3:48 | new Bro ... s: {}}) |
-| electron.js:4:5:4:46 | bv |
+| electron.js:4:5:4:6 | bv |
 | electron.js:4:10:4:46 | new Bro ... s: {}}) |
 | electron.js:35:1:37:1 | return of function foo |
 | electron.js:35:14:35:14 | x |
@@ -11,7 +11,7 @@ browserObject
 | electron.js:39:5:39:6 | bw |
 | electron.js:40:1:40:7 | foo(bv) |
 | electron.js:40:5:40:6 | bv |
-| electron.js:62:7:62:59 | win |
+| electron.js:62:7:62:9 | win |
 | electron.js:62:13:62:59 | new Bro ... 1500 }) |
 | electron.js:63:3:63:5 | win |
 | electron.js:65:18:65:20 | win |
diff --git a/javascript/ql/test/library-tests/frameworks/Express/src/json.js b/javascript/ql/test/library-tests/frameworks/Express/src/json.js
new file mode 100644
index 00000000000..6b87cad68cf
--- /dev/null
+++ b/javascript/ql/test/library-tests/frameworks/Express/src/json.js
@@ -0,0 +1,10 @@
+const express = require('express');
+const app = express();
+
+app.get('/test/json', function(req, res) {
+    res.json(req.query.data);
+});
+
+app.get('/test/jsonp', function(req, res) {
+    res.jsonp(req.query.data);
+});
diff --git a/javascript/ql/test/library-tests/frameworks/Express/tests.expected b/javascript/ql/test/library-tests/frameworks/Express/tests.expected
index ec4253740f7..9007a1ed984 100644
--- a/javascript/ql/test/library-tests/frameworks/Express/tests.expected
+++ b/javascript/ql/test/library-tests/frameworks/Express/tests.expected
@@ -131,6 +131,12 @@ test_isRequest
 | src/inheritedFromNode.js:4:24:4:26 | req |
 | src/inheritedFromNode.js:4:24:4:26 | req |
 | src/inheritedFromNode.js:7:2:7:4 | req |
+| src/json.js:4:32:4:34 | req |
+| src/json.js:4:32:4:34 | req |
+| src/json.js:5:14:5:16 | req |
+| src/json.js:8:33:8:35 | req |
+| src/json.js:8:33:8:35 | req |
+| src/json.js:9:15:9:17 | req |
 | src/middleware-flow.js:5:20:5:22 | req |
 | src/middleware-flow.js:5:20:5:22 | req |
 | src/middleware-flow.js:6:5:6:7 | req |
@@ -201,6 +207,8 @@ test_RouteSetup
 | src/express.js:65:1:69:2 | app.get ... es);\\n}) | src/express.js:2:11:2:19 | express() | false |
 | src/express.js:71:1:75:2 | app.get ... es);\\n}) | src/express.js:2:11:2:19 | express() | false |
 | src/inheritedFromNode.js:4:1:8:2 | app.pos ... url;\\n}) | src/inheritedFromNode.js:2:11:2:19 | express() | false |
+| src/json.js:4:1:6:2 | app.get ... ta);\\n}) | src/json.js:2:13:2:21 | express() | false |
+| src/json.js:8:1:10:2 | app.get ... ta);\\n}) | src/json.js:2:13:2:21 | express() | false |
 | src/middleware-flow.js:13:5:13:25 | router. ... tallDb) | src/middleware-flow.js:2:13:2:21 | express() | true |
 | src/middleware-flow.js:17:5:21:6 | router. ... \\n    }) | src/middleware-flow.js:2:13:2:21 | express() | false |
 | src/middleware-flow.js:39:1:43:2 | unrelat ... .db;\\n}) | src/middleware-flow.js:37:22:37:30 | express() | false |
@@ -345,6 +353,14 @@ test_isResponse
 | src/inheritedFromNode.js:4:29:4:31 | res |
 | src/inheritedFromNode.js:5:2:5:4 | res |
 | src/inheritedFromNode.js:6:2:6:4 | res |
+| src/json.js:4:37:4:39 | res |
+| src/json.js:4:37:4:39 | res |
+| src/json.js:5:5:5:7 | res |
+| src/json.js:5:5:5:28 | res.jso ... y.data) |
+| src/json.js:8:38:8:40 | res |
+| src/json.js:8:38:8:40 | res |
+| src/json.js:9:5:9:7 | res |
+| src/json.js:9:5:9:29 | res.jso ... y.data) |
 | src/middleware-flow.js:5:25:5:27 | res |
 | src/middleware-flow.js:17:30:17:32 | res |
 | src/middleware-flow.js:23:23:23:25 | res |
@@ -575,6 +591,12 @@ test_RequestExpr
 | src/inheritedFromNode.js:4:24:4:26 | req | src/inheritedFromNode.js:4:15:8:1 | functio ... .url;\\n} |
 | src/inheritedFromNode.js:4:24:4:26 | req | src/inheritedFromNode.js:4:15:8:1 | functio ... .url;\\n} |
 | src/inheritedFromNode.js:7:2:7:4 | req | src/inheritedFromNode.js:4:15:8:1 | functio ... .url;\\n} |
+| src/json.js:4:32:4:34 | req | src/json.js:4:23:6:1 | functio ... ata);\\n} |
+| src/json.js:4:32:4:34 | req | src/json.js:4:23:6:1 | functio ... ata);\\n} |
+| src/json.js:5:14:5:16 | req | src/json.js:4:23:6:1 | functio ... ata);\\n} |
+| src/json.js:8:33:8:35 | req | src/json.js:8:24:10:1 | functio ... ata);\\n} |
+| src/json.js:8:33:8:35 | req | src/json.js:8:24:10:1 | functio ... ata);\\n} |
+| src/json.js:9:15:9:17 | req | src/json.js:8:24:10:1 | functio ... ata);\\n} |
 | src/middleware-flow.js:5:20:5:22 | req | src/middleware-flow.js:5:1:10:1 | functio ... xt();\\n} |
 | src/middleware-flow.js:5:20:5:22 | req | src/middleware-flow.js:5:1:10:1 | functio ... xt();\\n} |
 | src/middleware-flow.js:6:5:6:7 | req | src/middleware-flow.js:5:1:10:1 | functio ... xt();\\n} |
@@ -627,6 +649,7 @@ test_appCreation
 | src/express4.js:2:11:2:19 | express() |
 | src/express.js:2:11:2:19 | express() |
 | src/inheritedFromNode.js:2:11:2:19 | express() |
+| src/json.js:2:13:2:21 | express() |
 | src/middleware-flow.js:2:13:2:21 | express() |
 | src/middleware-flow.js:37:22:37:30 | express() |
 | src/params.js:2:11:2:19 | express() |
@@ -651,6 +674,8 @@ test_ResponseBody
 | src/express.js:61:12:61:25 | req.params.foo | src/express.js:59:23:63:1 | functio ... res);\\n} |
 | src/express.js:67:12:67:25 | req.params.foo | src/express.js:65:27:69:1 | functio ... res);\\n} |
 | src/express.js:73:12:73:19 | req.path | src/express.js:71:23:75:1 | functio ... res);\\n} |
+| src/json.js:5:14:5:27 | req.query.data | src/json.js:4:23:6:1 | functio ... ata);\\n} |
+| src/json.js:9:15:9:28 | req.query.data | src/json.js:8:24:10:1 | functio ... ata);\\n} |
 | src/params.js:8:18:8:22 | value | src/params.js:4:18:12:1 | (req, r ...     }\\n} |
 | src/params.js:15:12:15:18 | "Hello" | src/params.js:14:24:16:1 | functio ... lo");\\n} |
 test_ResponseExpr
@@ -820,6 +845,14 @@ test_ResponseExpr
 | src/inheritedFromNode.js:4:29:4:31 | res | src/inheritedFromNode.js:4:15:8:1 | functio ... .url;\\n} |
 | src/inheritedFromNode.js:5:2:5:4 | res | src/inheritedFromNode.js:4:15:8:1 | functio ... .url;\\n} |
 | src/inheritedFromNode.js:6:2:6:4 | res | src/inheritedFromNode.js:4:15:8:1 | functio ... .url;\\n} |
+| src/json.js:4:37:4:39 | res | src/json.js:4:23:6:1 | functio ... ata);\\n} |
+| src/json.js:4:37:4:39 | res | src/json.js:4:23:6:1 | functio ... ata);\\n} |
+| src/json.js:5:5:5:7 | res | src/json.js:4:23:6:1 | functio ... ata);\\n} |
+| src/json.js:5:5:5:28 | res.jso ... y.data) | src/json.js:4:23:6:1 | functio ... ata);\\n} |
+| src/json.js:8:38:8:40 | res | src/json.js:8:24:10:1 | functio ... ata);\\n} |
+| src/json.js:8:38:8:40 | res | src/json.js:8:24:10:1 | functio ... ata);\\n} |
+| src/json.js:9:5:9:7 | res | src/json.js:8:24:10:1 | functio ... ata);\\n} |
+| src/json.js:9:5:9:29 | res.jso ... y.data) | src/json.js:8:24:10:1 | functio ... ata);\\n} |
 | src/middleware-flow.js:5:25:5:27 | res | src/middleware-flow.js:5:1:10:1 | functio ... xt();\\n} |
 | src/middleware-flow.js:17:30:17:32 | res | src/middleware-flow.js:17:24:21:5 | (req, r ... ;\\n    } |
 | src/middleware-flow.js:23:23:23:25 | res | src/middleware-flow.js:23:17:23:41 | (req, r ... q.db; } |
@@ -940,6 +973,8 @@ test_RouteHandler
 | src/express.js:65:27:69:1 | functio ... res);\\n} | src/express.js:65:36:65:38 | req | src/express.js:65:41:65:43 | res |
 | src/express.js:71:23:75:1 | functio ... res);\\n} | src/express.js:71:32:71:34 | req | src/express.js:71:37:71:39 | res |
 | src/inheritedFromNode.js:4:15:8:1 | functio ... .url;\\n} | src/inheritedFromNode.js:4:24:4:26 | req | src/inheritedFromNode.js:4:29:4:31 | res |
+| src/json.js:4:23:6:1 | functio ... ata);\\n} | src/json.js:4:32:4:34 | req | src/json.js:4:37:4:39 | res |
+| src/json.js:8:24:10:1 | functio ... ata);\\n} | src/json.js:8:33:8:35 | req | src/json.js:8:38:8:40 | res |
 | src/middleware-flow.js:5:1:10:1 | functio ... xt();\\n} | src/middleware-flow.js:5:20:5:22 | req | src/middleware-flow.js:5:25:5:27 | res |
 | src/middleware-flow.js:17:24:21:5 | (req, r ... ;\\n    } | src/middleware-flow.js:17:25:17:27 | req | src/middleware-flow.js:17:30:17:32 | res |
 | src/middleware-flow.js:23:17:23:41 | (req, r ... q.db; } | src/middleware-flow.js:23:18:23:20 | req | src/middleware-flow.js:23:23:23:25 | res |
@@ -972,6 +1007,8 @@ test_HeaderDefinition
 | src/express.js:66:3:66:42 | res.hea ... plain") | src/express.js:65:27:69:1 | functio ... res);\\n} |
 | src/express.js:72:3:72:41 | res.hea ... /html") | src/express.js:71:23:75:1 | functio ... res);\\n} |
 | src/inheritedFromNode.js:6:2:6:16 | res.setHeader() | src/inheritedFromNode.js:4:15:8:1 | functio ... .url;\\n} |
+| src/json.js:5:5:5:28 | res.jso ... y.data) | src/json.js:4:23:6:1 | functio ... ata);\\n} |
+| src/json.js:9:5:9:29 | res.jso ... y.data) | src/json.js:8:24:10:1 | functio ... ata);\\n} |
 | src/responseExprs.js:19:5:19:16 | res.append() | src/responseExprs.js:16:30:42:1 | functio ...     }\\n} |
 | src/responseExprs.js:37:5:37:28 | f(res.a ... ppend() | src/responseExprs.js:16:30:42:1 | functio ...     }\\n} |
 | src/responseExprs.js:37:7:37:18 | res.append() | src/responseExprs.js:16:30:42:1 | functio ...     }\\n} |
@@ -1036,6 +1073,8 @@ test_RouteHandlerExpr
 | src/express.js:65:27:69:1 | functio ... res);\\n} | src/express.js:65:1:69:2 | app.get ... es);\\n}) | true |
 | src/express.js:71:23:75:1 | functio ... res);\\n} | src/express.js:71:1:75:2 | app.get ... es);\\n}) | true |
 | src/inheritedFromNode.js:4:15:8:1 | functio ... .url;\\n} | src/inheritedFromNode.js:4:1:8:2 | app.pos ... url;\\n}) | true |
+| src/json.js:4:23:6:1 | functio ... ata);\\n} | src/json.js:4:1:6:2 | app.get ... ta);\\n}) | true |
+| src/json.js:8:24:10:1 | functio ... ata);\\n} | src/json.js:8:1:10:2 | app.get ... ta);\\n}) | true |
 | src/middleware-flow.js:13:16:13:24 | installDb | src/middleware-flow.js:13:5:13:25 | router. ... tallDb) | false |
 | src/middleware-flow.js:17:24:21:5 | (req, r ... ;\\n    } | src/middleware-flow.js:17:5:21:6 | router. ... \\n    }) | true |
 | src/middleware-flow.js:27:23:27:32 | routers[p] | src/middleware-flow.js:27:9:27:33 | router. ... ers[p]) | true |
@@ -1068,6 +1107,7 @@ test_isRouterCreation
 | src/express4.js:2:11:2:19 | express() |
 | src/express.js:2:11:2:19 | express() |
 | src/inheritedFromNode.js:2:11:2:19 | express() |
+| src/json.js:2:13:2:21 | express() |
 | src/middleware-flow.js:2:13:2:21 | express() |
 | src/middleware-flow.js:37:22:37:30 | express() |
 | src/params.js:2:11:2:19 | express() |
@@ -1111,6 +1151,8 @@ test_RequestInputAccess
 | src/express.js:67:12:67:25 | req.params.foo | parameter | src/express.js:65:27:69:1 | functio ... res);\\n} |
 | src/express.js:73:12:73:19 | req.path | url | src/express.js:71:23:75:1 | functio ... res);\\n} |
 | src/inheritedFromNode.js:7:2:7:8 | req.url | url | src/inheritedFromNode.js:4:15:8:1 | functio ... .url;\\n} |
+| src/json.js:5:14:5:27 | req.query.data | parameter | src/json.js:4:23:6:1 | functio ... ata);\\n} |
+| src/json.js:9:15:9:28 | req.query.data | parameter | src/json.js:8:24:10:1 | functio ... ata);\\n} |
 | src/params.js:4:35:4:39 | value | parameter | src/params.js:4:18:12:1 | (req, r ...     }\\n} |
 | src/params.js:5:17:5:28 | req.query.xx | parameter | src/params.js:4:18:12:1 | (req, r ...     }\\n} |
 | src/params.js:6:17:6:24 | req.body | body | src/params.js:4:18:12:1 | (req, r ...     }\\n} |
@@ -1125,6 +1167,8 @@ test_ResponseSendArgument
 | src/express.js:61:12:61:25 | req.params.foo | src/express.js:59:23:63:1 | functio ... res);\\n} |
 | src/express.js:67:12:67:25 | req.params.foo | src/express.js:65:27:69:1 | functio ... res);\\n} |
 | src/express.js:73:12:73:19 | req.path | src/express.js:71:23:75:1 | functio ... res);\\n} |
+| src/json.js:5:14:5:27 | req.query.data | src/json.js:4:23:6:1 | functio ... ata);\\n} |
+| src/json.js:9:15:9:28 | req.query.data | src/json.js:8:24:10:1 | functio ... ata);\\n} |
 | src/params.js:8:18:8:22 | value | src/params.js:4:18:12:1 | (req, r ...     }\\n} |
 | src/params.js:15:12:15:18 | "Hello" | src/params.js:14:24:16:1 | functio ... lo");\\n} |
 test_RouteSetup_getRouter
@@ -1182,6 +1226,8 @@ test_RouteSetup_getRouter
 | src/express.js:65:1:69:2 | app.get ... es);\\n}) | src/express.js:2:11:2:19 | express() |
 | src/express.js:71:1:75:2 | app.get ... es);\\n}) | src/express.js:2:11:2:19 | express() |
 | src/inheritedFromNode.js:4:1:8:2 | app.pos ... url;\\n}) | src/inheritedFromNode.js:2:11:2:19 | express() |
+| src/json.js:4:1:6:2 | app.get ... ta);\\n}) | src/json.js:2:13:2:21 | express() |
+| src/json.js:8:1:10:2 | app.get ... ta);\\n}) | src/json.js:2:13:2:21 | express() |
 | src/middleware-flow.js:13:5:13:25 | router. ... tallDb) | src/middleware-flow.js:2:13:2:21 | express() |
 | src/middleware-flow.js:17:5:21:6 | router. ... \\n    }) | src/middleware-flow.js:2:13:2:21 | express() |
 | src/middleware-flow.js:27:9:27:33 | router. ... ers[p]) | src/middleware-flow.js:2:13:2:21 | express() |
@@ -1226,6 +1272,8 @@ test_RouteSetup_getServer
 | src/express.js:65:1:69:2 | app.get ... es);\\n}) | src/express.js:2:11:2:19 | express() |
 | src/express.js:71:1:75:2 | app.get ... es);\\n}) | src/express.js:2:11:2:19 | express() |
 | src/inheritedFromNode.js:4:1:8:2 | app.pos ... url;\\n}) | src/inheritedFromNode.js:2:11:2:19 | express() |
+| src/json.js:4:1:6:2 | app.get ... ta);\\n}) | src/json.js:2:13:2:21 | express() |
+| src/json.js:8:1:10:2 | app.get ... ta);\\n}) | src/json.js:2:13:2:21 | express() |
 | src/middleware-flow.js:13:5:13:25 | router. ... tallDb) | src/middleware-flow.js:2:13:2:21 | express() |
 | src/middleware-flow.js:17:5:21:6 | router. ... \\n    }) | src/middleware-flow.js:2:13:2:21 | express() |
 | src/middleware-flow.js:39:1:43:2 | unrelat ... .db;\\n}) | src/middleware-flow.js:37:22:37:30 | express() |
@@ -1266,6 +1314,8 @@ test_StandardRouteHandler
 | src/express.js:65:27:69:1 | functio ... res);\\n} | src/express.js:2:11:2:19 | express() | src/express.js:65:36:65:38 | req | src/express.js:65:41:65:43 | res |
 | src/express.js:71:23:75:1 | functio ... res);\\n} | src/express.js:2:11:2:19 | express() | src/express.js:71:32:71:34 | req | src/express.js:71:37:71:39 | res |
 | src/inheritedFromNode.js:4:15:8:1 | functio ... .url;\\n} | src/inheritedFromNode.js:2:11:2:19 | express() | src/inheritedFromNode.js:4:24:4:26 | req | src/inheritedFromNode.js:4:29:4:31 | res |
+| src/json.js:4:23:6:1 | functio ... ata);\\n} | src/json.js:2:13:2:21 | express() | src/json.js:4:32:4:34 | req | src/json.js:4:37:4:39 | res |
+| src/json.js:8:24:10:1 | functio ... ata);\\n} | src/json.js:2:13:2:21 | express() | src/json.js:8:33:8:35 | req | src/json.js:8:38:8:40 | res |
 | src/middleware-flow.js:5:1:10:1 | functio ... xt();\\n} | src/middleware-flow.js:2:13:2:21 | express() | src/middleware-flow.js:5:20:5:22 | req | src/middleware-flow.js:5:25:5:27 | res |
 | src/middleware-flow.js:17:24:21:5 | (req, r ... ;\\n    } | src/middleware-flow.js:2:13:2:21 | express() | src/middleware-flow.js:17:25:17:27 | req | src/middleware-flow.js:17:30:17:32 | res |
 | src/middleware-flow.js:39:23:43:1 | (req, r ... s.db;\\n} | src/middleware-flow.js:37:22:37:30 | express() | src/middleware-flow.js:39:24:39:26 | req | src/middleware-flow.js:39:29:39:31 | res |
@@ -1322,6 +1372,8 @@ test_HeaderDefinition_defines
 | src/express.js:60:3:60:47 | res.hea ... n/xml") | content-type | application/xml |
 | src/express.js:66:3:66:42 | res.hea ... plain") | content-type | text/plain |
 | src/express.js:72:3:72:41 | res.hea ... /html") | content-type | text/html |
+| src/json.js:5:5:5:28 | res.jso ... y.data) | content-type | application/json |
+| src/json.js:9:5:9:29 | res.jso ... y.data) | content-type | application/json |
 test_RouteHandlerExpr_getBody
 | src/advanced-routehandler-registration.js:51:9:51:60 | (req, r ... tever") | src/advanced-routehandler-registration.js:51:9:51:60 | (req, r ... tever") |
 | src/advanced-routehandler-registration.js:64:9:64:53 | (req, r ... q, res) | src/advanced-routehandler-registration.js:64:9:64:53 | (req, r ... q, res) |
@@ -1346,6 +1398,8 @@ test_RouteHandlerExpr_getBody
 | src/express.js:65:27:69:1 | functio ... res);\\n} | src/express.js:65:27:69:1 | functio ... res);\\n} |
 | src/express.js:71:23:75:1 | functio ... res);\\n} | src/express.js:71:23:75:1 | functio ... res);\\n} |
 | src/inheritedFromNode.js:4:15:8:1 | functio ... .url;\\n} | src/inheritedFromNode.js:4:15:8:1 | functio ... .url;\\n} |
+| src/json.js:4:23:6:1 | functio ... ata);\\n} | src/json.js:4:23:6:1 | functio ... ata);\\n} |
+| src/json.js:8:24:10:1 | functio ... ata);\\n} | src/json.js:8:24:10:1 | functio ... ata);\\n} |
 | src/middleware-flow.js:13:16:13:24 | installDb | src/middleware-flow.js:5:1:10:1 | functio ... xt();\\n} |
 | src/middleware-flow.js:17:24:21:5 | (req, r ... ;\\n    } | src/middleware-flow.js:17:24:21:5 | (req, r ... ;\\n    } |
 | src/middleware-flow.js:39:23:43:1 | (req, r ... s.db;\\n} | src/middleware-flow.js:39:23:43:1 | (req, r ... s.db;\\n} |
@@ -1466,6 +1520,8 @@ test_RouteSetup_getARouteHandler
 | src/express.js:65:1:69:2 | app.get ... es);\\n}) | src/express.js:65:27:69:1 | functio ... res);\\n} |
 | src/express.js:71:1:75:2 | app.get ... es);\\n}) | src/express.js:71:23:75:1 | functio ... res);\\n} |
 | src/inheritedFromNode.js:4:1:8:2 | app.pos ... url;\\n}) | src/inheritedFromNode.js:4:15:8:1 | functio ... .url;\\n} |
+| src/json.js:4:1:6:2 | app.get ... ta);\\n}) | src/json.js:4:23:6:1 | functio ... ata);\\n} |
+| src/json.js:8:1:10:2 | app.get ... ta);\\n}) | src/json.js:8:24:10:1 | functio ... ata);\\n} |
 | src/middleware-flow.js:13:5:13:25 | router. ... tallDb) | src/middleware-flow.js:5:1:10:1 | functio ... xt();\\n} |
 | src/middleware-flow.js:17:5:21:6 | router. ... \\n    }) | src/middleware-flow.js:17:24:21:5 | (req, r ... ;\\n    } |
 | src/middleware-flow.js:27:9:27:33 | router. ... ers[p]) | src/middleware-flow.js:23:17:23:41 | (req, r ... q.db; } |
@@ -1526,6 +1582,8 @@ test_RouteSetup_getRequestMethod
 | src/express.js:65:1:69:2 | app.get ... es);\\n}) | GET |
 | src/express.js:71:1:75:2 | app.get ... es);\\n}) | GET |
 | src/inheritedFromNode.js:4:1:8:2 | app.pos ... url;\\n}) | POST |
+| src/json.js:4:1:6:2 | app.get ... ta);\\n}) | GET |
+| src/json.js:8:1:10:2 | app.get ... ta);\\n}) | GET |
 | src/middleware-flow.js:17:5:21:6 | router. ... \\n    }) | GET |
 | src/middleware-flow.js:27:9:27:33 | router. ... ers[p]) | GET |
 | src/middleware-flow.js:39:1:43:2 | unrelat ... .db;\\n}) | GET |
@@ -1699,6 +1757,12 @@ test_RouteHandler_getARequestExpr
 | src/inheritedFromNode.js:4:15:8:1 | functio ... .url;\\n} | src/inheritedFromNode.js:4:24:4:26 | req |
 | src/inheritedFromNode.js:4:15:8:1 | functio ... .url;\\n} | src/inheritedFromNode.js:4:24:4:26 | req |
 | src/inheritedFromNode.js:4:15:8:1 | functio ... .url;\\n} | src/inheritedFromNode.js:7:2:7:4 | req |
+| src/json.js:4:23:6:1 | functio ... ata);\\n} | src/json.js:4:32:4:34 | req |
+| src/json.js:4:23:6:1 | functio ... ata);\\n} | src/json.js:4:32:4:34 | req |
+| src/json.js:4:23:6:1 | functio ... ata);\\n} | src/json.js:5:14:5:16 | req |
+| src/json.js:8:24:10:1 | functio ... ata);\\n} | src/json.js:8:33:8:35 | req |
+| src/json.js:8:24:10:1 | functio ... ata);\\n} | src/json.js:8:33:8:35 | req |
+| src/json.js:8:24:10:1 | functio ... ata);\\n} | src/json.js:9:15:9:17 | req |
 | src/middleware-flow.js:5:1:10:1 | functio ... xt();\\n} | src/middleware-flow.js:5:20:5:22 | req |
 | src/middleware-flow.js:5:1:10:1 | functio ... xt();\\n} | src/middleware-flow.js:5:20:5:22 | req |
 | src/middleware-flow.js:5:1:10:1 | functio ... xt();\\n} | src/middleware-flow.js:6:5:6:7 | req |
@@ -1909,6 +1973,14 @@ test_RouteHandler_getAResponseExpr
 | src/inheritedFromNode.js:4:15:8:1 | functio ... .url;\\n} | src/inheritedFromNode.js:4:29:4:31 | res |
 | src/inheritedFromNode.js:4:15:8:1 | functio ... .url;\\n} | src/inheritedFromNode.js:5:2:5:4 | res |
 | src/inheritedFromNode.js:4:15:8:1 | functio ... .url;\\n} | src/inheritedFromNode.js:6:2:6:4 | res |
+| src/json.js:4:23:6:1 | functio ... ata);\\n} | src/json.js:4:37:4:39 | res |
+| src/json.js:4:23:6:1 | functio ... ata);\\n} | src/json.js:4:37:4:39 | res |
+| src/json.js:4:23:6:1 | functio ... ata);\\n} | src/json.js:5:5:5:7 | res |
+| src/json.js:4:23:6:1 | functio ... ata);\\n} | src/json.js:5:5:5:28 | res.jso ... y.data) |
+| src/json.js:8:24:10:1 | functio ... ata);\\n} | src/json.js:8:38:8:40 | res |
+| src/json.js:8:24:10:1 | functio ... ata);\\n} | src/json.js:8:38:8:40 | res |
+| src/json.js:8:24:10:1 | functio ... ata);\\n} | src/json.js:9:5:9:7 | res |
+| src/json.js:8:24:10:1 | functio ... ata);\\n} | src/json.js:9:5:9:29 | res.jso ... y.data) |
 | src/middleware-flow.js:5:1:10:1 | functio ... xt();\\n} | src/middleware-flow.js:5:25:5:27 | res |
 | src/middleware-flow.js:17:24:21:5 | (req, r ... ;\\n    } | src/middleware-flow.js:17:30:17:32 | res |
 | src/middleware-flow.js:23:17:23:41 | (req, r ... q.db; } | src/middleware-flow.js:23:23:23:25 | res |
@@ -2041,6 +2113,8 @@ test_RouteSetup_getRouteHandlerExpr
 | src/express.js:65:1:69:2 | app.get ... es);\\n}) | 0 | src/express.js:65:27:69:1 | functio ... res);\\n} |
 | src/express.js:71:1:75:2 | app.get ... es);\\n}) | 0 | src/express.js:71:23:75:1 | functio ... res);\\n} |
 | src/inheritedFromNode.js:4:1:8:2 | app.pos ... url;\\n}) | 0 | src/inheritedFromNode.js:4:15:8:1 | functio ... .url;\\n} |
+| src/json.js:4:1:6:2 | app.get ... ta);\\n}) | 0 | src/json.js:4:23:6:1 | functio ... ata);\\n} |
+| src/json.js:8:1:10:2 | app.get ... ta);\\n}) | 0 | src/json.js:8:24:10:1 | functio ... ata);\\n} |
 | src/middleware-flow.js:13:5:13:25 | router. ... tallDb) | 0 | src/middleware-flow.js:13:16:13:24 | installDb |
 | src/middleware-flow.js:17:5:21:6 | router. ... \\n    }) | 0 | src/middleware-flow.js:17:24:21:5 | (req, r ... ;\\n    } |
 | src/middleware-flow.js:27:9:27:33 | router. ... ers[p]) | 0 | src/middleware-flow.js:27:23:27:32 | routers[p] |
@@ -2073,6 +2147,8 @@ test_HeaderDefinition_getAHeaderName
 | src/express.js:60:3:60:47 | res.hea ... n/xml") | content-type |
 | src/express.js:66:3:66:42 | res.hea ... plain") | content-type |
 | src/express.js:72:3:72:41 | res.hea ... /html") | content-type |
+| src/json.js:5:5:5:28 | res.jso ... y.data) | content-type |
+| src/json.js:9:5:9:29 | res.jso ... y.data) | content-type |
 test_RouteHandlerExpr_getAsSubRouter
 | src/csurf-example.js:13:17:13:19 | api | src/csurf-example.js:30:16:30:35 | new express.Router() |
 | src/express2.js:6:9:6:14 | router | src/express2.js:2:14:2:23 | e.Router() |
@@ -2089,6 +2165,8 @@ test_RouteHandler_getAResponseHeader
 | src/express.js:65:27:69:1 | functio ... res);\\n} | content-type | src/express.js:66:3:66:42 | res.hea ... plain") |
 | src/express.js:71:23:75:1 | functio ... res);\\n} | access-control-allow-credentials | src/express.js:12:3:12:54 | arg.hea ... , true) |
 | src/express.js:71:23:75:1 | functio ... res);\\n} | content-type | src/express.js:72:3:72:41 | res.hea ... /html") |
+| src/json.js:4:23:6:1 | functio ... ata);\\n} | content-type | src/json.js:5:5:5:28 | res.jso ... y.data) |
+| src/json.js:8:24:10:1 | functio ... ata);\\n} | content-type | src/json.js:9:5:9:29 | res.jso ... y.data) |
 test_RouteSetup_getARouteHandlerExpr
 | src/advanced-routehandler-registration.js:10:3:10:24 | app.get ... es0[p]) | src/advanced-routehandler-registration.js:10:14:10:23 | routes0[p] |
 | src/advanced-routehandler-registration.js:19:3:19:18 | app.use(handler) | src/advanced-routehandler-registration.js:19:11:19:17 | handler |
@@ -2149,6 +2227,8 @@ test_RouteSetup_getARouteHandlerExpr
 | src/express.js:65:1:69:2 | app.get ... es);\\n}) | src/express.js:65:27:69:1 | functio ... res);\\n} |
 | src/express.js:71:1:75:2 | app.get ... es);\\n}) | src/express.js:71:23:75:1 | functio ... res);\\n} |
 | src/inheritedFromNode.js:4:1:8:2 | app.pos ... url;\\n}) | src/inheritedFromNode.js:4:15:8:1 | functio ... .url;\\n} |
+| src/json.js:4:1:6:2 | app.get ... ta);\\n}) | src/json.js:4:23:6:1 | functio ... ata);\\n} |
+| src/json.js:8:1:10:2 | app.get ... ta);\\n}) | src/json.js:8:24:10:1 | functio ... ata);\\n} |
 | src/middleware-flow.js:13:5:13:25 | router. ... tallDb) | src/middleware-flow.js:13:16:13:24 | installDb |
 | src/middleware-flow.js:17:5:21:6 | router. ... \\n    }) | src/middleware-flow.js:17:24:21:5 | (req, r ... ;\\n    } |
 | src/middleware-flow.js:27:9:27:33 | router. ... ers[p]) | src/middleware-flow.js:27:23:27:32 | routers[p] |
@@ -2181,6 +2261,7 @@ test_RouterDefinition_RouterDefinition
 | src/express4.js:2:11:2:19 | express() |
 | src/express.js:2:11:2:19 | express() |
 | src/inheritedFromNode.js:2:11:2:19 | express() |
+| src/json.js:2:13:2:21 | express() |
 | src/middleware-flow.js:2:13:2:21 | express() |
 | src/middleware-flow.js:37:22:37:30 | express() |
 | src/params.js:2:11:2:19 | express() |
@@ -2216,6 +2297,8 @@ test_RouterDefinition_getARouteHandler
 | src/express.js:2:11:2:19 | express() | src/express.js:65:27:69:1 | functio ... res);\\n} |
 | src/express.js:2:11:2:19 | express() | src/express.js:71:23:75:1 | functio ... res);\\n} |
 | src/inheritedFromNode.js:2:11:2:19 | express() | src/inheritedFromNode.js:4:15:8:1 | functio ... .url;\\n} |
+| src/json.js:2:13:2:21 | express() | src/json.js:4:23:6:1 | functio ... ata);\\n} |
+| src/json.js:2:13:2:21 | express() | src/json.js:8:24:10:1 | functio ... ata);\\n} |
 | src/middleware-flow.js:2:13:2:21 | express() | src/middleware-flow.js:5:1:10:1 | functio ... xt();\\n} |
 | src/middleware-flow.js:2:13:2:21 | express() | src/middleware-flow.js:17:24:21:5 | (req, r ... ;\\n    } |
 | src/middleware-flow.js:37:22:37:30 | express() | src/middleware-flow.js:39:23:43:1 | (req, r ... s.db;\\n} |
@@ -2334,6 +2417,8 @@ test_RouteSetup_getLastRouteHandlerExpr
 | src/express.js:65:1:69:2 | app.get ... es);\\n}) | src/express.js:65:27:69:1 | functio ... res);\\n} |
 | src/express.js:71:1:75:2 | app.get ... es);\\n}) | src/express.js:71:23:75:1 | functio ... res);\\n} |
 | src/inheritedFromNode.js:4:1:8:2 | app.pos ... url;\\n}) | src/inheritedFromNode.js:4:15:8:1 | functio ... .url;\\n} |
+| src/json.js:4:1:6:2 | app.get ... ta);\\n}) | src/json.js:4:23:6:1 | functio ... ata);\\n} |
+| src/json.js:8:1:10:2 | app.get ... ta);\\n}) | src/json.js:8:24:10:1 | functio ... ata);\\n} |
 | src/middleware-flow.js:13:5:13:25 | router. ... tallDb) | src/middleware-flow.js:13:16:13:24 | installDb |
 | src/middleware-flow.js:17:5:21:6 | router. ... \\n    }) | src/middleware-flow.js:17:24:21:5 | (req, r ... ;\\n    } |
 | src/middleware-flow.js:27:9:27:33 | router. ... ers[p]) | src/middleware-flow.js:27:23:27:32 | routers[p] |
diff --git a/javascript/ql/test/library-tests/frameworks/ReactJS/tests.expected b/javascript/ql/test/library-tests/frameworks/ReactJS/tests.expected
index 9b453989bb8..16d31cd07e1 100644
--- a/javascript/ql/test/library-tests/frameworks/ReactJS/tests.expected
+++ b/javascript/ql/test/library-tests/frameworks/ReactJS/tests.expected
@@ -225,7 +225,7 @@ reactComponentRef
 | statePropertyReads.js:1:1:13:1 | class R ...     }\\n} | statePropertyReads.js:7:9:7:12 | this |
 | statePropertyReads.js:1:1:13:1 | class R ...     }\\n} | statePropertyReads.js:10:23:10:22 | this |
 | statePropertyWrites.js:1:1:34:1 | class W ...    };\\n} | statePropertyWrites.js:2:16:2:15 | this |
-| statePropertyWrites.js:1:1:34:1 | class W ...    };\\n} | statePropertyWrites.js:3:13:3:22 | cmp |
+| statePropertyWrites.js:1:1:34:1 | class W ...    };\\n} | statePropertyWrites.js:3:13:3:15 | cmp |
 | statePropertyWrites.js:1:1:34:1 | class W ...    };\\n} | statePropertyWrites.js:3:19:3:22 | this |
 | statePropertyWrites.js:1:1:34:1 | class W ...    };\\n} | statePropertyWrites.js:4:9:4:11 | cmp |
 | statePropertyWrites.js:1:1:34:1 | class W ...    };\\n} | statePropertyWrites.js:6:9:6:11 | cmp |
@@ -241,7 +241,7 @@ reactComponentRef
 | statePropertyWrites.js:36:19:45:1 | {\\n  ren ... ;\\n  }\\n} | statePropertyWrites.js:40:20:40:19 | this |
 | thisAccesses.js:1:1:16:1 | class C ...     }\\n} | thisAccesses.js:2:17:2:16 | this |
 | thisAccesses.js:1:1:16:1 | class C ...     }\\n} | thisAccesses.js:3:9:3:12 | this |
-| thisAccesses.js:1:1:16:1 | class C ...     }\\n} | thisAccesses.js:5:13:5:22 | dis |
+| thisAccesses.js:1:1:16:1 | class C ...     }\\n} | thisAccesses.js:5:13:5:15 | dis |
 | thisAccesses.js:1:1:16:1 | class C ...     }\\n} | thisAccesses.js:5:19:5:22 | this |
 | thisAccesses.js:1:1:16:1 | class C ...     }\\n} | thisAccesses.js:6:9:6:11 | dis |
 | thisAccesses.js:1:1:16:1 | class C ...     }\\n} | thisAccesses.js:8:10:8:9 | this |
diff --git a/javascript/ql/test/library-tests/frameworks/koa/tests.expected b/javascript/ql/test/library-tests/frameworks/koa/tests.expected
index 365986dfa0b..1c3a323d110 100644
--- a/javascript/ql/test/library-tests/frameworks/koa/tests.expected
+++ b/javascript/ql/test/library-tests/frameworks/koa/tests.expected
@@ -67,7 +67,7 @@ test_HeaderAccess
 test_ResponseExpr
 | src/koa.js:12:3:12:15 | this.response | src/koa.js:10:10:28:1 | functio ... az');\\n} |
 | src/koa.js:14:3:14:14 | ctx.response | src/koa.js:10:10:28:1 | functio ... az');\\n} |
-| src/koa.js:15:7:15:24 | rsp | src/koa.js:10:10:28:1 | functio ... az');\\n} |
+| src/koa.js:15:7:15:9 | rsp | src/koa.js:10:10:28:1 | functio ... az');\\n} |
 | src/koa.js:15:13:15:24 | ctx.response | src/koa.js:10:10:28:1 | functio ... az');\\n} |
 | src/koa.js:16:3:16:5 | rsp | src/koa.js:10:10:28:1 | functio ... az');\\n} |
 | src/koa.js:18:3:18:14 | ctx.response | src/koa.js:10:10:28:1 | functio ... az');\\n} |
@@ -190,7 +190,7 @@ test_RouteHandler_getARequestExpr
 test_RouteHandler_getAResponseExpr
 | src/koa.js:10:10:28:1 | functio ... az');\\n} | src/koa.js:12:3:12:15 | this.response |
 | src/koa.js:10:10:28:1 | functio ... az');\\n} | src/koa.js:14:3:14:14 | ctx.response |
-| src/koa.js:10:10:28:1 | functio ... az');\\n} | src/koa.js:15:7:15:24 | rsp |
+| src/koa.js:10:10:28:1 | functio ... az');\\n} | src/koa.js:15:7:15:9 | rsp |
 | src/koa.js:10:10:28:1 | functio ... az');\\n} | src/koa.js:15:13:15:24 | ctx.response |
 | src/koa.js:10:10:28:1 | functio ... az');\\n} | src/koa.js:16:3:16:5 | rsp |
 | src/koa.js:10:10:28:1 | functio ... az');\\n} | src/koa.js:18:3:18:14 | ctx.response |
diff --git a/javascript/ql/test/library-tests/frameworks/xUnit/tests.expected b/javascript/ql/test/library-tests/frameworks/xUnit/tests.expected
index 5d30921408b..266e9e31e6f 100644
--- a/javascript/ql/test/library-tests/frameworks/xUnit/tests.expected
+++ b/javascript/ql/test/library-tests/frameworks/xUnit/tests.expected
@@ -3,10 +3,10 @@ xUnitAnnotationfrom
 | tst.js:5:5:5:13 | [Fixture] | tst.js:6:5:13:5 | functio ... }\\n    } |
 | tst.js:7:9:7:14 | [Fact] | tst.js:8:9:12:9 | functio ...       } |
 | tst.js:16:1:16:43 | [Import ... t.js")] | tst.js:18:1:22:2 | Test.xU ... ..]\\n\\n}; |
-| tst.js:17:1:17:9 | Fixture | tst.js:18:1:22:2 | Test.xU ... ..]\\n\\n}; |
+| tst.js:17:2:17:8 | Fixture | tst.js:18:1:22:2 | Test.xU ... ..]\\n\\n}; |
 | tst.js:24:1:24:9 | [Fixture] | tst.js:25:1:34:2 | Test.Ex ...    }\\n}; |
 | tst.js:27:5:29:7 | [Import ...     })] | tst.js:31:5:33:5 | functio ... ]\\n    } |
-| tst.js:30:5:30:10 | Fact | tst.js:31:5:33:5 | functio ... ]\\n    } |
+| tst.js:30:6:30:9 | Fact | tst.js:31:5:33:5 | functio ... ]\\n    } |
 xUnitAttribute
 | tst.js:3:2:3:8 | Fixture | Fixture | 0 |
 | tst.js:5:6:5:12 | Fixture | Fixture | 0 |
@@ -24,7 +24,7 @@ xUnitFixture
 | tst.js:4:20:14:1 | functio ...     }\\n} | tst.js:3:1:3:9 | [Fixture] |
 | tst.js:6:5:13:5 | functio ... }\\n    } | tst.js:5:5:5:13 | [Fixture] |
 | tst.js:18:24:22:1 | functio ... ...]\\n\\n} | tst.js:16:1:16:43 | [Import ... t.js")] |
-| tst.js:18:24:22:1 | functio ... ...]\\n\\n} | tst.js:17:1:17:9 | Fixture |
+| tst.js:18:24:22:1 | functio ... ...]\\n\\n} | tst.js:17:2:17:8 | Fixture |
 | tst.js:25:21:34:1 | functio ...     }\\n} | tst.js:24:1:24:9 | [Fixture] |
 xUnitTarget
 | tst.js:4:1:14:2 | Test.Ex ...    }\\n}; |
diff --git a/javascript/ql/test/query-tests/LanguageFeatures/LengthComparisonOffByOne/tst.js b/javascript/ql/test/query-tests/LanguageFeatures/LengthComparisonOffByOne/tst.js
index 6b214c9b042..bd284d2c027 100644
--- a/javascript/ql/test/query-tests/LanguageFeatures/LengthComparisonOffByOne/tst.js
+++ b/javascript/ql/test/query-tests/LanguageFeatures/LengthComparisonOffByOne/tst.js
@@ -55,3 +55,11 @@ function badContains(a, elt) {
       return true;
   return false;
 }
+
+// OK - incorrect upper bound, but extra check
+function badContains2(a, elt) {
+  for (let i = 0; i <= a.length; ++i)
+    if (i < a.length && a[i] === elt)
+      return true;
+  return false;
+}
diff --git a/javascript/ql/test/query-tests/Security/CWE-020/UntrustedDataToExternalAPI/UntrustedDataToExternalAPI.expected b/javascript/ql/test/query-tests/Security/CWE-020/UntrustedDataToExternalAPI/UntrustedDataToExternalAPI.expected
index de528b8bde2..4e58b4f8548 100644
--- a/javascript/ql/test/query-tests/Security/CWE-020/UntrustedDataToExternalAPI/UntrustedDataToExternalAPI.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-020/UntrustedDataToExternalAPI/UntrustedDataToExternalAPI.expected
@@ -12,20 +12,20 @@
 | tst-UntrustedDataToExternalAPI.js:41:7:41:8 | {} | tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | tst-UntrustedDataToExternalAPI.js:41:7:41:8 | {} | Call to lodash.merge() [param 0] with untrusted data from $@. | tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | window.name |
 | tst-UntrustedDataToExternalAPI.js:41:11:45:1 | { // $  ... usted\\n} | tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | tst-UntrustedDataToExternalAPI.js:41:11:45:1 | { // $  ... usted\\n} | Call to lodash.merge() [param 1] with untrusted data from $@. | tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | window.name |
 edges
-| tst-UntrustedDataToExternalAPI.js:3:5:3:27 | untrusted | tst-UntrustedDataToExternalAPI.js:5:13:5:21 | untrusted | provenance |  |
-| tst-UntrustedDataToExternalAPI.js:3:5:3:27 | untrusted | tst-UntrustedDataToExternalAPI.js:6:17:6:25 | untrusted | provenance |  |
-| tst-UntrustedDataToExternalAPI.js:3:5:3:27 | untrusted | tst-UntrustedDataToExternalAPI.js:7:16:7:24 | untrusted | provenance |  |
-| tst-UntrustedDataToExternalAPI.js:3:5:3:27 | untrusted | tst-UntrustedDataToExternalAPI.js:8:31:8:39 | untrusted | provenance |  |
-| tst-UntrustedDataToExternalAPI.js:3:5:3:27 | untrusted | tst-UntrustedDataToExternalAPI.js:9:18:9:26 | untrusted | provenance |  |
-| tst-UntrustedDataToExternalAPI.js:3:5:3:27 | untrusted | tst-UntrustedDataToExternalAPI.js:10:19:10:27 | untrusted | provenance |  |
-| tst-UntrustedDataToExternalAPI.js:3:5:3:27 | untrusted | tst-UntrustedDataToExternalAPI.js:11:20:11:28 | untrusted | provenance |  |
-| tst-UntrustedDataToExternalAPI.js:3:5:3:27 | untrusted | tst-UntrustedDataToExternalAPI.js:15:16:15:24 | untrusted | provenance |  |
-| tst-UntrustedDataToExternalAPI.js:3:5:3:27 | untrusted | tst-UntrustedDataToExternalAPI.js:33:14:33:22 | untrusted | provenance |  |
-| tst-UntrustedDataToExternalAPI.js:3:5:3:27 | untrusted | tst-UntrustedDataToExternalAPI.js:34:34:34:42 | untrusted | provenance |  |
-| tst-UntrustedDataToExternalAPI.js:3:5:3:27 | untrusted | tst-UntrustedDataToExternalAPI.js:42:8:42:16 | untrusted | provenance |  |
-| tst-UntrustedDataToExternalAPI.js:3:5:3:27 | untrusted | tst-UntrustedDataToExternalAPI.js:43:8:43:16 | untrusted | provenance |  |
-| tst-UntrustedDataToExternalAPI.js:3:5:3:27 | untrusted | tst-UntrustedDataToExternalAPI.js:44:8:44:16 | untrusted | provenance |  |
-| tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | tst-UntrustedDataToExternalAPI.js:3:5:3:27 | untrusted | provenance |  |
+| tst-UntrustedDataToExternalAPI.js:3:5:3:13 | untrusted | tst-UntrustedDataToExternalAPI.js:5:13:5:21 | untrusted | provenance |  |
+| tst-UntrustedDataToExternalAPI.js:3:5:3:13 | untrusted | tst-UntrustedDataToExternalAPI.js:6:17:6:25 | untrusted | provenance |  |
+| tst-UntrustedDataToExternalAPI.js:3:5:3:13 | untrusted | tst-UntrustedDataToExternalAPI.js:7:16:7:24 | untrusted | provenance |  |
+| tst-UntrustedDataToExternalAPI.js:3:5:3:13 | untrusted | tst-UntrustedDataToExternalAPI.js:8:31:8:39 | untrusted | provenance |  |
+| tst-UntrustedDataToExternalAPI.js:3:5:3:13 | untrusted | tst-UntrustedDataToExternalAPI.js:9:18:9:26 | untrusted | provenance |  |
+| tst-UntrustedDataToExternalAPI.js:3:5:3:13 | untrusted | tst-UntrustedDataToExternalAPI.js:10:19:10:27 | untrusted | provenance |  |
+| tst-UntrustedDataToExternalAPI.js:3:5:3:13 | untrusted | tst-UntrustedDataToExternalAPI.js:11:20:11:28 | untrusted | provenance |  |
+| tst-UntrustedDataToExternalAPI.js:3:5:3:13 | untrusted | tst-UntrustedDataToExternalAPI.js:15:16:15:24 | untrusted | provenance |  |
+| tst-UntrustedDataToExternalAPI.js:3:5:3:13 | untrusted | tst-UntrustedDataToExternalAPI.js:33:14:33:22 | untrusted | provenance |  |
+| tst-UntrustedDataToExternalAPI.js:3:5:3:13 | untrusted | tst-UntrustedDataToExternalAPI.js:34:34:34:42 | untrusted | provenance |  |
+| tst-UntrustedDataToExternalAPI.js:3:5:3:13 | untrusted | tst-UntrustedDataToExternalAPI.js:42:8:42:16 | untrusted | provenance |  |
+| tst-UntrustedDataToExternalAPI.js:3:5:3:13 | untrusted | tst-UntrustedDataToExternalAPI.js:43:8:43:16 | untrusted | provenance |  |
+| tst-UntrustedDataToExternalAPI.js:3:5:3:13 | untrusted | tst-UntrustedDataToExternalAPI.js:44:8:44:16 | untrusted | provenance |  |
+| tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | tst-UntrustedDataToExternalAPI.js:3:5:3:13 | untrusted | provenance |  |
 | tst-UntrustedDataToExternalAPI.js:10:19:10:27 | untrusted | tst-UntrustedDataToExternalAPI.js:10:13:10:33 | ['x', u ... d, 'y'] | provenance |  |
 | tst-UntrustedDataToExternalAPI.js:14:12:16:9 | {\\n      ...       } [z] | tst-UntrustedDataToExternalAPI.js:13:8:17:5 | {\\n      ... }\\n    } | provenance |  |
 | tst-UntrustedDataToExternalAPI.js:15:16:15:24 | untrusted | tst-UntrustedDataToExternalAPI.js:14:12:16:9 | {\\n      ...       } [z] | provenance |  |
@@ -39,7 +39,7 @@ edges
 | tst-UntrustedDataToExternalAPI.js:44:8:44:16 | untrusted | tst-UntrustedDataToExternalAPI.js:41:11:45:1 | { // $  ... usted\\n} | provenance |  |
 | tst-UntrustedDataToExternalAPI.js:44:8:44:16 | untrusted | tst-UntrustedDataToExternalAPI.js:41:11:45:1 | { // $  ... usted\\n} [z] | provenance |  |
 nodes
-| tst-UntrustedDataToExternalAPI.js:3:5:3:27 | untrusted | semmle.label | untrusted |
+| tst-UntrustedDataToExternalAPI.js:3:5:3:13 | untrusted | semmle.label | untrusted |
 | tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | semmle.label | window.name |
 | tst-UntrustedDataToExternalAPI.js:5:13:5:21 | untrusted | semmle.label | untrusted |
 | tst-UntrustedDataToExternalAPI.js:6:17:6:25 | untrusted | semmle.label | untrusted |
diff --git a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/TaintedPath.expected b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/TaintedPath.expected
index 2a3e4c18884..833128c1292 100644
--- a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/TaintedPath.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/TaintedPath.expected
@@ -251,35 +251,35 @@
 | typescript.ts:31:29:31:33 | path6 | typescript.ts:9:24:9:30 | req.url | typescript.ts:31:29:31:33 | path6 | This path depends on a $@. | typescript.ts:9:24:9:30 | req.url | user-provided value |
 | views.js:1:43:1:55 | req.params[0] | views.js:1:43:1:55 | req.params[0] | views.js:1:43:1:55 | req.params[0] | This path depends on a $@. | views.js:1:43:1:55 | req.params[0] | user-provided value |
 edges
-| TaintedPath-es6.js:7:7:7:44 | path | TaintedPath-es6.js:9:41:9:44 | path | provenance |  |
+| TaintedPath-es6.js:7:7:7:10 | path | TaintedPath-es6.js:9:41:9:44 | path | provenance |  |
 | TaintedPath-es6.js:7:14:7:33 | parse(req.url, true) | TaintedPath-es6.js:7:14:7:39 | parse(r ... ).query | provenance | Config |
 | TaintedPath-es6.js:7:14:7:39 | parse(r ... ).query | TaintedPath-es6.js:7:14:7:44 | parse(r ... ry.path | provenance | Config |
-| TaintedPath-es6.js:7:14:7:44 | parse(r ... ry.path | TaintedPath-es6.js:7:7:7:44 | path | provenance |  |
+| TaintedPath-es6.js:7:14:7:44 | parse(r ... ry.path | TaintedPath-es6.js:7:7:7:10 | path | provenance |  |
 | TaintedPath-es6.js:7:20:7:26 | req.url | TaintedPath-es6.js:7:14:7:33 | parse(req.url, true) | provenance | Config |
 | TaintedPath-es6.js:9:41:9:44 | path | TaintedPath-es6.js:9:26:9:45 | join("public", path) | provenance | Config |
-| TaintedPath.js:9:7:9:48 | path | TaintedPath.js:11:29:11:32 | path | provenance |  |
-| TaintedPath.js:9:7:9:48 | path | TaintedPath.js:13:45:13:48 | path | provenance |  |
-| TaintedPath.js:9:7:9:48 | path | TaintedPath.js:16:33:16:36 | path | provenance |  |
-| TaintedPath.js:9:7:9:48 | path | TaintedPath.js:19:33:19:36 | path | provenance |  |
-| TaintedPath.js:9:7:9:48 | path | TaintedPath.js:22:33:22:36 | path | provenance |  |
-| TaintedPath.js:9:7:9:48 | path | TaintedPath.js:31:31:31:34 | path | provenance |  |
+| TaintedPath.js:9:7:9:10 | path | TaintedPath.js:11:29:11:32 | path | provenance |  |
+| TaintedPath.js:9:7:9:10 | path | TaintedPath.js:13:45:13:48 | path | provenance |  |
+| TaintedPath.js:9:7:9:10 | path | TaintedPath.js:16:33:16:36 | path | provenance |  |
+| TaintedPath.js:9:7:9:10 | path | TaintedPath.js:19:33:19:36 | path | provenance |  |
+| TaintedPath.js:9:7:9:10 | path | TaintedPath.js:22:33:22:36 | path | provenance |  |
+| TaintedPath.js:9:7:9:10 | path | TaintedPath.js:31:31:31:34 | path | provenance |  |
 | TaintedPath.js:9:14:9:37 | url.par ... , true) | TaintedPath.js:9:14:9:43 | url.par ... ).query | provenance | Config |
 | TaintedPath.js:9:14:9:43 | url.par ... ).query | TaintedPath.js:9:14:9:48 | url.par ... ry.path | provenance | Config |
-| TaintedPath.js:9:14:9:48 | url.par ... ry.path | TaintedPath.js:9:7:9:48 | path | provenance |  |
+| TaintedPath.js:9:14:9:48 | url.par ... ry.path | TaintedPath.js:9:7:9:10 | path | provenance |  |
 | TaintedPath.js:9:24:9:30 | req.url | TaintedPath.js:9:14:9:37 | url.par ... , true) | provenance | Config |
 | TaintedPath.js:13:45:13:48 | path | TaintedPath.js:13:29:13:48 | "/home/user/" + path | provenance | Config |
-| TaintedPath.js:36:3:36:44 | path | TaintedPath.js:39:48:39:51 | path | provenance |  |
-| TaintedPath.js:36:3:36:44 | path | TaintedPath.js:42:45:42:48 | path | provenance |  |
-| TaintedPath.js:36:3:36:44 | path | TaintedPath.js:43:51:43:54 | path | provenance |  |
-| TaintedPath.js:36:3:36:44 | path | TaintedPath.js:44:50:44:53 | path | provenance |  |
-| TaintedPath.js:36:3:36:44 | path | TaintedPath.js:45:52:45:55 | path | provenance |  |
-| TaintedPath.js:36:3:36:44 | path | TaintedPath.js:46:49:46:52 | path | provenance |  |
-| TaintedPath.js:36:3:36:44 | path | TaintedPath.js:47:48:47:51 | path | provenance |  |
-| TaintedPath.js:36:3:36:44 | path | TaintedPath.js:48:54:48:57 | path | provenance |  |
-| TaintedPath.js:36:3:36:44 | path | TaintedPath.js:49:57:49:60 | path | provenance |  |
+| TaintedPath.js:36:3:36:6 | path | TaintedPath.js:39:48:39:51 | path | provenance |  |
+| TaintedPath.js:36:3:36:6 | path | TaintedPath.js:42:45:42:48 | path | provenance |  |
+| TaintedPath.js:36:3:36:6 | path | TaintedPath.js:43:51:43:54 | path | provenance |  |
+| TaintedPath.js:36:3:36:6 | path | TaintedPath.js:44:50:44:53 | path | provenance |  |
+| TaintedPath.js:36:3:36:6 | path | TaintedPath.js:45:52:45:55 | path | provenance |  |
+| TaintedPath.js:36:3:36:6 | path | TaintedPath.js:46:49:46:52 | path | provenance |  |
+| TaintedPath.js:36:3:36:6 | path | TaintedPath.js:47:48:47:51 | path | provenance |  |
+| TaintedPath.js:36:3:36:6 | path | TaintedPath.js:48:54:48:57 | path | provenance |  |
+| TaintedPath.js:36:3:36:6 | path | TaintedPath.js:49:57:49:60 | path | provenance |  |
 | TaintedPath.js:36:10:36:33 | url.par ... , true) | TaintedPath.js:36:10:36:39 | url.par ... ).query | provenance | Config |
 | TaintedPath.js:36:10:36:39 | url.par ... ).query | TaintedPath.js:36:10:36:44 | url.par ... ry.path | provenance | Config |
-| TaintedPath.js:36:10:36:44 | url.par ... ry.path | TaintedPath.js:36:3:36:44 | path | provenance |  |
+| TaintedPath.js:36:10:36:44 | url.par ... ry.path | TaintedPath.js:36:3:36:6 | path | provenance |  |
 | TaintedPath.js:36:20:36:26 | req.url | TaintedPath.js:36:10:36:33 | url.par ... , true) | provenance | Config |
 | TaintedPath.js:39:48:39:51 | path | TaintedPath.js:39:29:39:52 | pathMod ... e(path) | provenance | Config |
 | TaintedPath.js:42:45:42:48 | path | TaintedPath.js:42:29:42:49 | pathMod ... n(path) | provenance | Config |
@@ -296,57 +296,57 @@ edges
 | TaintedPath.js:55:61:55:67 | req.url | TaintedPath.js:55:31:55:68 | require ... eq.url) | provenance | Config |
 | TaintedPath.js:56:31:56:67 | require ... eq.url) | TaintedPath.js:56:31:56:73 | require ... ).query | provenance | Config |
 | TaintedPath.js:56:60:56:66 | req.url | TaintedPath.js:56:31:56:67 | require ... eq.url) | provenance | Config |
-| TaintedPath.js:73:6:73:47 | path | TaintedPath.js:75:44:75:47 | path | provenance |  |
-| TaintedPath.js:73:6:73:47 | path | TaintedPath.js:76:14:76:17 | path | provenance |  |
+| TaintedPath.js:73:6:73:9 | path | TaintedPath.js:75:44:75:47 | path | provenance |  |
+| TaintedPath.js:73:6:73:9 | path | TaintedPath.js:76:14:76:17 | path | provenance |  |
 | TaintedPath.js:73:13:73:36 | url.par ... , true) | TaintedPath.js:73:13:73:42 | url.par ... ).query | provenance | Config |
 | TaintedPath.js:73:13:73:42 | url.par ... ).query | TaintedPath.js:73:13:73:47 | url.par ... ry.path | provenance | Config |
-| TaintedPath.js:73:13:73:47 | url.par ... ry.path | TaintedPath.js:73:6:73:47 | path | provenance |  |
+| TaintedPath.js:73:13:73:47 | url.par ... ry.path | TaintedPath.js:73:6:73:9 | path | provenance |  |
 | TaintedPath.js:73:23:73:29 | req.url | TaintedPath.js:73:13:73:36 | url.par ... , true) | provenance | Config |
 | TaintedPath.js:75:44:75:47 | path | TaintedPath.js:75:28:75:48 | fs.real ... c(path) | provenance | Config |
 | TaintedPath.js:76:14:76:17 | path | TaintedPath.js:77:32:77:39 | realpath | provenance | Config |
 | TaintedPath.js:77:32:77:39 | realpath | TaintedPath.js:78:45:78:52 | realpath | provenance |  |
-| TaintedPath.js:109:6:109:47 | path | TaintedPath.js:111:23:111:26 | path | provenance |  |
+| TaintedPath.js:109:6:109:9 | path | TaintedPath.js:111:23:111:26 | path | provenance |  |
 | TaintedPath.js:109:13:109:36 | url.par ... , true) | TaintedPath.js:109:13:109:42 | url.par ... ).query | provenance | Config |
 | TaintedPath.js:109:13:109:42 | url.par ... ).query | TaintedPath.js:109:13:109:47 | url.par ... ry.path | provenance | Config |
-| TaintedPath.js:109:13:109:47 | url.par ... ry.path | TaintedPath.js:109:6:109:47 | path | provenance |  |
+| TaintedPath.js:109:13:109:47 | url.par ... ry.path | TaintedPath.js:109:6:109:9 | path | provenance |  |
 | TaintedPath.js:109:23:109:29 | req.url | TaintedPath.js:109:13:109:36 | url.par ... , true) | provenance | Config |
-| TaintedPath.js:115:7:115:48 | path | TaintedPath.js:117:19:117:22 | path | provenance |  |
-| TaintedPath.js:115:7:115:48 | path | TaintedPath.js:119:15:119:18 | path | provenance |  |
+| TaintedPath.js:115:7:115:10 | path | TaintedPath.js:117:19:117:22 | path | provenance |  |
+| TaintedPath.js:115:7:115:10 | path | TaintedPath.js:119:15:119:18 | path | provenance |  |
 | TaintedPath.js:115:14:115:37 | url.par ... , true) | TaintedPath.js:115:14:115:43 | url.par ... ).query | provenance | Config |
 | TaintedPath.js:115:14:115:43 | url.par ... ).query | TaintedPath.js:115:14:115:48 | url.par ... ry.path | provenance | Config |
-| TaintedPath.js:115:14:115:48 | url.par ... ry.path | TaintedPath.js:115:7:115:48 | path | provenance |  |
+| TaintedPath.js:115:14:115:48 | url.par ... ry.path | TaintedPath.js:115:7:115:10 | path | provenance |  |
 | TaintedPath.js:115:24:115:30 | req.url | TaintedPath.js:115:14:115:37 | url.par ... , true) | provenance | Config |
-| TaintedPath.js:119:7:119:29 | split | TaintedPath.js:121:19:121:23 | split | provenance |  |
-| TaintedPath.js:119:7:119:29 | split | TaintedPath.js:125:19:125:23 | split | provenance |  |
-| TaintedPath.js:119:7:119:29 | split | TaintedPath.js:126:28:126:32 | split | provenance |  |
-| TaintedPath.js:119:7:119:29 | split | TaintedPath.js:128:33:128:37 | split | provenance |  |
-| TaintedPath.js:119:7:119:29 | split | TaintedPath.js:131:20:131:24 | split | provenance |  |
-| TaintedPath.js:119:7:119:29 | split | TaintedPath.js:134:19:134:23 | split | provenance |  |
+| TaintedPath.js:119:7:119:11 | split | TaintedPath.js:121:19:121:23 | split | provenance |  |
+| TaintedPath.js:119:7:119:11 | split | TaintedPath.js:125:19:125:23 | split | provenance |  |
+| TaintedPath.js:119:7:119:11 | split | TaintedPath.js:126:28:126:32 | split | provenance |  |
+| TaintedPath.js:119:7:119:11 | split | TaintedPath.js:128:33:128:37 | split | provenance |  |
+| TaintedPath.js:119:7:119:11 | split | TaintedPath.js:131:20:131:24 | split | provenance |  |
+| TaintedPath.js:119:7:119:11 | split | TaintedPath.js:134:19:134:23 | split | provenance |  |
 | TaintedPath.js:119:15:119:18 | path | TaintedPath.js:119:15:119:29 | path.split("/") | provenance | Config |
-| TaintedPath.js:119:15:119:29 | path.split("/") | TaintedPath.js:119:7:119:29 | split | provenance |  |
+| TaintedPath.js:119:15:119:29 | path.split("/") | TaintedPath.js:119:7:119:11 | split | provenance |  |
 | TaintedPath.js:121:19:121:23 | split | TaintedPath.js:121:19:121:33 | split.join("/") | provenance | Config |
 | TaintedPath.js:125:19:125:23 | split | TaintedPath.js:125:19:125:26 | split[x] | provenance | Config |
 | TaintedPath.js:126:28:126:32 | split | TaintedPath.js:126:28:126:35 | split[x] | provenance | Config |
 | TaintedPath.js:126:28:126:35 | split[x] | TaintedPath.js:126:19:126:35 | prefix + split[x] | provenance | Config |
-| TaintedPath.js:128:7:128:38 | concatted | TaintedPath.js:129:19:129:27 | concatted | provenance |  |
-| TaintedPath.js:128:19:128:38 | prefix.concat(split) | TaintedPath.js:128:7:128:38 | concatted | provenance |  |
+| TaintedPath.js:128:7:128:15 | concatted | TaintedPath.js:129:19:129:27 | concatted | provenance |  |
+| TaintedPath.js:128:19:128:38 | prefix.concat(split) | TaintedPath.js:128:7:128:15 | concatted | provenance |  |
 | TaintedPath.js:128:33:128:37 | split | TaintedPath.js:128:19:128:38 | prefix.concat(split) | provenance | Config |
 | TaintedPath.js:129:19:129:27 | concatted | TaintedPath.js:129:19:129:37 | concatted.join("/") | provenance | Config |
-| TaintedPath.js:131:7:131:39 | concatted2 | TaintedPath.js:132:19:132:28 | concatted2 | provenance |  |
+| TaintedPath.js:131:7:131:16 | concatted2 | TaintedPath.js:132:19:132:28 | concatted2 | provenance |  |
 | TaintedPath.js:131:20:131:24 | split | TaintedPath.js:131:20:131:39 | split.concat(prefix) | provenance | Config |
-| TaintedPath.js:131:20:131:39 | split.concat(prefix) | TaintedPath.js:131:7:131:39 | concatted2 | provenance |  |
+| TaintedPath.js:131:20:131:39 | split.concat(prefix) | TaintedPath.js:131:7:131:16 | concatted2 | provenance |  |
 | TaintedPath.js:132:19:132:28 | concatted2 | TaintedPath.js:132:19:132:38 | concatted2.join("/") | provenance | Config |
 | TaintedPath.js:134:19:134:23 | split | TaintedPath.js:134:19:134:29 | split.pop() | provenance | Config |
-| TaintedPath.js:139:7:139:48 | path | TaintedPath.js:143:29:143:32 | path | provenance |  |
-| TaintedPath.js:139:7:139:48 | path | TaintedPath.js:149:29:149:32 | path | provenance |  |
-| TaintedPath.js:139:7:139:48 | path | TaintedPath.js:150:29:150:32 | path | provenance |  |
-| TaintedPath.js:139:7:139:48 | path | TaintedPath.js:151:29:151:32 | path | provenance |  |
-| TaintedPath.js:139:7:139:48 | path | TaintedPath.js:152:29:152:32 | path | provenance |  |
-| TaintedPath.js:139:7:139:48 | path | TaintedPath.js:167:40:167:43 | path | provenance |  |
-| TaintedPath.js:139:7:139:48 | path | TaintedPath.js:168:50:168:53 | path | provenance |  |
+| TaintedPath.js:139:7:139:10 | path | TaintedPath.js:143:29:143:32 | path | provenance |  |
+| TaintedPath.js:139:7:139:10 | path | TaintedPath.js:149:29:149:32 | path | provenance |  |
+| TaintedPath.js:139:7:139:10 | path | TaintedPath.js:150:29:150:32 | path | provenance |  |
+| TaintedPath.js:139:7:139:10 | path | TaintedPath.js:151:29:151:32 | path | provenance |  |
+| TaintedPath.js:139:7:139:10 | path | TaintedPath.js:152:29:152:32 | path | provenance |  |
+| TaintedPath.js:139:7:139:10 | path | TaintedPath.js:167:40:167:43 | path | provenance |  |
+| TaintedPath.js:139:7:139:10 | path | TaintedPath.js:168:50:168:53 | path | provenance |  |
 | TaintedPath.js:139:14:139:37 | url.par ... , true) | TaintedPath.js:139:14:139:43 | url.par ... ).query | provenance | Config |
 | TaintedPath.js:139:14:139:43 | url.par ... ).query | TaintedPath.js:139:14:139:48 | url.par ... ry.path | provenance | Config |
-| TaintedPath.js:139:14:139:48 | url.par ... ry.path | TaintedPath.js:139:7:139:48 | path | provenance |  |
+| TaintedPath.js:139:14:139:48 | url.par ... ry.path | TaintedPath.js:139:7:139:10 | path | provenance |  |
 | TaintedPath.js:139:24:139:30 | req.url | TaintedPath.js:139:14:139:37 | url.par ... , true) | provenance | Config |
 | TaintedPath.js:143:29:143:32 | path | TaintedPath.js:143:29:143:55 | path.re ... /g, '') | provenance | Config |
 | TaintedPath.js:149:29:149:32 | path | TaintedPath.js:149:29:149:52 | path.re ... /g, '') | provenance | Config |
@@ -364,360 +364,360 @@ edges
 | TaintedPath.js:177:51:177:57 | req.url | TaintedPath.js:177:38:177:58 | normali ... eq.url) | provenance | Config |
 | TaintedPath.js:179:29:179:51 | parseqs ... eq.url) | TaintedPath.js:179:29:179:55 | parseqs ... rl).foo | provenance | Config |
 | TaintedPath.js:179:44:179:50 | req.url | TaintedPath.js:179:29:179:51 | parseqs ... eq.url) | provenance | Config |
-| TaintedPath.js:184:7:184:48 | path | TaintedPath.js:185:31:185:34 | path | provenance |  |
-| TaintedPath.js:184:7:184:48 | path | TaintedPath.js:186:45:186:48 | path | provenance |  |
-| TaintedPath.js:184:7:184:48 | path | TaintedPath.js:187:35:187:38 | path | provenance |  |
+| TaintedPath.js:184:7:184:10 | path | TaintedPath.js:185:31:185:34 | path | provenance |  |
+| TaintedPath.js:184:7:184:10 | path | TaintedPath.js:186:45:186:48 | path | provenance |  |
+| TaintedPath.js:184:7:184:10 | path | TaintedPath.js:187:35:187:38 | path | provenance |  |
 | TaintedPath.js:184:14:184:37 | url.par ... , true) | TaintedPath.js:184:14:184:43 | url.par ... ).query | provenance | Config |
 | TaintedPath.js:184:14:184:43 | url.par ... ).query | TaintedPath.js:184:14:184:48 | url.par ... ry.path | provenance | Config |
-| TaintedPath.js:184:14:184:48 | url.par ... ry.path | TaintedPath.js:184:7:184:48 | path | provenance |  |
+| TaintedPath.js:184:14:184:48 | url.par ... ry.path | TaintedPath.js:184:7:184:10 | path | provenance |  |
 | TaintedPath.js:184:24:184:30 | req.url | TaintedPath.js:184:14:184:37 | url.par ... , true) | provenance | Config |
-| TaintedPath.js:191:7:191:48 | path | TaintedPath.js:195:29:195:32 | path | provenance |  |
+| TaintedPath.js:191:7:191:10 | path | TaintedPath.js:195:29:195:32 | path | provenance |  |
 | TaintedPath.js:191:14:191:37 | url.par ... , true) | TaintedPath.js:191:14:191:43 | url.par ... ).query | provenance | Config |
 | TaintedPath.js:191:14:191:43 | url.par ... ).query | TaintedPath.js:191:14:191:48 | url.par ... ry.path | provenance | Config |
-| TaintedPath.js:191:14:191:48 | url.par ... ry.path | TaintedPath.js:191:7:191:48 | path | provenance |  |
+| TaintedPath.js:191:14:191:48 | url.par ... ry.path | TaintedPath.js:191:7:191:10 | path | provenance |  |
 | TaintedPath.js:191:24:191:30 | req.url | TaintedPath.js:191:14:191:37 | url.par ... , true) | provenance | Config |
 | TaintedPath.js:195:29:195:32 | path | TaintedPath.js:195:29:195:85 | path.re ... '), '') | provenance | Config |
-| TaintedPath.js:200:7:200:48 | path | TaintedPath.js:202:29:202:32 | path | provenance |  |
-| TaintedPath.js:200:7:200:48 | path | TaintedPath.js:205:31:205:34 | path | provenance |  |
+| TaintedPath.js:200:7:200:10 | path | TaintedPath.js:202:29:202:32 | path | provenance |  |
+| TaintedPath.js:200:7:200:10 | path | TaintedPath.js:205:31:205:34 | path | provenance |  |
 | TaintedPath.js:200:14:200:37 | url.par ... , true) | TaintedPath.js:200:14:200:43 | url.par ... ).query | provenance | Config |
 | TaintedPath.js:200:14:200:43 | url.par ... ).query | TaintedPath.js:200:14:200:48 | url.par ... ry.path | provenance | Config |
-| TaintedPath.js:200:14:200:48 | url.par ... ry.path | TaintedPath.js:200:7:200:48 | path | provenance |  |
+| TaintedPath.js:200:14:200:48 | url.par ... ry.path | TaintedPath.js:200:7:200:10 | path | provenance |  |
 | TaintedPath.js:200:24:200:30 | req.url | TaintedPath.js:200:14:200:37 | url.par ... , true) | provenance | Config |
 | TaintedPath.js:202:29:202:32 | path | TaintedPath.js:202:29:202:68 | path.re ... '), '') | provenance | Config |
 | TaintedPath.js:205:31:205:34 | path | TaintedPath.js:205:31:205:69 | path.re ... '), '') | provenance | Config |
-| TaintedPath.js:212:7:212:48 | path | TaintedPath.js:213:33:213:36 | path | provenance |  |
-| TaintedPath.js:212:7:212:48 | path | TaintedPath.js:215:36:215:39 | path | provenance |  |
+| TaintedPath.js:212:7:212:10 | path | TaintedPath.js:213:33:213:36 | path | provenance |  |
+| TaintedPath.js:212:7:212:10 | path | TaintedPath.js:215:36:215:39 | path | provenance |  |
 | TaintedPath.js:212:14:212:37 | url.par ... , true) | TaintedPath.js:212:14:212:43 | url.par ... ).query | provenance | Config |
 | TaintedPath.js:212:14:212:43 | url.par ... ).query | TaintedPath.js:212:14:212:48 | url.par ... ry.path | provenance | Config |
-| TaintedPath.js:212:14:212:48 | url.par ... ry.path | TaintedPath.js:212:7:212:48 | path | provenance |  |
+| TaintedPath.js:212:14:212:48 | url.par ... ry.path | TaintedPath.js:212:7:212:10 | path | provenance |  |
 | TaintedPath.js:212:24:212:30 | req.url | TaintedPath.js:212:14:212:37 | url.par ... , true) | provenance | Config |
-| TaintedPath.js:213:9:213:37 | improperEscape | TaintedPath.js:214:29:214:42 | improperEscape | provenance |  |
-| TaintedPath.js:213:26:213:37 | escape(path) | TaintedPath.js:213:9:213:37 | improperEscape | provenance |  |
+| TaintedPath.js:213:9:213:22 | improperEscape | TaintedPath.js:214:29:214:42 | improperEscape | provenance |  |
+| TaintedPath.js:213:26:213:37 | escape(path) | TaintedPath.js:213:9:213:22 | improperEscape | provenance |  |
 | TaintedPath.js:213:33:213:36 | path | TaintedPath.js:213:26:213:37 | escape(path) | provenance | Config |
-| TaintedPath.js:215:9:215:40 | improperEscape2 | TaintedPath.js:216:29:216:43 | improperEscape2 | provenance |  |
-| TaintedPath.js:215:27:215:40 | unescape(path) | TaintedPath.js:215:9:215:40 | improperEscape2 | provenance |  |
+| TaintedPath.js:215:9:215:23 | improperEscape2 | TaintedPath.js:216:29:216:43 | improperEscape2 | provenance |  |
+| TaintedPath.js:215:27:215:40 | unescape(path) | TaintedPath.js:215:9:215:23 | improperEscape2 | provenance |  |
 | TaintedPath.js:215:36:215:39 | path | TaintedPath.js:215:27:215:40 | unescape(path) | provenance | Config |
-| examples/TaintedPath.js:8:7:8:52 | filePath | examples/TaintedPath.js:10:36:10:43 | filePath | provenance |  |
+| examples/TaintedPath.js:8:7:8:14 | filePath | examples/TaintedPath.js:10:36:10:43 | filePath | provenance |  |
 | examples/TaintedPath.js:8:18:8:41 | url.par ... , true) | examples/TaintedPath.js:8:18:8:47 | url.par ... ).query | provenance | Config |
 | examples/TaintedPath.js:8:18:8:47 | url.par ... ).query | examples/TaintedPath.js:8:18:8:52 | url.par ... ry.path | provenance | Config |
-| examples/TaintedPath.js:8:18:8:52 | url.par ... ry.path | examples/TaintedPath.js:8:7:8:52 | filePath | provenance |  |
+| examples/TaintedPath.js:8:18:8:52 | url.par ... ry.path | examples/TaintedPath.js:8:7:8:14 | filePath | provenance |  |
 | examples/TaintedPath.js:8:28:8:34 | req.url | examples/TaintedPath.js:8:18:8:41 | url.par ... , true) | provenance | Config |
 | examples/TaintedPath.js:10:36:10:43 | filePath | examples/TaintedPath.js:10:29:10:43 | ROOT + filePath | provenance | Config |
-| execa.js:6:9:6:64 | filePath | execa.js:9:26:9:33 | filePath | provenance |  |
-| execa.js:6:9:6:64 | filePath | execa.js:12:37:12:44 | filePath | provenance |  |
-| execa.js:6:9:6:64 | filePath | execa.js:15:50:15:57 | filePath | provenance |  |
-| execa.js:6:9:6:64 | filePath | execa.js:18:62:18:69 | filePath | provenance |  |
+| execa.js:6:9:6:16 | filePath | execa.js:9:26:9:33 | filePath | provenance |  |
+| execa.js:6:9:6:16 | filePath | execa.js:12:37:12:44 | filePath | provenance |  |
+| execa.js:6:9:6:16 | filePath | execa.js:15:50:15:57 | filePath | provenance |  |
+| execa.js:6:9:6:16 | filePath | execa.js:18:62:18:69 | filePath | provenance |  |
 | execa.js:6:20:6:43 | url.par ... , true) | execa.js:6:20:6:49 | url.par ... ).query | provenance | Config |
 | execa.js:6:20:6:49 | url.par ... ).query | execa.js:6:20:6:61 | url.par ... ePath"] | provenance | Config |
 | execa.js:6:20:6:61 | url.par ... ePath"] | execa.js:6:20:6:64 | url.par ... th"][0] | provenance | Config |
-| execa.js:6:20:6:64 | url.par ... th"][0] | execa.js:6:9:6:64 | filePath | provenance |  |
+| execa.js:6:20:6:64 | url.par ... th"][0] | execa.js:6:9:6:16 | filePath | provenance |  |
 | execa.js:6:30:6:36 | req.url | execa.js:6:20:6:43 | url.par ... , true) | provenance | Config |
 | handlebars.js:10:51:10:58 | filePath | handlebars.js:11:32:11:39 | filePath | provenance |  |
 | handlebars.js:13:73:13:80 | filePath | handlebars.js:15:25:15:32 | filePath | provenance |  |
 | handlebars.js:29:46:29:60 | req.params.path | handlebars.js:10:51:10:58 | filePath | provenance |  |
 | handlebars.js:43:15:43:29 | req.params.path | handlebars.js:13:73:13:80 | filePath | provenance |  |
-| hapi.js:14:19:14:51 | filepath | hapi.js:15:44:15:51 | filepath | provenance |  |
-| hapi.js:14:30:14:51 | request ... ilepath | hapi.js:14:19:14:51 | filepath | provenance |  |
-| make-dir.js:7:11:7:31 | file | make-dir.js:9:25:9:28 | file | provenance |  |
-| make-dir.js:7:11:7:31 | file | make-dir.js:10:23:10:26 | file | provenance |  |
-| make-dir.js:7:18:7:31 | req.query.file | make-dir.js:7:11:7:31 | file | provenance |  |
-| mkdirp.js:9:11:9:76 | dirPath | mkdirp.js:11:12:11:18 | dirPath | provenance |  |
-| mkdirp.js:9:11:9:76 | dirPath | mkdirp.js:12:17:12:23 | dirPath | provenance |  |
-| mkdirp.js:9:11:9:76 | dirPath | mkdirp.js:13:23:13:29 | dirPath | provenance |  |
-| mkdirp.js:9:11:9:76 | dirPath | mkdirp.js:14:19:14:25 | dirPath | provenance |  |
-| mkdirp.js:9:11:9:76 | dirPath | mkdirp.js:15:19:15:25 | dirPath | provenance |  |
-| mkdirp.js:9:11:9:76 | dirPath | mkdirp.js:16:23:16:29 | dirPath | provenance |  |
-| mkdirp.js:9:11:9:76 | dirPath | mkdirp.js:17:25:17:31 | dirPath | provenance |  |
-| mkdirp.js:9:11:9:76 | dirPath | mkdirp.js:18:25:18:31 | dirPath | provenance |  |
-| mkdirp.js:9:11:9:76 | dirPath | mkdirp.js:19:29:19:35 | dirPath | provenance |  |
-| mkdirp.js:9:11:9:76 | dirPath | mkdirp.js:20:29:20:35 | dirPath | provenance |  |
-| mkdirp.js:9:11:9:76 | dirPath | mkdirp.js:21:23:21:29 | dirPath | provenance |  |
-| mkdirp.js:9:21:9:76 | path.jo ... ltDir') | mkdirp.js:9:11:9:76 | dirPath | provenance |  |
+| hapi.js:14:19:14:26 | filepath | hapi.js:15:44:15:51 | filepath | provenance |  |
+| hapi.js:14:30:14:51 | request ... ilepath | hapi.js:14:19:14:26 | filepath | provenance |  |
+| make-dir.js:7:11:7:14 | file | make-dir.js:9:25:9:28 | file | provenance |  |
+| make-dir.js:7:11:7:14 | file | make-dir.js:10:23:10:26 | file | provenance |  |
+| make-dir.js:7:18:7:31 | req.query.file | make-dir.js:7:11:7:14 | file | provenance |  |
+| mkdirp.js:9:11:9:17 | dirPath | mkdirp.js:11:12:11:18 | dirPath | provenance |  |
+| mkdirp.js:9:11:9:17 | dirPath | mkdirp.js:12:17:12:23 | dirPath | provenance |  |
+| mkdirp.js:9:11:9:17 | dirPath | mkdirp.js:13:23:13:29 | dirPath | provenance |  |
+| mkdirp.js:9:11:9:17 | dirPath | mkdirp.js:14:19:14:25 | dirPath | provenance |  |
+| mkdirp.js:9:11:9:17 | dirPath | mkdirp.js:15:19:15:25 | dirPath | provenance |  |
+| mkdirp.js:9:11:9:17 | dirPath | mkdirp.js:16:23:16:29 | dirPath | provenance |  |
+| mkdirp.js:9:11:9:17 | dirPath | mkdirp.js:17:25:17:31 | dirPath | provenance |  |
+| mkdirp.js:9:11:9:17 | dirPath | mkdirp.js:18:25:18:31 | dirPath | provenance |  |
+| mkdirp.js:9:11:9:17 | dirPath | mkdirp.js:19:29:19:35 | dirPath | provenance |  |
+| mkdirp.js:9:11:9:17 | dirPath | mkdirp.js:20:29:20:35 | dirPath | provenance |  |
+| mkdirp.js:9:11:9:17 | dirPath | mkdirp.js:21:23:21:29 | dirPath | provenance |  |
+| mkdirp.js:9:21:9:76 | path.jo ... ltDir') | mkdirp.js:9:11:9:17 | dirPath | provenance |  |
 | mkdirp.js:9:42:9:59 | req.query.filename | mkdirp.js:9:42:9:75 | req.que ... ultDir' | provenance |  |
 | mkdirp.js:9:42:9:75 | req.que ... ultDir' | mkdirp.js:9:21:9:76 | path.jo ... ltDir') | provenance | Config |
 | more-fs-extra.js:8:11:8:22 | { filename } | more-fs-extra.js:8:13:8:20 | filename | provenance | Config |
-| more-fs-extra.js:8:11:8:33 | filename | more-fs-extra.js:10:15:10:22 | filename | provenance |  |
-| more-fs-extra.js:8:11:8:33 | filename | more-fs-extra.js:11:11:11:18 | filename | provenance |  |
-| more-fs-extra.js:8:11:8:33 | filename | more-fs-extra.js:12:14:12:21 | filename | provenance |  |
-| more-fs-extra.js:8:11:8:33 | filename | more-fs-extra.js:13:18:13:25 | filename | provenance |  |
-| more-fs-extra.js:8:11:8:33 | filename | more-fs-extra.js:14:11:14:18 | filename | provenance |  |
-| more-fs-extra.js:8:11:8:33 | filename | more-fs-extra.js:15:21:15:28 | filename | provenance |  |
-| more-fs-extra.js:8:11:8:33 | filename | more-fs-extra.js:16:21:16:28 | filename | provenance |  |
-| more-fs-extra.js:8:11:8:33 | filename | more-fs-extra.js:17:31:17:38 | filename | provenance |  |
-| more-fs-extra.js:8:11:8:33 | filename | more-fs-extra.js:18:15:18:22 | filename | provenance |  |
-| more-fs-extra.js:8:11:8:33 | filename | more-fs-extra.js:19:25:19:32 | filename | provenance |  |
-| more-fs-extra.js:8:11:8:33 | filename | more-fs-extra.js:20:21:20:28 | filename | provenance |  |
-| more-fs-extra.js:8:11:8:33 | filename | more-fs-extra.js:21:17:21:24 | filename | provenance |  |
-| more-fs-extra.js:8:11:8:33 | filename | more-fs-extra.js:22:16:22:23 | filename | provenance |  |
-| more-fs-extra.js:8:11:8:33 | filename | more-fs-extra.js:23:20:23:27 | filename | provenance |  |
-| more-fs-extra.js:8:11:8:33 | filename | more-fs-extra.js:24:19:24:26 | filename | provenance |  |
-| more-fs-extra.js:8:11:8:33 | filename | more-fs-extra.js:25:15:25:22 | filename | provenance |  |
-| more-fs-extra.js:8:11:8:33 | filename | more-fs-extra.js:26:19:26:26 | filename | provenance |  |
-| more-fs-extra.js:8:11:8:33 | filename | more-fs-extra.js:27:13:27:20 | filename | provenance |  |
-| more-fs-extra.js:8:11:8:33 | filename | more-fs-extra.js:28:17:28:24 | filename | provenance |  |
-| more-fs-extra.js:8:11:8:33 | filename | more-fs-extra.js:29:23:29:30 | filename | provenance |  |
-| more-fs-extra.js:8:11:8:33 | filename | more-fs-extra.js:30:16:30:23 | filename | provenance |  |
-| more-fs-extra.js:8:11:8:33 | filename | more-fs-extra.js:31:20:31:27 | filename | provenance |  |
-| more-fs-extra.js:8:11:8:33 | filename | more-fs-extra.js:32:23:32:30 | filename | provenance |  |
-| more-fs-extra.js:8:13:8:20 | filename | more-fs-extra.js:8:11:8:33 | filename | provenance |  |
+| more-fs-extra.js:8:13:8:20 | filename | more-fs-extra.js:8:13:8:20 | filename | provenance |  |
+| more-fs-extra.js:8:13:8:20 | filename | more-fs-extra.js:10:15:10:22 | filename | provenance |  |
+| more-fs-extra.js:8:13:8:20 | filename | more-fs-extra.js:11:11:11:18 | filename | provenance |  |
+| more-fs-extra.js:8:13:8:20 | filename | more-fs-extra.js:12:14:12:21 | filename | provenance |  |
+| more-fs-extra.js:8:13:8:20 | filename | more-fs-extra.js:13:18:13:25 | filename | provenance |  |
+| more-fs-extra.js:8:13:8:20 | filename | more-fs-extra.js:14:11:14:18 | filename | provenance |  |
+| more-fs-extra.js:8:13:8:20 | filename | more-fs-extra.js:15:21:15:28 | filename | provenance |  |
+| more-fs-extra.js:8:13:8:20 | filename | more-fs-extra.js:16:21:16:28 | filename | provenance |  |
+| more-fs-extra.js:8:13:8:20 | filename | more-fs-extra.js:17:31:17:38 | filename | provenance |  |
+| more-fs-extra.js:8:13:8:20 | filename | more-fs-extra.js:18:15:18:22 | filename | provenance |  |
+| more-fs-extra.js:8:13:8:20 | filename | more-fs-extra.js:19:25:19:32 | filename | provenance |  |
+| more-fs-extra.js:8:13:8:20 | filename | more-fs-extra.js:20:21:20:28 | filename | provenance |  |
+| more-fs-extra.js:8:13:8:20 | filename | more-fs-extra.js:21:17:21:24 | filename | provenance |  |
+| more-fs-extra.js:8:13:8:20 | filename | more-fs-extra.js:22:16:22:23 | filename | provenance |  |
+| more-fs-extra.js:8:13:8:20 | filename | more-fs-extra.js:23:20:23:27 | filename | provenance |  |
+| more-fs-extra.js:8:13:8:20 | filename | more-fs-extra.js:24:19:24:26 | filename | provenance |  |
+| more-fs-extra.js:8:13:8:20 | filename | more-fs-extra.js:25:15:25:22 | filename | provenance |  |
+| more-fs-extra.js:8:13:8:20 | filename | more-fs-extra.js:26:19:26:26 | filename | provenance |  |
+| more-fs-extra.js:8:13:8:20 | filename | more-fs-extra.js:27:13:27:20 | filename | provenance |  |
+| more-fs-extra.js:8:13:8:20 | filename | more-fs-extra.js:28:17:28:24 | filename | provenance |  |
+| more-fs-extra.js:8:13:8:20 | filename | more-fs-extra.js:29:23:29:30 | filename | provenance |  |
+| more-fs-extra.js:8:13:8:20 | filename | more-fs-extra.js:30:16:30:23 | filename | provenance |  |
+| more-fs-extra.js:8:13:8:20 | filename | more-fs-extra.js:31:20:31:27 | filename | provenance |  |
+| more-fs-extra.js:8:13:8:20 | filename | more-fs-extra.js:32:23:32:30 | filename | provenance |  |
 | more-fs-extra.js:8:26:8:33 | req.body | more-fs-extra.js:8:11:8:22 | { filename } | provenance |  |
-| normalizedPaths.js:11:7:11:27 | path | normalizedPaths.js:13:19:13:22 | path | provenance |  |
-| normalizedPaths.js:11:7:11:27 | path | normalizedPaths.js:14:26:14:29 | path | provenance |  |
-| normalizedPaths.js:11:7:11:27 | path | normalizedPaths.js:15:19:15:22 | path | provenance |  |
-| normalizedPaths.js:11:7:11:27 | path | normalizedPaths.js:16:35:16:38 | path | provenance |  |
-| normalizedPaths.js:11:7:11:27 | path | normalizedPaths.js:17:53:17:56 | path | provenance |  |
-| normalizedPaths.js:11:14:11:27 | req.query.path | normalizedPaths.js:11:7:11:27 | path | provenance |  |
+| normalizedPaths.js:11:7:11:10 | path | normalizedPaths.js:13:19:13:22 | path | provenance |  |
+| normalizedPaths.js:11:7:11:10 | path | normalizedPaths.js:14:26:14:29 | path | provenance |  |
+| normalizedPaths.js:11:7:11:10 | path | normalizedPaths.js:15:19:15:22 | path | provenance |  |
+| normalizedPaths.js:11:7:11:10 | path | normalizedPaths.js:16:35:16:38 | path | provenance |  |
+| normalizedPaths.js:11:7:11:10 | path | normalizedPaths.js:17:53:17:56 | path | provenance |  |
+| normalizedPaths.js:11:14:11:27 | req.query.path | normalizedPaths.js:11:7:11:10 | path | provenance |  |
 | normalizedPaths.js:14:26:14:29 | path | normalizedPaths.js:14:19:14:29 | './' + path | provenance | Config |
 | normalizedPaths.js:15:19:15:22 | path | normalizedPaths.js:15:19:15:38 | path + '/index.html' | provenance | Config |
 | normalizedPaths.js:16:35:16:38 | path | normalizedPaths.js:16:19:16:53 | pathMod ... .html') | provenance | Config |
 | normalizedPaths.js:17:53:17:56 | path | normalizedPaths.js:17:19:17:57 | pathMod ... , path) | provenance | Config |
-| normalizedPaths.js:21:7:21:49 | path | normalizedPaths.js:23:19:23:22 | path | provenance |  |
-| normalizedPaths.js:21:7:21:49 | path | normalizedPaths.js:24:26:24:29 | path | provenance |  |
-| normalizedPaths.js:21:7:21:49 | path | normalizedPaths.js:25:19:25:22 | path | provenance |  |
-| normalizedPaths.js:21:7:21:49 | path | normalizedPaths.js:26:35:26:38 | path | provenance |  |
-| normalizedPaths.js:21:7:21:49 | path | normalizedPaths.js:27:53:27:56 | path | provenance |  |
-| normalizedPaths.js:21:14:21:49 | pathMod ... y.path) | normalizedPaths.js:21:7:21:49 | path | provenance |  |
+| normalizedPaths.js:21:7:21:10 | path | normalizedPaths.js:23:19:23:22 | path | provenance |  |
+| normalizedPaths.js:21:7:21:10 | path | normalizedPaths.js:24:26:24:29 | path | provenance |  |
+| normalizedPaths.js:21:7:21:10 | path | normalizedPaths.js:25:19:25:22 | path | provenance |  |
+| normalizedPaths.js:21:7:21:10 | path | normalizedPaths.js:26:35:26:38 | path | provenance |  |
+| normalizedPaths.js:21:7:21:10 | path | normalizedPaths.js:27:53:27:56 | path | provenance |  |
+| normalizedPaths.js:21:14:21:49 | pathMod ... y.path) | normalizedPaths.js:21:7:21:10 | path | provenance |  |
 | normalizedPaths.js:21:35:21:48 | req.query.path | normalizedPaths.js:21:14:21:49 | pathMod ... y.path) | provenance | Config |
 | normalizedPaths.js:24:26:24:29 | path | normalizedPaths.js:24:19:24:29 | './' + path | provenance | Config |
 | normalizedPaths.js:25:19:25:22 | path | normalizedPaths.js:25:19:25:38 | path + '/index.html' | provenance | Config |
 | normalizedPaths.js:26:35:26:38 | path | normalizedPaths.js:26:19:26:53 | pathMod ... .html') | provenance | Config |
 | normalizedPaths.js:27:53:27:56 | path | normalizedPaths.js:27:19:27:57 | pathMod ... , path) | provenance | Config |
-| normalizedPaths.js:31:7:31:49 | path | normalizedPaths.js:36:19:36:22 | path | provenance |  |
-| normalizedPaths.js:31:7:31:49 | path | normalizedPaths.js:41:21:41:24 | path | provenance |  |
-| normalizedPaths.js:31:14:31:49 | pathMod ... y.path) | normalizedPaths.js:31:7:31:49 | path | provenance |  |
+| normalizedPaths.js:31:7:31:10 | path | normalizedPaths.js:36:19:36:22 | path | provenance |  |
+| normalizedPaths.js:31:7:31:10 | path | normalizedPaths.js:41:21:41:24 | path | provenance |  |
+| normalizedPaths.js:31:14:31:49 | pathMod ... y.path) | normalizedPaths.js:31:7:31:10 | path | provenance |  |
 | normalizedPaths.js:31:35:31:48 | req.query.path | normalizedPaths.js:31:14:31:49 | pathMod ... y.path) | provenance | Config |
-| normalizedPaths.js:54:7:54:49 | path | normalizedPaths.js:59:19:59:22 | path | provenance |  |
-| normalizedPaths.js:54:7:54:49 | path | normalizedPaths.js:63:19:63:22 | path | provenance |  |
-| normalizedPaths.js:54:7:54:49 | path | normalizedPaths.js:68:21:68:24 | path | provenance |  |
-| normalizedPaths.js:54:14:54:49 | pathMod ... y.path) | normalizedPaths.js:54:7:54:49 | path | provenance |  |
+| normalizedPaths.js:54:7:54:10 | path | normalizedPaths.js:59:19:59:22 | path | provenance |  |
+| normalizedPaths.js:54:7:54:10 | path | normalizedPaths.js:63:19:63:22 | path | provenance |  |
+| normalizedPaths.js:54:7:54:10 | path | normalizedPaths.js:68:21:68:24 | path | provenance |  |
+| normalizedPaths.js:54:14:54:49 | pathMod ... y.path) | normalizedPaths.js:54:7:54:10 | path | provenance |  |
 | normalizedPaths.js:54:35:54:48 | req.query.path | normalizedPaths.js:54:14:54:49 | pathMod ... y.path) | provenance | Config |
 | normalizedPaths.js:63:19:63:22 | path | normalizedPaths.js:63:19:63:38 | path + "/index.html" | provenance | Config |
-| normalizedPaths.js:73:7:73:56 | path | normalizedPaths.js:78:22:78:25 | path | provenance |  |
-| normalizedPaths.js:73:14:73:56 | pathMod ... y.path) | normalizedPaths.js:73:7:73:56 | path | provenance |  |
+| normalizedPaths.js:73:7:73:10 | path | normalizedPaths.js:78:22:78:25 | path | provenance |  |
+| normalizedPaths.js:73:14:73:56 | pathMod ... y.path) | normalizedPaths.js:73:7:73:10 | path | provenance |  |
 | normalizedPaths.js:73:35:73:55 | './' +  ... ry.path | normalizedPaths.js:73:14:73:56 | pathMod ... y.path) | provenance | Config |
 | normalizedPaths.js:73:42:73:55 | req.query.path | normalizedPaths.js:73:35:73:55 | './' +  ... ry.path | provenance | Config |
-| normalizedPaths.js:82:7:82:27 | path | normalizedPaths.js:87:29:87:32 | path | provenance |  |
-| normalizedPaths.js:82:7:82:27 | path | normalizedPaths.js:90:31:90:34 | path | provenance |  |
-| normalizedPaths.js:82:14:82:27 | req.query.path | normalizedPaths.js:82:7:82:27 | path | provenance |  |
-| normalizedPaths.js:94:7:94:49 | path | normalizedPaths.js:99:29:99:32 | path | provenance |  |
-| normalizedPaths.js:94:14:94:49 | pathMod ... y.path) | normalizedPaths.js:94:7:94:49 | path | provenance |  |
+| normalizedPaths.js:82:7:82:10 | path | normalizedPaths.js:87:29:87:32 | path | provenance |  |
+| normalizedPaths.js:82:7:82:10 | path | normalizedPaths.js:90:31:90:34 | path | provenance |  |
+| normalizedPaths.js:82:14:82:27 | req.query.path | normalizedPaths.js:82:7:82:10 | path | provenance |  |
+| normalizedPaths.js:94:7:94:10 | path | normalizedPaths.js:99:29:99:32 | path | provenance |  |
+| normalizedPaths.js:94:14:94:49 | pathMod ... y.path) | normalizedPaths.js:94:7:94:10 | path | provenance |  |
 | normalizedPaths.js:94:35:94:48 | req.query.path | normalizedPaths.js:94:14:94:49 | pathMod ... y.path) | provenance | Config |
-| normalizedPaths.js:117:7:117:44 | path | normalizedPaths.js:119:19:119:22 | path | provenance |  |
-| normalizedPaths.js:117:7:117:44 | path | normalizedPaths.js:120:35:120:38 | path | provenance |  |
-| normalizedPaths.js:117:14:117:44 | fs.real ... y.path) | normalizedPaths.js:117:7:117:44 | path | provenance |  |
+| normalizedPaths.js:117:7:117:10 | path | normalizedPaths.js:119:19:119:22 | path | provenance |  |
+| normalizedPaths.js:117:7:117:10 | path | normalizedPaths.js:120:35:120:38 | path | provenance |  |
+| normalizedPaths.js:117:14:117:44 | fs.real ... y.path) | normalizedPaths.js:117:7:117:10 | path | provenance |  |
 | normalizedPaths.js:117:30:117:43 | req.query.path | normalizedPaths.js:117:14:117:44 | fs.real ... y.path) | provenance | Config |
 | normalizedPaths.js:120:35:120:38 | path | normalizedPaths.js:120:19:120:53 | pathMod ... .html') | provenance | Config |
-| normalizedPaths.js:130:7:130:49 | path | normalizedPaths.js:135:21:135:24 | path | provenance |  |
-| normalizedPaths.js:130:14:130:49 | pathMod ... y.path) | normalizedPaths.js:130:7:130:49 | path | provenance |  |
+| normalizedPaths.js:130:7:130:10 | path | normalizedPaths.js:135:21:135:24 | path | provenance |  |
+| normalizedPaths.js:130:14:130:49 | pathMod ... y.path) | normalizedPaths.js:130:7:130:10 | path | provenance |  |
 | normalizedPaths.js:130:35:130:48 | req.query.path | normalizedPaths.js:130:14:130:49 | pathMod ... y.path) | provenance | Config |
-| normalizedPaths.js:139:7:139:62 | path | normalizedPaths.js:144:21:144:24 | path | provenance |  |
-| normalizedPaths.js:139:14:139:62 | pathMod ... y.path) | normalizedPaths.js:139:7:139:62 | path | provenance |  |
+| normalizedPaths.js:139:7:139:10 | path | normalizedPaths.js:144:21:144:24 | path | provenance |  |
+| normalizedPaths.js:139:14:139:62 | pathMod ... y.path) | normalizedPaths.js:139:7:139:10 | path | provenance |  |
 | normalizedPaths.js:139:48:139:61 | req.query.path | normalizedPaths.js:139:14:139:62 | pathMod ... y.path) | provenance | Config |
-| normalizedPaths.js:148:7:148:58 | path | normalizedPaths.js:151:21:151:24 | path | provenance |  |
-| normalizedPaths.js:148:7:148:58 | path | normalizedPaths.js:153:21:153:24 | path | provenance |  |
-| normalizedPaths.js:148:14:148:58 | 'foo/'  ... y.path) | normalizedPaths.js:148:7:148:58 | path | provenance |  |
+| normalizedPaths.js:148:7:148:10 | path | normalizedPaths.js:151:21:151:24 | path | provenance |  |
+| normalizedPaths.js:148:7:148:10 | path | normalizedPaths.js:153:21:153:24 | path | provenance |  |
+| normalizedPaths.js:148:14:148:58 | 'foo/'  ... y.path) | normalizedPaths.js:148:7:148:10 | path | provenance |  |
 | normalizedPaths.js:148:23:148:58 | pathMod ... y.path) | normalizedPaths.js:148:14:148:58 | 'foo/'  ... y.path) | provenance | Config |
 | normalizedPaths.js:148:44:148:57 | req.query.path | normalizedPaths.js:148:23:148:58 | pathMod ... y.path) | provenance | Config |
-| normalizedPaths.js:160:7:160:49 | path | normalizedPaths.js:165:19:165:22 | path | provenance |  |
-| normalizedPaths.js:160:7:160:49 | path | normalizedPaths.js:170:21:170:24 | path | provenance |  |
-| normalizedPaths.js:160:14:160:49 | pathMod ... y.path) | normalizedPaths.js:160:7:160:49 | path | provenance |  |
+| normalizedPaths.js:160:7:160:10 | path | normalizedPaths.js:165:19:165:22 | path | provenance |  |
+| normalizedPaths.js:160:7:160:10 | path | normalizedPaths.js:170:21:170:24 | path | provenance |  |
+| normalizedPaths.js:160:14:160:49 | pathMod ... y.path) | normalizedPaths.js:160:7:160:10 | path | provenance |  |
 | normalizedPaths.js:160:35:160:48 | req.query.path | normalizedPaths.js:160:14:160:49 | pathMod ... y.path) | provenance | Config |
-| normalizedPaths.js:174:7:174:27 | path | normalizedPaths.js:184:19:184:22 | path | provenance |  |
-| normalizedPaths.js:174:7:174:27 | path | normalizedPaths.js:187:21:187:24 | path | provenance |  |
-| normalizedPaths.js:174:7:174:27 | path | normalizedPaths.js:189:21:189:24 | path | provenance |  |
-| normalizedPaths.js:174:7:174:27 | path | normalizedPaths.js:192:21:192:24 | path | provenance |  |
-| normalizedPaths.js:174:7:174:27 | path | normalizedPaths.js:194:21:194:24 | path | provenance |  |
-| normalizedPaths.js:174:7:174:27 | path | normalizedPaths.js:199:21:199:24 | path | provenance |  |
-| normalizedPaths.js:174:7:174:27 | path | normalizedPaths.js:201:45:201:48 | path | provenance |  |
-| normalizedPaths.js:174:14:174:27 | req.query.path | normalizedPaths.js:174:7:174:27 | path | provenance |  |
-| normalizedPaths.js:201:7:201:49 | normalizedPath | normalizedPaths.js:205:21:205:34 | normalizedPath | provenance |  |
-| normalizedPaths.js:201:7:201:49 | normalizedPath | normalizedPaths.js:208:21:208:34 | normalizedPath | provenance |  |
-| normalizedPaths.js:201:7:201:49 | normalizedPath | normalizedPaths.js:210:21:210:34 | normalizedPath | provenance |  |
-| normalizedPaths.js:201:24:201:49 | pathMod ... e(path) | normalizedPaths.js:201:7:201:49 | normalizedPath | provenance |  |
+| normalizedPaths.js:174:7:174:10 | path | normalizedPaths.js:184:19:184:22 | path | provenance |  |
+| normalizedPaths.js:174:7:174:10 | path | normalizedPaths.js:187:21:187:24 | path | provenance |  |
+| normalizedPaths.js:174:7:174:10 | path | normalizedPaths.js:189:21:189:24 | path | provenance |  |
+| normalizedPaths.js:174:7:174:10 | path | normalizedPaths.js:192:21:192:24 | path | provenance |  |
+| normalizedPaths.js:174:7:174:10 | path | normalizedPaths.js:194:21:194:24 | path | provenance |  |
+| normalizedPaths.js:174:7:174:10 | path | normalizedPaths.js:199:21:199:24 | path | provenance |  |
+| normalizedPaths.js:174:7:174:10 | path | normalizedPaths.js:201:45:201:48 | path | provenance |  |
+| normalizedPaths.js:174:14:174:27 | req.query.path | normalizedPaths.js:174:7:174:10 | path | provenance |  |
+| normalizedPaths.js:201:7:201:20 | normalizedPath | normalizedPaths.js:205:21:205:34 | normalizedPath | provenance |  |
+| normalizedPaths.js:201:7:201:20 | normalizedPath | normalizedPaths.js:208:21:208:34 | normalizedPath | provenance |  |
+| normalizedPaths.js:201:7:201:20 | normalizedPath | normalizedPaths.js:210:21:210:34 | normalizedPath | provenance |  |
+| normalizedPaths.js:201:24:201:49 | pathMod ... e(path) | normalizedPaths.js:201:7:201:20 | normalizedPath | provenance |  |
 | normalizedPaths.js:201:45:201:48 | path | normalizedPaths.js:201:24:201:49 | pathMod ... e(path) | provenance | Config |
-| normalizedPaths.js:214:7:214:49 | path | normalizedPaths.js:219:29:219:32 | path | provenance |  |
-| normalizedPaths.js:214:14:214:49 | pathMod ... y.path) | normalizedPaths.js:214:7:214:49 | path | provenance |  |
+| normalizedPaths.js:214:7:214:10 | path | normalizedPaths.js:219:29:219:32 | path | provenance |  |
+| normalizedPaths.js:214:14:214:49 | pathMod ... y.path) | normalizedPaths.js:214:7:214:10 | path | provenance |  |
 | normalizedPaths.js:214:35:214:48 | req.query.path | normalizedPaths.js:214:14:214:49 | pathMod ... y.path) | provenance | Config |
-| normalizedPaths.js:219:3:219:33 | path | normalizedPaths.js:222:21:222:24 | path | provenance |  |
-| normalizedPaths.js:219:10:219:33 | decodeU ... t(path) | normalizedPaths.js:219:3:219:33 | path | provenance |  |
+| normalizedPaths.js:219:3:219:6 | path | normalizedPaths.js:222:21:222:24 | path | provenance |  |
+| normalizedPaths.js:219:10:219:33 | decodeU ... t(path) | normalizedPaths.js:219:3:219:6 | path | provenance |  |
 | normalizedPaths.js:219:29:219:32 | path | normalizedPaths.js:219:10:219:33 | decodeU ... t(path) | provenance | Config |
-| normalizedPaths.js:226:7:226:70 | path | normalizedPaths.js:228:21:228:24 | path | provenance |  |
+| normalizedPaths.js:226:7:226:10 | path | normalizedPaths.js:228:21:228:24 | path | provenance |  |
 | normalizedPaths.js:226:14:226:49 | pathMod ... y.path) | normalizedPaths.js:226:14:226:70 | pathMod ... g, ' ') | provenance | Config |
-| normalizedPaths.js:226:14:226:70 | pathMod ... g, ' ') | normalizedPaths.js:226:7:226:70 | path | provenance |  |
+| normalizedPaths.js:226:14:226:70 | pathMod ... g, ' ') | normalizedPaths.js:226:7:226:10 | path | provenance |  |
 | normalizedPaths.js:226:35:226:48 | req.query.path | normalizedPaths.js:226:14:226:49 | pathMod ... y.path) | provenance | Config |
-| normalizedPaths.js:236:7:236:47 | path | normalizedPaths.js:238:19:238:22 | path | provenance |  |
-| normalizedPaths.js:236:7:236:47 | path | normalizedPaths.js:245:21:245:24 | path | provenance |  |
-| normalizedPaths.js:236:7:236:47 | path | normalizedPaths.js:250:21:250:24 | path | provenance |  |
-| normalizedPaths.js:236:14:236:47 | pathMod ... y.path) | normalizedPaths.js:236:7:236:47 | path | provenance |  |
+| normalizedPaths.js:236:7:236:10 | path | normalizedPaths.js:238:19:238:22 | path | provenance |  |
+| normalizedPaths.js:236:7:236:10 | path | normalizedPaths.js:245:21:245:24 | path | provenance |  |
+| normalizedPaths.js:236:7:236:10 | path | normalizedPaths.js:250:21:250:24 | path | provenance |  |
+| normalizedPaths.js:236:14:236:47 | pathMod ... y.path) | normalizedPaths.js:236:7:236:10 | path | provenance |  |
 | normalizedPaths.js:236:33:236:46 | req.query.path | normalizedPaths.js:236:14:236:47 | pathMod ... y.path) | provenance | Config |
-| normalizedPaths.js:254:7:254:47 | path | normalizedPaths.js:256:19:256:22 | path | provenance |  |
-| normalizedPaths.js:254:7:254:47 | path | normalizedPaths.js:262:21:262:24 | path | provenance |  |
-| normalizedPaths.js:254:7:254:47 | path | normalizedPaths.js:267:38:267:41 | path | provenance |  |
-| normalizedPaths.js:254:7:254:47 | path | normalizedPaths.js:275:38:275:41 | path | provenance |  |
-| normalizedPaths.js:254:7:254:47 | path | normalizedPaths.js:283:38:283:41 | path | provenance |  |
-| normalizedPaths.js:254:7:254:47 | path | normalizedPaths.js:291:38:291:41 | path | provenance |  |
-| normalizedPaths.js:254:14:254:47 | pathMod ... y.path) | normalizedPaths.js:254:7:254:47 | path | provenance |  |
+| normalizedPaths.js:254:7:254:10 | path | normalizedPaths.js:256:19:256:22 | path | provenance |  |
+| normalizedPaths.js:254:7:254:10 | path | normalizedPaths.js:262:21:262:24 | path | provenance |  |
+| normalizedPaths.js:254:7:254:10 | path | normalizedPaths.js:267:38:267:41 | path | provenance |  |
+| normalizedPaths.js:254:7:254:10 | path | normalizedPaths.js:275:38:275:41 | path | provenance |  |
+| normalizedPaths.js:254:7:254:10 | path | normalizedPaths.js:283:38:283:41 | path | provenance |  |
+| normalizedPaths.js:254:7:254:10 | path | normalizedPaths.js:291:38:291:41 | path | provenance |  |
+| normalizedPaths.js:254:14:254:47 | pathMod ... y.path) | normalizedPaths.js:254:7:254:10 | path | provenance |  |
 | normalizedPaths.js:254:33:254:46 | req.query.path | normalizedPaths.js:254:14:254:47 | pathMod ... y.path) | provenance | Config |
-| normalizedPaths.js:267:7:267:42 | newpath | normalizedPaths.js:270:21:270:27 | newpath | provenance |  |
-| normalizedPaths.js:267:17:267:42 | pathMod ... e(path) | normalizedPaths.js:267:7:267:42 | newpath | provenance |  |
+| normalizedPaths.js:267:7:267:13 | newpath | normalizedPaths.js:270:21:270:27 | newpath | provenance |  |
+| normalizedPaths.js:267:17:267:42 | pathMod ... e(path) | normalizedPaths.js:267:7:267:13 | newpath | provenance |  |
 | normalizedPaths.js:267:38:267:41 | path | normalizedPaths.js:267:17:267:42 | pathMod ... e(path) | provenance | Config |
-| normalizedPaths.js:275:7:275:42 | newpath | normalizedPaths.js:278:21:278:27 | newpath | provenance |  |
-| normalizedPaths.js:275:17:275:42 | pathMod ... e(path) | normalizedPaths.js:275:7:275:42 | newpath | provenance |  |
+| normalizedPaths.js:275:7:275:13 | newpath | normalizedPaths.js:278:21:278:27 | newpath | provenance |  |
+| normalizedPaths.js:275:17:275:42 | pathMod ... e(path) | normalizedPaths.js:275:7:275:13 | newpath | provenance |  |
 | normalizedPaths.js:275:38:275:41 | path | normalizedPaths.js:275:17:275:42 | pathMod ... e(path) | provenance | Config |
-| normalizedPaths.js:283:7:283:42 | newpath | normalizedPaths.js:286:21:286:27 | newpath | provenance |  |
-| normalizedPaths.js:283:17:283:42 | pathMod ... e(path) | normalizedPaths.js:283:7:283:42 | newpath | provenance |  |
+| normalizedPaths.js:283:7:283:13 | newpath | normalizedPaths.js:286:21:286:27 | newpath | provenance |  |
+| normalizedPaths.js:283:17:283:42 | pathMod ... e(path) | normalizedPaths.js:283:7:283:13 | newpath | provenance |  |
 | normalizedPaths.js:283:38:283:41 | path | normalizedPaths.js:283:17:283:42 | pathMod ... e(path) | provenance | Config |
-| normalizedPaths.js:291:7:291:42 | newpath | normalizedPaths.js:296:21:296:27 | newpath | provenance |  |
-| normalizedPaths.js:291:17:291:42 | pathMod ... e(path) | normalizedPaths.js:291:7:291:42 | newpath | provenance |  |
+| normalizedPaths.js:291:7:291:13 | newpath | normalizedPaths.js:296:21:296:27 | newpath | provenance |  |
+| normalizedPaths.js:291:17:291:42 | pathMod ... e(path) | normalizedPaths.js:291:7:291:13 | newpath | provenance |  |
 | normalizedPaths.js:291:38:291:41 | path | normalizedPaths.js:291:17:291:42 | pathMod ... e(path) | provenance | Config |
-| normalizedPaths.js:303:6:303:26 | path | normalizedPaths.js:304:18:304:21 | path | provenance |  |
-| normalizedPaths.js:303:6:303:26 | path | normalizedPaths.js:309:19:309:22 | path | provenance |  |
-| normalizedPaths.js:303:6:303:26 | path | normalizedPaths.js:313:19:313:22 | path | provenance |  |
-| normalizedPaths.js:303:6:303:26 | path | normalizedPaths.js:316:19:316:22 | path | provenance |  |
-| normalizedPaths.js:303:6:303:26 | path | normalizedPaths.js:320:45:320:48 | path | provenance |  |
-| normalizedPaths.js:303:13:303:26 | req.query.path | normalizedPaths.js:303:6:303:26 | path | provenance |  |
-| normalizedPaths.js:320:6:320:49 | normalizedPath | normalizedPaths.js:325:19:325:32 | normalizedPath | provenance |  |
-| normalizedPaths.js:320:6:320:49 | normalizedPath | normalizedPaths.js:332:19:332:32 | normalizedPath | provenance |  |
-| normalizedPaths.js:320:23:320:49 | pathMod ... , path) | normalizedPaths.js:320:6:320:49 | normalizedPath | provenance |  |
+| normalizedPaths.js:303:6:303:9 | path | normalizedPaths.js:304:18:304:21 | path | provenance |  |
+| normalizedPaths.js:303:6:303:9 | path | normalizedPaths.js:309:19:309:22 | path | provenance |  |
+| normalizedPaths.js:303:6:303:9 | path | normalizedPaths.js:313:19:313:22 | path | provenance |  |
+| normalizedPaths.js:303:6:303:9 | path | normalizedPaths.js:316:19:316:22 | path | provenance |  |
+| normalizedPaths.js:303:6:303:9 | path | normalizedPaths.js:320:45:320:48 | path | provenance |  |
+| normalizedPaths.js:303:13:303:26 | req.query.path | normalizedPaths.js:303:6:303:9 | path | provenance |  |
+| normalizedPaths.js:320:6:320:19 | normalizedPath | normalizedPaths.js:325:19:325:32 | normalizedPath | provenance |  |
+| normalizedPaths.js:320:6:320:19 | normalizedPath | normalizedPaths.js:332:19:332:32 | normalizedPath | provenance |  |
+| normalizedPaths.js:320:23:320:49 | pathMod ... , path) | normalizedPaths.js:320:6:320:19 | normalizedPath | provenance |  |
 | normalizedPaths.js:320:45:320:48 | path | normalizedPaths.js:320:23:320:49 | pathMod ... , path) | provenance | Config |
-| normalizedPaths.js:339:6:339:46 | path | normalizedPaths.js:341:18:341:21 | path | provenance |  |
-| normalizedPaths.js:339:6:339:46 | path | normalizedPaths.js:346:19:346:22 | path | provenance |  |
-| normalizedPaths.js:339:13:339:46 | pathMod ... y.path) | normalizedPaths.js:339:6:339:46 | path | provenance |  |
+| normalizedPaths.js:339:6:339:9 | path | normalizedPaths.js:341:18:341:21 | path | provenance |  |
+| normalizedPaths.js:339:6:339:9 | path | normalizedPaths.js:346:19:346:22 | path | provenance |  |
+| normalizedPaths.js:339:13:339:46 | pathMod ... y.path) | normalizedPaths.js:339:6:339:9 | path | provenance |  |
 | normalizedPaths.js:339:32:339:45 | req.query.path | normalizedPaths.js:339:13:339:46 | pathMod ... y.path) | provenance | Config |
-| normalizedPaths.js:354:7:354:27 | path | normalizedPaths.js:356:19:356:22 | path | provenance |  |
-| normalizedPaths.js:354:7:354:27 | path | normalizedPaths.js:358:47:358:50 | path | provenance |  |
-| normalizedPaths.js:354:14:354:27 | req.query.path | normalizedPaths.js:354:7:354:27 | path | provenance |  |
-| normalizedPaths.js:358:7:358:51 | requestPath | normalizedPaths.js:363:21:363:31 | requestPath | provenance |  |
-| normalizedPaths.js:358:21:358:51 | pathMod ... , path) | normalizedPaths.js:358:7:358:51 | requestPath | provenance |  |
+| normalizedPaths.js:354:7:354:10 | path | normalizedPaths.js:356:19:356:22 | path | provenance |  |
+| normalizedPaths.js:354:7:354:10 | path | normalizedPaths.js:358:47:358:50 | path | provenance |  |
+| normalizedPaths.js:354:14:354:27 | req.query.path | normalizedPaths.js:354:7:354:10 | path | provenance |  |
+| normalizedPaths.js:358:7:358:17 | requestPath | normalizedPaths.js:363:21:363:31 | requestPath | provenance |  |
+| normalizedPaths.js:358:21:358:51 | pathMod ... , path) | normalizedPaths.js:358:7:358:17 | requestPath | provenance |  |
 | normalizedPaths.js:358:47:358:50 | path | normalizedPaths.js:358:21:358:51 | pathMod ... , path) | provenance | Config |
-| normalizedPaths.js:377:7:377:27 | path | normalizedPaths.js:379:19:379:22 | path | provenance |  |
-| normalizedPaths.js:377:7:377:27 | path | normalizedPaths.js:381:25:381:28 | path | provenance |  |
-| normalizedPaths.js:377:14:377:27 | req.query.path | normalizedPaths.js:377:7:377:27 | path | provenance |  |
+| normalizedPaths.js:377:7:377:10 | path | normalizedPaths.js:379:19:379:22 | path | provenance |  |
+| normalizedPaths.js:377:7:377:10 | path | normalizedPaths.js:381:25:381:28 | path | provenance |  |
+| normalizedPaths.js:377:14:377:27 | req.query.path | normalizedPaths.js:377:7:377:10 | path | provenance |  |
 | normalizedPaths.js:381:25:381:28 | path | normalizedPaths.js:381:19:381:29 | slash(path) | provenance | Config |
-| normalizedPaths.js:385:7:385:46 | path | normalizedPaths.js:388:19:388:22 | path | provenance |  |
-| normalizedPaths.js:385:7:385:46 | path | normalizedPaths.js:399:21:399:24 | path | provenance |  |
-| normalizedPaths.js:385:14:385:46 | pathMod ... uery.x) | normalizedPaths.js:385:7:385:46 | path | provenance |  |
+| normalizedPaths.js:385:7:385:10 | path | normalizedPaths.js:388:19:388:22 | path | provenance |  |
+| normalizedPaths.js:385:7:385:10 | path | normalizedPaths.js:399:21:399:24 | path | provenance |  |
+| normalizedPaths.js:385:14:385:46 | pathMod ... uery.x) | normalizedPaths.js:385:7:385:10 | path | provenance |  |
 | normalizedPaths.js:385:35:385:45 | req.query.x | normalizedPaths.js:385:14:385:46 | pathMod ... uery.x) | provenance | Config |
 | normalizedPaths.js:407:45:407:55 | req.query.x | normalizedPaths.js:407:45:407:66 | req.que ... it('/') | provenance | Config |
 | normalizedPaths.js:407:45:407:66 | req.que ... it('/') | normalizedPaths.js:407:19:407:67 | pathMod ... t('/')) | provenance | Config |
 | normalizedPaths.js:408:38:408:48 | req.query.x | normalizedPaths.js:408:38:408:59 | req.que ... it('/') | provenance | Config |
 | normalizedPaths.js:408:38:408:59 | req.que ... it('/') | normalizedPaths.js:408:19:408:60 | pathMod ... t('/')) | provenance | Config |
-| normalizedPaths.js:412:7:412:46 | path | normalizedPaths.js:415:19:415:22 | path | provenance |  |
-| normalizedPaths.js:412:7:412:46 | path | normalizedPaths.js:426:21:426:24 | path | provenance |  |
-| normalizedPaths.js:412:14:412:46 | pathMod ... uery.x) | normalizedPaths.js:412:7:412:46 | path | provenance |  |
+| normalizedPaths.js:412:7:412:10 | path | normalizedPaths.js:415:19:415:22 | path | provenance |  |
+| normalizedPaths.js:412:7:412:10 | path | normalizedPaths.js:426:21:426:24 | path | provenance |  |
+| normalizedPaths.js:412:14:412:46 | pathMod ... uery.x) | normalizedPaths.js:412:7:412:10 | path | provenance |  |
 | normalizedPaths.js:412:35:412:45 | req.query.x | normalizedPaths.js:412:14:412:46 | pathMod ... uery.x) | provenance | Config |
-| open.js:7:11:7:31 | file | open.js:9:10:9:13 | file | provenance |  |
-| open.js:7:11:7:31 | file | open.js:10:13:10:16 | file | provenance |  |
-| open.js:7:18:7:31 | req.query.file | open.js:7:11:7:31 | file | provenance |  |
-| other-fs-libraries.js:9:7:9:48 | path | other-fs-libraries.js:11:19:11:22 | path | provenance |  |
-| other-fs-libraries.js:9:7:9:48 | path | other-fs-libraries.js:12:27:12:30 | path | provenance |  |
-| other-fs-libraries.js:9:7:9:48 | path | other-fs-libraries.js:13:24:13:27 | path | provenance |  |
-| other-fs-libraries.js:9:7:9:48 | path | other-fs-libraries.js:14:27:14:30 | path | provenance |  |
-| other-fs-libraries.js:9:7:9:48 | path | other-fs-libraries.js:16:34:16:37 | path | provenance |  |
-| other-fs-libraries.js:9:7:9:48 | path | other-fs-libraries.js:17:35:17:38 | path | provenance |  |
-| other-fs-libraries.js:9:7:9:48 | path | other-fs-libraries.js:19:56:19:59 | path | provenance |  |
-| other-fs-libraries.js:9:7:9:48 | path | other-fs-libraries.js:24:35:24:38 | path | provenance |  |
+| open.js:7:11:7:14 | file | open.js:9:10:9:13 | file | provenance |  |
+| open.js:7:11:7:14 | file | open.js:10:13:10:16 | file | provenance |  |
+| open.js:7:18:7:31 | req.query.file | open.js:7:11:7:14 | file | provenance |  |
+| other-fs-libraries.js:9:7:9:10 | path | other-fs-libraries.js:11:19:11:22 | path | provenance |  |
+| other-fs-libraries.js:9:7:9:10 | path | other-fs-libraries.js:12:27:12:30 | path | provenance |  |
+| other-fs-libraries.js:9:7:9:10 | path | other-fs-libraries.js:13:24:13:27 | path | provenance |  |
+| other-fs-libraries.js:9:7:9:10 | path | other-fs-libraries.js:14:27:14:30 | path | provenance |  |
+| other-fs-libraries.js:9:7:9:10 | path | other-fs-libraries.js:16:34:16:37 | path | provenance |  |
+| other-fs-libraries.js:9:7:9:10 | path | other-fs-libraries.js:17:35:17:38 | path | provenance |  |
+| other-fs-libraries.js:9:7:9:10 | path | other-fs-libraries.js:19:56:19:59 | path | provenance |  |
+| other-fs-libraries.js:9:7:9:10 | path | other-fs-libraries.js:24:35:24:38 | path | provenance |  |
 | other-fs-libraries.js:9:14:9:37 | url.par ... , true) | other-fs-libraries.js:9:14:9:43 | url.par ... ).query | provenance | Config |
 | other-fs-libraries.js:9:14:9:43 | url.par ... ).query | other-fs-libraries.js:9:14:9:48 | url.par ... ry.path | provenance | Config |
-| other-fs-libraries.js:9:14:9:48 | url.par ... ry.path | other-fs-libraries.js:9:7:9:48 | path | provenance |  |
+| other-fs-libraries.js:9:14:9:48 | url.par ... ry.path | other-fs-libraries.js:9:7:9:10 | path | provenance |  |
 | other-fs-libraries.js:9:24:9:30 | req.url | other-fs-libraries.js:9:14:9:37 | url.par ... , true) | provenance | Config |
-| other-fs-libraries.js:38:7:38:48 | path | other-fs-libraries.js:40:35:40:38 | path | provenance |  |
-| other-fs-libraries.js:38:7:38:48 | path | other-fs-libraries.js:41:50:41:53 | path | provenance |  |
-| other-fs-libraries.js:38:7:38:48 | path | other-fs-libraries.js:42:53:42:56 | path | provenance |  |
+| other-fs-libraries.js:38:7:38:10 | path | other-fs-libraries.js:40:35:40:38 | path | provenance |  |
+| other-fs-libraries.js:38:7:38:10 | path | other-fs-libraries.js:41:50:41:53 | path | provenance |  |
+| other-fs-libraries.js:38:7:38:10 | path | other-fs-libraries.js:42:53:42:56 | path | provenance |  |
 | other-fs-libraries.js:38:14:38:37 | url.par ... , true) | other-fs-libraries.js:38:14:38:43 | url.par ... ).query | provenance | Config |
 | other-fs-libraries.js:38:14:38:43 | url.par ... ).query | other-fs-libraries.js:38:14:38:48 | url.par ... ry.path | provenance | Config |
-| other-fs-libraries.js:38:14:38:48 | url.par ... ry.path | other-fs-libraries.js:38:7:38:48 | path | provenance |  |
+| other-fs-libraries.js:38:14:38:48 | url.par ... ry.path | other-fs-libraries.js:38:7:38:10 | path | provenance |  |
 | other-fs-libraries.js:38:24:38:30 | req.url | other-fs-libraries.js:38:14:38:37 | url.par ... , true) | provenance | Config |
-| other-fs-libraries.js:49:7:49:48 | path | other-fs-libraries.js:51:19:51:22 | path | provenance |  |
-| other-fs-libraries.js:49:7:49:48 | path | other-fs-libraries.js:52:24:52:27 | path | provenance |  |
-| other-fs-libraries.js:49:7:49:48 | path | other-fs-libraries.js:54:36:54:39 | path | provenance |  |
-| other-fs-libraries.js:49:7:49:48 | path | other-fs-libraries.js:55:36:55:39 | path | provenance |  |
-| other-fs-libraries.js:49:7:49:48 | path | other-fs-libraries.js:57:46:57:49 | path | provenance |  |
-| other-fs-libraries.js:49:7:49:48 | path | other-fs-libraries.js:59:39:59:42 | path | provenance |  |
-| other-fs-libraries.js:49:7:49:48 | path | other-fs-libraries.js:62:43:62:46 | path | provenance |  |
-| other-fs-libraries.js:49:7:49:48 | path | other-fs-libraries.js:63:51:63:54 | path | provenance |  |
+| other-fs-libraries.js:49:7:49:10 | path | other-fs-libraries.js:51:19:51:22 | path | provenance |  |
+| other-fs-libraries.js:49:7:49:10 | path | other-fs-libraries.js:52:24:52:27 | path | provenance |  |
+| other-fs-libraries.js:49:7:49:10 | path | other-fs-libraries.js:54:36:54:39 | path | provenance |  |
+| other-fs-libraries.js:49:7:49:10 | path | other-fs-libraries.js:55:36:55:39 | path | provenance |  |
+| other-fs-libraries.js:49:7:49:10 | path | other-fs-libraries.js:57:46:57:49 | path | provenance |  |
+| other-fs-libraries.js:49:7:49:10 | path | other-fs-libraries.js:59:39:59:42 | path | provenance |  |
+| other-fs-libraries.js:49:7:49:10 | path | other-fs-libraries.js:62:43:62:46 | path | provenance |  |
+| other-fs-libraries.js:49:7:49:10 | path | other-fs-libraries.js:63:51:63:54 | path | provenance |  |
 | other-fs-libraries.js:49:14:49:37 | url.par ... , true) | other-fs-libraries.js:49:14:49:43 | url.par ... ).query | provenance | Config |
 | other-fs-libraries.js:49:14:49:43 | url.par ... ).query | other-fs-libraries.js:49:14:49:48 | url.par ... ry.path | provenance | Config |
-| other-fs-libraries.js:49:14:49:48 | url.par ... ry.path | other-fs-libraries.js:49:7:49:48 | path | provenance |  |
+| other-fs-libraries.js:49:14:49:48 | url.par ... ry.path | other-fs-libraries.js:49:7:49:10 | path | provenance |  |
 | other-fs-libraries.js:49:24:49:30 | req.url | other-fs-libraries.js:49:14:49:37 | url.par ... , true) | provenance | Config |
-| other-fs-libraries.js:68:7:68:48 | path | other-fs-libraries.js:70:19:70:22 | path | provenance |  |
-| other-fs-libraries.js:68:7:68:48 | path | other-fs-libraries.js:71:10:71:13 | path | provenance |  |
-| other-fs-libraries.js:68:7:68:48 | path | other-fs-libraries.js:72:15:72:18 | path | provenance |  |
-| other-fs-libraries.js:68:7:68:48 | path | other-fs-libraries.js:73:8:73:11 | path | provenance |  |
+| other-fs-libraries.js:68:7:68:10 | path | other-fs-libraries.js:70:19:70:22 | path | provenance |  |
+| other-fs-libraries.js:68:7:68:10 | path | other-fs-libraries.js:71:10:71:13 | path | provenance |  |
+| other-fs-libraries.js:68:7:68:10 | path | other-fs-libraries.js:72:15:72:18 | path | provenance |  |
+| other-fs-libraries.js:68:7:68:10 | path | other-fs-libraries.js:73:8:73:11 | path | provenance |  |
 | other-fs-libraries.js:68:14:68:37 | url.par ... , true) | other-fs-libraries.js:68:14:68:43 | url.par ... ).query | provenance | Config |
 | other-fs-libraries.js:68:14:68:43 | url.par ... ).query | other-fs-libraries.js:68:14:68:48 | url.par ... ry.path | provenance | Config |
-| other-fs-libraries.js:68:14:68:48 | url.par ... ry.path | other-fs-libraries.js:68:7:68:48 | path | provenance |  |
+| other-fs-libraries.js:68:14:68:48 | url.par ... ry.path | other-fs-libraries.js:68:7:68:10 | path | provenance |  |
 | other-fs-libraries.js:68:24:68:30 | req.url | other-fs-libraries.js:68:14:68:37 | url.par ... , true) | provenance | Config |
 | other-fs-libraries.js:73:8:73:11 | path | other-fs-libraries.js:75:15:75:15 | x | provenance |  |
 | other-fs-libraries.js:75:15:75:15 | x | other-fs-libraries.js:76:19:76:19 | x | provenance |  |
-| other-fs-libraries.js:81:7:81:48 | path | other-fs-libraries.js:83:16:83:19 | path | provenance |  |
+| other-fs-libraries.js:81:7:81:10 | path | other-fs-libraries.js:83:16:83:19 | path | provenance |  |
 | other-fs-libraries.js:81:14:81:37 | url.par ... , true) | other-fs-libraries.js:81:14:81:43 | url.par ... ).query | provenance | Config |
 | other-fs-libraries.js:81:14:81:43 | url.par ... ).query | other-fs-libraries.js:81:14:81:48 | url.par ... ry.path | provenance | Config |
-| other-fs-libraries.js:81:14:81:48 | url.par ... ry.path | other-fs-libraries.js:81:7:81:48 | path | provenance |  |
+| other-fs-libraries.js:81:14:81:48 | url.par ... ry.path | other-fs-libraries.js:81:7:81:10 | path | provenance |  |
 | other-fs-libraries.js:81:24:81:30 | req.url | other-fs-libraries.js:81:14:81:37 | url.par ... , true) | provenance | Config |
-| prettier.js:6:11:6:28 | p | prettier.js:7:28:7:28 | p | provenance |  |
-| prettier.js:6:11:6:28 | p | prettier.js:11:44:11:44 | p | provenance |  |
-| prettier.js:6:13:6:13 | p | prettier.js:6:11:6:28 | p | provenance |  |
-| pupeteer.js:5:9:5:71 | tainted | pupeteer.js:9:28:9:34 | tainted | provenance |  |
-| pupeteer.js:5:9:5:71 | tainted | pupeteer.js:13:37:13:43 | tainted | provenance |  |
-| pupeteer.js:5:19:5:71 | "dir/"  ... t.data" | pupeteer.js:5:9:5:71 | tainted | provenance |  |
+| prettier.js:6:13:6:13 | p | prettier.js:6:13:6:13 | p | provenance |  |
+| prettier.js:6:13:6:13 | p | prettier.js:7:28:7:28 | p | provenance |  |
+| prettier.js:6:13:6:13 | p | prettier.js:11:44:11:44 | p | provenance |  |
+| pupeteer.js:5:9:5:15 | tainted | pupeteer.js:9:28:9:34 | tainted | provenance |  |
+| pupeteer.js:5:9:5:15 | tainted | pupeteer.js:13:37:13:43 | tainted | provenance |  |
+| pupeteer.js:5:19:5:71 | "dir/"  ... t.data" | pupeteer.js:5:9:5:15 | tainted | provenance |  |
 | pupeteer.js:5:28:5:53 | parseTo ... t).name | pupeteer.js:5:19:5:71 | "dir/"  ... t.data" | provenance | Config |
 | rimraf.js:8:11:8:18 | { path } | rimraf.js:8:13:8:16 | path | provenance | Config |
-| rimraf.js:8:11:8:29 | path | rimraf.js:10:17:10:20 | path | provenance |  |
-| rimraf.js:8:11:8:29 | path | rimraf.js:11:23:11:26 | path | provenance |  |
-| rimraf.js:8:11:8:29 | path | rimraf.js:12:19:12:22 | path | provenance |  |
-| rimraf.js:8:11:8:29 | path | rimraf.js:13:25:13:28 | path | provenance |  |
-| rimraf.js:8:11:8:29 | path | rimraf.js:14:24:14:27 | path | provenance |  |
-| rimraf.js:8:11:8:29 | path | rimraf.js:15:23:15:26 | path | provenance |  |
-| rimraf.js:8:11:8:29 | path | rimraf.js:16:25:16:28 | path | provenance |  |
-| rimraf.js:8:11:8:29 | path | rimraf.js:17:19:17:22 | path | provenance |  |
-| rimraf.js:8:11:8:29 | path | rimraf.js:18:24:18:27 | path | provenance |  |
-| rimraf.js:8:11:8:29 | path | rimraf.js:19:23:19:26 | path | provenance |  |
-| rimraf.js:8:11:8:29 | path | rimraf.js:20:26:20:29 | path | provenance |  |
-| rimraf.js:8:11:8:29 | path | rimraf.js:21:20:21:23 | path | provenance |  |
-| rimraf.js:8:11:8:29 | path | rimraf.js:22:25:22:28 | path | provenance |  |
-| rimraf.js:8:11:8:29 | path | rimraf.js:23:24:23:27 | path | provenance |  |
-| rimraf.js:8:11:8:29 | path | rimraf.js:24:23:24:26 | path | provenance |  |
-| rimraf.js:8:11:8:29 | path | rimraf.js:25:28:25:31 | path | provenance |  |
-| rimraf.js:8:11:8:29 | path | rimraf.js:26:27:26:30 | path | provenance |  |
-| rimraf.js:8:11:8:29 | path | rimraf.js:27:22:27:25 | path | provenance |  |
-| rimraf.js:8:11:8:29 | path | rimraf.js:28:18:28:21 | path | provenance |  |
-| rimraf.js:8:11:8:29 | path | rimraf.js:29:23:29:26 | path | provenance |  |
-| rimraf.js:8:13:8:16 | path | rimraf.js:8:11:8:29 | path | provenance |  |
+| rimraf.js:8:13:8:16 | path | rimraf.js:8:13:8:16 | path | provenance |  |
+| rimraf.js:8:13:8:16 | path | rimraf.js:10:17:10:20 | path | provenance |  |
+| rimraf.js:8:13:8:16 | path | rimraf.js:11:23:11:26 | path | provenance |  |
+| rimraf.js:8:13:8:16 | path | rimraf.js:12:19:12:22 | path | provenance |  |
+| rimraf.js:8:13:8:16 | path | rimraf.js:13:25:13:28 | path | provenance |  |
+| rimraf.js:8:13:8:16 | path | rimraf.js:14:24:14:27 | path | provenance |  |
+| rimraf.js:8:13:8:16 | path | rimraf.js:15:23:15:26 | path | provenance |  |
+| rimraf.js:8:13:8:16 | path | rimraf.js:16:25:16:28 | path | provenance |  |
+| rimraf.js:8:13:8:16 | path | rimraf.js:17:19:17:22 | path | provenance |  |
+| rimraf.js:8:13:8:16 | path | rimraf.js:18:24:18:27 | path | provenance |  |
+| rimraf.js:8:13:8:16 | path | rimraf.js:19:23:19:26 | path | provenance |  |
+| rimraf.js:8:13:8:16 | path | rimraf.js:20:26:20:29 | path | provenance |  |
+| rimraf.js:8:13:8:16 | path | rimraf.js:21:20:21:23 | path | provenance |  |
+| rimraf.js:8:13:8:16 | path | rimraf.js:22:25:22:28 | path | provenance |  |
+| rimraf.js:8:13:8:16 | path | rimraf.js:23:24:23:27 | path | provenance |  |
+| rimraf.js:8:13:8:16 | path | rimraf.js:24:23:24:26 | path | provenance |  |
+| rimraf.js:8:13:8:16 | path | rimraf.js:25:28:25:31 | path | provenance |  |
+| rimraf.js:8:13:8:16 | path | rimraf.js:26:27:26:30 | path | provenance |  |
+| rimraf.js:8:13:8:16 | path | rimraf.js:27:22:27:25 | path | provenance |  |
+| rimraf.js:8:13:8:16 | path | rimraf.js:28:18:28:21 | path | provenance |  |
+| rimraf.js:8:13:8:16 | path | rimraf.js:29:23:29:26 | path | provenance |  |
 | rimraf.js:8:22:8:29 | req.body | rimraf.js:8:11:8:18 | { path } | provenance |  |
 | sharedlib-repro.js:13:22:13:43 | req.par ... spaceId | sharedlib-repro.js:21:27:21:34 | filepath | provenance |  |
 | sharedlib-repro.js:21:27:21:34 | filepath | sharedlib-repro.js:22:18:22:25 | filepath | provenance |  |
-| tainted-access-paths.js:6:7:6:48 | path | tainted-access-paths.js:8:19:8:22 | path | provenance |  |
-| tainted-access-paths.js:6:7:6:48 | path | tainted-access-paths.js:10:33:10:36 | path | provenance |  |
+| tainted-access-paths.js:6:7:6:10 | path | tainted-access-paths.js:8:19:8:22 | path | provenance |  |
+| tainted-access-paths.js:6:7:6:10 | path | tainted-access-paths.js:10:33:10:36 | path | provenance |  |
 | tainted-access-paths.js:6:14:6:37 | url.par ... , true) | tainted-access-paths.js:6:14:6:43 | url.par ... ).query | provenance | Config |
 | tainted-access-paths.js:6:14:6:43 | url.par ... ).query | tainted-access-paths.js:6:14:6:48 | url.par ... ry.path | provenance | Config |
-| tainted-access-paths.js:6:14:6:48 | url.par ... ry.path | tainted-access-paths.js:6:7:6:48 | path | provenance |  |
+| tainted-access-paths.js:6:14:6:48 | url.par ... ry.path | tainted-access-paths.js:6:7:6:10 | path | provenance |  |
 | tainted-access-paths.js:6:24:6:30 | req.url | tainted-access-paths.js:6:14:6:37 | url.par ... , true) | provenance | Config |
-| tainted-access-paths.js:10:7:10:36 | obj | tainted-access-paths.js:12:19:12:21 | obj | provenance |  |
-| tainted-access-paths.js:10:7:10:36 | obj | tainted-access-paths.js:26:19:26:21 | obj | provenance |  |
-| tainted-access-paths.js:10:7:10:36 | obj | tainted-access-paths.js:29:21:29:23 | obj | provenance |  |
-| tainted-access-paths.js:10:7:10:36 | obj | tainted-access-paths.js:30:23:30:25 | obj | provenance |  |
-| tainted-access-paths.js:10:7:10:36 | obj | tainted-access-paths.js:31:23:31:25 | obj | provenance |  |
-| tainted-access-paths.js:10:33:10:36 | path | tainted-access-paths.js:10:7:10:36 | obj | provenance |  |
+| tainted-access-paths.js:10:7:10:9 | obj | tainted-access-paths.js:12:19:12:21 | obj | provenance |  |
+| tainted-access-paths.js:10:7:10:9 | obj | tainted-access-paths.js:26:19:26:21 | obj | provenance |  |
+| tainted-access-paths.js:10:7:10:9 | obj | tainted-access-paths.js:29:21:29:23 | obj | provenance |  |
+| tainted-access-paths.js:10:7:10:9 | obj | tainted-access-paths.js:30:23:30:25 | obj | provenance |  |
+| tainted-access-paths.js:10:7:10:9 | obj | tainted-access-paths.js:31:23:31:25 | obj | provenance |  |
+| tainted-access-paths.js:10:33:10:36 | path | tainted-access-paths.js:10:7:10:9 | obj | provenance |  |
 | tainted-access-paths.js:12:19:12:21 | obj | tainted-access-paths.js:12:19:12:25 | obj.sub | provenance | Config |
 | tainted-access-paths.js:26:19:26:21 | obj | tainted-access-paths.js:26:19:26:26 | obj.sub3 | provenance | Config |
 | tainted-access-paths.js:29:21:29:23 | obj | tainted-access-paths.js:29:21:29:28 | obj.sub4 | provenance | Config |
 | tainted-access-paths.js:30:23:30:25 | obj | tainted-access-paths.js:30:23:30:30 | obj.sub4 | provenance | Config |
 | tainted-access-paths.js:31:23:31:25 | obj | tainted-access-paths.js:31:23:31:30 | obj.sub4 | provenance | Config |
-| tainted-access-paths.js:39:7:39:48 | path | tainted-access-paths.js:40:23:40:26 | path | provenance |  |
+| tainted-access-paths.js:39:7:39:10 | path | tainted-access-paths.js:40:23:40:26 | path | provenance |  |
 | tainted-access-paths.js:39:14:39:37 | url.par ... , true) | tainted-access-paths.js:39:14:39:43 | url.par ... ).query | provenance | Config |
 | tainted-access-paths.js:39:14:39:43 | url.par ... ).query | tainted-access-paths.js:39:14:39:48 | url.par ... ry.path | provenance | Config |
-| tainted-access-paths.js:39:14:39:48 | url.par ... ry.path | tainted-access-paths.js:39:7:39:48 | path | provenance |  |
+| tainted-access-paths.js:39:14:39:48 | url.par ... ry.path | tainted-access-paths.js:39:7:39:10 | path | provenance |  |
 | tainted-access-paths.js:39:24:39:30 | req.url | tainted-access-paths.js:39:14:39:37 | url.par ... , true) | provenance | Config |
-| tainted-access-paths.js:48:7:48:48 | path | tainted-access-paths.js:49:10:49:13 | path | provenance |  |
+| tainted-access-paths.js:48:7:48:10 | path | tainted-access-paths.js:49:10:49:13 | path | provenance |  |
 | tainted-access-paths.js:48:14:48:37 | url.par ... , true) | tainted-access-paths.js:48:14:48:43 | url.par ... ).query | provenance | Config |
 | tainted-access-paths.js:48:14:48:43 | url.par ... ).query | tainted-access-paths.js:48:14:48:48 | url.par ... ry.path | provenance | Config |
-| tainted-access-paths.js:48:14:48:48 | url.par ... ry.path | tainted-access-paths.js:48:7:48:48 | path | provenance |  |
+| tainted-access-paths.js:48:14:48:48 | url.par ... ry.path | tainted-access-paths.js:48:7:48:10 | path | provenance |  |
 | tainted-access-paths.js:48:24:48:30 | req.url | tainted-access-paths.js:48:14:48:37 | url.par ... , true) | provenance | Config |
-| tainted-promise-steps.js:6:7:6:48 | path | tainted-promise-steps.js:7:26:7:29 | path | provenance |  |
+| tainted-promise-steps.js:6:7:6:10 | path | tainted-promise-steps.js:7:26:7:29 | path | provenance |  |
 | tainted-promise-steps.js:6:14:6:37 | url.par ... , true) | tainted-promise-steps.js:6:14:6:43 | url.par ... ).query | provenance | Config |
 | tainted-promise-steps.js:6:14:6:43 | url.par ... ).query | tainted-promise-steps.js:6:14:6:48 | url.par ... ry.path | provenance | Config |
-| tainted-promise-steps.js:6:14:6:48 | url.par ... ry.path | tainted-promise-steps.js:6:7:6:48 | path | provenance |  |
+| tainted-promise-steps.js:6:14:6:48 | url.par ... ry.path | tainted-promise-steps.js:6:7:6:10 | path | provenance |  |
 | tainted-promise-steps.js:6:24:6:30 | req.url | tainted-promise-steps.js:6:14:6:37 | url.par ... , true) | provenance | Config |
 | tainted-promise-steps.js:7:10:7:30 | Promise ... e(path) [PromiseValue] | tainted-promise-steps.js:10:23:10:33 | pathPromise [PromiseValue] | provenance |  |
 | tainted-promise-steps.js:7:26:7:29 | path | tainted-promise-steps.js:7:10:7:30 | Promise ... e(path) [PromiseValue] | provenance |  |
@@ -730,23 +730,23 @@ edges
 | tainted-sendFile.js:22:34:22:45 | req.params.x | tainted-sendFile.js:22:16:22:46 | path.jo ... rams.x) | provenance | Config |
 | tainted-sendFile.js:28:37:28:48 | req.params.x | tainted-sendFile.js:28:16:28:48 | homeDir ... arams.x | provenance | Config |
 | tainted-sendFile.js:30:34:30:45 | req.params.x | tainted-sendFile.js:30:16:30:46 | path.jo ... rams.x) | provenance | Config |
-| tainted-string-steps.js:6:7:6:48 | path | tainted-string-steps.js:8:18:8:21 | path | provenance |  |
-| tainted-string-steps.js:6:7:6:48 | path | tainted-string-steps.js:9:18:9:21 | path | provenance |  |
-| tainted-string-steps.js:6:7:6:48 | path | tainted-string-steps.js:10:18:10:21 | path | provenance |  |
-| tainted-string-steps.js:6:7:6:48 | path | tainted-string-steps.js:11:18:11:21 | path | provenance |  |
-| tainted-string-steps.js:6:7:6:48 | path | tainted-string-steps.js:13:18:13:21 | path | provenance |  |
-| tainted-string-steps.js:6:7:6:48 | path | tainted-string-steps.js:14:33:14:36 | path | provenance |  |
-| tainted-string-steps.js:6:7:6:48 | path | tainted-string-steps.js:15:42:15:45 | path | provenance |  |
-| tainted-string-steps.js:6:7:6:48 | path | tainted-string-steps.js:17:18:17:21 | path | provenance |  |
-| tainted-string-steps.js:6:7:6:48 | path | tainted-string-steps.js:18:18:18:21 | path | provenance |  |
-| tainted-string-steps.js:6:7:6:48 | path | tainted-string-steps.js:22:18:22:21 | path | provenance |  |
-| tainted-string-steps.js:6:7:6:48 | path | tainted-string-steps.js:23:18:23:21 | path | provenance |  |
-| tainted-string-steps.js:6:7:6:48 | path | tainted-string-steps.js:24:18:24:21 | path | provenance |  |
-| tainted-string-steps.js:6:7:6:48 | path | tainted-string-steps.js:26:18:26:21 | path | provenance |  |
-| tainted-string-steps.js:6:7:6:48 | path | tainted-string-steps.js:27:18:27:21 | path | provenance |  |
+| tainted-string-steps.js:6:7:6:10 | path | tainted-string-steps.js:8:18:8:21 | path | provenance |  |
+| tainted-string-steps.js:6:7:6:10 | path | tainted-string-steps.js:9:18:9:21 | path | provenance |  |
+| tainted-string-steps.js:6:7:6:10 | path | tainted-string-steps.js:10:18:10:21 | path | provenance |  |
+| tainted-string-steps.js:6:7:6:10 | path | tainted-string-steps.js:11:18:11:21 | path | provenance |  |
+| tainted-string-steps.js:6:7:6:10 | path | tainted-string-steps.js:13:18:13:21 | path | provenance |  |
+| tainted-string-steps.js:6:7:6:10 | path | tainted-string-steps.js:14:33:14:36 | path | provenance |  |
+| tainted-string-steps.js:6:7:6:10 | path | tainted-string-steps.js:15:42:15:45 | path | provenance |  |
+| tainted-string-steps.js:6:7:6:10 | path | tainted-string-steps.js:17:18:17:21 | path | provenance |  |
+| tainted-string-steps.js:6:7:6:10 | path | tainted-string-steps.js:18:18:18:21 | path | provenance |  |
+| tainted-string-steps.js:6:7:6:10 | path | tainted-string-steps.js:22:18:22:21 | path | provenance |  |
+| tainted-string-steps.js:6:7:6:10 | path | tainted-string-steps.js:23:18:23:21 | path | provenance |  |
+| tainted-string-steps.js:6:7:6:10 | path | tainted-string-steps.js:24:18:24:21 | path | provenance |  |
+| tainted-string-steps.js:6:7:6:10 | path | tainted-string-steps.js:26:18:26:21 | path | provenance |  |
+| tainted-string-steps.js:6:7:6:10 | path | tainted-string-steps.js:27:18:27:21 | path | provenance |  |
 | tainted-string-steps.js:6:14:6:37 | url.par ... , true) | tainted-string-steps.js:6:14:6:43 | url.par ... ).query | provenance | Config |
 | tainted-string-steps.js:6:14:6:43 | url.par ... ).query | tainted-string-steps.js:6:14:6:48 | url.par ... ry.path | provenance | Config |
-| tainted-string-steps.js:6:14:6:48 | url.par ... ry.path | tainted-string-steps.js:6:7:6:48 | path | provenance |  |
+| tainted-string-steps.js:6:14:6:48 | url.par ... ry.path | tainted-string-steps.js:6:7:6:10 | path | provenance |  |
 | tainted-string-steps.js:6:24:6:30 | req.url | tainted-string-steps.js:6:14:6:37 | url.par ... , true) | provenance | Config |
 | tainted-string-steps.js:8:18:8:21 | path | tainted-string-steps.js:8:18:8:34 | path.substring(4) | provenance | Config |
 | tainted-string-steps.js:9:18:9:21 | path | tainted-string-steps.js:9:18:9:37 | path.substring(0, i) | provenance | Config |
@@ -766,34 +766,34 @@ edges
 | tainted-string-steps.js:26:18:26:21 | path | tainted-string-steps.js:26:18:26:36 | path.split(unknown) | provenance | Config |
 | tainted-string-steps.js:26:18:26:36 | path.split(unknown) | tainted-string-steps.js:26:18:26:45 | path.sp ... hatever | provenance | Config |
 | tainted-string-steps.js:27:18:27:21 | path | tainted-string-steps.js:27:18:27:36 | path.split(unknown) | provenance | Config |
-| torrents.js:5:6:5:38 | name | torrents.js:6:24:6:27 | name | provenance |  |
-| torrents.js:5:13:5:38 | parseTo ... t).name | torrents.js:5:6:5:38 | name | provenance |  |
-| torrents.js:6:6:6:45 | loc | torrents.js:7:25:7:27 | loc | provenance |  |
-| torrents.js:6:12:6:45 | dir + " ... t.data" | torrents.js:6:6:6:45 | loc | provenance |  |
+| torrents.js:5:6:5:9 | name | torrents.js:6:24:6:27 | name | provenance |  |
+| torrents.js:5:13:5:38 | parseTo ... t).name | torrents.js:5:6:5:9 | name | provenance |  |
+| torrents.js:6:6:6:8 | loc | torrents.js:7:25:7:27 | loc | provenance |  |
+| torrents.js:6:12:6:45 | dir + " ... t.data" | torrents.js:6:6:6:8 | loc | provenance |  |
 | torrents.js:6:24:6:27 | name | torrents.js:6:12:6:45 | dir + " ... t.data" | provenance | Config |
-| typescript.ts:9:7:9:48 | path | typescript.ts:11:29:11:32 | path | provenance |  |
-| typescript.ts:9:7:9:48 | path | typescript.ts:19:15:19:18 | path | provenance |  |
-| typescript.ts:9:7:9:48 | path | typescript.ts:22:15:22:18 | path | provenance |  |
-| typescript.ts:9:7:9:48 | path | typescript.ts:29:15:29:18 | path | provenance |  |
+| typescript.ts:9:7:9:10 | path | typescript.ts:11:29:11:32 | path | provenance |  |
+| typescript.ts:9:7:9:10 | path | typescript.ts:19:15:19:18 | path | provenance |  |
+| typescript.ts:9:7:9:10 | path | typescript.ts:22:15:22:18 | path | provenance |  |
+| typescript.ts:9:7:9:10 | path | typescript.ts:29:15:29:18 | path | provenance |  |
 | typescript.ts:9:14:9:37 | url.par ... , true) | typescript.ts:9:14:9:43 | url.par ... ).query | provenance | Config |
 | typescript.ts:9:14:9:43 | url.par ... ).query | typescript.ts:9:14:9:48 | url.par ... ry.path | provenance | Config |
-| typescript.ts:9:14:9:48 | url.par ... ry.path | typescript.ts:9:7:9:48 | path | provenance |  |
+| typescript.ts:9:14:9:48 | url.par ... ry.path | typescript.ts:9:7:9:10 | path | provenance |  |
 | typescript.ts:9:24:9:30 | req.url | typescript.ts:9:14:9:37 | url.par ... , true) | provenance | Config |
-| typescript.ts:19:7:19:18 | path3 | typescript.ts:20:39:20:43 | path3 | provenance |  |
-| typescript.ts:19:15:19:18 | path | typescript.ts:19:7:19:18 | path3 | provenance |  |
-| typescript.ts:22:7:22:18 | path4 | typescript.ts:23:39:23:43 | path4 | provenance |  |
-| typescript.ts:22:15:22:18 | path | typescript.ts:22:7:22:18 | path4 | provenance |  |
-| typescript.ts:29:7:29:18 | path6 | typescript.ts:31:29:31:33 | path6 | provenance |  |
-| typescript.ts:29:15:29:18 | path | typescript.ts:29:7:29:18 | path6 | provenance |  |
+| typescript.ts:19:7:19:11 | path3 | typescript.ts:20:39:20:43 | path3 | provenance |  |
+| typescript.ts:19:15:19:18 | path | typescript.ts:19:7:19:11 | path3 | provenance |  |
+| typescript.ts:22:7:22:11 | path4 | typescript.ts:23:39:23:43 | path4 | provenance |  |
+| typescript.ts:22:15:22:18 | path | typescript.ts:22:7:22:11 | path4 | provenance |  |
+| typescript.ts:29:7:29:11 | path6 | typescript.ts:31:29:31:33 | path6 | provenance |  |
+| typescript.ts:29:15:29:18 | path | typescript.ts:29:7:29:11 | path6 | provenance |  |
 nodes
-| TaintedPath-es6.js:7:7:7:44 | path | semmle.label | path |
+| TaintedPath-es6.js:7:7:7:10 | path | semmle.label | path |
 | TaintedPath-es6.js:7:14:7:33 | parse(req.url, true) | semmle.label | parse(req.url, true) |
 | TaintedPath-es6.js:7:14:7:39 | parse(r ... ).query | semmle.label | parse(r ... ).query |
 | TaintedPath-es6.js:7:14:7:44 | parse(r ... ry.path | semmle.label | parse(r ... ry.path |
 | TaintedPath-es6.js:7:20:7:26 | req.url | semmle.label | req.url |
 | TaintedPath-es6.js:9:26:9:45 | join("public", path) | semmle.label | join("public", path) |
 | TaintedPath-es6.js:9:41:9:44 | path | semmle.label | path |
-| TaintedPath.js:9:7:9:48 | path | semmle.label | path |
+| TaintedPath.js:9:7:9:10 | path | semmle.label | path |
 | TaintedPath.js:9:14:9:37 | url.par ... , true) | semmle.label | url.par ... , true) |
 | TaintedPath.js:9:14:9:43 | url.par ... ).query | semmle.label | url.par ... ).query |
 | TaintedPath.js:9:14:9:48 | url.par ... ry.path | semmle.label | url.par ... ry.path |
@@ -805,7 +805,7 @@ nodes
 | TaintedPath.js:19:33:19:36 | path | semmle.label | path |
 | TaintedPath.js:22:33:22:36 | path | semmle.label | path |
 | TaintedPath.js:31:31:31:34 | path | semmle.label | path |
-| TaintedPath.js:36:3:36:44 | path | semmle.label | path |
+| TaintedPath.js:36:3:36:6 | path | semmle.label | path |
 | TaintedPath.js:36:10:36:33 | url.par ... , true) | semmle.label | url.par ... , true) |
 | TaintedPath.js:36:10:36:39 | url.par ... ).query | semmle.label | url.par ... ).query |
 | TaintedPath.js:36:10:36:44 | url.par ... ry.path | semmle.label | url.par ... ry.path |
@@ -838,7 +838,7 @@ nodes
 | TaintedPath.js:56:31:56:73 | require ... ).query | semmle.label | require ... ).query |
 | TaintedPath.js:56:60:56:66 | req.url | semmle.label | req.url |
 | TaintedPath.js:64:48:64:60 | req.params[0] | semmle.label | req.params[0] |
-| TaintedPath.js:73:6:73:47 | path | semmle.label | path |
+| TaintedPath.js:73:6:73:9 | path | semmle.label | path |
 | TaintedPath.js:73:13:73:36 | url.par ... , true) | semmle.label | url.par ... , true) |
 | TaintedPath.js:73:13:73:42 | url.par ... ).query | semmle.label | url.par ... ).query |
 | TaintedPath.js:73:13:73:47 | url.par ... ry.path | semmle.label | url.par ... ry.path |
@@ -848,19 +848,19 @@ nodes
 | TaintedPath.js:76:14:76:17 | path | semmle.label | path |
 | TaintedPath.js:77:32:77:39 | realpath | semmle.label | realpath |
 | TaintedPath.js:78:45:78:52 | realpath | semmle.label | realpath |
-| TaintedPath.js:109:6:109:47 | path | semmle.label | path |
+| TaintedPath.js:109:6:109:9 | path | semmle.label | path |
 | TaintedPath.js:109:13:109:36 | url.par ... , true) | semmle.label | url.par ... , true) |
 | TaintedPath.js:109:13:109:42 | url.par ... ).query | semmle.label | url.par ... ).query |
 | TaintedPath.js:109:13:109:47 | url.par ... ry.path | semmle.label | url.par ... ry.path |
 | TaintedPath.js:109:23:109:29 | req.url | semmle.label | req.url |
 | TaintedPath.js:111:23:111:26 | path | semmle.label | path |
-| TaintedPath.js:115:7:115:48 | path | semmle.label | path |
+| TaintedPath.js:115:7:115:10 | path | semmle.label | path |
 | TaintedPath.js:115:14:115:37 | url.par ... , true) | semmle.label | url.par ... , true) |
 | TaintedPath.js:115:14:115:43 | url.par ... ).query | semmle.label | url.par ... ).query |
 | TaintedPath.js:115:14:115:48 | url.par ... ry.path | semmle.label | url.par ... ry.path |
 | TaintedPath.js:115:24:115:30 | req.url | semmle.label | req.url |
 | TaintedPath.js:117:19:117:22 | path | semmle.label | path |
-| TaintedPath.js:119:7:119:29 | split | semmle.label | split |
+| TaintedPath.js:119:7:119:11 | split | semmle.label | split |
 | TaintedPath.js:119:15:119:18 | path | semmle.label | path |
 | TaintedPath.js:119:15:119:29 | path.split("/") | semmle.label | path.split("/") |
 | TaintedPath.js:121:19:121:23 | split | semmle.label | split |
@@ -870,19 +870,19 @@ nodes
 | TaintedPath.js:126:19:126:35 | prefix + split[x] | semmle.label | prefix + split[x] |
 | TaintedPath.js:126:28:126:32 | split | semmle.label | split |
 | TaintedPath.js:126:28:126:35 | split[x] | semmle.label | split[x] |
-| TaintedPath.js:128:7:128:38 | concatted | semmle.label | concatted |
+| TaintedPath.js:128:7:128:15 | concatted | semmle.label | concatted |
 | TaintedPath.js:128:19:128:38 | prefix.concat(split) | semmle.label | prefix.concat(split) |
 | TaintedPath.js:128:33:128:37 | split | semmle.label | split |
 | TaintedPath.js:129:19:129:27 | concatted | semmle.label | concatted |
 | TaintedPath.js:129:19:129:37 | concatted.join("/") | semmle.label | concatted.join("/") |
-| TaintedPath.js:131:7:131:39 | concatted2 | semmle.label | concatted2 |
+| TaintedPath.js:131:7:131:16 | concatted2 | semmle.label | concatted2 |
 | TaintedPath.js:131:20:131:24 | split | semmle.label | split |
 | TaintedPath.js:131:20:131:39 | split.concat(prefix) | semmle.label | split.concat(prefix) |
 | TaintedPath.js:132:19:132:28 | concatted2 | semmle.label | concatted2 |
 | TaintedPath.js:132:19:132:38 | concatted2.join("/") | semmle.label | concatted2.join("/") |
 | TaintedPath.js:134:19:134:23 | split | semmle.label | split |
 | TaintedPath.js:134:19:134:29 | split.pop() | semmle.label | split.pop() |
-| TaintedPath.js:139:7:139:48 | path | semmle.label | path |
+| TaintedPath.js:139:7:139:10 | path | semmle.label | path |
 | TaintedPath.js:139:14:139:37 | url.par ... , true) | semmle.label | url.par ... , true) |
 | TaintedPath.js:139:14:139:43 | url.par ... ).query | semmle.label | url.par ... ).query |
 | TaintedPath.js:139:14:139:48 | url.par ... ry.path | semmle.label | url.par ... ry.path |
@@ -913,7 +913,7 @@ nodes
 | TaintedPath.js:179:29:179:51 | parseqs ... eq.url) | semmle.label | parseqs ... eq.url) |
 | TaintedPath.js:179:29:179:55 | parseqs ... rl).foo | semmle.label | parseqs ... rl).foo |
 | TaintedPath.js:179:44:179:50 | req.url | semmle.label | req.url |
-| TaintedPath.js:184:7:184:48 | path | semmle.label | path |
+| TaintedPath.js:184:7:184:10 | path | semmle.label | path |
 | TaintedPath.js:184:14:184:37 | url.par ... , true) | semmle.label | url.par ... , true) |
 | TaintedPath.js:184:14:184:43 | url.par ... ).query | semmle.label | url.par ... ).query |
 | TaintedPath.js:184:14:184:48 | url.par ... ry.path | semmle.label | url.par ... ry.path |
@@ -921,14 +921,14 @@ nodes
 | TaintedPath.js:185:31:185:34 | path | semmle.label | path |
 | TaintedPath.js:186:45:186:48 | path | semmle.label | path |
 | TaintedPath.js:187:35:187:38 | path | semmle.label | path |
-| TaintedPath.js:191:7:191:48 | path | semmle.label | path |
+| TaintedPath.js:191:7:191:10 | path | semmle.label | path |
 | TaintedPath.js:191:14:191:37 | url.par ... , true) | semmle.label | url.par ... , true) |
 | TaintedPath.js:191:14:191:43 | url.par ... ).query | semmle.label | url.par ... ).query |
 | TaintedPath.js:191:14:191:48 | url.par ... ry.path | semmle.label | url.par ... ry.path |
 | TaintedPath.js:191:24:191:30 | req.url | semmle.label | req.url |
 | TaintedPath.js:195:29:195:32 | path | semmle.label | path |
 | TaintedPath.js:195:29:195:85 | path.re ... '), '') | semmle.label | path.re ... '), '') |
-| TaintedPath.js:200:7:200:48 | path | semmle.label | path |
+| TaintedPath.js:200:7:200:10 | path | semmle.label | path |
 | TaintedPath.js:200:14:200:37 | url.par ... , true) | semmle.label | url.par ... , true) |
 | TaintedPath.js:200:14:200:43 | url.par ... ).query | semmle.label | url.par ... ).query |
 | TaintedPath.js:200:14:200:48 | url.par ... ry.path | semmle.label | url.par ... ry.path |
@@ -937,27 +937,27 @@ nodes
 | TaintedPath.js:202:29:202:68 | path.re ... '), '') | semmle.label | path.re ... '), '') |
 | TaintedPath.js:205:31:205:34 | path | semmle.label | path |
 | TaintedPath.js:205:31:205:69 | path.re ... '), '') | semmle.label | path.re ... '), '') |
-| TaintedPath.js:212:7:212:48 | path | semmle.label | path |
+| TaintedPath.js:212:7:212:10 | path | semmle.label | path |
 | TaintedPath.js:212:14:212:37 | url.par ... , true) | semmle.label | url.par ... , true) |
 | TaintedPath.js:212:14:212:43 | url.par ... ).query | semmle.label | url.par ... ).query |
 | TaintedPath.js:212:14:212:48 | url.par ... ry.path | semmle.label | url.par ... ry.path |
 | TaintedPath.js:212:24:212:30 | req.url | semmle.label | req.url |
-| TaintedPath.js:213:9:213:37 | improperEscape | semmle.label | improperEscape |
+| TaintedPath.js:213:9:213:22 | improperEscape | semmle.label | improperEscape |
 | TaintedPath.js:213:26:213:37 | escape(path) | semmle.label | escape(path) |
 | TaintedPath.js:213:33:213:36 | path | semmle.label | path |
 | TaintedPath.js:214:29:214:42 | improperEscape | semmle.label | improperEscape |
-| TaintedPath.js:215:9:215:40 | improperEscape2 | semmle.label | improperEscape2 |
+| TaintedPath.js:215:9:215:23 | improperEscape2 | semmle.label | improperEscape2 |
 | TaintedPath.js:215:27:215:40 | unescape(path) | semmle.label | unescape(path) |
 | TaintedPath.js:215:36:215:39 | path | semmle.label | path |
 | TaintedPath.js:216:29:216:43 | improperEscape2 | semmle.label | improperEscape2 |
-| examples/TaintedPath.js:8:7:8:52 | filePath | semmle.label | filePath |
+| examples/TaintedPath.js:8:7:8:14 | filePath | semmle.label | filePath |
 | examples/TaintedPath.js:8:18:8:41 | url.par ... , true) | semmle.label | url.par ... , true) |
 | examples/TaintedPath.js:8:18:8:47 | url.par ... ).query | semmle.label | url.par ... ).query |
 | examples/TaintedPath.js:8:18:8:52 | url.par ... ry.path | semmle.label | url.par ... ry.path |
 | examples/TaintedPath.js:8:28:8:34 | req.url | semmle.label | req.url |
 | examples/TaintedPath.js:10:29:10:43 | ROOT + filePath | semmle.label | ROOT + filePath |
 | examples/TaintedPath.js:10:36:10:43 | filePath | semmle.label | filePath |
-| execa.js:6:9:6:64 | filePath | semmle.label | filePath |
+| execa.js:6:9:6:16 | filePath | semmle.label | filePath |
 | execa.js:6:20:6:43 | url.par ... , true) | semmle.label | url.par ... , true) |
 | execa.js:6:20:6:49 | url.par ... ).query | semmle.label | url.par ... ).query |
 | execa.js:6:20:6:61 | url.par ... ePath"] | semmle.label | url.par ... ePath"] |
@@ -974,14 +974,14 @@ nodes
 | handlebars.js:15:25:15:32 | filePath | semmle.label | filePath |
 | handlebars.js:29:46:29:60 | req.params.path | semmle.label | req.params.path |
 | handlebars.js:43:15:43:29 | req.params.path | semmle.label | req.params.path |
-| hapi.js:14:19:14:51 | filepath | semmle.label | filepath |
+| hapi.js:14:19:14:26 | filepath | semmle.label | filepath |
 | hapi.js:14:30:14:51 | request ... ilepath | semmle.label | request ... ilepath |
 | hapi.js:15:44:15:51 | filepath | semmle.label | filepath |
-| make-dir.js:7:11:7:31 | file | semmle.label | file |
+| make-dir.js:7:11:7:14 | file | semmle.label | file |
 | make-dir.js:7:18:7:31 | req.query.file | semmle.label | req.query.file |
 | make-dir.js:9:25:9:28 | file | semmle.label | file |
 | make-dir.js:10:23:10:26 | file | semmle.label | file |
-| mkdirp.js:9:11:9:76 | dirPath | semmle.label | dirPath |
+| mkdirp.js:9:11:9:17 | dirPath | semmle.label | dirPath |
 | mkdirp.js:9:21:9:76 | path.jo ... ltDir') | semmle.label | path.jo ... ltDir') |
 | mkdirp.js:9:42:9:59 | req.query.filename | semmle.label | req.query.filename |
 | mkdirp.js:9:42:9:75 | req.que ... ultDir' | semmle.label | req.que ... ultDir' |
@@ -997,7 +997,7 @@ nodes
 | mkdirp.js:20:29:20:35 | dirPath | semmle.label | dirPath |
 | mkdirp.js:21:23:21:29 | dirPath | semmle.label | dirPath |
 | more-fs-extra.js:8:11:8:22 | { filename } | semmle.label | { filename } |
-| more-fs-extra.js:8:11:8:33 | filename | semmle.label | filename |
+| more-fs-extra.js:8:13:8:20 | filename | semmle.label | filename |
 | more-fs-extra.js:8:13:8:20 | filename | semmle.label | filename |
 | more-fs-extra.js:8:26:8:33 | req.body | semmle.label | req.body |
 | more-fs-extra.js:10:15:10:22 | filename | semmle.label | filename |
@@ -1023,7 +1023,7 @@ nodes
 | more-fs-extra.js:30:16:30:23 | filename | semmle.label | filename |
 | more-fs-extra.js:31:20:31:27 | filename | semmle.label | filename |
 | more-fs-extra.js:32:23:32:30 | filename | semmle.label | filename |
-| normalizedPaths.js:11:7:11:27 | path | semmle.label | path |
+| normalizedPaths.js:11:7:11:10 | path | semmle.label | path |
 | normalizedPaths.js:11:14:11:27 | req.query.path | semmle.label | req.query.path |
 | normalizedPaths.js:13:19:13:22 | path | semmle.label | path |
 | normalizedPaths.js:14:19:14:29 | './' + path | semmle.label | './' + path |
@@ -1034,7 +1034,7 @@ nodes
 | normalizedPaths.js:16:35:16:38 | path | semmle.label | path |
 | normalizedPaths.js:17:19:17:57 | pathMod ... , path) | semmle.label | pathMod ... , path) |
 | normalizedPaths.js:17:53:17:56 | path | semmle.label | path |
-| normalizedPaths.js:21:7:21:49 | path | semmle.label | path |
+| normalizedPaths.js:21:7:21:10 | path | semmle.label | path |
 | normalizedPaths.js:21:14:21:49 | pathMod ... y.path) | semmle.label | pathMod ... y.path) |
 | normalizedPaths.js:21:35:21:48 | req.query.path | semmle.label | req.query.path |
 | normalizedPaths.js:23:19:23:22 | path | semmle.label | path |
@@ -1046,57 +1046,57 @@ nodes
 | normalizedPaths.js:26:35:26:38 | path | semmle.label | path |
 | normalizedPaths.js:27:19:27:57 | pathMod ... , path) | semmle.label | pathMod ... , path) |
 | normalizedPaths.js:27:53:27:56 | path | semmle.label | path |
-| normalizedPaths.js:31:7:31:49 | path | semmle.label | path |
+| normalizedPaths.js:31:7:31:10 | path | semmle.label | path |
 | normalizedPaths.js:31:14:31:49 | pathMod ... y.path) | semmle.label | pathMod ... y.path) |
 | normalizedPaths.js:31:35:31:48 | req.query.path | semmle.label | req.query.path |
 | normalizedPaths.js:36:19:36:22 | path | semmle.label | path |
 | normalizedPaths.js:41:21:41:24 | path | semmle.label | path |
-| normalizedPaths.js:54:7:54:49 | path | semmle.label | path |
+| normalizedPaths.js:54:7:54:10 | path | semmle.label | path |
 | normalizedPaths.js:54:14:54:49 | pathMod ... y.path) | semmle.label | pathMod ... y.path) |
 | normalizedPaths.js:54:35:54:48 | req.query.path | semmle.label | req.query.path |
 | normalizedPaths.js:59:19:59:22 | path | semmle.label | path |
 | normalizedPaths.js:63:19:63:22 | path | semmle.label | path |
 | normalizedPaths.js:63:19:63:38 | path + "/index.html" | semmle.label | path + "/index.html" |
 | normalizedPaths.js:68:21:68:24 | path | semmle.label | path |
-| normalizedPaths.js:73:7:73:56 | path | semmle.label | path |
+| normalizedPaths.js:73:7:73:10 | path | semmle.label | path |
 | normalizedPaths.js:73:14:73:56 | pathMod ... y.path) | semmle.label | pathMod ... y.path) |
 | normalizedPaths.js:73:35:73:55 | './' +  ... ry.path | semmle.label | './' +  ... ry.path |
 | normalizedPaths.js:73:42:73:55 | req.query.path | semmle.label | req.query.path |
 | normalizedPaths.js:78:22:78:25 | path | semmle.label | path |
-| normalizedPaths.js:82:7:82:27 | path | semmle.label | path |
+| normalizedPaths.js:82:7:82:10 | path | semmle.label | path |
 | normalizedPaths.js:82:14:82:27 | req.query.path | semmle.label | req.query.path |
 | normalizedPaths.js:87:29:87:32 | path | semmle.label | path |
 | normalizedPaths.js:90:31:90:34 | path | semmle.label | path |
-| normalizedPaths.js:94:7:94:49 | path | semmle.label | path |
+| normalizedPaths.js:94:7:94:10 | path | semmle.label | path |
 | normalizedPaths.js:94:14:94:49 | pathMod ... y.path) | semmle.label | pathMod ... y.path) |
 | normalizedPaths.js:94:35:94:48 | req.query.path | semmle.label | req.query.path |
 | normalizedPaths.js:99:29:99:32 | path | semmle.label | path |
-| normalizedPaths.js:117:7:117:44 | path | semmle.label | path |
+| normalizedPaths.js:117:7:117:10 | path | semmle.label | path |
 | normalizedPaths.js:117:14:117:44 | fs.real ... y.path) | semmle.label | fs.real ... y.path) |
 | normalizedPaths.js:117:30:117:43 | req.query.path | semmle.label | req.query.path |
 | normalizedPaths.js:119:19:119:22 | path | semmle.label | path |
 | normalizedPaths.js:120:19:120:53 | pathMod ... .html') | semmle.label | pathMod ... .html') |
 | normalizedPaths.js:120:35:120:38 | path | semmle.label | path |
-| normalizedPaths.js:130:7:130:49 | path | semmle.label | path |
+| normalizedPaths.js:130:7:130:10 | path | semmle.label | path |
 | normalizedPaths.js:130:14:130:49 | pathMod ... y.path) | semmle.label | pathMod ... y.path) |
 | normalizedPaths.js:130:35:130:48 | req.query.path | semmle.label | req.query.path |
 | normalizedPaths.js:135:21:135:24 | path | semmle.label | path |
-| normalizedPaths.js:139:7:139:62 | path | semmle.label | path |
+| normalizedPaths.js:139:7:139:10 | path | semmle.label | path |
 | normalizedPaths.js:139:14:139:62 | pathMod ... y.path) | semmle.label | pathMod ... y.path) |
 | normalizedPaths.js:139:48:139:61 | req.query.path | semmle.label | req.query.path |
 | normalizedPaths.js:144:21:144:24 | path | semmle.label | path |
-| normalizedPaths.js:148:7:148:58 | path | semmle.label | path |
+| normalizedPaths.js:148:7:148:10 | path | semmle.label | path |
 | normalizedPaths.js:148:14:148:58 | 'foo/'  ... y.path) | semmle.label | 'foo/'  ... y.path) |
 | normalizedPaths.js:148:23:148:58 | pathMod ... y.path) | semmle.label | pathMod ... y.path) |
 | normalizedPaths.js:148:44:148:57 | req.query.path | semmle.label | req.query.path |
 | normalizedPaths.js:151:21:151:24 | path | semmle.label | path |
 | normalizedPaths.js:153:21:153:24 | path | semmle.label | path |
-| normalizedPaths.js:160:7:160:49 | path | semmle.label | path |
+| normalizedPaths.js:160:7:160:10 | path | semmle.label | path |
 | normalizedPaths.js:160:14:160:49 | pathMod ... y.path) | semmle.label | pathMod ... y.path) |
 | normalizedPaths.js:160:35:160:48 | req.query.path | semmle.label | req.query.path |
 | normalizedPaths.js:165:19:165:22 | path | semmle.label | path |
 | normalizedPaths.js:170:21:170:24 | path | semmle.label | path |
-| normalizedPaths.js:174:7:174:27 | path | semmle.label | path |
+| normalizedPaths.js:174:7:174:10 | path | semmle.label | path |
 | normalizedPaths.js:174:14:174:27 | req.query.path | semmle.label | req.query.path |
 | normalizedPaths.js:184:19:184:22 | path | semmle.label | path |
 | normalizedPaths.js:187:21:187:24 | path | semmle.label | path |
@@ -1104,80 +1104,80 @@ nodes
 | normalizedPaths.js:192:21:192:24 | path | semmle.label | path |
 | normalizedPaths.js:194:21:194:24 | path | semmle.label | path |
 | normalizedPaths.js:199:21:199:24 | path | semmle.label | path |
-| normalizedPaths.js:201:7:201:49 | normalizedPath | semmle.label | normalizedPath |
+| normalizedPaths.js:201:7:201:20 | normalizedPath | semmle.label | normalizedPath |
 | normalizedPaths.js:201:24:201:49 | pathMod ... e(path) | semmle.label | pathMod ... e(path) |
 | normalizedPaths.js:201:45:201:48 | path | semmle.label | path |
 | normalizedPaths.js:205:21:205:34 | normalizedPath | semmle.label | normalizedPath |
 | normalizedPaths.js:208:21:208:34 | normalizedPath | semmle.label | normalizedPath |
 | normalizedPaths.js:210:21:210:34 | normalizedPath | semmle.label | normalizedPath |
-| normalizedPaths.js:214:7:214:49 | path | semmle.label | path |
+| normalizedPaths.js:214:7:214:10 | path | semmle.label | path |
 | normalizedPaths.js:214:14:214:49 | pathMod ... y.path) | semmle.label | pathMod ... y.path) |
 | normalizedPaths.js:214:35:214:48 | req.query.path | semmle.label | req.query.path |
-| normalizedPaths.js:219:3:219:33 | path | semmle.label | path |
+| normalizedPaths.js:219:3:219:6 | path | semmle.label | path |
 | normalizedPaths.js:219:10:219:33 | decodeU ... t(path) | semmle.label | decodeU ... t(path) |
 | normalizedPaths.js:219:29:219:32 | path | semmle.label | path |
 | normalizedPaths.js:222:21:222:24 | path | semmle.label | path |
-| normalizedPaths.js:226:7:226:70 | path | semmle.label | path |
+| normalizedPaths.js:226:7:226:10 | path | semmle.label | path |
 | normalizedPaths.js:226:14:226:49 | pathMod ... y.path) | semmle.label | pathMod ... y.path) |
 | normalizedPaths.js:226:14:226:70 | pathMod ... g, ' ') | semmle.label | pathMod ... g, ' ') |
 | normalizedPaths.js:226:35:226:48 | req.query.path | semmle.label | req.query.path |
 | normalizedPaths.js:228:21:228:24 | path | semmle.label | path |
-| normalizedPaths.js:236:7:236:47 | path | semmle.label | path |
+| normalizedPaths.js:236:7:236:10 | path | semmle.label | path |
 | normalizedPaths.js:236:14:236:47 | pathMod ... y.path) | semmle.label | pathMod ... y.path) |
 | normalizedPaths.js:236:33:236:46 | req.query.path | semmle.label | req.query.path |
 | normalizedPaths.js:238:19:238:22 | path | semmle.label | path |
 | normalizedPaths.js:245:21:245:24 | path | semmle.label | path |
 | normalizedPaths.js:250:21:250:24 | path | semmle.label | path |
-| normalizedPaths.js:254:7:254:47 | path | semmle.label | path |
+| normalizedPaths.js:254:7:254:10 | path | semmle.label | path |
 | normalizedPaths.js:254:14:254:47 | pathMod ... y.path) | semmle.label | pathMod ... y.path) |
 | normalizedPaths.js:254:33:254:46 | req.query.path | semmle.label | req.query.path |
 | normalizedPaths.js:256:19:256:22 | path | semmle.label | path |
 | normalizedPaths.js:262:21:262:24 | path | semmle.label | path |
-| normalizedPaths.js:267:7:267:42 | newpath | semmle.label | newpath |
+| normalizedPaths.js:267:7:267:13 | newpath | semmle.label | newpath |
 | normalizedPaths.js:267:17:267:42 | pathMod ... e(path) | semmle.label | pathMod ... e(path) |
 | normalizedPaths.js:267:38:267:41 | path | semmle.label | path |
 | normalizedPaths.js:270:21:270:27 | newpath | semmle.label | newpath |
-| normalizedPaths.js:275:7:275:42 | newpath | semmle.label | newpath |
+| normalizedPaths.js:275:7:275:13 | newpath | semmle.label | newpath |
 | normalizedPaths.js:275:17:275:42 | pathMod ... e(path) | semmle.label | pathMod ... e(path) |
 | normalizedPaths.js:275:38:275:41 | path | semmle.label | path |
 | normalizedPaths.js:278:21:278:27 | newpath | semmle.label | newpath |
-| normalizedPaths.js:283:7:283:42 | newpath | semmle.label | newpath |
+| normalizedPaths.js:283:7:283:13 | newpath | semmle.label | newpath |
 | normalizedPaths.js:283:17:283:42 | pathMod ... e(path) | semmle.label | pathMod ... e(path) |
 | normalizedPaths.js:283:38:283:41 | path | semmle.label | path |
 | normalizedPaths.js:286:21:286:27 | newpath | semmle.label | newpath |
-| normalizedPaths.js:291:7:291:42 | newpath | semmle.label | newpath |
+| normalizedPaths.js:291:7:291:13 | newpath | semmle.label | newpath |
 | normalizedPaths.js:291:17:291:42 | pathMod ... e(path) | semmle.label | pathMod ... e(path) |
 | normalizedPaths.js:291:38:291:41 | path | semmle.label | path |
 | normalizedPaths.js:296:21:296:27 | newpath | semmle.label | newpath |
-| normalizedPaths.js:303:6:303:26 | path | semmle.label | path |
+| normalizedPaths.js:303:6:303:9 | path | semmle.label | path |
 | normalizedPaths.js:303:13:303:26 | req.query.path | semmle.label | req.query.path |
 | normalizedPaths.js:304:18:304:21 | path | semmle.label | path |
 | normalizedPaths.js:309:19:309:22 | path | semmle.label | path |
 | normalizedPaths.js:313:19:313:22 | path | semmle.label | path |
 | normalizedPaths.js:316:19:316:22 | path | semmle.label | path |
-| normalizedPaths.js:320:6:320:49 | normalizedPath | semmle.label | normalizedPath |
+| normalizedPaths.js:320:6:320:19 | normalizedPath | semmle.label | normalizedPath |
 | normalizedPaths.js:320:23:320:49 | pathMod ... , path) | semmle.label | pathMod ... , path) |
 | normalizedPaths.js:320:45:320:48 | path | semmle.label | path |
 | normalizedPaths.js:325:19:325:32 | normalizedPath | semmle.label | normalizedPath |
 | normalizedPaths.js:332:19:332:32 | normalizedPath | semmle.label | normalizedPath |
-| normalizedPaths.js:339:6:339:46 | path | semmle.label | path |
+| normalizedPaths.js:339:6:339:9 | path | semmle.label | path |
 | normalizedPaths.js:339:13:339:46 | pathMod ... y.path) | semmle.label | pathMod ... y.path) |
 | normalizedPaths.js:339:32:339:45 | req.query.path | semmle.label | req.query.path |
 | normalizedPaths.js:341:18:341:21 | path | semmle.label | path |
 | normalizedPaths.js:346:19:346:22 | path | semmle.label | path |
-| normalizedPaths.js:354:7:354:27 | path | semmle.label | path |
+| normalizedPaths.js:354:7:354:10 | path | semmle.label | path |
 | normalizedPaths.js:354:14:354:27 | req.query.path | semmle.label | req.query.path |
 | normalizedPaths.js:356:19:356:22 | path | semmle.label | path |
-| normalizedPaths.js:358:7:358:51 | requestPath | semmle.label | requestPath |
+| normalizedPaths.js:358:7:358:17 | requestPath | semmle.label | requestPath |
 | normalizedPaths.js:358:21:358:51 | pathMod ... , path) | semmle.label | pathMod ... , path) |
 | normalizedPaths.js:358:47:358:50 | path | semmle.label | path |
 | normalizedPaths.js:363:21:363:31 | requestPath | semmle.label | requestPath |
-| normalizedPaths.js:377:7:377:27 | path | semmle.label | path |
+| normalizedPaths.js:377:7:377:10 | path | semmle.label | path |
 | normalizedPaths.js:377:14:377:27 | req.query.path | semmle.label | req.query.path |
 | normalizedPaths.js:379:19:379:22 | path | semmle.label | path |
 | normalizedPaths.js:381:19:381:29 | slash(path) | semmle.label | slash(path) |
 | normalizedPaths.js:381:25:381:28 | path | semmle.label | path |
-| normalizedPaths.js:385:7:385:46 | path | semmle.label | path |
+| normalizedPaths.js:385:7:385:10 | path | semmle.label | path |
 | normalizedPaths.js:385:14:385:46 | pathMod ... uery.x) | semmle.label | pathMod ... uery.x) |
 | normalizedPaths.js:385:35:385:45 | req.query.x | semmle.label | req.query.x |
 | normalizedPaths.js:388:19:388:22 | path | semmle.label | path |
@@ -1188,16 +1188,16 @@ nodes
 | normalizedPaths.js:408:19:408:60 | pathMod ... t('/')) | semmle.label | pathMod ... t('/')) |
 | normalizedPaths.js:408:38:408:48 | req.query.x | semmle.label | req.query.x |
 | normalizedPaths.js:408:38:408:59 | req.que ... it('/') | semmle.label | req.que ... it('/') |
-| normalizedPaths.js:412:7:412:46 | path | semmle.label | path |
+| normalizedPaths.js:412:7:412:10 | path | semmle.label | path |
 | normalizedPaths.js:412:14:412:46 | pathMod ... uery.x) | semmle.label | pathMod ... uery.x) |
 | normalizedPaths.js:412:35:412:45 | req.query.x | semmle.label | req.query.x |
 | normalizedPaths.js:415:19:415:22 | path | semmle.label | path |
 | normalizedPaths.js:426:21:426:24 | path | semmle.label | path |
-| open.js:7:11:7:31 | file | semmle.label | file |
+| open.js:7:11:7:14 | file | semmle.label | file |
 | open.js:7:18:7:31 | req.query.file | semmle.label | req.query.file |
 | open.js:9:10:9:13 | file | semmle.label | file |
 | open.js:10:13:10:16 | file | semmle.label | file |
-| other-fs-libraries.js:9:7:9:48 | path | semmle.label | path |
+| other-fs-libraries.js:9:7:9:10 | path | semmle.label | path |
 | other-fs-libraries.js:9:14:9:37 | url.par ... , true) | semmle.label | url.par ... , true) |
 | other-fs-libraries.js:9:14:9:43 | url.par ... ).query | semmle.label | url.par ... ).query |
 | other-fs-libraries.js:9:14:9:48 | url.par ... ry.path | semmle.label | url.par ... ry.path |
@@ -1210,7 +1210,7 @@ nodes
 | other-fs-libraries.js:17:35:17:38 | path | semmle.label | path |
 | other-fs-libraries.js:19:56:19:59 | path | semmle.label | path |
 | other-fs-libraries.js:24:35:24:38 | path | semmle.label | path |
-| other-fs-libraries.js:38:7:38:48 | path | semmle.label | path |
+| other-fs-libraries.js:38:7:38:10 | path | semmle.label | path |
 | other-fs-libraries.js:38:14:38:37 | url.par ... , true) | semmle.label | url.par ... , true) |
 | other-fs-libraries.js:38:14:38:43 | url.par ... ).query | semmle.label | url.par ... ).query |
 | other-fs-libraries.js:38:14:38:48 | url.par ... ry.path | semmle.label | url.par ... ry.path |
@@ -1218,7 +1218,7 @@ nodes
 | other-fs-libraries.js:40:35:40:38 | path | semmle.label | path |
 | other-fs-libraries.js:41:50:41:53 | path | semmle.label | path |
 | other-fs-libraries.js:42:53:42:56 | path | semmle.label | path |
-| other-fs-libraries.js:49:7:49:48 | path | semmle.label | path |
+| other-fs-libraries.js:49:7:49:10 | path | semmle.label | path |
 | other-fs-libraries.js:49:14:49:37 | url.par ... , true) | semmle.label | url.par ... , true) |
 | other-fs-libraries.js:49:14:49:43 | url.par ... ).query | semmle.label | url.par ... ).query |
 | other-fs-libraries.js:49:14:49:48 | url.par ... ry.path | semmle.label | url.par ... ry.path |
@@ -1231,7 +1231,7 @@ nodes
 | other-fs-libraries.js:59:39:59:42 | path | semmle.label | path |
 | other-fs-libraries.js:62:43:62:46 | path | semmle.label | path |
 | other-fs-libraries.js:63:51:63:54 | path | semmle.label | path |
-| other-fs-libraries.js:68:7:68:48 | path | semmle.label | path |
+| other-fs-libraries.js:68:7:68:10 | path | semmle.label | path |
 | other-fs-libraries.js:68:14:68:37 | url.par ... , true) | semmle.label | url.par ... , true) |
 | other-fs-libraries.js:68:14:68:43 | url.par ... ).query | semmle.label | url.par ... ).query |
 | other-fs-libraries.js:68:14:68:48 | url.par ... ry.path | semmle.label | url.par ... ry.path |
@@ -1242,23 +1242,23 @@ nodes
 | other-fs-libraries.js:73:8:73:11 | path | semmle.label | path |
 | other-fs-libraries.js:75:15:75:15 | x | semmle.label | x |
 | other-fs-libraries.js:76:19:76:19 | x | semmle.label | x |
-| other-fs-libraries.js:81:7:81:48 | path | semmle.label | path |
+| other-fs-libraries.js:81:7:81:10 | path | semmle.label | path |
 | other-fs-libraries.js:81:14:81:37 | url.par ... , true) | semmle.label | url.par ... , true) |
 | other-fs-libraries.js:81:14:81:43 | url.par ... ).query | semmle.label | url.par ... ).query |
 | other-fs-libraries.js:81:14:81:48 | url.par ... ry.path | semmle.label | url.par ... ry.path |
 | other-fs-libraries.js:81:24:81:30 | req.url | semmle.label | req.url |
 | other-fs-libraries.js:83:16:83:19 | path | semmle.label | path |
-| prettier.js:6:11:6:28 | p | semmle.label | p |
+| prettier.js:6:13:6:13 | p | semmle.label | p |
 | prettier.js:6:13:6:13 | p | semmle.label | p |
 | prettier.js:7:28:7:28 | p | semmle.label | p |
 | prettier.js:11:44:11:44 | p | semmle.label | p |
-| pupeteer.js:5:9:5:71 | tainted | semmle.label | tainted |
+| pupeteer.js:5:9:5:15 | tainted | semmle.label | tainted |
 | pupeteer.js:5:19:5:71 | "dir/"  ... t.data" | semmle.label | "dir/"  ... t.data" |
 | pupeteer.js:5:28:5:53 | parseTo ... t).name | semmle.label | parseTo ... t).name |
 | pupeteer.js:9:28:9:34 | tainted | semmle.label | tainted |
 | pupeteer.js:13:37:13:43 | tainted | semmle.label | tainted |
 | rimraf.js:8:11:8:18 | { path } | semmle.label | { path } |
-| rimraf.js:8:11:8:29 | path | semmle.label | path |
+| rimraf.js:8:13:8:16 | path | semmle.label | path |
 | rimraf.js:8:13:8:16 | path | semmle.label | path |
 | rimraf.js:8:22:8:29 | req.body | semmle.label | req.body |
 | rimraf.js:10:17:10:20 | path | semmle.label | path |
@@ -1284,13 +1284,13 @@ nodes
 | sharedlib-repro.js:13:22:13:43 | req.par ... spaceId | semmle.label | req.par ... spaceId |
 | sharedlib-repro.js:21:27:21:34 | filepath | semmle.label | filepath |
 | sharedlib-repro.js:22:18:22:25 | filepath | semmle.label | filepath |
-| tainted-access-paths.js:6:7:6:48 | path | semmle.label | path |
+| tainted-access-paths.js:6:7:6:10 | path | semmle.label | path |
 | tainted-access-paths.js:6:14:6:37 | url.par ... , true) | semmle.label | url.par ... , true) |
 | tainted-access-paths.js:6:14:6:43 | url.par ... ).query | semmle.label | url.par ... ).query |
 | tainted-access-paths.js:6:14:6:48 | url.par ... ry.path | semmle.label | url.par ... ry.path |
 | tainted-access-paths.js:6:24:6:30 | req.url | semmle.label | req.url |
 | tainted-access-paths.js:8:19:8:22 | path | semmle.label | path |
-| tainted-access-paths.js:10:7:10:36 | obj | semmle.label | obj |
+| tainted-access-paths.js:10:7:10:9 | obj | semmle.label | obj |
 | tainted-access-paths.js:10:33:10:36 | path | semmle.label | path |
 | tainted-access-paths.js:12:19:12:21 | obj | semmle.label | obj |
 | tainted-access-paths.js:12:19:12:25 | obj.sub | semmle.label | obj.sub |
@@ -1302,19 +1302,19 @@ nodes
 | tainted-access-paths.js:30:23:30:30 | obj.sub4 | semmle.label | obj.sub4 |
 | tainted-access-paths.js:31:23:31:25 | obj | semmle.label | obj |
 | tainted-access-paths.js:31:23:31:30 | obj.sub4 | semmle.label | obj.sub4 |
-| tainted-access-paths.js:39:7:39:48 | path | semmle.label | path |
+| tainted-access-paths.js:39:7:39:10 | path | semmle.label | path |
 | tainted-access-paths.js:39:14:39:37 | url.par ... , true) | semmle.label | url.par ... , true) |
 | tainted-access-paths.js:39:14:39:43 | url.par ... ).query | semmle.label | url.par ... ).query |
 | tainted-access-paths.js:39:14:39:48 | url.par ... ry.path | semmle.label | url.par ... ry.path |
 | tainted-access-paths.js:39:24:39:30 | req.url | semmle.label | req.url |
 | tainted-access-paths.js:40:23:40:26 | path | semmle.label | path |
-| tainted-access-paths.js:48:7:48:48 | path | semmle.label | path |
+| tainted-access-paths.js:48:7:48:10 | path | semmle.label | path |
 | tainted-access-paths.js:48:14:48:37 | url.par ... , true) | semmle.label | url.par ... , true) |
 | tainted-access-paths.js:48:14:48:43 | url.par ... ).query | semmle.label | url.par ... ).query |
 | tainted-access-paths.js:48:14:48:48 | url.par ... ry.path | semmle.label | url.par ... ry.path |
 | tainted-access-paths.js:48:24:48:30 | req.url | semmle.label | req.url |
 | tainted-access-paths.js:49:10:49:13 | path | semmle.label | path |
-| tainted-promise-steps.js:6:7:6:48 | path | semmle.label | path |
+| tainted-promise-steps.js:6:7:6:10 | path | semmle.label | path |
 | tainted-promise-steps.js:6:14:6:37 | url.par ... , true) | semmle.label | url.par ... , true) |
 | tainted-promise-steps.js:6:14:6:43 | url.par ... ).query | semmle.label | url.par ... ).query |
 | tainted-promise-steps.js:6:14:6:48 | url.par ... ry.path | semmle.label | url.par ... ry.path |
@@ -1343,7 +1343,7 @@ nodes
 | tainted-sendFile.js:30:16:30:46 | path.jo ... rams.x) | semmle.label | path.jo ... rams.x) |
 | tainted-sendFile.js:30:34:30:45 | req.params.x | semmle.label | req.params.x |
 | tainted-sendFile.js:32:43:32:58 | req.param("dir") | semmle.label | req.param("dir") |
-| tainted-string-steps.js:6:7:6:48 | path | semmle.label | path |
+| tainted-string-steps.js:6:7:6:10 | path | semmle.label | path |
 | tainted-string-steps.js:6:14:6:37 | url.par ... , true) | semmle.label | url.par ... , true) |
 | tainted-string-steps.js:6:14:6:43 | url.par ... ).query | semmle.label | url.par ... ).query |
 | tainted-string-steps.js:6:14:6:48 | url.par ... ry.path | semmle.label | url.par ... ry.path |
@@ -1380,25 +1380,25 @@ nodes
 | tainted-string-steps.js:26:18:26:45 | path.sp ... hatever | semmle.label | path.sp ... hatever |
 | tainted-string-steps.js:27:18:27:21 | path | semmle.label | path |
 | tainted-string-steps.js:27:18:27:36 | path.split(unknown) | semmle.label | path.split(unknown) |
-| torrents.js:5:6:5:38 | name | semmle.label | name |
+| torrents.js:5:6:5:9 | name | semmle.label | name |
 | torrents.js:5:13:5:38 | parseTo ... t).name | semmle.label | parseTo ... t).name |
-| torrents.js:6:6:6:45 | loc | semmle.label | loc |
+| torrents.js:6:6:6:8 | loc | semmle.label | loc |
 | torrents.js:6:12:6:45 | dir + " ... t.data" | semmle.label | dir + " ... t.data" |
 | torrents.js:6:24:6:27 | name | semmle.label | name |
 | torrents.js:7:25:7:27 | loc | semmle.label | loc |
-| typescript.ts:9:7:9:48 | path | semmle.label | path |
+| typescript.ts:9:7:9:10 | path | semmle.label | path |
 | typescript.ts:9:14:9:37 | url.par ... , true) | semmle.label | url.par ... , true) |
 | typescript.ts:9:14:9:43 | url.par ... ).query | semmle.label | url.par ... ).query |
 | typescript.ts:9:14:9:48 | url.par ... ry.path | semmle.label | url.par ... ry.path |
 | typescript.ts:9:24:9:30 | req.url | semmle.label | req.url |
 | typescript.ts:11:29:11:32 | path | semmle.label | path |
-| typescript.ts:19:7:19:18 | path3 | semmle.label | path3 |
+| typescript.ts:19:7:19:11 | path3 | semmle.label | path3 |
 | typescript.ts:19:15:19:18 | path | semmle.label | path |
 | typescript.ts:20:39:20:43 | path3 | semmle.label | path3 |
-| typescript.ts:22:7:22:18 | path4 | semmle.label | path4 |
+| typescript.ts:22:7:22:11 | path4 | semmle.label | path4 |
 | typescript.ts:22:15:22:18 | path | semmle.label | path |
 | typescript.ts:23:39:23:43 | path4 | semmle.label | path4 |
-| typescript.ts:29:7:29:18 | path6 | semmle.label | path6 |
+| typescript.ts:29:7:29:11 | path6 | semmle.label | path6 |
 | typescript.ts:29:15:29:18 | path | semmle.label | path |
 | typescript.ts:31:29:31:33 | path6 | semmle.label | path6 |
 | views.js:1:43:1:55 | req.params[0] | semmle.label | req.params[0] |
diff --git a/javascript/ql/test/query-tests/Security/CWE-022/ZipSlip/ZipSlip.expected b/javascript/ql/test/query-tests/Security/CWE-022/ZipSlip/ZipSlip.expected
index f8916181de1..d5c5f012a76 100644
--- a/javascript/ql/test/query-tests/Security/CWE-022/ZipSlip/ZipSlip.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-022/ZipSlip/ZipSlip.expected
@@ -10,41 +10,41 @@
 | ZipSlipBad.js:34:16:34:19 | name | ZipSlipBad.js:34:16:34:19 | name | ZipSlipBad.js:35:26:35:29 | name | Unsanitized archive entry, which may contain '..', is used in a $@. | ZipSlipBad.js:35:26:35:29 | name | file system operation |
 | ZipSlipBadUnzipper.js:7:20:7:29 | entry.path | ZipSlipBadUnzipper.js:7:20:7:29 | entry.path | ZipSlipBadUnzipper.js:8:37:8:44 | fileName | Unsanitized archive entry, which may contain '..', is used in a $@. | ZipSlipBadUnzipper.js:8:37:8:44 | fileName | file system operation |
 edges
-| ZipSlipBad2.js:5:9:5:46 | fileName | ZipSlipBad2.js:6:22:6:29 | fileName | provenance |  |
-| ZipSlipBad2.js:5:20:5:46 | 'output ... ry.path | ZipSlipBad2.js:5:9:5:46 | fileName | provenance |  |
+| ZipSlipBad2.js:5:9:5:16 | fileName | ZipSlipBad2.js:6:22:6:29 | fileName | provenance |  |
+| ZipSlipBad2.js:5:20:5:46 | 'output ... ry.path | ZipSlipBad2.js:5:9:5:16 | fileName | provenance |  |
 | ZipSlipBad2.js:5:37:5:46 | entry.path | ZipSlipBad2.js:5:20:5:46 | 'output ... ry.path | provenance | Config |
-| ZipSlipBad.js:7:11:7:31 | fileName | ZipSlipBad.js:8:37:8:44 | fileName | provenance |  |
-| ZipSlipBad.js:7:22:7:31 | entry.path | ZipSlipBad.js:7:11:7:31 | fileName | provenance |  |
-| ZipSlipBad.js:15:11:15:31 | fileName | ZipSlipBad.js:16:30:16:37 | fileName | provenance |  |
-| ZipSlipBad.js:15:22:15:31 | entry.path | ZipSlipBad.js:15:11:15:31 | fileName | provenance |  |
-| ZipSlipBad.js:22:11:22:31 | fileName | ZipSlipBad.js:23:28:23:35 | fileName | provenance |  |
-| ZipSlipBad.js:22:22:22:31 | entry.path | ZipSlipBad.js:22:11:22:31 | fileName | provenance |  |
+| ZipSlipBad.js:7:11:7:18 | fileName | ZipSlipBad.js:8:37:8:44 | fileName | provenance |  |
+| ZipSlipBad.js:7:22:7:31 | entry.path | ZipSlipBad.js:7:11:7:18 | fileName | provenance |  |
+| ZipSlipBad.js:15:11:15:18 | fileName | ZipSlipBad.js:16:30:16:37 | fileName | provenance |  |
+| ZipSlipBad.js:15:22:15:31 | entry.path | ZipSlipBad.js:15:11:15:18 | fileName | provenance |  |
+| ZipSlipBad.js:22:11:22:18 | fileName | ZipSlipBad.js:23:28:23:35 | fileName | provenance |  |
+| ZipSlipBad.js:22:22:22:31 | entry.path | ZipSlipBad.js:22:11:22:18 | fileName | provenance |  |
 | ZipSlipBad.js:30:14:30:17 | name | ZipSlipBad.js:31:26:31:29 | name | provenance |  |
 | ZipSlipBad.js:34:16:34:19 | name | ZipSlipBad.js:35:26:35:29 | name | provenance |  |
-| ZipSlipBadUnzipper.js:7:9:7:29 | fileName | ZipSlipBadUnzipper.js:8:37:8:44 | fileName | provenance |  |
-| ZipSlipBadUnzipper.js:7:20:7:29 | entry.path | ZipSlipBadUnzipper.js:7:9:7:29 | fileName | provenance |  |
+| ZipSlipBadUnzipper.js:7:9:7:16 | fileName | ZipSlipBadUnzipper.js:8:37:8:44 | fileName | provenance |  |
+| ZipSlipBadUnzipper.js:7:20:7:29 | entry.path | ZipSlipBadUnzipper.js:7:9:7:16 | fileName | provenance |  |
 nodes
 | AdmZipBad.js:6:24:6:41 | zipEntry.entryName | semmle.label | zipEntry.entryName |
 | TarSlipBad.js:6:36:6:46 | header.name | semmle.label | header.name |
 | TarSlipBad.js:9:17:9:31 | header.linkname | semmle.label | header.linkname |
-| ZipSlipBad2.js:5:9:5:46 | fileName | semmle.label | fileName |
+| ZipSlipBad2.js:5:9:5:16 | fileName | semmle.label | fileName |
 | ZipSlipBad2.js:5:20:5:46 | 'output ... ry.path | semmle.label | 'output ... ry.path |
 | ZipSlipBad2.js:5:37:5:46 | entry.path | semmle.label | entry.path |
 | ZipSlipBad2.js:6:22:6:29 | fileName | semmle.label | fileName |
-| ZipSlipBad.js:7:11:7:31 | fileName | semmle.label | fileName |
+| ZipSlipBad.js:7:11:7:18 | fileName | semmle.label | fileName |
 | ZipSlipBad.js:7:22:7:31 | entry.path | semmle.label | entry.path |
 | ZipSlipBad.js:8:37:8:44 | fileName | semmle.label | fileName |
-| ZipSlipBad.js:15:11:15:31 | fileName | semmle.label | fileName |
+| ZipSlipBad.js:15:11:15:18 | fileName | semmle.label | fileName |
 | ZipSlipBad.js:15:22:15:31 | entry.path | semmle.label | entry.path |
 | ZipSlipBad.js:16:30:16:37 | fileName | semmle.label | fileName |
-| ZipSlipBad.js:22:11:22:31 | fileName | semmle.label | fileName |
+| ZipSlipBad.js:22:11:22:18 | fileName | semmle.label | fileName |
 | ZipSlipBad.js:22:22:22:31 | entry.path | semmle.label | entry.path |
 | ZipSlipBad.js:23:28:23:35 | fileName | semmle.label | fileName |
 | ZipSlipBad.js:30:14:30:17 | name | semmle.label | name |
 | ZipSlipBad.js:31:26:31:29 | name | semmle.label | name |
 | ZipSlipBad.js:34:16:34:19 | name | semmle.label | name |
 | ZipSlipBad.js:35:26:35:29 | name | semmle.label | name |
-| ZipSlipBadUnzipper.js:7:9:7:29 | fileName | semmle.label | fileName |
+| ZipSlipBadUnzipper.js:7:9:7:16 | fileName | semmle.label | fileName |
 | ZipSlipBadUnzipper.js:7:20:7:29 | entry.path | semmle.label | entry.path |
 | ZipSlipBadUnzipper.js:8:37:8:44 | fileName | semmle.label | fileName |
 subpaths
diff --git a/javascript/ql/test/query-tests/Security/CWE-073/TemplateObjectInjection.expected b/javascript/ql/test/query-tests/Security/CWE-073/TemplateObjectInjection.expected
index 32b2875a86c..9962113d806 100644
--- a/javascript/ql/test/query-tests/Security/CWE-073/TemplateObjectInjection.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-073/TemplateObjectInjection.expected
@@ -10,67 +10,67 @@
 | tst.js:24:28:24:30 | obj | tst.js:8:26:8:49 | req.que ... rameter | tst.js:24:28:24:30 | obj | Template object depends on a $@. | tst.js:8:26:8:49 | req.que ... rameter | user-provided value |
 | tst.js:29:28:29:42 | JSON.parse(str) | tst.js:8:26:8:49 | req.que ... rameter | tst.js:29:28:29:42 | JSON.parse(str) | Template object depends on a $@. | tst.js:8:26:8:49 | req.que ... rameter | user-provided value |
 edges
-| tst2.js:6:9:6:46 | bodyParameter | tst2.js:7:28:7:40 | bodyParameter | provenance |  |
+| tst2.js:6:9:6:21 | bodyParameter | tst2.js:7:28:7:40 | bodyParameter | provenance |  |
 | tst2.js:6:25:6:32 | req.body | tst2.js:6:25:6:46 | req.bod ... rameter | provenance | Config |
-| tst2.js:6:25:6:46 | req.bod ... rameter | tst2.js:6:9:6:46 | bodyParameter | provenance |  |
-| tst2.js:26:9:26:46 | bodyParameter | tst2.js:27:28:27:40 | bodyParameter | provenance |  |
+| tst2.js:6:25:6:46 | req.bod ... rameter | tst2.js:6:9:6:21 | bodyParameter | provenance |  |
+| tst2.js:26:9:26:21 | bodyParameter | tst2.js:27:28:27:40 | bodyParameter | provenance |  |
 | tst2.js:26:25:26:32 | req.body | tst2.js:26:25:26:46 | req.bod ... rameter | provenance | Config |
-| tst2.js:26:25:26:46 | req.bod ... rameter | tst2.js:26:9:26:46 | bodyParameter | provenance |  |
-| tst2.js:34:9:34:46 | bodyParameter | tst2.js:35:28:35:40 | bodyParameter | provenance |  |
+| tst2.js:26:25:26:46 | req.bod ... rameter | tst2.js:26:9:26:21 | bodyParameter | provenance |  |
+| tst2.js:34:9:34:21 | bodyParameter | tst2.js:35:28:35:40 | bodyParameter | provenance |  |
 | tst2.js:34:25:34:32 | req.body | tst2.js:34:25:34:46 | req.bod ... rameter | provenance | Config |
-| tst2.js:34:25:34:46 | req.bod ... rameter | tst2.js:34:9:34:46 | bodyParameter | provenance |  |
-| tst2.js:42:9:42:46 | bodyParameter | tst2.js:43:28:43:40 | bodyParameter | provenance |  |
+| tst2.js:34:25:34:46 | req.bod ... rameter | tst2.js:34:9:34:21 | bodyParameter | provenance |  |
+| tst2.js:42:9:42:21 | bodyParameter | tst2.js:43:28:43:40 | bodyParameter | provenance |  |
 | tst2.js:42:25:42:32 | req.body | tst2.js:42:25:42:46 | req.bod ... rameter | provenance | Config |
-| tst2.js:42:25:42:46 | req.bod ... rameter | tst2.js:42:9:42:46 | bodyParameter | provenance |  |
-| tst2.js:51:9:51:46 | bodyParameter | tst2.js:52:28:52:40 | bodyParameter | provenance |  |
+| tst2.js:42:25:42:46 | req.bod ... rameter | tst2.js:42:9:42:21 | bodyParameter | provenance |  |
+| tst2.js:51:9:51:21 | bodyParameter | tst2.js:52:28:52:40 | bodyParameter | provenance |  |
 | tst2.js:51:25:51:32 | req.body | tst2.js:51:25:51:46 | req.bod ... rameter | provenance | Config |
-| tst2.js:51:25:51:46 | req.bod ... rameter | tst2.js:51:9:51:46 | bodyParameter | provenance |  |
-| tst.js:7:9:7:46 | bodyParameter | tst.js:10:28:10:40 | bodyParameter | provenance |  |
+| tst2.js:51:25:51:46 | req.bod ... rameter | tst2.js:51:9:51:21 | bodyParameter | provenance |  |
+| tst.js:7:9:7:21 | bodyParameter | tst.js:10:28:10:40 | bodyParameter | provenance |  |
 | tst.js:7:25:7:32 | req.body | tst.js:7:25:7:46 | req.bod ... rameter | provenance | Config |
-| tst.js:7:25:7:46 | req.bod ... rameter | tst.js:7:9:7:46 | bodyParameter | provenance |  |
-| tst.js:8:9:8:49 | queryParameter | tst.js:11:28:11:41 | queryParameter | provenance |  |
-| tst.js:8:9:8:49 | queryParameter | tst.js:20:19:20:32 | queryParameter | provenance |  |
-| tst.js:8:26:8:49 | req.que ... rameter | tst.js:8:9:8:49 | queryParameter | provenance |  |
+| tst.js:7:25:7:46 | req.bod ... rameter | tst.js:7:9:7:21 | bodyParameter | provenance |  |
+| tst.js:8:9:8:22 | queryParameter | tst.js:11:28:11:41 | queryParameter | provenance |  |
+| tst.js:8:9:8:22 | queryParameter | tst.js:20:19:20:32 | queryParameter | provenance |  |
+| tst.js:8:26:8:49 | req.que ... rameter | tst.js:8:9:8:22 | queryParameter | provenance |  |
 | tst.js:20:19:20:32 | queryParameter | tst.js:23:24:23:26 | obj | provenance |  |
 | tst.js:23:24:23:26 | obj | tst.js:24:28:24:30 | obj | provenance |  |
 | tst.js:23:24:23:26 | obj | tst.js:26:17:26:19 | obj | provenance |  |
-| tst.js:26:11:26:24 | str | tst.js:29:39:29:41 | str | provenance |  |
+| tst.js:26:11:26:13 | str | tst.js:29:39:29:41 | str | provenance |  |
 | tst.js:26:17:26:19 | obj | tst.js:26:17:26:24 | obj + "" | provenance | Config |
-| tst.js:26:17:26:24 | obj + "" | tst.js:26:11:26:24 | str | provenance |  |
+| tst.js:26:17:26:24 | obj + "" | tst.js:26:11:26:13 | str | provenance |  |
 | tst.js:29:39:29:41 | str | tst.js:29:28:29:42 | JSON.parse(str) | provenance | Config |
 nodes
 | routes.js:2:23:2:30 | req.body | semmle.label | req.body |
-| tst2.js:6:9:6:46 | bodyParameter | semmle.label | bodyParameter |
+| tst2.js:6:9:6:21 | bodyParameter | semmle.label | bodyParameter |
 | tst2.js:6:25:6:32 | req.body | semmle.label | req.body |
 | tst2.js:6:25:6:46 | req.bod ... rameter | semmle.label | req.bod ... rameter |
 | tst2.js:7:28:7:40 | bodyParameter | semmle.label | bodyParameter |
-| tst2.js:26:9:26:46 | bodyParameter | semmle.label | bodyParameter |
+| tst2.js:26:9:26:21 | bodyParameter | semmle.label | bodyParameter |
 | tst2.js:26:25:26:32 | req.body | semmle.label | req.body |
 | tst2.js:26:25:26:46 | req.bod ... rameter | semmle.label | req.bod ... rameter |
 | tst2.js:27:28:27:40 | bodyParameter | semmle.label | bodyParameter |
-| tst2.js:34:9:34:46 | bodyParameter | semmle.label | bodyParameter |
+| tst2.js:34:9:34:21 | bodyParameter | semmle.label | bodyParameter |
 | tst2.js:34:25:34:32 | req.body | semmle.label | req.body |
 | tst2.js:34:25:34:46 | req.bod ... rameter | semmle.label | req.bod ... rameter |
 | tst2.js:35:28:35:40 | bodyParameter | semmle.label | bodyParameter |
-| tst2.js:42:9:42:46 | bodyParameter | semmle.label | bodyParameter |
+| tst2.js:42:9:42:21 | bodyParameter | semmle.label | bodyParameter |
 | tst2.js:42:25:42:32 | req.body | semmle.label | req.body |
 | tst2.js:42:25:42:46 | req.bod ... rameter | semmle.label | req.bod ... rameter |
 | tst2.js:43:28:43:40 | bodyParameter | semmle.label | bodyParameter |
-| tst2.js:51:9:51:46 | bodyParameter | semmle.label | bodyParameter |
+| tst2.js:51:9:51:21 | bodyParameter | semmle.label | bodyParameter |
 | tst2.js:51:25:51:32 | req.body | semmle.label | req.body |
 | tst2.js:51:25:51:46 | req.bod ... rameter | semmle.label | req.bod ... rameter |
 | tst2.js:52:28:52:40 | bodyParameter | semmle.label | bodyParameter |
-| tst.js:7:9:7:46 | bodyParameter | semmle.label | bodyParameter |
+| tst.js:7:9:7:21 | bodyParameter | semmle.label | bodyParameter |
 | tst.js:7:25:7:32 | req.body | semmle.label | req.body |
 | tst.js:7:25:7:46 | req.bod ... rameter | semmle.label | req.bod ... rameter |
-| tst.js:8:9:8:49 | queryParameter | semmle.label | queryParameter |
+| tst.js:8:9:8:22 | queryParameter | semmle.label | queryParameter |
 | tst.js:8:26:8:49 | req.que ... rameter | semmle.label | req.que ... rameter |
 | tst.js:10:28:10:40 | bodyParameter | semmle.label | bodyParameter |
 | tst.js:11:28:11:41 | queryParameter | semmle.label | queryParameter |
 | tst.js:20:19:20:32 | queryParameter | semmle.label | queryParameter |
 | tst.js:23:24:23:26 | obj | semmle.label | obj |
 | tst.js:24:28:24:30 | obj | semmle.label | obj |
-| tst.js:26:11:26:24 | str | semmle.label | str |
+| tst.js:26:11:26:13 | str | semmle.label | str |
 | tst.js:26:17:26:19 | obj | semmle.label | obj |
 | tst.js:26:17:26:24 | obj + "" | semmle.label | obj + "" |
 | tst.js:29:28:29:42 | JSON.parse(str) | semmle.label | JSON.parse(str) |
diff --git a/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/CommandInjection.expected b/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/CommandInjection.expected
index 22394ec4cb8..f1d547bdfb1 100644
--- a/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/CommandInjection.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/CommandInjection.expected
@@ -21,6 +21,12 @@
 | child_process-test.js:75:29:75:31 | cmd | child_process-test.js:73:25:73:31 | req.url | child_process-test.js:75:29:75:31 | cmd | This command line depends on a $@. | child_process-test.js:73:25:73:31 | req.url | user-provided value |
 | child_process-test.js:83:19:83:36 | req.query.fileName | child_process-test.js:83:19:83:36 | req.query.fileName | child_process-test.js:83:19:83:36 | req.query.fileName | This command line depends on a $@. | child_process-test.js:83:19:83:36 | req.query.fileName | user-provided value |
 | child_process-test.js:94:11:94:35 | "ping " ... ms.host | child_process-test.js:94:21:94:30 | ctx.params | child_process-test.js:94:11:94:35 | "ping " ... ms.host | This command line depends on a $@. | child_process-test.js:94:21:94:30 | ctx.params | user-provided value |
+| command-line-libs.js:14:8:14:18 | options.cmd | command-line-libs.js:9:16:9:23 | req.body | command-line-libs.js:14:8:14:18 | options.cmd | This command line depends on a $@. | command-line-libs.js:9:16:9:23 | req.body | user-provided value |
+| command-line-libs.js:15:8:15:18 | program.cmd | command-line-libs.js:9:16:9:23 | req.body | command-line-libs.js:15:8:15:18 | program.cmd | This command line depends on a $@. | command-line-libs.js:9:16:9:23 | req.body | user-provided value |
+| command-line-libs.js:21:12:21:17 | script | command-line-libs.js:9:16:9:23 | req.body | command-line-libs.js:21:12:21:17 | script | This command line depends on a $@. | command-line-libs.js:9:16:9:23 | req.body | user-provided value |
+| command-line-libs.js:29:10:29:24 | parsed['--cmd'] | command-line-libs.js:27:23:27:30 | req.body | command-line-libs.js:29:10:29:24 | parsed['--cmd'] | This command line depends on a $@. | command-line-libs.js:27:23:27:30 | req.body | user-provided value |
+| command-line-libs.js:37:8:37:18 | options.cmd | command-line-libs.js:35:62:35:69 | req.body | command-line-libs.js:37:8:37:18 | options.cmd | This command line depends on a $@. | command-line-libs.js:35:62:35:69 | req.body | user-provided value |
+| command-line-libs.js:49:8:49:17 | parsed.cmd | command-line-libs.js:42:16:42:23 | req.body | command-line-libs.js:49:8:49:17 | parsed.cmd | This command line depends on a $@. | command-line-libs.js:42:16:42:23 | req.body | user-provided value |
 | exec-sh2.js:10:12:10:57 | cp.spaw ... ptions) | exec-sh2.js:14:25:14:31 | req.url | exec-sh2.js:10:40:10:46 | command | This command line depends on a $@. | exec-sh2.js:14:25:14:31 | req.url | user-provided value |
 | exec-sh.js:15:12:15:61 | cp.spaw ... ptions) | exec-sh.js:19:25:19:31 | req.url | exec-sh.js:15:44:15:50 | command | This command line depends on a $@. | exec-sh.js:19:25:19:31 | req.url | user-provided value |
 | execSeries.js:14:41:14:47 | command | execSeries.js:18:34:18:40 | req.url | execSeries.js:14:41:14:47 | command | This command line depends on a $@. | execSeries.js:18:34:18:40 | req.url | user-provided value |
@@ -76,34 +82,61 @@
 | other.js:28:27:28:29 | cmd | other.js:5:25:5:31 | req.url | other.js:28:27:28:29 | cmd | This command line depends on a $@. | other.js:5:25:5:31 | req.url | user-provided value |
 | other.js:30:33:30:35 | cmd | other.js:5:25:5:31 | req.url | other.js:30:33:30:35 | cmd | This command line depends on a $@. | other.js:5:25:5:31 | req.url | user-provided value |
 | other.js:34:44:34:46 | cmd | other.js:5:25:5:31 | req.url | other.js:34:44:34:46 | cmd | This command line depends on a $@. | other.js:5:25:5:31 | req.url | user-provided value |
+| promisification.js:9:13:9:21 | code.code | promisification.js:15:18:15:25 | req.body | promisification.js:9:13:9:21 | code.code | This command line depends on a $@. | promisification.js:15:18:15:25 | req.body | user-provided value |
+| promisification.js:24:22:24:25 | code | promisification.js:21:18:21:25 | req.body | promisification.js:24:22:24:25 | code | This command line depends on a $@. | promisification.js:21:18:21:25 | req.body | user-provided value |
+| promisification.js:31:24:31:27 | code | promisification.js:30:18:30:25 | req.body | promisification.js:31:24:31:27 | code | This command line depends on a $@. | promisification.js:30:18:30:25 | req.body | user-provided value |
+| promisification.js:40:21:40:24 | code | promisification.js:37:18:37:25 | req.body | promisification.js:40:21:40:24 | code | This command line depends on a $@. | promisification.js:37:18:37:25 | req.body | user-provided value |
+| promisification.js:43:24:43:27 | code | promisification.js:37:18:37:25 | req.body | promisification.js:43:24:43:27 | code | This command line depends on a $@. | promisification.js:37:18:37:25 | req.body | user-provided value |
+| promisification.js:52:21:52:24 | code | promisification.js:49:18:49:25 | req.body | promisification.js:52:21:52:24 | code | This command line depends on a $@. | promisification.js:49:18:49:25 | req.body | user-provided value |
+| promisification.js:55:15:55:18 | code | promisification.js:49:18:49:25 | req.body | promisification.js:55:15:55:18 | code | This command line depends on a $@. | promisification.js:49:18:49:25 | req.body | user-provided value |
+| promisification.js:65:21:65:23 | cmd | promisification.js:61:15:61:22 | req.body | promisification.js:65:21:65:23 | cmd | This command line depends on a $@. | promisification.js:61:15:61:22 | req.body | user-provided value |
+| promisification.js:69:20:69:22 | cmd | promisification.js:61:15:61:22 | req.body | promisification.js:69:20:69:22 | cmd | This command line depends on a $@. | promisification.js:61:15:61:22 | req.body | user-provided value |
+| promisification.js:74:26:74:28 | cmd | promisification.js:61:15:61:22 | req.body | promisification.js:74:26:74:28 | cmd | This command line depends on a $@. | promisification.js:61:15:61:22 | req.body | user-provided value |
+| promisification.js:77:24:77:26 | cmd | promisification.js:61:15:61:22 | req.body | promisification.js:77:24:77:26 | cmd | This command line depends on a $@. | promisification.js:61:15:61:22 | req.body | user-provided value |
+| promisification.js:78:28:78:30 | cmd | promisification.js:61:15:61:22 | req.body | promisification.js:78:28:78:30 | cmd | This command line depends on a $@. | promisification.js:61:15:61:22 | req.body | user-provided value |
+| promisification.js:79:25:79:27 | cmd | promisification.js:61:15:61:22 | req.body | promisification.js:79:25:79:27 | cmd | This command line depends on a $@. | promisification.js:61:15:61:22 | req.body | user-provided value |
+| promisification.js:83:36:83:39 | code | promisification.js:61:15:61:22 | req.body | promisification.js:83:36:83:39 | code | This command line depends on a $@. | promisification.js:61:15:61:22 | req.body | user-provided value |
+| promisification.js:100:23:100:26 | code | promisification.js:99:18:99:25 | req.body | promisification.js:100:23:100:26 | code | This command line depends on a $@. | promisification.js:99:18:99:25 | req.body | user-provided value |
+| promisification.js:101:27:101:30 | code | promisification.js:99:18:99:25 | req.body | promisification.js:101:27:101:30 | code | This command line depends on a $@. | promisification.js:99:18:99:25 | req.body | user-provided value |
+| promisification.js:102:27:102:30 | code | promisification.js:99:18:99:25 | req.body | promisification.js:102:27:102:30 | code | This command line depends on a $@. | promisification.js:99:18:99:25 | req.body | user-provided value |
+| promisification.js:106:24:106:27 | code | promisification.js:99:18:99:25 | req.body | promisification.js:106:24:106:27 | code | This command line depends on a $@. | promisification.js:99:18:99:25 | req.body | user-provided value |
+| promisification.js:109:24:109:27 | code | promisification.js:99:18:99:25 | req.body | promisification.js:109:24:109:27 | code | This command line depends on a $@. | promisification.js:99:18:99:25 | req.body | user-provided value |
+| promisification.js:124:17:124:19 | cmd | promisification.js:114:18:114:25 | req.body | promisification.js:124:17:124:19 | cmd | This command line depends on a $@. | promisification.js:114:18:114:25 | req.body | user-provided value |
+| promisification.js:133:21:133:24 | code | promisification.js:130:18:130:25 | req.body | promisification.js:133:21:133:24 | code | This command line depends on a $@. | promisification.js:130:18:130:25 | req.body | user-provided value |
+| promisification.js:136:15:136:18 | code | promisification.js:130:18:130:25 | req.body | promisification.js:136:15:136:18 | code | This command line depends on a $@. | promisification.js:130:18:130:25 | req.body | user-provided value |
+| promisification.js:144:21:144:24 | code | promisification.js:141:18:141:25 | req.body | promisification.js:144:21:144:24 | code | This command line depends on a $@. | promisification.js:141:18:141:25 | req.body | user-provided value |
+| promisification.js:147:15:147:18 | code | promisification.js:141:18:141:25 | req.body | promisification.js:147:15:147:18 | code | This command line depends on a $@. | promisification.js:141:18:141:25 | req.body | user-provided value |
+| promisification.js:150:24:150:27 | code | promisification.js:141:18:141:25 | req.body | promisification.js:150:24:150:27 | code | This command line depends on a $@. | promisification.js:141:18:141:25 | req.body | user-provided value |
+| promisification.js:151:28:151:31 | code | promisification.js:141:18:141:25 | req.body | promisification.js:151:28:151:31 | code | This command line depends on a $@. | promisification.js:141:18:141:25 | req.body | user-provided value |
+| promisification.js:152:25:152:28 | code | promisification.js:141:18:141:25 | req.body | promisification.js:152:25:152:28 | code | This command line depends on a $@. | promisification.js:141:18:141:25 | req.body | user-provided value |
 | third-party-command-injection.js:6:21:6:27 | command | third-party-command-injection.js:5:20:5:26 | command | third-party-command-injection.js:6:21:6:27 | command | This command line depends on a $@. | third-party-command-injection.js:5:20:5:26 | command | user-provided value |
 edges
-| actions.js:8:9:8:57 | title | actions.js:9:16:9:20 | title | provenance |  |
-| actions.js:8:17:8:57 | github. ... t.title | actions.js:8:9:8:57 | title | provenance |  |
+| actions.js:8:9:8:13 | title | actions.js:9:16:9:20 | title | provenance |  |
+| actions.js:8:17:8:57 | github. ... t.title | actions.js:8:9:8:13 | title | provenance |  |
 | actions.js:9:16:9:20 | title | actions.js:9:8:9:22 | `echo ${title}` | provenance |  |
-| actions.js:18:9:18:63 | head_ref | actions.js:19:22:19:29 | head_ref | provenance |  |
-| actions.js:18:20:18:63 | github. ... ead.ref | actions.js:18:9:18:63 | head_ref | provenance |  |
+| actions.js:18:9:18:16 | head_ref | actions.js:19:22:19:29 | head_ref | provenance |  |
+| actions.js:18:20:18:63 | github. ... ead.ref | actions.js:18:9:18:16 | head_ref | provenance |  |
 | actions.js:19:22:19:29 | head_ref | actions.js:19:14:19:31 | `echo ${head_ref}` | provenance |  |
-| child_process-test.js:6:9:6:49 | cmd | child_process-test.js:17:13:17:15 | cmd | provenance |  |
-| child_process-test.js:6:9:6:49 | cmd | child_process-test.js:18:17:18:19 | cmd | provenance |  |
-| child_process-test.js:6:9:6:49 | cmd | child_process-test.js:19:17:19:19 | cmd | provenance |  |
-| child_process-test.js:6:9:6:49 | cmd | child_process-test.js:20:21:20:23 | cmd | provenance |  |
-| child_process-test.js:6:9:6:49 | cmd | child_process-test.js:21:14:21:16 | cmd | provenance |  |
-| child_process-test.js:6:9:6:49 | cmd | child_process-test.js:22:18:22:20 | cmd | provenance |  |
-| child_process-test.js:6:9:6:49 | cmd | child_process-test.js:23:13:23:15 | cmd | provenance |  |
-| child_process-test.js:6:9:6:49 | cmd | child_process-test.js:25:21:25:23 | cmd | provenance |  |
-| child_process-test.js:6:9:6:49 | cmd | child_process-test.js:39:26:39:28 | cmd | provenance |  |
-| child_process-test.js:6:9:6:49 | cmd | child_process-test.js:43:15:43:17 | cmd | provenance |  |
-| child_process-test.js:6:9:6:49 | cmd | child_process-test.js:48:15:48:17 | cmd | provenance |  |
-| child_process-test.js:6:9:6:49 | cmd | child_process-test.js:48:15:48:17 | cmd | provenance |  |
-| child_process-test.js:6:9:6:49 | cmd | child_process-test.js:53:15:53:17 | cmd | provenance |  |
-| child_process-test.js:6:9:6:49 | cmd | child_process-test.js:56:54:56:56 | cmd | provenance |  |
-| child_process-test.js:6:9:6:49 | cmd | child_process-test.js:56:54:56:56 | cmd | provenance |  |
-| child_process-test.js:6:9:6:49 | cmd | child_process-test.js:57:46:57:48 | cmd | provenance |  |
-| child_process-test.js:6:15:6:38 | url.par ... , true) | child_process-test.js:6:9:6:49 | cmd | provenance |  |
+| child_process-test.js:6:9:6:11 | cmd | child_process-test.js:17:13:17:15 | cmd | provenance |  |
+| child_process-test.js:6:9:6:11 | cmd | child_process-test.js:18:17:18:19 | cmd | provenance |  |
+| child_process-test.js:6:9:6:11 | cmd | child_process-test.js:19:17:19:19 | cmd | provenance |  |
+| child_process-test.js:6:9:6:11 | cmd | child_process-test.js:20:21:20:23 | cmd | provenance |  |
+| child_process-test.js:6:9:6:11 | cmd | child_process-test.js:21:14:21:16 | cmd | provenance |  |
+| child_process-test.js:6:9:6:11 | cmd | child_process-test.js:22:18:22:20 | cmd | provenance |  |
+| child_process-test.js:6:9:6:11 | cmd | child_process-test.js:23:13:23:15 | cmd | provenance |  |
+| child_process-test.js:6:9:6:11 | cmd | child_process-test.js:25:21:25:23 | cmd | provenance |  |
+| child_process-test.js:6:9:6:11 | cmd | child_process-test.js:39:26:39:28 | cmd | provenance |  |
+| child_process-test.js:6:9:6:11 | cmd | child_process-test.js:43:15:43:17 | cmd | provenance |  |
+| child_process-test.js:6:9:6:11 | cmd | child_process-test.js:48:15:48:17 | cmd | provenance |  |
+| child_process-test.js:6:9:6:11 | cmd | child_process-test.js:48:15:48:17 | cmd | provenance |  |
+| child_process-test.js:6:9:6:11 | cmd | child_process-test.js:53:15:53:17 | cmd | provenance |  |
+| child_process-test.js:6:9:6:11 | cmd | child_process-test.js:56:54:56:56 | cmd | provenance |  |
+| child_process-test.js:6:9:6:11 | cmd | child_process-test.js:56:54:56:56 | cmd | provenance |  |
+| child_process-test.js:6:9:6:11 | cmd | child_process-test.js:57:46:57:48 | cmd | provenance |  |
+| child_process-test.js:6:15:6:38 | url.par ... , true) | child_process-test.js:6:9:6:11 | cmd | provenance |  |
 | child_process-test.js:6:15:6:38 | url.par ... , true) | child_process-test.js:6:15:6:49 | url.par ... ry.path | provenance |  |
 | child_process-test.js:6:15:6:38 | url.par ... , true) | child_process-test.js:6:15:6:49 | url.par ... ry.path | provenance |  |
-| child_process-test.js:6:15:6:49 | url.par ... ry.path | child_process-test.js:6:9:6:49 | cmd | provenance |  |
+| child_process-test.js:6:15:6:49 | url.par ... ry.path | child_process-test.js:6:9:6:11 | cmd | provenance |  |
 | child_process-test.js:6:25:6:31 | req.url | child_process-test.js:6:15:6:38 | url.par ... , true) | provenance |  |
 | child_process-test.js:25:21:25:23 | cmd | child_process-test.js:25:13:25:31 | "foo" + cmd + "bar" | provenance |  |
 | child_process-test.js:48:5:48:8 | [post update] args [1] | child_process-test.js:49:15:49:18 | args [1] | provenance |  |
@@ -112,18 +145,47 @@ edges
 | child_process-test.js:56:46:56:57 | ["bar", cmd] [1] | child_process-test.js:56:25:56:58 | ['/C',  ... , cmd]) | provenance |  |
 | child_process-test.js:56:54:56:56 | cmd | child_process-test.js:56:46:56:57 | ["bar", cmd] [1] | provenance |  |
 | child_process-test.js:57:46:57:48 | cmd | child_process-test.js:57:25:57:49 | ['/C',  ... at(cmd) | provenance |  |
-| child_process-test.js:73:9:73:49 | cmd | child_process-test.js:75:29:75:31 | cmd | provenance |  |
-| child_process-test.js:73:15:73:38 | url.par ... , true) | child_process-test.js:73:9:73:49 | cmd | provenance |  |
+| child_process-test.js:73:9:73:11 | cmd | child_process-test.js:75:29:75:31 | cmd | provenance |  |
+| child_process-test.js:73:15:73:38 | url.par ... , true) | child_process-test.js:73:9:73:11 | cmd | provenance |  |
 | child_process-test.js:73:25:73:31 | req.url | child_process-test.js:73:15:73:38 | url.par ... , true) | provenance |  |
 | child_process-test.js:94:21:94:30 | ctx.params | child_process-test.js:94:11:94:35 | "ping " ... ms.host | provenance |  |
+| command-line-libs.js:9:9:9:12 | args | command-line-libs.js:12:17:12:20 | args | provenance |  |
+| command-line-libs.js:9:9:9:12 | args | command-line-libs.js:23:29:23:32 | args | provenance |  |
+| command-line-libs.js:9:16:9:23 | req.body | command-line-libs.js:9:9:9:12 | args | provenance |  |
+| command-line-libs.js:12:17:12:20 | args | command-line-libs.js:13:19:13:32 | program.opts() | provenance |  |
+| command-line-libs.js:12:17:12:20 | args | command-line-libs.js:15:8:15:18 | program.cmd | provenance |  |
+| command-line-libs.js:12:17:12:20 | args | command-line-libs.js:20:14:20:19 | script | provenance |  |
+| command-line-libs.js:13:9:13:15 | options | command-line-libs.js:14:8:14:14 | options | provenance |  |
+| command-line-libs.js:13:19:13:32 | program.opts() | command-line-libs.js:13:9:13:15 | options | provenance |  |
+| command-line-libs.js:14:8:14:14 | options | command-line-libs.js:14:8:14:18 | options.cmd | provenance |  |
+| command-line-libs.js:20:14:20:19 | script | command-line-libs.js:21:12:21:17 | script | provenance |  |
+| command-line-libs.js:23:29:23:32 | args | command-line-libs.js:20:14:20:19 | script | provenance |  |
+| command-line-libs.js:27:11:27:19 | argsArray | command-line-libs.js:28:53:28:61 | argsArray | provenance |  |
+| command-line-libs.js:27:23:27:30 | req.body | command-line-libs.js:27:11:27:19 | argsArray | provenance |  |
+| command-line-libs.js:28:11:28:16 | parsed | command-line-libs.js:29:10:29:15 | parsed | provenance |  |
+| command-line-libs.js:28:20:28:64 | arg({ ' ... rray }) | command-line-libs.js:28:11:28:16 | parsed | provenance |  |
+| command-line-libs.js:28:53:28:61 | argsArray | command-line-libs.js:28:20:28:64 | arg({ ' ... rray }) | provenance |  |
+| command-line-libs.js:29:10:29:15 | parsed | command-line-libs.js:29:10:29:24 | parsed['--cmd'] | provenance |  |
+| command-line-libs.js:35:9:35:15 | options | command-line-libs.js:37:8:37:14 | options | provenance |  |
+| command-line-libs.js:35:19:35:83 | command ... \| [] }) | command-line-libs.js:35:9:35:15 | options | provenance |  |
+| command-line-libs.js:35:62:35:69 | req.body | command-line-libs.js:35:19:35:83 | command ... \| [] }) | provenance |  |
+| command-line-libs.js:37:8:37:14 | options | command-line-libs.js:37:8:37:18 | options.cmd | provenance |  |
+| command-line-libs.js:42:9:42:12 | args | command-line-libs.js:43:24:43:27 | args | provenance |  |
+| command-line-libs.js:42:16:42:23 | req.body | command-line-libs.js:42:9:42:12 | args | provenance |  |
+| command-line-libs.js:43:9:43:14 | parsed | command-line-libs.js:49:8:49:13 | parsed | provenance |  |
+| command-line-libs.js:43:18:43:28 | yargs(args) | command-line-libs.js:43:18:47:4 | yargs(a ... ue\\n  }) | provenance |  |
+| command-line-libs.js:43:18:47:4 | yargs(a ... ue\\n  }) | command-line-libs.js:43:18:47:12 | yargs(a ... parse() | provenance |  |
+| command-line-libs.js:43:18:47:12 | yargs(a ... parse() | command-line-libs.js:43:9:43:14 | parsed | provenance |  |
+| command-line-libs.js:43:24:43:27 | args | command-line-libs.js:43:18:43:28 | yargs(args) | provenance |  |
+| command-line-libs.js:49:8:49:13 | parsed | command-line-libs.js:49:8:49:17 | parsed.cmd | provenance |  |
 | exec-sh2.js:9:17:9:23 | command | exec-sh2.js:10:40:10:46 | command | provenance |  |
-| exec-sh2.js:14:9:14:49 | cmd | exec-sh2.js:15:12:15:14 | cmd | provenance |  |
-| exec-sh2.js:14:15:14:38 | url.par ... , true) | exec-sh2.js:14:9:14:49 | cmd | provenance |  |
+| exec-sh2.js:14:9:14:11 | cmd | exec-sh2.js:15:12:15:14 | cmd | provenance |  |
+| exec-sh2.js:14:15:14:38 | url.par ... , true) | exec-sh2.js:14:9:14:11 | cmd | provenance |  |
 | exec-sh2.js:14:25:14:31 | req.url | exec-sh2.js:14:15:14:38 | url.par ... , true) | provenance |  |
 | exec-sh2.js:15:12:15:14 | cmd | exec-sh2.js:9:17:9:23 | command | provenance |  |
 | exec-sh.js:13:17:13:23 | command | exec-sh.js:15:44:15:50 | command | provenance |  |
-| exec-sh.js:19:9:19:49 | cmd | exec-sh.js:20:12:20:14 | cmd | provenance |  |
-| exec-sh.js:19:15:19:38 | url.par ... , true) | exec-sh.js:19:9:19:49 | cmd | provenance |  |
+| exec-sh.js:19:9:19:11 | cmd | exec-sh.js:20:12:20:14 | cmd | provenance |  |
+| exec-sh.js:19:15:19:38 | url.par ... , true) | exec-sh.js:19:9:19:11 | cmd | provenance |  |
 | exec-sh.js:19:25:19:31 | req.url | exec-sh.js:19:15:19:38 | url.par ... , true) | provenance |  |
 | exec-sh.js:20:12:20:14 | cmd | exec-sh.js:13:17:13:23 | command | provenance |  |
 | execSeries.js:3:20:3:22 | arr [0] | execSeries.js:5:3:10:4 | (functi ... );\\n  }) [arr, 0] | provenance |  |
@@ -134,45 +196,45 @@ edges
 | execSeries.js:13:19:13:26 | commands [0] | execSeries.js:14:13:14:20 | commands [0] | provenance |  |
 | execSeries.js:14:13:14:20 | commands [0] | execSeries.js:3:20:3:22 | arr [0] | provenance |  |
 | execSeries.js:14:24:14:30 | command | execSeries.js:14:41:14:47 | command | provenance |  |
-| execSeries.js:18:7:18:58 | cmd | execSeries.js:19:13:19:15 | cmd | provenance |  |
-| execSeries.js:18:13:18:47 | require ... , true) | execSeries.js:18:7:18:58 | cmd | provenance |  |
+| execSeries.js:18:7:18:9 | cmd | execSeries.js:19:13:19:15 | cmd | provenance |  |
+| execSeries.js:18:13:18:47 | require ... , true) | execSeries.js:18:7:18:9 | cmd | provenance |  |
 | execSeries.js:18:34:18:40 | req.url | execSeries.js:18:13:18:47 | require ... , true) | provenance |  |
 | execSeries.js:19:12:19:16 | [cmd] [0] | execSeries.js:13:19:13:26 | commands [0] | provenance |  |
 | execSeries.js:19:13:19:15 | cmd | execSeries.js:19:12:19:16 | [cmd] [0] | provenance |  |
-| execa.js:6:9:6:54 | cmd | execa.js:11:15:11:17 | cmd | provenance |  |
-| execa.js:6:9:6:54 | cmd | execa.js:13:32:13:34 | cmd | provenance |  |
-| execa.js:6:9:6:54 | cmd | execa.js:14:31:14:33 | cmd | provenance |  |
-| execa.js:6:9:6:54 | cmd | execa.js:17:14:17:16 | cmd | provenance |  |
-| execa.js:6:9:6:54 | cmd | execa.js:19:32:19:34 | cmd | provenance |  |
-| execa.js:6:9:6:54 | cmd | execa.js:20:33:20:35 | cmd | provenance |  |
-| execa.js:6:9:6:54 | cmd | execa.js:23:17:23:19 | cmd | provenance |  |
-| execa.js:6:9:6:54 | cmd | execa.js:24:17:24:19 | cmd | provenance |  |
-| execa.js:6:9:6:54 | cmd | execa.js:25:17:25:19 | cmd | provenance |  |
-| execa.js:6:9:6:54 | cmd | execa.js:27:15:27:17 | cmd | provenance |  |
-| execa.js:6:9:6:54 | cmd | execa.js:28:15:28:17 | cmd | provenance |  |
-| execa.js:6:9:6:54 | cmd | execa.js:30:24:30:26 | cmd | provenance |  |
-| execa.js:6:9:6:54 | cmd | execa.js:31:24:31:26 | cmd | provenance |  |
-| execa.js:6:9:6:54 | cmd | execa.js:33:22:33:24 | cmd | provenance |  |
-| execa.js:6:9:6:54 | cmd | execa.js:34:22:34:24 | cmd | provenance |  |
-| execa.js:6:15:6:38 | url.par ... , true) | execa.js:6:9:6:54 | cmd | provenance |  |
+| execa.js:6:9:6:11 | cmd | execa.js:11:15:11:17 | cmd | provenance |  |
+| execa.js:6:9:6:11 | cmd | execa.js:13:32:13:34 | cmd | provenance |  |
+| execa.js:6:9:6:11 | cmd | execa.js:14:31:14:33 | cmd | provenance |  |
+| execa.js:6:9:6:11 | cmd | execa.js:17:14:17:16 | cmd | provenance |  |
+| execa.js:6:9:6:11 | cmd | execa.js:19:32:19:34 | cmd | provenance |  |
+| execa.js:6:9:6:11 | cmd | execa.js:20:33:20:35 | cmd | provenance |  |
+| execa.js:6:9:6:11 | cmd | execa.js:23:17:23:19 | cmd | provenance |  |
+| execa.js:6:9:6:11 | cmd | execa.js:24:17:24:19 | cmd | provenance |  |
+| execa.js:6:9:6:11 | cmd | execa.js:25:17:25:19 | cmd | provenance |  |
+| execa.js:6:9:6:11 | cmd | execa.js:27:15:27:17 | cmd | provenance |  |
+| execa.js:6:9:6:11 | cmd | execa.js:28:15:28:17 | cmd | provenance |  |
+| execa.js:6:9:6:11 | cmd | execa.js:30:24:30:26 | cmd | provenance |  |
+| execa.js:6:9:6:11 | cmd | execa.js:31:24:31:26 | cmd | provenance |  |
+| execa.js:6:9:6:11 | cmd | execa.js:33:22:33:24 | cmd | provenance |  |
+| execa.js:6:9:6:11 | cmd | execa.js:34:22:34:24 | cmd | provenance |  |
+| execa.js:6:15:6:38 | url.par ... , true) | execa.js:6:9:6:11 | cmd | provenance |  |
 | execa.js:6:25:6:31 | req.url | execa.js:6:15:6:38 | url.par ... , true) | provenance |  |
-| execa.js:7:9:7:53 | arg1 | execa.js:30:30:30:33 | arg1 | provenance |  |
-| execa.js:7:9:7:53 | arg1 | execa.js:31:30:31:33 | arg1 | provenance |  |
-| execa.js:7:9:7:53 | arg1 | execa.js:33:28:33:31 | arg1 | provenance |  |
-| execa.js:7:9:7:53 | arg1 | execa.js:34:28:34:31 | arg1 | provenance |  |
-| execa.js:7:16:7:39 | url.par ... , true) | execa.js:7:9:7:53 | arg1 | provenance |  |
+| execa.js:7:9:7:12 | arg1 | execa.js:30:30:30:33 | arg1 | provenance |  |
+| execa.js:7:9:7:12 | arg1 | execa.js:31:30:31:33 | arg1 | provenance |  |
+| execa.js:7:9:7:12 | arg1 | execa.js:33:28:33:31 | arg1 | provenance |  |
+| execa.js:7:9:7:12 | arg1 | execa.js:34:28:34:31 | arg1 | provenance |  |
+| execa.js:7:16:7:39 | url.par ... , true) | execa.js:7:9:7:12 | arg1 | provenance |  |
 | execa.js:7:26:7:32 | req.url | execa.js:7:16:7:39 | url.par ... , true) | provenance |  |
-| execa.js:8:9:8:53 | arg2 | execa.js:30:37:30:40 | arg2 | provenance |  |
-| execa.js:8:9:8:53 | arg2 | execa.js:31:37:31:40 | arg2 | provenance |  |
-| execa.js:8:9:8:53 | arg2 | execa.js:33:35:33:38 | arg2 | provenance |  |
-| execa.js:8:9:8:53 | arg2 | execa.js:34:35:34:38 | arg2 | provenance |  |
-| execa.js:8:16:8:39 | url.par ... , true) | execa.js:8:9:8:53 | arg2 | provenance |  |
+| execa.js:8:9:8:12 | arg2 | execa.js:30:37:30:40 | arg2 | provenance |  |
+| execa.js:8:9:8:12 | arg2 | execa.js:31:37:31:40 | arg2 | provenance |  |
+| execa.js:8:9:8:12 | arg2 | execa.js:33:35:33:38 | arg2 | provenance |  |
+| execa.js:8:9:8:12 | arg2 | execa.js:34:35:34:38 | arg2 | provenance |  |
+| execa.js:8:16:8:39 | url.par ... , true) | execa.js:8:9:8:12 | arg2 | provenance |  |
 | execa.js:8:26:8:32 | req.url | execa.js:8:16:8:39 | url.par ... , true) | provenance |  |
-| execa.js:9:9:9:53 | arg3 | execa.js:30:44:30:47 | arg3 | provenance |  |
-| execa.js:9:9:9:53 | arg3 | execa.js:31:44:31:47 | arg3 | provenance |  |
-| execa.js:9:9:9:53 | arg3 | execa.js:33:42:33:45 | arg3 | provenance |  |
-| execa.js:9:9:9:53 | arg3 | execa.js:34:42:34:45 | arg3 | provenance |  |
-| execa.js:9:16:9:39 | url.par ... , true) | execa.js:9:9:9:53 | arg3 | provenance |  |
+| execa.js:9:9:9:12 | arg3 | execa.js:30:44:30:47 | arg3 | provenance |  |
+| execa.js:9:9:9:12 | arg3 | execa.js:31:44:31:47 | arg3 | provenance |  |
+| execa.js:9:9:9:12 | arg3 | execa.js:33:42:33:45 | arg3 | provenance |  |
+| execa.js:9:9:9:12 | arg3 | execa.js:34:42:34:45 | arg3 | provenance |  |
+| execa.js:9:16:9:39 | url.par ... , true) | execa.js:9:9:9:12 | arg3 | provenance |  |
 | execa.js:9:26:9:32 | req.url | execa.js:9:16:9:39 | url.par ... , true) | provenance |  |
 | execa.js:30:24:30:26 | cmd | execa.js:30:24:30:47 | cmd + a ...  + arg3 | provenance |  |
 | execa.js:30:30:30:33 | arg1 | execa.js:30:24:30:47 | cmd + a ...  + arg3 | provenance |  |
@@ -204,37 +266,90 @@ edges
 | form-parsers.js:53:21:53:26 | fields | form-parsers.js:53:10:53:31 | "touch  ... ds.name | provenance |  |
 | form-parsers.js:58:30:58:33 | part | form-parsers.js:59:21:59:24 | part | provenance |  |
 | form-parsers.js:59:21:59:24 | part | form-parsers.js:59:10:59:33 | "touch  ... ilename | provenance |  |
-| other.js:5:9:5:49 | cmd | other.js:7:33:7:35 | cmd | provenance |  |
-| other.js:5:9:5:49 | cmd | other.js:8:28:8:30 | cmd | provenance |  |
-| other.js:5:9:5:49 | cmd | other.js:9:32:9:34 | cmd | provenance |  |
-| other.js:5:9:5:49 | cmd | other.js:10:29:10:31 | cmd | provenance |  |
-| other.js:5:9:5:49 | cmd | other.js:11:29:11:31 | cmd | provenance |  |
-| other.js:5:9:5:49 | cmd | other.js:12:27:12:29 | cmd | provenance |  |
-| other.js:5:9:5:49 | cmd | other.js:14:28:14:30 | cmd | provenance |  |
-| other.js:5:9:5:49 | cmd | other.js:15:34:15:36 | cmd | provenance |  |
-| other.js:5:9:5:49 | cmd | other.js:16:21:16:23 | cmd | provenance |  |
-| other.js:5:9:5:49 | cmd | other.js:17:27:17:29 | cmd | provenance |  |
-| other.js:5:9:5:49 | cmd | other.js:18:22:18:24 | cmd | provenance |  |
-| other.js:5:9:5:49 | cmd | other.js:19:36:19:38 | cmd | provenance |  |
-| other.js:5:9:5:49 | cmd | other.js:22:21:22:23 | cmd | provenance |  |
-| other.js:5:9:5:49 | cmd | other.js:23:28:23:30 | cmd | provenance |  |
-| other.js:5:9:5:49 | cmd | other.js:26:34:26:36 | cmd | provenance |  |
-| other.js:5:9:5:49 | cmd | other.js:28:27:28:29 | cmd | provenance |  |
-| other.js:5:9:5:49 | cmd | other.js:30:33:30:35 | cmd | provenance |  |
-| other.js:5:9:5:49 | cmd | other.js:34:44:34:46 | cmd | provenance |  |
-| other.js:5:15:5:38 | url.par ... , true) | other.js:5:9:5:49 | cmd | provenance |  |
+| other.js:5:9:5:11 | cmd | other.js:7:33:7:35 | cmd | provenance |  |
+| other.js:5:9:5:11 | cmd | other.js:8:28:8:30 | cmd | provenance |  |
+| other.js:5:9:5:11 | cmd | other.js:9:32:9:34 | cmd | provenance |  |
+| other.js:5:9:5:11 | cmd | other.js:10:29:10:31 | cmd | provenance |  |
+| other.js:5:9:5:11 | cmd | other.js:11:29:11:31 | cmd | provenance |  |
+| other.js:5:9:5:11 | cmd | other.js:12:27:12:29 | cmd | provenance |  |
+| other.js:5:9:5:11 | cmd | other.js:14:28:14:30 | cmd | provenance |  |
+| other.js:5:9:5:11 | cmd | other.js:15:34:15:36 | cmd | provenance |  |
+| other.js:5:9:5:11 | cmd | other.js:16:21:16:23 | cmd | provenance |  |
+| other.js:5:9:5:11 | cmd | other.js:17:27:17:29 | cmd | provenance |  |
+| other.js:5:9:5:11 | cmd | other.js:18:22:18:24 | cmd | provenance |  |
+| other.js:5:9:5:11 | cmd | other.js:19:36:19:38 | cmd | provenance |  |
+| other.js:5:9:5:11 | cmd | other.js:22:21:22:23 | cmd | provenance |  |
+| other.js:5:9:5:11 | cmd | other.js:23:28:23:30 | cmd | provenance |  |
+| other.js:5:9:5:11 | cmd | other.js:26:34:26:36 | cmd | provenance |  |
+| other.js:5:9:5:11 | cmd | other.js:28:27:28:29 | cmd | provenance |  |
+| other.js:5:9:5:11 | cmd | other.js:30:33:30:35 | cmd | provenance |  |
+| other.js:5:9:5:11 | cmd | other.js:34:44:34:46 | cmd | provenance |  |
+| other.js:5:15:5:38 | url.par ... , true) | other.js:5:9:5:11 | cmd | provenance |  |
 | other.js:5:25:5:31 | req.url | other.js:5:15:5:38 | url.par ... , true) | provenance |  |
+| promisification.js:8:21:8:24 | code | promisification.js:9:13:9:16 | code | provenance |  |
+| promisification.js:9:13:9:16 | code | promisification.js:9:13:9:21 | code.code | provenance |  |
+| promisification.js:15:11:15:14 | code | promisification.js:16:15:16:18 | code | provenance |  |
+| promisification.js:15:18:15:25 | req.body | promisification.js:15:11:15:14 | code | provenance |  |
+| promisification.js:16:15:16:18 | code | promisification.js:8:21:8:24 | code | provenance |  |
+| promisification.js:21:11:21:14 | code | promisification.js:24:22:24:25 | code | provenance |  |
+| promisification.js:21:18:21:25 | req.body | promisification.js:21:11:21:14 | code | provenance |  |
+| promisification.js:30:11:30:14 | code | promisification.js:31:24:31:27 | code | provenance |  |
+| promisification.js:30:18:30:25 | req.body | promisification.js:30:11:30:14 | code | provenance |  |
+| promisification.js:37:11:37:14 | code | promisification.js:40:21:40:24 | code | provenance |  |
+| promisification.js:37:11:37:14 | code | promisification.js:43:24:43:27 | code | provenance |  |
+| promisification.js:37:18:37:25 | req.body | promisification.js:37:11:37:14 | code | provenance |  |
+| promisification.js:49:11:49:14 | code | promisification.js:52:21:52:24 | code | provenance |  |
+| promisification.js:49:11:49:14 | code | promisification.js:55:15:55:18 | code | provenance |  |
+| promisification.js:49:18:49:25 | req.body | promisification.js:49:11:49:14 | code | provenance |  |
+| promisification.js:61:9:61:11 | cmd | promisification.js:65:21:65:23 | cmd | provenance |  |
+| promisification.js:61:9:61:11 | cmd | promisification.js:69:20:69:22 | cmd | provenance |  |
+| promisification.js:61:9:61:11 | cmd | promisification.js:74:26:74:28 | cmd | provenance |  |
+| promisification.js:61:9:61:11 | cmd | promisification.js:77:24:77:26 | cmd | provenance |  |
+| promisification.js:61:9:61:11 | cmd | promisification.js:78:28:78:30 | cmd | provenance |  |
+| promisification.js:61:9:61:11 | cmd | promisification.js:79:25:79:27 | cmd | provenance |  |
+| promisification.js:61:9:61:11 | cmd | promisification.js:89:12:89:14 | cmd | provenance |  |
+| promisification.js:61:15:61:22 | req.body | promisification.js:61:9:61:11 | cmd | provenance |  |
+| promisification.js:81:34:81:37 | code | promisification.js:83:36:83:39 | code | provenance |  |
+| promisification.js:89:12:89:14 | cmd | promisification.js:81:34:81:37 | code | provenance |  |
+| promisification.js:99:11:99:14 | code | promisification.js:100:23:100:26 | code | provenance |  |
+| promisification.js:99:11:99:14 | code | promisification.js:101:27:101:30 | code | provenance |  |
+| promisification.js:99:11:99:14 | code | promisification.js:102:27:102:30 | code | provenance |  |
+| promisification.js:99:11:99:14 | code | promisification.js:106:24:106:27 | code | provenance |  |
+| promisification.js:99:11:99:14 | code | promisification.js:109:24:109:27 | code | provenance |  |
+| promisification.js:99:18:99:25 | req.body | promisification.js:99:11:99:14 | code | provenance |  |
+| promisification.js:114:11:114:14 | code | promisification.js:122:42:122:45 | code | provenance |  |
+| promisification.js:114:18:114:25 | req.body | promisification.js:114:11:114:14 | code | provenance |  |
+| promisification.js:116:32:116:34 | cmd | promisification.js:117:16:119:10 | new Pro ...      }) [PromiseValue] | provenance |  |
+| promisification.js:116:32:116:34 | cmd | promisification.js:118:21:118:23 | cmd | provenance |  |
+| promisification.js:118:13:118:19 | [post update] resolve [resolve-value] | promisification.js:117:29:117:35 | resolve [Return] [resolve-value] | provenance |  |
+| promisification.js:118:21:118:23 | cmd | promisification.js:118:13:118:19 | [post update] resolve [resolve-value] | provenance |  |
+| promisification.js:122:11:122:20 | cmdPromise [PromiseValue] | promisification.js:123:17:123:26 | cmdPromise [PromiseValue] | provenance |  |
+| promisification.js:122:24:122:46 | createE ... e(code) [PromiseValue] | promisification.js:122:11:122:20 | cmdPromise [PromiseValue] | provenance |  |
+| promisification.js:122:42:122:45 | code | promisification.js:116:32:116:34 | cmd | provenance |  |
+| promisification.js:122:42:122:45 | code | promisification.js:122:24:122:46 | createE ... e(code) [PromiseValue] | provenance |  |
+| promisification.js:123:5:123:27 | maybe(n ... romise) [PromiseValue] | promisification.js:123:34:123:36 | cmd | provenance |  |
+| promisification.js:123:17:123:26 | cmdPromise [PromiseValue] | promisification.js:123:5:123:27 | maybe(n ... romise) [PromiseValue] | provenance |  |
+| promisification.js:123:34:123:36 | cmd | promisification.js:124:17:124:19 | cmd | provenance |  |
+| promisification.js:130:11:130:14 | code | promisification.js:133:21:133:24 | code | provenance |  |
+| promisification.js:130:11:130:14 | code | promisification.js:136:15:136:18 | code | provenance |  |
+| promisification.js:130:18:130:25 | req.body | promisification.js:130:11:130:14 | code | provenance |  |
+| promisification.js:141:11:141:14 | code | promisification.js:144:21:144:24 | code | provenance |  |
+| promisification.js:141:11:141:14 | code | promisification.js:147:15:147:18 | code | provenance |  |
+| promisification.js:141:11:141:14 | code | promisification.js:150:24:150:27 | code | provenance |  |
+| promisification.js:141:11:141:14 | code | promisification.js:151:28:151:31 | code | provenance |  |
+| promisification.js:141:11:141:14 | code | promisification.js:152:25:152:28 | code | provenance |  |
+| promisification.js:141:18:141:25 | req.body | promisification.js:141:11:141:14 | code | provenance |  |
 | third-party-command-injection.js:5:20:5:26 | command | third-party-command-injection.js:6:21:6:27 | command | provenance |  |
 nodes
-| actions.js:8:9:8:57 | title | semmle.label | title |
+| actions.js:8:9:8:13 | title | semmle.label | title |
 | actions.js:8:17:8:57 | github. ... t.title | semmle.label | github. ... t.title |
 | actions.js:9:8:9:22 | `echo ${title}` | semmle.label | `echo ${title}` |
 | actions.js:9:16:9:20 | title | semmle.label | title |
-| actions.js:18:9:18:63 | head_ref | semmle.label | head_ref |
+| actions.js:18:9:18:16 | head_ref | semmle.label | head_ref |
 | actions.js:18:20:18:63 | github. ... ead.ref | semmle.label | github. ... ead.ref |
 | actions.js:19:14:19:31 | `echo ${head_ref}` | semmle.label | `echo ${head_ref}` |
 | actions.js:19:22:19:29 | head_ref | semmle.label | head_ref |
-| child_process-test.js:6:9:6:49 | cmd | semmle.label | cmd |
+| child_process-test.js:6:9:6:11 | cmd | semmle.label | cmd |
 | child_process-test.js:6:15:6:38 | url.par ... , true) | semmle.label | url.par ... , true) |
 | child_process-test.js:6:15:6:49 | url.par ... ry.path | semmle.label | url.par ... ry.path |
 | child_process-test.js:6:15:6:49 | url.par ... ry.path | semmle.label | url.par ... ry.path |
@@ -262,22 +377,54 @@ nodes
 | child_process-test.js:57:25:57:49 | ['/C',  ... at(cmd) | semmle.label | ['/C',  ... at(cmd) |
 | child_process-test.js:57:46:57:48 | cmd | semmle.label | cmd |
 | child_process-test.js:66:19:66:22 | args | semmle.label | args |
-| child_process-test.js:73:9:73:49 | cmd | semmle.label | cmd |
+| child_process-test.js:73:9:73:11 | cmd | semmle.label | cmd |
 | child_process-test.js:73:15:73:38 | url.par ... , true) | semmle.label | url.par ... , true) |
 | child_process-test.js:73:25:73:31 | req.url | semmle.label | req.url |
 | child_process-test.js:75:29:75:31 | cmd | semmle.label | cmd |
 | child_process-test.js:83:19:83:36 | req.query.fileName | semmle.label | req.query.fileName |
 | child_process-test.js:94:11:94:35 | "ping " ... ms.host | semmle.label | "ping " ... ms.host |
 | child_process-test.js:94:21:94:30 | ctx.params | semmle.label | ctx.params |
+| command-line-libs.js:9:9:9:12 | args | semmle.label | args |
+| command-line-libs.js:9:16:9:23 | req.body | semmle.label | req.body |
+| command-line-libs.js:12:17:12:20 | args | semmle.label | args |
+| command-line-libs.js:13:9:13:15 | options | semmle.label | options |
+| command-line-libs.js:13:19:13:32 | program.opts() | semmle.label | program.opts() |
+| command-line-libs.js:14:8:14:14 | options | semmle.label | options |
+| command-line-libs.js:14:8:14:18 | options.cmd | semmle.label | options.cmd |
+| command-line-libs.js:15:8:15:18 | program.cmd | semmle.label | program.cmd |
+| command-line-libs.js:20:14:20:19 | script | semmle.label | script |
+| command-line-libs.js:21:12:21:17 | script | semmle.label | script |
+| command-line-libs.js:23:29:23:32 | args | semmle.label | args |
+| command-line-libs.js:27:11:27:19 | argsArray | semmle.label | argsArray |
+| command-line-libs.js:27:23:27:30 | req.body | semmle.label | req.body |
+| command-line-libs.js:28:11:28:16 | parsed | semmle.label | parsed |
+| command-line-libs.js:28:20:28:64 | arg({ ' ... rray }) | semmle.label | arg({ ' ... rray }) |
+| command-line-libs.js:28:53:28:61 | argsArray | semmle.label | argsArray |
+| command-line-libs.js:29:10:29:15 | parsed | semmle.label | parsed |
+| command-line-libs.js:29:10:29:24 | parsed['--cmd'] | semmle.label | parsed['--cmd'] |
+| command-line-libs.js:35:9:35:15 | options | semmle.label | options |
+| command-line-libs.js:35:19:35:83 | command ... \| [] }) | semmle.label | command ... \| [] }) |
+| command-line-libs.js:35:62:35:69 | req.body | semmle.label | req.body |
+| command-line-libs.js:37:8:37:14 | options | semmle.label | options |
+| command-line-libs.js:37:8:37:18 | options.cmd | semmle.label | options.cmd |
+| command-line-libs.js:42:9:42:12 | args | semmle.label | args |
+| command-line-libs.js:42:16:42:23 | req.body | semmle.label | req.body |
+| command-line-libs.js:43:9:43:14 | parsed | semmle.label | parsed |
+| command-line-libs.js:43:18:43:28 | yargs(args) | semmle.label | yargs(args) |
+| command-line-libs.js:43:18:47:4 | yargs(a ... ue\\n  }) | semmle.label | yargs(a ... ue\\n  }) |
+| command-line-libs.js:43:18:47:12 | yargs(a ... parse() | semmle.label | yargs(a ... parse() |
+| command-line-libs.js:43:24:43:27 | args | semmle.label | args |
+| command-line-libs.js:49:8:49:13 | parsed | semmle.label | parsed |
+| command-line-libs.js:49:8:49:17 | parsed.cmd | semmle.label | parsed.cmd |
 | exec-sh2.js:9:17:9:23 | command | semmle.label | command |
 | exec-sh2.js:10:40:10:46 | command | semmle.label | command |
-| exec-sh2.js:14:9:14:49 | cmd | semmle.label | cmd |
+| exec-sh2.js:14:9:14:11 | cmd | semmle.label | cmd |
 | exec-sh2.js:14:15:14:38 | url.par ... , true) | semmle.label | url.par ... , true) |
 | exec-sh2.js:14:25:14:31 | req.url | semmle.label | req.url |
 | exec-sh2.js:15:12:15:14 | cmd | semmle.label | cmd |
 | exec-sh.js:13:17:13:23 | command | semmle.label | command |
 | exec-sh.js:15:44:15:50 | command | semmle.label | command |
-| exec-sh.js:19:9:19:49 | cmd | semmle.label | cmd |
+| exec-sh.js:19:9:19:11 | cmd | semmle.label | cmd |
 | exec-sh.js:19:15:19:38 | url.par ... , true) | semmle.label | url.par ... , true) |
 | exec-sh.js:19:25:19:31 | req.url | semmle.label | req.url |
 | exec-sh.js:20:12:20:14 | cmd | semmle.label | cmd |
@@ -289,21 +436,21 @@ nodes
 | execSeries.js:14:13:14:20 | commands [0] | semmle.label | commands [0] |
 | execSeries.js:14:24:14:30 | command | semmle.label | command |
 | execSeries.js:14:41:14:47 | command | semmle.label | command |
-| execSeries.js:18:7:18:58 | cmd | semmle.label | cmd |
+| execSeries.js:18:7:18:9 | cmd | semmle.label | cmd |
 | execSeries.js:18:13:18:47 | require ... , true) | semmle.label | require ... , true) |
 | execSeries.js:18:34:18:40 | req.url | semmle.label | req.url |
 | execSeries.js:19:12:19:16 | [cmd] [0] | semmle.label | [cmd] [0] |
 | execSeries.js:19:13:19:15 | cmd | semmle.label | cmd |
-| execa.js:6:9:6:54 | cmd | semmle.label | cmd |
+| execa.js:6:9:6:11 | cmd | semmle.label | cmd |
 | execa.js:6:15:6:38 | url.par ... , true) | semmle.label | url.par ... , true) |
 | execa.js:6:25:6:31 | req.url | semmle.label | req.url |
-| execa.js:7:9:7:53 | arg1 | semmle.label | arg1 |
+| execa.js:7:9:7:12 | arg1 | semmle.label | arg1 |
 | execa.js:7:16:7:39 | url.par ... , true) | semmle.label | url.par ... , true) |
 | execa.js:7:26:7:32 | req.url | semmle.label | req.url |
-| execa.js:8:9:8:53 | arg2 | semmle.label | arg2 |
+| execa.js:8:9:8:12 | arg2 | semmle.label | arg2 |
 | execa.js:8:16:8:39 | url.par ... , true) | semmle.label | url.par ... , true) |
 | execa.js:8:26:8:32 | req.url | semmle.label | req.url |
-| execa.js:9:9:9:53 | arg3 | semmle.label | arg3 |
+| execa.js:9:9:9:12 | arg3 | semmle.label | arg3 |
 | execa.js:9:16:9:39 | url.par ... , true) | semmle.label | url.par ... , true) |
 | execa.js:9:26:9:32 | req.url | semmle.label | req.url |
 | execa.js:11:15:11:17 | cmd | semmle.label | cmd |
@@ -358,7 +505,7 @@ nodes
 | form-parsers.js:58:30:58:33 | part | semmle.label | part |
 | form-parsers.js:59:10:59:33 | "touch  ... ilename | semmle.label | "touch  ... ilename |
 | form-parsers.js:59:21:59:24 | part | semmle.label | part |
-| other.js:5:9:5:49 | cmd | semmle.label | cmd |
+| other.js:5:9:5:11 | cmd | semmle.label | cmd |
 | other.js:5:15:5:38 | url.par ... , true) | semmle.label | url.par ... , true) |
 | other.js:5:25:5:31 | req.url | semmle.label | req.url |
 | other.js:7:33:7:35 | cmd | semmle.label | cmd |
@@ -379,6 +526,71 @@ nodes
 | other.js:28:27:28:29 | cmd | semmle.label | cmd |
 | other.js:30:33:30:35 | cmd | semmle.label | cmd |
 | other.js:34:44:34:46 | cmd | semmle.label | cmd |
+| promisification.js:8:21:8:24 | code | semmle.label | code |
+| promisification.js:9:13:9:16 | code | semmle.label | code |
+| promisification.js:9:13:9:21 | code.code | semmle.label | code.code |
+| promisification.js:15:11:15:14 | code | semmle.label | code |
+| promisification.js:15:18:15:25 | req.body | semmle.label | req.body |
+| promisification.js:16:15:16:18 | code | semmle.label | code |
+| promisification.js:21:11:21:14 | code | semmle.label | code |
+| promisification.js:21:18:21:25 | req.body | semmle.label | req.body |
+| promisification.js:24:22:24:25 | code | semmle.label | code |
+| promisification.js:30:11:30:14 | code | semmle.label | code |
+| promisification.js:30:18:30:25 | req.body | semmle.label | req.body |
+| promisification.js:31:24:31:27 | code | semmle.label | code |
+| promisification.js:37:11:37:14 | code | semmle.label | code |
+| promisification.js:37:18:37:25 | req.body | semmle.label | req.body |
+| promisification.js:40:21:40:24 | code | semmle.label | code |
+| promisification.js:43:24:43:27 | code | semmle.label | code |
+| promisification.js:49:11:49:14 | code | semmle.label | code |
+| promisification.js:49:18:49:25 | req.body | semmle.label | req.body |
+| promisification.js:52:21:52:24 | code | semmle.label | code |
+| promisification.js:55:15:55:18 | code | semmle.label | code |
+| promisification.js:61:9:61:11 | cmd | semmle.label | cmd |
+| promisification.js:61:15:61:22 | req.body | semmle.label | req.body |
+| promisification.js:65:21:65:23 | cmd | semmle.label | cmd |
+| promisification.js:69:20:69:22 | cmd | semmle.label | cmd |
+| promisification.js:74:26:74:28 | cmd | semmle.label | cmd |
+| promisification.js:77:24:77:26 | cmd | semmle.label | cmd |
+| promisification.js:78:28:78:30 | cmd | semmle.label | cmd |
+| promisification.js:79:25:79:27 | cmd | semmle.label | cmd |
+| promisification.js:81:34:81:37 | code | semmle.label | code |
+| promisification.js:83:36:83:39 | code | semmle.label | code |
+| promisification.js:89:12:89:14 | cmd | semmle.label | cmd |
+| promisification.js:99:11:99:14 | code | semmle.label | code |
+| promisification.js:99:18:99:25 | req.body | semmle.label | req.body |
+| promisification.js:100:23:100:26 | code | semmle.label | code |
+| promisification.js:101:27:101:30 | code | semmle.label | code |
+| promisification.js:102:27:102:30 | code | semmle.label | code |
+| promisification.js:106:24:106:27 | code | semmle.label | code |
+| promisification.js:109:24:109:27 | code | semmle.label | code |
+| promisification.js:114:11:114:14 | code | semmle.label | code |
+| promisification.js:114:18:114:25 | req.body | semmle.label | req.body |
+| promisification.js:116:32:116:34 | cmd | semmle.label | cmd |
+| promisification.js:117:16:119:10 | new Pro ...      }) [PromiseValue] | semmle.label | new Pro ...      }) [PromiseValue] |
+| promisification.js:117:29:117:35 | resolve [Return] [resolve-value] | semmle.label | resolve [Return] [resolve-value] |
+| promisification.js:118:13:118:19 | [post update] resolve [resolve-value] | semmle.label | [post update] resolve [resolve-value] |
+| promisification.js:118:21:118:23 | cmd | semmle.label | cmd |
+| promisification.js:122:11:122:20 | cmdPromise [PromiseValue] | semmle.label | cmdPromise [PromiseValue] |
+| promisification.js:122:24:122:46 | createE ... e(code) [PromiseValue] | semmle.label | createE ... e(code) [PromiseValue] |
+| promisification.js:122:42:122:45 | code | semmle.label | code |
+| promisification.js:123:5:123:27 | maybe(n ... romise) [PromiseValue] | semmle.label | maybe(n ... romise) [PromiseValue] |
+| promisification.js:123:17:123:26 | cmdPromise [PromiseValue] | semmle.label | cmdPromise [PromiseValue] |
+| promisification.js:123:34:123:36 | cmd | semmle.label | cmd |
+| promisification.js:124:17:124:19 | cmd | semmle.label | cmd |
+| promisification.js:130:11:130:14 | code | semmle.label | code |
+| promisification.js:130:18:130:25 | req.body | semmle.label | req.body |
+| promisification.js:133:21:133:24 | code | semmle.label | code |
+| promisification.js:136:15:136:18 | code | semmle.label | code |
+| promisification.js:141:11:141:14 | code | semmle.label | code |
+| promisification.js:141:18:141:25 | req.body | semmle.label | req.body |
+| promisification.js:144:21:144:24 | code | semmle.label | code |
+| promisification.js:147:15:147:18 | code | semmle.label | code |
+| promisification.js:150:24:150:27 | code | semmle.label | code |
+| promisification.js:151:28:151:31 | code | semmle.label | code |
+| promisification.js:152:25:152:28 | code | semmle.label | code |
 | third-party-command-injection.js:5:20:5:26 | command | semmle.label | command |
 | third-party-command-injection.js:6:21:6:27 | command | semmle.label | command |
 subpaths
+| promisification.js:116:32:116:34 | cmd | promisification.js:118:21:118:23 | cmd | promisification.js:117:29:117:35 | resolve [Return] [resolve-value] | promisification.js:117:16:119:10 | new Pro ...      }) [PromiseValue] |
+| promisification.js:122:42:122:45 | code | promisification.js:116:32:116:34 | cmd | promisification.js:117:16:119:10 | new Pro ...      }) [PromiseValue] | promisification.js:122:24:122:46 | createE ... e(code) [PromiseValue] |
diff --git a/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/command-line-libs.js b/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/command-line-libs.js
new file mode 100644
index 00000000000..83c824d4239
--- /dev/null
+++ b/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/command-line-libs.js
@@ -0,0 +1,50 @@
+import express from 'express';
+import { Command } from 'commander';
+import { exec } from 'child_process';
+import arg from 'arg';
+const app = express();
+app.use(express.json());
+
+app.post('/Command', async (req, res) => {
+  const args = req.body.args || []; // $ Source
+  const program = new Command();
+  program.option('--cmd <value>', 'Command to execute');
+  program.parse(args, { from: 'user' });
+  const options = program.opts();
+  exec(options.cmd); // $ Alert
+  exec(program.cmd); // $ Alert
+
+  const program1 = new Command();
+  program1
+    .command('run <script>')
+    .action((script) => {
+      exec(script); // $ Alert
+    });
+  await program1.parseAsync(args);
+});
+
+app.post('/arg', (req, res) => {
+    const argsArray = req.body.args || []; // $ Source
+    const parsed = arg({ '--cmd': String }, { argv: argsArray });
+    exec(parsed['--cmd']); // $ Alert
+});
+
+app.post('/commandLineArgs', (req, res) => {
+  const commandLineArgs = require('command-line-args');
+  const optionDefinitions = [{ name: 'cmd', type: String }];
+  const options = commandLineArgs(optionDefinitions, { argv: req.body.args || [] }); // $ Source
+  if (!options.cmd) return res.status(400).send({ error: 'Missing --cmd' });
+  exec(options.cmd); // $ Alert
+});
+
+app.post('/yargs', (req, res) => {
+  const yargs = require('yargs/yargs');
+  const args = req.body.args || []; // $ Source
+  const parsed = yargs(args).option('cmd', {
+    type: 'string',
+    describe: 'Command to execute',
+    demandOption: true
+  }).parse();
+
+  exec(parsed.cmd); // $ Alert
+});
diff --git a/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/promisification.js b/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/promisification.js
new file mode 100644
index 00000000000..b062c8b7ee2
--- /dev/null
+++ b/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/promisification.js
@@ -0,0 +1,153 @@
+const express = require('express');
+const bodyParser = require('body-parser');
+const cp = require('child_process');
+
+const app = express();
+app.use(bodyParser.json());
+
+function legacyEval(code) {
+    cp.exec(code.code); // $ Alert
+}
+
+app.post('/eval', async (req, res) => {
+    const { promisify } = require('util');
+    const evalAsync = promisify(legacyEval);
+    const code = req.body; // $ Source
+    evalAsync(code);
+});
+
+app.post('/eval', async (req, res) => {
+    const directPromisify = require('util.promisify');
+    const code = req.body; // $ Source
+
+    const promisifiedExec3 = directPromisify(cp.exec);
+    promisifiedExec3(code); // $ Alert
+});
+
+app.post('/eval', async (req, res) => {
+    const promisify2 = require('util.promisify-all');
+    const promisifiedCp = promisify2(cp);
+    const code = req.body; // $ Source
+    promisifiedCp.exec(code); // $ Alert
+});
+
+
+app.post('/eval', async (req, res) => {
+    var garPromisify = require("@gar/promisify");
+    const code = req.body; // $ Source
+
+    const promisifiedExec = garPromisify(cp.exec);
+    promisifiedExec(code); // $ Alert
+
+    const promisifiedCp = garPromisify(cp);
+    promisifiedCp.exec(code); // $ Alert
+});
+
+app.post('/eval', async (req, res) => {
+    require('util.promisify/shim')();
+    const util = require('util');
+    const code = req.body; // $ Source
+
+    const promisifiedExec = util.promisify(cp.exec);
+    promisifiedExec(code); // $ Alert
+
+    const execAsync = util.promisify(cp.exec.bind(cp));
+    execAsync(code); // $ Alert
+});
+
+
+app.post('/eval', async (req, res) => {
+    const es6Promisify = require("es6-promisify");
+    let cmd = req.body; // $ Source
+
+    // Test basic promisification
+    const promisifiedExec = es6Promisify(cp.exec);
+    promisifiedExec(cmd); // $ Alert
+
+    // Test with method binding
+    const execBoundAsync = es6Promisify(cp.exec.bind(cp));
+    execBoundAsync(cmd); // $ Alert
+
+    const promisifiedExecMulti = es6Promisify(cp.exec, {
+        multiArgs: true
+    });
+    promisifiedExecMulti(cmd); // $ Alert
+
+    const promisifiedCp = es6Promisify.promisifyAll(cp);
+    promisifiedCp.exec(cmd); // $ Alert
+    promisifiedCp.execFile(cmd); // $ Alert
+    promisifiedCp.spawn(cmd); // $ Alert
+
+    const lambda = es6Promisify((code, callback) => {
+        try {
+            const result = cp.exec(code); // $ Alert
+            callback(null, result);
+        } catch (err) {
+            callback(err);
+        }
+    });
+    lambda(cmd);
+});
+
+
+app.post('/eval', async (req, res) => {
+    var thenifyAll = require('thenify-all');
+    var cpThenifyAll = thenifyAll(require('child_process'), {}, [
+      'exec',
+      'execSync',
+    ]);
+    const code = req.body; // $ Source
+    cpThenifyAll.exec(code); // $ Alert
+    cpThenifyAll.execSync(code); // $ Alert
+    cpThenifyAll.execFile(code); // $ SPURIOUS: Alert - not promisified, as it is not listed in `thenifyAll`, but it should fine to flag it
+
+
+    var cpThenifyAll1 = thenifyAll.withCallback(require('child_process'), {}, ['exec']);
+    cpThenifyAll1.exec(code, function (err, string) {}); // $ Alert
+
+    var cpThenifyAll2 = thenifyAll(require('child_process'));
+    cpThenifyAll2.exec(code); // $ Alert
+});
+
+app.post('/eval', async (req, res) => {
+    const maybe = require('call-me-maybe');
+    const code = req.body; // $ Source
+    
+    function createExecPromise(cmd) {
+        return new Promise((resolve) => {
+            resolve(cmd);
+        });
+    }
+    
+    const cmdPromise = createExecPromise(code);
+    maybe(null, cmdPromise).then(cmd => {
+        cp.exec(cmd); // $ Alert
+    });
+});
+
+app.post('/eval', async (req, res) => {
+    const utilPromisify = require('util-promisify');
+    const code = req.body; // $ Source
+
+    const promisifiedExec = utilPromisify(cp.exec);
+    promisifiedExec(code); // $ Alert
+
+    const execAsync = utilPromisify(cp.exec.bind(cp));
+    execAsync(code); // $ Alert
+});
+
+app.post('/eval', async (req, res) => {
+    const {promisify, promisifyAll} = require('@google-cloud/promisify');
+    const code = req.body; // $ Source
+
+    const promisifiedExec = promisify(cp.exec);
+    promisifiedExec(code); // $ Alert
+
+    const execAsync = promisify(cp.exec.bind(cp));
+    execAsync(code); // $ Alert
+
+    const promisifiedCp = promisifyAll(cp);
+    promisifiedCp.exec(code); // $ Alert
+    promisifiedCp.execFile(code); // $ Alert
+    promisifiedCp.spawn(code); // $ Alert
+});
diff --git a/javascript/ql/test/query-tests/Security/CWE-078/IndirectCommandInjection/IndirectCommandInjection.expected b/javascript/ql/test/query-tests/Security/CWE-078/IndirectCommandInjection/IndirectCommandInjection.expected
index 9fc6f6b1bc4..ee906376953 100644
--- a/javascript/ql/test/query-tests/Security/CWE-078/IndirectCommandInjection/IndirectCommandInjection.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-078/IndirectCommandInjection/IndirectCommandInjection.expected
@@ -51,51 +51,51 @@ edges
 | actions.js:19:22:19:32 | shelljs.env | actions.js:19:10:19:37 | 'rm -rf ... nv.SOME | provenance |  |
 | actions.js:20:22:20:32 | shelljs.env | actions.js:20:10:20:32 | 'rm -rf ... ljs.env | provenance |  |
 | command-line-parameter-command-injection.js:8:22:8:33 | process.argv | command-line-parameter-command-injection.js:8:10:8:36 | "cmd.sh ... argv[2] | provenance |  |
-| command-line-parameter-command-injection.js:10:6:10:33 | args | command-line-parameter-command-injection.js:11:14:11:17 | args | provenance |  |
-| command-line-parameter-command-injection.js:10:6:10:33 | args | command-line-parameter-command-injection.js:12:26:12:29 | args | provenance |  |
-| command-line-parameter-command-injection.js:10:6:10:33 | args | command-line-parameter-command-injection.js:14:18:14:21 | args | provenance |  |
-| command-line-parameter-command-injection.js:10:6:10:33 | args [ArrayElement] | command-line-parameter-command-injection.js:11:14:11:17 | args [ArrayElement] | provenance |  |
-| command-line-parameter-command-injection.js:10:6:10:33 | args [ArrayElement] | command-line-parameter-command-injection.js:12:26:12:29 | args [ArrayElement] | provenance |  |
-| command-line-parameter-command-injection.js:10:6:10:33 | args [ArrayElement] | command-line-parameter-command-injection.js:14:18:14:21 | args [ArrayElement] | provenance |  |
+| command-line-parameter-command-injection.js:10:6:10:9 | args | command-line-parameter-command-injection.js:11:14:11:17 | args | provenance |  |
+| command-line-parameter-command-injection.js:10:6:10:9 | args | command-line-parameter-command-injection.js:12:26:12:29 | args | provenance |  |
+| command-line-parameter-command-injection.js:10:6:10:9 | args | command-line-parameter-command-injection.js:14:18:14:21 | args | provenance |  |
+| command-line-parameter-command-injection.js:10:6:10:9 | args [ArrayElement] | command-line-parameter-command-injection.js:11:14:11:17 | args [ArrayElement] | provenance |  |
+| command-line-parameter-command-injection.js:10:6:10:9 | args [ArrayElement] | command-line-parameter-command-injection.js:12:26:12:29 | args [ArrayElement] | provenance |  |
+| command-line-parameter-command-injection.js:10:6:10:9 | args [ArrayElement] | command-line-parameter-command-injection.js:14:18:14:21 | args [ArrayElement] | provenance |  |
 | command-line-parameter-command-injection.js:10:13:10:24 | process.argv | command-line-parameter-command-injection.js:10:13:10:33 | process ... lice(2) | provenance |  |
 | command-line-parameter-command-injection.js:10:13:10:24 | process.argv | command-line-parameter-command-injection.js:10:13:10:33 | process ... lice(2) [ArrayElement] | provenance |  |
-| command-line-parameter-command-injection.js:10:13:10:33 | process ... lice(2) | command-line-parameter-command-injection.js:10:6:10:33 | args | provenance |  |
-| command-line-parameter-command-injection.js:10:13:10:33 | process ... lice(2) [ArrayElement] | command-line-parameter-command-injection.js:10:6:10:33 | args [ArrayElement] | provenance |  |
+| command-line-parameter-command-injection.js:10:13:10:33 | process ... lice(2) | command-line-parameter-command-injection.js:10:6:10:9 | args | provenance |  |
+| command-line-parameter-command-injection.js:10:13:10:33 | process ... lice(2) [ArrayElement] | command-line-parameter-command-injection.js:10:6:10:9 | args [ArrayElement] | provenance |  |
 | command-line-parameter-command-injection.js:11:14:11:17 | args | command-line-parameter-command-injection.js:11:14:11:20 | args[0] | provenance |  |
 | command-line-parameter-command-injection.js:11:14:11:17 | args [ArrayElement] | command-line-parameter-command-injection.js:11:14:11:20 | args[0] | provenance |  |
 | command-line-parameter-command-injection.js:12:26:12:29 | args | command-line-parameter-command-injection.js:12:14:12:32 | "cmd.sh " + args[0] | provenance |  |
 | command-line-parameter-command-injection.js:12:26:12:29 | args [ArrayElement] | command-line-parameter-command-injection.js:12:26:12:32 | args[0] | provenance |  |
 | command-line-parameter-command-injection.js:12:26:12:32 | args[0] | command-line-parameter-command-injection.js:12:14:12:32 | "cmd.sh " + args[0] | provenance |  |
-| command-line-parameter-command-injection.js:14:6:14:30 | fewerArgs | command-line-parameter-command-injection.js:15:14:15:22 | fewerArgs | provenance |  |
-| command-line-parameter-command-injection.js:14:6:14:30 | fewerArgs | command-line-parameter-command-injection.js:16:26:16:34 | fewerArgs | provenance |  |
-| command-line-parameter-command-injection.js:14:6:14:30 | fewerArgs | command-line-parameter-command-injection.js:18:13:18:21 | fewerArgs | provenance |  |
-| command-line-parameter-command-injection.js:14:6:14:30 | fewerArgs [ArrayElement] | command-line-parameter-command-injection.js:15:14:15:22 | fewerArgs [ArrayElement] | provenance |  |
-| command-line-parameter-command-injection.js:14:6:14:30 | fewerArgs [ArrayElement] | command-line-parameter-command-injection.js:16:26:16:34 | fewerArgs [ArrayElement] | provenance |  |
-| command-line-parameter-command-injection.js:14:6:14:30 | fewerArgs [ArrayElement] | command-line-parameter-command-injection.js:18:13:18:21 | fewerArgs [ArrayElement] | provenance |  |
+| command-line-parameter-command-injection.js:14:6:14:14 | fewerArgs | command-line-parameter-command-injection.js:15:14:15:22 | fewerArgs | provenance |  |
+| command-line-parameter-command-injection.js:14:6:14:14 | fewerArgs | command-line-parameter-command-injection.js:16:26:16:34 | fewerArgs | provenance |  |
+| command-line-parameter-command-injection.js:14:6:14:14 | fewerArgs | command-line-parameter-command-injection.js:18:13:18:21 | fewerArgs | provenance |  |
+| command-line-parameter-command-injection.js:14:6:14:14 | fewerArgs [ArrayElement] | command-line-parameter-command-injection.js:15:14:15:22 | fewerArgs [ArrayElement] | provenance |  |
+| command-line-parameter-command-injection.js:14:6:14:14 | fewerArgs [ArrayElement] | command-line-parameter-command-injection.js:16:26:16:34 | fewerArgs [ArrayElement] | provenance |  |
+| command-line-parameter-command-injection.js:14:6:14:14 | fewerArgs [ArrayElement] | command-line-parameter-command-injection.js:18:13:18:21 | fewerArgs [ArrayElement] | provenance |  |
 | command-line-parameter-command-injection.js:14:18:14:21 | args | command-line-parameter-command-injection.js:14:18:14:30 | args.slice(1) | provenance |  |
 | command-line-parameter-command-injection.js:14:18:14:21 | args | command-line-parameter-command-injection.js:14:18:14:30 | args.slice(1) [ArrayElement] | provenance |  |
 | command-line-parameter-command-injection.js:14:18:14:21 | args [ArrayElement] | command-line-parameter-command-injection.js:14:18:14:30 | args.slice(1) [ArrayElement] | provenance |  |
-| command-line-parameter-command-injection.js:14:18:14:30 | args.slice(1) | command-line-parameter-command-injection.js:14:6:14:30 | fewerArgs | provenance |  |
-| command-line-parameter-command-injection.js:14:18:14:30 | args.slice(1) [ArrayElement] | command-line-parameter-command-injection.js:14:6:14:30 | fewerArgs [ArrayElement] | provenance |  |
+| command-line-parameter-command-injection.js:14:18:14:30 | args.slice(1) | command-line-parameter-command-injection.js:14:6:14:14 | fewerArgs | provenance |  |
+| command-line-parameter-command-injection.js:14:18:14:30 | args.slice(1) [ArrayElement] | command-line-parameter-command-injection.js:14:6:14:14 | fewerArgs [ArrayElement] | provenance |  |
 | command-line-parameter-command-injection.js:15:14:15:22 | fewerArgs | command-line-parameter-command-injection.js:15:14:15:25 | fewerArgs[0] | provenance |  |
 | command-line-parameter-command-injection.js:15:14:15:22 | fewerArgs [ArrayElement] | command-line-parameter-command-injection.js:15:14:15:25 | fewerArgs[0] | provenance |  |
 | command-line-parameter-command-injection.js:16:26:16:34 | fewerArgs | command-line-parameter-command-injection.js:16:14:16:37 | "cmd.sh ... Args[0] | provenance |  |
 | command-line-parameter-command-injection.js:16:26:16:34 | fewerArgs [ArrayElement] | command-line-parameter-command-injection.js:16:26:16:37 | fewerArgs[0] | provenance |  |
 | command-line-parameter-command-injection.js:16:26:16:37 | fewerArgs[0] | command-line-parameter-command-injection.js:16:14:16:37 | "cmd.sh ... Args[0] | provenance |  |
-| command-line-parameter-command-injection.js:18:6:18:24 | arg0 | command-line-parameter-command-injection.js:19:14:19:17 | arg0 | provenance |  |
-| command-line-parameter-command-injection.js:18:6:18:24 | arg0 | command-line-parameter-command-injection.js:20:26:20:29 | arg0 | provenance |  |
-| command-line-parameter-command-injection.js:18:13:18:21 | fewerArgs | command-line-parameter-command-injection.js:18:6:18:24 | arg0 | provenance |  |
+| command-line-parameter-command-injection.js:18:6:18:9 | arg0 | command-line-parameter-command-injection.js:19:14:19:17 | arg0 | provenance |  |
+| command-line-parameter-command-injection.js:18:6:18:9 | arg0 | command-line-parameter-command-injection.js:20:26:20:29 | arg0 | provenance |  |
+| command-line-parameter-command-injection.js:18:13:18:21 | fewerArgs | command-line-parameter-command-injection.js:18:6:18:9 | arg0 | provenance |  |
 | command-line-parameter-command-injection.js:18:13:18:21 | fewerArgs [ArrayElement] | command-line-parameter-command-injection.js:18:13:18:24 | fewerArgs[0] | provenance |  |
-| command-line-parameter-command-injection.js:18:13:18:24 | fewerArgs[0] | command-line-parameter-command-injection.js:18:6:18:24 | arg0 | provenance |  |
+| command-line-parameter-command-injection.js:18:13:18:24 | fewerArgs[0] | command-line-parameter-command-injection.js:18:6:18:9 | arg0 | provenance |  |
 | command-line-parameter-command-injection.js:20:26:20:29 | arg0 | command-line-parameter-command-injection.js:20:14:20:29 | "cmd.sh " + arg0 | provenance |  |
-| command-line-parameter-command-injection.js:24:8:24:35 | args | command-line-parameter-command-injection.js:26:32:26:35 | args | provenance |  |
-| command-line-parameter-command-injection.js:24:8:24:35 | args | command-line-parameter-command-injection.js:27:32:27:35 | args | provenance |  |
-| command-line-parameter-command-injection.js:24:8:24:35 | args [ArrayElement] | command-line-parameter-command-injection.js:26:32:26:35 | args [ArrayElement] | provenance |  |
-| command-line-parameter-command-injection.js:24:8:24:35 | args [ArrayElement] | command-line-parameter-command-injection.js:27:32:27:35 | args [ArrayElement] | provenance |  |
+| command-line-parameter-command-injection.js:24:8:24:11 | args | command-line-parameter-command-injection.js:26:32:26:35 | args | provenance |  |
+| command-line-parameter-command-injection.js:24:8:24:11 | args | command-line-parameter-command-injection.js:27:32:27:35 | args | provenance |  |
+| command-line-parameter-command-injection.js:24:8:24:11 | args [ArrayElement] | command-line-parameter-command-injection.js:26:32:26:35 | args [ArrayElement] | provenance |  |
+| command-line-parameter-command-injection.js:24:8:24:11 | args [ArrayElement] | command-line-parameter-command-injection.js:27:32:27:35 | args [ArrayElement] | provenance |  |
 | command-line-parameter-command-injection.js:24:15:24:26 | process.argv | command-line-parameter-command-injection.js:24:15:24:35 | process ... lice(2) | provenance |  |
 | command-line-parameter-command-injection.js:24:15:24:26 | process.argv | command-line-parameter-command-injection.js:24:15:24:35 | process ... lice(2) [ArrayElement] | provenance |  |
-| command-line-parameter-command-injection.js:24:15:24:35 | process ... lice(2) | command-line-parameter-command-injection.js:24:8:24:35 | args | provenance |  |
-| command-line-parameter-command-injection.js:24:15:24:35 | process ... lice(2) [ArrayElement] | command-line-parameter-command-injection.js:24:8:24:35 | args [ArrayElement] | provenance |  |
+| command-line-parameter-command-injection.js:24:15:24:35 | process ... lice(2) | command-line-parameter-command-injection.js:24:8:24:11 | args | provenance |  |
+| command-line-parameter-command-injection.js:24:15:24:35 | process ... lice(2) [ArrayElement] | command-line-parameter-command-injection.js:24:8:24:11 | args [ArrayElement] | provenance |  |
 | command-line-parameter-command-injection.js:26:32:26:35 | args | command-line-parameter-command-injection.js:26:14:26:50 | `node $ ... ption"` | provenance |  |
 | command-line-parameter-command-injection.js:26:32:26:35 | args [ArrayElement] | command-line-parameter-command-injection.js:26:32:26:38 | args[0] | provenance |  |
 | command-line-parameter-command-injection.js:26:32:26:38 | args[0] | command-line-parameter-command-injection.js:26:14:26:50 | `node $ ... ption"` | provenance |  |
@@ -105,43 +105,43 @@ edges
 | command-line-parameter-command-injection.js:30:21:30:46 | require ... rgs")() | command-line-parameter-command-injection.js:30:9:30:50 | "cmd.sh ... )().foo | provenance |  |
 | command-line-parameter-command-injection.js:32:21:32:41 | require ... ").argv | command-line-parameter-command-injection.js:32:9:32:45 | "cmd.sh ... rgv.foo | provenance |  |
 | command-line-parameter-command-injection.js:33:21:33:44 | require ... ").argv | command-line-parameter-command-injection.js:33:9:33:48 | "cmd.sh ... rgv.foo | provenance |  |
-| command-line-parameter-command-injection.js:36:6:39:7 | args | command-line-parameter-command-injection.js:41:22:41:25 | args | provenance |  |
-| command-line-parameter-command-injection.js:36:13:39:7 | require ... \\t\\t.argv | command-line-parameter-command-injection.js:36:6:39:7 | args | provenance |  |
+| command-line-parameter-command-injection.js:36:6:36:9 | args | command-line-parameter-command-injection.js:41:22:41:25 | args | provenance |  |
+| command-line-parameter-command-injection.js:36:13:39:7 | require ... \\t\\t.argv | command-line-parameter-command-injection.js:36:6:36:9 | args | provenance |  |
 | command-line-parameter-command-injection.js:41:22:41:25 | args | command-line-parameter-command-injection.js:41:10:41:25 | "cmd.sh " + args | provenance |  |
 | command-line-parameter-command-injection.js:43:22:43:58 | require ... parse() | command-line-parameter-command-injection.js:43:10:43:62 | "cmd.sh ... e().foo | provenance |  |
-| command-line-parameter-command-injection.js:47:8:53:12 | args | command-line-parameter-command-injection.js:55:22:55:25 | args | provenance |  |
 | command-line-parameter-command-injection.js:48:3:50:3 | argv: { ... rgs\\n\\t\\t} | command-line-parameter-command-injection.js:48:9:50:3 | {\\n\\t\\t\\t...args\\n\\t\\t} | provenance |  |
-| command-line-parameter-command-injection.js:48:9:50:3 | {\\n\\t\\t\\t...args\\n\\t\\t} | command-line-parameter-command-injection.js:47:8:53:12 | args | provenance |  |
+| command-line-parameter-command-injection.js:48:9:50:3 | {\\n\\t\\t\\t...args\\n\\t\\t} | command-line-parameter-command-injection.js:49:7:49:10 | args | provenance |  |
+| command-line-parameter-command-injection.js:49:7:49:10 | args | command-line-parameter-command-injection.js:55:22:55:25 | args | provenance |  |
 | command-line-parameter-command-injection.js:55:22:55:25 | args | command-line-parameter-command-injection.js:55:10:55:25 | "cmd.sh " + args | provenance |  |
-| command-line-parameter-command-injection.js:57:6:57:37 | tainted1 | command-line-parameter-command-injection.js:61:11:61:18 | tainted1 | provenance |  |
-| command-line-parameter-command-injection.js:57:17:57:37 | require ... ').argv | command-line-parameter-command-injection.js:57:6:57:37 | tainted1 | provenance |  |
-| command-line-parameter-command-injection.js:58:6:58:40 | tainted2 | command-line-parameter-command-injection.js:62:11:62:18 | tainted2 | provenance |  |
-| command-line-parameter-command-injection.js:58:17:58:40 | require ... parse() | command-line-parameter-command-injection.js:58:6:58:40 | tainted2 | provenance |  |
+| command-line-parameter-command-injection.js:57:6:57:13 | tainted1 | command-line-parameter-command-injection.js:61:11:61:18 | tainted1 | provenance |  |
+| command-line-parameter-command-injection.js:57:17:57:37 | require ... ').argv | command-line-parameter-command-injection.js:57:6:57:13 | tainted1 | provenance |  |
+| command-line-parameter-command-injection.js:58:6:58:13 | tainted2 | command-line-parameter-command-injection.js:62:11:62:18 | tainted2 | provenance |  |
+| command-line-parameter-command-injection.js:58:17:58:40 | require ... parse() | command-line-parameter-command-injection.js:58:6:58:13 | tainted2 | provenance |  |
 | command-line-parameter-command-injection.js:60:8:60:56 | {taint1 ... 2rest}} [taint1] | command-line-parameter-command-injection.js:60:9:60:31 | taint1: ... t1rest} | provenance |  |
 | command-line-parameter-command-injection.js:60:8:60:56 | {taint1 ... 2rest}} [taint2] | command-line-parameter-command-injection.js:60:33:60:55 | taint2: ... t2rest} | provenance |  |
-| command-line-parameter-command-injection.js:60:8:63:2 | taint1rest | command-line-parameter-command-injection.js:65:22:65:31 | taint1rest | provenance |  |
-| command-line-parameter-command-injection.js:60:8:63:2 | taint2rest | command-line-parameter-command-injection.js:66:22:66:31 | taint2rest | provenance |  |
 | command-line-parameter-command-injection.js:60:9:60:31 | taint1: ... t1rest} | command-line-parameter-command-injection.js:60:17:60:31 | {...taint1rest} | provenance |  |
-| command-line-parameter-command-injection.js:60:17:60:31 | {...taint1rest} | command-line-parameter-command-injection.js:60:8:63:2 | taint1rest | provenance |  |
+| command-line-parameter-command-injection.js:60:17:60:31 | {...taint1rest} | command-line-parameter-command-injection.js:60:21:60:30 | taint1rest | provenance |  |
+| command-line-parameter-command-injection.js:60:21:60:30 | taint1rest | command-line-parameter-command-injection.js:65:22:65:31 | taint1rest | provenance |  |
 | command-line-parameter-command-injection.js:60:33:60:55 | taint2: ... t2rest} | command-line-parameter-command-injection.js:60:41:60:55 | {...taint2rest} | provenance |  |
-| command-line-parameter-command-injection.js:60:41:60:55 | {...taint2rest} | command-line-parameter-command-injection.js:60:8:63:2 | taint2rest | provenance |  |
+| command-line-parameter-command-injection.js:60:41:60:55 | {...taint2rest} | command-line-parameter-command-injection.js:60:45:60:54 | taint2rest | provenance |  |
+| command-line-parameter-command-injection.js:60:45:60:54 | taint2rest | command-line-parameter-command-injection.js:66:22:66:31 | taint2rest | provenance |  |
 | command-line-parameter-command-injection.js:60:60:63:2 | {\\n\\t\\ttai ... ted2\\n\\t} [taint1] | command-line-parameter-command-injection.js:60:8:60:56 | {taint1 ... 2rest}} [taint1] | provenance |  |
 | command-line-parameter-command-injection.js:60:60:63:2 | {\\n\\t\\ttai ... ted2\\n\\t} [taint2] | command-line-parameter-command-injection.js:60:8:60:56 | {taint1 ... 2rest}} [taint2] | provenance |  |
 | command-line-parameter-command-injection.js:61:11:61:18 | tainted1 | command-line-parameter-command-injection.js:60:60:63:2 | {\\n\\t\\ttai ... ted2\\n\\t} [taint1] | provenance |  |
 | command-line-parameter-command-injection.js:62:11:62:18 | tainted2 | command-line-parameter-command-injection.js:60:60:63:2 | {\\n\\t\\ttai ... ted2\\n\\t} [taint2] | provenance |  |
 | command-line-parameter-command-injection.js:65:22:65:31 | taint1rest | command-line-parameter-command-injection.js:65:10:65:31 | "cmd.sh ... nt1rest | provenance |  |
 | command-line-parameter-command-injection.js:66:22:66:31 | taint2rest | command-line-parameter-command-injection.js:66:10:66:31 | "cmd.sh ... nt2rest | provenance |  |
-| command-line-parameter-command-injection.js:68:6:68:16 | {...taint3} | command-line-parameter-command-injection.js:68:6:68:40 | taint3 | provenance |  |
-| command-line-parameter-command-injection.js:68:6:68:40 | taint3 | command-line-parameter-command-injection.js:69:22:69:27 | taint3 | provenance |  |
+| command-line-parameter-command-injection.js:68:6:68:16 | {...taint3} | command-line-parameter-command-injection.js:68:10:68:15 | taint3 | provenance |  |
+| command-line-parameter-command-injection.js:68:10:68:15 | taint3 | command-line-parameter-command-injection.js:69:22:69:27 | taint3 | provenance |  |
 | command-line-parameter-command-injection.js:68:20:68:40 | require ... ').argv | command-line-parameter-command-injection.js:68:6:68:16 | {...taint3} | provenance |  |
 | command-line-parameter-command-injection.js:69:22:69:27 | taint3 | command-line-parameter-command-injection.js:69:10:69:27 | "cmd.sh " + taint3 | provenance |  |
-| command-line-parameter-command-injection.js:71:6:71:16 | [...taint4] | command-line-parameter-command-injection.js:71:6:71:40 | taint4 | provenance |  |
-| command-line-parameter-command-injection.js:71:6:71:40 | taint4 | command-line-parameter-command-injection.js:72:22:72:27 | taint4 | provenance |  |
+| command-line-parameter-command-injection.js:71:6:71:16 | [...taint4] | command-line-parameter-command-injection.js:71:10:71:15 | taint4 | provenance |  |
+| command-line-parameter-command-injection.js:71:10:71:15 | taint4 | command-line-parameter-command-injection.js:72:22:72:27 | taint4 | provenance |  |
 | command-line-parameter-command-injection.js:71:20:71:40 | require ... ').argv | command-line-parameter-command-injection.js:71:6:71:16 | [...taint4] | provenance |  |
 | command-line-parameter-command-injection.js:72:22:72:27 | taint4 | command-line-parameter-command-injection.js:72:10:72:27 | "cmd.sh " + taint4 | provenance |  |
-| command-line-parameter-command-injection.js:76:8:76:35 | argv | command-line-parameter-command-injection.js:79:31:79:34 | argv | provenance |  |
+| command-line-parameter-command-injection.js:76:8:76:11 | argv | command-line-parameter-command-injection.js:79:31:79:34 | argv | provenance |  |
 | command-line-parameter-command-injection.js:76:15:76:26 | process.argv | command-line-parameter-command-injection.js:76:15:76:35 | process ... lice(2) | provenance |  |
-| command-line-parameter-command-injection.js:76:15:76:35 | process ... lice(2) | command-line-parameter-command-injection.js:76:8:76:35 | argv | provenance |  |
+| command-line-parameter-command-injection.js:76:15:76:35 | process ... lice(2) | command-line-parameter-command-injection.js:76:8:76:11 | argv | provenance |  |
 | command-line-parameter-command-injection.js:79:22:79:35 | minimist(argv) | command-line-parameter-command-injection.js:79:10:79:39 | "cmd.sh ... gv).foo | provenance |  |
 | command-line-parameter-command-injection.js:79:31:79:34 | argv | command-line-parameter-command-injection.js:79:22:79:35 | minimist(argv) | provenance |  |
 | command-line-parameter-command-injection.js:82:22:82:50 | subarg( ... ice(2)) | command-line-parameter-command-injection.js:82:10:82:54 | "cmd.sh ... 2)).foo | provenance |  |
@@ -150,28 +150,28 @@ edges
 | command-line-parameter-command-injection.js:85:22:85:55 | yargsPa ... ice(2)) | command-line-parameter-command-injection.js:85:10:85:59 | "cmd.sh ... 2)).foo | provenance |  |
 | command-line-parameter-command-injection.js:85:34:85:45 | process.argv | command-line-parameter-command-injection.js:85:34:85:54 | process ... lice(2) | provenance |  |
 | command-line-parameter-command-injection.js:85:34:85:54 | process ... lice(2) | command-line-parameter-command-injection.js:85:22:85:55 | yargsPa ... ice(2)) | provenance |  |
-| command-line-parameter-command-injection.js:88:6:88:37 | flags | command-line-parameter-command-injection.js:89:22:89:26 | flags | provenance |  |
-| command-line-parameter-command-injection.js:88:14:88:37 | args.pa ... s.argv) | command-line-parameter-command-injection.js:88:6:88:37 | flags | provenance |  |
+| command-line-parameter-command-injection.js:88:6:88:10 | flags | command-line-parameter-command-injection.js:89:22:89:26 | flags | provenance |  |
+| command-line-parameter-command-injection.js:88:14:88:37 | args.pa ... s.argv) | command-line-parameter-command-injection.js:88:6:88:10 | flags | provenance |  |
 | command-line-parameter-command-injection.js:88:25:88:36 | process.argv | command-line-parameter-command-injection.js:88:14:88:37 | args.pa ... s.argv) | provenance |  |
 | command-line-parameter-command-injection.js:89:22:89:26 | flags | command-line-parameter-command-injection.js:89:10:89:30 | "cmd.sh ... ags.foo | provenance |  |
-| command-line-parameter-command-injection.js:91:6:91:38 | flags | command-line-parameter-command-injection.js:92:22:92:26 | flags | provenance |  |
-| command-line-parameter-command-injection.js:91:14:91:38 | require ... .spec}) | command-line-parameter-command-injection.js:91:6:91:38 | flags | provenance |  |
+| command-line-parameter-command-injection.js:91:6:91:10 | flags | command-line-parameter-command-injection.js:92:22:92:26 | flags | provenance |  |
+| command-line-parameter-command-injection.js:91:14:91:38 | require ... .spec}) | command-line-parameter-command-injection.js:91:6:91:10 | flags | provenance |  |
 | command-line-parameter-command-injection.js:92:22:92:26 | flags | command-line-parameter-command-injection.js:92:10:92:30 | "cmd.sh ... ags.foo | provenance |  |
 | command-line-parameter-command-injection.js:102:22:102:40 | parser.parse_args() | command-line-parameter-command-injection.js:102:10:102:44 | "cmd.sh ... s().foo | provenance |  |
-| command-line-parameter-command-injection.js:107:8:107:51 | options | command-line-parameter-command-injection.js:108:22:108:28 | options | provenance |  |
-| command-line-parameter-command-injection.js:107:18:107:51 | command ... itions) | command-line-parameter-command-injection.js:107:8:107:51 | options | provenance |  |
+| command-line-parameter-command-injection.js:107:8:107:14 | options | command-line-parameter-command-injection.js:108:22:108:28 | options | provenance |  |
+| command-line-parameter-command-injection.js:107:18:107:51 | command ... itions) | command-line-parameter-command-injection.js:107:8:107:14 | options | provenance |  |
 | command-line-parameter-command-injection.js:108:22:108:28 | options | command-line-parameter-command-injection.js:108:10:108:32 | "cmd.sh ... ons.foo | provenance |  |
-| command-line-parameter-command-injection.js:114:8:114:52 | cli | command-line-parameter-command-injection.js:116:22:116:24 | cli | provenance |  |
-| command-line-parameter-command-injection.js:114:14:114:52 | meow(`h ... lags}}) | command-line-parameter-command-injection.js:114:8:114:52 | cli | provenance |  |
+| command-line-parameter-command-injection.js:114:8:114:10 | cli | command-line-parameter-command-injection.js:116:22:116:24 | cli | provenance |  |
+| command-line-parameter-command-injection.js:114:14:114:52 | meow(`h ... lags}}) | command-line-parameter-command-injection.js:114:8:114:10 | cli | provenance |  |
 | command-line-parameter-command-injection.js:116:22:116:24 | cli | command-line-parameter-command-injection.js:116:10:116:33 | "cmd.sh ... nput[0] | provenance |  |
-| command-line-parameter-command-injection.js:122:6:122:46 | opts | command-line-parameter-command-injection.js:124:22:124:25 | opts | provenance |  |
-| command-line-parameter-command-injection.js:122:13:122:46 | dashdas ... tions}) | command-line-parameter-command-injection.js:122:6:122:46 | opts | provenance |  |
+| command-line-parameter-command-injection.js:122:6:122:9 | opts | command-line-parameter-command-injection.js:124:22:124:25 | opts | provenance |  |
+| command-line-parameter-command-injection.js:122:13:122:46 | dashdas ... tions}) | command-line-parameter-command-injection.js:122:6:122:9 | opts | provenance |  |
 | command-line-parameter-command-injection.js:124:22:124:25 | opts | command-line-parameter-command-injection.js:124:10:124:29 | "cmd.sh " + opts.foo | provenance |  |
-| command-line-parameter-command-injection.js:127:6:127:26 | opts | command-line-parameter-command-injection.js:129:22:129:25 | opts | provenance |  |
-| command-line-parameter-command-injection.js:127:13:127:26 | parser.parse() | command-line-parameter-command-injection.js:127:6:127:26 | opts | provenance |  |
+| command-line-parameter-command-injection.js:127:6:127:9 | opts | command-line-parameter-command-injection.js:129:22:129:25 | opts | provenance |  |
+| command-line-parameter-command-injection.js:127:13:127:26 | parser.parse() | command-line-parameter-command-injection.js:127:6:127:9 | opts | provenance |  |
 | command-line-parameter-command-injection.js:129:22:129:25 | opts | command-line-parameter-command-injection.js:129:10:129:29 | "cmd.sh " + opts.foo | provenance |  |
-| command-line-parameter-command-injection.js:133:8:133:41 | program | command-line-parameter-command-injection.js:137:22:137:28 | program | provenance |  |
-| command-line-parameter-command-injection.js:133:10:133:16 | program | command-line-parameter-command-injection.js:133:8:133:41 | program | provenance |  |
+| command-line-parameter-command-injection.js:133:10:133:16 | program | command-line-parameter-command-injection.js:133:10:133:16 | program | provenance |  |
+| command-line-parameter-command-injection.js:133:10:133:16 | program | command-line-parameter-command-injection.js:137:22:137:28 | program | provenance |  |
 | command-line-parameter-command-injection.js:136:22:136:35 | program.opts() | command-line-parameter-command-injection.js:136:10:136:45 | "cmd.sh ... zzaType | provenance |  |
 | command-line-parameter-command-injection.js:136:22:136:45 | program ... zzaType | command-line-parameter-command-injection.js:136:10:136:45 | "cmd.sh ... zzaType | provenance |  |
 | command-line-parameter-command-injection.js:137:22:137:28 | program | command-line-parameter-command-injection.js:137:10:137:38 | "cmd.sh ... zzaType | provenance |  |
@@ -196,8 +196,8 @@ nodes
 | command-line-parameter-command-injection.js:4:10:4:21 | process.argv | semmle.label | process.argv |
 | command-line-parameter-command-injection.js:8:10:8:36 | "cmd.sh ... argv[2] | semmle.label | "cmd.sh ... argv[2] |
 | command-line-parameter-command-injection.js:8:22:8:33 | process.argv | semmle.label | process.argv |
-| command-line-parameter-command-injection.js:10:6:10:33 | args | semmle.label | args |
-| command-line-parameter-command-injection.js:10:6:10:33 | args [ArrayElement] | semmle.label | args [ArrayElement] |
+| command-line-parameter-command-injection.js:10:6:10:9 | args | semmle.label | args |
+| command-line-parameter-command-injection.js:10:6:10:9 | args [ArrayElement] | semmle.label | args [ArrayElement] |
 | command-line-parameter-command-injection.js:10:13:10:24 | process.argv | semmle.label | process.argv |
 | command-line-parameter-command-injection.js:10:13:10:33 | process ... lice(2) | semmle.label | process ... lice(2) |
 | command-line-parameter-command-injection.js:10:13:10:33 | process ... lice(2) [ArrayElement] | semmle.label | process ... lice(2) [ArrayElement] |
@@ -208,8 +208,8 @@ nodes
 | command-line-parameter-command-injection.js:12:26:12:29 | args | semmle.label | args |
 | command-line-parameter-command-injection.js:12:26:12:29 | args [ArrayElement] | semmle.label | args [ArrayElement] |
 | command-line-parameter-command-injection.js:12:26:12:32 | args[0] | semmle.label | args[0] |
-| command-line-parameter-command-injection.js:14:6:14:30 | fewerArgs | semmle.label | fewerArgs |
-| command-line-parameter-command-injection.js:14:6:14:30 | fewerArgs [ArrayElement] | semmle.label | fewerArgs [ArrayElement] |
+| command-line-parameter-command-injection.js:14:6:14:14 | fewerArgs | semmle.label | fewerArgs |
+| command-line-parameter-command-injection.js:14:6:14:14 | fewerArgs [ArrayElement] | semmle.label | fewerArgs [ArrayElement] |
 | command-line-parameter-command-injection.js:14:18:14:21 | args | semmle.label | args |
 | command-line-parameter-command-injection.js:14:18:14:21 | args [ArrayElement] | semmle.label | args [ArrayElement] |
 | command-line-parameter-command-injection.js:14:18:14:30 | args.slice(1) | semmle.label | args.slice(1) |
@@ -221,15 +221,15 @@ nodes
 | command-line-parameter-command-injection.js:16:26:16:34 | fewerArgs | semmle.label | fewerArgs |
 | command-line-parameter-command-injection.js:16:26:16:34 | fewerArgs [ArrayElement] | semmle.label | fewerArgs [ArrayElement] |
 | command-line-parameter-command-injection.js:16:26:16:37 | fewerArgs[0] | semmle.label | fewerArgs[0] |
-| command-line-parameter-command-injection.js:18:6:18:24 | arg0 | semmle.label | arg0 |
+| command-line-parameter-command-injection.js:18:6:18:9 | arg0 | semmle.label | arg0 |
 | command-line-parameter-command-injection.js:18:13:18:21 | fewerArgs | semmle.label | fewerArgs |
 | command-line-parameter-command-injection.js:18:13:18:21 | fewerArgs [ArrayElement] | semmle.label | fewerArgs [ArrayElement] |
 | command-line-parameter-command-injection.js:18:13:18:24 | fewerArgs[0] | semmle.label | fewerArgs[0] |
 | command-line-parameter-command-injection.js:19:14:19:17 | arg0 | semmle.label | arg0 |
 | command-line-parameter-command-injection.js:20:14:20:29 | "cmd.sh " + arg0 | semmle.label | "cmd.sh " + arg0 |
 | command-line-parameter-command-injection.js:20:26:20:29 | arg0 | semmle.label | arg0 |
-| command-line-parameter-command-injection.js:24:8:24:35 | args | semmle.label | args |
-| command-line-parameter-command-injection.js:24:8:24:35 | args [ArrayElement] | semmle.label | args [ArrayElement] |
+| command-line-parameter-command-injection.js:24:8:24:11 | args | semmle.label | args |
+| command-line-parameter-command-injection.js:24:8:24:11 | args [ArrayElement] | semmle.label | args [ArrayElement] |
 | command-line-parameter-command-injection.js:24:15:24:26 | process.argv | semmle.label | process.argv |
 | command-line-parameter-command-injection.js:24:15:24:35 | process ... lice(2) | semmle.label | process ... lice(2) |
 | command-line-parameter-command-injection.js:24:15:24:35 | process ... lice(2) [ArrayElement] | semmle.label | process ... lice(2) [ArrayElement] |
@@ -247,29 +247,29 @@ nodes
 | command-line-parameter-command-injection.js:32:21:32:41 | require ... ").argv | semmle.label | require ... ").argv |
 | command-line-parameter-command-injection.js:33:9:33:48 | "cmd.sh ... rgv.foo | semmle.label | "cmd.sh ... rgv.foo |
 | command-line-parameter-command-injection.js:33:21:33:44 | require ... ").argv | semmle.label | require ... ").argv |
-| command-line-parameter-command-injection.js:36:6:39:7 | args | semmle.label | args |
+| command-line-parameter-command-injection.js:36:6:36:9 | args | semmle.label | args |
 | command-line-parameter-command-injection.js:36:13:39:7 | require ... \\t\\t.argv | semmle.label | require ... \\t\\t.argv |
 | command-line-parameter-command-injection.js:41:10:41:25 | "cmd.sh " + args | semmle.label | "cmd.sh " + args |
 | command-line-parameter-command-injection.js:41:22:41:25 | args | semmle.label | args |
 | command-line-parameter-command-injection.js:43:10:43:62 | "cmd.sh ... e().foo | semmle.label | "cmd.sh ... e().foo |
 | command-line-parameter-command-injection.js:43:22:43:58 | require ... parse() | semmle.label | require ... parse() |
-| command-line-parameter-command-injection.js:47:8:53:12 | args | semmle.label | args |
 | command-line-parameter-command-injection.js:48:3:50:3 | argv: { ... rgs\\n\\t\\t} | semmle.label | argv: { ... rgs\\n\\t\\t} |
 | command-line-parameter-command-injection.js:48:9:50:3 | {\\n\\t\\t\\t...args\\n\\t\\t} | semmle.label | {\\n\\t\\t\\t...args\\n\\t\\t} |
+| command-line-parameter-command-injection.js:49:7:49:10 | args | semmle.label | args |
 | command-line-parameter-command-injection.js:55:10:55:25 | "cmd.sh " + args | semmle.label | "cmd.sh " + args |
 | command-line-parameter-command-injection.js:55:22:55:25 | args | semmle.label | args |
-| command-line-parameter-command-injection.js:57:6:57:37 | tainted1 | semmle.label | tainted1 |
+| command-line-parameter-command-injection.js:57:6:57:13 | tainted1 | semmle.label | tainted1 |
 | command-line-parameter-command-injection.js:57:17:57:37 | require ... ').argv | semmle.label | require ... ').argv |
-| command-line-parameter-command-injection.js:58:6:58:40 | tainted2 | semmle.label | tainted2 |
+| command-line-parameter-command-injection.js:58:6:58:13 | tainted2 | semmle.label | tainted2 |
 | command-line-parameter-command-injection.js:58:17:58:40 | require ... parse() | semmle.label | require ... parse() |
 | command-line-parameter-command-injection.js:60:8:60:56 | {taint1 ... 2rest}} [taint1] | semmle.label | {taint1 ... 2rest}} [taint1] |
 | command-line-parameter-command-injection.js:60:8:60:56 | {taint1 ... 2rest}} [taint2] | semmle.label | {taint1 ... 2rest}} [taint2] |
-| command-line-parameter-command-injection.js:60:8:63:2 | taint1rest | semmle.label | taint1rest |
-| command-line-parameter-command-injection.js:60:8:63:2 | taint2rest | semmle.label | taint2rest |
 | command-line-parameter-command-injection.js:60:9:60:31 | taint1: ... t1rest} | semmle.label | taint1: ... t1rest} |
 | command-line-parameter-command-injection.js:60:17:60:31 | {...taint1rest} | semmle.label | {...taint1rest} |
+| command-line-parameter-command-injection.js:60:21:60:30 | taint1rest | semmle.label | taint1rest |
 | command-line-parameter-command-injection.js:60:33:60:55 | taint2: ... t2rest} | semmle.label | taint2: ... t2rest} |
 | command-line-parameter-command-injection.js:60:41:60:55 | {...taint2rest} | semmle.label | {...taint2rest} |
+| command-line-parameter-command-injection.js:60:45:60:54 | taint2rest | semmle.label | taint2rest |
 | command-line-parameter-command-injection.js:60:60:63:2 | {\\n\\t\\ttai ... ted2\\n\\t} [taint1] | semmle.label | {\\n\\t\\ttai ... ted2\\n\\t} [taint1] |
 | command-line-parameter-command-injection.js:60:60:63:2 | {\\n\\t\\ttai ... ted2\\n\\t} [taint2] | semmle.label | {\\n\\t\\ttai ... ted2\\n\\t} [taint2] |
 | command-line-parameter-command-injection.js:61:11:61:18 | tainted1 | semmle.label | tainted1 |
@@ -279,16 +279,16 @@ nodes
 | command-line-parameter-command-injection.js:66:10:66:31 | "cmd.sh ... nt2rest | semmle.label | "cmd.sh ... nt2rest |
 | command-line-parameter-command-injection.js:66:22:66:31 | taint2rest | semmle.label | taint2rest |
 | command-line-parameter-command-injection.js:68:6:68:16 | {...taint3} | semmle.label | {...taint3} |
-| command-line-parameter-command-injection.js:68:6:68:40 | taint3 | semmle.label | taint3 |
+| command-line-parameter-command-injection.js:68:10:68:15 | taint3 | semmle.label | taint3 |
 | command-line-parameter-command-injection.js:68:20:68:40 | require ... ').argv | semmle.label | require ... ').argv |
 | command-line-parameter-command-injection.js:69:10:69:27 | "cmd.sh " + taint3 | semmle.label | "cmd.sh " + taint3 |
 | command-line-parameter-command-injection.js:69:22:69:27 | taint3 | semmle.label | taint3 |
 | command-line-parameter-command-injection.js:71:6:71:16 | [...taint4] | semmle.label | [...taint4] |
-| command-line-parameter-command-injection.js:71:6:71:40 | taint4 | semmle.label | taint4 |
+| command-line-parameter-command-injection.js:71:10:71:15 | taint4 | semmle.label | taint4 |
 | command-line-parameter-command-injection.js:71:20:71:40 | require ... ').argv | semmle.label | require ... ').argv |
 | command-line-parameter-command-injection.js:72:10:72:27 | "cmd.sh " + taint4 | semmle.label | "cmd.sh " + taint4 |
 | command-line-parameter-command-injection.js:72:22:72:27 | taint4 | semmle.label | taint4 |
-| command-line-parameter-command-injection.js:76:8:76:35 | argv | semmle.label | argv |
+| command-line-parameter-command-injection.js:76:8:76:11 | argv | semmle.label | argv |
 | command-line-parameter-command-injection.js:76:15:76:26 | process.argv | semmle.label | process.argv |
 | command-line-parameter-command-injection.js:76:15:76:35 | process ... lice(2) | semmle.label | process ... lice(2) |
 | command-line-parameter-command-injection.js:79:10:79:39 | "cmd.sh ... gv).foo | semmle.label | "cmd.sh ... gv).foo |
@@ -302,34 +302,34 @@ nodes
 | command-line-parameter-command-injection.js:85:22:85:55 | yargsPa ... ice(2)) | semmle.label | yargsPa ... ice(2)) |
 | command-line-parameter-command-injection.js:85:34:85:45 | process.argv | semmle.label | process.argv |
 | command-line-parameter-command-injection.js:85:34:85:54 | process ... lice(2) | semmle.label | process ... lice(2) |
-| command-line-parameter-command-injection.js:88:6:88:37 | flags | semmle.label | flags |
+| command-line-parameter-command-injection.js:88:6:88:10 | flags | semmle.label | flags |
 | command-line-parameter-command-injection.js:88:14:88:37 | args.pa ... s.argv) | semmle.label | args.pa ... s.argv) |
 | command-line-parameter-command-injection.js:88:25:88:36 | process.argv | semmle.label | process.argv |
 | command-line-parameter-command-injection.js:89:10:89:30 | "cmd.sh ... ags.foo | semmle.label | "cmd.sh ... ags.foo |
 | command-line-parameter-command-injection.js:89:22:89:26 | flags | semmle.label | flags |
-| command-line-parameter-command-injection.js:91:6:91:38 | flags | semmle.label | flags |
+| command-line-parameter-command-injection.js:91:6:91:10 | flags | semmle.label | flags |
 | command-line-parameter-command-injection.js:91:14:91:38 | require ... .spec}) | semmle.label | require ... .spec}) |
 | command-line-parameter-command-injection.js:92:10:92:30 | "cmd.sh ... ags.foo | semmle.label | "cmd.sh ... ags.foo |
 | command-line-parameter-command-injection.js:92:22:92:26 | flags | semmle.label | flags |
 | command-line-parameter-command-injection.js:102:10:102:44 | "cmd.sh ... s().foo | semmle.label | "cmd.sh ... s().foo |
 | command-line-parameter-command-injection.js:102:22:102:40 | parser.parse_args() | semmle.label | parser.parse_args() |
-| command-line-parameter-command-injection.js:107:8:107:51 | options | semmle.label | options |
+| command-line-parameter-command-injection.js:107:8:107:14 | options | semmle.label | options |
 | command-line-parameter-command-injection.js:107:18:107:51 | command ... itions) | semmle.label | command ... itions) |
 | command-line-parameter-command-injection.js:108:10:108:32 | "cmd.sh ... ons.foo | semmle.label | "cmd.sh ... ons.foo |
 | command-line-parameter-command-injection.js:108:22:108:28 | options | semmle.label | options |
-| command-line-parameter-command-injection.js:114:8:114:52 | cli | semmle.label | cli |
+| command-line-parameter-command-injection.js:114:8:114:10 | cli | semmle.label | cli |
 | command-line-parameter-command-injection.js:114:14:114:52 | meow(`h ... lags}}) | semmle.label | meow(`h ... lags}}) |
 | command-line-parameter-command-injection.js:116:10:116:33 | "cmd.sh ... nput[0] | semmle.label | "cmd.sh ... nput[0] |
 | command-line-parameter-command-injection.js:116:22:116:24 | cli | semmle.label | cli |
-| command-line-parameter-command-injection.js:122:6:122:46 | opts | semmle.label | opts |
+| command-line-parameter-command-injection.js:122:6:122:9 | opts | semmle.label | opts |
 | command-line-parameter-command-injection.js:122:13:122:46 | dashdas ... tions}) | semmle.label | dashdas ... tions}) |
 | command-line-parameter-command-injection.js:124:10:124:29 | "cmd.sh " + opts.foo | semmle.label | "cmd.sh " + opts.foo |
 | command-line-parameter-command-injection.js:124:22:124:25 | opts | semmle.label | opts |
-| command-line-parameter-command-injection.js:127:6:127:26 | opts | semmle.label | opts |
+| command-line-parameter-command-injection.js:127:6:127:9 | opts | semmle.label | opts |
 | command-line-parameter-command-injection.js:127:13:127:26 | parser.parse() | semmle.label | parser.parse() |
 | command-line-parameter-command-injection.js:129:10:129:29 | "cmd.sh " + opts.foo | semmle.label | "cmd.sh " + opts.foo |
 | command-line-parameter-command-injection.js:129:22:129:25 | opts | semmle.label | opts |
-| command-line-parameter-command-injection.js:133:8:133:41 | program | semmle.label | program |
+| command-line-parameter-command-injection.js:133:10:133:16 | program | semmle.label | program |
 | command-line-parameter-command-injection.js:133:10:133:16 | program | semmle.label | program |
 | command-line-parameter-command-injection.js:136:10:136:45 | "cmd.sh ... zzaType | semmle.label | "cmd.sh ... zzaType |
 | command-line-parameter-command-injection.js:136:22:136:35 | program.opts() | semmle.label | program.opts() |
diff --git a/javascript/ql/test/query-tests/Security/CWE-078/SecondOrderCommandInjection/SecondOrderCommandInjection.expected b/javascript/ql/test/query-tests/Security/CWE-078/SecondOrderCommandInjection/SecondOrderCommandInjection.expected
index e4396669dc8..85d629191c5 100644
--- a/javascript/ql/test/query-tests/Security/CWE-078/SecondOrderCommandInjection/SecondOrderCommandInjection.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-078/SecondOrderCommandInjection/SecondOrderCommandInjection.expected
@@ -9,20 +9,20 @@
 | second-order.js:42:31:42:46 | req.query.remote | second-order.js:42:31:42:46 | req.query.remote | second-order.js:42:31:42:46 | req.query.remote | Command line argument that depends on $@ can execute an arbitrary command if --config=alias.<alias>=<command> is used with hg. | second-order.js:42:31:42:46 | req.query.remote | a user-provided value |
 | second-order.js:44:18:44:31 | req.query.args | second-order.js:44:18:44:31 | req.query.args | second-order.js:44:18:44:31 | req.query.args | Command line argument that depends on $@ can execute an arbitrary command if --config=alias.<alias>=<command> is used with hg. | second-order.js:44:18:44:31 | req.query.args | a user-provided value |
 edges
-| second-order.js:6:9:6:33 | remote | second-order.js:7:33:7:38 | remote | provenance |  |
-| second-order.js:6:9:6:33 | remote | second-order.js:9:29:9:34 | remote | provenance |  |
-| second-order.js:6:9:6:33 | remote | second-order.js:11:33:11:38 | remote | provenance |  |
-| second-order.js:6:9:6:33 | remote | second-order.js:26:35:26:40 | remote | provenance |  |
-| second-order.js:6:18:6:33 | req.query.remote | second-order.js:6:9:6:33 | remote | provenance |  |
-| second-order.js:13:9:13:31 | myArgs | second-order.js:15:19:15:24 | myArgs | provenance |  |
-| second-order.js:13:18:13:31 | req.query.args | second-order.js:13:9:13:31 | myArgs | provenance |  |
+| second-order.js:6:9:6:14 | remote | second-order.js:7:33:7:38 | remote | provenance |  |
+| second-order.js:6:9:6:14 | remote | second-order.js:9:29:9:34 | remote | provenance |  |
+| second-order.js:6:9:6:14 | remote | second-order.js:11:33:11:38 | remote | provenance |  |
+| second-order.js:6:9:6:14 | remote | second-order.js:26:35:26:40 | remote | provenance |  |
+| second-order.js:6:18:6:33 | req.query.remote | second-order.js:6:9:6:14 | remote | provenance |  |
+| second-order.js:13:9:13:14 | myArgs | second-order.js:15:19:15:24 | myArgs | provenance |  |
+| second-order.js:13:18:13:31 | req.query.args | second-order.js:13:9:13:14 | myArgs | provenance |  |
 nodes
-| second-order.js:6:9:6:33 | remote | semmle.label | remote |
+| second-order.js:6:9:6:14 | remote | semmle.label | remote |
 | second-order.js:6:18:6:33 | req.query.remote | semmle.label | req.query.remote |
 | second-order.js:7:33:7:38 | remote | semmle.label | remote |
 | second-order.js:9:29:9:34 | remote | semmle.label | remote |
 | second-order.js:11:33:11:38 | remote | semmle.label | remote |
-| second-order.js:13:9:13:31 | myArgs | semmle.label | myArgs |
+| second-order.js:13:9:13:14 | myArgs | semmle.label | myArgs |
 | second-order.js:13:18:13:31 | req.query.args | semmle.label | req.query.args |
 | second-order.js:15:19:15:24 | myArgs | semmle.label | myArgs |
 | second-order.js:26:35:26:40 | remote | semmle.label | remote |
diff --git a/javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/UnsafeShellCommandConstruction.expected b/javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/UnsafeShellCommandConstruction.expected
index c4b16b01a38..564d9ca221e 100644
--- a/javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/UnsafeShellCommandConstruction.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/UnsafeShellCommandConstruction.expected
@@ -142,10 +142,10 @@ edges
 | lib/lib.js:155:38:155:41 | name | lib/lib.js:161:25:161:28 | name | provenance |  |
 | lib/lib.js:170:41:170:44 | name | lib/lib.js:173:20:173:23 | name | provenance |  |
 | lib/lib.js:177:38:177:41 | name | lib/lib.js:181:21:181:24 | name | provenance |  |
-| lib/lib.js:181:6:181:52 | broken | lib/lib.js:182:22:182:27 | broken | provenance |  |
+| lib/lib.js:181:6:181:11 | broken | lib/lib.js:182:22:182:27 | broken | provenance |  |
 | lib/lib.js:181:21:181:24 | name | lib/lib.js:181:21:181:46 | name.re ... "'\\''") | provenance |  |
 | lib/lib.js:181:21:181:24 | name | lib/lib.js:181:21:181:46 | name.re ... "'\\''") | provenance |  |
-| lib/lib.js:181:21:181:46 | name.re ... "'\\''") | lib/lib.js:181:6:181:52 | broken | provenance |  |
+| lib/lib.js:181:21:181:46 | name.re ... "'\\''") | lib/lib.js:181:6:181:11 | broken | provenance |  |
 | lib/lib.js:186:34:186:37 | name | lib/lib.js:187:22:187:25 | name | provenance |  |
 | lib/lib.js:186:34:186:37 | name | lib/lib.js:190:23:190:26 | name | provenance |  |
 | lib/lib.js:196:45:196:48 | name | lib/lib.js:197:22:197:25 | name | provenance |  |
@@ -160,8 +160,8 @@ edges
 | lib/lib.js:239:28:239:28 | s | lib/lib.js:245:9:245:9 | s | provenance |  |
 | lib/lib.js:248:42:248:45 | name | lib/lib.js:249:22:249:25 | name | provenance |  |
 | lib/lib.js:248:42:248:45 | name | lib/lib.js:251:27:251:30 | name | provenance |  |
-| lib/lib.js:251:6:251:31 | cleaned | lib/lib.js:253:22:253:28 | cleaned | provenance |  |
-| lib/lib.js:251:16:251:31 | cleanInput(name) | lib/lib.js:251:6:251:31 | cleaned | provenance |  |
+| lib/lib.js:251:6:251:12 | cleaned | lib/lib.js:253:22:253:28 | cleaned | provenance |  |
+| lib/lib.js:251:16:251:31 | cleanInput(name) | lib/lib.js:251:6:251:12 | cleaned | provenance |  |
 | lib/lib.js:251:27:251:30 | name | lib/lib.js:239:28:239:28 | s | provenance |  |
 | lib/lib.js:251:27:251:30 | name | lib/lib.js:251:16:251:31 | cleanInput(name) | provenance |  |
 | lib/lib.js:257:35:257:38 | name | lib/lib.js:258:22:258:25 | name | provenance |  |
@@ -235,10 +235,10 @@ edges
 | lib/lib.js:608:42:608:45 | name | lib/lib.js:626:29:626:32 | name | provenance |  |
 | lib/lib.js:608:42:608:45 | name | lib/lib.js:629:25:629:28 | name | provenance |  |
 | lib/lib.js:632:38:632:41 | name | lib/lib.js:633:24:633:27 | name | provenance |  |
-| lib/lib.js:633:6:633:68 | sanitized | lib/lib.js:634:22:634:30 | sanitized | provenance |  |
+| lib/lib.js:633:6:633:14 | sanitized | lib/lib.js:634:22:634:30 | sanitized | provenance |  |
 | lib/lib.js:633:24:633:27 | name | lib/lib.js:633:24:633:62 | name.re ... '\\\\''") | provenance |  |
 | lib/lib.js:633:24:633:27 | name | lib/lib.js:633:24:633:62 | name.re ... '\\\\''") | provenance |  |
-| lib/lib.js:633:24:633:62 | name.re ... '\\\\''") | lib/lib.js:633:6:633:68 | sanitized | provenance |  |
+| lib/lib.js:633:24:633:62 | name.re ... '\\\\''") | lib/lib.js:633:6:633:14 | sanitized | provenance |  |
 | lib/subLib2/compiled-file.ts:3:26:3:29 | name | lib/subLib2/compiled-file.ts:4:25:4:28 | name | provenance |  |
 | lib/subLib2/special-file.js:3:28:3:31 | name | lib/subLib2/special-file.js:4:22:4:25 | name | provenance |  |
 | lib/subLib3/my-file.ts:3:28:3:31 | name | lib/subLib3/my-file.ts:4:22:4:25 | name | provenance |  |
@@ -308,7 +308,7 @@ nodes
 | lib/lib.js:170:41:170:44 | name | semmle.label | name |
 | lib/lib.js:173:20:173:23 | name | semmle.label | name |
 | lib/lib.js:177:38:177:41 | name | semmle.label | name |
-| lib/lib.js:181:6:181:52 | broken | semmle.label | broken |
+| lib/lib.js:181:6:181:11 | broken | semmle.label | broken |
 | lib/lib.js:181:21:181:24 | name | semmle.label | name |
 | lib/lib.js:181:21:181:46 | name.re ... "'\\''") | semmle.label | name.re ... "'\\''") |
 | lib/lib.js:181:21:181:46 | name.re ... "'\\''") | semmle.label | name.re ... "'\\''") |
@@ -333,7 +333,7 @@ nodes
 | lib/lib.js:245:9:245:9 | s | semmle.label | s |
 | lib/lib.js:248:42:248:45 | name | semmle.label | name |
 | lib/lib.js:249:22:249:25 | name | semmle.label | name |
-| lib/lib.js:251:6:251:31 | cleaned | semmle.label | cleaned |
+| lib/lib.js:251:6:251:12 | cleaned | semmle.label | cleaned |
 | lib/lib.js:251:16:251:31 | cleanInput(name) | semmle.label | cleanInput(name) |
 | lib/lib.js:251:27:251:30 | name | semmle.label | name |
 | lib/lib.js:253:22:253:28 | cleaned | semmle.label | cleaned |
@@ -428,7 +428,7 @@ nodes
 | lib/lib.js:626:29:626:32 | name | semmle.label | name |
 | lib/lib.js:629:25:629:28 | name | semmle.label | name |
 | lib/lib.js:632:38:632:41 | name | semmle.label | name |
-| lib/lib.js:633:6:633:68 | sanitized | semmle.label | sanitized |
+| lib/lib.js:633:6:633:14 | sanitized | semmle.label | sanitized |
 | lib/lib.js:633:24:633:27 | name | semmle.label | name |
 | lib/lib.js:633:24:633:62 | name.re ... '\\\\''") | semmle.label | name.re ... '\\\\''") |
 | lib/lib.js:633:24:633:62 | name.re ... '\\\\''") | semmle.label | name.re ... '\\\\''") |
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/Xss.expected b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/Xss.expected
index 0f565949211..fce55fec293 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/Xss.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/Xss.expected
@@ -244,8 +244,8 @@
 edges
 | addEventListener.js:1:43:1:47 | event | addEventListener.js:2:20:2:24 | event | provenance |  |
 | addEventListener.js:2:20:2:24 | event | addEventListener.js:2:20:2:29 | event.data | provenance |  |
-| addEventListener.js:5:43:5:48 | data | addEventListener.js:6:20:6:23 | data | provenance |  |
-| addEventListener.js:5:43:5:48 | {data} | addEventListener.js:5:43:5:48 | data | provenance |  |
+| addEventListener.js:5:43:5:48 | {data} | addEventListener.js:5:44:5:47 | data | provenance |  |
+| addEventListener.js:5:44:5:47 | data | addEventListener.js:6:20:6:23 | data | provenance |  |
 | addEventListener.js:10:21:10:25 | event | addEventListener.js:12:24:12:28 | event | provenance |  |
 | addEventListener.js:12:24:12:28 | event | addEventListener.js:12:24:12:33 | event.data | provenance |  |
 | angular2-client.ts:26:44:26:69 | this.ro ... .params | angular2-client.ts:26:44:26:73 | this.ro ... ams.foo | provenance |  |
@@ -270,25 +270,25 @@ edges
 | classnames.js:15:52:15:62 | window.name | classnames.js:15:47:15:63 | clsx(window.name) | provenance |  |
 | classnames.js:17:48:17:64 | clsx(window.name) | classnames.js:17:32:17:79 | `<span  ... <span>` | provenance |  |
 | classnames.js:17:53:17:63 | window.name | classnames.js:17:48:17:64 | clsx(window.name) | provenance |  |
-| clipboard.ts:8:11:8:51 | html | clipboard.ts:15:25:15:28 | html | provenance |  |
-| clipboard.ts:8:18:8:51 | clipboa ... /html') | clipboard.ts:8:11:8:51 | html | provenance |  |
-| clipboard.ts:43:15:43:55 | html | clipboard.ts:50:29:50:32 | html | provenance |  |
-| clipboard.ts:43:22:43:55 | clipboa ... /html') | clipboard.ts:43:15:43:55 | html | provenance |  |
-| clipboard.ts:71:13:71:62 | droppedHtml | clipboard.ts:73:29:73:39 | droppedHtml | provenance |  |
-| clipboard.ts:71:27:71:62 | e.clipb ... /html') | clipboard.ts:71:13:71:62 | droppedHtml | provenance |  |
-| clipboard.ts:98:15:98:54 | html | clipboard.ts:99:23:99:26 | html | provenance |  |
-| clipboard.ts:98:22:98:54 | dataTra ... /html') | clipboard.ts:98:15:98:54 | html | provenance |  |
+| clipboard.ts:8:11:8:14 | html | clipboard.ts:15:25:15:28 | html | provenance |  |
+| clipboard.ts:8:18:8:51 | clipboa ... /html') | clipboard.ts:8:11:8:14 | html | provenance |  |
+| clipboard.ts:43:15:43:18 | html | clipboard.ts:50:29:50:32 | html | provenance |  |
+| clipboard.ts:43:22:43:55 | clipboa ... /html') | clipboard.ts:43:15:43:18 | html | provenance |  |
+| clipboard.ts:71:13:71:23 | droppedHtml | clipboard.ts:73:29:73:39 | droppedHtml | provenance |  |
+| clipboard.ts:71:27:71:62 | e.clipb ... /html') | clipboard.ts:71:13:71:23 | droppedHtml | provenance |  |
+| clipboard.ts:98:15:98:18 | html | clipboard.ts:99:23:99:26 | html | provenance |  |
+| clipboard.ts:98:22:98:54 | dataTra ... /html') | clipboard.ts:98:15:98:18 | html | provenance |  |
 | d3.js:4:12:4:22 | window.name | d3.js:11:15:11:24 | getTaint() | provenance |  |
 | d3.js:4:12:4:22 | window.name | d3.js:12:20:12:29 | getTaint() | provenance |  |
 | d3.js:4:12:4:22 | window.name | d3.js:14:20:14:29 | getTaint() | provenance |  |
 | d3.js:4:12:4:22 | window.name | d3.js:21:15:21:24 | getTaint() | provenance |  |
-| dates.js:9:9:9:69 | taint | dates.js:11:63:11:67 | taint | provenance |  |
-| dates.js:9:9:9:69 | taint | dates.js:12:66:12:70 | taint | provenance |  |
-| dates.js:9:9:9:69 | taint | dates.js:13:59:13:63 | taint | provenance |  |
-| dates.js:9:9:9:69 | taint | dates.js:16:62:16:66 | taint | provenance |  |
-| dates.js:9:9:9:69 | taint | dates.js:18:59:18:63 | taint | provenance |  |
-| dates.js:9:9:9:69 | taint | dates.js:21:61:21:65 | taint | provenance |  |
-| dates.js:9:17:9:69 | decodeU ... ing(1)) | dates.js:9:9:9:69 | taint | provenance |  |
+| dates.js:9:9:9:13 | taint | dates.js:11:63:11:67 | taint | provenance |  |
+| dates.js:9:9:9:13 | taint | dates.js:12:66:12:70 | taint | provenance |  |
+| dates.js:9:9:9:13 | taint | dates.js:13:59:13:63 | taint | provenance |  |
+| dates.js:9:9:9:13 | taint | dates.js:16:62:16:66 | taint | provenance |  |
+| dates.js:9:9:9:13 | taint | dates.js:18:59:18:63 | taint | provenance |  |
+| dates.js:9:9:9:13 | taint | dates.js:21:61:21:65 | taint | provenance |  |
+| dates.js:9:17:9:69 | decodeU ... ing(1)) | dates.js:9:9:9:13 | taint | provenance |  |
 | dates.js:9:36:9:55 | window.location.hash | dates.js:9:36:9:68 | window. ... ring(1) | provenance |  |
 | dates.js:9:36:9:55 | window.location.hash | dates.js:9:36:9:68 | window. ... ring(1) | provenance | Config |
 | dates.js:9:36:9:68 | window. ... ring(1) | dates.js:9:17:9:69 | decodeU ... ing(1)) | provenance |  |
@@ -304,11 +304,11 @@ edges
 | dates.js:18:59:18:63 | taint | dates.js:18:42:18:64 | datefor ...  taint) | provenance |  |
 | dates.js:21:42:21:66 | dayjs(t ... (taint) | dates.js:21:31:21:68 | `Time i ... aint)}` | provenance |  |
 | dates.js:21:61:21:65 | taint | dates.js:21:42:21:66 | dayjs(t ... (taint) | provenance |  |
-| dates.js:30:9:30:69 | taint | dates.js:37:77:37:81 | taint | provenance |  |
-| dates.js:30:9:30:69 | taint | dates.js:38:77:38:81 | taint | provenance |  |
-| dates.js:30:9:30:69 | taint | dates.js:39:79:39:83 | taint | provenance |  |
-| dates.js:30:9:30:69 | taint | dates.js:40:77:40:81 | taint | provenance |  |
-| dates.js:30:17:30:69 | decodeU ... ing(1)) | dates.js:30:9:30:69 | taint | provenance |  |
+| dates.js:30:9:30:13 | taint | dates.js:37:77:37:81 | taint | provenance |  |
+| dates.js:30:9:30:13 | taint | dates.js:38:77:38:81 | taint | provenance |  |
+| dates.js:30:9:30:13 | taint | dates.js:39:79:39:83 | taint | provenance |  |
+| dates.js:30:9:30:13 | taint | dates.js:40:77:40:81 | taint | provenance |  |
+| dates.js:30:17:30:69 | decodeU ... ing(1)) | dates.js:30:9:30:13 | taint | provenance |  |
 | dates.js:30:36:30:55 | window.location.hash | dates.js:30:36:30:68 | window. ... ring(1) | provenance |  |
 | dates.js:30:36:30:55 | window.location.hash | dates.js:30:36:30:68 | window. ... ring(1) | provenance | Config |
 | dates.js:30:36:30:68 | window. ... ring(1) | dates.js:30:17:30:69 | decodeU ... ing(1)) | provenance |  |
@@ -320,10 +320,10 @@ edges
 | dates.js:39:79:39:83 | taint | dates.js:39:42:39:84 | moment. ...  taint) | provenance |  |
 | dates.js:40:42:40:82 | dayjs.f ...  taint) | dates.js:40:31:40:84 | `Time i ... aint)}` | provenance |  |
 | dates.js:40:77:40:81 | taint | dates.js:40:42:40:82 | dayjs.f ...  taint) | provenance |  |
-| dates.js:46:9:46:69 | taint | dates.js:48:83:48:87 | taint | provenance |  |
-| dates.js:46:9:46:69 | taint | dates.js:49:82:49:86 | taint | provenance |  |
-| dates.js:46:9:46:69 | taint | dates.js:50:97:50:101 | taint | provenance |  |
-| dates.js:46:17:46:69 | decodeU ... ing(1)) | dates.js:46:9:46:69 | taint | provenance |  |
+| dates.js:46:9:46:13 | taint | dates.js:48:83:48:87 | taint | provenance |  |
+| dates.js:46:9:46:13 | taint | dates.js:49:82:49:86 | taint | provenance |  |
+| dates.js:46:9:46:13 | taint | dates.js:50:97:50:101 | taint | provenance |  |
+| dates.js:46:17:46:69 | decodeU ... ing(1)) | dates.js:46:9:46:13 | taint | provenance |  |
 | dates.js:46:36:46:55 | window.location.hash | dates.js:46:36:46:68 | window. ... ring(1) | provenance |  |
 | dates.js:46:36:46:55 | window.location.hash | dates.js:46:36:46:68 | window. ... ring(1) | provenance | Config |
 | dates.js:46:36:46:68 | window. ... ring(1) | dates.js:46:17:46:69 | decodeU ... ing(1)) | provenance |  |
@@ -333,10 +333,10 @@ edges
 | dates.js:49:82:49:86 | taint | dates.js:49:42:49:87 | new Dat ... (taint) | provenance |  |
 | dates.js:50:42:50:102 | DateTim ... (taint) | dates.js:50:31:50:104 | `Time i ... aint)}` | provenance |  |
 | dates.js:50:97:50:101 | taint | dates.js:50:42:50:102 | DateTim ... (taint) | provenance |  |
-| dates.js:54:9:54:69 | taint | dates.js:57:94:57:98 | taint | provenance |  |
-| dates.js:54:9:54:69 | taint | dates.js:59:80:59:84 | taint | provenance |  |
-| dates.js:54:9:54:69 | taint | dates.js:61:81:61:85 | taint | provenance |  |
-| dates.js:54:17:54:69 | decodeU ... ing(1)) | dates.js:54:9:54:69 | taint | provenance |  |
+| dates.js:54:9:54:13 | taint | dates.js:57:94:57:98 | taint | provenance |  |
+| dates.js:54:9:54:13 | taint | dates.js:59:80:59:84 | taint | provenance |  |
+| dates.js:54:9:54:13 | taint | dates.js:61:81:61:85 | taint | provenance |  |
+| dates.js:54:17:54:69 | decodeU ... ing(1)) | dates.js:54:9:54:13 | taint | provenance |  |
 | dates.js:54:36:54:55 | window.location.hash | dates.js:54:36:54:68 | window. ... ring(1) | provenance |  |
 | dates.js:54:36:54:55 | window.location.hash | dates.js:54:36:54:68 | window. ... ring(1) | provenance | Config |
 | dates.js:54:36:54:68 | window. ... ring(1) | dates.js:54:17:54:69 | decodeU ... ing(1)) | provenance |  |
@@ -346,21 +346,21 @@ edges
 | dates.js:59:80:59:84 | taint | dates.js:59:42:59:85 | luxon.e ... (taint) | provenance |  |
 | dates.js:61:42:61:86 | dayjs.s ... (taint) | dates.js:61:31:61:88 | `Time i ... aint)}` | provenance |  |
 | dates.js:61:81:61:85 | taint | dates.js:61:42:61:86 | dayjs.s ... (taint) | provenance |  |
-| dragAndDrop.ts:8:11:8:50 | html | dragAndDrop.ts:15:25:15:28 | html | provenance |  |
-| dragAndDrop.ts:8:18:8:50 | dataTra ... /html') | dragAndDrop.ts:8:11:8:50 | html | provenance |  |
-| dragAndDrop.ts:43:15:43:54 | html | dragAndDrop.ts:50:29:50:32 | html | provenance |  |
-| dragAndDrop.ts:43:22:43:54 | dataTra ... /html') | dragAndDrop.ts:43:15:43:54 | html | provenance |  |
-| dragAndDrop.ts:71:13:71:61 | droppedHtml | dragAndDrop.ts:73:29:73:39 | droppedHtml | provenance |  |
-| dragAndDrop.ts:71:27:71:61 | e.dataT ... /html') | dragAndDrop.ts:71:13:71:61 | droppedHtml | provenance |  |
+| dragAndDrop.ts:8:11:8:14 | html | dragAndDrop.ts:15:25:15:28 | html | provenance |  |
+| dragAndDrop.ts:8:18:8:50 | dataTra ... /html') | dragAndDrop.ts:8:11:8:14 | html | provenance |  |
+| dragAndDrop.ts:43:15:43:18 | html | dragAndDrop.ts:50:29:50:32 | html | provenance |  |
+| dragAndDrop.ts:43:22:43:54 | dataTra ... /html') | dragAndDrop.ts:43:15:43:18 | html | provenance |  |
+| dragAndDrop.ts:71:13:71:23 | droppedHtml | dragAndDrop.ts:73:29:73:39 | droppedHtml | provenance |  |
+| dragAndDrop.ts:71:27:71:61 | e.dataT ... /html') | dragAndDrop.ts:71:13:71:23 | droppedHtml | provenance |  |
 | event-handler-receiver.js:2:49:2:61 | location.href | event-handler-receiver.js:2:31:2:83 | '<h2><a ... ></h2>' | provenance |  |
 | event-handler-receiver.js:2:49:2:61 | location.href | event-handler-receiver.js:2:31:2:83 | '<h2><a ... ></h2>' | provenance | Config |
-| jquery.js:2:7:2:40 | tainted | jquery.js:4:5:4:11 | tainted | provenance |  |
-| jquery.js:2:7:2:40 | tainted | jquery.js:5:13:5:19 | tainted | provenance |  |
-| jquery.js:2:7:2:40 | tainted | jquery.js:6:11:6:17 | tainted | provenance |  |
-| jquery.js:2:7:2:40 | tainted | jquery.js:7:20:7:26 | tainted | provenance |  |
-| jquery.js:2:7:2:40 | tainted | jquery.js:8:28:8:34 | tainted | provenance |  |
-| jquery.js:2:7:2:40 | tainted | jquery.js:36:25:36:31 | tainted | provenance |  |
-| jquery.js:2:17:2:40 | documen ... .search | jquery.js:2:7:2:40 | tainted | provenance |  |
+| jquery.js:2:7:2:13 | tainted | jquery.js:4:5:4:11 | tainted | provenance |  |
+| jquery.js:2:7:2:13 | tainted | jquery.js:5:13:5:19 | tainted | provenance |  |
+| jquery.js:2:7:2:13 | tainted | jquery.js:6:11:6:17 | tainted | provenance |  |
+| jquery.js:2:7:2:13 | tainted | jquery.js:7:20:7:26 | tainted | provenance |  |
+| jquery.js:2:7:2:13 | tainted | jquery.js:8:28:8:34 | tainted | provenance |  |
+| jquery.js:2:7:2:13 | tainted | jquery.js:36:25:36:31 | tainted | provenance |  |
+| jquery.js:2:17:2:40 | documen ... .search | jquery.js:2:7:2:13 | tainted | provenance |  |
 | jquery.js:4:5:4:11 | tainted | jquery.js:5:13:5:19 | tainted | provenance |  |
 | jquery.js:5:13:5:19 | tainted | jquery.js:6:11:6:17 | tainted | provenance |  |
 | jquery.js:6:11:6:17 | tainted | jquery.js:7:20:7:26 | tainted | provenance |  |
@@ -374,13 +374,13 @@ edges
 | jquery.js:15:38:15:59 | window. ... .search | jquery.js:15:19:15:60 | decodeU ... search) | provenance |  |
 | jquery.js:16:38:16:52 | window.location | jquery.js:16:38:16:63 | window. ... tring() | provenance |  |
 | jquery.js:16:38:16:63 | window. ... tring() | jquery.js:16:19:16:64 | decodeU ... ring()) | provenance |  |
-| jquery.js:18:7:18:33 | hash | jquery.js:21:5:21:8 | hash | provenance |  |
-| jquery.js:18:7:18:33 | hash | jquery.js:22:5:22:8 | hash | provenance |  |
-| jquery.js:18:7:18:33 | hash | jquery.js:23:5:23:8 | hash | provenance |  |
-| jquery.js:18:7:18:33 | hash | jquery.js:24:5:24:8 | hash | provenance |  |
-| jquery.js:18:7:18:33 | hash | jquery.js:27:5:27:8 | hash | provenance |  |
-| jquery.js:18:7:18:33 | hash | jquery.js:34:13:34:16 | hash | provenance |  |
-| jquery.js:18:14:18:33 | window.location.hash | jquery.js:18:7:18:33 | hash | provenance |  |
+| jquery.js:18:7:18:10 | hash | jquery.js:21:5:21:8 | hash | provenance |  |
+| jquery.js:18:7:18:10 | hash | jquery.js:22:5:22:8 | hash | provenance |  |
+| jquery.js:18:7:18:10 | hash | jquery.js:23:5:23:8 | hash | provenance |  |
+| jquery.js:18:7:18:10 | hash | jquery.js:24:5:24:8 | hash | provenance |  |
+| jquery.js:18:7:18:10 | hash | jquery.js:27:5:27:8 | hash | provenance |  |
+| jquery.js:18:7:18:10 | hash | jquery.js:34:13:34:16 | hash | provenance |  |
+| jquery.js:18:14:18:33 | window.location.hash | jquery.js:18:7:18:10 | hash | provenance |  |
 | jquery.js:21:5:21:8 | hash | jquery.js:21:5:21:21 | hash.substring(1) | provenance | Config |
 | jquery.js:22:5:22:8 | hash | jquery.js:22:5:22:25 | hash.su ... (1, 10) | provenance | Config |
 | jquery.js:23:5:23:8 | hash | jquery.js:23:5:23:18 | hash.substr(1) | provenance | Config |
@@ -390,47 +390,47 @@ edges
 | jquery.js:34:13:34:16 | hash | jquery.js:34:5:34:25 | '<b>' + ...  '</b>' | provenance | Config |
 | jquery.js:36:25:36:31 | tainted | jquery.js:37:31:37:37 | tainted | provenance |  |
 | jquery.js:37:31:37:37 | tainted | jquery.js:37:25:37:37 | () => tainted | provenance | Config |
-| json-stringify.jsx:5:9:5:36 | locale | json-stringify.jsx:11:51:11:56 | locale | provenance |  |
-| json-stringify.jsx:5:9:5:36 | locale | json-stringify.jsx:19:56:19:61 | locale | provenance |  |
-| json-stringify.jsx:5:9:5:36 | locale | json-stringify.jsx:31:55:31:60 | locale | provenance |  |
-| json-stringify.jsx:5:18:5:36 | req.param("locale") | json-stringify.jsx:5:9:5:36 | locale | provenance |  |
+| json-stringify.jsx:5:9:5:14 | locale | json-stringify.jsx:11:51:11:56 | locale | provenance |  |
+| json-stringify.jsx:5:9:5:14 | locale | json-stringify.jsx:19:56:19:61 | locale | provenance |  |
+| json-stringify.jsx:5:9:5:14 | locale | json-stringify.jsx:31:55:31:60 | locale | provenance |  |
+| json-stringify.jsx:5:18:5:36 | req.param("locale") | json-stringify.jsx:5:9:5:14 | locale | provenance |  |
 | json-stringify.jsx:11:51:11:56 | locale | json-stringify.jsx:35:40:35:61 | JSON.st ... jsonLD) | provenance |  |
 | json-stringify.jsx:19:56:19:61 | locale | json-stringify.jsx:35:40:35:61 | JSON.st ... jsonLD) | provenance |  |
 | json-stringify.jsx:31:55:31:60 | locale | json-stringify.jsx:31:40:31:61 | JSON.st ... locale) | provenance |  |
-| jwt-server.js:7:9:7:35 | taint | jwt-server.js:9:16:9:20 | taint | provenance |  |
-| jwt-server.js:7:17:7:35 | req.param("wobble") | jwt-server.js:7:9:7:35 | taint | provenance |  |
+| jwt-server.js:7:9:7:13 | taint | jwt-server.js:9:16:9:20 | taint | provenance |  |
+| jwt-server.js:7:17:7:35 | req.param("wobble") | jwt-server.js:7:9:7:13 | taint | provenance |  |
 | jwt-server.js:9:16:9:20 | taint | jwt-server.js:9:55:9:61 | decoded | provenance |  |
 | jwt-server.js:9:55:9:61 | decoded | jwt-server.js:10:19:10:25 | decoded | provenance |  |
 | jwt-server.js:10:19:10:25 | decoded | jwt-server.js:10:19:10:29 | decoded.foo | provenance |  |
 | nodemailer.js:13:50:13:66 | req.query.message | nodemailer.js:13:11:13:69 | `Hi, yo ... sage}.` | provenance |  |
-| optionalSanitizer.js:2:7:2:39 | target | optionalSanitizer.js:6:18:6:23 | target | provenance |  |
-| optionalSanitizer.js:2:7:2:39 | target | optionalSanitizer.js:8:17:8:22 | target | provenance |  |
-| optionalSanitizer.js:2:7:2:39 | target | optionalSanitizer.js:15:9:15:14 | target | provenance |  |
-| optionalSanitizer.js:2:16:2:39 | documen ... .search | optionalSanitizer.js:2:7:2:39 | target | provenance |  |
-| optionalSanitizer.js:8:7:8:22 | tainted | optionalSanitizer.js:9:18:9:24 | tainted | provenance |  |
-| optionalSanitizer.js:8:17:8:22 | target | optionalSanitizer.js:8:7:8:22 | tainted | provenance |  |
+| optionalSanitizer.js:2:7:2:12 | target | optionalSanitizer.js:6:18:6:23 | target | provenance |  |
+| optionalSanitizer.js:2:7:2:12 | target | optionalSanitizer.js:8:17:8:22 | target | provenance |  |
+| optionalSanitizer.js:2:7:2:12 | target | optionalSanitizer.js:15:9:15:14 | target | provenance |  |
+| optionalSanitizer.js:2:16:2:39 | documen ... .search | optionalSanitizer.js:2:7:2:12 | target | provenance |  |
+| optionalSanitizer.js:8:7:8:13 | tainted | optionalSanitizer.js:9:18:9:24 | tainted | provenance |  |
+| optionalSanitizer.js:8:17:8:22 | target | optionalSanitizer.js:8:7:8:13 | tainted | provenance |  |
 | optionalSanitizer.js:15:9:15:14 | target | optionalSanitizer.js:16:18:16:18 | x | provenance |  |
 | optionalSanitizer.js:16:18:16:18 | x | optionalSanitizer.js:17:20:17:20 | x | provenance |  |
-| optionalSanitizer.js:26:7:26:39 | target | optionalSanitizer.js:31:18:31:23 | target | provenance |  |
-| optionalSanitizer.js:26:7:26:39 | target | optionalSanitizer.js:38:18:38:23 | target | provenance |  |
-| optionalSanitizer.js:26:7:26:39 | target | optionalSanitizer.js:45:41:45:46 | target | provenance |  |
-| optionalSanitizer.js:26:7:26:39 | target | optionalSanitizer.js:45:51:45:56 | target | provenance |  |
-| optionalSanitizer.js:26:16:26:39 | documen ... .search | optionalSanitizer.js:26:7:26:39 | target | provenance |  |
+| optionalSanitizer.js:26:7:26:12 | target | optionalSanitizer.js:31:18:31:23 | target | provenance |  |
+| optionalSanitizer.js:26:7:26:12 | target | optionalSanitizer.js:38:18:38:23 | target | provenance |  |
+| optionalSanitizer.js:26:7:26:12 | target | optionalSanitizer.js:45:41:45:46 | target | provenance |  |
+| optionalSanitizer.js:26:7:26:12 | target | optionalSanitizer.js:45:51:45:56 | target | provenance |  |
+| optionalSanitizer.js:26:16:26:39 | documen ... .search | optionalSanitizer.js:26:7:26:12 | target | provenance |  |
 | optionalSanitizer.js:28:24:28:24 | x | optionalSanitizer.js:29:12:29:12 | x | provenance |  |
-| optionalSanitizer.js:31:7:31:23 | tainted2 | optionalSanitizer.js:32:18:32:25 | tainted2 | provenance |  |
-| optionalSanitizer.js:31:7:31:23 | tainted2 | optionalSanitizer.js:34:28:34:35 | tainted2 | provenance |  |
-| optionalSanitizer.js:31:7:31:23 | tainted2 | optionalSanitizer.js:36:18:36:25 | tainted2 | provenance |  |
-| optionalSanitizer.js:31:18:31:23 | target | optionalSanitizer.js:31:7:31:23 | tainted2 | provenance |  |
-| optionalSanitizer.js:34:5:34:36 | tainted2 | optionalSanitizer.js:36:18:36:25 | tainted2 | provenance |  |
-| optionalSanitizer.js:34:16:34:36 | sanitiz ... inted2) | optionalSanitizer.js:34:5:34:36 | tainted2 | provenance |  |
+| optionalSanitizer.js:31:7:31:14 | tainted2 | optionalSanitizer.js:32:18:32:25 | tainted2 | provenance |  |
+| optionalSanitizer.js:31:7:31:14 | tainted2 | optionalSanitizer.js:34:28:34:35 | tainted2 | provenance |  |
+| optionalSanitizer.js:31:7:31:14 | tainted2 | optionalSanitizer.js:36:18:36:25 | tainted2 | provenance |  |
+| optionalSanitizer.js:31:18:31:23 | target | optionalSanitizer.js:31:7:31:14 | tainted2 | provenance |  |
+| optionalSanitizer.js:34:5:34:12 | tainted2 | optionalSanitizer.js:36:18:36:25 | tainted2 | provenance |  |
+| optionalSanitizer.js:34:16:34:36 | sanitiz ... inted2) | optionalSanitizer.js:34:5:34:12 | tainted2 | provenance |  |
 | optionalSanitizer.js:34:28:34:35 | tainted2 | optionalSanitizer.js:28:24:28:24 | x | provenance |  |
 | optionalSanitizer.js:34:28:34:35 | tainted2 | optionalSanitizer.js:34:16:34:36 | sanitiz ... inted2) | provenance |  |
-| optionalSanitizer.js:38:7:38:23 | tainted3 | optionalSanitizer.js:39:18:39:25 | tainted3 | provenance |  |
-| optionalSanitizer.js:38:7:38:23 | tainted3 | optionalSanitizer.js:41:28:41:35 | tainted3 | provenance |  |
-| optionalSanitizer.js:38:7:38:23 | tainted3 | optionalSanitizer.js:43:18:43:25 | tainted3 | provenance |  |
-| optionalSanitizer.js:38:18:38:23 | target | optionalSanitizer.js:38:7:38:23 | tainted3 | provenance |  |
-| optionalSanitizer.js:41:5:41:36 | tainted3 | optionalSanitizer.js:43:18:43:25 | tainted3 | provenance |  |
-| optionalSanitizer.js:41:16:41:36 | sanitiz ... inted3) | optionalSanitizer.js:41:5:41:36 | tainted3 | provenance |  |
+| optionalSanitizer.js:38:7:38:14 | tainted3 | optionalSanitizer.js:39:18:39:25 | tainted3 | provenance |  |
+| optionalSanitizer.js:38:7:38:14 | tainted3 | optionalSanitizer.js:41:28:41:35 | tainted3 | provenance |  |
+| optionalSanitizer.js:38:7:38:14 | tainted3 | optionalSanitizer.js:43:18:43:25 | tainted3 | provenance |  |
+| optionalSanitizer.js:38:18:38:23 | target | optionalSanitizer.js:38:7:38:14 | tainted3 | provenance |  |
+| optionalSanitizer.js:41:5:41:12 | tainted3 | optionalSanitizer.js:43:18:43:25 | tainted3 | provenance |  |
+| optionalSanitizer.js:41:16:41:36 | sanitiz ... inted3) | optionalSanitizer.js:41:5:41:12 | tainted3 | provenance |  |
 | optionalSanitizer.js:41:28:41:35 | tainted3 | optionalSanitizer.js:28:24:28:24 | x | provenance |  |
 | optionalSanitizer.js:41:28:41:35 | tainted3 | optionalSanitizer.js:41:16:41:36 | sanitiz ... inted3) | provenance |  |
 | optionalSanitizer.js:45:29:45:47 | sanitizeBad(target) | optionalSanitizer.js:45:18:45:56 | sanitiz ...  target | provenance |  |
@@ -439,8 +439,8 @@ edges
 | optionalSanitizer.js:45:51:45:56 | target | optionalSanitizer.js:45:18:45:56 | sanitiz ...  target | provenance |  |
 | pages/[id].jsx:3:30:3:35 | params [id] | pages/[id].jsx:13:44:13:49 | params [id] | provenance |  |
 | pages/[id].jsx:3:30:3:35 | params [q] | pages/[id].jsx:16:44:16:49 | params [q] | provenance |  |
-| pages/[id].jsx:5:9:5:14 | { id } | pages/[id].jsx:5:9:5:29 | id | provenance |  |
-| pages/[id].jsx:5:9:5:29 | id | pages/[id].jsx:10:44:10:45 | id | provenance |  |
+| pages/[id].jsx:5:9:5:14 | { id } | pages/[id].jsx:5:11:5:12 | id | provenance |  |
+| pages/[id].jsx:5:11:5:12 | id | pages/[id].jsx:10:44:10:45 | id | provenance |  |
 | pages/[id].jsx:5:18:5:29 | router.query | pages/[id].jsx:5:9:5:14 | { id } | provenance |  |
 | pages/[id].jsx:13:44:13:49 | params [id] | pages/[id].jsx:13:44:13:52 | params.id | provenance |  |
 | pages/[id].jsx:16:44:16:49 | params [q] | pages/[id].jsx:16:44:16:51 | params.q | provenance |  |
@@ -450,30 +450,30 @@ edges
 | pages/[id].jsx:25:11:25:33 | context ... d \|\| "" | pages/[id].jsx:24:12:27:5 | {\\n      ... e\\n    } [id] | provenance |  |
 | pages/[id].jsx:26:10:26:22 | context.query | pages/[id].jsx:26:10:26:36 | context ... r \|\| "" | provenance |  |
 | pages/[id].jsx:26:10:26:36 | context ... r \|\| "" | pages/[id].jsx:24:12:27:5 | {\\n      ... e\\n    } [q] | provenance |  |
-| react-native.js:7:7:7:33 | tainted | react-native.js:8:18:8:24 | tainted | provenance |  |
-| react-native.js:7:7:7:33 | tainted | react-native.js:9:27:9:33 | tainted | provenance |  |
-| react-native.js:7:17:7:33 | req.param("code") | react-native.js:7:7:7:33 | tainted | provenance |  |
+| react-native.js:7:7:7:13 | tainted | react-native.js:8:18:8:24 | tainted | provenance |  |
+| react-native.js:7:7:7:13 | tainted | react-native.js:9:27:9:33 | tainted | provenance |  |
+| react-native.js:7:17:7:33 | req.param("code") | react-native.js:7:7:7:13 | tainted | provenance |  |
 | react-use-router.js:8:21:8:32 | router.query | react-use-router.js:8:21:8:39 | router.query.foobar | provenance |  |
 | react-use-router.js:11:24:11:35 | router.query | react-use-router.js:11:24:11:42 | router.query.foobar | provenance |  |
 | react-use-router.js:23:43:23:54 | router.query | react-use-router.js:23:43:23:61 | router.query.foobar | provenance |  |
 | react-use-router.js:33:21:33:32 | router.query | react-use-router.js:33:21:33:39 | router.query.foobar | provenance |  |
-| react-use-state.js:4:9:4:49 | state | react-use-state.js:5:51:5:55 | state | provenance |  |
-| react-use-state.js:4:38:4:48 | window.name | react-use-state.js:4:9:4:49 | state | provenance |  |
-| react-use-state.js:9:9:9:43 | state | react-use-state.js:11:51:11:55 | state | provenance |  |
-| react-use-state.js:10:14:10:24 | window.name | react-use-state.js:9:9:9:43 | state | provenance |  |
-| react-use-state.js:15:9:15:43 | state | react-use-state.js:17:51:17:55 | state | provenance |  |
-| react-use-state.js:15:10:15:14 | state | react-use-state.js:15:9:15:43 | state | provenance |  |
+| react-use-state.js:4:10:4:14 | state | react-use-state.js:5:51:5:55 | state | provenance |  |
+| react-use-state.js:4:38:4:48 | window.name | react-use-state.js:4:10:4:14 | state | provenance |  |
+| react-use-state.js:9:10:9:14 | state | react-use-state.js:11:51:11:55 | state | provenance |  |
+| react-use-state.js:10:14:10:24 | window.name | react-use-state.js:9:10:9:14 | state | provenance |  |
+| react-use-state.js:15:10:15:14 | state | react-use-state.js:15:10:15:14 | state | provenance |  |
+| react-use-state.js:15:10:15:14 | state | react-use-state.js:17:51:17:55 | state | provenance |  |
 | react-use-state.js:16:20:16:30 | window.name | react-use-state.js:15:10:15:14 | state | provenance |  |
 | react-use-state.js:21:10:21:14 | state | react-use-state.js:22:14:22:17 | prev | provenance |  |
 | react-use-state.js:22:14:22:17 | prev | react-use-state.js:23:35:23:38 | prev | provenance |  |
 | react-use-state.js:25:20:25:30 | window.name | react-use-state.js:21:10:21:14 | state | provenance |  |
-| sanitiser.js:16:7:16:27 | tainted | sanitiser.js:23:29:23:35 | tainted | provenance |  |
-| sanitiser.js:16:7:16:27 | tainted | sanitiser.js:30:29:30:35 | tainted | provenance |  |
-| sanitiser.js:16:7:16:27 | tainted | sanitiser.js:33:29:33:35 | tainted | provenance |  |
-| sanitiser.js:16:7:16:27 | tainted | sanitiser.js:38:29:38:35 | tainted | provenance |  |
-| sanitiser.js:16:7:16:27 | tainted | sanitiser.js:45:29:45:35 | tainted | provenance |  |
-| sanitiser.js:16:7:16:27 | tainted | sanitiser.js:48:19:48:25 | tainted | provenance |  |
-| sanitiser.js:16:17:16:27 | window.name | sanitiser.js:16:7:16:27 | tainted | provenance |  |
+| sanitiser.js:16:7:16:13 | tainted | sanitiser.js:23:29:23:35 | tainted | provenance |  |
+| sanitiser.js:16:7:16:13 | tainted | sanitiser.js:30:29:30:35 | tainted | provenance |  |
+| sanitiser.js:16:7:16:13 | tainted | sanitiser.js:33:29:33:35 | tainted | provenance |  |
+| sanitiser.js:16:7:16:13 | tainted | sanitiser.js:38:29:38:35 | tainted | provenance |  |
+| sanitiser.js:16:7:16:13 | tainted | sanitiser.js:45:29:45:35 | tainted | provenance |  |
+| sanitiser.js:16:7:16:13 | tainted | sanitiser.js:48:19:48:25 | tainted | provenance |  |
+| sanitiser.js:16:17:16:27 | window.name | sanitiser.js:16:7:16:13 | tainted | provenance |  |
 | sanitiser.js:23:29:23:35 | tainted | sanitiser.js:23:21:23:44 | '<b>' + ...  '</b>' | provenance |  |
 | sanitiser.js:30:29:30:35 | tainted | sanitiser.js:30:21:30:44 | '<b>' + ...  '</b>' | provenance |  |
 | sanitiser.js:33:29:33:35 | tainted | sanitiser.js:33:21:33:44 | '<b>' + ...  '</b>' | provenance |  |
@@ -483,8 +483,8 @@ edges
 | stored-xss.js:2:39:2:62 | documen ... .search | stored-xss.js:5:20:5:52 | session ... ssion') | provenance |  |
 | stored-xss.js:3:35:3:58 | documen ... .search | stored-xss.js:8:20:8:48 | localSt ... local') | provenance |  |
 | stored-xss.js:3:35:3:58 | documen ... .search | stored-xss.js:10:16:10:44 | localSt ... local') | provenance |  |
-| stored-xss.js:10:9:10:44 | href | stored-xss.js:12:35:12:38 | href | provenance |  |
-| stored-xss.js:10:16:10:44 | localSt ... local') | stored-xss.js:10:9:10:44 | href | provenance |  |
+| stored-xss.js:10:9:10:12 | href | stored-xss.js:12:35:12:38 | href | provenance |  |
+| stored-xss.js:10:16:10:44 | localSt ... local') | stored-xss.js:10:9:10:12 | href | provenance |  |
 | stored-xss.js:12:35:12:38 | href | stored-xss.js:12:20:12:54 | "<a hre ... ar</a>" | provenance |  |
 | stored-xss.js:12:35:12:38 | href | stored-xss.js:12:20:12:54 | "<a hre ... ar</a>" | provenance | Config |
 | string-manipulations.js:5:16:5:37 | documen ... on.href | string-manipulations.js:5:16:5:47 | documen ... lueOf() | provenance |  |
@@ -494,24 +494,24 @@ edges
 | string-manipulations.js:9:36:9:57 | documen ... on.href | string-manipulations.js:9:16:9:58 | String. ... n.href) | provenance |  |
 | string-manipulations.js:10:23:10:44 | documen ... on.href | string-manipulations.js:10:16:10:45 | String( ... n.href) | provenance |  |
 | tainted-url-suffix-arguments.js:3:17:3:17 | y | tainted-url-suffix-arguments.js:6:22:6:22 | y | provenance |  |
-| tainted-url-suffix-arguments.js:11:11:11:36 | url | tainted-url-suffix-arguments.js:12:17:12:19 | url | provenance |  |
-| tainted-url-suffix-arguments.js:11:17:11:36 | window.location.href | tainted-url-suffix-arguments.js:11:11:11:36 | url | provenance |  |
+| tainted-url-suffix-arguments.js:11:11:11:13 | url | tainted-url-suffix-arguments.js:12:17:12:19 | url | provenance |  |
+| tainted-url-suffix-arguments.js:11:17:11:36 | window.location.href | tainted-url-suffix-arguments.js:11:11:11:13 | url | provenance |  |
 | tainted-url-suffix-arguments.js:12:17:12:19 | url | tainted-url-suffix-arguments.js:3:17:3:17 | y | provenance |  |
-| tooltip.jsx:6:11:6:30 | source | tooltip.jsx:10:25:10:30 | source | provenance |  |
-| tooltip.jsx:6:11:6:30 | source | tooltip.jsx:11:25:11:30 | source | provenance |  |
-| tooltip.jsx:6:20:6:30 | window.name | tooltip.jsx:6:11:6:30 | source | provenance |  |
-| tooltip.jsx:17:11:17:33 | provide [source] | tooltip.jsx:18:51:18:57 | provide [source] | provenance |  |
-| tooltip.jsx:17:21:17:33 | props.provide [source] | tooltip.jsx:17:11:17:33 | provide [source] | provenance |  |
+| tooltip.jsx:6:11:6:16 | source | tooltip.jsx:10:25:10:30 | source | provenance |  |
+| tooltip.jsx:6:11:6:16 | source | tooltip.jsx:11:25:11:30 | source | provenance |  |
+| tooltip.jsx:6:20:6:30 | window.name | tooltip.jsx:6:11:6:16 | source | provenance |  |
+| tooltip.jsx:17:11:17:17 | provide [source] | tooltip.jsx:18:51:18:57 | provide [source] | provenance |  |
+| tooltip.jsx:17:21:17:33 | props.provide [source] | tooltip.jsx:17:11:17:17 | provide [source] | provenance |  |
 | tooltip.jsx:18:51:18:57 | provide [source] | tooltip.jsx:18:51:18:59 | provide() | provenance |  |
 | tooltip.jsx:18:51:18:57 | provide [source] | tooltip.jsx:23:38:23:43 | source | provenance |  |
-| tooltip.jsx:22:11:22:30 | source | tooltip.jsx:17:21:17:33 | props.provide [source] | provenance |  |
-| tooltip.jsx:22:20:22:30 | window.name | tooltip.jsx:22:11:22:30 | source | provenance |  |
-| translate.js:6:7:6:39 | target | translate.js:7:42:7:47 | target | provenance |  |
-| translate.js:6:16:6:39 | documen ... .search | translate.js:6:7:6:39 | target | provenance |  |
-| translate.js:7:7:7:61 | searchParams | translate.js:8:27:8:38 | searchParams | provenance |  |
-| translate.js:7:7:7:61 | searchParams [MapValue] | translate.js:8:27:8:38 | searchParams [MapValue] | provenance |  |
-| translate.js:7:22:7:61 | new URL ... ing(1)) | translate.js:7:7:7:61 | searchParams | provenance |  |
-| translate.js:7:22:7:61 | new URL ... ing(1)) [MapValue] | translate.js:7:7:7:61 | searchParams [MapValue] | provenance |  |
+| tooltip.jsx:22:11:22:16 | source | tooltip.jsx:17:21:17:33 | props.provide [source] | provenance |  |
+| tooltip.jsx:22:20:22:30 | window.name | tooltip.jsx:22:11:22:16 | source | provenance |  |
+| translate.js:6:7:6:12 | target | translate.js:7:42:7:47 | target | provenance |  |
+| translate.js:6:16:6:39 | documen ... .search | translate.js:6:7:6:12 | target | provenance |  |
+| translate.js:7:7:7:18 | searchParams | translate.js:8:27:8:38 | searchParams | provenance |  |
+| translate.js:7:7:7:18 | searchParams [MapValue] | translate.js:8:27:8:38 | searchParams [MapValue] | provenance |  |
+| translate.js:7:22:7:61 | new URL ... ing(1)) | translate.js:7:7:7:18 | searchParams | provenance |  |
+| translate.js:7:22:7:61 | new URL ... ing(1)) [MapValue] | translate.js:7:7:7:18 | searchParams [MapValue] | provenance |  |
 | translate.js:7:42:7:47 | target | translate.js:7:42:7:60 | target.substring(1) | provenance |  |
 | translate.js:7:42:7:47 | target | translate.js:7:42:7:60 | target.substring(1) | provenance | Config |
 | translate.js:7:42:7:47 | target | translate.js:7:42:7:60 | target.substring(1) | provenance | Config |
@@ -538,32 +538,32 @@ edges
 | tst3.js:7:32:7:35 | data | tst3.js:7:32:7:37 | data.p | provenance |  |
 | tst3.js:9:37:9:40 | data | tst3.js:9:37:9:42 | data.p | provenance |  |
 | tst3.js:10:38:10:41 | data | tst3.js:10:38:10:43 | data.p | provenance |  |
-| tst.js:2:7:2:39 | target | tst.js:4:18:4:23 | target | provenance |  |
-| tst.js:2:7:2:39 | target | tst.js:9:28:9:33 | target | provenance |  |
-| tst.js:2:7:2:39 | target | tst.js:17:42:17:47 | target | provenance |  |
-| tst.js:2:16:2:39 | documen ... .search | tst.js:2:7:2:39 | target | provenance |  |
+| tst.js:2:7:2:12 | target | tst.js:4:18:4:23 | target | provenance |  |
+| tst.js:2:7:2:12 | target | tst.js:9:28:9:33 | target | provenance |  |
+| tst.js:2:7:2:12 | target | tst.js:17:42:17:47 | target | provenance |  |
+| tst.js:2:16:2:39 | documen ... .search | tst.js:2:7:2:12 | target | provenance |  |
 | tst.js:6:37:6:58 | documen ... on.href | tst.js:6:37:6:114 | documen ... t=")+8) | provenance |  |
 | tst.js:6:37:6:58 | documen ... on.href | tst.js:6:37:6:114 | documen ... t=")+8) | provenance | Config |
 | tst.js:6:37:6:114 | documen ... t=")+8) | tst.js:6:18:6:126 | "<OPTIO ... PTION>" | provenance |  |
 | tst.js:6:37:6:114 | documen ... t=")+8) | tst.js:6:18:6:126 | "<OPTIO ... PTION>" | provenance |  |
 | tst.js:6:37:6:114 | documen ... t=")+8) | tst.js:6:18:6:126 | "<OPTIO ... PTION>" | provenance | Config |
 | tst.js:9:28:9:33 | target | tst.js:9:5:9:42 | '<div s ...  'px">' | provenance | Config |
-| tst.js:14:7:14:56 | params | tst.js:15:18:15:23 | params | provenance |  |
-| tst.js:14:7:14:56 | params [MapValue] | tst.js:15:18:15:23 | params [MapValue] | provenance |  |
+| tst.js:14:7:14:12 | params | tst.js:15:18:15:23 | params | provenance |  |
+| tst.js:14:7:14:12 | params [MapValue] | tst.js:15:18:15:23 | params [MapValue] | provenance |  |
 | tst.js:14:16:14:43 | (new UR ... ation)) [searchParams, MapValue] | tst.js:14:16:14:56 | (new UR ... hParams [MapValue] | provenance |  |
 | tst.js:14:16:14:43 | (new UR ... ation)) [searchParams] | tst.js:14:16:14:56 | (new UR ... hParams | provenance |  |
-| tst.js:14:16:14:56 | (new UR ... hParams | tst.js:14:7:14:56 | params | provenance |  |
-| tst.js:14:16:14:56 | (new UR ... hParams [MapValue] | tst.js:14:7:14:56 | params [MapValue] | provenance |  |
+| tst.js:14:16:14:56 | (new UR ... hParams | tst.js:14:7:14:12 | params | provenance |  |
+| tst.js:14:16:14:56 | (new UR ... hParams [MapValue] | tst.js:14:7:14:12 | params [MapValue] | provenance |  |
 | tst.js:14:17:14:42 | new URL ... cation) [searchParams, MapValue] | tst.js:14:16:14:43 | (new UR ... ation)) [searchParams, MapValue] | provenance |  |
 | tst.js:14:17:14:42 | new URL ... cation) [searchParams] | tst.js:14:16:14:43 | (new UR ... ation)) [searchParams] | provenance |  |
 | tst.js:14:25:14:41 | document.location | tst.js:14:17:14:42 | new URL ... cation) [searchParams, MapValue] | provenance |  |
 | tst.js:14:25:14:41 | document.location | tst.js:14:17:14:42 | new URL ... cation) [searchParams] | provenance |  |
 | tst.js:15:18:15:23 | params | tst.js:15:18:15:35 | params.get('name') | provenance | Config |
 | tst.js:15:18:15:23 | params [MapValue] | tst.js:15:18:15:35 | params.get('name') | provenance |  |
-| tst.js:17:7:17:61 | searchParams | tst.js:18:18:18:29 | searchParams | provenance |  |
-| tst.js:17:7:17:61 | searchParams [MapValue] | tst.js:18:18:18:29 | searchParams [MapValue] | provenance |  |
-| tst.js:17:22:17:61 | new URL ... ing(1)) | tst.js:17:7:17:61 | searchParams | provenance |  |
-| tst.js:17:22:17:61 | new URL ... ing(1)) [MapValue] | tst.js:17:7:17:61 | searchParams [MapValue] | provenance |  |
+| tst.js:17:7:17:18 | searchParams | tst.js:18:18:18:29 | searchParams | provenance |  |
+| tst.js:17:7:17:18 | searchParams [MapValue] | tst.js:18:18:18:29 | searchParams [MapValue] | provenance |  |
+| tst.js:17:22:17:61 | new URL ... ing(1)) | tst.js:17:7:17:18 | searchParams | provenance |  |
+| tst.js:17:22:17:61 | new URL ... ing(1)) [MapValue] | tst.js:17:7:17:18 | searchParams [MapValue] | provenance |  |
 | tst.js:17:42:17:47 | target | tst.js:17:42:17:60 | target.substring(1) | provenance |  |
 | tst.js:17:42:17:47 | target | tst.js:17:42:17:60 | target.substring(1) | provenance | Config |
 | tst.js:17:42:17:47 | target | tst.js:17:42:17:60 | target.substring(1) | provenance | Config |
@@ -613,31 +613,31 @@ edges
 | tst.js:58:1:58:27 | [,docum ... search] [1] | tst.js:58:46:58:46 | x | provenance |  |
 | tst.js:58:3:58:26 | documen ... .search | tst.js:58:1:58:27 | [,docum ... search] [1] | provenance |  |
 | tst.js:58:46:58:46 | x | tst.js:60:20:60:20 | x | provenance |  |
-| tst.js:93:7:93:44 | v | tst.js:95:18:95:18 | v | provenance |  |
-| tst.js:93:7:93:44 | v | tst.js:120:18:120:18 | v | provenance |  |
+| tst.js:93:7:93:7 | v | tst.js:95:18:95:18 | v | provenance |  |
+| tst.js:93:7:93:7 | v | tst.js:120:18:120:18 | v | provenance |  |
 | tst.js:93:11:93:34 | documen ... .search | tst.js:93:11:93:44 | documen ... bstr(1) | provenance |  |
 | tst.js:93:11:93:34 | documen ... .search | tst.js:93:11:93:44 | documen ... bstr(1) | provenance | Config |
-| tst.js:93:11:93:44 | documen ... bstr(1) | tst.js:93:7:93:44 | v | provenance |  |
+| tst.js:93:11:93:44 | documen ... bstr(1) | tst.js:93:7:93:7 | v | provenance |  |
 | tst.js:132:29:132:50 | window. ... .search | tst.js:135:29:135:29 | v | provenance |  |
 | tst.js:135:29:135:29 | v | tst.js:135:49:135:49 | v | provenance |  |
 | tst.js:142:40:142:61 | window. ... .search | tst.js:139:29:139:46 | xssSourceService() | provenance |  |
-| tst.js:161:9:161:41 | target | tst.js:164:28:164:33 | target | provenance |  |
-| tst.js:161:18:161:41 | documen ... .search | tst.js:161:9:161:41 | target | provenance |  |
-| tst.js:168:9:168:42 | tainted | tst.js:170:31:170:37 | tainted | provenance |  |
-| tst.js:168:9:168:42 | tainted | tst.js:172:42:172:48 | tainted | provenance |  |
-| tst.js:168:9:168:42 | tainted | tst.js:173:33:173:39 | tainted | provenance |  |
-| tst.js:168:9:168:42 | tainted | tst.js:175:54:175:60 | tainted | provenance |  |
-| tst.js:168:9:168:42 | tainted | tst.js:176:45:176:51 | tainted | provenance |  |
-| tst.js:168:9:168:42 | tainted | tst.js:177:49:177:55 | tainted | provenance |  |
-| tst.js:168:19:168:42 | documen ... .search | tst.js:168:9:168:42 | tainted | provenance |  |
-| tst.js:181:9:181:42 | tainted | tst.js:183:67:183:73 | tainted | provenance |  |
-| tst.js:181:9:181:42 | tainted | tst.js:184:67:184:73 | tainted | provenance |  |
-| tst.js:181:9:181:42 | tainted | tst.js:220:35:220:41 | tainted | provenance |  |
-| tst.js:181:9:181:42 | tainted | tst.js:222:20:222:26 | tainted | provenance |  |
-| tst.js:181:9:181:42 | tainted | tst.js:224:23:224:29 | tainted | provenance |  |
-| tst.js:181:9:181:42 | tainted | tst.js:225:23:225:29 | tainted | provenance |  |
-| tst.js:181:9:181:42 | tainted | tst.js:239:23:239:29 | tainted | provenance |  |
-| tst.js:181:19:181:42 | documen ... .search | tst.js:181:9:181:42 | tainted | provenance |  |
+| tst.js:161:9:161:14 | target | tst.js:164:28:164:33 | target | provenance |  |
+| tst.js:161:18:161:41 | documen ... .search | tst.js:161:9:161:14 | target | provenance |  |
+| tst.js:168:9:168:15 | tainted | tst.js:170:31:170:37 | tainted | provenance |  |
+| tst.js:168:9:168:15 | tainted | tst.js:172:42:172:48 | tainted | provenance |  |
+| tst.js:168:9:168:15 | tainted | tst.js:173:33:173:39 | tainted | provenance |  |
+| tst.js:168:9:168:15 | tainted | tst.js:175:54:175:60 | tainted | provenance |  |
+| tst.js:168:9:168:15 | tainted | tst.js:176:45:176:51 | tainted | provenance |  |
+| tst.js:168:9:168:15 | tainted | tst.js:177:49:177:55 | tainted | provenance |  |
+| tst.js:168:19:168:42 | documen ... .search | tst.js:168:9:168:15 | tainted | provenance |  |
+| tst.js:181:9:181:15 | tainted | tst.js:183:67:183:73 | tainted | provenance |  |
+| tst.js:181:9:181:15 | tainted | tst.js:184:67:184:73 | tainted | provenance |  |
+| tst.js:181:9:181:15 | tainted | tst.js:220:35:220:41 | tainted | provenance |  |
+| tst.js:181:9:181:15 | tainted | tst.js:222:20:222:26 | tainted | provenance |  |
+| tst.js:181:9:181:15 | tainted | tst.js:224:23:224:29 | tainted | provenance |  |
+| tst.js:181:9:181:15 | tainted | tst.js:225:23:225:29 | tainted | provenance |  |
+| tst.js:181:9:181:15 | tainted | tst.js:239:23:239:29 | tainted | provenance |  |
+| tst.js:181:19:181:42 | documen ... .search | tst.js:181:9:181:15 | tainted | provenance |  |
 | tst.js:183:67:183:73 | tainted | tst.js:184:67:184:73 | tainted | provenance |  |
 | tst.js:184:67:184:73 | tainted | tst.js:188:35:188:41 | tainted | provenance |  |
 | tst.js:184:67:184:73 | tainted | tst.js:190:46:190:52 | tainted | provenance |  |
@@ -658,8 +658,8 @@ edges
 | tst.js:225:23:225:29 | tainted | tst.js:239:23:239:29 | tainted | provenance |  |
 | tst.js:231:39:231:55 | props.propTainted | tst.js:235:60:235:82 | this.st ... Tainted | provenance |  |
 | tst.js:239:23:239:29 | tainted | tst.js:231:39:231:55 | props.propTainted | provenance |  |
-| tst.js:269:9:269:29 | tainted | tst.js:272:59:272:65 | tainted | provenance |  |
-| tst.js:269:19:269:29 | window.name | tst.js:269:9:269:29 | tainted | provenance |  |
+| tst.js:269:9:269:15 | tainted | tst.js:272:59:272:65 | tainted | provenance |  |
+| tst.js:269:19:269:29 | window.name | tst.js:269:9:269:15 | tainted | provenance |  |
 | tst.js:285:9:285:16 | location | tst.js:286:10:286:10 | e | provenance |  |
 | tst.js:286:10:286:10 | e | tst.js:287:20:287:20 | e | provenance |  |
 | tst.js:292:10:292:17 | location | tst.js:294:10:294:10 | e | provenance |  |
@@ -668,34 +668,34 @@ edges
 | tst.js:311:10:311:35 | new URL ... cation) [searchParams] | tst.js:315:16:315:30 | getTaintedUrl() [searchParams] | provenance |  |
 | tst.js:311:18:311:34 | document.location | tst.js:311:10:311:35 | new URL ... cation) [searchParams, MapValue] | provenance |  |
 | tst.js:311:18:311:34 | document.location | tst.js:311:10:311:35 | new URL ... cation) [searchParams] | provenance |  |
-| tst.js:315:7:315:43 | params | tst.js:316:18:316:23 | params | provenance |  |
-| tst.js:315:7:315:43 | params [MapValue] | tst.js:316:18:316:23 | params [MapValue] | provenance |  |
+| tst.js:315:7:315:12 | params | tst.js:316:18:316:23 | params | provenance |  |
+| tst.js:315:7:315:12 | params [MapValue] | tst.js:316:18:316:23 | params [MapValue] | provenance |  |
 | tst.js:315:16:315:30 | getTaintedUrl() [searchParams, MapValue] | tst.js:315:16:315:43 | getTain ... hParams [MapValue] | provenance |  |
 | tst.js:315:16:315:30 | getTaintedUrl() [searchParams] | tst.js:315:16:315:43 | getTain ... hParams | provenance |  |
-| tst.js:315:16:315:43 | getTain ... hParams | tst.js:315:7:315:43 | params | provenance |  |
-| tst.js:315:16:315:43 | getTain ... hParams [MapValue] | tst.js:315:7:315:43 | params [MapValue] | provenance |  |
+| tst.js:315:16:315:43 | getTain ... hParams | tst.js:315:7:315:12 | params | provenance |  |
+| tst.js:315:16:315:43 | getTain ... hParams [MapValue] | tst.js:315:7:315:12 | params [MapValue] | provenance |  |
 | tst.js:316:18:316:23 | params | tst.js:316:18:316:35 | params.get('name') | provenance | Config |
 | tst.js:316:18:316:23 | params [MapValue] | tst.js:316:18:316:35 | params.get('name') | provenance |  |
 | tst.js:325:12:325:37 | new URL ... cation) [hash] | tst.js:327:5:327:12 | getUrl() [hash] | provenance |  |
 | tst.js:325:20:325:36 | document.location | tst.js:325:12:325:37 | new URL ... cation) [hash] | provenance |  |
 | tst.js:327:5:327:12 | getUrl() [hash] | tst.js:327:5:327:17 | getUrl().hash | provenance |  |
 | tst.js:327:5:327:17 | getUrl().hash | tst.js:327:5:327:30 | getUrl( ... ring(1) | provenance | Config |
-| tst.js:332:7:332:39 | target | tst.js:333:12:333:17 | target | provenance |  |
-| tst.js:332:16:332:39 | documen ... .search | tst.js:332:7:332:39 | target | provenance |  |
-| tst.js:339:10:339:42 | target | tst.js:340:16:340:21 | target | provenance |  |
-| tst.js:339:10:339:42 | target | tst.js:341:20:341:25 | target | provenance |  |
-| tst.js:339:19:339:42 | documen ... .search | tst.js:339:10:339:42 | target | provenance |  |
+| tst.js:332:7:332:12 | target | tst.js:333:12:333:17 | target | provenance |  |
+| tst.js:332:16:332:39 | documen ... .search | tst.js:332:7:332:12 | target | provenance |  |
+| tst.js:339:10:339:15 | target | tst.js:340:16:340:21 | target | provenance |  |
+| tst.js:339:10:339:15 | target | tst.js:341:20:341:25 | target | provenance |  |
+| tst.js:339:19:339:42 | documen ... .search | tst.js:339:10:339:15 | target | provenance |  |
 | tst.js:340:16:340:21 | target | tst.js:341:20:341:25 | target | provenance |  |
 | tst.js:341:20:341:25 | target | tst.js:344:21:344:26 | target | provenance |  |
 | tst.js:341:20:341:25 | target | tst.js:347:18:347:23 | target | provenance |  |
-| tst.js:355:7:355:39 | target | tst.js:357:18:357:23 | target | provenance |  |
-| tst.js:355:16:355:39 | documen ... .search | tst.js:355:7:355:39 | target | provenance |  |
-| tst.js:364:7:364:39 | target | tst.js:367:18:367:23 | target | provenance |  |
-| tst.js:364:7:364:39 | target | tst.js:369:18:369:23 | target | provenance |  |
-| tst.js:364:7:364:39 | target | tst.js:380:18:380:23 | target | provenance |  |
-| tst.js:364:7:364:39 | target | tst.js:389:18:389:23 | target | provenance |  |
-| tst.js:364:7:364:39 | target | tst.js:391:19:391:24 | target | provenance |  |
-| tst.js:364:16:364:39 | documen ... .search | tst.js:364:7:364:39 | target | provenance |  |
+| tst.js:355:7:355:12 | target | tst.js:357:18:357:23 | target | provenance |  |
+| tst.js:355:16:355:39 | documen ... .search | tst.js:355:7:355:12 | target | provenance |  |
+| tst.js:364:7:364:12 | target | tst.js:367:18:367:23 | target | provenance |  |
+| tst.js:364:7:364:12 | target | tst.js:369:18:369:23 | target | provenance |  |
+| tst.js:364:7:364:12 | target | tst.js:380:18:380:23 | target | provenance |  |
+| tst.js:364:7:364:12 | target | tst.js:389:18:389:23 | target | provenance |  |
+| tst.js:364:7:364:12 | target | tst.js:391:19:391:24 | target | provenance |  |
+| tst.js:364:16:364:39 | documen ... .search | tst.js:364:7:364:12 | target | provenance |  |
 | tst.js:369:18:369:23 | target | tst.js:369:18:369:29 | target.taint | provenance |  |
 | tst.js:374:3:374:8 | [post update] target [taint3] | tst.js:375:18:375:23 | target [taint3] | provenance |  |
 | tst.js:374:19:374:42 | documen ... .search | tst.js:374:3:374:8 | [post update] target [taint3] | provenance |  |
@@ -708,64 +708,64 @@ edges
 | tst.js:391:19:391:24 | target [taint8] | tst.js:391:19:391:31 | target.taint8 | provenance |  |
 | tst.js:391:19:391:31 | target.taint8 | tst.js:391:3:391:8 | [post update] target [taint8] | provenance |  |
 | tst.js:392:18:392:23 | target [taint8] | tst.js:392:18:392:30 | target.taint8 | provenance |  |
-| tst.js:399:7:399:46 | payload | tst.js:400:18:400:24 | payload | provenance |  |
+| tst.js:399:7:399:13 | payload | tst.js:400:18:400:24 | payload | provenance |  |
 | tst.js:399:17:399:36 | window.location.hash | tst.js:399:17:399:46 | window. ... bstr(1) | provenance |  |
 | tst.js:399:17:399:36 | window.location.hash | tst.js:399:17:399:46 | window. ... bstr(1) | provenance | Config |
-| tst.js:399:17:399:46 | window. ... bstr(1) | tst.js:399:7:399:46 | payload | provenance |  |
-| tst.js:402:7:402:55 | match | tst.js:404:20:404:24 | match | provenance |  |
+| tst.js:399:17:399:46 | window. ... bstr(1) | tst.js:399:7:399:13 | payload | provenance |  |
+| tst.js:402:7:402:11 | match | tst.js:404:20:404:24 | match | provenance |  |
 | tst.js:402:15:402:34 | window.location.hash | tst.js:402:15:402:55 | window. ... (\\w+)/) | provenance |  |
-| tst.js:402:15:402:55 | window. ... (\\w+)/) | tst.js:402:7:402:55 | match | provenance |  |
+| tst.js:402:15:402:55 | window. ... (\\w+)/) | tst.js:402:7:402:11 | match | provenance |  |
 | tst.js:404:20:404:24 | match | tst.js:404:20:404:27 | match[1] | provenance |  |
 | tst.js:407:18:407:37 | window.location.hash | tst.js:407:18:407:48 | window. ... it('#') [1] | provenance | Config |
 | tst.js:407:18:407:48 | window. ... it('#') [1] | tst.js:407:18:407:51 | window. ... '#')[1] | provenance |  |
-| tst.js:411:7:411:39 | target | tst.js:413:18:413:23 | target | provenance |  |
-| tst.js:411:16:411:39 | documen ... .search | tst.js:411:7:411:39 | target | provenance |  |
+| tst.js:411:7:411:12 | target | tst.js:413:18:413:23 | target | provenance |  |
+| tst.js:411:16:411:39 | documen ... .search | tst.js:411:7:411:12 | target | provenance |  |
 | tst.js:413:18:413:23 | target | tst.js:413:18:413:89 | target. ... data>') | provenance |  |
-| tst.js:419:6:419:38 | source | tst.js:423:28:423:33 | source | provenance |  |
-| tst.js:419:6:419:38 | source | tst.js:424:33:424:38 | source | provenance |  |
-| tst.js:419:6:419:38 | source | tst.js:425:34:425:39 | source | provenance |  |
-| tst.js:419:6:419:38 | source | tst.js:426:41:426:46 | source | provenance |  |
-| tst.js:419:6:419:38 | source | tst.js:427:44:427:49 | source | provenance |  |
-| tst.js:419:6:419:38 | source | tst.js:428:32:428:37 | source | provenance |  |
-| tst.js:419:15:419:38 | documen ... .search | tst.js:419:6:419:38 | source | provenance |  |
-| tst.js:436:7:436:39 | source | tst.js:438:18:438:23 | source | provenance |  |
-| tst.js:436:7:436:39 | source | tst.js:439:36:439:41 | source | provenance |  |
-| tst.js:436:16:436:39 | documen ... .search | tst.js:436:7:436:39 | source | provenance |  |
+| tst.js:419:6:419:11 | source | tst.js:423:28:423:33 | source | provenance |  |
+| tst.js:419:6:419:11 | source | tst.js:424:33:424:38 | source | provenance |  |
+| tst.js:419:6:419:11 | source | tst.js:425:34:425:39 | source | provenance |  |
+| tst.js:419:6:419:11 | source | tst.js:426:41:426:46 | source | provenance |  |
+| tst.js:419:6:419:11 | source | tst.js:427:44:427:49 | source | provenance |  |
+| tst.js:419:6:419:11 | source | tst.js:428:32:428:37 | source | provenance |  |
+| tst.js:419:15:419:38 | documen ... .search | tst.js:419:6:419:11 | source | provenance |  |
+| tst.js:436:7:436:12 | source | tst.js:438:18:438:23 | source | provenance |  |
+| tst.js:436:7:436:12 | source | tst.js:439:36:439:41 | source | provenance |  |
+| tst.js:436:16:436:39 | documen ... .search | tst.js:436:7:436:12 | source | provenance |  |
 | tst.js:439:36:439:41 | source | tst.js:439:18:439:42 | ansiToH ... source) | provenance |  |
-| tst.js:443:6:443:38 | source | tst.js:446:21:446:26 | source | provenance |  |
-| tst.js:443:6:443:38 | source | tst.js:448:19:448:24 | source | provenance |  |
-| tst.js:443:6:443:38 | source | tst.js:450:20:450:25 | source | provenance |  |
-| tst.js:443:15:443:38 | documen ... .search | tst.js:443:6:443:38 | source | provenance |  |
-| tst.js:454:7:454:46 | url | tst.js:456:19:456:21 | url | provenance |  |
-| tst.js:454:7:454:46 | url | tst.js:457:26:457:28 | url | provenance |  |
-| tst.js:454:7:454:46 | url | tst.js:458:25:458:27 | url | provenance |  |
-| tst.js:454:7:454:46 | url | tst.js:459:20:459:22 | url | provenance |  |
-| tst.js:454:7:454:46 | url | tst.js:469:22:469:24 | url | provenance |  |
+| tst.js:443:6:443:11 | source | tst.js:446:21:446:26 | source | provenance |  |
+| tst.js:443:6:443:11 | source | tst.js:448:19:448:24 | source | provenance |  |
+| tst.js:443:6:443:11 | source | tst.js:450:20:450:25 | source | provenance |  |
+| tst.js:443:15:443:38 | documen ... .search | tst.js:443:6:443:11 | source | provenance |  |
+| tst.js:454:7:454:9 | url | tst.js:456:19:456:21 | url | provenance |  |
+| tst.js:454:7:454:9 | url | tst.js:457:26:457:28 | url | provenance |  |
+| tst.js:454:7:454:9 | url | tst.js:458:25:458:27 | url | provenance |  |
+| tst.js:454:7:454:9 | url | tst.js:459:20:459:22 | url | provenance |  |
+| tst.js:454:7:454:9 | url | tst.js:469:22:469:24 | url | provenance |  |
 | tst.js:454:13:454:36 | documen ... .search | tst.js:454:13:454:46 | documen ... bstr(1) | provenance | Config |
-| tst.js:454:13:454:46 | documen ... bstr(1) | tst.js:454:7:454:46 | url | provenance |  |
+| tst.js:454:13:454:46 | documen ... bstr(1) | tst.js:454:7:454:9 | url | provenance |  |
 | tst.js:474:23:474:35 | location.hash | tst.js:474:23:474:45 | locatio ... bstr(1) | provenance | Config |
 | tst.js:477:18:477:30 | location.hash | tst.js:477:18:477:40 | locatio ... bstr(1) | provenance | Config |
 | tst.js:484:43:484:62 | window.location.hash | tst.js:484:33:484:63 | decodeU ... n.hash) | provenance |  |
-| tst.js:491:7:491:39 | target | tst.js:492:18:492:23 | target | provenance |  |
-| tst.js:491:16:491:39 | documen ... .search | tst.js:491:7:491:39 | target | provenance |  |
+| tst.js:491:7:491:12 | target | tst.js:492:18:492:23 | target | provenance |  |
+| tst.js:491:16:491:39 | documen ... .search | tst.js:491:7:491:12 | target | provenance |  |
 | tst.js:492:18:492:23 | target | tst.js:492:18:492:54 | target. ... "), '') | provenance |  |
-| tst.js:498:7:498:26 | source | tst.js:499:27:499:32 | source | provenance |  |
-| tst.js:498:16:498:26 | window.name | tst.js:498:7:498:26 | source | provenance |  |
+| tst.js:498:7:498:12 | source | tst.js:499:27:499:32 | source | provenance |  |
+| tst.js:498:16:498:26 | window.name | tst.js:498:7:498:12 | source | provenance |  |
 | tst.js:499:27:499:32 | source | tst.js:499:18:499:33 | unescape(source) | provenance |  |
-| typeahead.js:20:13:20:45 | target | typeahead.js:21:12:21:17 | target | provenance |  |
-| typeahead.js:20:22:20:45 | documen ... .search | typeahead.js:20:13:20:45 | target | provenance |  |
+| typeahead.js:20:13:20:18 | target | typeahead.js:21:12:21:17 | target | provenance |  |
+| typeahead.js:20:22:20:45 | documen ... .search | typeahead.js:20:13:20:18 | target | provenance |  |
 | typeahead.js:21:12:21:17 | target | typeahead.js:24:30:24:32 | val | provenance |  |
 | typeahead.js:24:30:24:32 | val | typeahead.js:25:18:25:20 | val | provenance |  |
 | v-html.vue:6:42:6:58 | document.location | v-html.vue:2:8:2:23 | v-html=tainted | provenance |  |
-| various-concat-obfuscations.js:2:6:2:39 | tainted | various-concat-obfuscations.js:4:14:4:20 | tainted | provenance |  |
-| various-concat-obfuscations.js:2:6:2:39 | tainted | various-concat-obfuscations.js:5:12:5:18 | tainted | provenance |  |
-| various-concat-obfuscations.js:2:6:2:39 | tainted | various-concat-obfuscations.js:6:19:6:25 | tainted | provenance |  |
-| various-concat-obfuscations.js:2:6:2:39 | tainted | various-concat-obfuscations.js:7:14:7:20 | tainted | provenance |  |
-| various-concat-obfuscations.js:2:6:2:39 | tainted | various-concat-obfuscations.js:9:19:9:25 | tainted | provenance |  |
-| various-concat-obfuscations.js:2:6:2:39 | tainted | various-concat-obfuscations.js:10:16:10:22 | tainted | provenance |  |
-| various-concat-obfuscations.js:2:6:2:39 | tainted | various-concat-obfuscations.js:11:24:11:30 | tainted | provenance |  |
-| various-concat-obfuscations.js:2:6:2:39 | tainted | various-concat-obfuscations.js:12:19:12:25 | tainted | provenance |  |
-| various-concat-obfuscations.js:2:16:2:39 | documen ... .search | various-concat-obfuscations.js:2:6:2:39 | tainted | provenance |  |
+| various-concat-obfuscations.js:2:6:2:12 | tainted | various-concat-obfuscations.js:4:14:4:20 | tainted | provenance |  |
+| various-concat-obfuscations.js:2:6:2:12 | tainted | various-concat-obfuscations.js:5:12:5:18 | tainted | provenance |  |
+| various-concat-obfuscations.js:2:6:2:12 | tainted | various-concat-obfuscations.js:6:19:6:25 | tainted | provenance |  |
+| various-concat-obfuscations.js:2:6:2:12 | tainted | various-concat-obfuscations.js:7:14:7:20 | tainted | provenance |  |
+| various-concat-obfuscations.js:2:6:2:12 | tainted | various-concat-obfuscations.js:9:19:9:25 | tainted | provenance |  |
+| various-concat-obfuscations.js:2:6:2:12 | tainted | various-concat-obfuscations.js:10:16:10:22 | tainted | provenance |  |
+| various-concat-obfuscations.js:2:6:2:12 | tainted | various-concat-obfuscations.js:11:24:11:30 | tainted | provenance |  |
+| various-concat-obfuscations.js:2:6:2:12 | tainted | various-concat-obfuscations.js:12:19:12:25 | tainted | provenance |  |
+| various-concat-obfuscations.js:2:16:2:39 | documen ... .search | various-concat-obfuscations.js:2:6:2:12 | tainted | provenance |  |
 | various-concat-obfuscations.js:4:14:4:20 | tainted | various-concat-obfuscations.js:4:4:4:31 | "<div>" ... </div>" | provenance | Config |
 | various-concat-obfuscations.js:5:12:5:18 | tainted | various-concat-obfuscations.js:5:4:5:26 | `<div>$ ... </div>` | provenance | Config |
 | various-concat-obfuscations.js:6:4:6:26 | "<div>" ... ainted) | various-concat-obfuscations.js:6:4:6:43 | "<div>" ... /div>") | provenance |  |
@@ -795,17 +795,17 @@ edges
 | various-concat-obfuscations.js:21:17:21:40 | documen ... .search | various-concat-obfuscations.js:21:17:21:46 | documen ... h.attrs | provenance |  |
 | various-concat-obfuscations.js:21:17:21:46 | documen ... h.attrs | various-concat-obfuscations.js:17:24:17:28 | attrs | provenance |  |
 | various-concat-obfuscations.js:21:17:21:46 | documen ... h.attrs | various-concat-obfuscations.js:21:4:21:47 | indirec ... .attrs) | provenance | Config |
-| winjs.js:2:7:2:53 | tainted | winjs.js:3:43:3:49 | tainted | provenance |  |
-| winjs.js:2:7:2:53 | tainted | winjs.js:4:43:4:49 | tainted | provenance |  |
+| winjs.js:2:7:2:13 | tainted | winjs.js:3:43:3:49 | tainted | provenance |  |
+| winjs.js:2:7:2:13 | tainted | winjs.js:4:43:4:49 | tainted | provenance |  |
 | winjs.js:2:17:2:40 | documen ... .search | winjs.js:2:17:2:53 | documen ... ring(1) | provenance |  |
 | winjs.js:2:17:2:40 | documen ... .search | winjs.js:2:17:2:53 | documen ... ring(1) | provenance | Config |
-| winjs.js:2:17:2:53 | documen ... ring(1) | winjs.js:2:7:2:53 | tainted | provenance |  |
+| winjs.js:2:17:2:53 | documen ... ring(1) | winjs.js:2:7:2:13 | tainted | provenance |  |
 nodes
 | addEventListener.js:1:43:1:47 | event | semmle.label | event |
 | addEventListener.js:2:20:2:24 | event | semmle.label | event |
 | addEventListener.js:2:20:2:29 | event.data | semmle.label | event.data |
-| addEventListener.js:5:43:5:48 | data | semmle.label | data |
 | addEventListener.js:5:43:5:48 | {data} | semmle.label | {data} |
+| addEventListener.js:5:44:5:47 | data | semmle.label | data |
 | addEventListener.js:6:20:6:23 | data | semmle.label | data |
 | addEventListener.js:10:21:10:25 | event | semmle.label | event |
 | addEventListener.js:12:24:12:28 | event | semmle.label | event |
@@ -855,19 +855,19 @@ nodes
 | classnames.js:17:32:17:79 | `<span  ... <span>` | semmle.label | `<span  ... <span>` |
 | classnames.js:17:48:17:64 | clsx(window.name) | semmle.label | clsx(window.name) |
 | classnames.js:17:53:17:63 | window.name | semmle.label | window.name |
-| clipboard.ts:8:11:8:51 | html | semmle.label | html |
+| clipboard.ts:8:11:8:14 | html | semmle.label | html |
 | clipboard.ts:8:18:8:51 | clipboa ... /html') | semmle.label | clipboa ... /html') |
 | clipboard.ts:15:25:15:28 | html | semmle.label | html |
 | clipboard.ts:24:23:24:58 | e.clipb ... /html') | semmle.label | e.clipb ... /html') |
 | clipboard.ts:29:19:29:54 | e.clipb ... /html') | semmle.label | e.clipb ... /html') |
 | clipboard.ts:33:19:33:68 | e.origi ... /html') | semmle.label | e.origi ... /html') |
-| clipboard.ts:43:15:43:55 | html | semmle.label | html |
+| clipboard.ts:43:15:43:18 | html | semmle.label | html |
 | clipboard.ts:43:22:43:55 | clipboa ... /html') | semmle.label | clipboa ... /html') |
 | clipboard.ts:50:29:50:32 | html | semmle.label | html |
-| clipboard.ts:71:13:71:62 | droppedHtml | semmle.label | droppedHtml |
+| clipboard.ts:71:13:71:23 | droppedHtml | semmle.label | droppedHtml |
 | clipboard.ts:71:27:71:62 | e.clipb ... /html') | semmle.label | e.clipb ... /html') |
 | clipboard.ts:73:29:73:39 | droppedHtml | semmle.label | droppedHtml |
-| clipboard.ts:98:15:98:54 | html | semmle.label | html |
+| clipboard.ts:98:15:98:18 | html | semmle.label | html |
 | clipboard.ts:98:22:98:54 | dataTra ... /html') | semmle.label | dataTra ... /html') |
 | clipboard.ts:99:23:99:26 | html | semmle.label | html |
 | custom-element.js:5:26:5:36 | window.name | semmle.label | window.name |
@@ -876,7 +876,7 @@ nodes
 | d3.js:12:20:12:29 | getTaint() | semmle.label | getTaint() |
 | d3.js:14:20:14:29 | getTaint() | semmle.label | getTaint() |
 | d3.js:21:15:21:24 | getTaint() | semmle.label | getTaint() |
-| dates.js:9:9:9:69 | taint | semmle.label | taint |
+| dates.js:9:9:9:13 | taint | semmle.label | taint |
 | dates.js:9:17:9:69 | decodeU ... ing(1)) | semmle.label | decodeU ... ing(1)) |
 | dates.js:9:36:9:55 | window.location.hash | semmle.label | window.location.hash |
 | dates.js:9:36:9:68 | window. ... ring(1) | semmle.label | window. ... ring(1) |
@@ -898,7 +898,7 @@ nodes
 | dates.js:21:31:21:68 | `Time i ... aint)}` | semmle.label | `Time i ... aint)}` |
 | dates.js:21:42:21:66 | dayjs(t ... (taint) | semmle.label | dayjs(t ... (taint) |
 | dates.js:21:61:21:65 | taint | semmle.label | taint |
-| dates.js:30:9:30:69 | taint | semmle.label | taint |
+| dates.js:30:9:30:13 | taint | semmle.label | taint |
 | dates.js:30:17:30:69 | decodeU ... ing(1)) | semmle.label | decodeU ... ing(1)) |
 | dates.js:30:36:30:55 | window.location.hash | semmle.label | window.location.hash |
 | dates.js:30:36:30:68 | window. ... ring(1) | semmle.label | window. ... ring(1) |
@@ -914,7 +914,7 @@ nodes
 | dates.js:40:31:40:84 | `Time i ... aint)}` | semmle.label | `Time i ... aint)}` |
 | dates.js:40:42:40:82 | dayjs.f ...  taint) | semmle.label | dayjs.f ...  taint) |
 | dates.js:40:77:40:81 | taint | semmle.label | taint |
-| dates.js:46:9:46:69 | taint | semmle.label | taint |
+| dates.js:46:9:46:13 | taint | semmle.label | taint |
 | dates.js:46:17:46:69 | decodeU ... ing(1)) | semmle.label | decodeU ... ing(1)) |
 | dates.js:46:36:46:55 | window.location.hash | semmle.label | window.location.hash |
 | dates.js:46:36:46:68 | window. ... ring(1) | semmle.label | window. ... ring(1) |
@@ -927,7 +927,7 @@ nodes
 | dates.js:50:31:50:104 | `Time i ... aint)}` | semmle.label | `Time i ... aint)}` |
 | dates.js:50:42:50:102 | DateTim ... (taint) | semmle.label | DateTim ... (taint) |
 | dates.js:50:97:50:101 | taint | semmle.label | taint |
-| dates.js:54:9:54:69 | taint | semmle.label | taint |
+| dates.js:54:9:54:13 | taint | semmle.label | taint |
 | dates.js:54:17:54:69 | decodeU ... ing(1)) | semmle.label | decodeU ... ing(1)) |
 | dates.js:54:36:54:55 | window.location.hash | semmle.label | window.location.hash |
 | dates.js:54:36:54:68 | window. ... ring(1) | semmle.label | window. ... ring(1) |
@@ -941,16 +941,16 @@ nodes
 | dates.js:61:42:61:86 | dayjs.s ... (taint) | semmle.label | dayjs.s ... (taint) |
 | dates.js:61:81:61:85 | taint | semmle.label | taint |
 | dom.js:4:20:4:30 | window.name | semmle.label | window.name |
-| dragAndDrop.ts:8:11:8:50 | html | semmle.label | html |
+| dragAndDrop.ts:8:11:8:14 | html | semmle.label | html |
 | dragAndDrop.ts:8:18:8:50 | dataTra ... /html') | semmle.label | dataTra ... /html') |
 | dragAndDrop.ts:15:25:15:28 | html | semmle.label | html |
 | dragAndDrop.ts:24:23:24:57 | e.dataT ... /html') | semmle.label | e.dataT ... /html') |
 | dragAndDrop.ts:29:19:29:53 | e.dataT ... /html') | semmle.label | e.dataT ... /html') |
 | dragAndDrop.ts:33:19:33:67 | e.origi ... /html') | semmle.label | e.origi ... /html') |
-| dragAndDrop.ts:43:15:43:54 | html | semmle.label | html |
+| dragAndDrop.ts:43:15:43:18 | html | semmle.label | html |
 | dragAndDrop.ts:43:22:43:54 | dataTra ... /html') | semmle.label | dataTra ... /html') |
 | dragAndDrop.ts:50:29:50:32 | html | semmle.label | html |
-| dragAndDrop.ts:71:13:71:61 | droppedHtml | semmle.label | droppedHtml |
+| dragAndDrop.ts:71:13:71:23 | droppedHtml | semmle.label | droppedHtml |
 | dragAndDrop.ts:71:27:71:61 | e.dataT ... /html') | semmle.label | e.dataT ... /html') |
 | dragAndDrop.ts:73:29:73:39 | droppedHtml | semmle.label | droppedHtml |
 | event-handler-receiver.js:2:31:2:83 | '<h2><a ... ></h2>' | semmle.label | '<h2><a ... ></h2>' |
@@ -958,7 +958,7 @@ nodes
 | express.js:6:15:6:33 | req.param("wobble") | semmle.label | req.param("wobble") |
 | jquery-declare-any.ts:6:7:6:17 | window.name | semmle.label | window.name |
 | jquery-declare-type.ts:6:7:6:17 | window.name | semmle.label | window.name |
-| jquery.js:2:7:2:40 | tainted | semmle.label | tainted |
+| jquery.js:2:7:2:13 | tainted | semmle.label | tainted |
 | jquery.js:2:17:2:40 | documen ... .search | semmle.label | documen ... .search |
 | jquery.js:4:5:4:11 | tainted | semmle.label | tainted |
 | jquery.js:5:13:5:19 | tainted | semmle.label | tainted |
@@ -977,7 +977,7 @@ nodes
 | jquery.js:16:19:16:64 | decodeU ... ring()) | semmle.label | decodeU ... ring()) |
 | jquery.js:16:38:16:52 | window.location | semmle.label | window.location |
 | jquery.js:16:38:16:63 | window. ... tring() | semmle.label | window. ... tring() |
-| jquery.js:18:7:18:33 | hash | semmle.label | hash |
+| jquery.js:18:7:18:10 | hash | semmle.label | hash |
 | jquery.js:18:14:18:33 | window.location.hash | semmle.label | window.location.hash |
 | jquery.js:21:5:21:8 | hash | semmle.label | hash |
 | jquery.js:21:5:21:21 | hash.substring(1) | semmle.label | hash.substring(1) |
@@ -996,14 +996,14 @@ nodes
 | jquery.js:36:25:36:31 | tainted | semmle.label | tainted |
 | jquery.js:37:25:37:37 | () => tainted | semmle.label | () => tainted |
 | jquery.js:37:31:37:37 | tainted | semmle.label | tainted |
-| json-stringify.jsx:5:9:5:36 | locale | semmle.label | locale |
+| json-stringify.jsx:5:9:5:14 | locale | semmle.label | locale |
 | json-stringify.jsx:5:18:5:36 | req.param("locale") | semmle.label | req.param("locale") |
 | json-stringify.jsx:11:51:11:56 | locale | semmle.label | locale |
 | json-stringify.jsx:19:56:19:61 | locale | semmle.label | locale |
 | json-stringify.jsx:31:40:31:61 | JSON.st ... locale) | semmle.label | JSON.st ... locale) |
 | json-stringify.jsx:31:55:31:60 | locale | semmle.label | locale |
 | json-stringify.jsx:35:40:35:61 | JSON.st ... jsonLD) | semmle.label | JSON.st ... jsonLD) |
-| jwt-server.js:7:9:7:35 | taint | semmle.label | taint |
+| jwt-server.js:7:9:7:13 | taint | semmle.label | taint |
 | jwt-server.js:7:17:7:35 | req.param("wobble") | semmle.label | req.param("wobble") |
 | jwt-server.js:9:16:9:20 | taint | semmle.label | taint |
 | jwt-server.js:9:55:9:61 | decoded | semmle.label | decoded |
@@ -1011,30 +1011,30 @@ nodes
 | jwt-server.js:10:19:10:29 | decoded.foo | semmle.label | decoded.foo |
 | nodemailer.js:13:11:13:69 | `Hi, yo ... sage}.` | semmle.label | `Hi, yo ... sage}.` |
 | nodemailer.js:13:50:13:66 | req.query.message | semmle.label | req.query.message |
-| optionalSanitizer.js:2:7:2:39 | target | semmle.label | target |
+| optionalSanitizer.js:2:7:2:12 | target | semmle.label | target |
 | optionalSanitizer.js:2:16:2:39 | documen ... .search | semmle.label | documen ... .search |
 | optionalSanitizer.js:6:18:6:23 | target | semmle.label | target |
-| optionalSanitizer.js:8:7:8:22 | tainted | semmle.label | tainted |
+| optionalSanitizer.js:8:7:8:13 | tainted | semmle.label | tainted |
 | optionalSanitizer.js:8:17:8:22 | target | semmle.label | target |
 | optionalSanitizer.js:9:18:9:24 | tainted | semmle.label | tainted |
 | optionalSanitizer.js:15:9:15:14 | target | semmle.label | target |
 | optionalSanitizer.js:16:18:16:18 | x | semmle.label | x |
 | optionalSanitizer.js:17:20:17:20 | x | semmle.label | x |
-| optionalSanitizer.js:26:7:26:39 | target | semmle.label | target |
+| optionalSanitizer.js:26:7:26:12 | target | semmle.label | target |
 | optionalSanitizer.js:26:16:26:39 | documen ... .search | semmle.label | documen ... .search |
 | optionalSanitizer.js:28:24:28:24 | x | semmle.label | x |
 | optionalSanitizer.js:29:12:29:12 | x | semmle.label | x |
-| optionalSanitizer.js:31:7:31:23 | tainted2 | semmle.label | tainted2 |
+| optionalSanitizer.js:31:7:31:14 | tainted2 | semmle.label | tainted2 |
 | optionalSanitizer.js:31:18:31:23 | target | semmle.label | target |
 | optionalSanitizer.js:32:18:32:25 | tainted2 | semmle.label | tainted2 |
-| optionalSanitizer.js:34:5:34:36 | tainted2 | semmle.label | tainted2 |
+| optionalSanitizer.js:34:5:34:12 | tainted2 | semmle.label | tainted2 |
 | optionalSanitizer.js:34:16:34:36 | sanitiz ... inted2) | semmle.label | sanitiz ... inted2) |
 | optionalSanitizer.js:34:28:34:35 | tainted2 | semmle.label | tainted2 |
 | optionalSanitizer.js:36:18:36:25 | tainted2 | semmle.label | tainted2 |
-| optionalSanitizer.js:38:7:38:23 | tainted3 | semmle.label | tainted3 |
+| optionalSanitizer.js:38:7:38:14 | tainted3 | semmle.label | tainted3 |
 | optionalSanitizer.js:38:18:38:23 | target | semmle.label | target |
 | optionalSanitizer.js:39:18:39:25 | tainted3 | semmle.label | tainted3 |
-| optionalSanitizer.js:41:5:41:36 | tainted3 | semmle.label | tainted3 |
+| optionalSanitizer.js:41:5:41:12 | tainted3 | semmle.label | tainted3 |
 | optionalSanitizer.js:41:16:41:36 | sanitiz ... inted3) | semmle.label | sanitiz ... inted3) |
 | optionalSanitizer.js:41:28:41:35 | tainted3 | semmle.label | tainted3 |
 | optionalSanitizer.js:43:18:43:25 | tainted3 | semmle.label | tainted3 |
@@ -1045,7 +1045,7 @@ nodes
 | pages/[id].jsx:3:30:3:35 | params [id] | semmle.label | params [id] |
 | pages/[id].jsx:3:30:3:35 | params [q] | semmle.label | params [q] |
 | pages/[id].jsx:5:9:5:14 | { id } | semmle.label | { id } |
-| pages/[id].jsx:5:9:5:29 | id | semmle.label | id |
+| pages/[id].jsx:5:11:5:12 | id | semmle.label | id |
 | pages/[id].jsx:5:18:5:29 | router.query | semmle.label | router.query |
 | pages/[id].jsx:10:44:10:45 | id | semmle.label | id |
 | pages/[id].jsx:13:44:13:49 | params [id] | semmle.label | params [id] |
@@ -1058,7 +1058,7 @@ nodes
 | pages/[id].jsx:25:11:25:33 | context ... d \|\| "" | semmle.label | context ... d \|\| "" |
 | pages/[id].jsx:26:10:26:22 | context.query | semmle.label | context.query |
 | pages/[id].jsx:26:10:26:36 | context ... r \|\| "" | semmle.label | context ... r \|\| "" |
-| react-native.js:7:7:7:33 | tainted | semmle.label | tainted |
+| react-native.js:7:7:7:13 | tainted | semmle.label | tainted |
 | react-native.js:7:17:7:33 | req.param("code") | semmle.label | req.param("code") |
 | react-native.js:8:18:8:24 | tainted | semmle.label | tainted |
 | react-native.js:9:27:9:33 | tainted | semmle.label | tainted |
@@ -1072,13 +1072,13 @@ nodes
 | react-use-router.js:23:43:23:61 | router.query.foobar | semmle.label | router.query.foobar |
 | react-use-router.js:33:21:33:32 | router.query | semmle.label | router.query |
 | react-use-router.js:33:21:33:39 | router.query.foobar | semmle.label | router.query.foobar |
-| react-use-state.js:4:9:4:49 | state | semmle.label | state |
+| react-use-state.js:4:10:4:14 | state | semmle.label | state |
 | react-use-state.js:4:38:4:48 | window.name | semmle.label | window.name |
 | react-use-state.js:5:51:5:55 | state | semmle.label | state |
-| react-use-state.js:9:9:9:43 | state | semmle.label | state |
+| react-use-state.js:9:10:9:14 | state | semmle.label | state |
 | react-use-state.js:10:14:10:24 | window.name | semmle.label | window.name |
 | react-use-state.js:11:51:11:55 | state | semmle.label | state |
-| react-use-state.js:15:9:15:43 | state | semmle.label | state |
+| react-use-state.js:15:10:15:14 | state | semmle.label | state |
 | react-use-state.js:15:10:15:14 | state | semmle.label | state |
 | react-use-state.js:16:20:16:30 | window.name | semmle.label | window.name |
 | react-use-state.js:17:51:17:55 | state | semmle.label | state |
@@ -1086,7 +1086,7 @@ nodes
 | react-use-state.js:22:14:22:17 | prev | semmle.label | prev |
 | react-use-state.js:23:35:23:38 | prev | semmle.label | prev |
 | react-use-state.js:25:20:25:30 | window.name | semmle.label | window.name |
-| sanitiser.js:16:7:16:27 | tainted | semmle.label | tainted |
+| sanitiser.js:16:7:16:13 | tainted | semmle.label | tainted |
 | sanitiser.js:16:17:16:27 | window.name | semmle.label | window.name |
 | sanitiser.js:23:21:23:44 | '<b>' + ...  '</b>' | semmle.label | '<b>' + ...  '</b>' |
 | sanitiser.js:23:29:23:35 | tainted | semmle.label | tainted |
@@ -1104,7 +1104,7 @@ nodes
 | stored-xss.js:3:35:3:58 | documen ... .search | semmle.label | documen ... .search |
 | stored-xss.js:5:20:5:52 | session ... ssion') | semmle.label | session ... ssion') |
 | stored-xss.js:8:20:8:48 | localSt ... local') | semmle.label | localSt ... local') |
-| stored-xss.js:10:9:10:44 | href | semmle.label | href |
+| stored-xss.js:10:9:10:12 | href | semmle.label | href |
 | stored-xss.js:10:16:10:44 | localSt ... local') | semmle.label | localSt ... local') |
 | stored-xss.js:12:20:12:54 | "<a hre ... ar</a>" | semmle.label | "<a hre ... ar</a>" |
 | stored-xss.js:12:35:12:38 | href | semmle.label | href |
@@ -1124,24 +1124,24 @@ nodes
 | string-manipulations.js:10:23:10:44 | documen ... on.href | semmle.label | documen ... on.href |
 | tainted-url-suffix-arguments.js:3:17:3:17 | y | semmle.label | y |
 | tainted-url-suffix-arguments.js:6:22:6:22 | y | semmle.label | y |
-| tainted-url-suffix-arguments.js:11:11:11:36 | url | semmle.label | url |
+| tainted-url-suffix-arguments.js:11:11:11:13 | url | semmle.label | url |
 | tainted-url-suffix-arguments.js:11:17:11:36 | window.location.href | semmle.label | window.location.href |
 | tainted-url-suffix-arguments.js:12:17:12:19 | url | semmle.label | url |
-| tooltip.jsx:6:11:6:30 | source | semmle.label | source |
+| tooltip.jsx:6:11:6:16 | source | semmle.label | source |
 | tooltip.jsx:6:20:6:30 | window.name | semmle.label | window.name |
 | tooltip.jsx:10:25:10:30 | source | semmle.label | source |
 | tooltip.jsx:11:25:11:30 | source | semmle.label | source |
-| tooltip.jsx:17:11:17:33 | provide [source] | semmle.label | provide [source] |
+| tooltip.jsx:17:11:17:17 | provide [source] | semmle.label | provide [source] |
 | tooltip.jsx:17:21:17:33 | props.provide [source] | semmle.label | props.provide [source] |
 | tooltip.jsx:18:51:18:57 | provide [source] | semmle.label | provide [source] |
 | tooltip.jsx:18:51:18:59 | provide() | semmle.label | provide() |
-| tooltip.jsx:22:11:22:30 | source | semmle.label | source |
+| tooltip.jsx:22:11:22:16 | source | semmle.label | source |
 | tooltip.jsx:22:20:22:30 | window.name | semmle.label | window.name |
 | tooltip.jsx:23:38:23:43 | source | semmle.label | source |
-| translate.js:6:7:6:39 | target | semmle.label | target |
+| translate.js:6:7:6:12 | target | semmle.label | target |
 | translate.js:6:16:6:39 | documen ... .search | semmle.label | documen ... .search |
-| translate.js:7:7:7:61 | searchParams | semmle.label | searchParams |
-| translate.js:7:7:7:61 | searchParams [MapValue] | semmle.label | searchParams [MapValue] |
+| translate.js:7:7:7:18 | searchParams | semmle.label | searchParams |
+| translate.js:7:7:7:18 | searchParams [MapValue] | semmle.label | searchParams [MapValue] |
 | translate.js:7:22:7:61 | new URL ... ing(1)) | semmle.label | new URL ... ing(1)) |
 | translate.js:7:22:7:61 | new URL ... ing(1)) [MapValue] | semmle.label | new URL ... ing(1)) [MapValue] |
 | translate.js:7:42:7:47 | target | semmle.label | target |
@@ -1171,7 +1171,7 @@ nodes
 | tst3.js:9:37:9:42 | data.p | semmle.label | data.p |
 | tst3.js:10:38:10:41 | data | semmle.label | data |
 | tst3.js:10:38:10:43 | data.p | semmle.label | data.p |
-| tst.js:2:7:2:39 | target | semmle.label | target |
+| tst.js:2:7:2:12 | target | semmle.label | target |
 | tst.js:2:16:2:39 | documen ... .search | semmle.label | documen ... .search |
 | tst.js:4:18:4:23 | target | semmle.label | target |
 | tst.js:6:18:6:126 | "<OPTIO ... PTION>" | semmle.label | "<OPTIO ... PTION>" |
@@ -1180,8 +1180,8 @@ nodes
 | tst.js:6:37:6:114 | documen ... t=")+8) | semmle.label | documen ... t=")+8) |
 | tst.js:9:5:9:42 | '<div s ...  'px">' | semmle.label | '<div s ...  'px">' |
 | tst.js:9:28:9:33 | target | semmle.label | target |
-| tst.js:14:7:14:56 | params | semmle.label | params |
-| tst.js:14:7:14:56 | params [MapValue] | semmle.label | params [MapValue] |
+| tst.js:14:7:14:12 | params | semmle.label | params |
+| tst.js:14:7:14:12 | params [MapValue] | semmle.label | params [MapValue] |
 | tst.js:14:16:14:43 | (new UR ... ation)) [searchParams, MapValue] | semmle.label | (new UR ... ation)) [searchParams, MapValue] |
 | tst.js:14:16:14:43 | (new UR ... ation)) [searchParams] | semmle.label | (new UR ... ation)) [searchParams] |
 | tst.js:14:16:14:56 | (new UR ... hParams | semmle.label | (new UR ... hParams |
@@ -1192,8 +1192,8 @@ nodes
 | tst.js:15:18:15:23 | params | semmle.label | params |
 | tst.js:15:18:15:23 | params [MapValue] | semmle.label | params [MapValue] |
 | tst.js:15:18:15:35 | params.get('name') | semmle.label | params.get('name') |
-| tst.js:17:7:17:61 | searchParams | semmle.label | searchParams |
-| tst.js:17:7:17:61 | searchParams [MapValue] | semmle.label | searchParams [MapValue] |
+| tst.js:17:7:17:18 | searchParams | semmle.label | searchParams |
+| tst.js:17:7:17:18 | searchParams [MapValue] | semmle.label | searchParams [MapValue] |
 | tst.js:17:22:17:61 | new URL ... ing(1)) | semmle.label | new URL ... ing(1)) |
 | tst.js:17:22:17:61 | new URL ... ing(1)) [MapValue] | semmle.label | new URL ... ing(1)) [MapValue] |
 | tst.js:17:42:17:47 | target | semmle.label | target |
@@ -1249,7 +1249,7 @@ nodes
 | tst.js:76:39:76:62 | documen ... .search | semmle.label | documen ... .search |
 | tst.js:82:30:82:53 | documen ... .search | semmle.label | documen ... .search |
 | tst.js:88:25:88:48 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:93:7:93:44 | v | semmle.label | v |
+| tst.js:93:7:93:7 | v | semmle.label | v |
 | tst.js:93:11:93:34 | documen ... .search | semmle.label | documen ... .search |
 | tst.js:93:11:93:44 | documen ... bstr(1) | semmle.label | documen ... bstr(1) |
 | tst.js:95:18:95:18 | v | semmle.label | v |
@@ -1259,10 +1259,10 @@ nodes
 | tst.js:135:49:135:49 | v | semmle.label | v |
 | tst.js:139:29:139:46 | xssSourceService() | semmle.label | xssSourceService() |
 | tst.js:142:40:142:61 | window. ... .search | semmle.label | window. ... .search |
-| tst.js:161:9:161:41 | target | semmle.label | target |
+| tst.js:161:9:161:14 | target | semmle.label | target |
 | tst.js:161:18:161:41 | documen ... .search | semmle.label | documen ... .search |
 | tst.js:164:28:164:33 | target | semmle.label | target |
-| tst.js:168:9:168:42 | tainted | semmle.label | tainted |
+| tst.js:168:9:168:15 | tainted | semmle.label | tainted |
 | tst.js:168:19:168:42 | documen ... .search | semmle.label | documen ... .search |
 | tst.js:170:31:170:37 | tainted | semmle.label | tainted |
 | tst.js:172:42:172:48 | tainted | semmle.label | tainted |
@@ -1270,7 +1270,7 @@ nodes
 | tst.js:175:54:175:60 | tainted | semmle.label | tainted |
 | tst.js:176:45:176:51 | tainted | semmle.label | tainted |
 | tst.js:177:49:177:55 | tainted | semmle.label | tainted |
-| tst.js:181:9:181:42 | tainted | semmle.label | tainted |
+| tst.js:181:9:181:15 | tainted | semmle.label | tainted |
 | tst.js:181:19:181:42 | documen ... .search | semmle.label | documen ... .search |
 | tst.js:183:67:183:73 | tainted | semmle.label | tainted |
 | tst.js:184:67:184:73 | tainted | semmle.label | tainted |
@@ -1297,7 +1297,7 @@ nodes
 | tst.js:244:7:244:10 | name | semmle.label | name |
 | tst.js:248:11:248:21 | window.name | semmle.label | window.name |
 | tst.js:264:22:264:29 | location | semmle.label | location |
-| tst.js:269:9:269:29 | tainted | semmle.label | tainted |
+| tst.js:269:9:269:15 | tainted | semmle.label | tainted |
 | tst.js:269:19:269:29 | window.name | semmle.label | window.name |
 | tst.js:272:59:272:65 | tainted | semmle.label | tainted |
 | tst.js:285:9:285:16 | location | semmle.label | location |
@@ -1310,8 +1310,8 @@ nodes
 | tst.js:311:10:311:35 | new URL ... cation) [searchParams, MapValue] | semmle.label | new URL ... cation) [searchParams, MapValue] |
 | tst.js:311:10:311:35 | new URL ... cation) [searchParams] | semmle.label | new URL ... cation) [searchParams] |
 | tst.js:311:18:311:34 | document.location | semmle.label | document.location |
-| tst.js:315:7:315:43 | params | semmle.label | params |
-| tst.js:315:7:315:43 | params [MapValue] | semmle.label | params [MapValue] |
+| tst.js:315:7:315:12 | params | semmle.label | params |
+| tst.js:315:7:315:12 | params [MapValue] | semmle.label | params [MapValue] |
 | tst.js:315:16:315:30 | getTaintedUrl() [searchParams, MapValue] | semmle.label | getTaintedUrl() [searchParams, MapValue] |
 | tst.js:315:16:315:30 | getTaintedUrl() [searchParams] | semmle.label | getTaintedUrl() [searchParams] |
 | tst.js:315:16:315:43 | getTain ... hParams | semmle.label | getTain ... hParams |
@@ -1324,19 +1324,19 @@ nodes
 | tst.js:327:5:327:12 | getUrl() [hash] | semmle.label | getUrl() [hash] |
 | tst.js:327:5:327:17 | getUrl().hash | semmle.label | getUrl().hash |
 | tst.js:327:5:327:30 | getUrl( ... ring(1) | semmle.label | getUrl( ... ring(1) |
-| tst.js:332:7:332:39 | target | semmle.label | target |
+| tst.js:332:7:332:12 | target | semmle.label | target |
 | tst.js:332:16:332:39 | documen ... .search | semmle.label | documen ... .search |
 | tst.js:333:12:333:17 | target | semmle.label | target |
-| tst.js:339:10:339:42 | target | semmle.label | target |
+| tst.js:339:10:339:15 | target | semmle.label | target |
 | tst.js:339:19:339:42 | documen ... .search | semmle.label | documen ... .search |
 | tst.js:340:16:340:21 | target | semmle.label | target |
 | tst.js:341:20:341:25 | target | semmle.label | target |
 | tst.js:344:21:344:26 | target | semmle.label | target |
 | tst.js:347:18:347:23 | target | semmle.label | target |
-| tst.js:355:7:355:39 | target | semmle.label | target |
+| tst.js:355:7:355:12 | target | semmle.label | target |
 | tst.js:355:16:355:39 | documen ... .search | semmle.label | documen ... .search |
 | tst.js:357:18:357:23 | target | semmle.label | target |
-| tst.js:364:7:364:39 | target | semmle.label | target |
+| tst.js:364:7:364:12 | target | semmle.label | target |
 | tst.js:364:16:364:39 | documen ... .search | semmle.label | documen ... .search |
 | tst.js:367:18:367:23 | target | semmle.label | target |
 | tst.js:369:18:369:23 | target | semmle.label | target |
@@ -1355,11 +1355,11 @@ nodes
 | tst.js:391:19:391:31 | target.taint8 | semmle.label | target.taint8 |
 | tst.js:392:18:392:23 | target [taint8] | semmle.label | target [taint8] |
 | tst.js:392:18:392:30 | target.taint8 | semmle.label | target.taint8 |
-| tst.js:399:7:399:46 | payload | semmle.label | payload |
+| tst.js:399:7:399:13 | payload | semmle.label | payload |
 | tst.js:399:17:399:36 | window.location.hash | semmle.label | window.location.hash |
 | tst.js:399:17:399:46 | window. ... bstr(1) | semmle.label | window. ... bstr(1) |
 | tst.js:400:18:400:24 | payload | semmle.label | payload |
-| tst.js:402:7:402:55 | match | semmle.label | match |
+| tst.js:402:7:402:11 | match | semmle.label | match |
 | tst.js:402:15:402:34 | window.location.hash | semmle.label | window.location.hash |
 | tst.js:402:15:402:55 | window. ... (\\w+)/) | semmle.label | window. ... (\\w+)/) |
 | tst.js:404:20:404:24 | match | semmle.label | match |
@@ -1367,11 +1367,11 @@ nodes
 | tst.js:407:18:407:37 | window.location.hash | semmle.label | window.location.hash |
 | tst.js:407:18:407:48 | window. ... it('#') [1] | semmle.label | window. ... it('#') [1] |
 | tst.js:407:18:407:51 | window. ... '#')[1] | semmle.label | window. ... '#')[1] |
-| tst.js:411:7:411:39 | target | semmle.label | target |
+| tst.js:411:7:411:12 | target | semmle.label | target |
 | tst.js:411:16:411:39 | documen ... .search | semmle.label | documen ... .search |
 | tst.js:413:18:413:23 | target | semmle.label | target |
 | tst.js:413:18:413:89 | target. ... data>') | semmle.label | target. ... data>') |
-| tst.js:419:6:419:38 | source | semmle.label | source |
+| tst.js:419:6:419:11 | source | semmle.label | source |
 | tst.js:419:15:419:38 | documen ... .search | semmle.label | documen ... .search |
 | tst.js:423:28:423:33 | source | semmle.label | source |
 | tst.js:424:33:424:38 | source | semmle.label | source |
@@ -1379,17 +1379,17 @@ nodes
 | tst.js:426:41:426:46 | source | semmle.label | source |
 | tst.js:427:44:427:49 | source | semmle.label | source |
 | tst.js:428:32:428:37 | source | semmle.label | source |
-| tst.js:436:7:436:39 | source | semmle.label | source |
+| tst.js:436:7:436:12 | source | semmle.label | source |
 | tst.js:436:16:436:39 | documen ... .search | semmle.label | documen ... .search |
 | tst.js:438:18:438:23 | source | semmle.label | source |
 | tst.js:439:18:439:42 | ansiToH ... source) | semmle.label | ansiToH ... source) |
 | tst.js:439:36:439:41 | source | semmle.label | source |
-| tst.js:443:6:443:38 | source | semmle.label | source |
+| tst.js:443:6:443:11 | source | semmle.label | source |
 | tst.js:443:15:443:38 | documen ... .search | semmle.label | documen ... .search |
 | tst.js:446:21:446:26 | source | semmle.label | source |
 | tst.js:448:19:448:24 | source | semmle.label | source |
 | tst.js:450:20:450:25 | source | semmle.label | source |
-| tst.js:454:7:454:46 | url | semmle.label | url |
+| tst.js:454:7:454:9 | url | semmle.label | url |
 | tst.js:454:13:454:36 | documen ... .search | semmle.label | documen ... .search |
 | tst.js:454:13:454:46 | documen ... bstr(1) | semmle.label | documen ... bstr(1) |
 | tst.js:456:19:456:21 | url | semmle.label | url |
@@ -1403,22 +1403,22 @@ nodes
 | tst.js:477:18:477:40 | locatio ... bstr(1) | semmle.label | locatio ... bstr(1) |
 | tst.js:484:33:484:63 | decodeU ... n.hash) | semmle.label | decodeU ... n.hash) |
 | tst.js:484:43:484:62 | window.location.hash | semmle.label | window.location.hash |
-| tst.js:491:7:491:39 | target | semmle.label | target |
+| tst.js:491:7:491:12 | target | semmle.label | target |
 | tst.js:491:16:491:39 | documen ... .search | semmle.label | documen ... .search |
 | tst.js:492:18:492:23 | target | semmle.label | target |
 | tst.js:492:18:492:54 | target. ... "), '') | semmle.label | target. ... "), '') |
-| tst.js:498:7:498:26 | source | semmle.label | source |
+| tst.js:498:7:498:12 | source | semmle.label | source |
 | tst.js:498:16:498:26 | window.name | semmle.label | window.name |
 | tst.js:499:18:499:33 | unescape(source) | semmle.label | unescape(source) |
 | tst.js:499:27:499:32 | source | semmle.label | source |
-| typeahead.js:20:13:20:45 | target | semmle.label | target |
+| typeahead.js:20:13:20:18 | target | semmle.label | target |
 | typeahead.js:20:22:20:45 | documen ... .search | semmle.label | documen ... .search |
 | typeahead.js:21:12:21:17 | target | semmle.label | target |
 | typeahead.js:24:30:24:32 | val | semmle.label | val |
 | typeahead.js:25:18:25:20 | val | semmle.label | val |
 | v-html.vue:2:8:2:23 | v-html=tainted | semmle.label | v-html=tainted |
 | v-html.vue:6:42:6:58 | document.location | semmle.label | document.location |
-| various-concat-obfuscations.js:2:6:2:39 | tainted | semmle.label | tainted |
+| various-concat-obfuscations.js:2:6:2:12 | tainted | semmle.label | tainted |
 | various-concat-obfuscations.js:2:16:2:39 | documen ... .search | semmle.label | documen ... .search |
 | various-concat-obfuscations.js:4:4:4:31 | "<div>" ... </div>" | semmle.label | "<div>" ... </div>" |
 | various-concat-obfuscations.js:4:14:4:20 | tainted | semmle.label | tainted |
@@ -1458,7 +1458,7 @@ nodes
 | various-concat-obfuscations.js:21:4:21:47 | indirec ... .attrs) | semmle.label | indirec ... .attrs) |
 | various-concat-obfuscations.js:21:17:21:40 | documen ... .search | semmle.label | documen ... .search |
 | various-concat-obfuscations.js:21:17:21:46 | documen ... h.attrs | semmle.label | documen ... h.attrs |
-| winjs.js:2:7:2:53 | tainted | semmle.label | tainted |
+| winjs.js:2:7:2:13 | tainted | semmle.label | tainted |
 | winjs.js:2:17:2:40 | documen ... .search | semmle.label | documen ... .search |
 | winjs.js:2:17:2:53 | documen ... ring(1) | semmle.label | documen ... ring(1) |
 | winjs.js:3:43:3:49 | tainted | semmle.label | tainted |
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/XssWithAdditionalSources.expected b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/XssWithAdditionalSources.expected
index c031b7c1810..f8781e6741b 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/XssWithAdditionalSources.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/XssWithAdditionalSources.expected
@@ -2,8 +2,8 @@ nodes
 | addEventListener.js:1:43:1:47 | event | semmle.label | event |
 | addEventListener.js:2:20:2:24 | event | semmle.label | event |
 | addEventListener.js:2:20:2:29 | event.data | semmle.label | event.data |
-| addEventListener.js:5:43:5:48 | data | semmle.label | data |
 | addEventListener.js:5:43:5:48 | {data} | semmle.label | {data} |
+| addEventListener.js:5:44:5:47 | data | semmle.label | data |
 | addEventListener.js:6:20:6:23 | data | semmle.label | data |
 | addEventListener.js:10:21:10:25 | event | semmle.label | event |
 | addEventListener.js:12:24:12:28 | event | semmle.label | event |
@@ -32,6 +32,82 @@ nodes
 | angular-tempate-url.js:13:30:13:31 | ev | semmle.label | ev |
 | angular-tempate-url.js:14:26:14:27 | ev | semmle.label | ev |
 | angular-tempate-url.js:14:26:14:32 | ev.data | semmle.label | ev.data |
+| aws-db.js:15:31:15:37 | results | semmle.label | results |
+| aws-db.js:15:31:15:76 | results ... arValue | semmle.label | results ... arValue |
+| aws-db.js:20:31:20:38 | response | semmle.label | response |
+| aws-db.js:20:31:20:54 | respons ... tring() | semmle.label | respons ... tring() |
+| aws-db.js:24:31:24:39 | response2 | semmle.label | response2 |
+| aws-db.js:24:31:24:47 | response2.records | semmle.label | response2.records |
+| aws-db.js:28:31:28:39 | response3 | semmle.label | response3 |
+| aws-db.js:28:31:28:44 | response3.Item | semmle.label | response3.Item |
+| aws-db.js:43:31:43:37 | results | semmle.label | results |
+| aws-db.js:43:31:43:76 | results ... arValue | semmle.label | results ... arValue |
+| aws-db.js:46:35:46:38 | data | semmle.label | data |
+| aws-db.js:46:35:46:77 | data.Re ... arValue | semmle.label | data.Re ... arValue |
+| aws-db.js:51:31:51:38 | response | semmle.label | response |
+| aws-db.js:51:31:51:54 | respons ... tring() | semmle.label | respons ... tring() |
+| aws-db.js:54:35:54:38 | data | semmle.label | data |
+| aws-db.js:54:35:54:54 | data.Body.toString() | semmle.label | data.Body.toString() |
+| aws-db.js:59:31:59:39 | response1 | semmle.label | response1 |
+| aws-db.js:59:31:59:47 | response1.records | semmle.label | response1.records |
+| aws-db.js:62:35:62:38 | data | semmle.label | data |
+| aws-db.js:62:35:62:46 | data.records | semmle.label | data.records |
+| aws-db.js:66:31:66:39 | response2 | semmle.label | response2 |
+| aws-db.js:66:31:66:53 | respons ... Results | semmle.label | respons ... Results |
+| aws-db.js:69:35:69:38 | data | semmle.label | data |
+| aws-db.js:69:35:69:52 | data.updateResults | semmle.label | data.updateResults |
+| aws-db.js:74:35:74:38 | data | semmle.label | data |
+| aws-db.js:74:35:74:43 | data.Item | semmle.label | data.Item |
+| aws-db.js:77:35:77:38 | data | semmle.label | data |
+| aws-db.js:77:35:77:43 | data.Item | semmle.label | data.Item |
+| aws.js:14:31:14:36 | result | semmle.label | result |
+| aws.js:14:31:14:44 | result.comment | semmle.label | result.comment |
+| aws.js:18:31:18:37 | result2 | semmle.label | result2 |
+| aws.js:18:31:18:45 | result2.comment | semmle.label | result2.comment |
+| aws.js:22:31:22:37 | result3 | semmle.label | result3 |
+| aws.js:22:31:22:45 | result3.comment | semmle.label | result3.comment |
+| aws.js:26:31:26:37 | result4 | semmle.label | result4 |
+| aws.js:26:31:26:45 | result4.comment | semmle.label | result4.comment |
+| aws.js:34:31:34:34 | data | semmle.label | data |
+| aws.js:34:31:34:42 | data.comment | semmle.label | data.comment |
+| aws.js:37:35:37:38 | data | semmle.label | data |
+| aws.js:37:35:37:46 | data.comment | semmle.label | data.comment |
+| aws.js:47:31:47:34 | data | semmle.label | data |
+| aws.js:47:31:47:42 | data.comment | semmle.label | data.comment |
+| aws.js:50:35:50:38 | data | semmle.label | data |
+| aws.js:50:35:50:46 | data.comment | semmle.label | data.comment |
+| aws.js:59:31:59:34 | data | semmle.label | data |
+| aws.js:59:31:59:42 | data.comment | semmle.label | data.comment |
+| aws.js:62:35:62:38 | data | semmle.label | data |
+| aws.js:62:35:62:46 | data.comment | semmle.label | data.comment |
+| aws.js:66:31:66:35 | data2 | semmle.label | data2 |
+| aws.js:66:31:66:43 | data2.comment | semmle.label | data2.comment |
+| aws.js:69:35:69:38 | data | semmle.label | data |
+| aws.js:69:35:69:46 | data.comment | semmle.label | data.comment |
+| aws.js:78:31:78:34 | data | semmle.label | data |
+| aws.js:78:31:78:42 | data.comment | semmle.label | data.comment |
+| aws.js:81:35:81:38 | data | semmle.label | data |
+| aws.js:81:35:81:46 | data.comment | semmle.label | data.comment |
+| aws.js:85:31:85:35 | data2 | semmle.label | data2 |
+| aws.js:85:31:85:43 | data2.comment | semmle.label | data2.comment |
+| aws.js:88:35:88:38 | data | semmle.label | data |
+| aws.js:88:35:88:46 | data.comment | semmle.label | data.comment |
+| aws.js:92:31:92:35 | data3 | semmle.label | data3 |
+| aws.js:92:31:92:43 | data3.comment | semmle.label | data3.comment |
+| aws.js:95:35:95:38 | data | semmle.label | data |
+| aws.js:95:35:95:46 | data.comment | semmle.label | data.comment |
+| aws.js:99:31:99:35 | data4 | semmle.label | data4 |
+| aws.js:99:31:99:43 | data4.comment | semmle.label | data4.comment |
+| aws.js:102:35:102:38 | data | semmle.label | data |
+| aws.js:102:35:102:46 | data.comment | semmle.label | data.comment |
+| aws.js:106:31:106:35 | data5 | semmle.label | data5 |
+| aws.js:106:31:106:43 | data5.comment | semmle.label | data5.comment |
+| aws.js:109:35:109:38 | data | semmle.label | data |
+| aws.js:109:35:109:46 | data.comment | semmle.label | data.comment |
+| aws.js:113:31:113:35 | data6 | semmle.label | data6 |
+| aws.js:113:31:113:43 | data6.comment | semmle.label | data6.comment |
+| aws.js:116:35:116:38 | data | semmle.label | data |
+| aws.js:116:35:116:46 | data.comment | semmle.label | data.comment |
 | classnames.js:7:31:7:84 | `<span  ... <span>` | semmle.label | `<span  ... <span>` |
 | classnames.js:7:47:7:69 | classNa ... w.name) | semmle.label | classNa ... w.name) |
 | classnames.js:7:58:7:68 | window.name | semmle.label | window.name |
@@ -53,19 +129,19 @@ nodes
 | classnames.js:17:32:17:79 | `<span  ... <span>` | semmle.label | `<span  ... <span>` |
 | classnames.js:17:48:17:64 | clsx(window.name) | semmle.label | clsx(window.name) |
 | classnames.js:17:53:17:63 | window.name | semmle.label | window.name |
-| clipboard.ts:8:11:8:51 | html | semmle.label | html |
+| clipboard.ts:8:11:8:14 | html | semmle.label | html |
 | clipboard.ts:8:18:8:51 | clipboa ... /html') | semmle.label | clipboa ... /html') |
 | clipboard.ts:15:25:15:28 | html | semmle.label | html |
 | clipboard.ts:24:23:24:58 | e.clipb ... /html') | semmle.label | e.clipb ... /html') |
 | clipboard.ts:29:19:29:54 | e.clipb ... /html') | semmle.label | e.clipb ... /html') |
 | clipboard.ts:33:19:33:68 | e.origi ... /html') | semmle.label | e.origi ... /html') |
-| clipboard.ts:43:15:43:55 | html | semmle.label | html |
+| clipboard.ts:43:15:43:18 | html | semmle.label | html |
 | clipboard.ts:43:22:43:55 | clipboa ... /html') | semmle.label | clipboa ... /html') |
 | clipboard.ts:50:29:50:32 | html | semmle.label | html |
-| clipboard.ts:71:13:71:62 | droppedHtml | semmle.label | droppedHtml |
+| clipboard.ts:71:13:71:23 | droppedHtml | semmle.label | droppedHtml |
 | clipboard.ts:71:27:71:62 | e.clipb ... /html') | semmle.label | e.clipb ... /html') |
 | clipboard.ts:73:29:73:39 | droppedHtml | semmle.label | droppedHtml |
-| clipboard.ts:98:15:98:54 | html | semmle.label | html |
+| clipboard.ts:98:15:98:18 | html | semmle.label | html |
 | clipboard.ts:98:22:98:54 | dataTra ... /html') | semmle.label | dataTra ... /html') |
 | clipboard.ts:99:23:99:26 | html | semmle.label | html |
 | custom-element.js:5:26:5:36 | window.name | semmle.label | window.name |
@@ -74,7 +150,7 @@ nodes
 | d3.js:12:20:12:29 | getTaint() | semmle.label | getTaint() |
 | d3.js:14:20:14:29 | getTaint() | semmle.label | getTaint() |
 | d3.js:21:15:21:24 | getTaint() | semmle.label | getTaint() |
-| dates.js:9:9:9:69 | taint | semmle.label | taint |
+| dates.js:9:9:9:13 | taint | semmle.label | taint |
 | dates.js:9:17:9:69 | decodeU ... ing(1)) | semmle.label | decodeU ... ing(1)) |
 | dates.js:9:36:9:55 | window.location.hash | semmle.label | window.location.hash |
 | dates.js:9:36:9:68 | window. ... ring(1) | semmle.label | window. ... ring(1) |
@@ -96,7 +172,7 @@ nodes
 | dates.js:21:31:21:68 | `Time i ... aint)}` | semmle.label | `Time i ... aint)}` |
 | dates.js:21:42:21:66 | dayjs(t ... (taint) | semmle.label | dayjs(t ... (taint) |
 | dates.js:21:61:21:65 | taint | semmle.label | taint |
-| dates.js:30:9:30:69 | taint | semmle.label | taint |
+| dates.js:30:9:30:13 | taint | semmle.label | taint |
 | dates.js:30:17:30:69 | decodeU ... ing(1)) | semmle.label | decodeU ... ing(1)) |
 | dates.js:30:36:30:55 | window.location.hash | semmle.label | window.location.hash |
 | dates.js:30:36:30:68 | window. ... ring(1) | semmle.label | window. ... ring(1) |
@@ -112,7 +188,7 @@ nodes
 | dates.js:40:31:40:84 | `Time i ... aint)}` | semmle.label | `Time i ... aint)}` |
 | dates.js:40:42:40:82 | dayjs.f ...  taint) | semmle.label | dayjs.f ...  taint) |
 | dates.js:40:77:40:81 | taint | semmle.label | taint |
-| dates.js:46:9:46:69 | taint | semmle.label | taint |
+| dates.js:46:9:46:13 | taint | semmle.label | taint |
 | dates.js:46:17:46:69 | decodeU ... ing(1)) | semmle.label | decodeU ... ing(1)) |
 | dates.js:46:36:46:55 | window.location.hash | semmle.label | window.location.hash |
 | dates.js:46:36:46:68 | window. ... ring(1) | semmle.label | window. ... ring(1) |
@@ -125,7 +201,7 @@ nodes
 | dates.js:50:31:50:104 | `Time i ... aint)}` | semmle.label | `Time i ... aint)}` |
 | dates.js:50:42:50:102 | DateTim ... (taint) | semmle.label | DateTim ... (taint) |
 | dates.js:50:97:50:101 | taint | semmle.label | taint |
-| dates.js:54:9:54:69 | taint | semmle.label | taint |
+| dates.js:54:9:54:13 | taint | semmle.label | taint |
 | dates.js:54:17:54:69 | decodeU ... ing(1)) | semmle.label | decodeU ... ing(1)) |
 | dates.js:54:36:54:55 | window.location.hash | semmle.label | window.location.hash |
 | dates.js:54:36:54:68 | window. ... ring(1) | semmle.label | window. ... ring(1) |
@@ -139,16 +215,16 @@ nodes
 | dates.js:61:42:61:86 | dayjs.s ... (taint) | semmle.label | dayjs.s ... (taint) |
 | dates.js:61:81:61:85 | taint | semmle.label | taint |
 | dom.js:4:20:4:30 | window.name | semmle.label | window.name |
-| dragAndDrop.ts:8:11:8:50 | html | semmle.label | html |
+| dragAndDrop.ts:8:11:8:14 | html | semmle.label | html |
 | dragAndDrop.ts:8:18:8:50 | dataTra ... /html') | semmle.label | dataTra ... /html') |
 | dragAndDrop.ts:15:25:15:28 | html | semmle.label | html |
 | dragAndDrop.ts:24:23:24:57 | e.dataT ... /html') | semmle.label | e.dataT ... /html') |
 | dragAndDrop.ts:29:19:29:53 | e.dataT ... /html') | semmle.label | e.dataT ... /html') |
 | dragAndDrop.ts:33:19:33:67 | e.origi ... /html') | semmle.label | e.origi ... /html') |
-| dragAndDrop.ts:43:15:43:54 | html | semmle.label | html |
+| dragAndDrop.ts:43:15:43:18 | html | semmle.label | html |
 | dragAndDrop.ts:43:22:43:54 | dataTra ... /html') | semmle.label | dataTra ... /html') |
 | dragAndDrop.ts:50:29:50:32 | html | semmle.label | html |
-| dragAndDrop.ts:71:13:71:61 | droppedHtml | semmle.label | droppedHtml |
+| dragAndDrop.ts:71:13:71:23 | droppedHtml | semmle.label | droppedHtml |
 | dragAndDrop.ts:71:27:71:61 | e.dataT ... /html') | semmle.label | e.dataT ... /html') |
 | dragAndDrop.ts:73:29:73:39 | droppedHtml | semmle.label | droppedHtml |
 | event-handler-receiver.js:2:31:2:83 | '<h2><a ... ></h2>' | semmle.label | '<h2><a ... ></h2>' |
@@ -184,7 +260,7 @@ nodes
 | hana.js:90:33:90:45 | rs[0].comment | semmle.label | rs[0].comment |
 | jquery-declare-any.ts:6:7:6:17 | window.name | semmle.label | window.name |
 | jquery-declare-type.ts:6:7:6:17 | window.name | semmle.label | window.name |
-| jquery.js:2:7:2:40 | tainted | semmle.label | tainted |
+| jquery.js:2:7:2:13 | tainted | semmle.label | tainted |
 | jquery.js:2:17:2:40 | documen ... .search | semmle.label | documen ... .search |
 | jquery.js:4:5:4:11 | tainted | semmle.label | tainted |
 | jquery.js:5:13:5:19 | tainted | semmle.label | tainted |
@@ -203,7 +279,7 @@ nodes
 | jquery.js:16:19:16:64 | decodeU ... ring()) | semmle.label | decodeU ... ring()) |
 | jquery.js:16:38:16:52 | window.location | semmle.label | window.location |
 | jquery.js:16:38:16:63 | window. ... tring() | semmle.label | window. ... tring() |
-| jquery.js:18:7:18:33 | hash | semmle.label | hash |
+| jquery.js:18:7:18:10 | hash | semmle.label | hash |
 | jquery.js:18:14:18:33 | window.location.hash | semmle.label | window.location.hash |
 | jquery.js:21:5:21:8 | hash | semmle.label | hash |
 | jquery.js:21:5:21:21 | hash.substring(1) | semmle.label | hash.substring(1) |
@@ -222,50 +298,50 @@ nodes
 | jquery.js:36:25:36:31 | tainted | semmle.label | tainted |
 | jquery.js:37:25:37:37 | () => tainted | semmle.label | () => tainted |
 | jquery.js:37:31:37:37 | tainted | semmle.label | tainted |
-| json-stringify.jsx:5:9:5:36 | locale | semmle.label | locale |
+| json-stringify.jsx:5:9:5:14 | locale | semmle.label | locale |
 | json-stringify.jsx:5:18:5:36 | req.param("locale") | semmle.label | req.param("locale") |
 | json-stringify.jsx:11:51:11:56 | locale | semmle.label | locale |
 | json-stringify.jsx:19:56:19:61 | locale | semmle.label | locale |
 | json-stringify.jsx:31:40:31:61 | JSON.st ... locale) | semmle.label | JSON.st ... locale) |
 | json-stringify.jsx:31:55:31:60 | locale | semmle.label | locale |
 | json-stringify.jsx:35:40:35:61 | JSON.st ... jsonLD) | semmle.label | JSON.st ... jsonLD) |
-| jwt-server.js:7:9:7:35 | taint | semmle.label | taint |
+| jwt-server.js:7:9:7:13 | taint | semmle.label | taint |
 | jwt-server.js:7:17:7:35 | req.param("wobble") | semmle.label | req.param("wobble") |
 | jwt-server.js:9:16:9:20 | taint | semmle.label | taint |
 | jwt-server.js:9:55:9:61 | decoded | semmle.label | decoded |
 | jwt-server.js:10:19:10:25 | decoded | semmle.label | decoded |
 | jwt-server.js:10:19:10:29 | decoded.foo | semmle.label | decoded.foo |
 | jwt.js:4:36:4:39 | data | semmle.label | data |
-| jwt.js:5:9:5:34 | decoded | semmle.label | decoded |
+| jwt.js:5:9:5:15 | decoded | semmle.label | decoded |
 | jwt.js:5:19:5:34 | jwt_decode(data) | semmle.label | jwt_decode(data) |
 | jwt.js:5:30:5:33 | data | semmle.label | data |
 | jwt.js:6:14:6:20 | decoded | semmle.label | decoded |
 | nodemailer.js:13:11:13:69 | `Hi, yo ... sage}.` | semmle.label | `Hi, yo ... sage}.` |
 | nodemailer.js:13:50:13:66 | req.query.message | semmle.label | req.query.message |
-| optionalSanitizer.js:2:7:2:39 | target | semmle.label | target |
+| optionalSanitizer.js:2:7:2:12 | target | semmle.label | target |
 | optionalSanitizer.js:2:16:2:39 | documen ... .search | semmle.label | documen ... .search |
 | optionalSanitizer.js:6:18:6:23 | target | semmle.label | target |
-| optionalSanitizer.js:8:7:8:22 | tainted | semmle.label | tainted |
+| optionalSanitizer.js:8:7:8:13 | tainted | semmle.label | tainted |
 | optionalSanitizer.js:8:17:8:22 | target | semmle.label | target |
 | optionalSanitizer.js:9:18:9:24 | tainted | semmle.label | tainted |
 | optionalSanitizer.js:15:9:15:14 | target | semmle.label | target |
 | optionalSanitizer.js:16:18:16:18 | x | semmle.label | x |
 | optionalSanitizer.js:17:20:17:20 | x | semmle.label | x |
-| optionalSanitizer.js:26:7:26:39 | target | semmle.label | target |
+| optionalSanitizer.js:26:7:26:12 | target | semmle.label | target |
 | optionalSanitizer.js:26:16:26:39 | documen ... .search | semmle.label | documen ... .search |
 | optionalSanitizer.js:28:24:28:24 | x | semmle.label | x |
 | optionalSanitizer.js:29:12:29:12 | x | semmle.label | x |
-| optionalSanitizer.js:31:7:31:23 | tainted2 | semmle.label | tainted2 |
+| optionalSanitizer.js:31:7:31:14 | tainted2 | semmle.label | tainted2 |
 | optionalSanitizer.js:31:18:31:23 | target | semmle.label | target |
 | optionalSanitizer.js:32:18:32:25 | tainted2 | semmle.label | tainted2 |
-| optionalSanitizer.js:34:5:34:36 | tainted2 | semmle.label | tainted2 |
+| optionalSanitizer.js:34:5:34:12 | tainted2 | semmle.label | tainted2 |
 | optionalSanitizer.js:34:16:34:36 | sanitiz ... inted2) | semmle.label | sanitiz ... inted2) |
 | optionalSanitizer.js:34:28:34:35 | tainted2 | semmle.label | tainted2 |
 | optionalSanitizer.js:36:18:36:25 | tainted2 | semmle.label | tainted2 |
-| optionalSanitizer.js:38:7:38:23 | tainted3 | semmle.label | tainted3 |
+| optionalSanitizer.js:38:7:38:14 | tainted3 | semmle.label | tainted3 |
 | optionalSanitizer.js:38:18:38:23 | target | semmle.label | target |
 | optionalSanitizer.js:39:18:39:25 | tainted3 | semmle.label | tainted3 |
-| optionalSanitizer.js:41:5:41:36 | tainted3 | semmle.label | tainted3 |
+| optionalSanitizer.js:41:5:41:12 | tainted3 | semmle.label | tainted3 |
 | optionalSanitizer.js:41:16:41:36 | sanitiz ... inted3) | semmle.label | sanitiz ... inted3) |
 | optionalSanitizer.js:41:28:41:35 | tainted3 | semmle.label | tainted3 |
 | optionalSanitizer.js:43:18:43:25 | tainted3 | semmle.label | tainted3 |
@@ -276,7 +352,7 @@ nodes
 | pages/[id].jsx:3:30:3:35 | params [id] | semmle.label | params [id] |
 | pages/[id].jsx:3:30:3:35 | params [q] | semmle.label | params [q] |
 | pages/[id].jsx:5:9:5:14 | { id } | semmle.label | { id } |
-| pages/[id].jsx:5:9:5:29 | id | semmle.label | id |
+| pages/[id].jsx:5:11:5:12 | id | semmle.label | id |
 | pages/[id].jsx:5:18:5:29 | router.query | semmle.label | router.query |
 | pages/[id].jsx:10:44:10:45 | id | semmle.label | id |
 | pages/[id].jsx:13:44:13:49 | params [id] | semmle.label | params [id] |
@@ -289,7 +365,7 @@ nodes
 | pages/[id].jsx:25:11:25:33 | context ... d \|\| "" | semmle.label | context ... d \|\| "" |
 | pages/[id].jsx:26:10:26:22 | context.query | semmle.label | context.query |
 | pages/[id].jsx:26:10:26:36 | context ... r \|\| "" | semmle.label | context ... r \|\| "" |
-| react-native.js:7:7:7:33 | tainted | semmle.label | tainted |
+| react-native.js:7:7:7:13 | tainted | semmle.label | tainted |
 | react-native.js:7:17:7:33 | req.param("code") | semmle.label | req.param("code") |
 | react-native.js:8:18:8:24 | tainted | semmle.label | tainted |
 | react-native.js:9:27:9:33 | tainted | semmle.label | tainted |
@@ -303,13 +379,13 @@ nodes
 | react-use-router.js:23:43:23:61 | router.query.foobar | semmle.label | router.query.foobar |
 | react-use-router.js:33:21:33:32 | router.query | semmle.label | router.query |
 | react-use-router.js:33:21:33:39 | router.query.foobar | semmle.label | router.query.foobar |
-| react-use-state.js:4:9:4:49 | state | semmle.label | state |
+| react-use-state.js:4:10:4:14 | state | semmle.label | state |
 | react-use-state.js:4:38:4:48 | window.name | semmle.label | window.name |
 | react-use-state.js:5:51:5:55 | state | semmle.label | state |
-| react-use-state.js:9:9:9:43 | state | semmle.label | state |
+| react-use-state.js:9:10:9:14 | state | semmle.label | state |
 | react-use-state.js:10:14:10:24 | window.name | semmle.label | window.name |
 | react-use-state.js:11:51:11:55 | state | semmle.label | state |
-| react-use-state.js:15:9:15:43 | state | semmle.label | state |
+| react-use-state.js:15:10:15:14 | state | semmle.label | state |
 | react-use-state.js:15:10:15:14 | state | semmle.label | state |
 | react-use-state.js:16:20:16:30 | window.name | semmle.label | window.name |
 | react-use-state.js:17:51:17:55 | state | semmle.label | state |
@@ -317,7 +393,7 @@ nodes
 | react-use-state.js:22:14:22:17 | prev | semmle.label | prev |
 | react-use-state.js:23:35:23:38 | prev | semmle.label | prev |
 | react-use-state.js:25:20:25:30 | window.name | semmle.label | window.name |
-| sanitiser.js:16:7:16:27 | tainted | semmle.label | tainted |
+| sanitiser.js:16:7:16:13 | tainted | semmle.label | tainted |
 | sanitiser.js:16:17:16:27 | window.name | semmle.label | window.name |
 | sanitiser.js:23:21:23:44 | '<b>' + ...  '</b>' | semmle.label | '<b>' + ...  '</b>' |
 | sanitiser.js:23:29:23:35 | tainted | semmle.label | tainted |
@@ -335,7 +411,7 @@ nodes
 | stored-xss.js:3:35:3:58 | documen ... .search | semmle.label | documen ... .search |
 | stored-xss.js:5:20:5:52 | session ... ssion') | semmle.label | session ... ssion') |
 | stored-xss.js:8:20:8:48 | localSt ... local') | semmle.label | localSt ... local') |
-| stored-xss.js:10:9:10:44 | href | semmle.label | href |
+| stored-xss.js:10:9:10:12 | href | semmle.label | href |
 | stored-xss.js:10:16:10:44 | localSt ... local') | semmle.label | localSt ... local') |
 | stored-xss.js:12:20:12:54 | "<a hre ... ar</a>" | semmle.label | "<a hre ... ar</a>" |
 | stored-xss.js:12:35:12:38 | href | semmle.label | href |
@@ -355,24 +431,24 @@ nodes
 | string-manipulations.js:10:23:10:44 | documen ... on.href | semmle.label | documen ... on.href |
 | tainted-url-suffix-arguments.js:3:17:3:17 | y | semmle.label | y |
 | tainted-url-suffix-arguments.js:6:22:6:22 | y | semmle.label | y |
-| tainted-url-suffix-arguments.js:11:11:11:36 | url | semmle.label | url |
+| tainted-url-suffix-arguments.js:11:11:11:13 | url | semmle.label | url |
 | tainted-url-suffix-arguments.js:11:17:11:36 | window.location.href | semmle.label | window.location.href |
 | tainted-url-suffix-arguments.js:12:17:12:19 | url | semmle.label | url |
-| tooltip.jsx:6:11:6:30 | source | semmle.label | source |
+| tooltip.jsx:6:11:6:16 | source | semmle.label | source |
 | tooltip.jsx:6:20:6:30 | window.name | semmle.label | window.name |
 | tooltip.jsx:10:25:10:30 | source | semmle.label | source |
 | tooltip.jsx:11:25:11:30 | source | semmle.label | source |
-| tooltip.jsx:17:11:17:33 | provide [source] | semmle.label | provide [source] |
+| tooltip.jsx:17:11:17:17 | provide [source] | semmle.label | provide [source] |
 | tooltip.jsx:17:21:17:33 | props.provide [source] | semmle.label | props.provide [source] |
 | tooltip.jsx:18:51:18:57 | provide [source] | semmle.label | provide [source] |
 | tooltip.jsx:18:51:18:59 | provide() | semmle.label | provide() |
-| tooltip.jsx:22:11:22:30 | source | semmle.label | source |
+| tooltip.jsx:22:11:22:16 | source | semmle.label | source |
 | tooltip.jsx:22:20:22:30 | window.name | semmle.label | window.name |
 | tooltip.jsx:23:38:23:43 | source | semmle.label | source |
-| translate.js:6:7:6:39 | target | semmle.label | target |
+| translate.js:6:7:6:12 | target | semmle.label | target |
 | translate.js:6:16:6:39 | documen ... .search | semmle.label | documen ... .search |
-| translate.js:7:7:7:61 | searchParams | semmle.label | searchParams |
-| translate.js:7:7:7:61 | searchParams [MapValue] | semmle.label | searchParams [MapValue] |
+| translate.js:7:7:7:18 | searchParams | semmle.label | searchParams |
+| translate.js:7:7:7:18 | searchParams [MapValue] | semmle.label | searchParams [MapValue] |
 | translate.js:7:22:7:61 | new URL ... ing(1)) | semmle.label | new URL ... ing(1)) |
 | translate.js:7:22:7:61 | new URL ... ing(1)) [MapValue] | semmle.label | new URL ... ing(1)) [MapValue] |
 | translate.js:7:42:7:47 | target | semmle.label | target |
@@ -402,7 +478,7 @@ nodes
 | tst3.js:9:37:9:42 | data.p | semmle.label | data.p |
 | tst3.js:10:38:10:41 | data | semmle.label | data |
 | tst3.js:10:38:10:43 | data.p | semmle.label | data.p |
-| tst.js:2:7:2:39 | target | semmle.label | target |
+| tst.js:2:7:2:12 | target | semmle.label | target |
 | tst.js:2:16:2:39 | documen ... .search | semmle.label | documen ... .search |
 | tst.js:4:18:4:23 | target | semmle.label | target |
 | tst.js:6:18:6:126 | "<OPTIO ... PTION>" | semmle.label | "<OPTIO ... PTION>" |
@@ -411,8 +487,8 @@ nodes
 | tst.js:6:37:6:114 | documen ... t=")+8) | semmle.label | documen ... t=")+8) |
 | tst.js:9:5:9:42 | '<div s ...  'px">' | semmle.label | '<div s ...  'px">' |
 | tst.js:9:28:9:33 | target | semmle.label | target |
-| tst.js:14:7:14:56 | params | semmle.label | params |
-| tst.js:14:7:14:56 | params [MapValue] | semmle.label | params [MapValue] |
+| tst.js:14:7:14:12 | params | semmle.label | params |
+| tst.js:14:7:14:12 | params [MapValue] | semmle.label | params [MapValue] |
 | tst.js:14:16:14:43 | (new UR ... ation)) [searchParams, MapValue] | semmle.label | (new UR ... ation)) [searchParams, MapValue] |
 | tst.js:14:16:14:43 | (new UR ... ation)) [searchParams] | semmle.label | (new UR ... ation)) [searchParams] |
 | tst.js:14:16:14:56 | (new UR ... hParams | semmle.label | (new UR ... hParams |
@@ -423,8 +499,8 @@ nodes
 | tst.js:15:18:15:23 | params | semmle.label | params |
 | tst.js:15:18:15:23 | params [MapValue] | semmle.label | params [MapValue] |
 | tst.js:15:18:15:35 | params.get('name') | semmle.label | params.get('name') |
-| tst.js:17:7:17:61 | searchParams | semmle.label | searchParams |
-| tst.js:17:7:17:61 | searchParams [MapValue] | semmle.label | searchParams [MapValue] |
+| tst.js:17:7:17:18 | searchParams | semmle.label | searchParams |
+| tst.js:17:7:17:18 | searchParams [MapValue] | semmle.label | searchParams [MapValue] |
 | tst.js:17:22:17:61 | new URL ... ing(1)) | semmle.label | new URL ... ing(1)) |
 | tst.js:17:22:17:61 | new URL ... ing(1)) [MapValue] | semmle.label | new URL ... ing(1)) [MapValue] |
 | tst.js:17:42:17:47 | target | semmle.label | target |
@@ -480,7 +556,7 @@ nodes
 | tst.js:76:39:76:62 | documen ... .search | semmle.label | documen ... .search |
 | tst.js:82:30:82:53 | documen ... .search | semmle.label | documen ... .search |
 | tst.js:88:25:88:48 | documen ... .search | semmle.label | documen ... .search |
-| tst.js:93:7:93:44 | v | semmle.label | v |
+| tst.js:93:7:93:7 | v | semmle.label | v |
 | tst.js:93:11:93:34 | documen ... .search | semmle.label | documen ... .search |
 | tst.js:93:11:93:44 | documen ... bstr(1) | semmle.label | documen ... bstr(1) |
 | tst.js:95:18:95:18 | v | semmle.label | v |
@@ -490,10 +566,10 @@ nodes
 | tst.js:135:49:135:49 | v | semmle.label | v |
 | tst.js:139:29:139:46 | xssSourceService() | semmle.label | xssSourceService() |
 | tst.js:142:40:142:61 | window. ... .search | semmle.label | window. ... .search |
-| tst.js:161:9:161:41 | target | semmle.label | target |
+| tst.js:161:9:161:14 | target | semmle.label | target |
 | tst.js:161:18:161:41 | documen ... .search | semmle.label | documen ... .search |
 | tst.js:164:28:164:33 | target | semmle.label | target |
-| tst.js:168:9:168:42 | tainted | semmle.label | tainted |
+| tst.js:168:9:168:15 | tainted | semmle.label | tainted |
 | tst.js:168:19:168:42 | documen ... .search | semmle.label | documen ... .search |
 | tst.js:170:31:170:37 | tainted | semmle.label | tainted |
 | tst.js:172:42:172:48 | tainted | semmle.label | tainted |
@@ -501,7 +577,7 @@ nodes
 | tst.js:175:54:175:60 | tainted | semmle.label | tainted |
 | tst.js:176:45:176:51 | tainted | semmle.label | tainted |
 | tst.js:177:49:177:55 | tainted | semmle.label | tainted |
-| tst.js:181:9:181:42 | tainted | semmle.label | tainted |
+| tst.js:181:9:181:15 | tainted | semmle.label | tainted |
 | tst.js:181:19:181:42 | documen ... .search | semmle.label | documen ... .search |
 | tst.js:183:67:183:73 | tainted | semmle.label | tainted |
 | tst.js:184:67:184:73 | tainted | semmle.label | tainted |
@@ -528,7 +604,7 @@ nodes
 | tst.js:244:7:244:10 | name | semmle.label | name |
 | tst.js:248:11:248:21 | window.name | semmle.label | window.name |
 | tst.js:264:22:264:29 | location | semmle.label | location |
-| tst.js:269:9:269:29 | tainted | semmle.label | tainted |
+| tst.js:269:9:269:15 | tainted | semmle.label | tainted |
 | tst.js:269:19:269:29 | window.name | semmle.label | window.name |
 | tst.js:272:59:272:65 | tainted | semmle.label | tainted |
 | tst.js:285:9:285:16 | location | semmle.label | location |
@@ -541,8 +617,8 @@ nodes
 | tst.js:311:10:311:35 | new URL ... cation) [searchParams, MapValue] | semmle.label | new URL ... cation) [searchParams, MapValue] |
 | tst.js:311:10:311:35 | new URL ... cation) [searchParams] | semmle.label | new URL ... cation) [searchParams] |
 | tst.js:311:18:311:34 | document.location | semmle.label | document.location |
-| tst.js:315:7:315:43 | params | semmle.label | params |
-| tst.js:315:7:315:43 | params [MapValue] | semmle.label | params [MapValue] |
+| tst.js:315:7:315:12 | params | semmle.label | params |
+| tst.js:315:7:315:12 | params [MapValue] | semmle.label | params [MapValue] |
 | tst.js:315:16:315:30 | getTaintedUrl() [searchParams, MapValue] | semmle.label | getTaintedUrl() [searchParams, MapValue] |
 | tst.js:315:16:315:30 | getTaintedUrl() [searchParams] | semmle.label | getTaintedUrl() [searchParams] |
 | tst.js:315:16:315:43 | getTain ... hParams | semmle.label | getTain ... hParams |
@@ -555,19 +631,19 @@ nodes
 | tst.js:327:5:327:12 | getUrl() [hash] | semmle.label | getUrl() [hash] |
 | tst.js:327:5:327:17 | getUrl().hash | semmle.label | getUrl().hash |
 | tst.js:327:5:327:30 | getUrl( ... ring(1) | semmle.label | getUrl( ... ring(1) |
-| tst.js:332:7:332:39 | target | semmle.label | target |
+| tst.js:332:7:332:12 | target | semmle.label | target |
 | tst.js:332:16:332:39 | documen ... .search | semmle.label | documen ... .search |
 | tst.js:333:12:333:17 | target | semmle.label | target |
-| tst.js:339:10:339:42 | target | semmle.label | target |
+| tst.js:339:10:339:15 | target | semmle.label | target |
 | tst.js:339:19:339:42 | documen ... .search | semmle.label | documen ... .search |
 | tst.js:340:16:340:21 | target | semmle.label | target |
 | tst.js:341:20:341:25 | target | semmle.label | target |
 | tst.js:344:21:344:26 | target | semmle.label | target |
 | tst.js:347:18:347:23 | target | semmle.label | target |
-| tst.js:355:7:355:39 | target | semmle.label | target |
+| tst.js:355:7:355:12 | target | semmle.label | target |
 | tst.js:355:16:355:39 | documen ... .search | semmle.label | documen ... .search |
 | tst.js:357:18:357:23 | target | semmle.label | target |
-| tst.js:364:7:364:39 | target | semmle.label | target |
+| tst.js:364:7:364:12 | target | semmle.label | target |
 | tst.js:364:16:364:39 | documen ... .search | semmle.label | documen ... .search |
 | tst.js:367:18:367:23 | target | semmle.label | target |
 | tst.js:369:18:369:23 | target | semmle.label | target |
@@ -586,11 +662,11 @@ nodes
 | tst.js:391:19:391:31 | target.taint8 | semmle.label | target.taint8 |
 | tst.js:392:18:392:23 | target [taint8] | semmle.label | target [taint8] |
 | tst.js:392:18:392:30 | target.taint8 | semmle.label | target.taint8 |
-| tst.js:399:7:399:46 | payload | semmle.label | payload |
+| tst.js:399:7:399:13 | payload | semmle.label | payload |
 | tst.js:399:17:399:36 | window.location.hash | semmle.label | window.location.hash |
 | tst.js:399:17:399:46 | window. ... bstr(1) | semmle.label | window. ... bstr(1) |
 | tst.js:400:18:400:24 | payload | semmle.label | payload |
-| tst.js:402:7:402:55 | match | semmle.label | match |
+| tst.js:402:7:402:11 | match | semmle.label | match |
 | tst.js:402:15:402:34 | window.location.hash | semmle.label | window.location.hash |
 | tst.js:402:15:402:55 | window. ... (\\w+)/) | semmle.label | window. ... (\\w+)/) |
 | tst.js:404:20:404:24 | match | semmle.label | match |
@@ -598,11 +674,11 @@ nodes
 | tst.js:407:18:407:37 | window.location.hash | semmle.label | window.location.hash |
 | tst.js:407:18:407:48 | window. ... it('#') [1] | semmle.label | window. ... it('#') [1] |
 | tst.js:407:18:407:51 | window. ... '#')[1] | semmle.label | window. ... '#')[1] |
-| tst.js:411:7:411:39 | target | semmle.label | target |
+| tst.js:411:7:411:12 | target | semmle.label | target |
 | tst.js:411:16:411:39 | documen ... .search | semmle.label | documen ... .search |
 | tst.js:413:18:413:23 | target | semmle.label | target |
 | tst.js:413:18:413:89 | target. ... data>') | semmle.label | target. ... data>') |
-| tst.js:419:6:419:38 | source | semmle.label | source |
+| tst.js:419:6:419:11 | source | semmle.label | source |
 | tst.js:419:15:419:38 | documen ... .search | semmle.label | documen ... .search |
 | tst.js:423:28:423:33 | source | semmle.label | source |
 | tst.js:424:33:424:38 | source | semmle.label | source |
@@ -610,17 +686,17 @@ nodes
 | tst.js:426:41:426:46 | source | semmle.label | source |
 | tst.js:427:44:427:49 | source | semmle.label | source |
 | tst.js:428:32:428:37 | source | semmle.label | source |
-| tst.js:436:7:436:39 | source | semmle.label | source |
+| tst.js:436:7:436:12 | source | semmle.label | source |
 | tst.js:436:16:436:39 | documen ... .search | semmle.label | documen ... .search |
 | tst.js:438:18:438:23 | source | semmle.label | source |
 | tst.js:439:18:439:42 | ansiToH ... source) | semmle.label | ansiToH ... source) |
 | tst.js:439:36:439:41 | source | semmle.label | source |
-| tst.js:443:6:443:38 | source | semmle.label | source |
+| tst.js:443:6:443:11 | source | semmle.label | source |
 | tst.js:443:15:443:38 | documen ... .search | semmle.label | documen ... .search |
 | tst.js:446:21:446:26 | source | semmle.label | source |
 | tst.js:448:19:448:24 | source | semmle.label | source |
 | tst.js:450:20:450:25 | source | semmle.label | source |
-| tst.js:454:7:454:46 | url | semmle.label | url |
+| tst.js:454:7:454:9 | url | semmle.label | url |
 | tst.js:454:13:454:36 | documen ... .search | semmle.label | documen ... .search |
 | tst.js:454:13:454:46 | documen ... bstr(1) | semmle.label | documen ... bstr(1) |
 | tst.js:456:19:456:21 | url | semmle.label | url |
@@ -634,24 +710,24 @@ nodes
 | tst.js:477:18:477:40 | locatio ... bstr(1) | semmle.label | locatio ... bstr(1) |
 | tst.js:484:33:484:63 | decodeU ... n.hash) | semmle.label | decodeU ... n.hash) |
 | tst.js:484:43:484:62 | window.location.hash | semmle.label | window.location.hash |
-| tst.js:491:7:491:39 | target | semmle.label | target |
+| tst.js:491:7:491:12 | target | semmle.label | target |
 | tst.js:491:16:491:39 | documen ... .search | semmle.label | documen ... .search |
 | tst.js:492:18:492:23 | target | semmle.label | target |
 | tst.js:492:18:492:54 | target. ... "), '') | semmle.label | target. ... "), '') |
-| tst.js:498:7:498:26 | source | semmle.label | source |
+| tst.js:498:7:498:12 | source | semmle.label | source |
 | tst.js:498:16:498:26 | window.name | semmle.label | window.name |
 | tst.js:499:18:499:33 | unescape(source) | semmle.label | unescape(source) |
 | tst.js:499:27:499:32 | source | semmle.label | source |
 | typeahead.js:9:28:9:30 | loc | semmle.label | loc |
 | typeahead.js:10:16:10:18 | loc | semmle.label | loc |
-| typeahead.js:20:13:20:45 | target | semmle.label | target |
+| typeahead.js:20:13:20:18 | target | semmle.label | target |
 | typeahead.js:20:22:20:45 | documen ... .search | semmle.label | documen ... .search |
 | typeahead.js:21:12:21:17 | target | semmle.label | target |
 | typeahead.js:24:30:24:32 | val | semmle.label | val |
 | typeahead.js:25:18:25:20 | val | semmle.label | val |
 | v-html.vue:2:8:2:23 | v-html=tainted | semmle.label | v-html=tainted |
 | v-html.vue:6:42:6:58 | document.location | semmle.label | document.location |
-| various-concat-obfuscations.js:2:6:2:39 | tainted | semmle.label | tainted |
+| various-concat-obfuscations.js:2:6:2:12 | tainted | semmle.label | tainted |
 | various-concat-obfuscations.js:2:16:2:39 | documen ... .search | semmle.label | documen ... .search |
 | various-concat-obfuscations.js:4:4:4:31 | "<div>" ... </div>" | semmle.label | "<div>" ... </div>" |
 | various-concat-obfuscations.js:4:14:4:20 | tainted | semmle.label | tainted |
@@ -691,20 +767,20 @@ nodes
 | various-concat-obfuscations.js:21:4:21:47 | indirec ... .attrs) | semmle.label | indirec ... .attrs) |
 | various-concat-obfuscations.js:21:17:21:40 | documen ... .search | semmle.label | documen ... .search |
 | various-concat-obfuscations.js:21:17:21:46 | documen ... h.attrs | semmle.label | documen ... h.attrs |
-| winjs.js:2:7:2:53 | tainted | semmle.label | tainted |
+| winjs.js:2:7:2:13 | tainted | semmle.label | tainted |
 | winjs.js:2:17:2:40 | documen ... .search | semmle.label | documen ... .search |
 | winjs.js:2:17:2:53 | documen ... ring(1) | semmle.label | documen ... ring(1) |
 | winjs.js:3:43:3:49 | tainted | semmle.label | tainted |
 | winjs.js:4:43:4:49 | tainted | semmle.label | tainted |
-| xmlRequest.js:8:13:8:47 | json | semmle.label | json |
+| xmlRequest.js:8:13:8:16 | json | semmle.label | json |
 | xmlRequest.js:8:20:8:47 | JSON.pa ... seText) | semmle.label | JSON.pa ... seText) |
 | xmlRequest.js:8:31:8:46 | xhr.responseText | semmle.label | xhr.responseText |
 | xmlRequest.js:9:28:9:31 | json | semmle.label | json |
 | xmlRequest.js:9:28:9:39 | json.message | semmle.label | json.message |
-| xmlRequest.js:20:11:20:48 | resp | semmle.label | resp |
+| xmlRequest.js:20:11:20:14 | resp | semmle.label | resp |
 | xmlRequest.js:20:18:20:48 | await g ... rl }}") | semmle.label | await g ... rl }}") |
 | xmlRequest.js:20:24:20:48 | got.get ... rl }}") | semmle.label | got.get ... rl }}") |
-| xmlRequest.js:21:11:21:38 | json | semmle.label | json |
+| xmlRequest.js:21:11:21:14 | json | semmle.label | json |
 | xmlRequest.js:21:18:21:38 | JSON.pa ... p.body) | semmle.label | JSON.pa ... p.body) |
 | xmlRequest.js:21:29:21:32 | resp | semmle.label | resp |
 | xmlRequest.js:22:24:22:27 | json | semmle.label | json |
@@ -712,8 +788,8 @@ nodes
 edges
 | addEventListener.js:1:43:1:47 | event | addEventListener.js:2:20:2:24 | event | provenance |  |
 | addEventListener.js:2:20:2:24 | event | addEventListener.js:2:20:2:29 | event.data | provenance |  |
-| addEventListener.js:5:43:5:48 | data | addEventListener.js:6:20:6:23 | data | provenance |  |
-| addEventListener.js:5:43:5:48 | {data} | addEventListener.js:5:43:5:48 | data | provenance |  |
+| addEventListener.js:5:43:5:48 | {data} | addEventListener.js:5:44:5:47 | data | provenance |  |
+| addEventListener.js:5:44:5:47 | data | addEventListener.js:6:20:6:23 | data | provenance |  |
 | addEventListener.js:10:21:10:25 | event | addEventListener.js:12:24:12:28 | event | provenance |  |
 | addEventListener.js:12:24:12:28 | event | addEventListener.js:12:24:12:33 | event.data | provenance |  |
 | angular2-client.ts:26:44:26:69 | this.ro ... .params | angular2-client.ts:26:44:26:73 | this.ro ... ams.foo | provenance |  |
@@ -724,6 +800,44 @@ edges
 | angular-tempate-url.js:13:30:13:31 | ev | angular-tempate-url.js:14:26:14:27 | ev | provenance |  |
 | angular-tempate-url.js:14:26:14:27 | ev | angular-tempate-url.js:14:26:14:32 | ev.data | provenance |  |
 | angular-tempate-url.js:14:26:14:32 | ev.data | angular-tempate-url.js:9:26:9:45 | Cookie.get("unsafe") | provenance |  |
+| aws-db.js:15:31:15:37 | results | aws-db.js:15:31:15:76 | results ... arValue | provenance |  |
+| aws-db.js:20:31:20:38 | response | aws-db.js:20:31:20:54 | respons ... tring() | provenance |  |
+| aws-db.js:24:31:24:39 | response2 | aws-db.js:24:31:24:47 | response2.records | provenance |  |
+| aws-db.js:28:31:28:39 | response3 | aws-db.js:28:31:28:44 | response3.Item | provenance |  |
+| aws-db.js:43:31:43:37 | results | aws-db.js:43:31:43:76 | results ... arValue | provenance |  |
+| aws-db.js:46:35:46:38 | data | aws-db.js:46:35:46:77 | data.Re ... arValue | provenance |  |
+| aws-db.js:51:31:51:38 | response | aws-db.js:51:31:51:54 | respons ... tring() | provenance |  |
+| aws-db.js:54:35:54:38 | data | aws-db.js:54:35:54:54 | data.Body.toString() | provenance |  |
+| aws-db.js:59:31:59:39 | response1 | aws-db.js:59:31:59:47 | response1.records | provenance |  |
+| aws-db.js:62:35:62:38 | data | aws-db.js:62:35:62:46 | data.records | provenance |  |
+| aws-db.js:66:31:66:39 | response2 | aws-db.js:66:31:66:53 | respons ... Results | provenance |  |
+| aws-db.js:69:35:69:38 | data | aws-db.js:69:35:69:52 | data.updateResults | provenance |  |
+| aws-db.js:74:35:74:38 | data | aws-db.js:74:35:74:43 | data.Item | provenance |  |
+| aws-db.js:77:35:77:38 | data | aws-db.js:77:35:77:43 | data.Item | provenance |  |
+| aws.js:14:31:14:36 | result | aws.js:14:31:14:44 | result.comment | provenance |  |
+| aws.js:18:31:18:37 | result2 | aws.js:18:31:18:45 | result2.comment | provenance |  |
+| aws.js:22:31:22:37 | result3 | aws.js:22:31:22:45 | result3.comment | provenance |  |
+| aws.js:26:31:26:37 | result4 | aws.js:26:31:26:45 | result4.comment | provenance |  |
+| aws.js:34:31:34:34 | data | aws.js:34:31:34:42 | data.comment | provenance |  |
+| aws.js:37:35:37:38 | data | aws.js:37:35:37:46 | data.comment | provenance |  |
+| aws.js:47:31:47:34 | data | aws.js:47:31:47:42 | data.comment | provenance |  |
+| aws.js:50:35:50:38 | data | aws.js:50:35:50:46 | data.comment | provenance |  |
+| aws.js:59:31:59:34 | data | aws.js:59:31:59:42 | data.comment | provenance |  |
+| aws.js:62:35:62:38 | data | aws.js:62:35:62:46 | data.comment | provenance |  |
+| aws.js:66:31:66:35 | data2 | aws.js:66:31:66:43 | data2.comment | provenance |  |
+| aws.js:69:35:69:38 | data | aws.js:69:35:69:46 | data.comment | provenance |  |
+| aws.js:78:31:78:34 | data | aws.js:78:31:78:42 | data.comment | provenance |  |
+| aws.js:81:35:81:38 | data | aws.js:81:35:81:46 | data.comment | provenance |  |
+| aws.js:85:31:85:35 | data2 | aws.js:85:31:85:43 | data2.comment | provenance |  |
+| aws.js:88:35:88:38 | data | aws.js:88:35:88:46 | data.comment | provenance |  |
+| aws.js:92:31:92:35 | data3 | aws.js:92:31:92:43 | data3.comment | provenance |  |
+| aws.js:95:35:95:38 | data | aws.js:95:35:95:46 | data.comment | provenance |  |
+| aws.js:99:31:99:35 | data4 | aws.js:99:31:99:43 | data4.comment | provenance |  |
+| aws.js:102:35:102:38 | data | aws.js:102:35:102:46 | data.comment | provenance |  |
+| aws.js:106:31:106:35 | data5 | aws.js:106:31:106:43 | data5.comment | provenance |  |
+| aws.js:109:35:109:38 | data | aws.js:109:35:109:46 | data.comment | provenance |  |
+| aws.js:113:31:113:35 | data6 | aws.js:113:31:113:43 | data6.comment | provenance |  |
+| aws.js:116:35:116:38 | data | aws.js:116:35:116:46 | data.comment | provenance |  |
 | classnames.js:7:47:7:69 | classNa ... w.name) | classnames.js:7:31:7:84 | `<span  ... <span>` | provenance |  |
 | classnames.js:7:58:7:68 | window.name | classnames.js:7:47:7:69 | classNa ... w.name) | provenance |  |
 | classnames.js:8:47:8:70 | classNa ... w.name) | classnames.js:8:31:8:85 | `<span  ... <span>` | provenance |  |
@@ -738,25 +852,25 @@ edges
 | classnames.js:15:52:15:62 | window.name | classnames.js:15:47:15:63 | clsx(window.name) | provenance |  |
 | classnames.js:17:48:17:64 | clsx(window.name) | classnames.js:17:32:17:79 | `<span  ... <span>` | provenance |  |
 | classnames.js:17:53:17:63 | window.name | classnames.js:17:48:17:64 | clsx(window.name) | provenance |  |
-| clipboard.ts:8:11:8:51 | html | clipboard.ts:15:25:15:28 | html | provenance |  |
-| clipboard.ts:8:18:8:51 | clipboa ... /html') | clipboard.ts:8:11:8:51 | html | provenance |  |
-| clipboard.ts:43:15:43:55 | html | clipboard.ts:50:29:50:32 | html | provenance |  |
-| clipboard.ts:43:22:43:55 | clipboa ... /html') | clipboard.ts:43:15:43:55 | html | provenance |  |
-| clipboard.ts:71:13:71:62 | droppedHtml | clipboard.ts:73:29:73:39 | droppedHtml | provenance |  |
-| clipboard.ts:71:27:71:62 | e.clipb ... /html') | clipboard.ts:71:13:71:62 | droppedHtml | provenance |  |
-| clipboard.ts:98:15:98:54 | html | clipboard.ts:99:23:99:26 | html | provenance |  |
-| clipboard.ts:98:22:98:54 | dataTra ... /html') | clipboard.ts:98:15:98:54 | html | provenance |  |
+| clipboard.ts:8:11:8:14 | html | clipboard.ts:15:25:15:28 | html | provenance |  |
+| clipboard.ts:8:18:8:51 | clipboa ... /html') | clipboard.ts:8:11:8:14 | html | provenance |  |
+| clipboard.ts:43:15:43:18 | html | clipboard.ts:50:29:50:32 | html | provenance |  |
+| clipboard.ts:43:22:43:55 | clipboa ... /html') | clipboard.ts:43:15:43:18 | html | provenance |  |
+| clipboard.ts:71:13:71:23 | droppedHtml | clipboard.ts:73:29:73:39 | droppedHtml | provenance |  |
+| clipboard.ts:71:27:71:62 | e.clipb ... /html') | clipboard.ts:71:13:71:23 | droppedHtml | provenance |  |
+| clipboard.ts:98:15:98:18 | html | clipboard.ts:99:23:99:26 | html | provenance |  |
+| clipboard.ts:98:22:98:54 | dataTra ... /html') | clipboard.ts:98:15:98:18 | html | provenance |  |
 | d3.js:4:12:4:22 | window.name | d3.js:11:15:11:24 | getTaint() | provenance |  |
 | d3.js:4:12:4:22 | window.name | d3.js:12:20:12:29 | getTaint() | provenance |  |
 | d3.js:4:12:4:22 | window.name | d3.js:14:20:14:29 | getTaint() | provenance |  |
 | d3.js:4:12:4:22 | window.name | d3.js:21:15:21:24 | getTaint() | provenance |  |
-| dates.js:9:9:9:69 | taint | dates.js:11:63:11:67 | taint | provenance |  |
-| dates.js:9:9:9:69 | taint | dates.js:12:66:12:70 | taint | provenance |  |
-| dates.js:9:9:9:69 | taint | dates.js:13:59:13:63 | taint | provenance |  |
-| dates.js:9:9:9:69 | taint | dates.js:16:62:16:66 | taint | provenance |  |
-| dates.js:9:9:9:69 | taint | dates.js:18:59:18:63 | taint | provenance |  |
-| dates.js:9:9:9:69 | taint | dates.js:21:61:21:65 | taint | provenance |  |
-| dates.js:9:17:9:69 | decodeU ... ing(1)) | dates.js:9:9:9:69 | taint | provenance |  |
+| dates.js:9:9:9:13 | taint | dates.js:11:63:11:67 | taint | provenance |  |
+| dates.js:9:9:9:13 | taint | dates.js:12:66:12:70 | taint | provenance |  |
+| dates.js:9:9:9:13 | taint | dates.js:13:59:13:63 | taint | provenance |  |
+| dates.js:9:9:9:13 | taint | dates.js:16:62:16:66 | taint | provenance |  |
+| dates.js:9:9:9:13 | taint | dates.js:18:59:18:63 | taint | provenance |  |
+| dates.js:9:9:9:13 | taint | dates.js:21:61:21:65 | taint | provenance |  |
+| dates.js:9:17:9:69 | decodeU ... ing(1)) | dates.js:9:9:9:13 | taint | provenance |  |
 | dates.js:9:36:9:55 | window.location.hash | dates.js:9:36:9:68 | window. ... ring(1) | provenance |  |
 | dates.js:9:36:9:55 | window.location.hash | dates.js:9:36:9:68 | window. ... ring(1) | provenance | Config |
 | dates.js:9:36:9:68 | window. ... ring(1) | dates.js:9:17:9:69 | decodeU ... ing(1)) | provenance |  |
@@ -772,11 +886,11 @@ edges
 | dates.js:18:59:18:63 | taint | dates.js:18:42:18:64 | datefor ...  taint) | provenance |  |
 | dates.js:21:42:21:66 | dayjs(t ... (taint) | dates.js:21:31:21:68 | `Time i ... aint)}` | provenance |  |
 | dates.js:21:61:21:65 | taint | dates.js:21:42:21:66 | dayjs(t ... (taint) | provenance |  |
-| dates.js:30:9:30:69 | taint | dates.js:37:77:37:81 | taint | provenance |  |
-| dates.js:30:9:30:69 | taint | dates.js:38:77:38:81 | taint | provenance |  |
-| dates.js:30:9:30:69 | taint | dates.js:39:79:39:83 | taint | provenance |  |
-| dates.js:30:9:30:69 | taint | dates.js:40:77:40:81 | taint | provenance |  |
-| dates.js:30:17:30:69 | decodeU ... ing(1)) | dates.js:30:9:30:69 | taint | provenance |  |
+| dates.js:30:9:30:13 | taint | dates.js:37:77:37:81 | taint | provenance |  |
+| dates.js:30:9:30:13 | taint | dates.js:38:77:38:81 | taint | provenance |  |
+| dates.js:30:9:30:13 | taint | dates.js:39:79:39:83 | taint | provenance |  |
+| dates.js:30:9:30:13 | taint | dates.js:40:77:40:81 | taint | provenance |  |
+| dates.js:30:17:30:69 | decodeU ... ing(1)) | dates.js:30:9:30:13 | taint | provenance |  |
 | dates.js:30:36:30:55 | window.location.hash | dates.js:30:36:30:68 | window. ... ring(1) | provenance |  |
 | dates.js:30:36:30:55 | window.location.hash | dates.js:30:36:30:68 | window. ... ring(1) | provenance | Config |
 | dates.js:30:36:30:68 | window. ... ring(1) | dates.js:30:17:30:69 | decodeU ... ing(1)) | provenance |  |
@@ -788,10 +902,10 @@ edges
 | dates.js:39:79:39:83 | taint | dates.js:39:42:39:84 | moment. ...  taint) | provenance |  |
 | dates.js:40:42:40:82 | dayjs.f ...  taint) | dates.js:40:31:40:84 | `Time i ... aint)}` | provenance |  |
 | dates.js:40:77:40:81 | taint | dates.js:40:42:40:82 | dayjs.f ...  taint) | provenance |  |
-| dates.js:46:9:46:69 | taint | dates.js:48:83:48:87 | taint | provenance |  |
-| dates.js:46:9:46:69 | taint | dates.js:49:82:49:86 | taint | provenance |  |
-| dates.js:46:9:46:69 | taint | dates.js:50:97:50:101 | taint | provenance |  |
-| dates.js:46:17:46:69 | decodeU ... ing(1)) | dates.js:46:9:46:69 | taint | provenance |  |
+| dates.js:46:9:46:13 | taint | dates.js:48:83:48:87 | taint | provenance |  |
+| dates.js:46:9:46:13 | taint | dates.js:49:82:49:86 | taint | provenance |  |
+| dates.js:46:9:46:13 | taint | dates.js:50:97:50:101 | taint | provenance |  |
+| dates.js:46:17:46:69 | decodeU ... ing(1)) | dates.js:46:9:46:13 | taint | provenance |  |
 | dates.js:46:36:46:55 | window.location.hash | dates.js:46:36:46:68 | window. ... ring(1) | provenance |  |
 | dates.js:46:36:46:55 | window.location.hash | dates.js:46:36:46:68 | window. ... ring(1) | provenance | Config |
 | dates.js:46:36:46:68 | window. ... ring(1) | dates.js:46:17:46:69 | decodeU ... ing(1)) | provenance |  |
@@ -801,10 +915,10 @@ edges
 | dates.js:49:82:49:86 | taint | dates.js:49:42:49:87 | new Dat ... (taint) | provenance |  |
 | dates.js:50:42:50:102 | DateTim ... (taint) | dates.js:50:31:50:104 | `Time i ... aint)}` | provenance |  |
 | dates.js:50:97:50:101 | taint | dates.js:50:42:50:102 | DateTim ... (taint) | provenance |  |
-| dates.js:54:9:54:69 | taint | dates.js:57:94:57:98 | taint | provenance |  |
-| dates.js:54:9:54:69 | taint | dates.js:59:80:59:84 | taint | provenance |  |
-| dates.js:54:9:54:69 | taint | dates.js:61:81:61:85 | taint | provenance |  |
-| dates.js:54:17:54:69 | decodeU ... ing(1)) | dates.js:54:9:54:69 | taint | provenance |  |
+| dates.js:54:9:54:13 | taint | dates.js:57:94:57:98 | taint | provenance |  |
+| dates.js:54:9:54:13 | taint | dates.js:59:80:59:84 | taint | provenance |  |
+| dates.js:54:9:54:13 | taint | dates.js:61:81:61:85 | taint | provenance |  |
+| dates.js:54:17:54:69 | decodeU ... ing(1)) | dates.js:54:9:54:13 | taint | provenance |  |
 | dates.js:54:36:54:55 | window.location.hash | dates.js:54:36:54:68 | window. ... ring(1) | provenance |  |
 | dates.js:54:36:54:55 | window.location.hash | dates.js:54:36:54:68 | window. ... ring(1) | provenance | Config |
 | dates.js:54:36:54:68 | window. ... ring(1) | dates.js:54:17:54:69 | decodeU ... ing(1)) | provenance |  |
@@ -814,12 +928,12 @@ edges
 | dates.js:59:80:59:84 | taint | dates.js:59:42:59:85 | luxon.e ... (taint) | provenance |  |
 | dates.js:61:42:61:86 | dayjs.s ... (taint) | dates.js:61:31:61:88 | `Time i ... aint)}` | provenance |  |
 | dates.js:61:81:61:85 | taint | dates.js:61:42:61:86 | dayjs.s ... (taint) | provenance |  |
-| dragAndDrop.ts:8:11:8:50 | html | dragAndDrop.ts:15:25:15:28 | html | provenance |  |
-| dragAndDrop.ts:8:18:8:50 | dataTra ... /html') | dragAndDrop.ts:8:11:8:50 | html | provenance |  |
-| dragAndDrop.ts:43:15:43:54 | html | dragAndDrop.ts:50:29:50:32 | html | provenance |  |
-| dragAndDrop.ts:43:22:43:54 | dataTra ... /html') | dragAndDrop.ts:43:15:43:54 | html | provenance |  |
-| dragAndDrop.ts:71:13:71:61 | droppedHtml | dragAndDrop.ts:73:29:73:39 | droppedHtml | provenance |  |
-| dragAndDrop.ts:71:27:71:61 | e.dataT ... /html') | dragAndDrop.ts:71:13:71:61 | droppedHtml | provenance |  |
+| dragAndDrop.ts:8:11:8:14 | html | dragAndDrop.ts:15:25:15:28 | html | provenance |  |
+| dragAndDrop.ts:8:18:8:50 | dataTra ... /html') | dragAndDrop.ts:8:11:8:14 | html | provenance |  |
+| dragAndDrop.ts:43:15:43:18 | html | dragAndDrop.ts:50:29:50:32 | html | provenance |  |
+| dragAndDrop.ts:43:22:43:54 | dataTra ... /html') | dragAndDrop.ts:43:15:43:18 | html | provenance |  |
+| dragAndDrop.ts:71:13:71:23 | droppedHtml | dragAndDrop.ts:73:29:73:39 | droppedHtml | provenance |  |
+| dragAndDrop.ts:71:27:71:61 | e.dataT ... /html') | dragAndDrop.ts:71:13:71:23 | droppedHtml | provenance |  |
 | event-handler-receiver.js:2:49:2:61 | location.href | event-handler-receiver.js:2:31:2:83 | '<h2><a ... ></h2>' | provenance |  |
 | event-handler-receiver.js:2:49:2:61 | location.href | event-handler-receiver.js:2:31:2:83 | '<h2><a ... ></h2>' | provenance | Config |
 | hana.js:11:37:11:40 | rows | hana.js:11:37:11:51 | rows[0].comment | provenance |  |
@@ -836,13 +950,13 @@ edges
 | hana.js:84:35:84:43 | dummyRows | hana.js:84:35:84:54 | dummyRows[0].comment | provenance |  |
 | hana.js:85:35:85:43 | tableRows | hana.js:85:35:85:54 | tableRows[0].comment | provenance |  |
 | hana.js:90:33:90:34 | rs | hana.js:90:33:90:45 | rs[0].comment | provenance |  |
-| jquery.js:2:7:2:40 | tainted | jquery.js:4:5:4:11 | tainted | provenance |  |
-| jquery.js:2:7:2:40 | tainted | jquery.js:5:13:5:19 | tainted | provenance |  |
-| jquery.js:2:7:2:40 | tainted | jquery.js:6:11:6:17 | tainted | provenance |  |
-| jquery.js:2:7:2:40 | tainted | jquery.js:7:20:7:26 | tainted | provenance |  |
-| jquery.js:2:7:2:40 | tainted | jquery.js:8:28:8:34 | tainted | provenance |  |
-| jquery.js:2:7:2:40 | tainted | jquery.js:36:25:36:31 | tainted | provenance |  |
-| jquery.js:2:17:2:40 | documen ... .search | jquery.js:2:7:2:40 | tainted | provenance |  |
+| jquery.js:2:7:2:13 | tainted | jquery.js:4:5:4:11 | tainted | provenance |  |
+| jquery.js:2:7:2:13 | tainted | jquery.js:5:13:5:19 | tainted | provenance |  |
+| jquery.js:2:7:2:13 | tainted | jquery.js:6:11:6:17 | tainted | provenance |  |
+| jquery.js:2:7:2:13 | tainted | jquery.js:7:20:7:26 | tainted | provenance |  |
+| jquery.js:2:7:2:13 | tainted | jquery.js:8:28:8:34 | tainted | provenance |  |
+| jquery.js:2:7:2:13 | tainted | jquery.js:36:25:36:31 | tainted | provenance |  |
+| jquery.js:2:17:2:40 | documen ... .search | jquery.js:2:7:2:13 | tainted | provenance |  |
 | jquery.js:4:5:4:11 | tainted | jquery.js:5:13:5:19 | tainted | provenance |  |
 | jquery.js:5:13:5:19 | tainted | jquery.js:6:11:6:17 | tainted | provenance |  |
 | jquery.js:6:11:6:17 | tainted | jquery.js:7:20:7:26 | tainted | provenance |  |
@@ -856,13 +970,13 @@ edges
 | jquery.js:15:38:15:59 | window. ... .search | jquery.js:15:19:15:60 | decodeU ... search) | provenance |  |
 | jquery.js:16:38:16:52 | window.location | jquery.js:16:38:16:63 | window. ... tring() | provenance |  |
 | jquery.js:16:38:16:63 | window. ... tring() | jquery.js:16:19:16:64 | decodeU ... ring()) | provenance |  |
-| jquery.js:18:7:18:33 | hash | jquery.js:21:5:21:8 | hash | provenance |  |
-| jquery.js:18:7:18:33 | hash | jquery.js:22:5:22:8 | hash | provenance |  |
-| jquery.js:18:7:18:33 | hash | jquery.js:23:5:23:8 | hash | provenance |  |
-| jquery.js:18:7:18:33 | hash | jquery.js:24:5:24:8 | hash | provenance |  |
-| jquery.js:18:7:18:33 | hash | jquery.js:27:5:27:8 | hash | provenance |  |
-| jquery.js:18:7:18:33 | hash | jquery.js:34:13:34:16 | hash | provenance |  |
-| jquery.js:18:14:18:33 | window.location.hash | jquery.js:18:7:18:33 | hash | provenance |  |
+| jquery.js:18:7:18:10 | hash | jquery.js:21:5:21:8 | hash | provenance |  |
+| jquery.js:18:7:18:10 | hash | jquery.js:22:5:22:8 | hash | provenance |  |
+| jquery.js:18:7:18:10 | hash | jquery.js:23:5:23:8 | hash | provenance |  |
+| jquery.js:18:7:18:10 | hash | jquery.js:24:5:24:8 | hash | provenance |  |
+| jquery.js:18:7:18:10 | hash | jquery.js:27:5:27:8 | hash | provenance |  |
+| jquery.js:18:7:18:10 | hash | jquery.js:34:13:34:16 | hash | provenance |  |
+| jquery.js:18:14:18:33 | window.location.hash | jquery.js:18:7:18:10 | hash | provenance |  |
 | jquery.js:21:5:21:8 | hash | jquery.js:21:5:21:21 | hash.substring(1) | provenance | Config |
 | jquery.js:22:5:22:8 | hash | jquery.js:22:5:22:25 | hash.su ... (1, 10) | provenance | Config |
 | jquery.js:23:5:23:8 | hash | jquery.js:23:5:23:18 | hash.substr(1) | provenance | Config |
@@ -872,51 +986,51 @@ edges
 | jquery.js:34:13:34:16 | hash | jquery.js:34:5:34:25 | '<b>' + ...  '</b>' | provenance | Config |
 | jquery.js:36:25:36:31 | tainted | jquery.js:37:31:37:37 | tainted | provenance |  |
 | jquery.js:37:31:37:37 | tainted | jquery.js:37:25:37:37 | () => tainted | provenance | Config |
-| json-stringify.jsx:5:9:5:36 | locale | json-stringify.jsx:11:51:11:56 | locale | provenance |  |
-| json-stringify.jsx:5:9:5:36 | locale | json-stringify.jsx:19:56:19:61 | locale | provenance |  |
-| json-stringify.jsx:5:9:5:36 | locale | json-stringify.jsx:31:55:31:60 | locale | provenance |  |
-| json-stringify.jsx:5:18:5:36 | req.param("locale") | json-stringify.jsx:5:9:5:36 | locale | provenance |  |
+| json-stringify.jsx:5:9:5:14 | locale | json-stringify.jsx:11:51:11:56 | locale | provenance |  |
+| json-stringify.jsx:5:9:5:14 | locale | json-stringify.jsx:19:56:19:61 | locale | provenance |  |
+| json-stringify.jsx:5:9:5:14 | locale | json-stringify.jsx:31:55:31:60 | locale | provenance |  |
+| json-stringify.jsx:5:18:5:36 | req.param("locale") | json-stringify.jsx:5:9:5:14 | locale | provenance |  |
 | json-stringify.jsx:11:51:11:56 | locale | json-stringify.jsx:35:40:35:61 | JSON.st ... jsonLD) | provenance |  |
 | json-stringify.jsx:19:56:19:61 | locale | json-stringify.jsx:35:40:35:61 | JSON.st ... jsonLD) | provenance |  |
 | json-stringify.jsx:31:55:31:60 | locale | json-stringify.jsx:31:40:31:61 | JSON.st ... locale) | provenance |  |
-| jwt-server.js:7:9:7:35 | taint | jwt-server.js:9:16:9:20 | taint | provenance |  |
-| jwt-server.js:7:17:7:35 | req.param("wobble") | jwt-server.js:7:9:7:35 | taint | provenance |  |
+| jwt-server.js:7:9:7:13 | taint | jwt-server.js:9:16:9:20 | taint | provenance |  |
+| jwt-server.js:7:17:7:35 | req.param("wobble") | jwt-server.js:7:9:7:13 | taint | provenance |  |
 | jwt-server.js:9:16:9:20 | taint | jwt-server.js:9:55:9:61 | decoded | provenance |  |
 | jwt-server.js:9:55:9:61 | decoded | jwt-server.js:10:19:10:25 | decoded | provenance |  |
 | jwt-server.js:10:19:10:25 | decoded | jwt-server.js:10:19:10:29 | decoded.foo | provenance |  |
 | jwt.js:4:36:4:39 | data | jwt.js:5:30:5:33 | data | provenance |  |
-| jwt.js:5:9:5:34 | decoded | jwt.js:6:14:6:20 | decoded | provenance |  |
-| jwt.js:5:19:5:34 | jwt_decode(data) | jwt.js:5:9:5:34 | decoded | provenance |  |
+| jwt.js:5:9:5:15 | decoded | jwt.js:6:14:6:20 | decoded | provenance |  |
+| jwt.js:5:19:5:34 | jwt_decode(data) | jwt.js:5:9:5:15 | decoded | provenance |  |
 | jwt.js:5:30:5:33 | data | jwt.js:5:19:5:34 | jwt_decode(data) | provenance |  |
 | nodemailer.js:13:50:13:66 | req.query.message | nodemailer.js:13:11:13:69 | `Hi, yo ... sage}.` | provenance |  |
-| optionalSanitizer.js:2:7:2:39 | target | optionalSanitizer.js:6:18:6:23 | target | provenance |  |
-| optionalSanitizer.js:2:7:2:39 | target | optionalSanitizer.js:8:17:8:22 | target | provenance |  |
-| optionalSanitizer.js:2:7:2:39 | target | optionalSanitizer.js:15:9:15:14 | target | provenance |  |
-| optionalSanitizer.js:2:16:2:39 | documen ... .search | optionalSanitizer.js:2:7:2:39 | target | provenance |  |
-| optionalSanitizer.js:8:7:8:22 | tainted | optionalSanitizer.js:9:18:9:24 | tainted | provenance |  |
-| optionalSanitizer.js:8:17:8:22 | target | optionalSanitizer.js:8:7:8:22 | tainted | provenance |  |
+| optionalSanitizer.js:2:7:2:12 | target | optionalSanitizer.js:6:18:6:23 | target | provenance |  |
+| optionalSanitizer.js:2:7:2:12 | target | optionalSanitizer.js:8:17:8:22 | target | provenance |  |
+| optionalSanitizer.js:2:7:2:12 | target | optionalSanitizer.js:15:9:15:14 | target | provenance |  |
+| optionalSanitizer.js:2:16:2:39 | documen ... .search | optionalSanitizer.js:2:7:2:12 | target | provenance |  |
+| optionalSanitizer.js:8:7:8:13 | tainted | optionalSanitizer.js:9:18:9:24 | tainted | provenance |  |
+| optionalSanitizer.js:8:17:8:22 | target | optionalSanitizer.js:8:7:8:13 | tainted | provenance |  |
 | optionalSanitizer.js:15:9:15:14 | target | optionalSanitizer.js:16:18:16:18 | x | provenance |  |
 | optionalSanitizer.js:16:18:16:18 | x | optionalSanitizer.js:17:20:17:20 | x | provenance |  |
-| optionalSanitizer.js:26:7:26:39 | target | optionalSanitizer.js:31:18:31:23 | target | provenance |  |
-| optionalSanitizer.js:26:7:26:39 | target | optionalSanitizer.js:38:18:38:23 | target | provenance |  |
-| optionalSanitizer.js:26:7:26:39 | target | optionalSanitizer.js:45:41:45:46 | target | provenance |  |
-| optionalSanitizer.js:26:7:26:39 | target | optionalSanitizer.js:45:51:45:56 | target | provenance |  |
-| optionalSanitizer.js:26:16:26:39 | documen ... .search | optionalSanitizer.js:26:7:26:39 | target | provenance |  |
+| optionalSanitizer.js:26:7:26:12 | target | optionalSanitizer.js:31:18:31:23 | target | provenance |  |
+| optionalSanitizer.js:26:7:26:12 | target | optionalSanitizer.js:38:18:38:23 | target | provenance |  |
+| optionalSanitizer.js:26:7:26:12 | target | optionalSanitizer.js:45:41:45:46 | target | provenance |  |
+| optionalSanitizer.js:26:7:26:12 | target | optionalSanitizer.js:45:51:45:56 | target | provenance |  |
+| optionalSanitizer.js:26:16:26:39 | documen ... .search | optionalSanitizer.js:26:7:26:12 | target | provenance |  |
 | optionalSanitizer.js:28:24:28:24 | x | optionalSanitizer.js:29:12:29:12 | x | provenance |  |
-| optionalSanitizer.js:31:7:31:23 | tainted2 | optionalSanitizer.js:32:18:32:25 | tainted2 | provenance |  |
-| optionalSanitizer.js:31:7:31:23 | tainted2 | optionalSanitizer.js:34:28:34:35 | tainted2 | provenance |  |
-| optionalSanitizer.js:31:7:31:23 | tainted2 | optionalSanitizer.js:36:18:36:25 | tainted2 | provenance |  |
-| optionalSanitizer.js:31:18:31:23 | target | optionalSanitizer.js:31:7:31:23 | tainted2 | provenance |  |
-| optionalSanitizer.js:34:5:34:36 | tainted2 | optionalSanitizer.js:36:18:36:25 | tainted2 | provenance |  |
-| optionalSanitizer.js:34:16:34:36 | sanitiz ... inted2) | optionalSanitizer.js:34:5:34:36 | tainted2 | provenance |  |
+| optionalSanitizer.js:31:7:31:14 | tainted2 | optionalSanitizer.js:32:18:32:25 | tainted2 | provenance |  |
+| optionalSanitizer.js:31:7:31:14 | tainted2 | optionalSanitizer.js:34:28:34:35 | tainted2 | provenance |  |
+| optionalSanitizer.js:31:7:31:14 | tainted2 | optionalSanitizer.js:36:18:36:25 | tainted2 | provenance |  |
+| optionalSanitizer.js:31:18:31:23 | target | optionalSanitizer.js:31:7:31:14 | tainted2 | provenance |  |
+| optionalSanitizer.js:34:5:34:12 | tainted2 | optionalSanitizer.js:36:18:36:25 | tainted2 | provenance |  |
+| optionalSanitizer.js:34:16:34:36 | sanitiz ... inted2) | optionalSanitizer.js:34:5:34:12 | tainted2 | provenance |  |
 | optionalSanitizer.js:34:28:34:35 | tainted2 | optionalSanitizer.js:28:24:28:24 | x | provenance |  |
 | optionalSanitizer.js:34:28:34:35 | tainted2 | optionalSanitizer.js:34:16:34:36 | sanitiz ... inted2) | provenance |  |
-| optionalSanitizer.js:38:7:38:23 | tainted3 | optionalSanitizer.js:39:18:39:25 | tainted3 | provenance |  |
-| optionalSanitizer.js:38:7:38:23 | tainted3 | optionalSanitizer.js:41:28:41:35 | tainted3 | provenance |  |
-| optionalSanitizer.js:38:7:38:23 | tainted3 | optionalSanitizer.js:43:18:43:25 | tainted3 | provenance |  |
-| optionalSanitizer.js:38:18:38:23 | target | optionalSanitizer.js:38:7:38:23 | tainted3 | provenance |  |
-| optionalSanitizer.js:41:5:41:36 | tainted3 | optionalSanitizer.js:43:18:43:25 | tainted3 | provenance |  |
-| optionalSanitizer.js:41:16:41:36 | sanitiz ... inted3) | optionalSanitizer.js:41:5:41:36 | tainted3 | provenance |  |
+| optionalSanitizer.js:38:7:38:14 | tainted3 | optionalSanitizer.js:39:18:39:25 | tainted3 | provenance |  |
+| optionalSanitizer.js:38:7:38:14 | tainted3 | optionalSanitizer.js:41:28:41:35 | tainted3 | provenance |  |
+| optionalSanitizer.js:38:7:38:14 | tainted3 | optionalSanitizer.js:43:18:43:25 | tainted3 | provenance |  |
+| optionalSanitizer.js:38:18:38:23 | target | optionalSanitizer.js:38:7:38:14 | tainted3 | provenance |  |
+| optionalSanitizer.js:41:5:41:12 | tainted3 | optionalSanitizer.js:43:18:43:25 | tainted3 | provenance |  |
+| optionalSanitizer.js:41:16:41:36 | sanitiz ... inted3) | optionalSanitizer.js:41:5:41:12 | tainted3 | provenance |  |
 | optionalSanitizer.js:41:28:41:35 | tainted3 | optionalSanitizer.js:28:24:28:24 | x | provenance |  |
 | optionalSanitizer.js:41:28:41:35 | tainted3 | optionalSanitizer.js:41:16:41:36 | sanitiz ... inted3) | provenance |  |
 | optionalSanitizer.js:45:29:45:47 | sanitizeBad(target) | optionalSanitizer.js:45:18:45:56 | sanitiz ...  target | provenance |  |
@@ -925,8 +1039,8 @@ edges
 | optionalSanitizer.js:45:51:45:56 | target | optionalSanitizer.js:45:18:45:56 | sanitiz ...  target | provenance |  |
 | pages/[id].jsx:3:30:3:35 | params [id] | pages/[id].jsx:13:44:13:49 | params [id] | provenance |  |
 | pages/[id].jsx:3:30:3:35 | params [q] | pages/[id].jsx:16:44:16:49 | params [q] | provenance |  |
-| pages/[id].jsx:5:9:5:14 | { id } | pages/[id].jsx:5:9:5:29 | id | provenance |  |
-| pages/[id].jsx:5:9:5:29 | id | pages/[id].jsx:10:44:10:45 | id | provenance |  |
+| pages/[id].jsx:5:9:5:14 | { id } | pages/[id].jsx:5:11:5:12 | id | provenance |  |
+| pages/[id].jsx:5:11:5:12 | id | pages/[id].jsx:10:44:10:45 | id | provenance |  |
 | pages/[id].jsx:5:18:5:29 | router.query | pages/[id].jsx:5:9:5:14 | { id } | provenance |  |
 | pages/[id].jsx:13:44:13:49 | params [id] | pages/[id].jsx:13:44:13:52 | params.id | provenance |  |
 | pages/[id].jsx:16:44:16:49 | params [q] | pages/[id].jsx:16:44:16:51 | params.q | provenance |  |
@@ -936,30 +1050,30 @@ edges
 | pages/[id].jsx:25:11:25:33 | context ... d \|\| "" | pages/[id].jsx:24:12:27:5 | {\\n      ... e\\n    } [id] | provenance |  |
 | pages/[id].jsx:26:10:26:22 | context.query | pages/[id].jsx:26:10:26:36 | context ... r \|\| "" | provenance |  |
 | pages/[id].jsx:26:10:26:36 | context ... r \|\| "" | pages/[id].jsx:24:12:27:5 | {\\n      ... e\\n    } [q] | provenance |  |
-| react-native.js:7:7:7:33 | tainted | react-native.js:8:18:8:24 | tainted | provenance |  |
-| react-native.js:7:7:7:33 | tainted | react-native.js:9:27:9:33 | tainted | provenance |  |
-| react-native.js:7:17:7:33 | req.param("code") | react-native.js:7:7:7:33 | tainted | provenance |  |
+| react-native.js:7:7:7:13 | tainted | react-native.js:8:18:8:24 | tainted | provenance |  |
+| react-native.js:7:7:7:13 | tainted | react-native.js:9:27:9:33 | tainted | provenance |  |
+| react-native.js:7:17:7:33 | req.param("code") | react-native.js:7:7:7:13 | tainted | provenance |  |
 | react-use-router.js:8:21:8:32 | router.query | react-use-router.js:8:21:8:39 | router.query.foobar | provenance |  |
 | react-use-router.js:11:24:11:35 | router.query | react-use-router.js:11:24:11:42 | router.query.foobar | provenance |  |
 | react-use-router.js:23:43:23:54 | router.query | react-use-router.js:23:43:23:61 | router.query.foobar | provenance |  |
 | react-use-router.js:33:21:33:32 | router.query | react-use-router.js:33:21:33:39 | router.query.foobar | provenance |  |
-| react-use-state.js:4:9:4:49 | state | react-use-state.js:5:51:5:55 | state | provenance |  |
-| react-use-state.js:4:38:4:48 | window.name | react-use-state.js:4:9:4:49 | state | provenance |  |
-| react-use-state.js:9:9:9:43 | state | react-use-state.js:11:51:11:55 | state | provenance |  |
-| react-use-state.js:10:14:10:24 | window.name | react-use-state.js:9:9:9:43 | state | provenance |  |
-| react-use-state.js:15:9:15:43 | state | react-use-state.js:17:51:17:55 | state | provenance |  |
-| react-use-state.js:15:10:15:14 | state | react-use-state.js:15:9:15:43 | state | provenance |  |
+| react-use-state.js:4:10:4:14 | state | react-use-state.js:5:51:5:55 | state | provenance |  |
+| react-use-state.js:4:38:4:48 | window.name | react-use-state.js:4:10:4:14 | state | provenance |  |
+| react-use-state.js:9:10:9:14 | state | react-use-state.js:11:51:11:55 | state | provenance |  |
+| react-use-state.js:10:14:10:24 | window.name | react-use-state.js:9:10:9:14 | state | provenance |  |
+| react-use-state.js:15:10:15:14 | state | react-use-state.js:15:10:15:14 | state | provenance |  |
+| react-use-state.js:15:10:15:14 | state | react-use-state.js:17:51:17:55 | state | provenance |  |
 | react-use-state.js:16:20:16:30 | window.name | react-use-state.js:15:10:15:14 | state | provenance |  |
 | react-use-state.js:21:10:21:14 | state | react-use-state.js:22:14:22:17 | prev | provenance |  |
 | react-use-state.js:22:14:22:17 | prev | react-use-state.js:23:35:23:38 | prev | provenance |  |
 | react-use-state.js:25:20:25:30 | window.name | react-use-state.js:21:10:21:14 | state | provenance |  |
-| sanitiser.js:16:7:16:27 | tainted | sanitiser.js:23:29:23:35 | tainted | provenance |  |
-| sanitiser.js:16:7:16:27 | tainted | sanitiser.js:30:29:30:35 | tainted | provenance |  |
-| sanitiser.js:16:7:16:27 | tainted | sanitiser.js:33:29:33:35 | tainted | provenance |  |
-| sanitiser.js:16:7:16:27 | tainted | sanitiser.js:38:29:38:35 | tainted | provenance |  |
-| sanitiser.js:16:7:16:27 | tainted | sanitiser.js:45:29:45:35 | tainted | provenance |  |
-| sanitiser.js:16:7:16:27 | tainted | sanitiser.js:48:19:48:25 | tainted | provenance |  |
-| sanitiser.js:16:17:16:27 | window.name | sanitiser.js:16:7:16:27 | tainted | provenance |  |
+| sanitiser.js:16:7:16:13 | tainted | sanitiser.js:23:29:23:35 | tainted | provenance |  |
+| sanitiser.js:16:7:16:13 | tainted | sanitiser.js:30:29:30:35 | tainted | provenance |  |
+| sanitiser.js:16:7:16:13 | tainted | sanitiser.js:33:29:33:35 | tainted | provenance |  |
+| sanitiser.js:16:7:16:13 | tainted | sanitiser.js:38:29:38:35 | tainted | provenance |  |
+| sanitiser.js:16:7:16:13 | tainted | sanitiser.js:45:29:45:35 | tainted | provenance |  |
+| sanitiser.js:16:7:16:13 | tainted | sanitiser.js:48:19:48:25 | tainted | provenance |  |
+| sanitiser.js:16:17:16:27 | window.name | sanitiser.js:16:7:16:13 | tainted | provenance |  |
 | sanitiser.js:23:29:23:35 | tainted | sanitiser.js:23:21:23:44 | '<b>' + ...  '</b>' | provenance |  |
 | sanitiser.js:30:29:30:35 | tainted | sanitiser.js:30:21:30:44 | '<b>' + ...  '</b>' | provenance |  |
 | sanitiser.js:33:29:33:35 | tainted | sanitiser.js:33:21:33:44 | '<b>' + ...  '</b>' | provenance |  |
@@ -969,8 +1083,8 @@ edges
 | stored-xss.js:2:39:2:62 | documen ... .search | stored-xss.js:5:20:5:52 | session ... ssion') | provenance |  |
 | stored-xss.js:3:35:3:58 | documen ... .search | stored-xss.js:8:20:8:48 | localSt ... local') | provenance |  |
 | stored-xss.js:3:35:3:58 | documen ... .search | stored-xss.js:10:16:10:44 | localSt ... local') | provenance |  |
-| stored-xss.js:10:9:10:44 | href | stored-xss.js:12:35:12:38 | href | provenance |  |
-| stored-xss.js:10:16:10:44 | localSt ... local') | stored-xss.js:10:9:10:44 | href | provenance |  |
+| stored-xss.js:10:9:10:12 | href | stored-xss.js:12:35:12:38 | href | provenance |  |
+| stored-xss.js:10:16:10:44 | localSt ... local') | stored-xss.js:10:9:10:12 | href | provenance |  |
 | stored-xss.js:12:35:12:38 | href | stored-xss.js:12:20:12:54 | "<a hre ... ar</a>" | provenance |  |
 | stored-xss.js:12:35:12:38 | href | stored-xss.js:12:20:12:54 | "<a hre ... ar</a>" | provenance | Config |
 | string-manipulations.js:5:16:5:37 | documen ... on.href | string-manipulations.js:5:16:5:47 | documen ... lueOf() | provenance |  |
@@ -980,24 +1094,24 @@ edges
 | string-manipulations.js:9:36:9:57 | documen ... on.href | string-manipulations.js:9:16:9:58 | String. ... n.href) | provenance |  |
 | string-manipulations.js:10:23:10:44 | documen ... on.href | string-manipulations.js:10:16:10:45 | String( ... n.href) | provenance |  |
 | tainted-url-suffix-arguments.js:3:17:3:17 | y | tainted-url-suffix-arguments.js:6:22:6:22 | y | provenance |  |
-| tainted-url-suffix-arguments.js:11:11:11:36 | url | tainted-url-suffix-arguments.js:12:17:12:19 | url | provenance |  |
-| tainted-url-suffix-arguments.js:11:17:11:36 | window.location.href | tainted-url-suffix-arguments.js:11:11:11:36 | url | provenance |  |
+| tainted-url-suffix-arguments.js:11:11:11:13 | url | tainted-url-suffix-arguments.js:12:17:12:19 | url | provenance |  |
+| tainted-url-suffix-arguments.js:11:17:11:36 | window.location.href | tainted-url-suffix-arguments.js:11:11:11:13 | url | provenance |  |
 | tainted-url-suffix-arguments.js:12:17:12:19 | url | tainted-url-suffix-arguments.js:3:17:3:17 | y | provenance |  |
-| tooltip.jsx:6:11:6:30 | source | tooltip.jsx:10:25:10:30 | source | provenance |  |
-| tooltip.jsx:6:11:6:30 | source | tooltip.jsx:11:25:11:30 | source | provenance |  |
-| tooltip.jsx:6:20:6:30 | window.name | tooltip.jsx:6:11:6:30 | source | provenance |  |
-| tooltip.jsx:17:11:17:33 | provide [source] | tooltip.jsx:18:51:18:57 | provide [source] | provenance |  |
-| tooltip.jsx:17:21:17:33 | props.provide [source] | tooltip.jsx:17:11:17:33 | provide [source] | provenance |  |
+| tooltip.jsx:6:11:6:16 | source | tooltip.jsx:10:25:10:30 | source | provenance |  |
+| tooltip.jsx:6:11:6:16 | source | tooltip.jsx:11:25:11:30 | source | provenance |  |
+| tooltip.jsx:6:20:6:30 | window.name | tooltip.jsx:6:11:6:16 | source | provenance |  |
+| tooltip.jsx:17:11:17:17 | provide [source] | tooltip.jsx:18:51:18:57 | provide [source] | provenance |  |
+| tooltip.jsx:17:21:17:33 | props.provide [source] | tooltip.jsx:17:11:17:17 | provide [source] | provenance |  |
 | tooltip.jsx:18:51:18:57 | provide [source] | tooltip.jsx:18:51:18:59 | provide() | provenance |  |
 | tooltip.jsx:18:51:18:57 | provide [source] | tooltip.jsx:23:38:23:43 | source | provenance |  |
-| tooltip.jsx:22:11:22:30 | source | tooltip.jsx:17:21:17:33 | props.provide [source] | provenance |  |
-| tooltip.jsx:22:20:22:30 | window.name | tooltip.jsx:22:11:22:30 | source | provenance |  |
-| translate.js:6:7:6:39 | target | translate.js:7:42:7:47 | target | provenance |  |
-| translate.js:6:16:6:39 | documen ... .search | translate.js:6:7:6:39 | target | provenance |  |
-| translate.js:7:7:7:61 | searchParams | translate.js:8:27:8:38 | searchParams | provenance |  |
-| translate.js:7:7:7:61 | searchParams [MapValue] | translate.js:8:27:8:38 | searchParams [MapValue] | provenance |  |
-| translate.js:7:22:7:61 | new URL ... ing(1)) | translate.js:7:7:7:61 | searchParams | provenance |  |
-| translate.js:7:22:7:61 | new URL ... ing(1)) [MapValue] | translate.js:7:7:7:61 | searchParams [MapValue] | provenance |  |
+| tooltip.jsx:22:11:22:16 | source | tooltip.jsx:17:21:17:33 | props.provide [source] | provenance |  |
+| tooltip.jsx:22:20:22:30 | window.name | tooltip.jsx:22:11:22:16 | source | provenance |  |
+| translate.js:6:7:6:12 | target | translate.js:7:42:7:47 | target | provenance |  |
+| translate.js:6:16:6:39 | documen ... .search | translate.js:6:7:6:12 | target | provenance |  |
+| translate.js:7:7:7:18 | searchParams | translate.js:8:27:8:38 | searchParams | provenance |  |
+| translate.js:7:7:7:18 | searchParams [MapValue] | translate.js:8:27:8:38 | searchParams [MapValue] | provenance |  |
+| translate.js:7:22:7:61 | new URL ... ing(1)) | translate.js:7:7:7:18 | searchParams | provenance |  |
+| translate.js:7:22:7:61 | new URL ... ing(1)) [MapValue] | translate.js:7:7:7:18 | searchParams [MapValue] | provenance |  |
 | translate.js:7:42:7:47 | target | translate.js:7:42:7:60 | target.substring(1) | provenance |  |
 | translate.js:7:42:7:47 | target | translate.js:7:42:7:60 | target.substring(1) | provenance | Config |
 | translate.js:7:42:7:47 | target | translate.js:7:42:7:60 | target.substring(1) | provenance | Config |
@@ -1024,32 +1138,32 @@ edges
 | tst3.js:7:32:7:35 | data | tst3.js:7:32:7:37 | data.p | provenance |  |
 | tst3.js:9:37:9:40 | data | tst3.js:9:37:9:42 | data.p | provenance |  |
 | tst3.js:10:38:10:41 | data | tst3.js:10:38:10:43 | data.p | provenance |  |
-| tst.js:2:7:2:39 | target | tst.js:4:18:4:23 | target | provenance |  |
-| tst.js:2:7:2:39 | target | tst.js:9:28:9:33 | target | provenance |  |
-| tst.js:2:7:2:39 | target | tst.js:17:42:17:47 | target | provenance |  |
-| tst.js:2:16:2:39 | documen ... .search | tst.js:2:7:2:39 | target | provenance |  |
+| tst.js:2:7:2:12 | target | tst.js:4:18:4:23 | target | provenance |  |
+| tst.js:2:7:2:12 | target | tst.js:9:28:9:33 | target | provenance |  |
+| tst.js:2:7:2:12 | target | tst.js:17:42:17:47 | target | provenance |  |
+| tst.js:2:16:2:39 | documen ... .search | tst.js:2:7:2:12 | target | provenance |  |
 | tst.js:6:37:6:58 | documen ... on.href | tst.js:6:37:6:114 | documen ... t=")+8) | provenance |  |
 | tst.js:6:37:6:58 | documen ... on.href | tst.js:6:37:6:114 | documen ... t=")+8) | provenance | Config |
 | tst.js:6:37:6:114 | documen ... t=")+8) | tst.js:6:18:6:126 | "<OPTIO ... PTION>" | provenance |  |
 | tst.js:6:37:6:114 | documen ... t=")+8) | tst.js:6:18:6:126 | "<OPTIO ... PTION>" | provenance |  |
 | tst.js:6:37:6:114 | documen ... t=")+8) | tst.js:6:18:6:126 | "<OPTIO ... PTION>" | provenance | Config |
 | tst.js:9:28:9:33 | target | tst.js:9:5:9:42 | '<div s ...  'px">' | provenance | Config |
-| tst.js:14:7:14:56 | params | tst.js:15:18:15:23 | params | provenance |  |
-| tst.js:14:7:14:56 | params [MapValue] | tst.js:15:18:15:23 | params [MapValue] | provenance |  |
+| tst.js:14:7:14:12 | params | tst.js:15:18:15:23 | params | provenance |  |
+| tst.js:14:7:14:12 | params [MapValue] | tst.js:15:18:15:23 | params [MapValue] | provenance |  |
 | tst.js:14:16:14:43 | (new UR ... ation)) [searchParams, MapValue] | tst.js:14:16:14:56 | (new UR ... hParams [MapValue] | provenance |  |
 | tst.js:14:16:14:43 | (new UR ... ation)) [searchParams] | tst.js:14:16:14:56 | (new UR ... hParams | provenance |  |
-| tst.js:14:16:14:56 | (new UR ... hParams | tst.js:14:7:14:56 | params | provenance |  |
-| tst.js:14:16:14:56 | (new UR ... hParams [MapValue] | tst.js:14:7:14:56 | params [MapValue] | provenance |  |
+| tst.js:14:16:14:56 | (new UR ... hParams | tst.js:14:7:14:12 | params | provenance |  |
+| tst.js:14:16:14:56 | (new UR ... hParams [MapValue] | tst.js:14:7:14:12 | params [MapValue] | provenance |  |
 | tst.js:14:17:14:42 | new URL ... cation) [searchParams, MapValue] | tst.js:14:16:14:43 | (new UR ... ation)) [searchParams, MapValue] | provenance |  |
 | tst.js:14:17:14:42 | new URL ... cation) [searchParams] | tst.js:14:16:14:43 | (new UR ... ation)) [searchParams] | provenance |  |
 | tst.js:14:25:14:41 | document.location | tst.js:14:17:14:42 | new URL ... cation) [searchParams, MapValue] | provenance |  |
 | tst.js:14:25:14:41 | document.location | tst.js:14:17:14:42 | new URL ... cation) [searchParams] | provenance |  |
 | tst.js:15:18:15:23 | params | tst.js:15:18:15:35 | params.get('name') | provenance | Config |
 | tst.js:15:18:15:23 | params [MapValue] | tst.js:15:18:15:35 | params.get('name') | provenance |  |
-| tst.js:17:7:17:61 | searchParams | tst.js:18:18:18:29 | searchParams | provenance |  |
-| tst.js:17:7:17:61 | searchParams [MapValue] | tst.js:18:18:18:29 | searchParams [MapValue] | provenance |  |
-| tst.js:17:22:17:61 | new URL ... ing(1)) | tst.js:17:7:17:61 | searchParams | provenance |  |
-| tst.js:17:22:17:61 | new URL ... ing(1)) [MapValue] | tst.js:17:7:17:61 | searchParams [MapValue] | provenance |  |
+| tst.js:17:7:17:18 | searchParams | tst.js:18:18:18:29 | searchParams | provenance |  |
+| tst.js:17:7:17:18 | searchParams [MapValue] | tst.js:18:18:18:29 | searchParams [MapValue] | provenance |  |
+| tst.js:17:22:17:61 | new URL ... ing(1)) | tst.js:17:7:17:18 | searchParams | provenance |  |
+| tst.js:17:22:17:61 | new URL ... ing(1)) [MapValue] | tst.js:17:7:17:18 | searchParams [MapValue] | provenance |  |
 | tst.js:17:42:17:47 | target | tst.js:17:42:17:60 | target.substring(1) | provenance |  |
 | tst.js:17:42:17:47 | target | tst.js:17:42:17:60 | target.substring(1) | provenance | Config |
 | tst.js:17:42:17:47 | target | tst.js:17:42:17:60 | target.substring(1) | provenance | Config |
@@ -1099,31 +1213,31 @@ edges
 | tst.js:58:1:58:27 | [,docum ... search] [1] | tst.js:58:46:58:46 | x | provenance |  |
 | tst.js:58:3:58:26 | documen ... .search | tst.js:58:1:58:27 | [,docum ... search] [1] | provenance |  |
 | tst.js:58:46:58:46 | x | tst.js:60:20:60:20 | x | provenance |  |
-| tst.js:93:7:93:44 | v | tst.js:95:18:95:18 | v | provenance |  |
-| tst.js:93:7:93:44 | v | tst.js:120:18:120:18 | v | provenance |  |
+| tst.js:93:7:93:7 | v | tst.js:95:18:95:18 | v | provenance |  |
+| tst.js:93:7:93:7 | v | tst.js:120:18:120:18 | v | provenance |  |
 | tst.js:93:11:93:34 | documen ... .search | tst.js:93:11:93:44 | documen ... bstr(1) | provenance |  |
 | tst.js:93:11:93:34 | documen ... .search | tst.js:93:11:93:44 | documen ... bstr(1) | provenance | Config |
-| tst.js:93:11:93:44 | documen ... bstr(1) | tst.js:93:7:93:44 | v | provenance |  |
+| tst.js:93:11:93:44 | documen ... bstr(1) | tst.js:93:7:93:7 | v | provenance |  |
 | tst.js:132:29:132:50 | window. ... .search | tst.js:135:29:135:29 | v | provenance |  |
 | tst.js:135:29:135:29 | v | tst.js:135:49:135:49 | v | provenance |  |
 | tst.js:142:40:142:61 | window. ... .search | tst.js:139:29:139:46 | xssSourceService() | provenance |  |
-| tst.js:161:9:161:41 | target | tst.js:164:28:164:33 | target | provenance |  |
-| tst.js:161:18:161:41 | documen ... .search | tst.js:161:9:161:41 | target | provenance |  |
-| tst.js:168:9:168:42 | tainted | tst.js:170:31:170:37 | tainted | provenance |  |
-| tst.js:168:9:168:42 | tainted | tst.js:172:42:172:48 | tainted | provenance |  |
-| tst.js:168:9:168:42 | tainted | tst.js:173:33:173:39 | tainted | provenance |  |
-| tst.js:168:9:168:42 | tainted | tst.js:175:54:175:60 | tainted | provenance |  |
-| tst.js:168:9:168:42 | tainted | tst.js:176:45:176:51 | tainted | provenance |  |
-| tst.js:168:9:168:42 | tainted | tst.js:177:49:177:55 | tainted | provenance |  |
-| tst.js:168:19:168:42 | documen ... .search | tst.js:168:9:168:42 | tainted | provenance |  |
-| tst.js:181:9:181:42 | tainted | tst.js:183:67:183:73 | tainted | provenance |  |
-| tst.js:181:9:181:42 | tainted | tst.js:184:67:184:73 | tainted | provenance |  |
-| tst.js:181:9:181:42 | tainted | tst.js:220:35:220:41 | tainted | provenance |  |
-| tst.js:181:9:181:42 | tainted | tst.js:222:20:222:26 | tainted | provenance |  |
-| tst.js:181:9:181:42 | tainted | tst.js:224:23:224:29 | tainted | provenance |  |
-| tst.js:181:9:181:42 | tainted | tst.js:225:23:225:29 | tainted | provenance |  |
-| tst.js:181:9:181:42 | tainted | tst.js:239:23:239:29 | tainted | provenance |  |
-| tst.js:181:19:181:42 | documen ... .search | tst.js:181:9:181:42 | tainted | provenance |  |
+| tst.js:161:9:161:14 | target | tst.js:164:28:164:33 | target | provenance |  |
+| tst.js:161:18:161:41 | documen ... .search | tst.js:161:9:161:14 | target | provenance |  |
+| tst.js:168:9:168:15 | tainted | tst.js:170:31:170:37 | tainted | provenance |  |
+| tst.js:168:9:168:15 | tainted | tst.js:172:42:172:48 | tainted | provenance |  |
+| tst.js:168:9:168:15 | tainted | tst.js:173:33:173:39 | tainted | provenance |  |
+| tst.js:168:9:168:15 | tainted | tst.js:175:54:175:60 | tainted | provenance |  |
+| tst.js:168:9:168:15 | tainted | tst.js:176:45:176:51 | tainted | provenance |  |
+| tst.js:168:9:168:15 | tainted | tst.js:177:49:177:55 | tainted | provenance |  |
+| tst.js:168:19:168:42 | documen ... .search | tst.js:168:9:168:15 | tainted | provenance |  |
+| tst.js:181:9:181:15 | tainted | tst.js:183:67:183:73 | tainted | provenance |  |
+| tst.js:181:9:181:15 | tainted | tst.js:184:67:184:73 | tainted | provenance |  |
+| tst.js:181:9:181:15 | tainted | tst.js:220:35:220:41 | tainted | provenance |  |
+| tst.js:181:9:181:15 | tainted | tst.js:222:20:222:26 | tainted | provenance |  |
+| tst.js:181:9:181:15 | tainted | tst.js:224:23:224:29 | tainted | provenance |  |
+| tst.js:181:9:181:15 | tainted | tst.js:225:23:225:29 | tainted | provenance |  |
+| tst.js:181:9:181:15 | tainted | tst.js:239:23:239:29 | tainted | provenance |  |
+| tst.js:181:19:181:42 | documen ... .search | tst.js:181:9:181:15 | tainted | provenance |  |
 | tst.js:183:67:183:73 | tainted | tst.js:184:67:184:73 | tainted | provenance |  |
 | tst.js:184:67:184:73 | tainted | tst.js:188:35:188:41 | tainted | provenance |  |
 | tst.js:184:67:184:73 | tainted | tst.js:190:46:190:52 | tainted | provenance |  |
@@ -1144,8 +1258,8 @@ edges
 | tst.js:225:23:225:29 | tainted | tst.js:239:23:239:29 | tainted | provenance |  |
 | tst.js:231:39:231:55 | props.propTainted | tst.js:235:60:235:82 | this.st ... Tainted | provenance |  |
 | tst.js:239:23:239:29 | tainted | tst.js:231:39:231:55 | props.propTainted | provenance |  |
-| tst.js:269:9:269:29 | tainted | tst.js:272:59:272:65 | tainted | provenance |  |
-| tst.js:269:19:269:29 | window.name | tst.js:269:9:269:29 | tainted | provenance |  |
+| tst.js:269:9:269:15 | tainted | tst.js:272:59:272:65 | tainted | provenance |  |
+| tst.js:269:19:269:29 | window.name | tst.js:269:9:269:15 | tainted | provenance |  |
 | tst.js:285:9:285:16 | location | tst.js:286:10:286:10 | e | provenance |  |
 | tst.js:286:10:286:10 | e | tst.js:287:20:287:20 | e | provenance |  |
 | tst.js:292:10:292:17 | location | tst.js:294:10:294:10 | e | provenance |  |
@@ -1154,34 +1268,34 @@ edges
 | tst.js:311:10:311:35 | new URL ... cation) [searchParams] | tst.js:315:16:315:30 | getTaintedUrl() [searchParams] | provenance |  |
 | tst.js:311:18:311:34 | document.location | tst.js:311:10:311:35 | new URL ... cation) [searchParams, MapValue] | provenance |  |
 | tst.js:311:18:311:34 | document.location | tst.js:311:10:311:35 | new URL ... cation) [searchParams] | provenance |  |
-| tst.js:315:7:315:43 | params | tst.js:316:18:316:23 | params | provenance |  |
-| tst.js:315:7:315:43 | params [MapValue] | tst.js:316:18:316:23 | params [MapValue] | provenance |  |
+| tst.js:315:7:315:12 | params | tst.js:316:18:316:23 | params | provenance |  |
+| tst.js:315:7:315:12 | params [MapValue] | tst.js:316:18:316:23 | params [MapValue] | provenance |  |
 | tst.js:315:16:315:30 | getTaintedUrl() [searchParams, MapValue] | tst.js:315:16:315:43 | getTain ... hParams [MapValue] | provenance |  |
 | tst.js:315:16:315:30 | getTaintedUrl() [searchParams] | tst.js:315:16:315:43 | getTain ... hParams | provenance |  |
-| tst.js:315:16:315:43 | getTain ... hParams | tst.js:315:7:315:43 | params | provenance |  |
-| tst.js:315:16:315:43 | getTain ... hParams [MapValue] | tst.js:315:7:315:43 | params [MapValue] | provenance |  |
+| tst.js:315:16:315:43 | getTain ... hParams | tst.js:315:7:315:12 | params | provenance |  |
+| tst.js:315:16:315:43 | getTain ... hParams [MapValue] | tst.js:315:7:315:12 | params [MapValue] | provenance |  |
 | tst.js:316:18:316:23 | params | tst.js:316:18:316:35 | params.get('name') | provenance | Config |
 | tst.js:316:18:316:23 | params [MapValue] | tst.js:316:18:316:35 | params.get('name') | provenance |  |
 | tst.js:325:12:325:37 | new URL ... cation) [hash] | tst.js:327:5:327:12 | getUrl() [hash] | provenance |  |
 | tst.js:325:20:325:36 | document.location | tst.js:325:12:325:37 | new URL ... cation) [hash] | provenance |  |
 | tst.js:327:5:327:12 | getUrl() [hash] | tst.js:327:5:327:17 | getUrl().hash | provenance |  |
 | tst.js:327:5:327:17 | getUrl().hash | tst.js:327:5:327:30 | getUrl( ... ring(1) | provenance | Config |
-| tst.js:332:7:332:39 | target | tst.js:333:12:333:17 | target | provenance |  |
-| tst.js:332:16:332:39 | documen ... .search | tst.js:332:7:332:39 | target | provenance |  |
-| tst.js:339:10:339:42 | target | tst.js:340:16:340:21 | target | provenance |  |
-| tst.js:339:10:339:42 | target | tst.js:341:20:341:25 | target | provenance |  |
-| tst.js:339:19:339:42 | documen ... .search | tst.js:339:10:339:42 | target | provenance |  |
+| tst.js:332:7:332:12 | target | tst.js:333:12:333:17 | target | provenance |  |
+| tst.js:332:16:332:39 | documen ... .search | tst.js:332:7:332:12 | target | provenance |  |
+| tst.js:339:10:339:15 | target | tst.js:340:16:340:21 | target | provenance |  |
+| tst.js:339:10:339:15 | target | tst.js:341:20:341:25 | target | provenance |  |
+| tst.js:339:19:339:42 | documen ... .search | tst.js:339:10:339:15 | target | provenance |  |
 | tst.js:340:16:340:21 | target | tst.js:341:20:341:25 | target | provenance |  |
 | tst.js:341:20:341:25 | target | tst.js:344:21:344:26 | target | provenance |  |
 | tst.js:341:20:341:25 | target | tst.js:347:18:347:23 | target | provenance |  |
-| tst.js:355:7:355:39 | target | tst.js:357:18:357:23 | target | provenance |  |
-| tst.js:355:16:355:39 | documen ... .search | tst.js:355:7:355:39 | target | provenance |  |
-| tst.js:364:7:364:39 | target | tst.js:367:18:367:23 | target | provenance |  |
-| tst.js:364:7:364:39 | target | tst.js:369:18:369:23 | target | provenance |  |
-| tst.js:364:7:364:39 | target | tst.js:380:18:380:23 | target | provenance |  |
-| tst.js:364:7:364:39 | target | tst.js:389:18:389:23 | target | provenance |  |
-| tst.js:364:7:364:39 | target | tst.js:391:19:391:24 | target | provenance |  |
-| tst.js:364:16:364:39 | documen ... .search | tst.js:364:7:364:39 | target | provenance |  |
+| tst.js:355:7:355:12 | target | tst.js:357:18:357:23 | target | provenance |  |
+| tst.js:355:16:355:39 | documen ... .search | tst.js:355:7:355:12 | target | provenance |  |
+| tst.js:364:7:364:12 | target | tst.js:367:18:367:23 | target | provenance |  |
+| tst.js:364:7:364:12 | target | tst.js:369:18:369:23 | target | provenance |  |
+| tst.js:364:7:364:12 | target | tst.js:380:18:380:23 | target | provenance |  |
+| tst.js:364:7:364:12 | target | tst.js:389:18:389:23 | target | provenance |  |
+| tst.js:364:7:364:12 | target | tst.js:391:19:391:24 | target | provenance |  |
+| tst.js:364:16:364:39 | documen ... .search | tst.js:364:7:364:12 | target | provenance |  |
 | tst.js:369:18:369:23 | target | tst.js:369:18:369:29 | target.taint | provenance |  |
 | tst.js:374:3:374:8 | [post update] target [taint3] | tst.js:375:18:375:23 | target [taint3] | provenance |  |
 | tst.js:374:19:374:42 | documen ... .search | tst.js:374:3:374:8 | [post update] target [taint3] | provenance |  |
@@ -1194,65 +1308,65 @@ edges
 | tst.js:391:19:391:24 | target [taint8] | tst.js:391:19:391:31 | target.taint8 | provenance |  |
 | tst.js:391:19:391:31 | target.taint8 | tst.js:391:3:391:8 | [post update] target [taint8] | provenance |  |
 | tst.js:392:18:392:23 | target [taint8] | tst.js:392:18:392:30 | target.taint8 | provenance |  |
-| tst.js:399:7:399:46 | payload | tst.js:400:18:400:24 | payload | provenance |  |
+| tst.js:399:7:399:13 | payload | tst.js:400:18:400:24 | payload | provenance |  |
 | tst.js:399:17:399:36 | window.location.hash | tst.js:399:17:399:46 | window. ... bstr(1) | provenance |  |
 | tst.js:399:17:399:36 | window.location.hash | tst.js:399:17:399:46 | window. ... bstr(1) | provenance | Config |
-| tst.js:399:17:399:46 | window. ... bstr(1) | tst.js:399:7:399:46 | payload | provenance |  |
-| tst.js:402:7:402:55 | match | tst.js:404:20:404:24 | match | provenance |  |
+| tst.js:399:17:399:46 | window. ... bstr(1) | tst.js:399:7:399:13 | payload | provenance |  |
+| tst.js:402:7:402:11 | match | tst.js:404:20:404:24 | match | provenance |  |
 | tst.js:402:15:402:34 | window.location.hash | tst.js:402:15:402:55 | window. ... (\\w+)/) | provenance |  |
-| tst.js:402:15:402:55 | window. ... (\\w+)/) | tst.js:402:7:402:55 | match | provenance |  |
+| tst.js:402:15:402:55 | window. ... (\\w+)/) | tst.js:402:7:402:11 | match | provenance |  |
 | tst.js:404:20:404:24 | match | tst.js:404:20:404:27 | match[1] | provenance |  |
 | tst.js:407:18:407:37 | window.location.hash | tst.js:407:18:407:48 | window. ... it('#') [1] | provenance | Config |
 | tst.js:407:18:407:48 | window. ... it('#') [1] | tst.js:407:18:407:51 | window. ... '#')[1] | provenance |  |
-| tst.js:411:7:411:39 | target | tst.js:413:18:413:23 | target | provenance |  |
-| tst.js:411:16:411:39 | documen ... .search | tst.js:411:7:411:39 | target | provenance |  |
+| tst.js:411:7:411:12 | target | tst.js:413:18:413:23 | target | provenance |  |
+| tst.js:411:16:411:39 | documen ... .search | tst.js:411:7:411:12 | target | provenance |  |
 | tst.js:413:18:413:23 | target | tst.js:413:18:413:89 | target. ... data>') | provenance |  |
-| tst.js:419:6:419:38 | source | tst.js:423:28:423:33 | source | provenance |  |
-| tst.js:419:6:419:38 | source | tst.js:424:33:424:38 | source | provenance |  |
-| tst.js:419:6:419:38 | source | tst.js:425:34:425:39 | source | provenance |  |
-| tst.js:419:6:419:38 | source | tst.js:426:41:426:46 | source | provenance |  |
-| tst.js:419:6:419:38 | source | tst.js:427:44:427:49 | source | provenance |  |
-| tst.js:419:6:419:38 | source | tst.js:428:32:428:37 | source | provenance |  |
-| tst.js:419:15:419:38 | documen ... .search | tst.js:419:6:419:38 | source | provenance |  |
-| tst.js:436:7:436:39 | source | tst.js:438:18:438:23 | source | provenance |  |
-| tst.js:436:7:436:39 | source | tst.js:439:36:439:41 | source | provenance |  |
-| tst.js:436:16:436:39 | documen ... .search | tst.js:436:7:436:39 | source | provenance |  |
+| tst.js:419:6:419:11 | source | tst.js:423:28:423:33 | source | provenance |  |
+| tst.js:419:6:419:11 | source | tst.js:424:33:424:38 | source | provenance |  |
+| tst.js:419:6:419:11 | source | tst.js:425:34:425:39 | source | provenance |  |
+| tst.js:419:6:419:11 | source | tst.js:426:41:426:46 | source | provenance |  |
+| tst.js:419:6:419:11 | source | tst.js:427:44:427:49 | source | provenance |  |
+| tst.js:419:6:419:11 | source | tst.js:428:32:428:37 | source | provenance |  |
+| tst.js:419:15:419:38 | documen ... .search | tst.js:419:6:419:11 | source | provenance |  |
+| tst.js:436:7:436:12 | source | tst.js:438:18:438:23 | source | provenance |  |
+| tst.js:436:7:436:12 | source | tst.js:439:36:439:41 | source | provenance |  |
+| tst.js:436:16:436:39 | documen ... .search | tst.js:436:7:436:12 | source | provenance |  |
 | tst.js:439:36:439:41 | source | tst.js:439:18:439:42 | ansiToH ... source) | provenance |  |
-| tst.js:443:6:443:38 | source | tst.js:446:21:446:26 | source | provenance |  |
-| tst.js:443:6:443:38 | source | tst.js:448:19:448:24 | source | provenance |  |
-| tst.js:443:6:443:38 | source | tst.js:450:20:450:25 | source | provenance |  |
-| tst.js:443:15:443:38 | documen ... .search | tst.js:443:6:443:38 | source | provenance |  |
-| tst.js:454:7:454:46 | url | tst.js:456:19:456:21 | url | provenance |  |
-| tst.js:454:7:454:46 | url | tst.js:457:26:457:28 | url | provenance |  |
-| tst.js:454:7:454:46 | url | tst.js:458:25:458:27 | url | provenance |  |
-| tst.js:454:7:454:46 | url | tst.js:459:20:459:22 | url | provenance |  |
-| tst.js:454:7:454:46 | url | tst.js:469:22:469:24 | url | provenance |  |
+| tst.js:443:6:443:11 | source | tst.js:446:21:446:26 | source | provenance |  |
+| tst.js:443:6:443:11 | source | tst.js:448:19:448:24 | source | provenance |  |
+| tst.js:443:6:443:11 | source | tst.js:450:20:450:25 | source | provenance |  |
+| tst.js:443:15:443:38 | documen ... .search | tst.js:443:6:443:11 | source | provenance |  |
+| tst.js:454:7:454:9 | url | tst.js:456:19:456:21 | url | provenance |  |
+| tst.js:454:7:454:9 | url | tst.js:457:26:457:28 | url | provenance |  |
+| tst.js:454:7:454:9 | url | tst.js:458:25:458:27 | url | provenance |  |
+| tst.js:454:7:454:9 | url | tst.js:459:20:459:22 | url | provenance |  |
+| tst.js:454:7:454:9 | url | tst.js:469:22:469:24 | url | provenance |  |
 | tst.js:454:13:454:36 | documen ... .search | tst.js:454:13:454:46 | documen ... bstr(1) | provenance | Config |
-| tst.js:454:13:454:46 | documen ... bstr(1) | tst.js:454:7:454:46 | url | provenance |  |
+| tst.js:454:13:454:46 | documen ... bstr(1) | tst.js:454:7:454:9 | url | provenance |  |
 | tst.js:474:23:474:35 | location.hash | tst.js:474:23:474:45 | locatio ... bstr(1) | provenance | Config |
 | tst.js:477:18:477:30 | location.hash | tst.js:477:18:477:40 | locatio ... bstr(1) | provenance | Config |
 | tst.js:484:43:484:62 | window.location.hash | tst.js:484:33:484:63 | decodeU ... n.hash) | provenance |  |
-| tst.js:491:7:491:39 | target | tst.js:492:18:492:23 | target | provenance |  |
-| tst.js:491:16:491:39 | documen ... .search | tst.js:491:7:491:39 | target | provenance |  |
+| tst.js:491:7:491:12 | target | tst.js:492:18:492:23 | target | provenance |  |
+| tst.js:491:16:491:39 | documen ... .search | tst.js:491:7:491:12 | target | provenance |  |
 | tst.js:492:18:492:23 | target | tst.js:492:18:492:54 | target. ... "), '') | provenance |  |
-| tst.js:498:7:498:26 | source | tst.js:499:27:499:32 | source | provenance |  |
-| tst.js:498:16:498:26 | window.name | tst.js:498:7:498:26 | source | provenance |  |
+| tst.js:498:7:498:12 | source | tst.js:499:27:499:32 | source | provenance |  |
+| tst.js:498:16:498:26 | window.name | tst.js:498:7:498:12 | source | provenance |  |
 | tst.js:499:27:499:32 | source | tst.js:499:18:499:33 | unescape(source) | provenance |  |
 | typeahead.js:9:28:9:30 | loc | typeahead.js:10:16:10:18 | loc | provenance |  |
-| typeahead.js:20:13:20:45 | target | typeahead.js:21:12:21:17 | target | provenance |  |
-| typeahead.js:20:22:20:45 | documen ... .search | typeahead.js:20:13:20:45 | target | provenance |  |
+| typeahead.js:20:13:20:18 | target | typeahead.js:21:12:21:17 | target | provenance |  |
+| typeahead.js:20:22:20:45 | documen ... .search | typeahead.js:20:13:20:18 | target | provenance |  |
 | typeahead.js:21:12:21:17 | target | typeahead.js:24:30:24:32 | val | provenance |  |
 | typeahead.js:24:30:24:32 | val | typeahead.js:25:18:25:20 | val | provenance |  |
 | v-html.vue:6:42:6:58 | document.location | v-html.vue:2:8:2:23 | v-html=tainted | provenance |  |
-| various-concat-obfuscations.js:2:6:2:39 | tainted | various-concat-obfuscations.js:4:14:4:20 | tainted | provenance |  |
-| various-concat-obfuscations.js:2:6:2:39 | tainted | various-concat-obfuscations.js:5:12:5:18 | tainted | provenance |  |
-| various-concat-obfuscations.js:2:6:2:39 | tainted | various-concat-obfuscations.js:6:19:6:25 | tainted | provenance |  |
-| various-concat-obfuscations.js:2:6:2:39 | tainted | various-concat-obfuscations.js:7:14:7:20 | tainted | provenance |  |
-| various-concat-obfuscations.js:2:6:2:39 | tainted | various-concat-obfuscations.js:9:19:9:25 | tainted | provenance |  |
-| various-concat-obfuscations.js:2:6:2:39 | tainted | various-concat-obfuscations.js:10:16:10:22 | tainted | provenance |  |
-| various-concat-obfuscations.js:2:6:2:39 | tainted | various-concat-obfuscations.js:11:24:11:30 | tainted | provenance |  |
-| various-concat-obfuscations.js:2:6:2:39 | tainted | various-concat-obfuscations.js:12:19:12:25 | tainted | provenance |  |
-| various-concat-obfuscations.js:2:16:2:39 | documen ... .search | various-concat-obfuscations.js:2:6:2:39 | tainted | provenance |  |
+| various-concat-obfuscations.js:2:6:2:12 | tainted | various-concat-obfuscations.js:4:14:4:20 | tainted | provenance |  |
+| various-concat-obfuscations.js:2:6:2:12 | tainted | various-concat-obfuscations.js:5:12:5:18 | tainted | provenance |  |
+| various-concat-obfuscations.js:2:6:2:12 | tainted | various-concat-obfuscations.js:6:19:6:25 | tainted | provenance |  |
+| various-concat-obfuscations.js:2:6:2:12 | tainted | various-concat-obfuscations.js:7:14:7:20 | tainted | provenance |  |
+| various-concat-obfuscations.js:2:6:2:12 | tainted | various-concat-obfuscations.js:9:19:9:25 | tainted | provenance |  |
+| various-concat-obfuscations.js:2:6:2:12 | tainted | various-concat-obfuscations.js:10:16:10:22 | tainted | provenance |  |
+| various-concat-obfuscations.js:2:6:2:12 | tainted | various-concat-obfuscations.js:11:24:11:30 | tainted | provenance |  |
+| various-concat-obfuscations.js:2:6:2:12 | tainted | various-concat-obfuscations.js:12:19:12:25 | tainted | provenance |  |
+| various-concat-obfuscations.js:2:16:2:39 | documen ... .search | various-concat-obfuscations.js:2:6:2:12 | tainted | provenance |  |
 | various-concat-obfuscations.js:4:14:4:20 | tainted | various-concat-obfuscations.js:4:4:4:31 | "<div>" ... </div>" | provenance | Config |
 | various-concat-obfuscations.js:5:12:5:18 | tainted | various-concat-obfuscations.js:5:4:5:26 | `<div>$ ... </div>` | provenance | Config |
 | various-concat-obfuscations.js:6:4:6:26 | "<div>" ... ainted) | various-concat-obfuscations.js:6:4:6:43 | "<div>" ... /div>") | provenance |  |
@@ -1282,20 +1396,20 @@ edges
 | various-concat-obfuscations.js:21:17:21:40 | documen ... .search | various-concat-obfuscations.js:21:17:21:46 | documen ... h.attrs | provenance |  |
 | various-concat-obfuscations.js:21:17:21:46 | documen ... h.attrs | various-concat-obfuscations.js:17:24:17:28 | attrs | provenance |  |
 | various-concat-obfuscations.js:21:17:21:46 | documen ... h.attrs | various-concat-obfuscations.js:21:4:21:47 | indirec ... .attrs) | provenance | Config |
-| winjs.js:2:7:2:53 | tainted | winjs.js:3:43:3:49 | tainted | provenance |  |
-| winjs.js:2:7:2:53 | tainted | winjs.js:4:43:4:49 | tainted | provenance |  |
+| winjs.js:2:7:2:13 | tainted | winjs.js:3:43:3:49 | tainted | provenance |  |
+| winjs.js:2:7:2:13 | tainted | winjs.js:4:43:4:49 | tainted | provenance |  |
 | winjs.js:2:17:2:40 | documen ... .search | winjs.js:2:17:2:53 | documen ... ring(1) | provenance |  |
 | winjs.js:2:17:2:40 | documen ... .search | winjs.js:2:17:2:53 | documen ... ring(1) | provenance | Config |
-| winjs.js:2:17:2:53 | documen ... ring(1) | winjs.js:2:7:2:53 | tainted | provenance |  |
-| xmlRequest.js:8:13:8:47 | json | xmlRequest.js:9:28:9:31 | json | provenance |  |
-| xmlRequest.js:8:20:8:47 | JSON.pa ... seText) | xmlRequest.js:8:13:8:47 | json | provenance |  |
+| winjs.js:2:17:2:53 | documen ... ring(1) | winjs.js:2:7:2:13 | tainted | provenance |  |
+| xmlRequest.js:8:13:8:16 | json | xmlRequest.js:9:28:9:31 | json | provenance |  |
+| xmlRequest.js:8:20:8:47 | JSON.pa ... seText) | xmlRequest.js:8:13:8:16 | json | provenance |  |
 | xmlRequest.js:8:31:8:46 | xhr.responseText | xmlRequest.js:8:20:8:47 | JSON.pa ... seText) | provenance |  |
 | xmlRequest.js:9:28:9:31 | json | xmlRequest.js:9:28:9:39 | json.message | provenance |  |
-| xmlRequest.js:20:11:20:48 | resp | xmlRequest.js:21:29:21:32 | resp | provenance |  |
-| xmlRequest.js:20:18:20:48 | await g ... rl }}") | xmlRequest.js:20:11:20:48 | resp | provenance |  |
+| xmlRequest.js:20:11:20:14 | resp | xmlRequest.js:21:29:21:32 | resp | provenance |  |
+| xmlRequest.js:20:18:20:48 | await g ... rl }}") | xmlRequest.js:20:11:20:14 | resp | provenance |  |
 | xmlRequest.js:20:24:20:48 | got.get ... rl }}") | xmlRequest.js:20:18:20:48 | await g ... rl }}") | provenance |  |
-| xmlRequest.js:21:11:21:38 | json | xmlRequest.js:22:24:22:27 | json | provenance |  |
-| xmlRequest.js:21:18:21:38 | JSON.pa ... p.body) | xmlRequest.js:21:11:21:38 | json | provenance |  |
+| xmlRequest.js:21:11:21:14 | json | xmlRequest.js:22:24:22:27 | json | provenance |  |
+| xmlRequest.js:21:18:21:38 | JSON.pa ... p.body) | xmlRequest.js:21:11:21:14 | json | provenance |  |
 | xmlRequest.js:21:29:21:32 | resp | xmlRequest.js:21:18:21:38 | JSON.pa ... p.body) | provenance |  |
 | xmlRequest.js:22:24:22:27 | json | xmlRequest.js:22:24:22:35 | json.message | provenance |  |
 subpaths
@@ -1319,6 +1433,44 @@ subpaths
 | various-concat-obfuscations.js:21:17:21:46 | documen ... h.attrs | various-concat-obfuscations.js:17:24:17:28 | attrs | various-concat-obfuscations.js:18:10:18:105 | '<div a ... /div>') | various-concat-obfuscations.js:21:4:21:47 | indirec ... .attrs) |
 | various-concat-obfuscations.js:21:17:21:46 | documen ... h.attrs | various-concat-obfuscations.js:17:24:17:28 | attrs | various-concat-obfuscations.js:18:10:18:105 | '<div a ... /div>') [ArrayElement] | various-concat-obfuscations.js:21:4:21:47 | indirec ... .attrs) |
 #select
+| aws-db.js:15:31:15:76 | results ... arValue | aws-db.js:15:31:15:37 | results | aws-db.js:15:31:15:76 | results ... arValue | Cross-site scripting vulnerability due to $@. | aws-db.js:15:31:15:37 | results | user-provided value |
+| aws-db.js:20:31:20:54 | respons ... tring() | aws-db.js:20:31:20:38 | response | aws-db.js:20:31:20:54 | respons ... tring() | Cross-site scripting vulnerability due to $@. | aws-db.js:20:31:20:38 | response | user-provided value |
+| aws-db.js:24:31:24:47 | response2.records | aws-db.js:24:31:24:39 | response2 | aws-db.js:24:31:24:47 | response2.records | Cross-site scripting vulnerability due to $@. | aws-db.js:24:31:24:39 | response2 | user-provided value |
+| aws-db.js:28:31:28:44 | response3.Item | aws-db.js:28:31:28:39 | response3 | aws-db.js:28:31:28:44 | response3.Item | Cross-site scripting vulnerability due to $@. | aws-db.js:28:31:28:39 | response3 | user-provided value |
+| aws-db.js:43:31:43:76 | results ... arValue | aws-db.js:43:31:43:37 | results | aws-db.js:43:31:43:76 | results ... arValue | Cross-site scripting vulnerability due to $@. | aws-db.js:43:31:43:37 | results | user-provided value |
+| aws-db.js:46:35:46:77 | data.Re ... arValue | aws-db.js:46:35:46:38 | data | aws-db.js:46:35:46:77 | data.Re ... arValue | Cross-site scripting vulnerability due to $@. | aws-db.js:46:35:46:38 | data | user-provided value |
+| aws-db.js:51:31:51:54 | respons ... tring() | aws-db.js:51:31:51:38 | response | aws-db.js:51:31:51:54 | respons ... tring() | Cross-site scripting vulnerability due to $@. | aws-db.js:51:31:51:38 | response | user-provided value |
+| aws-db.js:54:35:54:54 | data.Body.toString() | aws-db.js:54:35:54:38 | data | aws-db.js:54:35:54:54 | data.Body.toString() | Cross-site scripting vulnerability due to $@. | aws-db.js:54:35:54:38 | data | user-provided value |
+| aws-db.js:59:31:59:47 | response1.records | aws-db.js:59:31:59:39 | response1 | aws-db.js:59:31:59:47 | response1.records | Cross-site scripting vulnerability due to $@. | aws-db.js:59:31:59:39 | response1 | user-provided value |
+| aws-db.js:62:35:62:46 | data.records | aws-db.js:62:35:62:38 | data | aws-db.js:62:35:62:46 | data.records | Cross-site scripting vulnerability due to $@. | aws-db.js:62:35:62:38 | data | user-provided value |
+| aws-db.js:66:31:66:53 | respons ... Results | aws-db.js:66:31:66:39 | response2 | aws-db.js:66:31:66:53 | respons ... Results | Cross-site scripting vulnerability due to $@. | aws-db.js:66:31:66:39 | response2 | user-provided value |
+| aws-db.js:69:35:69:52 | data.updateResults | aws-db.js:69:35:69:38 | data | aws-db.js:69:35:69:52 | data.updateResults | Cross-site scripting vulnerability due to $@. | aws-db.js:69:35:69:38 | data | user-provided value |
+| aws-db.js:74:35:74:43 | data.Item | aws-db.js:74:35:74:38 | data | aws-db.js:74:35:74:43 | data.Item | Cross-site scripting vulnerability due to $@. | aws-db.js:74:35:74:38 | data | user-provided value |
+| aws-db.js:77:35:77:43 | data.Item | aws-db.js:77:35:77:38 | data | aws-db.js:77:35:77:43 | data.Item | Cross-site scripting vulnerability due to $@. | aws-db.js:77:35:77:38 | data | user-provided value |
+| aws.js:14:31:14:44 | result.comment | aws.js:14:31:14:36 | result | aws.js:14:31:14:44 | result.comment | Cross-site scripting vulnerability due to $@. | aws.js:14:31:14:36 | result | user-provided value |
+| aws.js:18:31:18:45 | result2.comment | aws.js:18:31:18:37 | result2 | aws.js:18:31:18:45 | result2.comment | Cross-site scripting vulnerability due to $@. | aws.js:18:31:18:37 | result2 | user-provided value |
+| aws.js:22:31:22:45 | result3.comment | aws.js:22:31:22:37 | result3 | aws.js:22:31:22:45 | result3.comment | Cross-site scripting vulnerability due to $@. | aws.js:22:31:22:37 | result3 | user-provided value |
+| aws.js:26:31:26:45 | result4.comment | aws.js:26:31:26:37 | result4 | aws.js:26:31:26:45 | result4.comment | Cross-site scripting vulnerability due to $@. | aws.js:26:31:26:37 | result4 | user-provided value |
+| aws.js:34:31:34:42 | data.comment | aws.js:34:31:34:34 | data | aws.js:34:31:34:42 | data.comment | Cross-site scripting vulnerability due to $@. | aws.js:34:31:34:34 | data | user-provided value |
+| aws.js:37:35:37:46 | data.comment | aws.js:37:35:37:38 | data | aws.js:37:35:37:46 | data.comment | Cross-site scripting vulnerability due to $@. | aws.js:37:35:37:38 | data | user-provided value |
+| aws.js:47:31:47:42 | data.comment | aws.js:47:31:47:34 | data | aws.js:47:31:47:42 | data.comment | Cross-site scripting vulnerability due to $@. | aws.js:47:31:47:34 | data | user-provided value |
+| aws.js:50:35:50:46 | data.comment | aws.js:50:35:50:38 | data | aws.js:50:35:50:46 | data.comment | Cross-site scripting vulnerability due to $@. | aws.js:50:35:50:38 | data | user-provided value |
+| aws.js:59:31:59:42 | data.comment | aws.js:59:31:59:34 | data | aws.js:59:31:59:42 | data.comment | Cross-site scripting vulnerability due to $@. | aws.js:59:31:59:34 | data | user-provided value |
+| aws.js:62:35:62:46 | data.comment | aws.js:62:35:62:38 | data | aws.js:62:35:62:46 | data.comment | Cross-site scripting vulnerability due to $@. | aws.js:62:35:62:38 | data | user-provided value |
+| aws.js:66:31:66:43 | data2.comment | aws.js:66:31:66:35 | data2 | aws.js:66:31:66:43 | data2.comment | Cross-site scripting vulnerability due to $@. | aws.js:66:31:66:35 | data2 | user-provided value |
+| aws.js:69:35:69:46 | data.comment | aws.js:69:35:69:38 | data | aws.js:69:35:69:46 | data.comment | Cross-site scripting vulnerability due to $@. | aws.js:69:35:69:38 | data | user-provided value |
+| aws.js:78:31:78:42 | data.comment | aws.js:78:31:78:34 | data | aws.js:78:31:78:42 | data.comment | Cross-site scripting vulnerability due to $@. | aws.js:78:31:78:34 | data | user-provided value |
+| aws.js:81:35:81:46 | data.comment | aws.js:81:35:81:38 | data | aws.js:81:35:81:46 | data.comment | Cross-site scripting vulnerability due to $@. | aws.js:81:35:81:38 | data | user-provided value |
+| aws.js:85:31:85:43 | data2.comment | aws.js:85:31:85:35 | data2 | aws.js:85:31:85:43 | data2.comment | Cross-site scripting vulnerability due to $@. | aws.js:85:31:85:35 | data2 | user-provided value |
+| aws.js:88:35:88:46 | data.comment | aws.js:88:35:88:38 | data | aws.js:88:35:88:46 | data.comment | Cross-site scripting vulnerability due to $@. | aws.js:88:35:88:38 | data | user-provided value |
+| aws.js:92:31:92:43 | data3.comment | aws.js:92:31:92:35 | data3 | aws.js:92:31:92:43 | data3.comment | Cross-site scripting vulnerability due to $@. | aws.js:92:31:92:35 | data3 | user-provided value |
+| aws.js:95:35:95:46 | data.comment | aws.js:95:35:95:38 | data | aws.js:95:35:95:46 | data.comment | Cross-site scripting vulnerability due to $@. | aws.js:95:35:95:38 | data | user-provided value |
+| aws.js:99:31:99:43 | data4.comment | aws.js:99:31:99:35 | data4 | aws.js:99:31:99:43 | data4.comment | Cross-site scripting vulnerability due to $@. | aws.js:99:31:99:35 | data4 | user-provided value |
+| aws.js:102:35:102:46 | data.comment | aws.js:102:35:102:38 | data | aws.js:102:35:102:46 | data.comment | Cross-site scripting vulnerability due to $@. | aws.js:102:35:102:38 | data | user-provided value |
+| aws.js:106:31:106:43 | data5.comment | aws.js:106:31:106:35 | data5 | aws.js:106:31:106:43 | data5.comment | Cross-site scripting vulnerability due to $@. | aws.js:106:31:106:35 | data5 | user-provided value |
+| aws.js:109:35:109:46 | data.comment | aws.js:109:35:109:38 | data | aws.js:109:35:109:46 | data.comment | Cross-site scripting vulnerability due to $@. | aws.js:109:35:109:38 | data | user-provided value |
+| aws.js:113:31:113:43 | data6.comment | aws.js:113:31:113:35 | data6 | aws.js:113:31:113:43 | data6.comment | Cross-site scripting vulnerability due to $@. | aws.js:113:31:113:35 | data6 | user-provided value |
+| aws.js:116:35:116:46 | data.comment | aws.js:116:35:116:38 | data | aws.js:116:35:116:46 | data.comment | Cross-site scripting vulnerability due to $@. | aws.js:116:35:116:38 | data | user-provided value |
 | hana.js:11:37:11:51 | rows[0].comment | hana.js:11:37:11:40 | rows | hana.js:11:37:11:51 | rows[0].comment | Cross-site scripting vulnerability due to $@. | hana.js:11:37:11:40 | rows | user-provided value |
 | hana.js:16:37:16:51 | rows[0].comment | hana.js:16:37:16:40 | rows | hana.js:16:37:16:51 | rows[0].comment | Cross-site scripting vulnerability due to $@. | hana.js:16:37:16:40 | rows | user-provided value |
 | hana.js:19:37:19:51 | rows[0].comment | hana.js:19:37:19:40 | rows | hana.js:19:37:19:51 | rows[0].comment | Cross-site scripting vulnerability due to $@. | hana.js:19:37:19:40 | rows | user-provided value |
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/aws-db.js b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/aws-db.js
new file mode 100644
index 00000000000..0f345f7172e
--- /dev/null
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/aws-db.js
@@ -0,0 +1,79 @@
+const { AthenaClient, GetQueryResultsCommand } = require('@aws-sdk/client-athena');
+const { S3Client, GetObjectCommand } = require("@aws-sdk/client-s3");
+const { RDSDataClient, ExecuteStatementCommand } = require("@aws-sdk/client-rds-data");
+const { DynamoDBClient, GetItemCommand } = require("@aws-sdk/client-dynamodb");
+
+
+const express = require('express');
+const bodyParser = require('body-parser');
+const app = express();
+app.use(bodyParser.json());
+
+app.post('/v3/all', async (req, res) => {
+    const client = new AthenaClient({ region: "us-east-1" });
+    const results = await client.send(new GetQueryResultsCommand({ QueryExecutionId }));
+    document.body.innerHTML = results.ResultSet.Rows[0].Data[0].VarCharValue; // $ Alert[js/xss-additional-sources-dom-test]
+    
+    const s3 = new S3Client({ region: "us-east-1" });
+    const command = new GetObjectCommand({ Bucket: bucket, Key: key });
+    const response = await s3.send(command);
+    document.body.innerHTML = response.Body.toString(); // $ Alert[js/xss-additional-sources-dom-test]
+
+    const clientRDS = new RDSDataClient({ region: "us-east-1" });
+    const response2 = await clientRDS.send(new ExecuteStatementCommand(command));
+    document.body.innerHTML = response2.records; // $ Alert[js/xss-additional-sources-dom-test]
+
+    const clientDyamo = new DynamoDBClient({ region: "us-east-1" });
+    const response3 = await clientDyamo.send(new GetItemCommand(command));
+    document.body.innerHTML = response3.Item; // $ Alert[js/xss-additional-sources-dom-test]
+
+});
+
+
+app.post('/v2/all', async (req, res) => {
+    const AWS = require('aws-sdk');
+    const athena = new AWS.Athena();
+    const params = {
+        QueryString: 'SELECT * FROM my_table',
+        ResultConfiguration: { OutputLocation: 's3://bucket/prefix/' }
+    };
+    const { QueryExecutionId } = await athena.startQueryExecution(params).promise();
+
+    const results = await athena.getQueryResults({ QueryExecutionId }).promise();
+    document.body.innerHTML = results.ResultSet.Rows[0].Data[0].VarCharValue; // $ Alert[js/xss-additional-sources-dom-test]
+
+    athena.getQueryResults({ QueryExecutionId }, (err, data) => {
+        document.body.innerHTML = data.ResultSet.Rows[0].Data[0].VarCharValue; // $ Alert[js/xss-additional-sources-dom-test]
+    });
+
+    const s3 = new AWS.S3({ region: "us-east-1" });
+    const response = await s3.getObject({ Bucket: "bucket", Key: "key" }).promise();
+    document.body.innerHTML = response.Body.toString(); // $ Alert[js/xss-additional-sources-dom-test]
+
+    s3.getObject({ Bucket: "bucket", Key: "key" }, (err, data) => {
+        document.body.innerHTML = data.Body.toString(); // $ Alert[js/xss-additional-sources-dom-test]
+    });
+    
+    const rdsData = new AWS.RDSDataService({ region: "us-east-1" });
+    const response1 = await rdsData.executeStatement(params).promise();
+    document.body.innerHTML = response1.records; // $ Alert[js/xss-additional-sources-dom-test]
+
+    rdsData.executeStatement(params, function(err, data) {
+        document.body.innerHTML = data.records; // $ Alert[js/xss-additional-sources-dom-test]
+    });
+
+    const response2 = await rdsData.batchExecuteStatement(params).promise();
+    document.body.innerHTML = response2.updateResults; // $ Alert[js/xss-additional-sources-dom-test]
+
+    rdsData.batchExecuteStatement(params, function(err, data) {
+        document.body.innerHTML = data.updateResults; // $ Alert[js/xss-additional-sources-dom-test]
+    });
+
+    const dynamodb = new AWS.DynamoDB({ region: "us-east-1" });
+    dynamodb.executeStatement(params, (err, data) => {
+        document.body.innerHTML = data.Item; // $ Alert[js/xss-additional-sources-dom-test]
+    });
+    dynamodb.executeStatement(params).promise().then(data => {
+        document.body.innerHTML = data.Item; // $ Alert[js/xss-additional-sources-dom-test]
+    });
+});
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/aws.js b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/aws.js
new file mode 100644
index 00000000000..103689c078f
--- /dev/null
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/aws.js
@@ -0,0 +1,118 @@
+const AWS = require('aws-sdk');
+const { AthenaClient } = require('@aws-sdk/client-athena');
+const { S3Client } = require('@aws-sdk/client-s3');
+const { RDSDataClient } = require('@aws-sdk/client-rds-data');
+const { DynamoDBClient } = require('@aws-sdk/client-dynamodb');
+const express = require('express');
+
+const app = express();
+
+// AWS V3 Common tests
+app.post('/aws-v3-common', async (req, res) => {
+    const athenaClient = new AthenaClient({});
+    const result = await athenaClient.send({});
+    document.body.innerHTML = result.comment; // $ Alert[js/xss-additional-sources-dom-test]
+    
+    const s3Client = new S3Client({});
+    const result2 = await s3Client.send({});
+    document.body.innerHTML = result2.comment; // $ Alert[js/xss-additional-sources-dom-test]
+    
+    const rdsDataClient = new RDSDataClient({});
+    const result3 = await rdsDataClient.send({});
+    document.body.innerHTML = result3.comment; // $ Alert[js/xss-additional-sources-dom-test]
+    
+    const dynamoClient = new DynamoDBClient({});
+    const result4 = await dynamoClient.send({});
+    document.body.innerHTML = result4.comment; // $ Alert[js/xss-additional-sources-dom-test]
+});
+
+// Athena Client V2 tests
+app.post('/athena-v2', async (req, res) => {
+    const athena = new AWS.Athena();
+
+    const data = await athena.getQueryResults({}).promise();
+    document.body.innerHTML = data.comment; // $ Alert[js/xss-additional-sources-dom-test]
+
+    athena.getQueryResults({}, function(err, data) {
+        document.body.innerHTML = data.comment; // $ Alert[js/xss-additional-sources-dom-test]
+    });
+});
+
+// S3 Client V2 tests
+app.post('/s3-v2', async (req, res) => {
+    const s3 = new AWS.S3();
+    
+
+    const data = await s3.getObject({}).promise();
+    document.body.innerHTML = data.comment; // $ Alert[js/xss-additional-sources-dom-test]
+
+    s3.getObject({}, function(err, data) {
+        document.body.innerHTML = data.comment; // $ Alert[js/xss-additional-sources-dom-test]
+    });
+});
+
+// RDS Data Client V2 tests
+app.post('/rds-data-v2', async (req, res) => {
+    const rdsData = new AWS.RDSDataService();
+    
+    const data = await rdsData.executeStatement({}).promise();
+    document.body.innerHTML = data.comment; // $ Alert[js/xss-additional-sources-dom-test]
+
+    rdsData.executeStatement({}, function(err, data) {
+        document.body.innerHTML = data.comment; // $ Alert[js/xss-additional-sources-dom-test]
+    });
+    
+    const data2 = await rdsData.batchExecuteStatement({}).promise();
+    document.body.innerHTML = data2.comment; // $ Alert[js/xss-additional-sources-dom-test]
+    
+    rdsData.batchExecuteStatement({}, function(err, data) {
+        document.body.innerHTML = data.comment; // $ Alert[js/xss-additional-sources-dom-test]
+    });
+});
+
+// DynamoDB Client V2 tests
+app.post('/dynamodb-v2', async (req, res) => {
+    const dynamodb = new AWS.DynamoDB();
+    
+    const data = await dynamodb.executeStatement({}).promise();
+    document.body.innerHTML = data.comment; // $ Alert[js/xss-additional-sources-dom-test]
+    
+    dynamodb.executeStatement({}, function(err, data) {
+        document.body.innerHTML = data.comment; // $ Alert[js/xss-additional-sources-dom-test]
+    });
+    
+    const data2 = await dynamodb.batchExecuteStatement({}).promise();
+    document.body.innerHTML = data2.comment; // $ Alert[js/xss-additional-sources-dom-test]
+    
+    dynamodb.batchExecuteStatement({}, function(err, data) {
+        document.body.innerHTML = data.comment; // $ Alert[js/xss-additional-sources-dom-test]
+    });
+    
+    const data3 = await dynamodb.query({}).promise();
+    document.body.innerHTML = data3.comment; // $ Alert[js/xss-additional-sources-dom-test]
+    
+    dynamodb.query({}, function(err, data) {
+        document.body.innerHTML = data.comment; // $ Alert[js/xss-additional-sources-dom-test]
+    });
+    
+    const data4 = await dynamodb.scan({}).promise();
+    document.body.innerHTML = data4.comment; // $ Alert[js/xss-additional-sources-dom-test]
+    
+    dynamodb.scan({}, function(err, data) {
+        document.body.innerHTML = data.comment; // $ Alert[js/xss-additional-sources-dom-test]
+    });
+    
+    const data5 = await dynamodb.getItem({}).promise();
+    document.body.innerHTML = data5.comment; // $ Alert[js/xss-additional-sources-dom-test]
+    
+    dynamodb.getItem({}, function(err, data) {
+        document.body.innerHTML = data.comment; // $ Alert[js/xss-additional-sources-dom-test]
+    });
+    
+    const data6 = await dynamodb.batchGetItem({}).promise();
+    document.body.innerHTML = data6.comment; // $ Alert[js/xss-additional-sources-dom-test]
+    
+    dynamodb.batchGetItem({}, function(err, data) {
+        document.body.innerHTML = data.comment; // $ Alert[js/xss-additional-sources-dom-test]
+    });
+});
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXssWithResponseThreat/Xss.expected b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXssWithResponseThreat/Xss.expected
index afc30e24608..99cafddc41d 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXssWithResponseThreat/Xss.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXssWithResponseThreat/Xss.expected
@@ -20,18 +20,18 @@
 | testUseQueries.vue:25:10:25:23 | v-html=data2 | testUseQueries.vue:11:36:11:49 | fetch("${id}") | testUseQueries.vue:25:10:25:23 | v-html=data2 | Cross-site scripting vulnerability due to $@. | testUseQueries.vue:11:36:11:49 | fetch("${id}") | user-provided value |
 edges
 | interceptors.js:7:6:7:13 | response | interceptors.js:8:35:8:42 | response | provenance |  |
-| interceptors.js:8:15:8:47 | userGeneratedHtml | interceptors.js:9:56:9:72 | userGeneratedHtml | provenance |  |
-| interceptors.js:8:35:8:42 | response | interceptors.js:8:15:8:47 | userGeneratedHtml | provenance |  |
-| test.jsx:5:11:5:63 | response | test.jsx:6:24:6:31 | response | provenance |  |
-| test.jsx:5:22:5:63 | await f ... ntent") | test.jsx:5:11:5:63 | response | provenance |  |
+| interceptors.js:8:15:8:31 | userGeneratedHtml | interceptors.js:9:56:9:72 | userGeneratedHtml | provenance |  |
+| interceptors.js:8:35:8:42 | response | interceptors.js:8:15:8:31 | userGeneratedHtml | provenance |  |
+| test.jsx:5:11:5:18 | response | test.jsx:6:24:6:31 | response | provenance |  |
+| test.jsx:5:22:5:63 | await f ... ntent") | test.jsx:5:11:5:18 | response | provenance |  |
 | test.jsx:5:28:5:63 | fetch(" ... ntent") | test.jsx:5:22:5:63 | await f ... ntent") | provenance |  |
-| test.jsx:6:11:6:38 | data | test.jsx:7:12:7:15 | data | provenance |  |
-| test.jsx:6:18:6:38 | await r ... .json() | test.jsx:6:11:6:38 | data | provenance |  |
+| test.jsx:6:11:6:14 | data | test.jsx:7:12:7:15 | data | provenance |  |
+| test.jsx:6:18:6:38 | await r ... .json() | test.jsx:6:11:6:14 | data | provenance |  |
 | test.jsx:6:24:6:31 | response | test.jsx:6:24:6:38 | response.json() | provenance |  |
 | test.jsx:6:24:6:38 | response.json() | test.jsx:6:18:6:38 | await r ... .json() | provenance |  |
 | test.jsx:7:12:7:15 | data | test.jsx:15:13:15:16 | data | provenance |  |
-| test.jsx:15:11:17:5 | data | test.jsx:27:29:27:32 | data | provenance |  |
-| test.jsx:15:13:15:16 | data | test.jsx:15:11:17:5 | data | provenance |  |
+| test.jsx:15:13:15:16 | data | test.jsx:15:13:15:16 | data | provenance |  |
+| test.jsx:15:13:15:16 | data | test.jsx:27:29:27:32 | data | provenance |  |
 | test.ts:8:9:8:79 | this.#h ... query') | test.ts:20:28:20:35 | response | provenance |  |
 | test.ts:20:28:20:35 | response | test.ts:21:57:21:64 | response | provenance |  |
 | test.ts:20:28:20:35 | response | test.ts:24:43:24:50 | response | provenance |  |
@@ -41,78 +41,78 @@ edges
 | test.ts:24:43:24:55 | response.name | test.ts:24:36:24:90 | `<h2>${ ... o}</p>` | provenance |  |
 | test.ts:24:67:24:74 | response | test.ts:24:67:24:84 | response.owner.bio | provenance |  |
 | test.ts:24:67:24:84 | response.owner.bio | test.ts:24:36:24:90 | `<h2>${ ... o}</p>` | provenance |  |
-| test.vue:7:11:13:6 | data | test.vue:15:21:15:24 | data | provenance |  |
-| test.vue:7:45:7:48 | data | test.vue:7:11:13:6 | data | provenance |  |
-| test.vue:10:15:10:84 | response | test.vue:11:16:11:23 | response | provenance |  |
-| test.vue:10:26:10:84 | await f ... sts/1") | test.vue:10:15:10:84 | response | provenance |  |
+| test.vue:7:45:7:48 | data | test.vue:7:45:7:48 | data | provenance |  |
+| test.vue:7:45:7:48 | data | test.vue:15:21:15:24 | data | provenance |  |
+| test.vue:10:15:10:22 | response | test.vue:11:16:11:23 | response | provenance |  |
+| test.vue:10:26:10:84 | await f ... sts/1") | test.vue:10:15:10:22 | response | provenance |  |
 | test.vue:10:32:10:84 | fetch(" ... sts/1") | test.vue:10:26:10:84 | await f ... sts/1") | provenance |  |
 | test.vue:11:16:11:23 | response | test.vue:11:16:11:30 | response.json() | provenance |  |
 | test.vue:11:16:11:30 | response.json() | test.vue:7:45:7:48 | data | provenance |  |
 | test.vue:15:21:15:24 | data | test.vue:22:10:22:22 | v-html=data | provenance |  |
-| testReactRelay.tsx:5:9:5:52 | commentData | testReactRelay.tsx:7:43:7:53 | commentData | provenance |  |
-| testReactRelay.tsx:5:23:5:52 | useFrag ... entRef) | testReactRelay.tsx:5:9:5:52 | commentData | provenance |  |
+| testReactRelay.tsx:5:9:5:19 | commentData | testReactRelay.tsx:7:43:7:53 | commentData | provenance |  |
+| testReactRelay.tsx:5:23:5:52 | useFrag ... entRef) | testReactRelay.tsx:5:9:5:19 | commentData | provenance |  |
 | testReactRelay.tsx:7:43:7:53 | commentData | testReactRelay.tsx:7:43:7:58 | commentData.text | provenance |  |
-| testReactRelay.tsx:17:9:17:42 | data | testReactRelay.tsx:18:48:18:51 | data | provenance |  |
-| testReactRelay.tsx:17:16:17:42 | useLazy ... ry, {}) | testReactRelay.tsx:17:9:17:42 | data | provenance |  |
+| testReactRelay.tsx:17:9:17:12 | data | testReactRelay.tsx:18:48:18:51 | data | provenance |  |
+| testReactRelay.tsx:17:16:17:42 | useLazy ... ry, {}) | testReactRelay.tsx:17:9:17:12 | data | provenance |  |
 | testReactRelay.tsx:18:48:18:51 | data | testReactRelay.tsx:18:48:18:68 | data.co ... 0].text | provenance |  |
 | testReactRelay.tsx:28:17:28:56 | usePrel ... erence) | testReactRelay.tsx:28:17:28:67 | usePrel ... r?.name | provenance |  |
-| testReactRelay.tsx:37:9:37:40 | data | testReactRelay.tsx:38:49:38:52 | data | provenance |  |
-| testReactRelay.tsx:37:16:37:40 | useClie ... ry, {}) | testReactRelay.tsx:37:9:37:40 | data | provenance |  |
-| testReactRelay.tsx:44:9:44:70 | data | testReactRelay.tsx:47:46:47:49 | data | provenance |  |
-| testReactRelay.tsx:44:10:44:13 | data | testReactRelay.tsx:44:9:44:70 | data | provenance |  |
-| testReactRelay.tsx:61:9:70:38 | data | testReactRelay.tsx:71:49:71:52 | data | provenance |  |
-| testReactRelay.tsx:62:5:62:8 | data | testReactRelay.tsx:61:9:70:38 | data | provenance |  |
-| testReactRelay.tsx:80:9:80:54 | feedbackText | testReactRelay.tsx:88:50:88:61 | feedbackText | provenance |  |
-| testReactRelay.tsx:80:10:80:21 | feedbackText | testReactRelay.tsx:80:9:80:54 | feedbackText | provenance |  |
+| testReactRelay.tsx:37:9:37:12 | data | testReactRelay.tsx:38:49:38:52 | data | provenance |  |
+| testReactRelay.tsx:37:16:37:40 | useClie ... ry, {}) | testReactRelay.tsx:37:9:37:12 | data | provenance |  |
+| testReactRelay.tsx:44:10:44:13 | data | testReactRelay.tsx:44:10:44:13 | data | provenance |  |
+| testReactRelay.tsx:44:10:44:13 | data | testReactRelay.tsx:47:46:47:49 | data | provenance |  |
+| testReactRelay.tsx:62:5:62:8 | data | testReactRelay.tsx:62:5:62:8 | data | provenance |  |
+| testReactRelay.tsx:62:5:62:8 | data | testReactRelay.tsx:71:49:71:52 | data | provenance |  |
+| testReactRelay.tsx:80:10:80:21 | feedbackText | testReactRelay.tsx:80:10:80:21 | feedbackText | provenance |  |
+| testReactRelay.tsx:80:10:80:21 | feedbackText | testReactRelay.tsx:88:50:88:61 | feedbackText | provenance |  |
 | testReactRelay.tsx:83:17:83:20 | data | testReactRelay.tsx:84:23:84:26 | data | provenance |  |
 | testReactRelay.tsx:84:23:84:26 | data | testReactRelay.tsx:80:10:80:21 | feedbackText | provenance |  |
-| testReactRelay.tsx:95:9:95:50 | fragmentRef | testReactRelay.tsx:113:48:113:58 | fragmentRef | provenance |  |
-| testReactRelay.tsx:95:10:95:20 | fragmentRef | testReactRelay.tsx:95:9:95:50 | fragmentRef | provenance |  |
+| testReactRelay.tsx:95:10:95:20 | fragmentRef | testReactRelay.tsx:95:10:95:20 | fragmentRef | provenance |  |
+| testReactRelay.tsx:95:10:95:20 | fragmentRef | testReactRelay.tsx:113:48:113:58 | fragmentRef | provenance |  |
 | testReactRelay.tsx:100:14:100:16 | res | testReactRelay.tsx:101:22:101:24 | res | provenance |  |
 | testReactRelay.tsx:101:22:101:24 | res | testReactRelay.tsx:95:10:95:20 | fragmentRef | provenance |  |
 | testReactRelay.tsx:124:12:124:15 | data | testReactRelay.tsx:127:35:127:38 | data | provenance |  |
 | testReactRelay.tsx:127:35:127:38 | data | testReactRelay.tsx:127:35:127:43 | data.user | provenance |  |
-| testReactRelay.tsx:136:9:136:39 | data | testReactRelay.tsx:137:50:137:53 | data | provenance |  |
-| testReactRelay.tsx:136:16:136:39 | readFra ... y, key) | testReactRelay.tsx:136:9:136:39 | data | provenance |  |
-| testReactUseQueries.jsx:4:9:4:53 | response | testReactUseQueries.jsx:5:10:5:17 | response | provenance |  |
-| testReactUseQueries.jsx:4:20:4:53 | await f ... e.com') | testReactUseQueries.jsx:4:9:4:53 | response | provenance |  |
+| testReactRelay.tsx:136:9:136:12 | data | testReactRelay.tsx:137:50:137:53 | data | provenance |  |
+| testReactRelay.tsx:136:16:136:39 | readFra ... y, key) | testReactRelay.tsx:136:9:136:12 | data | provenance |  |
+| testReactUseQueries.jsx:4:9:4:16 | response | testReactUseQueries.jsx:5:10:5:17 | response | provenance |  |
+| testReactUseQueries.jsx:4:20:4:53 | await f ... e.com') | testReactUseQueries.jsx:4:9:4:16 | response | provenance |  |
 | testReactUseQueries.jsx:4:26:4:53 | fetch(' ... e.com') | testReactUseQueries.jsx:4:20:4:53 | await f ... e.com') | provenance |  |
 | testReactUseQueries.jsx:5:10:5:17 | response | testReactUseQueries.jsx:5:10:5:24 | response.json() | provenance |  |
 | testReactUseQueries.jsx:5:10:5:24 | response.json() | testReactUseQueries.jsx:37:25:37:38 | repoQuery.data | provenance |  |
-| testUseQueries2.vue:6:11:6:63 | response | testUseQueries2.vue:7:24:7:31 | response | provenance |  |
-| testUseQueries2.vue:6:22:6:63 | await f ... ntent") | testUseQueries2.vue:6:11:6:63 | response | provenance |  |
+| testUseQueries2.vue:6:11:6:18 | response | testUseQueries2.vue:7:24:7:31 | response | provenance |  |
+| testUseQueries2.vue:6:22:6:63 | await f ... ntent") | testUseQueries2.vue:6:11:6:18 | response | provenance |  |
 | testUseQueries2.vue:6:28:6:63 | fetch(" ... ntent") | testUseQueries2.vue:6:22:6:63 | await f ... ntent") | provenance |  |
-| testUseQueries2.vue:7:11:7:38 | data | testUseQueries2.vue:8:12:8:15 | data | provenance |  |
-| testUseQueries2.vue:7:18:7:38 | await r ... .json() | testUseQueries2.vue:7:11:7:38 | data | provenance |  |
+| testUseQueries2.vue:7:11:7:14 | data | testUseQueries2.vue:8:12:8:15 | data | provenance |  |
+| testUseQueries2.vue:7:18:7:38 | await r ... .json() | testUseQueries2.vue:7:11:7:14 | data | provenance |  |
 | testUseQueries2.vue:7:24:7:31 | response | testUseQueries2.vue:7:24:7:38 | response.json() | provenance |  |
 | testUseQueries2.vue:7:24:7:38 | response.json() | testUseQueries2.vue:7:18:7:38 | await r ... .json() | provenance |  |
 | testUseQueries2.vue:8:12:8:15 | data | testUseQueries2.vue:33:22:33:36 | results[0].data | provenance |  |
-| testUseQueries2.vue:12:11:12:41 | response | testUseQueries2.vue:13:12:13:19 | response | provenance |  |
-| testUseQueries2.vue:12:22:12:41 | await fetch("${id}") | testUseQueries2.vue:12:11:12:41 | response | provenance |  |
+| testUseQueries2.vue:12:11:12:18 | response | testUseQueries2.vue:13:12:13:19 | response | provenance |  |
+| testUseQueries2.vue:12:22:12:41 | await fetch("${id}") | testUseQueries2.vue:12:11:12:18 | response | provenance |  |
 | testUseQueries2.vue:12:28:12:41 | fetch("${id}") | testUseQueries2.vue:12:22:12:41 | await fetch("${id}") | provenance |  |
 | testUseQueries2.vue:13:12:13:19 | response | testUseQueries2.vue:13:12:13:26 | response.json() | provenance |  |
 | testUseQueries2.vue:13:12:13:26 | response.json() | testUseQueries2.vue:33:22:33:36 | results[0].data | provenance |  |
 | testUseQueries2.vue:33:22:33:36 | results[0].data | testUseQueries2.vue:40:10:40:23 | v-html=data3 | provenance |  |
-| testUseQueries.vue:11:19:11:49 | response | testUseQueries.vue:12:20:12:27 | response | provenance |  |
-| testUseQueries.vue:11:30:11:49 | await fetch("${id}") | testUseQueries.vue:11:19:11:49 | response | provenance |  |
+| testUseQueries.vue:11:19:11:26 | response | testUseQueries.vue:12:20:12:27 | response | provenance |  |
+| testUseQueries.vue:11:30:11:49 | await fetch("${id}") | testUseQueries.vue:11:19:11:26 | response | provenance |  |
 | testUseQueries.vue:11:36:11:49 | fetch("${id}") | testUseQueries.vue:11:30:11:49 | await fetch("${id}") | provenance |  |
 | testUseQueries.vue:12:20:12:27 | response | testUseQueries.vue:12:20:12:34 | response.json() | provenance |  |
 | testUseQueries.vue:12:20:12:34 | response.json() | testUseQueries.vue:18:22:18:36 | results[0].data | provenance |  |
 | testUseQueries.vue:18:22:18:36 | results[0].data | testUseQueries.vue:25:10:25:23 | v-html=data2 | provenance |  |
 nodes
 | interceptors.js:7:6:7:13 | response | semmle.label | response |
-| interceptors.js:8:15:8:47 | userGeneratedHtml | semmle.label | userGeneratedHtml |
+| interceptors.js:8:15:8:31 | userGeneratedHtml | semmle.label | userGeneratedHtml |
 | interceptors.js:8:35:8:42 | response | semmle.label | response |
 | interceptors.js:9:56:9:72 | userGeneratedHtml | semmle.label | userGeneratedHtml |
-| test.jsx:5:11:5:63 | response | semmle.label | response |
+| test.jsx:5:11:5:18 | response | semmle.label | response |
 | test.jsx:5:22:5:63 | await f ... ntent") | semmle.label | await f ... ntent") |
 | test.jsx:5:28:5:63 | fetch(" ... ntent") | semmle.label | fetch(" ... ntent") |
-| test.jsx:6:11:6:38 | data | semmle.label | data |
+| test.jsx:6:11:6:14 | data | semmle.label | data |
 | test.jsx:6:18:6:38 | await r ... .json() | semmle.label | await r ... .json() |
 | test.jsx:6:24:6:31 | response | semmle.label | response |
 | test.jsx:6:24:6:38 | response.json() | semmle.label | response.json() |
 | test.jsx:7:12:7:15 | data | semmle.label | data |
-| test.jsx:15:11:17:5 | data | semmle.label | data |
+| test.jsx:15:13:15:16 | data | semmle.label | data |
 | test.jsx:15:13:15:16 | data | semmle.label | data |
 | test.jsx:27:29:27:32 | data | semmle.label | data |
 | test.ts:8:9:8:79 | this.#h ... query') | semmle.label | this.#h ... query') |
@@ -124,40 +124,40 @@ nodes
 | test.ts:24:43:24:55 | response.name | semmle.label | response.name |
 | test.ts:24:67:24:74 | response | semmle.label | response |
 | test.ts:24:67:24:84 | response.owner.bio | semmle.label | response.owner.bio |
-| test.vue:7:11:13:6 | data | semmle.label | data |
 | test.vue:7:45:7:48 | data | semmle.label | data |
-| test.vue:10:15:10:84 | response | semmle.label | response |
+| test.vue:7:45:7:48 | data | semmle.label | data |
+| test.vue:10:15:10:22 | response | semmle.label | response |
 | test.vue:10:26:10:84 | await f ... sts/1") | semmle.label | await f ... sts/1") |
 | test.vue:10:32:10:84 | fetch(" ... sts/1") | semmle.label | fetch(" ... sts/1") |
 | test.vue:11:16:11:23 | response | semmle.label | response |
 | test.vue:11:16:11:30 | response.json() | semmle.label | response.json() |
 | test.vue:15:21:15:24 | data | semmle.label | data |
 | test.vue:22:10:22:22 | v-html=data | semmle.label | v-html=data |
-| testReactRelay.tsx:5:9:5:52 | commentData | semmle.label | commentData |
+| testReactRelay.tsx:5:9:5:19 | commentData | semmle.label | commentData |
 | testReactRelay.tsx:5:23:5:52 | useFrag ... entRef) | semmle.label | useFrag ... entRef) |
 | testReactRelay.tsx:7:43:7:53 | commentData | semmle.label | commentData |
 | testReactRelay.tsx:7:43:7:58 | commentData.text | semmle.label | commentData.text |
-| testReactRelay.tsx:17:9:17:42 | data | semmle.label | data |
+| testReactRelay.tsx:17:9:17:12 | data | semmle.label | data |
 | testReactRelay.tsx:17:16:17:42 | useLazy ... ry, {}) | semmle.label | useLazy ... ry, {}) |
 | testReactRelay.tsx:18:48:18:51 | data | semmle.label | data |
 | testReactRelay.tsx:18:48:18:68 | data.co ... 0].text | semmle.label | data.co ... 0].text |
 | testReactRelay.tsx:28:17:28:56 | usePrel ... erence) | semmle.label | usePrel ... erence) |
 | testReactRelay.tsx:28:17:28:67 | usePrel ... r?.name | semmle.label | usePrel ... r?.name |
-| testReactRelay.tsx:37:9:37:40 | data | semmle.label | data |
+| testReactRelay.tsx:37:9:37:12 | data | semmle.label | data |
 | testReactRelay.tsx:37:16:37:40 | useClie ... ry, {}) | semmle.label | useClie ... ry, {}) |
 | testReactRelay.tsx:38:49:38:52 | data | semmle.label | data |
-| testReactRelay.tsx:44:9:44:70 | data | semmle.label | data |
+| testReactRelay.tsx:44:10:44:13 | data | semmle.label | data |
 | testReactRelay.tsx:44:10:44:13 | data | semmle.label | data |
 | testReactRelay.tsx:47:46:47:49 | data | semmle.label | data |
-| testReactRelay.tsx:61:9:70:38 | data | semmle.label | data |
+| testReactRelay.tsx:62:5:62:8 | data | semmle.label | data |
 | testReactRelay.tsx:62:5:62:8 | data | semmle.label | data |
 | testReactRelay.tsx:71:49:71:52 | data | semmle.label | data |
-| testReactRelay.tsx:80:9:80:54 | feedbackText | semmle.label | feedbackText |
+| testReactRelay.tsx:80:10:80:21 | feedbackText | semmle.label | feedbackText |
 | testReactRelay.tsx:80:10:80:21 | feedbackText | semmle.label | feedbackText |
 | testReactRelay.tsx:83:17:83:20 | data | semmle.label | data |
 | testReactRelay.tsx:84:23:84:26 | data | semmle.label | data |
 | testReactRelay.tsx:88:50:88:61 | feedbackText | semmle.label | feedbackText |
-| testReactRelay.tsx:95:9:95:50 | fragmentRef | semmle.label | fragmentRef |
+| testReactRelay.tsx:95:10:95:20 | fragmentRef | semmle.label | fragmentRef |
 | testReactRelay.tsx:95:10:95:20 | fragmentRef | semmle.label | fragmentRef |
 | testReactRelay.tsx:100:14:100:16 | res | semmle.label | res |
 | testReactRelay.tsx:101:22:101:24 | res | semmle.label | res |
@@ -165,31 +165,31 @@ nodes
 | testReactRelay.tsx:124:12:124:15 | data | semmle.label | data |
 | testReactRelay.tsx:127:35:127:38 | data | semmle.label | data |
 | testReactRelay.tsx:127:35:127:43 | data.user | semmle.label | data.user |
-| testReactRelay.tsx:136:9:136:39 | data | semmle.label | data |
+| testReactRelay.tsx:136:9:136:12 | data | semmle.label | data |
 | testReactRelay.tsx:136:16:136:39 | readFra ... y, key) | semmle.label | readFra ... y, key) |
 | testReactRelay.tsx:137:50:137:53 | data | semmle.label | data |
-| testReactUseQueries.jsx:4:9:4:53 | response | semmle.label | response |
+| testReactUseQueries.jsx:4:9:4:16 | response | semmle.label | response |
 | testReactUseQueries.jsx:4:20:4:53 | await f ... e.com') | semmle.label | await f ... e.com') |
 | testReactUseQueries.jsx:4:26:4:53 | fetch(' ... e.com') | semmle.label | fetch(' ... e.com') |
 | testReactUseQueries.jsx:5:10:5:17 | response | semmle.label | response |
 | testReactUseQueries.jsx:5:10:5:24 | response.json() | semmle.label | response.json() |
 | testReactUseQueries.jsx:37:25:37:38 | repoQuery.data | semmle.label | repoQuery.data |
-| testUseQueries2.vue:6:11:6:63 | response | semmle.label | response |
+| testUseQueries2.vue:6:11:6:18 | response | semmle.label | response |
 | testUseQueries2.vue:6:22:6:63 | await f ... ntent") | semmle.label | await f ... ntent") |
 | testUseQueries2.vue:6:28:6:63 | fetch(" ... ntent") | semmle.label | fetch(" ... ntent") |
-| testUseQueries2.vue:7:11:7:38 | data | semmle.label | data |
+| testUseQueries2.vue:7:11:7:14 | data | semmle.label | data |
 | testUseQueries2.vue:7:18:7:38 | await r ... .json() | semmle.label | await r ... .json() |
 | testUseQueries2.vue:7:24:7:31 | response | semmle.label | response |
 | testUseQueries2.vue:7:24:7:38 | response.json() | semmle.label | response.json() |
 | testUseQueries2.vue:8:12:8:15 | data | semmle.label | data |
-| testUseQueries2.vue:12:11:12:41 | response | semmle.label | response |
+| testUseQueries2.vue:12:11:12:18 | response | semmle.label | response |
 | testUseQueries2.vue:12:22:12:41 | await fetch("${id}") | semmle.label | await fetch("${id}") |
 | testUseQueries2.vue:12:28:12:41 | fetch("${id}") | semmle.label | fetch("${id}") |
 | testUseQueries2.vue:13:12:13:19 | response | semmle.label | response |
 | testUseQueries2.vue:13:12:13:26 | response.json() | semmle.label | response.json() |
 | testUseQueries2.vue:33:22:33:36 | results[0].data | semmle.label | results[0].data |
 | testUseQueries2.vue:40:10:40:23 | v-html=data3 | semmle.label | v-html=data3 |
-| testUseQueries.vue:11:19:11:49 | response | semmle.label | response |
+| testUseQueries.vue:11:19:11:26 | response | semmle.label | response |
 | testUseQueries.vue:11:30:11:49 | await fetch("${id}") | semmle.label | await fetch("${id}") |
 | testUseQueries.vue:11:36:11:49 | fetch("${id}") | semmle.label | fetch("${id}") |
 | testUseQueries.vue:12:20:12:27 | response | semmle.label | response |
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/ExceptionXss/ExceptionXss.expected b/javascript/ql/test/query-tests/Security/CWE-079/ExceptionXss/ExceptionXss.expected
index 350f7bf5431..595187bdf6f 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/ExceptionXss/ExceptionXss.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-079/ExceptionXss/ExceptionXss.expected
@@ -18,16 +18,16 @@
 | exception-xss.js:175:18:175:18 | e | exception-xss.js:146:12:146:35 | documen ... .search | exception-xss.js:175:18:175:18 | e | $@ is reinterpreted as HTML without escaping meta-characters. | exception-xss.js:146:12:146:35 | documen ... .search | Exception text |
 | exception-xss.js:182:19:182:23 | error | exception-xss.js:180:10:180:22 | req.params.id | exception-xss.js:182:19:182:23 | error | $@ is reinterpreted as HTML without escaping meta-characters. | exception-xss.js:180:10:180:22 | req.params.id | Exception text |
 edges
-| exception-xss.js:2:6:2:28 | foo | exception-xss.js:9:11:9:13 | foo | provenance |  |
-| exception-xss.js:2:6:2:28 | foo | exception-xss.js:15:9:15:11 | foo | provenance |  |
-| exception-xss.js:2:6:2:28 | foo | exception-xss.js:21:11:21:13 | foo | provenance |  |
-| exception-xss.js:2:6:2:28 | foo | exception-xss.js:33:19:33:21 | foo | provenance |  |
-| exception-xss.js:2:6:2:28 | foo | exception-xss.js:46:16:46:18 | foo | provenance |  |
-| exception-xss.js:2:6:2:28 | foo | exception-xss.js:81:16:81:18 | foo | provenance |  |
-| exception-xss.js:2:6:2:28 | foo | exception-xss.js:89:11:89:13 | foo | provenance |  |
-| exception-xss.js:2:6:2:28 | foo | exception-xss.js:95:12:95:14 | foo | provenance |  |
-| exception-xss.js:2:6:2:28 | foo | exception-xss.js:102:12:102:14 | foo | provenance |  |
-| exception-xss.js:2:12:2:28 | document.location | exception-xss.js:2:6:2:28 | foo | provenance |  |
+| exception-xss.js:2:6:2:8 | foo | exception-xss.js:9:11:9:13 | foo | provenance |  |
+| exception-xss.js:2:6:2:8 | foo | exception-xss.js:15:9:15:11 | foo | provenance |  |
+| exception-xss.js:2:6:2:8 | foo | exception-xss.js:21:11:21:13 | foo | provenance |  |
+| exception-xss.js:2:6:2:8 | foo | exception-xss.js:33:19:33:21 | foo | provenance |  |
+| exception-xss.js:2:6:2:8 | foo | exception-xss.js:46:16:46:18 | foo | provenance |  |
+| exception-xss.js:2:6:2:8 | foo | exception-xss.js:81:16:81:18 | foo | provenance |  |
+| exception-xss.js:2:6:2:8 | foo | exception-xss.js:89:11:89:13 | foo | provenance |  |
+| exception-xss.js:2:6:2:8 | foo | exception-xss.js:95:12:95:14 | foo | provenance |  |
+| exception-xss.js:2:6:2:8 | foo | exception-xss.js:102:12:102:14 | foo | provenance |  |
+| exception-xss.js:2:12:2:28 | document.location | exception-xss.js:2:6:2:8 | foo | provenance |  |
 | exception-xss.js:4:17:4:17 | x | exception-xss.js:5:11:5:11 | x | provenance |  |
 | exception-xss.js:9:11:9:13 | foo | exception-xss.js:10:11:10:11 | e | provenance | Config |
 | exception-xss.js:10:11:10:11 | e | exception-xss.js:11:18:11:18 | e | provenance |  |
@@ -75,10 +75,10 @@ edges
 | exception-xss.js:129:11:129:11 | e | exception-xss.js:130:18:130:18 | e | provenance |  |
 | exception-xss.js:136:10:136:22 | req.params.id | exception-xss.js:136:26:136:30 | error | provenance | Config |
 | exception-xss.js:136:26:136:30 | error | exception-xss.js:138:19:138:23 | error | provenance |  |
-| exception-xss.js:146:6:146:35 | foo | exception-xss.js:148:33:148:35 | foo | provenance |  |
-| exception-xss.js:146:6:146:35 | foo | exception-xss.js:153:8:153:10 | foo | provenance |  |
-| exception-xss.js:146:6:146:35 | foo | exception-xss.js:174:31:174:33 | foo | provenance |  |
-| exception-xss.js:146:12:146:35 | documen ... .search | exception-xss.js:146:6:146:35 | foo | provenance |  |
+| exception-xss.js:146:6:146:8 | foo | exception-xss.js:148:33:148:35 | foo | provenance |  |
+| exception-xss.js:146:6:146:8 | foo | exception-xss.js:153:8:153:10 | foo | provenance |  |
+| exception-xss.js:146:6:146:8 | foo | exception-xss.js:174:31:174:33 | foo | provenance |  |
+| exception-xss.js:146:12:146:35 | documen ... .search | exception-xss.js:146:6:146:8 | foo | provenance |  |
 | exception-xss.js:148:2:148:46 | new Pro ... solve)) [PromiseError] | exception-xss.js:148:55:148:55 | e | provenance |  |
 | exception-xss.js:148:33:148:35 | foo | exception-xss.js:148:2:148:46 | new Pro ... solve)) [PromiseError] | provenance | Config |
 | exception-xss.js:148:55:148:55 | e | exception-xss.js:149:18:149:18 | e | provenance |  |
@@ -95,7 +95,7 @@ edges
 nodes
 | ajv.js:11:18:11:33 | ajv.errorsText() | semmle.label | ajv.errorsText() |
 | ajv.js:24:18:24:26 | val.error | semmle.label | val.error |
-| exception-xss.js:2:6:2:28 | foo | semmle.label | foo |
+| exception-xss.js:2:6:2:8 | foo | semmle.label | foo |
 | exception-xss.js:2:12:2:28 | document.location | semmle.label | document.location |
 | exception-xss.js:4:17:4:17 | x | semmle.label | x |
 | exception-xss.js:5:11:5:11 | x | semmle.label | x |
@@ -154,7 +154,7 @@ nodes
 | exception-xss.js:136:10:136:22 | req.params.id | semmle.label | req.params.id |
 | exception-xss.js:136:26:136:30 | error | semmle.label | error |
 | exception-xss.js:138:19:138:23 | error | semmle.label | error |
-| exception-xss.js:146:6:146:35 | foo | semmle.label | foo |
+| exception-xss.js:146:6:146:8 | foo | semmle.label | foo |
 | exception-xss.js:146:12:146:35 | documen ... .search | semmle.label | documen ... .search |
 | exception-xss.js:148:2:148:46 | new Pro ... solve)) [PromiseError] | semmle.label | new Pro ... solve)) [PromiseError] |
 | exception-xss.js:148:33:148:35 | foo | semmle.label | foo |
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/ReflectedXss.expected b/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/ReflectedXss.expected
index c1e626a688a..e536364f805 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/ReflectedXss.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-079/ReflectedXss/ReflectedXss.expected
@@ -78,8 +78,8 @@ edges
 | ReflectedXss.js:7:33:7:45 | req.params.id | ReflectedXss.js:7:14:7:45 | "Unknow ... rams.id | provenance |  |
 | ReflectedXss.js:16:31:16:39 | params.id | ReflectedXss.js:16:12:16:39 | "Unknow ... rams.id | provenance |  |
 | ReflectedXss.js:22:19:22:26 | req.body | ReflectedXss.js:22:12:22:27 | marked(req.body) | provenance |  |
-| ReflectedXss.js:29:7:32:4 | mytable | ReflectedXss.js:33:12:33:18 | mytable | provenance |  |
-| ReflectedXss.js:29:17:32:4 | table([ ... ce\\n  ]) | ReflectedXss.js:29:7:32:4 | mytable | provenance |  |
+| ReflectedXss.js:29:7:29:13 | mytable | ReflectedXss.js:33:12:33:18 | mytable | provenance |  |
+| ReflectedXss.js:29:17:32:4 | table([ ... ce\\n  ]) | ReflectedXss.js:29:7:29:13 | mytable | provenance |  |
 | ReflectedXss.js:29:23:32:3 | [\\n    [ ... rce\\n  ] [1, 1] | ReflectedXss.js:29:17:32:4 | table([ ... ce\\n  ]) | provenance |  |
 | ReflectedXss.js:31:5:31:22 | ['body', req.body] [1] | ReflectedXss.js:29:23:32:3 | [\\n    [ ... rce\\n  ] [1, 1] | provenance |  |
 | ReflectedXss.js:31:14:31:21 | req.body | ReflectedXss.js:31:5:31:22 | ['body', req.body] [1] | provenance |  |
@@ -97,23 +97,23 @@ edges
 | ReflectedXss.js:97:30:97:37 | req.body | ReflectedXss.js:97:12:97:38 | markdow ... q.body) | provenance |  |
 | ReflectedXss.js:99:31:99:38 | req.body | ReflectedXss.js:99:12:99:39 | markdow ... q.body) | provenance |  |
 | ReflectedXss.js:102:76:102:83 | req.body | ReflectedXss.js:102:12:102:84 | markdow ... q.body) | provenance |  |
-| ReflectedXss.js:113:11:113:41 | queryKeys | ReflectedXss.js:115:18:115:26 | queryKeys | provenance |  |
-| ReflectedXss.js:113:13:113:27 | keys: queryKeys | ReflectedXss.js:113:11:113:41 | queryKeys | provenance |  |
-| ReflectedXss.js:115:11:115:45 | keys | ReflectedXss.js:117:50:117:53 | keys | provenance |  |
-| ReflectedXss.js:115:11:115:45 | keys | ReflectedXss.js:117:58:117:61 | keys | provenance |  |
-| ReflectedXss.js:115:18:115:26 | queryKeys | ReflectedXss.js:115:11:115:45 | keys | provenance |  |
-| ReflectedXss.js:115:31:115:45 | paramKeys?.keys | ReflectedXss.js:115:11:115:45 | keys | provenance |  |
-| ReflectedXss.js:117:11:117:61 | keyArray | ReflectedXss.js:118:25:118:32 | keyArray | provenance |  |
-| ReflectedXss.js:117:11:117:61 | keyArray [0] | ReflectedXss.js:118:25:118:32 | keyArray [0] | provenance |  |
-| ReflectedXss.js:117:49:117:54 | [keys] [0] | ReflectedXss.js:117:11:117:61 | keyArray [0] | provenance |  |
+| ReflectedXss.js:113:13:113:27 | keys: queryKeys | ReflectedXss.js:113:19:113:27 | queryKeys | provenance |  |
+| ReflectedXss.js:113:19:113:27 | queryKeys | ReflectedXss.js:115:18:115:26 | queryKeys | provenance |  |
+| ReflectedXss.js:115:11:115:14 | keys | ReflectedXss.js:117:50:117:53 | keys | provenance |  |
+| ReflectedXss.js:115:11:115:14 | keys | ReflectedXss.js:117:58:117:61 | keys | provenance |  |
+| ReflectedXss.js:115:18:115:26 | queryKeys | ReflectedXss.js:115:11:115:14 | keys | provenance |  |
+| ReflectedXss.js:115:31:115:45 | paramKeys?.keys | ReflectedXss.js:115:11:115:14 | keys | provenance |  |
+| ReflectedXss.js:117:11:117:18 | keyArray | ReflectedXss.js:118:25:118:32 | keyArray | provenance |  |
+| ReflectedXss.js:117:11:117:18 | keyArray [0] | ReflectedXss.js:118:25:118:32 | keyArray [0] | provenance |  |
+| ReflectedXss.js:117:49:117:54 | [keys] [0] | ReflectedXss.js:117:11:117:18 | keyArray [0] | provenance |  |
 | ReflectedXss.js:117:50:117:53 | keys | ReflectedXss.js:117:49:117:54 | [keys] [0] | provenance |  |
-| ReflectedXss.js:117:58:117:61 | keys | ReflectedXss.js:117:11:117:61 | keyArray | provenance |  |
-| ReflectedXss.js:118:11:118:72 | invalidKeys | ReflectedXss.js:121:33:121:43 | invalidKeys | provenance |  |
-| ReflectedXss.js:118:11:118:72 | invalidKeys [0] | ReflectedXss.js:121:33:121:43 | invalidKeys [0] | provenance |  |
+| ReflectedXss.js:117:58:117:61 | keys | ReflectedXss.js:117:11:117:18 | keyArray | provenance |  |
+| ReflectedXss.js:118:11:118:21 | invalidKeys | ReflectedXss.js:121:33:121:43 | invalidKeys | provenance |  |
+| ReflectedXss.js:118:11:118:21 | invalidKeys [0] | ReflectedXss.js:121:33:121:43 | invalidKeys [0] | provenance |  |
 | ReflectedXss.js:118:25:118:32 | keyArray | ReflectedXss.js:118:25:118:72 | keyArra ... s(key)) | provenance |  |
 | ReflectedXss.js:118:25:118:32 | keyArray [0] | ReflectedXss.js:118:25:118:72 | keyArra ... s(key)) [0] | provenance |  |
-| ReflectedXss.js:118:25:118:72 | keyArra ... s(key)) | ReflectedXss.js:118:11:118:72 | invalidKeys | provenance |  |
-| ReflectedXss.js:118:25:118:72 | keyArra ... s(key)) [0] | ReflectedXss.js:118:11:118:72 | invalidKeys [0] | provenance |  |
+| ReflectedXss.js:118:25:118:72 | keyArra ... s(key)) | ReflectedXss.js:118:11:118:21 | invalidKeys | provenance |  |
+| ReflectedXss.js:118:25:118:72 | keyArra ... s(key)) [0] | ReflectedXss.js:118:11:118:21 | invalidKeys [0] | provenance |  |
 | ReflectedXss.js:121:33:121:43 | invalidKeys | ReflectedXss.js:121:33:121:54 | invalid ... n(', ') | provenance |  |
 | ReflectedXss.js:121:33:121:43 | invalidKeys [0] | ReflectedXss.js:121:33:121:54 | invalid ... n(', ') | provenance |  |
 | ReflectedXss.js:121:33:121:54 | invalid ... n(', ') | ReflectedXss.js:121:30:121:73 | `${inva ... telist` | provenance |  |
@@ -123,11 +123,11 @@ edges
 | ReflectedXssContentTypes.js:70:22:70:34 | req.params.id | ReflectedXssContentTypes.js:70:12:70:34 | "FOO: " ... rams.id | provenance |  |
 | ReflectedXssGood3.js:68:22:68:26 | value | ReflectedXssGood3.js:77:16:77:20 | value | provenance |  |
 | ReflectedXssGood3.js:68:22:68:26 | value | ReflectedXssGood3.js:105:18:105:22 | value | provenance |  |
-| ReflectedXssGood3.js:77:7:77:37 | parts | ReflectedXssGood3.js:108:10:108:14 | parts | provenance |  |
-| ReflectedXssGood3.js:77:7:77:37 | parts [0] | ReflectedXssGood3.js:108:10:108:14 | parts [0] | provenance |  |
-| ReflectedXssGood3.js:77:15:77:37 | [value. ... (0, i)] [0] | ReflectedXssGood3.js:77:7:77:37 | parts [0] | provenance |  |
+| ReflectedXssGood3.js:77:7:77:11 | parts | ReflectedXssGood3.js:108:10:108:14 | parts | provenance |  |
+| ReflectedXssGood3.js:77:7:77:11 | parts [0] | ReflectedXssGood3.js:108:10:108:14 | parts [0] | provenance |  |
+| ReflectedXssGood3.js:77:15:77:37 | [value. ... (0, i)] [0] | ReflectedXssGood3.js:77:7:77:11 | parts [0] | provenance |  |
 | ReflectedXssGood3.js:77:16:77:20 | value | ReflectedXssGood3.js:77:16:77:36 | value.s ... g(0, i) | provenance |  |
-| ReflectedXssGood3.js:77:16:77:36 | value.s ... g(0, i) | ReflectedXssGood3.js:77:7:77:37 | parts | provenance |  |
+| ReflectedXssGood3.js:77:16:77:36 | value.s ... g(0, i) | ReflectedXssGood3.js:77:7:77:11 | parts | provenance |  |
 | ReflectedXssGood3.js:77:16:77:36 | value.s ... g(0, i) | ReflectedXssGood3.js:77:15:77:37 | [value. ... (0, i)] [0] | provenance |  |
 | ReflectedXssGood3.js:77:16:77:36 | value.s ... g(0, i) | ReflectedXssGood3.js:108:10:108:23 | parts.join('') | provenance |  |
 | ReflectedXssGood3.js:105:7:105:11 | [post update] parts [ArrayElement] | ReflectedXssGood3.js:108:10:108:14 | parts [ArrayElement] | provenance |  |
@@ -136,34 +136,34 @@ edges
 | ReflectedXssGood3.js:108:10:108:14 | parts | ReflectedXssGood3.js:108:10:108:23 | parts.join('') | provenance |  |
 | ReflectedXssGood3.js:108:10:108:14 | parts [0] | ReflectedXssGood3.js:108:10:108:23 | parts.join('') | provenance |  |
 | ReflectedXssGood3.js:108:10:108:14 | parts [ArrayElement] | ReflectedXssGood3.js:108:10:108:23 | parts.join('') | provenance |  |
-| ReflectedXssGood3.js:135:9:135:27 | url | ReflectedXssGood3.js:139:24:139:26 | url | provenance |  |
-| ReflectedXssGood3.js:135:15:135:27 | req.params.id | ReflectedXssGood3.js:135:9:135:27 | url | provenance |  |
+| ReflectedXssGood3.js:135:9:135:11 | url | ReflectedXssGood3.js:139:24:139:26 | url | provenance |  |
+| ReflectedXssGood3.js:135:15:135:27 | req.params.id | ReflectedXssGood3.js:135:9:135:11 | url | provenance |  |
 | ReflectedXssGood3.js:139:24:139:26 | url | ReflectedXssGood3.js:68:22:68:26 | value | provenance |  |
 | ReflectedXssGood3.js:139:24:139:26 | url | ReflectedXssGood3.js:139:12:139:27 | escapeHtml3(url) | provenance |  |
-| app/api/route.ts:2:11:2:33 | body | app/api/route.ts:5:18:5:21 | body | provenance |  |
-| app/api/route.ts:2:11:2:33 | body | app/api/route.ts:13:18:13:21 | body | provenance |  |
-| app/api/route.ts:2:11:2:33 | body | app/api/route.ts:25:18:25:21 | body | provenance |  |
-| app/api/route.ts:2:11:2:33 | body | app/api/route.ts:29:25:29:28 | body | provenance |  |
-| app/api/route.ts:2:18:2:33 | await req.json() | app/api/route.ts:2:11:2:33 | body | provenance |  |
+| app/api/route.ts:2:11:2:14 | body | app/api/route.ts:5:18:5:21 | body | provenance |  |
+| app/api/route.ts:2:11:2:14 | body | app/api/route.ts:13:18:13:21 | body | provenance |  |
+| app/api/route.ts:2:11:2:14 | body | app/api/route.ts:25:18:25:21 | body | provenance |  |
+| app/api/route.ts:2:11:2:14 | body | app/api/route.ts:29:25:29:28 | body | provenance |  |
+| app/api/route.ts:2:18:2:33 | await req.json() | app/api/route.ts:2:11:2:14 | body | provenance |  |
 | app/api/route.ts:2:24:2:33 | req.json() | app/api/route.ts:2:18:2:33 | await req.json() | provenance |  |
-| app/api/routeNextRequest.ts:4:9:4:31 | body | app/api/routeNextRequest.ts:7:20:7:23 | body | provenance |  |
-| app/api/routeNextRequest.ts:4:9:4:31 | body | app/api/routeNextRequest.ts:15:20:15:23 | body | provenance |  |
-| app/api/routeNextRequest.ts:4:9:4:31 | body | app/api/routeNextRequest.ts:27:20:27:23 | body | provenance |  |
-| app/api/routeNextRequest.ts:4:9:4:31 | body | app/api/routeNextRequest.ts:31:27:31:30 | body | provenance |  |
-| app/api/routeNextRequest.ts:4:16:4:31 | await req.json() | app/api/routeNextRequest.ts:4:9:4:31 | body | provenance |  |
+| app/api/routeNextRequest.ts:4:9:4:12 | body | app/api/routeNextRequest.ts:7:20:7:23 | body | provenance |  |
+| app/api/routeNextRequest.ts:4:9:4:12 | body | app/api/routeNextRequest.ts:15:20:15:23 | body | provenance |  |
+| app/api/routeNextRequest.ts:4:9:4:12 | body | app/api/routeNextRequest.ts:27:20:27:23 | body | provenance |  |
+| app/api/routeNextRequest.ts:4:9:4:12 | body | app/api/routeNextRequest.ts:31:27:31:30 | body | provenance |  |
+| app/api/routeNextRequest.ts:4:16:4:31 | await req.json() | app/api/routeNextRequest.ts:4:9:4:12 | body | provenance |  |
 | app/api/routeNextRequest.ts:4:22:4:31 | req.json() | app/api/routeNextRequest.ts:4:16:4:31 | await req.json() | provenance |  |
-| etherpad.js:9:5:9:53 | response | etherpad.js:11:12:11:19 | response | provenance |  |
-| etherpad.js:9:16:9:30 | req.query.jsonp | etherpad.js:9:5:9:53 | response | provenance |  |
-| formatting.js:4:9:4:29 | evil | formatting.js:6:43:6:46 | evil | provenance |  |
-| formatting.js:4:9:4:29 | evil | formatting.js:7:49:7:52 | evil | provenance |  |
-| formatting.js:4:16:4:29 | req.query.evil | formatting.js:4:9:4:29 | evil | provenance |  |
+| etherpad.js:9:5:9:12 | response | etherpad.js:11:12:11:19 | response | provenance |  |
+| etherpad.js:9:16:9:30 | req.query.jsonp | etherpad.js:9:5:9:12 | response | provenance |  |
+| formatting.js:4:9:4:12 | evil | formatting.js:6:43:6:46 | evil | provenance |  |
+| formatting.js:4:9:4:12 | evil | formatting.js:7:49:7:52 | evil | provenance |  |
+| formatting.js:4:16:4:29 | req.query.evil | formatting.js:4:9:4:12 | evil | provenance |  |
 | formatting.js:6:43:6:46 | evil | formatting.js:6:14:6:47 | util.fo ... , evil) | provenance |  |
 | formatting.js:7:49:7:52 | evil | formatting.js:7:14:7:53 | require ... , evil) | provenance |  |
-| live-server.js:4:11:4:27 | tainted | live-server.js:6:28:6:34 | tainted | provenance |  |
-| live-server.js:4:21:4:27 | req.url | live-server.js:4:11:4:27 | tainted | provenance |  |
+| live-server.js:4:11:4:17 | tainted | live-server.js:6:28:6:34 | tainted | provenance |  |
+| live-server.js:4:21:4:27 | req.url | live-server.js:4:11:4:17 | tainted | provenance |  |
 | live-server.js:6:28:6:34 | tainted | live-server.js:6:13:6:50 | `<html> ... /html>` | provenance |  |
-| live-server.js:10:11:10:27 | tainted | live-server.js:12:28:12:34 | tainted | provenance |  |
-| live-server.js:10:21:10:27 | req.url | live-server.js:10:11:10:27 | tainted | provenance |  |
+| live-server.js:10:11:10:17 | tainted | live-server.js:12:28:12:34 | tainted | provenance |  |
+| live-server.js:10:21:10:27 | req.url | live-server.js:10:11:10:17 | tainted | provenance |  |
 | live-server.js:12:28:12:34 | tainted | live-server.js:12:13:12:50 | `<html> ... /html>` | provenance |  |
 | partial.js:9:25:9:25 | x | partial.js:10:14:10:14 | x | provenance |  |
 | partial.js:10:14:10:14 | x | partial.js:10:14:10:18 | x + y | provenance |  |
@@ -182,85 +182,85 @@ edges
 | promises.js:5:36:5:42 | [post update] resolve [resolve-value] | promises.js:5:16:5:22 | resolve [Return] [resolve-value] | provenance |  |
 | promises.js:5:44:5:57 | req.query.data | promises.js:5:36:5:42 | [post update] resolve [resolve-value] | provenance |  |
 | promises.js:6:11:6:11 | x | promises.js:6:25:6:25 | x | provenance |  |
-| response-object.js:7:11:7:25 | data | response-object.js:9:18:9:21 | data | provenance |  |
-| response-object.js:7:11:7:25 | data | response-object.js:10:18:10:21 | data | provenance |  |
-| response-object.js:7:11:7:25 | data | response-object.js:11:18:11:21 | data | provenance |  |
-| response-object.js:7:11:7:25 | data | response-object.js:14:18:14:21 | data | provenance |  |
-| response-object.js:7:11:7:25 | data | response-object.js:17:18:17:21 | data | provenance |  |
-| response-object.js:7:11:7:25 | data | response-object.js:23:18:23:21 | data | provenance |  |
-| response-object.js:7:11:7:25 | data | response-object.js:26:18:26:21 | data | provenance |  |
-| response-object.js:7:11:7:25 | data | response-object.js:34:18:34:21 | data | provenance |  |
-| response-object.js:7:11:7:25 | data | response-object.js:38:18:38:21 | data | provenance |  |
-| response-object.js:7:18:7:25 | req.body | response-object.js:7:11:7:25 | data | provenance |  |
-| tst2.js:6:7:6:30 | p | tst2.js:7:12:7:12 | p | provenance |  |
-| tst2.js:6:7:6:30 | r | tst2.js:8:12:8:12 | r | provenance |  |
-| tst2.js:6:9:6:9 | p | tst2.js:6:7:6:30 | p | provenance |  |
-| tst2.js:6:12:6:15 | q: r | tst2.js:6:7:6:30 | r | provenance |  |
-| tst2.js:14:7:14:24 | p | tst2.js:18:12:18:12 | p | provenance |  |
-| tst2.js:14:7:14:24 | p | tst2.js:21:14:21:14 | p | provenance |  |
-| tst2.js:14:9:14:9 | p | tst2.js:14:7:14:24 | p | provenance |  |
-| tst2.js:30:7:30:24 | p | tst2.js:33:11:33:11 | p | provenance |  |
-| tst2.js:30:7:30:24 | p | tst2.js:36:12:36:12 | p | provenance |  |
-| tst2.js:30:9:30:9 | p | tst2.js:30:7:30:24 | p | provenance |  |
+| response-object.js:7:11:7:14 | data | response-object.js:9:18:9:21 | data | provenance |  |
+| response-object.js:7:11:7:14 | data | response-object.js:10:18:10:21 | data | provenance |  |
+| response-object.js:7:11:7:14 | data | response-object.js:11:18:11:21 | data | provenance |  |
+| response-object.js:7:11:7:14 | data | response-object.js:14:18:14:21 | data | provenance |  |
+| response-object.js:7:11:7:14 | data | response-object.js:17:18:17:21 | data | provenance |  |
+| response-object.js:7:11:7:14 | data | response-object.js:23:18:23:21 | data | provenance |  |
+| response-object.js:7:11:7:14 | data | response-object.js:26:18:26:21 | data | provenance |  |
+| response-object.js:7:11:7:14 | data | response-object.js:34:18:34:21 | data | provenance |  |
+| response-object.js:7:11:7:14 | data | response-object.js:38:18:38:21 | data | provenance |  |
+| response-object.js:7:18:7:25 | req.body | response-object.js:7:11:7:14 | data | provenance |  |
+| tst2.js:6:9:6:9 | p | tst2.js:6:9:6:9 | p | provenance |  |
+| tst2.js:6:9:6:9 | p | tst2.js:7:12:7:12 | p | provenance |  |
+| tst2.js:6:12:6:15 | q: r | tst2.js:6:15:6:15 | r | provenance |  |
+| tst2.js:6:15:6:15 | r | tst2.js:8:12:8:12 | r | provenance |  |
+| tst2.js:14:9:14:9 | p | tst2.js:14:9:14:9 | p | provenance |  |
+| tst2.js:14:9:14:9 | p | tst2.js:18:12:18:12 | p | provenance |  |
+| tst2.js:14:9:14:9 | p | tst2.js:21:14:21:14 | p | provenance |  |
+| tst2.js:30:9:30:9 | p | tst2.js:30:9:30:9 | p | provenance |  |
+| tst2.js:30:9:30:9 | p | tst2.js:33:11:33:11 | p | provenance |  |
+| tst2.js:30:9:30:9 | p | tst2.js:36:12:36:12 | p | provenance |  |
 | tst2.js:33:3:33:5 | [post update] obj [p] | tst2.js:34:21:34:23 | obj [p] | provenance |  |
 | tst2.js:33:11:33:11 | p | tst2.js:33:3:33:5 | [post update] obj [p] | provenance |  |
-| tst2.js:34:7:34:24 | other [p] | tst2.js:37:12:37:16 | other [p] | provenance |  |
-| tst2.js:34:15:34:24 | clone(obj) [p] | tst2.js:34:7:34:24 | other [p] | provenance |  |
+| tst2.js:34:7:34:11 | other [p] | tst2.js:37:12:37:16 | other [p] | provenance |  |
+| tst2.js:34:15:34:24 | clone(obj) [p] | tst2.js:34:7:34:11 | other [p] | provenance |  |
 | tst2.js:34:21:34:23 | obj [p] | tst2.js:34:15:34:24 | clone(obj) [p] | provenance |  |
 | tst2.js:37:12:37:16 | other [p] | tst2.js:37:12:37:18 | other.p | provenance |  |
-| tst2.js:43:7:43:24 | p | tst2.js:49:36:49:36 | p | provenance |  |
-| tst2.js:43:9:43:9 | p | tst2.js:43:7:43:24 | p | provenance |  |
-| tst2.js:49:7:49:53 | unsafe | tst2.js:51:12:51:17 | unsafe | provenance |  |
-| tst2.js:49:16:49:53 | seriali ...  true}) | tst2.js:49:7:49:53 | unsafe | provenance |  |
+| tst2.js:43:9:43:9 | p | tst2.js:43:9:43:9 | p | provenance |  |
+| tst2.js:43:9:43:9 | p | tst2.js:49:36:49:36 | p | provenance |  |
+| tst2.js:49:7:49:12 | unsafe | tst2.js:51:12:51:17 | unsafe | provenance |  |
+| tst2.js:49:16:49:53 | seriali ...  true}) | tst2.js:49:7:49:12 | unsafe | provenance |  |
 | tst2.js:49:36:49:36 | p | tst2.js:49:16:49:53 | seriali ...  true}) | provenance |  |
-| tst2.js:57:7:57:24 | p | tst2.js:60:11:60:11 | p | provenance |  |
-| tst2.js:57:7:57:24 | p | tst2.js:63:12:63:12 | p | provenance |  |
-| tst2.js:57:9:57:9 | p | tst2.js:57:7:57:24 | p | provenance |  |
+| tst2.js:57:9:57:9 | p | tst2.js:57:9:57:9 | p | provenance |  |
+| tst2.js:57:9:57:9 | p | tst2.js:60:11:60:11 | p | provenance |  |
+| tst2.js:57:9:57:9 | p | tst2.js:63:12:63:12 | p | provenance |  |
 | tst2.js:60:3:60:5 | [post update] obj [p] | tst2.js:61:22:61:24 | obj [p] | provenance |  |
 | tst2.js:60:11:60:11 | p | tst2.js:60:3:60:5 | [post update] obj [p] | provenance |  |
-| tst2.js:61:7:61:25 | other [p] | tst2.js:64:12:64:16 | other [p] | provenance |  |
-| tst2.js:61:15:61:25 | fclone(obj) [p] | tst2.js:61:7:61:25 | other [p] | provenance |  |
+| tst2.js:61:7:61:11 | other [p] | tst2.js:64:12:64:16 | other [p] | provenance |  |
+| tst2.js:61:15:61:25 | fclone(obj) [p] | tst2.js:61:7:61:11 | other [p] | provenance |  |
 | tst2.js:61:22:61:24 | obj [p] | tst2.js:61:15:61:25 | fclone(obj) [p] | provenance |  |
 | tst2.js:64:12:64:16 | other [p] | tst2.js:64:12:64:18 | other.p | provenance |  |
-| tst2.js:69:7:69:24 | p | tst2.js:72:11:72:11 | p | provenance |  |
-| tst2.js:69:7:69:24 | p | tst2.js:75:12:75:12 | p | provenance |  |
-| tst2.js:69:9:69:9 | p | tst2.js:69:7:69:24 | p | provenance |  |
+| tst2.js:69:9:69:9 | p | tst2.js:69:9:69:9 | p | provenance |  |
+| tst2.js:69:9:69:9 | p | tst2.js:72:11:72:11 | p | provenance |  |
+| tst2.js:69:9:69:9 | p | tst2.js:75:12:75:12 | p | provenance |  |
 | tst2.js:72:3:72:5 | [post update] obj [p] | tst2.js:73:40:73:42 | obj [p] | provenance |  |
 | tst2.js:72:11:72:11 | p | tst2.js:72:3:72:5 | [post update] obj [p] | provenance |  |
-| tst2.js:73:7:73:44 | other [p] | tst2.js:76:12:76:16 | other [p] | provenance |  |
-| tst2.js:73:15:73:44 | jc.retr ... e(obj)) [p] | tst2.js:73:7:73:44 | other [p] | provenance |  |
+| tst2.js:73:7:73:11 | other [p] | tst2.js:76:12:76:16 | other [p] | provenance |  |
+| tst2.js:73:15:73:44 | jc.retr ... e(obj)) [p] | tst2.js:73:7:73:11 | other [p] | provenance |  |
 | tst2.js:73:29:73:43 | jc.decycle(obj) [p] | tst2.js:73:15:73:44 | jc.retr ... e(obj)) [p] | provenance |  |
 | tst2.js:73:40:73:42 | obj [p] | tst2.js:73:29:73:43 | jc.decycle(obj) [p] | provenance |  |
 | tst2.js:76:12:76:16 | other [p] | tst2.js:76:12:76:18 | other.p | provenance |  |
-| tst2.js:82:7:82:24 | p | tst2.js:85:11:85:11 | p | provenance |  |
-| tst2.js:82:7:82:24 | p | tst2.js:88:12:88:12 | p | provenance |  |
-| tst2.js:82:9:82:9 | p | tst2.js:82:7:82:24 | p | provenance |  |
+| tst2.js:82:9:82:9 | p | tst2.js:82:9:82:9 | p | provenance |  |
+| tst2.js:82:9:82:9 | p | tst2.js:85:11:85:11 | p | provenance |  |
+| tst2.js:82:9:82:9 | p | tst2.js:88:12:88:12 | p | provenance |  |
 | tst2.js:85:3:85:5 | [post update] obj [p] | tst2.js:86:24:86:26 | obj [p] | provenance |  |
 | tst2.js:85:11:85:11 | p | tst2.js:85:3:85:5 | [post update] obj [p] | provenance |  |
-| tst2.js:86:7:86:27 | other [p] | tst2.js:89:12:89:16 | other [p] | provenance |  |
-| tst2.js:86:15:86:27 | sortKeys(obj) [p] | tst2.js:86:7:86:27 | other [p] | provenance |  |
+| tst2.js:86:7:86:11 | other [p] | tst2.js:89:12:89:16 | other [p] | provenance |  |
+| tst2.js:86:15:86:27 | sortKeys(obj) [p] | tst2.js:86:7:86:11 | other [p] | provenance |  |
 | tst2.js:86:24:86:26 | obj [p] | tst2.js:86:15:86:27 | sortKeys(obj) [p] | provenance |  |
 | tst2.js:89:12:89:16 | other [p] | tst2.js:89:12:89:18 | other.p | provenance |  |
-| tst2.js:93:7:93:24 | p | tst2.js:99:51:99:51 | p | provenance |  |
-| tst2.js:93:9:93:9 | p | tst2.js:93:7:93:24 | p | provenance |  |
-| tst2.js:99:7:99:69 | unsafe | tst2.js:101:12:101:17 | unsafe | provenance |  |
-| tst2.js:99:16:99:69 | seriali ...  true}) | tst2.js:99:7:99:69 | unsafe | provenance |  |
+| tst2.js:93:9:93:9 | p | tst2.js:93:9:93:9 | p | provenance |  |
+| tst2.js:93:9:93:9 | p | tst2.js:99:51:99:51 | p | provenance |  |
+| tst2.js:99:7:99:12 | unsafe | tst2.js:101:12:101:17 | unsafe | provenance |  |
+| tst2.js:99:16:99:69 | seriali ...  true}) | tst2.js:99:7:99:12 | unsafe | provenance |  |
 | tst2.js:99:36:99:52 | {someProperty: p} [someProperty] | tst2.js:99:16:99:69 | seriali ...  true}) | provenance |  |
 | tst2.js:99:51:99:51 | p | tst2.js:99:16:99:69 | seriali ...  true}) | provenance |  |
 | tst2.js:99:51:99:51 | p | tst2.js:99:36:99:52 | {someProperty: p} [someProperty] | provenance |  |
-| tst2.js:105:7:105:24 | p | tst2.js:110:28:110:28 | p | provenance |  |
-| tst2.js:105:9:105:9 | p | tst2.js:105:7:105:24 | p | provenance |  |
-| tst2.js:110:7:110:29 | obj [someProperty] | tst2.js:111:36:111:38 | obj [someProperty] | provenance |  |
-| tst2.js:110:13:110:29 | {someProperty: p} [someProperty] | tst2.js:110:7:110:29 | obj [someProperty] | provenance |  |
+| tst2.js:105:9:105:9 | p | tst2.js:105:9:105:9 | p | provenance |  |
+| tst2.js:105:9:105:9 | p | tst2.js:110:28:110:28 | p | provenance |  |
+| tst2.js:110:7:110:9 | obj [someProperty] | tst2.js:111:36:111:38 | obj [someProperty] | provenance |  |
+| tst2.js:110:13:110:29 | {someProperty: p} [someProperty] | tst2.js:110:7:110:9 | obj [someProperty] | provenance |  |
 | tst2.js:110:28:110:28 | p | tst2.js:110:13:110:29 | {someProperty: p} [someProperty] | provenance |  |
 | tst2.js:110:28:110:28 | p | tst2.js:111:16:111:55 | seriali ...  true}) | provenance |  |
-| tst2.js:111:7:111:55 | unsafe | tst2.js:113:12:113:17 | unsafe | provenance |  |
-| tst2.js:111:16:111:55 | seriali ...  true}) | tst2.js:111:7:111:55 | unsafe | provenance |  |
+| tst2.js:111:7:111:12 | unsafe | tst2.js:113:12:113:17 | unsafe | provenance |  |
+| tst2.js:111:16:111:55 | seriali ...  true}) | tst2.js:111:7:111:12 | unsafe | provenance |  |
 | tst2.js:111:36:111:38 | obj [someProperty] | tst2.js:111:16:111:55 | seriali ...  true}) | provenance |  |
-| tst3.js:5:7:5:24 | p | tst3.js:6:12:6:12 | p | provenance |  |
-| tst3.js:5:9:5:9 | p | tst3.js:5:7:5:24 | p | provenance |  |
-| tst3.js:11:9:11:74 | code | tst3.js:12:12:12:15 | code | provenance |  |
-| tst3.js:11:16:11:74 | prettie ... bel" }) | tst3.js:11:9:11:74 | code | provenance |  |
+| tst3.js:5:9:5:9 | p | tst3.js:5:9:5:9 | p | provenance |  |
+| tst3.js:5:9:5:9 | p | tst3.js:6:12:6:12 | p | provenance |  |
+| tst3.js:11:9:11:12 | code | tst3.js:12:12:12:15 | code | provenance |  |
+| tst3.js:11:16:11:74 | prettie ... bel" }) | tst3.js:11:9:11:12 | code | provenance |  |
 | tst3.js:11:32:11:39 | reg.body | tst3.js:11:16:11:74 | prettie ... bel" }) | provenance |  |
 nodes
 | ReflectedXss.js:7:14:7:45 | "Unknow ... rams.id | semmle.label | "Unknow ... rams.id |
@@ -271,7 +271,7 @@ nodes
 | ReflectedXss.js:22:12:22:27 | marked(req.body) | semmle.label | marked(req.body) |
 | ReflectedXss.js:22:19:22:26 | req.body | semmle.label | req.body |
 | ReflectedXss.js:28:12:28:19 | req.body | semmle.label | req.body |
-| ReflectedXss.js:29:7:32:4 | mytable | semmle.label | mytable |
+| ReflectedXss.js:29:7:29:13 | mytable | semmle.label | mytable |
 | ReflectedXss.js:29:17:32:4 | table([ ... ce\\n  ]) | semmle.label | table([ ... ce\\n  ]) |
 | ReflectedXss.js:29:23:32:3 | [\\n    [ ... rce\\n  ] [1, 1] | semmle.label | [\\n    [ ... rce\\n  ] [1, 1] |
 | ReflectedXss.js:31:5:31:22 | ['body', req.body] [1] | semmle.label | ['body', req.body] [1] |
@@ -306,18 +306,18 @@ nodes
 | ReflectedXss.js:102:12:102:84 | markdow ... q.body) | semmle.label | markdow ... q.body) |
 | ReflectedXss.js:102:76:102:83 | req.body | semmle.label | req.body |
 | ReflectedXss.js:109:16:109:30 | request.query.p | semmle.label | request.query.p |
-| ReflectedXss.js:113:11:113:41 | queryKeys | semmle.label | queryKeys |
 | ReflectedXss.js:113:13:113:27 | keys: queryKeys | semmle.label | keys: queryKeys |
-| ReflectedXss.js:115:11:115:45 | keys | semmle.label | keys |
+| ReflectedXss.js:113:19:113:27 | queryKeys | semmle.label | queryKeys |
+| ReflectedXss.js:115:11:115:14 | keys | semmle.label | keys |
 | ReflectedXss.js:115:18:115:26 | queryKeys | semmle.label | queryKeys |
 | ReflectedXss.js:115:31:115:45 | paramKeys?.keys | semmle.label | paramKeys?.keys |
-| ReflectedXss.js:117:11:117:61 | keyArray | semmle.label | keyArray |
-| ReflectedXss.js:117:11:117:61 | keyArray [0] | semmle.label | keyArray [0] |
+| ReflectedXss.js:117:11:117:18 | keyArray | semmle.label | keyArray |
+| ReflectedXss.js:117:11:117:18 | keyArray [0] | semmle.label | keyArray [0] |
 | ReflectedXss.js:117:49:117:54 | [keys] [0] | semmle.label | [keys] [0] |
 | ReflectedXss.js:117:50:117:53 | keys | semmle.label | keys |
 | ReflectedXss.js:117:58:117:61 | keys | semmle.label | keys |
-| ReflectedXss.js:118:11:118:72 | invalidKeys | semmle.label | invalidKeys |
-| ReflectedXss.js:118:11:118:72 | invalidKeys [0] | semmle.label | invalidKeys [0] |
+| ReflectedXss.js:118:11:118:21 | invalidKeys | semmle.label | invalidKeys |
+| ReflectedXss.js:118:11:118:21 | invalidKeys [0] | semmle.label | invalidKeys [0] |
 | ReflectedXss.js:118:25:118:32 | keyArray | semmle.label | keyArray |
 | ReflectedXss.js:118:25:118:32 | keyArray [0] | semmle.label | keyArray [0] |
 | ReflectedXss.js:118:25:118:72 | keyArra ... s(key)) | semmle.label | keyArra ... s(key)) |
@@ -335,8 +335,8 @@ nodes
 | ReflectedXssContentTypes.js:70:12:70:34 | "FOO: " ... rams.id | semmle.label | "FOO: " ... rams.id |
 | ReflectedXssContentTypes.js:70:22:70:34 | req.params.id | semmle.label | req.params.id |
 | ReflectedXssGood3.js:68:22:68:26 | value | semmle.label | value |
-| ReflectedXssGood3.js:77:7:77:37 | parts | semmle.label | parts |
-| ReflectedXssGood3.js:77:7:77:37 | parts [0] | semmle.label | parts [0] |
+| ReflectedXssGood3.js:77:7:77:11 | parts | semmle.label | parts |
+| ReflectedXssGood3.js:77:7:77:11 | parts [0] | semmle.label | parts [0] |
 | ReflectedXssGood3.js:77:15:77:37 | [value. ... (0, i)] [0] | semmle.label | [value. ... (0, i)] [0] |
 | ReflectedXssGood3.js:77:16:77:20 | value | semmle.label | value |
 | ReflectedXssGood3.js:77:16:77:36 | value.s ... g(0, i) | semmle.label | value.s ... g(0, i) |
@@ -347,38 +347,38 @@ nodes
 | ReflectedXssGood3.js:108:10:108:14 | parts [0] | semmle.label | parts [0] |
 | ReflectedXssGood3.js:108:10:108:14 | parts [ArrayElement] | semmle.label | parts [ArrayElement] |
 | ReflectedXssGood3.js:108:10:108:23 | parts.join('') | semmle.label | parts.join('') |
-| ReflectedXssGood3.js:135:9:135:27 | url | semmle.label | url |
+| ReflectedXssGood3.js:135:9:135:11 | url | semmle.label | url |
 | ReflectedXssGood3.js:135:15:135:27 | req.params.id | semmle.label | req.params.id |
 | ReflectedXssGood3.js:139:12:139:27 | escapeHtml3(url) | semmle.label | escapeHtml3(url) |
 | ReflectedXssGood3.js:139:24:139:26 | url | semmle.label | url |
-| app/api/route.ts:2:11:2:33 | body | semmle.label | body |
+| app/api/route.ts:2:11:2:14 | body | semmle.label | body |
 | app/api/route.ts:2:18:2:33 | await req.json() | semmle.label | await req.json() |
 | app/api/route.ts:2:24:2:33 | req.json() | semmle.label | req.json() |
 | app/api/route.ts:5:18:5:21 | body | semmle.label | body |
 | app/api/route.ts:13:18:13:21 | body | semmle.label | body |
 | app/api/route.ts:25:18:25:21 | body | semmle.label | body |
 | app/api/route.ts:29:25:29:28 | body | semmle.label | body |
-| app/api/routeNextRequest.ts:4:9:4:31 | body | semmle.label | body |
+| app/api/routeNextRequest.ts:4:9:4:12 | body | semmle.label | body |
 | app/api/routeNextRequest.ts:4:16:4:31 | await req.json() | semmle.label | await req.json() |
 | app/api/routeNextRequest.ts:4:22:4:31 | req.json() | semmle.label | req.json() |
 | app/api/routeNextRequest.ts:7:20:7:23 | body | semmle.label | body |
 | app/api/routeNextRequest.ts:15:20:15:23 | body | semmle.label | body |
 | app/api/routeNextRequest.ts:27:20:27:23 | body | semmle.label | body |
 | app/api/routeNextRequest.ts:31:27:31:30 | body | semmle.label | body |
-| etherpad.js:9:5:9:53 | response | semmle.label | response |
+| etherpad.js:9:5:9:12 | response | semmle.label | response |
 | etherpad.js:9:16:9:30 | req.query.jsonp | semmle.label | req.query.jsonp |
 | etherpad.js:11:12:11:19 | response | semmle.label | response |
-| formatting.js:4:9:4:29 | evil | semmle.label | evil |
+| formatting.js:4:9:4:12 | evil | semmle.label | evil |
 | formatting.js:4:16:4:29 | req.query.evil | semmle.label | req.query.evil |
 | formatting.js:6:14:6:47 | util.fo ... , evil) | semmle.label | util.fo ... , evil) |
 | formatting.js:6:43:6:46 | evil | semmle.label | evil |
 | formatting.js:7:14:7:53 | require ... , evil) | semmle.label | require ... , evil) |
 | formatting.js:7:49:7:52 | evil | semmle.label | evil |
-| live-server.js:4:11:4:27 | tainted | semmle.label | tainted |
+| live-server.js:4:11:4:17 | tainted | semmle.label | tainted |
 | live-server.js:4:21:4:27 | req.url | semmle.label | req.url |
 | live-server.js:6:13:6:50 | `<html> ... /html>` | semmle.label | `<html> ... /html>` |
 | live-server.js:6:28:6:34 | tainted | semmle.label | tainted |
-| live-server.js:10:11:10:27 | tainted | semmle.label | tainted |
+| live-server.js:10:11:10:17 | tainted | semmle.label | tainted |
 | live-server.js:10:21:10:27 | req.url | semmle.label | req.url |
 | live-server.js:12:13:12:50 | `<html> ... /html>` | semmle.label | `<html> ... /html>` |
 | live-server.js:12:28:12:34 | tainted | semmle.label | tainted |
@@ -407,7 +407,7 @@ nodes
 | promises.js:5:44:5:57 | req.query.data | semmle.label | req.query.data |
 | promises.js:6:11:6:11 | x | semmle.label | x |
 | promises.js:6:25:6:25 | x | semmle.label | x |
-| response-object.js:7:11:7:25 | data | semmle.label | data |
+| response-object.js:7:11:7:14 | data | semmle.label | data |
 | response-object.js:7:18:7:25 | req.body | semmle.label | req.body |
 | response-object.js:9:18:9:21 | data | semmle.label | data |
 | response-object.js:10:18:10:21 | data | semmle.label | data |
@@ -418,83 +418,83 @@ nodes
 | response-object.js:26:18:26:21 | data | semmle.label | data |
 | response-object.js:34:18:34:21 | data | semmle.label | data |
 | response-object.js:38:18:38:21 | data | semmle.label | data |
-| tst2.js:6:7:6:30 | p | semmle.label | p |
-| tst2.js:6:7:6:30 | r | semmle.label | r |
+| tst2.js:6:9:6:9 | p | semmle.label | p |
 | tst2.js:6:9:6:9 | p | semmle.label | p |
 | tst2.js:6:12:6:15 | q: r | semmle.label | q: r |
+| tst2.js:6:15:6:15 | r | semmle.label | r |
 | tst2.js:7:12:7:12 | p | semmle.label | p |
 | tst2.js:8:12:8:12 | r | semmle.label | r |
-| tst2.js:14:7:14:24 | p | semmle.label | p |
+| tst2.js:14:9:14:9 | p | semmle.label | p |
 | tst2.js:14:9:14:9 | p | semmle.label | p |
 | tst2.js:18:12:18:12 | p | semmle.label | p |
 | tst2.js:21:14:21:14 | p | semmle.label | p |
-| tst2.js:30:7:30:24 | p | semmle.label | p |
+| tst2.js:30:9:30:9 | p | semmle.label | p |
 | tst2.js:30:9:30:9 | p | semmle.label | p |
 | tst2.js:33:3:33:5 | [post update] obj [p] | semmle.label | [post update] obj [p] |
 | tst2.js:33:11:33:11 | p | semmle.label | p |
-| tst2.js:34:7:34:24 | other [p] | semmle.label | other [p] |
+| tst2.js:34:7:34:11 | other [p] | semmle.label | other [p] |
 | tst2.js:34:15:34:24 | clone(obj) [p] | semmle.label | clone(obj) [p] |
 | tst2.js:34:21:34:23 | obj [p] | semmle.label | obj [p] |
 | tst2.js:36:12:36:12 | p | semmle.label | p |
 | tst2.js:37:12:37:16 | other [p] | semmle.label | other [p] |
 | tst2.js:37:12:37:18 | other.p | semmle.label | other.p |
-| tst2.js:43:7:43:24 | p | semmle.label | p |
 | tst2.js:43:9:43:9 | p | semmle.label | p |
-| tst2.js:49:7:49:53 | unsafe | semmle.label | unsafe |
+| tst2.js:43:9:43:9 | p | semmle.label | p |
+| tst2.js:49:7:49:12 | unsafe | semmle.label | unsafe |
 | tst2.js:49:16:49:53 | seriali ...  true}) | semmle.label | seriali ...  true}) |
 | tst2.js:49:36:49:36 | p | semmle.label | p |
 | tst2.js:51:12:51:17 | unsafe | semmle.label | unsafe |
-| tst2.js:57:7:57:24 | p | semmle.label | p |
+| tst2.js:57:9:57:9 | p | semmle.label | p |
 | tst2.js:57:9:57:9 | p | semmle.label | p |
 | tst2.js:60:3:60:5 | [post update] obj [p] | semmle.label | [post update] obj [p] |
 | tst2.js:60:11:60:11 | p | semmle.label | p |
-| tst2.js:61:7:61:25 | other [p] | semmle.label | other [p] |
+| tst2.js:61:7:61:11 | other [p] | semmle.label | other [p] |
 | tst2.js:61:15:61:25 | fclone(obj) [p] | semmle.label | fclone(obj) [p] |
 | tst2.js:61:22:61:24 | obj [p] | semmle.label | obj [p] |
 | tst2.js:63:12:63:12 | p | semmle.label | p |
 | tst2.js:64:12:64:16 | other [p] | semmle.label | other [p] |
 | tst2.js:64:12:64:18 | other.p | semmle.label | other.p |
-| tst2.js:69:7:69:24 | p | semmle.label | p |
+| tst2.js:69:9:69:9 | p | semmle.label | p |
 | tst2.js:69:9:69:9 | p | semmle.label | p |
 | tst2.js:72:3:72:5 | [post update] obj [p] | semmle.label | [post update] obj [p] |
 | tst2.js:72:11:72:11 | p | semmle.label | p |
-| tst2.js:73:7:73:44 | other [p] | semmle.label | other [p] |
+| tst2.js:73:7:73:11 | other [p] | semmle.label | other [p] |
 | tst2.js:73:15:73:44 | jc.retr ... e(obj)) [p] | semmle.label | jc.retr ... e(obj)) [p] |
 | tst2.js:73:29:73:43 | jc.decycle(obj) [p] | semmle.label | jc.decycle(obj) [p] |
 | tst2.js:73:40:73:42 | obj [p] | semmle.label | obj [p] |
 | tst2.js:75:12:75:12 | p | semmle.label | p |
 | tst2.js:76:12:76:16 | other [p] | semmle.label | other [p] |
 | tst2.js:76:12:76:18 | other.p | semmle.label | other.p |
-| tst2.js:82:7:82:24 | p | semmle.label | p |
+| tst2.js:82:9:82:9 | p | semmle.label | p |
 | tst2.js:82:9:82:9 | p | semmle.label | p |
 | tst2.js:85:3:85:5 | [post update] obj [p] | semmle.label | [post update] obj [p] |
 | tst2.js:85:11:85:11 | p | semmle.label | p |
-| tst2.js:86:7:86:27 | other [p] | semmle.label | other [p] |
+| tst2.js:86:7:86:11 | other [p] | semmle.label | other [p] |
 | tst2.js:86:15:86:27 | sortKeys(obj) [p] | semmle.label | sortKeys(obj) [p] |
 | tst2.js:86:24:86:26 | obj [p] | semmle.label | obj [p] |
 | tst2.js:88:12:88:12 | p | semmle.label | p |
 | tst2.js:89:12:89:16 | other [p] | semmle.label | other [p] |
 | tst2.js:89:12:89:18 | other.p | semmle.label | other.p |
-| tst2.js:93:7:93:24 | p | semmle.label | p |
 | tst2.js:93:9:93:9 | p | semmle.label | p |
-| tst2.js:99:7:99:69 | unsafe | semmle.label | unsafe |
+| tst2.js:93:9:93:9 | p | semmle.label | p |
+| tst2.js:99:7:99:12 | unsafe | semmle.label | unsafe |
 | tst2.js:99:16:99:69 | seriali ...  true}) | semmle.label | seriali ...  true}) |
 | tst2.js:99:36:99:52 | {someProperty: p} [someProperty] | semmle.label | {someProperty: p} [someProperty] |
 | tst2.js:99:51:99:51 | p | semmle.label | p |
 | tst2.js:101:12:101:17 | unsafe | semmle.label | unsafe |
-| tst2.js:105:7:105:24 | p | semmle.label | p |
 | tst2.js:105:9:105:9 | p | semmle.label | p |
-| tst2.js:110:7:110:29 | obj [someProperty] | semmle.label | obj [someProperty] |
+| tst2.js:105:9:105:9 | p | semmle.label | p |
+| tst2.js:110:7:110:9 | obj [someProperty] | semmle.label | obj [someProperty] |
 | tst2.js:110:13:110:29 | {someProperty: p} [someProperty] | semmle.label | {someProperty: p} [someProperty] |
 | tst2.js:110:28:110:28 | p | semmle.label | p |
-| tst2.js:111:7:111:55 | unsafe | semmle.label | unsafe |
+| tst2.js:111:7:111:12 | unsafe | semmle.label | unsafe |
 | tst2.js:111:16:111:55 | seriali ...  true}) | semmle.label | seriali ...  true}) |
 | tst2.js:111:36:111:38 | obj [someProperty] | semmle.label | obj [someProperty] |
 | tst2.js:113:12:113:17 | unsafe | semmle.label | unsafe |
-| tst3.js:5:7:5:24 | p | semmle.label | p |
+| tst3.js:5:9:5:9 | p | semmle.label | p |
 | tst3.js:5:9:5:9 | p | semmle.label | p |
 | tst3.js:6:12:6:12 | p | semmle.label | p |
-| tst3.js:11:9:11:74 | code | semmle.label | code |
+| tst3.js:11:9:11:12 | code | semmle.label | code |
 | tst3.js:11:16:11:74 | prettie ... bel" }) | semmle.label | prettie ... bel" }) |
 | tst3.js:11:32:11:39 | reg.body | semmle.label | reg.body |
 | tst3.js:12:12:12:15 | code | semmle.label | code |
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/StoredXss/StoredXss.expected b/javascript/ql/test/query-tests/Security/CWE-079/StoredXss/StoredXss.expected
index a2bcd0163fd..26f888fa0ba 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/StoredXss/StoredXss.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-079/StoredXss/StoredXss.expected
@@ -22,12 +22,12 @@ edges
 | xss-through-filenames.js:30:34:30:37 | file | xss-through-filenames.js:31:25:31:28 | file | provenance |  |
 | xss-through-filenames.js:31:25:31:28 | file | xss-through-filenames.js:31:13:31:18 | [post update] files2 [ArrayElement] | provenance |  |
 | xss-through-filenames.js:33:19:33:24 | files2 [ArrayElement] | xss-through-filenames.js:35:29:35:34 | files2 [ArrayElement] | provenance |  |
-| xss-through-filenames.js:35:13:35:35 | files3 | xss-through-filenames.js:37:19:37:24 | files3 | provenance |  |
-| xss-through-filenames.js:35:22:35:35 | format(files2) | xss-through-filenames.js:35:13:35:35 | files3 | provenance |  |
+| xss-through-filenames.js:35:13:35:18 | files3 | xss-through-filenames.js:37:19:37:24 | files3 | provenance |  |
+| xss-through-filenames.js:35:22:35:35 | format(files2) | xss-through-filenames.js:35:13:35:18 | files3 | provenance |  |
 | xss-through-filenames.js:35:29:35:34 | files2 [ArrayElement] | xss-through-filenames.js:17:21:17:26 | files2 [ArrayElement] | provenance |  |
 | xss-through-filenames.js:35:29:35:34 | files2 [ArrayElement] | xss-through-filenames.js:35:22:35:35 | format(files2) | provenance |  |
-| xss-through-torrent.js:6:6:6:24 | name | xss-through-torrent.js:7:11:7:14 | name | provenance |  |
-| xss-through-torrent.js:6:13:6:24 | torrent.name | xss-through-torrent.js:6:6:6:24 | name | provenance |  |
+| xss-through-torrent.js:6:6:6:9 | name | xss-through-torrent.js:7:11:7:14 | name | provenance |  |
+| xss-through-torrent.js:6:13:6:24 | torrent.name | xss-through-torrent.js:6:6:6:9 | name | provenance |  |
 nodes
 | xss-through-filenames.js:7:43:7:48 | files1 | semmle.label | files1 |
 | xss-through-filenames.js:8:18:8:23 | files1 | semmle.label | files1 |
@@ -48,11 +48,11 @@ nodes
 | xss-through-filenames.js:31:25:31:28 | file | semmle.label | file |
 | xss-through-filenames.js:33:19:33:24 | files2 | semmle.label | files2 |
 | xss-through-filenames.js:33:19:33:24 | files2 [ArrayElement] | semmle.label | files2 [ArrayElement] |
-| xss-through-filenames.js:35:13:35:35 | files3 | semmle.label | files3 |
+| xss-through-filenames.js:35:13:35:18 | files3 | semmle.label | files3 |
 | xss-through-filenames.js:35:22:35:35 | format(files2) | semmle.label | format(files2) |
 | xss-through-filenames.js:35:29:35:34 | files2 [ArrayElement] | semmle.label | files2 [ArrayElement] |
 | xss-through-filenames.js:37:19:37:24 | files3 | semmle.label | files3 |
-| xss-through-torrent.js:6:6:6:24 | name | semmle.label | name |
+| xss-through-torrent.js:6:6:6:9 | name | semmle.label | name |
 | xss-through-torrent.js:6:13:6:24 | torrent.name | semmle.label | torrent.name |
 | xss-through-torrent.js:7:11:7:14 | name | semmle.label | name |
 subpaths
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/UnsafeHtmlConstruction/UnsafeHtmlConstruction.expected b/javascript/ql/test/query-tests/Security/CWE-079/UnsafeHtmlConstruction/UnsafeHtmlConstruction.expected
index 4f757d1a931..63bdfa1bcf2 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/UnsafeHtmlConstruction/UnsafeHtmlConstruction.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-079/UnsafeHtmlConstruction/UnsafeHtmlConstruction.expected
@@ -29,11 +29,11 @@ edges
 | lib2/index.ts:1:28:1:28 | s | lib2/index.ts:2:27:2:27 | s | provenance |  |
 | lib2/index.ts:6:29:6:36 | settings | lib2/index.ts:7:58:7:65 | settings | provenance |  |
 | lib2/index.ts:6:29:6:36 | settings | lib2/index.ts:13:16:13:23 | settings | provenance |  |
-| lib2/index.ts:13:9:13:41 | name | lib2/index.ts:18:62:18:65 | name | provenance |  |
+| lib2/index.ts:13:9:13:12 | name | lib2/index.ts:18:62:18:65 | name | provenance |  |
 | lib2/index.ts:13:16:13:23 | settings | lib2/index.ts:13:16:13:33 | settings.mySetting | provenance | Config |
 | lib2/index.ts:13:16:13:33 | settings.mySetting | lib2/index.ts:13:16:13:36 | setting ... ting[i] | provenance | Config |
 | lib2/index.ts:13:16:13:36 | setting ... ting[i] | lib2/index.ts:13:16:13:41 | setting ... i].name | provenance | Config |
-| lib2/index.ts:13:16:13:41 | setting ... i].name | lib2/index.ts:13:9:13:41 | name | provenance |  |
+| lib2/index.ts:13:16:13:41 | setting ... i].name | lib2/index.ts:13:9:13:12 | name | provenance |  |
 | lib2/src/MyNode.ts:1:28:1:28 | s | lib2/src/MyNode.ts:2:29:2:29 | s | provenance |  |
 | lib/src/MyNode.ts:1:28:1:28 | s | lib/src/MyNode.ts:2:29:2:29 | s | provenance |  |
 | main.js:1:55:1:55 | s | main.js:2:29:2:29 | s | provenance |  |
@@ -41,12 +41,12 @@ edges
 | main.js:11:60:11:60 | s | main.js:12:49:12:49 | s | provenance |  |
 | main.js:21:47:21:47 | s | main.js:22:34:22:34 | s | provenance |  |
 | main.js:56:28:56:34 | options | main.js:60:41:60:47 | options | provenance |  |
-| main.js:57:11:59:5 | defaults | main.js:60:31:60:38 | defaults | provenance |  |
-| main.js:57:11:59:5 | defaults | main.js:60:31:60:38 | defaults | provenance |  |
-| main.js:57:22:59:5 | {\\n      ... "\\n    } | main.js:57:11:59:5 | defaults | provenance |  |
-| main.js:57:22:59:5 | {\\n      ... "\\n    } | main.js:57:11:59:5 | defaults | provenance |  |
-| main.js:60:11:60:48 | settings | main.js:62:19:62:26 | settings | provenance |  |
-| main.js:60:22:60:48 | $.exten ... ptions) | main.js:60:11:60:48 | settings | provenance |  |
+| main.js:57:11:57:18 | defaults | main.js:60:31:60:38 | defaults | provenance |  |
+| main.js:57:11:57:18 | defaults | main.js:60:31:60:38 | defaults | provenance |  |
+| main.js:57:22:59:5 | {\\n      ... "\\n    } | main.js:57:11:57:18 | defaults | provenance |  |
+| main.js:57:22:59:5 | {\\n      ... "\\n    } | main.js:57:11:57:18 | defaults | provenance |  |
+| main.js:60:11:60:18 | settings | main.js:62:19:62:26 | settings | provenance |  |
+| main.js:60:22:60:48 | $.exten ... ptions) | main.js:60:11:60:18 | settings | provenance |  |
 | main.js:60:31:60:38 | defaults | main.js:60:22:60:48 | $.exten ... ptions) | provenance |  |
 | main.js:60:31:60:38 | defaults | main.js:60:22:60:48 | $.exten ... ptions) | provenance |  |
 | main.js:60:31:60:38 | defaults | main.js:60:22:60:48 | $.exten ... ptions) | provenance | Config |
@@ -78,7 +78,7 @@ nodes
 | lib2/index.ts:2:27:2:27 | s | semmle.label | s |
 | lib2/index.ts:6:29:6:36 | settings | semmle.label | settings |
 | lib2/index.ts:7:58:7:65 | settings | semmle.label | settings |
-| lib2/index.ts:13:9:13:41 | name | semmle.label | name |
+| lib2/index.ts:13:9:13:12 | name | semmle.label | name |
 | lib2/index.ts:13:16:13:23 | settings | semmle.label | settings |
 | lib2/index.ts:13:16:13:33 | settings.mySetting | semmle.label | settings.mySetting |
 | lib2/index.ts:13:16:13:36 | setting ... ting[i] | semmle.label | setting ... ting[i] |
@@ -97,11 +97,11 @@ nodes
 | main.js:21:47:21:47 | s | semmle.label | s |
 | main.js:22:34:22:34 | s | semmle.label | s |
 | main.js:56:28:56:34 | options | semmle.label | options |
-| main.js:57:11:59:5 | defaults | semmle.label | defaults |
-| main.js:57:11:59:5 | defaults | semmle.label | defaults |
+| main.js:57:11:57:18 | defaults | semmle.label | defaults |
+| main.js:57:11:57:18 | defaults | semmle.label | defaults |
 | main.js:57:22:59:5 | {\\n      ... "\\n    } | semmle.label | {\\n      ... "\\n    } |
 | main.js:57:22:59:5 | {\\n      ... "\\n    } | semmle.label | {\\n      ... "\\n    } |
-| main.js:60:11:60:48 | settings | semmle.label | settings |
+| main.js:60:11:60:18 | settings | semmle.label | settings |
 | main.js:60:22:60:48 | $.exten ... ptions) | semmle.label | $.exten ... ptions) |
 | main.js:60:31:60:38 | defaults | semmle.label | defaults |
 | main.js:60:31:60:38 | defaults | semmle.label | defaults |
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/UnsafeJQueryPlugin/UnsafeJQueryPlugin.expected b/javascript/ql/test/query-tests/Security/CWE-079/UnsafeJQueryPlugin/UnsafeJQueryPlugin.expected
index 236f3b387fa..563f8b52d9c 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/UnsafeJQueryPlugin/UnsafeJQueryPlugin.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-079/UnsafeJQueryPlugin/UnsafeJQueryPlugin.expected
@@ -32,15 +32,15 @@ edges
 | unsafe-jquery-plugin.js:5:5:5:18 | options.target | unsafe-jquery-plugin.js:11:16:11:29 | options.target | provenance | Config |
 | unsafe-jquery-plugin.js:7:17:7:23 | options | unsafe-jquery-plugin.js:7:17:7:30 | options.target | provenance |  |
 | unsafe-jquery-plugin.js:7:17:7:30 | options.target | unsafe-jquery-plugin.js:11:16:11:29 | options.target | provenance | Config |
-| unsafe-jquery-plugin.js:11:7:11:29 | target | unsafe-jquery-plugin.js:22:6:22:11 | target | provenance |  |
-| unsafe-jquery-plugin.js:11:7:11:29 | target | unsafe-jquery-plugin.js:30:6:30:11 | target | provenance |  |
-| unsafe-jquery-plugin.js:11:7:11:29 | target | unsafe-jquery-plugin.js:36:6:36:11 | target | provenance |  |
-| unsafe-jquery-plugin.js:11:7:11:29 | target | unsafe-jquery-plugin.js:40:6:40:11 | target | provenance |  |
-| unsafe-jquery-plugin.js:11:7:11:29 | target | unsafe-jquery-plugin.js:48:6:48:11 | target | provenance |  |
-| unsafe-jquery-plugin.js:11:7:11:29 | target | unsafe-jquery-plugin.js:52:6:52:11 | target | provenance |  |
-| unsafe-jquery-plugin.js:11:7:11:29 | target | unsafe-jquery-plugin.js:60:6:60:11 | target | provenance |  |
+| unsafe-jquery-plugin.js:11:7:11:12 | target | unsafe-jquery-plugin.js:22:6:22:11 | target | provenance |  |
+| unsafe-jquery-plugin.js:11:7:11:12 | target | unsafe-jquery-plugin.js:30:6:30:11 | target | provenance |  |
+| unsafe-jquery-plugin.js:11:7:11:12 | target | unsafe-jquery-plugin.js:36:6:36:11 | target | provenance |  |
+| unsafe-jquery-plugin.js:11:7:11:12 | target | unsafe-jquery-plugin.js:40:6:40:11 | target | provenance |  |
+| unsafe-jquery-plugin.js:11:7:11:12 | target | unsafe-jquery-plugin.js:48:6:48:11 | target | provenance |  |
+| unsafe-jquery-plugin.js:11:7:11:12 | target | unsafe-jquery-plugin.js:52:6:52:11 | target | provenance |  |
+| unsafe-jquery-plugin.js:11:7:11:12 | target | unsafe-jquery-plugin.js:60:6:60:11 | target | provenance |  |
 | unsafe-jquery-plugin.js:11:16:11:22 | options | unsafe-jquery-plugin.js:11:16:11:29 | options.target | provenance |  |
-| unsafe-jquery-plugin.js:11:16:11:29 | options.target | unsafe-jquery-plugin.js:11:7:11:29 | target | provenance |  |
+| unsafe-jquery-plugin.js:11:16:11:29 | options.target | unsafe-jquery-plugin.js:11:7:11:12 | target | provenance |  |
 | unsafe-jquery-plugin.js:65:47:65:53 | options | unsafe-jquery-plugin.js:67:37:67:43 | options | provenance |  |
 | unsafe-jquery-plugin.js:67:3:67:6 | [post update] this [options] | unsafe-jquery-plugin.js:68:7:68:10 | this [options] | provenance |  |
 | unsafe-jquery-plugin.js:67:24:67:44 | $.exten ... ptions) | unsafe-jquery-plugin.js:67:3:67:6 | [post update] this [options] | provenance |  |
@@ -57,18 +57,18 @@ edges
 | unsafe-jquery-plugin.js:86:4:86:7 | [post update] this [o] | unsafe-jquery-plugin.js:87:12:87:15 | this [o] | provenance |  |
 | unsafe-jquery-plugin.js:86:13:86:27 | $.extend({}, o) | unsafe-jquery-plugin.js:86:4:86:7 | [post update] this [o] | provenance |  |
 | unsafe-jquery-plugin.js:86:26:86:26 | o | unsafe-jquery-plugin.js:86:13:86:27 | $.extend({}, o) | provenance |  |
-| unsafe-jquery-plugin.js:87:8:87:24 | t | unsafe-jquery-plugin.js:90:6:90:6 | t | provenance |  |
+| unsafe-jquery-plugin.js:87:8:87:8 | t | unsafe-jquery-plugin.js:90:6:90:6 | t | provenance |  |
 | unsafe-jquery-plugin.js:87:12:87:15 | this [o] | unsafe-jquery-plugin.js:87:12:87:17 | this.o | provenance |  |
-| unsafe-jquery-plugin.js:87:12:87:17 | this.o | unsafe-jquery-plugin.js:87:8:87:24 | t | provenance |  |
+| unsafe-jquery-plugin.js:87:12:87:17 | this.o | unsafe-jquery-plugin.js:87:8:87:8 | t | provenance |  |
 | unsafe-jquery-plugin.js:92:5:92:11 | options | unsafe-jquery-plugin.js:85:14:85:14 | o | provenance |  |
 | unsafe-jquery-plugin.js:101:38:101:44 | options | unsafe-jquery-plugin.js:105:6:105:12 | options | provenance |  |
-| unsafe-jquery-plugin.js:102:3:105:13 | options | unsafe-jquery-plugin.js:107:5:107:11 | options | provenance |  |
-| unsafe-jquery-plugin.js:102:13:105:13 | $.exten ... ptions) | unsafe-jquery-plugin.js:102:3:105:13 | options | provenance |  |
+| unsafe-jquery-plugin.js:102:3:102:9 | options | unsafe-jquery-plugin.js:107:5:107:11 | options | provenance |  |
+| unsafe-jquery-plugin.js:102:13:105:13 | $.exten ... ptions) | unsafe-jquery-plugin.js:102:3:102:9 | options | provenance |  |
 | unsafe-jquery-plugin.js:105:6:105:12 | options | unsafe-jquery-plugin.js:102:13:105:13 | $.exten ... ptions) | provenance |  |
 | unsafe-jquery-plugin.js:107:5:107:11 | options | unsafe-jquery-plugin.js:107:5:107:18 | options.target | provenance |  |
 | unsafe-jquery-plugin.js:114:38:114:44 | options | unsafe-jquery-plugin.js:115:51:115:57 | options | provenance |  |
-| unsafe-jquery-plugin.js:115:3:115:58 | options | unsafe-jquery-plugin.js:117:5:117:11 | options | provenance |  |
-| unsafe-jquery-plugin.js:115:13:115:58 | $.exten ... ptions) | unsafe-jquery-plugin.js:115:3:115:58 | options | provenance |  |
+| unsafe-jquery-plugin.js:115:3:115:9 | options | unsafe-jquery-plugin.js:117:5:117:11 | options | provenance |  |
+| unsafe-jquery-plugin.js:115:13:115:58 | $.exten ... ptions) | unsafe-jquery-plugin.js:115:3:115:9 | options | provenance |  |
 | unsafe-jquery-plugin.js:115:51:115:57 | options | unsafe-jquery-plugin.js:115:13:115:58 | $.exten ... ptions) | provenance |  |
 | unsafe-jquery-plugin.js:117:5:117:11 | options | unsafe-jquery-plugin.js:117:5:117:18 | options.target | provenance |  |
 | unsafe-jquery-plugin.js:121:40:121:46 | options | unsafe-jquery-plugin.js:122:5:122:11 | options | provenance |  |
@@ -90,8 +90,8 @@ edges
 | unsafe-jquery-plugin.js:157:44:157:50 | options | unsafe-jquery-plugin.js:157:44:157:57 | options.target | provenance |  |
 | unsafe-jquery-plugin.js:157:44:157:57 | options.target | unsafe-jquery-plugin.js:157:44:157:59 | options.target.a | provenance |  |
 | unsafe-jquery-plugin.js:160:38:160:44 | options | unsafe-jquery-plugin.js:165:16:165:22 | options | provenance |  |
-| unsafe-jquery-plugin.js:165:7:165:29 | target | unsafe-jquery-plugin.js:170:6:170:11 | target | provenance |  |
-| unsafe-jquery-plugin.js:165:16:165:22 | options | unsafe-jquery-plugin.js:165:7:165:29 | target | provenance |  |
+| unsafe-jquery-plugin.js:165:7:165:12 | target | unsafe-jquery-plugin.js:170:6:170:11 | target | provenance |  |
+| unsafe-jquery-plugin.js:165:16:165:22 | options | unsafe-jquery-plugin.js:165:7:165:12 | target | provenance |  |
 | unsafe-jquery-plugin.js:178:27:178:33 | options | unsafe-jquery-plugin.js:179:5:179:11 | options | provenance |  |
 | unsafe-jquery-plugin.js:179:5:179:11 | options | unsafe-jquery-plugin.js:179:5:179:18 | options.target | provenance |  |
 | unsafe-jquery-plugin.js:185:28:185:34 | options | unsafe-jquery-plugin.js:186:21:186:27 | options | provenance |  |
@@ -105,7 +105,7 @@ nodes
 | unsafe-jquery-plugin.js:5:5:5:18 | options.target | semmle.label | options.target |
 | unsafe-jquery-plugin.js:7:17:7:23 | options | semmle.label | options |
 | unsafe-jquery-plugin.js:7:17:7:30 | options.target | semmle.label | options.target |
-| unsafe-jquery-plugin.js:11:7:11:29 | target | semmle.label | target |
+| unsafe-jquery-plugin.js:11:7:11:12 | target | semmle.label | target |
 | unsafe-jquery-plugin.js:11:16:11:22 | options | semmle.label | options |
 | unsafe-jquery-plugin.js:11:16:11:29 | options.target | semmle.label | options.target |
 | unsafe-jquery-plugin.js:22:6:22:11 | target | semmle.label | target |
@@ -134,19 +134,19 @@ nodes
 | unsafe-jquery-plugin.js:86:4:86:7 | [post update] this [o] | semmle.label | [post update] this [o] |
 | unsafe-jquery-plugin.js:86:13:86:27 | $.extend({}, o) | semmle.label | $.extend({}, o) |
 | unsafe-jquery-plugin.js:86:26:86:26 | o | semmle.label | o |
-| unsafe-jquery-plugin.js:87:8:87:24 | t | semmle.label | t |
+| unsafe-jquery-plugin.js:87:8:87:8 | t | semmle.label | t |
 | unsafe-jquery-plugin.js:87:12:87:15 | this [o] | semmle.label | this [o] |
 | unsafe-jquery-plugin.js:87:12:87:17 | this.o | semmle.label | this.o |
 | unsafe-jquery-plugin.js:90:6:90:6 | t | semmle.label | t |
 | unsafe-jquery-plugin.js:92:5:92:11 | options | semmle.label | options |
 | unsafe-jquery-plugin.js:101:38:101:44 | options | semmle.label | options |
-| unsafe-jquery-plugin.js:102:3:105:13 | options | semmle.label | options |
+| unsafe-jquery-plugin.js:102:3:102:9 | options | semmle.label | options |
 | unsafe-jquery-plugin.js:102:13:105:13 | $.exten ... ptions) | semmle.label | $.exten ... ptions) |
 | unsafe-jquery-plugin.js:105:6:105:12 | options | semmle.label | options |
 | unsafe-jquery-plugin.js:107:5:107:11 | options | semmle.label | options |
 | unsafe-jquery-plugin.js:107:5:107:18 | options.target | semmle.label | options.target |
 | unsafe-jquery-plugin.js:114:38:114:44 | options | semmle.label | options |
-| unsafe-jquery-plugin.js:115:3:115:58 | options | semmle.label | options |
+| unsafe-jquery-plugin.js:115:3:115:9 | options | semmle.label | options |
 | unsafe-jquery-plugin.js:115:13:115:58 | $.exten ... ptions) | semmle.label | $.exten ... ptions) |
 | unsafe-jquery-plugin.js:115:51:115:57 | options | semmle.label | options |
 | unsafe-jquery-plugin.js:117:5:117:11 | options | semmle.label | options |
@@ -172,7 +172,7 @@ nodes
 | unsafe-jquery-plugin.js:157:44:157:57 | options.target | semmle.label | options.target |
 | unsafe-jquery-plugin.js:157:44:157:59 | options.target.a | semmle.label | options.target.a |
 | unsafe-jquery-plugin.js:160:38:160:44 | options | semmle.label | options |
-| unsafe-jquery-plugin.js:165:7:165:29 | target | semmle.label | target |
+| unsafe-jquery-plugin.js:165:7:165:12 | target | semmle.label | target |
 | unsafe-jquery-plugin.js:165:16:165:22 | options | semmle.label | options |
 | unsafe-jquery-plugin.js:170:6:170:11 | target | semmle.label | target |
 | unsafe-jquery-plugin.js:178:27:178:33 | options | semmle.label | options |
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/XssThroughDom/XssThroughDom.expected b/javascript/ql/test/query-tests/Security/CWE-079/XssThroughDom/XssThroughDom.expected
index 6f2eed5b139..fe0ee6ea788 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/XssThroughDom/XssThroughDom.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-079/XssThroughDom/XssThroughDom.expected
@@ -58,38 +58,38 @@ edges
 | forms.js:25:23:25:28 | values | forms.js:25:23:25:34 | values.email | provenance |  |
 | forms.js:28:20:28:25 | values | forms.js:29:23:29:28 | values | provenance |  |
 | forms.js:29:23:29:28 | values | forms.js:29:23:29:34 | values.email | provenance |  |
-| forms.js:34:11:34:53 | values | forms.js:35:19:35:24 | values | provenance |  |
-| forms.js:34:13:34:18 | values | forms.js:34:11:34:53 | values | provenance |  |
+| forms.js:34:13:34:18 | values | forms.js:34:13:34:18 | values | provenance |  |
+| forms.js:34:13:34:18 | values | forms.js:35:19:35:24 | values | provenance |  |
 | forms.js:35:19:35:24 | values | forms.js:35:19:35:30 | values.email | provenance |  |
 | forms.js:44:21:44:26 | values | forms.js:45:21:45:26 | values | provenance |  |
 | forms.js:45:21:45:26 | values | forms.js:45:21:45:33 | values.stooge | provenance |  |
 | forms.js:71:21:71:24 | data | forms.js:72:19:72:22 | data | provenance |  |
 | forms.js:72:19:72:22 | data | forms.js:72:19:72:27 | data.name | provenance |  |
-| forms.js:92:17:92:36 | values | forms.js:93:25:93:30 | values | provenance |  |
-| forms.js:92:26:92:36 | getValues() | forms.js:92:17:92:36 | values | provenance |  |
+| forms.js:92:17:92:22 | values | forms.js:93:25:93:30 | values | provenance |  |
+| forms.js:92:26:92:36 | getValues() | forms.js:92:17:92:22 | values | provenance |  |
 | forms.js:93:25:93:30 | values | forms.js:93:25:93:35 | values.name | provenance |  |
-| xss-through-dom.js:73:9:73:41 | selector | xss-through-dom.js:77:4:77:11 | selector | provenance |  |
-| xss-through-dom.js:73:20:73:41 | $("inpu ... 0).name | xss-through-dom.js:73:9:73:41 | selector | provenance |  |
-| xss-through-dom.js:84:8:84:30 | text | xss-through-dom.js:86:33:86:36 | text | provenance |  |
-| xss-through-dom.js:84:8:84:30 | text | xss-through-dom.js:87:36:87:39 | text | provenance |  |
-| xss-through-dom.js:84:15:84:30 | $("text").text() | xss-through-dom.js:84:8:84:30 | text | provenance |  |
+| xss-through-dom.js:73:9:73:16 | selector | xss-through-dom.js:77:4:77:11 | selector | provenance |  |
+| xss-through-dom.js:73:20:73:41 | $("inpu ... 0).name | xss-through-dom.js:73:9:73:16 | selector | provenance |  |
+| xss-through-dom.js:84:8:84:11 | text | xss-through-dom.js:86:33:86:36 | text | provenance |  |
+| xss-through-dom.js:84:8:84:11 | text | xss-through-dom.js:87:36:87:39 | text | provenance |  |
+| xss-through-dom.js:84:15:84:30 | $("text").text() | xss-through-dom.js:84:8:84:11 | text | provenance |  |
 | xss-through-dom.js:86:33:86:36 | text | xss-through-dom.js:86:16:86:37 | anser.a ... l(text) | provenance |  |
 | xss-through-dom.js:87:36:87:39 | text | xss-through-dom.js:87:16:87:40 | new ans ... s(text) | provenance |  |
 | xss-through-dom.js:109:45:109:55 | this.el.src | xss-through-dom.js:109:31:109:70 | "<a src ... oo</a>" | provenance |  |
-| xss-through-dom.js:114:11:114:52 | src | xss-through-dom.js:115:16:115:18 | src | provenance |  |
-| xss-through-dom.js:114:11:114:52 | src | xss-through-dom.js:117:26:117:28 | src | provenance |  |
-| xss-through-dom.js:114:17:114:52 | documen ... k").src | xss-through-dom.js:114:11:114:52 | src | provenance |  |
+| xss-through-dom.js:114:11:114:13 | src | xss-through-dom.js:115:16:115:18 | src | provenance |  |
+| xss-through-dom.js:114:11:114:13 | src | xss-through-dom.js:117:26:117:28 | src | provenance |  |
+| xss-through-dom.js:114:17:114:52 | documen ... k").src | xss-through-dom.js:114:11:114:13 | src | provenance |  |
 | xss-through-dom.js:120:23:120:37 | ev.target.files | xss-through-dom.js:120:23:120:45 | ev.targ ... 0].name | provenance |  |
 | xss-through-dom.js:122:53:122:67 | ev.target.files | xss-through-dom.js:122:53:122:70 | ev.target.files[0] | provenance |  |
 | xss-through-dom.js:122:53:122:70 | ev.target.files[0] | xss-through-dom.js:122:33:122:71 | URL.cre ... les[0]) | provenance | Config |
-| xss-through-dom.js:130:6:130:68 | linkText | xss-through-dom.js:131:19:131:26 | linkText | provenance |  |
-| xss-through-dom.js:130:6:130:68 | linkText | xss-through-dom.js:132:16:132:23 | linkText | provenance |  |
-| xss-through-dom.js:130:17:130:37 | wSelect ... tring() | xss-through-dom.js:130:6:130:68 | linkText | provenance |  |
-| xss-through-dom.js:130:42:130:62 | dSelect ... tring() | xss-through-dom.js:130:6:130:68 | linkText | provenance |  |
-| xss-through-dom.js:139:11:139:52 | src | xss-through-dom.js:140:19:140:21 | src | provenance |  |
-| xss-through-dom.js:139:11:139:52 | src | xss-through-dom.js:141:25:141:27 | src | provenance |  |
-| xss-through-dom.js:139:11:139:52 | src | xss-through-dom.js:150:24:150:26 | src | provenance |  |
-| xss-through-dom.js:139:17:139:52 | documen ... k").src | xss-through-dom.js:139:11:139:52 | src | provenance |  |
+| xss-through-dom.js:130:6:130:13 | linkText | xss-through-dom.js:131:19:131:26 | linkText | provenance |  |
+| xss-through-dom.js:130:6:130:13 | linkText | xss-through-dom.js:132:16:132:23 | linkText | provenance |  |
+| xss-through-dom.js:130:17:130:37 | wSelect ... tring() | xss-through-dom.js:130:6:130:13 | linkText | provenance |  |
+| xss-through-dom.js:130:42:130:62 | dSelect ... tring() | xss-through-dom.js:130:6:130:13 | linkText | provenance |  |
+| xss-through-dom.js:139:11:139:13 | src | xss-through-dom.js:140:19:140:21 | src | provenance |  |
+| xss-through-dom.js:139:11:139:13 | src | xss-through-dom.js:141:25:141:27 | src | provenance |  |
+| xss-through-dom.js:139:11:139:13 | src | xss-through-dom.js:150:24:150:26 | src | provenance |  |
+| xss-through-dom.js:139:17:139:52 | documen ... k").src | xss-through-dom.js:139:11:139:13 | src | provenance |  |
 | xss-through-dom.js:154:25:154:27 | msg | xss-through-dom.js:155:27:155:29 | msg | provenance |  |
 | xss-through-dom.js:159:34:159:52 | $("textarea").val() | xss-through-dom.js:154:25:154:27 | msg | provenance |  |
 nodes
@@ -111,7 +111,7 @@ nodes
 | forms.js:28:20:28:25 | values | semmle.label | values |
 | forms.js:29:23:29:28 | values | semmle.label | values |
 | forms.js:29:23:29:34 | values.email | semmle.label | values.email |
-| forms.js:34:11:34:53 | values | semmle.label | values |
+| forms.js:34:13:34:18 | values | semmle.label | values |
 | forms.js:34:13:34:18 | values | semmle.label | values |
 | forms.js:35:19:35:24 | values | semmle.label | values |
 | forms.js:35:19:35:30 | values.email | semmle.label | values.email |
@@ -122,7 +122,7 @@ nodes
 | forms.js:71:21:71:24 | data | semmle.label | data |
 | forms.js:72:19:72:22 | data | semmle.label | data |
 | forms.js:72:19:72:27 | data.name | semmle.label | data.name |
-| forms.js:92:17:92:36 | values | semmle.label | values |
+| forms.js:92:17:92:22 | values | semmle.label | values |
 | forms.js:92:26:92:36 | getValues() | semmle.label | getValues() |
 | forms.js:93:25:93:30 | values | semmle.label | values |
 | forms.js:93:25:93:35 | values.name | semmle.label | values.name |
@@ -142,12 +142,12 @@ nodes
 | xss-through-dom.js:61:30:61:69 | $(docum ... value") | semmle.label | $(docum ... value") |
 | xss-through-dom.js:64:30:64:40 | valMethod() | semmle.label | valMethod() |
 | xss-through-dom.js:71:11:71:32 | $("inpu ... 0).name | semmle.label | $("inpu ... 0).name |
-| xss-through-dom.js:73:9:73:41 | selector | semmle.label | selector |
+| xss-through-dom.js:73:9:73:16 | selector | semmle.label | selector |
 | xss-through-dom.js:73:20:73:41 | $("inpu ... 0).name | semmle.label | $("inpu ... 0).name |
 | xss-through-dom.js:77:4:77:11 | selector | semmle.label | selector |
 | xss-through-dom.js:79:4:79:34 | documen ... t.value | semmle.label | documen ... t.value |
 | xss-through-dom.js:81:17:81:43 | $('#foo ... rText') | semmle.label | $('#foo ... rText') |
-| xss-through-dom.js:84:8:84:30 | text | semmle.label | text |
+| xss-through-dom.js:84:8:84:11 | text | semmle.label | text |
 | xss-through-dom.js:84:15:84:30 | $("text").text() | semmle.label | $("text").text() |
 | xss-through-dom.js:86:16:86:37 | anser.a ... l(text) | semmle.label | anser.a ... l(text) |
 | xss-through-dom.js:86:33:86:36 | text | semmle.label | text |
@@ -157,7 +157,7 @@ nodes
 | xss-through-dom.js:96:17:96:47 | $("#foo ... ].value | semmle.label | $("#foo ... ].value |
 | xss-through-dom.js:109:31:109:70 | "<a src ... oo</a>" | semmle.label | "<a src ... oo</a>" |
 | xss-through-dom.js:109:45:109:55 | this.el.src | semmle.label | this.el.src |
-| xss-through-dom.js:114:11:114:52 | src | semmle.label | src |
+| xss-through-dom.js:114:11:114:13 | src | semmle.label | src |
 | xss-through-dom.js:114:17:114:52 | documen ... k").src | semmle.label | documen ... k").src |
 | xss-through-dom.js:115:16:115:18 | src | semmle.label | src |
 | xss-through-dom.js:117:26:117:28 | src | semmle.label | src |
@@ -166,12 +166,12 @@ nodes
 | xss-through-dom.js:122:33:122:71 | URL.cre ... les[0]) | semmle.label | URL.cre ... les[0]) |
 | xss-through-dom.js:122:53:122:67 | ev.target.files | semmle.label | ev.target.files |
 | xss-through-dom.js:122:53:122:70 | ev.target.files[0] | semmle.label | ev.target.files[0] |
-| xss-through-dom.js:130:6:130:68 | linkText | semmle.label | linkText |
+| xss-through-dom.js:130:6:130:13 | linkText | semmle.label | linkText |
 | xss-through-dom.js:130:17:130:37 | wSelect ... tring() | semmle.label | wSelect ... tring() |
 | xss-through-dom.js:130:42:130:62 | dSelect ... tring() | semmle.label | dSelect ... tring() |
 | xss-through-dom.js:131:19:131:26 | linkText | semmle.label | linkText |
 | xss-through-dom.js:132:16:132:23 | linkText | semmle.label | linkText |
-| xss-through-dom.js:139:11:139:52 | src | semmle.label | src |
+| xss-through-dom.js:139:11:139:13 | src | semmle.label | src |
 | xss-through-dom.js:139:17:139:52 | documen ... k").src | semmle.label | documen ... k").src |
 | xss-through-dom.js:140:19:140:21 | src | semmle.label | src |
 | xss-through-dom.js:141:25:141:27 | src | semmle.label | src |
diff --git a/javascript/ql/test/query-tests/Security/CWE-089/local-threat-source/SqlInjection.expected b/javascript/ql/test/query-tests/Security/CWE-089/local-threat-source/SqlInjection.expected
index b6710ee92f5..48d4262921d 100644
--- a/javascript/ql/test/query-tests/Security/CWE-089/local-threat-source/SqlInjection.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-089/local-threat-source/SqlInjection.expected
@@ -1,11 +1,11 @@
 #select
 | test.js:7:14:7:61 | 'SELECT ...  + temp | test.js:4:12:4:22 | process.env | test.js:7:14:7:61 | 'SELECT ...  + temp | This query string depends on a $@. | test.js:4:12:4:22 | process.env | user-provided value |
 edges
-| test.js:4:5:4:29 | temp | test.js:7:58:7:61 | temp | provenance |  |
-| test.js:4:12:4:22 | process.env | test.js:4:5:4:29 | temp | provenance |  |
+| test.js:4:5:4:8 | temp | test.js:7:58:7:61 | temp | provenance |  |
+| test.js:4:12:4:22 | process.env | test.js:4:5:4:8 | temp | provenance |  |
 | test.js:7:58:7:61 | temp | test.js:7:14:7:61 | 'SELECT ...  + temp | provenance |  |
 nodes
-| test.js:4:5:4:29 | temp | semmle.label | temp |
+| test.js:4:5:4:8 | temp | semmle.label | temp |
 | test.js:4:12:4:22 | process.env | semmle.label | process.env |
 | test.js:7:14:7:61 | 'SELECT ...  + temp | semmle.label | 'SELECT ...  + temp |
 | test.js:7:58:7:61 | temp | semmle.label | temp |
diff --git a/javascript/ql/test/query-tests/Security/CWE-089/typed/SqlInjection.expected b/javascript/ql/test/query-tests/Security/CWE-089/typed/SqlInjection.expected
index b0ae2737b00..e4e45ed74d5 100644
--- a/javascript/ql/test/query-tests/Security/CWE-089/typed/SqlInjection.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-089/typed/SqlInjection.expected
@@ -3,26 +3,26 @@
 | typedClient.ts:22:27:22:35 | { id: v } | typedClient.ts:21:22:21:29 | req.body | typedClient.ts:22:27:22:35 | { id: v } | This query object depends on a $@. | typedClient.ts:21:22:21:29 | req.body | user-provided value |
 | typedClient.ts:23:27:23:35 | { id: v } | typedClient.ts:21:22:21:29 | req.body | typedClient.ts:23:27:23:35 | { id: v } | This query object depends on a $@. | typedClient.ts:21:22:21:29 | req.body | user-provided value |
 edges
-| typedClient.ts:13:7:13:32 | v | typedClient.ts:14:30:14:30 | v | provenance |  |
-| typedClient.ts:13:11:13:32 | JSON.pa ... body.x) | typedClient.ts:13:7:13:32 | v | provenance |  |
+| typedClient.ts:13:7:13:7 | v | typedClient.ts:14:30:14:30 | v | provenance |  |
+| typedClient.ts:13:11:13:32 | JSON.pa ... body.x) | typedClient.ts:13:7:13:7 | v | provenance |  |
 | typedClient.ts:13:22:13:29 | req.body | typedClient.ts:13:22:13:31 | req.body.x | provenance | Config |
 | typedClient.ts:13:22:13:31 | req.body.x | typedClient.ts:13:11:13:32 | JSON.pa ... body.x) | provenance | Config |
 | typedClient.ts:14:30:14:30 | v | typedClient.ts:14:24:14:32 | { id: v } | provenance | Config |
-| typedClient.ts:21:7:21:32 | v | typedClient.ts:22:33:22:33 | v | provenance |  |
-| typedClient.ts:21:7:21:32 | v | typedClient.ts:23:33:23:33 | v | provenance |  |
-| typedClient.ts:21:11:21:32 | JSON.pa ... body.x) | typedClient.ts:21:7:21:32 | v | provenance |  |
+| typedClient.ts:21:7:21:7 | v | typedClient.ts:22:33:22:33 | v | provenance |  |
+| typedClient.ts:21:7:21:7 | v | typedClient.ts:23:33:23:33 | v | provenance |  |
+| typedClient.ts:21:11:21:32 | JSON.pa ... body.x) | typedClient.ts:21:7:21:7 | v | provenance |  |
 | typedClient.ts:21:22:21:29 | req.body | typedClient.ts:21:22:21:31 | req.body.x | provenance | Config |
 | typedClient.ts:21:22:21:31 | req.body.x | typedClient.ts:21:11:21:32 | JSON.pa ... body.x) | provenance | Config |
 | typedClient.ts:22:33:22:33 | v | typedClient.ts:22:27:22:35 | { id: v } | provenance | Config |
 | typedClient.ts:23:33:23:33 | v | typedClient.ts:23:27:23:35 | { id: v } | provenance | Config |
 nodes
-| typedClient.ts:13:7:13:32 | v | semmle.label | v |
+| typedClient.ts:13:7:13:7 | v | semmle.label | v |
 | typedClient.ts:13:11:13:32 | JSON.pa ... body.x) | semmle.label | JSON.pa ... body.x) |
 | typedClient.ts:13:22:13:29 | req.body | semmle.label | req.body |
 | typedClient.ts:13:22:13:31 | req.body.x | semmle.label | req.body.x |
 | typedClient.ts:14:24:14:32 | { id: v } | semmle.label | { id: v } |
 | typedClient.ts:14:30:14:30 | v | semmle.label | v |
-| typedClient.ts:21:7:21:32 | v | semmle.label | v |
+| typedClient.ts:21:7:21:7 | v | semmle.label | v |
 | typedClient.ts:21:11:21:32 | JSON.pa ... body.x) | semmle.label | JSON.pa ... body.x) |
 | typedClient.ts:21:22:21:29 | req.body | semmle.label | req.body |
 | typedClient.ts:21:22:21:31 | req.body.x | semmle.label | req.body.x |
diff --git a/javascript/ql/test/query-tests/Security/CWE-089/untyped/SqlInjection.expected b/javascript/ql/test/query-tests/Security/CWE-089/untyped/SqlInjection.expected
index 843d41eb922..f28fb93238d 100644
--- a/javascript/ql/test/query-tests/Security/CWE-089/untyped/SqlInjection.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-089/untyped/SqlInjection.expected
@@ -1,4 +1,20 @@
 #select
+| athena.js:19:23:19:23 | p | athena.js:9:23:9:30 | req.body | athena.js:19:23:19:23 | p | This query string depends on a $@. | athena.js:9:23:9:30 | req.body | user-provided value |
+| athena.js:27:23:27:58 | new Cre ... arams2) | athena.js:9:23:9:30 | req.body | athena.js:27:23:27:58 | new Cre ... arams2) | This query string depends on a $@. | athena.js:9:23:9:30 | req.body | user-provided value |
+| athena.js:36:23:36:58 | new Upd ... arams3) | athena.js:9:23:9:30 | req.body | athena.js:36:23:36:58 | new Upd ... arams3) | This query string depends on a $@. | athena.js:9:23:9:30 | req.body | user-provided value |
+| athena.js:48:22:48:30 | userQuery | athena.js:43:23:43:30 | req.body | athena.js:48:22:48:30 | userQuery | This query string depends on a $@. | athena.js:43:23:43:30 | req.body | user-provided value |
+| athena.js:57:22:57:30 | userQuery | athena.js:43:23:43:30 | req.body | athena.js:57:22:57:30 | userQuery | This query string depends on a $@. | athena.js:43:23:43:30 | req.body | user-provided value |
+| athena.js:66:22:66:30 | userQuery | athena.js:43:23:43:30 | req.body | athena.js:66:22:66:30 | userQuery | This query string depends on a $@. | athena.js:43:23:43:30 | req.body | user-provided value |
+| athena.js:84:23:84:29 | command | athena.js:75:32:75:39 | req.body | athena.js:84:23:84:29 | command | This query string depends on a $@. | athena.js:75:32:75:39 | req.body | user-provided value |
+| clients3.js:18:23:18:60 | new Sel ... params) | clients3.js:10:26:10:33 | req.body | clients3.js:18:23:18:60 | new Sel ... params) | This query string depends on a $@. | clients3.js:10:26:10:33 | req.body | user-provided value |
+| clients3.js:29:21:29:68 | "SELECT ... usInput | clients3.js:23:26:23:33 | req.body | clients3.js:29:21:29:68 | "SELECT ... usInput | This query string depends on a $@. | clients3.js:23:26:23:33 | req.body | user-provided value |
+| clients3.js:38:21:38:68 | "SELECT ... usInput | clients3.js:23:26:23:33 | req.body | clients3.js:38:21:38:68 | "SELECT ... usInput | This query string depends on a $@. | clients3.js:23:26:23:33 | req.body | user-provided value |
+| dynamodb.js:15:23:15:29 | command | dynamodb.js:9:26:9:33 | req.body | dynamodb.js:15:23:15:29 | command | This query string depends on a $@. | dynamodb.js:9:26:9:33 | req.body | user-provided value |
+| dynamodb.js:21:23:21:35 | updateCommand | dynamodb.js:9:26:9:33 | req.body | dynamodb.js:21:23:21:35 | updateCommand | This query string depends on a $@. | dynamodb.js:9:26:9:33 | req.body | user-provided value |
+| dynamodb.js:47:24:47:30 | command | dynamodb.js:9:26:9:33 | req.body | dynamodb.js:47:24:47:30 | command | This query string depends on a $@. | dynamodb.js:9:26:9:33 | req.body | user-provided value |
+| dynamodb.js:58:20:58:77 | `SELECT ... nput}'` | dynamodb.js:56:26:56:33 | req.body | dynamodb.js:58:20:58:77 | `SELECT ... nput}'` | This query string depends on a $@. | dynamodb.js:56:26:56:33 | req.body | user-provided value |
+| dynamodb.js:64:28:64:85 | `SELECT ... nput}'` | dynamodb.js:56:26:56:33 | req.body | dynamodb.js:64:28:64:85 | `SELECT ... nput}'` | This query string depends on a $@. | dynamodb.js:56:26:56:33 | req.body | user-provided value |
+| dynamodb.js:67:28:67:85 | `SELECT ... nput}'` | dynamodb.js:56:26:56:33 | req.body | dynamodb.js:67:28:67:85 | `SELECT ... nput}'` | This query string depends on a $@. | dynamodb.js:56:26:56:33 | req.body | user-provided value |
 | graphql.js:9:34:19:5 | `\\n      ... }\\n    ` | graphql.js:8:16:8:28 | req.params.id | graphql.js:9:34:19:5 | `\\n      ... }\\n    ` | This query string depends on a $@. | graphql.js:8:16:8:28 | req.params.id | user-provided value |
 | graphql.js:26:30:26:40 | `foo ${id}` | graphql.js:25:16:25:28 | req.params.id | graphql.js:26:30:26:40 | `foo ${id}` | This query string depends on a $@. | graphql.js:25:16:25:28 | req.params.id | user-provided value |
 | graphql.js:29:32:29:42 | `foo ${id}` | graphql.js:25:16:25:28 | req.params.id | graphql.js:29:32:29:42 | `foo ${id}` | This query string depends on a $@. | graphql.js:25:16:25:28 | req.params.id | user-provided value |
@@ -122,6 +138,10 @@
 | pg-promise.js:60:20:60:24 | query | pg-promise.js:7:16:7:34 | req.params.category | pg-promise.js:60:20:60:24 | query | This query string depends on a $@. | pg-promise.js:7:16:7:34 | req.params.category | user-provided value |
 | pg-promise.js:63:23:63:27 | query | pg-promise.js:7:16:7:34 | req.params.category | pg-promise.js:63:23:63:27 | query | This query string depends on a $@. | pg-promise.js:7:16:7:34 | req.params.category | user-provided value |
 | pg-promise.js:64:16:64:20 | query | pg-promise.js:7:16:7:34 | req.params.category | pg-promise.js:64:16:64:20 | query | This query string depends on a $@. | pg-promise.js:7:16:7:34 | req.params.category | user-provided value |
+| rds-client.js:19:23:19:58 | new Exe ... arams1) | rds-client.js:8:23:8:30 | req.body | rds-client.js:19:23:19:58 | new Exe ... arams1) | This query string depends on a $@. | rds-client.js:8:23:8:30 | req.body | user-provided value |
+| rds-client.js:36:23:36:51 | new Exe ... params) | rds-client.js:8:23:8:30 | req.body | rds-client.js:36:23:36:51 | new Exe ... params) | This query string depends on a $@. | rds-client.js:8:23:8:30 | req.body | user-provided value |
+| rds-client.js:53:14:53:22 | userQuery | rds-client.js:44:23:44:30 | req.body | rds-client.js:53:14:53:22 | userQuery | This query string depends on a $@. | rds-client.js:44:23:44:30 | req.body | user-provided value |
+| rds-client.js:61:50:61:52 | sql | rds-client.js:45:25:45:32 | req.body | rds-client.js:61:50:61:52 | sql | This query string depends on a $@. | rds-client.js:45:25:45:32 | req.body | user-provided value |
 | redis.js:10:16:10:27 | req.body.key | redis.js:10:16:10:23 | req.body | redis.js:10:16:10:27 | req.body.key | This query object depends on a $@. | redis.js:10:16:10:23 | req.body | user-provided value |
 | redis.js:18:16:18:18 | key | redis.js:12:15:12:22 | req.body | redis.js:18:16:18:18 | key | This query object depends on a $@. | redis.js:12:15:12:22 | req.body | user-provided value |
 | redis.js:19:43:19:45 | key | redis.js:12:15:12:22 | req.body | redis.js:19:43:19:45 | key | This query object depends on a $@. | redis.js:12:15:12:22 | req.body | user-provided value |
@@ -137,63 +157,129 @@
 | tst4.js:8:10:8:66 | 'SELECT ... d + '"' | tst4.js:8:46:8:60 | $routeParams.id | tst4.js:8:10:8:66 | 'SELECT ... d + '"' | This query string depends on a $@. | tst4.js:8:46:8:60 | $routeParams.id | user-provided value |
 | tst.js:10:10:10:64 | 'SELECT ... d + '"' | tst.js:10:46:10:58 | req.params.id | tst.js:10:10:10:64 | 'SELECT ... d + '"' | This query string depends on a $@. | tst.js:10:46:10:58 | req.params.id | user-provided value |
 edges
-| graphql.js:8:11:8:28 | id | graphql.js:11:46:11:47 | id | provenance |  |
-| graphql.js:8:16:8:28 | req.params.id | graphql.js:8:11:8:28 | id | provenance |  |
+| athena.js:9:11:9:19 | userQuery | athena.js:14:30:14:38 | userQuery | provenance |  |
+| athena.js:9:11:9:19 | userQuery | athena.js:24:22:24:30 | userQuery | provenance |  |
+| athena.js:9:11:9:19 | userQuery | athena.js:33:22:33:30 | userQuery | provenance |  |
+| athena.js:9:23:9:30 | req.body | athena.js:9:11:9:19 | userQuery | provenance |  |
+| athena.js:13:11:13:17 | params1 [QueryString] | athena.js:18:46:18:52 | params1 [QueryString] | provenance |  |
+| athena.js:13:21:17:5 | {   \\n   ... }\\n    } [QueryString] | athena.js:13:11:13:17 | params1 [QueryString] | provenance |  |
+| athena.js:14:22:14:38 | "SQL" + userQuery | athena.js:13:21:17:5 | {   \\n   ... }\\n    } [QueryString] | provenance |  |
+| athena.js:14:30:14:38 | userQuery | athena.js:14:22:14:38 | "SQL" + userQuery | provenance |  |
+| athena.js:18:11:18:11 | p | athena.js:19:23:19:23 | p | provenance |  |
+| athena.js:18:15:18:53 | new Sta ... arams1) | athena.js:18:11:18:11 | p | provenance |  |
+| athena.js:18:46:18:52 | params1 [QueryString] | athena.js:18:15:18:53 | new Sta ... arams1) | provenance |  |
+| athena.js:21:11:21:17 | params2 [QueryString] | athena.js:27:51:27:57 | params2 [QueryString] | provenance |  |
+| athena.js:21:21:26:5 | {\\n      ... "\\n    } [QueryString] | athena.js:21:11:21:17 | params2 [QueryString] | provenance |  |
+| athena.js:24:22:24:30 | userQuery | athena.js:21:21:26:5 | {\\n      ... "\\n    } [QueryString] | provenance |  |
+| athena.js:27:51:27:57 | params2 [QueryString] | athena.js:27:23:27:58 | new Cre ... arams2) | provenance |  |
+| athena.js:29:11:29:17 | params3 [QueryString] | athena.js:36:51:36:57 | params3 [QueryString] | provenance |  |
+| athena.js:29:21:35:5 | {\\n      ... "\\n    } [QueryString] | athena.js:29:11:29:17 | params3 [QueryString] | provenance |  |
+| athena.js:33:22:33:30 | userQuery | athena.js:29:21:35:5 | {\\n      ... "\\n    } [QueryString] | provenance |  |
+| athena.js:36:51:36:57 | params3 [QueryString] | athena.js:36:23:36:58 | new Upd ... arams3) | provenance |  |
+| athena.js:43:11:43:19 | userQuery | athena.js:48:22:48:30 | userQuery | provenance |  |
+| athena.js:43:11:43:19 | userQuery | athena.js:57:22:57:30 | userQuery | provenance |  |
+| athena.js:43:11:43:19 | userQuery | athena.js:66:22:66:30 | userQuery | provenance |  |
+| athena.js:43:23:43:30 | req.body | athena.js:43:11:43:19 | userQuery | provenance |  |
+| athena.js:75:11:75:28 | userQueryStatement | athena.js:80:25:80:42 | userQueryStatement | provenance |  |
+| athena.js:75:32:75:39 | req.body | athena.js:75:11:75:28 | userQueryStatement | provenance |  |
+| athena.js:77:11:77:15 | input [QueryStatement] | athena.js:83:56:83:60 | input [QueryStatement] | provenance |  |
+| athena.js:77:19:82:5 | {\\n      ... ,\\n    } [QueryStatement] | athena.js:77:11:77:15 | input [QueryStatement] | provenance |  |
+| athena.js:80:25:80:42 | userQueryStatement | athena.js:77:19:82:5 | {\\n      ... ,\\n    } [QueryStatement] | provenance |  |
+| athena.js:83:11:83:17 | command | athena.js:84:23:84:29 | command | provenance |  |
+| athena.js:83:21:83:61 | new Cre ... (input) | athena.js:83:11:83:17 | command | provenance |  |
+| athena.js:83:56:83:60 | input [QueryStatement] | athena.js:83:21:83:61 | new Cre ... (input) | provenance |  |
+| clients3.js:10:9:10:22 | maliciousInput | clients3.js:16:55:16:68 | maliciousInput | provenance |  |
+| clients3.js:10:26:10:33 | req.body | clients3.js:10:9:10:22 | maliciousInput | provenance |  |
+| clients3.js:12:11:12:16 | params [Expression] | clients3.js:18:54:18:59 | params [Expression] | provenance |  |
+| clients3.js:12:20:17:5 | {\\n      ... ,\\n    } [Expression] | clients3.js:12:11:12:16 | params [Expression] | provenance |  |
+| clients3.js:16:21:16:68 | "SELECT ... usInput | clients3.js:12:20:17:5 | {\\n      ... ,\\n    } [Expression] | provenance |  |
+| clients3.js:16:55:16:68 | maliciousInput | clients3.js:16:21:16:68 | "SELECT ... usInput | provenance |  |
+| clients3.js:18:54:18:59 | params [Expression] | clients3.js:18:23:18:60 | new Sel ... params) | provenance |  |
+| clients3.js:23:9:23:22 | maliciousInput | clients3.js:29:55:29:68 | maliciousInput | provenance |  |
+| clients3.js:23:9:23:22 | maliciousInput | clients3.js:38:55:38:68 | maliciousInput | provenance |  |
+| clients3.js:23:26:23:33 | req.body | clients3.js:23:9:23:22 | maliciousInput | provenance |  |
+| clients3.js:29:55:29:68 | maliciousInput | clients3.js:29:21:29:68 | "SELECT ... usInput | provenance |  |
+| clients3.js:38:55:38:68 | maliciousInput | clients3.js:38:21:38:68 | "SELECT ... usInput | provenance |  |
+| dynamodb.js:9:9:9:22 | maliciousInput | dynamodb.js:11:64:11:77 | maliciousInput | provenance |  |
+| dynamodb.js:9:9:9:22 | maliciousInput | dynamodb.js:17:80:17:93 | maliciousInput | provenance |  |
+| dynamodb.js:9:26:9:33 | req.body | dynamodb.js:9:9:9:22 | maliciousInput | provenance |  |
+| dynamodb.js:11:11:11:19 | statement | dynamodb.js:13:20:13:28 | statement | provenance |  |
+| dynamodb.js:11:64:11:77 | maliciousInput | dynamodb.js:11:11:11:19 | statement | provenance |  |
+| dynamodb.js:12:11:12:17 | command | dynamodb.js:15:23:15:29 | command | provenance |  |
+| dynamodb.js:12:11:12:17 | command | dynamodb.js:47:24:47:30 | command | provenance |  |
+| dynamodb.js:12:21:14:6 | new Exe ... \\n    }) | dynamodb.js:12:11:12:17 | command | provenance |  |
+| dynamodb.js:12:49:14:5 | {\\n      ... t\\n    } [Statement] | dynamodb.js:12:21:14:6 | new Exe ... \\n    }) | provenance |  |
+| dynamodb.js:13:20:13:28 | statement | dynamodb.js:12:49:14:5 | {\\n      ... t\\n    } [Statement] | provenance |  |
+| dynamodb.js:17:11:17:25 | updateStatement | dynamodb.js:19:20:19:34 | updateStatement | provenance |  |
+| dynamodb.js:17:80:17:93 | maliciousInput | dynamodb.js:17:11:17:25 | updateStatement | provenance |  |
+| dynamodb.js:18:11:18:23 | updateCommand | dynamodb.js:21:23:21:35 | updateCommand | provenance |  |
+| dynamodb.js:18:27:20:6 | new Exe ... \\n    }) | dynamodb.js:18:11:18:23 | updateCommand | provenance |  |
+| dynamodb.js:18:55:20:5 | {\\n      ... t\\n    } [Statement] | dynamodb.js:18:27:20:6 | new Exe ... \\n    }) | provenance |  |
+| dynamodb.js:19:20:19:34 | updateStatement | dynamodb.js:18:55:20:5 | {\\n      ... t\\n    } [Statement] | provenance |  |
+| dynamodb.js:56:9:56:22 | maliciousInput | dynamodb.js:58:61:58:74 | maliciousInput | provenance |  |
+| dynamodb.js:56:9:56:22 | maliciousInput | dynamodb.js:64:69:64:82 | maliciousInput | provenance |  |
+| dynamodb.js:56:9:56:22 | maliciousInput | dynamodb.js:67:69:67:82 | maliciousInput | provenance |  |
+| dynamodb.js:56:26:56:33 | req.body | dynamodb.js:56:9:56:22 | maliciousInput | provenance |  |
+| dynamodb.js:58:61:58:74 | maliciousInput | dynamodb.js:58:20:58:77 | `SELECT ... nput}'` | provenance |  |
+| dynamodb.js:64:69:64:82 | maliciousInput | dynamodb.js:64:28:64:85 | `SELECT ... nput}'` | provenance |  |
+| dynamodb.js:67:69:67:82 | maliciousInput | dynamodb.js:67:28:67:85 | `SELECT ... nput}'` | provenance |  |
+| graphql.js:8:11:8:12 | id | graphql.js:11:46:11:47 | id | provenance |  |
+| graphql.js:8:16:8:28 | req.params.id | graphql.js:8:11:8:12 | id | provenance |  |
 | graphql.js:11:46:11:47 | id | graphql.js:9:34:19:5 | `\\n      ... }\\n    ` | provenance |  |
-| graphql.js:25:11:25:28 | id | graphql.js:26:37:26:38 | id | provenance |  |
-| graphql.js:25:11:25:28 | id | graphql.js:29:39:29:40 | id | provenance |  |
-| graphql.js:25:11:25:28 | id | graphql.js:32:25:32:26 | id | provenance |  |
-| graphql.js:25:16:25:28 | req.params.id | graphql.js:25:11:25:28 | id | provenance |  |
+| graphql.js:25:11:25:12 | id | graphql.js:26:37:26:38 | id | provenance |  |
+| graphql.js:25:11:25:12 | id | graphql.js:29:39:29:40 | id | provenance |  |
+| graphql.js:25:11:25:12 | id | graphql.js:32:25:32:26 | id | provenance |  |
+| graphql.js:25:16:25:28 | req.params.id | graphql.js:25:11:25:12 | id | provenance |  |
 | graphql.js:26:37:26:38 | id | graphql.js:26:30:26:40 | `foo ${id}` | provenance |  |
 | graphql.js:29:39:29:40 | id | graphql.js:29:32:29:42 | `foo ${id}` | provenance |  |
 | graphql.js:32:25:32:26 | id | graphql.js:32:18:32:28 | `foo ${id}` | provenance |  |
-| graphql.js:38:11:38:28 | id | graphql.js:43:21:43:22 | id | provenance |  |
-| graphql.js:38:11:38:28 | id | graphql.js:47:51:47:52 | id | provenance |  |
-| graphql.js:38:16:38:28 | req.params.id | graphql.js:38:11:38:28 | id | provenance |  |
+| graphql.js:38:11:38:12 | id | graphql.js:43:21:43:22 | id | provenance |  |
+| graphql.js:38:11:38:12 | id | graphql.js:47:51:47:52 | id | provenance |  |
+| graphql.js:38:16:38:28 | req.params.id | graphql.js:38:11:38:12 | id | provenance |  |
 | graphql.js:43:21:43:22 | id | graphql.js:43:14:43:24 | `foo ${id}` | provenance |  |
 | graphql.js:47:51:47:52 | id | graphql.js:47:44:47:54 | `foo ${id}` | provenance |  |
-| graphql.js:54:11:54:28 | id | graphql.js:55:46:55:47 | id | provenance |  |
-| graphql.js:54:11:54:28 | id | graphql.js:57:73:57:74 | id | provenance |  |
-| graphql.js:54:16:54:28 | req.params.id | graphql.js:54:11:54:28 | id | provenance |  |
+| graphql.js:54:11:54:12 | id | graphql.js:55:46:55:47 | id | provenance |  |
+| graphql.js:54:11:54:12 | id | graphql.js:57:73:57:74 | id | provenance |  |
+| graphql.js:54:16:54:28 | req.params.id | graphql.js:54:11:54:12 | id | provenance |  |
 | graphql.js:55:46:55:47 | id | graphql.js:55:39:55:49 | `foo ${id}` | provenance |  |
 | graphql.js:57:73:57:74 | id | graphql.js:57:66:57:76 | `foo ${id}` | provenance |  |
-| graphql.js:73:9:73:25 | id | graphql.js:74:56:74:57 | id | provenance |  |
-| graphql.js:73:9:73:25 | id | graphql.js:86:13:86:14 | id | provenance |  |
-| graphql.js:73:14:73:25 | req.query.id | graphql.js:73:9:73:25 | id | provenance |  |
+| graphql.js:73:9:73:10 | id | graphql.js:74:56:74:57 | id | provenance |  |
+| graphql.js:73:9:73:10 | id | graphql.js:86:13:86:14 | id | provenance |  |
+| graphql.js:73:14:73:25 | req.query.id | graphql.js:73:9:73:10 | id | provenance |  |
 | graphql.js:74:56:74:57 | id | graphql.js:74:46:74:64 | "{ foo" + id + " }" | provenance |  |
 | graphql.js:86:13:86:14 | id | graphql.js:82:14:88:8 | `{\\n     ...      }` | provenance |  |
-| graphql.js:117:11:117:28 | id | graphql.js:118:45:118:46 | id | provenance |  |
-| graphql.js:117:16:117:28 | req.params.id | graphql.js:117:11:117:28 | id | provenance |  |
+| graphql.js:117:11:117:12 | id | graphql.js:118:45:118:46 | id | provenance |  |
+| graphql.js:117:16:117:28 | req.params.id | graphql.js:117:11:117:12 | id | provenance |  |
 | graphql.js:118:45:118:46 | id | graphql.js:118:38:118:48 | `foo ${id}` | provenance |  |
-| hana.js:9:13:9:42 | maliciousInput | hana.js:10:64:10:77 | maliciousInput | provenance |  |
-| hana.js:9:30:9:37 | req.body | hana.js:9:13:9:42 | maliciousInput | provenance |  |
-| hana.js:10:15:10:80 | query | hana.js:11:19:11:23 | query | provenance |  |
-| hana.js:10:64:10:77 | maliciousInput | hana.js:10:15:10:80 | query | provenance |  |
-| hana.js:16:15:16:44 | maliciousInput | hana.js:17:87:17:100 | maliciousInput | provenance |  |
-| hana.js:16:32:16:39 | req.body | hana.js:16:15:16:44 | maliciousInput | provenance |  |
+| hana.js:9:13:9:26 | maliciousInput | hana.js:10:64:10:77 | maliciousInput | provenance |  |
+| hana.js:9:30:9:37 | req.body | hana.js:9:13:9:26 | maliciousInput | provenance |  |
+| hana.js:10:15:10:19 | query | hana.js:11:19:11:23 | query | provenance |  |
+| hana.js:10:64:10:77 | maliciousInput | hana.js:10:15:10:19 | query | provenance |  |
+| hana.js:16:15:16:28 | maliciousInput | hana.js:17:87:17:100 | maliciousInput | provenance |  |
+| hana.js:16:32:16:39 | req.body | hana.js:16:15:16:28 | maliciousInput | provenance |  |
 | hana.js:17:87:17:100 | maliciousInput | hana.js:17:35:17:100 | `SELECT ... usInput | provenance |  |
-| hana.js:23:15:23:44 | maliciousInput | hana.js:24:83:24:96 | maliciousInput | provenance |  |
-| hana.js:23:32:23:39 | req.body | hana.js:23:15:23:44 | maliciousInput | provenance |  |
+| hana.js:23:15:23:28 | maliciousInput | hana.js:24:83:24:96 | maliciousInput | provenance |  |
+| hana.js:23:32:23:39 | req.body | hana.js:23:15:23:28 | maliciousInput | provenance |  |
 | hana.js:24:83:24:96 | maliciousInput | hana.js:24:33:24:96 | `INSERT ... usInput | provenance |  |
-| hana.js:30:13:30:42 | maliciousInput | hana.js:31:84:31:97 | maliciousInput | provenance |  |
-| hana.js:30:30:30:37 | req.body | hana.js:30:13:30:42 | maliciousInput | provenance |  |
+| hana.js:30:13:30:26 | maliciousInput | hana.js:31:84:31:97 | maliciousInput | provenance |  |
+| hana.js:30:30:30:37 | req.body | hana.js:30:13:30:26 | maliciousInput | provenance |  |
 | hana.js:31:84:31:97 | maliciousInput | hana.js:31:31:31:97 | "SELECT ... usInput | provenance |  |
-| hana.js:47:7:47:36 | maliciousInput | hana.js:48:39:48:52 | maliciousInput | provenance |  |
-| hana.js:47:7:47:36 | maliciousInput | hana.js:50:76:50:89 | maliciousInput | provenance |  |
-| hana.js:47:7:47:36 | maliciousInput | hana.js:54:53:54:66 | maliciousInput | provenance |  |
-| hana.js:47:24:47:31 | req.body | hana.js:47:7:47:36 | maliciousInput | provenance |  |
+| hana.js:47:7:47:20 | maliciousInput | hana.js:48:39:48:52 | maliciousInput | provenance |  |
+| hana.js:47:7:47:20 | maliciousInput | hana.js:50:76:50:89 | maliciousInput | provenance |  |
+| hana.js:47:7:47:20 | maliciousInput | hana.js:54:53:54:66 | maliciousInput | provenance |  |
+| hana.js:47:24:47:31 | req.body | hana.js:47:7:47:20 | maliciousInput | provenance |  |
 | hana.js:48:39:48:52 | maliciousInput | hana.js:48:15:48:52 | 'SELECT ... usInput | provenance |  |
 | hana.js:48:39:48:52 | maliciousInput | hana.js:50:76:50:89 | maliciousInput | provenance |  |
 | hana.js:50:76:50:89 | maliciousInput | hana.js:50:40:50:89 | 'CALL P ... usInput | provenance |  |
 | hana.js:50:76:50:89 | maliciousInput | hana.js:54:53:54:66 | maliciousInput | provenance |  |
 | hana.js:54:53:54:66 | maliciousInput | hana.js:54:38:54:66 | 'PROC_D ... usInput | provenance |  |
-| hana.js:68:7:68:36 | maliciousInput | hana.js:71:86:71:99 | maliciousInput | provenance |  |
-| hana.js:68:7:68:36 | maliciousInput | hana.js:73:41:73:54 | maliciousInput | provenance |  |
-| hana.js:68:7:68:36 | maliciousInput | hana.js:74:41:74:54 | maliciousInput | provenance |  |
-| hana.js:68:7:68:36 | maliciousInput | hana.js:76:60:76:73 | maliciousInput | provenance |  |
-| hana.js:68:7:68:36 | maliciousInput | hana.js:80:56:80:69 | maliciousInput | provenance |  |
-| hana.js:68:7:68:36 | maliciousInput | hana.js:84:65:84:78 | maliciousInput | provenance |  |
-| hana.js:68:24:68:31 | req.body | hana.js:68:7:68:36 | maliciousInput | provenance |  |
+| hana.js:68:7:68:20 | maliciousInput | hana.js:71:86:71:99 | maliciousInput | provenance |  |
+| hana.js:68:7:68:20 | maliciousInput | hana.js:73:41:73:54 | maliciousInput | provenance |  |
+| hana.js:68:7:68:20 | maliciousInput | hana.js:74:41:74:54 | maliciousInput | provenance |  |
+| hana.js:68:7:68:20 | maliciousInput | hana.js:76:60:76:73 | maliciousInput | provenance |  |
+| hana.js:68:7:68:20 | maliciousInput | hana.js:80:56:80:69 | maliciousInput | provenance |  |
+| hana.js:68:7:68:20 | maliciousInput | hana.js:84:65:84:78 | maliciousInput | provenance |  |
+| hana.js:68:24:68:31 | req.body | hana.js:68:7:68:20 | maliciousInput | provenance |  |
 | hana.js:71:86:71:99 | maliciousInput | hana.js:71:44:71:99 | "INSERT ... usInput | provenance |  |
 | hana.js:73:41:73:54 | maliciousInput | hana.js:73:17:73:54 | 'select ... usInput | provenance |  |
 | hana.js:74:41:74:54 | maliciousInput | hana.js:74:17:74:54 | 'select ... usInput | provenance |  |
@@ -201,151 +287,151 @@ edges
 | hana.js:80:56:80:69 | maliciousInput | hana.js:80:20:80:69 | 'call P ... usInput | provenance |  |
 | hana.js:84:65:84:78 | maliciousInput | hana.js:84:20:84:78 | 'select ... usInput | provenance |  |
 | html-sanitizer.js:13:39:13:44 | param1 | html-sanitizer.js:14:18:14:23 | param1 | provenance |  |
-| html-sanitizer.js:14:5:14:24 | param1 | html-sanitizer.js:16:54:16:59 | param1 | provenance |  |
-| html-sanitizer.js:14:14:14:24 | xss(param1) | html-sanitizer.js:14:5:14:24 | param1 | provenance |  |
+| html-sanitizer.js:14:5:14:10 | param1 | html-sanitizer.js:16:54:16:59 | param1 | provenance |  |
+| html-sanitizer.js:14:14:14:24 | xss(param1) | html-sanitizer.js:14:5:14:10 | param1 | provenance |  |
 | html-sanitizer.js:14:18:14:23 | param1 | html-sanitizer.js:14:14:14:24 | xss(param1) | provenance | Config |
 | html-sanitizer.js:16:54:16:59 | param1 | html-sanitizer.js:16:9:16:59 | `SELECT ...  param1 | provenance |  |
-| json-schema-validator.js:25:15:25:48 | query | json-schema-validator.js:33:22:33:26 | query | provenance |  |
-| json-schema-validator.js:25:15:25:48 | query | json-schema-validator.js:35:18:35:22 | query | provenance |  |
-| json-schema-validator.js:25:23:25:48 | JSON.pa ... y.data) | json-schema-validator.js:25:15:25:48 | query | provenance |  |
+| json-schema-validator.js:25:15:25:19 | query | json-schema-validator.js:33:22:33:26 | query | provenance |  |
+| json-schema-validator.js:25:15:25:19 | query | json-schema-validator.js:35:18:35:22 | query | provenance |  |
+| json-schema-validator.js:25:23:25:48 | JSON.pa ... y.data) | json-schema-validator.js:25:15:25:19 | query | provenance |  |
 | json-schema-validator.js:25:34:25:47 | req.query.data | json-schema-validator.js:25:23:25:48 | JSON.pa ... y.data) | provenance | Config |
-| json-schema-validator.js:50:15:50:48 | query | json-schema-validator.js:55:22:55:26 | query | provenance |  |
-| json-schema-validator.js:50:15:50:48 | query | json-schema-validator.js:59:22:59:26 | query | provenance |  |
-| json-schema-validator.js:50:15:50:48 | query | json-schema-validator.js:61:22:61:26 | query | provenance |  |
-| json-schema-validator.js:50:23:50:48 | JSON.pa ... y.data) | json-schema-validator.js:50:15:50:48 | query | provenance |  |
+| json-schema-validator.js:50:15:50:19 | query | json-schema-validator.js:55:22:55:26 | query | provenance |  |
+| json-schema-validator.js:50:15:50:19 | query | json-schema-validator.js:59:22:59:26 | query | provenance |  |
+| json-schema-validator.js:50:15:50:19 | query | json-schema-validator.js:61:22:61:26 | query | provenance |  |
+| json-schema-validator.js:50:23:50:48 | JSON.pa ... y.data) | json-schema-validator.js:50:15:50:19 | query | provenance |  |
 | json-schema-validator.js:50:34:50:47 | req.query.data | json-schema-validator.js:50:23:50:48 | JSON.pa ... y.data) | provenance | Config |
-| koarouter.js:5:11:5:33 | version | koarouter.js:14:38:14:44 | version | provenance |  |
-| koarouter.js:5:13:5:19 | version | koarouter.js:5:11:5:33 | version | provenance |  |
+| koarouter.js:5:13:5:19 | version | koarouter.js:5:13:5:19 | version | provenance |  |
+| koarouter.js:5:13:5:19 | version | koarouter.js:14:38:14:44 | version | provenance |  |
 | koarouter.js:14:9:14:18 | [post update] conditions [ArrayElement] | koarouter.js:17:52:17:61 | conditions [ArrayElement] | provenance |  |
 | koarouter.js:14:25:14:46 | `versio ... rsion}` | koarouter.js:14:9:14:18 | [post update] conditions [ArrayElement] | provenance |  |
 | koarouter.js:14:38:14:44 | version | koarouter.js:14:25:14:46 | `versio ... rsion}` | provenance |  |
 | koarouter.js:17:52:17:61 | conditions [ArrayElement] | koarouter.js:17:52:17:75 | conditi ...  and ') | provenance |  |
 | koarouter.js:17:52:17:75 | conditi ...  and ') | koarouter.js:17:27:17:77 | `SELECT ... nd ')}` | provenance |  |
-| ldap.js:20:7:20:34 | q | ldap.js:22:18:22:18 | q | provenance |  |
-| ldap.js:20:11:20:34 | url.par ... , true) | ldap.js:20:7:20:34 | q | provenance |  |
+| ldap.js:20:7:20:7 | q | ldap.js:22:18:22:18 | q | provenance |  |
+| ldap.js:20:11:20:34 | url.par ... , true) | ldap.js:20:7:20:7 | q | provenance |  |
 | ldap.js:20:21:20:27 | req.url | ldap.js:20:11:20:34 | url.par ... , true) | provenance |  |
-| ldap.js:22:7:22:33 | username | ldap.js:25:24:25:31 | username | provenance |  |
-| ldap.js:22:7:22:33 | username | ldap.js:25:46:25:53 | username | provenance |  |
-| ldap.js:22:7:22:33 | username | ldap.js:32:26:32:33 | username | provenance |  |
-| ldap.js:22:7:22:33 | username | ldap.js:32:48:32:55 | username | provenance |  |
-| ldap.js:22:7:22:33 | username | ldap.js:64:16:64:23 | username | provenance |  |
-| ldap.js:22:7:22:33 | username | ldap.js:64:38:64:45 | username | provenance |  |
-| ldap.js:22:7:22:33 | username | ldap.js:68:33:68:40 | username | provenance |  |
-| ldap.js:22:18:22:18 | q | ldap.js:22:7:22:33 | username | provenance |  |
+| ldap.js:22:7:22:14 | username | ldap.js:25:24:25:31 | username | provenance |  |
+| ldap.js:22:7:22:14 | username | ldap.js:25:46:25:53 | username | provenance |  |
+| ldap.js:22:7:22:14 | username | ldap.js:32:26:32:33 | username | provenance |  |
+| ldap.js:22:7:22:14 | username | ldap.js:32:48:32:55 | username | provenance |  |
+| ldap.js:22:7:22:14 | username | ldap.js:64:16:64:23 | username | provenance |  |
+| ldap.js:22:7:22:14 | username | ldap.js:64:38:64:45 | username | provenance |  |
+| ldap.js:22:7:22:14 | username | ldap.js:68:33:68:40 | username | provenance |  |
+| ldap.js:22:18:22:18 | q | ldap.js:22:7:22:14 | username | provenance |  |
 | ldap.js:25:13:25:57 | `(\|(nam ... ame}))` | ldap.js:28:30:28:34 | opts1 | provenance | Config |
 | ldap.js:25:24:25:31 | username | ldap.js:25:13:25:57 | `(\|(nam ... ame}))` | provenance |  |
 | ldap.js:25:46:25:53 | username | ldap.js:25:13:25:57 | `(\|(nam ... ame}))` | provenance |  |
 | ldap.js:32:15:32:59 | `(\|(nam ... ame}))` | ldap.js:32:5:32:61 | { filte ... e}))` } | provenance | Config |
 | ldap.js:32:26:32:33 | username | ldap.js:32:15:32:59 | `(\|(nam ... ame}))` | provenance |  |
 | ldap.js:32:48:32:55 | username | ldap.js:32:15:32:59 | `(\|(nam ... ame}))` | provenance |  |
-| ldap.js:63:9:65:3 | parsedFilter | ldap.js:66:40:66:51 | parsedFilter | provenance |  |
-| ldap.js:63:24:65:3 | ldap.pa ... ))`\\n  ) | ldap.js:63:9:65:3 | parsedFilter | provenance |  |
+| ldap.js:63:9:63:20 | parsedFilter | ldap.js:66:40:66:51 | parsedFilter | provenance |  |
+| ldap.js:63:24:65:3 | ldap.pa ... ))`\\n  ) | ldap.js:63:9:63:20 | parsedFilter | provenance |  |
 | ldap.js:64:5:64:49 | `(\|(nam ... ame}))` | ldap.js:63:24:65:3 | ldap.pa ... ))`\\n  ) | provenance | Config |
 | ldap.js:64:16:64:23 | username | ldap.js:64:5:64:49 | `(\|(nam ... ame}))` | provenance |  |
 | ldap.js:64:38:64:45 | username | ldap.js:64:5:64:49 | `(\|(nam ... ame}))` | provenance |  |
 | ldap.js:66:40:66:51 | parsedFilter | ldap.js:66:30:66:53 | { filte ... ilter } | provenance | Config |
 | ldap.js:68:33:68:40 | username | ldap.js:68:27:68:42 | `cn=${username}` | provenance |  |
-| marsdb-flow-to.js:10:9:10:18 | query | marsdb-flow-to.js:13:17:13:21 | query | provenance |  |
-| marsdb-flow-to.js:10:17:10:18 | {} | marsdb-flow-to.js:10:9:10:18 | query | provenance |  |
+| marsdb-flow-to.js:10:9:10:13 | query | marsdb-flow-to.js:13:17:13:21 | query | provenance |  |
+| marsdb-flow-to.js:10:17:10:18 | {} | marsdb-flow-to.js:10:9:10:13 | query | provenance |  |
 | marsdb-flow-to.js:11:17:11:24 | req.body | marsdb-flow-to.js:11:17:11:30 | req.body.title | provenance | Config |
-| marsdb-flow-to.js:11:17:11:30 | req.body.title | marsdb-flow-to.js:10:9:10:18 | query | provenance | Config |
+| marsdb-flow-to.js:11:17:11:30 | req.body.title | marsdb-flow-to.js:10:9:10:13 | query | provenance | Config |
 | marsdb-flow-to.js:11:17:11:30 | req.body.title | marsdb-flow-to.js:10:17:10:18 | {} | provenance | Config |
 | marsdb-flow-to.js:11:17:11:30 | req.body.title | marsdb-flow-to.js:13:17:13:21 | query | provenance | Config |
-| marsdb.js:12:9:12:18 | query | marsdb.js:15:12:15:16 | query | provenance |  |
-| marsdb.js:12:17:12:18 | {} | marsdb.js:12:9:12:18 | query | provenance |  |
+| marsdb.js:12:9:12:13 | query | marsdb.js:15:12:15:16 | query | provenance |  |
+| marsdb.js:12:17:12:18 | {} | marsdb.js:12:9:12:13 | query | provenance |  |
 | marsdb.js:13:17:13:24 | req.body | marsdb.js:13:17:13:30 | req.body.title | provenance | Config |
-| marsdb.js:13:17:13:30 | req.body.title | marsdb.js:12:9:12:18 | query | provenance | Config |
+| marsdb.js:13:17:13:30 | req.body.title | marsdb.js:12:9:12:13 | query | provenance | Config |
 | marsdb.js:13:17:13:30 | req.body.title | marsdb.js:12:17:12:18 | {} | provenance | Config |
 | marsdb.js:13:17:13:30 | req.body.title | marsdb.js:15:12:15:16 | query | provenance | Config |
-| minimongo.js:14:9:14:18 | query | minimongo.js:17:12:17:16 | query | provenance |  |
-| minimongo.js:14:17:14:18 | {} | minimongo.js:14:9:14:18 | query | provenance |  |
+| minimongo.js:14:9:14:13 | query | minimongo.js:17:12:17:16 | query | provenance |  |
+| minimongo.js:14:17:14:18 | {} | minimongo.js:14:9:14:13 | query | provenance |  |
 | minimongo.js:15:17:15:24 | req.body | minimongo.js:15:17:15:30 | req.body.title | provenance | Config |
-| minimongo.js:15:17:15:30 | req.body.title | minimongo.js:14:9:14:18 | query | provenance | Config |
+| minimongo.js:15:17:15:30 | req.body.title | minimongo.js:14:9:14:13 | query | provenance | Config |
 | minimongo.js:15:17:15:30 | req.body.title | minimongo.js:14:17:14:18 | {} | provenance | Config |
 | minimongo.js:15:17:15:30 | req.body.title | minimongo.js:17:12:17:16 | query | provenance | Config |
-| mongodb.js:12:11:12:20 | query | mongodb.js:13:5:13:9 | query | provenance |  |
-| mongodb.js:12:19:12:20 | {} | mongodb.js:12:11:12:20 | query | provenance |  |
+| mongodb.js:12:11:12:15 | query | mongodb.js:13:5:13:9 | query | provenance |  |
+| mongodb.js:12:19:12:20 | {} | mongodb.js:12:11:12:15 | query | provenance |  |
 | mongodb.js:13:5:13:9 | query | mongodb.js:17:16:17:20 | query | provenance |  |
 | mongodb.js:13:19:13:26 | req.body | mongodb.js:13:19:13:32 | req.body.title | provenance | Config |
-| mongodb.js:13:19:13:32 | req.body.title | mongodb.js:12:11:12:20 | query | provenance | Config |
+| mongodb.js:13:19:13:32 | req.body.title | mongodb.js:12:11:12:15 | query | provenance | Config |
 | mongodb.js:13:19:13:32 | req.body.title | mongodb.js:12:19:12:20 | {} | provenance | Config |
 | mongodb.js:13:19:13:32 | req.body.title | mongodb.js:13:5:13:9 | query | provenance | Config |
 | mongodb.js:13:19:13:32 | req.body.title | mongodb.js:17:16:17:20 | query | provenance | Config |
-| mongodb.js:25:11:25:32 | title | mongodb.js:30:38:30:42 | title | provenance |  |
+| mongodb.js:25:11:25:15 | title | mongodb.js:30:38:30:42 | title | provenance |  |
 | mongodb.js:25:19:25:26 | req.body | mongodb.js:25:19:25:32 | req.body.title | provenance | Config |
-| mongodb.js:25:19:25:32 | req.body.title | mongodb.js:25:11:25:32 | title | provenance |  |
+| mongodb.js:25:19:25:32 | req.body.title | mongodb.js:25:11:25:15 | title | provenance |  |
 | mongodb.js:30:27:30:43 | JSON.parse(title) | mongodb.js:30:18:30:45 | { title ... itle) } | provenance | Config |
 | mongodb.js:30:38:30:42 | title | mongodb.js:30:27:30:43 | JSON.parse(title) | provenance | Config |
-| mongodb.js:46:11:46:20 | query | mongodb.js:47:5:47:9 | query | provenance |  |
-| mongodb.js:46:19:46:20 | {} | mongodb.js:46:11:46:20 | query | provenance |  |
+| mongodb.js:46:11:46:15 | query | mongodb.js:47:5:47:9 | query | provenance |  |
+| mongodb.js:46:19:46:20 | {} | mongodb.js:46:11:46:15 | query | provenance |  |
 | mongodb.js:47:5:47:9 | query | mongodb.js:51:16:51:20 | query | provenance |  |
-| mongodb.js:47:19:47:33 | req.query.title | mongodb.js:46:11:46:20 | query | provenance | Config |
+| mongodb.js:47:19:47:33 | req.query.title | mongodb.js:46:11:46:15 | query | provenance | Config |
 | mongodb.js:47:19:47:33 | req.query.title | mongodb.js:46:19:46:20 | {} | provenance | Config |
 | mongodb.js:47:19:47:33 | req.query.title | mongodb.js:47:5:47:9 | query | provenance | Config |
 | mongodb.js:47:19:47:33 | req.query.title | mongodb.js:51:16:51:20 | query | provenance | Config |
-| mongodb.js:56:8:56:17 | query | mongodb.js:57:2:57:6 | query | provenance |  |
-| mongodb.js:56:16:56:17 | {} | mongodb.js:56:8:56:17 | query | provenance |  |
+| mongodb.js:56:8:56:12 | query | mongodb.js:57:2:57:6 | query | provenance |  |
+| mongodb.js:56:16:56:17 | {} | mongodb.js:56:8:56:12 | query | provenance |  |
 | mongodb.js:57:2:57:6 | query | mongodb.js:61:12:61:16 | query | provenance |  |
-| mongodb.js:57:16:57:30 | req.query.title | mongodb.js:56:8:56:17 | query | provenance | Config |
+| mongodb.js:57:16:57:30 | req.query.title | mongodb.js:56:8:56:12 | query | provenance | Config |
 | mongodb.js:57:16:57:30 | req.query.title | mongodb.js:56:16:56:17 | {} | provenance | Config |
 | mongodb.js:57:16:57:30 | req.query.title | mongodb.js:57:2:57:6 | query | provenance | Config |
 | mongodb.js:57:16:57:30 | req.query.title | mongodb.js:61:12:61:16 | query | provenance | Config |
-| mongodb.js:66:7:66:25 | tag | mongodb.js:72:22:72:24 | tag | provenance |  |
-| mongodb.js:66:7:66:25 | tag | mongodb.js:79:20:79:22 | tag | provenance |  |
-| mongodb.js:66:13:66:25 | req.query.tag | mongodb.js:66:7:66:25 | tag | provenance |  |
+| mongodb.js:66:7:66:9 | tag | mongodb.js:72:22:72:24 | tag | provenance |  |
+| mongodb.js:66:7:66:9 | tag | mongodb.js:79:20:79:22 | tag | provenance |  |
+| mongodb.js:66:13:66:25 | req.query.tag | mongodb.js:66:7:66:9 | tag | provenance |  |
 | mongodb.js:72:22:72:24 | tag | mongodb.js:72:14:72:26 | { tags: tag } | provenance | Config |
 | mongodb.js:79:20:79:22 | tag | mongodb.js:79:12:79:24 | { tags: tag } | provenance | Config |
-| mongodb.js:100:9:100:18 | query | mongodb.js:101:3:101:7 | query | provenance |  |
-| mongodb.js:100:17:100:18 | {} | mongodb.js:100:9:100:18 | query | provenance |  |
+| mongodb.js:100:9:100:13 | query | mongodb.js:101:3:101:7 | query | provenance |  |
+| mongodb.js:100:17:100:18 | {} | mongodb.js:100:9:100:13 | query | provenance |  |
 | mongodb.js:101:3:101:7 | query | mongodb.js:105:14:105:18 | query | provenance |  |
-| mongodb.js:101:17:101:29 | queries.title | mongodb.js:100:9:100:18 | query | provenance | Config |
+| mongodb.js:101:17:101:29 | queries.title | mongodb.js:100:9:100:13 | query | provenance | Config |
 | mongodb.js:101:17:101:29 | queries.title | mongodb.js:100:17:100:18 | {} | provenance | Config |
 | mongodb.js:101:17:101:29 | queries.title | mongodb.js:101:3:101:7 | query | provenance | Config |
 | mongodb.js:101:17:101:29 | queries.title | mongodb.js:105:14:105:18 | query | provenance | Config |
-| mongodb_bodySafe.js:23:11:23:20 | query | mongodb_bodySafe.js:24:5:24:9 | query | provenance |  |
-| mongodb_bodySafe.js:23:19:23:20 | {} | mongodb_bodySafe.js:23:11:23:20 | query | provenance |  |
+| mongodb_bodySafe.js:23:11:23:15 | query | mongodb_bodySafe.js:24:5:24:9 | query | provenance |  |
+| mongodb_bodySafe.js:23:19:23:20 | {} | mongodb_bodySafe.js:23:11:23:15 | query | provenance |  |
 | mongodb_bodySafe.js:24:5:24:9 | query | mongodb_bodySafe.js:28:16:28:20 | query | provenance |  |
-| mongodb_bodySafe.js:24:19:24:33 | req.query.title | mongodb_bodySafe.js:23:11:23:20 | query | provenance | Config |
+| mongodb_bodySafe.js:24:19:24:33 | req.query.title | mongodb_bodySafe.js:23:11:23:15 | query | provenance | Config |
 | mongodb_bodySafe.js:24:19:24:33 | req.query.title | mongodb_bodySafe.js:23:19:23:20 | {} | provenance | Config |
 | mongodb_bodySafe.js:24:19:24:33 | req.query.title | mongodb_bodySafe.js:24:5:24:9 | query | provenance | Config |
 | mongodb_bodySafe.js:24:19:24:33 | req.query.title | mongodb_bodySafe.js:28:16:28:20 | query | provenance | Config |
-| mongoose.js:20:8:20:17 | query | mongoose.js:21:2:21:6 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:23:22:23:26 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:25:17:25:21 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:27:22:27:26 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:29:21:29:25 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:31:28:31:32 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:33:16:33:20 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:35:19:35:23 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:37:28:37:32 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:39:28:39:32 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:41:28:41:32 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:43:22:43:26 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:45:18:45:22 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:47:22:47:26 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:49:21:49:25 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:51:32:51:36 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:53:27:53:31 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:54:8:54:12 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:57:17:57:21 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:58:10:58:14 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:59:8:59:12 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:60:7:60:11 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:61:16:61:20 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:62:12:62:16 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:63:10:63:14 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:67:37:67:41 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:68:46:68:50 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:69:47:69:51 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:90:21:90:25 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:97:14:97:18 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:99:31:99:35 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:119:38:119:42 | query | provenance |  |
-| mongoose.js:20:8:20:17 | query | mongoose.js:122:30:122:34 | query | provenance |  |
-| mongoose.js:20:16:20:17 | {} | mongoose.js:20:8:20:17 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:21:2:21:6 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:23:22:23:26 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:25:17:25:21 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:27:22:27:26 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:29:21:29:25 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:31:28:31:32 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:33:16:33:20 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:35:19:35:23 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:37:28:37:32 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:39:28:39:32 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:41:28:41:32 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:43:22:43:26 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:45:18:45:22 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:47:22:47:26 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:49:21:49:25 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:51:32:51:36 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:53:27:53:31 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:54:8:54:12 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:57:17:57:21 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:58:10:58:14 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:59:8:59:12 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:60:7:60:11 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:61:16:61:20 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:62:12:62:16 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:63:10:63:14 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:67:37:67:41 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:68:46:68:50 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:69:47:69:51 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:90:21:90:25 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:97:14:97:18 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:99:31:99:35 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:119:38:119:42 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:122:30:122:34 | query | provenance |  |
+| mongoose.js:20:16:20:17 | {} | mongoose.js:20:8:20:12 | query | provenance |  |
 | mongoose.js:21:2:21:6 | query | mongoose.js:23:22:23:26 | query | provenance |  |
 | mongoose.js:21:16:21:23 | req.body | mongoose.js:21:16:21:29 | req.body.title | provenance | Config |
-| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:20:8:20:17 | query | provenance | Config |
+| mongoose.js:21:16:21:29 | req.body.title | mongoose.js:20:8:20:12 | query | provenance | Config |
 | mongoose.js:21:16:21:29 | req.body.title | mongoose.js:20:16:20:17 | {} | provenance | Config |
 | mongoose.js:21:16:21:29 | req.body.title | mongoose.js:21:2:21:6 | query | provenance | Config |
 | mongoose.js:21:16:21:29 | req.body.title | mongoose.js:23:22:23:26 | query | provenance | Config |
@@ -423,59 +509,59 @@ edges
 | mongoose.js:90:21:90:25 | query | mongoose.js:97:14:97:18 | query | provenance |  |
 | mongoose.js:97:14:97:18 | query | mongoose.js:99:31:99:35 | query | provenance |  |
 | mongoose.js:99:31:99:35 | query | mongoose.js:119:38:119:42 | query | provenance |  |
-| mongoose.js:101:6:101:22 | id | mongoose.js:109:20:109:21 | id | provenance |  |
-| mongoose.js:101:6:101:22 | id | mongoose.js:116:23:116:24 | id | provenance |  |
-| mongoose.js:101:11:101:22 | req.query.id | mongoose.js:101:6:101:22 | id | provenance |  |
-| mongoose.js:101:25:101:45 | cond | mongoose.js:102:22:102:25 | cond | provenance |  |
-| mongoose.js:101:25:101:45 | cond | mongoose.js:103:21:103:24 | cond | provenance |  |
-| mongoose.js:101:25:101:45 | cond | mongoose.js:104:21:104:24 | cond | provenance |  |
-| mongoose.js:101:25:101:45 | cond | mongoose.js:105:18:105:21 | cond | provenance |  |
-| mongoose.js:101:25:101:45 | cond | mongoose.js:106:22:106:25 | cond | provenance |  |
-| mongoose.js:101:25:101:45 | cond | mongoose.js:107:16:107:19 | cond | provenance |  |
-| mongoose.js:101:25:101:45 | cond | mongoose.js:108:19:108:22 | cond | provenance |  |
-| mongoose.js:101:25:101:45 | cond | mongoose.js:110:28:110:31 | cond | provenance |  |
-| mongoose.js:101:25:101:45 | cond | mongoose.js:111:28:111:31 | cond | provenance |  |
-| mongoose.js:101:25:101:45 | cond | mongoose.js:112:28:112:31 | cond | provenance |  |
-| mongoose.js:101:25:101:45 | cond | mongoose.js:113:18:113:21 | cond | provenance |  |
-| mongoose.js:101:25:101:45 | cond | mongoose.js:114:22:114:25 | cond | provenance |  |
-| mongoose.js:101:25:101:45 | cond | mongoose.js:115:21:115:24 | cond | provenance |  |
-| mongoose.js:101:32:101:45 | req.query.cond | mongoose.js:101:25:101:45 | cond | provenance |  |
+| mongoose.js:101:6:101:7 | id | mongoose.js:109:20:109:21 | id | provenance |  |
+| mongoose.js:101:6:101:7 | id | mongoose.js:116:23:116:24 | id | provenance |  |
+| mongoose.js:101:11:101:22 | req.query.id | mongoose.js:101:6:101:7 | id | provenance |  |
+| mongoose.js:101:25:101:28 | cond | mongoose.js:102:22:102:25 | cond | provenance |  |
+| mongoose.js:101:25:101:28 | cond | mongoose.js:103:21:103:24 | cond | provenance |  |
+| mongoose.js:101:25:101:28 | cond | mongoose.js:104:21:104:24 | cond | provenance |  |
+| mongoose.js:101:25:101:28 | cond | mongoose.js:105:18:105:21 | cond | provenance |  |
+| mongoose.js:101:25:101:28 | cond | mongoose.js:106:22:106:25 | cond | provenance |  |
+| mongoose.js:101:25:101:28 | cond | mongoose.js:107:16:107:19 | cond | provenance |  |
+| mongoose.js:101:25:101:28 | cond | mongoose.js:108:19:108:22 | cond | provenance |  |
+| mongoose.js:101:25:101:28 | cond | mongoose.js:110:28:110:31 | cond | provenance |  |
+| mongoose.js:101:25:101:28 | cond | mongoose.js:111:28:111:31 | cond | provenance |  |
+| mongoose.js:101:25:101:28 | cond | mongoose.js:112:28:112:31 | cond | provenance |  |
+| mongoose.js:101:25:101:28 | cond | mongoose.js:113:18:113:21 | cond | provenance |  |
+| mongoose.js:101:25:101:28 | cond | mongoose.js:114:22:114:25 | cond | provenance |  |
+| mongoose.js:101:25:101:28 | cond | mongoose.js:115:21:115:24 | cond | provenance |  |
+| mongoose.js:101:32:101:45 | req.query.cond | mongoose.js:101:25:101:28 | cond | provenance |  |
 | mongoose.js:116:23:116:24 | id | mongoose.js:116:16:116:26 | { _id: id } | provenance | Config |
 | mongoose.js:119:38:119:42 | query | mongoose.js:122:30:122:34 | query | provenance |  |
-| mongooseJsonParse.js:19:11:19:20 | query | mongooseJsonParse.js:22:19:22:23 | query | provenance |  |
-| mongooseJsonParse.js:19:19:19:20 | {} | mongooseJsonParse.js:19:11:19:20 | query | provenance |  |
+| mongooseJsonParse.js:19:11:19:15 | query | mongooseJsonParse.js:22:19:22:23 | query | provenance |  |
+| mongooseJsonParse.js:19:19:19:20 | {} | mongooseJsonParse.js:19:11:19:15 | query | provenance |  |
 | mongooseJsonParse.js:20:19:20:44 | JSON.pa ... y.data) | mongooseJsonParse.js:20:19:20:50 | JSON.pa ... ).title | provenance | Config |
-| mongooseJsonParse.js:20:19:20:50 | JSON.pa ... ).title | mongooseJsonParse.js:19:11:19:20 | query | provenance | Config |
+| mongooseJsonParse.js:20:19:20:50 | JSON.pa ... ).title | mongooseJsonParse.js:19:11:19:15 | query | provenance | Config |
 | mongooseJsonParse.js:20:19:20:50 | JSON.pa ... ).title | mongooseJsonParse.js:19:19:19:20 | {} | provenance | Config |
 | mongooseJsonParse.js:20:19:20:50 | JSON.pa ... ).title | mongooseJsonParse.js:22:19:22:23 | query | provenance | Config |
 | mongooseJsonParse.js:20:30:20:43 | req.query.data | mongooseJsonParse.js:20:19:20:44 | JSON.pa ... y.data) | provenance | Config |
-| mongooseModelClient.js:10:7:10:32 | v | mongooseModelClient.js:11:22:11:22 | v | provenance |  |
-| mongooseModelClient.js:10:11:10:32 | JSON.pa ... body.x) | mongooseModelClient.js:10:7:10:32 | v | provenance |  |
+| mongooseModelClient.js:10:7:10:7 | v | mongooseModelClient.js:11:22:11:22 | v | provenance |  |
+| mongooseModelClient.js:10:11:10:32 | JSON.pa ... body.x) | mongooseModelClient.js:10:7:10:7 | v | provenance |  |
 | mongooseModelClient.js:10:22:10:29 | req.body | mongooseModelClient.js:10:22:10:31 | req.body.x | provenance | Config |
 | mongooseModelClient.js:10:22:10:31 | req.body.x | mongooseModelClient.js:10:11:10:32 | JSON.pa ... body.x) | provenance | Config |
 | mongooseModelClient.js:11:22:11:22 | v | mongooseModelClient.js:11:16:11:24 | { id: v } | provenance | Config |
 | mongooseModelClient.js:12:22:12:29 | req.body | mongooseModelClient.js:12:22:12:32 | req.body.id | provenance | Config |
 | mongooseModelClient.js:12:22:12:32 | req.body.id | mongooseModelClient.js:12:16:12:34 | { id: req.body.id } | provenance | Config |
-| mysql.js:6:9:6:31 | temp | mysql.js:15:62:15:65 | temp | provenance |  |
-| mysql.js:6:9:6:31 | temp | mysql.js:19:70:19:73 | temp | provenance |  |
-| mysql.js:6:16:6:31 | req.params.value | mysql.js:6:9:6:31 | temp | provenance |  |
+| mysql.js:6:9:6:12 | temp | mysql.js:15:62:15:65 | temp | provenance |  |
+| mysql.js:6:9:6:12 | temp | mysql.js:19:70:19:73 | temp | provenance |  |
+| mysql.js:6:16:6:31 | req.params.value | mysql.js:6:9:6:12 | temp | provenance |  |
 | mysql.js:15:62:15:65 | temp | mysql.js:15:18:15:65 | 'SELECT ...  + temp | provenance |  |
 | mysql.js:19:70:19:73 | temp | mysql.js:19:26:19:73 | 'SELECT ...  + temp | provenance |  |
-| pg-promise-types.ts:7:9:7:28 | taint | pg-promise-types.ts:8:17:8:21 | taint | provenance |  |
-| pg-promise-types.ts:7:17:7:28 | req.params.x | pg-promise-types.ts:7:9:7:28 | taint | provenance |  |
-| pg-promise.js:6:7:7:55 | query | pg-promise.js:9:10:9:14 | query | provenance |  |
-| pg-promise.js:6:7:7:55 | query | pg-promise.js:10:11:10:15 | query | provenance |  |
-| pg-promise.js:6:7:7:55 | query | pg-promise.js:11:17:11:21 | query | provenance |  |
-| pg-promise.js:6:7:7:55 | query | pg-promise.js:12:10:12:14 | query | provenance |  |
-| pg-promise.js:6:7:7:55 | query | pg-promise.js:13:12:13:16 | query | provenance |  |
-| pg-promise.js:6:7:7:55 | query | pg-promise.js:14:18:14:22 | query | provenance |  |
-| pg-promise.js:6:7:7:55 | query | pg-promise.js:15:11:15:15 | query | provenance |  |
-| pg-promise.js:6:7:7:55 | query | pg-promise.js:16:10:16:14 | query | provenance |  |
-| pg-promise.js:6:7:7:55 | query | pg-promise.js:17:16:17:20 | query | provenance |  |
-| pg-promise.js:6:7:7:55 | query | pg-promise.js:18:12:18:16 | query | provenance |  |
-| pg-promise.js:6:7:7:55 | query | pg-promise.js:19:13:19:17 | query | provenance |  |
-| pg-promise.js:6:7:7:55 | query | pg-promise.js:22:11:22:15 | query | provenance |  |
-| pg-promise.js:7:16:7:34 | req.params.category | pg-promise.js:6:7:7:55 | query | provenance |  |
+| pg-promise-types.ts:7:9:7:13 | taint | pg-promise-types.ts:8:17:8:21 | taint | provenance |  |
+| pg-promise-types.ts:7:17:7:28 | req.params.x | pg-promise-types.ts:7:9:7:13 | taint | provenance |  |
+| pg-promise.js:6:7:6:11 | query | pg-promise.js:9:10:9:14 | query | provenance |  |
+| pg-promise.js:6:7:6:11 | query | pg-promise.js:10:11:10:15 | query | provenance |  |
+| pg-promise.js:6:7:6:11 | query | pg-promise.js:11:17:11:21 | query | provenance |  |
+| pg-promise.js:6:7:6:11 | query | pg-promise.js:12:10:12:14 | query | provenance |  |
+| pg-promise.js:6:7:6:11 | query | pg-promise.js:13:12:13:16 | query | provenance |  |
+| pg-promise.js:6:7:6:11 | query | pg-promise.js:14:18:14:22 | query | provenance |  |
+| pg-promise.js:6:7:6:11 | query | pg-promise.js:15:11:15:15 | query | provenance |  |
+| pg-promise.js:6:7:6:11 | query | pg-promise.js:16:10:16:14 | query | provenance |  |
+| pg-promise.js:6:7:6:11 | query | pg-promise.js:17:16:17:20 | query | provenance |  |
+| pg-promise.js:6:7:6:11 | query | pg-promise.js:18:12:18:16 | query | provenance |  |
+| pg-promise.js:6:7:6:11 | query | pg-promise.js:19:13:19:17 | query | provenance |  |
+| pg-promise.js:6:7:6:11 | query | pg-promise.js:22:11:22:15 | query | provenance |  |
+| pg-promise.js:7:16:7:34 | req.params.category | pg-promise.js:6:7:6:11 | query | provenance |  |
 | pg-promise.js:9:10:9:14 | query | pg-promise.js:10:11:10:15 | query | provenance |  |
 | pg-promise.js:10:11:10:15 | query | pg-promise.js:11:17:11:21 | query | provenance |  |
 | pg-promise.js:11:17:11:21 | query | pg-promise.js:12:10:12:14 | query | provenance |  |
@@ -490,39 +576,129 @@ edges
 | pg-promise.js:22:11:22:15 | query | pg-promise.js:60:20:60:24 | query | provenance |  |
 | pg-promise.js:22:11:22:15 | query | pg-promise.js:63:23:63:27 | query | provenance |  |
 | pg-promise.js:22:11:22:15 | query | pg-promise.js:64:16:64:20 | query | provenance |  |
+| rds-client.js:8:11:8:19 | userQuery | rds-client.js:17:14:17:22 | userQuery | provenance |  |
+| rds-client.js:8:11:8:19 | userQuery | rds-client.js:33:24:33:32 | userQuery | provenance |  |
+| rds-client.js:8:23:8:30 | req.body | rds-client.js:8:11:8:19 | userQuery | provenance |  |
+| rds-client.js:13:11:13:17 | params1 [sql] | rds-client.js:19:51:19:57 | params1 [sql] | provenance |  |
+| rds-client.js:13:21:18:5 | {\\n      ... y\\n    } [sql] | rds-client.js:13:11:13:17 | params1 [sql] | provenance |  |
+| rds-client.js:17:14:17:22 | userQuery | rds-client.js:13:21:18:5 | {\\n      ... y\\n    } [sql] | provenance |  |
+| rds-client.js:19:51:19:57 | params1 [sql] | rds-client.js:19:23:19:58 | new Exe ... arams1) | provenance |  |
+| rds-client.js:29:11:29:16 | params [sqlStatements] | rds-client.js:36:45:36:50 | params [sqlStatements] | provenance |  |
+| rds-client.js:29:20:34:5 | {\\n      ... y\\n    } [sqlStatements] | rds-client.js:29:11:29:16 | params [sqlStatements] | provenance |  |
+| rds-client.js:33:24:33:32 | userQuery | rds-client.js:29:20:34:5 | {\\n      ... y\\n    } [sqlStatements] | provenance |  |
+| rds-client.js:36:45:36:50 | params [sqlStatements] | rds-client.js:36:23:36:51 | new Exe ... params) | provenance |  |
+| rds-client.js:44:11:44:19 | userQuery | rds-client.js:53:14:53:22 | userQuery | provenance |  |
+| rds-client.js:44:23:44:30 | req.body | rds-client.js:44:11:44:19 | userQuery | provenance |  |
+| rds-client.js:45:11:45:21 | userQueries | rds-client.js:61:24:61:34 | userQueries | provenance |  |
+| rds-client.js:45:25:45:32 | req.body | rds-client.js:45:11:45:21 | userQueries | provenance |  |
+| rds-client.js:61:24:61:34 | userQueries | rds-client.js:61:40:61:42 | sql | provenance |  |
+| rds-client.js:61:40:61:42 | sql | rds-client.js:61:50:61:52 | sql | provenance |  |
 | redis.js:10:16:10:23 | req.body | redis.js:10:16:10:27 | req.body.key | provenance | Config |
-| redis.js:12:9:12:26 | key | redis.js:13:16:13:18 | key | provenance |  |
-| redis.js:12:9:12:26 | key | redis.js:18:16:18:18 | key | provenance |  |
-| redis.js:12:9:12:26 | key | redis.js:19:43:19:45 | key | provenance |  |
-| redis.js:12:9:12:26 | key | redis.js:25:14:25:16 | key | provenance |  |
-| redis.js:12:9:12:26 | key | redis.js:26:14:26:16 | key | provenance |  |
-| redis.js:12:9:12:26 | key | redis.js:32:28:32:30 | key | provenance |  |
+| redis.js:12:9:12:11 | key | redis.js:13:16:13:18 | key | provenance |  |
+| redis.js:12:9:12:11 | key | redis.js:18:16:18:18 | key | provenance |  |
+| redis.js:12:9:12:11 | key | redis.js:19:43:19:45 | key | provenance |  |
+| redis.js:12:9:12:11 | key | redis.js:25:14:25:16 | key | provenance |  |
+| redis.js:12:9:12:11 | key | redis.js:26:14:26:16 | key | provenance |  |
+| redis.js:12:9:12:11 | key | redis.js:32:28:32:30 | key | provenance |  |
 | redis.js:12:15:12:22 | req.body | redis.js:12:15:12:26 | req.body.key | provenance | Config |
-| redis.js:12:15:12:26 | req.body.key | redis.js:12:9:12:26 | key | provenance |  |
+| redis.js:12:15:12:26 | req.body.key | redis.js:12:9:12:11 | key | provenance |  |
 | redis.js:13:16:13:18 | key | redis.js:18:16:18:18 | key | provenance |  |
 | redis.js:18:16:18:18 | key | redis.js:19:43:19:45 | key | provenance |  |
 | redis.js:19:43:19:45 | key | redis.js:25:14:25:16 | key | provenance |  |
 | redis.js:25:14:25:16 | key | redis.js:26:14:26:16 | key | provenance |  |
 | redis.js:26:14:26:16 | key | redis.js:30:23:30:25 | key | provenance |  |
 | redis.js:26:14:26:16 | key | redis.js:32:28:32:30 | key | provenance |  |
-| redis.js:38:11:38:28 | key | redis.js:39:16:39:18 | key | provenance |  |
-| redis.js:38:11:38:28 | key | redis.js:43:27:43:29 | key | provenance |  |
-| redis.js:38:11:38:28 | key | redis.js:46:34:46:36 | key | provenance |  |
+| redis.js:38:11:38:13 | key | redis.js:39:16:39:18 | key | provenance |  |
+| redis.js:38:11:38:13 | key | redis.js:43:27:43:29 | key | provenance |  |
+| redis.js:38:11:38:13 | key | redis.js:46:34:46:36 | key | provenance |  |
 | redis.js:38:17:38:24 | req.body | redis.js:38:17:38:28 | req.body.key | provenance | Config |
-| redis.js:38:17:38:28 | req.body.key | redis.js:38:11:38:28 | key | provenance |  |
+| redis.js:38:17:38:28 | req.body.key | redis.js:38:11:38:13 | key | provenance |  |
 | socketio.js:10:25:10:30 | handle | socketio.js:11:46:11:51 | handle | provenance |  |
 | socketio.js:11:46:11:51 | handle | socketio.js:11:12:11:53 | `INSERT ... andle}` | provenance |  |
 | tst2.js:8:66:8:78 | req.params.id | tst2.js:8:27:8:84 | "select ... d + "'" | provenance |  |
-| tst3.js:7:7:8:55 | query1 | tst3.js:9:14:9:19 | query1 | provenance |  |
-| tst3.js:8:16:8:34 | req.params.category | tst3.js:7:7:8:55 | query1 | provenance |  |
+| tst3.js:7:7:7:12 | query1 | tst3.js:9:14:9:19 | query1 | provenance |  |
+| tst3.js:8:16:8:34 | req.params.category | tst3.js:7:7:7:12 | query1 | provenance |  |
 | tst4.js:8:46:8:60 | $routeParams.id | tst4.js:8:10:8:66 | 'SELECT ... d + '"' | provenance |  |
 | tst.js:10:46:10:58 | req.params.id | tst.js:10:10:10:64 | 'SELECT ... d + '"' | provenance |  |
 nodes
-| graphql.js:8:11:8:28 | id | semmle.label | id |
+| athena.js:9:11:9:19 | userQuery | semmle.label | userQuery |
+| athena.js:9:23:9:30 | req.body | semmle.label | req.body |
+| athena.js:13:11:13:17 | params1 [QueryString] | semmle.label | params1 [QueryString] |
+| athena.js:13:21:17:5 | {   \\n   ... }\\n    } [QueryString] | semmle.label | {   \\n   ... }\\n    } [QueryString] |
+| athena.js:14:22:14:38 | "SQL" + userQuery | semmle.label | "SQL" + userQuery |
+| athena.js:14:30:14:38 | userQuery | semmle.label | userQuery |
+| athena.js:18:11:18:11 | p | semmle.label | p |
+| athena.js:18:15:18:53 | new Sta ... arams1) | semmle.label | new Sta ... arams1) |
+| athena.js:18:46:18:52 | params1 [QueryString] | semmle.label | params1 [QueryString] |
+| athena.js:19:23:19:23 | p | semmle.label | p |
+| athena.js:21:11:21:17 | params2 [QueryString] | semmle.label | params2 [QueryString] |
+| athena.js:21:21:26:5 | {\\n      ... "\\n    } [QueryString] | semmle.label | {\\n      ... "\\n    } [QueryString] |
+| athena.js:24:22:24:30 | userQuery | semmle.label | userQuery |
+| athena.js:27:23:27:58 | new Cre ... arams2) | semmle.label | new Cre ... arams2) |
+| athena.js:27:51:27:57 | params2 [QueryString] | semmle.label | params2 [QueryString] |
+| athena.js:29:11:29:17 | params3 [QueryString] | semmle.label | params3 [QueryString] |
+| athena.js:29:21:35:5 | {\\n      ... "\\n    } [QueryString] | semmle.label | {\\n      ... "\\n    } [QueryString] |
+| athena.js:33:22:33:30 | userQuery | semmle.label | userQuery |
+| athena.js:36:23:36:58 | new Upd ... arams3) | semmle.label | new Upd ... arams3) |
+| athena.js:36:51:36:57 | params3 [QueryString] | semmle.label | params3 [QueryString] |
+| athena.js:43:11:43:19 | userQuery | semmle.label | userQuery |
+| athena.js:43:23:43:30 | req.body | semmle.label | req.body |
+| athena.js:48:22:48:30 | userQuery | semmle.label | userQuery |
+| athena.js:57:22:57:30 | userQuery | semmle.label | userQuery |
+| athena.js:66:22:66:30 | userQuery | semmle.label | userQuery |
+| athena.js:75:11:75:28 | userQueryStatement | semmle.label | userQueryStatement |
+| athena.js:75:32:75:39 | req.body | semmle.label | req.body |
+| athena.js:77:11:77:15 | input [QueryStatement] | semmle.label | input [QueryStatement] |
+| athena.js:77:19:82:5 | {\\n      ... ,\\n    } [QueryStatement] | semmle.label | {\\n      ... ,\\n    } [QueryStatement] |
+| athena.js:80:25:80:42 | userQueryStatement | semmle.label | userQueryStatement |
+| athena.js:83:11:83:17 | command | semmle.label | command |
+| athena.js:83:21:83:61 | new Cre ... (input) | semmle.label | new Cre ... (input) |
+| athena.js:83:56:83:60 | input [QueryStatement] | semmle.label | input [QueryStatement] |
+| athena.js:84:23:84:29 | command | semmle.label | command |
+| clients3.js:10:9:10:22 | maliciousInput | semmle.label | maliciousInput |
+| clients3.js:10:26:10:33 | req.body | semmle.label | req.body |
+| clients3.js:12:11:12:16 | params [Expression] | semmle.label | params [Expression] |
+| clients3.js:12:20:17:5 | {\\n      ... ,\\n    } [Expression] | semmle.label | {\\n      ... ,\\n    } [Expression] |
+| clients3.js:16:21:16:68 | "SELECT ... usInput | semmle.label | "SELECT ... usInput |
+| clients3.js:16:55:16:68 | maliciousInput | semmle.label | maliciousInput |
+| clients3.js:18:23:18:60 | new Sel ... params) | semmle.label | new Sel ... params) |
+| clients3.js:18:54:18:59 | params [Expression] | semmle.label | params [Expression] |
+| clients3.js:23:9:23:22 | maliciousInput | semmle.label | maliciousInput |
+| clients3.js:23:26:23:33 | req.body | semmle.label | req.body |
+| clients3.js:29:21:29:68 | "SELECT ... usInput | semmle.label | "SELECT ... usInput |
+| clients3.js:29:55:29:68 | maliciousInput | semmle.label | maliciousInput |
+| clients3.js:38:21:38:68 | "SELECT ... usInput | semmle.label | "SELECT ... usInput |
+| clients3.js:38:55:38:68 | maliciousInput | semmle.label | maliciousInput |
+| dynamodb.js:9:9:9:22 | maliciousInput | semmle.label | maliciousInput |
+| dynamodb.js:9:26:9:33 | req.body | semmle.label | req.body |
+| dynamodb.js:11:11:11:19 | statement | semmle.label | statement |
+| dynamodb.js:11:64:11:77 | maliciousInput | semmle.label | maliciousInput |
+| dynamodb.js:12:11:12:17 | command | semmle.label | command |
+| dynamodb.js:12:21:14:6 | new Exe ... \\n    }) | semmle.label | new Exe ... \\n    }) |
+| dynamodb.js:12:49:14:5 | {\\n      ... t\\n    } [Statement] | semmle.label | {\\n      ... t\\n    } [Statement] |
+| dynamodb.js:13:20:13:28 | statement | semmle.label | statement |
+| dynamodb.js:15:23:15:29 | command | semmle.label | command |
+| dynamodb.js:17:11:17:25 | updateStatement | semmle.label | updateStatement |
+| dynamodb.js:17:80:17:93 | maliciousInput | semmle.label | maliciousInput |
+| dynamodb.js:18:11:18:23 | updateCommand | semmle.label | updateCommand |
+| dynamodb.js:18:27:20:6 | new Exe ... \\n    }) | semmle.label | new Exe ... \\n    }) |
+| dynamodb.js:18:55:20:5 | {\\n      ... t\\n    } [Statement] | semmle.label | {\\n      ... t\\n    } [Statement] |
+| dynamodb.js:19:20:19:34 | updateStatement | semmle.label | updateStatement |
+| dynamodb.js:21:23:21:35 | updateCommand | semmle.label | updateCommand |
+| dynamodb.js:47:24:47:30 | command | semmle.label | command |
+| dynamodb.js:56:9:56:22 | maliciousInput | semmle.label | maliciousInput |
+| dynamodb.js:56:26:56:33 | req.body | semmle.label | req.body |
+| dynamodb.js:58:20:58:77 | `SELECT ... nput}'` | semmle.label | `SELECT ... nput}'` |
+| dynamodb.js:58:61:58:74 | maliciousInput | semmle.label | maliciousInput |
+| dynamodb.js:64:28:64:85 | `SELECT ... nput}'` | semmle.label | `SELECT ... nput}'` |
+| dynamodb.js:64:69:64:82 | maliciousInput | semmle.label | maliciousInput |
+| dynamodb.js:67:28:67:85 | `SELECT ... nput}'` | semmle.label | `SELECT ... nput}'` |
+| dynamodb.js:67:69:67:82 | maliciousInput | semmle.label | maliciousInput |
+| graphql.js:8:11:8:12 | id | semmle.label | id |
 | graphql.js:8:16:8:28 | req.params.id | semmle.label | req.params.id |
 | graphql.js:9:34:19:5 | `\\n      ... }\\n    ` | semmle.label | `\\n      ... }\\n    ` |
 | graphql.js:11:46:11:47 | id | semmle.label | id |
-| graphql.js:25:11:25:28 | id | semmle.label | id |
+| graphql.js:25:11:25:12 | id | semmle.label | id |
 | graphql.js:25:16:25:28 | req.params.id | semmle.label | req.params.id |
 | graphql.js:26:30:26:40 | `foo ${id}` | semmle.label | `foo ${id}` |
 | graphql.js:26:37:26:38 | id | semmle.label | id |
@@ -530,46 +706,46 @@ nodes
 | graphql.js:29:39:29:40 | id | semmle.label | id |
 | graphql.js:32:18:32:28 | `foo ${id}` | semmle.label | `foo ${id}` |
 | graphql.js:32:25:32:26 | id | semmle.label | id |
-| graphql.js:38:11:38:28 | id | semmle.label | id |
+| graphql.js:38:11:38:12 | id | semmle.label | id |
 | graphql.js:38:16:38:28 | req.params.id | semmle.label | req.params.id |
 | graphql.js:43:14:43:24 | `foo ${id}` | semmle.label | `foo ${id}` |
 | graphql.js:43:21:43:22 | id | semmle.label | id |
 | graphql.js:47:44:47:54 | `foo ${id}` | semmle.label | `foo ${id}` |
 | graphql.js:47:51:47:52 | id | semmle.label | id |
-| graphql.js:54:11:54:28 | id | semmle.label | id |
+| graphql.js:54:11:54:12 | id | semmle.label | id |
 | graphql.js:54:16:54:28 | req.params.id | semmle.label | req.params.id |
 | graphql.js:55:39:55:49 | `foo ${id}` | semmle.label | `foo ${id}` |
 | graphql.js:55:46:55:47 | id | semmle.label | id |
 | graphql.js:57:66:57:76 | `foo ${id}` | semmle.label | `foo ${id}` |
 | graphql.js:57:73:57:74 | id | semmle.label | id |
-| graphql.js:73:9:73:25 | id | semmle.label | id |
+| graphql.js:73:9:73:10 | id | semmle.label | id |
 | graphql.js:73:14:73:25 | req.query.id | semmle.label | req.query.id |
 | graphql.js:74:46:74:64 | "{ foo" + id + " }" | semmle.label | "{ foo" + id + " }" |
 | graphql.js:74:56:74:57 | id | semmle.label | id |
 | graphql.js:82:14:88:8 | `{\\n     ...      }` | semmle.label | `{\\n     ...      }` |
 | graphql.js:86:13:86:14 | id | semmle.label | id |
-| graphql.js:117:11:117:28 | id | semmle.label | id |
+| graphql.js:117:11:117:12 | id | semmle.label | id |
 | graphql.js:117:16:117:28 | req.params.id | semmle.label | req.params.id |
 | graphql.js:118:38:118:48 | `foo ${id}` | semmle.label | `foo ${id}` |
 | graphql.js:118:45:118:46 | id | semmle.label | id |
-| hana.js:9:13:9:42 | maliciousInput | semmle.label | maliciousInput |
+| hana.js:9:13:9:26 | maliciousInput | semmle.label | maliciousInput |
 | hana.js:9:30:9:37 | req.body | semmle.label | req.body |
-| hana.js:10:15:10:80 | query | semmle.label | query |
+| hana.js:10:15:10:19 | query | semmle.label | query |
 | hana.js:10:64:10:77 | maliciousInput | semmle.label | maliciousInput |
 | hana.js:11:19:11:23 | query | semmle.label | query |
-| hana.js:16:15:16:44 | maliciousInput | semmle.label | maliciousInput |
+| hana.js:16:15:16:28 | maliciousInput | semmle.label | maliciousInput |
 | hana.js:16:32:16:39 | req.body | semmle.label | req.body |
 | hana.js:17:35:17:100 | `SELECT ... usInput | semmle.label | `SELECT ... usInput |
 | hana.js:17:87:17:100 | maliciousInput | semmle.label | maliciousInput |
-| hana.js:23:15:23:44 | maliciousInput | semmle.label | maliciousInput |
+| hana.js:23:15:23:28 | maliciousInput | semmle.label | maliciousInput |
 | hana.js:23:32:23:39 | req.body | semmle.label | req.body |
 | hana.js:24:33:24:96 | `INSERT ... usInput | semmle.label | `INSERT ... usInput |
 | hana.js:24:83:24:96 | maliciousInput | semmle.label | maliciousInput |
-| hana.js:30:13:30:42 | maliciousInput | semmle.label | maliciousInput |
+| hana.js:30:13:30:26 | maliciousInput | semmle.label | maliciousInput |
 | hana.js:30:30:30:37 | req.body | semmle.label | req.body |
 | hana.js:31:31:31:97 | "SELECT ... usInput | semmle.label | "SELECT ... usInput |
 | hana.js:31:84:31:97 | maliciousInput | semmle.label | maliciousInput |
-| hana.js:47:7:47:36 | maliciousInput | semmle.label | maliciousInput |
+| hana.js:47:7:47:20 | maliciousInput | semmle.label | maliciousInput |
 | hana.js:47:24:47:31 | req.body | semmle.label | req.body |
 | hana.js:48:15:48:52 | 'SELECT ... usInput | semmle.label | 'SELECT ... usInput |
 | hana.js:48:39:48:52 | maliciousInput | semmle.label | maliciousInput |
@@ -577,7 +753,7 @@ nodes
 | hana.js:50:76:50:89 | maliciousInput | semmle.label | maliciousInput |
 | hana.js:54:38:54:66 | 'PROC_D ... usInput | semmle.label | 'PROC_D ... usInput |
 | hana.js:54:53:54:66 | maliciousInput | semmle.label | maliciousInput |
-| hana.js:68:7:68:36 | maliciousInput | semmle.label | maliciousInput |
+| hana.js:68:7:68:20 | maliciousInput | semmle.label | maliciousInput |
 | hana.js:68:24:68:31 | req.body | semmle.label | req.body |
 | hana.js:71:44:71:99 | "INSERT ... usInput | semmle.label | "INSERT ... usInput |
 | hana.js:71:86:71:99 | maliciousInput | semmle.label | maliciousInput |
@@ -592,23 +768,23 @@ nodes
 | hana.js:84:20:84:78 | 'select ... usInput | semmle.label | 'select ... usInput |
 | hana.js:84:65:84:78 | maliciousInput | semmle.label | maliciousInput |
 | html-sanitizer.js:13:39:13:44 | param1 | semmle.label | param1 |
-| html-sanitizer.js:14:5:14:24 | param1 | semmle.label | param1 |
+| html-sanitizer.js:14:5:14:10 | param1 | semmle.label | param1 |
 | html-sanitizer.js:14:14:14:24 | xss(param1) | semmle.label | xss(param1) |
 | html-sanitizer.js:14:18:14:23 | param1 | semmle.label | param1 |
 | html-sanitizer.js:16:9:16:59 | `SELECT ...  param1 | semmle.label | `SELECT ...  param1 |
 | html-sanitizer.js:16:54:16:59 | param1 | semmle.label | param1 |
-| json-schema-validator.js:25:15:25:48 | query | semmle.label | query |
+| json-schema-validator.js:25:15:25:19 | query | semmle.label | query |
 | json-schema-validator.js:25:23:25:48 | JSON.pa ... y.data) | semmle.label | JSON.pa ... y.data) |
 | json-schema-validator.js:25:34:25:47 | req.query.data | semmle.label | req.query.data |
 | json-schema-validator.js:33:22:33:26 | query | semmle.label | query |
 | json-schema-validator.js:35:18:35:22 | query | semmle.label | query |
-| json-schema-validator.js:50:15:50:48 | query | semmle.label | query |
+| json-schema-validator.js:50:15:50:19 | query | semmle.label | query |
 | json-schema-validator.js:50:23:50:48 | JSON.pa ... y.data) | semmle.label | JSON.pa ... y.data) |
 | json-schema-validator.js:50:34:50:47 | req.query.data | semmle.label | req.query.data |
 | json-schema-validator.js:55:22:55:26 | query | semmle.label | query |
 | json-schema-validator.js:59:22:59:26 | query | semmle.label | query |
 | json-schema-validator.js:61:22:61:26 | query | semmle.label | query |
-| koarouter.js:5:11:5:33 | version | semmle.label | version |
+| koarouter.js:5:13:5:19 | version | semmle.label | version |
 | koarouter.js:5:13:5:19 | version | semmle.label | version |
 | koarouter.js:14:9:14:18 | [post update] conditions [ArrayElement] | semmle.label | [post update] conditions [ArrayElement] |
 | koarouter.js:14:25:14:46 | `versio ... rsion}` | semmle.label | `versio ... rsion}` |
@@ -616,10 +792,10 @@ nodes
 | koarouter.js:17:27:17:77 | `SELECT ... nd ')}` | semmle.label | `SELECT ... nd ')}` |
 | koarouter.js:17:52:17:61 | conditions [ArrayElement] | semmle.label | conditions [ArrayElement] |
 | koarouter.js:17:52:17:75 | conditi ...  and ') | semmle.label | conditi ...  and ') |
-| ldap.js:20:7:20:34 | q | semmle.label | q |
+| ldap.js:20:7:20:7 | q | semmle.label | q |
 | ldap.js:20:11:20:34 | url.par ... , true) | semmle.label | url.par ... , true) |
 | ldap.js:20:21:20:27 | req.url | semmle.label | req.url |
-| ldap.js:22:7:22:33 | username | semmle.label | username |
+| ldap.js:22:7:22:14 | username | semmle.label | username |
 | ldap.js:22:18:22:18 | q | semmle.label | q |
 | ldap.js:25:13:25:57 | `(\|(nam ... ame}))` | semmle.label | `(\|(nam ... ame}))` |
 | ldap.js:25:24:25:31 | username | semmle.label | username |
@@ -629,7 +805,7 @@ nodes
 | ldap.js:32:15:32:59 | `(\|(nam ... ame}))` | semmle.label | `(\|(nam ... ame}))` |
 | ldap.js:32:26:32:33 | username | semmle.label | username |
 | ldap.js:32:48:32:55 | username | semmle.label | username |
-| ldap.js:63:9:65:3 | parsedFilter | semmle.label | parsedFilter |
+| ldap.js:63:9:63:20 | parsedFilter | semmle.label | parsedFilter |
 | ldap.js:63:24:65:3 | ldap.pa ... ))`\\n  ) | semmle.label | ldap.pa ... ))`\\n  ) |
 | ldap.js:64:5:64:49 | `(\|(nam ... ame}))` | semmle.label | `(\|(nam ... ame}))` |
 | ldap.js:64:16:64:23 | username | semmle.label | username |
@@ -638,60 +814,60 @@ nodes
 | ldap.js:66:40:66:51 | parsedFilter | semmle.label | parsedFilter |
 | ldap.js:68:27:68:42 | `cn=${username}` | semmle.label | `cn=${username}` |
 | ldap.js:68:33:68:40 | username | semmle.label | username |
-| marsdb-flow-to.js:10:9:10:18 | query | semmle.label | query |
+| marsdb-flow-to.js:10:9:10:13 | query | semmle.label | query |
 | marsdb-flow-to.js:10:17:10:18 | {} | semmle.label | {} |
 | marsdb-flow-to.js:11:17:11:24 | req.body | semmle.label | req.body |
 | marsdb-flow-to.js:11:17:11:30 | req.body.title | semmle.label | req.body.title |
 | marsdb-flow-to.js:13:17:13:21 | query | semmle.label | query |
-| marsdb.js:12:9:12:18 | query | semmle.label | query |
+| marsdb.js:12:9:12:13 | query | semmle.label | query |
 | marsdb.js:12:17:12:18 | {} | semmle.label | {} |
 | marsdb.js:13:17:13:24 | req.body | semmle.label | req.body |
 | marsdb.js:13:17:13:30 | req.body.title | semmle.label | req.body.title |
 | marsdb.js:15:12:15:16 | query | semmle.label | query |
-| minimongo.js:14:9:14:18 | query | semmle.label | query |
+| minimongo.js:14:9:14:13 | query | semmle.label | query |
 | minimongo.js:14:17:14:18 | {} | semmle.label | {} |
 | minimongo.js:15:17:15:24 | req.body | semmle.label | req.body |
 | minimongo.js:15:17:15:30 | req.body.title | semmle.label | req.body.title |
 | minimongo.js:17:12:17:16 | query | semmle.label | query |
-| mongodb.js:12:11:12:20 | query | semmle.label | query |
+| mongodb.js:12:11:12:15 | query | semmle.label | query |
 | mongodb.js:12:19:12:20 | {} | semmle.label | {} |
 | mongodb.js:13:5:13:9 | query | semmle.label | query |
 | mongodb.js:13:19:13:26 | req.body | semmle.label | req.body |
 | mongodb.js:13:19:13:32 | req.body.title | semmle.label | req.body.title |
 | mongodb.js:17:16:17:20 | query | semmle.label | query |
-| mongodb.js:25:11:25:32 | title | semmle.label | title |
+| mongodb.js:25:11:25:15 | title | semmle.label | title |
 | mongodb.js:25:19:25:26 | req.body | semmle.label | req.body |
 | mongodb.js:25:19:25:32 | req.body.title | semmle.label | req.body.title |
 | mongodb.js:30:18:30:45 | { title ... itle) } | semmle.label | { title ... itle) } |
 | mongodb.js:30:27:30:43 | JSON.parse(title) | semmle.label | JSON.parse(title) |
 | mongodb.js:30:38:30:42 | title | semmle.label | title |
-| mongodb.js:46:11:46:20 | query | semmle.label | query |
+| mongodb.js:46:11:46:15 | query | semmle.label | query |
 | mongodb.js:46:19:46:20 | {} | semmle.label | {} |
 | mongodb.js:47:5:47:9 | query | semmle.label | query |
 | mongodb.js:47:19:47:33 | req.query.title | semmle.label | req.query.title |
 | mongodb.js:51:16:51:20 | query | semmle.label | query |
-| mongodb.js:56:8:56:17 | query | semmle.label | query |
+| mongodb.js:56:8:56:12 | query | semmle.label | query |
 | mongodb.js:56:16:56:17 | {} | semmle.label | {} |
 | mongodb.js:57:2:57:6 | query | semmle.label | query |
 | mongodb.js:57:16:57:30 | req.query.title | semmle.label | req.query.title |
 | mongodb.js:61:12:61:16 | query | semmle.label | query |
-| mongodb.js:66:7:66:25 | tag | semmle.label | tag |
+| mongodb.js:66:7:66:9 | tag | semmle.label | tag |
 | mongodb.js:66:13:66:25 | req.query.tag | semmle.label | req.query.tag |
 | mongodb.js:72:14:72:26 | { tags: tag } | semmle.label | { tags: tag } |
 | mongodb.js:72:22:72:24 | tag | semmle.label | tag |
 | mongodb.js:79:12:79:24 | { tags: tag } | semmle.label | { tags: tag } |
 | mongodb.js:79:20:79:22 | tag | semmle.label | tag |
-| mongodb.js:100:9:100:18 | query | semmle.label | query |
+| mongodb.js:100:9:100:13 | query | semmle.label | query |
 | mongodb.js:100:17:100:18 | {} | semmle.label | {} |
 | mongodb.js:101:3:101:7 | query | semmle.label | query |
 | mongodb.js:101:17:101:29 | queries.title | semmle.label | queries.title |
 | mongodb.js:105:14:105:18 | query | semmle.label | query |
-| mongodb_bodySafe.js:23:11:23:20 | query | semmle.label | query |
+| mongodb_bodySafe.js:23:11:23:15 | query | semmle.label | query |
 | mongodb_bodySafe.js:23:19:23:20 | {} | semmle.label | {} |
 | mongodb_bodySafe.js:24:5:24:9 | query | semmle.label | query |
 | mongodb_bodySafe.js:24:19:24:33 | req.query.title | semmle.label | req.query.title |
 | mongodb_bodySafe.js:28:16:28:20 | query | semmle.label | query |
-| mongoose.js:20:8:20:17 | query | semmle.label | query |
+| mongoose.js:20:8:20:12 | query | semmle.label | query |
 | mongoose.js:20:16:20:17 | {} | semmle.label | {} |
 | mongoose.js:21:2:21:6 | query | semmle.label | query |
 | mongoose.js:21:16:21:23 | req.body | semmle.label | req.body |
@@ -733,9 +909,9 @@ nodes
 | mongoose.js:90:21:90:25 | query | semmle.label | query |
 | mongoose.js:97:14:97:18 | query | semmle.label | query |
 | mongoose.js:99:31:99:35 | query | semmle.label | query |
-| mongoose.js:101:6:101:22 | id | semmle.label | id |
+| mongoose.js:101:6:101:7 | id | semmle.label | id |
 | mongoose.js:101:11:101:22 | req.query.id | semmle.label | req.query.id |
-| mongoose.js:101:25:101:45 | cond | semmle.label | cond |
+| mongoose.js:101:25:101:28 | cond | semmle.label | cond |
 | mongoose.js:101:32:101:45 | req.query.cond | semmle.label | req.query.cond |
 | mongoose.js:102:22:102:25 | cond | semmle.label | cond |
 | mongoose.js:103:21:103:24 | cond | semmle.label | cond |
@@ -755,13 +931,13 @@ nodes
 | mongoose.js:116:23:116:24 | id | semmle.label | id |
 | mongoose.js:119:38:119:42 | query | semmle.label | query |
 | mongoose.js:122:30:122:34 | query | semmle.label | query |
-| mongooseJsonParse.js:19:11:19:20 | query | semmle.label | query |
+| mongooseJsonParse.js:19:11:19:15 | query | semmle.label | query |
 | mongooseJsonParse.js:19:19:19:20 | {} | semmle.label | {} |
 | mongooseJsonParse.js:20:19:20:44 | JSON.pa ... y.data) | semmle.label | JSON.pa ... y.data) |
 | mongooseJsonParse.js:20:19:20:50 | JSON.pa ... ).title | semmle.label | JSON.pa ... ).title |
 | mongooseJsonParse.js:20:30:20:43 | req.query.data | semmle.label | req.query.data |
 | mongooseJsonParse.js:22:19:22:23 | query | semmle.label | query |
-| mongooseModelClient.js:10:7:10:32 | v | semmle.label | v |
+| mongooseModelClient.js:10:7:10:7 | v | semmle.label | v |
 | mongooseModelClient.js:10:11:10:32 | JSON.pa ... body.x) | semmle.label | JSON.pa ... body.x) |
 | mongooseModelClient.js:10:22:10:29 | req.body | semmle.label | req.body |
 | mongooseModelClient.js:10:22:10:31 | req.body.x | semmle.label | req.body.x |
@@ -770,16 +946,16 @@ nodes
 | mongooseModelClient.js:12:16:12:34 | { id: req.body.id } | semmle.label | { id: req.body.id } |
 | mongooseModelClient.js:12:22:12:29 | req.body | semmle.label | req.body |
 | mongooseModelClient.js:12:22:12:32 | req.body.id | semmle.label | req.body.id |
-| mysql.js:6:9:6:31 | temp | semmle.label | temp |
+| mysql.js:6:9:6:12 | temp | semmle.label | temp |
 | mysql.js:6:16:6:31 | req.params.value | semmle.label | req.params.value |
 | mysql.js:15:18:15:65 | 'SELECT ...  + temp | semmle.label | 'SELECT ...  + temp |
 | mysql.js:15:62:15:65 | temp | semmle.label | temp |
 | mysql.js:19:26:19:73 | 'SELECT ...  + temp | semmle.label | 'SELECT ...  + temp |
 | mysql.js:19:70:19:73 | temp | semmle.label | temp |
-| pg-promise-types.ts:7:9:7:28 | taint | semmle.label | taint |
+| pg-promise-types.ts:7:9:7:13 | taint | semmle.label | taint |
 | pg-promise-types.ts:7:17:7:28 | req.params.x | semmle.label | req.params.x |
 | pg-promise-types.ts:8:17:8:21 | taint | semmle.label | taint |
-| pg-promise.js:6:7:7:55 | query | semmle.label | query |
+| pg-promise.js:6:7:6:11 | query | semmle.label | query |
 | pg-promise.js:7:16:7:34 | req.params.category | semmle.label | req.params.category |
 | pg-promise.js:9:10:9:14 | query | semmle.label | query |
 | pg-promise.js:10:11:10:15 | query | semmle.label | query |
@@ -803,9 +979,29 @@ nodes
 | pg-promise.js:60:20:60:24 | query | semmle.label | query |
 | pg-promise.js:63:23:63:27 | query | semmle.label | query |
 | pg-promise.js:64:16:64:20 | query | semmle.label | query |
+| rds-client.js:8:11:8:19 | userQuery | semmle.label | userQuery |
+| rds-client.js:8:23:8:30 | req.body | semmle.label | req.body |
+| rds-client.js:13:11:13:17 | params1 [sql] | semmle.label | params1 [sql] |
+| rds-client.js:13:21:18:5 | {\\n      ... y\\n    } [sql] | semmle.label | {\\n      ... y\\n    } [sql] |
+| rds-client.js:17:14:17:22 | userQuery | semmle.label | userQuery |
+| rds-client.js:19:23:19:58 | new Exe ... arams1) | semmle.label | new Exe ... arams1) |
+| rds-client.js:19:51:19:57 | params1 [sql] | semmle.label | params1 [sql] |
+| rds-client.js:29:11:29:16 | params [sqlStatements] | semmle.label | params [sqlStatements] |
+| rds-client.js:29:20:34:5 | {\\n      ... y\\n    } [sqlStatements] | semmle.label | {\\n      ... y\\n    } [sqlStatements] |
+| rds-client.js:33:24:33:32 | userQuery | semmle.label | userQuery |
+| rds-client.js:36:23:36:51 | new Exe ... params) | semmle.label | new Exe ... params) |
+| rds-client.js:36:45:36:50 | params [sqlStatements] | semmle.label | params [sqlStatements] |
+| rds-client.js:44:11:44:19 | userQuery | semmle.label | userQuery |
+| rds-client.js:44:23:44:30 | req.body | semmle.label | req.body |
+| rds-client.js:45:11:45:21 | userQueries | semmle.label | userQueries |
+| rds-client.js:45:25:45:32 | req.body | semmle.label | req.body |
+| rds-client.js:53:14:53:22 | userQuery | semmle.label | userQuery |
+| rds-client.js:61:24:61:34 | userQueries | semmle.label | userQueries |
+| rds-client.js:61:40:61:42 | sql | semmle.label | sql |
+| rds-client.js:61:50:61:52 | sql | semmle.label | sql |
 | redis.js:10:16:10:23 | req.body | semmle.label | req.body |
 | redis.js:10:16:10:27 | req.body.key | semmle.label | req.body.key |
-| redis.js:12:9:12:26 | key | semmle.label | key |
+| redis.js:12:9:12:11 | key | semmle.label | key |
 | redis.js:12:15:12:22 | req.body | semmle.label | req.body |
 | redis.js:12:15:12:26 | req.body.key | semmle.label | req.body.key |
 | redis.js:13:16:13:18 | key | semmle.label | key |
@@ -815,7 +1011,7 @@ nodes
 | redis.js:26:14:26:16 | key | semmle.label | key |
 | redis.js:30:23:30:25 | key | semmle.label | key |
 | redis.js:32:28:32:30 | key | semmle.label | key |
-| redis.js:38:11:38:28 | key | semmle.label | key |
+| redis.js:38:11:38:13 | key | semmle.label | key |
 | redis.js:38:17:38:24 | req.body | semmle.label | req.body |
 | redis.js:38:17:38:28 | req.body.key | semmle.label | req.body.key |
 | redis.js:39:16:39:18 | key | semmle.label | key |
@@ -826,7 +1022,7 @@ nodes
 | socketio.js:11:46:11:51 | handle | semmle.label | handle |
 | tst2.js:8:27:8:84 | "select ... d + "'" | semmle.label | "select ... d + "'" |
 | tst2.js:8:66:8:78 | req.params.id | semmle.label | req.params.id |
-| tst3.js:7:7:8:55 | query1 | semmle.label | query1 |
+| tst3.js:7:7:7:12 | query1 | semmle.label | query1 |
 | tst3.js:8:16:8:34 | req.params.category | semmle.label | req.params.category |
 | tst3.js:9:14:9:19 | query1 | semmle.label | query1 |
 | tst4.js:8:10:8:66 | 'SELECT ... d + '"' | semmle.label | 'SELECT ... d + '"' |
diff --git a/javascript/ql/test/query-tests/Security/CWE-089/untyped/athena.js b/javascript/ql/test/query-tests/Security/CWE-089/untyped/athena.js
new file mode 100644
index 00000000000..a671fdc5356
--- /dev/null
+++ b/javascript/ql/test/query-tests/Security/CWE-089/untyped/athena.js
@@ -0,0 +1,85 @@
+const { AthenaClient, StartQueryExecutionCommand, CreateNamedQueryCommand, UpdateNamedQueryCommand, CreatePreparedStatementCommand } = require("@aws-sdk/client-athena");
+const AWS = require('aws-sdk');
+const express = require('express');
+const bodyParser = require('body-parser');
+const app = express();
+app.use(bodyParser.json());
+
+app.post('/v3/athena/all', async (req, res) => {
+    const userQuery = req.body.query; // $ Source
+
+    const client = new AthenaClient({ region: "us-east-1" });
+
+    const params1 = {   
+        QueryString: "SQL" + userQuery,
+        QueryExecutionContext: { Database: "default" },
+        ResultConfiguration: { OutputLocation: "s3://my-results/" }
+    };
+    const p = new StartQueryExecutionCommand(params1);
+    await client.send(p); // $ Alert
+
+    const params2 = {
+        Name: "user_query",
+        Database: "default",
+        QueryString: userQuery,
+        Description: "User-provided query"
+    };
+    await client.send(new CreateNamedQueryCommand(params2)); // $ Alert -- This only stores query to database, not executed
+
+    const params3 = {
+        NamedQueryId: "namedQueryId",
+        Name: "user_query_updated",
+        Database: "default",
+        QueryString: userQuery,
+        Description: "Updated user-provided query"
+    };
+    await client.send(new UpdateNamedQueryCommand(params3)); // $ Alert -- This only stores query to database, not executed
+
+    res.end();
+});
+
+
+app.post('/v2/athena/all', async (req, res) => {
+    const userQuery = req.body.query; // $ Source
+
+    const athena = new AWS.Athena({ region: "us-east-1" });
+
+    const params1 = {
+        QueryString: userQuery,  // $ Alert
+        QueryExecutionContext: { Database: "default" },
+        ResultConfiguration: { OutputLocation: "s3://my-results/" }
+    };
+    await athena.startQueryExecution(params1).promise();
+
+    const params2 = {
+        Name: "user_query",
+        Database: "default",
+        QueryString: userQuery, // $ Alert -- This only stores query to database, not executed
+        Description: "User-provided query"
+    };
+    await athena.createNamedQuery(params2).promise();
+
+    const params3 = {
+        NamedQueryId: "namedQueryId",
+        Name: "user_query_updated",
+        Database: "default",
+        QueryString: userQuery, // $ Alert -- This only stores query to database, not executed
+        Description: "Updated user-provided query"
+    };
+    await athena.updateNamedQuery(params3).promise();
+
+    res.end();
+});
+
+app.post('/dynamodb-v3', async (req, res) => {
+    const userQueryStatement = req.body.query; // $ Source
+    const client = new AthenaClient({ region: "us-east-1" });
+    const input = {
+        StatementName: "STRING_VALUE",
+        WorkGroup: "STRING_VALUE",
+        QueryStatement: userQueryStatement,
+        Description: "STRING_VALUE",
+    };
+    const command = new CreatePreparedStatementCommand(input);
+    await client.send(command); // $ Alert
+});
diff --git a/javascript/ql/test/query-tests/Security/CWE-089/untyped/clients3.js b/javascript/ql/test/query-tests/Security/CWE-089/untyped/clients3.js
new file mode 100644
index 00000000000..9c6bce42657
--- /dev/null
+++ b/javascript/ql/test/query-tests/Security/CWE-089/untyped/clients3.js
@@ -0,0 +1,44 @@
+const { S3Client, SelectObjectContentCommand } = require("@aws-sdk/client-s3");
+const AWS = require('aws-sdk');
+const express = require('express');
+const bodyParser = require('body-parser');
+
+const app = express();
+app.use(bodyParser.json());
+
+app.post('/client/v3/execute', async (req, res) => {
+    let maliciousInput = req.body.filter; // $ Source
+    const client = new S3Client({ region: "us-east-1" });
+    const params = {
+        Bucket: "my-bucket",
+        Key: "data.csv",
+        ExpressionType: "SQL",
+        Expression: "SELECT * FROM S3Object WHERE " + maliciousInput,
+    };
+    await client.send(new SelectObjectContentCommand(params)); // $ Alert
+    res.end();
+});
+
+app.post('/client/v2/execute', async (req, res) => {
+    let maliciousInput = req.body.filter; // $ Source
+    const s3 = new AWS.S3({ region: "us-east-1" });
+    const params = {
+        Bucket: "my-bucket",
+        Key: "data.csv",
+        ExpressionType: "SQL",
+        Expression: "SELECT * FROM S3Object WHERE " + maliciousInput, // $ Alert
+    };
+    await s3.selectObjectContent(params).promise();
+    res.end();
+
+    const params1 = {
+        Bucket: "my-bucket",
+        Key: "data.csv",
+        ExpressionType: "SQL",
+        Expression: "SELECT * FROM S3Object WHERE " + maliciousInput, // $ Alert
+    };
+
+    s3.selectObjectContent(params1, (err, data) => {
+        res.end();
+    });
+});
diff --git a/javascript/ql/test/query-tests/Security/CWE-089/untyped/dynamodb.js b/javascript/ql/test/query-tests/Security/CWE-089/untyped/dynamodb.js
new file mode 100644
index 00000000000..ef9e3c3005c
--- /dev/null
+++ b/javascript/ql/test/query-tests/Security/CWE-089/untyped/dynamodb.js
@@ -0,0 +1,73 @@
+import {DynamoDBClient, ExecuteStatementCommand, BatchExecuteStatementCommand, DynamoDB} from "@aws-sdk/client-dynamodb";
+const express = require('express');
+
+const app = express();
+const region = 'us-east-1';
+
+app.post('/partiql/v3/execute', async (req, res) => {
+    const client = new DynamoDBClient({});
+    let maliciousInput = req.body.data; // $ Source
+
+    const statement = `SELECT * FROM Users WHERE username = '${maliciousInput}'`;
+    const command = new ExecuteStatementCommand({
+        Statement: statement
+    });
+    await client.send(command); // $ Alert
+
+    const updateStatement = "UPDATE Users SET status = 'active' WHERE id = " + maliciousInput;
+    const updateCommand = new ExecuteStatementCommand({
+        Statement: updateStatement
+    });
+    await client.send(updateCommand); // $ Alert
+
+
+    const batchInput = {
+        Statements: [{
+                Statement: `SELECT * FROM Users WHERE username = '${maliciousInput}'`
+            },
+            {
+                Statement: "UPDATE Users SET role = 'user' WHERE username = bob"
+            }
+        ]
+    };
+
+    const batchCommand = new BatchExecuteStatementCommand(batchInput);
+    await client.send(batchCommand); // $ MISSING: Alert
+
+    const batchInput2 = {
+        Statements: maliciousInput.map(input => ({
+            Statement: `SELECT * FROM SensitiveData WHERE username = '${input}'`
+        }))
+    };
+
+    const batchCommand2 = new BatchExecuteStatementCommand(batchInput2);
+    await client.send(batchCommand2); // $ MISSING: Alert
+
+    const client2 = new DynamoDB({});
+    await client2.send(command); // $ Alert
+    await client2.send(batchCommand); // $ MISSING: Alert
+});
+
+app.post('/partiql/v2/execute', async (req, res) => {
+    const AWS = require('aws-sdk');
+    const dynamodb = new AWS.DynamoDB({
+        region: 'us-east-1'
+    });
+    let maliciousInput = req.body.data; // $ Source
+    const params = {
+        Statement: `SELECT * FROM Users WHERE username = '${maliciousInput}'`  // $ Alert
+    };
+
+    dynamodb.executeStatement(params, function(err, data) {});
+    const params2 = {
+        Statements: [{
+                Statement: `SELECT * FROM Users WHERE username = '${maliciousInput}'`  // $ Alert
+            },
+            {
+                Statement: `SELECT * FROM Users WHERE username = '${maliciousInput}'` // $ Alert
+            }
+        ]
+    };
+
+    dynamodb.batchExecuteStatement(params2, function(err, data) {});
+});
diff --git a/javascript/ql/test/query-tests/Security/CWE-089/untyped/rds-client.js b/javascript/ql/test/query-tests/Security/CWE-089/untyped/rds-client.js
new file mode 100644
index 00000000000..35d41e145f9
--- /dev/null
+++ b/javascript/ql/test/query-tests/Security/CWE-089/untyped/rds-client.js
@@ -0,0 +1,68 @@
+const { RDSDataClient, BatchExecuteStatementCommand, ExecuteStatementCommand, ExecuteSqlCommand } = require("@aws-sdk/client-rds-data");
+const express = require('express');
+const bodyParser = require('body-parser');
+const app = express();
+app.use(bodyParser.json());
+
+app.post('/v3/rds/all', async (req, res) => {
+    const userQuery = req.body.query; // $ Source
+    const userQueries = req.body.queries; // $ MISSING: Source
+
+    const client = new RDSDataClient({ region: "us-east-1" });
+
+    const params1 = {
+        resourceArn: "arn:aws:rds:us-east-1:123456789012:cluster:my-aurora-cluster",
+        secretArn: "arn:aws:secretsmanager:us-east-1:123456789012:secret:my-secret",
+        database: "userDatabase",
+        sql: userQuery
+    };
+    await client.send(new ExecuteStatementCommand(params1)); // $ Alert
+
+    const params2 = {
+        resourceArn: "arn:aws:rds:us-east-1:123456789012:cluster:my-aurora-cluster",
+        secretArn: "arn:aws:secretsmanager:us-east-1:123456789012:secret:my-secret",
+        database: "userDatabase",
+        parameterSets: userQueries.map(sql => ({ sql }))
+    };
+    await client.send(new BatchExecuteStatementCommand(params2)); // $ MISSING: Alert
+
+    const params = {
+        resourceArn: "...",
+        secretArn: "...",
+        database: "userDatabase",
+        sqlStatements: userQuery
+    };
+
+    await client.send(new ExecuteSqlCommand(params)); // $ Alert
+
+    res.end();
+});
+
+const AWS = require('aws-sdk');
+
+app.post('/v2/rds/all', async (req, res) => {
+    const userQuery = req.body.query; // $ Source
+    const userQueries = req.body.queries; // $ Source
+
+    const rdsData = new AWS.RDSDataService({ region: "us-east-1" });
+
+    const params1 = {
+        resourceArn: "arn:aws:rds:us-east-1:123456789012:cluster:my-aurora-cluster",
+        secretArn: "arn:aws:secretsmanager:us-east-1:123456789012:secret:my-secret",
+        database: "userDatabase",
+        sql: userQuery // $ Alert
+    };
+    await rdsData.executeStatement(params1).promise();
+
+    const params2 = {
+        resourceArn: "arn:aws:rds:us-east-1:123456789012:cluster:my-aurora-cluster",
+        secretArn: "arn:aws:secretsmanager:us-east-1:123456789012:secret:my-secret",
+        database: "userDatabase",
+        parameterSets: userQueries.map(sql => ({ sql })) // $ Alert
+    };
+    await rdsData.batchExecuteStatement(params2).promise();
+
+    res.end();
+});
+
+app.listen(3000);
diff --git a/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/CodeInjection.expected b/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/CodeInjection.expected
index 412f0a5c5fa..fb3e4ad6e6a 100644
--- a/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/CodeInjection.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/CodeInjection.expected
@@ -61,6 +61,9 @@
 | fastify.js:107:23:107:31 | userInput | fastify.js:106:21:106:38 | request.query.code | fastify.js:107:23:107:31 | userInput | This code execution depends on a $@. | fastify.js:106:21:106:38 | request.query.code | user-provided value |
 | fastify.js:108:28:108:50 | reply.l ... tedCode | fastify.js:94:29:94:41 | request.query | fastify.js:108:28:108:50 | reply.l ... tedCode | This code execution depends on a $@. | fastify.js:94:29:94:41 | request.query | user-provided value |
 | fastify.js:108:28:108:50 | reply.l ... tedCode | fastify.js:94:29:94:51 | request ... plyCode | fastify.js:108:28:108:50 | reply.l ... tedCode | This code execution depends on a $@. | fastify.js:94:29:94:51 | request ... plyCode | user-provided value |
+| graph-ql.js:20:19:20:22 | expr | graph-ql.js:28:32:28:39 | req.body | graph-ql.js:20:19:20:22 | expr | This code execution depends on a $@. | graph-ql.js:28:32:28:39 | req.body | user-provided value |
+| graph-ql.js:39:19:39:30 | name + title | graph-ql.js:28:32:28:39 | req.body | graph-ql.js:39:19:39:30 | name + title | This code execution depends on a $@. | graph-ql.js:28:32:28:39 | req.body | user-provided value |
+| graph-ql.js:66:23:66:27 | value | graph-ql.js:65:22:65:30 | { value } | graph-ql.js:66:23:66:27 | value | This code execution depends on a $@. | graph-ql.js:65:22:65:30 | { value } | user-provided value |
 | module.js:9:16:9:29 | req.query.code | module.js:9:16:9:29 | req.query.code | module.js:9:16:9:29 | req.query.code | This code execution depends on a $@. | module.js:9:16:9:29 | req.query.code | user-provided value |
 | module.js:11:17:11:30 | req.query.code | module.js:11:17:11:30 | req.query.code | module.js:11:17:11:30 | req.query.code | This code execution depends on a $@. | module.js:11:17:11:30 | req.query.code | user-provided value |
 | react-native.js:8:32:8:38 | tainted | react-native.js:7:17:7:33 | req.param("code") | react-native.js:8:32:8:38 | tainted | This code execution depends on a $@. | react-native.js:7:17:7:33 | req.param("code") | user-provided value |
@@ -105,45 +108,45 @@ edges
 | express.js:6:44:6:62 | req.param("wobble") | express.js:6:24:6:69 | "return ...  + "];" | provenance |  |
 | express.js:7:54:7:72 | req.param("wobble") | express.js:7:34:7:79 | "return ...  + "];" | provenance |  |
 | express.js:9:28:9:46 | req.param("wobble") | express.js:9:8:9:53 | "return ...  + "];" | provenance |  |
-| express.js:19:9:19:35 | taint | express.js:20:34:20:38 | taint | provenance |  |
-| express.js:19:17:19:35 | req.param("wobble") | express.js:19:9:19:35 | taint | provenance |  |
-| express.js:27:9:27:35 | taint | express.js:36:15:36:19 | taint | provenance |  |
-| express.js:27:17:27:35 | req.param("wobble") | express.js:27:9:27:35 | taint | provenance |  |
+| express.js:19:9:19:13 | taint | express.js:20:34:20:38 | taint | provenance |  |
+| express.js:19:17:19:35 | req.param("wobble") | express.js:19:9:19:13 | taint | provenance |  |
+| express.js:27:9:27:13 | taint | express.js:36:15:36:19 | taint | provenance |  |
+| express.js:27:17:27:35 | req.param("wobble") | express.js:27:9:27:13 | taint | provenance |  |
 | express.js:42:30:42:32 | msg | express.js:43:10:43:12 | msg | provenance |  |
-| fastify.js:4:9:4:43 | userInput | fastify.js:5:44:5:52 | userInput | provenance |  |
-| fastify.js:4:21:4:33 | request.query | fastify.js:4:9:4:43 | userInput | provenance |  |
-| fastify.js:4:21:4:43 | request ... Request | fastify.js:4:9:4:43 | userInput | provenance |  |
-| fastify.js:9:9:9:40 | userInput | fastify.js:10:44:10:52 | userInput | provenance |  |
-| fastify.js:9:21:9:33 | request.query | fastify.js:9:9:9:40 | userInput | provenance |  |
-| fastify.js:9:21:9:40 | request.query.onSend | fastify.js:9:9:9:40 | userInput | provenance |  |
-| fastify.js:15:9:15:44 | userInput | fastify.js:16:44:16:52 | userInput | provenance |  |
-| fastify.js:15:21:15:33 | request.query | fastify.js:15:9:15:44 | userInput | provenance |  |
-| fastify.js:15:21:15:44 | request ... Parsing | fastify.js:15:9:15:44 | userInput | provenance |  |
-| fastify.js:21:9:21:47 | userInput | fastify.js:22:44:22:52 | userInput | provenance |  |
-| fastify.js:21:21:21:33 | request.query | fastify.js:21:9:21:47 | userInput | provenance |  |
-| fastify.js:21:21:21:47 | request ... idation | fastify.js:21:9:21:47 | userInput | provenance |  |
-| fastify.js:26:9:26:44 | userInput | fastify.js:27:44:27:52 | userInput | provenance |  |
-| fastify.js:26:21:26:33 | request.query | fastify.js:26:9:26:44 | userInput | provenance |  |
-| fastify.js:26:21:26:44 | request ... Handler | fastify.js:26:9:26:44 | userInput | provenance |  |
-| fastify.js:31:9:31:50 | userInput | fastify.js:32:44:32:52 | userInput | provenance |  |
-| fastify.js:31:21:31:33 | request.query | fastify.js:31:9:31:50 | userInput | provenance |  |
-| fastify.js:31:21:31:50 | request ... ization | fastify.js:31:9:31:50 | userInput | provenance |  |
-| fastify.js:37:9:37:44 | userInput | fastify.js:38:44:38:52 | userInput | provenance |  |
-| fastify.js:37:21:37:33 | request.query | fastify.js:37:9:37:44 | userInput | provenance |  |
-| fastify.js:37:21:37:44 | request ... esponse | fastify.js:37:9:37:44 | userInput | provenance |  |
-| fastify.js:42:9:42:41 | userInput | fastify.js:43:44:43:52 | userInput | provenance |  |
-| fastify.js:42:21:42:33 | request.query | fastify.js:42:9:42:41 | userInput | provenance |  |
-| fastify.js:42:21:42:41 | request ... onError | fastify.js:42:9:42:41 | userInput | provenance |  |
-| fastify.js:47:9:47:43 | userInput | fastify.js:48:44:48:52 | userInput | provenance |  |
-| fastify.js:47:21:47:33 | request.query | fastify.js:47:9:47:43 | userInput | provenance |  |
-| fastify.js:47:21:47:43 | request ... Timeout | fastify.js:47:9:47:43 | userInput | provenance |  |
-| fastify.js:52:11:52:50 | userInput | fastify.js:53:46:53:54 | userInput | provenance |  |
-| fastify.js:52:23:52:35 | request.query | fastify.js:52:11:52:50 | userInput | provenance |  |
-| fastify.js:52:23:52:50 | request ... stAbort | fastify.js:52:11:52:50 | userInput | provenance |  |
-| fastify.js:57:9:57:39 | userInput | fastify.js:58:44:58:52 | userInput | provenance |  |
-| fastify.js:57:9:57:39 | userInput | fastify.js:59:23:59:31 | userInput | provenance |  |
-| fastify.js:57:21:57:33 | request.query | fastify.js:57:9:57:39 | userInput | provenance |  |
-| fastify.js:57:21:57:39 | request.query.input | fastify.js:57:9:57:39 | userInput | provenance |  |
+| fastify.js:4:9:4:17 | userInput | fastify.js:5:44:5:52 | userInput | provenance |  |
+| fastify.js:4:21:4:33 | request.query | fastify.js:4:9:4:17 | userInput | provenance |  |
+| fastify.js:4:21:4:43 | request ... Request | fastify.js:4:9:4:17 | userInput | provenance |  |
+| fastify.js:9:9:9:17 | userInput | fastify.js:10:44:10:52 | userInput | provenance |  |
+| fastify.js:9:21:9:33 | request.query | fastify.js:9:9:9:17 | userInput | provenance |  |
+| fastify.js:9:21:9:40 | request.query.onSend | fastify.js:9:9:9:17 | userInput | provenance |  |
+| fastify.js:15:9:15:17 | userInput | fastify.js:16:44:16:52 | userInput | provenance |  |
+| fastify.js:15:21:15:33 | request.query | fastify.js:15:9:15:17 | userInput | provenance |  |
+| fastify.js:15:21:15:44 | request ... Parsing | fastify.js:15:9:15:17 | userInput | provenance |  |
+| fastify.js:21:9:21:17 | userInput | fastify.js:22:44:22:52 | userInput | provenance |  |
+| fastify.js:21:21:21:33 | request.query | fastify.js:21:9:21:17 | userInput | provenance |  |
+| fastify.js:21:21:21:47 | request ... idation | fastify.js:21:9:21:17 | userInput | provenance |  |
+| fastify.js:26:9:26:17 | userInput | fastify.js:27:44:27:52 | userInput | provenance |  |
+| fastify.js:26:21:26:33 | request.query | fastify.js:26:9:26:17 | userInput | provenance |  |
+| fastify.js:26:21:26:44 | request ... Handler | fastify.js:26:9:26:17 | userInput | provenance |  |
+| fastify.js:31:9:31:17 | userInput | fastify.js:32:44:32:52 | userInput | provenance |  |
+| fastify.js:31:21:31:33 | request.query | fastify.js:31:9:31:17 | userInput | provenance |  |
+| fastify.js:31:21:31:50 | request ... ization | fastify.js:31:9:31:17 | userInput | provenance |  |
+| fastify.js:37:9:37:17 | userInput | fastify.js:38:44:38:52 | userInput | provenance |  |
+| fastify.js:37:21:37:33 | request.query | fastify.js:37:9:37:17 | userInput | provenance |  |
+| fastify.js:37:21:37:44 | request ... esponse | fastify.js:37:9:37:17 | userInput | provenance |  |
+| fastify.js:42:9:42:17 | userInput | fastify.js:43:44:43:52 | userInput | provenance |  |
+| fastify.js:42:21:42:33 | request.query | fastify.js:42:9:42:17 | userInput | provenance |  |
+| fastify.js:42:21:42:41 | request ... onError | fastify.js:42:9:42:17 | userInput | provenance |  |
+| fastify.js:47:9:47:17 | userInput | fastify.js:48:44:48:52 | userInput | provenance |  |
+| fastify.js:47:21:47:33 | request.query | fastify.js:47:9:47:17 | userInput | provenance |  |
+| fastify.js:47:21:47:43 | request ... Timeout | fastify.js:47:9:47:17 | userInput | provenance |  |
+| fastify.js:52:11:52:19 | userInput | fastify.js:53:46:53:54 | userInput | provenance |  |
+| fastify.js:52:23:52:35 | request.query | fastify.js:52:11:52:19 | userInput | provenance |  |
+| fastify.js:52:23:52:50 | request ... stAbort | fastify.js:52:11:52:19 | userInput | provenance |  |
+| fastify.js:57:9:57:17 | userInput | fastify.js:58:44:58:52 | userInput | provenance |  |
+| fastify.js:57:9:57:17 | userInput | fastify.js:59:23:59:31 | userInput | provenance |  |
+| fastify.js:57:21:57:33 | request.query | fastify.js:57:9:57:17 | userInput | provenance |  |
+| fastify.js:57:21:57:39 | request.query.input | fastify.js:57:9:57:17 | userInput | provenance |  |
 | fastify.js:66:24:66:36 | request.query | fastify.js:66:24:66:47 | request ... redCode | provenance |  |
 | fastify.js:66:24:66:47 | request ... redCode | fastify.js:71:34:71:51 | request.storedCode | provenance |  |
 | fastify.js:79:20:79:32 | request.query | fastify.js:79:20:79:42 | request ... plyCode | provenance |  |
@@ -151,44 +154,63 @@ edges
 | fastify.js:94:29:94:41 | request.query | fastify.js:94:29:94:51 | request ... plyCode | provenance |  |
 | fastify.js:94:29:94:51 | request ... plyCode | fastify.js:99:30:99:52 | reply.l ... tedCode | provenance |  |
 | fastify.js:94:29:94:51 | request ... plyCode | fastify.js:108:28:108:50 | reply.l ... tedCode | provenance |  |
-| fastify.js:106:9:106:38 | userInput | fastify.js:107:23:107:31 | userInput | provenance |  |
-| fastify.js:106:21:106:33 | request.query | fastify.js:106:9:106:38 | userInput | provenance |  |
-| fastify.js:106:21:106:38 | request.query.code | fastify.js:106:9:106:38 | userInput | provenance |  |
-| react-native.js:7:7:7:33 | tainted | react-native.js:8:32:8:38 | tainted | provenance |  |
-| react-native.js:7:7:7:33 | tainted | react-native.js:10:23:10:29 | tainted | provenance |  |
-| react-native.js:7:17:7:33 | req.param("code") | react-native.js:7:7:7:33 | tainted | provenance |  |
+| fastify.js:106:9:106:17 | userInput | fastify.js:107:23:107:31 | userInput | provenance |  |
+| fastify.js:106:21:106:33 | request.query | fastify.js:106:9:106:17 | userInput | provenance |  |
+| fastify.js:106:21:106:38 | request.query.code | fastify.js:106:9:106:17 | userInput | provenance |  |
+| graph-ql.js:18:10:18:17 | { expr } | graph-ql.js:18:12:18:15 | expr | provenance |  |
+| graph-ql.js:18:12:18:15 | expr | graph-ql.js:20:19:20:22 | expr | provenance |  |
+| graph-ql.js:28:9:28:28 | { query, variables } | graph-ql.js:28:11:28:15 | query | provenance |  |
+| graph-ql.js:28:9:28:28 | { query, variables } | graph-ql.js:28:18:28:26 | variables | provenance |  |
+| graph-ql.js:28:11:28:15 | query | graph-ql.js:31:13:31:17 | query | provenance |  |
+| graph-ql.js:28:18:28:26 | variables | graph-ql.js:33:21:33:29 | variables | provenance |  |
+| graph-ql.js:28:18:28:26 | variables | graph-ql.js:54:21:54:29 | variables | provenance |  |
+| graph-ql.js:28:32:28:39 | req.body | graph-ql.js:28:9:28:28 | { query, variables } | provenance |  |
+| graph-ql.js:31:13:31:17 | query | graph-ql.js:18:10:18:17 | { expr } | provenance |  |
+| graph-ql.js:33:21:33:29 | variables | graph-ql.js:18:10:18:17 | { expr } | provenance |  |
+| graph-ql.js:38:13:38:27 | { name, title } | graph-ql.js:38:15:38:18 | name | provenance |  |
+| graph-ql.js:38:13:38:27 | { name, title } | graph-ql.js:38:21:38:25 | title | provenance |  |
+| graph-ql.js:38:15:38:18 | name | graph-ql.js:39:19:39:22 | name | provenance |  |
+| graph-ql.js:38:21:38:25 | title | graph-ql.js:39:26:39:30 | title | provenance |  |
+| graph-ql.js:39:19:39:22 | name | graph-ql.js:39:19:39:30 | name + title | provenance |  |
+| graph-ql.js:39:26:39:30 | title | graph-ql.js:39:19:39:30 | name + title | provenance |  |
+| graph-ql.js:54:21:54:29 | variables | graph-ql.js:38:13:38:27 | { name, title } | provenance |  |
+| graph-ql.js:65:22:65:30 | { value } | graph-ql.js:65:24:65:28 | value | provenance |  |
+| graph-ql.js:65:24:65:28 | value | graph-ql.js:66:23:66:27 | value | provenance |  |
+| react-native.js:7:7:7:13 | tainted | react-native.js:8:32:8:38 | tainted | provenance |  |
+| react-native.js:7:7:7:13 | tainted | react-native.js:10:23:10:29 | tainted | provenance |  |
+| react-native.js:7:17:7:33 | req.param("code") | react-native.js:7:7:7:13 | tainted | provenance |  |
 | react-server-function.js:3:35:3:35 | x | react-server-function.js:4:12:4:12 | x | provenance |  |
 | react-server-function.js:4:12:4:12 | x | react-server-function.js:4:12:4:29 | x + " from server" | provenance |  |
 | react-server-function.js:4:12:4:29 | x + " from server" | react.js:24:20:24:44 | echoSer ... value") [PromiseValue] | provenance |  |
-| react.js:24:9:24:45 | data | react.js:25:8:25:11 | data | provenance |  |
-| react.js:24:16:24:45 | use(ech ... alue")) | react.js:24:9:24:45 | data | provenance |  |
+| react.js:24:9:24:12 | data | react.js:25:8:25:11 | data | provenance |  |
+| react.js:24:16:24:45 | use(ech ... alue")) | react.js:24:9:24:12 | data | provenance |  |
 | react.js:24:20:24:44 | echoSer ... value") [PromiseValue] | react.js:24:16:24:45 | use(ech ... alue")) | provenance |  |
-| template-sinks.js:18:9:18:31 | tainted | template-sinks.js:20:17:20:23 | tainted | provenance |  |
-| template-sinks.js:18:9:18:31 | tainted | template-sinks.js:21:16:21:22 | tainted | provenance |  |
-| template-sinks.js:18:9:18:31 | tainted | template-sinks.js:22:18:22:24 | tainted | provenance |  |
-| template-sinks.js:18:9:18:31 | tainted | template-sinks.js:23:17:23:23 | tainted | provenance |  |
-| template-sinks.js:18:9:18:31 | tainted | template-sinks.js:24:18:24:24 | tainted | provenance |  |
-| template-sinks.js:18:9:18:31 | tainted | template-sinks.js:25:16:25:22 | tainted | provenance |  |
-| template-sinks.js:18:9:18:31 | tainted | template-sinks.js:26:27:26:33 | tainted | provenance |  |
-| template-sinks.js:18:9:18:31 | tainted | template-sinks.js:27:21:27:27 | tainted | provenance |  |
-| template-sinks.js:18:9:18:31 | tainted | template-sinks.js:28:17:28:23 | tainted | provenance |  |
-| template-sinks.js:18:9:18:31 | tainted | template-sinks.js:29:24:29:30 | tainted | provenance |  |
-| template-sinks.js:18:9:18:31 | tainted | template-sinks.js:30:21:30:27 | tainted | provenance |  |
-| template-sinks.js:18:9:18:31 | tainted | template-sinks.js:31:19:31:25 | tainted | provenance |  |
-| template-sinks.js:18:9:18:31 | tainted | template-sinks.js:32:16:32:22 | tainted | provenance |  |
-| template-sinks.js:18:9:18:31 | tainted | template-sinks.js:33:17:33:23 | tainted | provenance |  |
-| template-sinks.js:18:19:18:31 | req.query.foo | template-sinks.js:18:9:18:31 | tainted | provenance |  |
+| template-sinks.js:18:9:18:15 | tainted | template-sinks.js:20:17:20:23 | tainted | provenance |  |
+| template-sinks.js:18:9:18:15 | tainted | template-sinks.js:21:16:21:22 | tainted | provenance |  |
+| template-sinks.js:18:9:18:15 | tainted | template-sinks.js:22:18:22:24 | tainted | provenance |  |
+| template-sinks.js:18:9:18:15 | tainted | template-sinks.js:23:17:23:23 | tainted | provenance |  |
+| template-sinks.js:18:9:18:15 | tainted | template-sinks.js:24:18:24:24 | tainted | provenance |  |
+| template-sinks.js:18:9:18:15 | tainted | template-sinks.js:25:16:25:22 | tainted | provenance |  |
+| template-sinks.js:18:9:18:15 | tainted | template-sinks.js:26:27:26:33 | tainted | provenance |  |
+| template-sinks.js:18:9:18:15 | tainted | template-sinks.js:27:21:27:27 | tainted | provenance |  |
+| template-sinks.js:18:9:18:15 | tainted | template-sinks.js:28:17:28:23 | tainted | provenance |  |
+| template-sinks.js:18:9:18:15 | tainted | template-sinks.js:29:24:29:30 | tainted | provenance |  |
+| template-sinks.js:18:9:18:15 | tainted | template-sinks.js:30:21:30:27 | tainted | provenance |  |
+| template-sinks.js:18:9:18:15 | tainted | template-sinks.js:31:19:31:25 | tainted | provenance |  |
+| template-sinks.js:18:9:18:15 | tainted | template-sinks.js:32:16:32:22 | tainted | provenance |  |
+| template-sinks.js:18:9:18:15 | tainted | template-sinks.js:33:17:33:23 | tainted | provenance |  |
+| template-sinks.js:18:19:18:31 | req.query.foo | template-sinks.js:18:9:18:15 | tainted | provenance |  |
 | tst.js:1:6:1:27 | documen ... on.href | tst.js:1:6:1:83 | documen ... t=")+8) | provenance |  |
 | tst.js:11:10:11:33 | documen ... .search | tst.js:11:10:11:74 | documen ... , "$1") | provenance |  |
 | tst.js:17:11:17:32 | documen ... on.hash | tst.js:17:11:17:45 | documen ... ring(1) | provenance |  |
 | tst.js:17:11:17:45 | documen ... ring(1) | tst.js:17:6:17:46 | atob(do ... ing(1)) | provenance |  |
 | tst.js:19:26:19:40 | location.search | tst.js:19:26:19:53 | locatio ... ring(1) | provenance |  |
-| tst.js:22:9:22:82 | source | tst.js:24:18:24:23 | source | provenance |  |
-| tst.js:22:9:22:82 | source | tst.js:26:14:26:19 | source | provenance |  |
-| tst.js:22:9:22:82 | source | tst.js:28:28:28:33 | source | provenance |  |
-| tst.js:22:9:22:82 | source | tst.js:30:33:30:38 | source | provenance |  |
+| tst.js:22:9:22:14 | source | tst.js:24:18:24:23 | source | provenance |  |
+| tst.js:22:9:22:14 | source | tst.js:26:14:26:19 | source | provenance |  |
+| tst.js:22:9:22:14 | source | tst.js:28:28:28:33 | source | provenance |  |
+| tst.js:22:9:22:14 | source | tst.js:30:33:30:38 | source | provenance |  |
 | tst.js:22:18:22:41 | documen ... .search | tst.js:22:18:22:82 | documen ... , "$1") | provenance |  |
-| tst.js:22:18:22:82 | documen ... , "$1") | tst.js:22:9:22:82 | source | provenance |  |
+| tst.js:22:18:22:82 | documen ... , "$1") | tst.js:22:9:22:14 | source | provenance |  |
 nodes
 | NoSQLCodeInjection.js:18:24:18:31 | req.body | semmle.label | req.body |
 | NoSQLCodeInjection.js:18:24:18:37 | req.body.query | semmle.label | req.body.query |
@@ -221,55 +243,55 @@ nodes
 | express.js:12:30:12:53 | req.par ... cript") | semmle.label | req.par ... cript") |
 | express.js:13:37:13:70 | req.par ... odule") | semmle.label | req.par ... odule") |
 | express.js:14:19:14:48 | req.par ... ntext") | semmle.label | req.par ... ntext") |
-| express.js:19:9:19:35 | taint | semmle.label | taint |
+| express.js:19:9:19:13 | taint | semmle.label | taint |
 | express.js:19:17:19:35 | req.param("wobble") | semmle.label | req.param("wobble") |
 | express.js:20:34:20:38 | taint | semmle.label | taint |
-| express.js:27:9:27:35 | taint | semmle.label | taint |
+| express.js:27:9:27:13 | taint | semmle.label | taint |
 | express.js:27:17:27:35 | req.param("wobble") | semmle.label | req.param("wobble") |
 | express.js:36:15:36:19 | taint | semmle.label | taint |
 | express.js:42:30:42:32 | msg | semmle.label | msg |
 | express.js:43:10:43:12 | msg | semmle.label | msg |
-| fastify.js:4:9:4:43 | userInput | semmle.label | userInput |
+| fastify.js:4:9:4:17 | userInput | semmle.label | userInput |
 | fastify.js:4:21:4:33 | request.query | semmle.label | request.query |
 | fastify.js:4:21:4:43 | request ... Request | semmle.label | request ... Request |
 | fastify.js:5:44:5:52 | userInput | semmle.label | userInput |
-| fastify.js:9:9:9:40 | userInput | semmle.label | userInput |
+| fastify.js:9:9:9:17 | userInput | semmle.label | userInput |
 | fastify.js:9:21:9:33 | request.query | semmle.label | request.query |
 | fastify.js:9:21:9:40 | request.query.onSend | semmle.label | request.query.onSend |
 | fastify.js:10:44:10:52 | userInput | semmle.label | userInput |
-| fastify.js:15:9:15:44 | userInput | semmle.label | userInput |
+| fastify.js:15:9:15:17 | userInput | semmle.label | userInput |
 | fastify.js:15:21:15:33 | request.query | semmle.label | request.query |
 | fastify.js:15:21:15:44 | request ... Parsing | semmle.label | request ... Parsing |
 | fastify.js:16:44:16:52 | userInput | semmle.label | userInput |
-| fastify.js:21:9:21:47 | userInput | semmle.label | userInput |
+| fastify.js:21:9:21:17 | userInput | semmle.label | userInput |
 | fastify.js:21:21:21:33 | request.query | semmle.label | request.query |
 | fastify.js:21:21:21:47 | request ... idation | semmle.label | request ... idation |
 | fastify.js:22:44:22:52 | userInput | semmle.label | userInput |
-| fastify.js:26:9:26:44 | userInput | semmle.label | userInput |
+| fastify.js:26:9:26:17 | userInput | semmle.label | userInput |
 | fastify.js:26:21:26:33 | request.query | semmle.label | request.query |
 | fastify.js:26:21:26:44 | request ... Handler | semmle.label | request ... Handler |
 | fastify.js:27:44:27:52 | userInput | semmle.label | userInput |
-| fastify.js:31:9:31:50 | userInput | semmle.label | userInput |
+| fastify.js:31:9:31:17 | userInput | semmle.label | userInput |
 | fastify.js:31:21:31:33 | request.query | semmle.label | request.query |
 | fastify.js:31:21:31:50 | request ... ization | semmle.label | request ... ization |
 | fastify.js:32:44:32:52 | userInput | semmle.label | userInput |
-| fastify.js:37:9:37:44 | userInput | semmle.label | userInput |
+| fastify.js:37:9:37:17 | userInput | semmle.label | userInput |
 | fastify.js:37:21:37:33 | request.query | semmle.label | request.query |
 | fastify.js:37:21:37:44 | request ... esponse | semmle.label | request ... esponse |
 | fastify.js:38:44:38:52 | userInput | semmle.label | userInput |
-| fastify.js:42:9:42:41 | userInput | semmle.label | userInput |
+| fastify.js:42:9:42:17 | userInput | semmle.label | userInput |
 | fastify.js:42:21:42:33 | request.query | semmle.label | request.query |
 | fastify.js:42:21:42:41 | request ... onError | semmle.label | request ... onError |
 | fastify.js:43:44:43:52 | userInput | semmle.label | userInput |
-| fastify.js:47:9:47:43 | userInput | semmle.label | userInput |
+| fastify.js:47:9:47:17 | userInput | semmle.label | userInput |
 | fastify.js:47:21:47:33 | request.query | semmle.label | request.query |
 | fastify.js:47:21:47:43 | request ... Timeout | semmle.label | request ... Timeout |
 | fastify.js:48:44:48:52 | userInput | semmle.label | userInput |
-| fastify.js:52:11:52:50 | userInput | semmle.label | userInput |
+| fastify.js:52:11:52:19 | userInput | semmle.label | userInput |
 | fastify.js:52:23:52:35 | request.query | semmle.label | request.query |
 | fastify.js:52:23:52:50 | request ... stAbort | semmle.label | request ... stAbort |
 | fastify.js:53:46:53:54 | userInput | semmle.label | userInput |
-| fastify.js:57:9:57:39 | userInput | semmle.label | userInput |
+| fastify.js:57:9:57:17 | userInput | semmle.label | userInput |
 | fastify.js:57:21:57:33 | request.query | semmle.label | request.query |
 | fastify.js:57:21:57:39 | request.query.input | semmle.label | request.query.input |
 | fastify.js:58:44:58:52 | userInput | semmle.label | userInput |
@@ -283,14 +305,33 @@ nodes
 | fastify.js:94:29:94:41 | request.query | semmle.label | request.query |
 | fastify.js:94:29:94:51 | request ... plyCode | semmle.label | request ... plyCode |
 | fastify.js:99:30:99:52 | reply.l ... tedCode | semmle.label | reply.l ... tedCode |
-| fastify.js:106:9:106:38 | userInput | semmle.label | userInput |
+| fastify.js:106:9:106:17 | userInput | semmle.label | userInput |
 | fastify.js:106:21:106:33 | request.query | semmle.label | request.query |
 | fastify.js:106:21:106:38 | request.query.code | semmle.label | request.query.code |
 | fastify.js:107:23:107:31 | userInput | semmle.label | userInput |
 | fastify.js:108:28:108:50 | reply.l ... tedCode | semmle.label | reply.l ... tedCode |
+| graph-ql.js:18:10:18:17 | { expr } | semmle.label | { expr } |
+| graph-ql.js:18:12:18:15 | expr | semmle.label | expr |
+| graph-ql.js:20:19:20:22 | expr | semmle.label | expr |
+| graph-ql.js:28:9:28:28 | { query, variables } | semmle.label | { query, variables } |
+| graph-ql.js:28:11:28:15 | query | semmle.label | query |
+| graph-ql.js:28:18:28:26 | variables | semmle.label | variables |
+| graph-ql.js:28:32:28:39 | req.body | semmle.label | req.body |
+| graph-ql.js:31:13:31:17 | query | semmle.label | query |
+| graph-ql.js:33:21:33:29 | variables | semmle.label | variables |
+| graph-ql.js:38:13:38:27 | { name, title } | semmle.label | { name, title } |
+| graph-ql.js:38:15:38:18 | name | semmle.label | name |
+| graph-ql.js:38:21:38:25 | title | semmle.label | title |
+| graph-ql.js:39:19:39:22 | name | semmle.label | name |
+| graph-ql.js:39:19:39:30 | name + title | semmle.label | name + title |
+| graph-ql.js:39:26:39:30 | title | semmle.label | title |
+| graph-ql.js:54:21:54:29 | variables | semmle.label | variables |
+| graph-ql.js:65:22:65:30 | { value } | semmle.label | { value } |
+| graph-ql.js:65:24:65:28 | value | semmle.label | value |
+| graph-ql.js:66:23:66:27 | value | semmle.label | value |
 | module.js:9:16:9:29 | req.query.code | semmle.label | req.query.code |
 | module.js:11:17:11:30 | req.query.code | semmle.label | req.query.code |
-| react-native.js:7:7:7:33 | tainted | semmle.label | tainted |
+| react-native.js:7:7:7:13 | tainted | semmle.label | tainted |
 | react-native.js:7:17:7:33 | req.param("code") | semmle.label | req.param("code") |
 | react-native.js:8:32:8:38 | tainted | semmle.label | tainted |
 | react-native.js:10:23:10:29 | tainted | semmle.label | tainted |
@@ -298,11 +339,11 @@ nodes
 | react-server-function.js:4:12:4:12 | x | semmle.label | x |
 | react-server-function.js:4:12:4:29 | x + " from server" | semmle.label | x + " from server" |
 | react.js:11:56:11:77 | documen ... on.hash | semmle.label | documen ... on.hash |
-| react.js:24:9:24:45 | data | semmle.label | data |
+| react.js:24:9:24:12 | data | semmle.label | data |
 | react.js:24:16:24:45 | use(ech ... alue")) | semmle.label | use(ech ... alue")) |
 | react.js:24:20:24:44 | echoSer ... value") [PromiseValue] | semmle.label | echoSer ... value") [PromiseValue] |
 | react.js:25:8:25:11 | data | semmle.label | data |
-| template-sinks.js:18:9:18:31 | tainted | semmle.label | tainted |
+| template-sinks.js:18:9:18:15 | tainted | semmle.label | tainted |
 | template-sinks.js:18:19:18:31 | req.query.foo | semmle.label | req.query.foo |
 | template-sinks.js:20:17:20:23 | tainted | semmle.label | tainted |
 | template-sinks.js:21:16:21:22 | tainted | semmle.label | tainted |
@@ -330,7 +371,7 @@ nodes
 | tst.js:17:11:17:45 | documen ... ring(1) | semmle.label | documen ... ring(1) |
 | tst.js:19:26:19:40 | location.search | semmle.label | location.search |
 | tst.js:19:26:19:53 | locatio ... ring(1) | semmle.label | locatio ... ring(1) |
-| tst.js:22:9:22:82 | source | semmle.label | source |
+| tst.js:22:9:22:14 | source | semmle.label | source |
 | tst.js:22:18:22:41 | documen ... .search | semmle.label | documen ... .search |
 | tst.js:22:18:22:82 | documen ... , "$1") | semmle.label | documen ... , "$1") |
 | tst.js:24:18:24:23 | source | semmle.label | source |
diff --git a/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/HeuristicSourceCodeInjection.expected b/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/HeuristicSourceCodeInjection.expected
index 5a249b086b9..837ae37eaee 100644
--- a/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/HeuristicSourceCodeInjection.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/HeuristicSourceCodeInjection.expected
@@ -6,45 +6,45 @@ edges
 | express.js:6:44:6:62 | req.param("wobble") | express.js:6:24:6:69 | "return ...  + "];" | provenance |  |
 | express.js:7:54:7:72 | req.param("wobble") | express.js:7:34:7:79 | "return ...  + "];" | provenance |  |
 | express.js:9:28:9:46 | req.param("wobble") | express.js:9:8:9:53 | "return ...  + "];" | provenance |  |
-| express.js:19:9:19:35 | taint | express.js:20:34:20:38 | taint | provenance |  |
-| express.js:19:17:19:35 | req.param("wobble") | express.js:19:9:19:35 | taint | provenance |  |
-| express.js:27:9:27:35 | taint | express.js:36:15:36:19 | taint | provenance |  |
-| express.js:27:17:27:35 | req.param("wobble") | express.js:27:9:27:35 | taint | provenance |  |
+| express.js:19:9:19:13 | taint | express.js:20:34:20:38 | taint | provenance |  |
+| express.js:19:17:19:35 | req.param("wobble") | express.js:19:9:19:13 | taint | provenance |  |
+| express.js:27:9:27:13 | taint | express.js:36:15:36:19 | taint | provenance |  |
+| express.js:27:17:27:35 | req.param("wobble") | express.js:27:9:27:13 | taint | provenance |  |
 | express.js:42:30:42:32 | msg | express.js:43:10:43:12 | msg | provenance |  |
-| fastify.js:4:9:4:43 | userInput | fastify.js:5:44:5:52 | userInput | provenance |  |
-| fastify.js:4:21:4:33 | request.query | fastify.js:4:9:4:43 | userInput | provenance |  |
-| fastify.js:4:21:4:43 | request ... Request | fastify.js:4:9:4:43 | userInput | provenance |  |
-| fastify.js:9:9:9:40 | userInput | fastify.js:10:44:10:52 | userInput | provenance |  |
-| fastify.js:9:21:9:33 | request.query | fastify.js:9:9:9:40 | userInput | provenance |  |
-| fastify.js:9:21:9:40 | request.query.onSend | fastify.js:9:9:9:40 | userInput | provenance |  |
-| fastify.js:15:9:15:44 | userInput | fastify.js:16:44:16:52 | userInput | provenance |  |
-| fastify.js:15:21:15:33 | request.query | fastify.js:15:9:15:44 | userInput | provenance |  |
-| fastify.js:15:21:15:44 | request ... Parsing | fastify.js:15:9:15:44 | userInput | provenance |  |
-| fastify.js:21:9:21:47 | userInput | fastify.js:22:44:22:52 | userInput | provenance |  |
-| fastify.js:21:21:21:33 | request.query | fastify.js:21:9:21:47 | userInput | provenance |  |
-| fastify.js:21:21:21:47 | request ... idation | fastify.js:21:9:21:47 | userInput | provenance |  |
-| fastify.js:26:9:26:44 | userInput | fastify.js:27:44:27:52 | userInput | provenance |  |
-| fastify.js:26:21:26:33 | request.query | fastify.js:26:9:26:44 | userInput | provenance |  |
-| fastify.js:26:21:26:44 | request ... Handler | fastify.js:26:9:26:44 | userInput | provenance |  |
-| fastify.js:31:9:31:50 | userInput | fastify.js:32:44:32:52 | userInput | provenance |  |
-| fastify.js:31:21:31:33 | request.query | fastify.js:31:9:31:50 | userInput | provenance |  |
-| fastify.js:31:21:31:50 | request ... ization | fastify.js:31:9:31:50 | userInput | provenance |  |
-| fastify.js:37:9:37:44 | userInput | fastify.js:38:44:38:52 | userInput | provenance |  |
-| fastify.js:37:21:37:33 | request.query | fastify.js:37:9:37:44 | userInput | provenance |  |
-| fastify.js:37:21:37:44 | request ... esponse | fastify.js:37:9:37:44 | userInput | provenance |  |
-| fastify.js:42:9:42:41 | userInput | fastify.js:43:44:43:52 | userInput | provenance |  |
-| fastify.js:42:21:42:33 | request.query | fastify.js:42:9:42:41 | userInput | provenance |  |
-| fastify.js:42:21:42:41 | request ... onError | fastify.js:42:9:42:41 | userInput | provenance |  |
-| fastify.js:47:9:47:43 | userInput | fastify.js:48:44:48:52 | userInput | provenance |  |
-| fastify.js:47:21:47:33 | request.query | fastify.js:47:9:47:43 | userInput | provenance |  |
-| fastify.js:47:21:47:43 | request ... Timeout | fastify.js:47:9:47:43 | userInput | provenance |  |
-| fastify.js:52:11:52:50 | userInput | fastify.js:53:46:53:54 | userInput | provenance |  |
-| fastify.js:52:23:52:35 | request.query | fastify.js:52:11:52:50 | userInput | provenance |  |
-| fastify.js:52:23:52:50 | request ... stAbort | fastify.js:52:11:52:50 | userInput | provenance |  |
-| fastify.js:57:9:57:39 | userInput | fastify.js:58:44:58:52 | userInput | provenance |  |
-| fastify.js:57:9:57:39 | userInput | fastify.js:59:23:59:31 | userInput | provenance |  |
-| fastify.js:57:21:57:33 | request.query | fastify.js:57:9:57:39 | userInput | provenance |  |
-| fastify.js:57:21:57:39 | request.query.input | fastify.js:57:9:57:39 | userInput | provenance |  |
+| fastify.js:4:9:4:17 | userInput | fastify.js:5:44:5:52 | userInput | provenance |  |
+| fastify.js:4:21:4:33 | request.query | fastify.js:4:9:4:17 | userInput | provenance |  |
+| fastify.js:4:21:4:43 | request ... Request | fastify.js:4:9:4:17 | userInput | provenance |  |
+| fastify.js:9:9:9:17 | userInput | fastify.js:10:44:10:52 | userInput | provenance |  |
+| fastify.js:9:21:9:33 | request.query | fastify.js:9:9:9:17 | userInput | provenance |  |
+| fastify.js:9:21:9:40 | request.query.onSend | fastify.js:9:9:9:17 | userInput | provenance |  |
+| fastify.js:15:9:15:17 | userInput | fastify.js:16:44:16:52 | userInput | provenance |  |
+| fastify.js:15:21:15:33 | request.query | fastify.js:15:9:15:17 | userInput | provenance |  |
+| fastify.js:15:21:15:44 | request ... Parsing | fastify.js:15:9:15:17 | userInput | provenance |  |
+| fastify.js:21:9:21:17 | userInput | fastify.js:22:44:22:52 | userInput | provenance |  |
+| fastify.js:21:21:21:33 | request.query | fastify.js:21:9:21:17 | userInput | provenance |  |
+| fastify.js:21:21:21:47 | request ... idation | fastify.js:21:9:21:17 | userInput | provenance |  |
+| fastify.js:26:9:26:17 | userInput | fastify.js:27:44:27:52 | userInput | provenance |  |
+| fastify.js:26:21:26:33 | request.query | fastify.js:26:9:26:17 | userInput | provenance |  |
+| fastify.js:26:21:26:44 | request ... Handler | fastify.js:26:9:26:17 | userInput | provenance |  |
+| fastify.js:31:9:31:17 | userInput | fastify.js:32:44:32:52 | userInput | provenance |  |
+| fastify.js:31:21:31:33 | request.query | fastify.js:31:9:31:17 | userInput | provenance |  |
+| fastify.js:31:21:31:50 | request ... ization | fastify.js:31:9:31:17 | userInput | provenance |  |
+| fastify.js:37:9:37:17 | userInput | fastify.js:38:44:38:52 | userInput | provenance |  |
+| fastify.js:37:21:37:33 | request.query | fastify.js:37:9:37:17 | userInput | provenance |  |
+| fastify.js:37:21:37:44 | request ... esponse | fastify.js:37:9:37:17 | userInput | provenance |  |
+| fastify.js:42:9:42:17 | userInput | fastify.js:43:44:43:52 | userInput | provenance |  |
+| fastify.js:42:21:42:33 | request.query | fastify.js:42:9:42:17 | userInput | provenance |  |
+| fastify.js:42:21:42:41 | request ... onError | fastify.js:42:9:42:17 | userInput | provenance |  |
+| fastify.js:47:9:47:17 | userInput | fastify.js:48:44:48:52 | userInput | provenance |  |
+| fastify.js:47:21:47:33 | request.query | fastify.js:47:9:47:17 | userInput | provenance |  |
+| fastify.js:47:21:47:43 | request ... Timeout | fastify.js:47:9:47:17 | userInput | provenance |  |
+| fastify.js:52:11:52:19 | userInput | fastify.js:53:46:53:54 | userInput | provenance |  |
+| fastify.js:52:23:52:35 | request.query | fastify.js:52:11:52:19 | userInput | provenance |  |
+| fastify.js:52:23:52:50 | request ... stAbort | fastify.js:52:11:52:19 | userInput | provenance |  |
+| fastify.js:57:9:57:17 | userInput | fastify.js:58:44:58:52 | userInput | provenance |  |
+| fastify.js:57:9:57:17 | userInput | fastify.js:59:23:59:31 | userInput | provenance |  |
+| fastify.js:57:21:57:33 | request.query | fastify.js:57:9:57:17 | userInput | provenance |  |
+| fastify.js:57:21:57:39 | request.query.input | fastify.js:57:9:57:17 | userInput | provenance |  |
 | fastify.js:66:24:66:36 | request.query | fastify.js:66:24:66:47 | request ... redCode | provenance |  |
 | fastify.js:66:24:66:47 | request ... redCode | fastify.js:71:34:71:51 | request.storedCode | provenance |  |
 | fastify.js:79:20:79:32 | request.query | fastify.js:79:20:79:42 | request ... plyCode | provenance |  |
@@ -52,44 +52,63 @@ edges
 | fastify.js:94:29:94:41 | request.query | fastify.js:94:29:94:51 | request ... plyCode | provenance |  |
 | fastify.js:94:29:94:51 | request ... plyCode | fastify.js:99:30:99:52 | reply.l ... tedCode | provenance |  |
 | fastify.js:94:29:94:51 | request ... plyCode | fastify.js:108:28:108:50 | reply.l ... tedCode | provenance |  |
-| fastify.js:106:9:106:38 | userInput | fastify.js:107:23:107:31 | userInput | provenance |  |
-| fastify.js:106:21:106:33 | request.query | fastify.js:106:9:106:38 | userInput | provenance |  |
-| fastify.js:106:21:106:38 | request.query.code | fastify.js:106:9:106:38 | userInput | provenance |  |
-| react-native.js:7:7:7:33 | tainted | react-native.js:8:32:8:38 | tainted | provenance |  |
-| react-native.js:7:7:7:33 | tainted | react-native.js:10:23:10:29 | tainted | provenance |  |
-| react-native.js:7:17:7:33 | req.param("code") | react-native.js:7:7:7:33 | tainted | provenance |  |
+| fastify.js:106:9:106:17 | userInput | fastify.js:107:23:107:31 | userInput | provenance |  |
+| fastify.js:106:21:106:33 | request.query | fastify.js:106:9:106:17 | userInput | provenance |  |
+| fastify.js:106:21:106:38 | request.query.code | fastify.js:106:9:106:17 | userInput | provenance |  |
+| graph-ql.js:18:10:18:17 | { expr } | graph-ql.js:18:12:18:15 | expr | provenance |  |
+| graph-ql.js:18:12:18:15 | expr | graph-ql.js:20:19:20:22 | expr | provenance |  |
+| graph-ql.js:28:9:28:28 | { query, variables } | graph-ql.js:28:11:28:15 | query | provenance |  |
+| graph-ql.js:28:9:28:28 | { query, variables } | graph-ql.js:28:18:28:26 | variables | provenance |  |
+| graph-ql.js:28:11:28:15 | query | graph-ql.js:31:13:31:17 | query | provenance |  |
+| graph-ql.js:28:18:28:26 | variables | graph-ql.js:33:21:33:29 | variables | provenance |  |
+| graph-ql.js:28:18:28:26 | variables | graph-ql.js:54:21:54:29 | variables | provenance |  |
+| graph-ql.js:28:32:28:39 | req.body | graph-ql.js:28:9:28:28 | { query, variables } | provenance |  |
+| graph-ql.js:31:13:31:17 | query | graph-ql.js:18:10:18:17 | { expr } | provenance |  |
+| graph-ql.js:33:21:33:29 | variables | graph-ql.js:18:10:18:17 | { expr } | provenance |  |
+| graph-ql.js:38:13:38:27 | { name, title } | graph-ql.js:38:15:38:18 | name | provenance |  |
+| graph-ql.js:38:13:38:27 | { name, title } | graph-ql.js:38:21:38:25 | title | provenance |  |
+| graph-ql.js:38:15:38:18 | name | graph-ql.js:39:19:39:22 | name | provenance |  |
+| graph-ql.js:38:21:38:25 | title | graph-ql.js:39:26:39:30 | title | provenance |  |
+| graph-ql.js:39:19:39:22 | name | graph-ql.js:39:19:39:30 | name + title | provenance |  |
+| graph-ql.js:39:26:39:30 | title | graph-ql.js:39:19:39:30 | name + title | provenance |  |
+| graph-ql.js:54:21:54:29 | variables | graph-ql.js:38:13:38:27 | { name, title } | provenance |  |
+| graph-ql.js:65:22:65:30 | { value } | graph-ql.js:65:24:65:28 | value | provenance |  |
+| graph-ql.js:65:24:65:28 | value | graph-ql.js:66:23:66:27 | value | provenance |  |
+| react-native.js:7:7:7:13 | tainted | react-native.js:8:32:8:38 | tainted | provenance |  |
+| react-native.js:7:7:7:13 | tainted | react-native.js:10:23:10:29 | tainted | provenance |  |
+| react-native.js:7:17:7:33 | req.param("code") | react-native.js:7:7:7:13 | tainted | provenance |  |
 | react-server-function.js:3:35:3:35 | x | react-server-function.js:4:12:4:12 | x | provenance |  |
 | react-server-function.js:4:12:4:12 | x | react-server-function.js:4:12:4:29 | x + " from server" | provenance |  |
 | react-server-function.js:4:12:4:29 | x + " from server" | react.js:24:20:24:44 | echoSer ... value") [PromiseValue] | provenance |  |
-| react.js:24:9:24:45 | data | react.js:25:8:25:11 | data | provenance |  |
-| react.js:24:16:24:45 | use(ech ... alue")) | react.js:24:9:24:45 | data | provenance |  |
+| react.js:24:9:24:12 | data | react.js:25:8:25:11 | data | provenance |  |
+| react.js:24:16:24:45 | use(ech ... alue")) | react.js:24:9:24:12 | data | provenance |  |
 | react.js:24:20:24:44 | echoSer ... value") [PromiseValue] | react.js:24:16:24:45 | use(ech ... alue")) | provenance |  |
-| template-sinks.js:18:9:18:31 | tainted | template-sinks.js:20:17:20:23 | tainted | provenance |  |
-| template-sinks.js:18:9:18:31 | tainted | template-sinks.js:21:16:21:22 | tainted | provenance |  |
-| template-sinks.js:18:9:18:31 | tainted | template-sinks.js:22:18:22:24 | tainted | provenance |  |
-| template-sinks.js:18:9:18:31 | tainted | template-sinks.js:23:17:23:23 | tainted | provenance |  |
-| template-sinks.js:18:9:18:31 | tainted | template-sinks.js:24:18:24:24 | tainted | provenance |  |
-| template-sinks.js:18:9:18:31 | tainted | template-sinks.js:25:16:25:22 | tainted | provenance |  |
-| template-sinks.js:18:9:18:31 | tainted | template-sinks.js:26:27:26:33 | tainted | provenance |  |
-| template-sinks.js:18:9:18:31 | tainted | template-sinks.js:27:21:27:27 | tainted | provenance |  |
-| template-sinks.js:18:9:18:31 | tainted | template-sinks.js:28:17:28:23 | tainted | provenance |  |
-| template-sinks.js:18:9:18:31 | tainted | template-sinks.js:29:24:29:30 | tainted | provenance |  |
-| template-sinks.js:18:9:18:31 | tainted | template-sinks.js:30:21:30:27 | tainted | provenance |  |
-| template-sinks.js:18:9:18:31 | tainted | template-sinks.js:31:19:31:25 | tainted | provenance |  |
-| template-sinks.js:18:9:18:31 | tainted | template-sinks.js:32:16:32:22 | tainted | provenance |  |
-| template-sinks.js:18:9:18:31 | tainted | template-sinks.js:33:17:33:23 | tainted | provenance |  |
-| template-sinks.js:18:19:18:31 | req.query.foo | template-sinks.js:18:9:18:31 | tainted | provenance |  |
+| template-sinks.js:18:9:18:15 | tainted | template-sinks.js:20:17:20:23 | tainted | provenance |  |
+| template-sinks.js:18:9:18:15 | tainted | template-sinks.js:21:16:21:22 | tainted | provenance |  |
+| template-sinks.js:18:9:18:15 | tainted | template-sinks.js:22:18:22:24 | tainted | provenance |  |
+| template-sinks.js:18:9:18:15 | tainted | template-sinks.js:23:17:23:23 | tainted | provenance |  |
+| template-sinks.js:18:9:18:15 | tainted | template-sinks.js:24:18:24:24 | tainted | provenance |  |
+| template-sinks.js:18:9:18:15 | tainted | template-sinks.js:25:16:25:22 | tainted | provenance |  |
+| template-sinks.js:18:9:18:15 | tainted | template-sinks.js:26:27:26:33 | tainted | provenance |  |
+| template-sinks.js:18:9:18:15 | tainted | template-sinks.js:27:21:27:27 | tainted | provenance |  |
+| template-sinks.js:18:9:18:15 | tainted | template-sinks.js:28:17:28:23 | tainted | provenance |  |
+| template-sinks.js:18:9:18:15 | tainted | template-sinks.js:29:24:29:30 | tainted | provenance |  |
+| template-sinks.js:18:9:18:15 | tainted | template-sinks.js:30:21:30:27 | tainted | provenance |  |
+| template-sinks.js:18:9:18:15 | tainted | template-sinks.js:31:19:31:25 | tainted | provenance |  |
+| template-sinks.js:18:9:18:15 | tainted | template-sinks.js:32:16:32:22 | tainted | provenance |  |
+| template-sinks.js:18:9:18:15 | tainted | template-sinks.js:33:17:33:23 | tainted | provenance |  |
+| template-sinks.js:18:19:18:31 | req.query.foo | template-sinks.js:18:9:18:15 | tainted | provenance |  |
 | tst.js:1:6:1:27 | documen ... on.href | tst.js:1:6:1:83 | documen ... t=")+8) | provenance |  |
 | tst.js:11:10:11:33 | documen ... .search | tst.js:11:10:11:74 | documen ... , "$1") | provenance |  |
 | tst.js:17:11:17:32 | documen ... on.hash | tst.js:17:11:17:45 | documen ... ring(1) | provenance |  |
 | tst.js:17:11:17:45 | documen ... ring(1) | tst.js:17:6:17:46 | atob(do ... ing(1)) | provenance |  |
 | tst.js:19:26:19:40 | location.search | tst.js:19:26:19:53 | locatio ... ring(1) | provenance |  |
-| tst.js:22:9:22:82 | source | tst.js:24:18:24:23 | source | provenance |  |
-| tst.js:22:9:22:82 | source | tst.js:26:14:26:19 | source | provenance |  |
-| tst.js:22:9:22:82 | source | tst.js:28:28:28:33 | source | provenance |  |
-| tst.js:22:9:22:82 | source | tst.js:30:33:30:38 | source | provenance |  |
+| tst.js:22:9:22:14 | source | tst.js:24:18:24:23 | source | provenance |  |
+| tst.js:22:9:22:14 | source | tst.js:26:14:26:19 | source | provenance |  |
+| tst.js:22:9:22:14 | source | tst.js:28:28:28:33 | source | provenance |  |
+| tst.js:22:9:22:14 | source | tst.js:30:33:30:38 | source | provenance |  |
 | tst.js:22:18:22:41 | documen ... .search | tst.js:22:18:22:82 | documen ... , "$1") | provenance |  |
-| tst.js:22:18:22:82 | documen ... , "$1") | tst.js:22:9:22:82 | source | provenance |  |
+| tst.js:22:18:22:82 | documen ... , "$1") | tst.js:22:9:22:14 | source | provenance |  |
 nodes
 | NoSQLCodeInjection.js:18:24:18:31 | req.body | semmle.label | req.body |
 | NoSQLCodeInjection.js:18:24:18:37 | req.body.query | semmle.label | req.body.query |
@@ -124,55 +143,55 @@ nodes
 | express.js:12:30:12:53 | req.par ... cript") | semmle.label | req.par ... cript") |
 | express.js:13:37:13:70 | req.par ... odule") | semmle.label | req.par ... odule") |
 | express.js:14:19:14:48 | req.par ... ntext") | semmle.label | req.par ... ntext") |
-| express.js:19:9:19:35 | taint | semmle.label | taint |
+| express.js:19:9:19:13 | taint | semmle.label | taint |
 | express.js:19:17:19:35 | req.param("wobble") | semmle.label | req.param("wobble") |
 | express.js:20:34:20:38 | taint | semmle.label | taint |
-| express.js:27:9:27:35 | taint | semmle.label | taint |
+| express.js:27:9:27:13 | taint | semmle.label | taint |
 | express.js:27:17:27:35 | req.param("wobble") | semmle.label | req.param("wobble") |
 | express.js:36:15:36:19 | taint | semmle.label | taint |
 | express.js:42:30:42:32 | msg | semmle.label | msg |
 | express.js:43:10:43:12 | msg | semmle.label | msg |
-| fastify.js:4:9:4:43 | userInput | semmle.label | userInput |
+| fastify.js:4:9:4:17 | userInput | semmle.label | userInput |
 | fastify.js:4:21:4:33 | request.query | semmle.label | request.query |
 | fastify.js:4:21:4:43 | request ... Request | semmle.label | request ... Request |
 | fastify.js:5:44:5:52 | userInput | semmle.label | userInput |
-| fastify.js:9:9:9:40 | userInput | semmle.label | userInput |
+| fastify.js:9:9:9:17 | userInput | semmle.label | userInput |
 | fastify.js:9:21:9:33 | request.query | semmle.label | request.query |
 | fastify.js:9:21:9:40 | request.query.onSend | semmle.label | request.query.onSend |
 | fastify.js:10:44:10:52 | userInput | semmle.label | userInput |
-| fastify.js:15:9:15:44 | userInput | semmle.label | userInput |
+| fastify.js:15:9:15:17 | userInput | semmle.label | userInput |
 | fastify.js:15:21:15:33 | request.query | semmle.label | request.query |
 | fastify.js:15:21:15:44 | request ... Parsing | semmle.label | request ... Parsing |
 | fastify.js:16:44:16:52 | userInput | semmle.label | userInput |
-| fastify.js:21:9:21:47 | userInput | semmle.label | userInput |
+| fastify.js:21:9:21:17 | userInput | semmle.label | userInput |
 | fastify.js:21:21:21:33 | request.query | semmle.label | request.query |
 | fastify.js:21:21:21:47 | request ... idation | semmle.label | request ... idation |
 | fastify.js:22:44:22:52 | userInput | semmle.label | userInput |
-| fastify.js:26:9:26:44 | userInput | semmle.label | userInput |
+| fastify.js:26:9:26:17 | userInput | semmle.label | userInput |
 | fastify.js:26:21:26:33 | request.query | semmle.label | request.query |
 | fastify.js:26:21:26:44 | request ... Handler | semmle.label | request ... Handler |
 | fastify.js:27:44:27:52 | userInput | semmle.label | userInput |
-| fastify.js:31:9:31:50 | userInput | semmle.label | userInput |
+| fastify.js:31:9:31:17 | userInput | semmle.label | userInput |
 | fastify.js:31:21:31:33 | request.query | semmle.label | request.query |
 | fastify.js:31:21:31:50 | request ... ization | semmle.label | request ... ization |
 | fastify.js:32:44:32:52 | userInput | semmle.label | userInput |
-| fastify.js:37:9:37:44 | userInput | semmle.label | userInput |
+| fastify.js:37:9:37:17 | userInput | semmle.label | userInput |
 | fastify.js:37:21:37:33 | request.query | semmle.label | request.query |
 | fastify.js:37:21:37:44 | request ... esponse | semmle.label | request ... esponse |
 | fastify.js:38:44:38:52 | userInput | semmle.label | userInput |
-| fastify.js:42:9:42:41 | userInput | semmle.label | userInput |
+| fastify.js:42:9:42:17 | userInput | semmle.label | userInput |
 | fastify.js:42:21:42:33 | request.query | semmle.label | request.query |
 | fastify.js:42:21:42:41 | request ... onError | semmle.label | request ... onError |
 | fastify.js:43:44:43:52 | userInput | semmle.label | userInput |
-| fastify.js:47:9:47:43 | userInput | semmle.label | userInput |
+| fastify.js:47:9:47:17 | userInput | semmle.label | userInput |
 | fastify.js:47:21:47:33 | request.query | semmle.label | request.query |
 | fastify.js:47:21:47:43 | request ... Timeout | semmle.label | request ... Timeout |
 | fastify.js:48:44:48:52 | userInput | semmle.label | userInput |
-| fastify.js:52:11:52:50 | userInput | semmle.label | userInput |
+| fastify.js:52:11:52:19 | userInput | semmle.label | userInput |
 | fastify.js:52:23:52:35 | request.query | semmle.label | request.query |
 | fastify.js:52:23:52:50 | request ... stAbort | semmle.label | request ... stAbort |
 | fastify.js:53:46:53:54 | userInput | semmle.label | userInput |
-| fastify.js:57:9:57:39 | userInput | semmle.label | userInput |
+| fastify.js:57:9:57:17 | userInput | semmle.label | userInput |
 | fastify.js:57:21:57:33 | request.query | semmle.label | request.query |
 | fastify.js:57:21:57:39 | request.query.input | semmle.label | request.query.input |
 | fastify.js:58:44:58:52 | userInput | semmle.label | userInput |
@@ -186,14 +205,33 @@ nodes
 | fastify.js:94:29:94:41 | request.query | semmle.label | request.query |
 | fastify.js:94:29:94:51 | request ... plyCode | semmle.label | request ... plyCode |
 | fastify.js:99:30:99:52 | reply.l ... tedCode | semmle.label | reply.l ... tedCode |
-| fastify.js:106:9:106:38 | userInput | semmle.label | userInput |
+| fastify.js:106:9:106:17 | userInput | semmle.label | userInput |
 | fastify.js:106:21:106:33 | request.query | semmle.label | request.query |
 | fastify.js:106:21:106:38 | request.query.code | semmle.label | request.query.code |
 | fastify.js:107:23:107:31 | userInput | semmle.label | userInput |
 | fastify.js:108:28:108:50 | reply.l ... tedCode | semmle.label | reply.l ... tedCode |
+| graph-ql.js:18:10:18:17 | { expr } | semmle.label | { expr } |
+| graph-ql.js:18:12:18:15 | expr | semmle.label | expr |
+| graph-ql.js:20:19:20:22 | expr | semmle.label | expr |
+| graph-ql.js:28:9:28:28 | { query, variables } | semmle.label | { query, variables } |
+| graph-ql.js:28:11:28:15 | query | semmle.label | query |
+| graph-ql.js:28:18:28:26 | variables | semmle.label | variables |
+| graph-ql.js:28:32:28:39 | req.body | semmle.label | req.body |
+| graph-ql.js:31:13:31:17 | query | semmle.label | query |
+| graph-ql.js:33:21:33:29 | variables | semmle.label | variables |
+| graph-ql.js:38:13:38:27 | { name, title } | semmle.label | { name, title } |
+| graph-ql.js:38:15:38:18 | name | semmle.label | name |
+| graph-ql.js:38:21:38:25 | title | semmle.label | title |
+| graph-ql.js:39:19:39:22 | name | semmle.label | name |
+| graph-ql.js:39:19:39:30 | name + title | semmle.label | name + title |
+| graph-ql.js:39:26:39:30 | title | semmle.label | title |
+| graph-ql.js:54:21:54:29 | variables | semmle.label | variables |
+| graph-ql.js:65:22:65:30 | { value } | semmle.label | { value } |
+| graph-ql.js:65:24:65:28 | value | semmle.label | value |
+| graph-ql.js:66:23:66:27 | value | semmle.label | value |
 | module.js:9:16:9:29 | req.query.code | semmle.label | req.query.code |
 | module.js:11:17:11:30 | req.query.code | semmle.label | req.query.code |
-| react-native.js:7:7:7:33 | tainted | semmle.label | tainted |
+| react-native.js:7:7:7:13 | tainted | semmle.label | tainted |
 | react-native.js:7:17:7:33 | req.param("code") | semmle.label | req.param("code") |
 | react-native.js:8:32:8:38 | tainted | semmle.label | tainted |
 | react-native.js:10:23:10:29 | tainted | semmle.label | tainted |
@@ -201,11 +239,11 @@ nodes
 | react-server-function.js:4:12:4:12 | x | semmle.label | x |
 | react-server-function.js:4:12:4:29 | x + " from server" | semmle.label | x + " from server" |
 | react.js:11:56:11:77 | documen ... on.hash | semmle.label | documen ... on.hash |
-| react.js:24:9:24:45 | data | semmle.label | data |
+| react.js:24:9:24:12 | data | semmle.label | data |
 | react.js:24:16:24:45 | use(ech ... alue")) | semmle.label | use(ech ... alue")) |
 | react.js:24:20:24:44 | echoSer ... value") [PromiseValue] | semmle.label | echoSer ... value") [PromiseValue] |
 | react.js:25:8:25:11 | data | semmle.label | data |
-| template-sinks.js:18:9:18:31 | tainted | semmle.label | tainted |
+| template-sinks.js:18:9:18:15 | tainted | semmle.label | tainted |
 | template-sinks.js:18:19:18:31 | req.query.foo | semmle.label | req.query.foo |
 | template-sinks.js:20:17:20:23 | tainted | semmle.label | tainted |
 | template-sinks.js:21:16:21:22 | tainted | semmle.label | tainted |
@@ -233,7 +271,7 @@ nodes
 | tst.js:17:11:17:45 | documen ... ring(1) | semmle.label | documen ... ring(1) |
 | tst.js:19:26:19:40 | location.search | semmle.label | location.search |
 | tst.js:19:26:19:53 | locatio ... ring(1) | semmle.label | locatio ... ring(1) |
-| tst.js:22:9:22:82 | source | semmle.label | source |
+| tst.js:22:9:22:14 | source | semmle.label | source |
 | tst.js:22:18:22:41 | documen ... .search | semmle.label | documen ... .search |
 | tst.js:22:18:22:82 | documen ... , "$1") | semmle.label | documen ... , "$1") |
 | tst.js:24:18:24:23 | source | semmle.label | source |
diff --git a/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/ImproperCodeSanitization.expected b/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/ImproperCodeSanitization.expected
index 84c50efddc9..ff58ba1fedc 100644
--- a/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/ImproperCodeSanitization.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/ImproperCodeSanitization.expected
@@ -14,8 +14,8 @@ edges
 | bad-code-sanitization.js:7:21:7:70 | `${name ... key])}` | bad-code-sanitization.js:7:5:7:14 | [post update] statements [ArrayElement] | provenance |  |
 | bad-code-sanitization.js:7:31:7:43 | safeProp(key) | bad-code-sanitization.js:7:21:7:70 | `${name ... key])}` | provenance |  |
 | bad-code-sanitization.js:8:27:8:36 | statements [ArrayElement] | bad-code-sanitization.js:8:27:8:46 | statements.join(';') | provenance |  |
-| bad-code-sanitization.js:63:11:63:55 | assignment | bad-code-sanitization.js:64:27:64:36 | assignment | provenance |  |
-| bad-code-sanitization.js:63:31:63:49 | JSON.stringify(key) | bad-code-sanitization.js:63:11:63:55 | assignment | provenance |  |
+| bad-code-sanitization.js:63:11:63:20 | assignment | bad-code-sanitization.js:64:27:64:36 | assignment | provenance |  |
+| bad-code-sanitization.js:63:31:63:49 | JSON.stringify(key) | bad-code-sanitization.js:63:11:63:20 | assignment | provenance |  |
 nodes
 | bad-code-sanitization.js:2:12:2:90 | /^[_$a- ... key)}]` | semmle.label | /^[_$a- ... key)}]` |
 | bad-code-sanitization.js:2:69:2:87 | JSON.stringify(key) | semmle.label | JSON.stringify(key) |
@@ -32,7 +32,7 @@ nodes
 | bad-code-sanitization.js:52:28:52:62 | JSON.st ... bble")) | semmle.label | JSON.st ... bble")) |
 | bad-code-sanitization.js:54:29:54:63 | JSON.st ... bble")) | semmle.label | JSON.st ... bble")) |
 | bad-code-sanitization.js:58:29:58:49 | JSON.st ... (taint) | semmle.label | JSON.st ... (taint) |
-| bad-code-sanitization.js:63:11:63:55 | assignment | semmle.label | assignment |
+| bad-code-sanitization.js:63:11:63:20 | assignment | semmle.label | assignment |
 | bad-code-sanitization.js:63:31:63:49 | JSON.stringify(key) | semmle.label | JSON.stringify(key) |
 | bad-code-sanitization.js:64:27:64:36 | assignment | semmle.label | assignment |
 subpaths
diff --git a/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/graph-ql.js b/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/graph-ql.js
new file mode 100644
index 00000000000..167292330d2
--- /dev/null
+++ b/javascript/ql/test/query-tests/Security/CWE-094/CodeInjection/graph-ql.js
@@ -0,0 +1,82 @@
+const express = require('express');
+const { graphql, buildSchema, GraphQLObjectType, GraphQLString } = require('graphql');
+
+const app = express();
+app.use(express.json());
+
+const schema = buildSchema(`
+  type Query {
+    greet(name: String!): String
+    calc(expr: String!): String
+  }
+`);
+
+const root = {
+  greet: ({ name }) => {
+    return `Hello, ${name}!`;
+  },
+  calc: ({ expr }) => {
+    try {
+      return eval(expr).toString(); // $ Alert[js/code-injection]
+    } catch (e) {
+      return `Error: ${e.message}`;
+    }
+  }
+};
+
+app.post('/graphql', async (req, res) => {
+  const { query, variables } = req.body; // $ Source[js/code-injection]
+  const result = await graphql({
+    schema,
+    source: query,
+    rootValue: root,
+    variableValues: variables
+  });
+  res.json(result);
+
+  const root1 = {
+    greet: ({ name, title }) => {
+      return eval(name + title).toString(); // $ Alert[js/code-injection]
+    }
+  };
+  graphql({
+    schema: buildSchema(`
+    type Query {
+      greet(name: String!, title: String): String
+    }
+  `),
+    source: `
+      query GreetUser($name: String!, $title: String) {
+        greet(name: $name, title: $title)
+      }
+    `,
+    rootValue: root1,
+    variableValues: variables
+  });
+
+  const MutationType = new GraphQLObjectType({
+    name: 'Mutation',
+    fields: {
+      runEval: {
+        type: GraphQLString,
+        args: {
+          value: { type: GraphQLString }
+        },
+        resolve: (_, { value }, context) => { // $ Source[js/code-injection]
+          return eval(value); // $ Alert[js/code-injection]
+        }
+      }
+    }
+  });
+  
+  const schema = new GraphQLSchema({
+    query: QueryType,
+    mutation: MutationType
+  });
+
+  await graphql({
+    schema,
+    source: query,
+    variableValues: variables
+  });
+});
diff --git a/javascript/ql/test/query-tests/Security/CWE-094/UnsafeDynamicMethodAccess/UnsafeDynamicMethodAccess.expected b/javascript/ql/test/query-tests/Security/CWE-094/UnsafeDynamicMethodAccess/UnsafeDynamicMethodAccess.expected
index bddb2845709..f6a518629d2 100644
--- a/javascript/ql/test/query-tests/Security/CWE-094/UnsafeDynamicMethodAccess/UnsafeDynamicMethodAccess.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-094/UnsafeDynamicMethodAccess/UnsafeDynamicMethodAccess.expected
@@ -7,19 +7,19 @@
 | tst.js:21:5:21:29 | window[ ... e.name] | tst.js:3:37:3:38 | ev | tst.js:21:5:21:29 | window[ ... e.name] | This method is invoked using a $@, which may allow remote code execution. | tst.js:3:37:3:38 | ev | user-controlled value |
 edges
 | example.js:9:37:9:38 | ev | example.js:10:30:10:31 | ev | provenance |  |
-| example.js:10:9:10:37 | message | example.js:13:12:13:18 | message | provenance |  |
-| example.js:10:19:10:37 | JSON.parse(ev.data) | example.js:10:9:10:37 | message | provenance |  |
+| example.js:10:9:10:15 | message | example.js:13:12:13:18 | message | provenance |  |
+| example.js:10:19:10:37 | JSON.parse(ev.data) | example.js:10:9:10:15 | message | provenance |  |
 | example.js:10:30:10:31 | ev | example.js:10:30:10:36 | ev.data | provenance | Config |
 | example.js:10:30:10:36 | ev.data | example.js:10:19:10:37 | JSON.parse(ev.data) | provenance | Config |
 | example.js:13:12:13:18 | message | example.js:13:12:13:23 | message.name | provenance | Config |
 | example.js:13:12:13:23 | message.name | example.js:13:5:13:24 | window[message.name] | provenance | Config |
 | tst.js:3:37:3:38 | ev | tst.js:4:30:4:31 | ev | provenance |  |
 | tst.js:3:37:3:38 | ev | tst.js:15:12:15:13 | ev | provenance |  |
-| tst.js:4:9:4:37 | message | tst.js:5:12:5:18 | message | provenance |  |
-| tst.js:4:9:4:37 | message | tst.js:6:16:6:22 | message | provenance |  |
-| tst.js:4:9:4:37 | message | tst.js:11:7:11:13 | message | provenance |  |
-| tst.js:4:9:4:37 | message | tst.js:21:17:21:23 | message | provenance |  |
-| tst.js:4:19:4:37 | JSON.parse(ev.data) | tst.js:4:9:4:37 | message | provenance |  |
+| tst.js:4:9:4:15 | message | tst.js:5:12:5:18 | message | provenance |  |
+| tst.js:4:9:4:15 | message | tst.js:6:16:6:22 | message | provenance |  |
+| tst.js:4:9:4:15 | message | tst.js:11:7:11:13 | message | provenance |  |
+| tst.js:4:9:4:15 | message | tst.js:21:17:21:23 | message | provenance |  |
+| tst.js:4:19:4:37 | JSON.parse(ev.data) | tst.js:4:9:4:15 | message | provenance |  |
 | tst.js:4:30:4:31 | ev | tst.js:4:30:4:36 | ev.data | provenance | Config |
 | tst.js:4:30:4:36 | ev.data | tst.js:4:19:4:37 | JSON.parse(ev.data) | provenance | Config |
 | tst.js:5:12:5:18 | message | tst.js:5:12:5:23 | message.name | provenance | Config |
@@ -34,7 +34,7 @@ edges
 | tst.js:21:17:21:28 | message.name | tst.js:21:12:21:28 | '' + message.name | provenance | Config |
 nodes
 | example.js:9:37:9:38 | ev | semmle.label | ev |
-| example.js:10:9:10:37 | message | semmle.label | message |
+| example.js:10:9:10:15 | message | semmle.label | message |
 | example.js:10:19:10:37 | JSON.parse(ev.data) | semmle.label | JSON.parse(ev.data) |
 | example.js:10:30:10:31 | ev | semmle.label | ev |
 | example.js:10:30:10:36 | ev.data | semmle.label | ev.data |
@@ -42,7 +42,7 @@ nodes
 | example.js:13:12:13:18 | message | semmle.label | message |
 | example.js:13:12:13:23 | message.name | semmle.label | message.name |
 | tst.js:3:37:3:38 | ev | semmle.label | ev |
-| tst.js:4:9:4:37 | message | semmle.label | message |
+| tst.js:4:9:4:15 | message | semmle.label | message |
 | tst.js:4:19:4:37 | JSON.parse(ev.data) | semmle.label | JSON.parse(ev.data) |
 | tst.js:4:30:4:31 | ev | semmle.label | ev |
 | tst.js:4:30:4:36 | ev.data | semmle.label | ev.data |
diff --git a/javascript/ql/test/query-tests/Security/CWE-116/IncompleteSanitization/IncompleteHtmlAttributeSanitization.expected b/javascript/ql/test/query-tests/Security/CWE-116/IncompleteSanitization/IncompleteHtmlAttributeSanitization.expected
index 162ff1c0599..3f1ac1685d7 100644
--- a/javascript/ql/test/query-tests/Security/CWE-116/IncompleteSanitization/IncompleteHtmlAttributeSanitization.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-116/IncompleteSanitization/IncompleteHtmlAttributeSanitization.expected
@@ -13,8 +13,8 @@
 | tst.js:303:10:303:34 | s().rep ... /g, '') | tst.js:303:10:303:34 | s().rep ... /g, '') | tst.js:303:10:303:34 | s().rep ... /g, '') | Cross-site scripting vulnerability as the output of $@ may contain single quotes when it reaches this attribute definition. | tst.js:303:10:303:34 | s().rep ... /g, '') | this final HTML sanitizer step |
 | tst.js:309:10:318:3 | s().rep ... ;";\\n\\t}) | tst.js:309:10:318:3 | s().rep ... ;";\\n\\t}) | tst.js:309:10:318:3 | s().rep ... ;";\\n\\t}) | Cross-site scripting vulnerability as the output of $@ may contain single quotes when it reaches this attribute definition. | tst.js:309:10:318:3 | s().rep ... ;";\\n\\t}) | this final HTML sanitizer step |
 edges
-| tst.js:274:6:274:94 | arr | tst.js:275:9:275:11 | arr | provenance |  |
-| tst.js:274:12:274:94 | s().val ... g , '') | tst.js:274:6:274:94 | arr | provenance |  |
+| tst.js:274:6:274:8 | arr | tst.js:275:9:275:11 | arr | provenance |  |
+| tst.js:274:12:274:94 | s().val ... g , '') | tst.js:274:6:274:8 | arr | provenance |  |
 | tst.js:275:9:275:11 | arr | tst.js:275:9:275:21 | arr.join(" ") | provenance |  |
 nodes
 | tst.js:243:9:243:31 | s().rep ... ]/g,'') | semmle.label | s().rep ... ]/g,'') |
@@ -24,7 +24,7 @@ nodes
 | tst.js:253:21:253:45 | s().rep ... /g, '') | semmle.label | s().rep ... /g, '') |
 | tst.js:254:32:254:56 | s().rep ... /g, '') | semmle.label | s().rep ... /g, '') |
 | tst.js:270:61:270:85 | s().rep ... /g, '') | semmle.label | s().rep ... /g, '') |
-| tst.js:274:6:274:94 | arr | semmle.label | arr |
+| tst.js:274:6:274:8 | arr | semmle.label | arr |
 | tst.js:274:12:274:94 | s().val ... g , '') | semmle.label | s().val ... g , '') |
 | tst.js:275:9:275:11 | arr | semmle.label | arr |
 | tst.js:275:9:275:21 | arr.join(" ") | semmle.label | arr.join(" ") |
diff --git a/javascript/ql/test/query-tests/Security/CWE-117/LogInjection.expected b/javascript/ql/test/query-tests/Security/CWE-117/LogInjection.expected
index 42417a6ac8d..6b192117593 100644
--- a/javascript/ql/test/query-tests/Security/CWE-117/LogInjection.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-117/LogInjection.expected
@@ -24,35 +24,35 @@
 | logInjectionBad.js:129:42:129:50 | RegExp.$1 | logInjectionBad.js:128:30:128:36 | req.url | logInjectionBad.js:129:42:129:50 | RegExp.$1 | Log entry depends on a $@. | logInjectionBad.js:128:30:128:36 | req.url | user-provided value |
 edges
 | logInjectionBad.js:7:25:7:32 | username | logInjectionBad.js:8:38:8:45 | username | provenance |  |
-| logInjectionBad.js:19:9:19:36 | q | logInjectionBad.js:20:20:20:20 | q | provenance |  |
-| logInjectionBad.js:19:13:19:36 | url.par ... , true) | logInjectionBad.js:19:9:19:36 | q | provenance |  |
+| logInjectionBad.js:19:9:19:9 | q | logInjectionBad.js:20:20:20:20 | q | provenance |  |
+| logInjectionBad.js:19:13:19:36 | url.par ... , true) | logInjectionBad.js:19:9:19:9 | q | provenance |  |
 | logInjectionBad.js:19:23:19:29 | req.url | logInjectionBad.js:19:13:19:36 | url.par ... , true) | provenance |  |
-| logInjectionBad.js:20:9:20:35 | username | logInjectionBad.js:22:34:22:41 | username | provenance |  |
-| logInjectionBad.js:20:9:20:35 | username | logInjectionBad.js:23:37:23:44 | username | provenance |  |
-| logInjectionBad.js:20:9:20:35 | username | logInjectionBad.js:24:35:24:42 | username | provenance |  |
-| logInjectionBad.js:20:9:20:35 | username | logInjectionBad.js:25:36:25:43 | username | provenance |  |
-| logInjectionBad.js:20:9:20:35 | username | logInjectionBad.js:28:24:28:31 | username | provenance |  |
-| logInjectionBad.js:20:20:20:20 | q | logInjectionBad.js:20:9:20:35 | username | provenance |  |
+| logInjectionBad.js:20:9:20:16 | username | logInjectionBad.js:22:34:22:41 | username | provenance |  |
+| logInjectionBad.js:20:9:20:16 | username | logInjectionBad.js:23:37:23:44 | username | provenance |  |
+| logInjectionBad.js:20:9:20:16 | username | logInjectionBad.js:24:35:24:42 | username | provenance |  |
+| logInjectionBad.js:20:9:20:16 | username | logInjectionBad.js:25:36:25:43 | username | provenance |  |
+| logInjectionBad.js:20:9:20:16 | username | logInjectionBad.js:28:24:28:31 | username | provenance |  |
+| logInjectionBad.js:20:20:20:20 | q | logInjectionBad.js:20:9:20:16 | username | provenance |  |
 | logInjectionBad.js:22:34:22:41 | username | logInjectionBad.js:22:18:22:43 | `[INFO] ... rname}` | provenance |  |
 | logInjectionBad.js:28:9:28:32 | exceptional return of check_u ... ername) | logInjectionBad.js:29:14:29:18 | error | provenance |  |
 | logInjectionBad.js:28:24:28:31 | username | logInjectionBad.js:7:25:7:32 | username | provenance |  |
 | logInjectionBad.js:28:24:28:31 | username | logInjectionBad.js:28:9:28:32 | exceptional return of check_u ... ername) | provenance |  |
 | logInjectionBad.js:29:14:29:18 | error | logInjectionBad.js:30:42:30:46 | error | provenance |  |
 | logInjectionBad.js:30:42:30:46 | error | logInjectionBad.js:30:23:30:49 | `[ERROR ... rror}"` | provenance |  |
-| logInjectionBad.js:46:9:46:36 | q | logInjectionBad.js:47:20:47:20 | q | provenance |  |
-| logInjectionBad.js:46:13:46:36 | url.par ... , true) | logInjectionBad.js:46:9:46:36 | q | provenance |  |
+| logInjectionBad.js:46:9:46:9 | q | logInjectionBad.js:47:20:47:20 | q | provenance |  |
+| logInjectionBad.js:46:13:46:36 | url.par ... , true) | logInjectionBad.js:46:9:46:9 | q | provenance |  |
 | logInjectionBad.js:46:23:46:29 | req.url | logInjectionBad.js:46:13:46:36 | url.par ... , true) | provenance |  |
-| logInjectionBad.js:47:9:47:35 | username | logInjectionBad.js:49:46:49:53 | username | provenance |  |
-| logInjectionBad.js:47:9:47:35 | username | logInjectionBad.js:50:39:50:46 | username | provenance |  |
-| logInjectionBad.js:47:9:47:35 | username | logInjectionBad.js:51:48:51:55 | username | provenance |  |
-| logInjectionBad.js:47:9:47:35 | username | logInjectionBad.js:52:37:52:44 | username | provenance |  |
-| logInjectionBad.js:47:9:47:35 | username | logInjectionBad.js:53:27:53:34 | username | provenance |  |
-| logInjectionBad.js:47:9:47:35 | username | logInjectionBad.js:54:43:54:50 | username | provenance |  |
-| logInjectionBad.js:47:9:47:35 | username | logInjectionBad.js:55:48:55:55 | username | provenance |  |
-| logInjectionBad.js:47:9:47:35 | username | logInjectionBad.js:56:47:56:54 | username | provenance |  |
-| logInjectionBad.js:47:9:47:35 | username | logInjectionBad.js:57:40:57:47 | username | provenance |  |
-| logInjectionBad.js:47:9:47:35 | username | logInjectionBad.js:58:50:58:57 | username | provenance |  |
-| logInjectionBad.js:47:20:47:20 | q | logInjectionBad.js:47:9:47:35 | username | provenance |  |
+| logInjectionBad.js:47:9:47:16 | username | logInjectionBad.js:49:46:49:53 | username | provenance |  |
+| logInjectionBad.js:47:9:47:16 | username | logInjectionBad.js:50:39:50:46 | username | provenance |  |
+| logInjectionBad.js:47:9:47:16 | username | logInjectionBad.js:51:48:51:55 | username | provenance |  |
+| logInjectionBad.js:47:9:47:16 | username | logInjectionBad.js:52:37:52:44 | username | provenance |  |
+| logInjectionBad.js:47:9:47:16 | username | logInjectionBad.js:53:27:53:34 | username | provenance |  |
+| logInjectionBad.js:47:9:47:16 | username | logInjectionBad.js:54:43:54:50 | username | provenance |  |
+| logInjectionBad.js:47:9:47:16 | username | logInjectionBad.js:55:48:55:55 | username | provenance |  |
+| logInjectionBad.js:47:9:47:16 | username | logInjectionBad.js:56:47:56:54 | username | provenance |  |
+| logInjectionBad.js:47:9:47:16 | username | logInjectionBad.js:57:40:57:47 | username | provenance |  |
+| logInjectionBad.js:47:9:47:16 | username | logInjectionBad.js:58:50:58:57 | username | provenance |  |
+| logInjectionBad.js:47:20:47:20 | q | logInjectionBad.js:47:9:47:16 | username | provenance |  |
 | logInjectionBad.js:49:46:49:53 | username | logInjectionBad.js:49:18:49:54 | ansiCol ... ername) | provenance |  |
 | logInjectionBad.js:50:39:50:46 | username | logInjectionBad.js:50:18:50:47 | colors. ... ername) | provenance |  |
 | logInjectionBad.js:51:27:51:56 | colors. ... ername) | logInjectionBad.js:51:18:51:61 | wrapAns ... e), 20) | provenance |  |
@@ -68,18 +68,18 @@ edges
 | logInjectionBad.js:57:40:57:47 | username | logInjectionBad.js:57:17:57:48 | chalk.u ... ername) | provenance |  |
 | logInjectionBad.js:58:27:58:58 | chalk.u ... ername) | logInjectionBad.js:58:17:58:59 | stripAn ... rname)) | provenance |  |
 | logInjectionBad.js:58:50:58:57 | username | logInjectionBad.js:58:27:58:58 | chalk.u ... ername) | provenance |  |
-| logInjectionBad.js:63:9:63:36 | q | logInjectionBad.js:64:20:64:20 | q | provenance |  |
-| logInjectionBad.js:63:13:63:36 | url.par ... , true) | logInjectionBad.js:63:9:63:36 | q | provenance |  |
+| logInjectionBad.js:63:9:63:9 | q | logInjectionBad.js:64:20:64:20 | q | provenance |  |
+| logInjectionBad.js:63:13:63:36 | url.par ... , true) | logInjectionBad.js:63:9:63:9 | q | provenance |  |
 | logInjectionBad.js:63:23:63:29 | req.url | logInjectionBad.js:63:13:63:36 | url.par ... , true) | provenance |  |
-| logInjectionBad.js:64:9:64:35 | username | logInjectionBad.js:66:35:66:42 | username | provenance |  |
-| logInjectionBad.js:64:20:64:20 | q | logInjectionBad.js:64:9:64:35 | username | provenance |  |
+| logInjectionBad.js:64:9:64:16 | username | logInjectionBad.js:66:35:66:42 | username | provenance |  |
+| logInjectionBad.js:64:20:64:20 | q | logInjectionBad.js:64:9:64:16 | username | provenance |  |
 | logInjectionBad.js:66:35:66:42 | username | logInjectionBad.js:66:17:66:43 | prettyj ... ername) | provenance |  |
-| logInjectionBad.js:72:9:72:36 | q | logInjectionBad.js:73:20:73:20 | q | provenance |  |
-| logInjectionBad.js:72:13:72:36 | url.par ... , true) | logInjectionBad.js:72:9:72:36 | q | provenance |  |
+| logInjectionBad.js:72:9:72:9 | q | logInjectionBad.js:73:20:73:20 | q | provenance |  |
+| logInjectionBad.js:72:13:72:36 | url.par ... , true) | logInjectionBad.js:72:9:72:9 | q | provenance |  |
 | logInjectionBad.js:72:23:72:29 | req.url | logInjectionBad.js:72:13:72:36 | url.par ... , true) | provenance |  |
-| logInjectionBad.js:73:9:73:35 | username | logInjectionBad.js:75:15:75:22 | username | provenance |  |
-| logInjectionBad.js:73:9:73:35 | username | logInjectionBad.js:75:15:75:22 | username | provenance |  |
-| logInjectionBad.js:73:20:73:20 | q | logInjectionBad.js:73:9:73:35 | username | provenance |  |
+| logInjectionBad.js:73:9:73:16 | username | logInjectionBad.js:75:15:75:22 | username | provenance |  |
+| logInjectionBad.js:73:9:73:16 | username | logInjectionBad.js:75:15:75:22 | username | provenance |  |
+| logInjectionBad.js:73:20:73:20 | q | logInjectionBad.js:73:9:73:16 | username | provenance |  |
 | logInjectionBad.js:75:15:75:22 | username | logInjectionBad.js:77:5:85:5 | functio ... ;\\n    } [username] | provenance |  |
 | logInjectionBad.js:75:15:75:22 | username | logInjectionBad.js:87:5:94:5 | functio ... ;\\n    } [username] | provenance |  |
 | logInjectionBad.js:75:15:75:22 | username | logInjectionBad.js:96:5:103:5 | functio ... ;\\n    } [username] | provenance |  |
@@ -88,21 +88,21 @@ edges
 | logInjectionBad.js:87:5:94:5 | functio ... ;\\n    } [username] | logInjectionBad.js:91:26:91:33 | username | provenance |  |
 | logInjectionBad.js:96:5:103:5 | functio ... ;\\n    } [username] | logInjectionBad.js:99:26:99:33 | username | provenance |  |
 | logInjectionBad.js:105:5:118:5 | functio ... ;\\n    } [username] | logInjectionBad.js:113:37:113:44 | username | provenance |  |
-| logInjectionBad.js:122:9:122:58 | username | logInjectionBad.js:123:20:123:27 | username | provenance |  |
-| logInjectionBad.js:122:20:122:43 | url.par ... , true) | logInjectionBad.js:122:9:122:58 | username | provenance |  |
+| logInjectionBad.js:122:9:122:16 | username | logInjectionBad.js:123:20:123:27 | username | provenance |  |
+| logInjectionBad.js:122:20:122:43 | url.par ... , true) | logInjectionBad.js:122:9:122:16 | username | provenance |  |
 | logInjectionBad.js:122:30:122:36 | req.url | logInjectionBad.js:122:20:122:43 | url.par ... , true) | provenance |  |
-| logInjectionBad.js:123:9:123:46 | otherStr | logInjectionBad.js:124:17:124:24 | otherStr | provenance |  |
+| logInjectionBad.js:123:9:123:16 | otherStr | logInjectionBad.js:124:17:124:24 | otherStr | provenance |  |
 | logInjectionBad.js:123:20:123:27 | username | logInjectionBad.js:123:20:123:43 | usernam ... (/.*/g) | provenance |  |
-| logInjectionBad.js:123:20:123:43 | usernam ... (/.*/g) | logInjectionBad.js:123:9:123:46 | otherStr | provenance |  |
+| logInjectionBad.js:123:20:123:43 | usernam ... (/.*/g) | logInjectionBad.js:123:9:123:16 | otherStr | provenance |  |
 | logInjectionBad.js:128:20:128:43 | url.par ... , true) | logInjectionBad.js:129:42:129:50 | RegExp.$1 | provenance |  |
 | logInjectionBad.js:128:30:128:36 | req.url | logInjectionBad.js:128:20:128:43 | url.par ... , true) | provenance |  |
 nodes
 | logInjectionBad.js:7:25:7:32 | username | semmle.label | username |
 | logInjectionBad.js:8:38:8:45 | username | semmle.label | username |
-| logInjectionBad.js:19:9:19:36 | q | semmle.label | q |
+| logInjectionBad.js:19:9:19:9 | q | semmle.label | q |
 | logInjectionBad.js:19:13:19:36 | url.par ... , true) | semmle.label | url.par ... , true) |
 | logInjectionBad.js:19:23:19:29 | req.url | semmle.label | req.url |
-| logInjectionBad.js:20:9:20:35 | username | semmle.label | username |
+| logInjectionBad.js:20:9:20:16 | username | semmle.label | username |
 | logInjectionBad.js:20:20:20:20 | q | semmle.label | q |
 | logInjectionBad.js:22:18:22:43 | `[INFO] ... rname}` | semmle.label | `[INFO] ... rname}` |
 | logInjectionBad.js:22:34:22:41 | username | semmle.label | username |
@@ -114,10 +114,10 @@ nodes
 | logInjectionBad.js:29:14:29:18 | error | semmle.label | error |
 | logInjectionBad.js:30:23:30:49 | `[ERROR ... rror}"` | semmle.label | `[ERROR ... rror}"` |
 | logInjectionBad.js:30:42:30:46 | error | semmle.label | error |
-| logInjectionBad.js:46:9:46:36 | q | semmle.label | q |
+| logInjectionBad.js:46:9:46:9 | q | semmle.label | q |
 | logInjectionBad.js:46:13:46:36 | url.par ... , true) | semmle.label | url.par ... , true) |
 | logInjectionBad.js:46:23:46:29 | req.url | semmle.label | req.url |
-| logInjectionBad.js:47:9:47:35 | username | semmle.label | username |
+| logInjectionBad.js:47:9:47:16 | username | semmle.label | username |
 | logInjectionBad.js:47:20:47:20 | q | semmle.label | q |
 | logInjectionBad.js:49:18:49:54 | ansiCol ... ername) | semmle.label | ansiCol ... ername) |
 | logInjectionBad.js:49:46:49:53 | username | semmle.label | username |
@@ -144,17 +144,17 @@ nodes
 | logInjectionBad.js:58:17:58:59 | stripAn ... rname)) | semmle.label | stripAn ... rname)) |
 | logInjectionBad.js:58:27:58:58 | chalk.u ... ername) | semmle.label | chalk.u ... ername) |
 | logInjectionBad.js:58:50:58:57 | username | semmle.label | username |
-| logInjectionBad.js:63:9:63:36 | q | semmle.label | q |
+| logInjectionBad.js:63:9:63:9 | q | semmle.label | q |
 | logInjectionBad.js:63:13:63:36 | url.par ... , true) | semmle.label | url.par ... , true) |
 | logInjectionBad.js:63:23:63:29 | req.url | semmle.label | req.url |
-| logInjectionBad.js:64:9:64:35 | username | semmle.label | username |
+| logInjectionBad.js:64:9:64:16 | username | semmle.label | username |
 | logInjectionBad.js:64:20:64:20 | q | semmle.label | q |
 | logInjectionBad.js:66:17:66:43 | prettyj ... ername) | semmle.label | prettyj ... ername) |
 | logInjectionBad.js:66:35:66:42 | username | semmle.label | username |
-| logInjectionBad.js:72:9:72:36 | q | semmle.label | q |
+| logInjectionBad.js:72:9:72:9 | q | semmle.label | q |
 | logInjectionBad.js:72:13:72:36 | url.par ... , true) | semmle.label | url.par ... , true) |
 | logInjectionBad.js:72:23:72:29 | req.url | semmle.label | req.url |
-| logInjectionBad.js:73:9:73:35 | username | semmle.label | username |
+| logInjectionBad.js:73:9:73:16 | username | semmle.label | username |
 | logInjectionBad.js:73:20:73:20 | q | semmle.label | q |
 | logInjectionBad.js:75:15:75:22 | username | semmle.label | username |
 | logInjectionBad.js:75:15:75:22 | username | semmle.label | username |
@@ -166,10 +166,10 @@ nodes
 | logInjectionBad.js:99:26:99:33 | username | semmle.label | username |
 | logInjectionBad.js:105:5:118:5 | functio ... ;\\n    } [username] | semmle.label | functio ... ;\\n    } [username] |
 | logInjectionBad.js:113:37:113:44 | username | semmle.label | username |
-| logInjectionBad.js:122:9:122:58 | username | semmle.label | username |
+| logInjectionBad.js:122:9:122:16 | username | semmle.label | username |
 | logInjectionBad.js:122:20:122:43 | url.par ... , true) | semmle.label | url.par ... , true) |
 | logInjectionBad.js:122:30:122:36 | req.url | semmle.label | req.url |
-| logInjectionBad.js:123:9:123:46 | otherStr | semmle.label | otherStr |
+| logInjectionBad.js:123:9:123:16 | otherStr | semmle.label | otherStr |
 | logInjectionBad.js:123:20:123:27 | username | semmle.label | username |
 | logInjectionBad.js:123:20:123:43 | usernam ... (/.*/g) | semmle.label | usernam ... (/.*/g) |
 | logInjectionBad.js:124:17:124:24 | otherStr | semmle.label | otherStr |
diff --git a/javascript/ql/test/query-tests/Security/CWE-200/FileAccessToHttp.expected b/javascript/ql/test/query-tests/Security/CWE-200/FileAccessToHttp.expected
index bde27032d4f..74324c0ebcf 100644
--- a/javascript/ql/test/query-tests/Security/CWE-200/FileAccessToHttp.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-200/FileAccessToHttp.expected
@@ -13,28 +13,28 @@
 | sentAsHeaders.js:14:20:19:9 | {\\n      ...       } | sentAsHeaders.js:10:79:10:84 | buffer | sentAsHeaders.js:14:20:19:9 | {\\n      ...       } | Outbound network request depends on $@. | sentAsHeaders.js:10:79:10:84 | buffer | file data |
 | sentAsHeaders.js:20:20:25:9 | {\\n      ...       } | sentAsHeaders.js:10:79:10:84 | buffer | sentAsHeaders.js:20:20:25:9 | {\\n      ...       } | Outbound network request depends on $@. | sentAsHeaders.js:10:79:10:84 | buffer | file data |
 edges
-| FileAccessToHttp.js:4:5:4:47 | content | FileAccessToHttp.js:9:23:9:29 | content | provenance |  |
-| FileAccessToHttp.js:4:15:4:47 | fs.read ... "utf8") | FileAccessToHttp.js:4:5:4:47 | content | provenance |  |
+| FileAccessToHttp.js:4:5:4:11 | content | FileAccessToHttp.js:9:23:9:29 | content | provenance |  |
+| FileAccessToHttp.js:4:15:4:47 | fs.read ... "utf8") | FileAccessToHttp.js:4:5:4:11 | content | provenance |  |
 | FileAccessToHttp.js:9:12:9:31 | { Referer: content } [Referer] | FileAccessToHttp.js:5:11:10:1 | {\\n  hos ... ent }\\n} | provenance |  |
 | FileAccessToHttp.js:9:23:9:29 | content | FileAccessToHttp.js:9:12:9:31 | { Referer: content } [Referer] | provenance |  |
-| FileAccessToHttp.js:16:11:16:56 | content | FileAccessToHttp.js:22:27:22:33 | content | provenance |  |
-| FileAccessToHttp.js:16:21:16:56 | await f ... "utf8") | FileAccessToHttp.js:16:11:16:56 | content | provenance |  |
+| FileAccessToHttp.js:16:11:16:17 | content | FileAccessToHttp.js:22:27:22:33 | content | provenance |  |
+| FileAccessToHttp.js:16:21:16:56 | await f ... "utf8") | FileAccessToHttp.js:16:11:16:17 | content | provenance |  |
 | FileAccessToHttp.js:22:16:22:35 | { Referer: content } [Referer] | FileAccessToHttp.js:18:15:23:5 | {\\n      ... }\\n    } | provenance |  |
 | FileAccessToHttp.js:22:27:22:33 | content | FileAccessToHttp.js:22:16:22:35 | { Referer: content } [Referer] | provenance |  |
-| FileAccessToHttp.js:34:9:34:57 | buffer | FileAccessToHttp.js:40:25:40:30 | buffer | provenance |  |
-| FileAccessToHttp.js:34:18:34:57 | [Buffer ... (1024)] | FileAccessToHttp.js:34:9:34:57 | buffer | provenance |  |
+| FileAccessToHttp.js:34:9:34:14 | buffer | FileAccessToHttp.js:40:25:40:30 | buffer | provenance |  |
+| FileAccessToHttp.js:34:18:34:57 | [Buffer ... (1024)] | FileAccessToHttp.js:34:9:34:14 | buffer | provenance |  |
 | FileAccessToHttp.js:40:14:40:32 | { Referer: buffer } [Referer] | FileAccessToHttp.js:36:13:41:3 | {\\n    h ... r }\\n  } | provenance |  |
 | FileAccessToHttp.js:40:25:40:30 | buffer | FileAccessToHttp.js:40:14:40:32 | { Referer: buffer } [Referer] | provenance |  |
-| FileAccessToHttp.js:43:9:43:36 | buffer1 | FileAccessToHttp.js:49:25:49:31 | buffer1 | provenance |  |
-| FileAccessToHttp.js:43:19:43:36 | Buffer.alloc(1024) | FileAccessToHttp.js:43:9:43:36 | buffer1 | provenance |  |
+| FileAccessToHttp.js:43:9:43:15 | buffer1 | FileAccessToHttp.js:49:25:49:31 | buffer1 | provenance |  |
+| FileAccessToHttp.js:43:19:43:36 | Buffer.alloc(1024) | FileAccessToHttp.js:43:9:43:15 | buffer1 | provenance |  |
 | FileAccessToHttp.js:49:14:49:65 | { Refer ... ing() } [Referer] | FileAccessToHttp.js:45:13:50:3 | {\\n    h ... ) }\\n  } | provenance |  |
 | FileAccessToHttp.js:49:25:49:31 | buffer1 | FileAccessToHttp.js:49:25:49:52 | buffer1 ... sRead1) | provenance |  |
 | FileAccessToHttp.js:49:25:49:31 | buffer1 | FileAccessToHttp.js:49:25:49:52 | buffer1 ... sRead1) [ArrayElement] | provenance |  |
 | FileAccessToHttp.js:49:25:49:52 | buffer1 ... sRead1) | FileAccessToHttp.js:49:25:49:63 | buffer1 ... tring() | provenance |  |
 | FileAccessToHttp.js:49:25:49:52 | buffer1 ... sRead1) [ArrayElement] | FileAccessToHttp.js:49:25:49:63 | buffer1 ... tring() | provenance |  |
 | FileAccessToHttp.js:49:25:49:63 | buffer1 ... tring() | FileAccessToHttp.js:49:14:49:65 | { Refer ... ing() } [Referer] | provenance |  |
-| FileAccessToHttp.js:52:9:52:36 | buffer2 | FileAccessToHttp.js:53:17:53:23 | buffer2 | provenance |  |
-| FileAccessToHttp.js:52:19:52:36 | Buffer.alloc(1024) | FileAccessToHttp.js:52:9:52:36 | buffer2 | provenance |  |
+| FileAccessToHttp.js:52:9:52:15 | buffer2 | FileAccessToHttp.js:53:17:53:23 | buffer2 | provenance |  |
+| FileAccessToHttp.js:52:19:52:36 | Buffer.alloc(1024) | FileAccessToHttp.js:52:9:52:15 | buffer2 | provenance |  |
 | FileAccessToHttp.js:53:17:53:23 | buffer2 | FileAccessToHttp.js:58:27:58:33 | buffer2 | provenance |  |
 | FileAccessToHttp.js:58:16:58:67 | { Refer ... ing() } [Referer] | FileAccessToHttp.js:54:15:59:5 | {\\n      ... }\\n    } | provenance |  |
 | FileAccessToHttp.js:58:27:58:33 | buffer2 | FileAccessToHttp.js:58:27:58:54 | buffer2 ... sRead2) | provenance |  |
@@ -42,28 +42,28 @@ edges
 | FileAccessToHttp.js:58:27:58:54 | buffer2 ... sRead2) | FileAccessToHttp.js:58:27:58:65 | buffer2 ... tring() | provenance |  |
 | FileAccessToHttp.js:58:27:58:54 | buffer2 ... sRead2) [ArrayElement] | FileAccessToHttp.js:58:27:58:65 | buffer2 ... tring() | provenance |  |
 | FileAccessToHttp.js:58:27:58:65 | buffer2 ... tring() | FileAccessToHttp.js:58:16:58:67 | { Refer ... ing() } [Referer] | provenance |  |
-| bufferRead.js:12:13:12:43 | buffer | bufferRead.js:13:21:13:26 | buffer | provenance |  |
-| bufferRead.js:12:13:12:43 | buffer | bufferRead.js:13:32:13:37 | buffer | provenance |  |
-| bufferRead.js:12:22:12:43 | new Buf ... s.size) | bufferRead.js:12:13:12:43 | buffer | provenance |  |
+| bufferRead.js:12:13:12:18 | buffer | bufferRead.js:13:21:13:26 | buffer | provenance |  |
+| bufferRead.js:12:13:12:18 | buffer | bufferRead.js:13:32:13:37 | buffer | provenance |  |
+| bufferRead.js:12:22:12:43 | new Buf ... s.size) | bufferRead.js:12:13:12:18 | buffer | provenance |  |
 | bufferRead.js:13:21:13:26 | buffer | bufferRead.js:13:32:13:37 | buffer | provenance |  |
 | bufferRead.js:13:32:13:37 | buffer | bufferRead.js:15:26:15:31 | buffer | provenance |  |
-| bufferRead.js:15:15:15:62 | postData | bufferRead.js:32:21:32:28 | postData | provenance |  |
+| bufferRead.js:15:15:15:22 | postData | bufferRead.js:32:21:32:28 | postData | provenance |  |
 | bufferRead.js:15:26:15:31 | buffer | bufferRead.js:15:26:15:62 | buffer. ... esRead) | provenance |  |
-| bufferRead.js:15:26:15:62 | buffer. ... esRead) | bufferRead.js:15:15:15:62 | postData | provenance |  |
+| bufferRead.js:15:26:15:62 | buffer. ... esRead) | bufferRead.js:15:15:15:22 | postData | provenance |  |
 | googlecompiler.js:7:19:7:28 | codestring | googlecompiler.js:14:21:14:30 | codestring | provenance |  |
-| googlecompiler.js:9:7:15:4 | post_data | googlecompiler.js:37:18:37:26 | post_data | provenance |  |
-| googlecompiler.js:9:19:15:4 | queryst ... dy\\n  }) | googlecompiler.js:9:7:15:4 | post_data | provenance |  |
+| googlecompiler.js:9:7:9:15 | post_data | googlecompiler.js:37:18:37:26 | post_data | provenance |  |
+| googlecompiler.js:9:19:15:4 | queryst ... dy\\n  }) | googlecompiler.js:9:7:9:15 | post_data | provenance |  |
 | googlecompiler.js:9:41:15:3 | {\\n      ... ody\\n  } [js_code] | googlecompiler.js:9:19:15:4 | queryst ... dy\\n  }) | provenance |  |
 | googlecompiler.js:14:21:14:30 | codestring | googlecompiler.js:9:41:15:3 | {\\n      ... ody\\n  } [js_code] | provenance |  |
 | googlecompiler.js:43:54:43:57 | data | googlecompiler.js:55:14:55:17 | data | provenance |  |
 | googlecompiler.js:55:14:55:17 | data | googlecompiler.js:7:19:7:28 | codestring | provenance |  |
-| readFileSync.js:5:5:5:39 | data | readFileSync.js:7:11:7:14 | data | provenance |  |
-| readFileSync.js:5:12:5:39 | fs.read ... t.txt") | readFileSync.js:5:5:5:39 | data | provenance |  |
-| readFileSync.js:7:7:7:25 | s | readFileSync.js:25:18:25:18 | s | provenance |  |
+| readFileSync.js:5:5:5:8 | data | readFileSync.js:7:11:7:14 | data | provenance |  |
+| readFileSync.js:5:12:5:39 | fs.read ... t.txt") | readFileSync.js:5:5:5:8 | data | provenance |  |
+| readFileSync.js:7:7:7:7 | s | readFileSync.js:25:18:25:18 | s | provenance |  |
 | readFileSync.js:7:11:7:14 | data | readFileSync.js:7:11:7:25 | data.toString() | provenance |  |
-| readFileSync.js:7:11:7:25 | data.toString() | readFileSync.js:7:7:7:25 | s | provenance |  |
-| readStreamRead.js:13:13:13:35 | chunk | readStreamRead.js:29:19:29:23 | chunk | provenance |  |
-| readStreamRead.js:13:21:13:35 | readable.read() | readStreamRead.js:13:13:13:35 | chunk | provenance |  |
+| readFileSync.js:7:11:7:25 | data.toString() | readFileSync.js:7:7:7:7 | s | provenance |  |
+| readStreamRead.js:13:13:13:17 | chunk | readStreamRead.js:29:19:29:23 | chunk | provenance |  |
+| readStreamRead.js:13:21:13:35 | readable.read() | readStreamRead.js:13:13:13:17 | chunk | provenance |  |
 | request.js:6:19:6:26 | jsonData | request.js:8:12:8:19 | jsonData | provenance |  |
 | request.js:8:12:8:19 | jsonData | request.js:8:11:8:20 | {jsonData} | provenance |  |
 | request.js:13:18:13:24 | xmlData | request.js:22:11:22:17 | xmlData | provenance |  |
@@ -73,14 +73,14 @@ edges
 | request.js:43:51:43:54 | data | request.js:50:13:50:16 | data | provenance |  |
 | request.js:50:13:50:16 | data | request.js:13:18:13:24 | xmlData | provenance |  |
 | sentAsHeaders.js:10:79:10:84 | buffer | sentAsHeaders.js:11:23:11:28 | buffer | provenance |  |
-| sentAsHeaders.js:11:13:11:59 | content | sentAsHeaders.js:12:19:12:25 | content | provenance |  |
+| sentAsHeaders.js:11:13:11:19 | content | sentAsHeaders.js:12:19:12:25 | content | provenance |  |
 | sentAsHeaders.js:11:23:11:28 | buffer | sentAsHeaders.js:11:23:11:59 | buffer. ... esRead) | provenance |  |
-| sentAsHeaders.js:11:23:11:59 | buffer. ... esRead) | sentAsHeaders.js:11:13:11:59 | content | provenance |  |
-| sentAsHeaders.js:12:9:12:81 | content | sentAsHeaders.js:18:47:18:53 | content | provenance |  |
-| sentAsHeaders.js:12:9:12:81 | content | sentAsHeaders.js:24:47:24:53 | content | provenance |  |
+| sentAsHeaders.js:11:23:11:59 | buffer. ... esRead) | sentAsHeaders.js:11:13:11:19 | content | provenance |  |
+| sentAsHeaders.js:12:9:12:15 | content | sentAsHeaders.js:18:47:18:53 | content | provenance |  |
+| sentAsHeaders.js:12:9:12:15 | content | sentAsHeaders.js:24:47:24:53 | content | provenance |  |
 | sentAsHeaders.js:12:19:12:25 | content | sentAsHeaders.js:12:19:12:74 | content ... =", "") | provenance |  |
 | sentAsHeaders.js:12:19:12:74 | content ... =", "") | sentAsHeaders.js:12:19:12:81 | content ... .trim() | provenance |  |
-| sentAsHeaders.js:12:19:12:81 | content ... .trim() | sentAsHeaders.js:12:9:12:81 | content | provenance |  |
+| sentAsHeaders.js:12:19:12:81 | content ... .trim() | sentAsHeaders.js:12:9:12:15 | content | provenance |  |
 | sentAsHeaders.js:18:20:18:55 | { Refer ... ntent } [Referer] | sentAsHeaders.js:14:20:19:9 | {\\n      ...       } | provenance |  |
 | sentAsHeaders.js:18:31:18:53 | "http:/ ... content | sentAsHeaders.js:18:20:18:55 | { Refer ... ntent } [Referer] | provenance |  |
 | sentAsHeaders.js:18:47:18:53 | content | sentAsHeaders.js:18:31:18:53 | "http:/ ... content | provenance |  |
@@ -88,22 +88,22 @@ edges
 | sentAsHeaders.js:24:31:24:53 | "http:/ ... content | sentAsHeaders.js:24:20:24:55 | { Refer ... ntent } [Referer] | provenance |  |
 | sentAsHeaders.js:24:47:24:53 | content | sentAsHeaders.js:24:31:24:53 | "http:/ ... content | provenance |  |
 nodes
-| FileAccessToHttp.js:4:5:4:47 | content | semmle.label | content |
+| FileAccessToHttp.js:4:5:4:11 | content | semmle.label | content |
 | FileAccessToHttp.js:4:15:4:47 | fs.read ... "utf8") | semmle.label | fs.read ... "utf8") |
 | FileAccessToHttp.js:5:11:10:1 | {\\n  hos ... ent }\\n} | semmle.label | {\\n  hos ... ent }\\n} |
 | FileAccessToHttp.js:9:12:9:31 | { Referer: content } [Referer] | semmle.label | { Referer: content } [Referer] |
 | FileAccessToHttp.js:9:23:9:29 | content | semmle.label | content |
-| FileAccessToHttp.js:16:11:16:56 | content | semmle.label | content |
+| FileAccessToHttp.js:16:11:16:17 | content | semmle.label | content |
 | FileAccessToHttp.js:16:21:16:56 | await f ... "utf8") | semmle.label | await f ... "utf8") |
 | FileAccessToHttp.js:18:15:23:5 | {\\n      ... }\\n    } | semmle.label | {\\n      ... }\\n    } |
 | FileAccessToHttp.js:22:16:22:35 | { Referer: content } [Referer] | semmle.label | { Referer: content } [Referer] |
 | FileAccessToHttp.js:22:27:22:33 | content | semmle.label | content |
-| FileAccessToHttp.js:34:9:34:57 | buffer | semmle.label | buffer |
+| FileAccessToHttp.js:34:9:34:14 | buffer | semmle.label | buffer |
 | FileAccessToHttp.js:34:18:34:57 | [Buffer ... (1024)] | semmle.label | [Buffer ... (1024)] |
 | FileAccessToHttp.js:36:13:41:3 | {\\n    h ... r }\\n  } | semmle.label | {\\n    h ... r }\\n  } |
 | FileAccessToHttp.js:40:14:40:32 | { Referer: buffer } [Referer] | semmle.label | { Referer: buffer } [Referer] |
 | FileAccessToHttp.js:40:25:40:30 | buffer | semmle.label | buffer |
-| FileAccessToHttp.js:43:9:43:36 | buffer1 | semmle.label | buffer1 |
+| FileAccessToHttp.js:43:9:43:15 | buffer1 | semmle.label | buffer1 |
 | FileAccessToHttp.js:43:19:43:36 | Buffer.alloc(1024) | semmle.label | Buffer.alloc(1024) |
 | FileAccessToHttp.js:45:13:50:3 | {\\n    h ... ) }\\n  } | semmle.label | {\\n    h ... ) }\\n  } |
 | FileAccessToHttp.js:49:14:49:65 | { Refer ... ing() } [Referer] | semmle.label | { Refer ... ing() } [Referer] |
@@ -111,7 +111,7 @@ nodes
 | FileAccessToHttp.js:49:25:49:52 | buffer1 ... sRead1) | semmle.label | buffer1 ... sRead1) |
 | FileAccessToHttp.js:49:25:49:52 | buffer1 ... sRead1) [ArrayElement] | semmle.label | buffer1 ... sRead1) [ArrayElement] |
 | FileAccessToHttp.js:49:25:49:63 | buffer1 ... tring() | semmle.label | buffer1 ... tring() |
-| FileAccessToHttp.js:52:9:52:36 | buffer2 | semmle.label | buffer2 |
+| FileAccessToHttp.js:52:9:52:15 | buffer2 | semmle.label | buffer2 |
 | FileAccessToHttp.js:52:19:52:36 | Buffer.alloc(1024) | semmle.label | Buffer.alloc(1024) |
 | FileAccessToHttp.js:53:17:53:23 | buffer2 | semmle.label | buffer2 |
 | FileAccessToHttp.js:54:15:59:5 | {\\n      ... }\\n    } | semmle.label | {\\n      ... }\\n    } |
@@ -120,29 +120,29 @@ nodes
 | FileAccessToHttp.js:58:27:58:54 | buffer2 ... sRead2) | semmle.label | buffer2 ... sRead2) |
 | FileAccessToHttp.js:58:27:58:54 | buffer2 ... sRead2) [ArrayElement] | semmle.label | buffer2 ... sRead2) [ArrayElement] |
 | FileAccessToHttp.js:58:27:58:65 | buffer2 ... tring() | semmle.label | buffer2 ... tring() |
-| bufferRead.js:12:13:12:43 | buffer | semmle.label | buffer |
+| bufferRead.js:12:13:12:18 | buffer | semmle.label | buffer |
 | bufferRead.js:12:22:12:43 | new Buf ... s.size) | semmle.label | new Buf ... s.size) |
 | bufferRead.js:13:21:13:26 | buffer | semmle.label | buffer |
 | bufferRead.js:13:32:13:37 | buffer | semmle.label | buffer |
-| bufferRead.js:15:15:15:62 | postData | semmle.label | postData |
+| bufferRead.js:15:15:15:22 | postData | semmle.label | postData |
 | bufferRead.js:15:26:15:31 | buffer | semmle.label | buffer |
 | bufferRead.js:15:26:15:62 | buffer. ... esRead) | semmle.label | buffer. ... esRead) |
 | bufferRead.js:32:21:32:28 | postData | semmle.label | postData |
 | googlecompiler.js:7:19:7:28 | codestring | semmle.label | codestring |
-| googlecompiler.js:9:7:15:4 | post_data | semmle.label | post_data |
+| googlecompiler.js:9:7:9:15 | post_data | semmle.label | post_data |
 | googlecompiler.js:9:19:15:4 | queryst ... dy\\n  }) | semmle.label | queryst ... dy\\n  }) |
 | googlecompiler.js:9:41:15:3 | {\\n      ... ody\\n  } [js_code] | semmle.label | {\\n      ... ody\\n  } [js_code] |
 | googlecompiler.js:14:21:14:30 | codestring | semmle.label | codestring |
 | googlecompiler.js:37:18:37:26 | post_data | semmle.label | post_data |
 | googlecompiler.js:43:54:43:57 | data | semmle.label | data |
 | googlecompiler.js:55:14:55:17 | data | semmle.label | data |
-| readFileSync.js:5:5:5:39 | data | semmle.label | data |
+| readFileSync.js:5:5:5:8 | data | semmle.label | data |
 | readFileSync.js:5:12:5:39 | fs.read ... t.txt") | semmle.label | fs.read ... t.txt") |
-| readFileSync.js:7:7:7:25 | s | semmle.label | s |
+| readFileSync.js:7:7:7:7 | s | semmle.label | s |
 | readFileSync.js:7:11:7:14 | data | semmle.label | data |
 | readFileSync.js:7:11:7:25 | data.toString() | semmle.label | data.toString() |
 | readFileSync.js:25:18:25:18 | s | semmle.label | s |
-| readStreamRead.js:13:13:13:35 | chunk | semmle.label | chunk |
+| readStreamRead.js:13:13:13:17 | chunk | semmle.label | chunk |
 | readStreamRead.js:13:21:13:35 | readable.read() | semmle.label | readable.read() |
 | readStreamRead.js:29:19:29:23 | chunk | semmle.label | chunk |
 | request.js:6:19:6:26 | jsonData | semmle.label | jsonData |
@@ -156,10 +156,10 @@ nodes
 | request.js:43:51:43:54 | data | semmle.label | data |
 | request.js:50:13:50:16 | data | semmle.label | data |
 | sentAsHeaders.js:10:79:10:84 | buffer | semmle.label | buffer |
-| sentAsHeaders.js:11:13:11:59 | content | semmle.label | content |
+| sentAsHeaders.js:11:13:11:19 | content | semmle.label | content |
 | sentAsHeaders.js:11:23:11:28 | buffer | semmle.label | buffer |
 | sentAsHeaders.js:11:23:11:59 | buffer. ... esRead) | semmle.label | buffer. ... esRead) |
-| sentAsHeaders.js:12:9:12:81 | content | semmle.label | content |
+| sentAsHeaders.js:12:9:12:15 | content | semmle.label | content |
 | sentAsHeaders.js:12:19:12:25 | content | semmle.label | content |
 | sentAsHeaders.js:12:19:12:74 | content ... =", "") | semmle.label | content ... =", "") |
 | sentAsHeaders.js:12:19:12:81 | content ... .trim() | semmle.label | content ... .trim() |
diff --git a/javascript/ql/test/query-tests/Security/CWE-312/BuildArtifactLeak.expected b/javascript/ql/test/query-tests/Security/CWE-312/BuildArtifactLeak.expected
index 37c0773b697..59560d7c7f3 100644
--- a/javascript/ql/test/query-tests/Security/CWE-312/BuildArtifactLeak.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-312/BuildArtifactLeak.expected
@@ -1,14 +1,18 @@
+#select
+| build-leaks.js:4:39:6:1 | {\\n    " ... leak]\\n} | build-leaks.js:5:35:5:45 | process.env | build-leaks.js:4:39:6:1 | {\\n    " ... leak]\\n} | This creates a build artifact that depends on $@. | build-leaks.js:5:35:5:45 | process.env | sensitive data returned byprocess environment |
+| build-leaks.js:34:26:34:57 | getEnv( ... ngified | build-leaks.js:15:24:15:34 | process.env | build-leaks.js:34:26:34:57 | getEnv( ... ngified | This creates a build artifact that depends on $@. | build-leaks.js:15:24:15:34 | process.env | sensitive data returned byprocess environment |
+| build-leaks.js:41:43:41:86 | { "proc ... y(pw) } | build-leaks.js:40:14:40:60 | url.par ... assword | build-leaks.js:41:43:41:86 | { "proc ... y(pw) } | This creates a build artifact that depends on $@. | build-leaks.js:40:14:40:60 | url.par ... assword | sensitive data returned byan access to current_password |
 edges
 | build-leaks.js:5:20:5:46 | JSON.st ... ss.env) | build-leaks.js:4:39:6:1 | {\\n    " ... leak]\\n} | provenance |  |
 | build-leaks.js:5:35:5:45 | process.env | build-leaks.js:5:20:5:46 | JSON.st ... ss.env) | provenance |  |
-| build-leaks.js:13:11:19:10 | raw | build-leaks.js:22:36:22:38 | raw | provenance |  |
-| build-leaks.js:13:17:19:10 | Object. ...      }) | build-leaks.js:13:11:19:10 | raw | provenance |  |
+| build-leaks.js:13:11:13:13 | raw | build-leaks.js:22:36:22:38 | raw | provenance |  |
+| build-leaks.js:13:17:19:10 | Object. ...      }) | build-leaks.js:13:11:13:13 | raw | provenance |  |
 | build-leaks.js:15:13:15:15 | [post update] env | build-leaks.js:16:20:16:22 | env | provenance |  |
 | build-leaks.js:15:24:15:34 | process.env | build-leaks.js:15:13:15:15 | [post update] env | provenance | Config |
 | build-leaks.js:16:20:16:22 | env | build-leaks.js:13:17:19:10 | Object. ...      }) | provenance |  |
 | build-leaks.js:16:20:16:22 | env | build-leaks.js:22:49:22:51 | env | provenance |  |
-| build-leaks.js:21:11:26:5 | stringifed [process.env] | build-leaks.js:30:22:30:31 | stringifed [process.env] | provenance |  |
-| build-leaks.js:21:24:26:5 | {\\n      ... )\\n    } [process.env] | build-leaks.js:21:11:26:5 | stringifed [process.env] | provenance |  |
+| build-leaks.js:21:11:21:20 | stringifed [process.env] | build-leaks.js:30:22:30:31 | stringifed [process.env] | provenance |  |
+| build-leaks.js:21:24:26:5 | {\\n      ... )\\n    } [process.env] | build-leaks.js:21:11:21:20 | stringifed [process.env] | provenance |  |
 | build-leaks.js:22:24:25:14 | Object. ...  }, {}) | build-leaks.js:21:24:26:5 | {\\n      ... )\\n    } [process.env] | provenance |  |
 | build-leaks.js:22:36:22:38 | raw | build-leaks.js:22:24:25:14 | Object. ...  }, {}) | provenance | Config |
 | build-leaks.js:22:36:22:38 | raw | build-leaks.js:22:49:22:51 | env | provenance | Config |
@@ -19,20 +23,20 @@ edges
 | build-leaks.js:28:12:31:5 | {\\n      ... d\\n    } [stringified, process.env] | build-leaks.js:34:26:34:45 | getEnv('production') [stringified, process.env] | provenance |  |
 | build-leaks.js:30:22:30:31 | stringifed [process.env] | build-leaks.js:28:12:31:5 | {\\n      ... d\\n    } [stringified, process.env] | provenance |  |
 | build-leaks.js:34:26:34:45 | getEnv('production') [stringified, process.env] | build-leaks.js:34:26:34:57 | getEnv( ... ngified | provenance |  |
-| build-leaks.js:40:9:40:60 | pw | build-leaks.js:41:82:41:83 | pw | provenance |  |
-| build-leaks.js:40:14:40:60 | url.par ... assword | build-leaks.js:40:9:40:60 | pw | provenance |  |
+| build-leaks.js:40:9:40:10 | pw | build-leaks.js:41:82:41:83 | pw | provenance |  |
+| build-leaks.js:40:14:40:60 | url.par ... assword | build-leaks.js:40:9:40:10 | pw | provenance |  |
 | build-leaks.js:41:67:41:84 | JSON.stringify(pw) | build-leaks.js:41:43:41:86 | { "proc ... y(pw) } | provenance |  |
 | build-leaks.js:41:82:41:83 | pw | build-leaks.js:41:67:41:84 | JSON.stringify(pw) | provenance |  |
 nodes
 | build-leaks.js:4:39:6:1 | {\\n    " ... leak]\\n} | semmle.label | {\\n    " ... leak]\\n} |
 | build-leaks.js:5:20:5:46 | JSON.st ... ss.env) | semmle.label | JSON.st ... ss.env) |
 | build-leaks.js:5:35:5:45 | process.env | semmle.label | process.env |
-| build-leaks.js:13:11:19:10 | raw | semmle.label | raw |
+| build-leaks.js:13:11:13:13 | raw | semmle.label | raw |
 | build-leaks.js:13:17:19:10 | Object. ...      }) | semmle.label | Object. ...      }) |
 | build-leaks.js:15:13:15:15 | [post update] env | semmle.label | [post update] env |
 | build-leaks.js:15:24:15:34 | process.env | semmle.label | process.env |
 | build-leaks.js:16:20:16:22 | env | semmle.label | env |
-| build-leaks.js:21:11:26:5 | stringifed [process.env] | semmle.label | stringifed [process.env] |
+| build-leaks.js:21:11:21:20 | stringifed [process.env] | semmle.label | stringifed [process.env] |
 | build-leaks.js:21:24:26:5 | {\\n      ... )\\n    } [process.env] | semmle.label | {\\n      ... )\\n    } [process.env] |
 | build-leaks.js:22:24:25:14 | Object. ...  }, {}) | semmle.label | Object. ...  }, {}) |
 | build-leaks.js:22:36:22:38 | raw | semmle.label | raw |
@@ -45,7 +49,7 @@ nodes
 | build-leaks.js:30:22:30:31 | stringifed [process.env] | semmle.label | stringifed [process.env] |
 | build-leaks.js:34:26:34:45 | getEnv('production') [stringified, process.env] | semmle.label | getEnv('production') [stringified, process.env] |
 | build-leaks.js:34:26:34:57 | getEnv( ... ngified | semmle.label | getEnv( ... ngified |
-| build-leaks.js:40:9:40:60 | pw | semmle.label | pw |
+| build-leaks.js:40:9:40:10 | pw | semmle.label | pw |
 | build-leaks.js:40:14:40:60 | url.par ... assword | semmle.label | url.par ... assword |
 | build-leaks.js:41:43:41:86 | { "proc ... y(pw) } | semmle.label | { "proc ... y(pw) } |
 | build-leaks.js:41:67:41:84 | JSON.stringify(pw) | semmle.label | JSON.stringify(pw) |
@@ -53,7 +57,3 @@ nodes
 subpaths
 | build-leaks.js:22:36:22:38 | raw | build-leaks.js:22:49:22:51 | env | build-leaks.js:24:20:24:22 | env | build-leaks.js:22:24:25:14 | Object. ...  }, {}) |
 | build-leaks.js:22:36:22:38 | raw | build-leaks.js:23:39:23:41 | raw | build-leaks.js:24:20:24:22 | env | build-leaks.js:22:24:25:14 | Object. ...  }, {}) |
-#select
-| build-leaks.js:4:39:6:1 | {\\n    " ... leak]\\n} | build-leaks.js:5:35:5:45 | process.env | build-leaks.js:4:39:6:1 | {\\n    " ... leak]\\n} | This creates a build artifact that depends on $@. | build-leaks.js:5:35:5:45 | process.env | sensitive data returned byprocess environment |
-| build-leaks.js:34:26:34:57 | getEnv( ... ngified | build-leaks.js:15:24:15:34 | process.env | build-leaks.js:34:26:34:57 | getEnv( ... ngified | This creates a build artifact that depends on $@. | build-leaks.js:15:24:15:34 | process.env | sensitive data returned byprocess environment |
-| build-leaks.js:41:43:41:86 | { "proc ... y(pw) } | build-leaks.js:40:14:40:60 | url.par ... assword | build-leaks.js:41:43:41:86 | { "proc ... y(pw) } | This creates a build artifact that depends on $@. | build-leaks.js:40:14:40:60 | url.par ... assword | sensitive data returned byan access to current_password |
diff --git a/javascript/ql/test/query-tests/Security/CWE-312/BuildArtifactLeak.qlref b/javascript/ql/test/query-tests/Security/CWE-312/BuildArtifactLeak.qlref
index ac51e69c797..b0fc1218f95 100644
--- a/javascript/ql/test/query-tests/Security/CWE-312/BuildArtifactLeak.qlref
+++ b/javascript/ql/test/query-tests/Security/CWE-312/BuildArtifactLeak.qlref
@@ -1 +1,2 @@
 query: Security/CWE-312/BuildArtifactLeak.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-312/CleartextLogging.expected b/javascript/ql/test/query-tests/Security/CWE-312/CleartextLogging.expected
index 491c4359fe7..af9e0f485c2 100644
--- a/javascript/ql/test/query-tests/Security/CWE-312/CleartextLogging.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-312/CleartextLogging.expected
@@ -46,18 +46,18 @@ edges
 | passwords.js:10:11:10:18 | password | passwords.js:7:20:7:20 | x | provenance |  |
 | passwords.js:14:31:14:38 | password | passwords.js:14:17:14:38 | name +  ... assword | provenance |  |
 | passwords.js:16:29:16:36 | password | passwords.js:16:17:16:38 | `${name ... sword}` | provenance |  |
-| passwords.js:18:9:20:5 | obj1 [password] | passwords.js:21:17:21:20 | obj1 | provenance |  |
-| passwords.js:18:16:20:5 | {\\n      ... ]\\n    } [password] | passwords.js:18:9:20:5 | obj1 [password] | provenance |  |
+| passwords.js:18:9:18:12 | obj1 [password] | passwords.js:21:17:21:20 | obj1 | provenance |  |
+| passwords.js:18:16:20:5 | {\\n      ... ]\\n    } [password] | passwords.js:18:9:18:12 | obj1 [password] | provenance |  |
 | passwords.js:19:19:19:19 | x | passwords.js:18:16:20:5 | {\\n      ... ]\\n    } [password] | provenance |  |
-| passwords.js:23:9:25:5 | obj2 [x] | passwords.js:26:17:26:20 | obj2 | provenance |  |
-| passwords.js:23:16:25:5 | {\\n      ... ]\\n    } [x] | passwords.js:23:9:25:5 | obj2 [x] | provenance |  |
+| passwords.js:23:9:23:12 | obj2 [x] | passwords.js:26:17:26:20 | obj2 | provenance |  |
+| passwords.js:23:16:25:5 | {\\n      ... ]\\n    } [x] | passwords.js:23:9:23:12 | obj2 [x] | provenance |  |
 | passwords.js:24:12:24:19 | password | passwords.js:23:16:25:5 | {\\n      ... ]\\n    } [x] | provenance |  |
-| passwords.js:77:9:77:55 | temp [encryptedPassword] | passwords.js:78:17:78:20 | temp [encryptedPassword] | provenance |  |
-| passwords.js:77:16:77:55 | { encry ... sword } [encryptedPassword] | passwords.js:77:9:77:55 | temp [encryptedPassword] | provenance |  |
+| passwords.js:77:9:77:12 | temp [encryptedPassword] | passwords.js:78:17:78:20 | temp [encryptedPassword] | provenance |  |
+| passwords.js:77:16:77:55 | { encry ... sword } [encryptedPassword] | passwords.js:77:9:77:12 | temp [encryptedPassword] | provenance |  |
 | passwords.js:77:37:77:53 | req.body.password | passwords.js:77:16:77:55 | { encry ... sword } [encryptedPassword] | provenance |  |
 | passwords.js:78:17:78:20 | temp [encryptedPassword] | passwords.js:78:17:78:38 | temp.en ... assword | provenance |  |
-| passwords.js:80:9:80:25 | secret | passwords.js:81:24:81:29 | secret | provenance |  |
-| passwords.js:80:18:80:25 | password | passwords.js:80:9:80:25 | secret | provenance |  |
+| passwords.js:80:9:80:14 | secret | passwords.js:81:24:81:29 | secret | provenance |  |
+| passwords.js:80:18:80:25 | password | passwords.js:80:9:80:14 | secret | provenance |  |
 | passwords.js:81:24:81:29 | secret | passwords.js:81:17:81:31 | `pw: ${secret}` | provenance |  |
 | passwords.js:93:39:93:46 | password | passwords.js:93:21:93:46 | "Passwo ... assword | provenance |  |
 | passwords.js:98:39:98:46 | password | passwords.js:98:21:98:46 | "Passwo ... assword | provenance |  |
@@ -69,14 +69,14 @@ edges
 | passwords.js:122:31:122:49 | password.toString() | passwords.js:122:17:122:49 | name +  ... tring() | provenance |  |
 | passwords.js:123:31:123:38 | password | passwords.js:123:31:123:48 | password.valueOf() | provenance |  |
 | passwords.js:123:31:123:48 | password.valueOf() | passwords.js:123:17:123:48 | name +  ... lueOf() | provenance |  |
-| passwords.js:127:9:132:5 | config [password] | passwords.js:135:17:135:22 | config | provenance |  |
-| passwords.js:127:9:132:5 | config [x] | passwords.js:135:17:135:22 | config | provenance |  |
-| passwords.js:127:9:132:5 | config [x] | passwords.js:136:17:136:22 | config [x] | provenance |  |
-| passwords.js:127:9:132:5 | config [y] | passwords.js:135:17:135:22 | config | provenance |  |
-| passwords.js:127:9:132:5 | config [y] | passwords.js:137:17:137:22 | config [y] | provenance |  |
-| passwords.js:127:18:132:5 | {\\n      ... ]\\n    } [password] | passwords.js:127:9:132:5 | config [password] | provenance |  |
-| passwords.js:127:18:132:5 | {\\n      ... ]\\n    } [x] | passwords.js:127:9:132:5 | config [x] | provenance |  |
-| passwords.js:127:18:132:5 | {\\n      ... ]\\n    } [y] | passwords.js:127:9:132:5 | config [y] | provenance |  |
+| passwords.js:127:9:127:14 | config [password] | passwords.js:135:17:135:22 | config | provenance |  |
+| passwords.js:127:9:127:14 | config [x] | passwords.js:135:17:135:22 | config | provenance |  |
+| passwords.js:127:9:127:14 | config [x] | passwords.js:136:17:136:22 | config [x] | provenance |  |
+| passwords.js:127:9:127:14 | config [y] | passwords.js:135:17:135:22 | config | provenance |  |
+| passwords.js:127:9:127:14 | config [y] | passwords.js:137:17:137:22 | config [y] | provenance |  |
+| passwords.js:127:18:132:5 | {\\n      ... ]\\n    } [password] | passwords.js:127:9:127:14 | config [password] | provenance |  |
+| passwords.js:127:18:132:5 | {\\n      ... ]\\n    } [x] | passwords.js:127:9:127:14 | config [x] | provenance |  |
+| passwords.js:127:18:132:5 | {\\n      ... ]\\n    } [y] | passwords.js:127:9:127:14 | config [y] | provenance |  |
 | passwords.js:128:19:128:19 | x | passwords.js:127:18:132:5 | {\\n      ... ]\\n    } [password] | provenance |  |
 | passwords.js:130:12:130:19 | password | passwords.js:127:18:132:5 | {\\n      ... ]\\n    } [x] | provenance |  |
 | passwords.js:131:12:131:24 | getPassword() | passwords.js:127:18:132:5 | {\\n      ... ]\\n    } [y] | provenance |  |
@@ -90,8 +90,8 @@ edges
 | passwords.js:142:26:142:34 | arguments [0] | passwords.js:142:26:142:34 | [apply call taint node] | provenance |  |
 | passwords.js:142:26:142:34 | arguments [ArrayElement] | passwords.js:142:26:142:34 | [apply call taint node] | provenance |  |
 | passwords.js:142:26:142:34 | arguments [ArrayElement] | passwords.js:142:26:142:34 | [apply call taint node] | provenance |  |
-| passwords.js:146:9:148:5 | config [x] | passwords.js:149:21:149:26 | config [x] | provenance |  |
-| passwords.js:146:18:148:5 | {\\n      ... ]\\n    } [x] | passwords.js:146:9:148:5 | config [x] | provenance |  |
+| passwords.js:146:9:146:14 | config [x] | passwords.js:149:21:149:26 | config [x] | provenance |  |
+| passwords.js:146:18:148:5 | {\\n      ... ]\\n    } [x] | passwords.js:146:9:146:14 | config [x] | provenance |  |
 | passwords.js:147:12:147:19 | password | passwords.js:146:18:148:5 | {\\n      ... ]\\n    } [x] | provenance |  |
 | passwords.js:149:21:149:26 | config [x] | passwords.js:149:21:149:28 | config.x | provenance |  |
 | passwords.js:149:21:149:28 | config.x | passwords.js:142:26:142:34 | arguments | provenance |  |
@@ -102,9 +102,9 @@ edges
 | passwords.js:150:21:150:31 | process.env | passwords.js:142:26:142:34 | arguments | provenance | Config |
 | passwords.js:150:21:150:31 | process.env | passwords.js:142:26:142:34 | arguments | provenance | Config |
 | passwords.js:150:21:150:31 | process.env | passwords.js:142:26:142:34 | arguments [0] | provenance |  |
-| passwords.js:152:9:152:63 | procdesc | passwords.js:154:21:154:28 | procdesc | provenance |  |
+| passwords.js:152:9:152:16 | procdesc | passwords.js:154:21:154:28 | procdesc | provenance |  |
 | passwords.js:152:20:152:44 | Util.in ... ss.env) | passwords.js:152:20:152:63 | Util.in ... /g, '') | provenance |  |
-| passwords.js:152:20:152:63 | Util.in ... /g, '') | passwords.js:152:9:152:63 | procdesc | provenance |  |
+| passwords.js:152:20:152:63 | Util.in ... /g, '') | passwords.js:152:9:152:16 | procdesc | provenance |  |
 | passwords.js:152:33:152:43 | process.env | passwords.js:152:20:152:44 | Util.in ... ss.env) | provenance |  |
 | passwords.js:154:21:154:28 | procdesc | passwords.js:142:26:142:34 | arguments | provenance |  |
 | passwords.js:154:21:154:28 | procdesc | passwords.js:142:26:142:34 | arguments | provenance | Config |
@@ -131,20 +131,20 @@ nodes
 | passwords.js:14:31:14:38 | password | semmle.label | password |
 | passwords.js:16:17:16:38 | `${name ... sword}` | semmle.label | `${name ... sword}` |
 | passwords.js:16:29:16:36 | password | semmle.label | password |
-| passwords.js:18:9:20:5 | obj1 [password] | semmle.label | obj1 [password] |
+| passwords.js:18:9:18:12 | obj1 [password] | semmle.label | obj1 [password] |
 | passwords.js:18:16:20:5 | {\\n      ... ]\\n    } [password] | semmle.label | {\\n      ... ]\\n    } [password] |
 | passwords.js:19:19:19:19 | x | semmle.label | x |
 | passwords.js:21:17:21:20 | obj1 | semmle.label | obj1 |
-| passwords.js:23:9:25:5 | obj2 [x] | semmle.label | obj2 [x] |
+| passwords.js:23:9:23:12 | obj2 [x] | semmle.label | obj2 [x] |
 | passwords.js:23:16:25:5 | {\\n      ... ]\\n    } [x] | semmle.label | {\\n      ... ]\\n    } [x] |
 | passwords.js:24:12:24:19 | password | semmle.label | password |
 | passwords.js:26:17:26:20 | obj2 | semmle.label | obj2 |
-| passwords.js:77:9:77:55 | temp [encryptedPassword] | semmle.label | temp [encryptedPassword] |
+| passwords.js:77:9:77:12 | temp [encryptedPassword] | semmle.label | temp [encryptedPassword] |
 | passwords.js:77:16:77:55 | { encry ... sword } [encryptedPassword] | semmle.label | { encry ... sword } [encryptedPassword] |
 | passwords.js:77:37:77:53 | req.body.password | semmle.label | req.body.password |
 | passwords.js:78:17:78:20 | temp [encryptedPassword] | semmle.label | temp [encryptedPassword] |
 | passwords.js:78:17:78:38 | temp.en ... assword | semmle.label | temp.en ... assword |
-| passwords.js:80:9:80:25 | secret | semmle.label | secret |
+| passwords.js:80:9:80:14 | secret | semmle.label | secret |
 | passwords.js:80:18:80:25 | password | semmle.label | password |
 | passwords.js:81:17:81:31 | `pw: ${secret}` | semmle.label | `pw: ${secret}` |
 | passwords.js:81:24:81:29 | secret | semmle.label | secret |
@@ -166,9 +166,9 @@ nodes
 | passwords.js:123:17:123:48 | name +  ... lueOf() | semmle.label | name +  ... lueOf() |
 | passwords.js:123:31:123:38 | password | semmle.label | password |
 | passwords.js:123:31:123:48 | password.valueOf() | semmle.label | password.valueOf() |
-| passwords.js:127:9:132:5 | config [password] | semmle.label | config [password] |
-| passwords.js:127:9:132:5 | config [x] | semmle.label | config [x] |
-| passwords.js:127:9:132:5 | config [y] | semmle.label | config [y] |
+| passwords.js:127:9:127:14 | config [password] | semmle.label | config [password] |
+| passwords.js:127:9:127:14 | config [x] | semmle.label | config [x] |
+| passwords.js:127:9:127:14 | config [y] | semmle.label | config [y] |
 | passwords.js:127:18:132:5 | {\\n      ... ]\\n    } [password] | semmle.label | {\\n      ... ]\\n    } [password] |
 | passwords.js:127:18:132:5 | {\\n      ... ]\\n    } [x] | semmle.label | {\\n      ... ]\\n    } [x] |
 | passwords.js:127:18:132:5 | {\\n      ... ]\\n    } [y] | semmle.label | {\\n      ... ]\\n    } [y] |
@@ -187,13 +187,13 @@ nodes
 | passwords.js:142:26:142:34 | arguments [0] | semmle.label | arguments [0] |
 | passwords.js:142:26:142:34 | arguments [ArrayElement] | semmle.label | arguments [ArrayElement] |
 | passwords.js:142:26:142:34 | arguments [ArrayElement] | semmle.label | arguments [ArrayElement] |
-| passwords.js:146:9:148:5 | config [x] | semmle.label | config [x] |
+| passwords.js:146:9:146:14 | config [x] | semmle.label | config [x] |
 | passwords.js:146:18:148:5 | {\\n      ... ]\\n    } [x] | semmle.label | {\\n      ... ]\\n    } [x] |
 | passwords.js:147:12:147:19 | password | semmle.label | password |
 | passwords.js:149:21:149:26 | config [x] | semmle.label | config [x] |
 | passwords.js:149:21:149:28 | config.x | semmle.label | config.x |
 | passwords.js:150:21:150:31 | process.env | semmle.label | process.env |
-| passwords.js:152:9:152:63 | procdesc | semmle.label | procdesc |
+| passwords.js:152:9:152:16 | procdesc | semmle.label | procdesc |
 | passwords.js:152:20:152:44 | Util.in ... ss.env) | semmle.label | Util.in ... ss.env) |
 | passwords.js:152:20:152:63 | Util.in ... /g, '') | semmle.label | Util.in ... /g, '') |
 | passwords.js:152:33:152:43 | process.env | semmle.label | process.env |
diff --git a/javascript/ql/test/query-tests/Security/CWE-312/CleartextStorage.expected b/javascript/ql/test/query-tests/Security/CWE-312/CleartextStorage.expected
index fcb6c03d006..035ea1cae57 100644
--- a/javascript/ql/test/query-tests/Security/CWE-312/CleartextStorage.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-312/CleartextStorage.expected
@@ -10,17 +10,17 @@
 | tst-webstorage.js:3:20:3:32 | data.password | tst-webstorage.js:3:20:3:32 | data.password | tst-webstorage.js:3:20:3:32 | data.password | This stores sensitive data returned by $@ as clear text. | tst-webstorage.js:3:20:3:32 | data.password | an access to password |
 | tst-webstorage.js:4:29:4:41 | data.password | tst-webstorage.js:4:29:4:41 | data.password | tst-webstorage.js:4:29:4:41 | data.password | This stores sensitive data returned by $@ as clear text. | tst-webstorage.js:4:29:4:41 | data.password | an access to password |
 edges
-| CleartextStorage2.js:5:7:5:58 | pw | CleartextStorage2.js:7:33:7:34 | pw | provenance |  |
-| CleartextStorage2.js:5:12:5:58 | url.par ... assword | CleartextStorage2.js:5:7:5:58 | pw | provenance |  |
+| CleartextStorage2.js:5:7:5:8 | pw | CleartextStorage2.js:7:33:7:34 | pw | provenance |  |
+| CleartextStorage2.js:5:12:5:58 | url.par ... assword | CleartextStorage2.js:5:7:5:8 | pw | provenance |  |
 | CleartextStorage2.js:7:33:7:34 | pw | CleartextStorage2.js:7:19:7:34 | 'password=' + pw | provenance |  |
-| CleartextStorage.js:5:7:5:40 | pw | CleartextStorage.js:6:26:6:27 | pw | provenance |  |
-| CleartextStorage.js:5:12:5:40 | req.par ... sword") | CleartextStorage.js:5:7:5:40 | pw | provenance |  |
+| CleartextStorage.js:5:7:5:8 | pw | CleartextStorage.js:6:26:6:27 | pw | provenance |  |
+| CleartextStorage.js:5:12:5:40 | req.par ... sword") | CleartextStorage.js:5:7:5:8 | pw | provenance |  |
 nodes
-| CleartextStorage2.js:5:7:5:58 | pw | semmle.label | pw |
+| CleartextStorage2.js:5:7:5:8 | pw | semmle.label | pw |
 | CleartextStorage2.js:5:12:5:58 | url.par ... assword | semmle.label | url.par ... assword |
 | CleartextStorage2.js:7:19:7:34 | 'password=' + pw | semmle.label | 'password=' + pw |
 | CleartextStorage2.js:7:33:7:34 | pw | semmle.label | pw |
-| CleartextStorage.js:5:7:5:40 | pw | semmle.label | pw |
+| CleartextStorage.js:5:7:5:8 | pw | semmle.label | pw |
 | CleartextStorage.js:5:12:5:40 | req.par ... sword") | semmle.label | req.par ... sword") |
 | CleartextStorage.js:6:26:6:27 | pw | semmle.label | pw |
 | tst-angularjs.js:3:32:3:45 | data1.password | semmle.label | data1.password |
diff --git a/javascript/ql/test/query-tests/Security/CWE-312/build-leaks.js b/javascript/ql/test/query-tests/Security/CWE-312/build-leaks.js
index e99122cb6af..ca81d1fab73 100644
--- a/javascript/ql/test/query-tests/Security/CWE-312/build-leaks.js
+++ b/javascript/ql/test/query-tests/Security/CWE-312/build-leaks.js
@@ -90,4 +90,14 @@ var server = https.createServer(function (req, res) {
     }
 
     new webpack.DefinePlugin(getOnlyReactVariables3());
-})();
\ No newline at end of file
+
+    function getFilteredEnv4() {
+        return ["FOO", "BAR", "BAZ"]
+            .reduce((env, key) => {
+                env[key] = JSON.stringify(process.env[key]);
+                return env;
+            }, {});
+    }
+
+    new webpack.DefinePlugin(getFilteredEnv4());
+})();
diff --git a/javascript/ql/test/query-tests/Security/CWE-327/BrokenCryptoAlgorithm.expected b/javascript/ql/test/query-tests/Security/CWE-327/BrokenCryptoAlgorithm.expected
index 660a49e6bb2..f7e3f04dbb0 100644
--- a/javascript/ql/test/query-tests/Security/CWE-327/BrokenCryptoAlgorithm.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-327/BrokenCryptoAlgorithm.expected
@@ -5,11 +5,11 @@
 | tst.js:22:21:22:30 | secretText | tst.js:3:18:3:24 | trusted | tst.js:22:21:22:30 | secretText | $@ depends on $@. | tst.js:21:22:21:60 | crypto. ... ', key) | A broken or weak cryptographic algorithm | tst.js:3:18:3:24 | trusted | sensitive data from an access to trusted |
 | tst.js:22:21:22:30 | secretText | tst.js:22:21:22:30 | secretText | tst.js:22:21:22:30 | secretText | $@ depends on $@. | tst.js:21:22:21:60 | crypto. ... ', key) | A broken or weak cryptographic algorithm | tst.js:22:21:22:30 | secretText | sensitive data from an access to secretText |
 edges
-| tst.js:3:5:3:24 | secretText | tst.js:11:17:11:26 | secretText | provenance |  |
-| tst.js:3:5:3:24 | secretText | tst.js:22:21:22:30 | secretText | provenance |  |
-| tst.js:3:18:3:24 | trusted | tst.js:3:5:3:24 | secretText | provenance |  |
+| tst.js:3:5:3:14 | secretText | tst.js:11:17:11:26 | secretText | provenance |  |
+| tst.js:3:5:3:14 | secretText | tst.js:22:21:22:30 | secretText | provenance |  |
+| tst.js:3:18:3:24 | trusted | tst.js:3:5:3:14 | secretText | provenance |  |
 nodes
-| tst.js:3:5:3:24 | secretText | semmle.label | secretText |
+| tst.js:3:5:3:14 | secretText | semmle.label | secretText |
 | tst.js:3:18:3:24 | trusted | semmle.label | trusted |
 | tst.js:11:17:11:26 | secretText | semmle.label | secretText |
 | tst.js:17:17:17:25 | o.trusted | semmle.label | o.trusted |
diff --git a/javascript/ql/test/query-tests/Security/CWE-338/InsecureRandomness.expected b/javascript/ql/test/query-tests/Security/CWE-338/InsecureRandomness.expected
index fb24179ae56..cce22e3eee7 100644
--- a/javascript/ql/test/query-tests/Security/CWE-338/InsecureRandomness.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-338/InsecureRandomness.expected
@@ -21,24 +21,24 @@
 | tst.js:118:23:118:63 | Math.fl ... 00_000) | tst.js:118:34:118:46 | Math.random() | tst.js:118:23:118:63 | Math.fl ... 00_000) | This uses a cryptographically insecure random number generated at $@ in a security context. | tst.js:118:34:118:46 | Math.random() | Math.random() |
 | tst.js:120:16:120:28 | Math.random() | tst.js:120:16:120:28 | Math.random() | tst.js:120:16:120:28 | Math.random() | This uses a cryptographically insecure random number generated at $@ in a security context. | tst.js:120:16:120:28 | Math.random() | Math.random() |
 | tst.js:121:18:121:30 | Math.random() | tst.js:121:18:121:30 | Math.random() | tst.js:121:18:121:30 | Math.random() | This uses a cryptographically insecure random number generated at $@ in a security context. | tst.js:121:18:121:30 | Math.random() | Math.random() |
-| tst.js:136:9:136:67 | password | tst.js:136:38:136:50 | Math.random() | tst.js:136:9:136:67 | password | This uses a cryptographically insecure random number generated at $@ in a security context. | tst.js:136:38:136:50 | Math.random() | Math.random() |
+| tst.js:136:9:136:16 | password | tst.js:136:38:136:50 | Math.random() | tst.js:136:9:136:16 | password | This uses a cryptographically insecure random number generated at $@ in a security context. | tst.js:136:38:136:50 | Math.random() | Math.random() |
 edges
 | tst.js:6:31:6:43 | Math.random() | tst.js:6:20:6:43 | "prefix ... andom() | provenance | Config |
-| tst.js:19:9:19:36 | suffix | tst.js:20:31:20:36 | suffix | provenance |  |
+| tst.js:19:9:19:14 | suffix | tst.js:20:31:20:36 | suffix | provenance |  |
 | tst.js:19:18:19:30 | Math.random() | tst.js:19:18:19:36 | Math.random() % 255 | provenance | Config |
-| tst.js:19:18:19:36 | Math.random() % 255 | tst.js:19:9:19:36 | suffix | provenance |  |
+| tst.js:19:18:19:36 | Math.random() % 255 | tst.js:19:9:19:14 | suffix | provenance |  |
 | tst.js:20:31:20:36 | suffix | tst.js:20:20:20:36 | "prefix" + suffix | provenance | Config |
-| tst.js:28:9:28:26 | pw | tst.js:29:20:29:21 | pw | provenance |  |
-| tst.js:28:14:28:26 | Math.random() | tst.js:28:9:28:26 | pw | provenance |  |
+| tst.js:28:9:28:10 | pw | tst.js:29:20:29:21 | pw | provenance |  |
+| tst.js:28:14:28:26 | Math.random() | tst.js:28:9:28:10 | pw | provenance |  |
 | tst.js:41:21:41:33 | Math.random() | tst.js:41:20:41:33 | !Math.random() | provenance | Config |
 | tst.js:61:22:61:34 | Math.random() | tst.js:61:17:61:34 | '' + Math.random() | provenance | Config |
 | tst.js:66:29:66:41 | Math.random() | tst.js:66:18:66:42 | Math.fl ... ndom()) | provenance | Config |
-| tst.js:71:9:71:48 | rand | tst.js:72:34:72:37 | rand | provenance |  |
-| tst.js:71:16:71:48 | Math.fl ... 999999) | tst.js:71:9:71:48 | rand | provenance |  |
+| tst.js:71:9:71:12 | rand | tst.js:72:34:72:37 | rand | provenance |  |
+| tst.js:71:16:71:48 | Math.fl ... 999999) | tst.js:71:9:71:12 | rand | provenance |  |
 | tst.js:71:27:71:39 | Math.random() | tst.js:71:27:71:47 | Math.ra ... 9999999 | provenance | Config |
 | tst.js:71:27:71:47 | Math.ra ... 9999999 | tst.js:71:16:71:48 | Math.fl ... 999999) | provenance | Config |
-| tst.js:72:9:72:48 | concat | tst.js:73:23:73:28 | concat | provenance |  |
-| tst.js:72:18:72:48 | ts.toSt ... tring() | tst.js:72:9:72:48 | concat | provenance |  |
+| tst.js:72:9:72:14 | concat | tst.js:73:23:73:28 | concat | provenance |  |
+| tst.js:72:18:72:48 | ts.toSt ... tring() | tst.js:72:9:72:14 | concat | provenance |  |
 | tst.js:72:34:72:37 | rand | tst.js:72:34:72:48 | rand.toString() | provenance | Config |
 | tst.js:72:34:72:48 | rand.toString() | tst.js:72:18:72:48 | ts.toSt ... tring() | provenance | Config |
 | tst.js:77:16:77:21 | secret | tst.js:77:16:77:21 | secret | provenance |  |
@@ -51,7 +51,7 @@ edges
 | tst.js:117:26:117:54 | Math.ra ... 000_000 | tst.js:117:15:117:55 | Math.fl ... 00_000) | provenance | Config |
 | tst.js:118:34:118:46 | Math.random() | tst.js:118:34:118:62 | Math.ra ... 000_000 | provenance | Config |
 | tst.js:118:34:118:62 | Math.ra ... 000_000 | tst.js:118:23:118:63 | Math.fl ... 00_000) | provenance | Config |
-| tst.js:136:21:136:67 | chars[M ... ength)] | tst.js:136:9:136:67 | password | provenance | Config |
+| tst.js:136:21:136:67 | chars[M ... ength)] | tst.js:136:9:136:16 | password | provenance | Config |
 | tst.js:136:27:136:66 | Math.fl ... length) | tst.js:136:21:136:67 | chars[M ... ength)] | provenance | Config |
 | tst.js:136:38:136:50 | Math.random() | tst.js:136:38:136:65 | Math.ra ... .length | provenance | Config |
 | tst.js:136:38:136:65 | Math.ra ... .length | tst.js:136:27:136:66 | Math.fl ... length) | provenance | Config |
@@ -60,12 +60,12 @@ nodes
 | tst.js:6:20:6:43 | "prefix ... andom() | semmle.label | "prefix ... andom() |
 | tst.js:6:31:6:43 | Math.random() | semmle.label | Math.random() |
 | tst.js:10:20:10:32 | Math.random() | semmle.label | Math.random() |
-| tst.js:19:9:19:36 | suffix | semmle.label | suffix |
+| tst.js:19:9:19:14 | suffix | semmle.label | suffix |
 | tst.js:19:18:19:30 | Math.random() | semmle.label | Math.random() |
 | tst.js:19:18:19:36 | Math.random() % 255 | semmle.label | Math.random() % 255 |
 | tst.js:20:20:20:36 | "prefix" + suffix | semmle.label | "prefix" + suffix |
 | tst.js:20:31:20:36 | suffix | semmle.label | suffix |
-| tst.js:28:9:28:26 | pw | semmle.label | pw |
+| tst.js:28:9:28:10 | pw | semmle.label | pw |
 | tst.js:28:14:28:26 | Math.random() | semmle.label | Math.random() |
 | tst.js:29:20:29:21 | pw | semmle.label | pw |
 | tst.js:41:20:41:33 | !Math.random() | semmle.label | !Math.random() |
@@ -77,11 +77,11 @@ nodes
 | tst.js:61:22:61:34 | Math.random() | semmle.label | Math.random() |
 | tst.js:66:18:66:42 | Math.fl ... ndom()) | semmle.label | Math.fl ... ndom()) |
 | tst.js:66:29:66:41 | Math.random() | semmle.label | Math.random() |
-| tst.js:71:9:71:48 | rand | semmle.label | rand |
+| tst.js:71:9:71:12 | rand | semmle.label | rand |
 | tst.js:71:16:71:48 | Math.fl ... 999999) | semmle.label | Math.fl ... 999999) |
 | tst.js:71:27:71:39 | Math.random() | semmle.label | Math.random() |
 | tst.js:71:27:71:47 | Math.ra ... 9999999 | semmle.label | Math.ra ... 9999999 |
-| tst.js:72:9:72:48 | concat | semmle.label | concat |
+| tst.js:72:9:72:14 | concat | semmle.label | concat |
 | tst.js:72:18:72:48 | ts.toSt ... tring() | semmle.label | ts.toSt ... tring() |
 | tst.js:72:34:72:37 | rand | semmle.label | rand |
 | tst.js:72:34:72:48 | rand.toString() | semmle.label | rand.toString() |
@@ -106,7 +106,7 @@ nodes
 | tst.js:118:34:118:62 | Math.ra ... 000_000 | semmle.label | Math.ra ... 000_000 |
 | tst.js:120:16:120:28 | Math.random() | semmle.label | Math.random() |
 | tst.js:121:18:121:30 | Math.random() | semmle.label | Math.random() |
-| tst.js:136:9:136:67 | password | semmle.label | password |
+| tst.js:136:9:136:16 | password | semmle.label | password |
 | tst.js:136:21:136:67 | chars[M ... ength)] | semmle.label | chars[M ... ength)] |
 | tst.js:136:27:136:66 | Math.fl ... length) | semmle.label | Math.fl ... length) |
 | tst.js:136:38:136:50 | Math.random() | semmle.label | Math.random() |
diff --git a/javascript/ql/test/query-tests/Security/CWE-346/CorsMisconfigurationForCredentials.expected b/javascript/ql/test/query-tests/Security/CWE-346/CorsMisconfigurationForCredentials.expected
index 34b731a12d1..f879a9c865b 100644
--- a/javascript/ql/test/query-tests/Security/CWE-346/CorsMisconfigurationForCredentials.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-346/CorsMisconfigurationForCredentials.expected
@@ -3,11 +3,11 @@
 | tst.js:18:50:18:53 | null | tst.js:18:50:18:53 | null | tst.js:18:50:18:53 | null | $@ leak vulnerability due to a $@. | tst.js:19:5:19:59 | res.set ... , true) | Credential | tst.js:18:50:18:53 | null | misconfigured CORS header value |
 | tst.js:23:50:23:55 | "null" | tst.js:23:50:23:55 | "null" | tst.js:23:50:23:55 | "null" | $@ leak vulnerability due to a $@. | tst.js:24:5:24:59 | res.set ... , true) | Credential | tst.js:23:50:23:55 | "null" | misconfigured CORS header value |
 edges
-| tst.js:12:9:12:54 | origin | tst.js:13:50:13:55 | origin | provenance |  |
-| tst.js:12:18:12:41 | url.par ... , true) | tst.js:12:9:12:54 | origin | provenance |  |
+| tst.js:12:9:12:14 | origin | tst.js:13:50:13:55 | origin | provenance |  |
+| tst.js:12:18:12:41 | url.par ... , true) | tst.js:12:9:12:14 | origin | provenance |  |
 | tst.js:12:28:12:34 | req.url | tst.js:12:18:12:41 | url.par ... , true) | provenance |  |
 nodes
-| tst.js:12:9:12:54 | origin | semmle.label | origin |
+| tst.js:12:9:12:14 | origin | semmle.label | origin |
 | tst.js:12:18:12:41 | url.par ... , true) | semmle.label | url.par ... , true) |
 | tst.js:12:28:12:34 | req.url | semmle.label | req.url |
 | tst.js:13:50:13:55 | origin | semmle.label | origin |
diff --git a/javascript/ql/test/query-tests/Security/CWE-377/InsecureTemporaryFile.expected b/javascript/ql/test/query-tests/Security/CWE-377/InsecureTemporaryFile.expected
index 29e82a60956..adc9540b630 100644
--- a/javascript/ql/test/query-tests/Security/CWE-377/InsecureTemporaryFile.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-377/InsecureTemporaryFile.expected
@@ -5,30 +5,30 @@
 | insecure-temporary-file.js:26:22:26:29 | tmpPath2 | insecure-temporary-file.js:25:32:25:42 | os.tmpdir() | insecure-temporary-file.js:26:22:26:29 | tmpPath2 | Insecure creation of file in $@. | insecure-temporary-file.js:25:32:25:42 | os.tmpdir() | the os temp dir |
 | insecure-temporary-file.js:28:17:28:24 | tmpPath2 | insecure-temporary-file.js:25:32:25:42 | os.tmpdir() | insecure-temporary-file.js:28:17:28:24 | tmpPath2 | Insecure creation of file in $@. | insecure-temporary-file.js:25:32:25:42 | os.tmpdir() | the os temp dir |
 edges
-| insecure-temporary-file.js:7:9:11:5 | tmpLocation | insecure-temporary-file.js:13:22:13:32 | tmpLocation | provenance |  |
-| insecure-temporary-file.js:7:23:11:5 | path.jo ... )\\n    ) | insecure-temporary-file.js:7:9:11:5 | tmpLocation | provenance |  |
+| insecure-temporary-file.js:7:9:7:19 | tmpLocation | insecure-temporary-file.js:13:22:13:32 | tmpLocation | provenance |  |
+| insecure-temporary-file.js:7:23:11:5 | path.jo ... )\\n    ) | insecure-temporary-file.js:7:9:7:19 | tmpLocation | provenance |  |
 | insecure-temporary-file.js:8:21:8:31 | os.tmpdir() | insecure-temporary-file.js:7:23:11:5 | path.jo ... )\\n    ) | provenance |  |
-| insecure-temporary-file.js:15:9:15:34 | tmpPath | insecure-temporary-file.js:17:32:17:38 | tmpPath | provenance |  |
-| insecure-temporary-file.js:15:9:15:34 | tmpPath | insecure-temporary-file.js:23:32:23:38 | tmpPath | provenance |  |
-| insecure-temporary-file.js:15:19:15:34 | "/tmp/something" | insecure-temporary-file.js:15:9:15:34 | tmpPath | provenance |  |
+| insecure-temporary-file.js:15:9:15:15 | tmpPath | insecure-temporary-file.js:17:32:17:38 | tmpPath | provenance |  |
+| insecure-temporary-file.js:15:9:15:15 | tmpPath | insecure-temporary-file.js:23:32:23:38 | tmpPath | provenance |  |
+| insecure-temporary-file.js:15:19:15:34 | "/tmp/something" | insecure-temporary-file.js:15:9:15:15 | tmpPath | provenance |  |
 | insecure-temporary-file.js:17:32:17:38 | tmpPath | insecure-temporary-file.js:17:22:17:49 | path.jo ... /foo/") | provenance |  |
 | insecure-temporary-file.js:23:32:23:38 | tmpPath | insecure-temporary-file.js:23:22:23:49 | path.jo ... /foo/") | provenance |  |
-| insecure-temporary-file.js:25:11:25:92 | tmpPath2 | insecure-temporary-file.js:26:22:26:29 | tmpPath2 | provenance |  |
-| insecure-temporary-file.js:25:11:25:92 | tmpPath2 | insecure-temporary-file.js:28:17:28:24 | tmpPath2 | provenance |  |
-| insecure-temporary-file.js:25:22:25:92 | path.jo ... )}.md`) | insecure-temporary-file.js:25:11:25:92 | tmpPath2 | provenance |  |
+| insecure-temporary-file.js:25:11:25:18 | tmpPath2 | insecure-temporary-file.js:26:22:26:29 | tmpPath2 | provenance |  |
+| insecure-temporary-file.js:25:11:25:18 | tmpPath2 | insecure-temporary-file.js:28:17:28:24 | tmpPath2 | provenance |  |
+| insecure-temporary-file.js:25:22:25:92 | path.jo ... )}.md`) | insecure-temporary-file.js:25:11:25:18 | tmpPath2 | provenance |  |
 | insecure-temporary-file.js:25:32:25:42 | os.tmpdir() | insecure-temporary-file.js:25:22:25:92 | path.jo ... )}.md`) | provenance |  |
 nodes
-| insecure-temporary-file.js:7:9:11:5 | tmpLocation | semmle.label | tmpLocation |
+| insecure-temporary-file.js:7:9:7:19 | tmpLocation | semmle.label | tmpLocation |
 | insecure-temporary-file.js:7:23:11:5 | path.jo ... )\\n    ) | semmle.label | path.jo ... )\\n    ) |
 | insecure-temporary-file.js:8:21:8:31 | os.tmpdir() | semmle.label | os.tmpdir() |
 | insecure-temporary-file.js:13:22:13:32 | tmpLocation | semmle.label | tmpLocation |
-| insecure-temporary-file.js:15:9:15:34 | tmpPath | semmle.label | tmpPath |
+| insecure-temporary-file.js:15:9:15:15 | tmpPath | semmle.label | tmpPath |
 | insecure-temporary-file.js:15:19:15:34 | "/tmp/something" | semmle.label | "/tmp/something" |
 | insecure-temporary-file.js:17:22:17:49 | path.jo ... /foo/") | semmle.label | path.jo ... /foo/") |
 | insecure-temporary-file.js:17:32:17:38 | tmpPath | semmle.label | tmpPath |
 | insecure-temporary-file.js:23:22:23:49 | path.jo ... /foo/") | semmle.label | path.jo ... /foo/") |
 | insecure-temporary-file.js:23:32:23:38 | tmpPath | semmle.label | tmpPath |
-| insecure-temporary-file.js:25:11:25:92 | tmpPath2 | semmle.label | tmpPath2 |
+| insecure-temporary-file.js:25:11:25:18 | tmpPath2 | semmle.label | tmpPath2 |
 | insecure-temporary-file.js:25:22:25:92 | path.jo ... )}.md`) | semmle.label | path.jo ... )}.md`) |
 | insecure-temporary-file.js:25:32:25:42 | os.tmpdir() | semmle.label | os.tmpdir() |
 | insecure-temporary-file.js:26:22:26:29 | tmpPath2 | semmle.label | tmpPath2 |
diff --git a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/PolynomialReDoS.expected b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/PolynomialReDoS.expected
index 7484e72c3f0..d2de005f42a 100644
--- a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/PolynomialReDoS.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/PolynomialReDoS.expected
@@ -111,9 +111,9 @@ edges
 | lib/lib.js:35:28:35:31 | name | lib/lib.js:36:13:36:16 | name | provenance |  |
 | lib/lib.js:41:32:41:35 | name | lib/lib.js:42:17:42:20 | name | provenance |  |
 | lib/lib.js:41:32:41:35 | name | lib/lib.js:44:12:44:15 | name | provenance |  |
-| lib/lib.js:44:5:44:25 | name | lib/lib.js:45:17:45:20 | name | provenance |  |
+| lib/lib.js:44:5:44:8 | name | lib/lib.js:45:17:45:20 | name | provenance |  |
 | lib/lib.js:44:12:44:15 | name | lib/lib.js:44:12:44:25 | name.substr(1) | provenance |  |
-| lib/lib.js:44:12:44:25 | name.substr(1) | lib/lib.js:44:5:44:25 | name | provenance |  |
+| lib/lib.js:44:12:44:25 | name.substr(1) | lib/lib.js:44:5:44:8 | name | provenance |  |
 | lib/lib.js:52:22:52:25 | name | lib/lib.js:53:16:53:19 | name | provenance |  |
 | lib/moduleLib/moduleLib.js:1:28:1:31 | name | lib/moduleLib/moduleLib.js:2:13:2:16 | name | provenance |  |
 | lib/otherLib/js/src/index.js:1:28:1:31 | name | lib/otherLib/js/src/index.js:2:13:2:16 | name | provenance |  |
@@ -131,160 +131,160 @@ edges
 | lib/subLib5/subclass.js:4:10:4:13 | name | lib/subLib5/subclass.js:5:16:5:19 | name | provenance |  |
 | lib/subLib6/index.js:1:32:1:35 | name | lib/subLib6/index.js:2:14:2:17 | name | provenance |  |
 | lib/sublib/factory.js:12:26:12:29 | name | lib/sublib/factory.js:13:24:13:27 | name | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:7:2:7:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:7:2:7:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:8:2:8:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:8:2:8:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:9:2:9:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:9:2:9:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:10:2:10:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:11:2:11:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:11:2:11:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:12:2:12:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:12:2:12:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:13:2:13:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:14:2:14:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:15:2:15:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:15:2:15:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:16:2:16:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:16:2:16:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:17:23:17:29 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:17:23:17:29 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:18:2:18:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:18:2:18:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:19:2:19:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:19:2:19:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:20:2:20:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:20:2:20:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:21:6:21:12 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:25:2:25:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:25:2:25:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:26:2:26:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:27:77:27:83 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:28:76:28:82 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:30:2:30:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:30:2:30:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:31:2:31:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:32:2:32:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:33:2:33:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:33:2:33:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:34:2:34:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:36:2:36:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:36:2:36:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:37:2:37:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:37:2:37:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:38:2:38:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:38:2:38:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:40:2:40:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:40:2:40:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:41:2:41:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:43:2:43:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:43:2:43:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:44:2:44:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:46:9:46:15 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:47:2:47:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:48:2:48:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:48:2:48:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:50:14:50:20 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:50:14:50:20 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:51:26:51:32 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:51:26:51:32 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:52:22:52:28 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:52:22:52:28 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:53:21:53:27 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:53:21:53:27 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:54:22:54:28 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:54:22:54:28 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:55:23:55:29 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:55:23:55:29 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:56:22:56:28 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:56:22:56:28 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:57:25:57:31 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:57:25:57:31 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:58:21:58:27 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:58:21:58:27 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:59:23:59:29 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:59:23:59:29 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:60:17:60:23 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:61:18:61:24 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:62:17:62:23 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:62:17:62:23 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:63:21:63:27 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:63:21:63:27 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:64:24:64:30 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:64:24:64:30 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:65:24:65:30 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:65:24:65:30 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:66:19:66:25 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:66:19:66:25 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:67:18:67:24 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:67:18:67:24 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:71:2:71:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:71:2:71:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:73:2:73:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:73:2:73:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:75:2:75:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:75:2:75:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:77:2:77:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:77:2:77:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:80:2:80:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:80:2:80:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:81:2:81:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:81:2:81:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:82:2:82:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:83:2:83:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:84:2:84:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:86:2:86:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:86:2:86:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:88:2:88:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:88:2:88:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:89:2:89:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:89:2:89:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:90:2:90:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:90:2:90:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:91:2:91:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:92:2:92:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:94:2:94:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:94:2:94:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:95:2:95:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:95:2:95:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:96:2:96:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:96:2:96:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:98:2:98:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:98:2:98:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:100:2:100:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:100:2:100:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:101:2:101:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:101:2:101:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:102:2:102:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:102:2:102:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:103:2:103:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:103:2:103:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:104:2:104:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:104:2:104:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:105:2:105:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:107:2:107:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:107:2:107:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:108:2:108:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:108:2:108:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:109:2:109:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:109:2:109:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:111:2:111:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:111:2:111:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:112:2:112:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:112:2:112:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:114:2:114:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:114:2:114:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:116:2:116:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:116:2:116:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:118:2:118:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:118:2:118:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:127:2:127:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:129:17:129:23 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:132:18:132:24 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:135:21:135:27 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:138:5:138:11 | tainted | provenance |  |
-| polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:5:6:5:32 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:7:2:7:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:7:2:7:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:8:2:8:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:8:2:8:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:9:2:9:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:9:2:9:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:10:2:10:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:11:2:11:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:11:2:11:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:12:2:12:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:12:2:12:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:13:2:13:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:14:2:14:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:15:2:15:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:15:2:15:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:16:2:16:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:16:2:16:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:17:23:17:29 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:17:23:17:29 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:18:2:18:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:18:2:18:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:19:2:19:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:19:2:19:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:20:2:20:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:20:2:20:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:21:6:21:12 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:25:2:25:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:25:2:25:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:26:2:26:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:27:77:27:83 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:28:76:28:82 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:30:2:30:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:30:2:30:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:31:2:31:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:32:2:32:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:33:2:33:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:33:2:33:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:34:2:34:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:36:2:36:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:36:2:36:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:37:2:37:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:37:2:37:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:38:2:38:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:38:2:38:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:40:2:40:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:40:2:40:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:41:2:41:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:43:2:43:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:43:2:43:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:44:2:44:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:46:9:46:15 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:47:2:47:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:48:2:48:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:48:2:48:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:50:14:50:20 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:50:14:50:20 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:51:26:51:32 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:51:26:51:32 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:52:22:52:28 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:52:22:52:28 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:53:21:53:27 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:53:21:53:27 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:54:22:54:28 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:54:22:54:28 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:55:23:55:29 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:55:23:55:29 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:56:22:56:28 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:56:22:56:28 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:57:25:57:31 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:57:25:57:31 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:58:21:58:27 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:58:21:58:27 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:59:23:59:29 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:59:23:59:29 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:60:17:60:23 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:61:18:61:24 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:62:17:62:23 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:62:17:62:23 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:63:21:63:27 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:63:21:63:27 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:64:24:64:30 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:64:24:64:30 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:65:24:65:30 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:65:24:65:30 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:66:19:66:25 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:66:19:66:25 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:67:18:67:24 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:67:18:67:24 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:71:2:71:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:71:2:71:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:73:2:73:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:73:2:73:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:75:2:75:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:75:2:75:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:77:2:77:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:77:2:77:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:80:2:80:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:80:2:80:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:81:2:81:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:81:2:81:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:82:2:82:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:83:2:83:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:84:2:84:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:86:2:86:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:86:2:86:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:88:2:88:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:88:2:88:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:89:2:89:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:89:2:89:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:90:2:90:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:90:2:90:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:91:2:91:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:92:2:92:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:94:2:94:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:94:2:94:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:95:2:95:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:95:2:95:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:96:2:96:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:96:2:96:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:98:2:98:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:98:2:98:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:100:2:100:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:100:2:100:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:101:2:101:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:101:2:101:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:102:2:102:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:102:2:102:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:103:2:103:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:103:2:103:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:104:2:104:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:104:2:104:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:105:2:105:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:107:2:107:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:107:2:107:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:108:2:108:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:108:2:108:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:109:2:109:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:109:2:109:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:111:2:111:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:111:2:111:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:112:2:112:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:112:2:112:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:114:2:114:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:114:2:114:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:116:2:116:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:116:2:116:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:118:2:118:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:118:2:118:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:127:2:127:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:129:17:129:23 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:132:18:132:24 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:135:21:135:27 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:138:5:138:11 | tainted | provenance |  |
+| polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:5:6:5:12 | tainted | provenance |  |
 | polynomial-redos.js:7:2:7:8 | tainted | polynomial-redos.js:8:2:8:8 | tainted | provenance |  |
 | polynomial-redos.js:7:2:7:8 | tainted | polynomial-redos.js:8:2:8:8 | tainted | provenance |  |
 | polynomial-redos.js:8:2:8:8 | tainted | polynomial-redos.js:9:2:9:8 | tainted | provenance |  |
@@ -435,27 +435,27 @@ edges
 | polynomial-redos.js:118:2:118:8 | tainted | polynomial-redos.js:121:18:121:24 | tainted | provenance |  |
 | polynomial-redos.js:118:2:118:8 | tainted | polynomial-redos.js:127:2:127:8 | tainted | provenance |  |
 | polynomial-redos.js:120:2:125:3 | (functi ... os]\\n\\t}) [tainted] | polynomial-redos.js:121:18:121:24 | tainted | provenance |  |
-| polynomial-redos.js:121:7:121:55 | replaced | polynomial-redos.js:123:13:123:20 | replaced | provenance |  |
+| polynomial-redos.js:121:7:121:14 | replaced | polynomial-redos.js:123:13:123:20 | replaced | provenance |  |
 | polynomial-redos.js:121:18:121:24 | tainted | polynomial-redos.js:121:18:121:55 | tainted ... /g, '') | provenance |  |
-| polynomial-redos.js:121:18:121:55 | tainted ... /g, '') | polynomial-redos.js:121:7:121:55 | replaced | provenance |  |
-| polynomial-redos.js:123:3:123:20 | result | polynomial-redos.js:124:12:124:17 | result | provenance |  |
-| polynomial-redos.js:123:13:123:20 | replaced | polynomial-redos.js:123:3:123:20 | result | provenance |  |
+| polynomial-redos.js:121:18:121:55 | tainted ... /g, '') | polynomial-redos.js:121:7:121:14 | replaced | provenance |  |
+| polynomial-redos.js:123:3:123:8 | result | polynomial-redos.js:124:12:124:17 | result | provenance |  |
+| polynomial-redos.js:123:13:123:20 | replaced | polynomial-redos.js:123:3:123:8 | result | provenance |  |
 | polynomial-redos.js:127:2:127:8 | tainted | polynomial-redos.js:129:17:129:23 | tainted | provenance |  |
-| polynomial-redos.js:129:6:129:42 | modified | polynomial-redos.js:130:2:130:9 | modified | provenance |  |
+| polynomial-redos.js:129:6:129:13 | modified | polynomial-redos.js:130:2:130:9 | modified | provenance |  |
 | polynomial-redos.js:129:17:129:23 | tainted | polynomial-redos.js:129:17:129:42 | tainted ... g, "b") | provenance |  |
 | polynomial-redos.js:129:17:129:23 | tainted | polynomial-redos.js:132:18:132:24 | tainted | provenance |  |
-| polynomial-redos.js:129:17:129:42 | tainted ... g, "b") | polynomial-redos.js:129:6:129:42 | modified | provenance |  |
-| polynomial-redos.js:132:6:132:50 | modified2 | polynomial-redos.js:133:2:133:10 | modified2 | provenance |  |
+| polynomial-redos.js:129:17:129:42 | tainted ... g, "b") | polynomial-redos.js:129:6:129:13 | modified | provenance |  |
+| polynomial-redos.js:132:6:132:14 | modified2 | polynomial-redos.js:133:2:133:10 | modified2 | provenance |  |
 | polynomial-redos.js:132:18:132:24 | tainted | polynomial-redos.js:132:18:132:50 | tainted ... g, "e") | provenance |  |
 | polynomial-redos.js:132:18:132:24 | tainted | polynomial-redos.js:135:21:135:27 | tainted | provenance |  |
-| polynomial-redos.js:132:18:132:50 | tainted ... g, "e") | polynomial-redos.js:132:6:132:50 | modified2 | provenance |  |
-| polynomial-redos.js:135:9:135:47 | modified3 | polynomial-redos.js:136:5:136:13 | modified3 | provenance |  |
-| polynomial-redos.js:135:9:135:47 | modified3 | polynomial-redos.js:140:2:140:10 | modified3 | provenance |  |
-| polynomial-redos.js:135:9:135:47 | modified3 | polynomial-redos.js:141:2:141:10 | modified3 | provenance |  |
-| polynomial-redos.js:135:9:135:47 | modified3 | polynomial-redos.js:142:2:142:10 | modified3 | provenance |  |
+| polynomial-redos.js:132:18:132:50 | tainted ... g, "e") | polynomial-redos.js:132:6:132:14 | modified2 | provenance |  |
+| polynomial-redos.js:135:9:135:17 | modified3 | polynomial-redos.js:136:5:136:13 | modified3 | provenance |  |
+| polynomial-redos.js:135:9:135:17 | modified3 | polynomial-redos.js:140:2:140:10 | modified3 | provenance |  |
+| polynomial-redos.js:135:9:135:17 | modified3 | polynomial-redos.js:141:2:141:10 | modified3 | provenance |  |
+| polynomial-redos.js:135:9:135:17 | modified3 | polynomial-redos.js:142:2:142:10 | modified3 | provenance |  |
 | polynomial-redos.js:135:21:135:27 | tainted | polynomial-redos.js:135:21:135:47 | tainted ... /g, "") | provenance |  |
 | polynomial-redos.js:135:21:135:27 | tainted | polynomial-redos.js:138:5:138:11 | tainted | provenance |  |
-| polynomial-redos.js:135:21:135:47 | tainted ... /g, "") | polynomial-redos.js:135:9:135:47 | modified3 | provenance |  |
+| polynomial-redos.js:135:21:135:47 | tainted ... /g, "") | polynomial-redos.js:135:9:135:17 | modified3 | provenance |  |
 nodes
 | lib/closure.js:3:21:3:21 | x | semmle.label | x |
 | lib/closure.js:4:16:4:16 | x | semmle.label | x |
@@ -472,7 +472,7 @@ nodes
 | lib/lib.js:36:13:36:16 | name | semmle.label | name |
 | lib/lib.js:41:32:41:35 | name | semmle.label | name |
 | lib/lib.js:42:17:42:20 | name | semmle.label | name |
-| lib/lib.js:44:5:44:25 | name | semmle.label | name |
+| lib/lib.js:44:5:44:8 | name | semmle.label | name |
 | lib/lib.js:44:12:44:15 | name | semmle.label | name |
 | lib/lib.js:44:12:44:25 | name.substr(1) | semmle.label | name.substr(1) |
 | lib/lib.js:45:17:45:20 | name | semmle.label | name |
@@ -505,7 +505,7 @@ nodes
 | lib/subLib6/index.js:2:14:2:17 | name | semmle.label | name |
 | lib/sublib/factory.js:12:26:12:29 | name | semmle.label | name |
 | lib/sublib/factory.js:13:24:13:27 | name | semmle.label | name |
-| polynomial-redos.js:5:6:5:32 | tainted | semmle.label | tainted |
+| polynomial-redos.js:5:6:5:12 | tainted | semmle.label | tainted |
 | polynomial-redos.js:5:16:5:32 | req.query.tainted | semmle.label | req.query.tainted |
 | polynomial-redos.js:7:2:7:8 | tainted | semmle.label | tainted |
 | polynomial-redos.js:7:2:7:8 | tainted | semmle.label | tainted |
@@ -658,22 +658,22 @@ nodes
 | polynomial-redos.js:118:2:118:8 | tainted | semmle.label | tainted |
 | polynomial-redos.js:118:2:118:8 | tainted | semmle.label | tainted |
 | polynomial-redos.js:120:2:125:3 | (functi ... os]\\n\\t}) [tainted] | semmle.label | (functi ... os]\\n\\t}) [tainted] |
-| polynomial-redos.js:121:7:121:55 | replaced | semmle.label | replaced |
+| polynomial-redos.js:121:7:121:14 | replaced | semmle.label | replaced |
 | polynomial-redos.js:121:18:121:24 | tainted | semmle.label | tainted |
 | polynomial-redos.js:121:18:121:55 | tainted ... /g, '') | semmle.label | tainted ... /g, '') |
-| polynomial-redos.js:123:3:123:20 | result | semmle.label | result |
+| polynomial-redos.js:123:3:123:8 | result | semmle.label | result |
 | polynomial-redos.js:123:13:123:20 | replaced | semmle.label | replaced |
 | polynomial-redos.js:124:12:124:17 | result | semmle.label | result |
 | polynomial-redos.js:127:2:127:8 | tainted | semmle.label | tainted |
-| polynomial-redos.js:129:6:129:42 | modified | semmle.label | modified |
+| polynomial-redos.js:129:6:129:13 | modified | semmle.label | modified |
 | polynomial-redos.js:129:17:129:23 | tainted | semmle.label | tainted |
 | polynomial-redos.js:129:17:129:42 | tainted ... g, "b") | semmle.label | tainted ... g, "b") |
 | polynomial-redos.js:130:2:130:9 | modified | semmle.label | modified |
-| polynomial-redos.js:132:6:132:50 | modified2 | semmle.label | modified2 |
+| polynomial-redos.js:132:6:132:14 | modified2 | semmle.label | modified2 |
 | polynomial-redos.js:132:18:132:24 | tainted | semmle.label | tainted |
 | polynomial-redos.js:132:18:132:50 | tainted ... g, "e") | semmle.label | tainted ... g, "e") |
 | polynomial-redos.js:133:2:133:10 | modified2 | semmle.label | modified2 |
-| polynomial-redos.js:135:9:135:47 | modified3 | semmle.label | modified3 |
+| polynomial-redos.js:135:9:135:17 | modified3 | semmle.label | modified3 |
 | polynomial-redos.js:135:21:135:27 | tainted | semmle.label | tainted |
 | polynomial-redos.js:135:21:135:47 | tainted ... /g, "") | semmle.label | tainted ... /g, "") |
 | polynomial-redos.js:136:5:136:13 | modified3 | semmle.label | modified3 |
diff --git a/javascript/ql/test/query-tests/Security/CWE-400/RemovePropertyInjection/RemotePropertyInjection.expected b/javascript/ql/test/query-tests/Security/CWE-400/RemotePropertyInjection/RemotePropertyInjection.expected
similarity index 50%
rename from javascript/ql/test/query-tests/Security/CWE-400/RemovePropertyInjection/RemotePropertyInjection.expected
rename to javascript/ql/test/query-tests/Security/CWE-400/RemotePropertyInjection/RemotePropertyInjection.expected
index 9b486b59333..8096bea00f9 100644
--- a/javascript/ql/test/query-tests/Security/CWE-400/RemovePropertyInjection/RemotePropertyInjection.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-400/RemotePropertyInjection/RemotePropertyInjection.expected
@@ -3,36 +3,42 @@
 | tst.js:13:15:13:18 | prop | tst.js:8:28:8:51 | req.que ... trolled | tst.js:13:15:13:18 | prop | A property name to write to depends on a $@. | tst.js:8:28:8:51 | req.que ... trolled | user-provided value |
 | tst.js:14:31:14:34 | prop | tst.js:8:28:8:51 | req.que ... trolled | tst.js:14:31:14:34 | prop | A property name to write to depends on a $@. | tst.js:8:28:8:51 | req.que ... trolled | user-provided value |
 | tst.js:16:10:16:13 | prop | tst.js:8:28:8:51 | req.que ... trolled | tst.js:16:10:16:13 | prop | A property name to write to depends on a $@. | tst.js:8:28:8:51 | req.que ... trolled | user-provided value |
+| tst.js:22:10:22:12 | key | tst.js:20:14:20:21 | req.body | tst.js:22:10:22:12 | key | A property name to write to depends on a $@. | tst.js:20:14:20:21 | req.body | user-provided value |
 | tstNonExpr.js:8:17:8:23 | userVal | tstNonExpr.js:5:17:5:23 | req.url | tstNonExpr.js:8:17:8:23 | userVal | A header name depends on a $@. | tstNonExpr.js:5:17:5:23 | req.url | user-provided value |
 edges
-| tst.js:8:6:8:52 | prop | tst.js:9:8:9:11 | prop | provenance |  |
-| tst.js:8:6:8:52 | prop | tst.js:13:15:13:18 | prop | provenance |  |
-| tst.js:8:6:8:52 | prop | tst.js:14:31:14:34 | prop | provenance |  |
-| tst.js:8:6:8:52 | prop | tst.js:16:10:16:13 | prop | provenance |  |
-| tst.js:8:13:8:52 | myCoolL ... rolled) | tst.js:8:6:8:52 | prop | provenance |  |
+| tst.js:8:6:8:9 | prop | tst.js:9:8:9:11 | prop | provenance |  |
+| tst.js:8:6:8:9 | prop | tst.js:13:15:13:18 | prop | provenance |  |
+| tst.js:8:6:8:9 | prop | tst.js:14:31:14:34 | prop | provenance |  |
+| tst.js:8:6:8:9 | prop | tst.js:16:10:16:13 | prop | provenance |  |
+| tst.js:8:13:8:52 | myCoolL ... rolled) | tst.js:8:6:8:9 | prop | provenance |  |
 | tst.js:8:28:8:51 | req.que ... trolled | tst.js:8:13:8:52 | myCoolL ... rolled) | provenance |  |
-| tst.js:8:28:8:51 | req.que ... trolled | tst.js:21:25:21:25 | x | provenance |  |
-| tst.js:21:25:21:25 | x | tst.js:22:15:22:15 | x | provenance |  |
-| tst.js:22:6:22:15 | result | tst.js:23:9:23:14 | result | provenance |  |
-| tst.js:22:15:22:15 | x | tst.js:22:6:22:15 | result | provenance |  |
-| tst.js:23:9:23:14 | result | tst.js:23:9:23:42 | result. ... length) | provenance |  |
-| tstNonExpr.js:5:7:5:23 | userVal | tstNonExpr.js:8:17:8:23 | userVal | provenance |  |
-| tstNonExpr.js:5:17:5:23 | req.url | tstNonExpr.js:5:7:5:23 | userVal | provenance |  |
+| tst.js:8:28:8:51 | req.que ... trolled | tst.js:27:25:27:25 | x | provenance |  |
+| tst.js:20:14:20:21 | req.body | tst.js:21:3:21:5 | key | provenance | Config |
+| tst.js:21:3:21:5 | key | tst.js:22:10:22:12 | key | provenance |  |
+| tst.js:27:25:27:25 | x | tst.js:28:15:28:15 | x | provenance |  |
+| tst.js:28:6:28:11 | result | tst.js:29:9:29:14 | result | provenance |  |
+| tst.js:28:15:28:15 | x | tst.js:28:6:28:11 | result | provenance |  |
+| tst.js:29:9:29:14 | result | tst.js:29:9:29:42 | result. ... length) | provenance |  |
+| tstNonExpr.js:5:7:5:13 | userVal | tstNonExpr.js:8:17:8:23 | userVal | provenance |  |
+| tstNonExpr.js:5:17:5:23 | req.url | tstNonExpr.js:5:7:5:13 | userVal | provenance |  |
 nodes
-| tst.js:8:6:8:52 | prop | semmle.label | prop |
+| tst.js:8:6:8:9 | prop | semmle.label | prop |
 | tst.js:8:13:8:52 | myCoolL ... rolled) | semmle.label | myCoolL ... rolled) |
 | tst.js:8:28:8:51 | req.que ... trolled | semmle.label | req.que ... trolled |
 | tst.js:9:8:9:11 | prop | semmle.label | prop |
 | tst.js:13:15:13:18 | prop | semmle.label | prop |
 | tst.js:14:31:14:34 | prop | semmle.label | prop |
 | tst.js:16:10:16:13 | prop | semmle.label | prop |
-| tst.js:21:25:21:25 | x | semmle.label | x |
-| tst.js:22:6:22:15 | result | semmle.label | result |
-| tst.js:22:15:22:15 | x | semmle.label | x |
-| tst.js:23:9:23:14 | result | semmle.label | result |
-| tst.js:23:9:23:42 | result. ... length) | semmle.label | result. ... length) |
-| tstNonExpr.js:5:7:5:23 | userVal | semmle.label | userVal |
+| tst.js:20:14:20:21 | req.body | semmle.label | req.body |
+| tst.js:21:3:21:5 | key | semmle.label | key |
+| tst.js:22:10:22:12 | key | semmle.label | key |
+| tst.js:27:25:27:25 | x | semmle.label | x |
+| tst.js:28:6:28:11 | result | semmle.label | result |
+| tst.js:28:15:28:15 | x | semmle.label | x |
+| tst.js:29:9:29:14 | result | semmle.label | result |
+| tst.js:29:9:29:42 | result. ... length) | semmle.label | result. ... length) |
+| tstNonExpr.js:5:7:5:13 | userVal | semmle.label | userVal |
 | tstNonExpr.js:5:17:5:23 | req.url | semmle.label | req.url |
 | tstNonExpr.js:8:17:8:23 | userVal | semmle.label | userVal |
 subpaths
-| tst.js:8:28:8:51 | req.que ... trolled | tst.js:21:25:21:25 | x | tst.js:23:9:23:42 | result. ... length) | tst.js:8:13:8:52 | myCoolL ... rolled) |
+| tst.js:8:28:8:51 | req.que ... trolled | tst.js:27:25:27:25 | x | tst.js:29:9:29:42 | result. ... length) | tst.js:8:13:8:52 | myCoolL ... rolled) |
diff --git a/javascript/ql/test/query-tests/Security/CWE-400/RemovePropertyInjection/RemotePropertyInjection.qlref b/javascript/ql/test/query-tests/Security/CWE-400/RemotePropertyInjection/RemotePropertyInjection.qlref
similarity index 100%
rename from javascript/ql/test/query-tests/Security/CWE-400/RemovePropertyInjection/RemotePropertyInjection.qlref
rename to javascript/ql/test/query-tests/Security/CWE-400/RemotePropertyInjection/RemotePropertyInjection.qlref
diff --git a/javascript/ql/test/query-tests/Security/CWE-400/RemovePropertyInjection/tst.js b/javascript/ql/test/query-tests/Security/CWE-400/RemotePropertyInjection/tst.js
similarity index 87%
rename from javascript/ql/test/query-tests/Security/CWE-400/RemovePropertyInjection/tst.js
rename to javascript/ql/test/query-tests/Security/CWE-400/RemotePropertyInjection/tst.js
index 301b7b80881..ebdb07a758b 100644
--- a/javascript/ql/test/query-tests/Security/CWE-400/RemovePropertyInjection/tst.js
+++ b/javascript/ql/test/query-tests/Security/CWE-400/RemotePropertyInjection/tst.js
@@ -16,10 +16,15 @@ app.get('/user/:id', function(req, res) {
 	headers[prop] = 42; // $ Alert
 	res.set(headers);
 	myCoolLocalFct[req.query.x](); // OK - flagged by method name injection
+
+	Object.keys(req.body).forEach( // $ Source
+		key => {
+			myObj[key] = 42; // $ Alert
+		}
+	);
 });
 
 function myCoolLocalFct(x) {
 	var result = x;
 	return result.substring(0, result.length);
-
-}
\ No newline at end of file
+}
diff --git a/javascript/ql/test/query-tests/Security/CWE-400/RemovePropertyInjection/tstNonExpr.js b/javascript/ql/test/query-tests/Security/CWE-400/RemotePropertyInjection/tstNonExpr.js
similarity index 100%
rename from javascript/ql/test/query-tests/Security/CWE-400/RemovePropertyInjection/tstNonExpr.js
rename to javascript/ql/test/query-tests/Security/CWE-400/RemotePropertyInjection/tstNonExpr.js
diff --git a/javascript/ql/test/query-tests/Security/CWE-506/HardcodedDataInterpretedAsCode.expected b/javascript/ql/test/query-tests/Security/CWE-506/HardcodedDataInterpretedAsCode.expected
index 85c44d00905..ffbc8cb2482 100644
--- a/javascript/ql/test/query-tests/Security/CWE-506/HardcodedDataInterpretedAsCode.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-506/HardcodedDataInterpretedAsCode.expected
@@ -14,12 +14,12 @@ edges
 | event-stream.js:6:22:6:22 | r | event-stream.js:6:10:6:30 | Buffer. ...  "hex") | provenance | Config |
 | event-stream.js:9:13:9:36 | "2e2f74 ... 617461" | event-stream.js:5:12:5:12 | r | provenance |  |
 | event-stream.js:9:13:9:36 | "2e2f74 ... 617461" | event-stream.js:9:11:9:37 | e("2e2f ... 17461") | provenance | Config |
-| tst.js:1:5:1:88 | totallyHarmlessString | tst.js:2:18:2:38 | totally ... sString | provenance |  |
-| tst.js:1:29:1:88 | '636f6e ... 6e2729' | tst.js:1:5:1:88 | totallyHarmlessString | provenance |  |
+| tst.js:1:5:1:25 | totallyHarmlessString | tst.js:2:18:2:38 | totally ... sString | provenance |  |
+| tst.js:1:29:1:88 | '636f6e ... 6e2729' | tst.js:1:5:1:25 | totallyHarmlessString | provenance |  |
 | tst.js:2:6:2:46 | Buffer. ...  'hex') | tst.js:2:6:2:57 | Buffer. ... tring() | provenance | Config |
 | tst.js:2:18:2:38 | totally ... sString | tst.js:2:6:2:46 | Buffer. ...  'hex') | provenance | Config |
-| tst.js:5:5:5:23 | test | tst.js:7:8:7:11 | test | provenance |  |
-| tst.js:5:12:5:23 | "0123456789" | tst.js:5:5:5:23 | test | provenance |  |
+| tst.js:5:5:5:8 | test | tst.js:7:8:7:11 | test | provenance |  |
+| tst.js:5:12:5:23 | "0123456789" | tst.js:5:5:5:8 | test | provenance |  |
 | tst.js:7:8:7:11 | test | tst.js:7:8:7:15 | test+"n" | provenance | Config |
 nodes
 | event-stream-orig.js:93:16:93:16 | r | semmle.label | r |
@@ -34,12 +34,12 @@ nodes
 | event-stream.js:6:22:6:22 | r | semmle.label | r |
 | event-stream.js:9:11:9:37 | e("2e2f ... 17461") | semmle.label | e("2e2f ... 17461") |
 | event-stream.js:9:13:9:36 | "2e2f74 ... 617461" | semmle.label | "2e2f74 ... 617461" |
-| tst.js:1:5:1:88 | totallyHarmlessString | semmle.label | totallyHarmlessString |
+| tst.js:1:5:1:25 | totallyHarmlessString | semmle.label | totallyHarmlessString |
 | tst.js:1:29:1:88 | '636f6e ... 6e2729' | semmle.label | '636f6e ... 6e2729' |
 | tst.js:2:6:2:46 | Buffer. ...  'hex') | semmle.label | Buffer. ...  'hex') |
 | tst.js:2:6:2:57 | Buffer. ... tring() | semmle.label | Buffer. ... tring() |
 | tst.js:2:18:2:38 | totally ... sString | semmle.label | totally ... sString |
-| tst.js:5:5:5:23 | test | semmle.label | test |
+| tst.js:5:5:5:8 | test | semmle.label | test |
 | tst.js:5:12:5:23 | "0123456789" | semmle.label | "0123456789" |
 | tst.js:7:8:7:11 | test | semmle.label | test |
 | tst.js:7:8:7:15 | test+"n" | semmle.label | test+"n" |
diff --git a/javascript/ql/test/query-tests/Security/CWE-522-DecompressionBombs/DecompressionBombs.expected b/javascript/ql/test/query-tests/Security/CWE-522-DecompressionBombs/DecompressionBombs.expected
index 11c63c257e8..43fa4f8c6a8 100644
--- a/javascript/ql/test/query-tests/Security/CWE-522-DecompressionBombs/DecompressionBombs.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-522-DecompressionBombs/DecompressionBombs.expected
@@ -74,16 +74,16 @@ edges
 | pako.js:13:14:13:22 | req.files | pako.js:13:14:13:39 | req.fil ... le.data | provenance |  |
 | pako.js:13:14:13:39 | req.fil ... le.data | pako.js:28:19:28:25 | zipFile | provenance |  |
 | pako.js:17:19:17:25 | zipFile | pako.js:18:48:18:54 | zipFile | provenance |  |
-| pako.js:18:11:18:68 | myArray | pako.js:21:31:21:37 | myArray | provenance |  |
-| pako.js:18:21:18:68 | Buffer. ... uffer)) | pako.js:18:11:18:68 | myArray | provenance |  |
+| pako.js:18:11:18:17 | myArray | pako.js:21:31:21:37 | myArray | provenance |  |
+| pako.js:18:21:18:68 | Buffer. ... uffer)) | pako.js:18:11:18:17 | myArray | provenance |  |
 | pako.js:18:33:18:67 | new Uin ... buffer) | pako.js:18:21:18:68 | Buffer. ... uffer)) | provenance |  |
 | pako.js:18:48:18:54 | zipFile | pako.js:18:48:18:66 | zipFile.data.buffer | provenance |  |
 | pako.js:18:48:18:66 | zipFile.data.buffer | pako.js:18:33:18:67 | new Uin ... buffer) | provenance | Config |
 | pako.js:28:19:28:25 | zipFile | pako.js:29:36:29:42 | zipFile | provenance |  |
-| pako.js:29:11:29:62 | myArray | pako.js:32:31:32:37 | myArray | provenance |  |
-| pako.js:29:11:29:62 | myArray [ArrayElement] | pako.js:32:31:32:37 | myArray | provenance |  |
-| pako.js:29:21:29:55 | new Uin ... buffer) | pako.js:29:11:29:62 | myArray | provenance |  |
-| pako.js:29:21:29:55 | new Uin ... buffer) [ArrayElement] | pako.js:29:11:29:62 | myArray [ArrayElement] | provenance |  |
+| pako.js:29:11:29:17 | myArray | pako.js:32:31:32:37 | myArray | provenance |  |
+| pako.js:29:11:29:17 | myArray [ArrayElement] | pako.js:32:31:32:37 | myArray | provenance |  |
+| pako.js:29:21:29:55 | new Uin ... buffer) | pako.js:29:11:29:17 | myArray | provenance |  |
+| pako.js:29:21:29:55 | new Uin ... buffer) [ArrayElement] | pako.js:29:11:29:17 | myArray [ArrayElement] | provenance |  |
 | pako.js:29:36:29:42 | zipFile | pako.js:29:36:29:54 | zipFile.data.buffer | provenance |  |
 | pako.js:29:36:29:54 | zipFile.data.buffer | pako.js:29:21:29:55 | new Uin ... buffer) | provenance | Config |
 | pako.js:29:36:29:54 | zipFile.data.buffer | pako.js:29:21:29:55 | new Uin ... buffer) [ArrayElement] | provenance |  |
@@ -132,8 +132,8 @@ edges
 | zlib.js:75:39:75:45 | zipFile | zlib.js:75:39:75:50 | zipFile.data | provenance |  |
 | zlib.js:75:39:75:50 | zipFile.data | zlib.js:75:25:75:51 | Readabl ... e.data) | provenance | Config |
 | zlib.js:82:43:82:49 | zipFile | zlib.js:83:39:83:45 | zipFile | provenance |  |
-| zlib.js:83:11:83:51 | inputStream | zlib.js:86:9:86:19 | inputStream | provenance |  |
-| zlib.js:83:25:83:51 | Readabl ... e.data) | zlib.js:83:11:83:51 | inputStream | provenance |  |
+| zlib.js:83:11:83:21 | inputStream | zlib.js:86:9:86:19 | inputStream | provenance |  |
+| zlib.js:83:25:83:51 | Readabl ... e.data) | zlib.js:83:11:83:21 | inputStream | provenance |  |
 | zlib.js:83:39:83:45 | zipFile | zlib.js:83:39:83:50 | zipFile.data | provenance |  |
 | zlib.js:83:39:83:50 | zipFile.data | zlib.js:83:25:83:51 | Readabl ... e.data) | provenance | Config |
 | zlib.js:86:9:86:19 | inputStream | zlib.js:87:9:87:27 | zlib.createGunzip() | provenance | Config |
@@ -178,15 +178,15 @@ nodes
 | pako.js:13:14:13:22 | req.files | semmle.label | req.files |
 | pako.js:13:14:13:39 | req.fil ... le.data | semmle.label | req.fil ... le.data |
 | pako.js:17:19:17:25 | zipFile | semmle.label | zipFile |
-| pako.js:18:11:18:68 | myArray | semmle.label | myArray |
+| pako.js:18:11:18:17 | myArray | semmle.label | myArray |
 | pako.js:18:21:18:68 | Buffer. ... uffer)) | semmle.label | Buffer. ... uffer)) |
 | pako.js:18:33:18:67 | new Uin ... buffer) | semmle.label | new Uin ... buffer) |
 | pako.js:18:48:18:54 | zipFile | semmle.label | zipFile |
 | pako.js:18:48:18:66 | zipFile.data.buffer | semmle.label | zipFile.data.buffer |
 | pako.js:21:31:21:37 | myArray | semmle.label | myArray |
 | pako.js:28:19:28:25 | zipFile | semmle.label | zipFile |
-| pako.js:29:11:29:62 | myArray | semmle.label | myArray |
-| pako.js:29:11:29:62 | myArray [ArrayElement] | semmle.label | myArray [ArrayElement] |
+| pako.js:29:11:29:17 | myArray | semmle.label | myArray |
+| pako.js:29:11:29:17 | myArray [ArrayElement] | semmle.label | myArray [ArrayElement] |
 | pako.js:29:21:29:55 | new Uin ... buffer) | semmle.label | new Uin ... buffer) |
 | pako.js:29:21:29:55 | new Uin ... buffer) [ArrayElement] | semmle.label | new Uin ... buffer) [ArrayElement] |
 | pako.js:29:36:29:42 | zipFile | semmle.label | zipFile |
@@ -246,7 +246,7 @@ nodes
 | zlib.js:78:22:78:39 | zlib.createUnzip() | semmle.label | zlib.createUnzip() |
 | zlib.js:79:22:79:50 | zlib.cr ... press() | semmle.label | zlib.cr ... press() |
 | zlib.js:82:43:82:49 | zipFile | semmle.label | zipFile |
-| zlib.js:83:11:83:51 | inputStream | semmle.label | inputStream |
+| zlib.js:83:11:83:21 | inputStream | semmle.label | inputStream |
 | zlib.js:83:25:83:51 | Readabl ... e.data) | semmle.label | Readabl ... e.data) |
 | zlib.js:83:39:83:45 | zipFile | semmle.label | zipFile |
 | zlib.js:83:39:83:50 | zipFile.data | semmle.label | zipFile.data |
diff --git a/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/ClientSideUrlRedirect.expected b/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/ClientSideUrlRedirect.expected
index 243d4b25dfd..d4617441802 100644
--- a/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/ClientSideUrlRedirect.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-601/ClientSideUrlRedirect/ClientSideUrlRedirect.expected
@@ -79,41 +79,41 @@ edges
 | react.js:31:43:31:64 | documen ... on.hash | react.js:31:43:31:74 | documen ... bstr(1) | provenance | Config |
 | react.js:37:43:37:64 | documen ... on.hash | react.js:37:43:37:74 | documen ... bstr(1) | provenance | Config |
 | react.js:43:19:43:40 | documen ... on.hash | react.js:43:19:43:50 | documen ... bstr(1) | provenance | Config |
-| regexp-exec.js:4:11:4:20 | [, group1] | regexp-exec.js:4:11:4:57 | group1 | provenance |  |
-| regexp-exec.js:4:11:4:57 | group1 | regexp-exec.js:5:28:5:33 | group1 | provenance |  |
+| regexp-exec.js:4:11:4:20 | [, group1] | regexp-exec.js:4:14:4:19 | group1 | provenance |  |
+| regexp-exec.js:4:14:4:19 | group1 | regexp-exec.js:5:28:5:33 | group1 | provenance |  |
 | regexp-exec.js:4:24:4:57 | /#(.*)/ ... n.href) | regexp-exec.js:4:11:4:20 | [, group1] | provenance |  |
 | regexp-exec.js:4:37:4:56 | window.location.href | regexp-exec.js:4:24:4:57 | /#(.*)/ ... n.href) | provenance | Config |
-| regexp-exec.js:9:11:9:20 | [, group1] | regexp-exec.js:9:11:9:58 | group1 | provenance |  |
-| regexp-exec.js:9:11:9:58 | group1 | regexp-exec.js:10:28:10:33 | group1 | provenance |  |
+| regexp-exec.js:9:11:9:20 | [, group1] | regexp-exec.js:9:14:9:19 | group1 | provenance |  |
+| regexp-exec.js:9:14:9:19 | group1 | regexp-exec.js:10:28:10:33 | group1 | provenance |  |
 | regexp-exec.js:9:24:9:58 | /\\?(.*) ... n.href) | regexp-exec.js:9:11:9:20 | [, group1] | provenance |  |
 | regexp-exec.js:9:38:9:57 | window.location.href | regexp-exec.js:9:24:9:58 | /\\?(.*) ... n.href) | provenance | Config |
-| regexp-exec.js:29:11:29:20 | [, group1] | regexp-exec.js:29:11:29:58 | group1 | provenance |  |
-| regexp-exec.js:29:11:29:58 | group1 | regexp-exec.js:30:28:30:33 | group1 | provenance |  |
+| regexp-exec.js:29:11:29:20 | [, group1] | regexp-exec.js:29:14:29:19 | group1 | provenance |  |
+| regexp-exec.js:29:14:29:19 | group1 | regexp-exec.js:30:28:30:33 | group1 | provenance |  |
 | regexp-exec.js:29:24:29:43 | window.location.href | regexp-exec.js:29:24:29:58 | window. ... #(.*)/) | provenance | Config |
 | regexp-exec.js:29:24:29:58 | window. ... #(.*)/) | regexp-exec.js:29:11:29:20 | [, group1] | provenance |  |
-| regexp-exec.js:34:11:34:20 | [, group1] | regexp-exec.js:34:11:34:64 | group1 | provenance |  |
-| regexp-exec.js:34:11:34:64 | group1 | regexp-exec.js:35:28:35:33 | group1 | provenance |  |
+| regexp-exec.js:34:11:34:20 | [, group1] | regexp-exec.js:34:14:34:19 | group1 | provenance |  |
+| regexp-exec.js:34:14:34:19 | group1 | regexp-exec.js:35:28:35:33 | group1 | provenance |  |
 | regexp-exec.js:34:24:34:43 | window.location.href | regexp-exec.js:34:24:34:61 | window. ... #(.*)/) | provenance | Config |
 | regexp-exec.js:34:24:34:61 | window. ... #(.*)/) | regexp-exec.js:34:11:34:20 | [, group1] | provenance |  |
-| regexp-exec.js:39:11:39:20 | [, group1] | regexp-exec.js:39:11:39:71 | group1 | provenance |  |
-| regexp-exec.js:39:11:39:71 | group1 | regexp-exec.js:40:28:40:33 | group1 | provenance |  |
+| regexp-exec.js:39:11:39:20 | [, group1] | regexp-exec.js:39:14:39:19 | group1 | provenance |  |
+| regexp-exec.js:39:14:39:19 | group1 | regexp-exec.js:40:28:40:33 | group1 | provenance |  |
 | regexp-exec.js:39:24:39:71 | new Reg ... n.href) | regexp-exec.js:39:11:39:20 | [, group1] | provenance |  |
 | regexp-exec.js:39:51:39:70 | window.location.href | regexp-exec.js:39:24:39:71 | new Reg ... n.href) | provenance | Config |
-| sanitizer.js:2:9:2:25 | url | sanitizer.js:4:27:4:29 | url | provenance |  |
-| sanitizer.js:2:9:2:25 | url | sanitizer.js:16:27:16:29 | url | provenance |  |
-| sanitizer.js:2:9:2:25 | url | sanitizer.js:19:27:19:29 | url | provenance |  |
-| sanitizer.js:2:9:2:25 | url | sanitizer.js:22:27:22:29 | url | provenance |  |
-| sanitizer.js:2:9:2:25 | url | sanitizer.js:25:27:25:29 | url | provenance |  |
-| sanitizer.js:2:9:2:25 | url | sanitizer.js:28:27:28:29 | url | provenance |  |
-| sanitizer.js:2:9:2:25 | url | sanitizer.js:31:27:31:29 | url | provenance |  |
-| sanitizer.js:2:9:2:25 | url | sanitizer.js:37:27:37:29 | url | provenance |  |
-| sanitizer.js:2:15:2:25 | window.name | sanitizer.js:2:9:2:25 | url | provenance |  |
-| tst2.js:2:7:2:33 | href | tst2.js:3:21:3:24 | href | provenance |  |
-| tst2.js:2:14:2:33 | window.location.href | tst2.js:2:7:2:33 | href | provenance |  |
+| sanitizer.js:2:9:2:11 | url | sanitizer.js:4:27:4:29 | url | provenance |  |
+| sanitizer.js:2:9:2:11 | url | sanitizer.js:16:27:16:29 | url | provenance |  |
+| sanitizer.js:2:9:2:11 | url | sanitizer.js:19:27:19:29 | url | provenance |  |
+| sanitizer.js:2:9:2:11 | url | sanitizer.js:22:27:22:29 | url | provenance |  |
+| sanitizer.js:2:9:2:11 | url | sanitizer.js:25:27:25:29 | url | provenance |  |
+| sanitizer.js:2:9:2:11 | url | sanitizer.js:28:27:28:29 | url | provenance |  |
+| sanitizer.js:2:9:2:11 | url | sanitizer.js:31:27:31:29 | url | provenance |  |
+| sanitizer.js:2:9:2:11 | url | sanitizer.js:37:27:37:29 | url | provenance |  |
+| sanitizer.js:2:15:2:25 | window.name | sanitizer.js:2:9:2:11 | url | provenance |  |
+| tst2.js:2:7:2:10 | href | tst2.js:3:21:3:24 | href | provenance |  |
+| tst2.js:2:14:2:33 | window.location.href | tst2.js:2:7:2:10 | href | provenance |  |
 | tst2.js:3:21:3:24 | href | tst2.js:3:21:3:55 | href.su ... '?')+1) | provenance | Config |
-| tst6.js:2:7:2:45 | redirect | tst6.js:3:21:3:28 | redirect | provenance |  |
-| tst6.js:2:7:2:45 | redirect | tst6.js:4:17:4:24 | redirect | provenance |  |
-| tst6.js:2:18:2:45 | $locati ... irect') | tst6.js:2:7:2:45 | redirect | provenance |  |
+| tst6.js:2:7:2:14 | redirect | tst6.js:3:21:3:28 | redirect | provenance |  |
+| tst6.js:2:7:2:14 | redirect | tst6.js:4:17:4:24 | redirect | provenance |  |
+| tst6.js:2:18:2:45 | $locati ... irect') | tst6.js:2:7:2:14 | redirect | provenance |  |
 | tst6.js:5:21:5:48 | $locati ... irect') | tst6.js:5:21:5:56 | $locati ... + "foo" | provenance |  |
 | tst7.js:1:12:1:35 | documen ... .search | tst7.js:1:12:1:48 | documen ... ring(1) | provenance | Config |
 | tst7.js:3:27:3:50 | documen ... .search | tst7.js:3:27:3:63 | documen ... ring(1) | provenance | Config |
@@ -126,63 +126,63 @@ edges
 | tst10.js:8:27:8:63 | documen ... ring(1) | tst10.js:8:17:8:63 | '//foo' ... ring(1) | provenance |  |
 | tst10.js:10:33:10:56 | documen ... .search | tst10.js:10:33:10:69 | documen ... ring(1) | provenance | Config |
 | tst10.js:10:33:10:69 | documen ... ring(1) | tst10.js:10:17:10:69 | 'https: ... ring(1) | provenance |  |
-| tst13.js:2:9:2:52 | payload | tst13.js:4:15:4:21 | payload | provenance |  |
-| tst13.js:2:9:2:52 | payload | tst13.js:8:21:8:27 | payload | provenance |  |
-| tst13.js:2:9:2:52 | payload | tst13.js:12:14:12:20 | payload | provenance |  |
-| tst13.js:2:9:2:52 | payload | tst13.js:16:17:16:23 | payload | provenance |  |
-| tst13.js:2:9:2:52 | payload | tst13.js:20:14:20:20 | payload | provenance |  |
-| tst13.js:2:9:2:52 | payload | tst13.js:24:14:24:20 | payload | provenance |  |
-| tst13.js:2:9:2:52 | payload | tst13.js:28:21:28:27 | payload | provenance |  |
-| tst13.js:2:9:2:52 | payload | tst13.js:32:17:32:23 | payload | provenance |  |
-| tst13.js:2:9:2:52 | payload | tst13.js:36:21:36:27 | payload | provenance |  |
-| tst13.js:2:9:2:52 | payload | tst13.js:40:15:40:21 | payload | provenance |  |
-| tst13.js:2:9:2:52 | payload | tst13.js:44:14:44:20 | payload | provenance |  |
+| tst13.js:2:9:2:15 | payload | tst13.js:4:15:4:21 | payload | provenance |  |
+| tst13.js:2:9:2:15 | payload | tst13.js:8:21:8:27 | payload | provenance |  |
+| tst13.js:2:9:2:15 | payload | tst13.js:12:14:12:20 | payload | provenance |  |
+| tst13.js:2:9:2:15 | payload | tst13.js:16:17:16:23 | payload | provenance |  |
+| tst13.js:2:9:2:15 | payload | tst13.js:20:14:20:20 | payload | provenance |  |
+| tst13.js:2:9:2:15 | payload | tst13.js:24:14:24:20 | payload | provenance |  |
+| tst13.js:2:9:2:15 | payload | tst13.js:28:21:28:27 | payload | provenance |  |
+| tst13.js:2:9:2:15 | payload | tst13.js:32:17:32:23 | payload | provenance |  |
+| tst13.js:2:9:2:15 | payload | tst13.js:36:21:36:27 | payload | provenance |  |
+| tst13.js:2:9:2:15 | payload | tst13.js:40:15:40:21 | payload | provenance |  |
+| tst13.js:2:9:2:15 | payload | tst13.js:44:14:44:20 | payload | provenance |  |
 | tst13.js:2:19:2:42 | documen ... .search | tst13.js:2:19:2:52 | documen ... bstr(1) | provenance | Config |
-| tst13.js:2:19:2:52 | documen ... bstr(1) | tst13.js:2:9:2:52 | payload | provenance |  |
+| tst13.js:2:19:2:52 | documen ... bstr(1) | tst13.js:2:9:2:15 | payload | provenance |  |
 | tst13.js:49:32:49:32 | e | tst13.js:50:23:50:23 | e | provenance |  |
 | tst13.js:52:34:52:34 | e | tst13.js:53:28:53:28 | e | provenance |  |
-| tst13.js:59:9:59:52 | payload | tst13.js:61:18:61:24 | payload | provenance |  |
+| tst13.js:59:9:59:15 | payload | tst13.js:61:18:61:24 | payload | provenance |  |
 | tst13.js:59:19:59:42 | documen ... .search | tst13.js:59:19:59:52 | documen ... bstr(1) | provenance | Config |
-| tst13.js:59:19:59:52 | documen ... bstr(1) | tst13.js:59:9:59:52 | payload | provenance |  |
-| tst13.js:65:9:65:49 | payload | tst13.js:67:21:67:27 | payload | provenance |  |
+| tst13.js:59:19:59:52 | documen ... bstr(1) | tst13.js:59:9:59:15 | payload | provenance |  |
+| tst13.js:65:9:65:15 | payload | tst13.js:67:21:67:27 | payload | provenance |  |
 | tst13.js:65:19:65:39 | history ... on.hash | tst13.js:65:19:65:49 | history ... bstr(1) | provenance |  |
-| tst13.js:65:19:65:49 | history ... bstr(1) | tst13.js:65:9:65:49 | payload | provenance |  |
-| tst13.js:72:9:72:49 | payload | tst13.js:74:21:74:27 | payload | provenance |  |
+| tst13.js:65:19:65:49 | history ... bstr(1) | tst13.js:65:9:65:15 | payload | provenance |  |
+| tst13.js:72:9:72:15 | payload | tst13.js:74:21:74:27 | payload | provenance |  |
 | tst13.js:72:19:72:39 | history ... on.hash | tst13.js:72:19:72:49 | history ... bstr(1) | provenance |  |
-| tst13.js:72:19:72:49 | history ... bstr(1) | tst13.js:72:9:72:49 | payload | provenance |  |
-| tst13.js:78:9:78:48 | url | tst13.js:80:21:80:23 | url | provenance |  |
-| tst13.js:78:9:78:48 | url | tst13.js:81:28:81:30 | url | provenance |  |
-| tst13.js:78:9:78:48 | url | tst13.js:82:27:82:29 | url | provenance |  |
-| tst13.js:78:9:78:48 | url | tst13.js:83:22:83:24 | url | provenance |  |
+| tst13.js:72:19:72:49 | history ... bstr(1) | tst13.js:72:9:72:15 | payload | provenance |  |
+| tst13.js:78:9:78:11 | url | tst13.js:80:21:80:23 | url | provenance |  |
+| tst13.js:78:9:78:11 | url | tst13.js:81:28:81:30 | url | provenance |  |
+| tst13.js:78:9:78:11 | url | tst13.js:82:27:82:29 | url | provenance |  |
+| tst13.js:78:9:78:11 | url | tst13.js:83:22:83:24 | url | provenance |  |
 | tst13.js:78:15:78:38 | documen ... .search | tst13.js:78:15:78:48 | documen ... bstr(1) | provenance | Config |
-| tst13.js:78:15:78:48 | documen ... bstr(1) | tst13.js:78:9:78:48 | url | provenance |  |
-| tst15.js:2:9:2:42 | url | tst15.js:3:23:3:25 | url | provenance |  |
-| tst15.js:2:9:2:42 | url | tst15.js:4:23:4:25 | url | provenance |  |
-| tst15.js:2:9:2:42 | url | tst15.js:5:23:5:25 | url | provenance |  |
+| tst13.js:78:15:78:48 | documen ... bstr(1) | tst13.js:78:9:78:11 | url | provenance |  |
+| tst15.js:2:9:2:11 | url | tst15.js:3:23:3:25 | url | provenance |  |
+| tst15.js:2:9:2:11 | url | tst15.js:4:23:4:25 | url | provenance |  |
+| tst15.js:2:9:2:11 | url | tst15.js:5:23:5:25 | url | provenance |  |
 | tst15.js:2:15:2:31 | document.location | tst15.js:2:15:2:42 | documen ... tring() | provenance |  |
-| tst15.js:2:15:2:42 | documen ... tring() | tst15.js:2:9:2:42 | url | provenance |  |
+| tst15.js:2:15:2:42 | documen ... tring() | tst15.js:2:9:2:11 | url | provenance |  |
 | tst15.js:3:23:3:25 | url | tst15.js:3:23:3:38 | url.substring(0) | provenance |  |
 | tst15.js:3:23:3:38 | url.substring(0) | tst15.js:3:23:3:51 | url.sub ... ring(1) | provenance | Config |
 | tst15.js:4:23:4:25 | url | tst15.js:4:23:4:42 | url.substring(0, 10) | provenance |  |
 | tst15.js:4:23:4:42 | url.substring(0, 10) | tst15.js:4:23:4:55 | url.sub ... ring(1) | provenance | Config |
 | tst15.js:5:23:5:25 | url | tst15.js:5:23:5:60 | url.sub ... ', 10)) | provenance |  |
 | tst15.js:5:23:5:60 | url.sub ... ', 10)) | tst15.js:5:23:5:73 | url.sub ... ring(1) | provenance | Config |
-| tst15.js:7:9:7:43 | url2 | tst15.js:8:23:8:26 | url2 | provenance |  |
-| tst15.js:7:9:7:43 | url2 | tst15.js:9:23:9:26 | url2 | provenance |  |
-| tst15.js:7:9:7:43 | url2 | tst15.js:10:23:10:26 | url2 | provenance |  |
+| tst15.js:7:9:7:12 | url2 | tst15.js:8:23:8:26 | url2 | provenance |  |
+| tst15.js:7:9:7:12 | url2 | tst15.js:9:23:9:26 | url2 | provenance |  |
+| tst15.js:7:9:7:12 | url2 | tst15.js:10:23:10:26 | url2 | provenance |  |
 | tst15.js:7:16:7:32 | document.location | tst15.js:7:16:7:43 | documen ... tring() | provenance |  |
-| tst15.js:7:16:7:43 | documen ... tring() | tst15.js:7:9:7:43 | url2 | provenance |  |
+| tst15.js:7:16:7:43 | documen ... tring() | tst15.js:7:9:7:12 | url2 | provenance |  |
 | tst15.js:8:23:8:26 | url2 | tst15.js:8:23:8:39 | url2.substring(0) | provenance |  |
 | tst15.js:8:23:8:39 | url2.substring(0) | tst15.js:8:23:8:60 | url2.su ... nown()) | provenance | Config |
 | tst15.js:9:23:9:26 | url2 | tst15.js:9:23:9:43 | url2.su ... (0, 10) | provenance |  |
 | tst15.js:9:23:9:43 | url2.su ... (0, 10) | tst15.js:9:23:9:64 | url2.su ... nown()) | provenance | Config |
 | tst15.js:10:23:10:26 | url2 | tst15.js:10:23:10:62 | url2.su ... ', 10)) | provenance |  |
 | tst15.js:10:23:10:62 | url2.su ... ', 10)) | tst15.js:10:23:10:83 | url2.su ... nown()) | provenance | Config |
-| tst15.js:12:9:12:52 | search | tst15.js:13:23:13:28 | search | provenance |  |
-| tst15.js:12:9:12:52 | search | tst15.js:14:23:14:28 | search | provenance |  |
-| tst15.js:12:9:12:52 | search | tst15.js:15:23:15:28 | search | provenance |  |
+| tst15.js:12:9:12:14 | search | tst15.js:13:23:13:28 | search | provenance |  |
+| tst15.js:12:9:12:14 | search | tst15.js:14:23:14:28 | search | provenance |  |
+| tst15.js:12:9:12:14 | search | tst15.js:15:23:15:28 | search | provenance |  |
 | tst15.js:12:18:12:41 | documen ... .search | tst15.js:12:18:12:52 | documen ... tring() | provenance |  |
-| tst15.js:12:18:12:52 | documen ... tring() | tst15.js:12:9:12:52 | search | provenance |  |
+| tst15.js:12:18:12:52 | documen ... tring() | tst15.js:12:9:12:14 | search | provenance |  |
 | tst15.js:13:23:13:28 | search | tst15.js:13:23:13:41 | search.substring(0) | provenance |  |
 | tst15.js:13:23:13:41 | search.substring(0) | tst15.js:13:23:13:54 | search. ... ring(1) | provenance | Config |
 | tst15.js:14:23:14:28 | search | tst15.js:14:23:14:45 | search. ... (0, 10) | provenance |  |
@@ -208,9 +208,9 @@ edges
 | tst.js:19:34:19:55 | documen ... on.href | tst.js:19:20:19:56 | indirec ... n.href) | provenance | Config |
 | tst.js:23:22:23:79 | new Reg ... n.href) | tst.js:23:22:23:82 | new Reg ... ref)[1] | provenance |  |
 | tst.js:23:62:23:78 | win.location.href | tst.js:23:22:23:79 | new Reg ... n.href) | provenance | Config |
-| typed.ts:4:13:4:49 | params | typed.ts:5:25:5:30 | params | provenance |  |
+| typed.ts:4:13:4:18 | params | typed.ts:5:25:5:30 | params | provenance |  |
 | typed.ts:4:22:4:36 | location.search | typed.ts:4:22:4:49 | locatio ... ring(1) | provenance | Config |
-| typed.ts:4:22:4:49 | locatio ... ring(1) | typed.ts:4:13:4:49 | params | provenance |  |
+| typed.ts:4:22:4:49 | locatio ... ring(1) | typed.ts:4:13:4:18 | params | provenance |  |
 | typed.ts:5:25:5:30 | params | typed.ts:7:24:7:34 | redirectUri | provenance |  |
 | typed.ts:7:24:7:34 | redirectUri | typed.ts:8:33:8:43 | redirectUri | provenance |  |
 | typed.ts:25:25:25:34 | loc.search | typed.ts:25:25:25:47 | loc.sea ... ring(1) | provenance | Config |
@@ -236,31 +236,31 @@ nodes
 | react.js:43:19:43:40 | documen ... on.hash | semmle.label | documen ... on.hash |
 | react.js:43:19:43:50 | documen ... bstr(1) | semmle.label | documen ... bstr(1) |
 | regexp-exec.js:4:11:4:20 | [, group1] | semmle.label | [, group1] |
-| regexp-exec.js:4:11:4:57 | group1 | semmle.label | group1 |
+| regexp-exec.js:4:14:4:19 | group1 | semmle.label | group1 |
 | regexp-exec.js:4:24:4:57 | /#(.*)/ ... n.href) | semmle.label | /#(.*)/ ... n.href) |
 | regexp-exec.js:4:37:4:56 | window.location.href | semmle.label | window.location.href |
 | regexp-exec.js:5:28:5:33 | group1 | semmle.label | group1 |
 | regexp-exec.js:9:11:9:20 | [, group1] | semmle.label | [, group1] |
-| regexp-exec.js:9:11:9:58 | group1 | semmle.label | group1 |
+| regexp-exec.js:9:14:9:19 | group1 | semmle.label | group1 |
 | regexp-exec.js:9:24:9:58 | /\\?(.*) ... n.href) | semmle.label | /\\?(.*) ... n.href) |
 | regexp-exec.js:9:38:9:57 | window.location.href | semmle.label | window.location.href |
 | regexp-exec.js:10:28:10:33 | group1 | semmle.label | group1 |
 | regexp-exec.js:29:11:29:20 | [, group1] | semmle.label | [, group1] |
-| regexp-exec.js:29:11:29:58 | group1 | semmle.label | group1 |
+| regexp-exec.js:29:14:29:19 | group1 | semmle.label | group1 |
 | regexp-exec.js:29:24:29:43 | window.location.href | semmle.label | window.location.href |
 | regexp-exec.js:29:24:29:58 | window. ... #(.*)/) | semmle.label | window. ... #(.*)/) |
 | regexp-exec.js:30:28:30:33 | group1 | semmle.label | group1 |
 | regexp-exec.js:34:11:34:20 | [, group1] | semmle.label | [, group1] |
-| regexp-exec.js:34:11:34:64 | group1 | semmle.label | group1 |
+| regexp-exec.js:34:14:34:19 | group1 | semmle.label | group1 |
 | regexp-exec.js:34:24:34:43 | window.location.href | semmle.label | window.location.href |
 | regexp-exec.js:34:24:34:61 | window. ... #(.*)/) | semmle.label | window. ... #(.*)/) |
 | regexp-exec.js:35:28:35:33 | group1 | semmle.label | group1 |
 | regexp-exec.js:39:11:39:20 | [, group1] | semmle.label | [, group1] |
-| regexp-exec.js:39:11:39:71 | group1 | semmle.label | group1 |
+| regexp-exec.js:39:14:39:19 | group1 | semmle.label | group1 |
 | regexp-exec.js:39:24:39:71 | new Reg ... n.href) | semmle.label | new Reg ... n.href) |
 | regexp-exec.js:39:51:39:70 | window.location.href | semmle.label | window.location.href |
 | regexp-exec.js:40:28:40:33 | group1 | semmle.label | group1 |
-| sanitizer.js:2:9:2:25 | url | semmle.label | url |
+| sanitizer.js:2:9:2:11 | url | semmle.label | url |
 | sanitizer.js:2:15:2:25 | window.name | semmle.label | window.name |
 | sanitizer.js:4:27:4:29 | url | semmle.label | url |
 | sanitizer.js:16:27:16:29 | url | semmle.label | url |
@@ -270,11 +270,11 @@ nodes
 | sanitizer.js:28:27:28:29 | url | semmle.label | url |
 | sanitizer.js:31:27:31:29 | url | semmle.label | url |
 | sanitizer.js:37:27:37:29 | url | semmle.label | url |
-| tst2.js:2:7:2:33 | href | semmle.label | href |
+| tst2.js:2:7:2:10 | href | semmle.label | href |
 | tst2.js:2:14:2:33 | window.location.href | semmle.label | window.location.href |
 | tst2.js:3:21:3:24 | href | semmle.label | href |
 | tst2.js:3:21:3:55 | href.su ... '?')+1) | semmle.label | href.su ... '?')+1) |
-| tst6.js:2:7:2:45 | redirect | semmle.label | redirect |
+| tst6.js:2:7:2:14 | redirect | semmle.label | redirect |
 | tst6.js:2:18:2:45 | $locati ... irect') | semmle.label | $locati ... irect') |
 | tst6.js:3:21:3:28 | redirect | semmle.label | redirect |
 | tst6.js:4:17:4:24 | redirect | semmle.label | redirect |
@@ -298,7 +298,7 @@ nodes
 | tst10.js:10:17:10:69 | 'https: ... ring(1) | semmle.label | 'https: ... ring(1) |
 | tst10.js:10:33:10:56 | documen ... .search | semmle.label | documen ... .search |
 | tst10.js:10:33:10:69 | documen ... ring(1) | semmle.label | documen ... ring(1) |
-| tst13.js:2:9:2:52 | payload | semmle.label | payload |
+| tst13.js:2:9:2:15 | payload | semmle.label | payload |
 | tst13.js:2:19:2:42 | documen ... .search | semmle.label | documen ... .search |
 | tst13.js:2:19:2:52 | documen ... bstr(1) | semmle.label | documen ... bstr(1) |
 | tst13.js:4:15:4:21 | payload | semmle.label | payload |
@@ -316,26 +316,26 @@ nodes
 | tst13.js:50:23:50:23 | e | semmle.label | e |
 | tst13.js:52:34:52:34 | e | semmle.label | e |
 | tst13.js:53:28:53:28 | e | semmle.label | e |
-| tst13.js:59:9:59:52 | payload | semmle.label | payload |
+| tst13.js:59:9:59:15 | payload | semmle.label | payload |
 | tst13.js:59:19:59:42 | documen ... .search | semmle.label | documen ... .search |
 | tst13.js:59:19:59:52 | documen ... bstr(1) | semmle.label | documen ... bstr(1) |
 | tst13.js:61:18:61:24 | payload | semmle.label | payload |
-| tst13.js:65:9:65:49 | payload | semmle.label | payload |
+| tst13.js:65:9:65:15 | payload | semmle.label | payload |
 | tst13.js:65:19:65:39 | history ... on.hash | semmle.label | history ... on.hash |
 | tst13.js:65:19:65:49 | history ... bstr(1) | semmle.label | history ... bstr(1) |
 | tst13.js:67:21:67:27 | payload | semmle.label | payload |
-| tst13.js:72:9:72:49 | payload | semmle.label | payload |
+| tst13.js:72:9:72:15 | payload | semmle.label | payload |
 | tst13.js:72:19:72:39 | history ... on.hash | semmle.label | history ... on.hash |
 | tst13.js:72:19:72:49 | history ... bstr(1) | semmle.label | history ... bstr(1) |
 | tst13.js:74:21:74:27 | payload | semmle.label | payload |
-| tst13.js:78:9:78:48 | url | semmle.label | url |
+| tst13.js:78:9:78:11 | url | semmle.label | url |
 | tst13.js:78:15:78:38 | documen ... .search | semmle.label | documen ... .search |
 | tst13.js:78:15:78:48 | documen ... bstr(1) | semmle.label | documen ... bstr(1) |
 | tst13.js:80:21:80:23 | url | semmle.label | url |
 | tst13.js:81:28:81:30 | url | semmle.label | url |
 | tst13.js:82:27:82:29 | url | semmle.label | url |
 | tst13.js:83:22:83:24 | url | semmle.label | url |
-| tst15.js:2:9:2:42 | url | semmle.label | url |
+| tst15.js:2:9:2:11 | url | semmle.label | url |
 | tst15.js:2:15:2:31 | document.location | semmle.label | document.location |
 | tst15.js:2:15:2:42 | documen ... tring() | semmle.label | documen ... tring() |
 | tst15.js:3:23:3:25 | url | semmle.label | url |
@@ -347,7 +347,7 @@ nodes
 | tst15.js:5:23:5:25 | url | semmle.label | url |
 | tst15.js:5:23:5:60 | url.sub ... ', 10)) | semmle.label | url.sub ... ', 10)) |
 | tst15.js:5:23:5:73 | url.sub ... ring(1) | semmle.label | url.sub ... ring(1) |
-| tst15.js:7:9:7:43 | url2 | semmle.label | url2 |
+| tst15.js:7:9:7:12 | url2 | semmle.label | url2 |
 | tst15.js:7:16:7:32 | document.location | semmle.label | document.location |
 | tst15.js:7:16:7:43 | documen ... tring() | semmle.label | documen ... tring() |
 | tst15.js:8:23:8:26 | url2 | semmle.label | url2 |
@@ -359,7 +359,7 @@ nodes
 | tst15.js:10:23:10:26 | url2 | semmle.label | url2 |
 | tst15.js:10:23:10:62 | url2.su ... ', 10)) | semmle.label | url2.su ... ', 10)) |
 | tst15.js:10:23:10:83 | url2.su ... nown()) | semmle.label | url2.su ... nown()) |
-| tst15.js:12:9:12:52 | search | semmle.label | search |
+| tst15.js:12:9:12:14 | search | semmle.label | search |
 | tst15.js:12:18:12:41 | documen ... .search | semmle.label | documen ... .search |
 | tst15.js:12:18:12:52 | documen ... tring() | semmle.label | documen ... tring() |
 | tst15.js:13:23:13:28 | search | semmle.label | search |
@@ -400,7 +400,7 @@ nodes
 | tst.js:23:22:23:79 | new Reg ... n.href) | semmle.label | new Reg ... n.href) |
 | tst.js:23:22:23:82 | new Reg ... ref)[1] | semmle.label | new Reg ... ref)[1] |
 | tst.js:23:62:23:78 | win.location.href | semmle.label | win.location.href |
-| typed.ts:4:13:4:49 | params | semmle.label | params |
+| typed.ts:4:13:4:18 | params | semmle.label | params |
 | typed.ts:4:22:4:36 | location.search | semmle.label | location.search |
 | typed.ts:4:22:4:49 | locatio ... ring(1) | semmle.label | locatio ... ring(1) |
 | typed.ts:5:25:5:30 | params | semmle.label | params |
diff --git a/javascript/ql/test/query-tests/Security/CWE-601/ServerSideUrlRedirect/ServerSideUrlRedirect.expected b/javascript/ql/test/query-tests/Security/CWE-601/ServerSideUrlRedirect/ServerSideUrlRedirect.expected
index 34c12408de3..c8466a9560d 100644
--- a/javascript/ql/test/query-tests/Security/CWE-601/ServerSideUrlRedirect/ServerSideUrlRedirect.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-601/ServerSideUrlRedirect/ServerSideUrlRedirect.expected
@@ -30,16 +30,16 @@
 | react-native.js:8:17:8:23 | tainted | react-native.js:7:17:7:33 | req.param("code") | react-native.js:8:17:8:23 | tainted | Untrusted URL redirection depends on a $@. | react-native.js:7:17:7:33 | req.param("code") | user-provided value |
 | react-native.js:9:26:9:32 | tainted | react-native.js:7:17:7:33 | req.param("code") | react-native.js:9:26:9:32 | tainted | Untrusted URL redirection depends on a $@. | react-native.js:7:17:7:33 | req.param("code") | user-provided value |
 edges
-| ServerSideUrlRedirectGood2.js:16:7:16:34 | target | ServerSideUrlRedirectGood2.js:18:18:18:23 | target | provenance |  |
-| ServerSideUrlRedirectGood2.js:16:16:16:34 | req.query["target"] | ServerSideUrlRedirectGood2.js:16:7:16:34 | target | provenance |  |
-| express.js:25:7:25:34 | target | express.js:30:18:30:23 | target | provenance |  |
-| express.js:25:7:25:34 | target | express.js:31:16:31:21 | target | provenance |  |
-| express.js:25:16:25:34 | req.param("target") | express.js:25:7:25:34 | target | provenance |  |
+| ServerSideUrlRedirectGood2.js:16:7:16:12 | target | ServerSideUrlRedirectGood2.js:18:18:18:23 | target | provenance |  |
+| ServerSideUrlRedirectGood2.js:16:16:16:34 | req.query["target"] | ServerSideUrlRedirectGood2.js:16:7:16:12 | target | provenance |  |
+| express.js:25:7:25:12 | target | express.js:30:18:30:23 | target | provenance |  |
+| express.js:25:7:25:12 | target | express.js:31:16:31:21 | target | provenance |  |
+| express.js:25:16:25:34 | req.param("target") | express.js:25:7:25:12 | target | provenance |  |
 | express.js:35:69:35:87 | req.param('action') | express.js:35:16:35:108 | (req.pa ... ntacts" | provenance |  |
 | express.js:68:19:68:37 | req.param("target") | express.js:68:16:68:43 | `${req. ... )}/foo` | provenance |  |
-| express.js:77:7:77:34 | target | express.js:83:18:83:23 | target | provenance |  |
-| express.js:77:7:77:34 | target | express.js:89:16:89:21 | target | provenance |  |
-| express.js:77:16:77:34 | req.param("target") | express.js:77:7:77:34 | target | provenance |  |
+| express.js:77:7:77:12 | target | express.js:83:18:83:23 | target | provenance |  |
+| express.js:77:7:77:12 | target | express.js:89:16:89:21 | target | provenance |  |
+| express.js:77:16:77:34 | req.param("target") | express.js:77:7:77:12 | target | provenance |  |
 | express.js:109:16:109:63 | [req.qu ... ection] | express.js:109:16:109:72 | [req.qu ... oin('') | provenance |  |
 | express.js:109:16:109:63 | [req.qu ... ection] [0] | express.js:109:16:109:72 | [req.qu ... oin('') | provenance |  |
 | express.js:109:17:109:30 | req.query.page | express.js:109:16:109:63 | [req.qu ... ection] | provenance |  |
@@ -50,45 +50,45 @@ edges
 | express.js:124:22:124:36 | req.params.user | express.js:124:16:124:36 | '/' + r ... ms.user | provenance |  |
 | express.js:125:23:125:37 | req.params.user | express.js:125:16:125:37 | '//' +  ... ms.user | provenance |  |
 | express.js:126:22:126:36 | req.params.user | express.js:126:16:126:36 | 'u' + r ... ms.user | provenance |  |
-| express.js:140:7:140:34 | target | express.js:145:18:145:23 | target | provenance |  |
-| express.js:140:7:140:34 | target | express.js:150:18:150:23 | target | provenance |  |
-| express.js:140:16:140:34 | req.param("target") | express.js:140:7:140:34 | target | provenance |  |
-| express.js:154:7:154:54 | myThing | express.js:155:16:155:22 | myThing | provenance |  |
-| express.js:154:7:154:54 | myThing [ArrayElement] | express.js:155:16:155:22 | myThing | provenance |  |
+| express.js:140:7:140:12 | target | express.js:145:18:145:23 | target | provenance |  |
+| express.js:140:7:140:12 | target | express.js:150:18:150:23 | target | provenance |  |
+| express.js:140:16:140:34 | req.param("target") | express.js:140:7:140:12 | target | provenance |  |
+| express.js:154:7:154:13 | myThing | express.js:155:16:155:22 | myThing | provenance |  |
+| express.js:154:7:154:13 | myThing [ArrayElement] | express.js:155:16:155:22 | myThing | provenance |  |
 | express.js:154:17:154:41 | JSON.st ... .query) | express.js:154:17:154:54 | JSON.st ... (1, -1) | provenance |  |
 | express.js:154:17:154:41 | JSON.st ... .query) | express.js:154:17:154:54 | JSON.st ... (1, -1) [ArrayElement] | provenance |  |
-| express.js:154:17:154:54 | JSON.st ... (1, -1) | express.js:154:7:154:54 | myThing | provenance |  |
-| express.js:154:17:154:54 | JSON.st ... (1, -1) [ArrayElement] | express.js:154:7:154:54 | myThing [ArrayElement] | provenance |  |
+| express.js:154:17:154:54 | JSON.st ... (1, -1) | express.js:154:7:154:13 | myThing | provenance |  |
+| express.js:154:17:154:54 | JSON.st ... (1, -1) [ArrayElement] | express.js:154:7:154:13 | myThing [ArrayElement] | provenance |  |
 | express.js:154:32:154:40 | req.query | express.js:154:17:154:41 | JSON.st ... .query) | provenance |  |
-| koa.js:6:6:6:27 | url | koa.js:7:15:7:17 | url | provenance |  |
-| koa.js:6:6:6:27 | url | koa.js:8:18:8:20 | url | provenance |  |
-| koa.js:6:6:6:27 | url | koa.js:14:16:14:18 | url | provenance |  |
-| koa.js:6:6:6:27 | url | koa.js:20:16:20:18 | url | provenance |  |
-| koa.js:6:12:6:27 | ctx.query.target | koa.js:6:6:6:27 | url | provenance |  |
+| koa.js:6:6:6:8 | url | koa.js:7:15:7:17 | url | provenance |  |
+| koa.js:6:6:6:8 | url | koa.js:8:18:8:20 | url | provenance |  |
+| koa.js:6:6:6:8 | url | koa.js:14:16:14:18 | url | provenance |  |
+| koa.js:6:6:6:8 | url | koa.js:20:16:20:18 | url | provenance |  |
+| koa.js:6:12:6:27 | ctx.query.target | koa.js:6:6:6:8 | url | provenance |  |
 | koa.js:8:18:8:20 | url | koa.js:8:15:8:26 | `${url}${x}` | provenance |  |
 | next.ts:11:31:11:38 | req.body | next.ts:11:31:11:50 | req.body.callbackUrl | provenance |  |
-| node.js:5:7:5:52 | target | node.js:6:34:6:39 | target | provenance |  |
-| node.js:5:16:5:39 | url.par ... , true) | node.js:5:7:5:52 | target | provenance |  |
+| node.js:5:7:5:12 | target | node.js:6:34:6:39 | target | provenance |  |
+| node.js:5:16:5:39 | url.par ... , true) | node.js:5:7:5:12 | target | provenance |  |
 | node.js:5:26:5:32 | req.url | node.js:5:16:5:39 | url.par ... , true) | provenance |  |
-| node.js:10:7:10:52 | target | node.js:13:40:13:45 | target | provenance |  |
-| node.js:10:16:10:39 | url.par ... , true) | node.js:10:7:10:52 | target | provenance |  |
+| node.js:10:7:10:12 | target | node.js:13:40:13:45 | target | provenance |  |
+| node.js:10:16:10:39 | url.par ... , true) | node.js:10:7:10:12 | target | provenance |  |
 | node.js:10:26:10:32 | req.url | node.js:10:16:10:39 | url.par ... , true) | provenance |  |
 | node.js:13:40:13:45 | target | node.js:13:34:13:45 | '/' + target | provenance |  |
-| node.js:27:7:27:52 | target | node.js:29:34:29:39 | target | provenance |  |
-| node.js:27:16:27:39 | url.par ... , true) | node.js:27:7:27:52 | target | provenance |  |
+| node.js:27:7:27:12 | target | node.js:29:34:29:39 | target | provenance |  |
+| node.js:27:16:27:39 | url.par ... , true) | node.js:27:7:27:12 | target | provenance |  |
 | node.js:27:26:27:32 | req.url | node.js:27:16:27:39 | url.par ... , true) | provenance |  |
 | node.js:29:34:29:39 | target | node.js:29:34:29:55 | target  ... =" + me | provenance |  |
-| react-native.js:7:7:7:33 | tainted | react-native.js:8:17:8:23 | tainted | provenance |  |
-| react-native.js:7:7:7:33 | tainted | react-native.js:9:26:9:32 | tainted | provenance |  |
-| react-native.js:7:17:7:33 | req.param("code") | react-native.js:7:7:7:33 | tainted | provenance |  |
+| react-native.js:7:7:7:13 | tainted | react-native.js:8:17:8:23 | tainted | provenance |  |
+| react-native.js:7:7:7:13 | tainted | react-native.js:9:26:9:32 | tainted | provenance |  |
+| react-native.js:7:17:7:33 | req.param("code") | react-native.js:7:7:7:13 | tainted | provenance |  |
 nodes
 | ServerSideUrlRedirect.js:4:16:4:34 | req.query["target"] | semmle.label | req.query["target"] |
-| ServerSideUrlRedirectGood2.js:16:7:16:34 | target | semmle.label | target |
+| ServerSideUrlRedirectGood2.js:16:7:16:12 | target | semmle.label | target |
 | ServerSideUrlRedirectGood2.js:16:16:16:34 | req.query["target"] | semmle.label | req.query["target"] |
 | ServerSideUrlRedirectGood2.js:18:18:18:23 | target | semmle.label | target |
 | express.js:6:16:6:34 | req.param("target") | semmle.label | req.param("target") |
 | express.js:10:26:10:44 | req.param("target") | semmle.label | req.param("target") |
-| express.js:25:7:25:34 | target | semmle.label | target |
+| express.js:25:7:25:12 | target | semmle.label | target |
 | express.js:25:16:25:34 | req.param("target") | semmle.label | req.param("target") |
 | express.js:30:18:30:23 | target | semmle.label | target |
 | express.js:31:16:31:21 | target | semmle.label | target |
@@ -96,7 +96,7 @@ nodes
 | express.js:35:69:35:87 | req.param('action') | semmle.label | req.param('action') |
 | express.js:68:16:68:43 | `${req. ... )}/foo` | semmle.label | `${req. ... )}/foo` |
 | express.js:68:19:68:37 | req.param("target") | semmle.label | req.param("target") |
-| express.js:77:7:77:34 | target | semmle.label | target |
+| express.js:77:7:77:12 | target | semmle.label | target |
 | express.js:77:16:77:34 | req.param("target") | semmle.label | req.param("target") |
 | express.js:83:18:83:23 | target | semmle.label | target |
 | express.js:89:16:89:21 | target | semmle.label | target |
@@ -115,18 +115,18 @@ nodes
 | express.js:126:22:126:36 | req.params.user | semmle.label | req.params.user |
 | express.js:133:16:133:28 | req.query.foo | semmle.label | req.query.foo |
 | express.js:136:16:136:24 | query.foo | semmle.label | query.foo |
-| express.js:140:7:140:34 | target | semmle.label | target |
+| express.js:140:7:140:12 | target | semmle.label | target |
 | express.js:140:16:140:34 | req.param("target") | semmle.label | req.param("target") |
 | express.js:145:18:145:23 | target | semmle.label | target |
 | express.js:150:18:150:23 | target | semmle.label | target |
-| express.js:154:7:154:54 | myThing | semmle.label | myThing |
-| express.js:154:7:154:54 | myThing [ArrayElement] | semmle.label | myThing [ArrayElement] |
+| express.js:154:7:154:13 | myThing | semmle.label | myThing |
+| express.js:154:7:154:13 | myThing [ArrayElement] | semmle.label | myThing [ArrayElement] |
 | express.js:154:17:154:41 | JSON.st ... .query) | semmle.label | JSON.st ... .query) |
 | express.js:154:17:154:54 | JSON.st ... (1, -1) | semmle.label | JSON.st ... (1, -1) |
 | express.js:154:17:154:54 | JSON.st ... (1, -1) [ArrayElement] | semmle.label | JSON.st ... (1, -1) [ArrayElement] |
 | express.js:154:32:154:40 | req.query | semmle.label | req.query |
 | express.js:155:16:155:22 | myThing | semmle.label | myThing |
-| koa.js:6:6:6:27 | url | semmle.label | url |
+| koa.js:6:6:6:8 | url | semmle.label | url |
 | koa.js:6:12:6:27 | ctx.query.target | semmle.label | ctx.query.target |
 | koa.js:7:15:7:17 | url | semmle.label | url |
 | koa.js:8:15:8:26 | `${url}${x}` | semmle.label | `${url}${x}` |
@@ -135,21 +135,21 @@ nodes
 | koa.js:20:16:20:18 | url | semmle.label | url |
 | next.ts:11:31:11:38 | req.body | semmle.label | req.body |
 | next.ts:11:31:11:50 | req.body.callbackUrl | semmle.label | req.body.callbackUrl |
-| node.js:5:7:5:52 | target | semmle.label | target |
+| node.js:5:7:5:12 | target | semmle.label | target |
 | node.js:5:16:5:39 | url.par ... , true) | semmle.label | url.par ... , true) |
 | node.js:5:26:5:32 | req.url | semmle.label | req.url |
 | node.js:6:34:6:39 | target | semmle.label | target |
-| node.js:10:7:10:52 | target | semmle.label | target |
+| node.js:10:7:10:12 | target | semmle.label | target |
 | node.js:10:16:10:39 | url.par ... , true) | semmle.label | url.par ... , true) |
 | node.js:10:26:10:32 | req.url | semmle.label | req.url |
 | node.js:13:34:13:45 | '/' + target | semmle.label | '/' + target |
 | node.js:13:40:13:45 | target | semmle.label | target |
-| node.js:27:7:27:52 | target | semmle.label | target |
+| node.js:27:7:27:12 | target | semmle.label | target |
 | node.js:27:16:27:39 | url.par ... , true) | semmle.label | url.par ... , true) |
 | node.js:27:26:27:32 | req.url | semmle.label | req.url |
 | node.js:29:34:29:39 | target | semmle.label | target |
 | node.js:29:34:29:55 | target  ... =" + me | semmle.label | target  ... =" + me |
-| react-native.js:7:7:7:33 | tainted | semmle.label | tainted |
+| react-native.js:7:7:7:13 | tainted | semmle.label | tainted |
 | react-native.js:7:17:7:33 | req.param("code") | semmle.label | req.param("code") |
 | react-native.js:8:17:8:23 | tainted | semmle.label | tainted |
 | react-native.js:9:26:9:32 | tainted | semmle.label | tainted |
diff --git a/javascript/ql/test/query-tests/Security/CWE-611/Xxe.expected b/javascript/ql/test/query-tests/Security/CWE-611/Xxe.expected
index 4b946c92042..07b6acfc361 100644
--- a/javascript/ql/test/query-tests/Security/CWE-611/Xxe.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-611/Xxe.expected
@@ -8,12 +8,12 @@
 | libxml.sax.js:6:22:6:42 | req.par ... e-xml") | libxml.sax.js:6:22:6:42 | req.par ... e-xml") | libxml.sax.js:6:22:6:42 | req.par ... e-xml") | XML parsing depends on a $@ without guarding against external entity expansion. | libxml.sax.js:6:22:6:42 | req.par ... e-xml") | user-provided value |
 | libxml.saxpush.js:6:15:6:35 | req.par ... e-xml") | libxml.saxpush.js:6:15:6:35 | req.par ... e-xml") | libxml.saxpush.js:6:15:6:35 | req.par ... e-xml") | XML parsing depends on a $@ without guarding against external entity expansion. | libxml.saxpush.js:6:15:6:35 | req.par ... e-xml") | user-provided value |
 edges
-| domparser.js:2:7:2:36 | src | domparser.js:10:55:10:57 | src | provenance |  |
-| domparser.js:2:7:2:36 | src | domparser.js:12:57:12:59 | src | provenance |  |
-| domparser.js:2:13:2:36 | documen ... .search | domparser.js:2:7:2:36 | src | provenance |  |
+| domparser.js:2:7:2:9 | src | domparser.js:10:55:10:57 | src | provenance |  |
+| domparser.js:2:7:2:9 | src | domparser.js:12:57:12:59 | src | provenance |  |
+| domparser.js:2:13:2:36 | documen ... .search | domparser.js:2:7:2:9 | src | provenance |  |
 | libxml.noent.js:12:27:12:35 | req.files | libxml.noent.js:12:27:12:66 | req.fil ... 'utf8') | provenance |  |
 nodes
-| domparser.js:2:7:2:36 | src | semmle.label | src |
+| domparser.js:2:7:2:9 | src | semmle.label | src |
 | domparser.js:2:13:2:36 | documen ... .search | semmle.label | documen ... .search |
 | domparser.js:10:55:10:57 | src | semmle.label | src |
 | domparser.js:12:57:12:59 | src | semmle.label | src |
diff --git a/javascript/ql/test/query-tests/Security/CWE-643/XpathInjection.expected b/javascript/ql/test/query-tests/Security/CWE-643/XpathInjection.expected
index 4ad42bcdc03..e1db31c6f7b 100644
--- a/javascript/ql/test/query-tests/Security/CWE-643/XpathInjection.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-643/XpathInjection.expected
@@ -7,19 +7,19 @@
 | tst.js:9:17:9:23 | tainted | tst.js:6:17:6:37 | req.par ... rName") | tst.js:9:17:9:23 | tainted | XPath expression depends on a $@. | tst.js:6:17:6:37 | req.par ... rName") | user-provided value |
 | tst.js:11:8:11:14 | tainted | tst.js:6:17:6:37 | req.par ... rName") | tst.js:11:8:11:14 | tainted | XPath expression depends on a $@. | tst.js:6:17:6:37 | req.par ... rName") | user-provided value |
 edges
-| XpathInjectionBad.js:6:7:6:38 | userName | XpathInjectionBad.js:8:66:8:73 | userName | provenance |  |
-| XpathInjectionBad.js:6:18:6:38 | req.par ... rName") | XpathInjectionBad.js:6:7:6:38 | userName | provenance |  |
+| XpathInjectionBad.js:6:7:6:14 | userName | XpathInjectionBad.js:8:66:8:73 | userName | provenance |  |
+| XpathInjectionBad.js:6:18:6:38 | req.par ... rName") | XpathInjectionBad.js:6:7:6:14 | userName | provenance |  |
 | XpathInjectionBad.js:8:66:8:73 | userName | XpathInjectionBad.js:8:34:8:96 | "//user ... text()" | provenance |  |
 | tst2.js:1:13:1:34 | documen ... on.hash | tst2.js:1:13:1:47 | documen ... ring(1) | provenance |  |
 | tst2.js:1:13:1:47 | documen ... ring(1) | tst2.js:2:27:2:31 | query | provenance |  |
 | tst2.js:1:13:1:47 | documen ... ring(1) | tst2.js:3:19:3:23 | query | provenance |  |
-| tst.js:6:7:6:37 | tainted | tst.js:7:15:7:21 | tainted | provenance |  |
-| tst.js:6:7:6:37 | tainted | tst.js:8:16:8:22 | tainted | provenance |  |
-| tst.js:6:7:6:37 | tainted | tst.js:9:17:9:23 | tainted | provenance |  |
-| tst.js:6:7:6:37 | tainted | tst.js:11:8:11:14 | tainted | provenance |  |
-| tst.js:6:17:6:37 | req.par ... rName") | tst.js:6:7:6:37 | tainted | provenance |  |
+| tst.js:6:7:6:13 | tainted | tst.js:7:15:7:21 | tainted | provenance |  |
+| tst.js:6:7:6:13 | tainted | tst.js:8:16:8:22 | tainted | provenance |  |
+| tst.js:6:7:6:13 | tainted | tst.js:9:17:9:23 | tainted | provenance |  |
+| tst.js:6:7:6:13 | tainted | tst.js:11:8:11:14 | tainted | provenance |  |
+| tst.js:6:17:6:37 | req.par ... rName") | tst.js:6:7:6:13 | tainted | provenance |  |
 nodes
-| XpathInjectionBad.js:6:7:6:38 | userName | semmle.label | userName |
+| XpathInjectionBad.js:6:7:6:14 | userName | semmle.label | userName |
 | XpathInjectionBad.js:6:18:6:38 | req.par ... rName") | semmle.label | req.par ... rName") |
 | XpathInjectionBad.js:8:34:8:96 | "//user ... text()" | semmle.label | "//user ... text()" |
 | XpathInjectionBad.js:8:66:8:73 | userName | semmle.label | userName |
@@ -27,7 +27,7 @@ nodes
 | tst2.js:1:13:1:47 | documen ... ring(1) | semmle.label | documen ... ring(1) |
 | tst2.js:2:27:2:31 | query | semmle.label | query |
 | tst2.js:3:19:3:23 | query | semmle.label | query |
-| tst.js:6:7:6:37 | tainted | semmle.label | tainted |
+| tst.js:6:7:6:13 | tainted | semmle.label | tainted |
 | tst.js:6:17:6:37 | req.par ... rName") | semmle.label | req.par ... rName") |
 | tst.js:7:15:7:21 | tainted | semmle.label | tainted |
 | tst.js:8:16:8:22 | tainted | semmle.label | tainted |
diff --git a/javascript/ql/test/query-tests/Security/CWE-730/RegExpInjection.expected b/javascript/ql/test/query-tests/Security/CWE-730/Threat-models-disabled/RegExpInjection.expected
similarity index 82%
rename from javascript/ql/test/query-tests/Security/CWE-730/RegExpInjection.expected
rename to javascript/ql/test/query-tests/Security/CWE-730/Threat-models-disabled/RegExpInjection.expected
index 06926c487ef..bdc3775dbb7 100644
--- a/javascript/ql/test/query-tests/Security/CWE-730/RegExpInjection.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-730/Threat-models-disabled/RegExpInjection.expected
@@ -14,24 +14,23 @@
 | RegExpInjection.js:49:14:49:52 | key.spl ... in("-") | RegExpInjection.js:5:13:5:28 | req.param("key") | RegExpInjection.js:49:14:49:52 | key.spl ... in("-") | This regular expression is constructed from a $@. | RegExpInjection.js:5:13:5:28 | req.param("key") | user-provided value |
 | RegExpInjection.js:59:14:59:18 | input | RegExpInjection.js:55:39:55:56 | req.param("input") | RegExpInjection.js:59:14:59:18 | input | This regular expression is constructed from a $@. | RegExpInjection.js:55:39:55:56 | req.param("input") | user-provided value |
 | RegExpInjection.js:82:14:82:55 | "^.*\\.( ...  + ")$" | RegExpInjection.js:77:15:77:32 | req.param("input") | RegExpInjection.js:82:14:82:55 | "^.*\\.( ...  + ")$" | This regular expression is constructed from a $@. | RegExpInjection.js:77:15:77:32 | req.param("input") | user-provided value |
-| RegExpInjection.js:86:16:86:50 | `^${pro ... r.app$` | RegExpInjection.js:86:20:86:30 | process.env | RegExpInjection.js:86:16:86:50 | `^${pro ... r.app$` | This regular expression is constructed from a $@. | RegExpInjection.js:86:20:86:30 | process.env | environment variable |
 | RegExpInjection.js:88:16:88:49 | `^${pro ... r.app$` | RegExpInjection.js:88:20:88:31 | process.argv | RegExpInjection.js:88:16:88:49 | `^${pro ... r.app$` | This regular expression is constructed from a $@. | RegExpInjection.js:88:20:88:31 | process.argv | command-line argument |
 | RegExpInjection.js:95:14:95:22 | sanitized | RegExpInjection.js:92:15:92:32 | req.param("input") | RegExpInjection.js:95:14:95:22 | sanitized | This regular expression is constructed from a $@. | RegExpInjection.js:92:15:92:32 | req.param("input") | user-provided value |
 | tst.js:6:16:6:35 | "^"+ data.name + "$" | tst.js:5:16:5:29 | req.query.data | tst.js:6:16:6:35 | "^"+ data.name + "$" | This regular expression is constructed from a $@. | tst.js:5:16:5:29 | req.query.data | user-provided value |
 edges
-| RegExpInjection.js:5:7:5:28 | key | RegExpInjection.js:7:31:7:33 | key | provenance |  |
-| RegExpInjection.js:5:7:5:28 | key | RegExpInjection.js:17:19:17:21 | key | provenance |  |
-| RegExpInjection.js:5:7:5:28 | key | RegExpInjection.js:18:19:18:21 | key | provenance |  |
-| RegExpInjection.js:5:7:5:28 | key | RegExpInjection.js:28:12:28:14 | key | provenance |  |
-| RegExpInjection.js:5:7:5:28 | key | RegExpInjection.js:49:14:49:16 | key | provenance |  |
-| RegExpInjection.js:5:13:5:28 | req.param("key") | RegExpInjection.js:5:7:5:28 | key | provenance |  |
-| RegExpInjection.js:5:31:5:56 | input | RegExpInjection.js:35:23:35:27 | input | provenance |  |
-| RegExpInjection.js:5:31:5:56 | input | RegExpInjection.js:36:26:36:30 | input | provenance |  |
-| RegExpInjection.js:5:31:5:56 | input | RegExpInjection.js:37:25:37:29 | input | provenance |  |
-| RegExpInjection.js:5:31:5:56 | input | RegExpInjection.js:40:24:40:28 | input | provenance |  |
-| RegExpInjection.js:5:31:5:56 | input | RegExpInjection.js:41:27:41:31 | input | provenance |  |
-| RegExpInjection.js:5:31:5:56 | input | RegExpInjection.js:42:26:42:30 | input | provenance |  |
-| RegExpInjection.js:5:39:5:56 | req.param("input") | RegExpInjection.js:5:31:5:56 | input | provenance |  |
+| RegExpInjection.js:5:7:5:9 | key | RegExpInjection.js:7:31:7:33 | key | provenance |  |
+| RegExpInjection.js:5:7:5:9 | key | RegExpInjection.js:17:19:17:21 | key | provenance |  |
+| RegExpInjection.js:5:7:5:9 | key | RegExpInjection.js:18:19:18:21 | key | provenance |  |
+| RegExpInjection.js:5:7:5:9 | key | RegExpInjection.js:28:12:28:14 | key | provenance |  |
+| RegExpInjection.js:5:7:5:9 | key | RegExpInjection.js:49:14:49:16 | key | provenance |  |
+| RegExpInjection.js:5:13:5:28 | req.param("key") | RegExpInjection.js:5:7:5:9 | key | provenance |  |
+| RegExpInjection.js:5:31:5:35 | input | RegExpInjection.js:35:23:35:27 | input | provenance |  |
+| RegExpInjection.js:5:31:5:35 | input | RegExpInjection.js:36:26:36:30 | input | provenance |  |
+| RegExpInjection.js:5:31:5:35 | input | RegExpInjection.js:37:25:37:29 | input | provenance |  |
+| RegExpInjection.js:5:31:5:35 | input | RegExpInjection.js:40:24:40:28 | input | provenance |  |
+| RegExpInjection.js:5:31:5:35 | input | RegExpInjection.js:41:27:41:31 | input | provenance |  |
+| RegExpInjection.js:5:31:5:35 | input | RegExpInjection.js:42:26:42:30 | input | provenance |  |
+| RegExpInjection.js:5:39:5:56 | req.param("input") | RegExpInjection.js:5:31:5:35 | input | provenance |  |
 | RegExpInjection.js:7:31:7:33 | key | RegExpInjection.js:7:23:7:45 | "\\\\b" + ... (.*)\\n" | provenance |  |
 | RegExpInjection.js:9:17:9:17 | s | RegExpInjection.js:10:26:10:26 | s | provenance |  |
 | RegExpInjection.js:10:20:10:27 | wrap2(s) | RegExpInjection.js:10:12:10:27 | "\\\\b" + wrap2(s) | provenance |  |
@@ -51,26 +50,25 @@ edges
 | RegExpInjection.js:49:14:49:16 | key | RegExpInjection.js:49:14:49:27 | key.split(".") [ArrayElement] | provenance |  |
 | RegExpInjection.js:49:14:49:27 | key.split(".") [ArrayElement] | RegExpInjection.js:49:14:49:42 | key.spl ... x => x) [ArrayElement] | provenance |  |
 | RegExpInjection.js:49:14:49:42 | key.spl ... x => x) [ArrayElement] | RegExpInjection.js:49:14:49:52 | key.spl ... in("-") | provenance |  |
-| RegExpInjection.js:55:31:55:56 | input | RegExpInjection.js:59:14:59:18 | input | provenance |  |
-| RegExpInjection.js:55:39:55:56 | req.param("input") | RegExpInjection.js:55:31:55:56 | input | provenance |  |
-| RegExpInjection.js:77:7:77:32 | input | RegExpInjection.js:82:25:82:29 | input | provenance |  |
-| RegExpInjection.js:77:15:77:32 | req.param("input") | RegExpInjection.js:77:7:77:32 | input | provenance |  |
+| RegExpInjection.js:55:31:55:35 | input | RegExpInjection.js:59:14:59:18 | input | provenance |  |
+| RegExpInjection.js:55:39:55:56 | req.param("input") | RegExpInjection.js:55:31:55:35 | input | provenance |  |
+| RegExpInjection.js:77:7:77:11 | input | RegExpInjection.js:82:25:82:29 | input | provenance |  |
+| RegExpInjection.js:77:15:77:32 | req.param("input") | RegExpInjection.js:77:7:77:11 | input | provenance |  |
 | RegExpInjection.js:82:25:82:29 | input | RegExpInjection.js:82:25:82:48 | input.r ... g, "\|") | provenance |  |
 | RegExpInjection.js:82:25:82:48 | input.r ... g, "\|") | RegExpInjection.js:82:14:82:55 | "^.*\\.( ...  + ")$" | provenance |  |
-| RegExpInjection.js:86:20:86:30 | process.env | RegExpInjection.js:86:16:86:50 | `^${pro ... r.app$` | provenance |  |
 | RegExpInjection.js:88:20:88:31 | process.argv | RegExpInjection.js:88:16:88:49 | `^${pro ... r.app$` | provenance |  |
-| RegExpInjection.js:92:7:92:32 | input | RegExpInjection.js:94:19:94:23 | input | provenance |  |
-| RegExpInjection.js:92:15:92:32 | req.param("input") | RegExpInjection.js:92:7:92:32 | input | provenance |  |
-| RegExpInjection.js:94:7:94:106 | sanitized | RegExpInjection.js:95:14:95:22 | sanitized | provenance |  |
+| RegExpInjection.js:92:7:92:11 | input | RegExpInjection.js:94:19:94:23 | input | provenance |  |
+| RegExpInjection.js:92:15:92:32 | req.param("input") | RegExpInjection.js:92:7:92:11 | input | provenance |  |
+| RegExpInjection.js:94:7:94:15 | sanitized | RegExpInjection.js:95:14:95:22 | sanitized | provenance |  |
 | RegExpInjection.js:94:19:94:23 | input | RegExpInjection.js:94:19:94:106 | input.r ... "\\\\$&") | provenance |  |
-| RegExpInjection.js:94:19:94:106 | input.r ... "\\\\$&") | RegExpInjection.js:94:7:94:106 | sanitized | provenance |  |
-| tst.js:5:9:5:29 | data | tst.js:6:21:6:24 | data | provenance |  |
-| tst.js:5:16:5:29 | req.query.data | tst.js:5:9:5:29 | data | provenance |  |
+| RegExpInjection.js:94:19:94:106 | input.r ... "\\\\$&") | RegExpInjection.js:94:7:94:15 | sanitized | provenance |  |
+| tst.js:5:9:5:12 | data | tst.js:6:21:6:24 | data | provenance |  |
+| tst.js:5:16:5:29 | req.query.data | tst.js:5:9:5:12 | data | provenance |  |
 | tst.js:6:21:6:24 | data | tst.js:6:16:6:35 | "^"+ data.name + "$" | provenance |  |
 nodes
-| RegExpInjection.js:5:7:5:28 | key | semmle.label | key |
+| RegExpInjection.js:5:7:5:9 | key | semmle.label | key |
 | RegExpInjection.js:5:13:5:28 | req.param("key") | semmle.label | req.param("key") |
-| RegExpInjection.js:5:31:5:56 | input | semmle.label | input |
+| RegExpInjection.js:5:31:5:35 | input | semmle.label | input |
 | RegExpInjection.js:5:39:5:56 | req.param("input") | semmle.label | req.param("input") |
 | RegExpInjection.js:7:23:7:45 | "\\\\b" + ... (.*)\\n" | semmle.label | "\\\\b" + ... (.*)\\n" |
 | RegExpInjection.js:7:31:7:33 | key | semmle.label | key |
@@ -101,25 +99,23 @@ nodes
 | RegExpInjection.js:49:14:49:27 | key.split(".") [ArrayElement] | semmle.label | key.split(".") [ArrayElement] |
 | RegExpInjection.js:49:14:49:42 | key.spl ... x => x) [ArrayElement] | semmle.label | key.spl ... x => x) [ArrayElement] |
 | RegExpInjection.js:49:14:49:52 | key.spl ... in("-") | semmle.label | key.spl ... in("-") |
-| RegExpInjection.js:55:31:55:56 | input | semmle.label | input |
+| RegExpInjection.js:55:31:55:35 | input | semmle.label | input |
 | RegExpInjection.js:55:39:55:56 | req.param("input") | semmle.label | req.param("input") |
 | RegExpInjection.js:59:14:59:18 | input | semmle.label | input |
-| RegExpInjection.js:77:7:77:32 | input | semmle.label | input |
+| RegExpInjection.js:77:7:77:11 | input | semmle.label | input |
 | RegExpInjection.js:77:15:77:32 | req.param("input") | semmle.label | req.param("input") |
 | RegExpInjection.js:82:14:82:55 | "^.*\\.( ...  + ")$" | semmle.label | "^.*\\.( ...  + ")$" |
 | RegExpInjection.js:82:25:82:29 | input | semmle.label | input |
 | RegExpInjection.js:82:25:82:48 | input.r ... g, "\|") | semmle.label | input.r ... g, "\|") |
-| RegExpInjection.js:86:16:86:50 | `^${pro ... r.app$` | semmle.label | `^${pro ... r.app$` |
-| RegExpInjection.js:86:20:86:30 | process.env | semmle.label | process.env |
 | RegExpInjection.js:88:16:88:49 | `^${pro ... r.app$` | semmle.label | `^${pro ... r.app$` |
 | RegExpInjection.js:88:20:88:31 | process.argv | semmle.label | process.argv |
-| RegExpInjection.js:92:7:92:32 | input | semmle.label | input |
+| RegExpInjection.js:92:7:92:11 | input | semmle.label | input |
 | RegExpInjection.js:92:15:92:32 | req.param("input") | semmle.label | req.param("input") |
-| RegExpInjection.js:94:7:94:106 | sanitized | semmle.label | sanitized |
+| RegExpInjection.js:94:7:94:15 | sanitized | semmle.label | sanitized |
 | RegExpInjection.js:94:19:94:23 | input | semmle.label | input |
 | RegExpInjection.js:94:19:94:106 | input.r ... "\\\\$&") | semmle.label | input.r ... "\\\\$&") |
 | RegExpInjection.js:95:14:95:22 | sanitized | semmle.label | sanitized |
-| tst.js:5:9:5:29 | data | semmle.label | data |
+| tst.js:5:9:5:12 | data | semmle.label | data |
 | tst.js:5:16:5:29 | req.query.data | semmle.label | req.query.data |
 | tst.js:6:16:6:35 | "^"+ data.name + "$" | semmle.label | "^"+ data.name + "$" |
 | tst.js:6:21:6:24 | data | semmle.label | data |
diff --git a/javascript/ql/test/query-tests/Security/CWE-730/RegExpInjection.js b/javascript/ql/test/query-tests/Security/CWE-730/Threat-models-disabled/RegExpInjection.js
similarity index 96%
rename from javascript/ql/test/query-tests/Security/CWE-730/RegExpInjection.js
rename to javascript/ql/test/query-tests/Security/CWE-730/Threat-models-disabled/RegExpInjection.js
index 2aa73c80877..8a5fa557c19 100644
--- a/javascript/ql/test/query-tests/Security/CWE-730/RegExpInjection.js
+++ b/javascript/ql/test/query-tests/Security/CWE-730/Threat-models-disabled/RegExpInjection.js
@@ -83,7 +83,7 @@ app.get('/has-sanitizer', function(req, res) {
 });
 
 app.get("argv", function(req, res) {
-    new RegExp(`^${process.env.HOME}/Foo/bar.app$`); // $ Alert[js/regex-injection]
+    new RegExp(`^${process.env.HOME}/Foo/bar.app$`); // environment variable, should be detected only with threat model enabled.
 
     new RegExp(`^${process.argv[1]}/Foo/bar.app$`); // $ Alert[js/regex-injection]
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-730/RegExpInjection.qlref b/javascript/ql/test/query-tests/Security/CWE-730/Threat-models-disabled/RegExpInjection.qlref
similarity index 100%
rename from javascript/ql/test/query-tests/Security/CWE-730/RegExpInjection.qlref
rename to javascript/ql/test/query-tests/Security/CWE-730/Threat-models-disabled/RegExpInjection.qlref
diff --git a/javascript/ql/test/query-tests/Security/CWE-730/RegExpInjectionGood.js b/javascript/ql/test/query-tests/Security/CWE-730/Threat-models-disabled/RegExpInjectionGood.js
similarity index 100%
rename from javascript/ql/test/query-tests/Security/CWE-730/RegExpInjectionGood.js
rename to javascript/ql/test/query-tests/Security/CWE-730/Threat-models-disabled/RegExpInjectionGood.js
diff --git a/javascript/ql/test/query-tests/Security/CWE-730/ServerCrash.expected b/javascript/ql/test/query-tests/Security/CWE-730/Threat-models-disabled/ServerCrash.expected
similarity index 100%
rename from javascript/ql/test/query-tests/Security/CWE-730/ServerCrash.expected
rename to javascript/ql/test/query-tests/Security/CWE-730/Threat-models-disabled/ServerCrash.expected
diff --git a/javascript/ql/test/query-tests/Security/CWE-730/ServerCrash.qlref b/javascript/ql/test/query-tests/Security/CWE-730/Threat-models-disabled/ServerCrash.qlref
similarity index 100%
rename from javascript/ql/test/query-tests/Security/CWE-730/ServerCrash.qlref
rename to javascript/ql/test/query-tests/Security/CWE-730/Threat-models-disabled/ServerCrash.qlref
diff --git a/javascript/ql/test/query-tests/Security/CWE-730/client-side.js b/javascript/ql/test/query-tests/Security/CWE-730/Threat-models-disabled/client-side.js
similarity index 100%
rename from javascript/ql/test/query-tests/Security/CWE-730/client-side.js
rename to javascript/ql/test/query-tests/Security/CWE-730/Threat-models-disabled/client-side.js
diff --git a/javascript/ql/test/query-tests/Security/CWE-730/search.js b/javascript/ql/test/query-tests/Security/CWE-730/Threat-models-disabled/search.js
similarity index 100%
rename from javascript/ql/test/query-tests/Security/CWE-730/search.js
rename to javascript/ql/test/query-tests/Security/CWE-730/Threat-models-disabled/search.js
diff --git a/javascript/ql/test/query-tests/Security/CWE-730/server-crash.js b/javascript/ql/test/query-tests/Security/CWE-730/Threat-models-disabled/server-crash.js
similarity index 100%
rename from javascript/ql/test/query-tests/Security/CWE-730/server-crash.js
rename to javascript/ql/test/query-tests/Security/CWE-730/Threat-models-disabled/server-crash.js
diff --git a/javascript/ql/test/query-tests/Security/CWE-730/tst.js b/javascript/ql/test/query-tests/Security/CWE-730/Threat-models-disabled/tst.js
similarity index 100%
rename from javascript/ql/test/query-tests/Security/CWE-730/tst.js
rename to javascript/ql/test/query-tests/Security/CWE-730/Threat-models-disabled/tst.js
diff --git a/javascript/ql/test/query-tests/Security/CWE-730/Threat-models-enabled/RegExpInjection.expected b/javascript/ql/test/query-tests/Security/CWE-730/Threat-models-enabled/RegExpInjection.expected
new file mode 100644
index 00000000000..ad2123f3d14
--- /dev/null
+++ b/javascript/ql/test/query-tests/Security/CWE-730/Threat-models-enabled/RegExpInjection.expected
@@ -0,0 +1,34 @@
+#select
+| RegExpInjection.js:6:14:6:48 | `^${pro ... r.app$` | RegExpInjection.js:6:18:6:28 | process.env | RegExpInjection.js:6:14:6:48 | `^${pro ... r.app$` | This regular expression is constructed from a $@. | RegExpInjection.js:6:18:6:28 | process.env | environment variable |
+| RegExpInjection.js:8:14:8:40 | `^${pro ... }/bin$` | RegExpInjection.js:8:18:8:28 | process.env | RegExpInjection.js:8:14:8:40 | `^${pro ... }/bin$` | This regular expression is constructed from a $@. | RegExpInjection.js:8:18:8:28 | process.env | environment variable |
+| RegExpInjection.js:11:14:11:19 | envVar | RegExpInjection.js:10:16:10:26 | process.env | RegExpInjection.js:11:14:11:19 | envVar | This regular expression is constructed from a $@. | RegExpInjection.js:10:16:10:26 | process.env | environment variable |
+| RegExpInjection.js:14:14:14:47 | `^${pro ... r.app$` | RegExpInjection.js:14:18:14:29 | process.argv | RegExpInjection.js:14:14:14:47 | `^${pro ... r.app$` | This regular expression is constructed from a $@. | RegExpInjection.js:14:18:14:29 | process.argv | command-line argument |
+| RegExpInjection.js:17:14:17:17 | argv | RegExpInjection.js:16:14:16:25 | process.argv | RegExpInjection.js:17:14:17:17 | argv | This regular expression is constructed from a $@. | RegExpInjection.js:16:14:16:25 | process.argv | command-line argument |
+| RegExpInjection.js:21:14:21:22 | userInput | RegExpInjection.js:20:19:20:36 | req.param("input") | RegExpInjection.js:21:14:21:22 | userInput | This regular expression is constructed from a $@. | RegExpInjection.js:20:19:20:36 | req.param("input") | user-provided value |
+edges
+| RegExpInjection.js:6:18:6:28 | process.env | RegExpInjection.js:6:14:6:48 | `^${pro ... r.app$` | provenance |  |
+| RegExpInjection.js:8:18:8:28 | process.env | RegExpInjection.js:8:14:8:40 | `^${pro ... }/bin$` | provenance |  |
+| RegExpInjection.js:10:7:10:12 | envVar | RegExpInjection.js:11:14:11:19 | envVar | provenance |  |
+| RegExpInjection.js:10:16:10:26 | process.env | RegExpInjection.js:10:7:10:12 | envVar | provenance |  |
+| RegExpInjection.js:14:18:14:29 | process.argv | RegExpInjection.js:14:14:14:47 | `^${pro ... r.app$` | provenance |  |
+| RegExpInjection.js:16:7:16:10 | argv | RegExpInjection.js:17:14:17:17 | argv | provenance |  |
+| RegExpInjection.js:16:14:16:25 | process.argv | RegExpInjection.js:16:7:16:10 | argv | provenance |  |
+| RegExpInjection.js:20:7:20:15 | userInput | RegExpInjection.js:21:14:21:22 | userInput | provenance |  |
+| RegExpInjection.js:20:19:20:36 | req.param("input") | RegExpInjection.js:20:7:20:15 | userInput | provenance |  |
+nodes
+| RegExpInjection.js:6:14:6:48 | `^${pro ... r.app$` | semmle.label | `^${pro ... r.app$` |
+| RegExpInjection.js:6:18:6:28 | process.env | semmle.label | process.env |
+| RegExpInjection.js:8:14:8:40 | `^${pro ... }/bin$` | semmle.label | `^${pro ... }/bin$` |
+| RegExpInjection.js:8:18:8:28 | process.env | semmle.label | process.env |
+| RegExpInjection.js:10:7:10:12 | envVar | semmle.label | envVar |
+| RegExpInjection.js:10:16:10:26 | process.env | semmle.label | process.env |
+| RegExpInjection.js:11:14:11:19 | envVar | semmle.label | envVar |
+| RegExpInjection.js:14:14:14:47 | `^${pro ... r.app$` | semmle.label | `^${pro ... r.app$` |
+| RegExpInjection.js:14:18:14:29 | process.argv | semmle.label | process.argv |
+| RegExpInjection.js:16:7:16:10 | argv | semmle.label | argv |
+| RegExpInjection.js:16:14:16:25 | process.argv | semmle.label | process.argv |
+| RegExpInjection.js:17:14:17:17 | argv | semmle.label | argv |
+| RegExpInjection.js:20:7:20:15 | userInput | semmle.label | userInput |
+| RegExpInjection.js:20:19:20:36 | req.param("input") | semmle.label | req.param("input") |
+| RegExpInjection.js:21:14:21:22 | userInput | semmle.label | userInput |
+subpaths
diff --git a/javascript/ql/test/query-tests/Security/CWE-730/Threat-models-enabled/RegExpInjection.ext.yml b/javascript/ql/test/query-tests/Security/CWE-730/Threat-models-enabled/RegExpInjection.ext.yml
new file mode 100644
index 00000000000..cd28c6d9717
--- /dev/null
+++ b/javascript/ql/test/query-tests/Security/CWE-730/Threat-models-enabled/RegExpInjection.ext.yml
@@ -0,0 +1,6 @@
+extensions:
+  - addsTo:
+      pack: codeql/threat-models
+      extensible: threatModelConfiguration
+    data:
+      - ["environment", true, 0]
diff --git a/javascript/ql/test/query-tests/Security/CWE-730/Threat-models-enabled/RegExpInjection.js b/javascript/ql/test/query-tests/Security/CWE-730/Threat-models-enabled/RegExpInjection.js
new file mode 100644
index 00000000000..28736678d8c
--- /dev/null
+++ b/javascript/ql/test/query-tests/Security/CWE-730/Threat-models-enabled/RegExpInjection.js
@@ -0,0 +1,22 @@
+var express = require('express');
+var app = express();
+
+app.get('/test-environment', function(req, res) {
+  // Environment variables should be detected when "environment" threat model is enabled
+  new RegExp(`^${process.env.HOME}/Foo/bar.app$`); // $ Alert[js/regex-injection]
+  
+  new RegExp(`^${process.env.PATH}/bin$`); // $ Alert[js/regex-injection]
+  
+  var envVar = process.env.NODE_ENV; // $ Source[js/regex-injection]
+  new RegExp(envVar); // $ Alert[js/regex-injection]
+  
+  // Command line arguments should still be detected
+  new RegExp(`^${process.argv[1]}/Foo/bar.app$`); // $ Alert[js/regex-injection]
+  
+  var argv = process.argv[2]; // $ Source[js/regex-injection]
+  new RegExp(argv); // $ Alert[js/regex-injection]
+  
+  // Regular user input should still be detected
+  var userInput = req.param("input"); // $ Source[js/regex-injection]
+  new RegExp(userInput); // $ Alert[js/regex-injection]
+});
diff --git a/javascript/ql/test/query-tests/Security/CWE-730/Threat-models-enabled/RegExpInjection.qlref b/javascript/ql/test/query-tests/Security/CWE-730/Threat-models-enabled/RegExpInjection.qlref
new file mode 100644
index 00000000000..2bf1a8eee36
--- /dev/null
+++ b/javascript/ql/test/query-tests/Security/CWE-730/Threat-models-enabled/RegExpInjection.qlref
@@ -0,0 +1,2 @@
+query: Security/CWE-730/RegExpInjection.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/query-tests/Security/CWE-754/UnvalidatedDynamicMethodCall.expected b/javascript/ql/test/query-tests/Security/CWE-754/UnvalidatedDynamicMethodCall.expected
index 74cb64bdb8d..11aaf95922c 100644
--- a/javascript/ql/test/query-tests/Security/CWE-754/UnvalidatedDynamicMethodCall.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-754/UnvalidatedDynamicMethodCall.expected
@@ -16,82 +16,82 @@
 | tst.js:50:5:50:6 | fn | tst.js:47:39:47:40 | ev | tst.js:50:5:50:6 | fn | Invocation of method with $@ name may dispatch to unexpected target and cause an exception. | tst.js:47:39:47:40 | ev | user-controlled |
 edges
 | UnsafeDynamicMethodAccess.js:5:37:5:38 | ev | UnsafeDynamicMethodAccess.js:6:30:6:31 | ev | provenance |  |
-| UnsafeDynamicMethodAccess.js:6:9:6:37 | message | UnsafeDynamicMethodAccess.js:15:9:15:15 | message | provenance |  |
-| UnsafeDynamicMethodAccess.js:6:19:6:37 | JSON.parse(ev.data) | UnsafeDynamicMethodAccess.js:6:9:6:37 | message | provenance |  |
+| UnsafeDynamicMethodAccess.js:6:9:6:15 | message | UnsafeDynamicMethodAccess.js:15:9:15:15 | message | provenance |  |
+| UnsafeDynamicMethodAccess.js:6:19:6:37 | JSON.parse(ev.data) | UnsafeDynamicMethodAccess.js:6:9:6:15 | message | provenance |  |
 | UnsafeDynamicMethodAccess.js:6:30:6:31 | ev | UnsafeDynamicMethodAccess.js:6:30:6:36 | ev.data | provenance | Config |
 | UnsafeDynamicMethodAccess.js:6:30:6:36 | ev.data | UnsafeDynamicMethodAccess.js:6:19:6:37 | JSON.parse(ev.data) | provenance | Config |
 | UnsafeDynamicMethodAccess.js:15:9:15:15 | message | UnsafeDynamicMethodAccess.js:15:9:15:20 | message.name | provenance | Config |
 | UnsafeDynamicMethodAccess.js:15:9:15:20 | message.name | UnsafeDynamicMethodAccess.js:15:5:15:21 | obj[message.name] | provenance | Config |
-| UnvalidatedDynamicMethodCall2.js:13:9:13:47 | action | UnvalidatedDynamicMethodCall2.js:14:13:14:18 | action | provenance |  |
-| UnvalidatedDynamicMethodCall2.js:13:18:13:47 | actions ... action) | UnvalidatedDynamicMethodCall2.js:13:9:13:47 | action | provenance |  |
+| UnvalidatedDynamicMethodCall2.js:13:9:13:14 | action | UnvalidatedDynamicMethodCall2.js:14:13:14:18 | action | provenance |  |
+| UnvalidatedDynamicMethodCall2.js:13:18:13:47 | actions ... action) | UnvalidatedDynamicMethodCall2.js:13:9:13:14 | action | provenance |  |
 | UnvalidatedDynamicMethodCall2.js:13:30:13:46 | req.params.action | UnvalidatedDynamicMethodCall2.js:13:18:13:47 | actions ... action) | provenance | Config |
-| UnvalidatedDynamicMethodCall.js:14:7:14:41 | action | UnvalidatedDynamicMethodCall.js:15:11:15:16 | action | provenance |  |
-| UnvalidatedDynamicMethodCall.js:14:16:14:41 | actions ... action] | UnvalidatedDynamicMethodCall.js:14:7:14:41 | action | provenance |  |
+| UnvalidatedDynamicMethodCall.js:14:7:14:12 | action | UnvalidatedDynamicMethodCall.js:15:11:15:16 | action | provenance |  |
+| UnvalidatedDynamicMethodCall.js:14:16:14:41 | actions ... action] | UnvalidatedDynamicMethodCall.js:14:7:14:12 | action | provenance |  |
 | UnvalidatedDynamicMethodCall.js:14:24:14:40 | req.params.action | UnvalidatedDynamicMethodCall.js:14:16:14:41 | actions ... action] | provenance | Config |
-| UnvalidatedDynamicMethodCallGood4.js:14:13:14:51 | action | UnvalidatedDynamicMethodCallGood4.js:15:17:15:22 | action | provenance |  |
-| UnvalidatedDynamicMethodCallGood4.js:14:22:14:51 | actions ... action) | UnvalidatedDynamicMethodCallGood4.js:14:13:14:51 | action | provenance |  |
+| UnvalidatedDynamicMethodCallGood4.js:14:13:14:18 | action | UnvalidatedDynamicMethodCallGood4.js:15:17:15:22 | action | provenance |  |
+| UnvalidatedDynamicMethodCallGood4.js:14:22:14:51 | actions ... action) | UnvalidatedDynamicMethodCallGood4.js:14:13:14:18 | action | provenance |  |
 | UnvalidatedDynamicMethodCallGood4.js:14:34:14:50 | req.params.action | UnvalidatedDynamicMethodCallGood4.js:14:22:14:51 | actions ... action) | provenance | Config |
 | tst.js:6:39:6:40 | ev | tst.js:7:27:7:28 | ev | provenance |  |
 | tst.js:6:39:6:40 | ev | tst.js:9:9:9:10 | ev | provenance |  |
-| tst.js:7:9:7:39 | name | tst.js:11:9:11:12 | name | provenance |  |
-| tst.js:7:9:7:39 | name | tst.js:17:18:17:21 | name | provenance |  |
-| tst.js:7:9:7:39 | name | tst.js:21:11:21:14 | name | provenance |  |
-| tst.js:7:9:7:39 | name | tst.js:26:11:26:14 | name | provenance |  |
-| tst.js:7:9:7:39 | name | tst.js:28:11:28:14 | name | provenance |  |
-| tst.js:7:9:7:39 | name | tst.js:34:21:34:24 | name | provenance |  |
+| tst.js:7:9:7:12 | name | tst.js:11:9:11:12 | name | provenance |  |
+| tst.js:7:9:7:12 | name | tst.js:17:18:17:21 | name | provenance |  |
+| tst.js:7:9:7:12 | name | tst.js:21:11:21:14 | name | provenance |  |
+| tst.js:7:9:7:12 | name | tst.js:26:11:26:14 | name | provenance |  |
+| tst.js:7:9:7:12 | name | tst.js:28:11:28:14 | name | provenance |  |
+| tst.js:7:9:7:12 | name | tst.js:34:21:34:24 | name | provenance |  |
 | tst.js:7:16:7:34 | JSON.parse(ev.data) | tst.js:7:16:7:39 | JSON.pa ... a).name | provenance | Config |
-| tst.js:7:16:7:39 | JSON.pa ... a).name | tst.js:7:9:7:39 | name | provenance |  |
+| tst.js:7:16:7:39 | JSON.pa ... a).name | tst.js:7:9:7:12 | name | provenance |  |
 | tst.js:7:27:7:28 | ev | tst.js:7:27:7:33 | ev.data | provenance | Config |
 | tst.js:7:27:7:33 | ev.data | tst.js:7:16:7:34 | JSON.parse(ev.data) | provenance | Config |
 | tst.js:9:9:9:10 | ev | tst.js:9:9:9:15 | ev.data | provenance | Config |
 | tst.js:9:9:9:15 | ev.data | tst.js:9:5:9:16 | obj[ev.data] | provenance | Config |
 | tst.js:11:9:11:12 | name | tst.js:11:5:11:13 | obj[name] | provenance | Config |
-| tst.js:17:9:17:22 | fn | tst.js:18:5:18:6 | fn | provenance |  |
-| tst.js:17:9:17:22 | fn | tst.js:20:7:20:8 | fn | provenance |  |
-| tst.js:17:9:17:22 | fn | tst.js:22:11:22:12 | fn | provenance |  |
-| tst.js:17:14:17:22 | obj[name] | tst.js:17:9:17:22 | fn | provenance |  |
+| tst.js:17:9:17:10 | fn | tst.js:18:5:18:6 | fn | provenance |  |
+| tst.js:17:9:17:10 | fn | tst.js:20:7:20:8 | fn | provenance |  |
+| tst.js:17:9:17:10 | fn | tst.js:22:11:22:12 | fn | provenance |  |
+| tst.js:17:14:17:22 | obj[name] | tst.js:17:9:17:10 | fn | provenance |  |
 | tst.js:17:18:17:21 | name | tst.js:17:14:17:22 | obj[name] | provenance | Config |
 | tst.js:21:11:21:14 | name | tst.js:21:7:21:15 | obj[name] | provenance | Config |
 | tst.js:26:11:26:14 | name | tst.js:26:7:26:15 | obj[name] | provenance | Config |
 | tst.js:28:11:28:14 | name | tst.js:28:7:28:15 | obj[name] | provenance | Config |
-| tst.js:34:9:34:24 | key | tst.js:35:9:35:11 | key | provenance |  |
-| tst.js:34:9:34:24 | key | tst.js:37:11:37:13 | key | provenance |  |
-| tst.js:34:15:34:24 | "$" + name | tst.js:34:9:34:24 | key | provenance |  |
+| tst.js:34:9:34:11 | key | tst.js:35:9:35:11 | key | provenance |  |
+| tst.js:34:9:34:11 | key | tst.js:37:11:37:13 | key | provenance |  |
+| tst.js:34:15:34:24 | "$" + name | tst.js:34:9:34:11 | key | provenance |  |
 | tst.js:34:21:34:24 | name | tst.js:34:15:34:24 | "$" + name | provenance | Config |
 | tst.js:35:9:35:11 | key | tst.js:35:5:35:12 | obj[key] | provenance | Config |
 | tst.js:37:11:37:13 | key | tst.js:37:7:37:14 | obj[key] | provenance | Config |
 | tst.js:47:39:47:40 | ev | tst.js:48:27:48:28 | ev | provenance |  |
-| tst.js:48:9:48:39 | name | tst.js:49:19:49:22 | name | provenance |  |
+| tst.js:48:9:48:12 | name | tst.js:49:19:49:22 | name | provenance |  |
 | tst.js:48:16:48:34 | JSON.parse(ev.data) | tst.js:48:16:48:39 | JSON.pa ... a).name | provenance | Config |
-| tst.js:48:16:48:39 | JSON.pa ... a).name | tst.js:48:9:48:39 | name | provenance |  |
+| tst.js:48:16:48:39 | JSON.pa ... a).name | tst.js:48:9:48:12 | name | provenance |  |
 | tst.js:48:27:48:28 | ev | tst.js:48:27:48:33 | ev.data | provenance | Config |
 | tst.js:48:27:48:33 | ev.data | tst.js:48:16:48:34 | JSON.parse(ev.data) | provenance | Config |
-| tst.js:49:9:49:23 | fn | tst.js:50:5:50:6 | fn | provenance |  |
-| tst.js:49:14:49:23 | obj2[name] | tst.js:49:9:49:23 | fn | provenance |  |
+| tst.js:49:9:49:10 | fn | tst.js:50:5:50:6 | fn | provenance |  |
+| tst.js:49:14:49:23 | obj2[name] | tst.js:49:9:49:10 | fn | provenance |  |
 | tst.js:49:19:49:22 | name | tst.js:49:14:49:23 | obj2[name] | provenance | Config |
 nodes
 | UnsafeDynamicMethodAccess.js:5:37:5:38 | ev | semmle.label | ev |
-| UnsafeDynamicMethodAccess.js:6:9:6:37 | message | semmle.label | message |
+| UnsafeDynamicMethodAccess.js:6:9:6:15 | message | semmle.label | message |
 | UnsafeDynamicMethodAccess.js:6:19:6:37 | JSON.parse(ev.data) | semmle.label | JSON.parse(ev.data) |
 | UnsafeDynamicMethodAccess.js:6:30:6:31 | ev | semmle.label | ev |
 | UnsafeDynamicMethodAccess.js:6:30:6:36 | ev.data | semmle.label | ev.data |
 | UnsafeDynamicMethodAccess.js:15:5:15:21 | obj[message.name] | semmle.label | obj[message.name] |
 | UnsafeDynamicMethodAccess.js:15:9:15:15 | message | semmle.label | message |
 | UnsafeDynamicMethodAccess.js:15:9:15:20 | message.name | semmle.label | message.name |
-| UnvalidatedDynamicMethodCall2.js:13:9:13:47 | action | semmle.label | action |
+| UnvalidatedDynamicMethodCall2.js:13:9:13:14 | action | semmle.label | action |
 | UnvalidatedDynamicMethodCall2.js:13:18:13:47 | actions ... action) | semmle.label | actions ... action) |
 | UnvalidatedDynamicMethodCall2.js:13:30:13:46 | req.params.action | semmle.label | req.params.action |
 | UnvalidatedDynamicMethodCall2.js:14:13:14:18 | action | semmle.label | action |
-| UnvalidatedDynamicMethodCall.js:14:7:14:41 | action | semmle.label | action |
+| UnvalidatedDynamicMethodCall.js:14:7:14:12 | action | semmle.label | action |
 | UnvalidatedDynamicMethodCall.js:14:16:14:41 | actions ... action] | semmle.label | actions ... action] |
 | UnvalidatedDynamicMethodCall.js:14:24:14:40 | req.params.action | semmle.label | req.params.action |
 | UnvalidatedDynamicMethodCall.js:15:11:15:16 | action | semmle.label | action |
-| UnvalidatedDynamicMethodCallGood4.js:14:13:14:51 | action | semmle.label | action |
+| UnvalidatedDynamicMethodCallGood4.js:14:13:14:18 | action | semmle.label | action |
 | UnvalidatedDynamicMethodCallGood4.js:14:22:14:51 | actions ... action) | semmle.label | actions ... action) |
 | UnvalidatedDynamicMethodCallGood4.js:14:34:14:50 | req.params.action | semmle.label | req.params.action |
 | UnvalidatedDynamicMethodCallGood4.js:15:17:15:22 | action | semmle.label | action |
 | tst.js:6:39:6:40 | ev | semmle.label | ev |
-| tst.js:7:9:7:39 | name | semmle.label | name |
+| tst.js:7:9:7:12 | name | semmle.label | name |
 | tst.js:7:16:7:34 | JSON.parse(ev.data) | semmle.label | JSON.parse(ev.data) |
 | tst.js:7:16:7:39 | JSON.pa ... a).name | semmle.label | JSON.pa ... a).name |
 | tst.js:7:27:7:28 | ev | semmle.label | ev |
@@ -101,7 +101,7 @@ nodes
 | tst.js:9:9:9:15 | ev.data | semmle.label | ev.data |
 | tst.js:11:5:11:13 | obj[name] | semmle.label | obj[name] |
 | tst.js:11:9:11:12 | name | semmle.label | name |
-| tst.js:17:9:17:22 | fn | semmle.label | fn |
+| tst.js:17:9:17:10 | fn | semmle.label | fn |
 | tst.js:17:14:17:22 | obj[name] | semmle.label | obj[name] |
 | tst.js:17:18:17:21 | name | semmle.label | name |
 | tst.js:18:5:18:6 | fn | semmle.label | fn |
@@ -113,7 +113,7 @@ nodes
 | tst.js:26:11:26:14 | name | semmle.label | name |
 | tst.js:28:7:28:15 | obj[name] | semmle.label | obj[name] |
 | tst.js:28:11:28:14 | name | semmle.label | name |
-| tst.js:34:9:34:24 | key | semmle.label | key |
+| tst.js:34:9:34:11 | key | semmle.label | key |
 | tst.js:34:15:34:24 | "$" + name | semmle.label | "$" + name |
 | tst.js:34:21:34:24 | name | semmle.label | name |
 | tst.js:35:5:35:12 | obj[key] | semmle.label | obj[key] |
@@ -121,12 +121,12 @@ nodes
 | tst.js:37:7:37:14 | obj[key] | semmle.label | obj[key] |
 | tst.js:37:11:37:13 | key | semmle.label | key |
 | tst.js:47:39:47:40 | ev | semmle.label | ev |
-| tst.js:48:9:48:39 | name | semmle.label | name |
+| tst.js:48:9:48:12 | name | semmle.label | name |
 | tst.js:48:16:48:34 | JSON.parse(ev.data) | semmle.label | JSON.parse(ev.data) |
 | tst.js:48:16:48:39 | JSON.pa ... a).name | semmle.label | JSON.pa ... a).name |
 | tst.js:48:27:48:28 | ev | semmle.label | ev |
 | tst.js:48:27:48:33 | ev.data | semmle.label | ev.data |
-| tst.js:49:9:49:23 | fn | semmle.label | fn |
+| tst.js:49:9:49:10 | fn | semmle.label | fn |
 | tst.js:49:14:49:23 | obj2[name] | semmle.label | obj2[name] |
 | tst.js:49:19:49:22 | name | semmle.label | name |
 | tst.js:50:5:50:6 | fn | semmle.label | fn |
diff --git a/javascript/ql/test/query-tests/Security/CWE-770/ResourceExhaustion/ResourceExhaustion.expected b/javascript/ql/test/query-tests/Security/CWE-770/ResourceExhaustion/ResourceExhaustion.expected
index 0d90beb0669..886460544af 100644
--- a/javascript/ql/test/query-tests/Security/CWE-770/ResourceExhaustion/ResourceExhaustion.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-770/ResourceExhaustion/ResourceExhaustion.expected
@@ -20,46 +20,46 @@
 | resource-exhaustion.js:88:16:88:16 | n | resource-exhaustion.js:5:21:5:27 | req.url | resource-exhaustion.js:88:16:88:16 | n | This creates a buffer with a user-controlled size from a $@. | resource-exhaustion.js:5:21:5:27 | req.url | user-provided value |
 | resource-exhaustion.js:92:18:92:18 | n | resource-exhaustion.js:5:21:5:27 | req.url | resource-exhaustion.js:92:18:92:18 | n | This creates a buffer with a user-controlled size from a $@. | resource-exhaustion.js:5:21:5:27 | req.url | user-provided value |
 edges
-| documentaion-examples/ResourceExhaustion_timeout.js:5:6:5:59 | delay | documentaion-examples/ResourceExhaustion_timeout.js:7:16:7:20 | delay | provenance |  |
-| documentaion-examples/ResourceExhaustion_timeout.js:5:14:5:59 | parseIn ... .delay) | documentaion-examples/ResourceExhaustion_timeout.js:5:6:5:59 | delay | provenance |  |
+| documentaion-examples/ResourceExhaustion_timeout.js:5:6:5:10 | delay | documentaion-examples/ResourceExhaustion_timeout.js:7:16:7:20 | delay | provenance |  |
+| documentaion-examples/ResourceExhaustion_timeout.js:5:14:5:59 | parseIn ... .delay) | documentaion-examples/ResourceExhaustion_timeout.js:5:6:5:10 | delay | provenance |  |
 | documentaion-examples/ResourceExhaustion_timeout.js:5:23:5:46 | url.par ... , true) | documentaion-examples/ResourceExhaustion_timeout.js:5:23:5:58 | url.par ... y.delay | provenance |  |
 | documentaion-examples/ResourceExhaustion_timeout.js:5:23:5:58 | url.par ... y.delay | documentaion-examples/ResourceExhaustion_timeout.js:5:14:5:59 | parseIn ... .delay) | provenance | Config |
 | documentaion-examples/ResourceExhaustion_timeout.js:5:33:5:39 | req.url | documentaion-examples/ResourceExhaustion_timeout.js:5:23:5:46 | url.par ... , true) | provenance |  |
-| resource-exhaustion.js:5:7:5:42 | s | resource-exhaustion.js:6:20:6:20 | s | provenance |  |
-| resource-exhaustion.js:5:7:5:42 | s | resource-exhaustion.js:35:12:35:12 | s | provenance |  |
-| resource-exhaustion.js:5:7:5:42 | s | resource-exhaustion.js:82:17:82:17 | s | provenance |  |
-| resource-exhaustion.js:5:7:5:42 | s | resource-exhaustion.js:84:18:84:18 | s | provenance |  |
-| resource-exhaustion.js:5:11:5:34 | url.par ... , true) | resource-exhaustion.js:5:7:5:42 | s | provenance |  |
+| resource-exhaustion.js:5:7:5:7 | s | resource-exhaustion.js:6:20:6:20 | s | provenance |  |
+| resource-exhaustion.js:5:7:5:7 | s | resource-exhaustion.js:35:12:35:12 | s | provenance |  |
+| resource-exhaustion.js:5:7:5:7 | s | resource-exhaustion.js:82:17:82:17 | s | provenance |  |
+| resource-exhaustion.js:5:7:5:7 | s | resource-exhaustion.js:84:18:84:18 | s | provenance |  |
+| resource-exhaustion.js:5:11:5:34 | url.par ... , true) | resource-exhaustion.js:5:7:5:7 | s | provenance |  |
 | resource-exhaustion.js:5:21:5:27 | req.url | resource-exhaustion.js:5:11:5:34 | url.par ... , true) | provenance |  |
-| resource-exhaustion.js:6:7:6:21 | n | resource-exhaustion.js:14:16:14:16 | n | provenance |  |
-| resource-exhaustion.js:6:7:6:21 | n | resource-exhaustion.js:15:22:15:22 | n | provenance |  |
-| resource-exhaustion.js:6:7:6:21 | n | resource-exhaustion.js:16:26:16:26 | n | provenance |  |
-| resource-exhaustion.js:6:7:6:21 | n | resource-exhaustion.js:20:20:20:20 | n | provenance |  |
-| resource-exhaustion.js:6:7:6:21 | n | resource-exhaustion.js:22:18:22:18 | n | provenance |  |
-| resource-exhaustion.js:6:7:6:21 | n | resource-exhaustion.js:27:9:27:9 | n | provenance |  |
-| resource-exhaustion.js:6:7:6:21 | n | resource-exhaustion.js:28:13:28:13 | n | provenance |  |
-| resource-exhaustion.js:6:7:6:21 | n | resource-exhaustion.js:29:9:29:9 | n | provenance |  |
-| resource-exhaustion.js:6:7:6:21 | n | resource-exhaustion.js:30:9:30:9 | n | provenance |  |
-| resource-exhaustion.js:6:7:6:21 | n | resource-exhaustion.js:31:9:31:9 | n | provenance |  |
-| resource-exhaustion.js:6:7:6:21 | n | resource-exhaustion.js:32:9:32:9 | n | provenance |  |
-| resource-exhaustion.js:6:7:6:21 | n | resource-exhaustion.js:34:12:34:12 | n | provenance |  |
-| resource-exhaustion.js:6:7:6:21 | n | resource-exhaustion.js:81:17:81:17 | n | provenance |  |
-| resource-exhaustion.js:6:7:6:21 | n | resource-exhaustion.js:83:18:83:18 | n | provenance |  |
-| resource-exhaustion.js:6:7:6:21 | n | resource-exhaustion.js:88:16:88:16 | n | provenance |  |
-| resource-exhaustion.js:6:7:6:21 | n | resource-exhaustion.js:92:18:92:18 | n | provenance |  |
-| resource-exhaustion.js:6:11:6:21 | parseInt(s) | resource-exhaustion.js:6:7:6:21 | n | provenance |  |
+| resource-exhaustion.js:6:7:6:7 | n | resource-exhaustion.js:14:16:14:16 | n | provenance |  |
+| resource-exhaustion.js:6:7:6:7 | n | resource-exhaustion.js:15:22:15:22 | n | provenance |  |
+| resource-exhaustion.js:6:7:6:7 | n | resource-exhaustion.js:16:26:16:26 | n | provenance |  |
+| resource-exhaustion.js:6:7:6:7 | n | resource-exhaustion.js:20:20:20:20 | n | provenance |  |
+| resource-exhaustion.js:6:7:6:7 | n | resource-exhaustion.js:22:18:22:18 | n | provenance |  |
+| resource-exhaustion.js:6:7:6:7 | n | resource-exhaustion.js:27:9:27:9 | n | provenance |  |
+| resource-exhaustion.js:6:7:6:7 | n | resource-exhaustion.js:28:13:28:13 | n | provenance |  |
+| resource-exhaustion.js:6:7:6:7 | n | resource-exhaustion.js:29:9:29:9 | n | provenance |  |
+| resource-exhaustion.js:6:7:6:7 | n | resource-exhaustion.js:30:9:30:9 | n | provenance |  |
+| resource-exhaustion.js:6:7:6:7 | n | resource-exhaustion.js:31:9:31:9 | n | provenance |  |
+| resource-exhaustion.js:6:7:6:7 | n | resource-exhaustion.js:32:9:32:9 | n | provenance |  |
+| resource-exhaustion.js:6:7:6:7 | n | resource-exhaustion.js:34:12:34:12 | n | provenance |  |
+| resource-exhaustion.js:6:7:6:7 | n | resource-exhaustion.js:81:17:81:17 | n | provenance |  |
+| resource-exhaustion.js:6:7:6:7 | n | resource-exhaustion.js:83:18:83:18 | n | provenance |  |
+| resource-exhaustion.js:6:7:6:7 | n | resource-exhaustion.js:88:16:88:16 | n | provenance |  |
+| resource-exhaustion.js:6:7:6:7 | n | resource-exhaustion.js:92:18:92:18 | n | provenance |  |
+| resource-exhaustion.js:6:11:6:21 | parseInt(s) | resource-exhaustion.js:6:7:6:7 | n | provenance |  |
 | resource-exhaustion.js:6:20:6:20 | s | resource-exhaustion.js:6:11:6:21 | parseInt(s) | provenance | Config |
 nodes
-| documentaion-examples/ResourceExhaustion_timeout.js:5:6:5:59 | delay | semmle.label | delay |
+| documentaion-examples/ResourceExhaustion_timeout.js:5:6:5:10 | delay | semmle.label | delay |
 | documentaion-examples/ResourceExhaustion_timeout.js:5:14:5:59 | parseIn ... .delay) | semmle.label | parseIn ... .delay) |
 | documentaion-examples/ResourceExhaustion_timeout.js:5:23:5:46 | url.par ... , true) | semmle.label | url.par ... , true) |
 | documentaion-examples/ResourceExhaustion_timeout.js:5:23:5:58 | url.par ... y.delay | semmle.label | url.par ... y.delay |
 | documentaion-examples/ResourceExhaustion_timeout.js:5:33:5:39 | req.url | semmle.label | req.url |
 | documentaion-examples/ResourceExhaustion_timeout.js:7:16:7:20 | delay | semmle.label | delay |
-| resource-exhaustion.js:5:7:5:42 | s | semmle.label | s |
+| resource-exhaustion.js:5:7:5:7 | s | semmle.label | s |
 | resource-exhaustion.js:5:11:5:34 | url.par ... , true) | semmle.label | url.par ... , true) |
 | resource-exhaustion.js:5:21:5:27 | req.url | semmle.label | req.url |
-| resource-exhaustion.js:6:7:6:21 | n | semmle.label | n |
+| resource-exhaustion.js:6:7:6:7 | n | semmle.label | n |
 | resource-exhaustion.js:6:11:6:21 | parseInt(s) | semmle.label | parseInt(s) |
 | resource-exhaustion.js:6:20:6:20 | s | semmle.label | s |
 | resource-exhaustion.js:14:16:14:16 | n | semmle.label | n |
diff --git a/javascript/ql/test/query-tests/Security/CWE-776/XmlBomb.expected b/javascript/ql/test/query-tests/Security/CWE-776/XmlBomb.expected
index 2b4d4180491..8bb8dd8d27d 100644
--- a/javascript/ql/test/query-tests/Security/CWE-776/XmlBomb.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-776/XmlBomb.expected
@@ -5,34 +5,26 @@
 | domparser.js:11:57:11:59 | src | domparser.js:2:13:2:36 | documen ... .search | domparser.js:11:57:11:59 | src | XML parsing depends on a $@ without guarding against uncontrolled entity expansion. | domparser.js:2:13:2:36 | documen ... .search | user-provided value |
 | expat.js:6:16:6:36 | req.par ... e-xml") | expat.js:6:16:6:36 | req.par ... e-xml") | expat.js:6:16:6:36 | req.par ... e-xml") | XML parsing depends on a $@ without guarding against uncontrolled entity expansion. | expat.js:6:16:6:36 | req.par ... e-xml") | user-provided value |
 | jquery.js:4:14:4:16 | src | jquery.js:2:13:2:36 | documen ... .search | jquery.js:4:14:4:16 | src | XML parsing depends on a $@ without guarding against uncontrolled entity expansion. | jquery.js:2:13:2:36 | documen ... .search | user-provided value |
-| libxml.js:5:21:5:41 | req.par ... e-xml") | libxml.js:5:21:5:41 | req.par ... e-xml") | libxml.js:5:21:5:41 | req.par ... e-xml") | XML parsing depends on a $@ without guarding against uncontrolled entity expansion. | libxml.js:5:21:5:41 | req.par ... e-xml") | user-provided value |
-| libxml.noent.js:5:21:5:41 | req.par ... e-xml") | libxml.noent.js:5:21:5:41 | req.par ... e-xml") | libxml.noent.js:5:21:5:41 | req.par ... e-xml") | XML parsing depends on a $@ without guarding against uncontrolled entity expansion. | libxml.noent.js:5:21:5:41 | req.par ... e-xml") | user-provided value |
-| libxml.sax.js:6:22:6:42 | req.par ... e-xml") | libxml.sax.js:6:22:6:42 | req.par ... e-xml") | libxml.sax.js:6:22:6:42 | req.par ... e-xml") | XML parsing depends on a $@ without guarding against uncontrolled entity expansion. | libxml.sax.js:6:22:6:42 | req.par ... e-xml") | user-provided value |
-| libxml.saxpush.js:6:15:6:35 | req.par ... e-xml") | libxml.saxpush.js:6:15:6:35 | req.par ... e-xml") | libxml.saxpush.js:6:15:6:35 | req.par ... e-xml") | XML parsing depends on a $@ without guarding against uncontrolled entity expansion. | libxml.saxpush.js:6:15:6:35 | req.par ... e-xml") | user-provided value |
 edges
-| closure.js:2:7:2:36 | src | closure.js:3:24:3:26 | src | provenance |  |
-| closure.js:2:13:2:36 | documen ... .search | closure.js:2:7:2:36 | src | provenance |  |
-| domparser.js:2:7:2:36 | src | domparser.js:5:37:5:39 | src | provenance |  |
-| domparser.js:2:7:2:36 | src | domparser.js:9:55:9:57 | src | provenance |  |
-| domparser.js:2:7:2:36 | src | domparser.js:11:57:11:59 | src | provenance |  |
-| domparser.js:2:13:2:36 | documen ... .search | domparser.js:2:7:2:36 | src | provenance |  |
-| jquery.js:2:7:2:36 | src | jquery.js:4:14:4:16 | src | provenance |  |
-| jquery.js:2:13:2:36 | documen ... .search | jquery.js:2:7:2:36 | src | provenance |  |
+| closure.js:2:7:2:9 | src | closure.js:3:24:3:26 | src | provenance |  |
+| closure.js:2:13:2:36 | documen ... .search | closure.js:2:7:2:9 | src | provenance |  |
+| domparser.js:2:7:2:9 | src | domparser.js:5:37:5:39 | src | provenance |  |
+| domparser.js:2:7:2:9 | src | domparser.js:9:55:9:57 | src | provenance |  |
+| domparser.js:2:7:2:9 | src | domparser.js:11:57:11:59 | src | provenance |  |
+| domparser.js:2:13:2:36 | documen ... .search | domparser.js:2:7:2:9 | src | provenance |  |
+| jquery.js:2:7:2:9 | src | jquery.js:4:14:4:16 | src | provenance |  |
+| jquery.js:2:13:2:36 | documen ... .search | jquery.js:2:7:2:9 | src | provenance |  |
 nodes
-| closure.js:2:7:2:36 | src | semmle.label | src |
+| closure.js:2:7:2:9 | src | semmle.label | src |
 | closure.js:2:13:2:36 | documen ... .search | semmle.label | documen ... .search |
 | closure.js:3:24:3:26 | src | semmle.label | src |
-| domparser.js:2:7:2:36 | src | semmle.label | src |
+| domparser.js:2:7:2:9 | src | semmle.label | src |
 | domparser.js:2:13:2:36 | documen ... .search | semmle.label | documen ... .search |
 | domparser.js:5:37:5:39 | src | semmle.label | src |
 | domparser.js:9:55:9:57 | src | semmle.label | src |
 | domparser.js:11:57:11:59 | src | semmle.label | src |
 | expat.js:6:16:6:36 | req.par ... e-xml") | semmle.label | req.par ... e-xml") |
-| jquery.js:2:7:2:36 | src | semmle.label | src |
+| jquery.js:2:7:2:9 | src | semmle.label | src |
 | jquery.js:2:13:2:36 | documen ... .search | semmle.label | documen ... .search |
 | jquery.js:4:14:4:16 | src | semmle.label | src |
-| libxml.js:5:21:5:41 | req.par ... e-xml") | semmle.label | req.par ... e-xml") |
-| libxml.noent.js:5:21:5:41 | req.par ... e-xml") | semmle.label | req.par ... e-xml") |
-| libxml.sax.js:6:22:6:42 | req.par ... e-xml") | semmle.label | req.par ... e-xml") |
-| libxml.saxpush.js:6:15:6:35 | req.par ... e-xml") | semmle.label | req.par ... e-xml") |
 subpaths
diff --git a/javascript/ql/test/query-tests/Security/CWE-776/libxml.js b/javascript/ql/test/query-tests/Security/CWE-776/libxml.js
index 6af2da17ef5..3f16e457dc3 100644
--- a/javascript/ql/test/query-tests/Security/CWE-776/libxml.js
+++ b/javascript/ql/test/query-tests/Security/CWE-776/libxml.js
@@ -2,5 +2,5 @@ const express = require('express');
 const libxmljs = require('libxmljs');
 
 express().get('/some/path', function(req) {
-  libxmljs.parseXml(req.param("some-xml")); // $ Alert - libxml expands internal general entities by default
+  libxmljs.parseXml(req.param("some-xml"));
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-776/libxml.noent.js b/javascript/ql/test/query-tests/Security/CWE-776/libxml.noent.js
index da133cc782e..de633c04688 100644
--- a/javascript/ql/test/query-tests/Security/CWE-776/libxml.noent.js
+++ b/javascript/ql/test/query-tests/Security/CWE-776/libxml.noent.js
@@ -2,5 +2,5 @@ const express = require('express');
 const libxmljs = require('libxmljs');
 
 express().get('/some/path', function(req) {
-  libxmljs.parseXml(req.param("some-xml"), { noent: true }); // $ Alert - unguarded entity expansion
+  libxmljs.parseXml(req.param("some-xml"), { noent: true });
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-776/libxml.sax.js b/javascript/ql/test/query-tests/Security/CWE-776/libxml.sax.js
index 6049a8297a9..dc7ec2ddec0 100644
--- a/javascript/ql/test/query-tests/Security/CWE-776/libxml.sax.js
+++ b/javascript/ql/test/query-tests/Security/CWE-776/libxml.sax.js
@@ -3,5 +3,5 @@ const libxmljs = require('libxmljs');
 
 express().get('/some/path', function(req) {
   const parser = new libxmljs.SaxParser();
-  parser.parseString(req.param("some-xml")); // $ Alert - the SAX parser expands external entities by default
+  parser.parseString(req.param("some-xml"));
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-776/libxml.saxpush.js b/javascript/ql/test/query-tests/Security/CWE-776/libxml.saxpush.js
index 2fc4afc8ce4..15e63bf5d53 100644
--- a/javascript/ql/test/query-tests/Security/CWE-776/libxml.saxpush.js
+++ b/javascript/ql/test/query-tests/Security/CWE-776/libxml.saxpush.js
@@ -3,5 +3,5 @@ const libxmljs = require('libxmljs');
 
 express().get('/some/path', function(req) {
   const parser = new libxmljs.SaxPushParser();
-  parser.push(req.param("some-xml")); // $ Alert - the SAX parser expands external entities by default
+  parser.push(req.param("some-xml"));
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-798/HardcodedCredentials.expected b/javascript/ql/test/query-tests/Security/CWE-798/HardcodedCredentials.expected
index 22311127d54..965e4e51e45 100644
--- a/javascript/ql/test/query-tests/Security/CWE-798/HardcodedCredentials.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-798/HardcodedCredentials.expected
@@ -172,15 +172,15 @@
 | __tests__/HardcodedCredentialsDemo.js:8:19:8:28 | 'hgfedcba' | __tests__/HardcodedCredentialsDemo.js:8:19:8:28 | 'hgfedcba' | __tests__/HardcodedCredentialsDemo.js:8:19:8:28 | 'hgfedcba' | The hard-coded value "hgfedcba" is used as $@. | __tests__/HardcodedCredentialsDemo.js:8:19:8:28 | 'hgfedcba' | password |
 edges
 | HardcodedCredentials.js:18:16:18:30 | "user:hgfedcba" | HardcodedCredentials.js:20:36:20:51 | getCredentials() | provenance |  |
-| HardcodedCredentials.js:171:11:171:25 | USER | HardcodedCredentials.js:173:35:173:38 | USER | provenance |  |
-| HardcodedCredentials.js:171:18:171:25 | 'sdsdag' | HardcodedCredentials.js:171:11:171:25 | USER | provenance |  |
-| HardcodedCredentials.js:172:11:172:25 | PASS | HardcodedCredentials.js:173:43:173:46 | PASS | provenance |  |
-| HardcodedCredentials.js:172:18:172:25 | 'sdsdag' | HardcodedCredentials.js:172:11:172:25 | PASS | provenance |  |
-| HardcodedCredentials.js:173:11:173:49 | AUTH | HardcodedCredentials.js:178:39:178:42 | AUTH | provenance |  |
-| HardcodedCredentials.js:173:11:173:49 | AUTH | HardcodedCredentials.js:188:39:188:42 | AUTH | provenance |  |
-| HardcodedCredentials.js:173:11:173:49 | AUTH | HardcodedCredentials.js:195:46:195:49 | AUTH | provenance |  |
-| HardcodedCredentials.js:173:11:173:49 | AUTH | HardcodedCredentials.js:204:44:204:47 | AUTH | provenance |  |
-| HardcodedCredentials.js:173:18:173:49 | base64. ... PASS}`) | HardcodedCredentials.js:173:11:173:49 | AUTH | provenance |  |
+| HardcodedCredentials.js:171:11:171:14 | USER | HardcodedCredentials.js:173:35:173:38 | USER | provenance |  |
+| HardcodedCredentials.js:171:18:171:25 | 'sdsdag' | HardcodedCredentials.js:171:11:171:14 | USER | provenance |  |
+| HardcodedCredentials.js:172:11:172:14 | PASS | HardcodedCredentials.js:173:43:173:46 | PASS | provenance |  |
+| HardcodedCredentials.js:172:18:172:25 | 'sdsdag' | HardcodedCredentials.js:172:11:172:14 | PASS | provenance |  |
+| HardcodedCredentials.js:173:11:173:14 | AUTH | HardcodedCredentials.js:178:39:178:42 | AUTH | provenance |  |
+| HardcodedCredentials.js:173:11:173:14 | AUTH | HardcodedCredentials.js:188:39:188:42 | AUTH | provenance |  |
+| HardcodedCredentials.js:173:11:173:14 | AUTH | HardcodedCredentials.js:195:46:195:49 | AUTH | provenance |  |
+| HardcodedCredentials.js:173:11:173:14 | AUTH | HardcodedCredentials.js:204:44:204:47 | AUTH | provenance |  |
+| HardcodedCredentials.js:173:18:173:49 | base64. ... PASS}`) | HardcodedCredentials.js:173:11:173:14 | AUTH | provenance |  |
 | HardcodedCredentials.js:173:32:173:48 | `${USER}:${PASS}` | HardcodedCredentials.js:173:18:173:49 | base64. ... PASS}`) | provenance | Config |
 | HardcodedCredentials.js:173:35:173:38 | USER | HardcodedCredentials.js:173:32:173:48 | `${USER}:${PASS}` | provenance | Config |
 | HardcodedCredentials.js:173:43:173:46 | PASS | HardcodedCredentials.js:173:32:173:48 | `${USER}:${PASS}` | provenance | Config |
@@ -188,54 +188,54 @@ edges
 | HardcodedCredentials.js:188:39:188:42 | AUTH | HardcodedCredentials.js:188:30:188:44 | `Basic ${AUTH}` | provenance | Config |
 | HardcodedCredentials.js:195:46:195:49 | AUTH | HardcodedCredentials.js:195:37:195:51 | `Basic ${AUTH}` | provenance | Config |
 | HardcodedCredentials.js:204:44:204:47 | AUTH | HardcodedCredentials.js:204:35:204:49 | `Basic ${AUTH}` | provenance | Config |
-| HardcodedCredentials.js:214:11:214:25 | USER | HardcodedCredentials.js:216:35:216:38 | USER | provenance |  |
-| HardcodedCredentials.js:214:18:214:25 | 'sdsdag' | HardcodedCredentials.js:214:11:214:25 | USER | provenance |  |
-| HardcodedCredentials.js:215:11:215:25 | PASS | HardcodedCredentials.js:216:43:216:46 | PASS | provenance |  |
-| HardcodedCredentials.js:215:18:215:25 | 'sdsdag' | HardcodedCredentials.js:215:11:215:25 | PASS | provenance |  |
-| HardcodedCredentials.js:216:11:216:49 | AUTH | HardcodedCredentials.js:221:46:221:49 | AUTH | provenance |  |
-| HardcodedCredentials.js:216:18:216:49 | base64. ... PASS}`) | HardcodedCredentials.js:216:11:216:49 | AUTH | provenance |  |
+| HardcodedCredentials.js:214:11:214:14 | USER | HardcodedCredentials.js:216:35:216:38 | USER | provenance |  |
+| HardcodedCredentials.js:214:18:214:25 | 'sdsdag' | HardcodedCredentials.js:214:11:214:14 | USER | provenance |  |
+| HardcodedCredentials.js:215:11:215:14 | PASS | HardcodedCredentials.js:216:43:216:46 | PASS | provenance |  |
+| HardcodedCredentials.js:215:18:215:25 | 'sdsdag' | HardcodedCredentials.js:215:11:215:14 | PASS | provenance |  |
+| HardcodedCredentials.js:216:11:216:14 | AUTH | HardcodedCredentials.js:221:46:221:49 | AUTH | provenance |  |
+| HardcodedCredentials.js:216:18:216:49 | base64. ... PASS}`) | HardcodedCredentials.js:216:11:216:14 | AUTH | provenance |  |
 | HardcodedCredentials.js:216:32:216:48 | `${USER}:${PASS}` | HardcodedCredentials.js:216:18:216:49 | base64. ... PASS}`) | provenance | Config |
 | HardcodedCredentials.js:216:35:216:38 | USER | HardcodedCredentials.js:216:32:216:48 | `${USER}:${PASS}` | provenance | Config |
 | HardcodedCredentials.js:216:43:216:46 | PASS | HardcodedCredentials.js:216:32:216:48 | `${USER}:${PASS}` | provenance | Config |
 | HardcodedCredentials.js:221:46:221:49 | AUTH | HardcodedCredentials.js:221:37:221:51 | `Basic ${AUTH}` | provenance | Config |
-| HardcodedCredentials.js:231:11:231:29 | username | HardcodedCredentials.js:237:47:237:54 | username | provenance |  |
-| HardcodedCredentials.js:231:22:231:29 | 'sdsdag' | HardcodedCredentials.js:231:11:231:29 | username | provenance |  |
+| HardcodedCredentials.js:231:11:231:18 | username | HardcodedCredentials.js:237:47:237:54 | username | provenance |  |
+| HardcodedCredentials.js:231:22:231:29 | 'sdsdag' | HardcodedCredentials.js:231:11:231:18 | username | provenance |  |
 | HardcodedCredentials.js:237:35:237:72 | Buffer. ... ssword) | HardcodedCredentials.js:237:35:237:91 | Buffer. ... ase64') | provenance | Config |
 | HardcodedCredentials.js:237:35:237:91 | Buffer. ... ase64') | HardcodedCredentials.js:237:24:237:91 | 'Basic  ... ase64') | provenance | Config |
 | HardcodedCredentials.js:237:47:237:54 | username | HardcodedCredentials.js:237:47:237:71 | usernam ... assword | provenance | Config |
 | HardcodedCredentials.js:237:47:237:71 | usernam ... assword | HardcodedCredentials.js:237:35:237:72 | Buffer. ... ssword) | provenance | Config |
 | HardcodedCredentials.js:237:47:237:71 | usernam ... assword | HardcodedCredentials.js:237:35:237:91 | Buffer. ... ase64') | provenance | Config |
-| HardcodedCredentials.js:245:9:245:44 | privateKey | HardcodedCredentials.js:246:42:246:51 | privateKey | provenance |  |
-| HardcodedCredentials.js:245:22:245:44 | "myHard ... ateKey" | HardcodedCredentials.js:245:9:245:44 | privateKey | provenance |  |
-| HardcodedCredentials.js:248:9:248:42 | publicKey | HardcodedCredentials.js:249:23:249:31 | publicKey | provenance |  |
-| HardcodedCredentials.js:248:21:248:42 | "myHard ... licKey" | HardcodedCredentials.js:248:9:248:42 | publicKey | provenance |  |
+| HardcodedCredentials.js:245:9:245:18 | privateKey | HardcodedCredentials.js:246:42:246:51 | privateKey | provenance |  |
+| HardcodedCredentials.js:245:22:245:44 | "myHard ... ateKey" | HardcodedCredentials.js:245:9:245:18 | privateKey | provenance |  |
+| HardcodedCredentials.js:248:9:248:17 | publicKey | HardcodedCredentials.js:249:23:249:31 | publicKey | provenance |  |
+| HardcodedCredentials.js:248:21:248:42 | "myHard ... licKey" | HardcodedCredentials.js:248:9:248:17 | publicKey | provenance |  |
 | HardcodedCredentials.js:268:33:268:56 | foo ? ' ... 'OAuth' | HardcodedCredentials.js:268:30:268:73 | `${foo  ... Token}` | provenance | Config |
 | HardcodedCredentials.js:268:39:268:46 | 'Bearer' | HardcodedCredentials.js:268:33:268:56 | foo ? ' ... 'OAuth' | provenance |  |
 | HardcodedCredentials.js:268:50:268:56 | 'OAuth' | HardcodedCredentials.js:268:33:268:56 | foo ? ' ... 'OAuth' | provenance |  |
-| HardcodedCredentials.js:308:9:308:44 | privateKey | HardcodedCredentials.js:309:34:309:43 | privateKey | provenance |  |
-| HardcodedCredentials.js:308:22:308:44 | "myHard ... ateKey" | HardcodedCredentials.js:308:9:308:44 | privateKey | provenance |  |
-| HardcodedCredentials.js:316:9:316:44 | privateKey | HardcodedCredentials.js:317:52:317:61 | privateKey | provenance |  |
-| HardcodedCredentials.js:316:22:316:44 | "myHard ... ateKey" | HardcodedCredentials.js:316:9:316:44 | privateKey | provenance |  |
+| HardcodedCredentials.js:308:9:308:18 | privateKey | HardcodedCredentials.js:309:34:309:43 | privateKey | provenance |  |
+| HardcodedCredentials.js:308:22:308:44 | "myHard ... ateKey" | HardcodedCredentials.js:308:9:308:18 | privateKey | provenance |  |
+| HardcodedCredentials.js:316:9:316:18 | privateKey | HardcodedCredentials.js:317:52:317:61 | privateKey | provenance |  |
+| HardcodedCredentials.js:316:22:316:44 | "myHard ... ateKey" | HardcodedCredentials.js:316:9:316:18 | privateKey | provenance |  |
 | HardcodedCredentials.js:317:52:317:61 | privateKey | HardcodedCredentials.js:317:27:317:62 | new Tex ... ateKey) | provenance | Config |
-| HardcodedCredentials.js:319:11:321:29 | spki | HardcodedCredentials.js:322:43:322:46 | spki | provenance |  |
-| HardcodedCredentials.js:319:18:321:29 | `-----B ... Y-----` | HardcodedCredentials.js:319:11:321:29 | spki | provenance |  |
-| HardcodedCredentials.js:322:9:322:56 | publicKey | HardcodedCredentials.js:323:27:323:35 | publicKey | provenance |  |
-| HardcodedCredentials.js:322:21:322:56 | await j ... RS256') | HardcodedCredentials.js:322:9:322:56 | publicKey | provenance |  |
+| HardcodedCredentials.js:319:11:319:14 | spki | HardcodedCredentials.js:322:43:322:46 | spki | provenance |  |
+| HardcodedCredentials.js:319:18:321:29 | `-----B ... Y-----` | HardcodedCredentials.js:319:11:319:14 | spki | provenance |  |
+| HardcodedCredentials.js:322:9:322:17 | publicKey | HardcodedCredentials.js:323:27:323:35 | publicKey | provenance |  |
+| HardcodedCredentials.js:322:21:322:56 | await j ... RS256') | HardcodedCredentials.js:322:9:322:17 | publicKey | provenance |  |
 | HardcodedCredentials.js:322:43:322:46 | spki | HardcodedCredentials.js:322:21:322:56 | await j ... RS256') | provenance | Config |
 | HardcodedCredentials.js:328:12:328:55 | 'whYOFK ... -6f...' | HardcodedCredentials.js:331:17:331:46 | await j ... k, alg) | provenance | Config |
-| HardcodedCredentials.js:331:5:331:46 | publicKey | HardcodedCredentials.js:335:31:335:39 | publicKey | provenance |  |
-| HardcodedCredentials.js:331:17:331:46 | await j ... k, alg) | HardcodedCredentials.js:331:5:331:46 | publicKey | provenance |  |
-| HardcodedCredentials.js:344:9:344:43 | secretKey | HardcodedCredentials.js:349:21:349:29 | secretKey | provenance |  |
-| HardcodedCredentials.js:344:9:344:43 | secretKey | HardcodedCredentials.js:360:33:360:41 | secretKey | provenance |  |
-| HardcodedCredentials.js:344:21:344:43 | "myHard ... ateKey" | HardcodedCredentials.js:344:9:344:43 | secretKey | provenance |  |
+| HardcodedCredentials.js:331:5:331:13 | publicKey | HardcodedCredentials.js:335:31:335:39 | publicKey | provenance |  |
+| HardcodedCredentials.js:331:17:331:46 | await j ... k, alg) | HardcodedCredentials.js:331:5:331:13 | publicKey | provenance |  |
+| HardcodedCredentials.js:344:9:344:17 | secretKey | HardcodedCredentials.js:349:21:349:29 | secretKey | provenance |  |
+| HardcodedCredentials.js:344:9:344:17 | secretKey | HardcodedCredentials.js:360:33:360:41 | secretKey | provenance |  |
+| HardcodedCredentials.js:344:21:344:43 | "myHard ... ateKey" | HardcodedCredentials.js:344:9:344:17 | secretKey | provenance |  |
 | HardcodedCredentials.js:360:33:360:41 | secretKey | HardcodedCredentials.js:360:21:360:52 | Buffer. ... ase64") | provenance | Config |
-| HardcodedCredentials.js:375:9:375:43 | secretKey | HardcodedCredentials.js:378:24:378:32 | secretKey | provenance |  |
-| HardcodedCredentials.js:375:9:375:43 | secretKey | HardcodedCredentials.js:385:31:385:39 | secretKey | provenance |  |
-| HardcodedCredentials.js:375:21:375:43 | "myHard ... ateKey" | HardcodedCredentials.js:375:9:375:43 | secretKey | provenance |  |
-| HardcodedCredentials.js:396:9:396:43 | secretKey | HardcodedCredentials.js:399:17:399:25 | secretKey | provenance |  |
-| HardcodedCredentials.js:396:21:396:43 | "myHard ... ateKey" | HardcodedCredentials.js:396:9:396:43 | secretKey | provenance |  |
-| HardcodedCredentials.js:414:9:414:43 | secretKey | HardcodedCredentials.js:416:27:416:35 | secretKey | provenance |  |
-| HardcodedCredentials.js:414:21:414:43 | "myHard ... ateKey" | HardcodedCredentials.js:414:9:414:43 | secretKey | provenance |  |
+| HardcodedCredentials.js:375:9:375:17 | secretKey | HardcodedCredentials.js:378:24:378:32 | secretKey | provenance |  |
+| HardcodedCredentials.js:375:9:375:17 | secretKey | HardcodedCredentials.js:385:31:385:39 | secretKey | provenance |  |
+| HardcodedCredentials.js:375:21:375:43 | "myHard ... ateKey" | HardcodedCredentials.js:375:9:375:17 | secretKey | provenance |  |
+| HardcodedCredentials.js:396:9:396:17 | secretKey | HardcodedCredentials.js:399:17:399:25 | secretKey | provenance |  |
+| HardcodedCredentials.js:396:21:396:43 | "myHard ... ateKey" | HardcodedCredentials.js:396:9:396:17 | secretKey | provenance |  |
+| HardcodedCredentials.js:414:9:414:17 | secretKey | HardcodedCredentials.js:416:27:416:35 | secretKey | provenance |  |
+| HardcodedCredentials.js:414:21:414:43 | "myHard ... ateKey" | HardcodedCredentials.js:414:9:414:17 | secretKey | provenance |  |
 nodes
 | HardcodedCredentials.js:5:15:5:22 | 'dbuser' | semmle.label | 'dbuser' |
 | HardcodedCredentials.js:8:19:8:28 | 'hgfedcba' | semmle.label | 'hgfedcba' |
@@ -292,11 +292,11 @@ nodes
 | HardcodedCredentials.js:160:38:160:56 | "oiuneawrgiyubaegr" | semmle.label | "oiuneawrgiyubaegr" |
 | HardcodedCredentials.js:161:41:161:59 | 'oiuneawrgiyubaegr' | semmle.label | 'oiuneawrgiyubaegr' |
 | HardcodedCredentials.js:164:35:164:45 | 'change_me' | semmle.label | 'change_me' |
-| HardcodedCredentials.js:171:11:171:25 | USER | semmle.label | USER |
+| HardcodedCredentials.js:171:11:171:14 | USER | semmle.label | USER |
 | HardcodedCredentials.js:171:18:171:25 | 'sdsdag' | semmle.label | 'sdsdag' |
-| HardcodedCredentials.js:172:11:172:25 | PASS | semmle.label | PASS |
+| HardcodedCredentials.js:172:11:172:14 | PASS | semmle.label | PASS |
 | HardcodedCredentials.js:172:18:172:25 | 'sdsdag' | semmle.label | 'sdsdag' |
-| HardcodedCredentials.js:173:11:173:49 | AUTH | semmle.label | AUTH |
+| HardcodedCredentials.js:173:11:173:14 | AUTH | semmle.label | AUTH |
 | HardcodedCredentials.js:173:18:173:49 | base64. ... PASS}`) | semmle.label | base64. ... PASS}`) |
 | HardcodedCredentials.js:173:32:173:48 | `${USER}:${PASS}` | semmle.label | `${USER}:${PASS}` |
 | HardcodedCredentials.js:173:35:173:38 | USER | semmle.label | USER |
@@ -309,28 +309,28 @@ nodes
 | HardcodedCredentials.js:195:46:195:49 | AUTH | semmle.label | AUTH |
 | HardcodedCredentials.js:204:35:204:49 | `Basic ${AUTH}` | semmle.label | `Basic ${AUTH}` |
 | HardcodedCredentials.js:204:44:204:47 | AUTH | semmle.label | AUTH |
-| HardcodedCredentials.js:214:11:214:25 | USER | semmle.label | USER |
+| HardcodedCredentials.js:214:11:214:14 | USER | semmle.label | USER |
 | HardcodedCredentials.js:214:18:214:25 | 'sdsdag' | semmle.label | 'sdsdag' |
-| HardcodedCredentials.js:215:11:215:25 | PASS | semmle.label | PASS |
+| HardcodedCredentials.js:215:11:215:14 | PASS | semmle.label | PASS |
 | HardcodedCredentials.js:215:18:215:25 | 'sdsdag' | semmle.label | 'sdsdag' |
-| HardcodedCredentials.js:216:11:216:49 | AUTH | semmle.label | AUTH |
+| HardcodedCredentials.js:216:11:216:14 | AUTH | semmle.label | AUTH |
 | HardcodedCredentials.js:216:18:216:49 | base64. ... PASS}`) | semmle.label | base64. ... PASS}`) |
 | HardcodedCredentials.js:216:32:216:48 | `${USER}:${PASS}` | semmle.label | `${USER}:${PASS}` |
 | HardcodedCredentials.js:216:35:216:38 | USER | semmle.label | USER |
 | HardcodedCredentials.js:216:43:216:46 | PASS | semmle.label | PASS |
 | HardcodedCredentials.js:221:37:221:51 | `Basic ${AUTH}` | semmle.label | `Basic ${AUTH}` |
 | HardcodedCredentials.js:221:46:221:49 | AUTH | semmle.label | AUTH |
-| HardcodedCredentials.js:231:11:231:29 | username | semmle.label | username |
+| HardcodedCredentials.js:231:11:231:18 | username | semmle.label | username |
 | HardcodedCredentials.js:231:22:231:29 | 'sdsdag' | semmle.label | 'sdsdag' |
 | HardcodedCredentials.js:237:24:237:91 | 'Basic  ... ase64') | semmle.label | 'Basic  ... ase64') |
 | HardcodedCredentials.js:237:35:237:72 | Buffer. ... ssword) | semmle.label | Buffer. ... ssword) |
 | HardcodedCredentials.js:237:35:237:91 | Buffer. ... ase64') | semmle.label | Buffer. ... ase64') |
 | HardcodedCredentials.js:237:47:237:54 | username | semmle.label | username |
 | HardcodedCredentials.js:237:47:237:71 | usernam ... assword | semmle.label | usernam ... assword |
-| HardcodedCredentials.js:245:9:245:44 | privateKey | semmle.label | privateKey |
+| HardcodedCredentials.js:245:9:245:18 | privateKey | semmle.label | privateKey |
 | HardcodedCredentials.js:245:22:245:44 | "myHard ... ateKey" | semmle.label | "myHard ... ateKey" |
 | HardcodedCredentials.js:246:42:246:51 | privateKey | semmle.label | privateKey |
-| HardcodedCredentials.js:248:9:248:42 | publicKey | semmle.label | publicKey |
+| HardcodedCredentials.js:248:9:248:17 | publicKey | semmle.label | publicKey |
 | HardcodedCredentials.js:248:21:248:42 | "myHard ... licKey" | semmle.label | "myHard ... licKey" |
 | HardcodedCredentials.js:249:23:249:31 | publicKey | semmle.label | publicKey |
 | HardcodedCredentials.js:260:30:260:40 | `Basic foo` | semmle.label | `Basic foo` |
@@ -358,36 +358,36 @@ nodes
 | HardcodedCredentials.js:300:44:300:56 | 'SampleToken' | semmle.label | 'SampleToken' |
 | HardcodedCredentials.js:301:44:301:55 | 'MyPassword' | semmle.label | 'MyPassword' |
 | HardcodedCredentials.js:302:44:302:69 | 'iubfew ... ybgera' | semmle.label | 'iubfew ... ybgera' |
-| HardcodedCredentials.js:308:9:308:44 | privateKey | semmle.label | privateKey |
+| HardcodedCredentials.js:308:9:308:18 | privateKey | semmle.label | privateKey |
 | HardcodedCredentials.js:308:22:308:44 | "myHard ... ateKey" | semmle.label | "myHard ... ateKey" |
 | HardcodedCredentials.js:309:34:309:43 | privateKey | semmle.label | privateKey |
-| HardcodedCredentials.js:316:9:316:44 | privateKey | semmle.label | privateKey |
+| HardcodedCredentials.js:316:9:316:18 | privateKey | semmle.label | privateKey |
 | HardcodedCredentials.js:316:22:316:44 | "myHard ... ateKey" | semmle.label | "myHard ... ateKey" |
 | HardcodedCredentials.js:317:27:317:62 | new Tex ... ateKey) | semmle.label | new Tex ... ateKey) |
 | HardcodedCredentials.js:317:52:317:61 | privateKey | semmle.label | privateKey |
-| HardcodedCredentials.js:319:11:321:29 | spki | semmle.label | spki |
+| HardcodedCredentials.js:319:11:319:14 | spki | semmle.label | spki |
 | HardcodedCredentials.js:319:18:321:29 | `-----B ... Y-----` | semmle.label | `-----B ... Y-----` |
-| HardcodedCredentials.js:322:9:322:56 | publicKey | semmle.label | publicKey |
+| HardcodedCredentials.js:322:9:322:17 | publicKey | semmle.label | publicKey |
 | HardcodedCredentials.js:322:21:322:56 | await j ... RS256') | semmle.label | await j ... RS256') |
 | HardcodedCredentials.js:322:43:322:46 | spki | semmle.label | spki |
 | HardcodedCredentials.js:323:27:323:35 | publicKey | semmle.label | publicKey |
 | HardcodedCredentials.js:328:12:328:55 | 'whYOFK ... -6f...' | semmle.label | 'whYOFK ... -6f...' |
-| HardcodedCredentials.js:331:5:331:46 | publicKey | semmle.label | publicKey |
+| HardcodedCredentials.js:331:5:331:13 | publicKey | semmle.label | publicKey |
 | HardcodedCredentials.js:331:17:331:46 | await j ... k, alg) | semmle.label | await j ... k, alg) |
 | HardcodedCredentials.js:335:31:335:39 | publicKey | semmle.label | publicKey |
-| HardcodedCredentials.js:344:9:344:43 | secretKey | semmle.label | secretKey |
+| HardcodedCredentials.js:344:9:344:17 | secretKey | semmle.label | secretKey |
 | HardcodedCredentials.js:344:21:344:43 | "myHard ... ateKey" | semmle.label | "myHard ... ateKey" |
 | HardcodedCredentials.js:349:21:349:29 | secretKey | semmle.label | secretKey |
 | HardcodedCredentials.js:360:21:360:52 | Buffer. ... ase64") | semmle.label | Buffer. ... ase64") |
 | HardcodedCredentials.js:360:33:360:41 | secretKey | semmle.label | secretKey |
-| HardcodedCredentials.js:375:9:375:43 | secretKey | semmle.label | secretKey |
+| HardcodedCredentials.js:375:9:375:17 | secretKey | semmle.label | secretKey |
 | HardcodedCredentials.js:375:21:375:43 | "myHard ... ateKey" | semmle.label | "myHard ... ateKey" |
 | HardcodedCredentials.js:378:24:378:32 | secretKey | semmle.label | secretKey |
 | HardcodedCredentials.js:385:31:385:39 | secretKey | semmle.label | secretKey |
-| HardcodedCredentials.js:396:9:396:43 | secretKey | semmle.label | secretKey |
+| HardcodedCredentials.js:396:9:396:17 | secretKey | semmle.label | secretKey |
 | HardcodedCredentials.js:396:21:396:43 | "myHard ... ateKey" | semmle.label | "myHard ... ateKey" |
 | HardcodedCredentials.js:399:17:399:25 | secretKey | semmle.label | secretKey |
-| HardcodedCredentials.js:414:9:414:43 | secretKey | semmle.label | secretKey |
+| HardcodedCredentials.js:414:9:414:17 | secretKey | semmle.label | secretKey |
 | HardcodedCredentials.js:414:21:414:43 | "myHard ... ateKey" | semmle.label | "myHard ... ateKey" |
 | HardcodedCredentials.js:416:27:416:35 | secretKey | semmle.label | secretKey |
 | HardcodedCredentials.js:423:43:423:53 | "AccessID1" | semmle.label | "AccessID1" |
diff --git a/javascript/ql/test/query-tests/Security/CWE-807/ConditionalBypass.expected b/javascript/ql/test/query-tests/Security/CWE-807/ConditionalBypass.expected
index 8743571bbbc..ea9f656fb51 100644
--- a/javascript/ql/test/query-tests/Security/CWE-807/ConditionalBypass.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-807/ConditionalBypass.expected
@@ -13,8 +13,8 @@ edges
 | example_bypass.js:6:9:6:19 | req.cookies | example_bypass.js:6:9:6:34 | req.coo ... nUserId | provenance |  |
 | tst.js:13:9:13:19 | req.cookies | tst.js:13:9:13:30 | req.coo ... inThing | provenance |  |
 | tst.js:24:17:24:17 | v | tst.js:25:16:25:16 | v | provenance |  |
-| tst.js:27:9:27:37 | v3 | tst.js:28:9:28:10 | v3 | provenance |  |
-| tst.js:27:14:27:37 | id(req. ... okieId) | tst.js:27:9:27:37 | v3 | provenance |  |
+| tst.js:27:9:27:10 | v3 | tst.js:28:9:28:10 | v3 | provenance |  |
+| tst.js:27:14:27:37 | id(req. ... okieId) | tst.js:27:9:27:10 | v3 | provenance |  |
 | tst.js:27:17:27:27 | req.cookies | tst.js:27:17:27:36 | req.cookies.cookieId | provenance |  |
 | tst.js:27:17:27:36 | req.cookies.cookieId | tst.js:24:17:24:17 | v | provenance |  |
 | tst.js:27:17:27:36 | req.cookies.cookieId | tst.js:27:14:27:37 | id(req. ... okieId) | provenance |  |
@@ -35,7 +35,7 @@ nodes
 | tst.js:13:9:13:30 | req.coo ... inThing | semmle.label | req.coo ... inThing |
 | tst.js:24:17:24:17 | v | semmle.label | v |
 | tst.js:25:16:25:16 | v | semmle.label | v |
-| tst.js:27:9:27:37 | v3 | semmle.label | v3 |
+| tst.js:27:9:27:10 | v3 | semmle.label | v3 |
 | tst.js:27:14:27:37 | id(req. ... okieId) | semmle.label | id(req. ... okieId) |
 | tst.js:27:17:27:27 | req.cookies | semmle.label | req.cookies |
 | tst.js:27:17:27:36 | req.cookies.cookieId | semmle.label | req.cookies.cookieId |
diff --git a/javascript/ql/test/query-tests/Security/CWE-829/InsecureDownload.expected b/javascript/ql/test/query-tests/Security/CWE-829/InsecureDownload.expected
index e430335b97b..5c9f10f5621 100644
--- a/javascript/ql/test/query-tests/Security/CWE-829/InsecureDownload.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-829/InsecureDownload.expected
@@ -6,12 +6,12 @@
 | insecure-download.js:48:12:48:38 | "http:/ ... unsafe" | insecure-download.js:48:12:48:38 | "http:/ ... unsafe" | insecure-download.js:48:12:48:38 | "http:/ ... unsafe" | $@ of sensitive file from $@. | insecure-download.js:48:5:48:71 | nugget( ... => { }) | Download | insecure-download.js:48:12:48:38 | "http:/ ... unsafe" | HTTP source |
 | insecure-download.js:52:11:52:45 | "http:/ ... nknown" | insecure-download.js:52:11:52:45 | "http:/ ... nknown" | insecure-download.js:52:11:52:45 | "http:/ ... nknown" | $@ of sensitive file from $@. | insecure-download.js:52:5:54:6 | $.get(" ... \\n    }) | Download | insecure-download.js:52:11:52:45 | "http:/ ... nknown" | HTTP source |
 edges
-| insecure-download.js:36:9:36:45 | url | insecure-download.js:37:23:37:25 | url | provenance |  |
-| insecure-download.js:36:9:36:45 | url | insecure-download.js:39:26:39:28 | url | provenance |  |
-| insecure-download.js:36:15:36:45 | "http:/ ... fe.APK" | insecure-download.js:36:9:36:45 | url | provenance |  |
+| insecure-download.js:36:9:36:11 | url | insecure-download.js:37:23:37:25 | url | provenance |  |
+| insecure-download.js:36:9:36:11 | url | insecure-download.js:39:26:39:28 | url | provenance |  |
+| insecure-download.js:36:15:36:45 | "http:/ ... fe.APK" | insecure-download.js:36:9:36:11 | url | provenance |  |
 nodes
 | insecure-download.js:30:12:30:42 | "http:/ ... fe.APK" | semmle.label | "http:/ ... fe.APK" |
-| insecure-download.js:36:9:36:45 | url | semmle.label | url |
+| insecure-download.js:36:9:36:11 | url | semmle.label | url |
 | insecure-download.js:36:15:36:45 | "http:/ ... fe.APK" | semmle.label | "http:/ ... fe.APK" |
 | insecure-download.js:37:23:37:25 | url | semmle.label | url |
 | insecure-download.js:39:26:39:28 | url | semmle.label | url |
diff --git a/javascript/ql/test/query-tests/Security/CWE-843/TypeConfusionThroughParameterTampering.expected b/javascript/ql/test/query-tests/Security/CWE-843/TypeConfusionThroughParameterTampering.expected
index b07e1c194a4..39ef0ef3318 100644
--- a/javascript/ql/test/query-tests/Security/CWE-843/TypeConfusionThroughParameterTampering.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-843/TypeConfusionThroughParameterTampering.expected
@@ -14,21 +14,21 @@
 | tst.js:100:9:100:16 | data.foo | tst.js:100:9:100:16 | data.foo | tst.js:100:9:100:16 | data.foo | Potential type confusion as $@ may be either an array or a string. | tst.js:100:9:100:16 | data.foo | this HTTP request parameter |
 | tst.js:106:5:106:8 | data | tst.js:105:16:105:29 | req.query.data | tst.js:106:5:106:8 | data | Potential type confusion as $@ may be either an array or a string. | tst.js:105:16:105:29 | req.query.data | this HTTP request parameter |
 edges
-| tst.js:5:9:5:27 | foo | tst.js:6:5:6:7 | foo | provenance |  |
-| tst.js:5:9:5:27 | foo | tst.js:6:5:6:7 | foo | provenance |  |
-| tst.js:5:9:5:27 | foo | tst.js:8:5:8:7 | foo | provenance |  |
-| tst.js:5:9:5:27 | foo | tst.js:8:5:8:7 | foo | provenance |  |
-| tst.js:5:9:5:27 | foo | tst.js:17:7:17:9 | foo | provenance |  |
-| tst.js:5:9:5:27 | foo | tst.js:21:5:21:7 | foo | provenance |  |
-| tst.js:5:9:5:27 | foo | tst.js:22:5:22:7 | foo | provenance |  |
-| tst.js:5:9:5:27 | foo | tst.js:23:5:23:7 | foo | provenance |  |
-| tst.js:5:9:5:27 | foo | tst.js:25:5:25:7 | foo | provenance |  |
-| tst.js:5:9:5:27 | foo | tst.js:27:5:27:7 | foo | provenance |  |
-| tst.js:5:9:5:27 | foo | tst.js:27:5:27:7 | foo | provenance |  |
-| tst.js:5:9:5:27 | foo | tst.js:28:5:28:7 | foo | provenance |  |
-| tst.js:5:9:5:27 | foo | tst.js:28:5:28:7 | foo | provenance |  |
-| tst.js:5:9:5:27 | foo | tst.js:30:5:30:7 | foo | provenance |  |
-| tst.js:5:15:5:27 | req.query.foo | tst.js:5:9:5:27 | foo | provenance |  |
+| tst.js:5:9:5:11 | foo | tst.js:6:5:6:7 | foo | provenance |  |
+| tst.js:5:9:5:11 | foo | tst.js:6:5:6:7 | foo | provenance |  |
+| tst.js:5:9:5:11 | foo | tst.js:8:5:8:7 | foo | provenance |  |
+| tst.js:5:9:5:11 | foo | tst.js:8:5:8:7 | foo | provenance |  |
+| tst.js:5:9:5:11 | foo | tst.js:17:7:17:9 | foo | provenance |  |
+| tst.js:5:9:5:11 | foo | tst.js:21:5:21:7 | foo | provenance |  |
+| tst.js:5:9:5:11 | foo | tst.js:22:5:22:7 | foo | provenance |  |
+| tst.js:5:9:5:11 | foo | tst.js:23:5:23:7 | foo | provenance |  |
+| tst.js:5:9:5:11 | foo | tst.js:25:5:25:7 | foo | provenance |  |
+| tst.js:5:9:5:11 | foo | tst.js:27:5:27:7 | foo | provenance |  |
+| tst.js:5:9:5:11 | foo | tst.js:27:5:27:7 | foo | provenance |  |
+| tst.js:5:9:5:11 | foo | tst.js:28:5:28:7 | foo | provenance |  |
+| tst.js:5:9:5:11 | foo | tst.js:28:5:28:7 | foo | provenance |  |
+| tst.js:5:9:5:11 | foo | tst.js:30:5:30:7 | foo | provenance |  |
+| tst.js:5:15:5:27 | req.query.foo | tst.js:5:9:5:11 | foo | provenance |  |
 | tst.js:6:5:6:7 | foo | tst.js:8:5:8:7 | foo | provenance |  |
 | tst.js:6:5:6:7 | foo | tst.js:8:5:8:7 | foo | provenance |  |
 | tst.js:8:5:8:7 | foo | tst.js:10:5:12:5 | functio ... t\\n    } [foo] | provenance |  |
@@ -48,15 +48,15 @@ edges
 | tst.js:27:5:27:7 | foo | tst.js:28:5:28:7 | foo | provenance |  |
 | tst.js:28:5:28:7 | foo | tst.js:30:5:30:7 | foo | provenance |  |
 | tst.js:41:12:41:12 | f [foo] | tst.js:11:9:11:11 | foo | provenance |  |
-| tst.js:47:9:47:35 | foo | tst.js:48:5:48:7 | foo | provenance |  |
-| tst.js:47:15:47:35 | ctx.req ... ery.foo | tst.js:47:9:47:35 | foo | provenance |  |
+| tst.js:47:9:47:11 | foo | tst.js:48:5:48:7 | foo | provenance |  |
+| tst.js:47:15:47:35 | ctx.req ... ery.foo | tst.js:47:9:47:11 | foo | provenance |  |
 | tst.js:79:25:79:38 | req.query.path | tst.js:82:23:82:23 | p | provenance |  |
 | tst.js:82:23:82:23 | p | tst.js:83:9:83:9 | p | provenance |  |
 | tst.js:82:23:82:23 | p | tst.js:84:9:84:9 | p | provenance |  |
-| tst.js:105:9:105:29 | data | tst.js:106:5:106:8 | data | provenance |  |
-| tst.js:105:16:105:29 | req.query.data | tst.js:105:9:105:29 | data | provenance |  |
+| tst.js:105:9:105:12 | data | tst.js:106:5:106:8 | data | provenance |  |
+| tst.js:105:16:105:29 | req.query.data | tst.js:105:9:105:12 | data | provenance |  |
 nodes
-| tst.js:5:9:5:27 | foo | semmle.label | foo |
+| tst.js:5:9:5:11 | foo | semmle.label | foo |
 | tst.js:5:15:5:27 | req.query.foo | semmle.label | req.query.foo |
 | tst.js:6:5:6:7 | foo | semmle.label | foo |
 | tst.js:6:5:6:7 | foo | semmle.label | foo |
@@ -78,7 +78,7 @@ nodes
 | tst.js:28:5:28:7 | foo | semmle.label | foo |
 | tst.js:30:5:30:7 | foo | semmle.label | foo |
 | tst.js:41:12:41:12 | f [foo] | semmle.label | f [foo] |
-| tst.js:47:9:47:35 | foo | semmle.label | foo |
+| tst.js:47:9:47:11 | foo | semmle.label | foo |
 | tst.js:47:15:47:35 | ctx.req ... ery.foo | semmle.label | ctx.req ... ery.foo |
 | tst.js:48:5:48:7 | foo | semmle.label | foo |
 | tst.js:79:25:79:38 | req.query.path | semmle.label | req.query.path |
@@ -88,7 +88,7 @@ nodes
 | tst.js:92:5:92:12 | data.foo | semmle.label | data.foo |
 | tst.js:94:9:94:16 | data.foo | semmle.label | data.foo |
 | tst.js:100:9:100:16 | data.foo | semmle.label | data.foo |
-| tst.js:105:9:105:29 | data | semmle.label | data |
+| tst.js:105:9:105:12 | data | semmle.label | data |
 | tst.js:105:16:105:29 | req.query.data | semmle.label | req.query.data |
 | tst.js:106:5:106:8 | data | semmle.label | data |
 subpaths
diff --git a/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingAssignment/PrototypePollutingAssignment.expected b/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingAssignment/PrototypePollutingAssignment.expected
index 67aadb32c31..c2fddac0ce3 100644
--- a/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingAssignment/PrototypePollutingAssignment.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingAssignment/PrototypePollutingAssignment.expected
@@ -29,59 +29,59 @@
 edges
 | lib.js:1:38:1:40 | obj | lib.js:6:7:6:9 | obj | provenance |  |
 | lib.js:1:43:1:46 | path | lib.js:2:21:2:24 | path | provenance |  |
-| lib.js:2:7:2:27 | currentPath | lib.js:11:21:11:31 | currentPath | provenance |  |
+| lib.js:2:7:2:17 | currentPath | lib.js:11:21:11:31 | currentPath | provenance |  |
 | lib.js:2:21:2:24 | path | lib.js:2:21:2:27 | path[0] | provenance | Config |
-| lib.js:2:21:2:27 | path[0] | lib.js:2:7:2:27 | currentPath | provenance |  |
+| lib.js:2:21:2:27 | path[0] | lib.js:2:7:2:17 | currentPath | provenance |  |
 | lib.js:11:17:11:32 | obj[currentPath] | lib.js:1:38:1:40 | obj | provenance |  |
 | lib.js:11:21:11:31 | currentPath | lib.js:11:17:11:32 | obj[currentPath] | provenance | Config |
 | lib.js:14:38:14:41 | path | lib.js:15:7:15:10 | path | provenance |  |
 | lib.js:15:7:15:10 | path | lib.js:15:7:15:13 | path[0] | provenance | Config |
 | lib.js:15:7:15:13 | path[0] | lib.js:15:3:15:14 | obj[path[0]] | provenance | Config |
-| lib.js:20:7:20:25 | path | lib.js:22:7:22:10 | path | provenance |  |
+| lib.js:20:7:20:10 | path | lib.js:22:7:22:10 | path | provenance |  |
 | lib.js:20:14:20:22 | arguments | lib.js:20:14:20:25 | arguments[1] | provenance | Config |
-| lib.js:20:14:20:25 | arguments[1] | lib.js:20:7:20:25 | path | provenance |  |
+| lib.js:20:14:20:25 | arguments[1] | lib.js:20:7:20:10 | path | provenance |  |
 | lib.js:22:7:22:10 | path | lib.js:22:7:22:13 | path[0] | provenance | Config |
 | lib.js:22:7:22:13 | path[0] | lib.js:22:3:22:14 | obj[path[0]] | provenance | Config |
 | lib.js:25:44:25:47 | path | lib.js:26:14:26:17 | path | provenance |  |
 | lib.js:26:14:26:17 | path | lib.js:26:14:26:20 | path[0] | provenance | Config |
 | lib.js:26:14:26:20 | path[0] | lib.js:26:10:26:21 | obj[path[0]] | provenance | Config |
-| lib.js:30:9:30:52 | args | lib.js:32:14:32:17 | args | provenance |  |
-| lib.js:30:9:30:52 | args [ArrayElement] | lib.js:32:14:32:17 | args [ArrayElement] | provenance |  |
-| lib.js:30:16:30:52 | Array.p ... uments) | lib.js:30:9:30:52 | args | provenance |  |
-| lib.js:30:16:30:52 | Array.p ... uments) [ArrayElement] | lib.js:30:9:30:52 | args [ArrayElement] | provenance |  |
+| lib.js:30:9:30:12 | args | lib.js:32:14:32:17 | args | provenance |  |
+| lib.js:30:9:30:12 | args [ArrayElement] | lib.js:32:14:32:17 | args [ArrayElement] | provenance |  |
+| lib.js:30:16:30:52 | Array.p ... uments) | lib.js:30:9:30:12 | args | provenance |  |
+| lib.js:30:16:30:52 | Array.p ... uments) [ArrayElement] | lib.js:30:9:30:12 | args [ArrayElement] | provenance |  |
 | lib.js:30:16:30:52 | reflective call | lib.js:30:16:30:52 | Array.p ... uments) | provenance |  |
 | lib.js:30:16:30:52 | reflective call [ArrayElement] | lib.js:30:16:30:52 | Array.p ... uments) [ArrayElement] | provenance |  |
 | lib.js:30:43:30:51 | arguments | lib.js:30:16:30:52 | reflective call | provenance | Config |
 | lib.js:30:43:30:51 | arguments | lib.js:30:16:30:52 | reflective call [ArrayElement] | provenance | Config |
-| lib.js:32:7:32:20 | path | lib.js:34:7:34:10 | path | provenance |  |
+| lib.js:32:7:32:10 | path | lib.js:34:7:34:10 | path | provenance |  |
 | lib.js:32:14:32:17 | args | lib.js:32:14:32:20 | args[1] | provenance | Config |
 | lib.js:32:14:32:17 | args [ArrayElement] | lib.js:32:14:32:20 | args[1] | provenance |  |
-| lib.js:32:14:32:20 | args[1] | lib.js:32:7:32:20 | path | provenance |  |
+| lib.js:32:14:32:20 | args[1] | lib.js:32:7:32:10 | path | provenance |  |
 | lib.js:34:7:34:10 | path | lib.js:34:7:34:13 | path[0] | provenance | Config |
 | lib.js:34:7:34:13 | path[0] | lib.js:34:3:34:14 | obj[path[0]] | provenance | Config |
-| lib.js:38:9:38:36 | args | lib.js:40:14:40:17 | args | provenance |  |
-| lib.js:38:16:38:36 | Array.f ... uments) | lib.js:38:9:38:36 | args | provenance |  |
+| lib.js:38:9:38:12 | args | lib.js:40:14:40:17 | args | provenance |  |
+| lib.js:38:16:38:36 | Array.f ... uments) | lib.js:38:9:38:12 | args | provenance |  |
 | lib.js:38:27:38:35 | arguments | lib.js:38:16:38:36 | Array.f ... uments) | provenance | Config |
-| lib.js:40:7:40:20 | path | lib.js:42:7:42:10 | path | provenance |  |
+| lib.js:40:7:40:10 | path | lib.js:42:7:42:10 | path | provenance |  |
 | lib.js:40:14:40:17 | args | lib.js:40:14:40:20 | args[1] | provenance | Config |
-| lib.js:40:14:40:20 | args[1] | lib.js:40:7:40:20 | path | provenance |  |
+| lib.js:40:14:40:20 | args[1] | lib.js:40:7:40:10 | path | provenance |  |
 | lib.js:42:7:42:10 | path | lib.js:42:7:42:13 | path[0] | provenance | Config |
 | lib.js:42:7:42:13 | path[0] | lib.js:42:3:42:14 | obj[path[0]] | provenance | Config |
-| lib.js:83:7:83:25 | path | lib.js:86:19:86:22 | path | provenance |  |
+| lib.js:83:7:83:10 | path | lib.js:86:19:86:22 | path | provenance |  |
 | lib.js:83:14:83:22 | arguments | lib.js:83:14:83:25 | arguments[1] | provenance | Config |
-| lib.js:83:14:83:25 | arguments[1] | lib.js:83:7:83:25 | path | provenance |  |
-| lib.js:86:7:86:26 | proto | lib.js:87:10:87:14 | proto | provenance |  |
-| lib.js:86:15:86:26 | obj[path[0]] | lib.js:86:7:86:26 | proto | provenance |  |
+| lib.js:83:14:83:25 | arguments[1] | lib.js:83:7:83:10 | path | provenance |  |
+| lib.js:86:7:86:11 | proto | lib.js:87:10:87:14 | proto | provenance |  |
+| lib.js:86:15:86:26 | obj[path[0]] | lib.js:86:7:86:11 | proto | provenance |  |
 | lib.js:86:19:86:22 | path | lib.js:86:19:86:25 | path[0] | provenance | Config |
 | lib.js:86:19:86:25 | path[0] | lib.js:86:15:86:26 | obj[path[0]] | provenance | Config |
 | lib.js:90:43:90:46 | path | lib.js:91:24:91:27 | path | provenance |  |
-| lib.js:91:7:91:28 | maybeProto | lib.js:92:3:92:12 | maybeProto | provenance |  |
-| lib.js:91:7:91:28 | maybeProto | lib.js:95:3:95:12 | maybeProto | provenance |  |
-| lib.js:91:20:91:28 | obj[path] | lib.js:91:7:91:28 | maybeProto | provenance |  |
+| lib.js:91:7:91:16 | maybeProto | lib.js:92:3:92:12 | maybeProto | provenance |  |
+| lib.js:91:7:91:16 | maybeProto | lib.js:95:3:95:12 | maybeProto | provenance |  |
+| lib.js:91:20:91:28 | obj[path] | lib.js:91:7:91:16 | maybeProto | provenance |  |
 | lib.js:91:24:91:27 | path | lib.js:91:20:91:28 | obj[path] | provenance | Config |
-| lib.js:104:7:104:24 | one | lib.js:108:7:108:9 | one | provenance |  |
+| lib.js:104:7:104:9 | one | lib.js:108:7:108:9 | one | provenance |  |
 | lib.js:104:13:104:21 | arguments | lib.js:104:13:104:24 | arguments[1] | provenance | Config |
-| lib.js:104:13:104:24 | arguments[1] | lib.js:104:7:104:24 | one | provenance |  |
+| lib.js:104:13:104:24 | arguments[1] | lib.js:104:7:104:9 | one | provenance |  |
 | lib.js:108:7:108:9 | one | lib.js:108:3:108:10 | obj[one] | provenance | Config |
 | lib.js:118:29:118:32 | path | lib.js:119:17:119:20 | path | provenance |  |
 | lib.js:119:17:119:20 | path | lib.js:119:17:119:23 | path[0] | provenance | Config |
@@ -98,11 +98,11 @@ edges
 | sublib/sub.js:1:37:1:40 | path | sublib/sub.js:2:7:2:10 | path | provenance |  |
 | sublib/sub.js:2:7:2:10 | path | sublib/sub.js:2:7:2:13 | path[0] | provenance | Config |
 | sublib/sub.js:2:7:2:13 | path[0] | sublib/sub.js:2:3:2:14 | obj[path[0]] | provenance | Config |
-| tst.js:5:9:5:38 | taint | tst.js:8:12:8:16 | taint | provenance |  |
-| tst.js:5:9:5:38 | taint | tst.js:9:12:9:16 | taint | provenance |  |
-| tst.js:5:9:5:38 | taint | tst.js:12:25:12:29 | taint | provenance |  |
-| tst.js:5:9:5:38 | taint | tst.js:14:27:14:31 | taint | provenance |  |
-| tst.js:5:17:5:38 | String( ... y.data) | tst.js:5:9:5:38 | taint | provenance |  |
+| tst.js:5:9:5:13 | taint | tst.js:8:12:8:16 | taint | provenance |  |
+| tst.js:5:9:5:13 | taint | tst.js:9:12:9:16 | taint | provenance |  |
+| tst.js:5:9:5:13 | taint | tst.js:12:25:12:29 | taint | provenance |  |
+| tst.js:5:9:5:13 | taint | tst.js:14:27:14:31 | taint | provenance |  |
+| tst.js:5:17:5:38 | String( ... y.data) | tst.js:5:9:5:13 | taint | provenance |  |
 | tst.js:5:24:5:37 | req.query.data | tst.js:5:17:5:38 | String( ... y.data) | provenance | Config |
 | tst.js:8:12:8:16 | taint | tst.js:8:5:8:17 | object[taint] | provenance | Config |
 | tst.js:9:12:9:16 | taint | tst.js:9:5:9:17 | object[taint] | provenance | Config |
@@ -117,10 +117,10 @@ edges
 | tst.js:55:29:55:32 | prop | tst.js:56:22:56:25 | prop | provenance |  |
 | tst.js:56:18:56:26 | obj[prop] | tst.js:56:12:56:33 | obj ? o ...  : null | provenance |  |
 | tst.js:56:22:56:25 | prop | tst.js:56:18:56:26 | obj[prop] | provenance | Config |
-| tst.js:77:9:77:38 | taint | tst.js:80:12:80:16 | taint | provenance |  |
-| tst.js:77:9:77:38 | taint | tst.js:82:17:82:21 | taint | provenance |  |
-| tst.js:77:9:77:38 | taint | tst.js:87:16:87:20 | taint | provenance |  |
-| tst.js:77:17:77:38 | String( ... y.data) | tst.js:77:9:77:38 | taint | provenance |  |
+| tst.js:77:9:77:13 | taint | tst.js:80:12:80:16 | taint | provenance |  |
+| tst.js:77:9:77:13 | taint | tst.js:82:17:82:21 | taint | provenance |  |
+| tst.js:77:9:77:13 | taint | tst.js:87:16:87:20 | taint | provenance |  |
+| tst.js:77:17:77:38 | String( ... y.data) | tst.js:77:9:77:13 | taint | provenance |  |
 | tst.js:77:24:77:37 | req.query.data | tst.js:77:17:77:38 | String( ... y.data) | provenance | Config |
 | tst.js:80:12:80:16 | taint | tst.js:80:5:80:17 | object[taint] | provenance | Config |
 | tst.js:82:12:82:21 | "" + taint | tst.js:82:5:82:22 | object["" + taint] | provenance | Config |
@@ -130,8 +130,8 @@ edges
 | tst.js:94:9:94:36 | req.que ... _', '') | tst.js:94:5:94:37 | obj[req ... ', '')] | provenance | Config |
 | tst.js:97:9:97:19 | req.query.x | tst.js:97:9:97:45 | req.que ... /g, '') | provenance | Config |
 | tst.js:97:9:97:45 | req.que ... /g, '') | tst.js:97:5:97:46 | obj[req ... g, '')] | provenance | Config |
-| tst.js:102:9:102:38 | taint | tst.js:105:12:105:16 | taint | provenance |  |
-| tst.js:102:17:102:38 | String( ... y.data) | tst.js:102:9:102:38 | taint | provenance |  |
+| tst.js:102:9:102:13 | taint | tst.js:105:12:105:16 | taint | provenance |  |
+| tst.js:102:17:102:38 | String( ... y.data) | tst.js:102:9:102:13 | taint | provenance |  |
 | tst.js:102:24:102:37 | req.query.data | tst.js:102:17:102:38 | String( ... y.data) | provenance | Config |
 | tst.js:105:12:105:16 | taint | tst.js:105:5:105:17 | object[taint] | provenance | Config |
 | tst.js:130:9:130:19 | req.query.x | tst.js:130:9:130:52 | req.que ... '), '') | provenance | Config |
@@ -139,7 +139,7 @@ edges
 nodes
 | lib.js:1:38:1:40 | obj | semmle.label | obj |
 | lib.js:1:43:1:46 | path | semmle.label | path |
-| lib.js:2:7:2:27 | currentPath | semmle.label | currentPath |
+| lib.js:2:7:2:17 | currentPath | semmle.label | currentPath |
 | lib.js:2:21:2:24 | path | semmle.label | path |
 | lib.js:2:21:2:27 | path[0] | semmle.label | path[0] |
 | lib.js:6:7:6:9 | obj | semmle.label | obj |
@@ -149,7 +149,7 @@ nodes
 | lib.js:15:3:15:14 | obj[path[0]] | semmle.label | obj[path[0]] |
 | lib.js:15:7:15:10 | path | semmle.label | path |
 | lib.js:15:7:15:13 | path[0] | semmle.label | path[0] |
-| lib.js:20:7:20:25 | path | semmle.label | path |
+| lib.js:20:7:20:10 | path | semmle.label | path |
 | lib.js:20:14:20:22 | arguments | semmle.label | arguments |
 | lib.js:20:14:20:25 | arguments[1] | semmle.label | arguments[1] |
 | lib.js:22:3:22:14 | obj[path[0]] | semmle.label | obj[path[0]] |
@@ -159,44 +159,44 @@ nodes
 | lib.js:26:10:26:21 | obj[path[0]] | semmle.label | obj[path[0]] |
 | lib.js:26:14:26:17 | path | semmle.label | path |
 | lib.js:26:14:26:20 | path[0] | semmle.label | path[0] |
-| lib.js:30:9:30:52 | args | semmle.label | args |
-| lib.js:30:9:30:52 | args [ArrayElement] | semmle.label | args [ArrayElement] |
+| lib.js:30:9:30:12 | args | semmle.label | args |
+| lib.js:30:9:30:12 | args [ArrayElement] | semmle.label | args [ArrayElement] |
 | lib.js:30:16:30:52 | Array.p ... uments) | semmle.label | Array.p ... uments) |
 | lib.js:30:16:30:52 | Array.p ... uments) [ArrayElement] | semmle.label | Array.p ... uments) [ArrayElement] |
 | lib.js:30:16:30:52 | reflective call | semmle.label | reflective call |
 | lib.js:30:16:30:52 | reflective call [ArrayElement] | semmle.label | reflective call [ArrayElement] |
 | lib.js:30:43:30:51 | arguments | semmle.label | arguments |
-| lib.js:32:7:32:20 | path | semmle.label | path |
+| lib.js:32:7:32:10 | path | semmle.label | path |
 | lib.js:32:14:32:17 | args | semmle.label | args |
 | lib.js:32:14:32:17 | args [ArrayElement] | semmle.label | args [ArrayElement] |
 | lib.js:32:14:32:20 | args[1] | semmle.label | args[1] |
 | lib.js:34:3:34:14 | obj[path[0]] | semmle.label | obj[path[0]] |
 | lib.js:34:7:34:10 | path | semmle.label | path |
 | lib.js:34:7:34:13 | path[0] | semmle.label | path[0] |
-| lib.js:38:9:38:36 | args | semmle.label | args |
+| lib.js:38:9:38:12 | args | semmle.label | args |
 | lib.js:38:16:38:36 | Array.f ... uments) | semmle.label | Array.f ... uments) |
 | lib.js:38:27:38:35 | arguments | semmle.label | arguments |
-| lib.js:40:7:40:20 | path | semmle.label | path |
+| lib.js:40:7:40:10 | path | semmle.label | path |
 | lib.js:40:14:40:17 | args | semmle.label | args |
 | lib.js:40:14:40:20 | args[1] | semmle.label | args[1] |
 | lib.js:42:3:42:14 | obj[path[0]] | semmle.label | obj[path[0]] |
 | lib.js:42:7:42:10 | path | semmle.label | path |
 | lib.js:42:7:42:13 | path[0] | semmle.label | path[0] |
-| lib.js:83:7:83:25 | path | semmle.label | path |
+| lib.js:83:7:83:10 | path | semmle.label | path |
 | lib.js:83:14:83:22 | arguments | semmle.label | arguments |
 | lib.js:83:14:83:25 | arguments[1] | semmle.label | arguments[1] |
-| lib.js:86:7:86:26 | proto | semmle.label | proto |
+| lib.js:86:7:86:11 | proto | semmle.label | proto |
 | lib.js:86:15:86:26 | obj[path[0]] | semmle.label | obj[path[0]] |
 | lib.js:86:19:86:22 | path | semmle.label | path |
 | lib.js:86:19:86:25 | path[0] | semmle.label | path[0] |
 | lib.js:87:10:87:14 | proto | semmle.label | proto |
 | lib.js:90:43:90:46 | path | semmle.label | path |
-| lib.js:91:7:91:28 | maybeProto | semmle.label | maybeProto |
+| lib.js:91:7:91:16 | maybeProto | semmle.label | maybeProto |
 | lib.js:91:20:91:28 | obj[path] | semmle.label | obj[path] |
 | lib.js:91:24:91:27 | path | semmle.label | path |
 | lib.js:92:3:92:12 | maybeProto | semmle.label | maybeProto |
 | lib.js:95:3:95:12 | maybeProto | semmle.label | maybeProto |
-| lib.js:104:7:104:24 | one | semmle.label | one |
+| lib.js:104:7:104:9 | one | semmle.label | one |
 | lib.js:104:13:104:21 | arguments | semmle.label | arguments |
 | lib.js:104:13:104:24 | arguments[1] | semmle.label | arguments[1] |
 | lib.js:108:3:108:10 | obj[one] | semmle.label | obj[one] |
@@ -221,7 +221,7 @@ nodes
 | sublib/sub.js:2:3:2:14 | obj[path[0]] | semmle.label | obj[path[0]] |
 | sublib/sub.js:2:7:2:10 | path | semmle.label | path |
 | sublib/sub.js:2:7:2:13 | path[0] | semmle.label | path[0] |
-| tst.js:5:9:5:38 | taint | semmle.label | taint |
+| tst.js:5:9:5:13 | taint | semmle.label | taint |
 | tst.js:5:17:5:38 | String( ... y.data) | semmle.label | String( ... y.data) |
 | tst.js:5:24:5:37 | req.query.data | semmle.label | req.query.data |
 | tst.js:8:5:8:17 | object[taint] | semmle.label | object[taint] |
@@ -241,7 +241,7 @@ nodes
 | tst.js:56:12:56:33 | obj ? o ...  : null | semmle.label | obj ? o ...  : null |
 | tst.js:56:18:56:26 | obj[prop] | semmle.label | obj[prop] |
 | tst.js:56:22:56:25 | prop | semmle.label | prop |
-| tst.js:77:9:77:38 | taint | semmle.label | taint |
+| tst.js:77:9:77:13 | taint | semmle.label | taint |
 | tst.js:77:17:77:38 | String( ... y.data) | semmle.label | String( ... y.data) |
 | tst.js:77:24:77:37 | req.query.data | semmle.label | req.query.data |
 | tst.js:80:5:80:17 | object[taint] | semmle.label | object[taint] |
@@ -257,7 +257,7 @@ nodes
 | tst.js:97:5:97:46 | obj[req ... g, '')] | semmle.label | obj[req ... g, '')] |
 | tst.js:97:9:97:19 | req.query.x | semmle.label | req.query.x |
 | tst.js:97:9:97:45 | req.que ... /g, '') | semmle.label | req.que ... /g, '') |
-| tst.js:102:9:102:38 | taint | semmle.label | taint |
+| tst.js:102:9:102:13 | taint | semmle.label | taint |
 | tst.js:102:17:102:38 | String( ... y.data) | semmle.label | String( ... y.data) |
 | tst.js:102:24:102:37 | req.query.data | semmle.label | req.query.data |
 | tst.js:105:5:105:17 | object[taint] | semmle.label | object[taint] |
diff --git a/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingFunction/PrototypePollutingFunction.expected b/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingFunction/PrototypePollutingFunction.expected
index 4546ee4b6aa..7eb7c2fdf90 100644
--- a/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingFunction/PrototypePollutingFunction.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingFunction/PrototypePollutingFunction.expected
@@ -61,42 +61,42 @@ edges
 | examples/PrototypePollutingFunction_fixed.js:5:29:5:36 | src[key] | examples/PrototypePollutingFunction_fixed.js:1:21:1:23 | src | provenance |  |
 | examples/PrototypePollutingFunction_fixed.js:7:24:7:26 | src | examples/PrototypePollutingFunction_fixed.js:7:24:7:31 | src[key] | provenance | Config |
 | examples/PrototypePollutingFunction_fixed.js:7:28:7:30 | key | examples/PrototypePollutingFunction_fixed.js:7:24:7:31 | src[key] | provenance | Config |
-| path-assignment.js:8:13:8:25 | key | path-assignment.js:13:29:13:31 | key | provenance |  |
-| path-assignment.js:8:13:8:25 | key | path-assignment.js:15:20:15:22 | key | provenance |  |
-| path-assignment.js:8:19:8:25 | keys[i] | path-assignment.js:8:13:8:25 | key | provenance |  |
-| path-assignment.js:13:13:13:32 | target | path-assignment.js:13:22:13:27 | target | provenance |  |
-| path-assignment.js:13:13:13:32 | target | path-assignment.js:15:13:15:18 | target | provenance |  |
+| path-assignment.js:8:13:8:15 | key | path-assignment.js:13:29:13:31 | key | provenance |  |
+| path-assignment.js:8:13:8:15 | key | path-assignment.js:15:20:15:22 | key | provenance |  |
+| path-assignment.js:8:19:8:25 | keys[i] | path-assignment.js:8:13:8:15 | key | provenance |  |
+| path-assignment.js:13:13:13:18 | target | path-assignment.js:13:22:13:27 | target | provenance |  |
+| path-assignment.js:13:13:13:18 | target | path-assignment.js:15:13:15:18 | target | provenance |  |
 | path-assignment.js:13:22:13:27 | target | path-assignment.js:13:22:13:32 | target[key] | provenance | Config |
-| path-assignment.js:13:22:13:32 | target[key] | path-assignment.js:13:13:13:32 | target | provenance |  |
+| path-assignment.js:13:22:13:32 | target[key] | path-assignment.js:13:13:13:18 | target | provenance |  |
 | path-assignment.js:13:29:13:31 | key | path-assignment.js:13:22:13:32 | target[key] | provenance | Config |
-| path-assignment.js:41:13:41:25 | key | path-assignment.js:42:25:42:27 | key | provenance |  |
-| path-assignment.js:41:13:41:25 | key | path-assignment.js:42:39:42:41 | key | provenance |  |
-| path-assignment.js:41:19:41:25 | keys[i] | path-assignment.js:41:13:41:25 | key | provenance |  |
-| path-assignment.js:42:9:42:48 | target | path-assignment.js:42:18:42:23 | target | provenance |  |
-| path-assignment.js:42:9:42:48 | target | path-assignment.js:42:32:42:37 | target | provenance |  |
-| path-assignment.js:42:9:42:48 | target | path-assignment.js:44:5:44:10 | target | provenance |  |
+| path-assignment.js:41:13:41:15 | key | path-assignment.js:42:25:42:27 | key | provenance |  |
+| path-assignment.js:41:13:41:15 | key | path-assignment.js:42:39:42:41 | key | provenance |  |
+| path-assignment.js:41:19:41:25 | keys[i] | path-assignment.js:41:13:41:15 | key | provenance |  |
+| path-assignment.js:42:9:42:14 | target | path-assignment.js:42:18:42:23 | target | provenance |  |
+| path-assignment.js:42:9:42:14 | target | path-assignment.js:42:32:42:37 | target | provenance |  |
+| path-assignment.js:42:9:42:14 | target | path-assignment.js:44:5:44:10 | target | provenance |  |
 | path-assignment.js:42:32:42:37 | target | path-assignment.js:42:32:42:42 | target[key] | provenance | Config |
-| path-assignment.js:42:32:42:42 | target[key] | path-assignment.js:42:9:42:48 | target | provenance |  |
+| path-assignment.js:42:32:42:42 | target[key] | path-assignment.js:42:9:42:14 | target | provenance |  |
 | path-assignment.js:42:32:42:42 | target[key] | path-assignment.js:42:32:42:48 | target[key] \|\| {} | provenance |  |
 | path-assignment.js:42:39:42:41 | key | path-assignment.js:42:32:42:42 | target[key] | provenance | Config |
-| path-assignment.js:58:13:58:25 | key | path-assignment.js:59:25:59:27 | key | provenance |  |
-| path-assignment.js:58:13:58:25 | key | path-assignment.js:59:39:59:41 | key | provenance |  |
-| path-assignment.js:58:19:58:25 | keys[i] | path-assignment.js:58:13:58:25 | key | provenance |  |
-| path-assignment.js:59:9:59:48 | target | path-assignment.js:59:18:59:23 | target | provenance |  |
-| path-assignment.js:59:9:59:48 | target | path-assignment.js:59:32:59:37 | target | provenance |  |
-| path-assignment.js:59:9:59:48 | target | path-assignment.js:61:5:61:10 | target | provenance |  |
+| path-assignment.js:58:13:58:15 | key | path-assignment.js:59:25:59:27 | key | provenance |  |
+| path-assignment.js:58:13:58:15 | key | path-assignment.js:59:39:59:41 | key | provenance |  |
+| path-assignment.js:58:19:58:25 | keys[i] | path-assignment.js:58:13:58:15 | key | provenance |  |
+| path-assignment.js:59:9:59:14 | target | path-assignment.js:59:18:59:23 | target | provenance |  |
+| path-assignment.js:59:9:59:14 | target | path-assignment.js:59:32:59:37 | target | provenance |  |
+| path-assignment.js:59:9:59:14 | target | path-assignment.js:61:5:61:10 | target | provenance |  |
 | path-assignment.js:59:32:59:37 | target | path-assignment.js:59:32:59:42 | target[key] | provenance | Config |
-| path-assignment.js:59:32:59:42 | target[key] | path-assignment.js:59:9:59:48 | target | provenance |  |
+| path-assignment.js:59:32:59:42 | target[key] | path-assignment.js:59:9:59:14 | target | provenance |  |
 | path-assignment.js:59:32:59:42 | target[key] | path-assignment.js:59:32:59:48 | target[key] \|\| {} | provenance |  |
 | path-assignment.js:59:39:59:41 | key | path-assignment.js:59:32:59:42 | target[key] | provenance | Config |
-| path-assignment.js:68:13:68:25 | key | path-assignment.js:69:25:69:27 | key | provenance |  |
-| path-assignment.js:68:13:68:25 | key | path-assignment.js:69:39:69:41 | key | provenance |  |
-| path-assignment.js:68:19:68:25 | keys[i] | path-assignment.js:68:13:68:25 | key | provenance |  |
-| path-assignment.js:69:9:69:48 | target | path-assignment.js:69:18:69:23 | target | provenance |  |
-| path-assignment.js:69:9:69:48 | target | path-assignment.js:69:32:69:37 | target | provenance |  |
-| path-assignment.js:69:9:69:48 | target | path-assignment.js:71:5:71:10 | target | provenance |  |
+| path-assignment.js:68:13:68:15 | key | path-assignment.js:69:25:69:27 | key | provenance |  |
+| path-assignment.js:68:13:68:15 | key | path-assignment.js:69:39:69:41 | key | provenance |  |
+| path-assignment.js:68:19:68:25 | keys[i] | path-assignment.js:68:13:68:15 | key | provenance |  |
+| path-assignment.js:69:9:69:14 | target | path-assignment.js:69:18:69:23 | target | provenance |  |
+| path-assignment.js:69:9:69:14 | target | path-assignment.js:69:32:69:37 | target | provenance |  |
+| path-assignment.js:69:9:69:14 | target | path-assignment.js:71:5:71:10 | target | provenance |  |
 | path-assignment.js:69:32:69:37 | target | path-assignment.js:69:32:69:42 | target[key] | provenance | Config |
-| path-assignment.js:69:32:69:42 | target[key] | path-assignment.js:69:9:69:48 | target | provenance |  |
+| path-assignment.js:69:32:69:42 | target[key] | path-assignment.js:69:9:69:14 | target | provenance |  |
 | path-assignment.js:69:32:69:42 | target[key] | path-assignment.js:69:32:69:48 | target[key] \|\| {} | provenance |  |
 | path-assignment.js:69:39:69:41 | key | path-assignment.js:69:32:69:42 | target[key] | provenance | Config |
 | tests.js:3:25:3:27 | dst | tests.js:6:28:6:30 | dst | provenance |  |
@@ -149,9 +149,9 @@ edges
 | tests.js:31:27:31:31 | value | tests.js:36:20:36:24 | value | provenance |  |
 | tests.js:31:34:31:36 | key | tests.js:32:24:32:26 | key | provenance |  |
 | tests.js:31:34:31:36 | key | tests.js:36:13:36:15 | key | provenance |  |
-| tests.js:32:9:32:27 | dstValue | tests.js:34:18:34:25 | dstValue | provenance |  |
+| tests.js:32:9:32:16 | dstValue | tests.js:34:18:34:25 | dstValue | provenance |  |
 | tests.js:32:20:32:22 | dst | tests.js:32:20:32:27 | dst[key] | provenance | Config |
-| tests.js:32:20:32:27 | dst[key] | tests.js:32:9:32:27 | dstValue | provenance |  |
+| tests.js:32:20:32:27 | dst[key] | tests.js:32:9:32:16 | dstValue | provenance |  |
 | tests.js:32:24:32:26 | key | tests.js:32:20:32:27 | dst[key] | provenance | Config |
 | tests.js:34:18:34:25 | dstValue | tests.js:23:19:23:21 | dst | provenance |  |
 | tests.js:34:28:34:32 | value | tests.js:23:27:23:33 | sources [0] | provenance |  |
@@ -274,11 +274,11 @@ edges
 | tests.js:189:32:189:34 | dst | tests.js:196:13:196:15 | dst | provenance |  |
 | tests.js:189:37:189:39 | src | tests.js:194:45:194:47 | src | provenance |  |
 | tests.js:189:37:189:39 | src | tests.js:196:24:196:26 | src | provenance |  |
-| tests.js:192:13:192:25 | key | tests.js:194:39:194:41 | key | provenance |  |
-| tests.js:192:13:192:25 | key | tests.js:194:49:194:51 | key | provenance |  |
-| tests.js:192:13:192:25 | key | tests.js:196:17:196:19 | key | provenance |  |
-| tests.js:192:13:192:25 | key | tests.js:196:28:196:30 | key | provenance |  |
-| tests.js:192:19:192:25 | keys[i] | tests.js:192:13:192:25 | key | provenance |  |
+| tests.js:192:13:192:15 | key | tests.js:194:39:194:41 | key | provenance |  |
+| tests.js:192:13:192:15 | key | tests.js:194:49:194:51 | key | provenance |  |
+| tests.js:192:13:192:15 | key | tests.js:196:17:196:19 | key | provenance |  |
+| tests.js:192:13:192:15 | key | tests.js:196:28:196:30 | key | provenance |  |
+| tests.js:192:19:192:25 | keys[i] | tests.js:192:13:192:15 | key | provenance |  |
 | tests.js:194:35:194:37 | dst | tests.js:194:35:194:42 | dst[key] | provenance | Config |
 | tests.js:194:35:194:42 | dst[key] | tests.js:189:32:189:34 | dst | provenance |  |
 | tests.js:194:39:194:41 | key | tests.js:194:35:194:42 | dst[key] | provenance | Config |
@@ -329,11 +329,11 @@ edges
 | tests.js:240:41:240:43 | key | tests.js:240:36:240:44 | data[key] | provenance | Config |
 | tests.js:263:27:263:29 | dst | tests.js:268:30:268:32 | dst | provenance |  |
 | tests.js:263:27:263:29 | dst | tests.js:270:13:270:15 | dst | provenance |  |
-| tests.js:265:13:265:26 | key | tests.js:268:34:268:36 | key | provenance |  |
-| tests.js:265:13:265:26 | key | tests.js:270:17:270:19 | key | provenance |  |
-| tests.js:265:19:265:26 | entry[0] | tests.js:265:13:265:26 | key | provenance |  |
-| tests.js:266:13:266:28 | value | tests.js:270:24:270:28 | value | provenance |  |
-| tests.js:266:21:266:28 | entry[1] | tests.js:266:13:266:28 | value | provenance |  |
+| tests.js:265:13:265:15 | key | tests.js:268:34:268:36 | key | provenance |  |
+| tests.js:265:13:265:15 | key | tests.js:270:17:270:19 | key | provenance |  |
+| tests.js:265:19:265:26 | entry[0] | tests.js:265:13:265:15 | key | provenance |  |
+| tests.js:266:13:266:17 | value | tests.js:270:24:270:28 | value | provenance |  |
+| tests.js:266:21:266:28 | entry[1] | tests.js:266:13:266:17 | value | provenance |  |
 | tests.js:268:30:268:32 | dst | tests.js:268:30:268:37 | dst[key] | provenance | Config |
 | tests.js:268:30:268:37 | dst[key] | tests.js:263:27:263:29 | dst | provenance |  |
 | tests.js:268:34:268:36 | key | tests.js:268:30:268:37 | dst[key] | provenance | Config |
@@ -360,15 +360,15 @@ edges
 | tests.js:302:14:302:16 | key | tests.js:304:29:304:31 | key | provenance |  |
 | tests.js:302:14:302:16 | key | tests.js:306:38:306:40 | key | provenance |  |
 | tests.js:302:14:302:16 | key | tests.js:308:21:308:23 | key | provenance |  |
-| tests.js:304:17:304:32 | value | tests.js:306:44:306:48 | value | provenance |  |
-| tests.js:304:17:304:32 | value | tests.js:306:44:306:48 | value | provenance |  |
-| tests.js:304:17:304:32 | value | tests.js:308:28:308:32 | value | provenance |  |
-| tests.js:304:17:304:32 | value | tests.js:308:28:308:32 | value | provenance |  |
-| tests.js:304:17:304:32 | value | tests.js:308:28:308:32 | value | provenance |  |
+| tests.js:304:17:304:21 | value | tests.js:306:44:306:48 | value | provenance |  |
+| tests.js:304:17:304:21 | value | tests.js:306:44:306:48 | value | provenance |  |
+| tests.js:304:17:304:21 | value | tests.js:308:28:308:32 | value | provenance |  |
+| tests.js:304:17:304:21 | value | tests.js:308:28:308:32 | value | provenance |  |
+| tests.js:304:17:304:21 | value | tests.js:308:28:308:32 | value | provenance |  |
 | tests.js:304:25:304:27 | src | tests.js:304:25:304:32 | src[key] | provenance | Config |
-| tests.js:304:25:304:32 | src[key] | tests.js:304:17:304:32 | value | provenance |  |
-| tests.js:304:25:304:32 | src[key] | tests.js:304:17:304:32 | value | provenance |  |
-| tests.js:304:25:304:32 | src[key] | tests.js:304:17:304:32 | value | provenance |  |
+| tests.js:304:25:304:32 | src[key] | tests.js:304:17:304:21 | value | provenance |  |
+| tests.js:304:25:304:32 | src[key] | tests.js:304:17:304:21 | value | provenance |  |
+| tests.js:304:25:304:32 | src[key] | tests.js:304:17:304:21 | value | provenance |  |
 | tests.js:304:29:304:31 | key | tests.js:304:25:304:32 | src[key] | provenance | Config |
 | tests.js:304:29:304:31 | key | tests.js:304:25:304:32 | src[key] | provenance | Config |
 | tests.js:306:34:306:36 | dst | tests.js:306:34:306:41 | dst[key] | provenance | Config |
@@ -381,15 +381,15 @@ edges
 | tests.js:315:14:315:16 | key | tests.js:318:29:318:31 | key | provenance |  |
 | tests.js:315:14:315:16 | key | tests.js:320:42:320:44 | key | provenance |  |
 | tests.js:315:14:315:16 | key | tests.js:322:21:322:23 | key | provenance |  |
-| tests.js:318:17:318:32 | value | tests.js:320:48:320:52 | value | provenance |  |
-| tests.js:318:17:318:32 | value | tests.js:320:48:320:52 | value | provenance |  |
-| tests.js:318:17:318:32 | value | tests.js:322:28:322:32 | value | provenance |  |
-| tests.js:318:17:318:32 | value | tests.js:322:28:322:32 | value | provenance |  |
-| tests.js:318:17:318:32 | value | tests.js:322:28:322:32 | value | provenance |  |
+| tests.js:318:17:318:21 | value | tests.js:320:48:320:52 | value | provenance |  |
+| tests.js:318:17:318:21 | value | tests.js:320:48:320:52 | value | provenance |  |
+| tests.js:318:17:318:21 | value | tests.js:322:28:322:32 | value | provenance |  |
+| tests.js:318:17:318:21 | value | tests.js:322:28:322:32 | value | provenance |  |
+| tests.js:318:17:318:21 | value | tests.js:322:28:322:32 | value | provenance |  |
 | tests.js:318:25:318:27 | src | tests.js:318:25:318:32 | src[key] | provenance | Config |
-| tests.js:318:25:318:32 | src[key] | tests.js:318:17:318:32 | value | provenance |  |
-| tests.js:318:25:318:32 | src[key] | tests.js:318:17:318:32 | value | provenance |  |
-| tests.js:318:25:318:32 | src[key] | tests.js:318:17:318:32 | value | provenance |  |
+| tests.js:318:25:318:32 | src[key] | tests.js:318:17:318:21 | value | provenance |  |
+| tests.js:318:25:318:32 | src[key] | tests.js:318:17:318:21 | value | provenance |  |
+| tests.js:318:25:318:32 | src[key] | tests.js:318:17:318:21 | value | provenance |  |
 | tests.js:318:29:318:31 | key | tests.js:318:25:318:32 | src[key] | provenance | Config |
 | tests.js:318:29:318:31 | key | tests.js:318:25:318:32 | src[key] | provenance | Config |
 | tests.js:320:38:320:40 | dst | tests.js:320:38:320:45 | dst[key] | provenance | Config |
@@ -526,15 +526,15 @@ edges
 | tests.js:413:14:413:16 | key | tests.js:414:38:414:40 | key | provenance |  |
 | tests.js:413:14:413:16 | key | tests.js:415:39:415:41 | key | provenance |  |
 | tests.js:413:14:413:16 | key | tests.js:419:17:419:19 | key | provenance |  |
-| tests.js:414:13:414:41 | value | tests.js:417:42:417:46 | value | provenance |  |
-| tests.js:414:13:414:41 | value | tests.js:419:24:419:28 | value | provenance |  |
-| tests.js:414:21:414:41 | wrapped ... c, key) | tests.js:414:13:414:41 | value | provenance |  |
+| tests.js:414:13:414:17 | value | tests.js:417:42:417:46 | value | provenance |  |
+| tests.js:414:13:414:17 | value | tests.js:419:24:419:28 | value | provenance |  |
+| tests.js:414:21:414:41 | wrapped ... c, key) | tests.js:414:13:414:17 | value | provenance |  |
 | tests.js:414:33:414:35 | src | tests.js:408:22:408:24 | obj | provenance |  |
 | tests.js:414:33:414:35 | src | tests.js:414:21:414:41 | wrapped ... c, key) | provenance | Config |
 | tests.js:414:38:414:40 | key | tests.js:408:27:408:29 | key | provenance |  |
 | tests.js:414:38:414:40 | key | tests.js:414:21:414:41 | wrapped ... c, key) | provenance | Config |
-| tests.js:415:13:415:42 | target | tests.js:417:34:417:39 | target | provenance |  |
-| tests.js:415:22:415:42 | wrapped ... t, key) | tests.js:415:13:415:42 | target | provenance |  |
+| tests.js:415:13:415:18 | target | tests.js:417:34:417:39 | target | provenance |  |
+| tests.js:415:22:415:42 | wrapped ... t, key) | tests.js:415:13:415:18 | target | provenance |  |
 | tests.js:415:34:415:36 | dst | tests.js:408:22:408:24 | obj | provenance |  |
 | tests.js:415:34:415:36 | dst | tests.js:415:22:415:42 | wrapped ... t, key) | provenance | Config |
 | tests.js:415:39:415:41 | key | tests.js:408:27:408:29 | key | provenance |  |
@@ -551,15 +551,15 @@ edges
 | tests.js:430:14:430:16 | key | tests.js:431:41:431:43 | key | provenance |  |
 | tests.js:430:14:430:16 | key | tests.js:432:42:432:44 | key | provenance |  |
 | tests.js:430:14:430:16 | key | tests.js:436:17:436:19 | key | provenance |  |
-| tests.js:431:13:431:44 | value | tests.js:434:45:434:49 | value | provenance |  |
-| tests.js:431:13:431:44 | value | tests.js:436:24:436:28 | value | provenance |  |
-| tests.js:431:21:431:44 | almostS ... c, key) | tests.js:431:13:431:44 | value | provenance |  |
+| tests.js:431:13:431:17 | value | tests.js:434:45:434:49 | value | provenance |  |
+| tests.js:431:13:431:17 | value | tests.js:436:24:436:28 | value | provenance |  |
+| tests.js:431:21:431:44 | almostS ... c, key) | tests.js:431:13:431:17 | value | provenance |  |
 | tests.js:431:36:431:38 | src | tests.js:424:25:424:27 | obj | provenance |  |
 | tests.js:431:36:431:38 | src | tests.js:431:21:431:44 | almostS ... c, key) | provenance | Config |
 | tests.js:431:41:431:43 | key | tests.js:424:30:424:32 | key | provenance |  |
 | tests.js:431:41:431:43 | key | tests.js:431:21:431:44 | almostS ... c, key) | provenance | Config |
-| tests.js:432:13:432:45 | target | tests.js:434:37:434:42 | target | provenance |  |
-| tests.js:432:22:432:45 | almostS ... t, key) | tests.js:432:13:432:45 | target | provenance |  |
+| tests.js:432:13:432:18 | target | tests.js:434:37:434:42 | target | provenance |  |
+| tests.js:432:22:432:45 | almostS ... t, key) | tests.js:432:13:432:18 | target | provenance |  |
 | tests.js:432:37:432:39 | dst | tests.js:424:25:424:27 | obj | provenance |  |
 | tests.js:432:37:432:39 | dst | tests.js:432:22:432:45 | almostS ... t, key) | provenance | Config |
 | tests.js:432:42:432:44 | key | tests.js:424:30:424:32 | key | provenance |  |
@@ -570,9 +570,9 @@ edges
 | tests.js:443:12:443:14 | obj | tests.js:443:12:443:19 | obj[key] | provenance | Config |
 | tests.js:446:33:446:35 | src | tests.js:448:30:448:32 | src | provenance |  |
 | tests.js:447:14:447:16 | key | tests.js:453:17:453:19 | key | provenance |  |
-| tests.js:448:13:448:38 | value | tests.js:451:39:451:43 | value | provenance |  |
-| tests.js:448:13:448:38 | value | tests.js:453:24:453:28 | value | provenance |  |
-| tests.js:448:21:448:38 | safeRead(src, key) | tests.js:448:13:448:38 | value | provenance |  |
+| tests.js:448:13:448:17 | value | tests.js:451:39:451:43 | value | provenance |  |
+| tests.js:448:13:448:17 | value | tests.js:453:24:453:28 | value | provenance |  |
+| tests.js:448:21:448:38 | safeRead(src, key) | tests.js:448:13:448:17 | value | provenance |  |
 | tests.js:448:30:448:32 | src | tests.js:441:19:441:21 | obj | provenance |  |
 | tests.js:448:30:448:32 | src | tests.js:448:21:448:38 | safeRead(src, key) | provenance | Config |
 | tests.js:451:39:451:43 | value | tests.js:446:33:446:35 | src | provenance |  |
@@ -630,26 +630,26 @@ edges
 | tests.js:494:32:494:34 | src | tests.js:498:21:498:23 | src | provenance |  |
 | tests.js:495:14:495:16 | key | tests.js:498:25:498:27 | key | provenance |  |
 | tests.js:495:14:495:16 | key | tests.js:502:17:502:19 | key | provenance |  |
-| tests.js:498:13:498:28 | value | tests.js:500:38:500:42 | value | provenance |  |
-| tests.js:498:13:498:28 | value | tests.js:500:38:500:42 | value | provenance |  |
-| tests.js:498:13:498:28 | value | tests.js:502:24:502:28 | value | provenance |  |
-| tests.js:498:13:498:28 | value | tests.js:502:24:502:28 | value | provenance |  |
-| tests.js:498:13:498:28 | value | tests.js:502:24:502:28 | value | provenance |  |
+| tests.js:498:13:498:17 | value | tests.js:500:38:500:42 | value | provenance |  |
+| tests.js:498:13:498:17 | value | tests.js:500:38:500:42 | value | provenance |  |
+| tests.js:498:13:498:17 | value | tests.js:502:24:502:28 | value | provenance |  |
+| tests.js:498:13:498:17 | value | tests.js:502:24:502:28 | value | provenance |  |
+| tests.js:498:13:498:17 | value | tests.js:502:24:502:28 | value | provenance |  |
 | tests.js:498:21:498:23 | src | tests.js:498:21:498:28 | src[key] | provenance | Config |
-| tests.js:498:21:498:28 | src[key] | tests.js:498:13:498:28 | value | provenance |  |
-| tests.js:498:21:498:28 | src[key] | tests.js:498:13:498:28 | value | provenance |  |
-| tests.js:498:21:498:28 | src[key] | tests.js:498:13:498:28 | value | provenance |  |
+| tests.js:498:21:498:28 | src[key] | tests.js:498:13:498:17 | value | provenance |  |
+| tests.js:498:21:498:28 | src[key] | tests.js:498:13:498:17 | value | provenance |  |
+| tests.js:498:21:498:28 | src[key] | tests.js:498:13:498:17 | value | provenance |  |
 | tests.js:498:25:498:27 | key | tests.js:498:21:498:28 | src[key] | provenance | Config |
 | tests.js:500:38:500:42 | value | tests.js:494:32:494:34 | src | provenance |  |
 | tests.js:508:30:508:32 | dst | tests.js:513:33:513:35 | dst | provenance |  |
 | tests.js:508:30:508:32 | dst | tests.js:517:35:517:37 | dst | provenance |  |
 | tests.js:508:35:508:37 | src | tests.js:513:43:513:45 | src | provenance |  |
 | tests.js:508:35:508:37 | src | tests.js:516:32:516:34 | src | provenance |  |
-| tests.js:511:13:511:25 | key | tests.js:513:37:513:39 | key | provenance |  |
-| tests.js:511:13:511:25 | key | tests.js:513:47:513:49 | key | provenance |  |
-| tests.js:511:13:511:25 | key | tests.js:516:36:516:38 | key | provenance |  |
-| tests.js:511:13:511:25 | key | tests.js:517:40:517:42 | key | provenance |  |
-| tests.js:511:19:511:25 | keys[i] | tests.js:511:13:511:25 | key | provenance |  |
+| tests.js:511:13:511:15 | key | tests.js:513:37:513:39 | key | provenance |  |
+| tests.js:511:13:511:15 | key | tests.js:513:47:513:49 | key | provenance |  |
+| tests.js:511:13:511:15 | key | tests.js:516:36:516:38 | key | provenance |  |
+| tests.js:511:13:511:15 | key | tests.js:517:40:517:42 | key | provenance |  |
+| tests.js:511:19:511:25 | keys[i] | tests.js:511:13:511:15 | key | provenance |  |
 | tests.js:513:33:513:35 | dst | tests.js:513:33:513:40 | dst[key] | provenance | Config |
 | tests.js:513:33:513:40 | dst[key] | tests.js:508:30:508:32 | dst | provenance |  |
 | tests.js:513:37:513:39 | key | tests.js:513:33:513:40 | dst[key] | provenance | Config |
@@ -660,14 +660,14 @@ edges
 | tests.js:516:36:516:38 | key | tests.js:516:32:516:39 | src[key] | provenance | Config |
 | tests.js:522:35:522:38 | args [0] | tests.js:523:17:523:20 | args [0] | provenance |  |
 | tests.js:522:35:522:38 | args [1] | tests.js:524:17:524:20 | args [1] | provenance |  |
-| tests.js:523:11:523:23 | dst | tests.js:527:35:527:37 | dst | provenance |  |
-| tests.js:523:11:523:23 | dst | tests.js:529:13:529:15 | dst | provenance |  |
+| tests.js:523:11:523:13 | dst | tests.js:527:35:527:37 | dst | provenance |  |
+| tests.js:523:11:523:13 | dst | tests.js:529:13:529:15 | dst | provenance |  |
 | tests.js:523:17:523:20 | args [0] | tests.js:523:17:523:23 | args[0] | provenance |  |
-| tests.js:523:17:523:23 | args[0] | tests.js:523:11:523:23 | dst | provenance |  |
-| tests.js:524:11:524:23 | src | tests.js:527:45:527:47 | src | provenance |  |
-| tests.js:524:11:524:23 | src | tests.js:529:24:529:26 | src | provenance |  |
+| tests.js:523:17:523:23 | args[0] | tests.js:523:11:523:13 | dst | provenance |  |
+| tests.js:524:11:524:13 | src | tests.js:527:45:527:47 | src | provenance |  |
+| tests.js:524:11:524:13 | src | tests.js:529:24:529:26 | src | provenance |  |
 | tests.js:524:17:524:20 | args [1] | tests.js:524:17:524:23 | args[1] | provenance |  |
-| tests.js:524:17:524:23 | args[1] | tests.js:524:11:524:23 | src | provenance |  |
+| tests.js:524:17:524:23 | args[1] | tests.js:524:11:524:13 | src | provenance |  |
 | tests.js:525:14:525:16 | key | tests.js:527:39:527:41 | key | provenance |  |
 | tests.js:525:14:525:16 | key | tests.js:527:49:527:51 | key | provenance |  |
 | tests.js:525:14:525:16 | key | tests.js:529:17:529:19 | key | provenance |  |
@@ -776,17 +776,17 @@ nodes
 | examples/PrototypePollutingFunction_fixed.js:7:24:7:26 | src | semmle.label | src |
 | examples/PrototypePollutingFunction_fixed.js:7:24:7:31 | src[key] | semmle.label | src[key] |
 | examples/PrototypePollutingFunction_fixed.js:7:28:7:30 | key | semmle.label | key |
-| path-assignment.js:8:13:8:25 | key | semmle.label | key |
+| path-assignment.js:8:13:8:15 | key | semmle.label | key |
 | path-assignment.js:8:19:8:25 | keys[i] | semmle.label | keys[i] |
-| path-assignment.js:13:13:13:32 | target | semmle.label | target |
+| path-assignment.js:13:13:13:18 | target | semmle.label | target |
 | path-assignment.js:13:22:13:27 | target | semmle.label | target |
 | path-assignment.js:13:22:13:32 | target[key] | semmle.label | target[key] |
 | path-assignment.js:13:29:13:31 | key | semmle.label | key |
 | path-assignment.js:15:13:15:18 | target | semmle.label | target |
 | path-assignment.js:15:20:15:22 | key | semmle.label | key |
-| path-assignment.js:41:13:41:25 | key | semmle.label | key |
+| path-assignment.js:41:13:41:15 | key | semmle.label | key |
 | path-assignment.js:41:19:41:25 | keys[i] | semmle.label | keys[i] |
-| path-assignment.js:42:9:42:48 | target | semmle.label | target |
+| path-assignment.js:42:9:42:14 | target | semmle.label | target |
 | path-assignment.js:42:18:42:23 | target | semmle.label | target |
 | path-assignment.js:42:25:42:27 | key | semmle.label | key |
 | path-assignment.js:42:32:42:37 | target | semmle.label | target |
@@ -795,9 +795,9 @@ nodes
 | path-assignment.js:42:39:42:41 | key | semmle.label | key |
 | path-assignment.js:44:5:44:10 | target | semmle.label | target |
 | path-assignment.js:44:12:44:18 | keys[i] | semmle.label | keys[i] |
-| path-assignment.js:58:13:58:25 | key | semmle.label | key |
+| path-assignment.js:58:13:58:15 | key | semmle.label | key |
 | path-assignment.js:58:19:58:25 | keys[i] | semmle.label | keys[i] |
-| path-assignment.js:59:9:59:48 | target | semmle.label | target |
+| path-assignment.js:59:9:59:14 | target | semmle.label | target |
 | path-assignment.js:59:18:59:23 | target | semmle.label | target |
 | path-assignment.js:59:25:59:27 | key | semmle.label | key |
 | path-assignment.js:59:32:59:37 | target | semmle.label | target |
@@ -806,9 +806,9 @@ nodes
 | path-assignment.js:59:39:59:41 | key | semmle.label | key |
 | path-assignment.js:61:5:61:10 | target | semmle.label | target |
 | path-assignment.js:61:12:61:18 | keys[i] | semmle.label | keys[i] |
-| path-assignment.js:68:13:68:25 | key | semmle.label | key |
+| path-assignment.js:68:13:68:15 | key | semmle.label | key |
 | path-assignment.js:68:19:68:25 | keys[i] | semmle.label | keys[i] |
-| path-assignment.js:69:9:69:48 | target | semmle.label | target |
+| path-assignment.js:69:9:69:14 | target | semmle.label | target |
 | path-assignment.js:69:18:69:23 | target | semmle.label | target |
 | path-assignment.js:69:25:69:27 | key | semmle.label | key |
 | path-assignment.js:69:32:69:37 | target | semmle.label | target |
@@ -859,7 +859,7 @@ nodes
 | tests.js:31:22:31:24 | dst | semmle.label | dst |
 | tests.js:31:27:31:31 | value | semmle.label | value |
 | tests.js:31:34:31:36 | key | semmle.label | key |
-| tests.js:32:9:32:27 | dstValue | semmle.label | dstValue |
+| tests.js:32:9:32:16 | dstValue | semmle.label | dstValue |
 | tests.js:32:20:32:22 | dst | semmle.label | dst |
 | tests.js:32:20:32:27 | dst[key] | semmle.label | dst[key] |
 | tests.js:32:24:32:26 | key | semmle.label | key |
@@ -976,7 +976,7 @@ nodes
 | tests.js:184:24:184:31 | src[key] | semmle.label | src[key] |
 | tests.js:189:32:189:34 | dst | semmle.label | dst |
 | tests.js:189:37:189:39 | src | semmle.label | src |
-| tests.js:192:13:192:25 | key | semmle.label | key |
+| tests.js:192:13:192:15 | key | semmle.label | key |
 | tests.js:192:19:192:25 | keys[i] | semmle.label | keys[i] |
 | tests.js:194:35:194:37 | dst | semmle.label | dst |
 | tests.js:194:35:194:42 | dst[key] | semmle.label | dst[key] |
@@ -1031,9 +1031,9 @@ nodes
 | tests.js:240:36:240:44 | data[key] | semmle.label | data[key] |
 | tests.js:240:41:240:43 | key | semmle.label | key |
 | tests.js:263:27:263:29 | dst | semmle.label | dst |
-| tests.js:265:13:265:26 | key | semmle.label | key |
+| tests.js:265:13:265:15 | key | semmle.label | key |
 | tests.js:265:19:265:26 | entry[0] | semmle.label | entry[0] |
-| tests.js:266:13:266:28 | value | semmle.label | value |
+| tests.js:266:13:266:17 | value | semmle.label | value |
 | tests.js:266:21:266:28 | entry[1] | semmle.label | entry[1] |
 | tests.js:268:30:268:32 | dst | semmle.label | dst |
 | tests.js:268:30:268:37 | dst[key] | semmle.label | dst[key] |
@@ -1059,9 +1059,9 @@ nodes
 | tests.js:301:27:301:29 | dst | semmle.label | dst |
 | tests.js:301:32:301:34 | src | semmle.label | src |
 | tests.js:302:14:302:16 | key | semmle.label | key |
-| tests.js:304:17:304:32 | value | semmle.label | value |
-| tests.js:304:17:304:32 | value | semmle.label | value |
-| tests.js:304:17:304:32 | value | semmle.label | value |
+| tests.js:304:17:304:21 | value | semmle.label | value |
+| tests.js:304:17:304:21 | value | semmle.label | value |
+| tests.js:304:17:304:21 | value | semmle.label | value |
 | tests.js:304:25:304:27 | src | semmle.label | src |
 | tests.js:304:25:304:32 | src[key] | semmle.label | src[key] |
 | tests.js:304:25:304:32 | src[key] | semmle.label | src[key] |
@@ -1077,9 +1077,9 @@ nodes
 | tests.js:314:31:314:33 | dst | semmle.label | dst |
 | tests.js:314:36:314:38 | src | semmle.label | src |
 | tests.js:315:14:315:16 | key | semmle.label | key |
-| tests.js:318:17:318:32 | value | semmle.label | value |
-| tests.js:318:17:318:32 | value | semmle.label | value |
-| tests.js:318:17:318:32 | value | semmle.label | value |
+| tests.js:318:17:318:21 | value | semmle.label | value |
+| tests.js:318:17:318:21 | value | semmle.label | value |
+| tests.js:318:17:318:21 | value | semmle.label | value |
 | tests.js:318:25:318:27 | src | semmle.label | src |
 | tests.js:318:25:318:32 | src[key] | semmle.label | src[key] |
 | tests.js:318:25:318:32 | src[key] | semmle.label | src[key] |
@@ -1197,11 +1197,11 @@ nodes
 | tests.js:412:31:412:33 | dst | semmle.label | dst |
 | tests.js:412:36:412:38 | src | semmle.label | src |
 | tests.js:413:14:413:16 | key | semmle.label | key |
-| tests.js:414:13:414:41 | value | semmle.label | value |
+| tests.js:414:13:414:17 | value | semmle.label | value |
 | tests.js:414:21:414:41 | wrapped ... c, key) | semmle.label | wrapped ... c, key) |
 | tests.js:414:33:414:35 | src | semmle.label | src |
 | tests.js:414:38:414:40 | key | semmle.label | key |
-| tests.js:415:13:415:42 | target | semmle.label | target |
+| tests.js:415:13:415:18 | target | semmle.label | target |
 | tests.js:415:22:415:42 | wrapped ... t, key) | semmle.label | wrapped ... t, key) |
 | tests.js:415:34:415:36 | dst | semmle.label | dst |
 | tests.js:415:39:415:41 | key | semmle.label | key |
@@ -1218,11 +1218,11 @@ nodes
 | tests.js:429:34:429:36 | dst | semmle.label | dst |
 | tests.js:429:39:429:41 | src | semmle.label | src |
 | tests.js:430:14:430:16 | key | semmle.label | key |
-| tests.js:431:13:431:44 | value | semmle.label | value |
+| tests.js:431:13:431:17 | value | semmle.label | value |
 | tests.js:431:21:431:44 | almostS ... c, key) | semmle.label | almostS ... c, key) |
 | tests.js:431:36:431:38 | src | semmle.label | src |
 | tests.js:431:41:431:43 | key | semmle.label | key |
-| tests.js:432:13:432:45 | target | semmle.label | target |
+| tests.js:432:13:432:18 | target | semmle.label | target |
 | tests.js:432:22:432:45 | almostS ... t, key) | semmle.label | almostS ... t, key) |
 | tests.js:432:37:432:39 | dst | semmle.label | dst |
 | tests.js:432:42:432:44 | key | semmle.label | key |
@@ -1236,7 +1236,7 @@ nodes
 | tests.js:443:12:443:19 | obj[key] | semmle.label | obj[key] |
 | tests.js:446:33:446:35 | src | semmle.label | src |
 | tests.js:447:14:447:16 | key | semmle.label | key |
-| tests.js:448:13:448:38 | value | semmle.label | value |
+| tests.js:448:13:448:17 | value | semmle.label | value |
 | tests.js:448:21:448:38 | safeRead(src, key) | semmle.label | safeRead(src, key) |
 | tests.js:448:30:448:32 | src | semmle.label | src |
 | tests.js:451:39:451:43 | value | semmle.label | value |
@@ -1293,9 +1293,9 @@ nodes
 | tests.js:489:28:489:30 | key | semmle.label | key |
 | tests.js:494:32:494:34 | src | semmle.label | src |
 | tests.js:495:14:495:16 | key | semmle.label | key |
-| tests.js:498:13:498:28 | value | semmle.label | value |
-| tests.js:498:13:498:28 | value | semmle.label | value |
-| tests.js:498:13:498:28 | value | semmle.label | value |
+| tests.js:498:13:498:17 | value | semmle.label | value |
+| tests.js:498:13:498:17 | value | semmle.label | value |
+| tests.js:498:13:498:17 | value | semmle.label | value |
 | tests.js:498:21:498:23 | src | semmle.label | src |
 | tests.js:498:21:498:28 | src[key] | semmle.label | src[key] |
 | tests.js:498:21:498:28 | src[key] | semmle.label | src[key] |
@@ -1306,7 +1306,7 @@ nodes
 | tests.js:502:24:502:28 | value | semmle.label | value |
 | tests.js:508:30:508:32 | dst | semmle.label | dst |
 | tests.js:508:35:508:37 | src | semmle.label | src |
-| tests.js:511:13:511:25 | key | semmle.label | key |
+| tests.js:511:13:511:15 | key | semmle.label | key |
 | tests.js:511:19:511:25 | keys[i] | semmle.label | keys[i] |
 | tests.js:513:33:513:35 | dst | semmle.label | dst |
 | tests.js:513:33:513:40 | dst[key] | semmle.label | dst[key] |
@@ -1321,10 +1321,10 @@ nodes
 | tests.js:517:40:517:42 | key | semmle.label | key |
 | tests.js:522:35:522:38 | args [0] | semmle.label | args [0] |
 | tests.js:522:35:522:38 | args [1] | semmle.label | args [1] |
-| tests.js:523:11:523:23 | dst | semmle.label | dst |
+| tests.js:523:11:523:13 | dst | semmle.label | dst |
 | tests.js:523:17:523:20 | args [0] | semmle.label | args [0] |
 | tests.js:523:17:523:23 | args[0] | semmle.label | args[0] |
-| tests.js:524:11:524:23 | src | semmle.label | src |
+| tests.js:524:11:524:13 | src | semmle.label | src |
 | tests.js:524:17:524:20 | args [1] | semmle.label | args [1] |
 | tests.js:524:17:524:23 | args[1] | semmle.label | args[1] |
 | tests.js:525:14:525:16 | key | semmle.label | key |
diff --git a/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingMergeCall/PrototypePollutingMergeCall.expected b/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingMergeCall/PrototypePollutingMergeCall.expected
index 8b08f2a20af..3bdb65ac450 100644
--- a/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingMergeCall/PrototypePollutingMergeCall.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingMergeCall/PrototypePollutingMergeCall.expected
@@ -12,8 +12,8 @@ edges
 | angularmerge.js:2:32:2:36 | event | angularmerge.js:2:32:2:41 | event.data | provenance |  |
 | angularmerge.js:2:32:2:41 | event.data | angularmerge.js:2:21:2:42 | JSON.pa ... t.data) | provenance | Config |
 | src-vulnerable-lodash/tst.js:11:16:11:30 | req.query.value | src-vulnerable-lodash/tst.js:10:17:12:5 | {\\n      ... e\\n    } | provenance |  |
-| src-vulnerable-lodash/tst.js:14:9:16:5 | opts [thing] | src-vulnerable-lodash/tst.js:18:16:18:19 | opts [thing] | provenance |  |
-| src-vulnerable-lodash/tst.js:14:16:16:5 | {\\n      ... e\\n    } [thing] | src-vulnerable-lodash/tst.js:14:9:16:5 | opts [thing] | provenance |  |
+| src-vulnerable-lodash/tst.js:14:9:14:12 | opts [thing] | src-vulnerable-lodash/tst.js:18:16:18:19 | opts [thing] | provenance |  |
+| src-vulnerable-lodash/tst.js:14:16:16:5 | {\\n      ... e\\n    } [thing] | src-vulnerable-lodash/tst.js:14:9:14:12 | opts [thing] | provenance |  |
 | src-vulnerable-lodash/tst.js:15:14:15:28 | req.query.value | src-vulnerable-lodash/tst.js:14:16:16:5 | {\\n      ... e\\n    } [thing] | provenance |  |
 | src-vulnerable-lodash/tst.js:18:16:18:19 | opts [thing] | src-vulnerable-lodash/tst.js:18:16:18:25 | opts.thing | provenance |  |
 | src-vulnerable-lodash/tst.js:18:16:18:25 | opts.thing | src-vulnerable-lodash/tst.js:17:17:19:5 | {\\n      ... g\\n    } | provenance |  |
@@ -37,7 +37,7 @@ nodes
 | src-vulnerable-lodash/tst.js:7:17:7:29 | req.query.foo | semmle.label | req.query.foo |
 | src-vulnerable-lodash/tst.js:10:17:12:5 | {\\n      ... e\\n    } | semmle.label | {\\n      ... e\\n    } |
 | src-vulnerable-lodash/tst.js:11:16:11:30 | req.query.value | semmle.label | req.query.value |
-| src-vulnerable-lodash/tst.js:14:9:16:5 | opts [thing] | semmle.label | opts [thing] |
+| src-vulnerable-lodash/tst.js:14:9:14:12 | opts [thing] | semmle.label | opts [thing] |
 | src-vulnerable-lodash/tst.js:14:16:16:5 | {\\n      ... e\\n    } [thing] | semmle.label | {\\n      ... e\\n    } [thing] |
 | src-vulnerable-lodash/tst.js:15:14:15:28 | req.query.value | semmle.label | req.query.value |
 | src-vulnerable-lodash/tst.js:17:17:19:5 | {\\n      ... g\\n    } | semmle.label | {\\n      ... g\\n    } |
diff --git a/javascript/ql/test/query-tests/Security/CWE-918/ClientSideRequestForgery.expected b/javascript/ql/test/query-tests/Security/CWE-918/ClientSideRequestForgery.expected
index 4a8f524f862..1d6b8781db7 100644
--- a/javascript/ql/test/query-tests/Security/CWE-918/ClientSideRequestForgery.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-918/ClientSideRequestForgery.expected
@@ -4,32 +4,32 @@
 | clientSide.js:17:5:17:58 | request ...  '/id') | clientSide.js:16:22:16:41 | window.location.hash | clientSide.js:17:13:17:57 | 'https: ... + '/id' | The $@ of this request depends on a $@. | clientSide.js:17:13:17:57 | 'https: ... + '/id' | URL | clientSide.js:16:22:16:41 | window.location.hash | user-provided value |
 | clientSide.js:21:5:21:54 | request ...  '/id') | clientSide.js:20:18:20:28 | window.name | clientSide.js:21:13:21:53 | 'https: ... + '/id' | The $@ of this request depends on a $@. | clientSide.js:21:13:21:53 | 'https: ... + '/id' | URL | clientSide.js:20:18:20:28 | window.name | user-provided value |
 edges
-| clientSide.js:11:11:11:53 | query | clientSide.js:12:42:12:46 | query | provenance |  |
+| clientSide.js:11:11:11:15 | query | clientSide.js:12:42:12:46 | query | provenance |  |
 | clientSide.js:11:19:11:40 | window. ... .search | clientSide.js:11:19:11:53 | window. ... ring(1) | provenance |  |
-| clientSide.js:11:19:11:53 | window. ... ring(1) | clientSide.js:11:11:11:53 | query | provenance |  |
+| clientSide.js:11:19:11:53 | window. ... ring(1) | clientSide.js:11:11:11:15 | query | provenance |  |
 | clientSide.js:12:42:12:46 | query | clientSide.js:12:13:12:54 | 'https: ... + '/id' | provenance |  |
 | clientSide.js:14:42:14:63 | window. ... .search | clientSide.js:14:13:14:63 | 'https: ... .search | provenance |  |
-| clientSide.js:16:11:16:54 | fragment | clientSide.js:17:42:17:49 | fragment | provenance |  |
+| clientSide.js:16:11:16:18 | fragment | clientSide.js:17:42:17:49 | fragment | provenance |  |
 | clientSide.js:16:22:16:41 | window.location.hash | clientSide.js:16:22:16:54 | window. ... ring(1) | provenance |  |
-| clientSide.js:16:22:16:54 | window. ... ring(1) | clientSide.js:16:11:16:54 | fragment | provenance |  |
+| clientSide.js:16:22:16:54 | window. ... ring(1) | clientSide.js:16:11:16:18 | fragment | provenance |  |
 | clientSide.js:17:42:17:49 | fragment | clientSide.js:17:13:17:57 | 'https: ... + '/id' | provenance |  |
-| clientSide.js:20:11:20:28 | name | clientSide.js:21:42:21:45 | name | provenance |  |
-| clientSide.js:20:18:20:28 | window.name | clientSide.js:20:11:20:28 | name | provenance |  |
+| clientSide.js:20:11:20:14 | name | clientSide.js:21:42:21:45 | name | provenance |  |
+| clientSide.js:20:18:20:28 | window.name | clientSide.js:20:11:20:14 | name | provenance |  |
 | clientSide.js:21:42:21:45 | name | clientSide.js:21:13:21:53 | 'https: ... + '/id' | provenance |  |
 nodes
-| clientSide.js:11:11:11:53 | query | semmle.label | query |
+| clientSide.js:11:11:11:15 | query | semmle.label | query |
 | clientSide.js:11:19:11:40 | window. ... .search | semmle.label | window. ... .search |
 | clientSide.js:11:19:11:53 | window. ... ring(1) | semmle.label | window. ... ring(1) |
 | clientSide.js:12:13:12:54 | 'https: ... + '/id' | semmle.label | 'https: ... + '/id' |
 | clientSide.js:12:42:12:46 | query | semmle.label | query |
 | clientSide.js:14:13:14:63 | 'https: ... .search | semmle.label | 'https: ... .search |
 | clientSide.js:14:42:14:63 | window. ... .search | semmle.label | window. ... .search |
-| clientSide.js:16:11:16:54 | fragment | semmle.label | fragment |
+| clientSide.js:16:11:16:18 | fragment | semmle.label | fragment |
 | clientSide.js:16:22:16:41 | window.location.hash | semmle.label | window.location.hash |
 | clientSide.js:16:22:16:54 | window. ... ring(1) | semmle.label | window. ... ring(1) |
 | clientSide.js:17:13:17:57 | 'https: ... + '/id' | semmle.label | 'https: ... + '/id' |
 | clientSide.js:17:42:17:49 | fragment | semmle.label | fragment |
-| clientSide.js:20:11:20:28 | name | semmle.label | name |
+| clientSide.js:20:11:20:14 | name | semmle.label | name |
 | clientSide.js:20:18:20:28 | window.name | semmle.label | window.name |
 | clientSide.js:21:13:21:53 | 'https: ... + '/id' | semmle.label | 'https: ... + '/id' |
 | clientSide.js:21:42:21:45 | name | semmle.label | name |
diff --git a/javascript/ql/test/query-tests/Security/CWE-918/RequestForgery.expected b/javascript/ql/test/query-tests/Security/CWE-918/RequestForgery.expected
index f7ff324b401..a91a6348dfa 100644
--- a/javascript/ql/test/query-tests/Security/CWE-918/RequestForgery.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-918/RequestForgery.expected
@@ -40,58 +40,58 @@
 | serverSide.js:145:3:145:23 | axios.g ... dedUrl) | serverSide.js:139:17:139:29 | req.query.url | serverSide.js:145:13:145:22 | encodedUrl | The $@ of this request depends on a $@. | serverSide.js:145:13:145:22 | encodedUrl | URL | serverSide.js:139:17:139:29 | req.query.url | user-provided value |
 | serverSide.js:147:3:147:23 | axios.g ... pedUrl) | serverSide.js:139:17:139:29 | req.query.url | serverSide.js:147:13:147:22 | escapedUrl | The $@ of this request depends on a $@. | serverSide.js:147:13:147:22 | escapedUrl | URL | serverSide.js:139:17:139:29 | req.query.url | user-provided value |
 edges
-| Request/app/api/proxy/route2.serverSide.ts:4:9:4:15 | { url } | Request/app/api/proxy/route2.serverSide.ts:4:9:4:34 | url | provenance |  |
-| Request/app/api/proxy/route2.serverSide.ts:4:9:4:34 | url | Request/app/api/proxy/route2.serverSide.ts:5:27:5:29 | url | provenance |  |
+| Request/app/api/proxy/route2.serverSide.ts:4:9:4:15 | { url } | Request/app/api/proxy/route2.serverSide.ts:4:11:4:13 | url | provenance |  |
+| Request/app/api/proxy/route2.serverSide.ts:4:11:4:13 | url | Request/app/api/proxy/route2.serverSide.ts:5:27:5:29 | url | provenance |  |
 | Request/app/api/proxy/route2.serverSide.ts:4:19:4:34 | await req.json() | Request/app/api/proxy/route2.serverSide.ts:4:9:4:15 | { url } | provenance |  |
 | Request/app/api/proxy/route2.serverSide.ts:4:25:4:34 | req.json() | Request/app/api/proxy/route2.serverSide.ts:4:19:4:34 | await req.json() | provenance |  |
-| Request/app/api/proxy/route.serverSide.ts:2:9:2:15 | { url } | Request/app/api/proxy/route.serverSide.ts:2:9:2:34 | url | provenance |  |
-| Request/app/api/proxy/route.serverSide.ts:2:9:2:34 | url | Request/app/api/proxy/route.serverSide.ts:3:27:3:29 | url | provenance |  |
+| Request/app/api/proxy/route.serverSide.ts:2:9:2:15 | { url } | Request/app/api/proxy/route.serverSide.ts:2:11:2:13 | url | provenance |  |
+| Request/app/api/proxy/route.serverSide.ts:2:11:2:13 | url | Request/app/api/proxy/route.serverSide.ts:3:27:3:29 | url | provenance |  |
 | Request/app/api/proxy/route.serverSide.ts:2:19:2:34 | await req.json() | Request/app/api/proxy/route.serverSide.ts:2:9:2:15 | { url } | provenance |  |
 | Request/app/api/proxy/route.serverSide.ts:2:25:2:34 | req.json() | Request/app/api/proxy/route.serverSide.ts:2:19:2:34 | await req.json() | provenance |  |
-| Request/middleware.ts:4:11:4:30 | target | Request/middleware.ts:7:31:7:36 | target | provenance |  |
-| Request/middleware.ts:4:20:4:30 | req.nextUrl | Request/middleware.ts:4:11:4:30 | target | provenance |  |
-| Request/middleware.ts:5:11:5:53 | target2 | Request/middleware.ts:12:33:12:39 | target2 | provenance |  |
-| Request/middleware.ts:5:21:5:53 | target. ... arget') | Request/middleware.ts:5:11:5:53 | target2 | provenance |  |
-| apollo.serverSide.ts:7:36:7:44 | files | apollo.serverSide.ts:8:13:8:17 | files | provenance |  |
-| apollo.serverSide.ts:7:36:7:44 | { files } | apollo.serverSide.ts:7:36:7:44 | files | provenance |  |
+| Request/middleware.ts:4:11:4:16 | target | Request/middleware.ts:7:31:7:36 | target | provenance |  |
+| Request/middleware.ts:4:20:4:30 | req.nextUrl | Request/middleware.ts:4:11:4:16 | target | provenance |  |
+| Request/middleware.ts:5:11:5:17 | target2 | Request/middleware.ts:12:33:12:39 | target2 | provenance |  |
+| Request/middleware.ts:5:21:5:53 | target. ... arget') | Request/middleware.ts:5:11:5:17 | target2 | provenance |  |
+| apollo.serverSide.ts:7:36:7:44 | { files } | apollo.serverSide.ts:7:38:7:42 | files | provenance |  |
+| apollo.serverSide.ts:7:38:7:42 | files | apollo.serverSide.ts:8:13:8:17 | files | provenance |  |
 | apollo.serverSide.ts:8:13:8:17 | files | apollo.serverSide.ts:8:28:8:31 | file | provenance |  |
 | apollo.serverSide.ts:8:28:8:31 | file | apollo.serverSide.ts:8:43:8:46 | file | provenance |  |
 | apollo.serverSide.ts:8:43:8:46 | file | apollo.serverSide.ts:8:43:8:50 | file.url | provenance |  |
-| apollo.serverSide.ts:17:34:17:42 | files | apollo.serverSide.ts:18:11:18:15 | files | provenance |  |
-| apollo.serverSide.ts:17:34:17:42 | { files } | apollo.serverSide.ts:17:34:17:42 | files | provenance |  |
+| apollo.serverSide.ts:17:34:17:42 | { files } | apollo.serverSide.ts:17:36:17:40 | files | provenance |  |
+| apollo.serverSide.ts:17:36:17:40 | files | apollo.serverSide.ts:18:11:18:15 | files | provenance |  |
 | apollo.serverSide.ts:18:11:18:15 | files | apollo.serverSide.ts:18:26:18:29 | file | provenance |  |
 | apollo.serverSide.ts:18:26:18:29 | file | apollo.serverSide.ts:18:41:18:44 | file | provenance |  |
 | apollo.serverSide.ts:18:41:18:44 | file | apollo.serverSide.ts:18:41:18:48 | file.url | provenance |  |
-| axiosInterceptors.serverSide.js:19:11:19:17 | { url } | axiosInterceptors.serverSide.js:19:11:19:28 | url | provenance |  |
-| axiosInterceptors.serverSide.js:19:11:19:28 | url | axiosInterceptors.serverSide.js:20:23:20:25 | url | provenance |  |
+| axiosInterceptors.serverSide.js:19:11:19:17 | { url } | axiosInterceptors.serverSide.js:19:13:19:15 | url | provenance |  |
+| axiosInterceptors.serverSide.js:19:13:19:15 | url | axiosInterceptors.serverSide.js:20:23:20:25 | url | provenance |  |
 | axiosInterceptors.serverSide.js:19:21:19:28 | req.body | axiosInterceptors.serverSide.js:19:11:19:17 | { url } | provenance |  |
-| axiosInterceptors.serverSide.js:20:5:20:25 | userProvidedUrl | axiosInterceptors.serverSide.js:11:26:11:40 | userProvidedUrl | provenance |  |
-| axiosInterceptors.serverSide.js:20:23:20:25 | url | axiosInterceptors.serverSide.js:20:5:20:25 | userProvidedUrl | provenance |  |
+| axiosInterceptors.serverSide.js:20:5:20:19 | userProvidedUrl | axiosInterceptors.serverSide.js:11:26:11:40 | userProvidedUrl | provenance |  |
+| axiosInterceptors.serverSide.js:20:23:20:25 | url | axiosInterceptors.serverSide.js:20:5:20:19 | userProvidedUrl | provenance |  |
 | serverSide2.js:9:34:9:63 | qs.pars ... .query) | serverSide2.js:19:24:19:51 | req.par ... rsedUrl | provenance |  |
 | serverSide2.js:9:43:9:56 | req._parsedUrl | serverSide2.js:9:34:9:63 | qs.pars ... .query) | provenance |  |
 | serverSide2.js:10:25:10:31 | req.url | serverSide2.js:16:23:16:41 | req.parsedQuery.url | provenance |  |
 | serverSide2.js:11:24:11:30 | req.url | serverSide2.js:25:24:25:41 | req.SomeObject.url | provenance |  |
-| serverSide2.js:16:11:16:41 | targetUrl | serverSide2.js:17:38:17:46 | targetUrl | provenance |  |
-| serverSide2.js:16:23:16:41 | req.parsedQuery.url | serverSide2.js:16:11:16:41 | targetUrl | provenance |  |
-| serverSide2.js:19:11:19:55 | targetUrl1 | serverSide2.js:20:39:20:48 | targetUrl1 | provenance |  |
-| serverSide2.js:19:24:19:51 | req.par ... rsedUrl | serverSide2.js:19:11:19:55 | targetUrl1 | provenance |  |
-| serverSide2.js:22:11:22:36 | targetUrl2 | serverSide2.js:23:39:23:48 | targetUrl2 | provenance |  |
-| serverSide2.js:22:24:22:30 | req.url | serverSide2.js:22:11:22:36 | targetUrl2 | provenance |  |
-| serverSide2.js:25:11:25:47 | targetUrl3 | serverSide2.js:26:39:26:48 | targetUrl3 | provenance |  |
-| serverSide2.js:25:24:25:41 | req.SomeObject.url | serverSide2.js:25:11:25:47 | targetUrl3 | provenance |  |
-| serverSide.js:14:9:14:52 | tainted | serverSide.js:18:13:18:19 | tainted | provenance |  |
-| serverSide.js:14:9:14:52 | tainted | serverSide.js:20:17:20:23 | tainted | provenance |  |
-| serverSide.js:14:9:14:52 | tainted | serverSide.js:23:19:23:25 | tainted | provenance |  |
-| serverSide.js:14:9:14:52 | tainted | serverSide.js:26:25:26:31 | tainted | provenance |  |
-| serverSide.js:14:9:14:52 | tainted | serverSide.js:28:36:28:42 | tainted | provenance |  |
-| serverSide.js:14:9:14:52 | tainted | serverSide.js:30:37:30:43 | tainted | provenance |  |
-| serverSide.js:14:9:14:52 | tainted | serverSide.js:34:34:34:40 | tainted | provenance |  |
-| serverSide.js:14:9:14:52 | tainted | serverSide.js:36:24:36:30 | tainted | provenance |  |
-| serverSide.js:14:9:14:52 | tainted | serverSide.js:37:30:37:36 | tainted | provenance |  |
-| serverSide.js:14:9:14:52 | tainted | serverSide.js:41:43:41:49 | tainted | provenance |  |
-| serverSide.js:14:9:14:52 | tainted | serverSide.js:43:46:43:52 | tainted | provenance |  |
-| serverSide.js:14:9:14:52 | tainted | serverSide.js:45:50:45:56 | tainted | provenance |  |
-| serverSide.js:14:19:14:42 | url.par ... , true) | serverSide.js:14:9:14:52 | tainted | provenance |  |
+| serverSide2.js:16:11:16:19 | targetUrl | serverSide2.js:17:38:17:46 | targetUrl | provenance |  |
+| serverSide2.js:16:23:16:41 | req.parsedQuery.url | serverSide2.js:16:11:16:19 | targetUrl | provenance |  |
+| serverSide2.js:19:11:19:20 | targetUrl1 | serverSide2.js:20:39:20:48 | targetUrl1 | provenance |  |
+| serverSide2.js:19:24:19:51 | req.par ... rsedUrl | serverSide2.js:19:11:19:20 | targetUrl1 | provenance |  |
+| serverSide2.js:22:11:22:20 | targetUrl2 | serverSide2.js:23:39:23:48 | targetUrl2 | provenance |  |
+| serverSide2.js:22:24:22:30 | req.url | serverSide2.js:22:11:22:20 | targetUrl2 | provenance |  |
+| serverSide2.js:25:11:25:20 | targetUrl3 | serverSide2.js:26:39:26:48 | targetUrl3 | provenance |  |
+| serverSide2.js:25:24:25:41 | req.SomeObject.url | serverSide2.js:25:11:25:20 | targetUrl3 | provenance |  |
+| serverSide.js:14:9:14:15 | tainted | serverSide.js:18:13:18:19 | tainted | provenance |  |
+| serverSide.js:14:9:14:15 | tainted | serverSide.js:20:17:20:23 | tainted | provenance |  |
+| serverSide.js:14:9:14:15 | tainted | serverSide.js:23:19:23:25 | tainted | provenance |  |
+| serverSide.js:14:9:14:15 | tainted | serverSide.js:26:25:26:31 | tainted | provenance |  |
+| serverSide.js:14:9:14:15 | tainted | serverSide.js:28:36:28:42 | tainted | provenance |  |
+| serverSide.js:14:9:14:15 | tainted | serverSide.js:30:37:30:43 | tainted | provenance |  |
+| serverSide.js:14:9:14:15 | tainted | serverSide.js:34:34:34:40 | tainted | provenance |  |
+| serverSide.js:14:9:14:15 | tainted | serverSide.js:36:24:36:30 | tainted | provenance |  |
+| serverSide.js:14:9:14:15 | tainted | serverSide.js:37:30:37:36 | tainted | provenance |  |
+| serverSide.js:14:9:14:15 | tainted | serverSide.js:41:43:41:49 | tainted | provenance |  |
+| serverSide.js:14:9:14:15 | tainted | serverSide.js:43:46:43:52 | tainted | provenance |  |
+| serverSide.js:14:9:14:15 | tainted | serverSide.js:45:50:45:56 | tainted | provenance |  |
+| serverSide.js:14:19:14:42 | url.par ... , true) | serverSide.js:14:9:14:15 | tainted | provenance |  |
 | serverSide.js:14:29:14:35 | req.url | serverSide.js:14:19:14:42 | url.par ... , true) | provenance |  |
 | serverSide.js:26:25:26:31 | tainted | serverSide.js:26:13:26:31 | "http://" + tainted | provenance |  |
 | serverSide.js:28:36:28:42 | tainted | serverSide.js:28:13:28:42 | "http:/ ... tainted | provenance |  |
@@ -101,101 +101,101 @@ edges
 | serverSide.js:41:43:41:49 | tainted | serverSide.js:41:13:41:51 | `http:/ ... inted}` | provenance |  |
 | serverSide.js:43:46:43:52 | tainted | serverSide.js:43:13:43:54 | `http:/ ... inted}` | provenance |  |
 | serverSide.js:45:50:45:56 | tainted | serverSide.js:45:13:45:56 | 'http:/ ... tainted | provenance |  |
-| serverSide.js:58:9:58:52 | tainted | serverSide.js:61:29:61:35 | tainted | provenance |  |
-| serverSide.js:58:9:58:52 | tainted | serverSide.js:61:29:61:35 | tainted | provenance |  |
-| serverSide.js:58:19:58:42 | url.par ... , true) | serverSide.js:58:9:58:52 | tainted | provenance |  |
+| serverSide.js:58:9:58:15 | tainted | serverSide.js:61:29:61:35 | tainted | provenance |  |
+| serverSide.js:58:9:58:15 | tainted | serverSide.js:61:29:61:35 | tainted | provenance |  |
+| serverSide.js:58:19:58:42 | url.par ... , true) | serverSide.js:58:9:58:15 | tainted | provenance |  |
 | serverSide.js:58:29:58:35 | req.url | serverSide.js:58:19:58:42 | url.par ... , true) | provenance |  |
 | serverSide.js:61:29:61:35 | tainted | serverSide.js:64:30:64:36 | tainted | provenance |  |
 | serverSide.js:61:29:61:35 | tainted | serverSide.js:68:30:68:36 | tainted | provenance |  |
-| serverSide.js:74:9:74:52 | tainted | serverSide.js:76:19:76:25 | tainted | provenance |  |
-| serverSide.js:74:19:74:42 | url.par ... , true) | serverSide.js:74:9:74:52 | tainted | provenance |  |
+| serverSide.js:74:9:74:15 | tainted | serverSide.js:76:19:76:25 | tainted | provenance |  |
+| serverSide.js:74:19:74:42 | url.par ... , true) | serverSide.js:74:9:74:15 | tainted | provenance |  |
 | serverSide.js:74:29:74:35 | req.url | serverSide.js:74:19:74:42 | url.par ... , true) | provenance |  |
 | serverSide.js:83:38:83:43 | param1 | serverSide.js:84:19:84:24 | param1 | provenance |  |
 | serverSide.js:90:19:90:28 | ctx.params | serverSide.js:90:19:90:32 | ctx.params.foo | provenance |  |
 | serverSide.js:92:19:92:28 | ctx.params | serverSide.js:92:19:92:32 | ctx.params.foo | provenance |  |
-| serverSide.js:98:9:98:52 | tainted | serverSide.js:100:19:100:25 | tainted | provenance |  |
-| serverSide.js:98:19:98:42 | url.par ... , true) | serverSide.js:98:9:98:52 | tainted | provenance |  |
+| serverSide.js:98:9:98:15 | tainted | serverSide.js:100:19:100:25 | tainted | provenance |  |
+| serverSide.js:98:19:98:42 | url.par ... , true) | serverSide.js:98:9:98:15 | tainted | provenance |  |
 | serverSide.js:98:29:98:35 | req.url | serverSide.js:98:19:98:42 | url.par ... , true) | provenance |  |
-| serverSide.js:108:11:108:27 | url | serverSide.js:109:27:109:29 | url | provenance |  |
-| serverSide.js:108:17:108:27 | request.url | serverSide.js:108:11:108:27 | url | provenance |  |
-| serverSide.js:115:11:115:42 | url | serverSide.js:117:27:117:29 | url | provenance |  |
-| serverSide.js:115:17:115:42 | new URL ... , base) | serverSide.js:115:11:115:42 | url | provenance |  |
+| serverSide.js:108:11:108:13 | url | serverSide.js:109:27:109:29 | url | provenance |  |
+| serverSide.js:108:17:108:27 | request.url | serverSide.js:108:11:108:13 | url | provenance |  |
+| serverSide.js:115:11:115:13 | url | serverSide.js:117:27:117:29 | url | provenance |  |
+| serverSide.js:115:17:115:42 | new URL ... , base) | serverSide.js:115:11:115:13 | url | provenance |  |
 | serverSide.js:115:25:115:35 | request.url | serverSide.js:115:17:115:42 | new URL ... , base) | provenance | Config |
-| serverSide.js:123:9:123:52 | tainted | serverSide.js:127:14:127:20 | tainted | provenance |  |
-| serverSide.js:123:9:123:52 | tainted | serverSide.js:130:37:130:43 | tainted | provenance |  |
-| serverSide.js:123:19:123:42 | url.par ... , true) | serverSide.js:123:9:123:52 | tainted | provenance |  |
+| serverSide.js:123:9:123:15 | tainted | serverSide.js:127:14:127:20 | tainted | provenance |  |
+| serverSide.js:123:9:123:15 | tainted | serverSide.js:130:37:130:43 | tainted | provenance |  |
+| serverSide.js:123:19:123:42 | url.par ... , true) | serverSide.js:123:9:123:15 | tainted | provenance |  |
 | serverSide.js:123:29:123:35 | req.url | serverSide.js:123:19:123:42 | url.par ... , true) | provenance |  |
-| serverSide.js:130:9:130:45 | myUrl | serverSide.js:131:15:131:19 | myUrl | provenance |  |
-| serverSide.js:130:37:130:43 | tainted | serverSide.js:130:9:130:45 | myUrl | provenance |  |
-| serverSide.js:139:9:139:29 | input | serverSide.js:140:26:140:30 | input | provenance |  |
-| serverSide.js:139:9:139:29 | input | serverSide.js:144:32:144:36 | input | provenance |  |
-| serverSide.js:139:9:139:29 | input | serverSide.js:146:29:146:33 | input | provenance |  |
-| serverSide.js:139:17:139:29 | req.query.url | serverSide.js:139:9:139:29 | input | provenance |  |
-| serverSide.js:140:9:140:31 | target | serverSide.js:141:13:141:18 | target | provenance |  |
-| serverSide.js:140:9:140:31 | target | serverSide.js:142:13:142:18 | target | provenance |  |
-| serverSide.js:140:9:140:31 | target | serverSide.js:143:13:143:18 | target | provenance |  |
-| serverSide.js:140:18:140:31 | new URL(input) | serverSide.js:140:9:140:31 | target | provenance |  |
+| serverSide.js:130:9:130:13 | myUrl | serverSide.js:131:15:131:19 | myUrl | provenance |  |
+| serverSide.js:130:37:130:43 | tainted | serverSide.js:130:9:130:13 | myUrl | provenance |  |
+| serverSide.js:139:9:139:13 | input | serverSide.js:140:26:140:30 | input | provenance |  |
+| serverSide.js:139:9:139:13 | input | serverSide.js:144:32:144:36 | input | provenance |  |
+| serverSide.js:139:9:139:13 | input | serverSide.js:146:29:146:33 | input | provenance |  |
+| serverSide.js:139:17:139:29 | req.query.url | serverSide.js:139:9:139:13 | input | provenance |  |
+| serverSide.js:140:9:140:14 | target | serverSide.js:141:13:141:18 | target | provenance |  |
+| serverSide.js:140:9:140:14 | target | serverSide.js:142:13:142:18 | target | provenance |  |
+| serverSide.js:140:9:140:14 | target | serverSide.js:143:13:143:18 | target | provenance |  |
+| serverSide.js:140:18:140:31 | new URL(input) | serverSide.js:140:9:140:14 | target | provenance |  |
 | serverSide.js:140:26:140:30 | input | serverSide.js:140:18:140:31 | new URL(input) | provenance | Config |
 | serverSide.js:141:13:141:18 | target | serverSide.js:141:13:141:29 | target.toString() | provenance |  |
 | serverSide.js:143:13:143:18 | target | serverSide.js:143:13:143:23 | target.href | provenance |  |
-| serverSide.js:144:9:144:37 | encodedUrl | serverSide.js:145:13:145:22 | encodedUrl | provenance |  |
-| serverSide.js:144:22:144:37 | encodeURI(input) | serverSide.js:144:9:144:37 | encodedUrl | provenance |  |
+| serverSide.js:144:9:144:18 | encodedUrl | serverSide.js:145:13:145:22 | encodedUrl | provenance |  |
+| serverSide.js:144:22:144:37 | encodeURI(input) | serverSide.js:144:9:144:18 | encodedUrl | provenance |  |
 | serverSide.js:144:32:144:36 | input | serverSide.js:144:22:144:37 | encodeURI(input) | provenance |  |
-| serverSide.js:146:9:146:34 | escapedUrl | serverSide.js:147:13:147:22 | escapedUrl | provenance |  |
-| serverSide.js:146:22:146:34 | escape(input) | serverSide.js:146:9:146:34 | escapedUrl | provenance |  |
+| serverSide.js:146:9:146:18 | escapedUrl | serverSide.js:147:13:147:22 | escapedUrl | provenance |  |
+| serverSide.js:146:22:146:34 | escape(input) | serverSide.js:146:9:146:18 | escapedUrl | provenance |  |
 | serverSide.js:146:29:146:33 | input | serverSide.js:146:22:146:34 | escape(input) | provenance |  |
 nodes
 | Request/app/api/proxy/route2.serverSide.ts:4:9:4:15 | { url } | semmle.label | { url } |
-| Request/app/api/proxy/route2.serverSide.ts:4:9:4:34 | url | semmle.label | url |
+| Request/app/api/proxy/route2.serverSide.ts:4:11:4:13 | url | semmle.label | url |
 | Request/app/api/proxy/route2.serverSide.ts:4:19:4:34 | await req.json() | semmle.label | await req.json() |
 | Request/app/api/proxy/route2.serverSide.ts:4:25:4:34 | req.json() | semmle.label | req.json() |
 | Request/app/api/proxy/route2.serverSide.ts:5:27:5:29 | url | semmle.label | url |
 | Request/app/api/proxy/route.serverSide.ts:2:9:2:15 | { url } | semmle.label | { url } |
-| Request/app/api/proxy/route.serverSide.ts:2:9:2:34 | url | semmle.label | url |
+| Request/app/api/proxy/route.serverSide.ts:2:11:2:13 | url | semmle.label | url |
 | Request/app/api/proxy/route.serverSide.ts:2:19:2:34 | await req.json() | semmle.label | await req.json() |
 | Request/app/api/proxy/route.serverSide.ts:2:25:2:34 | req.json() | semmle.label | req.json() |
 | Request/app/api/proxy/route.serverSide.ts:3:27:3:29 | url | semmle.label | url |
-| Request/middleware.ts:4:11:4:30 | target | semmle.label | target |
+| Request/middleware.ts:4:11:4:16 | target | semmle.label | target |
 | Request/middleware.ts:4:20:4:30 | req.nextUrl | semmle.label | req.nextUrl |
-| Request/middleware.ts:5:11:5:53 | target2 | semmle.label | target2 |
+| Request/middleware.ts:5:11:5:17 | target2 | semmle.label | target2 |
 | Request/middleware.ts:5:21:5:53 | target. ... arget') | semmle.label | target. ... arget') |
 | Request/middleware.ts:7:31:7:36 | target | semmle.label | target |
 | Request/middleware.ts:12:33:12:39 | target2 | semmle.label | target2 |
-| apollo.serverSide.ts:7:36:7:44 | files | semmle.label | files |
 | apollo.serverSide.ts:7:36:7:44 | { files } | semmle.label | { files } |
+| apollo.serverSide.ts:7:38:7:42 | files | semmle.label | files |
 | apollo.serverSide.ts:8:13:8:17 | files | semmle.label | files |
 | apollo.serverSide.ts:8:28:8:31 | file | semmle.label | file |
 | apollo.serverSide.ts:8:43:8:46 | file | semmle.label | file |
 | apollo.serverSide.ts:8:43:8:50 | file.url | semmle.label | file.url |
-| apollo.serverSide.ts:17:34:17:42 | files | semmle.label | files |
 | apollo.serverSide.ts:17:34:17:42 | { files } | semmle.label | { files } |
+| apollo.serverSide.ts:17:36:17:40 | files | semmle.label | files |
 | apollo.serverSide.ts:18:11:18:15 | files | semmle.label | files |
 | apollo.serverSide.ts:18:26:18:29 | file | semmle.label | file |
 | apollo.serverSide.ts:18:41:18:44 | file | semmle.label | file |
 | apollo.serverSide.ts:18:41:18:48 | file.url | semmle.label | file.url |
 | axiosInterceptors.serverSide.js:11:26:11:40 | userProvidedUrl | semmle.label | userProvidedUrl |
 | axiosInterceptors.serverSide.js:19:11:19:17 | { url } | semmle.label | { url } |
-| axiosInterceptors.serverSide.js:19:11:19:28 | url | semmle.label | url |
+| axiosInterceptors.serverSide.js:19:13:19:15 | url | semmle.label | url |
 | axiosInterceptors.serverSide.js:19:21:19:28 | req.body | semmle.label | req.body |
-| axiosInterceptors.serverSide.js:20:5:20:25 | userProvidedUrl | semmle.label | userProvidedUrl |
+| axiosInterceptors.serverSide.js:20:5:20:19 | userProvidedUrl | semmle.label | userProvidedUrl |
 | axiosInterceptors.serverSide.js:20:23:20:25 | url | semmle.label | url |
 | serverSide2.js:9:34:9:63 | qs.pars ... .query) | semmle.label | qs.pars ... .query) |
 | serverSide2.js:9:43:9:56 | req._parsedUrl | semmle.label | req._parsedUrl |
 | serverSide2.js:10:25:10:31 | req.url | semmle.label | req.url |
 | serverSide2.js:11:24:11:30 | req.url | semmle.label | req.url |
-| serverSide2.js:16:11:16:41 | targetUrl | semmle.label | targetUrl |
+| serverSide2.js:16:11:16:19 | targetUrl | semmle.label | targetUrl |
 | serverSide2.js:16:23:16:41 | req.parsedQuery.url | semmle.label | req.parsedQuery.url |
 | serverSide2.js:17:38:17:46 | targetUrl | semmle.label | targetUrl |
-| serverSide2.js:19:11:19:55 | targetUrl1 | semmle.label | targetUrl1 |
+| serverSide2.js:19:11:19:20 | targetUrl1 | semmle.label | targetUrl1 |
 | serverSide2.js:19:24:19:51 | req.par ... rsedUrl | semmle.label | req.par ... rsedUrl |
 | serverSide2.js:20:39:20:48 | targetUrl1 | semmle.label | targetUrl1 |
-| serverSide2.js:22:11:22:36 | targetUrl2 | semmle.label | targetUrl2 |
+| serverSide2.js:22:11:22:20 | targetUrl2 | semmle.label | targetUrl2 |
 | serverSide2.js:22:24:22:30 | req.url | semmle.label | req.url |
 | serverSide2.js:23:39:23:48 | targetUrl2 | semmle.label | targetUrl2 |
-| serverSide2.js:25:11:25:47 | targetUrl3 | semmle.label | targetUrl3 |
+| serverSide2.js:25:11:25:20 | targetUrl3 | semmle.label | targetUrl3 |
 | serverSide2.js:25:24:25:41 | req.SomeObject.url | semmle.label | req.SomeObject.url |
 | serverSide2.js:26:39:26:48 | targetUrl3 | semmle.label | targetUrl3 |
-| serverSide.js:14:9:14:52 | tainted | semmle.label | tainted |
+| serverSide.js:14:9:14:15 | tainted | semmle.label | tainted |
 | serverSide.js:14:19:14:42 | url.par ... , true) | semmle.label | url.par ... , true) |
 | serverSide.js:14:29:14:35 | req.url | semmle.label | req.url |
 | serverSide.js:18:13:18:19 | tainted | semmle.label | tainted |
@@ -218,14 +218,14 @@ nodes
 | serverSide.js:43:46:43:52 | tainted | semmle.label | tainted |
 | serverSide.js:45:13:45:56 | 'http:/ ... tainted | semmle.label | 'http:/ ... tainted |
 | serverSide.js:45:50:45:56 | tainted | semmle.label | tainted |
-| serverSide.js:58:9:58:52 | tainted | semmle.label | tainted |
+| serverSide.js:58:9:58:15 | tainted | semmle.label | tainted |
 | serverSide.js:58:19:58:42 | url.par ... , true) | semmle.label | url.par ... , true) |
 | serverSide.js:58:29:58:35 | req.url | semmle.label | req.url |
 | serverSide.js:61:29:61:35 | tainted | semmle.label | tainted |
 | serverSide.js:61:29:61:35 | tainted | semmle.label | tainted |
 | serverSide.js:64:30:64:36 | tainted | semmle.label | tainted |
 | serverSide.js:68:30:68:36 | tainted | semmle.label | tainted |
-| serverSide.js:74:9:74:52 | tainted | semmle.label | tainted |
+| serverSide.js:74:9:74:15 | tainted | semmle.label | tainted |
 | serverSide.js:74:19:74:42 | url.par ... , true) | semmle.label | url.par ... , true) |
 | serverSide.js:74:29:74:35 | req.url | semmle.label | req.url |
 | serverSide.js:76:19:76:25 | tainted | semmle.label | tainted |
@@ -235,27 +235,27 @@ nodes
 | serverSide.js:90:19:90:32 | ctx.params.foo | semmle.label | ctx.params.foo |
 | serverSide.js:92:19:92:28 | ctx.params | semmle.label | ctx.params |
 | serverSide.js:92:19:92:32 | ctx.params.foo | semmle.label | ctx.params.foo |
-| serverSide.js:98:9:98:52 | tainted | semmle.label | tainted |
+| serverSide.js:98:9:98:15 | tainted | semmle.label | tainted |
 | serverSide.js:98:19:98:42 | url.par ... , true) | semmle.label | url.par ... , true) |
 | serverSide.js:98:29:98:35 | req.url | semmle.label | req.url |
 | serverSide.js:100:19:100:25 | tainted | semmle.label | tainted |
-| serverSide.js:108:11:108:27 | url | semmle.label | url |
+| serverSide.js:108:11:108:13 | url | semmle.label | url |
 | serverSide.js:108:17:108:27 | request.url | semmle.label | request.url |
 | serverSide.js:109:27:109:29 | url | semmle.label | url |
-| serverSide.js:115:11:115:42 | url | semmle.label | url |
+| serverSide.js:115:11:115:13 | url | semmle.label | url |
 | serverSide.js:115:17:115:42 | new URL ... , base) | semmle.label | new URL ... , base) |
 | serverSide.js:115:25:115:35 | request.url | semmle.label | request.url |
 | serverSide.js:117:27:117:29 | url | semmle.label | url |
-| serverSide.js:123:9:123:52 | tainted | semmle.label | tainted |
+| serverSide.js:123:9:123:15 | tainted | semmle.label | tainted |
 | serverSide.js:123:19:123:42 | url.par ... , true) | semmle.label | url.par ... , true) |
 | serverSide.js:123:29:123:35 | req.url | semmle.label | req.url |
 | serverSide.js:127:14:127:20 | tainted | semmle.label | tainted |
-| serverSide.js:130:9:130:45 | myUrl | semmle.label | myUrl |
+| serverSide.js:130:9:130:13 | myUrl | semmle.label | myUrl |
 | serverSide.js:130:37:130:43 | tainted | semmle.label | tainted |
 | serverSide.js:131:15:131:19 | myUrl | semmle.label | myUrl |
-| serverSide.js:139:9:139:29 | input | semmle.label | input |
+| serverSide.js:139:9:139:13 | input | semmle.label | input |
 | serverSide.js:139:17:139:29 | req.query.url | semmle.label | req.query.url |
-| serverSide.js:140:9:140:31 | target | semmle.label | target |
+| serverSide.js:140:9:140:14 | target | semmle.label | target |
 | serverSide.js:140:18:140:31 | new URL(input) | semmle.label | new URL(input) |
 | serverSide.js:140:26:140:30 | input | semmle.label | input |
 | serverSide.js:141:13:141:18 | target | semmle.label | target |
@@ -263,11 +263,11 @@ nodes
 | serverSide.js:142:13:142:18 | target | semmle.label | target |
 | serverSide.js:143:13:143:18 | target | semmle.label | target |
 | serverSide.js:143:13:143:23 | target.href | semmle.label | target.href |
-| serverSide.js:144:9:144:37 | encodedUrl | semmle.label | encodedUrl |
+| serverSide.js:144:9:144:18 | encodedUrl | semmle.label | encodedUrl |
 | serverSide.js:144:22:144:37 | encodeURI(input) | semmle.label | encodeURI(input) |
 | serverSide.js:144:32:144:36 | input | semmle.label | input |
 | serverSide.js:145:13:145:22 | encodedUrl | semmle.label | encodedUrl |
-| serverSide.js:146:9:146:34 | escapedUrl | semmle.label | escapedUrl |
+| serverSide.js:146:9:146:18 | escapedUrl | semmle.label | escapedUrl |
 | serverSide.js:146:22:146:34 | escape(input) | semmle.label | escape(input) |
 | serverSide.js:146:29:146:33 | input | semmle.label | input |
 | serverSide.js:147:13:147:22 | escapedUrl | semmle.label | escapedUrl |
diff --git a/javascript/ql/test/query-tests/Security/CWE-942/CorsPermissiveConfiguration.expected b/javascript/ql/test/query-tests/Security/CWE-942/CorsPermissiveConfiguration.expected
new file mode 100644
index 00000000000..2e59a7a8bd1
--- /dev/null
+++ b/javascript/ql/test/query-tests/Security/CWE-942/CorsPermissiveConfiguration.expected
@@ -0,0 +1,44 @@
+#select
+| apollo-test.js:11:25:11:28 | true | apollo-test.js:11:25:11:28 | true | apollo-test.js:11:25:11:28 | true | CORS Origin allows broad access due to $@. | apollo-test.js:11:25:11:28 | true | permissive or user controlled value |
+| apollo-test.js:21:25:21:28 | null | apollo-test.js:21:25:21:28 | null | apollo-test.js:21:25:21:28 | null | CORS Origin allows broad access due to $@. | apollo-test.js:21:25:21:28 | null | permissive or user controlled value |
+| apollo-test.js:26:25:26:35 | user_origin | apollo-test.js:8:33:8:39 | req.url | apollo-test.js:26:25:26:35 | user_origin | CORS Origin allows broad access due to $@. | apollo-test.js:8:33:8:39 | req.url | permissive or user controlled value |
+| apollo-test.js:26:25:26:35 | user_origin | apollo-test.js:8:42:8:45 | true | apollo-test.js:26:25:26:35 | user_origin | CORS Origin allows broad access due to $@. | apollo-test.js:8:42:8:45 | true | permissive or user controlled value |
+| express-test.js:26:17:26:19 | '*' | express-test.js:26:17:26:19 | '*' | express-test.js:26:17:26:19 | '*' | CORS Origin allows broad access due to $@. | express-test.js:26:17:26:19 | '*' | permissive or user controlled value |
+| express-test.js:33:17:33:27 | user_origin | express-test.js:10:33:10:39 | req.url | express-test.js:33:17:33:27 | user_origin | CORS Origin allows broad access due to $@. | express-test.js:10:33:10:39 | req.url | permissive or user controlled value |
+| express-test.js:33:17:33:27 | user_origin | express-test.js:10:42:10:45 | true | express-test.js:33:17:33:27 | user_origin | CORS Origin allows broad access due to $@. | express-test.js:10:42:10:45 | true | permissive or user controlled value |
+| express-test.js:48:17:48:19 | '*' | express-test.js:48:17:48:19 | '*' | express-test.js:48:17:48:19 | '*' | CORS Origin allows broad access due to $@. | express-test.js:48:17:48:19 | '*' | permissive or user controlled value |
+edges
+| apollo-test.js:8:9:8:19 | user_origin | apollo-test.js:26:25:26:35 | user_origin | provenance |  |
+| apollo-test.js:8:9:8:19 | user_origin | apollo-test.js:26:25:26:35 | user_origin | provenance |  |
+| apollo-test.js:8:23:8:46 | url.par ... , true) | apollo-test.js:8:9:8:19 | user_origin | provenance |  |
+| apollo-test.js:8:23:8:46 | url.par ... , true) | apollo-test.js:8:9:8:19 | user_origin | provenance |  |
+| apollo-test.js:8:33:8:39 | req.url | apollo-test.js:8:23:8:46 | url.par ... , true) | provenance |  |
+| apollo-test.js:8:42:8:45 | true | apollo-test.js:8:23:8:46 | url.par ... , true) | provenance |  |
+| express-test.js:10:9:10:19 | user_origin | express-test.js:33:17:33:27 | user_origin | provenance |  |
+| express-test.js:10:9:10:19 | user_origin | express-test.js:33:17:33:27 | user_origin | provenance |  |
+| express-test.js:10:23:10:46 | url.par ... , true) | express-test.js:10:9:10:19 | user_origin | provenance |  |
+| express-test.js:10:23:10:46 | url.par ... , true) | express-test.js:10:9:10:19 | user_origin | provenance |  |
+| express-test.js:10:33:10:39 | req.url | express-test.js:10:23:10:46 | url.par ... , true) | provenance |  |
+| express-test.js:10:42:10:45 | true | express-test.js:10:23:10:46 | url.par ... , true) | provenance |  |
+nodes
+| apollo-test.js:8:9:8:19 | user_origin | semmle.label | user_origin |
+| apollo-test.js:8:9:8:19 | user_origin | semmle.label | user_origin |
+| apollo-test.js:8:23:8:46 | url.par ... , true) | semmle.label | url.par ... , true) |
+| apollo-test.js:8:23:8:46 | url.par ... , true) | semmle.label | url.par ... , true) |
+| apollo-test.js:8:33:8:39 | req.url | semmle.label | req.url |
+| apollo-test.js:8:42:8:45 | true | semmle.label | true |
+| apollo-test.js:11:25:11:28 | true | semmle.label | true |
+| apollo-test.js:21:25:21:28 | null | semmle.label | null |
+| apollo-test.js:26:25:26:35 | user_origin | semmle.label | user_origin |
+| apollo-test.js:26:25:26:35 | user_origin | semmle.label | user_origin |
+| express-test.js:10:9:10:19 | user_origin | semmle.label | user_origin |
+| express-test.js:10:9:10:19 | user_origin | semmle.label | user_origin |
+| express-test.js:10:23:10:46 | url.par ... , true) | semmle.label | url.par ... , true) |
+| express-test.js:10:23:10:46 | url.par ... , true) | semmle.label | url.par ... , true) |
+| express-test.js:10:33:10:39 | req.url | semmle.label | req.url |
+| express-test.js:10:42:10:45 | true | semmle.label | true |
+| express-test.js:26:17:26:19 | '*' | semmle.label | '*' |
+| express-test.js:33:17:33:27 | user_origin | semmle.label | user_origin |
+| express-test.js:33:17:33:27 | user_origin | semmle.label | user_origin |
+| express-test.js:48:17:48:19 | '*' | semmle.label | '*' |
+subpaths
diff --git a/javascript/ql/test/query-tests/Security/CWE-942/CorsPermissiveConfiguration.qlref b/javascript/ql/test/query-tests/Security/CWE-942/CorsPermissiveConfiguration.qlref
new file mode 100644
index 00000000000..b38b30eb842
--- /dev/null
+++ b/javascript/ql/test/query-tests/Security/CWE-942/CorsPermissiveConfiguration.qlref
@@ -0,0 +1,2 @@
+query: Security/CWE-942/CorsPermissiveConfiguration.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/javascript/ql/test/experimental/Security/CWE-942/apollo-test.js b/javascript/ql/test/query-tests/Security/CWE-942/apollo-test.js
similarity index 72%
rename from javascript/ql/test/experimental/Security/CWE-942/apollo-test.js
rename to javascript/ql/test/query-tests/Security/CWE-942/apollo-test.js
index f55d5dc2c3e..22019a72258 100644
--- a/javascript/ql/test/experimental/Security/CWE-942/apollo-test.js
+++ b/javascript/ql/test/query-tests/Security/CWE-942/apollo-test.js
@@ -5,10 +5,10 @@ var https = require('https'),
 var server = https.createServer(function () { });
 
 server.on('request', function (req, res) {
-    let user_origin = url.parse(req.url, true).query.origin;
+    let user_origin = url.parse(req.url, true).query.origin; // $ Source
     // BAD: CORS too permissive
     const server_1 = new ApolloServer({
-        cors: { origin: true }
+        cors: { origin: true } // $ Alert
     });
 
     // GOOD: restrictive CORS 
@@ -18,11 +18,11 @@ server.on('request', function (req, res) {
 
     // BAD: CORS too permissive 
     const server_3 = new ApolloServer({
-        cors: { origin: null }
+        cors: { origin: null } // $ Alert
     });
 
     // BAD: CORS is controlled by user
     const server_4 = new ApolloServer({
-        cors: { origin: user_origin }
+        cors: { origin: user_origin } // $ Alert
     });
 });
\ No newline at end of file
diff --git a/javascript/ql/test/experimental/Security/CWE-942/express-test.js b/javascript/ql/test/query-tests/Security/CWE-942/express-test.js
similarity index 56%
rename from javascript/ql/test/experimental/Security/CWE-942/express-test.js
rename to javascript/ql/test/query-tests/Security/CWE-942/express-test.js
index 3ad31a6a31a..31454e0a4eb 100644
--- a/javascript/ql/test/experimental/Security/CWE-942/express-test.js
+++ b/javascript/ql/test/query-tests/Security/CWE-942/express-test.js
@@ -7,7 +7,7 @@ var https = require('https'),
 var server = https.createServer(function () { });
 
 server.on('request', function (req, res) {
-    let user_origin = url.parse(req.url, true).query.origin;
+    let user_origin = url.parse(req.url, true).query.origin; // $ Source
 
     // BAD: CORS too permissive, default value is *
     var app1 = express();
@@ -23,14 +23,30 @@ server.on('request', function (req, res) {
     // BAD: CORS too permissive 
     var app3 = express();
     var corsOption3 = {
-        origin: '*'
+        origin: '*' // $ Alert
     };
     app3.use(cors(corsOption3));
 
     // BAD: CORS is controlled by user
     var app4 = express();
     var corsOption4 = {
-        origin: user_origin
+        origin: user_origin // $ Alert
     };
     app4.use(cors(corsOption4));
+
+    // GOOD: CORS allows any origin but credentials are disabled (safe pattern)
+    var app5 = express();
+    var corsOption5 = {
+        origin: '*',
+        credentials: false
+    };
+    app5.use(cors(corsOption5));
+
+    // BAD: CORS allows any origin with credentials enabled
+    var app6 = express();
+    var corsOption6 = {
+        origin: '*',       // $ Alert  
+        credentials: true
+    };
+    app6.use(cors(corsOption6));
 });
\ No newline at end of file
diff --git a/javascript/ql/test/tutorials/Analyzing data flow in JavaScript/Local data flow/query1.expected b/javascript/ql/test/tutorials/Analyzing data flow in JavaScript/Local data flow/query1.expected
index 42bfa5e6430..fef71929fdf 100644
--- a/javascript/ql/test/tutorials/Analyzing data flow in JavaScript/Local data flow/query1.expected	
+++ b/javascript/ql/test/tutorials/Analyzing data flow in JavaScript/Local data flow/query1.expected	
@@ -1,3 +1,3 @@
-| test.js:4:5:4:22 | firstArg |
+| test.js:4:5:4:12 | firstArg |
 | test.js:4:16:4:22 | args[2] |
 | test.js:5:13:5:20 | firstArg |
diff --git a/javascript/resources/codeql-extractor.yml b/javascript/resources/codeql-extractor.yml
index b82b2a96581..14ec56e2429 100644
--- a/javascript/resources/codeql-extractor.yml
+++ b/javascript/resources/codeql-extractor.yml
@@ -6,8 +6,11 @@ display_name: "JavaScript/TypeScript"
 version: 1.22.1
 column_kind: "utf16"
 unicode_newlines: true
+overlay_support_version: 20250626
 build_modes:
   - none
+default_queries:
+  - codeql/javascript-queries
 file_coverage_languages:
   - name: javascript
     display_name: JavaScript
diff --git a/misc/bazel/3rdparty/BUILD.bazel b/misc/bazel/3rdparty/BUILD.bazel
index 4e12f92edee..6f5f1f77fef 100644
--- a/misc/bazel/3rdparty/BUILD.bazel
+++ b/misc/bazel/3rdparty/BUILD.bazel
@@ -5,15 +5,7 @@ crates_vendor(
     name = "vendor_tree_sitter_extractors",
     cargo_lockfile = "//:Cargo.lock",
     generate_build_scripts = True,
-    manifests = [
-        "//:Cargo.toml",
-        "//ruby/extractor:Cargo.toml",
-        "//rust/extractor:Cargo.toml",
-        "//rust/extractor/macros:Cargo.toml",
-        "//rust/ast-generator:Cargo.toml",
-        "//rust/autobuild:Cargo.toml",
-        "//shared/tree-sitter-extractor:Cargo.toml",
-    ],
+    manifests = ["//:Cargo.toml"],
     mode = "remote",
     repository_name = "vendor_ts",
     tags = ["manual"],
@@ -24,10 +16,7 @@ crates_vendor(
     name = "vendor_py_deps",
     cargo_lockfile = "//python/extractor/tsg-python:Cargo.lock",
     generate_build_scripts = True,
-    manifests = [
-        "//python/extractor/tsg-python:Cargo.toml",
-        "//python/extractor/tsg-python/tsp:Cargo.toml",
-    ],
+    manifests = ["//python/extractor/tsg-python:Cargo.toml"],
     mode = "remote",
     repository_name = "vendor_py",
     tags = ["manual"],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.ahash-0.4.8.bazel b/misc/bazel/3rdparty/py_deps/BUILD.ahash-0.4.8.bazel
deleted file mode 100644
index 057a5225197..00000000000
--- a/misc/bazel/3rdparty/py_deps/BUILD.ahash-0.4.8.bazel
+++ /dev/null
@@ -1,92 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "ahash",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=ahash",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.4.8",
-)
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.aho-corasick-1.1.3.bazel b/misc/bazel/3rdparty/py_deps/BUILD.aho-corasick-1.1.3.bazel
index 8c66fc77a56..e8bbd96a1c5 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.aho-corasick-1.1.3.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.aho-corasick-1.1.3.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.anstream-0.6.18.bazel b/misc/bazel/3rdparty/py_deps/BUILD.anstream-0.6.18.bazel
index 19d6745d757..dba6f5a5313 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.anstream-0.6.18.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.anstream-0.6.18.bazel
@@ -75,12 +75,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.anstyle-1.0.10.bazel b/misc/bazel/3rdparty/py_deps/BUILD.anstyle-1.0.10.bazel
index 200bb05804c..a6c3752b60f 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.anstyle-1.0.10.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.anstyle-1.0.10.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.anstyle-parse-0.2.6.bazel b/misc/bazel/3rdparty/py_deps/BUILD.anstyle-parse-0.2.6.bazel
index 1de0f16e9b9..5f8c366ff87 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.anstyle-parse-0.2.6.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.anstyle-parse-0.2.6.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.anstyle-query-1.1.2.bazel b/misc/bazel/3rdparty/py_deps/BUILD.anstyle-query-1.1.2.bazel
index f785c8416a1..598ea5da3af 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.anstyle-query-1.1.2.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.anstyle-query-1.1.2.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.anstyle-wincon-3.0.7.bazel b/misc/bazel/3rdparty/py_deps/BUILD.anstyle-wincon-3.0.7.bazel
index 384ace979ac..ce4d5dc8abd 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.anstyle-wincon-3.0.7.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.anstyle-wincon-3.0.7.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.anyhow-1.0.95.bazel b/misc/bazel/3rdparty/py_deps/BUILD.anyhow-1.0.95.bazel
index 9a3ea416d14..34ea952cd26 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.anyhow-1.0.95.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.anyhow-1.0.95.bazel
@@ -78,12 +78,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.bazel b/misc/bazel/3rdparty/py_deps/BUILD.bazel
index f756b4a519f..86bfde26641 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.bazel
@@ -80,26 +80,26 @@ alias(
 )
 
 alias(
-    name = "tree-sitter-0.20.4",
-    actual = "@vendor_py__tree-sitter-0.20.4//:tree_sitter",
+    name = "tree-sitter-0.24.7",
+    actual = "@vendor_py__tree-sitter-0.24.7//:tree_sitter",
     tags = ["manual"],
 )
 
 alias(
     name = "tree-sitter",
-    actual = "@vendor_py__tree-sitter-0.20.4//:tree_sitter",
+    actual = "@vendor_py__tree-sitter-0.24.7//:tree_sitter",
     tags = ["manual"],
 )
 
 alias(
-    name = "tree-sitter-graph-0.7.0",
-    actual = "@vendor_py__tree-sitter-graph-0.7.0//:tree_sitter_graph",
+    name = "tree-sitter-graph-0.12.0",
+    actual = "@vendor_py__tree-sitter-graph-0.12.0//:tree_sitter_graph",
     tags = ["manual"],
 )
 
 alias(
     name = "tree-sitter-graph",
-    actual = "@vendor_py__tree-sitter-graph-0.7.0//:tree_sitter_graph",
+    actual = "@vendor_py__tree-sitter-graph-0.12.0//:tree_sitter_graph",
     tags = ["manual"],
 )
 
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.cc-1.2.14.bazel b/misc/bazel/3rdparty/py_deps/BUILD.cc-1.2.14.bazel
index 0fc47086bfb..e3f89bafb19 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.cc-1.2.14.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.cc-1.2.14.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.cfg-if-1.0.0.bazel b/misc/bazel/3rdparty/py_deps/BUILD.cfg-if-1.0.0.bazel
deleted file mode 100644
index da9dbdfb977..00000000000
--- a/misc/bazel/3rdparty/py_deps/BUILD.cfg-if-1.0.0.bazel
+++ /dev/null
@@ -1,92 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_py_deps
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "cfg_if",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=cfg-if",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.0.0",
-)
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.clap-4.5.30.bazel b/misc/bazel/3rdparty/py_deps/BUILD.clap-4.5.30.bazel
index 70e833a34bc..7ddd490dffc 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.clap-4.5.30.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.clap-4.5.30.bazel
@@ -79,12 +79,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.clap_builder-4.5.30.bazel b/misc/bazel/3rdparty/py_deps/BUILD.clap_builder-4.5.30.bazel
index be920c5727a..c44b8554ad4 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.clap_builder-4.5.30.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.clap_builder-4.5.30.bazel
@@ -78,12 +78,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.clap_lex-0.7.4.bazel b/misc/bazel/3rdparty/py_deps/BUILD.clap_lex-0.7.4.bazel
index fb906059fd1..231ff9c856e 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.clap_lex-0.7.4.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.clap_lex-0.7.4.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.colorchoice-1.0.3.bazel b/misc/bazel/3rdparty/py_deps/BUILD.colorchoice-1.0.3.bazel
index 43ca3c94eb1..94d46209718 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.colorchoice-1.0.3.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.colorchoice-1.0.3.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.is_terminal_polyfill-1.70.1.bazel b/misc/bazel/3rdparty/py_deps/BUILD.is_terminal_polyfill-1.70.1.bazel
index 495713baf56..6528f5edc54 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.is_terminal_polyfill-1.70.1.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.is_terminal_polyfill-1.70.1.bazel
@@ -73,12 +73,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.itoa-1.0.14.bazel b/misc/bazel/3rdparty/py_deps/BUILD.itoa-1.0.14.bazel
index aa5ba49e524..b9b1384da8d 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.itoa-1.0.14.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.itoa-1.0.14.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.log-0.4.25.bazel b/misc/bazel/3rdparty/py_deps/BUILD.log-0.4.25.bazel
index 130fcc98569..5d8cb464baf 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.log-0.4.25.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.log-0.4.25.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.memchr-2.7.4.bazel b/misc/bazel/3rdparty/py_deps/BUILD.memchr-2.7.4.bazel
index 371600a694b..290610f2234 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.memchr-2.7.4.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.memchr-2.7.4.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.once_cell-1.20.3.bazel b/misc/bazel/3rdparty/py_deps/BUILD.once_cell-1.20.3.bazel
index 87394011b30..ad2cdfd44f6 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.once_cell-1.20.3.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.once_cell-1.20.3.bazel
@@ -76,12 +76,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.proc-macro2-1.0.93.bazel b/misc/bazel/3rdparty/py_deps/BUILD.proc-macro2-1.0.93.bazel
index cd9e4a8f0d8..0dc7bb180d1 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.proc-macro2-1.0.93.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.proc-macro2-1.0.93.bazel
@@ -78,12 +78,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.quote-1.0.38.bazel b/misc/bazel/3rdparty/py_deps/BUILD.quote-1.0.38.bazel
index 0c966529bdf..f14687523f0 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.quote-1.0.38.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.quote-1.0.38.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.regex-1.11.1.bazel b/misc/bazel/3rdparty/py_deps/BUILD.regex-1.11.1.bazel
index a4408253a92..a450cf23e5b 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.regex-1.11.1.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.regex-1.11.1.bazel
@@ -89,12 +89,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.regex-automata-0.4.9.bazel b/misc/bazel/3rdparty/py_deps/BUILD.regex-automata-0.4.9.bazel
index b72ce8f99a2..95353401fa8 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.regex-automata-0.4.9.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.regex-automata-0.4.9.bazel
@@ -94,12 +94,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.regex-syntax-0.8.5.bazel b/misc/bazel/3rdparty/py_deps/BUILD.regex-syntax-0.8.5.bazel
index e5c758d7484..be5fade3f8b 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.regex-syntax-0.8.5.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.regex-syntax-0.8.5.bazel
@@ -82,12 +82,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.ryu-1.0.19.bazel b/misc/bazel/3rdparty/py_deps/BUILD.ryu-1.0.19.bazel
index 7d930f72d8a..7f8fb872113 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.ryu-1.0.19.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.ryu-1.0.19.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.serde-1.0.217.bazel b/misc/bazel/3rdparty/py_deps/BUILD.serde-1.0.217.bazel
index e3927c2e2cf..c2f3f0b2f1e 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.serde-1.0.217.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.serde-1.0.217.bazel
@@ -78,12 +78,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.serde_derive-1.0.217.bazel b/misc/bazel/3rdparty/py_deps/BUILD.serde_derive-1.0.217.bazel
index 134d08a022b..49ca3826b70 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.serde_derive-1.0.217.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.serde_derive-1.0.217.bazel
@@ -70,12 +70,16 @@ rust_proc_macro(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.serde_json-1.0.138.bazel b/misc/bazel/3rdparty/py_deps/BUILD.serde_json-1.0.138.bazel
index 2e144608c02..6f981174de7 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.serde_json-1.0.138.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.serde_json-1.0.138.bazel
@@ -78,12 +78,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.shlex-1.3.0.bazel b/misc/bazel/3rdparty/py_deps/BUILD.shlex-1.3.0.bazel
index 1fd5763f4b2..3a7b5dd13f3 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.shlex-1.3.0.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.shlex-1.3.0.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.smallvec-1.14.0.bazel b/misc/bazel/3rdparty/py_deps/BUILD.smallvec-1.14.0.bazel
index 01002bf50e5..5ef3609e865 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.smallvec-1.14.0.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.smallvec-1.14.0.bazel
@@ -73,12 +73,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.hashbrown-0.9.1.bazel b/misc/bazel/3rdparty/py_deps/BUILD.streaming-iterator-0.1.9.bazel
similarity index 90%
rename from misc/bazel/3rdparty/py_deps/BUILD.hashbrown-0.9.1.bazel
rename to misc/bazel/3rdparty/py_deps/BUILD.streaming-iterator-0.1.9.bazel
index 15fc24acbf1..c693289d0d5 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.hashbrown-0.9.1.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.streaming-iterator-0.1.9.bazel
@@ -17,7 +17,7 @@ cargo_toml_env_vars(
 )
 
 rust_library(
-    name = "hashbrown",
+    name = "streaming_iterator",
     srcs = glob(
         include = ["**/*.rs"],
         allow_empty = True,
@@ -34,12 +34,8 @@ rust_library(
             "WORKSPACE.bazel",
         ],
     ),
-    crate_features = [
-        "ahash",
-        "inline-more",
-    ],
     crate_root = "src/lib.rs",
-    edition = "2018",
+    edition = "2021",
     rustc_env_files = [
         ":cargo_toml_env_vars",
     ],
@@ -48,7 +44,7 @@ rust_library(
     ],
     tags = [
         "cargo-bazel",
-        "crate-name=hashbrown",
+        "crate-name=streaming-iterator",
         "manual",
         "noclippy",
         "norustfmt",
@@ -74,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -92,8 +92,5 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.9.1",
-    deps = [
-        "@vendor_py__ahash-0.4.8//:ahash",
-    ],
+    version = "0.1.9",
 )
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.strsim-0.11.1.bazel b/misc/bazel/3rdparty/py_deps/BUILD.strsim-0.11.1.bazel
index 70e01c3cd7a..89f35680ecd 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.strsim-0.11.1.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.strsim-0.11.1.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.syn-2.0.98.bazel b/misc/bazel/3rdparty/py_deps/BUILD.syn-2.0.98.bazel
index a136852520b..74c276c55b2 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.syn-2.0.98.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.syn-2.0.98.bazel
@@ -78,12 +78,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.thiserror-1.0.69.bazel b/misc/bazel/3rdparty/py_deps/BUILD.thiserror-1.0.69.bazel
index 5a9ef078472..c085df67e5c 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.thiserror-1.0.69.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.thiserror-1.0.69.bazel
@@ -77,12 +77,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.thiserror-impl-1.0.69.bazel b/misc/bazel/3rdparty/py_deps/BUILD.thiserror-impl-1.0.69.bazel
index d2ed4ad02fe..f2dc22a0d19 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.thiserror-impl-1.0.69.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.thiserror-impl-1.0.69.bazel
@@ -70,12 +70,16 @@ rust_proc_macro(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.tree-sitter-0.20.4.bazel b/misc/bazel/3rdparty/py_deps/BUILD.tree-sitter-0.24.7.bazel
similarity index 86%
rename from misc/bazel/3rdparty/py_deps/BUILD.tree-sitter-0.20.4.bazel
rename to misc/bazel/3rdparty/py_deps/BUILD.tree-sitter-0.24.7.bazel
index fea7b8b185e..a37116c26fb 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.tree-sitter-0.20.4.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.tree-sitter-0.24.7.bazel
@@ -38,8 +38,12 @@ rust_library(
             "WORKSPACE.bazel",
         ],
     ),
+    crate_features = [
+        "default",
+        "std",
+    ],
     crate_root = "binding_rust/lib.rs",
-    edition = "2018",
+    edition = "2021",
     rustc_env_files = [
         ":cargo_toml_env_vars",
     ],
@@ -74,12 +78,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -92,10 +100,13 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.20.4",
+    version = "0.24.7",
     deps = [
         "@vendor_py__regex-1.11.1//:regex",
-        "@vendor_py__tree-sitter-0.20.4//:build_script_build",
+        "@vendor_py__regex-syntax-0.8.5//:regex_syntax",
+        "@vendor_py__streaming-iterator-0.1.9//:streaming_iterator",
+        "@vendor_py__tree-sitter-0.24.7//:build_script_build",
+        "@vendor_py__tree-sitter-language-0.1.5//:tree_sitter_language",
     ],
 )
 
@@ -118,6 +129,10 @@ cargo_build_script(
             "WORKSPACE.bazel",
         ],
     ),
+    crate_features = [
+        "default",
+        "std",
+    ],
     crate_name = "build_script_build",
     crate_root = "binding_rust/build.rs",
     data = glob(
@@ -132,7 +147,8 @@ cargo_build_script(
             "WORKSPACE.bazel",
         ],
     ),
-    edition = "2018",
+    edition = "2021",
+    links = "tree-sitter",
     pkg_name = "tree-sitter",
     rustc_env_files = [
         ":cargo_toml_env_vars",
@@ -147,7 +163,7 @@ cargo_build_script(
         "noclippy",
         "norustfmt",
     ],
-    version = "0.20.4",
+    version = "0.24.7",
     visibility = ["//visibility:private"],
     deps = [
         "@vendor_py__cc-1.2.14//:cc",
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.tree-sitter-graph-0.7.0.bazel b/misc/bazel/3rdparty/py_deps/BUILD.tree-sitter-graph-0.12.0.bazel
similarity index 90%
rename from misc/bazel/3rdparty/py_deps/BUILD.tree-sitter-graph-0.7.0.bazel
rename to misc/bazel/3rdparty/py_deps/BUILD.tree-sitter-graph-0.12.0.bazel
index 4db3e576764..3917bb3d165 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.tree-sitter-graph-0.7.0.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.tree-sitter-graph-0.12.0.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,15 +92,15 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.7.0",
+    version = "0.12.0",
     deps = [
         "@vendor_py__log-0.4.25//:log",
         "@vendor_py__regex-1.11.1//:regex",
         "@vendor_py__serde-1.0.217//:serde",
         "@vendor_py__serde_json-1.0.138//:serde_json",
         "@vendor_py__smallvec-1.14.0//:smallvec",
-        "@vendor_py__string-interner-0.12.2//:string_interner",
+        "@vendor_py__streaming-iterator-0.1.9//:streaming_iterator",
         "@vendor_py__thiserror-1.0.69//:thiserror",
-        "@vendor_py__tree-sitter-0.20.4//:tree_sitter",
+        "@vendor_py__tree-sitter-0.24.7//:tree_sitter",
     ],
 )
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.string-interner-0.12.2.bazel b/misc/bazel/3rdparty/py_deps/BUILD.tree-sitter-language-0.1.5.bazel
similarity index 89%
rename from misc/bazel/3rdparty/py_deps/BUILD.string-interner-0.12.2.bazel
rename to misc/bazel/3rdparty/py_deps/BUILD.tree-sitter-language-0.1.5.bazel
index 5e177a306e9..de6215593a4 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.string-interner-0.12.2.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.tree-sitter-language-0.1.5.bazel
@@ -17,7 +17,7 @@ cargo_toml_env_vars(
 )
 
 rust_library(
-    name = "string_interner",
+    name = "tree_sitter_language",
     srcs = glob(
         include = ["**/*.rs"],
         allow_empty = True,
@@ -34,13 +34,8 @@ rust_library(
             "WORKSPACE.bazel",
         ],
     ),
-    crate_features = [
-        "backends",
-        "inline-more",
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2018",
+    crate_root = "language.rs",
+    edition = "2021",
     rustc_env_files = [
         ":cargo_toml_env_vars",
     ],
@@ -49,7 +44,7 @@ rust_library(
     ],
     tags = [
         "cargo-bazel",
-        "crate-name=string-interner",
+        "crate-name=tree-sitter-language",
         "manual",
         "noclippy",
         "norustfmt",
@@ -75,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -93,9 +92,5 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.12.2",
-    deps = [
-        "@vendor_py__cfg-if-1.0.0//:cfg_if",
-        "@vendor_py__hashbrown-0.9.1//:hashbrown",
-    ],
+    version = "0.1.5",
 )
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.unicode-ident-1.0.16.bazel b/misc/bazel/3rdparty/py_deps/BUILD.unicode-ident-1.0.16.bazel
index 00509c7dfe1..cf6899aafa0 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.unicode-ident-1.0.16.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.unicode-ident-1.0.16.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.utf8parse-0.2.2.bazel b/misc/bazel/3rdparty/py_deps/BUILD.utf8parse-0.2.2.bazel
index ce31b354d5c..caf972ae7c8 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.utf8parse-0.2.2.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.utf8parse-0.2.2.bazel
@@ -73,12 +73,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.windows-sys-0.59.0.bazel b/misc/bazel/3rdparty/py_deps/BUILD.windows-sys-0.59.0.bazel
index 0e640044247..aba90d60cc2 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.windows-sys-0.59.0.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.windows-sys-0.59.0.bazel
@@ -77,12 +77,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.windows-targets-0.52.6.bazel b/misc/bazel/3rdparty/py_deps/BUILD.windows-targets-0.52.6.bazel
index 2ceda06e690..469d31b2fec 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.windows-targets-0.52.6.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.windows-targets-0.52.6.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.windows_aarch64_gnullvm-0.52.6.bazel b/misc/bazel/3rdparty/py_deps/BUILD.windows_aarch64_gnullvm-0.52.6.bazel
index 43e3d458b61..f4b8a614e6f 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.windows_aarch64_gnullvm-0.52.6.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.windows_aarch64_gnullvm-0.52.6.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.windows_aarch64_msvc-0.52.6.bazel b/misc/bazel/3rdparty/py_deps/BUILD.windows_aarch64_msvc-0.52.6.bazel
index d2d560db7f6..82e1c57e2ab 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.windows_aarch64_msvc-0.52.6.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.windows_aarch64_msvc-0.52.6.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.windows_i686_gnu-0.52.6.bazel b/misc/bazel/3rdparty/py_deps/BUILD.windows_i686_gnu-0.52.6.bazel
index d16a88914f7..b0904b98ca8 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.windows_i686_gnu-0.52.6.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.windows_i686_gnu-0.52.6.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.windows_i686_gnullvm-0.52.6.bazel b/misc/bazel/3rdparty/py_deps/BUILD.windows_i686_gnullvm-0.52.6.bazel
index 14c2f9bff04..78e37e28693 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.windows_i686_gnullvm-0.52.6.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.windows_i686_gnullvm-0.52.6.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.windows_i686_msvc-0.52.6.bazel b/misc/bazel/3rdparty/py_deps/BUILD.windows_i686_msvc-0.52.6.bazel
index c6526b6edc4..6406d8c7c69 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.windows_i686_msvc-0.52.6.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.windows_i686_msvc-0.52.6.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.windows_x86_64_gnu-0.52.6.bazel b/misc/bazel/3rdparty/py_deps/BUILD.windows_x86_64_gnu-0.52.6.bazel
index 2629a55f49b..e5e5950f643 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.windows_x86_64_gnu-0.52.6.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.windows_x86_64_gnu-0.52.6.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.windows_x86_64_gnullvm-0.52.6.bazel b/misc/bazel/3rdparty/py_deps/BUILD.windows_x86_64_gnullvm-0.52.6.bazel
index e71a9a4a2e8..9107aa2b364 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.windows_x86_64_gnullvm-0.52.6.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.windows_x86_64_gnullvm-0.52.6.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.windows_x86_64_msvc-0.52.6.bazel b/misc/bazel/3rdparty/py_deps/BUILD.windows_x86_64_msvc-0.52.6.bazel
index 443821cda2c..326deb21750 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.windows_x86_64_msvc-0.52.6.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.windows_x86_64_msvc-0.52.6.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/py_deps/defs.bzl b/misc/bazel/3rdparty/py_deps/defs.bzl
index 9d78e46b2f8..90b5a7b640c 100644
--- a/misc/bazel/3rdparty/py_deps/defs.bzl
+++ b/misc/bazel/3rdparty/py_deps/defs.bzl
@@ -298,13 +298,13 @@ _NORMAL_DEPENDENCIES = {
             "anyhow": Label("@vendor_py__anyhow-1.0.95//:anyhow"),
             "clap": Label("@vendor_py__clap-4.5.30//:clap"),
             "regex": Label("@vendor_py__regex-1.11.1//:regex"),
-            "tree-sitter": Label("@vendor_py__tree-sitter-0.20.4//:tree_sitter"),
-            "tree-sitter-graph": Label("@vendor_py__tree-sitter-graph-0.7.0//:tree_sitter_graph"),
+            "tree-sitter": Label("@vendor_py__tree-sitter-0.24.7//:tree_sitter"),
+            "tree-sitter-graph": Label("@vendor_py__tree-sitter-graph-0.12.0//:tree_sitter_graph"),
         },
     },
     "python/extractor/tsg-python/tsp": {
         _COMMON_CONDITION: {
-            "tree-sitter": Label("@vendor_py__tree-sitter-0.20.4//:tree_sitter"),
+            "tree-sitter": Label("@vendor_py__tree-sitter-0.24.7//:tree_sitter"),
         },
     },
 }
@@ -425,12 +425,16 @@ _CONDITIONS = {
     "i686-unknown-linux-gnu": ["@rules_rust//rust/platform:i686-unknown-linux-gnu"],
     "powerpc-unknown-linux-gnu": ["@rules_rust//rust/platform:powerpc-unknown-linux-gnu"],
     "riscv32imc-unknown-none-elf": ["@rules_rust//rust/platform:riscv32imc-unknown-none-elf"],
+    "riscv64gc-unknown-linux-gnu": ["@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu"],
     "riscv64gc-unknown-none-elf": ["@rules_rust//rust/platform:riscv64gc-unknown-none-elf"],
     "s390x-unknown-linux-gnu": ["@rules_rust//rust/platform:s390x-unknown-linux-gnu"],
     "thumbv7em-none-eabi": ["@rules_rust//rust/platform:thumbv7em-none-eabi"],
     "thumbv8m.main-none-eabi": ["@rules_rust//rust/platform:thumbv8m.main-none-eabi"],
+    "wasm32-unknown-emscripten": ["@rules_rust//rust/platform:wasm32-unknown-emscripten"],
     "wasm32-unknown-unknown": ["@rules_rust//rust/platform:wasm32-unknown-unknown"],
     "wasm32-wasip1": ["@rules_rust//rust/platform:wasm32-wasip1"],
+    "wasm32-wasip1-threads": ["@rules_rust//rust/platform:wasm32-wasip1-threads"],
+    "wasm32-wasip2": ["@rules_rust//rust/platform:wasm32-wasip2"],
     "x86_64-apple-darwin": ["@rules_rust//rust/platform:x86_64-apple-darwin"],
     "x86_64-apple-ios": ["@rules_rust//rust/platform:x86_64-apple-ios"],
     "x86_64-linux-android": ["@rules_rust//rust/platform:x86_64-linux-android"],
@@ -452,16 +456,6 @@ def crate_repositories():
     Returns:
       A list of repos visible to the module through the module extension.
     """
-    maybe(
-        http_archive,
-        name = "vendor_py__ahash-0.4.8",
-        sha256 = "0453232ace82dee0dd0b4c87a59bd90f7b53b314f3e0f61fe2ee7c8a16482289",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ahash/0.4.8/download"],
-        strip_prefix = "ahash-0.4.8",
-        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.ahash-0.4.8.bazel"),
-    )
-
     maybe(
         http_archive,
         name = "vendor_py__aho-corasick-1.1.3",
@@ -542,16 +536,6 @@ def crate_repositories():
         build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.cc-1.2.14.bazel"),
     )
 
-    maybe(
-        http_archive,
-        name = "vendor_py__cfg-if-1.0.0",
-        sha256 = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/cfg-if/1.0.0/download"],
-        strip_prefix = "cfg-if-1.0.0",
-        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.cfg-if-1.0.0.bazel"),
-    )
-
     maybe(
         http_archive,
         name = "vendor_py__clap-4.5.30",
@@ -592,16 +576,6 @@ def crate_repositories():
         build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.colorchoice-1.0.3.bazel"),
     )
 
-    maybe(
-        http_archive,
-        name = "vendor_py__hashbrown-0.9.1",
-        sha256 = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/hashbrown/0.9.1/download"],
-        strip_prefix = "hashbrown-0.9.1",
-        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.hashbrown-0.9.1.bazel"),
-    )
-
     maybe(
         http_archive,
         name = "vendor_py__is_terminal_polyfill-1.70.1",
@@ -764,12 +738,12 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_py__string-interner-0.12.2",
-        sha256 = "383196d1876517ee6f9f0864d1fc1070331b803335d3c6daaa04bbcccd823c08",
+        name = "vendor_py__streaming-iterator-0.1.9",
+        sha256 = "2b2231b7c3057d5e4ad0156fb3dc807d900806020c5ffa3ee6ff2c8c76fb8520",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/string-interner/0.12.2/download"],
-        strip_prefix = "string-interner-0.12.2",
-        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.string-interner-0.12.2.bazel"),
+        urls = ["https://static.crates.io/crates/streaming-iterator/0.1.9/download"],
+        strip_prefix = "streaming-iterator-0.1.9",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.streaming-iterator-0.1.9.bazel"),
     )
 
     maybe(
@@ -814,22 +788,32 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_py__tree-sitter-0.20.4",
-        sha256 = "4e34327f8eac545e3f037382471b2b19367725a242bba7bc45edb9efb49fe39a",
+        name = "vendor_py__tree-sitter-0.24.7",
+        sha256 = "a5387dffa7ffc7d2dae12b50c6f7aab8ff79d6210147c6613561fc3d474c6f75",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/tree-sitter/0.20.4/download"],
-        strip_prefix = "tree-sitter-0.20.4",
-        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.tree-sitter-0.20.4.bazel"),
+        urls = ["https://static.crates.io/crates/tree-sitter/0.24.7/download"],
+        strip_prefix = "tree-sitter-0.24.7",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.tree-sitter-0.24.7.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_py__tree-sitter-graph-0.7.0",
-        sha256 = "639d21e886f581d293de5f5081f09af003c54607ff3fa85efa159b243ba1f97a",
+        name = "vendor_py__tree-sitter-graph-0.12.0",
+        sha256 = "63f86eb73c7d891c4b9b6fe4d4e63dd94c506e4788af7c2296afdcfbeea626cc",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/tree-sitter-graph/0.7.0/download"],
-        strip_prefix = "tree-sitter-graph-0.7.0",
-        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.tree-sitter-graph-0.7.0.bazel"),
+        urls = ["https://static.crates.io/crates/tree-sitter-graph/0.12.0/download"],
+        strip_prefix = "tree-sitter-graph-0.12.0",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.tree-sitter-graph-0.12.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_py__tree-sitter-language-0.1.5",
+        sha256 = "c4013970217383f67b18aef68f6fb2e8d409bc5755227092d32efb0422ba24b8",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/tree-sitter-language/0.1.5/download"],
+        strip_prefix = "tree-sitter-language-0.1.5",
+        build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.tree-sitter-language-0.1.5.bazel"),
     )
 
     maybe(
@@ -957,6 +941,6 @@ def crate_repositories():
         struct(repo = "vendor_py__cc-1.2.14", is_dev_dep = False),
         struct(repo = "vendor_py__clap-4.5.30", is_dev_dep = False),
         struct(repo = "vendor_py__regex-1.11.1", is_dev_dep = False),
-        struct(repo = "vendor_py__tree-sitter-0.20.4", is_dev_dep = False),
-        struct(repo = "vendor_py__tree-sitter-graph-0.7.0", is_dev_dep = False),
+        struct(repo = "vendor_py__tree-sitter-0.24.7", is_dev_dep = False),
+        struct(repo = "vendor_py__tree-sitter-graph-0.12.0", is_dev_dep = False),
     ]
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.adler2-2.0.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.adler2-2.0.1.bazel
similarity index 93%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.adler2-2.0.0.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.adler2-2.0.1.bazel
index 5ee0a08f4c7..15d108fcbec 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.adler2-2.0.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.adler2-2.0.1.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,5 +92,5 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "2.0.0",
+    version = "2.0.1",
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.aho-corasick-1.1.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.aho-corasick-1.1.3.bazel
index 6d911d0cd9f..d47c7298b75 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.aho-corasick-1.1.3.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.aho-corasick-1.1.3.bazel
@@ -75,12 +75,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.allocator-api2-0.2.21.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.allocator-api2-0.2.21.bazel
index 043bb8717df..b1ca8b4a42d 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.allocator-api2-0.2.21.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.allocator-api2-0.2.21.bazel
@@ -73,12 +73,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.android_system_properties-0.1.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.android_system_properties-0.1.5.bazel
index 0d633d276d5..a133ae2799b 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.android_system_properties-0.1.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.android_system_properties-0.1.5.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -90,6 +94,6 @@ rust_library(
     }),
     version = "0.1.5",
     deps = [
-        "@vendor_ts__libc-0.2.174//:libc",
+        "@vendor_ts__libc-0.2.175//:libc",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.nu-ansi-term-0.46.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstream-0.6.20.bazel
similarity index 78%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.nu-ansi-term-0.46.0.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstream-0.6.20.bazel
index b436335be0c..ebd0e844157 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.nu-ansi-term-0.46.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstream-0.6.20.bazel
@@ -17,7 +17,7 @@ cargo_toml_env_vars(
 )
 
 rust_library(
-    name = "nu_ansi_term",
+    name = "anstream",
     srcs = glob(
         include = ["**/*.rs"],
         allow_empty = True,
@@ -34,8 +34,13 @@ rust_library(
             "WORKSPACE.bazel",
         ],
     ),
+    crate_features = [
+        "auto",
+        "default",
+        "wincon",
+    ],
     crate_root = "src/lib.rs",
-    edition = "2018",
+    edition = "2021",
     rustc_env_files = [
         ":cargo_toml_env_vars",
     ],
@@ -44,7 +49,7 @@ rust_library(
     ],
     tags = [
         "cargo-bazel",
-        "crate-name=nu-ansi-term",
+        "crate-name=anstream",
         "manual",
         "noclippy",
         "norustfmt",
@@ -70,12 +75,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,18 +97,23 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.46.0",
+    version = "0.6.20",
     deps = [
-        "@vendor_ts__overload-0.1.1//:overload",
+        "@vendor_ts__anstyle-1.0.11//:anstyle",
+        "@vendor_ts__anstyle-parse-0.2.7//:anstyle_parse",
+        "@vendor_ts__anstyle-query-1.1.4//:anstyle_query",
+        "@vendor_ts__colorchoice-1.0.4//:colorchoice",
+        "@vendor_ts__is_terminal_polyfill-1.70.1//:is_terminal_polyfill",
+        "@vendor_ts__utf8parse-0.2.2//:utf8parse",
     ] + select({
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
-            "@vendor_ts__winapi-0.3.9//:winapi",  # cfg(target_os = "windows")
+            "@vendor_ts__anstyle-wincon-3.0.10//:anstyle_wincon",  # aarch64-pc-windows-msvc
         ],
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "@vendor_ts__winapi-0.3.9//:winapi",  # cfg(target_os = "windows")
+            "@vendor_ts__anstyle-wincon-3.0.10//:anstyle_wincon",  # i686-pc-windows-msvc
         ],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
-            "@vendor_ts__winapi-0.3.9//:winapi",  # cfg(target_os = "windows")
+            "@vendor_ts__anstyle-wincon-3.0.10//:anstyle_wincon",  # x86_64-pc-windows-msvc
         ],
         "//conditions:default": [],
     }),
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-1.0.10.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-1.0.11.bazel
similarity index 93%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-1.0.10.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-1.0.11.bazel
index 3edab30a739..bf8779d93c9 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-1.0.10.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-1.0.11.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -92,5 +96,5 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "1.0.10",
+    version = "1.0.11",
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-parse-0.2.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-parse-0.2.7.bazel
similarity index 93%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-parse-0.2.6.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-parse-0.2.7.bazel
index 76bd33a1a87..4a81b5ca7fa 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-parse-0.2.6.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-parse-0.2.7.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -92,7 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.2.6",
+    version = "0.2.7",
     deps = [
         "@vendor_ts__utf8parse-0.2.2//:utf8parse",
     ],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-query-1.1.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-query-1.1.4.bazel
similarity index 89%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-query-1.1.2.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-query-1.1.4.bazel
index 3726dd1b1b6..2004f465f53 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-query-1.1.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-query-1.1.4.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,16 +92,16 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "1.1.2",
+    version = "1.1.4",
     deps = select({
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
-            "@vendor_ts__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
+            "@vendor_ts__windows-sys-0.60.2//:windows_sys",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "@vendor_ts__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
+            "@vendor_ts__windows-sys-0.60.2//:windows_sys",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
-            "@vendor_ts__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
+            "@vendor_ts__windows-sys-0.60.2//:windows_sys",  # cfg(windows)
         ],
         "//conditions:default": [],
     }),
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-wincon-3.0.7.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-wincon-3.0.10.bazel
similarity index 83%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-wincon-3.0.7.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-wincon-3.0.10.bazel
index 4665ce20e48..cc610fb0aa9 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-wincon-3.0.7.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-wincon-3.0.10.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,21 +92,21 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "3.0.7",
+    version = "3.0.10",
     deps = [
-        "@vendor_ts__anstyle-1.0.10//:anstyle",
+        "@vendor_ts__anstyle-1.0.11//:anstyle",
     ] + select({
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
-            "@vendor_ts__once_cell-1.20.3//:once_cell",  # cfg(windows)
-            "@vendor_ts__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
+            "@vendor_ts__once_cell_polyfill-1.70.1//:once_cell_polyfill",  # cfg(windows)
+            "@vendor_ts__windows-sys-0.60.2//:windows_sys",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "@vendor_ts__once_cell-1.20.3//:once_cell",  # cfg(windows)
-            "@vendor_ts__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
+            "@vendor_ts__once_cell_polyfill-1.70.1//:once_cell_polyfill",  # cfg(windows)
+            "@vendor_ts__windows-sys-0.60.2//:windows_sys",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
-            "@vendor_ts__once_cell-1.20.3//:once_cell",  # cfg(windows)
-            "@vendor_ts__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
+            "@vendor_ts__once_cell_polyfill-1.70.1//:once_cell_polyfill",  # cfg(windows)
+            "@vendor_ts__windows-sys-0.60.2//:windows_sys",  # cfg(windows)
         ],
         "//conditions:default": [],
     }),
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anyhow-1.0.98.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anyhow-1.0.100.bazel
similarity index 93%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anyhow-1.0.98.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anyhow-1.0.100.bazel
index daa523a6b66..5d8502998aa 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anyhow-1.0.98.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anyhow-1.0.100.bazel
@@ -78,12 +78,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -96,9 +100,9 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "1.0.98",
+    version = "1.0.100",
     deps = [
-        "@vendor_ts__anyhow-1.0.98//:build_script_build",
+        "@vendor_ts__anyhow-1.0.100//:build_script_build",
     ],
 )
 
@@ -154,7 +158,7 @@ cargo_build_script(
         "noclippy",
         "norustfmt",
     ],
-    version = "1.0.98",
+    version = "1.0.100",
     visibility = ["//visibility:private"],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.argfile-0.2.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.argfile-0.2.1.bazel
index c28444a73c1..32b9ff0d9c7 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.argfile-0.2.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.argfile-0.2.1.bazel
@@ -73,12 +73,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -94,6 +98,6 @@ rust_library(
     version = "0.2.1",
     deps = [
         "@vendor_ts__fs-err-2.11.0//:fs_err",
-        "@vendor_ts__os_str_bytes-7.0.0//:os_str_bytes",
+        "@vendor_ts__os_str_bytes-7.1.1//:os_str_bytes",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.arrayvec-0.7.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.arrayvec-0.7.6.bazel
index 92ffe37c58b..b9e36249cf7 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.arrayvec-0.7.6.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.arrayvec-0.7.6.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.atomic-0.6.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.atomic-0.6.1.bazel
similarity index 92%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.atomic-0.6.0.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.atomic-0.6.1.bazel
index 4cb9d323813..b0be5564bb5 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.atomic-0.6.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.atomic-0.6.1.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -92,8 +96,8 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.6.0",
+    version = "0.6.1",
     deps = [
-        "@vendor_ts__bytemuck-1.21.0//:bytemuck",
+        "@vendor_ts__bytemuck-1.23.2//:bytemuck",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.autocfg-1.4.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.autocfg-1.5.0.bazel
similarity index 93%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.autocfg-1.4.0.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.autocfg-1.5.0.bazel
index 426ee88b2fe..2be65fdc967 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.autocfg-1.4.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.autocfg-1.5.0.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,5 +92,5 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "1.4.0",
+    version = "1.5.0",
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.base64-0.22.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.base64-0.22.1.bazel
index dc8e3b89124..17d891f3c2c 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.base64-0.22.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.base64-0.22.1.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bazel
index 8b09c0613aa..a5cfeccdcea 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bazel
@@ -32,14 +32,14 @@ filegroup(
 
 # Workspace Member Dependencies
 alias(
-    name = "anyhow-1.0.98",
-    actual = "@vendor_ts__anyhow-1.0.98//:anyhow",
+    name = "anyhow-1.0.100",
+    actual = "@vendor_ts__anyhow-1.0.100//:anyhow",
     tags = ["manual"],
 )
 
 alias(
     name = "anyhow",
-    actual = "@vendor_ts__anyhow-1.0.98//:anyhow",
+    actual = "@vendor_ts__anyhow-1.0.100//:anyhow",
     tags = ["manual"],
 )
 
@@ -56,38 +56,38 @@ alias(
 )
 
 alias(
-    name = "chalk-ir-0.103.0",
-    actual = "@vendor_ts__chalk-ir-0.103.0//:chalk_ir",
+    name = "chalk-ir-0.104.0",
+    actual = "@vendor_ts__chalk-ir-0.104.0//:chalk_ir",
     tags = ["manual"],
 )
 
 alias(
     name = "chalk-ir",
-    actual = "@vendor_ts__chalk-ir-0.103.0//:chalk_ir",
+    actual = "@vendor_ts__chalk-ir-0.104.0//:chalk_ir",
     tags = ["manual"],
 )
 
 alias(
-    name = "chrono-0.4.41",
-    actual = "@vendor_ts__chrono-0.4.41//:chrono",
+    name = "chrono-0.4.42",
+    actual = "@vendor_ts__chrono-0.4.42//:chrono",
     tags = ["manual"],
 )
 
 alias(
     name = "chrono",
-    actual = "@vendor_ts__chrono-0.4.41//:chrono",
+    actual = "@vendor_ts__chrono-0.4.42//:chrono",
     tags = ["manual"],
 )
 
 alias(
-    name = "clap-4.5.40",
-    actual = "@vendor_ts__clap-4.5.40//:clap",
+    name = "clap-4.5.48",
+    actual = "@vendor_ts__clap-4.5.48//:clap",
     tags = ["manual"],
 )
 
 alias(
     name = "clap",
-    actual = "@vendor_ts__clap-4.5.40//:clap",
+    actual = "@vendor_ts__clap-4.5.48//:clap",
     tags = ["manual"],
 )
 
@@ -140,38 +140,38 @@ alias(
 )
 
 alias(
-    name = "flate2-1.1.0",
-    actual = "@vendor_ts__flate2-1.1.0//:flate2",
+    name = "flate2-1.1.2",
+    actual = "@vendor_ts__flate2-1.1.2//:flate2",
     tags = ["manual"],
 )
 
 alias(
     name = "flate2",
-    actual = "@vendor_ts__flate2-1.1.0//:flate2",
+    actual = "@vendor_ts__flate2-1.1.2//:flate2",
     tags = ["manual"],
 )
 
 alias(
-    name = "glob-0.3.2",
-    actual = "@vendor_ts__glob-0.3.2//:glob",
+    name = "glob-0.3.3",
+    actual = "@vendor_ts__glob-0.3.3//:glob",
     tags = ["manual"],
 )
 
 alias(
     name = "glob",
-    actual = "@vendor_ts__glob-0.3.2//:glob",
+    actual = "@vendor_ts__glob-0.3.3//:glob",
     tags = ["manual"],
 )
 
 alias(
-    name = "globset-0.4.15",
-    actual = "@vendor_ts__globset-0.4.15//:globset",
+    name = "globset-0.4.16",
+    actual = "@vendor_ts__globset-0.4.16//:globset",
     tags = ["manual"],
 )
 
 alias(
     name = "globset",
-    actual = "@vendor_ts__globset-0.4.15//:globset",
+    actual = "@vendor_ts__globset-0.4.16//:globset",
     tags = ["manual"],
 )
 
@@ -236,320 +236,320 @@ alias(
 )
 
 alias(
-    name = "proc-macro2-1.0.95",
-    actual = "@vendor_ts__proc-macro2-1.0.95//:proc_macro2",
+    name = "proc-macro2-1.0.101",
+    actual = "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
     tags = ["manual"],
 )
 
 alias(
     name = "proc-macro2",
-    actual = "@vendor_ts__proc-macro2-1.0.95//:proc_macro2",
+    actual = "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
     tags = ["manual"],
 )
 
 alias(
-    name = "quote-1.0.40",
-    actual = "@vendor_ts__quote-1.0.40//:quote",
+    name = "quote-1.0.41",
+    actual = "@vendor_ts__quote-1.0.41//:quote",
     tags = ["manual"],
 )
 
 alias(
     name = "quote",
-    actual = "@vendor_ts__quote-1.0.40//:quote",
+    actual = "@vendor_ts__quote-1.0.41//:quote",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_base_db-0.0.288",
-    actual = "@vendor_ts__ra_ap_base_db-0.0.288//:ra_ap_base_db",
+    name = "ra_ap_base_db-0.0.301",
+    actual = "@vendor_ts__ra_ap_base_db-0.0.301//:ra_ap_base_db",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_base_db",
-    actual = "@vendor_ts__ra_ap_base_db-0.0.288//:ra_ap_base_db",
+    actual = "@vendor_ts__ra_ap_base_db-0.0.301//:ra_ap_base_db",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_cfg-0.0.288",
-    actual = "@vendor_ts__ra_ap_cfg-0.0.288//:ra_ap_cfg",
+    name = "ra_ap_cfg-0.0.301",
+    actual = "@vendor_ts__ra_ap_cfg-0.0.301//:ra_ap_cfg",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_cfg",
-    actual = "@vendor_ts__ra_ap_cfg-0.0.288//:ra_ap_cfg",
+    actual = "@vendor_ts__ra_ap_cfg-0.0.301//:ra_ap_cfg",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_hir-0.0.288",
-    actual = "@vendor_ts__ra_ap_hir-0.0.288//:ra_ap_hir",
+    name = "ra_ap_hir-0.0.301",
+    actual = "@vendor_ts__ra_ap_hir-0.0.301//:ra_ap_hir",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_hir",
-    actual = "@vendor_ts__ra_ap_hir-0.0.288//:ra_ap_hir",
+    actual = "@vendor_ts__ra_ap_hir-0.0.301//:ra_ap_hir",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_hir_def-0.0.288",
-    actual = "@vendor_ts__ra_ap_hir_def-0.0.288//:ra_ap_hir_def",
+    name = "ra_ap_hir_def-0.0.301",
+    actual = "@vendor_ts__ra_ap_hir_def-0.0.301//:ra_ap_hir_def",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_hir_def",
-    actual = "@vendor_ts__ra_ap_hir_def-0.0.288//:ra_ap_hir_def",
+    actual = "@vendor_ts__ra_ap_hir_def-0.0.301//:ra_ap_hir_def",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_hir_expand-0.0.288",
-    actual = "@vendor_ts__ra_ap_hir_expand-0.0.288//:ra_ap_hir_expand",
+    name = "ra_ap_hir_expand-0.0.301",
+    actual = "@vendor_ts__ra_ap_hir_expand-0.0.301//:ra_ap_hir_expand",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_hir_expand",
-    actual = "@vendor_ts__ra_ap_hir_expand-0.0.288//:ra_ap_hir_expand",
+    actual = "@vendor_ts__ra_ap_hir_expand-0.0.301//:ra_ap_hir_expand",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_hir_ty-0.0.288",
-    actual = "@vendor_ts__ra_ap_hir_ty-0.0.288//:ra_ap_hir_ty",
+    name = "ra_ap_hir_ty-0.0.301",
+    actual = "@vendor_ts__ra_ap_hir_ty-0.0.301//:ra_ap_hir_ty",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_hir_ty",
-    actual = "@vendor_ts__ra_ap_hir_ty-0.0.288//:ra_ap_hir_ty",
+    actual = "@vendor_ts__ra_ap_hir_ty-0.0.301//:ra_ap_hir_ty",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_ide_db-0.0.288",
-    actual = "@vendor_ts__ra_ap_ide_db-0.0.288//:ra_ap_ide_db",
+    name = "ra_ap_ide_db-0.0.301",
+    actual = "@vendor_ts__ra_ap_ide_db-0.0.301//:ra_ap_ide_db",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_ide_db",
-    actual = "@vendor_ts__ra_ap_ide_db-0.0.288//:ra_ap_ide_db",
+    actual = "@vendor_ts__ra_ap_ide_db-0.0.301//:ra_ap_ide_db",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_intern-0.0.288",
-    actual = "@vendor_ts__ra_ap_intern-0.0.288//:ra_ap_intern",
+    name = "ra_ap_intern-0.0.301",
+    actual = "@vendor_ts__ra_ap_intern-0.0.301//:ra_ap_intern",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_intern",
-    actual = "@vendor_ts__ra_ap_intern-0.0.288//:ra_ap_intern",
+    actual = "@vendor_ts__ra_ap_intern-0.0.301//:ra_ap_intern",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_load-cargo-0.0.288",
-    actual = "@vendor_ts__ra_ap_load-cargo-0.0.288//:ra_ap_load_cargo",
+    name = "ra_ap_load-cargo-0.0.301",
+    actual = "@vendor_ts__ra_ap_load-cargo-0.0.301//:ra_ap_load_cargo",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_load-cargo",
-    actual = "@vendor_ts__ra_ap_load-cargo-0.0.288//:ra_ap_load_cargo",
+    actual = "@vendor_ts__ra_ap_load-cargo-0.0.301//:ra_ap_load_cargo",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_parser-0.0.288",
-    actual = "@vendor_ts__ra_ap_parser-0.0.288//:ra_ap_parser",
+    name = "ra_ap_parser-0.0.301",
+    actual = "@vendor_ts__ra_ap_parser-0.0.301//:ra_ap_parser",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_parser",
-    actual = "@vendor_ts__ra_ap_parser-0.0.288//:ra_ap_parser",
+    actual = "@vendor_ts__ra_ap_parser-0.0.301//:ra_ap_parser",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_paths-0.0.288",
-    actual = "@vendor_ts__ra_ap_paths-0.0.288//:ra_ap_paths",
+    name = "ra_ap_paths-0.0.301",
+    actual = "@vendor_ts__ra_ap_paths-0.0.301//:ra_ap_paths",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_paths",
-    actual = "@vendor_ts__ra_ap_paths-0.0.288//:ra_ap_paths",
+    actual = "@vendor_ts__ra_ap_paths-0.0.301//:ra_ap_paths",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_project_model-0.0.288",
-    actual = "@vendor_ts__ra_ap_project_model-0.0.288//:ra_ap_project_model",
+    name = "ra_ap_project_model-0.0.301",
+    actual = "@vendor_ts__ra_ap_project_model-0.0.301//:ra_ap_project_model",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_project_model",
-    actual = "@vendor_ts__ra_ap_project_model-0.0.288//:ra_ap_project_model",
+    actual = "@vendor_ts__ra_ap_project_model-0.0.301//:ra_ap_project_model",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_span-0.0.288",
-    actual = "@vendor_ts__ra_ap_span-0.0.288//:ra_ap_span",
+    name = "ra_ap_span-0.0.301",
+    actual = "@vendor_ts__ra_ap_span-0.0.301//:ra_ap_span",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_span",
-    actual = "@vendor_ts__ra_ap_span-0.0.288//:ra_ap_span",
+    actual = "@vendor_ts__ra_ap_span-0.0.301//:ra_ap_span",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_stdx-0.0.288",
-    actual = "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx",
+    name = "ra_ap_stdx-0.0.301",
+    actual = "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx",
     tags = ["manual"],
 )
 
 alias(
-    name = "stdx-0.0.288",
-    actual = "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx",
+    name = "stdx-0.0.301",
+    actual = "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx",
     tags = ["manual"],
 )
 
 alias(
     name = "stdx",
-    actual = "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx",
+    actual = "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_syntax-0.0.288",
-    actual = "@vendor_ts__ra_ap_syntax-0.0.288//:ra_ap_syntax",
+    name = "ra_ap_syntax-0.0.301",
+    actual = "@vendor_ts__ra_ap_syntax-0.0.301//:ra_ap_syntax",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_syntax",
-    actual = "@vendor_ts__ra_ap_syntax-0.0.288//:ra_ap_syntax",
+    actual = "@vendor_ts__ra_ap_syntax-0.0.301//:ra_ap_syntax",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_vfs-0.0.288",
-    actual = "@vendor_ts__ra_ap_vfs-0.0.288//:ra_ap_vfs",
+    name = "ra_ap_vfs-0.0.301",
+    actual = "@vendor_ts__ra_ap_vfs-0.0.301//:ra_ap_vfs",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_vfs",
-    actual = "@vendor_ts__ra_ap_vfs-0.0.288//:ra_ap_vfs",
+    actual = "@vendor_ts__ra_ap_vfs-0.0.301//:ra_ap_vfs",
     tags = ["manual"],
 )
 
 alias(
-    name = "rand-0.9.1",
-    actual = "@vendor_ts__rand-0.9.1//:rand",
+    name = "rand-0.9.2",
+    actual = "@vendor_ts__rand-0.9.2//:rand",
     tags = ["manual"],
 )
 
 alias(
     name = "rand",
-    actual = "@vendor_ts__rand-0.9.1//:rand",
+    actual = "@vendor_ts__rand-0.9.2//:rand",
     tags = ["manual"],
 )
 
 alias(
-    name = "rayon-1.10.0",
-    actual = "@vendor_ts__rayon-1.10.0//:rayon",
+    name = "rayon-1.11.0",
+    actual = "@vendor_ts__rayon-1.11.0//:rayon",
     tags = ["manual"],
 )
 
 alias(
     name = "rayon",
-    actual = "@vendor_ts__rayon-1.10.0//:rayon",
+    actual = "@vendor_ts__rayon-1.11.0//:rayon",
     tags = ["manual"],
 )
 
 alias(
-    name = "regex-1.11.1",
-    actual = "@vendor_ts__regex-1.11.1//:regex",
+    name = "regex-1.11.3",
+    actual = "@vendor_ts__regex-1.11.3//:regex",
     tags = ["manual"],
 )
 
 alias(
     name = "regex",
-    actual = "@vendor_ts__regex-1.11.1//:regex",
+    actual = "@vendor_ts__regex-1.11.3//:regex",
     tags = ["manual"],
 )
 
 alias(
-    name = "serde-1.0.219",
-    actual = "@vendor_ts__serde-1.0.219//:serde",
+    name = "serde-1.0.228",
+    actual = "@vendor_ts__serde-1.0.228//:serde",
     tags = ["manual"],
 )
 
 alias(
     name = "serde",
-    actual = "@vendor_ts__serde-1.0.219//:serde",
+    actual = "@vendor_ts__serde-1.0.228//:serde",
     tags = ["manual"],
 )
 
 alias(
-    name = "serde_json-1.0.140",
-    actual = "@vendor_ts__serde_json-1.0.140//:serde_json",
+    name = "serde_json-1.0.145",
+    actual = "@vendor_ts__serde_json-1.0.145//:serde_json",
     tags = ["manual"],
 )
 
 alias(
     name = "serde_json",
-    actual = "@vendor_ts__serde_json-1.0.140//:serde_json",
+    actual = "@vendor_ts__serde_json-1.0.145//:serde_json",
     tags = ["manual"],
 )
 
 alias(
-    name = "serde_with-3.13.0",
-    actual = "@vendor_ts__serde_with-3.13.0//:serde_with",
+    name = "serde_with-3.14.1",
+    actual = "@vendor_ts__serde_with-3.14.1//:serde_with",
     tags = ["manual"],
 )
 
 alias(
     name = "serde_with",
-    actual = "@vendor_ts__serde_with-3.13.0//:serde_with",
+    actual = "@vendor_ts__serde_with-3.14.1//:serde_with",
     tags = ["manual"],
 )
 
 alias(
-    name = "syn-2.0.103",
-    actual = "@vendor_ts__syn-2.0.103//:syn",
+    name = "syn-2.0.106",
+    actual = "@vendor_ts__syn-2.0.106//:syn",
     tags = ["manual"],
 )
 
 alias(
     name = "syn",
-    actual = "@vendor_ts__syn-2.0.103//:syn",
+    actual = "@vendor_ts__syn-2.0.106//:syn",
     tags = ["manual"],
 )
 
 alias(
-    name = "toml-0.8.23",
-    actual = "@vendor_ts__toml-0.8.23//:toml",
+    name = "toml-0.9.7",
+    actual = "@vendor_ts__toml-0.9.7//:toml",
     tags = ["manual"],
 )
 
 alias(
     name = "toml",
-    actual = "@vendor_ts__toml-0.8.23//:toml",
+    actual = "@vendor_ts__toml-0.9.7//:toml",
     tags = ["manual"],
 )
 
@@ -578,38 +578,38 @@ alias(
 )
 
 alias(
-    name = "tracing-subscriber-0.3.19",
-    actual = "@vendor_ts__tracing-subscriber-0.3.19//:tracing_subscriber",
+    name = "tracing-subscriber-0.3.20",
+    actual = "@vendor_ts__tracing-subscriber-0.3.20//:tracing_subscriber",
     tags = ["manual"],
 )
 
 alias(
     name = "tracing-subscriber",
-    actual = "@vendor_ts__tracing-subscriber-0.3.19//:tracing_subscriber",
+    actual = "@vendor_ts__tracing-subscriber-0.3.20//:tracing_subscriber",
     tags = ["manual"],
 )
 
 alias(
-    name = "tree-sitter-0.24.6",
-    actual = "@vendor_ts__tree-sitter-0.24.6//:tree_sitter",
+    name = "tree-sitter-0.25.9",
+    actual = "@vendor_ts__tree-sitter-0.25.9//:tree_sitter",
     tags = ["manual"],
 )
 
 alias(
     name = "tree-sitter",
-    actual = "@vendor_ts__tree-sitter-0.24.6//:tree_sitter",
+    actual = "@vendor_ts__tree-sitter-0.25.9//:tree_sitter",
     tags = ["manual"],
 )
 
 alias(
-    name = "tree-sitter-embedded-template-0.23.2",
-    actual = "@vendor_ts__tree-sitter-embedded-template-0.23.2//:tree_sitter_embedded_template",
+    name = "tree-sitter-embedded-template-0.25.0",
+    actual = "@vendor_ts__tree-sitter-embedded-template-0.25.0//:tree_sitter_embedded_template",
     tags = ["manual"],
 )
 
 alias(
     name = "tree-sitter-embedded-template",
-    actual = "@vendor_ts__tree-sitter-embedded-template-0.23.2//:tree_sitter_embedded_template",
+    actual = "@vendor_ts__tree-sitter-embedded-template-0.25.0//:tree_sitter_embedded_template",
     tags = ["manual"],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bitflags-1.3.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bitflags-1.3.2.bazel
index 951fa2156eb..b9b25068599 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bitflags-1.3.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bitflags-1.3.2.bazel
@@ -73,12 +73,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bitflags-2.9.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bitflags-2.9.4.bazel
similarity index 93%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bitflags-2.9.1.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bitflags-2.9.4.bazel
index fbb0a5c3656..1bfb8cf8e15 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bitflags-2.9.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bitflags-2.9.4.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,5 +92,5 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "2.9.1",
+    version = "2.9.4",
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.borsh-1.5.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.borsh-1.5.7.bazel
similarity index 93%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.borsh-1.5.5.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.borsh-1.5.7.bazel
index 144c4990caf..cf4d5c3aaa1 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.borsh-1.5.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.borsh-1.5.7.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -92,9 +96,9 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "1.5.5",
+    version = "1.5.7",
     deps = [
-        "@vendor_ts__borsh-1.5.5//:build_script_build",
+        "@vendor_ts__borsh-1.5.7//:build_script_build",
     ],
 )
 
@@ -146,7 +150,7 @@ cargo_build_script(
         "noclippy",
         "norustfmt",
     ],
-    version = "1.5.5",
+    version = "1.5.7",
     visibility = ["//visibility:private"],
     deps = [
         "@vendor_ts__cfg_aliases-0.2.1//:cfg_aliases",
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.boxcar-0.2.13.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.boxcar-0.2.14.bazel
similarity index 92%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.boxcar-0.2.13.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.boxcar-0.2.14.bazel
index ac24b2ad629..cfc997b9101 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.boxcar-0.2.13.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.boxcar-0.2.14.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,5 +92,5 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.2.13",
+    version = "0.2.14",
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bstr-1.11.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bstr-1.12.0.bazel
similarity index 93%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bstr-1.11.3.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bstr-1.12.0.bazel
index 1793e0d7dae..04c40d43016 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bstr-1.11.3.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bstr-1.12.0.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -92,7 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "1.11.3",
+    version = "1.12.0",
     deps = [
         "@vendor_ts__memchr-2.7.5//:memchr",
     ],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bumpalo-3.16.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bumpalo-3.19.0.bazel
similarity index 93%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bumpalo-3.16.0.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bumpalo-3.19.0.bazel
index 4a816613e62..bd48b980b9a 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bumpalo-3.16.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bumpalo-3.19.0.bazel
@@ -73,12 +73,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -91,5 +95,5 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "3.16.0",
+    version = "3.19.0",
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bytemuck-1.21.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bytemuck-1.23.2.bazel
similarity index 93%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bytemuck-1.21.0.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bytemuck-1.23.2.bazel
index cf7710e627d..05edb30b608 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bytemuck-1.21.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bytemuck-1.23.2.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,5 +92,5 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "1.21.0",
+    version = "1.23.2",
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.byteorder-1.5.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.byteorder-1.5.0.bazel
deleted file mode 100644
index cb0e7c07ee3..00000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.byteorder-1.5.0.bazel
+++ /dev/null
@@ -1,92 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "byteorder",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=byteorder",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.5.0",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.camino-1.1.10.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.camino-1.1.12.bazel
similarity index 92%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.camino-1.1.10.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.camino-1.1.12.bazel
index f7df381842e..b138a8c2f3d 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.camino-1.1.10.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.camino-1.1.12.bazel
@@ -78,12 +78,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -96,10 +100,10 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "1.1.10",
+    version = "1.1.12",
     deps = [
-        "@vendor_ts__camino-1.1.10//:build_script_build",
-        "@vendor_ts__serde-1.0.219//:serde",
+        "@vendor_ts__camino-1.1.12//:build_script_build",
+        "@vendor_ts__serde-1.0.228//:serde",
     ],
 )
 
@@ -155,7 +159,7 @@ cargo_build_script(
         "noclippy",
         "norustfmt",
     ],
-    version = "1.1.10",
+    version = "1.1.12",
     visibility = ["//visibility:private"],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo-platform-0.2.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo-platform-0.2.0.bazel
index bde1a5698f5..e4ee9d80fbd 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo-platform-0.2.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo-platform-0.2.0.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -90,6 +94,6 @@ rust_library(
     }),
     version = "0.2.0",
     deps = [
-        "@vendor_ts__serde-1.0.219//:serde",
+        "@vendor_ts__serde-1.0.228//:serde",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo-util-schemas-0.2.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo-util-schemas-0.8.2.bazel
similarity index 89%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo-util-schemas-0.2.0.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo-util-schemas-0.8.2.bazel
index dc20343396f..7564be022f1 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo-util-schemas-0.2.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo-util-schemas-0.8.2.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,15 +92,15 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.2.0",
+    version = "0.8.2",
     deps = [
         "@vendor_ts__semver-1.0.26//:semver",
-        "@vendor_ts__serde-1.0.219//:serde",
-        "@vendor_ts__serde-untagged-0.1.7//:serde_untagged",
+        "@vendor_ts__serde-1.0.228//:serde",
+        "@vendor_ts__serde-untagged-0.1.8//:serde_untagged",
         "@vendor_ts__serde-value-0.7.0//:serde_value",
-        "@vendor_ts__thiserror-1.0.69//:thiserror",
+        "@vendor_ts__thiserror-2.0.16//:thiserror",
         "@vendor_ts__toml-0.8.23//:toml",
         "@vendor_ts__unicode-xid-0.2.6//:unicode_xid",
-        "@vendor_ts__url-2.5.4//:url",
+        "@vendor_ts__url-2.5.7//:url",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo_metadata-0.20.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo_metadata-0.21.0.bazel
similarity index 87%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo_metadata-0.20.0.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo_metadata-0.21.0.bazel
index 8e20620f1d7..95acbcc53aa 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo_metadata-0.20.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo_metadata-0.21.0.bazel
@@ -73,12 +73,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -91,14 +95,14 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.20.0",
+    version = "0.21.0",
     deps = [
-        "@vendor_ts__camino-1.1.10//:camino",
+        "@vendor_ts__camino-1.1.12//:camino",
         "@vendor_ts__cargo-platform-0.2.0//:cargo_platform",
-        "@vendor_ts__cargo-util-schemas-0.2.0//:cargo_util_schemas",
+        "@vendor_ts__cargo-util-schemas-0.8.2//:cargo_util_schemas",
         "@vendor_ts__semver-1.0.26//:semver",
-        "@vendor_ts__serde-1.0.219//:serde",
-        "@vendor_ts__serde_json-1.0.140//:serde_json",
-        "@vendor_ts__thiserror-2.0.12//:thiserror",
+        "@vendor_ts__serde-1.0.228//:serde",
+        "@vendor_ts__serde_json-1.0.145//:serde_json",
+        "@vendor_ts__thiserror-2.0.16//:thiserror",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cc-1.2.7.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cc-1.2.37.bazel
similarity index 79%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cc-1.2.7.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cc-1.2.37.bazel
index f49b2a00f16..ef757a77cac 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cc-1.2.7.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cc-1.2.37.bazel
@@ -73,12 +73,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -91,43 +95,47 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "1.2.7",
+    version = "1.2.37",
     deps = [
-        "@vendor_ts__jobserver-0.1.32//:jobserver",
+        "@vendor_ts__find-msvc-tools-0.1.1//:find_msvc_tools",
+        "@vendor_ts__jobserver-0.1.34//:jobserver",
         "@vendor_ts__shlex-1.3.0//:shlex",
     ] + select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [
-            "@vendor_ts__libc-0.2.174//:libc",  # aarch64-apple-darwin
+            "@vendor_ts__libc-0.2.175//:libc",  # aarch64-apple-darwin
         ],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # aarch64-unknown-linux-gnu
+            "@vendor_ts__libc-0.2.175//:libc",  # aarch64-unknown-linux-gnu
         ],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # aarch64-unknown-linux-gnu, aarch64-unknown-nixos-gnu
+            "@vendor_ts__libc-0.2.175//:libc",  # aarch64-unknown-linux-gnu, aarch64-unknown-nixos-gnu
         ],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
-            "@vendor_ts__libc-0.2.174//:libc",  # arm-unknown-linux-gnueabi
+            "@vendor_ts__libc-0.2.175//:libc",  # arm-unknown-linux-gnueabi
         ],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # i686-unknown-linux-gnu
+            "@vendor_ts__libc-0.2.175//:libc",  # i686-unknown-linux-gnu
         ],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # powerpc-unknown-linux-gnu
+            "@vendor_ts__libc-0.2.175//:libc",  # powerpc-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.175//:libc",  # riscv64gc-unknown-linux-gnu
         ],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # s390x-unknown-linux-gnu
+            "@vendor_ts__libc-0.2.175//:libc",  # s390x-unknown-linux-gnu
         ],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [
-            "@vendor_ts__libc-0.2.174//:libc",  # x86_64-apple-darwin
+            "@vendor_ts__libc-0.2.175//:libc",  # x86_64-apple-darwin
         ],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
-            "@vendor_ts__libc-0.2.174//:libc",  # x86_64-unknown-freebsd
+            "@vendor_ts__libc-0.2.175//:libc",  # x86_64-unknown-freebsd
         ],
         "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # x86_64-unknown-linux-gnu
+            "@vendor_ts__libc-0.2.175//:libc",  # x86_64-unknown-linux-gnu
         ],
         "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # x86_64-unknown-linux-gnu, x86_64-unknown-nixos-gnu
+            "@vendor_ts__libc-0.2.175//:libc",  # x86_64-unknown-linux-gnu, x86_64-unknown-nixos-gnu
         ],
         "//conditions:default": [],
     }),
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cfg-if-1.0.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cfg-if-1.0.3.bazel
similarity index 93%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cfg-if-1.0.1.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cfg-if-1.0.3.bazel
index 3c46f710630..6df1698a8b4 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cfg-if-1.0.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cfg-if-1.0.3.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,5 +92,5 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "1.0.1",
+    version = "1.0.3",
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cfg_aliases-0.2.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cfg_aliases-0.2.1.bazel
index 045b9c7d3e1..093182c2bdd 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cfg_aliases-0.2.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cfg_aliases-0.2.1.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-derive-0.103.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-derive-0.103.0.bazel
index 26bb8d267a7..09fe4a1d194 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-derive-0.103.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-derive-0.103.0.bazel
@@ -70,12 +70,16 @@ rust_proc_macro(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -90,9 +94,9 @@ rust_proc_macro(
     }),
     version = "0.103.0",
     deps = [
-        "@vendor_ts__proc-macro2-1.0.95//:proc_macro2",
-        "@vendor_ts__quote-1.0.40//:quote",
-        "@vendor_ts__syn-2.0.103//:syn",
-        "@vendor_ts__synstructure-0.13.1//:synstructure",
+        "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
+        "@vendor_ts__quote-1.0.41//:quote",
+        "@vendor_ts__syn-2.0.106//:syn",
+        "@vendor_ts__synstructure-0.13.2//:synstructure",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-derive-0.7.35.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-derive-0.104.0.bazel
similarity index 87%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-derive-0.7.35.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-derive-0.104.0.bazel
index b8c3c044e85..6f83f8a3128 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-derive-0.7.35.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-derive-0.104.0.bazel
@@ -17,7 +17,7 @@ cargo_toml_env_vars(
 )
 
 rust_proc_macro(
-    name = "zerocopy_derive",
+    name = "chalk_derive",
     srcs = glob(
         include = ["**/*.rs"],
         allow_empty = True,
@@ -44,7 +44,7 @@ rust_proc_macro(
     ],
     tags = [
         "cargo-bazel",
-        "crate-name=zerocopy-derive",
+        "crate-name=chalk-derive",
         "manual",
         "noclippy",
         "norustfmt",
@@ -70,12 +70,16 @@ rust_proc_macro(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,10 +92,11 @@ rust_proc_macro(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.7.35",
+    version = "0.104.0",
     deps = [
-        "@vendor_ts__proc-macro2-1.0.95//:proc_macro2",
-        "@vendor_ts__quote-1.0.40//:quote",
-        "@vendor_ts__syn-2.0.103//:syn",
+        "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
+        "@vendor_ts__quote-1.0.41//:quote",
+        "@vendor_ts__syn-2.0.106//:syn",
+        "@vendor_ts__synstructure-0.13.2//:synstructure",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-ir-0.103.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-ir-0.103.0.bazel
index 1e3c900ab90..61c81e205d3 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-ir-0.103.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-ir-0.103.0.bazel
@@ -73,12 +73,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -93,6 +97,6 @@ rust_library(
     }),
     version = "0.103.0",
     deps = [
-        "@vendor_ts__bitflags-2.9.1//:bitflags",
+        "@vendor_ts__bitflags-2.9.4//:bitflags",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-0.7.35.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-ir-0.104.0.bazel
similarity index 89%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-0.7.35.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-ir-0.104.0.bazel
index 616cecefee1..01017b869eb 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-0.7.35.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-ir-0.104.0.bazel
@@ -17,7 +17,7 @@ cargo_toml_env_vars(
 )
 
 rust_library(
-    name = "zerocopy",
+    name = "chalk_ir",
     srcs = glob(
         include = ["**/*.rs"],
         allow_empty = True,
@@ -34,17 +34,10 @@ rust_library(
             "WORKSPACE.bazel",
         ],
     ),
-    crate_features = [
-        "byteorder",
-        "default",
-        "derive",
-        "simd",
-        "zerocopy-derive",
-    ],
     crate_root = "src/lib.rs",
     edition = "2018",
     proc_macro_deps = [
-        "@vendor_ts__zerocopy-derive-0.7.35//:zerocopy_derive",
+        "@vendor_ts__chalk-derive-0.104.0//:chalk_derive",
     ],
     rustc_env_files = [
         ":cargo_toml_env_vars",
@@ -54,7 +47,7 @@ rust_library(
     ],
     tags = [
         "cargo-bazel",
-        "crate-name=zerocopy",
+        "crate-name=chalk-ir",
         "manual",
         "noclippy",
         "norustfmt",
@@ -80,12 +73,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -98,8 +95,8 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.7.35",
+    version = "0.104.0",
     deps = [
-        "@vendor_ts__byteorder-1.5.0//:byteorder",
+        "@vendor_ts__bitflags-2.9.4//:bitflags",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-recursive-0.103.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-recursive-0.103.0.bazel
index a8959b395ef..4f15fef15d6 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-recursive-0.103.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-recursive-0.103.0.bazel
@@ -73,12 +73,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-solve-0.103.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-solve-0.103.0.bazel
index 44923a124e5..3b35ec7bf2b 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-solve-0.103.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-solve-0.103.0.bazel
@@ -73,12 +73,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -95,7 +99,7 @@ rust_library(
     deps = [
         "@vendor_ts__chalk-ir-0.103.0//:chalk_ir",
         "@vendor_ts__ena-0.14.3//:ena",
-        "@vendor_ts__indexmap-2.9.0//:indexmap",
+        "@vendor_ts__indexmap-2.11.4//:indexmap",
         "@vendor_ts__itertools-0.12.1//:itertools",
         "@vendor_ts__petgraph-0.6.5//:petgraph",
         "@vendor_ts__rustc-hash-1.1.0//:rustc_hash",
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chrono-0.4.41.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chrono-0.4.42.bazel
similarity index 73%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chrono-0.4.41.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chrono-0.4.42.bazel
index 42801a73f91..0b5f1b3f916 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chrono-0.4.41.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chrono-0.4.42.bazel
@@ -36,7 +36,6 @@ rust_library(
     ),
     crate_features = [
         "alloc",
-        "android-tzdata",
         "clock",
         "default",
         "iana-time-zone",
@@ -86,12 +85,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -104,99 +107,101 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.4.41",
+    version = "0.4.42",
     deps = [
         "@vendor_ts__num-traits-0.2.19//:num_traits",
-        "@vendor_ts__serde-1.0.219//:serde",
+        "@vendor_ts__serde-1.0.228//:serde",
     ] + select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [
-            "@vendor_ts__iana-time-zone-0.1.61//:iana_time_zone",  # aarch64-apple-darwin
+            "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # aarch64-apple-darwin
         ],
         "@rules_rust//rust/platform:aarch64-apple-ios": [
-            "@vendor_ts__iana-time-zone-0.1.61//:iana_time_zone",  # aarch64-apple-ios
+            "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # aarch64-apple-ios
         ],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
-            "@vendor_ts__iana-time-zone-0.1.61//:iana_time_zone",  # aarch64-apple-ios-sim
+            "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # aarch64-apple-ios-sim
         ],
         "@rules_rust//rust/platform:aarch64-linux-android": [
-            "@vendor_ts__android-tzdata-0.1.1//:android_tzdata",  # aarch64-linux-android
-            "@vendor_ts__iana-time-zone-0.1.61//:iana_time_zone",  # aarch64-linux-android
+            "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # aarch64-linux-android
         ],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
-            "@vendor_ts__windows-link-0.1.1//:windows_link",  # aarch64-pc-windows-msvc
+            "@vendor_ts__windows-link-0.2.0//:windows_link",  # aarch64-pc-windows-msvc
         ],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [
-            "@vendor_ts__iana-time-zone-0.1.61//:iana_time_zone",  # aarch64-unknown-fuchsia
+            "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # aarch64-unknown-fuchsia
         ],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
-            "@vendor_ts__iana-time-zone-0.1.61//:iana_time_zone",  # aarch64-unknown-linux-gnu
+            "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # aarch64-unknown-linux-gnu
         ],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
-            "@vendor_ts__iana-time-zone-0.1.61//:iana_time_zone",  # aarch64-unknown-linux-gnu, aarch64-unknown-nixos-gnu
+            "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # aarch64-unknown-linux-gnu, aarch64-unknown-nixos-gnu
         ],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [
-            "@vendor_ts__iana-time-zone-0.1.61//:iana_time_zone",  # aarch64-unknown-nto-qnx710
+            "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # aarch64-unknown-nto-qnx710
         ],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
-            "@vendor_ts__iana-time-zone-0.1.61//:iana_time_zone",  # arm-unknown-linux-gnueabi
+            "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # arm-unknown-linux-gnueabi
         ],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [
-            "@vendor_ts__android-tzdata-0.1.1//:android_tzdata",  # armv7-linux-androideabi
-            "@vendor_ts__iana-time-zone-0.1.61//:iana_time_zone",  # armv7-linux-androideabi
+            "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # armv7-linux-androideabi
         ],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
-            "@vendor_ts__iana-time-zone-0.1.61//:iana_time_zone",  # armv7-unknown-linux-gnueabi
+            "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # armv7-unknown-linux-gnueabi
         ],
         "@rules_rust//rust/platform:i686-apple-darwin": [
-            "@vendor_ts__iana-time-zone-0.1.61//:iana_time_zone",  # i686-apple-darwin
+            "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # i686-apple-darwin
         ],
         "@rules_rust//rust/platform:i686-linux-android": [
-            "@vendor_ts__android-tzdata-0.1.1//:android_tzdata",  # i686-linux-android
-            "@vendor_ts__iana-time-zone-0.1.61//:iana_time_zone",  # i686-linux-android
+            "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # i686-linux-android
         ],
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "@vendor_ts__windows-link-0.1.1//:windows_link",  # i686-pc-windows-msvc
+            "@vendor_ts__windows-link-0.2.0//:windows_link",  # i686-pc-windows-msvc
         ],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [
-            "@vendor_ts__iana-time-zone-0.1.61//:iana_time_zone",  # i686-unknown-freebsd
+            "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # i686-unknown-freebsd
         ],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
-            "@vendor_ts__iana-time-zone-0.1.61//:iana_time_zone",  # i686-unknown-linux-gnu
+            "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # i686-unknown-linux-gnu
         ],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
-            "@vendor_ts__iana-time-zone-0.1.61//:iana_time_zone",  # powerpc-unknown-linux-gnu
+            "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # powerpc-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [
+            "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # riscv64gc-unknown-linux-gnu
         ],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
-            "@vendor_ts__iana-time-zone-0.1.61//:iana_time_zone",  # s390x-unknown-linux-gnu
+            "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # s390x-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [
+            "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # wasm32-unknown-emscripten
         ],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [
-            "@vendor_ts__js-sys-0.3.76//:js_sys",  # wasm32-unknown-unknown
-            "@vendor_ts__wasm-bindgen-0.2.99//:wasm_bindgen",  # wasm32-unknown-unknown
+            "@vendor_ts__js-sys-0.3.78//:js_sys",  # wasm32-unknown-unknown
+            "@vendor_ts__wasm-bindgen-0.2.101//:wasm_bindgen",  # wasm32-unknown-unknown
         ],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [
-            "@vendor_ts__iana-time-zone-0.1.61//:iana_time_zone",  # x86_64-apple-darwin
+            "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # x86_64-apple-darwin
         ],
         "@rules_rust//rust/platform:x86_64-apple-ios": [
-            "@vendor_ts__iana-time-zone-0.1.61//:iana_time_zone",  # x86_64-apple-ios
+            "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # x86_64-apple-ios
         ],
         "@rules_rust//rust/platform:x86_64-linux-android": [
-            "@vendor_ts__android-tzdata-0.1.1//:android_tzdata",  # x86_64-linux-android
-            "@vendor_ts__iana-time-zone-0.1.61//:iana_time_zone",  # x86_64-linux-android
+            "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # x86_64-linux-android
         ],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
-            "@vendor_ts__windows-link-0.1.1//:windows_link",  # x86_64-pc-windows-msvc
+            "@vendor_ts__windows-link-0.2.0//:windows_link",  # x86_64-pc-windows-msvc
         ],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
-            "@vendor_ts__iana-time-zone-0.1.61//:iana_time_zone",  # x86_64-unknown-freebsd
+            "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # x86_64-unknown-freebsd
         ],
         "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [
-            "@vendor_ts__iana-time-zone-0.1.61//:iana_time_zone",  # x86_64-unknown-fuchsia
+            "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # x86_64-unknown-fuchsia
         ],
         "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
-            "@vendor_ts__iana-time-zone-0.1.61//:iana_time_zone",  # x86_64-unknown-linux-gnu
+            "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # x86_64-unknown-linux-gnu
         ],
         "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
-            "@vendor_ts__iana-time-zone-0.1.61//:iana_time_zone",  # x86_64-unknown-linux-gnu, x86_64-unknown-nixos-gnu
+            "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # x86_64-unknown-linux-gnu, x86_64-unknown-nixos-gnu
         ],
         "//conditions:default": [],
     }),
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap-4.5.40.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap-4.5.48.bazel
similarity index 90%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap-4.5.40.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap-4.5.48.bazel
index e055432baee..07b70d3c00e 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap-4.5.40.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap-4.5.48.bazel
@@ -47,7 +47,7 @@ rust_library(
     crate_root = "src/lib.rs",
     edition = "2021",
     proc_macro_deps = [
-        "@vendor_ts__clap_derive-4.5.40//:clap_derive",
+        "@vendor_ts__clap_derive-4.5.47//:clap_derive",
     ],
     rustc_env_files = [
         ":cargo_toml_env_vars",
@@ -83,12 +83,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -101,8 +105,8 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "4.5.40",
+    version = "4.5.48",
     deps = [
-        "@vendor_ts__clap_builder-4.5.40//:clap_builder",
+        "@vendor_ts__clap_builder-4.5.48//:clap_builder",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_builder-4.5.40.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_builder-4.5.48.bazel
similarity index 90%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_builder-4.5.40.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_builder-4.5.48.bazel
index e0f318dadde..d4778d3ba49 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_builder-4.5.40.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_builder-4.5.48.bazel
@@ -78,12 +78,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -96,11 +100,11 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "4.5.40",
+    version = "4.5.48",
     deps = [
-        "@vendor_ts__anstream-0.6.18//:anstream",
-        "@vendor_ts__anstyle-1.0.10//:anstyle",
-        "@vendor_ts__clap_lex-0.7.4//:clap_lex",
+        "@vendor_ts__anstream-0.6.20//:anstream",
+        "@vendor_ts__anstyle-1.0.11//:anstyle",
+        "@vendor_ts__clap_lex-0.7.5//:clap_lex",
         "@vendor_ts__strsim-0.11.1//:strsim",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_derive-4.5.40.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_derive-4.5.47.bazel
similarity index 90%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_derive-4.5.40.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_derive-4.5.47.bazel
index ebc392a70a8..30ec5af6c1f 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_derive-4.5.40.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_derive-4.5.47.bazel
@@ -73,12 +73,16 @@ rust_proc_macro(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -91,11 +95,11 @@ rust_proc_macro(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "4.5.40",
+    version = "4.5.47",
     deps = [
         "@vendor_ts__heck-0.5.0//:heck",
-        "@vendor_ts__proc-macro2-1.0.95//:proc_macro2",
-        "@vendor_ts__quote-1.0.40//:quote",
-        "@vendor_ts__syn-2.0.103//:syn",
+        "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
+        "@vendor_ts__quote-1.0.41//:quote",
+        "@vendor_ts__syn-2.0.106//:syn",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_lex-0.7.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_lex-0.7.5.bazel
similarity index 93%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_lex-0.7.4.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_lex-0.7.5.bazel
index 51aeb39bd7f..54194c27503 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_lex-0.7.4.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_lex-0.7.5.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,5 +92,5 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.7.4",
+    version = "0.7.5",
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.colorchoice-1.0.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.colorchoice-1.0.4.bazel
similarity index 93%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.colorchoice-1.0.3.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.colorchoice-1.0.4.bazel
index 31696488337..3fde0013d95 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.colorchoice-1.0.3.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.colorchoice-1.0.4.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,5 +92,5 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "1.0.3",
+    version = "1.0.4",
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.core-foundation-sys-0.8.7.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.core-foundation-sys-0.8.7.bazel
index 961ed6da5a7..d7c24a33e09 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.core-foundation-sys-0.8.7.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.core-foundation-sys-0.8.7.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.countme-3.0.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.countme-3.0.1.bazel
index 3d52a6a65d2..6471b14ab04 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.countme-3.0.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.countme-3.0.1.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cov-mark-2.0.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cov-mark-2.1.0.bazel
similarity index 93%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cov-mark-2.0.0.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cov-mark-2.1.0.bazel
index 3c562e624d0..934e00d1c70 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cov-mark-2.0.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cov-mark-2.1.0.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -92,5 +96,5 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "2.0.0",
+    version = "2.1.0",
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crc32fast-1.4.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crc32fast-1.4.2.bazel
deleted file mode 100644
index 24f106b3eda..00000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crc32fast-1.4.2.bazel
+++ /dev/null
@@ -1,99 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "crc32fast",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2015",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=crc32fast",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.4.2",
-    deps = [
-        "@vendor_ts__cfg-if-1.0.1//:cfg_if",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_json-1.0.140.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crc32fast-1.5.0.bazel
similarity index 90%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_json-1.0.140.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crc32fast-1.5.0.bazel
index c4632eee008..f626b633f13 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_json-1.0.140.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crc32fast-1.5.0.bazel
@@ -21,7 +21,7 @@ cargo_toml_env_vars(
 )
 
 rust_library(
-    name = "serde_json",
+    name = "crc32fast",
     srcs = glob(
         include = ["**/*.rs"],
         allow_empty = True,
@@ -41,7 +41,6 @@ rust_library(
     crate_features = [
         "default",
         "std",
-        "unbounded_depth",
     ],
     crate_root = "src/lib.rs",
     edition = "2021",
@@ -53,7 +52,7 @@ rust_library(
     ],
     tags = [
         "cargo-bazel",
-        "crate-name=serde_json",
+        "crate-name=crc32fast",
         "manual",
         "noclippy",
         "norustfmt",
@@ -79,12 +78,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -97,13 +100,10 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "1.0.140",
+    version = "1.5.0",
     deps = [
-        "@vendor_ts__itoa-1.0.15//:itoa",
-        "@vendor_ts__memchr-2.7.5//:memchr",
-        "@vendor_ts__ryu-1.0.19//:ryu",
-        "@vendor_ts__serde-1.0.219//:serde",
-        "@vendor_ts__serde_json-1.0.140//:build_script_build",
+        "@vendor_ts__cfg-if-1.0.3//:cfg_if",
+        "@vendor_ts__crc32fast-1.5.0//:build_script_build",
     ],
 )
 
@@ -129,7 +129,6 @@ cargo_build_script(
     crate_features = [
         "default",
         "std",
-        "unbounded_depth",
     ],
     crate_name = "build_script_build",
     crate_root = "build.rs",
@@ -146,7 +145,7 @@ cargo_build_script(
         ],
     ),
     edition = "2021",
-    pkg_name = "serde_json",
+    pkg_name = "crc32fast",
     rustc_env_files = [
         ":cargo_toml_env_vars",
     ],
@@ -155,12 +154,12 @@ cargo_build_script(
     ],
     tags = [
         "cargo-bazel",
-        "crate-name=serde_json",
+        "crate-name=crc32fast",
         "manual",
         "noclippy",
         "norustfmt",
     ],
-    version = "1.0.140",
+    version = "1.5.0",
     visibility = ["//visibility:private"],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-channel-0.5.15.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-channel-0.5.15.bazel
index 8d06af4b20d..c179f7d4da0 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-channel-0.5.15.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-channel-0.5.15.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-deque-0.8.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-deque-0.8.6.bazel
index 275da3cb388..0208adb97be 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-deque-0.8.6.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-deque-0.8.6.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-epoch-0.9.18.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-epoch-0.9.18.bazel
index ca30e79b83e..627145e84ee 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-epoch-0.9.18.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-epoch-0.9.18.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-queue-0.3.12.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-queue-0.3.12.bazel
index 2de25a15e6c..52201cf8a8b 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-queue-0.3.12.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-queue-0.3.12.bazel
@@ -75,12 +75,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-utils-0.8.21.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-utils-0.8.21.bazel
index 5efee8b6bd1..18ae31e2eca 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-utils-0.8.21.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-utils-0.8.21.bazel
@@ -78,12 +78,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling-0.20.10.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling-0.21.3.bazel
similarity index 90%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling-0.20.10.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling-0.21.3.bazel
index 4efdc5f3108..4c292c1d710 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling-0.20.10.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling-0.21.3.bazel
@@ -41,7 +41,7 @@ rust_library(
     crate_root = "src/lib.rs",
     edition = "2021",
     proc_macro_deps = [
-        "@vendor_ts__darling_macro-0.20.10//:darling_macro",
+        "@vendor_ts__darling_macro-0.21.3//:darling_macro",
     ],
     rustc_env_files = [
         ":cargo_toml_env_vars",
@@ -77,12 +77,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -95,8 +99,8 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.20.10",
+    version = "0.21.3",
     deps = [
-        "@vendor_ts__darling_core-0.20.10//:darling_core",
+        "@vendor_ts__darling_core-0.21.3//:darling_core",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling_core-0.20.10.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling_core-0.21.3.bazel
similarity index 90%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling_core-0.20.10.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling_core-0.21.3.bazel
index 2513d906b8f..85fc26280ae 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling_core-0.20.10.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling_core-0.21.3.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -92,13 +96,13 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.20.10",
+    version = "0.21.3",
     deps = [
         "@vendor_ts__fnv-1.0.7//:fnv",
         "@vendor_ts__ident_case-1.0.1//:ident_case",
-        "@vendor_ts__proc-macro2-1.0.95//:proc_macro2",
-        "@vendor_ts__quote-1.0.40//:quote",
+        "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
+        "@vendor_ts__quote-1.0.41//:quote",
         "@vendor_ts__strsim-0.11.1//:strsim",
-        "@vendor_ts__syn-2.0.103//:syn",
+        "@vendor_ts__syn-2.0.106//:syn",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling_macro-0.20.10.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling_macro-0.21.3.bazel
similarity index 89%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling_macro-0.20.10.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling_macro-0.21.3.bazel
index 0d48c635284..84a6db16b68 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling_macro-0.20.10.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling_macro-0.21.3.bazel
@@ -70,12 +70,16 @@ rust_proc_macro(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,10 +92,10 @@ rust_proc_macro(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.20.10",
+    version = "0.21.3",
     deps = [
-        "@vendor_ts__darling_core-0.20.10//:darling_core",
-        "@vendor_ts__quote-1.0.40//:quote",
-        "@vendor_ts__syn-2.0.103//:syn",
+        "@vendor_ts__darling_core-0.21.3//:darling_core",
+        "@vendor_ts__quote-1.0.41//:quote",
+        "@vendor_ts__syn-2.0.106//:syn",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.dashmap-6.1.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.dashmap-6.1.0.bazel
index e902b52fc77..9dfad53ceb5 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.dashmap-6.1.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.dashmap-6.1.0.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -94,11 +98,11 @@ rust_library(
     }),
     version = "6.1.0",
     deps = [
-        "@vendor_ts__cfg-if-1.0.1//:cfg_if",
+        "@vendor_ts__cfg-if-1.0.3//:cfg_if",
         "@vendor_ts__crossbeam-utils-0.8.21//:crossbeam_utils",
         "@vendor_ts__hashbrown-0.14.5//:hashbrown",
-        "@vendor_ts__lock_api-0.4.12//:lock_api",
-        "@vendor_ts__once_cell-1.20.3//:once_cell",
-        "@vendor_ts__parking_lot_core-0.9.10//:parking_lot_core",
+        "@vendor_ts__lock_api-0.4.13//:lock_api",
+        "@vendor_ts__once_cell-1.21.3//:once_cell",
+        "@vendor_ts__parking_lot_core-0.9.11//:parking_lot_core",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.deranged-0.3.11.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.deranged-0.5.3.bazel
similarity index 93%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.deranged-0.3.11.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.deranged-0.5.3.bazel
index ae682344092..68432d606f8 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.deranged-0.3.11.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.deranged-0.5.3.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,5 +92,5 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.3.11",
+    version = "0.5.3",
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.displaydoc-0.2.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.displaydoc-0.2.5.bazel
index d2be9ea8eb7..c021a09033e 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.displaydoc-0.2.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.displaydoc-0.2.5.bazel
@@ -70,12 +70,16 @@ rust_proc_macro(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -90,8 +94,8 @@ rust_proc_macro(
     }),
     version = "0.2.5",
     deps = [
-        "@vendor_ts__proc-macro2-1.0.95//:proc_macro2",
-        "@vendor_ts__quote-1.0.40//:quote",
-        "@vendor_ts__syn-2.0.103//:syn",
+        "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
+        "@vendor_ts__quote-1.0.41//:quote",
+        "@vendor_ts__syn-2.0.106//:syn",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.drop_bomb-0.1.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.drop_bomb-0.1.5.bazel
index e1753384d51..2d4581a50d9 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.drop_bomb-0.1.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.drop_bomb-0.1.5.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.dunce-1.0.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.dunce-1.0.5.bazel
index 107c3ffebb5..df9735fb044 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.dunce-1.0.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.dunce-1.0.5.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.dyn-clone-1.0.19.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.dyn-clone-1.0.20.bazel
similarity index 93%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.dyn-clone-1.0.19.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.dyn-clone-1.0.20.bazel
index 448bf06fc09..c810715cbc8 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.dyn-clone-1.0.19.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.dyn-clone-1.0.20.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,5 +92,5 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "1.0.19",
+    version = "1.0.20",
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.either-1.15.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.either-1.15.0.bazel
index f0e4ed753a9..7889b2bacd1 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.either-1.15.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.either-1.15.0.bazel
@@ -75,12 +75,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ena-0.14.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ena-0.14.3.bazel
index d006d25618c..bc79eea8cb9 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ena-0.14.3.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ena-0.14.3.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -90,6 +94,6 @@ rust_library(
     }),
     version = "0.14.3",
     deps = [
-        "@vendor_ts__log-0.4.27//:log",
+        "@vendor_ts__log-0.4.28//:log",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-0.2.33.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-0.2.33.bazel
index a244aae188c..c9577c65f88 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-0.2.33.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-0.2.33.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-japanese-1.20141219.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-japanese-1.20141219.5.bazel
index 364bb52518b..2479888abce 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-japanese-1.20141219.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-japanese-1.20141219.5.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-korean-1.20141219.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-korean-1.20141219.5.bazel
index 20bed276c3d..4bfdf59c286 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-korean-1.20141219.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-korean-1.20141219.5.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-simpchinese-1.20141219.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-simpchinese-1.20141219.5.bazel
index d351a58ac13..8b4274d602b 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-simpchinese-1.20141219.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-simpchinese-1.20141219.5.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-singlebyte-1.20141219.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-singlebyte-1.20141219.5.bazel
index f5842e0a4ea..a53f1999f2c 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-singlebyte-1.20141219.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-singlebyte-1.20141219.5.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-tradchinese-1.20141219.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-tradchinese-1.20141219.5.bazel
index bbee3fd0412..b6a7ad2993b 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-tradchinese-1.20141219.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-tradchinese-1.20141219.5.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding_index_tests-0.1.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding_index_tests-0.1.4.bazel
index 38f81f0a381..a68310e470d 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding_index_tests-0.1.4.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding_index_tests-0.1.4.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.equivalent-1.0.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.equivalent-1.0.2.bazel
index 0c774d24ada..c262f8362d7 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.equivalent-1.0.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.equivalent-1.0.2.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.erased-serde-0.4.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.erased-serde-0.4.6.bazel
index 100d2f9727c..3eebca66b45 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.erased-serde-0.4.6.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.erased-serde-0.4.6.bazel
@@ -73,12 +73,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -93,7 +97,7 @@ rust_library(
     }),
     version = "0.4.6",
     deps = [
-        "@vendor_ts__serde-1.0.219//:serde",
+        "@vendor_ts__serde-1.0.228//:serde",
         "@vendor_ts__typeid-1.0.3//:typeid",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.figment-0.10.19.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.figment-0.10.19.bazel
index 9569df15a02..9f707fe589a 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.figment-0.10.19.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.figment-0.10.19.bazel
@@ -81,12 +81,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -103,51 +107,60 @@ rust_library(
     deps = [
         "@vendor_ts__figment-0.10.19//:build_script_build",
         "@vendor_ts__pear-0.2.9//:pear",
-        "@vendor_ts__serde-1.0.219//:serde",
+        "@vendor_ts__serde-1.0.228//:serde",
         "@vendor_ts__serde_yaml-0.9.34-deprecated//:serde_yaml",
         "@vendor_ts__uncased-0.9.10//:uncased",
     ] + select({
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
-            "@vendor_ts__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
+            "@vendor_ts__atomic-0.6.1//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
         ],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [
-            "@vendor_ts__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
+            "@vendor_ts__atomic-0.6.1//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
         ],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
-            "@vendor_ts__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
+            "@vendor_ts__atomic-0.6.1//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
         ],
         "@rules_rust//rust/platform:i686-apple-darwin": [
-            "@vendor_ts__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
+            "@vendor_ts__atomic-0.6.1//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
         ],
         "@rules_rust//rust/platform:i686-linux-android": [
-            "@vendor_ts__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
+            "@vendor_ts__atomic-0.6.1//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
         ],
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "@vendor_ts__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
+            "@vendor_ts__atomic-0.6.1//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
         ],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [
-            "@vendor_ts__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
+            "@vendor_ts__atomic-0.6.1//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
         ],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
-            "@vendor_ts__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
+            "@vendor_ts__atomic-0.6.1//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
         ],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
-            "@vendor_ts__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
+            "@vendor_ts__atomic-0.6.1//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
         ],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [
-            "@vendor_ts__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
+            "@vendor_ts__atomic-0.6.1//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
         ],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [
-            "@vendor_ts__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
+            "@vendor_ts__atomic-0.6.1//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
         ],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [
-            "@vendor_ts__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
+            "@vendor_ts__atomic-0.6.1//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
+        ],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [
+            "@vendor_ts__atomic-0.6.1//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
         ],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [
-            "@vendor_ts__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
+            "@vendor_ts__atomic-0.6.1//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
         ],
         "@rules_rust//rust/platform:wasm32-wasip1": [
-            "@vendor_ts__atomic-0.6.0//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
+            "@vendor_ts__atomic-0.6.1//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
+        ],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [
+            "@vendor_ts__atomic-0.6.1//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
+        ],
+        "@rules_rust//rust/platform:wasm32-wasip2": [
+            "@vendor_ts__atomic-0.6.1//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
         ],
         "//conditions:default": [],
     }),
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.overload-0.1.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.find-msvc-tools-0.1.1.bazel
similarity index 91%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.overload-0.1.1.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.find-msvc-tools-0.1.1.bazel
index 047ca4a2489..c04dd7706d6 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.overload-0.1.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.find-msvc-tools-0.1.1.bazel
@@ -17,7 +17,7 @@ cargo_toml_env_vars(
 )
 
 rust_library(
-    name = "overload",
+    name = "find_msvc_tools",
     srcs = glob(
         include = ["**/*.rs"],
         allow_empty = True,
@@ -44,7 +44,7 @@ rust_library(
     ],
     tags = [
         "cargo-bazel",
-        "crate-name=overload",
+        "crate-name=find-msvc-tools",
         "manual",
         "noclippy",
         "norustfmt",
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fixedbitset-0.4.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fixedbitset-0.4.2.bazel
index 75630f1b6ff..2e2ffe86c6a 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fixedbitset-0.4.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fixedbitset-0.4.2.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.flate2-1.1.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.flate2-1.1.2.bazel
similarity index 90%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.flate2-1.1.0.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.flate2-1.1.2.bazel
index 47ffe2a16c7..6b919bce0b8 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.flate2-1.1.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.flate2-1.1.2.bazel
@@ -76,12 +76,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -94,9 +98,9 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "1.1.0",
+    version = "1.1.2",
     deps = [
-        "@vendor_ts__crc32fast-1.4.2//:crc32fast",
-        "@vendor_ts__miniz_oxide-0.8.5//:miniz_oxide",
+        "@vendor_ts__crc32fast-1.5.0//:crc32fast",
+        "@vendor_ts__miniz_oxide-0.8.9//:miniz_oxide",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fnv-1.0.7.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fnv-1.0.7.bazel
index 54f682b45eb..c3eab8bc83c 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fnv-1.0.7.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fnv-1.0.7.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.foldhash-0.1.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.foldhash-0.1.5.bazel
index 766dc7a15dc..7d6f47fa04f 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.foldhash-0.1.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.foldhash-0.1.5.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.form_urlencoded-1.2.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.form_urlencoded-1.2.2.bazel
similarity index 91%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.form_urlencoded-1.2.1.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.form_urlencoded-1.2.2.bazel
index be5dbcf148d..e496ef247da 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.form_urlencoded-1.2.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.form_urlencoded-1.2.2.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -92,8 +96,8 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "1.2.1",
+    version = "1.2.2",
     deps = [
-        "@vendor_ts__percent-encoding-2.3.1//:percent_encoding",
+        "@vendor_ts__percent-encoding-2.3.2//:percent_encoding",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fs-err-2.11.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fs-err-2.11.0.bazel
index 15c2e43a80f..263df3abe82 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fs-err-2.11.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fs-err-2.11.0.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -149,7 +153,7 @@ cargo_build_script(
     version = "2.11.0",
     visibility = ["//visibility:private"],
     deps = [
-        "@vendor_ts__autocfg-1.4.0//:autocfg",
+        "@vendor_ts__autocfg-1.5.0//:autocfg",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fsevent-sys-4.1.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fsevent-sys-4.1.0.bazel
index f6e6c4fad54..ece66edee6c 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fsevent-sys-4.1.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fsevent-sys-4.1.0.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -90,6 +94,6 @@ rust_library(
     }),
     version = "4.1.0",
     deps = [
-        "@vendor_ts__libc-0.2.174//:libc",
+        "@vendor_ts__libc-0.2.175//:libc",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fst-0.4.7.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fst-0.4.7.bazel
index 4512e7e59c2..060ec5e07d9 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fst-0.4.7.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fst-0.4.7.bazel
@@ -77,12 +77,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.getrandom-0.3.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.getrandom-0.3.3.bazel
similarity index 57%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.getrandom-0.3.1.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.getrandom-0.3.3.bazel
index 24c7f564c52..47a353d3df9 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.getrandom-0.3.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.getrandom-0.3.3.bazel
@@ -77,12 +77,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -95,85 +99,85 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.3.1",
+    version = "0.3.3",
     deps = [
-        "@vendor_ts__cfg-if-1.0.1//:cfg_if",
-        "@vendor_ts__getrandom-0.3.1//:build_script_build",
+        "@vendor_ts__cfg-if-1.0.3//:cfg_if",
+        "@vendor_ts__getrandom-0.3.3//:build_script_build",
     ] + select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(any(target_os = "macos", target_os = "openbsd", target_os = "vita", target_os = "emscripten"))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(any(target_os = "macos", target_os = "openbsd", target_os = "vita", target_os = "emscripten"))
         ],
         "@rules_rust//rust/platform:aarch64-apple-ios": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(any(target_os = "ios", target_os = "visionos", target_os = "watchos", target_os = "tvos"))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(any(target_os = "ios", target_os = "visionos", target_os = "watchos", target_os = "tvos"))
         ],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(any(target_os = "ios", target_os = "visionos", target_os = "watchos", target_os = "tvos"))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(any(target_os = "ios", target_os = "visionos", target_os = "watchos", target_os = "tvos"))
         ],
         "@rules_rust//rust/platform:aarch64-linux-android": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(getrandom_backend = "custom", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
-        ],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
-            "@vendor_ts__windows-targets-0.52.6//:windows_targets",  # cfg(all(windows, not(target_vendor = "win7")))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
         ],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(getrandom_backend = "custom", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
         ],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(getrandom_backend = "custom", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
         ],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(any(target_os = "haiku", target_os = "redox", target_os = "nto", target_os = "aix"))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(any(target_os = "haiku", target_os = "redox", target_os = "nto", target_os = "aix"))
         ],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(getrandom_backend = "custom", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
         ],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(getrandom_backend = "custom", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
         ],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(getrandom_backend = "custom", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
         ],
         "@rules_rust//rust/platform:i686-apple-darwin": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(any(target_os = "macos", target_os = "openbsd", target_os = "vita", target_os = "emscripten"))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(any(target_os = "macos", target_os = "openbsd", target_os = "vita", target_os = "emscripten"))
         ],
         "@rules_rust//rust/platform:i686-linux-android": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(getrandom_backend = "custom", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
-        ],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "@vendor_ts__windows-targets-0.52.6//:windows_targets",  # cfg(all(windows, not(target_vendor = "win7")))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
         ],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(any(target_os = "dragonfly", target_os = "freebsd", target_os = "hurd", target_os = "illumos", all(target_os = "horizon", target_arch = "arm")))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(any(target_os = "dragonfly", target_os = "freebsd", target_os = "hurd", target_os = "illumos", target_os = "cygwin", all(target_os = "horizon", target_arch = "arm")))
         ],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(getrandom_backend = "custom", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
         ],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(getrandom_backend = "custom", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
+        ],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
         ],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(getrandom_backend = "custom", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
+        ],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(any(target_os = "macos", target_os = "openbsd", target_os = "vita", target_os = "emscripten"))
+        ],
+        "@rules_rust//rust/platform:wasm32-wasip2": [
+            "@vendor_ts__wasi-0.14.5-wasi-0.2.4//:wasi",  # cfg(all(target_arch = "wasm32", target_os = "wasi", target_env = "p2"))
         ],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(any(target_os = "macos", target_os = "openbsd", target_os = "vita", target_os = "emscripten"))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(any(target_os = "macos", target_os = "openbsd", target_os = "vita", target_os = "emscripten"))
         ],
         "@rules_rust//rust/platform:x86_64-apple-ios": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(any(target_os = "ios", target_os = "visionos", target_os = "watchos", target_os = "tvos"))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(any(target_os = "ios", target_os = "visionos", target_os = "watchos", target_os = "tvos"))
         ],
         "@rules_rust//rust/platform:x86_64-linux-android": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(getrandom_backend = "custom", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
-        ],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
-            "@vendor_ts__windows-targets-0.52.6//:windows_targets",  # cfg(all(windows, not(target_vendor = "win7")))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
         ],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(any(target_os = "dragonfly", target_os = "freebsd", target_os = "hurd", target_os = "illumos", all(target_os = "horizon", target_arch = "arm")))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(any(target_os = "dragonfly", target_os = "freebsd", target_os = "hurd", target_os = "illumos", target_os = "cygwin", all(target_os = "horizon", target_arch = "arm")))
         ],
         "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(getrandom_backend = "custom", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
         ],
         "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(getrandom_backend = "custom", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
         ],
         "//conditions:default": [],
     }),
@@ -230,7 +234,7 @@ cargo_build_script(
         "noclippy",
         "norustfmt",
     ],
-    version = "0.3.1",
+    version = "0.3.3",
     visibility = ["//visibility:private"],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.glob-0.3.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.glob-0.3.3.bazel
similarity index 93%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.glob-0.3.2.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.glob-0.3.3.bazel
index 8b0a41ca41f..6ce6e3c9719 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.glob-0.3.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.glob-0.3.3.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,5 +92,5 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.3.2",
+    version = "0.3.3",
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.globset-0.4.15.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.globset-0.4.16.bazel
similarity index 88%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.globset-0.4.15.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.globset-0.4.16.bazel
index 23ffeea84c3..8a77be50b7f 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.globset-0.4.15.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.globset-0.4.16.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -92,12 +96,12 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.4.15",
+    version = "0.4.16",
     deps = [
         "@vendor_ts__aho-corasick-1.1.3//:aho_corasick",
-        "@vendor_ts__bstr-1.11.3//:bstr",
-        "@vendor_ts__log-0.4.27//:log",
-        "@vendor_ts__regex-automata-0.4.9//:regex_automata",
-        "@vendor_ts__regex-syntax-0.8.5//:regex_syntax",
+        "@vendor_ts__bstr-1.12.0//:bstr",
+        "@vendor_ts__log-0.4.28//:log",
+        "@vendor_ts__regex-automata-0.4.11//:regex_automata",
+        "@vendor_ts__regex-syntax-0.8.6//:regex_syntax",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.12.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.12.3.bazel
index aa0a973bafe..57dc7dc0b07 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.12.3.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.12.3.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.14.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.14.5.bazel
index ba496ad4471..dadefeac311 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.14.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.14.5.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.15.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.15.5.bazel
similarity index 93%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.15.2.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.15.5.bazel
index 73f285ddc42..b7b644fb681 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.15.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.15.5.bazel
@@ -78,12 +78,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -96,7 +100,7 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.15.2",
+    version = "0.15.5",
     deps = [
         "@vendor_ts__allocator-api2-0.2.21//:allocator_api2",
         "@vendor_ts__equivalent-1.0.2//:equivalent",
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashlink-0.10.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashlink-0.10.0.bazel
index 77d4a570d12..c4549368f6c 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashlink-0.10.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashlink-0.10.0.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -90,6 +94,6 @@ rust_library(
     }),
     version = "0.10.0",
     deps = [
-        "@vendor_ts__hashbrown-0.15.2//:hashbrown",
+        "@vendor_ts__hashbrown-0.15.5//:hashbrown",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.heck-0.5.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.heck-0.5.0.bazel
index 8332feb628b..78a22ad0140 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.heck-0.5.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.heck-0.5.0.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hermit-abi-0.5.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hermit-abi-0.5.2.bazel
index a8ce19b7407..a7fa4e0c9e1 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hermit-abi-0.5.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hermit-abi-0.5.2.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hex-0.4.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hex-0.4.3.bazel
index c04fd290de8..2d7ca484cad 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hex-0.4.3.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hex-0.4.3.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.home-0.5.11.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.home-0.5.11.bazel
index 8f5c82b71d0..3f5d6f3e711 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.home-0.5.11.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.home-0.5.11.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.iana-time-zone-0.1.61.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.iana-time-zone-0.1.63.bazel
similarity index 84%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.iana-time-zone-0.1.61.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.iana-time-zone-0.1.63.bazel
index 04cb0e6a4e6..2363e88f60e 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.iana-time-zone-0.1.61.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.iana-time-zone-0.1.63.bazel
@@ -38,7 +38,7 @@ rust_library(
         "fallback",
     ],
     crate_root = "src/lib.rs",
-    edition = "2018",
+    edition = "2021",
     rustc_env_files = [
         ":cargo_toml_env_vars",
     ],
@@ -73,12 +73,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -91,50 +95,51 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.1.61",
+    version = "0.1.63",
     deps = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [
-            "@vendor_ts__core-foundation-sys-0.8.7//:core_foundation_sys",  # cfg(any(target_os = "macos", target_os = "ios"))
+            "@vendor_ts__core-foundation-sys-0.8.7//:core_foundation_sys",  # cfg(target_vendor = "apple")
         ],
         "@rules_rust//rust/platform:aarch64-apple-ios": [
-            "@vendor_ts__core-foundation-sys-0.8.7//:core_foundation_sys",  # cfg(any(target_os = "macos", target_os = "ios"))
+            "@vendor_ts__core-foundation-sys-0.8.7//:core_foundation_sys",  # cfg(target_vendor = "apple")
         ],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
-            "@vendor_ts__core-foundation-sys-0.8.7//:core_foundation_sys",  # cfg(any(target_os = "macos", target_os = "ios"))
+            "@vendor_ts__core-foundation-sys-0.8.7//:core_foundation_sys",  # cfg(target_vendor = "apple")
         ],
         "@rules_rust//rust/platform:aarch64-linux-android": [
             "@vendor_ts__android_system_properties-0.1.5//:android_system_properties",  # cfg(target_os = "android")
         ],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
-            "@vendor_ts__windows-core-0.52.0//:windows_core",  # cfg(target_os = "windows")
+            "@vendor_ts__windows-core-0.61.2//:windows_core",  # cfg(target_os = "windows")
         ],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [
             "@vendor_ts__android_system_properties-0.1.5//:android_system_properties",  # cfg(target_os = "android")
         ],
         "@rules_rust//rust/platform:i686-apple-darwin": [
-            "@vendor_ts__core-foundation-sys-0.8.7//:core_foundation_sys",  # cfg(any(target_os = "macos", target_os = "ios"))
+            "@vendor_ts__core-foundation-sys-0.8.7//:core_foundation_sys",  # cfg(target_vendor = "apple")
         ],
         "@rules_rust//rust/platform:i686-linux-android": [
             "@vendor_ts__android_system_properties-0.1.5//:android_system_properties",  # cfg(target_os = "android")
         ],
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "@vendor_ts__windows-core-0.52.0//:windows_core",  # cfg(target_os = "windows")
+            "@vendor_ts__windows-core-0.61.2//:windows_core",  # cfg(target_os = "windows")
         ],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [
-            "@vendor_ts__js-sys-0.3.76//:js_sys",  # cfg(all(target_arch = "wasm32", target_os = "unknown"))
-            "@vendor_ts__wasm-bindgen-0.2.99//:wasm_bindgen",  # cfg(all(target_arch = "wasm32", target_os = "unknown"))
+            "@vendor_ts__js-sys-0.3.78//:js_sys",  # cfg(all(target_arch = "wasm32", target_os = "unknown"))
+            "@vendor_ts__log-0.4.28//:log",  # cfg(all(target_arch = "wasm32", target_os = "unknown"))
+            "@vendor_ts__wasm-bindgen-0.2.101//:wasm_bindgen",  # cfg(all(target_arch = "wasm32", target_os = "unknown"))
         ],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [
-            "@vendor_ts__core-foundation-sys-0.8.7//:core_foundation_sys",  # cfg(any(target_os = "macos", target_os = "ios"))
+            "@vendor_ts__core-foundation-sys-0.8.7//:core_foundation_sys",  # cfg(target_vendor = "apple")
         ],
         "@rules_rust//rust/platform:x86_64-apple-ios": [
-            "@vendor_ts__core-foundation-sys-0.8.7//:core_foundation_sys",  # cfg(any(target_os = "macos", target_os = "ios"))
+            "@vendor_ts__core-foundation-sys-0.8.7//:core_foundation_sys",  # cfg(target_vendor = "apple")
         ],
         "@rules_rust//rust/platform:x86_64-linux-android": [
             "@vendor_ts__android_system_properties-0.1.5//:android_system_properties",  # cfg(target_os = "android")
         ],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
-            "@vendor_ts__windows-core-0.52.0//:windows_core",  # cfg(target_os = "windows")
+            "@vendor_ts__windows-core-0.61.2//:windows_core",  # cfg(target_os = "windows")
         ],
         "//conditions:default": [],
     }),
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.iana-time-zone-haiku-0.1.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.iana-time-zone-haiku-0.1.2.bazel
index b41fc811758..0a2ab447f06 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.iana-time-zone-haiku-0.1.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.iana-time-zone-haiku-0.1.2.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -149,7 +153,7 @@ cargo_build_script(
     version = "0.1.2",
     visibility = ["//visibility:private"],
     deps = [
-        "@vendor_ts__cc-1.2.7//:cc",
+        "@vendor_ts__cc-1.2.37//:cc",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_collections-2.0.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_collections-2.0.0.bazel
index 73ee415f9a1..03ec6ed98b2 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_collections-2.0.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_collections-2.0.0.bazel
@@ -73,12 +73,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -93,9 +97,9 @@ rust_library(
     }),
     version = "2.0.0",
     deps = [
-        "@vendor_ts__potential_utf-0.1.2//:potential_utf",
+        "@vendor_ts__potential_utf-0.1.3//:potential_utf",
         "@vendor_ts__yoke-0.8.0//:yoke",
         "@vendor_ts__zerofrom-0.1.6//:zerofrom",
-        "@vendor_ts__zerovec-0.11.2//:zerovec",
+        "@vendor_ts__zerovec-0.11.4//:zerovec",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_locale_core-2.0.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_locale_core-2.0.0.bazel
index 91cf4cab296..78b39e2617e 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_locale_core-2.0.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_locale_core-2.0.0.bazel
@@ -76,12 +76,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -99,6 +103,6 @@ rust_library(
         "@vendor_ts__litemap-0.8.0//:litemap",
         "@vendor_ts__tinystr-0.8.1//:tinystr",
         "@vendor_ts__writeable-0.6.1//:writeable",
-        "@vendor_ts__zerovec-0.11.2//:zerovec",
+        "@vendor_ts__zerovec-0.11.4//:zerovec",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_normalizer-2.0.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_normalizer-2.0.0.bazel
index f604cf034a9..a99daf34fd7 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_normalizer-2.0.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_normalizer-2.0.0.bazel
@@ -76,12 +76,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -100,6 +104,6 @@ rust_library(
         "@vendor_ts__icu_normalizer_data-2.0.0//:icu_normalizer_data",
         "@vendor_ts__icu_provider-2.0.0//:icu_provider",
         "@vendor_ts__smallvec-1.15.1//:smallvec",
-        "@vendor_ts__zerovec-0.11.2//:zerovec",
+        "@vendor_ts__zerovec-0.11.4//:zerovec",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_normalizer_data-2.0.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_normalizer_data-2.0.0.bazel
index 1bc714152c0..a54e63d5cbc 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_normalizer_data-2.0.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_normalizer_data-2.0.0.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_properties-2.0.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_properties-2.0.1.bazel
index cee332f06e1..31ae1bf654d 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_properties-2.0.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_properties-2.0.1.bazel
@@ -76,12 +76,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -100,8 +104,8 @@ rust_library(
         "@vendor_ts__icu_locale_core-2.0.0//:icu_locale_core",
         "@vendor_ts__icu_properties_data-2.0.1//:icu_properties_data",
         "@vendor_ts__icu_provider-2.0.0//:icu_provider",
-        "@vendor_ts__potential_utf-0.1.2//:potential_utf",
+        "@vendor_ts__potential_utf-0.1.3//:potential_utf",
         "@vendor_ts__zerotrie-0.2.2//:zerotrie",
-        "@vendor_ts__zerovec-0.11.2//:zerovec",
+        "@vendor_ts__zerovec-0.11.4//:zerovec",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_properties_data-2.0.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_properties_data-2.0.1.bazel
index 4779fee40dd..f74ecbdc568 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_properties_data-2.0.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_properties_data-2.0.1.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_provider-2.0.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_provider-2.0.0.bazel
index 0a9c998ee12..cdb3b7c9449 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_provider-2.0.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_provider-2.0.0.bazel
@@ -77,12 +77,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -104,6 +108,6 @@ rust_library(
         "@vendor_ts__yoke-0.8.0//:yoke",
         "@vendor_ts__zerofrom-0.1.6//:zerofrom",
         "@vendor_ts__zerotrie-0.2.2//:zerotrie",
-        "@vendor_ts__zerovec-0.11.2//:zerovec",
+        "@vendor_ts__zerovec-0.11.4//:zerovec",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ident_case-1.0.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ident_case-1.0.1.bazel
index e4bc23dc1af..de24b64e74b 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ident_case-1.0.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ident_case-1.0.1.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.idna-1.0.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.idna-1.1.0.bazel
similarity index 93%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.idna-1.0.3.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.idna-1.1.0.bazel
index ca624309664..c79d20f3a9e 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.idna-1.0.3.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.idna-1.1.0.bazel
@@ -75,12 +75,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -93,7 +97,7 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "1.0.3",
+    version = "1.1.0",
     deps = [
         "@vendor_ts__idna_adapter-1.2.1//:idna_adapter",
         "@vendor_ts__smallvec-1.15.1//:smallvec",
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.idna_adapter-1.2.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.idna_adapter-1.2.1.bazel
index ca74505a064..538648fc1eb 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.idna_adapter-1.2.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.idna_adapter-1.2.1.bazel
@@ -73,12 +73,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.indexmap-1.9.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.indexmap-1.9.3.bazel
index a529a3ed814..f3c41fc7d20 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.indexmap-1.9.3.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.indexmap-1.9.3.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -150,7 +154,7 @@ cargo_build_script(
     version = "1.9.3",
     visibility = ["//visibility:private"],
     deps = [
-        "@vendor_ts__autocfg-1.4.0//:autocfg",
+        "@vendor_ts__autocfg-1.5.0//:autocfg",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.indexmap-2.11.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.indexmap-2.11.4.bazel
new file mode 100644
index 00000000000..339324bc897
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.indexmap-2.11.4.bazel
@@ -0,0 +1,106 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "indexmap",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "serde",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=indexmap",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "2.11.4",
+    deps = [
+        "@vendor_ts__equivalent-1.0.2//:equivalent",
+        "@vendor_ts__hashbrown-0.15.5//:hashbrown",
+        "@vendor_ts__serde_core-1.0.228//:serde_core",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inlinable_string-0.1.15.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inlinable_string-0.1.15.bazel
index 6a2221969bf..838f8dfd6ce 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inlinable_string-0.1.15.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inlinable_string-0.1.15.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inotify-0.11.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inotify-0.11.0.bazel
index 455b1ada88b..687f07ab93b 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inotify-0.11.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inotify-0.11.0.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -90,8 +94,8 @@ rust_library(
     }),
     version = "0.11.0",
     deps = [
-        "@vendor_ts__bitflags-2.9.1//:bitflags",
+        "@vendor_ts__bitflags-2.9.4//:bitflags",
         "@vendor_ts__inotify-sys-0.1.5//:inotify_sys",
-        "@vendor_ts__libc-0.2.174//:libc",
+        "@vendor_ts__libc-0.2.175//:libc",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inotify-sys-0.1.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inotify-sys-0.1.5.bazel
index 64a360cc60b..c9e73bfb91c 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inotify-sys-0.1.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inotify-sys-0.1.5.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -90,6 +94,6 @@ rust_library(
     }),
     version = "0.1.5",
     deps = [
-        "@vendor_ts__libc-0.2.174//:libc",
+        "@vendor_ts__libc-0.2.175//:libc",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.quote-1.0.40.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.intrusive-collections-0.9.7.bazel
similarity index 89%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.quote-1.0.40.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.intrusive-collections-0.9.7.bazel
index 49b6c201521..4135430c0dd 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.quote-1.0.40.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.intrusive-collections-0.9.7.bazel
@@ -17,7 +17,7 @@ cargo_toml_env_vars(
 )
 
 rust_library(
-    name = "quote",
+    name = "intrusive_collections",
     srcs = glob(
         include = ["**/*.rs"],
         allow_empty = True,
@@ -35,8 +35,8 @@ rust_library(
         ],
     ),
     crate_features = [
+        "alloc",
         "default",
-        "proc-macro",
     ],
     crate_root = "src/lib.rs",
     edition = "2018",
@@ -48,7 +48,7 @@ rust_library(
     ],
     tags = [
         "cargo-bazel",
-        "crate-name=quote",
+        "crate-name=intrusive-collections",
         "manual",
         "noclippy",
         "norustfmt",
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -92,8 +96,8 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "1.0.40",
+    version = "0.9.7",
     deps = [
-        "@vendor_ts__proc-macro2-1.0.95//:proc_macro2",
+        "@vendor_ts__memoffset-0.9.1//:memoffset",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.is_terminal_polyfill-1.70.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.is_terminal_polyfill-1.70.1.bazel
index 196b9d70b34..178eb9ea801 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.is_terminal_polyfill-1.70.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.is_terminal_polyfill-1.70.1.bazel
@@ -73,12 +73,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itertools-0.12.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itertools-0.12.1.bazel
index 4a7838edb6f..8c01d09ec29 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itertools-0.12.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itertools-0.12.1.bazel
@@ -75,12 +75,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itertools-0.14.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itertools-0.14.0.bazel
index d0885a15d3d..ff6f7e18e76 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itertools-0.14.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itertools-0.14.0.bazel
@@ -75,12 +75,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itoa-1.0.15.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itoa-1.0.15.bazel
index d0d13ab1a57..64e8b1bf5db 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itoa-1.0.15.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itoa-1.0.15.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.jobserver-0.1.32.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.jobserver-0.1.32.bazel
deleted file mode 100644
index 5e1bfd6978c..00000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.jobserver-0.1.32.bazel
+++ /dev/null
@@ -1,167 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "jobserver",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=jobserver",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.1.32",
-    deps = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:aarch64-linux-android": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:i686-apple-darwin": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:i686-linux-android": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:x86_64-linux-android": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
-        ],
-        "//conditions:default": [],
-    }),
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.mio-1.0.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.jobserver-0.1.34.bazel
similarity index 71%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.mio-1.0.3.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.jobserver-0.1.34.bazel
index 10d2ed3a4f3..6f7696c7983 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.mio-1.0.3.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.jobserver-0.1.34.bazel
@@ -17,7 +17,7 @@ cargo_toml_env_vars(
 )
 
 rust_library(
-    name = "mio",
+    name = "jobserver",
     srcs = glob(
         include = ["**/*.rs"],
         allow_empty = True,
@@ -34,12 +34,6 @@ rust_library(
             "WORKSPACE.bazel",
         ],
     ),
-    crate_features = [
-        "default",
-        "log",
-        "os-ext",
-        "os-poll",
-    ],
     crate_root = "src/lib.rs",
     edition = "2021",
     rustc_env_files = [
@@ -50,7 +44,7 @@ rust_library(
     ],
     tags = [
         "cargo-bazel",
-        "crate-name=mio",
+        "crate-name=jobserver",
         "manual",
         "noclippy",
         "norustfmt",
@@ -76,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -94,94 +92,94 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "1.0.3",
-    deps = [
-        "@vendor_ts__log-0.4.27//:log",
-    ] + select({
+    version = "0.1.34",
+    deps = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:aarch64-apple-ios": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:aarch64-linux-android": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
-            "@vendor_ts__windows-sys-0.52.0//:windows_sys",  # cfg(windows)
+            "@vendor_ts__getrandom-0.3.3//:getrandom",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:i686-apple-darwin": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:i686-linux-android": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "@vendor_ts__windows-sys-0.52.0//:windows_sys",  # cfg(windows)
+            "@vendor_ts__getrandom-0.3.3//:getrandom",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
-        "@rules_rust//rust/platform:wasm32-wasip1": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(target_os = "wasi")
-            "@vendor_ts__wasi-0.11.0-wasi-snapshot-preview1//:wasi",  # cfg(target_os = "wasi")
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:x86_64-apple-ios": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:x86_64-linux-android": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
-            "@vendor_ts__windows-sys-0.52.0//:windows_sys",  # cfg(windows)
+            "@vendor_ts__getrandom-0.3.3//:getrandom",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "//conditions:default": [],
     }),
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.jod-thread-1.0.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.jod-thread-1.0.0.bazel
index 46ed18db7c9..9659dec0e4b 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.jod-thread-1.0.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.jod-thread-1.0.0.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.js-sys-0.3.76.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.js-sys-0.3.78.bazel
similarity index 90%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.js-sys-0.3.76.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.js-sys-0.3.78.bazel
index aabb25c011c..3a2d6e01b80 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.js-sys-0.3.76.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.js-sys-0.3.78.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -92,9 +96,9 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.3.76",
+    version = "0.3.78",
     deps = [
-        "@vendor_ts__once_cell-1.20.3//:once_cell",
-        "@vendor_ts__wasm-bindgen-0.2.99//:wasm_bindgen",
+        "@vendor_ts__once_cell-1.21.3//:once_cell",
+        "@vendor_ts__wasm-bindgen-0.2.101//:wasm_bindgen",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.kqueue-1.0.8.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.kqueue-1.1.1.bazel
similarity index 91%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.kqueue-1.0.8.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.kqueue-1.1.1.bazel
index 7fa12a19651..2163666cef7 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.kqueue-1.0.8.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.kqueue-1.1.1.bazel
@@ -35,7 +35,7 @@ rust_library(
         ],
     ),
     crate_root = "src/lib.rs",
-    edition = "2018",
+    edition = "2021",
     rustc_env_files = [
         ":cargo_toml_env_vars",
     ],
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,9 +92,9 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "1.0.8",
+    version = "1.1.1",
     deps = [
         "@vendor_ts__kqueue-sys-1.0.4//:kqueue_sys",
-        "@vendor_ts__libc-0.2.174//:libc",
+        "@vendor_ts__libc-0.2.175//:libc",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.kqueue-sys-1.0.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.kqueue-sys-1.0.4.bazel
index ad1e457dfe6..a162ce9265a 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.kqueue-sys-1.0.4.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.kqueue-sys-1.0.4.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -91,6 +95,6 @@ rust_library(
     version = "1.0.4",
     deps = [
         "@vendor_ts__bitflags-1.3.2//:bitflags",
-        "@vendor_ts__libc-0.2.174//:libc",
+        "@vendor_ts__libc-0.2.175//:libc",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.la-arena-0.3.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.la-arena-0.3.1.bazel
index 63ae48cb758..078852cfe3c 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.la-arena-0.3.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.la-arena-0.3.1.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.lazy_static-1.5.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.lazy_static-1.5.0.bazel
index 8fdf1e161e9..204862e396e 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.lazy_static-1.5.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.lazy_static-1.5.0.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.libc-0.2.174.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.libc-0.2.175.bazel
similarity index 93%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.libc-0.2.174.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.libc-0.2.175.bazel
index 55fe8a8115b..b00d5c2476c 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.libc-0.2.174.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.libc-0.2.175.bazel
@@ -78,12 +78,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -96,9 +100,9 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.2.174",
+    version = "0.2.175",
     deps = [
-        "@vendor_ts__libc-0.2.174//:build_script_build",
+        "@vendor_ts__libc-0.2.175//:build_script_build",
     ],
 )
 
@@ -154,7 +158,7 @@ cargo_build_script(
         "noclippy",
         "norustfmt",
     ],
-    version = "0.2.174",
+    version = "0.2.175",
     visibility = ["//visibility:private"],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.libredox-0.1.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.libredox-0.1.3.bazel
deleted file mode 100644
index e29c1c5302c..00000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.libredox-0.1.3.bazel
+++ /dev/null
@@ -1,97 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "libredox",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=libredox",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.1.3",
-    deps = [
-        "@vendor_ts__bitflags-2.9.1//:bitflags",
-        "@vendor_ts__libc-0.2.174//:libc",
-        "@vendor_ts__redox_syscall-0.5.8//:syscall",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.line-index-0.1.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.line-index-0.1.2.bazel
index 95a868e1ad3..6570e76db93 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.line-index-0.1.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.line-index-0.1.2.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.litemap-0.8.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.litemap-0.8.0.bazel
index 0e547980f69..47e14a2a214 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.litemap-0.8.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.litemap-0.8.0.bazel
@@ -73,12 +73,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.lock_api-0.4.12.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.lock_api-0.4.13.bazel
similarity index 92%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.lock_api-0.4.12.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.lock_api-0.4.13.bazel
index 24de2e5e9b4..e369edeb455 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.lock_api-0.4.12.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.lock_api-0.4.13.bazel
@@ -78,12 +78,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -96,9 +100,9 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.4.12",
+    version = "0.4.13",
     deps = [
-        "@vendor_ts__lock_api-0.4.12//:build_script_build",
+        "@vendor_ts__lock_api-0.4.13//:build_script_build",
         "@vendor_ts__scopeguard-1.2.0//:scopeguard",
     ],
 )
@@ -155,10 +159,10 @@ cargo_build_script(
         "noclippy",
         "norustfmt",
     ],
-    version = "0.4.12",
+    version = "0.4.13",
     visibility = ["//visibility:private"],
     deps = [
-        "@vendor_ts__autocfg-1.4.0//:autocfg",
+        "@vendor_ts__autocfg-1.5.0//:autocfg",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.log-0.3.9.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.log-0.3.9.bazel
index cc061b625ca..a2b546f0520 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.log-0.3.9.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.log-0.3.9.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -94,6 +98,6 @@ rust_library(
     }),
     version = "0.3.9",
     deps = [
-        "@vendor_ts__log-0.4.27//:log",
+        "@vendor_ts__log-0.4.28//:log",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.log-0.4.27.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.log-0.4.28.bazel
similarity index 93%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.log-0.4.27.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.log-0.4.28.bazel
index 8e1f8897335..b3bed18c81c 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.log-0.4.27.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.log-0.4.28.bazel
@@ -73,12 +73,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -91,5 +95,5 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.4.27",
+    version = "0.4.28",
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.matchers-0.1.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.matchers-0.2.0.bazel
similarity index 91%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.matchers-0.1.0.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.matchers-0.2.0.bazel
index 9a3778fcabc..cc8ef40941e 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.matchers-0.1.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.matchers-0.2.0.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,8 +92,8 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.1.0",
+    version = "0.2.0",
     deps = [
-        "@vendor_ts__regex-automata-0.1.10//:regex_automata",
+        "@vendor_ts__regex-automata-0.4.11//:regex_automata",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.memchr-2.7.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.memchr-2.7.5.bazel
index 9af3cd4c572..03b04580ea9 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.memchr-2.7.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.memchr-2.7.5.bazel
@@ -75,12 +75,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.memoffset-0.9.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.memoffset-0.9.1.bazel
index c0df5fd6d15..3485ee47710 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.memoffset-0.9.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.memoffset-0.9.1.bazel
@@ -77,12 +77,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -155,7 +159,7 @@ cargo_build_script(
     version = "0.9.1",
     visibility = ["//visibility:private"],
     deps = [
-        "@vendor_ts__autocfg-1.4.0//:autocfg",
+        "@vendor_ts__autocfg-1.5.0//:autocfg",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.miniz_oxide-0.8.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.miniz_oxide-0.8.9.bazel
similarity index 92%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.miniz_oxide-0.8.5.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.miniz_oxide-0.8.9.bazel
index bc02579b4ea..6f1ca1a97da 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.miniz_oxide-0.8.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.miniz_oxide-0.8.9.bazel
@@ -73,12 +73,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -91,8 +95,8 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.8.5",
+    version = "0.8.9",
     deps = [
-        "@vendor_ts__adler2-2.0.0//:adler2",
+        "@vendor_ts__adler2-2.0.1//:adler2",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.filetime-0.2.25.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.mio-1.0.4.bazel
similarity index 67%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.filetime-0.2.25.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.mio-1.0.4.bazel
index 35820d594a5..539da180bb7 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.filetime-0.2.25.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.mio-1.0.4.bazel
@@ -17,7 +17,7 @@ cargo_toml_env_vars(
 )
 
 rust_library(
-    name = "filetime",
+    name = "mio",
     srcs = glob(
         include = ["**/*.rs"],
         allow_empty = True,
@@ -34,8 +34,14 @@ rust_library(
             "WORKSPACE.bazel",
         ],
     ),
+    crate_features = [
+        "default",
+        "log",
+        "os-ext",
+        "os-poll",
+    ],
     crate_root = "src/lib.rs",
-    edition = "2018",
+    edition = "2021",
     rustc_env_files = [
         ":cargo_toml_env_vars",
     ],
@@ -44,7 +50,7 @@ rust_library(
     ],
     tags = [
         "cargo-bazel",
-        "crate-name=filetime",
+        "crate-name=mio",
         "manual",
         "noclippy",
         "norustfmt",
@@ -70,12 +76,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,90 +98,108 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.2.25",
+    version = "1.0.4",
     deps = [
-        "@vendor_ts__cfg-if-1.0.1//:cfg_if",
+        "@vendor_ts__log-0.4.28//:log",
     ] + select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:aarch64-apple-ios": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:aarch64-linux-android": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
             "@vendor_ts__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:i686-apple-darwin": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:i686-linux-android": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [
             "@vendor_ts__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:wasm32-wasip1": [
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(target_os = "wasi")
+            "@vendor_ts__wasi-0.11.1-wasi-snapshot-preview1//:wasi",  # cfg(target_os = "wasi")
+        ],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(target_os = "wasi")
+            "@vendor_ts__wasi-0.11.1-wasi-snapshot-preview1//:wasi",  # cfg(target_os = "wasi")
+        ],
+        "@rules_rust//rust/platform:wasm32-wasip2": [
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(target_os = "wasi")
+            "@vendor_ts__wasi-0.11.1-wasi-snapshot-preview1//:wasi",  # cfg(target_os = "wasi")
         ],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:x86_64-apple-ios": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:x86_64-linux-android": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
             "@vendor_ts__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "//conditions:default": [],
     }),
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.miow-0.6.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.miow-0.6.1.bazel
similarity index 91%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.miow-0.6.0.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.miow-0.6.1.bazel
index 6f99dee0d2d..8025e8f3b2c 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.miow-0.6.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.miow-0.6.1.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,8 +92,8 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.6.0",
+    version = "0.6.1",
     deps = [
-        "@vendor_ts__windows-sys-0.48.0//:windows_sys",
+        "@vendor_ts__windows-sys-0.61.0//:windows_sys",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.mustache-0.9.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.mustache-0.9.0.bazel
index ae043e0e2a1..aec7c2bd00b 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.mustache-0.9.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.mustache-0.9.0.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -91,6 +95,6 @@ rust_library(
     version = "0.9.0",
     deps = [
         "@vendor_ts__log-0.3.9//:log",
-        "@vendor_ts__serde-1.0.219//:serde",
+        "@vendor_ts__serde-1.0.228//:serde",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.nohash-hasher-0.2.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.nohash-hasher-0.2.0.bazel
index ed88ea3eebb..6ed4e8027e7 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.nohash-hasher-0.2.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.nohash-hasher-0.2.0.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.notify-8.0.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.notify-8.2.0.bazel
similarity index 78%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.notify-8.0.0.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.notify-8.2.0.bazel
index 36f3abaff0a..6d024f0d1d9 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.notify-8.0.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.notify-8.2.0.bazel
@@ -75,12 +75,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -93,106 +97,109 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "8.0.0",
+    version = "8.2.0",
     deps = [
-        "@vendor_ts__filetime-0.2.25//:filetime",
-        "@vendor_ts__libc-0.2.174//:libc",
-        "@vendor_ts__log-0.4.27//:log",
+        "@vendor_ts__libc-0.2.175//:libc",
+        "@vendor_ts__log-0.4.28//:log",
         "@vendor_ts__notify-types-2.0.0//:notify_types",
         "@vendor_ts__walkdir-2.5.0//:walkdir",
     ] + select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [
-            "@vendor_ts__bitflags-2.9.1//:bitflags",  # cfg(target_os = "macos")
+            "@vendor_ts__bitflags-2.9.4//:bitflags",  # cfg(target_os = "macos")
             "@vendor_ts__fsevent-sys-4.1.0//:fsevent_sys",  # aarch64-apple-darwin
         ],
         "@rules_rust//rust/platform:aarch64-apple-ios": [
-            "@vendor_ts__kqueue-1.0.8//:kqueue",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
-            "@vendor_ts__mio-1.0.3//:mio",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
+            "@vendor_ts__kqueue-1.1.1//:kqueue",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
+            "@vendor_ts__mio-1.0.4//:mio",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
         ],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
-            "@vendor_ts__kqueue-1.0.8//:kqueue",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
-            "@vendor_ts__mio-1.0.3//:mio",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
+            "@vendor_ts__kqueue-1.1.1//:kqueue",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
+            "@vendor_ts__mio-1.0.4//:mio",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
         ],
         "@rules_rust//rust/platform:aarch64-linux-android": [
             "@vendor_ts__inotify-0.11.0//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
-            "@vendor_ts__mio-1.0.3//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__mio-1.0.4//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
         ],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
-            "@vendor_ts__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
+            "@vendor_ts__windows-sys-0.60.2//:windows_sys",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
             "@vendor_ts__inotify-0.11.0//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
-            "@vendor_ts__mio-1.0.3//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__mio-1.0.4//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
         ],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
             "@vendor_ts__inotify-0.11.0//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
-            "@vendor_ts__mio-1.0.3//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__mio-1.0.4//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
         ],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
             "@vendor_ts__inotify-0.11.0//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
-            "@vendor_ts__mio-1.0.3//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__mio-1.0.4//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
         ],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [
             "@vendor_ts__inotify-0.11.0//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
-            "@vendor_ts__mio-1.0.3//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__mio-1.0.4//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
         ],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
             "@vendor_ts__inotify-0.11.0//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
-            "@vendor_ts__mio-1.0.3//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__mio-1.0.4//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
         ],
         "@rules_rust//rust/platform:i686-apple-darwin": [
-            "@vendor_ts__bitflags-2.9.1//:bitflags",  # cfg(target_os = "macos")
+            "@vendor_ts__bitflags-2.9.4//:bitflags",  # cfg(target_os = "macos")
             "@vendor_ts__fsevent-sys-4.1.0//:fsevent_sys",  # i686-apple-darwin
         ],
         "@rules_rust//rust/platform:i686-linux-android": [
             "@vendor_ts__inotify-0.11.0//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
-            "@vendor_ts__mio-1.0.3//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__mio-1.0.4//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
         ],
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "@vendor_ts__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
+            "@vendor_ts__windows-sys-0.60.2//:windows_sys",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [
-            "@vendor_ts__kqueue-1.0.8//:kqueue",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
-            "@vendor_ts__mio-1.0.3//:mio",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
+            "@vendor_ts__kqueue-1.1.1//:kqueue",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
+            "@vendor_ts__mio-1.0.4//:mio",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
         ],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
             "@vendor_ts__inotify-0.11.0//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
-            "@vendor_ts__mio-1.0.3//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__mio-1.0.4//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
         ],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
             "@vendor_ts__inotify-0.11.0//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
-            "@vendor_ts__mio-1.0.3//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__mio-1.0.4//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+        ],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [
+            "@vendor_ts__inotify-0.11.0//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__mio-1.0.4//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
         ],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
             "@vendor_ts__inotify-0.11.0//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
-            "@vendor_ts__mio-1.0.3//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__mio-1.0.4//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
         ],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [
-            "@vendor_ts__bitflags-2.9.1//:bitflags",  # cfg(target_os = "macos")
+            "@vendor_ts__bitflags-2.9.4//:bitflags",  # cfg(target_os = "macos")
             "@vendor_ts__fsevent-sys-4.1.0//:fsevent_sys",  # x86_64-apple-darwin
         ],
         "@rules_rust//rust/platform:x86_64-apple-ios": [
-            "@vendor_ts__kqueue-1.0.8//:kqueue",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
-            "@vendor_ts__mio-1.0.3//:mio",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
+            "@vendor_ts__kqueue-1.1.1//:kqueue",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
+            "@vendor_ts__mio-1.0.4//:mio",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
         ],
         "@rules_rust//rust/platform:x86_64-linux-android": [
             "@vendor_ts__inotify-0.11.0//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
-            "@vendor_ts__mio-1.0.3//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__mio-1.0.4//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
         ],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
-            "@vendor_ts__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
+            "@vendor_ts__windows-sys-0.60.2//:windows_sys",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
-            "@vendor_ts__kqueue-1.0.8//:kqueue",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
-            "@vendor_ts__mio-1.0.3//:mio",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
+            "@vendor_ts__kqueue-1.1.1//:kqueue",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
+            "@vendor_ts__mio-1.0.4//:mio",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
         ],
         "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
             "@vendor_ts__inotify-0.11.0//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
-            "@vendor_ts__mio-1.0.3//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__mio-1.0.4//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
         ],
         "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
             "@vendor_ts__inotify-0.11.0//:inotify",  # cfg(any(target_os = "linux", target_os = "android"))
-            "@vendor_ts__mio-1.0.3//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
+            "@vendor_ts__mio-1.0.4//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
         ],
         "//conditions:default": [],
     }),
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.notify-types-2.0.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.notify-types-2.0.0.bazel
index 4ec350cba96..643378311dd 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.notify-types-2.0.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.notify-types-2.0.0.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.nu-ansi-term-0.50.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.nu-ansi-term-0.50.1.bazel
new file mode 100644
index 00000000000..a12b6b5e5d7
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.nu-ansi-term-0.50.1.bazel
@@ -0,0 +1,120 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "nu_ansi_term",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    aliases = select({
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": {
+            "@vendor_ts__windows-sys-0.52.0//:windows_sys": "windows",  # cfg(windows)
+        },
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": {
+            "@vendor_ts__windows-sys-0.52.0//:windows_sys": "windows",  # cfg(windows)
+        },
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": {
+            "@vendor_ts__windows-sys-0.52.0//:windows_sys": "windows",  # cfg(windows)
+        },
+        "//conditions:default": {},
+    }),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=nu-ansi-term",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.50.1",
+    deps = select({
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
+            "@vendor_ts__windows-sys-0.52.0//:windows_sys",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
+            "@vendor_ts__windows-sys-0.52.0//:windows_sys",  # cfg(windows)
+        ],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
+            "@vendor_ts__windows-sys-0.52.0//:windows_sys",  # cfg(windows)
+        ],
+        "//conditions:default": [],
+    }),
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.num-conv-0.1.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.num-conv-0.1.0.bazel
index ee85d2c2961..7f7685c0d5b 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.num-conv-0.1.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.num-conv-0.1.0.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.num-traits-0.2.19.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.num-traits-0.2.19.bazel
index ac2b7c3b887..97a0e0a2f13 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.num-traits-0.2.19.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.num-traits-0.2.19.bazel
@@ -78,12 +78,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -157,7 +161,7 @@ cargo_build_script(
     version = "0.2.19",
     visibility = ["//visibility:private"],
     deps = [
-        "@vendor_ts__autocfg-1.4.0//:autocfg",
+        "@vendor_ts__autocfg-1.5.0//:autocfg",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.num_cpus-1.17.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.num_cpus-1.17.0.bazel
index 65ccdc7fd1a..0cd3c5c33dd 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.num_cpus-1.17.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.num_cpus-1.17.0.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -91,103 +95,115 @@ rust_library(
     version = "1.17.0",
     deps = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:aarch64-apple-ios": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:aarch64-linux-android": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:i686-apple-darwin": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:i686-linux-android": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
+        ],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
+        ],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:wasm32-wasip1": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
+        ],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
+        ],
+        "@rules_rust//rust/platform:wasm32-wasip2": [
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:x86_64-apple-ios": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:x86_64-linux-android": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:x86_64-unknown-none": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
         ],
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(not(windows))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
         ],
         "//conditions:default": [],
     }),
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.once_cell-1.20.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.once_cell-1.21.3.bazel
similarity index 93%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.once_cell-1.20.3.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.once_cell-1.21.3.bazel
index 4893cbf637e..686dd8f6a79 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.once_cell-1.20.3.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.once_cell-1.21.3.bazel
@@ -76,12 +76,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -94,5 +98,5 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "1.20.3",
+    version = "1.21.3",
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.once_cell_polyfill-1.70.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.once_cell_polyfill-1.70.1.bazel
new file mode 100644
index 00000000000..dc02094678d
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.once_cell_polyfill-1.70.1.bazel
@@ -0,0 +1,99 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "once_cell_polyfill",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=once_cell_polyfill",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.70.1",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.oorandom-11.1.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.oorandom-11.1.5.bazel
index a712daf3904..826c14777f0 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.oorandom-11.1.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.oorandom-11.1.5.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ordered-float-2.10.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ordered-float-2.10.1.bazel
index be67bf877f4..e9e1714252b 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ordered-float-2.10.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ordered-float-2.10.1.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.os_str_bytes-7.0.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.os_str_bytes-7.1.1.bazel
similarity index 93%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.os_str_bytes-7.0.0.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.os_str_bytes-7.1.1.bazel
index 5f68898f2b4..b957f54c950 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.os_str_bytes-7.0.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.os_str_bytes-7.1.1.bazel
@@ -75,12 +75,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -93,7 +97,7 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "7.0.0",
+    version = "7.1.1",
     deps = [
         "@vendor_ts__memchr-2.7.5//:memchr",
     ],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.indexmap-2.9.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.papaya-0.2.3.bazel
similarity index 91%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.indexmap-2.9.0.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.papaya-0.2.3.bazel
index 3016429fb5e..d10b3e75896 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.indexmap-2.9.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.papaya-0.2.3.bazel
@@ -17,7 +17,7 @@ cargo_toml_env_vars(
 )
 
 rust_library(
-    name = "indexmap",
+    name = "papaya",
     srcs = glob(
         include = ["**/*.rs"],
         allow_empty = True,
@@ -36,8 +36,6 @@ rust_library(
     ),
     crate_features = [
         "default",
-        "serde",
-        "std",
     ],
     crate_root = "src/lib.rs",
     edition = "2021",
@@ -49,7 +47,7 @@ rust_library(
     ],
     tags = [
         "cargo-bazel",
-        "crate-name=indexmap",
+        "crate-name=papaya",
         "manual",
         "noclippy",
         "norustfmt",
@@ -75,12 +73,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -93,10 +95,9 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "2.9.0",
+    version = "0.2.3",
     deps = [
         "@vendor_ts__equivalent-1.0.2//:equivalent",
-        "@vendor_ts__hashbrown-0.15.2//:hashbrown",
-        "@vendor_ts__serde-1.0.219//:serde",
+        "@vendor_ts__seize-0.5.0//:seize",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.parking_lot-0.12.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.parking_lot-0.12.4.bazel
similarity index 90%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.parking_lot-0.12.3.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.parking_lot-0.12.4.bazel
index a1275079363..4bc7f4f9bb8 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.parking_lot-0.12.3.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.parking_lot-0.12.4.bazel
@@ -73,12 +73,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -91,9 +95,9 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.12.3",
+    version = "0.12.4",
     deps = [
-        "@vendor_ts__lock_api-0.4.12//:lock_api",
-        "@vendor_ts__parking_lot_core-0.9.10//:parking_lot_core",
+        "@vendor_ts__lock_api-0.4.13//:lock_api",
+        "@vendor_ts__parking_lot_core-0.9.11//:parking_lot_core",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.parking_lot_core-0.9.10.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.parking_lot_core-0.9.11.bazel
similarity index 77%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.parking_lot_core-0.9.10.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.parking_lot_core-0.9.11.bazel
index 75c9885a206..e602d4cf358 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.parking_lot_core-0.9.10.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.parking_lot_core-0.9.11.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -92,92 +96,98 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.9.10",
+    version = "0.9.11",
     deps = [
-        "@vendor_ts__cfg-if-1.0.1//:cfg_if",
-        "@vendor_ts__parking_lot_core-0.9.10//:build_script_build",
+        "@vendor_ts__cfg-if-1.0.3//:cfg_if",
+        "@vendor_ts__parking_lot_core-0.9.11//:build_script_build",
         "@vendor_ts__smallvec-1.15.1//:smallvec",
     ] + select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:aarch64-apple-ios": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:aarch64-linux-android": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
             "@vendor_ts__windows-targets-0.52.6//:windows_targets",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:i686-apple-darwin": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:i686-linux-android": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [
             "@vendor_ts__windows-targets-0.52.6//:windows_targets",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:x86_64-apple-ios": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:x86_64-linux-android": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
             "@vendor_ts__windows-targets-0.52.6//:windows_targets",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "//conditions:default": [],
     }),
@@ -231,7 +241,7 @@ cargo_build_script(
         "noclippy",
         "norustfmt",
     ],
-    version = "0.9.10",
+    version = "0.9.11",
     visibility = ["//visibility:private"],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pear-0.2.9.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pear-0.2.9.bazel
index 6a781ccec50..a806ba783a6 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pear-0.2.9.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pear-0.2.9.bazel
@@ -78,12 +78,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pear_codegen-0.2.9.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pear_codegen-0.2.9.bazel
index 96ef21c3d84..d37a7916d11 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pear_codegen-0.2.9.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pear_codegen-0.2.9.bazel
@@ -70,12 +70,16 @@ rust_proc_macro(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -90,9 +94,9 @@ rust_proc_macro(
     }),
     version = "0.2.9",
     deps = [
-        "@vendor_ts__proc-macro2-1.0.95//:proc_macro2",
+        "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
         "@vendor_ts__proc-macro2-diagnostics-0.10.1//:proc_macro2_diagnostics",
-        "@vendor_ts__quote-1.0.40//:quote",
-        "@vendor_ts__syn-2.0.103//:syn",
+        "@vendor_ts__quote-1.0.41//:quote",
+        "@vendor_ts__syn-2.0.106//:syn",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.percent-encoding-2.3.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.percent-encoding-2.3.2.bazel
similarity index 93%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.percent-encoding-2.3.1.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.percent-encoding-2.3.2.bazel
index dae967123fc..925777f7837 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.percent-encoding-2.3.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.percent-encoding-2.3.2.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -92,5 +96,5 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "2.3.1",
+    version = "2.3.2",
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.perf-event-0.4.7.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.perf-event-0.4.7.bazel
index c6512969320..3dcdb7841a8 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.perf-event-0.4.7.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.perf-event-0.4.7.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -90,7 +94,7 @@ rust_library(
     }),
     version = "0.4.7",
     deps = [
-        "@vendor_ts__libc-0.2.174//:libc",
+        "@vendor_ts__libc-0.2.175//:libc",
         "@vendor_ts__perf-event-open-sys-1.0.1//:perf_event_open_sys",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.perf-event-open-sys-1.0.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.perf-event-open-sys-1.0.1.bazel
index 2f975dbab22..66c6d44fb9c 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.perf-event-open-sys-1.0.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.perf-event-open-sys-1.0.1.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -90,6 +94,6 @@ rust_library(
     }),
     version = "1.0.1",
     deps = [
-        "@vendor_ts__libc-0.2.174//:libc",
+        "@vendor_ts__libc-0.2.175//:libc",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.petgraph-0.6.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.petgraph-0.6.5.bazel
index a0b594ce3e0..96b02e10e07 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.petgraph-0.6.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.petgraph-0.6.5.bazel
@@ -76,12 +76,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -97,6 +101,6 @@ rust_library(
     version = "0.6.5",
     deps = [
         "@vendor_ts__fixedbitset-0.4.2//:fixedbitset",
-        "@vendor_ts__indexmap-2.9.0//:indexmap",
+        "@vendor_ts__indexmap-2.11.4//:indexmap",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pin-project-lite-0.2.16.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pin-project-lite-0.2.16.bazel
index 1c7ae29aa31..613c24f7cbc 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pin-project-lite-0.2.16.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pin-project-lite-0.2.16.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pkg-config-0.3.32.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pkg-config-0.3.32.bazel
index 10e8e40e1f1..e03ef295d21 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pkg-config-0.3.32.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pkg-config-0.3.32.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.portable-atomic-1.11.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.portable-atomic-1.11.1.bazel
similarity index 93%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.portable-atomic-1.11.0.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.portable-atomic-1.11.1.bazel
index fab3e1529c9..c8afae58b26 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.portable-atomic-1.11.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.portable-atomic-1.11.1.bazel
@@ -78,12 +78,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -96,9 +100,9 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "1.11.0",
+    version = "1.11.1",
     deps = [
-        "@vendor_ts__portable-atomic-1.11.0//:build_script_build",
+        "@vendor_ts__portable-atomic-1.11.1//:build_script_build",
     ],
 )
 
@@ -154,7 +158,7 @@ cargo_build_script(
         "noclippy",
         "norustfmt",
     ],
-    version = "1.11.0",
+    version = "1.11.1",
     visibility = ["//visibility:private"],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.potential_utf-0.1.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.potential_utf-0.1.3.bazel
similarity index 92%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.potential_utf-0.1.2.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.potential_utf-0.1.3.bazel
index 2c1aa625c77..343962c4585 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.potential_utf-0.1.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.potential_utf-0.1.3.bazel
@@ -73,12 +73,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -91,8 +95,8 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.1.2",
+    version = "0.1.3",
     deps = [
-        "@vendor_ts__zerovec-0.11.2//:zerovec",
+        "@vendor_ts__zerovec-0.11.4//:zerovec",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.powerfmt-0.2.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.powerfmt-0.2.0.bazel
index eee2906ed43..9d58835a336 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.powerfmt-0.2.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.powerfmt-0.2.0.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ppv-lite86-0.2.20.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ppv-lite86-0.2.21.bazel
similarity index 92%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ppv-lite86-0.2.20.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ppv-lite86-0.2.21.bazel
index cb4aa127091..8043ecaee06 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ppv-lite86-0.2.20.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ppv-lite86-0.2.21.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -92,8 +96,8 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.2.20",
+    version = "0.2.21",
     deps = [
-        "@vendor_ts__zerocopy-0.7.35//:zerocopy",
+        "@vendor_ts__zerocopy-0.8.27//:zerocopy",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.proc-macro2-1.0.95.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.proc-macro2-1.0.101.bazel
similarity index 92%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.proc-macro2-1.0.95.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.proc-macro2-1.0.101.bazel
index 2ba0ce40df9..b979922bfcf 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.proc-macro2-1.0.95.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.proc-macro2-1.0.101.bazel
@@ -78,12 +78,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -96,10 +100,10 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "1.0.95",
+    version = "1.0.101",
     deps = [
-        "@vendor_ts__proc-macro2-1.0.95//:build_script_build",
-        "@vendor_ts__unicode-ident-1.0.17//:unicode_ident",
+        "@vendor_ts__proc-macro2-1.0.101//:build_script_build",
+        "@vendor_ts__unicode-ident-1.0.19//:unicode_ident",
     ],
 )
 
@@ -155,7 +159,7 @@ cargo_build_script(
         "noclippy",
         "norustfmt",
     ],
-    version = "1.0.95",
+    version = "1.0.101",
     visibility = ["//visibility:private"],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.proc-macro2-diagnostics-0.10.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.proc-macro2-diagnostics-0.10.1.bazel
index d0e023cf5cd..e97d61f229b 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.proc-macro2-diagnostics-0.10.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.proc-macro2-diagnostics-0.10.1.bazel
@@ -79,12 +79,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -99,10 +103,10 @@ rust_library(
     }),
     version = "0.10.1",
     deps = [
-        "@vendor_ts__proc-macro2-1.0.95//:proc_macro2",
+        "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
         "@vendor_ts__proc-macro2-diagnostics-0.10.1//:build_script_build",
-        "@vendor_ts__quote-1.0.40//:quote",
-        "@vendor_ts__syn-2.0.103//:syn",
+        "@vendor_ts__quote-1.0.41//:quote",
+        "@vendor_ts__syn-2.0.106//:syn",
         "@vendor_ts__yansi-1.0.1//:yansi",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.quote-1.0.41.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.quote-1.0.41.bazel
new file mode 100644
index 00000000000..bf89a7251f3
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.quote-1.0.41.bazel
@@ -0,0 +1,170 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load(
+    "@rules_rust//cargo:defs.bzl",
+    "cargo_build_script",
+    "cargo_toml_env_vars",
+)
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "quote",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "proc-macro",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=quote",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.41",
+    deps = [
+        "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
+        "@vendor_ts__quote-1.0.41//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "proc-macro",
+    ],
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2018",
+    pkg_name = "quote",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=quote",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "1.0.41",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.android-tzdata-0.1.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.r-efi-5.3.0.bazel
similarity index 91%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.android-tzdata-0.1.1.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.r-efi-5.3.0.bazel
index 8a7e7f71b1f..778a94832fb 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.android-tzdata-0.1.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.r-efi-5.3.0.bazel
@@ -17,7 +17,7 @@ cargo_toml_env_vars(
 )
 
 rust_library(
-    name = "android_tzdata",
+    name = "r_efi",
     srcs = glob(
         include = ["**/*.rs"],
         allow_empty = True,
@@ -44,7 +44,7 @@ rust_library(
     ],
     tags = [
         "cargo-bazel",
-        "crate-name=android-tzdata",
+        "crate-name=r-efi",
         "manual",
         "noclippy",
         "norustfmt",
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,5 +92,5 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.1.1",
+    version = "5.3.0",
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_abi-0.116.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_abi-0.123.0.bazel
similarity index 86%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_abi-0.116.0.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_abi-0.123.0.bazel
index 77e39ac60c4..de56de7393c 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_abi-0.116.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_abi-0.123.0.bazel
@@ -23,8 +23,8 @@ rust_library(
         allow_empty = True,
     ),
     aliases = {
-        "@vendor_ts__ra-ap-rustc_hashes-0.116.0//:ra_ap_rustc_hashes": "rustc_hashes",
-        "@vendor_ts__ra-ap-rustc_index-0.116.0//:ra_ap_rustc_index": "rustc_index",
+        "@vendor_ts__ra-ap-rustc_hashes-0.123.0//:ra_ap_rustc_hashes": "rustc_hashes",
+        "@vendor_ts__ra-ap-rustc_index-0.123.0//:ra_ap_rustc_index": "rustc_index",
     },
     compile_data = glob(
         include = ["**"],
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -92,11 +96,11 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.116.0",
+    version = "0.123.0",
     deps = [
-        "@vendor_ts__bitflags-2.9.1//:bitflags",
-        "@vendor_ts__ra-ap-rustc_hashes-0.116.0//:ra_ap_rustc_hashes",
-        "@vendor_ts__ra-ap-rustc_index-0.116.0//:ra_ap_rustc_index",
+        "@vendor_ts__bitflags-2.9.4//:bitflags",
+        "@vendor_ts__ra-ap-rustc_hashes-0.123.0//:ra_ap_rustc_hashes",
+        "@vendor_ts__ra-ap-rustc_index-0.123.0//:ra_ap_rustc_index",
         "@vendor_ts__tracing-0.1.41//:tracing",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_hashes-0.116.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_hashes-0.123.0.bazel
similarity index 91%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_hashes-0.116.0.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_hashes-0.123.0.bazel
index b92c4f5d59a..5d4250c41bc 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_hashes-0.116.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_hashes-0.123.0.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,8 +92,8 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.116.0",
+    version = "0.123.0",
     deps = [
-        "@vendor_ts__rustc-stable-hash-0.1.1//:rustc_stable_hash",
+        "@vendor_ts__rustc-stable-hash-0.1.2//:rustc_stable_hash",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index-0.116.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index-0.123.0.bazel
similarity index 90%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index-0.116.0.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index-0.123.0.bazel
index 5ae899ecf4d..bf33fe6c892 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index-0.116.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index-0.123.0.bazel
@@ -23,7 +23,7 @@ rust_library(
         allow_empty = True,
     ),
     aliases = {
-        "@vendor_ts__ra-ap-rustc_index_macros-0.116.0//:ra_ap_rustc_index_macros": "rustc_index_macros",
+        "@vendor_ts__ra-ap-rustc_index_macros-0.123.0//:ra_ap_rustc_index_macros": "rustc_index_macros",
     },
     compile_data = glob(
         include = ["**"],
@@ -40,7 +40,7 @@ rust_library(
     crate_root = "src/lib.rs",
     edition = "2024",
     proc_macro_deps = [
-        "@vendor_ts__ra-ap-rustc_index_macros-0.116.0//:ra_ap_rustc_index_macros",
+        "@vendor_ts__ra-ap-rustc_index_macros-0.123.0//:ra_ap_rustc_index_macros",
     ],
     rustc_env_files = [
         ":cargo_toml_env_vars",
@@ -76,12 +76,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -94,7 +98,7 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.116.0",
+    version = "0.123.0",
     deps = [
         "@vendor_ts__smallvec-1.15.1//:smallvec",
     ],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index_macros-0.116.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index_macros-0.123.0.bazel
similarity index 89%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index_macros-0.116.0.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index_macros-0.123.0.bazel
index ed11fe7b762..b3dcedb0ec5 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index_macros-0.116.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index_macros-0.123.0.bazel
@@ -70,12 +70,16 @@ rust_proc_macro(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,10 +92,10 @@ rust_proc_macro(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.116.0",
+    version = "0.123.0",
     deps = [
-        "@vendor_ts__proc-macro2-1.0.95//:proc_macro2",
-        "@vendor_ts__quote-1.0.40//:quote",
-        "@vendor_ts__syn-2.0.103//:syn",
+        "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
+        "@vendor_ts__quote-1.0.41//:quote",
+        "@vendor_ts__syn-2.0.106//:syn",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_lexer-0.116.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_lexer-0.121.0.bazel
similarity index 93%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_lexer-0.116.0.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_lexer-0.121.0.bazel
index 9c9bce91367..88d4046a03a 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_lexer-0.116.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_lexer-0.121.0.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,7 +92,7 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.116.0",
+    version = "0.121.0",
     deps = [
         "@vendor_ts__memchr-2.7.5//:memchr",
         "@vendor_ts__unicode-properties-0.1.3//:unicode_properties",
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_lexer-0.123.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_lexer-0.123.0.bazel
new file mode 100644
index 00000000000..4971fc67e03
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_lexer-0.123.0.bazel
@@ -0,0 +1,101 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "ra_ap_rustc_lexer",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2024",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=ra-ap-rustc_lexer",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.123.0",
+    deps = [
+        "@vendor_ts__memchr-2.7.5//:memchr",
+        "@vendor_ts__unicode-properties-0.1.3//:unicode_properties",
+        "@vendor_ts__unicode-xid-0.2.6//:unicode_xid",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_parse_format-0.116.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_parse_format-0.121.0.bazel
similarity index 89%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_parse_format-0.116.0.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_parse_format-0.121.0.bazel
index 2e1cb7d1e2d..c5eaeddb683 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_parse_format-0.116.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_parse_format-0.121.0.bazel
@@ -23,7 +23,7 @@ rust_library(
         allow_empty = True,
     ),
     aliases = {
-        "@vendor_ts__ra-ap-rustc_lexer-0.116.0//:ra_ap_rustc_lexer": "rustc_lexer",
+        "@vendor_ts__ra-ap-rustc_lexer-0.121.0//:ra_ap_rustc_lexer": "rustc_lexer",
     },
     compile_data = glob(
         include = ["**"],
@@ -73,12 +73,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -91,9 +95,9 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.116.0",
+    version = "0.121.0",
     deps = [
-        "@vendor_ts__ra-ap-rustc_lexer-0.116.0//:ra_ap_rustc_lexer",
-        "@vendor_ts__rustc-literal-escaper-0.0.2//:rustc_literal_escaper",
+        "@vendor_ts__ra-ap-rustc_lexer-0.121.0//:ra_ap_rustc_lexer",
+        "@vendor_ts__rustc-literal-escaper-0.0.4//:rustc_literal_escaper",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_pattern_analysis-0.116.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_pattern_analysis-0.123.0.bazel
similarity index 90%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_pattern_analysis-0.116.0.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_pattern_analysis-0.123.0.bazel
index d31775913f0..bd2180aa2c5 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_pattern_analysis-0.116.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_pattern_analysis-0.123.0.bazel
@@ -23,7 +23,7 @@ rust_library(
         allow_empty = True,
     ),
     aliases = {
-        "@vendor_ts__ra-ap-rustc_index-0.116.0//:ra_ap_rustc_index": "rustc_index",
+        "@vendor_ts__ra-ap-rustc_index-0.123.0//:ra_ap_rustc_index": "rustc_index",
     },
     compile_data = glob(
         include = ["**"],
@@ -73,12 +73,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -91,9 +95,9 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.116.0",
+    version = "0.123.0",
     deps = [
-        "@vendor_ts__ra-ap-rustc_index-0.116.0//:ra_ap_rustc_index",
+        "@vendor_ts__ra-ap-rustc_index-0.123.0//:ra_ap_rustc_index",
         "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
         "@vendor_ts__rustc_apfloat-0.2.3-llvm-462a31f5a5ab//:rustc_apfloat",
         "@vendor_ts__smallvec-1.15.1//:smallvec",
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_base_db-0.0.288.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_base_db-0.0.301.bazel
similarity index 78%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_base_db-0.0.288.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_base_db-0.0.301.bazel
index 585d6635920..2c5fe2ea244 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_base_db-0.0.288.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_base_db-0.0.301.bazel
@@ -23,12 +23,12 @@ rust_library(
         allow_empty = True,
     ),
     aliases = {
-        "@vendor_ts__ra_ap_cfg-0.0.288//:ra_ap_cfg": "cfg",
-        "@vendor_ts__ra_ap_intern-0.0.288//:ra_ap_intern": "intern",
-        "@vendor_ts__ra_ap_query-group-macro-0.0.288//:ra_ap_query_group_macro": "query_group",
-        "@vendor_ts__ra_ap_span-0.0.288//:ra_ap_span": "span",
-        "@vendor_ts__ra_ap_syntax-0.0.288//:ra_ap_syntax": "syntax",
-        "@vendor_ts__ra_ap_vfs-0.0.288//:ra_ap_vfs": "vfs",
+        "@vendor_ts__ra_ap_cfg-0.0.301//:ra_ap_cfg": "cfg",
+        "@vendor_ts__ra_ap_intern-0.0.301//:ra_ap_intern": "intern",
+        "@vendor_ts__ra_ap_query-group-macro-0.0.301//:ra_ap_query_group_macro": "query_group",
+        "@vendor_ts__ra_ap_span-0.0.301//:ra_ap_span": "span",
+        "@vendor_ts__ra_ap_syntax-0.0.301//:ra_ap_syntax": "syntax",
+        "@vendor_ts__ra_ap_vfs-0.0.301//:ra_ap_vfs": "vfs",
     },
     compile_data = glob(
         include = ["**"],
@@ -45,8 +45,8 @@ rust_library(
     crate_root = "src/lib.rs",
     edition = "2024",
     proc_macro_deps = [
-        "@vendor_ts__ra_ap_query-group-macro-0.0.288//:ra_ap_query_group_macro",
-        "@vendor_ts__salsa-macros-0.22.0//:salsa_macros",
+        "@vendor_ts__ra_ap_query-group-macro-0.0.301//:ra_ap_query_group_macro",
+        "@vendor_ts__salsa-macros-0.23.0//:salsa_macros",
     ],
     rustc_env_files = [
         ":cargo_toml_env_vars",
@@ -82,12 +82,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -100,18 +104,18 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.0.288",
+    version = "0.0.301",
     deps = [
         "@vendor_ts__dashmap-6.1.0//:dashmap",
-        "@vendor_ts__indexmap-2.9.0//:indexmap",
+        "@vendor_ts__indexmap-2.11.4//:indexmap",
         "@vendor_ts__la-arena-0.3.1//:la_arena",
-        "@vendor_ts__ra_ap_cfg-0.0.288//:ra_ap_cfg",
-        "@vendor_ts__ra_ap_intern-0.0.288//:ra_ap_intern",
-        "@vendor_ts__ra_ap_span-0.0.288//:ra_ap_span",
-        "@vendor_ts__ra_ap_syntax-0.0.288//:ra_ap_syntax",
-        "@vendor_ts__ra_ap_vfs-0.0.288//:ra_ap_vfs",
+        "@vendor_ts__ra_ap_cfg-0.0.301//:ra_ap_cfg",
+        "@vendor_ts__ra_ap_intern-0.0.301//:ra_ap_intern",
+        "@vendor_ts__ra_ap_span-0.0.301//:ra_ap_span",
+        "@vendor_ts__ra_ap_syntax-0.0.301//:ra_ap_syntax",
+        "@vendor_ts__ra_ap_vfs-0.0.301//:ra_ap_vfs",
         "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
-        "@vendor_ts__salsa-0.22.0//:salsa",
+        "@vendor_ts__salsa-0.23.0//:salsa",
         "@vendor_ts__semver-1.0.26//:semver",
         "@vendor_ts__tracing-0.1.41//:tracing",
         "@vendor_ts__triomphe-0.1.14//:triomphe",
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_cfg-0.0.288.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_cfg-0.0.301.bazel
similarity index 88%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_cfg-0.0.288.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_cfg-0.0.301.bazel
index 820502e96b4..a3eb4397b88 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_cfg-0.0.288.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_cfg-0.0.301.bazel
@@ -23,8 +23,8 @@ rust_library(
         allow_empty = True,
     ),
     aliases = {
-        "@vendor_ts__ra_ap_intern-0.0.288//:ra_ap_intern": "intern",
-        "@vendor_ts__ra_ap_tt-0.0.288//:ra_ap_tt": "tt",
+        "@vendor_ts__ra_ap_intern-0.0.301//:ra_ap_intern": "intern",
+        "@vendor_ts__ra_ap_tt-0.0.301//:ra_ap_tt": "tt",
     },
     compile_data = glob(
         include = ["**"],
@@ -77,12 +77,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -95,10 +99,10 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.0.288",
+    version = "0.0.301",
     deps = [
-        "@vendor_ts__ra_ap_intern-0.0.288//:ra_ap_intern",
-        "@vendor_ts__ra_ap_tt-0.0.288//:ra_ap_tt",
+        "@vendor_ts__ra_ap_intern-0.0.301//:ra_ap_intern",
+        "@vendor_ts__ra_ap_tt-0.0.301//:ra_ap_tt",
         "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
         "@vendor_ts__tracing-0.1.41//:tracing",
     ],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_edition-0.0.288.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_edition-0.0.301.bazel
similarity index 93%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_edition-0.0.288.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_edition-0.0.301.bazel
index 8f5390d881b..648552243c8 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_edition-0.0.288.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_edition-0.0.301.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,5 +92,5 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.0.288",
+    version = "0.0.301",
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir-0.0.288.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir-0.0.301.bazel
similarity index 73%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir-0.0.288.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir-0.0.301.bazel
index 0aceb0bb68f..a138ff5c887 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir-0.0.288.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir-0.0.301.bazel
@@ -23,16 +23,16 @@ rust_library(
         allow_empty = True,
     ),
     aliases = {
-        "@vendor_ts__ra_ap_base_db-0.0.288//:ra_ap_base_db": "base_db",
-        "@vendor_ts__ra_ap_cfg-0.0.288//:ra_ap_cfg": "cfg",
-        "@vendor_ts__ra_ap_hir_def-0.0.288//:ra_ap_hir_def": "hir_def",
-        "@vendor_ts__ra_ap_hir_expand-0.0.288//:ra_ap_hir_expand": "hir_expand",
-        "@vendor_ts__ra_ap_hir_ty-0.0.288//:ra_ap_hir_ty": "hir_ty",
-        "@vendor_ts__ra_ap_intern-0.0.288//:ra_ap_intern": "intern",
-        "@vendor_ts__ra_ap_span-0.0.288//:ra_ap_span": "span",
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx": "stdx",
-        "@vendor_ts__ra_ap_syntax-0.0.288//:ra_ap_syntax": "syntax",
-        "@vendor_ts__ra_ap_tt-0.0.288//:ra_ap_tt": "tt",
+        "@vendor_ts__ra_ap_base_db-0.0.301//:ra_ap_base_db": "base_db",
+        "@vendor_ts__ra_ap_cfg-0.0.301//:ra_ap_cfg": "cfg",
+        "@vendor_ts__ra_ap_hir_def-0.0.301//:ra_ap_hir_def": "hir_def",
+        "@vendor_ts__ra_ap_hir_expand-0.0.301//:ra_ap_hir_expand": "hir_expand",
+        "@vendor_ts__ra_ap_hir_ty-0.0.301//:ra_ap_hir_ty": "hir_ty",
+        "@vendor_ts__ra_ap_intern-0.0.301//:ra_ap_intern": "intern",
+        "@vendor_ts__ra_ap_span-0.0.301//:ra_ap_span": "span",
+        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx": "stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.301//:ra_ap_syntax": "syntax",
+        "@vendor_ts__ra_ap_tt-0.0.301//:ra_ap_tt": "tt",
     },
     compile_data = glob(
         include = ["**"],
@@ -82,12 +82,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -100,22 +104,22 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.0.288",
+    version = "0.0.301",
     deps = [
         "@vendor_ts__arrayvec-0.7.6//:arrayvec",
         "@vendor_ts__either-1.15.0//:either",
-        "@vendor_ts__indexmap-2.9.0//:indexmap",
+        "@vendor_ts__indexmap-2.11.4//:indexmap",
         "@vendor_ts__itertools-0.14.0//:itertools",
-        "@vendor_ts__ra_ap_base_db-0.0.288//:ra_ap_base_db",
-        "@vendor_ts__ra_ap_cfg-0.0.288//:ra_ap_cfg",
-        "@vendor_ts__ra_ap_hir_def-0.0.288//:ra_ap_hir_def",
-        "@vendor_ts__ra_ap_hir_expand-0.0.288//:ra_ap_hir_expand",
-        "@vendor_ts__ra_ap_hir_ty-0.0.288//:ra_ap_hir_ty",
-        "@vendor_ts__ra_ap_intern-0.0.288//:ra_ap_intern",
-        "@vendor_ts__ra_ap_span-0.0.288//:ra_ap_span",
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx",
-        "@vendor_ts__ra_ap_syntax-0.0.288//:ra_ap_syntax",
-        "@vendor_ts__ra_ap_tt-0.0.288//:ra_ap_tt",
+        "@vendor_ts__ra_ap_base_db-0.0.301//:ra_ap_base_db",
+        "@vendor_ts__ra_ap_cfg-0.0.301//:ra_ap_cfg",
+        "@vendor_ts__ra_ap_hir_def-0.0.301//:ra_ap_hir_def",
+        "@vendor_ts__ra_ap_hir_expand-0.0.301//:ra_ap_hir_expand",
+        "@vendor_ts__ra_ap_hir_ty-0.0.301//:ra_ap_hir_ty",
+        "@vendor_ts__ra_ap_intern-0.0.301//:ra_ap_intern",
+        "@vendor_ts__ra_ap_span-0.0.301//:ra_ap_span",
+        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.301//:ra_ap_syntax",
+        "@vendor_ts__ra_ap_tt-0.0.301//:ra_ap_tt",
         "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
         "@vendor_ts__smallvec-1.15.1//:smallvec",
         "@vendor_ts__tracing-0.1.41//:tracing",
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_def-0.0.288.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_def-0.0.301.bazel
similarity index 71%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_def-0.0.288.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_def-0.0.301.bazel
index 59654b11ac7..8811733c690 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_def-0.0.288.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_def-0.0.301.bazel
@@ -23,16 +23,16 @@ rust_library(
         allow_empty = True,
     ),
     aliases = {
-        "@vendor_ts__ra_ap_base_db-0.0.288//:ra_ap_base_db": "base_db",
-        "@vendor_ts__ra_ap_cfg-0.0.288//:ra_ap_cfg": "cfg",
-        "@vendor_ts__ra_ap_hir_expand-0.0.288//:ra_ap_hir_expand": "hir_expand",
-        "@vendor_ts__ra_ap_intern-0.0.288//:ra_ap_intern": "intern",
-        "@vendor_ts__ra_ap_mbe-0.0.288//:ra_ap_mbe": "mbe",
-        "@vendor_ts__ra_ap_query-group-macro-0.0.288//:ra_ap_query_group_macro": "query_group",
-        "@vendor_ts__ra_ap_span-0.0.288//:ra_ap_span": "span",
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx": "stdx",
-        "@vendor_ts__ra_ap_syntax-0.0.288//:ra_ap_syntax": "syntax",
-        "@vendor_ts__ra_ap_tt-0.0.288//:ra_ap_tt": "tt",
+        "@vendor_ts__ra_ap_base_db-0.0.301//:ra_ap_base_db": "base_db",
+        "@vendor_ts__ra_ap_cfg-0.0.301//:ra_ap_cfg": "cfg",
+        "@vendor_ts__ra_ap_hir_expand-0.0.301//:ra_ap_hir_expand": "hir_expand",
+        "@vendor_ts__ra_ap_intern-0.0.301//:ra_ap_intern": "intern",
+        "@vendor_ts__ra_ap_mbe-0.0.301//:ra_ap_mbe": "mbe",
+        "@vendor_ts__ra_ap_query-group-macro-0.0.301//:ra_ap_query_group_macro": "query_group",
+        "@vendor_ts__ra_ap_span-0.0.301//:ra_ap_span": "span",
+        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx": "stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.301//:ra_ap_syntax": "syntax",
+        "@vendor_ts__ra_ap_tt-0.0.301//:ra_ap_tt": "tt",
     },
     compile_data = glob(
         include = ["**"],
@@ -49,8 +49,8 @@ rust_library(
     crate_root = "src/lib.rs",
     edition = "2024",
     proc_macro_deps = [
-        "@vendor_ts__ra_ap_query-group-macro-0.0.288//:ra_ap_query_group_macro",
-        "@vendor_ts__salsa-macros-0.22.0//:salsa_macros",
+        "@vendor_ts__ra_ap_query-group-macro-0.0.301//:ra_ap_query_group_macro",
+        "@vendor_ts__salsa-macros-0.23.0//:salsa_macros",
     ],
     rustc_env_files = [
         ":cargo_toml_env_vars",
@@ -86,12 +86,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -104,31 +108,31 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.0.288",
+    version = "0.0.301",
     deps = [
         "@vendor_ts__arrayvec-0.7.6//:arrayvec",
-        "@vendor_ts__bitflags-2.9.1//:bitflags",
-        "@vendor_ts__cov-mark-2.0.0//:cov_mark",
+        "@vendor_ts__bitflags-2.9.4//:bitflags",
+        "@vendor_ts__cov-mark-2.1.0//:cov_mark",
         "@vendor_ts__drop_bomb-0.1.5//:drop_bomb",
         "@vendor_ts__either-1.15.0//:either",
         "@vendor_ts__fst-0.4.7//:fst",
-        "@vendor_ts__indexmap-2.9.0//:indexmap",
+        "@vendor_ts__indexmap-2.11.4//:indexmap",
         "@vendor_ts__itertools-0.14.0//:itertools",
         "@vendor_ts__la-arena-0.3.1//:la_arena",
-        "@vendor_ts__ra-ap-rustc_abi-0.116.0//:ra_ap_rustc_abi",
-        "@vendor_ts__ra-ap-rustc_parse_format-0.116.0//:ra_ap_rustc_parse_format",
-        "@vendor_ts__ra_ap_base_db-0.0.288//:ra_ap_base_db",
-        "@vendor_ts__ra_ap_cfg-0.0.288//:ra_ap_cfg",
-        "@vendor_ts__ra_ap_hir_expand-0.0.288//:ra_ap_hir_expand",
-        "@vendor_ts__ra_ap_intern-0.0.288//:ra_ap_intern",
-        "@vendor_ts__ra_ap_mbe-0.0.288//:ra_ap_mbe",
-        "@vendor_ts__ra_ap_span-0.0.288//:ra_ap_span",
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx",
-        "@vendor_ts__ra_ap_syntax-0.0.288//:ra_ap_syntax",
-        "@vendor_ts__ra_ap_tt-0.0.288//:ra_ap_tt",
+        "@vendor_ts__ra-ap-rustc_abi-0.123.0//:ra_ap_rustc_abi",
+        "@vendor_ts__ra-ap-rustc_parse_format-0.121.0//:ra_ap_rustc_parse_format",
+        "@vendor_ts__ra_ap_base_db-0.0.301//:ra_ap_base_db",
+        "@vendor_ts__ra_ap_cfg-0.0.301//:ra_ap_cfg",
+        "@vendor_ts__ra_ap_hir_expand-0.0.301//:ra_ap_hir_expand",
+        "@vendor_ts__ra_ap_intern-0.0.301//:ra_ap_intern",
+        "@vendor_ts__ra_ap_mbe-0.0.301//:ra_ap_mbe",
+        "@vendor_ts__ra_ap_span-0.0.301//:ra_ap_span",
+        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.301//:ra_ap_syntax",
+        "@vendor_ts__ra_ap_tt-0.0.301//:ra_ap_tt",
         "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
         "@vendor_ts__rustc_apfloat-0.2.3-llvm-462a31f5a5ab//:rustc_apfloat",
-        "@vendor_ts__salsa-0.22.0//:salsa",
+        "@vendor_ts__salsa-0.23.0//:salsa",
         "@vendor_ts__smallvec-1.15.1//:smallvec",
         "@vendor_ts__text-size-1.1.1//:text_size",
         "@vendor_ts__thin-vec-0.2.14//:thin_vec",
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_expand-0.0.288.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_expand-0.0.301.bazel
similarity index 70%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_expand-0.0.288.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_expand-0.0.301.bazel
index b6447508551..87e6fa6e904 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_expand-0.0.288.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_expand-0.0.301.bazel
@@ -23,17 +23,17 @@ rust_library(
         allow_empty = True,
     ),
     aliases = {
-        "@vendor_ts__ra_ap_base_db-0.0.288//:ra_ap_base_db": "base_db",
-        "@vendor_ts__ra_ap_cfg-0.0.288//:ra_ap_cfg": "cfg",
-        "@vendor_ts__ra_ap_intern-0.0.288//:ra_ap_intern": "intern",
-        "@vendor_ts__ra_ap_mbe-0.0.288//:ra_ap_mbe": "mbe",
-        "@vendor_ts__ra_ap_parser-0.0.288//:ra_ap_parser": "parser",
-        "@vendor_ts__ra_ap_query-group-macro-0.0.288//:ra_ap_query_group_macro": "query_group",
-        "@vendor_ts__ra_ap_span-0.0.288//:ra_ap_span": "span",
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx": "stdx",
-        "@vendor_ts__ra_ap_syntax-0.0.288//:ra_ap_syntax": "syntax",
-        "@vendor_ts__ra_ap_syntax-bridge-0.0.288//:ra_ap_syntax_bridge": "syntax_bridge",
-        "@vendor_ts__ra_ap_tt-0.0.288//:ra_ap_tt": "tt",
+        "@vendor_ts__ra_ap_base_db-0.0.301//:ra_ap_base_db": "base_db",
+        "@vendor_ts__ra_ap_cfg-0.0.301//:ra_ap_cfg": "cfg",
+        "@vendor_ts__ra_ap_intern-0.0.301//:ra_ap_intern": "intern",
+        "@vendor_ts__ra_ap_mbe-0.0.301//:ra_ap_mbe": "mbe",
+        "@vendor_ts__ra_ap_parser-0.0.301//:ra_ap_parser": "parser",
+        "@vendor_ts__ra_ap_query-group-macro-0.0.301//:ra_ap_query_group_macro": "query_group",
+        "@vendor_ts__ra_ap_span-0.0.301//:ra_ap_span": "span",
+        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx": "stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.301//:ra_ap_syntax": "syntax",
+        "@vendor_ts__ra_ap_syntax-bridge-0.0.301//:ra_ap_syntax_bridge": "syntax_bridge",
+        "@vendor_ts__ra_ap_tt-0.0.301//:ra_ap_tt": "tt",
     },
     compile_data = glob(
         include = ["**"],
@@ -50,8 +50,8 @@ rust_library(
     crate_root = "src/lib.rs",
     edition = "2024",
     proc_macro_deps = [
-        "@vendor_ts__ra_ap_query-group-macro-0.0.288//:ra_ap_query_group_macro",
-        "@vendor_ts__salsa-macros-0.22.0//:salsa_macros",
+        "@vendor_ts__ra_ap_query-group-macro-0.0.301//:ra_ap_query_group_macro",
+        "@vendor_ts__salsa-macros-0.23.0//:salsa_macros",
     ],
     rustc_env_files = [
         ":cargo_toml_env_vars",
@@ -87,12 +87,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -105,23 +109,23 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.0.288",
+    version = "0.0.301",
     deps = [
-        "@vendor_ts__cov-mark-2.0.0//:cov_mark",
+        "@vendor_ts__cov-mark-2.1.0//:cov_mark",
         "@vendor_ts__either-1.15.0//:either",
         "@vendor_ts__itertools-0.14.0//:itertools",
-        "@vendor_ts__ra_ap_base_db-0.0.288//:ra_ap_base_db",
-        "@vendor_ts__ra_ap_cfg-0.0.288//:ra_ap_cfg",
-        "@vendor_ts__ra_ap_intern-0.0.288//:ra_ap_intern",
-        "@vendor_ts__ra_ap_mbe-0.0.288//:ra_ap_mbe",
-        "@vendor_ts__ra_ap_parser-0.0.288//:ra_ap_parser",
-        "@vendor_ts__ra_ap_span-0.0.288//:ra_ap_span",
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx",
-        "@vendor_ts__ra_ap_syntax-0.0.288//:ra_ap_syntax",
-        "@vendor_ts__ra_ap_syntax-bridge-0.0.288//:ra_ap_syntax_bridge",
-        "@vendor_ts__ra_ap_tt-0.0.288//:ra_ap_tt",
+        "@vendor_ts__ra_ap_base_db-0.0.301//:ra_ap_base_db",
+        "@vendor_ts__ra_ap_cfg-0.0.301//:ra_ap_cfg",
+        "@vendor_ts__ra_ap_intern-0.0.301//:ra_ap_intern",
+        "@vendor_ts__ra_ap_mbe-0.0.301//:ra_ap_mbe",
+        "@vendor_ts__ra_ap_parser-0.0.301//:ra_ap_parser",
+        "@vendor_ts__ra_ap_span-0.0.301//:ra_ap_span",
+        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.301//:ra_ap_syntax",
+        "@vendor_ts__ra_ap_syntax-bridge-0.0.301//:ra_ap_syntax_bridge",
+        "@vendor_ts__ra_ap_tt-0.0.301//:ra_ap_tt",
         "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
-        "@vendor_ts__salsa-0.22.0//:salsa",
+        "@vendor_ts__salsa-0.23.0//:salsa",
         "@vendor_ts__smallvec-1.15.1//:smallvec",
         "@vendor_ts__tracing-0.1.41//:tracing",
         "@vendor_ts__triomphe-0.1.14//:triomphe",
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_ty-0.0.288.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_ty-0.0.301.bazel
similarity index 73%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_ty-0.0.288.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_ty-0.0.301.bazel
index 6b3be0fba4e..c9b81576e38 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_ty-0.0.288.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_ty-0.0.301.bazel
@@ -23,14 +23,14 @@ rust_library(
         allow_empty = True,
     ),
     aliases = {
-        "@vendor_ts__ra_ap_base_db-0.0.288//:ra_ap_base_db": "base_db",
-        "@vendor_ts__ra_ap_hir_def-0.0.288//:ra_ap_hir_def": "hir_def",
-        "@vendor_ts__ra_ap_hir_expand-0.0.288//:ra_ap_hir_expand": "hir_expand",
-        "@vendor_ts__ra_ap_intern-0.0.288//:ra_ap_intern": "intern",
-        "@vendor_ts__ra_ap_query-group-macro-0.0.288//:ra_ap_query_group_macro": "query_group",
-        "@vendor_ts__ra_ap_span-0.0.288//:ra_ap_span": "span",
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx": "stdx",
-        "@vendor_ts__ra_ap_syntax-0.0.288//:ra_ap_syntax": "syntax",
+        "@vendor_ts__ra_ap_base_db-0.0.301//:ra_ap_base_db": "base_db",
+        "@vendor_ts__ra_ap_hir_def-0.0.301//:ra_ap_hir_def": "hir_def",
+        "@vendor_ts__ra_ap_hir_expand-0.0.301//:ra_ap_hir_expand": "hir_expand",
+        "@vendor_ts__ra_ap_intern-0.0.301//:ra_ap_intern": "intern",
+        "@vendor_ts__ra_ap_query-group-macro-0.0.301//:ra_ap_query_group_macro": "query_group",
+        "@vendor_ts__ra_ap_span-0.0.301//:ra_ap_span": "span",
+        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx": "stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.301//:ra_ap_syntax": "syntax",
     },
     compile_data = glob(
         include = ["**"],
@@ -48,8 +48,8 @@ rust_library(
     edition = "2024",
     proc_macro_deps = [
         "@vendor_ts__chalk-derive-0.103.0//:chalk_derive",
-        "@vendor_ts__ra_ap_query-group-macro-0.0.288//:ra_ap_query_group_macro",
-        "@vendor_ts__salsa-macros-0.22.0//:salsa_macros",
+        "@vendor_ts__ra_ap_query-group-macro-0.0.301//:ra_ap_query_group_macro",
+        "@vendor_ts__salsa-macros-0.23.0//:salsa_macros",
     ],
     rustc_env_files = [
         ":cargo_toml_env_vars",
@@ -85,12 +85,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -103,33 +107,33 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.0.288",
+    version = "0.0.301",
     deps = [
         "@vendor_ts__arrayvec-0.7.6//:arrayvec",
-        "@vendor_ts__bitflags-2.9.1//:bitflags",
+        "@vendor_ts__bitflags-2.9.4//:bitflags",
         "@vendor_ts__chalk-ir-0.103.0//:chalk_ir",
         "@vendor_ts__chalk-recursive-0.103.0//:chalk_recursive",
         "@vendor_ts__chalk-solve-0.103.0//:chalk_solve",
-        "@vendor_ts__cov-mark-2.0.0//:cov_mark",
+        "@vendor_ts__cov-mark-2.1.0//:cov_mark",
         "@vendor_ts__either-1.15.0//:either",
         "@vendor_ts__ena-0.14.3//:ena",
-        "@vendor_ts__indexmap-2.9.0//:indexmap",
+        "@vendor_ts__indexmap-2.11.4//:indexmap",
         "@vendor_ts__itertools-0.14.0//:itertools",
         "@vendor_ts__la-arena-0.3.1//:la_arena",
         "@vendor_ts__oorandom-11.1.5//:oorandom",
-        "@vendor_ts__ra-ap-rustc_abi-0.116.0//:ra_ap_rustc_abi",
-        "@vendor_ts__ra-ap-rustc_index-0.116.0//:ra_ap_rustc_index",
-        "@vendor_ts__ra-ap-rustc_pattern_analysis-0.116.0//:ra_ap_rustc_pattern_analysis",
-        "@vendor_ts__ra_ap_base_db-0.0.288//:ra_ap_base_db",
-        "@vendor_ts__ra_ap_hir_def-0.0.288//:ra_ap_hir_def",
-        "@vendor_ts__ra_ap_hir_expand-0.0.288//:ra_ap_hir_expand",
-        "@vendor_ts__ra_ap_intern-0.0.288//:ra_ap_intern",
-        "@vendor_ts__ra_ap_span-0.0.288//:ra_ap_span",
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx",
-        "@vendor_ts__ra_ap_syntax-0.0.288//:ra_ap_syntax",
+        "@vendor_ts__ra-ap-rustc_abi-0.123.0//:ra_ap_rustc_abi",
+        "@vendor_ts__ra-ap-rustc_index-0.123.0//:ra_ap_rustc_index",
+        "@vendor_ts__ra-ap-rustc_pattern_analysis-0.123.0//:ra_ap_rustc_pattern_analysis",
+        "@vendor_ts__ra_ap_base_db-0.0.301//:ra_ap_base_db",
+        "@vendor_ts__ra_ap_hir_def-0.0.301//:ra_ap_hir_def",
+        "@vendor_ts__ra_ap_hir_expand-0.0.301//:ra_ap_hir_expand",
+        "@vendor_ts__ra_ap_intern-0.0.301//:ra_ap_intern",
+        "@vendor_ts__ra_ap_span-0.0.301//:ra_ap_span",
+        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.301//:ra_ap_syntax",
         "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
         "@vendor_ts__rustc_apfloat-0.2.3-llvm-462a31f5a5ab//:rustc_apfloat",
-        "@vendor_ts__salsa-0.22.0//:salsa",
+        "@vendor_ts__salsa-0.23.0//:salsa",
         "@vendor_ts__scoped-tls-1.0.1//:scoped_tls",
         "@vendor_ts__smallvec-1.15.1//:smallvec",
         "@vendor_ts__tracing-0.1.41//:tracing",
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_ide_db-0.0.288.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_ide_db-0.0.301.bazel
similarity index 72%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_ide_db-0.0.288.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_ide_db-0.0.301.bazel
index 52fb38a0662..6c023eedf9a 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_ide_db-0.0.288.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_ide_db-0.0.301.bazel
@@ -23,15 +23,15 @@ rust_library(
         allow_empty = True,
     ),
     aliases = {
-        "@vendor_ts__ra_ap_base_db-0.0.288//:ra_ap_base_db": "base_db",
-        "@vendor_ts__ra_ap_hir-0.0.288//:ra_ap_hir": "hir",
-        "@vendor_ts__ra_ap_parser-0.0.288//:ra_ap_parser": "parser",
-        "@vendor_ts__ra_ap_profile-0.0.288//:ra_ap_profile": "profile",
-        "@vendor_ts__ra_ap_query-group-macro-0.0.288//:ra_ap_query_group_macro": "query_group",
-        "@vendor_ts__ra_ap_span-0.0.288//:ra_ap_span": "span",
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx": "stdx",
-        "@vendor_ts__ra_ap_syntax-0.0.288//:ra_ap_syntax": "syntax",
-        "@vendor_ts__ra_ap_vfs-0.0.288//:ra_ap_vfs": "vfs",
+        "@vendor_ts__ra_ap_base_db-0.0.301//:ra_ap_base_db": "base_db",
+        "@vendor_ts__ra_ap_hir-0.0.301//:ra_ap_hir": "hir",
+        "@vendor_ts__ra_ap_parser-0.0.301//:ra_ap_parser": "parser",
+        "@vendor_ts__ra_ap_profile-0.0.301//:ra_ap_profile": "profile",
+        "@vendor_ts__ra_ap_query-group-macro-0.0.301//:ra_ap_query_group_macro": "query_group",
+        "@vendor_ts__ra_ap_span-0.0.301//:ra_ap_span": "span",
+        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx": "stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.301//:ra_ap_syntax": "syntax",
+        "@vendor_ts__ra_ap_vfs-0.0.301//:ra_ap_vfs": "vfs",
     },
     compile_data = glob(
         include = ["**"],
@@ -48,8 +48,8 @@ rust_library(
     crate_root = "src/lib.rs",
     edition = "2024",
     proc_macro_deps = [
-        "@vendor_ts__ra_ap_query-group-macro-0.0.288//:ra_ap_query_group_macro",
-        "@vendor_ts__salsa-macros-0.22.0//:salsa_macros",
+        "@vendor_ts__ra_ap_query-group-macro-0.0.301//:ra_ap_query_group_macro",
+        "@vendor_ts__salsa-macros-0.23.0//:salsa_macros",
     ],
     rustc_env_files = [
         ":cargo_toml_env_vars",
@@ -85,12 +85,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -103,30 +107,30 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.0.288",
+    version = "0.0.301",
     deps = [
         "@vendor_ts__arrayvec-0.7.6//:arrayvec",
-        "@vendor_ts__bitflags-2.9.1//:bitflags",
-        "@vendor_ts__cov-mark-2.0.0//:cov_mark",
+        "@vendor_ts__bitflags-2.9.4//:bitflags",
+        "@vendor_ts__cov-mark-2.1.0//:cov_mark",
         "@vendor_ts__crossbeam-channel-0.5.15//:crossbeam_channel",
         "@vendor_ts__either-1.15.0//:either",
         "@vendor_ts__fst-0.4.7//:fst",
-        "@vendor_ts__indexmap-2.9.0//:indexmap",
+        "@vendor_ts__indexmap-2.11.4//:indexmap",
         "@vendor_ts__itertools-0.14.0//:itertools",
         "@vendor_ts__line-index-0.1.2//:line_index",
         "@vendor_ts__memchr-2.7.5//:memchr",
         "@vendor_ts__nohash-hasher-0.2.0//:nohash_hasher",
-        "@vendor_ts__ra_ap_base_db-0.0.288//:ra_ap_base_db",
-        "@vendor_ts__ra_ap_hir-0.0.288//:ra_ap_hir",
-        "@vendor_ts__ra_ap_parser-0.0.288//:ra_ap_parser",
-        "@vendor_ts__ra_ap_profile-0.0.288//:ra_ap_profile",
-        "@vendor_ts__ra_ap_span-0.0.288//:ra_ap_span",
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx",
-        "@vendor_ts__ra_ap_syntax-0.0.288//:ra_ap_syntax",
-        "@vendor_ts__ra_ap_vfs-0.0.288//:ra_ap_vfs",
-        "@vendor_ts__rayon-1.10.0//:rayon",
+        "@vendor_ts__ra_ap_base_db-0.0.301//:ra_ap_base_db",
+        "@vendor_ts__ra_ap_hir-0.0.301//:ra_ap_hir",
+        "@vendor_ts__ra_ap_parser-0.0.301//:ra_ap_parser",
+        "@vendor_ts__ra_ap_profile-0.0.301//:ra_ap_profile",
+        "@vendor_ts__ra_ap_span-0.0.301//:ra_ap_span",
+        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.301//:ra_ap_syntax",
+        "@vendor_ts__ra_ap_vfs-0.0.301//:ra_ap_vfs",
+        "@vendor_ts__rayon-1.11.0//:rayon",
         "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
-        "@vendor_ts__salsa-0.22.0//:salsa",
+        "@vendor_ts__salsa-0.23.0//:salsa",
         "@vendor_ts__tracing-0.1.41//:tracing",
         "@vendor_ts__triomphe-0.1.14//:triomphe",
     ],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_intern-0.0.288.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_intern-0.0.301.bazel
similarity index 93%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_intern-0.0.288.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_intern-0.0.301.bazel
index 9c0c23c1f6b..4542092adf9 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_intern-0.0.288.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_intern-0.0.301.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,7 +92,7 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.0.288",
+    version = "0.0.301",
     deps = [
         "@vendor_ts__dashmap-6.1.0//:dashmap",
         "@vendor_ts__hashbrown-0.14.5//:hashbrown",
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_load-cargo-0.0.288.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_load-cargo-0.0.301.bazel
similarity index 74%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_load-cargo-0.0.288.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_load-cargo-0.0.301.bazel
index 06318029c82..137cdb42e44 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_load-cargo-0.0.288.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_load-cargo-0.0.301.bazel
@@ -23,15 +23,15 @@ rust_library(
         allow_empty = True,
     ),
     aliases = {
-        "@vendor_ts__ra_ap_hir_expand-0.0.288//:ra_ap_hir_expand": "hir_expand",
-        "@vendor_ts__ra_ap_ide_db-0.0.288//:ra_ap_ide_db": "ide_db",
-        "@vendor_ts__ra_ap_intern-0.0.288//:ra_ap_intern": "intern",
-        "@vendor_ts__ra_ap_proc_macro_api-0.0.288//:ra_ap_proc_macro_api": "proc_macro_api",
-        "@vendor_ts__ra_ap_project_model-0.0.288//:ra_ap_project_model": "project_model",
-        "@vendor_ts__ra_ap_span-0.0.288//:ra_ap_span": "span",
-        "@vendor_ts__ra_ap_tt-0.0.288//:ra_ap_tt": "tt",
-        "@vendor_ts__ra_ap_vfs-0.0.288//:ra_ap_vfs": "vfs",
-        "@vendor_ts__ra_ap_vfs-notify-0.0.288//:ra_ap_vfs_notify": "vfs_notify",
+        "@vendor_ts__ra_ap_hir_expand-0.0.301//:ra_ap_hir_expand": "hir_expand",
+        "@vendor_ts__ra_ap_ide_db-0.0.301//:ra_ap_ide_db": "ide_db",
+        "@vendor_ts__ra_ap_intern-0.0.301//:ra_ap_intern": "intern",
+        "@vendor_ts__ra_ap_proc_macro_api-0.0.301//:ra_ap_proc_macro_api": "proc_macro_api",
+        "@vendor_ts__ra_ap_project_model-0.0.301//:ra_ap_project_model": "project_model",
+        "@vendor_ts__ra_ap_span-0.0.301//:ra_ap_span": "span",
+        "@vendor_ts__ra_ap_tt-0.0.301//:ra_ap_tt": "tt",
+        "@vendor_ts__ra_ap_vfs-0.0.301//:ra_ap_vfs": "vfs",
+        "@vendor_ts__ra_ap_vfs-notify-0.0.301//:ra_ap_vfs_notify": "vfs_notify",
     },
     compile_data = glob(
         include = ["**"],
@@ -81,12 +81,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -99,20 +103,20 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.0.288",
+    version = "0.0.301",
     deps = [
-        "@vendor_ts__anyhow-1.0.98//:anyhow",
+        "@vendor_ts__anyhow-1.0.100//:anyhow",
         "@vendor_ts__crossbeam-channel-0.5.15//:crossbeam_channel",
         "@vendor_ts__itertools-0.14.0//:itertools",
-        "@vendor_ts__ra_ap_hir_expand-0.0.288//:ra_ap_hir_expand",
-        "@vendor_ts__ra_ap_ide_db-0.0.288//:ra_ap_ide_db",
-        "@vendor_ts__ra_ap_intern-0.0.288//:ra_ap_intern",
-        "@vendor_ts__ra_ap_proc_macro_api-0.0.288//:ra_ap_proc_macro_api",
-        "@vendor_ts__ra_ap_project_model-0.0.288//:ra_ap_project_model",
-        "@vendor_ts__ra_ap_span-0.0.288//:ra_ap_span",
-        "@vendor_ts__ra_ap_tt-0.0.288//:ra_ap_tt",
-        "@vendor_ts__ra_ap_vfs-0.0.288//:ra_ap_vfs",
-        "@vendor_ts__ra_ap_vfs-notify-0.0.288//:ra_ap_vfs_notify",
+        "@vendor_ts__ra_ap_hir_expand-0.0.301//:ra_ap_hir_expand",
+        "@vendor_ts__ra_ap_ide_db-0.0.301//:ra_ap_ide_db",
+        "@vendor_ts__ra_ap_intern-0.0.301//:ra_ap_intern",
+        "@vendor_ts__ra_ap_proc_macro_api-0.0.301//:ra_ap_proc_macro_api",
+        "@vendor_ts__ra_ap_project_model-0.0.301//:ra_ap_project_model",
+        "@vendor_ts__ra_ap_span-0.0.301//:ra_ap_span",
+        "@vendor_ts__ra_ap_tt-0.0.301//:ra_ap_tt",
+        "@vendor_ts__ra_ap_vfs-0.0.301//:ra_ap_vfs",
+        "@vendor_ts__ra_ap_vfs-notify-0.0.301//:ra_ap_vfs_notify",
         "@vendor_ts__tracing-0.1.41//:tracing",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_mbe-0.0.288.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_mbe-0.0.301.bazel
similarity index 78%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_mbe-0.0.288.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_mbe-0.0.301.bazel
index 061ad224056..2fbff68fc77 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_mbe-0.0.288.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_mbe-0.0.301.bazel
@@ -23,12 +23,12 @@ rust_library(
         allow_empty = True,
     ),
     aliases = {
-        "@vendor_ts__ra_ap_intern-0.0.288//:ra_ap_intern": "intern",
-        "@vendor_ts__ra_ap_parser-0.0.288//:ra_ap_parser": "parser",
-        "@vendor_ts__ra_ap_span-0.0.288//:ra_ap_span": "span",
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx": "stdx",
-        "@vendor_ts__ra_ap_syntax-bridge-0.0.288//:ra_ap_syntax_bridge": "syntax_bridge",
-        "@vendor_ts__ra_ap_tt-0.0.288//:ra_ap_tt": "tt",
+        "@vendor_ts__ra_ap_intern-0.0.301//:ra_ap_intern": "intern",
+        "@vendor_ts__ra_ap_parser-0.0.301//:ra_ap_parser": "parser",
+        "@vendor_ts__ra_ap_span-0.0.301//:ra_ap_span": "span",
+        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx": "stdx",
+        "@vendor_ts__ra_ap_syntax-bridge-0.0.301//:ra_ap_syntax_bridge": "syntax_bridge",
+        "@vendor_ts__ra_ap_tt-0.0.301//:ra_ap_tt": "tt",
     },
     compile_data = glob(
         include = ["**"],
@@ -78,12 +78,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -96,17 +100,17 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.0.288",
+    version = "0.0.301",
     deps = [
         "@vendor_ts__arrayvec-0.7.6//:arrayvec",
-        "@vendor_ts__cov-mark-2.0.0//:cov_mark",
-        "@vendor_ts__ra-ap-rustc_lexer-0.116.0//:ra_ap_rustc_lexer",
-        "@vendor_ts__ra_ap_intern-0.0.288//:ra_ap_intern",
-        "@vendor_ts__ra_ap_parser-0.0.288//:ra_ap_parser",
-        "@vendor_ts__ra_ap_span-0.0.288//:ra_ap_span",
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx",
-        "@vendor_ts__ra_ap_syntax-bridge-0.0.288//:ra_ap_syntax_bridge",
-        "@vendor_ts__ra_ap_tt-0.0.288//:ra_ap_tt",
+        "@vendor_ts__cov-mark-2.1.0//:cov_mark",
+        "@vendor_ts__ra-ap-rustc_lexer-0.123.0//:ra_ap_rustc_lexer",
+        "@vendor_ts__ra_ap_intern-0.0.301//:ra_ap_intern",
+        "@vendor_ts__ra_ap_parser-0.0.301//:ra_ap_parser",
+        "@vendor_ts__ra_ap_span-0.0.301//:ra_ap_span",
+        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx",
+        "@vendor_ts__ra_ap_syntax-bridge-0.0.301//:ra_ap_syntax_bridge",
+        "@vendor_ts__ra_ap_tt-0.0.301//:ra_ap_tt",
         "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
         "@vendor_ts__smallvec-1.15.1//:smallvec",
     ],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_parser-0.0.288.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_parser-0.0.301.bazel
similarity index 88%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_parser-0.0.288.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_parser-0.0.301.bazel
index 6c236f815c6..e31fb6afe34 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_parser-0.0.288.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_parser-0.0.301.bazel
@@ -23,7 +23,7 @@ rust_library(
         allow_empty = True,
     ),
     aliases = {
-        "@vendor_ts__ra_ap_edition-0.0.288//:ra_ap_edition": "edition",
+        "@vendor_ts__ra_ap_edition-0.0.301//:ra_ap_edition": "edition",
     },
     compile_data = glob(
         include = ["**"],
@@ -77,12 +77,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -95,12 +99,12 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.0.288",
+    version = "0.0.301",
     deps = [
         "@vendor_ts__drop_bomb-0.1.5//:drop_bomb",
-        "@vendor_ts__ra-ap-rustc_lexer-0.116.0//:ra_ap_rustc_lexer",
-        "@vendor_ts__ra_ap_edition-0.0.288//:ra_ap_edition",
-        "@vendor_ts__rustc-literal-escaper-0.0.3//:rustc_literal_escaper",
+        "@vendor_ts__ra-ap-rustc_lexer-0.123.0//:ra_ap_rustc_lexer",
+        "@vendor_ts__ra_ap_edition-0.0.301//:ra_ap_edition",
+        "@vendor_ts__rustc-literal-escaper-0.0.4//:rustc_literal_escaper",
         "@vendor_ts__tracing-0.1.41//:tracing",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_paths-0.0.288.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_paths-0.0.301.bazel
similarity index 92%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_paths-0.0.288.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_paths-0.0.301.bazel
index 2bbfbca6dc1..d3627c8e09d 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_paths-0.0.288.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_paths-0.0.301.bazel
@@ -73,12 +73,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -91,8 +95,8 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.0.288",
+    version = "0.0.301",
     deps = [
-        "@vendor_ts__camino-1.1.10//:camino",
+        "@vendor_ts__camino-1.1.12//:camino",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_proc_macro_api-0.0.288.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_proc_macro_api-0.0.301.bazel
similarity index 78%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_proc_macro_api-0.0.288.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_proc_macro_api-0.0.301.bazel
index 97084be0d2a..62382cb6834 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_proc_macro_api-0.0.288.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_proc_macro_api-0.0.301.bazel
@@ -23,11 +23,11 @@ rust_library(
         allow_empty = True,
     ),
     aliases = {
-        "@vendor_ts__ra_ap_intern-0.0.288//:ra_ap_intern": "intern",
-        "@vendor_ts__ra_ap_paths-0.0.288//:ra_ap_paths": "paths",
-        "@vendor_ts__ra_ap_span-0.0.288//:ra_ap_span": "span",
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx": "stdx",
-        "@vendor_ts__ra_ap_tt-0.0.288//:ra_ap_tt": "tt",
+        "@vendor_ts__ra_ap_intern-0.0.301//:ra_ap_intern": "intern",
+        "@vendor_ts__ra_ap_paths-0.0.301//:ra_ap_paths": "paths",
+        "@vendor_ts__ra_ap_span-0.0.301//:ra_ap_span": "span",
+        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx": "stdx",
+        "@vendor_ts__ra_ap_tt-0.0.301//:ra_ap_tt": "tt",
     },
     compile_data = glob(
         include = ["**"],
@@ -44,7 +44,7 @@ rust_library(
     crate_root = "src/lib.rs",
     edition = "2024",
     proc_macro_deps = [
-        "@vendor_ts__serde_derive-1.0.219//:serde_derive",
+        "@vendor_ts__serde_derive-1.0.228//:serde_derive",
     ],
     rustc_env_files = [
         ":cargo_toml_env_vars",
@@ -80,12 +80,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -98,17 +102,17 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.0.288",
+    version = "0.0.301",
     deps = [
-        "@vendor_ts__indexmap-2.9.0//:indexmap",
-        "@vendor_ts__ra_ap_intern-0.0.288//:ra_ap_intern",
-        "@vendor_ts__ra_ap_paths-0.0.288//:ra_ap_paths",
-        "@vendor_ts__ra_ap_span-0.0.288//:ra_ap_span",
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx",
-        "@vendor_ts__ra_ap_tt-0.0.288//:ra_ap_tt",
+        "@vendor_ts__indexmap-2.11.4//:indexmap",
+        "@vendor_ts__ra_ap_intern-0.0.301//:ra_ap_intern",
+        "@vendor_ts__ra_ap_paths-0.0.301//:ra_ap_paths",
+        "@vendor_ts__ra_ap_span-0.0.301//:ra_ap_span",
+        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx",
+        "@vendor_ts__ra_ap_tt-0.0.301//:ra_ap_tt",
         "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
-        "@vendor_ts__serde-1.0.219//:serde",
-        "@vendor_ts__serde_json-1.0.140//:serde_json",
+        "@vendor_ts__serde-1.0.228//:serde",
+        "@vendor_ts__serde_json-1.0.145//:serde_json",
         "@vendor_ts__tracing-0.1.41//:tracing",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_profile-0.0.288.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_profile-0.0.301.bazel
similarity index 84%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_profile-0.0.288.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_profile-0.0.301.bazel
index 2522ef6c080..bda44ea0ec5 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_profile-0.0.288.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_profile-0.0.301.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,53 +92,57 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.0.288",
+    version = "0.0.301",
     deps = [
-        "@vendor_ts__cfg-if-1.0.1//:cfg_if",
+        "@vendor_ts__cfg-if-1.0.3//:cfg_if",
     ] + select({
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
             "@vendor_ts__windows-sys-0.60.2//:windows_sys",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(all(target_os = "linux", target_env = "gnu"))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(all(target_os = "linux", target_env = "gnu"))
             "@vendor_ts__perf-event-0.4.7//:perf_event",  # cfg(all(target_os = "linux", not(target_env = "ohos")))
         ],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(all(target_os = "linux", target_env = "gnu"))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(all(target_os = "linux", target_env = "gnu"))
             "@vendor_ts__perf-event-0.4.7//:perf_event",  # cfg(all(target_os = "linux", not(target_env = "ohos")))
         ],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(all(target_os = "linux", target_env = "gnu"))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(all(target_os = "linux", target_env = "gnu"))
             "@vendor_ts__perf-event-0.4.7//:perf_event",  # cfg(all(target_os = "linux", not(target_env = "ohos")))
         ],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(all(target_os = "linux", target_env = "gnu"))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(all(target_os = "linux", target_env = "gnu"))
             "@vendor_ts__perf-event-0.4.7//:perf_event",  # cfg(all(target_os = "linux", not(target_env = "ohos")))
         ],
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [
             "@vendor_ts__windows-sys-0.60.2//:windows_sys",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(all(target_os = "linux", target_env = "gnu"))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(all(target_os = "linux", target_env = "gnu"))
             "@vendor_ts__perf-event-0.4.7//:perf_event",  # cfg(all(target_os = "linux", not(target_env = "ohos")))
         ],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(all(target_os = "linux", target_env = "gnu"))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(all(target_os = "linux", target_env = "gnu"))
+            "@vendor_ts__perf-event-0.4.7//:perf_event",  # cfg(all(target_os = "linux", not(target_env = "ohos")))
+        ],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(all(target_os = "linux", target_env = "gnu"))
             "@vendor_ts__perf-event-0.4.7//:perf_event",  # cfg(all(target_os = "linux", not(target_env = "ohos")))
         ],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(all(target_os = "linux", target_env = "gnu"))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(all(target_os = "linux", target_env = "gnu"))
             "@vendor_ts__perf-event-0.4.7//:perf_event",  # cfg(all(target_os = "linux", not(target_env = "ohos")))
         ],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
             "@vendor_ts__windows-sys-0.60.2//:windows_sys",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(all(target_os = "linux", target_env = "gnu"))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(all(target_os = "linux", target_env = "gnu"))
             "@vendor_ts__perf-event-0.4.7//:perf_event",  # cfg(all(target_os = "linux", not(target_env = "ohos")))
         ],
         "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(all(target_os = "linux", target_env = "gnu"))
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(all(target_os = "linux", target_env = "gnu"))
             "@vendor_ts__perf-event-0.4.7//:perf_event",  # cfg(all(target_os = "linux", not(target_env = "ohos")))
         ],
         "//conditions:default": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_project_model-0.0.288.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_project_model-0.0.301.bazel
similarity index 74%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_project_model-0.0.288.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_project_model-0.0.301.bazel
index 5cbd98eb330..e54b95b9252 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_project_model-0.0.288.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_project_model-0.0.301.bazel
@@ -23,13 +23,13 @@ rust_library(
         allow_empty = True,
     ),
     aliases = {
-        "@vendor_ts__ra_ap_base_db-0.0.288//:ra_ap_base_db": "base_db",
-        "@vendor_ts__ra_ap_cfg-0.0.288//:ra_ap_cfg": "cfg",
-        "@vendor_ts__ra_ap_intern-0.0.288//:ra_ap_intern": "intern",
-        "@vendor_ts__ra_ap_paths-0.0.288//:ra_ap_paths": "paths",
-        "@vendor_ts__ra_ap_span-0.0.288//:ra_ap_span": "span",
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx": "stdx",
-        "@vendor_ts__ra_ap_toolchain-0.0.288//:ra_ap_toolchain": "toolchain",
+        "@vendor_ts__ra_ap_base_db-0.0.301//:ra_ap_base_db": "base_db",
+        "@vendor_ts__ra_ap_cfg-0.0.301//:ra_ap_cfg": "cfg",
+        "@vendor_ts__ra_ap_intern-0.0.301//:ra_ap_intern": "intern",
+        "@vendor_ts__ra_ap_paths-0.0.301//:ra_ap_paths": "paths",
+        "@vendor_ts__ra_ap_span-0.0.301//:ra_ap_span": "span",
+        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx": "stdx",
+        "@vendor_ts__ra_ap_toolchain-0.0.301//:ra_ap_toolchain": "toolchain",
     },
     compile_data = glob(
         include = ["**"],
@@ -46,7 +46,7 @@ rust_library(
     crate_root = "src/lib.rs",
     edition = "2024",
     proc_macro_deps = [
-        "@vendor_ts__serde_derive-1.0.219//:serde_derive",
+        "@vendor_ts__serde_derive-1.0.228//:serde_derive",
     ],
     rustc_env_files = [
         ":cargo_toml_env_vars",
@@ -82,12 +82,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -100,23 +104,24 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.0.288",
+    version = "0.0.301",
     deps = [
-        "@vendor_ts__anyhow-1.0.98//:anyhow",
-        "@vendor_ts__cargo_metadata-0.20.0//:cargo_metadata",
+        "@vendor_ts__anyhow-1.0.100//:anyhow",
+        "@vendor_ts__cargo_metadata-0.21.0//:cargo_metadata",
         "@vendor_ts__itertools-0.14.0//:itertools",
         "@vendor_ts__la-arena-0.3.1//:la_arena",
-        "@vendor_ts__ra_ap_base_db-0.0.288//:ra_ap_base_db",
-        "@vendor_ts__ra_ap_cfg-0.0.288//:ra_ap_cfg",
-        "@vendor_ts__ra_ap_intern-0.0.288//:ra_ap_intern",
-        "@vendor_ts__ra_ap_paths-0.0.288//:ra_ap_paths",
-        "@vendor_ts__ra_ap_span-0.0.288//:ra_ap_span",
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx",
-        "@vendor_ts__ra_ap_toolchain-0.0.288//:ra_ap_toolchain",
+        "@vendor_ts__ra_ap_base_db-0.0.301//:ra_ap_base_db",
+        "@vendor_ts__ra_ap_cfg-0.0.301//:ra_ap_cfg",
+        "@vendor_ts__ra_ap_intern-0.0.301//:ra_ap_intern",
+        "@vendor_ts__ra_ap_paths-0.0.301//:ra_ap_paths",
+        "@vendor_ts__ra_ap_span-0.0.301//:ra_ap_span",
+        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx",
+        "@vendor_ts__ra_ap_toolchain-0.0.301//:ra_ap_toolchain",
         "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
         "@vendor_ts__semver-1.0.26//:semver",
-        "@vendor_ts__serde-1.0.219//:serde",
-        "@vendor_ts__serde_json-1.0.140//:serde_json",
+        "@vendor_ts__serde-1.0.228//:serde",
+        "@vendor_ts__serde_json-1.0.145//:serde_json",
+        "@vendor_ts__temp-dir-0.1.16//:temp_dir",
         "@vendor_ts__tracing-0.1.41//:tracing",
         "@vendor_ts__triomphe-0.1.14//:triomphe",
     ],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_query-group-macro-0.0.288.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_query-group-macro-0.0.301.bazel
similarity index 89%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_query-group-macro-0.0.288.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_query-group-macro-0.0.301.bazel
index ba77f60997b..d1a49cd5f95 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_query-group-macro-0.0.288.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_query-group-macro-0.0.301.bazel
@@ -70,12 +70,16 @@ rust_proc_macro(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,10 +92,10 @@ rust_proc_macro(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.0.288",
+    version = "0.0.301",
     deps = [
-        "@vendor_ts__proc-macro2-1.0.95//:proc_macro2",
-        "@vendor_ts__quote-1.0.40//:quote",
-        "@vendor_ts__syn-2.0.103//:syn",
+        "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
+        "@vendor_ts__quote-1.0.41//:quote",
+        "@vendor_ts__syn-2.0.106//:syn",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_span-0.0.288.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_span-0.0.301.bazel
similarity index 85%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_span-0.0.288.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_span-0.0.301.bazel
index a621647e140..fa784c663a8 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_span-0.0.288.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_span-0.0.301.bazel
@@ -23,9 +23,9 @@ rust_library(
         allow_empty = True,
     ),
     aliases = {
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx": "stdx",
-        "@vendor_ts__ra_ap_syntax-0.0.288//:ra_ap_syntax": "syntax",
-        "@vendor_ts__ra_ap_vfs-0.0.288//:ra_ap_vfs": "vfs",
+        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx": "stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.301//:ra_ap_syntax": "syntax",
+        "@vendor_ts__ra_ap_vfs-0.0.301//:ra_ap_vfs": "vfs",
     },
     compile_data = glob(
         include = ["**"],
@@ -79,12 +79,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -97,15 +101,15 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.0.288",
+    version = "0.0.301",
     deps = [
         "@vendor_ts__hashbrown-0.14.5//:hashbrown",
         "@vendor_ts__la-arena-0.3.1//:la_arena",
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx",
-        "@vendor_ts__ra_ap_syntax-0.0.288//:ra_ap_syntax",
-        "@vendor_ts__ra_ap_vfs-0.0.288//:ra_ap_vfs",
+        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.301//:ra_ap_syntax",
+        "@vendor_ts__ra_ap_vfs-0.0.301//:ra_ap_vfs",
         "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
-        "@vendor_ts__salsa-0.22.0//:salsa",
+        "@vendor_ts__salsa-0.23.0//:salsa",
         "@vendor_ts__text-size-1.1.1//:text_size",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_stdx-0.0.288.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_stdx-0.0.301.bazel
similarity index 74%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_stdx-0.0.288.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_stdx-0.0.301.bazel
index 6fe94fdf39a..4d81268c7ba 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_stdx-0.0.288.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_stdx-0.0.301.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,7 +92,7 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.0.288",
+    version = "0.0.301",
     deps = [
         "@vendor_ts__crossbeam-channel-0.5.15//:crossbeam_channel",
         "@vendor_ts__crossbeam-utils-0.8.21//:crossbeam_utils",
@@ -97,88 +101,94 @@ rust_library(
         "@vendor_ts__tracing-0.1.41//:tracing",
     ] + select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:aarch64-apple-ios": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:aarch64-linux-android": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
-            "@vendor_ts__miow-0.6.0//:miow",  # cfg(windows)
+            "@vendor_ts__miow-0.6.1//:miow",  # cfg(windows)
             "@vendor_ts__windows-sys-0.60.2//:windows_sys",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:i686-apple-darwin": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:i686-linux-android": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "@vendor_ts__miow-0.6.0//:miow",  # cfg(windows)
+            "@vendor_ts__miow-0.6.1//:miow",  # cfg(windows)
             "@vendor_ts__windows-sys-0.60.2//:windows_sys",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
+        ],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:x86_64-apple-ios": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:x86_64-linux-android": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
-            "@vendor_ts__miow-0.6.0//:miow",  # cfg(windows)
+            "@vendor_ts__miow-0.6.1//:miow",  # cfg(windows)
             "@vendor_ts__windows-sys-0.60.2//:windows_sys",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
         "//conditions:default": [],
     }),
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-0.0.288.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-0.0.301.bazel
similarity index 87%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-0.0.288.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-0.0.301.bazel
index d36724e8a09..2413110f255 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-0.0.288.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-0.0.301.bazel
@@ -23,8 +23,8 @@ rust_library(
         allow_empty = True,
     ),
     aliases = {
-        "@vendor_ts__ra_ap_parser-0.0.288//:ra_ap_parser": "parser",
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx": "stdx",
+        "@vendor_ts__ra_ap_parser-0.0.301//:ra_ap_parser": "parser",
+        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx": "stdx",
     },
     compile_data = glob(
         include = ["**"],
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -92,15 +96,15 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.0.288",
+    version = "0.0.301",
     deps = [
         "@vendor_ts__either-1.15.0//:either",
         "@vendor_ts__itertools-0.14.0//:itertools",
-        "@vendor_ts__ra_ap_parser-0.0.288//:ra_ap_parser",
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx",
+        "@vendor_ts__ra_ap_parser-0.0.301//:ra_ap_parser",
+        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx",
         "@vendor_ts__rowan-0.15.15//:rowan",
         "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
-        "@vendor_ts__rustc-literal-escaper-0.0.3//:rustc_literal_escaper",
+        "@vendor_ts__rustc-literal-escaper-0.0.4//:rustc_literal_escaper",
         "@vendor_ts__smol_str-0.3.2//:smol_str",
         "@vendor_ts__tracing-0.1.41//:tracing",
         "@vendor_ts__triomphe-0.1.14//:triomphe",
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-bridge-0.0.288.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-bridge-0.0.301.bazel
similarity index 79%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-bridge-0.0.288.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-bridge-0.0.301.bazel
index 1437cfd81f5..4f0ccf66d07 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-bridge-0.0.288.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-bridge-0.0.301.bazel
@@ -23,12 +23,12 @@ rust_library(
         allow_empty = True,
     ),
     aliases = {
-        "@vendor_ts__ra_ap_intern-0.0.288//:ra_ap_intern": "intern",
-        "@vendor_ts__ra_ap_parser-0.0.288//:ra_ap_parser": "parser",
-        "@vendor_ts__ra_ap_span-0.0.288//:ra_ap_span": "span",
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx": "stdx",
-        "@vendor_ts__ra_ap_syntax-0.0.288//:ra_ap_syntax": "syntax",
-        "@vendor_ts__ra_ap_tt-0.0.288//:ra_ap_tt": "tt",
+        "@vendor_ts__ra_ap_intern-0.0.301//:ra_ap_intern": "intern",
+        "@vendor_ts__ra_ap_parser-0.0.301//:ra_ap_parser": "parser",
+        "@vendor_ts__ra_ap_span-0.0.301//:ra_ap_span": "span",
+        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx": "stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.301//:ra_ap_syntax": "syntax",
+        "@vendor_ts__ra_ap_tt-0.0.301//:ra_ap_tt": "tt",
     },
     compile_data = glob(
         include = ["**"],
@@ -78,12 +78,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -96,14 +100,14 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.0.288",
+    version = "0.0.301",
     deps = [
-        "@vendor_ts__ra_ap_intern-0.0.288//:ra_ap_intern",
-        "@vendor_ts__ra_ap_parser-0.0.288//:ra_ap_parser",
-        "@vendor_ts__ra_ap_span-0.0.288//:ra_ap_span",
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx",
-        "@vendor_ts__ra_ap_syntax-0.0.288//:ra_ap_syntax",
-        "@vendor_ts__ra_ap_tt-0.0.288//:ra_ap_tt",
+        "@vendor_ts__ra_ap_intern-0.0.301//:ra_ap_intern",
+        "@vendor_ts__ra_ap_parser-0.0.301//:ra_ap_parser",
+        "@vendor_ts__ra_ap_span-0.0.301//:ra_ap_span",
+        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.301//:ra_ap_syntax",
+        "@vendor_ts__ra_ap_tt-0.0.301//:ra_ap_tt",
         "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_toolchain-0.0.288.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_toolchain-0.0.301.bazel
similarity index 92%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_toolchain-0.0.288.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_toolchain-0.0.301.bazel
index d5810dbca8f..8688fe6dde8 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_toolchain-0.0.288.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_toolchain-0.0.301.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,9 +92,9 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.0.288",
+    version = "0.0.301",
     deps = [
-        "@vendor_ts__camino-1.1.10//:camino",
+        "@vendor_ts__camino-1.1.12//:camino",
         "@vendor_ts__home-0.5.11//:home",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_tt-0.0.288.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_tt-0.0.301.bazel
similarity index 86%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_tt-0.0.288.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_tt-0.0.301.bazel
index 486ce92d90b..4e3842c4f09 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_tt-0.0.288.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_tt-0.0.301.bazel
@@ -23,8 +23,8 @@ rust_library(
         allow_empty = True,
     ),
     aliases = {
-        "@vendor_ts__ra_ap_intern-0.0.288//:ra_ap_intern": "intern",
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx": "stdx",
+        "@vendor_ts__ra_ap_intern-0.0.301//:ra_ap_intern": "intern",
+        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx": "stdx",
     },
     compile_data = glob(
         include = ["**"],
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -92,12 +96,12 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.0.288",
+    version = "0.0.301",
     deps = [
         "@vendor_ts__arrayvec-0.7.6//:arrayvec",
-        "@vendor_ts__ra-ap-rustc_lexer-0.116.0//:ra_ap_rustc_lexer",
-        "@vendor_ts__ra_ap_intern-0.0.288//:ra_ap_intern",
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx",
+        "@vendor_ts__ra-ap-rustc_lexer-0.123.0//:ra_ap_rustc_lexer",
+        "@vendor_ts__ra_ap_intern-0.0.301//:ra_ap_intern",
+        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx",
         "@vendor_ts__text-size-1.1.1//:text_size",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-0.0.288.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-0.0.301.bazel
similarity index 87%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-0.0.288.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-0.0.301.bazel
index 0e8b8fcd7e3..bca4bbf5f85 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-0.0.288.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-0.0.301.bazel
@@ -23,8 +23,8 @@ rust_library(
         allow_empty = True,
     ),
     aliases = {
-        "@vendor_ts__ra_ap_paths-0.0.288//:ra_ap_paths": "paths",
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx": "stdx",
+        "@vendor_ts__ra_ap_paths-0.0.301//:ra_ap_paths": "paths",
+        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx": "stdx",
     },
     compile_data = glob(
         include = ["**"],
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -92,14 +96,14 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.0.288",
+    version = "0.0.301",
     deps = [
         "@vendor_ts__crossbeam-channel-0.5.15//:crossbeam_channel",
         "@vendor_ts__fst-0.4.7//:fst",
-        "@vendor_ts__indexmap-2.9.0//:indexmap",
+        "@vendor_ts__indexmap-2.11.4//:indexmap",
         "@vendor_ts__nohash-hasher-0.2.0//:nohash_hasher",
-        "@vendor_ts__ra_ap_paths-0.0.288//:ra_ap_paths",
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx",
+        "@vendor_ts__ra_ap_paths-0.0.301//:ra_ap_paths",
+        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx",
         "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
         "@vendor_ts__tracing-0.1.41//:tracing",
     ],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-notify-0.0.288.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-notify-0.0.301.bazel
similarity index 84%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-notify-0.0.288.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-notify-0.0.301.bazel
index f98d75024ea..8f09f78c4b0 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-notify-0.0.288.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-notify-0.0.301.bazel
@@ -23,9 +23,9 @@ rust_library(
         allow_empty = True,
     ),
     aliases = {
-        "@vendor_ts__ra_ap_paths-0.0.288//:ra_ap_paths": "paths",
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx": "stdx",
-        "@vendor_ts__ra_ap_vfs-0.0.288//:ra_ap_vfs": "vfs",
+        "@vendor_ts__ra_ap_paths-0.0.301//:ra_ap_paths": "paths",
+        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx": "stdx",
+        "@vendor_ts__ra_ap_vfs-0.0.301//:ra_ap_vfs": "vfs",
     },
     compile_data = glob(
         include = ["**"],
@@ -75,12 +75,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -93,14 +97,14 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.0.288",
+    version = "0.0.301",
     deps = [
         "@vendor_ts__crossbeam-channel-0.5.15//:crossbeam_channel",
-        "@vendor_ts__notify-8.0.0//:notify",
-        "@vendor_ts__ra_ap_paths-0.0.288//:ra_ap_paths",
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx",
-        "@vendor_ts__ra_ap_vfs-0.0.288//:ra_ap_vfs",
-        "@vendor_ts__rayon-1.10.0//:rayon",
+        "@vendor_ts__notify-8.2.0//:notify",
+        "@vendor_ts__ra_ap_paths-0.0.301//:ra_ap_paths",
+        "@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx",
+        "@vendor_ts__ra_ap_vfs-0.0.301//:ra_ap_vfs",
+        "@vendor_ts__rayon-1.11.0//:rayon",
         "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
         "@vendor_ts__tracing-0.1.41//:tracing",
         "@vendor_ts__walkdir-2.5.0//:walkdir",
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand-0.9.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand-0.9.2.bazel
similarity index 92%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand-0.9.1.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand-0.9.2.bazel
index 47ae67f0888..1e5b380c8e8 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand-0.9.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand-0.9.2.bazel
@@ -79,12 +79,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -97,9 +101,9 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.9.1",
+    version = "0.9.2",
     deps = [
         "@vendor_ts__rand_chacha-0.9.0//:rand_chacha",
-        "@vendor_ts__rand_core-0.9.2//:rand_core",
+        "@vendor_ts__rand_core-0.9.3//:rand_core",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand_chacha-0.9.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand_chacha-0.9.0.bazel
index 1ce83435732..d95c304574e 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand_chacha-0.9.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand_chacha-0.9.0.bazel
@@ -73,12 +73,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -93,7 +97,7 @@ rust_library(
     }),
     version = "0.9.0",
     deps = [
-        "@vendor_ts__ppv-lite86-0.2.20//:ppv_lite86",
-        "@vendor_ts__rand_core-0.9.2//:rand_core",
+        "@vendor_ts__ppv-lite86-0.2.21//:ppv_lite86",
+        "@vendor_ts__rand_core-0.9.3//:rand_core",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand_core-0.9.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand_core-0.9.3.bazel
similarity index 92%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand_core-0.9.2.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand_core-0.9.3.bazel
index 7c0ca672590..02b349c691a 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand_core-0.9.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand_core-0.9.3.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -92,9 +96,8 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.9.2",
+    version = "0.9.3",
     deps = [
-        "@vendor_ts__getrandom-0.3.1//:getrandom",
-        "@vendor_ts__zerocopy-0.8.20//:zerocopy",
+        "@vendor_ts__getrandom-0.3.3//:getrandom",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rayon-1.10.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rayon-1.11.0.bazel
similarity index 91%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rayon-1.10.0.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rayon-1.11.0.bazel
index 54b0313af6f..b022fcc5c8f 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rayon-1.10.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rayon-1.11.0.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,9 +92,9 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "1.10.0",
+    version = "1.11.0",
     deps = [
         "@vendor_ts__either-1.15.0//:either",
-        "@vendor_ts__rayon-core-1.12.1//:rayon_core",
+        "@vendor_ts__rayon-core-1.13.0//:rayon_core",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rayon-core-1.12.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rayon-core-1.13.0.bazel
similarity index 93%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rayon-core-1.12.1.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rayon-core-1.13.0.bazel
index 32592b58e8a..293c4247781 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rayon-core-1.12.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rayon-core-1.13.0.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -92,11 +96,11 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "1.12.1",
+    version = "1.13.0",
     deps = [
         "@vendor_ts__crossbeam-deque-0.8.6//:crossbeam_deque",
         "@vendor_ts__crossbeam-utils-0.8.21//:crossbeam_utils",
-        "@vendor_ts__rayon-core-1.12.1//:build_script_build",
+        "@vendor_ts__rayon-core-1.13.0//:build_script_build",
     ],
 )
 
@@ -149,7 +153,7 @@ cargo_build_script(
         "noclippy",
         "norustfmt",
     ],
-    version = "1.12.1",
+    version = "1.13.0",
     visibility = ["//visibility:private"],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.redox_syscall-0.5.8.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.redox_syscall-0.5.17.bazel
similarity index 91%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.redox_syscall-0.5.8.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.redox_syscall-0.5.17.bazel
index 6ee1fcaa938..4f235ca509f 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.redox_syscall-0.5.8.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.redox_syscall-0.5.17.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,8 +92,8 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.5.8",
+    version = "0.5.17",
     deps = [
-        "@vendor_ts__bitflags-2.9.1//:bitflags",
+        "@vendor_ts__bitflags-2.9.4//:bitflags",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ref-cast-1.0.24.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ref-cast-1.0.24.bazel
index 7db5ebf02c7..aa00cedf811 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ref-cast-1.0.24.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ref-cast-1.0.24.bazel
@@ -77,12 +77,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ref-cast-impl-1.0.24.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ref-cast-impl-1.0.24.bazel
index ceeea730440..283e6bf5a8f 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ref-cast-impl-1.0.24.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ref-cast-impl-1.0.24.bazel
@@ -70,12 +70,16 @@ rust_proc_macro(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -90,8 +94,8 @@ rust_proc_macro(
     }),
     version = "1.0.24",
     deps = [
-        "@vendor_ts__proc-macro2-1.0.95//:proc_macro2",
-        "@vendor_ts__quote-1.0.40//:quote",
-        "@vendor_ts__syn-2.0.103//:syn",
+        "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
+        "@vendor_ts__quote-1.0.41//:quote",
+        "@vendor_ts__syn-2.0.106//:syn",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-1.11.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-1.11.3.bazel
similarity index 91%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-1.11.1.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-1.11.3.bazel
index 92e631bc957..67446df2cc3 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-1.11.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-1.11.3.bazel
@@ -89,12 +89,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -107,11 +111,11 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "1.11.1",
+    version = "1.11.3",
     deps = [
         "@vendor_ts__aho-corasick-1.1.3//:aho_corasick",
         "@vendor_ts__memchr-2.7.5//:memchr",
-        "@vendor_ts__regex-automata-0.4.9//:regex_automata",
-        "@vendor_ts__regex-syntax-0.8.5//:regex_syntax",
+        "@vendor_ts__regex-automata-0.4.11//:regex_automata",
+        "@vendor_ts__regex-syntax-0.8.6//:regex_syntax",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-automata-0.1.10.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-automata-0.1.10.bazel
deleted file mode 100644
index 9b58dc74006..00000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-automata-0.1.10.bazel
+++ /dev/null
@@ -1,100 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "regex_automata",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "regex-syntax",
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2015",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=regex-automata",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.1.10",
-    deps = [
-        "@vendor_ts__regex-syntax-0.6.29//:regex_syntax",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-automata-0.4.9.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-automata-0.4.11.bazel
similarity index 92%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-automata-0.4.9.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-automata-0.4.11.bazel
index bdfd5c10b87..b921cf34fd2 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-automata-0.4.9.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-automata-0.4.11.bazel
@@ -36,7 +36,9 @@ rust_library(
     ),
     crate_features = [
         "alloc",
+        "dfa-build",
         "dfa-onepass",
+        "dfa-search",
         "hybrid",
         "meta",
         "nfa",
@@ -96,12 +98,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -114,10 +120,10 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.4.9",
+    version = "0.4.11",
     deps = [
         "@vendor_ts__aho-corasick-1.1.3//:aho_corasick",
         "@vendor_ts__memchr-2.7.5//:memchr",
-        "@vendor_ts__regex-syntax-0.8.5//:regex_syntax",
+        "@vendor_ts__regex-syntax-0.8.6//:regex_syntax",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-syntax-0.6.29.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-syntax-0.6.29.bazel
deleted file mode 100644
index dbfafb2e61f..00000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-syntax-0.6.29.bazel
+++ /dev/null
@@ -1,103 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "regex_syntax",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "default",
-        "unicode",
-        "unicode-age",
-        "unicode-bool",
-        "unicode-case",
-        "unicode-gencat",
-        "unicode-perl",
-        "unicode-script",
-        "unicode-segment",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=regex-syntax",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.6.29",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-syntax-0.8.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-syntax-0.8.6.bazel
similarity index 93%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-syntax-0.8.5.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-syntax-0.8.6.bazel
index 78a2a7ef6bc..8591bbb61ad 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-syntax-0.8.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-syntax-0.8.6.bazel
@@ -82,12 +82,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -100,5 +104,5 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.8.5",
+    version = "0.8.6",
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rowan-0.15.15.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rowan-0.15.15.bazel
index 730dcab37ba..8dd1734cb0b 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rowan-0.15.15.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rowan-0.15.15.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-hash-1.1.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-hash-1.1.0.bazel
index b1c27aea91a..2e1e394414b 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-hash-1.1.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-hash-1.1.0.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-hash-2.1.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-hash-2.1.1.bazel
index 5af0f94dc4b..3510d2a1ecb 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-hash-2.1.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-hash-2.1.1.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-literal-escaper-0.0.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-literal-escaper-0.0.3.bazel
deleted file mode 100644
index f5ded90eee8..00000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-literal-escaper-0.0.3.bazel
+++ /dev/null
@@ -1,92 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "rustc_literal_escaper",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=rustc-literal-escaper",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.0.3",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-literal-escaper-0.0.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-literal-escaper-0.0.4.bazel
similarity index 93%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-literal-escaper-0.0.2.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-literal-escaper-0.0.4.bazel
index 9a56ccdfbec..e28c0bc4178 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-literal-escaper-0.0.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-literal-escaper-0.0.4.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,5 +92,5 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.0.2",
+    version = "0.0.4",
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-stable-hash-0.1.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-stable-hash-0.1.2.bazel
similarity index 93%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-stable-hash-0.1.1.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-stable-hash-0.1.2.bazel
index b35f640c18c..adfeba65d21 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-stable-hash-0.1.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-stable-hash-0.1.2.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,5 +92,5 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.1.1",
+    version = "0.1.2",
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc_apfloat-0.2.3+llvm-462a31f5a5ab.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc_apfloat-0.2.3+llvm-462a31f5a5ab.bazel
index c63cc2939ba..0120f3ea41b 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc_apfloat-0.2.3+llvm-462a31f5a5ab.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc_apfloat-0.2.3+llvm-462a31f5a5ab.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -94,7 +98,7 @@ rust_library(
     }),
     version = "0.2.3+llvm-462a31f5a5ab",
     deps = [
-        "@vendor_ts__bitflags-2.9.1//:bitflags",
+        "@vendor_ts__bitflags-2.9.4//:bitflags",
         "@vendor_ts__rustc_apfloat-0.2.3-llvm-462a31f5a5ab//:build_script_build",
         "@vendor_ts__smallvec-1.15.1//:smallvec",
     ],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustversion-1.0.22.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustversion-1.0.22.bazel
new file mode 100644
index 00000000000..03476d43a93
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustversion-1.0.22.bazel
@@ -0,0 +1,161 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load(
+    "@rules_rust//cargo:defs.bzl",
+    "cargo_build_script",
+    "cargo_toml_env_vars",
+)
+load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_proc_macro(
+    name = "rustversion",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=rustversion",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.22",
+    deps = [
+        "@vendor_ts__rustversion-1.0.22//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "build/build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2018",
+    pkg_name = "rustversion",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=rustversion",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "1.0.22",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ryu-1.0.19.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ryu-1.0.20.bazel
similarity index 92%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ryu-1.0.19.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ryu-1.0.20.bazel
index d86a32cc46c..5b099b034d2 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ryu-1.0.19.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ryu-1.0.20.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,5 +92,5 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "1.0.19",
+    version = "1.0.20",
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-0.22.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-0.23.0.bazel
similarity index 82%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-0.22.0.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-0.23.0.bazel
index a01bae583ad..6a57925fb36 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-0.22.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-0.23.0.bazel
@@ -43,7 +43,7 @@ rust_library(
     crate_root = "src/lib.rs",
     edition = "2021",
     proc_macro_deps = [
-        "@vendor_ts__salsa-macros-0.22.0//:salsa_macros",
+        "@vendor_ts__salsa-macros-0.23.0//:salsa_macros",
     ],
     rustc_env_files = [
         ":cargo_toml_env_vars",
@@ -79,12 +79,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -97,19 +101,21 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.22.0",
+    version = "0.23.0",
     deps = [
-        "@vendor_ts__boxcar-0.2.13//:boxcar",
+        "@vendor_ts__boxcar-0.2.14//:boxcar",
         "@vendor_ts__crossbeam-queue-0.3.12//:crossbeam_queue",
-        "@vendor_ts__dashmap-6.1.0//:dashmap",
-        "@vendor_ts__hashbrown-0.15.2//:hashbrown",
+        "@vendor_ts__crossbeam-utils-0.8.21//:crossbeam_utils",
+        "@vendor_ts__hashbrown-0.15.5//:hashbrown",
         "@vendor_ts__hashlink-0.10.0//:hashlink",
-        "@vendor_ts__indexmap-2.9.0//:indexmap",
-        "@vendor_ts__parking_lot-0.12.3//:parking_lot",
-        "@vendor_ts__portable-atomic-1.11.0//:portable_atomic",
-        "@vendor_ts__rayon-1.10.0//:rayon",
+        "@vendor_ts__indexmap-2.11.4//:indexmap",
+        "@vendor_ts__intrusive-collections-0.9.7//:intrusive_collections",
+        "@vendor_ts__papaya-0.2.3//:papaya",
+        "@vendor_ts__parking_lot-0.12.4//:parking_lot",
+        "@vendor_ts__portable-atomic-1.11.1//:portable_atomic",
+        "@vendor_ts__rayon-1.11.0//:rayon",
         "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
-        "@vendor_ts__salsa-macro-rules-0.22.0//:salsa_macro_rules",
+        "@vendor_ts__salsa-macro-rules-0.23.0//:salsa_macro_rules",
         "@vendor_ts__smallvec-1.15.1//:smallvec",
         "@vendor_ts__thin-vec-0.2.14//:thin_vec",
         "@vendor_ts__tracing-0.1.41//:tracing",
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-macro-rules-0.22.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-macro-rules-0.23.0.bazel
similarity index 93%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-macro-rules-0.22.0.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-macro-rules-0.23.0.bazel
index 88855a571b5..2fa60dda2d7 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-macro-rules-0.22.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-macro-rules-0.23.0.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,5 +92,5 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.22.0",
+    version = "0.23.0",
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-macros-0.22.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-macros-0.23.0.bazel
similarity index 88%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-macros-0.22.0.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-macros-0.23.0.bazel
index 3d1c5c6e30b..622d2817781 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-macros-0.22.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-macros-0.23.0.bazel
@@ -70,12 +70,16 @@ rust_proc_macro(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,12 +92,11 @@ rust_proc_macro(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.22.0",
+    version = "0.23.0",
     deps = [
-        "@vendor_ts__heck-0.5.0//:heck",
-        "@vendor_ts__proc-macro2-1.0.95//:proc_macro2",
-        "@vendor_ts__quote-1.0.40//:quote",
-        "@vendor_ts__syn-2.0.103//:syn",
-        "@vendor_ts__synstructure-0.13.1//:synstructure",
+        "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
+        "@vendor_ts__quote-1.0.41//:quote",
+        "@vendor_ts__syn-2.0.106//:syn",
+        "@vendor_ts__synstructure-0.13.2//:synstructure",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.same-file-1.0.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.same-file-1.0.6.bazel
index 12659c8d66c..01d9cc94d56 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.same-file-1.0.6.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.same-file-1.0.6.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -91,13 +95,13 @@ rust_library(
     version = "1.0.6",
     deps = select({
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
-            "@vendor_ts__winapi-util-0.1.9//:winapi_util",  # cfg(windows)
+            "@vendor_ts__winapi-util-0.1.11//:winapi_util",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "@vendor_ts__winapi-util-0.1.9//:winapi_util",  # cfg(windows)
+            "@vendor_ts__winapi-util-0.1.11//:winapi_util",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
-            "@vendor_ts__winapi-util-0.1.9//:winapi_util",  # cfg(windows)
+            "@vendor_ts__winapi-util-0.1.11//:winapi_util",  # cfg(windows)
         ],
         "//conditions:default": [],
     }),
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.schemars-0.9.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.schemars-0.9.0.bazel
index f0a4f6dbe74..7229003a1d0 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.schemars-0.9.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.schemars-0.9.0.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -90,9 +94,9 @@ rust_library(
     }),
     version = "0.9.0",
     deps = [
-        "@vendor_ts__dyn-clone-1.0.19//:dyn_clone",
+        "@vendor_ts__dyn-clone-1.0.20//:dyn_clone",
         "@vendor_ts__ref-cast-1.0.24//:ref_cast",
-        "@vendor_ts__serde-1.0.219//:serde",
-        "@vendor_ts__serde_json-1.0.140//:serde_json",
+        "@vendor_ts__serde-1.0.228//:serde",
+        "@vendor_ts__serde_json-1.0.145//:serde_json",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.schemars-1.0.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.schemars-1.0.4.bazel
new file mode 100644
index 00000000000..757f0deab3c
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.schemars-1.0.4.bazel
@@ -0,0 +1,102 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "schemars",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=schemars",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.4",
+    deps = [
+        "@vendor_ts__dyn-clone-1.0.20//:dyn_clone",
+        "@vendor_ts__ref-cast-1.0.24//:ref_cast",
+        "@vendor_ts__serde-1.0.228//:serde",
+        "@vendor_ts__serde_json-1.0.145//:serde_json",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.scoped-tls-1.0.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.scoped-tls-1.0.1.bazel
index b7ee6285790..6083076913d 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.scoped-tls-1.0.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.scoped-tls-1.0.1.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.scopeguard-1.2.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.scopeguard-1.2.0.bazel
index 268fe36a09b..e9f53614a25 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.scopeguard-1.2.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.scopeguard-1.2.0.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstream-0.6.18.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.seize-0.5.0.bazel
similarity index 84%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstream-0.6.18.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.seize-0.5.0.bazel
index f4323de097a..1a284015551 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstream-0.6.18.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.seize-0.5.0.bazel
@@ -17,7 +17,7 @@ cargo_toml_env_vars(
 )
 
 rust_library(
-    name = "anstream",
+    name = "seize",
     srcs = glob(
         include = ["**/*.rs"],
         allow_empty = True,
@@ -35,9 +35,10 @@ rust_library(
         ],
     ),
     crate_features = [
-        "auto",
         "default",
-        "wincon",
+        "fast-barrier",
+        "libc",
+        "windows-sys",
     ],
     crate_root = "src/lib.rs",
     edition = "2021",
@@ -49,7 +50,7 @@ rust_library(
     ],
     tags = [
         "cargo-bazel",
-        "crate-name=anstream",
+        "crate-name=seize",
         "manual",
         "noclippy",
         "norustfmt",
@@ -75,12 +76,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -93,23 +98,18 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.6.18",
+    version = "0.5.0",
     deps = [
-        "@vendor_ts__anstyle-1.0.10//:anstyle",
-        "@vendor_ts__anstyle-parse-0.2.6//:anstyle_parse",
-        "@vendor_ts__anstyle-query-1.1.2//:anstyle_query",
-        "@vendor_ts__colorchoice-1.0.3//:colorchoice",
-        "@vendor_ts__is_terminal_polyfill-1.70.1//:is_terminal_polyfill",
-        "@vendor_ts__utf8parse-0.2.2//:utf8parse",
+        "@vendor_ts__libc-0.2.175//:libc",
     ] + select({
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
-            "@vendor_ts__anstyle-wincon-3.0.7//:anstyle_wincon",  # aarch64-pc-windows-msvc
+            "@vendor_ts__windows-sys-0.52.0//:windows_sys",  # aarch64-pc-windows-msvc
         ],
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "@vendor_ts__anstyle-wincon-3.0.7//:anstyle_wincon",  # i686-pc-windows-msvc
+            "@vendor_ts__windows-sys-0.52.0//:windows_sys",  # i686-pc-windows-msvc
         ],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
-            "@vendor_ts__anstyle-wincon-3.0.7//:anstyle_wincon",  # x86_64-pc-windows-msvc
+            "@vendor_ts__windows-sys-0.52.0//:windows_sys",  # x86_64-pc-windows-msvc
         ],
         "//conditions:default": [],
     }),
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.semver-1.0.26.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.semver-1.0.26.bazel
index 1b139d7a87e..b50da61882e 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.semver-1.0.26.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.semver-1.0.26.bazel
@@ -79,12 +79,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -100,7 +104,7 @@ rust_library(
     version = "1.0.26",
     deps = [
         "@vendor_ts__semver-1.0.26//:build_script_build",
-        "@vendor_ts__serde-1.0.219//:serde",
+        "@vendor_ts__serde-1.0.228//:serde",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde-1.0.219.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde-1.0.228.bazel
similarity index 90%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde-1.0.219.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde-1.0.228.bazel
index 86cb23175ba..c8b33b40bfe 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde-1.0.219.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde-1.0.228.bazel
@@ -46,9 +46,9 @@ rust_library(
         "std",
     ],
     crate_root = "src/lib.rs",
-    edition = "2018",
+    edition = "2021",
     proc_macro_deps = [
-        "@vendor_ts__serde_derive-1.0.219//:serde_derive",
+        "@vendor_ts__serde_derive-1.0.228//:serde_derive",
     ],
     rustc_env_files = [
         ":cargo_toml_env_vars",
@@ -84,12 +84,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -102,9 +106,10 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "1.0.219",
+    version = "1.0.228",
     deps = [
-        "@vendor_ts__serde-1.0.219//:build_script_build",
+        "@vendor_ts__serde-1.0.228//:build_script_build",
+        "@vendor_ts__serde_core-1.0.228//:serde_core",
     ],
 )
 
@@ -148,7 +153,7 @@ cargo_build_script(
             "WORKSPACE.bazel",
         ],
     ),
-    edition = "2018",
+    edition = "2021",
     pkg_name = "serde",
     rustc_env_files = [
         ":cargo_toml_env_vars",
@@ -163,7 +168,7 @@ cargo_build_script(
         "noclippy",
         "norustfmt",
     ],
-    version = "1.0.219",
+    version = "1.0.228",
     visibility = ["//visibility:private"],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde-untagged-0.1.7.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde-untagged-0.1.8.bazel
similarity index 92%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde-untagged-0.1.7.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde-untagged-0.1.8.bazel
index 8336f37c318..61298a6ffb6 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde-untagged-0.1.7.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde-untagged-0.1.8.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,10 +92,10 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.1.7",
+    version = "0.1.8",
     deps = [
         "@vendor_ts__erased-serde-0.4.6//:erased_serde",
-        "@vendor_ts__serde-1.0.219//:serde",
+        "@vendor_ts__serde-1.0.228//:serde",
         "@vendor_ts__typeid-1.0.3//:typeid",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde-value-0.7.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde-value-0.7.0.bazel
index f6b8e9a212a..4225c41bd21 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde-value-0.7.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde-value-0.7.0.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -91,6 +95,6 @@ rust_library(
     version = "0.7.0",
     deps = [
         "@vendor_ts__ordered-float-2.10.1//:ordered_float",
-        "@vendor_ts__serde-1.0.219//:serde",
+        "@vendor_ts__serde-1.0.228//:serde",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-0.2.99.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_core-1.0.228.bazel
similarity index 89%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-0.2.99.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_core-1.0.228.bazel
index 23de7fd36fc..2052a7e95a1 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-0.2.99.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_core-1.0.228.bazel
@@ -21,7 +21,7 @@ cargo_toml_env_vars(
 )
 
 rust_library(
-    name = "wasm_bindgen",
+    name = "serde_core",
     srcs = glob(
         include = ["**/*.rs"],
         allow_empty = True,
@@ -39,15 +39,12 @@ rust_library(
         ],
     ),
     crate_features = [
-        "default",
-        "spans",
+        "alloc",
+        "result",
         "std",
     ],
     crate_root = "src/lib.rs",
     edition = "2021",
-    proc_macro_deps = [
-        "@vendor_ts__wasm-bindgen-macro-0.2.99//:wasm_bindgen_macro",
-    ],
     rustc_env_files = [
         ":cargo_toml_env_vars",
     ],
@@ -56,7 +53,7 @@ rust_library(
     ],
     tags = [
         "cargo-bazel",
-        "crate-name=wasm-bindgen",
+        "crate-name=serde_core",
         "manual",
         "noclippy",
         "norustfmt",
@@ -82,12 +79,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -100,11 +101,9 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.2.99",
+    version = "1.0.228",
     deps = [
-        "@vendor_ts__cfg-if-1.0.1//:cfg_if",
-        "@vendor_ts__once_cell-1.20.3//:once_cell",
-        "@vendor_ts__wasm-bindgen-0.2.99//:build_script_build",
+        "@vendor_ts__serde_core-1.0.228//:build_script_build",
     ],
 )
 
@@ -128,8 +127,8 @@ cargo_build_script(
         ],
     ),
     crate_features = [
-        "default",
-        "spans",
+        "alloc",
+        "result",
         "std",
     ],
     crate_name = "build_script_build",
@@ -147,7 +146,7 @@ cargo_build_script(
         ],
     ),
     edition = "2021",
-    pkg_name = "wasm-bindgen",
+    pkg_name = "serde_core",
     rustc_env_files = [
         ":cargo_toml_env_vars",
     ],
@@ -156,12 +155,12 @@ cargo_build_script(
     ],
     tags = [
         "cargo-bazel",
-        "crate-name=wasm-bindgen",
+        "crate-name=serde_core",
         "manual",
         "noclippy",
         "norustfmt",
     ],
-    version = "0.2.99",
+    version = "1.0.228",
     visibility = ["//visibility:private"],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_derive-1.0.219.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_derive-1.0.228.bazel
similarity index 89%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_derive-1.0.219.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_derive-1.0.228.bazel
index 36abf3866f9..55489195f29 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_derive-1.0.219.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_derive-1.0.228.bazel
@@ -38,7 +38,7 @@ rust_proc_macro(
         "default",
     ],
     crate_root = "src/lib.rs",
-    edition = "2015",
+    edition = "2021",
     rustc_env_files = [
         ":cargo_toml_env_vars",
     ],
@@ -73,12 +73,16 @@ rust_proc_macro(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -91,10 +95,10 @@ rust_proc_macro(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "1.0.219",
+    version = "1.0.228",
     deps = [
-        "@vendor_ts__proc-macro2-1.0.95//:proc_macro2",
-        "@vendor_ts__quote-1.0.40//:quote",
-        "@vendor_ts__syn-2.0.103//:syn",
+        "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
+        "@vendor_ts__quote-1.0.41//:quote",
+        "@vendor_ts__syn-2.0.106//:syn",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_json-1.0.145.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_json-1.0.145.bazel
new file mode 100644
index 00000000000..c1beaef5896
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_json-1.0.145.bazel
@@ -0,0 +1,346 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load(
+    "@rules_rust//cargo:defs.bzl",
+    "cargo_build_script",
+    "cargo_toml_env_vars",
+)
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "serde_json",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+        "unbounded_depth",
+    ] + select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [
+            "indexmap",  # aarch64-apple-darwin
+            "preserve_order",  # aarch64-apple-darwin
+        ],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
+            "indexmap",  # aarch64-pc-windows-msvc
+            "preserve_order",  # aarch64-pc-windows-msvc
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
+            "indexmap",  # aarch64-unknown-linux-gnu
+            "preserve_order",  # aarch64-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
+            "indexmap",  # aarch64-unknown-linux-gnu, aarch64-unknown-nixos-gnu
+            "preserve_order",  # aarch64-unknown-linux-gnu, aarch64-unknown-nixos-gnu
+        ],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
+            "indexmap",  # arm-unknown-linux-gnueabi
+            "preserve_order",  # arm-unknown-linux-gnueabi
+        ],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
+            "indexmap",  # i686-pc-windows-msvc
+            "preserve_order",  # i686-pc-windows-msvc
+        ],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
+            "indexmap",  # i686-unknown-linux-gnu
+            "preserve_order",  # i686-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
+            "indexmap",  # powerpc-unknown-linux-gnu
+            "preserve_order",  # powerpc-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [
+            "indexmap",  # riscv64gc-unknown-linux-gnu
+            "preserve_order",  # riscv64gc-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
+            "indexmap",  # s390x-unknown-linux-gnu
+            "preserve_order",  # s390x-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [
+            "indexmap",  # x86_64-apple-darwin
+            "preserve_order",  # x86_64-apple-darwin
+        ],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
+            "indexmap",  # x86_64-pc-windows-msvc
+            "preserve_order",  # x86_64-pc-windows-msvc
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
+            "indexmap",  # x86_64-unknown-freebsd
+            "preserve_order",  # x86_64-unknown-freebsd
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
+            "indexmap",  # x86_64-unknown-linux-gnu
+            "preserve_order",  # x86_64-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
+            "indexmap",  # x86_64-unknown-linux-gnu, x86_64-unknown-nixos-gnu
+            "preserve_order",  # x86_64-unknown-linux-gnu, x86_64-unknown-nixos-gnu
+        ],
+        "//conditions:default": [],
+    }),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=serde_json",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.145",
+    deps = [
+        "@vendor_ts__itoa-1.0.15//:itoa",
+        "@vendor_ts__memchr-2.7.5//:memchr",
+        "@vendor_ts__ryu-1.0.20//:ryu",
+        "@vendor_ts__serde_core-1.0.228//:serde_core",
+        "@vendor_ts__serde_json-1.0.145//:build_script_build",
+    ] + select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [
+            "@vendor_ts__indexmap-2.11.4//:indexmap",  # aarch64-apple-darwin
+        ],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
+            "@vendor_ts__indexmap-2.11.4//:indexmap",  # aarch64-pc-windows-msvc
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
+            "@vendor_ts__indexmap-2.11.4//:indexmap",  # aarch64-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
+            "@vendor_ts__indexmap-2.11.4//:indexmap",  # aarch64-unknown-linux-gnu, aarch64-unknown-nixos-gnu
+        ],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
+            "@vendor_ts__indexmap-2.11.4//:indexmap",  # arm-unknown-linux-gnueabi
+        ],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
+            "@vendor_ts__indexmap-2.11.4//:indexmap",  # i686-pc-windows-msvc
+        ],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
+            "@vendor_ts__indexmap-2.11.4//:indexmap",  # i686-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
+            "@vendor_ts__indexmap-2.11.4//:indexmap",  # powerpc-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [
+            "@vendor_ts__indexmap-2.11.4//:indexmap",  # riscv64gc-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
+            "@vendor_ts__indexmap-2.11.4//:indexmap",  # s390x-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [
+            "@vendor_ts__indexmap-2.11.4//:indexmap",  # x86_64-apple-darwin
+        ],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
+            "@vendor_ts__indexmap-2.11.4//:indexmap",  # x86_64-pc-windows-msvc
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
+            "@vendor_ts__indexmap-2.11.4//:indexmap",  # x86_64-unknown-freebsd
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
+            "@vendor_ts__indexmap-2.11.4//:indexmap",  # x86_64-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
+            "@vendor_ts__indexmap-2.11.4//:indexmap",  # x86_64-unknown-linux-gnu, x86_64-unknown-nixos-gnu
+        ],
+        "//conditions:default": [],
+    }),
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "std",
+        "unbounded_depth",
+    ] + select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [
+            "indexmap",  # aarch64-apple-darwin
+            "preserve_order",  # aarch64-apple-darwin
+        ],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
+            "indexmap",  # aarch64-pc-windows-msvc
+            "preserve_order",  # aarch64-pc-windows-msvc
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
+            "indexmap",  # aarch64-unknown-linux-gnu
+            "preserve_order",  # aarch64-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
+            "indexmap",  # aarch64-unknown-linux-gnu, aarch64-unknown-nixos-gnu
+            "preserve_order",  # aarch64-unknown-linux-gnu, aarch64-unknown-nixos-gnu
+        ],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
+            "indexmap",  # arm-unknown-linux-gnueabi
+            "preserve_order",  # arm-unknown-linux-gnueabi
+        ],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
+            "indexmap",  # i686-pc-windows-msvc
+            "preserve_order",  # i686-pc-windows-msvc
+        ],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
+            "indexmap",  # i686-unknown-linux-gnu
+            "preserve_order",  # i686-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
+            "indexmap",  # powerpc-unknown-linux-gnu
+            "preserve_order",  # powerpc-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [
+            "indexmap",  # riscv64gc-unknown-linux-gnu
+            "preserve_order",  # riscv64gc-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
+            "indexmap",  # s390x-unknown-linux-gnu
+            "preserve_order",  # s390x-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [
+            "indexmap",  # x86_64-apple-darwin
+            "preserve_order",  # x86_64-apple-darwin
+        ],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
+            "indexmap",  # x86_64-pc-windows-msvc
+            "preserve_order",  # x86_64-pc-windows-msvc
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
+            "indexmap",  # x86_64-unknown-freebsd
+            "preserve_order",  # x86_64-unknown-freebsd
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
+            "indexmap",  # x86_64-unknown-linux-gnu
+            "preserve_order",  # x86_64-unknown-linux-gnu
+        ],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
+            "indexmap",  # x86_64-unknown-linux-gnu, x86_64-unknown-nixos-gnu
+            "preserve_order",  # x86_64-unknown-linux-gnu, x86_64-unknown-nixos-gnu
+        ],
+        "//conditions:default": [],
+    }),
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    pkg_name = "serde_json",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=serde_json",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "1.0.145",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_spanned-0.6.9.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_spanned-0.6.9.bazel
index ffb3bcf7240..cfd8057e492 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_spanned-0.6.9.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_spanned-0.6.9.bazel
@@ -73,12 +73,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -93,6 +97,6 @@ rust_library(
     }),
     version = "0.6.9",
     deps = [
-        "@vendor_ts__serde-1.0.219//:serde",
+        "@vendor_ts__serde-1.0.228//:serde",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_spanned-1.0.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_spanned-1.0.2.bazel
new file mode 100644
index 00000000000..6e22434699e
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_spanned-1.0.2.bazel
@@ -0,0 +1,104 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "serde_spanned",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "alloc",
+        "serde",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=serde_spanned",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.2",
+    deps = [
+        "@vendor_ts__serde_core-1.0.228//:serde_core",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with-3.14.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with-3.14.1.bazel
new file mode 100644
index 00000000000..b34c3aebce9
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with-3.14.1.bazel
@@ -0,0 +1,109 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "serde_with",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "alloc",
+        "default",
+        "macros",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    proc_macro_deps = [
+        "@vendor_ts__serde_derive-1.0.228//:serde_derive",
+        "@vendor_ts__serde_with_macros-3.14.1//:serde_with_macros",
+    ],
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=serde_with",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "3.14.1",
+    deps = [
+        "@vendor_ts__serde-1.0.228//:serde",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with_macros-3.13.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with_macros-3.14.1.bazel
similarity index 88%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with_macros-3.13.0.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with_macros-3.14.1.bazel
index 38781f47448..adec2841a5f 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with_macros-3.13.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with_macros-3.14.1.bazel
@@ -70,12 +70,16 @@ rust_proc_macro(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,11 +92,11 @@ rust_proc_macro(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "3.13.0",
+    version = "3.14.1",
     deps = [
-        "@vendor_ts__darling-0.20.10//:darling",
-        "@vendor_ts__proc-macro2-1.0.95//:proc_macro2",
-        "@vendor_ts__quote-1.0.40//:quote",
-        "@vendor_ts__syn-2.0.103//:syn",
+        "@vendor_ts__darling-0.21.3//:darling",
+        "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
+        "@vendor_ts__quote-1.0.41//:quote",
+        "@vendor_ts__syn-2.0.106//:syn",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_yaml-0.9.34+deprecated.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_yaml-0.9.34+deprecated.bazel
index efa0d88a1ac..0baae2b420d 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_yaml-0.9.34+deprecated.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_yaml-0.9.34+deprecated.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -90,10 +94,10 @@ rust_library(
     }),
     version = "0.9.34+deprecated",
     deps = [
-        "@vendor_ts__indexmap-2.9.0//:indexmap",
+        "@vendor_ts__indexmap-2.11.4//:indexmap",
         "@vendor_ts__itoa-1.0.15//:itoa",
-        "@vendor_ts__ryu-1.0.19//:ryu",
-        "@vendor_ts__serde-1.0.219//:serde",
+        "@vendor_ts__ryu-1.0.20//:ryu",
+        "@vendor_ts__serde-1.0.228//:serde",
         "@vendor_ts__unsafe-libyaml-0.2.11//:unsafe_libyaml",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.sharded-slab-0.1.7.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.sharded-slab-0.1.7.bazel
index 848d1e2a4e5..d51e394269a 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.sharded-slab-0.1.7.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.sharded-slab-0.1.7.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.shlex-1.3.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.shlex-1.3.0.bazel
index b9f77c42ca3..9c85601923b 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.shlex-1.3.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.shlex-1.3.0.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.smallvec-1.15.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.smallvec-1.15.1.bazel
index baeaf39f21e..ef1a58e47b6 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.smallvec-1.15.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.smallvec-1.15.1.bazel
@@ -75,12 +75,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.smol_str-0.3.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.smol_str-0.3.2.bazel
index 93dd67a02aa..ba66fdd7cff 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.smol_str-0.3.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.smol_str-0.3.2.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.stable_deref_trait-1.2.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.stable_deref_trait-1.2.0.bazel
index 38f9881b0b7..d01e1329328 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.stable_deref_trait-1.2.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.stable_deref_trait-1.2.0.bazel
@@ -73,12 +73,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.streaming-iterator-0.1.9.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.streaming-iterator-0.1.9.bazel
index 595be8e1eaf..70243163889 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.streaming-iterator-0.1.9.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.streaming-iterator-0.1.9.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.strsim-0.11.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.strsim-0.11.1.bazel
index 69afe594ca7..3b807674bb6 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.strsim-0.11.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.strsim-0.11.1.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.syn-2.0.103.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.syn-2.0.106.bazel
similarity index 90%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.syn-2.0.103.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.syn-2.0.106.bazel
index d7247d1235f..b771972149b 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.syn-2.0.103.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.syn-2.0.106.bazel
@@ -83,12 +83,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -101,10 +105,10 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "2.0.103",
+    version = "2.0.106",
     deps = [
-        "@vendor_ts__proc-macro2-1.0.95//:proc_macro2",
-        "@vendor_ts__quote-1.0.40//:quote",
-        "@vendor_ts__unicode-ident-1.0.17//:unicode_ident",
+        "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
+        "@vendor_ts__quote-1.0.41//:quote",
+        "@vendor_ts__unicode-ident-1.0.19//:unicode_ident",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.synstructure-0.13.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.synstructure-0.13.2.bazel
similarity index 90%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.synstructure-0.13.1.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.synstructure-0.13.2.bazel
index 67c55836035..100a3963472 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.synstructure-0.13.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.synstructure-0.13.2.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -92,10 +96,10 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.13.1",
+    version = "0.13.2",
     deps = [
-        "@vendor_ts__proc-macro2-1.0.95//:proc_macro2",
-        "@vendor_ts__quote-1.0.40//:quote",
-        "@vendor_ts__syn-2.0.103//:syn",
+        "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
+        "@vendor_ts__quote-1.0.41//:quote",
+        "@vendor_ts__syn-2.0.106//:syn",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.temp-dir-0.1.16.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.temp-dir-0.1.16.bazel
new file mode 100644
index 00000000000..b8c9c3fa890
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.temp-dir-0.1.16.bazel
@@ -0,0 +1,96 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "temp_dir",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=temp-dir",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.1.16",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.text-size-1.1.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.text-size-1.1.1.bazel
index eb5ded13f06..24c4e086a8e 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.text-size-1.1.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.text-size-1.1.1.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thin-vec-0.2.14.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thin-vec-0.2.14.bazel
index 5cae0f03c35..20749982e65 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thin-vec-0.2.14.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thin-vec-0.2.14.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-1.0.69.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-1.0.69.bazel
deleted file mode 100644
index 00be21d7175..00000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-1.0.69.bazel
+++ /dev/null
@@ -1,160 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "thiserror",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    proc_macro_deps = [
-        "@vendor_ts__thiserror-impl-1.0.69//:thiserror_impl",
-    ],
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=thiserror",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "1.0.69",
-    deps = [
-        "@vendor_ts__thiserror-1.0.69//:build_script_build",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2021",
-    pkg_name = "thiserror",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=thiserror",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "1.0.69",
-    visibility = ["//visibility:private"],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-2.0.12.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-2.0.16.bazel
similarity index 92%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-2.0.12.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-2.0.16.bazel
index 22a50f358c8..d4da859d348 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-2.0.12.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-2.0.16.bazel
@@ -45,7 +45,7 @@ rust_library(
     crate_root = "src/lib.rs",
     edition = "2021",
     proc_macro_deps = [
-        "@vendor_ts__thiserror-impl-2.0.12//:thiserror_impl",
+        "@vendor_ts__thiserror-impl-2.0.16//:thiserror_impl",
     ],
     rustc_env_files = [
         ":cargo_toml_env_vars",
@@ -81,12 +81,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -99,9 +103,9 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "2.0.12",
+    version = "2.0.16",
     deps = [
-        "@vendor_ts__thiserror-2.0.12//:build_script_build",
+        "@vendor_ts__thiserror-2.0.16//:build_script_build",
     ],
 )
 
@@ -157,7 +161,7 @@ cargo_build_script(
         "noclippy",
         "norustfmt",
     ],
-    version = "2.0.12",
+    version = "2.0.16",
     visibility = ["//visibility:private"],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-impl-2.0.12.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-impl-2.0.12.bazel
deleted file mode 100644
index 845df8353bf..00000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-impl-2.0.12.bazel
+++ /dev/null
@@ -1,97 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_proc_macro(
-    name = "thiserror_impl",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=thiserror-impl",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "2.0.12",
-    deps = [
-        "@vendor_ts__proc-macro2-1.0.95//:proc_macro2",
-        "@vendor_ts__quote-1.0.40//:quote",
-        "@vendor_ts__syn-2.0.103//:syn",
-    ],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-impl-1.0.69.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-impl-2.0.16.bazel
similarity index 89%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-impl-1.0.69.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-impl-2.0.16.bazel
index bfe106d46ac..9bce5c77e1d 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-impl-1.0.69.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-impl-2.0.16.bazel
@@ -70,12 +70,16 @@ rust_proc_macro(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,10 +92,10 @@ rust_proc_macro(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "1.0.69",
+    version = "2.0.16",
     deps = [
-        "@vendor_ts__proc-macro2-1.0.95//:proc_macro2",
-        "@vendor_ts__quote-1.0.40//:quote",
-        "@vendor_ts__syn-2.0.103//:syn",
+        "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
+        "@vendor_ts__quote-1.0.41//:quote",
+        "@vendor_ts__syn-2.0.106//:syn",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thread_local-1.1.8.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thread_local-1.1.9.bazel
similarity index 92%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thread_local-1.1.8.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thread_local-1.1.9.bazel
index 0a1b6865944..5fdccb311d1 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thread_local-1.1.8.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thread_local-1.1.9.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,9 +92,8 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "1.1.8",
+    version = "1.1.9",
     deps = [
-        "@vendor_ts__cfg-if-1.0.1//:cfg_if",
-        "@vendor_ts__once_cell-1.20.3//:once_cell",
+        "@vendor_ts__cfg-if-1.0.3//:cfg_if",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-0.3.37.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-0.3.43.bazel
similarity index 90%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-0.3.37.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-0.3.43.bazel
index c7ad459f04c..095ed4f18ce 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-0.3.37.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-0.3.43.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,11 +92,11 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.3.37",
+    version = "0.3.43",
     deps = [
-        "@vendor_ts__deranged-0.3.11//:deranged",
+        "@vendor_ts__deranged-0.5.3//:deranged",
         "@vendor_ts__num-conv-0.1.0//:num_conv",
         "@vendor_ts__powerfmt-0.2.0//:powerfmt",
-        "@vendor_ts__time-core-0.1.2//:time_core",
+        "@vendor_ts__time-core-0.1.6//:time_core",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-core-0.1.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-core-0.1.6.bazel
similarity index 93%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-core-0.1.2.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-core-0.1.6.bazel
index 923ab44f163..c97b1837f2e 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-core-0.1.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-core-0.1.6.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,5 +92,5 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.1.2",
+    version = "0.1.6",
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-macros-0.2.19.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-macros-0.2.24.bazel
similarity index 92%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-macros-0.2.19.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-macros-0.2.24.bazel
index 204fbd140dc..74e05258e0c 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-macros-0.2.19.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-macros-0.2.24.bazel
@@ -70,12 +70,16 @@ rust_proc_macro(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,9 +92,9 @@ rust_proc_macro(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.2.19",
+    version = "0.2.24",
     deps = [
         "@vendor_ts__num-conv-0.1.0//:num_conv",
-        "@vendor_ts__time-core-0.1.2//:time_core",
+        "@vendor_ts__time-core-0.1.6//:time_core",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tinystr-0.8.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tinystr-0.8.1.bazel
index e59752c0787..af42b4cbcb1 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tinystr-0.8.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tinystr-0.8.1.bazel
@@ -77,12 +77,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -97,6 +101,6 @@ rust_library(
     }),
     version = "0.8.1",
     deps = [
-        "@vendor_ts__zerovec-0.11.2//:zerovec",
+        "@vendor_ts__zerovec-0.11.4//:zerovec",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml-0.8.23.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml-0.8.23.bazel
index bca02cb3cec..f772d5dcdc2 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml-0.8.23.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml-0.8.23.bazel
@@ -75,12 +75,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -95,7 +99,7 @@ rust_library(
     }),
     version = "0.8.23",
     deps = [
-        "@vendor_ts__serde-1.0.219//:serde",
+        "@vendor_ts__serde-1.0.228//:serde",
         "@vendor_ts__serde_spanned-0.6.9//:serde_spanned",
         "@vendor_ts__toml_datetime-0.6.11//:toml_datetime",
         "@vendor_ts__toml_edit-0.22.27//:toml_edit",
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml-0.9.7.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml-0.9.7.bazel
new file mode 100644
index 00000000000..73249141b0f
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml-0.9.7.bazel
@@ -0,0 +1,111 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "toml",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "display",
+        "parse",
+        "serde",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=toml",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.9.7",
+    deps = [
+        "@vendor_ts__serde_core-1.0.228//:serde_core",
+        "@vendor_ts__serde_spanned-1.0.2//:serde_spanned",
+        "@vendor_ts__toml_datetime-0.7.2//:toml_datetime",
+        "@vendor_ts__toml_parser-1.0.3//:toml_parser",
+        "@vendor_ts__toml_writer-1.0.3//:toml_writer",
+        "@vendor_ts__winnow-0.7.13//:winnow",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_datetime-0.6.11.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_datetime-0.6.11.bazel
index d0a8d2086cc..2d752cc867d 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_datetime-0.6.11.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_datetime-0.6.11.bazel
@@ -73,12 +73,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -93,6 +97,6 @@ rust_library(
     }),
     version = "0.6.11",
     deps = [
-        "@vendor_ts__serde-1.0.219//:serde",
+        "@vendor_ts__serde-1.0.228//:serde",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_datetime-0.7.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_datetime-0.7.2.bazel
new file mode 100644
index 00000000000..662a538d5b7
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_datetime-0.7.2.bazel
@@ -0,0 +1,104 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "toml_datetime",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "alloc",
+        "serde",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=toml_datetime",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.7.2",
+    deps = [
+        "@vendor_ts__serde_core-1.0.228//:serde_core",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_edit-0.22.27.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_edit-0.22.27.bazel
index be91209ae64..4a3081f858a 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_edit-0.22.27.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_edit-0.22.27.bazel
@@ -75,12 +75,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -95,11 +99,11 @@ rust_library(
     }),
     version = "0.22.27",
     deps = [
-        "@vendor_ts__indexmap-2.9.0//:indexmap",
-        "@vendor_ts__serde-1.0.219//:serde",
+        "@vendor_ts__indexmap-2.11.4//:indexmap",
+        "@vendor_ts__serde-1.0.228//:serde",
         "@vendor_ts__serde_spanned-0.6.9//:serde_spanned",
         "@vendor_ts__toml_datetime-0.6.11//:toml_datetime",
         "@vendor_ts__toml_write-0.1.2//:toml_write",
-        "@vendor_ts__winnow-0.7.11//:winnow",
+        "@vendor_ts__winnow-0.7.13//:winnow",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with-3.13.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_parser-1.0.3.bazel
similarity index 90%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with-3.13.0.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_parser-1.0.3.bazel
index 0c1498841f1..9920a989d97 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with-3.13.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_parser-1.0.3.bazel
@@ -17,7 +17,7 @@ cargo_toml_env_vars(
 )
 
 rust_library(
-    name = "serde_with",
+    name = "toml_parser",
     srcs = glob(
         include = ["**/*.rs"],
         allow_empty = True,
@@ -36,16 +36,10 @@ rust_library(
     ),
     crate_features = [
         "alloc",
-        "default",
-        "macros",
         "std",
     ],
     crate_root = "src/lib.rs",
     edition = "2021",
-    proc_macro_deps = [
-        "@vendor_ts__serde_derive-1.0.219//:serde_derive",
-        "@vendor_ts__serde_with_macros-3.13.0//:serde_with_macros",
-    ],
     rustc_env_files = [
         ":cargo_toml_env_vars",
     ],
@@ -54,7 +48,7 @@ rust_library(
     ],
     tags = [
         "cargo-bazel",
-        "crate-name=serde_with",
+        "crate-name=toml_parser",
         "manual",
         "noclippy",
         "norustfmt",
@@ -80,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -98,8 +96,8 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "3.13.0",
+    version = "1.0.3",
     deps = [
-        "@vendor_ts__serde-1.0.219//:serde",
+        "@vendor_ts__winnow-0.7.13//:winnow",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_write-0.1.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_write-0.1.2.bazel
index d8562021086..b25d3e86f9f 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_write-0.1.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_write-0.1.2.bazel
@@ -75,12 +75,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_writer-1.0.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_writer-1.0.3.bazel
new file mode 100644
index 00000000000..178d3e98f70
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_writer-1.0.3.bazel
@@ -0,0 +1,100 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "toml_writer",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "alloc",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=toml_writer",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.3",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-0.1.41.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-0.1.41.bazel
index 52f1d140719..48d06e879a6 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-0.1.41.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-0.1.41.bazel
@@ -43,7 +43,7 @@ rust_library(
     crate_root = "src/lib.rs",
     edition = "2018",
     proc_macro_deps = [
-        "@vendor_ts__tracing-attributes-0.1.28//:tracing_attributes",
+        "@vendor_ts__tracing-attributes-0.1.30//:tracing_attributes",
     ],
     rustc_env_files = [
         ":cargo_toml_env_vars",
@@ -79,12 +79,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -100,6 +104,6 @@ rust_library(
     version = "0.1.41",
     deps = [
         "@vendor_ts__pin-project-lite-0.2.16//:pin_project_lite",
-        "@vendor_ts__tracing-core-0.1.33//:tracing_core",
+        "@vendor_ts__tracing-core-0.1.34//:tracing_core",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-attributes-0.1.28.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-attributes-0.1.30.bazel
similarity index 89%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-attributes-0.1.28.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-attributes-0.1.30.bazel
index dbe9e94771d..16782034af3 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-attributes-0.1.28.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-attributes-0.1.30.bazel
@@ -70,12 +70,16 @@ rust_proc_macro(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,10 +92,10 @@ rust_proc_macro(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.1.28",
+    version = "0.1.30",
     deps = [
-        "@vendor_ts__proc-macro2-1.0.95//:proc_macro2",
-        "@vendor_ts__quote-1.0.40//:quote",
-        "@vendor_ts__syn-2.0.103//:syn",
+        "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
+        "@vendor_ts__quote-1.0.41//:quote",
+        "@vendor_ts__syn-2.0.106//:syn",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-core-0.1.33.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-core-0.1.34.bazel
similarity index 92%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-core-0.1.33.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-core-0.1.34.bazel
index 1f6fab9f817..e758ef8b8e9 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-core-0.1.33.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-core-0.1.34.bazel
@@ -75,12 +75,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -93,8 +97,8 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.1.33",
+    version = "0.1.34",
     deps = [
-        "@vendor_ts__once_cell-1.20.3//:once_cell",
+        "@vendor_ts__once_cell-1.21.3//:once_cell",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-flame-0.2.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-flame-0.2.0.bazel
index 7bc42503a2b..310b8a8a6d2 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-flame-0.2.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-flame-0.2.0.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -96,6 +100,6 @@ rust_library(
     deps = [
         "@vendor_ts__lazy_static-1.5.0//:lazy_static",
         "@vendor_ts__tracing-0.1.41//:tracing",
-        "@vendor_ts__tracing-subscriber-0.3.19//:tracing_subscriber",
+        "@vendor_ts__tracing-subscriber-0.3.20//:tracing_subscriber",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-log-0.2.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-log-0.2.0.bazel
index 648508de095..292b84993bc 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-log-0.2.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-log-0.2.0.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -94,8 +98,8 @@ rust_library(
     }),
     version = "0.2.0",
     deps = [
-        "@vendor_ts__log-0.4.27//:log",
-        "@vendor_ts__once_cell-1.20.3//:once_cell",
-        "@vendor_ts__tracing-core-0.1.33//:tracing_core",
+        "@vendor_ts__log-0.4.28//:log",
+        "@vendor_ts__once_cell-1.21.3//:once_cell",
+        "@vendor_ts__tracing-core-0.1.34//:tracing_core",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-subscriber-0.3.19.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-subscriber-0.3.20.bazel
similarity index 87%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-subscriber-0.3.19.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-subscriber-0.3.20.bazel
index 5e28965c142..a118ed152c5 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-subscriber-0.3.19.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-subscriber-0.3.20.bazel
@@ -43,7 +43,6 @@ rust_library(
         "matchers",
         "nu-ansi-term",
         "once_cell",
-        "regex",
         "registry",
         "sharded-slab",
         "smallvec",
@@ -88,12 +87,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -106,17 +109,17 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.3.19",
+    version = "0.3.20",
     deps = [
-        "@vendor_ts__matchers-0.1.0//:matchers",
-        "@vendor_ts__nu-ansi-term-0.46.0//:nu_ansi_term",
-        "@vendor_ts__once_cell-1.20.3//:once_cell",
-        "@vendor_ts__regex-1.11.1//:regex",
+        "@vendor_ts__matchers-0.2.0//:matchers",
+        "@vendor_ts__nu-ansi-term-0.50.1//:nu_ansi_term",
+        "@vendor_ts__once_cell-1.21.3//:once_cell",
+        "@vendor_ts__regex-automata-0.4.11//:regex_automata",
         "@vendor_ts__sharded-slab-0.1.7//:sharded_slab",
         "@vendor_ts__smallvec-1.15.1//:smallvec",
-        "@vendor_ts__thread_local-1.1.8//:thread_local",
+        "@vendor_ts__thread_local-1.1.9//:thread_local",
         "@vendor_ts__tracing-0.1.41//:tracing",
-        "@vendor_ts__tracing-core-0.1.33//:tracing_core",
+        "@vendor_ts__tracing-core-0.1.34//:tracing_core",
         "@vendor_ts__tracing-log-0.2.0//:tracing_log",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-0.24.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-0.25.9.bazel
similarity index 89%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-0.24.6.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-0.25.9.bazel
index 1a4d9052b64..aec4b5a2fa4 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-0.24.6.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-0.25.9.bazel
@@ -78,12 +78,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -96,13 +100,13 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.24.6",
+    version = "0.25.9",
     deps = [
-        "@vendor_ts__regex-1.11.1//:regex",
-        "@vendor_ts__regex-syntax-0.8.5//:regex_syntax",
+        "@vendor_ts__regex-1.11.3//:regex",
+        "@vendor_ts__regex-syntax-0.8.6//:regex_syntax",
         "@vendor_ts__streaming-iterator-0.1.9//:streaming_iterator",
-        "@vendor_ts__tree-sitter-0.24.6//:build_script_build",
-        "@vendor_ts__tree-sitter-language-0.1.3//:tree_sitter_language",
+        "@vendor_ts__tree-sitter-0.25.9//:build_script_build",
+        "@vendor_ts__tree-sitter-language-0.1.5//:tree_sitter_language",
     ],
 )
 
@@ -159,10 +163,11 @@ cargo_build_script(
         "noclippy",
         "norustfmt",
     ],
-    version = "0.24.6",
+    version = "0.25.9",
     visibility = ["//visibility:private"],
     deps = [
-        "@vendor_ts__cc-1.2.7//:cc",
+        "@vendor_ts__cc-1.2.37//:cc",
+        "@vendor_ts__serde_json-1.0.145//:serde_json",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-embedded-template-0.23.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-embedded-template-0.25.0.bazel
similarity index 91%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-embedded-template-0.23.2.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-embedded-template-0.25.0.bazel
index b11c5f6a7f7..4d3af159e79 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-embedded-template-0.23.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-embedded-template-0.25.0.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -92,10 +96,10 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.23.2",
+    version = "0.25.0",
     deps = [
-        "@vendor_ts__tree-sitter-embedded-template-0.23.2//:build_script_build",
-        "@vendor_ts__tree-sitter-language-0.1.3//:tree_sitter_language",
+        "@vendor_ts__tree-sitter-embedded-template-0.25.0//:build_script_build",
+        "@vendor_ts__tree-sitter-language-0.1.5//:tree_sitter_language",
     ],
 )
 
@@ -147,10 +151,10 @@ cargo_build_script(
         "noclippy",
         "norustfmt",
     ],
-    version = "0.23.2",
+    version = "0.25.0",
     visibility = ["//visibility:private"],
     deps = [
-        "@vendor_ts__cc-1.2.7//:cc",
+        "@vendor_ts__cc-1.2.37//:cc",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-json-0.24.8.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-json-0.24.8.bazel
index 2de91c5d67e..613b9ec6fd1 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-json-0.24.8.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-json-0.24.8.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -95,7 +99,7 @@ rust_library(
     version = "0.24.8",
     deps = [
         "@vendor_ts__tree-sitter-json-0.24.8//:build_script_build",
-        "@vendor_ts__tree-sitter-language-0.1.3//:tree_sitter_language",
+        "@vendor_ts__tree-sitter-language-0.1.5//:tree_sitter_language",
     ],
 )
 
@@ -150,7 +154,7 @@ cargo_build_script(
     version = "0.24.8",
     visibility = ["//visibility:private"],
     deps = [
-        "@vendor_ts__cc-1.2.7//:cc",
+        "@vendor_ts__cc-1.2.37//:cc",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-language-0.1.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-language-0.1.5.bazel
similarity index 93%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-language-0.1.3.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-language-0.1.5.bazel
index c714fc492e3..956e222a8f0 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-language-0.1.3.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-language-0.1.5.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,5 +92,5 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.1.3",
+    version = "0.1.5",
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-ql-0.23.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-ql-0.23.1.bazel
index 1542f32c361..f1b7c0f0118 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-ql-0.23.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-ql-0.23.1.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -94,7 +98,7 @@ rust_library(
     }),
     version = "0.23.1",
     deps = [
-        "@vendor_ts__tree-sitter-language-0.1.3//:tree_sitter_language",
+        "@vendor_ts__tree-sitter-language-0.1.5//:tree_sitter_language",
         "@vendor_ts__tree-sitter-ql-0.23.1//:build_script_build",
     ],
 )
@@ -150,7 +154,7 @@ cargo_build_script(
     version = "0.23.1",
     visibility = ["//visibility:private"],
     deps = [
-        "@vendor_ts__cc-1.2.7//:cc",
+        "@vendor_ts__cc-1.2.37//:cc",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-ruby-0.23.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-ruby-0.23.1.bazel
index 4e64a93f4ee..443ca47fa2c 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-ruby-0.23.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-ruby-0.23.1.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -94,7 +98,7 @@ rust_library(
     }),
     version = "0.23.1",
     deps = [
-        "@vendor_ts__tree-sitter-language-0.1.3//:tree_sitter_language",
+        "@vendor_ts__tree-sitter-language-0.1.5//:tree_sitter_language",
         "@vendor_ts__tree-sitter-ruby-0.23.1//:build_script_build",
     ],
 )
@@ -150,7 +154,7 @@ cargo_build_script(
     version = "0.23.1",
     visibility = ["//visibility:private"],
     deps = [
-        "@vendor_ts__cc-1.2.7//:cc",
+        "@vendor_ts__cc-1.2.37//:cc",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.triomphe-0.1.14.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.triomphe-0.1.14.bazel
index 1ea48d5a72d..480f760f197 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.triomphe-0.1.14.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.triomphe-0.1.14.bazel
@@ -76,12 +76,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -96,7 +100,7 @@ rust_library(
     }),
     version = "0.1.14",
     deps = [
-        "@vendor_ts__serde-1.0.219//:serde",
+        "@vendor_ts__serde-1.0.228//:serde",
         "@vendor_ts__stable_deref_trait-1.2.0//:stable_deref_trait",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.typed-arena-2.0.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.typed-arena-2.0.2.bazel
index 69e0c45ebd0..f0af1025ad3 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.typed-arena-2.0.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.typed-arena-2.0.2.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.typeid-1.0.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.typeid-1.0.3.bazel
index 10f66174bc2..07d0afb6bd7 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.typeid-1.0.3.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.typeid-1.0.3.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.uncased-0.9.10.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.uncased-0.9.10.bazel
index bcd4e9b5123..3a95385b785 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.uncased-0.9.10.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.uncased-0.9.10.bazel
@@ -78,12 +78,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ungrammar-1.16.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ungrammar-1.16.1.bazel
index 5472fc5dabb..473cc4ece53 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ungrammar-1.16.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ungrammar-1.16.1.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-ident-1.0.17.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-ident-1.0.19.bazel
similarity index 93%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-ident-1.0.17.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-ident-1.0.19.bazel
index 3eb20d4edb0..0879a535547 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-ident-1.0.17.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-ident-1.0.19.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,5 +92,5 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "1.0.17",
+    version = "1.0.19",
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-properties-0.1.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-properties-0.1.3.bazel
index fed0654f1c1..fc560bc6d41 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-properties-0.1.3.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-properties-0.1.3.bazel
@@ -73,12 +73,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-xid-0.2.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-xid-0.2.6.bazel
index 6776feb0210..0d91b8333d9 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-xid-0.2.6.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-xid-0.2.6.bazel
@@ -73,12 +73,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unsafe-libyaml-0.2.11.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unsafe-libyaml-0.2.11.bazel
index 9478c1cfe80..089e3d57c69 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unsafe-libyaml-0.2.11.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unsafe-libyaml-0.2.11.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.url-2.5.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.url-2.5.7.bazel
similarity index 88%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.url-2.5.4.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.url-2.5.7.bazel
index 58f034d5353..7f701fa2f9a 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.url-2.5.4.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.url-2.5.7.bazel
@@ -36,6 +36,7 @@ rust_library(
     ),
     crate_features = [
         "default",
+        "serde",
         "std",
     ],
     crate_root = "src/lib.rs",
@@ -74,12 +75,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -92,10 +97,11 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "2.5.4",
+    version = "2.5.7",
     deps = [
-        "@vendor_ts__form_urlencoded-1.2.1//:form_urlencoded",
-        "@vendor_ts__idna-1.0.3//:idna",
-        "@vendor_ts__percent-encoding-2.3.1//:percent_encoding",
+        "@vendor_ts__form_urlencoded-1.2.2//:form_urlencoded",
+        "@vendor_ts__idna-1.1.0//:idna",
+        "@vendor_ts__percent-encoding-2.3.2//:percent_encoding",
+        "@vendor_ts__serde-1.0.228//:serde",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.utf8_iter-1.0.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.utf8_iter-1.0.4.bazel
index c4b2c4062c1..f933e15e86f 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.utf8_iter-1.0.4.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.utf8_iter-1.0.4.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.utf8parse-0.2.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.utf8parse-0.2.2.bazel
index df14dcb7e1f..436b71c8e8b 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.utf8parse-0.2.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.utf8parse-0.2.2.bazel
@@ -73,12 +73,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.valuable-0.1.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.valuable-0.1.1.bazel
similarity index 92%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.valuable-0.1.0.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.valuable-0.1.1.bazel
index de1698f1576..020a37ab945 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.valuable-0.1.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.valuable-0.1.1.bazel
@@ -39,7 +39,7 @@ rust_library(
         ],
     ),
     crate_root = "src/lib.rs",
-    edition = "2018",
+    edition = "2021",
     rustc_env_files = [
         ":cargo_toml_env_vars",
     ],
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -92,9 +96,9 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.1.0",
+    version = "0.1.1",
     deps = [
-        "@vendor_ts__valuable-0.1.0//:build_script_build",
+        "@vendor_ts__valuable-0.1.1//:build_script_build",
     ],
 )
 
@@ -131,7 +135,7 @@ cargo_build_script(
             "WORKSPACE.bazel",
         ],
     ),
-    edition = "2018",
+    edition = "2021",
     pkg_name = "valuable",
     rustc_env_files = [
         ":cargo_toml_env_vars",
@@ -146,7 +150,7 @@ cargo_build_script(
         "noclippy",
         "norustfmt",
     ],
-    version = "0.1.0",
+    version = "0.1.1",
     visibility = ["//visibility:private"],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.version_check-0.9.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.version_check-0.9.5.bazel
index ce51c79a218..43b406d0976 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.version_check-0.9.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.version_check-0.9.5.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.walkdir-2.5.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.walkdir-2.5.0.bazel
index 3ee13a3e6f7..5ac9c7ffbc7 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.walkdir-2.5.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.walkdir-2.5.0.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -93,13 +97,13 @@ rust_library(
         "@vendor_ts__same-file-1.0.6//:same_file",
     ] + select({
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
-            "@vendor_ts__winapi-util-0.1.9//:winapi_util",  # cfg(windows)
+            "@vendor_ts__winapi-util-0.1.11//:winapi_util",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "@vendor_ts__winapi-util-0.1.9//:winapi_util",  # cfg(windows)
+            "@vendor_ts__winapi-util-0.1.11//:winapi_util",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
-            "@vendor_ts__winapi-util-0.1.9//:winapi_util",  # cfg(windows)
+            "@vendor_ts__winapi-util-0.1.11//:winapi_util",  # cfg(windows)
         ],
         "//conditions:default": [],
     }),
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasi-0.11.0+wasi-snapshot-preview1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasi-0.11.1+wasi-snapshot-preview1.bazel
similarity index 92%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasi-0.11.0+wasi-snapshot-preview1.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasi-0.11.1+wasi-snapshot-preview1.bazel
index 742d16d635a..5e8b84da975 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasi-0.11.0+wasi-snapshot-preview1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasi-0.11.1+wasi-snapshot-preview1.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,5 +92,5 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.11.0+wasi-snapshot-preview1",
+    version = "0.11.1+wasi-snapshot-preview1",
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasi-0.13.3+wasi-0.2.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasi-0.14.5+wasi-0.2.4.bazel
similarity index 91%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasi-0.13.3+wasi-0.2.2.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasi-0.14.5+wasi-0.2.4.bazel
index 0cba8ab2681..0b482a2c9b2 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasi-0.13.3+wasi-0.2.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasi-0.14.5+wasi-0.2.4.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,8 +92,8 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.13.3+wasi-0.2.2",
+    version = "0.14.5+wasi-0.2.4",
     deps = [
-        "@vendor_ts__wit-bindgen-rt-0.33.0//:wit_bindgen_rt",
+        "@vendor_ts__wasip2-1.0.0-wasi-0.2.4//:wasip2",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasip2-1.0.0+wasi-0.2.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasip2-1.0.0+wasi-0.2.4.bazel
new file mode 100644
index 00000000000..113948d4094
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasip2-1.0.0+wasi-0.2.4.bazel
@@ -0,0 +1,99 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "wasip2",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=wasip2",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.0+wasi-0.2.4",
+    deps = [
+        "@vendor_ts__wit-bindgen-0.45.1//:wit_bindgen",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-0.2.101.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-0.2.101.bazel
new file mode 100644
index 00000000000..244a8c5b365
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-0.2.101.bazel
@@ -0,0 +1,183 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load(
+    "@rules_rust//cargo:defs.bzl",
+    "cargo_build_script",
+    "cargo_toml_env_vars",
+)
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "wasm_bindgen",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "msrv",
+        "rustversion",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    proc_macro_deps = [
+        "@vendor_ts__rustversion-1.0.22//:rustversion",
+        "@vendor_ts__wasm-bindgen-macro-0.2.101//:wasm_bindgen_macro",
+    ],
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=wasm-bindgen",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.2.101",
+    deps = [
+        "@vendor_ts__cfg-if-1.0.3//:cfg_if",
+        "@vendor_ts__once_cell-1.21.3//:once_cell",
+        "@vendor_ts__wasm-bindgen-0.2.101//:build_script_build",
+        "@vendor_ts__wasm-bindgen-shared-0.2.101//:wasm_bindgen_shared",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "default",
+        "msrv",
+        "rustversion",
+        "std",
+    ],
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    link_deps = [
+        "@vendor_ts__wasm-bindgen-shared-0.2.101//:wasm_bindgen_shared",
+    ],
+    pkg_name = "wasm-bindgen",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=wasm-bindgen",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.2.101",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-backend-0.2.99.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-backend-0.2.101.bazel
similarity index 86%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-backend-0.2.99.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-backend-0.2.101.bazel
index e536d4346c4..b56eaba879c 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-backend-0.2.99.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-backend-0.2.101.bazel
@@ -34,10 +34,6 @@ rust_library(
             "WORKSPACE.bazel",
         ],
     ),
-    crate_features = [
-        "spans",
-        "std",
-    ],
     crate_root = "src/lib.rs",
     edition = "2021",
     rustc_env_files = [
@@ -74,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -92,13 +92,13 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.2.99",
+    version = "0.2.101",
     deps = [
-        "@vendor_ts__bumpalo-3.16.0//:bumpalo",
-        "@vendor_ts__log-0.4.27//:log",
-        "@vendor_ts__proc-macro2-1.0.95//:proc_macro2",
-        "@vendor_ts__quote-1.0.40//:quote",
-        "@vendor_ts__syn-2.0.103//:syn",
-        "@vendor_ts__wasm-bindgen-shared-0.2.99//:wasm_bindgen_shared",
+        "@vendor_ts__bumpalo-3.19.0//:bumpalo",
+        "@vendor_ts__log-0.4.28//:log",
+        "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
+        "@vendor_ts__quote-1.0.41//:quote",
+        "@vendor_ts__syn-2.0.106//:syn",
+        "@vendor_ts__wasm-bindgen-shared-0.2.101//:wasm_bindgen_shared",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-macro-0.2.99.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-macro-0.2.101.bazel
similarity index 90%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-macro-0.2.99.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-macro-0.2.101.bazel
index 04e2e22268d..5ee795fafbf 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-macro-0.2.99.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-macro-0.2.101.bazel
@@ -34,10 +34,6 @@ rust_proc_macro(
             "WORKSPACE.bazel",
         ],
     ),
-    crate_features = [
-        "spans",
-        "std",
-    ],
     crate_root = "src/lib.rs",
     edition = "2021",
     rustc_env_files = [
@@ -74,12 +70,16 @@ rust_proc_macro(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -92,9 +92,9 @@ rust_proc_macro(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.2.99",
+    version = "0.2.101",
     deps = [
-        "@vendor_ts__quote-1.0.40//:quote",
-        "@vendor_ts__wasm-bindgen-macro-support-0.2.99//:wasm_bindgen_macro_support",
+        "@vendor_ts__quote-1.0.41//:quote",
+        "@vendor_ts__wasm-bindgen-macro-support-0.2.101//:wasm_bindgen_macro_support",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-macro-support-0.2.99.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-macro-support-0.2.101.bazel
similarity index 86%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-macro-support-0.2.99.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-macro-support-0.2.101.bazel
index 0672ed5d897..6930d6021e9 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-macro-support-0.2.99.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-macro-support-0.2.101.bazel
@@ -34,10 +34,6 @@ rust_library(
             "WORKSPACE.bazel",
         ],
     ),
-    crate_features = [
-        "spans",
-        "std",
-    ],
     crate_root = "src/lib.rs",
     edition = "2021",
     rustc_env_files = [
@@ -74,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -92,12 +92,12 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.2.99",
+    version = "0.2.101",
     deps = [
-        "@vendor_ts__proc-macro2-1.0.95//:proc_macro2",
-        "@vendor_ts__quote-1.0.40//:quote",
-        "@vendor_ts__syn-2.0.103//:syn",
-        "@vendor_ts__wasm-bindgen-backend-0.2.99//:wasm_bindgen_backend",
-        "@vendor_ts__wasm-bindgen-shared-0.2.99//:wasm_bindgen_shared",
+        "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
+        "@vendor_ts__quote-1.0.41//:quote",
+        "@vendor_ts__syn-2.0.106//:syn",
+        "@vendor_ts__wasm-bindgen-backend-0.2.101//:wasm_bindgen_backend",
+        "@vendor_ts__wasm-bindgen-shared-0.2.101//:wasm_bindgen_shared",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-shared-0.2.99.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-shared-0.2.101.bazel
similarity index 92%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-shared-0.2.99.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-shared-0.2.101.bazel
index c699dc66494..948ae73962f 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-shared-0.2.99.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-shared-0.2.101.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -92,9 +96,10 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.2.99",
+    version = "0.2.101",
     deps = [
-        "@vendor_ts__wasm-bindgen-shared-0.2.99//:build_script_build",
+        "@vendor_ts__unicode-ident-1.0.19//:unicode_ident",
+        "@vendor_ts__wasm-bindgen-shared-0.2.101//:build_script_build",
     ],
 )
 
@@ -147,7 +152,7 @@ cargo_build_script(
         "noclippy",
         "norustfmt",
     ],
-    version = "0.2.99",
+    version = "0.2.101",
     visibility = ["//visibility:private"],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winapi-0.3.9.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winapi-0.3.9.bazel
deleted file mode 100644
index bdfcc0a9347..00000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winapi-0.3.9.bazel
+++ /dev/null
@@ -1,171 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "winapi",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "consoleapi",
-        "errhandlingapi",
-        "fileapi",
-        "handleapi",
-        "processenv",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2015",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=winapi",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.3.9",
-    deps = [
-        "@vendor_ts__winapi-0.3.9//:build_script_build",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "consoleapi",
-        "errhandlingapi",
-        "fileapi",
-        "handleapi",
-        "processenv",
-    ],
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2015",
-    pkg_name = "winapi",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=winapi",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "0.3.9",
-    visibility = ["//visibility:private"],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winapi-i686-pc-windows-gnu-0.4.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winapi-i686-pc-windows-gnu-0.4.0.bazel
deleted file mode 100644
index 45130211eb6..00000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winapi-i686-pc-windows-gnu-0.4.0.bazel
+++ /dev/null
@@ -1,157 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "winapi_i686_pc_windows_gnu",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2015",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=winapi-i686-pc-windows-gnu",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.4.0",
-    deps = [
-        "@vendor_ts__winapi-i686-pc-windows-gnu-0.4.0//:build_script_build",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2015",
-    pkg_name = "winapi-i686-pc-windows-gnu",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=winapi-i686-pc-windows-gnu",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "0.4.0",
-    visibility = ["//visibility:private"],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winapi-util-0.1.9.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winapi-util-0.1.11.bazel
similarity index 89%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winapi-util-0.1.9.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winapi-util-0.1.11.bazel
index 4699f73a72e..9a98af20dc9 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winapi-util-0.1.9.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winapi-util-0.1.11.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,16 +92,16 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.1.9",
+    version = "0.1.11",
     deps = select({
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
-            "@vendor_ts__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
+            "@vendor_ts__windows-sys-0.61.0//:windows_sys",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "@vendor_ts__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
+            "@vendor_ts__windows-sys-0.61.0//:windows_sys",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
-            "@vendor_ts__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
+            "@vendor_ts__windows-sys-0.61.0//:windows_sys",  # cfg(windows)
         ],
         "//conditions:default": [],
     }),
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winapi-x86_64-pc-windows-gnu-0.4.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winapi-x86_64-pc-windows-gnu-0.4.0.bazel
deleted file mode 100644
index 200e251f5bd..00000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winapi-x86_64-pc-windows-gnu-0.4.0.bazel
+++ /dev/null
@@ -1,157 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "winapi_x86_64_pc_windows_gnu",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2015",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=winapi-x86_64-pc-windows-gnu",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.4.0",
-    deps = [
-        "@vendor_ts__winapi-x86_64-pc-windows-gnu-0.4.0//:build_script_build",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2015",
-    pkg_name = "winapi-x86_64-pc-windows-gnu",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=winapi-x86_64-pc-windows-gnu",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "0.4.0",
-    visibility = ["//visibility:private"],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-core-0.52.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-core-0.61.2.bazel
similarity index 85%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-core-0.52.0.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-core-0.61.2.bazel
index e99bf40969f..24e0b959158 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-core-0.52.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-core-0.61.2.bazel
@@ -36,6 +36,10 @@ rust_library(
     ),
     crate_root = "src/lib.rs",
     edition = "2021",
+    proc_macro_deps = [
+        "@vendor_ts__windows-implement-0.60.0//:windows_implement",
+        "@vendor_ts__windows-interface-0.59.1//:windows_interface",
+    ],
     rustc_env_files = [
         ":cargo_toml_env_vars",
     ],
@@ -70,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,8 +96,10 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.52.0",
+    version = "0.61.2",
     deps = [
-        "@vendor_ts__windows-targets-0.52.6//:windows_targets",
+        "@vendor_ts__windows-link-0.1.3//:windows_link",
+        "@vendor_ts__windows-result-0.3.4//:windows_result",
+        "@vendor_ts__windows-strings-0.4.2//:windows_strings",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-implement-0.60.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-implement-0.60.0.bazel
new file mode 100644
index 00000000000..d48b53ff142
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-implement-0.60.0.bazel
@@ -0,0 +1,101 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_proc_macro(
+    name = "windows_implement",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows-implement",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.60.0",
+    deps = [
+        "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
+        "@vendor_ts__quote-1.0.41//:quote",
+        "@vendor_ts__syn-2.0.106//:syn",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-interface-0.59.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-interface-0.59.1.bazel
new file mode 100644
index 00000000000..49937afe581
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-interface-0.59.1.bazel
@@ -0,0 +1,101 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_proc_macro(
+    name = "windows_interface",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows-interface",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.59.1",
+    deps = [
+        "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
+        "@vendor_ts__quote-1.0.41//:quote",
+        "@vendor_ts__syn-2.0.106//:syn",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-link-0.1.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-link-0.1.3.bazel
similarity index 93%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-link-0.1.1.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-link-0.1.3.bazel
index 94fa81560ff..977e17dfc3b 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-link-0.1.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-link-0.1.3.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,5 +92,5 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.1.1",
+    version = "0.1.3",
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-link-0.2.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-link-0.2.0.bazel
new file mode 100644
index 00000000000..f50b21712e5
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-link-0.2.0.bazel
@@ -0,0 +1,96 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "windows_link",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows-link",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.2.0",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-result-0.3.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-result-0.3.4.bazel
new file mode 100644
index 00000000000..e5cec242987
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-result-0.3.4.bazel
@@ -0,0 +1,99 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "windows_result",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows-result",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.3.4",
+    deps = [
+        "@vendor_ts__windows-link-0.1.3//:windows_link",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-strings-0.4.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-strings-0.4.2.bazel
new file mode 100644
index 00000000000..412effdf6db
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-strings-0.4.2.bazel
@@ -0,0 +1,99 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "windows_strings",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=windows-strings",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.4.2",
+    deps = [
+        "@vendor_ts__windows-link-0.1.3//:windows_link",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.52.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.52.0.bazel
index 0bf14cb113f..7e31f8f0880 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.52.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.52.0.bazel
@@ -34,6 +34,17 @@ rust_library(
             "WORKSPACE.bazel",
         ],
     ),
+    crate_features = [
+        "Win32",
+        "Win32_Foundation",
+        "Win32_Security",
+        "Win32_Storage",
+        "Win32_Storage_FileSystem",
+        "Win32_System",
+        "Win32_System_Console",
+        "Win32_System_Threading",
+        "default",
+    ],
     crate_root = "src/lib.rs",
     edition = "2021",
     rustc_env_files = [
@@ -70,12 +81,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.59.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.59.0.bazel
index 3c282e594c9..f744a0937da 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.59.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.59.0.bazel
@@ -37,16 +37,8 @@ rust_library(
     crate_features = [
         "Win32",
         "Win32_Foundation",
-        "Win32_Security",
-        "Win32_Storage",
-        "Win32_Storage_FileSystem",
         "Win32_System",
         "Win32_System_Com",
-        "Win32_System_Console",
-        "Win32_System_IO",
-        "Win32_System_SystemInformation",
-        "Win32_System_Threading",
-        "Win32_System_WindowsProgramming",
         "Win32_UI",
         "Win32_UI_Shell",
         "default",
@@ -87,12 +79,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.60.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.60.2.bazel
index 02aff274771..1d83a074bfd 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.60.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.60.2.bazel
@@ -37,9 +37,15 @@ rust_library(
     crate_features = [
         "Win32",
         "Win32_Foundation",
+        "Win32_Security",
+        "Win32_Storage",
+        "Win32_Storage_FileSystem",
         "Win32_System",
+        "Win32_System_Console",
+        "Win32_System_IO",
         "Win32_System_ProcessStatus",
         "Win32_System_Threading",
+        "Win32_System_WindowsProgramming",
         "default",
     ],
     crate_root = "src/lib.rs",
@@ -78,12 +84,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -98,6 +108,6 @@ rust_library(
     }),
     version = "0.60.2",
     deps = [
-        "@vendor_ts__windows-targets-0.53.2//:windows_targets",
+        "@vendor_ts__windows-targets-0.53.3//:windows_targets",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.48.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.61.0.bazel
similarity index 90%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.48.0.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.61.0.bazel
index 5517c53feda..ba1daef32f2 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.48.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.61.0.bazel
@@ -43,13 +43,15 @@ rust_library(
         "Win32_Storage",
         "Win32_Storage_FileSystem",
         "Win32_System",
+        "Win32_System_Console",
         "Win32_System_IO",
         "Win32_System_Pipes",
+        "Win32_System_SystemInformation",
         "Win32_System_Threading",
         "default",
     ],
     crate_root = "src/lib.rs",
-    edition = "2018",
+    edition = "2021",
     rustc_env_files = [
         ":cargo_toml_env_vars",
     ],
@@ -84,12 +86,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -102,8 +108,8 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.48.0",
+    version = "0.61.0",
     deps = [
-        "@vendor_ts__windows-targets-0.48.5//:windows_targets",
+        "@vendor_ts__windows-link-0.2.0//:windows_link",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-targets-0.48.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-targets-0.48.5.bazel
deleted file mode 100644
index ebe18b13d6e..00000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-targets-0.48.5.bazel
+++ /dev/null
@@ -1,113 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "windows_targets",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows-targets",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.48.5",
-    deps = select({
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
-            "@vendor_ts__windows_aarch64_msvc-0.48.5//:windows_aarch64_msvc",  # cfg(all(target_arch = "aarch64", target_env = "msvc", not(windows_raw_dylib)))
-        ],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "@vendor_ts__windows_i686_msvc-0.48.5//:windows_i686_msvc",  # cfg(all(target_arch = "x86", target_env = "msvc", not(windows_raw_dylib)))
-        ],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
-            "@vendor_ts__windows_i686_gnu-0.48.5//:windows_i686_gnu",  # cfg(all(target_arch = "x86", target_env = "gnu", not(windows_raw_dylib)))
-        ],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
-            "@vendor_ts__windows_x86_64_msvc-0.48.5//:windows_x86_64_msvc",  # cfg(all(target_arch = "x86_64", target_env = "msvc", not(windows_raw_dylib)))
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
-            "@vendor_ts__windows_x86_64_gnu-0.48.5//:windows_x86_64_gnu",  # cfg(all(target_arch = "x86_64", target_env = "gnu", not(target_abi = "llvm"), not(windows_raw_dylib)))
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
-            "@vendor_ts__windows_x86_64_gnu-0.48.5//:windows_x86_64_gnu",  # cfg(all(target_arch = "x86_64", target_env = "gnu", not(target_abi = "llvm"), not(windows_raw_dylib)))
-        ],
-        "//conditions:default": [],
-    }),
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-targets-0.52.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-targets-0.52.6.bazel
index ebc4d23015e..cd7e40af7c3 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-targets-0.52.6.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-targets-0.52.6.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-targets-0.53.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-targets-0.53.3.bazel
similarity index 94%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-targets-0.53.2.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-targets-0.53.3.bazel
index 6f9255ba423..d719429a8dc 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-targets-0.53.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-targets-0.53.3.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,7 +92,7 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.53.2",
+    version = "0.53.3",
     deps = select({
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
             "@vendor_ts__windows_aarch64_msvc-0.53.0//:windows_aarch64_msvc",  # cfg(all(target_arch = "aarch64", target_env = "msvc", not(windows_raw_dylib)))
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_gnullvm-0.48.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_gnullvm-0.48.5.bazel
deleted file mode 100644
index 76ee4c4ac63..00000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_gnullvm-0.48.5.bazel
+++ /dev/null
@@ -1,157 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "windows_aarch64_gnullvm",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows_aarch64_gnullvm",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.48.5",
-    deps = [
-        "@vendor_ts__windows_aarch64_gnullvm-0.48.5//:build_script_build",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2018",
-    pkg_name = "windows_aarch64_gnullvm",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows_aarch64_gnullvm",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "0.48.5",
-    visibility = ["//visibility:private"],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_gnullvm-0.52.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_gnullvm-0.52.6.bazel
index d9528c09f76..ef1741d80d4 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_gnullvm-0.52.6.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_gnullvm-0.52.6.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_gnullvm-0.53.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_gnullvm-0.53.0.bazel
index 6d4e29a973d..602461b5c35 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_gnullvm-0.53.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_gnullvm-0.53.0.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_msvc-0.48.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_msvc-0.48.5.bazel
deleted file mode 100644
index 5d16d71c77e..00000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_msvc-0.48.5.bazel
+++ /dev/null
@@ -1,157 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "windows_aarch64_msvc",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows_aarch64_msvc",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.48.5",
-    deps = [
-        "@vendor_ts__windows_aarch64_msvc-0.48.5//:build_script_build",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2018",
-    pkg_name = "windows_aarch64_msvc",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows_aarch64_msvc",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "0.48.5",
-    visibility = ["//visibility:private"],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_msvc-0.52.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_msvc-0.52.6.bazel
index 81ac3184619..f9a5577d654 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_msvc-0.52.6.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_msvc-0.52.6.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_msvc-0.53.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_msvc-0.53.0.bazel
index 7f892eceb07..e69571a86c9 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_msvc-0.53.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_msvc-0.53.0.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnu-0.48.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnu-0.48.5.bazel
deleted file mode 100644
index 4e9c211e2f8..00000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnu-0.48.5.bazel
+++ /dev/null
@@ -1,157 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "windows_i686_gnu",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows_i686_gnu",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.48.5",
-    deps = [
-        "@vendor_ts__windows_i686_gnu-0.48.5//:build_script_build",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2018",
-    pkg_name = "windows_i686_gnu",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows_i686_gnu",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "0.48.5",
-    visibility = ["//visibility:private"],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnu-0.52.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnu-0.52.6.bazel
index 8946e3dae8c..a1a0cbcda3a 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnu-0.52.6.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnu-0.52.6.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnu-0.53.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnu-0.53.0.bazel
index 5421c3221b0..ae4bfaa33b3 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnu-0.53.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnu-0.53.0.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnullvm-0.52.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnullvm-0.52.6.bazel
index 7c6704de130..0188a24e021 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnullvm-0.52.6.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnullvm-0.52.6.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnullvm-0.53.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnullvm-0.53.0.bazel
index ec895ba6728..27afbde319d 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnullvm-0.53.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnullvm-0.53.0.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_msvc-0.48.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_msvc-0.48.5.bazel
deleted file mode 100644
index 8057157574e..00000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_msvc-0.48.5.bazel
+++ /dev/null
@@ -1,157 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "windows_i686_msvc",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows_i686_msvc",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.48.5",
-    deps = [
-        "@vendor_ts__windows_i686_msvc-0.48.5//:build_script_build",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2018",
-    pkg_name = "windows_i686_msvc",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows_i686_msvc",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "0.48.5",
-    visibility = ["//visibility:private"],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_msvc-0.52.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_msvc-0.52.6.bazel
index 714cbd2a786..06d2929a45f 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_msvc-0.52.6.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_msvc-0.52.6.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_msvc-0.53.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_msvc-0.53.0.bazel
index 442a155b5ef..7772ad2658c 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_msvc-0.53.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_msvc-0.53.0.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnu-0.48.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnu-0.48.5.bazel
deleted file mode 100644
index 79ebf6c9ad7..00000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnu-0.48.5.bazel
+++ /dev/null
@@ -1,157 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "windows_x86_64_gnu",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows_x86_64_gnu",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.48.5",
-    deps = [
-        "@vendor_ts__windows_x86_64_gnu-0.48.5//:build_script_build",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2018",
-    pkg_name = "windows_x86_64_gnu",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows_x86_64_gnu",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "0.48.5",
-    visibility = ["//visibility:private"],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnu-0.52.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnu-0.52.6.bazel
index 627d5812cfd..9520c81c38e 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnu-0.52.6.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnu-0.52.6.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnu-0.53.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnu-0.53.0.bazel
index 5ed7b8685f4..8c35bce1d55 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnu-0.53.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnu-0.53.0.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnullvm-0.48.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnullvm-0.48.5.bazel
deleted file mode 100644
index 4a8f3a92123..00000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnullvm-0.48.5.bazel
+++ /dev/null
@@ -1,157 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "windows_x86_64_gnullvm",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows_x86_64_gnullvm",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.48.5",
-    deps = [
-        "@vendor_ts__windows_x86_64_gnullvm-0.48.5//:build_script_build",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2018",
-    pkg_name = "windows_x86_64_gnullvm",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows_x86_64_gnullvm",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "0.48.5",
-    visibility = ["//visibility:private"],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnullvm-0.52.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnullvm-0.52.6.bazel
index a7d85c18b4e..b73914ecb7c 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnullvm-0.52.6.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnullvm-0.52.6.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnullvm-0.53.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnullvm-0.53.0.bazel
index 01065e2d820..6d9af145384 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnullvm-0.53.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnullvm-0.53.0.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_msvc-0.48.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_msvc-0.48.5.bazel
deleted file mode 100644
index 47c0fc5917b..00000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_msvc-0.48.5.bazel
+++ /dev/null
@@ -1,157 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "windows_x86_64_msvc",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows_x86_64_msvc",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.48.5",
-    deps = [
-        "@vendor_ts__windows_x86_64_msvc-0.48.5//:build_script_build",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2018",
-    pkg_name = "windows_x86_64_msvc",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=windows_x86_64_msvc",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "0.48.5",
-    visibility = ["//visibility:private"],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_msvc-0.52.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_msvc-0.52.6.bazel
index 6b5b8ea9385..6cfc3a6ef6f 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_msvc-0.52.6.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_msvc-0.52.6.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_msvc-0.53.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_msvc-0.53.0.bazel
index 8dac1ae2733..6886d7c018a 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_msvc-0.53.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_msvc-0.53.0.bazel
@@ -74,12 +74,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winnow-0.7.11.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winnow-0.7.13.bazel
similarity index 93%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winnow-0.7.11.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winnow-0.7.13.bazel
index ad39ba9d121..3d741c7c121 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winnow-0.7.11.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winnow-0.7.13.bazel
@@ -75,12 +75,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -93,5 +97,5 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.7.11",
+    version = "0.7.13",
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wit-bindgen-0.45.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wit-bindgen-0.45.1.bazel
new file mode 100644
index 00000000000..b1993606fb8
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wit-bindgen-0.45.1.bazel
@@ -0,0 +1,161 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load(
+    "@rules_rust//cargo:defs.bzl",
+    "cargo_build_script",
+    "cargo_toml_env_vars",
+)
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "wit_bindgen",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=wit-bindgen",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.45.1",
+    deps = [
+        "@vendor_ts__wit-bindgen-0.45.1//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    pkg_name = "wit-bindgen",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=wit-bindgen",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.45.1",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wit-bindgen-rt-0.33.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wit-bindgen-rt-0.33.0.bazel
deleted file mode 100644
index 038c60a2dc8..00000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wit-bindgen-rt-0.33.0.bazel
+++ /dev/null
@@ -1,157 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
-###############################################################################
-
-load(
-    "@rules_rust//cargo:defs.bzl",
-    "cargo_build_script",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "wit_bindgen_rt",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=wit-bindgen-rt",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    target_compatible_with = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
-        "@rules_rust//rust/platform:aarch64-linux-android": [],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
-        "@rules_rust//rust/platform:aarch64-unknown-uefi": [],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
-        "@rules_rust//rust/platform:i686-apple-darwin": [],
-        "@rules_rust//rust/platform:i686-linux-android": [],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
-        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
-        "@rules_rust//rust/platform:wasm32-wasip1": [],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [],
-        "@rules_rust//rust/platform:x86_64-linux-android": [],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
-        "@rules_rust//rust/platform:x86_64-unknown-none": [],
-        "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
-    version = "0.33.0",
-    deps = [
-        "@vendor_ts__wit-bindgen-rt-0.33.0//:build_script_build",
-    ],
-)
-
-cargo_build_script(
-    name = "_bs",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            "**/*.rs",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_name = "build_script_build",
-    crate_root = "build.rs",
-    data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    edition = "2021",
-    pkg_name = "wit-bindgen-rt",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=wit-bindgen-rt",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "0.33.0",
-    visibility = ["//visibility:private"],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.writeable-0.6.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.writeable-0.6.1.bazel
index 4fcd2d17feb..91386e84b83 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.writeable-0.6.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.writeable-0.6.1.bazel
@@ -70,12 +70,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.yansi-1.0.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.yansi-1.0.1.bazel
index bd4b2f2df67..33212c84bf0 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.yansi-1.0.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.yansi-1.0.1.bazel
@@ -75,12 +75,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.yoke-0.8.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.yoke-0.8.0.bazel
index 94aab2f51b5..5a2396ce8c2 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.yoke-0.8.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.yoke-0.8.0.bazel
@@ -78,12 +78,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.yoke-derive-0.8.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.yoke-derive-0.8.0.bazel
index 57b624f83cf..b1f81925305 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.yoke-derive-0.8.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.yoke-derive-0.8.0.bazel
@@ -70,12 +70,16 @@ rust_proc_macro(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -90,9 +94,9 @@ rust_proc_macro(
     }),
     version = "0.8.0",
     deps = [
-        "@vendor_ts__proc-macro2-1.0.95//:proc_macro2",
-        "@vendor_ts__quote-1.0.40//:quote",
-        "@vendor_ts__syn-2.0.103//:syn",
-        "@vendor_ts__synstructure-0.13.1//:synstructure",
+        "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
+        "@vendor_ts__quote-1.0.41//:quote",
+        "@vendor_ts__syn-2.0.106//:syn",
+        "@vendor_ts__synstructure-0.13.2//:synstructure",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-0.8.20.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-0.8.27.bazel
similarity index 91%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-0.8.20.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-0.8.27.bazel
index 4783c0054a2..9e99c8ff5ca 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-0.8.20.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-0.8.27.bazel
@@ -38,6 +38,9 @@ rust_library(
             "WORKSPACE.bazel",
         ],
     ),
+    crate_features = [
+        "simd",
+    ],
     crate_root = "src/lib.rs",
     edition = "2021",
     rustc_env_files = [
@@ -74,12 +77,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -92,9 +99,9 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.8.20",
+    version = "0.8.27",
     deps = [
-        "@vendor_ts__zerocopy-0.8.20//:build_script_build",
+        "@vendor_ts__zerocopy-0.8.27//:build_script_build",
     ],
 )
 
@@ -117,6 +124,9 @@ cargo_build_script(
             "WORKSPACE.bazel",
         ],
     ),
+    crate_features = [
+        "simd",
+    ],
     crate_name = "build_script_build",
     crate_root = "build.rs",
     data = glob(
@@ -146,7 +156,7 @@ cargo_build_script(
         "noclippy",
         "norustfmt",
     ],
-    version = "0.8.20",
+    version = "0.8.27",
     visibility = ["//visibility:private"],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-derive-0.8.20.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-derive-0.8.27.bazel
similarity index 89%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-derive-0.8.20.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-derive-0.8.27.bazel
index 5a397a7ec31..0b0f63f88cc 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-derive-0.8.20.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-derive-0.8.27.bazel
@@ -70,12 +70,16 @@ rust_proc_macro(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -88,10 +92,10 @@ rust_proc_macro(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.8.20",
+    version = "0.8.27",
     deps = [
-        "@vendor_ts__proc-macro2-1.0.95//:proc_macro2",
-        "@vendor_ts__quote-1.0.40//:quote",
-        "@vendor_ts__syn-2.0.103//:syn",
+        "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
+        "@vendor_ts__quote-1.0.41//:quote",
+        "@vendor_ts__syn-2.0.106//:syn",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerofrom-0.1.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerofrom-0.1.6.bazel
index ff66227ba59..35d1978548b 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerofrom-0.1.6.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerofrom-0.1.6.bazel
@@ -77,12 +77,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerofrom-derive-0.1.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerofrom-derive-0.1.6.bazel
index 8ca846a0bf6..6e1f2b13254 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerofrom-derive-0.1.6.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerofrom-derive-0.1.6.bazel
@@ -70,12 +70,16 @@ rust_proc_macro(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -90,9 +94,9 @@ rust_proc_macro(
     }),
     version = "0.1.6",
     deps = [
-        "@vendor_ts__proc-macro2-1.0.95//:proc_macro2",
-        "@vendor_ts__quote-1.0.40//:quote",
-        "@vendor_ts__syn-2.0.103//:syn",
-        "@vendor_ts__synstructure-0.13.1//:synstructure",
+        "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
+        "@vendor_ts__quote-1.0.41//:quote",
+        "@vendor_ts__syn-2.0.106//:syn",
+        "@vendor_ts__synstructure-0.13.2//:synstructure",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerotrie-0.2.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerotrie-0.2.2.bazel
index 68bcc2fdf62..94342aec8e3 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerotrie-0.2.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerotrie-0.2.2.bazel
@@ -77,12 +77,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerovec-0.11.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerovec-0.11.4.bazel
similarity index 93%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerovec-0.11.2.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerovec-0.11.4.bazel
index 5a3209f87c0..931a800f5d0 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerovec-0.11.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerovec-0.11.4.bazel
@@ -78,12 +78,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -96,7 +100,7 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.11.2",
+    version = "0.11.4",
     deps = [
         "@vendor_ts__yoke-0.8.0//:yoke",
         "@vendor_ts__zerofrom-0.1.6//:zerofrom",
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerovec-derive-0.11.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerovec-derive-0.11.1.bazel
index 1f22bb4dc29..820d85f680f 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerovec-derive-0.11.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerovec-derive-0.11.1.bazel
@@ -70,12 +70,16 @@ rust_proc_macro(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -90,8 +94,8 @@ rust_proc_macro(
     }),
     version = "0.11.1",
     deps = [
-        "@vendor_ts__proc-macro2-1.0.95//:proc_macro2",
-        "@vendor_ts__quote-1.0.40//:quote",
-        "@vendor_ts__syn-2.0.103//:syn",
+        "@vendor_ts__proc-macro2-1.0.101//:proc_macro2",
+        "@vendor_ts__quote-1.0.41//:quote",
+        "@vendor_ts__syn-2.0.106//:syn",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zstd-0.13.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zstd-0.13.3.bazel
index 587eab5d90b..2cb5eb09652 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zstd-0.13.3.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zstd-0.13.3.bazel
@@ -76,12 +76,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zstd-safe-7.2.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zstd-safe-7.2.4.bazel
index 449d88c74f2..f51a0c3a30e 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zstd-safe-7.2.4.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zstd-safe-7.2.4.bazel
@@ -80,12 +80,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -101,7 +105,7 @@ rust_library(
     version = "7.2.4",
     deps = [
         "@vendor_ts__zstd-safe-7.2.4//:build_script_build",
-        "@vendor_ts__zstd-sys-2.0.15-zstd.1.5.7//:zstd_sys",
+        "@vendor_ts__zstd-sys-2.0.16-zstd.1.5.7//:zstd_sys",
     ],
 )
 
@@ -146,7 +150,7 @@ cargo_build_script(
     ),
     edition = "2018",
     link_deps = [
-        "@vendor_ts__zstd-sys-2.0.15-zstd.1.5.7//:zstd_sys",
+        "@vendor_ts__zstd-sys-2.0.16-zstd.1.5.7//:zstd_sys",
     ],
     pkg_name = "zstd-safe",
     rustc_env_files = [
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zstd-sys-2.0.15+zstd.1.5.7.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zstd-sys-2.0.16+zstd.1.5.7.bazel
similarity index 92%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zstd-sys-2.0.15+zstd.1.5.7.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zstd-sys-2.0.16+zstd.1.5.7.bazel
index 1d01652f12f..060e52d4a08 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zstd-sys-2.0.15+zstd.1.5.7.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zstd-sys-2.0.16+zstd.1.5.7.bazel
@@ -79,12 +79,16 @@ rust_library(
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
         "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:wasm32-wasip1-threads": [],
+        "@rules_rust//rust/platform:wasm32-wasip2": [],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [],
         "@rules_rust//rust/platform:x86_64-apple-ios": [],
         "@rules_rust//rust/platform:x86_64-linux-android": [],
@@ -97,9 +101,9 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "2.0.15+zstd.1.5.7",
+    version = "2.0.16+zstd.1.5.7",
     deps = [
-        "@vendor_ts__zstd-sys-2.0.15-zstd.1.5.7//:build_script_build",
+        "@vendor_ts__zstd-sys-2.0.16-zstd.1.5.7//:build_script_build",
     ],
 )
 
@@ -157,10 +161,10 @@ cargo_build_script(
         "noclippy",
         "norustfmt",
     ],
-    version = "2.0.15+zstd.1.5.7",
+    version = "2.0.16+zstd.1.5.7",
     visibility = ["//visibility:private"],
     deps = [
-        "@vendor_ts__cc-1.2.7//:cc",
+        "@vendor_ts__cc-1.2.37//:cc",
         "@vendor_ts__pkg-config-0.3.32//:pkg_config",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/defs.bzl b/misc/bazel/3rdparty/tree_sitter_extractors_deps/defs.bzl
index 7f5a2035841..a56d266ab74 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/defs.bzl
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/defs.bzl
@@ -295,29 +295,29 @@ def aliases(
 _NORMAL_DEPENDENCIES = {
     "ruby/extractor": {
         _COMMON_CONDITION: {
-            "clap": Label("@vendor_ts__clap-4.5.40//:clap"),
+            "clap": Label("@vendor_ts__clap-4.5.48//:clap"),
             "encoding": Label("@vendor_ts__encoding-0.2.33//:encoding"),
             "lazy_static": Label("@vendor_ts__lazy_static-1.5.0//:lazy_static"),
-            "rayon": Label("@vendor_ts__rayon-1.10.0//:rayon"),
-            "regex": Label("@vendor_ts__regex-1.11.1//:regex"),
-            "serde_json": Label("@vendor_ts__serde_json-1.0.140//:serde_json"),
+            "rayon": Label("@vendor_ts__rayon-1.11.0//:rayon"),
+            "regex": Label("@vendor_ts__regex-1.11.3//:regex"),
+            "serde_json": Label("@vendor_ts__serde_json-1.0.145//:serde_json"),
             "tracing": Label("@vendor_ts__tracing-0.1.41//:tracing"),
-            "tracing-subscriber": Label("@vendor_ts__tracing-subscriber-0.3.19//:tracing_subscriber"),
-            "tree-sitter": Label("@vendor_ts__tree-sitter-0.24.6//:tree_sitter"),
-            "tree-sitter-embedded-template": Label("@vendor_ts__tree-sitter-embedded-template-0.23.2//:tree_sitter_embedded_template"),
+            "tracing-subscriber": Label("@vendor_ts__tracing-subscriber-0.3.20//:tracing_subscriber"),
+            "tree-sitter": Label("@vendor_ts__tree-sitter-0.25.9//:tree_sitter"),
+            "tree-sitter-embedded-template": Label("@vendor_ts__tree-sitter-embedded-template-0.25.0//:tree_sitter_embedded_template"),
             "tree-sitter-ruby": Label("@vendor_ts__tree-sitter-ruby-0.23.1//:tree_sitter_ruby"),
         },
     },
     "rust/ast-generator": {
         _COMMON_CONDITION: {
-            "anyhow": Label("@vendor_ts__anyhow-1.0.98//:anyhow"),
+            "anyhow": Label("@vendor_ts__anyhow-1.0.100//:anyhow"),
             "either": Label("@vendor_ts__either-1.15.0//:either"),
             "itertools": Label("@vendor_ts__itertools-0.14.0//:itertools"),
             "mustache": Label("@vendor_ts__mustache-0.9.0//:mustache"),
-            "proc-macro2": Label("@vendor_ts__proc-macro2-1.0.95//:proc_macro2"),
-            "quote": Label("@vendor_ts__quote-1.0.40//:quote"),
-            "serde": Label("@vendor_ts__serde-1.0.219//:serde"),
-            "stdx": Label("@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx"),
+            "proc-macro2": Label("@vendor_ts__proc-macro2-1.0.101//:proc_macro2"),
+            "quote": Label("@vendor_ts__quote-1.0.41//:quote"),
+            "serde": Label("@vendor_ts__serde-1.0.228//:serde"),
+            "stdx": Label("@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx"),
             "ungrammar": Label("@vendor_ts__ungrammar-1.16.1//:ungrammar"),
         },
     },
@@ -325,63 +325,63 @@ _NORMAL_DEPENDENCIES = {
     },
     "rust/extractor": {
         _COMMON_CONDITION: {
-            "anyhow": Label("@vendor_ts__anyhow-1.0.98//:anyhow"),
+            "anyhow": Label("@vendor_ts__anyhow-1.0.100//:anyhow"),
             "argfile": Label("@vendor_ts__argfile-0.2.1//:argfile"),
-            "chalk-ir": Label("@vendor_ts__chalk-ir-0.103.0//:chalk_ir"),
-            "chrono": Label("@vendor_ts__chrono-0.4.41//:chrono"),
-            "clap": Label("@vendor_ts__clap-4.5.40//:clap"),
+            "chalk-ir": Label("@vendor_ts__chalk-ir-0.104.0//:chalk_ir"),
+            "chrono": Label("@vendor_ts__chrono-0.4.42//:chrono"),
+            "clap": Label("@vendor_ts__clap-4.5.48//:clap"),
             "dunce": Label("@vendor_ts__dunce-1.0.5//:dunce"),
             "figment": Label("@vendor_ts__figment-0.10.19//:figment"),
-            "glob": Label("@vendor_ts__glob-0.3.2//:glob"),
+            "glob": Label("@vendor_ts__glob-0.3.3//:glob"),
             "itertools": Label("@vendor_ts__itertools-0.14.0//:itertools"),
             "mustache": Label("@vendor_ts__mustache-0.9.0//:mustache"),
             "num-traits": Label("@vendor_ts__num-traits-0.2.19//:num_traits"),
-            "ra_ap_base_db": Label("@vendor_ts__ra_ap_base_db-0.0.288//:ra_ap_base_db"),
-            "ra_ap_cfg": Label("@vendor_ts__ra_ap_cfg-0.0.288//:ra_ap_cfg"),
-            "ra_ap_hir": Label("@vendor_ts__ra_ap_hir-0.0.288//:ra_ap_hir"),
-            "ra_ap_hir_def": Label("@vendor_ts__ra_ap_hir_def-0.0.288//:ra_ap_hir_def"),
-            "ra_ap_hir_expand": Label("@vendor_ts__ra_ap_hir_expand-0.0.288//:ra_ap_hir_expand"),
-            "ra_ap_hir_ty": Label("@vendor_ts__ra_ap_hir_ty-0.0.288//:ra_ap_hir_ty"),
-            "ra_ap_ide_db": Label("@vendor_ts__ra_ap_ide_db-0.0.288//:ra_ap_ide_db"),
-            "ra_ap_intern": Label("@vendor_ts__ra_ap_intern-0.0.288//:ra_ap_intern"),
-            "ra_ap_load-cargo": Label("@vendor_ts__ra_ap_load-cargo-0.0.288//:ra_ap_load_cargo"),
-            "ra_ap_parser": Label("@vendor_ts__ra_ap_parser-0.0.288//:ra_ap_parser"),
-            "ra_ap_paths": Label("@vendor_ts__ra_ap_paths-0.0.288//:ra_ap_paths"),
-            "ra_ap_project_model": Label("@vendor_ts__ra_ap_project_model-0.0.288//:ra_ap_project_model"),
-            "ra_ap_span": Label("@vendor_ts__ra_ap_span-0.0.288//:ra_ap_span"),
-            "ra_ap_syntax": Label("@vendor_ts__ra_ap_syntax-0.0.288//:ra_ap_syntax"),
-            "ra_ap_vfs": Label("@vendor_ts__ra_ap_vfs-0.0.288//:ra_ap_vfs"),
-            "serde": Label("@vendor_ts__serde-1.0.219//:serde"),
-            "serde_json": Label("@vendor_ts__serde_json-1.0.140//:serde_json"),
-            "serde_with": Label("@vendor_ts__serde_with-3.13.0//:serde_with"),
-            "toml": Label("@vendor_ts__toml-0.8.23//:toml"),
+            "ra_ap_base_db": Label("@vendor_ts__ra_ap_base_db-0.0.301//:ra_ap_base_db"),
+            "ra_ap_cfg": Label("@vendor_ts__ra_ap_cfg-0.0.301//:ra_ap_cfg"),
+            "ra_ap_hir": Label("@vendor_ts__ra_ap_hir-0.0.301//:ra_ap_hir"),
+            "ra_ap_hir_def": Label("@vendor_ts__ra_ap_hir_def-0.0.301//:ra_ap_hir_def"),
+            "ra_ap_hir_expand": Label("@vendor_ts__ra_ap_hir_expand-0.0.301//:ra_ap_hir_expand"),
+            "ra_ap_hir_ty": Label("@vendor_ts__ra_ap_hir_ty-0.0.301//:ra_ap_hir_ty"),
+            "ra_ap_ide_db": Label("@vendor_ts__ra_ap_ide_db-0.0.301//:ra_ap_ide_db"),
+            "ra_ap_intern": Label("@vendor_ts__ra_ap_intern-0.0.301//:ra_ap_intern"),
+            "ra_ap_load-cargo": Label("@vendor_ts__ra_ap_load-cargo-0.0.301//:ra_ap_load_cargo"),
+            "ra_ap_parser": Label("@vendor_ts__ra_ap_parser-0.0.301//:ra_ap_parser"),
+            "ra_ap_paths": Label("@vendor_ts__ra_ap_paths-0.0.301//:ra_ap_paths"),
+            "ra_ap_project_model": Label("@vendor_ts__ra_ap_project_model-0.0.301//:ra_ap_project_model"),
+            "ra_ap_span": Label("@vendor_ts__ra_ap_span-0.0.301//:ra_ap_span"),
+            "ra_ap_syntax": Label("@vendor_ts__ra_ap_syntax-0.0.301//:ra_ap_syntax"),
+            "ra_ap_vfs": Label("@vendor_ts__ra_ap_vfs-0.0.301//:ra_ap_vfs"),
+            "serde": Label("@vendor_ts__serde-1.0.228//:serde"),
+            "serde_json": Label("@vendor_ts__serde_json-1.0.145//:serde_json"),
+            "serde_with": Label("@vendor_ts__serde_with-3.14.1//:serde_with"),
+            "toml": Label("@vendor_ts__toml-0.9.7//:toml"),
             "tracing": Label("@vendor_ts__tracing-0.1.41//:tracing"),
             "tracing-flame": Label("@vendor_ts__tracing-flame-0.2.0//:tracing_flame"),
-            "tracing-subscriber": Label("@vendor_ts__tracing-subscriber-0.3.19//:tracing_subscriber"),
+            "tracing-subscriber": Label("@vendor_ts__tracing-subscriber-0.3.20//:tracing_subscriber"),
             "triomphe": Label("@vendor_ts__triomphe-0.1.14//:triomphe"),
         },
     },
     "rust/extractor/macros": {
         _COMMON_CONDITION: {
-            "quote": Label("@vendor_ts__quote-1.0.40//:quote"),
-            "syn": Label("@vendor_ts__syn-2.0.103//:syn"),
+            "quote": Label("@vendor_ts__quote-1.0.41//:quote"),
+            "syn": Label("@vendor_ts__syn-2.0.106//:syn"),
         },
     },
     "shared/tree-sitter-extractor": {
         _COMMON_CONDITION: {
-            "chrono": Label("@vendor_ts__chrono-0.4.41//:chrono"),
+            "chrono": Label("@vendor_ts__chrono-0.4.42//:chrono"),
             "encoding": Label("@vendor_ts__encoding-0.2.33//:encoding"),
-            "flate2": Label("@vendor_ts__flate2-1.1.0//:flate2"),
-            "globset": Label("@vendor_ts__globset-0.4.15//:globset"),
+            "flate2": Label("@vendor_ts__flate2-1.1.2//:flate2"),
+            "globset": Label("@vendor_ts__globset-0.4.16//:globset"),
             "lazy_static": Label("@vendor_ts__lazy_static-1.5.0//:lazy_static"),
             "num_cpus": Label("@vendor_ts__num_cpus-1.17.0//:num_cpus"),
-            "rayon": Label("@vendor_ts__rayon-1.10.0//:rayon"),
-            "regex": Label("@vendor_ts__regex-1.11.1//:regex"),
-            "serde": Label("@vendor_ts__serde-1.0.219//:serde"),
-            "serde_json": Label("@vendor_ts__serde_json-1.0.140//:serde_json"),
+            "rayon": Label("@vendor_ts__rayon-1.11.0//:rayon"),
+            "regex": Label("@vendor_ts__regex-1.11.3//:regex"),
+            "serde": Label("@vendor_ts__serde-1.0.228//:serde"),
+            "serde_json": Label("@vendor_ts__serde_json-1.0.145//:serde_json"),
             "tracing": Label("@vendor_ts__tracing-0.1.41//:tracing"),
-            "tracing-subscriber": Label("@vendor_ts__tracing-subscriber-0.3.19//:tracing_subscriber"),
-            "tree-sitter": Label("@vendor_ts__tree-sitter-0.24.6//:tree_sitter"),
+            "tracing-subscriber": Label("@vendor_ts__tracing-subscriber-0.3.20//:tracing_subscriber"),
+            "tree-sitter": Label("@vendor_ts__tree-sitter-0.25.9//:tree_sitter"),
             "zstd": Label("@vendor_ts__zstd-0.13.3//:zstd"),
         },
     },
@@ -394,7 +394,7 @@ _NORMAL_ALIASES = {
     },
     "rust/ast-generator": {
         _COMMON_CONDITION: {
-            Label("@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx"): "stdx",
+            Label("@vendor_ts__ra_ap_stdx-0.0.301//:ra_ap_stdx"): "stdx",
         },
     },
     "rust/autobuild": {
@@ -426,7 +426,7 @@ _NORMAL_DEV_DEPENDENCIES = {
     },
     "shared/tree-sitter-extractor": {
         _COMMON_CONDITION: {
-            "rand": Label("@vendor_ts__rand-0.9.1//:rand"),
+            "rand": Label("@vendor_ts__rand-0.9.2//:rand"),
             "tree-sitter-json": Label("@vendor_ts__tree-sitter-json-0.24.8//:tree_sitter_json"),
             "tree-sitter-ql": Label("@vendor_ts__tree-sitter-ql-0.23.1//:tree_sitter_ql"),
         },
@@ -588,28 +588,25 @@ _CONDITIONS = {
     "armv7-linux-androideabi": ["@rules_rust//rust/platform:armv7-linux-androideabi"],
     "armv7-unknown-linux-gnueabi": ["@rules_rust//rust/platform:armv7-unknown-linux-gnueabi"],
     "cfg(all(any(target_arch = \"x86_64\", target_arch = \"arm64ec\"), target_env = \"msvc\", not(windows_raw_dylib)))": ["@rules_rust//rust/platform:x86_64-pc-windows-msvc"],
-    "cfg(all(any(target_os = \"linux\", target_os = \"android\"), not(any(getrandom_backend = \"custom\", getrandom_backend = \"rdrand\", getrandom_backend = \"rndr\"))))": ["@rules_rust//rust/platform:aarch64-linux-android", "@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu", "@rules_rust//rust/platform:arm-unknown-linux-gnueabi", "@rules_rust//rust/platform:armv7-linux-androideabi", "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi", "@rules_rust//rust/platform:i686-linux-android", "@rules_rust//rust/platform:i686-unknown-linux-gnu", "@rules_rust//rust/platform:powerpc-unknown-linux-gnu", "@rules_rust//rust/platform:s390x-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-linux-android", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"],
+    "cfg(all(any(target_os = \"linux\", target_os = \"android\"), not(any(all(target_os = \"linux\", target_env = \"\"), getrandom_backend = \"custom\", getrandom_backend = \"linux_raw\", getrandom_backend = \"rdrand\", getrandom_backend = \"rndr\"))))": ["@rules_rust//rust/platform:aarch64-linux-android", "@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu", "@rules_rust//rust/platform:arm-unknown-linux-gnueabi", "@rules_rust//rust/platform:armv7-linux-androideabi", "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi", "@rules_rust//rust/platform:i686-linux-android", "@rules_rust//rust/platform:i686-unknown-linux-gnu", "@rules_rust//rust/platform:powerpc-unknown-linux-gnu", "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu", "@rules_rust//rust/platform:s390x-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-linux-android", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"],
     "cfg(all(target_arch = \"aarch64\", target_env = \"msvc\", not(windows_raw_dylib)))": ["@rules_rust//rust/platform:aarch64-pc-windows-msvc"],
     "cfg(all(target_arch = \"wasm32\", target_os = \"unknown\"))": ["@rules_rust//rust/platform:wasm32-unknown-unknown"],
-    "cfg(all(target_arch = \"wasm32\", target_os = \"wasi\", target_env = \"p2\"))": [],
+    "cfg(all(target_arch = \"wasm32\", target_os = \"wasi\", target_env = \"p2\"))": ["@rules_rust//rust/platform:wasm32-wasip2"],
     "cfg(all(target_arch = \"x86\", target_env = \"gnu\", not(target_abi = \"llvm\"), not(windows_raw_dylib)))": ["@rules_rust//rust/platform:i686-unknown-linux-gnu"],
-    "cfg(all(target_arch = \"x86\", target_env = \"gnu\", not(windows_raw_dylib)))": ["@rules_rust//rust/platform:i686-unknown-linux-gnu"],
     "cfg(all(target_arch = \"x86\", target_env = \"msvc\", not(windows_raw_dylib)))": ["@rules_rust//rust/platform:i686-pc-windows-msvc"],
     "cfg(all(target_arch = \"x86_64\", target_env = \"gnu\", not(target_abi = \"llvm\"), not(windows_raw_dylib)))": ["@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"],
-    "cfg(all(target_arch = \"x86_64\", target_env = \"msvc\", not(windows_raw_dylib)))": ["@rules_rust//rust/platform:x86_64-pc-windows-msvc"],
-    "cfg(all(target_os = \"linux\", not(target_env = \"ohos\")))": ["@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu", "@rules_rust//rust/platform:arm-unknown-linux-gnueabi", "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi", "@rules_rust//rust/platform:i686-unknown-linux-gnu", "@rules_rust//rust/platform:powerpc-unknown-linux-gnu", "@rules_rust//rust/platform:s390x-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"],
-    "cfg(all(target_os = \"linux\", target_env = \"gnu\"))": ["@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu", "@rules_rust//rust/platform:arm-unknown-linux-gnueabi", "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi", "@rules_rust//rust/platform:i686-unknown-linux-gnu", "@rules_rust//rust/platform:powerpc-unknown-linux-gnu", "@rules_rust//rust/platform:s390x-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"],
-    "cfg(all(windows, not(target_vendor = \"win7\")))": ["@rules_rust//rust/platform:aarch64-pc-windows-msvc", "@rules_rust//rust/platform:i686-pc-windows-msvc", "@rules_rust//rust/platform:x86_64-pc-windows-msvc"],
+    "cfg(all(target_os = \"linux\", not(target_env = \"ohos\")))": ["@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu", "@rules_rust//rust/platform:arm-unknown-linux-gnueabi", "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi", "@rules_rust//rust/platform:i686-unknown-linux-gnu", "@rules_rust//rust/platform:powerpc-unknown-linux-gnu", "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu", "@rules_rust//rust/platform:s390x-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"],
+    "cfg(all(target_os = \"linux\", target_env = \"gnu\"))": ["@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu", "@rules_rust//rust/platform:arm-unknown-linux-gnueabi", "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi", "@rules_rust//rust/platform:i686-unknown-linux-gnu", "@rules_rust//rust/platform:powerpc-unknown-linux-gnu", "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu", "@rules_rust//rust/platform:s390x-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"],
+    "cfg(all(target_os = \"uefi\", getrandom_backend = \"efi_rng\"))": [],
     "cfg(any())": [],
-    "cfg(any(target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"hurd\", target_os = \"illumos\", all(target_os = \"horizon\", target_arch = \"arm\")))": ["@rules_rust//rust/platform:i686-unknown-freebsd", "@rules_rust//rust/platform:x86_64-unknown-freebsd"],
+    "cfg(any(target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"hurd\", target_os = \"illumos\", target_os = \"cygwin\", all(target_os = \"horizon\", target_arch = \"arm\")))": ["@rules_rust//rust/platform:i686-unknown-freebsd", "@rules_rust//rust/platform:x86_64-unknown-freebsd"],
     "cfg(any(target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\", target_os = \"dragonflybsd\", target_os = \"ios\"))": ["@rules_rust//rust/platform:aarch64-apple-ios", "@rules_rust//rust/platform:aarch64-apple-ios-sim", "@rules_rust//rust/platform:i686-unknown-freebsd", "@rules_rust//rust/platform:x86_64-apple-ios", "@rules_rust//rust/platform:x86_64-unknown-freebsd"],
     "cfg(any(target_os = \"haiku\", target_os = \"redox\", target_os = \"nto\", target_os = \"aix\"))": ["@rules_rust//rust/platform:aarch64-unknown-nto-qnx710"],
     "cfg(any(target_os = \"ios\", target_os = \"visionos\", target_os = \"watchos\", target_os = \"tvos\"))": ["@rules_rust//rust/platform:aarch64-apple-ios", "@rules_rust//rust/platform:aarch64-apple-ios-sim", "@rules_rust//rust/platform:x86_64-apple-ios"],
-    "cfg(any(target_os = \"linux\", target_os = \"android\"))": ["@rules_rust//rust/platform:aarch64-linux-android", "@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu", "@rules_rust//rust/platform:arm-unknown-linux-gnueabi", "@rules_rust//rust/platform:armv7-linux-androideabi", "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi", "@rules_rust//rust/platform:i686-linux-android", "@rules_rust//rust/platform:i686-unknown-linux-gnu", "@rules_rust//rust/platform:powerpc-unknown-linux-gnu", "@rules_rust//rust/platform:s390x-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-linux-android", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"],
-    "cfg(any(target_os = \"macos\", target_os = \"ios\"))": ["@rules_rust//rust/platform:aarch64-apple-darwin", "@rules_rust//rust/platform:aarch64-apple-ios", "@rules_rust//rust/platform:aarch64-apple-ios-sim", "@rules_rust//rust/platform:i686-apple-darwin", "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-apple-ios"],
-    "cfg(any(target_os = \"macos\", target_os = \"openbsd\", target_os = \"vita\", target_os = \"emscripten\"))": ["@rules_rust//rust/platform:aarch64-apple-darwin", "@rules_rust//rust/platform:i686-apple-darwin", "@rules_rust//rust/platform:x86_64-apple-darwin"],
-    "cfg(any(target_pointer_width = \"8\", target_pointer_width = \"16\", target_pointer_width = \"32\"))": ["@rules_rust//rust/platform:arm-unknown-linux-gnueabi", "@rules_rust//rust/platform:armv7-linux-androideabi", "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi", "@rules_rust//rust/platform:i686-apple-darwin", "@rules_rust//rust/platform:i686-linux-android", "@rules_rust//rust/platform:i686-pc-windows-msvc", "@rules_rust//rust/platform:i686-unknown-freebsd", "@rules_rust//rust/platform:i686-unknown-linux-gnu", "@rules_rust//rust/platform:powerpc-unknown-linux-gnu", "@rules_rust//rust/platform:riscv32imc-unknown-none-elf", "@rules_rust//rust/platform:thumbv7em-none-eabi", "@rules_rust//rust/platform:thumbv8m.main-none-eabi", "@rules_rust//rust/platform:wasm32-unknown-unknown", "@rules_rust//rust/platform:wasm32-wasip1"],
-    "cfg(not(windows))": ["@rules_rust//rust/platform:aarch64-apple-darwin", "@rules_rust//rust/platform:aarch64-apple-ios", "@rules_rust//rust/platform:aarch64-apple-ios-sim", "@rules_rust//rust/platform:aarch64-linux-android", "@rules_rust//rust/platform:aarch64-unknown-fuchsia", "@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu", "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710", "@rules_rust//rust/platform:aarch64-unknown-uefi", "@rules_rust//rust/platform:arm-unknown-linux-gnueabi", "@rules_rust//rust/platform:armv7-linux-androideabi", "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi", "@rules_rust//rust/platform:i686-apple-darwin", "@rules_rust//rust/platform:i686-linux-android", "@rules_rust//rust/platform:i686-unknown-freebsd", "@rules_rust//rust/platform:i686-unknown-linux-gnu", "@rules_rust//rust/platform:powerpc-unknown-linux-gnu", "@rules_rust//rust/platform:riscv32imc-unknown-none-elf", "@rules_rust//rust/platform:riscv64gc-unknown-none-elf", "@rules_rust//rust/platform:s390x-unknown-linux-gnu", "@rules_rust//rust/platform:thumbv7em-none-eabi", "@rules_rust//rust/platform:thumbv8m.main-none-eabi", "@rules_rust//rust/platform:wasm32-unknown-unknown", "@rules_rust//rust/platform:wasm32-wasip1", "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-apple-ios", "@rules_rust//rust/platform:x86_64-linux-android", "@rules_rust//rust/platform:x86_64-unknown-freebsd", "@rules_rust//rust/platform:x86_64-unknown-fuchsia", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu", "@rules_rust//rust/platform:x86_64-unknown-none", "@rules_rust//rust/platform:x86_64-unknown-uefi"],
+    "cfg(any(target_os = \"linux\", target_os = \"android\"))": ["@rules_rust//rust/platform:aarch64-linux-android", "@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu", "@rules_rust//rust/platform:arm-unknown-linux-gnueabi", "@rules_rust//rust/platform:armv7-linux-androideabi", "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi", "@rules_rust//rust/platform:i686-linux-android", "@rules_rust//rust/platform:i686-unknown-linux-gnu", "@rules_rust//rust/platform:powerpc-unknown-linux-gnu", "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu", "@rules_rust//rust/platform:s390x-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-linux-android", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"],
+    "cfg(any(target_os = \"macos\", target_os = \"openbsd\", target_os = \"vita\", target_os = \"emscripten\"))": ["@rules_rust//rust/platform:aarch64-apple-darwin", "@rules_rust//rust/platform:i686-apple-darwin", "@rules_rust//rust/platform:wasm32-unknown-emscripten", "@rules_rust//rust/platform:x86_64-apple-darwin"],
+    "cfg(any(target_pointer_width = \"8\", target_pointer_width = \"16\", target_pointer_width = \"32\"))": ["@rules_rust//rust/platform:arm-unknown-linux-gnueabi", "@rules_rust//rust/platform:armv7-linux-androideabi", "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi", "@rules_rust//rust/platform:i686-apple-darwin", "@rules_rust//rust/platform:i686-linux-android", "@rules_rust//rust/platform:i686-pc-windows-msvc", "@rules_rust//rust/platform:i686-unknown-freebsd", "@rules_rust//rust/platform:i686-unknown-linux-gnu", "@rules_rust//rust/platform:powerpc-unknown-linux-gnu", "@rules_rust//rust/platform:riscv32imc-unknown-none-elf", "@rules_rust//rust/platform:thumbv7em-none-eabi", "@rules_rust//rust/platform:thumbv8m.main-none-eabi", "@rules_rust//rust/platform:wasm32-unknown-emscripten", "@rules_rust//rust/platform:wasm32-unknown-unknown", "@rules_rust//rust/platform:wasm32-wasip1", "@rules_rust//rust/platform:wasm32-wasip1-threads", "@rules_rust//rust/platform:wasm32-wasip2"],
+    "cfg(not(windows))": ["@rules_rust//rust/platform:aarch64-apple-darwin", "@rules_rust//rust/platform:aarch64-apple-ios", "@rules_rust//rust/platform:aarch64-apple-ios-sim", "@rules_rust//rust/platform:aarch64-linux-android", "@rules_rust//rust/platform:aarch64-unknown-fuchsia", "@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu", "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710", "@rules_rust//rust/platform:aarch64-unknown-uefi", "@rules_rust//rust/platform:arm-unknown-linux-gnueabi", "@rules_rust//rust/platform:armv7-linux-androideabi", "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi", "@rules_rust//rust/platform:i686-apple-darwin", "@rules_rust//rust/platform:i686-linux-android", "@rules_rust//rust/platform:i686-unknown-freebsd", "@rules_rust//rust/platform:i686-unknown-linux-gnu", "@rules_rust//rust/platform:powerpc-unknown-linux-gnu", "@rules_rust//rust/platform:riscv32imc-unknown-none-elf", "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu", "@rules_rust//rust/platform:riscv64gc-unknown-none-elf", "@rules_rust//rust/platform:s390x-unknown-linux-gnu", "@rules_rust//rust/platform:thumbv7em-none-eabi", "@rules_rust//rust/platform:thumbv8m.main-none-eabi", "@rules_rust//rust/platform:wasm32-unknown-emscripten", "@rules_rust//rust/platform:wasm32-unknown-unknown", "@rules_rust//rust/platform:wasm32-wasip1", "@rules_rust//rust/platform:wasm32-wasip1-threads", "@rules_rust//rust/platform:wasm32-wasip2", "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-apple-ios", "@rules_rust//rust/platform:x86_64-linux-android", "@rules_rust//rust/platform:x86_64-unknown-freebsd", "@rules_rust//rust/platform:x86_64-unknown-fuchsia", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu", "@rules_rust//rust/platform:x86_64-unknown-none", "@rules_rust//rust/platform:x86_64-unknown-uefi"],
     "cfg(target_os = \"android\")": ["@rules_rust//rust/platform:aarch64-linux-android", "@rules_rust//rust/platform:armv7-linux-androideabi", "@rules_rust//rust/platform:i686-linux-android", "@rules_rust//rust/platform:x86_64-linux-android"],
     "cfg(target_os = \"haiku\")": [],
     "cfg(target_os = \"hermit\")": [],
@@ -618,29 +615,33 @@ _CONDITIONS = {
     "cfg(target_os = \"redox\")": [],
     "cfg(target_os = \"solaris\")": [],
     "cfg(target_os = \"vxworks\")": [],
-    "cfg(target_os = \"wasi\")": ["@rules_rust//rust/platform:wasm32-wasip1"],
+    "cfg(target_os = \"wasi\")": ["@rules_rust//rust/platform:wasm32-wasip1", "@rules_rust//rust/platform:wasm32-wasip1-threads", "@rules_rust//rust/platform:wasm32-wasip2"],
     "cfg(target_os = \"windows\")": ["@rules_rust//rust/platform:aarch64-pc-windows-msvc", "@rules_rust//rust/platform:i686-pc-windows-msvc", "@rules_rust//rust/platform:x86_64-pc-windows-msvc"],
-    "cfg(unix)": ["@rules_rust//rust/platform:aarch64-apple-darwin", "@rules_rust//rust/platform:aarch64-apple-ios", "@rules_rust//rust/platform:aarch64-apple-ios-sim", "@rules_rust//rust/platform:aarch64-linux-android", "@rules_rust//rust/platform:aarch64-unknown-fuchsia", "@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu", "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710", "@rules_rust//rust/platform:arm-unknown-linux-gnueabi", "@rules_rust//rust/platform:armv7-linux-androideabi", "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi", "@rules_rust//rust/platform:i686-apple-darwin", "@rules_rust//rust/platform:i686-linux-android", "@rules_rust//rust/platform:i686-unknown-freebsd", "@rules_rust//rust/platform:i686-unknown-linux-gnu", "@rules_rust//rust/platform:powerpc-unknown-linux-gnu", "@rules_rust//rust/platform:s390x-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-apple-ios", "@rules_rust//rust/platform:x86_64-linux-android", "@rules_rust//rust/platform:x86_64-unknown-freebsd", "@rules_rust//rust/platform:x86_64-unknown-fuchsia", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"],
+    "cfg(target_vendor = \"apple\")": ["@rules_rust//rust/platform:aarch64-apple-darwin", "@rules_rust//rust/platform:aarch64-apple-ios", "@rules_rust//rust/platform:aarch64-apple-ios-sim", "@rules_rust//rust/platform:i686-apple-darwin", "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-apple-ios"],
+    "cfg(unix)": ["@rules_rust//rust/platform:aarch64-apple-darwin", "@rules_rust//rust/platform:aarch64-apple-ios", "@rules_rust//rust/platform:aarch64-apple-ios-sim", "@rules_rust//rust/platform:aarch64-linux-android", "@rules_rust//rust/platform:aarch64-unknown-fuchsia", "@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu", "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710", "@rules_rust//rust/platform:arm-unknown-linux-gnueabi", "@rules_rust//rust/platform:armv7-linux-androideabi", "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi", "@rules_rust//rust/platform:i686-apple-darwin", "@rules_rust//rust/platform:i686-linux-android", "@rules_rust//rust/platform:i686-unknown-freebsd", "@rules_rust//rust/platform:i686-unknown-linux-gnu", "@rules_rust//rust/platform:powerpc-unknown-linux-gnu", "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu", "@rules_rust//rust/platform:s390x-unknown-linux-gnu", "@rules_rust//rust/platform:wasm32-unknown-emscripten", "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-apple-ios", "@rules_rust//rust/platform:x86_64-linux-android", "@rules_rust//rust/platform:x86_64-unknown-freebsd", "@rules_rust//rust/platform:x86_64-unknown-fuchsia", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"],
     "cfg(windows)": ["@rules_rust//rust/platform:aarch64-pc-windows-msvc", "@rules_rust//rust/platform:i686-pc-windows-msvc", "@rules_rust//rust/platform:x86_64-pc-windows-msvc"],
+    "cfg(windows_raw_dylib)": [],
     "i686-apple-darwin": ["@rules_rust//rust/platform:i686-apple-darwin"],
     "i686-linux-android": ["@rules_rust//rust/platform:i686-linux-android"],
-    "i686-pc-windows-gnu": [],
     "i686-pc-windows-gnullvm": [],
     "i686-pc-windows-msvc": ["@rules_rust//rust/platform:i686-pc-windows-msvc"],
     "i686-unknown-freebsd": ["@rules_rust//rust/platform:i686-unknown-freebsd"],
     "i686-unknown-linux-gnu": ["@rules_rust//rust/platform:i686-unknown-linux-gnu"],
     "powerpc-unknown-linux-gnu": ["@rules_rust//rust/platform:powerpc-unknown-linux-gnu"],
     "riscv32imc-unknown-none-elf": ["@rules_rust//rust/platform:riscv32imc-unknown-none-elf"],
+    "riscv64gc-unknown-linux-gnu": ["@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu"],
     "riscv64gc-unknown-none-elf": ["@rules_rust//rust/platform:riscv64gc-unknown-none-elf"],
     "s390x-unknown-linux-gnu": ["@rules_rust//rust/platform:s390x-unknown-linux-gnu"],
     "thumbv7em-none-eabi": ["@rules_rust//rust/platform:thumbv7em-none-eabi"],
     "thumbv8m.main-none-eabi": ["@rules_rust//rust/platform:thumbv8m.main-none-eabi"],
+    "wasm32-unknown-emscripten": ["@rules_rust//rust/platform:wasm32-unknown-emscripten"],
     "wasm32-unknown-unknown": ["@rules_rust//rust/platform:wasm32-unknown-unknown"],
     "wasm32-wasip1": ["@rules_rust//rust/platform:wasm32-wasip1"],
+    "wasm32-wasip1-threads": ["@rules_rust//rust/platform:wasm32-wasip1-threads"],
+    "wasm32-wasip2": ["@rules_rust//rust/platform:wasm32-wasip2"],
     "x86_64-apple-darwin": ["@rules_rust//rust/platform:x86_64-apple-darwin"],
     "x86_64-apple-ios": ["@rules_rust//rust/platform:x86_64-apple-ios"],
     "x86_64-linux-android": ["@rules_rust//rust/platform:x86_64-linux-android"],
-    "x86_64-pc-windows-gnu": [],
     "x86_64-pc-windows-gnullvm": [],
     "x86_64-pc-windows-msvc": ["@rules_rust//rust/platform:x86_64-pc-windows-msvc"],
     "x86_64-unknown-freebsd": ["@rules_rust//rust/platform:x86_64-unknown-freebsd"],
@@ -661,12 +662,12 @@ def crate_repositories():
     """
     maybe(
         http_archive,
-        name = "vendor_ts__adler2-2.0.0",
-        sha256 = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627",
+        name = "vendor_ts__adler2-2.0.1",
+        sha256 = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/adler2/2.0.0/download"],
-        strip_prefix = "adler2-2.0.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.adler2-2.0.0.bazel"),
+        urls = ["https://static.crates.io/crates/adler2/2.0.1/download"],
+        strip_prefix = "adler2-2.0.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.adler2-2.0.1.bazel"),
     )
 
     maybe(
@@ -689,16 +690,6 @@ def crate_repositories():
         build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.allocator-api2-0.2.21.bazel"),
     )
 
-    maybe(
-        http_archive,
-        name = "vendor_ts__android-tzdata-0.1.1",
-        sha256 = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/android-tzdata/0.1.1/download"],
-        strip_prefix = "android-tzdata-0.1.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.android-tzdata-0.1.1.bazel"),
-    )
-
     maybe(
         http_archive,
         name = "vendor_ts__android_system_properties-0.1.5",
@@ -711,62 +702,62 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__anstream-0.6.18",
-        sha256 = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b",
+        name = "vendor_ts__anstream-0.6.20",
+        sha256 = "3ae563653d1938f79b1ab1b5e668c87c76a9930414574a6583a7b7e11a8e6192",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/anstream/0.6.18/download"],
-        strip_prefix = "anstream-0.6.18",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.anstream-0.6.18.bazel"),
+        urls = ["https://static.crates.io/crates/anstream/0.6.20/download"],
+        strip_prefix = "anstream-0.6.20",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.anstream-0.6.20.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__anstyle-1.0.10",
-        sha256 = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9",
+        name = "vendor_ts__anstyle-1.0.11",
+        sha256 = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/anstyle/1.0.10/download"],
-        strip_prefix = "anstyle-1.0.10",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.anstyle-1.0.10.bazel"),
+        urls = ["https://static.crates.io/crates/anstyle/1.0.11/download"],
+        strip_prefix = "anstyle-1.0.11",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.anstyle-1.0.11.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__anstyle-parse-0.2.6",
-        sha256 = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9",
+        name = "vendor_ts__anstyle-parse-0.2.7",
+        sha256 = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/anstyle-parse/0.2.6/download"],
-        strip_prefix = "anstyle-parse-0.2.6",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.anstyle-parse-0.2.6.bazel"),
+        urls = ["https://static.crates.io/crates/anstyle-parse/0.2.7/download"],
+        strip_prefix = "anstyle-parse-0.2.7",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.anstyle-parse-0.2.7.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__anstyle-query-1.1.2",
-        sha256 = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c",
+        name = "vendor_ts__anstyle-query-1.1.4",
+        sha256 = "9e231f6134f61b71076a3eab506c379d4f36122f2af15a9ff04415ea4c3339e2",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/anstyle-query/1.1.2/download"],
-        strip_prefix = "anstyle-query-1.1.2",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.anstyle-query-1.1.2.bazel"),
+        urls = ["https://static.crates.io/crates/anstyle-query/1.1.4/download"],
+        strip_prefix = "anstyle-query-1.1.4",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.anstyle-query-1.1.4.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__anstyle-wincon-3.0.7",
-        sha256 = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e",
+        name = "vendor_ts__anstyle-wincon-3.0.10",
+        sha256 = "3e0633414522a32ffaac8ac6cc8f748e090c5717661fddeea04219e2344f5f2a",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/anstyle-wincon/3.0.7/download"],
-        strip_prefix = "anstyle-wincon-3.0.7",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.anstyle-wincon-3.0.7.bazel"),
+        urls = ["https://static.crates.io/crates/anstyle-wincon/3.0.10/download"],
+        strip_prefix = "anstyle-wincon-3.0.10",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.anstyle-wincon-3.0.10.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__anyhow-1.0.98",
-        sha256 = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487",
+        name = "vendor_ts__anyhow-1.0.100",
+        sha256 = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/anyhow/1.0.98/download"],
-        strip_prefix = "anyhow-1.0.98",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.anyhow-1.0.98.bazel"),
+        urls = ["https://static.crates.io/crates/anyhow/1.0.100/download"],
+        strip_prefix = "anyhow-1.0.100",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.anyhow-1.0.100.bazel"),
     )
 
     maybe(
@@ -791,22 +782,22 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__atomic-0.6.0",
-        sha256 = "8d818003e740b63afc82337e3160717f4f63078720a810b7b903e70a5d1d2994",
+        name = "vendor_ts__atomic-0.6.1",
+        sha256 = "a89cbf775b137e9b968e67227ef7f775587cde3fd31b0d8599dbd0f598a48340",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/atomic/0.6.0/download"],
-        strip_prefix = "atomic-0.6.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.atomic-0.6.0.bazel"),
+        urls = ["https://static.crates.io/crates/atomic/0.6.1/download"],
+        strip_prefix = "atomic-0.6.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.atomic-0.6.1.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__autocfg-1.4.0",
-        sha256 = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26",
+        name = "vendor_ts__autocfg-1.5.0",
+        sha256 = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/autocfg/1.4.0/download"],
-        strip_prefix = "autocfg-1.4.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.autocfg-1.4.0.bazel"),
+        urls = ["https://static.crates.io/crates/autocfg/1.5.0/download"],
+        strip_prefix = "autocfg-1.5.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.autocfg-1.5.0.bazel"),
     )
 
     maybe(
@@ -831,82 +822,72 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__bitflags-2.9.1",
-        sha256 = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967",
+        name = "vendor_ts__bitflags-2.9.4",
+        sha256 = "2261d10cca569e4643e526d8dc2e62e433cc8aba21ab764233731f8d369bf394",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/bitflags/2.9.1/download"],
-        strip_prefix = "bitflags-2.9.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.bitflags-2.9.1.bazel"),
+        urls = ["https://static.crates.io/crates/bitflags/2.9.4/download"],
+        strip_prefix = "bitflags-2.9.4",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.bitflags-2.9.4.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__borsh-1.5.5",
-        sha256 = "5430e3be710b68d984d1391c854eb431a9d548640711faa54eecb1df93db91cc",
+        name = "vendor_ts__borsh-1.5.7",
+        sha256 = "ad8646f98db542e39fc66e68a20b2144f6a732636df7c2354e74645faaa433ce",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/borsh/1.5.5/download"],
-        strip_prefix = "borsh-1.5.5",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.borsh-1.5.5.bazel"),
+        urls = ["https://static.crates.io/crates/borsh/1.5.7/download"],
+        strip_prefix = "borsh-1.5.7",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.borsh-1.5.7.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__boxcar-0.2.13",
-        sha256 = "26c4925bc979b677330a8c7fe7a8c94af2dbb4a2d37b4a20a80d884400f46baa",
+        name = "vendor_ts__boxcar-0.2.14",
+        sha256 = "36f64beae40a84da1b4b26ff2761a5b895c12adc41dc25aaee1c4f2bbfe97a6e",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/boxcar/0.2.13/download"],
-        strip_prefix = "boxcar-0.2.13",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.boxcar-0.2.13.bazel"),
+        urls = ["https://static.crates.io/crates/boxcar/0.2.14/download"],
+        strip_prefix = "boxcar-0.2.14",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.boxcar-0.2.14.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__bstr-1.11.3",
-        sha256 = "531a9155a481e2ee699d4f98f43c0ca4ff8ee1bfd55c31e9e98fb29d2b176fe0",
+        name = "vendor_ts__bstr-1.12.0",
+        sha256 = "234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/bstr/1.11.3/download"],
-        strip_prefix = "bstr-1.11.3",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.bstr-1.11.3.bazel"),
+        urls = ["https://static.crates.io/crates/bstr/1.12.0/download"],
+        strip_prefix = "bstr-1.12.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.bstr-1.12.0.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__bumpalo-3.16.0",
-        sha256 = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c",
+        name = "vendor_ts__bumpalo-3.19.0",
+        sha256 = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/bumpalo/3.16.0/download"],
-        strip_prefix = "bumpalo-3.16.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.bumpalo-3.16.0.bazel"),
+        urls = ["https://static.crates.io/crates/bumpalo/3.19.0/download"],
+        strip_prefix = "bumpalo-3.19.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.bumpalo-3.19.0.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__bytemuck-1.21.0",
-        sha256 = "ef657dfab802224e671f5818e9a4935f9b1957ed18e58292690cc39e7a4092a3",
+        name = "vendor_ts__bytemuck-1.23.2",
+        sha256 = "3995eaeebcdf32f91f980d360f78732ddc061097ab4e39991ae7a6ace9194677",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/bytemuck/1.21.0/download"],
-        strip_prefix = "bytemuck-1.21.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.bytemuck-1.21.0.bazel"),
+        urls = ["https://static.crates.io/crates/bytemuck/1.23.2/download"],
+        strip_prefix = "bytemuck-1.23.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.bytemuck-1.23.2.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__byteorder-1.5.0",
-        sha256 = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b",
+        name = "vendor_ts__camino-1.1.12",
+        sha256 = "dd0b03af37dad7a14518b7691d81acb0f8222604ad3d1b02f6b4bed5188c0cd5",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/byteorder/1.5.0/download"],
-        strip_prefix = "byteorder-1.5.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.byteorder-1.5.0.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__camino-1.1.10",
-        sha256 = "0da45bc31171d8d6960122e222a67740df867c1dd53b4d51caa297084c185cab",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/camino/1.1.10/download"],
-        strip_prefix = "camino-1.1.10",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.camino-1.1.10.bazel"),
+        urls = ["https://static.crates.io/crates/camino/1.1.12/download"],
+        strip_prefix = "camino-1.1.12",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.camino-1.1.12.bazel"),
     )
 
     maybe(
@@ -921,42 +902,42 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__cargo-util-schemas-0.2.0",
-        sha256 = "e63d2780ac94487eb9f1fea7b0d56300abc9eb488800854ca217f102f5caccca",
+        name = "vendor_ts__cargo-util-schemas-0.8.2",
+        sha256 = "7dc1a6f7b5651af85774ae5a34b4e8be397d9cf4bc063b7e6dbd99a841837830",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/cargo-util-schemas/0.2.0/download"],
-        strip_prefix = "cargo-util-schemas-0.2.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.cargo-util-schemas-0.2.0.bazel"),
+        urls = ["https://static.crates.io/crates/cargo-util-schemas/0.8.2/download"],
+        strip_prefix = "cargo-util-schemas-0.8.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.cargo-util-schemas-0.8.2.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__cargo_metadata-0.20.0",
-        sha256 = "4f7835cfc6135093070e95eb2b53e5d9b5c403dc3a6be6040ee026270aa82502",
+        name = "vendor_ts__cargo_metadata-0.21.0",
+        sha256 = "5cfca2aaa699835ba88faf58a06342a314a950d2b9686165e038286c30316868",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/cargo_metadata/0.20.0/download"],
-        strip_prefix = "cargo_metadata-0.20.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.cargo_metadata-0.20.0.bazel"),
+        urls = ["https://static.crates.io/crates/cargo_metadata/0.21.0/download"],
+        strip_prefix = "cargo_metadata-0.21.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.cargo_metadata-0.21.0.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__cc-1.2.7",
-        sha256 = "a012a0df96dd6d06ba9a1b29d6402d1a5d77c6befd2566afdc26e10603dc93d7",
+        name = "vendor_ts__cc-1.2.37",
+        sha256 = "65193589c6404eb80b450d618eaf9a2cafaaafd57ecce47370519ef674a7bd44",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/cc/1.2.7/download"],
-        strip_prefix = "cc-1.2.7",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.cc-1.2.7.bazel"),
+        urls = ["https://static.crates.io/crates/cc/1.2.37/download"],
+        strip_prefix = "cc-1.2.37",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.cc-1.2.37.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__cfg-if-1.0.1",
-        sha256 = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268",
+        name = "vendor_ts__cfg-if-1.0.3",
+        sha256 = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/cfg-if/1.0.1/download"],
-        strip_prefix = "cfg-if-1.0.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.cfg-if-1.0.1.bazel"),
+        urls = ["https://static.crates.io/crates/cfg-if/1.0.3/download"],
+        strip_prefix = "cfg-if-1.0.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.cfg-if-1.0.3.bazel"),
     )
 
     maybe(
@@ -979,6 +960,16 @@ def crate_repositories():
         build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.chalk-derive-0.103.0.bazel"),
     )
 
+    maybe(
+        http_archive,
+        name = "vendor_ts__chalk-derive-0.104.0",
+        sha256 = "9ea9b1e80910f66ae87c772247591432032ef3f6a67367ff17f8343db05beafa",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/chalk-derive/0.104.0/download"],
+        strip_prefix = "chalk-derive-0.104.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.chalk-derive-0.104.0.bazel"),
+    )
+
     maybe(
         http_archive,
         name = "vendor_ts__chalk-ir-0.103.0",
@@ -989,6 +980,16 @@ def crate_repositories():
         build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.chalk-ir-0.103.0.bazel"),
     )
 
+    maybe(
+        http_archive,
+        name = "vendor_ts__chalk-ir-0.104.0",
+        sha256 = "7047a516de16226cd17344d41a319d0ea1064bf9e60bd612ab341ab4a34bbfa8",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/chalk-ir/0.104.0/download"],
+        strip_prefix = "chalk-ir-0.104.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.chalk-ir-0.104.0.bazel"),
+    )
+
     maybe(
         http_archive,
         name = "vendor_ts__chalk-recursive-0.103.0",
@@ -1011,62 +1012,62 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__chrono-0.4.41",
-        sha256 = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d",
+        name = "vendor_ts__chrono-0.4.42",
+        sha256 = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/chrono/0.4.41/download"],
-        strip_prefix = "chrono-0.4.41",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.chrono-0.4.41.bazel"),
+        urls = ["https://static.crates.io/crates/chrono/0.4.42/download"],
+        strip_prefix = "chrono-0.4.42",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.chrono-0.4.42.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__clap-4.5.40",
-        sha256 = "40b6887a1d8685cebccf115538db5c0efe625ccac9696ad45c409d96566e910f",
+        name = "vendor_ts__clap-4.5.48",
+        sha256 = "e2134bb3ea021b78629caa971416385309e0131b351b25e01dc16fb54e1b5fae",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/clap/4.5.40/download"],
-        strip_prefix = "clap-4.5.40",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.clap-4.5.40.bazel"),
+        urls = ["https://static.crates.io/crates/clap/4.5.48/download"],
+        strip_prefix = "clap-4.5.48",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.clap-4.5.48.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__clap_builder-4.5.40",
-        sha256 = "e0c66c08ce9f0c698cbce5c0279d0bb6ac936d8674174fe48f736533b964f59e",
+        name = "vendor_ts__clap_builder-4.5.48",
+        sha256 = "c2ba64afa3c0a6df7fa517765e31314e983f51dda798ffba27b988194fb65dc9",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/clap_builder/4.5.40/download"],
-        strip_prefix = "clap_builder-4.5.40",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.clap_builder-4.5.40.bazel"),
+        urls = ["https://static.crates.io/crates/clap_builder/4.5.48/download"],
+        strip_prefix = "clap_builder-4.5.48",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.clap_builder-4.5.48.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__clap_derive-4.5.40",
-        sha256 = "d2c7947ae4cc3d851207c1adb5b5e260ff0cca11446b1d6d1423788e442257ce",
+        name = "vendor_ts__clap_derive-4.5.47",
+        sha256 = "bbfd7eae0b0f1a6e63d4b13c9c478de77c2eb546fba158ad50b4203dc24b9f9c",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/clap_derive/4.5.40/download"],
-        strip_prefix = "clap_derive-4.5.40",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.clap_derive-4.5.40.bazel"),
+        urls = ["https://static.crates.io/crates/clap_derive/4.5.47/download"],
+        strip_prefix = "clap_derive-4.5.47",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.clap_derive-4.5.47.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__clap_lex-0.7.4",
-        sha256 = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6",
+        name = "vendor_ts__clap_lex-0.7.5",
+        sha256 = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/clap_lex/0.7.4/download"],
-        strip_prefix = "clap_lex-0.7.4",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.clap_lex-0.7.4.bazel"),
+        urls = ["https://static.crates.io/crates/clap_lex/0.7.5/download"],
+        strip_prefix = "clap_lex-0.7.5",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.clap_lex-0.7.5.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__colorchoice-1.0.3",
-        sha256 = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990",
+        name = "vendor_ts__colorchoice-1.0.4",
+        sha256 = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/colorchoice/1.0.3/download"],
-        strip_prefix = "colorchoice-1.0.3",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.colorchoice-1.0.3.bazel"),
+        urls = ["https://static.crates.io/crates/colorchoice/1.0.4/download"],
+        strip_prefix = "colorchoice-1.0.4",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.colorchoice-1.0.4.bazel"),
     )
 
     maybe(
@@ -1091,22 +1092,22 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__cov-mark-2.0.0",
-        sha256 = "0570650661aa447e7335f1d5e4f499d8e58796e617bedc9267d971e51c8b49d4",
+        name = "vendor_ts__cov-mark-2.1.0",
+        sha256 = "3f1d92727879fb4f24cec33a35e3bff74035541326cbc12ad44ba8886d1927b0",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/cov-mark/2.0.0/download"],
-        strip_prefix = "cov-mark-2.0.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.cov-mark-2.0.0.bazel"),
+        urls = ["https://static.crates.io/crates/cov-mark/2.1.0/download"],
+        strip_prefix = "cov-mark-2.1.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.cov-mark-2.1.0.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__crc32fast-1.4.2",
-        sha256 = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3",
+        name = "vendor_ts__crc32fast-1.5.0",
+        sha256 = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/crc32fast/1.4.2/download"],
-        strip_prefix = "crc32fast-1.4.2",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.crc32fast-1.4.2.bazel"),
+        urls = ["https://static.crates.io/crates/crc32fast/1.5.0/download"],
+        strip_prefix = "crc32fast-1.5.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.crc32fast-1.5.0.bazel"),
     )
 
     maybe(
@@ -1161,32 +1162,32 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__darling-0.20.10",
-        sha256 = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989",
+        name = "vendor_ts__darling-0.21.3",
+        sha256 = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/darling/0.20.10/download"],
-        strip_prefix = "darling-0.20.10",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.darling-0.20.10.bazel"),
+        urls = ["https://static.crates.io/crates/darling/0.21.3/download"],
+        strip_prefix = "darling-0.21.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.darling-0.21.3.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__darling_core-0.20.10",
-        sha256 = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5",
+        name = "vendor_ts__darling_core-0.21.3",
+        sha256 = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/darling_core/0.20.10/download"],
-        strip_prefix = "darling_core-0.20.10",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.darling_core-0.20.10.bazel"),
+        urls = ["https://static.crates.io/crates/darling_core/0.21.3/download"],
+        strip_prefix = "darling_core-0.21.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.darling_core-0.21.3.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__darling_macro-0.20.10",
-        sha256 = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806",
+        name = "vendor_ts__darling_macro-0.21.3",
+        sha256 = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/darling_macro/0.20.10/download"],
-        strip_prefix = "darling_macro-0.20.10",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.darling_macro-0.20.10.bazel"),
+        urls = ["https://static.crates.io/crates/darling_macro/0.21.3/download"],
+        strip_prefix = "darling_macro-0.21.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.darling_macro-0.21.3.bazel"),
     )
 
     maybe(
@@ -1201,12 +1202,12 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__deranged-0.3.11",
-        sha256 = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4",
+        name = "vendor_ts__deranged-0.5.3",
+        sha256 = "d630bccd429a5bb5a64b5e94f693bfc48c9f8566418fda4c494cc94f911f87cc",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/deranged/0.3.11/download"],
-        strip_prefix = "deranged-0.3.11",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.deranged-0.3.11.bazel"),
+        urls = ["https://static.crates.io/crates/deranged/0.5.3/download"],
+        strip_prefix = "deranged-0.5.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.deranged-0.5.3.bazel"),
     )
 
     maybe(
@@ -1241,12 +1242,12 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__dyn-clone-1.0.19",
-        sha256 = "1c7a8fb8a9fbf66c1f703fe16184d10ca0ee9d23be5b4436400408ba54a95005",
+        name = "vendor_ts__dyn-clone-1.0.20",
+        sha256 = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/dyn-clone/1.0.19/download"],
-        strip_prefix = "dyn-clone-1.0.19",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.dyn-clone-1.0.19.bazel"),
+        urls = ["https://static.crates.io/crates/dyn-clone/1.0.20/download"],
+        strip_prefix = "dyn-clone-1.0.20",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.dyn-clone-1.0.20.bazel"),
     )
 
     maybe(
@@ -1371,12 +1372,12 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__filetime-0.2.25",
-        sha256 = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586",
+        name = "vendor_ts__find-msvc-tools-0.1.1",
+        sha256 = "7fd99930f64d146689264c637b5af2f0233a933bef0d8570e2526bf9e083192d",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/filetime/0.2.25/download"],
-        strip_prefix = "filetime-0.2.25",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.filetime-0.2.25.bazel"),
+        urls = ["https://static.crates.io/crates/find-msvc-tools/0.1.1/download"],
+        strip_prefix = "find-msvc-tools-0.1.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.find-msvc-tools-0.1.1.bazel"),
     )
 
     maybe(
@@ -1391,12 +1392,12 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__flate2-1.1.0",
-        sha256 = "11faaf5a5236997af9848be0bef4db95824b1d534ebc64d0f0c6cf3e67bd38dc",
+        name = "vendor_ts__flate2-1.1.2",
+        sha256 = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/flate2/1.1.0/download"],
-        strip_prefix = "flate2-1.1.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.flate2-1.1.0.bazel"),
+        urls = ["https://static.crates.io/crates/flate2/1.1.2/download"],
+        strip_prefix = "flate2-1.1.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.flate2-1.1.2.bazel"),
     )
 
     maybe(
@@ -1421,12 +1422,12 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__form_urlencoded-1.2.1",
-        sha256 = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456",
+        name = "vendor_ts__form_urlencoded-1.2.2",
+        sha256 = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/form_urlencoded/1.2.1/download"],
-        strip_prefix = "form_urlencoded-1.2.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.form_urlencoded-1.2.1.bazel"),
+        urls = ["https://static.crates.io/crates/form_urlencoded/1.2.2/download"],
+        strip_prefix = "form_urlencoded-1.2.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.form_urlencoded-1.2.2.bazel"),
     )
 
     maybe(
@@ -1461,32 +1462,32 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__getrandom-0.3.1",
-        sha256 = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8",
+        name = "vendor_ts__getrandom-0.3.3",
+        sha256 = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/getrandom/0.3.1/download"],
-        strip_prefix = "getrandom-0.3.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.getrandom-0.3.1.bazel"),
+        urls = ["https://static.crates.io/crates/getrandom/0.3.3/download"],
+        strip_prefix = "getrandom-0.3.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.getrandom-0.3.3.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__glob-0.3.2",
-        sha256 = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2",
+        name = "vendor_ts__glob-0.3.3",
+        sha256 = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/glob/0.3.2/download"],
-        strip_prefix = "glob-0.3.2",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.glob-0.3.2.bazel"),
+        urls = ["https://static.crates.io/crates/glob/0.3.3/download"],
+        strip_prefix = "glob-0.3.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.glob-0.3.3.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__globset-0.4.15",
-        sha256 = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19",
+        name = "vendor_ts__globset-0.4.16",
+        sha256 = "54a1028dfc5f5df5da8a56a73e6c153c9a9708ec57232470703592a3f18e49f5",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/globset/0.4.15/download"],
-        strip_prefix = "globset-0.4.15",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.globset-0.4.15.bazel"),
+        urls = ["https://static.crates.io/crates/globset/0.4.16/download"],
+        strip_prefix = "globset-0.4.16",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.globset-0.4.16.bazel"),
     )
 
     maybe(
@@ -1511,12 +1512,12 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__hashbrown-0.15.2",
-        sha256 = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289",
+        name = "vendor_ts__hashbrown-0.15.5",
+        sha256 = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/hashbrown/0.15.2/download"],
-        strip_prefix = "hashbrown-0.15.2",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.hashbrown-0.15.2.bazel"),
+        urls = ["https://static.crates.io/crates/hashbrown/0.15.5/download"],
+        strip_prefix = "hashbrown-0.15.5",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.hashbrown-0.15.5.bazel"),
     )
 
     maybe(
@@ -1571,12 +1572,12 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__iana-time-zone-0.1.61",
-        sha256 = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220",
+        name = "vendor_ts__iana-time-zone-0.1.63",
+        sha256 = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/iana-time-zone/0.1.61/download"],
-        strip_prefix = "iana-time-zone-0.1.61",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.iana-time-zone-0.1.61.bazel"),
+        urls = ["https://static.crates.io/crates/iana-time-zone/0.1.63/download"],
+        strip_prefix = "iana-time-zone-0.1.63",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.iana-time-zone-0.1.63.bazel"),
     )
 
     maybe(
@@ -1671,12 +1672,12 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__idna-1.0.3",
-        sha256 = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e",
+        name = "vendor_ts__idna-1.1.0",
+        sha256 = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/idna/1.0.3/download"],
-        strip_prefix = "idna-1.0.3",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.idna-1.0.3.bazel"),
+        urls = ["https://static.crates.io/crates/idna/1.1.0/download"],
+        strip_prefix = "idna-1.1.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.idna-1.1.0.bazel"),
     )
 
     maybe(
@@ -1701,12 +1702,12 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__indexmap-2.9.0",
-        sha256 = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e",
+        name = "vendor_ts__indexmap-2.11.4",
+        sha256 = "4b0f83760fb341a774ed326568e19f5a863af4a952def8c39f9ab92fd95b88e5",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/indexmap/2.9.0/download"],
-        strip_prefix = "indexmap-2.9.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.indexmap-2.9.0.bazel"),
+        urls = ["https://static.crates.io/crates/indexmap/2.11.4/download"],
+        strip_prefix = "indexmap-2.11.4",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.indexmap-2.11.4.bazel"),
     )
 
     maybe(
@@ -1739,6 +1740,16 @@ def crate_repositories():
         build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.inotify-sys-0.1.5.bazel"),
     )
 
+    maybe(
+        http_archive,
+        name = "vendor_ts__intrusive-collections-0.9.7",
+        sha256 = "189d0897e4cbe8c75efedf3502c18c887b05046e59d28404d4d8e46cbc4d1e86",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/intrusive-collections/0.9.7/download"],
+        strip_prefix = "intrusive-collections-0.9.7",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.intrusive-collections-0.9.7.bazel"),
+    )
+
     maybe(
         http_archive,
         name = "vendor_ts__is_terminal_polyfill-1.70.1",
@@ -1781,12 +1792,12 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__jobserver-0.1.32",
-        sha256 = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0",
+        name = "vendor_ts__jobserver-0.1.34",
+        sha256 = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/jobserver/0.1.32/download"],
-        strip_prefix = "jobserver-0.1.32",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.jobserver-0.1.32.bazel"),
+        urls = ["https://static.crates.io/crates/jobserver/0.1.34/download"],
+        strip_prefix = "jobserver-0.1.34",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.jobserver-0.1.34.bazel"),
     )
 
     maybe(
@@ -1801,22 +1812,22 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__js-sys-0.3.76",
-        sha256 = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7",
+        name = "vendor_ts__js-sys-0.3.78",
+        sha256 = "0c0b063578492ceec17683ef2f8c5e89121fbd0b172cbc280635ab7567db2738",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/js-sys/0.3.76/download"],
-        strip_prefix = "js-sys-0.3.76",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.js-sys-0.3.76.bazel"),
+        urls = ["https://static.crates.io/crates/js-sys/0.3.78/download"],
+        strip_prefix = "js-sys-0.3.78",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.js-sys-0.3.78.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__kqueue-1.0.8",
-        sha256 = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c",
+        name = "vendor_ts__kqueue-1.1.1",
+        sha256 = "eac30106d7dce88daf4a3fcb4879ea939476d5074a9b7ddd0fb97fa4bed5596a",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/kqueue/1.0.8/download"],
-        strip_prefix = "kqueue-1.0.8",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.kqueue-1.0.8.bazel"),
+        urls = ["https://static.crates.io/crates/kqueue/1.1.1/download"],
+        strip_prefix = "kqueue-1.1.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.kqueue-1.1.1.bazel"),
     )
 
     maybe(
@@ -1851,22 +1862,12 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__libc-0.2.174",
-        sha256 = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776",
+        name = "vendor_ts__libc-0.2.175",
+        sha256 = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/libc/0.2.174/download"],
-        strip_prefix = "libc-0.2.174",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.libc-0.2.174.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__libredox-0.1.3",
-        sha256 = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/libredox/0.1.3/download"],
-        strip_prefix = "libredox-0.1.3",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.libredox-0.1.3.bazel"),
+        urls = ["https://static.crates.io/crates/libc/0.2.175/download"],
+        strip_prefix = "libc-0.2.175",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.libc-0.2.175.bazel"),
     )
 
     maybe(
@@ -1891,12 +1892,12 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__lock_api-0.4.12",
-        sha256 = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17",
+        name = "vendor_ts__lock_api-0.4.13",
+        sha256 = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/lock_api/0.4.12/download"],
-        strip_prefix = "lock_api-0.4.12",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.lock_api-0.4.12.bazel"),
+        urls = ["https://static.crates.io/crates/lock_api/0.4.13/download"],
+        strip_prefix = "lock_api-0.4.13",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.lock_api-0.4.13.bazel"),
     )
 
     maybe(
@@ -1911,22 +1912,22 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__log-0.4.27",
-        sha256 = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94",
+        name = "vendor_ts__log-0.4.28",
+        sha256 = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/log/0.4.27/download"],
-        strip_prefix = "log-0.4.27",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.log-0.4.27.bazel"),
+        urls = ["https://static.crates.io/crates/log/0.4.28/download"],
+        strip_prefix = "log-0.4.28",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.log-0.4.28.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__matchers-0.1.0",
-        sha256 = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558",
+        name = "vendor_ts__matchers-0.2.0",
+        sha256 = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/matchers/0.1.0/download"],
-        strip_prefix = "matchers-0.1.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.matchers-0.1.0.bazel"),
+        urls = ["https://static.crates.io/crates/matchers/0.2.0/download"],
+        strip_prefix = "matchers-0.2.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.matchers-0.2.0.bazel"),
     )
 
     maybe(
@@ -1951,32 +1952,32 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__miniz_oxide-0.8.5",
-        sha256 = "8e3e04debbb59698c15bacbb6d93584a8c0ca9cc3213cb423d31f760d8843ce5",
+        name = "vendor_ts__miniz_oxide-0.8.9",
+        sha256 = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/miniz_oxide/0.8.5/download"],
-        strip_prefix = "miniz_oxide-0.8.5",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.miniz_oxide-0.8.5.bazel"),
+        urls = ["https://static.crates.io/crates/miniz_oxide/0.8.9/download"],
+        strip_prefix = "miniz_oxide-0.8.9",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.miniz_oxide-0.8.9.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__mio-1.0.3",
-        sha256 = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd",
+        name = "vendor_ts__mio-1.0.4",
+        sha256 = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/mio/1.0.3/download"],
-        strip_prefix = "mio-1.0.3",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.mio-1.0.3.bazel"),
+        urls = ["https://static.crates.io/crates/mio/1.0.4/download"],
+        strip_prefix = "mio-1.0.4",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.mio-1.0.4.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__miow-0.6.0",
-        sha256 = "359f76430b20a79f9e20e115b3428614e654f04fab314482fc0fda0ebd3c6044",
+        name = "vendor_ts__miow-0.6.1",
+        sha256 = "536bfad37a309d62069485248eeaba1e8d9853aaf951caaeaed0585a95346f08",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/miow/0.6.0/download"],
-        strip_prefix = "miow-0.6.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.miow-0.6.0.bazel"),
+        urls = ["https://static.crates.io/crates/miow/0.6.1/download"],
+        strip_prefix = "miow-0.6.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.miow-0.6.1.bazel"),
     )
 
     maybe(
@@ -2001,12 +2002,12 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__notify-8.0.0",
-        sha256 = "2fee8403b3d66ac7b26aee6e40a897d85dc5ce26f44da36b8b73e987cc52e943",
+        name = "vendor_ts__notify-8.2.0",
+        sha256 = "4d3d07927151ff8575b7087f245456e549fea62edf0ec4e565a5ee50c8402bc3",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/notify/8.0.0/download"],
-        strip_prefix = "notify-8.0.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.notify-8.0.0.bazel"),
+        urls = ["https://static.crates.io/crates/notify/8.2.0/download"],
+        strip_prefix = "notify-8.2.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.notify-8.2.0.bazel"),
     )
 
     maybe(
@@ -2021,12 +2022,12 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__nu-ansi-term-0.46.0",
-        sha256 = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84",
+        name = "vendor_ts__nu-ansi-term-0.50.1",
+        sha256 = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/nu-ansi-term/0.46.0/download"],
-        strip_prefix = "nu-ansi-term-0.46.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.nu-ansi-term-0.46.0.bazel"),
+        urls = ["https://static.crates.io/crates/nu-ansi-term/0.50.1/download"],
+        strip_prefix = "nu-ansi-term-0.50.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.nu-ansi-term-0.50.1.bazel"),
     )
 
     maybe(
@@ -2061,12 +2062,22 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__once_cell-1.20.3",
-        sha256 = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e",
+        name = "vendor_ts__once_cell-1.21.3",
+        sha256 = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/once_cell/1.20.3/download"],
-        strip_prefix = "once_cell-1.20.3",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.once_cell-1.20.3.bazel"),
+        urls = ["https://static.crates.io/crates/once_cell/1.21.3/download"],
+        strip_prefix = "once_cell-1.21.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.once_cell-1.21.3.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__once_cell_polyfill-1.70.1",
+        sha256 = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/once_cell_polyfill/1.70.1/download"],
+        strip_prefix = "once_cell_polyfill-1.70.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.once_cell_polyfill-1.70.1.bazel"),
     )
 
     maybe(
@@ -2091,42 +2102,42 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__os_str_bytes-7.0.0",
-        sha256 = "7ac44c994af577c799b1b4bd80dc214701e349873ad894d6cdf96f4f7526e0b9",
+        name = "vendor_ts__os_str_bytes-7.1.1",
+        sha256 = "63eceb7b5d757011a87d08eb2123db15d87fb0c281f65d101ce30a1e96c3ad5c",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/os_str_bytes/7.0.0/download"],
-        strip_prefix = "os_str_bytes-7.0.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.os_str_bytes-7.0.0.bazel"),
+        urls = ["https://static.crates.io/crates/os_str_bytes/7.1.1/download"],
+        strip_prefix = "os_str_bytes-7.1.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.os_str_bytes-7.1.1.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__overload-0.1.1",
-        sha256 = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39",
+        name = "vendor_ts__papaya-0.2.3",
+        sha256 = "f92dd0b07c53a0a0c764db2ace8c541dc47320dad97c2200c2a637ab9dd2328f",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/overload/0.1.1/download"],
-        strip_prefix = "overload-0.1.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.overload-0.1.1.bazel"),
+        urls = ["https://static.crates.io/crates/papaya/0.2.3/download"],
+        strip_prefix = "papaya-0.2.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.papaya-0.2.3.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__parking_lot-0.12.3",
-        sha256 = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27",
+        name = "vendor_ts__parking_lot-0.12.4",
+        sha256 = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/parking_lot/0.12.3/download"],
-        strip_prefix = "parking_lot-0.12.3",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.parking_lot-0.12.3.bazel"),
+        urls = ["https://static.crates.io/crates/parking_lot/0.12.4/download"],
+        strip_prefix = "parking_lot-0.12.4",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.parking_lot-0.12.4.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__parking_lot_core-0.9.10",
-        sha256 = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8",
+        name = "vendor_ts__parking_lot_core-0.9.11",
+        sha256 = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/parking_lot_core/0.9.10/download"],
-        strip_prefix = "parking_lot_core-0.9.10",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.parking_lot_core-0.9.10.bazel"),
+        urls = ["https://static.crates.io/crates/parking_lot_core/0.9.11/download"],
+        strip_prefix = "parking_lot_core-0.9.11",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.parking_lot_core-0.9.11.bazel"),
     )
 
     maybe(
@@ -2151,12 +2162,12 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__percent-encoding-2.3.1",
-        sha256 = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e",
+        name = "vendor_ts__percent-encoding-2.3.2",
+        sha256 = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/percent-encoding/2.3.1/download"],
-        strip_prefix = "percent-encoding-2.3.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.percent-encoding-2.3.1.bazel"),
+        urls = ["https://static.crates.io/crates/percent-encoding/2.3.2/download"],
+        strip_prefix = "percent-encoding-2.3.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.percent-encoding-2.3.2.bazel"),
     )
 
     maybe(
@@ -2211,22 +2222,22 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__portable-atomic-1.11.0",
-        sha256 = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e",
+        name = "vendor_ts__portable-atomic-1.11.1",
+        sha256 = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/portable-atomic/1.11.0/download"],
-        strip_prefix = "portable-atomic-1.11.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.portable-atomic-1.11.0.bazel"),
+        urls = ["https://static.crates.io/crates/portable-atomic/1.11.1/download"],
+        strip_prefix = "portable-atomic-1.11.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.portable-atomic-1.11.1.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__potential_utf-0.1.2",
-        sha256 = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585",
+        name = "vendor_ts__potential_utf-0.1.3",
+        sha256 = "84df19adbe5b5a0782edcab45899906947ab039ccf4573713735ee7de1e6b08a",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/potential_utf/0.1.2/download"],
-        strip_prefix = "potential_utf-0.1.2",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.potential_utf-0.1.2.bazel"),
+        urls = ["https://static.crates.io/crates/potential_utf/0.1.3/download"],
+        strip_prefix = "potential_utf-0.1.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.potential_utf-0.1.3.bazel"),
     )
 
     maybe(
@@ -2241,22 +2252,22 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__ppv-lite86-0.2.20",
-        sha256 = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04",
+        name = "vendor_ts__ppv-lite86-0.2.21",
+        sha256 = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ppv-lite86/0.2.20/download"],
-        strip_prefix = "ppv-lite86-0.2.20",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ppv-lite86-0.2.20.bazel"),
+        urls = ["https://static.crates.io/crates/ppv-lite86/0.2.21/download"],
+        strip_prefix = "ppv-lite86-0.2.21",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ppv-lite86-0.2.21.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__proc-macro2-1.0.95",
-        sha256 = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778",
+        name = "vendor_ts__proc-macro2-1.0.101",
+        sha256 = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/proc-macro2/1.0.95/download"],
-        strip_prefix = "proc-macro2-1.0.95",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.proc-macro2-1.0.95.bazel"),
+        urls = ["https://static.crates.io/crates/proc-macro2/1.0.101/download"],
+        strip_prefix = "proc-macro2-1.0.101",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.proc-macro2-1.0.101.bazel"),
     )
 
     maybe(
@@ -2271,342 +2282,362 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__quote-1.0.40",
-        sha256 = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d",
+        name = "vendor_ts__quote-1.0.41",
+        sha256 = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/quote/1.0.40/download"],
-        strip_prefix = "quote-1.0.40",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.quote-1.0.40.bazel"),
+        urls = ["https://static.crates.io/crates/quote/1.0.41/download"],
+        strip_prefix = "quote-1.0.41",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.quote-1.0.41.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra-ap-rustc_abi-0.116.0",
-        sha256 = "a967e3a9cd3e38b543f503978e0eccee461e3aea3f7b10e944959bff41dbe612",
+        name = "vendor_ts__r-efi-5.3.0",
+        sha256 = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra-ap-rustc_abi/0.116.0/download"],
-        strip_prefix = "ra-ap-rustc_abi-0.116.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_abi-0.116.0.bazel"),
+        urls = ["https://static.crates.io/crates/r-efi/5.3.0/download"],
+        strip_prefix = "r-efi-5.3.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.r-efi-5.3.0.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra-ap-rustc_hashes-0.116.0",
-        sha256 = "1ea4c755ecbbffa5743c251344f484ebe571ec7bc5b36d80b2a8ae775d1a7a40",
+        name = "vendor_ts__ra-ap-rustc_abi-0.123.0",
+        sha256 = "f18c877575c259d127072e9bfc41d985202262fb4d6bfdae3d1252147c2562c2",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra-ap-rustc_hashes/0.116.0/download"],
-        strip_prefix = "ra-ap-rustc_hashes-0.116.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_hashes-0.116.0.bazel"),
+        urls = ["https://static.crates.io/crates/ra-ap-rustc_abi/0.123.0/download"],
+        strip_prefix = "ra-ap-rustc_abi-0.123.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_abi-0.123.0.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra-ap-rustc_index-0.116.0",
-        sha256 = "aca7ad7cf911538c619caa2162339fe98637e9e46f11bb0484ef96735df4d64a",
+        name = "vendor_ts__ra-ap-rustc_hashes-0.123.0",
+        sha256 = "2439ed1df3472443133b66949f81080dff88089b42f825761455463709ee1cad",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra-ap-rustc_index/0.116.0/download"],
-        strip_prefix = "ra-ap-rustc_index-0.116.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_index-0.116.0.bazel"),
+        urls = ["https://static.crates.io/crates/ra-ap-rustc_hashes/0.123.0/download"],
+        strip_prefix = "ra-ap-rustc_hashes-0.123.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_hashes-0.123.0.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra-ap-rustc_index_macros-0.116.0",
-        sha256 = "8767ba551c9355bc3031be072cc4bb0381106e5e7cd275e72b7a8c76051c4070",
+        name = "vendor_ts__ra-ap-rustc_index-0.123.0",
+        sha256 = "57a24fe0be21be1f8ebc21dcb40129214fb4cefb0f2753f3d46b6dbe656a1a45",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra-ap-rustc_index_macros/0.116.0/download"],
-        strip_prefix = "ra-ap-rustc_index_macros-0.116.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_index_macros-0.116.0.bazel"),
+        urls = ["https://static.crates.io/crates/ra-ap-rustc_index/0.123.0/download"],
+        strip_prefix = "ra-ap-rustc_index-0.123.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_index-0.123.0.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra-ap-rustc_lexer-0.116.0",
-        sha256 = "6101374afb267e6c27e4e2eb0b1352e9f3504c1a8f716f619cd39244e2ed92ab",
+        name = "vendor_ts__ra-ap-rustc_index_macros-0.123.0",
+        sha256 = "844a27ddcad0116facae2df8e741fd788662cf93dc13029cd864f2b8013b81f9",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra-ap-rustc_lexer/0.116.0/download"],
-        strip_prefix = "ra-ap-rustc_lexer-0.116.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_lexer-0.116.0.bazel"),
+        urls = ["https://static.crates.io/crates/ra-ap-rustc_index_macros/0.123.0/download"],
+        strip_prefix = "ra-ap-rustc_index_macros-0.123.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_index_macros-0.123.0.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra-ap-rustc_parse_format-0.116.0",
-        sha256 = "ecd88a19f00da4f43e6727d5013444cbc399804b5046dfa2bbcd28ebed3970ce",
+        name = "vendor_ts__ra-ap-rustc_lexer-0.121.0",
+        sha256 = "22944e31fb91e9b3e75bcbc91e37d958b8c0825a6160927f2856831d2ce83b36",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra-ap-rustc_parse_format/0.116.0/download"],
-        strip_prefix = "ra-ap-rustc_parse_format-0.116.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_parse_format-0.116.0.bazel"),
+        urls = ["https://static.crates.io/crates/ra-ap-rustc_lexer/0.121.0/download"],
+        strip_prefix = "ra-ap-rustc_lexer-0.121.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_lexer-0.121.0.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra-ap-rustc_pattern_analysis-0.116.0",
-        sha256 = "bb332dd32d7850a799862533b1c021e6062558861a4ad57817bf522499fbb892",
+        name = "vendor_ts__ra-ap-rustc_lexer-0.123.0",
+        sha256 = "2b734cfcb577d09877799a22742f1bd398be6c00bc428d9de56d48d11ece5771",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra-ap-rustc_pattern_analysis/0.116.0/download"],
-        strip_prefix = "ra-ap-rustc_pattern_analysis-0.116.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_pattern_analysis-0.116.0.bazel"),
+        urls = ["https://static.crates.io/crates/ra-ap-rustc_lexer/0.123.0/download"],
+        strip_prefix = "ra-ap-rustc_lexer-0.123.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_lexer-0.123.0.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra_ap_base_db-0.0.288",
-        sha256 = "edf27fccb119fe85faf51f51847df9695d3cca30c2427fed9b4d71e6adebb54f",
+        name = "vendor_ts__ra-ap-rustc_parse_format-0.121.0",
+        sha256 = "81057891bc2063ad9e353f29462fbc47a0f5072560af34428ae9313aaa5e9d97",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_base_db/0.0.288/download"],
-        strip_prefix = "ra_ap_base_db-0.0.288",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_base_db-0.0.288.bazel"),
+        urls = ["https://static.crates.io/crates/ra-ap-rustc_parse_format/0.121.0/download"],
+        strip_prefix = "ra-ap-rustc_parse_format-0.121.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_parse_format-0.121.0.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra_ap_cfg-0.0.288",
-        sha256 = "3cea86a5d6e84fd73824c26f52442807af911db038db821124b2ac65fac24209",
+        name = "vendor_ts__ra-ap-rustc_pattern_analysis-0.123.0",
+        sha256 = "75b0ee1f059b9dea0818c6c7267478926eee95ba4c7dcf89c8db32fa165d3904",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_cfg/0.0.288/download"],
-        strip_prefix = "ra_ap_cfg-0.0.288",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_cfg-0.0.288.bazel"),
+        urls = ["https://static.crates.io/crates/ra-ap-rustc_pattern_analysis/0.123.0/download"],
+        strip_prefix = "ra-ap-rustc_pattern_analysis-0.123.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_pattern_analysis-0.123.0.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra_ap_edition-0.0.288",
-        sha256 = "fb5538d534eeb8526071610664dc64b71ca336b78f6933ff7241d10c1f37e91b",
+        name = "vendor_ts__ra_ap_base_db-0.0.301",
+        sha256 = "e876bb2c3e52a8d4e6684526a2d4e81f9d028b939ee4dc5dc775fe10deb44d59",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_edition/0.0.288/download"],
-        strip_prefix = "ra_ap_edition-0.0.288",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_edition-0.0.288.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_base_db/0.0.301/download"],
+        strip_prefix = "ra_ap_base_db-0.0.301",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_base_db-0.0.301.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra_ap_hir-0.0.288",
-        sha256 = "44796828650900565917ddcc944fecdf6c7d5c3a8a31141f17268ea8c1d2e6f0",
+        name = "vendor_ts__ra_ap_cfg-0.0.301",
+        sha256 = "3a0b56eb4536ce6d2431932c4d337aeeaf7bb22c9249b38cbe80677b5881228f",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_hir/0.0.288/download"],
-        strip_prefix = "ra_ap_hir-0.0.288",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_hir-0.0.288.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_cfg/0.0.301/download"],
+        strip_prefix = "ra_ap_cfg-0.0.301",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_cfg-0.0.301.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra_ap_hir_def-0.0.288",
-        sha256 = "8949b2fb362a1e4eab4d90c7299f0fad3f2c887d9f7d9c286ac6530da4141f85",
+        name = "vendor_ts__ra_ap_edition-0.0.301",
+        sha256 = "1bdc6cbe42c63ca78611bae82bfc8db24864f33dccc813697c5fde43a0907285",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_hir_def/0.0.288/download"],
-        strip_prefix = "ra_ap_hir_def-0.0.288",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_hir_def-0.0.288.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_edition/0.0.301/download"],
+        strip_prefix = "ra_ap_edition-0.0.301",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_edition-0.0.301.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra_ap_hir_expand-0.0.288",
-        sha256 = "22457a431b5eeb67517e03266fddefe48839b060a674a6b18bd84269012ede1e",
+        name = "vendor_ts__ra_ap_hir-0.0.301",
+        sha256 = "ebffdc134eccabc17209d7760cfff7fd12ed18ab6e21188c5e084b97aa38504c",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_hir_expand/0.0.288/download"],
-        strip_prefix = "ra_ap_hir_expand-0.0.288",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_hir_expand-0.0.288.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_hir/0.0.301/download"],
+        strip_prefix = "ra_ap_hir-0.0.301",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_hir-0.0.301.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra_ap_hir_ty-0.0.288",
-        sha256 = "3a4b7a7531414203e11ae447627e2909250eff392c06278ab53ae2a022ecc9fc",
+        name = "vendor_ts__ra_ap_hir_def-0.0.301",
+        sha256 = "81d2337ef59550392d42aa997aa1105a3d6d1c2b3a583c777786bc4a0a074fd5",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_hir_ty/0.0.288/download"],
-        strip_prefix = "ra_ap_hir_ty-0.0.288",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_hir_ty-0.0.288.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_hir_def/0.0.301/download"],
+        strip_prefix = "ra_ap_hir_def-0.0.301",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_hir_def-0.0.301.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra_ap_ide_db-0.0.288",
-        sha256 = "77741ceb096d4f5ecf5384210ea5a2b46878125047c6b0df2bdcfac08a20ea0c",
+        name = "vendor_ts__ra_ap_hir_expand-0.0.301",
+        sha256 = "97cf8ececb2743a819d8299a408e17f164dd1a1004d65936b3d5493b55330326",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_ide_db/0.0.288/download"],
-        strip_prefix = "ra_ap_ide_db-0.0.288",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_ide_db-0.0.288.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_hir_expand/0.0.301/download"],
+        strip_prefix = "ra_ap_hir_expand-0.0.301",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_hir_expand-0.0.301.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra_ap_intern-0.0.288",
-        sha256 = "4a1872cd5a425db6d5247a7deca11526e3104757f6732447ac6ee93c3e795725",
+        name = "vendor_ts__ra_ap_hir_ty-0.0.301",
+        sha256 = "bc004e1099ba766a61500c27d34eb5cd336430d0a89a9620315a90d7a202a73a",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_intern/0.0.288/download"],
-        strip_prefix = "ra_ap_intern-0.0.288",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_intern-0.0.288.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_hir_ty/0.0.301/download"],
+        strip_prefix = "ra_ap_hir_ty-0.0.301",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_hir_ty-0.0.301.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra_ap_load-cargo-0.0.288",
-        sha256 = "f30f5433f056594b02f1879c5c2ce76ea9fd395f21e2a55df6ce3229db993caa",
+        name = "vendor_ts__ra_ap_ide_db-0.0.301",
+        sha256 = "d2acb572d6dbeb1c96d0339890ba91298b8f5f0ab22648da4ee2b4ab77dbc3fe",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_load-cargo/0.0.288/download"],
-        strip_prefix = "ra_ap_load-cargo-0.0.288",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_load-cargo-0.0.288.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_ide_db/0.0.301/download"],
+        strip_prefix = "ra_ap_ide_db-0.0.301",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_ide_db-0.0.301.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra_ap_mbe-0.0.288",
-        sha256 = "222a993acaec35e90c08357aecd530b7170cc3a7f13b3ddfd15a200029ccd555",
+        name = "vendor_ts__ra_ap_intern-0.0.301",
+        sha256 = "14586c2c4781b69fdd0c505972d9bff8c162a8740537a3ee506faff686d9a20d",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_mbe/0.0.288/download"],
-        strip_prefix = "ra_ap_mbe-0.0.288",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_mbe-0.0.288.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_intern/0.0.301/download"],
+        strip_prefix = "ra_ap_intern-0.0.301",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_intern-0.0.301.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra_ap_parser-0.0.288",
-        sha256 = "1c5693f5efd27832e1ac572ea756a1a4a3f7eba07f1287268ca111710971c2e5",
+        name = "vendor_ts__ra_ap_load-cargo-0.0.301",
+        sha256 = "50ce5546b3e3414507ab4d12348d0a28748062e33a1448895c68466d0b015503",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_parser/0.0.288/download"],
-        strip_prefix = "ra_ap_parser-0.0.288",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_parser-0.0.288.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_load-cargo/0.0.301/download"],
+        strip_prefix = "ra_ap_load-cargo-0.0.301",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_load-cargo-0.0.301.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra_ap_paths-0.0.288",
-        sha256 = "39418eff64e59d4bf90dd825ac7d242576e9554669824ebc55a6628bde0aaf10",
+        name = "vendor_ts__ra_ap_mbe-0.0.301",
+        sha256 = "67333c6405797cb64aafb994b9a179157b30beeda2352e203e800be2b184a22d",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_paths/0.0.288/download"],
-        strip_prefix = "ra_ap_paths-0.0.288",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_paths-0.0.288.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_mbe/0.0.301/download"],
+        strip_prefix = "ra_ap_mbe-0.0.301",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_mbe-0.0.301.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra_ap_proc_macro_api-0.0.288",
-        sha256 = "14a315af8c4a9379c26abe7baa143d62e3975ff26f27c65332f9a5edccc56d38",
+        name = "vendor_ts__ra_ap_parser-0.0.301",
+        sha256 = "3a3b92b8b147c0826b83e70ad44e3c98e94201fc93e1f09396c43b4d7958c22a",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_proc_macro_api/0.0.288/download"],
-        strip_prefix = "ra_ap_proc_macro_api-0.0.288",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_proc_macro_api-0.0.288.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_parser/0.0.301/download"],
+        strip_prefix = "ra_ap_parser-0.0.301",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_parser-0.0.301.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra_ap_profile-0.0.288",
-        sha256 = "08274a0adbf8255f8b2672302452e31bbb2ed4d38324da9c72a7bf9cf1428483",
+        name = "vendor_ts__ra_ap_paths-0.0.301",
+        sha256 = "d4991f3d57fac0def7822bebfeb159c8d7b58c824bf82044b765c54f2c0971e2",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_profile/0.0.288/download"],
-        strip_prefix = "ra_ap_profile-0.0.288",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_profile-0.0.288.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_paths/0.0.301/download"],
+        strip_prefix = "ra_ap_paths-0.0.301",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_paths-0.0.301.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra_ap_project_model-0.0.288",
-        sha256 = "33deecb3724faf91f13b0f1b5115af7c4f5c9dc1dfbbf45f55261aa28f874838",
+        name = "vendor_ts__ra_ap_proc_macro_api-0.0.301",
+        sha256 = "45db9e2df587d56f0738afa89fb2c100ff7c1e9cbe49e07f6a8b62342832211b",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_project_model/0.0.288/download"],
-        strip_prefix = "ra_ap_project_model-0.0.288",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_project_model-0.0.288.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_proc_macro_api/0.0.301/download"],
+        strip_prefix = "ra_ap_proc_macro_api-0.0.301",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_proc_macro_api-0.0.301.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra_ap_query-group-macro-0.0.288",
-        sha256 = "5fdefdc9c8d6fd7d85ac572649378e83266262e09400bfdb7c8a7407d3cc2a3e",
+        name = "vendor_ts__ra_ap_profile-0.0.301",
+        sha256 = "19981637b8ee4160e228c815a7fef3944b5c0555d6af41a931be92d68978bc6c",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_query-group-macro/0.0.288/download"],
-        strip_prefix = "ra_ap_query-group-macro-0.0.288",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_query-group-macro-0.0.288.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_profile/0.0.301/download"],
+        strip_prefix = "ra_ap_profile-0.0.301",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_profile-0.0.301.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra_ap_span-0.0.288",
-        sha256 = "c20071c89e1f7dd63c803130634f4bb6ce7783dc0e7ff90839d1d0f4e625b7a8",
+        name = "vendor_ts__ra_ap_project_model-0.0.301",
+        sha256 = "5bda0769fd6ca949fdd5917acb68ddc2c143745614ddd94ef38b376838611cf8",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_span/0.0.288/download"],
-        strip_prefix = "ra_ap_span-0.0.288",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_span-0.0.288.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_project_model/0.0.301/download"],
+        strip_prefix = "ra_ap_project_model-0.0.301",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_project_model-0.0.301.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra_ap_stdx-0.0.288",
-        sha256 = "552df390b26624eca7936aea1dbbb3786d7a12477e26ef917ffabba19f75ad44",
+        name = "vendor_ts__ra_ap_query-group-macro-0.0.301",
+        sha256 = "5f182a4b05f004eabaa83250a5de7ea3a13a92c88f3cbe98bfa1880cd9fbce0a",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_stdx/0.0.288/download"],
-        strip_prefix = "ra_ap_stdx-0.0.288",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_stdx-0.0.288.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_query-group-macro/0.0.301/download"],
+        strip_prefix = "ra_ap_query-group-macro-0.0.301",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_query-group-macro-0.0.301.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra_ap_syntax-0.0.288",
-        sha256 = "a78db1a9966c0fa05446b8185da35a325680741119366c6246e4a9800f29143a",
+        name = "vendor_ts__ra_ap_span-0.0.301",
+        sha256 = "ca6f9fa2de07f5cccf431674b90e82c1fe1ea2339db3b3869eec44d135de09a4",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_syntax/0.0.288/download"],
-        strip_prefix = "ra_ap_syntax-0.0.288",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_syntax-0.0.288.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_span/0.0.301/download"],
+        strip_prefix = "ra_ap_span-0.0.301",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_span-0.0.301.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra_ap_syntax-bridge-0.0.288",
-        sha256 = "e69ef7fad8598d5c9f14a375d56ec12200fa927bc805b600af419611f4642fdb",
+        name = "vendor_ts__ra_ap_stdx-0.0.301",
+        sha256 = "aa770adb32896fcba934b464ac3bd179163ba2b0766e275eed5b4e262e08492b",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_syntax-bridge/0.0.288/download"],
-        strip_prefix = "ra_ap_syntax-bridge-0.0.288",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_syntax-bridge-0.0.288.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_stdx/0.0.301/download"],
+        strip_prefix = "ra_ap_stdx-0.0.301",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_stdx-0.0.301.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra_ap_toolchain-0.0.288",
-        sha256 = "628f3f190def67b1116d8bdd6ec4f6f206fada2c93b84ba71086d60c63429282",
+        name = "vendor_ts__ra_ap_syntax-0.0.301",
+        sha256 = "6e9e1393281ad5c635239d353ed3cfbf28c8d0af03d0c61a3b24b31d1143b17f",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_toolchain/0.0.288/download"],
-        strip_prefix = "ra_ap_toolchain-0.0.288",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_toolchain-0.0.288.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_syntax/0.0.301/download"],
+        strip_prefix = "ra_ap_syntax-0.0.301",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_syntax-0.0.301.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra_ap_tt-0.0.288",
-        sha256 = "e050f4ad13df59e90e38332860304a3e85ff2fa8d4585b8cc44fc982923c82b1",
+        name = "vendor_ts__ra_ap_syntax-bridge-0.0.301",
+        sha256 = "684e6ff1008ee5340335888f0453d94bb38950f110059a51f1818c7f6a56a807",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_tt/0.0.288/download"],
-        strip_prefix = "ra_ap_tt-0.0.288",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_tt-0.0.288.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_syntax-bridge/0.0.301/download"],
+        strip_prefix = "ra_ap_syntax-bridge-0.0.301",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_syntax-bridge-0.0.301.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra_ap_vfs-0.0.288",
-        sha256 = "62082190f0b3551e4d941bcaaac51a7c39c85b2e193bcc50d0807e1701da4083",
+        name = "vendor_ts__ra_ap_toolchain-0.0.301",
+        sha256 = "61969c5f72af03a9837e077c2d939d87a5c863623725c461777c352664a3bb03",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_vfs/0.0.288/download"],
-        strip_prefix = "ra_ap_vfs-0.0.288",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_vfs-0.0.288.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_toolchain/0.0.301/download"],
+        strip_prefix = "ra_ap_toolchain-0.0.301",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_toolchain-0.0.301.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra_ap_vfs-notify-0.0.288",
-        sha256 = "efd7cfa1095b81bd1994ab70e5543c97a8733987eb0ddf390cf3ad58d4e2dc57",
+        name = "vendor_ts__ra_ap_tt-0.0.301",
+        sha256 = "fb87c7b35572c18a580ea811e970b94875fad5ac7cfa8644266a59081044f959",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_vfs-notify/0.0.288/download"],
-        strip_prefix = "ra_ap_vfs-notify-0.0.288",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_vfs-notify-0.0.288.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_tt/0.0.301/download"],
+        strip_prefix = "ra_ap_tt-0.0.301",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_tt-0.0.301.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__rand-0.9.1",
-        sha256 = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97",
+        name = "vendor_ts__ra_ap_vfs-0.0.301",
+        sha256 = "6c174d6b9b7a7f54687df7e00c3e75ed6f082a7943a9afb1d54f33c0c12773de",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/rand/0.9.1/download"],
-        strip_prefix = "rand-0.9.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rand-0.9.1.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_vfs/0.0.301/download"],
+        strip_prefix = "ra_ap_vfs-0.0.301",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_vfs-0.0.301.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__ra_ap_vfs-notify-0.0.301",
+        sha256 = "04f6fce8d47c7ce9b8f2cd0e5a55f8fc4878d6043e61f46cde4391d3a5c6086f",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_vfs-notify/0.0.301/download"],
+        strip_prefix = "ra_ap_vfs-notify-0.0.301",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_vfs-notify-0.0.301.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__rand-0.9.2",
+        sha256 = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/rand/0.9.2/download"],
+        strip_prefix = "rand-0.9.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rand-0.9.2.bazel"),
     )
 
     maybe(
@@ -2621,42 +2652,42 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__rand_core-0.9.2",
-        sha256 = "7a509b1a2ffbe92afab0e55c8fd99dea1c280e8171bd2d88682bb20bc41cbc2c",
+        name = "vendor_ts__rand_core-0.9.3",
+        sha256 = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/rand_core/0.9.2/download"],
-        strip_prefix = "rand_core-0.9.2",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rand_core-0.9.2.bazel"),
+        urls = ["https://static.crates.io/crates/rand_core/0.9.3/download"],
+        strip_prefix = "rand_core-0.9.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rand_core-0.9.3.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__rayon-1.10.0",
-        sha256 = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa",
+        name = "vendor_ts__rayon-1.11.0",
+        sha256 = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/rayon/1.10.0/download"],
-        strip_prefix = "rayon-1.10.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rayon-1.10.0.bazel"),
+        urls = ["https://static.crates.io/crates/rayon/1.11.0/download"],
+        strip_prefix = "rayon-1.11.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rayon-1.11.0.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__rayon-core-1.12.1",
-        sha256 = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2",
+        name = "vendor_ts__rayon-core-1.13.0",
+        sha256 = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/rayon-core/1.12.1/download"],
-        strip_prefix = "rayon-core-1.12.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rayon-core-1.12.1.bazel"),
+        urls = ["https://static.crates.io/crates/rayon-core/1.13.0/download"],
+        strip_prefix = "rayon-core-1.13.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rayon-core-1.13.0.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__redox_syscall-0.5.8",
-        sha256 = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834",
+        name = "vendor_ts__redox_syscall-0.5.17",
+        sha256 = "5407465600fb0548f1442edf71dd20683c6ed326200ace4b1ef0763521bb3b77",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/redox_syscall/0.5.8/download"],
-        strip_prefix = "redox_syscall-0.5.8",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.redox_syscall-0.5.8.bazel"),
+        urls = ["https://static.crates.io/crates/redox_syscall/0.5.17/download"],
+        strip_prefix = "redox_syscall-0.5.17",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.redox_syscall-0.5.17.bazel"),
     )
 
     maybe(
@@ -2681,52 +2712,32 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__regex-1.11.1",
-        sha256 = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191",
+        name = "vendor_ts__regex-1.11.3",
+        sha256 = "8b5288124840bee7b386bc413c487869b360b2b4ec421ea56425128692f2a82c",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/regex/1.11.1/download"],
-        strip_prefix = "regex-1.11.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.regex-1.11.1.bazel"),
+        urls = ["https://static.crates.io/crates/regex/1.11.3/download"],
+        strip_prefix = "regex-1.11.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.regex-1.11.3.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__regex-automata-0.1.10",
-        sha256 = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132",
+        name = "vendor_ts__regex-automata-0.4.11",
+        sha256 = "833eb9ce86d40ef33cb1306d8accf7bc8ec2bfea4355cbdebb3df68b40925cad",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/regex-automata/0.1.10/download"],
-        strip_prefix = "regex-automata-0.1.10",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.regex-automata-0.1.10.bazel"),
+        urls = ["https://static.crates.io/crates/regex-automata/0.4.11/download"],
+        strip_prefix = "regex-automata-0.4.11",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.regex-automata-0.4.11.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__regex-automata-0.4.9",
-        sha256 = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908",
+        name = "vendor_ts__regex-syntax-0.8.6",
+        sha256 = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/regex-automata/0.4.9/download"],
-        strip_prefix = "regex-automata-0.4.9",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.regex-automata-0.4.9.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__regex-syntax-0.6.29",
-        sha256 = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/regex-syntax/0.6.29/download"],
-        strip_prefix = "regex-syntax-0.6.29",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.regex-syntax-0.6.29.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__regex-syntax-0.8.5",
-        sha256 = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/regex-syntax/0.8.5/download"],
-        strip_prefix = "regex-syntax-0.8.5",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.regex-syntax-0.8.5.bazel"),
+        urls = ["https://static.crates.io/crates/regex-syntax/0.8.6/download"],
+        strip_prefix = "regex-syntax-0.8.6",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.regex-syntax-0.8.6.bazel"),
     )
 
     maybe(
@@ -2761,32 +2772,22 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__rustc-literal-escaper-0.0.2",
-        sha256 = "0041b6238913c41fe704213a4a9329e2f685a156d1781998128b4149c230ad04",
+        name = "vendor_ts__rustc-literal-escaper-0.0.4",
+        sha256 = "ab03008eb631b703dd16978282ae36c73282e7922fe101a4bd072a40ecea7b8b",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/rustc-literal-escaper/0.0.2/download"],
-        strip_prefix = "rustc-literal-escaper-0.0.2",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rustc-literal-escaper-0.0.2.bazel"),
+        urls = ["https://static.crates.io/crates/rustc-literal-escaper/0.0.4/download"],
+        strip_prefix = "rustc-literal-escaper-0.0.4",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rustc-literal-escaper-0.0.4.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__rustc-literal-escaper-0.0.3",
-        sha256 = "78744cd17f5d01c75b709e49807d1363e02a940ccee2e9e72435843fdb0d076e",
+        name = "vendor_ts__rustc-stable-hash-0.1.2",
+        sha256 = "781442f29170c5c93b7185ad559492601acdc71d5bb0706f5868094f45cfcd08",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/rustc-literal-escaper/0.0.3/download"],
-        strip_prefix = "rustc-literal-escaper-0.0.3",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rustc-literal-escaper-0.0.3.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__rustc-stable-hash-0.1.1",
-        sha256 = "2febf9acc5ee5e99d1ad0afcdbccc02d87aa3f857a1f01f825b80eacf8edfcd1",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/rustc-stable-hash/0.1.1/download"],
-        strip_prefix = "rustc-stable-hash-0.1.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rustc-stable-hash-0.1.1.bazel"),
+        urls = ["https://static.crates.io/crates/rustc-stable-hash/0.1.2/download"],
+        strip_prefix = "rustc-stable-hash-0.1.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rustc-stable-hash-0.1.2.bazel"),
     )
 
     maybe(
@@ -2801,42 +2802,52 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__ryu-1.0.19",
-        sha256 = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd",
+        name = "vendor_ts__rustversion-1.0.22",
+        sha256 = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ryu/1.0.19/download"],
-        strip_prefix = "ryu-1.0.19",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ryu-1.0.19.bazel"),
+        urls = ["https://static.crates.io/crates/rustversion/1.0.22/download"],
+        strip_prefix = "rustversion-1.0.22",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rustversion-1.0.22.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__salsa-0.22.0",
-        sha256 = "c8fff508e3d6ef42a32607f7538e17171a877a12015e32036f46e99d00c95781",
+        name = "vendor_ts__ryu-1.0.20",
+        sha256 = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/salsa/0.22.0/download"],
-        strip_prefix = "salsa-0.22.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.salsa-0.22.0.bazel"),
+        urls = ["https://static.crates.io/crates/ryu/1.0.20/download"],
+        strip_prefix = "ryu-1.0.20",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ryu-1.0.20.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__salsa-macro-rules-0.22.0",
-        sha256 = "8ea72b3c06f2ce6350fe3a0eeb7aaaf842d1d8352b706973c19c4f02e298a87c",
+        name = "vendor_ts__salsa-0.23.0",
+        sha256 = "2e235afdb8e510f38a07138fbe5a0b64691894358a9c0cbd813b1aade110efc9",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/salsa-macro-rules/0.22.0/download"],
-        strip_prefix = "salsa-macro-rules-0.22.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.salsa-macro-rules-0.22.0.bazel"),
+        urls = ["https://static.crates.io/crates/salsa/0.23.0/download"],
+        strip_prefix = "salsa-0.23.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.salsa-0.23.0.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__salsa-macros-0.22.0",
-        sha256 = "0ce92025bc160b27814a207cb78d680973af17f863c7f4fc56cf3a535e22f378",
+        name = "vendor_ts__salsa-macro-rules-0.23.0",
+        sha256 = "2edb86a7e9c91f6d30c9ce054312721dbe773a162db27bbfae834d16177b30ce",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/salsa-macros/0.22.0/download"],
-        strip_prefix = "salsa-macros-0.22.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.salsa-macros-0.22.0.bazel"),
+        urls = ["https://static.crates.io/crates/salsa-macro-rules/0.23.0/download"],
+        strip_prefix = "salsa-macro-rules-0.23.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.salsa-macro-rules-0.23.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__salsa-macros-0.23.0",
+        sha256 = "d0778d6e209051bc4e75acfe83bcd7848601ec3dbe9c3dbb982829020e9128af",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/salsa-macros/0.23.0/download"],
+        strip_prefix = "salsa-macros-0.23.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.salsa-macros-0.23.0.bazel"),
     )
 
     maybe(
@@ -2859,6 +2870,16 @@ def crate_repositories():
         build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.schemars-0.9.0.bazel"),
     )
 
+    maybe(
+        http_archive,
+        name = "vendor_ts__schemars-1.0.4",
+        sha256 = "82d20c4491bc164fa2f6c5d44565947a52ad80b9505d8e36f8d54c27c739fcd0",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/schemars/1.0.4/download"],
+        strip_prefix = "schemars-1.0.4",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.schemars-1.0.4.bazel"),
+    )
+
     maybe(
         http_archive,
         name = "vendor_ts__scoped-tls-1.0.1",
@@ -2879,6 +2900,16 @@ def crate_repositories():
         build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.scopeguard-1.2.0.bazel"),
     )
 
+    maybe(
+        http_archive,
+        name = "vendor_ts__seize-0.5.0",
+        sha256 = "e4b8d813387d566f627f3ea1b914c068aac94c40ae27ec43f5f33bde65abefe7",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/seize/0.5.0/download"],
+        strip_prefix = "seize-0.5.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.seize-0.5.0.bazel"),
+    )
+
     maybe(
         http_archive,
         name = "vendor_ts__semver-1.0.26",
@@ -2891,22 +2922,22 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__serde-1.0.219",
-        sha256 = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6",
+        name = "vendor_ts__serde-1.0.228",
+        sha256 = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/serde/1.0.219/download"],
-        strip_prefix = "serde-1.0.219",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.serde-1.0.219.bazel"),
+        urls = ["https://static.crates.io/crates/serde/1.0.228/download"],
+        strip_prefix = "serde-1.0.228",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.serde-1.0.228.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__serde-untagged-0.1.7",
-        sha256 = "299d9c19d7d466db4ab10addd5703e4c615dec2a5a16dbbafe191045e87ee66e",
+        name = "vendor_ts__serde-untagged-0.1.8",
+        sha256 = "34836a629bcbc6f1afdf0907a744870039b1e14c0561cb26094fa683b158eff3",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/serde-untagged/0.1.7/download"],
-        strip_prefix = "serde-untagged-0.1.7",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.serde-untagged-0.1.7.bazel"),
+        urls = ["https://static.crates.io/crates/serde-untagged/0.1.8/download"],
+        strip_prefix = "serde-untagged-0.1.8",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.serde-untagged-0.1.8.bazel"),
     )
 
     maybe(
@@ -2921,22 +2952,32 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__serde_derive-1.0.219",
-        sha256 = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00",
+        name = "vendor_ts__serde_core-1.0.228",
+        sha256 = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/serde_derive/1.0.219/download"],
-        strip_prefix = "serde_derive-1.0.219",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.serde_derive-1.0.219.bazel"),
+        urls = ["https://static.crates.io/crates/serde_core/1.0.228/download"],
+        strip_prefix = "serde_core-1.0.228",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.serde_core-1.0.228.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__serde_json-1.0.140",
-        sha256 = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373",
+        name = "vendor_ts__serde_derive-1.0.228",
+        sha256 = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/serde_json/1.0.140/download"],
-        strip_prefix = "serde_json-1.0.140",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.serde_json-1.0.140.bazel"),
+        urls = ["https://static.crates.io/crates/serde_derive/1.0.228/download"],
+        strip_prefix = "serde_derive-1.0.228",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.serde_derive-1.0.228.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__serde_json-1.0.145",
+        sha256 = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/serde_json/1.0.145/download"],
+        strip_prefix = "serde_json-1.0.145",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.serde_json-1.0.145.bazel"),
     )
 
     maybe(
@@ -2951,22 +2992,32 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__serde_with-3.13.0",
-        sha256 = "bf65a400f8f66fb7b0552869ad70157166676db75ed8181f8104ea91cf9d0b42",
+        name = "vendor_ts__serde_spanned-1.0.2",
+        sha256 = "5417783452c2be558477e104686f7de5dae53dba813c28435e0e70f82d9b04ee",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/serde_with/3.13.0/download"],
-        strip_prefix = "serde_with-3.13.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.serde_with-3.13.0.bazel"),
+        urls = ["https://static.crates.io/crates/serde_spanned/1.0.2/download"],
+        strip_prefix = "serde_spanned-1.0.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.serde_spanned-1.0.2.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__serde_with_macros-3.13.0",
-        sha256 = "81679d9ed988d5e9a5e6531dc3f2c28efbd639cbd1dfb628df08edea6004da77",
+        name = "vendor_ts__serde_with-3.14.1",
+        sha256 = "c522100790450cf78eeac1507263d0a350d4d5b30df0c8e1fe051a10c22b376e",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/serde_with_macros/3.13.0/download"],
-        strip_prefix = "serde_with_macros-3.13.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.serde_with_macros-3.13.0.bazel"),
+        urls = ["https://static.crates.io/crates/serde_with/3.14.1/download"],
+        strip_prefix = "serde_with-3.14.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.serde_with-3.14.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__serde_with_macros-3.14.1",
+        sha256 = "327ada00f7d64abaac1e55a6911e90cf665aa051b9a561c7006c157f4633135e",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/serde_with_macros/3.14.1/download"],
+        strip_prefix = "serde_with_macros-3.14.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.serde_with_macros-3.14.1.bazel"),
     )
 
     maybe(
@@ -3051,22 +3102,32 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__syn-2.0.103",
-        sha256 = "e4307e30089d6fd6aff212f2da3a1f9e32f3223b1f010fb09b7c95f90f3ca1e8",
+        name = "vendor_ts__syn-2.0.106",
+        sha256 = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/syn/2.0.103/download"],
-        strip_prefix = "syn-2.0.103",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.syn-2.0.103.bazel"),
+        urls = ["https://static.crates.io/crates/syn/2.0.106/download"],
+        strip_prefix = "syn-2.0.106",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.syn-2.0.106.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__synstructure-0.13.1",
-        sha256 = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971",
+        name = "vendor_ts__synstructure-0.13.2",
+        sha256 = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/synstructure/0.13.1/download"],
-        strip_prefix = "synstructure-0.13.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.synstructure-0.13.1.bazel"),
+        urls = ["https://static.crates.io/crates/synstructure/0.13.2/download"],
+        strip_prefix = "synstructure-0.13.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.synstructure-0.13.2.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__temp-dir-0.1.16",
+        sha256 = "83176759e9416cf81ee66cb6508dbfe9c96f20b8b56265a39917551c23c70964",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/temp-dir/0.1.16/download"],
+        strip_prefix = "temp-dir-0.1.16",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.temp-dir-0.1.16.bazel"),
     )
 
     maybe(
@@ -3091,82 +3152,62 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__thiserror-1.0.69",
-        sha256 = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52",
+        name = "vendor_ts__thiserror-2.0.16",
+        sha256 = "3467d614147380f2e4e374161426ff399c91084acd2363eaf549172b3d5e60c0",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/thiserror/1.0.69/download"],
-        strip_prefix = "thiserror-1.0.69",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.thiserror-1.0.69.bazel"),
+        urls = ["https://static.crates.io/crates/thiserror/2.0.16/download"],
+        strip_prefix = "thiserror-2.0.16",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.thiserror-2.0.16.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__thiserror-2.0.12",
-        sha256 = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708",
+        name = "vendor_ts__thiserror-impl-2.0.16",
+        sha256 = "6c5e1be1c48b9172ee610da68fd9cd2770e7a4056cb3fc98710ee6906f0c7960",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/thiserror/2.0.12/download"],
-        strip_prefix = "thiserror-2.0.12",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.thiserror-2.0.12.bazel"),
+        urls = ["https://static.crates.io/crates/thiserror-impl/2.0.16/download"],
+        strip_prefix = "thiserror-impl-2.0.16",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.thiserror-impl-2.0.16.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__thiserror-impl-1.0.69",
-        sha256 = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1",
+        name = "vendor_ts__thread_local-1.1.9",
+        sha256 = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/thiserror-impl/1.0.69/download"],
-        strip_prefix = "thiserror-impl-1.0.69",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.thiserror-impl-1.0.69.bazel"),
+        urls = ["https://static.crates.io/crates/thread_local/1.1.9/download"],
+        strip_prefix = "thread_local-1.1.9",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.thread_local-1.1.9.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__thiserror-impl-2.0.12",
-        sha256 = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d",
+        name = "vendor_ts__time-0.3.43",
+        sha256 = "83bde6f1ec10e72d583d91623c939f623002284ef622b87de38cfd546cbf2031",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/thiserror-impl/2.0.12/download"],
-        strip_prefix = "thiserror-impl-2.0.12",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.thiserror-impl-2.0.12.bazel"),
+        urls = ["https://static.crates.io/crates/time/0.3.43/download"],
+        strip_prefix = "time-0.3.43",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.time-0.3.43.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__thread_local-1.1.8",
-        sha256 = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c",
+        name = "vendor_ts__time-core-0.1.6",
+        sha256 = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/thread_local/1.1.8/download"],
-        strip_prefix = "thread_local-1.1.8",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.thread_local-1.1.8.bazel"),
+        urls = ["https://static.crates.io/crates/time-core/0.1.6/download"],
+        strip_prefix = "time-core-0.1.6",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.time-core-0.1.6.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__time-0.3.37",
-        sha256 = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21",
+        name = "vendor_ts__time-macros-0.2.24",
+        sha256 = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/time/0.3.37/download"],
-        strip_prefix = "time-0.3.37",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.time-0.3.37.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__time-core-0.1.2",
-        sha256 = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/time-core/0.1.2/download"],
-        strip_prefix = "time-core-0.1.2",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.time-core-0.1.2.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__time-macros-0.2.19",
-        sha256 = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/time-macros/0.2.19/download"],
-        strip_prefix = "time-macros-0.2.19",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.time-macros-0.2.19.bazel"),
+        urls = ["https://static.crates.io/crates/time-macros/0.2.24/download"],
+        strip_prefix = "time-macros-0.2.24",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.time-macros-0.2.24.bazel"),
     )
 
     maybe(
@@ -3189,6 +3230,16 @@ def crate_repositories():
         build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.toml-0.8.23.bazel"),
     )
 
+    maybe(
+        http_archive,
+        name = "vendor_ts__toml-0.9.7",
+        sha256 = "00e5e5d9bf2475ac9d4f0d9edab68cc573dc2fd644b0dba36b0c30a92dd9eaa0",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/toml/0.9.7/download"],
+        strip_prefix = "toml-0.9.7",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.toml-0.9.7.bazel"),
+    )
+
     maybe(
         http_archive,
         name = "vendor_ts__toml_datetime-0.6.11",
@@ -3199,6 +3250,16 @@ def crate_repositories():
         build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.toml_datetime-0.6.11.bazel"),
     )
 
+    maybe(
+        http_archive,
+        name = "vendor_ts__toml_datetime-0.7.2",
+        sha256 = "32f1085dec27c2b6632b04c80b3bb1b4300d6495d1e129693bdda7d91e72eec1",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/toml_datetime/0.7.2/download"],
+        strip_prefix = "toml_datetime-0.7.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.toml_datetime-0.7.2.bazel"),
+    )
+
     maybe(
         http_archive,
         name = "vendor_ts__toml_edit-0.22.27",
@@ -3209,6 +3270,16 @@ def crate_repositories():
         build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.toml_edit-0.22.27.bazel"),
     )
 
+    maybe(
+        http_archive,
+        name = "vendor_ts__toml_parser-1.0.3",
+        sha256 = "4cf893c33be71572e0e9aa6dd15e6677937abd686b066eac3f8cd3531688a627",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/toml_parser/1.0.3/download"],
+        strip_prefix = "toml_parser-1.0.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.toml_parser-1.0.3.bazel"),
+    )
+
     maybe(
         http_archive,
         name = "vendor_ts__toml_write-0.1.2",
@@ -3219,6 +3290,16 @@ def crate_repositories():
         build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.toml_write-0.1.2.bazel"),
     )
 
+    maybe(
+        http_archive,
+        name = "vendor_ts__toml_writer-1.0.3",
+        sha256 = "d163a63c116ce562a22cda521fcc4d79152e7aba014456fb5eb442f6d6a10109",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/toml_writer/1.0.3/download"],
+        strip_prefix = "toml_writer-1.0.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.toml_writer-1.0.3.bazel"),
+    )
+
     maybe(
         http_archive,
         name = "vendor_ts__tracing-0.1.41",
@@ -3231,22 +3312,22 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__tracing-attributes-0.1.28",
-        sha256 = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d",
+        name = "vendor_ts__tracing-attributes-0.1.30",
+        sha256 = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/tracing-attributes/0.1.28/download"],
-        strip_prefix = "tracing-attributes-0.1.28",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tracing-attributes-0.1.28.bazel"),
+        urls = ["https://static.crates.io/crates/tracing-attributes/0.1.30/download"],
+        strip_prefix = "tracing-attributes-0.1.30",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tracing-attributes-0.1.30.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__tracing-core-0.1.33",
-        sha256 = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c",
+        name = "vendor_ts__tracing-core-0.1.34",
+        sha256 = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/tracing-core/0.1.33/download"],
-        strip_prefix = "tracing-core-0.1.33",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tracing-core-0.1.33.bazel"),
+        urls = ["https://static.crates.io/crates/tracing-core/0.1.34/download"],
+        strip_prefix = "tracing-core-0.1.34",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tracing-core-0.1.34.bazel"),
     )
 
     maybe(
@@ -3271,32 +3352,32 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__tracing-subscriber-0.3.19",
-        sha256 = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008",
+        name = "vendor_ts__tracing-subscriber-0.3.20",
+        sha256 = "2054a14f5307d601f88daf0553e1cbf472acc4f2c51afab632431cdcd72124d5",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/tracing-subscriber/0.3.19/download"],
-        strip_prefix = "tracing-subscriber-0.3.19",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tracing-subscriber-0.3.19.bazel"),
+        urls = ["https://static.crates.io/crates/tracing-subscriber/0.3.20/download"],
+        strip_prefix = "tracing-subscriber-0.3.20",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tracing-subscriber-0.3.20.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__tree-sitter-0.24.6",
-        sha256 = "5f2434c86ba59ed15af56039cc5bf1acf8ba76ce301e32ef08827388ef285ec5",
+        name = "vendor_ts__tree-sitter-0.25.9",
+        sha256 = "ccd2a058a86cfece0bf96f7cce1021efef9c8ed0e892ab74639173e5ed7a34fa",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/tree-sitter/0.24.6/download"],
-        strip_prefix = "tree-sitter-0.24.6",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tree-sitter-0.24.6.bazel"),
+        urls = ["https://static.crates.io/crates/tree-sitter/0.25.9/download"],
+        strip_prefix = "tree-sitter-0.25.9",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tree-sitter-0.25.9.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__tree-sitter-embedded-template-0.23.2",
-        sha256 = "790063ef14e5b67556abc0b3be0ed863fb41d65ee791cf8c0b20eb42a1fa46af",
+        name = "vendor_ts__tree-sitter-embedded-template-0.25.0",
+        sha256 = "833d528e8fcb4e49ddb04d4d6450ddb8ac08f282a58fec94ce981c9c5dbf7e3a",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/tree-sitter-embedded-template/0.23.2/download"],
-        strip_prefix = "tree-sitter-embedded-template-0.23.2",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tree-sitter-embedded-template-0.23.2.bazel"),
+        urls = ["https://static.crates.io/crates/tree-sitter-embedded-template/0.25.0/download"],
+        strip_prefix = "tree-sitter-embedded-template-0.25.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tree-sitter-embedded-template-0.25.0.bazel"),
     )
 
     maybe(
@@ -3311,12 +3392,12 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__tree-sitter-language-0.1.3",
-        sha256 = "c199356c799a8945965bb5f2c55b2ad9d9aa7c4b4f6e587fe9dea0bc715e5f9c",
+        name = "vendor_ts__tree-sitter-language-0.1.5",
+        sha256 = "c4013970217383f67b18aef68f6fb2e8d409bc5755227092d32efb0422ba24b8",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/tree-sitter-language/0.1.3/download"],
-        strip_prefix = "tree-sitter-language-0.1.3",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tree-sitter-language-0.1.3.bazel"),
+        urls = ["https://static.crates.io/crates/tree-sitter-language/0.1.5/download"],
+        strip_prefix = "tree-sitter-language-0.1.5",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tree-sitter-language-0.1.5.bazel"),
     )
 
     maybe(
@@ -3391,12 +3472,12 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__unicode-ident-1.0.17",
-        sha256 = "00e2473a93778eb0bad35909dff6a10d28e63f792f16ed15e404fca9d5eeedbe",
+        name = "vendor_ts__unicode-ident-1.0.19",
+        sha256 = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/unicode-ident/1.0.17/download"],
-        strip_prefix = "unicode-ident-1.0.17",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.unicode-ident-1.0.17.bazel"),
+        urls = ["https://static.crates.io/crates/unicode-ident/1.0.19/download"],
+        strip_prefix = "unicode-ident-1.0.19",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.unicode-ident-1.0.19.bazel"),
     )
 
     maybe(
@@ -3431,12 +3512,12 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__url-2.5.4",
-        sha256 = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60",
+        name = "vendor_ts__url-2.5.7",
+        sha256 = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/url/2.5.4/download"],
-        strip_prefix = "url-2.5.4",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.url-2.5.4.bazel"),
+        urls = ["https://static.crates.io/crates/url/2.5.7/download"],
+        strip_prefix = "url-2.5.7",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.url-2.5.7.bazel"),
     )
 
     maybe(
@@ -3461,12 +3542,12 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__valuable-0.1.0",
-        sha256 = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d",
+        name = "vendor_ts__valuable-0.1.1",
+        sha256 = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/valuable/0.1.0/download"],
-        strip_prefix = "valuable-0.1.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.valuable-0.1.0.bazel"),
+        urls = ["https://static.crates.io/crates/valuable/0.1.1/download"],
+        strip_prefix = "valuable-0.1.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.valuable-0.1.1.bazel"),
     )
 
     maybe(
@@ -3491,142 +3572,162 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__wasi-0.11.0-wasi-snapshot-preview1",
-        sha256 = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423",
+        name = "vendor_ts__wasi-0.11.1-wasi-snapshot-preview1",
+        sha256 = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/wasi/0.11.0+wasi-snapshot-preview1/download"],
-        strip_prefix = "wasi-0.11.0+wasi-snapshot-preview1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.wasi-0.11.0+wasi-snapshot-preview1.bazel"),
+        urls = ["https://static.crates.io/crates/wasi/0.11.1+wasi-snapshot-preview1/download"],
+        strip_prefix = "wasi-0.11.1+wasi-snapshot-preview1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.wasi-0.11.1+wasi-snapshot-preview1.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__wasi-0.13.3-wasi-0.2.2",
-        sha256 = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2",
+        name = "vendor_ts__wasi-0.14.5-wasi-0.2.4",
+        sha256 = "a4494f6290a82f5fe584817a676a34b9d6763e8d9d18204009fb31dceca98fd4",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/wasi/0.13.3+wasi-0.2.2/download"],
-        strip_prefix = "wasi-0.13.3+wasi-0.2.2",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.wasi-0.13.3+wasi-0.2.2.bazel"),
+        urls = ["https://static.crates.io/crates/wasi/0.14.5+wasi-0.2.4/download"],
+        strip_prefix = "wasi-0.14.5+wasi-0.2.4",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.wasi-0.14.5+wasi-0.2.4.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__wasm-bindgen-0.2.99",
-        sha256 = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396",
+        name = "vendor_ts__wasip2-1.0.0-wasi-0.2.4",
+        sha256 = "03fa2761397e5bd52002cd7e73110c71af2109aca4e521a9f40473fe685b0a24",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/wasm-bindgen/0.2.99/download"],
-        strip_prefix = "wasm-bindgen-0.2.99",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.wasm-bindgen-0.2.99.bazel"),
+        urls = ["https://static.crates.io/crates/wasip2/1.0.0+wasi-0.2.4/download"],
+        strip_prefix = "wasip2-1.0.0+wasi-0.2.4",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.wasip2-1.0.0+wasi-0.2.4.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__wasm-bindgen-backend-0.2.99",
-        sha256 = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79",
+        name = "vendor_ts__wasm-bindgen-0.2.101",
+        sha256 = "7e14915cadd45b529bb8d1f343c4ed0ac1de926144b746e2710f9cd05df6603b",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/wasm-bindgen-backend/0.2.99/download"],
-        strip_prefix = "wasm-bindgen-backend-0.2.99",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.wasm-bindgen-backend-0.2.99.bazel"),
+        urls = ["https://static.crates.io/crates/wasm-bindgen/0.2.101/download"],
+        strip_prefix = "wasm-bindgen-0.2.101",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.wasm-bindgen-0.2.101.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__wasm-bindgen-macro-0.2.99",
-        sha256 = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe",
+        name = "vendor_ts__wasm-bindgen-backend-0.2.101",
+        sha256 = "e28d1ba982ca7923fd01448d5c30c6864d0a14109560296a162f80f305fb93bb",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/wasm-bindgen-macro/0.2.99/download"],
-        strip_prefix = "wasm-bindgen-macro-0.2.99",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.wasm-bindgen-macro-0.2.99.bazel"),
+        urls = ["https://static.crates.io/crates/wasm-bindgen-backend/0.2.101/download"],
+        strip_prefix = "wasm-bindgen-backend-0.2.101",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.wasm-bindgen-backend-0.2.101.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__wasm-bindgen-macro-support-0.2.99",
-        sha256 = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2",
+        name = "vendor_ts__wasm-bindgen-macro-0.2.101",
+        sha256 = "7c3d463ae3eff775b0c45df9da45d68837702ac35af998361e2c84e7c5ec1b0d",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/wasm-bindgen-macro-support/0.2.99/download"],
-        strip_prefix = "wasm-bindgen-macro-support-0.2.99",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.wasm-bindgen-macro-support-0.2.99.bazel"),
+        urls = ["https://static.crates.io/crates/wasm-bindgen-macro/0.2.101/download"],
+        strip_prefix = "wasm-bindgen-macro-0.2.101",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.wasm-bindgen-macro-0.2.101.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__wasm-bindgen-shared-0.2.99",
-        sha256 = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6",
+        name = "vendor_ts__wasm-bindgen-macro-support-0.2.101",
+        sha256 = "7bb4ce89b08211f923caf51d527662b75bdc9c9c7aab40f86dcb9fb85ac552aa",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/wasm-bindgen-shared/0.2.99/download"],
-        strip_prefix = "wasm-bindgen-shared-0.2.99",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.wasm-bindgen-shared-0.2.99.bazel"),
+        urls = ["https://static.crates.io/crates/wasm-bindgen-macro-support/0.2.101/download"],
+        strip_prefix = "wasm-bindgen-macro-support-0.2.101",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.wasm-bindgen-macro-support-0.2.101.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__winapi-0.3.9",
-        sha256 = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419",
+        name = "vendor_ts__wasm-bindgen-shared-0.2.101",
+        sha256 = "f143854a3b13752c6950862c906306adb27c7e839f7414cec8fea35beab624c1",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/winapi/0.3.9/download"],
-        strip_prefix = "winapi-0.3.9",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.winapi-0.3.9.bazel"),
+        urls = ["https://static.crates.io/crates/wasm-bindgen-shared/0.2.101/download"],
+        strip_prefix = "wasm-bindgen-shared-0.2.101",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.wasm-bindgen-shared-0.2.101.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__winapi-i686-pc-windows-gnu-0.4.0",
-        sha256 = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6",
+        name = "vendor_ts__winapi-util-0.1.11",
+        sha256 = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/winapi-i686-pc-windows-gnu/0.4.0/download"],
-        strip_prefix = "winapi-i686-pc-windows-gnu-0.4.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.winapi-i686-pc-windows-gnu-0.4.0.bazel"),
+        urls = ["https://static.crates.io/crates/winapi-util/0.1.11/download"],
+        strip_prefix = "winapi-util-0.1.11",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.winapi-util-0.1.11.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__winapi-util-0.1.9",
-        sha256 = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb",
+        name = "vendor_ts__windows-core-0.61.2",
+        sha256 = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/winapi-util/0.1.9/download"],
-        strip_prefix = "winapi-util-0.1.9",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.winapi-util-0.1.9.bazel"),
+        urls = ["https://static.crates.io/crates/windows-core/0.61.2/download"],
+        strip_prefix = "windows-core-0.61.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-core-0.61.2.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__winapi-x86_64-pc-windows-gnu-0.4.0",
-        sha256 = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f",
+        name = "vendor_ts__windows-implement-0.60.0",
+        sha256 = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download"],
-        strip_prefix = "winapi-x86_64-pc-windows-gnu-0.4.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.winapi-x86_64-pc-windows-gnu-0.4.0.bazel"),
+        urls = ["https://static.crates.io/crates/windows-implement/0.60.0/download"],
+        strip_prefix = "windows-implement-0.60.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-implement-0.60.0.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__windows-core-0.52.0",
-        sha256 = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9",
+        name = "vendor_ts__windows-interface-0.59.1",
+        sha256 = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/windows-core/0.52.0/download"],
-        strip_prefix = "windows-core-0.52.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-core-0.52.0.bazel"),
+        urls = ["https://static.crates.io/crates/windows-interface/0.59.1/download"],
+        strip_prefix = "windows-interface-0.59.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-interface-0.59.1.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__windows-link-0.1.1",
-        sha256 = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38",
+        name = "vendor_ts__windows-link-0.1.3",
+        sha256 = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/windows-link/0.1.1/download"],
-        strip_prefix = "windows-link-0.1.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-link-0.1.1.bazel"),
+        urls = ["https://static.crates.io/crates/windows-link/0.1.3/download"],
+        strip_prefix = "windows-link-0.1.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-link-0.1.3.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__windows-sys-0.48.0",
-        sha256 = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9",
+        name = "vendor_ts__windows-link-0.2.0",
+        sha256 = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/windows-sys/0.48.0/download"],
-        strip_prefix = "windows-sys-0.48.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-sys-0.48.0.bazel"),
+        urls = ["https://static.crates.io/crates/windows-link/0.2.0/download"],
+        strip_prefix = "windows-link-0.2.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-link-0.2.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__windows-result-0.3.4",
+        sha256 = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows-result/0.3.4/download"],
+        strip_prefix = "windows-result-0.3.4",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-result-0.3.4.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__windows-strings-0.4.2",
+        sha256 = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows-strings/0.4.2/download"],
+        strip_prefix = "windows-strings-0.4.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-strings-0.4.2.bazel"),
     )
 
     maybe(
@@ -3661,12 +3762,12 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__windows-targets-0.48.5",
-        sha256 = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c",
+        name = "vendor_ts__windows-sys-0.61.0",
+        sha256 = "e201184e40b2ede64bc2ea34968b28e33622acdbbf37104f0e4a33f7abe657aa",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/windows-targets/0.48.5/download"],
-        strip_prefix = "windows-targets-0.48.5",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-targets-0.48.5.bazel"),
+        urls = ["https://static.crates.io/crates/windows-sys/0.61.0/download"],
+        strip_prefix = "windows-sys-0.61.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-sys-0.61.0.bazel"),
     )
 
     maybe(
@@ -3681,22 +3782,12 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__windows-targets-0.53.2",
-        sha256 = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef",
+        name = "vendor_ts__windows-targets-0.53.3",
+        sha256 = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/windows-targets/0.53.2/download"],
-        strip_prefix = "windows-targets-0.53.2",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-targets-0.53.2.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__windows_aarch64_gnullvm-0.48.5",
-        sha256 = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/windows_aarch64_gnullvm/0.48.5/download"],
-        strip_prefix = "windows_aarch64_gnullvm-0.48.5",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows_aarch64_gnullvm-0.48.5.bazel"),
+        urls = ["https://static.crates.io/crates/windows-targets/0.53.3/download"],
+        strip_prefix = "windows-targets-0.53.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-targets-0.53.3.bazel"),
     )
 
     maybe(
@@ -3719,16 +3810,6 @@ def crate_repositories():
         build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows_aarch64_gnullvm-0.53.0.bazel"),
     )
 
-    maybe(
-        http_archive,
-        name = "vendor_ts__windows_aarch64_msvc-0.48.5",
-        sha256 = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/windows_aarch64_msvc/0.48.5/download"],
-        strip_prefix = "windows_aarch64_msvc-0.48.5",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows_aarch64_msvc-0.48.5.bazel"),
-    )
-
     maybe(
         http_archive,
         name = "vendor_ts__windows_aarch64_msvc-0.52.6",
@@ -3749,16 +3830,6 @@ def crate_repositories():
         build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows_aarch64_msvc-0.53.0.bazel"),
     )
 
-    maybe(
-        http_archive,
-        name = "vendor_ts__windows_i686_gnu-0.48.5",
-        sha256 = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/windows_i686_gnu/0.48.5/download"],
-        strip_prefix = "windows_i686_gnu-0.48.5",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows_i686_gnu-0.48.5.bazel"),
-    )
-
     maybe(
         http_archive,
         name = "vendor_ts__windows_i686_gnu-0.52.6",
@@ -3799,16 +3870,6 @@ def crate_repositories():
         build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows_i686_gnullvm-0.53.0.bazel"),
     )
 
-    maybe(
-        http_archive,
-        name = "vendor_ts__windows_i686_msvc-0.48.5",
-        sha256 = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/windows_i686_msvc/0.48.5/download"],
-        strip_prefix = "windows_i686_msvc-0.48.5",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows_i686_msvc-0.48.5.bazel"),
-    )
-
     maybe(
         http_archive,
         name = "vendor_ts__windows_i686_msvc-0.52.6",
@@ -3829,16 +3890,6 @@ def crate_repositories():
         build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows_i686_msvc-0.53.0.bazel"),
     )
 
-    maybe(
-        http_archive,
-        name = "vendor_ts__windows_x86_64_gnu-0.48.5",
-        sha256 = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/windows_x86_64_gnu/0.48.5/download"],
-        strip_prefix = "windows_x86_64_gnu-0.48.5",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows_x86_64_gnu-0.48.5.bazel"),
-    )
-
     maybe(
         http_archive,
         name = "vendor_ts__windows_x86_64_gnu-0.52.6",
@@ -3859,16 +3910,6 @@ def crate_repositories():
         build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows_x86_64_gnu-0.53.0.bazel"),
     )
 
-    maybe(
-        http_archive,
-        name = "vendor_ts__windows_x86_64_gnullvm-0.48.5",
-        sha256 = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/windows_x86_64_gnullvm/0.48.5/download"],
-        strip_prefix = "windows_x86_64_gnullvm-0.48.5",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows_x86_64_gnullvm-0.48.5.bazel"),
-    )
-
     maybe(
         http_archive,
         name = "vendor_ts__windows_x86_64_gnullvm-0.52.6",
@@ -3889,16 +3930,6 @@ def crate_repositories():
         build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows_x86_64_gnullvm-0.53.0.bazel"),
     )
 
-    maybe(
-        http_archive,
-        name = "vendor_ts__windows_x86_64_msvc-0.48.5",
-        sha256 = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/windows_x86_64_msvc/0.48.5/download"],
-        strip_prefix = "windows_x86_64_msvc-0.48.5",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows_x86_64_msvc-0.48.5.bazel"),
-    )
-
     maybe(
         http_archive,
         name = "vendor_ts__windows_x86_64_msvc-0.52.6",
@@ -3921,22 +3952,22 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__winnow-0.7.11",
-        sha256 = "74c7b26e3480b707944fc872477815d29a8e429d2f93a1ce000f5fa84a15cbcd",
+        name = "vendor_ts__winnow-0.7.13",
+        sha256 = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/winnow/0.7.11/download"],
-        strip_prefix = "winnow-0.7.11",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.winnow-0.7.11.bazel"),
+        urls = ["https://static.crates.io/crates/winnow/0.7.13/download"],
+        strip_prefix = "winnow-0.7.13",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.winnow-0.7.13.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__wit-bindgen-rt-0.33.0",
-        sha256 = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c",
+        name = "vendor_ts__wit-bindgen-0.45.1",
+        sha256 = "5c573471f125075647d03df72e026074b7203790d41351cd6edc96f46bcccd36",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/wit-bindgen-rt/0.33.0/download"],
-        strip_prefix = "wit-bindgen-rt-0.33.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.wit-bindgen-rt-0.33.0.bazel"),
+        urls = ["https://static.crates.io/crates/wit-bindgen/0.45.1/download"],
+        strip_prefix = "wit-bindgen-0.45.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.wit-bindgen-0.45.1.bazel"),
     )
 
     maybe(
@@ -3981,42 +4012,22 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__zerocopy-0.7.35",
-        sha256 = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0",
+        name = "vendor_ts__zerocopy-0.8.27",
+        sha256 = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/zerocopy/0.7.35/download"],
-        strip_prefix = "zerocopy-0.7.35",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.zerocopy-0.7.35.bazel"),
+        urls = ["https://static.crates.io/crates/zerocopy/0.8.27/download"],
+        strip_prefix = "zerocopy-0.8.27",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.zerocopy-0.8.27.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__zerocopy-0.8.20",
-        sha256 = "dde3bb8c68a8f3f1ed4ac9221aad6b10cece3e60a8e2ea54a6a2dec806d0084c",
+        name = "vendor_ts__zerocopy-derive-0.8.27",
+        sha256 = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/zerocopy/0.8.20/download"],
-        strip_prefix = "zerocopy-0.8.20",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.zerocopy-0.8.20.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__zerocopy-derive-0.7.35",
-        sha256 = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/zerocopy-derive/0.7.35/download"],
-        strip_prefix = "zerocopy-derive-0.7.35",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.zerocopy-derive-0.7.35.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__zerocopy-derive-0.8.20",
-        sha256 = "eea57037071898bf96a6da35fd626f4f27e9cee3ead2a6c703cf09d472b2e700",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/zerocopy-derive/0.8.20/download"],
-        strip_prefix = "zerocopy-derive-0.8.20",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.zerocopy-derive-0.8.20.bazel"),
+        urls = ["https://static.crates.io/crates/zerocopy-derive/0.8.27/download"],
+        strip_prefix = "zerocopy-derive-0.8.27",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.zerocopy-derive-0.8.27.bazel"),
     )
 
     maybe(
@@ -4051,12 +4062,12 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__zerovec-0.11.2",
-        sha256 = "4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428",
+        name = "vendor_ts__zerovec-0.11.4",
+        sha256 = "e7aa2bd55086f1ab526693ecbe444205da57e25f4489879da80635a46d90e73b",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/zerovec/0.11.2/download"],
-        strip_prefix = "zerovec-0.11.2",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.zerovec-0.11.2.bazel"),
+        urls = ["https://static.crates.io/crates/zerovec/0.11.4/download"],
+        strip_prefix = "zerovec-0.11.4",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.zerovec-0.11.4.bazel"),
     )
 
     maybe(
@@ -4091,67 +4102,67 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__zstd-sys-2.0.15-zstd.1.5.7",
-        sha256 = "eb81183ddd97d0c74cedf1d50d85c8d08c1b8b68ee863bdee9e706eedba1a237",
+        name = "vendor_ts__zstd-sys-2.0.16-zstd.1.5.7",
+        sha256 = "91e19ebc2adc8f83e43039e79776e3fda8ca919132d68a1fed6a5faca2683748",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/zstd-sys/2.0.15+zstd.1.5.7/download"],
-        strip_prefix = "zstd-sys-2.0.15+zstd.1.5.7",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.zstd-sys-2.0.15+zstd.1.5.7.bazel"),
+        urls = ["https://static.crates.io/crates/zstd-sys/2.0.16+zstd.1.5.7/download"],
+        strip_prefix = "zstd-sys-2.0.16+zstd.1.5.7",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.zstd-sys-2.0.16+zstd.1.5.7.bazel"),
     )
 
     return [
-        struct(repo = "vendor_ts__anyhow-1.0.98", is_dev_dep = False),
+        struct(repo = "vendor_ts__anyhow-1.0.100", is_dev_dep = False),
         struct(repo = "vendor_ts__argfile-0.2.1", is_dev_dep = False),
-        struct(repo = "vendor_ts__chalk-ir-0.103.0", is_dev_dep = False),
-        struct(repo = "vendor_ts__chrono-0.4.41", is_dev_dep = False),
-        struct(repo = "vendor_ts__clap-4.5.40", is_dev_dep = False),
+        struct(repo = "vendor_ts__chalk-ir-0.104.0", is_dev_dep = False),
+        struct(repo = "vendor_ts__chrono-0.4.42", is_dev_dep = False),
+        struct(repo = "vendor_ts__clap-4.5.48", is_dev_dep = False),
         struct(repo = "vendor_ts__dunce-1.0.5", is_dev_dep = False),
         struct(repo = "vendor_ts__either-1.15.0", is_dev_dep = False),
         struct(repo = "vendor_ts__encoding-0.2.33", is_dev_dep = False),
         struct(repo = "vendor_ts__figment-0.10.19", is_dev_dep = False),
-        struct(repo = "vendor_ts__flate2-1.1.0", is_dev_dep = False),
-        struct(repo = "vendor_ts__glob-0.3.2", is_dev_dep = False),
-        struct(repo = "vendor_ts__globset-0.4.15", is_dev_dep = False),
+        struct(repo = "vendor_ts__flate2-1.1.2", is_dev_dep = False),
+        struct(repo = "vendor_ts__glob-0.3.3", is_dev_dep = False),
+        struct(repo = "vendor_ts__globset-0.4.16", is_dev_dep = False),
         struct(repo = "vendor_ts__itertools-0.14.0", is_dev_dep = False),
         struct(repo = "vendor_ts__lazy_static-1.5.0", is_dev_dep = False),
         struct(repo = "vendor_ts__mustache-0.9.0", is_dev_dep = False),
         struct(repo = "vendor_ts__num-traits-0.2.19", is_dev_dep = False),
         struct(repo = "vendor_ts__num_cpus-1.17.0", is_dev_dep = False),
-        struct(repo = "vendor_ts__proc-macro2-1.0.95", is_dev_dep = False),
-        struct(repo = "vendor_ts__quote-1.0.40", is_dev_dep = False),
-        struct(repo = "vendor_ts__ra_ap_base_db-0.0.288", is_dev_dep = False),
-        struct(repo = "vendor_ts__ra_ap_cfg-0.0.288", is_dev_dep = False),
-        struct(repo = "vendor_ts__ra_ap_hir-0.0.288", is_dev_dep = False),
-        struct(repo = "vendor_ts__ra_ap_hir_def-0.0.288", is_dev_dep = False),
-        struct(repo = "vendor_ts__ra_ap_hir_expand-0.0.288", is_dev_dep = False),
-        struct(repo = "vendor_ts__ra_ap_hir_ty-0.0.288", is_dev_dep = False),
-        struct(repo = "vendor_ts__ra_ap_ide_db-0.0.288", is_dev_dep = False),
-        struct(repo = "vendor_ts__ra_ap_intern-0.0.288", is_dev_dep = False),
-        struct(repo = "vendor_ts__ra_ap_load-cargo-0.0.288", is_dev_dep = False),
-        struct(repo = "vendor_ts__ra_ap_parser-0.0.288", is_dev_dep = False),
-        struct(repo = "vendor_ts__ra_ap_paths-0.0.288", is_dev_dep = False),
-        struct(repo = "vendor_ts__ra_ap_project_model-0.0.288", is_dev_dep = False),
-        struct(repo = "vendor_ts__ra_ap_span-0.0.288", is_dev_dep = False),
-        struct(repo = "vendor_ts__ra_ap_stdx-0.0.288", is_dev_dep = False),
-        struct(repo = "vendor_ts__ra_ap_syntax-0.0.288", is_dev_dep = False),
-        struct(repo = "vendor_ts__ra_ap_vfs-0.0.288", is_dev_dep = False),
-        struct(repo = "vendor_ts__rayon-1.10.0", is_dev_dep = False),
-        struct(repo = "vendor_ts__regex-1.11.1", is_dev_dep = False),
-        struct(repo = "vendor_ts__serde-1.0.219", is_dev_dep = False),
-        struct(repo = "vendor_ts__serde_json-1.0.140", is_dev_dep = False),
-        struct(repo = "vendor_ts__serde_with-3.13.0", is_dev_dep = False),
-        struct(repo = "vendor_ts__syn-2.0.103", is_dev_dep = False),
-        struct(repo = "vendor_ts__toml-0.8.23", is_dev_dep = False),
+        struct(repo = "vendor_ts__proc-macro2-1.0.101", is_dev_dep = False),
+        struct(repo = "vendor_ts__quote-1.0.41", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_base_db-0.0.301", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_cfg-0.0.301", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_hir-0.0.301", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_hir_def-0.0.301", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_hir_expand-0.0.301", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_hir_ty-0.0.301", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_ide_db-0.0.301", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_intern-0.0.301", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_load-cargo-0.0.301", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_parser-0.0.301", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_paths-0.0.301", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_project_model-0.0.301", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_span-0.0.301", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_stdx-0.0.301", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_syntax-0.0.301", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_vfs-0.0.301", is_dev_dep = False),
+        struct(repo = "vendor_ts__rayon-1.11.0", is_dev_dep = False),
+        struct(repo = "vendor_ts__regex-1.11.3", is_dev_dep = False),
+        struct(repo = "vendor_ts__serde-1.0.228", is_dev_dep = False),
+        struct(repo = "vendor_ts__serde_json-1.0.145", is_dev_dep = False),
+        struct(repo = "vendor_ts__serde_with-3.14.1", is_dev_dep = False),
+        struct(repo = "vendor_ts__syn-2.0.106", is_dev_dep = False),
+        struct(repo = "vendor_ts__toml-0.9.7", is_dev_dep = False),
         struct(repo = "vendor_ts__tracing-0.1.41", is_dev_dep = False),
         struct(repo = "vendor_ts__tracing-flame-0.2.0", is_dev_dep = False),
-        struct(repo = "vendor_ts__tracing-subscriber-0.3.19", is_dev_dep = False),
-        struct(repo = "vendor_ts__tree-sitter-0.24.6", is_dev_dep = False),
-        struct(repo = "vendor_ts__tree-sitter-embedded-template-0.23.2", is_dev_dep = False),
+        struct(repo = "vendor_ts__tracing-subscriber-0.3.20", is_dev_dep = False),
+        struct(repo = "vendor_ts__tree-sitter-0.25.9", is_dev_dep = False),
+        struct(repo = "vendor_ts__tree-sitter-embedded-template-0.25.0", is_dev_dep = False),
         struct(repo = "vendor_ts__tree-sitter-ruby-0.23.1", is_dev_dep = False),
         struct(repo = "vendor_ts__triomphe-0.1.14", is_dev_dep = False),
         struct(repo = "vendor_ts__ungrammar-1.16.1", is_dev_dep = False),
         struct(repo = "vendor_ts__zstd-0.13.3", is_dev_dep = False),
-        struct(repo = "vendor_ts__rand-0.9.1", is_dev_dep = True),
+        struct(repo = "vendor_ts__rand-0.9.2", is_dev_dep = True),
         struct(repo = "vendor_ts__tree-sitter-json-0.24.8", is_dev_dep = True),
         struct(repo = "vendor_ts__tree-sitter-ql-0.23.1", is_dev_dep = True),
     ]
diff --git a/misc/bazel/csharp.bzl b/misc/bazel/csharp.bzl
index 2ba8c59f076..7a317909627 100644
--- a/misc/bazel/csharp.bzl
+++ b/misc/bazel/csharp.bzl
@@ -47,6 +47,30 @@ def codeql_xunit_test(name, **kwargs):
         **kwargs
     )
 
+def _filter_published_files_impl(ctx):
+    dir = ctx.attr.src[DefaultInfo].files_to_run.executable.dirname
+    files = ctx.attr.src[DefaultInfo].files.to_list()
+
+    # filter out all unneeded localization directories, that contain
+    # duplicate files that would break our packaging
+    files = [
+        f
+        for f in files
+        if f.dirname in (dir, dir + "/bin", dir + "\\bin")
+    ]
+    return [
+        DefaultInfo(
+            files = depset(files),
+        ),
+    ]
+
+_filter_published_files = rule(
+    implementation = _filter_published_files_impl,
+    attrs = {
+        "src": attr.label(),
+    },
+)
+
 def codeql_csharp_binary(name, **kwargs):
     kwargs.setdefault("nullable", "enable")
     kwargs.setdefault("target_frameworks", [TARGET_FRAMEWORK])
@@ -63,6 +87,7 @@ def codeql_csharp_binary(name, **kwargs):
 
     csharp_binary_target = "bin/" + name
     publish_binary_target = "publish/" + name
+    filtered_target = "filtered/" + name
     csharp_binary(name = csharp_binary_target, srcs = srcs, resources = resources, visibility = visibility, **kwargs)
     publish_binary(
         name = publish_binary_target,
@@ -76,10 +101,14 @@ def codeql_csharp_binary(name, **kwargs):
             },
         ),
     )
+    _filter_published_files(
+        name = filtered_target,
+        src = publish_binary_target,
+    )
 
     codeql_pkg_files(
         name = name,
-        exes = [publish_binary_target],
+        exes = [filtered_target],
         prefix = "tools/{CODEQL_PLATFORM}",
         strip_prefix = strip_prefix.files_only(),
         visibility = visibility,
diff --git a/misc/bazel/pkg.bzl b/misc/bazel/pkg.bzl
index d8f69c5f748..25f2bf3577d 100644
--- a/misc/bazel/pkg.bzl
+++ b/misc/bazel/pkg.bzl
@@ -3,12 +3,11 @@ Wrappers and helpers around `rules_pkg` to build codeql packs.
 """
 
 load("@bazel_skylib//lib:paths.bzl", "paths")
-load("@bazel_skylib//rules:native_binary.bzl", "native_test")
 load("@rules_pkg//pkg:install.bzl", "pkg_install")
 load("@rules_pkg//pkg:mappings.bzl", "pkg_attributes", "pkg_filegroup", "pkg_files", _strip_prefix = "strip_prefix")
 load("@rules_pkg//pkg:pkg.bzl", "pkg_zip")
 load("@rules_pkg//pkg:providers.bzl", "PackageFilegroupInfo", "PackageFilesInfo")
-load("@rules_python//python:defs.bzl", "py_binary")
+load("@rules_python//python:defs.bzl", "py_binary", "py_test")
 load("//misc/bazel:os.bzl", "OS_DETECTION_ATTRS", "os_select")
 
 def _make_internal(name):
@@ -366,28 +365,29 @@ def _codeql_pack_install(name, srcs, install_dest = None, build_file_label = Non
     ] if build_file_label else []) + (
         ["--destdir", "\"%s\"" % install_dest] if install_dest else []
     )
-    py_binary(
-        name = name,
+    installer_args = dict(
         srcs = [Label("//misc/bazel/internal:install.py")],
         main = Label("//misc/bazel/internal:install.py"),
         deps = ["@rules_python//python/runfiles"],
         data = data,
         args = args,
     )
+    py_binary(
+        name = name,
+        **installer_args
+    )
 
     # this hack is meant to be an optimization when using install for tests, where
     # the install step is skipped if nothing changed. If the installation directory
     # is somehow messed up, `bazel run` can be used to force install
-    native_test(
+    py_test(
         name = internal("as", "test"),
-        src = name,
         tags = [
             "manual",  # avoid having this picked up by `...`, `:all` or `:*`
             "local",  # make sure installation does not run sandboxed
         ],
-        data = data,
-        args = args,
         size = "small",
+        **installer_args
     )
 
 def codeql_pack_group(name, srcs, visibility = None, skip_installer = False, prefix = "", install_dest = None, build_file_label = None, compression_level = 6):
diff --git a/misc/bazel/registry/modules/rules_dotnet/0.19.2-codeql.1/MODULE.bazel b/misc/bazel/registry/modules/rules_dotnet/0.19.2-codeql.1/MODULE.bazel
new file mode 100644
index 00000000000..ba047f282b0
--- /dev/null
+++ b/misc/bazel/registry/modules/rules_dotnet/0.19.2-codeql.1/MODULE.bazel
@@ -0,0 +1,57 @@
+"rules_dotnet"
+
+module(
+    name = "rules_dotnet",
+    version = "0.19.2-codeql.1",
+    bazel_compatibility = [">=7.0.0"],
+    compatibility_level = 0,
+)
+
+dotnet = use_extension("@rules_dotnet//dotnet:extensions.bzl", "dotnet")
+dotnet.toolchain(dotnet_version = "9.0.300")
+use_repo(dotnet, "dotnet_toolchains")
+
+register_toolchains("@dotnet_toolchains//:all")
+
+paket2bazel_dependencies_extension = use_extension("//dotnet:paket.paket2bazel_dependencies_extension.bzl", "paket2bazel_dependencies_extension")
+use_repo(paket2bazel_dependencies_extension, "paket.paket2bazel_dependencies")
+
+rules_dotnet_nuget_packages_extension = use_extension("//dotnet:paket.rules_dotnet_nuget_packages_extension.bzl", "rules_dotnet_nuget_packages_extension")
+use_repo(rules_dotnet_nuget_packages_extension, "paket.rules_dotnet_nuget_packages")
+
+targeting_packs_extension = use_extension("//dotnet/private/sdk/targeting_packs:dotnet.targeting_packs_extension.bzl", "targeting_packs_extension")
+use_repo(targeting_packs_extension, "dotnet.targeting_packs")
+
+runtime_packs_extension = use_extension("//dotnet/private/sdk/runtime_packs:dotnet.runtime_packs_extension.bzl", "runtime_packs_extension")
+use_repo(runtime_packs_extension, "dotnet.runtime_packs")
+
+apphost_packs_extension = use_extension("//dotnet/private/sdk/apphost_packs:dotnet.apphost_packs_extension.bzl", "apphost_packs_extension")
+use_repo(apphost_packs_extension, "dotnet.apphost_packs")
+
+bazel_dep(name = "bazel_skylib", version = "1.7.1")
+bazel_dep(name = "platforms", version = "1.0.0")
+bazel_dep(name = "aspect_bazel_lib", version = "2.19.4")
+bazel_dep(name = "rules_shell", version = "0.5.0")
+
+# Dev dependencies
+bazel_dep(name = "stardoc", version = "0.8.0", dev_dependency = True)
+bazel_dep(name = "rules_pkg", version = "1.1.0", dev_dependency = True)
+bazel_dep(name = "gazelle", version = "0.44.0", dev_dependency = True, repo_name = "bazel_gazelle")
+bazel_dep(name = "bazel_skylib_gazelle_plugin", version = "1.7.1", dev_dependency = True)
+bazel_dep(name = "rules_cc", version = "0.1.2", dev_dependency = True)
+bazel_dep(name = "rules_testing", version = "0.8.0", dev_dependency = True)
+bazel_dep(name = "bazel_ci_rules", version = "1.0.0", dev_dependency = True)
+bazel_dep(name = "dotnet_test_resources_other_repo", version = "", dev_dependency = True)
+local_path_override(
+    module_name = "dotnet_test_resources_other_repo",
+    path = "dotnet/private/tests/resources/other_repo",
+)
+
+rules_dotnet_dev_nuget_packages_extension = use_extension("//dotnet:paket.rules_dotnet_dev_nuget_packages_extension.bzl", "rules_dotnet_dev_nuget_packages_extension", dev_dependency = True)
+use_repo(rules_dotnet_dev_nuget_packages_extension, "paket.rules_dotnet_dev_nuget_packages")
+
+rules_dotnet_nuget_resource_assemblies_tests_extension = use_extension("//dotnet:paket.rules_dotnet_nuget_resource_assemblies_tests_extension.bzl", "rules_dotnet_nuget_resource_assemblies_tests_extension", dev_dependency = True)
+use_repo(rules_dotnet_nuget_resource_assemblies_tests_extension, "paket.rules_dotnet_nuget_resource_assemblies_tests")
+
+internal_dev_deps = use_extension("//dotnet:internal_dev_deps.bzl", "internal_dev_deps", dev_dependency = True)
+use_repo(internal_dev_deps, "buildkite_config")
diff --git a/misc/bazel/registry/modules/rules_dotnet/0.19.2-codeql.1/patches/revert_additional_files_in_nuget_archive.patch b/misc/bazel/registry/modules/rules_dotnet/0.19.2-codeql.1/patches/revert_additional_files_in_nuget_archive.patch
new file mode 100644
index 00000000000..f1c629694ec
--- /dev/null
+++ b/misc/bazel/registry/modules/rules_dotnet/0.19.2-codeql.1/patches/revert_additional_files_in_nuget_archive.patch
@@ -0,0 +1,11 @@
+--- a/dotnet/private/rules/nuget/nuget_archive.bzl	2025-09-04 16:14:49.402400198 +0200
++++ b/dotnet/private/rules/nuget/nuget_archive.bzl	2025-09-04 16:12:16.577010334 +0200
+@@ -123,7 +123,7 @@
+         return
+ 
+     # If the folder is empty we do nothing
+-    if file.endswith(tfm) or file.endswith(tfm + "/"):
++    if file.find("/", tfm_end + 1) != -1:
+         return
+ 
+     group = groups[group_name]
diff --git a/misc/bazel/registry/modules/rules_dotnet/0.19.2-codeql.1/source.json b/misc/bazel/registry/modules/rules_dotnet/0.19.2-codeql.1/source.json
new file mode 100644
index 00000000000..928683521e2
--- /dev/null
+++ b/misc/bazel/registry/modules/rules_dotnet/0.19.2-codeql.1/source.json
@@ -0,0 +1,9 @@
+{
+    "integrity": "sha256-6f9LidI9BUve7+TpoL1sh5GKC6sgLSYNImlVnVaiHEE=",
+    "strip_prefix": "rules_dotnet-0.19.2",
+    "url": "https://github.com/bazel-contrib/rules_dotnet/releases/download/v0.19.2/rules_dotnet-v0.19.2.tar.gz",
+    "patches": {
+        "revert_additional_files_in_nuget_archive.patch": "sha256-FzMKXeHVhIBXQRCNFB0EANDszgJc/BBaPgWCzkbW9Ck="
+    },
+    "patch_strip": 1
+}
diff --git a/misc/bazel/registry/modules/rules_dotnet/metadata.json b/misc/bazel/registry/modules/rules_dotnet/metadata.json
new file mode 100644
index 00000000000..684babcda14
--- /dev/null
+++ b/misc/bazel/registry/modules/rules_dotnet/metadata.json
@@ -0,0 +1,19 @@
+{
+    "homepage": "https://github.com/bazel-contrib/rules_dotnet",
+    "maintainers": [
+        {
+            "name": "Dan\u00edel Poul Purkh\u00fas",
+            "email": "purkhusid@gmail.com",
+            "github": "purkhusid",
+            "github_user_id": 5622403
+        }
+    ],
+    "repository": [
+        "github:bazelbuild/rules_dotnet",
+        "github:bazel-contrib/rules_dotnet"
+    ],
+    "versions": [
+        "0.19.2-codeql.1"
+    ],
+    "yanked_versions": {}
+}
diff --git a/misc/codegen/templates/ql_db.mustache b/misc/codegen/templates/ql_db.mustache
index e63e0aae903..a82ff78ec51 100644
--- a/misc/codegen/templates/ql_db.mustache
+++ b/misc/codegen/templates/ql_db.mustache
@@ -29,9 +29,79 @@ module Raw {
     {{type}} {{getter}}({{#is_indexed}}int index{{/is_indexed}}) {
       {{tablename}}({{#tableparams}}{{^first}}, {{/first}}{{param}}{{/tableparams}})
     }
+    {{#is_indexed}}
+    /**
+     * Gets the number of {{doc_plural}}.
+    {{#internal}}
+     * INTERNAL: Do not use.
+    {{/internal}}
+     */
+    int getNumberOf{{plural}}() {
+      result = count(int i | {{tablename}}(this, i, _))
+    }
+    {{/is_indexed}}
     {{/synth}}
     {{/properties}}
   }
 
+
+  {{#final}}
+  private Element getImmediateChildOf{{name}}({{name}} e, int index) {
+    {{^has_children}}none(){{/has_children}}
+    {{#has_children}}
+    {{! n is the base offset 0, for ease of generation }}
+    {{! n<child> is constructed to be strictly greater than the indexes for <child> children }}
+        exists(int n{{#all_children}}, int n{{property.singular}}{{/all_children}} |
+            n = 0
+            {{#all_children}}
+                {{#property}}
+                {{#synth}}
+                       and
+                       n{{singular}} = n{{prev}}
+                {{/synth}}
+                {{^synth}}
+                    {{! n<child> is defined on top of the previous definition }}
+                    {{! for single and optional properties it adds 1 (regardless of whether the optional property exists) }}
+                    {{! for repeated it adds 1 + the maximum index (which works for repeated optional as well) }}
+                        and
+                        n{{singular}} = n{{prev}} {{^is_repeated}}+ 1{{/is_repeated}}{{#is_repeated}}+ e.getNumberOf{{plural}}(){{/is_repeated}}
+                {{/synth}}
+                {{/property}}
+            {{/all_children}} and (
+        none()
+        {{#all_children}}
+            {{#property}}
+            {{^synth}}
+                or
+                {{#is_repeated}}
+                    result = e.get{{singular}}(index - n{{prev}})
+                {{/is_repeated}}
+                {{^is_repeated}}
+                    index = n{{prev}} and result = e.get{{singular}}()
+                {{/is_repeated}}
+            {{/synth}}
+            {{/property}}
+        {{/all_children}}
+        ))
+    {{/has_children}}
+    }
+    {{/final}}
+
   {{/classes}}
+
+  /**
+   * Gets the immediate child indexed at `index`. Indexes are not guaranteed to be contiguous, but are guaranteed to be distinct.
+   */
+  pragma[nomagic]
+  Element getImmediateChild(Element e, int index) {
+  // why does this look more complicated than it should?
+  // * none() simplifies generation, as we can append `or ...` without a special case for the first item
+  none()
+  {{#classes}}
+      {{#final}}
+          or
+          result = getImmediateChildOf{{name}}(e, index)
+      {{/final}}
+  {{/classes}}
+  }
 }
diff --git a/misc/codegen/templates/ql_parent.mustache b/misc/codegen/templates/ql_parent.mustache
index 84bc0d79a0b..91c5de98c47 100644
--- a/misc/codegen/templates/ql_parent.mustache
+++ b/misc/codegen/templates/ql_parent.mustache
@@ -23,7 +23,12 @@ private module Impl {
                         {{! for single and optional properties it adds 1 (regardless of whether the optional property exists) }}
                         {{! for repeated it adds 1 + the maximum index (which works for repeated optional as well) }}
                             and
-                            n{{singular}} = n{{prev}} + 1{{#is_repeated}}+ max(int i | i = -1 or exists(e.get{{#type_is_hideable}}Immediate{{/type_is_hideable}}{{singular}}(i)) | i){{/is_repeated}}
+                            {{#type_is_hideable}}
+                            n{{singular}} = n{{prev}} + 1{{#is_repeated}}+ max(int i | i = -1 or exists(e.getImmediate{{singular}}(i)) | i){{/is_repeated}}
+                            {{/type_is_hideable}}
+                            {{^type_is_hideable}}
+                            n{{singular}} = n{{prev}} {{^is_repeated}}+ 1{{/is_repeated}}{{#is_repeated}}+ e.getNumberOf{{plural}}(){{/is_repeated}}
+                            {{/type_is_hideable}}
                     {{/property}}
                 {{/all_children}} and (
             none()
diff --git a/misc/codegen/templates/ql_synth_types.mustache b/misc/codegen/templates/ql_synth_types.mustache
index c76654b8ea9..14a48f635e5 100644
--- a/misc/codegen/templates/ql_synth_types.mustache
+++ b/misc/codegen/templates/ql_synth_types.mustache
@@ -32,9 +32,28 @@ module Synth {
   {{/root}}
   {{/non_final_classes}}
 
+  /**
+   * INTERNAL: Do not use.
+   *
+   * Gets the parent of synthetic element `e`.
+   */
+  Raw::{{root}} getSynthParent(T{{root}} e) {
+    none()
+    {{#final_classes}}
+    {{#is_fresh_synth}}
+    {{#has_params}}
+    or
+    e = T{{name}}({{#params}}{{#first}}result{{/first}}{{^first}}, _{{/first}}{{/params}})
+    {{/has_params}}
+    {{/is_fresh_synth}}
+    {{/final_classes}}
+  }
+
+
   {{#final_classes}}
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `T{{name}}`, if possible.
    */
   T{{name}} convert{{name}}FromRaw(Raw::Element e) {
diff --git a/misc/ripunzip/ripunzip-Linux.tar.zst b/misc/ripunzip/ripunzip-Linux.tar.zst
new file mode 100644
index 00000000000..94530212daf
--- /dev/null
+++ b/misc/ripunzip/ripunzip-Linux.tar.zst
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e6df3e70fa425f5640aba1b319ed21f0a12d3e5d39d5da8cb4820396149c95bd
+size 4740396
diff --git a/misc/ripunzip/ripunzip-Linux.zip b/misc/ripunzip/ripunzip-Linux.zip
deleted file mode 100644
index d5535b1f17f..00000000000
--- a/misc/ripunzip/ripunzip-Linux.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:411e5578af004e7be449b6945d50b0984efc3308fe42a0b5c9e82d4be38425e1
-size 4888352
diff --git a/misc/ripunzip/ripunzip-Windows.tar.zst b/misc/ripunzip/ripunzip-Windows.tar.zst
new file mode 100644
index 00000000000..81f156c41b5
--- /dev/null
+++ b/misc/ripunzip/ripunzip-Windows.tar.zst
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a85c91867649a0ca0bbfddd2c88a3f3da7e0a44edd293571d72ee8492bc9b81b
+size 1765497
diff --git a/misc/ripunzip/ripunzip-Windows.zip b/misc/ripunzip/ripunzip-Windows.zip
deleted file mode 100644
index 7ef76bfbb0d..00000000000
--- a/misc/ripunzip/ripunzip-Windows.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0c0bfe3d9c8a2236ecdb574839e83d54c50a019656d26d4d870e8ca26be083dd
-size 1860383
diff --git a/misc/ripunzip/ripunzip-macOS.tar.zst b/misc/ripunzip/ripunzip-macOS.tar.zst
new file mode 100644
index 00000000000..2f5e111c78e
--- /dev/null
+++ b/misc/ripunzip/ripunzip-macOS.tar.zst
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9fbc5326b12fa6b9e06d48c60fb9cd363fff9a0c87a81ed93c29facbe9d2e4f2
+size 3796231
diff --git a/misc/ripunzip/ripunzip-macOS.zip b/misc/ripunzip/ripunzip-macOS.zip
deleted file mode 100644
index c47a54d2c07..00000000000
--- a/misc/ripunzip/ripunzip-macOS.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a1edacc510b44d35f926e7a682ea8efc1a7f28028cacf31f432e5b4b409a2d2b
-size 4140891
diff --git a/misc/scripts/create-change-note.py b/misc/scripts/create-change-note.py
index 1a13a0cf114..1de42126c90 100755
--- a/misc/scripts/create-change-note.py
+++ b/misc/scripts/create-change-note.py
@@ -7,7 +7,7 @@
 # - What language the change note is for
 # - Whether it's a query or library change (the string `src` or `lib`)
 # - The name of the change note (in kebab-case)
-# - The category of the change.
+# - The category of the change (see https://github.com/github/codeql/blob/main/docs/change-notes.md#change-categories).
 
 # The change note will be created in the `{language}/ql/{subdir}/change-notes` directory, where `subdir` is either `src` or `lib`.
 
diff --git a/misc/scripts/generate-code-scanning-query-list.py b/misc/scripts/generate-code-scanning-query-list.py
index 02d59c473ec..24ed1d5de00 100755
--- a/misc/scripts/generate-code-scanning-query-list.py
+++ b/misc/scripts/generate-code-scanning-query-list.py
@@ -31,7 +31,7 @@ assert hasattr(arguments, "ignore_missing_query_packs")
 
 # Define which languages and query packs to consider
 languages = [ "actions", "cpp", "csharp", "go", "java", "javascript", "python", "ruby", "rust", "swift" ]
-packs = [ "code-scanning", "security-and-quality", "security-extended", "security-experimental", "code-quality"]
+packs = [ "code-scanning", "security-and-quality", "security-extended", "security-experimental", "code-quality", "code-quality-extended"]
 
 class CodeQL:
     def __init__(self):
@@ -184,8 +184,8 @@ with CodeQL() as codeql:
                         sys.exit("You can use '--ignore-missing-query-packs' to ignore this error")
 
                 # Exception for the code-quality suites, which might be empty, but must be resolvable.
-                if pack == 'code-quality' and queries_subp == '':
-                    print(f'Warning: skipping empty suite code-quality', file=sys.stderr)
+                if pack in ['code-quality', 'code-quality-extended'] and queries_subp == '':
+                    print(f'Warning: skipping empty suite {pack}', file=sys.stderr)
                     continue
 
                 # Investigate metadata for every query by using 'codeql resolve metadata'
diff --git a/misc/scripts/patch_query_history.py b/misc/scripts/patch_query_history.py
new file mode 100644
index 00000000000..e30d3b003d0
--- /dev/null
+++ b/misc/scripts/patch_query_history.py
@@ -0,0 +1,148 @@
+#!/usr/bin/env python3
+"""Duplicate the last CodeQL query history entry, pointing it at a given evaluator log.
+
+Behavior:
+1. Locate the most relevant ``workspace-query-history.json`` (supports local & remote VS Code).
+2. Duplicate the final object in ``queries``.
+3. Generate a fresh random ID and a new timestamp.
+4. Set ``jsonEvalLogSummaryLocation`` to the provided summary file path.
+5. Set ``initialInfo.userSpecifiedLabel`` to ``Evaluator log at <dir>/<filename>`` (last 2 path parts).
+6. Write back atomically.
+
+Usage: python3 misc/scripts/patch_query_history.py /path/to/evaluator-log.summary.jsonl
+"""
+from __future__ import annotations
+import argparse
+import json, os, random, string, tempfile, sys
+from pathlib import Path
+from typing import List
+from datetime import datetime, timezone
+import copy
+
+
+# Extension folder segment for CodeQL extension query history
+EXT_SEGMENT = "GitHub.vscode-codeql"
+HISTORY_FILENAME = "workspace-query-history.json"
+WORKSPACE_JSON = "workspace.json"
+
+def candidate_user_data_dirs() -> List[Path]:
+    """Return plausible VS Code user data dirs (ordered, deduped)."""
+    home = Path.home()
+    env = os.environ
+    override = env.get("VSCODE_USER_DATA_DIR")
+    bases: List[Path] = []
+    if override:
+        bases.append(Path(override).expanduser())
+    if os.name == "nt":
+        appdata = env.get("APPDATA")
+        if appdata:
+            bases.append(Path(appdata) / "Code" / "User")
+    elif sys.platform == "darwin":  # macOS inline check
+        bases.append(home / "Library" / "Application Support" / "Code" / "User")
+    else:
+        bases.append(home / ".config" / "Code" / "User")
+    # Remote / server variants
+    bases.extend([
+        home / ".vscode-remote" / "data" / "User",
+        home / ".vscode-server" / "data" / "User",
+        home / ".vscode" / "data" / "User",
+    ])
+    seen: set[Path] = set()
+    ordered: List[Path] = []
+    for b in bases:
+        if b not in seen:
+            seen.add(b)
+            ordered.append(b)
+    return ordered
+
+
+def find_history_files() -> List[Path]:
+    """Return all candidate history files sorted by descending modification time.
+    """
+    candidates: List[Path] = []
+    for base in candidate_user_data_dirs():
+        storage_root = base / "workspaceStorage"
+        if not storage_root.is_dir():
+            continue
+        for ws_entry in storage_root.iterdir():
+            if not ws_entry.is_dir():
+                continue
+            history_file = ws_entry / EXT_SEGMENT / HISTORY_FILENAME
+            if history_file.is_file():
+                candidates.append(history_file)
+    candidates.sort(key=lambda p: p.stat().st_mtime, reverse=True)
+    return candidates
+
+def _generate_new_id() -> str:
+    """Return a new random id (24 chars from allowed set, prefixed with 'evaluator-log-' for stability)."""
+    alphabet = string.ascii_letters + string.digits + "_-"
+    return "evaluator-log-" + "".join(random.choice(alphabet) for _ in range(23))
+
+def atomic_write_json(target: Path, obj) -> None:
+    fd, tmp = tempfile.mkstemp(dir=str(target.parent), prefix="history.", suffix=".json")
+    try:
+        with os.fdopen(fd, "w", encoding="utf-8") as out:
+            json.dump(obj, out, ensure_ascii=False, indent=2)
+            out.write("\n")
+        os.replace(tmp, target)
+    finally:
+        if os.path.exists(tmp):
+            try:
+                os.remove(tmp)
+            except OSError:
+                pass
+
+def _duplicate_last_entry(path: Path, summary_path: Path) -> dict:
+    try:
+        data = json.loads(path.read_text(encoding="utf-8"))
+    except json.JSONDecodeError as e:
+        raise SystemExit(f"History file JSON is corrupt: {e}")
+    if not isinstance(data, dict) or not isinstance(data.get("queries"), list):
+        raise SystemExit("Unexpected history file structure: missing 'queries' list")
+    queries = data["queries"]
+    if not queries:
+        raise SystemExit("History file contains no queries to duplicate. Please run a query in VSCode and try again.")
+    last = queries[-1]
+    if not isinstance(last, dict):
+        raise SystemExit("Last query entry malformed")
+    payload = copy.deepcopy(last)
+    initial = payload.setdefault("initialInfo", {})
+    if not isinstance(initial, dict):
+        initial = {}
+        payload["initialInfo"] = initial
+    new_id = _generate_new_id()
+    initial["id"] = new_id
+    initial["start"] = datetime.now(timezone.utc).isoformat(timespec="milliseconds").replace("+00:00", "Z")
+    payload["jsonEvalLogSummaryLocation"] = str(summary_path)
+    parts = list(summary_path.parts)
+    last_two = "/".join(parts[-2:]) if len(parts) >= 2 else parts[-1]
+    new_label = f"Evaluator log at {last_two}"
+    initial["userSpecifiedLabel"] = new_label
+    queries.append(payload)
+    atomic_write_json(path, data)
+    return {"new_id": new_id, "new_label": new_label, "count": len(queries)}
+
+def main() -> int:
+    parser = argparse.ArgumentParser(description="Duplicate last CodeQL query history entry, patching summary location and label.")
+    parser.add_argument("summary_path", type=Path, help="Path to evaluator-log.summary.jsonl file (required).")
+    args = parser.parse_args()
+
+    summary_path: Path = args.summary_path
+    if not summary_path.is_file():
+        raise SystemExit(f"Summary file does not exist: {summary_path}")
+
+    candidates = find_history_files()
+    if not candidates:
+        raise SystemExit("No workspace-query-history.json files found.")
+    best = candidates[0]
+
+    result = _duplicate_last_entry(best, summary_path)
+
+    print(f"Patched history: {best}")
+    print(f"Evaluator log summary: {summary_path}")
+    print(f"New ID: {result['new_id']}")
+    print(f"Label: {result['new_label']}")
+    print(f"Total entries: {result['count']}")
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/misc/scripts/shared-code-metrics.py b/misc/scripts/shared-code-metrics.py
index 94679693186..62a14be6749 100755
--- a/misc/scripts/shared-code-metrics.py
+++ b/misc/scripts/shared-code-metrics.py
@@ -159,7 +159,7 @@ class Package(SharedAsset):
 
     def containsDirectory(self, dir):
         return self.path.parent.parts == dir.parts[:len(self.path.parent.parts)]
-        # dir.startsWith(self.path.parent)
+        # dir.startsWith(self.path.parent)
 
     # Constructs a list of transitive depedencies of this package.
     def calculateDependencies(self, packageNameMap):
diff --git a/misc/suite-helpers/CHANGELOG.md b/misc/suite-helpers/CHANGELOG.md
index 3ba59599115..203d289a673 100644
--- a/misc/suite-helpers/CHANGELOG.md
+++ b/misc/suite-helpers/CHANGELOG.md
@@ -1,3 +1,27 @@
+## 1.0.34
+
+No user-facing changes.
+
+## 1.0.33
+
+No user-facing changes.
+
+## 1.0.32
+
+No user-facing changes.
+
+## 1.0.31
+
+No user-facing changes.
+
+## 1.0.30
+
+No user-facing changes.
+
+## 1.0.29
+
+No user-facing changes.
+
 ## 1.0.28
 
 No user-facing changes.
diff --git a/misc/suite-helpers/change-notes/released/1.0.29.md b/misc/suite-helpers/change-notes/released/1.0.29.md
new file mode 100644
index 00000000000..e6b79b88ef3
--- /dev/null
+++ b/misc/suite-helpers/change-notes/released/1.0.29.md
@@ -0,0 +1,3 @@
+## 1.0.29
+
+No user-facing changes.
diff --git a/misc/suite-helpers/change-notes/released/1.0.30.md b/misc/suite-helpers/change-notes/released/1.0.30.md
new file mode 100644
index 00000000000..cb2cf6d0a27
--- /dev/null
+++ b/misc/suite-helpers/change-notes/released/1.0.30.md
@@ -0,0 +1,3 @@
+## 1.0.30
+
+No user-facing changes.
diff --git a/misc/suite-helpers/change-notes/released/1.0.31.md b/misc/suite-helpers/change-notes/released/1.0.31.md
new file mode 100644
index 00000000000..b2642bbb5f8
--- /dev/null
+++ b/misc/suite-helpers/change-notes/released/1.0.31.md
@@ -0,0 +1,3 @@
+## 1.0.31
+
+No user-facing changes.
diff --git a/misc/suite-helpers/change-notes/released/1.0.32.md b/misc/suite-helpers/change-notes/released/1.0.32.md
new file mode 100644
index 00000000000..05c4073731c
--- /dev/null
+++ b/misc/suite-helpers/change-notes/released/1.0.32.md
@@ -0,0 +1,3 @@
+## 1.0.32
+
+No user-facing changes.
diff --git a/misc/suite-helpers/change-notes/released/1.0.33.md b/misc/suite-helpers/change-notes/released/1.0.33.md
new file mode 100644
index 00000000000..3a65838479f
--- /dev/null
+++ b/misc/suite-helpers/change-notes/released/1.0.33.md
@@ -0,0 +1,3 @@
+## 1.0.33
+
+No user-facing changes.
diff --git a/misc/suite-helpers/change-notes/released/1.0.34.md b/misc/suite-helpers/change-notes/released/1.0.34.md
new file mode 100644
index 00000000000..7e097cfe937
--- /dev/null
+++ b/misc/suite-helpers/change-notes/released/1.0.34.md
@@ -0,0 +1,3 @@
+## 1.0.34
+
+No user-facing changes.
diff --git a/misc/suite-helpers/codeql-pack.release.yml b/misc/suite-helpers/codeql-pack.release.yml
index 328402fb34f..b736654032c 100644
--- a/misc/suite-helpers/codeql-pack.release.yml
+++ b/misc/suite-helpers/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.28
+lastReleaseVersion: 1.0.34
diff --git a/misc/suite-helpers/qlpack.yml b/misc/suite-helpers/qlpack.yml
index de025c1e873..e3283b5dc3f 100644
--- a/misc/suite-helpers/qlpack.yml
+++ b/misc/suite-helpers/qlpack.yml
@@ -1,4 +1,4 @@
 name: codeql/suite-helpers
-version: 1.0.29-dev
+version: 1.0.35-dev
 groups: shared
 warnOnImplicitThis: true
diff --git a/python/codeql-extractor.yml b/python/codeql-extractor.yml
index 97a9e1f2cf2..993b1505bd1 100644
--- a/python/codeql-extractor.yml
+++ b/python/codeql-extractor.yml
@@ -2,8 +2,11 @@ name: "python"
 display_name: "Python"
 version: 1.22.1
 column_kind: utf32
+overlay_support_version: 20250626
 build_modes:
   - none
+default_queries:
+  - codeql/python-queries
 github_api_languages:
   - Python
 scc_languages:
diff --git a/python/downgrades/6a1f497168da2f43828161d3c86db7d4c94c2b53/old.dbscheme b/python/downgrades/6a1f497168da2f43828161d3c86db7d4c94c2b53/old.dbscheme
new file mode 100644
index 00000000000..6a1f497168d
--- /dev/null
+++ b/python/downgrades/6a1f497168da2f43828161d3c86db7d4c94c2b53/old.dbscheme
@@ -0,0 +1,1252 @@
+/*
+ *      This dbscheme is auto-generated by 'semmle/dbscheme_gen.py'.
+ *      WARNING: Any modifications to this file will be lost.
+ *      Relations can be changed by modifying master.py or
+ *      by adding rules to dbscheme.template
+ */
+
+/* This is a dummy line to alter the dbscheme, so we can make a database upgrade
+ * without actually changing any of the dbscheme predicates. It contains a date
+ * to allow for such updates in the future as well.
+ *
+ * 2020-07-02
+ *
+ * DO NOT remove this comment carelessly, since it can revert the dbscheme back to a
+ * previously seen state (matching a previously seen SHA), which would make the upgrade
+ * mechanism not work properly.
+ */
+
+/*- DEPRECATED: External defects and metrics -*/
+
+externalDefects(
+  unique int id : @externalDefect,
+  varchar(900) queryPath : string ref,
+  int location : @location ref,
+  varchar(900) message : string ref,
+  float severity : float ref
+);
+
+externalMetrics(
+  unique int id : @externalMetric,
+  varchar(900) queryPath : string ref,
+  int location : @location ref,
+  float value : float ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit the tuple `databaseMetadata("isOverlay", "true")`,
+ * along with an `overlayChangedFiles` tuple for each new/modified/deleted file,
+ * when building an overlay database, and these can be used by the discard predicates.
+ */
+databaseMetadata(
+  string metadataKey : string ref,
+  string value : string ref
+);
+
+overlayChangedFiles(
+  string path : string ref
+);
+
+/*- DEPRECATED: Snapshot date -*/
+
+snapshotDate(unique date snapshotDate : date ref);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- DEPRECATED: Duplicate code -*/
+
+duplicateCode(
+  unique int id : @duplication,
+  string relativePath : string ref,
+  int equivClass : int ref
+);
+
+similarCode(
+  unique int id : @similarity,
+  string relativePath : string ref,
+  int equivClass : int ref
+);
+
+@duplication_or_similarity = @duplication | @similarity
+
+tokens(
+  int id : @duplication_or_similarity ref,
+  int offset : int ref,
+  int beginLine : int ref,
+  int beginColumn : int ref,
+  int endLine : int ref,
+  int endColumn : int ref
+);
+
+/*- DEPRECATED: Version control data -*/
+
+svnentries(
+  unique int id : @svnentry,
+  string revision : string ref,
+  string author : string ref,
+  date revisionDate : date ref,
+  int changeSize : int ref
+)
+
+svnaffectedfiles(
+  int id : @svnentry ref,
+  int file : @file ref,
+  string action : string ref
+)
+
+svnentrymsg(
+  unique int id : @svnentry ref,
+  string message : string ref
+)
+
+svnchurn(
+  int commit : @svnentry ref,
+  int file : @file ref,
+  int addedLines : int ref,
+  int deletedLines : int ref
+)
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error;
+
+/*- Python dbscheme -*/
+
+/*
+ * Line metrics
+ */
+py_codelines(int id : @py_scope ref,
+             int count : int ref);
+
+py_commentlines(int id : @py_scope ref,
+                int count : int ref);
+
+py_docstringlines(int id : @py_scope ref,
+                int count : int ref);
+
+py_alllines(int id : @py_scope ref,
+                int count : int ref);
+
+/****************************
+        Python dbscheme
+****************************/
+
+@sourceline = @file | @py_Module | @xmllocatable;
+
+@location = @location_ast | @location_default ;
+
+locations_ast(unique int id: @location_ast,
+          int module: @py_Module ref,
+          int beginLine: int ref,
+          int beginColumn: int ref,
+          int endLine: int ref,
+          int endColumn: int ref);
+
+file_contents(unique int file: @file ref, string contents: string ref);
+
+py_module_path(int module: @py_Module ref, int file: @container ref);
+
+variable(unique int id : @py_variable,
+         int scope : @py_scope ref,
+         varchar(1) name : string ref);
+
+py_line_lengths(unique int id : @py_line,
+                int file: @py_Module ref,
+                int line : int ref,
+                int length : int ref);
+
+py_extracted_version(int module : @py_Module ref,
+                     varchar(1) version : string ref);
+
+/* AUTO GENERATED PART STARTS HERE */
+
+
+/* <Field> AnnAssign.location = 0, location */
+/* <Field> AnnAssign.value = 1, expr */
+/* <Field> AnnAssign.annotation = 2, expr */
+/* <Field> AnnAssign.target = 3, expr */
+
+/* <Field> Assert.location = 0, location */
+/* <Field> Assert.test = 1, expr */
+/* <Field> Assert.msg = 2, expr */
+
+/* <Field> Assign.location = 0, location */
+/* <Field> Assign.value = 1, expr */
+/* <Field> Assign.targets = 2, expr_list */
+
+/* <Field> AssignExpr.location = 0, location */
+/* <Field> AssignExpr.parenthesised = 1, bool */
+/* <Field> AssignExpr.value = 2, expr */
+/* <Field> AssignExpr.target = 3, expr */
+
+/* <Field> Attribute.location = 0, location */
+/* <Field> Attribute.parenthesised = 1, bool */
+/* <Field> Attribute.value = 2, expr */
+/* <Field> Attribute.attr = 3, str */
+/* <Field> Attribute.ctx = 4, expr_context */
+
+/* <Field> AugAssign.location = 0, location */
+/* <Field> AugAssign.operation = 1, BinOp */
+
+/* <Field> Await.location = 0, location */
+/* <Field> Await.parenthesised = 1, bool */
+/* <Field> Await.value = 2, expr */
+
+/* <Field> BinaryExpr.location = 0, location */
+/* <Field> BinaryExpr.parenthesised = 1, bool */
+/* <Field> BinaryExpr.left = 2, expr */
+/* <Field> BinaryExpr.op = 3, operator */
+/* <Field> BinaryExpr.right = 4, expr */
+/* <Parent> BinaryExpr = AugAssign  */
+
+/* <Field> BoolExpr.location = 0, location */
+/* <Field> BoolExpr.parenthesised = 1, bool */
+/* <Field> BoolExpr.op = 2, boolop */
+/* <Field> BoolExpr.values = 3, expr_list */
+
+/* <Field> Break.location = 0, location */
+
+/* <Field> Bytes.location = 0, location */
+/* <Field> Bytes.parenthesised = 1, bool */
+/* <Field> Bytes.s = 2, bytes */
+/* <Field> Bytes.prefix = 3, bytes */
+/* <Field> Bytes.implicitly_concatenated_parts = 4, StringPart_list */
+
+/* <Field> Call.location = 0, location */
+/* <Field> Call.parenthesised = 1, bool */
+/* <Field> Call.func = 2, expr */
+/* <Field> Call.positional_args = 3, expr_list */
+/* <Field> Call.named_args = 4, dict_item_list */
+
+/* <Field> Case.location = 0, location */
+/* <Field> Case.pattern = 1, pattern */
+/* <Field> Case.guard = 2, expr */
+/* <Field> Case.body = 3, stmt_list */
+
+/* <Field> Class.name = 0, str */
+/* <Field> Class.body = 1, stmt_list */
+/* <Parent> Class = ClassExpr  */
+
+/* <Field> ClassExpr.location = 0, location */
+/* <Field> ClassExpr.parenthesised = 1, bool */
+/* <Field> ClassExpr.name = 2, str */
+/* <Field> ClassExpr.bases = 3, expr_list */
+/* <Field> ClassExpr.keywords = 4, dict_item_list */
+/* <Field> ClassExpr.inner_scope = 5, Class */
+/* <Field> ClassExpr.type_parameters = 6, type_parameter_list */
+
+/* <Field> Compare.location = 0, location */
+/* <Field> Compare.parenthesised = 1, bool */
+/* <Field> Compare.left = 2, expr */
+/* <Field> Compare.ops = 3, cmpop_list */
+/* <Field> Compare.comparators = 4, expr_list */
+
+/* <Field> Continue.location = 0, location */
+
+/* <Field> Delete.location = 0, location */
+/* <Field> Delete.targets = 1, expr_list */
+
+/* <Field> Dict.location = 0, location */
+/* <Field> Dict.parenthesised = 1, bool */
+/* <Field> Dict.items = 2, dict_item_list */
+
+/* <Field> DictComp.location = 0, location */
+/* <Field> DictComp.parenthesised = 1, bool */
+/* <Field> DictComp.function = 2, Function */
+/* <Field> DictComp.iterable = 3, expr */
+
+/* <Field> DictUnpacking.location = 0, location */
+/* <Field> DictUnpacking.value = 1, expr */
+
+/* <Field> Ellipsis.location = 0, location */
+/* <Field> Ellipsis.parenthesised = 1, bool */
+
+/* <Field> ExceptGroupStmt.location = 0, location */
+/* <Field> ExceptGroupStmt.type = 1, expr */
+/* <Field> ExceptGroupStmt.name = 2, expr */
+/* <Field> ExceptGroupStmt.body = 3, stmt_list */
+
+/* <Field> ExceptStmt.location = 0, location */
+/* <Field> ExceptStmt.type = 1, expr */
+/* <Field> ExceptStmt.name = 2, expr */
+/* <Field> ExceptStmt.body = 3, stmt_list */
+
+/* <Field> Exec.location = 0, location */
+/* <Field> Exec.body = 1, expr */
+/* <Field> Exec.globals = 2, expr */
+/* <Field> Exec.locals = 3, expr */
+
+/* <Field> ExprStmt.location = 0, location */
+/* <Field> ExprStmt.value = 1, expr */
+
+/* <Field> Filter.location = 0, location */
+/* <Field> Filter.parenthesised = 1, bool */
+/* <Field> Filter.value = 2, expr */
+/* <Field> Filter.filter = 3, expr */
+
+/* <Field> For.location = 0, location */
+/* <Field> For.target = 1, expr */
+/* <Field> For.iter = 2, expr */
+/* <Field> For.body = 3, stmt_list */
+/* <Field> For.orelse = 4, stmt_list */
+/* <Field> For.is_async = 5, bool */
+
+/* <Field> FormattedValue.location = 0, location */
+/* <Field> FormattedValue.parenthesised = 1, bool */
+/* <Field> FormattedValue.value = 2, expr */
+/* <Field> FormattedValue.conversion = 3, str */
+/* <Field> FormattedValue.format_spec = 4, JoinedStr */
+
+/* <Field> Function.name = 0, str */
+/* <Field> Function.args = 1, parameter_list */
+/* <Field> Function.vararg = 2, expr */
+/* <Field> Function.kwonlyargs = 3, expr_list */
+/* <Field> Function.kwarg = 4, expr */
+/* <Field> Function.body = 5, stmt_list */
+/* <Field> Function.is_async = 6, bool */
+/* <Field> Function.type_parameters = 7, type_parameter_list */
+/* <Parent> Function = FunctionParent  */
+
+/* <Field> FunctionExpr.location = 0, location */
+/* <Field> FunctionExpr.parenthesised = 1, bool */
+/* <Field> FunctionExpr.name = 2, str */
+/* <Field> FunctionExpr.args = 3, arguments */
+/* <Field> FunctionExpr.returns = 4, expr */
+/* <Field> FunctionExpr.inner_scope = 5, Function */
+
+/* <Field> GeneratorExp.location = 0, location */
+/* <Field> GeneratorExp.parenthesised = 1, bool */
+/* <Field> GeneratorExp.function = 2, Function */
+/* <Field> GeneratorExp.iterable = 3, expr */
+
+/* <Field> Global.location = 0, location */
+/* <Field> Global.names = 1, str_list */
+
+/* <Field> Guard.location = 0, location */
+/* <Field> Guard.parenthesised = 1, bool */
+/* <Field> Guard.test = 2, expr */
+
+/* <Field> If.location = 0, location */
+/* <Field> If.test = 1, expr */
+/* <Field> If.body = 2, stmt_list */
+/* <Field> If.orelse = 3, stmt_list */
+
+/* <Field> IfExp.location = 0, location */
+/* <Field> IfExp.parenthesised = 1, bool */
+/* <Field> IfExp.test = 2, expr */
+/* <Field> IfExp.body = 3, expr */
+/* <Field> IfExp.orelse = 4, expr */
+
+/* <Field> Import.location = 0, location */
+/* <Field> Import.names = 1, alias_list */
+
+/* <Field> ImportExpr.location = 0, location */
+/* <Field> ImportExpr.parenthesised = 1, bool */
+/* <Field> ImportExpr.level = 2, int */
+/* <Field> ImportExpr.name = 3, str */
+/* <Field> ImportExpr.top = 4, bool */
+
+/* <Field> ImportStar.location = 0, location */
+/* <Field> ImportStar.module = 1, expr */
+
+/* <Field> ImportMember.location = 0, location */
+/* <Field> ImportMember.parenthesised = 1, bool */
+/* <Field> ImportMember.module = 2, expr */
+/* <Field> ImportMember.name = 3, str */
+
+/* <Field> Fstring.location = 0, location */
+/* <Field> Fstring.parenthesised = 1, bool */
+/* <Field> Fstring.values = 2, expr_list */
+/* <Parent> Fstring = FormattedValue  */
+
+/* <Field> KeyValuePair.location = 0, location */
+/* <Field> KeyValuePair.value = 1, expr */
+/* <Field> KeyValuePair.key = 2, expr */
+
+/* <Field> Lambda.location = 0, location */
+/* <Field> Lambda.parenthesised = 1, bool */
+/* <Field> Lambda.args = 2, arguments */
+/* <Field> Lambda.inner_scope = 3, Function */
+
+/* <Field> List.location = 0, location */
+/* <Field> List.parenthesised = 1, bool */
+/* <Field> List.elts = 2, expr_list */
+/* <Field> List.ctx = 3, expr_context */
+
+/* <Field> ListComp.location = 0, location */
+/* <Field> ListComp.parenthesised = 1, bool */
+/* <Field> ListComp.function = 2, Function */
+/* <Field> ListComp.iterable = 3, expr */
+/* <Field> ListComp.generators = 4, comprehension_list */
+/* <Field> ListComp.elt = 5, expr */
+
+/* <Field> MatchStmt.location = 0, location */
+/* <Field> MatchStmt.subject = 1, expr */
+/* <Field> MatchStmt.cases = 2, stmt_list */
+
+/* <Field> MatchAsPattern.location = 0, location */
+/* <Field> MatchAsPattern.parenthesised = 1, bool */
+/* <Field> MatchAsPattern.pattern = 2, pattern */
+/* <Field> MatchAsPattern.alias = 3, expr */
+
+/* <Field> MatchCapturePattern.location = 0, location */
+/* <Field> MatchCapturePattern.parenthesised = 1, bool */
+/* <Field> MatchCapturePattern.variable = 2, expr */
+
+/* <Field> MatchClassPattern.location = 0, location */
+/* <Field> MatchClassPattern.parenthesised = 1, bool */
+/* <Field> MatchClassPattern.class = 2, expr */
+/* <Field> MatchClassPattern.class_name = 3, expr */
+/* <Field> MatchClassPattern.positional = 4, pattern_list */
+/* <Field> MatchClassPattern.keyword = 5, pattern_list */
+
+/* <Field> MatchDoubleStarPattern.location = 0, location */
+/* <Field> MatchDoubleStarPattern.parenthesised = 1, bool */
+/* <Field> MatchDoubleStarPattern.target = 2, pattern */
+
+/* <Field> MatchKeyValuePattern.location = 0, location */
+/* <Field> MatchKeyValuePattern.parenthesised = 1, bool */
+/* <Field> MatchKeyValuePattern.key = 2, pattern */
+/* <Field> MatchKeyValuePattern.value = 3, pattern */
+
+/* <Field> MatchKeywordPattern.location = 0, location */
+/* <Field> MatchKeywordPattern.parenthesised = 1, bool */
+/* <Field> MatchKeywordPattern.attribute = 2, expr */
+/* <Field> MatchKeywordPattern.value = 3, pattern */
+
+/* <Field> MatchLiteralPattern.location = 0, location */
+/* <Field> MatchLiteralPattern.parenthesised = 1, bool */
+/* <Field> MatchLiteralPattern.literal = 2, expr */
+
+/* <Field> MatchMappingPattern.location = 0, location */
+/* <Field> MatchMappingPattern.parenthesised = 1, bool */
+/* <Field> MatchMappingPattern.mappings = 2, pattern_list */
+
+/* <Field> MatchOrPattern.location = 0, location */
+/* <Field> MatchOrPattern.parenthesised = 1, bool */
+/* <Field> MatchOrPattern.patterns = 2, pattern_list */
+
+/* <Field> MatchSequencePattern.location = 0, location */
+/* <Field> MatchSequencePattern.parenthesised = 1, bool */
+/* <Field> MatchSequencePattern.patterns = 2, pattern_list */
+
+/* <Field> MatchStarPattern.location = 0, location */
+/* <Field> MatchStarPattern.parenthesised = 1, bool */
+/* <Field> MatchStarPattern.target = 2, pattern */
+
+/* <Field> MatchValuePattern.location = 0, location */
+/* <Field> MatchValuePattern.parenthesised = 1, bool */
+/* <Field> MatchValuePattern.value = 2, expr */
+
+/* <Field> MatchWildcardPattern.location = 0, location */
+/* <Field> MatchWildcardPattern.parenthesised = 1, bool */
+
+/* <Field> Module.name = 0, str */
+/* <Field> Module.hash = 1, str */
+/* <Field> Module.body = 2, stmt_list */
+/* <Field> Module.kind = 3, str */
+
+/* <Field> Name.location = 0, location */
+/* <Field> Name.parenthesised = 1, bool */
+/* <Field> Name.variable = 2, variable */
+/* <Field> Name.ctx = 3, expr_context */
+/* <Parent> Name = ParameterList  */
+
+/* <Field> Nonlocal.location = 0, location */
+/* <Field> Nonlocal.names = 1, str_list */
+
+/* <Field> Num.location = 0, location */
+/* <Field> Num.parenthesised = 1, bool */
+/* <Field> Num.n = 2, number */
+/* <Field> Num.text = 3, number */
+
+/* <Field> ParamSpec.location = 0, location */
+/* <Field> ParamSpec.name = 1, expr */
+/* <Field> ParamSpec.default = 2, expr */
+
+/* <Field> Pass.location = 0, location */
+
+/* <Field> PlaceHolder.location = 0, location */
+/* <Field> PlaceHolder.parenthesised = 1, bool */
+/* <Field> PlaceHolder.variable = 2, variable */
+/* <Field> PlaceHolder.ctx = 3, expr_context */
+
+/* <Field> Print.location = 0, location */
+/* <Field> Print.dest = 1, expr */
+/* <Field> Print.values = 2, expr_list */
+/* <Field> Print.nl = 3, bool */
+
+/* <Field> Raise.location = 0, location */
+/* <Field> Raise.exc = 1, expr */
+/* <Field> Raise.cause = 2, expr */
+/* <Field> Raise.type = 3, expr */
+/* <Field> Raise.inst = 4, expr */
+/* <Field> Raise.tback = 5, expr */
+
+/* <Field> Repr.location = 0, location */
+/* <Field> Repr.parenthesised = 1, bool */
+/* <Field> Repr.value = 2, expr */
+
+/* <Field> Return.location = 0, location */
+/* <Field> Return.value = 1, expr */
+
+/* <Field> Set.location = 0, location */
+/* <Field> Set.parenthesised = 1, bool */
+/* <Field> Set.elts = 2, expr_list */
+
+/* <Field> SetComp.location = 0, location */
+/* <Field> SetComp.parenthesised = 1, bool */
+/* <Field> SetComp.function = 2, Function */
+/* <Field> SetComp.iterable = 3, expr */
+
+/* <Field> Slice.location = 0, location */
+/* <Field> Slice.parenthesised = 1, bool */
+/* <Field> Slice.start = 2, expr */
+/* <Field> Slice.stop = 3, expr */
+/* <Field> Slice.step = 4, expr */
+
+/* <Field> SpecialOperation.location = 0, location */
+/* <Field> SpecialOperation.parenthesised = 1, bool */
+/* <Field> SpecialOperation.name = 2, str */
+/* <Field> SpecialOperation.arguments = 3, expr_list */
+
+/* <Field> Starred.location = 0, location */
+/* <Field> Starred.parenthesised = 1, bool */
+/* <Field> Starred.value = 2, expr */
+/* <Field> Starred.ctx = 3, expr_context */
+
+/* <Field> Str.location = 0, location */
+/* <Field> Str.parenthesised = 1, bool */
+/* <Field> Str.s = 2, str */
+/* <Field> Str.prefix = 3, str */
+/* <Field> Str.implicitly_concatenated_parts = 4, StringPart_list */
+
+/* <Field> StringPart.text = 0, str */
+/* <Field> StringPart.location = 1, location */
+/* <Parent> StringPart = StringPartList  */
+/* <Parent> StringPartList = BytesOrStr  */
+
+/* <Field> Subscript.location = 0, location */
+/* <Field> Subscript.parenthesised = 1, bool */
+/* <Field> Subscript.value = 2, expr */
+/* <Field> Subscript.index = 3, expr */
+/* <Field> Subscript.ctx = 4, expr_context */
+
+/* <Field> TemplateDottedNotation.location = 0, location */
+/* <Field> TemplateDottedNotation.parenthesised = 1, bool */
+/* <Field> TemplateDottedNotation.value = 2, expr */
+/* <Field> TemplateDottedNotation.attr = 3, str */
+/* <Field> TemplateDottedNotation.ctx = 4, expr_context */
+
+/* <Field> TemplateWrite.location = 0, location */
+/* <Field> TemplateWrite.value = 1, expr */
+
+/* <Field> Try.location = 0, location */
+/* <Field> Try.body = 1, stmt_list */
+/* <Field> Try.orelse = 2, stmt_list */
+/* <Field> Try.handlers = 3, stmt_list */
+/* <Field> Try.finalbody = 4, stmt_list */
+
+/* <Field> Tuple.location = 0, location */
+/* <Field> Tuple.parenthesised = 1, bool */
+/* <Field> Tuple.elts = 2, expr_list */
+/* <Field> Tuple.ctx = 3, expr_context */
+/* <Parent> Tuple = ParameterList  */
+
+/* <Field> TypeAlias.location = 0, location */
+/* <Field> TypeAlias.name = 1, expr */
+/* <Field> TypeAlias.type_parameters = 2, type_parameter_list */
+/* <Field> TypeAlias.value = 3, expr */
+
+/* <Field> TypeVar.location = 0, location */
+/* <Field> TypeVar.name = 1, expr */
+/* <Field> TypeVar.bound = 2, expr */
+/* <Field> TypeVar.default = 3, expr */
+
+/* <Field> TypeVarTuple.location = 0, location */
+/* <Field> TypeVarTuple.name = 1, expr */
+/* <Field> TypeVarTuple.default = 2, expr */
+
+/* <Field> UnaryExpr.location = 0, location */
+/* <Field> UnaryExpr.parenthesised = 1, bool */
+/* <Field> UnaryExpr.op = 2, unaryop */
+/* <Field> UnaryExpr.operand = 3, expr */
+
+/* <Field> While.location = 0, location */
+/* <Field> While.test = 1, expr */
+/* <Field> While.body = 2, stmt_list */
+/* <Field> While.orelse = 3, stmt_list */
+
+/* <Field> With.location = 0, location */
+/* <Field> With.context_expr = 1, expr */
+/* <Field> With.optional_vars = 2, expr */
+/* <Field> With.body = 3, stmt_list */
+/* <Field> With.is_async = 4, bool */
+
+/* <Field> Yield.location = 0, location */
+/* <Field> Yield.parenthesised = 1, bool */
+/* <Field> Yield.value = 2, expr */
+
+/* <Field> YieldFrom.location = 0, location */
+/* <Field> YieldFrom.parenthesised = 1, bool */
+/* <Field> YieldFrom.value = 2, expr */
+
+/* <Field> Alias.value = 0, expr */
+/* <Field> Alias.asname = 1, expr */
+/* <Parent> Alias = AliasList  */
+/* <Parent> AliasList = Import  */
+
+/* <Field> Arguments.kw_defaults = 0, expr_list */
+/* <Field> Arguments.defaults = 1, expr_list */
+/* <Field> Arguments.annotations = 2, expr_list */
+/* <Field> Arguments.varargannotation = 3, expr */
+/* <Field> Arguments.kwargannotation = 4, expr */
+/* <Field> Arguments.kw_annotations = 5, expr_list */
+/* <Parent> Arguments = ArgumentsParent  */
+/* <Parent> boolean = BoolParent  */
+/* <Parent> Boolop = BoolExpr  */
+/* <Parent> string = Bytes  */
+/* <Parent> Cmpop = CmpopList  */
+/* <Parent> CmpopList = Compare  */
+
+/* <Field> Comprehension.location = 0, location */
+/* <Field> Comprehension.iter = 1, expr */
+/* <Field> Comprehension.target = 2, expr */
+/* <Field> Comprehension.ifs = 3, expr_list */
+/* <Parent> Comprehension = ComprehensionList  */
+/* <Parent> ComprehensionList = ListComp  */
+/* <Parent> DictItem = DictItemList  */
+/* <Parent> DictItemList = DictItemListParent  */
+
+/* <Field> Expr.location = 0, location */
+/* <Field> Expr.parenthesised = 1, bool */
+/* <Parent> Expr = ExprParent  */
+/* <Parent> ExprContext = ExprContextParent  */
+/* <Parent> ExprList = ExprListParent  */
+/* <Parent> int = ImportExpr  */
+
+/* <Field> Keyword.location = 0, location */
+/* <Field> Keyword.value = 1, expr */
+/* <Field> Keyword.arg = 2, str */
+/* <Parent> Location = LocationParent  */
+/* <Parent> string = Num  */
+/* <Parent> Operator = BinaryExpr  */
+/* <Parent> ParameterList = Function  */
+
+/* <Field> Pattern.location = 0, location */
+/* <Field> Pattern.parenthesised = 1, bool */
+/* <Parent> Pattern = PatternParent  */
+/* <Parent> PatternList = PatternListParent  */
+
+/* <Field> Stmt.location = 0, location */
+/* <Parent> Stmt = StmtList  */
+/* <Parent> StmtList = StmtListParent  */
+/* <Parent> string = StrParent  */
+/* <Parent> StringList = StrListParent  */
+
+/* <Field> TypeParameter.location = 0, location */
+/* <Parent> TypeParameter = TypeParameterList  */
+/* <Parent> TypeParameterList = TypeParameterListParent  */
+/* <Parent> Unaryop = UnaryExpr  */
+/* <Parent> Variable = VariableParent  */
+py_Classes(unique int id : @py_Class,
+    unique int parent : @py_ClassExpr ref);
+
+py_Functions(unique int id : @py_Function,
+    unique int parent : @py_Function_parent ref);
+
+py_Modules(unique int id : @py_Module);
+
+py_StringParts(unique int id : @py_StringPart,
+    int parent : @py_StringPart_list ref,
+    int idx : int ref);
+
+py_StringPart_lists(unique int id : @py_StringPart_list,
+    unique int parent : @py_Bytes_or_Str ref);
+
+py_aliases(unique int id : @py_alias,
+    int parent : @py_alias_list ref,
+    int idx : int ref);
+
+py_alias_lists(unique int id : @py_alias_list,
+    unique int parent : @py_Import ref);
+
+py_arguments(unique int id : @py_arguments,
+    unique int parent : @py_arguments_parent ref);
+
+py_bools(int parent : @py_bool_parent ref,
+    int idx : int ref);
+
+py_boolops(unique int id : @py_boolop,
+    int kind: int ref,
+    unique int parent : @py_BoolExpr ref);
+
+py_bytes(varchar(1) id : string ref,
+    int parent : @py_Bytes ref,
+    int idx : int ref);
+
+py_cmpops(unique int id : @py_cmpop,
+    int kind: int ref,
+    int parent : @py_cmpop_list ref,
+    int idx : int ref);
+
+py_cmpop_lists(unique int id : @py_cmpop_list,
+    unique int parent : @py_Compare ref);
+
+py_comprehensions(unique int id : @py_comprehension,
+    int parent : @py_comprehension_list ref,
+    int idx : int ref);
+
+py_comprehension_lists(unique int id : @py_comprehension_list,
+    unique int parent : @py_ListComp ref);
+
+py_dict_items(unique int id : @py_dict_item,
+    int kind: int ref,
+    int parent : @py_dict_item_list ref,
+    int idx : int ref);
+
+py_dict_item_lists(unique int id : @py_dict_item_list,
+    unique int parent : @py_dict_item_list_parent ref);
+
+py_exprs(unique int id : @py_expr,
+    int kind: int ref,
+    int parent : @py_expr_parent ref,
+    int idx : int ref);
+
+py_expr_contexts(unique int id : @py_expr_context,
+    int kind: int ref,
+    unique int parent : @py_expr_context_parent ref);
+
+py_expr_lists(unique int id : @py_expr_list,
+    int parent : @py_expr_list_parent ref,
+    int idx : int ref);
+
+py_ints(int id : int ref,
+    unique int parent : @py_ImportExpr ref);
+
+py_locations(unique int id : @location ref,
+    unique int parent : @py_location_parent ref);
+
+py_numbers(varchar(1) id : string ref,
+    int parent : @py_Num ref,
+    int idx : int ref);
+
+py_operators(unique int id : @py_operator,
+    int kind: int ref,
+    unique int parent : @py_BinaryExpr ref);
+
+py_parameter_lists(unique int id : @py_parameter_list,
+    unique int parent : @py_Function ref);
+
+py_patterns(unique int id : @py_pattern,
+    int kind: int ref,
+    int parent : @py_pattern_parent ref,
+    int idx : int ref);
+
+py_pattern_lists(unique int id : @py_pattern_list,
+    int parent : @py_pattern_list_parent ref,
+    int idx : int ref);
+
+py_stmts(unique int id : @py_stmt,
+    int kind: int ref,
+    int parent : @py_stmt_list ref,
+    int idx : int ref);
+
+py_stmt_lists(unique int id : @py_stmt_list,
+    int parent : @py_stmt_list_parent ref,
+    int idx : int ref);
+
+py_strs(varchar(1) id : string ref,
+    int parent : @py_str_parent ref,
+    int idx : int ref);
+
+py_str_lists(unique int id : @py_str_list,
+    unique int parent : @py_str_list_parent ref);
+
+py_type_parameters(unique int id : @py_type_parameter,
+    int kind: int ref,
+    int parent : @py_type_parameter_list ref,
+    int idx : int ref);
+
+py_type_parameter_lists(unique int id : @py_type_parameter_list,
+    unique int parent : @py_type_parameter_list_parent ref);
+
+py_unaryops(unique int id : @py_unaryop,
+    int kind: int ref,
+    unique int parent : @py_UnaryExpr ref);
+
+py_variables(int id : @py_variable ref,
+    unique int parent : @py_variable_parent ref);
+
+case @py_boolop.kind of
+    0 = @py_And
+|   1 = @py_Or;
+
+case @py_cmpop.kind of
+    0 = @py_Eq
+|   1 = @py_Gt
+|   2 = @py_GtE
+|   3 = @py_In
+|   4 = @py_Is
+|   5 = @py_IsNot
+|   6 = @py_Lt
+|   7 = @py_LtE
+|   8 = @py_NotEq
+|   9 = @py_NotIn;
+
+case @py_dict_item.kind of
+    0 = @py_DictUnpacking
+|   1 = @py_KeyValuePair
+|   2 = @py_keyword;
+
+case @py_expr.kind of
+    0 = @py_Attribute
+|   1 = @py_BinaryExpr
+|   2 = @py_BoolExpr
+|   3 = @py_Bytes
+|   4 = @py_Call
+|   5 = @py_ClassExpr
+|   6 = @py_Compare
+|   7 = @py_Dict
+|   8 = @py_DictComp
+|   9 = @py_Ellipsis
+|   10 = @py_FunctionExpr
+|   11 = @py_GeneratorExp
+|   12 = @py_IfExp
+|   13 = @py_ImportExpr
+|   14 = @py_ImportMember
+|   15 = @py_Lambda
+|   16 = @py_List
+|   17 = @py_ListComp
+|   18 = @py_Guard
+|   19 = @py_Name
+|   20 = @py_Num
+|   21 = @py_Repr
+|   22 = @py_Set
+|   23 = @py_SetComp
+|   24 = @py_Slice
+|   25 = @py_Starred
+|   26 = @py_Str
+|   27 = @py_Subscript
+|   28 = @py_Tuple
+|   29 = @py_UnaryExpr
+|   30 = @py_Yield
+|   31 = @py_YieldFrom
+|   32 = @py_TemplateDottedNotation
+|   33 = @py_Filter
+|   34 = @py_PlaceHolder
+|   35 = @py_Await
+|   36 = @py_Fstring
+|   37 = @py_FormattedValue
+|   38 = @py_AssignExpr
+|   39 = @py_SpecialOperation;
+
+case @py_expr_context.kind of
+    0 = @py_AugLoad
+|   1 = @py_AugStore
+|   2 = @py_Del
+|   3 = @py_Load
+|   4 = @py_Param
+|   5 = @py_Store;
+
+case @py_operator.kind of
+    0 = @py_Add
+|   1 = @py_BitAnd
+|   2 = @py_BitOr
+|   3 = @py_BitXor
+|   4 = @py_Div
+|   5 = @py_FloorDiv
+|   6 = @py_LShift
+|   7 = @py_Mod
+|   8 = @py_Mult
+|   9 = @py_Pow
+|   10 = @py_RShift
+|   11 = @py_Sub
+|   12 = @py_MatMult;
+
+case @py_pattern.kind of
+    0 = @py_MatchAsPattern
+|   1 = @py_MatchOrPattern
+|   2 = @py_MatchLiteralPattern
+|   3 = @py_MatchCapturePattern
+|   4 = @py_MatchWildcardPattern
+|   5 = @py_MatchValuePattern
+|   6 = @py_MatchSequencePattern
+|   7 = @py_MatchStarPattern
+|   8 = @py_MatchMappingPattern
+|   9 = @py_MatchDoubleStarPattern
+|   10 = @py_MatchKeyValuePattern
+|   11 = @py_MatchClassPattern
+|   12 = @py_MatchKeywordPattern;
+
+case @py_stmt.kind of
+    0 = @py_Assert
+|   1 = @py_Assign
+|   2 = @py_AugAssign
+|   3 = @py_Break
+|   4 = @py_Continue
+|   5 = @py_Delete
+|   6 = @py_ExceptStmt
+|   7 = @py_ExceptGroupStmt
+|   8 = @py_Exec
+|   9 = @py_Expr_stmt
+|   10 = @py_For
+|   11 = @py_Global
+|   12 = @py_If
+|   13 = @py_Import
+|   14 = @py_ImportStar
+|   15 = @py_MatchStmt
+|   16 = @py_Case
+|   17 = @py_Nonlocal
+|   18 = @py_Pass
+|   19 = @py_Print
+|   20 = @py_Raise
+|   21 = @py_Return
+|   22 = @py_Try
+|   23 = @py_While
+|   24 = @py_With
+|   25 = @py_TemplateWrite
+|   26 = @py_AnnAssign
+|   27 = @py_TypeAlias;
+
+case @py_type_parameter.kind of
+    0 = @py_ParamSpec
+|   1 = @py_TypeVar
+|   2 = @py_TypeVarTuple;
+
+case @py_unaryop.kind of
+    0 = @py_Invert
+|   1 = @py_Not
+|   2 = @py_UAdd
+|   3 = @py_USub;
+
+@py_Bytes_or_Str = @py_Bytes | @py_Str;
+
+@py_Function_parent = @py_DictComp | @py_FunctionExpr | @py_GeneratorExp | @py_Lambda | @py_ListComp | @py_SetComp;
+
+@py_arguments_parent = @py_FunctionExpr | @py_Lambda;
+
+@py_ast_node = @py_Class | @py_Function | @py_Module | @py_StringPart | @py_comprehension | @py_dict_item | @py_expr | @py_pattern | @py_stmt | @py_type_parameter;
+
+@py_bool_parent = @py_For | @py_Function | @py_Print | @py_With | @py_expr | @py_pattern;
+
+@py_dict_item_list_parent = @py_Call | @py_ClassExpr | @py_Dict;
+
+@py_expr_context_parent = @py_Attribute | @py_List | @py_Name | @py_PlaceHolder | @py_Starred | @py_Subscript | @py_TemplateDottedNotation | @py_Tuple;
+
+@py_expr_list_parent = @py_Assign | @py_BoolExpr | @py_Call | @py_ClassExpr | @py_Compare | @py_Delete | @py_Fstring | @py_Function | @py_List | @py_Print | @py_Set | @py_SpecialOperation | @py_Tuple | @py_arguments | @py_comprehension;
+
+@py_expr_or_stmt = @py_expr | @py_stmt;
+
+@py_expr_parent = @py_AnnAssign | @py_Assert | @py_Assign | @py_AssignExpr | @py_Attribute | @py_AugAssign | @py_Await | @py_BinaryExpr | @py_Call | @py_Case | @py_Compare | @py_DictComp | @py_DictUnpacking | @py_ExceptGroupStmt | @py_ExceptStmt | @py_Exec | @py_Expr_stmt | @py_Filter | @py_For | @py_FormattedValue | @py_Function | @py_FunctionExpr | @py_GeneratorExp | @py_Guard | @py_If | @py_IfExp | @py_ImportMember | @py_ImportStar | @py_KeyValuePair | @py_ListComp | @py_MatchAsPattern | @py_MatchCapturePattern | @py_MatchClassPattern | @py_MatchKeywordPattern | @py_MatchLiteralPattern | @py_MatchStmt | @py_MatchValuePattern | @py_ParamSpec | @py_Print | @py_Raise | @py_Repr | @py_Return | @py_SetComp | @py_Slice | @py_Starred | @py_Subscript | @py_TemplateDottedNotation | @py_TemplateWrite | @py_TypeAlias | @py_TypeVar | @py_TypeVarTuple | @py_UnaryExpr | @py_While | @py_With | @py_Yield | @py_YieldFrom | @py_alias | @py_arguments | @py_comprehension | @py_expr_list | @py_keyword | @py_parameter_list;
+
+@py_location_parent = @py_DictUnpacking | @py_KeyValuePair | @py_StringPart | @py_comprehension | @py_expr | @py_keyword | @py_pattern | @py_stmt | @py_type_parameter;
+
+@py_parameter = @py_Name | @py_Tuple;
+
+@py_pattern_list_parent = @py_MatchClassPattern | @py_MatchMappingPattern | @py_MatchOrPattern | @py_MatchSequencePattern;
+
+@py_pattern_parent = @py_Case | @py_MatchAsPattern | @py_MatchDoubleStarPattern | @py_MatchKeyValuePattern | @py_MatchKeywordPattern | @py_MatchStarPattern | @py_pattern_list;
+
+@py_scope = @py_Class | @py_Function | @py_Module;
+
+@py_stmt_list_parent = @py_Case | @py_Class | @py_ExceptGroupStmt | @py_ExceptStmt | @py_For | @py_Function | @py_If | @py_MatchStmt | @py_Module | @py_Try | @py_While | @py_With;
+
+@py_str_list_parent = @py_Global | @py_Nonlocal;
+
+@py_str_parent = @py_Attribute | @py_Class | @py_ClassExpr | @py_FormattedValue | @py_Function | @py_FunctionExpr | @py_ImportExpr | @py_ImportMember | @py_Module | @py_SpecialOperation | @py_Str | @py_StringPart | @py_TemplateDottedNotation | @py_keyword | @py_str_list;
+
+@py_type_parameter_list_parent = @py_ClassExpr | @py_Function | @py_TypeAlias;
+
+@py_variable_parent = @py_Name | @py_PlaceHolder;
+
+
+/*
+ * End of auto-generated part
+ */
+
+
+
+/* Map relative names to absolute names for imports */
+py_absolute_names(int module : @py_Module ref,
+                  varchar(1) relname : string ref,
+                  varchar(1) absname : string ref);
+
+py_exports(int id : @py_Module ref,
+           varchar(1) name : string ref);
+
+/* Successor information */
+py_successors(int predecessor : @py_flow_node ref,
+              int successor : @py_flow_node ref);
+
+py_true_successors(int predecessor : @py_flow_node ref,
+              int successor : @py_flow_node ref);
+
+py_exception_successors(int predecessor : @py_flow_node ref,
+              int successor : @py_flow_node ref);
+
+py_false_successors(int predecessor : @py_flow_node ref,
+              int successor : @py_flow_node ref);
+
+py_flow_bb_node(unique int flownode : @py_flow_node,
+             int realnode : @py_ast_node ref,
+             int basicblock : @py_flow_node ref,
+             int index : int ref);
+
+py_scope_flow(int flow : @py_flow_node ref,
+              int scope : @py_scope ref,
+              int kind : int ref);
+
+py_idoms(unique int node : @py_flow_node ref,
+         int immediate_dominator : @py_flow_node ref);
+
+py_ssa_phi(int phi : @py_ssa_var ref,
+           int arg: @py_ssa_var ref);
+
+py_ssa_var(unique int id : @py_ssa_var,
+            int var : @py_variable ref);
+
+py_ssa_use(int node: @py_flow_node ref,
+           int var : @py_ssa_var ref);
+
+py_ssa_defn(unique int id : @py_ssa_var ref,
+                  int node: @py_flow_node ref);
+
+@py_base_var = @py_variable | @py_ssa_var;
+
+py_scopes(unique int node : @py_expr_or_stmt ref,
+         int scope : @py_scope ref);
+
+py_scope_location(unique int id : @location ref,
+                   unique int scope : @py_scope ref);
+
+py_flags_versioned(varchar(1) name : string ref,
+                   varchar(1) value : string ref,
+                   varchar(1) version : string ref);
+
+py_syntax_error_versioned(unique int id : @location ref,
+                varchar(1) message : string ref,
+                varchar(1) version : string ref);
+
+py_comments(unique int id : @py_comment,
+           varchar(1) text : string ref,
+           unique int location : @location ref);
+
+/* Type information support */
+
+py_cobjects(unique int obj : @py_cobject);
+
+py_cobjecttypes(unique int obj : @py_cobject ref,
+                int typeof : @py_cobject ref);
+
+py_cobjectnames(unique int obj : @py_cobject ref,
+                varchar(1) name : string ref);
+
+/* Kind should be 0 for introspection, > 0 from source, as follows:
+   1 from C extension source
+ */
+py_cobject_sources(int obj : @py_cobject ref,
+                  int kind : int ref);
+
+py_cmembers_versioned(int object : @py_cobject ref,
+                      varchar(1) name : string ref,
+                      int member : @py_cobject ref,
+                      varchar(1) version : string ref);
+
+py_citems(int object : @py_cobject ref,
+            int index : int ref,
+            int member : @py_cobject ref);
+
+ext_argtype(int funcid : @py_object ref,
+            int arg : int ref,
+            int typeid : @py_object ref);
+
+ext_rettype(int funcid : @py_object ref,
+            int typeid : @py_object ref);
+
+ext_proptype(int propid : @py_object ref,
+             int typeid : @py_object ref);
+
+ext_argreturn(int funcid : @py_object ref,
+              int arg : int ref);
+
+py_special_objects(unique int obj : @py_cobject ref,
+                   unique varchar(1) name : string ref);
+
+py_decorated_object(int object : @py_object ref,
+                    int level: int ref);
+
+@py_object = @py_cobject | @py_flow_node;
+
+@py_source_element = @py_ast_node | @container;
diff --git a/python/downgrades/6a1f497168da2f43828161d3c86db7d4c94c2b53/semmlecode.python.dbscheme b/python/downgrades/6a1f497168da2f43828161d3c86db7d4c94c2b53/semmlecode.python.dbscheme
new file mode 100644
index 00000000000..5af903da088
--- /dev/null
+++ b/python/downgrades/6a1f497168da2f43828161d3c86db7d4c94c2b53/semmlecode.python.dbscheme
@@ -0,0 +1,1236 @@
+/*
+ *      This dbscheme is auto-generated by 'semmle/dbscheme_gen.py'.
+ *      WARNING: Any modifications to this file will be lost.
+ *      Relations can be changed by modifying master.py or
+ *      by adding rules to dbscheme.template
+ */
+
+/* This is a dummy line to alter the dbscheme, so we can make a database upgrade
+ * without actually changing any of the dbscheme predicates. It contains a date
+ * to allow for such updates in the future as well.
+ *
+ * 2020-07-02
+ *
+ * DO NOT remove this comment carelessly, since it can revert the dbscheme back to a
+ * previously seen state (matching a previously seen SHA), which would make the upgrade
+ * mechanism not work properly.
+ */
+
+/*- DEPRECATED: External defects and metrics -*/
+
+externalDefects(
+  unique int id : @externalDefect,
+  varchar(900) queryPath : string ref,
+  int location : @location ref,
+  varchar(900) message : string ref,
+  float severity : float ref
+);
+
+externalMetrics(
+  unique int id : @externalMetric,
+  varchar(900) queryPath : string ref,
+  int location : @location ref,
+  float value : float ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- DEPRECATED: Snapshot date -*/
+
+snapshotDate(unique date snapshotDate : date ref);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- DEPRECATED: Duplicate code -*/
+
+duplicateCode(
+  unique int id : @duplication,
+  string relativePath : string ref,
+  int equivClass : int ref
+);
+
+similarCode(
+  unique int id : @similarity,
+  string relativePath : string ref,
+  int equivClass : int ref
+);
+
+@duplication_or_similarity = @duplication | @similarity
+
+tokens(
+  int id : @duplication_or_similarity ref,
+  int offset : int ref,
+  int beginLine : int ref,
+  int beginColumn : int ref,
+  int endLine : int ref,
+  int endColumn : int ref
+);
+
+/*- DEPRECATED: Version control data -*/
+
+svnentries(
+  unique int id : @svnentry,
+  string revision : string ref,
+  string author : string ref,
+  date revisionDate : date ref,
+  int changeSize : int ref
+)
+
+svnaffectedfiles(
+  int id : @svnentry ref,
+  int file : @file ref,
+  string action : string ref
+)
+
+svnentrymsg(
+  unique int id : @svnentry ref,
+  string message : string ref
+)
+
+svnchurn(
+  int commit : @svnentry ref,
+  int file : @file ref,
+  int addedLines : int ref,
+  int deletedLines : int ref
+)
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error;
+
+/*- Python dbscheme -*/
+
+/*
+ * Line metrics
+ */
+py_codelines(int id : @py_scope ref,
+             int count : int ref);
+
+py_commentlines(int id : @py_scope ref,
+                int count : int ref);
+
+py_docstringlines(int id : @py_scope ref,
+                int count : int ref);
+
+py_alllines(int id : @py_scope ref,
+                int count : int ref);
+
+/****************************
+        Python dbscheme
+****************************/
+
+@sourceline = @file | @py_Module | @xmllocatable;
+
+@location = @location_ast | @location_default ;
+
+locations_ast(unique int id: @location_ast,
+          int module: @py_Module ref,
+          int beginLine: int ref,
+          int beginColumn: int ref,
+          int endLine: int ref,
+          int endColumn: int ref);
+
+file_contents(unique int file: @file ref, string contents: string ref);
+
+py_module_path(int module: @py_Module ref, int file: @container ref);
+
+variable(unique int id : @py_variable,
+         int scope : @py_scope ref,
+         varchar(1) name : string ref);
+
+py_line_lengths(unique int id : @py_line,
+                int file: @py_Module ref,
+                int line : int ref,
+                int length : int ref);
+
+py_extracted_version(int module : @py_Module ref,
+                     varchar(1) version : string ref);
+
+/* AUTO GENERATED PART STARTS HERE */
+
+
+/* <Field> AnnAssign.location = 0, location */
+/* <Field> AnnAssign.value = 1, expr */
+/* <Field> AnnAssign.annotation = 2, expr */
+/* <Field> AnnAssign.target = 3, expr */
+
+/* <Field> Assert.location = 0, location */
+/* <Field> Assert.test = 1, expr */
+/* <Field> Assert.msg = 2, expr */
+
+/* <Field> Assign.location = 0, location */
+/* <Field> Assign.value = 1, expr */
+/* <Field> Assign.targets = 2, expr_list */
+
+/* <Field> AssignExpr.location = 0, location */
+/* <Field> AssignExpr.parenthesised = 1, bool */
+/* <Field> AssignExpr.value = 2, expr */
+/* <Field> AssignExpr.target = 3, expr */
+
+/* <Field> Attribute.location = 0, location */
+/* <Field> Attribute.parenthesised = 1, bool */
+/* <Field> Attribute.value = 2, expr */
+/* <Field> Attribute.attr = 3, str */
+/* <Field> Attribute.ctx = 4, expr_context */
+
+/* <Field> AugAssign.location = 0, location */
+/* <Field> AugAssign.operation = 1, BinOp */
+
+/* <Field> Await.location = 0, location */
+/* <Field> Await.parenthesised = 1, bool */
+/* <Field> Await.value = 2, expr */
+
+/* <Field> BinaryExpr.location = 0, location */
+/* <Field> BinaryExpr.parenthesised = 1, bool */
+/* <Field> BinaryExpr.left = 2, expr */
+/* <Field> BinaryExpr.op = 3, operator */
+/* <Field> BinaryExpr.right = 4, expr */
+/* <Parent> BinaryExpr = AugAssign  */
+
+/* <Field> BoolExpr.location = 0, location */
+/* <Field> BoolExpr.parenthesised = 1, bool */
+/* <Field> BoolExpr.op = 2, boolop */
+/* <Field> BoolExpr.values = 3, expr_list */
+
+/* <Field> Break.location = 0, location */
+
+/* <Field> Bytes.location = 0, location */
+/* <Field> Bytes.parenthesised = 1, bool */
+/* <Field> Bytes.s = 2, bytes */
+/* <Field> Bytes.prefix = 3, bytes */
+/* <Field> Bytes.implicitly_concatenated_parts = 4, StringPart_list */
+
+/* <Field> Call.location = 0, location */
+/* <Field> Call.parenthesised = 1, bool */
+/* <Field> Call.func = 2, expr */
+/* <Field> Call.positional_args = 3, expr_list */
+/* <Field> Call.named_args = 4, dict_item_list */
+
+/* <Field> Case.location = 0, location */
+/* <Field> Case.pattern = 1, pattern */
+/* <Field> Case.guard = 2, expr */
+/* <Field> Case.body = 3, stmt_list */
+
+/* <Field> Class.name = 0, str */
+/* <Field> Class.body = 1, stmt_list */
+/* <Parent> Class = ClassExpr  */
+
+/* <Field> ClassExpr.location = 0, location */
+/* <Field> ClassExpr.parenthesised = 1, bool */
+/* <Field> ClassExpr.name = 2, str */
+/* <Field> ClassExpr.bases = 3, expr_list */
+/* <Field> ClassExpr.keywords = 4, dict_item_list */
+/* <Field> ClassExpr.inner_scope = 5, Class */
+/* <Field> ClassExpr.type_parameters = 6, type_parameter_list */
+
+/* <Field> Compare.location = 0, location */
+/* <Field> Compare.parenthesised = 1, bool */
+/* <Field> Compare.left = 2, expr */
+/* <Field> Compare.ops = 3, cmpop_list */
+/* <Field> Compare.comparators = 4, expr_list */
+
+/* <Field> Continue.location = 0, location */
+
+/* <Field> Delete.location = 0, location */
+/* <Field> Delete.targets = 1, expr_list */
+
+/* <Field> Dict.location = 0, location */
+/* <Field> Dict.parenthesised = 1, bool */
+/* <Field> Dict.items = 2, dict_item_list */
+
+/* <Field> DictComp.location = 0, location */
+/* <Field> DictComp.parenthesised = 1, bool */
+/* <Field> DictComp.function = 2, Function */
+/* <Field> DictComp.iterable = 3, expr */
+
+/* <Field> DictUnpacking.location = 0, location */
+/* <Field> DictUnpacking.value = 1, expr */
+
+/* <Field> Ellipsis.location = 0, location */
+/* <Field> Ellipsis.parenthesised = 1, bool */
+
+/* <Field> ExceptGroupStmt.location = 0, location */
+/* <Field> ExceptGroupStmt.type = 1, expr */
+/* <Field> ExceptGroupStmt.name = 2, expr */
+/* <Field> ExceptGroupStmt.body = 3, stmt_list */
+
+/* <Field> ExceptStmt.location = 0, location */
+/* <Field> ExceptStmt.type = 1, expr */
+/* <Field> ExceptStmt.name = 2, expr */
+/* <Field> ExceptStmt.body = 3, stmt_list */
+
+/* <Field> Exec.location = 0, location */
+/* <Field> Exec.body = 1, expr */
+/* <Field> Exec.globals = 2, expr */
+/* <Field> Exec.locals = 3, expr */
+
+/* <Field> ExprStmt.location = 0, location */
+/* <Field> ExprStmt.value = 1, expr */
+
+/* <Field> Filter.location = 0, location */
+/* <Field> Filter.parenthesised = 1, bool */
+/* <Field> Filter.value = 2, expr */
+/* <Field> Filter.filter = 3, expr */
+
+/* <Field> For.location = 0, location */
+/* <Field> For.target = 1, expr */
+/* <Field> For.iter = 2, expr */
+/* <Field> For.body = 3, stmt_list */
+/* <Field> For.orelse = 4, stmt_list */
+/* <Field> For.is_async = 5, bool */
+
+/* <Field> FormattedValue.location = 0, location */
+/* <Field> FormattedValue.parenthesised = 1, bool */
+/* <Field> FormattedValue.value = 2, expr */
+/* <Field> FormattedValue.conversion = 3, str */
+/* <Field> FormattedValue.format_spec = 4, JoinedStr */
+
+/* <Field> Function.name = 0, str */
+/* <Field> Function.args = 1, parameter_list */
+/* <Field> Function.vararg = 2, expr */
+/* <Field> Function.kwonlyargs = 3, expr_list */
+/* <Field> Function.kwarg = 4, expr */
+/* <Field> Function.body = 5, stmt_list */
+/* <Field> Function.is_async = 6, bool */
+/* <Field> Function.type_parameters = 7, type_parameter_list */
+/* <Parent> Function = FunctionParent  */
+
+/* <Field> FunctionExpr.location = 0, location */
+/* <Field> FunctionExpr.parenthesised = 1, bool */
+/* <Field> FunctionExpr.name = 2, str */
+/* <Field> FunctionExpr.args = 3, arguments */
+/* <Field> FunctionExpr.returns = 4, expr */
+/* <Field> FunctionExpr.inner_scope = 5, Function */
+
+/* <Field> GeneratorExp.location = 0, location */
+/* <Field> GeneratorExp.parenthesised = 1, bool */
+/* <Field> GeneratorExp.function = 2, Function */
+/* <Field> GeneratorExp.iterable = 3, expr */
+
+/* <Field> Global.location = 0, location */
+/* <Field> Global.names = 1, str_list */
+
+/* <Field> Guard.location = 0, location */
+/* <Field> Guard.parenthesised = 1, bool */
+/* <Field> Guard.test = 2, expr */
+
+/* <Field> If.location = 0, location */
+/* <Field> If.test = 1, expr */
+/* <Field> If.body = 2, stmt_list */
+/* <Field> If.orelse = 3, stmt_list */
+
+/* <Field> IfExp.location = 0, location */
+/* <Field> IfExp.parenthesised = 1, bool */
+/* <Field> IfExp.test = 2, expr */
+/* <Field> IfExp.body = 3, expr */
+/* <Field> IfExp.orelse = 4, expr */
+
+/* <Field> Import.location = 0, location */
+/* <Field> Import.names = 1, alias_list */
+
+/* <Field> ImportExpr.location = 0, location */
+/* <Field> ImportExpr.parenthesised = 1, bool */
+/* <Field> ImportExpr.level = 2, int */
+/* <Field> ImportExpr.name = 3, str */
+/* <Field> ImportExpr.top = 4, bool */
+
+/* <Field> ImportStar.location = 0, location */
+/* <Field> ImportStar.module = 1, expr */
+
+/* <Field> ImportMember.location = 0, location */
+/* <Field> ImportMember.parenthesised = 1, bool */
+/* <Field> ImportMember.module = 2, expr */
+/* <Field> ImportMember.name = 3, str */
+
+/* <Field> Fstring.location = 0, location */
+/* <Field> Fstring.parenthesised = 1, bool */
+/* <Field> Fstring.values = 2, expr_list */
+/* <Parent> Fstring = FormattedValue  */
+
+/* <Field> KeyValuePair.location = 0, location */
+/* <Field> KeyValuePair.value = 1, expr */
+/* <Field> KeyValuePair.key = 2, expr */
+
+/* <Field> Lambda.location = 0, location */
+/* <Field> Lambda.parenthesised = 1, bool */
+/* <Field> Lambda.args = 2, arguments */
+/* <Field> Lambda.inner_scope = 3, Function */
+
+/* <Field> List.location = 0, location */
+/* <Field> List.parenthesised = 1, bool */
+/* <Field> List.elts = 2, expr_list */
+/* <Field> List.ctx = 3, expr_context */
+
+/* <Field> ListComp.location = 0, location */
+/* <Field> ListComp.parenthesised = 1, bool */
+/* <Field> ListComp.function = 2, Function */
+/* <Field> ListComp.iterable = 3, expr */
+/* <Field> ListComp.generators = 4, comprehension_list */
+/* <Field> ListComp.elt = 5, expr */
+
+/* <Field> MatchStmt.location = 0, location */
+/* <Field> MatchStmt.subject = 1, expr */
+/* <Field> MatchStmt.cases = 2, stmt_list */
+
+/* <Field> MatchAsPattern.location = 0, location */
+/* <Field> MatchAsPattern.parenthesised = 1, bool */
+/* <Field> MatchAsPattern.pattern = 2, pattern */
+/* <Field> MatchAsPattern.alias = 3, expr */
+
+/* <Field> MatchCapturePattern.location = 0, location */
+/* <Field> MatchCapturePattern.parenthesised = 1, bool */
+/* <Field> MatchCapturePattern.variable = 2, expr */
+
+/* <Field> MatchClassPattern.location = 0, location */
+/* <Field> MatchClassPattern.parenthesised = 1, bool */
+/* <Field> MatchClassPattern.class = 2, expr */
+/* <Field> MatchClassPattern.class_name = 3, expr */
+/* <Field> MatchClassPattern.positional = 4, pattern_list */
+/* <Field> MatchClassPattern.keyword = 5, pattern_list */
+
+/* <Field> MatchDoubleStarPattern.location = 0, location */
+/* <Field> MatchDoubleStarPattern.parenthesised = 1, bool */
+/* <Field> MatchDoubleStarPattern.target = 2, pattern */
+
+/* <Field> MatchKeyValuePattern.location = 0, location */
+/* <Field> MatchKeyValuePattern.parenthesised = 1, bool */
+/* <Field> MatchKeyValuePattern.key = 2, pattern */
+/* <Field> MatchKeyValuePattern.value = 3, pattern */
+
+/* <Field> MatchKeywordPattern.location = 0, location */
+/* <Field> MatchKeywordPattern.parenthesised = 1, bool */
+/* <Field> MatchKeywordPattern.attribute = 2, expr */
+/* <Field> MatchKeywordPattern.value = 3, pattern */
+
+/* <Field> MatchLiteralPattern.location = 0, location */
+/* <Field> MatchLiteralPattern.parenthesised = 1, bool */
+/* <Field> MatchLiteralPattern.literal = 2, expr */
+
+/* <Field> MatchMappingPattern.location = 0, location */
+/* <Field> MatchMappingPattern.parenthesised = 1, bool */
+/* <Field> MatchMappingPattern.mappings = 2, pattern_list */
+
+/* <Field> MatchOrPattern.location = 0, location */
+/* <Field> MatchOrPattern.parenthesised = 1, bool */
+/* <Field> MatchOrPattern.patterns = 2, pattern_list */
+
+/* <Field> MatchSequencePattern.location = 0, location */
+/* <Field> MatchSequencePattern.parenthesised = 1, bool */
+/* <Field> MatchSequencePattern.patterns = 2, pattern_list */
+
+/* <Field> MatchStarPattern.location = 0, location */
+/* <Field> MatchStarPattern.parenthesised = 1, bool */
+/* <Field> MatchStarPattern.target = 2, pattern */
+
+/* <Field> MatchValuePattern.location = 0, location */
+/* <Field> MatchValuePattern.parenthesised = 1, bool */
+/* <Field> MatchValuePattern.value = 2, expr */
+
+/* <Field> MatchWildcardPattern.location = 0, location */
+/* <Field> MatchWildcardPattern.parenthesised = 1, bool */
+
+/* <Field> Module.name = 0, str */
+/* <Field> Module.hash = 1, str */
+/* <Field> Module.body = 2, stmt_list */
+/* <Field> Module.kind = 3, str */
+
+/* <Field> Name.location = 0, location */
+/* <Field> Name.parenthesised = 1, bool */
+/* <Field> Name.variable = 2, variable */
+/* <Field> Name.ctx = 3, expr_context */
+/* <Parent> Name = ParameterList  */
+
+/* <Field> Nonlocal.location = 0, location */
+/* <Field> Nonlocal.names = 1, str_list */
+
+/* <Field> Num.location = 0, location */
+/* <Field> Num.parenthesised = 1, bool */
+/* <Field> Num.n = 2, number */
+/* <Field> Num.text = 3, number */
+
+/* <Field> ParamSpec.location = 0, location */
+/* <Field> ParamSpec.name = 1, expr */
+/* <Field> ParamSpec.default = 2, expr */
+
+/* <Field> Pass.location = 0, location */
+
+/* <Field> PlaceHolder.location = 0, location */
+/* <Field> PlaceHolder.parenthesised = 1, bool */
+/* <Field> PlaceHolder.variable = 2, variable */
+/* <Field> PlaceHolder.ctx = 3, expr_context */
+
+/* <Field> Print.location = 0, location */
+/* <Field> Print.dest = 1, expr */
+/* <Field> Print.values = 2, expr_list */
+/* <Field> Print.nl = 3, bool */
+
+/* <Field> Raise.location = 0, location */
+/* <Field> Raise.exc = 1, expr */
+/* <Field> Raise.cause = 2, expr */
+/* <Field> Raise.type = 3, expr */
+/* <Field> Raise.inst = 4, expr */
+/* <Field> Raise.tback = 5, expr */
+
+/* <Field> Repr.location = 0, location */
+/* <Field> Repr.parenthesised = 1, bool */
+/* <Field> Repr.value = 2, expr */
+
+/* <Field> Return.location = 0, location */
+/* <Field> Return.value = 1, expr */
+
+/* <Field> Set.location = 0, location */
+/* <Field> Set.parenthesised = 1, bool */
+/* <Field> Set.elts = 2, expr_list */
+
+/* <Field> SetComp.location = 0, location */
+/* <Field> SetComp.parenthesised = 1, bool */
+/* <Field> SetComp.function = 2, Function */
+/* <Field> SetComp.iterable = 3, expr */
+
+/* <Field> Slice.location = 0, location */
+/* <Field> Slice.parenthesised = 1, bool */
+/* <Field> Slice.start = 2, expr */
+/* <Field> Slice.stop = 3, expr */
+/* <Field> Slice.step = 4, expr */
+
+/* <Field> SpecialOperation.location = 0, location */
+/* <Field> SpecialOperation.parenthesised = 1, bool */
+/* <Field> SpecialOperation.name = 2, str */
+/* <Field> SpecialOperation.arguments = 3, expr_list */
+
+/* <Field> Starred.location = 0, location */
+/* <Field> Starred.parenthesised = 1, bool */
+/* <Field> Starred.value = 2, expr */
+/* <Field> Starred.ctx = 3, expr_context */
+
+/* <Field> Str.location = 0, location */
+/* <Field> Str.parenthesised = 1, bool */
+/* <Field> Str.s = 2, str */
+/* <Field> Str.prefix = 3, str */
+/* <Field> Str.implicitly_concatenated_parts = 4, StringPart_list */
+
+/* <Field> StringPart.text = 0, str */
+/* <Field> StringPart.location = 1, location */
+/* <Parent> StringPart = StringPartList  */
+/* <Parent> StringPartList = BytesOrStr  */
+
+/* <Field> Subscript.location = 0, location */
+/* <Field> Subscript.parenthesised = 1, bool */
+/* <Field> Subscript.value = 2, expr */
+/* <Field> Subscript.index = 3, expr */
+/* <Field> Subscript.ctx = 4, expr_context */
+
+/* <Field> TemplateDottedNotation.location = 0, location */
+/* <Field> TemplateDottedNotation.parenthesised = 1, bool */
+/* <Field> TemplateDottedNotation.value = 2, expr */
+/* <Field> TemplateDottedNotation.attr = 3, str */
+/* <Field> TemplateDottedNotation.ctx = 4, expr_context */
+
+/* <Field> TemplateWrite.location = 0, location */
+/* <Field> TemplateWrite.value = 1, expr */
+
+/* <Field> Try.location = 0, location */
+/* <Field> Try.body = 1, stmt_list */
+/* <Field> Try.orelse = 2, stmt_list */
+/* <Field> Try.handlers = 3, stmt_list */
+/* <Field> Try.finalbody = 4, stmt_list */
+
+/* <Field> Tuple.location = 0, location */
+/* <Field> Tuple.parenthesised = 1, bool */
+/* <Field> Tuple.elts = 2, expr_list */
+/* <Field> Tuple.ctx = 3, expr_context */
+/* <Parent> Tuple = ParameterList  */
+
+/* <Field> TypeAlias.location = 0, location */
+/* <Field> TypeAlias.name = 1, expr */
+/* <Field> TypeAlias.type_parameters = 2, type_parameter_list */
+/* <Field> TypeAlias.value = 3, expr */
+
+/* <Field> TypeVar.location = 0, location */
+/* <Field> TypeVar.name = 1, expr */
+/* <Field> TypeVar.bound = 2, expr */
+/* <Field> TypeVar.default = 3, expr */
+
+/* <Field> TypeVarTuple.location = 0, location */
+/* <Field> TypeVarTuple.name = 1, expr */
+/* <Field> TypeVarTuple.default = 2, expr */
+
+/* <Field> UnaryExpr.location = 0, location */
+/* <Field> UnaryExpr.parenthesised = 1, bool */
+/* <Field> UnaryExpr.op = 2, unaryop */
+/* <Field> UnaryExpr.operand = 3, expr */
+
+/* <Field> While.location = 0, location */
+/* <Field> While.test = 1, expr */
+/* <Field> While.body = 2, stmt_list */
+/* <Field> While.orelse = 3, stmt_list */
+
+/* <Field> With.location = 0, location */
+/* <Field> With.context_expr = 1, expr */
+/* <Field> With.optional_vars = 2, expr */
+/* <Field> With.body = 3, stmt_list */
+/* <Field> With.is_async = 4, bool */
+
+/* <Field> Yield.location = 0, location */
+/* <Field> Yield.parenthesised = 1, bool */
+/* <Field> Yield.value = 2, expr */
+
+/* <Field> YieldFrom.location = 0, location */
+/* <Field> YieldFrom.parenthesised = 1, bool */
+/* <Field> YieldFrom.value = 2, expr */
+
+/* <Field> Alias.value = 0, expr */
+/* <Field> Alias.asname = 1, expr */
+/* <Parent> Alias = AliasList  */
+/* <Parent> AliasList = Import  */
+
+/* <Field> Arguments.kw_defaults = 0, expr_list */
+/* <Field> Arguments.defaults = 1, expr_list */
+/* <Field> Arguments.annotations = 2, expr_list */
+/* <Field> Arguments.varargannotation = 3, expr */
+/* <Field> Arguments.kwargannotation = 4, expr */
+/* <Field> Arguments.kw_annotations = 5, expr_list */
+/* <Parent> Arguments = ArgumentsParent  */
+/* <Parent> boolean = BoolParent  */
+/* <Parent> Boolop = BoolExpr  */
+/* <Parent> string = Bytes  */
+/* <Parent> Cmpop = CmpopList  */
+/* <Parent> CmpopList = Compare  */
+
+/* <Field> Comprehension.location = 0, location */
+/* <Field> Comprehension.iter = 1, expr */
+/* <Field> Comprehension.target = 2, expr */
+/* <Field> Comprehension.ifs = 3, expr_list */
+/* <Parent> Comprehension = ComprehensionList  */
+/* <Parent> ComprehensionList = ListComp  */
+/* <Parent> DictItem = DictItemList  */
+/* <Parent> DictItemList = DictItemListParent  */
+
+/* <Field> Expr.location = 0, location */
+/* <Field> Expr.parenthesised = 1, bool */
+/* <Parent> Expr = ExprParent  */
+/* <Parent> ExprContext = ExprContextParent  */
+/* <Parent> ExprList = ExprListParent  */
+/* <Parent> int = ImportExpr  */
+
+/* <Field> Keyword.location = 0, location */
+/* <Field> Keyword.value = 1, expr */
+/* <Field> Keyword.arg = 2, str */
+/* <Parent> Location = LocationParent  */
+/* <Parent> string = Num  */
+/* <Parent> Operator = BinaryExpr  */
+/* <Parent> ParameterList = Function  */
+
+/* <Field> Pattern.location = 0, location */
+/* <Field> Pattern.parenthesised = 1, bool */
+/* <Parent> Pattern = PatternParent  */
+/* <Parent> PatternList = PatternListParent  */
+
+/* <Field> Stmt.location = 0, location */
+/* <Parent> Stmt = StmtList  */
+/* <Parent> StmtList = StmtListParent  */
+/* <Parent> string = StrParent  */
+/* <Parent> StringList = StrListParent  */
+
+/* <Field> TypeParameter.location = 0, location */
+/* <Parent> TypeParameter = TypeParameterList  */
+/* <Parent> TypeParameterList = TypeParameterListParent  */
+/* <Parent> Unaryop = UnaryExpr  */
+/* <Parent> Variable = VariableParent  */
+py_Classes(unique int id : @py_Class,
+    unique int parent : @py_ClassExpr ref);
+
+py_Functions(unique int id : @py_Function,
+    unique int parent : @py_Function_parent ref);
+
+py_Modules(unique int id : @py_Module);
+
+py_StringParts(unique int id : @py_StringPart,
+    int parent : @py_StringPart_list ref,
+    int idx : int ref);
+
+py_StringPart_lists(unique int id : @py_StringPart_list,
+    unique int parent : @py_Bytes_or_Str ref);
+
+py_aliases(unique int id : @py_alias,
+    int parent : @py_alias_list ref,
+    int idx : int ref);
+
+py_alias_lists(unique int id : @py_alias_list,
+    unique int parent : @py_Import ref);
+
+py_arguments(unique int id : @py_arguments,
+    unique int parent : @py_arguments_parent ref);
+
+py_bools(int parent : @py_bool_parent ref,
+    int idx : int ref);
+
+py_boolops(unique int id : @py_boolop,
+    int kind: int ref,
+    unique int parent : @py_BoolExpr ref);
+
+py_bytes(varchar(1) id : string ref,
+    int parent : @py_Bytes ref,
+    int idx : int ref);
+
+py_cmpops(unique int id : @py_cmpop,
+    int kind: int ref,
+    int parent : @py_cmpop_list ref,
+    int idx : int ref);
+
+py_cmpop_lists(unique int id : @py_cmpop_list,
+    unique int parent : @py_Compare ref);
+
+py_comprehensions(unique int id : @py_comprehension,
+    int parent : @py_comprehension_list ref,
+    int idx : int ref);
+
+py_comprehension_lists(unique int id : @py_comprehension_list,
+    unique int parent : @py_ListComp ref);
+
+py_dict_items(unique int id : @py_dict_item,
+    int kind: int ref,
+    int parent : @py_dict_item_list ref,
+    int idx : int ref);
+
+py_dict_item_lists(unique int id : @py_dict_item_list,
+    unique int parent : @py_dict_item_list_parent ref);
+
+py_exprs(unique int id : @py_expr,
+    int kind: int ref,
+    int parent : @py_expr_parent ref,
+    int idx : int ref);
+
+py_expr_contexts(unique int id : @py_expr_context,
+    int kind: int ref,
+    unique int parent : @py_expr_context_parent ref);
+
+py_expr_lists(unique int id : @py_expr_list,
+    int parent : @py_expr_list_parent ref,
+    int idx : int ref);
+
+py_ints(int id : int ref,
+    unique int parent : @py_ImportExpr ref);
+
+py_locations(unique int id : @location ref,
+    unique int parent : @py_location_parent ref);
+
+py_numbers(varchar(1) id : string ref,
+    int parent : @py_Num ref,
+    int idx : int ref);
+
+py_operators(unique int id : @py_operator,
+    int kind: int ref,
+    unique int parent : @py_BinaryExpr ref);
+
+py_parameter_lists(unique int id : @py_parameter_list,
+    unique int parent : @py_Function ref);
+
+py_patterns(unique int id : @py_pattern,
+    int kind: int ref,
+    int parent : @py_pattern_parent ref,
+    int idx : int ref);
+
+py_pattern_lists(unique int id : @py_pattern_list,
+    int parent : @py_pattern_list_parent ref,
+    int idx : int ref);
+
+py_stmts(unique int id : @py_stmt,
+    int kind: int ref,
+    int parent : @py_stmt_list ref,
+    int idx : int ref);
+
+py_stmt_lists(unique int id : @py_stmt_list,
+    int parent : @py_stmt_list_parent ref,
+    int idx : int ref);
+
+py_strs(varchar(1) id : string ref,
+    int parent : @py_str_parent ref,
+    int idx : int ref);
+
+py_str_lists(unique int id : @py_str_list,
+    unique int parent : @py_str_list_parent ref);
+
+py_type_parameters(unique int id : @py_type_parameter,
+    int kind: int ref,
+    int parent : @py_type_parameter_list ref,
+    int idx : int ref);
+
+py_type_parameter_lists(unique int id : @py_type_parameter_list,
+    unique int parent : @py_type_parameter_list_parent ref);
+
+py_unaryops(unique int id : @py_unaryop,
+    int kind: int ref,
+    unique int parent : @py_UnaryExpr ref);
+
+py_variables(int id : @py_variable ref,
+    unique int parent : @py_variable_parent ref);
+
+case @py_boolop.kind of
+    0 = @py_And
+|   1 = @py_Or;
+
+case @py_cmpop.kind of
+    0 = @py_Eq
+|   1 = @py_Gt
+|   2 = @py_GtE
+|   3 = @py_In
+|   4 = @py_Is
+|   5 = @py_IsNot
+|   6 = @py_Lt
+|   7 = @py_LtE
+|   8 = @py_NotEq
+|   9 = @py_NotIn;
+
+case @py_dict_item.kind of
+    0 = @py_DictUnpacking
+|   1 = @py_KeyValuePair
+|   2 = @py_keyword;
+
+case @py_expr.kind of
+    0 = @py_Attribute
+|   1 = @py_BinaryExpr
+|   2 = @py_BoolExpr
+|   3 = @py_Bytes
+|   4 = @py_Call
+|   5 = @py_ClassExpr
+|   6 = @py_Compare
+|   7 = @py_Dict
+|   8 = @py_DictComp
+|   9 = @py_Ellipsis
+|   10 = @py_FunctionExpr
+|   11 = @py_GeneratorExp
+|   12 = @py_IfExp
+|   13 = @py_ImportExpr
+|   14 = @py_ImportMember
+|   15 = @py_Lambda
+|   16 = @py_List
+|   17 = @py_ListComp
+|   18 = @py_Guard
+|   19 = @py_Name
+|   20 = @py_Num
+|   21 = @py_Repr
+|   22 = @py_Set
+|   23 = @py_SetComp
+|   24 = @py_Slice
+|   25 = @py_Starred
+|   26 = @py_Str
+|   27 = @py_Subscript
+|   28 = @py_Tuple
+|   29 = @py_UnaryExpr
+|   30 = @py_Yield
+|   31 = @py_YieldFrom
+|   32 = @py_TemplateDottedNotation
+|   33 = @py_Filter
+|   34 = @py_PlaceHolder
+|   35 = @py_Await
+|   36 = @py_Fstring
+|   37 = @py_FormattedValue
+|   38 = @py_AssignExpr
+|   39 = @py_SpecialOperation;
+
+case @py_expr_context.kind of
+    0 = @py_AugLoad
+|   1 = @py_AugStore
+|   2 = @py_Del
+|   3 = @py_Load
+|   4 = @py_Param
+|   5 = @py_Store;
+
+case @py_operator.kind of
+    0 = @py_Add
+|   1 = @py_BitAnd
+|   2 = @py_BitOr
+|   3 = @py_BitXor
+|   4 = @py_Div
+|   5 = @py_FloorDiv
+|   6 = @py_LShift
+|   7 = @py_Mod
+|   8 = @py_Mult
+|   9 = @py_Pow
+|   10 = @py_RShift
+|   11 = @py_Sub
+|   12 = @py_MatMult;
+
+case @py_pattern.kind of
+    0 = @py_MatchAsPattern
+|   1 = @py_MatchOrPattern
+|   2 = @py_MatchLiteralPattern
+|   3 = @py_MatchCapturePattern
+|   4 = @py_MatchWildcardPattern
+|   5 = @py_MatchValuePattern
+|   6 = @py_MatchSequencePattern
+|   7 = @py_MatchStarPattern
+|   8 = @py_MatchMappingPattern
+|   9 = @py_MatchDoubleStarPattern
+|   10 = @py_MatchKeyValuePattern
+|   11 = @py_MatchClassPattern
+|   12 = @py_MatchKeywordPattern;
+
+case @py_stmt.kind of
+    0 = @py_Assert
+|   1 = @py_Assign
+|   2 = @py_AugAssign
+|   3 = @py_Break
+|   4 = @py_Continue
+|   5 = @py_Delete
+|   6 = @py_ExceptStmt
+|   7 = @py_ExceptGroupStmt
+|   8 = @py_Exec
+|   9 = @py_Expr_stmt
+|   10 = @py_For
+|   11 = @py_Global
+|   12 = @py_If
+|   13 = @py_Import
+|   14 = @py_ImportStar
+|   15 = @py_MatchStmt
+|   16 = @py_Case
+|   17 = @py_Nonlocal
+|   18 = @py_Pass
+|   19 = @py_Print
+|   20 = @py_Raise
+|   21 = @py_Return
+|   22 = @py_Try
+|   23 = @py_While
+|   24 = @py_With
+|   25 = @py_TemplateWrite
+|   26 = @py_AnnAssign
+|   27 = @py_TypeAlias;
+
+case @py_type_parameter.kind of
+    0 = @py_ParamSpec
+|   1 = @py_TypeVar
+|   2 = @py_TypeVarTuple;
+
+case @py_unaryop.kind of
+    0 = @py_Invert
+|   1 = @py_Not
+|   2 = @py_UAdd
+|   3 = @py_USub;
+
+@py_Bytes_or_Str = @py_Bytes | @py_Str;
+
+@py_Function_parent = @py_DictComp | @py_FunctionExpr | @py_GeneratorExp | @py_Lambda | @py_ListComp | @py_SetComp;
+
+@py_arguments_parent = @py_FunctionExpr | @py_Lambda;
+
+@py_ast_node = @py_Class | @py_Function | @py_Module | @py_StringPart | @py_comprehension | @py_dict_item | @py_expr | @py_pattern | @py_stmt | @py_type_parameter;
+
+@py_bool_parent = @py_For | @py_Function | @py_Print | @py_With | @py_expr | @py_pattern;
+
+@py_dict_item_list_parent = @py_Call | @py_ClassExpr | @py_Dict;
+
+@py_expr_context_parent = @py_Attribute | @py_List | @py_Name | @py_PlaceHolder | @py_Starred | @py_Subscript | @py_TemplateDottedNotation | @py_Tuple;
+
+@py_expr_list_parent = @py_Assign | @py_BoolExpr | @py_Call | @py_ClassExpr | @py_Compare | @py_Delete | @py_Fstring | @py_Function | @py_List | @py_Print | @py_Set | @py_SpecialOperation | @py_Tuple | @py_arguments | @py_comprehension;
+
+@py_expr_or_stmt = @py_expr | @py_stmt;
+
+@py_expr_parent = @py_AnnAssign | @py_Assert | @py_Assign | @py_AssignExpr | @py_Attribute | @py_AugAssign | @py_Await | @py_BinaryExpr | @py_Call | @py_Case | @py_Compare | @py_DictComp | @py_DictUnpacking | @py_ExceptGroupStmt | @py_ExceptStmt | @py_Exec | @py_Expr_stmt | @py_Filter | @py_For | @py_FormattedValue | @py_Function | @py_FunctionExpr | @py_GeneratorExp | @py_Guard | @py_If | @py_IfExp | @py_ImportMember | @py_ImportStar | @py_KeyValuePair | @py_ListComp | @py_MatchAsPattern | @py_MatchCapturePattern | @py_MatchClassPattern | @py_MatchKeywordPattern | @py_MatchLiteralPattern | @py_MatchStmt | @py_MatchValuePattern | @py_ParamSpec | @py_Print | @py_Raise | @py_Repr | @py_Return | @py_SetComp | @py_Slice | @py_Starred | @py_Subscript | @py_TemplateDottedNotation | @py_TemplateWrite | @py_TypeAlias | @py_TypeVar | @py_TypeVarTuple | @py_UnaryExpr | @py_While | @py_With | @py_Yield | @py_YieldFrom | @py_alias | @py_arguments | @py_comprehension | @py_expr_list | @py_keyword | @py_parameter_list;
+
+@py_location_parent = @py_DictUnpacking | @py_KeyValuePair | @py_StringPart | @py_comprehension | @py_expr | @py_keyword | @py_pattern | @py_stmt | @py_type_parameter;
+
+@py_parameter = @py_Name | @py_Tuple;
+
+@py_pattern_list_parent = @py_MatchClassPattern | @py_MatchMappingPattern | @py_MatchOrPattern | @py_MatchSequencePattern;
+
+@py_pattern_parent = @py_Case | @py_MatchAsPattern | @py_MatchDoubleStarPattern | @py_MatchKeyValuePattern | @py_MatchKeywordPattern | @py_MatchStarPattern | @py_pattern_list;
+
+@py_scope = @py_Class | @py_Function | @py_Module;
+
+@py_stmt_list_parent = @py_Case | @py_Class | @py_ExceptGroupStmt | @py_ExceptStmt | @py_For | @py_Function | @py_If | @py_MatchStmt | @py_Module | @py_Try | @py_While | @py_With;
+
+@py_str_list_parent = @py_Global | @py_Nonlocal;
+
+@py_str_parent = @py_Attribute | @py_Class | @py_ClassExpr | @py_FormattedValue | @py_Function | @py_FunctionExpr | @py_ImportExpr | @py_ImportMember | @py_Module | @py_SpecialOperation | @py_Str | @py_StringPart | @py_TemplateDottedNotation | @py_keyword | @py_str_list;
+
+@py_type_parameter_list_parent = @py_ClassExpr | @py_Function | @py_TypeAlias;
+
+@py_variable_parent = @py_Name | @py_PlaceHolder;
+
+
+/*
+ * End of auto-generated part
+ */
+
+
+
+/* Map relative names to absolute names for imports */
+py_absolute_names(int module : @py_Module ref,
+                  varchar(1) relname : string ref,
+                  varchar(1) absname : string ref);
+
+py_exports(int id : @py_Module ref,
+           varchar(1) name : string ref);
+
+/* Successor information */
+py_successors(int predecessor : @py_flow_node ref,
+              int successor : @py_flow_node ref);
+
+py_true_successors(int predecessor : @py_flow_node ref,
+              int successor : @py_flow_node ref);
+
+py_exception_successors(int predecessor : @py_flow_node ref,
+              int successor : @py_flow_node ref);
+
+py_false_successors(int predecessor : @py_flow_node ref,
+              int successor : @py_flow_node ref);
+
+py_flow_bb_node(unique int flownode : @py_flow_node,
+             int realnode : @py_ast_node ref,
+             int basicblock : @py_flow_node ref,
+             int index : int ref);
+
+py_scope_flow(int flow : @py_flow_node ref,
+              int scope : @py_scope ref,
+              int kind : int ref);
+
+py_idoms(unique int node : @py_flow_node ref,
+         int immediate_dominator : @py_flow_node ref);
+
+py_ssa_phi(int phi : @py_ssa_var ref,
+           int arg: @py_ssa_var ref);
+
+py_ssa_var(unique int id : @py_ssa_var,
+            int var : @py_variable ref);
+
+py_ssa_use(int node: @py_flow_node ref,
+           int var : @py_ssa_var ref);
+
+py_ssa_defn(unique int id : @py_ssa_var ref,
+                  int node: @py_flow_node ref);
+
+@py_base_var = @py_variable | @py_ssa_var;
+
+py_scopes(unique int node : @py_expr_or_stmt ref,
+         int scope : @py_scope ref);
+
+py_scope_location(unique int id : @location ref,
+                   unique int scope : @py_scope ref);
+
+py_flags_versioned(varchar(1) name : string ref,
+                   varchar(1) value : string ref,
+                   varchar(1) version : string ref);
+
+py_syntax_error_versioned(unique int id : @location ref,
+                varchar(1) message : string ref,
+                varchar(1) version : string ref);
+
+py_comments(unique int id : @py_comment,
+           varchar(1) text : string ref,
+           unique int location : @location ref);
+
+/* Type information support */
+
+py_cobjects(unique int obj : @py_cobject);
+
+py_cobjecttypes(unique int obj : @py_cobject ref,
+                int typeof : @py_cobject ref);
+
+py_cobjectnames(unique int obj : @py_cobject ref,
+                varchar(1) name : string ref);
+
+/* Kind should be 0 for introspection, > 0 from source, as follows:
+   1 from C extension source
+ */
+py_cobject_sources(int obj : @py_cobject ref,
+                  int kind : int ref);
+
+py_cmembers_versioned(int object : @py_cobject ref,
+                      varchar(1) name : string ref,
+                      int member : @py_cobject ref,
+                      varchar(1) version : string ref);
+
+py_citems(int object : @py_cobject ref,
+            int index : int ref,
+            int member : @py_cobject ref);
+
+ext_argtype(int funcid : @py_object ref,
+            int arg : int ref,
+            int typeid : @py_object ref);
+
+ext_rettype(int funcid : @py_object ref,
+            int typeid : @py_object ref);
+
+ext_proptype(int propid : @py_object ref,
+             int typeid : @py_object ref);
+
+ext_argreturn(int funcid : @py_object ref,
+              int arg : int ref);
+
+py_special_objects(unique int obj : @py_cobject ref,
+                   unique varchar(1) name : string ref);
+
+py_decorated_object(int object : @py_object ref,
+                    int level: int ref);
+
+@py_object = @py_cobject | @py_flow_node;
+
+@py_source_element = @py_ast_node | @container;
diff --git a/python/downgrades/6a1f497168da2f43828161d3c86db7d4c94c2b53/upgrade.properties b/python/downgrades/6a1f497168da2f43828161d3c86db7d4c94c2b53/upgrade.properties
new file mode 100644
index 00000000000..1a7cdb0ad71
--- /dev/null
+++ b/python/downgrades/6a1f497168da2f43828161d3c86db7d4c94c2b53/upgrade.properties
@@ -0,0 +1,4 @@
+description: Add databaseMetadata and overlayChangedFiles relations
+compatibility: full
+databaseMetadata.rel: delete
+overlayChangedFiles.rel: delete
diff --git a/python/downgrades/acf8d3b08ae3cfac8833d16efbfa5a10fef86819/old.dbscheme b/python/downgrades/acf8d3b08ae3cfac8833d16efbfa5a10fef86819/old.dbscheme
new file mode 100644
index 00000000000..acf8d3b08ae
--- /dev/null
+++ b/python/downgrades/acf8d3b08ae3cfac8833d16efbfa5a10fef86819/old.dbscheme
@@ -0,0 +1,1261 @@
+/*
+ *      This dbscheme is auto-generated by 'semmle/dbscheme_gen.py'.
+ *      WARNING: Any modifications to this file will be lost.
+ *      Relations can be changed by modifying master.py or
+ *      by adding rules to dbscheme.template
+ */
+
+/* This is a dummy line to alter the dbscheme, so we can make a database upgrade
+ * without actually changing any of the dbscheme predicates. It contains a date
+ * to allow for such updates in the future as well.
+ *
+ * 2020-07-02
+ *
+ * DO NOT remove this comment carelessly, since it can revert the dbscheme back to a
+ * previously seen state (matching a previously seen SHA), which would make the upgrade
+ * mechanism not work properly.
+ */
+
+/*- DEPRECATED: External defects and metrics -*/
+
+externalDefects(
+  unique int id : @externalDefect,
+  varchar(900) queryPath : string ref,
+  int location : @location ref,
+  varchar(900) message : string ref,
+  float severity : float ref
+);
+
+externalMetrics(
+  unique int id : @externalMetric,
+  varchar(900) queryPath : string ref,
+  int location : @location ref,
+  float value : float ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit the tuple `databaseMetadata("isOverlay", "true")`,
+ * along with an `overlayChangedFiles` tuple for each new/modified/deleted file,
+ * when building an overlay database, and these can be used by the discard predicates.
+ */
+databaseMetadata(
+  string metadataKey : string ref,
+  string value : string ref
+);
+
+overlayChangedFiles(
+  string path : string ref
+);
+
+/*- DEPRECATED: Snapshot date -*/
+
+snapshotDate(unique date snapshotDate : date ref);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- DEPRECATED: Duplicate code -*/
+
+duplicateCode(
+  unique int id : @duplication,
+  string relativePath : string ref,
+  int equivClass : int ref
+);
+
+similarCode(
+  unique int id : @similarity,
+  string relativePath : string ref,
+  int equivClass : int ref
+);
+
+@duplication_or_similarity = @duplication | @similarity
+
+tokens(
+  int id : @duplication_or_similarity ref,
+  int offset : int ref,
+  int beginLine : int ref,
+  int beginColumn : int ref,
+  int endLine : int ref,
+  int endColumn : int ref
+);
+
+/*- DEPRECATED: Version control data -*/
+
+svnentries(
+  unique int id : @svnentry,
+  string revision : string ref,
+  string author : string ref,
+  date revisionDate : date ref,
+  int changeSize : int ref
+)
+
+svnaffectedfiles(
+  int id : @svnentry ref,
+  int file : @file ref,
+  string action : string ref
+)
+
+svnentrymsg(
+  unique int id : @svnentry ref,
+  string message : string ref
+)
+
+svnchurn(
+  int commit : @svnentry ref,
+  int file : @file ref,
+  int addedLines : int ref,
+  int deletedLines : int ref
+)
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error;
+
+/*- Python dbscheme -*/
+
+/*
+ * Line metrics
+ */
+py_codelines(int id : @py_scope ref,
+             int count : int ref);
+
+py_commentlines(int id : @py_scope ref,
+                int count : int ref);
+
+py_docstringlines(int id : @py_scope ref,
+                int count : int ref);
+
+py_alllines(int id : @py_scope ref,
+                int count : int ref);
+
+/****************************
+        Python dbscheme
+****************************/
+
+@sourceline = @file | @py_Module | @xmllocatable;
+
+@location = @location_ast | @location_default ;
+
+locations_ast(unique int id: @location_ast,
+          int module: @py_Module ref,
+          int beginLine: int ref,
+          int beginColumn: int ref,
+          int endLine: int ref,
+          int endColumn: int ref);
+
+file_contents(unique int file: @file ref, string contents: string ref);
+
+py_module_path(int module: @py_Module ref, int file: @container ref);
+
+variable(unique int id : @py_variable,
+         int scope : @py_scope ref,
+         varchar(1) name : string ref);
+
+py_line_lengths(unique int id : @py_line,
+                int file: @py_Module ref,
+                int line : int ref,
+                int length : int ref);
+
+py_extracted_version(int module : @py_Module ref,
+                     varchar(1) version : string ref);
+
+/* AUTO GENERATED PART STARTS HERE */
+
+
+/* <Field> AnnAssign.location = 0, location */
+/* <Field> AnnAssign.value = 1, expr */
+/* <Field> AnnAssign.annotation = 2, expr */
+/* <Field> AnnAssign.target = 3, expr */
+
+/* <Field> Assert.location = 0, location */
+/* <Field> Assert.test = 1, expr */
+/* <Field> Assert.msg = 2, expr */
+
+/* <Field> Assign.location = 0, location */
+/* <Field> Assign.value = 1, expr */
+/* <Field> Assign.targets = 2, expr_list */
+
+/* <Field> AssignExpr.location = 0, location */
+/* <Field> AssignExpr.parenthesised = 1, bool */
+/* <Field> AssignExpr.value = 2, expr */
+/* <Field> AssignExpr.target = 3, expr */
+
+/* <Field> Attribute.location = 0, location */
+/* <Field> Attribute.parenthesised = 1, bool */
+/* <Field> Attribute.value = 2, expr */
+/* <Field> Attribute.attr = 3, str */
+/* <Field> Attribute.ctx = 4, expr_context */
+
+/* <Field> AugAssign.location = 0, location */
+/* <Field> AugAssign.operation = 1, BinOp */
+
+/* <Field> Await.location = 0, location */
+/* <Field> Await.parenthesised = 1, bool */
+/* <Field> Await.value = 2, expr */
+
+/* <Field> BinaryExpr.location = 0, location */
+/* <Field> BinaryExpr.parenthesised = 1, bool */
+/* <Field> BinaryExpr.left = 2, expr */
+/* <Field> BinaryExpr.op = 3, operator */
+/* <Field> BinaryExpr.right = 4, expr */
+/* <Parent> BinaryExpr = AugAssign  */
+
+/* <Field> BoolExpr.location = 0, location */
+/* <Field> BoolExpr.parenthesised = 1, bool */
+/* <Field> BoolExpr.op = 2, boolop */
+/* <Field> BoolExpr.values = 3, expr_list */
+
+/* <Field> Break.location = 0, location */
+
+/* <Field> Bytes.location = 0, location */
+/* <Field> Bytes.parenthesised = 1, bool */
+/* <Field> Bytes.s = 2, bytes */
+/* <Field> Bytes.prefix = 3, bytes */
+/* <Field> Bytes.implicitly_concatenated_parts = 4, StringPart_list */
+
+/* <Field> Call.location = 0, location */
+/* <Field> Call.parenthesised = 1, bool */
+/* <Field> Call.func = 2, expr */
+/* <Field> Call.positional_args = 3, expr_list */
+/* <Field> Call.named_args = 4, dict_item_list */
+
+/* <Field> Case.location = 0, location */
+/* <Field> Case.pattern = 1, pattern */
+/* <Field> Case.guard = 2, expr */
+/* <Field> Case.body = 3, stmt_list */
+
+/* <Field> Class.name = 0, str */
+/* <Field> Class.body = 1, stmt_list */
+/* <Parent> Class = ClassExpr  */
+
+/* <Field> ClassExpr.location = 0, location */
+/* <Field> ClassExpr.parenthesised = 1, bool */
+/* <Field> ClassExpr.name = 2, str */
+/* <Field> ClassExpr.bases = 3, expr_list */
+/* <Field> ClassExpr.keywords = 4, dict_item_list */
+/* <Field> ClassExpr.inner_scope = 5, Class */
+/* <Field> ClassExpr.type_parameters = 6, type_parameter_list */
+
+/* <Field> Compare.location = 0, location */
+/* <Field> Compare.parenthesised = 1, bool */
+/* <Field> Compare.left = 2, expr */
+/* <Field> Compare.ops = 3, cmpop_list */
+/* <Field> Compare.comparators = 4, expr_list */
+
+/* <Field> Continue.location = 0, location */
+
+/* <Field> Delete.location = 0, location */
+/* <Field> Delete.targets = 1, expr_list */
+
+/* <Field> Dict.location = 0, location */
+/* <Field> Dict.parenthesised = 1, bool */
+/* <Field> Dict.items = 2, dict_item_list */
+
+/* <Field> DictComp.location = 0, location */
+/* <Field> DictComp.parenthesised = 1, bool */
+/* <Field> DictComp.function = 2, Function */
+/* <Field> DictComp.iterable = 3, expr */
+
+/* <Field> DictUnpacking.location = 0, location */
+/* <Field> DictUnpacking.value = 1, expr */
+
+/* <Field> Ellipsis.location = 0, location */
+/* <Field> Ellipsis.parenthesised = 1, bool */
+
+/* <Field> ExceptGroupStmt.location = 0, location */
+/* <Field> ExceptGroupStmt.type = 1, expr */
+/* <Field> ExceptGroupStmt.name = 2, expr */
+/* <Field> ExceptGroupStmt.body = 3, stmt_list */
+
+/* <Field> ExceptStmt.location = 0, location */
+/* <Field> ExceptStmt.type = 1, expr */
+/* <Field> ExceptStmt.name = 2, expr */
+/* <Field> ExceptStmt.body = 3, stmt_list */
+
+/* <Field> Exec.location = 0, location */
+/* <Field> Exec.body = 1, expr */
+/* <Field> Exec.globals = 2, expr */
+/* <Field> Exec.locals = 3, expr */
+
+/* <Field> ExprStmt.location = 0, location */
+/* <Field> ExprStmt.value = 1, expr */
+
+/* <Field> Filter.location = 0, location */
+/* <Field> Filter.parenthesised = 1, bool */
+/* <Field> Filter.value = 2, expr */
+/* <Field> Filter.filter = 3, expr */
+
+/* <Field> For.location = 0, location */
+/* <Field> For.target = 1, expr */
+/* <Field> For.iter = 2, expr */
+/* <Field> For.body = 3, stmt_list */
+/* <Field> For.orelse = 4, stmt_list */
+/* <Field> For.is_async = 5, bool */
+
+/* <Field> FormattedValue.location = 0, location */
+/* <Field> FormattedValue.parenthesised = 1, bool */
+/* <Field> FormattedValue.value = 2, expr */
+/* <Field> FormattedValue.conversion = 3, str */
+/* <Field> FormattedValue.format_spec = 4, JoinedStr */
+
+/* <Field> Function.name = 0, str */
+/* <Field> Function.args = 1, parameter_list */
+/* <Field> Function.vararg = 2, expr */
+/* <Field> Function.kwonlyargs = 3, expr_list */
+/* <Field> Function.kwarg = 4, expr */
+/* <Field> Function.body = 5, stmt_list */
+/* <Field> Function.is_async = 6, bool */
+/* <Field> Function.type_parameters = 7, type_parameter_list */
+/* <Parent> Function = FunctionParent  */
+
+/* <Field> FunctionExpr.location = 0, location */
+/* <Field> FunctionExpr.parenthesised = 1, bool */
+/* <Field> FunctionExpr.name = 2, str */
+/* <Field> FunctionExpr.args = 3, arguments */
+/* <Field> FunctionExpr.returns = 4, expr */
+/* <Field> FunctionExpr.inner_scope = 5, Function */
+
+/* <Field> GeneratorExp.location = 0, location */
+/* <Field> GeneratorExp.parenthesised = 1, bool */
+/* <Field> GeneratorExp.function = 2, Function */
+/* <Field> GeneratorExp.iterable = 3, expr */
+
+/* <Field> Global.location = 0, location */
+/* <Field> Global.names = 1, str_list */
+
+/* <Field> Guard.location = 0, location */
+/* <Field> Guard.parenthesised = 1, bool */
+/* <Field> Guard.test = 2, expr */
+
+/* <Field> If.location = 0, location */
+/* <Field> If.test = 1, expr */
+/* <Field> If.body = 2, stmt_list */
+/* <Field> If.orelse = 3, stmt_list */
+
+/* <Field> IfExp.location = 0, location */
+/* <Field> IfExp.parenthesised = 1, bool */
+/* <Field> IfExp.test = 2, expr */
+/* <Field> IfExp.body = 3, expr */
+/* <Field> IfExp.orelse = 4, expr */
+
+/* <Field> Import.location = 0, location */
+/* <Field> Import.names = 1, alias_list */
+
+/* <Field> ImportExpr.location = 0, location */
+/* <Field> ImportExpr.parenthesised = 1, bool */
+/* <Field> ImportExpr.level = 2, int */
+/* <Field> ImportExpr.name = 3, str */
+/* <Field> ImportExpr.top = 4, bool */
+
+/* <Field> ImportStar.location = 0, location */
+/* <Field> ImportStar.module = 1, expr */
+
+/* <Field> ImportMember.location = 0, location */
+/* <Field> ImportMember.parenthesised = 1, bool */
+/* <Field> ImportMember.module = 2, expr */
+/* <Field> ImportMember.name = 3, str */
+
+/* <Field> Fstring.location = 0, location */
+/* <Field> Fstring.parenthesised = 1, bool */
+/* <Field> Fstring.values = 2, expr_list */
+/* <Parent> Fstring = FormattedValue  */
+
+/* <Field> KeyValuePair.location = 0, location */
+/* <Field> KeyValuePair.value = 1, expr */
+/* <Field> KeyValuePair.key = 2, expr */
+
+/* <Field> Lambda.location = 0, location */
+/* <Field> Lambda.parenthesised = 1, bool */
+/* <Field> Lambda.args = 2, arguments */
+/* <Field> Lambda.inner_scope = 3, Function */
+
+/* <Field> List.location = 0, location */
+/* <Field> List.parenthesised = 1, bool */
+/* <Field> List.elts = 2, expr_list */
+/* <Field> List.ctx = 3, expr_context */
+
+/* <Field> ListComp.location = 0, location */
+/* <Field> ListComp.parenthesised = 1, bool */
+/* <Field> ListComp.function = 2, Function */
+/* <Field> ListComp.iterable = 3, expr */
+/* <Field> ListComp.generators = 4, comprehension_list */
+/* <Field> ListComp.elt = 5, expr */
+
+/* <Field> MatchStmt.location = 0, location */
+/* <Field> MatchStmt.subject = 1, expr */
+/* <Field> MatchStmt.cases = 2, stmt_list */
+
+/* <Field> MatchAsPattern.location = 0, location */
+/* <Field> MatchAsPattern.parenthesised = 1, bool */
+/* <Field> MatchAsPattern.pattern = 2, pattern */
+/* <Field> MatchAsPattern.alias = 3, expr */
+
+/* <Field> MatchCapturePattern.location = 0, location */
+/* <Field> MatchCapturePattern.parenthesised = 1, bool */
+/* <Field> MatchCapturePattern.variable = 2, expr */
+
+/* <Field> MatchClassPattern.location = 0, location */
+/* <Field> MatchClassPattern.parenthesised = 1, bool */
+/* <Field> MatchClassPattern.class = 2, expr */
+/* <Field> MatchClassPattern.class_name = 3, expr */
+/* <Field> MatchClassPattern.positional = 4, pattern_list */
+/* <Field> MatchClassPattern.keyword = 5, pattern_list */
+
+/* <Field> MatchDoubleStarPattern.location = 0, location */
+/* <Field> MatchDoubleStarPattern.parenthesised = 1, bool */
+/* <Field> MatchDoubleStarPattern.target = 2, pattern */
+
+/* <Field> MatchKeyValuePattern.location = 0, location */
+/* <Field> MatchKeyValuePattern.parenthesised = 1, bool */
+/* <Field> MatchKeyValuePattern.key = 2, pattern */
+/* <Field> MatchKeyValuePattern.value = 3, pattern */
+
+/* <Field> MatchKeywordPattern.location = 0, location */
+/* <Field> MatchKeywordPattern.parenthesised = 1, bool */
+/* <Field> MatchKeywordPattern.attribute = 2, expr */
+/* <Field> MatchKeywordPattern.value = 3, pattern */
+
+/* <Field> MatchLiteralPattern.location = 0, location */
+/* <Field> MatchLiteralPattern.parenthesised = 1, bool */
+/* <Field> MatchLiteralPattern.literal = 2, expr */
+
+/* <Field> MatchMappingPattern.location = 0, location */
+/* <Field> MatchMappingPattern.parenthesised = 1, bool */
+/* <Field> MatchMappingPattern.mappings = 2, pattern_list */
+
+/* <Field> MatchOrPattern.location = 0, location */
+/* <Field> MatchOrPattern.parenthesised = 1, bool */
+/* <Field> MatchOrPattern.patterns = 2, pattern_list */
+
+/* <Field> MatchSequencePattern.location = 0, location */
+/* <Field> MatchSequencePattern.parenthesised = 1, bool */
+/* <Field> MatchSequencePattern.patterns = 2, pattern_list */
+
+/* <Field> MatchStarPattern.location = 0, location */
+/* <Field> MatchStarPattern.parenthesised = 1, bool */
+/* <Field> MatchStarPattern.target = 2, pattern */
+
+/* <Field> MatchValuePattern.location = 0, location */
+/* <Field> MatchValuePattern.parenthesised = 1, bool */
+/* <Field> MatchValuePattern.value = 2, expr */
+
+/* <Field> MatchWildcardPattern.location = 0, location */
+/* <Field> MatchWildcardPattern.parenthesised = 1, bool */
+
+/* <Field> Module.name = 0, str */
+/* <Field> Module.hash = 1, str */
+/* <Field> Module.body = 2, stmt_list */
+/* <Field> Module.kind = 3, str */
+
+/* <Field> Name.location = 0, location */
+/* <Field> Name.parenthesised = 1, bool */
+/* <Field> Name.variable = 2, variable */
+/* <Field> Name.ctx = 3, expr_context */
+/* <Parent> Name = ParameterList  */
+
+/* <Field> Nonlocal.location = 0, location */
+/* <Field> Nonlocal.names = 1, str_list */
+
+/* <Field> Num.location = 0, location */
+/* <Field> Num.parenthesised = 1, bool */
+/* <Field> Num.n = 2, number */
+/* <Field> Num.text = 3, number */
+
+/* <Field> ParamSpec.location = 0, location */
+/* <Field> ParamSpec.name = 1, expr */
+/* <Field> ParamSpec.default = 2, expr */
+
+/* <Field> Pass.location = 0, location */
+
+/* <Field> PlaceHolder.location = 0, location */
+/* <Field> PlaceHolder.parenthesised = 1, bool */
+/* <Field> PlaceHolder.variable = 2, variable */
+/* <Field> PlaceHolder.ctx = 3, expr_context */
+
+/* <Field> Print.location = 0, location */
+/* <Field> Print.dest = 1, expr */
+/* <Field> Print.values = 2, expr_list */
+/* <Field> Print.nl = 3, bool */
+
+/* <Field> Raise.location = 0, location */
+/* <Field> Raise.exc = 1, expr */
+/* <Field> Raise.cause = 2, expr */
+/* <Field> Raise.type = 3, expr */
+/* <Field> Raise.inst = 4, expr */
+/* <Field> Raise.tback = 5, expr */
+
+/* <Field> Repr.location = 0, location */
+/* <Field> Repr.parenthesised = 1, bool */
+/* <Field> Repr.value = 2, expr */
+
+/* <Field> Return.location = 0, location */
+/* <Field> Return.value = 1, expr */
+
+/* <Field> Set.location = 0, location */
+/* <Field> Set.parenthesised = 1, bool */
+/* <Field> Set.elts = 2, expr_list */
+
+/* <Field> SetComp.location = 0, location */
+/* <Field> SetComp.parenthesised = 1, bool */
+/* <Field> SetComp.function = 2, Function */
+/* <Field> SetComp.iterable = 3, expr */
+
+/* <Field> Slice.location = 0, location */
+/* <Field> Slice.parenthesised = 1, bool */
+/* <Field> Slice.start = 2, expr */
+/* <Field> Slice.stop = 3, expr */
+/* <Field> Slice.step = 4, expr */
+
+/* <Field> SpecialOperation.location = 0, location */
+/* <Field> SpecialOperation.parenthesised = 1, bool */
+/* <Field> SpecialOperation.name = 2, str */
+/* <Field> SpecialOperation.arguments = 3, expr_list */
+
+/* <Field> Starred.location = 0, location */
+/* <Field> Starred.parenthesised = 1, bool */
+/* <Field> Starred.value = 2, expr */
+/* <Field> Starred.ctx = 3, expr_context */
+
+/* <Field> Str.location = 0, location */
+/* <Field> Str.parenthesised = 1, bool */
+/* <Field> Str.s = 2, str */
+/* <Field> Str.prefix = 3, str */
+/* <Field> Str.implicitly_concatenated_parts = 4, StringPart_list */
+
+/* <Field> StringPart.text = 0, str */
+/* <Field> StringPart.location = 1, location */
+/* <Parent> StringPart = StringPartList  */
+/* <Parent> StringPartList = BytesOrStr  */
+
+/* <Field> Subscript.location = 0, location */
+/* <Field> Subscript.parenthesised = 1, bool */
+/* <Field> Subscript.value = 2, expr */
+/* <Field> Subscript.index = 3, expr */
+/* <Field> Subscript.ctx = 4, expr_context */
+
+/* <Field> TemplateDottedNotation.location = 0, location */
+/* <Field> TemplateDottedNotation.parenthesised = 1, bool */
+/* <Field> TemplateDottedNotation.value = 2, expr */
+/* <Field> TemplateDottedNotation.attr = 3, str */
+/* <Field> TemplateDottedNotation.ctx = 4, expr_context */
+
+/* <Field> TemplateWrite.location = 0, location */
+/* <Field> TemplateWrite.value = 1, expr */
+
+/* <Field> Try.location = 0, location */
+/* <Field> Try.body = 1, stmt_list */
+/* <Field> Try.orelse = 2, stmt_list */
+/* <Field> Try.handlers = 3, stmt_list */
+/* <Field> Try.finalbody = 4, stmt_list */
+
+/* <Field> Tuple.location = 0, location */
+/* <Field> Tuple.parenthesised = 1, bool */
+/* <Field> Tuple.elts = 2, expr_list */
+/* <Field> Tuple.ctx = 3, expr_context */
+/* <Parent> Tuple = ParameterList  */
+
+/* <Field> TypeAlias.location = 0, location */
+/* <Field> TypeAlias.name = 1, expr */
+/* <Field> TypeAlias.type_parameters = 2, type_parameter_list */
+/* <Field> TypeAlias.value = 3, expr */
+
+/* <Field> TypeVar.location = 0, location */
+/* <Field> TypeVar.name = 1, expr */
+/* <Field> TypeVar.bound = 2, expr */
+/* <Field> TypeVar.default = 3, expr */
+
+/* <Field> TypeVarTuple.location = 0, location */
+/* <Field> TypeVarTuple.name = 1, expr */
+/* <Field> TypeVarTuple.default = 2, expr */
+
+/* <Field> UnaryExpr.location = 0, location */
+/* <Field> UnaryExpr.parenthesised = 1, bool */
+/* <Field> UnaryExpr.op = 2, unaryop */
+/* <Field> UnaryExpr.operand = 3, expr */
+
+/* <Field> While.location = 0, location */
+/* <Field> While.test = 1, expr */
+/* <Field> While.body = 2, stmt_list */
+/* <Field> While.orelse = 3, stmt_list */
+
+/* <Field> With.location = 0, location */
+/* <Field> With.context_expr = 1, expr */
+/* <Field> With.optional_vars = 2, expr */
+/* <Field> With.body = 3, stmt_list */
+/* <Field> With.is_async = 4, bool */
+
+/* <Field> Yield.location = 0, location */
+/* <Field> Yield.parenthesised = 1, bool */
+/* <Field> Yield.value = 2, expr */
+
+/* <Field> YieldFrom.location = 0, location */
+/* <Field> YieldFrom.parenthesised = 1, bool */
+/* <Field> YieldFrom.value = 2, expr */
+
+/* <Field> Alias.value = 0, expr */
+/* <Field> Alias.asname = 1, expr */
+/* <Parent> Alias = AliasList  */
+/* <Parent> AliasList = Import  */
+
+/* <Field> Arguments.kw_defaults = 0, expr_list */
+/* <Field> Arguments.defaults = 1, expr_list */
+/* <Field> Arguments.annotations = 2, expr_list */
+/* <Field> Arguments.varargannotation = 3, expr */
+/* <Field> Arguments.kwargannotation = 4, expr */
+/* <Field> Arguments.kw_annotations = 5, expr_list */
+/* <Parent> Arguments = ArgumentsParent  */
+/* <Parent> boolean = BoolParent  */
+/* <Parent> Boolop = BoolExpr  */
+/* <Parent> string = Bytes  */
+/* <Parent> Cmpop = CmpopList  */
+/* <Parent> CmpopList = Compare  */
+
+/* <Field> Comprehension.location = 0, location */
+/* <Field> Comprehension.iter = 1, expr */
+/* <Field> Comprehension.target = 2, expr */
+/* <Field> Comprehension.ifs = 3, expr_list */
+/* <Parent> Comprehension = ComprehensionList  */
+/* <Parent> ComprehensionList = ListComp  */
+/* <Parent> DictItem = DictItemList  */
+/* <Parent> DictItemList = DictItemListParent  */
+
+/* <Field> Expr.location = 0, location */
+/* <Field> Expr.parenthesised = 1, bool */
+/* <Parent> Expr = ExprParent  */
+/* <Parent> ExprContext = ExprContextParent  */
+/* <Parent> ExprList = ExprListParent  */
+/* <Parent> int = ImportExpr  */
+
+/* <Field> Keyword.location = 0, location */
+/* <Field> Keyword.value = 1, expr */
+/* <Field> Keyword.arg = 2, str */
+/* <Parent> Location = LocationParent  */
+/* <Parent> string = Num  */
+/* <Parent> Operator = BinaryExpr  */
+/* <Parent> ParameterList = Function  */
+
+/* <Field> Pattern.location = 0, location */
+/* <Field> Pattern.parenthesised = 1, bool */
+/* <Parent> Pattern = PatternParent  */
+/* <Parent> PatternList = PatternListParent  */
+
+/* <Field> Stmt.location = 0, location */
+/* <Parent> Stmt = StmtList  */
+/* <Parent> StmtList = StmtListParent  */
+/* <Parent> string = StrParent  */
+/* <Parent> StringList = StrListParent  */
+
+/* <Field> TypeParameter.location = 0, location */
+/* <Parent> TypeParameter = TypeParameterList  */
+/* <Parent> TypeParameterList = TypeParameterListParent  */
+/* <Parent> Unaryop = UnaryExpr  */
+/* <Parent> Variable = VariableParent  */
+py_Classes(unique int id : @py_Class,
+    unique int parent : @py_ClassExpr ref);
+
+py_Functions(unique int id : @py_Function,
+    unique int parent : @py_Function_parent ref);
+
+py_Modules(unique int id : @py_Module);
+
+py_StringParts(unique int id : @py_StringPart,
+    int parent : @py_StringPart_list ref,
+    int idx : int ref);
+
+py_StringPart_lists(unique int id : @py_StringPart_list,
+    unique int parent : @py_Bytes_or_Str ref);
+
+py_aliases(unique int id : @py_alias,
+    int parent : @py_alias_list ref,
+    int idx : int ref);
+
+py_alias_lists(unique int id : @py_alias_list,
+    unique int parent : @py_Import ref);
+
+py_arguments(unique int id : @py_arguments,
+    unique int parent : @py_arguments_parent ref);
+
+py_bools(int parent : @py_bool_parent ref,
+    int idx : int ref);
+
+py_boolops(unique int id : @py_boolop,
+    int kind: int ref,
+    unique int parent : @py_BoolExpr ref);
+
+py_bytes(varchar(1) id : string ref,
+    int parent : @py_Bytes ref,
+    int idx : int ref);
+
+py_cmpops(unique int id : @py_cmpop,
+    int kind: int ref,
+    int parent : @py_cmpop_list ref,
+    int idx : int ref);
+
+py_cmpop_lists(unique int id : @py_cmpop_list,
+    unique int parent : @py_Compare ref);
+
+py_comprehensions(unique int id : @py_comprehension,
+    int parent : @py_comprehension_list ref,
+    int idx : int ref);
+
+py_comprehension_lists(unique int id : @py_comprehension_list,
+    unique int parent : @py_ListComp ref);
+
+py_dict_items(unique int id : @py_dict_item,
+    int kind: int ref,
+    int parent : @py_dict_item_list ref,
+    int idx : int ref);
+
+py_dict_item_lists(unique int id : @py_dict_item_list,
+    unique int parent : @py_dict_item_list_parent ref);
+
+py_exprs(unique int id : @py_expr,
+    int kind: int ref,
+    int parent : @py_expr_parent ref,
+    int idx : int ref);
+
+py_expr_contexts(unique int id : @py_expr_context,
+    int kind: int ref,
+    unique int parent : @py_expr_context_parent ref);
+
+py_expr_lists(unique int id : @py_expr_list,
+    int parent : @py_expr_list_parent ref,
+    int idx : int ref);
+
+py_ints(int id : int ref,
+    unique int parent : @py_ImportExpr ref);
+
+py_locations(unique int id : @location ref,
+    unique int parent : @py_location_parent ref);
+
+py_numbers(varchar(1) id : string ref,
+    int parent : @py_Num ref,
+    int idx : int ref);
+
+py_operators(unique int id : @py_operator,
+    int kind: int ref,
+    unique int parent : @py_BinaryExpr ref);
+
+py_parameter_lists(unique int id : @py_parameter_list,
+    unique int parent : @py_Function ref);
+
+py_patterns(unique int id : @py_pattern,
+    int kind: int ref,
+    int parent : @py_pattern_parent ref,
+    int idx : int ref);
+
+py_pattern_lists(unique int id : @py_pattern_list,
+    int parent : @py_pattern_list_parent ref,
+    int idx : int ref);
+
+py_stmts(unique int id : @py_stmt,
+    int kind: int ref,
+    int parent : @py_stmt_list ref,
+    int idx : int ref);
+
+py_stmt_lists(unique int id : @py_stmt_list,
+    int parent : @py_stmt_list_parent ref,
+    int idx : int ref);
+
+py_strs(varchar(1) id : string ref,
+    int parent : @py_str_parent ref,
+    int idx : int ref);
+
+py_str_lists(unique int id : @py_str_list,
+    unique int parent : @py_str_list_parent ref);
+
+py_type_parameters(unique int id : @py_type_parameter,
+    int kind: int ref,
+    int parent : @py_type_parameter_list ref,
+    int idx : int ref);
+
+py_type_parameter_lists(unique int id : @py_type_parameter_list,
+    unique int parent : @py_type_parameter_list_parent ref);
+
+py_unaryops(unique int id : @py_unaryop,
+    int kind: int ref,
+    unique int parent : @py_UnaryExpr ref);
+
+py_variables(int id : @py_variable ref,
+    unique int parent : @py_variable_parent ref);
+
+case @py_boolop.kind of
+    0 = @py_And
+|   1 = @py_Or;
+
+case @py_cmpop.kind of
+    0 = @py_Eq
+|   1 = @py_Gt
+|   2 = @py_GtE
+|   3 = @py_In
+|   4 = @py_Is
+|   5 = @py_IsNot
+|   6 = @py_Lt
+|   7 = @py_LtE
+|   8 = @py_NotEq
+|   9 = @py_NotIn;
+
+case @py_dict_item.kind of
+    0 = @py_DictUnpacking
+|   1 = @py_KeyValuePair
+|   2 = @py_keyword;
+
+case @py_expr.kind of
+    0 = @py_Attribute
+|   1 = @py_BinaryExpr
+|   2 = @py_BoolExpr
+|   3 = @py_Bytes
+|   4 = @py_Call
+|   5 = @py_ClassExpr
+|   6 = @py_Compare
+|   7 = @py_Dict
+|   8 = @py_DictComp
+|   9 = @py_Ellipsis
+|   10 = @py_FunctionExpr
+|   11 = @py_GeneratorExp
+|   12 = @py_IfExp
+|   13 = @py_ImportExpr
+|   14 = @py_ImportMember
+|   15 = @py_Lambda
+|   16 = @py_List
+|   17 = @py_ListComp
+|   18 = @py_Guard
+|   19 = @py_Name
+|   20 = @py_Num
+|   21 = @py_Repr
+|   22 = @py_Set
+|   23 = @py_SetComp
+|   24 = @py_Slice
+|   25 = @py_Starred
+|   26 = @py_Str
+|   27 = @py_Subscript
+|   28 = @py_Tuple
+|   29 = @py_UnaryExpr
+|   30 = @py_Yield
+|   31 = @py_YieldFrom
+|   32 = @py_TemplateDottedNotation
+|   33 = @py_Filter
+|   34 = @py_PlaceHolder
+|   35 = @py_Await
+|   36 = @py_Fstring
+|   37 = @py_FormattedValue
+|   38 = @py_AssignExpr
+|   39 = @py_SpecialOperation;
+
+case @py_expr_context.kind of
+    0 = @py_AugLoad
+|   1 = @py_AugStore
+|   2 = @py_Del
+|   3 = @py_Load
+|   4 = @py_Param
+|   5 = @py_Store;
+
+case @py_operator.kind of
+    0 = @py_Add
+|   1 = @py_BitAnd
+|   2 = @py_BitOr
+|   3 = @py_BitXor
+|   4 = @py_Div
+|   5 = @py_FloorDiv
+|   6 = @py_LShift
+|   7 = @py_Mod
+|   8 = @py_Mult
+|   9 = @py_Pow
+|   10 = @py_RShift
+|   11 = @py_Sub
+|   12 = @py_MatMult;
+
+case @py_pattern.kind of
+    0 = @py_MatchAsPattern
+|   1 = @py_MatchOrPattern
+|   2 = @py_MatchLiteralPattern
+|   3 = @py_MatchCapturePattern
+|   4 = @py_MatchWildcardPattern
+|   5 = @py_MatchValuePattern
+|   6 = @py_MatchSequencePattern
+|   7 = @py_MatchStarPattern
+|   8 = @py_MatchMappingPattern
+|   9 = @py_MatchDoubleStarPattern
+|   10 = @py_MatchKeyValuePattern
+|   11 = @py_MatchClassPattern
+|   12 = @py_MatchKeywordPattern;
+
+case @py_stmt.kind of
+    0 = @py_Assert
+|   1 = @py_Assign
+|   2 = @py_AugAssign
+|   3 = @py_Break
+|   4 = @py_Continue
+|   5 = @py_Delete
+|   6 = @py_ExceptStmt
+|   7 = @py_ExceptGroupStmt
+|   8 = @py_Exec
+|   9 = @py_Expr_stmt
+|   10 = @py_For
+|   11 = @py_Global
+|   12 = @py_If
+|   13 = @py_Import
+|   14 = @py_ImportStar
+|   15 = @py_MatchStmt
+|   16 = @py_Case
+|   17 = @py_Nonlocal
+|   18 = @py_Pass
+|   19 = @py_Print
+|   20 = @py_Raise
+|   21 = @py_Return
+|   22 = @py_Try
+|   23 = @py_While
+|   24 = @py_With
+|   25 = @py_TemplateWrite
+|   26 = @py_AnnAssign
+|   27 = @py_TypeAlias;
+
+case @py_type_parameter.kind of
+    0 = @py_ParamSpec
+|   1 = @py_TypeVar
+|   2 = @py_TypeVarTuple;
+
+case @py_unaryop.kind of
+    0 = @py_Invert
+|   1 = @py_Not
+|   2 = @py_UAdd
+|   3 = @py_USub;
+
+@py_Bytes_or_Str = @py_Bytes | @py_Str;
+
+@py_Function_parent = @py_DictComp | @py_FunctionExpr | @py_GeneratorExp | @py_Lambda | @py_ListComp | @py_SetComp;
+
+@py_arguments_parent = @py_FunctionExpr | @py_Lambda;
+
+@py_ast_node = @py_Class | @py_Function | @py_Module | @py_StringPart | @py_comprehension | @py_dict_item | @py_expr | @py_pattern | @py_stmt | @py_type_parameter;
+
+@py_bool_parent = @py_For | @py_Function | @py_Print | @py_With | @py_expr | @py_pattern;
+
+@py_dict_item_list_parent = @py_Call | @py_ClassExpr | @py_Dict;
+
+@py_expr_context_parent = @py_Attribute | @py_List | @py_Name | @py_PlaceHolder | @py_Starred | @py_Subscript | @py_TemplateDottedNotation | @py_Tuple;
+
+@py_expr_list_parent = @py_Assign | @py_BoolExpr | @py_Call | @py_ClassExpr | @py_Compare | @py_Delete | @py_Fstring | @py_Function | @py_List | @py_Print | @py_Set | @py_SpecialOperation | @py_Tuple | @py_arguments | @py_comprehension;
+
+@py_expr_or_stmt = @py_expr | @py_stmt;
+
+@py_expr_parent = @py_AnnAssign | @py_Assert | @py_Assign | @py_AssignExpr | @py_Attribute | @py_AugAssign | @py_Await | @py_BinaryExpr | @py_Call | @py_Case | @py_Compare | @py_DictComp | @py_DictUnpacking | @py_ExceptGroupStmt | @py_ExceptStmt | @py_Exec | @py_Expr_stmt | @py_Filter | @py_For | @py_FormattedValue | @py_Function | @py_FunctionExpr | @py_GeneratorExp | @py_Guard | @py_If | @py_IfExp | @py_ImportMember | @py_ImportStar | @py_KeyValuePair | @py_ListComp | @py_MatchAsPattern | @py_MatchCapturePattern | @py_MatchClassPattern | @py_MatchKeywordPattern | @py_MatchLiteralPattern | @py_MatchStmt | @py_MatchValuePattern | @py_ParamSpec | @py_Print | @py_Raise | @py_Repr | @py_Return | @py_SetComp | @py_Slice | @py_Starred | @py_Subscript | @py_TemplateDottedNotation | @py_TemplateWrite | @py_TypeAlias | @py_TypeVar | @py_TypeVarTuple | @py_UnaryExpr | @py_While | @py_With | @py_Yield | @py_YieldFrom | @py_alias | @py_arguments | @py_comprehension | @py_expr_list | @py_keyword | @py_parameter_list;
+
+@py_location_parent = @py_DictUnpacking | @py_KeyValuePair | @py_StringPart | @py_comprehension | @py_expr | @py_keyword | @py_pattern | @py_stmt | @py_type_parameter;
+
+@py_parameter = @py_Name | @py_Tuple;
+
+@py_pattern_list_parent = @py_MatchClassPattern | @py_MatchMappingPattern | @py_MatchOrPattern | @py_MatchSequencePattern;
+
+@py_pattern_parent = @py_Case | @py_MatchAsPattern | @py_MatchDoubleStarPattern | @py_MatchKeyValuePattern | @py_MatchKeywordPattern | @py_MatchStarPattern | @py_pattern_list;
+
+@py_scope = @py_Class | @py_Function | @py_Module;
+
+@py_stmt_list_parent = @py_Case | @py_Class | @py_ExceptGroupStmt | @py_ExceptStmt | @py_For | @py_Function | @py_If | @py_MatchStmt | @py_Module | @py_Try | @py_While | @py_With;
+
+@py_str_list_parent = @py_Global | @py_Nonlocal;
+
+@py_str_parent = @py_Attribute | @py_Class | @py_ClassExpr | @py_FormattedValue | @py_Function | @py_FunctionExpr | @py_ImportExpr | @py_ImportMember | @py_Module | @py_SpecialOperation | @py_Str | @py_StringPart | @py_TemplateDottedNotation | @py_keyword | @py_str_list;
+
+@py_type_parameter_list_parent = @py_ClassExpr | @py_Function | @py_TypeAlias;
+
+@py_variable_parent = @py_Name | @py_PlaceHolder;
+
+
+/*
+ * End of auto-generated part
+ */
+
+
+
+/* Map relative names to absolute names for imports */
+py_absolute_names(int module : @py_Module ref,
+                  varchar(1) relname : string ref,
+                  varchar(1) absname : string ref);
+
+py_exports(int id : @py_Module ref,
+           varchar(1) name : string ref);
+
+/* Successor information */
+py_successors(int predecessor : @py_flow_node ref,
+              int successor : @py_flow_node ref);
+
+py_true_successors(int predecessor : @py_flow_node ref,
+              int successor : @py_flow_node ref);
+
+py_exception_successors(int predecessor : @py_flow_node ref,
+              int successor : @py_flow_node ref);
+
+py_false_successors(int predecessor : @py_flow_node ref,
+              int successor : @py_flow_node ref);
+
+py_flow_bb_node(unique int flownode : @py_flow_node,
+             int realnode : @py_ast_node ref,
+             int basicblock : @py_flow_node ref,
+             int index : int ref);
+
+py_scope_flow(int flow : @py_flow_node ref,
+              int scope : @py_scope ref,
+              int kind : int ref);
+
+py_idoms(unique int node : @py_flow_node ref,
+         int immediate_dominator : @py_flow_node ref);
+
+py_ssa_phi(int phi : @py_ssa_var ref,
+           int arg: @py_ssa_var ref);
+
+py_ssa_var(unique int id : @py_ssa_var,
+            int var : @py_variable ref);
+
+py_ssa_use(int node: @py_flow_node ref,
+           int var : @py_ssa_var ref);
+
+py_ssa_defn(unique int id : @py_ssa_var ref,
+                  int node: @py_flow_node ref);
+
+@py_base_var = @py_variable | @py_ssa_var;
+
+py_scopes(unique int node : @py_expr_or_stmt ref,
+         int scope : @py_scope ref);
+
+py_scope_location(unique int id : @location ref,
+                   unique int scope : @py_scope ref);
+
+py_flags_versioned(varchar(1) name : string ref,
+                   varchar(1) value : string ref,
+                   varchar(1) version : string ref);
+
+py_syntax_error_versioned(unique int id : @location ref,
+                varchar(1) message : string ref,
+                varchar(1) version : string ref);
+
+py_comments(unique int id : @py_comment,
+           varchar(1) text : string ref,
+           unique int location : @location ref);
+
+/* Type information support */
+
+py_cobjects(unique int obj : @py_cobject);
+
+py_cobjecttypes(unique int obj : @py_cobject ref,
+                int typeof : @py_cobject ref);
+
+py_cobjectnames(unique int obj : @py_cobject ref,
+                varchar(1) name : string ref);
+
+/* Kind should be 0 for introspection, > 0 from source, as follows:
+   1 from C extension source
+ */
+py_cobject_sources(int obj : @py_cobject ref,
+                  int kind : int ref);
+
+py_cmembers_versioned(int object : @py_cobject ref,
+                      varchar(1) name : string ref,
+                      int member : @py_cobject ref,
+                      varchar(1) version : string ref);
+
+py_citems(int object : @py_cobject ref,
+            int index : int ref,
+            int member : @py_cobject ref);
+
+ext_argtype(int funcid : @py_object ref,
+            int arg : int ref,
+            int typeid : @py_object ref);
+
+ext_rettype(int funcid : @py_object ref,
+            int typeid : @py_object ref);
+
+ext_proptype(int propid : @py_object ref,
+             int typeid : @py_object ref);
+
+ext_argreturn(int funcid : @py_object ref,
+              int arg : int ref);
+
+py_special_objects(unique int obj : @py_cobject ref,
+                   unique varchar(1) name : string ref);
+
+py_decorated_object(int object : @py_object ref,
+                    int level: int ref);
+
+@py_object = @py_cobject | @py_flow_node;
+
+@py_source_element = @py_ast_node | @container;
+
+/** The union of all Python database entities */
+@top =
+  @py_source_element | @py_object | @py_base_var | @location | @py_line | @py_comment |
+      @py_expr_parent | @py_expr_context |
+      @py_operator | @py_boolop | @py_cmpop | @py_unaryop |
+      @py_cmpop_list | @py_alias_list | @py_StringPart_list | @py_comprehension_list | @py_dict_item_list | @py_pattern_list | @py_stmt_list | @py_str_list | @py_type_parameter_list |
+      @externalDefect | @externalMetric | @externalDataElement | @duplication_or_similarity | @svnentry |
+      @xmllocatable | @yaml_locatable;
diff --git a/python/downgrades/acf8d3b08ae3cfac8833d16efbfa5a10fef86819/semmlecode.python.dbscheme b/python/downgrades/acf8d3b08ae3cfac8833d16efbfa5a10fef86819/semmlecode.python.dbscheme
new file mode 100644
index 00000000000..6a1f497168d
--- /dev/null
+++ b/python/downgrades/acf8d3b08ae3cfac8833d16efbfa5a10fef86819/semmlecode.python.dbscheme
@@ -0,0 +1,1252 @@
+/*
+ *      This dbscheme is auto-generated by 'semmle/dbscheme_gen.py'.
+ *      WARNING: Any modifications to this file will be lost.
+ *      Relations can be changed by modifying master.py or
+ *      by adding rules to dbscheme.template
+ */
+
+/* This is a dummy line to alter the dbscheme, so we can make a database upgrade
+ * without actually changing any of the dbscheme predicates. It contains a date
+ * to allow for such updates in the future as well.
+ *
+ * 2020-07-02
+ *
+ * DO NOT remove this comment carelessly, since it can revert the dbscheme back to a
+ * previously seen state (matching a previously seen SHA), which would make the upgrade
+ * mechanism not work properly.
+ */
+
+/*- DEPRECATED: External defects and metrics -*/
+
+externalDefects(
+  unique int id : @externalDefect,
+  varchar(900) queryPath : string ref,
+  int location : @location ref,
+  varchar(900) message : string ref,
+  float severity : float ref
+);
+
+externalMetrics(
+  unique int id : @externalMetric,
+  varchar(900) queryPath : string ref,
+  int location : @location ref,
+  float value : float ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit the tuple `databaseMetadata("isOverlay", "true")`,
+ * along with an `overlayChangedFiles` tuple for each new/modified/deleted file,
+ * when building an overlay database, and these can be used by the discard predicates.
+ */
+databaseMetadata(
+  string metadataKey : string ref,
+  string value : string ref
+);
+
+overlayChangedFiles(
+  string path : string ref
+);
+
+/*- DEPRECATED: Snapshot date -*/
+
+snapshotDate(unique date snapshotDate : date ref);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- DEPRECATED: Duplicate code -*/
+
+duplicateCode(
+  unique int id : @duplication,
+  string relativePath : string ref,
+  int equivClass : int ref
+);
+
+similarCode(
+  unique int id : @similarity,
+  string relativePath : string ref,
+  int equivClass : int ref
+);
+
+@duplication_or_similarity = @duplication | @similarity
+
+tokens(
+  int id : @duplication_or_similarity ref,
+  int offset : int ref,
+  int beginLine : int ref,
+  int beginColumn : int ref,
+  int endLine : int ref,
+  int endColumn : int ref
+);
+
+/*- DEPRECATED: Version control data -*/
+
+svnentries(
+  unique int id : @svnentry,
+  string revision : string ref,
+  string author : string ref,
+  date revisionDate : date ref,
+  int changeSize : int ref
+)
+
+svnaffectedfiles(
+  int id : @svnentry ref,
+  int file : @file ref,
+  string action : string ref
+)
+
+svnentrymsg(
+  unique int id : @svnentry ref,
+  string message : string ref
+)
+
+svnchurn(
+  int commit : @svnentry ref,
+  int file : @file ref,
+  int addedLines : int ref,
+  int deletedLines : int ref
+)
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error;
+
+/*- Python dbscheme -*/
+
+/*
+ * Line metrics
+ */
+py_codelines(int id : @py_scope ref,
+             int count : int ref);
+
+py_commentlines(int id : @py_scope ref,
+                int count : int ref);
+
+py_docstringlines(int id : @py_scope ref,
+                int count : int ref);
+
+py_alllines(int id : @py_scope ref,
+                int count : int ref);
+
+/****************************
+        Python dbscheme
+****************************/
+
+@sourceline = @file | @py_Module | @xmllocatable;
+
+@location = @location_ast | @location_default ;
+
+locations_ast(unique int id: @location_ast,
+          int module: @py_Module ref,
+          int beginLine: int ref,
+          int beginColumn: int ref,
+          int endLine: int ref,
+          int endColumn: int ref);
+
+file_contents(unique int file: @file ref, string contents: string ref);
+
+py_module_path(int module: @py_Module ref, int file: @container ref);
+
+variable(unique int id : @py_variable,
+         int scope : @py_scope ref,
+         varchar(1) name : string ref);
+
+py_line_lengths(unique int id : @py_line,
+                int file: @py_Module ref,
+                int line : int ref,
+                int length : int ref);
+
+py_extracted_version(int module : @py_Module ref,
+                     varchar(1) version : string ref);
+
+/* AUTO GENERATED PART STARTS HERE */
+
+
+/* <Field> AnnAssign.location = 0, location */
+/* <Field> AnnAssign.value = 1, expr */
+/* <Field> AnnAssign.annotation = 2, expr */
+/* <Field> AnnAssign.target = 3, expr */
+
+/* <Field> Assert.location = 0, location */
+/* <Field> Assert.test = 1, expr */
+/* <Field> Assert.msg = 2, expr */
+
+/* <Field> Assign.location = 0, location */
+/* <Field> Assign.value = 1, expr */
+/* <Field> Assign.targets = 2, expr_list */
+
+/* <Field> AssignExpr.location = 0, location */
+/* <Field> AssignExpr.parenthesised = 1, bool */
+/* <Field> AssignExpr.value = 2, expr */
+/* <Field> AssignExpr.target = 3, expr */
+
+/* <Field> Attribute.location = 0, location */
+/* <Field> Attribute.parenthesised = 1, bool */
+/* <Field> Attribute.value = 2, expr */
+/* <Field> Attribute.attr = 3, str */
+/* <Field> Attribute.ctx = 4, expr_context */
+
+/* <Field> AugAssign.location = 0, location */
+/* <Field> AugAssign.operation = 1, BinOp */
+
+/* <Field> Await.location = 0, location */
+/* <Field> Await.parenthesised = 1, bool */
+/* <Field> Await.value = 2, expr */
+
+/* <Field> BinaryExpr.location = 0, location */
+/* <Field> BinaryExpr.parenthesised = 1, bool */
+/* <Field> BinaryExpr.left = 2, expr */
+/* <Field> BinaryExpr.op = 3, operator */
+/* <Field> BinaryExpr.right = 4, expr */
+/* <Parent> BinaryExpr = AugAssign  */
+
+/* <Field> BoolExpr.location = 0, location */
+/* <Field> BoolExpr.parenthesised = 1, bool */
+/* <Field> BoolExpr.op = 2, boolop */
+/* <Field> BoolExpr.values = 3, expr_list */
+
+/* <Field> Break.location = 0, location */
+
+/* <Field> Bytes.location = 0, location */
+/* <Field> Bytes.parenthesised = 1, bool */
+/* <Field> Bytes.s = 2, bytes */
+/* <Field> Bytes.prefix = 3, bytes */
+/* <Field> Bytes.implicitly_concatenated_parts = 4, StringPart_list */
+
+/* <Field> Call.location = 0, location */
+/* <Field> Call.parenthesised = 1, bool */
+/* <Field> Call.func = 2, expr */
+/* <Field> Call.positional_args = 3, expr_list */
+/* <Field> Call.named_args = 4, dict_item_list */
+
+/* <Field> Case.location = 0, location */
+/* <Field> Case.pattern = 1, pattern */
+/* <Field> Case.guard = 2, expr */
+/* <Field> Case.body = 3, stmt_list */
+
+/* <Field> Class.name = 0, str */
+/* <Field> Class.body = 1, stmt_list */
+/* <Parent> Class = ClassExpr  */
+
+/* <Field> ClassExpr.location = 0, location */
+/* <Field> ClassExpr.parenthesised = 1, bool */
+/* <Field> ClassExpr.name = 2, str */
+/* <Field> ClassExpr.bases = 3, expr_list */
+/* <Field> ClassExpr.keywords = 4, dict_item_list */
+/* <Field> ClassExpr.inner_scope = 5, Class */
+/* <Field> ClassExpr.type_parameters = 6, type_parameter_list */
+
+/* <Field> Compare.location = 0, location */
+/* <Field> Compare.parenthesised = 1, bool */
+/* <Field> Compare.left = 2, expr */
+/* <Field> Compare.ops = 3, cmpop_list */
+/* <Field> Compare.comparators = 4, expr_list */
+
+/* <Field> Continue.location = 0, location */
+
+/* <Field> Delete.location = 0, location */
+/* <Field> Delete.targets = 1, expr_list */
+
+/* <Field> Dict.location = 0, location */
+/* <Field> Dict.parenthesised = 1, bool */
+/* <Field> Dict.items = 2, dict_item_list */
+
+/* <Field> DictComp.location = 0, location */
+/* <Field> DictComp.parenthesised = 1, bool */
+/* <Field> DictComp.function = 2, Function */
+/* <Field> DictComp.iterable = 3, expr */
+
+/* <Field> DictUnpacking.location = 0, location */
+/* <Field> DictUnpacking.value = 1, expr */
+
+/* <Field> Ellipsis.location = 0, location */
+/* <Field> Ellipsis.parenthesised = 1, bool */
+
+/* <Field> ExceptGroupStmt.location = 0, location */
+/* <Field> ExceptGroupStmt.type = 1, expr */
+/* <Field> ExceptGroupStmt.name = 2, expr */
+/* <Field> ExceptGroupStmt.body = 3, stmt_list */
+
+/* <Field> ExceptStmt.location = 0, location */
+/* <Field> ExceptStmt.type = 1, expr */
+/* <Field> ExceptStmt.name = 2, expr */
+/* <Field> ExceptStmt.body = 3, stmt_list */
+
+/* <Field> Exec.location = 0, location */
+/* <Field> Exec.body = 1, expr */
+/* <Field> Exec.globals = 2, expr */
+/* <Field> Exec.locals = 3, expr */
+
+/* <Field> ExprStmt.location = 0, location */
+/* <Field> ExprStmt.value = 1, expr */
+
+/* <Field> Filter.location = 0, location */
+/* <Field> Filter.parenthesised = 1, bool */
+/* <Field> Filter.value = 2, expr */
+/* <Field> Filter.filter = 3, expr */
+
+/* <Field> For.location = 0, location */
+/* <Field> For.target = 1, expr */
+/* <Field> For.iter = 2, expr */
+/* <Field> For.body = 3, stmt_list */
+/* <Field> For.orelse = 4, stmt_list */
+/* <Field> For.is_async = 5, bool */
+
+/* <Field> FormattedValue.location = 0, location */
+/* <Field> FormattedValue.parenthesised = 1, bool */
+/* <Field> FormattedValue.value = 2, expr */
+/* <Field> FormattedValue.conversion = 3, str */
+/* <Field> FormattedValue.format_spec = 4, JoinedStr */
+
+/* <Field> Function.name = 0, str */
+/* <Field> Function.args = 1, parameter_list */
+/* <Field> Function.vararg = 2, expr */
+/* <Field> Function.kwonlyargs = 3, expr_list */
+/* <Field> Function.kwarg = 4, expr */
+/* <Field> Function.body = 5, stmt_list */
+/* <Field> Function.is_async = 6, bool */
+/* <Field> Function.type_parameters = 7, type_parameter_list */
+/* <Parent> Function = FunctionParent  */
+
+/* <Field> FunctionExpr.location = 0, location */
+/* <Field> FunctionExpr.parenthesised = 1, bool */
+/* <Field> FunctionExpr.name = 2, str */
+/* <Field> FunctionExpr.args = 3, arguments */
+/* <Field> FunctionExpr.returns = 4, expr */
+/* <Field> FunctionExpr.inner_scope = 5, Function */
+
+/* <Field> GeneratorExp.location = 0, location */
+/* <Field> GeneratorExp.parenthesised = 1, bool */
+/* <Field> GeneratorExp.function = 2, Function */
+/* <Field> GeneratorExp.iterable = 3, expr */
+
+/* <Field> Global.location = 0, location */
+/* <Field> Global.names = 1, str_list */
+
+/* <Field> Guard.location = 0, location */
+/* <Field> Guard.parenthesised = 1, bool */
+/* <Field> Guard.test = 2, expr */
+
+/* <Field> If.location = 0, location */
+/* <Field> If.test = 1, expr */
+/* <Field> If.body = 2, stmt_list */
+/* <Field> If.orelse = 3, stmt_list */
+
+/* <Field> IfExp.location = 0, location */
+/* <Field> IfExp.parenthesised = 1, bool */
+/* <Field> IfExp.test = 2, expr */
+/* <Field> IfExp.body = 3, expr */
+/* <Field> IfExp.orelse = 4, expr */
+
+/* <Field> Import.location = 0, location */
+/* <Field> Import.names = 1, alias_list */
+
+/* <Field> ImportExpr.location = 0, location */
+/* <Field> ImportExpr.parenthesised = 1, bool */
+/* <Field> ImportExpr.level = 2, int */
+/* <Field> ImportExpr.name = 3, str */
+/* <Field> ImportExpr.top = 4, bool */
+
+/* <Field> ImportStar.location = 0, location */
+/* <Field> ImportStar.module = 1, expr */
+
+/* <Field> ImportMember.location = 0, location */
+/* <Field> ImportMember.parenthesised = 1, bool */
+/* <Field> ImportMember.module = 2, expr */
+/* <Field> ImportMember.name = 3, str */
+
+/* <Field> Fstring.location = 0, location */
+/* <Field> Fstring.parenthesised = 1, bool */
+/* <Field> Fstring.values = 2, expr_list */
+/* <Parent> Fstring = FormattedValue  */
+
+/* <Field> KeyValuePair.location = 0, location */
+/* <Field> KeyValuePair.value = 1, expr */
+/* <Field> KeyValuePair.key = 2, expr */
+
+/* <Field> Lambda.location = 0, location */
+/* <Field> Lambda.parenthesised = 1, bool */
+/* <Field> Lambda.args = 2, arguments */
+/* <Field> Lambda.inner_scope = 3, Function */
+
+/* <Field> List.location = 0, location */
+/* <Field> List.parenthesised = 1, bool */
+/* <Field> List.elts = 2, expr_list */
+/* <Field> List.ctx = 3, expr_context */
+
+/* <Field> ListComp.location = 0, location */
+/* <Field> ListComp.parenthesised = 1, bool */
+/* <Field> ListComp.function = 2, Function */
+/* <Field> ListComp.iterable = 3, expr */
+/* <Field> ListComp.generators = 4, comprehension_list */
+/* <Field> ListComp.elt = 5, expr */
+
+/* <Field> MatchStmt.location = 0, location */
+/* <Field> MatchStmt.subject = 1, expr */
+/* <Field> MatchStmt.cases = 2, stmt_list */
+
+/* <Field> MatchAsPattern.location = 0, location */
+/* <Field> MatchAsPattern.parenthesised = 1, bool */
+/* <Field> MatchAsPattern.pattern = 2, pattern */
+/* <Field> MatchAsPattern.alias = 3, expr */
+
+/* <Field> MatchCapturePattern.location = 0, location */
+/* <Field> MatchCapturePattern.parenthesised = 1, bool */
+/* <Field> MatchCapturePattern.variable = 2, expr */
+
+/* <Field> MatchClassPattern.location = 0, location */
+/* <Field> MatchClassPattern.parenthesised = 1, bool */
+/* <Field> MatchClassPattern.class = 2, expr */
+/* <Field> MatchClassPattern.class_name = 3, expr */
+/* <Field> MatchClassPattern.positional = 4, pattern_list */
+/* <Field> MatchClassPattern.keyword = 5, pattern_list */
+
+/* <Field> MatchDoubleStarPattern.location = 0, location */
+/* <Field> MatchDoubleStarPattern.parenthesised = 1, bool */
+/* <Field> MatchDoubleStarPattern.target = 2, pattern */
+
+/* <Field> MatchKeyValuePattern.location = 0, location */
+/* <Field> MatchKeyValuePattern.parenthesised = 1, bool */
+/* <Field> MatchKeyValuePattern.key = 2, pattern */
+/* <Field> MatchKeyValuePattern.value = 3, pattern */
+
+/* <Field> MatchKeywordPattern.location = 0, location */
+/* <Field> MatchKeywordPattern.parenthesised = 1, bool */
+/* <Field> MatchKeywordPattern.attribute = 2, expr */
+/* <Field> MatchKeywordPattern.value = 3, pattern */
+
+/* <Field> MatchLiteralPattern.location = 0, location */
+/* <Field> MatchLiteralPattern.parenthesised = 1, bool */
+/* <Field> MatchLiteralPattern.literal = 2, expr */
+
+/* <Field> MatchMappingPattern.location = 0, location */
+/* <Field> MatchMappingPattern.parenthesised = 1, bool */
+/* <Field> MatchMappingPattern.mappings = 2, pattern_list */
+
+/* <Field> MatchOrPattern.location = 0, location */
+/* <Field> MatchOrPattern.parenthesised = 1, bool */
+/* <Field> MatchOrPattern.patterns = 2, pattern_list */
+
+/* <Field> MatchSequencePattern.location = 0, location */
+/* <Field> MatchSequencePattern.parenthesised = 1, bool */
+/* <Field> MatchSequencePattern.patterns = 2, pattern_list */
+
+/* <Field> MatchStarPattern.location = 0, location */
+/* <Field> MatchStarPattern.parenthesised = 1, bool */
+/* <Field> MatchStarPattern.target = 2, pattern */
+
+/* <Field> MatchValuePattern.location = 0, location */
+/* <Field> MatchValuePattern.parenthesised = 1, bool */
+/* <Field> MatchValuePattern.value = 2, expr */
+
+/* <Field> MatchWildcardPattern.location = 0, location */
+/* <Field> MatchWildcardPattern.parenthesised = 1, bool */
+
+/* <Field> Module.name = 0, str */
+/* <Field> Module.hash = 1, str */
+/* <Field> Module.body = 2, stmt_list */
+/* <Field> Module.kind = 3, str */
+
+/* <Field> Name.location = 0, location */
+/* <Field> Name.parenthesised = 1, bool */
+/* <Field> Name.variable = 2, variable */
+/* <Field> Name.ctx = 3, expr_context */
+/* <Parent> Name = ParameterList  */
+
+/* <Field> Nonlocal.location = 0, location */
+/* <Field> Nonlocal.names = 1, str_list */
+
+/* <Field> Num.location = 0, location */
+/* <Field> Num.parenthesised = 1, bool */
+/* <Field> Num.n = 2, number */
+/* <Field> Num.text = 3, number */
+
+/* <Field> ParamSpec.location = 0, location */
+/* <Field> ParamSpec.name = 1, expr */
+/* <Field> ParamSpec.default = 2, expr */
+
+/* <Field> Pass.location = 0, location */
+
+/* <Field> PlaceHolder.location = 0, location */
+/* <Field> PlaceHolder.parenthesised = 1, bool */
+/* <Field> PlaceHolder.variable = 2, variable */
+/* <Field> PlaceHolder.ctx = 3, expr_context */
+
+/* <Field> Print.location = 0, location */
+/* <Field> Print.dest = 1, expr */
+/* <Field> Print.values = 2, expr_list */
+/* <Field> Print.nl = 3, bool */
+
+/* <Field> Raise.location = 0, location */
+/* <Field> Raise.exc = 1, expr */
+/* <Field> Raise.cause = 2, expr */
+/* <Field> Raise.type = 3, expr */
+/* <Field> Raise.inst = 4, expr */
+/* <Field> Raise.tback = 5, expr */
+
+/* <Field> Repr.location = 0, location */
+/* <Field> Repr.parenthesised = 1, bool */
+/* <Field> Repr.value = 2, expr */
+
+/* <Field> Return.location = 0, location */
+/* <Field> Return.value = 1, expr */
+
+/* <Field> Set.location = 0, location */
+/* <Field> Set.parenthesised = 1, bool */
+/* <Field> Set.elts = 2, expr_list */
+
+/* <Field> SetComp.location = 0, location */
+/* <Field> SetComp.parenthesised = 1, bool */
+/* <Field> SetComp.function = 2, Function */
+/* <Field> SetComp.iterable = 3, expr */
+
+/* <Field> Slice.location = 0, location */
+/* <Field> Slice.parenthesised = 1, bool */
+/* <Field> Slice.start = 2, expr */
+/* <Field> Slice.stop = 3, expr */
+/* <Field> Slice.step = 4, expr */
+
+/* <Field> SpecialOperation.location = 0, location */
+/* <Field> SpecialOperation.parenthesised = 1, bool */
+/* <Field> SpecialOperation.name = 2, str */
+/* <Field> SpecialOperation.arguments = 3, expr_list */
+
+/* <Field> Starred.location = 0, location */
+/* <Field> Starred.parenthesised = 1, bool */
+/* <Field> Starred.value = 2, expr */
+/* <Field> Starred.ctx = 3, expr_context */
+
+/* <Field> Str.location = 0, location */
+/* <Field> Str.parenthesised = 1, bool */
+/* <Field> Str.s = 2, str */
+/* <Field> Str.prefix = 3, str */
+/* <Field> Str.implicitly_concatenated_parts = 4, StringPart_list */
+
+/* <Field> StringPart.text = 0, str */
+/* <Field> StringPart.location = 1, location */
+/* <Parent> StringPart = StringPartList  */
+/* <Parent> StringPartList = BytesOrStr  */
+
+/* <Field> Subscript.location = 0, location */
+/* <Field> Subscript.parenthesised = 1, bool */
+/* <Field> Subscript.value = 2, expr */
+/* <Field> Subscript.index = 3, expr */
+/* <Field> Subscript.ctx = 4, expr_context */
+
+/* <Field> TemplateDottedNotation.location = 0, location */
+/* <Field> TemplateDottedNotation.parenthesised = 1, bool */
+/* <Field> TemplateDottedNotation.value = 2, expr */
+/* <Field> TemplateDottedNotation.attr = 3, str */
+/* <Field> TemplateDottedNotation.ctx = 4, expr_context */
+
+/* <Field> TemplateWrite.location = 0, location */
+/* <Field> TemplateWrite.value = 1, expr */
+
+/* <Field> Try.location = 0, location */
+/* <Field> Try.body = 1, stmt_list */
+/* <Field> Try.orelse = 2, stmt_list */
+/* <Field> Try.handlers = 3, stmt_list */
+/* <Field> Try.finalbody = 4, stmt_list */
+
+/* <Field> Tuple.location = 0, location */
+/* <Field> Tuple.parenthesised = 1, bool */
+/* <Field> Tuple.elts = 2, expr_list */
+/* <Field> Tuple.ctx = 3, expr_context */
+/* <Parent> Tuple = ParameterList  */
+
+/* <Field> TypeAlias.location = 0, location */
+/* <Field> TypeAlias.name = 1, expr */
+/* <Field> TypeAlias.type_parameters = 2, type_parameter_list */
+/* <Field> TypeAlias.value = 3, expr */
+
+/* <Field> TypeVar.location = 0, location */
+/* <Field> TypeVar.name = 1, expr */
+/* <Field> TypeVar.bound = 2, expr */
+/* <Field> TypeVar.default = 3, expr */
+
+/* <Field> TypeVarTuple.location = 0, location */
+/* <Field> TypeVarTuple.name = 1, expr */
+/* <Field> TypeVarTuple.default = 2, expr */
+
+/* <Field> UnaryExpr.location = 0, location */
+/* <Field> UnaryExpr.parenthesised = 1, bool */
+/* <Field> UnaryExpr.op = 2, unaryop */
+/* <Field> UnaryExpr.operand = 3, expr */
+
+/* <Field> While.location = 0, location */
+/* <Field> While.test = 1, expr */
+/* <Field> While.body = 2, stmt_list */
+/* <Field> While.orelse = 3, stmt_list */
+
+/* <Field> With.location = 0, location */
+/* <Field> With.context_expr = 1, expr */
+/* <Field> With.optional_vars = 2, expr */
+/* <Field> With.body = 3, stmt_list */
+/* <Field> With.is_async = 4, bool */
+
+/* <Field> Yield.location = 0, location */
+/* <Field> Yield.parenthesised = 1, bool */
+/* <Field> Yield.value = 2, expr */
+
+/* <Field> YieldFrom.location = 0, location */
+/* <Field> YieldFrom.parenthesised = 1, bool */
+/* <Field> YieldFrom.value = 2, expr */
+
+/* <Field> Alias.value = 0, expr */
+/* <Field> Alias.asname = 1, expr */
+/* <Parent> Alias = AliasList  */
+/* <Parent> AliasList = Import  */
+
+/* <Field> Arguments.kw_defaults = 0, expr_list */
+/* <Field> Arguments.defaults = 1, expr_list */
+/* <Field> Arguments.annotations = 2, expr_list */
+/* <Field> Arguments.varargannotation = 3, expr */
+/* <Field> Arguments.kwargannotation = 4, expr */
+/* <Field> Arguments.kw_annotations = 5, expr_list */
+/* <Parent> Arguments = ArgumentsParent  */
+/* <Parent> boolean = BoolParent  */
+/* <Parent> Boolop = BoolExpr  */
+/* <Parent> string = Bytes  */
+/* <Parent> Cmpop = CmpopList  */
+/* <Parent> CmpopList = Compare  */
+
+/* <Field> Comprehension.location = 0, location */
+/* <Field> Comprehension.iter = 1, expr */
+/* <Field> Comprehension.target = 2, expr */
+/* <Field> Comprehension.ifs = 3, expr_list */
+/* <Parent> Comprehension = ComprehensionList  */
+/* <Parent> ComprehensionList = ListComp  */
+/* <Parent> DictItem = DictItemList  */
+/* <Parent> DictItemList = DictItemListParent  */
+
+/* <Field> Expr.location = 0, location */
+/* <Field> Expr.parenthesised = 1, bool */
+/* <Parent> Expr = ExprParent  */
+/* <Parent> ExprContext = ExprContextParent  */
+/* <Parent> ExprList = ExprListParent  */
+/* <Parent> int = ImportExpr  */
+
+/* <Field> Keyword.location = 0, location */
+/* <Field> Keyword.value = 1, expr */
+/* <Field> Keyword.arg = 2, str */
+/* <Parent> Location = LocationParent  */
+/* <Parent> string = Num  */
+/* <Parent> Operator = BinaryExpr  */
+/* <Parent> ParameterList = Function  */
+
+/* <Field> Pattern.location = 0, location */
+/* <Field> Pattern.parenthesised = 1, bool */
+/* <Parent> Pattern = PatternParent  */
+/* <Parent> PatternList = PatternListParent  */
+
+/* <Field> Stmt.location = 0, location */
+/* <Parent> Stmt = StmtList  */
+/* <Parent> StmtList = StmtListParent  */
+/* <Parent> string = StrParent  */
+/* <Parent> StringList = StrListParent  */
+
+/* <Field> TypeParameter.location = 0, location */
+/* <Parent> TypeParameter = TypeParameterList  */
+/* <Parent> TypeParameterList = TypeParameterListParent  */
+/* <Parent> Unaryop = UnaryExpr  */
+/* <Parent> Variable = VariableParent  */
+py_Classes(unique int id : @py_Class,
+    unique int parent : @py_ClassExpr ref);
+
+py_Functions(unique int id : @py_Function,
+    unique int parent : @py_Function_parent ref);
+
+py_Modules(unique int id : @py_Module);
+
+py_StringParts(unique int id : @py_StringPart,
+    int parent : @py_StringPart_list ref,
+    int idx : int ref);
+
+py_StringPart_lists(unique int id : @py_StringPart_list,
+    unique int parent : @py_Bytes_or_Str ref);
+
+py_aliases(unique int id : @py_alias,
+    int parent : @py_alias_list ref,
+    int idx : int ref);
+
+py_alias_lists(unique int id : @py_alias_list,
+    unique int parent : @py_Import ref);
+
+py_arguments(unique int id : @py_arguments,
+    unique int parent : @py_arguments_parent ref);
+
+py_bools(int parent : @py_bool_parent ref,
+    int idx : int ref);
+
+py_boolops(unique int id : @py_boolop,
+    int kind: int ref,
+    unique int parent : @py_BoolExpr ref);
+
+py_bytes(varchar(1) id : string ref,
+    int parent : @py_Bytes ref,
+    int idx : int ref);
+
+py_cmpops(unique int id : @py_cmpop,
+    int kind: int ref,
+    int parent : @py_cmpop_list ref,
+    int idx : int ref);
+
+py_cmpop_lists(unique int id : @py_cmpop_list,
+    unique int parent : @py_Compare ref);
+
+py_comprehensions(unique int id : @py_comprehension,
+    int parent : @py_comprehension_list ref,
+    int idx : int ref);
+
+py_comprehension_lists(unique int id : @py_comprehension_list,
+    unique int parent : @py_ListComp ref);
+
+py_dict_items(unique int id : @py_dict_item,
+    int kind: int ref,
+    int parent : @py_dict_item_list ref,
+    int idx : int ref);
+
+py_dict_item_lists(unique int id : @py_dict_item_list,
+    unique int parent : @py_dict_item_list_parent ref);
+
+py_exprs(unique int id : @py_expr,
+    int kind: int ref,
+    int parent : @py_expr_parent ref,
+    int idx : int ref);
+
+py_expr_contexts(unique int id : @py_expr_context,
+    int kind: int ref,
+    unique int parent : @py_expr_context_parent ref);
+
+py_expr_lists(unique int id : @py_expr_list,
+    int parent : @py_expr_list_parent ref,
+    int idx : int ref);
+
+py_ints(int id : int ref,
+    unique int parent : @py_ImportExpr ref);
+
+py_locations(unique int id : @location ref,
+    unique int parent : @py_location_parent ref);
+
+py_numbers(varchar(1) id : string ref,
+    int parent : @py_Num ref,
+    int idx : int ref);
+
+py_operators(unique int id : @py_operator,
+    int kind: int ref,
+    unique int parent : @py_BinaryExpr ref);
+
+py_parameter_lists(unique int id : @py_parameter_list,
+    unique int parent : @py_Function ref);
+
+py_patterns(unique int id : @py_pattern,
+    int kind: int ref,
+    int parent : @py_pattern_parent ref,
+    int idx : int ref);
+
+py_pattern_lists(unique int id : @py_pattern_list,
+    int parent : @py_pattern_list_parent ref,
+    int idx : int ref);
+
+py_stmts(unique int id : @py_stmt,
+    int kind: int ref,
+    int parent : @py_stmt_list ref,
+    int idx : int ref);
+
+py_stmt_lists(unique int id : @py_stmt_list,
+    int parent : @py_stmt_list_parent ref,
+    int idx : int ref);
+
+py_strs(varchar(1) id : string ref,
+    int parent : @py_str_parent ref,
+    int idx : int ref);
+
+py_str_lists(unique int id : @py_str_list,
+    unique int parent : @py_str_list_parent ref);
+
+py_type_parameters(unique int id : @py_type_parameter,
+    int kind: int ref,
+    int parent : @py_type_parameter_list ref,
+    int idx : int ref);
+
+py_type_parameter_lists(unique int id : @py_type_parameter_list,
+    unique int parent : @py_type_parameter_list_parent ref);
+
+py_unaryops(unique int id : @py_unaryop,
+    int kind: int ref,
+    unique int parent : @py_UnaryExpr ref);
+
+py_variables(int id : @py_variable ref,
+    unique int parent : @py_variable_parent ref);
+
+case @py_boolop.kind of
+    0 = @py_And
+|   1 = @py_Or;
+
+case @py_cmpop.kind of
+    0 = @py_Eq
+|   1 = @py_Gt
+|   2 = @py_GtE
+|   3 = @py_In
+|   4 = @py_Is
+|   5 = @py_IsNot
+|   6 = @py_Lt
+|   7 = @py_LtE
+|   8 = @py_NotEq
+|   9 = @py_NotIn;
+
+case @py_dict_item.kind of
+    0 = @py_DictUnpacking
+|   1 = @py_KeyValuePair
+|   2 = @py_keyword;
+
+case @py_expr.kind of
+    0 = @py_Attribute
+|   1 = @py_BinaryExpr
+|   2 = @py_BoolExpr
+|   3 = @py_Bytes
+|   4 = @py_Call
+|   5 = @py_ClassExpr
+|   6 = @py_Compare
+|   7 = @py_Dict
+|   8 = @py_DictComp
+|   9 = @py_Ellipsis
+|   10 = @py_FunctionExpr
+|   11 = @py_GeneratorExp
+|   12 = @py_IfExp
+|   13 = @py_ImportExpr
+|   14 = @py_ImportMember
+|   15 = @py_Lambda
+|   16 = @py_List
+|   17 = @py_ListComp
+|   18 = @py_Guard
+|   19 = @py_Name
+|   20 = @py_Num
+|   21 = @py_Repr
+|   22 = @py_Set
+|   23 = @py_SetComp
+|   24 = @py_Slice
+|   25 = @py_Starred
+|   26 = @py_Str
+|   27 = @py_Subscript
+|   28 = @py_Tuple
+|   29 = @py_UnaryExpr
+|   30 = @py_Yield
+|   31 = @py_YieldFrom
+|   32 = @py_TemplateDottedNotation
+|   33 = @py_Filter
+|   34 = @py_PlaceHolder
+|   35 = @py_Await
+|   36 = @py_Fstring
+|   37 = @py_FormattedValue
+|   38 = @py_AssignExpr
+|   39 = @py_SpecialOperation;
+
+case @py_expr_context.kind of
+    0 = @py_AugLoad
+|   1 = @py_AugStore
+|   2 = @py_Del
+|   3 = @py_Load
+|   4 = @py_Param
+|   5 = @py_Store;
+
+case @py_operator.kind of
+    0 = @py_Add
+|   1 = @py_BitAnd
+|   2 = @py_BitOr
+|   3 = @py_BitXor
+|   4 = @py_Div
+|   5 = @py_FloorDiv
+|   6 = @py_LShift
+|   7 = @py_Mod
+|   8 = @py_Mult
+|   9 = @py_Pow
+|   10 = @py_RShift
+|   11 = @py_Sub
+|   12 = @py_MatMult;
+
+case @py_pattern.kind of
+    0 = @py_MatchAsPattern
+|   1 = @py_MatchOrPattern
+|   2 = @py_MatchLiteralPattern
+|   3 = @py_MatchCapturePattern
+|   4 = @py_MatchWildcardPattern
+|   5 = @py_MatchValuePattern
+|   6 = @py_MatchSequencePattern
+|   7 = @py_MatchStarPattern
+|   8 = @py_MatchMappingPattern
+|   9 = @py_MatchDoubleStarPattern
+|   10 = @py_MatchKeyValuePattern
+|   11 = @py_MatchClassPattern
+|   12 = @py_MatchKeywordPattern;
+
+case @py_stmt.kind of
+    0 = @py_Assert
+|   1 = @py_Assign
+|   2 = @py_AugAssign
+|   3 = @py_Break
+|   4 = @py_Continue
+|   5 = @py_Delete
+|   6 = @py_ExceptStmt
+|   7 = @py_ExceptGroupStmt
+|   8 = @py_Exec
+|   9 = @py_Expr_stmt
+|   10 = @py_For
+|   11 = @py_Global
+|   12 = @py_If
+|   13 = @py_Import
+|   14 = @py_ImportStar
+|   15 = @py_MatchStmt
+|   16 = @py_Case
+|   17 = @py_Nonlocal
+|   18 = @py_Pass
+|   19 = @py_Print
+|   20 = @py_Raise
+|   21 = @py_Return
+|   22 = @py_Try
+|   23 = @py_While
+|   24 = @py_With
+|   25 = @py_TemplateWrite
+|   26 = @py_AnnAssign
+|   27 = @py_TypeAlias;
+
+case @py_type_parameter.kind of
+    0 = @py_ParamSpec
+|   1 = @py_TypeVar
+|   2 = @py_TypeVarTuple;
+
+case @py_unaryop.kind of
+    0 = @py_Invert
+|   1 = @py_Not
+|   2 = @py_UAdd
+|   3 = @py_USub;
+
+@py_Bytes_or_Str = @py_Bytes | @py_Str;
+
+@py_Function_parent = @py_DictComp | @py_FunctionExpr | @py_GeneratorExp | @py_Lambda | @py_ListComp | @py_SetComp;
+
+@py_arguments_parent = @py_FunctionExpr | @py_Lambda;
+
+@py_ast_node = @py_Class | @py_Function | @py_Module | @py_StringPart | @py_comprehension | @py_dict_item | @py_expr | @py_pattern | @py_stmt | @py_type_parameter;
+
+@py_bool_parent = @py_For | @py_Function | @py_Print | @py_With | @py_expr | @py_pattern;
+
+@py_dict_item_list_parent = @py_Call | @py_ClassExpr | @py_Dict;
+
+@py_expr_context_parent = @py_Attribute | @py_List | @py_Name | @py_PlaceHolder | @py_Starred | @py_Subscript | @py_TemplateDottedNotation | @py_Tuple;
+
+@py_expr_list_parent = @py_Assign | @py_BoolExpr | @py_Call | @py_ClassExpr | @py_Compare | @py_Delete | @py_Fstring | @py_Function | @py_List | @py_Print | @py_Set | @py_SpecialOperation | @py_Tuple | @py_arguments | @py_comprehension;
+
+@py_expr_or_stmt = @py_expr | @py_stmt;
+
+@py_expr_parent = @py_AnnAssign | @py_Assert | @py_Assign | @py_AssignExpr | @py_Attribute | @py_AugAssign | @py_Await | @py_BinaryExpr | @py_Call | @py_Case | @py_Compare | @py_DictComp | @py_DictUnpacking | @py_ExceptGroupStmt | @py_ExceptStmt | @py_Exec | @py_Expr_stmt | @py_Filter | @py_For | @py_FormattedValue | @py_Function | @py_FunctionExpr | @py_GeneratorExp | @py_Guard | @py_If | @py_IfExp | @py_ImportMember | @py_ImportStar | @py_KeyValuePair | @py_ListComp | @py_MatchAsPattern | @py_MatchCapturePattern | @py_MatchClassPattern | @py_MatchKeywordPattern | @py_MatchLiteralPattern | @py_MatchStmt | @py_MatchValuePattern | @py_ParamSpec | @py_Print | @py_Raise | @py_Repr | @py_Return | @py_SetComp | @py_Slice | @py_Starred | @py_Subscript | @py_TemplateDottedNotation | @py_TemplateWrite | @py_TypeAlias | @py_TypeVar | @py_TypeVarTuple | @py_UnaryExpr | @py_While | @py_With | @py_Yield | @py_YieldFrom | @py_alias | @py_arguments | @py_comprehension | @py_expr_list | @py_keyword | @py_parameter_list;
+
+@py_location_parent = @py_DictUnpacking | @py_KeyValuePair | @py_StringPart | @py_comprehension | @py_expr | @py_keyword | @py_pattern | @py_stmt | @py_type_parameter;
+
+@py_parameter = @py_Name | @py_Tuple;
+
+@py_pattern_list_parent = @py_MatchClassPattern | @py_MatchMappingPattern | @py_MatchOrPattern | @py_MatchSequencePattern;
+
+@py_pattern_parent = @py_Case | @py_MatchAsPattern | @py_MatchDoubleStarPattern | @py_MatchKeyValuePattern | @py_MatchKeywordPattern | @py_MatchStarPattern | @py_pattern_list;
+
+@py_scope = @py_Class | @py_Function | @py_Module;
+
+@py_stmt_list_parent = @py_Case | @py_Class | @py_ExceptGroupStmt | @py_ExceptStmt | @py_For | @py_Function | @py_If | @py_MatchStmt | @py_Module | @py_Try | @py_While | @py_With;
+
+@py_str_list_parent = @py_Global | @py_Nonlocal;
+
+@py_str_parent = @py_Attribute | @py_Class | @py_ClassExpr | @py_FormattedValue | @py_Function | @py_FunctionExpr | @py_ImportExpr | @py_ImportMember | @py_Module | @py_SpecialOperation | @py_Str | @py_StringPart | @py_TemplateDottedNotation | @py_keyword | @py_str_list;
+
+@py_type_parameter_list_parent = @py_ClassExpr | @py_Function | @py_TypeAlias;
+
+@py_variable_parent = @py_Name | @py_PlaceHolder;
+
+
+/*
+ * End of auto-generated part
+ */
+
+
+
+/* Map relative names to absolute names for imports */
+py_absolute_names(int module : @py_Module ref,
+                  varchar(1) relname : string ref,
+                  varchar(1) absname : string ref);
+
+py_exports(int id : @py_Module ref,
+           varchar(1) name : string ref);
+
+/* Successor information */
+py_successors(int predecessor : @py_flow_node ref,
+              int successor : @py_flow_node ref);
+
+py_true_successors(int predecessor : @py_flow_node ref,
+              int successor : @py_flow_node ref);
+
+py_exception_successors(int predecessor : @py_flow_node ref,
+              int successor : @py_flow_node ref);
+
+py_false_successors(int predecessor : @py_flow_node ref,
+              int successor : @py_flow_node ref);
+
+py_flow_bb_node(unique int flownode : @py_flow_node,
+             int realnode : @py_ast_node ref,
+             int basicblock : @py_flow_node ref,
+             int index : int ref);
+
+py_scope_flow(int flow : @py_flow_node ref,
+              int scope : @py_scope ref,
+              int kind : int ref);
+
+py_idoms(unique int node : @py_flow_node ref,
+         int immediate_dominator : @py_flow_node ref);
+
+py_ssa_phi(int phi : @py_ssa_var ref,
+           int arg: @py_ssa_var ref);
+
+py_ssa_var(unique int id : @py_ssa_var,
+            int var : @py_variable ref);
+
+py_ssa_use(int node: @py_flow_node ref,
+           int var : @py_ssa_var ref);
+
+py_ssa_defn(unique int id : @py_ssa_var ref,
+                  int node: @py_flow_node ref);
+
+@py_base_var = @py_variable | @py_ssa_var;
+
+py_scopes(unique int node : @py_expr_or_stmt ref,
+         int scope : @py_scope ref);
+
+py_scope_location(unique int id : @location ref,
+                   unique int scope : @py_scope ref);
+
+py_flags_versioned(varchar(1) name : string ref,
+                   varchar(1) value : string ref,
+                   varchar(1) version : string ref);
+
+py_syntax_error_versioned(unique int id : @location ref,
+                varchar(1) message : string ref,
+                varchar(1) version : string ref);
+
+py_comments(unique int id : @py_comment,
+           varchar(1) text : string ref,
+           unique int location : @location ref);
+
+/* Type information support */
+
+py_cobjects(unique int obj : @py_cobject);
+
+py_cobjecttypes(unique int obj : @py_cobject ref,
+                int typeof : @py_cobject ref);
+
+py_cobjectnames(unique int obj : @py_cobject ref,
+                varchar(1) name : string ref);
+
+/* Kind should be 0 for introspection, > 0 from source, as follows:
+   1 from C extension source
+ */
+py_cobject_sources(int obj : @py_cobject ref,
+                  int kind : int ref);
+
+py_cmembers_versioned(int object : @py_cobject ref,
+                      varchar(1) name : string ref,
+                      int member : @py_cobject ref,
+                      varchar(1) version : string ref);
+
+py_citems(int object : @py_cobject ref,
+            int index : int ref,
+            int member : @py_cobject ref);
+
+ext_argtype(int funcid : @py_object ref,
+            int arg : int ref,
+            int typeid : @py_object ref);
+
+ext_rettype(int funcid : @py_object ref,
+            int typeid : @py_object ref);
+
+ext_proptype(int propid : @py_object ref,
+             int typeid : @py_object ref);
+
+ext_argreturn(int funcid : @py_object ref,
+              int arg : int ref);
+
+py_special_objects(unique int obj : @py_cobject ref,
+                   unique varchar(1) name : string ref);
+
+py_decorated_object(int object : @py_object ref,
+                    int level: int ref);
+
+@py_object = @py_cobject | @py_flow_node;
+
+@py_source_element = @py_ast_node | @container;
diff --git a/python/downgrades/acf8d3b08ae3cfac8833d16efbfa5a10fef86819/upgrade.properties b/python/downgrades/acf8d3b08ae3cfac8833d16efbfa5a10fef86819/upgrade.properties
new file mode 100644
index 00000000000..63392513719
--- /dev/null
+++ b/python/downgrades/acf8d3b08ae3cfac8833d16efbfa5a10fef86819/upgrade.properties
@@ -0,0 +1,2 @@
+description: Add @top type
+compatibility: full
diff --git a/python/extractor/imp.py b/python/extractor/imp.py
index 6a0685559fd..8d703250b67 100644
--- a/python/extractor/imp.py
+++ b/python/extractor/imp.py
@@ -17,9 +17,16 @@ except ImportError:
     # Platform doesn't support dynamic loading.
     create_dynamic = None
 
-from importlib._bootstrap import _ERR_MSG, _exec, _load, _builtin_from_name
+from importlib._bootstrap import _exec, _load, _builtin_from_name
 from importlib._bootstrap_external import SourcelessFileLoader
 
+# In Python 3.14, `_ERR_MSG` was removed in favor of `_ERR_MSG_PREFIX`.
+try:
+    from importlib._bootstrap import _ERR_MSG
+except ImportError:
+    from importlib._bootstrap import _ERR_MSG_PREFIX
+    _ERR_MSG = _ERR_MSG_PREFIX + '{name!r}'
+
 from importlib import machinery
 from importlib import util
 import importlib
diff --git a/python/extractor/semmle/dbscheme.template b/python/extractor/semmle/dbscheme.template
index 07b65434bbd..6b320aafab6 100644
--- a/python/extractor/semmle/dbscheme.template
+++ b/python/extractor/semmle/dbscheme.template
@@ -40,6 +40,22 @@ externalData(
   string value : string ref
 );
 
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit the tuple `databaseMetadata("isOverlay", "true")`,
+ * along with an `overlayChangedFiles` tuple for each new/modified/deleted file,
+ * when building an overlay database, and these can be used by the discard predicates.
+ */
+databaseMetadata(
+  string metadataKey : string ref,
+  string value : string ref
+);
+
+overlayChangedFiles(
+  string path : string ref
+);
+
 /*- DEPRECATED: Snapshot date -*/
 
 snapshotDate(unique date snapshotDate : date ref);
@@ -420,3 +436,12 @@ py_decorated_object(int object : @py_object ref,
 @py_object = @py_cobject | @py_flow_node;
 
 @py_source_element = @py_ast_node | @container;
+
+/** The union of all Python database entities */
+@top =
+  @py_source_element | @py_object | @py_base_var | @location | @py_line | @py_comment |
+      @py_expr_parent | @py_expr_context |
+      @py_operator | @py_boolop | @py_cmpop | @py_unaryop |
+      @py_cmpop_list | @py_alias_list | @py_StringPart_list | @py_comprehension_list | @py_dict_item_list | @py_pattern_list | @py_stmt_list | @py_str_list | @py_type_parameter_list |
+      @externalDefect | @externalMetric | @externalDataElement | @duplication_or_similarity | @svnentry |
+      @xmllocatable | @yaml_locatable;
diff --git a/python/extractor/semmle/path_rename.py b/python/extractor/semmle/path_rename.py
index 3a72d41e971..39832d6d96a 100644
--- a/python/extractor/semmle/path_rename.py
+++ b/python/extractor/semmle/path_rename.py
@@ -25,7 +25,7 @@ def renamer_from_options_and_env(options, logger):
         except (AttributeError, ImportError):
             raise SemmleError("Cannot get renamer from module " + options.renamer)
     else:
-        path_transformer = os.environ.get("SEMMLE_PATH_TRANSFORMER", None)
+        path_transformer = os.environ.get("CODEQL_PATH_TRANSFORMER", None) or os.environ.get("SEMMLE_PATH_TRANSFORMER", None)
         if path_transformer:
             logger.info("Using path transformer '%s'", path_transformer)
             rename = projectlayout.get_renamer(path_transformer)
diff --git a/python/extractor/semmle/projectlayout.py b/python/extractor/semmle/projectlayout.py
index ec657d2ae24..2886f9e9e4d 100644
--- a/python/extractor/semmle/projectlayout.py
+++ b/python/extractor/semmle/projectlayout.py
@@ -12,12 +12,16 @@ import collections
 import re
 from functools import total_ordering
 import sys
+from pathlib import PureWindowsPath
+import os
 
 def get_renamer(filename):
     layout = load(filename)
     def rename(path):
         renamed = layout.artificial_path(path)
         return path if renamed is None else renamed
+    if os.name == "nt":
+        return lambda path: rename(PureWindowsPath(path).as_posix())
     return rename
 
 def load(filename):
@@ -257,7 +261,7 @@ class _Rewrite(object):
             exclude = path
             self._line = line;
             self._original = u'-' + exclude;
-            if not exclude.startswith(u"/"):
+            if os.name != 'nt' and not exclude.startswith(u"/"):
                 exclude = u'/' + exclude
             if exclude.find(u"//") != -1:
                 raise _error(u"Illegal '//' in exclude path", line)
@@ -274,14 +278,14 @@ class _Rewrite(object):
             include = path
             self._line = line;
             self._original = include;
-            if not include.startswith(u"/"):
+            if os.name != 'nt' and not include.startswith(u"/"):
                 include = u'/' + include
             doubleslash = include.find(u"//")
             if doubleslash != include.find(u"//"):
                 raise _error(u"More than one '//' in include path (project-layout)", line)
             if self._verify_stars.match(include):
                 raise _error(u"Illegal use of '**' in include path (project-layout)", line)
-            if not virtual.startswith(u"/"):
+            if os.name != 'nt' and not virtual.startswith(u"/"):
                 virtual = u"/" + virtual
             if virtual.endswith(u"/"):
                 virtual = virtual[0 : -1]
diff --git a/python/extractor/semmle/util.py b/python/extractor/semmle/util.py
index 56f7889ae23..2f6a18ac7a9 100644
--- a/python/extractor/semmle/util.py
+++ b/python/extractor/semmle/util.py
@@ -10,7 +10,7 @@ from io import BytesIO
 
 #Semantic version of extractor.
 #Update this if any changes are made
-VERSION = "7.1.3"
+VERSION = "7.1.5"
 
 PY_EXTENSIONS = ".py", ".pyw"
 
diff --git a/python/extractor/semmle/worker.py b/python/extractor/semmle/worker.py
index 726c2c90c3b..96761a01c77 100644
--- a/python/extractor/semmle/worker.py
+++ b/python/extractor/semmle/worker.py
@@ -11,6 +11,7 @@ from semmle.extractors import SuperExtractor, ModulePrinter, SkippedBuiltin
 from semmle.profiling import get_profiler
 from semmle.path_rename import renamer_from_options_and_env
 from semmle.logging import WARN, recursion_error_message, internal_error_message, Logger
+from semmle.util import FileExtractable, FolderExtractable
 
 class ExtractorFailure(Exception):
     'Generic exception representing the failure of an extractor.'
@@ -19,17 +20,32 @@ class ExtractorFailure(Exception):
 
 class ModuleImportGraph(object):
 
-    def __init__(self, max_depth):
+    def __init__(self, max_depth, logger: Logger):
         self.modules = {}
         self.succ = defaultdict(set)
         self.todo = set()
         self.done = set()
         self.max_depth = max_depth
+        self.logger = logger
+
+        # During overlay extraction, only traverse the files that were changed.
+        self.overlay_changes = None
+        if 'CODEQL_EXTRACTOR_PYTHON_OVERLAY_CHANGES' in os.environ:
+            overlay_changes_file = os.environ['CODEQL_EXTRACTOR_PYTHON_OVERLAY_CHANGES']
+            logger.info("Overlay extraction mode: only extracting files changed according to '%s'", overlay_changes_file)
+            try:
+                with open(overlay_changes_file, 'r', encoding='utf-8') as f:
+                    data = json.load(f)
+                    changed_paths = data.get('changes', [])
+                    self.overlay_changes = { os.path.abspath(p) for p in changed_paths }
+            except (IOError, ValueError) as e:
+                logger.warn("Failed to read overlay changes from '%s' (falling back to full extraction): %s", overlay_changes_file, e)
+                self.overlay_changes = None
 
     def add_root(self, mod):
         self.modules[mod] = 0
         if mod not in self.done:
-            self.todo.add(mod)
+            self.add_todo(mod)
 
     def add_import(self, mod, imported):
         assert mod in self.modules
@@ -39,7 +55,7 @@ class ModuleImportGraph(object):
                 self._reduce_depth(imported, self.modules[mod] + 1)
         else:
             if self.modules[mod] < self.max_depth and imported not in self.done:
-                self.todo.add(imported)
+                self.add_todo(imported)
             self.modules[imported] = self.modules[mod] + 1
 
     def _reduce_depth(self, mod, depth):
@@ -48,7 +64,7 @@ class ModuleImportGraph(object):
         if depth > self.max_depth:
             return
         if mod not in self.done:
-            self.todo.add(mod)
+            self.add_todo(mod)
         self.modules[mod] = depth
         for imp in self.succ[mod]:
             self._reduce_depth(imp, depth+1)
@@ -61,11 +77,25 @@ class ModuleImportGraph(object):
 
     def push_back(self, mod):
         self.done.remove(mod)
-        self.todo.add(mod)
+        self.add_todo(mod)
 
     def empty(self):
         return not self.todo
 
+    def add_todo(self, mod):
+        if not self._module_in_overlay_changes(mod):
+            self.logger.debug("Skipping module '%s' as it was not changed in overlay extraction.", mod)
+            return
+        self.todo.add(mod)
+
+    def _module_in_overlay_changes(self, mod):
+        if self.overlay_changes is not None:
+            if isinstance(mod, FileExtractable):
+                return mod.path in self.overlay_changes
+            if isinstance(mod, FolderExtractable):
+                return mod.path + '/__init__.py' in self.overlay_changes
+        return True
+
 class ExtractorPool(object):
     '''Pool of worker processes running extractors'''
 
@@ -90,7 +120,7 @@ class ExtractorPool(object):
         self.enqueued = set()
         self.done = set()
         self.requirements = {}
-        self.import_graph = ModuleImportGraph(options.max_import_depth)
+        self.import_graph = ModuleImportGraph(options.max_import_depth, logger)
         logger.debug("Source archive: %s", archive)
         self.logger = logger
         DiagnosticsWriter.create_output_dir()
@@ -162,6 +192,10 @@ class ExtractorPool(object):
             self.module_queue.put(None)
         for p in self.procs:
             p.join()
+        if 'CODEQL_EXTRACTOR_PYTHON_OVERLAY_BASE_METADATA_OUT' in os.environ:
+            with open(os.environ['CODEQL_EXTRACTOR_PYTHON_OVERLAY_BASE_METADATA_OUT'], 'w', encoding='utf-8') as f:
+                metadata = {}
+                json.dump(metadata, f)
         self.logger.info("Processed %d modules in %0.2fs", len(self.import_graph.done), time.time() - self.start_time)
 
     def stop(self, timeout=2.0):
diff --git a/python/extractor/tests/parser/types_new.expected b/python/extractor/tests/parser/types_new.expected
index a390ed1aae2..de4f4486280 100644
--- a/python/extractor/tests/parser/types_new.expected
+++ b/python/extractor/tests/parser/types_new.expected
@@ -308,47 +308,6 @@ Module: [1, 0] - [23, 0]
               ]
               ctx: Load
           ctx: Load
-    TypeAlias: [20, 0] - [20, 41]
-      name:
-        Name: [20, 5] - [20, 9]
-          variable: Variable('Baz2', None)
-          ctx: Store
-      type_parameters: [
-        ParamSpec: [20, 10] - [20, 27]
-          name:
-            Name: [20, 12] - [20, 14]
-              variable: Variable('P2', None)
-              ctx: Store
-          default:
-            List: [20, 17] - [20, 27]
-              elts: [
-                Name: [20, 18] - [20, 21]
-                  variable: Variable('int', None)
-                  ctx: Load
-                Name: [20, 23] - [20, 26]
-                  variable: Variable('str', None)
-                  ctx: Load
-              ]
-              ctx: Load
-      ]
-      value:
-        Subscript: [20, 31] - [20, 41]
-          value:
-            Name: [20, 31] - [20, 35]
-              variable: Variable('Spam', None)
-              ctx: Load
-          index:
-            BinOp: [20, 36] - [20, 40]
-              left:
-                Name: [20, 36] - [20, 36]
-                  variable: Variable('', None)
-                  ctx: Load
-              op: Pow
-              right:
-                Name: [20, 38] - [20, 40]
-                  variable: Variable('P2', None)
-                  ctx: Load
-          ctx: Load
     TypeAlias: [21, 0] - [21, 41]
       name:
         Name: [21, 5] - [21, 9]
diff --git a/python/extractor/tests/parser/types_new.py b/python/extractor/tests/parser/types_new.py
index 12e5eac0556..9709d0f3044 100644
--- a/python/extractor/tests/parser/types_new.py
+++ b/python/extractor/tests/parser/types_new.py
@@ -17,6 +17,6 @@ class Qux1[*Ts1 = *tuple[int, bool]]: ...
 
 # TypeAliases
 type Foo2[T15, U1 = str] = Bar1[T15, U1]
-type Baz2[**P2 = [int, str]] = Spam[**P2]
+# type Baz2[**P2 = [int, str]] = Spam[**P2] # From the PEP, but this is not actually valid syntax!
 type Qux2[*Ts2 = *tuple[str]] = Ham[*Ts2]
 type Rab[U2, T15 = str] = Bar2[T15, U2]
diff --git a/python/extractor/tests/test_use_projectlayout.py b/python/extractor/tests/test_use_projectlayout.py
index fde36016f97..a573044b0b4 100644
--- a/python/extractor/tests/test_use_projectlayout.py
+++ b/python/extractor/tests/test_use_projectlayout.py
@@ -19,7 +19,7 @@ class ProjectLayoutUseTest(ExtractorTest):
 
     def test_invalid_layout(self):
         try:
-            with environment("SEMMLE_PATH_TRANSFORMER", "nonsuch/project-layout"):
+            with environment("CODEQL_PATH_TRANSFORMER", "nonsuch/project-layout"):
                 self.run_extractor("-R", self.src_path)
         except subprocess.CalledProcessError as ex:
             self.assertEqual(ex.returncode, 2)
diff --git a/python/extractor/tsg-python/Cargo.lock b/python/extractor/tsg-python/Cargo.lock
index 16849dc7f4d..f3604d1a387 100644
--- a/python/extractor/tsg-python/Cargo.lock
+++ b/python/extractor/tsg-python/Cargo.lock
@@ -1,12 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "ahash"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0453232ace82dee0dd0b4c87a59bd90f7b53b314f3e0f61fe2ee7c8a16482289"
+version = 4
 
 [[package]]
 name = "aho-corasick"
@@ -82,12 +76,6 @@ dependencies = [
  "shlex",
 ]
 
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
 [[package]]
 name = "clap"
 version = "4.5.30"
@@ -121,15 +109,6 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
 
-[[package]]
-name = "hashbrown"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
-dependencies = [
- "ahash",
-]
-
 [[package]]
 name = "is_terminal_polyfill"
 version = "1.70.1"
@@ -258,14 +237,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd"
 
 [[package]]
-name = "string-interner"
-version = "0.12.2"
+name = "streaming-iterator"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "383196d1876517ee6f9f0864d1fc1070331b803335d3c6daaa04bbcccd823c08"
-dependencies = [
- "cfg-if",
- "hashbrown",
-]
+checksum = "2b2231b7c3057d5e4ad0156fb3dc807d900806020c5ffa3ee6ff2c8c76fb8520"
 
 [[package]]
 name = "strsim"
@@ -306,30 +281,39 @@ dependencies = [
 
 [[package]]
 name = "tree-sitter"
-version = "0.20.4"
+version = "0.24.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e34327f8eac545e3f037382471b2b19367725a242bba7bc45edb9efb49fe39a"
+checksum = "a5387dffa7ffc7d2dae12b50c6f7aab8ff79d6210147c6613561fc3d474c6f75"
 dependencies = [
  "cc",
  "regex",
+ "regex-syntax",
+ "streaming-iterator",
+ "tree-sitter-language",
 ]
 
 [[package]]
 name = "tree-sitter-graph"
-version = "0.7.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "639d21e886f581d293de5f5081f09af003c54607ff3fa85efa159b243ba1f97a"
+checksum = "63f86eb73c7d891c4b9b6fe4d4e63dd94c506e4788af7c2296afdcfbeea626cc"
 dependencies = [
  "log",
  "regex",
  "serde",
  "serde_json",
  "smallvec",
- "string-interner",
+ "streaming-iterator",
  "thiserror",
  "tree-sitter",
 ]
 
+[[package]]
+name = "tree-sitter-language"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4013970217383f67b18aef68f6fb2e8d409bc5755227092d32efb0422ba24b8"
+
 [[package]]
 name = "tsg-python"
 version = "0.1.0"
diff --git a/python/extractor/tsg-python/Cargo.toml b/python/extractor/tsg-python/Cargo.toml
index 7ad2c1c949e..f02fb06931b 100644
--- a/python/extractor/tsg-python/Cargo.toml
+++ b/python/extractor/tsg-python/Cargo.toml
@@ -10,7 +10,7 @@ edition = "2024"
 [dependencies]
 anyhow = "1.0"
 regex = "1"
-tree-sitter = "=0.20.4"
-tree-sitter-graph = "0.7.0"
+tree-sitter = "=0.24.7"
+tree-sitter-graph = "0.12.0"
 tsp = {path = "tsp"}
 clap = "4.5"
diff --git a/python/extractor/tsg-python/python.tsg b/python/extractor/tsg-python/python.tsg
index 7ad0f3f1424..50a59d4c27c 100644
--- a/python/extractor/tsg-python/python.tsg
+++ b/python/extractor/tsg-python/python.tsg
@@ -6,16 +6,6 @@
 (module) @mod
 { let @mod.node = (ast-node @mod "Module") }
 
-(_) @anynode
-{
-    scan (node-type @anynode) {
-        "^(ERROR|MISSING)$" {
-            let @anynode.node = (ast-node @anynode "SyntaxErrorNode")
-            attr (@anynode.node) source = (source-text @anynode)
-        }
-    }
-}
-
 (parenthesized_expression) @nd
 { let @nd.node = (ast-node @nd "Expr") }
 
@@ -174,7 +164,7 @@
 { let @unaryop.node = (ast-node @unaryop "UnaryOp") }
 
 (exec_statement) @exec
-{ let @exec.node = (ast-node @exec "Exec") }
+{ let @exec.node = (ast-node @exec "Exec") }
 
 (print_statement) @print
 { let @print.node = (ast-node @print "Print") }
@@ -416,13 +406,13 @@
     attr (@if.node) _location_end = (location-end @expr)
 }
 
-(generator_expression . "(" . (comment)* . (expression) @start (for_in_clause) @child [(for_in_clause) (if_clause)] @end . (comment)* . ")" .) @genexpr
+(generator_expression . "(" . (comment)* . (expression) @start (for_in_clause) @child [(for_in_clause) (if_clause)] @end . (comment)* . ")" .) @_genexpr
 {
     attr (@child.node) _location_start = (location-start @start)
     attr (@child.node) _location_end = (location-end @end)
 }
 
-(generator_expression . "(" . (comment)* . (expression) @start (for_in_clause) @end . (comment)* . ")" .) @genexpr
+(generator_expression . "(" . (comment)* . (expression) @start (for_in_clause) @end . (comment)* . ")" .) @_genexpr
 {
     attr (@end.node) _location_start = (location-start @start)
     attr (@end.node) _location_end = (location-end @end)
@@ -524,7 +514,7 @@
     attr (@del.node -> @target.node) targets = (named-child-index @target)
 }
 
-(delete_statement target: (_) @target) @del
+(delete_statement target: (_) @target) @_del
 {
     attr (@target.node) ctx = "del"
 }
@@ -798,8 +788,8 @@
 
 (dictionary_comprehension
     body: (pair
-        key: (_) @key
-        value: (_) @value
+        key: (_) @_key
+        value: (_) @_value
     )
 ) @genexpr
 {
@@ -1299,7 +1289,7 @@
 ; the index of the left-hand side of the current assignment.
 
 ; Base case, for the outermost assignment we set the outermost node to this node, and the index to zero.
-(expression_statement (assignment !type) @assign) @expr
+(expression_statement (assignment !type) @assign) @_expr
 {
     let @assign.outermost_assignment = @assign.node
     let @assign.target_index = 0
@@ -1358,7 +1348,7 @@
 }
 
 (assignment
-    left: (_) @target
+    left: (_) @_target
     type: (_)
     right: (_) @value
 ) @assign
@@ -2330,7 +2320,7 @@
     attr (@operand.node) ctx = "load"
 }
 
-(unary_operator "~" @op) @unaryop
+(unary_operator "~" @_op) @unaryop
 {
     attr (@unaryop.node) op = "~"
 }
@@ -2614,7 +2604,7 @@
 ; Async status
 ; NOTE: We only set the `is_async` field on the _first_ clause of the `with` statement,
 ; as this is the behaviour of the old parser.
-(with_statement "async" "with" @with_keyword (with_clause . (with_item) @with))
+(with_statement "async" "with" @_with_keyword (with_clause . (with_item) @with))
 {
     attr (@with.node) is_async = #true
 }
@@ -2800,7 +2790,7 @@
     (identifier) @obj
     .
     (identifier) @attr
-) @match_value_pattern
+) @_match_value_pattern
 {
     let attribute = (ast-node @attr "Attribute")
     attr (@attr.node) _skip_to = attribute
@@ -2814,7 +2804,7 @@
 (match_value_pattern
     .
     (identifier) @id
-) @match_value_pattern
+) @_match_value_pattern
 {
     attr (@id.node) ctx = "load"
 }
@@ -3040,7 +3030,7 @@
     if some @is_kwarg {
         attr (@lambda.function -> @name.node) kwonlyargs = (named-child-index @param)
     }
-    else { 
+    else { 
         attr (@lambda.function -> @name.node) args = (named-child-index @param)
     }
 
@@ -3153,7 +3143,7 @@
     if some @is_kwarg {
         attr (@funcdef.function -> @name.node) kwonlyargs = (named-child-index @param)
     }
-    else { 
+    else { 
         attr (@funcdef.function -> @name.node) args = (named-child-index @param)
     }
 
@@ -3267,8 +3257,8 @@
 (decorated_definition
     (decorator (expression) @exp1) @dec1
     . (comment)* .
-    (decorator (expression) @exp2) @dec2
-) @decorator
+    (decorator (expression) @_exp2) @dec2
+) @_decorator
 {
     attr (@dec1.node) func = @exp1.node
     edge @dec1.node -> @dec2.node
@@ -3279,24 +3269,24 @@
     (decorator (expression) @exp) @last
     . (comment)* .
     definition: (function_definition) @funcdef
-) @decorator
+) @_decorator
 {
     attr (@last.node) func = @exp.node
     edge @last.node -> @funcdef.funcexpr
     attr (@last.node -> @funcdef.funcexpr) positional_args = 0
-    attr (@last.node) _location_end = (location-end @exp)
+    attr (@last.node) _location_end = (location-end @exp)
 }
 
 (decorated_definition
     (decorator (expression) @exp) @last
     . (comment)* .
     definition: (class_definition) @class
-) @decorator
+) @_decorator
 {
     attr (@last.node) func = @exp.node
     edge @last.node -> @class.class_expr
     attr (@last.node -> @class.class_expr) positional_args = 0
-    attr (@last.node) _location_end = (location-end @exp)
+    attr (@last.node) _location_end = (location-end @exp)
 }
 
 ;;; Type parameters
diff --git a/python/extractor/tsg-python/src/main.rs b/python/extractor/tsg-python/src/main.rs
index 6b72efdb6ef..d71c93d7f2c 100644
--- a/python/extractor/tsg-python/src/main.rs
+++ b/python/extractor/tsg-python/src/main.rs
@@ -480,6 +480,102 @@ pub mod extra_functions {
     }
 }
 
+struct TreeIterator<'a> {
+    nodes_to_visit: Vec<tree_sitter::Node<'a>>,
+}
+
+impl<'a> TreeIterator<'a> {
+    fn new(root: tree_sitter::Node<'a>) -> Self {
+        Self {
+            nodes_to_visit: vec![root],
+        }
+    }
+}
+
+impl<'a> Iterator for TreeIterator<'a> {
+    type Item = tree_sitter::Node<'a>;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        if let Some(node) = self.nodes_to_visit.pop() {
+            // Add all children to the queue for processing
+            let children: Vec<_> = (0..node.child_count())
+                .rev()
+                .filter_map(|i| node.child(i))
+                .collect();
+            self.nodes_to_visit.extend(children);
+            Some(node)
+        } else {
+            None
+        }
+    }
+}
+
+#[derive(Debug, Clone)]
+struct SyntaxError {
+    start_pos: tree_sitter::Point,
+    end_pos: tree_sitter::Point,
+    source: String,
+}
+
+fn syntax_errors_from_tree<'a>(
+    root: tree_sitter::Node<'a>,
+    source: &'a str,
+) -> impl Iterator<Item = SyntaxError> + 'a {
+    TreeIterator::new(root)
+        .filter(|&node| node.is_error() || node.is_missing())
+        .map(move |node| {
+            let start_pos = node.start_position();
+            let end_pos = node.end_position();
+            let text = &source.get(node.byte_range()).unwrap_or("");
+            SyntaxError {
+                start_pos,
+                end_pos,
+                source: text.to_string(),
+            }
+        })
+}
+
+fn add_syntax_error_nodes(graph: &mut tree_sitter_graph::graph::Graph, errors: &[SyntaxError]) {
+    for error in errors {
+        let error_node = graph.add_graph_node();
+
+        // Add _kind attribute
+        graph[error_node]
+            .attributes
+            .add(
+                tree_sitter_graph::Identifier::from("_kind"),
+                tree_sitter_graph::graph::Value::String("SyntaxErrorNode".to_string()),
+            )
+            .expect("Fresh node should not have duplicate attributes");
+
+        // Add _location attribute
+        let location = tree_sitter_graph::graph::Value::List(
+            vec![
+                error.start_pos.row,
+                error.start_pos.column,
+                error.end_pos.row,
+                error.end_pos.column,
+            ]
+            .into_iter()
+            .map(|v| tree_sitter_graph::graph::Value::from(v as u32))
+            .collect(),
+        );
+        graph[error_node]
+            .attributes
+            .add(tree_sitter_graph::Identifier::from("_location"), location)
+            .expect("Fresh node should not have duplicate attributes");
+
+        // Add source attribute
+        graph[error_node]
+            .attributes
+            .add(
+                tree_sitter_graph::Identifier::from("source"),
+                tree_sitter_graph::graph::Value::String(error.source.clone()),
+            )
+            .expect("Fresh node should not have duplicate attributes");
+    }
+}
+
 fn main() -> Result<()> {
     let matches = Command::new("tsg-python")
         .version(BUILD_VERSION)
@@ -502,7 +598,7 @@ fn main() -> Result<()> {
     let source_path = Path::new(matches.get_one::<String>("source").unwrap());
     let language = tsp::language();
     let mut parser = Parser::new();
-    parser.set_language(language)?;
+    parser.set_language(&language)?;
     // Statically include `python.tsg`:
     let tsg = if matches.contains_id("tsg") {
         std::fs::read(&tsg_path).with_context(|| format!("Error reading TSG file {}", tsg_path))?
@@ -581,10 +677,18 @@ fn main() -> Result<()> {
     );
 
     let globals = Variables::new();
-    let mut config = ExecutionConfig::new(&mut functions, &globals).lazy(false);
-    let graph = file
-        .execute(&tree, &source, &mut config, &NoCancellation)
+    let config = ExecutionConfig::new(&functions, &globals).lazy(false);
+    let mut graph = file
+        .execute(&tree, &source, &config, &NoCancellation)
         .with_context(|| format!("Could not execute TSG file {}", tsg_path))?;
+
+    // Collect and add syntax error nodes to the graph
+    if tree.root_node().has_error() {
+        let syntax_errors: Vec<SyntaxError> =
+            syntax_errors_from_tree(tree.root_node(), &source).collect();
+        add_syntax_error_nodes(&mut graph, &syntax_errors);
+    }
+
     print!("{}", graph.pretty_print());
     Ok(())
 }
diff --git a/python/extractor/tsg-python/tsp/Cargo.toml b/python/extractor/tsg-python/tsp/Cargo.toml
index e3614456662..3d8587bbe5a 100644
--- a/python/extractor/tsg-python/tsp/Cargo.toml
+++ b/python/extractor/tsg-python/tsp/Cargo.toml
@@ -26,7 +26,7 @@ path = "bindings/rust/lib.rs"
 
 ## When updating these dependencies, run `misc/bazel/3rdparty/update_cargo_deps.sh`
 [dependencies]
-tree-sitter = ">= 0.20, < 0.21"
+tree-sitter = "=0.24.7"
 
 [build-dependencies]
 cc = "1.2"
diff --git a/python/ql/consistency-queries/OverlayDiscardConsistency.ql b/python/ql/consistency-queries/OverlayDiscardConsistency.ql
new file mode 100644
index 00000000000..d37afe1f919
--- /dev/null
+++ b/python/ql/consistency-queries/OverlayDiscardConsistency.ql
@@ -0,0 +1 @@
+import semmle.python.internal.OverlayDiscardConsistencyQuery
diff --git a/python/ql/examples/snippets/builtin_object.ql b/python/ql/examples/snippets/builtin_object.ql
index 7f552a5aa79..36b2d92e0b9 100644
--- a/python/ql/examples/snippets/builtin_object.ql
+++ b/python/ql/examples/snippets/builtin_object.ql
@@ -8,7 +8,8 @@
  */
 
 import python
+private import LegacyPointsTo
 
-from Expr e, string name
+from ExprWithPointsTo e, string name
 where e.pointsTo(Value::named(name)) and not name.charAt(_) = "."
 select e
diff --git a/python/ql/examples/snippets/catch_exception.ql b/python/ql/examples/snippets/catch_exception.ql
index 9d67d0056b6..b4a77f267d0 100644
--- a/python/ql/examples/snippets/catch_exception.ql
+++ b/python/ql/examples/snippets/catch_exception.ql
@@ -8,9 +8,10 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from ExceptStmt ex, ClassValue cls
 where
   cls.getName() = "MyExceptionClass" and
-  ex.getType().pointsTo(cls)
+  ex.getType().(ExprWithPointsTo).pointsTo(cls)
 select ex
diff --git a/python/ql/examples/snippets/conditional_expression.ql b/python/ql/examples/snippets/conditional_expression.ql
index 8af55ca104f..876c3467869 100644
--- a/python/ql/examples/snippets/conditional_expression.ql
+++ b/python/ql/examples/snippets/conditional_expression.ql
@@ -9,10 +9,11 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from IfExp e, ClassObject cls1, ClassObject cls2
 where
-  e.getBody().refersTo(_, cls1, _) and
-  e.getOrelse().refersTo(_, cls2, _) and
+  e.getBody().(ExprWithPointsTo).refersTo(_, cls1, _) and
+  e.getOrelse().(ExprWithPointsTo).refersTo(_, cls2, _) and
   cls1 != cls2
 select e
diff --git a/python/ql/examples/snippets/new_instance.ql b/python/ql/examples/snippets/new_instance.ql
index 75a1ea635d5..b0be6f77197 100644
--- a/python/ql/examples/snippets/new_instance.ql
+++ b/python/ql/examples/snippets/new_instance.ql
@@ -8,9 +8,10 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from Call new, ClassValue cls
 where
   cls.getName() = "MyClass" and
-  new.getFunc().pointsTo(cls)
+  new.getFunc().(ExprWithPointsTo).pointsTo(cls)
 select new
diff --git a/python/ql/examples/snippets/print.ql b/python/ql/examples/snippets/print.ql
index f0ba47eafeb..ba4d730118d 100644
--- a/python/ql/examples/snippets/print.ql
+++ b/python/ql/examples/snippets/print.ql
@@ -6,6 +6,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from AstNode print
 where
@@ -13,5 +14,5 @@ where
   print instanceof Print
   or
   /* Python 3 or with `from __future__ import print_function` */
-  print.(Call).getFunc().pointsTo(Value::named("print"))
+  print.(Call).getFunc().(ExprWithPointsTo).pointsTo(Value::named("print"))
 select print
diff --git a/python/ql/examples/snippets/raise_exception.ql b/python/ql/examples/snippets/raise_exception.ql
index 12e4f93a349..23cf26a8c60 100644
--- a/python/ql/examples/snippets/raise_exception.ql
+++ b/python/ql/examples/snippets/raise_exception.ql
@@ -8,9 +8,10 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from Raise raise, ClassValue ex
 where
   ex.getName() = "AnException" and
-  raise.getException().pointsTo(ex.getASuperType())
+  raise.getException().(ExprWithPointsTo).pointsTo(ex.getASuperType())
 select raise, "Don't raise instances of 'AnException'"
diff --git a/python/ql/examples/snippets/store_none.ql b/python/ql/examples/snippets/store_none.ql
index 57be82f229d..b35c5fc84b4 100644
--- a/python/ql/examples/snippets/store_none.ql
+++ b/python/ql/examples/snippets/store_none.ql
@@ -10,9 +10,10 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from SubscriptNode store
 where
   store.isStore() and
-  store.getIndex().pointsTo(Value::named("None"))
+  store.getIndex().(ControlFlowNodeWithPointsTo).pointsTo(Value::named("None"))
 select store
diff --git a/python/ql/integration-tests/query-suite/not_included_in_qls.expected b/python/ql/integration-tests/query-suite/not_included_in_qls.expected
index 05108abc206..8d0e0814d53 100644
--- a/python/ql/integration-tests/query-suite/not_included_in_qls.expected
+++ b/python/ql/integration-tests/query-suite/not_included_in_qls.expected
@@ -1,11 +1,7 @@
 ql/python/ql/src/AlertSuppression.ql
 ql/python/ql/src/Classes/MaybeUndefinedClassAttribute.ql
-ql/python/ql/src/Classes/ShouldBeContextManager.ql
 ql/python/ql/src/Classes/UndefinedClassAttribute.ql
-ql/python/ql/src/Classes/UselessClass.ql
-ql/python/ql/src/Expressions/NonPortableComparisonUsingIs.ql
 ql/python/ql/src/Filters/ClassifyFiles.ql
-ql/python/ql/src/Functions/ReturnValueIgnored.ql
 ql/python/ql/src/Imports/ImportShadowedByLoopVar.ql
 ql/python/ql/src/Imports/ImportStarUsed.ql
 ql/python/ql/src/Imports/Imports.ql
@@ -59,16 +55,12 @@ ql/python/ql/src/Metrics/TransitiveImports.ql
 ql/python/ql/src/Security/CWE-020-ExternalAPIs/ExternalAPIsUsedWithUntrustedData.ql
 ql/python/ql/src/Security/CWE-020-ExternalAPIs/UntrustedDataToExternalAPI.ql
 ql/python/ql/src/Security/CWE-798/HardcodedCredentials.ql
-ql/python/ql/src/Statements/AssertLiteralConstant.ql
 ql/python/ql/src/Statements/C_StyleParentheses.ql
 ql/python/ql/src/Statements/DocStrings.ql
 ql/python/ql/src/Statements/ExecUsed.ql
 ql/python/ql/src/Statements/StringConcatenationInLoop.ql
 ql/python/ql/src/Variables/Global.ql
-ql/python/ql/src/Variables/ShadowBuiltin.ql
-ql/python/ql/src/Variables/ShadowGlobal.ql
 ql/python/ql/src/Variables/UndefinedGlobal.ql
-ql/python/ql/src/Variables/UnusedParameter.ql
 ql/python/ql/src/analysis/CallGraphEfficiency.ql
 ql/python/ql/src/analysis/CallGraphMarginalEfficiency.ql
 ql/python/ql/src/analysis/Consistency.ql
diff --git a/python/ql/integration-tests/query-suite/python-code-quality-extended.qls.expected b/python/ql/integration-tests/query-suite/python-code-quality-extended.qls.expected
index 960972c508c..cc8d0fd7f5e 100644
--- a/python/ql/integration-tests/query-suite/python-code-quality-extended.qls.expected
+++ b/python/ql/integration-tests/query-suite/python-code-quality-extended.qls.expected
@@ -1,14 +1,19 @@
+ql/python/ql/src/Classes/CallsToInitDel/MissingCallToDel.ql
+ql/python/ql/src/Classes/CallsToInitDel/MissingCallToInit.ql
+ql/python/ql/src/Classes/CallsToInitDel/SuperclassDelCalledMultipleTimes.ql
+ql/python/ql/src/Classes/CallsToInitDel/SuperclassInitCalledMultipleTimes.ql
+ql/python/ql/src/Classes/Comparisons/EqualsOrHash.ql
+ql/python/ql/src/Classes/Comparisons/EqualsOrNotEquals.ql
+ql/python/ql/src/Classes/Comparisons/IncompleteOrdering.ql
 ql/python/ql/src/Classes/ConflictingAttributesInBaseClasses.ql
 ql/python/ql/src/Classes/DefineEqualsWhenAddingAttributes.ql
-ql/python/ql/src/Classes/EqualsOrHash.ql
 ql/python/ql/src/Classes/InconsistentMRO.ql
 ql/python/ql/src/Classes/InitCallsSubclass/InitCallsSubclassMethod.ql
-ql/python/ql/src/Classes/MissingCallToDel.ql
-ql/python/ql/src/Classes/MissingCallToInit.ql
 ql/python/ql/src/Classes/MutatingDescriptor.ql
-ql/python/ql/src/Classes/SubclassShadowing.ql
-ql/python/ql/src/Classes/SuperclassDelCalledMultipleTimes.ql
-ql/python/ql/src/Classes/SuperclassInitCalledMultipleTimes.ql
+ql/python/ql/src/Classes/OverwritingAttributeInSuperClass.ql
+ql/python/ql/src/Classes/ShouldBeContextManager.ql
+ql/python/ql/src/Classes/SubclassShadowing/SubclassShadowing.ql
+ql/python/ql/src/Classes/UselessClass.ql
 ql/python/ql/src/Classes/WrongNameForArgumentInClassInstantiation.ql
 ql/python/ql/src/Classes/WrongNumberArgumentsInClassInstantiation.ql
 ql/python/ql/src/Exceptions/CatchingBaseException.ql
@@ -35,6 +40,7 @@ ql/python/ql/src/Expressions/Formatting/WrongNumberArgumentsFor3101Format.ql
 ql/python/ql/src/Expressions/HashedButNoHash.ql
 ql/python/ql/src/Expressions/IncorrectComparisonUsingIs.ql
 ql/python/ql/src/Expressions/NonCallableCalled.ql
+ql/python/ql/src/Expressions/NonPortableComparisonUsingIs.ql
 ql/python/ql/src/Expressions/Regex/BackspaceEscape.ql
 ql/python/ql/src/Expressions/Regex/DuplicateCharacterInSet.ql
 ql/python/ql/src/Expressions/Regex/MissingPartSpecialGroup.ql
@@ -59,10 +65,12 @@ ql/python/ql/src/Functions/NonCls.ql
 ql/python/ql/src/Functions/NonSelf.ql
 ql/python/ql/src/Functions/OverlyComplexDelMethod.ql
 ql/python/ql/src/Functions/ReturnConsistentTupleSizes.ql
+ql/python/ql/src/Functions/ReturnValueIgnored.ql
 ql/python/ql/src/Functions/SignatureOverriddenMethod.ql
 ql/python/ql/src/Functions/SignatureSpecialMethods.ql
 ql/python/ql/src/Functions/UseImplicitNoneReturnValue.ql
 ql/python/ql/src/Imports/EncodingError.ql
+ql/python/ql/src/Imports/FromImportOfMutableAttribute.ql
 ql/python/ql/src/Imports/ImportandImportFrom.ql
 ql/python/ql/src/Imports/ModuleImportsItself.ql
 ql/python/ql/src/Imports/MultipleImports.ql
@@ -71,7 +79,9 @@ ql/python/ql/src/Imports/UnintentionalImport.ql
 ql/python/ql/src/Imports/UnusedImport.ql
 ql/python/ql/src/Lexical/CommentedOutCode.ql
 ql/python/ql/src/Resources/FileNotAlwaysClosed.ql
+ql/python/ql/src/Statements/AssertLiteralConstant.ql
 ql/python/ql/src/Statements/AssertOnTuple.ql
+ql/python/ql/src/Statements/BreakOrReturnInFinally.ql
 ql/python/ql/src/Statements/ConstantInConditional.ql
 ql/python/ql/src/Statements/IterableStringOrSequence.ql
 ql/python/ql/src/Statements/MismatchInMultipleAssignment.ql
@@ -80,6 +90,7 @@ ql/python/ql/src/Statements/NestedLoopsSameVariable.ql
 ql/python/ql/src/Statements/NestedLoopsSameVariableWithReuse.ql
 ql/python/ql/src/Statements/NonIteratorInForLoop.ql
 ql/python/ql/src/Statements/RedundantAssignment.ql
+ql/python/ql/src/Statements/ReturnOrYieldOutsideFunction.ql
 ql/python/ql/src/Statements/ShouldUseWithStatement.ql
 ql/python/ql/src/Statements/SideEffectInAssert.ql
 ql/python/ql/src/Statements/StatementNoEffect.ql
@@ -93,7 +104,12 @@ ql/python/ql/src/Testing/ImpreciseAssert.ql
 ql/python/ql/src/Variables/GlobalAtModuleLevel.ql
 ql/python/ql/src/Variables/LoopVariableCapture/LoopVariableCapture.ql
 ql/python/ql/src/Variables/MultiplyDefined.ql
+ql/python/ql/src/Variables/ShadowBuiltin.ql
+ql/python/ql/src/Variables/ShadowGlobal.ql
 ql/python/ql/src/Variables/SuspiciousUnusedLoopIterationVariable.ql
 ql/python/ql/src/Variables/UndefinedExport.ql
+ql/python/ql/src/Variables/UndefinedPlaceHolder.ql
+ql/python/ql/src/Variables/UninitializedLocal.ql
 ql/python/ql/src/Variables/UnusedLocalVariable.ql
 ql/python/ql/src/Variables/UnusedModuleVariable.ql
+ql/python/ql/src/Variables/UnusedParameter.ql
diff --git a/python/ql/integration-tests/query-suite/python-code-quality.qls.expected b/python/ql/integration-tests/query-suite/python-code-quality.qls.expected
index 960972c508c..b0cb4532541 100644
--- a/python/ql/integration-tests/query-suite/python-code-quality.qls.expected
+++ b/python/ql/integration-tests/query-suite/python-code-quality.qls.expected
@@ -1,14 +1,16 @@
+ql/python/ql/src/Classes/CallsToInitDel/MissingCallToDel.ql
+ql/python/ql/src/Classes/CallsToInitDel/MissingCallToInit.ql
+ql/python/ql/src/Classes/CallsToInitDel/SuperclassDelCalledMultipleTimes.ql
+ql/python/ql/src/Classes/CallsToInitDel/SuperclassInitCalledMultipleTimes.ql
+ql/python/ql/src/Classes/Comparisons/EqualsOrHash.ql
+ql/python/ql/src/Classes/Comparisons/EqualsOrNotEquals.ql
+ql/python/ql/src/Classes/Comparisons/IncompleteOrdering.ql
 ql/python/ql/src/Classes/ConflictingAttributesInBaseClasses.ql
 ql/python/ql/src/Classes/DefineEqualsWhenAddingAttributes.ql
-ql/python/ql/src/Classes/EqualsOrHash.ql
 ql/python/ql/src/Classes/InconsistentMRO.ql
 ql/python/ql/src/Classes/InitCallsSubclass/InitCallsSubclassMethod.ql
-ql/python/ql/src/Classes/MissingCallToDel.ql
-ql/python/ql/src/Classes/MissingCallToInit.ql
 ql/python/ql/src/Classes/MutatingDescriptor.ql
-ql/python/ql/src/Classes/SubclassShadowing.ql
-ql/python/ql/src/Classes/SuperclassDelCalledMultipleTimes.ql
-ql/python/ql/src/Classes/SuperclassInitCalledMultipleTimes.ql
+ql/python/ql/src/Classes/SubclassShadowing/SubclassShadowing.ql
 ql/python/ql/src/Classes/WrongNameForArgumentInClassInstantiation.ql
 ql/python/ql/src/Classes/WrongNumberArgumentsInClassInstantiation.ql
 ql/python/ql/src/Exceptions/CatchingBaseException.ql
diff --git a/python/ql/integration-tests/query-suite/python-code-scanning.qls.expected b/python/ql/integration-tests/query-suite/python-code-scanning.qls.expected
index 4db5af9c1a2..90885318d0d 100644
--- a/python/ql/integration-tests/query-suite/python-code-scanning.qls.expected
+++ b/python/ql/integration-tests/query-suite/python-code-scanning.qls.expected
@@ -13,8 +13,10 @@ ql/python/ql/src/Security/CWE-079/ReflectedXss.ql
 ql/python/ql/src/Security/CWE-089/SqlInjection.ql
 ql/python/ql/src/Security/CWE-090/LdapInjection.ql
 ql/python/ql/src/Security/CWE-094/CodeInjection.ql
+ql/python/ql/src/Security/CWE-1004/NonHttpOnlyCookie.ql
 ql/python/ql/src/Security/CWE-113/HeaderInjection.ql
 ql/python/ql/src/Security/CWE-116/BadTagFilter.ql
+ql/python/ql/src/Security/CWE-1275/SameSiteNoneCookie.ql
 ql/python/ql/src/Security/CWE-209/StackTraceExposure.ql
 ql/python/ql/src/Security/CWE-215/FlaskDebug.ql
 ql/python/ql/src/Security/CWE-285/PamAuthorization.ql
diff --git a/python/ql/integration-tests/query-suite/python-security-and-quality.qls.expected b/python/ql/integration-tests/query-suite/python-security-and-quality.qls.expected
index 170d9f442f9..11b75dd0ee3 100644
--- a/python/ql/integration-tests/query-suite/python-security-and-quality.qls.expected
+++ b/python/ql/integration-tests/query-suite/python-security-and-quality.qls.expected
@@ -1,20 +1,20 @@
+ql/python/ql/src/Classes/CallsToInitDel/MissingCallToDel.ql
+ql/python/ql/src/Classes/CallsToInitDel/MissingCallToInit.ql
+ql/python/ql/src/Classes/CallsToInitDel/SuperclassDelCalledMultipleTimes.ql
+ql/python/ql/src/Classes/CallsToInitDel/SuperclassInitCalledMultipleTimes.ql
+ql/python/ql/src/Classes/Comparisons/EqualsOrHash.ql
+ql/python/ql/src/Classes/Comparisons/EqualsOrNotEquals.ql
+ql/python/ql/src/Classes/Comparisons/IncompleteOrdering.ql
 ql/python/ql/src/Classes/ConflictingAttributesInBaseClasses.ql
 ql/python/ql/src/Classes/DefineEqualsWhenAddingAttributes.ql
-ql/python/ql/src/Classes/EqualsOrHash.ql
-ql/python/ql/src/Classes/EqualsOrNotEquals.ql
-ql/python/ql/src/Classes/IncompleteOrdering.ql
 ql/python/ql/src/Classes/InconsistentMRO.ql
 ql/python/ql/src/Classes/InitCallsSubclass/InitCallsSubclassMethod.ql
-ql/python/ql/src/Classes/MissingCallToDel.ql
-ql/python/ql/src/Classes/MissingCallToInit.ql
 ql/python/ql/src/Classes/MutatingDescriptor.ql
 ql/python/ql/src/Classes/OverwritingAttributeInSuperClass.ql
 ql/python/ql/src/Classes/PropertyInOldStyleClass.ql
 ql/python/ql/src/Classes/SlotsInOldStyleClass.ql
-ql/python/ql/src/Classes/SubclassShadowing.ql
+ql/python/ql/src/Classes/SubclassShadowing/SubclassShadowing.ql
 ql/python/ql/src/Classes/SuperInOldStyleClass.ql
-ql/python/ql/src/Classes/SuperclassDelCalledMultipleTimes.ql
-ql/python/ql/src/Classes/SuperclassInitCalledMultipleTimes.ql
 ql/python/ql/src/Classes/WrongNameForArgumentInClassInstantiation.ql
 ql/python/ql/src/Classes/WrongNumberArgumentsInClassInstantiation.ql
 ql/python/ql/src/Diagnostics/ExtractedFiles.ql
@@ -106,9 +106,11 @@ ql/python/ql/src/Security/CWE-079/ReflectedXss.ql
 ql/python/ql/src/Security/CWE-089/SqlInjection.ql
 ql/python/ql/src/Security/CWE-090/LdapInjection.ql
 ql/python/ql/src/Security/CWE-094/CodeInjection.ql
+ql/python/ql/src/Security/CWE-1004/NonHttpOnlyCookie.ql
 ql/python/ql/src/Security/CWE-113/HeaderInjection.ql
 ql/python/ql/src/Security/CWE-116/BadTagFilter.ql
 ql/python/ql/src/Security/CWE-117/LogInjection.ql
+ql/python/ql/src/Security/CWE-1275/SameSiteNoneCookie.ql
 ql/python/ql/src/Security/CWE-209/StackTraceExposure.ql
 ql/python/ql/src/Security/CWE-215/FlaskDebug.ql
 ql/python/ql/src/Security/CWE-285/PamAuthorization.ql
diff --git a/python/ql/integration-tests/query-suite/python-security-extended.qls.expected b/python/ql/integration-tests/query-suite/python-security-extended.qls.expected
index 1b255c6a0d0..d677e65c3cf 100644
--- a/python/ql/integration-tests/query-suite/python-security-extended.qls.expected
+++ b/python/ql/integration-tests/query-suite/python-security-extended.qls.expected
@@ -16,9 +16,11 @@ ql/python/ql/src/Security/CWE-079/ReflectedXss.ql
 ql/python/ql/src/Security/CWE-089/SqlInjection.ql
 ql/python/ql/src/Security/CWE-090/LdapInjection.ql
 ql/python/ql/src/Security/CWE-094/CodeInjection.ql
+ql/python/ql/src/Security/CWE-1004/NonHttpOnlyCookie.ql
 ql/python/ql/src/Security/CWE-113/HeaderInjection.ql
 ql/python/ql/src/Security/CWE-116/BadTagFilter.ql
 ql/python/ql/src/Security/CWE-117/LogInjection.ql
+ql/python/ql/src/Security/CWE-1275/SameSiteNoneCookie.ql
 ql/python/ql/src/Security/CWE-209/StackTraceExposure.ql
 ql/python/ql/src/Security/CWE-215/FlaskDebug.ql
 ql/python/ql/src/Security/CWE-285/PamAuthorization.ql
diff --git a/python/ql/lib/CHANGELOG.md b/python/ql/lib/CHANGELOG.md
index 901012f035f..df8a66ca0e6 100644
--- a/python/ql/lib/CHANGELOG.md
+++ b/python/ql/lib/CHANGELOG.md
@@ -1,3 +1,36 @@
+## 4.1.0
+
+### New Features
+
+* Initial support for incremental Python databases via `codeql database create --overlay-base`/`--overlay-changes`.
+
+## 4.0.17
+
+### Bug Fixes
+
+* The Python extractor no longer crashes with an `ImportError` when run using Python 3.14.
+
+## 4.0.16
+
+### Minor Analysis Improvements
+
+* Data flow tracking through global variables now supports nested field access patterns such as `global_var.obj.field`. This improves the precision of taint tracking analysis when data flows through complex global variable structures.
+
+## 4.0.15
+
+No user-facing changes.
+
+## 4.0.14
+
+### Minor Analysis Improvements
+
+- The modelling of Psycopg2 now supports the use of `psycopg2.pool` connection pools for handling database connections.
+* Removed `lxml` as an XML bomb sink. The underlying libxml2 library now includes [entity reference loop detection](https://github.com/lxml/lxml/blob/f33ac2c2f5f9c4c4c1fc47f363be96db308f2fa6/doc/FAQ.txt#L1077) that prevents XML bomb attacks. 
+
+## 4.0.13
+
+No user-facing changes.
+
 ## 4.0.12
 
 ### Minor Analysis Improvements
diff --git a/python/ql/lib/LegacyPointsTo.qll b/python/ql/lib/LegacyPointsTo.qll
new file mode 100644
index 00000000000..3e675854601
--- /dev/null
+++ b/python/ql/lib/LegacyPointsTo.qll
@@ -0,0 +1,210 @@
+/**
+ * DEPRECATED: Using the methods in this module may lead to a degradation of performance. Use at
+ * your own peril.
+ *
+ * This module contains legacy points-to predicates and methods for various classes in the
+ * points-to analysis.
+ *
+ * Existing code that depends on, say, points-to predicates on `ControlFlowNode` should be modified
+ * to use `ControlFlowNodeWithPointsTo` instead. In particular, if inside a method call chain such
+ * as
+ *
+ * `someCallNode.getFunction().pointsTo(...)`
+ *
+ *  an explicit cast should be added as follows
+ *
+ * `someCallNode.getFunction().(ControlFlowNodeWithPointsTo).pointsTo(...)`
+ *
+ * Similarly, if a bound variable has type `ControlFlowNode`, and a points-to method is called on
+ * it, the type should be changed to `ControlFlowNodeWithPointsTo`.
+ */
+
+private import python
+private import semmle.python.pointsto.PointsTo
+private import semmle.python.objects.Modules
+
+/**
+ * An extension of `ControlFlowNode` that provides points-to predicates.
+ */
+class ControlFlowNodeWithPointsTo extends ControlFlowNode {
+  /** Gets the value that this ControlFlowNode points-to. */
+  predicate pointsTo(Value value) { this.pointsTo(_, value, _) }
+
+  /** Gets the value that this ControlFlowNode points-to. */
+  Value pointsTo() { this.pointsTo(_, result, _) }
+
+  /** Gets a value that this ControlFlowNode may points-to. */
+  Value inferredValue() { this.pointsTo(_, result, _) }
+
+  /** Gets the value and origin that this ControlFlowNode points-to. */
+  predicate pointsTo(Value value, ControlFlowNode origin) { this.pointsTo(_, value, origin) }
+
+  /** Gets the value and origin that this ControlFlowNode points-to, given the context. */
+  predicate pointsTo(Context context, Value value, ControlFlowNode origin) {
+    PointsTo::pointsTo(this, context, value, origin)
+  }
+
+  /**
+   * Gets what this flow node might "refer-to". Performs a combination of localized (intra-procedural) points-to
+   * analysis and global module-level analysis. This points-to analysis favours precision over recall. It is highly
+   * precise, but may not provide information for a significant number of flow-nodes.
+   * If the class is unimportant then use `refersTo(value)` or `refersTo(value, origin)` instead.
+   */
+  pragma[nomagic]
+  predicate refersTo(Object obj, ClassObject cls, ControlFlowNode origin) {
+    this.refersTo(_, obj, cls, origin)
+  }
+
+  /** Gets what this expression might "refer-to" in the given `context`. */
+  pragma[nomagic]
+  predicate refersTo(Context context, Object obj, ClassObject cls, ControlFlowNode origin) {
+    not obj = unknownValue() and
+    not cls = theUnknownType() and
+    PointsTo::points_to(this, context, obj, cls, origin)
+  }
+
+  /**
+   * Whether this flow node might "refer-to" to `value` which is from `origin`
+   * Unlike `this.refersTo(value, _, origin)` this predicate includes results
+   * where the class cannot be inferred.
+   */
+  pragma[nomagic]
+  predicate refersTo(Object obj, ControlFlowNode origin) {
+    not obj = unknownValue() and
+    PointsTo::points_to(this, _, obj, _, origin)
+  }
+
+  /** Equivalent to `this.refersTo(value, _)` */
+  predicate refersTo(Object obj) { this.refersTo(obj, _) }
+
+  /**
+   * Check whether this control-flow node has complete points-to information.
+   * This would mean that the analysis managed to infer an over approximation
+   * of possible values at runtime.
+   */
+  predicate hasCompletePointsToSet() {
+    // If the tracking failed, then `this` will be its own "origin". In that
+    // case, we want to exclude nodes for which there is also a different
+    // origin, as that would indicate that some paths failed and some did not.
+    this.refersTo(_, _, this) and
+    not exists(ControlFlowNode other | other != this and this.refersTo(_, _, other))
+    or
+    // If `this` is a use of a variable, then we must have complete points-to
+    // for that variable.
+    exists(SsaVariable v | v.getAUse() = this | varHasCompletePointsToSet(v))
+  }
+}
+
+/**
+ * Check whether a SSA variable has complete points-to information.
+ * This would mean that the analysis managed to infer an overapproximation
+ * of possible values at runtime.
+ */
+private predicate varHasCompletePointsToSet(SsaVariable var) {
+  // Global variables may be modified non-locally or concurrently.
+  not var.getVariable() instanceof GlobalVariable and
+  (
+    // If we have complete points-to information on the definition of
+    // this variable, then the variable has complete information.
+    var.getDefinition()
+        .(DefinitionNode)
+        .getValue()
+        .(ControlFlowNodeWithPointsTo)
+        .hasCompletePointsToSet()
+    or
+    // If this variable is a phi output, then we have complete
+    // points-to information about it if all phi inputs had complete
+    // information.
+    forex(SsaVariable phiInput | phiInput = var.getAPhiInput() |
+      varHasCompletePointsToSet(phiInput)
+    )
+  )
+}
+
+/**
+ * An extension of `Expr` that provides points-to predicates.
+ */
+class ExprWithPointsTo extends Expr {
+  /**
+   * NOTE: `refersTo` will be deprecated in 2019. Use `pointsTo` instead.
+   * Gets what this expression might "refer-to". Performs a combination of localized (intra-procedural) points-to
+   *  analysis and global module-level analysis. This points-to analysis favours precision over recall. It is highly
+   *  precise, but may not provide information for a significant number of flow-nodes.
+   *  If the class is unimportant then use `refersTo(value)` or `refersTo(value, origin)` instead.
+   * NOTE: For complex dataflow, involving multiple stages of points-to analysis, it may be more precise to use
+   * `ControlFlowNode.refersTo(...)` instead.
+   */
+  predicate refersTo(Object obj, ClassObject cls, AstNode origin) {
+    this.refersTo(_, obj, cls, origin)
+  }
+
+  /**
+   * NOTE: `refersTo` will be deprecated in 2019. Use `pointsTo` instead.
+   * Gets what this expression might "refer-to" in the given `context`.
+   */
+  predicate refersTo(Context context, Object obj, ClassObject cls, AstNode origin) {
+    this.getAFlowNode()
+        .(ControlFlowNodeWithPointsTo)
+        .refersTo(context, obj, cls, origin.getAFlowNode())
+  }
+
+  /**
+   * NOTE: `refersTo` will be deprecated in 2019. Use `pointsTo` instead.
+   * Holds if this expression might "refer-to" to `value` which is from `origin`
+   * Unlike `this.refersTo(value, _, origin)`, this predicate includes results
+   * where the class cannot be inferred.
+   */
+  pragma[nomagic]
+  predicate refersTo(Object obj, AstNode origin) {
+    this.getAFlowNode().(ControlFlowNodeWithPointsTo).refersTo(obj, origin.getAFlowNode())
+  }
+
+  /**
+   * NOTE: `refersTo` will be deprecated in 2019. Use `pointsTo` instead.
+   * Equivalent to `this.refersTo(value, _)`
+   */
+  predicate refersTo(Object obj) { this.refersTo(obj, _) }
+
+  /**
+   * Holds if this expression might "point-to" to `value` which is from `origin`
+   * in the given `context`.
+   */
+  predicate pointsTo(Context context, Value value, AstNode origin) {
+    this.getAFlowNode()
+        .(ControlFlowNodeWithPointsTo)
+        .pointsTo(context, value, origin.getAFlowNode())
+  }
+
+  /**
+   * Holds if this expression might "point-to" to `value` which is from `origin`.
+   */
+  predicate pointsTo(Value value, AstNode origin) {
+    this.getAFlowNode().(ControlFlowNodeWithPointsTo).pointsTo(value, origin.getAFlowNode())
+  }
+
+  /**
+   * Holds if this expression might "point-to" to `value`.
+   */
+  predicate pointsTo(Value value) { this.pointsTo(value, _) }
+
+  /** Gets a value that this expression might "point-to". */
+  Value pointsTo() { this.pointsTo(result) }
+
+  override string getAQlClass() { none() }
+}
+
+/**
+ * An extension of `Module` that provides points-to related methods.
+ */
+class ModuleWithPointsTo extends Module {
+  /** Gets a name exported by this module, that is the names that will be added to a namespace by 'from this-module import *' */
+  string getAnExport() {
+    py_exports(this, result)
+    or
+    exists(ModuleObjectInternal mod | mod.getSource() = this.getEntryNode() |
+      mod.(ModuleValue).exports(result)
+    )
+  }
+
+  override string getAQlClass() { none() }
+}
diff --git a/python/ql/lib/analysis/DefinitionTracking.qll b/python/ql/lib/analysis/DefinitionTracking.qll
index 5a9811f6248..53f8e791cd8 100644
--- a/python/ql/lib/analysis/DefinitionTracking.qll
+++ b/python/ql/lib/analysis/DefinitionTracking.qll
@@ -3,6 +3,7 @@
  */
 
 import python
+private import LegacyPointsTo
 import semmle.python.pointsto.PointsTo
 import IDEContextual
 
@@ -36,22 +37,22 @@ private predicate jump_to_defn(ControlFlowNode use, Definition defn) {
   )
   or
   exists(PythonModuleObject mod |
-    use.(ImportExprNode).refersTo(mod) and
+    use.(ImportExprNode).(ControlFlowNodeWithPointsTo).refersTo(mod) and
     defn.getAstNode() = mod.getModule()
   )
   or
   exists(PythonModuleObject mod, string name |
-    use.(ImportMemberNode).getModule(name).refersTo(mod) and
+    use.(ImportMemberNode).getModule(name).(ControlFlowNodeWithPointsTo).refersTo(mod) and
     scope_jump_to_defn_attribute(mod.getModule(), name, defn)
   )
   or
   exists(PackageObject package |
-    use.(ImportExprNode).refersTo(package) and
+    use.(ImportExprNode).(ControlFlowNodeWithPointsTo).refersTo(package) and
     defn.getAstNode() = package.getInitModule().getModule()
   )
   or
   exists(PackageObject package, string name |
-    use.(ImportMemberNode).getModule(name).refersTo(package) and
+    use.(ImportMemberNode).getModule(name).(ControlFlowNodeWithPointsTo).refersTo(package) and
     scope_jump_to_defn_attribute(package.getInitModule().getModule(), name, defn)
   )
   or
@@ -83,7 +84,7 @@ private predicate ssa_phi_defn(PhiFunction phi, Definition defn) {
   ssa_variable_defn(phi.getAnInput(), defn)
 }
 
-/** Holds if the ESSA defn `def`  refers to (`value`, `cls`, `origin`) given the context `context`. */
+/** Holds if the ESSA defn `def` refers to (`value`, `cls`, `origin`) given the context `context`. */
 private predicate ssa_defn_defn(EssaDefinition def, Definition defn) {
   ssa_phi_defn(def, defn)
   or
@@ -230,7 +231,7 @@ private predicate module_and_name_for_import_star_helper(
   ModuleObject mod, string name, ImportStarNode im_star, ImportStarRefinement def
 ) {
   im_star = def.getDefiningNode() and
-  im_star.getModule().refersTo(mod) and
+  im_star.getModule().(ControlFlowNodeWithPointsTo).refersTo(mod) and
   name = def.getSourceVariable().getName()
 }
 
@@ -239,7 +240,7 @@ pragma[noinline]
 private predicate variable_not_redefined_by_import_star(EssaVariable var, ImportStarRefinement def) {
   var = def.getInput() and
   exists(ModuleObject mod |
-    def.getDefiningNode().(ImportStarNode).getModule().refersTo(mod) and
+    def.getDefiningNode().(ImportStarNode).getModule().(ControlFlowNodeWithPointsTo).refersTo(mod) and
     not mod.exports(var.getSourceVariable().getName())
   )
 }
@@ -352,7 +353,9 @@ private predicate scope_jump_to_defn_attribute(ImportTimeScope s, string name, D
   )
 }
 
-private predicate jump_to_defn_attribute(ControlFlowNode use, string name, Definition defn) {
+private predicate jump_to_defn_attribute(
+  ControlFlowNodeWithPointsTo use, string name, Definition defn
+) {
   /* Local attribute */
   exists(EssaVariable var |
     use = var.getASourceUse() and
@@ -367,7 +370,7 @@ private predicate jump_to_defn_attribute(ControlFlowNode use, string name, Defin
   /* Super attributes */
   exists(AttrNode f, SuperBoundMethod sbm, Object function |
     use = f.getObject(name) and
-    f.refersTo(sbm) and
+    f.(ControlFlowNodeWithPointsTo).refersTo(sbm) and
     function = sbm.getFunction(_) and
     function.getOrigin() = defn.getAstNode()
   )
@@ -408,7 +411,7 @@ private predicate attribute_assignment_jump_to_defn_attribute(
 private predicate sets_attribute(ArgumentRefinement def, string name) {
   exists(CallNode call |
     call = def.getDefiningNode() and
-    call.getFunction().refersTo(Object::builtin("setattr")) and
+    call.getFunction().(ControlFlowNodeWithPointsTo).refersTo(Object::builtin("setattr")) and
     def.getInput().getAUse() = call.getArg(0) and
     call.getArg(1).getNode().(StringLiteral).getText() = name
   )
diff --git a/python/ql/lib/change-notes/2025-10-30-remove-points-to-from-cfg-and-expr.md b/python/ql/lib/change-notes/2025-10-30-remove-points-to-from-cfg-and-expr.md
new file mode 100644
index 00000000000..9b8eef6bcba
--- /dev/null
+++ b/python/ql/lib/change-notes/2025-10-30-remove-points-to-from-cfg-and-expr.md
@@ -0,0 +1,5 @@
+---
+category: breaking
+---
+
+- The classes `ControlFlowNode`, `Expr`, and `Module` no longer expose predicates that invoke the points-to analysis. To access these predicates, import the module `LegacyPointsTo` and follow the instructions given therein.
diff --git a/python/ql/lib/change-notes/released/4.0.13.md b/python/ql/lib/change-notes/released/4.0.13.md
new file mode 100644
index 00000000000..7e3690f40f1
--- /dev/null
+++ b/python/ql/lib/change-notes/released/4.0.13.md
@@ -0,0 +1,3 @@
+## 4.0.13
+
+No user-facing changes.
diff --git a/python/ql/lib/change-notes/released/4.0.14.md b/python/ql/lib/change-notes/released/4.0.14.md
new file mode 100644
index 00000000000..41957d11048
--- /dev/null
+++ b/python/ql/lib/change-notes/released/4.0.14.md
@@ -0,0 +1,6 @@
+## 4.0.14
+
+### Minor Analysis Improvements
+
+- The modelling of Psycopg2 now supports the use of `psycopg2.pool` connection pools for handling database connections.
+* Removed `lxml` as an XML bomb sink. The underlying libxml2 library now includes [entity reference loop detection](https://github.com/lxml/lxml/blob/f33ac2c2f5f9c4c4c1fc47f363be96db308f2fa6/doc/FAQ.txt#L1077) that prevents XML bomb attacks. 
diff --git a/python/ql/lib/change-notes/released/4.0.15.md b/python/ql/lib/change-notes/released/4.0.15.md
new file mode 100644
index 00000000000..de5387e3da3
--- /dev/null
+++ b/python/ql/lib/change-notes/released/4.0.15.md
@@ -0,0 +1,3 @@
+## 4.0.15
+
+No user-facing changes.
diff --git a/python/ql/lib/change-notes/released/4.0.16.md b/python/ql/lib/change-notes/released/4.0.16.md
new file mode 100644
index 00000000000..025815a5c02
--- /dev/null
+++ b/python/ql/lib/change-notes/released/4.0.16.md
@@ -0,0 +1,5 @@
+## 4.0.16
+
+### Minor Analysis Improvements
+
+* Data flow tracking through global variables now supports nested field access patterns such as `global_var.obj.field`. This improves the precision of taint tracking analysis when data flows through complex global variable structures.
diff --git a/python/ql/lib/change-notes/released/4.0.17.md b/python/ql/lib/change-notes/released/4.0.17.md
new file mode 100644
index 00000000000..561e2db6a31
--- /dev/null
+++ b/python/ql/lib/change-notes/released/4.0.17.md
@@ -0,0 +1,5 @@
+## 4.0.17
+
+### Bug Fixes
+
+* The Python extractor no longer crashes with an `ImportError` when run using Python 3.14.
diff --git a/python/ql/lib/change-notes/released/4.1.0.md b/python/ql/lib/change-notes/released/4.1.0.md
new file mode 100644
index 00000000000..51c7ea24f1b
--- /dev/null
+++ b/python/ql/lib/change-notes/released/4.1.0.md
@@ -0,0 +1,5 @@
+## 4.1.0
+
+### New Features
+
+* Initial support for incremental Python databases via `codeql database create --overlay-base`/`--overlay-changes`.
diff --git a/python/ql/lib/codeql-pack.release.yml b/python/ql/lib/codeql-pack.release.yml
index f2bb0c626a2..d5b1bf88d10 100644
--- a/python/ql/lib/codeql-pack.release.yml
+++ b/python/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 4.0.12
+lastReleaseVersion: 4.1.0
diff --git a/python/ql/lib/experimental/cryptography/CryptoArtifact.qll b/python/ql/lib/experimental/cryptography/CryptoArtifact.qll
index fc5c75a4e44..e8939c98111 100644
--- a/python/ql/lib/experimental/cryptography/CryptoArtifact.qll
+++ b/python/ql/lib/experimental/cryptography/CryptoArtifact.qll
@@ -95,7 +95,7 @@ abstract class CryptographicAlgorithm extends CryptographicArtifact {
   /**
    * Normalizes a raw name into a normalized name as found in `CryptoAlgorithmNames.qll`.
    * Subclassess should override for more api-specific normalization.
-   * By deafult, converts a raw name to upper-case with no hyphen, underscore, hash, or space.
+   * By default, converts a raw name to upper-case with no hyphen, underscore, hash, or space.
    */
   bindingset[s]
   string normalizeName(string s) {
diff --git a/python/ql/lib/experimental/cryptography/modules/CryptographyModule.qll b/python/ql/lib/experimental/cryptography/modules/CryptographyModule.qll
index 405433b0735..0831d625d80 100644
--- a/python/ql/lib/experimental/cryptography/modules/CryptographyModule.qll
+++ b/python/ql/lib/experimental/cryptography/modules/CryptographyModule.qll
@@ -117,31 +117,25 @@ module KDF {
     override predicate requiresIteration() { this.getAlgorithm().getKDFName() in ["PBKDF2HMAC"] }
 
     override DataFlow::Node getIterationSizeSrc() {
-      if this.requiresIteration()
-      then
-        // ASSUMPTION: ONLY EVER in arg 3 in PBKDF2HMAC
-        result = Utils::getUltimateSrcFromApiNode(this.getParameter(3, "iterations"))
-      else none()
+      this.requiresIteration() and
+      // ASSUMPTION: ONLY EVER in arg 3 in PBKDF2HMAC
+      result = Utils::getUltimateSrcFromApiNode(this.getParameter(3, "iterations"))
     }
 
     override DataFlow::Node getSaltConfigSrc() {
-      if this.requiresSalt()
-      then
-        // SCRYPT has it in arg 1
-        if this.getAlgorithm().getKDFName() = "SCRYPT"
-        then result = Utils::getUltimateSrcFromApiNode(this.getParameter(1, "salt"))
-        else
-          // EVERYTHING ELSE that uses salt is in arg 2
-          result = Utils::getUltimateSrcFromApiNode(this.getParameter(2, "salt"))
-      else none()
+      this.requiresSalt() and
+      // SCRYPT has it in arg 1
+      if this.getAlgorithm().getKDFName() = "SCRYPT"
+      then result = Utils::getUltimateSrcFromApiNode(this.getParameter(1, "salt"))
+      else
+        // EVERYTHING ELSE that uses salt is in arg 2
+        result = Utils::getUltimateSrcFromApiNode(this.getParameter(2, "salt"))
     }
 
     override DataFlow::Node getHashConfigSrc() {
-      if this.requiresHash()
-      then
-        // ASSUMPTION: ONLY EVER in arg 0
-        result = Utils::getUltimateSrcFromApiNode(this.getParameter(0, "algorithm"))
-      else none()
+      this.requiresHash() and
+      // ASSUMPTION: ONLY EVER in arg 0
+      result = Utils::getUltimateSrcFromApiNode(this.getParameter(0, "algorithm"))
     }
 
     // TODO: get encryption algorithm for CBC-based KDF?
@@ -152,11 +146,9 @@ module KDF {
     }
 
     override DataFlow::Node getModeSrc() {
-      if this.requiresMode()
-      then
-        // ASSUMPTION: ONLY EVER in arg 1
-        result = Utils::getUltimateSrcFromApiNode(this.getParameter(1, "mode"))
-      else none()
+      this.requiresMode() and
+      // ASSUMPTION: ONLY EVER in arg 1
+      result = Utils::getUltimateSrcFromApiNode(this.getParameter(1, "mode"))
     }
   }
 }
diff --git a/python/ql/lib/experimental/cryptography/modules/stdlib/HashlibModule.qll b/python/ql/lib/experimental/cryptography/modules/stdlib/HashlibModule.qll
index 5b2586dc54a..346512e9a2d 100644
--- a/python/ql/lib/experimental/cryptography/modules/stdlib/HashlibModule.qll
+++ b/python/ql/lib/experimental/cryptography/modules/stdlib/HashlibModule.qll
@@ -201,7 +201,7 @@ module KDF {
 
   // TODO: better modeling of scrypt
   /**
-   * Identifies key derivation fucntion hashlib.scrypt accesses.
+   * Identifies key derivation function hashlib.scrypt accesses.
    */
   class HashlibScryptAlgorithm extends KeyDerivationAlgorithm, KeyDerivationOperation {
     HashlibScryptAlgorithm() { this = API::moduleImport("hashlib").getMember("scrypt").getACall() }
diff --git a/python/ql/lib/printAst.ql b/python/ql/lib/printAst.ql
index e6af7e1eff1..72fd89727c8 100644
--- a/python/ql/lib/printAst.ql
+++ b/python/ql/lib/printAst.ql
@@ -25,4 +25,9 @@ class PrintAstConfigurationOverride extends PrintAstConfiguration {
     super.shouldPrint(e, l) and
     l.getFile() = getFileBySourceArchiveName(selectedSourceFile())
   }
+
+  override predicate shouldPrintYaml(YamlNode y, Location l) {
+    super.shouldPrintYaml(y, l) and
+    l.getFile() = getFileBySourceArchiveName(selectedSourceFile())
+  }
 }
diff --git a/python/ql/lib/python.qll b/python/ql/lib/python.qll
index 24744d005a1..b08f0ae35bb 100644
--- a/python/ql/lib/python.qll
+++ b/python/ql/lib/python.qll
@@ -37,6 +37,7 @@ import semmle.python.pointsto.CallGraph
 import semmle.python.objects.ObjectAPI
 import semmle.python.Unit
 import site
+private import semmle.python.Overlay
 // Removing this import perturbs the compilation process enough that the points-to analysis gets
 // compiled -- and cached -- differently depending on whether the data flow library is imported. By
 // importing it privately here, we ensure that the points-to analysis is compiled the same way.
diff --git a/python/ql/lib/qlpack.yml b/python/ql/lib/qlpack.yml
index 2434ee3f0db..bb28a8f6315 100644
--- a/python/ql/lib/qlpack.yml
+++ b/python/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/python-all
-version: 4.0.13-dev
+version: 4.1.1-dev
 groups: python
 dbscheme: semmlecode.python.dbscheme
 extractor: python
@@ -19,3 +19,4 @@ dataExtensions:
   - semmle/python/frameworks/**/*.model.yml
   - ext/*.model.yml
 warnOnImplicitThis: true
+compileForOverlayEval: true
diff --git a/python/ql/lib/semmle/python/Class.qll b/python/ql/lib/semmle/python/Class.qll
index 52c6c5aa389..58a6504b547 100644
--- a/python/ql/lib/semmle/python/Class.qll
+++ b/python/ql/lib/semmle/python/Class.qll
@@ -91,6 +91,12 @@ class Class extends Class_, Scope, AstNode {
   /** Gets a method defined in this class */
   Function getAMethod() { result.getScope() = this }
 
+  /** Gets the method defined in this class with the specified name, if any. */
+  Function getMethod(string name) {
+    result = this.getAMethod() and
+    result.getName() = name
+  }
+
   override Location getLocation() { py_scope_location(result, this) }
 
   /** Gets the scope (module, class or function) in which this class is defined */
diff --git a/python/ql/lib/semmle/python/Concepts.qll b/python/ql/lib/semmle/python/Concepts.qll
index 16524aaf1db..0ca8a4dbef0 100644
--- a/python/ql/lib/semmle/python/Concepts.qll
+++ b/python/ql/lib/semmle/python/Concepts.qll
@@ -12,6 +12,7 @@ private import semmle.python.dataflow.new.TaintTracking
 private import semmle.python.Files
 private import semmle.python.Frameworks
 private import semmle.python.security.internal.EncryptionKeySizes
+private import semmle.python.dataflow.new.SensitiveDataSources
 private import codeql.threatmodels.ThreatModels
 private import codeql.concepts.ConceptsShared
 
@@ -1290,6 +1291,18 @@ module Http {
        */
       DataFlow::Node getValueArg() { result = super.getValueArg() }
 
+      /** Holds if the name of this cookie indicates it may contain sensitive information. */
+      predicate isSensitive() {
+        exists(DataFlow::Node name |
+          name = [this.getNameArg(), this.getHeaderArg()] and
+          (
+            DataFlow::localFlow(any(SensitiveDataSource src), name)
+            or
+            name = sensitiveLookupStringConst(_)
+          )
+        )
+      }
+
       /**
        * Holds if the `Secure` flag of the cookie is known to have a value of `b`.
        */
diff --git a/python/ql/lib/semmle/python/Exprs.qll b/python/ql/lib/semmle/python/Exprs.qll
index a7f67b0b80e..e5ee2bdb28c 100644
--- a/python/ql/lib/semmle/python/Exprs.qll
+++ b/python/ql/lib/semmle/python/Exprs.qll
@@ -1,6 +1,4 @@
-import python
-private import semmle.python.pointsto.PointsTo
-private import semmle.python.objects.ObjectInternal
+private import python
 private import semmle.python.internal.CachedStages
 
 /** An expression */
@@ -52,67 +50,6 @@ class Expr extends Expr_, AstNode {
   Expr getASubExpression() { none() }
 
   override AstNode getAChildNode() { result = this.getASubExpression() }
-
-  /**
-   * NOTE: `refersTo` will be deprecated in 2019. Use `pointsTo` instead.
-   * Gets what this expression might "refer-to". Performs a combination of localized (intra-procedural) points-to
-   *  analysis and global module-level analysis. This points-to analysis favours precision over recall. It is highly
-   *  precise, but may not provide information for a significant number of flow-nodes.
-   *  If the class is unimportant then use `refersTo(value)` or `refersTo(value, origin)` instead.
-   * NOTE: For complex dataflow, involving multiple stages of points-to analysis, it may be more precise to use
-   * `ControlFlowNode.refersTo(...)` instead.
-   */
-  predicate refersTo(Object obj, ClassObject cls, AstNode origin) {
-    this.refersTo(_, obj, cls, origin)
-  }
-
-  /**
-   * NOTE: `refersTo` will be deprecated in 2019. Use `pointsTo` instead.
-   * Gets what this expression might "refer-to" in the given `context`.
-   */
-  predicate refersTo(Context context, Object obj, ClassObject cls, AstNode origin) {
-    this.getAFlowNode().refersTo(context, obj, cls, origin.getAFlowNode())
-  }
-
-  /**
-   * NOTE: `refersTo` will be deprecated in 2019. Use `pointsTo` instead.
-   * Holds if this expression might "refer-to" to `value` which is from `origin`
-   * Unlike `this.refersTo(value, _, origin)`, this predicate includes results
-   * where the class cannot be inferred.
-   */
-  pragma[nomagic]
-  predicate refersTo(Object obj, AstNode origin) {
-    this.getAFlowNode().refersTo(obj, origin.getAFlowNode())
-  }
-
-  /**
-   * NOTE: `refersTo` will be deprecated in 2019. Use `pointsTo` instead.
-   * Equivalent to `this.refersTo(value, _)`
-   */
-  predicate refersTo(Object obj) { this.refersTo(obj, _) }
-
-  /**
-   * Holds if this expression might "point-to" to `value` which is from `origin`
-   * in the given `context`.
-   */
-  predicate pointsTo(Context context, Value value, AstNode origin) {
-    this.getAFlowNode().pointsTo(context, value, origin.getAFlowNode())
-  }
-
-  /**
-   * Holds if this expression might "point-to" to `value` which is from `origin`.
-   */
-  predicate pointsTo(Value value, AstNode origin) {
-    this.getAFlowNode().pointsTo(value, origin.getAFlowNode())
-  }
-
-  /**
-   * Holds if this expression might "point-to" to `value`.
-   */
-  predicate pointsTo(Value value) { this.pointsTo(value, _) }
-
-  /** Gets a value that this expression might "point-to". */
-  Value pointsTo() { this.pointsTo(result) }
 }
 
 /** An assignment expression, such as `x := y` */
@@ -332,8 +269,6 @@ abstract class ImmutableLiteral extends Expr {
   abstract Object getLiteralObject();
 
   abstract boolean booleanValue();
-
-  final Value getLiteralValue() { result.(ConstantObjectInternal).getLiteral() = this }
 }
 
 /** A numerical constant expression, such as `7` or `4.2` */
diff --git a/python/ql/lib/semmle/python/Flow.qll b/python/ql/lib/semmle/python/Flow.qll
index 90633651f11..496c1abc52a 100644
--- a/python/ql/lib/semmle/python/Flow.qll
+++ b/python/ql/lib/semmle/python/Flow.qll
@@ -1,6 +1,6 @@
 import python
-private import semmle.python.pointsto.PointsTo
 private import semmle.python.internal.CachedStages
+private import codeql.controlflow.BasicBlock as BB
 
 /*
  * Note about matching parent and child nodes and CFG splitting:
@@ -143,56 +143,6 @@ class ControlFlowNode extends @py_flow_node {
   /** Whether this flow node is the first in its scope */
   predicate isEntryNode() { py_scope_flow(this, _, -1) }
 
-  /** Gets the value that this ControlFlowNode points-to. */
-  predicate pointsTo(Value value) { this.pointsTo(_, value, _) }
-
-  /** Gets the value that this ControlFlowNode points-to. */
-  Value pointsTo() { this.pointsTo(_, result, _) }
-
-  /** Gets a value that this ControlFlowNode may points-to. */
-  Value inferredValue() { this.pointsTo(_, result, _) }
-
-  /** Gets the value and origin that this ControlFlowNode points-to. */
-  predicate pointsTo(Value value, ControlFlowNode origin) { this.pointsTo(_, value, origin) }
-
-  /** Gets the value and origin that this ControlFlowNode points-to, given the context. */
-  predicate pointsTo(Context context, Value value, ControlFlowNode origin) {
-    PointsTo::pointsTo(this, context, value, origin)
-  }
-
-  /**
-   * Gets what this flow node might "refer-to". Performs a combination of localized (intra-procedural) points-to
-   * analysis and global module-level analysis. This points-to analysis favours precision over recall. It is highly
-   * precise, but may not provide information for a significant number of flow-nodes.
-   * If the class is unimportant then use `refersTo(value)` or `refersTo(value, origin)` instead.
-   */
-  pragma[nomagic]
-  predicate refersTo(Object obj, ClassObject cls, ControlFlowNode origin) {
-    this.refersTo(_, obj, cls, origin)
-  }
-
-  /** Gets what this expression might "refer-to" in the given `context`. */
-  pragma[nomagic]
-  predicate refersTo(Context context, Object obj, ClassObject cls, ControlFlowNode origin) {
-    not obj = unknownValue() and
-    not cls = theUnknownType() and
-    PointsTo::points_to(this, context, obj, cls, origin)
-  }
-
-  /**
-   * Whether this flow node might "refer-to" to `value` which is from `origin`
-   * Unlike `this.refersTo(value, _, origin)` this predicate includes results
-   * where the class cannot be inferred.
-   */
-  pragma[nomagic]
-  predicate refersTo(Object obj, ControlFlowNode origin) {
-    not obj = unknownValue() and
-    PointsTo::points_to(this, _, obj, _, origin)
-  }
-
-  /** Equivalent to `this.refersTo(value, _)` */
-  predicate refersTo(Object obj) { this.refersTo(obj, _) }
-
   /** Gets the basic block containing this flow node */
   BasicBlock getBasicBlock() { result.contains(this) }
 
@@ -258,23 +208,6 @@ class ControlFlowNode extends @py_flow_node {
     )
   }
 
-  /**
-   * Check whether this control-flow node has complete points-to information.
-   * This would mean that the analysis managed to infer an over approximation
-   * of possible values at runtime.
-   */
-  predicate hasCompletePointsToSet() {
-    // If the tracking failed, then `this` will be its own "origin". In that
-    // case, we want to exclude nodes for which there is also a different
-    // origin, as that would indicate that some paths failed and some did not.
-    this.refersTo(_, _, this) and
-    not exists(ControlFlowNode other | other != this and this.refersTo(_, _, other))
-    or
-    // If `this` is a use of a variable, then we must have complete points-to
-    // for that variable.
-    exists(SsaVariable v | v.getAUse() = this | varHasCompletePointsToSet(v))
-  }
-
   /** Whether this strictly dominates other. */
   pragma[inline]
   predicate strictlyDominates(ControlFlowNode other) {
@@ -331,28 +264,6 @@ private class AnyNode extends ControlFlowNode {
   override AstNode getNode() { result = super.getNode() }
 }
 
-/**
- * Check whether a SSA variable has complete points-to information.
- * This would mean that the analysis managed to infer an overapproximation
- * of possible values at runtime.
- */
-private predicate varHasCompletePointsToSet(SsaVariable var) {
-  // Global variables may be modified non-locally or concurrently.
-  not var.getVariable() instanceof GlobalVariable and
-  (
-    // If we have complete points-to information on the definition of
-    // this variable, then the variable has complete information.
-    var.getDefinition().(DefinitionNode).getValue().hasCompletePointsToSet()
-    or
-    // If this variable is a phi output, then we have complete
-    // points-to information about it if all phi inputs had complete
-    // information.
-    forex(SsaVariable phiInput | phiInput = var.getAPhiInput() |
-      varHasCompletePointsToSet(phiInput)
-    )
-  )
-}
-
 /** A control flow node corresponding to a call expression, such as `func(...)` */
 class CallNode extends ControlFlowNode {
   CallNode() { toAst(this) instanceof Call }
@@ -1082,9 +993,15 @@ class BasicBlock extends @py_flow_node {
    * Dominance frontier of a node x is the set of all nodes `other` such that `this` dominates a predecessor
    * of `other` but does not strictly dominate `other`
    */
-  pragma[noinline]
-  predicate dominanceFrontier(BasicBlock other) {
-    this.dominates(other.getAPredecessor()) and not this.strictlyDominates(other)
+  predicate dominanceFrontier(BasicBlock other) { this.inDominanceFrontier(other) }
+
+  predicate inDominanceFrontier(BasicBlock df) {
+    this = df.getAPredecessor() and not this = df.getImmediateDominator()
+    or
+    exists(BasicBlock prev | prev.inDominanceFrontier(df) |
+      this = prev.getImmediateDominator() and
+      not this = df.getImmediateDominator()
+    )
   }
 
   private ControlFlowNode firstNode() { result = this }
@@ -1246,3 +1163,73 @@ private predicate end_bb_likely_reachable(BasicBlock b) {
     not p = b.getLastNode()
   )
 }
+
+private class ControlFlowNodeAlias = ControlFlowNode;
+
+final private class FinalBasicBlock = BasicBlock;
+
+module Cfg implements BB::CfgSig<Location> {
+  private import codeql.controlflow.SuccessorType
+
+  class ControlFlowNode = ControlFlowNodeAlias;
+
+  class BasicBlock extends FinalBasicBlock {
+    // Note `PY:BasicBlock` does not have a `getLocation`.
+    // (Instead it has a complicated location info logic.)
+    // Using the location of the first node is simple
+    // and we just need a way to identify the basic block
+    // during debugging, so this will be serviceable.
+    Location getLocation() { result = super.getNode(0).getLocation() }
+
+    int length() { result = count(int i | exists(this.getNode(i))) }
+
+    BasicBlock getASuccessor() { result = super.getASuccessor() }
+
+    private BasicBlock getANonDirectSuccessor(SuccessorType t) {
+      result = this.getATrueSuccessor() and
+      t.(BooleanSuccessor).getValue() = true
+      or
+      result = this.getAFalseSuccessor() and
+      t.(BooleanSuccessor).getValue() = false
+      or
+      result = this.getAnExceptionalSuccessor() and
+      t instanceof ExceptionSuccessor
+    }
+
+    BasicBlock getASuccessor(SuccessorType t) {
+      result = this.getANonDirectSuccessor(t)
+      or
+      result = super.getASuccessor() and
+      t instanceof DirectSuccessor and
+      not result = this.getANonDirectSuccessor(_)
+    }
+
+    predicate strictlyDominates(BasicBlock bb) { super.strictlyDominates(bb) }
+
+    predicate dominates(BasicBlock bb) { super.dominates(bb) }
+
+    predicate inDominanceFrontier(BasicBlock df) { super.inDominanceFrontier(df) }
+
+    BasicBlock getImmediateDominator() { result = super.getImmediateDominator() }
+
+    /** Unsupported. Do not use. */
+    predicate strictlyPostDominates(BasicBlock bb) { none() }
+
+    /** Unsupported. Do not use. */
+    predicate postDominates(BasicBlock bb) {
+      this.strictlyPostDominates(bb) or
+      this = bb
+    }
+  }
+
+  class EntryBasicBlock extends BasicBlock {
+    EntryBasicBlock() { this.getNode(0).isEntryNode() }
+  }
+
+  pragma[nomagic]
+  predicate dominatingEdge(BasicBlock bb1, BasicBlock bb2) {
+    bb1.getASuccessor() = bb2 and
+    bb1 = bb2.getImmediateDominator() and
+    forall(BasicBlock pred | pred = bb2.getAPredecessor() and pred != bb1 | bb2.dominates(pred))
+  }
+}
diff --git a/python/ql/lib/semmle/python/Metrics.qll b/python/ql/lib/semmle/python/Metrics.qll
index e5130ba000f..dcc5cf959d9 100644
--- a/python/ql/lib/semmle/python/Metrics.qll
+++ b/python/ql/lib/semmle/python/Metrics.qll
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 /** The metrics for a function */
 class FunctionMetrics extends Function {
@@ -59,7 +60,7 @@ class FunctionMetrics extends Function {
     not non_coupling_method(result) and
     exists(Call call | call.getScope() = this |
       exists(FunctionObject callee | callee.getFunction() = result |
-        call.getAFlowNode().getFunction().refersTo(callee)
+        call.getAFlowNode().getFunction().(ControlFlowNodeWithPointsTo).refersTo(callee)
       )
       or
       exists(Attribute a | call.getFunc() = a |
@@ -123,7 +124,7 @@ class ClassMetrics extends Class {
       )
       or
       exists(Function f, Call c, ClassObject cls | c.getScope() = f and f.getScope() = this |
-        c.getFunc().refersTo(cls) and
+        c.getFunc().(ExprWithPointsTo).refersTo(cls) and
         cls.getPyClass() = other
       )
     )
@@ -292,7 +293,7 @@ class ModuleMetrics extends Module {
       )
       or
       exists(Function f, Call c, ClassObject cls | c.getScope() = f and f.getScope() = this |
-        c.getFunc().refersTo(cls) and
+        c.getFunc().(ExprWithPointsTo).refersTo(cls) and
         cls.getPyClass().getEnclosingModule() = other
       )
     )
diff --git a/python/ql/lib/semmle/python/Module.qll b/python/ql/lib/semmle/python/Module.qll
index 307433fe95b..666217874b7 100644
--- a/python/ql/lib/semmle/python/Module.qll
+++ b/python/ql/lib/semmle/python/Module.qll
@@ -1,5 +1,4 @@
 import python
-private import semmle.python.objects.Modules
 private import semmle.python.internal.CachedStages
 
 /**
@@ -66,15 +65,6 @@ class Module extends Module_, Scope, AstNode {
   /** Whether this module is a package initializer */
   predicate isPackageInit() { this.getName().matches("%\\_\\_init\\_\\_") and not this.isPackage() }
 
-  /** Gets a name exported by this module, that is the names that will be added to a namespace by 'from this-module import *' */
-  string getAnExport() {
-    py_exports(this, result)
-    or
-    exists(ModuleObjectInternal mod | mod.getSource() = this.getEntryNode() |
-      mod.(ModuleValue).exports(result)
-    )
-  }
-
   /** Gets the source file for this module */
   File getFile() { py_module_path(this, result) }
 
diff --git a/python/ql/lib/semmle/python/Overlay.qll b/python/ql/lib/semmle/python/Overlay.qll
new file mode 100644
index 00000000000..fa782801457
--- /dev/null
+++ b/python/ql/lib/semmle/python/Overlay.qll
@@ -0,0 +1,355 @@
+/**
+ * Defines entity discard predicates for Python overlay analysis.
+ */
+
+/*- Predicates -*/
+/**
+ * Holds always for the overlay variant and never for the base variant.
+ * This local predicate is used to define local predicates that behave
+ * differently for the base and overlay variant.
+ */
+overlay[local]
+predicate isOverlay() { databaseMetadata("isOverlay", "true") }
+
+overlay[local]
+private string getPathForLocation(@location loc) {
+  exists(@file file | locations_default(loc, file, _, _, _, _) | files(file, result))
+  or
+  exists(@py_Module mod | locations_ast(loc, mod, _, _, _, _) | result = getPathForModule(mod))
+}
+
+overlay[local]
+private string getPathForModule(@py_Module mod) {
+  exists(@container fileOrFolder | py_module_path(mod, fileOrFolder) |
+    result = getPathForContainer(fileOrFolder)
+  )
+}
+
+overlay[local]
+private string getPathForContainer(@container fileOrFolder) {
+  files(fileOrFolder, result) or folders(fileOrFolder, result)
+}
+
+/*- Discardable entities and their discard predicates -*/
+/** Python database entities that use named TRAP IDs; the rest use *-ids. */
+overlay[local]
+private class NamedEntity = @py_Module or @container or @py_cobject;
+
+overlay[discard_entity]
+private predicate discardNamedEntity(@top el) {
+  el instanceof NamedEntity and
+  // Entities with named IDs can exist both in base, overlay, or both.
+  exists(Discardable d | d = el |
+    overlayChangedFiles(d.getPath()) and
+    not d.existsInOverlay()
+  )
+}
+
+overlay[discard_entity]
+private predicate discardStarEntity(@top el) {
+  not el instanceof NamedEntity and
+  // Entities with *-ids can exist either in base or overlay, but not both.
+  exists(Discardable d | d = el |
+    overlayChangedFiles(d.getPath()) and
+    d.existsInBase()
+  )
+}
+
+/**
+ * An abstract base class for all elements that can be discarded from the base.
+ */
+overlay[local]
+abstract class Discardable extends @top {
+  /** Gets the path to the file in which this element occurs. */
+  abstract string getPath();
+
+  /** Holds if this element exists in the base variant. */
+  predicate existsInBase() { not isOverlay() and exists(this) }
+
+  /** Holds if this element exists in the overlay variant. */
+  predicate existsInOverlay() { isOverlay() and exists(this) }
+
+  /** Gets a textual representation of this discardable element. */
+  string toString() { none() }
+}
+
+/**
+ * Discardable locatable AST nodes (`@py_location_parent`).
+ */
+overlay[local]
+final private class DiscardableLocatable extends Discardable instanceof @py_location_parent {
+  override string getPath() {
+    exists(@location loc | py_locations(loc, this) | result = getPathForLocation(loc))
+  }
+}
+
+/**
+ * Discardable scopes (classes, functions, modules).
+ */
+overlay[local]
+final private class DiscardableScope extends Discardable instanceof @py_scope {
+  override string getPath() {
+    exists(@location loc | py_scope_location(loc, this) | result = getPathForLocation(loc))
+    or
+    result = getPathForModule(this)
+  }
+}
+
+/**
+ * Discardable files and folders.
+ */
+overlay[local]
+final private class DiscardableContainer extends Discardable instanceof @container {
+  override string getPath() { result = getPathForContainer(this) }
+}
+
+/** Discardable control flow nodes */
+overlay[local]
+final private class DiscardableCfgNode extends Discardable instanceof @py_flow_node {
+  override string getPath() {
+    exists(Discardable d | result = d.getPath() | py_flow_bb_node(this, d.(@py_ast_node), _, _))
+  }
+}
+
+/** Discardable Python variables. */
+overlay[local]
+final private class DiscardableVar extends Discardable instanceof @py_variable {
+  override string getPath() {
+    exists(Discardable parent | result = parent.getPath() | variable(this, parent.(@py_scope), _))
+  }
+}
+
+/** Discardable SSA variables. */
+overlay[local]
+final private class DiscardableSsaVar extends Discardable instanceof @py_ssa_var {
+  override string getPath() {
+    exists(DiscardableVar other | result = other.getPath() | py_ssa_var(this, other))
+  }
+}
+
+/** Discardable locations. */
+overlay[local]
+final private class DiscardableLocation extends Discardable instanceof @location {
+  override string getPath() { result = getPathForLocation(this) }
+}
+
+/** Discardable lines. */
+overlay[local]
+final private class DiscardableLine extends Discardable instanceof @py_line {
+  override string getPath() {
+    exists(Discardable d | result = d.getPath() | py_line_lengths(this, d.(@py_Module), _, _))
+  }
+}
+
+/** Discardable string part lists. */
+overlay[local]
+final private class DiscardableStringPartList extends Discardable instanceof @py_StringPart_list {
+  override string getPath() {
+    exists(Discardable d | result = d.getPath() | py_StringPart_lists(this, d.(@py_Bytes_or_Str)))
+  }
+}
+
+/** Discardable alias */
+overlay[local]
+final private class DiscardableAlias extends Discardable instanceof @py_alias {
+  override string getPath() {
+    exists(DiscardableAliasList d | result = d.getPath() | py_aliases(this, d, _))
+  }
+}
+
+/** Discardable alias list */
+overlay[local]
+final private class DiscardableAliasList extends Discardable instanceof @py_alias_list {
+  override string getPath() {
+    exists(Discardable d | result = d.getPath() | py_alias_lists(this, d.(@py_Import)))
+  }
+}
+
+/** Discardable arguments */
+overlay[local]
+final private class DiscardableArguments extends Discardable instanceof @py_arguments {
+  override string getPath() {
+    exists(Discardable d | result = d.getPath() | py_arguments(this, d.(@py_arguments_parent)))
+  }
+}
+
+/** Discardable boolop */
+overlay[local]
+final private class DiscardableBoolOp extends Discardable instanceof @py_boolop {
+  override string getPath() {
+    exists(Discardable d | result = d.getPath() | py_boolops(this, _, d.(@py_BoolExpr)))
+  }
+}
+
+/** Discardable cmpop */
+overlay[local]
+final private class DiscardableCmpOp extends Discardable instanceof @py_cmpop {
+  override string getPath() {
+    exists(DiscardableCmpOpList d | result = d.getPath() | py_cmpops(this, _, d, _))
+  }
+}
+
+/** Discardable cmpop list */
+overlay[local]
+final private class DiscardableCmpOpList extends Discardable instanceof @py_cmpop_list {
+  override string getPath() {
+    exists(Discardable d | result = d.getPath() | py_cmpop_lists(this, d.(@py_Compare)))
+  }
+}
+
+/** Discardable comprehension list */
+overlay[local]
+final private class DiscardableComprehensionList extends Discardable instanceof @py_comprehension_list
+{
+  override string getPath() {
+    exists(Discardable d | result = d.getPath() | py_comprehension_lists(this, d.(@py_ListComp)))
+  }
+}
+
+/** Discardable dict item list */
+overlay[local]
+final private class DiscardableDictItemList extends Discardable instanceof @py_dict_item_list {
+  override string getPath() {
+    exists(Discardable d | result = d.getPath() |
+      py_dict_item_lists(this, d.(@py_dict_item_list_parent))
+    )
+  }
+}
+
+/** Discardable expr context */
+overlay[local]
+final private class DiscardableExprContext extends Discardable instanceof @py_expr_context {
+  override string getPath() {
+    exists(Discardable d | result = d.getPath() |
+      py_expr_contexts(this, _, d.(@py_expr_context_parent))
+    )
+  }
+}
+
+/** Discardable expr list */
+overlay[local]
+final private class DiscardableExprList extends Discardable instanceof @py_expr_list {
+  override string getPath() {
+    exists(Discardable d | result = d.getPath() | py_expr_lists(this, d.(@py_expr_list_parent), _))
+  }
+}
+
+/** Discardable operator */
+overlay[local]
+final private class DiscardableOperator extends Discardable instanceof @py_operator {
+  override string getPath() {
+    exists(Discardable d | result = d.getPath() | py_operators(this, _, d.(@py_BinaryExpr)))
+  }
+}
+
+/** Discardable parameter list */
+overlay[local]
+final private class DiscardableParameterList extends Discardable instanceof @py_parameter_list {
+  override string getPath() {
+    exists(Discardable d | result = d.getPath() | py_parameter_lists(this, d.(@py_Function)))
+  }
+}
+
+/** Discardable pattern list */
+overlay[local]
+final private class DiscardablePatternList extends Discardable instanceof @py_pattern_list {
+  override string getPath() {
+    exists(Discardable d | result = d.getPath() |
+      py_pattern_lists(this, d.(@py_pattern_list_parent), _)
+    )
+  }
+}
+
+/** Discardable stmt list */
+overlay[local]
+final private class DiscardableStmtList extends Discardable instanceof @py_stmt_list {
+  override string getPath() {
+    exists(Discardable d | result = d.getPath() | py_stmt_lists(this, d.(@py_stmt_list_parent), _))
+  }
+}
+
+/** Discardable str list */
+overlay[local]
+final private class DiscardableStrList extends Discardable instanceof @py_str_list {
+  override string getPath() {
+    exists(Discardable d | result = d.getPath() | py_str_lists(this, d.(@py_str_list_parent)))
+  }
+}
+
+/** Discardable type parameter list */
+overlay[local]
+final private class DiscardableTypeParameterList extends Discardable instanceof @py_type_parameter_list
+{
+  override string getPath() {
+    exists(Discardable d | result = d.getPath() |
+      py_type_parameter_lists(this, d.(@py_type_parameter_list_parent))
+    )
+  }
+}
+
+/** Discardable unaryop */
+overlay[local]
+final private class DiscardableUnaryOp extends Discardable instanceof @py_unaryop {
+  override string getPath() {
+    exists(Discardable d | result = d.getPath() | py_unaryops(this, _, d.(@py_UnaryExpr)))
+  }
+}
+
+/** Discardable comment */
+overlay[local]
+final private class DiscardableComment extends Discardable instanceof @py_comment {
+  override string getPath() {
+    exists(DiscardableLocation d | result = d.getPath() | py_comments(this, _, d))
+  }
+}
+
+/*- XML -*/
+overlay[local]
+final private class DiscardableXmlLocatable extends Discardable instanceof @xmllocatable {
+  override string getPath() {
+    exists(@location loc | xmllocations(this, loc) | result = getPathForLocation(loc))
+  }
+}
+
+overlay[local]
+private predicate overlayXmlExtracted(string path) {
+  exists(DiscardableXmlLocatable d | not files(d, _) and not xmlNs(d, _, _, _) |
+    d.existsInOverlay() and
+    path = d.getPath()
+  )
+}
+
+overlay[discard_entity]
+private predicate discardXmlLocatable(@xmllocatable el) {
+  exists(DiscardableXmlLocatable d | d = el |
+    // The XML extractor is currently not incremental and may extract more
+    // XML files than those included in `overlayChangedFiles`, so this discard predicate
+    // handles those files alongside the normal `discardStarEntity` logic.
+    overlayXmlExtracted(d.getPath()) and
+    d.existsInBase()
+  )
+}
+
+/*- YAML -*/
+overlay[local]
+final private class DiscardableYamlLocatable extends Discardable instanceof @yaml_locatable {
+  override string getPath() {
+    exists(@location loc | yaml_locations(this, loc) | result = getPathForLocation(loc))
+  }
+}
+
+overlay[local]
+private predicate overlayYamlExtracted(string path) {
+  exists(DiscardableYamlLocatable l | l.existsInOverlay() | path = l.getPath())
+}
+
+overlay[discard_entity]
+private predicate discardBaseYamlLocatable(@yaml_locatable el) {
+  exists(DiscardableYamlLocatable d | d = el |
+    // The Yaml extractor is currently not incremental and may extract more
+    // Yaml files than those included in `overlayChangedFiles`, so this discard predicate
+    // handles those files alongside the normal `discardStarEntity` logic.
+    overlayYamlExtracted(d.getPath()) and
+    d.existsInBase()
+  )
+}
diff --git a/python/ql/lib/semmle/python/PrintAst.qll b/python/ql/lib/semmle/python/PrintAst.qll
index d2aec338a58..4fa75acd71e 100644
--- a/python/ql/lib/semmle/python/PrintAst.qll
+++ b/python/ql/lib/semmle/python/PrintAst.qll
@@ -26,12 +26,22 @@ class PrintAstConfiguration extends TPrintAstConfiguration {
    * By default it checks whether the `AstNode` `e` belongs to `Location` `l`.
    */
   predicate shouldPrint(AstNode e, Location l) { l = e.getLocation() }
+
+  /**
+   * Controls whether the `YamlNode` should be considered for AST printing.
+   * By default it checks whether the `YamlNode` `y` belongs to `Location` `l`.
+   */
+  predicate shouldPrintYaml(YamlNode y, Location l) { l = y.getLocation() }
 }
 
 private predicate shouldPrint(AstNode e, Location l) {
   exists(PrintAstConfiguration config | config.shouldPrint(e, l))
 }
 
+private predicate shouldPrintYaml(YamlNode y, Location l) {
+  exists(PrintAstConfiguration config | config.shouldPrintYaml(y, l))
+}
+
 /** Holds if the given element does not need to be rendered in the AST. */
 private predicate isNotNeeded(AstNode el) {
   el.isArtificial()
@@ -55,8 +65,11 @@ private newtype TPrintAstNode =
     not list = any(Module mod).getBody() and
     not forall(AstNode child | child = list.getAnItem() | isNotNeeded(child))
   } or
-  TYamlNode(YamlNode node) or
-  TYamlMappingNode(YamlMapping mapping, int i) { exists(mapping.getKeyNode(i)) }
+  TYamlNode(YamlNode node) { shouldPrintYaml(node, _) } or
+  TYamlMappingNode(YamlMapping mapping, int i) {
+    shouldPrintYaml(mapping, _) and
+    exists(mapping.getKeyNode(i))
+  }
 
 /**
  * A node in the output tree.
diff --git a/python/ql/lib/semmle/python/SpecialMethods.qll b/python/ql/lib/semmle/python/SpecialMethods.qll
index a5832ae45ae..ea9e753d0f8 100644
--- a/python/ql/lib/semmle/python/SpecialMethods.qll
+++ b/python/ql/lib/semmle/python/SpecialMethods.qll
@@ -9,6 +9,7 @@
  */
 
 private import python
+private import LegacyPointsTo
 
 /** A control flow node which might correspond to a special method call. */
 class PotentialSpecialMethodCallNode extends ControlFlowNode instanceof SpecialMethod::Potential { }
@@ -106,7 +107,11 @@ class SpecialMethodCallNode extends PotentialSpecialMethodCallNode {
   SpecialMethodCallNode() {
     exists(SpecialMethod::Potential pot |
       this = pot and
-      pot.getSelf().pointsTo().getClass().lookup(pot.getSpecialMethodName()) = resolvedSpecialMethod
+      pot.getSelf()
+          .(ControlFlowNodeWithPointsTo)
+          .pointsTo()
+          .getClass()
+          .lookup(pot.getSpecialMethodName()) = resolvedSpecialMethod
     )
   }
 
diff --git a/python/ql/lib/semmle/python/dataflow/new/SensitiveDataSources.qll b/python/ql/lib/semmle/python/dataflow/new/SensitiveDataSources.qll
index 0e017c4a229..1a32965d08d 100644
--- a/python/ql/lib/semmle/python/dataflow/new/SensitiveDataSources.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/SensitiveDataSources.qll
@@ -334,3 +334,5 @@ private module SensitiveDataModeling {
 }
 
 predicate sensitiveDataExtraStepForCalls = SensitiveDataModeling::extraStepForCalls/2;
+
+predicate sensitiveLookupStringConst = SensitiveDataModeling::sensitiveLookupStringConst/1;
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/Attributes.qll b/python/ql/lib/semmle/python/dataflow/new/internal/Attributes.qll
index 51dccc29312..42c0c862e89 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/Attributes.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/Attributes.qll
@@ -64,6 +64,15 @@ abstract class AttrRef extends Node {
 abstract class AttrWrite extends AttrRef {
   /** Gets the data flow node corresponding to the value that is written to the attribute. */
   abstract Node getValue();
+
+  /**
+   * Holds if this attribute write writes the attribute named `attrName` on object `object` with
+   * value `value`.
+   */
+  predicate writes(Node object, string attrName, Node value) {
+    this.accesses(object, attrName) and
+    this.getValue() = value
+  }
 }
 
 /**
@@ -225,7 +234,10 @@ private class ClassDefinitionAsAttrWrite extends AttrWrite, CfgNode {
  * - Dynamic attribute reads using `getattr`: `getattr(object, attr)`
  * - Qualified imports: `from module import attr as name`
  */
-abstract class AttrRead extends AttrRef, Node, LocalSourceNode { }
+abstract class AttrRead extends AttrRef, Node, LocalSourceNode {
+  /** Holds if this attribute read reads the attribute named `attrName` on the object `object`. */
+  predicate reads(Node object, string attrName) { this.accesses(object, attrName) }
+}
 
 /** A simple attribute read, e.g. `object.attr` */
 private class AttributeReadAsAttrRead extends AttrRead, CfgNode {
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll
index 781023a9658..c717cd7bc97 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll
@@ -856,9 +856,14 @@ Class getNextClassInMroKnownStartingClass(Class cls, Class startingClass) {
   )
 }
 
-private Function findFunctionAccordingToMroKnownStartingClass(
-  Class cls, Class startingClass, string name
-) {
+/**
+ * Gets a potential definition of the function `name` of the class `cls` according to our approximation of
+ * MRO for the class `startingCls` (see `getNextClassInMroKnownStartingClass` for more information).
+ *
+ * Note: this is almost the same as `findFunctionAccordingToMro`, except we know the
+ * `startingClass`, which can give slightly more precise results.
+ */
+Function findFunctionAccordingToMroKnownStartingClass(Class cls, Class startingClass, string name) {
   result = cls.getAMethod() and
   result.getName() = name and
   cls = getADirectSuperclass*(startingClass)
@@ -871,7 +876,7 @@ private Function findFunctionAccordingToMroKnownStartingClass(
 
 /**
  * Gets a potential definition of the function `name` according to our approximation of
- * MRO for the class `cls` (see `getNextClassInMroKnownStartingClass` for more information).
+ * MRO for the class `startingCls` (see `getNextClassInMroKnownStartingClass` for more information).
  *
  * Note: this is almost the same as `findFunctionAccordingToMro`, except we know the
  * `startingClass`, which can give slightly more precise results.
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
index b29be706c4f..2322539995b 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
@@ -556,6 +556,75 @@ predicate runtimeJumpStep(Node nodeFrom, Node nodeTo) {
     nodeFrom.asCfgNode() = param.getDefault() and
     nodeTo.asCfgNode() = param.getDefiningNode()
   )
+  or
+  // Enhanced global variable field access tracking
+  globalVariableNestedFieldJumpStep(nodeFrom, nodeTo)
+}
+
+/** Helper predicate for `globalVariableNestedFieldJumpStep`. */
+pragma[nomagic]
+private predicate globalVariableAttrPathRead(
+  ModuleVariableNode globalVar, string accessPath, AttrRead r, string attrName
+) {
+  globalVariableAttrPathAtDepth(globalVar, accessPath, r.getObject(), _) and
+  attrName = r.getAttributeName()
+}
+
+/** Helper predicate for `globalVariableNestedFieldJumpStep`. */
+pragma[nomagic]
+private predicate globalVariableAttrPathWrite(
+  ModuleVariableNode globalVar, string accessPath, AttrWrite w, string attrName
+) {
+  globalVariableAttrPathAtDepth(globalVar, accessPath, w.getObject(), _) and
+  attrName = w.getAttributeName()
+}
+
+/**
+ * Holds if there is a jump step from `nodeFrom` to `nodeTo` through global variable field access.
+ * This supports tracking nested object field access through global variables like `app.obj.foo`.
+ */
+pragma[nomagic]
+private predicate globalVariableNestedFieldJumpStep(Node nodeFrom, Node nodeTo) {
+  exists(ModuleVariableNode globalVar, AttrWrite write, AttrRead read |
+    // Match writes and reads on the same global variable attribute path
+    exists(string accessPath, string attrName |
+      globalVariableAttrPathRead(globalVar, accessPath, read, attrName) and
+      globalVariableAttrPathWrite(globalVar, accessPath, write, attrName)
+    ) and
+    nodeFrom = write.getValue() and
+    nodeTo = read
+  )
+}
+
+/**
+ * Maximum depth for global variable nested attribute access.
+ * Depth 1 = globalVar.foo, depth 2 = globalVar.foo.bar, depth 3 = globalVar.foo.bar.baz, etc.
+ */
+private int getMaxGlobalVariableDepth() { result = 2 }
+
+/**
+ * Holds if `node` is an attribute access path starting from global variable `globalVar` at specific `depth`.
+ */
+private predicate globalVariableAttrPathAtDepth(
+  ModuleVariableNode globalVar, string accessPath, Node node, int depth
+) {
+  // Base case: Direct global variable access (depth 0)
+  depth = 0 and
+  // We use `globalVar` instead of `globalVar.getAWrite()` due to some weirdness with how
+  // attribute writes are handled in the global scope (see `GlobalAttributeAssignmentAsAttrWrite`).
+  node in [globalVar.getARead(), globalVar] and
+  accessPath = ""
+  or
+  exists(Node obj, string attrName, string parentAccessPath, int parentDepth |
+    node.(AttrRead).reads(obj, attrName)
+    or
+    any(AttrWrite aw).writes(obj, attrName, node)
+  |
+    globalVariableAttrPathAtDepth(globalVar, parentAccessPath, obj, parentDepth) and
+    accessPath = parentAccessPath + "." + attrName and
+    depth = parentDepth + 1 and
+    depth <= getMaxGlobalVariableDepth()
+  )
 }
 
 //--------
@@ -613,7 +682,7 @@ DataFlowType getNodeType(Node node) {
 // Extra flow
 //--------
 /**
- * Holds if `pred` can flow to `succ`, by jumping from one callable to
+ * Holds if `nodeFrom` can flow to `nodeTo`, by jumping from one callable to
  * another. Additional steps specified by the configuration are *not*
  * taken into account.
  */
@@ -634,7 +703,7 @@ predicate jumpStep(Node nodeFrom, Node nodeTo) {
  * the type-trackers as well, as that would make evaluation of type-tracking recursive
  * with the new jumpsteps.
  *
- * Holds if `pred` can flow to `succ`, by jumping from one callable to
+ * Holds if `nodeFrom` can flow to `nodeTo`, by jumping from one callable to
  * another. Additional steps specified by the configuration are *not*
  * taken into account.
  */
@@ -657,7 +726,7 @@ predicate jumpStepSharedWithTypeTracker(Node nodeFrom, Node nodeTo) {
  * the type-trackers as well, as that would make evaluation of type-tracking recursive
  * with the new jumpsteps.
  *
- * Holds if `pred` can flow to `succ`, by jumping from one callable to
+ * Holds if `nodeFrom` can flow to `nodeTo`, by jumping from one callable to
  * another. Additional steps specified by the configuration are *not*
  * taken into account.
  */
@@ -766,7 +835,7 @@ module Orm {
     abstract predicate storeStep(Node nodeFrom, Content c, Node nodeTo);
 
     /**
-     * Holds if `pred` can flow to `succ`, by jumping from one callable to
+     * Holds if `nodeFrom` can flow to `nodeTo`, by jumping from one callable to
      * another. Additional steps specified by the configuration are *not*
      * taken into account.
      */
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/FlowSummaryImpl.qll b/python/ql/lib/semmle/python/dataflow/new/internal/FlowSummaryImpl.qll
index f7fdf84549e..396154c06ee 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/FlowSummaryImpl.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/FlowSummaryImpl.qll
@@ -105,7 +105,9 @@ private module StepsInput implements Impl::Private::StepsInputSig {
         ])
   }
 
-  Node getSourceNode(Input::SourceBase source, Impl::Private::SummaryComponent sc) { none() }
+  DataFlowCallable getSourceNodeEnclosingCallable(Input::SourceBase source) { none() }
+
+  Node getSourceNode(Input::SourceBase source, Impl::Private::SummaryComponentStack s) { none() }
 
   Node getSinkNode(Input::SinkBase sink, Impl::Private::SummaryComponent sc) { none() }
 }
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/VariableCapture.qll b/python/ql/lib/semmle/python/dataflow/new/internal/VariableCapture.qll
index 6cb80881e2a..a7b3b9ceaeb 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/VariableCapture.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/VariableCapture.qll
@@ -12,7 +12,7 @@ private import codeql.dataflow.VariableCapture as Shared
 // The first is the main implementation, the second is a performance motivated restriction.
 // The restriction is to clear any `CapturedVariableContent` before writing a new one
 // to avoid long access paths (see the link for a nice explanation).
-private module CaptureInput implements Shared::InputSig<Location> {
+private module CaptureInput implements Shared::InputSig<Location, Cfg::BasicBlock> {
   private import python as PY
 
   additional class ExprCfgNode extends ControlFlowNode {
@@ -23,24 +23,7 @@ private module CaptureInput implements Shared::InputSig<Location> {
     predicate isConstructor() { none() }
   }
 
-  class BasicBlock extends PY::BasicBlock {
-    int length() { result = count(int i | exists(this.getNode(i))) }
-
-    Callable getEnclosingCallable() { result = this.getScope() }
-
-    // Note `PY:BasicBlock` does not have a `getLocation`.
-    // (Instead it has a complicated location info logic.)
-    // Using the location of the first node is simple
-    // and we just need a way to identify the basic block
-    // during debugging, so this will be serviceable.
-    Location getLocation() { result = super.getNode(0).getLocation() }
-  }
-
-  class ControlFlowNode = PY::ControlFlowNode;
-
-  BasicBlock getImmediateBasicBlockDominator(BasicBlock bb) { result = bb.getImmediateDominator() }
-
-  BasicBlock getABasicBlockSuccessor(BasicBlock bb) { result = bb.getASuccessor() }
+  Callable basicBlockGetEnclosingCallable(Cfg::BasicBlock bb) { result = bb.getScope() }
 
   class CapturedVariable extends LocalVariable {
     Function f;
@@ -70,7 +53,7 @@ private module CaptureInput implements Shared::InputSig<Location> {
   }
 
   class Expr extends ExprCfgNode {
-    predicate hasCfgNode(BasicBlock bb, int i) { this = bb.getNode(i) }
+    predicate hasCfgNode(Cfg::BasicBlock bb, int i) { this = bb.getNode(i) }
   }
 
   class VariableWrite extends ControlFlowNode {
@@ -80,7 +63,7 @@ private module CaptureInput implements Shared::InputSig<Location> {
 
     CapturedVariable getVariable() { result = v }
 
-    predicate hasCfgNode(BasicBlock bb, int i) { this = bb.getNode(i) }
+    predicate hasCfgNode(Cfg::BasicBlock bb, int i) { this = bb.getNode(i) }
   }
 
   class VariableRead extends Expr {
@@ -122,7 +105,7 @@ class CapturedVariable = CaptureInput::CapturedVariable;
 
 class ClosureExpr = CaptureInput::ClosureExpr;
 
-module Flow = Shared::Flow<Location, CaptureInput>;
+module Flow = Shared::Flow<Location, Cfg, CaptureInput>;
 
 private Flow::ClosureNode asClosureNode(Node n) {
   result = n.(SynthCaptureNode).getSynthesizedCaptureNode()
diff --git a/python/ql/lib/semmle/python/dataflow/old/Implementation.qll b/python/ql/lib/semmle/python/dataflow/old/Implementation.qll
index 19197f4bd30..83476db803c 100644
--- a/python/ql/lib/semmle/python/dataflow/old/Implementation.qll
+++ b/python/ql/lib/semmle/python/dataflow/old/Implementation.qll
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 import semmle.python.dataflow.TaintTracking
 private import semmle.python.objects.ObjectInternal
 private import semmle.python.pointsto.Filters as Filters
@@ -374,7 +375,7 @@ class TaintTrackingImplementation extends string instanceof TaintTracking::Confi
     exists(ModuleValue m, string name |
       src = TTaintTrackingNode_(_, context, path, kind, this) and
       this.moduleAttributeTainted(m, name, src) and
-      node.asCfgNode().(ImportMemberNode).getModule(name).pointsTo(m)
+      node.asCfgNode().(ImportMemberNode).getModule(name).(ControlFlowNodeWithPointsTo).pointsTo(m)
     )
   }
 
@@ -408,7 +409,9 @@ class TaintTrackingImplementation extends string instanceof TaintTracking::Confi
       src = TTaintTrackingNode_(srcnode, context, srcpath, srckind, this) and
       exists(CallNode call, ControlFlowNode arg |
         call = node.asCfgNode() and
-        call.getFunction().pointsTo(ObjectInternal::builtin("getattr")) and
+        call.getFunction()
+            .(ControlFlowNodeWithPointsTo)
+            .pointsTo(ObjectInternal::builtin("getattr")) and
         arg = call.getArg(0) and
         attrname = call.getArg(1).getNode().(StringLiteral).getText() and
         arg = srcnode.asCfgNode()
@@ -515,7 +518,7 @@ class TaintTrackingImplementation extends string instanceof TaintTracking::Confi
     TaintTrackingContext caller, TaintTrackingContext callee
   ) {
     exists(ClassValue cls |
-      call.getFunction().pointsTo(cls) and
+      call.getFunction().(ControlFlowNodeWithPointsTo).pointsTo(cls) and
       cls.lookup("__init__") = init
     |
       exists(int arg, TaintKind callerKind, AttributePath callerPath, DataFlow::Node argument |
@@ -878,7 +881,7 @@ private class EssaTaintTracking extends string instanceof TaintTracking::Configu
         const.getNode() instanceof ImmutableLiteral
       )
       or
-      exists(ControlFlowNode c, ClassValue cls |
+      exists(ControlFlowNodeWithPointsTo c, ClassValue cls |
         Filters::isinstance(test, c, use) and
         c.pointsTo(cls)
       |
@@ -978,7 +981,7 @@ module Implementation {
       tonode.getArg(0) = fromnode
     )
     or
-    tonode.getFunction().pointsTo(ObjectInternal::builtin("reversed")) and
+    tonode.getFunction().(ControlFlowNodeWithPointsTo).pointsTo(ObjectInternal::builtin("reversed")) and
     tonode.getArg(0) = fromnode
   }
 }
diff --git a/python/ql/lib/semmle/python/dataflow/old/TaintTracking.qll b/python/ql/lib/semmle/python/dataflow/old/TaintTracking.qll
index 0ce4bc27790..15459a31043 100644
--- a/python/ql/lib/semmle/python/dataflow/old/TaintTracking.qll
+++ b/python/ql/lib/semmle/python/dataflow/old/TaintTracking.qll
@@ -87,6 +87,7 @@
  */
 
 import python
+private import LegacyPointsTo
 private import semmle.python.pointsto.Filters as Filters
 private import semmle.python.objects.ObjectInternal
 private import semmle.python.dataflow.Implementation
@@ -267,7 +268,11 @@ module DictKind {
     Implementation::copyCall(fromnode, tonode) and
     edgeLabel = "dict copy"
     or
-    tonode.(CallNode).getFunction().pointsTo(ObjectInternal::builtin("dict")) and
+    tonode
+        .(CallNode)
+        .getFunction()
+        .(ControlFlowNodeWithPointsTo)
+        .pointsTo(ObjectInternal::builtin("dict")) and
     tonode.(CallNode).getArg(0) = fromnode and
     edgeLabel = "dict() call"
   }
@@ -615,7 +620,7 @@ module DataFlow {
     TCfgNode(ControlFlowNode node)
 
   abstract class Node extends TDataFlowNode {
-    abstract ControlFlowNode asCfgNode();
+    abstract ControlFlowNodeWithPointsTo asCfgNode();
 
     abstract EssaVariable asVariable();
 
@@ -632,7 +637,7 @@ module DataFlow {
   }
 
   class CfgNode extends Node, TCfgNode {
-    override ControlFlowNode asCfgNode() { this = TCfgNode(result) }
+    override ControlFlowNodeWithPointsTo asCfgNode() { this = TCfgNode(result) }
 
     override EssaVariable asVariable() { none() }
 
@@ -647,7 +652,7 @@ module DataFlow {
   }
 
   class EssaNode extends Node, TEssaNode {
-    override ControlFlowNode asCfgNode() { none() }
+    override ControlFlowNodeWithPointsTo asCfgNode() { none() }
 
     override EssaVariable asVariable() { this = TEssaNode(result) }
 
@@ -668,7 +673,11 @@ pragma[noinline]
 private predicate dict_construct(ControlFlowNode itemnode, ControlFlowNode dictnode) {
   dictnode.(DictNode).getAValue() = itemnode
   or
-  dictnode.(CallNode).getFunction().pointsTo(ObjectInternal::builtin("dict")) and
+  dictnode
+      .(CallNode)
+      .getFunction()
+      .(ControlFlowNodeWithPointsTo)
+      .pointsTo(ObjectInternal::builtin("dict")) and
   dictnode.(CallNode).getArgByName(_) = itemnode
 }
 
@@ -688,7 +697,7 @@ private predicate sequence_construct(ControlFlowNode itemnode, ControlFlowNode s
 pragma[noinline]
 private predicate sequence_call(ControlFlowNode fromnode, CallNode tonode) {
   tonode.getArg(0) = fromnode and
-  exists(ControlFlowNode cls | cls = tonode.getFunction() |
+  exists(ControlFlowNodeWithPointsTo cls | cls = tonode.getFunction() |
     cls.pointsTo(ObjectInternal::builtin("list"))
     or
     cls.pointsTo(ObjectInternal::builtin("tuple"))
diff --git a/python/ql/lib/semmle/python/dependencies/Dependencies.qll b/python/ql/lib/semmle/python/dependencies/Dependencies.qll
index 6f70c7e4ec0..a224ad1b960 100644
--- a/python/ql/lib/semmle/python/dependencies/Dependencies.qll
+++ b/python/ql/lib/semmle/python/dependencies/Dependencies.qll
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 import semmle.python.dependencies.DependencyKind
 
 private predicate importDependency(Object target, AstNode source) {
@@ -59,7 +60,7 @@ class PythonUse extends DependencyKind {
     interesting(target) and
     this = this and
     source != target.(ControlFlowNode).getNode() and
-    exists(ControlFlowNode use, Object obj |
+    exists(ControlFlowNodeWithPointsTo use, Object obj |
       use.getNode() = source and
       use.refersTo(obj) and
       use.isLoad()
@@ -114,12 +115,14 @@ private predicate attribute_access_dependency(Object target, AstNode source) {
 
 private predicate use_of_attribute(Attribute attr, Scope s, string name) {
   exists(AttrNode cfg | cfg.isLoad() and cfg.getNode() = attr |
-    exists(Object obj | cfg.getObject(name).refersTo(obj) |
+    exists(Object obj | cfg.getObject(name).(ControlFlowNodeWithPointsTo).refersTo(obj) |
       s = obj.(PythonModuleObject).getModule() or
       s = obj.(ClassObject).getPyClass()
     )
     or
-    exists(ClassObject cls | cfg.getObject(name).refersTo(_, cls, _) | s = cls.getPyClass())
+    exists(ClassObject cls | cfg.getObject(name).(ControlFlowNodeWithPointsTo).refersTo(_, cls, _) |
+      s = cls.getPyClass()
+    )
   )
   or
   exists(SelfAttributeRead sar | sar = attr |
diff --git a/python/ql/lib/semmle/python/frameworks/Lxml.qll b/python/ql/lib/semmle/python/frameworks/Lxml.qll
index c503d7d5cfb..e043093ed49 100644
--- a/python/ql/lib/semmle/python/frameworks/Lxml.qll
+++ b/python/ql/lib/semmle/python/frameworks/Lxml.qll
@@ -129,11 +129,6 @@ module Lxml {
             any(True t)
         )
         or
-        kind.isXmlBomb() and
-        this.getKeywordParameter("huge_tree").getAValueReachingSink().asExpr() = any(True t) and
-        not this.getKeywordParameter("resolve_entities").getAValueReachingSink().asExpr() =
-          any(False t)
-        or
         kind.isDtdRetrieval() and
         this.getKeywordParameter("load_dtd").getAValueReachingSink().asExpr() = any(True t) and
         this.getKeywordParameter("no_network").getAValueReachingSink().asExpr() = any(False t)
@@ -305,9 +300,8 @@ module Lxml {
       // note that there is no `resolve_entities` argument, so it's not possible to turn off XXE :O
       kind.isXxe()
       or
-      kind.isXmlBomb() and
-      this.getKeywordParameter("huge_tree").getAValueReachingSink().asExpr() = any(True t)
-      or
+      // libxml2 has built-in protection against XML bombs via entity reference loop detection,
+      // so lxml is not vulnerable to XML bomb attacks.
       kind.isDtdRetrieval() and
       this.getKeywordParameter("load_dtd").getAValueReachingSink().asExpr() = any(True t) and
       this.getKeywordParameter("no_network").getAValueReachingSink().asExpr() = any(False t)
diff --git a/python/ql/lib/semmle/python/frameworks/Psycopg2.qll b/python/ql/lib/semmle/python/frameworks/Psycopg2.qll
index 74016ebd639..93011f22277 100644
--- a/python/ql/lib/semmle/python/frameworks/Psycopg2.qll
+++ b/python/ql/lib/semmle/python/frameworks/Psycopg2.qll
@@ -29,4 +29,17 @@ private module Psycopg2 {
   class Psycopg2 extends PEP249::PEP249ModuleApiNode {
     Psycopg2() { this = API::moduleImport("psycopg2") }
   }
+
+  /** A database connection obtained from a psycopg2 connection pool. */
+  class Psycopg2ConnectionPoolMember extends PEP249::DatabaseConnection {
+    Psycopg2ConnectionPoolMember() {
+      this =
+        any(Psycopg2 p)
+            .getMember("pool")
+            .getMember(["SimpleConnectionPool", "ThreadedConnectionPool", "AbstractConnectionPool"])
+            .getAnInstance()
+            .getMember("getconn")
+            .getReturn()
+    }
+  }
 }
diff --git a/python/ql/lib/semmle/python/frameworks/Stdlib.qll b/python/ql/lib/semmle/python/frameworks/Stdlib.qll
index ceb2f1952a0..c6b671e8b78 100644
--- a/python/ql/lib/semmle/python/frameworks/Stdlib.qll
+++ b/python/ql/lib/semmle/python/frameworks/Stdlib.qll
@@ -3702,11 +3702,8 @@ module StdlibPrivate {
    * A call to a find method on a tree or an element will execute an XPath expression.
    */
   private class ElementTreeFindCall extends XML::XPathExecution::Range, DataFlow::CallCfgNode {
-    string methodName;
-
     ElementTreeFindCall() {
-      methodName in ["find", "findall", "findtext"] and
-      (
+      exists(string methodName | methodName in ["find", "findall", "findtext"] |
         this = elementTreeInstance().getMember(methodName).getACall()
         or
         this = elementInstance().getMember(methodName).getACall()
diff --git a/python/ql/lib/semmle/python/frameworks/builtins.model.yml b/python/ql/lib/semmle/python/frameworks/builtins.model.yml
new file mode 100644
index 00000000000..da976cb40bb
--- /dev/null
+++ b/python/ql/lib/semmle/python/frameworks/builtins.model.yml
@@ -0,0 +1,738 @@
+# process-builtin-exceptions 0.0.1; Python 3.11.0rc2
+extensions:
+- addsTo:
+    extensible: typeModel
+    pack: codeql/python-all
+  data:
+  - - builtins.PendingDeprecationWarning~Subclass
+    - builtins.PendingDeprecationWarning
+    - ''
+  - - builtins.Warning~Subclass
+    - builtins.PendingDeprecationWarning
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.PendingDeprecationWarning
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.PendingDeprecationWarning
+    - ''
+  - - builtins.UnicodeWarning~Subclass
+    - builtins.UnicodeWarning
+    - ''
+  - - builtins.Warning~Subclass
+    - builtins.UnicodeWarning
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.UnicodeWarning
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.UnicodeWarning
+    - ''
+  - - builtins.StopAsyncIteration~Subclass
+    - builtins.StopAsyncIteration
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.StopAsyncIteration
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.StopAsyncIteration
+    - ''
+  - - builtins.KeyboardInterrupt~Subclass
+    - builtins.KeyboardInterrupt
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.KeyboardInterrupt
+    - ''
+  - - builtins.ConnectionError~Subclass
+    - builtins.ConnectionError
+    - ''
+  - - builtins.OSError~Subclass
+    - builtins.ConnectionError
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.ConnectionError
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.ConnectionError
+    - ''
+  - - builtins.ConnectionResetError~Subclass
+    - builtins.ConnectionResetError
+    - ''
+  - - builtins.ConnectionError~Subclass
+    - builtins.ConnectionResetError
+    - ''
+  - - builtins.OSError~Subclass
+    - builtins.ConnectionResetError
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.ConnectionResetError
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.ConnectionResetError
+    - ''
+  - - builtins.InterruptedError~Subclass
+    - builtins.InterruptedError
+    - ''
+  - - builtins.OSError~Subclass
+    - builtins.InterruptedError
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.InterruptedError
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.InterruptedError
+    - ''
+  - - builtins.RuntimeError~Subclass
+    - builtins.RuntimeError
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.RuntimeError
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.RuntimeError
+    - ''
+  - - builtins.AttributeError~Subclass
+    - builtins.AttributeError
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.AttributeError
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.AttributeError
+    - ''
+  - - builtins.IndexError~Subclass
+    - builtins.IndexError
+    - ''
+  - - builtins.LookupError~Subclass
+    - builtins.IndexError
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.IndexError
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.IndexError
+    - ''
+  - - builtins.UnicodeDecodeError~Subclass
+    - builtins.UnicodeDecodeError
+    - ''
+  - - builtins.UnicodeError~Subclass
+    - builtins.UnicodeDecodeError
+    - ''
+  - - builtins.ValueError~Subclass
+    - builtins.UnicodeDecodeError
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.UnicodeDecodeError
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.UnicodeDecodeError
+    - ''
+  - - builtins.ExceptionGroup~Subclass
+    - builtins.ExceptionGroup
+    - ''
+  - - builtins.BaseExceptionGroup~Subclass
+    - builtins.ExceptionGroup
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.ExceptionGroup
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.ExceptionGroup
+    - ''
+  - - builtins.OverflowError~Subclass
+    - builtins.OverflowError
+    - ''
+  - - builtins.ArithmeticError~Subclass
+    - builtins.OverflowError
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.OverflowError
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.OverflowError
+    - ''
+  - - builtins.BufferError~Subclass
+    - builtins.BufferError
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.BufferError
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.BufferError
+    - ''
+  - - builtins.SyntaxWarning~Subclass
+    - builtins.SyntaxWarning
+    - ''
+  - - builtins.Warning~Subclass
+    - builtins.SyntaxWarning
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.SyntaxWarning
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.SyntaxWarning
+    - ''
+  - - builtins.BytesWarning~Subclass
+    - builtins.BytesWarning
+    - ''
+  - - builtins.Warning~Subclass
+    - builtins.BytesWarning
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.BytesWarning
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.BytesWarning
+    - ''
+  - - builtins.StopIteration~Subclass
+    - builtins.StopIteration
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.StopIteration
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.StopIteration
+    - ''
+  - - builtins.ImportError~Subclass
+    - builtins.ImportError
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.ImportError
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.ImportError
+    - ''
+  - - builtins.ChildProcessError~Subclass
+    - builtins.ChildProcessError
+    - ''
+  - - builtins.OSError~Subclass
+    - builtins.ChildProcessError
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.ChildProcessError
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.ChildProcessError
+    - ''
+  - - builtins.FileExistsError~Subclass
+    - builtins.FileExistsError
+    - ''
+  - - builtins.OSError~Subclass
+    - builtins.FileExistsError
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.FileExistsError
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.FileExistsError
+    - ''
+  - - builtins.PermissionError~Subclass
+    - builtins.PermissionError
+    - ''
+  - - builtins.OSError~Subclass
+    - builtins.PermissionError
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.PermissionError
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.PermissionError
+    - ''
+  - - builtins.RecursionError~Subclass
+    - builtins.RecursionError
+    - ''
+  - - builtins.RuntimeError~Subclass
+    - builtins.RecursionError
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.RecursionError
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.RecursionError
+    - ''
+  - - builtins.SyntaxError~Subclass
+    - builtins.SyntaxError
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.SyntaxError
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.SyntaxError
+    - ''
+  - - builtins.KeyError~Subclass
+    - builtins.KeyError
+    - ''
+  - - builtins.LookupError~Subclass
+    - builtins.KeyError
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.KeyError
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.KeyError
+    - ''
+  - - builtins.UnicodeTranslateError~Subclass
+    - builtins.UnicodeTranslateError
+    - ''
+  - - builtins.UnicodeError~Subclass
+    - builtins.UnicodeTranslateError
+    - ''
+  - - builtins.ValueError~Subclass
+    - builtins.UnicodeTranslateError
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.UnicodeTranslateError
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.UnicodeTranslateError
+    - ''
+  - - builtins.ZeroDivisionError~Subclass
+    - builtins.ZeroDivisionError
+    - ''
+  - - builtins.ArithmeticError~Subclass
+    - builtins.ZeroDivisionError
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.ZeroDivisionError
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.ZeroDivisionError
+    - ''
+  - - builtins.Warning~Subclass
+    - builtins.Warning
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.Warning
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.Warning
+    - ''
+  - - builtins.RuntimeWarning~Subclass
+    - builtins.RuntimeWarning
+    - ''
+  - - builtins.Warning~Subclass
+    - builtins.RuntimeWarning
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.RuntimeWarning
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.RuntimeWarning
+    - ''
+  - - builtins.EncodingWarning~Subclass
+    - builtins.EncodingWarning
+    - ''
+  - - builtins.Warning~Subclass
+    - builtins.EncodingWarning
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.EncodingWarning
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.EncodingWarning
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.BaseException
+    - ''
+  - - builtins.GeneratorExit~Subclass
+    - builtins.GeneratorExit
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.GeneratorExit
+    - ''
+  - - builtins.ModuleNotFoundError~Subclass
+    - builtins.ModuleNotFoundError
+    - ''
+  - - builtins.ImportError~Subclass
+    - builtins.ModuleNotFoundError
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.ModuleNotFoundError
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.ModuleNotFoundError
+    - ''
+  - - builtins.BrokenPipeError~Subclass
+    - builtins.BrokenPipeError
+    - ''
+  - - builtins.ConnectionError~Subclass
+    - builtins.BrokenPipeError
+    - ''
+  - - builtins.OSError~Subclass
+    - builtins.BrokenPipeError
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.BrokenPipeError
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.BrokenPipeError
+    - ''
+  - - builtins.FileNotFoundError~Subclass
+    - builtins.FileNotFoundError
+    - ''
+  - - builtins.OSError~Subclass
+    - builtins.FileNotFoundError
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.FileNotFoundError
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.FileNotFoundError
+    - ''
+  - - builtins.ProcessLookupError~Subclass
+    - builtins.ProcessLookupError
+    - ''
+  - - builtins.OSError~Subclass
+    - builtins.ProcessLookupError
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.ProcessLookupError
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.ProcessLookupError
+    - ''
+  - - builtins.NotImplementedError~Subclass
+    - builtins.NotImplementedError
+    - ''
+  - - builtins.RuntimeError~Subclass
+    - builtins.NotImplementedError
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.NotImplementedError
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.NotImplementedError
+    - ''
+  - - builtins.IndentationError~Subclass
+    - builtins.IndentationError
+    - ''
+  - - builtins.SyntaxError~Subclass
+    - builtins.IndentationError
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.IndentationError
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.IndentationError
+    - ''
+  - - builtins.ValueError~Subclass
+    - builtins.ValueError
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.ValueError
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.ValueError
+    - ''
+  - - builtins.AssertionError~Subclass
+    - builtins.AssertionError
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.AssertionError
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.AssertionError
+    - ''
+  - - builtins.SystemError~Subclass
+    - builtins.SystemError
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.SystemError
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.SystemError
+    - ''
+  - - builtins.UserWarning~Subclass
+    - builtins.UserWarning
+    - ''
+  - - builtins.Warning~Subclass
+    - builtins.UserWarning
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.UserWarning
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.UserWarning
+    - ''
+  - - builtins.FutureWarning~Subclass
+    - builtins.FutureWarning
+    - ''
+  - - builtins.Warning~Subclass
+    - builtins.FutureWarning
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.FutureWarning
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.FutureWarning
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.Exception
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.Exception
+    - ''
+  - - builtins.ResourceWarning~Subclass
+    - builtins.ResourceWarning
+    - ''
+  - - builtins.Warning~Subclass
+    - builtins.ResourceWarning
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.ResourceWarning
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.ResourceWarning
+    - ''
+  - - builtins.SystemExit~Subclass
+    - builtins.SystemExit
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.SystemExit
+    - ''
+  - - builtins.OSError~Subclass
+    - builtins.OSError
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.OSError
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.OSError
+    - ''
+  - - builtins.ConnectionAbortedError~Subclass
+    - builtins.ConnectionAbortedError
+    - ''
+  - - builtins.ConnectionError~Subclass
+    - builtins.ConnectionAbortedError
+    - ''
+  - - builtins.OSError~Subclass
+    - builtins.ConnectionAbortedError
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.ConnectionAbortedError
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.ConnectionAbortedError
+    - ''
+  - - builtins.IsADirectoryError~Subclass
+    - builtins.IsADirectoryError
+    - ''
+  - - builtins.OSError~Subclass
+    - builtins.IsADirectoryError
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.IsADirectoryError
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.IsADirectoryError
+    - ''
+  - - builtins.TimeoutError~Subclass
+    - builtins.TimeoutError
+    - ''
+  - - builtins.OSError~Subclass
+    - builtins.TimeoutError
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.TimeoutError
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.TimeoutError
+    - ''
+  - - builtins.NameError~Subclass
+    - builtins.NameError
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.NameError
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.NameError
+    - ''
+  - - builtins.TabError~Subclass
+    - builtins.TabError
+    - ''
+  - - builtins.IndentationError~Subclass
+    - builtins.TabError
+    - ''
+  - - builtins.SyntaxError~Subclass
+    - builtins.TabError
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.TabError
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.TabError
+    - ''
+  - - builtins.UnicodeError~Subclass
+    - builtins.UnicodeError
+    - ''
+  - - builtins.ValueError~Subclass
+    - builtins.UnicodeError
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.UnicodeError
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.UnicodeError
+    - ''
+  - - builtins.ArithmeticError~Subclass
+    - builtins.ArithmeticError
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.ArithmeticError
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.ArithmeticError
+    - ''
+  - - builtins.ReferenceError~Subclass
+    - builtins.ReferenceError
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.ReferenceError
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.ReferenceError
+    - ''
+  - - builtins.DeprecationWarning~Subclass
+    - builtins.DeprecationWarning
+    - ''
+  - - builtins.Warning~Subclass
+    - builtins.DeprecationWarning
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.DeprecationWarning
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.DeprecationWarning
+    - ''
+  - - builtins.ImportWarning~Subclass
+    - builtins.ImportWarning
+    - ''
+  - - builtins.Warning~Subclass
+    - builtins.ImportWarning
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.ImportWarning
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.ImportWarning
+    - ''
+  - - builtins.TypeError~Subclass
+    - builtins.TypeError
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.TypeError
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.TypeError
+    - ''
+  - - builtins.BaseExceptionGroup~Subclass
+    - builtins.BaseExceptionGroup
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.BaseExceptionGroup
+    - ''
+  - - builtins.BlockingIOError~Subclass
+    - builtins.BlockingIOError
+    - ''
+  - - builtins.OSError~Subclass
+    - builtins.BlockingIOError
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.BlockingIOError
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.BlockingIOError
+    - ''
+  - - builtins.ConnectionRefusedError~Subclass
+    - builtins.ConnectionRefusedError
+    - ''
+  - - builtins.ConnectionError~Subclass
+    - builtins.ConnectionRefusedError
+    - ''
+  - - builtins.OSError~Subclass
+    - builtins.ConnectionRefusedError
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.ConnectionRefusedError
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.ConnectionRefusedError
+    - ''
+  - - builtins.NotADirectoryError~Subclass
+    - builtins.NotADirectoryError
+    - ''
+  - - builtins.OSError~Subclass
+    - builtins.NotADirectoryError
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.NotADirectoryError
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.NotADirectoryError
+    - ''
+  - - builtins.EOFError~Subclass
+    - builtins.EOFError
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.EOFError
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.EOFError
+    - ''
+  - - builtins.UnboundLocalError~Subclass
+    - builtins.UnboundLocalError
+    - ''
+  - - builtins.NameError~Subclass
+    - builtins.UnboundLocalError
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.UnboundLocalError
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.UnboundLocalError
+    - ''
+  - - builtins.LookupError~Subclass
+    - builtins.LookupError
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.LookupError
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.LookupError
+    - ''
+  - - builtins.UnicodeEncodeError~Subclass
+    - builtins.UnicodeEncodeError
+    - ''
+  - - builtins.UnicodeError~Subclass
+    - builtins.UnicodeEncodeError
+    - ''
+  - - builtins.ValueError~Subclass
+    - builtins.UnicodeEncodeError
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.UnicodeEncodeError
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.UnicodeEncodeError
+    - ''
+  - - builtins.FloatingPointError~Subclass
+    - builtins.FloatingPointError
+    - ''
+  - - builtins.ArithmeticError~Subclass
+    - builtins.FloatingPointError
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.FloatingPointError
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.FloatingPointError
+    - ''
+  - - builtins.MemoryError~Subclass
+    - builtins.MemoryError
+    - ''
+  - - builtins.Exception~Subclass
+    - builtins.MemoryError
+    - ''
+  - - builtins.BaseException~Subclass
+    - builtins.MemoryError
+    - ''
diff --git a/python/ql/lib/semmle/python/frameworks/data/internal/ApiGraphModelsExtensions.qll b/python/ql/lib/semmle/python/frameworks/data/internal/ApiGraphModelsExtensions.qll
index b86d7de457e..4969da43be3 100644
--- a/python/ql/lib/semmle/python/frameworks/data/internal/ApiGraphModelsExtensions.qll
+++ b/python/ql/lib/semmle/python/frameworks/data/internal/ApiGraphModelsExtensions.qll
@@ -4,7 +4,7 @@
 
 /**
  * Holds if the value at `(type, path)` should be seen as a flow
- * source of the given `kind`.
+ * source of the given `kind` and `madId` is the data extension row number.
  *
  * The kind `remote` represents a general remote flow source.
  */
@@ -14,13 +14,14 @@ extensible predicate sourceModel(
 
 /**
  * Holds if the value at `(type, path)` should be seen as a sink
- * of the given `kind`.
+ * of the given `kind` and `madId` is the data extension row number.
  */
 extensible predicate sinkModel(string type, string path, string kind, QlBuiltins::ExtensionId madId);
 
 /**
  * Holds if in calls to `(type, path)`, the value referred to by `input`
- * can flow to the value referred to by `output`.
+ * can flow to the value referred to by `output` and `madId` is the data
+ * extension row number.
  *
  * `kind` should be either `value` or `taint`, for value-preserving or taint-preserving steps,
  * respectively.
diff --git a/python/ql/lib/semmle/python/internal/OverlayDiscardConsistencyQuery.qll b/python/ql/lib/semmle/python/internal/OverlayDiscardConsistencyQuery.qll
new file mode 100644
index 00000000000..9cca328b02d
--- /dev/null
+++ b/python/ql/lib/semmle/python/internal/OverlayDiscardConsistencyQuery.qll
@@ -0,0 +1,90 @@
+/**
+ * Provides consistency queries for checking that every database entity
+ * that can be discarded (i.e. everything but `@py_cobject`) in an overlay
+ * database is indeed discarded, by proxy of having exactly one `Discardable.getPath()`.
+ */
+
+import python
+import semmle.python.Overlay
+
+class TopWithToString instanceof @top {
+  string getDbType() {
+    this instanceof @py_source_element and result = "@source_element"
+    or
+    this instanceof @py_object and result = "@py_object"
+    or
+    this instanceof @py_base_var and result = "@py_base_var"
+    or
+    this instanceof @location and result = "@location"
+    or
+    this instanceof @py_line and result = "@py_line"
+    or
+    this instanceof @py_comment and result = "@py_comment"
+    or
+    this instanceof @py_expr_parent and result = "@py_expr_parent"
+    or
+    this instanceof @py_expr_context and result = "@py_expr_context"
+    or
+    this instanceof @py_operator and result = "@py_operator"
+    or
+    this instanceof @py_boolop and result = "@py_boolop"
+    or
+    this instanceof @py_cmpop and result = "@py_cmpop"
+    or
+    this instanceof @py_unaryop and result = "@py_unaryop"
+    or
+    this instanceof @py_cmpop_list and result = "@py_cmpop_list"
+    or
+    this instanceof @py_alias_list and result = "@py_alias_list"
+    or
+    this instanceof @py_StringPart_list and result = "@py_StringPart_list"
+    or
+    this instanceof @py_comprehension_list and result = "@py_comprehension_list"
+    or
+    this instanceof @py_dict_item_list and result = "@py_dict_item_list"
+    or
+    this instanceof @py_pattern_list and result = "@py_pattern_list"
+    or
+    this instanceof @py_stmt_list and result = "@py_stmt_list"
+    or
+    this instanceof @py_str_list and result = "@py_str_list"
+    or
+    this instanceof @py_type_parameter_list and result = "@py_type_parameter_list"
+    or
+    this instanceof @externalDefect and result = "@externalDefect"
+    or
+    this instanceof @externalMetric and result = "@externalMetric"
+    or
+    this instanceof @externalDataElement and result = "@externalDataElement"
+    or
+    this instanceof @duplication_or_similarity and result = "@duplication_or_similarity"
+    or
+    this instanceof @svnentry and result = "@svnentry"
+    or
+    this instanceof @xmllocatable and result = "@xmllocatable"
+    or
+    this instanceof @yaml_locatable and result = "@yaml_locatable"
+  }
+
+  string toString() {
+    result = this.getDbType()
+    or
+    not exists(this.getDbType()) and
+    result = "Unknown type"
+  }
+}
+
+query predicate consistencyTest(TopWithToString el, string message) {
+  not el instanceof Discardable and
+  not el instanceof @py_cobject and // cannot be linked to a path
+  not el instanceof @externalDataElement and // cannot be linked to a path
+  message = "Not Discardable"
+  or
+  exists(Discardable d, int numPaths | d = el and numPaths = count(d.getPath()) |
+    numPaths = 0 and
+    message = "Discardable but no path found"
+    or
+    numPaths > 1 and
+    message = "Discardable but multiple paths found (" + concat(d.getPath(), ", ") + ")"
+  )
+}
diff --git a/python/ql/lib/semmle/python/objects/ObjectAPI.qll b/python/ql/lib/semmle/python/objects/ObjectAPI.qll
index 4a36ec6d847..45247c5d9d4 100644
--- a/python/ql/lib/semmle/python/objects/ObjectAPI.qll
+++ b/python/ql/lib/semmle/python/objects/ObjectAPI.qll
@@ -4,6 +4,7 @@
  */
 
 import python
+private import LegacyPointsTo
 private import TObject
 private import semmle.python.objects.ObjectInternal
 private import semmle.python.pointsto.PointsTo
@@ -696,7 +697,9 @@ abstract class FunctionValue extends CallableValue {
     exists(ClassValue cls, string name |
       cls.declaredAttribute(name) = this and
       name != "__new__" and
-      exists(Expr expr, AstNode origin | expr.pointsTo(this, origin) | not origin instanceof Lambda)
+      exists(ExprWithPointsTo expr, AstNode origin | expr.pointsTo(this, origin) |
+        not origin instanceof Lambda
+      )
     )
   }
 
@@ -704,12 +707,14 @@ abstract class FunctionValue extends CallableValue {
   abstract ClassValue getARaisedType();
 
   /** Gets a call-site from where this function is called as a function */
-  CallNode getAFunctionCall() { result.getFunction().pointsTo() = this }
+  CallNode getAFunctionCall() {
+    result.getFunction().(ControlFlowNodeWithPointsTo).pointsTo() = this
+  }
 
   /** Gets a call-site from where this function is called as a method */
   CallNode getAMethodCall() {
     exists(BoundMethodObjectInternal bm |
-      result.getFunction().pointsTo() = bm and
+      result.getFunction().(ControlFlowNodeWithPointsTo).pointsTo() = bm and
       bm.getFunction() = this
     )
   }
@@ -753,7 +758,7 @@ class PythonFunctionValue extends FunctionValue {
      * explicit return nodes that we can query and get the class of.
      */
 
-    result = this.getAReturnedNode().pointsTo().getClass()
+    result = this.getAReturnedNode().(ControlFlowNodeWithPointsTo).pointsTo().getClass()
   }
 }
 
diff --git a/python/ql/lib/semmle/python/objects/ObjectInternal.qll b/python/ql/lib/semmle/python/objects/ObjectInternal.qll
index a58b8b5f0a9..aa78caa2c9d 100644
--- a/python/ql/lib/semmle/python/objects/ObjectInternal.qll
+++ b/python/ql/lib/semmle/python/objects/ObjectInternal.qll
@@ -174,9 +174,9 @@ class ObjectInternal extends TObject {
   abstract int length();
 
   /**
-   * Holds if the object `function` is called when this object is called and `paramOffset`
+   * Holds if the object `function` is called when this object is called and `offset`
    * is the difference from the parameter position and the argument position.
-   * For a normal function `paramOffset` is 0. For classes and bound-methods it is 1.
+   * For a normal function `offset` is 0. For classes and bound-methods it is 1.
    * This is used to implement the `CallableValue` public API.
    */
   predicate functionAndOffset(CallableObjectInternal function, int offset) { none() }
diff --git a/python/ql/lib/semmle/python/regexp/RegexTreeView.qll b/python/ql/lib/semmle/python/regexp/RegexTreeView.qll
index a2952a5680b..897c97bb783 100644
--- a/python/ql/lib/semmle/python/regexp/RegexTreeView.qll
+++ b/python/ql/lib/semmle/python/regexp/RegexTreeView.qll
@@ -964,7 +964,7 @@ module Impl implements RegexTreeViewSig {
    * ```
    */
   class RegExpPositiveLookahead extends RegExpLookahead {
-    RegExpPositiveLookahead() { re.positiveLookaheadAssertionGroup(start, end) }
+    RegExpPositiveLookahead() { re.positiveLookaheadAssertionGroup(start, end, _, _) }
 
     override string getPrimaryQLClass() { result = "RegExpPositiveLookahead" }
   }
@@ -979,7 +979,7 @@ module Impl implements RegexTreeViewSig {
    * ```
    */
   additional class RegExpNegativeLookahead extends RegExpLookahead {
-    RegExpNegativeLookahead() { re.negativeLookaheadAssertionGroup(start, end) }
+    RegExpNegativeLookahead() { re.negativeLookaheadAssertionGroup(start, end, _, _) }
 
     override string getPrimaryQLClass() { result = "RegExpNegativeLookahead" }
   }
@@ -1006,7 +1006,7 @@ module Impl implements RegexTreeViewSig {
    * ```
    */
   class RegExpPositiveLookbehind extends RegExpLookbehind {
-    RegExpPositiveLookbehind() { re.positiveLookbehindAssertionGroup(start, end) }
+    RegExpPositiveLookbehind() { re.positiveLookbehindAssertionGroup(start, end, _, _) }
 
     override string getPrimaryQLClass() { result = "RegExpPositiveLookbehind" }
   }
@@ -1021,7 +1021,7 @@ module Impl implements RegexTreeViewSig {
    * ```
    */
   additional class RegExpNegativeLookbehind extends RegExpLookbehind {
-    RegExpNegativeLookbehind() { re.negativeLookbehindAssertionGroup(start, end) }
+    RegExpNegativeLookbehind() { re.negativeLookbehindAssertionGroup(start, end, _, _) }
 
     override string getPrimaryQLClass() { result = "RegExpNegativeLookbehind" }
   }
diff --git a/python/ql/lib/semmle/python/regexp/internal/ParseRegExp.qll b/python/ql/lib/semmle/python/regexp/internal/ParseRegExp.qll
index 7e23554e058..d91c4bbd78c 100644
--- a/python/ql/lib/semmle/python/regexp/internal/ParseRegExp.qll
+++ b/python/ql/lib/semmle/python/regexp/internal/ParseRegExp.qll
@@ -554,9 +554,9 @@ class RegExp extends Expr instanceof StringLiteral {
     or
     this.negativeAssertionGroup(start, end)
     or
-    this.positiveLookaheadAssertionGroup(start, end)
+    this.positiveLookaheadAssertionGroup(start, end, _, _)
     or
-    this.positiveLookbehindAssertionGroup(start, end)
+    this.positiveLookbehindAssertionGroup(start, end, _, _)
   }
 
   /** Holds if an empty group is found between `start` and `end`. */
@@ -572,7 +572,7 @@ class RegExp extends Expr instanceof StringLiteral {
     or
     this.negativeAssertionGroup(start, end)
     or
-    this.positiveLookaheadAssertionGroup(start, end)
+    this.positiveLookaheadAssertionGroup(start, end, _, _)
   }
 
   private predicate emptyMatchAtEndGroup(int start, int end) {
@@ -580,7 +580,7 @@ class RegExp extends Expr instanceof StringLiteral {
     or
     this.negativeAssertionGroup(start, end)
     or
-    this.positiveLookbehindAssertionGroup(start, end)
+    this.positiveLookbehindAssertionGroup(start, end, _, _)
   }
 
   private predicate negativeAssertionGroup(int start, int end) {
@@ -593,32 +593,40 @@ class RegExp extends Expr instanceof StringLiteral {
     )
   }
 
-  /** Holds if a negative lookahead is found between `start` and `end` */
-  predicate negativeLookaheadAssertionGroup(int start, int end) {
-    exists(int in_start | this.negative_lookahead_assertion_start(start, in_start) |
-      this.groupContents(start, end, in_start, _)
-    )
+  /**
+   * Holds if a negative lookahead is found between `start` and `end`, with contents
+   * between  `in_start` and `in_end`.
+   */
+  predicate negativeLookaheadAssertionGroup(int start, int end, int in_start, int in_end) {
+    this.negative_lookahead_assertion_start(start, in_start) and
+    this.groupContents(start, end, in_start, in_end)
   }
 
-  /** Holds if a negative lookbehind is found between `start` and `end` */
-  predicate negativeLookbehindAssertionGroup(int start, int end) {
-    exists(int in_start | this.negative_lookbehind_assertion_start(start, in_start) |
-      this.groupContents(start, end, in_start, _)
-    )
+  /**
+   * Holds if a negative lookbehind is found between `start` and `end`, with contents
+   * between `in_start` and `in_end`.
+   */
+  predicate negativeLookbehindAssertionGroup(int start, int end, int in_start, int in_end) {
+    this.negative_lookbehind_assertion_start(start, in_start) and
+    this.groupContents(start, end, in_start, in_end)
   }
 
-  /** Holds if a positive lookahead is found between `start` and `end` */
-  predicate positiveLookaheadAssertionGroup(int start, int end) {
-    exists(int in_start | this.lookahead_assertion_start(start, in_start) |
-      this.groupContents(start, end, in_start, _)
-    )
+  /**
+   * Holds if a positive lookahead is found between `start` and `end`, with contents
+   * between `in_start` and `in_end`.
+   */
+  predicate positiveLookaheadAssertionGroup(int start, int end, int in_start, int in_end) {
+    this.lookahead_assertion_start(start, in_start) and
+    this.groupContents(start, end, in_start, in_end)
   }
 
-  /** Holds if a positive lookbehind is found between `start` and `end` */
-  predicate positiveLookbehindAssertionGroup(int start, int end) {
-    exists(int in_start | this.lookbehind_assertion_start(start, in_start) |
-      this.groupContents(start, end, in_start, _)
-    )
+  /**
+   * Holds if a positive lookbehind is found between `start` and `end`, with contents
+   * between `in_start` and `in_end`.
+   */
+  predicate positiveLookbehindAssertionGroup(int start, int end, int in_start, int in_end) {
+    this.lookbehind_assertion_start(start, in_start) and
+    this.groupContents(start, end, in_start, in_end)
   }
 
   private predicate group_start(int start, int end) {
@@ -1049,6 +1057,13 @@ class RegExp extends Expr instanceof StringLiteral {
       or
       this.alternationOption(x, y, start, end)
     )
+    or
+    // Lookbehind assertions can potentially match the start of the string
+    (
+      this.positiveLookbehindAssertionGroup(_, _, start, _) or
+      this.negativeLookbehindAssertionGroup(_, _, start, _)
+    ) and
+    this.item(start, end)
   }
 
   /** A part of the regex that may match the end of the string. */
@@ -1074,6 +1089,13 @@ class RegExp extends Expr instanceof StringLiteral {
       or
       this.alternationOption(x, y, start, end)
     )
+    or
+    // Lookahead assertions can potentially match the end of the string
+    (
+      this.positiveLookaheadAssertionGroup(_, _, _, end) or
+      this.negativeLookaheadAssertionGroup(_, _, _, end)
+    ) and
+    this.item(start, end)
   }
 
   /**
diff --git a/python/ql/lib/semmle/python/security/dataflow/PolynomialReDoSQuery.qll b/python/ql/lib/semmle/python/security/dataflow/PolynomialReDoSQuery.qll
index 89aa4961e6e..11ccf27d7eb 100644
--- a/python/ql/lib/semmle/python/security/dataflow/PolynomialReDoSQuery.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/PolynomialReDoSQuery.qll
@@ -21,6 +21,8 @@ private module PolynomialReDoSConfig implements DataFlow::ConfigSig {
   predicate observeDiffInformedIncrementalMode() { any() }
 
   Location getASelectedSinkLocation(DataFlow::Node sink) {
+    result = sink.(Sink).getLocation()
+    or
     result = sink.(Sink).getHighlight().getLocation()
     or
     result = sink.(Sink).getABacktrackingTerm().getLocation()
diff --git a/python/ql/lib/semmle/python/security/dataflow/ServerSideRequestForgeryQuery.qll b/python/ql/lib/semmle/python/security/dataflow/ServerSideRequestForgeryQuery.qll
index b466d34b227..e60afa470ec 100644
--- a/python/ql/lib/semmle/python/security/dataflow/ServerSideRequestForgeryQuery.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/ServerSideRequestForgeryQuery.qll
@@ -68,7 +68,8 @@ private module PartialServerSideRequestForgeryConfig implements DataFlow::Config
   predicate observeDiffInformedIncrementalMode() { any() }
 
   Location getASelectedSinkLocation(DataFlow::Node sink) {
-    // Note: this query does not select the sink itself
+    result = sink.(Sink).getLocation()
+    or
     result = sink.(Sink).getRequest().getLocation()
   }
 }
diff --git a/python/ql/lib/semmle/python/types/ClassObject.qll b/python/ql/lib/semmle/python/types/ClassObject.qll
index e3ad51ea162..6954a83463c 100644
--- a/python/ql/lib/semmle/python/types/ClassObject.qll
+++ b/python/ql/lib/semmle/python/types/ClassObject.qll
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 private import semmle.python.objects.Classes
 private import semmle.python.objects.Instances
 private import semmle.python.pointsto.PointsTo
@@ -193,7 +194,9 @@ class ClassObject extends Object {
    * It is guaranteed that getProbableSingletonInstance() returns at most one Object for each ClassObject.
    */
   Object getProbableSingletonInstance() {
-    exists(ControlFlowNode use, Expr origin | use.refersTo(result, this, origin.getAFlowNode()) |
+    exists(ControlFlowNodeWithPointsTo use, Expr origin |
+      use.refersTo(result, this, origin.getAFlowNode())
+    |
       this.hasStaticallyUniqueInstance() and
       /* Ensure that original expression will be executed only one. */
       origin.getScope() instanceof ImportTimeScope and
@@ -351,7 +354,7 @@ class ClassObject extends Object {
    * Gets a call to this class. Note that the call may not create a new instance of
    * this class, as that depends on the `__new__` method of this class.
    */
-  CallNode getACall() { result.getFunction().refersTo(this) }
+  CallNode getACall() { result.getFunction().(ControlFlowNodeWithPointsTo).refersTo(this) }
 
   override predicate notClass() { none() }
 }
diff --git a/python/ql/lib/semmle/python/types/Exceptions.qll b/python/ql/lib/semmle/python/types/Exceptions.qll
index 93bace1cf51..5e982aa0134 100644
--- a/python/ql/lib/semmle/python/types/Exceptions.qll
+++ b/python/ql/lib/semmle/python/types/Exceptions.qll
@@ -12,6 +12,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 /** The subset of ControlFlowNodes which might raise an exception */
 class RaisingNode extends ControlFlowNode {
@@ -30,7 +31,9 @@ class RaisingNode extends ControlFlowNode {
     )
   }
 
-  private predicate quits() { this.(CallNode).getFunction().refersTo(Object::quitter(_)) }
+  private predicate quits() {
+    this.(CallNode).getFunction().(ControlFlowNodeWithPointsTo).refersTo(Object::quitter(_))
+  }
 
   /**
    * Gets the type of an exception that may be raised
@@ -68,7 +71,7 @@ class RaisingNode extends ControlFlowNode {
   private ClassObject localRaisedType_objectapi() {
     result.isSubclassOf(theBaseExceptionType()) and
     (
-      exists(ControlFlowNode ex |
+      exists(ControlFlowNodeWithPointsTo ex |
         ex = this.getExceptionNode() and
         (ex.refersTo(result) or ex.refersTo(_, result, _))
       )
@@ -95,7 +98,7 @@ class RaisingNode extends ControlFlowNode {
   private ClassValue localRaisedType() {
     result.getASuperType() = ClassValue::baseException() and
     (
-      exists(ControlFlowNode ex |
+      exists(ControlFlowNodeWithPointsTo ex |
         ex = this.getExceptionNode() and
         (ex.pointsTo(result) or ex.pointsTo().getClass() = result)
       )
@@ -153,7 +156,9 @@ class RaisingNode extends ControlFlowNode {
       /* Call to an unknown object */
       this.getNode() instanceof Call and
       not exists(FunctionObject func | this = func.getACall()) and
-      not exists(ClassObject known | this.(CallNode).getFunction().refersTo(known))
+      not exists(ClassObject known |
+        this.(CallNode).getFunction().(ControlFlowNodeWithPointsTo).refersTo(known)
+      )
       or
       this.getNode() instanceof Exec
       or
@@ -371,7 +376,7 @@ class ExceptFlowNode extends ControlFlowNode {
    * Gets the type handled by this exception handler.
    * `ExceptionType` in `except ExceptionType as e:`
    */
-  ControlFlowNode getType() {
+  ControlFlowNodeWithPointsTo getType() {
     exists(ExceptStmt ex |
       this.getBasicBlock().dominates(result.getBasicBlock()) and
       ex = this.getNode() and
@@ -470,7 +475,7 @@ class ExceptGroupFlowNode extends ControlFlowNode {
   }
 }
 
-private ControlFlowNode element_from_tuple_objectapi(Object tuple) {
+private ControlFlowNodeWithPointsTo element_from_tuple_objectapi(Object tuple) {
   exists(Tuple t | t = tuple.getOrigin() and result = t.getAnElt().getAFlowNode())
 }
 
diff --git a/python/ql/lib/semmle/python/types/FunctionObject.qll b/python/ql/lib/semmle/python/types/FunctionObject.qll
index d52a885a832..72ddb9411fb 100644
--- a/python/ql/lib/semmle/python/types/FunctionObject.qll
+++ b/python/ql/lib/semmle/python/types/FunctionObject.qll
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 import semmle.python.types.Exceptions
 private import semmle.python.pointsto.PointsTo
 private import semmle.python.objects.Callables
@@ -32,29 +33,31 @@ abstract class FunctionObject extends Object {
   abstract string descriptiveString();
 
   /** Gets a call-site from where this function is called as a function */
-  CallNode getAFunctionCall() { result.getFunction().inferredValue() = this.theCallable() }
+  CallNode getAFunctionCall() {
+    result.getFunction().(ControlFlowNodeWithPointsTo).inferredValue() = this.theCallable()
+  }
 
   /** Gets a call-site from where this function is called as a method */
   CallNode getAMethodCall() {
     exists(BoundMethodObjectInternal bm |
-      result.getFunction().inferredValue() = bm and
+      result.getFunction().(ControlFlowNodeWithPointsTo).inferredValue() = bm and
       bm.getFunction() = this.theCallable()
     )
   }
 
   /** Gets a call-site from where this function is called */
-  ControlFlowNode getACall() { result = this.theCallable().getACall() }
+  ControlFlowNodeWithPointsTo getACall() { result = this.theCallable().getACall() }
 
   /** Gets a call-site from where this function is called, given the `context` */
-  ControlFlowNode getACall(Context caller_context) {
-    result = this.theCallable().getACall(caller_context)
+  ControlFlowNodeWithPointsTo getACall(Context context) {
+    result = this.theCallable().getACall(context)
   }
 
   /**
    * Gets the `ControlFlowNode` that will be passed as the nth argument to `this` when called at `call`.
    * This predicate will correctly handle `x.y()`, treating `x` as the zeroth argument.
    */
-  ControlFlowNode getArgumentForCall(CallNode call, int n) {
+  ControlFlowNodeWithPointsTo getArgumentForCall(CallNode call, int n) {
     result = this.theCallable().getArgumentForCall(call, n)
   }
 
@@ -62,7 +65,7 @@ abstract class FunctionObject extends Object {
    * Gets the `ControlFlowNode` that will be passed as the named argument to `this` when called at `call`.
    * This predicate will correctly handle `x.y()`, treating `x` as the self argument.
    */
-  ControlFlowNode getNamedArgumentForCall(CallNode call, string name) {
+  ControlFlowNodeWithPointsTo getNamedArgumentForCall(CallNode call, string name) {
     result = this.theCallable().getNamedArgumentForCall(call, name)
   }
 
@@ -136,7 +139,9 @@ class PyFunctionObject extends FunctionObject {
   override predicate raisesUnknownType() { scope_raises_unknown(this.getFunction()) }
 
   /** Gets a control flow node corresponding to the value of a return statement */
-  ControlFlowNode getAReturnedNode() { result = this.getFunction().getAReturnValueFlowNode() }
+  ControlFlowNodeWithPointsTo getAReturnedNode() {
+    result = this.getFunction().getAReturnValueFlowNode()
+  }
 
   override string descriptiveString() {
     if this.getFunction().isMethod()
@@ -218,7 +223,7 @@ abstract class BuiltinCallable extends FunctionObject {
 
   abstract override string getQualifiedName();
 
-  override ControlFlowNode getArgumentForCall(CallNode call, int n) {
+  override ControlFlowNodeWithPointsTo getArgumentForCall(CallNode call, int n) {
     call = this.getACall() and result = call.getArg(n)
   }
 }
diff --git a/python/ql/lib/semmle/python/types/Object.qll b/python/ql/lib/semmle/python/types/Object.qll
index 6c76067dc68..1e0868648be 100644
--- a/python/ql/lib/semmle/python/types/Object.qll
+++ b/python/ql/lib/semmle/python/types/Object.qll
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 private import semmle.python.objects.ObjectInternal
 private import semmle.python.types.Builtins
 private import semmle.python.internal.CachedStages
@@ -41,7 +42,7 @@ class Object extends @py_object {
    * for a control flow node 'f'
    */
   ClassObject getAnInferredType() {
-    exists(ControlFlowNode somewhere | somewhere.refersTo(this, result, _))
+    exists(ControlFlowNodeWithPointsTo somewhere | somewhere.refersTo(this, result, _))
     or
     this.asBuiltin().getClass() = result.asBuiltin() and not this = unknownValue()
     or
@@ -327,7 +328,7 @@ abstract class SequenceObject extends Object {
   Object getInferredElement(int n) {
     result = this.getBuiltinElement(n)
     or
-    this.getSourceElement(n).refersTo(result)
+    this.getSourceElement(n).(ControlFlowNodeWithPointsTo).refersTo(result)
   }
 }
 
@@ -438,7 +439,8 @@ class SuperBoundMethod extends Object {
   string name;
 
   SuperBoundMethod() {
-    this.(AttrNode).getObject(name).inferredValue().getClass() = Value::named("super")
+    this.(AttrNode).getObject(name).(ControlFlowNodeWithPointsTo).inferredValue().getClass() =
+      Value::named("super")
   }
 
   override string toString() { result = "super()." + name }
@@ -446,7 +448,7 @@ class SuperBoundMethod extends Object {
   Object getFunction(string fname) {
     fname = name and
     exists(SuperInstance sup, BoundMethodObjectInternal m |
-      sup = this.(AttrNode).getObject(name).inferredValue() and
+      sup = this.(AttrNode).getObject(name).(ControlFlowNodeWithPointsTo).inferredValue() and
       sup.attribute(name, m, _) and
       result = m.getFunction().getSource()
     )
diff --git a/python/ql/lib/semmle/python/types/Properties.qll b/python/ql/lib/semmle/python/types/Properties.qll
index a0efe6ca5eb..899f0a3407e 100644
--- a/python/ql/lib/semmle/python/types/Properties.qll
+++ b/python/ql/lib/semmle/python/types/Properties.qll
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 /**
  * A Python property:
@@ -77,32 +78,32 @@ class BuiltinPropertyObject extends PropertyObject {
 }
 
 private predicate property_getter(CallNode decorated, FunctionObject getter) {
-  decorated.getFunction().refersTo(thePropertyType()) and
-  decorated.getArg(0).refersTo(getter)
+  decorated.getFunction().(ControlFlowNodeWithPointsTo).refersTo(thePropertyType()) and
+  decorated.getArg(0).(ControlFlowNodeWithPointsTo).refersTo(getter)
 }
 
 private predicate property_setter(CallNode decorated, FunctionObject setter) {
   property_getter(decorated, _) and
   exists(CallNode setter_call, AttrNode prop_setter |
-    prop_setter.getObject("setter").refersTo(decorated)
+    prop_setter.getObject("setter").(ControlFlowNodeWithPointsTo).refersTo(decorated)
   |
-    setter_call.getArg(0).refersTo(setter) and
+    setter_call.getArg(0).(ControlFlowNodeWithPointsTo).refersTo(setter) and
     setter_call.getFunction() = prop_setter
   )
   or
-  decorated.getFunction().refersTo(thePropertyType()) and
-  decorated.getArg(1).refersTo(setter)
+  decorated.getFunction().(ControlFlowNodeWithPointsTo).refersTo(thePropertyType()) and
+  decorated.getArg(1).(ControlFlowNodeWithPointsTo).refersTo(setter)
 }
 
 private predicate property_deleter(CallNode decorated, FunctionObject deleter) {
   property_getter(decorated, _) and
   exists(CallNode deleter_call, AttrNode prop_deleter |
-    prop_deleter.getObject("deleter").refersTo(decorated)
+    prop_deleter.getObject("deleter").(ControlFlowNodeWithPointsTo).refersTo(decorated)
   |
-    deleter_call.getArg(0).refersTo(deleter) and
+    deleter_call.getArg(0).(ControlFlowNodeWithPointsTo).refersTo(deleter) and
     deleter_call.getFunction() = prop_deleter
   )
   or
-  decorated.getFunction().refersTo(thePropertyType()) and
-  decorated.getArg(2).refersTo(deleter)
+  decorated.getFunction().(ControlFlowNodeWithPointsTo).refersTo(thePropertyType()) and
+  decorated.getArg(2).(ControlFlowNodeWithPointsTo).refersTo(deleter)
 }
diff --git a/python/ql/lib/semmle/python/values/StringAttributes.qll b/python/ql/lib/semmle/python/values/StringAttributes.qll
index 792ee923227..e94540dbf20 100644
--- a/python/ql/lib/semmle/python/values/StringAttributes.qll
+++ b/python/ql/lib/semmle/python/values/StringAttributes.qll
@@ -1,6 +1,10 @@
 import python
+private import LegacyPointsTo
+private import semmle.python.types.Object
+private import semmle.python.types.ClassObject
+private import semmle.python.types.FunctionObject
 
-predicate string_attribute_all(ControlFlowNode n, string attr) {
+predicate string_attribute_all(ControlFlowNodeWithPointsTo n, string attr) {
   (n.getNode() instanceof Unicode or n.getNode() instanceof Bytes) and
   attr = "const"
   or
@@ -19,18 +23,27 @@ predicate tracked_object(ControlFlowNode obj, string attr) {
   tracked_object_any(obj, attr)
 }
 
-predicate open_file(Object obj) { obj.(CallNode).getFunction().refersTo(Object::builtin("open")) }
+predicate open_file(Object obj) {
+  obj.(CallNode).getFunction().(ControlFlowNodeWithPointsTo).refersTo(Object::builtin("open"))
+}
 
-predicate string_attribute_any(ControlFlowNode n, string attr) {
+predicate string_attribute_any(ControlFlowNodeWithPointsTo n, string attr) {
   attr = "user-input" and
-  exists(Object input | n.(CallNode).getFunction().refersTo(input) |
+  exists(Object input | n.(CallNode).getFunction().(ControlFlowNodeWithPointsTo).refersTo(input) |
     if major_version() = 2
     then input = Object::builtin("raw_input")
     else input = Object::builtin("input")
   )
   or
   attr = "file-input" and
-  exists(Object fd | n.(CallNode).getFunction().(AttrNode).getObject("read").refersTo(fd) |
+  exists(Object fd |
+    n.(CallNode)
+        .getFunction()
+        .(AttrNode)
+        .getObject("read")
+        .(ControlFlowNodeWithPointsTo)
+        .refersTo(fd)
+  |
     open_file(fd)
   )
   or
@@ -65,7 +78,7 @@ ControlFlowNode sequence_for_iterator(ControlFlowNode f) {
 }
 
 pragma[noinline]
-private predicate tracking_step(ControlFlowNode src, ControlFlowNode dest) {
+private predicate tracking_step(ControlFlowNode src, ControlFlowNodeWithPointsTo dest) {
   src = dest.(BinaryExprNode).getAnOperand()
   or
   src = dest.(UnaryExprNode).getOperand()
diff --git a/python/ql/lib/semmlecode.python.dbscheme b/python/ql/lib/semmlecode.python.dbscheme
index 5af903da088..acf8d3b08ae 100644
--- a/python/ql/lib/semmlecode.python.dbscheme
+++ b/python/ql/lib/semmlecode.python.dbscheme
@@ -47,6 +47,22 @@ externalData(
   string value : string ref
 );
 
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit the tuple `databaseMetadata("isOverlay", "true")`,
+ * along with an `overlayChangedFiles` tuple for each new/modified/deleted file,
+ * when building an overlay database, and these can be used by the discard predicates.
+ */
+databaseMetadata(
+  string metadataKey : string ref,
+  string value : string ref
+);
+
+overlayChangedFiles(
+  string path : string ref
+);
+
 /*- DEPRECATED: Snapshot date -*/
 
 snapshotDate(unique date snapshotDate : date ref);
@@ -1234,3 +1250,12 @@ py_decorated_object(int object : @py_object ref,
 @py_object = @py_cobject | @py_flow_node;
 
 @py_source_element = @py_ast_node | @container;
+
+/** The union of all Python database entities */
+@top =
+  @py_source_element | @py_object | @py_base_var | @location | @py_line | @py_comment |
+      @py_expr_parent | @py_expr_context |
+      @py_operator | @py_boolop | @py_cmpop | @py_unaryop |
+      @py_cmpop_list | @py_alias_list | @py_StringPart_list | @py_comprehension_list | @py_dict_item_list | @py_pattern_list | @py_stmt_list | @py_str_list | @py_type_parameter_list |
+      @externalDefect | @externalMetric | @externalDataElement | @duplication_or_similarity | @svnentry |
+      @xmllocatable | @yaml_locatable;
diff --git a/python/ql/lib/semmlecode.python.dbscheme.stats b/python/ql/lib/semmlecode.python.dbscheme.stats
index 289c0487066..a4060cf9b8e 100644
--- a/python/ql/lib/semmlecode.python.dbscheme.stats
+++ b/python/ql/lib/semmlecode.python.dbscheme.stats
@@ -1269,6 +1269,53 @@
 </dependencies>
 </relation>
 <relation>
+<name>databaseMetadata</name>
+<cardinality>1</cardinality>
+<columnsizes>
+<e>
+<k>metadataKey</k>
+<v>1</v>
+</e>
+<e>
+<k>value</k>
+<v>1</v>
+</e>
+</columnsizes>
+<dependencies>
+<dep>
+<src>metadataKey</src>
+<trg>value</trg>
+<val>
+<hist>
+<budget>12</budget>
+<bs/>
+</hist>
+</val>
+</dep>
+<dep>
+<src>value</src>
+<trg>metadataKey</trg>
+<val>
+<hist>
+<budget>12</budget>
+<bs/>
+</hist>
+</val>
+</dep>
+</dependencies>
+</relation>
+<relation>
+<name>overlayChangedFiles</name>
+<cardinality>50</cardinality>
+<columnsizes>
+<e>
+<k>path</k>
+<v>50</v>
+</e>
+</columnsizes>
+<dependencies/>
+</relation>
+<relation>
 <name>snapshotDate</name>
 <cardinality>2</cardinality>
 <columnsizes>
diff --git a/python/ql/lib/upgrades/5af903da088e3746aa283700a43a779302453523/old.dbscheme b/python/ql/lib/upgrades/5af903da088e3746aa283700a43a779302453523/old.dbscheme
new file mode 100644
index 00000000000..5af903da088
--- /dev/null
+++ b/python/ql/lib/upgrades/5af903da088e3746aa283700a43a779302453523/old.dbscheme
@@ -0,0 +1,1236 @@
+/*
+ *      This dbscheme is auto-generated by 'semmle/dbscheme_gen.py'.
+ *      WARNING: Any modifications to this file will be lost.
+ *      Relations can be changed by modifying master.py or
+ *      by adding rules to dbscheme.template
+ */
+
+/* This is a dummy line to alter the dbscheme, so we can make a database upgrade
+ * without actually changing any of the dbscheme predicates. It contains a date
+ * to allow for such updates in the future as well.
+ *
+ * 2020-07-02
+ *
+ * DO NOT remove this comment carelessly, since it can revert the dbscheme back to a
+ * previously seen state (matching a previously seen SHA), which would make the upgrade
+ * mechanism not work properly.
+ */
+
+/*- DEPRECATED: External defects and metrics -*/
+
+externalDefects(
+  unique int id : @externalDefect,
+  varchar(900) queryPath : string ref,
+  int location : @location ref,
+  varchar(900) message : string ref,
+  float severity : float ref
+);
+
+externalMetrics(
+  unique int id : @externalMetric,
+  varchar(900) queryPath : string ref,
+  int location : @location ref,
+  float value : float ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- DEPRECATED: Snapshot date -*/
+
+snapshotDate(unique date snapshotDate : date ref);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- DEPRECATED: Duplicate code -*/
+
+duplicateCode(
+  unique int id : @duplication,
+  string relativePath : string ref,
+  int equivClass : int ref
+);
+
+similarCode(
+  unique int id : @similarity,
+  string relativePath : string ref,
+  int equivClass : int ref
+);
+
+@duplication_or_similarity = @duplication | @similarity
+
+tokens(
+  int id : @duplication_or_similarity ref,
+  int offset : int ref,
+  int beginLine : int ref,
+  int beginColumn : int ref,
+  int endLine : int ref,
+  int endColumn : int ref
+);
+
+/*- DEPRECATED: Version control data -*/
+
+svnentries(
+  unique int id : @svnentry,
+  string revision : string ref,
+  string author : string ref,
+  date revisionDate : date ref,
+  int changeSize : int ref
+)
+
+svnaffectedfiles(
+  int id : @svnentry ref,
+  int file : @file ref,
+  string action : string ref
+)
+
+svnentrymsg(
+  unique int id : @svnentry ref,
+  string message : string ref
+)
+
+svnchurn(
+  int commit : @svnentry ref,
+  int file : @file ref,
+  int addedLines : int ref,
+  int deletedLines : int ref
+)
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error;
+
+/*- Python dbscheme -*/
+
+/*
+ * Line metrics
+ */
+py_codelines(int id : @py_scope ref,
+             int count : int ref);
+
+py_commentlines(int id : @py_scope ref,
+                int count : int ref);
+
+py_docstringlines(int id : @py_scope ref,
+                int count : int ref);
+
+py_alllines(int id : @py_scope ref,
+                int count : int ref);
+
+/****************************
+        Python dbscheme
+****************************/
+
+@sourceline = @file | @py_Module | @xmllocatable;
+
+@location = @location_ast | @location_default ;
+
+locations_ast(unique int id: @location_ast,
+          int module: @py_Module ref,
+          int beginLine: int ref,
+          int beginColumn: int ref,
+          int endLine: int ref,
+          int endColumn: int ref);
+
+file_contents(unique int file: @file ref, string contents: string ref);
+
+py_module_path(int module: @py_Module ref, int file: @container ref);
+
+variable(unique int id : @py_variable,
+         int scope : @py_scope ref,
+         varchar(1) name : string ref);
+
+py_line_lengths(unique int id : @py_line,
+                int file: @py_Module ref,
+                int line : int ref,
+                int length : int ref);
+
+py_extracted_version(int module : @py_Module ref,
+                     varchar(1) version : string ref);
+
+/* AUTO GENERATED PART STARTS HERE */
+
+
+/* <Field> AnnAssign.location = 0, location */
+/* <Field> AnnAssign.value = 1, expr */
+/* <Field> AnnAssign.annotation = 2, expr */
+/* <Field> AnnAssign.target = 3, expr */
+
+/* <Field> Assert.location = 0, location */
+/* <Field> Assert.test = 1, expr */
+/* <Field> Assert.msg = 2, expr */
+
+/* <Field> Assign.location = 0, location */
+/* <Field> Assign.value = 1, expr */
+/* <Field> Assign.targets = 2, expr_list */
+
+/* <Field> AssignExpr.location = 0, location */
+/* <Field> AssignExpr.parenthesised = 1, bool */
+/* <Field> AssignExpr.value = 2, expr */
+/* <Field> AssignExpr.target = 3, expr */
+
+/* <Field> Attribute.location = 0, location */
+/* <Field> Attribute.parenthesised = 1, bool */
+/* <Field> Attribute.value = 2, expr */
+/* <Field> Attribute.attr = 3, str */
+/* <Field> Attribute.ctx = 4, expr_context */
+
+/* <Field> AugAssign.location = 0, location */
+/* <Field> AugAssign.operation = 1, BinOp */
+
+/* <Field> Await.location = 0, location */
+/* <Field> Await.parenthesised = 1, bool */
+/* <Field> Await.value = 2, expr */
+
+/* <Field> BinaryExpr.location = 0, location */
+/* <Field> BinaryExpr.parenthesised = 1, bool */
+/* <Field> BinaryExpr.left = 2, expr */
+/* <Field> BinaryExpr.op = 3, operator */
+/* <Field> BinaryExpr.right = 4, expr */
+/* <Parent> BinaryExpr = AugAssign  */
+
+/* <Field> BoolExpr.location = 0, location */
+/* <Field> BoolExpr.parenthesised = 1, bool */
+/* <Field> BoolExpr.op = 2, boolop */
+/* <Field> BoolExpr.values = 3, expr_list */
+
+/* <Field> Break.location = 0, location */
+
+/* <Field> Bytes.location = 0, location */
+/* <Field> Bytes.parenthesised = 1, bool */
+/* <Field> Bytes.s = 2, bytes */
+/* <Field> Bytes.prefix = 3, bytes */
+/* <Field> Bytes.implicitly_concatenated_parts = 4, StringPart_list */
+
+/* <Field> Call.location = 0, location */
+/* <Field> Call.parenthesised = 1, bool */
+/* <Field> Call.func = 2, expr */
+/* <Field> Call.positional_args = 3, expr_list */
+/* <Field> Call.named_args = 4, dict_item_list */
+
+/* <Field> Case.location = 0, location */
+/* <Field> Case.pattern = 1, pattern */
+/* <Field> Case.guard = 2, expr */
+/* <Field> Case.body = 3, stmt_list */
+
+/* <Field> Class.name = 0, str */
+/* <Field> Class.body = 1, stmt_list */
+/* <Parent> Class = ClassExpr  */
+
+/* <Field> ClassExpr.location = 0, location */
+/* <Field> ClassExpr.parenthesised = 1, bool */
+/* <Field> ClassExpr.name = 2, str */
+/* <Field> ClassExpr.bases = 3, expr_list */
+/* <Field> ClassExpr.keywords = 4, dict_item_list */
+/* <Field> ClassExpr.inner_scope = 5, Class */
+/* <Field> ClassExpr.type_parameters = 6, type_parameter_list */
+
+/* <Field> Compare.location = 0, location */
+/* <Field> Compare.parenthesised = 1, bool */
+/* <Field> Compare.left = 2, expr */
+/* <Field> Compare.ops = 3, cmpop_list */
+/* <Field> Compare.comparators = 4, expr_list */
+
+/* <Field> Continue.location = 0, location */
+
+/* <Field> Delete.location = 0, location */
+/* <Field> Delete.targets = 1, expr_list */
+
+/* <Field> Dict.location = 0, location */
+/* <Field> Dict.parenthesised = 1, bool */
+/* <Field> Dict.items = 2, dict_item_list */
+
+/* <Field> DictComp.location = 0, location */
+/* <Field> DictComp.parenthesised = 1, bool */
+/* <Field> DictComp.function = 2, Function */
+/* <Field> DictComp.iterable = 3, expr */
+
+/* <Field> DictUnpacking.location = 0, location */
+/* <Field> DictUnpacking.value = 1, expr */
+
+/* <Field> Ellipsis.location = 0, location */
+/* <Field> Ellipsis.parenthesised = 1, bool */
+
+/* <Field> ExceptGroupStmt.location = 0, location */
+/* <Field> ExceptGroupStmt.type = 1, expr */
+/* <Field> ExceptGroupStmt.name = 2, expr */
+/* <Field> ExceptGroupStmt.body = 3, stmt_list */
+
+/* <Field> ExceptStmt.location = 0, location */
+/* <Field> ExceptStmt.type = 1, expr */
+/* <Field> ExceptStmt.name = 2, expr */
+/* <Field> ExceptStmt.body = 3, stmt_list */
+
+/* <Field> Exec.location = 0, location */
+/* <Field> Exec.body = 1, expr */
+/* <Field> Exec.globals = 2, expr */
+/* <Field> Exec.locals = 3, expr */
+
+/* <Field> ExprStmt.location = 0, location */
+/* <Field> ExprStmt.value = 1, expr */
+
+/* <Field> Filter.location = 0, location */
+/* <Field> Filter.parenthesised = 1, bool */
+/* <Field> Filter.value = 2, expr */
+/* <Field> Filter.filter = 3, expr */
+
+/* <Field> For.location = 0, location */
+/* <Field> For.target = 1, expr */
+/* <Field> For.iter = 2, expr */
+/* <Field> For.body = 3, stmt_list */
+/* <Field> For.orelse = 4, stmt_list */
+/* <Field> For.is_async = 5, bool */
+
+/* <Field> FormattedValue.location = 0, location */
+/* <Field> FormattedValue.parenthesised = 1, bool */
+/* <Field> FormattedValue.value = 2, expr */
+/* <Field> FormattedValue.conversion = 3, str */
+/* <Field> FormattedValue.format_spec = 4, JoinedStr */
+
+/* <Field> Function.name = 0, str */
+/* <Field> Function.args = 1, parameter_list */
+/* <Field> Function.vararg = 2, expr */
+/* <Field> Function.kwonlyargs = 3, expr_list */
+/* <Field> Function.kwarg = 4, expr */
+/* <Field> Function.body = 5, stmt_list */
+/* <Field> Function.is_async = 6, bool */
+/* <Field> Function.type_parameters = 7, type_parameter_list */
+/* <Parent> Function = FunctionParent  */
+
+/* <Field> FunctionExpr.location = 0, location */
+/* <Field> FunctionExpr.parenthesised = 1, bool */
+/* <Field> FunctionExpr.name = 2, str */
+/* <Field> FunctionExpr.args = 3, arguments */
+/* <Field> FunctionExpr.returns = 4, expr */
+/* <Field> FunctionExpr.inner_scope = 5, Function */
+
+/* <Field> GeneratorExp.location = 0, location */
+/* <Field> GeneratorExp.parenthesised = 1, bool */
+/* <Field> GeneratorExp.function = 2, Function */
+/* <Field> GeneratorExp.iterable = 3, expr */
+
+/* <Field> Global.location = 0, location */
+/* <Field> Global.names = 1, str_list */
+
+/* <Field> Guard.location = 0, location */
+/* <Field> Guard.parenthesised = 1, bool */
+/* <Field> Guard.test = 2, expr */
+
+/* <Field> If.location = 0, location */
+/* <Field> If.test = 1, expr */
+/* <Field> If.body = 2, stmt_list */
+/* <Field> If.orelse = 3, stmt_list */
+
+/* <Field> IfExp.location = 0, location */
+/* <Field> IfExp.parenthesised = 1, bool */
+/* <Field> IfExp.test = 2, expr */
+/* <Field> IfExp.body = 3, expr */
+/* <Field> IfExp.orelse = 4, expr */
+
+/* <Field> Import.location = 0, location */
+/* <Field> Import.names = 1, alias_list */
+
+/* <Field> ImportExpr.location = 0, location */
+/* <Field> ImportExpr.parenthesised = 1, bool */
+/* <Field> ImportExpr.level = 2, int */
+/* <Field> ImportExpr.name = 3, str */
+/* <Field> ImportExpr.top = 4, bool */
+
+/* <Field> ImportStar.location = 0, location */
+/* <Field> ImportStar.module = 1, expr */
+
+/* <Field> ImportMember.location = 0, location */
+/* <Field> ImportMember.parenthesised = 1, bool */
+/* <Field> ImportMember.module = 2, expr */
+/* <Field> ImportMember.name = 3, str */
+
+/* <Field> Fstring.location = 0, location */
+/* <Field> Fstring.parenthesised = 1, bool */
+/* <Field> Fstring.values = 2, expr_list */
+/* <Parent> Fstring = FormattedValue  */
+
+/* <Field> KeyValuePair.location = 0, location */
+/* <Field> KeyValuePair.value = 1, expr */
+/* <Field> KeyValuePair.key = 2, expr */
+
+/* <Field> Lambda.location = 0, location */
+/* <Field> Lambda.parenthesised = 1, bool */
+/* <Field> Lambda.args = 2, arguments */
+/* <Field> Lambda.inner_scope = 3, Function */
+
+/* <Field> List.location = 0, location */
+/* <Field> List.parenthesised = 1, bool */
+/* <Field> List.elts = 2, expr_list */
+/* <Field> List.ctx = 3, expr_context */
+
+/* <Field> ListComp.location = 0, location */
+/* <Field> ListComp.parenthesised = 1, bool */
+/* <Field> ListComp.function = 2, Function */
+/* <Field> ListComp.iterable = 3, expr */
+/* <Field> ListComp.generators = 4, comprehension_list */
+/* <Field> ListComp.elt = 5, expr */
+
+/* <Field> MatchStmt.location = 0, location */
+/* <Field> MatchStmt.subject = 1, expr */
+/* <Field> MatchStmt.cases = 2, stmt_list */
+
+/* <Field> MatchAsPattern.location = 0, location */
+/* <Field> MatchAsPattern.parenthesised = 1, bool */
+/* <Field> MatchAsPattern.pattern = 2, pattern */
+/* <Field> MatchAsPattern.alias = 3, expr */
+
+/* <Field> MatchCapturePattern.location = 0, location */
+/* <Field> MatchCapturePattern.parenthesised = 1, bool */
+/* <Field> MatchCapturePattern.variable = 2, expr */
+
+/* <Field> MatchClassPattern.location = 0, location */
+/* <Field> MatchClassPattern.parenthesised = 1, bool */
+/* <Field> MatchClassPattern.class = 2, expr */
+/* <Field> MatchClassPattern.class_name = 3, expr */
+/* <Field> MatchClassPattern.positional = 4, pattern_list */
+/* <Field> MatchClassPattern.keyword = 5, pattern_list */
+
+/* <Field> MatchDoubleStarPattern.location = 0, location */
+/* <Field> MatchDoubleStarPattern.parenthesised = 1, bool */
+/* <Field> MatchDoubleStarPattern.target = 2, pattern */
+
+/* <Field> MatchKeyValuePattern.location = 0, location */
+/* <Field> MatchKeyValuePattern.parenthesised = 1, bool */
+/* <Field> MatchKeyValuePattern.key = 2, pattern */
+/* <Field> MatchKeyValuePattern.value = 3, pattern */
+
+/* <Field> MatchKeywordPattern.location = 0, location */
+/* <Field> MatchKeywordPattern.parenthesised = 1, bool */
+/* <Field> MatchKeywordPattern.attribute = 2, expr */
+/* <Field> MatchKeywordPattern.value = 3, pattern */
+
+/* <Field> MatchLiteralPattern.location = 0, location */
+/* <Field> MatchLiteralPattern.parenthesised = 1, bool */
+/* <Field> MatchLiteralPattern.literal = 2, expr */
+
+/* <Field> MatchMappingPattern.location = 0, location */
+/* <Field> MatchMappingPattern.parenthesised = 1, bool */
+/* <Field> MatchMappingPattern.mappings = 2, pattern_list */
+
+/* <Field> MatchOrPattern.location = 0, location */
+/* <Field> MatchOrPattern.parenthesised = 1, bool */
+/* <Field> MatchOrPattern.patterns = 2, pattern_list */
+
+/* <Field> MatchSequencePattern.location = 0, location */
+/* <Field> MatchSequencePattern.parenthesised = 1, bool */
+/* <Field> MatchSequencePattern.patterns = 2, pattern_list */
+
+/* <Field> MatchStarPattern.location = 0, location */
+/* <Field> MatchStarPattern.parenthesised = 1, bool */
+/* <Field> MatchStarPattern.target = 2, pattern */
+
+/* <Field> MatchValuePattern.location = 0, location */
+/* <Field> MatchValuePattern.parenthesised = 1, bool */
+/* <Field> MatchValuePattern.value = 2, expr */
+
+/* <Field> MatchWildcardPattern.location = 0, location */
+/* <Field> MatchWildcardPattern.parenthesised = 1, bool */
+
+/* <Field> Module.name = 0, str */
+/* <Field> Module.hash = 1, str */
+/* <Field> Module.body = 2, stmt_list */
+/* <Field> Module.kind = 3, str */
+
+/* <Field> Name.location = 0, location */
+/* <Field> Name.parenthesised = 1, bool */
+/* <Field> Name.variable = 2, variable */
+/* <Field> Name.ctx = 3, expr_context */
+/* <Parent> Name = ParameterList  */
+
+/* <Field> Nonlocal.location = 0, location */
+/* <Field> Nonlocal.names = 1, str_list */
+
+/* <Field> Num.location = 0, location */
+/* <Field> Num.parenthesised = 1, bool */
+/* <Field> Num.n = 2, number */
+/* <Field> Num.text = 3, number */
+
+/* <Field> ParamSpec.location = 0, location */
+/* <Field> ParamSpec.name = 1, expr */
+/* <Field> ParamSpec.default = 2, expr */
+
+/* <Field> Pass.location = 0, location */
+
+/* <Field> PlaceHolder.location = 0, location */
+/* <Field> PlaceHolder.parenthesised = 1, bool */
+/* <Field> PlaceHolder.variable = 2, variable */
+/* <Field> PlaceHolder.ctx = 3, expr_context */
+
+/* <Field> Print.location = 0, location */
+/* <Field> Print.dest = 1, expr */
+/* <Field> Print.values = 2, expr_list */
+/* <Field> Print.nl = 3, bool */
+
+/* <Field> Raise.location = 0, location */
+/* <Field> Raise.exc = 1, expr */
+/* <Field> Raise.cause = 2, expr */
+/* <Field> Raise.type = 3, expr */
+/* <Field> Raise.inst = 4, expr */
+/* <Field> Raise.tback = 5, expr */
+
+/* <Field> Repr.location = 0, location */
+/* <Field> Repr.parenthesised = 1, bool */
+/* <Field> Repr.value = 2, expr */
+
+/* <Field> Return.location = 0, location */
+/* <Field> Return.value = 1, expr */
+
+/* <Field> Set.location = 0, location */
+/* <Field> Set.parenthesised = 1, bool */
+/* <Field> Set.elts = 2, expr_list */
+
+/* <Field> SetComp.location = 0, location */
+/* <Field> SetComp.parenthesised = 1, bool */
+/* <Field> SetComp.function = 2, Function */
+/* <Field> SetComp.iterable = 3, expr */
+
+/* <Field> Slice.location = 0, location */
+/* <Field> Slice.parenthesised = 1, bool */
+/* <Field> Slice.start = 2, expr */
+/* <Field> Slice.stop = 3, expr */
+/* <Field> Slice.step = 4, expr */
+
+/* <Field> SpecialOperation.location = 0, location */
+/* <Field> SpecialOperation.parenthesised = 1, bool */
+/* <Field> SpecialOperation.name = 2, str */
+/* <Field> SpecialOperation.arguments = 3, expr_list */
+
+/* <Field> Starred.location = 0, location */
+/* <Field> Starred.parenthesised = 1, bool */
+/* <Field> Starred.value = 2, expr */
+/* <Field> Starred.ctx = 3, expr_context */
+
+/* <Field> Str.location = 0, location */
+/* <Field> Str.parenthesised = 1, bool */
+/* <Field> Str.s = 2, str */
+/* <Field> Str.prefix = 3, str */
+/* <Field> Str.implicitly_concatenated_parts = 4, StringPart_list */
+
+/* <Field> StringPart.text = 0, str */
+/* <Field> StringPart.location = 1, location */
+/* <Parent> StringPart = StringPartList  */
+/* <Parent> StringPartList = BytesOrStr  */
+
+/* <Field> Subscript.location = 0, location */
+/* <Field> Subscript.parenthesised = 1, bool */
+/* <Field> Subscript.value = 2, expr */
+/* <Field> Subscript.index = 3, expr */
+/* <Field> Subscript.ctx = 4, expr_context */
+
+/* <Field> TemplateDottedNotation.location = 0, location */
+/* <Field> TemplateDottedNotation.parenthesised = 1, bool */
+/* <Field> TemplateDottedNotation.value = 2, expr */
+/* <Field> TemplateDottedNotation.attr = 3, str */
+/* <Field> TemplateDottedNotation.ctx = 4, expr_context */
+
+/* <Field> TemplateWrite.location = 0, location */
+/* <Field> TemplateWrite.value = 1, expr */
+
+/* <Field> Try.location = 0, location */
+/* <Field> Try.body = 1, stmt_list */
+/* <Field> Try.orelse = 2, stmt_list */
+/* <Field> Try.handlers = 3, stmt_list */
+/* <Field> Try.finalbody = 4, stmt_list */
+
+/* <Field> Tuple.location = 0, location */
+/* <Field> Tuple.parenthesised = 1, bool */
+/* <Field> Tuple.elts = 2, expr_list */
+/* <Field> Tuple.ctx = 3, expr_context */
+/* <Parent> Tuple = ParameterList  */
+
+/* <Field> TypeAlias.location = 0, location */
+/* <Field> TypeAlias.name = 1, expr */
+/* <Field> TypeAlias.type_parameters = 2, type_parameter_list */
+/* <Field> TypeAlias.value = 3, expr */
+
+/* <Field> TypeVar.location = 0, location */
+/* <Field> TypeVar.name = 1, expr */
+/* <Field> TypeVar.bound = 2, expr */
+/* <Field> TypeVar.default = 3, expr */
+
+/* <Field> TypeVarTuple.location = 0, location */
+/* <Field> TypeVarTuple.name = 1, expr */
+/* <Field> TypeVarTuple.default = 2, expr */
+
+/* <Field> UnaryExpr.location = 0, location */
+/* <Field> UnaryExpr.parenthesised = 1, bool */
+/* <Field> UnaryExpr.op = 2, unaryop */
+/* <Field> UnaryExpr.operand = 3, expr */
+
+/* <Field> While.location = 0, location */
+/* <Field> While.test = 1, expr */
+/* <Field> While.body = 2, stmt_list */
+/* <Field> While.orelse = 3, stmt_list */
+
+/* <Field> With.location = 0, location */
+/* <Field> With.context_expr = 1, expr */
+/* <Field> With.optional_vars = 2, expr */
+/* <Field> With.body = 3, stmt_list */
+/* <Field> With.is_async = 4, bool */
+
+/* <Field> Yield.location = 0, location */
+/* <Field> Yield.parenthesised = 1, bool */
+/* <Field> Yield.value = 2, expr */
+
+/* <Field> YieldFrom.location = 0, location */
+/* <Field> YieldFrom.parenthesised = 1, bool */
+/* <Field> YieldFrom.value = 2, expr */
+
+/* <Field> Alias.value = 0, expr */
+/* <Field> Alias.asname = 1, expr */
+/* <Parent> Alias = AliasList  */
+/* <Parent> AliasList = Import  */
+
+/* <Field> Arguments.kw_defaults = 0, expr_list */
+/* <Field> Arguments.defaults = 1, expr_list */
+/* <Field> Arguments.annotations = 2, expr_list */
+/* <Field> Arguments.varargannotation = 3, expr */
+/* <Field> Arguments.kwargannotation = 4, expr */
+/* <Field> Arguments.kw_annotations = 5, expr_list */
+/* <Parent> Arguments = ArgumentsParent  */
+/* <Parent> boolean = BoolParent  */
+/* <Parent> Boolop = BoolExpr  */
+/* <Parent> string = Bytes  */
+/* <Parent> Cmpop = CmpopList  */
+/* <Parent> CmpopList = Compare  */
+
+/* <Field> Comprehension.location = 0, location */
+/* <Field> Comprehension.iter = 1, expr */
+/* <Field> Comprehension.target = 2, expr */
+/* <Field> Comprehension.ifs = 3, expr_list */
+/* <Parent> Comprehension = ComprehensionList  */
+/* <Parent> ComprehensionList = ListComp  */
+/* <Parent> DictItem = DictItemList  */
+/* <Parent> DictItemList = DictItemListParent  */
+
+/* <Field> Expr.location = 0, location */
+/* <Field> Expr.parenthesised = 1, bool */
+/* <Parent> Expr = ExprParent  */
+/* <Parent> ExprContext = ExprContextParent  */
+/* <Parent> ExprList = ExprListParent  */
+/* <Parent> int = ImportExpr  */
+
+/* <Field> Keyword.location = 0, location */
+/* <Field> Keyword.value = 1, expr */
+/* <Field> Keyword.arg = 2, str */
+/* <Parent> Location = LocationParent  */
+/* <Parent> string = Num  */
+/* <Parent> Operator = BinaryExpr  */
+/* <Parent> ParameterList = Function  */
+
+/* <Field> Pattern.location = 0, location */
+/* <Field> Pattern.parenthesised = 1, bool */
+/* <Parent> Pattern = PatternParent  */
+/* <Parent> PatternList = PatternListParent  */
+
+/* <Field> Stmt.location = 0, location */
+/* <Parent> Stmt = StmtList  */
+/* <Parent> StmtList = StmtListParent  */
+/* <Parent> string = StrParent  */
+/* <Parent> StringList = StrListParent  */
+
+/* <Field> TypeParameter.location = 0, location */
+/* <Parent> TypeParameter = TypeParameterList  */
+/* <Parent> TypeParameterList = TypeParameterListParent  */
+/* <Parent> Unaryop = UnaryExpr  */
+/* <Parent> Variable = VariableParent  */
+py_Classes(unique int id : @py_Class,
+    unique int parent : @py_ClassExpr ref);
+
+py_Functions(unique int id : @py_Function,
+    unique int parent : @py_Function_parent ref);
+
+py_Modules(unique int id : @py_Module);
+
+py_StringParts(unique int id : @py_StringPart,
+    int parent : @py_StringPart_list ref,
+    int idx : int ref);
+
+py_StringPart_lists(unique int id : @py_StringPart_list,
+    unique int parent : @py_Bytes_or_Str ref);
+
+py_aliases(unique int id : @py_alias,
+    int parent : @py_alias_list ref,
+    int idx : int ref);
+
+py_alias_lists(unique int id : @py_alias_list,
+    unique int parent : @py_Import ref);
+
+py_arguments(unique int id : @py_arguments,
+    unique int parent : @py_arguments_parent ref);
+
+py_bools(int parent : @py_bool_parent ref,
+    int idx : int ref);
+
+py_boolops(unique int id : @py_boolop,
+    int kind: int ref,
+    unique int parent : @py_BoolExpr ref);
+
+py_bytes(varchar(1) id : string ref,
+    int parent : @py_Bytes ref,
+    int idx : int ref);
+
+py_cmpops(unique int id : @py_cmpop,
+    int kind: int ref,
+    int parent : @py_cmpop_list ref,
+    int idx : int ref);
+
+py_cmpop_lists(unique int id : @py_cmpop_list,
+    unique int parent : @py_Compare ref);
+
+py_comprehensions(unique int id : @py_comprehension,
+    int parent : @py_comprehension_list ref,
+    int idx : int ref);
+
+py_comprehension_lists(unique int id : @py_comprehension_list,
+    unique int parent : @py_ListComp ref);
+
+py_dict_items(unique int id : @py_dict_item,
+    int kind: int ref,
+    int parent : @py_dict_item_list ref,
+    int idx : int ref);
+
+py_dict_item_lists(unique int id : @py_dict_item_list,
+    unique int parent : @py_dict_item_list_parent ref);
+
+py_exprs(unique int id : @py_expr,
+    int kind: int ref,
+    int parent : @py_expr_parent ref,
+    int idx : int ref);
+
+py_expr_contexts(unique int id : @py_expr_context,
+    int kind: int ref,
+    unique int parent : @py_expr_context_parent ref);
+
+py_expr_lists(unique int id : @py_expr_list,
+    int parent : @py_expr_list_parent ref,
+    int idx : int ref);
+
+py_ints(int id : int ref,
+    unique int parent : @py_ImportExpr ref);
+
+py_locations(unique int id : @location ref,
+    unique int parent : @py_location_parent ref);
+
+py_numbers(varchar(1) id : string ref,
+    int parent : @py_Num ref,
+    int idx : int ref);
+
+py_operators(unique int id : @py_operator,
+    int kind: int ref,
+    unique int parent : @py_BinaryExpr ref);
+
+py_parameter_lists(unique int id : @py_parameter_list,
+    unique int parent : @py_Function ref);
+
+py_patterns(unique int id : @py_pattern,
+    int kind: int ref,
+    int parent : @py_pattern_parent ref,
+    int idx : int ref);
+
+py_pattern_lists(unique int id : @py_pattern_list,
+    int parent : @py_pattern_list_parent ref,
+    int idx : int ref);
+
+py_stmts(unique int id : @py_stmt,
+    int kind: int ref,
+    int parent : @py_stmt_list ref,
+    int idx : int ref);
+
+py_stmt_lists(unique int id : @py_stmt_list,
+    int parent : @py_stmt_list_parent ref,
+    int idx : int ref);
+
+py_strs(varchar(1) id : string ref,
+    int parent : @py_str_parent ref,
+    int idx : int ref);
+
+py_str_lists(unique int id : @py_str_list,
+    unique int parent : @py_str_list_parent ref);
+
+py_type_parameters(unique int id : @py_type_parameter,
+    int kind: int ref,
+    int parent : @py_type_parameter_list ref,
+    int idx : int ref);
+
+py_type_parameter_lists(unique int id : @py_type_parameter_list,
+    unique int parent : @py_type_parameter_list_parent ref);
+
+py_unaryops(unique int id : @py_unaryop,
+    int kind: int ref,
+    unique int parent : @py_UnaryExpr ref);
+
+py_variables(int id : @py_variable ref,
+    unique int parent : @py_variable_parent ref);
+
+case @py_boolop.kind of
+    0 = @py_And
+|   1 = @py_Or;
+
+case @py_cmpop.kind of
+    0 = @py_Eq
+|   1 = @py_Gt
+|   2 = @py_GtE
+|   3 = @py_In
+|   4 = @py_Is
+|   5 = @py_IsNot
+|   6 = @py_Lt
+|   7 = @py_LtE
+|   8 = @py_NotEq
+|   9 = @py_NotIn;
+
+case @py_dict_item.kind of
+    0 = @py_DictUnpacking
+|   1 = @py_KeyValuePair
+|   2 = @py_keyword;
+
+case @py_expr.kind of
+    0 = @py_Attribute
+|   1 = @py_BinaryExpr
+|   2 = @py_BoolExpr
+|   3 = @py_Bytes
+|   4 = @py_Call
+|   5 = @py_ClassExpr
+|   6 = @py_Compare
+|   7 = @py_Dict
+|   8 = @py_DictComp
+|   9 = @py_Ellipsis
+|   10 = @py_FunctionExpr
+|   11 = @py_GeneratorExp
+|   12 = @py_IfExp
+|   13 = @py_ImportExpr
+|   14 = @py_ImportMember
+|   15 = @py_Lambda
+|   16 = @py_List
+|   17 = @py_ListComp
+|   18 = @py_Guard
+|   19 = @py_Name
+|   20 = @py_Num
+|   21 = @py_Repr
+|   22 = @py_Set
+|   23 = @py_SetComp
+|   24 = @py_Slice
+|   25 = @py_Starred
+|   26 = @py_Str
+|   27 = @py_Subscript
+|   28 = @py_Tuple
+|   29 = @py_UnaryExpr
+|   30 = @py_Yield
+|   31 = @py_YieldFrom
+|   32 = @py_TemplateDottedNotation
+|   33 = @py_Filter
+|   34 = @py_PlaceHolder
+|   35 = @py_Await
+|   36 = @py_Fstring
+|   37 = @py_FormattedValue
+|   38 = @py_AssignExpr
+|   39 = @py_SpecialOperation;
+
+case @py_expr_context.kind of
+    0 = @py_AugLoad
+|   1 = @py_AugStore
+|   2 = @py_Del
+|   3 = @py_Load
+|   4 = @py_Param
+|   5 = @py_Store;
+
+case @py_operator.kind of
+    0 = @py_Add
+|   1 = @py_BitAnd
+|   2 = @py_BitOr
+|   3 = @py_BitXor
+|   4 = @py_Div
+|   5 = @py_FloorDiv
+|   6 = @py_LShift
+|   7 = @py_Mod
+|   8 = @py_Mult
+|   9 = @py_Pow
+|   10 = @py_RShift
+|   11 = @py_Sub
+|   12 = @py_MatMult;
+
+case @py_pattern.kind of
+    0 = @py_MatchAsPattern
+|   1 = @py_MatchOrPattern
+|   2 = @py_MatchLiteralPattern
+|   3 = @py_MatchCapturePattern
+|   4 = @py_MatchWildcardPattern
+|   5 = @py_MatchValuePattern
+|   6 = @py_MatchSequencePattern
+|   7 = @py_MatchStarPattern
+|   8 = @py_MatchMappingPattern
+|   9 = @py_MatchDoubleStarPattern
+|   10 = @py_MatchKeyValuePattern
+|   11 = @py_MatchClassPattern
+|   12 = @py_MatchKeywordPattern;
+
+case @py_stmt.kind of
+    0 = @py_Assert
+|   1 = @py_Assign
+|   2 = @py_AugAssign
+|   3 = @py_Break
+|   4 = @py_Continue
+|   5 = @py_Delete
+|   6 = @py_ExceptStmt
+|   7 = @py_ExceptGroupStmt
+|   8 = @py_Exec
+|   9 = @py_Expr_stmt
+|   10 = @py_For
+|   11 = @py_Global
+|   12 = @py_If
+|   13 = @py_Import
+|   14 = @py_ImportStar
+|   15 = @py_MatchStmt
+|   16 = @py_Case
+|   17 = @py_Nonlocal
+|   18 = @py_Pass
+|   19 = @py_Print
+|   20 = @py_Raise
+|   21 = @py_Return
+|   22 = @py_Try
+|   23 = @py_While
+|   24 = @py_With
+|   25 = @py_TemplateWrite
+|   26 = @py_AnnAssign
+|   27 = @py_TypeAlias;
+
+case @py_type_parameter.kind of
+    0 = @py_ParamSpec
+|   1 = @py_TypeVar
+|   2 = @py_TypeVarTuple;
+
+case @py_unaryop.kind of
+    0 = @py_Invert
+|   1 = @py_Not
+|   2 = @py_UAdd
+|   3 = @py_USub;
+
+@py_Bytes_or_Str = @py_Bytes | @py_Str;
+
+@py_Function_parent = @py_DictComp | @py_FunctionExpr | @py_GeneratorExp | @py_Lambda | @py_ListComp | @py_SetComp;
+
+@py_arguments_parent = @py_FunctionExpr | @py_Lambda;
+
+@py_ast_node = @py_Class | @py_Function | @py_Module | @py_StringPart | @py_comprehension | @py_dict_item | @py_expr | @py_pattern | @py_stmt | @py_type_parameter;
+
+@py_bool_parent = @py_For | @py_Function | @py_Print | @py_With | @py_expr | @py_pattern;
+
+@py_dict_item_list_parent = @py_Call | @py_ClassExpr | @py_Dict;
+
+@py_expr_context_parent = @py_Attribute | @py_List | @py_Name | @py_PlaceHolder | @py_Starred | @py_Subscript | @py_TemplateDottedNotation | @py_Tuple;
+
+@py_expr_list_parent = @py_Assign | @py_BoolExpr | @py_Call | @py_ClassExpr | @py_Compare | @py_Delete | @py_Fstring | @py_Function | @py_List | @py_Print | @py_Set | @py_SpecialOperation | @py_Tuple | @py_arguments | @py_comprehension;
+
+@py_expr_or_stmt = @py_expr | @py_stmt;
+
+@py_expr_parent = @py_AnnAssign | @py_Assert | @py_Assign | @py_AssignExpr | @py_Attribute | @py_AugAssign | @py_Await | @py_BinaryExpr | @py_Call | @py_Case | @py_Compare | @py_DictComp | @py_DictUnpacking | @py_ExceptGroupStmt | @py_ExceptStmt | @py_Exec | @py_Expr_stmt | @py_Filter | @py_For | @py_FormattedValue | @py_Function | @py_FunctionExpr | @py_GeneratorExp | @py_Guard | @py_If | @py_IfExp | @py_ImportMember | @py_ImportStar | @py_KeyValuePair | @py_ListComp | @py_MatchAsPattern | @py_MatchCapturePattern | @py_MatchClassPattern | @py_MatchKeywordPattern | @py_MatchLiteralPattern | @py_MatchStmt | @py_MatchValuePattern | @py_ParamSpec | @py_Print | @py_Raise | @py_Repr | @py_Return | @py_SetComp | @py_Slice | @py_Starred | @py_Subscript | @py_TemplateDottedNotation | @py_TemplateWrite | @py_TypeAlias | @py_TypeVar | @py_TypeVarTuple | @py_UnaryExpr | @py_While | @py_With | @py_Yield | @py_YieldFrom | @py_alias | @py_arguments | @py_comprehension | @py_expr_list | @py_keyword | @py_parameter_list;
+
+@py_location_parent = @py_DictUnpacking | @py_KeyValuePair | @py_StringPart | @py_comprehension | @py_expr | @py_keyword | @py_pattern | @py_stmt | @py_type_parameter;
+
+@py_parameter = @py_Name | @py_Tuple;
+
+@py_pattern_list_parent = @py_MatchClassPattern | @py_MatchMappingPattern | @py_MatchOrPattern | @py_MatchSequencePattern;
+
+@py_pattern_parent = @py_Case | @py_MatchAsPattern | @py_MatchDoubleStarPattern | @py_MatchKeyValuePattern | @py_MatchKeywordPattern | @py_MatchStarPattern | @py_pattern_list;
+
+@py_scope = @py_Class | @py_Function | @py_Module;
+
+@py_stmt_list_parent = @py_Case | @py_Class | @py_ExceptGroupStmt | @py_ExceptStmt | @py_For | @py_Function | @py_If | @py_MatchStmt | @py_Module | @py_Try | @py_While | @py_With;
+
+@py_str_list_parent = @py_Global | @py_Nonlocal;
+
+@py_str_parent = @py_Attribute | @py_Class | @py_ClassExpr | @py_FormattedValue | @py_Function | @py_FunctionExpr | @py_ImportExpr | @py_ImportMember | @py_Module | @py_SpecialOperation | @py_Str | @py_StringPart | @py_TemplateDottedNotation | @py_keyword | @py_str_list;
+
+@py_type_parameter_list_parent = @py_ClassExpr | @py_Function | @py_TypeAlias;
+
+@py_variable_parent = @py_Name | @py_PlaceHolder;
+
+
+/*
+ * End of auto-generated part
+ */
+
+
+
+/* Map relative names to absolute names for imports */
+py_absolute_names(int module : @py_Module ref,
+                  varchar(1) relname : string ref,
+                  varchar(1) absname : string ref);
+
+py_exports(int id : @py_Module ref,
+           varchar(1) name : string ref);
+
+/* Successor information */
+py_successors(int predecessor : @py_flow_node ref,
+              int successor : @py_flow_node ref);
+
+py_true_successors(int predecessor : @py_flow_node ref,
+              int successor : @py_flow_node ref);
+
+py_exception_successors(int predecessor : @py_flow_node ref,
+              int successor : @py_flow_node ref);
+
+py_false_successors(int predecessor : @py_flow_node ref,
+              int successor : @py_flow_node ref);
+
+py_flow_bb_node(unique int flownode : @py_flow_node,
+             int realnode : @py_ast_node ref,
+             int basicblock : @py_flow_node ref,
+             int index : int ref);
+
+py_scope_flow(int flow : @py_flow_node ref,
+              int scope : @py_scope ref,
+              int kind : int ref);
+
+py_idoms(unique int node : @py_flow_node ref,
+         int immediate_dominator : @py_flow_node ref);
+
+py_ssa_phi(int phi : @py_ssa_var ref,
+           int arg: @py_ssa_var ref);
+
+py_ssa_var(unique int id : @py_ssa_var,
+            int var : @py_variable ref);
+
+py_ssa_use(int node: @py_flow_node ref,
+           int var : @py_ssa_var ref);
+
+py_ssa_defn(unique int id : @py_ssa_var ref,
+                  int node: @py_flow_node ref);
+
+@py_base_var = @py_variable | @py_ssa_var;
+
+py_scopes(unique int node : @py_expr_or_stmt ref,
+         int scope : @py_scope ref);
+
+py_scope_location(unique int id : @location ref,
+                   unique int scope : @py_scope ref);
+
+py_flags_versioned(varchar(1) name : string ref,
+                   varchar(1) value : string ref,
+                   varchar(1) version : string ref);
+
+py_syntax_error_versioned(unique int id : @location ref,
+                varchar(1) message : string ref,
+                varchar(1) version : string ref);
+
+py_comments(unique int id : @py_comment,
+           varchar(1) text : string ref,
+           unique int location : @location ref);
+
+/* Type information support */
+
+py_cobjects(unique int obj : @py_cobject);
+
+py_cobjecttypes(unique int obj : @py_cobject ref,
+                int typeof : @py_cobject ref);
+
+py_cobjectnames(unique int obj : @py_cobject ref,
+                varchar(1) name : string ref);
+
+/* Kind should be 0 for introspection, > 0 from source, as follows:
+   1 from C extension source
+ */
+py_cobject_sources(int obj : @py_cobject ref,
+                  int kind : int ref);
+
+py_cmembers_versioned(int object : @py_cobject ref,
+                      varchar(1) name : string ref,
+                      int member : @py_cobject ref,
+                      varchar(1) version : string ref);
+
+py_citems(int object : @py_cobject ref,
+            int index : int ref,
+            int member : @py_cobject ref);
+
+ext_argtype(int funcid : @py_object ref,
+            int arg : int ref,
+            int typeid : @py_object ref);
+
+ext_rettype(int funcid : @py_object ref,
+            int typeid : @py_object ref);
+
+ext_proptype(int propid : @py_object ref,
+             int typeid : @py_object ref);
+
+ext_argreturn(int funcid : @py_object ref,
+              int arg : int ref);
+
+py_special_objects(unique int obj : @py_cobject ref,
+                   unique varchar(1) name : string ref);
+
+py_decorated_object(int object : @py_object ref,
+                    int level: int ref);
+
+@py_object = @py_cobject | @py_flow_node;
+
+@py_source_element = @py_ast_node | @container;
diff --git a/python/ql/lib/upgrades/5af903da088e3746aa283700a43a779302453523/semmlecode.python.dbscheme b/python/ql/lib/upgrades/5af903da088e3746aa283700a43a779302453523/semmlecode.python.dbscheme
new file mode 100644
index 00000000000..6a1f497168d
--- /dev/null
+++ b/python/ql/lib/upgrades/5af903da088e3746aa283700a43a779302453523/semmlecode.python.dbscheme
@@ -0,0 +1,1252 @@
+/*
+ *      This dbscheme is auto-generated by 'semmle/dbscheme_gen.py'.
+ *      WARNING: Any modifications to this file will be lost.
+ *      Relations can be changed by modifying master.py or
+ *      by adding rules to dbscheme.template
+ */
+
+/* This is a dummy line to alter the dbscheme, so we can make a database upgrade
+ * without actually changing any of the dbscheme predicates. It contains a date
+ * to allow for such updates in the future as well.
+ *
+ * 2020-07-02
+ *
+ * DO NOT remove this comment carelessly, since it can revert the dbscheme back to a
+ * previously seen state (matching a previously seen SHA), which would make the upgrade
+ * mechanism not work properly.
+ */
+
+/*- DEPRECATED: External defects and metrics -*/
+
+externalDefects(
+  unique int id : @externalDefect,
+  varchar(900) queryPath : string ref,
+  int location : @location ref,
+  varchar(900) message : string ref,
+  float severity : float ref
+);
+
+externalMetrics(
+  unique int id : @externalMetric,
+  varchar(900) queryPath : string ref,
+  int location : @location ref,
+  float value : float ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit the tuple `databaseMetadata("isOverlay", "true")`,
+ * along with an `overlayChangedFiles` tuple for each new/modified/deleted file,
+ * when building an overlay database, and these can be used by the discard predicates.
+ */
+databaseMetadata(
+  string metadataKey : string ref,
+  string value : string ref
+);
+
+overlayChangedFiles(
+  string path : string ref
+);
+
+/*- DEPRECATED: Snapshot date -*/
+
+snapshotDate(unique date snapshotDate : date ref);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- DEPRECATED: Duplicate code -*/
+
+duplicateCode(
+  unique int id : @duplication,
+  string relativePath : string ref,
+  int equivClass : int ref
+);
+
+similarCode(
+  unique int id : @similarity,
+  string relativePath : string ref,
+  int equivClass : int ref
+);
+
+@duplication_or_similarity = @duplication | @similarity
+
+tokens(
+  int id : @duplication_or_similarity ref,
+  int offset : int ref,
+  int beginLine : int ref,
+  int beginColumn : int ref,
+  int endLine : int ref,
+  int endColumn : int ref
+);
+
+/*- DEPRECATED: Version control data -*/
+
+svnentries(
+  unique int id : @svnentry,
+  string revision : string ref,
+  string author : string ref,
+  date revisionDate : date ref,
+  int changeSize : int ref
+)
+
+svnaffectedfiles(
+  int id : @svnentry ref,
+  int file : @file ref,
+  string action : string ref
+)
+
+svnentrymsg(
+  unique int id : @svnentry ref,
+  string message : string ref
+)
+
+svnchurn(
+  int commit : @svnentry ref,
+  int file : @file ref,
+  int addedLines : int ref,
+  int deletedLines : int ref
+)
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error;
+
+/*- Python dbscheme -*/
+
+/*
+ * Line metrics
+ */
+py_codelines(int id : @py_scope ref,
+             int count : int ref);
+
+py_commentlines(int id : @py_scope ref,
+                int count : int ref);
+
+py_docstringlines(int id : @py_scope ref,
+                int count : int ref);
+
+py_alllines(int id : @py_scope ref,
+                int count : int ref);
+
+/****************************
+        Python dbscheme
+****************************/
+
+@sourceline = @file | @py_Module | @xmllocatable;
+
+@location = @location_ast | @location_default ;
+
+locations_ast(unique int id: @location_ast,
+          int module: @py_Module ref,
+          int beginLine: int ref,
+          int beginColumn: int ref,
+          int endLine: int ref,
+          int endColumn: int ref);
+
+file_contents(unique int file: @file ref, string contents: string ref);
+
+py_module_path(int module: @py_Module ref, int file: @container ref);
+
+variable(unique int id : @py_variable,
+         int scope : @py_scope ref,
+         varchar(1) name : string ref);
+
+py_line_lengths(unique int id : @py_line,
+                int file: @py_Module ref,
+                int line : int ref,
+                int length : int ref);
+
+py_extracted_version(int module : @py_Module ref,
+                     varchar(1) version : string ref);
+
+/* AUTO GENERATED PART STARTS HERE */
+
+
+/* <Field> AnnAssign.location = 0, location */
+/* <Field> AnnAssign.value = 1, expr */
+/* <Field> AnnAssign.annotation = 2, expr */
+/* <Field> AnnAssign.target = 3, expr */
+
+/* <Field> Assert.location = 0, location */
+/* <Field> Assert.test = 1, expr */
+/* <Field> Assert.msg = 2, expr */
+
+/* <Field> Assign.location = 0, location */
+/* <Field> Assign.value = 1, expr */
+/* <Field> Assign.targets = 2, expr_list */
+
+/* <Field> AssignExpr.location = 0, location */
+/* <Field> AssignExpr.parenthesised = 1, bool */
+/* <Field> AssignExpr.value = 2, expr */
+/* <Field> AssignExpr.target = 3, expr */
+
+/* <Field> Attribute.location = 0, location */
+/* <Field> Attribute.parenthesised = 1, bool */
+/* <Field> Attribute.value = 2, expr */
+/* <Field> Attribute.attr = 3, str */
+/* <Field> Attribute.ctx = 4, expr_context */
+
+/* <Field> AugAssign.location = 0, location */
+/* <Field> AugAssign.operation = 1, BinOp */
+
+/* <Field> Await.location = 0, location */
+/* <Field> Await.parenthesised = 1, bool */
+/* <Field> Await.value = 2, expr */
+
+/* <Field> BinaryExpr.location = 0, location */
+/* <Field> BinaryExpr.parenthesised = 1, bool */
+/* <Field> BinaryExpr.left = 2, expr */
+/* <Field> BinaryExpr.op = 3, operator */
+/* <Field> BinaryExpr.right = 4, expr */
+/* <Parent> BinaryExpr = AugAssign  */
+
+/* <Field> BoolExpr.location = 0, location */
+/* <Field> BoolExpr.parenthesised = 1, bool */
+/* <Field> BoolExpr.op = 2, boolop */
+/* <Field> BoolExpr.values = 3, expr_list */
+
+/* <Field> Break.location = 0, location */
+
+/* <Field> Bytes.location = 0, location */
+/* <Field> Bytes.parenthesised = 1, bool */
+/* <Field> Bytes.s = 2, bytes */
+/* <Field> Bytes.prefix = 3, bytes */
+/* <Field> Bytes.implicitly_concatenated_parts = 4, StringPart_list */
+
+/* <Field> Call.location = 0, location */
+/* <Field> Call.parenthesised = 1, bool */
+/* <Field> Call.func = 2, expr */
+/* <Field> Call.positional_args = 3, expr_list */
+/* <Field> Call.named_args = 4, dict_item_list */
+
+/* <Field> Case.location = 0, location */
+/* <Field> Case.pattern = 1, pattern */
+/* <Field> Case.guard = 2, expr */
+/* <Field> Case.body = 3, stmt_list */
+
+/* <Field> Class.name = 0, str */
+/* <Field> Class.body = 1, stmt_list */
+/* <Parent> Class = ClassExpr  */
+
+/* <Field> ClassExpr.location = 0, location */
+/* <Field> ClassExpr.parenthesised = 1, bool */
+/* <Field> ClassExpr.name = 2, str */
+/* <Field> ClassExpr.bases = 3, expr_list */
+/* <Field> ClassExpr.keywords = 4, dict_item_list */
+/* <Field> ClassExpr.inner_scope = 5, Class */
+/* <Field> ClassExpr.type_parameters = 6, type_parameter_list */
+
+/* <Field> Compare.location = 0, location */
+/* <Field> Compare.parenthesised = 1, bool */
+/* <Field> Compare.left = 2, expr */
+/* <Field> Compare.ops = 3, cmpop_list */
+/* <Field> Compare.comparators = 4, expr_list */
+
+/* <Field> Continue.location = 0, location */
+
+/* <Field> Delete.location = 0, location */
+/* <Field> Delete.targets = 1, expr_list */
+
+/* <Field> Dict.location = 0, location */
+/* <Field> Dict.parenthesised = 1, bool */
+/* <Field> Dict.items = 2, dict_item_list */
+
+/* <Field> DictComp.location = 0, location */
+/* <Field> DictComp.parenthesised = 1, bool */
+/* <Field> DictComp.function = 2, Function */
+/* <Field> DictComp.iterable = 3, expr */
+
+/* <Field> DictUnpacking.location = 0, location */
+/* <Field> DictUnpacking.value = 1, expr */
+
+/* <Field> Ellipsis.location = 0, location */
+/* <Field> Ellipsis.parenthesised = 1, bool */
+
+/* <Field> ExceptGroupStmt.location = 0, location */
+/* <Field> ExceptGroupStmt.type = 1, expr */
+/* <Field> ExceptGroupStmt.name = 2, expr */
+/* <Field> ExceptGroupStmt.body = 3, stmt_list */
+
+/* <Field> ExceptStmt.location = 0, location */
+/* <Field> ExceptStmt.type = 1, expr */
+/* <Field> ExceptStmt.name = 2, expr */
+/* <Field> ExceptStmt.body = 3, stmt_list */
+
+/* <Field> Exec.location = 0, location */
+/* <Field> Exec.body = 1, expr */
+/* <Field> Exec.globals = 2, expr */
+/* <Field> Exec.locals = 3, expr */
+
+/* <Field> ExprStmt.location = 0, location */
+/* <Field> ExprStmt.value = 1, expr */
+
+/* <Field> Filter.location = 0, location */
+/* <Field> Filter.parenthesised = 1, bool */
+/* <Field> Filter.value = 2, expr */
+/* <Field> Filter.filter = 3, expr */
+
+/* <Field> For.location = 0, location */
+/* <Field> For.target = 1, expr */
+/* <Field> For.iter = 2, expr */
+/* <Field> For.body = 3, stmt_list */
+/* <Field> For.orelse = 4, stmt_list */
+/* <Field> For.is_async = 5, bool */
+
+/* <Field> FormattedValue.location = 0, location */
+/* <Field> FormattedValue.parenthesised = 1, bool */
+/* <Field> FormattedValue.value = 2, expr */
+/* <Field> FormattedValue.conversion = 3, str */
+/* <Field> FormattedValue.format_spec = 4, JoinedStr */
+
+/* <Field> Function.name = 0, str */
+/* <Field> Function.args = 1, parameter_list */
+/* <Field> Function.vararg = 2, expr */
+/* <Field> Function.kwonlyargs = 3, expr_list */
+/* <Field> Function.kwarg = 4, expr */
+/* <Field> Function.body = 5, stmt_list */
+/* <Field> Function.is_async = 6, bool */
+/* <Field> Function.type_parameters = 7, type_parameter_list */
+/* <Parent> Function = FunctionParent  */
+
+/* <Field> FunctionExpr.location = 0, location */
+/* <Field> FunctionExpr.parenthesised = 1, bool */
+/* <Field> FunctionExpr.name = 2, str */
+/* <Field> FunctionExpr.args = 3, arguments */
+/* <Field> FunctionExpr.returns = 4, expr */
+/* <Field> FunctionExpr.inner_scope = 5, Function */
+
+/* <Field> GeneratorExp.location = 0, location */
+/* <Field> GeneratorExp.parenthesised = 1, bool */
+/* <Field> GeneratorExp.function = 2, Function */
+/* <Field> GeneratorExp.iterable = 3, expr */
+
+/* <Field> Global.location = 0, location */
+/* <Field> Global.names = 1, str_list */
+
+/* <Field> Guard.location = 0, location */
+/* <Field> Guard.parenthesised = 1, bool */
+/* <Field> Guard.test = 2, expr */
+
+/* <Field> If.location = 0, location */
+/* <Field> If.test = 1, expr */
+/* <Field> If.body = 2, stmt_list */
+/* <Field> If.orelse = 3, stmt_list */
+
+/* <Field> IfExp.location = 0, location */
+/* <Field> IfExp.parenthesised = 1, bool */
+/* <Field> IfExp.test = 2, expr */
+/* <Field> IfExp.body = 3, expr */
+/* <Field> IfExp.orelse = 4, expr */
+
+/* <Field> Import.location = 0, location */
+/* <Field> Import.names = 1, alias_list */
+
+/* <Field> ImportExpr.location = 0, location */
+/* <Field> ImportExpr.parenthesised = 1, bool */
+/* <Field> ImportExpr.level = 2, int */
+/* <Field> ImportExpr.name = 3, str */
+/* <Field> ImportExpr.top = 4, bool */
+
+/* <Field> ImportStar.location = 0, location */
+/* <Field> ImportStar.module = 1, expr */
+
+/* <Field> ImportMember.location = 0, location */
+/* <Field> ImportMember.parenthesised = 1, bool */
+/* <Field> ImportMember.module = 2, expr */
+/* <Field> ImportMember.name = 3, str */
+
+/* <Field> Fstring.location = 0, location */
+/* <Field> Fstring.parenthesised = 1, bool */
+/* <Field> Fstring.values = 2, expr_list */
+/* <Parent> Fstring = FormattedValue  */
+
+/* <Field> KeyValuePair.location = 0, location */
+/* <Field> KeyValuePair.value = 1, expr */
+/* <Field> KeyValuePair.key = 2, expr */
+
+/* <Field> Lambda.location = 0, location */
+/* <Field> Lambda.parenthesised = 1, bool */
+/* <Field> Lambda.args = 2, arguments */
+/* <Field> Lambda.inner_scope = 3, Function */
+
+/* <Field> List.location = 0, location */
+/* <Field> List.parenthesised = 1, bool */
+/* <Field> List.elts = 2, expr_list */
+/* <Field> List.ctx = 3, expr_context */
+
+/* <Field> ListComp.location = 0, location */
+/* <Field> ListComp.parenthesised = 1, bool */
+/* <Field> ListComp.function = 2, Function */
+/* <Field> ListComp.iterable = 3, expr */
+/* <Field> ListComp.generators = 4, comprehension_list */
+/* <Field> ListComp.elt = 5, expr */
+
+/* <Field> MatchStmt.location = 0, location */
+/* <Field> MatchStmt.subject = 1, expr */
+/* <Field> MatchStmt.cases = 2, stmt_list */
+
+/* <Field> MatchAsPattern.location = 0, location */
+/* <Field> MatchAsPattern.parenthesised = 1, bool */
+/* <Field> MatchAsPattern.pattern = 2, pattern */
+/* <Field> MatchAsPattern.alias = 3, expr */
+
+/* <Field> MatchCapturePattern.location = 0, location */
+/* <Field> MatchCapturePattern.parenthesised = 1, bool */
+/* <Field> MatchCapturePattern.variable = 2, expr */
+
+/* <Field> MatchClassPattern.location = 0, location */
+/* <Field> MatchClassPattern.parenthesised = 1, bool */
+/* <Field> MatchClassPattern.class = 2, expr */
+/* <Field> MatchClassPattern.class_name = 3, expr */
+/* <Field> MatchClassPattern.positional = 4, pattern_list */
+/* <Field> MatchClassPattern.keyword = 5, pattern_list */
+
+/* <Field> MatchDoubleStarPattern.location = 0, location */
+/* <Field> MatchDoubleStarPattern.parenthesised = 1, bool */
+/* <Field> MatchDoubleStarPattern.target = 2, pattern */
+
+/* <Field> MatchKeyValuePattern.location = 0, location */
+/* <Field> MatchKeyValuePattern.parenthesised = 1, bool */
+/* <Field> MatchKeyValuePattern.key = 2, pattern */
+/* <Field> MatchKeyValuePattern.value = 3, pattern */
+
+/* <Field> MatchKeywordPattern.location = 0, location */
+/* <Field> MatchKeywordPattern.parenthesised = 1, bool */
+/* <Field> MatchKeywordPattern.attribute = 2, expr */
+/* <Field> MatchKeywordPattern.value = 3, pattern */
+
+/* <Field> MatchLiteralPattern.location = 0, location */
+/* <Field> MatchLiteralPattern.parenthesised = 1, bool */
+/* <Field> MatchLiteralPattern.literal = 2, expr */
+
+/* <Field> MatchMappingPattern.location = 0, location */
+/* <Field> MatchMappingPattern.parenthesised = 1, bool */
+/* <Field> MatchMappingPattern.mappings = 2, pattern_list */
+
+/* <Field> MatchOrPattern.location = 0, location */
+/* <Field> MatchOrPattern.parenthesised = 1, bool */
+/* <Field> MatchOrPattern.patterns = 2, pattern_list */
+
+/* <Field> MatchSequencePattern.location = 0, location */
+/* <Field> MatchSequencePattern.parenthesised = 1, bool */
+/* <Field> MatchSequencePattern.patterns = 2, pattern_list */
+
+/* <Field> MatchStarPattern.location = 0, location */
+/* <Field> MatchStarPattern.parenthesised = 1, bool */
+/* <Field> MatchStarPattern.target = 2, pattern */
+
+/* <Field> MatchValuePattern.location = 0, location */
+/* <Field> MatchValuePattern.parenthesised = 1, bool */
+/* <Field> MatchValuePattern.value = 2, expr */
+
+/* <Field> MatchWildcardPattern.location = 0, location */
+/* <Field> MatchWildcardPattern.parenthesised = 1, bool */
+
+/* <Field> Module.name = 0, str */
+/* <Field> Module.hash = 1, str */
+/* <Field> Module.body = 2, stmt_list */
+/* <Field> Module.kind = 3, str */
+
+/* <Field> Name.location = 0, location */
+/* <Field> Name.parenthesised = 1, bool */
+/* <Field> Name.variable = 2, variable */
+/* <Field> Name.ctx = 3, expr_context */
+/* <Parent> Name = ParameterList  */
+
+/* <Field> Nonlocal.location = 0, location */
+/* <Field> Nonlocal.names = 1, str_list */
+
+/* <Field> Num.location = 0, location */
+/* <Field> Num.parenthesised = 1, bool */
+/* <Field> Num.n = 2, number */
+/* <Field> Num.text = 3, number */
+
+/* <Field> ParamSpec.location = 0, location */
+/* <Field> ParamSpec.name = 1, expr */
+/* <Field> ParamSpec.default = 2, expr */
+
+/* <Field> Pass.location = 0, location */
+
+/* <Field> PlaceHolder.location = 0, location */
+/* <Field> PlaceHolder.parenthesised = 1, bool */
+/* <Field> PlaceHolder.variable = 2, variable */
+/* <Field> PlaceHolder.ctx = 3, expr_context */
+
+/* <Field> Print.location = 0, location */
+/* <Field> Print.dest = 1, expr */
+/* <Field> Print.values = 2, expr_list */
+/* <Field> Print.nl = 3, bool */
+
+/* <Field> Raise.location = 0, location */
+/* <Field> Raise.exc = 1, expr */
+/* <Field> Raise.cause = 2, expr */
+/* <Field> Raise.type = 3, expr */
+/* <Field> Raise.inst = 4, expr */
+/* <Field> Raise.tback = 5, expr */
+
+/* <Field> Repr.location = 0, location */
+/* <Field> Repr.parenthesised = 1, bool */
+/* <Field> Repr.value = 2, expr */
+
+/* <Field> Return.location = 0, location */
+/* <Field> Return.value = 1, expr */
+
+/* <Field> Set.location = 0, location */
+/* <Field> Set.parenthesised = 1, bool */
+/* <Field> Set.elts = 2, expr_list */
+
+/* <Field> SetComp.location = 0, location */
+/* <Field> SetComp.parenthesised = 1, bool */
+/* <Field> SetComp.function = 2, Function */
+/* <Field> SetComp.iterable = 3, expr */
+
+/* <Field> Slice.location = 0, location */
+/* <Field> Slice.parenthesised = 1, bool */
+/* <Field> Slice.start = 2, expr */
+/* <Field> Slice.stop = 3, expr */
+/* <Field> Slice.step = 4, expr */
+
+/* <Field> SpecialOperation.location = 0, location */
+/* <Field> SpecialOperation.parenthesised = 1, bool */
+/* <Field> SpecialOperation.name = 2, str */
+/* <Field> SpecialOperation.arguments = 3, expr_list */
+
+/* <Field> Starred.location = 0, location */
+/* <Field> Starred.parenthesised = 1, bool */
+/* <Field> Starred.value = 2, expr */
+/* <Field> Starred.ctx = 3, expr_context */
+
+/* <Field> Str.location = 0, location */
+/* <Field> Str.parenthesised = 1, bool */
+/* <Field> Str.s = 2, str */
+/* <Field> Str.prefix = 3, str */
+/* <Field> Str.implicitly_concatenated_parts = 4, StringPart_list */
+
+/* <Field> StringPart.text = 0, str */
+/* <Field> StringPart.location = 1, location */
+/* <Parent> StringPart = StringPartList  */
+/* <Parent> StringPartList = BytesOrStr  */
+
+/* <Field> Subscript.location = 0, location */
+/* <Field> Subscript.parenthesised = 1, bool */
+/* <Field> Subscript.value = 2, expr */
+/* <Field> Subscript.index = 3, expr */
+/* <Field> Subscript.ctx = 4, expr_context */
+
+/* <Field> TemplateDottedNotation.location = 0, location */
+/* <Field> TemplateDottedNotation.parenthesised = 1, bool */
+/* <Field> TemplateDottedNotation.value = 2, expr */
+/* <Field> TemplateDottedNotation.attr = 3, str */
+/* <Field> TemplateDottedNotation.ctx = 4, expr_context */
+
+/* <Field> TemplateWrite.location = 0, location */
+/* <Field> TemplateWrite.value = 1, expr */
+
+/* <Field> Try.location = 0, location */
+/* <Field> Try.body = 1, stmt_list */
+/* <Field> Try.orelse = 2, stmt_list */
+/* <Field> Try.handlers = 3, stmt_list */
+/* <Field> Try.finalbody = 4, stmt_list */
+
+/* <Field> Tuple.location = 0, location */
+/* <Field> Tuple.parenthesised = 1, bool */
+/* <Field> Tuple.elts = 2, expr_list */
+/* <Field> Tuple.ctx = 3, expr_context */
+/* <Parent> Tuple = ParameterList  */
+
+/* <Field> TypeAlias.location = 0, location */
+/* <Field> TypeAlias.name = 1, expr */
+/* <Field> TypeAlias.type_parameters = 2, type_parameter_list */
+/* <Field> TypeAlias.value = 3, expr */
+
+/* <Field> TypeVar.location = 0, location */
+/* <Field> TypeVar.name = 1, expr */
+/* <Field> TypeVar.bound = 2, expr */
+/* <Field> TypeVar.default = 3, expr */
+
+/* <Field> TypeVarTuple.location = 0, location */
+/* <Field> TypeVarTuple.name = 1, expr */
+/* <Field> TypeVarTuple.default = 2, expr */
+
+/* <Field> UnaryExpr.location = 0, location */
+/* <Field> UnaryExpr.parenthesised = 1, bool */
+/* <Field> UnaryExpr.op = 2, unaryop */
+/* <Field> UnaryExpr.operand = 3, expr */
+
+/* <Field> While.location = 0, location */
+/* <Field> While.test = 1, expr */
+/* <Field> While.body = 2, stmt_list */
+/* <Field> While.orelse = 3, stmt_list */
+
+/* <Field> With.location = 0, location */
+/* <Field> With.context_expr = 1, expr */
+/* <Field> With.optional_vars = 2, expr */
+/* <Field> With.body = 3, stmt_list */
+/* <Field> With.is_async = 4, bool */
+
+/* <Field> Yield.location = 0, location */
+/* <Field> Yield.parenthesised = 1, bool */
+/* <Field> Yield.value = 2, expr */
+
+/* <Field> YieldFrom.location = 0, location */
+/* <Field> YieldFrom.parenthesised = 1, bool */
+/* <Field> YieldFrom.value = 2, expr */
+
+/* <Field> Alias.value = 0, expr */
+/* <Field> Alias.asname = 1, expr */
+/* <Parent> Alias = AliasList  */
+/* <Parent> AliasList = Import  */
+
+/* <Field> Arguments.kw_defaults = 0, expr_list */
+/* <Field> Arguments.defaults = 1, expr_list */
+/* <Field> Arguments.annotations = 2, expr_list */
+/* <Field> Arguments.varargannotation = 3, expr */
+/* <Field> Arguments.kwargannotation = 4, expr */
+/* <Field> Arguments.kw_annotations = 5, expr_list */
+/* <Parent> Arguments = ArgumentsParent  */
+/* <Parent> boolean = BoolParent  */
+/* <Parent> Boolop = BoolExpr  */
+/* <Parent> string = Bytes  */
+/* <Parent> Cmpop = CmpopList  */
+/* <Parent> CmpopList = Compare  */
+
+/* <Field> Comprehension.location = 0, location */
+/* <Field> Comprehension.iter = 1, expr */
+/* <Field> Comprehension.target = 2, expr */
+/* <Field> Comprehension.ifs = 3, expr_list */
+/* <Parent> Comprehension = ComprehensionList  */
+/* <Parent> ComprehensionList = ListComp  */
+/* <Parent> DictItem = DictItemList  */
+/* <Parent> DictItemList = DictItemListParent  */
+
+/* <Field> Expr.location = 0, location */
+/* <Field> Expr.parenthesised = 1, bool */
+/* <Parent> Expr = ExprParent  */
+/* <Parent> ExprContext = ExprContextParent  */
+/* <Parent> ExprList = ExprListParent  */
+/* <Parent> int = ImportExpr  */
+
+/* <Field> Keyword.location = 0, location */
+/* <Field> Keyword.value = 1, expr */
+/* <Field> Keyword.arg = 2, str */
+/* <Parent> Location = LocationParent  */
+/* <Parent> string = Num  */
+/* <Parent> Operator = BinaryExpr  */
+/* <Parent> ParameterList = Function  */
+
+/* <Field> Pattern.location = 0, location */
+/* <Field> Pattern.parenthesised = 1, bool */
+/* <Parent> Pattern = PatternParent  */
+/* <Parent> PatternList = PatternListParent  */
+
+/* <Field> Stmt.location = 0, location */
+/* <Parent> Stmt = StmtList  */
+/* <Parent> StmtList = StmtListParent  */
+/* <Parent> string = StrParent  */
+/* <Parent> StringList = StrListParent  */
+
+/* <Field> TypeParameter.location = 0, location */
+/* <Parent> TypeParameter = TypeParameterList  */
+/* <Parent> TypeParameterList = TypeParameterListParent  */
+/* <Parent> Unaryop = UnaryExpr  */
+/* <Parent> Variable = VariableParent  */
+py_Classes(unique int id : @py_Class,
+    unique int parent : @py_ClassExpr ref);
+
+py_Functions(unique int id : @py_Function,
+    unique int parent : @py_Function_parent ref);
+
+py_Modules(unique int id : @py_Module);
+
+py_StringParts(unique int id : @py_StringPart,
+    int parent : @py_StringPart_list ref,
+    int idx : int ref);
+
+py_StringPart_lists(unique int id : @py_StringPart_list,
+    unique int parent : @py_Bytes_or_Str ref);
+
+py_aliases(unique int id : @py_alias,
+    int parent : @py_alias_list ref,
+    int idx : int ref);
+
+py_alias_lists(unique int id : @py_alias_list,
+    unique int parent : @py_Import ref);
+
+py_arguments(unique int id : @py_arguments,
+    unique int parent : @py_arguments_parent ref);
+
+py_bools(int parent : @py_bool_parent ref,
+    int idx : int ref);
+
+py_boolops(unique int id : @py_boolop,
+    int kind: int ref,
+    unique int parent : @py_BoolExpr ref);
+
+py_bytes(varchar(1) id : string ref,
+    int parent : @py_Bytes ref,
+    int idx : int ref);
+
+py_cmpops(unique int id : @py_cmpop,
+    int kind: int ref,
+    int parent : @py_cmpop_list ref,
+    int idx : int ref);
+
+py_cmpop_lists(unique int id : @py_cmpop_list,
+    unique int parent : @py_Compare ref);
+
+py_comprehensions(unique int id : @py_comprehension,
+    int parent : @py_comprehension_list ref,
+    int idx : int ref);
+
+py_comprehension_lists(unique int id : @py_comprehension_list,
+    unique int parent : @py_ListComp ref);
+
+py_dict_items(unique int id : @py_dict_item,
+    int kind: int ref,
+    int parent : @py_dict_item_list ref,
+    int idx : int ref);
+
+py_dict_item_lists(unique int id : @py_dict_item_list,
+    unique int parent : @py_dict_item_list_parent ref);
+
+py_exprs(unique int id : @py_expr,
+    int kind: int ref,
+    int parent : @py_expr_parent ref,
+    int idx : int ref);
+
+py_expr_contexts(unique int id : @py_expr_context,
+    int kind: int ref,
+    unique int parent : @py_expr_context_parent ref);
+
+py_expr_lists(unique int id : @py_expr_list,
+    int parent : @py_expr_list_parent ref,
+    int idx : int ref);
+
+py_ints(int id : int ref,
+    unique int parent : @py_ImportExpr ref);
+
+py_locations(unique int id : @location ref,
+    unique int parent : @py_location_parent ref);
+
+py_numbers(varchar(1) id : string ref,
+    int parent : @py_Num ref,
+    int idx : int ref);
+
+py_operators(unique int id : @py_operator,
+    int kind: int ref,
+    unique int parent : @py_BinaryExpr ref);
+
+py_parameter_lists(unique int id : @py_parameter_list,
+    unique int parent : @py_Function ref);
+
+py_patterns(unique int id : @py_pattern,
+    int kind: int ref,
+    int parent : @py_pattern_parent ref,
+    int idx : int ref);
+
+py_pattern_lists(unique int id : @py_pattern_list,
+    int parent : @py_pattern_list_parent ref,
+    int idx : int ref);
+
+py_stmts(unique int id : @py_stmt,
+    int kind: int ref,
+    int parent : @py_stmt_list ref,
+    int idx : int ref);
+
+py_stmt_lists(unique int id : @py_stmt_list,
+    int parent : @py_stmt_list_parent ref,
+    int idx : int ref);
+
+py_strs(varchar(1) id : string ref,
+    int parent : @py_str_parent ref,
+    int idx : int ref);
+
+py_str_lists(unique int id : @py_str_list,
+    unique int parent : @py_str_list_parent ref);
+
+py_type_parameters(unique int id : @py_type_parameter,
+    int kind: int ref,
+    int parent : @py_type_parameter_list ref,
+    int idx : int ref);
+
+py_type_parameter_lists(unique int id : @py_type_parameter_list,
+    unique int parent : @py_type_parameter_list_parent ref);
+
+py_unaryops(unique int id : @py_unaryop,
+    int kind: int ref,
+    unique int parent : @py_UnaryExpr ref);
+
+py_variables(int id : @py_variable ref,
+    unique int parent : @py_variable_parent ref);
+
+case @py_boolop.kind of
+    0 = @py_And
+|   1 = @py_Or;
+
+case @py_cmpop.kind of
+    0 = @py_Eq
+|   1 = @py_Gt
+|   2 = @py_GtE
+|   3 = @py_In
+|   4 = @py_Is
+|   5 = @py_IsNot
+|   6 = @py_Lt
+|   7 = @py_LtE
+|   8 = @py_NotEq
+|   9 = @py_NotIn;
+
+case @py_dict_item.kind of
+    0 = @py_DictUnpacking
+|   1 = @py_KeyValuePair
+|   2 = @py_keyword;
+
+case @py_expr.kind of
+    0 = @py_Attribute
+|   1 = @py_BinaryExpr
+|   2 = @py_BoolExpr
+|   3 = @py_Bytes
+|   4 = @py_Call
+|   5 = @py_ClassExpr
+|   6 = @py_Compare
+|   7 = @py_Dict
+|   8 = @py_DictComp
+|   9 = @py_Ellipsis
+|   10 = @py_FunctionExpr
+|   11 = @py_GeneratorExp
+|   12 = @py_IfExp
+|   13 = @py_ImportExpr
+|   14 = @py_ImportMember
+|   15 = @py_Lambda
+|   16 = @py_List
+|   17 = @py_ListComp
+|   18 = @py_Guard
+|   19 = @py_Name
+|   20 = @py_Num
+|   21 = @py_Repr
+|   22 = @py_Set
+|   23 = @py_SetComp
+|   24 = @py_Slice
+|   25 = @py_Starred
+|   26 = @py_Str
+|   27 = @py_Subscript
+|   28 = @py_Tuple
+|   29 = @py_UnaryExpr
+|   30 = @py_Yield
+|   31 = @py_YieldFrom
+|   32 = @py_TemplateDottedNotation
+|   33 = @py_Filter
+|   34 = @py_PlaceHolder
+|   35 = @py_Await
+|   36 = @py_Fstring
+|   37 = @py_FormattedValue
+|   38 = @py_AssignExpr
+|   39 = @py_SpecialOperation;
+
+case @py_expr_context.kind of
+    0 = @py_AugLoad
+|   1 = @py_AugStore
+|   2 = @py_Del
+|   3 = @py_Load
+|   4 = @py_Param
+|   5 = @py_Store;
+
+case @py_operator.kind of
+    0 = @py_Add
+|   1 = @py_BitAnd
+|   2 = @py_BitOr
+|   3 = @py_BitXor
+|   4 = @py_Div
+|   5 = @py_FloorDiv
+|   6 = @py_LShift
+|   7 = @py_Mod
+|   8 = @py_Mult
+|   9 = @py_Pow
+|   10 = @py_RShift
+|   11 = @py_Sub
+|   12 = @py_MatMult;
+
+case @py_pattern.kind of
+    0 = @py_MatchAsPattern
+|   1 = @py_MatchOrPattern
+|   2 = @py_MatchLiteralPattern
+|   3 = @py_MatchCapturePattern
+|   4 = @py_MatchWildcardPattern
+|   5 = @py_MatchValuePattern
+|   6 = @py_MatchSequencePattern
+|   7 = @py_MatchStarPattern
+|   8 = @py_MatchMappingPattern
+|   9 = @py_MatchDoubleStarPattern
+|   10 = @py_MatchKeyValuePattern
+|   11 = @py_MatchClassPattern
+|   12 = @py_MatchKeywordPattern;
+
+case @py_stmt.kind of
+    0 = @py_Assert
+|   1 = @py_Assign
+|   2 = @py_AugAssign
+|   3 = @py_Break
+|   4 = @py_Continue
+|   5 = @py_Delete
+|   6 = @py_ExceptStmt
+|   7 = @py_ExceptGroupStmt
+|   8 = @py_Exec
+|   9 = @py_Expr_stmt
+|   10 = @py_For
+|   11 = @py_Global
+|   12 = @py_If
+|   13 = @py_Import
+|   14 = @py_ImportStar
+|   15 = @py_MatchStmt
+|   16 = @py_Case
+|   17 = @py_Nonlocal
+|   18 = @py_Pass
+|   19 = @py_Print
+|   20 = @py_Raise
+|   21 = @py_Return
+|   22 = @py_Try
+|   23 = @py_While
+|   24 = @py_With
+|   25 = @py_TemplateWrite
+|   26 = @py_AnnAssign
+|   27 = @py_TypeAlias;
+
+case @py_type_parameter.kind of
+    0 = @py_ParamSpec
+|   1 = @py_TypeVar
+|   2 = @py_TypeVarTuple;
+
+case @py_unaryop.kind of
+    0 = @py_Invert
+|   1 = @py_Not
+|   2 = @py_UAdd
+|   3 = @py_USub;
+
+@py_Bytes_or_Str = @py_Bytes | @py_Str;
+
+@py_Function_parent = @py_DictComp | @py_FunctionExpr | @py_GeneratorExp | @py_Lambda | @py_ListComp | @py_SetComp;
+
+@py_arguments_parent = @py_FunctionExpr | @py_Lambda;
+
+@py_ast_node = @py_Class | @py_Function | @py_Module | @py_StringPart | @py_comprehension | @py_dict_item | @py_expr | @py_pattern | @py_stmt | @py_type_parameter;
+
+@py_bool_parent = @py_For | @py_Function | @py_Print | @py_With | @py_expr | @py_pattern;
+
+@py_dict_item_list_parent = @py_Call | @py_ClassExpr | @py_Dict;
+
+@py_expr_context_parent = @py_Attribute | @py_List | @py_Name | @py_PlaceHolder | @py_Starred | @py_Subscript | @py_TemplateDottedNotation | @py_Tuple;
+
+@py_expr_list_parent = @py_Assign | @py_BoolExpr | @py_Call | @py_ClassExpr | @py_Compare | @py_Delete | @py_Fstring | @py_Function | @py_List | @py_Print | @py_Set | @py_SpecialOperation | @py_Tuple | @py_arguments | @py_comprehension;
+
+@py_expr_or_stmt = @py_expr | @py_stmt;
+
+@py_expr_parent = @py_AnnAssign | @py_Assert | @py_Assign | @py_AssignExpr | @py_Attribute | @py_AugAssign | @py_Await | @py_BinaryExpr | @py_Call | @py_Case | @py_Compare | @py_DictComp | @py_DictUnpacking | @py_ExceptGroupStmt | @py_ExceptStmt | @py_Exec | @py_Expr_stmt | @py_Filter | @py_For | @py_FormattedValue | @py_Function | @py_FunctionExpr | @py_GeneratorExp | @py_Guard | @py_If | @py_IfExp | @py_ImportMember | @py_ImportStar | @py_KeyValuePair | @py_ListComp | @py_MatchAsPattern | @py_MatchCapturePattern | @py_MatchClassPattern | @py_MatchKeywordPattern | @py_MatchLiteralPattern | @py_MatchStmt | @py_MatchValuePattern | @py_ParamSpec | @py_Print | @py_Raise | @py_Repr | @py_Return | @py_SetComp | @py_Slice | @py_Starred | @py_Subscript | @py_TemplateDottedNotation | @py_TemplateWrite | @py_TypeAlias | @py_TypeVar | @py_TypeVarTuple | @py_UnaryExpr | @py_While | @py_With | @py_Yield | @py_YieldFrom | @py_alias | @py_arguments | @py_comprehension | @py_expr_list | @py_keyword | @py_parameter_list;
+
+@py_location_parent = @py_DictUnpacking | @py_KeyValuePair | @py_StringPart | @py_comprehension | @py_expr | @py_keyword | @py_pattern | @py_stmt | @py_type_parameter;
+
+@py_parameter = @py_Name | @py_Tuple;
+
+@py_pattern_list_parent = @py_MatchClassPattern | @py_MatchMappingPattern | @py_MatchOrPattern | @py_MatchSequencePattern;
+
+@py_pattern_parent = @py_Case | @py_MatchAsPattern | @py_MatchDoubleStarPattern | @py_MatchKeyValuePattern | @py_MatchKeywordPattern | @py_MatchStarPattern | @py_pattern_list;
+
+@py_scope = @py_Class | @py_Function | @py_Module;
+
+@py_stmt_list_parent = @py_Case | @py_Class | @py_ExceptGroupStmt | @py_ExceptStmt | @py_For | @py_Function | @py_If | @py_MatchStmt | @py_Module | @py_Try | @py_While | @py_With;
+
+@py_str_list_parent = @py_Global | @py_Nonlocal;
+
+@py_str_parent = @py_Attribute | @py_Class | @py_ClassExpr | @py_FormattedValue | @py_Function | @py_FunctionExpr | @py_ImportExpr | @py_ImportMember | @py_Module | @py_SpecialOperation | @py_Str | @py_StringPart | @py_TemplateDottedNotation | @py_keyword | @py_str_list;
+
+@py_type_parameter_list_parent = @py_ClassExpr | @py_Function | @py_TypeAlias;
+
+@py_variable_parent = @py_Name | @py_PlaceHolder;
+
+
+/*
+ * End of auto-generated part
+ */
+
+
+
+/* Map relative names to absolute names for imports */
+py_absolute_names(int module : @py_Module ref,
+                  varchar(1) relname : string ref,
+                  varchar(1) absname : string ref);
+
+py_exports(int id : @py_Module ref,
+           varchar(1) name : string ref);
+
+/* Successor information */
+py_successors(int predecessor : @py_flow_node ref,
+              int successor : @py_flow_node ref);
+
+py_true_successors(int predecessor : @py_flow_node ref,
+              int successor : @py_flow_node ref);
+
+py_exception_successors(int predecessor : @py_flow_node ref,
+              int successor : @py_flow_node ref);
+
+py_false_successors(int predecessor : @py_flow_node ref,
+              int successor : @py_flow_node ref);
+
+py_flow_bb_node(unique int flownode : @py_flow_node,
+             int realnode : @py_ast_node ref,
+             int basicblock : @py_flow_node ref,
+             int index : int ref);
+
+py_scope_flow(int flow : @py_flow_node ref,
+              int scope : @py_scope ref,
+              int kind : int ref);
+
+py_idoms(unique int node : @py_flow_node ref,
+         int immediate_dominator : @py_flow_node ref);
+
+py_ssa_phi(int phi : @py_ssa_var ref,
+           int arg: @py_ssa_var ref);
+
+py_ssa_var(unique int id : @py_ssa_var,
+            int var : @py_variable ref);
+
+py_ssa_use(int node: @py_flow_node ref,
+           int var : @py_ssa_var ref);
+
+py_ssa_defn(unique int id : @py_ssa_var ref,
+                  int node: @py_flow_node ref);
+
+@py_base_var = @py_variable | @py_ssa_var;
+
+py_scopes(unique int node : @py_expr_or_stmt ref,
+         int scope : @py_scope ref);
+
+py_scope_location(unique int id : @location ref,
+                   unique int scope : @py_scope ref);
+
+py_flags_versioned(varchar(1) name : string ref,
+                   varchar(1) value : string ref,
+                   varchar(1) version : string ref);
+
+py_syntax_error_versioned(unique int id : @location ref,
+                varchar(1) message : string ref,
+                varchar(1) version : string ref);
+
+py_comments(unique int id : @py_comment,
+           varchar(1) text : string ref,
+           unique int location : @location ref);
+
+/* Type information support */
+
+py_cobjects(unique int obj : @py_cobject);
+
+py_cobjecttypes(unique int obj : @py_cobject ref,
+                int typeof : @py_cobject ref);
+
+py_cobjectnames(unique int obj : @py_cobject ref,
+                varchar(1) name : string ref);
+
+/* Kind should be 0 for introspection, > 0 from source, as follows:
+   1 from C extension source
+ */
+py_cobject_sources(int obj : @py_cobject ref,
+                  int kind : int ref);
+
+py_cmembers_versioned(int object : @py_cobject ref,
+                      varchar(1) name : string ref,
+                      int member : @py_cobject ref,
+                      varchar(1) version : string ref);
+
+py_citems(int object : @py_cobject ref,
+            int index : int ref,
+            int member : @py_cobject ref);
+
+ext_argtype(int funcid : @py_object ref,
+            int arg : int ref,
+            int typeid : @py_object ref);
+
+ext_rettype(int funcid : @py_object ref,
+            int typeid : @py_object ref);
+
+ext_proptype(int propid : @py_object ref,
+             int typeid : @py_object ref);
+
+ext_argreturn(int funcid : @py_object ref,
+              int arg : int ref);
+
+py_special_objects(unique int obj : @py_cobject ref,
+                   unique varchar(1) name : string ref);
+
+py_decorated_object(int object : @py_object ref,
+                    int level: int ref);
+
+@py_object = @py_cobject | @py_flow_node;
+
+@py_source_element = @py_ast_node | @container;
diff --git a/python/ql/lib/upgrades/5af903da088e3746aa283700a43a779302453523/upgrade.properties b/python/ql/lib/upgrades/5af903da088e3746aa283700a43a779302453523/upgrade.properties
new file mode 100644
index 00000000000..52b67d65af7
--- /dev/null
+++ b/python/ql/lib/upgrades/5af903da088e3746aa283700a43a779302453523/upgrade.properties
@@ -0,0 +1,2 @@
+description: Add databaseMetadata and overlayChangedFiles relations
+compatibility: full
diff --git a/python/ql/lib/upgrades/6a1f497168da2f43828161d3c86db7d4c94c2b53/old.dbscheme b/python/ql/lib/upgrades/6a1f497168da2f43828161d3c86db7d4c94c2b53/old.dbscheme
new file mode 100644
index 00000000000..6a1f497168d
--- /dev/null
+++ b/python/ql/lib/upgrades/6a1f497168da2f43828161d3c86db7d4c94c2b53/old.dbscheme
@@ -0,0 +1,1252 @@
+/*
+ *      This dbscheme is auto-generated by 'semmle/dbscheme_gen.py'.
+ *      WARNING: Any modifications to this file will be lost.
+ *      Relations can be changed by modifying master.py or
+ *      by adding rules to dbscheme.template
+ */
+
+/* This is a dummy line to alter the dbscheme, so we can make a database upgrade
+ * without actually changing any of the dbscheme predicates. It contains a date
+ * to allow for such updates in the future as well.
+ *
+ * 2020-07-02
+ *
+ * DO NOT remove this comment carelessly, since it can revert the dbscheme back to a
+ * previously seen state (matching a previously seen SHA), which would make the upgrade
+ * mechanism not work properly.
+ */
+
+/*- DEPRECATED: External defects and metrics -*/
+
+externalDefects(
+  unique int id : @externalDefect,
+  varchar(900) queryPath : string ref,
+  int location : @location ref,
+  varchar(900) message : string ref,
+  float severity : float ref
+);
+
+externalMetrics(
+  unique int id : @externalMetric,
+  varchar(900) queryPath : string ref,
+  int location : @location ref,
+  float value : float ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit the tuple `databaseMetadata("isOverlay", "true")`,
+ * along with an `overlayChangedFiles` tuple for each new/modified/deleted file,
+ * when building an overlay database, and these can be used by the discard predicates.
+ */
+databaseMetadata(
+  string metadataKey : string ref,
+  string value : string ref
+);
+
+overlayChangedFiles(
+  string path : string ref
+);
+
+/*- DEPRECATED: Snapshot date -*/
+
+snapshotDate(unique date snapshotDate : date ref);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- DEPRECATED: Duplicate code -*/
+
+duplicateCode(
+  unique int id : @duplication,
+  string relativePath : string ref,
+  int equivClass : int ref
+);
+
+similarCode(
+  unique int id : @similarity,
+  string relativePath : string ref,
+  int equivClass : int ref
+);
+
+@duplication_or_similarity = @duplication | @similarity
+
+tokens(
+  int id : @duplication_or_similarity ref,
+  int offset : int ref,
+  int beginLine : int ref,
+  int beginColumn : int ref,
+  int endLine : int ref,
+  int endColumn : int ref
+);
+
+/*- DEPRECATED: Version control data -*/
+
+svnentries(
+  unique int id : @svnentry,
+  string revision : string ref,
+  string author : string ref,
+  date revisionDate : date ref,
+  int changeSize : int ref
+)
+
+svnaffectedfiles(
+  int id : @svnentry ref,
+  int file : @file ref,
+  string action : string ref
+)
+
+svnentrymsg(
+  unique int id : @svnentry ref,
+  string message : string ref
+)
+
+svnchurn(
+  int commit : @svnentry ref,
+  int file : @file ref,
+  int addedLines : int ref,
+  int deletedLines : int ref
+)
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error;
+
+/*- Python dbscheme -*/
+
+/*
+ * Line metrics
+ */
+py_codelines(int id : @py_scope ref,
+             int count : int ref);
+
+py_commentlines(int id : @py_scope ref,
+                int count : int ref);
+
+py_docstringlines(int id : @py_scope ref,
+                int count : int ref);
+
+py_alllines(int id : @py_scope ref,
+                int count : int ref);
+
+/****************************
+        Python dbscheme
+****************************/
+
+@sourceline = @file | @py_Module | @xmllocatable;
+
+@location = @location_ast | @location_default ;
+
+locations_ast(unique int id: @location_ast,
+          int module: @py_Module ref,
+          int beginLine: int ref,
+          int beginColumn: int ref,
+          int endLine: int ref,
+          int endColumn: int ref);
+
+file_contents(unique int file: @file ref, string contents: string ref);
+
+py_module_path(int module: @py_Module ref, int file: @container ref);
+
+variable(unique int id : @py_variable,
+         int scope : @py_scope ref,
+         varchar(1) name : string ref);
+
+py_line_lengths(unique int id : @py_line,
+                int file: @py_Module ref,
+                int line : int ref,
+                int length : int ref);
+
+py_extracted_version(int module : @py_Module ref,
+                     varchar(1) version : string ref);
+
+/* AUTO GENERATED PART STARTS HERE */
+
+
+/* <Field> AnnAssign.location = 0, location */
+/* <Field> AnnAssign.value = 1, expr */
+/* <Field> AnnAssign.annotation = 2, expr */
+/* <Field> AnnAssign.target = 3, expr */
+
+/* <Field> Assert.location = 0, location */
+/* <Field> Assert.test = 1, expr */
+/* <Field> Assert.msg = 2, expr */
+
+/* <Field> Assign.location = 0, location */
+/* <Field> Assign.value = 1, expr */
+/* <Field> Assign.targets = 2, expr_list */
+
+/* <Field> AssignExpr.location = 0, location */
+/* <Field> AssignExpr.parenthesised = 1, bool */
+/* <Field> AssignExpr.value = 2, expr */
+/* <Field> AssignExpr.target = 3, expr */
+
+/* <Field> Attribute.location = 0, location */
+/* <Field> Attribute.parenthesised = 1, bool */
+/* <Field> Attribute.value = 2, expr */
+/* <Field> Attribute.attr = 3, str */
+/* <Field> Attribute.ctx = 4, expr_context */
+
+/* <Field> AugAssign.location = 0, location */
+/* <Field> AugAssign.operation = 1, BinOp */
+
+/* <Field> Await.location = 0, location */
+/* <Field> Await.parenthesised = 1, bool */
+/* <Field> Await.value = 2, expr */
+
+/* <Field> BinaryExpr.location = 0, location */
+/* <Field> BinaryExpr.parenthesised = 1, bool */
+/* <Field> BinaryExpr.left = 2, expr */
+/* <Field> BinaryExpr.op = 3, operator */
+/* <Field> BinaryExpr.right = 4, expr */
+/* <Parent> BinaryExpr = AugAssign  */
+
+/* <Field> BoolExpr.location = 0, location */
+/* <Field> BoolExpr.parenthesised = 1, bool */
+/* <Field> BoolExpr.op = 2, boolop */
+/* <Field> BoolExpr.values = 3, expr_list */
+
+/* <Field> Break.location = 0, location */
+
+/* <Field> Bytes.location = 0, location */
+/* <Field> Bytes.parenthesised = 1, bool */
+/* <Field> Bytes.s = 2, bytes */
+/* <Field> Bytes.prefix = 3, bytes */
+/* <Field> Bytes.implicitly_concatenated_parts = 4, StringPart_list */
+
+/* <Field> Call.location = 0, location */
+/* <Field> Call.parenthesised = 1, bool */
+/* <Field> Call.func = 2, expr */
+/* <Field> Call.positional_args = 3, expr_list */
+/* <Field> Call.named_args = 4, dict_item_list */
+
+/* <Field> Case.location = 0, location */
+/* <Field> Case.pattern = 1, pattern */
+/* <Field> Case.guard = 2, expr */
+/* <Field> Case.body = 3, stmt_list */
+
+/* <Field> Class.name = 0, str */
+/* <Field> Class.body = 1, stmt_list */
+/* <Parent> Class = ClassExpr  */
+
+/* <Field> ClassExpr.location = 0, location */
+/* <Field> ClassExpr.parenthesised = 1, bool */
+/* <Field> ClassExpr.name = 2, str */
+/* <Field> ClassExpr.bases = 3, expr_list */
+/* <Field> ClassExpr.keywords = 4, dict_item_list */
+/* <Field> ClassExpr.inner_scope = 5, Class */
+/* <Field> ClassExpr.type_parameters = 6, type_parameter_list */
+
+/* <Field> Compare.location = 0, location */
+/* <Field> Compare.parenthesised = 1, bool */
+/* <Field> Compare.left = 2, expr */
+/* <Field> Compare.ops = 3, cmpop_list */
+/* <Field> Compare.comparators = 4, expr_list */
+
+/* <Field> Continue.location = 0, location */
+
+/* <Field> Delete.location = 0, location */
+/* <Field> Delete.targets = 1, expr_list */
+
+/* <Field> Dict.location = 0, location */
+/* <Field> Dict.parenthesised = 1, bool */
+/* <Field> Dict.items = 2, dict_item_list */
+
+/* <Field> DictComp.location = 0, location */
+/* <Field> DictComp.parenthesised = 1, bool */
+/* <Field> DictComp.function = 2, Function */
+/* <Field> DictComp.iterable = 3, expr */
+
+/* <Field> DictUnpacking.location = 0, location */
+/* <Field> DictUnpacking.value = 1, expr */
+
+/* <Field> Ellipsis.location = 0, location */
+/* <Field> Ellipsis.parenthesised = 1, bool */
+
+/* <Field> ExceptGroupStmt.location = 0, location */
+/* <Field> ExceptGroupStmt.type = 1, expr */
+/* <Field> ExceptGroupStmt.name = 2, expr */
+/* <Field> ExceptGroupStmt.body = 3, stmt_list */
+
+/* <Field> ExceptStmt.location = 0, location */
+/* <Field> ExceptStmt.type = 1, expr */
+/* <Field> ExceptStmt.name = 2, expr */
+/* <Field> ExceptStmt.body = 3, stmt_list */
+
+/* <Field> Exec.location = 0, location */
+/* <Field> Exec.body = 1, expr */
+/* <Field> Exec.globals = 2, expr */
+/* <Field> Exec.locals = 3, expr */
+
+/* <Field> ExprStmt.location = 0, location */
+/* <Field> ExprStmt.value = 1, expr */
+
+/* <Field> Filter.location = 0, location */
+/* <Field> Filter.parenthesised = 1, bool */
+/* <Field> Filter.value = 2, expr */
+/* <Field> Filter.filter = 3, expr */
+
+/* <Field> For.location = 0, location */
+/* <Field> For.target = 1, expr */
+/* <Field> For.iter = 2, expr */
+/* <Field> For.body = 3, stmt_list */
+/* <Field> For.orelse = 4, stmt_list */
+/* <Field> For.is_async = 5, bool */
+
+/* <Field> FormattedValue.location = 0, location */
+/* <Field> FormattedValue.parenthesised = 1, bool */
+/* <Field> FormattedValue.value = 2, expr */
+/* <Field> FormattedValue.conversion = 3, str */
+/* <Field> FormattedValue.format_spec = 4, JoinedStr */
+
+/* <Field> Function.name = 0, str */
+/* <Field> Function.args = 1, parameter_list */
+/* <Field> Function.vararg = 2, expr */
+/* <Field> Function.kwonlyargs = 3, expr_list */
+/* <Field> Function.kwarg = 4, expr */
+/* <Field> Function.body = 5, stmt_list */
+/* <Field> Function.is_async = 6, bool */
+/* <Field> Function.type_parameters = 7, type_parameter_list */
+/* <Parent> Function = FunctionParent  */
+
+/* <Field> FunctionExpr.location = 0, location */
+/* <Field> FunctionExpr.parenthesised = 1, bool */
+/* <Field> FunctionExpr.name = 2, str */
+/* <Field> FunctionExpr.args = 3, arguments */
+/* <Field> FunctionExpr.returns = 4, expr */
+/* <Field> FunctionExpr.inner_scope = 5, Function */
+
+/* <Field> GeneratorExp.location = 0, location */
+/* <Field> GeneratorExp.parenthesised = 1, bool */
+/* <Field> GeneratorExp.function = 2, Function */
+/* <Field> GeneratorExp.iterable = 3, expr */
+
+/* <Field> Global.location = 0, location */
+/* <Field> Global.names = 1, str_list */
+
+/* <Field> Guard.location = 0, location */
+/* <Field> Guard.parenthesised = 1, bool */
+/* <Field> Guard.test = 2, expr */
+
+/* <Field> If.location = 0, location */
+/* <Field> If.test = 1, expr */
+/* <Field> If.body = 2, stmt_list */
+/* <Field> If.orelse = 3, stmt_list */
+
+/* <Field> IfExp.location = 0, location */
+/* <Field> IfExp.parenthesised = 1, bool */
+/* <Field> IfExp.test = 2, expr */
+/* <Field> IfExp.body = 3, expr */
+/* <Field> IfExp.orelse = 4, expr */
+
+/* <Field> Import.location = 0, location */
+/* <Field> Import.names = 1, alias_list */
+
+/* <Field> ImportExpr.location = 0, location */
+/* <Field> ImportExpr.parenthesised = 1, bool */
+/* <Field> ImportExpr.level = 2, int */
+/* <Field> ImportExpr.name = 3, str */
+/* <Field> ImportExpr.top = 4, bool */
+
+/* <Field> ImportStar.location = 0, location */
+/* <Field> ImportStar.module = 1, expr */
+
+/* <Field> ImportMember.location = 0, location */
+/* <Field> ImportMember.parenthesised = 1, bool */
+/* <Field> ImportMember.module = 2, expr */
+/* <Field> ImportMember.name = 3, str */
+
+/* <Field> Fstring.location = 0, location */
+/* <Field> Fstring.parenthesised = 1, bool */
+/* <Field> Fstring.values = 2, expr_list */
+/* <Parent> Fstring = FormattedValue  */
+
+/* <Field> KeyValuePair.location = 0, location */
+/* <Field> KeyValuePair.value = 1, expr */
+/* <Field> KeyValuePair.key = 2, expr */
+
+/* <Field> Lambda.location = 0, location */
+/* <Field> Lambda.parenthesised = 1, bool */
+/* <Field> Lambda.args = 2, arguments */
+/* <Field> Lambda.inner_scope = 3, Function */
+
+/* <Field> List.location = 0, location */
+/* <Field> List.parenthesised = 1, bool */
+/* <Field> List.elts = 2, expr_list */
+/* <Field> List.ctx = 3, expr_context */
+
+/* <Field> ListComp.location = 0, location */
+/* <Field> ListComp.parenthesised = 1, bool */
+/* <Field> ListComp.function = 2, Function */
+/* <Field> ListComp.iterable = 3, expr */
+/* <Field> ListComp.generators = 4, comprehension_list */
+/* <Field> ListComp.elt = 5, expr */
+
+/* <Field> MatchStmt.location = 0, location */
+/* <Field> MatchStmt.subject = 1, expr */
+/* <Field> MatchStmt.cases = 2, stmt_list */
+
+/* <Field> MatchAsPattern.location = 0, location */
+/* <Field> MatchAsPattern.parenthesised = 1, bool */
+/* <Field> MatchAsPattern.pattern = 2, pattern */
+/* <Field> MatchAsPattern.alias = 3, expr */
+
+/* <Field> MatchCapturePattern.location = 0, location */
+/* <Field> MatchCapturePattern.parenthesised = 1, bool */
+/* <Field> MatchCapturePattern.variable = 2, expr */
+
+/* <Field> MatchClassPattern.location = 0, location */
+/* <Field> MatchClassPattern.parenthesised = 1, bool */
+/* <Field> MatchClassPattern.class = 2, expr */
+/* <Field> MatchClassPattern.class_name = 3, expr */
+/* <Field> MatchClassPattern.positional = 4, pattern_list */
+/* <Field> MatchClassPattern.keyword = 5, pattern_list */
+
+/* <Field> MatchDoubleStarPattern.location = 0, location */
+/* <Field> MatchDoubleStarPattern.parenthesised = 1, bool */
+/* <Field> MatchDoubleStarPattern.target = 2, pattern */
+
+/* <Field> MatchKeyValuePattern.location = 0, location */
+/* <Field> MatchKeyValuePattern.parenthesised = 1, bool */
+/* <Field> MatchKeyValuePattern.key = 2, pattern */
+/* <Field> MatchKeyValuePattern.value = 3, pattern */
+
+/* <Field> MatchKeywordPattern.location = 0, location */
+/* <Field> MatchKeywordPattern.parenthesised = 1, bool */
+/* <Field> MatchKeywordPattern.attribute = 2, expr */
+/* <Field> MatchKeywordPattern.value = 3, pattern */
+
+/* <Field> MatchLiteralPattern.location = 0, location */
+/* <Field> MatchLiteralPattern.parenthesised = 1, bool */
+/* <Field> MatchLiteralPattern.literal = 2, expr */
+
+/* <Field> MatchMappingPattern.location = 0, location */
+/* <Field> MatchMappingPattern.parenthesised = 1, bool */
+/* <Field> MatchMappingPattern.mappings = 2, pattern_list */
+
+/* <Field> MatchOrPattern.location = 0, location */
+/* <Field> MatchOrPattern.parenthesised = 1, bool */
+/* <Field> MatchOrPattern.patterns = 2, pattern_list */
+
+/* <Field> MatchSequencePattern.location = 0, location */
+/* <Field> MatchSequencePattern.parenthesised = 1, bool */
+/* <Field> MatchSequencePattern.patterns = 2, pattern_list */
+
+/* <Field> MatchStarPattern.location = 0, location */
+/* <Field> MatchStarPattern.parenthesised = 1, bool */
+/* <Field> MatchStarPattern.target = 2, pattern */
+
+/* <Field> MatchValuePattern.location = 0, location */
+/* <Field> MatchValuePattern.parenthesised = 1, bool */
+/* <Field> MatchValuePattern.value = 2, expr */
+
+/* <Field> MatchWildcardPattern.location = 0, location */
+/* <Field> MatchWildcardPattern.parenthesised = 1, bool */
+
+/* <Field> Module.name = 0, str */
+/* <Field> Module.hash = 1, str */
+/* <Field> Module.body = 2, stmt_list */
+/* <Field> Module.kind = 3, str */
+
+/* <Field> Name.location = 0, location */
+/* <Field> Name.parenthesised = 1, bool */
+/* <Field> Name.variable = 2, variable */
+/* <Field> Name.ctx = 3, expr_context */
+/* <Parent> Name = ParameterList  */
+
+/* <Field> Nonlocal.location = 0, location */
+/* <Field> Nonlocal.names = 1, str_list */
+
+/* <Field> Num.location = 0, location */
+/* <Field> Num.parenthesised = 1, bool */
+/* <Field> Num.n = 2, number */
+/* <Field> Num.text = 3, number */
+
+/* <Field> ParamSpec.location = 0, location */
+/* <Field> ParamSpec.name = 1, expr */
+/* <Field> ParamSpec.default = 2, expr */
+
+/* <Field> Pass.location = 0, location */
+
+/* <Field> PlaceHolder.location = 0, location */
+/* <Field> PlaceHolder.parenthesised = 1, bool */
+/* <Field> PlaceHolder.variable = 2, variable */
+/* <Field> PlaceHolder.ctx = 3, expr_context */
+
+/* <Field> Print.location = 0, location */
+/* <Field> Print.dest = 1, expr */
+/* <Field> Print.values = 2, expr_list */
+/* <Field> Print.nl = 3, bool */
+
+/* <Field> Raise.location = 0, location */
+/* <Field> Raise.exc = 1, expr */
+/* <Field> Raise.cause = 2, expr */
+/* <Field> Raise.type = 3, expr */
+/* <Field> Raise.inst = 4, expr */
+/* <Field> Raise.tback = 5, expr */
+
+/* <Field> Repr.location = 0, location */
+/* <Field> Repr.parenthesised = 1, bool */
+/* <Field> Repr.value = 2, expr */
+
+/* <Field> Return.location = 0, location */
+/* <Field> Return.value = 1, expr */
+
+/* <Field> Set.location = 0, location */
+/* <Field> Set.parenthesised = 1, bool */
+/* <Field> Set.elts = 2, expr_list */
+
+/* <Field> SetComp.location = 0, location */
+/* <Field> SetComp.parenthesised = 1, bool */
+/* <Field> SetComp.function = 2, Function */
+/* <Field> SetComp.iterable = 3, expr */
+
+/* <Field> Slice.location = 0, location */
+/* <Field> Slice.parenthesised = 1, bool */
+/* <Field> Slice.start = 2, expr */
+/* <Field> Slice.stop = 3, expr */
+/* <Field> Slice.step = 4, expr */
+
+/* <Field> SpecialOperation.location = 0, location */
+/* <Field> SpecialOperation.parenthesised = 1, bool */
+/* <Field> SpecialOperation.name = 2, str */
+/* <Field> SpecialOperation.arguments = 3, expr_list */
+
+/* <Field> Starred.location = 0, location */
+/* <Field> Starred.parenthesised = 1, bool */
+/* <Field> Starred.value = 2, expr */
+/* <Field> Starred.ctx = 3, expr_context */
+
+/* <Field> Str.location = 0, location */
+/* <Field> Str.parenthesised = 1, bool */
+/* <Field> Str.s = 2, str */
+/* <Field> Str.prefix = 3, str */
+/* <Field> Str.implicitly_concatenated_parts = 4, StringPart_list */
+
+/* <Field> StringPart.text = 0, str */
+/* <Field> StringPart.location = 1, location */
+/* <Parent> StringPart = StringPartList  */
+/* <Parent> StringPartList = BytesOrStr  */
+
+/* <Field> Subscript.location = 0, location */
+/* <Field> Subscript.parenthesised = 1, bool */
+/* <Field> Subscript.value = 2, expr */
+/* <Field> Subscript.index = 3, expr */
+/* <Field> Subscript.ctx = 4, expr_context */
+
+/* <Field> TemplateDottedNotation.location = 0, location */
+/* <Field> TemplateDottedNotation.parenthesised = 1, bool */
+/* <Field> TemplateDottedNotation.value = 2, expr */
+/* <Field> TemplateDottedNotation.attr = 3, str */
+/* <Field> TemplateDottedNotation.ctx = 4, expr_context */
+
+/* <Field> TemplateWrite.location = 0, location */
+/* <Field> TemplateWrite.value = 1, expr */
+
+/* <Field> Try.location = 0, location */
+/* <Field> Try.body = 1, stmt_list */
+/* <Field> Try.orelse = 2, stmt_list */
+/* <Field> Try.handlers = 3, stmt_list */
+/* <Field> Try.finalbody = 4, stmt_list */
+
+/* <Field> Tuple.location = 0, location */
+/* <Field> Tuple.parenthesised = 1, bool */
+/* <Field> Tuple.elts = 2, expr_list */
+/* <Field> Tuple.ctx = 3, expr_context */
+/* <Parent> Tuple = ParameterList  */
+
+/* <Field> TypeAlias.location = 0, location */
+/* <Field> TypeAlias.name = 1, expr */
+/* <Field> TypeAlias.type_parameters = 2, type_parameter_list */
+/* <Field> TypeAlias.value = 3, expr */
+
+/* <Field> TypeVar.location = 0, location */
+/* <Field> TypeVar.name = 1, expr */
+/* <Field> TypeVar.bound = 2, expr */
+/* <Field> TypeVar.default = 3, expr */
+
+/* <Field> TypeVarTuple.location = 0, location */
+/* <Field> TypeVarTuple.name = 1, expr */
+/* <Field> TypeVarTuple.default = 2, expr */
+
+/* <Field> UnaryExpr.location = 0, location */
+/* <Field> UnaryExpr.parenthesised = 1, bool */
+/* <Field> UnaryExpr.op = 2, unaryop */
+/* <Field> UnaryExpr.operand = 3, expr */
+
+/* <Field> While.location = 0, location */
+/* <Field> While.test = 1, expr */
+/* <Field> While.body = 2, stmt_list */
+/* <Field> While.orelse = 3, stmt_list */
+
+/* <Field> With.location = 0, location */
+/* <Field> With.context_expr = 1, expr */
+/* <Field> With.optional_vars = 2, expr */
+/* <Field> With.body = 3, stmt_list */
+/* <Field> With.is_async = 4, bool */
+
+/* <Field> Yield.location = 0, location */
+/* <Field> Yield.parenthesised = 1, bool */
+/* <Field> Yield.value = 2, expr */
+
+/* <Field> YieldFrom.location = 0, location */
+/* <Field> YieldFrom.parenthesised = 1, bool */
+/* <Field> YieldFrom.value = 2, expr */
+
+/* <Field> Alias.value = 0, expr */
+/* <Field> Alias.asname = 1, expr */
+/* <Parent> Alias = AliasList  */
+/* <Parent> AliasList = Import  */
+
+/* <Field> Arguments.kw_defaults = 0, expr_list */
+/* <Field> Arguments.defaults = 1, expr_list */
+/* <Field> Arguments.annotations = 2, expr_list */
+/* <Field> Arguments.varargannotation = 3, expr */
+/* <Field> Arguments.kwargannotation = 4, expr */
+/* <Field> Arguments.kw_annotations = 5, expr_list */
+/* <Parent> Arguments = ArgumentsParent  */
+/* <Parent> boolean = BoolParent  */
+/* <Parent> Boolop = BoolExpr  */
+/* <Parent> string = Bytes  */
+/* <Parent> Cmpop = CmpopList  */
+/* <Parent> CmpopList = Compare  */
+
+/* <Field> Comprehension.location = 0, location */
+/* <Field> Comprehension.iter = 1, expr */
+/* <Field> Comprehension.target = 2, expr */
+/* <Field> Comprehension.ifs = 3, expr_list */
+/* <Parent> Comprehension = ComprehensionList  */
+/* <Parent> ComprehensionList = ListComp  */
+/* <Parent> DictItem = DictItemList  */
+/* <Parent> DictItemList = DictItemListParent  */
+
+/* <Field> Expr.location = 0, location */
+/* <Field> Expr.parenthesised = 1, bool */
+/* <Parent> Expr = ExprParent  */
+/* <Parent> ExprContext = ExprContextParent  */
+/* <Parent> ExprList = ExprListParent  */
+/* <Parent> int = ImportExpr  */
+
+/* <Field> Keyword.location = 0, location */
+/* <Field> Keyword.value = 1, expr */
+/* <Field> Keyword.arg = 2, str */
+/* <Parent> Location = LocationParent  */
+/* <Parent> string = Num  */
+/* <Parent> Operator = BinaryExpr  */
+/* <Parent> ParameterList = Function  */
+
+/* <Field> Pattern.location = 0, location */
+/* <Field> Pattern.parenthesised = 1, bool */
+/* <Parent> Pattern = PatternParent  */
+/* <Parent> PatternList = PatternListParent  */
+
+/* <Field> Stmt.location = 0, location */
+/* <Parent> Stmt = StmtList  */
+/* <Parent> StmtList = StmtListParent  */
+/* <Parent> string = StrParent  */
+/* <Parent> StringList = StrListParent  */
+
+/* <Field> TypeParameter.location = 0, location */
+/* <Parent> TypeParameter = TypeParameterList  */
+/* <Parent> TypeParameterList = TypeParameterListParent  */
+/* <Parent> Unaryop = UnaryExpr  */
+/* <Parent> Variable = VariableParent  */
+py_Classes(unique int id : @py_Class,
+    unique int parent : @py_ClassExpr ref);
+
+py_Functions(unique int id : @py_Function,
+    unique int parent : @py_Function_parent ref);
+
+py_Modules(unique int id : @py_Module);
+
+py_StringParts(unique int id : @py_StringPart,
+    int parent : @py_StringPart_list ref,
+    int idx : int ref);
+
+py_StringPart_lists(unique int id : @py_StringPart_list,
+    unique int parent : @py_Bytes_or_Str ref);
+
+py_aliases(unique int id : @py_alias,
+    int parent : @py_alias_list ref,
+    int idx : int ref);
+
+py_alias_lists(unique int id : @py_alias_list,
+    unique int parent : @py_Import ref);
+
+py_arguments(unique int id : @py_arguments,
+    unique int parent : @py_arguments_parent ref);
+
+py_bools(int parent : @py_bool_parent ref,
+    int idx : int ref);
+
+py_boolops(unique int id : @py_boolop,
+    int kind: int ref,
+    unique int parent : @py_BoolExpr ref);
+
+py_bytes(varchar(1) id : string ref,
+    int parent : @py_Bytes ref,
+    int idx : int ref);
+
+py_cmpops(unique int id : @py_cmpop,
+    int kind: int ref,
+    int parent : @py_cmpop_list ref,
+    int idx : int ref);
+
+py_cmpop_lists(unique int id : @py_cmpop_list,
+    unique int parent : @py_Compare ref);
+
+py_comprehensions(unique int id : @py_comprehension,
+    int parent : @py_comprehension_list ref,
+    int idx : int ref);
+
+py_comprehension_lists(unique int id : @py_comprehension_list,
+    unique int parent : @py_ListComp ref);
+
+py_dict_items(unique int id : @py_dict_item,
+    int kind: int ref,
+    int parent : @py_dict_item_list ref,
+    int idx : int ref);
+
+py_dict_item_lists(unique int id : @py_dict_item_list,
+    unique int parent : @py_dict_item_list_parent ref);
+
+py_exprs(unique int id : @py_expr,
+    int kind: int ref,
+    int parent : @py_expr_parent ref,
+    int idx : int ref);
+
+py_expr_contexts(unique int id : @py_expr_context,
+    int kind: int ref,
+    unique int parent : @py_expr_context_parent ref);
+
+py_expr_lists(unique int id : @py_expr_list,
+    int parent : @py_expr_list_parent ref,
+    int idx : int ref);
+
+py_ints(int id : int ref,
+    unique int parent : @py_ImportExpr ref);
+
+py_locations(unique int id : @location ref,
+    unique int parent : @py_location_parent ref);
+
+py_numbers(varchar(1) id : string ref,
+    int parent : @py_Num ref,
+    int idx : int ref);
+
+py_operators(unique int id : @py_operator,
+    int kind: int ref,
+    unique int parent : @py_BinaryExpr ref);
+
+py_parameter_lists(unique int id : @py_parameter_list,
+    unique int parent : @py_Function ref);
+
+py_patterns(unique int id : @py_pattern,
+    int kind: int ref,
+    int parent : @py_pattern_parent ref,
+    int idx : int ref);
+
+py_pattern_lists(unique int id : @py_pattern_list,
+    int parent : @py_pattern_list_parent ref,
+    int idx : int ref);
+
+py_stmts(unique int id : @py_stmt,
+    int kind: int ref,
+    int parent : @py_stmt_list ref,
+    int idx : int ref);
+
+py_stmt_lists(unique int id : @py_stmt_list,
+    int parent : @py_stmt_list_parent ref,
+    int idx : int ref);
+
+py_strs(varchar(1) id : string ref,
+    int parent : @py_str_parent ref,
+    int idx : int ref);
+
+py_str_lists(unique int id : @py_str_list,
+    unique int parent : @py_str_list_parent ref);
+
+py_type_parameters(unique int id : @py_type_parameter,
+    int kind: int ref,
+    int parent : @py_type_parameter_list ref,
+    int idx : int ref);
+
+py_type_parameter_lists(unique int id : @py_type_parameter_list,
+    unique int parent : @py_type_parameter_list_parent ref);
+
+py_unaryops(unique int id : @py_unaryop,
+    int kind: int ref,
+    unique int parent : @py_UnaryExpr ref);
+
+py_variables(int id : @py_variable ref,
+    unique int parent : @py_variable_parent ref);
+
+case @py_boolop.kind of
+    0 = @py_And
+|   1 = @py_Or;
+
+case @py_cmpop.kind of
+    0 = @py_Eq
+|   1 = @py_Gt
+|   2 = @py_GtE
+|   3 = @py_In
+|   4 = @py_Is
+|   5 = @py_IsNot
+|   6 = @py_Lt
+|   7 = @py_LtE
+|   8 = @py_NotEq
+|   9 = @py_NotIn;
+
+case @py_dict_item.kind of
+    0 = @py_DictUnpacking
+|   1 = @py_KeyValuePair
+|   2 = @py_keyword;
+
+case @py_expr.kind of
+    0 = @py_Attribute
+|   1 = @py_BinaryExpr
+|   2 = @py_BoolExpr
+|   3 = @py_Bytes
+|   4 = @py_Call
+|   5 = @py_ClassExpr
+|   6 = @py_Compare
+|   7 = @py_Dict
+|   8 = @py_DictComp
+|   9 = @py_Ellipsis
+|   10 = @py_FunctionExpr
+|   11 = @py_GeneratorExp
+|   12 = @py_IfExp
+|   13 = @py_ImportExpr
+|   14 = @py_ImportMember
+|   15 = @py_Lambda
+|   16 = @py_List
+|   17 = @py_ListComp
+|   18 = @py_Guard
+|   19 = @py_Name
+|   20 = @py_Num
+|   21 = @py_Repr
+|   22 = @py_Set
+|   23 = @py_SetComp
+|   24 = @py_Slice
+|   25 = @py_Starred
+|   26 = @py_Str
+|   27 = @py_Subscript
+|   28 = @py_Tuple
+|   29 = @py_UnaryExpr
+|   30 = @py_Yield
+|   31 = @py_YieldFrom
+|   32 = @py_TemplateDottedNotation
+|   33 = @py_Filter
+|   34 = @py_PlaceHolder
+|   35 = @py_Await
+|   36 = @py_Fstring
+|   37 = @py_FormattedValue
+|   38 = @py_AssignExpr
+|   39 = @py_SpecialOperation;
+
+case @py_expr_context.kind of
+    0 = @py_AugLoad
+|   1 = @py_AugStore
+|   2 = @py_Del
+|   3 = @py_Load
+|   4 = @py_Param
+|   5 = @py_Store;
+
+case @py_operator.kind of
+    0 = @py_Add
+|   1 = @py_BitAnd
+|   2 = @py_BitOr
+|   3 = @py_BitXor
+|   4 = @py_Div
+|   5 = @py_FloorDiv
+|   6 = @py_LShift
+|   7 = @py_Mod
+|   8 = @py_Mult
+|   9 = @py_Pow
+|   10 = @py_RShift
+|   11 = @py_Sub
+|   12 = @py_MatMult;
+
+case @py_pattern.kind of
+    0 = @py_MatchAsPattern
+|   1 = @py_MatchOrPattern
+|   2 = @py_MatchLiteralPattern
+|   3 = @py_MatchCapturePattern
+|   4 = @py_MatchWildcardPattern
+|   5 = @py_MatchValuePattern
+|   6 = @py_MatchSequencePattern
+|   7 = @py_MatchStarPattern
+|   8 = @py_MatchMappingPattern
+|   9 = @py_MatchDoubleStarPattern
+|   10 = @py_MatchKeyValuePattern
+|   11 = @py_MatchClassPattern
+|   12 = @py_MatchKeywordPattern;
+
+case @py_stmt.kind of
+    0 = @py_Assert
+|   1 = @py_Assign
+|   2 = @py_AugAssign
+|   3 = @py_Break
+|   4 = @py_Continue
+|   5 = @py_Delete
+|   6 = @py_ExceptStmt
+|   7 = @py_ExceptGroupStmt
+|   8 = @py_Exec
+|   9 = @py_Expr_stmt
+|   10 = @py_For
+|   11 = @py_Global
+|   12 = @py_If
+|   13 = @py_Import
+|   14 = @py_ImportStar
+|   15 = @py_MatchStmt
+|   16 = @py_Case
+|   17 = @py_Nonlocal
+|   18 = @py_Pass
+|   19 = @py_Print
+|   20 = @py_Raise
+|   21 = @py_Return
+|   22 = @py_Try
+|   23 = @py_While
+|   24 = @py_With
+|   25 = @py_TemplateWrite
+|   26 = @py_AnnAssign
+|   27 = @py_TypeAlias;
+
+case @py_type_parameter.kind of
+    0 = @py_ParamSpec
+|   1 = @py_TypeVar
+|   2 = @py_TypeVarTuple;
+
+case @py_unaryop.kind of
+    0 = @py_Invert
+|   1 = @py_Not
+|   2 = @py_UAdd
+|   3 = @py_USub;
+
+@py_Bytes_or_Str = @py_Bytes | @py_Str;
+
+@py_Function_parent = @py_DictComp | @py_FunctionExpr | @py_GeneratorExp | @py_Lambda | @py_ListComp | @py_SetComp;
+
+@py_arguments_parent = @py_FunctionExpr | @py_Lambda;
+
+@py_ast_node = @py_Class | @py_Function | @py_Module | @py_StringPart | @py_comprehension | @py_dict_item | @py_expr | @py_pattern | @py_stmt | @py_type_parameter;
+
+@py_bool_parent = @py_For | @py_Function | @py_Print | @py_With | @py_expr | @py_pattern;
+
+@py_dict_item_list_parent = @py_Call | @py_ClassExpr | @py_Dict;
+
+@py_expr_context_parent = @py_Attribute | @py_List | @py_Name | @py_PlaceHolder | @py_Starred | @py_Subscript | @py_TemplateDottedNotation | @py_Tuple;
+
+@py_expr_list_parent = @py_Assign | @py_BoolExpr | @py_Call | @py_ClassExpr | @py_Compare | @py_Delete | @py_Fstring | @py_Function | @py_List | @py_Print | @py_Set | @py_SpecialOperation | @py_Tuple | @py_arguments | @py_comprehension;
+
+@py_expr_or_stmt = @py_expr | @py_stmt;
+
+@py_expr_parent = @py_AnnAssign | @py_Assert | @py_Assign | @py_AssignExpr | @py_Attribute | @py_AugAssign | @py_Await | @py_BinaryExpr | @py_Call | @py_Case | @py_Compare | @py_DictComp | @py_DictUnpacking | @py_ExceptGroupStmt | @py_ExceptStmt | @py_Exec | @py_Expr_stmt | @py_Filter | @py_For | @py_FormattedValue | @py_Function | @py_FunctionExpr | @py_GeneratorExp | @py_Guard | @py_If | @py_IfExp | @py_ImportMember | @py_ImportStar | @py_KeyValuePair | @py_ListComp | @py_MatchAsPattern | @py_MatchCapturePattern | @py_MatchClassPattern | @py_MatchKeywordPattern | @py_MatchLiteralPattern | @py_MatchStmt | @py_MatchValuePattern | @py_ParamSpec | @py_Print | @py_Raise | @py_Repr | @py_Return | @py_SetComp | @py_Slice | @py_Starred | @py_Subscript | @py_TemplateDottedNotation | @py_TemplateWrite | @py_TypeAlias | @py_TypeVar | @py_TypeVarTuple | @py_UnaryExpr | @py_While | @py_With | @py_Yield | @py_YieldFrom | @py_alias | @py_arguments | @py_comprehension | @py_expr_list | @py_keyword | @py_parameter_list;
+
+@py_location_parent = @py_DictUnpacking | @py_KeyValuePair | @py_StringPart | @py_comprehension | @py_expr | @py_keyword | @py_pattern | @py_stmt | @py_type_parameter;
+
+@py_parameter = @py_Name | @py_Tuple;
+
+@py_pattern_list_parent = @py_MatchClassPattern | @py_MatchMappingPattern | @py_MatchOrPattern | @py_MatchSequencePattern;
+
+@py_pattern_parent = @py_Case | @py_MatchAsPattern | @py_MatchDoubleStarPattern | @py_MatchKeyValuePattern | @py_MatchKeywordPattern | @py_MatchStarPattern | @py_pattern_list;
+
+@py_scope = @py_Class | @py_Function | @py_Module;
+
+@py_stmt_list_parent = @py_Case | @py_Class | @py_ExceptGroupStmt | @py_ExceptStmt | @py_For | @py_Function | @py_If | @py_MatchStmt | @py_Module | @py_Try | @py_While | @py_With;
+
+@py_str_list_parent = @py_Global | @py_Nonlocal;
+
+@py_str_parent = @py_Attribute | @py_Class | @py_ClassExpr | @py_FormattedValue | @py_Function | @py_FunctionExpr | @py_ImportExpr | @py_ImportMember | @py_Module | @py_SpecialOperation | @py_Str | @py_StringPart | @py_TemplateDottedNotation | @py_keyword | @py_str_list;
+
+@py_type_parameter_list_parent = @py_ClassExpr | @py_Function | @py_TypeAlias;
+
+@py_variable_parent = @py_Name | @py_PlaceHolder;
+
+
+/*
+ * End of auto-generated part
+ */
+
+
+
+/* Map relative names to absolute names for imports */
+py_absolute_names(int module : @py_Module ref,
+                  varchar(1) relname : string ref,
+                  varchar(1) absname : string ref);
+
+py_exports(int id : @py_Module ref,
+           varchar(1) name : string ref);
+
+/* Successor information */
+py_successors(int predecessor : @py_flow_node ref,
+              int successor : @py_flow_node ref);
+
+py_true_successors(int predecessor : @py_flow_node ref,
+              int successor : @py_flow_node ref);
+
+py_exception_successors(int predecessor : @py_flow_node ref,
+              int successor : @py_flow_node ref);
+
+py_false_successors(int predecessor : @py_flow_node ref,
+              int successor : @py_flow_node ref);
+
+py_flow_bb_node(unique int flownode : @py_flow_node,
+             int realnode : @py_ast_node ref,
+             int basicblock : @py_flow_node ref,
+             int index : int ref);
+
+py_scope_flow(int flow : @py_flow_node ref,
+              int scope : @py_scope ref,
+              int kind : int ref);
+
+py_idoms(unique int node : @py_flow_node ref,
+         int immediate_dominator : @py_flow_node ref);
+
+py_ssa_phi(int phi : @py_ssa_var ref,
+           int arg: @py_ssa_var ref);
+
+py_ssa_var(unique int id : @py_ssa_var,
+            int var : @py_variable ref);
+
+py_ssa_use(int node: @py_flow_node ref,
+           int var : @py_ssa_var ref);
+
+py_ssa_defn(unique int id : @py_ssa_var ref,
+                  int node: @py_flow_node ref);
+
+@py_base_var = @py_variable | @py_ssa_var;
+
+py_scopes(unique int node : @py_expr_or_stmt ref,
+         int scope : @py_scope ref);
+
+py_scope_location(unique int id : @location ref,
+                   unique int scope : @py_scope ref);
+
+py_flags_versioned(varchar(1) name : string ref,
+                   varchar(1) value : string ref,
+                   varchar(1) version : string ref);
+
+py_syntax_error_versioned(unique int id : @location ref,
+                varchar(1) message : string ref,
+                varchar(1) version : string ref);
+
+py_comments(unique int id : @py_comment,
+           varchar(1) text : string ref,
+           unique int location : @location ref);
+
+/* Type information support */
+
+py_cobjects(unique int obj : @py_cobject);
+
+py_cobjecttypes(unique int obj : @py_cobject ref,
+                int typeof : @py_cobject ref);
+
+py_cobjectnames(unique int obj : @py_cobject ref,
+                varchar(1) name : string ref);
+
+/* Kind should be 0 for introspection, > 0 from source, as follows:
+   1 from C extension source
+ */
+py_cobject_sources(int obj : @py_cobject ref,
+                  int kind : int ref);
+
+py_cmembers_versioned(int object : @py_cobject ref,
+                      varchar(1) name : string ref,
+                      int member : @py_cobject ref,
+                      varchar(1) version : string ref);
+
+py_citems(int object : @py_cobject ref,
+            int index : int ref,
+            int member : @py_cobject ref);
+
+ext_argtype(int funcid : @py_object ref,
+            int arg : int ref,
+            int typeid : @py_object ref);
+
+ext_rettype(int funcid : @py_object ref,
+            int typeid : @py_object ref);
+
+ext_proptype(int propid : @py_object ref,
+             int typeid : @py_object ref);
+
+ext_argreturn(int funcid : @py_object ref,
+              int arg : int ref);
+
+py_special_objects(unique int obj : @py_cobject ref,
+                   unique varchar(1) name : string ref);
+
+py_decorated_object(int object : @py_object ref,
+                    int level: int ref);
+
+@py_object = @py_cobject | @py_flow_node;
+
+@py_source_element = @py_ast_node | @container;
diff --git a/python/ql/lib/upgrades/6a1f497168da2f43828161d3c86db7d4c94c2b53/semmlecode.python.dbscheme b/python/ql/lib/upgrades/6a1f497168da2f43828161d3c86db7d4c94c2b53/semmlecode.python.dbscheme
new file mode 100644
index 00000000000..acf8d3b08ae
--- /dev/null
+++ b/python/ql/lib/upgrades/6a1f497168da2f43828161d3c86db7d4c94c2b53/semmlecode.python.dbscheme
@@ -0,0 +1,1261 @@
+/*
+ *      This dbscheme is auto-generated by 'semmle/dbscheme_gen.py'.
+ *      WARNING: Any modifications to this file will be lost.
+ *      Relations can be changed by modifying master.py or
+ *      by adding rules to dbscheme.template
+ */
+
+/* This is a dummy line to alter the dbscheme, so we can make a database upgrade
+ * without actually changing any of the dbscheme predicates. It contains a date
+ * to allow for such updates in the future as well.
+ *
+ * 2020-07-02
+ *
+ * DO NOT remove this comment carelessly, since it can revert the dbscheme back to a
+ * previously seen state (matching a previously seen SHA), which would make the upgrade
+ * mechanism not work properly.
+ */
+
+/*- DEPRECATED: External defects and metrics -*/
+
+externalDefects(
+  unique int id : @externalDefect,
+  varchar(900) queryPath : string ref,
+  int location : @location ref,
+  varchar(900) message : string ref,
+  float severity : float ref
+);
+
+externalMetrics(
+  unique int id : @externalMetric,
+  varchar(900) queryPath : string ref,
+  int location : @location ref,
+  float value : float ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit the tuple `databaseMetadata("isOverlay", "true")`,
+ * along with an `overlayChangedFiles` tuple for each new/modified/deleted file,
+ * when building an overlay database, and these can be used by the discard predicates.
+ */
+databaseMetadata(
+  string metadataKey : string ref,
+  string value : string ref
+);
+
+overlayChangedFiles(
+  string path : string ref
+);
+
+/*- DEPRECATED: Snapshot date -*/
+
+snapshotDate(unique date snapshotDate : date ref);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- DEPRECATED: Duplicate code -*/
+
+duplicateCode(
+  unique int id : @duplication,
+  string relativePath : string ref,
+  int equivClass : int ref
+);
+
+similarCode(
+  unique int id : @similarity,
+  string relativePath : string ref,
+  int equivClass : int ref
+);
+
+@duplication_or_similarity = @duplication | @similarity
+
+tokens(
+  int id : @duplication_or_similarity ref,
+  int offset : int ref,
+  int beginLine : int ref,
+  int beginColumn : int ref,
+  int endLine : int ref,
+  int endColumn : int ref
+);
+
+/*- DEPRECATED: Version control data -*/
+
+svnentries(
+  unique int id : @svnentry,
+  string revision : string ref,
+  string author : string ref,
+  date revisionDate : date ref,
+  int changeSize : int ref
+)
+
+svnaffectedfiles(
+  int id : @svnentry ref,
+  int file : @file ref,
+  string action : string ref
+)
+
+svnentrymsg(
+  unique int id : @svnentry ref,
+  string message : string ref
+)
+
+svnchurn(
+  int commit : @svnentry ref,
+  int file : @file ref,
+  int addedLines : int ref,
+  int deletedLines : int ref
+)
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error;
+
+/*- Python dbscheme -*/
+
+/*
+ * Line metrics
+ */
+py_codelines(int id : @py_scope ref,
+             int count : int ref);
+
+py_commentlines(int id : @py_scope ref,
+                int count : int ref);
+
+py_docstringlines(int id : @py_scope ref,
+                int count : int ref);
+
+py_alllines(int id : @py_scope ref,
+                int count : int ref);
+
+/****************************
+        Python dbscheme
+****************************/
+
+@sourceline = @file | @py_Module | @xmllocatable;
+
+@location = @location_ast | @location_default ;
+
+locations_ast(unique int id: @location_ast,
+          int module: @py_Module ref,
+          int beginLine: int ref,
+          int beginColumn: int ref,
+          int endLine: int ref,
+          int endColumn: int ref);
+
+file_contents(unique int file: @file ref, string contents: string ref);
+
+py_module_path(int module: @py_Module ref, int file: @container ref);
+
+variable(unique int id : @py_variable,
+         int scope : @py_scope ref,
+         varchar(1) name : string ref);
+
+py_line_lengths(unique int id : @py_line,
+                int file: @py_Module ref,
+                int line : int ref,
+                int length : int ref);
+
+py_extracted_version(int module : @py_Module ref,
+                     varchar(1) version : string ref);
+
+/* AUTO GENERATED PART STARTS HERE */
+
+
+/* <Field> AnnAssign.location = 0, location */
+/* <Field> AnnAssign.value = 1, expr */
+/* <Field> AnnAssign.annotation = 2, expr */
+/* <Field> AnnAssign.target = 3, expr */
+
+/* <Field> Assert.location = 0, location */
+/* <Field> Assert.test = 1, expr */
+/* <Field> Assert.msg = 2, expr */
+
+/* <Field> Assign.location = 0, location */
+/* <Field> Assign.value = 1, expr */
+/* <Field> Assign.targets = 2, expr_list */
+
+/* <Field> AssignExpr.location = 0, location */
+/* <Field> AssignExpr.parenthesised = 1, bool */
+/* <Field> AssignExpr.value = 2, expr */
+/* <Field> AssignExpr.target = 3, expr */
+
+/* <Field> Attribute.location = 0, location */
+/* <Field> Attribute.parenthesised = 1, bool */
+/* <Field> Attribute.value = 2, expr */
+/* <Field> Attribute.attr = 3, str */
+/* <Field> Attribute.ctx = 4, expr_context */
+
+/* <Field> AugAssign.location = 0, location */
+/* <Field> AugAssign.operation = 1, BinOp */
+
+/* <Field> Await.location = 0, location */
+/* <Field> Await.parenthesised = 1, bool */
+/* <Field> Await.value = 2, expr */
+
+/* <Field> BinaryExpr.location = 0, location */
+/* <Field> BinaryExpr.parenthesised = 1, bool */
+/* <Field> BinaryExpr.left = 2, expr */
+/* <Field> BinaryExpr.op = 3, operator */
+/* <Field> BinaryExpr.right = 4, expr */
+/* <Parent> BinaryExpr = AugAssign  */
+
+/* <Field> BoolExpr.location = 0, location */
+/* <Field> BoolExpr.parenthesised = 1, bool */
+/* <Field> BoolExpr.op = 2, boolop */
+/* <Field> BoolExpr.values = 3, expr_list */
+
+/* <Field> Break.location = 0, location */
+
+/* <Field> Bytes.location = 0, location */
+/* <Field> Bytes.parenthesised = 1, bool */
+/* <Field> Bytes.s = 2, bytes */
+/* <Field> Bytes.prefix = 3, bytes */
+/* <Field> Bytes.implicitly_concatenated_parts = 4, StringPart_list */
+
+/* <Field> Call.location = 0, location */
+/* <Field> Call.parenthesised = 1, bool */
+/* <Field> Call.func = 2, expr */
+/* <Field> Call.positional_args = 3, expr_list */
+/* <Field> Call.named_args = 4, dict_item_list */
+
+/* <Field> Case.location = 0, location */
+/* <Field> Case.pattern = 1, pattern */
+/* <Field> Case.guard = 2, expr */
+/* <Field> Case.body = 3, stmt_list */
+
+/* <Field> Class.name = 0, str */
+/* <Field> Class.body = 1, stmt_list */
+/* <Parent> Class = ClassExpr  */
+
+/* <Field> ClassExpr.location = 0, location */
+/* <Field> ClassExpr.parenthesised = 1, bool */
+/* <Field> ClassExpr.name = 2, str */
+/* <Field> ClassExpr.bases = 3, expr_list */
+/* <Field> ClassExpr.keywords = 4, dict_item_list */
+/* <Field> ClassExpr.inner_scope = 5, Class */
+/* <Field> ClassExpr.type_parameters = 6, type_parameter_list */
+
+/* <Field> Compare.location = 0, location */
+/* <Field> Compare.parenthesised = 1, bool */
+/* <Field> Compare.left = 2, expr */
+/* <Field> Compare.ops = 3, cmpop_list */
+/* <Field> Compare.comparators = 4, expr_list */
+
+/* <Field> Continue.location = 0, location */
+
+/* <Field> Delete.location = 0, location */
+/* <Field> Delete.targets = 1, expr_list */
+
+/* <Field> Dict.location = 0, location */
+/* <Field> Dict.parenthesised = 1, bool */
+/* <Field> Dict.items = 2, dict_item_list */
+
+/* <Field> DictComp.location = 0, location */
+/* <Field> DictComp.parenthesised = 1, bool */
+/* <Field> DictComp.function = 2, Function */
+/* <Field> DictComp.iterable = 3, expr */
+
+/* <Field> DictUnpacking.location = 0, location */
+/* <Field> DictUnpacking.value = 1, expr */
+
+/* <Field> Ellipsis.location = 0, location */
+/* <Field> Ellipsis.parenthesised = 1, bool */
+
+/* <Field> ExceptGroupStmt.location = 0, location */
+/* <Field> ExceptGroupStmt.type = 1, expr */
+/* <Field> ExceptGroupStmt.name = 2, expr */
+/* <Field> ExceptGroupStmt.body = 3, stmt_list */
+
+/* <Field> ExceptStmt.location = 0, location */
+/* <Field> ExceptStmt.type = 1, expr */
+/* <Field> ExceptStmt.name = 2, expr */
+/* <Field> ExceptStmt.body = 3, stmt_list */
+
+/* <Field> Exec.location = 0, location */
+/* <Field> Exec.body = 1, expr */
+/* <Field> Exec.globals = 2, expr */
+/* <Field> Exec.locals = 3, expr */
+
+/* <Field> ExprStmt.location = 0, location */
+/* <Field> ExprStmt.value = 1, expr */
+
+/* <Field> Filter.location = 0, location */
+/* <Field> Filter.parenthesised = 1, bool */
+/* <Field> Filter.value = 2, expr */
+/* <Field> Filter.filter = 3, expr */
+
+/* <Field> For.location = 0, location */
+/* <Field> For.target = 1, expr */
+/* <Field> For.iter = 2, expr */
+/* <Field> For.body = 3, stmt_list */
+/* <Field> For.orelse = 4, stmt_list */
+/* <Field> For.is_async = 5, bool */
+
+/* <Field> FormattedValue.location = 0, location */
+/* <Field> FormattedValue.parenthesised = 1, bool */
+/* <Field> FormattedValue.value = 2, expr */
+/* <Field> FormattedValue.conversion = 3, str */
+/* <Field> FormattedValue.format_spec = 4, JoinedStr */
+
+/* <Field> Function.name = 0, str */
+/* <Field> Function.args = 1, parameter_list */
+/* <Field> Function.vararg = 2, expr */
+/* <Field> Function.kwonlyargs = 3, expr_list */
+/* <Field> Function.kwarg = 4, expr */
+/* <Field> Function.body = 5, stmt_list */
+/* <Field> Function.is_async = 6, bool */
+/* <Field> Function.type_parameters = 7, type_parameter_list */
+/* <Parent> Function = FunctionParent  */
+
+/* <Field> FunctionExpr.location = 0, location */
+/* <Field> FunctionExpr.parenthesised = 1, bool */
+/* <Field> FunctionExpr.name = 2, str */
+/* <Field> FunctionExpr.args = 3, arguments */
+/* <Field> FunctionExpr.returns = 4, expr */
+/* <Field> FunctionExpr.inner_scope = 5, Function */
+
+/* <Field> GeneratorExp.location = 0, location */
+/* <Field> GeneratorExp.parenthesised = 1, bool */
+/* <Field> GeneratorExp.function = 2, Function */
+/* <Field> GeneratorExp.iterable = 3, expr */
+
+/* <Field> Global.location = 0, location */
+/* <Field> Global.names = 1, str_list */
+
+/* <Field> Guard.location = 0, location */
+/* <Field> Guard.parenthesised = 1, bool */
+/* <Field> Guard.test = 2, expr */
+
+/* <Field> If.location = 0, location */
+/* <Field> If.test = 1, expr */
+/* <Field> If.body = 2, stmt_list */
+/* <Field> If.orelse = 3, stmt_list */
+
+/* <Field> IfExp.location = 0, location */
+/* <Field> IfExp.parenthesised = 1, bool */
+/* <Field> IfExp.test = 2, expr */
+/* <Field> IfExp.body = 3, expr */
+/* <Field> IfExp.orelse = 4, expr */
+
+/* <Field> Import.location = 0, location */
+/* <Field> Import.names = 1, alias_list */
+
+/* <Field> ImportExpr.location = 0, location */
+/* <Field> ImportExpr.parenthesised = 1, bool */
+/* <Field> ImportExpr.level = 2, int */
+/* <Field> ImportExpr.name = 3, str */
+/* <Field> ImportExpr.top = 4, bool */
+
+/* <Field> ImportStar.location = 0, location */
+/* <Field> ImportStar.module = 1, expr */
+
+/* <Field> ImportMember.location = 0, location */
+/* <Field> ImportMember.parenthesised = 1, bool */
+/* <Field> ImportMember.module = 2, expr */
+/* <Field> ImportMember.name = 3, str */
+
+/* <Field> Fstring.location = 0, location */
+/* <Field> Fstring.parenthesised = 1, bool */
+/* <Field> Fstring.values = 2, expr_list */
+/* <Parent> Fstring = FormattedValue  */
+
+/* <Field> KeyValuePair.location = 0, location */
+/* <Field> KeyValuePair.value = 1, expr */
+/* <Field> KeyValuePair.key = 2, expr */
+
+/* <Field> Lambda.location = 0, location */
+/* <Field> Lambda.parenthesised = 1, bool */
+/* <Field> Lambda.args = 2, arguments */
+/* <Field> Lambda.inner_scope = 3, Function */
+
+/* <Field> List.location = 0, location */
+/* <Field> List.parenthesised = 1, bool */
+/* <Field> List.elts = 2, expr_list */
+/* <Field> List.ctx = 3, expr_context */
+
+/* <Field> ListComp.location = 0, location */
+/* <Field> ListComp.parenthesised = 1, bool */
+/* <Field> ListComp.function = 2, Function */
+/* <Field> ListComp.iterable = 3, expr */
+/* <Field> ListComp.generators = 4, comprehension_list */
+/* <Field> ListComp.elt = 5, expr */
+
+/* <Field> MatchStmt.location = 0, location */
+/* <Field> MatchStmt.subject = 1, expr */
+/* <Field> MatchStmt.cases = 2, stmt_list */
+
+/* <Field> MatchAsPattern.location = 0, location */
+/* <Field> MatchAsPattern.parenthesised = 1, bool */
+/* <Field> MatchAsPattern.pattern = 2, pattern */
+/* <Field> MatchAsPattern.alias = 3, expr */
+
+/* <Field> MatchCapturePattern.location = 0, location */
+/* <Field> MatchCapturePattern.parenthesised = 1, bool */
+/* <Field> MatchCapturePattern.variable = 2, expr */
+
+/* <Field> MatchClassPattern.location = 0, location */
+/* <Field> MatchClassPattern.parenthesised = 1, bool */
+/* <Field> MatchClassPattern.class = 2, expr */
+/* <Field> MatchClassPattern.class_name = 3, expr */
+/* <Field> MatchClassPattern.positional = 4, pattern_list */
+/* <Field> MatchClassPattern.keyword = 5, pattern_list */
+
+/* <Field> MatchDoubleStarPattern.location = 0, location */
+/* <Field> MatchDoubleStarPattern.parenthesised = 1, bool */
+/* <Field> MatchDoubleStarPattern.target = 2, pattern */
+
+/* <Field> MatchKeyValuePattern.location = 0, location */
+/* <Field> MatchKeyValuePattern.parenthesised = 1, bool */
+/* <Field> MatchKeyValuePattern.key = 2, pattern */
+/* <Field> MatchKeyValuePattern.value = 3, pattern */
+
+/* <Field> MatchKeywordPattern.location = 0, location */
+/* <Field> MatchKeywordPattern.parenthesised = 1, bool */
+/* <Field> MatchKeywordPattern.attribute = 2, expr */
+/* <Field> MatchKeywordPattern.value = 3, pattern */
+
+/* <Field> MatchLiteralPattern.location = 0, location */
+/* <Field> MatchLiteralPattern.parenthesised = 1, bool */
+/* <Field> MatchLiteralPattern.literal = 2, expr */
+
+/* <Field> MatchMappingPattern.location = 0, location */
+/* <Field> MatchMappingPattern.parenthesised = 1, bool */
+/* <Field> MatchMappingPattern.mappings = 2, pattern_list */
+
+/* <Field> MatchOrPattern.location = 0, location */
+/* <Field> MatchOrPattern.parenthesised = 1, bool */
+/* <Field> MatchOrPattern.patterns = 2, pattern_list */
+
+/* <Field> MatchSequencePattern.location = 0, location */
+/* <Field> MatchSequencePattern.parenthesised = 1, bool */
+/* <Field> MatchSequencePattern.patterns = 2, pattern_list */
+
+/* <Field> MatchStarPattern.location = 0, location */
+/* <Field> MatchStarPattern.parenthesised = 1, bool */
+/* <Field> MatchStarPattern.target = 2, pattern */
+
+/* <Field> MatchValuePattern.location = 0, location */
+/* <Field> MatchValuePattern.parenthesised = 1, bool */
+/* <Field> MatchValuePattern.value = 2, expr */
+
+/* <Field> MatchWildcardPattern.location = 0, location */
+/* <Field> MatchWildcardPattern.parenthesised = 1, bool */
+
+/* <Field> Module.name = 0, str */
+/* <Field> Module.hash = 1, str */
+/* <Field> Module.body = 2, stmt_list */
+/* <Field> Module.kind = 3, str */
+
+/* <Field> Name.location = 0, location */
+/* <Field> Name.parenthesised = 1, bool */
+/* <Field> Name.variable = 2, variable */
+/* <Field> Name.ctx = 3, expr_context */
+/* <Parent> Name = ParameterList  */
+
+/* <Field> Nonlocal.location = 0, location */
+/* <Field> Nonlocal.names = 1, str_list */
+
+/* <Field> Num.location = 0, location */
+/* <Field> Num.parenthesised = 1, bool */
+/* <Field> Num.n = 2, number */
+/* <Field> Num.text = 3, number */
+
+/* <Field> ParamSpec.location = 0, location */
+/* <Field> ParamSpec.name = 1, expr */
+/* <Field> ParamSpec.default = 2, expr */
+
+/* <Field> Pass.location = 0, location */
+
+/* <Field> PlaceHolder.location = 0, location */
+/* <Field> PlaceHolder.parenthesised = 1, bool */
+/* <Field> PlaceHolder.variable = 2, variable */
+/* <Field> PlaceHolder.ctx = 3, expr_context */
+
+/* <Field> Print.location = 0, location */
+/* <Field> Print.dest = 1, expr */
+/* <Field> Print.values = 2, expr_list */
+/* <Field> Print.nl = 3, bool */
+
+/* <Field> Raise.location = 0, location */
+/* <Field> Raise.exc = 1, expr */
+/* <Field> Raise.cause = 2, expr */
+/* <Field> Raise.type = 3, expr */
+/* <Field> Raise.inst = 4, expr */
+/* <Field> Raise.tback = 5, expr */
+
+/* <Field> Repr.location = 0, location */
+/* <Field> Repr.parenthesised = 1, bool */
+/* <Field> Repr.value = 2, expr */
+
+/* <Field> Return.location = 0, location */
+/* <Field> Return.value = 1, expr */
+
+/* <Field> Set.location = 0, location */
+/* <Field> Set.parenthesised = 1, bool */
+/* <Field> Set.elts = 2, expr_list */
+
+/* <Field> SetComp.location = 0, location */
+/* <Field> SetComp.parenthesised = 1, bool */
+/* <Field> SetComp.function = 2, Function */
+/* <Field> SetComp.iterable = 3, expr */
+
+/* <Field> Slice.location = 0, location */
+/* <Field> Slice.parenthesised = 1, bool */
+/* <Field> Slice.start = 2, expr */
+/* <Field> Slice.stop = 3, expr */
+/* <Field> Slice.step = 4, expr */
+
+/* <Field> SpecialOperation.location = 0, location */
+/* <Field> SpecialOperation.parenthesised = 1, bool */
+/* <Field> SpecialOperation.name = 2, str */
+/* <Field> SpecialOperation.arguments = 3, expr_list */
+
+/* <Field> Starred.location = 0, location */
+/* <Field> Starred.parenthesised = 1, bool */
+/* <Field> Starred.value = 2, expr */
+/* <Field> Starred.ctx = 3, expr_context */
+
+/* <Field> Str.location = 0, location */
+/* <Field> Str.parenthesised = 1, bool */
+/* <Field> Str.s = 2, str */
+/* <Field> Str.prefix = 3, str */
+/* <Field> Str.implicitly_concatenated_parts = 4, StringPart_list */
+
+/* <Field> StringPart.text = 0, str */
+/* <Field> StringPart.location = 1, location */
+/* <Parent> StringPart = StringPartList  */
+/* <Parent> StringPartList = BytesOrStr  */
+
+/* <Field> Subscript.location = 0, location */
+/* <Field> Subscript.parenthesised = 1, bool */
+/* <Field> Subscript.value = 2, expr */
+/* <Field> Subscript.index = 3, expr */
+/* <Field> Subscript.ctx = 4, expr_context */
+
+/* <Field> TemplateDottedNotation.location = 0, location */
+/* <Field> TemplateDottedNotation.parenthesised = 1, bool */
+/* <Field> TemplateDottedNotation.value = 2, expr */
+/* <Field> TemplateDottedNotation.attr = 3, str */
+/* <Field> TemplateDottedNotation.ctx = 4, expr_context */
+
+/* <Field> TemplateWrite.location = 0, location */
+/* <Field> TemplateWrite.value = 1, expr */
+
+/* <Field> Try.location = 0, location */
+/* <Field> Try.body = 1, stmt_list */
+/* <Field> Try.orelse = 2, stmt_list */
+/* <Field> Try.handlers = 3, stmt_list */
+/* <Field> Try.finalbody = 4, stmt_list */
+
+/* <Field> Tuple.location = 0, location */
+/* <Field> Tuple.parenthesised = 1, bool */
+/* <Field> Tuple.elts = 2, expr_list */
+/* <Field> Tuple.ctx = 3, expr_context */
+/* <Parent> Tuple = ParameterList  */
+
+/* <Field> TypeAlias.location = 0, location */
+/* <Field> TypeAlias.name = 1, expr */
+/* <Field> TypeAlias.type_parameters = 2, type_parameter_list */
+/* <Field> TypeAlias.value = 3, expr */
+
+/* <Field> TypeVar.location = 0, location */
+/* <Field> TypeVar.name = 1, expr */
+/* <Field> TypeVar.bound = 2, expr */
+/* <Field> TypeVar.default = 3, expr */
+
+/* <Field> TypeVarTuple.location = 0, location */
+/* <Field> TypeVarTuple.name = 1, expr */
+/* <Field> TypeVarTuple.default = 2, expr */
+
+/* <Field> UnaryExpr.location = 0, location */
+/* <Field> UnaryExpr.parenthesised = 1, bool */
+/* <Field> UnaryExpr.op = 2, unaryop */
+/* <Field> UnaryExpr.operand = 3, expr */
+
+/* <Field> While.location = 0, location */
+/* <Field> While.test = 1, expr */
+/* <Field> While.body = 2, stmt_list */
+/* <Field> While.orelse = 3, stmt_list */
+
+/* <Field> With.location = 0, location */
+/* <Field> With.context_expr = 1, expr */
+/* <Field> With.optional_vars = 2, expr */
+/* <Field> With.body = 3, stmt_list */
+/* <Field> With.is_async = 4, bool */
+
+/* <Field> Yield.location = 0, location */
+/* <Field> Yield.parenthesised = 1, bool */
+/* <Field> Yield.value = 2, expr */
+
+/* <Field> YieldFrom.location = 0, location */
+/* <Field> YieldFrom.parenthesised = 1, bool */
+/* <Field> YieldFrom.value = 2, expr */
+
+/* <Field> Alias.value = 0, expr */
+/* <Field> Alias.asname = 1, expr */
+/* <Parent> Alias = AliasList  */
+/* <Parent> AliasList = Import  */
+
+/* <Field> Arguments.kw_defaults = 0, expr_list */
+/* <Field> Arguments.defaults = 1, expr_list */
+/* <Field> Arguments.annotations = 2, expr_list */
+/* <Field> Arguments.varargannotation = 3, expr */
+/* <Field> Arguments.kwargannotation = 4, expr */
+/* <Field> Arguments.kw_annotations = 5, expr_list */
+/* <Parent> Arguments = ArgumentsParent  */
+/* <Parent> boolean = BoolParent  */
+/* <Parent> Boolop = BoolExpr  */
+/* <Parent> string = Bytes  */
+/* <Parent> Cmpop = CmpopList  */
+/* <Parent> CmpopList = Compare  */
+
+/* <Field> Comprehension.location = 0, location */
+/* <Field> Comprehension.iter = 1, expr */
+/* <Field> Comprehension.target = 2, expr */
+/* <Field> Comprehension.ifs = 3, expr_list */
+/* <Parent> Comprehension = ComprehensionList  */
+/* <Parent> ComprehensionList = ListComp  */
+/* <Parent> DictItem = DictItemList  */
+/* <Parent> DictItemList = DictItemListParent  */
+
+/* <Field> Expr.location = 0, location */
+/* <Field> Expr.parenthesised = 1, bool */
+/* <Parent> Expr = ExprParent  */
+/* <Parent> ExprContext = ExprContextParent  */
+/* <Parent> ExprList = ExprListParent  */
+/* <Parent> int = ImportExpr  */
+
+/* <Field> Keyword.location = 0, location */
+/* <Field> Keyword.value = 1, expr */
+/* <Field> Keyword.arg = 2, str */
+/* <Parent> Location = LocationParent  */
+/* <Parent> string = Num  */
+/* <Parent> Operator = BinaryExpr  */
+/* <Parent> ParameterList = Function  */
+
+/* <Field> Pattern.location = 0, location */
+/* <Field> Pattern.parenthesised = 1, bool */
+/* <Parent> Pattern = PatternParent  */
+/* <Parent> PatternList = PatternListParent  */
+
+/* <Field> Stmt.location = 0, location */
+/* <Parent> Stmt = StmtList  */
+/* <Parent> StmtList = StmtListParent  */
+/* <Parent> string = StrParent  */
+/* <Parent> StringList = StrListParent  */
+
+/* <Field> TypeParameter.location = 0, location */
+/* <Parent> TypeParameter = TypeParameterList  */
+/* <Parent> TypeParameterList = TypeParameterListParent  */
+/* <Parent> Unaryop = UnaryExpr  */
+/* <Parent> Variable = VariableParent  */
+py_Classes(unique int id : @py_Class,
+    unique int parent : @py_ClassExpr ref);
+
+py_Functions(unique int id : @py_Function,
+    unique int parent : @py_Function_parent ref);
+
+py_Modules(unique int id : @py_Module);
+
+py_StringParts(unique int id : @py_StringPart,
+    int parent : @py_StringPart_list ref,
+    int idx : int ref);
+
+py_StringPart_lists(unique int id : @py_StringPart_list,
+    unique int parent : @py_Bytes_or_Str ref);
+
+py_aliases(unique int id : @py_alias,
+    int parent : @py_alias_list ref,
+    int idx : int ref);
+
+py_alias_lists(unique int id : @py_alias_list,
+    unique int parent : @py_Import ref);
+
+py_arguments(unique int id : @py_arguments,
+    unique int parent : @py_arguments_parent ref);
+
+py_bools(int parent : @py_bool_parent ref,
+    int idx : int ref);
+
+py_boolops(unique int id : @py_boolop,
+    int kind: int ref,
+    unique int parent : @py_BoolExpr ref);
+
+py_bytes(varchar(1) id : string ref,
+    int parent : @py_Bytes ref,
+    int idx : int ref);
+
+py_cmpops(unique int id : @py_cmpop,
+    int kind: int ref,
+    int parent : @py_cmpop_list ref,
+    int idx : int ref);
+
+py_cmpop_lists(unique int id : @py_cmpop_list,
+    unique int parent : @py_Compare ref);
+
+py_comprehensions(unique int id : @py_comprehension,
+    int parent : @py_comprehension_list ref,
+    int idx : int ref);
+
+py_comprehension_lists(unique int id : @py_comprehension_list,
+    unique int parent : @py_ListComp ref);
+
+py_dict_items(unique int id : @py_dict_item,
+    int kind: int ref,
+    int parent : @py_dict_item_list ref,
+    int idx : int ref);
+
+py_dict_item_lists(unique int id : @py_dict_item_list,
+    unique int parent : @py_dict_item_list_parent ref);
+
+py_exprs(unique int id : @py_expr,
+    int kind: int ref,
+    int parent : @py_expr_parent ref,
+    int idx : int ref);
+
+py_expr_contexts(unique int id : @py_expr_context,
+    int kind: int ref,
+    unique int parent : @py_expr_context_parent ref);
+
+py_expr_lists(unique int id : @py_expr_list,
+    int parent : @py_expr_list_parent ref,
+    int idx : int ref);
+
+py_ints(int id : int ref,
+    unique int parent : @py_ImportExpr ref);
+
+py_locations(unique int id : @location ref,
+    unique int parent : @py_location_parent ref);
+
+py_numbers(varchar(1) id : string ref,
+    int parent : @py_Num ref,
+    int idx : int ref);
+
+py_operators(unique int id : @py_operator,
+    int kind: int ref,
+    unique int parent : @py_BinaryExpr ref);
+
+py_parameter_lists(unique int id : @py_parameter_list,
+    unique int parent : @py_Function ref);
+
+py_patterns(unique int id : @py_pattern,
+    int kind: int ref,
+    int parent : @py_pattern_parent ref,
+    int idx : int ref);
+
+py_pattern_lists(unique int id : @py_pattern_list,
+    int parent : @py_pattern_list_parent ref,
+    int idx : int ref);
+
+py_stmts(unique int id : @py_stmt,
+    int kind: int ref,
+    int parent : @py_stmt_list ref,
+    int idx : int ref);
+
+py_stmt_lists(unique int id : @py_stmt_list,
+    int parent : @py_stmt_list_parent ref,
+    int idx : int ref);
+
+py_strs(varchar(1) id : string ref,
+    int parent : @py_str_parent ref,
+    int idx : int ref);
+
+py_str_lists(unique int id : @py_str_list,
+    unique int parent : @py_str_list_parent ref);
+
+py_type_parameters(unique int id : @py_type_parameter,
+    int kind: int ref,
+    int parent : @py_type_parameter_list ref,
+    int idx : int ref);
+
+py_type_parameter_lists(unique int id : @py_type_parameter_list,
+    unique int parent : @py_type_parameter_list_parent ref);
+
+py_unaryops(unique int id : @py_unaryop,
+    int kind: int ref,
+    unique int parent : @py_UnaryExpr ref);
+
+py_variables(int id : @py_variable ref,
+    unique int parent : @py_variable_parent ref);
+
+case @py_boolop.kind of
+    0 = @py_And
+|   1 = @py_Or;
+
+case @py_cmpop.kind of
+    0 = @py_Eq
+|   1 = @py_Gt
+|   2 = @py_GtE
+|   3 = @py_In
+|   4 = @py_Is
+|   5 = @py_IsNot
+|   6 = @py_Lt
+|   7 = @py_LtE
+|   8 = @py_NotEq
+|   9 = @py_NotIn;
+
+case @py_dict_item.kind of
+    0 = @py_DictUnpacking
+|   1 = @py_KeyValuePair
+|   2 = @py_keyword;
+
+case @py_expr.kind of
+    0 = @py_Attribute
+|   1 = @py_BinaryExpr
+|   2 = @py_BoolExpr
+|   3 = @py_Bytes
+|   4 = @py_Call
+|   5 = @py_ClassExpr
+|   6 = @py_Compare
+|   7 = @py_Dict
+|   8 = @py_DictComp
+|   9 = @py_Ellipsis
+|   10 = @py_FunctionExpr
+|   11 = @py_GeneratorExp
+|   12 = @py_IfExp
+|   13 = @py_ImportExpr
+|   14 = @py_ImportMember
+|   15 = @py_Lambda
+|   16 = @py_List
+|   17 = @py_ListComp
+|   18 = @py_Guard
+|   19 = @py_Name
+|   20 = @py_Num
+|   21 = @py_Repr
+|   22 = @py_Set
+|   23 = @py_SetComp
+|   24 = @py_Slice
+|   25 = @py_Starred
+|   26 = @py_Str
+|   27 = @py_Subscript
+|   28 = @py_Tuple
+|   29 = @py_UnaryExpr
+|   30 = @py_Yield
+|   31 = @py_YieldFrom
+|   32 = @py_TemplateDottedNotation
+|   33 = @py_Filter
+|   34 = @py_PlaceHolder
+|   35 = @py_Await
+|   36 = @py_Fstring
+|   37 = @py_FormattedValue
+|   38 = @py_AssignExpr
+|   39 = @py_SpecialOperation;
+
+case @py_expr_context.kind of
+    0 = @py_AugLoad
+|   1 = @py_AugStore
+|   2 = @py_Del
+|   3 = @py_Load
+|   4 = @py_Param
+|   5 = @py_Store;
+
+case @py_operator.kind of
+    0 = @py_Add
+|   1 = @py_BitAnd
+|   2 = @py_BitOr
+|   3 = @py_BitXor
+|   4 = @py_Div
+|   5 = @py_FloorDiv
+|   6 = @py_LShift
+|   7 = @py_Mod
+|   8 = @py_Mult
+|   9 = @py_Pow
+|   10 = @py_RShift
+|   11 = @py_Sub
+|   12 = @py_MatMult;
+
+case @py_pattern.kind of
+    0 = @py_MatchAsPattern
+|   1 = @py_MatchOrPattern
+|   2 = @py_MatchLiteralPattern
+|   3 = @py_MatchCapturePattern
+|   4 = @py_MatchWildcardPattern
+|   5 = @py_MatchValuePattern
+|   6 = @py_MatchSequencePattern
+|   7 = @py_MatchStarPattern
+|   8 = @py_MatchMappingPattern
+|   9 = @py_MatchDoubleStarPattern
+|   10 = @py_MatchKeyValuePattern
+|   11 = @py_MatchClassPattern
+|   12 = @py_MatchKeywordPattern;
+
+case @py_stmt.kind of
+    0 = @py_Assert
+|   1 = @py_Assign
+|   2 = @py_AugAssign
+|   3 = @py_Break
+|   4 = @py_Continue
+|   5 = @py_Delete
+|   6 = @py_ExceptStmt
+|   7 = @py_ExceptGroupStmt
+|   8 = @py_Exec
+|   9 = @py_Expr_stmt
+|   10 = @py_For
+|   11 = @py_Global
+|   12 = @py_If
+|   13 = @py_Import
+|   14 = @py_ImportStar
+|   15 = @py_MatchStmt
+|   16 = @py_Case
+|   17 = @py_Nonlocal
+|   18 = @py_Pass
+|   19 = @py_Print
+|   20 = @py_Raise
+|   21 = @py_Return
+|   22 = @py_Try
+|   23 = @py_While
+|   24 = @py_With
+|   25 = @py_TemplateWrite
+|   26 = @py_AnnAssign
+|   27 = @py_TypeAlias;
+
+case @py_type_parameter.kind of
+    0 = @py_ParamSpec
+|   1 = @py_TypeVar
+|   2 = @py_TypeVarTuple;
+
+case @py_unaryop.kind of
+    0 = @py_Invert
+|   1 = @py_Not
+|   2 = @py_UAdd
+|   3 = @py_USub;
+
+@py_Bytes_or_Str = @py_Bytes | @py_Str;
+
+@py_Function_parent = @py_DictComp | @py_FunctionExpr | @py_GeneratorExp | @py_Lambda | @py_ListComp | @py_SetComp;
+
+@py_arguments_parent = @py_FunctionExpr | @py_Lambda;
+
+@py_ast_node = @py_Class | @py_Function | @py_Module | @py_StringPart | @py_comprehension | @py_dict_item | @py_expr | @py_pattern | @py_stmt | @py_type_parameter;
+
+@py_bool_parent = @py_For | @py_Function | @py_Print | @py_With | @py_expr | @py_pattern;
+
+@py_dict_item_list_parent = @py_Call | @py_ClassExpr | @py_Dict;
+
+@py_expr_context_parent = @py_Attribute | @py_List | @py_Name | @py_PlaceHolder | @py_Starred | @py_Subscript | @py_TemplateDottedNotation | @py_Tuple;
+
+@py_expr_list_parent = @py_Assign | @py_BoolExpr | @py_Call | @py_ClassExpr | @py_Compare | @py_Delete | @py_Fstring | @py_Function | @py_List | @py_Print | @py_Set | @py_SpecialOperation | @py_Tuple | @py_arguments | @py_comprehension;
+
+@py_expr_or_stmt = @py_expr | @py_stmt;
+
+@py_expr_parent = @py_AnnAssign | @py_Assert | @py_Assign | @py_AssignExpr | @py_Attribute | @py_AugAssign | @py_Await | @py_BinaryExpr | @py_Call | @py_Case | @py_Compare | @py_DictComp | @py_DictUnpacking | @py_ExceptGroupStmt | @py_ExceptStmt | @py_Exec | @py_Expr_stmt | @py_Filter | @py_For | @py_FormattedValue | @py_Function | @py_FunctionExpr | @py_GeneratorExp | @py_Guard | @py_If | @py_IfExp | @py_ImportMember | @py_ImportStar | @py_KeyValuePair | @py_ListComp | @py_MatchAsPattern | @py_MatchCapturePattern | @py_MatchClassPattern | @py_MatchKeywordPattern | @py_MatchLiteralPattern | @py_MatchStmt | @py_MatchValuePattern | @py_ParamSpec | @py_Print | @py_Raise | @py_Repr | @py_Return | @py_SetComp | @py_Slice | @py_Starred | @py_Subscript | @py_TemplateDottedNotation | @py_TemplateWrite | @py_TypeAlias | @py_TypeVar | @py_TypeVarTuple | @py_UnaryExpr | @py_While | @py_With | @py_Yield | @py_YieldFrom | @py_alias | @py_arguments | @py_comprehension | @py_expr_list | @py_keyword | @py_parameter_list;
+
+@py_location_parent = @py_DictUnpacking | @py_KeyValuePair | @py_StringPart | @py_comprehension | @py_expr | @py_keyword | @py_pattern | @py_stmt | @py_type_parameter;
+
+@py_parameter = @py_Name | @py_Tuple;
+
+@py_pattern_list_parent = @py_MatchClassPattern | @py_MatchMappingPattern | @py_MatchOrPattern | @py_MatchSequencePattern;
+
+@py_pattern_parent = @py_Case | @py_MatchAsPattern | @py_MatchDoubleStarPattern | @py_MatchKeyValuePattern | @py_MatchKeywordPattern | @py_MatchStarPattern | @py_pattern_list;
+
+@py_scope = @py_Class | @py_Function | @py_Module;
+
+@py_stmt_list_parent = @py_Case | @py_Class | @py_ExceptGroupStmt | @py_ExceptStmt | @py_For | @py_Function | @py_If | @py_MatchStmt | @py_Module | @py_Try | @py_While | @py_With;
+
+@py_str_list_parent = @py_Global | @py_Nonlocal;
+
+@py_str_parent = @py_Attribute | @py_Class | @py_ClassExpr | @py_FormattedValue | @py_Function | @py_FunctionExpr | @py_ImportExpr | @py_ImportMember | @py_Module | @py_SpecialOperation | @py_Str | @py_StringPart | @py_TemplateDottedNotation | @py_keyword | @py_str_list;
+
+@py_type_parameter_list_parent = @py_ClassExpr | @py_Function | @py_TypeAlias;
+
+@py_variable_parent = @py_Name | @py_PlaceHolder;
+
+
+/*
+ * End of auto-generated part
+ */
+
+
+
+/* Map relative names to absolute names for imports */
+py_absolute_names(int module : @py_Module ref,
+                  varchar(1) relname : string ref,
+                  varchar(1) absname : string ref);
+
+py_exports(int id : @py_Module ref,
+           varchar(1) name : string ref);
+
+/* Successor information */
+py_successors(int predecessor : @py_flow_node ref,
+              int successor : @py_flow_node ref);
+
+py_true_successors(int predecessor : @py_flow_node ref,
+              int successor : @py_flow_node ref);
+
+py_exception_successors(int predecessor : @py_flow_node ref,
+              int successor : @py_flow_node ref);
+
+py_false_successors(int predecessor : @py_flow_node ref,
+              int successor : @py_flow_node ref);
+
+py_flow_bb_node(unique int flownode : @py_flow_node,
+             int realnode : @py_ast_node ref,
+             int basicblock : @py_flow_node ref,
+             int index : int ref);
+
+py_scope_flow(int flow : @py_flow_node ref,
+              int scope : @py_scope ref,
+              int kind : int ref);
+
+py_idoms(unique int node : @py_flow_node ref,
+         int immediate_dominator : @py_flow_node ref);
+
+py_ssa_phi(int phi : @py_ssa_var ref,
+           int arg: @py_ssa_var ref);
+
+py_ssa_var(unique int id : @py_ssa_var,
+            int var : @py_variable ref);
+
+py_ssa_use(int node: @py_flow_node ref,
+           int var : @py_ssa_var ref);
+
+py_ssa_defn(unique int id : @py_ssa_var ref,
+                  int node: @py_flow_node ref);
+
+@py_base_var = @py_variable | @py_ssa_var;
+
+py_scopes(unique int node : @py_expr_or_stmt ref,
+         int scope : @py_scope ref);
+
+py_scope_location(unique int id : @location ref,
+                   unique int scope : @py_scope ref);
+
+py_flags_versioned(varchar(1) name : string ref,
+                   varchar(1) value : string ref,
+                   varchar(1) version : string ref);
+
+py_syntax_error_versioned(unique int id : @location ref,
+                varchar(1) message : string ref,
+                varchar(1) version : string ref);
+
+py_comments(unique int id : @py_comment,
+           varchar(1) text : string ref,
+           unique int location : @location ref);
+
+/* Type information support */
+
+py_cobjects(unique int obj : @py_cobject);
+
+py_cobjecttypes(unique int obj : @py_cobject ref,
+                int typeof : @py_cobject ref);
+
+py_cobjectnames(unique int obj : @py_cobject ref,
+                varchar(1) name : string ref);
+
+/* Kind should be 0 for introspection, > 0 from source, as follows:
+   1 from C extension source
+ */
+py_cobject_sources(int obj : @py_cobject ref,
+                  int kind : int ref);
+
+py_cmembers_versioned(int object : @py_cobject ref,
+                      varchar(1) name : string ref,
+                      int member : @py_cobject ref,
+                      varchar(1) version : string ref);
+
+py_citems(int object : @py_cobject ref,
+            int index : int ref,
+            int member : @py_cobject ref);
+
+ext_argtype(int funcid : @py_object ref,
+            int arg : int ref,
+            int typeid : @py_object ref);
+
+ext_rettype(int funcid : @py_object ref,
+            int typeid : @py_object ref);
+
+ext_proptype(int propid : @py_object ref,
+             int typeid : @py_object ref);
+
+ext_argreturn(int funcid : @py_object ref,
+              int arg : int ref);
+
+py_special_objects(unique int obj : @py_cobject ref,
+                   unique varchar(1) name : string ref);
+
+py_decorated_object(int object : @py_object ref,
+                    int level: int ref);
+
+@py_object = @py_cobject | @py_flow_node;
+
+@py_source_element = @py_ast_node | @container;
+
+/** The union of all Python database entities */
+@top =
+  @py_source_element | @py_object | @py_base_var | @location | @py_line | @py_comment |
+      @py_expr_parent | @py_expr_context |
+      @py_operator | @py_boolop | @py_cmpop | @py_unaryop |
+      @py_cmpop_list | @py_alias_list | @py_StringPart_list | @py_comprehension_list | @py_dict_item_list | @py_pattern_list | @py_stmt_list | @py_str_list | @py_type_parameter_list |
+      @externalDefect | @externalMetric | @externalDataElement | @duplication_or_similarity | @svnentry |
+      @xmllocatable | @yaml_locatable;
diff --git a/python/ql/lib/upgrades/6a1f497168da2f43828161d3c86db7d4c94c2b53/upgrade.properties b/python/ql/lib/upgrades/6a1f497168da2f43828161d3c86db7d4c94c2b53/upgrade.properties
new file mode 100644
index 00000000000..63392513719
--- /dev/null
+++ b/python/ql/lib/upgrades/6a1f497168da2f43828161d3c86db7d4c94c2b53/upgrade.properties
@@ -0,0 +1,2 @@
+description: Add @top type
+compatibility: full
diff --git a/python/ql/src/CHANGELOG.md b/python/ql/src/CHANGELOG.md
index 4e5033cfb45..65fd05e047b 100644
--- a/python/ql/src/CHANGELOG.md
+++ b/python/ql/src/CHANGELOG.md
@@ -1,3 +1,39 @@
+## 1.6.8
+
+### Minor Analysis Improvements
+
+* The `py/insecure-cookie` query has been split into multiple queries; with `py/insecure-cookie` checking for cases in which `Secure` flag is not set, `py/client-exposed-cookie` checking for cases in which the `HttpOnly` flag is not set, and the `py/samesite-none` query checking for cases in which the `SameSite` attribute is set to `None`. These queries also now only alert for cases in which the cookie is detected to contain sensitive data.
+
+## 1.6.7
+
+No user-facing changes.
+
+## 1.6.6
+
+### Minor Analysis Improvements
+
+- The queries that check for unmatchable `$` and `^` in regular expressions did not account correctly for occurrences inside lookahead and lookbehind assertions. These occurrences are now handled correctly, eliminating this source of false positives.
+* The `py/inheritance/signature-mismatch` query has been modernized. It produces more precise results and more descriptive alert messages. 
+* The `py/inheritance/incorrect-overriding-signature` query has been deprecated. Its results have been consolidated into the `py/inheritance/signature-mismatch` query.
+
+## 1.6.5
+
+### Minor Analysis Improvements
+
+* The queries `py/missing-call-to-init`, `py/missing-calls-to-del`, `py/multiple-calls-to-init`, and `py/multiple-calls-to-del` queries have been modernized; no longer relying on outdated libraries, producing more precise results with more descriptive alert messages, and improved documentation.
+
+## 1.6.4
+
+### Minor Analysis Improvements
+
+* The `py/unexpected-raise-in-special-method` query has been modernized. It produces additional results in cases where the exception is 
+only raised conditionally. Its precision has been changed from `very-high` to `high`.
+* The queries `py/incomplete-ordering`, `py/inconsistent-equality`, and `py/equals-hash-mismatch` have been modernized; no longer relying on outdated libraries, improved documentation, and no longer producing alerts for problems specific to Python 2.
+
+## 1.6.3
+
+No user-facing changes.
+
 ## 1.6.2
 
 No user-facing changes.
diff --git a/python/ql/src/Classes/CallsToInitDel/MethodCallOrder.qll b/python/ql/src/Classes/CallsToInitDel/MethodCallOrder.qll
new file mode 100644
index 00000000000..635953168d7
--- /dev/null
+++ b/python/ql/src/Classes/CallsToInitDel/MethodCallOrder.qll
@@ -0,0 +1,207 @@
+/** Definitions for reasoning about multiple or missing calls to superclass methods. */
+
+import python
+import semmle.python.ApiGraphs
+import semmle.python.dataflow.new.internal.DataFlowDispatch
+import codeql.util.Option
+
+/** Holds if `meth` is a method named `name` that transitively calls `calledMulti` of the same name via the calls `call1` and `call2`. */
+predicate multipleCallsToSuperclassMethod(
+  Function meth, Function calledMulti, DataFlow::MethodCallNode call1,
+  DataFlow::MethodCallNode call2, string name
+) {
+  exists(Class cls |
+    meth.getName() = name and
+    meth.getScope() = cls and
+    locationBefore(call1.getLocation(), call2.getLocation()) and
+    rankedSuperCallByLocation(1, cls, meth, call1, name, calledMulti) and
+    rankedSuperCallByLocation(2, cls, meth, call2, name, calledMulti) and
+    nonTrivial(calledMulti)
+  )
+}
+
+predicate rankedSuperCallByLocation(
+  int i, Class mroBase, Function meth, DataFlow::MethodCallNode call, string name, Function target
+) {
+  call =
+    rank[i](DataFlow::MethodCallNode calli |
+      target = getASuperCallTargetFromCall(mroBase, meth, calli, name)
+    |
+      calli order by calli.getLocation().getStartLine(), calli.getLocation().getStartColumn()
+    )
+}
+
+/** Holds if l1 comes before l2, assuming they're in the same file. */
+pragma[inline]
+private predicate locationBefore(Location l1, Location l2) {
+  l1.getStartLine() < l2.getStartLine()
+  or
+  l1.getStartLine() = l2.getStartLine() and
+  l1.getStartColumn() < l2.getStartColumn()
+}
+
+/** Gets a method transitively called by `meth` named `name` with `call` that it overrides, with `mroBase` as the type determining the MRO to search. */
+Function getASuperCallTargetFromCall(
+  Class mroBase, Function meth, DataFlow::MethodCallNode call, string name
+) {
+  exists(Function target | target = getDirectSuperCallTargetFromCall(mroBase, meth, call, name) |
+    result = target
+    or
+    result = getASuperCallTargetFromCall(mroBase, target, _, name)
+  )
+}
+
+/** Gets the method called by `meth` named `name` with `call`, with `mroBase` as the type determining the MRO to search. */
+Function getDirectSuperCallTargetFromCall(
+  Class mroBase, Function meth, DataFlow::MethodCallNode call, string name
+) {
+  meth = call.getScope() and
+  meth.getName() = name and
+  call.calls(_, name) and
+  mroBase = getADirectSubclass*(meth.getScope()) and
+  exists(Class targetCls |
+    // the differences between 0-arg and 2-arg super is not considered; we assume each super uses the mro of the instance `self`
+    superCall(call, _) and
+    targetCls = getNextClassInMroKnownStartingClass(meth.getScope(), mroBase) and
+    result = findFunctionAccordingToMroKnownStartingClass(targetCls, mroBase, name)
+    or
+    // targetCls is the mro base for this lookup.
+    // note however that if the call we find uses super(), that still uses the mro of the instance `self`
+    // assuming it's 0-arg or is 2-arg with `self` as second arg.
+    callsMethodOnClassWithSelf(meth, call, targetCls, _) and
+    result = findFunctionAccordingToMroKnownStartingClass(targetCls, targetCls, name)
+  )
+}
+
+/** Gets a method that is transitively called by a call to `cls.<name>`, with `mroBase` as the type determining the MRO to search. */
+Function getASuperCallTargetFromClass(Class mroBase, Class cls, string name) {
+  exists(Function target |
+    target = findFunctionAccordingToMroKnownStartingClass(cls, mroBase, name) and
+    (
+      result = target
+      or
+      result = getASuperCallTargetFromCall(mroBase, target, _, name)
+    )
+  )
+}
+
+/** Holds if `meth` does something besides calling a superclass method. */
+predicate nonTrivial(Function meth) {
+  exists(Stmt s | s = meth.getAStmt() |
+    not s instanceof Pass and
+    not exists(DataFlow::Node call | call.asExpr() = s.(ExprStmt).getValue() |
+      superCall(call, meth.getName())
+      or
+      callsMethodOnClassWithSelf(meth, call, _, meth.getName())
+    )
+  ) and
+  exists(meth.getANormalExit()) // doesn't always raise an exception
+}
+
+/** Holds if `call` is a call to `super().<name>`. No distinction is made between 0- and 2- arg super calls. */
+predicate superCall(DataFlow::MethodCallNode call, string name) {
+  exists(DataFlow::Node sup |
+    call.calls(sup, name) and
+    sup = API::builtin("super").getACall()
+  )
+}
+
+/** Holds if `meth` calls a `super()` method of the same name. */
+predicate callsSuper(Function meth) {
+  exists(DataFlow::MethodCallNode call |
+    call.getScope() = meth and
+    superCall(call, meth.getName())
+  )
+}
+
+/** Holds if `meth` calls `target.<name>(self, ...)` with the call `call`. */
+predicate callsMethodOnClassWithSelf(
+  Function meth, DataFlow::MethodCallNode call, Class target, string name
+) {
+  exists(DataFlow::Node callTarget, DataFlow::ParameterNode self |
+    call.calls(callTarget, name) and
+    self.getParameter() = meth.getArg(0) and
+    self.(DataFlow::LocalSourceNode).flowsTo(call.getArg(0)) and
+    callTarget = classTracker(target)
+  )
+}
+
+/** Holds if `meth` calls a method named `name` passing its `self` argument as its first parameter, but the class it refers to is unknown. */
+predicate callsMethodOnUnknownClassWithSelf(Function meth, string name) {
+  exists(DataFlow::MethodCallNode call, DataFlow::Node callTarget, DataFlow::ParameterNode self |
+    call.calls(callTarget, name) and
+    self.getParameter() = meth.getArg(0) and
+    self.(DataFlow::LocalSourceNode).flowsTo(call.getArg(0)) and
+    not callTarget = classTracker(any(Class target))
+  )
+}
+
+/** Holds if `base` does not call a superclass method `shouldCall` named `name` when it appears it should. */
+predicate missingCallToSuperclassMethod(Class base, Function shouldCall, string name) {
+  shouldCall.getName() = name and
+  shouldCall.getScope() = getADirectSuperclass+(base) and
+  not shouldCall = getASuperCallTargetFromClass(base, base, name) and
+  nonTrivial(shouldCall) and
+  // "Benefit of the doubt" - if somewhere in the chain we call an unknown superclass, assume all the necessary parent methods are called from it
+  not callsMethodOnUnknownClassWithSelf(getASuperCallTargetFromClass(base, base, name), name)
+}
+
+/**
+ * Holds if `base` does not call a superclass method `shouldCall` named `name` when it appears it should.
+ * Results are restricted to hold only for the highest `base` class and the lowest `shouldCall` method in the hierarchy for which this applies.
+ */
+predicate missingCallToSuperclassMethodRestricted(Class base, Function shouldCall, string name) {
+  missingCallToSuperclassMethod(base, shouldCall, name) and
+  not exists(Class superBase |
+    // Alert only on the highest base class that has the issue
+    superBase = getADirectSuperclass+(base) and
+    missingCallToSuperclassMethod(superBase, shouldCall, name)
+  ) and
+  not exists(Function subShouldCall |
+    // Mention in the alert only the lowest method we're missing the call to
+    subShouldCall.getScope() = getADirectSubclass+(shouldCall.getScope()) and
+    missingCallToSuperclassMethod(base, subShouldCall, name)
+  )
+}
+
+/**
+ * If `base` contains a `super()` call, gets a method in the inheritance hierarchy of `name` in the MRO of `base`
+ * that does not contain a `super()` call, but would call `shouldCall` if it did, which does not otherwise get called
+ * during a call to `base.<name>`.
+ */
+Function getPossibleMissingSuper(Class base, Function shouldCall, string name) {
+  missingCallToSuperclassMethod(base, shouldCall, name) and
+  exists(Function baseMethod |
+    baseMethod.getScope() = base and
+    baseMethod.getName() = name and
+    // the base method calls super, so is presumably expecting every method called in the MRO chain to do so
+    callsSuper(baseMethod) and
+    // result is something that does get called in the chain
+    result = getASuperCallTargetFromClass(base, base, name) and
+    // it doesn't call super
+    not callsSuper(result) and
+    // if it did call super, it would resolve to the missing method
+    shouldCall =
+      findFunctionAccordingToMroKnownStartingClass(getNextClassInMroKnownStartingClass(result
+              .getScope(), base), base, name)
+  )
+}
+
+/** An optional `Function`. */
+class FunctionOption extends LocatableOption<Location, Function>::Option {
+  /** Gets the qualified name of this function, or the empty string if it is None. */
+  string getQualifiedName() {
+    this.isNone() and result = ""
+    or
+    result = this.asSome().getQualifiedName()
+  }
+}
+
+/** Gets the result of `getPossibleMissingSuper`, or None if none exists. */
+bindingset[name]
+FunctionOption getPossibleMissingSuperOption(Class base, Function shouldCall, string name) {
+  result.asSome() = getPossibleMissingSuper(base, shouldCall, name)
+  or
+  not exists(getPossibleMissingSuper(base, shouldCall, name)) and
+  result.isNone()
+}
diff --git a/python/ql/src/Classes/CallsToInitDel/MissingCallToDel.qhelp b/python/ql/src/Classes/CallsToInitDel/MissingCallToDel.qhelp
new file mode 100644
index 00000000000..83aac7629eb
--- /dev/null
+++ b/python/ql/src/Classes/CallsToInitDel/MissingCallToDel.qhelp
@@ -0,0 +1,52 @@
+<!DOCTYPE qhelp PUBLIC
+  "-//Semmle//qhelp//EN"
+  "qhelp.dtd">
+<qhelp>
+
+<overview>
+<p>
+Python, unlike some other object-oriented languages such as Java, allows the developer complete freedom in 
+when and how superclass finalizers are called during object finalization.
+However, the developer has responsibility for ensuring that objects are properly cleaned up, and that all superclass <code>__del__</code> 
+methods are called.
+</p>
+<p>
+Classes with a <code>__del__</code> method (a finalizer) typically hold some resource such as a file handle that needs to be cleaned up. 
+If the  <code>__del__</code> method of a superclass is not called during object finalization, it is likely that
+resources may be leaked.
+</p>
+
+<p>A call to the <code>__del__</code> method of a superclass during object initialization may be unintentionally skipped:
+</p>
+<ul>
+        <li>If a subclass calls the <code>__del__</code> method of the wrong class.</li>
+        <li>If a call to the <code>__del__</code> method of one its base classes is omitted.</li>
+        <li>If a call to <code>super().__del__</code> is used, but not all <code>__del__</code> methods in the Method Resolution Order (MRO)
+        chain themselves call <code>super()</code>. This in particular arises more often in cases of multiple inheritance. </li>
+</ul>
+
+
+</overview>
+<recommendation>
+<p>Ensure that all superclass <code>__del__</code> methods are properly called. 
+Either each base class's finalize method should be explicitly called, or <code>super()</code> calls 
+should be consistently used throughout the inheritance hierarchy.</p>
+
+
+</recommendation>
+<example>
+<p>In the following example, explicit calls to <code>__del__</code> are used, but <code>SportsCar</code> erroneously calls
+<code>Vehicle.__del__</code>. This is fixed in <code>FixedSportsCar</code> by calling <code>Car.__del__</code>.
+</p>
+
+<sample src="examples/MissingCallToDel.py" />
+
+</example>
+<references>
+
+        <li>Python Reference: <a href="https://docs.python.org/3/reference/datamodel.html#object.__del__">__del__</a>.</li>
+        <li>Python Standard Library: <a href="https://docs.python.org/3/library/functions.html#super">super</a>.</li>
+        <li>Python Glossary: <a href="https://docs.python.org/3/glossary.html#term-method-resolution-order">Method resolution order</a>.</li>
+
+</references>
+</qhelp>
diff --git a/python/ql/src/Classes/CallsToInitDel/MissingCallToDel.ql b/python/ql/src/Classes/CallsToInitDel/MissingCallToDel.ql
new file mode 100644
index 00000000000..7d8e11b569d
--- /dev/null
+++ b/python/ql/src/Classes/CallsToInitDel/MissingCallToDel.ql
@@ -0,0 +1,49 @@
+/**
+ * @name Missing call to superclass `__del__` during object destruction
+ * @description An omitted call to a superclass `__del__` method may lead to class instances not being cleaned up properly.
+ * @kind problem
+ * @tags quality
+ *       reliability
+ *       correctness
+ *       performance
+ * @problem.severity error
+ * @sub-severity low
+ * @precision high
+ * @id py/missing-call-to-delete
+ */
+
+import python
+import MethodCallOrder
+
+Function getDelMethod(Class c) {
+  result = c.getAMethod() and
+  result.getName() = "__del__"
+}
+
+from Class base, Function shouldCall, FunctionOption possibleIssue, string msg
+where
+  not exists(Function newMethod | newMethod = base.getAMethod() and newMethod.getName() = "__new__") and
+  exists(FunctionOption possiblyMissingSuper |
+    missingCallToSuperclassMethodRestricted(base, shouldCall, "__del__") and
+    possiblyMissingSuper = getPossibleMissingSuperOption(base, shouldCall, "__del__") and
+    (
+      not possiblyMissingSuper.isNone() and
+      possibleIssue = possiblyMissingSuper and
+      msg =
+        "This class does not call $@ during finalization. ($@ may be missing a call to super().__del__)"
+      or
+      possiblyMissingSuper.isNone() and
+      (
+        possibleIssue.asSome() = getDelMethod(base) and
+        msg =
+          "This class does not call $@ during finalization. ($@ may be missing a call to a base class __del__)"
+        or
+        not exists(getDelMethod(base)) and
+        possibleIssue.isNone() and
+        msg =
+          "This class does not call $@ during finalization. (The class lacks an __del__ method to ensure every base class __del__ is called.)"
+      )
+    )
+  )
+select base, msg, shouldCall, shouldCall.getQualifiedName(), possibleIssue,
+  possibleIssue.getQualifiedName()
diff --git a/python/ql/src/Classes/CallsToInitDel/MissingCallToInit.qhelp b/python/ql/src/Classes/CallsToInitDel/MissingCallToInit.qhelp
new file mode 100644
index 00000000000..76121446f99
--- /dev/null
+++ b/python/ql/src/Classes/CallsToInitDel/MissingCallToInit.qhelp
@@ -0,0 +1,50 @@
+<!DOCTYPE qhelp PUBLIC
+  "-//Semmle//qhelp//EN"
+  "qhelp.dtd">
+<qhelp>
+
+<overview>
+<p>Python, unlike some other object-oriented languages such as Java, allows the developer complete freedom in 
+when and how superclass initializers are called during object initialization.
+However, the developer has responsibility for ensuring that objects are properly initialized, and that all superclass <code>__init__</code> 
+methods are called.
+</p>
+<p>
+If the  <code>__init__</code> method of a superclass is not called during object initialization, this can lead to errors due to
+the object not being fully initialized, such as having missing attributes.
+</p>
+
+<p>A call to the <code>__init__</code> method of a superclass during object initialization may be unintentionally skipped:
+</p>
+<ul>
+        <li>If a subclass calls the <code>__init__</code> method of the wrong class.</li>
+        <li>If a call to the <code>__init__</code> method of one its base classes is omitted.</li>
+        <li>If a call to <code>super().__init__</code> is used, but not all <code>__init__</code> methods in the Method Resolution Order (MRO)
+        chain themselves call <code>super()</code>. This in particular arises more often in cases of multiple inheritance. </li>
+</ul>
+
+
+</overview>
+<recommendation>
+<p>Ensure that all superclass <code>__init__</code> methods are properly called. 
+Either each base class's initialize method should be explicitly called, or <code>super()</code> calls 
+should be consistently used throughout the inheritance hierarchy.</p>
+
+
+</recommendation>
+<example>
+<p>In the following example, explicit calls to <code>__init__</code> are used, but <code>SportsCar</code> erroneously calls
+<code>Vehicle.__init__</code>. This is fixed in <code>FixedSportsCar</code> by calling <code>Car.__init__</code>.
+</p>
+
+<sample src="examples/MissingCallToInit.py" />
+
+</example>
+<references>
+
+        <li>Python Reference: <a href="https://docs.python.org/3/reference/datamodel.html#object.__init__">__init__</a>.</li>
+        <li>Python Standard Library: <a href="https://docs.python.org/3/library/functions.html#super">super</a>.</li>
+        <li>Python Glossary: <a href="https://docs.python.org/3/glossary.html#term-method-resolution-order">Method resolution order</a>.</li>
+
+</references>
+</qhelp>
diff --git a/python/ql/src/Classes/CallsToInitDel/MissingCallToInit.ql b/python/ql/src/Classes/CallsToInitDel/MissingCallToInit.ql
new file mode 100644
index 00000000000..566d8320a29
--- /dev/null
+++ b/python/ql/src/Classes/CallsToInitDel/MissingCallToInit.ql
@@ -0,0 +1,41 @@
+/**
+ * @name Missing call to superclass `__init__` during object initialization
+ * @description An omitted call to a superclass `__init__` method may lead to objects of this class not being fully initialized.
+ * @kind problem
+ * @tags quality
+ *       reliability
+ *       correctness
+ * @problem.severity error
+ * @sub-severity low
+ * @precision high
+ * @id py/missing-call-to-init
+ */
+
+import python
+import MethodCallOrder
+
+from Class base, Function shouldCall, FunctionOption possibleIssue, string msg
+where
+  exists(FunctionOption possiblyMissingSuper |
+    missingCallToSuperclassMethodRestricted(base, shouldCall, "__init__") and
+    possiblyMissingSuper = getPossibleMissingSuperOption(base, shouldCall, "__init__") and
+    (
+      possibleIssue.asSome() = possiblyMissingSuper.asSome() and
+      msg =
+        "This class does not call $@ during initialization. ($@ may be missing a call to super().__init__)"
+      or
+      possiblyMissingSuper.isNone() and
+      (
+        possibleIssue.asSome() = base.getInitMethod() and
+        msg =
+          "This class does not call $@ during initialization. ($@ may be missing a call to a base class __init__)"
+        or
+        not exists(base.getInitMethod()) and
+        possibleIssue.isNone() and
+        msg =
+          "This class does not call $@ during initialization. (The class lacks an __init__ method to ensure every base class __init__ is called.)"
+      )
+    )
+  )
+select base, msg, shouldCall, shouldCall.getQualifiedName(), possibleIssue,
+  possibleIssue.getQualifiedName()
diff --git a/python/ql/src/Classes/CallsToInitDel/SuperclassDelCalledMultipleTimes.qhelp b/python/ql/src/Classes/CallsToInitDel/SuperclassDelCalledMultipleTimes.qhelp
new file mode 100644
index 00000000000..e61627c878f
--- /dev/null
+++ b/python/ql/src/Classes/CallsToInitDel/SuperclassDelCalledMultipleTimes.qhelp
@@ -0,0 +1,55 @@
+<!DOCTYPE qhelp PUBLIC
+  "-//Semmle//qhelp//EN"
+  "qhelp.dtd">
+<qhelp>
+
+<overview>
+<p>
+Python, unlike some other object-oriented languages such as Java, allows the developer complete freedom in 
+when and how superclass finalizers are called during object finalization.
+However, the developer has responsibility for ensuring that objects are properly cleaned up.
+</p>
+
+<p>
+Objects with a <code>__del__</code> method (a finalizer) often hold resources such as file handles that need to be cleaned up.
+If a superclass finalizer is called multiple times, this may lead to errors such as closing an already closed file, and lead to objects not being 
+cleaned up properly as expected. 
+</p>
+
+<p>There are a number of ways that a <code>__del__</code> method may be called more than once.</p>
+<ul>
+    <li>There may be more than one explicit call to the method in the hierarchy of <code>__del__</code> methods.</li>
+    <li>In situations involving multiple inheritance, an finalization method may call the finalizers of each of its base types,
+     which themselves both call the finalizer of a shared base type. (This is an example of the Diamond Inheritance problem)</li>
+    <li>Another situation involving multiple inheritance arises when a subclass calls the <code>__del__</code> methods of each of its base classes,
+    one of which calls <code>super().__del__</code>. This super call resolves to the next class in the Method Resolution Order (MRO) of the subclass,
+    which may be another base class that already has its initializer explicitly called.</li>
+</ul>
+
+
+</overview>
+<recommendation>
+<p>Ensure that each finalizer method is called exactly once during finalization. 
+This can be ensured by calling <code>super().__del__</code> for each finalizer method in the inheritance chain.
+</p>
+
+</recommendation>
+<example>
+
+<p>In the following example, there is a mixture of explicit calls to <code>__del__</code> and calls using <code>super()</code>, resulting in <code>Vehicle.__del__</code>
+being called twice.
+<code>FixedSportsCar.__del__</code> fixes this by using <code>super()</code> consistently with the other delete methods.
+</p>
+
+<sample src="examples/SuperclassDelCalledMultipleTimes.py" />
+
+</example>
+<references>
+        
+        <li>Python Reference: <a href="https://docs.python.org/3/reference/datamodel.html#object.__del__">__del__</a>.</li>
+        <li>Python Standard Library: <a href="https://docs.python.org/3/library/functions.html#super">super</a>.</li>
+        <li>Python Glossary: <a href="https://docs.python.org/3/glossary.html#term-method-resolution-order">Method resolution order</a>.</li>
+        <li>Wikipedia: <a href="https://en.wikipedia.org/wiki/Multiple_inheritance#The_diamond_problem">The Diamond Problem</a>.</li>
+
+</references>
+</qhelp>
diff --git a/python/ql/src/Classes/CallsToInitDel/SuperclassDelCalledMultipleTimes.ql b/python/ql/src/Classes/CallsToInitDel/SuperclassDelCalledMultipleTimes.ql
new file mode 100644
index 00000000000..dfdc3545e64
--- /dev/null
+++ b/python/ql/src/Classes/CallsToInitDel/SuperclassDelCalledMultipleTimes.ql
@@ -0,0 +1,47 @@
+/**
+ * @name Multiple calls to `__del__` during object destruction
+ * @description A duplicated call to a superclass `__del__` method may lead to class instances not be cleaned up properly.
+ * @kind problem
+ * @tags quality
+ *       reliability
+ *       correctness
+ * @problem.severity warning
+ * @sub-severity high
+ * @precision very-high
+ * @id py/multiple-calls-to-delete
+ */
+
+import python
+import MethodCallOrder
+
+predicate multipleCallsToSuperclassDel(
+  Function meth, Function calledMulti, DataFlow::MethodCallNode call1,
+  DataFlow::MethodCallNode call2
+) {
+  multipleCallsToSuperclassMethod(meth, calledMulti, call1, call2, "__del__")
+}
+
+from
+  Function meth, Function calledMulti, DataFlow::MethodCallNode call1,
+  DataFlow::MethodCallNode call2, Function target1, Function target2, string msg
+where
+  multipleCallsToSuperclassDel(meth, calledMulti, call1, call2) and
+  // Only alert for the lowest method in the hierarchy that both calls will call.
+  not exists(Function subMulti |
+    multipleCallsToSuperclassDel(meth, subMulti, _, _) and
+    calledMulti.getScope() = getADirectSuperclass+(subMulti.getScope())
+  ) and
+  target1 = getDirectSuperCallTargetFromCall(meth.getScope(), meth, call1, _) and
+  target2 = getDirectSuperCallTargetFromCall(meth.getScope(), meth, call2, _) and
+  (
+    target1 != target2 and
+    msg =
+      "This finalization method calls $@ multiple times, via $@ and $@, resolving to $@ and $@ respectively."
+    or
+    target1 = target2 and
+    // The targets themselves are called multiple times (either is calledMulti, or something earlier in the MRO)
+    // Mentioning them again would be redundant.
+    msg = "This finalization method calls $@ multiple times, via $@ and $@."
+  )
+select meth, msg, calledMulti, calledMulti.getQualifiedName(), call1, "this call", call2,
+  "this call", target1, target1.getQualifiedName(), target2, target2.getQualifiedName()
diff --git a/python/ql/src/Classes/CallsToInitDel/SuperclassInitCalledMultipleTimes.qhelp b/python/ql/src/Classes/CallsToInitDel/SuperclassInitCalledMultipleTimes.qhelp
new file mode 100644
index 00000000000..e615144ff08
--- /dev/null
+++ b/python/ql/src/Classes/CallsToInitDel/SuperclassInitCalledMultipleTimes.qhelp
@@ -0,0 +1,74 @@
+<!DOCTYPE qhelp PUBLIC
+  "-//Semmle//qhelp//EN"
+  "qhelp.dtd">
+<qhelp>
+
+<overview>
+<p>Python, unlike some other object-oriented languages such as Java, allows the developer complete freedom in 
+when and how superclass initializers are called during object initialization.
+However, the developer has responsibility for ensuring that objects are properly initialized. 
+</p>
+
+<p>
+Calling an <code>__init__</code> method more than once during object initialization risks the object being incorrectly 
+initialized, as the method and the rest of the inheritance chain may not have been written with the expectation
+that it could be called multiple times. For example, it may set attributes to a default value in a way that unexpectedly overwrites 
+values setting those attributes in a subclass.
+</p>
+
+<p>There are a number of ways that an <code>__init__</code> method may be called more than once.</p>
+<ul>
+    <li>There may be more than one explicit call to the method in the hierarchy of <code>__init__</code> methods.</li>
+    <li>In situations involving multiple inheritance, an initialization method may call the initializers of each of its base types,
+     which themselves both call the initializer of a shared base type. (This is an example of the Diamond Inheritance problem)</li>
+    <li>Another situation involving multiple inheritance arises when a subclass calls the <code>__init__</code> methods of each of its base classes,
+    one of which calls <code>super().__init__</code>. This super call resolves to the next class in the Method Resolution Order (MRO) of the subclass,
+    which may be another base class that already has its initializer explicitly called.</li>
+</ul>
+
+
+</overview>
+<recommendation>
+<p>
+Take care whenever possible not to call an an initializer multiple times. If each <code>__init__</code> method in the hierarchy 
+calls <code>super().__init__()</code>, then each initializer will be called exactly once according to the MRO of the subclass. 
+
+When explicitly calling base class initializers (such as to pass different arguments to different initializers), 
+ensure this is done consistently throughout, rather than using <code>super()</code> calls in the base classes.
+</p>
+<p>
+In some cases, it may not be possible to avoid calling a base initializer multiple times without significant refactoring. 
+In this case, carefully check that the initializer does not interfere with subclass initializers
+ when called multiple times (such as by overwriting attributes), and ensure this behavior is documented.
+</p>
+
+
+</recommendation>
+<example>
+<p>In the following (BAD) example, the class <code>D</code> calls <code>B.__init__</code> and <code>C.__init__</code>, 
+which each call <code>A.__init__</code>. This results in <code>self.state</code> being set to <code>None</code> as 
+<code>A.__init__</code> is called again after <code>B.__init__</code> had finished. This may lead to unexpected results.
+</p>
+
+<sample src="examples/SuperclassInitCalledMultipleTimesBad1.py" />
+
+<p>In the following (GOOD) example, a call to <code>super().__init__</code> is made in each class 
+in the inheritance hierarchy, ensuring each initializer is called exactly once.
+</p>
+
+<sample src="examples/SuperclassInitCalledMultipleTimesGood2.py" />
+
+<p>In the following (BAD) example, explicit base class calls are mixed with <code>super()</code> calls, and <code>C.__init__</code> is called twice.</p>
+
+<sample src="examples/SuperclassInitCalledMultipleTimesBad3.py" />
+</example>
+<references>
+
+        <li>Python Reference: <a href="https://docs.python.org/3/reference/datamodel.html#object.__init__">__init__</a>.</li>
+        <li>Python Standard Library: <a href="https://docs.python.org/3/library/functions.html#super">super</a>.</li>
+        <li>Python Glossary: <a href="https://docs.python.org/3/glossary.html#term-method-resolution-order">Method resolution order</a>.</li>
+        <li>Wikipedia: <a href="https://en.wikipedia.org/wiki/Multiple_inheritance#The_diamond_problem">The Diamond Problem</a>.</li>
+
+
+</references>
+</qhelp>
diff --git a/python/ql/src/Classes/CallsToInitDel/SuperclassInitCalledMultipleTimes.ql b/python/ql/src/Classes/CallsToInitDel/SuperclassInitCalledMultipleTimes.ql
new file mode 100644
index 00000000000..04c226aa195
--- /dev/null
+++ b/python/ql/src/Classes/CallsToInitDel/SuperclassInitCalledMultipleTimes.ql
@@ -0,0 +1,47 @@
+/**
+ * @name Multiple calls to `__init__` during object initialization
+ * @description A duplicated call to a superclass `__init__` method may lead to objects of this class not being properly initialized.
+ * @kind problem
+ * @tags quality
+ *       reliability
+ *       correctness
+ * @problem.severity warning
+ * @sub-severity high
+ * @precision very-high
+ * @id py/multiple-calls-to-init
+ */
+
+import python
+import MethodCallOrder
+
+predicate multipleCallsToSuperclassInit(
+  Function meth, Function calledMulti, DataFlow::MethodCallNode call1,
+  DataFlow::MethodCallNode call2
+) {
+  multipleCallsToSuperclassMethod(meth, calledMulti, call1, call2, "__init__")
+}
+
+from
+  Function meth, Function calledMulti, DataFlow::MethodCallNode call1,
+  DataFlow::MethodCallNode call2, Function target1, Function target2, string msg
+where
+  multipleCallsToSuperclassInit(meth, calledMulti, call1, call2) and
+  // Only alert for the lowest method in the hierarchy that both calls will call.
+  not exists(Function subMulti |
+    multipleCallsToSuperclassInit(meth, subMulti, _, _) and
+    calledMulti.getScope() = getADirectSuperclass+(subMulti.getScope())
+  ) and
+  target1 = getDirectSuperCallTargetFromCall(meth.getScope(), meth, call1, _) and
+  target2 = getDirectSuperCallTargetFromCall(meth.getScope(), meth, call2, _) and
+  (
+    target1 != target2 and
+    msg =
+      "This initialization method calls $@ multiple times, via $@ and $@, resolving to $@ and $@ respectively."
+    or
+    target1 = target2 and
+    // The targets themselves are called multiple times (either is calledMulti, or something earlier in the MRO)
+    // Mentioning them again would be redundant.
+    msg = "This initialization method calls $@ multiple times, via $@ and $@."
+  )
+select meth, msg, calledMulti, calledMulti.getQualifiedName(), call1, "this call", call2,
+  "this call", target1, target1.getQualifiedName(), target2, target2.getQualifiedName()
diff --git a/python/ql/src/Classes/MissingCallToDel.py b/python/ql/src/Classes/CallsToInitDel/examples/MissingCallToDel.py
similarity index 86%
rename from python/ql/src/Classes/MissingCallToDel.py
rename to python/ql/src/Classes/CallsToInitDel/examples/MissingCallToDel.py
index 37520071b3a..296d36be7d8 100644
--- a/python/ql/src/Classes/MissingCallToDel.py
+++ b/python/ql/src/Classes/CallsToInitDel/examples/MissingCallToDel.py
@@ -10,14 +10,14 @@ class Car(Vehicle):
         recycle(self.car_parts)
         Vehicle.__del__(self)
         
-#Car.__del__ is missed out.
+#BAD: Car.__del__ is not called.
 class SportsCar(Car, Vehicle):
     
     def __del__(self):
         recycle(self.sports_car_parts)
         Vehicle.__del__(self)
         
-#Fix SportsCar by calling Car.__del__
+#GOOD: Car.__del__ is called correctly.
 class FixedSportsCar(Car, Vehicle):
     
     def __del__(self):
diff --git a/python/ql/src/Classes/MissingCallToInit.py b/python/ql/src/Classes/CallsToInitDel/examples/MissingCallToInit.py
similarity index 85%
rename from python/ql/src/Classes/MissingCallToInit.py
rename to python/ql/src/Classes/CallsToInitDel/examples/MissingCallToInit.py
index 1b3e0e3aee5..14d7c5a80fd 100644
--- a/python/ql/src/Classes/MissingCallToInit.py
+++ b/python/ql/src/Classes/CallsToInitDel/examples/MissingCallToInit.py
@@ -10,14 +10,14 @@ class Car(Vehicle):
         Vehicle.__init__(self)
         self.car_init()
         
-#Car.__init__ is missed out.
+# BAD: Car.__init__ is not called.
 class SportsCar(Car, Vehicle):
     
     def __init__(self):
         Vehicle.__init__(self)
         self.sports_car_init()
         
-#Fix SportsCar by calling Car.__init__
+# GOOD: Car.__init__ is called correctly.
 class FixedSportsCar(Car, Vehicle):
     
     def __init__(self):
diff --git a/python/ql/src/Classes/SuperclassDelCalledMultipleTimes2.py b/python/ql/src/Classes/CallsToInitDel/examples/SuperclassDelCalledMultipleTimes.py
similarity index 85%
rename from python/ql/src/Classes/SuperclassDelCalledMultipleTimes2.py
rename to python/ql/src/Classes/CallsToInitDel/examples/SuperclassDelCalledMultipleTimes.py
index 8cb1433ac0c..f48f325f8b5 100644
--- a/python/ql/src/Classes/SuperclassDelCalledMultipleTimes2.py
+++ b/python/ql/src/Classes/CallsToInitDel/examples/SuperclassDelCalledMultipleTimes.py
@@ -15,14 +15,14 @@ class Car(Vehicle):
         
 class SportsCar(Car, Vehicle):
     
-    # Vehicle.__del__ will get called twice
+    # BAD: Vehicle.__del__ will get called twice
     def __del__(self):
         recycle(self.sports_car_parts)
         Car.__del__(self)
         Vehicle.__del__(self)
         
         
-#Fix SportsCar by using super()
+# GOOD: super() is used ensuring each del method is called once.
 class FixedSportsCar(Car, Vehicle):
     
     def __del__(self):
diff --git a/python/ql/src/Classes/CallsToInitDel/examples/SuperclassInitCalledMultipleTimesBad1.py b/python/ql/src/Classes/CallsToInitDel/examples/SuperclassInitCalledMultipleTimesBad1.py
new file mode 100644
index 00000000000..0f595a534da
--- /dev/null
+++ b/python/ql/src/Classes/CallsToInitDel/examples/SuperclassInitCalledMultipleTimesBad1.py
@@ -0,0 +1,20 @@
+class A:
+    def __init__(self):
+        self.state = None 
+
+class B(A):
+    def __init__(self):
+        A.__init__(self)
+        self.state = "B"
+        self.b = 3 
+
+class C(A):
+    def __init__(self):
+        A.__init__(self)
+        self.c = 2 
+
+class D(B,C):
+    def __init__(self):
+        B.__init__(self)
+        C.__init__(self) # BAD: This calls A.__init__ a second time, setting self.state to None.
+        
diff --git a/python/ql/src/Classes/CallsToInitDel/examples/SuperclassInitCalledMultipleTimesBad3.py b/python/ql/src/Classes/CallsToInitDel/examples/SuperclassInitCalledMultipleTimesBad3.py
new file mode 100644
index 00000000000..9a70876e7a8
--- /dev/null
+++ b/python/ql/src/Classes/CallsToInitDel/examples/SuperclassInitCalledMultipleTimesBad3.py
@@ -0,0 +1,22 @@
+class A:
+    def __init__(self):
+        print("A")
+        self.state = None 
+
+class B(A):
+    def __init__(self):
+        print("B")
+        super().__init__() # When called from D, this calls C.__init__
+        self.state = "B"
+        self.b = 3 
+
+class C(A):
+    def __init__(self):
+        print("C")
+        super().__init__()
+        self.c = 2 
+
+class D(B,C):
+    def __init__(self): 
+        B.__init__(self)
+        C.__init__(self) # BAD: C.__init__ is called a second time
\ No newline at end of file
diff --git a/python/ql/src/Classes/CallsToInitDel/examples/SuperclassInitCalledMultipleTimesGood2.py b/python/ql/src/Classes/CallsToInitDel/examples/SuperclassInitCalledMultipleTimesGood2.py
new file mode 100644
index 00000000000..9e4bbdea058
--- /dev/null
+++ b/python/ql/src/Classes/CallsToInitDel/examples/SuperclassInitCalledMultipleTimesGood2.py
@@ -0,0 +1,22 @@
+class A:
+    def __init__(self):
+        self.state = None 
+
+class B(A):
+    def __init__(self):
+        super().__init__()
+        self.state = "B"
+        self.b = 3 
+
+class C(A):
+    def __init__(self):
+        super().__init__()
+        self.c = 2 
+
+class D(B,C):
+    def __init__(self): # GOOD: Each method calls super, so each init method runs once. self.state will be set to "B".
+        super().__init__()
+        self.d = 1
+        
+
+
diff --git a/python/ql/src/Classes/Comparisons/EqualsOrHash.qhelp b/python/ql/src/Classes/Comparisons/EqualsOrHash.qhelp
new file mode 100644
index 00000000000..562ad7be1bd
--- /dev/null
+++ b/python/ql/src/Classes/Comparisons/EqualsOrHash.qhelp
@@ -0,0 +1,44 @@
+<!DOCTYPE qhelp PUBLIC
+  "-//Semmle//qhelp//EN"
+  "qhelp.dtd">
+<qhelp>
+
+<overview>
+<p>A hashable class has an <code>__eq__</code> method, and a <code>__hash__</code> method that agrees with equality. 
+When a hash method is defined, an equality method should also be defined; otherwise object identity is used for equality comparisons 
+which may not be intended.
+ </p>
+
+<p>Note that defining an <code>__eq__</code> method without defining a <code>__hash__</code> method automatically makes the class unhashable in Python 3.
+(even if a superclass defines a hash method).</p>
+
+</overview>
+<recommendation>
+
+<p>
+If a <code>__hash__</code> method is defined, ensure a compatible <code>__eq__</code> method is also defined.
+</p>
+
+<p>
+To explicitly declare a class as unhashable, set <code>__hash__ = None</code>, rather than defining a <code>__hash__</code> method that always
+raises an exception. Otherwise, the class would be incorrectly identified as hashable by an <code>isinstance(obj, collections.abc.Hashable)</code> call.
+</p>
+
+</recommendation>
+<example>
+<p>In the following example, the <code>A</code> class defines an hash method but 
+no equality method. Equality will be determined by object identity, which may not be the expected behaviour.
+</p>
+
+<sample src="examples/EqualsOrHash.py" />
+
+</example>
+<references>
+
+
+<li>Python Language Reference: <a href="http://docs.python.org/reference/datamodel.html#object.__hash__">object.__hash__</a>.</li>
+<li>Python Glossary: <a href="http://docs.python.org/3/glossary.html#term-hashable">hashable</a>.</li>
+
+
+</references>
+</qhelp>
diff --git a/python/ql/src/Classes/Comparisons/EqualsOrHash.ql b/python/ql/src/Classes/Comparisons/EqualsOrHash.ql
new file mode 100644
index 00000000000..54393cf1573
--- /dev/null
+++ b/python/ql/src/Classes/Comparisons/EqualsOrHash.ql
@@ -0,0 +1,26 @@
+/**
+ * @name Inconsistent equality and hashing
+ * @description Defining a hash operation without defining equality may be a mistake.
+ * @kind problem
+ * @tags quality
+ *       reliability
+ *       correctness
+ *       external/cwe/cwe-581
+ * @problem.severity warning
+ * @sub-severity high
+ * @precision very-high
+ * @id py/equals-hash-mismatch
+ */
+
+import python
+
+predicate missingEquality(Class cls, Function defined) {
+  defined = cls.getMethod("__hash__") and
+  not exists(cls.getMethod("__eq__"))
+  // In python 3, the case of defined eq without hash automatically makes the class unhashable (even if a superclass defined hash)
+  // So this is not an issue.
+}
+
+from Class cls, Function defined
+where missingEquality(cls, defined)
+select cls, "This class implements $@, but does not implement __eq__.", defined, defined.getName()
diff --git a/python/ql/src/Classes/Comparisons/EqualsOrNotEquals.qhelp b/python/ql/src/Classes/Comparisons/EqualsOrNotEquals.qhelp
new file mode 100644
index 00000000000..74f20d9f0c5
--- /dev/null
+++ b/python/ql/src/Classes/Comparisons/EqualsOrNotEquals.qhelp
@@ -0,0 +1,53 @@
+<!DOCTYPE qhelp PUBLIC
+  "-//Semmle//qhelp//EN"
+  "qhelp.dtd">
+<qhelp>
+
+<overview>
+<p>In order to ensure the <code>==</code> and <code>!=</code> operators behave consistently as expected (i.e. they should be negations of each other), care should be taken when implementing the 
+<code>__eq__</code> and <code>__ne__</code> special methods.</p>
+
+<p>In Python 3, if the <code>__eq__</code> method is defined in a class while the <code>__ne__</code> is not, 
+then the <code>!=</code> operator will automatically delegate to the <code>__eq__</code> method in the expected way. 
+ </p>
+
+ <p>However, if the <code>__ne__</code> method is defined without a corresponding <code>__eq__</code> method, 
+ the <code>==</code> operator will still default to object identity (equivalent to the <code>is</code> operator), while the <code>!=</code>
+ operator will use the <code>__ne__</code> method, which may be inconsistent.
+ </p>
+
+<p>Additionally, if the <code>__ne__</code> method is defined on a superclass, and the subclass defines its own <code>__eq__</code> method without overriding
+the superclass <code>__ne__</code> method, the <code>!=</code> operator will use this superclass <code>__ne__</code> method, rather than automatically delegating
+to <code>__eq__</code>, which may be incorrect.
+</p>
+
+</overview>
+<recommendation>
+
+<p>Ensure that when an <code>__ne__</code> method is defined, the <code>__eq__</code> method is also defined, and their results are consistent.
+In most cases, the <code>__ne__</code> method does not need to be defined at all, as the default behavior is to delegate to <code>__eq__</code> and negate the result. </p>
+
+</recommendation>
+<example>
+<p>In the following example, <code>A</code> defines a <code>__ne__</code> method, but not an <code>__eq__</code> method.
+This leads to inconsistent results between equality and inequality operators. 
+</p>
+
+<sample src="examples/EqualsOrNotEquals1.py" />
+
+<p>In the following example, <code>C</code> defines an <code>__eq__</code> method, but its <code>__ne__</code> implementation is inherited from <code>B</code>, 
+which is not consistent with the equality operation.
+</p>
+
+<sample src="examples/EqualsOrNotEquals2.py" />
+
+</example>
+<references>
+
+
+<li>Python Language Reference: <a href="http://docs.python.org/3/reference/datamodel.html#object.__ne__">object.__ne__</a>, 
+<a href="http://docs.python.org/3/reference/expressions.html#comparisons">Comparisons</a>.</li>
+
+
+</references>
+</qhelp>
diff --git a/python/ql/src/Classes/Comparisons/EqualsOrNotEquals.ql b/python/ql/src/Classes/Comparisons/EqualsOrNotEquals.ql
new file mode 100644
index 00000000000..ea025f39c2f
--- /dev/null
+++ b/python/ql/src/Classes/Comparisons/EqualsOrNotEquals.ql
@@ -0,0 +1,37 @@
+/**
+ * @name Inconsistent equality and inequality
+ * @description Class definitions of equality and inequality operators may be inconsistent.
+ * @kind problem
+ * @tags quality
+ *       reliability
+ *       correctness
+ * @problem.severity warning
+ * @sub-severity high
+ * @precision very-high
+ * @id py/inconsistent-equality
+ */
+
+import python
+import semmle.python.dataflow.new.internal.DataFlowDispatch
+import Classes.Equality
+
+predicate missingEquality(Class cls, Function defined, string missing) {
+  defined = cls.getMethod("__ne__") and
+  not exists(cls.getMethod("__eq__")) and
+  missing = "__eq__"
+  or
+  // In python 3, __ne__ automatically delegates to __eq__ if its not defined in the hierarchy
+  // However if it is defined in a superclass (and isn't a delegation method) then it will use the superclass method (which may be incorrect)
+  defined = cls.getMethod("__eq__") and
+  not exists(cls.getMethod("__ne__")) and
+  exists(Function neMeth |
+    neMeth = getADirectSuperclass+(cls).getMethod("__ne__") and
+    not neMeth instanceof DelegatingEqualityMethod
+  ) and
+  missing = "__ne__"
+}
+
+from Class cls, Function defined, string missing
+where missingEquality(cls, defined, missing)
+select cls, "This class implements $@, but does not implement " + missing + ".", defined,
+  defined.getName()
diff --git a/python/ql/src/Classes/Comparisons/IncompleteOrdering.qhelp b/python/ql/src/Classes/Comparisons/IncompleteOrdering.qhelp
new file mode 100644
index 00000000000..6bffaed7b87
--- /dev/null
+++ b/python/ql/src/Classes/Comparisons/IncompleteOrdering.qhelp
@@ -0,0 +1,38 @@
+<!DOCTYPE qhelp PUBLIC
+  "-//Semmle//qhelp//EN"
+  "qhelp.dtd">
+<qhelp>
+<overview>
+<p> A class that implements the rich comparison operators
+(<code>__lt__</code>, <code>__gt__</code>, <code>__le__</code>, or <code>__ge__</code>) should ensure that all four 
+comparison operations <code>&lt;</code>, <code>&lt;=</code>, <code>&gt;</code>, and <code>&gt;=</code> function as expected, consistent 
+with expected mathematical rules.   
+In Python 3, this is ensured by implementing one of <code>__lt__</code> or <code>__gt__</code>, and one of  <code>__le__</code> or <code>__ge__</code>.
+If the ordering is not consistent with default equality, then <code>__eq__</code> should also be implemented.
+</p>
+
+</overview>
+<recommendation>
+<p>Ensure that at least one of <code>__lt__</code> or <code>__gt__</code> and at least one of <code>__le__</code> or <code>__ge__</code> is defined. 
+  </p>
+
+<p>
+The <code>functools.total_ordering</code> class decorator can be used to automatically implement all four comparison methods from a 
+single one,
+which is typically the cleanest way to ensure all necessary comparison methods are implemented consistently.</p>
+
+</recommendation>
+<example>
+<p>In the following example, only the <code>__lt__</code> operator has been implemented, which would lead to unexpected
+errors if the <code>&lt;=</code> or <code>&gt;=</code> operators are used on <code>A</code> instances.
+The <code>__le__</code> method should also be defined, as well as <code>__eq__</code> in this case.</p>
+<sample src="examples/IncompleteOrdering.py" />
+
+</example>
+<references>
+
+  <li>Python Language Reference: <a href="http://docs.python.org/3/reference/datamodel.html#object.__lt__">Rich comparisons in Python</a>.</li>
+
+
+</references>
+</qhelp>
diff --git a/python/ql/src/Classes/Comparisons/IncompleteOrdering.ql b/python/ql/src/Classes/Comparisons/IncompleteOrdering.ql
new file mode 100644
index 00000000000..e35f0c1a715
--- /dev/null
+++ b/python/ql/src/Classes/Comparisons/IncompleteOrdering.ql
@@ -0,0 +1,55 @@
+/**
+ * @name Incomplete ordering
+ * @description Class defines ordering comparison methods, but does not define both strict and nonstrict ordering methods, to ensure all four comparison operators behave as expected.
+ * @kind problem
+ * @tags quality
+ *       reliability
+ *       correctness
+ * @problem.severity warning
+ * @sub-severity low
+ * @precision very-high
+ * @id py/incomplete-ordering
+ */
+
+import python
+import semmle.python.dataflow.new.internal.DataFlowDispatch
+import semmle.python.ApiGraphs
+
+/** Holds if `cls` has the `functools.total_ordering` decorator. */
+predicate totalOrdering(Class cls) {
+  API::moduleImport("functools")
+      .getMember("total_ordering")
+      .asSource()
+      .flowsTo(DataFlow::exprNode(cls.getADecorator()))
+}
+
+predicate definesStrictOrdering(Class cls, Function meth) {
+  meth = cls.getMethod("__lt__")
+  or
+  not exists(cls.getMethod("__lt__")) and
+  meth = cls.getMethod("__gt__")
+}
+
+predicate definesNonStrictOrdering(Class cls, Function meth) {
+  meth = cls.getMethod("__le__")
+  or
+  not exists(cls.getMethod("__le__")) and
+  meth = cls.getMethod("__ge__")
+}
+
+predicate missingComparison(Class cls, Function defined, string missing) {
+  definesStrictOrdering(cls, defined) and
+  not definesNonStrictOrdering(getADirectSuperclass*(cls), _) and
+  missing = "__le__ or __ge__"
+  or
+  definesNonStrictOrdering(cls, defined) and
+  not definesStrictOrdering(getADirectSuperclass*(cls), _) and
+  missing = "__lt__ or __gt__"
+}
+
+from Class cls, Function defined, string missing
+where
+  not totalOrdering(cls) and
+  missingComparison(cls, defined, missing)
+select cls, "This class implements $@, but does not implement " + missing + ".", defined,
+  defined.getName()
diff --git a/python/ql/src/Classes/Comparisons/examples/EqualsOrHash.py b/python/ql/src/Classes/Comparisons/examples/EqualsOrHash.py
new file mode 100644
index 00000000000..601ce2b18d0
--- /dev/null
+++ b/python/ql/src/Classes/Comparisons/examples/EqualsOrHash.py
@@ -0,0 +1,8 @@
+class A:
+    def __init__(self, a, b):
+        self.a = a 
+        self.b = b
+
+    # No equality method is defined
+    def __hash__(self):
+        return hash((self.a, self.b))
diff --git a/python/ql/src/Classes/Comparisons/examples/EqualsOrNotEquals1.py b/python/ql/src/Classes/Comparisons/examples/EqualsOrNotEquals1.py
new file mode 100644
index 00000000000..2f749ebeb9e
--- /dev/null
+++ b/python/ql/src/Classes/Comparisons/examples/EqualsOrNotEquals1.py
@@ -0,0 +1,15 @@
+class A:
+    def __init__(self, a):
+        self.a = a 
+
+    # BAD: ne is defined, but not eq.
+    def __ne__(self, other):
+        if not isinstance(other, A):
+            return NotImplemented 
+        return self.a != other.a
+
+x = A(1)
+y = A(1)
+
+print(x == y) # Prints False (potentially unexpected - object identity is used)
+print(x != y) # Prints False
diff --git a/python/ql/src/Classes/Comparisons/examples/EqualsOrNotEquals2.py b/python/ql/src/Classes/Comparisons/examples/EqualsOrNotEquals2.py
new file mode 100644
index 00000000000..9b76a2536a5
--- /dev/null
+++ b/python/ql/src/Classes/Comparisons/examples/EqualsOrNotEquals2.py
@@ -0,0 +1,21 @@
+class B:
+    def __init__(self, b):
+        self.b = b 
+    
+    def __eq__(self, other):
+        return self.b == other.b 
+    
+    def __ne__(self, other):
+        return self.b != other.b 
+    
+class C(B):
+    def __init__(self, b, c):
+        super().__init__(b)
+        self.c = c 
+
+    # BAD: eq is defined, but != will use superclass ne method, which is not consistent
+    def __eq__(self, other):
+        return self.b == other.b and self.c == other.c 
+    
+print(C(1,2) == C(1,3)) # Prints False 
+print(C(1,2) != C(1,3)) # Prints False (potentially unexpected)
\ No newline at end of file
diff --git a/python/ql/src/Classes/Comparisons/examples/IncompleteOrdering.py b/python/ql/src/Classes/Comparisons/examples/IncompleteOrdering.py
new file mode 100644
index 00000000000..5a18e393620
--- /dev/null
+++ b/python/ql/src/Classes/Comparisons/examples/IncompleteOrdering.py
@@ -0,0 +1,8 @@
+class A:
+    def __init__(self, i):
+        self.i = i
+
+    # BAD: le is not defined, so `A(1) <= A(2)` would result in an error.
+    def __lt__(self, other):
+        return self.i < other.i
+    
\ No newline at end of file
diff --git a/python/ql/src/Classes/Equality.qll b/python/ql/src/Classes/Equality.qll
index 347f5057c38..08162399e3e 100644
--- a/python/ql/src/Classes/Equality.qll
+++ b/python/ql/src/Classes/Equality.qll
@@ -1,4 +1,7 @@
+/** Utility definitions for reasoning about equality methods. */
+
 import python
+import semmle.python.dataflow.new.DataFlow
 
 private Attribute dictAccess(LocalVariable var) {
   result.getName() = "__dict__" and
@@ -59,16 +62,28 @@ class IdentityEqMethod extends Function {
 /** An (in)equality method that delegates to its complement */
 class DelegatingEqualityMethod extends Function {
   DelegatingEqualityMethod() {
-    exists(Return ret, UnaryExpr not_, Compare comp, Cmpop op, Parameter p0, Parameter p1 |
+    exists(Return ret, UnaryExpr not_, Expr comp, Parameter p0, Parameter p1 |
       ret.getScope() = this and
       ret.getValue() = not_ and
       not_.getOp() instanceof Not and
-      not_.getOperand() = comp and
-      comp.compares(p0.getVariable().getAnAccess(), op, p1.getVariable().getAnAccess())
+      not_.getOperand() = comp
     |
-      this.getName() = "__eq__" and op instanceof NotEq
+      exists(Cmpop op |
+        comp.(Compare).compares(p0.getVariable().getAnAccess(), op, p1.getVariable().getAnAccess())
+      |
+        this.getName() = "__eq__" and op instanceof NotEq
+        or
+        this.getName() = "__ne__" and op instanceof Eq
+      )
       or
-      this.getName() = "__ne__" and op instanceof Eq
+      exists(DataFlow::MethodCallNode call, string name |
+        call.calls(DataFlow::exprNode(p0.getVariable().getAnAccess()), name) and
+        call.getArg(0).asExpr() = p1.getVariable().getAnAccess()
+      |
+        this.getName() = "__eq__" and name = "__ne__"
+        or
+        this.getName() = "__ne__" and name = "__eq__"
+      )
     )
   }
 }
diff --git a/python/ql/src/Classes/EqualsOrHash.py b/python/ql/src/Classes/EqualsOrHash.py
deleted file mode 100644
index e89c75b30ad..00000000000
--- a/python/ql/src/Classes/EqualsOrHash.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# Incorrect: equality method defined but class contains no hash method
-class Point(object):
-
-    def __init__(self, x, y):
-        self._x = x
-        self._y = y
-
-    def __repr__(self):
-        return 'Point(%r, %r)' % (self._x, self._y)
-
-    def __eq__(self, other):
-        if not isinstance(other, Point):
-            return False
-        return self._x == other._x and self._y == other._y
-
-
-# Improved: equality and hash method defined (inequality method still missing)
-class PointUpdated(object):
-
-    def __init__(self, x, y):
-        self._x = x
-        self._y = y
-
-    def __repr__(self):
-        return 'Point(%r, %r)' % (self._x, self._y)
-
-    def __eq__(self, other):
-        if not isinstance(other, Point):
-            return False
-        return self._x == other._x and self._y == other._y
-
-    def __hash__(self):  
-        return hash(self._x) ^ hash(self._y)
-
-# Improved: equality method defined and class instances made unhashable
-class UnhashablePoint(object):
-
-    def __init__(self, x, y):
-        self._x = x
-        self._y = y
-
-    def __repr__(self):
-        return 'Point(%r, %r)' % (self._x, self._y)
-
-    def __eq__(self, other):
-        if not isinstance(other, Point):
-            return False
-        return self._x == other._x and self._y == other._y
-
-    #Tell the interpreter that instances of this class cannot be hashed
-    __hash__ = None
-
diff --git a/python/ql/src/Classes/EqualsOrHash.qhelp b/python/ql/src/Classes/EqualsOrHash.qhelp
deleted file mode 100644
index 28579a095f7..00000000000
--- a/python/ql/src/Classes/EqualsOrHash.qhelp
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE qhelp PUBLIC
-  "-//Semmle//qhelp//EN"
-  "qhelp.dtd">
-<qhelp>
-
-<overview>
-<p>In order to conform to the object model, classes that define their own equality method should also 
-define their own hash method, or be unhashable. If the hash method is not defined then the <code>hash</code> of the 
-super class is used. This is unlikely to result in the expected behavior.</p>
-
-<p>A class can be made unhashable by setting its <code>__hash__</code> attribute to <code>None</code>.</p>
-
-<p>In Python 3, if you define a class-level equality method and omit a <code>__hash__</code> method 
-then the class is automatically marked as unhashable.</p>
-
-</overview>
-<recommendation>
-
-<p>When you define an <code>__eq__</code> method for a class, remember to implement a <code>__hash__</code> method or set 
-<code>__hash__ = None</code>.</p>
-
-</recommendation>
-<example>
-<p>In the following example the <code>Point</code> class defines an equality method but 
-no hash method. If hash is called on this class then the hash method defined for <code>object</code> 
-is used. This is unlikely to give the required behavior. The <code>PointUpdated</code> class 
-is better as it defines both an equality and a hash method.
-If <code>Point</code> was not to be used in <code>dict</code>s or <code>set</code>s, then it could be defined as
-<code>UnhashablePoint</code> below.
-</p>
-<p>
-To comply fully with the object model this class should also define an inequality method (identified 
-by a separate rule).</p>
-
-<sample src="EqualsOrHash.py" />
-
-</example>
-<references>
-
-
-<li>Python Language Reference: <a href="http://docs.python.org/reference/datamodel.html#object.__hash__">object.__hash__</a>.</li>
-<li>Python Glossary: <a href="http://docs.python.org/2/glossary.html#term-hashable">hashable</a>.</li>
-
-
-</references>
-</qhelp>
diff --git a/python/ql/src/Classes/EqualsOrHash.ql b/python/ql/src/Classes/EqualsOrHash.ql
deleted file mode 100644
index 4c8cf2c1169..00000000000
--- a/python/ql/src/Classes/EqualsOrHash.ql
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * @name Inconsistent equality and hashing
- * @description Defining equality for a class without also defining hashability (or vice-versa) violates the object model.
- * @kind problem
- * @tags quality
- *       reliability
- *       correctness
- *       external/cwe/cwe-581
- * @problem.severity warning
- * @sub-severity high
- * @precision very-high
- * @id py/equals-hash-mismatch
- */
-
-import python
-
-CallableValue defines_equality(ClassValue c, string name) {
-  (
-    name = "__eq__"
-    or
-    major_version() = 2 and name = "__cmp__"
-  ) and
-  result = c.declaredAttribute(name)
-}
-
-CallableValue implemented_method(ClassValue c, string name) {
-  result = defines_equality(c, name)
-  or
-  result = c.declaredAttribute("__hash__") and name = "__hash__"
-}
-
-string unimplemented_method(ClassValue c) {
-  not exists(defines_equality(c, _)) and
-  (
-    result = "__eq__" and major_version() = 3
-    or
-    major_version() = 2 and result = "__eq__ or __cmp__"
-  )
-  or
-  /* Python 3 automatically makes classes unhashable if __eq__ is defined, but __hash__ is not */
-  not c.declaresAttribute(result) and result = "__hash__" and major_version() = 2
-}
-
-/** Holds if this class is unhashable */
-predicate unhashable(ClassValue cls) {
-  cls.lookup("__hash__") = Value::named("None")
-  or
-  cls.lookup("__hash__").(CallableValue).neverReturns()
-}
-
-predicate violates_hash_contract(ClassValue c, string present, string missing, Value method) {
-  not unhashable(c) and
-  missing = unimplemented_method(c) and
-  method = implemented_method(c, present) and
-  not c.failedInference(_)
-}
-
-from ClassValue c, string present, string missing, CallableValue method
-where
-  violates_hash_contract(c, present, missing, method) and
-  exists(c.getScope()) // Suppress results that aren't from source
-select method, "Class $@ implements " + present + " but does not define " + missing + ".", c,
-  c.getName()
diff --git a/python/ql/src/Classes/EqualsOrNotEquals.py b/python/ql/src/Classes/EqualsOrNotEquals.py
deleted file mode 100644
index 7e1ece7685c..00000000000
--- a/python/ql/src/Classes/EqualsOrNotEquals.py
+++ /dev/null
@@ -1,32 +0,0 @@
-class PointOriginal(object):
-
-    def __init__(self, x, y):
-        self._x, x
-        self._y = y
-
-    def __repr__(self):
-        return 'Point(%r, %r)' % (self._x, self._y)
-
-    def __eq__(self, other):  # Incorrect: equality is defined but inequality is not
-        if not isinstance(other, Point):
-            return False
-        return self._x == other._x and self._y == other._y
-
-
-class PointUpdated(object):
-
-    def __init__(self, x, y):
-        self._x, x
-        self._y = y
-
-    def __repr__(self):
-        return 'Point(%r, %r)' % (self._x, self._y)
-
-    def __eq__(self, other):
-        if not isinstance(other, Point):
-            return False
-        return self._x == other._x and self._y == other._y
-
-    def __ne__(self, other):  # Improved: equality and inequality method defined (hash method still missing)
-        return not self == other
-
diff --git a/python/ql/src/Classes/EqualsOrNotEquals.qhelp b/python/ql/src/Classes/EqualsOrNotEquals.qhelp
deleted file mode 100644
index c49f3d2529e..00000000000
--- a/python/ql/src/Classes/EqualsOrNotEquals.qhelp
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE qhelp PUBLIC
-  "-//Semmle//qhelp//EN"
-  "qhelp.dtd">
-<qhelp>
-
-<overview>
-<p>In order to conform to the object model, classes should define either no equality methods, or both 
-an equality and an inequality method. If only one of <code>__eq__</code> or <code>__ne__</code> is 
-defined then the method from the super class is used. This is unlikely to result in the expected 
-behavior.</p>
-
-</overview>
-<recommendation>
-
-<p>When you define an equality or an inequality method for a class, remember to implement both an 
-<code>__eq__</code> method and an <code>__ne__</code> method.</p>
-
-</recommendation>
-<example>
-<p>In the following example the <code>PointOriginal</code> class defines an equality method but 
-no inequality method. If this class is tested for inequality then a type error will be raised. The 
-<code>PointUpdated</code> class is better as it defines both an equality and an inequality method. To
-comply fully with the object model this class should also define a hash method (identified by
-a separate rule).</p>
-
-<sample src="EqualsOrNotEquals.py" />
-
-</example>
-<references>
-
-
-<li>Python Language Reference: <a href="http://docs.python.org/2/reference/datamodel.html#object.__ne__">object.__ne__</a>, 
-<a href="http://docs.python.org/2/reference/expressions.html#comparisons">Comparisons</a>.</li>
-
-
-</references>
-</qhelp>
diff --git a/python/ql/src/Classes/EqualsOrNotEquals.ql b/python/ql/src/Classes/EqualsOrNotEquals.ql
deleted file mode 100644
index adac5a20e87..00000000000
--- a/python/ql/src/Classes/EqualsOrNotEquals.ql
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * @name Inconsistent equality and inequality
- * @description Defining only an equality method or an inequality method for a class violates the object model.
- * @kind problem
- * @tags reliability
- *       correctness
- * @problem.severity warning
- * @sub-severity high
- * @precision very-high
- * @id py/inconsistent-equality
- */
-
-import python
-import Equality
-
-string equals_or_ne() { result = "__eq__" or result = "__ne__" }
-
-predicate total_ordering(Class cls) {
-  exists(Attribute a | a = cls.getADecorator() | a.getName() = "total_ordering")
-  or
-  exists(Name n | n = cls.getADecorator() | n.getId() = "total_ordering")
-}
-
-CallableValue implemented_method(ClassValue c, string name) {
-  result = c.declaredAttribute(name) and name = equals_or_ne()
-}
-
-string unimplemented_method(ClassValue c) {
-  not c.declaresAttribute(result) and result = equals_or_ne()
-}
-
-predicate violates_equality_contract(
-  ClassValue c, string present, string missing, CallableValue method
-) {
-  missing = unimplemented_method(c) and
-  method = implemented_method(c, present) and
-  not c.failedInference(_) and
-  not total_ordering(c.getScope()) and
-  /* Python 3 automatically implements __ne__ if __eq__ is defined, but not vice-versa */
-  not (major_version() = 3 and present = "__eq__" and missing = "__ne__") and
-  not method.getScope() instanceof DelegatingEqualityMethod and
-  not c.lookup(missing).(CallableValue).getScope() instanceof DelegatingEqualityMethod
-}
-
-from ClassValue c, string present, string missing, CallableValue method
-where violates_equality_contract(c, present, missing, method)
-select method, "Class $@ implements " + present + " but does not implement " + missing + ".", c,
-  c.getName()
diff --git a/python/ql/src/Classes/IncompleteOrdering.py b/python/ql/src/Classes/IncompleteOrdering.py
deleted file mode 100644
index 78b306880b0..00000000000
--- a/python/ql/src/Classes/IncompleteOrdering.py
+++ /dev/null
@@ -1,6 +0,0 @@
-class IncompleteOrdering(object):
-    def __init__(self, i):
-        self.i = i
-
-    def __lt__(self, other):
-        return self.i < other.i
\ No newline at end of file
diff --git a/python/ql/src/Classes/IncompleteOrdering.qhelp b/python/ql/src/Classes/IncompleteOrdering.qhelp
deleted file mode 100644
index 7983985ccee..00000000000
--- a/python/ql/src/Classes/IncompleteOrdering.qhelp
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE qhelp PUBLIC
-  "-//Semmle//qhelp//EN"
-  "qhelp.dtd">
-<qhelp>
-<overview>
-<p> A class that implements an ordering operator
-(<code>__lt__</code>, <code>__gt__</code>, <code>__le__</code> or <code>__ge__</code>) should implement
-all four in order that ordering between two objects is consistent and obeys the usual mathematical rules.
-If the ordering is inconsistent with default equality, then <code>__eq__</code> and  <code>__ne__</code>
-should also be implemented.
-</p>
-
-</overview>
-<recommendation>
-<p>Ensure that all four ordering comparisons are implemented as well as <code>__eq__</code> and <code>
-__ne__</code> if required.</p>
-
-<p>It is not necessary to manually implement all four comparisons,
-the <code>functools.total_ordering</code> class decorator can be used.</p>
-
-</recommendation>
-<example>
-<p>In this example only the <code>__lt__</code> operator has been implemented which could lead to
-inconsistent behavior. <code>__gt__</code>, <code>__le__</code>, <code>__ge__</code>, and in this case,
-<code>__eq__</code> and <code>__ne__</code> should be implemented.</p>
-<sample src="IncompleteOrdering.py" />
-
-</example>
-<references>
-
-  <li>Python Language Reference: <a href="http://docs.python.org/2/reference/datamodel.html#object.__lt__">Rich comparisons in Python</a>.</li>
-
-
-</references>
-</qhelp>
diff --git a/python/ql/src/Classes/IncompleteOrdering.ql b/python/ql/src/Classes/IncompleteOrdering.ql
deleted file mode 100644
index d6cd1230ece..00000000000
--- a/python/ql/src/Classes/IncompleteOrdering.ql
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * @name Incomplete ordering
- * @description Class defines one or more ordering method but does not define all 4 ordering comparison methods
- * @kind problem
- * @tags reliability
- *       correctness
- * @problem.severity warning
- * @sub-severity low
- * @precision very-high
- * @id py/incomplete-ordering
- */
-
-import python
-
-predicate total_ordering(Class cls) {
-  exists(Attribute a | a = cls.getADecorator() | a.getName() = "total_ordering")
-  or
-  exists(Name n | n = cls.getADecorator() | n.getId() = "total_ordering")
-}
-
-string ordering_name(int n) {
-  result = "__lt__" and n = 1
-  or
-  result = "__le__" and n = 2
-  or
-  result = "__gt__" and n = 3
-  or
-  result = "__ge__" and n = 4
-}
-
-predicate overrides_ordering_method(ClassValue c, string name) {
-  name = ordering_name(_) and
-  (
-    c.declaresAttribute(name)
-    or
-    exists(ClassValue sup | sup = c.getASuperType() and not sup = Value::named("object") |
-      sup.declaresAttribute(name)
-    )
-  )
-}
-
-string unimplemented_ordering(ClassValue c, int n) {
-  not c = Value::named("object") and
-  not overrides_ordering_method(c, result) and
-  result = ordering_name(n)
-}
-
-string unimplemented_ordering_methods(ClassValue c, int n) {
-  n = 0 and result = "" and exists(unimplemented_ordering(c, _))
-  or
-  exists(string prefix, int nm1 | n = nm1 + 1 and prefix = unimplemented_ordering_methods(c, nm1) |
-    prefix = "" and result = unimplemented_ordering(c, n)
-    or
-    result = prefix and not exists(unimplemented_ordering(c, n)) and n < 5
-    or
-    prefix != "" and result = prefix + " or " + unimplemented_ordering(c, n)
-  )
-}
-
-Value ordering_method(ClassValue c, string name) {
-  /* If class doesn't declare a method then don't blame this class (the superclass will be blamed). */
-  name = ordering_name(_) and result = c.declaredAttribute(name)
-}
-
-from ClassValue c, Value ordering, string name
-where
-  not c.failedInference(_) and
-  not total_ordering(c.getScope()) and
-  ordering = ordering_method(c, name) and
-  exists(unimplemented_ordering(c, _))
-select c,
-  "Class " + c.getName() + " implements $@, but does not implement " +
-    unimplemented_ordering_methods(c, 4) + ".", ordering, name
diff --git a/python/ql/src/Classes/MethodCallOrder.qll b/python/ql/src/Classes/MethodCallOrder.qll
index 620cb802878..b911ee0183e 100644
--- a/python/ql/src/Classes/MethodCallOrder.qll
+++ b/python/ql/src/Classes/MethodCallOrder.qll
@@ -1,3 +1,5 @@
+deprecated module;
+
 import python
 
 // Helper predicates for multiple call to __init__/__del__ queries.
diff --git a/python/ql/src/Classes/MissingCallToDel.qhelp b/python/ql/src/Classes/MissingCallToDel.qhelp
deleted file mode 100644
index 864ddd1b56b..00000000000
--- a/python/ql/src/Classes/MissingCallToDel.qhelp
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE qhelp PUBLIC
-  "-//Semmle//qhelp//EN"
-  "qhelp.dtd">
-<qhelp>
-
-<overview>
-<p>Python, unlike statically typed languages such as Java, allows complete freedom when calling methods during object destruction.
-However, standard object-oriented principles apply to Python classes using deep inheritance hierarchies.
-Therefore the developer has responsibility for ensuring that objects are properly cleaned up when
-there are multiple <code>__del__</code> methods that need to be called.
-</p>
-<p>
-If the  <code>__del__</code> method of a superclass is not called during object destruction it is likely that
-that resources may be leaked.
-</p>
-
-<p>A call to the <code>__del__</code> method of a superclass during object destruction may be omitted:
-</p>
-<ul>
-        <li>When a subclass calls the <code>__del__</code> method of the wrong class.</li>
-        <li>When a call to the <code>__del__</code> method of one its base classes is omitted.</li>
-</ul>
-
-
-</overview>
-<recommendation>
-<p>Either be careful to explicitly call the <code>__del__</code> of the correct base class, or
-use <code>super()</code> throughout the inheritance hierarchy.</p>
-
-<p>Alternatively refactor one or more of the classes to use composition rather than inheritance.</p>
-
-
-</recommendation>
-<example>
-<p>In this example, explicit calls to <code>__del__</code> are used, but <code>SportsCar</code> erroneously calls
-<code>Vehicle.__del__</code>. This is fixed in <code>FixedSportsCar</code> by calling <code>Car.__del__</code>.
-</p>
-
-<sample src="MissingCallToDel.py" />
-
-</example>
-<references>
-
-        <li>Python Tutorial: <a href="https://docs.python.org/2/tutorial/classes.html">Classes</a>.</li>
-        <li>Python Standard Library: <a href="https://docs.python.org/2/library/functions.html#super">super</a>.</li>
-        <li>Artima Developer: <a href="http://www.artima.com/weblogs/viewpost.jsp?thread=236275">Things to Know About Python Super</a>.</li>
-        <li>Wikipedia: <a href="http://en.wikipedia.org/wiki/Composition_over_inheritance">Composition over inheritance</a>.</li>
-
-</references>
-</qhelp>
diff --git a/python/ql/src/Classes/MissingCallToDel.ql b/python/ql/src/Classes/MissingCallToDel.ql
deleted file mode 100644
index be49dc48b5f..00000000000
--- a/python/ql/src/Classes/MissingCallToDel.ql
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * @name Missing call to `__del__` during object destruction
- * @description An omitted call to a super-class `__del__` method may lead to class instances not being cleaned up properly.
- * @kind problem
- * @tags quality
- *       reliability
- *       correctness
- *       performance
- * @problem.severity error
- * @sub-severity low
- * @precision high
- * @id py/missing-call-to-delete
- */
-
-import python
-import MethodCallOrder
-
-from ClassObject self, FunctionObject missing
-where
-  missing_call_to_superclass_method(self, _, missing, "__del__") and
-  not missing.neverReturns() and
-  not self.failedInference() and
-  not missing.isBuiltin()
-select self,
-  "Class " + self.getName() + " may not be cleaned up properly as $@ is not called during deletion.",
-  missing, missing.descriptiveString()
diff --git a/python/ql/src/Classes/MissingCallToInit.qhelp b/python/ql/src/Classes/MissingCallToInit.qhelp
deleted file mode 100644
index 31ad3d693a5..00000000000
--- a/python/ql/src/Classes/MissingCallToInit.qhelp
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE qhelp PUBLIC
-  "-//Semmle//qhelp//EN"
-  "qhelp.dtd">
-<qhelp>
-
-<overview>
-<p>Python, unlike statically typed languages such as Java, allows complete freedom when calling methods during object initialization.
-However, standard object-oriented principles apply to Python classes using deep inheritance hierarchies.
-Therefore the developer has responsibility for ensuring that objects are properly initialized when
-there are multiple <code>__init__</code> methods that need to be called.
-</p>
-<p>
-If the  <code>__init__</code> method of a superclass is not called during object initialization it is likely that
-that object will end up in an incorrect state.
-</p>
-
-<p>A call to the <code>__init__</code> method of a superclass during object initialization may be omitted:
-</p>
-<ul>
-        <li>When a subclass calls the <code>__init__</code> method of the wrong class.</li>
-        <li>When a call to the <code>__init__</code> method of one its base classes is omitted.</li>
-        <li>When multiple inheritance is used and a class inherits from several base classes,
-        and at least one of those does not use <code>super()</code> in its own <code>__init__</code> method.</li>
-</ul>
-
-
-</overview>
-<recommendation>
-<p>Either be careful to explicitly call the <code>__init__</code> of the correct base class, or
-use <code>super()</code> throughout the inheritance hierarchy.</p>
-
-<p>Alternatively refactor one or more of the classes to use composition rather than inheritance.</p>
-
-
-</recommendation>
-<example>
-<p>In this example, explicit calls to <code>__init__</code> are used, but <code>SportsCar</code> erroneously calls
-<code>Vehicle.__init__</code>. This is fixed in <code>FixedSportsCar</code> by calling <code>Car.__init__</code>.
-</p>
-
-<sample src="MissingCallToInit.py" />
-
-</example>
-<references>
-
-        <li>Python Tutorial: <a href="https://docs.python.org/2/tutorial/classes.html">Classes</a>.</li>
-        <li>Python Standard Library: <a href="https://docs.python.org/2/library/functions.html#super">super</a>.</li>
-        <li>Artima Developer: <a href="http://www.artima.com/weblogs/viewpost.jsp?thread=236275">Things to Know About Python Super</a>.</li>
-        <li>Wikipedia: <a href="http://en.wikipedia.org/wiki/Composition_over_inheritance">Composition over inheritance</a>.</li>
-
-</references>
-</qhelp>
diff --git a/python/ql/src/Classes/MissingCallToInit.ql b/python/ql/src/Classes/MissingCallToInit.ql
deleted file mode 100644
index 4f5d3d90e84..00000000000
--- a/python/ql/src/Classes/MissingCallToInit.ql
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * @name Missing call to `__init__` during object initialization
- * @description An omitted call to a super-class `__init__` method may lead to objects of this class not being fully initialized.
- * @kind problem
- * @tags quality
- *       reliability
- *       correctness
- * @problem.severity error
- * @sub-severity low
- * @precision high
- * @id py/missing-call-to-init
- */
-
-import python
-import MethodCallOrder
-
-from ClassObject self, FunctionObject initializer, FunctionObject missing
-where
-  self.lookupAttribute("__init__") = initializer and
-  missing_call_to_superclass_method(self, initializer, missing, "__init__") and
-  // If a superclass is incorrect, don't flag this class as well.
-  not missing_call_to_superclass_method(self.getASuperType(), _, missing, "__init__") and
-  not missing.neverReturns() and
-  not self.failedInference() and
-  not missing.isBuiltin() and
-  not self.isAbstract()
-select self,
-  "Class " + self.getName() + " may not be initialized properly as $@ is not called from its $@.",
-  missing, missing.descriptiveString(), initializer, "__init__ method"
diff --git a/python/ql/src/Classes/OverwritingAttributeInSuperClass.ql b/python/ql/src/Classes/OverwritingAttributeInSuperClass.ql
index 24887221141..699e4387a14 100644
--- a/python/ql/src/Classes/OverwritingAttributeInSuperClass.ql
+++ b/python/ql/src/Classes/OverwritingAttributeInSuperClass.ql
@@ -2,9 +2,9 @@
  * @name Overwriting attribute in super-class or sub-class
  * @description Assignment to self attribute overwrites attribute previously defined in subclass or superclass `__init__` method.
  * @kind problem
- * @tags reliability
- *       maintainability
- *       modularity
+ * @tags quality
+ *       reliability
+ *       correctness
  * @problem.severity warning
  * @sub-severity low
  * @precision medium
diff --git a/python/ql/src/Classes/ShouldBeContextManager.ql b/python/ql/src/Classes/ShouldBeContextManager.ql
index bdcc6dc2863..2423206e3cf 100644
--- a/python/ql/src/Classes/ShouldBeContextManager.ql
+++ b/python/ql/src/Classes/ShouldBeContextManager.ql
@@ -3,9 +3,10 @@
  * @description Making a class a context manager allows instances to be used in a 'with' statement.
  *              This improves resource handling and code readability.
  * @kind problem
- * @tags maintainability
+ * @tags quality
+ *       maintainability
  *       readability
- *       convention
+ *       performance
  * @problem.severity recommendation
  * @sub-severity high
  * @precision medium
diff --git a/python/ql/src/Classes/SubclassShadowing.py b/python/ql/src/Classes/SubclassShadowing.py
deleted file mode 100644
index 617db3c58e0..00000000000
--- a/python/ql/src/Classes/SubclassShadowing.py
+++ /dev/null
@@ -1,17 +0,0 @@
-class Mammal(object):
-
-    def __init__(self, milk = 0):
-        self.milk = milk
-
-
-class Cow(Mammal):
-
-    def __init__(self):
-        Mammal.__init__(self)
-
-    def milk(self):
-        return "Milk"
-
-#Cow().milk() will raise an error as Cow().milk is the 'milk' attribute
-#set in Mammal.__init__, not the 'milk' method defined on Cow.
-
diff --git a/python/ql/src/Classes/SubclassShadowing.qhelp b/python/ql/src/Classes/SubclassShadowing.qhelp
deleted file mode 100644
index 90daa9a992a..00000000000
--- a/python/ql/src/Classes/SubclassShadowing.qhelp
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE qhelp PUBLIC
-  "-//Semmle//qhelp//EN"
-  "qhelp.dtd">
-<qhelp>
-<overview>
-<p> Subclass shadowing occurs when an instance attribute of a superclass has the
-the same name as a method of a subclass, or vice-versa.
-The semantics of Python attribute look-up mean that the instance attribute of
-the superclass hides the method in the subclass.
-</p>
-
-</overview>
-<recommendation>
-
-<p>Rename the method in the subclass or rename the attribute in the superclass.</p>
-
-</recommendation>
-<example>
-<p>The following code includes an example of subclass shadowing. When you call <code>Cow().milk()</code> 
-an error is raised because <code>Cow().milk</code> is interpreted as the 'milk' attribute set in 
-<code>Mammal.__init__</code>, not the 'milk' method defined within <code>Cow</code>. This can be fixed 
-by changing the name of either the 'milk' attribute or the 'milk' method.</p>
-
-<sample src="SubclassShadowing.py" />
-
-</example>
-</qhelp>
diff --git a/python/ql/src/Classes/SubclassShadowing.ql b/python/ql/src/Classes/SubclassShadowing.ql
deleted file mode 100644
index 542cf31c76a..00000000000
--- a/python/ql/src/Classes/SubclassShadowing.ql
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * @name Superclass attribute shadows subclass method
- * @description Defining an attribute in a superclass method with a name that matches a subclass
- *              method, hides the method in the subclass.
- * @kind problem
- * @problem.severity error
- * @tags quality
- *       reliability
- *       correctness
- * @sub-severity low
- * @precision high
- * @id py/attribute-shadows-method
- */
-
-/*
- * Determine if a class defines a method that is shadowed by an attribute
- *   defined in a super-class
- */
-
-/* Need to find attributes defined in superclass (only in __init__?) */
-import python
-
-predicate shadowed_by_super_class(
-  ClassObject c, ClassObject supercls, Assign assign, FunctionObject f
-) {
-  c.getASuperType() = supercls and
-  c.declaredAttribute(_) = f and
-  exists(FunctionObject init, Attribute attr |
-    supercls.declaredAttribute("__init__") = init and
-    attr = assign.getATarget() and
-    attr.getObject().(Name).getId() = "self" and
-    attr.getName() = f.getName() and
-    assign.getScope() = init.getOrigin().(FunctionExpr).getInnerScope()
-  ) and
-  /*
-   * It's OK if the super class defines the method as well.
-   * We assume that the original method must have been defined for a reason.
-   */
-
-  not supercls.hasAttribute(f.getName())
-}
-
-from ClassObject c, ClassObject supercls, Assign assign, FunctionObject shadowed
-where shadowed_by_super_class(c, supercls, assign, shadowed)
-select shadowed.getOrigin(),
-  "Method " + shadowed.getName() + " is shadowed by an $@ in super class '" + supercls.getName() +
-    "'.", assign, "attribute"
diff --git a/python/ql/src/Classes/SubclassShadowing/SubclassShadowing.qhelp b/python/ql/src/Classes/SubclassShadowing/SubclassShadowing.qhelp
new file mode 100644
index 00000000000..b45938cc28d
--- /dev/null
+++ b/python/ql/src/Classes/SubclassShadowing/SubclassShadowing.qhelp
@@ -0,0 +1,39 @@
+<!DOCTYPE qhelp PUBLIC
+  "-//Semmle//qhelp//EN"
+  "qhelp.dtd">
+<qhelp>
+<overview>
+<p>
+When an object has an attribute that shares its name with a method on the object's class (or another class attribute), the instance attribute is 
+prioritized during attribute lookup, shadowing the method.  
+
+If a method on a subclass is shadowed by an attribute on a superclass in this way, this may lead to unexpected results or errors, as this
+shadowing behavior is nonlocal and may be unintended.
+</p>
+
+</overview>
+<recommendation>
+
+<p>
+Ensure method names on subclasses don't conflict with attribute names on superclasses, and rename one.  
+If the shadowing behavior is intended, ensure this is explicit in the superclass.
+</p>
+
+</recommendation>
+<example>
+<p>
+In the following example, the <code>_foo</code> attribute of class <code>A</code> shadows the method <code>_foo</code> of class <code>B</code>. 
+Calls to <code>B()._foo()</code> will result in a <code>TypeError</code>, as <code>3</code> will be called instead. 
+</p>
+
+<sample src="examples/SubclassShadowingBad.py" />
+
+<p>
+In the following example, the behavior of the <code>default</code> attribute being shadowed to allow for customization during initialization is
+intended in within the superclass <code>A</code>. Overriding <code>default</code> in the subclass <code>B</code> is then OK.
+</p>
+
+<sample src="examples/SubclassShadowingGood.py" />
+
+</example>
+</qhelp>
diff --git a/python/ql/src/Classes/SubclassShadowing/SubclassShadowing.ql b/python/ql/src/Classes/SubclassShadowing/SubclassShadowing.ql
new file mode 100644
index 00000000000..39a320f75ac
--- /dev/null
+++ b/python/ql/src/Classes/SubclassShadowing/SubclassShadowing.ql
@@ -0,0 +1,71 @@
+/**
+ * @name Superclass attribute shadows subclass method
+ * @description Defining an attribute in a superclass method with a name that matches a subclass
+ *              method, hides the method in the subclass.
+ * @kind problem
+ * @problem.severity error
+ * @tags quality
+ *       reliability
+ *       correctness
+ * @sub-severity low
+ * @precision high
+ * @id py/attribute-shadows-method
+ */
+
+import python
+import semmle.python.ApiGraphs
+import semmle.python.dataflow.new.internal.DataFlowDispatch
+
+predicate isSettableProperty(Function prop) {
+  isProperty(prop) and
+  exists(Function setter |
+    setter.getScope() = prop.getScope() and
+    setter.getName() = prop.getName() and
+    isSetter(setter)
+  )
+}
+
+predicate isSetter(Function f) {
+  exists(DataFlow::AttrRead attr |
+    f.getADecorator() = attr.asExpr() and
+    attr.getAttributeName() = "setter"
+  )
+}
+
+predicate isProperty(Function prop) {
+  prop.getADecorator() = API::builtin("property").asSource().asExpr()
+}
+
+predicate shadowedBySuperclass(
+  Class cls, Class superclass, DataFlow::AttrWrite write, Function shadowed
+) {
+  getADirectSuperclass+(cls) = superclass and
+  shadowed = cls.getAMethod() and
+  exists(Function init |
+    init = superclass.getInitMethod() and
+    DataFlow::parameterNode(init.getArg(0)).(DataFlow::LocalSourceNode).flowsTo(write.getObject()) and
+    write.getAttributeName() = shadowed.getName()
+  ) and
+  // Allow cases in which the super class defines the method as well.
+  // We assume that the original method must have been defined for a reason.
+  not exists(Function superShadowed |
+    superShadowed = superclass.getAMethod() and
+    superShadowed.getName() = shadowed.getName()
+  ) and
+  // Allow properties if they have setters, as the write in the superclass will call the setter.
+  not isSettableProperty(shadowed) and
+  not isSetter(shadowed)
+}
+
+from Class cls, Class superclass, DataFlow::AttrWrite write, Function shadowed, string extra
+where
+  shadowedBySuperclass(cls, superclass, write, shadowed) and
+  (
+    if isProperty(shadowed)
+    then
+      // it's not a setter, so it's a read-only property
+      extra = " (read-only property may cause an error if written to in the superclass)"
+    else extra = ""
+  )
+select shadowed, "This method is shadowed by $@ in superclass $@." + extra, write,
+  "attribute " + write.getAttributeName(), superclass, superclass.getName()
diff --git a/python/ql/src/Classes/SubclassShadowing/examples/SubclassShadowingBad.py b/python/ql/src/Classes/SubclassShadowing/examples/SubclassShadowingBad.py
new file mode 100644
index 00000000000..00a221760b4
--- /dev/null
+++ b/python/ql/src/Classes/SubclassShadowing/examples/SubclassShadowingBad.py
@@ -0,0 +1,9 @@
+class A:
+    def __init__(self):
+        self._foo = 3
+
+class B(A):
+    # BAD: _foo is shadowed by attribute A._foo
+    def _foo(self):
+        return 2
+
diff --git a/python/ql/src/Classes/SubclassShadowing/examples/SubclassShadowingGood.py b/python/ql/src/Classes/SubclassShadowing/examples/SubclassShadowingGood.py
new file mode 100644
index 00000000000..8fca041176c
--- /dev/null
+++ b/python/ql/src/Classes/SubclassShadowing/examples/SubclassShadowingGood.py
@@ -0,0 +1,15 @@
+class A:
+    def __init__(self, default_func=None):
+        if default_func is not None:
+            self.default = default_func 
+
+    # GOOD: The shadowing behavior is explicitly intended in the superclass.
+    def default(self):
+        return []
+    
+class B(A):
+    
+    # Subclasses may override the method `default`, which will still be shadowed by the attribute `default` if it is set.
+    # As this is part of the expected behavior of the superclass, this is fine. 
+    def default(self):
+        return {}
\ No newline at end of file
diff --git a/python/ql/src/Classes/SuperclassDelCalledMultipleTimes.py b/python/ql/src/Classes/SuperclassDelCalledMultipleTimes.py
deleted file mode 100644
index 0ee6e61bcb1..00000000000
--- a/python/ql/src/Classes/SuperclassDelCalledMultipleTimes.py
+++ /dev/null
@@ -1,29 +0,0 @@
-#Calling a method multiple times by using explicit calls when a base inherits from other base
-class Vehicle(object):
-    
-    def __del__(self):
-        recycle(self.base_parts)
-        
-        
-class Car(Vehicle):
-    
-    def __del__(self):
-        recycle(self.car_parts)
-        Vehicle.__del__(self)
-    
-    
-class SportsCar(Car, Vehicle):
-    
-    # Vehicle.__del__ will get called twice
-    def __del__(self):
-        recycle(self.sports_car_parts)
-        Car.__del__(self)
-        Vehicle.__del__(self)
-        
-        
-#Fix SportsCar by only calling Car.__del__
-class FixedSportsCar(Car, Vehicle):
-    
-    def __del__(self):
-        recycle(self.sports_car_parts)
-        Car.__del__(self)
diff --git a/python/ql/src/Classes/SuperclassDelCalledMultipleTimes.qhelp b/python/ql/src/Classes/SuperclassDelCalledMultipleTimes.qhelp
deleted file mode 100644
index d9514b2c68c..00000000000
--- a/python/ql/src/Classes/SuperclassDelCalledMultipleTimes.qhelp
+++ /dev/null
@@ -1,58 +0,0 @@
-<!DOCTYPE qhelp PUBLIC
-  "-//Semmle//qhelp//EN"
-  "qhelp.dtd">
-<qhelp>
-
-<overview>
-<p>Python, unlike statically typed languages such as Java, allows complete freedom when calling methods during object destruction.
-However, standard object-oriented principles apply to Python classes using deep inheritance hierarchies.
-Therefore the developer has responsibility for ensuring that objects are properly cleaned up when
-there are multiple <code>__del__</code> methods that need to be called.
-</p>
-
-<p>
-Calling a <code>__del__</code> method more than once during object destruction risks resources being released multiple
-times. The relevant <code>__del__</code> method may not be designed to be called more than once.
-</p>
-
-<p>There are a number of ways that a <code>__del__</code> method may be be called more than once.</p>
-<ul>
-    <li>There may be more than one explicit call to the method in the hierarchy of <code>__del__</code> methods.</li>
-    <li>A class using multiple inheritance directly calls the <code>__del__</code> methods of its base types.
-    One or more of those base types uses <code>super()</code> to pass down the inheritance chain.</li>
-</ul>
-
-
-</overview>
-<recommendation>
-<p>Either be careful not to explicitly call a <code>__del__</code> method more than once, or
-use <code>super()</code> throughout the inheritance hierarchy.</p>
-
-<p>Alternatively refactor one or more of the classes to use composition rather than inheritance.</p>
-
-</recommendation>
-<example>
-<p>In the first example, explicit calls to <code>__del__</code> are used, but <code>SportsCar</code> erroneously calls
-both <code>Vehicle.__del__</code> and <code>Car.__del__</code>.
-This can be fixed by removing the call to <code>Vehicle.__del__</code>, as shown in <code>FixedSportsCar</code>.
-</p>
-
-<sample src="SuperclassDelCalledMultipleTimes.py" />
-
-<p>In the second example, there is a mixture of explicit calls to <code>__del__</code> and calls using <code>super()</code>.
-To fix this example, <code>super()</code> should be used throughout.
-</p>
-
-<sample src="SuperclassInitCalledMultipleTimes2.py" />
-
-</example>
-<references>
-
-        <li>Python Tutorial: <a href="https://docs.python.org/2/tutorial/classes.html">Classes</a>.</li>
-        <li>Python Standard Library: <a href="https://docs.python.org/2/library/functions.html#super">super</a>.</li>
-        <li>Artima Developer: <a href="http://www.artima.com/weblogs/viewpost.jsp?thread=236275">Things to Know About Python Super</a>.</li>
-        <li>Wikipedia: <a href="http://en.wikipedia.org/wiki/Composition_over_inheritance">Composition over inheritance</a>.</li>
-
-
-</references>
-</qhelp>
diff --git a/python/ql/src/Classes/SuperclassDelCalledMultipleTimes.ql b/python/ql/src/Classes/SuperclassDelCalledMultipleTimes.ql
deleted file mode 100644
index 019da4257aa..00000000000
--- a/python/ql/src/Classes/SuperclassDelCalledMultipleTimes.ql
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * @name Multiple calls to `__del__` during object destruction
- * @description A duplicated call to a super-class `__del__` method may lead to class instances not be cleaned up properly.
- * @kind problem
- * @tags quality
- *       reliability
- *       correctness
- * @problem.severity warning
- * @sub-severity high
- * @precision very-high
- * @id py/multiple-calls-to-delete
- */
-
-import python
-import MethodCallOrder
-
-from ClassObject self, FunctionObject multi
-where
-  multiple_calls_to_superclass_method(self, multi, "__del__") and
-  not multiple_calls_to_superclass_method(self.getABaseType(), multi, "__del__") and
-  not exists(FunctionObject better |
-    multiple_calls_to_superclass_method(self, better, "__del__") and
-    better.overrides(multi)
-  ) and
-  not self.failedInference()
-select self,
-  "Class " + self.getName() +
-    " may not be cleaned up properly as $@ may be called multiple times during destruction.", multi,
-  multi.descriptiveString()
diff --git a/python/ql/src/Classes/SuperclassInitCalledMultipleTimes.py b/python/ql/src/Classes/SuperclassInitCalledMultipleTimes.py
deleted file mode 100644
index 050d5d389d6..00000000000
--- a/python/ql/src/Classes/SuperclassInitCalledMultipleTimes.py
+++ /dev/null
@@ -1,36 +0,0 @@
-#Calling a method multiple times by using explicit calls when a base inherits from other base
-class Vehicle(object):
-    
-    def __init__(self):
-        self.mobile = True
-        
-class Car(Vehicle):
-    
-    def __init__(self):
-        Vehicle.__init__(self)
-        self.car_init()
-        
-    def car_init(self):
-        pass
-    
-class SportsCar(Car, Vehicle):
-    
-    # Vehicle.__init__ will get called twice
-    def __init__(self):
-        Vehicle.__init__(self)
-        Car.__init__(self)
-        self.sports_car_init()
-        
-    def sports_car_init(self):
-        pass
-        
-#Fix SportsCar by only calling Car.__init__
-class FixedSportsCar(Car, Vehicle):
-    
-    def __init__(self):
-        Car.__init__(self)
-        self.sports_car_init()
-        
-    def sports_car_init(self):
-        pass
- 
diff --git a/python/ql/src/Classes/SuperclassInitCalledMultipleTimes.qhelp b/python/ql/src/Classes/SuperclassInitCalledMultipleTimes.qhelp
deleted file mode 100644
index f1140d68b89..00000000000
--- a/python/ql/src/Classes/SuperclassInitCalledMultipleTimes.qhelp
+++ /dev/null
@@ -1,58 +0,0 @@
-<!DOCTYPE qhelp PUBLIC
-  "-//Semmle//qhelp//EN"
-  "qhelp.dtd">
-<qhelp>
-
-<overview>
-<p>Python, unlike statically typed languages such as Java, allows complete freedom when calling methods during object initialization.
-However, standard object-oriented principles apply to Python classes using deep inheritance hierarchies.
-Therefore the developer has responsibility for ensuring that objects are properly initialized when
-there are multiple <code>__init__</code> methods that need to be called.
-</p>
-
-<p>
-Calling an <code>__init__</code> method more than once during object initialization risks the object being incorrectly initialized.
-It is unlikely that the relevant <code>__init__</code> method is designed to be called more than once.
-</p>
-
-<p>There are a number of ways that an <code>__init__</code> method may be be called more than once.</p>
-<ul>
-    <li>There may be more than one explicit call to the method in the hierarchy of <code>__init__</code> methods.</li>
-    <li>A class using multiple inheritance directly calls the <code>__init__</code> methods of its base types.
-    One or more of those base types uses <code>super()</code> to pass down the inheritance chain.</li>
-</ul>
-
-
-</overview>
-<recommendation>
-<p>Either be careful not to explicitly call an <code>__init__</code> method more than once, or
-use <code>super()</code> throughout the inheritance hierarchy.</p>
-
-<p>Alternatively refactor one or more of the classes to use composition rather than inheritance.</p>
-
-</recommendation>
-<example>
-<p>In the first example, explicit calls to <code>__init__</code> are used, but <code>SportsCar</code> erroneously calls
-both <code>Vehicle.__init__</code> and <code>Car.__init__</code>.
-This can be fixed by removing the call to <code>Vehicle.__init__</code>, as shown in <code>FixedSportsCar</code>.
-</p>
-
-<sample src="SuperclassInitCalledMultipleTimes.py" />
-
-<p>In the second example, there is a mixture of explicit calls to <code>__init__</code> and calls using <code>super()</code>.
-To fix this example, <code>super()</code> should be used throughout.
-</p>
-
-<sample src="SuperclassInitCalledMultipleTimes2.py" />
-
-</example>
-<references>
-
-        <li>Python Tutorial: <a href="https://docs.python.org/2/tutorial/classes.html">Classes</a>.</li>
-        <li>Python Standard Library: <a href="https://docs.python.org/2/library/functions.html#super">super</a>.</li>
-        <li>Artima Developer: <a href="http://www.artima.com/weblogs/viewpost.jsp?thread=236275">Things to Know About Python Super</a>.</li>
-        <li>Wikipedia: <a href="http://en.wikipedia.org/wiki/Composition_over_inheritance">Composition over inheritance</a>.</li>
-
-
-</references>
-</qhelp>
diff --git a/python/ql/src/Classes/SuperclassInitCalledMultipleTimes.ql b/python/ql/src/Classes/SuperclassInitCalledMultipleTimes.ql
deleted file mode 100644
index 6251ef274da..00000000000
--- a/python/ql/src/Classes/SuperclassInitCalledMultipleTimes.ql
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * @name Multiple calls to `__init__` during object initialization
- * @description A duplicated call to a super-class `__init__` method may lead to objects of this class not being properly initialized.
- * @kind problem
- * @tags quality
- *       reliability
- *       correctness
- * @problem.severity warning
- * @sub-severity high
- * @precision very-high
- * @id py/multiple-calls-to-init
- */
-
-import python
-import MethodCallOrder
-
-from ClassObject self, FunctionObject multi
-where
-  multi != theObjectType().lookupAttribute("__init__") and
-  multiple_calls_to_superclass_method(self, multi, "__init__") and
-  not multiple_calls_to_superclass_method(self.getABaseType(), multi, "__init__") and
-  not exists(FunctionObject better |
-    multiple_calls_to_superclass_method(self, better, "__init__") and
-    better.overrides(multi)
-  ) and
-  not self.failedInference()
-select self,
-  "Class " + self.getName() +
-    " may not be initialized properly as $@ may be called multiple times during initialization.",
-  multi, multi.descriptiveString()
diff --git a/python/ql/src/Classes/SuperclassInitCalledMultipleTimes2.py b/python/ql/src/Classes/SuperclassInitCalledMultipleTimes2.py
deleted file mode 100644
index e12e86a079e..00000000000
--- a/python/ql/src/Classes/SuperclassInitCalledMultipleTimes2.py
+++ /dev/null
@@ -1,38 +0,0 @@
-
-#Calling a method multiple times by using explicit calls when a base uses super()
-class Vehicle(object):
-     
-    def __init__(self):
-        super(Vehicle, self).__init__()
-        self.mobile = True
-        
-class Car(Vehicle):
-    
-    def __init__(self):
-        super(Car, self).__init__()
-        self.car_init()
-        
-    def car_init(self):
-        pass
-        
-class SportsCar(Car, Vehicle):
-    
-    # Vehicle.__init__ will get called twice
-    def __init__(self):
-        Vehicle.__init__(self)
-        Car.__init__(self)
-        self.sports_car_init()
-        
-    def sports_car_init(self):
-        pass
-        
-#Fix SportsCar by using super()
-class FixedSportsCar(Car, Vehicle):
-    
-    def __init__(self):
-        super(SportsCar, self).__init__()
-        self.sports_car_init()
-        
-    def sports_car_init(self):
-        pass
-
diff --git a/python/ql/src/Classes/UselessClass.ql b/python/ql/src/Classes/UselessClass.ql
index 19d21c7e7ca..7e33660dafc 100644
--- a/python/ql/src/Classes/UselessClass.ql
+++ b/python/ql/src/Classes/UselessClass.ql
@@ -2,8 +2,10 @@
  * @name Useless class
  * @description Class only defines one public method (apart from `__init__` or `__new__`) and should be replaced by a function
  * @kind problem
- * @tags maintainability
+ * @tags quality
+ *       maintainability
  *       useless-code
+ *       complexity
  * @problem.severity recommendation
  * @sub-severity low
  * @precision medium
diff --git a/python/ql/src/Exceptions/IncorrectExceptOrder.qhelp b/python/ql/src/Exceptions/IncorrectExceptOrder.qhelp
index d2854af6ca6..9d78350bcd2 100644
--- a/python/ql/src/Exceptions/IncorrectExceptOrder.qhelp
+++ b/python/ql/src/Exceptions/IncorrectExceptOrder.qhelp
@@ -25,11 +25,11 @@ is a super class of <code>Error</code>.
 
 <p>Reorganize the <code>except</code> blocks so that the more specific <code>except</code> 
 is defined first. Alternatively, if the more specific <code>except</code> block is 
-no longer required then it should be deleted.</p>
+no longer required, then it should be deleted.</p>
 
 </recommendation>
 <example>
-<p>In this example the <code>except Exception:</code> will handle <code>AttributeError</code> preventing the
+<p>In the following example, the <code>except Exception:</code> will handle <code>AttributeError</code> preventing the
 subsequent handler from ever executing.</p>
 <sample src="IncorrectExceptOrder.py" />
 
@@ -37,8 +37,8 @@ subsequent handler from ever executing.</p>
 </example>
 <references>
 
-<li>Python Language Reference: <a href="http://docs.python.org/2.7/reference/compound_stmts.html#try">The try statement</a>, 
-<a href="http://docs.python.org/2.7/reference/executionmodel.html#exceptions">Exceptions</a>.</li>
+<li>Python Language Reference: <a href="http://docs.python.org/3/reference/compound_stmts.html#try">The try statement</a>, 
+<a href="http://docs.python.org/3/reference/executionmodel.html#exceptions">Exceptions</a>.</li>
 
 
 </references>
diff --git a/python/ql/src/Exceptions/IncorrectExceptOrder.ql b/python/ql/src/Exceptions/IncorrectExceptOrder.ql
index 3c0c90b36d3..6eb1b39b0e6 100644
--- a/python/ql/src/Exceptions/IncorrectExceptOrder.ql
+++ b/python/ql/src/Exceptions/IncorrectExceptOrder.ql
@@ -1,5 +1,5 @@
 /**
- * @name Unreachable 'except' block
+ * @name Unreachable `except` block
  * @description Handling general exceptions before specific exceptions means that the specific
  *              handlers are never executed.
  * @kind problem
@@ -14,22 +14,95 @@
  */
 
 import python
+import semmle.python.dataflow.new.internal.DataFlowDispatch
+import semmle.python.ApiGraphs
+import semmle.python.frameworks.data.internal.ApiGraphModels
 
-predicate incorrect_except_order(ExceptStmt ex1, ClassValue cls1, ExceptStmt ex2, ClassValue cls2) {
+predicate builtinException(string name) {
+  typeModel("builtins.BaseException~Subclass", "builtins." + name, "")
+}
+
+predicate builtinExceptionSubclass(string base, string sub) {
+  typeModel("builtins." + base + "~Subclass", "builtins." + sub, "")
+}
+
+newtype TExceptType =
+  TClass(Class c) or
+  TBuiltin(string name) { builtinException(name) }
+
+class ExceptType extends TExceptType {
+  Class asClass() { this = TClass(result) }
+
+  string asBuiltinName() { this = TBuiltin(result) }
+
+  predicate isBuiltin() { this = TBuiltin(_) }
+
+  string getName() {
+    result = this.asClass().getName()
+    or
+    result = this.asBuiltinName()
+  }
+
+  string toString() { result = this.getName() }
+
+  DataFlow::Node getAUse() {
+    result = classTracker(this.asClass())
+    or
+    API::builtin(this.asBuiltinName()).asSource().flowsTo(result)
+  }
+
+  ExceptType getADirectSuperclass() {
+    result.asClass() = getADirectSuperclass(this.asClass())
+    or
+    result.isBuiltin() and
+    result.getAUse().asExpr() = this.asClass().getABase()
+    or
+    builtinExceptionSubclass(result.asBuiltinName(), this.asBuiltinName()) and
+    this != result
+  }
+
+  /**
+   * Holds if this element is at the specified location.
+   * The location spans column `startColumn` of line `startLine` to
+   * column `endColumn` of line `endLine` in file `filepath`.
+   * For more information, see
+   * [Providing locations in CodeQL queries](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+   */
+  predicate hasLocationInfo(
+    string filePath, int startLine, int startColumn, int endLine, int endColumn
+  ) {
+    this.asClass()
+        .getLocation()
+        .hasLocationInfo(filePath, startLine, startColumn, endLine, endColumn)
+    or
+    this.isBuiltin() and
+    filePath = "" and
+    startLine = 0 and
+    startColumn = 0 and
+    endLine = 0 and
+    endColumn = 0
+  }
+}
+
+predicate incorrectExceptOrder(ExceptStmt ex1, ExceptType cls1, ExceptStmt ex2, ExceptType cls2) {
   exists(int i, int j, Try t |
     ex1 = t.getHandler(i) and
     ex2 = t.getHandler(j) and
     i < j and
-    cls1 = except_class(ex1) and
-    cls2 = except_class(ex2) and
-    cls1 = cls2.getASuperType()
+    cls1 = exceptClass(ex1) and
+    cls2 = exceptClass(ex2) and
+    cls1 = cls2.getADirectSuperclass*()
   )
 }
 
-ClassValue except_class(ExceptStmt ex) { ex.getType().pointsTo(result) }
+ExceptType exceptClass(ExceptStmt ex) { ex.getType() = result.getAUse().asExpr() }
 
-from ExceptStmt ex1, ClassValue cls1, ExceptStmt ex2, ClassValue cls2
-where incorrect_except_order(ex1, cls1, ex2, cls2)
-select ex2,
-  "Except block for $@ is unreachable; the more general $@ for $@ will always be executed in preference.",
-  cls2, cls2.getName(), ex1, "except block", cls1, cls1.getName()
+from ExceptStmt ex1, ExceptType cls1, ExceptStmt ex2, ExceptType cls2, string msg
+where
+  incorrectExceptOrder(ex1, cls1, ex2, cls2) and
+  if cls1 = cls2
+  then msg = "This except block handling $@ is unreachable; as $@ also handles $@."
+  else
+    msg =
+      "This except block handling $@ is unreachable; as $@ for the more general $@ always subsumes it."
+select ex2, msg, cls2, cls2.getName(), ex1, "this except block", cls1, cls1.getName()
diff --git a/python/ql/src/Exceptions/NotImplemented.qll b/python/ql/src/Exceptions/NotImplemented.qll
index 2186a7b5f30..498165d2982 100644
--- a/python/ql/src/Exceptions/NotImplemented.qll
+++ b/python/ql/src/Exceptions/NotImplemented.qll
@@ -1,7 +1,8 @@
 import python
+private import LegacyPointsTo
 
 /** Holds if `notimpl` refers to `NotImplemented` or `NotImplemented()` in the `raise` statement */
-predicate use_of_not_implemented_in_raise(Raise raise, Expr notimpl) {
+predicate use_of_not_implemented_in_raise(Raise raise, ExprWithPointsTo notimpl) {
   notimpl.pointsTo(Value::named("NotImplemented")) and
   (
     notimpl = raise.getException() or
diff --git a/python/ql/src/Exceptions/Raising.qll b/python/ql/src/Exceptions/Raising.qll
index c8149481187..c509c41819d 100644
--- a/python/ql/src/Exceptions/Raising.qll
+++ b/python/ql/src/Exceptions/Raising.qll
@@ -1,8 +1,9 @@
 import python
+private import LegacyPointsTo
 
 /** Whether the raise statement 'r' raises 'type' from origin 'orig' */
 predicate type_or_typeof(Raise r, ClassValue type, AstNode orig) {
-  exists(Expr exception | exception = r.getRaised() |
+  exists(ExprWithPointsTo exception | exception = r.getRaised() |
     exception.pointsTo(type, orig)
     or
     not exists(ClassValue exc_type | exception.pointsTo(exc_type)) and
diff --git a/python/ql/src/Expressions/CallArgs.qll b/python/ql/src/Expressions/CallArgs.qll
index d2f94ca7cf0..709915afbc6 100644
--- a/python/ql/src/Expressions/CallArgs.qll
+++ b/python/ql/src/Expressions/CallArgs.qll
@@ -1,12 +1,13 @@
 /** INTERNAL - Methods used by queries that test whether functions are invoked correctly. */
 
 import python
+private import LegacyPointsTo
 import Testing.Mox
 
 private int varargs_length_objectapi(Call call) {
   not exists(call.getStarargs()) and result = 0
   or
-  exists(TupleObject t | call.getStarargs().refersTo(t) | result = t.getLength())
+  exists(TupleObject t | call.getStarargs().(ExprWithPointsTo).refersTo(t) | result = t.getLength())
   or
   result = count(call.getStarargs().(List).getAnElt())
 }
@@ -14,7 +15,7 @@ private int varargs_length_objectapi(Call call) {
 private int varargs_length(Call call) {
   not exists(call.getStarargs()) and result = 0
   or
-  exists(TupleValue t | call.getStarargs().pointsTo(t) | result = t.length())
+  exists(TupleValue t | call.getStarargs().(ExprWithPointsTo).pointsTo(t) | result = t.length())
   or
   result = count(call.getStarargs().(List).getAnElt())
 }
diff --git a/python/ql/src/Expressions/ContainsNonContainer.ql b/python/ql/src/Expressions/ContainsNonContainer.ql
index cf6af5ce7b1..fd2123dd436 100644
--- a/python/ql/src/Expressions/ContainsNonContainer.ql
+++ b/python/ql/src/Expressions/ContainsNonContainer.ql
@@ -12,6 +12,7 @@
  */
 
 import python
+private import LegacyPointsTo
 import semmle.python.pointsto.PointsTo
 
 predicate rhs_in_expr(ControlFlowNode rhs, Compare cmp) {
@@ -20,7 +21,8 @@ predicate rhs_in_expr(ControlFlowNode rhs, Compare cmp) {
   )
 }
 
-from ControlFlowNode non_seq, Compare cmp, Value v, ClassValue cls, ControlFlowNode origin
+from
+  ControlFlowNodeWithPointsTo non_seq, Compare cmp, Value v, ClassValue cls, ControlFlowNode origin
 where
   rhs_in_expr(non_seq, cmp) and
   non_seq.pointsTo(_, v, origin) and
diff --git a/python/ql/src/Expressions/ExpectedMappingForFormatString.ql b/python/ql/src/Expressions/ExpectedMappingForFormatString.ql
index 4342062270b..c11ab58688e 100644
--- a/python/ql/src/Expressions/ExpectedMappingForFormatString.ql
+++ b/python/ql/src/Expressions/ExpectedMappingForFormatString.ql
@@ -12,9 +12,10 @@
  */
 
 import python
+private import LegacyPointsTo
 import semmle.python.strings
 
-from Expr e, ClassValue t
+from ExprWithPointsTo e, ClassValue t
 where
   exists(BinaryExpr b |
     b.getOp() instanceof Mod and
diff --git a/python/ql/src/Expressions/Formatting/AdvancedFormatting.qll b/python/ql/src/Expressions/Formatting/AdvancedFormatting.qll
index 7da80ffa027..d98286d85fa 100644
--- a/python/ql/src/Expressions/Formatting/AdvancedFormatting.qll
+++ b/python/ql/src/Expressions/Formatting/AdvancedFormatting.qll
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 /** A string constant that looks like it may be used in string formatting operations. */
 class PossibleAdvancedFormatString extends StringLiteral {
@@ -98,11 +99,15 @@ private predicate brace_pair(PossibleAdvancedFormatString fmt, int start, int en
 
 private predicate advanced_format_call(Call format_expr, PossibleAdvancedFormatString fmt, int args) {
   exists(CallNode call | call = format_expr.getAFlowNode() |
-    call.getFunction().pointsTo(Value::named("format")) and
-    call.getArg(0).pointsTo(_, fmt.getAFlowNode()) and
+    call.getFunction().(ControlFlowNodeWithPointsTo).pointsTo(Value::named("format")) and
+    call.getArg(0).(ControlFlowNodeWithPointsTo).pointsTo(_, fmt.getAFlowNode()) and
     args = count(format_expr.getAnArg()) - 1
     or
-    call.getFunction().(AttrNode).getObject("format").pointsTo(_, fmt.getAFlowNode()) and
+    call.getFunction()
+        .(AttrNode)
+        .getObject("format")
+        .(ControlFlowNodeWithPointsTo)
+        .pointsTo(_, fmt.getAFlowNode()) and
     args = count(format_expr.getAnArg())
   )
 }
diff --git a/python/ql/src/Expressions/HashedButNoHash.ql b/python/ql/src/Expressions/HashedButNoHash.ql
index eb86f3b5533..705806bf360 100644
--- a/python/ql/src/Expressions/HashedButNoHash.ql
+++ b/python/ql/src/Expressions/HashedButNoHash.ql
@@ -12,6 +12,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 /*
  * This assumes that any indexing operation where the value is not a sequence or numpy array involves hashing.
@@ -41,13 +42,13 @@ predicate unhashable_subscript(ControlFlowNode f, ClassValue c, ControlFlowNode
   is_unhashable(f, c, origin) and
   exists(SubscriptNode sub | sub.getIndex() = f |
     exists(Value custom_getitem |
-      sub.getObject().pointsTo(custom_getitem) and
+      sub.getObject().(ControlFlowNodeWithPointsTo).pointsTo(custom_getitem) and
       not has_custom_getitem(custom_getitem)
     )
   )
 }
 
-predicate is_unhashable(ControlFlowNode f, ClassValue cls, ControlFlowNode origin) {
+predicate is_unhashable(ControlFlowNodeWithPointsTo f, ClassValue cls, ControlFlowNode origin) {
   exists(Value v | f.pointsTo(v, origin) and v.getClass() = cls |
     not cls.hasAttribute("__hash__") and not cls.failedInference(_) and cls.isNewStyle()
     or
@@ -71,7 +72,7 @@ predicate is_unhashable(ControlFlowNode f, ClassValue cls, ControlFlowNode origi
 predicate typeerror_is_caught(ControlFlowNode f) {
   exists(Try try |
     try.getBody().contains(f.getNode()) and
-    try.getAHandler().getType().pointsTo(ClassValue::typeError())
+    try.getAHandler().getType().(ExprWithPointsTo).pointsTo(ClassValue::typeError())
   )
 }
 
diff --git a/python/ql/src/Expressions/IsComparisons.qll b/python/ql/src/Expressions/IsComparisons.qll
index 7825d01999b..1ed4534bd23 100644
--- a/python/ql/src/Expressions/IsComparisons.qll
+++ b/python/ql/src/Expressions/IsComparisons.qll
@@ -1,6 +1,8 @@
 /** INTERNAL - Helper predicates for queries that inspect the comparison of objects using `is`. */
 
 import python
+private import LegacyPointsTo
+private import semmle.python.objects.ObjectInternal
 
 /** Holds if the comparison `comp` uses `is` or `is not` (represented as `op`) to compare its `left` and `right` arguments. */
 predicate comparison_using_is(Compare comp, ControlFlowNode left, Cmpop op, ControlFlowNode right) {
@@ -42,7 +44,7 @@ predicate invalid_to_use_is_portably(ClassValue c) {
 }
 
 /** Holds if the control flow node `f` points to either `True`, `False`, or `None`. */
-predicate simple_constant(ControlFlowNode f) {
+predicate simple_constant(ControlFlowNodeWithPointsTo f) {
   exists(Value val | f.pointsTo(val) |
     val = Value::named("True") or val = Value::named("False") or val = Value::named("None")
   )
@@ -74,17 +76,17 @@ private predicate universally_interned_value(Expr e) {
 }
 
 /** Holds if the expression `e` points to an interned constant in CPython. */
-predicate cpython_interned_constant(Expr e) {
+predicate cpython_interned_constant(ExprWithPointsTo e) {
   exists(Expr const | e.pointsTo(_, const) | cpython_interned_value(const))
 }
 
 /** Holds if the expression `e` points to a value that can be reasonably expected to be interned across all implementations of Python. */
-predicate universally_interned_constant(Expr e) {
+predicate universally_interned_constant(ExprWithPointsTo e) {
   exists(Expr const | e.pointsTo(_, const) | universally_interned_value(const))
 }
 
 private predicate comparison_both_types(Compare comp, Cmpop op, ClassValue cls1, ClassValue cls2) {
-  exists(ControlFlowNode op1, ControlFlowNode op2 |
+  exists(ControlFlowNodeWithPointsTo op1, ControlFlowNodeWithPointsTo op2 |
     comparison_using_is(comp, op1, op, op2) or comparison_using_is(comp, op2, op, op1)
   |
     op1.inferredValue().getClass() = cls1 and
@@ -94,7 +96,7 @@ private predicate comparison_both_types(Compare comp, Cmpop op, ClassValue cls1,
 
 private predicate comparison_one_type(Compare comp, Cmpop op, ClassValue cls) {
   not comparison_both_types(comp, _, _, _) and
-  exists(ControlFlowNode operand |
+  exists(ControlFlowNodeWithPointsTo operand |
     comparison_using_is(comp, operand, op, _) or comparison_using_is(comp, _, op, operand)
   |
     operand.inferredValue().getClass() = cls
@@ -118,9 +120,9 @@ predicate invalid_portable_is_comparison(Compare comp, Cmpop op, ClassValue cls)
     )
   ) and
   // OK to use 'is' when comparing items from a known set of objects
-  not exists(Expr left, Expr right, Value val |
+  not exists(ExprWithPointsTo left, ExprWithPointsTo right, Value val |
     comp.compares(left, op, right) and
-    exists(ImmutableLiteral il | il.getLiteralValue() = val)
+    exists(ImmutableLiteral il | il = val.(ConstantObjectInternal).getLiteral())
   |
     left.pointsTo(val) and right.pointsTo(val)
     or
@@ -132,7 +134,7 @@ predicate invalid_portable_is_comparison(Compare comp, Cmpop op, ClassValue cls)
     )
   ) and
   // OK to use 'is' when comparing with a member of an enum
-  not exists(Expr left, Expr right, AstNode origin |
+  not exists(ExprWithPointsTo left, ExprWithPointsTo right, AstNode origin |
     comp.compares(left, op, right) and
     enum_member(origin)
   |
diff --git a/python/ql/src/Expressions/NonCallableCalled.ql b/python/ql/src/Expressions/NonCallableCalled.ql
index 2740dbe5fb2..2e593f88ca5 100644
--- a/python/ql/src/Expressions/NonCallableCalled.ql
+++ b/python/ql/src/Expressions/NonCallableCalled.ql
@@ -12,9 +12,10 @@
  */
 
 import python
+private import LegacyPointsTo
 import Exceptions.NotImplemented
 
-from Call c, Value v, ClassValue t, Expr f, AstNode origin
+from Call c, Value v, ClassValue t, ExprWithPointsTo f, AstNode origin
 where
   f = c.getFunc() and
   f.pointsTo(v, origin) and
diff --git a/python/ql/src/Expressions/NonPortableComparisonUsingIs.ql b/python/ql/src/Expressions/NonPortableComparisonUsingIs.ql
index d9a0f701635..894cc78c8f4 100644
--- a/python/ql/src/Expressions/NonPortableComparisonUsingIs.ql
+++ b/python/ql/src/Expressions/NonPortableComparisonUsingIs.ql
@@ -2,8 +2,9 @@
  * @name Non-portable comparison using is when operands support `__eq__`
  * @description Comparison using 'is' when equivalence is not the same as identity and may not be portable.
  * @kind problem
- * @tags portability
- *       maintainability
+ * @tags quality
+ *       reliability
+ *       correctness
  * @problem.severity recommendation
  * @sub-severity low
  * @precision medium
diff --git a/python/ql/src/Expressions/TruncatedDivision.ql b/python/ql/src/Expressions/TruncatedDivision.ql
index 54758b4b78e..c731a21f7d2 100644
--- a/python/ql/src/Expressions/TruncatedDivision.ql
+++ b/python/ql/src/Expressions/TruncatedDivision.ql
@@ -12,6 +12,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from BinaryExpr div, ControlFlowNode left, ControlFlowNode right
 where
@@ -20,9 +21,9 @@ where
   exists(BinaryExprNode bin, Value lval, Value rval |
     bin = div.getAFlowNode() and
     bin.getNode().getOp() instanceof Div and
-    bin.getLeft().pointsTo(lval, left) and
+    bin.getLeft().(ControlFlowNodeWithPointsTo).pointsTo(lval, left) and
     lval.getClass() = ClassValue::int_() and
-    bin.getRight().pointsTo(rval, right) and
+    bin.getRight().(ControlFlowNodeWithPointsTo).pointsTo(rval, right) and
     rval.getClass() = ClassValue::int_() and
     // Ignore instances where integer division leaves no remainder
     not lval.(NumericValue).getIntValue() % rval.(NumericValue).getIntValue() = 0 and
diff --git a/python/ql/src/Expressions/UnnecessaryLambda.ql b/python/ql/src/Expressions/UnnecessaryLambda.ql
index 5ba2dd17124..770dde6fece 100644
--- a/python/ql/src/Expressions/UnnecessaryLambda.ql
+++ b/python/ql/src/Expressions/UnnecessaryLambda.ql
@@ -12,6 +12,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 /* f consists of a single return statement, whose value is a call. The arguments of the call are exactly the parameters of f */
 predicate simple_wrapper(Lambda l, Expr wrapped) {
@@ -39,7 +40,7 @@ predicate simple_wrapper(Lambda l, Expr wrapped) {
 }
 
 /* The expression called will refer to the same object if evaluated when the lambda is created or when the lambda is executed. */
-predicate unnecessary_lambda(Lambda l, Expr e) {
+predicate unnecessary_lambda(Lambda l, ExprWithPointsTo e) {
   simple_wrapper(l, e) and
   (
     /* plain class */
diff --git a/python/ql/src/Expressions/UseofApply.ql b/python/ql/src/Expressions/UseofApply.ql
index 7a0d72b43cf..2012f2d9361 100644
--- a/python/ql/src/Expressions/UseofApply.ql
+++ b/python/ql/src/Expressions/UseofApply.ql
@@ -10,8 +10,9 @@
  */
 
 import python
+private import LegacyPointsTo
 private import semmle.python.types.Builtins
 
-from CallNode call, ControlFlowNode func
+from CallNode call, ControlFlowNodeWithPointsTo func
 where major_version() = 2 and call.getFunction() = func and func.pointsTo(Value::named("apply"))
 select call, "Call to the obsolete builtin function 'apply'."
diff --git a/python/ql/src/Expressions/WrongNumberArgumentsForFormat.ql b/python/ql/src/Expressions/WrongNumberArgumentsForFormat.ql
index e47d4a55bf5..d7b27e5c3d7 100644
--- a/python/ql/src/Expressions/WrongNumberArgumentsForFormat.ql
+++ b/python/ql/src/Expressions/WrongNumberArgumentsForFormat.ql
@@ -14,24 +14,26 @@
  */
 
 import python
+import LegacyPointsTo
+import semmle.python.objects.ObjectInternal
 import semmle.python.strings
 
 predicate string_format(BinaryExpr operation, StringLiteral str, Value args, AstNode origin) {
   operation.getOp() instanceof Mod and
   exists(Context ctx |
-    operation.getLeft().pointsTo(ctx, _, str) and
-    operation.getRight().pointsTo(ctx, args, origin)
+    operation.getLeft().(ExprWithPointsTo).pointsTo(ctx, _, str) and
+    operation.getRight().(ExprWithPointsTo).pointsTo(ctx, args, origin)
   )
 }
 
 int sequence_length(Value args) {
   /* Guess length of sequence */
-  exists(Tuple seq | seq.pointsTo(args, _) |
+  exists(Tuple seq | seq.(ExprWithPointsTo).pointsTo(args, _) |
     result = strictcount(seq.getAnElt()) and
     not seq.getAnElt() instanceof Starred
   )
   or
-  exists(ImmutableLiteral i | i.getLiteralValue() = args | result = 1)
+  exists(ImmutableLiteral i | i = args.(ConstantObjectInternal).getLiteral() | result = 1)
 }
 
 from
diff --git a/python/ql/src/Functions/ExplicitReturnInInit.ql b/python/ql/src/Functions/ExplicitReturnInInit.ql
index c4deea6111c..f1300afbfd0 100644
--- a/python/ql/src/Functions/ExplicitReturnInInit.ql
+++ b/python/ql/src/Functions/ExplicitReturnInInit.ql
@@ -12,8 +12,9 @@
  */
 
 import python
+private import LegacyPointsTo
 
-from Return r, Expr rv
+from Return r, ExprWithPointsTo rv
 where
   exists(Function init | init.isInitMethod() and r.getScope() = init) and
   r.getValue() = rv and
diff --git a/python/ql/src/Functions/IncorrectRaiseInSpecialMethod.py b/python/ql/src/Functions/IncorrectRaiseInSpecialMethod.py
deleted file mode 100644
index e76c27145db..00000000000
--- a/python/ql/src/Functions/IncorrectRaiseInSpecialMethod.py
+++ /dev/null
@@ -1,16 +0,0 @@
-#Incorrect unhashable class
-class MyMutableThing(object):
-    
-    def __init__(self):
-        pass
-    
-    def __hash__(self):
-        raise NotImplementedError("%r is unhashable" % self)
-
-#Make class unhashable in the standard way
-class MyCorrectMutableThing(object):
-    
-    def __init__(self):
-        pass
-    
-    __hash__ = None
diff --git a/python/ql/src/Functions/IncorrectRaiseInSpecialMethod.qhelp b/python/ql/src/Functions/IncorrectRaiseInSpecialMethod.qhelp
index f4f0cd6920a..ff3de29c90a 100644
--- a/python/ql/src/Functions/IncorrectRaiseInSpecialMethod.qhelp
+++ b/python/ql/src/Functions/IncorrectRaiseInSpecialMethod.qhelp
@@ -5,11 +5,11 @@
 <overview>
 <p>User-defined classes interact with the Python virtual machine via special methods (also called "magic methods").
 For example, for a class to support addition it must implement the <code>__add__</code> and <code>__radd__</code> special methods.
-When the expression <code>a + b</code> is evaluated the Python virtual machine will call <code>type(a).__add__(a, b)</code> and if that
+When the expression <code>a + b</code> is evaluated, the Python virtual machine will call <code>type(a).__add__(a, b)</code>, and if that
 is not implemented it will call <code>type(b).__radd__(b, a)</code>.</p>
 <p>
 Since the virtual machine calls these special methods for common expressions, users of the class will expect these operations to raise standard exceptions.
-For example, users would expect that the expression <code>a.b</code> might raise an <code>AttributeError</code>
+For example, users would expect that the expression <code>a.b</code> may raise an <code>AttributeError</code>
 if the object <code>a</code> does not have an attribute <code>b</code>.
 If a <code>KeyError</code> were raised instead,
 then this would be unexpected and may break code that expected an <code>AttributeError</code>, but not a <code>KeyError</code>.
@@ -20,50 +20,48 @@ Therefore, if a method is unable to perform the expected operation then its resp
 </p>
 
 <ul>
-    <li>Attribute access, <code>a.b</code>: Raise <code>AttributeError</code></li>
-    <li>Arithmetic operations, <code>a + b</code>: Do not raise an exception, return <code>NotImplemented</code> instead.</li>
-    <li>Indexing, <code>a[b]</code>: Raise <code>KeyError</code>.</li>
-    <li>Hashing, <code>hash(a)</code>: Use <code>__hash__ = None</code> to indicate that an object is unhashable.</li>
-    <li>Equality methods, <code>a != b</code>: Never raise an exception, always return <code>True</code> or <code>False</code>.</li>
-    <li>Ordering comparison methods, <code>a &lt; b</code>: Raise a <code>TypeError</code> if the objects cannot be ordered.</li>
-    <li>Most others: Ideally, do not implement the method at all, otherwise raise <code>TypeError</code> to indicate that the operation is unsupported.</li>
+    <li>Attribute access, <code>a.b</code> (<code>__getattr__</code>): Raise <code>AttributeError</code>.</li>
+    <li>Arithmetic operations, <code>a + b</code> (<code>__add__</code>): Do not raise an exception, return <code>NotImplemented</code> instead.</li>
+    <li>Indexing, <code>a[b]</code> (<code>__getitem__</code>): Raise <code>KeyError</code> or <code>IndexError</code>.</li>
+    <li>Hashing, <code>hash(a)</code> (<code>__hash__</code>): Should not raise an exception. Use <code>__hash__ = None</code> to indicate that an object is unhashable rather than raising an exception.</li>
+    <li>Equality methods, <code>a == b</code> (<code>__eq__</code>): Never raise an exception, always return <code>True</code> or <code>False</code>.</li>
+    <li>Ordering comparison methods, <code>a &lt; b</code> (<code>__lt__</code>): Raise a <code>TypeError</code> if the objects cannot be ordered.</li>
+    <li>Most others: If the operation is never supported, the method often does not need to be implemented at all; otherwise a <code>TypeError</code> should be raised.</li>
 </ul>
 
 </overview>
 <recommendation>
-<p>If the method is meant to be abstract, then declare it so using the <code>@abstractmethod</code> decorator.
-Otherwise, either remove the method or ensure that the method raises an exception of the correct type.
+<p>If the method always raises as exception, then if it is intended to be an abstract method, the <code>@abstractmethod</code> decorator should be used.
+Otherwise, ensure that the method raises an exception of the correct type, or remove the method if the operation does not need to be supported.
 </p>
 
 </recommendation>
 <example>
 
 <p>
-This example shows two unhashable classes. The first class is unhashable in a non-standard way which may cause maintenance problems.
-The second, corrected, class uses the standard idiom for unhashable classes.
+In the following example, the <code>__add__</code> method of <code>A</code> raises a <code>TypeError</code> if <code>other</code> is of the wrong type.
+However, it should return <code>NotImplemented</code> instead of rising an exception, to allow other classes to support adding to <code>A</code>.
+This is demonstrated in the class <code>B</code>.
 </p>
-<sample src="IncorrectRaiseInSpecialMethod.py" />
+<sample src="examples/IncorrectRaiseInSpecialMethod.py" />
 <p>
-In this example, the first class is implicitly abstract; the <code>__add__</code> method is unimplemented,
-presumably with the expectation that it will be implemented by sub-classes.
-The second class makes this explicit with an <code>@abstractmethod</code> decoration on the unimplemented  <code>__add__</code> method.
+In the following example, the <code>__getitem__</code> method of <code>C</code> raises a <code>ValueError</code>, rather than a <code>KeyError</code> or <code>IndexError</code> as expected.
 </p>
-<sample src="IncorrectRaiseInSpecialMethod2.py" />
+<sample src="examples/IncorrectRaiseInSpecialMethod2.py" />
 <p>
-In this last example, the first class implements a collection backed by the file store.
-However, should an <code>IOError</code> be raised in the <code>__getitem__</code> it will propagate to the caller.
-The second class handles any <code>IOError</code> by reraising a <code>KeyError</code> which is the standard exception for
-the <code>__getitem__</code> method.
+In the following example, the class <code>__hash__</code> method of <code>D</code> raises <code>NotImplementedError</code>. 
+This causes <code>D</code> to be incorrectly identified as hashable by <code>isinstance(obj, collections.abc.Hashable)</code>; so the correct 
+way to make a class unhashable is to set <code>__hash__ = None</code>.
 </p>
 
-<sample src="IncorrectRaiseInSpecialMethod3.py" />
+<sample src="examples/IncorrectRaiseInSpecialMethod3.py" />
 
 
 </example>
 <references>
 
 <li>Python Language Reference: <a href="http://docs.python.org/dev/reference/datamodel.html#special-method-names">Special Method Names</a>.</li>
-<li>Python Library Reference: <a href="https://docs.python.org/2/library/exceptions.html">Exceptions</a>.</li>
+<li>Python Library Reference: <a href="https://docs.python.org/3/library/exceptions.html">Exceptions</a>.</li>
 
 
 
diff --git a/python/ql/src/Functions/IncorrectRaiseInSpecialMethod.ql b/python/ql/src/Functions/IncorrectRaiseInSpecialMethod.ql
index 4bf52af9061..3cd7e0fe987 100644
--- a/python/ql/src/Functions/IncorrectRaiseInSpecialMethod.ql
+++ b/python/ql/src/Functions/IncorrectRaiseInSpecialMethod.ql
@@ -7,114 +7,188 @@
  *       error-handling
  * @problem.severity recommendation
  * @sub-severity high
- * @precision very-high
+ * @precision high
  * @id py/unexpected-raise-in-special-method
  */
 
 import python
+import semmle.python.ApiGraphs
+import semmle.python.dataflow.new.internal.DataFlowDispatch
 
-private predicate attribute_method(string name) {
-  name = "__getattribute__" or name = "__getattr__" or name = "__setattr__"
+/** Holds if `name` is the name of a special method for attribute access such as `a.b`, that should raise an `AttributeError`. */
+private predicate attributeMethod(string name) {
+  name = ["__getattribute__", "__getattr__", "__delattr__"] // __setattr__ excluded as it makes sense to raise different kinds of errors based on the `value` parameter
 }
 
-private predicate indexing_method(string name) {
-  name = "__getitem__" or name = "__setitem__" or name = "__delitem__"
+/** Holds if `name` is the name of a special method for indexing operations such as `a[b]`, that should raise a `LookupError`. */
+private predicate indexingMethod(string name) {
+  name = ["__getitem__", "__delitem__"] // __setitem__ excluded as it makes sense to raise different kinds of errors based on the `value` parameter
 }
 
-private predicate arithmetic_method(string name) {
-  name in [
-      "__add__", "__sub__", "__or__", "__xor__", "__rshift__", "__pow__", "__mul__", "__neg__",
-      "__radd__", "__rsub__", "__rdiv__", "__rfloordiv__", "__div__", "__rdiv__", "__rlshift__",
-      "__rand__", "__ror__", "__rxor__", "__rrshift__", "__rpow__", "__rmul__", "__truediv__",
-      "__rtruediv__", "__pos__", "__iadd__", "__isub__", "__idiv__", "__ifloordiv__", "__idiv__",
-      "__ilshift__", "__iand__", "__ior__", "__ixor__", "__irshift__", "__abs__", "__ipow__",
-      "__imul__", "__itruediv__", "__floordiv__", "__div__", "__divmod__", "__lshift__", "__and__"
+/** Holds if `name` is the name of a special method for arithmetic operations. */
+private predicate arithmeticMethod(string name) {
+  name =
+    [
+      "__add__", "__sub__", "__and__", "__or__", "__xor__", "__lshift__", "__rshift__", "__pow__",
+      "__mul__", "__div__", "__divmod__", "__truediv__", "__floordiv__", "__matmul__", "__radd__",
+      "__rsub__", "__rand__", "__ror__", "__rxor__", "__rlshift__", "__rrshift__", "__rpow__",
+      "__rmul__", "__rdiv__", "__rdivmod__", "__rtruediv__", "__rfloordiv__", "__rmatmul__",
+      "__iadd__", "__isub__", "__iand__", "__ior__", "__ixor__", "__ilshift__", "__irshift__",
+      "__ipow__", "__imul__", "__idiv__", "__idivmod__", "__itruediv__", "__ifloordiv__",
+      "__imatmul__", "__pos__", "__neg__", "__abs__", "__invert__",
     ]
 }
 
-private predicate ordering_method(string name) {
-  name = "__lt__"
-  or
-  name = "__le__"
-  or
-  name = "__gt__"
-  or
-  name = "__ge__"
-  or
-  name = "__cmp__" and major_version() = 2
+/** Holds if `name is the name of a special method for ordering operations such as `a < b`. */
+private predicate orderingMethod(string name) {
+  name =
+    [
+      "__lt__",
+      "__le__",
+      "__gt__",
+      "__ge__",
+    ]
 }
 
-private predicate cast_method(string name) {
-  name = "__nonzero__" and major_version() = 2
-  or
-  name = "__int__"
-  or
-  name = "__float__"
-  or
-  name = "__long__"
-  or
-  name = "__trunc__"
-  or
-  name = "__complex__"
+/** Holds if `name` is the name of a special method for casting an object to a numeric type, such as `int(x)` */
+private predicate castMethod(string name) {
+  name =
+    [
+      "__int__",
+      "__float__",
+      "__index__",
+      "__trunc__",
+      "__complex__"
+    ] // __bool__ excluded as it makes sense to allow it to always raise
 }
 
-predicate correct_raise(string name, ClassObject ex) {
-  ex.getAnImproperSuperType() = theTypeErrorType() and
+/** Holds if we allow a special method named `name` to raise `exec` as an exception. */
+predicate correctRaise(string name, Expr exec) {
+  execIsOfType(exec, "TypeError") and
   (
-    name = "__copy__" or
-    name = "__deepcopy__" or
-    name = "__call__" or
-    indexing_method(name) or
-    attribute_method(name)
+    indexingMethod(name) or
+    attributeMethod(name) or
+    // Allow add methods to raise a TypeError, as they can be used for sequence concatenation as well as arithmetic
+    name = ["__add__", "__iadd__", "__radd__"]
   )
   or
-  preferred_raise(name, ex)
-  or
-  preferred_raise(name, ex.getASuperType())
+  exists(string execName |
+    preferredRaise(name, execName, _) and
+    execIsOfType(exec, execName)
+  )
 }
 
-predicate preferred_raise(string name, ClassObject ex) {
-  attribute_method(name) and ex = theAttributeErrorType()
+/** Holds if it is preferred for `name` to raise exceptions of type `execName`. `message` is the alert message. */
+predicate preferredRaise(string name, string execName, string message) {
+  attributeMethod(name) and
+  execName = "AttributeError" and
+  message = "should raise an AttributeError instead."
   or
-  indexing_method(name) and ex = Object::builtin("LookupError")
+  indexingMethod(name) and
+  execName = "LookupError" and
+  message = "should raise a LookupError (KeyError or IndexError) instead."
   or
-  ordering_method(name) and ex = theTypeErrorType()
+  orderingMethod(name) and
+  execName = "TypeError" and
+  message = "should raise a TypeError or return NotImplemented instead."
   or
-  arithmetic_method(name) and ex = Object::builtin("ArithmeticError")
+  arithmeticMethod(name) and
+  execName = "ArithmeticError" and
+  message = "should raise an ArithmeticError or return NotImplemented instead."
   or
-  name = "__bool__" and ex = theTypeErrorType()
+  name = "__bool__" and
+  execName = "TypeError" and
+  message = "should raise a TypeError instead."
 }
 
-predicate no_need_to_raise(string name, string message) {
-  name = "__hash__" and message = "use __hash__ = None instead"
-  or
-  cast_method(name) and message = "there is no need to implement the method at all."
-}
-
-predicate is_abstract(FunctionObject func) {
-  func.getFunction().getADecorator().(Name).getId().matches("%abstract%")
-}
-
-predicate always_raises(FunctionObject f, ClassObject ex) {
-  ex = f.getARaisedType() and
-  strictcount(f.getARaisedType()) = 1 and
-  not exists(f.getFunction().getANormalExit()) and
-  /* raising StopIteration is equivalent to a return in a generator */
-  not ex = theStopIterationType()
-}
-
-from FunctionObject f, ClassObject cls, string message
-where
-  f.getFunction().isSpecialMethod() and
-  not is_abstract(f) and
-  always_raises(f, cls) and
-  (
-    no_need_to_raise(f.getName(), message) and not cls.getName() = "NotImplementedError"
+/** Holds if `exec` is an exception object of the type named `execName`. */
+predicate execIsOfType(Expr exec, string execName) {
+  // Might make sense to have execName be an IPA type here. Or part of a more general API modeling builtin/stdlib subclass relations.
+  exists(string subclass |
+    execName = "TypeError" and
+    subclass = "TypeError"
     or
-    not correct_raise(f.getName(), cls) and
-    not cls.getName() = "NotImplementedError" and
-    exists(ClassObject preferred | preferred_raise(f.getName(), preferred) |
-      message = "raise " + preferred.getName() + " instead"
+    execName = "LookupError" and
+    subclass = ["LookupError", "KeyError", "IndexError"]
+    or
+    execName = "ArithmeticError" and
+    subclass = ["ArithmeticError", "FloatingPointError", "OverflowError", "ZeroDivisionError"]
+    or
+    execName = "AttributeError" and
+    subclass = "AttributeError"
+  |
+    exec = API::builtin(subclass).getACall().asExpr()
+    or
+    exec = API::builtin(subclass).getASubclass().getACall().asExpr()
+  )
+}
+
+/**
+ * Holds if `meth` need not be implemented if it always raises. `message` is the alert message, and `allowNotImplemented` is true
+ * if we still allow the method to always raise `NotImplementedError`.
+ */
+predicate noNeedToAlwaysRaise(Function meth, string message, boolean allowNotImplemented) {
+  meth.getName() = "__hash__" and
+  message = "use __hash__ = None instead." and
+  allowNotImplemented = false
+  or
+  castMethod(meth.getName()) and
+  message = "this method does not need to be implemented." and
+  allowNotImplemented = true and
+  // Allow an always raising cast method if it's overriding other behavior
+  not exists(Function overridden |
+    overridden.getName() = meth.getName() and
+    overridden.getScope() = getADirectSuperclass+(meth.getScope()) and
+    not alwaysRaises(overridden, _)
+  )
+}
+
+/** Holds if `func` has a decorator likely marking it as an abstract method. */
+predicate isAbstract(Function func) { func.getADecorator().(Name).getId().matches("%abstract%") }
+
+/** Holds if `f` always raises the exception `exec`. */
+predicate alwaysRaises(Function f, Expr exec) {
+  directlyRaises(f, exec) and
+  strictcount(Expr e | directlyRaises(f, e)) = 1 and
+  not exists(f.getANormalExit())
+}
+
+/** Holds if `f` directly raises `exec` using a `raise` statement. */
+predicate directlyRaises(Function f, Expr exec) {
+  exists(Raise r |
+    r.getScope() = f and
+    exec = r.getException() and
+    exec instanceof Call
+  )
+}
+
+/** Holds if `exec` is a `NotImplementedError`. */
+predicate isNotImplementedError(Expr exec) {
+  exec = API::builtin("NotImplementedError").getACall().asExpr()
+}
+
+/** Gets the name of the builtin exception type `exec` constructs, if it can be determined. */
+string getExecName(Expr exec) { result = exec.(Call).getFunc().(Name).getId() }
+
+from Function f, Expr exec, string message
+where
+  f.isSpecialMethod() and
+  not isAbstract(f) and
+  directlyRaises(f, exec) and
+  (
+    exists(boolean allowNotImplemented, string subMessage |
+      alwaysRaises(f, exec) and
+      noNeedToAlwaysRaise(f, subMessage, allowNotImplemented) and
+      (allowNotImplemented = true implies not isNotImplementedError(exec)) and // don't alert if it's a NotImplementedError and that's ok
+      message = "This method always raises $@ - " + subMessage
+    )
+    or
+    not isNotImplementedError(exec) and
+    not correctRaise(f.getName(), exec) and
+    exists(string subMessage | preferredRaise(f.getName(), _, subMessage) |
+      if alwaysRaises(f, exec)
+      then message = "This method always raises $@ - " + subMessage
+      else message = "This method raises $@ - " + subMessage
     )
   )
-select f, "Function always raises $@; " + message, cls, cls.toString()
+select f, message, exec, getExecName(exec)
diff --git a/python/ql/src/Functions/IncorrectRaiseInSpecialMethod2.py b/python/ql/src/Functions/IncorrectRaiseInSpecialMethod2.py
deleted file mode 100644
index 405400bfe61..00000000000
--- a/python/ql/src/Functions/IncorrectRaiseInSpecialMethod2.py
+++ /dev/null
@@ -1,15 +0,0 @@
-    
-#Abstract base class, but don't declare it.
-class ImplicitAbstractClass(object):
-    
-    def __add__(self, other):
-        raise NotImplementedError()
-    
-#Make abstractness explicit.
-class ExplicitAbstractClass:
-    __metaclass__ = ABCMeta
-
-    @abstractmethod
-    def __add__(self, other):
-        raise NotImplementedError()
- 
diff --git a/python/ql/src/Functions/IncorrectRaiseInSpecialMethod3.py b/python/ql/src/Functions/IncorrectRaiseInSpecialMethod3.py
deleted file mode 100644
index 048d5043b4d..00000000000
--- a/python/ql/src/Functions/IncorrectRaiseInSpecialMethod3.py
+++ /dev/null
@@ -1,27 +0,0 @@
-    
-#Incorrect file-backed table
-class FileBackedTable(object):
-    
-    def __getitem__(self, key):
-        if key not in self.index:
-            raise IOError("Key '%s' not in table" % key)
-        else:
-            #May raise an IOError
-            return self.backing.get_row(key)
-        
-#Correct by transforming exception
-class ObjectLikeFileBackedTable(object):
-    
-    def get_from_key(self, key):
-        if key not in self.index:
-            raise IOError("Key '%s' not in table" % key)
-        else:
-            #May raise an IOError
-            return self.backing.get_row(key)
-    
-    def __getitem__(self, key):
-        try:
-            return self.get_from_key(key)
-        except IOError:
-            raise KeyError(key)
-                           
diff --git a/python/ql/src/Functions/IncorrectlyOverriddenMethod.ql b/python/ql/src/Functions/IncorrectlyOverriddenMethod.ql
index a46a2370c0e..a4e3bd6e0ce 100644
--- a/python/ql/src/Functions/IncorrectlyOverriddenMethod.ql
+++ b/python/ql/src/Functions/IncorrectlyOverriddenMethod.ql
@@ -1,4 +1,5 @@
 /**
+ * @deprecated
  * @name Mismatch between signature and use of an overriding method
  * @description Method has a different signature from the overridden method and, if it were called, would be likely to cause an error.
  * @kind problem
diff --git a/python/ql/src/Functions/ReturnValueIgnored.ql b/python/ql/src/Functions/ReturnValueIgnored.ql
index b7f272dcc2d..d8f81534b8a 100644
--- a/python/ql/src/Functions/ReturnValueIgnored.ql
+++ b/python/ql/src/Functions/ReturnValueIgnored.ql
@@ -2,11 +2,10 @@
  * @name Ignored return value
  * @description Ignoring return values may result in discarding errors or loss of information.
  * @kind problem
- * @tags reliability
+ * @tags quality
+ *       reliability
+ *       correctness
  *       readability
- *       convention
- *       statistical
- *       non-attributable
  *       external/cwe/cwe-252
  * @problem.severity recommendation
  * @sub-severity high
diff --git a/python/ql/src/Functions/SignatureOverriddenMethod.py b/python/ql/src/Functions/SignatureOverriddenMethod.py
index 7beddcb9e95..e3522351fc0 100644
--- a/python/ql/src/Functions/SignatureOverriddenMethod.py
+++ b/python/ql/src/Functions/SignatureOverriddenMethod.py
@@ -1,9 +1,12 @@
 
-# Base class method
-def runsource(self, source, filename="<input>", symbol="single"):
-    ... # Definition
+class Base:
+    def runsource(self, source, filename="<input>"):
+        ...
     
     
-# Extend base class method
-def runsource(self, source):
-    ... # Definition
\ No newline at end of file
+class Sub(Base):
+    def runsource(self, source): # BAD: Does not match the signature of overridden method.
+        ... 
+
+def run(obj: Base):
+    obj.runsource("source", filename="foo.txt")
\ No newline at end of file
diff --git a/python/ql/src/Functions/SignatureOverriddenMethod.qhelp b/python/ql/src/Functions/SignatureOverriddenMethod.qhelp
index b7da2678e3d..0575d967d3e 100644
--- a/python/ql/src/Functions/SignatureOverriddenMethod.qhelp
+++ b/python/ql/src/Functions/SignatureOverriddenMethod.qhelp
@@ -5,32 +5,25 @@
 
 
 <overview>
-<p> There are one (or more) legal parameters for an overridden method that are
-not legal for an overriding method. This will cause an error when the overriding 
-method is called with a number of parameters that is legal for the overridden method. 
-This violates the Liskov substitution principle.
+<p> When the signature of a method of a base class and a method of a subclass that overrides it don't match, a call to the base class method 
+may not be a valid call to the subclass method, and thus raise an exception if an instance of the subclass is passed instead. 
+If following the Liskov Substitution Principle, in which an instance of a subclass should be usable in every context as though it were an 
+instance of the base class, this behavior breaks the principle.
 </p>
 
 </overview>
 <recommendation>
 
-<p>Ensure that the overriding method accepts all the parameters that are legal for
-overridden method.</p>
+<p>Ensure that the overriding method in the subclass accepts the same parameters as the base method. </p>
 
 </recommendation>
 <example>
-<p>In this example there is a mismatch between the legal parameters for the base 
-class method <code>(self, source, filename, symbol)</code> and the extension method 
-<code>(self, source)</code>. The extension method can be used to override the base 
-method as long as values are not specified for the <code>filename</code> and 
-<code>symbol</code> parameters. If the extension method was passed the additional 
-parameters accepted by the base method then an error would occur.</p>
+<p>In the following example, <code>Base.runsource</code> takes an optional <code>filename</code> argument. However, the overriding method 
+<code>Sub.runsource</code> does not. This means the <code>run</code> function will fail if passed an instance of <code>Sub</code>.
+</p>
 
 <sample src="SignatureOverriddenMethod.py" />
 
-<p>The extension method should be updated to support the <code>filename</code> and 
-<code>symbol</code> parameters supported by the overridden method.</p>
-
 </example>
 <references>
 
diff --git a/python/ql/src/Functions/SignatureOverriddenMethod.ql b/python/ql/src/Functions/SignatureOverriddenMethod.ql
index 3e3877bc139..15b3fa70640 100644
--- a/python/ql/src/Functions/SignatureOverriddenMethod.ql
+++ b/python/ql/src/Functions/SignatureOverriddenMethod.ql
@@ -13,23 +13,254 @@
  */
 
 import python
-import Expressions.CallArgs
+import semmle.python.dataflow.new.DataFlow
+import semmle.python.dataflow.new.internal.DataFlowDispatch
+import codeql.util.Option
 
-from FunctionValue base, PythonFunctionValue derived
-where
-  not exists(base.getACall()) and
-  not exists(FunctionValue a_derived |
-    a_derived.overrides(base) and
-    exists(a_derived.getACall())
-  ) and
-  not derived.getScope().isSpecialMethod() and
-  derived.getName() != "__init__" and
-  derived.isNormalMethod() and
-  // call to overrides distributed for efficiency
-  (
-    derived.overrides(base) and derived.minParameters() > base.maxParameters()
-    or
-    derived.overrides(base) and derived.maxParameters() < base.minParameters()
+/** Holds if `base` is overridden by `sub` */
+predicate overrides(Function base, Function sub) {
+  base.getName() = sub.getName() and
+  base.getScope() = getADirectSuperclass+(sub.getScope())
+}
+
+/** Constructs a string to pluralize `str` depending on `num`. */
+bindingset[num, str]
+string plural(int num, string str) {
+  num = 1 and result = "1 " + str
+  or
+  num != 1 and result = num.toString() + " " + str + "s"
+}
+
+/** Describes the minimum number of arguments `func` can accept, using "at least" if it may accept more. */
+string describeMin(Function func) {
+  exists(string descr | descr = plural(func.getMinPositionalArguments(), "positional argument") |
+    if func.getMinPositionalArguments() = func.getMaxPositionalArguments()
+    then result = descr
+    else result = "at least " + descr
   )
-select derived, "Overriding method '" + derived.getName() + "' has signature mismatch with $@.",
-  base, "overridden method"
+}
+
+/** Described the maximum number of arguments `func` can accept, using "at most" if it may accept fewer, and "arbitrarily many" if it has a vararg. */
+string describeMax(Function func) {
+  if func.hasVarArg()
+  then result = "arbitrarily many positional arguments"
+  else
+    exists(string descr | descr = plural(func.getMaxPositionalArguments(), "positional argument") |
+      if func.getMinPositionalArguments() = func.getMaxPositionalArguments()
+      then result = descr
+      else result = "at most " + descr
+    )
+}
+
+/** Describes the minimum number of arguments `func` can accept, without repeating "positional arguments". */
+string describeMinShort(Function func) {
+  exists(string descr | descr = func.getMinPositionalArguments().toString() |
+    if func.getMinPositionalArguments() = func.getMaxPositionalArguments()
+    then result = descr
+    else result = "at least " + descr
+  )
+}
+
+/** Describes the maximum number of arguments `func` can accept, without repeating "positional arguments". */
+string describeMaxShort(Function func) {
+  if func.hasVarArg()
+  then result = "arbitrarily many"
+  else
+    exists(string descr | descr = func.getMaxPositionalArguments().toString() |
+      if func.getMinPositionalArguments() = func.getMaxPositionalArguments()
+      then result = descr
+      else result = "at most " + descr
+    )
+}
+
+/** Describe an upper bound on the number of arguments `func` may accept, without specifying "at most". */
+string describeMaxBound(Function func) {
+  if func.hasVarArg()
+  then result = "arbitrarily many"
+  else result = func.getMaxPositionalArguments().toString()
+}
+
+/** Holds if no way to call `base` would be valid for `sub`. The `msg` applies to the `sub method. */
+predicate strongSignatureMismatch(Function base, Function sub, string msg) {
+  overrides(base, sub) and
+  (
+    sub.getMinPositionalArguments() > base.getMaxPositionalArguments() and
+    msg =
+      "requires " + describeMin(sub) + ", whereas overridden $@ requires " + describeMaxShort(base) +
+        "."
+    or
+    sub.getMaxPositionalArguments() < base.getMinPositionalArguments() and
+    msg =
+      "requires " + describeMax(sub) + ", whereas overridden $@ requires " + describeMinShort(base) +
+        "."
+  )
+}
+
+/** Holds if there may be some ways to call `base` that would not be valid for `sub`. The `msg` applies to the `sub` method. */
+predicate weakSignatureMismatch(Function base, Function sub, string msg) {
+  overrides(base, sub) and
+  (
+    sub.getMinPositionalArguments() > base.getMinPositionalArguments() and
+    msg =
+      "requires " + describeMin(sub) + ", whereas overridden $@ may be called with " +
+        base.getMinPositionalArguments().toString() + "."
+    or
+    sub.getMaxPositionalArguments() < base.getMaxPositionalArguments() and
+    msg =
+      "requires " + describeMax(sub) + ", whereas overridden $@ may be called with " +
+        describeMaxBound(base) + "."
+    or
+    sub.getMinPositionalArguments() <= base.getMinPositionalArguments() and
+    sub.getMaxPositionalArguments() >= base.getMaxPositionalArguments() and
+    exists(string arg |
+      // TODO: positional-only args not considered
+      // e.g. `def foo(x, y, /, z):` has x,y as positional only args, should not be considered as possible kw args
+      // However, this likely does not create FPs, as we require a 'witness' call to generate an alert.
+      arg = base.getAnArg().getName() and
+      not arg = sub.getAnArg().getName() and
+      not exists(sub.getKwarg()) and
+      msg = "does not accept keyword argument `" + arg + "`, which overridden $@ does."
+    )
+    or
+    exists(base.getKwarg()) and
+    not exists(sub.getKwarg()) and
+    msg = "does not accept arbitrary keyword arguments, which overridden $@ does."
+  )
+}
+
+/** Holds if `f` should be ignored for considering signature mismatches. */
+predicate ignore(Function f) {
+  isClassmethod(f)
+  or
+  exists(
+    Function g // other functions with the same name, e.g. @property getters/setters.
+  |
+    g.getScope() = f.getScope() and
+    g.getName() = f.getName() and
+    g != f
+  )
+}
+
+/** Gets a function that `call` may resolve to. */
+Function resolveCall(Call call) {
+  exists(DataFlowCall dfc | call = dfc.getNode().(CallNode).getNode() |
+    result = viableCallable(dfc).(DataFlowFunction).getScope()
+  )
+}
+
+/** Holds if `call` may resolve to either `base` or `sub`, and `base` is overridden by `sub`. */
+predicate callViableForEitherOverride(Function base, Function sub, Call call) {
+  overrides(base, sub) and
+  base = resolveCall(call) and
+  sub = resolveCall(call)
+}
+
+/** Holds if either both `base` and `sub` are static methods, or both are not static methods, and `base` is overridden by `sub`. */
+predicate matchingStatic(Function base, Function sub) {
+  overrides(base, sub) and
+  (
+    isStaticmethod(base) and
+    isStaticmethod(sub)
+    or
+    not isStaticmethod(base) and
+    not isStaticmethod(sub)
+  )
+}
+
+int extraSelfArg(Function func) { if isStaticmethod(func) then result = 0 else result = 1 }
+
+/** Holds if the call `call` matches the signature for `func`. */
+predicate callMatchesSignature(Function func, Call call) {
+  func = resolveCall(call) and
+  (
+    // Each parameter of the function is accounted for in the call
+    forall(Parameter param, int i | param = func.getArg(i) |
+      // self arg
+      i = 0 and not isStaticmethod(func)
+      or
+      // positional arg
+      i - extraSelfArg(func) < call.getPositionalArgumentCount()
+      or
+      // has default
+      exists(param.getDefault())
+      or
+      // keyword arg
+      call.getANamedArgumentName() = param.getName()
+    )
+    or
+    // arbitrary varargs or kwargs
+    exists(call.getStarArg())
+    or
+    exists(call.getKwargs())
+  ) and
+  // No excess parameters
+  call.getPositionalArgumentCount() + extraSelfArg(func) <= func.getMaxPositionalArguments() and
+  (
+    exists(func.getKwarg())
+    or
+    forall(string name | name = call.getANamedArgumentName() | exists(func.getArgByName(name)))
+  )
+}
+
+pragma[nomagic]
+private File getFunctionFile(Function f) { result = f.getLocation().getFile() }
+
+/** Gets a call which matches the signature of `base`, but not of overridden `sub`. */
+Call getASignatureMismatchWitness(Function base, Function sub) {
+  callViableForEitherOverride(base, sub, result) and
+  callMatchesSignature(base, result) and
+  not callMatchesSignature(sub, result)
+}
+
+pragma[inline]
+string preferredFile(File callFile, Function base, Function sub) {
+  if callFile = getFunctionFile(base)
+  then result = " A"
+  else
+    if callFile = getFunctionFile(sub)
+    then result = " B"
+    else result = callFile.getAbsolutePath()
+}
+
+/** Choose a 'witnessing' call that matches the signature of `base` but not of overridden `sub`. */
+Call chooseASignatureMismatchWitness(Function base, Function sub) {
+  exists(getASignatureMismatchWitness(base, sub)) and
+  result =
+    min(Call c |
+      c = getASignatureMismatchWitness(base, sub)
+    |
+      c
+      order by
+        preferredFile(c.getLocation().getFile(), base, sub), c.getLocation().getStartLine(),
+        c.getLocation().getStartColumn()
+    )
+}
+
+module CallOption = LocatableOption<Location, Call>;
+
+from Function base, Function sub, string msg, string extraMsg, CallOption::Option call
+where
+  not sub.isSpecialMethod() and
+  sub.getName() != "__init__" and
+  not ignore(sub) and
+  not ignore(base) and
+  matchingStatic(base, sub) and
+  (
+    // If we have a witness, alert for a 'weak' mismatch, but prefer the message for a 'strong' mismatch if that holds.
+    call.asSome() = chooseASignatureMismatchWitness(base, sub) and
+    extraMsg =
+      " $@ correctly calls the base method, but does not match the signature of the overriding method." and
+    (
+      strongSignatureMismatch(base, sub, msg)
+      or
+      not strongSignatureMismatch(base, sub, _) and
+      weakSignatureMismatch(base, sub, msg)
+    )
+    or
+    // With no witness, only alert for 'strong' mismatches.
+    not exists(getASignatureMismatchWitness(base, sub)) and
+    call.isNone() and
+    strongSignatureMismatch(base, sub, msg) and
+    extraMsg = ""
+  )
+select sub, "This method " + msg + extraMsg, base, base.getQualifiedName(), call, "This call"
diff --git a/python/ql/src/Functions/UseImplicitNoneReturnValue.ql b/python/ql/src/Functions/UseImplicitNoneReturnValue.ql
index aeac382f638..4a8b8edd623 100644
--- a/python/ql/src/Functions/UseImplicitNoneReturnValue.ql
+++ b/python/ql/src/Functions/UseImplicitNoneReturnValue.ql
@@ -12,6 +12,7 @@
  */
 
 import python
+private import LegacyPointsTo
 import Testing.Mox
 
 predicate is_used(Call c) {
@@ -31,10 +32,12 @@ from Call c, FunctionValue func
 where
   /* Call result is used, but callee is a procedure */
   is_used(c) and
-  c.getFunc().pointsTo(func) and
+  c.getFunc().(ExprWithPointsTo).pointsTo(func) and
   func.getScope().isProcedure() and
   /* All callees are procedures */
-  forall(FunctionValue callee | c.getFunc().pointsTo(callee) | callee.getScope().isProcedure()) and
+  forall(FunctionValue callee | c.getFunc().(ExprWithPointsTo).pointsTo(callee) |
+    callee.getScope().isProcedure()
+  ) and
   /* Mox return objects have an `AndReturn` method */
   not useOfMoxInModule(c.getEnclosingModule())
 select c, "The result of $@ is used even though it is always None.", func, func.getQualifiedName()
diff --git a/python/ql/src/Functions/examples/IncorrectRaiseInSpecialMethod.py b/python/ql/src/Functions/examples/IncorrectRaiseInSpecialMethod.py
new file mode 100644
index 00000000000..d565a86cab2
--- /dev/null
+++ b/python/ql/src/Functions/examples/IncorrectRaiseInSpecialMethod.py
@@ -0,0 +1,22 @@
+class A:
+    def __init__(self, a):
+        self.a = a 
+
+    def __add__(self, other):
+        # BAD: Should return NotImplemented instead of raising
+        if not isinstance(other,A):
+            raise TypeError(f"Cannot add A to {other.__class__}")
+        return A(self.a + other.a)
+
+class B:
+    def __init__(self, a):
+        self.a = a 
+
+    def __add__(self, other):
+        # GOOD: Returning NotImplemented allows for the operation to fallback to other implementations to allow other classes to support adding to B.
+        if not isinstance(other,B):
+            return NotImplemented
+        return B(self.a + other.a)
+    
+
+        
diff --git a/python/ql/src/Functions/examples/IncorrectRaiseInSpecialMethod2.py b/python/ql/src/Functions/examples/IncorrectRaiseInSpecialMethod2.py
new file mode 100644
index 00000000000..ba5f90f4670
--- /dev/null
+++ b/python/ql/src/Functions/examples/IncorrectRaiseInSpecialMethod2.py
@@ -0,0 +1,7 @@
+class C:
+    def __getitem__(self, idx):
+        if self.idx < 0:
+            # BAD: Should raise a KeyError or IndexError instead.
+            raise ValueError("Invalid index")
+        return self.lookup(idx)
+ 
diff --git a/python/ql/src/Functions/examples/IncorrectRaiseInSpecialMethod3.py b/python/ql/src/Functions/examples/IncorrectRaiseInSpecialMethod3.py
new file mode 100644
index 00000000000..33541adc7e6
--- /dev/null
+++ b/python/ql/src/Functions/examples/IncorrectRaiseInSpecialMethod3.py
@@ -0,0 +1,4 @@
+class D:
+    def __hash__(self):
+        # BAD: Use `__hash__ = None` instead.
+        raise NotImplementedError(f"{self.__class__} is unhashable.")
\ No newline at end of file
diff --git a/python/ql/src/Imports/Cyclic.qll b/python/ql/src/Imports/Cyclic.qll
index dd25f06d0e5..720ea8f0048 100644
--- a/python/ql/src/Imports/Cyclic.qll
+++ b/python/ql/src/Imports/Cyclic.qll
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 predicate is_import_time(Stmt s) { not s.getScope+() instanceof Function }
 
@@ -21,7 +22,7 @@ predicate circular_import(ModuleValue m1, ModuleValue m2) {
 ModuleValue stmt_imports(ImportingStmt s) {
   exists(string name | result.importedAs(name) and not name = "__main__" |
     name = s.getAnImportedModuleName() and
-    s.getASubExpression().pointsTo(result) and
+    s.getASubExpression().(ExprWithPointsTo).pointsTo(result) and
     not result.isPackage()
   )
 }
@@ -57,7 +58,7 @@ predicate import_time_transitive_import(ModuleValue base, Stmt imp, ModuleValue
  * Returns import-time usages of module 'm' in module 'enclosing'
  */
 predicate import_time_module_use(ModuleValue m, ModuleValue enclosing, Expr use, string attr) {
-  exists(Expr mod |
+  exists(ExprWithPointsTo mod |
     use.getEnclosingModule() = enclosing.getScope() and
     not use.getScope+() instanceof Function and
     mod.pointsTo(m) and
@@ -90,7 +91,8 @@ predicate is_used_in_annotation(Expr use) {
  */
 predicate is_annotation_with_from_future_import_annotations(Expr use) {
   exists(ImportMember i | i.getScope() = use.getEnclosingModule() |
-    i.getModule().pointsTo().getName() = "__future__" and i.getName() = "annotations"
+    i.getModule().(ExprWithPointsTo).pointsTo().getName() = "__future__" and
+    i.getName() = "annotations"
   ) and
   is_used_in_annotation(use)
 }
diff --git a/python/ql/src/Imports/DeprecatedModule.ql b/python/ql/src/Imports/DeprecatedModule.ql
index 5f5a8af3ae9..3d529943fb8 100644
--- a/python/ql/src/Imports/DeprecatedModule.ql
+++ b/python/ql/src/Imports/DeprecatedModule.ql
@@ -11,6 +11,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 /**
  * Holds if the module `name` was deprecated in Python version `major`.`minor`,
@@ -79,7 +80,7 @@ where
   name = imp.getName() and
   deprecated_module(name, instead, _, _) and
   not exists(Try try, ExceptStmt except | except = try.getAHandler() |
-    except.getType().pointsTo(ClassValue::importError()) and
+    except.getType().(ExprWithPointsTo).pointsTo(ClassValue::importError()) and
     except.containsInScope(imp)
   )
 select imp, deprecation_message(name) + replacement_message(name)
diff --git a/python/ql/src/Imports/FromImportOfMutableAttribute.ql b/python/ql/src/Imports/FromImportOfMutableAttribute.ql
index cbb74977a03..63198bece30 100644
--- a/python/ql/src/Imports/FromImportOfMutableAttribute.ql
+++ b/python/ql/src/Imports/FromImportOfMutableAttribute.ql
@@ -2,9 +2,9 @@
  * @name Importing value of mutable attribute
  * @description Importing the value of a mutable attribute directly means that changes in global state will not be observed locally.
  * @kind problem
- * @tags reliability
- *       maintainability
- *       modularity
+ * @tags quality
+ *       reliability
+ *       correctness
  * @problem.severity warning
  * @sub-severity high
  * @precision medium
@@ -12,6 +12,7 @@
  */
 
 import python
+private import LegacyPointsTo
 import semmle.python.filters.Tests
 
 from ImportMember im, ModuleValue m, AttrNode store_attr, string name
@@ -23,7 +24,7 @@ where
   /* variable resulting from import must have a long lifetime */
   not im.getScope() instanceof Function and
   store_attr.isStore() and
-  store_attr.getObject(name).pointsTo(m) and
+  store_attr.getObject(name).(ControlFlowNodeWithPointsTo).pointsTo(m) and
   /* Import not in same module as modification. */
   not im.getEnclosingModule() = store_attr.getScope().getEnclosingModule() and
   /* Modification is not in a test */
diff --git a/python/ql/src/Imports/UnusedImport.ql b/python/ql/src/Imports/UnusedImport.ql
index 02035690165..370daf405fe 100644
--- a/python/ql/src/Imports/UnusedImport.ql
+++ b/python/ql/src/Imports/UnusedImport.ql
@@ -12,6 +12,7 @@
  */
 
 import python
+private import LegacyPointsTo
 import Variables.Definition
 import semmle.python.ApiGraphs
 
@@ -94,7 +95,7 @@ private string typehint_annotation_in_module(Module module_scope) {
     or
     annotation = any(FunctionExpr f).getReturns().getASubExpression*()
   |
-    annotation.pointsTo(Value::forString(result)) and
+    annotation.(ExprWithPointsTo).pointsTo(Value::forString(result)) and
     annotation.getEnclosingModule() = module_scope
   )
 }
@@ -144,7 +145,7 @@ predicate unused_import(Import imp, Variable name) {
   not is_pytest_fixture(imp, name) and
   // Only consider import statements that actually point-to something (possibly an unknown module).
   // If this is not the case, it's likely that the import statement never gets executed.
-  imp.getAName().getValue().pointsTo(_)
+  imp.getAName().getValue().(ExprWithPointsTo).pointsTo(_)
 }
 
 from Stmt s, Variable name
diff --git a/python/ql/src/Resources/FileNotAlwaysClosed.ql b/python/ql/src/Resources/FileNotAlwaysClosed.ql
index f639bc4aa91..4e0b897c9bb 100644
--- a/python/ql/src/Resources/FileNotAlwaysClosed.ql
+++ b/python/ql/src/Resources/FileNotAlwaysClosed.ql
@@ -15,12 +15,14 @@
 
 import python
 import FileNotAlwaysClosedQuery
+import codeql.util.Option
 
-from FileOpen fo, string msg
+from FileOpen fo, string msg, LocatableOption<Location, DataFlow::Node>::Option exec
 where
   fileNotClosed(fo) and
-  msg = "File is opened but is not closed."
+  msg = "File is opened but is not closed." and
+  exec.isNone()
   or
-  fileMayNotBeClosedOnException(fo, _) and
-  msg = "File may not be closed if an exception is raised."
-select fo, msg
+  fileMayNotBeClosedOnException(fo, exec.asSome()) and
+  msg = "File may not be closed if $@ raises an exception."
+select fo, msg, exec, "this operation"
diff --git a/python/ql/src/Resources/FileNotAlwaysClosedQuery.qll b/python/ql/src/Resources/FileNotAlwaysClosedQuery.qll
index 0122344d370..9d91e4f523c 100644
--- a/python/ql/src/Resources/FileNotAlwaysClosedQuery.qll
+++ b/python/ql/src/Resources/FileNotAlwaysClosedQuery.qll
@@ -34,6 +34,8 @@ class FileWrapperCall extends DataFlow::CallCfgNode {
   DataFlow::Node wrapped;
 
   FileWrapperCall() {
+    // Approximation: Treat any passing of a file object to a class constructor as potentially a wrapper
+    // This could be made more precise by checking that the constructor writes the file to a field.
     wrapped = this.getArg(_).getALocalSource() and
     this.getFunction() = classTracker(_)
     or
@@ -50,22 +52,15 @@ class FileWrapperCall extends DataFlow::CallCfgNode {
 
 /** A node where a file is closed. */
 abstract class FileClose extends DataFlow::CfgNode {
-  /** Holds if this file close will occur if an exception is raised at `raises`. */
-  predicate guardsExceptions(DataFlow::CfgNode raises) {
+  /** Holds if this file close will occur if an exception is raised at `fileRaises`. */
+  predicate guardsExceptions(DataFlow::CfgNode fileRaises) {
     // The close call occurs after an exception edge in the cfg (a catch or finally)
-    bbReachableRefl(raises.asCfgNode().getBasicBlock().getAnExceptionalSuccessor(),
+    bbReachableRefl(fileRaises.asCfgNode().getBasicBlock().getAnExceptionalSuccessor(),
       this.asCfgNode().getBasicBlock())
     or
     // The exception is after the close call.
-    // A full cfg reachability check is not in general feasible for performance, so we approximate it with:
-    // - A basic block reachability check (here) that works if the expression and close call are in different basic blocks
-    // - A check (in the `WithStatement` override of `guardsExceptions`) for the case where the exception call
-    //   is lexically contained in the body of a `with` statement that closes the file.
-    // This may cause FPs in a case such as:
-    //   f.close()
-    //   f.write("...")
-    // We presume this to not be very common.
-    bbReachableStrict(this.asCfgNode().getBasicBlock(), raises.asCfgNode().getBasicBlock())
+    // A full cfg reachability check is not feasible for performance, instead we use local dataflow
+    fileLocalFlow(this, fileRaises)
   }
 }
 
@@ -94,11 +89,10 @@ class WithStatement extends FileClose {
 
   WithStatement() { this.asExpr() = w.getContextExpr() }
 
-  override predicate guardsExceptions(DataFlow::CfgNode raises) {
-    super.guardsExceptions(raises)
+  override predicate guardsExceptions(DataFlow::CfgNode fileRaises) {
+    super.guardsExceptions(fileRaises)
     or
-    // Check whether the exception is raised in the body of the with statement.
-    raises.asExpr().getParent*() = w.getBody().getAnItem()
+    w.getBody().contains(fileRaises.asExpr())
   }
 }
 
@@ -131,7 +125,7 @@ private predicate fileLocalFlowHelper1(
 
 /** Holds if data flows from `source` to `sink`, including file wrapper classes. */
 pragma[inline]
-private predicate fileLocalFlow(FileOpen source, DataFlow::Node sink) {
+private predicate fileLocalFlow(DataFlow::Node source, DataFlow::Node sink) {
   exists(DataFlow::LocalSourceNode mid | fileLocalFlowHelper1(source, mid) and mid.flowsTo(sink))
 }
 
@@ -171,7 +165,7 @@ predicate fileMayNotBeClosedOnException(FileOpen fo, DataFlow::Node raises) {
     fileLocalFlow(fo, fileRaised) and
     not exists(FileClose fc |
       fileLocalFlow(fo, fc) and
-      fc.guardsExceptions(raises)
+      fc.guardsExceptions(fileRaised)
     )
   )
 }
diff --git a/python/ql/src/Security/CWE-020/OverlyLargeRange.ql b/python/ql/src/Security/CWE-020/OverlyLargeRange.ql
index 25acc667430..94bc74238bc 100644
--- a/python/ql/src/Security/CWE-020/OverlyLargeRange.ql
+++ b/python/ql/src/Security/CWE-020/OverlyLargeRange.ql
@@ -4,7 +4,7 @@
  *              This may allow an attacker to bypass a filter or sanitizer.
  * @kind problem
  * @problem.severity warning
- * @security-severity 5.0
+ * @security-severity 4.0
  * @precision high
  * @id py/overly-large-range
  * @tags correctness
diff --git a/python/ql/src/Security/CWE-1004/NonHttpOnlyCookie.qhelp b/python/ql/src/Security/CWE-1004/NonHttpOnlyCookie.qhelp
new file mode 100644
index 00000000000..7addd758fca
--- /dev/null
+++ b/python/ql/src/Security/CWE-1004/NonHttpOnlyCookie.qhelp
@@ -0,0 +1,26 @@
+<!DOCTYPE qhelp PUBLIC
+  "-//Semmle//qhelp//EN"
+  "qhelp.dtd">
+<qhelp>
+
+<overview>
+<p>Cookies without the <code>HttpOnly</code> flag set are accessible to JavaScript running in the same origin. 
+In case of a Cross-Site Scripting (XSS) vulnerability, the cookie can be stolen by a malicious script.
+If a sensitive cookie does not need to be accessed directly by client-side JS, the <code>HttpOnly</code> flag should be set.</p>
+</overview>
+
+<recommendation>
+<p>Set <code>httponly</code> to <code>True</code>, or add <code>; HttpOnly;</code> to the cookie's raw header value, to ensure that the cookie is not accessible via JavaScript.</p>
+</recommendation>
+
+<example>
+<p>In the following examples, the cases marked GOOD show secure cookie attributes being set; whereas in the case marked BAD they are not set.</p>
+<sample src="examples/InsecureCookie.py" />
+</example>
+
+<references>
+<li>PortSwigger: <a href="https://portswigger.net/kb/issues/00500600_cookie-without-httponly-flag-set">Cookie without HttpOnly flag set</a></li>
+<li>MDN: <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie">Set-Cookie</a>.</li>
+</references>
+
+</qhelp>
diff --git a/python/ql/src/Security/CWE-1004/NonHttpOnlyCookie.ql b/python/ql/src/Security/CWE-1004/NonHttpOnlyCookie.ql
new file mode 100644
index 00000000000..01056daaf78
--- /dev/null
+++ b/python/ql/src/Security/CWE-1004/NonHttpOnlyCookie.ql
@@ -0,0 +1,21 @@
+/**
+ * @name Sensitive cookie missing `HttpOnly` attribute.
+ * @description Cookies without the `HttpOnly` attribute set can be accessed by JS scripts, making them more vulnerable to XSS attacks.
+ * @kind problem
+ * @problem.severity warning
+ * @security-severity 5.0
+ * @precision high
+ * @id py/client-exposed-cookie
+ * @tags security
+ *       external/cwe/cwe-1004
+ */
+
+import python
+import semmle.python.dataflow.new.DataFlow
+import semmle.python.Concepts
+
+from Http::Server::CookieWrite cookie
+where
+  cookie.hasHttpOnlyFlag(false) and
+  cookie.isSensitive()
+select cookie, "Sensitive server cookie is set without HttpOnly flag."
diff --git a/python/ql/src/Security/CWE-1004/examples/InsecureCookie.py b/python/ql/src/Security/CWE-1004/examples/InsecureCookie.py
new file mode 100644
index 00000000000..19d84d14537
--- /dev/null
+++ b/python/ql/src/Security/CWE-1004/examples/InsecureCookie.py
@@ -0,0 +1,21 @@
+from flask import Flask, request, make_response, Response
+
+
+@app.route("/good1")
+def good1():
+    resp = make_response()
+    resp.set_cookie("sessionid", value="value", secure=True, httponly=True, samesite='Strict') # GOOD: Attributes are securely set
+    return resp
+
+
+@app.route("/good2")
+def good2():
+    resp = make_response()
+    resp.headers['Set-Cookie'] = "sessionid=value; Secure; HttpOnly; SameSite=Strict" # GOOD: Attributes are securely set 
+    return resp
+
+@app.route("/bad1")
+def bad1():
+    resp = make_response()
+    resp.set_cookie("sessionid", value="value", samesite='None') # BAD: the SameSite attribute is set to 'None' and the 'Secure' and 'HttpOnly' attributes are set to False by default.
+    return resp
\ No newline at end of file
diff --git a/python/ql/src/Security/CWE-1275/SameSiteNoneCookie.qhelp b/python/ql/src/Security/CWE-1275/SameSiteNoneCookie.qhelp
new file mode 100644
index 00000000000..e0cc6eade1d
--- /dev/null
+++ b/python/ql/src/Security/CWE-1275/SameSiteNoneCookie.qhelp
@@ -0,0 +1,26 @@
+<!DOCTYPE qhelp PUBLIC
+  "-//Semmle//qhelp//EN"
+  "qhelp.dtd">
+<qhelp>
+
+<overview>
+<p>Cookies with the <code>SameSite</code> attribute set to <code>'None'</code> will be sent with cross-origin requests. 
+This can sometimes allow for Cross-Site Request Forgery (CSRF) attacks, in which a third-party site could perform actions on behalf of a user, if the cookie is used for authentication.</p>
+</overview>
+
+<recommendation>
+<p>Set the <code>samesite</code> to <code>Lax</code> or <code>Strict</code>, or add <code>; SameSite=Lax;</code>, or
+<code>; SameSite=Strict;</code> to the cookie's raw header value. The default value in most cases is <code>Lax</code>.</p>
+</recommendation>
+
+<example>
+<p>In the following examples, the cases marked GOOD show secure cookie attributes being set; whereas in the case marked BAD they are not set.</p>
+<sample src="examples/InsecureCookie.py" />
+</example>
+
+<references>
+<li>MDN: <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie">Set-Cookie</a>.</li>
+<li>OWASP: <a href="https://owasp.org/www-community/SameSite">SameSite</a>.</li>
+</references>
+
+</qhelp>
diff --git a/python/ql/src/Security/CWE-1275/SameSiteNoneCookie.ql b/python/ql/src/Security/CWE-1275/SameSiteNoneCookie.ql
new file mode 100644
index 00000000000..ebad2ddbba6
--- /dev/null
+++ b/python/ql/src/Security/CWE-1275/SameSiteNoneCookie.ql
@@ -0,0 +1,21 @@
+/**
+ * @name Sensitive cookie with `SameSite` attribute set to `None`.
+ * @description Cookies with `SameSite` set to `None` can allow for Cross-Site Request Forgery (CSRF) attacks.
+ * @kind problem
+ * @problem.severity warning
+ * @security-severity 4.0
+ * @precision high
+ * @id py/samesite-none-cookie
+ * @tags security
+ *       external/cwe/cwe-1275
+ */
+
+import python
+import semmle.python.dataflow.new.DataFlow
+import semmle.python.Concepts
+
+from Http::Server::CookieWrite cookie
+where
+  cookie.hasSameSiteAttribute(any(Http::Server::CookieWrite::SameSiteNone v)) and
+  cookie.isSensitive()
+select cookie, "Sensitive cookie with SameSite set to 'None'."
diff --git a/python/ql/src/Security/CWE-1275/examples/InsecureCookie.py b/python/ql/src/Security/CWE-1275/examples/InsecureCookie.py
new file mode 100644
index 00000000000..19d84d14537
--- /dev/null
+++ b/python/ql/src/Security/CWE-1275/examples/InsecureCookie.py
@@ -0,0 +1,21 @@
+from flask import Flask, request, make_response, Response
+
+
+@app.route("/good1")
+def good1():
+    resp = make_response()
+    resp.set_cookie("sessionid", value="value", secure=True, httponly=True, samesite='Strict') # GOOD: Attributes are securely set
+    return resp
+
+
+@app.route("/good2")
+def good2():
+    resp = make_response()
+    resp.headers['Set-Cookie'] = "sessionid=value; Secure; HttpOnly; SameSite=Strict" # GOOD: Attributes are securely set 
+    return resp
+
+@app.route("/bad1")
+def bad1():
+    resp = make_response()
+    resp.set_cookie("sessionid", value="value", samesite='None') # BAD: the SameSite attribute is set to 'None' and the 'Secure' and 'HttpOnly' attributes are set to False by default.
+    return resp
\ No newline at end of file
diff --git a/python/ql/src/Security/CWE-327/BrokenCryptoAlgorithm.qhelp b/python/ql/src/Security/CWE-327/BrokenCryptoAlgorithm.qhelp
index 1b26d30e0fe..9757f2d49bf 100644
--- a/python/ql/src/Security/CWE-327/BrokenCryptoAlgorithm.qhelp
+++ b/python/ql/src/Security/CWE-327/BrokenCryptoAlgorithm.qhelp
@@ -3,20 +3,33 @@
 "qhelp.dtd">
 <qhelp>
      <overview>
+
           <p>
-               Using broken or weak cryptographic algorithms can leave data
-               vulnerable to being decrypted or forged by an attacker.
+               Using broken or weak cryptographic algorithms may compromise
+               security guarantees such as confidentiality, integrity, and
+               authenticity.
           </p>
 
           <p>
-               Many cryptographic algorithms provided by cryptography
-               libraries are known to be weak, or flawed. Using such an
-               algorithm means that encrypted or hashed data is less
-               secure than it appears to be.
+               Many cryptographic algorithms are known to be weak or flawed. The
+               security guarantees of a system often rely on the underlying
+               cryptography, so using a weak algorithm can have severe consequences.
+               For example:
           </p>
 
+          <ul>
+               <li>
+               If a weak encryption algorithm is used, an attacker may be able to
+               decrypt sensitive data.
+               </li>
+               <li>
+               If a weak algorithm is used for digital signatures, an attacker may
+               be able to forge signatures and impersonate legitimate users.
+               </li>
+          </ul>
+
           <p>
-               This query alerts on any use of a weak cryptographic algorithm, that is
+               This query alerts on any use of a weak cryptographic algorithm that is
                not a hashing algorithm. Use of broken or weak cryptographic hash
                functions are handled by the
                <code>py/weak-sensitive-data-hashing</code> query.
diff --git a/python/ql/src/Security/CWE-327/FluentApiModel.qll b/python/ql/src/Security/CWE-327/FluentApiModel.qll
index 8dd90a58821..0f8dae7b316 100644
--- a/python/ql/src/Security/CWE-327/FluentApiModel.qll
+++ b/python/ql/src/Security/CWE-327/FluentApiModel.qll
@@ -15,7 +15,7 @@ import TlsLibraryModel
  * The state is represented as a bit vector, where each bit corresponds to a
  * protocol version. The bit is set if the protocol is allowed.
  */
-module InsecureContextConfiguration implements DataFlow::StateConfigSig {
+module InsecureContextConfig implements DataFlow::StateConfigSig {
   private newtype TFlowState =
     TMkFlowState(TlsLibrary library, int bits) {
       bits in [0 .. max(any(ProtocolVersion v).getBit()) * 2 - 1]
@@ -116,7 +116,12 @@ module InsecureContextConfiguration implements DataFlow::StateConfigSig {
   }
 }
 
-private module InsecureContextFlow = DataFlow::GlobalWithState<InsecureContextConfiguration>;
+/**
+ * DEPRECATED: Renamed to `InsecureContextConfig`.
+ */
+deprecated module InsecureContextConfiguration = InsecureContextConfig;
+
+private module InsecureContextFlow = DataFlow::GlobalWithState<InsecureContextConfig>;
 
 /**
  * Holds if `conectionCreation` marks the creation of a connection based on the contex
diff --git a/python/ql/src/Security/CWE-614/InsecureCookie.qhelp b/python/ql/src/Security/CWE-614/InsecureCookie.qhelp
index 5b36c9cc59d..914d9d0baa5 100644
--- a/python/ql/src/Security/CWE-614/InsecureCookie.qhelp
+++ b/python/ql/src/Security/CWE-614/InsecureCookie.qhelp
@@ -4,26 +4,25 @@
 <qhelp>
 
 <overview>
-<p>Cookies without the <code>Secure</code> flag set may be transmitted using HTTP instead of HTTPS, which leaves them vulnerable to reading by a third party.</p>
-<p>Cookies without the <code>HttpOnly</code> flag set are accessible to JavaScript running in the same origin. In case of a Cross-Site Scripting (XSS) vulnerability, the cookie can be stolen by a malicious script.</p>
-<p>Cookies with the <code>SameSite</code> attribute set to <code>'None'</code> will be sent with cross-origin requests, which can be controlled by third-party JavaScript code and allow for Cross-Site Request Forgery (CSRF) attacks.</p>
+<p>Cookies without the <code>Secure</code> flag set may be transmitted using HTTP instead of HTTPS.
+This leaves them vulnerable to being read by a third party attacker. If a sensitive cookie such as a session
+key is intercepted this way, it would allow the attacker to perform actions on a user's behalf.</p>
 </overview>
 
 <recommendation>
-<p>Always set <code>secure</code> to <code>True</code> or add "; Secure;" to the cookie's raw value.</p>
-<p>Always set <code>httponly</code> to <code>True</code> or add "; HttpOnly;" to the cookie's raw value.</p>
-<p>Always set <code>samesite</code> to <code>Lax</code> or <code>Strict</code>, or add "; SameSite=Lax;", or
-"; Samesite=Strict;" to the cookie's raw header value.</p>
+<p>Always set <code>secure</code> to <code>True</code>, or add <code>; Secure;</code> to the cookie's raw header value, to ensure SSL is used to transmit the cookie
+with encryption.</p>
 </recommendation>
 
 <example>
-<p>In the following examples, the cases marked GOOD show secure cookie attributes being set; whereas in the cases marked BAD they are not set.</p>
+<p>In the following examples, the cases marked GOOD show secure cookie attributes being set; whereas in the case marked BAD they are not set.</p>
 <sample src="examples/InsecureCookie.py" />
 </example>
 
 <references>
 <li>Detectify: <a href="https://support.detectify.com/support/solutions/articles/48001048982-cookie-lack-secure-flag">Cookie lack Secure flag</a>.</li>
 <li>PortSwigger: <a href="https://portswigger.net/kb/issues/00500200_tls-cookie-without-secure-flag-set">TLS cookie without secure flag set</a>.</li>
+<li>MDN: <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie">Set-Cookie</a>.</li>
 </references>
 
 </qhelp>
diff --git a/python/ql/src/Security/CWE-614/InsecureCookie.ql b/python/ql/src/Security/CWE-614/InsecureCookie.ql
index 260bd303310..603c573e17f 100644
--- a/python/ql/src/Security/CWE-614/InsecureCookie.ql
+++ b/python/ql/src/Security/CWE-614/InsecureCookie.ql
@@ -9,43 +9,14 @@
  * @id py/insecure-cookie
  * @tags security
  *       external/cwe/cwe-614
- *       external/cwe/cwe-1004
- *       external/cwe/cwe-1275
  */
 
 import python
 import semmle.python.dataflow.new.DataFlow
 import semmle.python.Concepts
 
-predicate hasProblem(Http::Server::CookieWrite cookie, string alert, int idx) {
+from Http::Server::CookieWrite cookie
+where
   cookie.hasSecureFlag(false) and
-  alert = "Secure" and
-  idx = 0
-  or
-  cookie.hasHttpOnlyFlag(false) and
-  alert = "HttpOnly" and
-  idx = 1
-  or
-  cookie.hasSameSiteAttribute(any(Http::Server::CookieWrite::SameSiteNone v)) and
-  alert = "SameSite" and
-  idx = 2
-}
-
-predicate hasAlert(Http::Server::CookieWrite cookie, string alert) {
-  exists(int numProblems | numProblems = strictcount(string p | hasProblem(cookie, p, _)) |
-    numProblems = 1 and
-    alert = any(string prob | hasProblem(cookie, prob, _)) + " attribute"
-    or
-    numProblems = 2 and
-    alert =
-      strictconcat(string prob, int idx | hasProblem(cookie, prob, idx) | prob, " and " order by idx)
-        + " attributes"
-    or
-    numProblems = 3 and
-    alert = "Secure, HttpOnly, and SameSite attributes"
-  )
-}
-
-from Http::Server::CookieWrite cookie, string alert
-where hasAlert(cookie, alert)
-select cookie, "Cookie is added without the " + alert + " properly set."
+  cookie.isSensitive()
+select cookie, "Cookie is added to response without the 'secure' flag being set."
diff --git a/python/ql/src/Security/CWE-614/examples/InsecureCookie.py b/python/ql/src/Security/CWE-614/examples/InsecureCookie.py
index 07cca6c3fce..19d84d14537 100644
--- a/python/ql/src/Security/CWE-614/examples/InsecureCookie.py
+++ b/python/ql/src/Security/CWE-614/examples/InsecureCookie.py
@@ -4,17 +4,18 @@ from flask import Flask, request, make_response, Response
 @app.route("/good1")
 def good1():
     resp = make_response()
-    resp.set_cookie("name", value="value", secure=True, httponly=True, samesite='Strict') # GOOD: Attributes are securely set
+    resp.set_cookie("sessionid", value="value", secure=True, httponly=True, samesite='Strict') # GOOD: Attributes are securely set
     return resp
 
 
 @app.route("/good2")
 def good2():
     resp = make_response()
-    resp.headers['Set-Cookie'] = "name=value; Secure; HttpOnly; SameSite=Strict" # GOOD: Attributes are securely set 
+    resp.headers['Set-Cookie'] = "sessionid=value; Secure; HttpOnly; SameSite=Strict" # GOOD: Attributes are securely set 
     return resp
 
 @app.route("/bad1")
+def bad1():
     resp = make_response()
-    resp.set_cookie("name", value="value", samesite='None') # BAD: the SameSite attribute is set to 'None' and the 'Secure' and 'HttpOnly' attributes are set to False by default.
+    resp.set_cookie("sessionid", value="value", samesite='None') # BAD: the SameSite attribute is set to 'None' and the 'Secure' and 'HttpOnly' attributes are set to False by default.
     return resp
\ No newline at end of file
diff --git a/python/ql/src/Statements/AssertLiteralConstant.ql b/python/ql/src/Statements/AssertLiteralConstant.ql
index 73bd1645858..60c09951c06 100644
--- a/python/ql/src/Statements/AssertLiteralConstant.ql
+++ b/python/ql/src/Statements/AssertLiteralConstant.ql
@@ -3,7 +3,8 @@
  * @description An assert statement testing a literal constant value may exhibit
  *              different behavior when optimizations are enabled.
  * @kind problem
- * @tags reliability
+ * @tags quality
+ *       reliability
  *       correctness
  * @problem.severity recommendation
  * @sub-severity low
diff --git a/python/ql/src/Statements/BreakOrReturnInFinally.ql b/python/ql/src/Statements/BreakOrReturnInFinally.ql
index 02f501e0bfd..dc9800eba8a 100644
--- a/python/ql/src/Statements/BreakOrReturnInFinally.ql
+++ b/python/ql/src/Statements/BreakOrReturnInFinally.ql
@@ -3,8 +3,10 @@
  * @description Using a Break or Return statement in a finally block causes the
  *              Try-finally block to exit, discarding the exception.
  * @kind problem
- * @tags reliability
- *       maintainability
+ * @tags quality
+ *       reliability
+ *       error-handling
+ *       correctness
  *       external/cwe/cwe-584
  * @problem.severity warning
  * @sub-severity low
diff --git a/python/ql/src/Statements/DocStrings.ql b/python/ql/src/Statements/DocStrings.ql
index 355aff93f17..903207f7ccb 100644
--- a/python/ql/src/Statements/DocStrings.ql
+++ b/python/ql/src/Statements/DocStrings.ql
@@ -4,6 +4,7 @@
  *              makes it more difficult for other developers to maintain the code.
  * @kind problem
  * @tags maintainability
+ *       readability
  * @problem.severity recommendation
  * @sub-severity low
  * @precision medium
diff --git a/python/ql/src/Statements/IterableStringOrSequence.ql b/python/ql/src/Statements/IterableStringOrSequence.ql
index 5cf92754f62..d1c4a507f0d 100644
--- a/python/ql/src/Statements/IterableStringOrSequence.ql
+++ b/python/ql/src/Statements/IterableStringOrSequence.ql
@@ -12,6 +12,7 @@
  */
 
 import python
+private import LegacyPointsTo
 import semmle.python.filters.Tests
 
 predicate has_string_type(Value v) {
@@ -21,7 +22,7 @@ predicate has_string_type(Value v) {
 }
 
 from
-  For loop, ControlFlowNode iter, Value str, Value seq, ControlFlowNode seq_origin,
+  For loop, ControlFlowNodeWithPointsTo iter, Value str, Value seq, ControlFlowNode seq_origin,
   ControlFlowNode str_origin
 where
   loop.getIter().getAFlowNode() = iter and
diff --git a/python/ql/src/Statements/MismatchInMultipleAssignment.ql b/python/ql/src/Statements/MismatchInMultipleAssignment.ql
index 188bdd7b915..c44d8e348c6 100644
--- a/python/ql/src/Statements/MismatchInMultipleAssignment.ql
+++ b/python/ql/src/Statements/MismatchInMultipleAssignment.ql
@@ -13,6 +13,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 private int len(ExprList el) { result = count(el.getAnItem()) }
 
@@ -41,7 +42,7 @@ predicate mismatched_tuple_rhs(Assign a, int lcount, int rcount, Location loc) {
       a.getATarget().(Tuple).getElts() = l or
       a.getATarget().(List).getElts() = l
     ) and
-    a.getValue().pointsTo(r, origin) and
+    a.getValue().(ExprWithPointsTo).pointsTo(r, origin) and
     loc = origin.getLocation() and
     lcount = len(l) and
     rcount = r.length() and
diff --git a/python/ql/src/Statements/ModificationOfLocals.ql b/python/ql/src/Statements/ModificationOfLocals.ql
index 05c2095f88c..e4791a410f7 100644
--- a/python/ql/src/Statements/ModificationOfLocals.ql
+++ b/python/ql/src/Statements/ModificationOfLocals.ql
@@ -12,8 +12,11 @@
  */
 
 import python
+private import LegacyPointsTo
 
-predicate originIsLocals(ControlFlowNode n) { n.pointsTo(_, _, Value::named("locals").getACall()) }
+predicate originIsLocals(ControlFlowNodeWithPointsTo n) {
+  n.pointsTo(_, _, Value::named("locals").getACall())
+}
 
 predicate modification_of_locals(ControlFlowNode f) {
   originIsLocals(f.(SubscriptNode).getObject()) and
diff --git a/python/ql/src/Statements/NonIteratorInForLoop.ql b/python/ql/src/Statements/NonIteratorInForLoop.ql
index 92527a10e3b..f8e6e51b55f 100644
--- a/python/ql/src/Statements/NonIteratorInForLoop.ql
+++ b/python/ql/src/Statements/NonIteratorInForLoop.ql
@@ -12,8 +12,9 @@
  */
 
 import python
+private import LegacyPointsTo
 
-from For loop, ControlFlowNode iter, Value v, ClassValue t, ControlFlowNode origin
+from For loop, ControlFlowNodeWithPointsTo iter, Value v, ClassValue t, ControlFlowNode origin
 where
   loop.getIter().getAFlowNode() = iter and
   iter.pointsTo(_, v, origin) and
diff --git a/python/ql/src/Statements/RedundantAssignment.ql b/python/ql/src/Statements/RedundantAssignment.ql
index 42561905bac..357364c41b2 100644
--- a/python/ql/src/Statements/RedundantAssignment.ql
+++ b/python/ql/src/Statements/RedundantAssignment.ql
@@ -13,6 +13,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 predicate assignment(AssignStmt a, Expr left, Expr right) {
   a.getATarget() = left and a.getValue() = right
@@ -57,7 +58,9 @@ predicate same_name(Name n1, Name n2) {
   not maybe_defined_in_outer_scope(n2)
 }
 
-ClassValue value_type(Attribute a) { a.getObject().pointsTo().getClass() = result }
+ClassValue value_type(Attribute a) {
+  a.getObject().(ExprWithPointsTo).pointsTo().getClass() = result
+}
 
 predicate is_property_access(Attribute a) {
   value_type(a).lookup(a.getName()) instanceof PropertyValue
@@ -87,7 +90,7 @@ predicate pyflakes_commented(AssignStmt assignment) {
 
 predicate side_effecting_lhs(Attribute lhs) {
   exists(ClassValue cls, ClassValue decl |
-    lhs.getObject().pointsTo().getClass() = cls and
+    lhs.getObject().(ExprWithPointsTo).pointsTo().getClass() = cls and
     decl = cls.getASuperType() and
     not decl.isBuiltin()
   |
diff --git a/python/ql/src/Statements/ReturnOrYieldOutsideFunction.ql b/python/ql/src/Statements/ReturnOrYieldOutsideFunction.ql
index a940dc60123..7bb0161f130 100644
--- a/python/ql/src/Statements/ReturnOrYieldOutsideFunction.ql
+++ b/python/ql/src/Statements/ReturnOrYieldOutsideFunction.ql
@@ -2,7 +2,8 @@
  * @name Use of 'return' or 'yield' outside a function
  * @description Using 'return' or 'yield' outside a function causes a 'SyntaxError' at runtime.
  * @kind problem
- * @tags reliability
+ * @tags quality
+ *       reliability
  *       correctness
  * @problem.severity error
  * @sub-severity low
diff --git a/python/ql/src/Statements/ShouldUseWithStatement.ql b/python/ql/src/Statements/ShouldUseWithStatement.ql
index 2ad76b5c832..eb5cf9237d5 100644
--- a/python/ql/src/Statements/ShouldUseWithStatement.ql
+++ b/python/ql/src/Statements/ShouldUseWithStatement.ql
@@ -13,6 +13,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 predicate calls_close(Call c) { exists(Attribute a | c.getFunc() = a and a.getName() = "close") }
 
@@ -22,7 +23,7 @@ predicate only_stmt_in_finally(Try t, Call c) {
   )
 }
 
-predicate points_to_context_manager(ControlFlowNode f, ClassValue cls) {
+predicate points_to_context_manager(ControlFlowNodeWithPointsTo f, ClassValue cls) {
   forex(Value v | f.pointsTo(v) | v.getClass() = cls) and
   cls.isContextManager()
 }
diff --git a/python/ql/src/Statements/StatementNoEffect.ql b/python/ql/src/Statements/StatementNoEffect.ql
index a5806e7082d..222907f24e3 100644
--- a/python/ql/src/Statements/StatementNoEffect.ql
+++ b/python/ql/src/Statements/StatementNoEffect.ql
@@ -13,10 +13,11 @@
  */
 
 import python
+private import LegacyPointsTo
 
 predicate understood_attribute(Attribute attr, ClassValue cls, ClassValue attr_cls) {
   exists(string name | attr.getName() = name |
-    attr.getObject().pointsTo().getClass() = cls and
+    attr.getObject().(ExprWithPointsTo).pointsTo().getClass() = cls and
     cls.attr(name).getClass() = attr_cls
   )
 }
@@ -30,7 +31,7 @@ predicate side_effecting_attribute(Attribute attr) {
 }
 
 predicate maybe_side_effecting_attribute(Attribute attr) {
-  not understood_attribute(attr, _, _) and not attr.pointsTo(_)
+  not understood_attribute(attr, _, _) and not attr.(ExprWithPointsTo).pointsTo(_)
   or
   side_effecting_attribute(attr)
 }
@@ -68,7 +69,7 @@ predicate side_effecting_binary(Expr b) {
 
 pragma[nomagic]
 private predicate binary_operator_special_method(
-  BinaryExpr b, Expr sub, ClassValue cls, string method_name
+  BinaryExpr b, ExprWithPointsTo sub, ClassValue cls, string method_name
 ) {
   method_name = special_method() and
   sub = b.getLeft() and
@@ -77,7 +78,9 @@ private predicate binary_operator_special_method(
 }
 
 pragma[nomagic]
-private predicate comparison_special_method(Compare b, Expr sub, ClassValue cls, string method_name) {
+private predicate comparison_special_method(
+  Compare b, ExprWithPointsTo sub, ClassValue cls, string method_name
+) {
   exists(Cmpop op |
     b.compares(sub, op, _) and
     method_name = op.getSpecialMethodName()
diff --git a/python/ql/src/Statements/StringConcatenationInLoop.ql b/python/ql/src/Statements/StringConcatenationInLoop.ql
index 563a42e5462..c85292cf26a 100644
--- a/python/ql/src/Statements/StringConcatenationInLoop.ql
+++ b/python/ql/src/Statements/StringConcatenationInLoop.ql
@@ -11,6 +11,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 predicate string_concat_in_loop(BinaryExpr b) {
   b.getOp() instanceof Add and
@@ -19,7 +20,7 @@ predicate string_concat_in_loop(BinaryExpr b) {
   |
     d.getDefinition().(DefinitionNode).getValue() = add and
     u.getAUse() = add.getAnOperand() and
-    add.getAnOperand().pointsTo().getClass() = ClassValue::str()
+    add.getAnOperand().(ControlFlowNodeWithPointsTo).pointsTo().getClass() = ClassValue::str()
   )
 }
 
diff --git a/python/ql/src/Statements/UnreachableCode.ql b/python/ql/src/Statements/UnreachableCode.ql
index 98c99ac1218..55582ed2f06 100644
--- a/python/ql/src/Statements/UnreachableCode.ql
+++ b/python/ql/src/Statements/UnreachableCode.ql
@@ -13,6 +13,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 predicate typing_import(ImportingStmt is) {
   exists(Module m |
@@ -33,7 +34,11 @@ predicate unique_yield(Stmt s) {
 /** Holds if `contextlib.suppress` may be used in the same scope as `s` */
 predicate suppression_in_scope(Stmt s) {
   exists(With w |
-    w.getContextExpr().(Call).getFunc().pointsTo(Value::named("contextlib.suppress")) and
+    w.getContextExpr()
+        .(Call)
+        .getFunc()
+        .(ExprWithPointsTo)
+        .pointsTo(Value::named("contextlib.suppress")) and
     w.getScope() = s.getScope()
   )
 }
diff --git a/python/ql/src/Statements/UnusedExceptionObject.ql b/python/ql/src/Statements/UnusedExceptionObject.ql
index 90724b9f167..9a6a3650b7e 100644
--- a/python/ql/src/Statements/UnusedExceptionObject.ql
+++ b/python/ql/src/Statements/UnusedExceptionObject.ql
@@ -12,10 +12,11 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from Call call, ClassValue ex
 where
-  call.getFunc().pointsTo(ex) and
+  call.getFunc().(ExprWithPointsTo).pointsTo(ex) and
   ex.getASuperType() = ClassValue::exception() and
   exists(ExprStmt s | s.getValue() = call)
 select call, "Instantiating an exception, but not raising it, has no effect."
diff --git a/python/ql/src/Statements/UseOfExit.ql b/python/ql/src/Statements/UseOfExit.ql
index be3579481fc..437ff93b537 100644
--- a/python/ql/src/Statements/UseOfExit.ql
+++ b/python/ql/src/Statements/UseOfExit.ql
@@ -12,9 +12,10 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from CallNode call, string name
-where call.getFunction().pointsTo(Value::siteQuitter(name))
+where call.getFunction().(ControlFlowNodeWithPointsTo).pointsTo(Value::siteQuitter(name))
 select call,
   "The '" + name +
     "' site.Quitter object may not exist if the 'site' module is not loaded or is modified."
diff --git a/python/ql/src/Testing/Mox.qll b/python/ql/src/Testing/Mox.qll
index a131ca7eeca..969c49c6843 100644
--- a/python/ql/src/Testing/Mox.qll
+++ b/python/ql/src/Testing/Mox.qll
@@ -1,9 +1,10 @@
 import python
+private import LegacyPointsTo
 
 /** Whether `mox` or `.StubOutWithMock()` is used in thin module `m`. */
 predicate useOfMoxInModule(Module m) {
   exists(ModuleObject mox | mox.getName() = "mox" or mox.getName() = "mox3.mox" |
-    exists(ControlFlowNode use |
+    exists(ControlFlowNodeWithPointsTo use |
       use.refersTo(mox) and
       use.getScope().getEnclosingModule() = m
     )
diff --git a/python/ql/src/Variables/MonkeyPatched.qll b/python/ql/src/Variables/MonkeyPatched.qll
index ab842afbf26..86d9edac0a9 100644
--- a/python/ql/src/Variables/MonkeyPatched.qll
+++ b/python/ql/src/Variables/MonkeyPatched.qll
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 predicate monkey_patched_builtin(string name) {
   exists(AttrNode attr, SubscriptNode subscr, StringLiteral s |
@@ -6,19 +7,19 @@ predicate monkey_patched_builtin(string name) {
     subscr.getIndex().getNode() = s and
     s.getText() = name and
     subscr.getObject() = attr and
-    attr.getObject("__dict__").pointsTo(Module::builtinModule())
+    attr.getObject("__dict__").(ControlFlowNodeWithPointsTo).pointsTo(Module::builtinModule())
   )
   or
-  exists(CallNode call, ControlFlowNode bltn, StringLiteral s |
+  exists(CallNode call, ControlFlowNodeWithPointsTo bltn, StringLiteral s |
     call.getArg(0) = bltn and
     bltn.pointsTo(Module::builtinModule()) and
     call.getArg(1).getNode() = s and
     s.getText() = name and
-    call.getFunction().pointsTo(Value::named("setattr"))
+    call.getFunction().(ControlFlowNodeWithPointsTo).pointsTo(Value::named("setattr"))
   )
   or
   exists(AttrNode attr |
     attr.isStore() and
-    attr.getObject(name).pointsTo(Module::builtinModule())
+    attr.getObject(name).(ControlFlowNodeWithPointsTo).pointsTo(Module::builtinModule())
   )
 }
diff --git a/python/ql/src/Variables/ShadowBuiltin.ql b/python/ql/src/Variables/ShadowBuiltin.ql
index 7e4a8580a93..51b74b7109c 100644
--- a/python/ql/src/Variables/ShadowBuiltin.ql
+++ b/python/ql/src/Variables/ShadowBuiltin.ql
@@ -4,8 +4,10 @@
  *              makes the built-in object unusable within the current scope and makes the code
  *              more difficult to read.
  * @kind problem
- * @tags maintainability
+ * @tags quality
+ *       maintainability
  *       readability
+ *       correctness
  * @problem.severity recommendation
  * @sub-severity low
  * @precision medium
diff --git a/python/ql/src/Variables/ShadowGlobal.ql b/python/ql/src/Variables/ShadowGlobal.ql
index 79d74d272ae..fad86935cf1 100644
--- a/python/ql/src/Variables/ShadowGlobal.ql
+++ b/python/ql/src/Variables/ShadowGlobal.ql
@@ -4,8 +4,10 @@
  *              makes the global variable unusable within the current scope and makes the code
  *              more difficult to read.
  * @kind problem
- * @tags maintainability
+ * @tags quality
+ *       maintainability
  *       readability
+ *       correctness
  * @problem.severity recommendation
  * @sub-severity low
  * @precision medium
@@ -13,6 +15,7 @@
  */
 
 import python
+private import LegacyPointsTo
 import Shadowing
 import semmle.python.types.Builtins
 
@@ -33,7 +36,9 @@ predicate shadows(Name d, GlobalVariable g, Function scope, int line) {
 
 /* pytest dynamically populates its namespace so, we cannot look directly for the pytest.fixture function */
 AttrNode pytest_fixture_attr() {
-  exists(ModuleValue pytest | result.getObject("fixture").pointsTo(pytest))
+  exists(ModuleValue pytest |
+    result.getObject("fixture").(ControlFlowNodeWithPointsTo).pointsTo(pytest)
+  )
 }
 
 Value pytest_fixture() {
@@ -42,14 +47,15 @@ Value pytest_fixture() {
     or
     call.getFunction().(CallNode).getFunction() = pytest_fixture_attr()
   |
-    call.pointsTo(result)
+    call.(ControlFlowNodeWithPointsTo).pointsTo(result)
   )
 }
 
 /* pytest fixtures require that the parameter name is also a global */
 predicate assigned_pytest_fixture(GlobalVariable v) {
   exists(NameNode def |
-    def.defines(v) and def.(DefinitionNode).getValue().pointsTo(pytest_fixture())
+    def.defines(v) and
+    def.(DefinitionNode).getValue().(ControlFlowNodeWithPointsTo).pointsTo(pytest_fixture())
   )
 }
 
diff --git a/python/ql/src/Variables/SuspiciousUnusedLoopIterationVariable.ql b/python/ql/src/Variables/SuspiciousUnusedLoopIterationVariable.ql
index fbeb9b2b4f9..87900c48fc5 100644
--- a/python/ql/src/Variables/SuspiciousUnusedLoopIterationVariable.ql
+++ b/python/ql/src/Variables/SuspiciousUnusedLoopIterationVariable.ql
@@ -12,6 +12,7 @@
  */
 
 import python
+private import LegacyPointsTo
 import Definition
 
 predicate is_increment(Stmt s) {
@@ -55,7 +56,7 @@ predicate points_to_call_to_range(ControlFlowNode f) {
   )
   or
   /* Handle list(range(...)) and list(list(range(...))) */
-  f.(CallNode).pointsTo().getClass() = ClassValue::list() and
+  f.(CallNode).(ControlFlowNodeWithPointsTo).pointsTo().getClass() = ClassValue::list() and
   points_to_call_to_range(f.(CallNode).getArg(0))
 }
 
diff --git a/python/ql/src/Variables/UndefinedExport.ql b/python/ql/src/Variables/UndefinedExport.ql
index 173139e224a..ff3f78ec4bc 100644
--- a/python/ql/src/Variables/UndefinedExport.ql
+++ b/python/ql/src/Variables/UndefinedExport.ql
@@ -13,6 +13,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 /** Whether name is declared in the __all__ list of this module */
 predicate declaredInAll(Module m, StringLiteral name) {
@@ -44,7 +45,7 @@ predicate mutates_globals(ModuleValue m) {
         enum_convert = enum_class.attr("_convert") and
         exists(CallNode call | call.getScope() = m.getScope() |
           enum_convert.getACall() = call or
-          call.getFunction().pointsTo(enum_convert)
+          call.getFunction().(ControlFlowNodeWithPointsTo).pointsTo(enum_convert)
         )
       )
       or
@@ -52,7 +53,11 @@ predicate mutates_globals(ModuleValue m) {
       // analysis doesn't handle that well enough. So we need a special case for this
       not exists(enum_class.attr("_convert")) and
       exists(CallNode call | call.getScope() = m.getScope() |
-        call.getFunction().(AttrNode).getObject(["_convert", "_convert_"]).pointsTo() = enum_class
+        call.getFunction()
+            .(AttrNode)
+            .getObject(["_convert", "_convert_"])
+            .(ControlFlowNodeWithPointsTo)
+            .pointsTo() = enum_class
       )
     )
   )
@@ -65,9 +70,9 @@ predicate is_exported_submodule_name(ModuleValue m, string exported_name) {
 
 predicate contains_unknown_import_star(ModuleValue m) {
   exists(ImportStarNode imp | imp.getEnclosingModule() = m.getScope() |
-    imp.getModule().pointsTo().isAbsent()
+    imp.getModule().(ControlFlowNodeWithPointsTo).pointsTo().isAbsent()
     or
-    not exists(imp.getModule().pointsTo())
+    not exists(imp.getModule().(ControlFlowNodeWithPointsTo).pointsTo())
   )
 }
 
diff --git a/python/ql/src/Variables/UndefinedGlobal.ql b/python/ql/src/Variables/UndefinedGlobal.ql
index f88f5504df8..3ea1c0d38eb 100644
--- a/python/ql/src/Variables/UndefinedGlobal.ql
+++ b/python/ql/src/Variables/UndefinedGlobal.ql
@@ -11,6 +11,7 @@
  */
 
 import python
+private import LegacyPointsTo
 import Variables.MonkeyPatched
 import Loop
 import semmle.python.pointsto.PointsTo
@@ -95,7 +96,7 @@ predicate undefined_use(Name u) {
   not contains_unknown_import_star(u.getEnclosingModule()) and
   not use_of_exec(u.getEnclosingModule()) and
   not exists(u.getVariable().getAStore()) and
-  not u.pointsTo(_) and
+  not u.(ExprWithPointsTo).pointsTo(_) and
   not probably_defined_in_loop(u)
 }
 
diff --git a/python/ql/src/Variables/UndefinedPlaceHolder.ql b/python/ql/src/Variables/UndefinedPlaceHolder.ql
index 7f7794e60a1..b0eeeda871a 100644
--- a/python/ql/src/Variables/UndefinedPlaceHolder.ql
+++ b/python/ql/src/Variables/UndefinedPlaceHolder.ql
@@ -2,7 +2,8 @@
  * @name Use of an undefined placeholder variable
  * @description Using a variable before it is initialized causes an exception.
  * @kind problem
- * @tags reliability
+ * @tags quality
+ *       reliability
  *       correctness
  * @problem.severity error
  * @sub-severity low
diff --git a/python/ql/src/Variables/UninitializedLocal.ql b/python/ql/src/Variables/UninitializedLocal.ql
index 3a2461ee3e7..d4d94f5a4f3 100644
--- a/python/ql/src/Variables/UninitializedLocal.ql
+++ b/python/ql/src/Variables/UninitializedLocal.ql
@@ -2,7 +2,8 @@
  * @name Potentially uninitialized local variable
  * @description Using a local variable before it is initialized causes an UnboundLocalError.
  * @kind problem
- * @tags reliability
+ * @tags quality
+ *       reliability
  *       correctness
  * @problem.severity error
  * @sub-severity low
@@ -11,6 +12,7 @@
  */
 
 import python
+private import LegacyPointsTo
 import Undefined
 import semmle.python.pointsto.PointsTo
 
@@ -29,7 +31,7 @@ predicate uninitialized_local(NameNode use) {
 predicate explicitly_guarded(NameNode u) {
   exists(Try t |
     t.getBody().contains(u.getNode()) and
-    t.getAHandler().getType().pointsTo(ClassValue::nameError())
+    t.getAHandler().getType().(ExprWithPointsTo).pointsTo(ClassValue::nameError())
   )
 }
 
diff --git a/python/ql/src/Variables/UnusedModuleVariable.ql b/python/ql/src/Variables/UnusedModuleVariable.ql
index 855ca27a741..24d6559d6fe 100644
--- a/python/ql/src/Variables/UnusedModuleVariable.ql
+++ b/python/ql/src/Variables/UnusedModuleVariable.ql
@@ -13,6 +13,7 @@
  */
 
 import python
+private import LegacyPointsTo
 import Definition
 
 /**
@@ -58,7 +59,7 @@ predicate unused_global(Name unused, GlobalVariable v) {
       // indirectly
       defn.getBasicBlock().reachesExit() and u.getScope() != unused.getScope()
     ) and
-    not unused.getEnclosingModule().getAnExport() = v.getId() and
+    not unused.getEnclosingModule().(ModuleWithPointsTo).getAnExport() = v.getId() and
     not exists(unused.getParentNode().(ClassDef).getDefinedClass().getADecorator()) and
     not exists(unused.getParentNode().(FunctionDef).getDefinedFunction().getADecorator()) and
     unused.defines(v) and
diff --git a/python/ql/src/Variables/UnusedParameter.ql b/python/ql/src/Variables/UnusedParameter.ql
index 74e1c2ac536..7228974b7c7 100644
--- a/python/ql/src/Variables/UnusedParameter.ql
+++ b/python/ql/src/Variables/UnusedParameter.ql
@@ -2,7 +2,10 @@
  * @name Unused parameter
  * @description Parameter is defined but not used
  * @kind problem
- * @tags maintainability
+ * @tags quality
+ *       reliability
+ *       correctness
+ *       readability
  * @problem.severity recommendation
  * @sub-severity high
  * @precision medium
diff --git a/python/ql/src/analysis/Consistency.ql b/python/ql/src/analysis/Consistency.ql
index f7d80a5da95..aafb461a504 100644
--- a/python/ql/src/analysis/Consistency.ql
+++ b/python/ql/src/analysis/Consistency.ql
@@ -5,6 +5,7 @@
  */
 
 import python
+private import LegacyPointsTo
 import analysis.DefinitionTracking
 
 predicate uniqueness_error(int number, string what, string problem) {
@@ -208,18 +209,22 @@ predicate function_object_consistency(string clsname, string problem, string wha
 predicate multiple_origins_per_object(Object obj) {
   not obj.isC() and
   not obj instanceof ModuleObject and
-  exists(ControlFlowNode use, Context ctx |
+  exists(ControlFlowNodeWithPointsTo use, Context ctx |
     strictcount(ControlFlowNode orig | use.refersTo(ctx, obj, _, orig)) > 1
   )
 }
 
-predicate intermediate_origins(ControlFlowNode use, ControlFlowNode inter, Object obj) {
+predicate intermediate_origins(
+  ControlFlowNodeWithPointsTo use, ControlFlowNodeWithPointsTo inter, Object obj
+) {
   exists(ControlFlowNode orig, Context ctx | not inter = orig |
     use.refersTo(ctx, obj, _, inter) and
     inter.refersTo(ctx, obj, _, orig) and
     // It can sometimes happen that two different modules (e.g. cPickle and Pickle)
     // have the same attribute, but different origins.
-    not strictcount(Object val | inter.(AttrNode).getObject().refersTo(val)) > 1
+    not strictcount(Object val |
+      inter.(AttrNode).getObject().(ControlFlowNodeWithPointsTo).refersTo(val)
+    ) > 1
   )
 }
 
diff --git a/python/ql/src/analysis/Efficiency.ql b/python/ql/src/analysis/Efficiency.ql
index ff44fc2c47d..37cb5c97387 100644
--- a/python/ql/src/analysis/Efficiency.ql
+++ b/python/ql/src/analysis/Efficiency.ql
@@ -4,6 +4,7 @@
  */
 
 import python
+private import LegacyPointsTo
 import semmle.python.pointsto.PointsTo
 import semmle.python.pointsto.PointsToContext
 
@@ -18,11 +19,11 @@ predicate trivial(ControlFlowNode f) {
 from int interesting_facts, int interesting_facts_in_source, int total_size, float efficiency
 where
   interesting_facts =
-    strictcount(ControlFlowNode f, Object value, ClassObject cls |
+    strictcount(ControlFlowNodeWithPointsTo f, Object value, ClassObject cls |
       f.refersTo(value, cls, _) and not trivial(f)
     ) and
   interesting_facts_in_source =
-    strictcount(ControlFlowNode f, Object value, ClassObject cls |
+    strictcount(ControlFlowNodeWithPointsTo f, Object value, ClassObject cls |
       f.refersTo(value, cls, _) and
       not trivial(f) and
       exists(f.getScope().getEnclosingModule().getFile().getRelativePath())
diff --git a/python/ql/src/analysis/ImportFailure.ql b/python/ql/src/analysis/ImportFailure.ql
index 62de72f3b3e..c9289a8b474 100644
--- a/python/ql/src/analysis/ImportFailure.ql
+++ b/python/ql/src/analysis/ImportFailure.ql
@@ -7,6 +7,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 ImportExpr alternative_import(ImportExpr ie) {
   exists(Alias thisalias, Alias otheralias |
@@ -53,7 +54,7 @@ string os_specific_import(ImportExpr ie) {
 string get_os() { py_flags_versioned("sys.platform", result, major_version().toString()) }
 
 predicate ok_to_fail(ImportExpr ie) {
-  alternative_import(ie).refersTo(_)
+  alternative_import(ie).(ExprWithPointsTo).refersTo(_)
   or
   os_specific_import(ie) != get_os()
 }
@@ -62,7 +63,10 @@ class VersionTest extends ControlFlowNode {
   VersionTest() {
     exists(string name |
       name.matches("%version%") and
-      this.(CompareNode).getAChild+().pointsTo(Module::named("sys").attr(name))
+      this.(CompareNode)
+          .getAChild+()
+          .(ControlFlowNodeWithPointsTo)
+          .pointsTo(Module::named("sys").attr(name))
     )
   }
 
@@ -76,7 +80,7 @@ class VersionGuard extends ConditionBlock {
 
 from ImportExpr ie
 where
-  not ie.refersTo(_) and
+  not ie.(ExprWithPointsTo).refersTo(_) and
   exists(Context c | c.appliesTo(ie.getAFlowNode())) and
   not ok_to_fail(ie) and
   not exists(VersionGuard guard | guard.controls(ie.getAFlowNode().getBasicBlock(), _))
diff --git a/python/ql/src/analysis/PointsToFailure.ql b/python/ql/src/analysis/PointsToFailure.ql
index 66ff2d811a3..7b9a2ac0659 100644
--- a/python/ql/src/analysis/PointsToFailure.ql
+++ b/python/ql/src/analysis/PointsToFailure.ql
@@ -9,7 +9,8 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from Expr e
-where exists(ControlFlowNode f | f = e.getAFlowNode() | not f.refersTo(_))
+where exists(ControlFlowNodeWithPointsTo f | f = e.getAFlowNode() | not f.refersTo(_))
 select e, "Expression does not 'point-to' any object."
diff --git a/python/ql/src/analysis/RatioOfDefinitions.ql b/python/ql/src/analysis/RatioOfDefinitions.ql
index 562deb75005..84b8d7602ec 100644
--- a/python/ql/src/analysis/RatioOfDefinitions.ql
+++ b/python/ql/src/analysis/RatioOfDefinitions.ql
@@ -3,9 +3,10 @@
  */
 
 import python
+private import LegacyPointsTo
 import analysis.DefinitionTracking
 
-predicate want_to_have_definition(Expr e) {
+predicate want_to_have_definition(ExprWithPointsTo e) {
   /* not builtin object like len, tuple, etc. */
   not exists(Value builtin | e.pointsTo(builtin) and builtin.isBuiltin()) and
   (
diff --git a/python/ql/src/analysis/TypeInferenceFailure.ql b/python/ql/src/analysis/TypeInferenceFailure.ql
index 70c4e880879..5cfafee36b1 100644
--- a/python/ql/src/analysis/TypeInferenceFailure.ql
+++ b/python/ql/src/analysis/TypeInferenceFailure.ql
@@ -8,8 +8,9 @@
  */
 
 import python
+private import LegacyPointsTo
 
-from ControlFlowNode f, Object o
+from ControlFlowNodeWithPointsTo f, Object o
 where
   f.refersTo(o) and
   not f.refersTo(o, _, _)
diff --git a/python/ql/src/change-notes/2025-10-22-adjust-query-severity.md b/python/ql/src/change-notes/2025-10-22-adjust-query-severity.md
new file mode 100644
index 00000000000..bc314358a6f
--- /dev/null
+++ b/python/ql/src/change-notes/2025-10-22-adjust-query-severity.md
@@ -0,0 +1,4 @@
+---
+category: queryMetadata
+---
+* Reduced the `security-severity` score of the `py/overly-large-range` query from 5.0 to 4.0 to better reflect its impact.
\ No newline at end of file
diff --git a/python/ql/src/change-notes/released/1.6.3.md b/python/ql/src/change-notes/released/1.6.3.md
new file mode 100644
index 00000000000..a000ecf7025
--- /dev/null
+++ b/python/ql/src/change-notes/released/1.6.3.md
@@ -0,0 +1,3 @@
+## 1.6.3
+
+No user-facing changes.
diff --git a/python/ql/src/change-notes/released/1.6.4.md b/python/ql/src/change-notes/released/1.6.4.md
new file mode 100644
index 00000000000..e2f0bb39930
--- /dev/null
+++ b/python/ql/src/change-notes/released/1.6.4.md
@@ -0,0 +1,7 @@
+## 1.6.4
+
+### Minor Analysis Improvements
+
+* The `py/unexpected-raise-in-special-method` query has been modernized. It produces additional results in cases where the exception is 
+only raised conditionally. Its precision has been changed from `very-high` to `high`.
+* The queries `py/incomplete-ordering`, `py/inconsistent-equality`, and `py/equals-hash-mismatch` have been modernized; no longer relying on outdated libraries, improved documentation, and no longer producing alerts for problems specific to Python 2.
diff --git a/python/ql/src/change-notes/released/1.6.5.md b/python/ql/src/change-notes/released/1.6.5.md
new file mode 100644
index 00000000000..e9e53221424
--- /dev/null
+++ b/python/ql/src/change-notes/released/1.6.5.md
@@ -0,0 +1,5 @@
+## 1.6.5
+
+### Minor Analysis Improvements
+
+* The queries `py/missing-call-to-init`, `py/missing-calls-to-del`, `py/multiple-calls-to-init`, and `py/multiple-calls-to-del` queries have been modernized; no longer relying on outdated libraries, producing more precise results with more descriptive alert messages, and improved documentation.
diff --git a/python/ql/src/change-notes/released/1.6.6.md b/python/ql/src/change-notes/released/1.6.6.md
new file mode 100644
index 00000000000..e1b0e3c4955
--- /dev/null
+++ b/python/ql/src/change-notes/released/1.6.6.md
@@ -0,0 +1,7 @@
+## 1.6.6
+
+### Minor Analysis Improvements
+
+- The queries that check for unmatchable `$` and `^` in regular expressions did not account correctly for occurrences inside lookahead and lookbehind assertions. These occurrences are now handled correctly, eliminating this source of false positives.
+* The `py/inheritance/signature-mismatch` query has been modernized. It produces more precise results and more descriptive alert messages. 
+* The `py/inheritance/incorrect-overriding-signature` query has been deprecated. Its results have been consolidated into the `py/inheritance/signature-mismatch` query.
diff --git a/python/ql/src/change-notes/released/1.6.7.md b/python/ql/src/change-notes/released/1.6.7.md
new file mode 100644
index 00000000000..aba3f8d9ff7
--- /dev/null
+++ b/python/ql/src/change-notes/released/1.6.7.md
@@ -0,0 +1,3 @@
+## 1.6.7
+
+No user-facing changes.
diff --git a/python/ql/src/change-notes/released/1.6.8.md b/python/ql/src/change-notes/released/1.6.8.md
new file mode 100644
index 00000000000..d1b510e542a
--- /dev/null
+++ b/python/ql/src/change-notes/released/1.6.8.md
@@ -0,0 +1,5 @@
+## 1.6.8
+
+### Minor Analysis Improvements
+
+* The `py/insecure-cookie` query has been split into multiple queries; with `py/insecure-cookie` checking for cases in which `Secure` flag is not set, `py/client-exposed-cookie` checking for cases in which the `HttpOnly` flag is not set, and the `py/samesite-none` query checking for cases in which the `SameSite` attribute is set to `None`. These queries also now only alert for cases in which the cookie is detected to contain sensitive data.
diff --git a/python/ql/src/codeql-pack.release.yml b/python/ql/src/codeql-pack.release.yml
index 5f5beb68311..fbc11aa62b7 100644
--- a/python/ql/src/codeql-pack.release.yml
+++ b/python/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.6.2
+lastReleaseVersion: 1.6.8
diff --git a/python/ql/src/experimental/Security/CWE-022bis/TarSlipImprov.ql b/python/ql/src/experimental/Security/CWE-022bis/TarSlipImprov.ql
index 1727da1bcf5..42c0bc170fd 100755
--- a/python/ql/src/experimental/Security/CWE-022bis/TarSlipImprov.ql
+++ b/python/ql/src/experimental/Security/CWE-022bis/TarSlipImprov.ql
@@ -63,7 +63,7 @@ private module TarSlipImprovConfig implements DataFlow::ConfigSig {
       // For a call to `file.extractall` without `members` argument, `file` is considered a sink.
       exists(MethodCallNode call, AllTarfileOpens atfo |
         call = atfo.getReturn().getMember("extractall").getACall() and
-        not exists(Node arg | arg = call.getArgByName("members")) and
+        not exists(call.getArgByName("members")) and
         sink = call.getObject()
       )
       or
diff --git a/python/ql/src/experimental/Security/CWE-208/TimingAttackAgainstHash/PossibleTimingAttackAgainstHash.ql b/python/ql/src/experimental/Security/CWE-208/TimingAttackAgainstHash/PossibleTimingAttackAgainstHash.ql
index 82ba11c1d4b..c57373f4863 100644
--- a/python/ql/src/experimental/Security/CWE-208/TimingAttackAgainstHash/PossibleTimingAttackAgainstHash.ql
+++ b/python/ql/src/experimental/Security/CWE-208/TimingAttackAgainstHash/PossibleTimingAttackAgainstHash.ql
@@ -26,6 +26,8 @@ private module PossibleTimingAttackAgainstHashConfig implements DataFlow::Config
   predicate isSource(DataFlow::Node source) { source instanceof ProduceCryptoCall }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof NonConstantTimeComparisonSink }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
 }
 
 module PossibleTimingAttackAgainstHashFlow =
@@ -38,4 +40,4 @@ from
   PossibleTimingAttackAgainstHashFlow::PathNode sink
 where PossibleTimingAttackAgainstHashFlow::flowPath(source, sink)
 select sink.getNode(), source, sink, "Possible Timing attack against $@ validation.",
-  source.getNode().(ProduceCryptoCall).getResultType(), "message"
+  source.getNode(), source.getNode().(ProduceCryptoCall).getResultType() + " message"
diff --git a/python/ql/src/experimental/Security/CWE-208/TimingAttackAgainstHash/TimingAttackAgainstHash.ql b/python/ql/src/experimental/Security/CWE-208/TimingAttackAgainstHash/TimingAttackAgainstHash.ql
index e08f1dbb517..d97f6c619f9 100644
--- a/python/ql/src/experimental/Security/CWE-208/TimingAttackAgainstHash/TimingAttackAgainstHash.ql
+++ b/python/ql/src/experimental/Security/CWE-208/TimingAttackAgainstHash/TimingAttackAgainstHash.ql
@@ -25,6 +25,8 @@ private module TimingAttackAgainstHashConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { source instanceof ProduceCryptoCall }
 
   predicate isSink(DataFlow::Node sink) { sink instanceof NonConstantTimeComparisonSink }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
 }
 
 module TimingAttackAgainstHashFlow = TaintTracking::Global<TimingAttackAgainstHashConfig>;
@@ -35,5 +37,5 @@ from TimingAttackAgainstHashFlow::PathNode source, TimingAttackAgainstHashFlow::
 where
   TimingAttackAgainstHashFlow::flowPath(source, sink) and
   sink.getNode().(NonConstantTimeComparisonSink).includesUserInput()
-select sink.getNode(), source, sink, "Timing attack against $@ validation.",
-  source.getNode().(ProduceCryptoCall).getResultType(), "message"
+select sink.getNode(), source, sink, "Timing attack against $@ validation.", source.getNode(),
+  source.getNode().(ProduceCryptoCall).getResultType() + " message"
diff --git a/python/ql/src/experimental/Security/CWE-327/Azure/UnsafeUsageOfClientSideEncryptionVersion.ql b/python/ql/src/experimental/Security/CWE-327/Azure/UnsafeUsageOfClientSideEncryptionVersion.ql
index a93787c9d79..a0fadbff3f3 100644
--- a/python/ql/src/experimental/Security/CWE-327/Azure/UnsafeUsageOfClientSideEncryptionVersion.ql
+++ b/python/ql/src/experimental/Security/CWE-327/Azure/UnsafeUsageOfClientSideEncryptionVersion.ql
@@ -147,8 +147,6 @@ private module AzureBlobClientConfig implements DataFlow::StateConfigSig {
   }
 
   predicate observeDiffInformedIncrementalMode() { any() }
-
-  Location getASelectedSourceLocation(DataFlow::Node sink) { none() }
 }
 
 module AzureBlobClientFlow = DataFlow::GlobalWithState<AzureBlobClientConfig>;
diff --git a/python/ql/src/experimental/Security/CWE-346/CorsBypass.ql b/python/ql/src/experimental/Security/CWE-346/CorsBypass.ql
index 4bb8440c02c..01e661cb0bb 100644
--- a/python/ql/src/experimental/Security/CWE-346/CorsBypass.ql
+++ b/python/ql/src/experimental/Security/CWE-346/CorsBypass.ql
@@ -81,8 +81,6 @@ module CorsBypassConfig implements DataFlow::ConfigSig {
   }
 
   predicate observeDiffInformedIncrementalMode() { any() }
-
-  Location getASelectedSourceLocation(DataFlow::Node sink) { none() }
 }
 
 module CorsFlow = TaintTracking::Global<CorsBypassConfig>;
diff --git a/python/ql/src/experimental/Security/UnsafeUnpackQuery.qll b/python/ql/src/experimental/Security/UnsafeUnpackQuery.qll
index 79e50fbd36e..64da6b8d799 100644
--- a/python/ql/src/experimental/Security/UnsafeUnpackQuery.qll
+++ b/python/ql/src/experimental/Security/UnsafeUnpackQuery.qll
@@ -210,8 +210,6 @@ module UnsafeUnpackConfig implements DataFlow::ConfigSig {
   }
 
   predicate observeDiffInformedIncrementalMode() { any() }
-
-  Location getASelectedSourceLocation(DataFlow::Node sink) { none() }
 }
 
 /** Global taint-tracking for detecting "UnsafeUnpacking" vulnerabilities. */
diff --git a/python/ql/src/experimental/semmle/python/security/LdapInsecureAuth.qll b/python/ql/src/experimental/semmle/python/security/LdapInsecureAuth.qll
index 431f9f9ab73..630543e6f79 100644
--- a/python/ql/src/experimental/semmle/python/security/LdapInsecureAuth.qll
+++ b/python/ql/src/experimental/semmle/python/security/LdapInsecureAuth.qll
@@ -103,8 +103,6 @@ private module LdapInsecureAuthConfig implements DataFlow::ConfigSig {
   }
 
   predicate observeDiffInformedIncrementalMode() { any() }
-
-  Location getASelectedSourceLocation(DataFlow::Node sink) { none() }
 }
 
 /** Global taint-tracking for detecting "LDAP insecure authentications" vulnerabilities. */
diff --git a/python/ql/src/meta/ClassHierarchy/process-builtin-exceptions.py b/python/ql/src/meta/ClassHierarchy/process-builtin-exceptions.py
new file mode 100644
index 00000000000..fc0266a5b99
--- /dev/null
+++ b/python/ql/src/meta/ClassHierarchy/process-builtin-exceptions.py
@@ -0,0 +1,31 @@
+from shared_subclass_functions import wrap_in_template
+import sys
+import yaml
+from pathlib import Path
+
+py_version = sys.version.split()[0]
+VERSION = f"process-builtin-exceptions 0.0.1; Python {py_version}"
+
+builtins_model_path = Path(__file__).parent.parent.parent.parent / "lib/semmle/python/frameworks/builtins.model.yml"
+
+def write_data(data, path: Path):
+    f = path.open("w+")
+    f.write(f"# {VERSION}\n")
+    yaml.dump(data, indent=2, stream=f, Dumper=yaml.CDumper)
+
+builtin_names = dir(__builtins__)
+builtin_dict = {x: getattr(__builtins__,x) for x in builtin_names}
+
+
+builtin_exceptions = {v for v in builtin_dict.values() if type(v) is type and issubclass(v, BaseException)}
+
+data = []
+for sub in builtin_exceptions:
+    for base in sub.__mro__:
+        if issubclass(base, BaseException):
+            basename = base.__name__ 
+            subname = sub.__name__ 
+            row = [f"builtins.{basename}~Subclass", f"builtins.{subname}", ""]
+            data.append(row)
+            
+write_data(wrap_in_template(data), builtins_model_path)
diff --git a/python/ql/src/qlpack.yml b/python/ql/src/qlpack.yml
index 0605e37a7cc..7280bbcb67c 100644
--- a/python/ql/src/qlpack.yml
+++ b/python/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/python-queries
-version: 1.6.3-dev
+version: 1.6.9-dev
 groups:
   - python
   - queries
diff --git a/python/ql/test/2/library-tests/PointsTo/class_properties/ClassValues.ql b/python/ql/test/2/library-tests/PointsTo/class_properties/ClassValues.ql
index 3281b8d26e6..382312a4b5c 100644
--- a/python/ql/test/2/library-tests/PointsTo/class_properties/ClassValues.ql
+++ b/python/ql/test/2/library-tests/PointsTo/class_properties/ClassValues.ql
@@ -1,10 +1,11 @@
 import python
+private import LegacyPointsTo
 
 from ClassValue cls, string res
 where
   exists(CallNode call |
     call.getFunction().(NameNode).getId() = "test" and
-    call.getAnArg().pointsTo(cls)
+    call.getAnArg().(ControlFlowNodeWithPointsTo).pointsTo(cls)
   ) and
   (
     cls.isSequence() and
diff --git a/python/ql/test/2/library-tests/PointsTo/imports/Runtime.ql b/python/ql/test/2/library-tests/PointsTo/imports/Runtime.ql
index 7a46cc8cad1..aad100c14d5 100644
--- a/python/ql/test/2/library-tests/PointsTo/imports/Runtime.ql
+++ b/python/ql/test/2/library-tests/PointsTo/imports/Runtime.ql
@@ -1,6 +1,7 @@
 import python
+private import LegacyPointsTo
 
-from int line, ControlFlowNode f, Object o, ControlFlowNode orig
+from int line, ControlFlowNodeWithPointsTo f, Object o, ControlFlowNode orig
 where
   not f.getLocation().getFile().inStdlib() and
   f.refersTo(o, orig) and
diff --git a/python/ql/test/2/library-tests/PointsTo/imports2/Runtime.ql b/python/ql/test/2/library-tests/PointsTo/imports2/Runtime.ql
index f694bc64cf0..19add3600a0 100644
--- a/python/ql/test/2/library-tests/PointsTo/imports2/Runtime.ql
+++ b/python/ql/test/2/library-tests/PointsTo/imports2/Runtime.ql
@@ -1,6 +1,7 @@
 import python
+private import LegacyPointsTo
 
-from int line, ControlFlowNode f, Object o, ControlFlowNode orig
+from int line, ControlFlowNodeWithPointsTo f, Object o, ControlFlowNode orig
 where
   not f.getLocation().getFile().inStdlib() and
   f.refersTo(o, orig) and
diff --git a/python/ql/test/2/library-tests/PointsTo/imports2/RuntimeWithType.ql b/python/ql/test/2/library-tests/PointsTo/imports2/RuntimeWithType.ql
index 99a5f7b8163..09c330596c9 100644
--- a/python/ql/test/2/library-tests/PointsTo/imports2/RuntimeWithType.ql
+++ b/python/ql/test/2/library-tests/PointsTo/imports2/RuntimeWithType.ql
@@ -1,6 +1,7 @@
 import python
+private import LegacyPointsTo
 
-from int line, ControlFlowNode f, Object o, ClassObject cls, ControlFlowNode orig
+from int line, ControlFlowNodeWithPointsTo f, Object o, ClassObject cls, ControlFlowNode orig
 where
   not f.getLocation().getFile().inStdlib() and
   f.refersTo(o, cls, orig) and
diff --git a/python/ql/test/2/library-tests/PointsTo/origin_uniqueness/Origin.ql b/python/ql/test/2/library-tests/PointsTo/origin_uniqueness/Origin.ql
index 4c7a4fff358..3f923bc63fa 100644
--- a/python/ql/test/2/library-tests/PointsTo/origin_uniqueness/Origin.ql
+++ b/python/ql/test/2/library-tests/PointsTo/origin_uniqueness/Origin.ql
@@ -1,8 +1,9 @@
 import python
+private import LegacyPointsTo
 
 string short_loc(Location l) { result = l.getFile().getShortName() + ":" + l.getStartLine() }
 
-from ControlFlowNode use, Object obj, ControlFlowNode orig, int line
+from ControlFlowNodeWithPointsTo use, Object obj, ControlFlowNode orig, int line
 where
   use.refersTo(obj, orig) and
   use.getLocation().getFile().getShortName() = "test.py" and
diff --git a/python/ql/test/2/library-tests/six/pointsto.ql b/python/ql/test/2/library-tests/six/pointsto.ql
index cca7eeede10..66a9d449a76 100644
--- a/python/ql/test/2/library-tests/six/pointsto.ql
+++ b/python/ql/test/2/library-tests/six/pointsto.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 string longname(Expr e) {
   result = e.(Name).getId()
@@ -6,6 +7,6 @@ string longname(Expr e) {
   exists(Attribute a | a = e | result = longname(a.getObject()) + "." + a.getName())
 }
 
-from Expr e, Value v
+from ExprWithPointsTo e, Value v
 where e.pointsTo(v) and e.getLocation().getFile().getShortName() = "test.py"
 select longname(e), v.toString()
diff --git a/python/ql/test/2/query-tests/Classes/equals-hash/EqualsOrHash.expected b/python/ql/test/2/query-tests/Classes/equals-hash/EqualsOrHash.expected
deleted file mode 100644
index 916a9bb4454..00000000000
--- a/python/ql/test/2/query-tests/Classes/equals-hash/EqualsOrHash.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| equals_hash.py:8:5:8:28 | Function Eq.__eq__ | Class $@ implements __eq__ but does not define __hash__. | equals_hash.py:3:1:3:17 | class Eq | Eq |
-| equals_hash.py:24:5:24:23 | Function Hash.__hash__ | Class $@ implements __hash__ but does not define __eq__ or __cmp__. | equals_hash.py:19:1:19:19 | class Hash | Hash |
diff --git a/python/ql/test/2/query-tests/Classes/equals-hash/EqualsOrHash.qlref b/python/ql/test/2/query-tests/Classes/equals-hash/EqualsOrHash.qlref
deleted file mode 100644
index 7eb0f07e51c..00000000000
--- a/python/ql/test/2/query-tests/Classes/equals-hash/EqualsOrHash.qlref
+++ /dev/null
@@ -1 +0,0 @@
-Classes/EqualsOrHash.ql
\ No newline at end of file
diff --git a/python/ql/test/2/query-tests/Classes/equals-hash/EqualsOrNotEquals.expected b/python/ql/test/2/query-tests/Classes/equals-hash/EqualsOrNotEquals.expected
deleted file mode 100644
index 04e395c668b..00000000000
--- a/python/ql/test/2/query-tests/Classes/equals-hash/EqualsOrNotEquals.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| equals_hash.py:8:5:8:28 | Function Eq.__eq__ | Class $@ implements __eq__ but does not implement __ne__. | equals_hash.py:3:1:3:17 | class Eq | Eq |
-| equals_hash.py:16:5:16:28 | Function Ne.__ne__ | Class $@ implements __ne__ but does not implement __eq__. | equals_hash.py:11:1:11:17 | class Ne | Ne |
diff --git a/python/ql/test/2/query-tests/Classes/equals-hash/EqualsOrNotEquals.qlref b/python/ql/test/2/query-tests/Classes/equals-hash/EqualsOrNotEquals.qlref
deleted file mode 100644
index 163a9f3b667..00000000000
--- a/python/ql/test/2/query-tests/Classes/equals-hash/EqualsOrNotEquals.qlref
+++ /dev/null
@@ -1 +0,0 @@
-Classes/EqualsOrNotEquals.ql
\ No newline at end of file
diff --git a/python/ql/test/2/query-tests/Classes/equals-hash/equals_hash.py b/python/ql/test/2/query-tests/Classes/equals-hash/equals_hash.py
deleted file mode 100644
index 447250a5375..00000000000
--- a/python/ql/test/2/query-tests/Classes/equals-hash/equals_hash.py
+++ /dev/null
@@ -1,63 +0,0 @@
-#Equals and hash
-
-class Eq(object):
-
-    def __init__(self, data):
-        self.data = data
-
-    def __eq__(self, other):
-        return self.data == other.data
-
-class Ne(object):
-
-    def __init__(self, data):
-        self.data = data
-
-    def __ne__(self, other):
-        return self.data != other.data
-
-class Hash(object):
-
-    def __init__(self, data):
-        self.data = data
-
-    def __hash__(self):
-        return hash(self.data)
-    
-class Unhashable1(object):
-    
-    __hash__ = None
-    
-
-class EqOK1(Unhashable1):
-    
-    def __eq__(self, other):
-        return False
-    
-    def __ne__(self, other):
-        return True
-    
-class Unhashable2(object):
-    
-    #Not the idiomatic way of doing it, but not uncommon either
-    def __hash__(self):
-        raise TypeError("unhashable object")
-
-
-class EqOK2(Unhashable2):
-
-    def __eq__(self, other):
-        return False
-
-    def __ne__(self, other):
-        return True
-
-class ReflectiveNotEquals(object):
-
-    def __ne__(self, other):
-        return not self == other
-
-class EqOK3(ReflectiveNotEquals, Unhashable1):
-
-    def __eq__(self, other):
-        return self.data == other.data
diff --git a/python/ql/test/3/library-tests/PointsTo/attributes/Test.ql b/python/ql/test/3/library-tests/PointsTo/attributes/Test.ql
index cc191d7c7d8..ad7b74f8c58 100644
--- a/python/ql/test/3/library-tests/PointsTo/attributes/Test.ql
+++ b/python/ql/test/3/library-tests/PointsTo/attributes/Test.ql
@@ -1,5 +1,6 @@
 import python
+private import LegacyPointsTo
 
-from ControlFlowNode f, Object o, ControlFlowNode x
+from ControlFlowNodeWithPointsTo f, Object o, ControlFlowNode x
 where f.refersTo(o, x)
 select f.getLocation().getStartLine(), f.toString(), o.toString(), x.getLocation().getStartLine()
diff --git a/python/ql/test/3/library-tests/PointsTo/attributes/TestWithType.ql b/python/ql/test/3/library-tests/PointsTo/attributes/TestWithType.ql
index 2b4b8a8c70c..dc19fefb4ce 100644
--- a/python/ql/test/3/library-tests/PointsTo/attributes/TestWithType.ql
+++ b/python/ql/test/3/library-tests/PointsTo/attributes/TestWithType.ql
@@ -1,6 +1,7 @@
 import python
+private import LegacyPointsTo
 
-from ControlFlowNode f, Object o, ClassObject c, ControlFlowNode x
+from ControlFlowNodeWithPointsTo f, Object o, ClassObject c, ControlFlowNode x
 where f.refersTo(o, c, x)
 select f.getLocation().getStartLine(), f.toString(), o.toString(), c.toString(),
   x.getLocation().getStartLine()
diff --git a/python/ql/test/3/library-tests/PointsTo/class_properties/ClassValues.ql b/python/ql/test/3/library-tests/PointsTo/class_properties/ClassValues.ql
index 3281b8d26e6..382312a4b5c 100644
--- a/python/ql/test/3/library-tests/PointsTo/class_properties/ClassValues.ql
+++ b/python/ql/test/3/library-tests/PointsTo/class_properties/ClassValues.ql
@@ -1,10 +1,11 @@
 import python
+private import LegacyPointsTo
 
 from ClassValue cls, string res
 where
   exists(CallNode call |
     call.getFunction().(NameNode).getId() = "test" and
-    call.getAnArg().pointsTo(cls)
+    call.getAnArg().(ControlFlowNodeWithPointsTo).pointsTo(cls)
   ) and
   (
     cls.isSequence() and
diff --git a/python/ql/test/3/library-tests/PointsTo/imports/Runtime.ql b/python/ql/test/3/library-tests/PointsTo/imports/Runtime.ql
index f694bc64cf0..19add3600a0 100644
--- a/python/ql/test/3/library-tests/PointsTo/imports/Runtime.ql
+++ b/python/ql/test/3/library-tests/PointsTo/imports/Runtime.ql
@@ -1,6 +1,7 @@
 import python
+private import LegacyPointsTo
 
-from int line, ControlFlowNode f, Object o, ControlFlowNode orig
+from int line, ControlFlowNodeWithPointsTo f, Object o, ControlFlowNode orig
 where
   not f.getLocation().getFile().inStdlib() and
   f.refersTo(o, orig) and
diff --git a/python/ql/test/3/library-tests/PointsTo/imports/RuntimeWithType.ql b/python/ql/test/3/library-tests/PointsTo/imports/RuntimeWithType.ql
index 99a5f7b8163..09c330596c9 100644
--- a/python/ql/test/3/library-tests/PointsTo/imports/RuntimeWithType.ql
+++ b/python/ql/test/3/library-tests/PointsTo/imports/RuntimeWithType.ql
@@ -1,6 +1,7 @@
 import python
+private import LegacyPointsTo
 
-from int line, ControlFlowNode f, Object o, ClassObject cls, ControlFlowNode orig
+from int line, ControlFlowNodeWithPointsTo f, Object o, ClassObject cls, ControlFlowNode orig
 where
   not f.getLocation().getFile().inStdlib() and
   f.refersTo(o, cls, orig) and
diff --git a/python/ql/test/3/library-tests/PointsTo/typehints/Values.ql b/python/ql/test/3/library-tests/PointsTo/typehints/Values.ql
index 192468a2248..be451d6f596 100644
--- a/python/ql/test/3/library-tests/PointsTo/typehints/Values.ql
+++ b/python/ql/test/3/library-tests/PointsTo/typehints/Values.ql
@@ -1,6 +1,7 @@
 import python
+private import LegacyPointsTo
 
-from ControlFlowNode f, Context ctx, Value v, ControlFlowNode origin
+from ControlFlowNodeWithPointsTo f, Context ctx, Value v, ControlFlowNode origin
 where
   f.pointsTo(ctx, v, origin) and
   f.getLocation().getFile().getBaseName() = "test.py"
diff --git a/python/ql/test/3/library-tests/six/pointsto.ql b/python/ql/test/3/library-tests/six/pointsto.ql
index cca7eeede10..66a9d449a76 100644
--- a/python/ql/test/3/library-tests/six/pointsto.ql
+++ b/python/ql/test/3/library-tests/six/pointsto.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
 string longname(Expr e) {
   result = e.(Name).getId()
@@ -6,6 +7,6 @@ string longname(Expr e) {
   exists(Attribute a | a = e | result = longname(a.getObject()) + "." + a.getName())
 }
 
-from Expr e, Value v
+from ExprWithPointsTo e, Value v
 where e.pointsTo(v) and e.getLocation().getFile().getShortName() = "test.py"
 select longname(e), v.toString()
diff --git a/python/ql/test/3/query-tests/Classes/equals-hash/EqualsOrHash.expected b/python/ql/test/3/query-tests/Classes/equals-hash/EqualsOrHash.expected
deleted file mode 100644
index 87cf5d1e464..00000000000
--- a/python/ql/test/3/query-tests/Classes/equals-hash/EqualsOrHash.expected
+++ /dev/null
@@ -1 +0,0 @@
-| equals_hash.py:24:5:24:23 | Function Hash.__hash__ | Class $@ implements __hash__ but does not define __eq__. | equals_hash.py:19:1:19:19 | class Hash | Hash |
diff --git a/python/ql/test/3/query-tests/Classes/equals-hash/EqualsOrHash.qlref b/python/ql/test/3/query-tests/Classes/equals-hash/EqualsOrHash.qlref
deleted file mode 100644
index 7eb0f07e51c..00000000000
--- a/python/ql/test/3/query-tests/Classes/equals-hash/EqualsOrHash.qlref
+++ /dev/null
@@ -1 +0,0 @@
-Classes/EqualsOrHash.ql
\ No newline at end of file
diff --git a/python/ql/test/3/query-tests/Classes/equals-hash/equals_hash.py b/python/ql/test/3/query-tests/Classes/equals-hash/equals_hash.py
deleted file mode 100644
index d5a58d0b78c..00000000000
--- a/python/ql/test/3/query-tests/Classes/equals-hash/equals_hash.py
+++ /dev/null
@@ -1,63 +0,0 @@
-#Equals and hash
-
-class Eq(object):
-
-    def __init__(self, data):
-        self.data = data
-
-    def __eq__(self, other):
-        return self.data == other.data
-
-class Ne(object):
-
-    def __init__(self, data):
-        self.data = data
-
-    def __ne__(self, other):
-        return self.data != other.data
-
-class Hash(object):
-
-    def __init__(self, data):
-        self.data = data
-
-    def __hash__(self):
-        return hash(self.data)
-    
-class Unhashable1(object):
-    
-    __hash__ = None
-    
-
-class EqOK1(Unhashable1):
-    
-    def __eq__(self, other):
-        return False
-    
-    def __ne__(self, other):
-        return True
-    
-class Unhashable2(object):
-
-    #Not the idiomatic way of doing it, but not uncommon either
-    def __hash__(self):
-        raise TypeError("unhashable object")
-
-
-class EqOK2(Unhashable2):
-
-    def __eq__(self, other):
-        return False
-
-    def __ne__(self, other):
-        return True
-
-class ReflectiveNotEquals(object):
-
-    def __ne__(self, other):
-        return not self == other
-
-class EqOK3(ReflectiveNotEquals, Unhashable1):
-
-    def __eq__(self, other):
-        return self.data == other.data
diff --git a/python/ql/test/3/query-tests/Classes/equals-ne/EqualsOrNotEquals.expected b/python/ql/test/3/query-tests/Classes/equals-ne/EqualsOrNotEquals.expected
deleted file mode 100644
index 7e9c9458120..00000000000
--- a/python/ql/test/3/query-tests/Classes/equals-ne/EqualsOrNotEquals.expected
+++ /dev/null
@@ -1 +0,0 @@
-| test.py:9:5:9:28 | Function NotOK2.__ne__ | Class $@ implements __ne__ but does not implement __eq__. | test.py:7:1:7:13 | class NotOK2 | NotOK2 |
diff --git a/python/ql/test/3/query-tests/Classes/equals-ne/EqualsOrNotEquals.qlref b/python/ql/test/3/query-tests/Classes/equals-ne/EqualsOrNotEquals.qlref
deleted file mode 100644
index 163a9f3b667..00000000000
--- a/python/ql/test/3/query-tests/Classes/equals-ne/EqualsOrNotEquals.qlref
+++ /dev/null
@@ -1 +0,0 @@
-Classes/EqualsOrNotEquals.ql
\ No newline at end of file
diff --git a/python/ql/test/3/query-tests/Classes/equals-ne/test.py b/python/ql/test/3/query-tests/Classes/equals-ne/test.py
deleted file mode 100644
index 15097820bf4..00000000000
--- a/python/ql/test/3/query-tests/Classes/equals-ne/test.py
+++ /dev/null
@@ -1,10 +0,0 @@
-
-class OK:
-
-    def __eq__(self, other):
-        return False
-
-class NotOK2:
-
-    def __ne__(self, other):
-        return True
diff --git a/python/ql/test/experimental/query-tests/Security/CWE-208/TimingAttackAgainstHash/PossibleTimingAttackAgainstHash.expected b/python/ql/test/experimental/query-tests/Security/CWE-208/TimingAttackAgainstHash/PossibleTimingAttackAgainstHash.expected
index 8846e908798..1577182b2dc 100644
--- a/python/ql/test/experimental/query-tests/Security/CWE-208/TimingAttackAgainstHash/PossibleTimingAttackAgainstHash.expected
+++ b/python/ql/test/experimental/query-tests/Security/CWE-208/TimingAttackAgainstHash/PossibleTimingAttackAgainstHash.expected
@@ -10,5 +10,5 @@ nodes
 | TimingAttackAgainstHash.py:37:19:37:48 | ControlFlowNode for sign() | semmle.label | ControlFlowNode for sign() |
 subpaths
 #select
-| TimingAttackAgainstHash.py:27:24:27:32 | ControlFlowNode for signature | TimingAttackAgainstHash.py:26:17:26:41 | ControlFlowNode for Attribute() | TimingAttackAgainstHash.py:27:24:27:32 | ControlFlowNode for signature | Possible Timing attack against $@ validation. | signature | message |
-| TimingAttackAgainstHash.py:37:19:37:48 | ControlFlowNode for sign() | TimingAttackAgainstHash.py:30:12:30:47 | ControlFlowNode for Attribute() | TimingAttackAgainstHash.py:37:19:37:48 | ControlFlowNode for sign() | Possible Timing attack against $@ validation. | MAC | message |
+| TimingAttackAgainstHash.py:27:24:27:32 | ControlFlowNode for signature | TimingAttackAgainstHash.py:26:17:26:41 | ControlFlowNode for Attribute() | TimingAttackAgainstHash.py:27:24:27:32 | ControlFlowNode for signature | Possible Timing attack against $@ validation. | TimingAttackAgainstHash.py:26:17:26:41 | ControlFlowNode for Attribute() | signature message |
+| TimingAttackAgainstHash.py:37:19:37:48 | ControlFlowNode for sign() | TimingAttackAgainstHash.py:30:12:30:47 | ControlFlowNode for Attribute() | TimingAttackAgainstHash.py:37:19:37:48 | ControlFlowNode for sign() | Possible Timing attack against $@ validation. | TimingAttackAgainstHash.py:30:12:30:47 | ControlFlowNode for Attribute() | MAC message |
diff --git a/python/ql/test/experimental/query-tests/Security/CWE-208/TimingAttackAgainstHash/TimingAttackAgainstHash.expected b/python/ql/test/experimental/query-tests/Security/CWE-208/TimingAttackAgainstHash/TimingAttackAgainstHash.expected
new file mode 100644
index 00000000000..0b7b2de8ddb
--- /dev/null
+++ b/python/ql/test/experimental/query-tests/Security/CWE-208/TimingAttackAgainstHash/TimingAttackAgainstHash.expected
@@ -0,0 +1,12 @@
+edges
+| TimingAttackAgainstHash.py:26:5:26:13 | ControlFlowNode for signature | TimingAttackAgainstHash.py:27:24:27:32 | ControlFlowNode for signature | provenance |  |
+| TimingAttackAgainstHash.py:26:17:26:41 | ControlFlowNode for Attribute() | TimingAttackAgainstHash.py:26:5:26:13 | ControlFlowNode for signature | provenance |  |
+| TimingAttackAgainstHash.py:30:12:30:47 | ControlFlowNode for Attribute() | TimingAttackAgainstHash.py:37:19:37:48 | ControlFlowNode for sign() | provenance |  |
+nodes
+| TimingAttackAgainstHash.py:26:5:26:13 | ControlFlowNode for signature | semmle.label | ControlFlowNode for signature |
+| TimingAttackAgainstHash.py:26:17:26:41 | ControlFlowNode for Attribute() | semmle.label | ControlFlowNode for Attribute() |
+| TimingAttackAgainstHash.py:27:24:27:32 | ControlFlowNode for signature | semmle.label | ControlFlowNode for signature |
+| TimingAttackAgainstHash.py:30:12:30:47 | ControlFlowNode for Attribute() | semmle.label | ControlFlowNode for Attribute() |
+| TimingAttackAgainstHash.py:37:19:37:48 | ControlFlowNode for sign() | semmle.label | ControlFlowNode for sign() |
+subpaths
+#select
diff --git a/python/ql/test/experimental/query-tests/Security/CWE-208/TimingAttackAgainstHash/TimingAttackAgainstHash.qlref b/python/ql/test/experimental/query-tests/Security/CWE-208/TimingAttackAgainstHash/TimingAttackAgainstHash.qlref
new file mode 100644
index 00000000000..50c9d84b1f9
--- /dev/null
+++ b/python/ql/test/experimental/query-tests/Security/CWE-208/TimingAttackAgainstHash/TimingAttackAgainstHash.qlref
@@ -0,0 +1 @@
+experimental/Security/CWE-208/TimingAttackAgainstHash/TimingAttackAgainstHash.ql
diff --git a/python/ql/test/extractor-tests/exports/Test.ql b/python/ql/test/extractor-tests/exports/Test.ql
index 50bc0a4ab56..b04a904197c 100644
--- a/python/ql/test/extractor-tests/exports/Test.ql
+++ b/python/ql/test/extractor-tests/exports/Test.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
-from Module m
+from ModuleWithPointsTo m
 select m.toString(), m.getAnExport().toString()
diff --git a/python/ql/test/extractor-tests/overlay/basic-full-eval/greeting.py b/python/ql/test/extractor-tests/overlay/basic-full-eval/greeting.py
new file mode 100644
index 00000000000..8bff5db5bbf
--- /dev/null
+++ b/python/ql/test/extractor-tests/overlay/basic-full-eval/greeting.py
@@ -0,0 +1,5 @@
+from new import *
+from lib import *
+
+def get_greeting():
+    return combine("Goodbye", get_new_target())
diff --git a/python/ql/test/extractor-tests/overlay/basic-full-eval/hello.py b/python/ql/test/extractor-tests/overlay/basic-full-eval/hello.py
new file mode 100644
index 00000000000..2744a6c2978
--- /dev/null
+++ b/python/ql/test/extractor-tests/overlay/basic-full-eval/hello.py
@@ -0,0 +1,4 @@
+from greeting import *
+
+if __name__ == "__main__":
+    print(get_greeting())
diff --git a/python/ql/test/extractor-tests/overlay/basic-full-eval/lib/__init__.py b/python/ql/test/extractor-tests/overlay/basic-full-eval/lib/__init__.py
new file mode 100644
index 00000000000..b3587542d9b
--- /dev/null
+++ b/python/ql/test/extractor-tests/overlay/basic-full-eval/lib/__init__.py
@@ -0,0 +1 @@
+def combine(a, b): return f"{a}, {b}!"
diff --git a/python/ql/test/extractor-tests/overlay/basic-full-eval/new.py b/python/ql/test/extractor-tests/overlay/basic-full-eval/new.py
new file mode 100644
index 00000000000..25722f63b07
--- /dev/null
+++ b/python/ql/test/extractor-tests/overlay/basic-full-eval/new.py
@@ -0,0 +1,2 @@
+def get_new_target():
+    return "世界"
diff --git a/python/ql/test/extractor-tests/overlay/basic-full-eval/options b/python/ql/test/extractor-tests/overlay/basic-full-eval/options
new file mode 100644
index 00000000000..4f6e4043862
--- /dev/null
+++ b/python/ql/test/extractor-tests/overlay/basic-full-eval/options
@@ -0,0 +1 @@
+semmle-extractor-options: -R . -m hello.py --filter exclude:**/*.testproj/**
diff --git a/python/ql/test/extractor-tests/overlay/basic-full-eval/test.expected b/python/ql/test/extractor-tests/overlay/basic-full-eval/test.expected
new file mode 100644
index 00000000000..523e2eb8883
--- /dev/null
+++ b/python/ql/test/extractor-tests/overlay/basic-full-eval/test.expected
@@ -0,0 +1,152 @@
+testStringLiterals
+| greeting.py:5:20:5:28 | StringLiteral | Goodbye |
+| hello.py:3:16:3:25 | StringLiteral | __main__ |
+| lib/__init__.py:1:27:1:29 | StringLiteral |  |
+| lib/__init__.py:1:31:1:34 | StringLiteral | ,  |
+| lib/__init__.py:1:36:1:38 | StringLiteral | ! |
+| new.py:2:12:2:15 | StringLiteral | \u4e16\u754c |
+testModules
+| greeting.py:0:0:0:0 | Module greeting |
+| hello.py:0:0:0:0 | Module hello |
+| lib/__init__.py:0:0:0:0 | Module lib.__init__ |
+| lib:0:0:0:0 | Package lib |
+| new.py:0:0:0:0 | Module new |
+testFunctions
+| greeting.py:4:1:4:19 | Function get_greeting |
+| lib/__init__.py:1:1:1:18 | Function combine |
+| new.py:1:1:1:21 | Function get_new_target |
+testClasses
+testLocations
+| greeting.py:0:0:0:0 | greeting.py:0 |
+| greeting.py:1:1:1:17 | greeting.py:1 |
+| greeting.py:1:6:1:8 | greeting.py:1 |
+| greeting.py:2:1:2:17 | greeting.py:2 |
+| greeting.py:2:6:2:8 | greeting.py:2 |
+| greeting.py:4:1:4:19 | greeting.py:4 |
+| greeting.py:4:1:4:19 | greeting.py:4 |
+| greeting.py:4:1:4:19 | greeting.py:4 |
+| greeting.py:4:5:4:16 | greeting.py:4 |
+| greeting.py:5:5:5:47 | greeting.py:5 |
+| greeting.py:5:12:5:18 | greeting.py:5 |
+| greeting.py:5:12:5:47 | greeting.py:5 |
+| greeting.py:5:20:5:28 | greeting.py:5 |
+| greeting.py:5:31:5:44 | greeting.py:5 |
+| greeting.py:5:31:5:46 | greeting.py:5 |
+| hello.py:0:0:0:0 | hello.py:0 |
+| hello.py:1:1:1:22 | hello.py:1 |
+| hello.py:1:6:1:13 | hello.py:1 |
+| hello.py:3:1:3:26 | hello.py:3 |
+| hello.py:3:4:3:11 | hello.py:3 |
+| hello.py:3:4:3:25 | hello.py:3 |
+| hello.py:3:16:3:25 | hello.py:3 |
+| hello.py:4:5:4:9 | hello.py:4 |
+| hello.py:4:5:4:25 | hello.py:4 |
+| hello.py:4:5:4:25 | hello.py:4 |
+| hello.py:4:11:4:22 | hello.py:4 |
+| hello.py:4:11:4:24 | hello.py:4 |
+| lib/__init__.py:0:0:0:0 | lib/__init__.py:0 |
+| lib/__init__.py:1:1:1:18 | lib/__init__.py:1 |
+| lib/__init__.py:1:1:1:18 | lib/__init__.py:1 |
+| lib/__init__.py:1:1:1:18 | lib/__init__.py:1 |
+| lib/__init__.py:1:5:1:11 | lib/__init__.py:1 |
+| lib/__init__.py:1:13:1:13 | lib/__init__.py:1 |
+| lib/__init__.py:1:16:1:16 | lib/__init__.py:1 |
+| lib/__init__.py:1:20:1:38 | lib/__init__.py:1 |
+| lib/__init__.py:1:27:1:29 | lib/__init__.py:1 |
+| lib/__init__.py:1:27:1:38 | lib/__init__.py:1 |
+| lib/__init__.py:1:30:1:30 | lib/__init__.py:1 |
+| lib/__init__.py:1:31:1:34 | lib/__init__.py:1 |
+| lib/__init__.py:1:35:1:35 | lib/__init__.py:1 |
+| lib/__init__.py:1:36:1:38 | lib/__init__.py:1 |
+| lib:0:0:0:0 | lib:0 |
+| new.py:0:0:0:0 | new.py:0 |
+| new.py:1:1:1:21 | new.py:1 |
+| new.py:1:1:1:21 | new.py:1 |
+| new.py:1:1:1:21 | new.py:1 |
+| new.py:1:5:1:18 | new.py:1 |
+| new.py:2:5:2:15 | new.py:2 |
+| new.py:2:12:2:15 | new.py:2 |
+testFiles
+| greeting.py:0:0:0:0 | greeting.py |
+| hello.py:0:0:0:0 | hello.py |
+| lib/__init__.py:0:0:0:0 | lib/__init__.py |
+| new.py:0:0:0:0 | new.py |
+testCfgNodes
+| greeting.py:0:0:0:0 | Entry node for Module greeting |
+| greeting.py:0:0:0:0 | Exit node for Module greeting |
+| greeting.py:1:1:1:17 | ControlFlowNode for from new import * |
+| greeting.py:1:6:1:8 | ControlFlowNode for ImportExpr |
+| greeting.py:2:1:2:17 | ControlFlowNode for from lib import * |
+| greeting.py:2:6:2:8 | ControlFlowNode for ImportExpr |
+| greeting.py:4:1:4:19 | ControlFlowNode for FunctionExpr |
+| greeting.py:4:1:4:19 | Entry node for Function get_greeting |
+| greeting.py:4:1:4:19 | Exit node for Function get_greeting |
+| greeting.py:4:5:4:16 | ControlFlowNode for get_greeting |
+| greeting.py:5:5:5:47 | ControlFlowNode for Return |
+| greeting.py:5:12:5:18 | ControlFlowNode for combine |
+| greeting.py:5:12:5:47 | ControlFlowNode for combine() |
+| greeting.py:5:20:5:28 | ControlFlowNode for StringLiteral |
+| greeting.py:5:31:5:44 | ControlFlowNode for get_new_target |
+| greeting.py:5:31:5:46 | ControlFlowNode for get_new_target() |
+| hello.py:0:0:0:0 | Entry node for Module hello |
+| hello.py:0:0:0:0 | Exit node for Module hello |
+| hello.py:1:1:1:22 | ControlFlowNode for from greeting import * |
+| hello.py:1:6:1:13 | ControlFlowNode for ImportExpr |
+| hello.py:3:4:3:11 | ControlFlowNode for __name__ |
+| hello.py:3:4:3:25 | ControlFlowNode for Compare |
+| hello.py:3:16:3:25 | ControlFlowNode for StringLiteral |
+| hello.py:4:5:4:9 | ControlFlowNode for print |
+| hello.py:4:5:4:25 | ControlFlowNode for print() |
+| hello.py:4:11:4:22 | ControlFlowNode for get_greeting |
+| hello.py:4:11:4:24 | ControlFlowNode for get_greeting() |
+| lib/__init__.py:0:0:0:0 | Entry node for Module lib.__init__ |
+| lib/__init__.py:0:0:0:0 | Exit node for Module lib.__init__ |
+| lib/__init__.py:1:1:1:18 | ControlFlowNode for FunctionExpr |
+| lib/__init__.py:1:1:1:18 | Entry node for Function combine |
+| lib/__init__.py:1:1:1:18 | Exit node for Function combine |
+| lib/__init__.py:1:5:1:11 | ControlFlowNode for combine |
+| lib/__init__.py:1:13:1:13 | ControlFlowNode for a |
+| lib/__init__.py:1:16:1:16 | ControlFlowNode for b |
+| lib/__init__.py:1:20:1:38 | ControlFlowNode for Return |
+| lib/__init__.py:1:27:1:29 | ControlFlowNode for StringLiteral |
+| lib/__init__.py:1:27:1:38 | ControlFlowNode for Fstring |
+| lib/__init__.py:1:30:1:30 | ControlFlowNode for a |
+| lib/__init__.py:1:31:1:34 | ControlFlowNode for StringLiteral |
+| lib/__init__.py:1:35:1:35 | ControlFlowNode for b |
+| lib/__init__.py:1:36:1:38 | ControlFlowNode for StringLiteral |
+| lib:0:0:0:0 | Entry node for Package lib |
+| new.py:0:0:0:0 | Entry node for Module new |
+| new.py:0:0:0:0 | Exit node for Module new |
+| new.py:1:1:1:21 | ControlFlowNode for FunctionExpr |
+| new.py:1:1:1:21 | Entry node for Function get_new_target |
+| new.py:1:1:1:21 | Exit node for Function get_new_target |
+| new.py:1:5:1:18 | ControlFlowNode for get_new_target |
+| new.py:2:5:2:15 | ControlFlowNode for Return |
+| new.py:2:12:2:15 | ControlFlowNode for StringLiteral |
+testSsaVars
+| file://:0:0:0:0 | SSA Variable __name__ |
+| file://:0:0:0:0 | SSA Variable get_greeting |
+| file://:0:0:0:0 | SSA Variable print |
+| greeting.py:4:5:4:16 | SSA Variable get_greeting |
+| lib/__init__.py:1:5:1:11 | SSA Variable combine |
+| lib/__init__.py:1:13:1:13 | SSA Variable a |
+| lib/__init__.py:1:16:1:16 | SSA Variable b |
+| new.py:1:5:1:18 | SSA Variable get_new_target |
+testVars
+| Global Variable __name__ | greeting.py:0:0:0:0 | Module greeting |
+| Global Variable __name__ | hello.py:0:0:0:0 | Module hello |
+| Global Variable __name__ | lib/__init__.py:0:0:0:0 | Module lib.__init__ |
+| Global Variable __name__ | new.py:0:0:0:0 | Module new |
+| Global Variable __package__ | greeting.py:0:0:0:0 | Module greeting |
+| Global Variable __package__ | hello.py:0:0:0:0 | Module hello |
+| Global Variable __package__ | lib/__init__.py:0:0:0:0 | Module lib.__init__ |
+| Global Variable __package__ | new.py:0:0:0:0 | Module new |
+| Global Variable combine | greeting.py:0:0:0:0 | Module greeting |
+| Global Variable combine | lib/__init__.py:0:0:0:0 | Module lib.__init__ |
+| Global Variable get_greeting | greeting.py:0:0:0:0 | Module greeting |
+| Global Variable get_greeting | hello.py:0:0:0:0 | Module hello |
+| Global Variable get_new_target | greeting.py:0:0:0:0 | Module greeting |
+| Global Variable get_new_target | new.py:0:0:0:0 | Module new |
+| Global Variable print | hello.py:0:0:0:0 | Module hello |
+| Local Variable a | lib/__init__.py:1:1:1:18 | Function combine |
+| Local Variable b | lib/__init__.py:1:1:1:18 | Function combine |
diff --git a/python/ql/test/extractor-tests/overlay/basic-full-eval/test.ql b/python/ql/test/extractor-tests/overlay/basic-full-eval/test.ql
new file mode 100644
index 00000000000..469fb9118f0
--- /dev/null
+++ b/python/ql/test/extractor-tests/overlay/basic-full-eval/test.ql
@@ -0,0 +1,19 @@
+import python
+
+query predicate testStringLiterals(StringLiteral l, string text) { l.getText() = text }
+
+query predicate testModules(Module m) { any() }
+
+query predicate testFunctions(Function f) { any() }
+
+query predicate testClasses(Class c) { any() }
+
+query predicate testLocations(Location l) { any() }
+
+query predicate testFiles(File f) { any() }
+
+query predicate testCfgNodes(ControlFlowNode n) { any() }
+
+query predicate testSsaVars(SsaVariable var) { any() }
+
+query predicate testVars(Variable var, Scope s) { s = var.getScope() }
diff --git a/python/ql/test/extractor-tests/overlay/basic-overlay-eval/codeql-test.yml b/python/ql/test/extractor-tests/overlay/basic-overlay-eval/codeql-test.yml
new file mode 100644
index 00000000000..b0ad72e42d8
--- /dev/null
+++ b/python/ql/test/extractor-tests/overlay/basic-overlay-eval/codeql-test.yml
@@ -0,0 +1,3 @@
+overlay:
+  base: "orig_src"
+  overlay: "../basic-full-eval"
diff --git a/python/ql/test/extractor-tests/overlay/basic-overlay-eval/options b/python/ql/test/extractor-tests/overlay/basic-overlay-eval/options
new file mode 100644
index 00000000000..4f6e4043862
--- /dev/null
+++ b/python/ql/test/extractor-tests/overlay/basic-overlay-eval/options
@@ -0,0 +1 @@
+semmle-extractor-options: -R . -m hello.py --filter exclude:**/*.testproj/**
diff --git a/python/ql/test/extractor-tests/overlay/basic-overlay-eval/orig_src/greeting.py b/python/ql/test/extractor-tests/overlay/basic-overlay-eval/orig_src/greeting.py
new file mode 100644
index 00000000000..5b16454e2c6
--- /dev/null
+++ b/python/ql/test/extractor-tests/overlay/basic-overlay-eval/orig_src/greeting.py
@@ -0,0 +1,5 @@
+from old import *
+from lib import *
+
+def get_greeting():
+    return combine("Hello", get_old_target())
diff --git a/python/ql/test/extractor-tests/overlay/basic-overlay-eval/orig_src/hello.py b/python/ql/test/extractor-tests/overlay/basic-overlay-eval/orig_src/hello.py
new file mode 100644
index 00000000000..2744a6c2978
--- /dev/null
+++ b/python/ql/test/extractor-tests/overlay/basic-overlay-eval/orig_src/hello.py
@@ -0,0 +1,4 @@
+from greeting import *
+
+if __name__ == "__main__":
+    print(get_greeting())
diff --git a/python/ql/test/extractor-tests/overlay/basic-overlay-eval/orig_src/lib/__init__.py b/python/ql/test/extractor-tests/overlay/basic-overlay-eval/orig_src/lib/__init__.py
new file mode 100644
index 00000000000..b3587542d9b
--- /dev/null
+++ b/python/ql/test/extractor-tests/overlay/basic-overlay-eval/orig_src/lib/__init__.py
@@ -0,0 +1 @@
+def combine(a, b): return f"{a}, {b}!"
diff --git a/python/ql/test/extractor-tests/overlay/basic-overlay-eval/orig_src/old.py b/python/ql/test/extractor-tests/overlay/basic-overlay-eval/orig_src/old.py
new file mode 100644
index 00000000000..8dc6e3416fb
--- /dev/null
+++ b/python/ql/test/extractor-tests/overlay/basic-overlay-eval/orig_src/old.py
@@ -0,0 +1,2 @@
+def get_old_target():
+    return "World"
diff --git a/python/ql/test/extractor-tests/overlay/basic-overlay-eval/test.qlref b/python/ql/test/extractor-tests/overlay/basic-overlay-eval/test.qlref
new file mode 100644
index 00000000000..961494fbda1
--- /dev/null
+++ b/python/ql/test/extractor-tests/overlay/basic-overlay-eval/test.qlref
@@ -0,0 +1 @@
+../basic-full-eval/test.ql
diff --git a/python/ql/test/library-tests/PointsTo/absent/Absent.ql b/python/ql/test/library-tests/PointsTo/absent/Absent.ql
index 95cdf3a1084..b73eb9b5296 100644
--- a/python/ql/test/library-tests/PointsTo/absent/Absent.ql
+++ b/python/ql/test/library-tests/PointsTo/absent/Absent.ql
@@ -1,6 +1,7 @@
 import python
+private import LegacyPointsTo
 import semmle.python.objects.Modules
 
-from Value val, ControlFlowNode f
+from Value val, ControlFlowNodeWithPointsTo f
 where f.pointsTo(val)
 select f, val
diff --git a/python/ql/test/library-tests/PointsTo/calls/CallPointsTo.ql b/python/ql/test/library-tests/PointsTo/calls/CallPointsTo.ql
index 10247a98f94..70a9bbd914b 100644
--- a/python/ql/test/library-tests/PointsTo/calls/CallPointsTo.ql
+++ b/python/ql/test/library-tests/PointsTo/calls/CallPointsTo.ql
@@ -1,5 +1,6 @@
 import python
+private import LegacyPointsTo
 
 from CallNode call, Value func
-where call.getFunction().pointsTo(func)
+where call.getFunction().(ControlFlowNodeWithPointsTo).pointsTo(func)
 select call.getLocation().getStartLine(), call.toString(), func.toString()
diff --git a/python/ql/test/library-tests/PointsTo/comparisons/PointsTo.ql b/python/ql/test/library-tests/PointsTo/comparisons/PointsTo.ql
index 61f802a2ea5..31d2f1cab36 100644
--- a/python/ql/test/library-tests/PointsTo/comparisons/PointsTo.ql
+++ b/python/ql/test/library-tests/PointsTo/comparisons/PointsTo.ql
@@ -1,6 +1,7 @@
 import python
+private import LegacyPointsTo
 
-from int line, ControlFlowNode f, Value v
+from int line, ControlFlowNodeWithPointsTo f, Value v
 where
   any(ExprStmt s).getValue() = f.getNode() and
   line = f.getLocation().getStartLine() and
diff --git a/python/ql/test/library-tests/PointsTo/decorators/Test.ql b/python/ql/test/library-tests/PointsTo/decorators/Test.ql
index b5175845070..b237ce513d2 100644
--- a/python/ql/test/library-tests/PointsTo/decorators/Test.ql
+++ b/python/ql/test/library-tests/PointsTo/decorators/Test.ql
@@ -1,10 +1,11 @@
 import python
+private import LegacyPointsTo
 
 // We don't care about the internals of functools which vary from
 // version to version, just the end result.
 from NameNode f, Object o, ControlFlowNode x, int line
 where
-  f.refersTo(o, x) and
+  f.(ControlFlowNodeWithPointsTo).refersTo(o, x) and
   f.getLocation().getFile().getBaseName() = "test.py" and
   line = f.getLocation().getStartLine()
 select line, f.toString(), o.toString(), x.getLocation().toString()
diff --git a/python/ql/test/library-tests/PointsTo/general/GlobalPointsTo.ql b/python/ql/test/library-tests/PointsTo/general/GlobalPointsTo.ql
index 8caa54ccc23..e90674bab2e 100644
--- a/python/ql/test/library-tests/PointsTo/general/GlobalPointsTo.ql
+++ b/python/ql/test/library-tests/PointsTo/general/GlobalPointsTo.ql
@@ -1,7 +1,8 @@
 import python
+private import LegacyPointsTo
 import interesting
 
-from int line, ControlFlowNode f, Object o, ImportTimeScope n
+from int line, ControlFlowNodeWithPointsTo f, Object o, ImportTimeScope n
 where
   of_interest(f, line) and
   f.refersTo(o) and
diff --git a/python/ql/test/library-tests/PointsTo/general/LocalPointsTo.ql b/python/ql/test/library-tests/PointsTo/general/LocalPointsTo.ql
index aee2cb11bf4..76d711c00e0 100644
--- a/python/ql/test/library-tests/PointsTo/general/LocalPointsTo.ql
+++ b/python/ql/test/library-tests/PointsTo/general/LocalPointsTo.ql
@@ -6,10 +6,11 @@
  */
 
 import python
+private import LegacyPointsTo
 import interesting
 import Util
 
-from int line, ControlFlowNode f, Object o
+from int line, ControlFlowNodeWithPointsTo f, Object o
 where
   of_interest(f, line) and
   f.refersTo(o)
diff --git a/python/ql/test/library-tests/PointsTo/general/LocalPointsToType.ql b/python/ql/test/library-tests/PointsTo/general/LocalPointsToType.ql
index fe14e61e01b..8b5e008d60a 100644
--- a/python/ql/test/library-tests/PointsTo/general/LocalPointsToType.ql
+++ b/python/ql/test/library-tests/PointsTo/general/LocalPointsToType.ql
@@ -1,8 +1,9 @@
 import python
+private import LegacyPointsTo
 import interesting
 import Util
 
-from int line, ControlFlowNode f, Object o, ClassObject cls
+from int line, ControlFlowNodeWithPointsTo f, Object o, ClassObject cls
 where
   of_interest(f, line) and
   f.refersTo(o, cls, _)
diff --git a/python/ql/test/library-tests/PointsTo/guarded/PointsTo.ql b/python/ql/test/library-tests/PointsTo/guarded/PointsTo.ql
index db4710786ac..c264bf04013 100644
--- a/python/ql/test/library-tests/PointsTo/guarded/PointsTo.ql
+++ b/python/ql/test/library-tests/PointsTo/guarded/PointsTo.ql
@@ -1,6 +1,7 @@
 import python
+private import LegacyPointsTo
 
-from ControlFlowNode f, Object o, ControlFlowNode x
+from ControlFlowNodeWithPointsTo f, Object o, ControlFlowNode x
 where
   f.refersTo(o, x) and
   exists(CallNode call | call.getFunction().getNode().(Name).getId() = "use" and call.getArg(0) = f)
diff --git a/python/ql/test/library-tests/PointsTo/guarded/PointsToWithType.ql b/python/ql/test/library-tests/PointsTo/guarded/PointsToWithType.ql
index 1c294e64282..f7c3d5a5c71 100644
--- a/python/ql/test/library-tests/PointsTo/guarded/PointsToWithType.ql
+++ b/python/ql/test/library-tests/PointsTo/guarded/PointsToWithType.ql
@@ -1,6 +1,7 @@
 import python
+private import LegacyPointsTo
 
-from ControlFlowNode f, Object o, ClassObject c, ControlFlowNode x
+from ControlFlowNodeWithPointsTo f, Object o, ClassObject c, ControlFlowNode x
 where
   f.refersTo(o, c, x) and
   exists(CallNode call | call.getFunction().getNode().(Name).getId() = "use" and call.getArg(0) = f)
diff --git a/python/ql/test/library-tests/PointsTo/import_star/Values.ql b/python/ql/test/library-tests/PointsTo/import_star/Values.ql
index b54b8c6c78d..f8c620662d6 100644
--- a/python/ql/test/library-tests/PointsTo/import_star/Values.ql
+++ b/python/ql/test/library-tests/PointsTo/import_star/Values.ql
@@ -1,5 +1,6 @@
 import python
+private import LegacyPointsTo
 
-from ControlFlowNode f, Context ctx, Value v, ControlFlowNode origin
+from ControlFlowNodeWithPointsTo f, Context ctx, Value v, ControlFlowNode origin
 where f.pointsTo(ctx, v, origin)
 select f, ctx, v
diff --git a/python/ql/test/library-tests/PointsTo/indexing/Test.ql b/python/ql/test/library-tests/PointsTo/indexing/Test.ql
index 694e4d8e98e..d9a9d7156de 100644
--- a/python/ql/test/library-tests/PointsTo/indexing/Test.ql
+++ b/python/ql/test/library-tests/PointsTo/indexing/Test.ql
@@ -1,6 +1,7 @@
 import python
+private import LegacyPointsTo
 
-from ControlFlowNode f, Object o, ControlFlowNode x
+from ControlFlowNodeWithPointsTo f, Object o, ControlFlowNode x
 where
   f.refersTo(o, x) and
   f.getLocation().getFile().getBaseName() = "test.py"
diff --git a/python/ql/test/library-tests/PointsTo/indexing/TestWithType.ql b/python/ql/test/library-tests/PointsTo/indexing/TestWithType.ql
index 9f16abc2de0..b3888d5bf10 100644
--- a/python/ql/test/library-tests/PointsTo/indexing/TestWithType.ql
+++ b/python/ql/test/library-tests/PointsTo/indexing/TestWithType.ql
@@ -1,6 +1,7 @@
 import python
+private import LegacyPointsTo
 
-from ControlFlowNode f, Object o, ClassObject c, ControlFlowNode x
+from ControlFlowNodeWithPointsTo f, Object o, ClassObject c, ControlFlowNode x
 where
   f.refersTo(o, c, x) and
   f.getLocation().getFile().getBaseName() = "test.py"
diff --git a/python/ql/test/library-tests/PointsTo/inheritance/Self.ql b/python/ql/test/library-tests/PointsTo/inheritance/Self.ql
index 050690fd1cb..571f39d34ab 100644
--- a/python/ql/test/library-tests/PointsTo/inheritance/Self.ql
+++ b/python/ql/test/library-tests/PointsTo/inheritance/Self.ql
@@ -1,5 +1,6 @@
 import python
+private import LegacyPointsTo
 
 from NameNode n, Object value, ClassObject cls
-where n.getId() = "self" and n.refersTo(value, cls, _)
+where n.getId() = "self" and n.(ControlFlowNodeWithPointsTo).refersTo(value, cls, _)
 select n.getNode().getLocation().getStartLine(), value.toString(), cls.toString()
diff --git a/python/ql/test/library-tests/PointsTo/new/ImpliesDataflow.ql b/python/ql/test/library-tests/PointsTo/new/ImpliesDataflow.ql
index 620cac34332..da4b46595e6 100644
--- a/python/ql/test/library-tests/PointsTo/new/ImpliesDataflow.ql
+++ b/python/ql/test/library-tests/PointsTo/new/ImpliesDataflow.ql
@@ -4,10 +4,11 @@
  */
 
 private import python
+private import LegacyPointsTo
 import semmle.python.dataflow.new.DataFlow
 
 predicate pointsToOrigin(DataFlow::CfgNode pointer, DataFlow::CfgNode origin) {
-  origin.getNode() = pointer.getNode().pointsTo().getOrigin()
+  origin.getNode() = pointer.getNode().(ControlFlowNodeWithPointsTo).pointsTo().getOrigin()
 }
 
 module PointsToConfig implements DataFlow::ConfigSig {
diff --git a/python/ql/test/library-tests/PointsTo/new/PointsToNone.ql b/python/ql/test/library-tests/PointsTo/new/PointsToNone.ql
index c5009ad4cb6..8dca05a8a27 100644
--- a/python/ql/test/library-tests/PointsTo/new/PointsToNone.ql
+++ b/python/ql/test/library-tests/PointsTo/new/PointsToNone.ql
@@ -1,6 +1,7 @@
 import python
+private import LegacyPointsTo
 import Util
 
-from ControlFlowNode f, ControlFlowNode x
+from ControlFlowNodeWithPointsTo f, ControlFlowNode x
 where f.refersTo(theNoneObject(), _, x)
 select locate(f.getLocation(), "abcdghijklmopqr"), f.toString(), x.getLocation().getStartLine()
diff --git a/python/ql/test/library-tests/PointsTo/new/Values.ql b/python/ql/test/library-tests/PointsTo/new/Values.ql
index 668e7a6b265..9e49b44d37e 100644
--- a/python/ql/test/library-tests/PointsTo/new/Values.ql
+++ b/python/ql/test/library-tests/PointsTo/new/Values.ql
@@ -1,7 +1,8 @@
 import python
+private import LegacyPointsTo
 import Util
 
-from ControlFlowNode f, Context ctx, Value v, ControlFlowNode origin
+from ControlFlowNodeWithPointsTo f, Context ctx, Value v, ControlFlowNode origin
 where f.pointsTo(ctx, v, origin)
 select locate(f.getLocation(), "abeghijklmnpqrstu"), f.toString(), ctx, vrepr(v),
   vrepr(v.getClass())
diff --git a/python/ql/test/library-tests/PointsTo/properties/Values.ql b/python/ql/test/library-tests/PointsTo/properties/Values.ql
index 23416efc0eb..6ab52924bb9 100644
--- a/python/ql/test/library-tests/PointsTo/properties/Values.ql
+++ b/python/ql/test/library-tests/PointsTo/properties/Values.ql
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 import semmle.python.objects.ObjectInternal
 
 string vrepr(Value v) {
@@ -8,6 +9,6 @@ string vrepr(Value v) {
   v = ObjectInternal::boundMethod() and result = "builtin-class method"
 }
 
-from ControlFlowNode f, Context ctx, Value v, ControlFlowNode origin
+from ControlFlowNodeWithPointsTo f, Context ctx, Value v, ControlFlowNode origin
 where f.pointsTo(ctx, v, origin)
 select f.getLocation(), f.toString(), ctx, vrepr(v), vrepr(v.getClass())
diff --git a/python/ql/test/library-tests/PointsTo/regressions/missing/if-urlsplit-access/Test.ql b/python/ql/test/library-tests/PointsTo/regressions/missing/if-urlsplit-access/Test.ql
index db02e9c4f08..87b4bb605d7 100644
--- a/python/ql/test/library-tests/PointsTo/regressions/missing/if-urlsplit-access/Test.ql
+++ b/python/ql/test/library-tests/PointsTo/regressions/missing/if-urlsplit-access/Test.ql
@@ -1,6 +1,7 @@
 import python
+private import LegacyPointsTo
 
-from ControlFlowNode arg, CallNode call, string debug
+from ControlFlowNodeWithPointsTo arg, CallNode call, string debug
 where
   call.getAnArg() = arg and
   call.getFunction().(NameNode).getId() = "check" and
diff --git a/python/ql/test/library-tests/PointsTo/regressions/missing/re-compile/Test.ql b/python/ql/test/library-tests/PointsTo/regressions/missing/re-compile/Test.ql
index db02e9c4f08..87b4bb605d7 100644
--- a/python/ql/test/library-tests/PointsTo/regressions/missing/re-compile/Test.ql
+++ b/python/ql/test/library-tests/PointsTo/regressions/missing/re-compile/Test.ql
@@ -1,6 +1,7 @@
 import python
+private import LegacyPointsTo
 
-from ControlFlowNode arg, CallNode call, string debug
+from ControlFlowNodeWithPointsTo arg, CallNode call, string debug
 where
   call.getAnArg() = arg and
   call.getFunction().(NameNode).getId() = "check" and
diff --git a/python/ql/test/library-tests/PointsTo/regressions/missing/uncalled-function/Test.ql b/python/ql/test/library-tests/PointsTo/regressions/missing/uncalled-function/Test.ql
index db02e9c4f08..87b4bb605d7 100644
--- a/python/ql/test/library-tests/PointsTo/regressions/missing/uncalled-function/Test.ql
+++ b/python/ql/test/library-tests/PointsTo/regressions/missing/uncalled-function/Test.ql
@@ -1,6 +1,7 @@
 import python
+private import LegacyPointsTo
 
-from ControlFlowNode arg, CallNode call, string debug
+from ControlFlowNodeWithPointsTo arg, CallNode call, string debug
 where
   call.getAnArg() = arg and
   call.getFunction().(NameNode).getId() = "check" and
diff --git a/python/ql/test/library-tests/PointsTo/regressions/wrong/classmethod/Test.ql b/python/ql/test/library-tests/PointsTo/regressions/wrong/classmethod/Test.ql
index 700e0dd72a5..a7be670276f 100644
--- a/python/ql/test/library-tests/PointsTo/regressions/wrong/classmethod/Test.ql
+++ b/python/ql/test/library-tests/PointsTo/regressions/wrong/classmethod/Test.ql
@@ -1,10 +1,11 @@
 import python
+private import LegacyPointsTo
 
 from NameNode name, CallNode call, string debug
 where
   call.getAnArg() = name and
   call.getFunction().(NameNode).getId() = "check" and
-  if exists(name.pointsTo())
-  then debug = name.pointsTo().toString()
+  if exists(name.(ControlFlowNodeWithPointsTo).pointsTo())
+  then debug = name.(ControlFlowNodeWithPointsTo).pointsTo().toString()
   else debug = "<MISSING pointsTo()>"
 select name, debug
diff --git a/python/ql/test/library-tests/PointsTo/super/SuperMethodCall.ql b/python/ql/test/library-tests/PointsTo/super/SuperMethodCall.ql
index 86ad5bee155..43149df47b8 100644
--- a/python/ql/test/library-tests/PointsTo/super/SuperMethodCall.ql
+++ b/python/ql/test/library-tests/PointsTo/super/SuperMethodCall.ql
@@ -1,11 +1,12 @@
 import python
+private import LegacyPointsTo
 import semmle.python.pointsto.PointsTo
 import semmle.python.pointsto.PointsToContext
 import semmle.python.objects.ObjectInternal
 
 from CallNode call, SuperInstance sup, BoundMethodObjectInternal bm
 where
-  call.getFunction().inferredValue() = bm and
-  call.getFunction().(AttrNode).getObject().inferredValue() = sup
+  call.getFunction().(ControlFlowNodeWithPointsTo).inferredValue() = bm and
+  call.getFunction().(AttrNode).getObject().(ControlFlowNodeWithPointsTo).inferredValue() = sup
 select call.getLocation().getStartLine(), call.toString(),
   bm.getFunction().getSource().(FunctionObject).getQualifiedName()
diff --git a/python/ql/test/library-tests/dataflow/fieldflow/test.py b/python/ql/test/library-tests/dataflow/fieldflow/test.py
index 1ce049917f0..f0152ad38a8 100644
--- a/python/ql/test/library-tests/dataflow/fieldflow/test.py
+++ b/python/ql/test/library-tests/dataflow/fieldflow/test.py
@@ -301,12 +301,12 @@ def set_to_source():
 @expects(4) # $ unresolved_call=expects(..) unresolved_call=expects(..)(..)
 def test_global_flow_to_class_attribute():
     inst = WithTuple2()
-    SINK_F(WithTuple2.my_tuple[0])
+    SINK_F(WithTuple2.my_tuple[0])  # $ SPURIOUS: flow="SOURCE, l:-5 -> WithTuple2.my_tuple[0]"
     SINK_F(inst.my_tuple[0])
 
     set_to_source()
 
-    SINK(WithTuple2.my_tuple[0]) # $ MISSING: flow="SOURCE, l:-10 -> WithTuple2.my_tuple[0]"
+    SINK(WithTuple2.my_tuple[0]) # $ flow="SOURCE, l:-10 -> WithTuple2.my_tuple[0]"
     SINK(inst.my_tuple[0]) # $ MISSING: flow="SOURCE, l:-11 -> inst.my_tuple[0]"
 
 
diff --git a/python/ql/test/library-tests/dataflow/fieldflow/test_global.py b/python/ql/test/library-tests/dataflow/fieldflow/test_global.py
index 0e96b37dc33..9970c47c962 100644
--- a/python/ql/test/library-tests/dataflow/fieldflow/test_global.py
+++ b/python/ql/test/library-tests/dataflow/fieldflow/test_global.py
@@ -146,6 +146,7 @@ SINK(fields_with_local_flow(SOURCE)) # $ flow="SOURCE -> fields_with_local_flow(
 class NestedObj(object):
     def __init__(self):
         self.obj = MyObj("OK")
+        self.obj.foo = "default"
 
     def getObj(self):
         return self.obj
@@ -163,17 +164,31 @@ x2 = SOURCE
 a2 = NestedObj()
 a2.getObj().foo = x2
 SINK(a2.obj.foo) # $ flow="SOURCE, l:-3 -> a2.obj.foo"
+        
+# Global variable
+app = NestedObj()
+
+def init_global():
+    app.obj.foo = SOURCE
+
+def read_global(): 
+    return app.obj.foo
+
+def test_global_nested_attributes():
+    init_global()
+    result = read_global() 
+    SINK(result) # $ flow="SOURCE, l:-8 -> result"
 
 # ------------------------------------------------------------------------------
 # Global scope interaction
 # ------------------------------------------------------------------------------
 
 def func_defined_before():
-    SINK(global_obj.foo) # $ MISSING: flow="SOURCE, l:+3 -> global_obj.foo"
+    SINK(global_obj.foo) # $ flow="SOURCE, l:+3 -> global_obj.foo"
 
 global_obj = MyObj(NONSOURCE)
 global_obj.foo = SOURCE
 SINK(global_obj.foo) # $ flow="SOURCE, l:-1 -> global_obj.foo"
 
 def func_defined_after():
-    SINK(global_obj.foo) # $ MISSING: flow="SOURCE, l:-4 -> global_obj.foo"
+    SINK(global_obj.foo) # $ flow="SOURCE, l:-4 -> global_obj.foo"
diff --git a/python/ql/test/library-tests/dataflow/global-flow/known.py b/python/ql/test/library-tests/dataflow/global-flow/known.py
index ab60b991452..f9bdbd7af54 100644
--- a/python/ql/test/library-tests/dataflow/global-flow/known.py
+++ b/python/ql/test/library-tests/dataflow/global-flow/known.py
@@ -1 +1 @@
-known_attr = [1000] #$ writes=known_attr
+known_attr = [1000] #$ writes=known_attr
diff --git a/python/ql/test/library-tests/dataflow/typetracking/attribute_tests.py b/python/ql/test/library-tests/dataflow/typetracking/attribute_tests.py
index 2cc6346527f..8df3ef51f88 100644
--- a/python/ql/test/library-tests/dataflow/typetracking/attribute_tests.py
+++ b/python/ql/test/library-tests/dataflow/typetracking/attribute_tests.py
@@ -35,7 +35,7 @@ def set_foo(some_class_instance): # $ tracked=foo
     some_class_instance.foo = tracked # $ tracked=foo tracked
 
 def test_set_x():
-    x = SomeClass() # $ MISSING: tracked=foo
+    x = SomeClass() # $ MISSING: tracked=foo
     set_foo(x) # $ MISSING: tracked=foo
     print(x.foo) # $ MISSING: tracked=foo tracked
 
@@ -51,7 +51,7 @@ def test_create_with_foo():
 
 def test_global_attribute_assignment():
     global global_var
-    global_var.foo = tracked # $ tracked tracked=foo
+    global_var.foo = tracked # $ tracked tracked=foo
 
 def test_global_attribute_read():
     x = global_var.foo # $ tracked tracked=foo
@@ -61,7 +61,7 @@ def test_local_attribute_assignment():
     # In this case, we don't want flow going to the `ModuleVariableNode` for `local_var` 
     # (which is referenced in `test_local_attribute_read`).
     local_var = object() # $ tracked=foo
-    local_var.foo = tracked # $ tracked tracked=foo
+    local_var.foo = tracked # $ tracked tracked=foo
 
 def test_local_attribute_read():
     x = local_var.foo
@@ -129,7 +129,7 @@ def dunder_dict_indirect_write():
     x = SomeClass() # $ MISSING: tracked=foo
     x.__dict__[attr] = tracked # $tracked MISSING: tracked=foo
     y = x.foo # $ MISSING: tracked tracked=foo
-    do_stuff(y) # $ MISSING: tracked
+    do_stuff(y) # $ MISSING: tracked
 
 def dunder_dict_indirect_read():
     attr = "foo"
@@ -153,7 +153,7 @@ class MyClass2(object):
     def print_foo(self): # $ MISSING: tracked=foo
         print(self.foo) # $ MISSING: tracked=foo tracked
 
-    def possibly_uncalled_method(self): # $ MISSING: tracked=foo
+    def possibly_uncalled_method(self): # $ MISSING: tracked=foo
         print(self.foo) # $ MISSING: tracked=foo tracked
 
 instance = MyClass2()
@@ -170,7 +170,7 @@ class MyClass3(object):
     def print_foo(self): # $ tracked=foo
         print(self.foo) # $ tracked=foo tracked
 
-    def possibly_uncalled_method(self): # $ MISSING: tracked=foo
+    def possibly_uncalled_method(self): # $ MISSING: tracked=foo
         print(self.foo) # $ MISSING: tracked=foo tracked
 
 instance = MyClass3() # $ tracked=foo
diff --git a/python/ql/test/library-tests/frameworks/lxml/parsing.py b/python/ql/test/library-tests/frameworks/lxml/parsing.py
index 63cdc79b4c1..bff508f24ab 100644
--- a/python/ql/test/library-tests/frameworks/lxml/parsing.py
+++ b/python/ql/test/library-tests/frameworks/lxml/parsing.py
@@ -50,7 +50,7 @@ lxml.etree.fromstring(x, parser=parser) # $ decodeFormat=XML decodeInput=x xmlVu
 
 # Billion laughs vuln (also XXE)
 parser = lxml.etree.XMLParser(huge_tree=True)
-lxml.etree.fromstring(x, parser=parser) # $ decodeFormat=XML decodeInput=x xmlVuln='XML bomb' xmlVuln='XXE' decodeOutput=lxml.etree.fromstring(..)
+lxml.etree.fromstring(x, parser=parser) # $ decodeFormat=XML decodeInput=x xmlVuln='XXE' decodeOutput=lxml.etree.fromstring(..)
 
 # Safe for both Billion laughs and XXE
 parser = lxml.etree.XMLParser(resolve_entities=False, huge_tree=True)
@@ -63,5 +63,5 @@ lxml.etree.fromstring(x, parser=parser) # $ decodeFormat=XML decodeInput=x xmlVu
 # iterparse configurations ... this doesn't use a parser argument but takes MOST (!) of
 # the normal XMLParser arguments. Specifically, it doesn't allow disabling XXE :O
 
-lxml.etree.iterparse(xml_file, huge_tree=True) # $ decodeFormat=XML decodeInput=xml_file xmlVuln='XML bomb' xmlVuln='XXE' decodeOutput=lxml.etree.iterparse(..) getAPathArgument=xml_file
+lxml.etree.iterparse(xml_file, huge_tree=True) # $ decodeFormat=XML decodeInput=xml_file xmlVuln='XXE' decodeOutput=lxml.etree.iterparse(..) getAPathArgument=xml_file
 lxml.etree.iterparse(xml_file, load_dtd=True, no_network=False) # $ decodeFormat=XML decodeInput=xml_file xmlVuln='DTD retrieval' xmlVuln='XXE' decodeOutput=lxml.etree.iterparse(..) getAPathArgument=xml_file
diff --git a/rust/ql/test/library-tests/dataflow/sources/InlineFlow.expected b/python/ql/test/library-tests/frameworks/psycopg2/ConceptsTest.expected
similarity index 100%
rename from rust/ql/test/library-tests/dataflow/sources/InlineFlow.expected
rename to python/ql/test/library-tests/frameworks/psycopg2/ConceptsTest.expected
diff --git a/python/ql/test/library-tests/frameworks/psycopg2/ConceptsTest.ql b/python/ql/test/library-tests/frameworks/psycopg2/ConceptsTest.ql
new file mode 100644
index 00000000000..b557a0bccb6
--- /dev/null
+++ b/python/ql/test/library-tests/frameworks/psycopg2/ConceptsTest.ql
@@ -0,0 +1,2 @@
+import python
+import experimental.meta.ConceptsTest
diff --git a/python/ql/test/library-tests/frameworks/psycopg2/connectionpool.py b/python/ql/test/library-tests/frameworks/psycopg2/connectionpool.py
new file mode 100644
index 00000000000..507cdd59b82
--- /dev/null
+++ b/python/ql/test/library-tests/frameworks/psycopg2/connectionpool.py
@@ -0,0 +1,46 @@
+# Examples using psycopg2 connection pools.
+
+import psycopg2
+from psycopg2.pool import SimpleConnectionPool, AbstractConnectionPool
+
+
+DSN = "dbname=test user=test password=test host=localhost port=5432"
+
+
+def run_simple_pool_query():
+    pool = SimpleConnectionPool(1, 4, dsn=DSN)
+    try:
+        conn = pool.getconn()
+        try:
+            cur = conn.cursor()
+            try:
+                # Simple, parameterless query
+                cur.execute("SELECT 1") # $ getSql="SELECT 1"
+                _ = cur.fetchall() if hasattr(cur, "fetchall") else None # $ threatModelSource[database]=cur.fetchall()
+            finally:
+                cur.close()
+        finally:
+            pool.putconn(conn)
+    finally:
+        pool.closeall()
+
+
+class LocalPool(AbstractConnectionPool):
+    pass
+
+
+def run_custom_pool_query():
+    pool = LocalPool(1, 3, dsn=DSN)
+    try:
+        conn = pool.getconn()
+        try:
+            cur = conn.cursor()
+            try:
+                cur.execute("SELECT 2") # $ getSql="SELECT 2"
+                _ = cur.fetchone() if hasattr(cur, "fetchone") else None # $ threatModelSource[database]=cur.fetchone()
+            finally:
+                cur.close()
+        finally:
+            pool.putconn(conn)
+    finally:
+        pool.closeall()
diff --git a/python/ql/test/library-tests/objects/Strings.ql b/python/ql/test/library-tests/objects/Strings.ql
index eca8dec51fd..4c79df89daf 100644
--- a/python/ql/test/library-tests/objects/Strings.ql
+++ b/python/ql/test/library-tests/objects/Strings.ql
@@ -1,5 +1,6 @@
 import python
+private import LegacyPointsTo
 
-from StringObject s, ControlFlowNode f
+from StringObject s, ControlFlowNodeWithPointsTo f
 where f.refersTo(s)
 select f.getLocation().toString(), s.getText()
diff --git a/python/ql/test/library-tests/regex/FirstLast.expected b/python/ql/test/library-tests/regex/FirstLast.expected
index b187033ee22..0abf9c790c2 100644
--- a/python/ql/test/library-tests/regex/FirstLast.expected
+++ b/python/ql/test/library-tests/regex/FirstLast.expected
@@ -4,6 +4,7 @@
 | (?!not-this)^[A-Z_]+$ | first | 12 | 13 |
 | (?!not-this)^[A-Z_]+$ | first | 13 | 19 |
 | (?!not-this)^[A-Z_]+$ | first | 13 | 20 |
+| (?!not-this)^[A-Z_]+$ | last | 3 | 11 |
 | (?!not-this)^[A-Z_]+$ | last | 13 | 19 |
 | (?!not-this)^[A-Z_]+$ | last | 13 | 20 |
 | (?!not-this)^[A-Z_]+$ | last | 20 | 21 |
@@ -101,6 +102,7 @@
 | ^[A-Z_]+$(?<!not-this) | first | 0 | 1 |
 | ^[A-Z_]+$(?<!not-this) | first | 1 | 7 |
 | ^[A-Z_]+$(?<!not-this) | first | 1 | 8 |
+| ^[A-Z_]+$(?<!not-this) | first | 13 | 21 |
 | ^[A-Z_]+$(?<!not-this) | last | 1 | 7 |
 | ^[A-Z_]+$(?<!not-this) | last | 1 | 8 |
 | ^[A-Z_]+$(?<!not-this) | last | 8 | 9 |
diff --git a/python/ql/test/library-tests/taint/extensions/ExtensionsLib.qll b/python/ql/test/library-tests/taint/extensions/ExtensionsLib.qll
index 4ae53e94a38..e6874512f5c 100644
--- a/python/ql/test/library-tests/taint/extensions/ExtensionsLib.qll
+++ b/python/ql/test/library-tests/taint/extensions/ExtensionsLib.qll
@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 import semmle.python.dataflow.TaintTracking
 
 class SimpleTest extends TaintKind {
@@ -30,7 +31,7 @@ predicate visit_call(CallNode call, FunctionObject func) {
   exists(AttrNode attr, ClassObject cls, string name |
     name.matches("visit\\_%") and
     func = cls.lookupAttribute(name) and
-    attr.getObject("visit").refersTo(_, cls, _) and
+    attr.getObject("visit").(ControlFlowNodeWithPointsTo).refersTo(_, cls, _) and
     attr = call.getFunction()
   )
 }
diff --git a/python/ql/test/query-tests/Classes/equals-attr/DefineEqualsWhenAddingAttributes.expected b/python/ql/test/query-tests/Classes/equals-attr/DefineEqualsWhenAddingAttributes.expected
index e69de29bb2d..2f5a5a249f5 100644
--- a/python/ql/test/query-tests/Classes/equals-attr/DefineEqualsWhenAddingAttributes.expected
+++ b/python/ql/test/query-tests/Classes/equals-attr/DefineEqualsWhenAddingAttributes.expected
@@ -0,0 +1 @@
+| attr_eq_test.py:21:1:21:27 | class BadColorPoint | The class 'BadColorPoint' does not override $@, but adds the new attribute $@. | attr_eq_test.py:10:5:10:28 | Function Point.__eq__ | '__eq__' | attr_eq_test.py:25:9:25:19 | Attribute | _color |
diff --git a/python/ql/test/query-tests/Classes/equals-hash/attr_eq_test.py b/python/ql/test/query-tests/Classes/equals-attr/attr_eq_test.py
similarity index 100%
rename from python/ql/test/query-tests/Classes/equals-hash/attr_eq_test.py
rename to python/ql/test/query-tests/Classes/equals-attr/attr_eq_test.py
diff --git a/python/ql/test/query-tests/Classes/equals-hash/DefineEqualsWhenAddingFields.expected b/python/ql/test/query-tests/Classes/equals-hash/DefineEqualsWhenAddingFields.expected
deleted file mode 100644
index 2f5a5a249f5..00000000000
--- a/python/ql/test/query-tests/Classes/equals-hash/DefineEqualsWhenAddingFields.expected
+++ /dev/null
@@ -1 +0,0 @@
-| attr_eq_test.py:21:1:21:27 | class BadColorPoint | The class 'BadColorPoint' does not override $@, but adds the new attribute $@. | attr_eq_test.py:10:5:10:28 | Function Point.__eq__ | '__eq__' | attr_eq_test.py:25:9:25:19 | Attribute | _color |
diff --git a/python/ql/test/query-tests/Classes/equals-hash/DefineEqualsWhenAddingFields.qlref b/python/ql/test/query-tests/Classes/equals-hash/DefineEqualsWhenAddingFields.qlref
deleted file mode 100644
index e542a6176ad..00000000000
--- a/python/ql/test/query-tests/Classes/equals-hash/DefineEqualsWhenAddingFields.qlref
+++ /dev/null
@@ -1 +0,0 @@
-Classes/DefineEqualsWhenAddingAttributes.ql
\ No newline at end of file
diff --git a/python/ql/test/query-tests/Classes/equals-hash/EqualsOrHash.expected b/python/ql/test/query-tests/Classes/equals-hash/EqualsOrHash.expected
new file mode 100644
index 00000000000..bd584939b43
--- /dev/null
+++ b/python/ql/test/query-tests/Classes/equals-hash/EqualsOrHash.expected
@@ -0,0 +1,2 @@
+| equalsHash.py:13:1:13:8 | Class C | This class implements $@, but does not implement __eq__. | equalsHash.py:14:5:14:23 | Function __hash__ | __hash__ |
+| equalsHash.py:17:1:17:11 | Class D | This class implements $@, but does not implement __eq__. | equalsHash.py:18:5:18:23 | Function __hash__ | __hash__ |
diff --git a/python/ql/test/query-tests/Classes/equals-hash/EqualsOrHash.qlref b/python/ql/test/query-tests/Classes/equals-hash/EqualsOrHash.qlref
new file mode 100644
index 00000000000..e531bbc62e3
--- /dev/null
+++ b/python/ql/test/query-tests/Classes/equals-hash/EqualsOrHash.qlref
@@ -0,0 +1,2 @@
+query: Classes/Comparisons/EqualsOrHash.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/python/ql/test/query-tests/Classes/equals-hash/equalsHash.py b/python/ql/test/query-tests/Classes/equals-hash/equalsHash.py
new file mode 100644
index 00000000000..c9e1e47350f
--- /dev/null
+++ b/python/ql/test/query-tests/Classes/equals-hash/equalsHash.py
@@ -0,0 +1,19 @@
+class A:
+    def __eq__(self, other):
+        return True 
+    
+    def __hash__(self):
+        return 7 
+    
+# B is automatically non-hashable - so eq without hash never needs to alert
+class B:
+    def __eq__(self, other):
+        return True 
+    
+class C: # $ Alert
+    def __hash__(self):
+        return 5
+    
+class D(A): # $ Alert 
+    def __hash__(self):
+        return 4
\ No newline at end of file
diff --git a/python/ql/test/query-tests/Classes/equals-not-equals/EqualsOrNotEquals.expected b/python/ql/test/query-tests/Classes/equals-not-equals/EqualsOrNotEquals.expected
new file mode 100644
index 00000000000..ceec3c1cef9
--- /dev/null
+++ b/python/ql/test/query-tests/Classes/equals-not-equals/EqualsOrNotEquals.expected
@@ -0,0 +1,2 @@
+| EqualsOrNotEquals.py:14:1:14:8 | Class B | This class implements $@, but does not implement __eq__. | EqualsOrNotEquals.py:19:5:19:28 | Function __ne__ | __ne__ |
+| EqualsOrNotEquals.py:37:1:37:11 | Class D | This class implements $@, but does not implement __ne__. | EqualsOrNotEquals.py:43:5:43:28 | Function __eq__ | __eq__ |
diff --git a/python/ql/test/query-tests/Classes/equals-not-equals/EqualsOrNotEquals.py b/python/ql/test/query-tests/Classes/equals-not-equals/EqualsOrNotEquals.py
new file mode 100644
index 00000000000..2052118e749
--- /dev/null
+++ b/python/ql/test/query-tests/Classes/equals-not-equals/EqualsOrNotEquals.py
@@ -0,0 +1,147 @@
+class A:
+    def __init__(self, a):
+        self.a = a
+
+    # OK: __ne__ if not defined delegates to eq automatically
+    def __eq__(self, other):
+        return self.a == other.a 
+
+assert (A(1) == A(1))
+assert not (A(1) == A(2))
+assert not (A(1) != A(1))
+assert (A(1) != A(2))
+
+class B: # $ Alert 
+    def __init__(self, b):
+        self.b = b
+
+    # BAD: eq defaults to `is`
+    def __ne__(self, other):
+        return self.b != other.b 
+
+assert not (B(1) == B(1)) # potentially unexpected
+assert not (B(2) == B(2))
+assert not (B(1) != B(1))
+assert (B(1) != B(2))
+
+class C:
+    def __init__(self, c):
+        self.c = c 
+
+    def __eq__(self, other):
+        return self.c == other.c 
+
+    def __ne__(self, other):
+        return self.c != other.c 
+
+class D(C): # $ Alert 
+    def __init__(self, c, d):
+        super().__init__(c)
+        self.d = d
+
+    # BAD: ne is not defined, but the superclass ne is used instead of delegating, which may be incorrect
+    def __eq__(self, other):
+        return self.c == other.c and self.d == other.d
+
+assert (D(1,2) == D(1,2))
+assert not (D(1,2) == D(1,3))
+assert (D(1,2) != D(3,2)) 
+assert not (D(1,2) != D(1,3)) # Potentially unexpected 
+
+class E:
+    def __init__(self, e):
+        self.e = e 
+
+    def __eq__(self, other):
+        return self.e == other.e 
+
+    def __ne__(self, other):
+        return not self.__eq__(other)
+
+class F(E): 
+    def __init__(self, e, f):
+        super().__init__(e)
+        self.f = f
+
+    # OK: superclass ne delegates to eq
+    def __eq__(self, other):
+        return self.e == other.e and self.f == other.f
+
+assert (F(1,2) == F(1,2))
+assert not (F(1,2) == F(1,3))
+assert (F(1,2) != F(3,2)) 
+assert (F(1,2) != F(1,3))
+
+# Variations 
+
+class E2:
+    def __init__(self, e):
+        self.e = e 
+
+    def __eq__(self, other):
+        return self.e == other.e 
+
+    def __ne__(self, other):
+        return not self == other
+
+class F2(E2): 
+    def __init__(self, e, f):
+        super().__init__(e)
+        self.f = f
+
+    # OK: superclass ne delegates to eq
+    def __eq__(self, other):
+        return self.e == other.e and self.f == other.f
+
+assert (F2(1,2) == F2(1,2))
+assert not (F2(1,2) == F2(1,3))
+assert (F2(1,2) != F2(3,2)) 
+assert (F2(1,2) != F2(1,3))
+
+class E3:
+    def __init__(self, e):
+        self.e = e 
+
+    def __eq__(self, other):
+        return self.e == other.e 
+
+    def __ne__(self, other):
+        return not other.__eq__(self)
+
+class F3(E3): 
+    def __init__(self, e, f):
+        super().__init__(e)
+        self.f = f
+
+    # OK: superclass ne delegates to eq
+    def __eq__(self, other):
+        return self.e == other.e and self.f == other.f
+
+assert (F3(1,2) == F3(1,2))
+assert not (F3(1,2) == F3(1,3))
+assert (F3(1,2) != F3(3,2)) 
+assert (F3(1,2) != F3(1,3))
+
+class E4:
+    def __init__(self, e):
+        self.e = e 
+
+    def __eq__(self, other):
+        return self.e == other.e 
+
+    def __ne__(self, other):
+        return not other == self
+
+class F4(E4): 
+    def __init__(self, e, f):
+        super().__init__(e)
+        self.f = f
+
+    # OK: superclass ne delegates to eq
+    def __eq__(self, other):
+        return self.e == other.e and self.f == other.f
+
+assert (F4(1,2) == F4(1,2))
+assert not (F4(1,2) == F4(1,3))
+assert (F4(1,2) != F4(3,2)) 
+assert (F4(1,2) != F4(1,3))
\ No newline at end of file
diff --git a/python/ql/test/query-tests/Classes/equals-not-equals/EqualsOrNotEquals.qlref b/python/ql/test/query-tests/Classes/equals-not-equals/EqualsOrNotEquals.qlref
new file mode 100644
index 00000000000..9b1e8646c0e
--- /dev/null
+++ b/python/ql/test/query-tests/Classes/equals-not-equals/EqualsOrNotEquals.qlref
@@ -0,0 +1,2 @@
+query: Classes/Comparisons/EqualsOrNotEquals.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/python/ql/test/query-tests/Classes/incomplete-ordering/IncompleteOrdering.expected b/python/ql/test/query-tests/Classes/incomplete-ordering/IncompleteOrdering.expected
index d376a002335..94df0ad1d32 100644
--- a/python/ql/test/query-tests/Classes/incomplete-ordering/IncompleteOrdering.expected
+++ b/python/ql/test/query-tests/Classes/incomplete-ordering/IncompleteOrdering.expected
@@ -1 +1,2 @@
-| incomplete_ordering.py:3:1:3:26 | class PartOrdered | Class PartOrdered implements $@, but does not implement __le__ or __gt__ or __ge__. | incomplete_ordering.py:13:5:13:28 | Function PartOrdered.__lt__ | __lt__ |
+| incomplete_ordering.py:3:1:3:26 | Class LtWithoutLe | This class implements $@, but does not implement __le__ or __ge__. | incomplete_ordering.py:13:5:13:28 | Function __lt__ | __lt__ |
+| incomplete_ordering.py:28:1:28:17 | Class LendGeNoLt | This class implements $@, but does not implement __lt__ or __gt__. | incomplete_ordering.py:29:5:29:28 | Function __le__ | __le__ |
diff --git a/python/ql/test/query-tests/Classes/incomplete-ordering/IncompleteOrdering.qlref b/python/ql/test/query-tests/Classes/incomplete-ordering/IncompleteOrdering.qlref
index 3387dad807a..cb15c6a47ba 100644
--- a/python/ql/test/query-tests/Classes/incomplete-ordering/IncompleteOrdering.qlref
+++ b/python/ql/test/query-tests/Classes/incomplete-ordering/IncompleteOrdering.qlref
@@ -1 +1,2 @@
-Classes/IncompleteOrdering.ql
\ No newline at end of file
+query: Classes/Comparisons/IncompleteOrdering.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/python/ql/test/query-tests/Classes/incomplete-ordering/incomplete_ordering.py b/python/ql/test/query-tests/Classes/incomplete-ordering/incomplete_ordering.py
index 3c7514d7a83..2645819c43b 100644
--- a/python/ql/test/query-tests/Classes/incomplete-ordering/incomplete_ordering.py
+++ b/python/ql/test/query-tests/Classes/incomplete-ordering/incomplete_ordering.py
@@ -1,6 +1,6 @@
 #Incomplete ordering
 
-class PartOrdered(object):
+class LtWithoutLe(object): # $ Alert
     def __eq__(self, other):
         return self is other
 
@@ -13,6 +13,28 @@ class PartOrdered(object):
     def __lt__(self, other):
         return False
 
-#Don't blame a sub-class for super-class's sins.
-class DerivedPartOrdered(PartOrdered):
-    pass
\ No newline at end of file
+# Don't alert on subclass
+class LtWithoutLeSub(LtWithoutLe):
+    pass
+
+class LeSub(LtWithoutLe):
+    def __le__(self, other):
+        return self < other or self == other 
+    
+class GeSub(LtWithoutLe):
+    def __ge__(self, other):
+        return self > other or self == other 
+    
+class LendGeNoLt: # $ Alert
+    def __le__(self, other):
+        return True 
+    
+    def __ge__(self, other):
+        return other <= self 
+    
+from functools import total_ordering
+
+@total_ordering
+class Total:
+    def __le__(self, other):
+        return True
\ No newline at end of file
diff --git a/python/ql/test/query-tests/Classes/missing-del/MissingCallToDel.expected b/python/ql/test/query-tests/Classes/missing-del/MissingCallToDel.expected
index 7f080b1d729..2ec5e135258 100644
--- a/python/ql/test/query-tests/Classes/missing-del/MissingCallToDel.expected
+++ b/python/ql/test/query-tests/Classes/missing-del/MissingCallToDel.expected
@@ -1 +1 @@
-| missing_del.py:12:1:12:13 | class X3 | Class X3 may not be cleaned up properly as $@ is not called during deletion. | missing_del.py:9:5:9:22 | Function __del__ | method X2.__del__ |
+| missing_del.py:13:1:13:13 | Class X3 | This class does not call $@ during finalization. ($@ may be missing a call to a base class __del__) | missing_del.py:9:5:9:22 | Function __del__ | X2.__del__ | missing_del.py:15:5:15:22 | Function __del__ | X3.__del__ |
diff --git a/python/ql/test/query-tests/Classes/missing-del/MissingCallToDel.qlref b/python/ql/test/query-tests/Classes/missing-del/MissingCallToDel.qlref
index 8bf1811d0fa..b7ff0087054 100644
--- a/python/ql/test/query-tests/Classes/missing-del/MissingCallToDel.qlref
+++ b/python/ql/test/query-tests/Classes/missing-del/MissingCallToDel.qlref
@@ -1 +1,2 @@
-Classes/MissingCallToDel.ql
+query: Classes/CallsToInitDel/MissingCallToDel.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/python/ql/test/query-tests/Classes/missing-del/missing_del.py b/python/ql/test/query-tests/Classes/missing-del/missing_del.py
index 5d4e30e681d..6548bb1fa3b 100644
--- a/python/ql/test/query-tests/Classes/missing-del/missing_del.py
+++ b/python/ql/test/query-tests/Classes/missing-del/missing_del.py
@@ -2,14 +2,19 @@
 class X1(object):
 
     def __del__(self):
-        pass
+        print("X1 del")
 
 class X2(X1):
 
     def __del__(self):
+        print("X2 del")
         X1.__del__(self)
 
-class X3(X2):
+class X3(X2):  # $ Alert - skips X2 del
 
     def __del__(self):
+        print("X3 del")
         X1.__del__(self)
+
+a = X3()
+del a
diff --git a/python/ql/test/query-tests/Classes/missing-init/MissingCallToInit.expected b/python/ql/test/query-tests/Classes/missing-init/MissingCallToInit.expected
index 6cb92041a63..c0f35be3ff9 100644
--- a/python/ql/test/query-tests/Classes/missing-init/MissingCallToInit.expected
+++ b/python/ql/test/query-tests/Classes/missing-init/MissingCallToInit.expected
@@ -1,3 +1,6 @@
-| missing_init.py:12:1:12:13 | class B3 | Class B3 may not be initialized properly as $@ is not called from its $@. | missing_init.py:9:5:9:23 | Function __init__ | method B2.__init__ | missing_init.py:14:5:14:23 | Function __init__ | __init__ method |
-| missing_init.py:39:1:39:21 | class IUVT | Class IUVT may not be initialized properly as $@ is not called from its $@. | missing_init.py:30:5:30:23 | Function __init__ | method UT.__init__ | missing_init.py:26:5:26:23 | Function __init__ | __init__ method |
-| missing_init.py:72:1:72:13 | class AB | Class AB may not be initialized properly as $@ is not called from its $@. | missing_init.py:69:5:69:23 | Function __init__ | method AA.__init__ | missing_init.py:75:5:75:23 | Function __init__ | __init__ method |
+| missing_init.py:13:1:13:13 | Class B3 | This class does not call $@ during initialization. ($@ may be missing a call to a base class __init__) | missing_init.py:9:5:9:23 | Function __init__ | B2.__init__ | missing_init.py:14:5:14:23 | Function __init__ | B3.__init__ |
+| missing_init.py:42:1:42:21 | Class IUVT | This class does not call $@ during initialization. (The class lacks an __init__ method to ensure every base class __init__ is called.) | missing_init.py:33:5:33:23 | Function __init__ | UT.__init__ | file://:0:0:0:0 | (none) |  |
+| missing_init.py:67:1:67:13 | Class AB | This class does not call $@ during initialization. ($@ may be missing a call to a base class __init__) | missing_init.py:64:5:64:23 | Function __init__ | AA.__init__ | missing_init.py:70:5:70:23 | Function __init__ | AB.__init__ |
+| missing_init.py:122:5:122:17 | Class DC | This class does not call $@ during initialization. ($@ may be missing a call to a base class __init__) | missing_init.py:117:5:117:23 | Function __init__ | DA.__init__ | missing_init.py:124:9:124:27 | Function __init__ | DB.DC.__init__ |
+| missing_init.py:132:1:132:13 | Class DD | This class does not call $@ during initialization. ($@ may be missing a call to a base class __init__) | missing_init.py:117:5:117:23 | Function __init__ | DA.__init__ | missing_init.py:134:5:134:23 | Function __init__ | DD.__init__ |
+| missing_init.py:200:1:200:17 | Class H3 | This class does not call $@ during initialization. ($@ may be missing a call to super().__init__) | missing_init.py:197:5:197:23 | Function __init__ | H2.__init__ | missing_init.py:193:5:193:23 | Function __init__ | H1.__init__ |
diff --git a/python/ql/test/query-tests/Classes/missing-init/MissingCallToInit.qlref b/python/ql/test/query-tests/Classes/missing-init/MissingCallToInit.qlref
index b8635a5f8d9..86700427963 100644
--- a/python/ql/test/query-tests/Classes/missing-init/MissingCallToInit.qlref
+++ b/python/ql/test/query-tests/Classes/missing-init/MissingCallToInit.qlref
@@ -1 +1,2 @@
-Classes/MissingCallToInit.ql
+query: Classes/CallsToInitDel/MissingCallToInit.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/python/ql/test/query-tests/Classes/missing-init/missing_init.py b/python/ql/test/query-tests/Classes/missing-init/missing_init.py
index b1651557759..68498765f75 100644
--- a/python/ql/test/query-tests/Classes/missing-init/missing_init.py
+++ b/python/ql/test/query-tests/Classes/missing-init/missing_init.py
@@ -2,18 +2,21 @@
 class B1(object):
 
     def __init__(self):
-        do_something()
+        print("B1 init")
 
 class B2(B1):
 
     def __init__(self):
+        print("B2 init")
         B1.__init__(self)
 
-class B3(B2):
-
-    def __init__(self):
+class B3(B2): # $ Alert
+    def __init__(self): 
+        print("B3 init")
         B1.__init__(self)
 
+B3()
+
 #OK if superclass __init__ is builtin as
 #builtin classes tend to rely on __new__
 class MyException(Exception):
@@ -23,11 +26,11 @@ class MyException(Exception):
 
 #ODASA-4107
 class IUT(object):
-    def __init__(self):
+    def __init__(self):  
         print("IUT init")
 
 class UT(object):
-    def __init__(self):
+    def __init__(self): 
         print("UT init")
 
 class PU(object):
@@ -36,150 +39,167 @@ class PU(object):
 class UVT(UT, PU):
     pass
 
-class IUVT(IUT, UVT):
+class IUVT(IUT, UVT): # $ Alert
     pass
 
-#False positive
+print("IUVT")
+IUVT()
+
 class M1(object):
     def __init__(self):
-        print("A")
+        print("M1 init")
 
 class M2(object):
     pass
 
 class Mult(M2, M1):
     def __init__(self):
-        super(Mult, self).__init__() # Calls M1.__init__
+        print("Mult init")
+        super(Mult, self).__init__() # OK - Calls M1.__init__
 
-class X:
-    def __init__(self):
-        do_something()
-
-class Y(X):
-    @decorated
-    def __init__(self):
-        X.__init__(self)
-
-class Z(Y):
-    def __init__(self):
-        Y.__init__(self)
+Mult()
 
 class AA(object):
 
     def __init__(self):
-        do_something()
+        print("AA init")
 
-class AB(AA):
+class AB(AA): # $ Alert
 
-    #Don't call super class init
-    def __init__(self):
-        do_something()
+    # Doesn't call super class init
+    def __init__(self): 
+        print("AB init")
 
 class AC(AB):
 
     def __init__(self):
-        #Missing call to AA.__init__ but not AC's fault.
+        # Doesn't call AA init, but we don't alert here as the issue is with AB.
+        print("AC init")
         super(AC, self).__init__()
 
+AC()
+
 import six
 import abc
 
 class BA(object):
 
     def __init__(self):
-        do_something()
+        print("BA init")
 
 @six.add_metaclass(abc.ABCMeta)
 class BB(BA):
 
     def __init__(self):
+        print("BB init")
         super(BB,self).__init__()
 
+BB()
+
 
 @six.add_metaclass(abc.ABCMeta)
 class CA(object):
 
     def __init__(self):
-        do_something()
+        print("CA init")
 
-class CB(BA):
+class CB(CA):
 
     def __init__(self):
+        print("CB init")
         super(CB,self).__init__()
 
+CB()
+
 #ODASA-5799
 class DA(object):
 
     def __init__(self):
-        do_something()
+        print("DA init")
 
 class DB(DA):
 
-    class DC(DA):
+    class DC(DA): # $ SPURIOUS: Alert # We only consider direct super calls, so have an FP here
 
-        def __init__(self):
+        def __init__(self): 
+            print("DC init")
             sup = super(DB.DC, self)
             sup.__init__()
 
-#Simpler variants
-class DD(DA):
+DB.DC()
 
-    def __init__(self):
+#Simpler variants
+class DD(DA): # $ SPURIOUS: Alert # We only consider direct super calls, so have an FP here
+
+    def __init__(self): 
+        print("DD init")
         sup = super(DD, self)
         sup.__init__()
 
+DD()
+
 class DE(DA):
 
-    class DF(DA):
+    class DF(DA): # No alert here
 
-        def __init__(self):
+        def __init__(self): 
+            print("DF init")
             sup = super(DE.DF, self).__init__()
 
+DE.DF()
+
 class FA(object):
 
     def __init__(self):
-        pass
+        pass # does nothing, thus is considered a trivial method and ok to not call
 
 class FB(object):
 
     def __init__(self):
-        do_something()
+        print("FB init")
 
 class FC(FA, FB):
 
     def __init__(self):
-        #OK to skip call to FA.__init__ as that does nothing.
+        # No alert here - ok to skip call to trivial FA init
         FB.__init__(self)
 
 #Potential false positives.
 
 class ConfusingInit(B1):
 
-    def __init__(self):
+    def __init__(self): # We track this correctly and don't alert.
         super_call = super(ConfusingInit, self).__init__
         super_call()
 
 
-# Library class
-import collections
-
-class G1(collections.Counter):
-
+class G1:
     def __init__(self):
-        collections.Counter.__init__(self)
-
-class G2(G1):
+        print("G1 init")
 
+class G2:
     def __init__(self):
-        super(G2, self).__init__()
+        print("G2 init")
 
-class G3(collections.Counter):
+class G3(G1, G2):
+    def __init__(self): 
+        print("G3 init")
+        for cls in self.__class__.__bases__:
+            cls.__init__(self) # We dont track which classes this could refer to, but assume it calls all required init methods and don't alert.
 
+G3()
+
+class H1:
     def __init__(self):
-        super(G3, self).__init__()
-
-class G4(G3):
+        print("H1 init")
 
+class H2:
     def __init__(self):
-        G3.__init__(self)
+        print("H2 init")
 
+class H3(H1, H2): # $ Alert # The alert should also mention that H1.__init__ may be missing a call to super().__init__
+    def __init__(self): 
+        print("H3 init")
+        super().__init__()
+
+H3()
\ No newline at end of file
diff --git a/python/ql/test/query-tests/Classes/multiple/SuperclassDelCalledMultipleTimes.expected b/python/ql/test/query-tests/Classes/multiple/SuperclassDelCalledMultipleTimes.expected
deleted file mode 100644
index 210f24c7525..00000000000
--- a/python/ql/test/query-tests/Classes/multiple/SuperclassDelCalledMultipleTimes.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| multiple_del.py:17:1:17:17 | class Y3 | Class Y3 may not be cleaned up properly as $@ may be called multiple times during destruction. | multiple_del.py:9:5:9:22 | Function __del__ | method Y1.__del__ |
-| multiple_del.py:34:1:34:17 | class Z3 | Class Z3 may not be cleaned up properly as $@ may be called multiple times during destruction. | multiple_del.py:26:5:26:22 | Function __del__ | method Z1.__del__ |
diff --git a/python/ql/test/query-tests/Classes/multiple/SuperclassDelCalledMultipleTimes.qlref b/python/ql/test/query-tests/Classes/multiple/SuperclassDelCalledMultipleTimes.qlref
deleted file mode 100644
index 560d7b7dc41..00000000000
--- a/python/ql/test/query-tests/Classes/multiple/SuperclassDelCalledMultipleTimes.qlref
+++ /dev/null
@@ -1 +0,0 @@
-Classes/SuperclassDelCalledMultipleTimes.ql
diff --git a/python/ql/test/query-tests/Classes/multiple/SuperclassInitCalledMultipleTimes.expected b/python/ql/test/query-tests/Classes/multiple/SuperclassInitCalledMultipleTimes.expected
deleted file mode 100644
index 04ce8c0f373..00000000000
--- a/python/ql/test/query-tests/Classes/multiple/SuperclassInitCalledMultipleTimes.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| multiple_init.py:17:1:17:17 | class C3 | Class C3 may not be initialized properly as $@ may be called multiple times during initialization. | multiple_init.py:9:5:9:23 | Function __init__ | method C1.__init__ |
-| multiple_init.py:34:1:34:17 | class D3 | Class D3 may not be initialized properly as $@ may be called multiple times during initialization. | multiple_init.py:26:5:26:23 | Function __init__ | method D1.__init__ |
diff --git a/python/ql/test/query-tests/Classes/multiple/SuperclassInitCalledMultipleTimes.qlref b/python/ql/test/query-tests/Classes/multiple/SuperclassInitCalledMultipleTimes.qlref
deleted file mode 100644
index 042ddb76904..00000000000
--- a/python/ql/test/query-tests/Classes/multiple/SuperclassInitCalledMultipleTimes.qlref
+++ /dev/null
@@ -1 +0,0 @@
-Classes/SuperclassInitCalledMultipleTimes.ql
diff --git a/python/ql/test/query-tests/Classes/multiple/multiple-del/SuperclassDelCalledMultipleTimes.expected b/python/ql/test/query-tests/Classes/multiple/multiple-del/SuperclassDelCalledMultipleTimes.expected
new file mode 100644
index 00000000000..b7ee48feba7
--- /dev/null
+++ b/python/ql/test/query-tests/Classes/multiple/multiple-del/SuperclassDelCalledMultipleTimes.expected
@@ -0,0 +1,2 @@
+| multiple_del.py:21:5:21:22 | Function __del__ | This finalization method calls $@ multiple times, via $@ and $@, resolving to $@ and $@ respectively. | multiple_del.py:9:5:9:22 | Function __del__ | Y1.__del__ | multiple_del.py:23:9:23:24 | ControlFlowNode for Attribute() | this call | multiple_del.py:24:9:24:24 | ControlFlowNode for Attribute() | this call | multiple_del.py:9:5:9:22 | Function __del__ | Y1.__del__ | multiple_del.py:15:5:15:22 | Function __del__ | Y2.__del__ |
+| multiple_del.py:43:5:43:22 | Function __del__ | This finalization method calls $@ multiple times, via $@ and $@, resolving to $@ and $@ respectively. | multiple_del.py:32:5:32:22 | Function __del__ | Z1.__del__ | multiple_del.py:45:9:45:24 | ControlFlowNode for Attribute() | this call | multiple_del.py:46:9:46:24 | ControlFlowNode for Attribute() | this call | multiple_del.py:32:5:32:22 | Function __del__ | Z1.__del__ | multiple_del.py:37:5:37:22 | Function __del__ | Z2.__del__ |
diff --git a/python/ql/test/query-tests/Classes/multiple/multiple-del/SuperclassDelCalledMultipleTimes.qlref b/python/ql/test/query-tests/Classes/multiple/multiple-del/SuperclassDelCalledMultipleTimes.qlref
new file mode 100644
index 00000000000..8fa7d25474b
--- /dev/null
+++ b/python/ql/test/query-tests/Classes/multiple/multiple-del/SuperclassDelCalledMultipleTimes.qlref
@@ -0,0 +1,2 @@
+query: Classes/CallsToInitDel/SuperclassDelCalledMultipleTimes.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/python/ql/test/query-tests/Classes/multiple/multiple_del.py b/python/ql/test/query-tests/Classes/multiple/multiple-del/multiple_del.py
similarity index 71%
rename from python/ql/test/query-tests/Classes/multiple/multiple_del.py
rename to python/ql/test/query-tests/Classes/multiple/multiple-del/multiple_del.py
index 284f6bf6969..f72e7c5d00a 100644
--- a/python/ql/test/query-tests/Classes/multiple/multiple_del.py
+++ b/python/ql/test/query-tests/Classes/multiple/multiple-del/multiple_del.py
@@ -2,37 +2,48 @@
 class Base(object):
 
     def __del__(self):
-        pass
+        print("Base del")
 
 class Y1(Base):
 
     def __del__(self):
+        print("Y1 del")
         super(Y1, self).__del__()
 
 class Y2(Base):
 
     def __del__(self):
+        print("Y2 del")
         super(Y2, self).__del__()  #When `type(self) == Y3` this calls `Y1.__del__`
 
 class Y3(Y2, Y1):
 
-    def __del__(self):
+    def __del__(self): # $ Alert
+        print("Y3 del")
         Y1.__del__(self)
         Y2.__del__(self)
 
+a = Y3()
+del a
+
 #Calling a method multiple times by using explicit calls when a base inherits from other base
 class Z1(object):
 
     def __del__(self):
-        pass
+        print("Z1 del")
 
 class Z2(Z1):
 
     def __del__(self):
+        print("Z2 del")
         Z1.__del__(self)
 
 class Z3(Z2, Z1):
 
-    def __del__(self):
+    def __del__(self): # $ Alert
+        print("Z3 del")
         Z1.__del__(self)
         Z2.__del__(self)
+
+b = Z3()
+del b
diff --git a/python/ql/test/query-tests/Classes/multiple/multiple-init/SuperclassInitCalledMultipleTimes.expected b/python/ql/test/query-tests/Classes/multiple/multiple-init/SuperclassInitCalledMultipleTimes.expected
new file mode 100644
index 00000000000..024d0c6425a
--- /dev/null
+++ b/python/ql/test/query-tests/Classes/multiple/multiple-init/SuperclassInitCalledMultipleTimes.expected
@@ -0,0 +1,4 @@
+| multiple_init.py:21:5:21:23 | Function __init__ | This initialization method calls $@ multiple times, via $@ and $@, resolving to $@ and $@ respectively. | multiple_init.py:9:5:9:23 | Function __init__ | C1.__init__ | multiple_init.py:23:9:23:25 | ControlFlowNode for Attribute() | this call | multiple_init.py:24:9:24:25 | ControlFlowNode for Attribute() | this call | multiple_init.py:9:5:9:23 | Function __init__ | C1.__init__ | multiple_init.py:15:5:15:23 | Function __init__ | C2.__init__ |
+| multiple_init.py:42:5:42:23 | Function __init__ | This initialization method calls $@ multiple times, via $@ and $@, resolving to $@ and $@ respectively. | multiple_init.py:31:5:31:23 | Function __init__ | D1.__init__ | multiple_init.py:44:9:44:25 | ControlFlowNode for Attribute() | this call | multiple_init.py:45:9:45:25 | ControlFlowNode for Attribute() | this call | multiple_init.py:31:5:31:23 | Function __init__ | D1.__init__ | multiple_init.py:36:5:36:23 | Function __init__ | D2.__init__ |
+| multiple_init.py:84:5:84:23 | Function __init__ | This initialization method calls $@ multiple times, via $@ and $@, resolving to $@ and $@ respectively. | multiple_init.py:80:5:80:23 | Function __init__ | F3.__init__ | multiple_init.py:86:9:86:25 | ControlFlowNode for Attribute() | this call | multiple_init.py:87:9:87:25 | ControlFlowNode for Attribute() | this call | multiple_init.py:75:5:75:23 | Function __init__ | F2.__init__ | multiple_init.py:80:5:80:23 | Function __init__ | F3.__init__ |
+| multiple_init.py:111:5:111:23 | Function __init__ | This initialization method calls $@ multiple times, via $@ and $@, resolving to $@ and $@ respectively. | multiple_init.py:92:5:92:23 | Function __init__ | G1.__init__ | multiple_init.py:113:9:113:25 | ControlFlowNode for Attribute() | this call | multiple_init.py:114:9:114:25 | ControlFlowNode for Attribute() | this call | multiple_init.py:96:5:96:23 | Function __init__ | G2.__init__ | multiple_init.py:101:5:101:23 | Function __init__ | G3.__init__ |
diff --git a/python/ql/test/query-tests/Classes/multiple/multiple-init/SuperclassInitCalledMultipleTimes.qlref b/python/ql/test/query-tests/Classes/multiple/multiple-init/SuperclassInitCalledMultipleTimes.qlref
new file mode 100644
index 00000000000..9a2b156acd3
--- /dev/null
+++ b/python/ql/test/query-tests/Classes/multiple/multiple-init/SuperclassInitCalledMultipleTimes.qlref
@@ -0,0 +1,2 @@
+query: Classes/CallsToInitDel/SuperclassInitCalledMultipleTimes.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/python/ql/test/query-tests/Classes/multiple/multiple-init/multiple_init.py b/python/ql/test/query-tests/Classes/multiple/multiple-init/multiple_init.py
new file mode 100644
index 00000000000..faa0a71c6db
--- /dev/null
+++ b/python/ql/test/query-tests/Classes/multiple/multiple-init/multiple_init.py
@@ -0,0 +1,117 @@
+#Calling a method multiple times by using explicit calls when a base uses super()
+class Base(object):
+
+    def __init__(self):
+        print("Base init")
+
+class C1(Base):
+
+    def __init__(self):
+        print("C1 init")
+        super(C1, self).__init__()
+
+class C2(Base):
+
+    def __init__(self):
+        print("C2 init")
+        super(C2, self).__init__()  #When `type(self) == C3` this calls `C1.__init__`
+
+class C3(C2, C1):
+
+    def __init__(self): # $ Alert
+        print("C3 init")
+        C1.__init__(self)
+        C2.__init__(self)
+
+C3()
+
+#Calling a method multiple times by using explicit calls when a base inherits from other base
+class D1(object):
+
+    def __init__(self):
+        print("D1 init")
+
+class D2(D1):
+
+    def __init__(self):
+        print("D2 init")
+        D1.__init__(self)
+
+class D3(D2, D1):
+
+    def __init__(self): # $ Alert
+        print("D3 init")
+        D1.__init__(self)
+        D2.__init__(self)
+
+D3()
+
+#OK to call object.__init__ multiple times
+class E1(object):
+
+    def __init__(self):
+        print("E1 init")
+        super(E1, self).__init__()
+
+class E2(object):
+
+    def __init__(self):
+        print("E2 init")
+        object.__init__(self)
+
+class E3(E2, E1): 
+
+    def __init__(self): # OK: builtin init methods are fine.
+        E1.__init__(self)
+        E2.__init__(self)
+
+E3()
+
+
+class F1:
+    pass 
+
+class F2(F1):
+    def __init__(self):
+        print("F2 init") 
+        super().__init__()
+
+class F3(F1):
+    def __init__(self):
+        print("F3 init")
+
+class F4(F2, F3):
+    def __init__(self): # $ Alert # F2's super call calls F3
+        print("F4 init")
+        F2.__init__(self)
+        F3.__init__(self)
+
+F4()
+
+class G1:
+    def __init__(self):
+        print("G1 init") 
+
+class G2(G1):
+    def __init__(self):
+        print("G2 init") 
+        G1.__init__(self)
+
+class G3(G1):
+    def __init__(self):
+        print("G3 init") 
+        G1.__init__(self)
+
+class G4(G1):
+    def __init__(self):
+        print("G4 init") 
+        G1.__init__(self)
+
+class G5(G2,G3,G4):
+    def __init__(self): # $ Alert # Only one alert is generated, that mentions the first two calls
+        print("G5 init") 
+        G2.__init__(self)
+        G3.__init__(self)
+        G4.__init__(self)
+
+G5()
\ No newline at end of file
diff --git a/python/ql/test/query-tests/Classes/multiple/multiple_init.py b/python/ql/test/query-tests/Classes/multiple/multiple_init.py
deleted file mode 100644
index 6a97ef67f6c..00000000000
--- a/python/ql/test/query-tests/Classes/multiple/multiple_init.py
+++ /dev/null
@@ -1,76 +0,0 @@
-#Calling a method multiple times by using explicit calls when a base uses super()
-class Base(object):
-
-    def __init__(self):
-        pass
-
-class C1(Base):
-
-    def __init__(self):
-        super(C1, self).__init__()
-
-class C2(Base):
-
-    def __init__(self):
-        super(C2, self).__init__()  #When `type(self) == C3` this calls `C1.__init__`
-
-class C3(C2, C1):
-
-    def __init__(self):
-        C1.__init__(self)
-        C2.__init__(self)
-
-#Calling a method multiple times by using explicit calls when a base inherits from other base
-class D1(object):
-
-    def __init__(self):
-        pass
-
-class D2(D1):
-
-    def __init__(self):
-        D1.__init__(self)
-
-class D3(D2, D1):
-
-    def __init__(self):
-        D1.__init__(self)
-        D2.__init__(self)
-
-#OK to call object.__init__ multiple times
-class E1(object):
-
-    def __init__(self):
-        super(E1, self).__init__()
-
-class E2(object):
-
-    def __init__(self):
-        object.__init__(self)
-
-class E3(E2, E1): 
-
-    def __init__(self):
-        E1.__init__(self)
-        E2.__init__(self)
-
-#Two invocations, but can only be called once
-class F1(Base):
-
-    def __init__(self, cond):
-        if cond:
-            Base.__init__(self)
-        else:
-            Base.__init__(self)
-
-#Single call, splitting causes what seems to be multiple invocations.
-class F2(Base):
-
-    def __init__(self, cond):
-        if cond:
-            pass
-        if cond:
-            pass
-        Base.__init__(self)
-
-
diff --git a/python/ql/test/query-tests/Classes/subclass-shadowing/SubclassShadowing.expected b/python/ql/test/query-tests/Classes/subclass-shadowing/SubclassShadowing.expected
index caad71a9a31..94912eb1f91 100644
--- a/python/ql/test/query-tests/Classes/subclass-shadowing/SubclassShadowing.expected
+++ b/python/ql/test/query-tests/Classes/subclass-shadowing/SubclassShadowing.expected
@@ -1 +1,2 @@
-| subclass_shadowing.py:10:5:10:21 | FunctionExpr | Method shadow is shadowed by an $@ in super class 'Base'. | subclass_shadowing.py:6:9:6:23 | AssignStmt | attribute |
+| subclass_shadowing.py:11:5:11:21 | Function shadow | This method is shadowed by $@ in superclass $@. | subclass_shadowing.py:7:9:7:19 | ControlFlowNode for Attribute | attribute shadow | subclass_shadowing.py:4:1:4:11 | Class Base | Base |
+| subclass_shadowing.py:41:5:41:18 | Function foo | This method is shadowed by $@ in superclass $@. (read-only property may cause an error if written to in the superclass) | subclass_shadowing.py:35:9:35:16 | ControlFlowNode for Attribute | attribute foo | subclass_shadowing.py:33:1:33:12 | Class Base3 | Base3 |
diff --git a/python/ql/test/query-tests/Classes/subclass-shadowing/SubclassShadowing.qlref b/python/ql/test/query-tests/Classes/subclass-shadowing/SubclassShadowing.qlref
index 5fed3f9f8fc..5205014a3d5 100644
--- a/python/ql/test/query-tests/Classes/subclass-shadowing/SubclassShadowing.qlref
+++ b/python/ql/test/query-tests/Classes/subclass-shadowing/SubclassShadowing.qlref
@@ -1 +1,2 @@
-Classes/SubclassShadowing.ql
+query: Classes/SubclassShadowing/SubclassShadowing.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/python/ql/test/query-tests/Classes/subclass-shadowing/subclass_shadowing.py b/python/ql/test/query-tests/Classes/subclass-shadowing/subclass_shadowing.py
index 98e7f992e84..b9fcd975eb3 100644
--- a/python/ql/test/query-tests/Classes/subclass-shadowing/subclass_shadowing.py
+++ b/python/ql/test/query-tests/Classes/subclass-shadowing/subclass_shadowing.py
@@ -1,30 +1,51 @@
 #Subclass shadowing
 
-class Base(object):
+# BAD: `shadow` method shadows attribute
+class Base:
 
     def __init__(self):
         self.shadow = 4
 
 class Derived(Base):
 
-    def shadow(self):
+    def shadow(self): # $ Alert 
         pass
     
     
-#OK if the super class defines the method as well.
-#Since the original method must exist for some reason.
-#See JSONEncoder.default for real example
+# OK: Allow if superclass also shadows its own method, as this is likely intended.
+# Example: stdlib JSONEncoder.default uses this pattern.  
+class Base2:
 
-class Base2(object):
+    def __init__(self, default=None):
+        if default:
+            self.default = default
 
-    def __init__(self, shadowy=None):
-        if shadowy:
-            self.shadow = shadowy
-
-    def shadow(self):
+    def default(self):
         pass
 
 class Derived2(Base2):
 
-    def shadow(self):
+    def default(self): # No alert
         return 0
+
+# Properties 
+
+class Base3:
+    def __init__(self):
+        self.foo = 1 
+        self.bar = 2 
+
+class Derived3(Base3):
+    # BAD: Write to foo in superclass init raises an error.
+    @property 
+    def foo(self): # $ Alert
+        return 2 
+    
+    # OK: This property has a setter, so the write is OK.
+    @property 
+    def bar(self): # No alert
+        return self._bar 
+    
+    @bar.setter 
+    def bar(self, val):
+        self._bar = val
\ No newline at end of file
diff --git a/python/ql/test/query-tests/Exceptions/general/CatchingBaseException.expected b/python/ql/test/query-tests/Exceptions/general/CatchingBaseException.expected
index 8cbb6d9c961..dbc838a90be 100644
--- a/python/ql/test/query-tests/Exceptions/general/CatchingBaseException.expected
+++ b/python/ql/test/query-tests/Exceptions/general/CatchingBaseException.expected
@@ -1,2 +1,2 @@
 | exceptions_test.py:7:5:7:11 | ExceptStmt | Except block directly handles BaseException. |
-| exceptions_test.py:71:5:71:25 | ExceptStmt | Except block directly handles BaseException. |
+| exceptions_test.py:97:5:97:25 | ExceptStmt | Except block directly handles BaseException. |
diff --git a/python/ql/test/query-tests/Exceptions/general/EmptyExcept.expected b/python/ql/test/query-tests/Exceptions/general/EmptyExcept.expected
index 57c50449af8..f9d9c69dd87 100644
--- a/python/ql/test/query-tests/Exceptions/general/EmptyExcept.expected
+++ b/python/ql/test/query-tests/Exceptions/general/EmptyExcept.expected
@@ -1,2 +1,5 @@
 | exceptions_test.py:7:5:7:11 | ExceptStmt | 'except' clause does nothing but pass and there is no explanatory comment. |
 | exceptions_test.py:13:5:13:21 | ExceptStmt | 'except' clause does nothing but pass and there is no explanatory comment. |
+| exceptions_test.py:72:1:72:18 | ExceptStmt | 'except' clause does nothing but pass and there is no explanatory comment. |
+| exceptions_test.py:85:1:85:17 | ExceptStmt | 'except' clause does nothing but pass and there is no explanatory comment. |
+| exceptions_test.py:89:1:89:17 | ExceptStmt | 'except' clause does nothing but pass and there is no explanatory comment. |
diff --git a/python/ql/test/query-tests/Exceptions/general/IllegalExceptionHandlerType.expected b/python/ql/test/query-tests/Exceptions/general/IllegalExceptionHandlerType.expected
index 0864dd0fe30..5ba0c716371 100644
--- a/python/ql/test/query-tests/Exceptions/general/IllegalExceptionHandlerType.expected
+++ b/python/ql/test/query-tests/Exceptions/general/IllegalExceptionHandlerType.expected
@@ -1,4 +1,4 @@
 | exceptions_test.py:51:5:51:25 | ExceptStmt | Non-exception $@ in exception handler which will never match raised exception. | exceptions_test.py:33:1:33:28 | ControlFlowNode for ClassExpr | class 'NotException1' |
 | exceptions_test.py:54:5:54:25 | ExceptStmt | Non-exception $@ in exception handler which will never match raised exception. | exceptions_test.py:36:1:36:28 | ControlFlowNode for ClassExpr | class 'NotException2' |
-| exceptions_test.py:112:5:112:22 | ExceptStmt | Non-exception $@ in exception handler which will never match raised exception. | exceptions_test.py:107:12:107:14 | ControlFlowNode for FloatLiteral | instance of 'float' |
+| exceptions_test.py:138:5:138:22 | ExceptStmt | Non-exception $@ in exception handler which will never match raised exception. | exceptions_test.py:133:12:133:14 | ControlFlowNode for FloatLiteral | instance of 'float' |
 | pypy_test.py:14:5:14:14 | ExceptStmt | Non-exception $@ in exception handler which will never match raised exception. | pypy_test.py:14:12:14:13 | ControlFlowNode for IntegerLiteral | instance of 'int' |
diff --git a/python/ql/test/query-tests/Exceptions/general/IncorrectExceptOrder.expected b/python/ql/test/query-tests/Exceptions/general/IncorrectExceptOrder.expected
index 160d5176724..3fab57be376 100644
--- a/python/ql/test/query-tests/Exceptions/general/IncorrectExceptOrder.expected
+++ b/python/ql/test/query-tests/Exceptions/general/IncorrectExceptOrder.expected
@@ -1 +1 @@
-| exceptions_test.py:64:1:64:22 | ExceptStmt | Except block for $@ is unreachable; the more general $@ for $@ will always be executed in preference. | file://:0:0:0:0 | builtin-class AttributeError | AttributeError | exceptions_test.py:62:1:62:17 | ExceptStmt | except block | file://:0:0:0:0 | builtin-class Exception | Exception |
+| exceptions_test.py:64:1:64:22 | ExceptStmt | This except block handling $@ is unreachable; as $@ for the more general $@ always subsumes it. | file://:0:0:0:0 | AttributeError | AttributeError | exceptions_test.py:62:1:62:17 | ExceptStmt | this except block | file://:0:0:0:0 | Exception | Exception |
diff --git a/python/ql/test/query-tests/Exceptions/general/IncorrectExceptOrder.qlref b/python/ql/test/query-tests/Exceptions/general/IncorrectExceptOrder.qlref
index bc4c3a07081..5844968f9d6 100644
--- a/python/ql/test/query-tests/Exceptions/general/IncorrectExceptOrder.qlref
+++ b/python/ql/test/query-tests/Exceptions/general/IncorrectExceptOrder.qlref
@@ -1 +1,2 @@
-Exceptions/IncorrectExceptOrder.ql
+query: Exceptions/IncorrectExceptOrder.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/python/ql/test/query-tests/Exceptions/general/NotImplementedIsNotAnException.expected b/python/ql/test/query-tests/Exceptions/general/NotImplementedIsNotAnException.expected
index 7c5ee490b4e..0bb863ccfed 100644
--- a/python/ql/test/query-tests/Exceptions/general/NotImplementedIsNotAnException.expected
+++ b/python/ql/test/query-tests/Exceptions/general/NotImplementedIsNotAnException.expected
@@ -1,2 +1,2 @@
-| exceptions_test.py:170:11:170:24 | NotImplemented | NotImplemented is not an Exception. Did you mean NotImplementedError? |
-| exceptions_test.py:173:11:173:26 | NotImplemented() | NotImplemented is not an Exception. Did you mean NotImplementedError? |
+| exceptions_test.py:196:11:196:24 | NotImplemented | NotImplemented is not an Exception. Did you mean NotImplementedError? |
+| exceptions_test.py:199:11:199:26 | NotImplemented() | NotImplemented is not an Exception. Did you mean NotImplementedError? |
diff --git a/python/ql/test/query-tests/Exceptions/general/exceptions_test.py b/python/ql/test/query-tests/Exceptions/general/exceptions_test.py
index d3f782f874f..cf197683f15 100644
--- a/python/ql/test/query-tests/Exceptions/general/exceptions_test.py
+++ b/python/ql/test/query-tests/Exceptions/general/exceptions_test.py
@@ -61,8 +61,34 @@ try:
     val.attr
 except Exception:
     print (2)
-except AttributeError:
+except AttributeError: # $Alert[py/unreachable-except]
     print (3)
+
+class MyExc(ValueError):
+    pass 
+
+try:
+    pass
+except ValueError:
+    pass 
+except MyExc: # $MISSING:Alert[py/unreachable-except] # Missing due to dataflow limitiation preventing MyExc from being tracked here.
+    pass 
+
+class MyBaseExc(Exception):
+    pass 
+
+class MySubExc(MyBaseExc):
+    pass 
+
+try:
+    pass
+except MyBaseExc:
+    pass 
+except MySubExc: # $MISSING:Alert[py/unreachable-except] # Missing due to dataflow limitation preventing MyExc from being tracked here.
+    pass 
+except Exception:
+    pass
+
     
 #Catch BaseException
 def catch_base_exception():
diff --git a/python/ql/test/query-tests/Expressions/Regex/test.py b/python/ql/test/query-tests/Expressions/Regex/test.py
index 6dadbccb4b6..717663e335c 100644
--- a/python/ql/test/query-tests/Expressions/Regex/test.py
+++ b/python/ql/test/query-tests/Expressions/Regex/test.py
@@ -150,4 +150,12 @@ re.compile(r"[\U00010000-\U0010FFFF]")
 re.compile(r"[\u0000-\uFFFF]")
 
 #Allow unicode names
-re.compile(r"[\N{degree sign}\N{EM DASH}]")
\ No newline at end of file
+re.compile(r"[\N{degree sign}\N{EM DASH}]")
+
+#Lookahead assertions. None of these are unmatchable dollars:
+re.compile(r"^(?=a$)[ab]")
+re.compile(r"^(?!a$)[ab]")
+
+#Lookbehind assertions. None of these are unmatchable carets:
+re.compile(r"(?<=^a)a")
+re.compile(r"(?<!^a)a")
diff --git a/python/ql/test/query-tests/Functions/IncorrectRaiseInSpecialMethod/IncorrectRaiseInSpecialMethod.expected b/python/ql/test/query-tests/Functions/IncorrectRaiseInSpecialMethod/IncorrectRaiseInSpecialMethod.expected
new file mode 100644
index 00000000000..3907a725ee1
--- /dev/null
+++ b/python/ql/test/query-tests/Functions/IncorrectRaiseInSpecialMethod/IncorrectRaiseInSpecialMethod.expected
@@ -0,0 +1,6 @@
+| test.py:6:5:6:33 | Function __getitem__ | This method always raises $@ - should raise a LookupError (KeyError or IndexError) instead. | test.py:7:15:7:33 | ZeroDivisionError() | ZeroDivisionError |
+| test.py:9:5:9:32 | Function __getattr__ | This method always raises $@ - should raise an AttributeError instead. | test.py:10:15:10:33 | ZeroDivisionError() | ZeroDivisionError |
+| test.py:12:5:12:23 | Function __bool__ | This method always raises $@ - should raise a TypeError instead. | test.py:13:15:13:26 | ValueError() | ValueError |
+| test.py:15:5:15:22 | Function __int__ | This method always raises $@ - this method does not need to be implemented. | test.py:16:15:16:26 | ValueError() | ValueError |
+| test.py:24:5:24:23 | Function __hash__ | This method always raises $@ - use __hash__ = None instead. | test.py:25:15:25:35 | NotImplementedError() | NotImplementedError |
+| test.py:28:5:28:29 | Function __sub__ | This method raises $@ - should raise an ArithmeticError or return NotImplemented instead. | test.py:30:19:30:29 | TypeError() | TypeError |
diff --git a/python/ql/test/query-tests/Functions/IncorrectRaiseInSpecialMethod/IncorrectRaiseInSpecialMethod.qlref b/python/ql/test/query-tests/Functions/IncorrectRaiseInSpecialMethod/IncorrectRaiseInSpecialMethod.qlref
new file mode 100644
index 00000000000..a81e499ea66
--- /dev/null
+++ b/python/ql/test/query-tests/Functions/IncorrectRaiseInSpecialMethod/IncorrectRaiseInSpecialMethod.qlref
@@ -0,0 +1,2 @@
+query: Functions/IncorrectRaiseInSpecialMethod.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/python/ql/test/query-tests/Functions/IncorrectRaiseInSpecialMethod/test.py b/python/ql/test/query-tests/Functions/IncorrectRaiseInSpecialMethod/test.py
new file mode 100644
index 00000000000..d5b1bc585f6
--- /dev/null
+++ b/python/ql/test/query-tests/Functions/IncorrectRaiseInSpecialMethod/test.py
@@ -0,0 +1,66 @@
+class A:
+
+    def __add__(self, other): # No alert - Always allow NotImplementedError
+        raise NotImplementedError() 
+
+    def __getitem__(self, index): # $ Alert
+        raise ZeroDivisionError() 
+
+    def __getattr__(self, name): # $ Alert
+        raise ZeroDivisionError() 
+
+    def __bool__(self): # $ Alert
+        raise ValueError() 
+    
+    def __int__(self): # $ Alert # Cast method need not be defined to always raise
+        raise ValueError() 
+
+    def __float__(self): # No alert - OK to raise conditionally
+        if self.z:
+            return 0 
+        else:
+            raise ValueError()
+
+    def __hash__(self): # $ Alert # should use __hash__=None rather than stub implementation to make class unhashable
+        raise NotImplementedError()
+
+class B:
+    def __sub__(self, other): # $ Alert # should return NotImplemented instead
+        if not isinstance(other,B):
+            raise TypeError()
+        return self
+        
+    def __add__(self, other): # No alert - allow add to raise a TypeError, as it is sometimes used for sequence concatenation as well as arithmetic 
+        if not isinstance(other,B):
+            raise TypeError()
+        return self
+
+    def __setitem__(self, key, val): # No alert - allow setitem to raise arbitrary exceptions as they could be due to the value, rather than a LookupError relating to the key
+        if val < 0:
+            raise ValueError()
+
+    def __getitem__(self, key): # No alert - indexing method allowed to raise TypeError or subclasses of LookupError. 
+        if not isinstance(key, int):
+            raise TypeError()
+        if key < 0:
+            raise KeyError()
+        return 3
+
+    def __getattribute__(self, name):
+        if name != "a":
+            raise AttributeError() 
+        return 2
+
+    def __div__(self, other):
+        if other == 0:
+            raise ZeroDivisionError()
+        return self 
+
+    
+class D:
+    def __int__(self):
+        return 2 
+
+class E(D):
+    def __int__(self): # No alert - cast method may override to raise exception
+        raise TypeError()
\ No newline at end of file
diff --git a/python/ql/test/query-tests/Functions/general/IncorrectRaiseInSpecialMethod.expected b/python/ql/test/query-tests/Functions/general/IncorrectRaiseInSpecialMethod.expected
deleted file mode 100644
index dd4429de02e..00000000000
--- a/python/ql/test/query-tests/Functions/general/IncorrectRaiseInSpecialMethod.expected
+++ /dev/null
@@ -1,3 +0,0 @@
-| protocols.py:98:5:98:33 | Function __getitem__ | Function always raises $@; raise LookupError instead | file://:Compiled Code:0:0:0:0 | builtin-class ZeroDivisionError | builtin-class ZeroDivisionError |
-| protocols.py:101:5:101:26 | Function __getattr__ | Function always raises $@; raise AttributeError instead | file://:Compiled Code:0:0:0:0 | builtin-class ZeroDivisionError | builtin-class ZeroDivisionError |
-| protocols.py:104:5:104:23 | Function __bool__ | Function always raises $@; raise TypeError instead | file://:Compiled Code:0:0:0:0 | builtin-class ZeroDivisionError | builtin-class ZeroDivisionError |
diff --git a/python/ql/test/query-tests/Functions/general/IncorrectRaiseInSpecialMethod.qlref b/python/ql/test/query-tests/Functions/general/IncorrectRaiseInSpecialMethod.qlref
deleted file mode 100644
index 07fd22a9376..00000000000
--- a/python/ql/test/query-tests/Functions/general/IncorrectRaiseInSpecialMethod.qlref
+++ /dev/null
@@ -1 +0,0 @@
-Functions/IncorrectRaiseInSpecialMethod.ql
\ No newline at end of file
diff --git a/python/ql/test/query-tests/Functions/general/SignatureOverriddenMethod.expected b/python/ql/test/query-tests/Functions/general/SignatureOverriddenMethod.expected
index 81c45ab8abe..21b11212075 100644
--- a/python/ql/test/query-tests/Functions/general/SignatureOverriddenMethod.expected
+++ b/python/ql/test/query-tests/Functions/general/SignatureOverriddenMethod.expected
@@ -1,2 +1,2 @@
-| om_test.py:32:5:32:35 | Function Derived.grossly_wrong1 | Overriding method 'grossly_wrong1' has signature mismatch with $@. | om_test.py:12:5:12:41 | Function Base.grossly_wrong1 | overridden method |
-| om_test.py:35:5:35:47 | Function Derived.grossly_wrong2 | Overriding method 'grossly_wrong2' has signature mismatch with $@. | om_test.py:15:5:15:41 | Function Base.grossly_wrong2 | overridden method |
+| om_test.py:32:5:32:35 | Function grossly_wrong1 | This method requires 2 positional arguments, whereas overridden $@ requires 3. | om_test.py:12:5:12:41 | Function grossly_wrong1 | Base.grossly_wrong1 | file://:0:0:0:0 | (none) | This call |
+| om_test.py:35:5:35:47 | Function grossly_wrong2 | This method requires 4 positional arguments, whereas overridden $@ requires 3. | om_test.py:15:5:15:41 | Function grossly_wrong2 | Base.grossly_wrong2 | file://:0:0:0:0 | (none) | This call |
diff --git a/python/ql/test/query-tests/Functions/overriding/SignatureOverriddenMethod.expected b/python/ql/test/query-tests/Functions/overriding/SignatureOverriddenMethod.expected
index bcb9363a55a..07756ee4600 100644
--- a/python/ql/test/query-tests/Functions/overriding/SignatureOverriddenMethod.expected
+++ b/python/ql/test/query-tests/Functions/overriding/SignatureOverriddenMethod.expected
@@ -1 +1,13 @@
-| test.py:30:5:30:26 | Function Derived.meth3 | Overriding method 'meth3' has signature mismatch with $@. | test.py:11:5:11:20 | Function Base.meth3 | overridden method |
+| test.py:24:5:24:26 | Function meth1 | This method requires 2 positional arguments, whereas overridden $@ requires 1. $@ correctly calls the base method, but does not match the signature of the overriding method. | test.py:5:5:5:20 | Function meth1 | Base.meth1 | test.py:15:9:15:20 | Attribute() | This call |
+| test.py:27:5:27:20 | Function meth2 | This method requires 1 positional argument, whereas overridden $@ requires 2. $@ correctly calls the base method, but does not match the signature of the overriding method. | test.py:8:5:8:26 | Function meth2 | Base.meth2 | test.py:18:9:18:21 | Attribute() | This call |
+| test.py:30:5:30:26 | Function meth3 | This method requires 2 positional arguments, whereas overridden $@ requires 1. | test.py:11:5:11:20 | Function meth3 | Base.meth3 | file://:0:0:0:0 | (none) | This call |
+| test.py:69:5:69:24 | Function meth | This method requires 2 positional arguments, whereas overridden $@ requires 1. | test.py:64:5:64:19 | Function meth | BlameBase.meth | file://:0:0:0:0 | (none) | This call |
+| test.py:74:5:74:24 | Function meth | This method requires 2 positional arguments, whereas overridden $@ requires 1. | test.py:64:5:64:19 | Function meth | BlameBase.meth | file://:0:0:0:0 | (none) | This call |
+| test.py:125:5:125:20 | Function meth1 | This method requires 1 positional argument, whereas overridden $@ may be called with 2. $@ correctly calls the base method, but does not match the signature of the overriding method. | test.py:82:5:82:25 | Function meth1 | Base2.meth1 | test.py:110:9:110:23 | Attribute() | This call |
+| test.py:131:5:131:31 | Function meth4 | This method requires at least 3 positional arguments, whereas overridden $@ requires at most 2. | test.py:88:5:88:25 | Function meth4 | Base2.meth4 | file://:0:0:0:0 | (none) | This call |
+| test.py:133:5:133:28 | Function meth5 | This method requires at most 3 positional arguments, whereas overridden $@ requires at least 4. | test.py:90:5:90:34 | Function meth5 | Base2.meth5 | file://:0:0:0:0 | (none) | This call |
+| test.py:135:5:135:23 | Function meth6 | This method requires 2 positional arguments, whereas overridden $@ may be called with arbitrarily many. $@ correctly calls the base method, but does not match the signature of the overriding method. | test.py:92:5:92:28 | Function meth6 | Base2.meth6 | test.py:113:9:113:27 | Attribute() | This call |
+| test.py:137:5:137:28 | Function meth7 | This method requires at least 2 positional arguments, whereas overridden $@ may be called with 1. $@ correctly calls the base method, but does not match the signature of the overriding method. | test.py:94:5:94:25 | Function meth7 | Base2.meth7 | test.py:114:9:114:20 | Attribute() | This call |
+| test.py:139:5:139:26 | Function meth8 | This method does not accept keyword argument `y`, which overridden $@ does. $@ correctly calls the base method, but does not match the signature of the overriding method. | test.py:96:5:96:26 | Function meth8 | Base2.meth8 | test.py:115:9:115:25 | Attribute() | This call |
+| test.py:147:5:147:21 | Function meth12 | This method does not accept arbitrary keyword arguments, which overridden $@ does. $@ correctly calls the base method, but does not match the signature of the overriding method. | test.py:104:5:104:31 | Function meth12 | Base2.meth12 | test.py:119:9:119:24 | Attribute() | This call |
+| test.py:149:5:149:27 | Function meth13 | This method does not accept keyword argument `x`, which overridden $@ does. $@ correctly calls the base method, but does not match the signature of the overriding method. | test.py:106:5:106:27 | Function meth13 | Base2.meth13 | test.py:120:9:120:24 | Attribute() | This call |
diff --git a/python/ql/test/query-tests/Functions/overriding/SignatureOverriddenMethod.qlref b/python/ql/test/query-tests/Functions/overriding/SignatureOverriddenMethod.qlref
index a306477b3b4..5470a05e0e4 100644
--- a/python/ql/test/query-tests/Functions/overriding/SignatureOverriddenMethod.qlref
+++ b/python/ql/test/query-tests/Functions/overriding/SignatureOverriddenMethod.qlref
@@ -1 +1,2 @@
-Functions/SignatureOverriddenMethod.ql
+query: Functions/SignatureOverriddenMethod.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/python/ql/test/query-tests/Functions/overriding/WrongNameForArgumentInCall.expected b/python/ql/test/query-tests/Functions/overriding/WrongNameForArgumentInCall.expected
index d2fc2ef6784..0cadf5e5fbf 100644
--- a/python/ql/test/query-tests/Functions/overriding/WrongNameForArgumentInCall.expected
+++ b/python/ql/test/query-tests/Functions/overriding/WrongNameForArgumentInCall.expected
@@ -1 +1,2 @@
 | test.py:19:9:19:31 | Attribute() | Keyword argument 'spam' is not a supported parameter name of $@. | test.py:5:5:5:20 | Function meth1 | method Base.meth1 |
+| test.py:112:9:112:23 | Attribute() | Keyword argument 'x' is not a supported parameter name of $@. | test.py:86:5:86:20 | Function meth3 | method Base2.meth3 |
diff --git a/python/ql/test/query-tests/Functions/overriding/test.py b/python/ql/test/query-tests/Functions/overriding/test.py
index c4c7caaa1aa..63ee50e820c 100644
--- a/python/ql/test/query-tests/Functions/overriding/test.py
+++ b/python/ql/test/query-tests/Functions/overriding/test.py
@@ -21,13 +21,13 @@ class Base(object):
 
 class Derived(Base):
 
-    def meth1(self, spam):
+    def meth1(self, spam): # $Alert[py/inheritance/signature-mismatch] # Has 1 more arg, base called in Base.foo
         pass
 
-    def meth2(self):
+    def meth2(self): # $Alert[py/inheritance/signature-mismatch] # Has 1 fewer arg, base called in Base.foo
         pass
 
-    def meth3(self, eggs): #Incorrectly overridden and not called. 
+    def meth3(self, eggs): # $Alert[py/inheritance/signature-mismatch] # Has 1 more arg. Method is not called.
         pass
 
     def bar(self):
@@ -66,13 +66,84 @@ class BlameBase(object):
 
 class Correct1(BlameBase):
 
-    def meth(self, arg):
+    def meth(self, arg): # $Alert[py/inheritance/signature-mismatch] # Has 1 more arg. The incorrect-overridden-method query would alert for the base method in this case.
         pass
 
 class Correct2(BlameBase):
 
-    def meth(self, arg):
+    def meth(self, arg): # $Alert[py/inheritance/signature-mismatch] # Has 1 more arg
         pass
 
 c = Correct2()
 c.meth("hi")
+
+class Base2:
+
+    def meth1(self, x=1): pass
+
+    def meth2(self, x=1): pass
+
+    def meth3(self): pass
+
+    def meth4(self, x=1): pass
+
+    def meth5(self, x, y, z, w=1): pass
+
+    def meth6(self, x, *ys): pass
+
+    def meth7(self, *ys): pass
+
+    def meth8(self, x, y): pass
+
+    def meth9(self, x, y): pass
+
+    def meth10(self, x, *, y=3): pass
+
+    def meth11(self, x, y): pass
+
+    def meth12(self, **kwargs): pass
+
+    def meth13(self, /, x): pass
+
+    def call_some(self):
+        self.meth1()
+        self.meth1(x=2)
+        self.meth3()
+        self.meth3(x=2)
+        self.meth6(2, 3, 4)
+        self.meth7()
+        self.meth8(1,y=3)
+        self.meth9(1,2)
+        self.meth10(1,y=3)
+        self.meth11(1,y=3)
+        self.meth12(x=2)
+        self.meth13(x=2)
+
+
+class Derrived2(Base2):
+
+    def meth1(self): pass # $Alert[py/inheritance/signature-mismatch] # Weak mismatch (base may be called with 2 args. only alert if mismatching call exists)
+
+    def meth2(self): pass # No alert (weak mismatch, but not called)
+
+    def meth3(self, x=1): pass # No alert (no mismatch - all base calls are valid for sub)
+
+    def meth4(self, x, y, z=1): pass # $Alert[py/inheritance/signature-mismatch] # sub min > base max (strong mismatch)
+
+    def meth5(self, x, y=1): pass # $Alert[py/inheritance/signature-mismatch]
+
+    def meth6(self, x): pass # $Alert[py/inheritance/signature-mismatch] # weak mismatch (base may be called with 3+ args)
+
+    def meth7(self, x, *ys): pass # $Alert[py/inheritance/signature-mismatch] # weak mismatch (base may be called with 1 arg only)
+
+    def meth8(self, x, z): pass # $Alert[py/inheritance/signature-mismatch] # weak mismatch (base may be called with arg named y)
+
+    def meth9(self, x, z): pass # No alert (never called with wrong keyword arg)
+
+    def meth10(self, x, **kwargs): pass # No alert (y is kw-only arg in base, calls that use it are valid for sub)
+
+    def meth11(self, x, z, **kwargs): pass # $MISSING:Alert[py/inheritance/signature-mismatch] # call using y kw-arg is invalid due to not specifying z, but this is not detected. Likely a fairly niche situation.
+
+    def meth12(self): pass # $Alert[py/inheritance/signature-mismatch] # call including extra kwarg invalid
+
+    def meth13(self, /, y): pass # $Alert[py/inheritance/signature-mismatch] # weak mismatch (base may be called with arg named x), however meth13 is incorrectly detected as having 2 minimum positional arguments, whereas x is kw-only; resulting in the witness call not being detected as a valid call to Base2.meth13. 
diff --git a/python/ql/test/query-tests/Resources/FileNotAlwaysClosed/FileNotAlwaysClosed.expected b/python/ql/test/query-tests/Resources/FileNotAlwaysClosed/FileNotAlwaysClosed.expected
new file mode 100644
index 00000000000..7f48feb72eb
--- /dev/null
+++ b/python/ql/test/query-tests/Resources/FileNotAlwaysClosed/FileNotAlwaysClosed.expected
@@ -0,0 +1,9 @@
+| resources_test.py:4:10:4:25 | ControlFlowNode for open() | File may not be closed if $@ raises an exception. | resources_test.py:5:5:5:33 | ControlFlowNode for Attribute() | this operation |
+| resources_test.py:9:10:9:25 | ControlFlowNode for open() | File is opened but is not closed. | file://:0:0:0:0 | (none) | this operation |
+| resources_test.py:108:11:108:20 | ControlFlowNode for open() | File is opened but is not closed. | file://:0:0:0:0 | (none) | this operation |
+| resources_test.py:112:11:112:28 | ControlFlowNode for opener_func2() | File may not be closed if $@ raises an exception. | resources_test.py:113:5:113:22 | ControlFlowNode for Attribute() | this operation |
+| resources_test.py:123:11:123:24 | ControlFlowNode for opener_func2() | File is opened but is not closed. | file://:0:0:0:0 | (none) | this operation |
+| resources_test.py:129:15:129:24 | ControlFlowNode for open() | File may not be closed if $@ raises an exception. | resources_test.py:130:9:130:26 | ControlFlowNode for Attribute() | this operation |
+| resources_test.py:248:11:248:25 | ControlFlowNode for open() | File is opened but is not closed. | file://:0:0:0:0 | (none) | this operation |
+| resources_test.py:269:10:269:27 | ControlFlowNode for Attribute() | File may not be closed if $@ raises an exception. | resources_test.py:271:5:271:19 | ControlFlowNode for Attribute() | this operation |
+| resources_test.py:285:11:285:20 | ControlFlowNode for open() | File may not be closed if $@ raises an exception. | resources_test.py:287:5:287:31 | ControlFlowNode for Attribute() | this operation |
diff --git a/python/ql/test/query-tests/Resources/FileNotAlwaysClosed/FileNotAlwaysClosed.qlref b/python/ql/test/query-tests/Resources/FileNotAlwaysClosed/FileNotAlwaysClosed.qlref
new file mode 100644
index 00000000000..57ffce32b8b
--- /dev/null
+++ b/python/ql/test/query-tests/Resources/FileNotAlwaysClosed/FileNotAlwaysClosed.qlref
@@ -0,0 +1,2 @@
+query: Resources/FileNotAlwaysClosed.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/python/ql/test/query-tests/Resources/FileNotAlwaysClosed/resources_test.py b/python/ql/test/query-tests/Resources/FileNotAlwaysClosed/resources_test.py
index 244c6f73c13..15ba9393715 100644
--- a/python/ql/test/query-tests/Resources/FileNotAlwaysClosed/resources_test.py
+++ b/python/ql/test/query-tests/Resources/FileNotAlwaysClosed/resources_test.py
@@ -1,12 +1,12 @@
 #File not always closed
 
 def not_close1():
-    f1 = open("filename") # $ notClosedOnException
+    f1 = open("filename") # $ Alert # not closed on exception
     f1.write("Error could occur")
     f1.close() 
 
 def not_close2():
-    f2 = open("filename") # $ notClosed
+    f2 = open("filename") # $ Alert 
 
 def closed3():
     f3 = open("filename")
@@ -46,7 +46,7 @@ def closed7():
 def not_closed8():
     f8 = None
     try:
-        f8 = open("filename") # $ MISSING:notClosedOnException 
+        f8 = open("filename") # $ MISSING:Alert # not closed on exception 
         f8.write("Error could occur")
     finally:
         if f8 is None: # We don't precisely consider this condition, so this result is MISSING. However, this seems uncommon.
@@ -105,11 +105,11 @@ def opener_func2(name):
     return t1
 
 def not_closed13(name):
-    f13 = open(name) # $ notClosed
+    f13 = open(name) # $ Alert 
     f13.write("Hello")
 
 def may_not_be_closed14(name):
-    f14 = opener_func2(name) # $ notClosedOnException
+    f14 = opener_func2(name) # $ Alert # not closed on exception
     f14.write("Hello")
     f14.close()
 
@@ -120,13 +120,13 @@ def closer2(t3):
     closer1(t3)
 
 def closed15():
-    f15 = opener_func2() # $ SPURIOUS:notClosed
+    f15 = opener_func2() # $ SPURIOUS:Alert 
     closer2(f15) # We don't detect that this call closes the file, so this result is SPURIOUS.
 
 
 def may_not_be_closed16(name):
     try:
-        f16 = open(name) # $ notClosedOnException
+        f16 = open(name) # $ Alert # not closed on exception
         f16.write("Hello")
         f16.close()
     except IOError:
@@ -138,7 +138,7 @@ def may_raise():
 
 #Not handling all exceptions, but we'll tolerate the false negative
 def not_closed17():
-    f17 = open("filename") # $ MISSING:notClosedOnException
+    f17 = open("filename") # $ MISSING:Alert # not closed on exception
     try:
         f17.write("IOError could occur")
         f17.write("IOError could occur")
@@ -151,11 +151,11 @@ def not_closed17():
 #With statement will close the fp
 def closed18(path):
     try:
-        f18 = open(path)
+        f18 = open(path) 
     except IOError as ex:
         print(ex)
         raise ex
-    with f18:
+    with f18: 
         f18.read()
 
 class Closed19(object):
@@ -234,7 +234,7 @@ def closed21(path):
 
 
 def not_closed22(path):
-    f22 = open(path, "wb") # $ MISSING:notClosedOnException
+    f22 = open(path, "wb") # $ MISSING:Alert # not closed on exception
     try:
         f22.write(b"foo")
         may_raise()
@@ -245,7 +245,7 @@ def not_closed22(path):
             f22.close()
 
 def not_closed23(path):
-    f23 = open(path, "w") # $ notClosed
+    f23 = open(path, "w") # $ Alert 
     wr = FileWrapper(f23)
 
 def closed24(path):
@@ -266,7 +266,7 @@ def closed26(path):
     os.close(fd)
 
 def not_closed27(path):
-    fd = os.open(path, "w") # $notClosedOnException
+    fd = os.open(path, "w") # $Alert # not closed on exception
     f27 = os.fdopen(fd, "w")
     f27.write("hi")
     f27.close()
@@ -282,6 +282,53 @@ def closed28(path):
 def closed29(path):
     # Due to an approximation in CFG reachability for performance, it is not detected that the `write` call that may raise occurs after the file has already been closed.
     # We presume this case to be uncommon.
-    f28 = open(path) # $SPURIOUS:notClosedOnException 
+    f28 = open(path) # $SPURIOUS:Alert # not closed on exception 
     f28.close()
-    f28.write("already closed") 
\ No newline at end of file
+    f28.write("already closed") 
+
+# False positive in a previous implementation:
+
+class NotWrapper:
+    def __init__(self, fp):
+        self.data = fp.read()
+        fp.close()
+
+    def do_something(self):
+        pass 
+
+def closed30(path):
+    # Combination of approximations resulted in this FP:
+    # - NotWrapper is treated as a wrapper class as a file handle is passed to it 
+    # - thing.do_something() is treated as a call that can raise an exception while a file is open
+    # - this call is treated as occurring after the open but not as being guarded by the with statement, as it is in the same basic block
+    # - - this behavior has been changed fixing the FP
+
+    with open(path) as fp: # No longer spurious alert here.
+        thing = NotWrapper(fp)
+
+    thing.do_something() 
+
+
+def closed31(path):
+    with open(path) as fp: 
+        data = fp.readline()
+        data2 = fp.readline()
+
+
+class Wrapper():
+    def __init__(self, f):
+        self.f = f
+    def read(self):
+        return self.f.read()
+    def __enter__(self):
+        pass
+    def __exit__(self,exc_type, exc_value,traceback):
+        self.f.close()
+
+def closed32(path):
+    with open(path, "rb") as f: # No longer spurious alert here.
+        wrap = Wrapper(f)
+        # This resulted in an FP in a previous implementation, 
+        # due to a check that an operation is lexically contained within a `with` block (with `expr.getParent*()`)
+        # not detecting this case.
+        return list(wrap.read())
\ No newline at end of file
diff --git a/python/ql/test/query-tests/Resources/FileNotAlwaysClosed/test.ql b/python/ql/test/query-tests/Resources/FileNotAlwaysClosed/test.ql
deleted file mode 100644
index f176172d078..00000000000
--- a/python/ql/test/query-tests/Resources/FileNotAlwaysClosed/test.ql
+++ /dev/null
@@ -1,25 +0,0 @@
-import python
-import Resources.FileNotAlwaysClosedQuery
-import utils.test.InlineExpectationsTest
-
-module MethodArgTest implements TestSig {
-  string getARelevantTag() { result = ["notClosed", "notClosedOnException"] }
-
-  predicate hasActualResult(Location location, string element, string tag, string value) {
-    exists(DataFlow::CfgNode el, FileOpen fo |
-      el = fo and
-      element = el.toString() and
-      location = el.getLocation() and
-      value = "" and
-      (
-        fileNotClosed(fo) and
-        tag = "notClosed"
-        or
-        fileMayNotBeClosedOnException(fo, _) and
-        tag = "notClosedOnException"
-      )
-    )
-  }
-}
-
-import MakeTest<MethodArgTest>
diff --git a/python/ql/test/query-tests/Security/CWE-022-PathInjection/DataflowQueryTest.expected b/python/ql/test/query-tests/Security/CWE-022-PathInjection/DataflowQueryTest.expected
deleted file mode 100644
index 2fad7bb9a84..00000000000
--- a/python/ql/test/query-tests/Security/CWE-022-PathInjection/DataflowQueryTest.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-missingAnnotationOnSink
-testFailures
diff --git a/python/ql/test/query-tests/Security/CWE-022-PathInjection/DataflowQueryTest.ql b/python/ql/test/query-tests/Security/CWE-022-PathInjection/DataflowQueryTest.ql
deleted file mode 100644
index e4720596a37..00000000000
--- a/python/ql/test/query-tests/Security/CWE-022-PathInjection/DataflowQueryTest.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-import python
-import utils.test.dataflow.DataflowQueryTest
-import semmle.python.security.dataflow.PathInjectionQuery
-import FromTaintTrackingStateConfig<PathInjectionConfig>
diff --git a/python/ql/test/query-tests/Security/CWE-022-PathInjection/PathInjection.expected b/python/ql/test/query-tests/Security/CWE-022-PathInjection/PathInjection.expected
index 37e4dd927d8..79b36070c01 100644
--- a/python/ql/test/query-tests/Security/CWE-022-PathInjection/PathInjection.expected
+++ b/python/ql/test/query-tests/Security/CWE-022-PathInjection/PathInjection.expected
@@ -1,4 +1,38 @@
+#select
+| fastapi_path_injection.py:7:19:7:26 | ControlFlowNode for filepath | fastapi_path_injection.py:17:21:17:24 | ControlFlowNode for path | fastapi_path_injection.py:7:19:7:26 | ControlFlowNode for filepath | This path depends on a $@. | fastapi_path_injection.py:17:21:17:24 | ControlFlowNode for path | user-provided value |
+| fastapi_path_injection.py:7:19:7:26 | ControlFlowNode for filepath | fastapi_path_injection.py:26:21:26:24 | ControlFlowNode for path | fastapi_path_injection.py:7:19:7:26 | ControlFlowNode for filepath | This path depends on a $@. | fastapi_path_injection.py:26:21:26:24 | ControlFlowNode for path | user-provided value |
+| fastapi_path_injection.py:7:19:7:26 | ControlFlowNode for filepath | fastapi_path_injection.py:31:21:31:24 | ControlFlowNode for path | fastapi_path_injection.py:7:19:7:26 | ControlFlowNode for filepath | This path depends on a $@. | fastapi_path_injection.py:31:21:31:24 | ControlFlowNode for path | user-provided value |
+| fastapi_path_injection.py:7:19:7:26 | ControlFlowNode for filepath | fastapi_path_injection.py:48:21:48:24 | ControlFlowNode for path | fastapi_path_injection.py:7:19:7:26 | ControlFlowNode for filepath | This path depends on a $@. | fastapi_path_injection.py:48:21:48:24 | ControlFlowNode for path | user-provided value |
+| flask_path_injection.py:21:32:21:38 | ControlFlowNode for dirname | flask_path_injection.py:1:26:1:32 | ControlFlowNode for ImportMember | flask_path_injection.py:21:32:21:38 | ControlFlowNode for dirname | This path depends on a $@. | flask_path_injection.py:1:26:1:32 | ControlFlowNode for ImportMember | user-provided value |
+| path_injection.py:13:14:13:47 | ControlFlowNode for Attribute() | path_injection.py:3:26:3:32 | ControlFlowNode for ImportMember | path_injection.py:13:14:13:47 | ControlFlowNode for Attribute() | This path depends on a $@. | path_injection.py:3:26:3:32 | ControlFlowNode for ImportMember | user-provided value |
+| path_injection.py:21:14:21:18 | ControlFlowNode for npath | path_injection.py:3:26:3:32 | ControlFlowNode for ImportMember | path_injection.py:21:14:21:18 | ControlFlowNode for npath | This path depends on a $@. | path_injection.py:3:26:3:32 | ControlFlowNode for ImportMember | user-provided value |
+| path_injection.py:31:14:31:18 | ControlFlowNode for npath | path_injection.py:3:26:3:32 | ControlFlowNode for ImportMember | path_injection.py:31:14:31:18 | ControlFlowNode for npath | This path depends on a $@. | path_injection.py:3:26:3:32 | ControlFlowNode for ImportMember | user-provided value |
+| path_injection.py:48:14:48:18 | ControlFlowNode for npath | path_injection.py:3:26:3:32 | ControlFlowNode for ImportMember | path_injection.py:48:14:48:18 | ControlFlowNode for npath | This path depends on a $@. | path_injection.py:3:26:3:32 | ControlFlowNode for ImportMember | user-provided value |
+| path_injection.py:65:14:65:18 | ControlFlowNode for npath | path_injection.py:3:26:3:32 | ControlFlowNode for ImportMember | path_injection.py:65:14:65:18 | ControlFlowNode for npath | This path depends on a $@. | path_injection.py:3:26:3:32 | ControlFlowNode for ImportMember | user-provided value |
+| path_injection.py:87:18:87:37 | ControlFlowNode for possibly_unsafe_path | path_injection.py:3:26:3:32 | ControlFlowNode for ImportMember | path_injection.py:87:18:87:37 | ControlFlowNode for possibly_unsafe_path | This path depends on a $@. | path_injection.py:3:26:3:32 | ControlFlowNode for ImportMember | user-provided value |
+| path_injection.py:94:14:94:17 | ControlFlowNode for path | path_injection.py:91:20:91:25 | ControlFlowNode for foo_id | path_injection.py:94:14:94:17 | ControlFlowNode for path | This path depends on a $@. | path_injection.py:91:20:91:25 | ControlFlowNode for foo_id | user-provided value |
+| path_injection.py:102:14:102:17 | ControlFlowNode for path | path_injection.py:98:20:98:22 | ControlFlowNode for foo | path_injection.py:102:14:102:17 | ControlFlowNode for path | This path depends on a $@. | path_injection.py:98:20:98:22 | ControlFlowNode for foo | user-provided value |
+| path_injection.py:113:14:113:17 | ControlFlowNode for path | path_injection.py:3:26:3:32 | ControlFlowNode for ImportMember | path_injection.py:113:14:113:17 | ControlFlowNode for path | This path depends on a $@. | path_injection.py:3:26:3:32 | ControlFlowNode for ImportMember | user-provided value |
+| path_injection.py:124:14:124:17 | ControlFlowNode for path | path_injection.py:3:26:3:32 | ControlFlowNode for ImportMember | path_injection.py:124:14:124:17 | ControlFlowNode for path | This path depends on a $@. | path_injection.py:3:26:3:32 | ControlFlowNode for ImportMember | user-provided value |
+| path_injection.py:132:14:132:22 | ControlFlowNode for sanitized | path_injection.py:3:26:3:32 | ControlFlowNode for ImportMember | path_injection.py:132:14:132:22 | ControlFlowNode for sanitized | This path depends on a $@. | path_injection.py:3:26:3:32 | ControlFlowNode for ImportMember | user-provided value |
+| path_injection.py:142:14:142:17 | ControlFlowNode for path | path_injection.py:3:26:3:32 | ControlFlowNode for ImportMember | path_injection.py:142:14:142:17 | ControlFlowNode for path | This path depends on a $@. | path_injection.py:3:26:3:32 | ControlFlowNode for ImportMember | user-provided value |
+| path_injection.py:152:18:152:21 | ControlFlowNode for path | path_injection.py:3:26:3:32 | ControlFlowNode for ImportMember | path_injection.py:152:18:152:21 | ControlFlowNode for path | This path depends on a $@. | path_injection.py:3:26:3:32 | ControlFlowNode for ImportMember | user-provided value |
+| pathlib_use.py:14:5:14:5 | ControlFlowNode for p | pathlib_use.py:3:26:3:32 | ControlFlowNode for ImportMember | pathlib_use.py:14:5:14:5 | ControlFlowNode for p | This path depends on a $@. | pathlib_use.py:3:26:3:32 | ControlFlowNode for ImportMember | user-provided value |
+| pathlib_use.py:17:5:17:6 | ControlFlowNode for p2 | pathlib_use.py:3:26:3:32 | ControlFlowNode for ImportMember | pathlib_use.py:17:5:17:6 | ControlFlowNode for p2 | This path depends on a $@. | pathlib_use.py:3:26:3:32 | ControlFlowNode for ImportMember | user-provided value |
+| test.py:19:10:19:10 | ControlFlowNode for x | test.py:3:26:3:32 | ControlFlowNode for ImportMember | test.py:19:10:19:10 | ControlFlowNode for x | This path depends on a $@. | test.py:3:26:3:32 | ControlFlowNode for ImportMember | user-provided value |
+| test.py:26:10:26:10 | ControlFlowNode for y | test.py:3:26:3:32 | ControlFlowNode for ImportMember | test.py:26:10:26:10 | ControlFlowNode for y | This path depends on a $@. | test.py:3:26:3:32 | ControlFlowNode for ImportMember | user-provided value |
+| test.py:33:14:33:14 | ControlFlowNode for x | test.py:3:26:3:32 | ControlFlowNode for ImportMember | test.py:33:14:33:14 | ControlFlowNode for x | This path depends on a $@. | test.py:3:26:3:32 | ControlFlowNode for ImportMember | user-provided value |
+| test.py:49:14:49:14 | ControlFlowNode for y | test.py:3:26:3:32 | ControlFlowNode for ImportMember | test.py:49:14:49:14 | ControlFlowNode for y | This path depends on a $@. | test.py:3:26:3:32 | ControlFlowNode for ImportMember | user-provided value |
 edges
+| fastapi_path_injection.py:6:24:6:31 | ControlFlowNode for filepath | fastapi_path_injection.py:7:19:7:26 | ControlFlowNode for filepath | provenance |  |
+| fastapi_path_injection.py:17:21:17:24 | ControlFlowNode for path | fastapi_path_injection.py:20:34:20:37 | ControlFlowNode for path | provenance |  |
+| fastapi_path_injection.py:20:34:20:37 | ControlFlowNode for path | fastapi_path_injection.py:6:24:6:31 | ControlFlowNode for filepath | provenance |  |
+| fastapi_path_injection.py:26:21:26:24 | ControlFlowNode for path | fastapi_path_injection.py:27:34:27:37 | ControlFlowNode for path | provenance |  |
+| fastapi_path_injection.py:27:34:27:37 | ControlFlowNode for path | fastapi_path_injection.py:6:24:6:31 | ControlFlowNode for filepath | provenance |  |
+| fastapi_path_injection.py:31:21:31:24 | ControlFlowNode for path | fastapi_path_injection.py:32:34:32:37 | ControlFlowNode for path | provenance |  |
+| fastapi_path_injection.py:32:34:32:37 | ControlFlowNode for path | fastapi_path_injection.py:6:24:6:31 | ControlFlowNode for filepath | provenance |  |
+| fastapi_path_injection.py:48:21:48:24 | ControlFlowNode for path | fastapi_path_injection.py:49:45:49:48 | ControlFlowNode for path | provenance |  |
+| fastapi_path_injection.py:49:45:49:48 | ControlFlowNode for path | fastapi_path_injection.py:6:24:6:31 | ControlFlowNode for filepath | provenance |  |
 | flask_path_injection.py:1:26:1:32 | ControlFlowNode for ImportMember | flask_path_injection.py:1:26:1:32 | ControlFlowNode for request | provenance |  |
 | flask_path_injection.py:1:26:1:32 | ControlFlowNode for request | flask_path_injection.py:19:15:19:21 | ControlFlowNode for request | provenance |  |
 | flask_path_injection.py:19:5:19:11 | ControlFlowNode for dirname | flask_path_injection.py:21:32:21:38 | ControlFlowNode for dirname | provenance |  |
@@ -122,6 +156,16 @@ edges
 | test.py:48:23:48:23 | ControlFlowNode for x | test.py:12:15:12:15 | ControlFlowNode for x | provenance |  |
 | test.py:48:23:48:23 | ControlFlowNode for x | test.py:48:13:48:24 | ControlFlowNode for normalize() | provenance | Config |
 nodes
+| fastapi_path_injection.py:6:24:6:31 | ControlFlowNode for filepath | semmle.label | ControlFlowNode for filepath |
+| fastapi_path_injection.py:7:19:7:26 | ControlFlowNode for filepath | semmle.label | ControlFlowNode for filepath |
+| fastapi_path_injection.py:17:21:17:24 | ControlFlowNode for path | semmle.label | ControlFlowNode for path |
+| fastapi_path_injection.py:20:34:20:37 | ControlFlowNode for path | semmle.label | ControlFlowNode for path |
+| fastapi_path_injection.py:26:21:26:24 | ControlFlowNode for path | semmle.label | ControlFlowNode for path |
+| fastapi_path_injection.py:27:34:27:37 | ControlFlowNode for path | semmle.label | ControlFlowNode for path |
+| fastapi_path_injection.py:31:21:31:24 | ControlFlowNode for path | semmle.label | ControlFlowNode for path |
+| fastapi_path_injection.py:32:34:32:37 | ControlFlowNode for path | semmle.label | ControlFlowNode for path |
+| fastapi_path_injection.py:48:21:48:24 | ControlFlowNode for path | semmle.label | ControlFlowNode for path |
+| fastapi_path_injection.py:49:45:49:48 | ControlFlowNode for path | semmle.label | ControlFlowNode for path |
 | flask_path_injection.py:1:26:1:32 | ControlFlowNode for ImportMember | semmle.label | ControlFlowNode for ImportMember |
 | flask_path_injection.py:1:26:1:32 | ControlFlowNode for request | semmle.label | ControlFlowNode for request |
 | flask_path_injection.py:19:5:19:11 | ControlFlowNode for dirname | semmle.label | ControlFlowNode for dirname |
@@ -252,24 +296,3 @@ nodes
 subpaths
 | test.py:25:19:25:19 | ControlFlowNode for x | test.py:12:15:12:15 | ControlFlowNode for x | test.py:13:12:13:30 | ControlFlowNode for Attribute() | test.py:25:9:25:20 | ControlFlowNode for normalize() |
 | test.py:48:23:48:23 | ControlFlowNode for x | test.py:12:15:12:15 | ControlFlowNode for x | test.py:13:12:13:30 | ControlFlowNode for Attribute() | test.py:48:13:48:24 | ControlFlowNode for normalize() |
-#select
-| flask_path_injection.py:21:32:21:38 | ControlFlowNode for dirname | flask_path_injection.py:1:26:1:32 | ControlFlowNode for ImportMember | flask_path_injection.py:21:32:21:38 | ControlFlowNode for dirname | This path depends on a $@. | flask_path_injection.py:1:26:1:32 | ControlFlowNode for ImportMember | user-provided value |
-| path_injection.py:13:14:13:47 | ControlFlowNode for Attribute() | path_injection.py:3:26:3:32 | ControlFlowNode for ImportMember | path_injection.py:13:14:13:47 | ControlFlowNode for Attribute() | This path depends on a $@. | path_injection.py:3:26:3:32 | ControlFlowNode for ImportMember | user-provided value |
-| path_injection.py:21:14:21:18 | ControlFlowNode for npath | path_injection.py:3:26:3:32 | ControlFlowNode for ImportMember | path_injection.py:21:14:21:18 | ControlFlowNode for npath | This path depends on a $@. | path_injection.py:3:26:3:32 | ControlFlowNode for ImportMember | user-provided value |
-| path_injection.py:31:14:31:18 | ControlFlowNode for npath | path_injection.py:3:26:3:32 | ControlFlowNode for ImportMember | path_injection.py:31:14:31:18 | ControlFlowNode for npath | This path depends on a $@. | path_injection.py:3:26:3:32 | ControlFlowNode for ImportMember | user-provided value |
-| path_injection.py:48:14:48:18 | ControlFlowNode for npath | path_injection.py:3:26:3:32 | ControlFlowNode for ImportMember | path_injection.py:48:14:48:18 | ControlFlowNode for npath | This path depends on a $@. | path_injection.py:3:26:3:32 | ControlFlowNode for ImportMember | user-provided value |
-| path_injection.py:65:14:65:18 | ControlFlowNode for npath | path_injection.py:3:26:3:32 | ControlFlowNode for ImportMember | path_injection.py:65:14:65:18 | ControlFlowNode for npath | This path depends on a $@. | path_injection.py:3:26:3:32 | ControlFlowNode for ImportMember | user-provided value |
-| path_injection.py:87:18:87:37 | ControlFlowNode for possibly_unsafe_path | path_injection.py:3:26:3:32 | ControlFlowNode for ImportMember | path_injection.py:87:18:87:37 | ControlFlowNode for possibly_unsafe_path | This path depends on a $@. | path_injection.py:3:26:3:32 | ControlFlowNode for ImportMember | user-provided value |
-| path_injection.py:94:14:94:17 | ControlFlowNode for path | path_injection.py:91:20:91:25 | ControlFlowNode for foo_id | path_injection.py:94:14:94:17 | ControlFlowNode for path | This path depends on a $@. | path_injection.py:91:20:91:25 | ControlFlowNode for foo_id | user-provided value |
-| path_injection.py:102:14:102:17 | ControlFlowNode for path | path_injection.py:98:20:98:22 | ControlFlowNode for foo | path_injection.py:102:14:102:17 | ControlFlowNode for path | This path depends on a $@. | path_injection.py:98:20:98:22 | ControlFlowNode for foo | user-provided value |
-| path_injection.py:113:14:113:17 | ControlFlowNode for path | path_injection.py:3:26:3:32 | ControlFlowNode for ImportMember | path_injection.py:113:14:113:17 | ControlFlowNode for path | This path depends on a $@. | path_injection.py:3:26:3:32 | ControlFlowNode for ImportMember | user-provided value |
-| path_injection.py:124:14:124:17 | ControlFlowNode for path | path_injection.py:3:26:3:32 | ControlFlowNode for ImportMember | path_injection.py:124:14:124:17 | ControlFlowNode for path | This path depends on a $@. | path_injection.py:3:26:3:32 | ControlFlowNode for ImportMember | user-provided value |
-| path_injection.py:132:14:132:22 | ControlFlowNode for sanitized | path_injection.py:3:26:3:32 | ControlFlowNode for ImportMember | path_injection.py:132:14:132:22 | ControlFlowNode for sanitized | This path depends on a $@. | path_injection.py:3:26:3:32 | ControlFlowNode for ImportMember | user-provided value |
-| path_injection.py:142:14:142:17 | ControlFlowNode for path | path_injection.py:3:26:3:32 | ControlFlowNode for ImportMember | path_injection.py:142:14:142:17 | ControlFlowNode for path | This path depends on a $@. | path_injection.py:3:26:3:32 | ControlFlowNode for ImportMember | user-provided value |
-| path_injection.py:152:18:152:21 | ControlFlowNode for path | path_injection.py:3:26:3:32 | ControlFlowNode for ImportMember | path_injection.py:152:18:152:21 | ControlFlowNode for path | This path depends on a $@. | path_injection.py:3:26:3:32 | ControlFlowNode for ImportMember | user-provided value |
-| pathlib_use.py:14:5:14:5 | ControlFlowNode for p | pathlib_use.py:3:26:3:32 | ControlFlowNode for ImportMember | pathlib_use.py:14:5:14:5 | ControlFlowNode for p | This path depends on a $@. | pathlib_use.py:3:26:3:32 | ControlFlowNode for ImportMember | user-provided value |
-| pathlib_use.py:17:5:17:6 | ControlFlowNode for p2 | pathlib_use.py:3:26:3:32 | ControlFlowNode for ImportMember | pathlib_use.py:17:5:17:6 | ControlFlowNode for p2 | This path depends on a $@. | pathlib_use.py:3:26:3:32 | ControlFlowNode for ImportMember | user-provided value |
-| test.py:19:10:19:10 | ControlFlowNode for x | test.py:3:26:3:32 | ControlFlowNode for ImportMember | test.py:19:10:19:10 | ControlFlowNode for x | This path depends on a $@. | test.py:3:26:3:32 | ControlFlowNode for ImportMember | user-provided value |
-| test.py:26:10:26:10 | ControlFlowNode for y | test.py:3:26:3:32 | ControlFlowNode for ImportMember | test.py:26:10:26:10 | ControlFlowNode for y | This path depends on a $@. | test.py:3:26:3:32 | ControlFlowNode for ImportMember | user-provided value |
-| test.py:33:14:33:14 | ControlFlowNode for x | test.py:3:26:3:32 | ControlFlowNode for ImportMember | test.py:33:14:33:14 | ControlFlowNode for x | This path depends on a $@. | test.py:3:26:3:32 | ControlFlowNode for ImportMember | user-provided value |
-| test.py:49:14:49:14 | ControlFlowNode for y | test.py:3:26:3:32 | ControlFlowNode for ImportMember | test.py:49:14:49:14 | ControlFlowNode for y | This path depends on a $@. | test.py:3:26:3:32 | ControlFlowNode for ImportMember | user-provided value |
diff --git a/python/ql/test/query-tests/Security/CWE-022-PathInjection/PathInjection.qlref b/python/ql/test/query-tests/Security/CWE-022-PathInjection/PathInjection.qlref
index d43482cc509..6a680f6d5ff 100644
--- a/python/ql/test/query-tests/Security/CWE-022-PathInjection/PathInjection.qlref
+++ b/python/ql/test/query-tests/Security/CWE-022-PathInjection/PathInjection.qlref
@@ -1 +1,2 @@
-Security/CWE-022/PathInjection.ql
+query: Security/CWE-022/PathInjection.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/python/ql/test/query-tests/Security/CWE-022-PathInjection/fastapi_path_injection.py b/python/ql/test/query-tests/Security/CWE-022-PathInjection/fastapi_path_injection.py
new file mode 100644
index 00000000000..e5d7cae762c
--- /dev/null
+++ b/python/ql/test/query-tests/Security/CWE-022-PathInjection/fastapi_path_injection.py
@@ -0,0 +1,49 @@
+from fastapi import FastAPI, Depends
+
+app = FastAPI()
+
+class FileHandler:
+    def get_data(self, filepath: str):
+        with open(filepath, "r") as f: # $ Alert
+            return f.readline()
+
+file_handler = None
+
+def init_file_handler():
+    global file_handler
+    file_handler = FileHandler()
+
+@app.get("/file/")
+async def read_item(path: str): # $ Source
+    if file_handler is None:
+        init_file_handler()
+    return file_handler.get_data(path)
+
+def init_file_handler():
+    return FileHandler()
+
+@app.get("/file2/", dependencies=[Depends(init_file_handler)])
+async def read_item(path: str, file_handler: FileHandler = Depends()): # $ Source
+    return file_handler.get_data(path)
+
+
+@app.get("/file3/", dependencies=[Depends(init_file_handler)])
+async def read_item(path: str): # $ Source
+    return file_handler.get_data(path)
+
+
+@app.on_event("startup")
+def init_file_handler():    
+    app.state.file_handler1 = FileHandler()
+    app.state.file_handler2 = FileHandler()
+
+def get_data_source():
+    return app.state.file_handler1
+
+@app.get("/file4/")
+async def read_item(path: str, data_source=Depends(get_data_source)): # $ MISSING: Source  
+    return data_source.get_data(path)   
+    
+@app.get("/file5/", dependencies=[Depends(init_file_handler)])
+async def read_item(path: str): # $ Source
+    return app.state.file_handler2.get_data(path)
diff --git a/python/ql/test/query-tests/Security/CWE-022-PathInjection/flask_path_injection.py b/python/ql/test/query-tests/Security/CWE-022-PathInjection/flask_path_injection.py
index f64d76a3b4d..f289bcc94ec 100644
--- a/python/ql/test/query-tests/Security/CWE-022-PathInjection/flask_path_injection.py
+++ b/python/ql/test/query-tests/Security/CWE-022-PathInjection/flask_path_injection.py
@@ -1,4 +1,4 @@
-from flask import Flask, request, send_from_directory
+from flask import Flask, request, send_from_directory # $Source
 app = Flask(__name__)
 
 
@@ -18,4 +18,4 @@ def download_file():
 def download_file():
     dirname = request.args.get('dirname', '')
     filename = request.args.get('filename', '')
-    return send_from_directory(dirname, filename) # $result=BAD result=OK(filename)
+    return send_from_directory(dirname, filename) # $ Alert
diff --git a/python/ql/test/query-tests/Security/CWE-022-PathInjection/path_injection.py b/python/ql/test/query-tests/Security/CWE-022-PathInjection/path_injection.py
index 39c17037480..37ff20b7de1 100644
--- a/python/ql/test/query-tests/Security/CWE-022-PathInjection/path_injection.py
+++ b/python/ql/test/query-tests/Security/CWE-022-PathInjection/path_injection.py
@@ -1,6 +1,6 @@
 import os
 
-from flask import Flask, request
+from flask import Flask, request # $ Source
 app = Flask(__name__)
 
 
@@ -10,7 +10,7 @@ STATIC_DIR = "/server/static/"
 @app.route("/path1")
 def path_injection():
     filename = request.args.get('filename', '')
-    f = open(os.path.join(STATIC_DIR, filename)) # $result=BAD
+    f = open(os.path.join(STATIC_DIR, filename)) # $ Alert
 
 
 @app.route("/path2")
@@ -18,7 +18,7 @@ def path_injection():
     # Normalized, but not checked
     filename = request.args.get('filename', '')
     npath = os.path.normpath(os.path.join(STATIC_DIR, filename))
-    f = open(npath)  # $result=BAD
+    f = open(npath) # $ Alert
 
 
 @app.route("/path3")
@@ -28,7 +28,7 @@ def unsafe_path_normpath():
     npath = os.path.normpath(os.path.join(STATIC_DIR, filename))
     if npath.startswith(STATIC_DIR):
         pass
-    f = open(npath)  # $result=BAD
+    f = open(npath)  # $ Alert
 
 
 @app.route("/path4")
@@ -45,7 +45,7 @@ def unsafe_path_realpath():
     # Normalized (by `realpath` that also follows symlinks), but not checked properly
     filename = request.args.get('filename', '')
     npath = os.path.realpath(os.path.join(STATIC_DIR, filename))
-    f = open(npath)  # $result=BAD
+    f = open(npath)  # $ Alert
 
 
 @app.route("/path6")
@@ -62,7 +62,7 @@ def unsafe_path_abspath():
     # Normalized (by `abspath`), but not checked properly
     filename = request.args.get('filename', '')
     npath = os.path.abspath(os.path.join(STATIC_DIR, filename))
-    f = open(npath)  # $result=BAD
+    f = open(npath) # $ Alert
 
 
 @app.route("/path7")
@@ -84,22 +84,22 @@ def safe_path_abspath_tricky():
     filename = request.args.get('filename', '')
     possibly_unsafe_path = os.path.join(STATIC_DIR, filename)
     if os.path.abspath(possibly_unsafe_path).startswith(STATIC_DIR):
-        f = open(possibly_unsafe_path)  # $SPURIOUS: result=BAD
+        f = open(possibly_unsafe_path)  # $ SPURIOUS: Alert
 
 
 @app.route("/int-only/<int:foo_id>")
-def flask_int_only(foo_id):
+def flask_int_only(foo_id): # $ SPURIOUS: Source
     # This is OK, since the flask routing ensures that `foo_id` MUST be an integer.
     path = os.path.join(STATIC_DIR, foo_id)
-    f = open(path)  # $spurious: result=BAD
+    f = open(path)  # $ SPURIOUS: Alert
 
 
 @app.route("/not-path/<foo>")
-def flask_not_path(foo):
+def flask_not_path(foo): # $ Source
     # On UNIX systems, this is OK, since without being marked as `<path:foo>`, flask
     # routing ensures that `foo` cannot contain forward slashes (not by using %2F either).
     path = os.path.join(STATIC_DIR, foo)
-    f = open(path)  # $result=BAD // OK if only running on UNIX systems, NOT OK if could be running on windows
+    f = open(path)  # $ Alert // OK if only running on UNIX systems, NOT OK if could be running on windows
 
 
 @app.route("/no-dot-dot")
@@ -110,7 +110,7 @@ def no_dot_dot():
     # handle if `filename` is an absolute path
     if '../' in path:
         return "not this time"
-    f = open(path)  # $result=BAD
+    f = open(path)  # $ Alert
 
 
 @app.route("/no-dot-dot-with-prefix")
@@ -121,7 +121,7 @@ def no_dot_dot_with_prefix():
     # Therefore, for UNIX-only programs, the `../` check is enough to stop path injections.
     if '../' in path:
         return "not this time"
-    f = open(path)  # $result=BAD // OK if only running on UNIX systems, NOT OK if could be running on windows
+    f = open(path)  # $ Alert // OK if only running on UNIX systems, NOT OK if could be running on windows
 
 
 @app.route("/replace-slash")
@@ -129,7 +129,7 @@ def replace_slash():
     filename = request.args.get('filename', '')
     path = os.path.join(STATIC_DIR, filename)
     sanitized = path.replace("/", "_")
-    f = open(sanitized)  # $result=BAD // OK if only running on UNIX systems, NOT OK if could be running on windows
+    f = open(sanitized)  # $ Alert // OK if only running on UNIX systems, NOT OK if could be running on windows
 
 
 @app.route("/stackoverflow-solution")
@@ -139,7 +139,7 @@ def stackoverflow_solution():
     path = os.path.join(STATIC_DIR, filename)
     if os.path.commonprefix((os.path.realpath(path), STATIC_DIR)) != STATIC_DIR:
         return "not this time"
-    f = open(path) # $SPURIOUS: result=BAD
+    f = open(path) # $ SPURIOUS: Alert
 
 
 SAFE_FILES = ['foo', 'bar', 'baz']
@@ -149,4 +149,4 @@ def safe_set_of_files():
     filename = request.args.get('filename', '')
     if filename in SAFE_FILES:
         path = os.path.join(STATIC_DIR, filename)
-        f = open(path) # $SPURIOUS: result=BAD
+        f = open(path) # $ SPURIOUS: Alert
diff --git a/python/ql/test/query-tests/Security/CWE-022-PathInjection/pathlib_use.py b/python/ql/test/query-tests/Security/CWE-022-PathInjection/pathlib_use.py
index 6f703f903dc..76ce1d1cc99 100644
--- a/python/ql/test/query-tests/Security/CWE-022-PathInjection/pathlib_use.py
+++ b/python/ql/test/query-tests/Security/CWE-022-PathInjection/pathlib_use.py
@@ -1,6 +1,6 @@
 import pathlib
 
-from flask import Flask, request
+from flask import Flask, request # $ Source
 app = Flask(__name__)
 
 
@@ -11,7 +11,7 @@ STATIC_DIR = pathlib.Path("/server/static/")
 def path_injection():
     filename = request.args.get('filename', '')
     p = STATIC_DIR / filename
-    p.open() # $ result=BAD
+    p.open() # $ Alert
 
     p2 = pathlib.Path(STATIC_DIR, filename)
-    p2.open() # $ result=BAD
+    p2.open() # $ Alert
diff --git a/python/ql/test/query-tests/Security/CWE-022-PathInjection/test.py b/python/ql/test/query-tests/Security/CWE-022-PathInjection/test.py
index 7200cd78f45..c10c257dae5 100644
--- a/python/ql/test/query-tests/Security/CWE-022-PathInjection/test.py
+++ b/python/ql/test/query-tests/Security/CWE-022-PathInjection/test.py
@@ -1,6 +1,6 @@
 import os.path
 
-from flask import Flask, request
+from flask import Flask, request # $ Source
 
 app = Flask(__name__)
 
@@ -16,21 +16,21 @@ def normalize(x):
 @app.route("/path")
 def simple():
     x = source()
-    open(x)  # $result=BAD
+    open(x)  # $ Alert
 
 
 @app.route("/path")
 def normalization():
     x = source()
     y = normalize(x)
-    open(y)  # $result=BAD
+    open(y)  # $ Alert
 
 
 @app.route("/path")
 def check():
     x = source()
     if x.startswith("subfolder/"):
-        open(x)  # $result=BAD
+        open(x)  # $ Alert
 
 
 @app.route("/path")
@@ -46,4 +46,4 @@ def check_then_normalize():
     x = source()
     if x.startswith("subfolder/"):
         y = normalize(x)
-        open(y)  # $result=BAD
+        open(y)  # $ Alert
diff --git a/python/ql/test/query-tests/Security/CWE-1004-NonHttpOnlyCookie/NonHttpOnlyCookie.expected b/python/ql/test/query-tests/Security/CWE-1004-NonHttpOnlyCookie/NonHttpOnlyCookie.expected
new file mode 100644
index 00000000000..7af8af8d870
--- /dev/null
+++ b/python/ql/test/query-tests/Security/CWE-1004-NonHttpOnlyCookie/NonHttpOnlyCookie.expected
@@ -0,0 +1,3 @@
+| test.py:8:5:8:38 | ControlFlowNode for Attribute() | Sensitive server cookie is set without HttpOnly flag. |
+| test.py:9:5:9:51 | ControlFlowNode for Attribute() | Sensitive server cookie is set without HttpOnly flag. |
+| test.py:11:5:11:57 | ControlFlowNode for Attribute() | Sensitive server cookie is set without HttpOnly flag. |
diff --git a/python/ql/test/query-tests/Security/CWE-1004-NonHttpOnlyCookie/NonHttpOnlyCookie.qlref b/python/ql/test/query-tests/Security/CWE-1004-NonHttpOnlyCookie/NonHttpOnlyCookie.qlref
new file mode 100644
index 00000000000..7173918e360
--- /dev/null
+++ b/python/ql/test/query-tests/Security/CWE-1004-NonHttpOnlyCookie/NonHttpOnlyCookie.qlref
@@ -0,0 +1,2 @@
+query: Security/CWE-1004/NonHttpOnlyCookie.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/python/ql/test/query-tests/Security/CWE-1004-NonHttpOnlyCookie/test.py b/python/ql/test/query-tests/Security/CWE-1004-NonHttpOnlyCookie/test.py
new file mode 100644
index 00000000000..6091e31ae32
--- /dev/null
+++ b/python/ql/test/query-tests/Security/CWE-1004-NonHttpOnlyCookie/test.py
@@ -0,0 +1,12 @@
+from flask import Flask, request, make_response
+
+app = Flask(__name__)
+
+@app.route("/test")
+def test():
+    resp = make_response()
+    resp.set_cookie("oauth", "value1") # $Alert[py/client-exposed-cookie]
+    resp.set_cookie("oauth", "value2", secure=True) # $Alert[py/client-exposed-cookie]
+    resp.set_cookie("oauth", "value2", httponly=True) 
+    resp.set_cookie("oauth", "value2", samesite="Strict") # $Alert[py/client-exposed-cookie]
+    resp.set_cookie("oauth", "value2", httponly=True, samesite="None") 
\ No newline at end of file
diff --git a/python/ql/test/query-tests/Security/CWE-1275-SameSiteNoneCookie/SameSiteNoneCookie.expected b/python/ql/test/query-tests/Security/CWE-1275-SameSiteNoneCookie/SameSiteNoneCookie.expected
new file mode 100644
index 00000000000..7a8e83a732c
--- /dev/null
+++ b/python/ql/test/query-tests/Security/CWE-1275-SameSiteNoneCookie/SameSiteNoneCookie.expected
@@ -0,0 +1,2 @@
+| test.py:10:5:10:60 | ControlFlowNode for Attribute() | Sensitive cookie with SameSite set to 'None'. |
+| test.py:13:5:13:78 | ControlFlowNode for Attribute() | Sensitive cookie with SameSite set to 'None'. |
diff --git a/python/ql/test/query-tests/Security/CWE-1275-SameSiteNoneCookie/SameSiteNoneCookie.qlref b/python/ql/test/query-tests/Security/CWE-1275-SameSiteNoneCookie/SameSiteNoneCookie.qlref
new file mode 100644
index 00000000000..ad4e08218b3
--- /dev/null
+++ b/python/ql/test/query-tests/Security/CWE-1275-SameSiteNoneCookie/SameSiteNoneCookie.qlref
@@ -0,0 +1,2 @@
+query: Security/CWE-1275/SameSiteNoneCookie.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/python/ql/test/query-tests/Security/CWE-1275-SameSiteNoneCookie/test.py b/python/ql/test/query-tests/Security/CWE-1275-SameSiteNoneCookie/test.py
new file mode 100644
index 00000000000..f1fd1fd4486
--- /dev/null
+++ b/python/ql/test/query-tests/Security/CWE-1275-SameSiteNoneCookie/test.py
@@ -0,0 +1,15 @@
+from flask import Flask, request, make_response
+
+app = Flask(__name__)
+
+@app.route("/test")
+def test(oauth_cookie_name):
+    resp = make_response()
+    resp.set_cookie("password", "value1") 
+    resp.set_cookie("authKey", "value2", samesite="Lax") 
+    resp.set_cookie("session_id", "value2", samesite="None") # $Alert[py/samesite-none-cookie]
+    resp.set_cookie("oauth", "value2", secure=True, samesite="Strict") 
+    resp.set_cookie("oauth", "value2", httponly=True, samesite="Strict") 
+    resp.set_cookie(oauth_cookie_name, "value2", secure=True, samesite="None") # $Alert[py/samesite-none-cookie]
+    resp.set_cookie("not_sensitive", "value2", samesite="None")
+    
\ No newline at end of file
diff --git a/python/ql/test/query-tests/Security/CWE-614-InsecureCookie/InsecureCookie.expected b/python/ql/test/query-tests/Security/CWE-614-InsecureCookie/InsecureCookie.expected
index 95cad5b954e..3b07bc6d9eb 100644
--- a/python/ql/test/query-tests/Security/CWE-614-InsecureCookie/InsecureCookie.expected
+++ b/python/ql/test/query-tests/Security/CWE-614-InsecureCookie/InsecureCookie.expected
@@ -1,10 +1,3 @@
-| test.py:10:5:10:37 | ControlFlowNode for Attribute() | Cookie is added without the Secure and HttpOnly attributes properly set. |
-| test.py:11:5:11:50 | ControlFlowNode for Attribute() | Cookie is added without the HttpOnly attribute properly set. |
-| test.py:12:5:12:52 | ControlFlowNode for Attribute() | Cookie is added without the Secure attribute properly set. |
-| test.py:13:5:13:56 | ControlFlowNode for Attribute() | Cookie is added without the Secure and HttpOnly attributes properly set. |
-| test.py:14:5:14:53 | ControlFlowNode for Attribute() | Cookie is added without the Secure and HttpOnly attributes properly set. |
-| test.py:15:5:15:54 | ControlFlowNode for Attribute() | Cookie is added without the Secure, HttpOnly, and SameSite attributes properly set. |
-| test.py:16:5:16:69 | ControlFlowNode for Attribute() | Cookie is added without the HttpOnly attribute properly set. |
-| test.py:17:5:17:71 | ControlFlowNode for Attribute() | Cookie is added without the Secure attribute properly set. |
-| test.py:18:5:18:67 | ControlFlowNode for Attribute() | Cookie is added without the HttpOnly and SameSite attributes properly set. |
-| test.py:19:5:19:69 | ControlFlowNode for Attribute() | Cookie is added without the Secure and SameSite attributes properly set. |
+| test.py:8:5:8:40 | ControlFlowNode for Attribute() | Cookie is added to response without the 'secure' flag being set. |
+| test.py:10:5:10:57 | ControlFlowNode for Attribute() | Cookie is added to response without the 'secure' flag being set. |
+| test.py:11:5:11:60 | ControlFlowNode for Attribute() | Cookie is added to response without the 'secure' flag being set. |
diff --git a/python/ql/test/query-tests/Security/CWE-614-InsecureCookie/InsecureCookie.qlref b/python/ql/test/query-tests/Security/CWE-614-InsecureCookie/InsecureCookie.qlref
index d5143f6eaae..f7020667719 100644
--- a/python/ql/test/query-tests/Security/CWE-614-InsecureCookie/InsecureCookie.qlref
+++ b/python/ql/test/query-tests/Security/CWE-614-InsecureCookie/InsecureCookie.qlref
@@ -1 +1,2 @@
-Security/CWE-614/InsecureCookie.ql
\ No newline at end of file
+query: Security/CWE-614/InsecureCookie.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/python/ql/test/query-tests/Security/CWE-614-InsecureCookie/test.py b/python/ql/test/query-tests/Security/CWE-614-InsecureCookie/test.py
index 1a108fe41d4..214567275e5 100644
--- a/python/ql/test/query-tests/Security/CWE-614-InsecureCookie/test.py
+++ b/python/ql/test/query-tests/Security/CWE-614-InsecureCookie/test.py
@@ -1,20 +1,12 @@
 from flask import Flask, request, make_response
-import lxml.etree
-import markupsafe
 
 app = Flask(__name__)
 
 @app.route("/test")
 def test():
     resp = make_response()
-    resp.set_cookie("key1", "value1")
-    resp.set_cookie("key2", "value2", secure=True)
-    resp.set_cookie("key2", "value2", httponly=True)
-    resp.set_cookie("key2", "value2", samesite="Strict")
-    resp.set_cookie("key2", "value2", samesite="Lax")
-    resp.set_cookie("key2", "value2", samesite="None")
-    resp.set_cookie("key2", "value2", secure=True, samesite="Strict")
-    resp.set_cookie("key2", "value2", httponly=True, samesite="Strict")
-    resp.set_cookie("key2", "value2", secure=True, samesite="None")
-    resp.set_cookie("key2", "value2", httponly=True, samesite="None")
-    resp.set_cookie("key2", "value2", secure=True, httponly=True, samesite="Strict")
\ No newline at end of file
+    resp.set_cookie("authKey", "value1") # $Alert[py/insecure-cookie]
+    resp.set_cookie("authKey", "value2", secure=True) 
+    resp.set_cookie("sessionID", "value2", httponly=True) # $Alert[py/insecure-cookie]
+    resp.set_cookie("password", "value2", samesite="Strict") # $Alert[py/insecure-cookie]
+    resp.set_cookie("notSensitive", "value3") 
diff --git a/python/ql/test/query-tests/Security/CWE-776-XmlBomb/XmlBomb.expected b/python/ql/test/query-tests/Security/CWE-776-XmlBomb/XmlBomb.expected
index 8a7d7bc75e3..e217064d1df 100644
--- a/python/ql/test/query-tests/Security/CWE-776-XmlBomb/XmlBomb.expected
+++ b/python/ql/test/query-tests/Security/CWE-776-XmlBomb/XmlBomb.expected
@@ -1,14 +1,4 @@
 edges
-| test.py:1:26:1:32 | ControlFlowNode for ImportMember | test.py:1:26:1:32 | ControlFlowNode for request | provenance |  |
-| test.py:1:26:1:32 | ControlFlowNode for request | test.py:19:19:19:25 | ControlFlowNode for request | provenance |  |
-| test.py:19:5:19:15 | ControlFlowNode for xml_content | test.py:30:34:30:44 | ControlFlowNode for xml_content | provenance |  |
-| test.py:19:19:19:25 | ControlFlowNode for request | test.py:19:5:19:15 | ControlFlowNode for xml_content | provenance | AdditionalTaintStep |
 nodes
-| test.py:1:26:1:32 | ControlFlowNode for ImportMember | semmle.label | ControlFlowNode for ImportMember |
-| test.py:1:26:1:32 | ControlFlowNode for request | semmle.label | ControlFlowNode for request |
-| test.py:19:5:19:15 | ControlFlowNode for xml_content | semmle.label | ControlFlowNode for xml_content |
-| test.py:19:19:19:25 | ControlFlowNode for request | semmle.label | ControlFlowNode for request |
-| test.py:30:34:30:44 | ControlFlowNode for xml_content | semmle.label | ControlFlowNode for xml_content |
 subpaths
 #select
-| test.py:30:34:30:44 | ControlFlowNode for xml_content | test.py:1:26:1:32 | ControlFlowNode for ImportMember | test.py:30:34:30:44 | ControlFlowNode for xml_content | XML parsing depends on a $@ without guarding against uncontrolled entity expansion. | test.py:1:26:1:32 | ControlFlowNode for ImportMember | user-provided value |
diff --git a/python/ql/test/query-tests/analysis/jump_to_defn/Definitions.expected b/python/ql/test/query-tests/analysis/jump_to_defn/Definitions.expected
index 1162bce43fa..5c7c31ea4b2 100644
--- a/python/ql/test/query-tests/analysis/jump_to_defn/Definitions.expected
+++ b/python/ql/test/query-tests/analysis/jump_to_defn/Definitions.expected
@@ -26,3 +26,6 @@
 | test.py:44:8:44:14 | ImportExpr | package/__init__.py:0:0:0:0 | Definition package/__init__.py:0 | Definition |
 | test.py:45:1:45:1 | p | test.py:44:8:44:14 | Definition test.py:44 | Definition |
 | test.py:45:3:45:3 | Attribute | package/__init__.py:2:18:2:18 | Definition package/__init__.py:2 | Definition |
+| test.py:48:32:48:38 | dirname | test.py:47:9:47:15 | Definition test.py:47 | Definition |
+| test.py:50:34:50:38 | lines | test.py:47:18:47:22 | Definition test.py:47 | Definition |
+| test.py:53:12:53:12 | x | test.py:49:9:49:12 | Definition test.py:49 | Definition |
diff --git a/python/ql/test/query-tests/analysis/jump_to_defn/test.py b/python/ql/test/query-tests/analysis/jump_to_defn/test.py
index 0abfeb32c40..b9be08a4867 100644
--- a/python/ql/test/query-tests/analysis/jump_to_defn/test.py
+++ b/python/ql/test/query-tests/analysis/jump_to_defn/test.py
@@ -43,3 +43,11 @@ thing.bar
 from package import x
 import package as p
 p.x
+
+def foo(dirname, lines):
+    head, tail = os.path.split(dirname)
+    x = head # `head` is missing jump-to-def target
+    for start, line in enumerate(lines):
+        line = line.strip() # `line` is missing jump-to-def target
+        break
+    return x
\ No newline at end of file
diff --git a/ql/ql/src/codeql_ql/style/RedundantCastQuery.qll b/ql/ql/src/codeql_ql/style/RedundantCastQuery.qll
index 9549bb85844..4805cf5d69f 100644
--- a/ql/ql/src/codeql_ql/style/RedundantCastQuery.qll
+++ b/ql/ql/src/codeql_ql/style/RedundantCastQuery.qll
@@ -1,11 +1,12 @@
 import ql
 
 class RedundantInlineCast extends AstNode instanceof InlineCast {
-  Type t;
-
   RedundantInlineCast() {
-    t = unique( | | super.getType()) and
-    (
+    exists(Type t |
+      t = unique( | | super.getType()) and
+      // noopt can require explicit casts
+      not this.getEnclosingPredicate().getAnAnnotation() instanceof NoOpt
+    |
       // The cast is to the type the base expression already has
       t = unique( | | super.getBase().getType())
       or
@@ -23,9 +24,7 @@ class RedundantInlineCast extends AstNode instanceof InlineCast {
         target = unique( | | call.getTarget()) and
         t = unique( | | target.getParameterType(i))
       )
-    ) and
-    // noopt can require explicit casts
-    not this.getEnclosingPredicate().getAnAnnotation() instanceof NoOpt
+    )
   }
 
   TypeExpr getTypeExpr() { result = super.getTypeExpr() }
@@ -49,15 +48,16 @@ private class AnyCast extends AstNode instanceof FullAggregate {
 // `foo = any(Bar b)` is effectively a cast to `Bar`.
 class RedundantAnyCast extends AstNode instanceof ComparisonFormula {
   AnyCast cast;
-  Expr operand;
 
   RedundantAnyCast() {
     super.getOperator() = "=" and
     super.getAnOperand() = cast and
-    super.getAnOperand() = operand and
-    cast != operand and
-    unique( | | operand.getType()).getASuperType*() =
-      unique( | | cast.getTypeExpr().getResolvedType()) and
+    exists(Expr operand |
+      super.getAnOperand() = operand and
+      cast != operand and
+      unique( | | operand.getType()).getASuperType*() =
+        unique( | | cast.getTypeExpr().getResolvedType())
+    ) and
     not this.getEnclosingPredicate().getAnAnnotation() instanceof NoOpt
   }
 
diff --git a/ql/ql/test/queries/performance/VarUnusedInDisjunct/Test.qll b/ql/ql/test/queries/performance/VarUnusedInDisjunct/Test.qll
index 520acbaa1b3..10e97e58209 100644
--- a/ql/ql/test/queries/performance/VarUnusedInDisjunct/Test.qll
+++ b/ql/ql/test/queries/performance/VarUnusedInDisjunct/Test.qll
@@ -165,4 +165,6 @@ class HasField extends Big {
     or
     this.toString().matches("%foo") // <- field only defined here.
   }
+
+  Big getField() { result = field }
 }
diff --git a/ql/ql/test/queries/style/Misspelling/Misspelling.expected b/ql/ql/test/queries/style/Misspelling/Misspelling.expected
index 8116e2b5afa..1c02ca81d62 100644
--- a/ql/ql/test/queries/style/Misspelling/Misspelling.expected
+++ b/ql/ql/test/queries/style/Misspelling/Misspelling.expected
@@ -2,5 +2,5 @@
 | Test.qll:4:7:4:26 | Class PublicallyAccessible | This class name contains the common misspelling 'publically', which should instead be 'publicly'. |
 | Test.qll:5:3:5:20 | FieldDecl | This field name contains the common misspelling 'occurences', which should instead be 'occurrences'. |
 | Test.qll:10:13:10:23 | ClassPredicate hasAgrument | This predicate name contains the common misspelling 'agrument', which should instead be 'argument'. |
-| Test.qll:13:1:16:3 | QLDoc | This comment contains the non-US spelling 'colour', which should instead be 'color'. |
-| Test.qll:17:7:17:17 | Class AnalysedInt | This class name contains the non-US spelling 'analysed', which should instead be 'analyzed'. |
+| Test.qll:15:1:18:3 | QLDoc | This comment contains the non-US spelling 'colour', which should instead be 'color'. |
+| Test.qll:19:7:19:17 | Class AnalysedInt | This class name contains the non-US spelling 'analysed', which should instead be 'analyzed'. |
diff --git a/ql/ql/test/queries/style/Misspelling/Test.qll b/ql/ql/test/queries/style/Misspelling/Test.qll
index f49f4633c6b..b6619145f8d 100644
--- a/ql/ql/test/queries/style/Misspelling/Test.qll
+++ b/ql/ql/test/queries/style/Misspelling/Test.qll
@@ -8,6 +8,8 @@ class PublicallyAccessible extends string {
 
   // should be argument
   predicate hasAgrument() { none() }
+
+  int getNum() { result = numOccurences }
 }
 
 /**
diff --git a/ql/ql/test/queries/style/UseInstanceofExtension/Foo.qll b/ql/ql/test/queries/style/UseInstanceofExtension/Foo.qll
index 3429ce5b599..b58cb3f93e3 100644
--- a/ql/ql/test/queries/style/UseInstanceofExtension/Foo.qll
+++ b/ql/ql/test/queries/style/UseInstanceofExtension/Foo.qll
@@ -22,6 +22,8 @@ class Inst3 extends string {
   Range range;
 
   Inst3() { this = range }
+
+  Range getRange() { result = range }
 }
 
 class Inst4 extends string {
diff --git a/ql/ql/test/queries/style/UseInstanceofExtension/UseInstanceofExtension.expected b/ql/ql/test/queries/style/UseInstanceofExtension/UseInstanceofExtension.expected
index 72f110c632f..804927fa032 100644
--- a/ql/ql/test/queries/style/UseInstanceofExtension/UseInstanceofExtension.expected
+++ b/ql/ql/test/queries/style/UseInstanceofExtension/UseInstanceofExtension.expected
@@ -1,4 +1,4 @@
 | Foo.qll:7:7:7:10 | Class Inst | Consider defining this class as non-extending subtype of $@. | Foo.qll:1:7:1:11 | Class Range | Range |
 | Foo.qll:15:7:15:11 | Class Inst2 | Consider defining this class as non-extending subtype of $@. | Foo.qll:1:7:1:11 | Class Range | Range |
 | Foo.qll:21:7:21:11 | Class Inst3 | Consider defining this class as non-extending subtype of $@. | Foo.qll:1:7:1:11 | Class Range | Range |
-| Foo.qll:27:7:27:11 | Class Inst4 | Consider defining this class as non-extending subtype of $@. | Foo.qll:1:7:1:11 | Class Range | Range |
+| Foo.qll:29:7:29:11 | Class Inst4 | Consider defining this class as non-extending subtype of $@. | Foo.qll:1:7:1:11 | Class Range | Range |
diff --git a/ql/ql/test/queries/style/UseSetLiteral/UseSetLiteral.expected b/ql/ql/test/queries/style/UseSetLiteral/UseSetLiteral.expected
index fac79ff078e..ed17f5e1f1a 100644
--- a/ql/ql/test/queries/style/UseSetLiteral/UseSetLiteral.expected
+++ b/ql/ql/test/queries/style/UseSetLiteral/UseSetLiteral.expected
@@ -4,5 +4,5 @@
 | test.qll:62:7:65:14 | Disjunction | This formula of 4 comparisons can be replaced with a single equality on a set literal, improving readability. |
 | test.qll:68:7:71:13 | Disjunction | This formula of 4 comparisons can be replaced with a single equality on a set literal, improving readability. |
 | test.qll:74:7:77:13 | Disjunction | This formula of 4 comparisons can be replaced with a single equality on a set literal, improving readability. |
-| test.qll:87:3:90:9 | Disjunction | This formula of 4 predicate calls can be replaced with a single call on a set literal, improving readability. |
-| test.qll:128:3:134:3 | Disjunction | This formula of 4 comparisons can be replaced with a single equality on a set literal, improving readability. |
+| test.qll:89:3:92:9 | Disjunction | This formula of 4 predicate calls can be replaced with a single call on a set literal, improving readability. |
+| test.qll:130:3:136:3 | Disjunction | This formula of 4 comparisons can be replaced with a single equality on a set literal, improving readability. |
diff --git a/ql/ql/test/queries/style/UseSetLiteral/test.qll b/ql/ql/test/queries/style/UseSetLiteral/test.qll
index 36a5f938f89..fcc581c3e8c 100644
--- a/ql/ql/test/queries/style/UseSetLiteral/test.qll
+++ b/ql/ql/test/queries/style/UseSetLiteral/test.qll
@@ -81,6 +81,8 @@ class MyTest8Class extends int {
   predicate is(int x) { x = this }
 
   int get() { result = this }
+
+  string getS() { result = s }
 }
 
 predicate test9(MyTest8Class c) {
diff --git a/ruby/codeql-extractor.yml b/ruby/codeql-extractor.yml
index b1eee384133..dc885ecc37b 100644
--- a/ruby/codeql-extractor.yml
+++ b/ruby/codeql-extractor.yml
@@ -6,6 +6,8 @@ legacy_qltest_extraction: true
 overlay_support_version: 20250626
 build_modes:
   - none
+default_queries:
+  - codeql/ruby-queries
 github_api_languages:
   - Ruby
 scc_languages:
diff --git a/ruby/extractor/Cargo.toml b/ruby/extractor/Cargo.toml
index 16cdcca246c..b6e1ae90119 100644
--- a/ruby/extractor/Cargo.toml
+++ b/ruby/extractor/Cargo.toml
@@ -8,15 +8,15 @@ edition = "2024"
 # When updating these dependencies, run `misc/bazel/3rdparty/update_cargo_deps.sh`
 [dependencies]
 tree-sitter = ">= 0.23.0"
-tree-sitter-embedded-template = "0.23.2"
+tree-sitter-embedded-template = "0.25.0"
 tree-sitter-ruby = "0.23.1"
 clap = { version = "4.5", features = ["derive"] }
 tracing = "0.1"
-tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
-rayon = "1.10.0"
-regex = "1.11.1"
+tracing-subscriber = { version = "0.3.20", features = ["env-filter"] }
+rayon = "1.11.0"
+regex = "1.11.3"
 encoding = "0.2"
 lazy_static = "1.5.0"
-serde_json = "1.0.140"
+serde_json = "1.0.145"
 
 codeql-extractor = { path = "../../shared/tree-sitter-extractor" }
diff --git a/ruby/ql/consistency-queries/DataFlowConsistency.ql b/ruby/ql/consistency-queries/DataFlowConsistency.ql
index 24766016cbb..4e0588d5d4a 100644
--- a/ruby/ql/consistency-queries/DataFlowConsistency.ql
+++ b/ruby/ql/consistency-queries/DataFlowConsistency.ql
@@ -28,7 +28,7 @@ private module Input implements InputSig<Location, RubyDataFlow> {
     exists(CfgNodes::ExprCfgNode n |
       arg.argumentOf(call, _) and
       n = call.asCall() and
-      arg.asExpr().getASuccessor(any(SuccessorTypes::ConditionalSuccessor c)).getASuccessor*() = n and
+      arg.asExpr().getASuccessor(any(ConditionalSuccessor c)).getASuccessor*() = n and
       n.getASplit() instanceof Split::ConditionalCompletionSplit
     )
   }
diff --git a/ruby/ql/lib/CHANGELOG.md b/ruby/ql/lib/CHANGELOG.md
index 185be6d23bc..a99e4017789 100644
--- a/ruby/ql/lib/CHANGELOG.md
+++ b/ruby/ql/lib/CHANGELOG.md
@@ -1,3 +1,34 @@
+## 5.1.2
+
+No user-facing changes.
+
+## 5.1.1
+
+No user-facing changes.
+
+## 5.1.0
+
+### New Features
+
+* Initial modeling for the Ruby Grape framework in `Grape.qll` has been added to detect API endpoints, parameters, and headers within Grape API classes.
+
+## 5.0.4
+
+No user-facing changes.
+
+## 5.0.3
+
+No user-facing changes.
+
+## 5.0.2
+
+### Bug Fixes
+
+* Made the following changes to `NetHttpRequest`
+  * Adds `connectionNode`, like other Ruby HTTP clients
+  * Makes `requestNode` and `connectionNode` public so subclasses can use them
+  * Adds detection of `Net::HTTP.start`, a common way to make HTTP requests in Ruby
+
 ## 5.0.1
 
 ### Minor Analysis Improvements
diff --git a/ruby/ql/lib/change-notes/2025-07-21-nethttprequest-improvements.md b/ruby/ql/lib/change-notes/released/5.0.2.md
similarity index 91%
rename from ruby/ql/lib/change-notes/2025-07-21-nethttprequest-improvements.md
rename to ruby/ql/lib/change-notes/released/5.0.2.md
index 7de3ed050e2..c50a06af309 100644
--- a/ruby/ql/lib/change-notes/2025-07-21-nethttprequest-improvements.md
+++ b/ruby/ql/lib/change-notes/released/5.0.2.md
@@ -1,6 +1,7 @@
----
-category: fix
----
+## 5.0.2
+
+### Bug Fixes
+
 * Made the following changes to `NetHttpRequest`
   * Adds `connectionNode`, like other Ruby HTTP clients
   * Makes `requestNode` and `connectionNode` public so subclasses can use them
diff --git a/ruby/ql/lib/change-notes/released/5.0.3.md b/ruby/ql/lib/change-notes/released/5.0.3.md
new file mode 100644
index 00000000000..57074925279
--- /dev/null
+++ b/ruby/ql/lib/change-notes/released/5.0.3.md
@@ -0,0 +1,3 @@
+## 5.0.3
+
+No user-facing changes.
diff --git a/ruby/ql/lib/change-notes/released/5.0.4.md b/ruby/ql/lib/change-notes/released/5.0.4.md
new file mode 100644
index 00000000000..5c625c33d52
--- /dev/null
+++ b/ruby/ql/lib/change-notes/released/5.0.4.md
@@ -0,0 +1,3 @@
+## 5.0.4
+
+No user-facing changes.
diff --git a/ruby/ql/lib/change-notes/released/5.1.0.md b/ruby/ql/lib/change-notes/released/5.1.0.md
new file mode 100644
index 00000000000..4958aaac95f
--- /dev/null
+++ b/ruby/ql/lib/change-notes/released/5.1.0.md
@@ -0,0 +1,5 @@
+## 5.1.0
+
+### New Features
+
+* Initial modeling for the Ruby Grape framework in `Grape.qll` has been added to detect API endpoints, parameters, and headers within Grape API classes.
diff --git a/ruby/ql/lib/change-notes/released/5.1.1.md b/ruby/ql/lib/change-notes/released/5.1.1.md
new file mode 100644
index 00000000000..28b0060cedc
--- /dev/null
+++ b/ruby/ql/lib/change-notes/released/5.1.1.md
@@ -0,0 +1,3 @@
+## 5.1.1
+
+No user-facing changes.
diff --git a/ruby/ql/lib/change-notes/released/5.1.2.md b/ruby/ql/lib/change-notes/released/5.1.2.md
new file mode 100644
index 00000000000..86e21502e26
--- /dev/null
+++ b/ruby/ql/lib/change-notes/released/5.1.2.md
@@ -0,0 +1,3 @@
+## 5.1.2
+
+No user-facing changes.
diff --git a/ruby/ql/lib/codeql-pack.release.yml b/ruby/ql/lib/codeql-pack.release.yml
index ae7df5e18b7..d21c12fbe7f 100644
--- a/ruby/ql/lib/codeql-pack.release.yml
+++ b/ruby/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 5.0.1
+lastReleaseVersion: 5.1.2
diff --git a/ruby/ql/lib/codeql/ruby/ApiGraphs.qll b/ruby/ql/lib/codeql/ruby/ApiGraphs.qll
index 00537e375b1..a74b0e08199 100644
--- a/ruby/ql/lib/codeql/ruby/ApiGraphs.qll
+++ b/ruby/ql/lib/codeql/ruby/ApiGraphs.qll
@@ -1,5 +1,5 @@
 /**
- * Provides an implementation of _API graphs_, which allow efficient modelling of how a given
+ * Provides an implementation of _API graphs_, which allow efficient modeling of how a given
  * value is used by the code base or how values produced by the code base are consumed by a library.
  *
  * See `API::Node` for more details.
diff --git a/ruby/ql/lib/codeql/ruby/Frameworks.qll b/ruby/ql/lib/codeql/ruby/Frameworks.qll
index 9bc01874710..e8009c91b7d 100644
--- a/ruby/ql/lib/codeql/ruby/Frameworks.qll
+++ b/ruby/ql/lib/codeql/ruby/Frameworks.qll
@@ -21,6 +21,7 @@ private import codeql.ruby.frameworks.Rails
 private import codeql.ruby.frameworks.Railties
 private import codeql.ruby.frameworks.Stdlib
 private import codeql.ruby.frameworks.Files
+private import codeql.ruby.frameworks.Grape
 private import codeql.ruby.frameworks.HttpClients
 private import codeql.ruby.frameworks.XmlParsing
 private import codeql.ruby.frameworks.ActionDispatch
diff --git a/ruby/ql/lib/codeql/ruby/controlflow/BasicBlocks.qll b/ruby/ql/lib/codeql/ruby/controlflow/BasicBlocks.qll
index 93253371198..e085dbd90a3 100644
--- a/ruby/ql/lib/codeql/ruby/controlflow/BasicBlocks.qll
+++ b/ruby/ql/lib/codeql/ruby/controlflow/BasicBlocks.qll
@@ -8,8 +8,8 @@ private import codeql.ruby.ast.internal.TreeSitter
 private import codeql.ruby.controlflow.ControlFlowGraph
 private import internal.ControlFlowGraphImpl as CfgImpl
 private import CfgNodes
-private import SuccessorTypes
 private import CfgImpl::BasicBlocks as BasicBlocksImpl
+private import codeql.controlflow.BasicBlock as BB
 
 /**
  * A basic block, that is, a maximal straight-line sequence of control flow nodes
@@ -296,3 +296,19 @@ final class ConditionBlock extends BasicBlock, BasicBlocksImpl::ConditionBasicBl
     super.edgeDominates(controlled, s)
   }
 }
+
+private class BasicBlockAlias = BasicBlock;
+
+private class EntryBasicBlockAlias = EntryBasicBlock;
+
+module Cfg implements BB::CfgSig<Location> {
+  class ControlFlowNode = CfgNode;
+
+  class BasicBlock = BasicBlockAlias;
+
+  class EntryBasicBlock = EntryBasicBlockAlias;
+
+  predicate dominatingEdge(BasicBlock bb1, BasicBlock bb2) {
+    BasicBlocksImpl::dominatingEdge(bb1, bb2)
+  }
+}
diff --git a/ruby/ql/lib/codeql/ruby/controlflow/ControlFlowGraph.qll b/ruby/ql/lib/codeql/ruby/controlflow/ControlFlowGraph.qll
index 1d3632ba1c0..8a7abea3090 100644
--- a/ruby/ql/lib/codeql/ruby/controlflow/ControlFlowGraph.qll
+++ b/ruby/ql/lib/codeql/ruby/controlflow/ControlFlowGraph.qll
@@ -2,9 +2,9 @@
 overlay[local]
 module;
 
+import codeql.controlflow.SuccessorType
 private import codeql.ruby.AST
 private import codeql.ruby.controlflow.BasicBlocks
-private import SuccessorTypes
 private import internal.ControlFlowGraphImpl as CfgImpl
 private import internal.Splitting as Splitting
 private import internal.Completion
@@ -59,241 +59,6 @@ class CfgNode extends CfgImpl::Node {
   BasicBlock getBasicBlock() { result.getANode() = this }
 }
 
-/** The type of a control flow successor. */
-class SuccessorType extends CfgImpl::TSuccessorType {
-  /** Gets a textual representation of successor type. */
-  string toString() { none() }
-}
-
-/** Provides different types of control flow successor types. */
-module SuccessorTypes {
-  /** A normal control flow successor. */
-  class NormalSuccessor extends SuccessorType, CfgImpl::TSuccessorSuccessor {
-    final override string toString() { result = "successor" }
-  }
-
-  /**
-   * A conditional control flow successor. Either a Boolean successor (`BooleanSuccessor`)
-   * or a matching successor (`MatchingSuccessor`)
-   */
-  class ConditionalSuccessor extends SuccessorType {
-    boolean value;
-
-    ConditionalSuccessor() {
-      this = CfgImpl::TBooleanSuccessor(value) or
-      this = CfgImpl::TMatchingSuccessor(value)
-    }
-
-    /** Gets the Boolean value of this successor. */
-    final boolean getValue() { result = value }
-
-    override string toString() { result = this.getValue().toString() }
-  }
-
-  /**
-   * A Boolean control flow successor.
-   *
-   * For example, in
-   *
-   * ```rb
-   * if x >= 0
-   *   puts "positive"
-   * else
-   *   puts "negative"
-   * end
-   * ```
-   *
-   * `x >= 0` has both a `true` successor and a `false` successor.
-   */
-  class BooleanSuccessor extends ConditionalSuccessor, CfgImpl::TBooleanSuccessor { }
-
-  /**
-   * A matching control flow successor.
-   *
-   * For example, this program fragment:
-   *
-   * ```rb
-   * case x
-   *   when 1 then puts "one"
-   *   else puts "not one"
-   * end
-   * ```
-   *
-   * has a control flow graph containing matching successors:
-   *
-   * ```
-   *            x
-   *            |
-   *            1
-   *           / \
-   *          /   \
-   *         /     \
-   *        /       \
-   *     match    non-match
-   *       |          |
-   *  puts "one"  puts "not one"
-   * ```
-   */
-  class MatchingSuccessor extends ConditionalSuccessor, CfgImpl::TMatchingSuccessor {
-    override string toString() { if value = true then result = "match" else result = "no-match" }
-  }
-
-  /**
-   * A `return` control flow successor.
-   *
-   * Example:
-   *
-   * ```rb
-   * def sum(x,y)
-   *   return x + y
-   * end
-   * ```
-   *
-   * The exit node of `sum` is a `return` successor of the `return x + y`
-   * statement.
-   */
-  class ReturnSuccessor extends SuccessorType, CfgImpl::TReturnSuccessor {
-    final override string toString() { result = "return" }
-  }
-
-  /**
-   * A `break` control flow successor.
-   *
-   * Example:
-   *
-   * ```rb
-   * def m
-   *   while x >= 0
-   *     x -= 1
-   *     if num > 100
-   *       break
-   *     end
-   *   end
-   *   puts "done"
-   * end
-   * ```
-   *
-   * The node `puts "done"` is `break` successor of the node `break`.
-   */
-  class BreakSuccessor extends SuccessorType, CfgImpl::TBreakSuccessor {
-    final override string toString() { result = "break" }
-  }
-
-  /**
-   * A `next` control flow successor.
-   *
-   * Example:
-   *
-   * ```rb
-   * def m
-   *   while x >= 0
-   *     x -= 1
-   *     if num > 100
-   *       next
-   *     end
-   *   end
-   *   puts "done"
-   * end
-   * ```
-   *
-   * The node `x >= 0` is `next` successor of the node `next`.
-   */
-  class NextSuccessor extends SuccessorType, CfgImpl::TNextSuccessor {
-    final override string toString() { result = "next" }
-  }
-
-  /**
-   * A `redo` control flow successor.
-   *
-   * Example:
-   *
-   * Example:
-   *
-   * ```rb
-   * def m
-   *   while x >= 0
-   *     x -= 1
-   *     if num > 100
-   *       redo
-   *     end
-   *   end
-   *   puts "done"
-   * end
-   * ```
-   *
-   * The node `x -= 1` is `redo` successor of the node `redo`.
-   */
-  class RedoSuccessor extends SuccessorType, CfgImpl::TRedoSuccessor {
-    final override string toString() { result = "redo" }
-  }
-
-  /**
-   * A `retry` control flow successor.
-   *
-   * Example:
-   *
-   * Example:
-   *
-   * ```rb
-   * def m
-   *   begin
-   *     puts "Retry"
-   *     raise
-   *   rescue
-   *     retry
-   *   end
-   * end
-   * ```
-   *
-   * The node `puts "Retry"` is `retry` successor of the node `retry`.
-   */
-  class RetrySuccessor extends SuccessorType, CfgImpl::TRetrySuccessor {
-    final override string toString() { result = "retry" }
-  }
-
-  /**
-   * An exceptional control flow successor.
-   *
-   * Example:
-   *
-   * ```rb
-   * def m x
-   *   if x > 2
-   *     raise "x > 2"
-   *   end
-   *   puts "x <= 2"
-   * end
-   * ```
-   *
-   * The exit node of `m` is an exceptional successor of the node
-   * `raise "x > 2"`.
-   */
-  class RaiseSuccessor extends SuccessorType, CfgImpl::TRaiseSuccessor {
-    final override string toString() { result = "raise" }
-  }
-
-  /**
-   * An exit control flow successor.
-   *
-   * Example:
-   *
-   * ```rb
-   * def m x
-   *   if x > 2
-   *     exit 1
-   *   end
-   *   puts "x <= 2"
-   * end
-   * ```
-   *
-   * The exit node of `m` is an exit successor of the node
-   * `exit 1`.
-   */
-  class ExitSuccessor extends SuccessorType, CfgImpl::TExitSuccessor {
-    final override string toString() { result = "exit" }
-  }
-}
-
 class Split = Splitting::Split;
 
 /** Provides different kinds of control flow graph splittings. */
diff --git a/ruby/ql/lib/codeql/ruby/controlflow/internal/Completion.qll b/ruby/ql/lib/codeql/ruby/controlflow/internal/Completion.qll
index b8edf83c20d..bcfe8f98d43 100644
--- a/ruby/ql/lib/codeql/ruby/controlflow/internal/Completion.qll
+++ b/ruby/ql/lib/codeql/ruby/controlflow/internal/Completion.qll
@@ -12,7 +12,6 @@ private import codeql.ruby.ast.internal.Control
 private import codeql.ruby.controlflow.ControlFlowGraph
 private import ControlFlowGraphImpl as CfgImpl
 private import NonReturning
-private import SuccessorTypes
 
 private newtype TCompletion =
   TSimpleCompletion() or
@@ -267,7 +266,7 @@ abstract private class NonNestedNormalCompletion extends NormalCompletion { }
 
 /** A simple (normal) completion. */
 class SimpleCompletion extends NonNestedNormalCompletion, TSimpleCompletion {
-  override NormalSuccessor getAMatchingSuccessorType() { any() }
+  override DirectSuccessor getAMatchingSuccessorType() { any() }
 
   override string toString() { result = "simple" }
 }
@@ -377,7 +376,7 @@ class NextCompletion extends Completion {
     this = TNestedCompletion(_, TNextCompletion(), _)
   }
 
-  override NextSuccessor getAMatchingSuccessorType() { any() }
+  override ContinueSuccessor getAMatchingSuccessorType() { any() }
 
   override string toString() {
     // `NestedCompletion` defines `toString()` for the other case
@@ -431,7 +430,7 @@ class RaiseCompletion extends Completion {
     this = TNestedCompletion(_, TRaiseCompletion(), _)
   }
 
-  override RaiseSuccessor getAMatchingSuccessorType() { any() }
+  override ExceptionSuccessor getAMatchingSuccessorType() { any() }
 
   override string toString() {
     // `NestedCompletion` defines `toString()` for the other case
diff --git a/ruby/ql/lib/codeql/ruby/controlflow/internal/ControlFlowGraphImpl.qll b/ruby/ql/lib/codeql/ruby/controlflow/internal/ControlFlowGraphImpl.qll
index d0d418a839f..f564633bb00 100644
--- a/ruby/ql/lib/codeql/ruby/controlflow/internal/ControlFlowGraphImpl.qll
+++ b/ruby/ql/lib/codeql/ruby/controlflow/internal/ControlFlowGraphImpl.qll
@@ -46,23 +46,10 @@ private module CfgInput implements CfgShared::InputSig<Location> {
     scope.(Impl::CfgScopeImpl).exit(last, c)
   }
 
-  class SuccessorType = Cfg::SuccessorType;
+  private class SuccessorType = Cfg::SuccessorType;
 
   SuccessorType getAMatchingSuccessorType(Completion c) { result = c.getAMatchingSuccessorType() }
 
-  predicate successorTypeIsSimple(SuccessorType t) {
-    t instanceof Cfg::SuccessorTypes::NormalSuccessor
-  }
-
-  predicate successorTypeIsCondition(SuccessorType t) {
-    t instanceof Cfg::SuccessorTypes::ConditionalSuccessor
-  }
-
-  predicate isAbnormalExitType(SuccessorType t) {
-    t instanceof Cfg::SuccessorTypes::RaiseSuccessor or
-    t instanceof Cfg::SuccessorTypes::ExitSuccessor
-  }
-
   private predicate id(Ruby::AstNode node1, Ruby::AstNode node2) { node1 = node2 }
 
   private predicate idOf(Ruby::AstNode node, int id) = equivalenceRelation(id/2)(node, id)
@@ -1528,21 +1515,3 @@ CfgScope getCfgScope(AstNode n) {
     pragma[only_bind_into](result) = getCfgScopeImpl(n0)
   )
 }
-
-cached
-private module Cached {
-  cached
-  newtype TSuccessorType =
-    TSuccessorSuccessor() or
-    TBooleanSuccessor(boolean b) { b in [false, true] } or
-    TMatchingSuccessor(boolean isMatch) { isMatch in [false, true] } or
-    TReturnSuccessor() or
-    TBreakSuccessor() or
-    TNextSuccessor() or
-    TRedoSuccessor() or
-    TRetrySuccessor() or
-    TRaiseSuccessor() or // TODO: Add exception type?
-    TExitSuccessor()
-}
-
-import Cached
diff --git a/ruby/ql/lib/codeql/ruby/controlflow/internal/Guards.qll b/ruby/ql/lib/codeql/ruby/controlflow/internal/Guards.qll
index a60102e017c..387fb03dc9a 100644
--- a/ruby/ql/lib/codeql/ruby/controlflow/internal/Guards.qll
+++ b/ruby/ql/lib/codeql/ruby/controlflow/internal/Guards.qll
@@ -6,7 +6,7 @@ private import codeql.ruby.CFG
 /** Holds if the guard `guard` controls block `bb` upon evaluating to `branch`. */
 pragma[nomagic]
 predicate guardControlsBlock(CfgNodes::AstCfgNode guard, BasicBlock bb, boolean branch) {
-  exists(ConditionBlock conditionBlock, SuccessorTypes::ConditionalSuccessor s |
+  exists(ConditionBlock conditionBlock, ConditionalSuccessor s |
     guard = conditionBlock.getLastNode() and
     s.getValue() = branch and
     conditionBlock.edgeDominates(bb, s)
diff --git a/ruby/ql/lib/codeql/ruby/controlflow/internal/Splitting.qll b/ruby/ql/lib/codeql/ruby/controlflow/internal/Splitting.qll
index 146d5927479..782315dc14c 100644
--- a/ruby/ql/lib/codeql/ruby/controlflow/internal/Splitting.qll
+++ b/ruby/ql/lib/codeql/ruby/controlflow/internal/Splitting.qll
@@ -8,7 +8,6 @@ private import codeql.ruby.AST as Ast
 private import Completion as Comp
 private import Comp
 private import ControlFlowGraphImpl
-private import SuccessorTypes
 private import codeql.ruby.controlflow.ControlFlowGraph
 
 cached
@@ -132,7 +131,7 @@ module EnsureSplitting {
       then
         // If the entry into the `ensure` block completes with any normal completion,
         // it simply means normal execution after the `ensure` block
-        this instanceof NormalSuccessor
+        this instanceof DirectSuccessor
       else this = c.getAMatchingSuccessorType()
     }
   }
@@ -195,7 +194,7 @@ module EnsureSplitting {
     int getNestLevel() { result = nestLevel }
 
     override string toString() {
-      if type instanceof NormalSuccessor
+      if type instanceof DirectSuccessor
       then result = ""
       else
         if nestLevel > 0
@@ -271,14 +270,14 @@ module EnsureSplitting {
             or
             not c instanceof NormalCompletion
             or
-            type instanceof NormalSuccessor
+            type instanceof DirectSuccessor
           )
         else (
           // `ensure` block can exit with inherited completion `c`, which must
           // match this split
           inherited = true and
           type = c.getAMatchingSuccessorType() and
-          not type instanceof NormalSuccessor
+          not type instanceof DirectSuccessor
         )
       )
       or
@@ -308,7 +307,7 @@ module EnsureSplitting {
       exists(EnsureSplitImpl outer |
         outer.(EnsureSplit).getNestLevel() = super.getNestLevel() - 1 and
         outer.exit(pred, c, inherited) and
-        super.getType() instanceof NormalSuccessor and
+        super.getType() instanceof DirectSuccessor and
         inherited = true
       )
     }
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPrivate.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPrivate.qll
index 59fe0238c7f..9332aa43e52 100644
--- a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPrivate.qll
+++ b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPrivate.qll
@@ -153,7 +153,7 @@ module LocalFlow {
       exprTo = nodeTo.asExpr() and
       n.getReturningNode().getAstNode() instanceof BreakStmt and
       exprTo.getAstNode() instanceof Loop and
-      nodeTo.asExpr().getAPredecessor(any(SuccessorTypes::BreakSuccessor s)) = n.getReturningNode()
+      nodeTo.asExpr().getAPredecessor(any(BreakSuccessor s)) = n.getReturningNode()
     )
     or
     nodeFrom.asExpr() = nodeTo.(ReturningStatementNode).getReturningNode().getReturnedValueNode()
@@ -161,7 +161,7 @@ module LocalFlow {
     nodeTo.asExpr() =
       any(CfgNodes::ExprNodes::ForExprCfgNode for |
         exists(SuccessorType s |
-          not s instanceof SuccessorTypes::BreakSuccessor and
+          not s instanceof BreakSuccessor and
           exists(for.getAPredecessor(s))
         ) and
         nodeFrom.asExpr() = for.getValue()
@@ -280,6 +280,7 @@ predicate isNonConstantExpr(CfgNodes::ExprCfgNode n) {
 /** Provides logic related to captured variables. */
 module VariableCapture {
   private import codeql.dataflow.VariableCapture as Shared
+  private import codeql.ruby.controlflow.BasicBlocks as BasicBlocks
 
   private predicate closureFlowStep(CfgNodes::ExprCfgNode e1, CfgNodes::ExprCfgNode e2) {
     e1 = getALastEvalNode(e2)
@@ -290,23 +291,14 @@ module VariableCapture {
     )
   }
 
-  private module CaptureInput implements Shared::InputSig<Location> {
+  private module CaptureInput implements Shared::InputSig<Location, BasicBlocks::Cfg::BasicBlock> {
     private import codeql.ruby.controlflow.ControlFlowGraph as Cfg
-    private import codeql.ruby.controlflow.BasicBlocks as BasicBlocks
     private import TaintTrackingPrivate as TaintTrackingPrivate
 
-    class BasicBlock extends BasicBlocks::BasicBlock {
-      Callable getEnclosingCallable() { result = this.getScope() }
+    Callable basicBlockGetEnclosingCallable(BasicBlocks::Cfg::BasicBlock bb) {
+      result = bb.getScope()
     }
 
-    class ControlFlowNode = Cfg::CfgNode;
-
-    BasicBlock getImmediateBasicBlockDominator(BasicBlock bb) {
-      result = bb.getImmediateDominator()
-    }
-
-    BasicBlock getABasicBlockSuccessor(BasicBlock bb) { result = bb.getASuccessor() }
-
     class CapturedVariable extends LocalVariable {
       CapturedVariable() {
         this.isCaptured() and
@@ -377,7 +369,7 @@ module VariableCapture {
 
   class ClosureExpr = CaptureInput::ClosureExpr;
 
-  module Flow = Shared::Flow<Location, CaptureInput>;
+  module Flow = Shared::Flow<Location, BasicBlocks::Cfg, CaptureInput>;
 
   private Flow::ClosureNode asClosureNode(Node n) {
     result = n.(CaptureNode).getSynthesizedCaptureNode()
@@ -2394,8 +2386,7 @@ module TypeInference {
     |
       m = resolveConstantReadAccess(pattern.getExpr()) and
       cb.getLastNode() = pattern and
-      cb.edgeDominates(read.getBasicBlock(),
-        any(SuccessorTypes::MatchingSuccessor match | match.getValue() = true)) and
+      cb.edgeDominates(read.getBasicBlock(), any(MatchingSuccessor match | match.getValue() = true)) and
       caseRead = def.getARead() and
       read = def.getARead() and
       case.getValue() = caseRead
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/FlowSummaryImpl.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/FlowSummaryImpl.qll
index c85d2230b23..f8e3894a833 100644
--- a/ruby/ql/lib/codeql/ruby/dataflow/internal/FlowSummaryImpl.qll
+++ b/ruby/ql/lib/codeql/ruby/dataflow/internal/FlowSummaryImpl.qll
@@ -161,7 +161,9 @@ private module StepsInput implements Impl::Private::StepsInputSig {
     result.asCall().getAstNode() = sc.(LibraryCallable).getACallSimple()
   }
 
-  Node getSourceNode(Input::SourceBase source, Impl::Private::SummaryComponent sc) { none() }
+  DataFlowCallable getSourceNodeEnclosingCallable(Input::SourceBase source) { none() }
+
+  Node getSourceNode(Input::SourceBase source, Impl::Private::SummaryComponentStack s) { none() }
 
   Node getSinkNode(Input::SinkBase sink, Impl::Private::SummaryComponent sc) { none() }
 }
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/SsaImpl.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/SsaImpl.qll
index fd1619b1c63..029d4c53060 100644
--- a/ruby/ql/lib/codeql/ruby/dataflow/internal/SsaImpl.qll
+++ b/ruby/ql/lib/codeql/ruby/dataflow/internal/SsaImpl.qll
@@ -4,22 +4,16 @@ module;
 private import codeql.ssa.Ssa as SsaImplCommon
 private import codeql.ruby.AST
 private import codeql.ruby.CFG as Cfg
+private import codeql.ruby.controlflow.BasicBlocks as BasicBlocks
 private import codeql.ruby.controlflow.internal.ControlFlowGraphImpl as ControlFlowGraphImpl
 private import codeql.ruby.dataflow.SSA
 private import codeql.ruby.ast.Variable
 private import Cfg::CfgNodes::ExprNodes
 
-module SsaInput implements SsaImplCommon::InputSig<Location> {
+private class BasicBlock = BasicBlocks::Cfg::BasicBlock;
+
+module SsaInput implements SsaImplCommon::InputSig<Location, BasicBlock> {
   private import codeql.ruby.controlflow.ControlFlowGraph as Cfg
-  private import codeql.ruby.controlflow.BasicBlocks as BasicBlocks
-
-  class BasicBlock = BasicBlocks::BasicBlock;
-
-  class ControlFlowNode = Cfg::CfgNode;
-
-  BasicBlock getImmediateBasicBlockDominator(BasicBlock bb) { result = bb.getImmediateDominator() }
-
-  BasicBlock getABasicBlockSuccessor(BasicBlock bb) { result = bb.getASuccessor() }
 
   class SourceVariable = LocalVariable;
 
@@ -66,7 +60,7 @@ module SsaInput implements SsaImplCommon::InputSig<Location> {
   }
 }
 
-import SsaImplCommon::Make<Location, SsaInput> as Impl
+import SsaImplCommon::Make<Location, BasicBlocks::Cfg, SsaInput> as Impl
 
 class Definition = Impl::Definition;
 
@@ -220,15 +214,14 @@ private predicate hasVariableReadWithCapturedWrite(
 
 pragma[noinline]
 deprecated private predicate adjacentDefReadExt(
-  Definition def, SsaInput::BasicBlock bb1, int i1, SsaInput::BasicBlock bb2, int i2,
-  SsaInput::SourceVariable v
+  Definition def, BasicBlock bb1, int i1, BasicBlock bb2, int i2, SsaInput::SourceVariable v
 ) {
   Impl::adjacentDefReadExt(def, _, bb1, i1, bb2, i2) and
   v = def.getSourceVariable()
 }
 
 deprecated private predicate adjacentDefReachesReadExt(
-  Definition def, SsaInput::BasicBlock bb1, int i1, SsaInput::BasicBlock bb2, int i2
+  Definition def, BasicBlock bb1, int i1, BasicBlock bb2, int i2
 ) {
   exists(SsaInput::SourceVariable v | adjacentDefReadExt(def, bb1, i1, bb2, i2, v) |
     def.definesAt(v, bb1, i1)
@@ -236,7 +229,7 @@ deprecated private predicate adjacentDefReachesReadExt(
     SsaInput::variableRead(bb1, i1, v, true)
   )
   or
-  exists(SsaInput::BasicBlock bb3, int i3 |
+  exists(BasicBlock bb3, int i3 |
     adjacentDefReachesReadExt(def, bb1, i1, bb3, i3) and
     SsaInput::variableRead(bb3, i3, _, false) and
     Impl::adjacentDefReadExt(def, _, bb3, i3, bb2, i2)
@@ -244,7 +237,7 @@ deprecated private predicate adjacentDefReachesReadExt(
 }
 
 deprecated private predicate adjacentDefReachesUncertainReadExt(
-  Definition def, SsaInput::BasicBlock bb1, int i1, SsaInput::BasicBlock bb2, int i2
+  Definition def, BasicBlock bb1, int i1, BasicBlock bb2, int i2
 ) {
   adjacentDefReachesReadExt(def, bb1, i1, bb2, i2) and
   SsaInput::variableRead(bb2, i2, _, false)
@@ -252,13 +245,11 @@ deprecated private predicate adjacentDefReachesUncertainReadExt(
 
 /** Same as `lastRefRedef`, but skips uncertain reads. */
 pragma[nomagic]
-deprecated private predicate lastRefSkipUncertainReadsExt(
-  Definition def, SsaInput::BasicBlock bb, int i
-) {
+deprecated private predicate lastRefSkipUncertainReadsExt(Definition def, BasicBlock bb, int i) {
   Impl::lastRef(def, bb, i) and
   not SsaInput::variableRead(bb, i, def.getSourceVariable(), false)
   or
-  exists(SsaInput::BasicBlock bb0, int i0 |
+  exists(BasicBlock bb0, int i0 |
     Impl::lastRef(def, bb0, i0) and
     adjacentDefReachesUncertainReadExt(def, bb, i, bb0, i0)
   )
@@ -479,7 +470,7 @@ private module DataFlowIntegrationInput implements Impl::DataFlowIntegrationInpu
   private import codeql.util.Boolean
 
   class Expr extends Cfg::CfgNodes::ExprCfgNode {
-    predicate hasCfgNode(SsaInput::BasicBlock bb, int i) { this = bb.getNode(i) }
+    predicate hasCfgNode(BasicBlock bb, int i) { this = bb.getNode(i) }
   }
 
   Expr getARead(Definition def) { result = Cached::getARead(def) }
@@ -495,10 +486,8 @@ private module DataFlowIntegrationInput implements Impl::DataFlowIntegrationInpu
      * Holds if the evaluation of this guard to `branch` corresponds to the edge
      * from `bb1` to `bb2`.
      */
-    predicate hasValueBranchEdge(
-      SsaInput::BasicBlock bb1, SsaInput::BasicBlock bb2, GuardValue branch
-    ) {
-      exists(Cfg::SuccessorTypes::ConditionalSuccessor s |
+    predicate hasValueBranchEdge(BasicBlock bb1, BasicBlock bb2, GuardValue branch) {
+      exists(Cfg::ConditionalSuccessor s |
         this.getBasicBlock() = bb1 and
         bb2 = bb1.getASuccessor(s) and
         s.getValue() = branch
@@ -510,15 +499,13 @@ private module DataFlowIntegrationInput implements Impl::DataFlowIntegrationInpu
      * branch edge from `bb1` to `bb2`. That is, following the edge from
      * `bb1` to `bb2` implies that this guard evaluated to `branch`.
      */
-    predicate valueControlsBranchEdge(
-      SsaInput::BasicBlock bb1, SsaInput::BasicBlock bb2, GuardValue branch
-    ) {
+    predicate valueControlsBranchEdge(BasicBlock bb1, BasicBlock bb2, GuardValue branch) {
       this.hasValueBranchEdge(bb1, bb2, branch)
     }
   }
 
   /** Holds if the guard `guard` controls block `bb` upon evaluating to `branch`. */
-  predicate guardDirectlyControlsBlock(Guard guard, SsaInput::BasicBlock bb, GuardValue branch) {
+  predicate guardDirectlyControlsBlock(Guard guard, BasicBlock bb, GuardValue branch) {
     Guards::guardControlsBlock(guard, bb, branch)
   }
 }
diff --git a/ruby/ql/lib/codeql/ruby/frameworks/Grape.qll b/ruby/ql/lib/codeql/ruby/frameworks/Grape.qll
new file mode 100644
index 00000000000..9b7ae6185cd
--- /dev/null
+++ b/ruby/ql/lib/codeql/ruby/frameworks/Grape.qll
@@ -0,0 +1,300 @@
+/**
+ * Provides modeling for the `Grape` API framework.
+ */
+
+private import codeql.ruby.AST
+private import codeql.ruby.CFG
+private import codeql.ruby.Concepts
+private import codeql.ruby.controlflow.CfgNodes
+private import codeql.ruby.DataFlow
+private import codeql.ruby.dataflow.RemoteFlowSources
+private import codeql.ruby.ApiGraphs
+private import codeql.ruby.typetracking.TypeTracking
+private import codeql.ruby.frameworks.Rails
+private import codeql.ruby.frameworks.internal.Rails
+private import codeql.ruby.dataflow.internal.DataFlowDispatch
+private import codeql.ruby.dataflow.FlowSteps
+
+/**
+ * Provides modeling for Grape, a REST-like API framework for Ruby.
+ * Grape allows you to build RESTful APIs in Ruby with minimal effort.
+ */
+module Grape {
+  /**
+   * A Grape API class which sits at the top of the class hierarchy.
+   * In other words, it does not subclass any other Grape API class in source code.
+   */
+  class RootApi extends GrapeApiClass {
+    RootApi() { not this = any(GrapeApiClass parent).getAnImmediateDescendent() }
+  }
+
+  /**
+   * A class that extends `Grape::API`.
+   * For example,
+   *
+   * ```rb
+   * class FooAPI < Grape::API
+   *   get '/users' do
+   *     name = params[:name]
+   *     User.where("name = #{name}")
+   *   end
+   * end
+   * ```
+   */
+  class GrapeApiClass extends DataFlow::ClassNode {
+    GrapeApiClass() { this = grapeApiBaseClass().getADescendentModule() }
+
+    /**
+     * Gets a `GrapeEndpoint` defined in this class.
+     */
+    GrapeEndpoint getAnEndpoint() { result.getApiClass() = this }
+
+    /**
+     * Gets a `self` that possibly refers to an instance of this class.
+     */
+    DataFlow::LocalSourceNode getSelf() {
+      result = this.getAnInstanceSelf()
+      or
+      // Include the module-level `self` to recover some cases where a block at the module level
+      // is invoked with an instance as the `self`.
+      result = this.getModuleLevelSelf()
+    }
+
+    /**
+     * Gets the `self` parameter belonging to a method defined within a
+     * `helpers` block in this API class.
+     *
+     * These methods become available in endpoint contexts through Grape's DSL.
+     */
+    DataFlow::SelfParameterNode getHelperSelf() {
+      exists(DataFlow::CallNode helpersCall |
+        helpersCall = this.getAModuleLevelCall("helpers") and
+        result.getSelfVariable().getDeclaringScope().getOuterScope+() =
+          helpersCall.getBlock().asExpr().getExpr()
+      )
+    }
+  }
+
+  private DataFlow::ConstRef grapeApiBaseClass() {
+    result = DataFlow::getConstant("Grape").getConstant("API")
+  }
+
+  private API::Node grapeApiInstance() { result = any(GrapeApiClass cls).getSelf().track() }
+
+  /**
+   * A Grape API endpoint (get, post, put, delete, etc.) call within a `Grape::API` class.
+   */
+  class GrapeEndpoint extends DataFlow::CallNode {
+    private GrapeApiClass apiClass;
+
+    GrapeEndpoint() {
+      this =
+        apiClass.getAModuleLevelCall(["get", "post", "put", "delete", "patch", "head", "options"])
+    }
+
+    /**
+     * Gets the HTTP method for this endpoint (e.g., "GET", "POST", etc.)
+     */
+    string getHttpMethod() { result = this.getMethodName().toUpperCase() }
+
+    /**
+     * Gets the API class containing this endpoint.
+     */
+    GrapeApiClass getApiClass() { result = apiClass }
+
+    /**
+     * Gets the block containing the endpoint logic.
+     */
+    DataFlow::BlockNode getBody() { result = this.getBlock() }
+
+    /**
+     * Gets the path pattern for this endpoint, if specified.
+     */
+    string getPath() { result = this.getArgument(0).getConstantValue().getString() }
+  }
+
+  /**
+   * A `RemoteFlowSource::Range` to represent accessing the
+   * Grape parameters available via the `params` method within an endpoint.
+   */
+  class GrapeParamsSource extends Http::Server::RequestInputAccess::Range {
+    GrapeParamsSource() { this.asExpr().getExpr() instanceof GrapeParamsCall }
+
+    override string getSourceType() { result = "Grape::API#params" }
+
+    override Http::Server::RequestInputKind getKind() {
+      result = Http::Server::parameterInputKind()
+    }
+  }
+
+  /**
+   * A call to `params` from within a Grape API endpoint or helper method.
+   */
+  private class GrapeParamsCall extends ParamsCallImpl {
+    GrapeParamsCall() {
+      exists(API::Node n | this = n.getAMethodCall("params").asExpr().getExpr() |
+        // Params calls within endpoint blocks
+        n = grapeApiInstance()
+        or
+        // Params calls within helper methods (defined in helpers blocks)
+        n = any(GrapeApiClass c).getHelperSelf().track()
+      )
+    }
+  }
+
+  /**
+   * A call to `headers` from within a Grape API endpoint or headers block.
+   * Headers can also be a source of user input.
+   */
+  class GrapeHeadersSource extends Http::Server::RequestInputAccess::Range {
+    GrapeHeadersSource() {
+      this.asExpr().getExpr() instanceof GrapeHeadersCall
+      or
+      this.asExpr().getExpr() instanceof GrapeHeadersBlockCall
+    }
+
+    override string getSourceType() { result = "Grape::API#headers" }
+
+    override Http::Server::RequestInputKind getKind() { result = Http::Server::headerInputKind() }
+  }
+
+  /**
+   * A call to `headers` from within a Grape API endpoint.
+   */
+  private class GrapeHeadersCall extends MethodCall {
+    GrapeHeadersCall() {
+      // Handle cases where headers is called on an instance of a Grape API class
+      this = grapeApiInstance().getAMethodCall("headers").asExpr().getExpr()
+    }
+  }
+
+  /**
+   * A call to `request` from within a Grape API endpoint.
+   * The request object can contain user input.
+   */
+  class GrapeRequestSource extends Http::Server::RequestInputAccess::Range {
+    GrapeRequestSource() { this.asExpr().getExpr() instanceof GrapeRequestCall }
+
+    override string getSourceType() { result = "Grape::API#request" }
+
+    override Http::Server::RequestInputKind getKind() {
+      result = Http::Server::parameterInputKind()
+    }
+  }
+
+  /**
+   * A call to `route_param` from within a Grape API endpoint.
+   * Route parameters are extracted from the URL path and can be a source of user input.
+   */
+  class GrapeRouteParamSource extends Http::Server::RequestInputAccess::Range {
+    GrapeRouteParamSource() { this.asExpr().getExpr() instanceof GrapeRouteParamCall }
+
+    override string getSourceType() { result = "Grape::API#route_param" }
+
+    override Http::Server::RequestInputKind getKind() {
+      result = Http::Server::parameterInputKind()
+    }
+  }
+
+  /**
+   * A call to `request` from within a Grape API endpoint.
+   */
+  private class GrapeRequestCall extends MethodCall {
+    GrapeRequestCall() {
+      // Handle cases where request is called on an instance of a Grape API class
+      this = grapeApiInstance().getAMethodCall("request").asExpr().getExpr()
+    }
+  }
+
+  /**
+   * A call to `route_param` from within a Grape API endpoint.
+   */
+  private class GrapeRouteParamCall extends MethodCall {
+    GrapeRouteParamCall() {
+      // Handle cases where route_param is called on an instance of a Grape API class
+      this = grapeApiInstance().getAMethodCall("route_param").asExpr().getExpr()
+    }
+  }
+
+  /**
+   * A call to `headers` block within a Grape API class.
+   * This is different from the headers() method call - this is the DSL block for defining header requirements.
+   */
+  private class GrapeHeadersBlockCall extends MethodCall {
+    GrapeHeadersBlockCall() {
+      this = grapeApiInstance().getAMethodCall("headers").asExpr().getExpr() and
+      exists(this.getBlock())
+    }
+  }
+
+  /**
+   * A call to `cookies` block within a Grape API class.
+   * This DSL block defines cookie requirements and those cookies are user-controlled.
+   */
+  private class GrapeCookiesBlockCall extends MethodCall {
+    GrapeCookiesBlockCall() {
+      this = grapeApiInstance().getAMethodCall("cookies").asExpr().getExpr() and
+      exists(this.getBlock())
+    }
+  }
+
+  /**
+   * A call to `cookies` method from within a Grape API endpoint or cookies block.
+   * Similar to headers, cookies can be accessed as a method and are user-controlled input.
+   */
+  class GrapeCookiesSource extends Http::Server::RequestInputAccess::Range {
+    GrapeCookiesSource() {
+      this.asExpr().getExpr() instanceof GrapeCookiesCall
+      or
+      this.asExpr().getExpr() instanceof GrapeCookiesBlockCall
+    }
+
+    override string getSourceType() { result = "Grape::API#cookies" }
+
+    override Http::Server::RequestInputKind getKind() { result = Http::Server::cookieInputKind() }
+  }
+
+  /**
+   * A call to `cookies` method from within a Grape API endpoint.
+   */
+  private class GrapeCookiesCall extends MethodCall {
+    GrapeCookiesCall() {
+      // Handle cases where cookies is called on an instance of a Grape API class
+      this = grapeApiInstance().getAMethodCall("cookies").asExpr().getExpr()
+    }
+  }
+
+  /**
+   * A method defined within a `helpers` block in a Grape API class.
+   * These methods become available in endpoint contexts through Grape's DSL.
+   */
+  private class GrapeHelperMethod extends Method {
+    private GrapeApiClass apiClass;
+
+    GrapeHelperMethod() { this = apiClass.getHelperSelf().getSelfVariable().getDeclaringScope() }
+
+    /**
+     * Gets the API class that contains this helper method.
+     */
+    GrapeApiClass getApiClass() { result = apiClass }
+  }
+
+  /**
+   * Additional call-target to resolve helper method calls defined in `helpers` blocks.
+   *
+   * This class is responsible for resolving calls to helper methods defined in
+   * `helpers` blocks, allowing the dataflow framework to accurately track
+   * the flow of information between these methods and their call sites.
+   */
+  private class GrapeHelperMethodTarget extends AdditionalCallTarget {
+    override DataFlowCallable viableTarget(CfgNodes::ExprNodes::CallCfgNode call) {
+      // Find calls to helper methods from within Grape endpoints or other helper methods
+      exists(GrapeHelperMethod helperMethod, MethodCall mc |
+        result.asCfgScope() = helperMethod and
+        mc = call.getAstNode() and
+        mc.getMethodName() = helperMethod.getName() and
+        mc.getParent+() = helperMethod.getApiClass().getADeclaration()
+      )
+    }
+  }
+}
diff --git a/ruby/ql/lib/codeql/ruby/frameworks/core/Kernel.qll b/ruby/ql/lib/codeql/ruby/frameworks/core/Kernel.qll
index 2746faebdc8..0342932a614 100644
--- a/ruby/ql/lib/codeql/ruby/frameworks/core/Kernel.qll
+++ b/ruby/ql/lib/codeql/ruby/frameworks/core/Kernel.qll
@@ -50,8 +50,8 @@ module Kernel {
   }
 
   /**
-   * Private methods in the `Kernel` module.
-   * These can be be invoked on `self`, on `Kernel`, or using a low-level primitive like `send` or `instance_eval`.
+   * Holds if `method` is a name of a private method in the `Kernel` module.
+   * These can be invoked on `self`, on `Kernel`, or using a low-level primitive like `send` or `instance_eval`.
    * ```ruby
    * puts "hello world"
    * Kernel.puts "hello world"
diff --git a/ruby/ql/lib/codeql/ruby/frameworks/data/internal/ApiGraphModelsExtensions.qll b/ruby/ql/lib/codeql/ruby/frameworks/data/internal/ApiGraphModelsExtensions.qll
index b86d7de457e..4969da43be3 100644
--- a/ruby/ql/lib/codeql/ruby/frameworks/data/internal/ApiGraphModelsExtensions.qll
+++ b/ruby/ql/lib/codeql/ruby/frameworks/data/internal/ApiGraphModelsExtensions.qll
@@ -4,7 +4,7 @@
 
 /**
  * Holds if the value at `(type, path)` should be seen as a flow
- * source of the given `kind`.
+ * source of the given `kind` and `madId` is the data extension row number.
  *
  * The kind `remote` represents a general remote flow source.
  */
@@ -14,13 +14,14 @@ extensible predicate sourceModel(
 
 /**
  * Holds if the value at `(type, path)` should be seen as a sink
- * of the given `kind`.
+ * of the given `kind` and `madId` is the data extension row number.
  */
 extensible predicate sinkModel(string type, string path, string kind, QlBuiltins::ExtensionId madId);
 
 /**
  * Holds if in calls to `(type, path)`, the value referred to by `input`
- * can flow to the value referred to by `output`.
+ * can flow to the value referred to by `output` and `madId` is the data
+ * extension row number.
  *
  * `kind` should be either `value` or `taint`, for value-preserving or taint-preserving steps,
  * respectively.
diff --git a/ruby/ql/lib/codeql/ruby/frameworks/http_clients/Excon.qll b/ruby/ql/lib/codeql/ruby/frameworks/http_clients/Excon.qll
index e2ba1eb48fe..9ffd5e3ef51 100644
--- a/ruby/ql/lib/codeql/ruby/frameworks/http_clients/Excon.qll
+++ b/ruby/ql/lib/codeql/ruby/frameworks/http_clients/Excon.qll
@@ -25,27 +25,28 @@ private import codeql.ruby.DataFlow
  */
 class ExconHttpRequest extends Http::Client::Request::Range instanceof DataFlow::CallNode {
   API::Node requestNode;
-  API::Node connectionNode;
   DataFlow::Node connectionUse;
 
   ExconHttpRequest() {
     this = requestNode.asSource() and
-    connectionUse = connectionNode.asSource() and
-    connectionNode =
-      [
-        // one-off requests
-        API::getTopLevelMember("Excon"),
-        // connection re-use
-        API::getTopLevelMember("Excon").getInstance(),
-        API::getTopLevelMember("Excon").getMember("Connection").getInstance()
-      ] and
-    requestNode =
-      connectionNode
-          .getReturn([
-              // Excon#request exists but Excon.request doesn't.
-              // This shouldn't be a problem - in real code the latter would raise NoMethodError anyway.
-              "get", "head", "delete", "options", "post", "put", "patch", "trace", "request"
-            ])
+    exists(API::Node connectionNode |
+      connectionUse = connectionNode.asSource() and
+      connectionNode =
+        [
+          // one-off requests
+          API::getTopLevelMember("Excon"),
+          // connection re-use
+          API::getTopLevelMember("Excon").getInstance(),
+          API::getTopLevelMember("Excon").getMember("Connection").getInstance()
+        ] and
+      requestNode =
+        connectionNode
+            .getReturn([
+                // Excon#request exists but Excon.request doesn't.
+                // This shouldn't be a problem - in real code the latter would raise NoMethodError anyway.
+                "get", "head", "delete", "options", "post", "put", "patch", "trace", "request"
+              ])
+    )
   }
 
   override DataFlow::Node getResponseBody() { result = requestNode.getAMethodCall("body") }
diff --git a/ruby/ql/lib/codeql/ruby/frameworks/http_clients/NetHttp.qll b/ruby/ql/lib/codeql/ruby/frameworks/http_clients/NetHttp.qll
index bcb86e2b63d..a1b58d700b8 100644
--- a/ruby/ql/lib/codeql/ruby/frameworks/http_clients/NetHttp.qll
+++ b/ruby/ql/lib/codeql/ruby/frameworks/http_clients/NetHttp.qll
@@ -27,11 +27,10 @@ private import codeql.ruby.DataFlow
 class NetHttpRequest extends Http::Client::Request::Range instanceof DataFlow::CallNode {
   private DataFlow::CallNode request;
   API::Node requestNode;
-  API::Node connectionNode;
   private boolean returnsResponseBody;
 
   NetHttpRequest() {
-    exists(string method |
+    exists(string method, API::Node connectionNode |
       request = requestNode.asSource() and
       this = request and
       requestNode = connectionNode.getReturn(method)
diff --git a/ruby/ql/lib/codeql/ruby/regexp/internal/ParseRegExp.qll b/ruby/ql/lib/codeql/ruby/regexp/internal/ParseRegExp.qll
index d1f96ec407e..d35d9353bf1 100644
--- a/ruby/ql/lib/codeql/ruby/regexp/internal/ParseRegExp.qll
+++ b/ruby/ql/lib/codeql/ruby/regexp/internal/ParseRegExp.qll
@@ -194,7 +194,7 @@ abstract class RegExp extends Ast::StringlikeLiteral {
   }
 
   /**
-   * Holds if the character set starting at `charset_start` contains a character range
+   * Holds if the character set starting at `charsetStart` contains a character range
    * with lower bound found between `start` and `lowerEnd`
    * and upper bound found between `upperStart` and `end`.
    */
diff --git a/ruby/ql/lib/codeql/ruby/security/ImproperMemoizationQuery.qll b/ruby/ql/lib/codeql/ruby/security/ImproperMemoizationQuery.qll
index 46fc231c6fc..dab75f00b9e 100644
--- a/ruby/ql/lib/codeql/ruby/security/ImproperMemoizationQuery.qll
+++ b/ruby/ql/lib/codeql/ruby/security/ImproperMemoizationQuery.qll
@@ -45,7 +45,7 @@ private class MemoCandidate extends Method {
 }
 
 /**
- * Holds if parameter `p` of `m` is read in the right hand side of `assign`.
+ * Holds if parameter `p` of `m` is read in the right hand side of `a`.
  */
 private predicate parameterUsedInMemoValue(Method m, Parameter p, MemoStmt a) {
   p = m.getAParameter() and
@@ -54,7 +54,7 @@ private predicate parameterUsedInMemoValue(Method m, Parameter p, MemoStmt a) {
 }
 
 /**
- * Holds if parameter `p` of `m` is read in the left hand side of `assign`.
+ * Holds if parameter `p` of `m` is read in the left hand side of `a`.
  */
 private predicate parameterUsedInMemoKey(Method m, Parameter p, HashMemoStmt a) {
   p = m.getAParameter() and
diff --git a/ruby/ql/lib/codeql/ruby/security/regexp/PolynomialReDoSQuery.qll b/ruby/ql/lib/codeql/ruby/security/regexp/PolynomialReDoSQuery.qll
index 81179717e01..7ff62771462 100644
--- a/ruby/ql/lib/codeql/ruby/security/regexp/PolynomialReDoSQuery.qll
+++ b/ruby/ql/lib/codeql/ruby/security/regexp/PolynomialReDoSQuery.qll
@@ -24,6 +24,8 @@ private module PolynomialReDoSConfig implements DataFlow::ConfigSig {
   predicate observeDiffInformedIncrementalMode() { none() }
 
   Location getASelectedSinkLocation(DataFlow::Node sink) {
+    result = sink.(Sink).getLocation()
+    or
     result = sink.(Sink).getHighlight().getLocation()
     or
     result = sink.(Sink).getRegExp().getRootTerm().getLocation()
diff --git a/ruby/ql/lib/qlpack.yml b/ruby/ql/lib/qlpack.yml
index 2ee74c2d603..3a400018dec 100644
--- a/ruby/ql/lib/qlpack.yml
+++ b/ruby/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/ruby-all
-version: 5.0.2-dev
+version: 5.1.3-dev
 groups: ruby
 extractor: ruby
 dbscheme: ruby.dbscheme
diff --git a/ruby/ql/lib/utils/test/InlineFlowTest.qll b/ruby/ql/lib/utils/test/InlineFlowTest.qll
index 2444b04fb13..7ef20938003 100644
--- a/ruby/ql/lib/utils/test/InlineFlowTest.qll
+++ b/ruby/ql/lib/utils/test/InlineFlowTest.qll
@@ -3,7 +3,7 @@
  * See `shared/util/codeql/dataflow/test/InlineFlowTest.qll`
  */
 
-import ruby
+private import ruby
 private import codeql.Locations
 private import codeql.dataflow.test.InlineFlowTest
 private import codeql.ruby.dataflow.internal.DataFlowImplSpecific
diff --git a/ruby/ql/src/CHANGELOG.md b/ruby/ql/src/CHANGELOG.md
index 330b92b7d7e..282fd284635 100644
--- a/ruby/ql/src/CHANGELOG.md
+++ b/ruby/ql/src/CHANGELOG.md
@@ -1,3 +1,27 @@
+## 1.4.8
+
+No user-facing changes.
+
+## 1.4.7
+
+No user-facing changes.
+
+## 1.4.6
+
+No user-facing changes.
+
+## 1.4.5
+
+No user-facing changes.
+
+## 1.4.4
+
+No user-facing changes.
+
+## 1.4.3
+
+No user-facing changes.
+
 ## 1.4.2
 
 No user-facing changes.
diff --git a/ruby/ql/src/change-notes/2025-10-22-adjust-query-severity.md b/ruby/ql/src/change-notes/2025-10-22-adjust-query-severity.md
new file mode 100644
index 00000000000..4da73769e27
--- /dev/null
+++ b/ruby/ql/src/change-notes/2025-10-22-adjust-query-severity.md
@@ -0,0 +1,4 @@
+---
+category: queryMetadata
+---
+* Reduced the `security-severity` score of the `rb/overly-large-range` query from 5.0 to 4.0 to better reflect its impact. 
\ No newline at end of file
diff --git a/ruby/ql/src/change-notes/released/1.4.3.md b/ruby/ql/src/change-notes/released/1.4.3.md
new file mode 100644
index 00000000000..abf2a0d4dcc
--- /dev/null
+++ b/ruby/ql/src/change-notes/released/1.4.3.md
@@ -0,0 +1,3 @@
+## 1.4.3
+
+No user-facing changes.
diff --git a/ruby/ql/src/change-notes/released/1.4.4.md b/ruby/ql/src/change-notes/released/1.4.4.md
new file mode 100644
index 00000000000..cb7dd204b9c
--- /dev/null
+++ b/ruby/ql/src/change-notes/released/1.4.4.md
@@ -0,0 +1,3 @@
+## 1.4.4
+
+No user-facing changes.
diff --git a/ruby/ql/src/change-notes/released/1.4.5.md b/ruby/ql/src/change-notes/released/1.4.5.md
new file mode 100644
index 00000000000..930163bb5ae
--- /dev/null
+++ b/ruby/ql/src/change-notes/released/1.4.5.md
@@ -0,0 +1,3 @@
+## 1.4.5
+
+No user-facing changes.
diff --git a/ruby/ql/src/change-notes/released/1.4.6.md b/ruby/ql/src/change-notes/released/1.4.6.md
new file mode 100644
index 00000000000..5146f9e1cbf
--- /dev/null
+++ b/ruby/ql/src/change-notes/released/1.4.6.md
@@ -0,0 +1,3 @@
+## 1.4.6
+
+No user-facing changes.
diff --git a/ruby/ql/src/change-notes/released/1.4.7.md b/ruby/ql/src/change-notes/released/1.4.7.md
new file mode 100644
index 00000000000..4f064ad746f
--- /dev/null
+++ b/ruby/ql/src/change-notes/released/1.4.7.md
@@ -0,0 +1,3 @@
+## 1.4.7
+
+No user-facing changes.
diff --git a/ruby/ql/src/change-notes/released/1.4.8.md b/ruby/ql/src/change-notes/released/1.4.8.md
new file mode 100644
index 00000000000..06976d05e75
--- /dev/null
+++ b/ruby/ql/src/change-notes/released/1.4.8.md
@@ -0,0 +1,3 @@
+## 1.4.8
+
+No user-facing changes.
diff --git a/ruby/ql/src/codeql-pack.release.yml b/ruby/ql/src/codeql-pack.release.yml
index a76cacdf799..16e6425ae7e 100644
--- a/ruby/ql/src/codeql-pack.release.yml
+++ b/ruby/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.4.2
+lastReleaseVersion: 1.4.8
diff --git a/ruby/ql/src/experimental/insecure-randomness/examples/InsecureRandomnessBad.rb b/ruby/ql/src/experimental/insecure-randomness/examples/InsecureRandomnessBad.rb
index d4a94a8b18b..044d257096a 100644
--- a/ruby/ql/src/experimental/insecure-randomness/examples/InsecureRandomnessBad.rb
+++ b/ruby/ql/src/experimental/insecure-randomness/examples/InsecureRandomnessBad.rb
@@ -1,6 +1,6 @@
 def generate_password()
   chars = ('a'..'z').to_a + ('A'..'Z').to_a + ('0'..'9').to_a + ['!', '@', '#', '$', '%']
-  # BAD: rand is not cryptographically secure
+  # BAD: rand is not cryptographically secure
   password = (1..10).collect { chars[rand(chars.size)] }.join
 end
 
diff --git a/ruby/ql/src/experimental/manually-check-http-verb/ManuallyCheckHttpVerb.ql b/ruby/ql/src/experimental/manually-check-http-verb/ManuallyCheckHttpVerb.ql
index 80113ee7823..4af2425b1a8 100644
--- a/ruby/ql/src/experimental/manually-check-http-verb/ManuallyCheckHttpVerb.ql
+++ b/ruby/ql/src/experimental/manually-check-http-verb/ManuallyCheckHttpVerb.ql
@@ -88,8 +88,6 @@ private module HttpVerbConfig implements DataFlow::ConfigSig {
   }
 
   predicate observeDiffInformedIncrementalMode() { any() }
-
-  Location getASelectedSourceLocation(DataFlow::Node source) { none() }
 }
 
 private module HttpVerbFlow = TaintTracking::Global<HttpVerbConfig>;
diff --git a/ruby/ql/src/experimental/weak-params/WeakParams.ql b/ruby/ql/src/experimental/weak-params/WeakParams.ql
index 2abc151a920..faec728a2dd 100644
--- a/ruby/ql/src/experimental/weak-params/WeakParams.ql
+++ b/ruby/ql/src/experimental/weak-params/WeakParams.ql
@@ -48,8 +48,6 @@ private module WeakParamsConfig implements DataFlow::ConfigSig {
   predicate isSink(DataFlow::Node node) { node = any(PersistentWriteAccess a).getValue() }
 
   predicate observeDiffInformedIncrementalMode() { any() }
-
-  Location getASelectedSourceLocation(DataFlow::Node source) { none() }
 }
 
 private module WeakParamsFlow = TaintTracking::Global<WeakParamsConfig>;
diff --git a/ruby/ql/src/qlpack.yml b/ruby/ql/src/qlpack.yml
index ac62f1cc0d9..37c9e4be522 100644
--- a/ruby/ql/src/qlpack.yml
+++ b/ruby/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/ruby-queries
-version: 1.4.3-dev
+version: 1.4.9-dev
 groups:
   - ruby
   - queries
diff --git a/ruby/ql/src/queries/performance/DatabaseQueryInLoop.ql b/ruby/ql/src/queries/performance/DatabaseQueryInLoop.ql
index b34ee080fcd..c81cdd6b2f6 100644
--- a/ruby/ql/src/queries/performance/DatabaseQueryInLoop.ql
+++ b/ruby/ql/src/queries/performance/DatabaseQueryInLoop.ql
@@ -16,7 +16,6 @@ import codeql.ruby.ast.internal.Constant
 import codeql.ruby.Concepts
 import codeql.ruby.frameworks.ActiveRecord
 private import codeql.ruby.TaintTracking
-private import codeql.ruby.CFG
 private import codeql.ruby.controlflow.internal.Guards as Guards
 
 /** Gets the name of a built-in method that involves a loop operation. */
@@ -42,7 +41,7 @@ class LoopingCall extends DataFlow::CallNode {
 
 /** Holds if `ar` influences a guard that may control the execution of a loop. */
 predicate usedInLoopControlGuard(ActiveRecordInstance ar) {
-  exists(DataFlow::Node insideGuard, CfgNodes::ExprCfgNode guard |
+  exists(DataFlow::Node insideGuard, Cfg::CfgNodes::ExprCfgNode guard |
     // For a guard like `cond && ar`, the whole guard will not be tainted
     // so we need to look at the taint of the individual parts.
     insideGuard.asExpr().getExpr() = guard.getExpr().getAChild*()
@@ -53,12 +52,12 @@ predicate usedInLoopControlGuard(ActiveRecordInstance ar) {
 }
 
 /** Holds if `guard` controls `break` and `break` would break out of a loop. */
-predicate guardForLoopControl(CfgNodes::ExprCfgNode guard, CfgNodes::AstCfgNode break) {
+predicate guardForLoopControl(Cfg::CfgNodes::ExprCfgNode guard, Cfg::CfgNodes::AstCfgNode break) {
   Guards::guardControlsBlock(guard, break.getBasicBlock(), _) and
   (
-    break.(CfgNodes::ExprNodes::MethodCallCfgNode).getMethodName() = "raise"
+    break.(Cfg::CfgNodes::ExprNodes::MethodCallCfgNode).getMethodName() = "raise"
     or
-    break instanceof CfgNodes::ReturningCfgNode
+    break instanceof Cfg::CfgNodes::ReturningCfgNode
   )
 }
 
diff --git a/ruby/ql/src/queries/security/cwe-020/OverlyLargeRange.ql b/ruby/ql/src/queries/security/cwe-020/OverlyLargeRange.ql
index 62b088355b5..6f0f529a31d 100644
--- a/ruby/ql/src/queries/security/cwe-020/OverlyLargeRange.ql
+++ b/ruby/ql/src/queries/security/cwe-020/OverlyLargeRange.ql
@@ -4,7 +4,7 @@
  *              This may allow an attacker to bypass a filter or sanitizer.
  * @kind problem
  * @problem.severity warning
- * @security-severity 5.0
+ * @security-severity 4.0
  * @precision high
  * @id rb/overly-large-range
  * @tags correctness
diff --git a/ruby/ql/src/queries/security/cwe-327/BrokenCryptoAlgorithm.qhelp b/ruby/ql/src/queries/security/cwe-327/BrokenCryptoAlgorithm.qhelp
index cede4e735d5..cf84089e3d2 100644
--- a/ruby/ql/src/queries/security/cwe-327/BrokenCryptoAlgorithm.qhelp
+++ b/ruby/ql/src/queries/security/cwe-327/BrokenCryptoAlgorithm.qhelp
@@ -4,14 +4,33 @@
 <qhelp>
   <overview>
     <p>
-      Using broken or weak cryptographic algorithms can leave data
-      vulnerable to being decrypted or forged by an attacker.
+      Using broken or weak cryptographic algorithms may compromise
+      security guarantees such as confidentiality, integrity, and
+      authenticity.
     </p>
+
     <p>
-      Many cryptographic algorithms provided by cryptography
-      libraries are known to be weak, or flawed. Using such an
-      algorithm means that encrypted or hashed data is less
-      secure than it appears to be.
+      Many cryptographic algorithms are known to be weak or flawed. The
+      security guarantees of a system often rely on the underlying
+      cryptography, so using a weak algorithm can have severe consequences.
+      For example:
+    </p>
+
+    <ul>
+      <li>
+      If a weak encryption algorithm is used, an attacker may be able to
+      decrypt sensitive data.
+      </li>
+      <li>
+      If a weak algorithm is used for digital signatures, an attacker may
+      be able to forge signatures and impersonate legitimate users.
+      </li>
+    </ul>
+    <p>
+      This query alerts on any use of a weak cryptographic algorithm that is
+      not a hashing algorithm. Use of broken or weak cryptographic hash
+      functions are handled by the
+      <code>rb/weak-sensitive-data-hashing</code> query.
     </p>
   </overview>
   <recommendation>
diff --git a/ruby/ql/src/queries/security/cwe-352/CSRFProtectionDisabled.qhelp b/ruby/ql/src/queries/security/cwe-352/CSRFProtectionDisabled.qhelp
index 7656a676d64..f14f04de57f 100644
--- a/ruby/ql/src/queries/security/cwe-352/CSRFProtectionDisabled.qhelp
+++ b/ruby/ql/src/queries/security/cwe-352/CSRFProtectionDisabled.qhelp
@@ -58,6 +58,11 @@
       for example if parts of the session are memoized. Calling
       <code>protect_from_forgery with: :exception</code> can help to avoid this
       by raising an exception on an invalid CSRF token instead.
+      Note this remains true even in Rails version 5 and later: these versions
+      automatically run <code>protect_from_forgery with: :exception</code>
+      by default, but manually calling <code>protect_from_forgery</code> with
+      no <code>with</code> argument will still downgrade protection to provide an
+      empty session rather than raise an exception.
     </p>
 
   </example>
diff --git a/ruby/ql/src/queries/security/cwe-352/CSRFProtectionNotEnabled.qhelp b/ruby/ql/src/queries/security/cwe-352/CSRFProtectionNotEnabled.qhelp
index 9b8944b1d65..5cbbbd1eea1 100644
--- a/ruby/ql/src/queries/security/cwe-352/CSRFProtectionNotEnabled.qhelp
+++ b/ruby/ql/src/queries/security/cwe-352/CSRFProtectionNotEnabled.qhelp
@@ -42,6 +42,12 @@
       vulnerability - for example if parts of the session are memoized. Calling
       <code>protect_from_forgery with: :exception</code> can help to avoid this
       by raising an exception on an invalid CSRF token instead.
+
+      Note that Rails versions 5 and later
+      automatically run <code>protect_from_forgery with: :exception</code>
+      by default, but manually calling <code>protect_from_forgery</code> with
+      no <code>with</code> argument will downgrade protection to provide an empty
+      session rather than raise an exception.
     </p>
   </recommendation>
 
diff --git a/ruby/ql/src/queries/security/cwe-732/WeakFilePermissions.ql b/ruby/ql/src/queries/security/cwe-732/WeakFilePermissions.ql
index dbc5db91d99..eef9f9e8f8d 100644
--- a/ruby/ql/src/queries/security/cwe-732/WeakFilePermissions.ql
+++ b/ruby/ql/src/queries/security/cwe-732/WeakFilePermissions.ql
@@ -60,8 +60,9 @@ private module PermissivePermissionsConfig implements DataFlow::ConfigSig {
   predicate observeDiffInformedIncrementalMode() { any() }
 
   Location getASelectedSinkLocation(DataFlow::Node sink) {
-    exists(FileSystemPermissionModification mod |
-      sinkDef(sink, mod) and
+    exists(FileSystemPermissionModification mod | sinkDef(sink, mod) |
+      result = sink.getLocation()
+      or
       result = mod.getLocation()
     )
   }
diff --git a/ruby/ql/test/library-tests/controlflow/graph/BasicBlocks.expected b/ruby/ql/test/library-tests/controlflow/graph/BasicBlocks.expected
index cafb6267eb9..720ee26e679 100644
--- a/ruby/ql/test/library-tests/controlflow/graph/BasicBlocks.expected
+++ b/ruby/ql/test/library-tests/controlflow/graph/BasicBlocks.expected
@@ -6,10 +6,10 @@ dominates
 | break_ensure.rb:1:1:11:3 | enter m1 | break_ensure.rb:3:5:5:7 | if ... |
 | break_ensure.rb:1:1:11:3 | enter m1 | break_ensure.rb:3:8:3:8 | x |
 | break_ensure.rb:1:1:11:3 | enter m1 | break_ensure.rb:4:7:4:11 | break |
-| break_ensure.rb:1:1:11:3 | enter m1 | break_ensure.rb:8:3:10:5 | [ensure: raise] if ... |
+| break_ensure.rb:1:1:11:3 | enter m1 | break_ensure.rb:8:3:10:5 | [ensure: exception] if ... |
 | break_ensure.rb:1:1:11:3 | enter m1 | break_ensure.rb:8:3:10:5 | if ... |
-| break_ensure.rb:1:1:11:3 | enter m1 | break_ensure.rb:8:6:8:13 | [ensure: raise] self |
-| break_ensure.rb:1:1:11:3 | enter m1 | break_ensure.rb:9:5:9:23 | [ensure: raise] self |
+| break_ensure.rb:1:1:11:3 | enter m1 | break_ensure.rb:8:6:8:13 | [ensure: exception] self |
+| break_ensure.rb:1:1:11:3 | enter m1 | break_ensure.rb:9:5:9:23 | [ensure: exception] self |
 | break_ensure.rb:1:1:11:3 | enter m1 | break_ensure.rb:9:5:9:23 | self |
 | break_ensure.rb:1:1:11:3 | exit m1 | break_ensure.rb:1:1:11:3 | exit m1 |
 | break_ensure.rb:1:1:56:4 | enter break_ensure.rb | break_ensure.rb:1:1:56:4 | enter break_ensure.rb |
@@ -22,22 +22,22 @@ dominates
 | break_ensure.rb:2:9:2:9 | x | break_ensure.rb:3:5:5:7 | if ... |
 | break_ensure.rb:2:9:2:9 | x | break_ensure.rb:3:8:3:8 | x |
 | break_ensure.rb:2:9:2:9 | x | break_ensure.rb:4:7:4:11 | break |
-| break_ensure.rb:2:9:2:9 | x | break_ensure.rb:8:3:10:5 | [ensure: raise] if ... |
+| break_ensure.rb:2:9:2:9 | x | break_ensure.rb:8:3:10:5 | [ensure: exception] if ... |
 | break_ensure.rb:2:9:2:9 | x | break_ensure.rb:8:3:10:5 | if ... |
-| break_ensure.rb:2:9:2:9 | x | break_ensure.rb:8:6:8:13 | [ensure: raise] self |
-| break_ensure.rb:2:9:2:9 | x | break_ensure.rb:9:5:9:23 | [ensure: raise] self |
+| break_ensure.rb:2:9:2:9 | x | break_ensure.rb:8:6:8:13 | [ensure: exception] self |
+| break_ensure.rb:2:9:2:9 | x | break_ensure.rb:9:5:9:23 | [ensure: exception] self |
 | break_ensure.rb:2:9:2:9 | x | break_ensure.rb:9:5:9:23 | self |
 | break_ensure.rb:3:5:5:7 | if ... | break_ensure.rb:3:5:5:7 | if ... |
 | break_ensure.rb:3:8:3:8 | x | break_ensure.rb:3:5:5:7 | if ... |
 | break_ensure.rb:3:8:3:8 | x | break_ensure.rb:3:8:3:8 | x |
 | break_ensure.rb:3:8:3:8 | x | break_ensure.rb:4:7:4:11 | break |
 | break_ensure.rb:4:7:4:11 | break | break_ensure.rb:4:7:4:11 | break |
-| break_ensure.rb:8:3:10:5 | [ensure: raise] if ... | break_ensure.rb:8:3:10:5 | [ensure: raise] if ... |
+| break_ensure.rb:8:3:10:5 | [ensure: exception] if ... | break_ensure.rb:8:3:10:5 | [ensure: exception] if ... |
 | break_ensure.rb:8:3:10:5 | if ... | break_ensure.rb:8:3:10:5 | if ... |
-| break_ensure.rb:8:6:8:13 | [ensure: raise] self | break_ensure.rb:8:3:10:5 | [ensure: raise] if ... |
-| break_ensure.rb:8:6:8:13 | [ensure: raise] self | break_ensure.rb:8:6:8:13 | [ensure: raise] self |
-| break_ensure.rb:8:6:8:13 | [ensure: raise] self | break_ensure.rb:9:5:9:23 | [ensure: raise] self |
-| break_ensure.rb:9:5:9:23 | [ensure: raise] self | break_ensure.rb:9:5:9:23 | [ensure: raise] self |
+| break_ensure.rb:8:6:8:13 | [ensure: exception] self | break_ensure.rb:8:3:10:5 | [ensure: exception] if ... |
+| break_ensure.rb:8:6:8:13 | [ensure: exception] self | break_ensure.rb:8:6:8:13 | [ensure: exception] self |
+| break_ensure.rb:8:6:8:13 | [ensure: exception] self | break_ensure.rb:9:5:9:23 | [ensure: exception] self |
+| break_ensure.rb:9:5:9:23 | [ensure: exception] self | break_ensure.rb:9:5:9:23 | [ensure: exception] self |
 | break_ensure.rb:9:5:9:23 | self | break_ensure.rb:9:5:9:23 | self |
 | break_ensure.rb:13:1:25:3 | enter m2 | break_ensure.rb:13:1:25:3 | enter m2 |
 | break_ensure.rb:13:1:25:3 | enter m2 | break_ensure.rb:14:3:24:5 | while ... |
@@ -46,11 +46,11 @@ dominates
 | break_ensure.rb:13:1:25:3 | enter m2 | break_ensure.rb:16:10:16:10 | x |
 | break_ensure.rb:13:1:25:3 | enter m2 | break_ensure.rb:17:9:17:13 | break |
 | break_ensure.rb:13:1:25:3 | enter m2 | break_ensure.rb:20:7:22:9 | [ensure: break] if ... |
-| break_ensure.rb:13:1:25:3 | enter m2 | break_ensure.rb:20:7:22:9 | [ensure: raise] if ... |
+| break_ensure.rb:13:1:25:3 | enter m2 | break_ensure.rb:20:7:22:9 | [ensure: exception] if ... |
 | break_ensure.rb:13:1:25:3 | enter m2 | break_ensure.rb:20:7:22:9 | if ... |
-| break_ensure.rb:13:1:25:3 | enter m2 | break_ensure.rb:20:10:20:10 | [ensure: raise] y |
+| break_ensure.rb:13:1:25:3 | enter m2 | break_ensure.rb:20:10:20:10 | [ensure: exception] y |
 | break_ensure.rb:13:1:25:3 | enter m2 | break_ensure.rb:21:9:21:20 | [ensure: break] self |
-| break_ensure.rb:13:1:25:3 | enter m2 | break_ensure.rb:21:9:21:20 | [ensure: raise] self |
+| break_ensure.rb:13:1:25:3 | enter m2 | break_ensure.rb:21:9:21:20 | [ensure: exception] self |
 | break_ensure.rb:13:1:25:3 | enter m2 | break_ensure.rb:21:9:21:20 | self |
 | break_ensure.rb:14:3:24:5 | while ... | break_ensure.rb:14:3:24:5 | while ... |
 | break_ensure.rb:14:9:14:9 | x | break_ensure.rb:14:3:24:5 | while ... |
@@ -59,11 +59,11 @@ dominates
 | break_ensure.rb:14:9:14:9 | x | break_ensure.rb:16:10:16:10 | x |
 | break_ensure.rb:14:9:14:9 | x | break_ensure.rb:17:9:17:13 | break |
 | break_ensure.rb:14:9:14:9 | x | break_ensure.rb:20:7:22:9 | [ensure: break] if ... |
-| break_ensure.rb:14:9:14:9 | x | break_ensure.rb:20:7:22:9 | [ensure: raise] if ... |
+| break_ensure.rb:14:9:14:9 | x | break_ensure.rb:20:7:22:9 | [ensure: exception] if ... |
 | break_ensure.rb:14:9:14:9 | x | break_ensure.rb:20:7:22:9 | if ... |
-| break_ensure.rb:14:9:14:9 | x | break_ensure.rb:20:10:20:10 | [ensure: raise] y |
+| break_ensure.rb:14:9:14:9 | x | break_ensure.rb:20:10:20:10 | [ensure: exception] y |
 | break_ensure.rb:14:9:14:9 | x | break_ensure.rb:21:9:21:20 | [ensure: break] self |
-| break_ensure.rb:14:9:14:9 | x | break_ensure.rb:21:9:21:20 | [ensure: raise] self |
+| break_ensure.rb:14:9:14:9 | x | break_ensure.rb:21:9:21:20 | [ensure: exception] self |
 | break_ensure.rb:14:9:14:9 | x | break_ensure.rb:21:9:21:20 | self |
 | break_ensure.rb:16:7:18:9 | if ... | break_ensure.rb:16:7:18:9 | if ... |
 | break_ensure.rb:16:7:18:9 | if ... | break_ensure.rb:20:7:22:9 | if ... |
@@ -72,42 +72,42 @@ dominates
 | break_ensure.rb:16:10:16:10 | x | break_ensure.rb:16:10:16:10 | x |
 | break_ensure.rb:16:10:16:10 | x | break_ensure.rb:17:9:17:13 | break |
 | break_ensure.rb:16:10:16:10 | x | break_ensure.rb:20:7:22:9 | [ensure: break] if ... |
-| break_ensure.rb:16:10:16:10 | x | break_ensure.rb:20:7:22:9 | [ensure: raise] if ... |
+| break_ensure.rb:16:10:16:10 | x | break_ensure.rb:20:7:22:9 | [ensure: exception] if ... |
 | break_ensure.rb:16:10:16:10 | x | break_ensure.rb:20:7:22:9 | if ... |
-| break_ensure.rb:16:10:16:10 | x | break_ensure.rb:20:10:20:10 | [ensure: raise] y |
+| break_ensure.rb:16:10:16:10 | x | break_ensure.rb:20:10:20:10 | [ensure: exception] y |
 | break_ensure.rb:16:10:16:10 | x | break_ensure.rb:21:9:21:20 | [ensure: break] self |
-| break_ensure.rb:16:10:16:10 | x | break_ensure.rb:21:9:21:20 | [ensure: raise] self |
+| break_ensure.rb:16:10:16:10 | x | break_ensure.rb:21:9:21:20 | [ensure: exception] self |
 | break_ensure.rb:16:10:16:10 | x | break_ensure.rb:21:9:21:20 | self |
 | break_ensure.rb:17:9:17:13 | break | break_ensure.rb:17:9:17:13 | break |
 | break_ensure.rb:17:9:17:13 | break | break_ensure.rb:20:7:22:9 | [ensure: break] if ... |
 | break_ensure.rb:17:9:17:13 | break | break_ensure.rb:21:9:21:20 | [ensure: break] self |
 | break_ensure.rb:20:7:22:9 | [ensure: break] if ... | break_ensure.rb:20:7:22:9 | [ensure: break] if ... |
-| break_ensure.rb:20:7:22:9 | [ensure: raise] if ... | break_ensure.rb:20:7:22:9 | [ensure: raise] if ... |
+| break_ensure.rb:20:7:22:9 | [ensure: exception] if ... | break_ensure.rb:20:7:22:9 | [ensure: exception] if ... |
 | break_ensure.rb:20:7:22:9 | if ... | break_ensure.rb:20:7:22:9 | if ... |
-| break_ensure.rb:20:10:20:10 | [ensure: raise] y | break_ensure.rb:20:7:22:9 | [ensure: raise] if ... |
-| break_ensure.rb:20:10:20:10 | [ensure: raise] y | break_ensure.rb:20:10:20:10 | [ensure: raise] y |
-| break_ensure.rb:20:10:20:10 | [ensure: raise] y | break_ensure.rb:21:9:21:20 | [ensure: raise] self |
+| break_ensure.rb:20:10:20:10 | [ensure: exception] y | break_ensure.rb:20:7:22:9 | [ensure: exception] if ... |
+| break_ensure.rb:20:10:20:10 | [ensure: exception] y | break_ensure.rb:20:10:20:10 | [ensure: exception] y |
+| break_ensure.rb:20:10:20:10 | [ensure: exception] y | break_ensure.rb:21:9:21:20 | [ensure: exception] self |
 | break_ensure.rb:21:9:21:20 | [ensure: break] self | break_ensure.rb:21:9:21:20 | [ensure: break] self |
-| break_ensure.rb:21:9:21:20 | [ensure: raise] self | break_ensure.rb:21:9:21:20 | [ensure: raise] self |
+| break_ensure.rb:21:9:21:20 | [ensure: exception] self | break_ensure.rb:21:9:21:20 | [ensure: exception] self |
 | break_ensure.rb:21:9:21:20 | self | break_ensure.rb:21:9:21:20 | self |
 | break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:27:1:42:3 | enter m3 |
 | break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:27:1:42:3 | exit m3 |
 | break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:27:1:42:3 | exit m3 (normal) |
 | break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:29:5:31:7 | if ... |
 | break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:30:7:30:12 | return |
-| break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:33:5:39:7 | [ensure: raise] while ... |
+| break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:33:5:39:7 | [ensure: exception] while ... |
 | break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:33:5:39:7 | [ensure: return] while ... |
 | break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:33:5:39:7 | while ... |
-| break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:33:11:33:11 | [ensure: raise] y |
+| break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:33:11:33:11 | [ensure: exception] y |
 | break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:33:11:33:11 | [ensure: return] y |
 | break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:33:11:33:11 | y |
-| break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:35:9:37:11 | [ensure: raise] if ... |
+| break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:35:9:37:11 | [ensure: exception] if ... |
 | break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:35:9:37:11 | [ensure: return] if ... |
 | break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:35:9:37:11 | if ... |
-| break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:35:12:35:12 | [ensure: raise] x |
+| break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:35:12:35:12 | [ensure: exception] x |
 | break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:35:12:35:12 | [ensure: return] x |
 | break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:35:12:35:12 | x |
-| break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:36:11:36:15 | [ensure: raise] break |
+| break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:36:11:36:15 | [ensure: exception] break |
 | break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:36:11:36:15 | [ensure: return] break |
 | break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:36:11:36:15 | break |
 | break_ensure.rb:27:1:42:3 | exit m3 | break_ensure.rb:27:1:42:3 | exit m3 |
@@ -124,14 +124,14 @@ dominates
 | break_ensure.rb:30:7:30:12 | return | break_ensure.rb:35:9:37:11 | [ensure: return] if ... |
 | break_ensure.rb:30:7:30:12 | return | break_ensure.rb:35:12:35:12 | [ensure: return] x |
 | break_ensure.rb:30:7:30:12 | return | break_ensure.rb:36:11:36:15 | [ensure: return] break |
-| break_ensure.rb:33:5:39:7 | [ensure: raise] while ... | break_ensure.rb:33:5:39:7 | [ensure: raise] while ... |
+| break_ensure.rb:33:5:39:7 | [ensure: exception] while ... | break_ensure.rb:33:5:39:7 | [ensure: exception] while ... |
 | break_ensure.rb:33:5:39:7 | [ensure: return] while ... | break_ensure.rb:33:5:39:7 | [ensure: return] while ... |
 | break_ensure.rb:33:5:39:7 | while ... | break_ensure.rb:33:5:39:7 | while ... |
-| break_ensure.rb:33:11:33:11 | [ensure: raise] y | break_ensure.rb:33:5:39:7 | [ensure: raise] while ... |
-| break_ensure.rb:33:11:33:11 | [ensure: raise] y | break_ensure.rb:33:11:33:11 | [ensure: raise] y |
-| break_ensure.rb:33:11:33:11 | [ensure: raise] y | break_ensure.rb:35:9:37:11 | [ensure: raise] if ... |
-| break_ensure.rb:33:11:33:11 | [ensure: raise] y | break_ensure.rb:35:12:35:12 | [ensure: raise] x |
-| break_ensure.rb:33:11:33:11 | [ensure: raise] y | break_ensure.rb:36:11:36:15 | [ensure: raise] break |
+| break_ensure.rb:33:11:33:11 | [ensure: exception] y | break_ensure.rb:33:5:39:7 | [ensure: exception] while ... |
+| break_ensure.rb:33:11:33:11 | [ensure: exception] y | break_ensure.rb:33:11:33:11 | [ensure: exception] y |
+| break_ensure.rb:33:11:33:11 | [ensure: exception] y | break_ensure.rb:35:9:37:11 | [ensure: exception] if ... |
+| break_ensure.rb:33:11:33:11 | [ensure: exception] y | break_ensure.rb:35:12:35:12 | [ensure: exception] x |
+| break_ensure.rb:33:11:33:11 | [ensure: exception] y | break_ensure.rb:36:11:36:15 | [ensure: exception] break |
 | break_ensure.rb:33:11:33:11 | [ensure: return] y | break_ensure.rb:33:5:39:7 | [ensure: return] while ... |
 | break_ensure.rb:33:11:33:11 | [ensure: return] y | break_ensure.rb:33:11:33:11 | [ensure: return] y |
 | break_ensure.rb:33:11:33:11 | [ensure: return] y | break_ensure.rb:35:9:37:11 | [ensure: return] if ... |
@@ -142,19 +142,19 @@ dominates
 | break_ensure.rb:33:11:33:11 | y | break_ensure.rb:35:9:37:11 | if ... |
 | break_ensure.rb:33:11:33:11 | y | break_ensure.rb:35:12:35:12 | x |
 | break_ensure.rb:33:11:33:11 | y | break_ensure.rb:36:11:36:15 | break |
-| break_ensure.rb:35:9:37:11 | [ensure: raise] if ... | break_ensure.rb:35:9:37:11 | [ensure: raise] if ... |
+| break_ensure.rb:35:9:37:11 | [ensure: exception] if ... | break_ensure.rb:35:9:37:11 | [ensure: exception] if ... |
 | break_ensure.rb:35:9:37:11 | [ensure: return] if ... | break_ensure.rb:35:9:37:11 | [ensure: return] if ... |
 | break_ensure.rb:35:9:37:11 | if ... | break_ensure.rb:35:9:37:11 | if ... |
-| break_ensure.rb:35:12:35:12 | [ensure: raise] x | break_ensure.rb:35:9:37:11 | [ensure: raise] if ... |
-| break_ensure.rb:35:12:35:12 | [ensure: raise] x | break_ensure.rb:35:12:35:12 | [ensure: raise] x |
-| break_ensure.rb:35:12:35:12 | [ensure: raise] x | break_ensure.rb:36:11:36:15 | [ensure: raise] break |
+| break_ensure.rb:35:12:35:12 | [ensure: exception] x | break_ensure.rb:35:9:37:11 | [ensure: exception] if ... |
+| break_ensure.rb:35:12:35:12 | [ensure: exception] x | break_ensure.rb:35:12:35:12 | [ensure: exception] x |
+| break_ensure.rb:35:12:35:12 | [ensure: exception] x | break_ensure.rb:36:11:36:15 | [ensure: exception] break |
 | break_ensure.rb:35:12:35:12 | [ensure: return] x | break_ensure.rb:35:9:37:11 | [ensure: return] if ... |
 | break_ensure.rb:35:12:35:12 | [ensure: return] x | break_ensure.rb:35:12:35:12 | [ensure: return] x |
 | break_ensure.rb:35:12:35:12 | [ensure: return] x | break_ensure.rb:36:11:36:15 | [ensure: return] break |
 | break_ensure.rb:35:12:35:12 | x | break_ensure.rb:35:9:37:11 | if ... |
 | break_ensure.rb:35:12:35:12 | x | break_ensure.rb:35:12:35:12 | x |
 | break_ensure.rb:35:12:35:12 | x | break_ensure.rb:36:11:36:15 | break |
-| break_ensure.rb:36:11:36:15 | [ensure: raise] break | break_ensure.rb:36:11:36:15 | [ensure: raise] break |
+| break_ensure.rb:36:11:36:15 | [ensure: exception] break | break_ensure.rb:36:11:36:15 | [ensure: exception] break |
 | break_ensure.rb:36:11:36:15 | [ensure: return] break | break_ensure.rb:36:11:36:15 | [ensure: return] break |
 | break_ensure.rb:36:11:36:15 | break | break_ensure.rb:36:11:36:15 | break |
 | break_ensure.rb:44:1:56:3 | enter m4 | break_ensure.rb:44:1:56:3 | enter m4 |
@@ -163,41 +163,41 @@ dominates
 | break_ensure.rb:44:1:56:3 | enter m4 | break_ensure.rb:47:7:49:9 | if ... |
 | break_ensure.rb:44:1:56:3 | enter m4 | break_ensure.rb:47:10:47:10 | x |
 | break_ensure.rb:44:1:56:3 | enter m4 | break_ensure.rb:48:9:48:16 | self |
-| break_ensure.rb:44:1:56:3 | enter m4 | break_ensure.rb:51:7:53:9 | [ensure: raise] if ... |
+| break_ensure.rb:44:1:56:3 | enter m4 | break_ensure.rb:51:7:53:9 | [ensure: exception] if ... |
 | break_ensure.rb:44:1:56:3 | enter m4 | break_ensure.rb:51:7:53:9 | if ... |
-| break_ensure.rb:44:1:56:3 | enter m4 | break_ensure.rb:51:10:51:10 | [ensure: raise] x |
+| break_ensure.rb:44:1:56:3 | enter m4 | break_ensure.rb:51:10:51:10 | [ensure: exception] x |
 | break_ensure.rb:44:1:56:3 | enter m4 | break_ensure.rb:52:15:52:16 | 10 |
-| break_ensure.rb:44:1:56:3 | enter m4 | break_ensure.rb:52:15:52:16 | [ensure: raise] 10 |
+| break_ensure.rb:44:1:56:3 | enter m4 | break_ensure.rb:52:15:52:16 | [ensure: exception] 10 |
 | break_ensure.rb:45:3:55:5 | while ... | break_ensure.rb:45:3:55:5 | while ... |
 | break_ensure.rb:45:9:45:9 | x | break_ensure.rb:45:3:55:5 | while ... |
 | break_ensure.rb:45:9:45:9 | x | break_ensure.rb:45:9:45:9 | x |
 | break_ensure.rb:45:9:45:9 | x | break_ensure.rb:47:7:49:9 | if ... |
 | break_ensure.rb:45:9:45:9 | x | break_ensure.rb:47:10:47:10 | x |
 | break_ensure.rb:45:9:45:9 | x | break_ensure.rb:48:9:48:16 | self |
-| break_ensure.rb:45:9:45:9 | x | break_ensure.rb:51:7:53:9 | [ensure: raise] if ... |
+| break_ensure.rb:45:9:45:9 | x | break_ensure.rb:51:7:53:9 | [ensure: exception] if ... |
 | break_ensure.rb:45:9:45:9 | x | break_ensure.rb:51:7:53:9 | if ... |
-| break_ensure.rb:45:9:45:9 | x | break_ensure.rb:51:10:51:10 | [ensure: raise] x |
+| break_ensure.rb:45:9:45:9 | x | break_ensure.rb:51:10:51:10 | [ensure: exception] x |
 | break_ensure.rb:45:9:45:9 | x | break_ensure.rb:52:15:52:16 | 10 |
-| break_ensure.rb:45:9:45:9 | x | break_ensure.rb:52:15:52:16 | [ensure: raise] 10 |
+| break_ensure.rb:45:9:45:9 | x | break_ensure.rb:52:15:52:16 | [ensure: exception] 10 |
 | break_ensure.rb:47:7:49:9 | if ... | break_ensure.rb:47:7:49:9 | if ... |
 | break_ensure.rb:47:7:49:9 | if ... | break_ensure.rb:51:7:53:9 | if ... |
 | break_ensure.rb:47:7:49:9 | if ... | break_ensure.rb:52:15:52:16 | 10 |
 | break_ensure.rb:47:10:47:10 | x | break_ensure.rb:47:7:49:9 | if ... |
 | break_ensure.rb:47:10:47:10 | x | break_ensure.rb:47:10:47:10 | x |
 | break_ensure.rb:47:10:47:10 | x | break_ensure.rb:48:9:48:16 | self |
-| break_ensure.rb:47:10:47:10 | x | break_ensure.rb:51:7:53:9 | [ensure: raise] if ... |
+| break_ensure.rb:47:10:47:10 | x | break_ensure.rb:51:7:53:9 | [ensure: exception] if ... |
 | break_ensure.rb:47:10:47:10 | x | break_ensure.rb:51:7:53:9 | if ... |
-| break_ensure.rb:47:10:47:10 | x | break_ensure.rb:51:10:51:10 | [ensure: raise] x |
+| break_ensure.rb:47:10:47:10 | x | break_ensure.rb:51:10:51:10 | [ensure: exception] x |
 | break_ensure.rb:47:10:47:10 | x | break_ensure.rb:52:15:52:16 | 10 |
-| break_ensure.rb:47:10:47:10 | x | break_ensure.rb:52:15:52:16 | [ensure: raise] 10 |
+| break_ensure.rb:47:10:47:10 | x | break_ensure.rb:52:15:52:16 | [ensure: exception] 10 |
 | break_ensure.rb:48:9:48:16 | self | break_ensure.rb:48:9:48:16 | self |
-| break_ensure.rb:51:7:53:9 | [ensure: raise] if ... | break_ensure.rb:51:7:53:9 | [ensure: raise] if ... |
+| break_ensure.rb:51:7:53:9 | [ensure: exception] if ... | break_ensure.rb:51:7:53:9 | [ensure: exception] if ... |
 | break_ensure.rb:51:7:53:9 | if ... | break_ensure.rb:51:7:53:9 | if ... |
-| break_ensure.rb:51:10:51:10 | [ensure: raise] x | break_ensure.rb:51:7:53:9 | [ensure: raise] if ... |
-| break_ensure.rb:51:10:51:10 | [ensure: raise] x | break_ensure.rb:51:10:51:10 | [ensure: raise] x |
-| break_ensure.rb:51:10:51:10 | [ensure: raise] x | break_ensure.rb:52:15:52:16 | [ensure: raise] 10 |
+| break_ensure.rb:51:10:51:10 | [ensure: exception] x | break_ensure.rb:51:7:53:9 | [ensure: exception] if ... |
+| break_ensure.rb:51:10:51:10 | [ensure: exception] x | break_ensure.rb:51:10:51:10 | [ensure: exception] x |
+| break_ensure.rb:51:10:51:10 | [ensure: exception] x | break_ensure.rb:52:15:52:16 | [ensure: exception] 10 |
 | break_ensure.rb:52:15:52:16 | 10 | break_ensure.rb:52:15:52:16 | 10 |
-| break_ensure.rb:52:15:52:16 | [ensure: raise] 10 | break_ensure.rb:52:15:52:16 | [ensure: raise] 10 |
+| break_ensure.rb:52:15:52:16 | [ensure: exception] 10 | break_ensure.rb:52:15:52:16 | [ensure: exception] 10 |
 | case.rb:1:1:6:3 | enter if_in_case | case.rb:1:1:6:3 | enter if_in_case |
 | case.rb:1:1:6:3 | enter if_in_case | case.rb:2:3:5:5 | case ... |
 | case.rb:1:1:6:3 | enter if_in_case | case.rb:3:5:3:42 | [match] when ... |
@@ -2047,7 +2047,7 @@ dominates
 | raise.rb:68:1:77:3 | enter m7 | raise.rb:71:3:72:18 | elsif ... |
 | raise.rb:68:1:77:3 | enter m7 | raise.rb:71:9:71:9 | x |
 | raise.rb:68:1:77:3 | enter m7 | raise.rb:72:13:72:17 | x < 0 |
-| raise.rb:68:1:77:3 | enter m7 | raise.rb:76:3:76:15 | [ensure: raise] self |
+| raise.rb:68:1:77:3 | enter m7 | raise.rb:76:3:76:15 | [ensure: exception] self |
 | raise.rb:68:1:77:3 | enter m7 | raise.rb:76:3:76:15 | self |
 | raise.rb:68:1:77:3 | exit m7 | raise.rb:68:1:77:3 | exit m7 |
 | raise.rb:68:1:77:3 | exit m7 (normal) | raise.rb:68:1:77:3 | exit m7 (normal) |
@@ -2060,7 +2060,7 @@ dominates
 | raise.rb:71:9:71:9 | x | raise.rb:72:13:72:17 | x < 0 |
 | raise.rb:71:9:71:9 | x | raise.rb:76:3:76:15 | self |
 | raise.rb:72:13:72:17 | x < 0 | raise.rb:72:13:72:17 | x < 0 |
-| raise.rb:76:3:76:15 | [ensure: raise] self | raise.rb:76:3:76:15 | [ensure: raise] self |
+| raise.rb:76:3:76:15 | [ensure: exception] self | raise.rb:76:3:76:15 | [ensure: exception] self |
 | raise.rb:76:3:76:15 | self | raise.rb:76:3:76:15 | self |
 | raise.rb:79:1:92:3 | enter m8 | raise.rb:79:1:92:3 | enter m8 |
 | raise.rb:79:1:92:3 | enter m8 | raise.rb:79:1:92:3 | exit m8 |
@@ -2069,7 +2069,7 @@ dominates
 | raise.rb:79:1:92:3 | enter m8 | raise.rb:84:5:85:20 | elsif ... |
 | raise.rb:79:1:92:3 | enter m8 | raise.rb:84:11:84:11 | x |
 | raise.rb:79:1:92:3 | enter m8 | raise.rb:85:15:85:19 | x < 0 |
-| raise.rb:79:1:92:3 | enter m8 | raise.rb:89:5:89:17 | [ensure: raise] self |
+| raise.rb:79:1:92:3 | enter m8 | raise.rb:89:5:89:17 | [ensure: exception] self |
 | raise.rb:79:1:92:3 | enter m8 | raise.rb:89:5:89:17 | self |
 | raise.rb:79:1:92:3 | exit m8 | raise.rb:79:1:92:3 | exit m8 |
 | raise.rb:79:1:92:3 | exit m8 (normal) | raise.rb:79:1:92:3 | exit m8 (normal) |
@@ -2082,7 +2082,7 @@ dominates
 | raise.rb:84:11:84:11 | x | raise.rb:85:15:85:19 | x < 0 |
 | raise.rb:84:11:84:11 | x | raise.rb:89:5:89:17 | self |
 | raise.rb:85:15:85:19 | x < 0 | raise.rb:85:15:85:19 | x < 0 |
-| raise.rb:89:5:89:17 | [ensure: raise] self | raise.rb:89:5:89:17 | [ensure: raise] self |
+| raise.rb:89:5:89:17 | [ensure: exception] self | raise.rb:89:5:89:17 | [ensure: exception] self |
 | raise.rb:89:5:89:17 | self | raise.rb:89:5:89:17 | self |
 | raise.rb:94:1:119:3 | enter m9 | raise.rb:94:1:119:3 | enter m9 |
 | raise.rb:94:1:119:3 | enter m9 | raise.rb:94:1:119:3 | exit m9 |
@@ -2093,29 +2093,29 @@ dominates
 | raise.rb:94:1:119:3 | enter m9 | raise.rb:99:5:100:20 | elsif ... |
 | raise.rb:94:1:119:3 | enter m9 | raise.rb:99:11:99:11 | x |
 | raise.rb:94:1:119:3 | enter m9 | raise.rb:100:15:100:19 | x < 0 |
-| raise.rb:94:1:119:3 | enter m9 | raise.rb:104:5:104:23 | [ensure: raise] self |
+| raise.rb:94:1:119:3 | enter m9 | raise.rb:104:5:104:23 | [ensure: exception] self |
 | raise.rb:94:1:119:3 | enter m9 | raise.rb:104:5:104:23 | self |
-| raise.rb:94:1:119:3 | enter m9 | raise.rb:106:7:108:9 | [ensure: raise] if ... |
+| raise.rb:94:1:119:3 | enter m9 | raise.rb:106:7:108:9 | [ensure: exception] if ... |
 | raise.rb:94:1:119:3 | enter m9 | raise.rb:106:7:108:9 | [ensure: return] if ... |
 | raise.rb:94:1:119:3 | enter m9 | raise.rb:106:7:108:9 | if ... |
-| raise.rb:94:1:119:3 | enter m9 | raise.rb:106:10:106:11 | [ensure: raise] b1 |
+| raise.rb:94:1:119:3 | enter m9 | raise.rb:106:10:106:11 | [ensure: exception] b1 |
 | raise.rb:94:1:119:3 | enter m9 | raise.rb:106:10:106:11 | [ensure: return] b1 |
 | raise.rb:94:1:119:3 | enter m9 | raise.rb:106:10:106:11 | b1 |
-| raise.rb:94:1:119:3 | enter m9 | raise.rb:107:9:107:26 | [ensure: raise] self |
+| raise.rb:94:1:119:3 | enter m9 | raise.rb:107:9:107:26 | [ensure: exception] self |
 | raise.rb:94:1:119:3 | enter m9 | raise.rb:107:9:107:26 | [ensure: return] self |
 | raise.rb:94:1:119:3 | enter m9 | raise.rb:107:9:107:26 | self |
-| raise.rb:94:1:119:3 | enter m9 | raise.rb:109:5:110:25 | [ensure(1): raise] ensure ... |
-| raise.rb:94:1:119:3 | enter m9 | raise.rb:109:5:110:25 | [ensure: raise, ensure(1): raise] ensure ... |
-| raise.rb:94:1:119:3 | enter m9 | raise.rb:109:5:110:25 | [ensure: raise] ensure ... |
-| raise.rb:94:1:119:3 | enter m9 | raise.rb:109:5:110:25 | [ensure: return, ensure(1): raise] ensure ... |
+| raise.rb:94:1:119:3 | enter m9 | raise.rb:109:5:110:25 | [ensure(1): exception] ensure ... |
+| raise.rb:94:1:119:3 | enter m9 | raise.rb:109:5:110:25 | [ensure: exception, ensure(1): exception] ensure ... |
+| raise.rb:94:1:119:3 | enter m9 | raise.rb:109:5:110:25 | [ensure: exception] ensure ... |
+| raise.rb:94:1:119:3 | enter m9 | raise.rb:109:5:110:25 | [ensure: return, ensure(1): exception] ensure ... |
 | raise.rb:94:1:119:3 | enter m9 | raise.rb:109:5:110:25 | [ensure: return] ensure ... |
 | raise.rb:94:1:119:3 | enter m9 | raise.rb:109:5:110:25 | ensure ... |
-| raise.rb:94:1:119:3 | enter m9 | raise.rb:115:3:115:22 | [ensure: raise] self |
+| raise.rb:94:1:119:3 | enter m9 | raise.rb:115:3:115:22 | [ensure: exception] self |
 | raise.rb:94:1:119:3 | enter m9 | raise.rb:115:3:115:22 | self |
-| raise.rb:94:1:119:3 | enter m9 | raise.rb:116:3:118:5 | [ensure: raise] if ... |
+| raise.rb:94:1:119:3 | enter m9 | raise.rb:116:3:118:5 | [ensure: exception] if ... |
 | raise.rb:94:1:119:3 | enter m9 | raise.rb:116:3:118:5 | [ensure: return] if ... |
 | raise.rb:94:1:119:3 | enter m9 | raise.rb:116:3:118:5 | if ... |
-| raise.rb:94:1:119:3 | enter m9 | raise.rb:117:5:117:22 | [ensure: raise] self |
+| raise.rb:94:1:119:3 | enter m9 | raise.rb:117:5:117:22 | [ensure: exception] self |
 | raise.rb:94:1:119:3 | enter m9 | raise.rb:117:5:117:22 | [ensure: return] self |
 | raise.rb:94:1:119:3 | enter m9 | raise.rb:117:5:117:22 | self |
 | raise.rb:94:1:119:3 | exit m9 | raise.rb:94:1:119:3 | exit m9 |
@@ -2127,21 +2127,21 @@ dominates
 | raise.rb:97:8:97:8 | x | raise.rb:99:5:100:20 | elsif ... |
 | raise.rb:97:8:97:8 | x | raise.rb:99:11:99:11 | x |
 | raise.rb:97:8:97:8 | x | raise.rb:100:15:100:19 | x < 0 |
-| raise.rb:97:8:97:8 | x | raise.rb:104:5:104:23 | [ensure: raise] self |
+| raise.rb:97:8:97:8 | x | raise.rb:104:5:104:23 | [ensure: exception] self |
 | raise.rb:97:8:97:8 | x | raise.rb:104:5:104:23 | self |
-| raise.rb:97:8:97:8 | x | raise.rb:106:7:108:9 | [ensure: raise] if ... |
+| raise.rb:97:8:97:8 | x | raise.rb:106:7:108:9 | [ensure: exception] if ... |
 | raise.rb:97:8:97:8 | x | raise.rb:106:7:108:9 | [ensure: return] if ... |
 | raise.rb:97:8:97:8 | x | raise.rb:106:7:108:9 | if ... |
-| raise.rb:97:8:97:8 | x | raise.rb:106:10:106:11 | [ensure: raise] b1 |
+| raise.rb:97:8:97:8 | x | raise.rb:106:10:106:11 | [ensure: exception] b1 |
 | raise.rb:97:8:97:8 | x | raise.rb:106:10:106:11 | [ensure: return] b1 |
 | raise.rb:97:8:97:8 | x | raise.rb:106:10:106:11 | b1 |
-| raise.rb:97:8:97:8 | x | raise.rb:107:9:107:26 | [ensure: raise] self |
+| raise.rb:97:8:97:8 | x | raise.rb:107:9:107:26 | [ensure: exception] self |
 | raise.rb:97:8:97:8 | x | raise.rb:107:9:107:26 | [ensure: return] self |
 | raise.rb:97:8:97:8 | x | raise.rb:107:9:107:26 | self |
-| raise.rb:97:8:97:8 | x | raise.rb:109:5:110:25 | [ensure(1): raise] ensure ... |
-| raise.rb:97:8:97:8 | x | raise.rb:109:5:110:25 | [ensure: raise, ensure(1): raise] ensure ... |
-| raise.rb:97:8:97:8 | x | raise.rb:109:5:110:25 | [ensure: raise] ensure ... |
-| raise.rb:97:8:97:8 | x | raise.rb:109:5:110:25 | [ensure: return, ensure(1): raise] ensure ... |
+| raise.rb:97:8:97:8 | x | raise.rb:109:5:110:25 | [ensure(1): exception] ensure ... |
+| raise.rb:97:8:97:8 | x | raise.rb:109:5:110:25 | [ensure: exception, ensure(1): exception] ensure ... |
+| raise.rb:97:8:97:8 | x | raise.rb:109:5:110:25 | [ensure: exception] ensure ... |
+| raise.rb:97:8:97:8 | x | raise.rb:109:5:110:25 | [ensure: return, ensure(1): exception] ensure ... |
 | raise.rb:97:8:97:8 | x | raise.rb:109:5:110:25 | [ensure: return] ensure ... |
 | raise.rb:97:8:97:8 | x | raise.rb:109:5:110:25 | ensure ... |
 | raise.rb:97:8:97:8 | x | raise.rb:115:3:115:22 | self |
@@ -2155,7 +2155,7 @@ dominates
 | raise.rb:99:5:100:20 | elsif ... | raise.rb:106:7:108:9 | if ... |
 | raise.rb:99:5:100:20 | elsif ... | raise.rb:106:10:106:11 | b1 |
 | raise.rb:99:5:100:20 | elsif ... | raise.rb:107:9:107:26 | self |
-| raise.rb:99:5:100:20 | elsif ... | raise.rb:109:5:110:25 | [ensure(1): raise] ensure ... |
+| raise.rb:99:5:100:20 | elsif ... | raise.rb:109:5:110:25 | [ensure(1): exception] ensure ... |
 | raise.rb:99:5:100:20 | elsif ... | raise.rb:109:5:110:25 | ensure ... |
 | raise.rb:99:5:100:20 | elsif ... | raise.rb:115:3:115:22 | self |
 | raise.rb:99:5:100:20 | elsif ... | raise.rb:116:3:118:5 | if ... |
@@ -2171,8 +2171,8 @@ dominates
 | raise.rb:99:11:99:11 | x | raise.rb:106:10:106:11 | b1 |
 | raise.rb:99:11:99:11 | x | raise.rb:107:9:107:26 | [ensure: return] self |
 | raise.rb:99:11:99:11 | x | raise.rb:107:9:107:26 | self |
-| raise.rb:99:11:99:11 | x | raise.rb:109:5:110:25 | [ensure(1): raise] ensure ... |
-| raise.rb:99:11:99:11 | x | raise.rb:109:5:110:25 | [ensure: return, ensure(1): raise] ensure ... |
+| raise.rb:99:11:99:11 | x | raise.rb:109:5:110:25 | [ensure(1): exception] ensure ... |
+| raise.rb:99:11:99:11 | x | raise.rb:109:5:110:25 | [ensure: return, ensure(1): exception] ensure ... |
 | raise.rb:99:11:99:11 | x | raise.rb:109:5:110:25 | [ensure: return] ensure ... |
 | raise.rb:99:11:99:11 | x | raise.rb:109:5:110:25 | ensure ... |
 | raise.rb:99:11:99:11 | x | raise.rb:115:3:115:22 | self |
@@ -2184,27 +2184,27 @@ dominates
 | raise.rb:100:15:100:19 | x < 0 | raise.rb:106:7:108:9 | [ensure: return] if ... |
 | raise.rb:100:15:100:19 | x < 0 | raise.rb:106:10:106:11 | [ensure: return] b1 |
 | raise.rb:100:15:100:19 | x < 0 | raise.rb:107:9:107:26 | [ensure: return] self |
-| raise.rb:100:15:100:19 | x < 0 | raise.rb:109:5:110:25 | [ensure: return, ensure(1): raise] ensure ... |
+| raise.rb:100:15:100:19 | x < 0 | raise.rb:109:5:110:25 | [ensure: return, ensure(1): exception] ensure ... |
 | raise.rb:100:15:100:19 | x < 0 | raise.rb:109:5:110:25 | [ensure: return] ensure ... |
 | raise.rb:100:15:100:19 | x < 0 | raise.rb:116:3:118:5 | [ensure: return] if ... |
 | raise.rb:100:15:100:19 | x < 0 | raise.rb:117:5:117:22 | [ensure: return] self |
-| raise.rb:104:5:104:23 | [ensure: raise] self | raise.rb:104:5:104:23 | [ensure: raise] self |
-| raise.rb:104:5:104:23 | [ensure: raise] self | raise.rb:106:7:108:9 | [ensure: raise] if ... |
-| raise.rb:104:5:104:23 | [ensure: raise] self | raise.rb:106:10:106:11 | [ensure: raise] b1 |
-| raise.rb:104:5:104:23 | [ensure: raise] self | raise.rb:107:9:107:26 | [ensure: raise] self |
-| raise.rb:104:5:104:23 | [ensure: raise] self | raise.rb:109:5:110:25 | [ensure: raise, ensure(1): raise] ensure ... |
-| raise.rb:104:5:104:23 | [ensure: raise] self | raise.rb:109:5:110:25 | [ensure: raise] ensure ... |
+| raise.rb:104:5:104:23 | [ensure: exception] self | raise.rb:104:5:104:23 | [ensure: exception] self |
+| raise.rb:104:5:104:23 | [ensure: exception] self | raise.rb:106:7:108:9 | [ensure: exception] if ... |
+| raise.rb:104:5:104:23 | [ensure: exception] self | raise.rb:106:10:106:11 | [ensure: exception] b1 |
+| raise.rb:104:5:104:23 | [ensure: exception] self | raise.rb:107:9:107:26 | [ensure: exception] self |
+| raise.rb:104:5:104:23 | [ensure: exception] self | raise.rb:109:5:110:25 | [ensure: exception, ensure(1): exception] ensure ... |
+| raise.rb:104:5:104:23 | [ensure: exception] self | raise.rb:109:5:110:25 | [ensure: exception] ensure ... |
 | raise.rb:104:5:104:23 | self | raise.rb:104:5:104:23 | self |
 | raise.rb:104:5:104:23 | self | raise.rb:106:7:108:9 | if ... |
 | raise.rb:104:5:104:23 | self | raise.rb:106:10:106:11 | b1 |
 | raise.rb:104:5:104:23 | self | raise.rb:107:9:107:26 | self |
-| raise.rb:104:5:104:23 | self | raise.rb:109:5:110:25 | [ensure(1): raise] ensure ... |
+| raise.rb:104:5:104:23 | self | raise.rb:109:5:110:25 | [ensure(1): exception] ensure ... |
 | raise.rb:104:5:104:23 | self | raise.rb:109:5:110:25 | ensure ... |
 | raise.rb:104:5:104:23 | self | raise.rb:115:3:115:22 | self |
 | raise.rb:104:5:104:23 | self | raise.rb:116:3:118:5 | if ... |
 | raise.rb:104:5:104:23 | self | raise.rb:117:5:117:22 | self |
-| raise.rb:106:7:108:9 | [ensure: raise] if ... | raise.rb:106:7:108:9 | [ensure: raise] if ... |
-| raise.rb:106:7:108:9 | [ensure: raise] if ... | raise.rb:109:5:110:25 | [ensure: raise] ensure ... |
+| raise.rb:106:7:108:9 | [ensure: exception] if ... | raise.rb:106:7:108:9 | [ensure: exception] if ... |
+| raise.rb:106:7:108:9 | [ensure: exception] if ... | raise.rb:109:5:110:25 | [ensure: exception] ensure ... |
 | raise.rb:106:7:108:9 | [ensure: return] if ... | raise.rb:106:7:108:9 | [ensure: return] if ... |
 | raise.rb:106:7:108:9 | [ensure: return] if ... | raise.rb:109:5:110:25 | [ensure: return] ensure ... |
 | raise.rb:106:7:108:9 | [ensure: return] if ... | raise.rb:116:3:118:5 | [ensure: return] if ... |
@@ -2214,36 +2214,36 @@ dominates
 | raise.rb:106:7:108:9 | if ... | raise.rb:115:3:115:22 | self |
 | raise.rb:106:7:108:9 | if ... | raise.rb:116:3:118:5 | if ... |
 | raise.rb:106:7:108:9 | if ... | raise.rb:117:5:117:22 | self |
-| raise.rb:106:10:106:11 | [ensure: raise] b1 | raise.rb:106:7:108:9 | [ensure: raise] if ... |
-| raise.rb:106:10:106:11 | [ensure: raise] b1 | raise.rb:106:10:106:11 | [ensure: raise] b1 |
-| raise.rb:106:10:106:11 | [ensure: raise] b1 | raise.rb:107:9:107:26 | [ensure: raise] self |
-| raise.rb:106:10:106:11 | [ensure: raise] b1 | raise.rb:109:5:110:25 | [ensure: raise, ensure(1): raise] ensure ... |
-| raise.rb:106:10:106:11 | [ensure: raise] b1 | raise.rb:109:5:110:25 | [ensure: raise] ensure ... |
+| raise.rb:106:10:106:11 | [ensure: exception] b1 | raise.rb:106:7:108:9 | [ensure: exception] if ... |
+| raise.rb:106:10:106:11 | [ensure: exception] b1 | raise.rb:106:10:106:11 | [ensure: exception] b1 |
+| raise.rb:106:10:106:11 | [ensure: exception] b1 | raise.rb:107:9:107:26 | [ensure: exception] self |
+| raise.rb:106:10:106:11 | [ensure: exception] b1 | raise.rb:109:5:110:25 | [ensure: exception, ensure(1): exception] ensure ... |
+| raise.rb:106:10:106:11 | [ensure: exception] b1 | raise.rb:109:5:110:25 | [ensure: exception] ensure ... |
 | raise.rb:106:10:106:11 | [ensure: return] b1 | raise.rb:106:7:108:9 | [ensure: return] if ... |
 | raise.rb:106:10:106:11 | [ensure: return] b1 | raise.rb:106:10:106:11 | [ensure: return] b1 |
 | raise.rb:106:10:106:11 | [ensure: return] b1 | raise.rb:107:9:107:26 | [ensure: return] self |
-| raise.rb:106:10:106:11 | [ensure: return] b1 | raise.rb:109:5:110:25 | [ensure: return, ensure(1): raise] ensure ... |
+| raise.rb:106:10:106:11 | [ensure: return] b1 | raise.rb:109:5:110:25 | [ensure: return, ensure(1): exception] ensure ... |
 | raise.rb:106:10:106:11 | [ensure: return] b1 | raise.rb:109:5:110:25 | [ensure: return] ensure ... |
 | raise.rb:106:10:106:11 | [ensure: return] b1 | raise.rb:116:3:118:5 | [ensure: return] if ... |
 | raise.rb:106:10:106:11 | [ensure: return] b1 | raise.rb:117:5:117:22 | [ensure: return] self |
 | raise.rb:106:10:106:11 | b1 | raise.rb:106:7:108:9 | if ... |
 | raise.rb:106:10:106:11 | b1 | raise.rb:106:10:106:11 | b1 |
 | raise.rb:106:10:106:11 | b1 | raise.rb:107:9:107:26 | self |
-| raise.rb:106:10:106:11 | b1 | raise.rb:109:5:110:25 | [ensure(1): raise] ensure ... |
+| raise.rb:106:10:106:11 | b1 | raise.rb:109:5:110:25 | [ensure(1): exception] ensure ... |
 | raise.rb:106:10:106:11 | b1 | raise.rb:109:5:110:25 | ensure ... |
 | raise.rb:106:10:106:11 | b1 | raise.rb:115:3:115:22 | self |
 | raise.rb:106:10:106:11 | b1 | raise.rb:116:3:118:5 | if ... |
 | raise.rb:106:10:106:11 | b1 | raise.rb:117:5:117:22 | self |
-| raise.rb:107:9:107:26 | [ensure: raise] self | raise.rb:107:9:107:26 | [ensure: raise] self |
-| raise.rb:107:9:107:26 | [ensure: raise] self | raise.rb:109:5:110:25 | [ensure: raise, ensure(1): raise] ensure ... |
+| raise.rb:107:9:107:26 | [ensure: exception] self | raise.rb:107:9:107:26 | [ensure: exception] self |
+| raise.rb:107:9:107:26 | [ensure: exception] self | raise.rb:109:5:110:25 | [ensure: exception, ensure(1): exception] ensure ... |
 | raise.rb:107:9:107:26 | [ensure: return] self | raise.rb:107:9:107:26 | [ensure: return] self |
-| raise.rb:107:9:107:26 | [ensure: return] self | raise.rb:109:5:110:25 | [ensure: return, ensure(1): raise] ensure ... |
+| raise.rb:107:9:107:26 | [ensure: return] self | raise.rb:109:5:110:25 | [ensure: return, ensure(1): exception] ensure ... |
 | raise.rb:107:9:107:26 | self | raise.rb:107:9:107:26 | self |
-| raise.rb:107:9:107:26 | self | raise.rb:109:5:110:25 | [ensure(1): raise] ensure ... |
-| raise.rb:109:5:110:25 | [ensure(1): raise] ensure ... | raise.rb:109:5:110:25 | [ensure(1): raise] ensure ... |
-| raise.rb:109:5:110:25 | [ensure: raise, ensure(1): raise] ensure ... | raise.rb:109:5:110:25 | [ensure: raise, ensure(1): raise] ensure ... |
-| raise.rb:109:5:110:25 | [ensure: raise] ensure ... | raise.rb:109:5:110:25 | [ensure: raise] ensure ... |
-| raise.rb:109:5:110:25 | [ensure: return, ensure(1): raise] ensure ... | raise.rb:109:5:110:25 | [ensure: return, ensure(1): raise] ensure ... |
+| raise.rb:107:9:107:26 | self | raise.rb:109:5:110:25 | [ensure(1): exception] ensure ... |
+| raise.rb:109:5:110:25 | [ensure(1): exception] ensure ... | raise.rb:109:5:110:25 | [ensure(1): exception] ensure ... |
+| raise.rb:109:5:110:25 | [ensure: exception, ensure(1): exception] ensure ... | raise.rb:109:5:110:25 | [ensure: exception, ensure(1): exception] ensure ... |
+| raise.rb:109:5:110:25 | [ensure: exception] ensure ... | raise.rb:109:5:110:25 | [ensure: exception] ensure ... |
+| raise.rb:109:5:110:25 | [ensure: return, ensure(1): exception] ensure ... | raise.rb:109:5:110:25 | [ensure: return, ensure(1): exception] ensure ... |
 | raise.rb:109:5:110:25 | [ensure: return] ensure ... | raise.rb:109:5:110:25 | [ensure: return] ensure ... |
 | raise.rb:109:5:110:25 | [ensure: return] ensure ... | raise.rb:116:3:118:5 | [ensure: return] if ... |
 | raise.rb:109:5:110:25 | [ensure: return] ensure ... | raise.rb:117:5:117:22 | [ensure: return] self |
@@ -2251,16 +2251,16 @@ dominates
 | raise.rb:109:5:110:25 | ensure ... | raise.rb:115:3:115:22 | self |
 | raise.rb:109:5:110:25 | ensure ... | raise.rb:116:3:118:5 | if ... |
 | raise.rb:109:5:110:25 | ensure ... | raise.rb:117:5:117:22 | self |
-| raise.rb:115:3:115:22 | [ensure: raise] self | raise.rb:115:3:115:22 | [ensure: raise] self |
-| raise.rb:115:3:115:22 | [ensure: raise] self | raise.rb:116:3:118:5 | [ensure: raise] if ... |
-| raise.rb:115:3:115:22 | [ensure: raise] self | raise.rb:117:5:117:22 | [ensure: raise] self |
+| raise.rb:115:3:115:22 | [ensure: exception] self | raise.rb:115:3:115:22 | [ensure: exception] self |
+| raise.rb:115:3:115:22 | [ensure: exception] self | raise.rb:116:3:118:5 | [ensure: exception] if ... |
+| raise.rb:115:3:115:22 | [ensure: exception] self | raise.rb:117:5:117:22 | [ensure: exception] self |
 | raise.rb:115:3:115:22 | self | raise.rb:115:3:115:22 | self |
 | raise.rb:115:3:115:22 | self | raise.rb:116:3:118:5 | if ... |
 | raise.rb:115:3:115:22 | self | raise.rb:117:5:117:22 | self |
-| raise.rb:116:3:118:5 | [ensure: raise] if ... | raise.rb:116:3:118:5 | [ensure: raise] if ... |
+| raise.rb:116:3:118:5 | [ensure: exception] if ... | raise.rb:116:3:118:5 | [ensure: exception] if ... |
 | raise.rb:116:3:118:5 | [ensure: return] if ... | raise.rb:116:3:118:5 | [ensure: return] if ... |
 | raise.rb:116:3:118:5 | if ... | raise.rb:116:3:118:5 | if ... |
-| raise.rb:117:5:117:22 | [ensure: raise] self | raise.rb:117:5:117:22 | [ensure: raise] self |
+| raise.rb:117:5:117:22 | [ensure: exception] self | raise.rb:117:5:117:22 | [ensure: exception] self |
 | raise.rb:117:5:117:22 | [ensure: return] self | raise.rb:117:5:117:22 | [ensure: return] self |
 | raise.rb:117:5:117:22 | self | raise.rb:117:5:117:22 | self |
 | raise.rb:121:1:126:3 | enter m10 | raise.rb:121:1:126:3 | enter m10 |
@@ -2277,7 +2277,7 @@ dominates
 | raise.rb:128:1:140:3 | enter m11 | raise.rb:133:3:133:19 | rescue ... |
 | raise.rb:128:1:140:3 | enter m11 | raise.rb:134:10:134:19 | ExceptionB |
 | raise.rb:128:1:140:3 | enter m11 | raise.rb:135:5:135:21 | self |
-| raise.rb:128:1:140:3 | enter m11 | raise.rb:137:5:137:17 | [ensure: raise] self |
+| raise.rb:128:1:140:3 | enter m11 | raise.rb:137:5:137:17 | [ensure: exception] self |
 | raise.rb:128:1:140:3 | enter m11 | raise.rb:137:5:137:17 | self |
 | raise.rb:128:1:140:3 | exit m11 | raise.rb:128:1:140:3 | exit m11 |
 | raise.rb:130:5:132:7 | if ... | raise.rb:130:5:132:7 | if ... |
@@ -2285,13 +2285,13 @@ dominates
 | raise.rb:131:7:131:22 | self | raise.rb:133:3:133:19 | rescue ... |
 | raise.rb:131:7:131:22 | self | raise.rb:134:10:134:19 | ExceptionB |
 | raise.rb:131:7:131:22 | self | raise.rb:135:5:135:21 | self |
-| raise.rb:131:7:131:22 | self | raise.rb:137:5:137:17 | [ensure: raise] self |
+| raise.rb:131:7:131:22 | self | raise.rb:137:5:137:17 | [ensure: exception] self |
 | raise.rb:133:3:133:19 | rescue ... | raise.rb:133:3:133:19 | rescue ... |
 | raise.rb:134:10:134:19 | ExceptionB | raise.rb:134:10:134:19 | ExceptionB |
 | raise.rb:134:10:134:19 | ExceptionB | raise.rb:135:5:135:21 | self |
-| raise.rb:134:10:134:19 | ExceptionB | raise.rb:137:5:137:17 | [ensure: raise] self |
+| raise.rb:134:10:134:19 | ExceptionB | raise.rb:137:5:137:17 | [ensure: exception] self |
 | raise.rb:135:5:135:21 | self | raise.rb:135:5:135:21 | self |
-| raise.rb:137:5:137:17 | [ensure: raise] self | raise.rb:137:5:137:17 | [ensure: raise] self |
+| raise.rb:137:5:137:17 | [ensure: exception] self | raise.rb:137:5:137:17 | [ensure: exception] self |
 | raise.rb:137:5:137:17 | self | raise.rb:137:5:137:17 | self |
 | raise.rb:142:1:148:3 | enter m12 | raise.rb:142:1:148:3 | enter m12 |
 | raise.rb:142:1:148:3 | enter m12 | raise.rb:142:1:148:3 | exit m12 (normal) |
@@ -2362,7 +2362,7 @@ postDominance
 | break_ensure.rb:3:5:5:7 | if ... | break_ensure.rb:3:5:5:7 | if ... |
 | break_ensure.rb:3:8:3:8 | x | break_ensure.rb:3:8:3:8 | x |
 | break_ensure.rb:4:7:4:11 | break | break_ensure.rb:4:7:4:11 | break |
-| break_ensure.rb:8:3:10:5 | [ensure: raise] if ... | break_ensure.rb:8:3:10:5 | [ensure: raise] if ... |
+| break_ensure.rb:8:3:10:5 | [ensure: exception] if ... | break_ensure.rb:8:3:10:5 | [ensure: exception] if ... |
 | break_ensure.rb:8:3:10:5 | if ... | break_ensure.rb:1:1:11:3 | enter m1 |
 | break_ensure.rb:8:3:10:5 | if ... | break_ensure.rb:2:3:6:5 | while ... |
 | break_ensure.rb:8:3:10:5 | if ... | break_ensure.rb:2:9:2:9 | x |
@@ -2371,8 +2371,8 @@ postDominance
 | break_ensure.rb:8:3:10:5 | if ... | break_ensure.rb:4:7:4:11 | break |
 | break_ensure.rb:8:3:10:5 | if ... | break_ensure.rb:8:3:10:5 | if ... |
 | break_ensure.rb:8:3:10:5 | if ... | break_ensure.rb:9:5:9:23 | self |
-| break_ensure.rb:8:6:8:13 | [ensure: raise] self | break_ensure.rb:8:6:8:13 | [ensure: raise] self |
-| break_ensure.rb:9:5:9:23 | [ensure: raise] self | break_ensure.rb:9:5:9:23 | [ensure: raise] self |
+| break_ensure.rb:8:6:8:13 | [ensure: exception] self | break_ensure.rb:8:6:8:13 | [ensure: exception] self |
+| break_ensure.rb:9:5:9:23 | [ensure: exception] self | break_ensure.rb:9:5:9:23 | [ensure: exception] self |
 | break_ensure.rb:9:5:9:23 | self | break_ensure.rb:9:5:9:23 | self |
 | break_ensure.rb:13:1:25:3 | enter m2 | break_ensure.rb:13:1:25:3 | enter m2 |
 | break_ensure.rb:14:3:24:5 | while ... | break_ensure.rb:13:1:25:3 | enter m2 |
@@ -2382,11 +2382,11 @@ postDominance
 | break_ensure.rb:14:3:24:5 | while ... | break_ensure.rb:16:10:16:10 | x |
 | break_ensure.rb:14:3:24:5 | while ... | break_ensure.rb:17:9:17:13 | break |
 | break_ensure.rb:14:3:24:5 | while ... | break_ensure.rb:20:7:22:9 | [ensure: break] if ... |
-| break_ensure.rb:14:3:24:5 | while ... | break_ensure.rb:20:7:22:9 | [ensure: raise] if ... |
+| break_ensure.rb:14:3:24:5 | while ... | break_ensure.rb:20:7:22:9 | [ensure: exception] if ... |
 | break_ensure.rb:14:3:24:5 | while ... | break_ensure.rb:20:7:22:9 | if ... |
-| break_ensure.rb:14:3:24:5 | while ... | break_ensure.rb:20:10:20:10 | [ensure: raise] y |
+| break_ensure.rb:14:3:24:5 | while ... | break_ensure.rb:20:10:20:10 | [ensure: exception] y |
 | break_ensure.rb:14:3:24:5 | while ... | break_ensure.rb:21:9:21:20 | [ensure: break] self |
-| break_ensure.rb:14:3:24:5 | while ... | break_ensure.rb:21:9:21:20 | [ensure: raise] self |
+| break_ensure.rb:14:3:24:5 | while ... | break_ensure.rb:21:9:21:20 | [ensure: exception] self |
 | break_ensure.rb:14:3:24:5 | while ... | break_ensure.rb:21:9:21:20 | self |
 | break_ensure.rb:14:9:14:9 | x | break_ensure.rb:13:1:25:3 | enter m2 |
 | break_ensure.rb:14:9:14:9 | x | break_ensure.rb:14:9:14:9 | x |
@@ -2399,15 +2399,15 @@ postDominance
 | break_ensure.rb:20:7:22:9 | [ensure: break] if ... | break_ensure.rb:17:9:17:13 | break |
 | break_ensure.rb:20:7:22:9 | [ensure: break] if ... | break_ensure.rb:20:7:22:9 | [ensure: break] if ... |
 | break_ensure.rb:20:7:22:9 | [ensure: break] if ... | break_ensure.rb:21:9:21:20 | [ensure: break] self |
-| break_ensure.rb:20:7:22:9 | [ensure: raise] if ... | break_ensure.rb:20:7:22:9 | [ensure: raise] if ... |
-| break_ensure.rb:20:7:22:9 | [ensure: raise] if ... | break_ensure.rb:20:10:20:10 | [ensure: raise] y |
-| break_ensure.rb:20:7:22:9 | [ensure: raise] if ... | break_ensure.rb:21:9:21:20 | [ensure: raise] self |
+| break_ensure.rb:20:7:22:9 | [ensure: exception] if ... | break_ensure.rb:20:7:22:9 | [ensure: exception] if ... |
+| break_ensure.rb:20:7:22:9 | [ensure: exception] if ... | break_ensure.rb:20:10:20:10 | [ensure: exception] y |
+| break_ensure.rb:20:7:22:9 | [ensure: exception] if ... | break_ensure.rb:21:9:21:20 | [ensure: exception] self |
 | break_ensure.rb:20:7:22:9 | if ... | break_ensure.rb:16:7:18:9 | if ... |
 | break_ensure.rb:20:7:22:9 | if ... | break_ensure.rb:20:7:22:9 | if ... |
 | break_ensure.rb:20:7:22:9 | if ... | break_ensure.rb:21:9:21:20 | self |
-| break_ensure.rb:20:10:20:10 | [ensure: raise] y | break_ensure.rb:20:10:20:10 | [ensure: raise] y |
+| break_ensure.rb:20:10:20:10 | [ensure: exception] y | break_ensure.rb:20:10:20:10 | [ensure: exception] y |
 | break_ensure.rb:21:9:21:20 | [ensure: break] self | break_ensure.rb:21:9:21:20 | [ensure: break] self |
-| break_ensure.rb:21:9:21:20 | [ensure: raise] self | break_ensure.rb:21:9:21:20 | [ensure: raise] self |
+| break_ensure.rb:21:9:21:20 | [ensure: exception] self | break_ensure.rb:21:9:21:20 | [ensure: exception] self |
 | break_ensure.rb:21:9:21:20 | self | break_ensure.rb:21:9:21:20 | self |
 | break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:27:1:42:3 | enter m3 |
 | break_ensure.rb:27:1:42:3 | exit m3 | break_ensure.rb:27:1:42:3 | exit m3 |
@@ -2427,7 +2427,7 @@ postDominance
 | break_ensure.rb:27:1:42:3 | exit m3 (normal) | break_ensure.rb:36:11:36:15 | break |
 | break_ensure.rb:29:5:31:7 | if ... | break_ensure.rb:29:5:31:7 | if ... |
 | break_ensure.rb:30:7:30:12 | return | break_ensure.rb:30:7:30:12 | return |
-| break_ensure.rb:33:5:39:7 | [ensure: raise] while ... | break_ensure.rb:33:5:39:7 | [ensure: raise] while ... |
+| break_ensure.rb:33:5:39:7 | [ensure: exception] while ... | break_ensure.rb:33:5:39:7 | [ensure: exception] while ... |
 | break_ensure.rb:33:5:39:7 | [ensure: return] while ... | break_ensure.rb:30:7:30:12 | return |
 | break_ensure.rb:33:5:39:7 | [ensure: return] while ... | break_ensure.rb:33:5:39:7 | [ensure: return] while ... |
 | break_ensure.rb:33:5:39:7 | [ensure: return] while ... | break_ensure.rb:33:11:33:11 | [ensure: return] y |
@@ -2440,20 +2440,20 @@ postDominance
 | break_ensure.rb:33:5:39:7 | while ... | break_ensure.rb:35:9:37:11 | if ... |
 | break_ensure.rb:33:5:39:7 | while ... | break_ensure.rb:35:12:35:12 | x |
 | break_ensure.rb:33:5:39:7 | while ... | break_ensure.rb:36:11:36:15 | break |
-| break_ensure.rb:33:11:33:11 | [ensure: raise] y | break_ensure.rb:33:11:33:11 | [ensure: raise] y |
+| break_ensure.rb:33:11:33:11 | [ensure: exception] y | break_ensure.rb:33:11:33:11 | [ensure: exception] y |
 | break_ensure.rb:33:11:33:11 | [ensure: return] y | break_ensure.rb:30:7:30:12 | return |
 | break_ensure.rb:33:11:33:11 | [ensure: return] y | break_ensure.rb:33:11:33:11 | [ensure: return] y |
 | break_ensure.rb:33:11:33:11 | [ensure: return] y | break_ensure.rb:35:9:37:11 | [ensure: return] if ... |
 | break_ensure.rb:33:11:33:11 | y | break_ensure.rb:29:5:31:7 | if ... |
 | break_ensure.rb:33:11:33:11 | y | break_ensure.rb:33:11:33:11 | y |
 | break_ensure.rb:33:11:33:11 | y | break_ensure.rb:35:9:37:11 | if ... |
-| break_ensure.rb:35:9:37:11 | [ensure: raise] if ... | break_ensure.rb:35:9:37:11 | [ensure: raise] if ... |
+| break_ensure.rb:35:9:37:11 | [ensure: exception] if ... | break_ensure.rb:35:9:37:11 | [ensure: exception] if ... |
 | break_ensure.rb:35:9:37:11 | [ensure: return] if ... | break_ensure.rb:35:9:37:11 | [ensure: return] if ... |
 | break_ensure.rb:35:9:37:11 | if ... | break_ensure.rb:35:9:37:11 | if ... |
-| break_ensure.rb:35:12:35:12 | [ensure: raise] x | break_ensure.rb:35:12:35:12 | [ensure: raise] x |
+| break_ensure.rb:35:12:35:12 | [ensure: exception] x | break_ensure.rb:35:12:35:12 | [ensure: exception] x |
 | break_ensure.rb:35:12:35:12 | [ensure: return] x | break_ensure.rb:35:12:35:12 | [ensure: return] x |
 | break_ensure.rb:35:12:35:12 | x | break_ensure.rb:35:12:35:12 | x |
-| break_ensure.rb:36:11:36:15 | [ensure: raise] break | break_ensure.rb:36:11:36:15 | [ensure: raise] break |
+| break_ensure.rb:36:11:36:15 | [ensure: exception] break | break_ensure.rb:36:11:36:15 | [ensure: exception] break |
 | break_ensure.rb:36:11:36:15 | [ensure: return] break | break_ensure.rb:36:11:36:15 | [ensure: return] break |
 | break_ensure.rb:36:11:36:15 | break | break_ensure.rb:36:11:36:15 | break |
 | break_ensure.rb:44:1:56:3 | enter m4 | break_ensure.rb:44:1:56:3 | enter m4 |
@@ -2463,23 +2463,23 @@ postDominance
 | break_ensure.rb:45:3:55:5 | while ... | break_ensure.rb:47:7:49:9 | if ... |
 | break_ensure.rb:45:3:55:5 | while ... | break_ensure.rb:47:10:47:10 | x |
 | break_ensure.rb:45:3:55:5 | while ... | break_ensure.rb:48:9:48:16 | self |
-| break_ensure.rb:45:3:55:5 | while ... | break_ensure.rb:51:7:53:9 | [ensure: raise] if ... |
+| break_ensure.rb:45:3:55:5 | while ... | break_ensure.rb:51:7:53:9 | [ensure: exception] if ... |
 | break_ensure.rb:45:3:55:5 | while ... | break_ensure.rb:51:7:53:9 | if ... |
-| break_ensure.rb:45:3:55:5 | while ... | break_ensure.rb:51:10:51:10 | [ensure: raise] x |
+| break_ensure.rb:45:3:55:5 | while ... | break_ensure.rb:51:10:51:10 | [ensure: exception] x |
 | break_ensure.rb:45:3:55:5 | while ... | break_ensure.rb:52:15:52:16 | 10 |
-| break_ensure.rb:45:3:55:5 | while ... | break_ensure.rb:52:15:52:16 | [ensure: raise] 10 |
+| break_ensure.rb:45:3:55:5 | while ... | break_ensure.rb:52:15:52:16 | [ensure: exception] 10 |
 | break_ensure.rb:45:9:45:9 | x | break_ensure.rb:44:1:56:3 | enter m4 |
 | break_ensure.rb:45:9:45:9 | x | break_ensure.rb:45:9:45:9 | x |
 | break_ensure.rb:45:9:45:9 | x | break_ensure.rb:51:7:53:9 | if ... |
 | break_ensure.rb:47:7:49:9 | if ... | break_ensure.rb:47:7:49:9 | if ... |
 | break_ensure.rb:47:10:47:10 | x | break_ensure.rb:47:10:47:10 | x |
 | break_ensure.rb:48:9:48:16 | self | break_ensure.rb:48:9:48:16 | self |
-| break_ensure.rb:51:7:53:9 | [ensure: raise] if ... | break_ensure.rb:51:7:53:9 | [ensure: raise] if ... |
+| break_ensure.rb:51:7:53:9 | [ensure: exception] if ... | break_ensure.rb:51:7:53:9 | [ensure: exception] if ... |
 | break_ensure.rb:51:7:53:9 | if ... | break_ensure.rb:51:7:53:9 | if ... |
-| break_ensure.rb:51:10:51:10 | [ensure: raise] x | break_ensure.rb:48:9:48:16 | self |
-| break_ensure.rb:51:10:51:10 | [ensure: raise] x | break_ensure.rb:51:10:51:10 | [ensure: raise] x |
+| break_ensure.rb:51:10:51:10 | [ensure: exception] x | break_ensure.rb:48:9:48:16 | self |
+| break_ensure.rb:51:10:51:10 | [ensure: exception] x | break_ensure.rb:51:10:51:10 | [ensure: exception] x |
 | break_ensure.rb:52:15:52:16 | 10 | break_ensure.rb:52:15:52:16 | 10 |
-| break_ensure.rb:52:15:52:16 | [ensure: raise] 10 | break_ensure.rb:52:15:52:16 | [ensure: raise] 10 |
+| break_ensure.rb:52:15:52:16 | [ensure: exception] 10 | break_ensure.rb:52:15:52:16 | [ensure: exception] 10 |
 | case.rb:1:1:6:3 | enter if_in_case | case.rb:1:1:6:3 | enter if_in_case |
 | case.rb:1:1:99:4 | enter case.rb | case.rb:1:1:99:4 | enter case.rb |
 | case.rb:2:3:5:5 | case ... | case.rb:1:1:6:3 | enter if_in_case |
@@ -3959,7 +3959,7 @@ postDominance
 | raise.rb:71:9:71:9 | x | raise.rb:68:1:77:3 | enter m7 |
 | raise.rb:71:9:71:9 | x | raise.rb:71:9:71:9 | x |
 | raise.rb:72:13:72:17 | x < 0 | raise.rb:72:13:72:17 | x < 0 |
-| raise.rb:76:3:76:15 | [ensure: raise] self | raise.rb:76:3:76:15 | [ensure: raise] self |
+| raise.rb:76:3:76:15 | [ensure: exception] self | raise.rb:76:3:76:15 | [ensure: exception] self |
 | raise.rb:76:3:76:15 | self | raise.rb:71:3:72:18 | elsif ... |
 | raise.rb:76:3:76:15 | self | raise.rb:76:3:76:15 | self |
 | raise.rb:79:1:92:3 | enter m8 | raise.rb:79:1:92:3 | enter m8 |
@@ -3975,7 +3975,7 @@ postDominance
 | raise.rb:84:11:84:11 | x | raise.rb:79:1:92:3 | enter m8 |
 | raise.rb:84:11:84:11 | x | raise.rb:84:11:84:11 | x |
 | raise.rb:85:15:85:19 | x < 0 | raise.rb:85:15:85:19 | x < 0 |
-| raise.rb:89:5:89:17 | [ensure: raise] self | raise.rb:89:5:89:17 | [ensure: raise] self |
+| raise.rb:89:5:89:17 | [ensure: exception] self | raise.rb:89:5:89:17 | [ensure: exception] self |
 | raise.rb:89:5:89:17 | self | raise.rb:84:5:85:20 | elsif ... |
 | raise.rb:89:5:89:17 | self | raise.rb:89:5:89:17 | self |
 | raise.rb:94:1:119:3 | enter m9 | raise.rb:94:1:119:3 | enter m9 |
@@ -4005,10 +4005,10 @@ postDominance
 | raise.rb:99:11:99:11 | x | raise.rb:97:8:97:8 | x |
 | raise.rb:99:11:99:11 | x | raise.rb:99:11:99:11 | x |
 | raise.rb:100:15:100:19 | x < 0 | raise.rb:100:15:100:19 | x < 0 |
-| raise.rb:104:5:104:23 | [ensure: raise] self | raise.rb:104:5:104:23 | [ensure: raise] self |
+| raise.rb:104:5:104:23 | [ensure: exception] self | raise.rb:104:5:104:23 | [ensure: exception] self |
 | raise.rb:104:5:104:23 | self | raise.rb:99:5:100:20 | elsif ... |
 | raise.rb:104:5:104:23 | self | raise.rb:104:5:104:23 | self |
-| raise.rb:106:7:108:9 | [ensure: raise] if ... | raise.rb:106:7:108:9 | [ensure: raise] if ... |
+| raise.rb:106:7:108:9 | [ensure: exception] if ... | raise.rb:106:7:108:9 | [ensure: exception] if ... |
 | raise.rb:106:7:108:9 | [ensure: return] if ... | raise.rb:100:15:100:19 | x < 0 |
 | raise.rb:106:7:108:9 | [ensure: return] if ... | raise.rb:106:7:108:9 | [ensure: return] if ... |
 | raise.rb:106:7:108:9 | [ensure: return] if ... | raise.rb:106:10:106:11 | [ensure: return] b1 |
@@ -4016,19 +4016,19 @@ postDominance
 | raise.rb:106:7:108:9 | if ... | raise.rb:104:5:104:23 | self |
 | raise.rb:106:7:108:9 | if ... | raise.rb:106:7:108:9 | if ... |
 | raise.rb:106:7:108:9 | if ... | raise.rb:106:10:106:11 | b1 |
-| raise.rb:106:10:106:11 | [ensure: raise] b1 | raise.rb:106:10:106:11 | [ensure: raise] b1 |
+| raise.rb:106:10:106:11 | [ensure: exception] b1 | raise.rb:106:10:106:11 | [ensure: exception] b1 |
 | raise.rb:106:10:106:11 | [ensure: return] b1 | raise.rb:100:15:100:19 | x < 0 |
 | raise.rb:106:10:106:11 | [ensure: return] b1 | raise.rb:106:10:106:11 | [ensure: return] b1 |
 | raise.rb:106:10:106:11 | b1 | raise.rb:99:5:100:20 | elsif ... |
 | raise.rb:106:10:106:11 | b1 | raise.rb:104:5:104:23 | self |
 | raise.rb:106:10:106:11 | b1 | raise.rb:106:10:106:11 | b1 |
-| raise.rb:107:9:107:26 | [ensure: raise] self | raise.rb:107:9:107:26 | [ensure: raise] self |
+| raise.rb:107:9:107:26 | [ensure: exception] self | raise.rb:107:9:107:26 | [ensure: exception] self |
 | raise.rb:107:9:107:26 | [ensure: return] self | raise.rb:107:9:107:26 | [ensure: return] self |
 | raise.rb:107:9:107:26 | self | raise.rb:107:9:107:26 | self |
-| raise.rb:109:5:110:25 | [ensure(1): raise] ensure ... | raise.rb:109:5:110:25 | [ensure(1): raise] ensure ... |
-| raise.rb:109:5:110:25 | [ensure: raise, ensure(1): raise] ensure ... | raise.rb:109:5:110:25 | [ensure: raise, ensure(1): raise] ensure ... |
-| raise.rb:109:5:110:25 | [ensure: raise] ensure ... | raise.rb:109:5:110:25 | [ensure: raise] ensure ... |
-| raise.rb:109:5:110:25 | [ensure: return, ensure(1): raise] ensure ... | raise.rb:109:5:110:25 | [ensure: return, ensure(1): raise] ensure ... |
+| raise.rb:109:5:110:25 | [ensure(1): exception] ensure ... | raise.rb:109:5:110:25 | [ensure(1): exception] ensure ... |
+| raise.rb:109:5:110:25 | [ensure: exception, ensure(1): exception] ensure ... | raise.rb:109:5:110:25 | [ensure: exception, ensure(1): exception] ensure ... |
+| raise.rb:109:5:110:25 | [ensure: exception] ensure ... | raise.rb:109:5:110:25 | [ensure: exception] ensure ... |
+| raise.rb:109:5:110:25 | [ensure: return, ensure(1): exception] ensure ... | raise.rb:109:5:110:25 | [ensure: return, ensure(1): exception] ensure ... |
 | raise.rb:109:5:110:25 | [ensure: return] ensure ... | raise.rb:100:15:100:19 | x < 0 |
 | raise.rb:109:5:110:25 | [ensure: return] ensure ... | raise.rb:106:7:108:9 | [ensure: return] if ... |
 | raise.rb:109:5:110:25 | [ensure: return] ensure ... | raise.rb:106:10:106:11 | [ensure: return] b1 |
@@ -4038,14 +4038,14 @@ postDominance
 | raise.rb:109:5:110:25 | ensure ... | raise.rb:106:7:108:9 | if ... |
 | raise.rb:109:5:110:25 | ensure ... | raise.rb:106:10:106:11 | b1 |
 | raise.rb:109:5:110:25 | ensure ... | raise.rb:109:5:110:25 | ensure ... |
-| raise.rb:115:3:115:22 | [ensure: raise] self | raise.rb:115:3:115:22 | [ensure: raise] self |
+| raise.rb:115:3:115:22 | [ensure: exception] self | raise.rb:115:3:115:22 | [ensure: exception] self |
 | raise.rb:115:3:115:22 | self | raise.rb:99:5:100:20 | elsif ... |
 | raise.rb:115:3:115:22 | self | raise.rb:104:5:104:23 | self |
 | raise.rb:115:3:115:22 | self | raise.rb:106:7:108:9 | if ... |
 | raise.rb:115:3:115:22 | self | raise.rb:106:10:106:11 | b1 |
 | raise.rb:115:3:115:22 | self | raise.rb:109:5:110:25 | ensure ... |
 | raise.rb:115:3:115:22 | self | raise.rb:115:3:115:22 | self |
-| raise.rb:116:3:118:5 | [ensure: raise] if ... | raise.rb:116:3:118:5 | [ensure: raise] if ... |
+| raise.rb:116:3:118:5 | [ensure: exception] if ... | raise.rb:116:3:118:5 | [ensure: exception] if ... |
 | raise.rb:116:3:118:5 | [ensure: return] if ... | raise.rb:100:15:100:19 | x < 0 |
 | raise.rb:116:3:118:5 | [ensure: return] if ... | raise.rb:106:7:108:9 | [ensure: return] if ... |
 | raise.rb:116:3:118:5 | [ensure: return] if ... | raise.rb:106:10:106:11 | [ensure: return] b1 |
@@ -4058,7 +4058,7 @@ postDominance
 | raise.rb:116:3:118:5 | if ... | raise.rb:109:5:110:25 | ensure ... |
 | raise.rb:116:3:118:5 | if ... | raise.rb:115:3:115:22 | self |
 | raise.rb:116:3:118:5 | if ... | raise.rb:116:3:118:5 | if ... |
-| raise.rb:117:5:117:22 | [ensure: raise] self | raise.rb:117:5:117:22 | [ensure: raise] self |
+| raise.rb:117:5:117:22 | [ensure: exception] self | raise.rb:117:5:117:22 | [ensure: exception] self |
 | raise.rb:117:5:117:22 | [ensure: return] self | raise.rb:117:5:117:22 | [ensure: return] self |
 | raise.rb:117:5:117:22 | self | raise.rb:117:5:117:22 | self |
 | raise.rb:121:1:126:3 | enter m10 | raise.rb:121:1:126:3 | enter m10 |
@@ -4074,7 +4074,7 @@ postDominance
 | raise.rb:134:10:134:19 | ExceptionB | raise.rb:134:10:134:19 | ExceptionB |
 | raise.rb:135:5:135:21 | self | raise.rb:134:10:134:19 | ExceptionB |
 | raise.rb:135:5:135:21 | self | raise.rb:135:5:135:21 | self |
-| raise.rb:137:5:137:17 | [ensure: raise] self | raise.rb:137:5:137:17 | [ensure: raise] self |
+| raise.rb:137:5:137:17 | [ensure: exception] self | raise.rb:137:5:137:17 | [ensure: exception] self |
 | raise.rb:137:5:137:17 | self | raise.rb:128:1:140:3 | enter m11 |
 | raise.rb:137:5:137:17 | self | raise.rb:130:5:132:7 | if ... |
 | raise.rb:137:5:137:17 | self | raise.rb:131:7:131:22 | self |
@@ -4131,10 +4131,10 @@ immediateDominator
 | break_ensure.rb:3:5:5:7 | if ... | break_ensure.rb:3:8:3:8 | x |
 | break_ensure.rb:3:8:3:8 | x | break_ensure.rb:2:9:2:9 | x |
 | break_ensure.rb:4:7:4:11 | break | break_ensure.rb:3:8:3:8 | x |
-| break_ensure.rb:8:3:10:5 | [ensure: raise] if ... | break_ensure.rb:8:6:8:13 | [ensure: raise] self |
+| break_ensure.rb:8:3:10:5 | [ensure: exception] if ... | break_ensure.rb:8:6:8:13 | [ensure: exception] self |
 | break_ensure.rb:8:3:10:5 | if ... | break_ensure.rb:2:3:6:5 | while ... |
-| break_ensure.rb:8:6:8:13 | [ensure: raise] self | break_ensure.rb:2:9:2:9 | x |
-| break_ensure.rb:9:5:9:23 | [ensure: raise] self | break_ensure.rb:8:6:8:13 | [ensure: raise] self |
+| break_ensure.rb:8:6:8:13 | [ensure: exception] self | break_ensure.rb:2:9:2:9 | x |
+| break_ensure.rb:9:5:9:23 | [ensure: exception] self | break_ensure.rb:8:6:8:13 | [ensure: exception] self |
 | break_ensure.rb:9:5:9:23 | self | break_ensure.rb:2:3:6:5 | while ... |
 | break_ensure.rb:14:3:24:5 | while ... | break_ensure.rb:14:9:14:9 | x |
 | break_ensure.rb:14:9:14:9 | x | break_ensure.rb:13:1:25:3 | enter m2 |
@@ -4142,29 +4142,29 @@ immediateDominator
 | break_ensure.rb:16:10:16:10 | x | break_ensure.rb:14:9:14:9 | x |
 | break_ensure.rb:17:9:17:13 | break | break_ensure.rb:16:10:16:10 | x |
 | break_ensure.rb:20:7:22:9 | [ensure: break] if ... | break_ensure.rb:17:9:17:13 | break |
-| break_ensure.rb:20:7:22:9 | [ensure: raise] if ... | break_ensure.rb:20:10:20:10 | [ensure: raise] y |
+| break_ensure.rb:20:7:22:9 | [ensure: exception] if ... | break_ensure.rb:20:10:20:10 | [ensure: exception] y |
 | break_ensure.rb:20:7:22:9 | if ... | break_ensure.rb:16:7:18:9 | if ... |
-| break_ensure.rb:20:10:20:10 | [ensure: raise] y | break_ensure.rb:16:10:16:10 | x |
+| break_ensure.rb:20:10:20:10 | [ensure: exception] y | break_ensure.rb:16:10:16:10 | x |
 | break_ensure.rb:21:9:21:20 | [ensure: break] self | break_ensure.rb:17:9:17:13 | break |
-| break_ensure.rb:21:9:21:20 | [ensure: raise] self | break_ensure.rb:20:10:20:10 | [ensure: raise] y |
+| break_ensure.rb:21:9:21:20 | [ensure: exception] self | break_ensure.rb:20:10:20:10 | [ensure: exception] y |
 | break_ensure.rb:21:9:21:20 | self | break_ensure.rb:16:7:18:9 | if ... |
 | break_ensure.rb:27:1:42:3 | exit m3 | break_ensure.rb:27:1:42:3 | enter m3 |
 | break_ensure.rb:27:1:42:3 | exit m3 (normal) | break_ensure.rb:27:1:42:3 | enter m3 |
 | break_ensure.rb:29:5:31:7 | if ... | break_ensure.rb:27:1:42:3 | enter m3 |
 | break_ensure.rb:30:7:30:12 | return | break_ensure.rb:27:1:42:3 | enter m3 |
-| break_ensure.rb:33:5:39:7 | [ensure: raise] while ... | break_ensure.rb:33:11:33:11 | [ensure: raise] y |
+| break_ensure.rb:33:5:39:7 | [ensure: exception] while ... | break_ensure.rb:33:11:33:11 | [ensure: exception] y |
 | break_ensure.rb:33:5:39:7 | [ensure: return] while ... | break_ensure.rb:33:11:33:11 | [ensure: return] y |
 | break_ensure.rb:33:5:39:7 | while ... | break_ensure.rb:33:11:33:11 | y |
-| break_ensure.rb:33:11:33:11 | [ensure: raise] y | break_ensure.rb:27:1:42:3 | enter m3 |
+| break_ensure.rb:33:11:33:11 | [ensure: exception] y | break_ensure.rb:27:1:42:3 | enter m3 |
 | break_ensure.rb:33:11:33:11 | [ensure: return] y | break_ensure.rb:30:7:30:12 | return |
 | break_ensure.rb:33:11:33:11 | y | break_ensure.rb:29:5:31:7 | if ... |
-| break_ensure.rb:35:9:37:11 | [ensure: raise] if ... | break_ensure.rb:35:12:35:12 | [ensure: raise] x |
+| break_ensure.rb:35:9:37:11 | [ensure: exception] if ... | break_ensure.rb:35:12:35:12 | [ensure: exception] x |
 | break_ensure.rb:35:9:37:11 | [ensure: return] if ... | break_ensure.rb:35:12:35:12 | [ensure: return] x |
 | break_ensure.rb:35:9:37:11 | if ... | break_ensure.rb:35:12:35:12 | x |
-| break_ensure.rb:35:12:35:12 | [ensure: raise] x | break_ensure.rb:33:11:33:11 | [ensure: raise] y |
+| break_ensure.rb:35:12:35:12 | [ensure: exception] x | break_ensure.rb:33:11:33:11 | [ensure: exception] y |
 | break_ensure.rb:35:12:35:12 | [ensure: return] x | break_ensure.rb:33:11:33:11 | [ensure: return] y |
 | break_ensure.rb:35:12:35:12 | x | break_ensure.rb:33:11:33:11 | y |
-| break_ensure.rb:36:11:36:15 | [ensure: raise] break | break_ensure.rb:35:12:35:12 | [ensure: raise] x |
+| break_ensure.rb:36:11:36:15 | [ensure: exception] break | break_ensure.rb:35:12:35:12 | [ensure: exception] x |
 | break_ensure.rb:36:11:36:15 | [ensure: return] break | break_ensure.rb:35:12:35:12 | [ensure: return] x |
 | break_ensure.rb:36:11:36:15 | break | break_ensure.rb:35:12:35:12 | x |
 | break_ensure.rb:45:3:55:5 | while ... | break_ensure.rb:45:9:45:9 | x |
@@ -4172,11 +4172,11 @@ immediateDominator
 | break_ensure.rb:47:7:49:9 | if ... | break_ensure.rb:47:10:47:10 | x |
 | break_ensure.rb:47:10:47:10 | x | break_ensure.rb:45:9:45:9 | x |
 | break_ensure.rb:48:9:48:16 | self | break_ensure.rb:47:10:47:10 | x |
-| break_ensure.rb:51:7:53:9 | [ensure: raise] if ... | break_ensure.rb:51:10:51:10 | [ensure: raise] x |
+| break_ensure.rb:51:7:53:9 | [ensure: exception] if ... | break_ensure.rb:51:10:51:10 | [ensure: exception] x |
 | break_ensure.rb:51:7:53:9 | if ... | break_ensure.rb:47:7:49:9 | if ... |
-| break_ensure.rb:51:10:51:10 | [ensure: raise] x | break_ensure.rb:47:10:47:10 | x |
+| break_ensure.rb:51:10:51:10 | [ensure: exception] x | break_ensure.rb:47:10:47:10 | x |
 | break_ensure.rb:52:15:52:16 | 10 | break_ensure.rb:47:7:49:9 | if ... |
-| break_ensure.rb:52:15:52:16 | [ensure: raise] 10 | break_ensure.rb:51:10:51:10 | [ensure: raise] x |
+| break_ensure.rb:52:15:52:16 | [ensure: exception] 10 | break_ensure.rb:51:10:51:10 | [ensure: exception] x |
 | case.rb:2:3:5:5 | case ... | case.rb:1:1:6:3 | enter if_in_case |
 | case.rb:3:5:3:42 | [match] when ... | case.rb:1:1:6:3 | enter if_in_case |
 | case.rb:3:5:3:42 | [no-match] when ... | case.rb:1:1:6:3 | enter if_in_case |
@@ -4470,7 +4470,7 @@ immediateDominator
 | raise.rb:71:3:72:18 | elsif ... | raise.rb:71:9:71:9 | x |
 | raise.rb:71:9:71:9 | x | raise.rb:68:1:77:3 | enter m7 |
 | raise.rb:72:13:72:17 | x < 0 | raise.rb:71:9:71:9 | x |
-| raise.rb:76:3:76:15 | [ensure: raise] self | raise.rb:68:1:77:3 | enter m7 |
+| raise.rb:76:3:76:15 | [ensure: exception] self | raise.rb:68:1:77:3 | enter m7 |
 | raise.rb:76:3:76:15 | self | raise.rb:71:3:72:18 | elsif ... |
 | raise.rb:79:1:92:3 | exit m8 | raise.rb:79:1:92:3 | enter m8 |
 | raise.rb:79:1:92:3 | exit m8 (normal) | raise.rb:84:11:84:11 | x |
@@ -4478,7 +4478,7 @@ immediateDominator
 | raise.rb:84:5:85:20 | elsif ... | raise.rb:84:11:84:11 | x |
 | raise.rb:84:11:84:11 | x | raise.rb:79:1:92:3 | enter m8 |
 | raise.rb:85:15:85:19 | x < 0 | raise.rb:84:11:84:11 | x |
-| raise.rb:89:5:89:17 | [ensure: raise] self | raise.rb:79:1:92:3 | enter m8 |
+| raise.rb:89:5:89:17 | [ensure: exception] self | raise.rb:79:1:92:3 | enter m8 |
 | raise.rb:89:5:89:17 | self | raise.rb:84:5:85:20 | elsif ... |
 | raise.rb:94:1:119:3 | exit m9 | raise.rb:94:1:119:3 | enter m9 |
 | raise.rb:94:1:119:3 | exit m9 (abnormal) | raise.rb:94:1:119:3 | enter m9 |
@@ -4488,29 +4488,29 @@ immediateDominator
 | raise.rb:99:5:100:20 | elsif ... | raise.rb:99:11:99:11 | x |
 | raise.rb:99:11:99:11 | x | raise.rb:97:8:97:8 | x |
 | raise.rb:100:15:100:19 | x < 0 | raise.rb:99:11:99:11 | x |
-| raise.rb:104:5:104:23 | [ensure: raise] self | raise.rb:97:8:97:8 | x |
+| raise.rb:104:5:104:23 | [ensure: exception] self | raise.rb:97:8:97:8 | x |
 | raise.rb:104:5:104:23 | self | raise.rb:99:5:100:20 | elsif ... |
-| raise.rb:106:7:108:9 | [ensure: raise] if ... | raise.rb:106:10:106:11 | [ensure: raise] b1 |
+| raise.rb:106:7:108:9 | [ensure: exception] if ... | raise.rb:106:10:106:11 | [ensure: exception] b1 |
 | raise.rb:106:7:108:9 | [ensure: return] if ... | raise.rb:106:10:106:11 | [ensure: return] b1 |
 | raise.rb:106:7:108:9 | if ... | raise.rb:106:10:106:11 | b1 |
-| raise.rb:106:10:106:11 | [ensure: raise] b1 | raise.rb:104:5:104:23 | [ensure: raise] self |
+| raise.rb:106:10:106:11 | [ensure: exception] b1 | raise.rb:104:5:104:23 | [ensure: exception] self |
 | raise.rb:106:10:106:11 | [ensure: return] b1 | raise.rb:100:15:100:19 | x < 0 |
 | raise.rb:106:10:106:11 | b1 | raise.rb:104:5:104:23 | self |
-| raise.rb:107:9:107:26 | [ensure: raise] self | raise.rb:106:10:106:11 | [ensure: raise] b1 |
+| raise.rb:107:9:107:26 | [ensure: exception] self | raise.rb:106:10:106:11 | [ensure: exception] b1 |
 | raise.rb:107:9:107:26 | [ensure: return] self | raise.rb:106:10:106:11 | [ensure: return] b1 |
 | raise.rb:107:9:107:26 | self | raise.rb:106:10:106:11 | b1 |
-| raise.rb:109:5:110:25 | [ensure(1): raise] ensure ... | raise.rb:107:9:107:26 | self |
-| raise.rb:109:5:110:25 | [ensure: raise, ensure(1): raise] ensure ... | raise.rb:107:9:107:26 | [ensure: raise] self |
-| raise.rb:109:5:110:25 | [ensure: raise] ensure ... | raise.rb:106:7:108:9 | [ensure: raise] if ... |
-| raise.rb:109:5:110:25 | [ensure: return, ensure(1): raise] ensure ... | raise.rb:107:9:107:26 | [ensure: return] self |
+| raise.rb:109:5:110:25 | [ensure(1): exception] ensure ... | raise.rb:107:9:107:26 | self |
+| raise.rb:109:5:110:25 | [ensure: exception, ensure(1): exception] ensure ... | raise.rb:107:9:107:26 | [ensure: exception] self |
+| raise.rb:109:5:110:25 | [ensure: exception] ensure ... | raise.rb:106:7:108:9 | [ensure: exception] if ... |
+| raise.rb:109:5:110:25 | [ensure: return, ensure(1): exception] ensure ... | raise.rb:107:9:107:26 | [ensure: return] self |
 | raise.rb:109:5:110:25 | [ensure: return] ensure ... | raise.rb:106:7:108:9 | [ensure: return] if ... |
 | raise.rb:109:5:110:25 | ensure ... | raise.rb:106:7:108:9 | if ... |
-| raise.rb:115:3:115:22 | [ensure: raise] self | raise.rb:94:1:119:3 | enter m9 |
+| raise.rb:115:3:115:22 | [ensure: exception] self | raise.rb:94:1:119:3 | enter m9 |
 | raise.rb:115:3:115:22 | self | raise.rb:109:5:110:25 | ensure ... |
-| raise.rb:116:3:118:5 | [ensure: raise] if ... | raise.rb:115:3:115:22 | [ensure: raise] self |
+| raise.rb:116:3:118:5 | [ensure: exception] if ... | raise.rb:115:3:115:22 | [ensure: exception] self |
 | raise.rb:116:3:118:5 | [ensure: return] if ... | raise.rb:109:5:110:25 | [ensure: return] ensure ... |
 | raise.rb:116:3:118:5 | if ... | raise.rb:115:3:115:22 | self |
-| raise.rb:117:5:117:22 | [ensure: raise] self | raise.rb:115:3:115:22 | [ensure: raise] self |
+| raise.rb:117:5:117:22 | [ensure: exception] self | raise.rb:115:3:115:22 | [ensure: exception] self |
 | raise.rb:117:5:117:22 | [ensure: return] self | raise.rb:109:5:110:25 | [ensure: return] ensure ... |
 | raise.rb:117:5:117:22 | self | raise.rb:115:3:115:22 | self |
 | raise.rb:121:1:126:3 | exit m10 | raise.rb:121:1:126:3 | enter m10 |
@@ -4522,7 +4522,7 @@ immediateDominator
 | raise.rb:133:3:133:19 | rescue ... | raise.rb:131:7:131:22 | self |
 | raise.rb:134:10:134:19 | ExceptionB | raise.rb:131:7:131:22 | self |
 | raise.rb:135:5:135:21 | self | raise.rb:134:10:134:19 | ExceptionB |
-| raise.rb:137:5:137:17 | [ensure: raise] self | raise.rb:134:10:134:19 | ExceptionB |
+| raise.rb:137:5:137:17 | [ensure: exception] self | raise.rb:134:10:134:19 | ExceptionB |
 | raise.rb:137:5:137:17 | self | raise.rb:128:1:140:3 | enter m11 |
 | raise.rb:142:1:148:3 | exit m12 (normal) | raise.rb:142:1:148:3 | enter m12 |
 | raise.rb:143:3:145:5 | if ... | raise.rb:142:1:148:3 | enter m12 |
@@ -4550,16 +4550,16 @@ controls
 | break_ensure.rb:2:9:2:9 | x | break_ensure.rb:4:7:4:11 | break | true |
 | break_ensure.rb:3:8:3:8 | x | break_ensure.rb:3:5:5:7 | if ... | false |
 | break_ensure.rb:3:8:3:8 | x | break_ensure.rb:4:7:4:11 | break | true |
-| break_ensure.rb:8:6:8:13 | [ensure: raise] self | break_ensure.rb:9:5:9:23 | [ensure: raise] self | true |
+| break_ensure.rb:8:6:8:13 | [ensure: exception] self | break_ensure.rb:9:5:9:23 | [ensure: exception] self | true |
 | break_ensure.rb:14:9:14:9 | x | break_ensure.rb:16:7:18:9 | if ... | true |
 | break_ensure.rb:14:9:14:9 | x | break_ensure.rb:16:10:16:10 | x | true |
 | break_ensure.rb:14:9:14:9 | x | break_ensure.rb:17:9:17:13 | break | true |
 | break_ensure.rb:14:9:14:9 | x | break_ensure.rb:20:7:22:9 | [ensure: break] if ... | true |
-| break_ensure.rb:14:9:14:9 | x | break_ensure.rb:20:7:22:9 | [ensure: raise] if ... | true |
+| break_ensure.rb:14:9:14:9 | x | break_ensure.rb:20:7:22:9 | [ensure: exception] if ... | true |
 | break_ensure.rb:14:9:14:9 | x | break_ensure.rb:20:7:22:9 | if ... | true |
-| break_ensure.rb:14:9:14:9 | x | break_ensure.rb:20:10:20:10 | [ensure: raise] y | true |
+| break_ensure.rb:14:9:14:9 | x | break_ensure.rb:20:10:20:10 | [ensure: exception] y | true |
 | break_ensure.rb:14:9:14:9 | x | break_ensure.rb:21:9:21:20 | [ensure: break] self | true |
-| break_ensure.rb:14:9:14:9 | x | break_ensure.rb:21:9:21:20 | [ensure: raise] self | true |
+| break_ensure.rb:14:9:14:9 | x | break_ensure.rb:21:9:21:20 | [ensure: exception] self | true |
 | break_ensure.rb:14:9:14:9 | x | break_ensure.rb:21:9:21:20 | self | true |
 | break_ensure.rb:16:7:18:9 | if ... | break_ensure.rb:21:9:21:20 | self | true |
 | break_ensure.rb:16:10:16:10 | x | break_ensure.rb:16:7:18:9 | if ... | false |
@@ -4569,7 +4569,7 @@ controls
 | break_ensure.rb:16:10:16:10 | x | break_ensure.rb:21:9:21:20 | [ensure: break] self | true |
 | break_ensure.rb:16:10:16:10 | x | break_ensure.rb:21:9:21:20 | self | false |
 | break_ensure.rb:17:9:17:13 | break | break_ensure.rb:21:9:21:20 | [ensure: break] self | true |
-| break_ensure.rb:20:10:20:10 | [ensure: raise] y | break_ensure.rb:21:9:21:20 | [ensure: raise] self | true |
+| break_ensure.rb:20:10:20:10 | [ensure: exception] y | break_ensure.rb:21:9:21:20 | [ensure: exception] self | true |
 | break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:29:5:31:7 | if ... | false |
 | break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:30:7:30:12 | return | true |
 | break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:33:5:39:7 | [ensure: return] while ... | true |
@@ -4582,17 +4582,17 @@ controls
 | break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:35:12:35:12 | x | false |
 | break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:36:11:36:15 | [ensure: return] break | true |
 | break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:36:11:36:15 | break | false |
-| break_ensure.rb:33:11:33:11 | [ensure: raise] y | break_ensure.rb:35:9:37:11 | [ensure: raise] if ... | true |
-| break_ensure.rb:33:11:33:11 | [ensure: raise] y | break_ensure.rb:35:12:35:12 | [ensure: raise] x | true |
-| break_ensure.rb:33:11:33:11 | [ensure: raise] y | break_ensure.rb:36:11:36:15 | [ensure: raise] break | true |
+| break_ensure.rb:33:11:33:11 | [ensure: exception] y | break_ensure.rb:35:9:37:11 | [ensure: exception] if ... | true |
+| break_ensure.rb:33:11:33:11 | [ensure: exception] y | break_ensure.rb:35:12:35:12 | [ensure: exception] x | true |
+| break_ensure.rb:33:11:33:11 | [ensure: exception] y | break_ensure.rb:36:11:36:15 | [ensure: exception] break | true |
 | break_ensure.rb:33:11:33:11 | [ensure: return] y | break_ensure.rb:35:9:37:11 | [ensure: return] if ... | true |
 | break_ensure.rb:33:11:33:11 | [ensure: return] y | break_ensure.rb:35:12:35:12 | [ensure: return] x | true |
 | break_ensure.rb:33:11:33:11 | [ensure: return] y | break_ensure.rb:36:11:36:15 | [ensure: return] break | true |
 | break_ensure.rb:33:11:33:11 | y | break_ensure.rb:35:9:37:11 | if ... | true |
 | break_ensure.rb:33:11:33:11 | y | break_ensure.rb:35:12:35:12 | x | true |
 | break_ensure.rb:33:11:33:11 | y | break_ensure.rb:36:11:36:15 | break | true |
-| break_ensure.rb:35:12:35:12 | [ensure: raise] x | break_ensure.rb:35:9:37:11 | [ensure: raise] if ... | false |
-| break_ensure.rb:35:12:35:12 | [ensure: raise] x | break_ensure.rb:36:11:36:15 | [ensure: raise] break | true |
+| break_ensure.rb:35:12:35:12 | [ensure: exception] x | break_ensure.rb:35:9:37:11 | [ensure: exception] if ... | false |
+| break_ensure.rb:35:12:35:12 | [ensure: exception] x | break_ensure.rb:36:11:36:15 | [ensure: exception] break | true |
 | break_ensure.rb:35:12:35:12 | [ensure: return] x | break_ensure.rb:35:9:37:11 | [ensure: return] if ... | false |
 | break_ensure.rb:35:12:35:12 | [ensure: return] x | break_ensure.rb:36:11:36:15 | [ensure: return] break | true |
 | break_ensure.rb:35:12:35:12 | x | break_ensure.rb:35:9:37:11 | if ... | false |
@@ -4600,19 +4600,19 @@ controls
 | break_ensure.rb:45:9:45:9 | x | break_ensure.rb:47:7:49:9 | if ... | true |
 | break_ensure.rb:45:9:45:9 | x | break_ensure.rb:47:10:47:10 | x | true |
 | break_ensure.rb:45:9:45:9 | x | break_ensure.rb:48:9:48:16 | self | true |
-| break_ensure.rb:45:9:45:9 | x | break_ensure.rb:51:7:53:9 | [ensure: raise] if ... | true |
+| break_ensure.rb:45:9:45:9 | x | break_ensure.rb:51:7:53:9 | [ensure: exception] if ... | true |
 | break_ensure.rb:45:9:45:9 | x | break_ensure.rb:51:7:53:9 | if ... | true |
-| break_ensure.rb:45:9:45:9 | x | break_ensure.rb:51:10:51:10 | [ensure: raise] x | true |
+| break_ensure.rb:45:9:45:9 | x | break_ensure.rb:51:10:51:10 | [ensure: exception] x | true |
 | break_ensure.rb:45:9:45:9 | x | break_ensure.rb:52:15:52:16 | 10 | true |
-| break_ensure.rb:45:9:45:9 | x | break_ensure.rb:52:15:52:16 | [ensure: raise] 10 | true |
+| break_ensure.rb:45:9:45:9 | x | break_ensure.rb:52:15:52:16 | [ensure: exception] 10 | true |
 | break_ensure.rb:47:7:49:9 | if ... | break_ensure.rb:51:7:53:9 | if ... | false |
 | break_ensure.rb:47:7:49:9 | if ... | break_ensure.rb:52:15:52:16 | 10 | true |
 | break_ensure.rb:47:10:47:10 | x | break_ensure.rb:47:7:49:9 | if ... | false |
 | break_ensure.rb:47:10:47:10 | x | break_ensure.rb:48:9:48:16 | self | true |
 | break_ensure.rb:47:10:47:10 | x | break_ensure.rb:51:7:53:9 | if ... | false |
 | break_ensure.rb:47:10:47:10 | x | break_ensure.rb:52:15:52:16 | 10 | false |
-| break_ensure.rb:51:10:51:10 | [ensure: raise] x | break_ensure.rb:51:7:53:9 | [ensure: raise] if ... | false |
-| break_ensure.rb:51:10:51:10 | [ensure: raise] x | break_ensure.rb:52:15:52:16 | [ensure: raise] 10 | true |
+| break_ensure.rb:51:10:51:10 | [ensure: exception] x | break_ensure.rb:51:7:53:9 | [ensure: exception] if ... | false |
+| break_ensure.rb:51:10:51:10 | [ensure: exception] x | break_ensure.rb:52:15:52:16 | [ensure: exception] 10 | true |
 | case.rb:1:1:6:3 | enter if_in_case | case.rb:3:5:3:42 | [match] when ... | match |
 | case.rb:1:1:6:3 | enter if_in_case | case.rb:3:5:3:42 | [no-match] when ... | no-match |
 | case.rb:1:1:6:3 | enter if_in_case | case.rb:3:18:3:41 | if ... | match |
@@ -5726,8 +5726,8 @@ controls
 | raise.rb:97:8:97:8 | x | raise.rb:106:10:106:11 | b1 | false |
 | raise.rb:97:8:97:8 | x | raise.rb:107:9:107:26 | [ensure: return] self | false |
 | raise.rb:97:8:97:8 | x | raise.rb:107:9:107:26 | self | false |
-| raise.rb:97:8:97:8 | x | raise.rb:109:5:110:25 | [ensure(1): raise] ensure ... | false |
-| raise.rb:97:8:97:8 | x | raise.rb:109:5:110:25 | [ensure: return, ensure(1): raise] ensure ... | false |
+| raise.rb:97:8:97:8 | x | raise.rb:109:5:110:25 | [ensure(1): exception] ensure ... | false |
+| raise.rb:97:8:97:8 | x | raise.rb:109:5:110:25 | [ensure: return, ensure(1): exception] ensure ... | false |
 | raise.rb:97:8:97:8 | x | raise.rb:109:5:110:25 | [ensure: return] ensure ... | false |
 | raise.rb:97:8:97:8 | x | raise.rb:109:5:110:25 | ensure ... | false |
 | raise.rb:97:8:97:8 | x | raise.rb:115:3:115:22 | self | false |
@@ -5744,8 +5744,8 @@ controls
 | raise.rb:99:11:99:11 | x | raise.rb:106:10:106:11 | b1 | false |
 | raise.rb:99:11:99:11 | x | raise.rb:107:9:107:26 | [ensure: return] self | true |
 | raise.rb:99:11:99:11 | x | raise.rb:107:9:107:26 | self | false |
-| raise.rb:99:11:99:11 | x | raise.rb:109:5:110:25 | [ensure(1): raise] ensure ... | false |
-| raise.rb:99:11:99:11 | x | raise.rb:109:5:110:25 | [ensure: return, ensure(1): raise] ensure ... | true |
+| raise.rb:99:11:99:11 | x | raise.rb:109:5:110:25 | [ensure(1): exception] ensure ... | false |
+| raise.rb:99:11:99:11 | x | raise.rb:109:5:110:25 | [ensure: return, ensure(1): exception] ensure ... | true |
 | raise.rb:99:11:99:11 | x | raise.rb:109:5:110:25 | [ensure: return] ensure ... | true |
 | raise.rb:99:11:99:11 | x | raise.rb:109:5:110:25 | ensure ... | false |
 | raise.rb:99:11:99:11 | x | raise.rb:115:3:115:22 | self | false |
@@ -5753,27 +5753,27 @@ controls
 | raise.rb:99:11:99:11 | x | raise.rb:116:3:118:5 | if ... | false |
 | raise.rb:99:11:99:11 | x | raise.rb:117:5:117:22 | [ensure: return] self | true |
 | raise.rb:99:11:99:11 | x | raise.rb:117:5:117:22 | self | false |
-| raise.rb:106:10:106:11 | [ensure: raise] b1 | raise.rb:106:7:108:9 | [ensure: raise] if ... | false |
-| raise.rb:106:10:106:11 | [ensure: raise] b1 | raise.rb:107:9:107:26 | [ensure: raise] self | true |
-| raise.rb:106:10:106:11 | [ensure: raise] b1 | raise.rb:109:5:110:25 | [ensure: raise, ensure(1): raise] ensure ... | true |
-| raise.rb:106:10:106:11 | [ensure: raise] b1 | raise.rb:109:5:110:25 | [ensure: raise] ensure ... | false |
+| raise.rb:106:10:106:11 | [ensure: exception] b1 | raise.rb:106:7:108:9 | [ensure: exception] if ... | false |
+| raise.rb:106:10:106:11 | [ensure: exception] b1 | raise.rb:107:9:107:26 | [ensure: exception] self | true |
+| raise.rb:106:10:106:11 | [ensure: exception] b1 | raise.rb:109:5:110:25 | [ensure: exception, ensure(1): exception] ensure ... | true |
+| raise.rb:106:10:106:11 | [ensure: exception] b1 | raise.rb:109:5:110:25 | [ensure: exception] ensure ... | false |
 | raise.rb:106:10:106:11 | [ensure: return] b1 | raise.rb:106:7:108:9 | [ensure: return] if ... | false |
 | raise.rb:106:10:106:11 | [ensure: return] b1 | raise.rb:107:9:107:26 | [ensure: return] self | true |
-| raise.rb:106:10:106:11 | [ensure: return] b1 | raise.rb:109:5:110:25 | [ensure: return, ensure(1): raise] ensure ... | true |
+| raise.rb:106:10:106:11 | [ensure: return] b1 | raise.rb:109:5:110:25 | [ensure: return, ensure(1): exception] ensure ... | true |
 | raise.rb:106:10:106:11 | [ensure: return] b1 | raise.rb:109:5:110:25 | [ensure: return] ensure ... | false |
 | raise.rb:106:10:106:11 | [ensure: return] b1 | raise.rb:116:3:118:5 | [ensure: return] if ... | false |
 | raise.rb:106:10:106:11 | [ensure: return] b1 | raise.rb:117:5:117:22 | [ensure: return] self | false |
 | raise.rb:106:10:106:11 | b1 | raise.rb:106:7:108:9 | if ... | false |
 | raise.rb:106:10:106:11 | b1 | raise.rb:107:9:107:26 | self | true |
-| raise.rb:106:10:106:11 | b1 | raise.rb:109:5:110:25 | [ensure(1): raise] ensure ... | true |
+| raise.rb:106:10:106:11 | b1 | raise.rb:109:5:110:25 | [ensure(1): exception] ensure ... | true |
 | raise.rb:106:10:106:11 | b1 | raise.rb:109:5:110:25 | ensure ... | false |
 | raise.rb:106:10:106:11 | b1 | raise.rb:115:3:115:22 | self | false |
 | raise.rb:106:10:106:11 | b1 | raise.rb:116:3:118:5 | if ... | false |
 | raise.rb:106:10:106:11 | b1 | raise.rb:117:5:117:22 | self | false |
 | raise.rb:109:5:110:25 | [ensure: return] ensure ... | raise.rb:116:3:118:5 | [ensure: return] if ... | false |
 | raise.rb:109:5:110:25 | [ensure: return] ensure ... | raise.rb:117:5:117:22 | [ensure: return] self | true |
-| raise.rb:115:3:115:22 | [ensure: raise] self | raise.rb:116:3:118:5 | [ensure: raise] if ... | false |
-| raise.rb:115:3:115:22 | [ensure: raise] self | raise.rb:117:5:117:22 | [ensure: raise] self | true |
+| raise.rb:115:3:115:22 | [ensure: exception] self | raise.rb:116:3:118:5 | [ensure: exception] if ... | false |
+| raise.rb:115:3:115:22 | [ensure: exception] self | raise.rb:117:5:117:22 | [ensure: exception] self | true |
 | raise.rb:115:3:115:22 | self | raise.rb:116:3:118:5 | if ... | false |
 | raise.rb:115:3:115:22 | self | raise.rb:117:5:117:22 | self | true |
 | raise.rb:121:1:126:3 | enter m10 | raise.rb:121:14:121:30 | self | false |
@@ -5785,11 +5785,11 @@ controls
 | raise.rb:128:1:140:3 | enter m11 | raise.rb:133:3:133:19 | rescue ... | true |
 | raise.rb:128:1:140:3 | enter m11 | raise.rb:134:10:134:19 | ExceptionB | true |
 | raise.rb:128:1:140:3 | enter m11 | raise.rb:135:5:135:21 | self | true |
-| raise.rb:128:1:140:3 | enter m11 | raise.rb:137:5:137:17 | [ensure: raise] self | true |
+| raise.rb:128:1:140:3 | enter m11 | raise.rb:137:5:137:17 | [ensure: exception] self | true |
 | raise.rb:131:7:131:22 | self | raise.rb:133:3:133:19 | rescue ... | match |
 | raise.rb:131:7:131:22 | self | raise.rb:134:10:134:19 | ExceptionB | no-match |
 | raise.rb:131:7:131:22 | self | raise.rb:135:5:135:21 | self | no-match |
-| raise.rb:131:7:131:22 | self | raise.rb:137:5:137:17 | [ensure: raise] self | no-match |
+| raise.rb:131:7:131:22 | self | raise.rb:137:5:137:17 | [ensure: exception] self | no-match |
 | raise.rb:134:10:134:19 | ExceptionB | raise.rb:135:5:135:21 | self | match |
 | raise.rb:142:1:148:3 | enter m12 | raise.rb:143:3:145:5 | if ... | false |
 | raise.rb:142:1:148:3 | enter m12 | raise.rb:144:5:144:12 | self | true |
@@ -5810,34 +5810,34 @@ successor
 | break_ensure.rb:2:3:6:5 | while ... | break_ensure.rb:9:5:9:23 | self | true |
 | break_ensure.rb:2:9:2:9 | x | break_ensure.rb:2:3:6:5 | while ... | false |
 | break_ensure.rb:2:9:2:9 | x | break_ensure.rb:3:8:3:8 | x | true |
-| break_ensure.rb:2:9:2:9 | x | break_ensure.rb:8:6:8:13 | [ensure: raise] self | raise |
-| break_ensure.rb:3:8:3:8 | x | break_ensure.rb:2:3:6:5 | while ... | raise |
+| break_ensure.rb:2:9:2:9 | x | break_ensure.rb:8:6:8:13 | [ensure: exception] self | exception |
+| break_ensure.rb:3:8:3:8 | x | break_ensure.rb:2:3:6:5 | while ... | exception |
 | break_ensure.rb:3:8:3:8 | x | break_ensure.rb:3:5:5:7 | if ... | false |
 | break_ensure.rb:3:8:3:8 | x | break_ensure.rb:4:7:4:11 | break | true |
-| break_ensure.rb:8:6:8:13 | [ensure: raise] self | break_ensure.rb:8:3:10:5 | [ensure: raise] if ... | false |
-| break_ensure.rb:8:6:8:13 | [ensure: raise] self | break_ensure.rb:9:5:9:23 | [ensure: raise] self | true |
+| break_ensure.rb:8:6:8:13 | [ensure: exception] self | break_ensure.rb:8:3:10:5 | [ensure: exception] if ... | false |
+| break_ensure.rb:8:6:8:13 | [ensure: exception] self | break_ensure.rb:9:5:9:23 | [ensure: exception] self | true |
 | break_ensure.rb:14:9:14:9 | x | break_ensure.rb:14:3:24:5 | while ... | false |
 | break_ensure.rb:14:9:14:9 | x | break_ensure.rb:16:10:16:10 | x | true |
 | break_ensure.rb:16:7:18:9 | if ... | break_ensure.rb:20:7:22:9 | if ... | false |
 | break_ensure.rb:16:7:18:9 | if ... | break_ensure.rb:21:9:21:20 | self | true |
 | break_ensure.rb:16:10:16:10 | x | break_ensure.rb:16:7:18:9 | if ... | false |
 | break_ensure.rb:16:10:16:10 | x | break_ensure.rb:17:9:17:13 | break | true |
-| break_ensure.rb:16:10:16:10 | x | break_ensure.rb:20:10:20:10 | [ensure: raise] y | raise |
+| break_ensure.rb:16:10:16:10 | x | break_ensure.rb:20:10:20:10 | [ensure: exception] y | exception |
 | break_ensure.rb:17:9:17:13 | break | break_ensure.rb:20:7:22:9 | [ensure: break] if ... | false |
 | break_ensure.rb:17:9:17:13 | break | break_ensure.rb:21:9:21:20 | [ensure: break] self | true |
-| break_ensure.rb:20:10:20:10 | [ensure: raise] y | break_ensure.rb:20:7:22:9 | [ensure: raise] if ... | false |
-| break_ensure.rb:20:10:20:10 | [ensure: raise] y | break_ensure.rb:21:9:21:20 | [ensure: raise] self | true |
+| break_ensure.rb:20:10:20:10 | [ensure: exception] y | break_ensure.rb:20:7:22:9 | [ensure: exception] if ... | false |
+| break_ensure.rb:20:10:20:10 | [ensure: exception] y | break_ensure.rb:21:9:21:20 | [ensure: exception] self | true |
 | break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:29:5:31:7 | if ... | false |
 | break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:30:7:30:12 | return | true |
-| break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:33:11:33:11 | [ensure: raise] y | raise |
-| break_ensure.rb:33:11:33:11 | [ensure: raise] y | break_ensure.rb:33:5:39:7 | [ensure: raise] while ... | false |
-| break_ensure.rb:33:11:33:11 | [ensure: raise] y | break_ensure.rb:35:12:35:12 | [ensure: raise] x | true |
+| break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:33:11:33:11 | [ensure: exception] y | exception |
+| break_ensure.rb:33:11:33:11 | [ensure: exception] y | break_ensure.rb:33:5:39:7 | [ensure: exception] while ... | false |
+| break_ensure.rb:33:11:33:11 | [ensure: exception] y | break_ensure.rb:35:12:35:12 | [ensure: exception] x | true |
 | break_ensure.rb:33:11:33:11 | [ensure: return] y | break_ensure.rb:33:5:39:7 | [ensure: return] while ... | false |
 | break_ensure.rb:33:11:33:11 | [ensure: return] y | break_ensure.rb:35:12:35:12 | [ensure: return] x | true |
 | break_ensure.rb:33:11:33:11 | y | break_ensure.rb:33:5:39:7 | while ... | false |
 | break_ensure.rb:33:11:33:11 | y | break_ensure.rb:35:12:35:12 | x | true |
-| break_ensure.rb:35:12:35:12 | [ensure: raise] x | break_ensure.rb:35:9:37:11 | [ensure: raise] if ... | false |
-| break_ensure.rb:35:12:35:12 | [ensure: raise] x | break_ensure.rb:36:11:36:15 | [ensure: raise] break | true |
+| break_ensure.rb:35:12:35:12 | [ensure: exception] x | break_ensure.rb:35:9:37:11 | [ensure: exception] if ... | false |
+| break_ensure.rb:35:12:35:12 | [ensure: exception] x | break_ensure.rb:36:11:36:15 | [ensure: exception] break | true |
 | break_ensure.rb:35:12:35:12 | [ensure: return] x | break_ensure.rb:35:9:37:11 | [ensure: return] if ... | false |
 | break_ensure.rb:35:12:35:12 | [ensure: return] x | break_ensure.rb:36:11:36:15 | [ensure: return] break | true |
 | break_ensure.rb:35:12:35:12 | x | break_ensure.rb:35:9:37:11 | if ... | false |
@@ -5848,9 +5848,9 @@ successor
 | break_ensure.rb:47:7:49:9 | if ... | break_ensure.rb:52:15:52:16 | 10 | true |
 | break_ensure.rb:47:10:47:10 | x | break_ensure.rb:47:7:49:9 | if ... | false |
 | break_ensure.rb:47:10:47:10 | x | break_ensure.rb:48:9:48:16 | self | true |
-| break_ensure.rb:47:10:47:10 | x | break_ensure.rb:51:10:51:10 | [ensure: raise] x | raise |
-| break_ensure.rb:51:10:51:10 | [ensure: raise] x | break_ensure.rb:51:7:53:9 | [ensure: raise] if ... | false |
-| break_ensure.rb:51:10:51:10 | [ensure: raise] x | break_ensure.rb:52:15:52:16 | [ensure: raise] 10 | true |
+| break_ensure.rb:47:10:47:10 | x | break_ensure.rb:51:10:51:10 | [ensure: exception] x | exception |
+| break_ensure.rb:51:10:51:10 | [ensure: exception] x | break_ensure.rb:51:7:53:9 | [ensure: exception] if ... | false |
+| break_ensure.rb:51:10:51:10 | [ensure: exception] x | break_ensure.rb:52:15:52:16 | [ensure: exception] 10 | true |
 | case.rb:1:1:6:3 | enter if_in_case | case.rb:3:5:3:42 | [match] when ... | match |
 | case.rb:1:1:6:3 | enter if_in_case | case.rb:3:5:3:42 | [no-match] when ... | no-match |
 | case.rb:3:5:3:42 | [match] when ... | case.rb:3:21:3:22 | self | match |
@@ -5873,9 +5873,9 @@ successor
 | case.rb:15:5:15:28 | in ... then ... | case.rb:15:17:15:17 | x | match |
 | case.rb:15:17:15:17 | x | case.rb:15:28:15:28 | 7 | false |
 | case.rb:15:17:15:17 | x | case.rb:16:10:16:10 | 8 | true |
-| case.rb:20:1:24:3 | enter case_match_no_match | case.rb:20:1:24:3 | exit case_match_no_match (abnormal) | raise |
+| case.rb:20:1:24:3 | enter case_match_no_match | case.rb:20:1:24:3 | exit case_match_no_match (abnormal) | exception |
 | case.rb:20:1:24:3 | enter case_match_no_match | case.rb:21:3:23:5 | case ... | match |
-| case.rb:26:1:30:3 | enter case_match_raise | case.rb:26:1:30:3 | exit case_match_raise (abnormal) | raise |
+| case.rb:26:1:30:3 | enter case_match_raise | case.rb:26:1:30:3 | exit case_match_raise (abnormal) | exception |
 | case.rb:26:1:30:3 | enter case_match_raise | case.rb:27:3:29:5 | case ... | match |
 | case.rb:32:1:39:3 | enter case_match_array | case.rb:33:3:38:5 | case ... | match |
 | case.rb:32:1:39:3 | enter case_match_array | case.rb:35:5:35:11 | in ... then ... | no-match |
@@ -5889,9 +5889,9 @@ successor
 | case.rb:36:5:36:13 | in ... then ... | case.rb:36:9:36:9 | x | true |
 | case.rb:36:5:36:13 | in ... then ... | case.rb:37:5:37:27 | in ... then ... | no-match |
 | case.rb:36:9:36:9 | x | case.rb:33:3:38:5 | case ... | match |
-| case.rb:37:5:37:27 | in ... then ... | case.rb:32:1:39:3 | exit case_match_array (abnormal) | raise |
+| case.rb:37:5:37:27 | in ... then ... | case.rb:32:1:39:3 | exit case_match_array (abnormal) | exception |
 | case.rb:37:5:37:27 | in ... then ... | case.rb:37:8:37:26 | [ ..., * ] | match |
-| case.rb:37:8:37:26 | [ ..., * ] | case.rb:32:1:39:3 | exit case_match_array (abnormal) | raise |
+| case.rb:37:8:37:26 | [ ..., * ] | case.rb:32:1:39:3 | exit case_match_array (abnormal) | exception |
 | case.rb:37:8:37:26 | [ ..., * ] | case.rb:37:12:37:12 | a | false |
 | case.rb:37:8:37:26 | [ ..., * ] | case.rb:37:12:37:12 | a | match |
 | case.rb:37:8:37:26 | [ ..., * ] | case.rb:37:12:37:12 | a | true |
@@ -5899,13 +5899,13 @@ successor
 | case.rb:37:15:37:15 | b | case.rb:37:19:37:19 | c | match |
 | case.rb:37:19:37:19 | c | case.rb:37:25:37:25 | e | match |
 | case.rb:37:25:37:25 | e | case.rb:33:3:38:5 | case ... | match |
-| case.rb:41:1:45:3 | enter case_match_find | case.rb:41:1:45:3 | exit case_match_find (abnormal) | raise |
+| case.rb:41:1:45:3 | enter case_match_find | case.rb:41:1:45:3 | exit case_match_find (abnormal) | exception |
 | case.rb:41:1:45:3 | enter case_match_find | case.rb:43:10:43:10 | x | false |
 | case.rb:41:1:45:3 | enter case_match_find | case.rb:43:10:43:10 | x | match |
 | case.rb:41:1:45:3 | enter case_match_find | case.rb:43:10:43:10 | x | true |
-| case.rb:43:10:43:10 | x | case.rb:41:1:45:3 | exit case_match_find (abnormal) | raise |
+| case.rb:43:10:43:10 | x | case.rb:41:1:45:3 | exit case_match_find (abnormal) | exception |
 | case.rb:43:10:43:10 | x | case.rb:43:16:43:16 | 2 | match |
-| case.rb:43:16:43:16 | 2 | case.rb:41:1:45:3 | exit case_match_find (abnormal) | raise |
+| case.rb:43:16:43:16 | 2 | case.rb:41:1:45:3 | exit case_match_find (abnormal) | exception |
 | case.rb:43:16:43:16 | 2 | case.rb:43:20:43:20 | y | match |
 | case.rb:47:1:53:3 | enter case_match_hash | case.rb:49:8:49:34 | { ..., ** } | match |
 | case.rb:47:1:53:3 | enter case_match_hash | case.rb:50:5:50:25 | in ... then ... | no-match |
@@ -5924,9 +5924,9 @@ successor
 | case.rb:50:8:50:24 | { ..., ** } | case.rb:51:5:51:17 | in ... then ... | no-match |
 | case.rb:50:16:50:16 | 1 | case.rb:48:3:52:5 | case ... | match |
 | case.rb:50:16:50:16 | 1 | case.rb:51:5:51:17 | in ... then ... | no-match |
-| case.rb:51:5:51:17 | in ... then ... | case.rb:47:1:53:3 | exit case_match_hash (abnormal) | raise |
+| case.rb:51:5:51:17 | in ... then ... | case.rb:47:1:53:3 | exit case_match_hash (abnormal) | exception |
 | case.rb:51:5:51:17 | in ... then ... | case.rb:51:8:51:16 | { ..., ** } | match |
-| case.rb:51:8:51:16 | { ..., ** } | case.rb:47:1:53:3 | exit case_match_hash (abnormal) | raise |
+| case.rb:51:8:51:16 | { ..., ** } | case.rb:47:1:53:3 | exit case_match_hash (abnormal) | exception |
 | case.rb:51:8:51:16 | { ..., ** } | case.rb:48:3:52:5 | case ... | false |
 | case.rb:51:8:51:16 | { ..., ** } | case.rb:48:3:52:5 | case ... | match |
 | case.rb:51:8:51:16 | { ..., ** } | case.rb:48:3:52:5 | case ... | true |
@@ -5997,12 +5997,12 @@ successor
 | case.rb:91:13:91:14 | "" | case.rb:91:18:91:19 | [ ..., * ] | no-match |
 | case.rb:91:18:91:19 | [ ..., * ] | case.rb:72:3:92:5 | case ... | match |
 | case.rb:91:18:91:19 | [ ..., * ] | case.rb:91:23:91:24 | { ..., ** } | no-match |
-| case.rb:91:23:91:24 | { ..., ** } | case.rb:69:1:93:3 | exit case_match_various (abnormal) | raise |
+| case.rb:91:23:91:24 | { ..., ** } | case.rb:69:1:93:3 | exit case_match_various (abnormal) | exception |
 | case.rb:91:23:91:24 | { ..., ** } | case.rb:72:3:92:5 | case ... | false |
 | case.rb:91:23:91:24 | { ..., ** } | case.rb:72:3:92:5 | case ... | match |
 | case.rb:91:23:91:24 | { ..., ** } | case.rb:72:3:92:5 | case ... | true |
 | case.rb:95:1:99:3 | enter case_match_guard_no_else | case.rb:97:13:97:13 | x | match |
-| case.rb:97:13:97:13 | x | case.rb:95:1:99:3 | exit case_match_guard_no_else (abnormal) | raise |
+| case.rb:97:13:97:13 | x | case.rb:95:1:99:3 | exit case_match_guard_no_else (abnormal) | exception |
 | case.rb:97:13:97:13 | x | case.rb:97:25:97:25 | 6 | true |
 | cfg.html.erb:5:16:31:12 | enter cfg.html.erb | cfg.html.erb:19:19:19:32 | self | true |
 | cfg.html.erb:5:16:31:12 | enter cfg.html.erb | cfg.html.erb:21:19:21:32 | self | false |
@@ -6158,7 +6158,7 @@ successor
 | raise.rb:7:1:12:3 | enter m1 | raise.rb:9:5:9:17 | self | true |
 | raise.rb:14:1:23:3 | enter m2 | raise.rb:16:5:18:7 | if ... | false |
 | raise.rb:14:1:23:3 | enter m2 | raise.rb:17:7:17:22 | self | true |
-| raise.rb:17:7:17:22 | self | raise.rb:14:1:23:3 | exit m2 (abnormal) | raise |
+| raise.rb:17:7:17:22 | self | raise.rb:14:1:23:3 | exit m2 (abnormal) | exception |
 | raise.rb:17:7:17:22 | self | raise.rb:20:5:20:18 | self | match |
 | raise.rb:25:1:34:3 | enter m3 | raise.rb:27:5:29:7 | if ... | false |
 | raise.rb:25:1:34:3 | enter m3 | raise.rb:28:7:28:22 | self | true |
@@ -6170,36 +6170,36 @@ successor
 | raise.rb:57:1:66:3 | enter m6 | raise.rb:60:7:60:22 | self | true |
 | raise.rb:60:7:60:22 | self | raise.rb:62:22:62:31 | ExceptionB | no-match |
 | raise.rb:60:7:60:22 | self | raise.rb:62:36:62:36 | e | match |
-| raise.rb:62:22:62:31 | ExceptionB | raise.rb:57:1:66:3 | exit m6 (abnormal) | raise |
+| raise.rb:62:22:62:31 | ExceptionB | raise.rb:57:1:66:3 | exit m6 (abnormal) | exception |
 | raise.rb:62:22:62:31 | ExceptionB | raise.rb:62:36:62:36 | e | match |
 | raise.rb:68:1:77:3 | enter m7 | raise.rb:70:5:70:17 | self | true |
 | raise.rb:68:1:77:3 | enter m7 | raise.rb:71:9:71:9 | x | false |
-| raise.rb:68:1:77:3 | enter m7 | raise.rb:76:3:76:15 | [ensure: raise] self | raise |
+| raise.rb:68:1:77:3 | enter m7 | raise.rb:76:3:76:15 | [ensure: exception] self | exception |
 | raise.rb:71:9:71:9 | x | raise.rb:71:3:72:18 | elsif ... | false |
 | raise.rb:71:9:71:9 | x | raise.rb:72:13:72:17 | x < 0 | true |
-| raise.rb:71:9:71:9 | x | raise.rb:76:3:76:15 | [ensure: raise] self | raise |
+| raise.rb:71:9:71:9 | x | raise.rb:76:3:76:15 | [ensure: exception] self | exception |
 | raise.rb:79:1:92:3 | enter m8 | raise.rb:83:7:83:19 | self | true |
 | raise.rb:79:1:92:3 | enter m8 | raise.rb:84:11:84:11 | x | false |
-| raise.rb:79:1:92:3 | enter m8 | raise.rb:89:5:89:17 | [ensure: raise] self | raise |
+| raise.rb:79:1:92:3 | enter m8 | raise.rb:89:5:89:17 | [ensure: exception] self | exception |
 | raise.rb:84:11:84:11 | x | raise.rb:84:5:85:20 | elsif ... | false |
 | raise.rb:84:11:84:11 | x | raise.rb:85:15:85:19 | x < 0 | true |
-| raise.rb:84:11:84:11 | x | raise.rb:89:5:89:17 | [ensure: raise] self | raise |
+| raise.rb:84:11:84:11 | x | raise.rb:89:5:89:17 | [ensure: exception] self | exception |
 | raise.rb:97:8:97:8 | x | raise.rb:98:7:98:19 | self | true |
 | raise.rb:97:8:97:8 | x | raise.rb:99:11:99:11 | x | false |
-| raise.rb:97:8:97:8 | x | raise.rb:104:5:104:23 | [ensure: raise] self | raise |
+| raise.rb:97:8:97:8 | x | raise.rb:104:5:104:23 | [ensure: exception] self | exception |
 | raise.rb:99:11:99:11 | x | raise.rb:99:5:100:20 | elsif ... | false |
 | raise.rb:99:11:99:11 | x | raise.rb:100:15:100:19 | x < 0 | true |
-| raise.rb:99:11:99:11 | x | raise.rb:104:5:104:23 | [ensure: raise] self | raise |
-| raise.rb:106:10:106:11 | [ensure: raise] b1 | raise.rb:106:7:108:9 | [ensure: raise] if ... | false |
-| raise.rb:106:10:106:11 | [ensure: raise] b1 | raise.rb:107:9:107:26 | [ensure: raise] self | true |
+| raise.rb:99:11:99:11 | x | raise.rb:104:5:104:23 | [ensure: exception] self | exception |
+| raise.rb:106:10:106:11 | [ensure: exception] b1 | raise.rb:106:7:108:9 | [ensure: exception] if ... | false |
+| raise.rb:106:10:106:11 | [ensure: exception] b1 | raise.rb:107:9:107:26 | [ensure: exception] self | true |
 | raise.rb:106:10:106:11 | [ensure: return] b1 | raise.rb:106:7:108:9 | [ensure: return] if ... | false |
 | raise.rb:106:10:106:11 | [ensure: return] b1 | raise.rb:107:9:107:26 | [ensure: return] self | true |
 | raise.rb:106:10:106:11 | b1 | raise.rb:106:7:108:9 | if ... | false |
 | raise.rb:106:10:106:11 | b1 | raise.rb:107:9:107:26 | self | true |
 | raise.rb:109:5:110:25 | [ensure: return] ensure ... | raise.rb:116:3:118:5 | [ensure: return] if ... | false |
 | raise.rb:109:5:110:25 | [ensure: return] ensure ... | raise.rb:117:5:117:22 | [ensure: return] self | true |
-| raise.rb:115:3:115:22 | [ensure: raise] self | raise.rb:116:3:118:5 | [ensure: raise] if ... | false |
-| raise.rb:115:3:115:22 | [ensure: raise] self | raise.rb:117:5:117:22 | [ensure: raise] self | true |
+| raise.rb:115:3:115:22 | [ensure: exception] self | raise.rb:116:3:118:5 | [ensure: exception] if ... | false |
+| raise.rb:115:3:115:22 | [ensure: exception] self | raise.rb:117:5:117:22 | [ensure: exception] self | true |
 | raise.rb:115:3:115:22 | self | raise.rb:116:3:118:5 | if ... | false |
 | raise.rb:115:3:115:22 | self | raise.rb:117:5:117:22 | self | true |
 | raise.rb:121:1:126:3 | enter m10 | raise.rb:121:14:121:30 | self | false |
@@ -6211,7 +6211,7 @@ successor
 | raise.rb:131:7:131:22 | self | raise.rb:133:3:133:19 | rescue ... | match |
 | raise.rb:131:7:131:22 | self | raise.rb:134:10:134:19 | ExceptionB | no-match |
 | raise.rb:134:10:134:19 | ExceptionB | raise.rb:135:5:135:21 | self | match |
-| raise.rb:134:10:134:19 | ExceptionB | raise.rb:137:5:137:17 | [ensure: raise] self | raise |
+| raise.rb:134:10:134:19 | ExceptionB | raise.rb:137:5:137:17 | [ensure: exception] self | exception |
 | raise.rb:142:1:148:3 | enter m12 | raise.rb:143:3:145:5 | if ... | false |
 | raise.rb:142:1:148:3 | enter m12 | raise.rb:144:5:144:12 | self | true |
 | raise.rb:155:16:155:50 | enter { ... } | raise.rb:155:25:155:32 | self | true |
@@ -6221,60 +6221,61 @@ successor
 | raise.rb:172:1:182:3 | enter m16 | raise.rb:174:8:174:23 | [true] ... \|\| ... | true |
 | raise.rb:172:1:182:3 | enter m16 | raise.rb:174:14:174:15 | b2 | false |
 | raise.rb:174:8:174:23 | [false] ... \|\| ... | raise.rb:177:14:177:14 | 2 | false |
-| raise.rb:174:8:174:23 | [false] ... \|\| ... | raise.rb:179:10:179:19 | ExceptionA | raise |
+| raise.rb:174:8:174:23 | [false] ... \|\| ... | raise.rb:179:10:179:19 | ExceptionA | exception |
 | raise.rb:174:8:174:23 | [true] ... \|\| ... | raise.rb:175:14:175:14 | 1 | true |
-| raise.rb:174:8:174:23 | [true] ... \|\| ... | raise.rb:179:10:179:19 | ExceptionA | raise |
+| raise.rb:174:8:174:23 | [true] ... \|\| ... | raise.rb:179:10:179:19 | ExceptionA | exception |
 | raise.rb:174:14:174:15 | b2 | raise.rb:174:8:174:23 | [false] ... \|\| ... | false |
 | raise.rb:174:14:174:15 | b2 | raise.rb:174:8:174:23 | [true] ... \|\| ... | true |
-| raise.rb:174:14:174:15 | b2 | raise.rb:179:10:179:19 | ExceptionA | raise |
-| raise.rb:179:10:179:19 | ExceptionA | raise.rb:172:1:182:3 | exit m16 (abnormal) | raise |
+| raise.rb:174:14:174:15 | b2 | raise.rb:179:10:179:19 | ExceptionA | exception |
+| raise.rb:179:10:179:19 | ExceptionA | raise.rb:172:1:182:3 | exit m16 (abnormal) | exception |
 | raise.rb:179:10:179:19 | ExceptionA | raise.rb:180:12:180:12 | 3 | match |
 joinBlockPredecessor
-| break_ensure.rb:1:1:11:3 | exit m1 | break_ensure.rb:8:3:10:5 | [ensure: raise] if ... | 1 |
+| break_ensure.rb:1:1:11:3 | exit m1 | break_ensure.rb:8:3:10:5 | [ensure: exception] if ... | 1 |
 | break_ensure.rb:1:1:11:3 | exit m1 | break_ensure.rb:8:3:10:5 | if ... | 0 |
 | break_ensure.rb:2:3:6:5 | while ... | break_ensure.rb:2:9:2:9 | x | 0 |
 | break_ensure.rb:2:3:6:5 | while ... | break_ensure.rb:3:8:3:8 | x | 1 |
 | break_ensure.rb:2:3:6:5 | while ... | break_ensure.rb:4:7:4:11 | break | 2 |
 | break_ensure.rb:2:9:2:9 | x | break_ensure.rb:1:1:11:3 | enter m1 | 0 |
 | break_ensure.rb:2:9:2:9 | x | break_ensure.rb:3:5:5:7 | if ... | 1 |
-| break_ensure.rb:8:3:10:5 | [ensure: raise] if ... | break_ensure.rb:8:6:8:13 | [ensure: raise] self | 0 |
-| break_ensure.rb:8:3:10:5 | [ensure: raise] if ... | break_ensure.rb:9:5:9:23 | [ensure: raise] self | 1 |
+| break_ensure.rb:8:3:10:5 | [ensure: exception] if ... | break_ensure.rb:8:6:8:13 | [ensure: exception] self | 0 |
+| break_ensure.rb:8:3:10:5 | [ensure: exception] if ... | break_ensure.rb:9:5:9:23 | [ensure: exception] self | 1 |
 | break_ensure.rb:8:3:10:5 | if ... | break_ensure.rb:2:3:6:5 | while ... | 0 |
 | break_ensure.rb:8:3:10:5 | if ... | break_ensure.rb:9:5:9:23 | self | 1 |
 | break_ensure.rb:14:3:24:5 | while ... | break_ensure.rb:14:9:14:9 | x | 0 |
 | break_ensure.rb:14:3:24:5 | while ... | break_ensure.rb:20:7:22:9 | [ensure: break] if ... | 1 |
-| break_ensure.rb:14:3:24:5 | while ... | break_ensure.rb:20:7:22:9 | [ensure: raise] if ... | 2 |
+| break_ensure.rb:14:3:24:5 | while ... | break_ensure.rb:20:7:22:9 | [ensure: exception] if ... | 2 |
 | break_ensure.rb:14:9:14:9 | x | break_ensure.rb:13:1:25:3 | enter m2 | 0 |
 | break_ensure.rb:14:9:14:9 | x | break_ensure.rb:20:7:22:9 | if ... | 1 |
 | break_ensure.rb:20:7:22:9 | [ensure: break] if ... | break_ensure.rb:17:9:17:13 | break | 0 |
 | break_ensure.rb:20:7:22:9 | [ensure: break] if ... | break_ensure.rb:21:9:21:20 | [ensure: break] self | 1 |
-| break_ensure.rb:20:7:22:9 | [ensure: raise] if ... | break_ensure.rb:20:10:20:10 | [ensure: raise] y | 0 |
-| break_ensure.rb:20:7:22:9 | [ensure: raise] if ... | break_ensure.rb:21:9:21:20 | [ensure: raise] self | 1 |
+| break_ensure.rb:20:7:22:9 | [ensure: exception] if ... | break_ensure.rb:20:10:20:10 | [ensure: exception] y | 0 |
+| break_ensure.rb:20:7:22:9 | [ensure: exception] if ... | break_ensure.rb:21:9:21:20 | [ensure: exception] self | 1 |
 | break_ensure.rb:20:7:22:9 | if ... | break_ensure.rb:16:7:18:9 | if ... | 0 |
 | break_ensure.rb:20:7:22:9 | if ... | break_ensure.rb:21:9:21:20 | self | 1 |
-| break_ensure.rb:27:1:42:3 | exit m3 | break_ensure.rb:33:5:39:7 | [ensure: raise] while ... | 0 |
+| break_ensure.rb:27:1:42:3 | exit m3 | break_ensure.rb:27:1:42:3 | exit m3 (normal) | 0 |
+| break_ensure.rb:27:1:42:3 | exit m3 | break_ensure.rb:33:5:39:7 | [ensure: exception] while ... | 1 |
 | break_ensure.rb:27:1:42:3 | exit m3 (normal) | break_ensure.rb:33:5:39:7 | [ensure: return] while ... | 1 |
 | break_ensure.rb:27:1:42:3 | exit m3 (normal) | break_ensure.rb:33:5:39:7 | while ... | 0 |
-| break_ensure.rb:33:5:39:7 | [ensure: raise] while ... | break_ensure.rb:33:11:33:11 | [ensure: raise] y | 0 |
-| break_ensure.rb:33:5:39:7 | [ensure: raise] while ... | break_ensure.rb:36:11:36:15 | [ensure: raise] break | 1 |
+| break_ensure.rb:33:5:39:7 | [ensure: exception] while ... | break_ensure.rb:33:11:33:11 | [ensure: exception] y | 0 |
+| break_ensure.rb:33:5:39:7 | [ensure: exception] while ... | break_ensure.rb:36:11:36:15 | [ensure: exception] break | 1 |
 | break_ensure.rb:33:5:39:7 | [ensure: return] while ... | break_ensure.rb:33:11:33:11 | [ensure: return] y | 0 |
 | break_ensure.rb:33:5:39:7 | [ensure: return] while ... | break_ensure.rb:36:11:36:15 | [ensure: return] break | 1 |
 | break_ensure.rb:33:5:39:7 | while ... | break_ensure.rb:33:11:33:11 | y | 0 |
 | break_ensure.rb:33:5:39:7 | while ... | break_ensure.rb:36:11:36:15 | break | 1 |
-| break_ensure.rb:33:11:33:11 | [ensure: raise] y | break_ensure.rb:27:1:42:3 | enter m3 | 0 |
-| break_ensure.rb:33:11:33:11 | [ensure: raise] y | break_ensure.rb:35:9:37:11 | [ensure: raise] if ... | 1 |
+| break_ensure.rb:33:11:33:11 | [ensure: exception] y | break_ensure.rb:27:1:42:3 | enter m3 | 0 |
+| break_ensure.rb:33:11:33:11 | [ensure: exception] y | break_ensure.rb:35:9:37:11 | [ensure: exception] if ... | 1 |
 | break_ensure.rb:33:11:33:11 | [ensure: return] y | break_ensure.rb:30:7:30:12 | return | 0 |
 | break_ensure.rb:33:11:33:11 | [ensure: return] y | break_ensure.rb:35:9:37:11 | [ensure: return] if ... | 1 |
 | break_ensure.rb:33:11:33:11 | y | break_ensure.rb:29:5:31:7 | if ... | 0 |
 | break_ensure.rb:33:11:33:11 | y | break_ensure.rb:35:9:37:11 | if ... | 1 |
 | break_ensure.rb:45:3:55:5 | while ... | break_ensure.rb:45:9:45:9 | x | 0 |
-| break_ensure.rb:45:3:55:5 | while ... | break_ensure.rb:51:7:53:9 | [ensure: raise] if ... | 1 |
+| break_ensure.rb:45:3:55:5 | while ... | break_ensure.rb:51:7:53:9 | [ensure: exception] if ... | 1 |
 | break_ensure.rb:45:3:55:5 | while ... | break_ensure.rb:52:15:52:16 | 10 | 2 |
-| break_ensure.rb:45:3:55:5 | while ... | break_ensure.rb:52:15:52:16 | [ensure: raise] 10 | 3 |
+| break_ensure.rb:45:3:55:5 | while ... | break_ensure.rb:52:15:52:16 | [ensure: exception] 10 | 3 |
 | break_ensure.rb:45:9:45:9 | x | break_ensure.rb:44:1:56:3 | enter m4 | 0 |
 | break_ensure.rb:45:9:45:9 | x | break_ensure.rb:51:7:53:9 | if ... | 1 |
-| break_ensure.rb:51:10:51:10 | [ensure: raise] x | break_ensure.rb:47:10:47:10 | x | 0 |
-| break_ensure.rb:51:10:51:10 | [ensure: raise] x | break_ensure.rb:48:9:48:16 | self | 1 |
+| break_ensure.rb:51:10:51:10 | [ensure: exception] x | break_ensure.rb:47:10:47:10 | x | 0 |
+| break_ensure.rb:51:10:51:10 | [ensure: exception] x | break_ensure.rb:48:9:48:16 | self | 1 |
 | case.rb:2:3:5:5 | case ... | case.rb:3:18:3:41 | if ... | 0 |
 | case.rb:2:3:5:5 | case ... | case.rb:4:5:4:24 | [no-match] when ... | 1 |
 | case.rb:2:3:5:5 | case ... | case.rb:4:17:4:24 | self | 2 |
@@ -6286,20 +6287,25 @@ joinBlockPredecessor
 | case.rb:9:3:17:5 | case ... | case.rb:14:25:14:25 | 6 | 3 |
 | case.rb:9:3:17:5 | case ... | case.rb:15:28:15:28 | 7 | 4 |
 | case.rb:9:3:17:5 | case ... | case.rb:16:10:16:10 | 8 | 5 |
-| case.rb:20:1:24:3 | exit case_match_no_match | case.rb:21:3:23:5 | case ... | 0 |
-| case.rb:26:1:30:3 | exit case_match_raise | case.rb:27:3:29:5 | case ... | 0 |
-| case.rb:32:1:39:3 | exit case_match_array | case.rb:33:3:38:5 | case ... | 0 |
+| case.rb:20:1:24:3 | exit case_match_no_match | case.rb:20:1:24:3 | exit case_match_no_match (abnormal) | 0 |
+| case.rb:20:1:24:3 | exit case_match_no_match | case.rb:21:3:23:5 | case ... | 1 |
+| case.rb:26:1:30:3 | exit case_match_raise | case.rb:26:1:30:3 | exit case_match_raise (abnormal) | 0 |
+| case.rb:26:1:30:3 | exit case_match_raise | case.rb:27:3:29:5 | case ... | 1 |
+| case.rb:32:1:39:3 | exit case_match_array | case.rb:32:1:39:3 | exit case_match_array (abnormal) | 0 |
+| case.rb:32:1:39:3 | exit case_match_array | case.rb:33:3:38:5 | case ... | 1 |
 | case.rb:32:1:39:3 | exit case_match_array (abnormal) | case.rb:37:5:37:27 | in ... then ... | 0 |
 | case.rb:32:1:39:3 | exit case_match_array (abnormal) | case.rb:37:8:37:26 | [ ..., * ] | 1 |
 | case.rb:33:3:38:5 | case ... | case.rb:32:1:39:3 | enter case_match_array | 0 |
 | case.rb:33:3:38:5 | case ... | case.rb:35:9:35:9 | x | 1 |
 | case.rb:33:3:38:5 | case ... | case.rb:36:9:36:9 | x | 2 |
 | case.rb:33:3:38:5 | case ... | case.rb:37:25:37:25 | e | 3 |
-| case.rb:41:1:45:3 | exit case_match_find | case.rb:43:20:43:20 | y | 0 |
+| case.rb:41:1:45:3 | exit case_match_find | case.rb:41:1:45:3 | exit case_match_find (abnormal) | 0 |
+| case.rb:41:1:45:3 | exit case_match_find | case.rb:43:20:43:20 | y | 1 |
 | case.rb:41:1:45:3 | exit case_match_find (abnormal) | case.rb:41:1:45:3 | enter case_match_find | 0 |
 | case.rb:41:1:45:3 | exit case_match_find (abnormal) | case.rb:43:10:43:10 | x | 1 |
 | case.rb:41:1:45:3 | exit case_match_find (abnormal) | case.rb:43:16:43:16 | 2 | 2 |
-| case.rb:47:1:53:3 | exit case_match_hash | case.rb:48:3:52:5 | case ... | 0 |
+| case.rb:47:1:53:3 | exit case_match_hash | case.rb:47:1:53:3 | exit case_match_hash (abnormal) | 0 |
+| case.rb:47:1:53:3 | exit case_match_hash | case.rb:48:3:52:5 | case ... | 1 |
 | case.rb:47:1:53:3 | exit case_match_hash (abnormal) | case.rb:51:5:51:17 | in ... then ... | 0 |
 | case.rb:47:1:53:3 | exit case_match_hash (abnormal) | case.rb:51:8:51:16 | { ..., ** } | 1 |
 | case.rb:48:3:52:5 | case ... | case.rb:49:29:49:32 | rest | 0 |
@@ -6315,7 +6321,8 @@ joinBlockPredecessor
 | case.rb:56:3:60:5 | case ... | case.rb:58:5:58:10 | in ... then ... | 1 |
 | case.rb:64:3:66:5 | case ... | case.rb:63:1:67:3 | enter case_match_underscore | 0 |
 | case.rb:64:3:66:5 | case ... | case.rb:65:12:65:12 | _ | 1 |
-| case.rb:69:1:93:3 | exit case_match_various | case.rb:72:3:92:5 | case ... | 0 |
+| case.rb:69:1:93:3 | exit case_match_various | case.rb:69:1:93:3 | exit case_match_various (abnormal) | 0 |
+| case.rb:69:1:93:3 | exit case_match_various | case.rb:72:3:92:5 | case ... | 1 |
 | case.rb:72:3:92:5 | case ... | case.rb:69:1:93:3 | enter case_match_various | 0 |
 | case.rb:72:3:92:5 | case ... | case.rb:74:5:74:11 | in ... then ... | 1 |
 | case.rb:72:3:92:5 | case ... | case.rb:75:5:75:15 | in ... then ... | 2 |
@@ -6347,7 +6354,8 @@ joinBlockPredecessor
 | case.rb:72:3:92:5 | case ... | case.rb:91:13:91:14 | "" | 28 |
 | case.rb:72:3:92:5 | case ... | case.rb:91:18:91:19 | [ ..., * ] | 29 |
 | case.rb:72:3:92:5 | case ... | case.rb:91:23:91:24 | { ..., ** } | 30 |
-| case.rb:95:1:99:3 | exit case_match_guard_no_else | case.rb:97:25:97:25 | 6 | 0 |
+| case.rb:95:1:99:3 | exit case_match_guard_no_else | case.rb:95:1:99:3 | exit case_match_guard_no_else (abnormal) | 0 |
+| case.rb:95:1:99:3 | exit case_match_guard_no_else | case.rb:97:25:97:25 | 6 | 1 |
 | cfg.html.erb:18:14:22:16 | if ... | cfg.html.erb:19:19:19:32 | self | 0 |
 | cfg.html.erb:18:14:22:16 | if ... | cfg.html.erb:21:19:21:32 | self | 1 |
 | cfg.rb:41:1:45:3 | case ... | cfg.rb:42:15:42:24 | self | 0 |
@@ -6454,7 +6462,8 @@ joinBlockPredecessor
 | loops.rb:31:9:31:9 | x | loops.rb:31:15:32:5 | do ... | 1 |
 | raise.rb:7:1:12:3 | exit m1 | raise.rb:8:3:10:5 | if ... | 0 |
 | raise.rb:7:1:12:3 | exit m1 | raise.rb:9:5:9:17 | self | 1 |
-| raise.rb:14:1:23:3 | exit m2 | raise.rb:22:3:22:15 | self | 0 |
+| raise.rb:14:1:23:3 | exit m2 | raise.rb:14:1:23:3 | exit m2 (abnormal) | 0 |
+| raise.rb:14:1:23:3 | exit m2 | raise.rb:22:3:22:15 | self | 1 |
 | raise.rb:22:3:22:15 | self | raise.rb:16:5:18:7 | if ... | 0 |
 | raise.rb:22:3:22:15 | self | raise.rb:20:5:20:18 | self | 1 |
 | raise.rb:33:3:33:15 | self | raise.rb:27:5:29:7 | if ... | 0 |
@@ -6463,53 +6472,58 @@ joinBlockPredecessor
 | raise.rb:44:3:44:15 | self | raise.rb:39:7:39:22 | self | 1 |
 | raise.rb:54:3:54:15 | self | raise.rb:49:5:51:7 | if ... | 0 |
 | raise.rb:54:3:54:15 | self | raise.rb:50:7:50:22 | self | 1 |
-| raise.rb:57:1:66:3 | exit m6 | raise.rb:65:3:65:15 | self | 0 |
+| raise.rb:57:1:66:3 | exit m6 | raise.rb:57:1:66:3 | exit m6 (abnormal) | 0 |
+| raise.rb:57:1:66:3 | exit m6 | raise.rb:65:3:65:15 | self | 1 |
 | raise.rb:62:36:62:36 | e | raise.rb:60:7:60:22 | self | 0 |
 | raise.rb:62:36:62:36 | e | raise.rb:62:22:62:31 | ExceptionB | 1 |
 | raise.rb:65:3:65:15 | self | raise.rb:59:5:61:7 | if ... | 0 |
 | raise.rb:65:3:65:15 | self | raise.rb:62:36:62:36 | e | 1 |
-| raise.rb:68:1:77:3 | exit m7 | raise.rb:76:3:76:15 | [ensure: raise] self | 0 |
+| raise.rb:68:1:77:3 | exit m7 | raise.rb:68:1:77:3 | exit m7 (normal) | 0 |
+| raise.rb:68:1:77:3 | exit m7 | raise.rb:76:3:76:15 | [ensure: exception] self | 1 |
 | raise.rb:68:1:77:3 | exit m7 (normal) | raise.rb:72:13:72:17 | x < 0 | 0 |
 | raise.rb:68:1:77:3 | exit m7 (normal) | raise.rb:76:3:76:15 | self | 1 |
-| raise.rb:76:3:76:15 | [ensure: raise] self | raise.rb:68:1:77:3 | enter m7 | 0 |
-| raise.rb:76:3:76:15 | [ensure: raise] self | raise.rb:70:5:70:17 | self | 1 |
-| raise.rb:76:3:76:15 | [ensure: raise] self | raise.rb:71:3:72:18 | elsif ... | 2 |
-| raise.rb:76:3:76:15 | [ensure: raise] self | raise.rb:71:9:71:9 | x | 3 |
-| raise.rb:79:1:92:3 | exit m8 | raise.rb:89:5:89:17 | [ensure: raise] self | 0 |
+| raise.rb:76:3:76:15 | [ensure: exception] self | raise.rb:68:1:77:3 | enter m7 | 0 |
+| raise.rb:76:3:76:15 | [ensure: exception] self | raise.rb:70:5:70:17 | self | 1 |
+| raise.rb:76:3:76:15 | [ensure: exception] self | raise.rb:71:3:72:18 | elsif ... | 2 |
+| raise.rb:76:3:76:15 | [ensure: exception] self | raise.rb:71:9:71:9 | x | 3 |
+| raise.rb:79:1:92:3 | exit m8 | raise.rb:79:1:92:3 | exit m8 (normal) | 0 |
+| raise.rb:79:1:92:3 | exit m8 | raise.rb:89:5:89:17 | [ensure: exception] self | 1 |
 | raise.rb:79:1:92:3 | exit m8 (normal) | raise.rb:85:15:85:19 | x < 0 | 0 |
 | raise.rb:79:1:92:3 | exit m8 (normal) | raise.rb:89:5:89:17 | self | 1 |
-| raise.rb:89:5:89:17 | [ensure: raise] self | raise.rb:79:1:92:3 | enter m8 | 0 |
-| raise.rb:89:5:89:17 | [ensure: raise] self | raise.rb:83:7:83:19 | self | 1 |
-| raise.rb:89:5:89:17 | [ensure: raise] self | raise.rb:84:5:85:20 | elsif ... | 2 |
-| raise.rb:89:5:89:17 | [ensure: raise] self | raise.rb:84:11:84:11 | x | 3 |
-| raise.rb:94:1:119:3 | exit m9 (abnormal) | raise.rb:116:3:118:5 | [ensure: raise] if ... | 0 |
-| raise.rb:94:1:119:3 | exit m9 (abnormal) | raise.rb:117:5:117:22 | [ensure: raise] self | 2 |
+| raise.rb:89:5:89:17 | [ensure: exception] self | raise.rb:79:1:92:3 | enter m8 | 0 |
+| raise.rb:89:5:89:17 | [ensure: exception] self | raise.rb:83:7:83:19 | self | 1 |
+| raise.rb:89:5:89:17 | [ensure: exception] self | raise.rb:84:5:85:20 | elsif ... | 2 |
+| raise.rb:89:5:89:17 | [ensure: exception] self | raise.rb:84:11:84:11 | x | 3 |
+| raise.rb:94:1:119:3 | exit m9 | raise.rb:94:1:119:3 | exit m9 (abnormal) | 1 |
+| raise.rb:94:1:119:3 | exit m9 | raise.rb:94:1:119:3 | exit m9 (normal) | 0 |
+| raise.rb:94:1:119:3 | exit m9 (abnormal) | raise.rb:116:3:118:5 | [ensure: exception] if ... | 0 |
+| raise.rb:94:1:119:3 | exit m9 (abnormal) | raise.rb:117:5:117:22 | [ensure: exception] self | 2 |
 | raise.rb:94:1:119:3 | exit m9 (abnormal) | raise.rb:117:5:117:22 | [ensure: return] self | 3 |
 | raise.rb:94:1:119:3 | exit m9 (abnormal) | raise.rb:117:5:117:22 | self | 1 |
 | raise.rb:94:1:119:3 | exit m9 (normal) | raise.rb:116:3:118:5 | [ensure: return] if ... | 1 |
 | raise.rb:94:1:119:3 | exit m9 (normal) | raise.rb:116:3:118:5 | if ... | 0 |
-| raise.rb:104:5:104:23 | [ensure: raise] self | raise.rb:97:8:97:8 | x | 0 |
-| raise.rb:104:5:104:23 | [ensure: raise] self | raise.rb:98:7:98:19 | self | 1 |
-| raise.rb:104:5:104:23 | [ensure: raise] self | raise.rb:99:5:100:20 | elsif ... | 2 |
-| raise.rb:104:5:104:23 | [ensure: raise] self | raise.rb:99:11:99:11 | x | 3 |
-| raise.rb:115:3:115:22 | [ensure: raise] self | raise.rb:94:1:119:3 | enter m9 | 0 |
-| raise.rb:115:3:115:22 | [ensure: raise] self | raise.rb:100:15:100:19 | x < 0 | 1 |
-| raise.rb:115:3:115:22 | [ensure: raise] self | raise.rb:104:5:104:23 | [ensure: raise] self | 3 |
-| raise.rb:115:3:115:22 | [ensure: raise] self | raise.rb:104:5:104:23 | self | 2 |
-| raise.rb:115:3:115:22 | [ensure: raise] self | raise.rb:106:7:108:9 | [ensure: raise] if ... | 5 |
-| raise.rb:115:3:115:22 | [ensure: raise] self | raise.rb:106:7:108:9 | [ensure: return] if ... | 6 |
-| raise.rb:115:3:115:22 | [ensure: raise] self | raise.rb:106:7:108:9 | if ... | 4 |
-| raise.rb:115:3:115:22 | [ensure: raise] self | raise.rb:107:9:107:26 | [ensure: raise] self | 8 |
-| raise.rb:115:3:115:22 | [ensure: raise] self | raise.rb:107:9:107:26 | [ensure: return] self | 9 |
-| raise.rb:115:3:115:22 | [ensure: raise] self | raise.rb:107:9:107:26 | self | 7 |
-| raise.rb:115:3:115:22 | [ensure: raise] self | raise.rb:109:5:110:25 | [ensure(1): raise] ensure ... | 11 |
-| raise.rb:115:3:115:22 | [ensure: raise] self | raise.rb:109:5:110:25 | [ensure: raise, ensure(1): raise] ensure ... | 13 |
-| raise.rb:115:3:115:22 | [ensure: raise] self | raise.rb:109:5:110:25 | [ensure: raise] ensure ... | 12 |
-| raise.rb:115:3:115:22 | [ensure: raise] self | raise.rb:109:5:110:25 | [ensure: return, ensure(1): raise] ensure ... | 14 |
-| raise.rb:115:3:115:22 | [ensure: raise] self | raise.rb:109:5:110:25 | ensure ... | 10 |
+| raise.rb:104:5:104:23 | [ensure: exception] self | raise.rb:97:8:97:8 | x | 0 |
+| raise.rb:104:5:104:23 | [ensure: exception] self | raise.rb:98:7:98:19 | self | 1 |
+| raise.rb:104:5:104:23 | [ensure: exception] self | raise.rb:99:5:100:20 | elsif ... | 2 |
+| raise.rb:104:5:104:23 | [ensure: exception] self | raise.rb:99:11:99:11 | x | 3 |
+| raise.rb:115:3:115:22 | [ensure: exception] self | raise.rb:94:1:119:3 | enter m9 | 0 |
+| raise.rb:115:3:115:22 | [ensure: exception] self | raise.rb:100:15:100:19 | x < 0 | 1 |
+| raise.rb:115:3:115:22 | [ensure: exception] self | raise.rb:104:5:104:23 | [ensure: exception] self | 3 |
+| raise.rb:115:3:115:22 | [ensure: exception] self | raise.rb:104:5:104:23 | self | 2 |
+| raise.rb:115:3:115:22 | [ensure: exception] self | raise.rb:106:7:108:9 | [ensure: exception] if ... | 5 |
+| raise.rb:115:3:115:22 | [ensure: exception] self | raise.rb:106:7:108:9 | [ensure: return] if ... | 6 |
+| raise.rb:115:3:115:22 | [ensure: exception] self | raise.rb:106:7:108:9 | if ... | 4 |
+| raise.rb:115:3:115:22 | [ensure: exception] self | raise.rb:107:9:107:26 | [ensure: exception] self | 8 |
+| raise.rb:115:3:115:22 | [ensure: exception] self | raise.rb:107:9:107:26 | [ensure: return] self | 9 |
+| raise.rb:115:3:115:22 | [ensure: exception] self | raise.rb:107:9:107:26 | self | 7 |
+| raise.rb:115:3:115:22 | [ensure: exception] self | raise.rb:109:5:110:25 | [ensure(1): exception] ensure ... | 11 |
+| raise.rb:115:3:115:22 | [ensure: exception] self | raise.rb:109:5:110:25 | [ensure: exception, ensure(1): exception] ensure ... | 13 |
+| raise.rb:115:3:115:22 | [ensure: exception] self | raise.rb:109:5:110:25 | [ensure: exception] ensure ... | 12 |
+| raise.rb:115:3:115:22 | [ensure: exception] self | raise.rb:109:5:110:25 | [ensure: return, ensure(1): exception] ensure ... | 14 |
+| raise.rb:115:3:115:22 | [ensure: exception] self | raise.rb:109:5:110:25 | ensure ... | 10 |
 | raise.rb:121:1:126:3 | exit m10 | raise.rb:121:14:121:30 | self | 0 |
 | raise.rb:121:1:126:3 | exit m10 | raise.rb:125:3:125:51 | self | 1 |
-| raise.rb:128:1:140:3 | exit m11 | raise.rb:137:5:137:17 | [ensure: raise] self | 1 |
+| raise.rb:128:1:140:3 | exit m11 | raise.rb:137:5:137:17 | [ensure: exception] self | 1 |
 | raise.rb:128:1:140:3 | exit m11 | raise.rb:137:5:137:17 | self | 0 |
 | raise.rb:137:5:137:17 | self | raise.rb:130:5:132:7 | if ... | 0 |
 | raise.rb:137:5:137:17 | self | raise.rb:133:3:133:19 | rescue ... | 1 |
@@ -6520,6 +6534,8 @@ joinBlockPredecessor
 | raise.rb:155:16:155:50 | exit { ... } | raise.rb:155:25:155:48 | ... if ... | 0 |
 | raise.rb:160:9:162:7 | exit -> { ... } | raise.rb:161:7:161:14 | self | 1 |
 | raise.rb:160:9:162:7 | exit -> { ... } | raise.rb:161:7:161:23 | ... unless ... | 0 |
+| raise.rb:172:1:182:3 | exit m16 | raise.rb:172:1:182:3 | exit m16 (abnormal) | 1 |
+| raise.rb:172:1:182:3 | exit m16 | raise.rb:172:1:182:3 | exit m16 (normal) | 0 |
 | raise.rb:172:1:182:3 | exit m16 (normal) | raise.rb:175:14:175:14 | 1 | 0 |
 | raise.rb:172:1:182:3 | exit m16 (normal) | raise.rb:177:14:177:14 | 2 | 1 |
 | raise.rb:172:1:182:3 | exit m16 (normal) | raise.rb:180:12:180:12 | 3 | 2 |
diff --git a/ruby/ql/test/library-tests/controlflow/graph/BasicBlocks.ql b/ruby/ql/test/library-tests/controlflow/graph/BasicBlocks.ql
index e7879fa600a..c99de9bc0a8 100644
--- a/ruby/ql/test/library-tests/controlflow/graph/BasicBlocks.ql
+++ b/ruby/ql/test/library-tests/controlflow/graph/BasicBlocks.ql
@@ -1,4 +1,3 @@
-import ruby
 import codeql.ruby.controlflow.ControlFlowGraph
 import codeql.ruby.controlflow.BasicBlocks
 
@@ -10,7 +9,7 @@ query predicate immediateDominator(BasicBlock bb1, BasicBlock bb2) {
   bb1.getImmediateDominator() = bb2
 }
 
-query predicate controls(ConditionBlock bb1, BasicBlock bb2, SuccessorTypes::ConditionalSuccessor t) {
+query predicate controls(ConditionBlock bb1, BasicBlock bb2, ConditionalSuccessor t) {
   bb1.edgeDominates(bb2, t)
 }
 
diff --git a/ruby/ql/test/library-tests/controlflow/graph/Cfg.expected b/ruby/ql/test/library-tests/controlflow/graph/Cfg.expected
index 243e107906a..583ca5d46a8 100644
--- a/ruby/ql/test/library-tests/controlflow/graph/Cfg.expected
+++ b/ruby/ql/test/library-tests/controlflow/graph/Cfg.expected
@@ -9,37 +9,37 @@
 | break_ensure.rb:2:9:2:9 | x | break_ensure.rb:2:13:2:13 | 0 |  |
 | break_ensure.rb:2:9:2:13 | ... < ... | break_ensure.rb:2:3:6:5 | while ... | false |
 | break_ensure.rb:2:9:2:13 | ... < ... | break_ensure.rb:3:8:3:8 | x | true |
-| break_ensure.rb:2:9:2:13 | ... < ... | break_ensure.rb:8:6:8:13 | [ensure: raise] self | raise |
+| break_ensure.rb:2:9:2:13 | ... < ... | break_ensure.rb:8:6:8:13 | [ensure: exception] self | exception |
 | break_ensure.rb:2:13:2:13 | 0 | break_ensure.rb:2:9:2:13 | ... < ... |  |
 | break_ensure.rb:2:14:6:5 | do ... | break_ensure.rb:2:9:2:9 | x |  |
 | break_ensure.rb:3:5:5:7 | if ... | break_ensure.rb:2:14:6:5 | do ... |  |
 | break_ensure.rb:3:8:3:8 | x | break_ensure.rb:3:12:3:12 | 0 |  |
-| break_ensure.rb:3:8:3:12 | ... > ... | break_ensure.rb:2:3:6:5 | while ... | raise |
+| break_ensure.rb:3:8:3:12 | ... > ... | break_ensure.rb:2:3:6:5 | while ... | exception |
 | break_ensure.rb:3:8:3:12 | ... > ... | break_ensure.rb:3:5:5:7 | if ... | false |
 | break_ensure.rb:3:8:3:12 | ... > ... | break_ensure.rb:4:7:4:11 | break | true |
 | break_ensure.rb:3:12:3:12 | 0 | break_ensure.rb:3:8:3:12 | ... > ... |  |
 | break_ensure.rb:4:7:4:11 | break | break_ensure.rb:2:3:6:5 | while ... | break |
-| break_ensure.rb:7:1:10:5 | [ensure: raise] ensure ... | break_ensure.rb:1:1:11:3 | exit m1 (abnormal) | raise |
+| break_ensure.rb:7:1:10:5 | [ensure: exception] ensure ... | break_ensure.rb:1:1:11:3 | exit m1 (abnormal) | exception |
 | break_ensure.rb:7:1:10:5 | ensure ... | break_ensure.rb:1:1:11:3 | exit m1 (normal) |  |
-| break_ensure.rb:8:3:10:5 | [ensure: raise] if ... | break_ensure.rb:7:1:10:5 | [ensure: raise] ensure ... |  |
+| break_ensure.rb:8:3:10:5 | [ensure: exception] if ... | break_ensure.rb:7:1:10:5 | [ensure: exception] ensure ... |  |
 | break_ensure.rb:8:3:10:5 | if ... | break_ensure.rb:7:1:10:5 | ensure ... |  |
-| break_ensure.rb:8:6:8:13 | [ensure: raise] call to elements | break_ensure.rb:8:6:8:18 | [ensure: raise] call to nil? |  |
-| break_ensure.rb:8:6:8:13 | [ensure: raise] self | break_ensure.rb:8:6:8:13 | [ensure: raise] call to elements |  |
+| break_ensure.rb:8:6:8:13 | [ensure: exception] call to elements | break_ensure.rb:8:6:8:18 | [ensure: exception] call to nil? |  |
+| break_ensure.rb:8:6:8:13 | [ensure: exception] self | break_ensure.rb:8:6:8:13 | [ensure: exception] call to elements |  |
 | break_ensure.rb:8:6:8:13 | call to elements | break_ensure.rb:8:6:8:18 | call to nil? |  |
 | break_ensure.rb:8:6:8:13 | self | break_ensure.rb:8:6:8:13 | call to elements |  |
-| break_ensure.rb:8:6:8:18 | [ensure: raise] call to nil? | break_ensure.rb:8:3:10:5 | [ensure: raise] if ... | false |
-| break_ensure.rb:8:6:8:18 | [ensure: raise] call to nil? | break_ensure.rb:9:5:9:23 | [ensure: raise] self | true |
+| break_ensure.rb:8:6:8:18 | [ensure: exception] call to nil? | break_ensure.rb:8:3:10:5 | [ensure: exception] if ... | false |
+| break_ensure.rb:8:6:8:18 | [ensure: exception] call to nil? | break_ensure.rb:9:5:9:23 | [ensure: exception] self | true |
 | break_ensure.rb:8:6:8:18 | call to nil? | break_ensure.rb:8:3:10:5 | if ... | false |
 | break_ensure.rb:8:6:8:18 | call to nil? | break_ensure.rb:9:5:9:23 | self | true |
-| break_ensure.rb:8:20:9:23 | [ensure: raise] then ... | break_ensure.rb:8:3:10:5 | [ensure: raise] if ... |  |
+| break_ensure.rb:8:20:9:23 | [ensure: exception] then ... | break_ensure.rb:8:3:10:5 | [ensure: exception] if ... |  |
 | break_ensure.rb:8:20:9:23 | then ... | break_ensure.rb:8:3:10:5 | if ... |  |
-| break_ensure.rb:9:5:9:23 | [ensure: raise] call to puts | break_ensure.rb:8:20:9:23 | [ensure: raise] then ... |  |
-| break_ensure.rb:9:5:9:23 | [ensure: raise] self | break_ensure.rb:9:11:9:22 | [ensure: raise] elements nil |  |
+| break_ensure.rb:9:5:9:23 | [ensure: exception] call to puts | break_ensure.rb:8:20:9:23 | [ensure: exception] then ... |  |
+| break_ensure.rb:9:5:9:23 | [ensure: exception] self | break_ensure.rb:9:11:9:22 | [ensure: exception] elements nil |  |
 | break_ensure.rb:9:5:9:23 | call to puts | break_ensure.rb:8:20:9:23 | then ... |  |
 | break_ensure.rb:9:5:9:23 | self | break_ensure.rb:9:11:9:22 | elements nil |  |
 | break_ensure.rb:9:10:9:23 | "elements nil" | break_ensure.rb:9:5:9:23 | call to puts |  |
-| break_ensure.rb:9:10:9:23 | [ensure: raise] "elements nil" | break_ensure.rb:9:5:9:23 | [ensure: raise] call to puts |  |
-| break_ensure.rb:9:11:9:22 | [ensure: raise] elements nil | break_ensure.rb:9:10:9:23 | [ensure: raise] "elements nil" |  |
+| break_ensure.rb:9:10:9:23 | [ensure: exception] "elements nil" | break_ensure.rb:9:5:9:23 | [ensure: exception] call to puts |  |
+| break_ensure.rb:9:11:9:22 | [ensure: exception] elements nil | break_ensure.rb:9:10:9:23 | [ensure: exception] "elements nil" |  |
 | break_ensure.rb:9:11:9:22 | elements nil | break_ensure.rb:9:10:9:23 | "elements nil" |  |
 | break_ensure.rb:13:1:25:3 | enter m2 | break_ensure.rb:13:8:13:8 | x |  |
 | break_ensure.rb:13:1:25:3 | exit m2 (normal) | break_ensure.rb:13:1:25:3 | exit m2 |  |
@@ -56,38 +56,38 @@
 | break_ensure.rb:16:10:16:10 | x | break_ensure.rb:16:14:16:14 | 0 |  |
 | break_ensure.rb:16:10:16:14 | ... > ... | break_ensure.rb:16:7:18:9 | if ... | false |
 | break_ensure.rb:16:10:16:14 | ... > ... | break_ensure.rb:17:9:17:13 | break | true |
-| break_ensure.rb:16:10:16:14 | ... > ... | break_ensure.rb:20:10:20:10 | [ensure: raise] y | raise |
+| break_ensure.rb:16:10:16:14 | ... > ... | break_ensure.rb:20:10:20:10 | [ensure: exception] y | exception |
 | break_ensure.rb:16:14:16:14 | 0 | break_ensure.rb:16:10:16:14 | ... > ... |  |
 | break_ensure.rb:17:9:17:13 | break | break_ensure.rb:20:10:20:10 | [ensure: break] y | break |
 | break_ensure.rb:19:5:22:9 | [ensure: break] ensure ... | break_ensure.rb:14:3:24:5 | while ... | break |
-| break_ensure.rb:19:5:22:9 | [ensure: raise] ensure ... | break_ensure.rb:14:3:24:5 | while ... | raise |
+| break_ensure.rb:19:5:22:9 | [ensure: exception] ensure ... | break_ensure.rb:14:3:24:5 | while ... | exception |
 | break_ensure.rb:19:5:22:9 | ensure ... | break_ensure.rb:14:14:24:5 | do ... |  |
 | break_ensure.rb:20:7:22:9 | [ensure: break] if ... | break_ensure.rb:19:5:22:9 | [ensure: break] ensure ... |  |
-| break_ensure.rb:20:7:22:9 | [ensure: raise] if ... | break_ensure.rb:19:5:22:9 | [ensure: raise] ensure ... |  |
+| break_ensure.rb:20:7:22:9 | [ensure: exception] if ... | break_ensure.rb:19:5:22:9 | [ensure: exception] ensure ... |  |
 | break_ensure.rb:20:7:22:9 | if ... | break_ensure.rb:19:5:22:9 | ensure ... |  |
 | break_ensure.rb:20:10:20:10 | [ensure: break] y | break_ensure.rb:20:10:20:15 | [ensure: break] call to nil? |  |
-| break_ensure.rb:20:10:20:10 | [ensure: raise] y | break_ensure.rb:20:10:20:15 | [ensure: raise] call to nil? |  |
+| break_ensure.rb:20:10:20:10 | [ensure: exception] y | break_ensure.rb:20:10:20:15 | [ensure: exception] call to nil? |  |
 | break_ensure.rb:20:10:20:10 | y | break_ensure.rb:20:10:20:15 | call to nil? |  |
 | break_ensure.rb:20:10:20:15 | [ensure: break] call to nil? | break_ensure.rb:20:7:22:9 | [ensure: break] if ... | false |
 | break_ensure.rb:20:10:20:15 | [ensure: break] call to nil? | break_ensure.rb:21:9:21:20 | [ensure: break] self | true |
-| break_ensure.rb:20:10:20:15 | [ensure: raise] call to nil? | break_ensure.rb:20:7:22:9 | [ensure: raise] if ... | false |
-| break_ensure.rb:20:10:20:15 | [ensure: raise] call to nil? | break_ensure.rb:21:9:21:20 | [ensure: raise] self | true |
+| break_ensure.rb:20:10:20:15 | [ensure: exception] call to nil? | break_ensure.rb:20:7:22:9 | [ensure: exception] if ... | false |
+| break_ensure.rb:20:10:20:15 | [ensure: exception] call to nil? | break_ensure.rb:21:9:21:20 | [ensure: exception] self | true |
 | break_ensure.rb:20:10:20:15 | call to nil? | break_ensure.rb:20:7:22:9 | if ... | false |
 | break_ensure.rb:20:10:20:15 | call to nil? | break_ensure.rb:21:9:21:20 | self | true |
 | break_ensure.rb:20:17:21:20 | [ensure: break] then ... | break_ensure.rb:20:7:22:9 | [ensure: break] if ... |  |
-| break_ensure.rb:20:17:21:20 | [ensure: raise] then ... | break_ensure.rb:20:7:22:9 | [ensure: raise] if ... |  |
+| break_ensure.rb:20:17:21:20 | [ensure: exception] then ... | break_ensure.rb:20:7:22:9 | [ensure: exception] if ... |  |
 | break_ensure.rb:20:17:21:20 | then ... | break_ensure.rb:20:7:22:9 | if ... |  |
 | break_ensure.rb:21:9:21:20 | [ensure: break] call to puts | break_ensure.rb:20:17:21:20 | [ensure: break] then ... |  |
 | break_ensure.rb:21:9:21:20 | [ensure: break] self | break_ensure.rb:21:15:21:19 | [ensure: break] y nil |  |
-| break_ensure.rb:21:9:21:20 | [ensure: raise] call to puts | break_ensure.rb:20:17:21:20 | [ensure: raise] then ... |  |
-| break_ensure.rb:21:9:21:20 | [ensure: raise] self | break_ensure.rb:21:15:21:19 | [ensure: raise] y nil |  |
+| break_ensure.rb:21:9:21:20 | [ensure: exception] call to puts | break_ensure.rb:20:17:21:20 | [ensure: exception] then ... |  |
+| break_ensure.rb:21:9:21:20 | [ensure: exception] self | break_ensure.rb:21:15:21:19 | [ensure: exception] y nil |  |
 | break_ensure.rb:21:9:21:20 | call to puts | break_ensure.rb:20:17:21:20 | then ... |  |
 | break_ensure.rb:21:9:21:20 | self | break_ensure.rb:21:15:21:19 | y nil |  |
 | break_ensure.rb:21:14:21:20 | "y nil" | break_ensure.rb:21:9:21:20 | call to puts |  |
 | break_ensure.rb:21:14:21:20 | [ensure: break] "y nil" | break_ensure.rb:21:9:21:20 | [ensure: break] call to puts |  |
-| break_ensure.rb:21:14:21:20 | [ensure: raise] "y nil" | break_ensure.rb:21:9:21:20 | [ensure: raise] call to puts |  |
+| break_ensure.rb:21:14:21:20 | [ensure: exception] "y nil" | break_ensure.rb:21:9:21:20 | [ensure: exception] call to puts |  |
 | break_ensure.rb:21:15:21:19 | [ensure: break] y nil | break_ensure.rb:21:14:21:20 | [ensure: break] "y nil" |  |
-| break_ensure.rb:21:15:21:19 | [ensure: raise] y nil | break_ensure.rb:21:14:21:20 | [ensure: raise] "y nil" |  |
+| break_ensure.rb:21:15:21:19 | [ensure: exception] y nil | break_ensure.rb:21:14:21:20 | [ensure: exception] "y nil" |  |
 | break_ensure.rb:21:15:21:19 | y nil | break_ensure.rb:21:14:21:20 | "y nil" |  |
 | break_ensure.rb:27:1:42:3 | enter m3 | break_ensure.rb:27:8:27:8 | x |  |
 | break_ensure.rb:27:1:42:3 | exit m3 (abnormal) | break_ensure.rb:27:1:42:3 | exit m3 |  |
@@ -99,45 +99,45 @@
 | break_ensure.rb:29:8:29:8 | x | break_ensure.rb:29:8:29:13 | call to nil? |  |
 | break_ensure.rb:29:8:29:13 | call to nil? | break_ensure.rb:29:5:31:7 | if ... | false |
 | break_ensure.rb:29:8:29:13 | call to nil? | break_ensure.rb:30:7:30:12 | return | true |
-| break_ensure.rb:29:8:29:13 | call to nil? | break_ensure.rb:33:11:33:11 | [ensure: raise] y | raise |
+| break_ensure.rb:29:8:29:13 | call to nil? | break_ensure.rb:33:11:33:11 | [ensure: exception] y | exception |
 | break_ensure.rb:30:7:30:12 | return | break_ensure.rb:33:11:33:11 | [ensure: return] y | return |
-| break_ensure.rb:32:3:39:7 | [ensure: raise] ensure ... | break_ensure.rb:27:1:42:3 | exit m3 (abnormal) | raise |
+| break_ensure.rb:32:3:39:7 | [ensure: exception] ensure ... | break_ensure.rb:27:1:42:3 | exit m3 (abnormal) | exception |
 | break_ensure.rb:32:3:39:7 | [ensure: return] ensure ... | break_ensure.rb:27:1:42:3 | exit m3 (normal) | return |
 | break_ensure.rb:32:3:39:7 | ensure ... | break_ensure.rb:41:3:41:13 | self |  |
-| break_ensure.rb:33:5:39:7 | [ensure: raise] while ... | break_ensure.rb:32:3:39:7 | [ensure: raise] ensure ... |  |
+| break_ensure.rb:33:5:39:7 | [ensure: exception] while ... | break_ensure.rb:32:3:39:7 | [ensure: exception] ensure ... |  |
 | break_ensure.rb:33:5:39:7 | [ensure: return] while ... | break_ensure.rb:32:3:39:7 | [ensure: return] ensure ... |  |
 | break_ensure.rb:33:5:39:7 | while ... | break_ensure.rb:32:3:39:7 | ensure ... |  |
-| break_ensure.rb:33:11:33:11 | [ensure: raise] y | break_ensure.rb:33:15:33:15 | [ensure: raise] 0 |  |
+| break_ensure.rb:33:11:33:11 | [ensure: exception] y | break_ensure.rb:33:15:33:15 | [ensure: exception] 0 |  |
 | break_ensure.rb:33:11:33:11 | [ensure: return] y | break_ensure.rb:33:15:33:15 | [ensure: return] 0 |  |
 | break_ensure.rb:33:11:33:11 | y | break_ensure.rb:33:15:33:15 | 0 |  |
 | break_ensure.rb:33:11:33:15 | ... < ... | break_ensure.rb:33:5:39:7 | while ... | false |
 | break_ensure.rb:33:11:33:15 | ... < ... | break_ensure.rb:35:12:35:12 | x | true |
-| break_ensure.rb:33:11:33:15 | [ensure: raise] ... < ... | break_ensure.rb:33:5:39:7 | [ensure: raise] while ... | false |
-| break_ensure.rb:33:11:33:15 | [ensure: raise] ... < ... | break_ensure.rb:35:12:35:12 | [ensure: raise] x | true |
+| break_ensure.rb:33:11:33:15 | [ensure: exception] ... < ... | break_ensure.rb:33:5:39:7 | [ensure: exception] while ... | false |
+| break_ensure.rb:33:11:33:15 | [ensure: exception] ... < ... | break_ensure.rb:35:12:35:12 | [ensure: exception] x | true |
 | break_ensure.rb:33:11:33:15 | [ensure: return] ... < ... | break_ensure.rb:33:5:39:7 | [ensure: return] while ... | false |
 | break_ensure.rb:33:11:33:15 | [ensure: return] ... < ... | break_ensure.rb:35:12:35:12 | [ensure: return] x | true |
 | break_ensure.rb:33:15:33:15 | 0 | break_ensure.rb:33:11:33:15 | ... < ... |  |
-| break_ensure.rb:33:15:33:15 | [ensure: raise] 0 | break_ensure.rb:33:11:33:15 | [ensure: raise] ... < ... |  |
+| break_ensure.rb:33:15:33:15 | [ensure: exception] 0 | break_ensure.rb:33:11:33:15 | [ensure: exception] ... < ... |  |
 | break_ensure.rb:33:15:33:15 | [ensure: return] 0 | break_ensure.rb:33:11:33:15 | [ensure: return] ... < ... |  |
-| break_ensure.rb:33:16:39:7 | [ensure: raise] do ... | break_ensure.rb:33:11:33:11 | [ensure: raise] y |  |
+| break_ensure.rb:33:16:39:7 | [ensure: exception] do ... | break_ensure.rb:33:11:33:11 | [ensure: exception] y |  |
 | break_ensure.rb:33:16:39:7 | [ensure: return] do ... | break_ensure.rb:33:11:33:11 | [ensure: return] y |  |
 | break_ensure.rb:33:16:39:7 | do ... | break_ensure.rb:33:11:33:11 | y |  |
-| break_ensure.rb:35:9:37:11 | [ensure: raise] if ... | break_ensure.rb:33:16:39:7 | [ensure: raise] do ... |  |
+| break_ensure.rb:35:9:37:11 | [ensure: exception] if ... | break_ensure.rb:33:16:39:7 | [ensure: exception] do ... |  |
 | break_ensure.rb:35:9:37:11 | [ensure: return] if ... | break_ensure.rb:33:16:39:7 | [ensure: return] do ... |  |
 | break_ensure.rb:35:9:37:11 | if ... | break_ensure.rb:33:16:39:7 | do ... |  |
-| break_ensure.rb:35:12:35:12 | [ensure: raise] x | break_ensure.rb:35:16:35:16 | [ensure: raise] 0 |  |
+| break_ensure.rb:35:12:35:12 | [ensure: exception] x | break_ensure.rb:35:16:35:16 | [ensure: exception] 0 |  |
 | break_ensure.rb:35:12:35:12 | [ensure: return] x | break_ensure.rb:35:16:35:16 | [ensure: return] 0 |  |
 | break_ensure.rb:35:12:35:12 | x | break_ensure.rb:35:16:35:16 | 0 |  |
 | break_ensure.rb:35:12:35:16 | ... > ... | break_ensure.rb:35:9:37:11 | if ... | false |
 | break_ensure.rb:35:12:35:16 | ... > ... | break_ensure.rb:36:11:36:15 | break | true |
-| break_ensure.rb:35:12:35:16 | [ensure: raise] ... > ... | break_ensure.rb:35:9:37:11 | [ensure: raise] if ... | false |
-| break_ensure.rb:35:12:35:16 | [ensure: raise] ... > ... | break_ensure.rb:36:11:36:15 | [ensure: raise] break | true |
+| break_ensure.rb:35:12:35:16 | [ensure: exception] ... > ... | break_ensure.rb:35:9:37:11 | [ensure: exception] if ... | false |
+| break_ensure.rb:35:12:35:16 | [ensure: exception] ... > ... | break_ensure.rb:36:11:36:15 | [ensure: exception] break | true |
 | break_ensure.rb:35:12:35:16 | [ensure: return] ... > ... | break_ensure.rb:35:9:37:11 | [ensure: return] if ... | false |
 | break_ensure.rb:35:12:35:16 | [ensure: return] ... > ... | break_ensure.rb:36:11:36:15 | [ensure: return] break | true |
 | break_ensure.rb:35:16:35:16 | 0 | break_ensure.rb:35:12:35:16 | ... > ... |  |
-| break_ensure.rb:35:16:35:16 | [ensure: raise] 0 | break_ensure.rb:35:12:35:16 | [ensure: raise] ... > ... |  |
+| break_ensure.rb:35:16:35:16 | [ensure: exception] 0 | break_ensure.rb:35:12:35:16 | [ensure: exception] ... > ... |  |
 | break_ensure.rb:35:16:35:16 | [ensure: return] 0 | break_ensure.rb:35:12:35:16 | [ensure: return] ... > ... |  |
-| break_ensure.rb:36:11:36:15 | [ensure: raise] break | break_ensure.rb:33:5:39:7 | [ensure: raise] while ... | break |
+| break_ensure.rb:36:11:36:15 | [ensure: exception] break | break_ensure.rb:33:5:39:7 | [ensure: exception] while ... | break |
 | break_ensure.rb:36:11:36:15 | [ensure: return] break | break_ensure.rb:33:5:39:7 | [ensure: return] while ... | break |
 | break_ensure.rb:36:11:36:15 | break | break_ensure.rb:33:5:39:7 | while ... | break |
 | break_ensure.rb:41:3:41:13 | call to puts | break_ensure.rb:27:1:42:3 | exit m3 (normal) |  |
@@ -158,27 +158,27 @@
 | break_ensure.rb:47:10:47:10 | x | break_ensure.rb:47:14:47:14 | 1 |  |
 | break_ensure.rb:47:10:47:14 | ... > ... | break_ensure.rb:47:7:49:9 | if ... | false |
 | break_ensure.rb:47:10:47:14 | ... > ... | break_ensure.rb:48:9:48:16 | self | true |
-| break_ensure.rb:47:10:47:14 | ... > ... | break_ensure.rb:51:10:51:10 | [ensure: raise] x | raise |
+| break_ensure.rb:47:10:47:14 | ... > ... | break_ensure.rb:51:10:51:10 | [ensure: exception] x | exception |
 | break_ensure.rb:47:14:47:14 | 1 | break_ensure.rb:47:10:47:14 | ... > ... |  |
-| break_ensure.rb:48:9:48:16 | call to raise | break_ensure.rb:51:10:51:10 | [ensure: raise] x | raise |
+| break_ensure.rb:48:9:48:16 | call to raise | break_ensure.rb:51:10:51:10 | [ensure: exception] x | exception |
 | break_ensure.rb:48:9:48:16 | self | break_ensure.rb:48:15:48:16 | "" |  |
 | break_ensure.rb:48:15:48:16 | "" | break_ensure.rb:48:9:48:16 | call to raise |  |
-| break_ensure.rb:50:5:53:9 | [ensure: raise] ensure ... | break_ensure.rb:45:3:55:5 | while ... | raise |
+| break_ensure.rb:50:5:53:9 | [ensure: exception] ensure ... | break_ensure.rb:45:3:55:5 | while ... | exception |
 | break_ensure.rb:50:5:53:9 | ensure ... | break_ensure.rb:45:14:55:5 | do ... |  |
-| break_ensure.rb:51:7:53:9 | [ensure: raise] if ... | break_ensure.rb:50:5:53:9 | [ensure: raise] ensure ... |  |
+| break_ensure.rb:51:7:53:9 | [ensure: exception] if ... | break_ensure.rb:50:5:53:9 | [ensure: exception] ensure ... |  |
 | break_ensure.rb:51:7:53:9 | if ... | break_ensure.rb:50:5:53:9 | ensure ... |  |
-| break_ensure.rb:51:10:51:10 | [ensure: raise] x | break_ensure.rb:51:14:51:14 | [ensure: raise] 0 |  |
+| break_ensure.rb:51:10:51:10 | [ensure: exception] x | break_ensure.rb:51:14:51:14 | [ensure: exception] 0 |  |
 | break_ensure.rb:51:10:51:10 | x | break_ensure.rb:51:14:51:14 | 0 |  |
 | break_ensure.rb:51:10:51:14 | ... > ... | break_ensure.rb:51:7:53:9 | if ... | false |
 | break_ensure.rb:51:10:51:14 | ... > ... | break_ensure.rb:52:15:52:16 | 10 | true |
-| break_ensure.rb:51:10:51:14 | [ensure: raise] ... > ... | break_ensure.rb:51:7:53:9 | [ensure: raise] if ... | false |
-| break_ensure.rb:51:10:51:14 | [ensure: raise] ... > ... | break_ensure.rb:52:15:52:16 | [ensure: raise] 10 | true |
+| break_ensure.rb:51:10:51:14 | [ensure: exception] ... > ... | break_ensure.rb:51:7:53:9 | [ensure: exception] if ... | false |
+| break_ensure.rb:51:10:51:14 | [ensure: exception] ... > ... | break_ensure.rb:52:15:52:16 | [ensure: exception] 10 | true |
 | break_ensure.rb:51:14:51:14 | 0 | break_ensure.rb:51:10:51:14 | ... > ... |  |
-| break_ensure.rb:51:14:51:14 | [ensure: raise] 0 | break_ensure.rb:51:10:51:14 | [ensure: raise] ... > ... |  |
-| break_ensure.rb:52:9:52:16 | [ensure: raise] break | break_ensure.rb:45:3:55:5 | while ... | break |
+| break_ensure.rb:51:14:51:14 | [ensure: exception] 0 | break_ensure.rb:51:10:51:14 | [ensure: exception] ... > ... |  |
+| break_ensure.rb:52:9:52:16 | [ensure: exception] break | break_ensure.rb:45:3:55:5 | while ... | break |
 | break_ensure.rb:52:9:52:16 | break | break_ensure.rb:45:3:55:5 | while ... | break |
 | break_ensure.rb:52:15:52:16 | 10 | break_ensure.rb:52:9:52:16 | break |  |
-| break_ensure.rb:52:15:52:16 | [ensure: raise] 10 | break_ensure.rb:52:9:52:16 | [ensure: raise] break |  |
+| break_ensure.rb:52:15:52:16 | [ensure: exception] 10 | break_ensure.rb:52:9:52:16 | [ensure: exception] break |  |
 | case.rb:1:1:6:3 | enter if_in_case | case.rb:2:8:2:9 | self |  |
 | case.rb:1:1:6:3 | exit if_in_case (normal) | case.rb:1:1:6:3 | exit if_in_case |  |
 | case.rb:1:1:6:3 | if_in_case | case.rb:8:1:18:3 | case_match |  |
@@ -256,7 +256,7 @@
 | case.rb:21:3:23:5 | case ... | case.rb:20:1:24:3 | exit case_match_no_match (normal) |  |
 | case.rb:21:8:21:12 | value | case.rb:22:5:22:8 | in ... then ... |  |
 | case.rb:22:5:22:8 | in ... then ... | case.rb:22:8:22:8 | 1 |  |
-| case.rb:22:8:22:8 | 1 | case.rb:20:1:24:3 | exit case_match_no_match (abnormal) | raise |
+| case.rb:22:8:22:8 | 1 | case.rb:20:1:24:3 | exit case_match_no_match (abnormal) | exception |
 | case.rb:22:8:22:8 | 1 | case.rb:21:3:23:5 | case ... | match |
 | case.rb:26:1:30:3 | case_match_raise | case.rb:32:1:39:3 | case_match_array |  |
 | case.rb:26:1:30:3 | enter case_match_raise | case.rb:26:22:26:26 | value |  |
@@ -266,12 +266,12 @@
 | case.rb:27:3:29:5 | case ... | case.rb:26:1:30:3 | exit case_match_raise (normal) |  |
 | case.rb:27:8:27:12 | value | case.rb:28:4:28:28 | in ... then ... |  |
 | case.rb:28:4:28:28 | in ... then ... | case.rb:28:7:28:28 | -> { ... } |  |
-| case.rb:28:7:28:28 | -> { ... } | case.rb:26:1:30:3 | exit case_match_raise (abnormal) | raise |
+| case.rb:28:7:28:28 | -> { ... } | case.rb:26:1:30:3 | exit case_match_raise (abnormal) | exception |
 | case.rb:28:7:28:28 | -> { ... } | case.rb:27:3:29:5 | case ... | match |
 | case.rb:28:7:28:28 | enter -> { ... } | case.rb:28:10:28:10 | x |  |
 | case.rb:28:7:28:28 | exit -> { ... } (abnormal) | case.rb:28:7:28:28 | exit -> { ... } |  |
 | case.rb:28:10:28:10 | x | case.rb:28:14:28:25 | self |  |
-| case.rb:28:14:28:25 | call to raise | case.rb:28:7:28:28 | exit -> { ... } (abnormal) | raise |
+| case.rb:28:14:28:25 | call to raise | case.rb:28:7:28:28 | exit -> { ... } (abnormal) | exception |
 | case.rb:28:14:28:25 | self | case.rb:28:21:28:24 | oops |  |
 | case.rb:28:20:28:25 | "oops" | case.rb:28:14:28:25 | call to raise |  |
 | case.rb:28:21:28:24 | oops | case.rb:28:20:28:25 | "oops" |  |
@@ -294,9 +294,9 @@
 | case.rb:36:8:36:12 | [ ..., * ] | case.rb:37:5:37:27 | in ... then ... | no-match |
 | case.rb:36:9:36:9 | x | case.rb:33:3:38:5 | case ... | match |
 | case.rb:37:5:37:27 | in ... then ... | case.rb:37:8:37:10 | Bar |  |
-| case.rb:37:8:37:10 | Bar | case.rb:32:1:39:3 | exit case_match_array (abnormal) | raise |
+| case.rb:37:8:37:10 | Bar | case.rb:32:1:39:3 | exit case_match_array (abnormal) | exception |
 | case.rb:37:8:37:10 | Bar | case.rb:37:8:37:26 | [ ..., * ] | match |
-| case.rb:37:8:37:26 | [ ..., * ] | case.rb:32:1:39:3 | exit case_match_array (abnormal) | raise |
+| case.rb:37:8:37:26 | [ ..., * ] | case.rb:32:1:39:3 | exit case_match_array (abnormal) | exception |
 | case.rb:37:8:37:26 | [ ..., * ] | case.rb:37:12:37:12 | a | false, match, true |
 | case.rb:37:12:37:12 | a | case.rb:37:15:37:15 | b | match |
 | case.rb:37:15:37:15 | b | case.rb:37:19:37:19 | c | match |
@@ -311,12 +311,12 @@
 | case.rb:42:3:44:5 | case ... | case.rb:41:1:45:3 | exit case_match_find (normal) |  |
 | case.rb:42:8:42:12 | value | case.rb:43:5:43:22 | in ... then ... |  |
 | case.rb:43:5:43:22 | in ... then ... | case.rb:43:8:43:21 | [ *,...,* ] |  |
-| case.rb:43:8:43:21 | [ *,...,* ] | case.rb:41:1:45:3 | exit case_match_find (abnormal) | raise |
+| case.rb:43:8:43:21 | [ *,...,* ] | case.rb:41:1:45:3 | exit case_match_find (abnormal) | exception |
 | case.rb:43:8:43:21 | [ *,...,* ] | case.rb:43:10:43:10 | x | false, match, true |
 | case.rb:43:10:43:10 | x | case.rb:43:13:43:13 | 1 |  |
-| case.rb:43:13:43:13 | 1 | case.rb:41:1:45:3 | exit case_match_find (abnormal) | raise |
+| case.rb:43:13:43:13 | 1 | case.rb:41:1:45:3 | exit case_match_find (abnormal) | exception |
 | case.rb:43:13:43:13 | 1 | case.rb:43:16:43:16 | 2 | match |
-| case.rb:43:16:43:16 | 2 | case.rb:41:1:45:3 | exit case_match_find (abnormal) | raise |
+| case.rb:43:16:43:16 | 2 | case.rb:41:1:45:3 | exit case_match_find (abnormal) | exception |
 | case.rb:43:16:43:16 | 2 | case.rb:43:20:43:20 | y | match |
 | case.rb:43:20:43:20 | y | case.rb:42:3:44:5 | case ... |  |
 | case.rb:47:1:53:3 | case_match_hash | case.rb:55:1:61:3 | case_match_variable |  |
@@ -344,9 +344,9 @@
 | case.rb:50:16:50:16 | 1 | case.rb:48:3:52:5 | case ... | match |
 | case.rb:50:16:50:16 | 1 | case.rb:51:5:51:17 | in ... then ... | no-match |
 | case.rb:51:5:51:17 | in ... then ... | case.rb:51:8:51:10 | Bar |  |
-| case.rb:51:8:51:10 | Bar | case.rb:47:1:53:3 | exit case_match_hash (abnormal) | raise |
+| case.rb:51:8:51:10 | Bar | case.rb:47:1:53:3 | exit case_match_hash (abnormal) | exception |
 | case.rb:51:8:51:10 | Bar | case.rb:51:8:51:16 | { ..., ** } | match |
-| case.rb:51:8:51:16 | { ..., ** } | case.rb:47:1:53:3 | exit case_match_hash (abnormal) | raise |
+| case.rb:51:8:51:16 | { ..., ** } | case.rb:47:1:53:3 | exit case_match_hash (abnormal) | exception |
 | case.rb:51:8:51:16 | { ..., ** } | case.rb:48:3:52:5 | case ... | false, match, true |
 | case.rb:55:1:61:3 | case_match_variable | case.rb:63:1:67:3 | case_match_underscore |  |
 | case.rb:55:1:61:3 | enter case_match_variable | case.rb:55:25:55:29 | value |  |
@@ -500,7 +500,7 @@
 | case.rb:91:13:91:14 | "" | case.rb:91:18:91:19 | [ ..., * ] | no-match |
 | case.rb:91:18:91:19 | [ ..., * ] | case.rb:72:3:92:5 | case ... | match |
 | case.rb:91:18:91:19 | [ ..., * ] | case.rb:91:23:91:24 | { ..., ** } | no-match |
-| case.rb:91:23:91:24 | { ..., ** } | case.rb:69:1:93:3 | exit case_match_various (abnormal) | raise |
+| case.rb:91:23:91:24 | { ..., ** } | case.rb:69:1:93:3 | exit case_match_various (abnormal) | exception |
 | case.rb:91:23:91:24 | { ..., ** } | case.rb:72:3:92:5 | case ... | false, match, true |
 | case.rb:95:1:99:3 | case_match_guard_no_else | case.rb:1:1:99:4 | exit case.rb (normal) |  |
 | case.rb:95:1:99:3 | enter case_match_guard_no_else | case.rb:95:30:95:34 | value |  |
@@ -512,7 +512,7 @@
 | case.rb:97:5:97:25 | in ... then ... | case.rb:97:8:97:8 | x |  |
 | case.rb:97:8:97:8 | x | case.rb:97:13:97:13 | x | match |
 | case.rb:97:13:97:13 | x | case.rb:97:18:97:18 | 5 |  |
-| case.rb:97:13:97:18 | ... == ... | case.rb:95:1:99:3 | exit case_match_guard_no_else (abnormal) | raise |
+| case.rb:97:13:97:18 | ... == ... | case.rb:95:1:99:3 | exit case_match_guard_no_else (abnormal) | exception |
 | case.rb:97:13:97:18 | ... == ... | case.rb:97:25:97:25 | 6 | true |
 | case.rb:97:18:97:18 | 5 | case.rb:97:13:97:18 | ... == ... |  |
 | case.rb:97:20:97:25 | then ... | case.rb:96:3:98:5 | case ... |  |
@@ -870,7 +870,7 @@
 | cfg.rb:91:6:91:10 | ... > ... | cfg.rb:91:3:91:24 | if ... | false |
 | cfg.rb:91:6:91:10 | ... > ... | cfg.rb:91:17:91:20 | next | true |
 | cfg.rb:91:10:91:10 | 3 | cfg.rb:91:6:91:10 | ... > ... |  |
-| cfg.rb:91:17:91:20 | next | cfg.rb:90:1:93:3 | exit { ... } (normal) | next |
+| cfg.rb:91:17:91:20 | next | cfg.rb:90:1:93:3 | exit { ... } (normal) | continue |
 | cfg.rb:92:3:92:8 | call to puts | cfg.rb:90:1:93:3 | exit { ... } (normal) |  |
 | cfg.rb:92:3:92:8 | self | cfg.rb:92:8:92:8 | x |  |
 | cfg.rb:92:8:92:8 | x | cfg.rb:92:3:92:8 | call to puts |  |
@@ -1024,7 +1024,7 @@
 | cfg.rb:134:1:134:23 | EmptyModule | cfg.rb:136:1:136:1 | 1 |  |
 | cfg.rb:136:1:136:1 | 1 | cfg.rb:136:3:136:3 | 0 |  |
 | cfg.rb:136:1:136:3 | ... / ... | cfg.rb:136:1:136:29 | ... rescue ... |  |
-| cfg.rb:136:1:136:3 | ... / ... | cfg.rb:136:12:136:29 | self | raise |
+| cfg.rb:136:1:136:3 | ... / ... | cfg.rb:136:12:136:29 | self | exception |
 | cfg.rb:136:1:136:29 | ... rescue ... | cfg.rb:138:17:138:23 | __synth__2 |  |
 | cfg.rb:136:3:136:3 | 0 | cfg.rb:136:1:136:3 | ... / ... |  |
 | cfg.rb:136:12:136:29 | call to puts | cfg.rb:136:1:136:29 | ... rescue ... |  |
@@ -1828,7 +1828,7 @@
 | loops.rb:14:11:14:16 | ... > ... | loops.rb:15:7:15:10 | next | true |
 | loops.rb:14:11:14:16 | ... > ... | loops.rb:16:11:16:11 | x | false |
 | loops.rb:14:15:14:16 | 50 | loops.rb:14:11:14:16 | ... > ... |  |
-| loops.rb:15:7:15:10 | next | loops.rb:9:9:9:9 | x | next |
+| loops.rb:15:7:15:10 | next | loops.rb:9:9:9:9 | x | continue |
 | loops.rb:16:5:17:10 | elsif ... | loops.rb:14:5:17:10 | elsif ... |  |
 | loops.rb:16:11:16:11 | x | loops.rb:16:15:16:16 | 10 |  |
 | loops.rb:16:11:16:16 | ... > ... | loops.rb:16:5:17:10 | elsif ... | false |
@@ -1886,7 +1886,7 @@
 | raise.rb:8:6:8:10 | ... > ... | raise.rb:8:3:10:5 | if ... | false |
 | raise.rb:8:6:8:10 | ... > ... | raise.rb:9:5:9:17 | self | true |
 | raise.rb:8:10:8:10 | 2 | raise.rb:8:6:8:10 | ... > ... |  |
-| raise.rb:9:5:9:17 | call to raise | raise.rb:7:1:12:3 | exit m1 (abnormal) | raise |
+| raise.rb:9:5:9:17 | call to raise | raise.rb:7:1:12:3 | exit m1 (abnormal) | exception |
 | raise.rb:9:5:9:17 | self | raise.rb:9:12:9:16 | x > 2 |  |
 | raise.rb:9:11:9:17 | "x > 2" | raise.rb:9:5:9:17 | call to raise |  |
 | raise.rb:9:12:9:16 | x > 2 | raise.rb:9:11:9:17 | "x > 2" |  |
@@ -1902,11 +1902,11 @@
 | raise.rb:16:5:18:7 | if ... | raise.rb:22:3:22:15 | self |  |
 | raise.rb:16:8:16:8 | b | raise.rb:16:5:18:7 | if ... | false |
 | raise.rb:16:8:16:8 | b | raise.rb:17:7:17:22 | self | true |
-| raise.rb:17:7:17:22 | call to raise | raise.rb:19:10:19:19 | ExceptionA | raise |
+| raise.rb:17:7:17:22 | call to raise | raise.rb:19:10:19:19 | ExceptionA | exception |
 | raise.rb:17:7:17:22 | self | raise.rb:17:13:17:22 | ExceptionA |  |
 | raise.rb:17:13:17:22 | ExceptionA | raise.rb:17:7:17:22 | call to raise |  |
 | raise.rb:19:3:20:18 | rescue ... | raise.rb:22:3:22:15 | self |  |
-| raise.rb:19:10:19:19 | ExceptionA | raise.rb:14:1:23:3 | exit m2 (abnormal) | raise |
+| raise.rb:19:10:19:19 | ExceptionA | raise.rb:14:1:23:3 | exit m2 (abnormal) | exception |
 | raise.rb:19:10:19:19 | ExceptionA | raise.rb:20:5:20:18 | self | match |
 | raise.rb:19:20:20:18 | then ... | raise.rb:19:3:20:18 | rescue ... |  |
 | raise.rb:20:5:20:18 | call to puts | raise.rb:19:20:20:18 | then ... |  |
@@ -1924,7 +1924,7 @@
 | raise.rb:27:5:29:7 | if ... | raise.rb:33:3:33:15 | self |  |
 | raise.rb:27:8:27:8 | b | raise.rb:27:5:29:7 | if ... | false |
 | raise.rb:27:8:27:8 | b | raise.rb:28:7:28:22 | self | true |
-| raise.rb:28:7:28:22 | call to raise | raise.rb:31:5:31:18 | self | raise |
+| raise.rb:28:7:28:22 | call to raise | raise.rb:31:5:31:18 | self | exception |
 | raise.rb:28:7:28:22 | self | raise.rb:28:13:28:22 | ExceptionA |  |
 | raise.rb:28:13:28:22 | ExceptionA | raise.rb:28:7:28:22 | call to raise |  |
 | raise.rb:30:3:31:18 | rescue ... | raise.rb:33:3:33:15 | self |  |
@@ -1944,7 +1944,7 @@
 | raise.rb:38:5:40:7 | if ... | raise.rb:44:3:44:15 | self |  |
 | raise.rb:38:8:38:8 | b | raise.rb:38:5:40:7 | if ... | false |
 | raise.rb:38:8:38:8 | b | raise.rb:39:7:39:22 | self | true |
-| raise.rb:39:7:39:22 | call to raise | raise.rb:41:13:41:13 | e | raise |
+| raise.rb:39:7:39:22 | call to raise | raise.rb:41:13:41:13 | e | exception |
 | raise.rb:39:7:39:22 | self | raise.rb:39:13:39:22 | ExceptionA |  |
 | raise.rb:39:13:39:22 | ExceptionA | raise.rb:39:7:39:22 | call to raise |  |
 | raise.rb:41:3:42:22 | rescue ... | raise.rb:44:3:44:15 | self |  |
@@ -1965,7 +1965,7 @@
 | raise.rb:49:5:51:7 | if ... | raise.rb:54:3:54:15 | self |  |
 | raise.rb:49:8:49:8 | b | raise.rb:49:5:51:7 | if ... | false |
 | raise.rb:49:8:49:8 | b | raise.rb:50:7:50:22 | self | true |
-| raise.rb:50:7:50:22 | call to raise | raise.rb:52:13:52:13 | e | raise |
+| raise.rb:50:7:50:22 | call to raise | raise.rb:52:13:52:13 | e | exception |
 | raise.rb:50:7:50:22 | self | raise.rb:50:13:50:22 | ExceptionA |  |
 | raise.rb:50:13:50:22 | ExceptionA | raise.rb:50:7:50:22 | call to raise |  |
 | raise.rb:52:3:52:13 | rescue ... | raise.rb:54:3:54:15 | self |  |
@@ -1982,13 +1982,13 @@
 | raise.rb:59:5:61:7 | if ... | raise.rb:65:3:65:15 | self |  |
 | raise.rb:59:8:59:8 | b | raise.rb:59:5:61:7 | if ... | false |
 | raise.rb:59:8:59:8 | b | raise.rb:60:7:60:22 | self | true |
-| raise.rb:60:7:60:22 | call to raise | raise.rb:62:10:62:19 | ExceptionA | raise |
+| raise.rb:60:7:60:22 | call to raise | raise.rb:62:10:62:19 | ExceptionA | exception |
 | raise.rb:60:7:60:22 | self | raise.rb:60:13:60:22 | ExceptionA |  |
 | raise.rb:60:13:60:22 | ExceptionA | raise.rb:60:7:60:22 | call to raise |  |
 | raise.rb:62:3:63:22 | rescue ... | raise.rb:65:3:65:15 | self |  |
 | raise.rb:62:10:62:19 | ExceptionA | raise.rb:62:22:62:31 | ExceptionB | no-match |
 | raise.rb:62:10:62:19 | ExceptionA | raise.rb:62:36:62:36 | e | match |
-| raise.rb:62:22:62:31 | ExceptionB | raise.rb:57:1:66:3 | exit m6 (abnormal) | raise |
+| raise.rb:62:22:62:31 | ExceptionB | raise.rb:57:1:66:3 | exit m6 (abnormal) | exception |
 | raise.rb:62:22:62:31 | ExceptionB | raise.rb:62:36:62:36 | e | match |
 | raise.rb:62:36:62:36 | e | raise.rb:63:5:63:22 | self |  |
 | raise.rb:62:37:63:22 | then ... | raise.rb:62:3:63:22 | rescue ... |  |
@@ -2009,9 +2009,9 @@
 | raise.rb:69:6:69:6 | x | raise.rb:69:10:69:10 | 2 |  |
 | raise.rb:69:6:69:10 | ... > ... | raise.rb:70:5:70:17 | self | true |
 | raise.rb:69:6:69:10 | ... > ... | raise.rb:71:9:71:9 | x | false |
-| raise.rb:69:6:69:10 | ... > ... | raise.rb:76:3:76:15 | [ensure: raise] self | raise |
+| raise.rb:69:6:69:10 | ... > ... | raise.rb:76:3:76:15 | [ensure: exception] self | exception |
 | raise.rb:69:10:69:10 | 2 | raise.rb:69:6:69:10 | ... > ... |  |
-| raise.rb:70:5:70:17 | call to raise | raise.rb:76:3:76:15 | [ensure: raise] self | raise |
+| raise.rb:70:5:70:17 | call to raise | raise.rb:76:3:76:15 | [ensure: exception] self | exception |
 | raise.rb:70:5:70:17 | self | raise.rb:70:12:70:16 | x > 2 |  |
 | raise.rb:70:11:70:17 | "x > 2" | raise.rb:70:5:70:17 | call to raise |  |
 | raise.rb:70:12:70:16 | x > 2 | raise.rb:70:11:70:17 | "x > 2" |  |
@@ -2019,29 +2019,29 @@
 | raise.rb:71:9:71:9 | x | raise.rb:71:13:71:13 | 0 |  |
 | raise.rb:71:9:71:13 | ... < ... | raise.rb:71:3:72:18 | elsif ... | false |
 | raise.rb:71:9:71:13 | ... < ... | raise.rb:72:13:72:17 | x < 0 | true |
-| raise.rb:71:9:71:13 | ... < ... | raise.rb:76:3:76:15 | [ensure: raise] self | raise |
+| raise.rb:71:9:71:13 | ... < ... | raise.rb:76:3:76:15 | [ensure: exception] self | exception |
 | raise.rb:71:13:71:13 | 0 | raise.rb:71:9:71:13 | ... < ... |  |
 | raise.rb:72:5:72:18 | return | raise.rb:76:3:76:15 | [ensure: return] self | return |
 | raise.rb:72:12:72:18 | "x < 0" | raise.rb:72:5:72:18 | return |  |
 | raise.rb:72:13:72:17 | x < 0 | raise.rb:72:12:72:18 | "x < 0" |  |
-| raise.rb:74:3:74:20 | call to puts | raise.rb:76:3:76:15 | [ensure: raise] self | raise |
+| raise.rb:74:3:74:20 | call to puts | raise.rb:76:3:76:15 | [ensure: exception] self | exception |
 | raise.rb:74:3:74:20 | call to puts | raise.rb:76:3:76:15 | self |  |
 | raise.rb:74:3:74:20 | self | raise.rb:74:9:74:19 | 0 <= x <= 2 |  |
 | raise.rb:74:8:74:20 | "0 <= x <= 2" | raise.rb:74:3:74:20 | call to puts |  |
 | raise.rb:74:9:74:19 | 0 <= x <= 2 | raise.rb:74:8:74:20 | "0 <= x <= 2" |  |
-| raise.rb:75:1:76:15 | [ensure: raise] ensure ... | raise.rb:68:1:77:3 | exit m7 (abnormal) | raise |
+| raise.rb:75:1:76:15 | [ensure: exception] ensure ... | raise.rb:68:1:77:3 | exit m7 (abnormal) | exception |
 | raise.rb:75:1:76:15 | [ensure: return] ensure ... | raise.rb:68:1:77:3 | exit m7 (normal) | return |
 | raise.rb:75:1:76:15 | ensure ... | raise.rb:68:1:77:3 | exit m7 (normal) |  |
-| raise.rb:76:3:76:15 | [ensure: raise] call to puts | raise.rb:75:1:76:15 | [ensure: raise] ensure ... |  |
-| raise.rb:76:3:76:15 | [ensure: raise] self | raise.rb:76:9:76:14 | [ensure: raise] ensure |  |
+| raise.rb:76:3:76:15 | [ensure: exception] call to puts | raise.rb:75:1:76:15 | [ensure: exception] ensure ... |  |
+| raise.rb:76:3:76:15 | [ensure: exception] self | raise.rb:76:9:76:14 | [ensure: exception] ensure |  |
 | raise.rb:76:3:76:15 | [ensure: return] call to puts | raise.rb:75:1:76:15 | [ensure: return] ensure ... |  |
 | raise.rb:76:3:76:15 | [ensure: return] self | raise.rb:76:9:76:14 | [ensure: return] ensure |  |
 | raise.rb:76:3:76:15 | call to puts | raise.rb:75:1:76:15 | ensure ... |  |
 | raise.rb:76:3:76:15 | self | raise.rb:76:9:76:14 | ensure |  |
 | raise.rb:76:8:76:15 | "ensure" | raise.rb:76:3:76:15 | call to puts |  |
-| raise.rb:76:8:76:15 | [ensure: raise] "ensure" | raise.rb:76:3:76:15 | [ensure: raise] call to puts |  |
+| raise.rb:76:8:76:15 | [ensure: exception] "ensure" | raise.rb:76:3:76:15 | [ensure: exception] call to puts |  |
 | raise.rb:76:8:76:15 | [ensure: return] "ensure" | raise.rb:76:3:76:15 | [ensure: return] call to puts |  |
-| raise.rb:76:9:76:14 | [ensure: raise] ensure | raise.rb:76:8:76:15 | [ensure: raise] "ensure" |  |
+| raise.rb:76:9:76:14 | [ensure: exception] ensure | raise.rb:76:8:76:15 | [ensure: exception] "ensure" |  |
 | raise.rb:76:9:76:14 | [ensure: return] ensure | raise.rb:76:8:76:15 | [ensure: return] "ensure" |  |
 | raise.rb:76:9:76:14 | ensure | raise.rb:76:8:76:15 | "ensure" |  |
 | raise.rb:79:1:92:3 | enter m8 | raise.rb:79:8:79:8 | x |  |
@@ -2057,9 +2057,9 @@
 | raise.rb:82:8:82:8 | x | raise.rb:82:12:82:12 | 2 |  |
 | raise.rb:82:8:82:12 | ... > ... | raise.rb:83:7:83:19 | self | true |
 | raise.rb:82:8:82:12 | ... > ... | raise.rb:84:11:84:11 | x | false |
-| raise.rb:82:8:82:12 | ... > ... | raise.rb:89:5:89:17 | [ensure: raise] self | raise |
+| raise.rb:82:8:82:12 | ... > ... | raise.rb:89:5:89:17 | [ensure: exception] self | exception |
 | raise.rb:82:12:82:12 | 2 | raise.rb:82:8:82:12 | ... > ... |  |
-| raise.rb:83:7:83:19 | call to raise | raise.rb:89:5:89:17 | [ensure: raise] self | raise |
+| raise.rb:83:7:83:19 | call to raise | raise.rb:89:5:89:17 | [ensure: exception] self | exception |
 | raise.rb:83:7:83:19 | self | raise.rb:83:14:83:18 | x > 2 |  |
 | raise.rb:83:13:83:19 | "x > 2" | raise.rb:83:7:83:19 | call to raise |  |
 | raise.rb:83:14:83:18 | x > 2 | raise.rb:83:13:83:19 | "x > 2" |  |
@@ -2067,29 +2067,29 @@
 | raise.rb:84:11:84:11 | x | raise.rb:84:15:84:15 | 0 |  |
 | raise.rb:84:11:84:15 | ... < ... | raise.rb:84:5:85:20 | elsif ... | false |
 | raise.rb:84:11:84:15 | ... < ... | raise.rb:85:15:85:19 | x < 0 | true |
-| raise.rb:84:11:84:15 | ... < ... | raise.rb:89:5:89:17 | [ensure: raise] self | raise |
+| raise.rb:84:11:84:15 | ... < ... | raise.rb:89:5:89:17 | [ensure: exception] self | exception |
 | raise.rb:84:15:84:15 | 0 | raise.rb:84:11:84:15 | ... < ... |  |
 | raise.rb:85:7:85:20 | return | raise.rb:89:5:89:17 | [ensure: return] self | return |
 | raise.rb:85:14:85:20 | "x < 0" | raise.rb:85:7:85:20 | return |  |
 | raise.rb:85:15:85:19 | x < 0 | raise.rb:85:14:85:20 | "x < 0" |  |
-| raise.rb:87:5:87:22 | call to puts | raise.rb:89:5:89:17 | [ensure: raise] self | raise |
+| raise.rb:87:5:87:22 | call to puts | raise.rb:89:5:89:17 | [ensure: exception] self | exception |
 | raise.rb:87:5:87:22 | call to puts | raise.rb:89:5:89:17 | self |  |
 | raise.rb:87:5:87:22 | self | raise.rb:87:11:87:21 | 0 <= x <= 2 |  |
 | raise.rb:87:10:87:22 | "0 <= x <= 2" | raise.rb:87:5:87:22 | call to puts |  |
 | raise.rb:87:11:87:21 | 0 <= x <= 2 | raise.rb:87:10:87:22 | "0 <= x <= 2" |  |
-| raise.rb:88:3:89:17 | [ensure: raise] ensure ... | raise.rb:79:1:92:3 | exit m8 (abnormal) | raise |
+| raise.rb:88:3:89:17 | [ensure: exception] ensure ... | raise.rb:79:1:92:3 | exit m8 (abnormal) | exception |
 | raise.rb:88:3:89:17 | [ensure: return] ensure ... | raise.rb:79:1:92:3 | exit m8 (normal) | return |
 | raise.rb:88:3:89:17 | ensure ... | raise.rb:91:3:91:15 | self |  |
-| raise.rb:89:5:89:17 | [ensure: raise] call to puts | raise.rb:88:3:89:17 | [ensure: raise] ensure ... |  |
-| raise.rb:89:5:89:17 | [ensure: raise] self | raise.rb:89:11:89:16 | [ensure: raise] ensure |  |
+| raise.rb:89:5:89:17 | [ensure: exception] call to puts | raise.rb:88:3:89:17 | [ensure: exception] ensure ... |  |
+| raise.rb:89:5:89:17 | [ensure: exception] self | raise.rb:89:11:89:16 | [ensure: exception] ensure |  |
 | raise.rb:89:5:89:17 | [ensure: return] call to puts | raise.rb:88:3:89:17 | [ensure: return] ensure ... |  |
 | raise.rb:89:5:89:17 | [ensure: return] self | raise.rb:89:11:89:16 | [ensure: return] ensure |  |
 | raise.rb:89:5:89:17 | call to puts | raise.rb:88:3:89:17 | ensure ... |  |
 | raise.rb:89:5:89:17 | self | raise.rb:89:11:89:16 | ensure |  |
 | raise.rb:89:10:89:17 | "ensure" | raise.rb:89:5:89:17 | call to puts |  |
-| raise.rb:89:10:89:17 | [ensure: raise] "ensure" | raise.rb:89:5:89:17 | [ensure: raise] call to puts |  |
+| raise.rb:89:10:89:17 | [ensure: exception] "ensure" | raise.rb:89:5:89:17 | [ensure: exception] call to puts |  |
 | raise.rb:89:10:89:17 | [ensure: return] "ensure" | raise.rb:89:5:89:17 | [ensure: return] call to puts |  |
-| raise.rb:89:11:89:16 | [ensure: raise] ensure | raise.rb:89:10:89:17 | [ensure: raise] "ensure" |  |
+| raise.rb:89:11:89:16 | [ensure: exception] ensure | raise.rb:89:10:89:17 | [ensure: exception] "ensure" |  |
 | raise.rb:89:11:89:16 | [ensure: return] ensure | raise.rb:89:10:89:17 | [ensure: return] "ensure" |  |
 | raise.rb:89:11:89:16 | ensure | raise.rb:89:10:89:17 | "ensure" |  |
 | raise.rb:91:3:91:15 | call to puts | raise.rb:79:1:92:3 | exit m8 (normal) |  |
@@ -2104,7 +2104,7 @@
 | raise.rb:94:11:94:12 | b1 | raise.rb:94:15:94:16 | b2 |  |
 | raise.rb:94:15:94:16 | b2 | raise.rb:95:3:95:17 | self |  |
 | raise.rb:95:3:95:17 | call to puts | raise.rb:97:8:97:8 | x |  |
-| raise.rb:95:3:95:17 | call to puts | raise.rb:115:3:115:22 | [ensure: raise] self | raise |
+| raise.rb:95:3:95:17 | call to puts | raise.rb:115:3:115:22 | [ensure: exception] self | exception |
 | raise.rb:95:3:95:17 | self | raise.rb:95:9:95:16 | Begin m9 |  |
 | raise.rb:95:8:95:17 | "Begin m9" | raise.rb:95:3:95:17 | call to puts |  |
 | raise.rb:95:9:95:16 | Begin m9 | raise.rb:95:8:95:17 | "Begin m9" |  |
@@ -2112,9 +2112,9 @@
 | raise.rb:97:8:97:8 | x | raise.rb:97:12:97:12 | 2 |  |
 | raise.rb:97:8:97:12 | ... > ... | raise.rb:98:7:98:19 | self | true |
 | raise.rb:97:8:97:12 | ... > ... | raise.rb:99:11:99:11 | x | false |
-| raise.rb:97:8:97:12 | ... > ... | raise.rb:104:5:104:23 | [ensure: raise] self | raise |
+| raise.rb:97:8:97:12 | ... > ... | raise.rb:104:5:104:23 | [ensure: exception] self | exception |
 | raise.rb:97:12:97:12 | 2 | raise.rb:97:8:97:12 | ... > ... |  |
-| raise.rb:98:7:98:19 | call to raise | raise.rb:104:5:104:23 | [ensure: raise] self | raise |
+| raise.rb:98:7:98:19 | call to raise | raise.rb:104:5:104:23 | [ensure: exception] self | exception |
 | raise.rb:98:7:98:19 | self | raise.rb:98:14:98:18 | x > 2 |  |
 | raise.rb:98:13:98:19 | "x > 2" | raise.rb:98:7:98:19 | call to raise |  |
 | raise.rb:98:14:98:18 | x > 2 | raise.rb:98:13:98:19 | "x > 2" |  |
@@ -2122,130 +2122,130 @@
 | raise.rb:99:11:99:11 | x | raise.rb:99:15:99:15 | 0 |  |
 | raise.rb:99:11:99:15 | ... < ... | raise.rb:99:5:100:20 | elsif ... | false |
 | raise.rb:99:11:99:15 | ... < ... | raise.rb:100:15:100:19 | x < 0 | true |
-| raise.rb:99:11:99:15 | ... < ... | raise.rb:104:5:104:23 | [ensure: raise] self | raise |
+| raise.rb:99:11:99:15 | ... < ... | raise.rb:104:5:104:23 | [ensure: exception] self | exception |
 | raise.rb:99:15:99:15 | 0 | raise.rb:99:11:99:15 | ... < ... |  |
 | raise.rb:100:7:100:20 | return | raise.rb:104:5:104:23 | [ensure: return] self | return |
 | raise.rb:100:14:100:20 | "x < 0" | raise.rb:100:7:100:20 | return |  |
 | raise.rb:100:15:100:19 | x < 0 | raise.rb:100:14:100:20 | "x < 0" |  |
-| raise.rb:102:5:102:22 | call to puts | raise.rb:104:5:104:23 | [ensure: raise] self | raise |
+| raise.rb:102:5:102:22 | call to puts | raise.rb:104:5:104:23 | [ensure: exception] self | exception |
 | raise.rb:102:5:102:22 | call to puts | raise.rb:104:5:104:23 | self |  |
 | raise.rb:102:5:102:22 | self | raise.rb:102:11:102:21 | 0 <= x <= 2 |  |
 | raise.rb:102:10:102:22 | "0 <= x <= 2" | raise.rb:102:5:102:22 | call to puts |  |
 | raise.rb:102:11:102:21 | 0 <= x <= 2 | raise.rb:102:10:102:22 | "0 <= x <= 2" |  |
-| raise.rb:103:3:111:7 | [ensure: raise] ensure ... | raise.rb:115:3:115:22 | [ensure: raise] self | raise |
+| raise.rb:103:3:111:7 | [ensure: exception] ensure ... | raise.rb:115:3:115:22 | [ensure: exception] self | exception |
 | raise.rb:103:3:111:7 | [ensure: return] ensure ... | raise.rb:115:3:115:22 | [ensure: return] self | return |
 | raise.rb:103:3:111:7 | ensure ... | raise.rb:113:3:113:15 | self |  |
-| raise.rb:104:5:104:23 | [ensure: raise] call to puts | raise.rb:106:10:106:11 | [ensure: raise] b1 |  |
-| raise.rb:104:5:104:23 | [ensure: raise] call to puts | raise.rb:115:3:115:22 | [ensure: raise] self | raise |
-| raise.rb:104:5:104:23 | [ensure: raise] self | raise.rb:104:11:104:22 | [ensure: raise] outer ensure |  |
+| raise.rb:104:5:104:23 | [ensure: exception] call to puts | raise.rb:106:10:106:11 | [ensure: exception] b1 |  |
+| raise.rb:104:5:104:23 | [ensure: exception] call to puts | raise.rb:115:3:115:22 | [ensure: exception] self | exception |
+| raise.rb:104:5:104:23 | [ensure: exception] self | raise.rb:104:11:104:22 | [ensure: exception] outer ensure |  |
 | raise.rb:104:5:104:23 | [ensure: return] call to puts | raise.rb:106:10:106:11 | [ensure: return] b1 |  |
-| raise.rb:104:5:104:23 | [ensure: return] call to puts | raise.rb:115:3:115:22 | [ensure: raise] self | raise |
+| raise.rb:104:5:104:23 | [ensure: return] call to puts | raise.rb:115:3:115:22 | [ensure: exception] self | exception |
 | raise.rb:104:5:104:23 | [ensure: return] self | raise.rb:104:11:104:22 | [ensure: return] outer ensure |  |
 | raise.rb:104:5:104:23 | call to puts | raise.rb:106:10:106:11 | b1 |  |
-| raise.rb:104:5:104:23 | call to puts | raise.rb:115:3:115:22 | [ensure: raise] self | raise |
+| raise.rb:104:5:104:23 | call to puts | raise.rb:115:3:115:22 | [ensure: exception] self | exception |
 | raise.rb:104:5:104:23 | self | raise.rb:104:11:104:22 | outer ensure |  |
 | raise.rb:104:10:104:23 | "outer ensure" | raise.rb:104:5:104:23 | call to puts |  |
-| raise.rb:104:10:104:23 | [ensure: raise] "outer ensure" | raise.rb:104:5:104:23 | [ensure: raise] call to puts |  |
+| raise.rb:104:10:104:23 | [ensure: exception] "outer ensure" | raise.rb:104:5:104:23 | [ensure: exception] call to puts |  |
 | raise.rb:104:10:104:23 | [ensure: return] "outer ensure" | raise.rb:104:5:104:23 | [ensure: return] call to puts |  |
-| raise.rb:104:11:104:22 | [ensure: raise] outer ensure | raise.rb:104:10:104:23 | [ensure: raise] "outer ensure" |  |
+| raise.rb:104:11:104:22 | [ensure: exception] outer ensure | raise.rb:104:10:104:23 | [ensure: exception] "outer ensure" |  |
 | raise.rb:104:11:104:22 | [ensure: return] outer ensure | raise.rb:104:10:104:23 | [ensure: return] "outer ensure" |  |
 | raise.rb:104:11:104:22 | outer ensure | raise.rb:104:10:104:23 | "outer ensure" |  |
-| raise.rb:106:7:108:9 | [ensure: raise] if ... | raise.rb:110:7:110:25 | [ensure: raise] self |  |
+| raise.rb:106:7:108:9 | [ensure: exception] if ... | raise.rb:110:7:110:25 | [ensure: exception] self |  |
 | raise.rb:106:7:108:9 | [ensure: return] if ... | raise.rb:110:7:110:25 | [ensure: return] self |  |
 | raise.rb:106:7:108:9 | if ... | raise.rb:110:7:110:25 | self |  |
-| raise.rb:106:10:106:11 | [ensure: raise] b1 | raise.rb:106:7:108:9 | [ensure: raise] if ... | false |
-| raise.rb:106:10:106:11 | [ensure: raise] b1 | raise.rb:107:9:107:26 | [ensure: raise] self | true |
+| raise.rb:106:10:106:11 | [ensure: exception] b1 | raise.rb:106:7:108:9 | [ensure: exception] if ... | false |
+| raise.rb:106:10:106:11 | [ensure: exception] b1 | raise.rb:107:9:107:26 | [ensure: exception] self | true |
 | raise.rb:106:10:106:11 | [ensure: return] b1 | raise.rb:106:7:108:9 | [ensure: return] if ... | false |
 | raise.rb:106:10:106:11 | [ensure: return] b1 | raise.rb:107:9:107:26 | [ensure: return] self | true |
 | raise.rb:106:10:106:11 | b1 | raise.rb:106:7:108:9 | if ... | false |
 | raise.rb:106:10:106:11 | b1 | raise.rb:107:9:107:26 | self | true |
-| raise.rb:107:9:107:26 | [ensure: raise] call to raise | raise.rb:110:7:110:25 | [ensure: raise, ensure(1): raise] self | raise |
-| raise.rb:107:9:107:26 | [ensure: raise] self | raise.rb:107:16:107:25 | [ensure: raise] b1 is true |  |
-| raise.rb:107:9:107:26 | [ensure: return] call to raise | raise.rb:110:7:110:25 | [ensure: return, ensure(1): raise] self | raise |
+| raise.rb:107:9:107:26 | [ensure: exception] call to raise | raise.rb:110:7:110:25 | [ensure: exception, ensure(1): exception] self | exception |
+| raise.rb:107:9:107:26 | [ensure: exception] self | raise.rb:107:16:107:25 | [ensure: exception] b1 is true |  |
+| raise.rb:107:9:107:26 | [ensure: return] call to raise | raise.rb:110:7:110:25 | [ensure: return, ensure(1): exception] self | exception |
 | raise.rb:107:9:107:26 | [ensure: return] self | raise.rb:107:16:107:25 | [ensure: return] b1 is true |  |
-| raise.rb:107:9:107:26 | call to raise | raise.rb:110:7:110:25 | [ensure(1): raise] self | raise |
+| raise.rb:107:9:107:26 | call to raise | raise.rb:110:7:110:25 | [ensure(1): exception] self | exception |
 | raise.rb:107:9:107:26 | self | raise.rb:107:16:107:25 | b1 is true |  |
 | raise.rb:107:15:107:26 | "b1 is true" | raise.rb:107:9:107:26 | call to raise |  |
-| raise.rb:107:15:107:26 | [ensure: raise] "b1 is true" | raise.rb:107:9:107:26 | [ensure: raise] call to raise |  |
+| raise.rb:107:15:107:26 | [ensure: exception] "b1 is true" | raise.rb:107:9:107:26 | [ensure: exception] call to raise |  |
 | raise.rb:107:15:107:26 | [ensure: return] "b1 is true" | raise.rb:107:9:107:26 | [ensure: return] call to raise |  |
-| raise.rb:107:16:107:25 | [ensure: raise] b1 is true | raise.rb:107:15:107:26 | [ensure: raise] "b1 is true" |  |
+| raise.rb:107:16:107:25 | [ensure: exception] b1 is true | raise.rb:107:15:107:26 | [ensure: exception] "b1 is true" |  |
 | raise.rb:107:16:107:25 | [ensure: return] b1 is true | raise.rb:107:15:107:26 | [ensure: return] "b1 is true" |  |
 | raise.rb:107:16:107:25 | b1 is true | raise.rb:107:15:107:26 | "b1 is true" |  |
-| raise.rb:109:5:110:25 | [ensure(1): raise] ensure ... | raise.rb:115:3:115:22 | [ensure: raise] self | raise |
-| raise.rb:109:5:110:25 | [ensure: raise, ensure(1): raise] ensure ... | raise.rb:115:3:115:22 | [ensure: raise] self | raise |
-| raise.rb:109:5:110:25 | [ensure: raise] ensure ... | raise.rb:103:3:111:7 | [ensure: raise] ensure ... |  |
-| raise.rb:109:5:110:25 | [ensure: return, ensure(1): raise] ensure ... | raise.rb:115:3:115:22 | [ensure: raise] self | raise |
+| raise.rb:109:5:110:25 | [ensure(1): exception] ensure ... | raise.rb:115:3:115:22 | [ensure: exception] self | exception |
+| raise.rb:109:5:110:25 | [ensure: exception, ensure(1): exception] ensure ... | raise.rb:115:3:115:22 | [ensure: exception] self | exception |
+| raise.rb:109:5:110:25 | [ensure: exception] ensure ... | raise.rb:103:3:111:7 | [ensure: exception] ensure ... |  |
+| raise.rb:109:5:110:25 | [ensure: return, ensure(1): exception] ensure ... | raise.rb:115:3:115:22 | [ensure: exception] self | exception |
 | raise.rb:109:5:110:25 | [ensure: return] ensure ... | raise.rb:103:3:111:7 | [ensure: return] ensure ... |  |
 | raise.rb:109:5:110:25 | ensure ... | raise.rb:103:3:111:7 | ensure ... |  |
-| raise.rb:110:7:110:25 | [ensure(1): raise] call to puts | raise.rb:109:5:110:25 | [ensure(1): raise] ensure ... |  |
-| raise.rb:110:7:110:25 | [ensure(1): raise] call to puts | raise.rb:115:3:115:22 | [ensure: raise] self | raise |
-| raise.rb:110:7:110:25 | [ensure(1): raise] self | raise.rb:110:13:110:24 | [ensure(1): raise] inner ensure |  |
-| raise.rb:110:7:110:25 | [ensure: raise, ensure(1): raise] call to puts | raise.rb:109:5:110:25 | [ensure: raise, ensure(1): raise] ensure ... |  |
-| raise.rb:110:7:110:25 | [ensure: raise, ensure(1): raise] call to puts | raise.rb:115:3:115:22 | [ensure: raise] self | raise |
-| raise.rb:110:7:110:25 | [ensure: raise, ensure(1): raise] self | raise.rb:110:13:110:24 | [ensure: raise, ensure(1): raise] inner ensure |  |
-| raise.rb:110:7:110:25 | [ensure: raise] call to puts | raise.rb:109:5:110:25 | [ensure: raise] ensure ... |  |
-| raise.rb:110:7:110:25 | [ensure: raise] call to puts | raise.rb:115:3:115:22 | [ensure: raise] self | raise |
-| raise.rb:110:7:110:25 | [ensure: raise] self | raise.rb:110:13:110:24 | [ensure: raise] inner ensure |  |
-| raise.rb:110:7:110:25 | [ensure: return, ensure(1): raise] call to puts | raise.rb:109:5:110:25 | [ensure: return, ensure(1): raise] ensure ... |  |
-| raise.rb:110:7:110:25 | [ensure: return, ensure(1): raise] call to puts | raise.rb:115:3:115:22 | [ensure: raise] self | raise |
-| raise.rb:110:7:110:25 | [ensure: return, ensure(1): raise] self | raise.rb:110:13:110:24 | [ensure: return, ensure(1): raise] inner ensure |  |
+| raise.rb:110:7:110:25 | [ensure(1): exception] call to puts | raise.rb:109:5:110:25 | [ensure(1): exception] ensure ... |  |
+| raise.rb:110:7:110:25 | [ensure(1): exception] call to puts | raise.rb:115:3:115:22 | [ensure: exception] self | exception |
+| raise.rb:110:7:110:25 | [ensure(1): exception] self | raise.rb:110:13:110:24 | [ensure(1): exception] inner ensure |  |
+| raise.rb:110:7:110:25 | [ensure: exception, ensure(1): exception] call to puts | raise.rb:109:5:110:25 | [ensure: exception, ensure(1): exception] ensure ... |  |
+| raise.rb:110:7:110:25 | [ensure: exception, ensure(1): exception] call to puts | raise.rb:115:3:115:22 | [ensure: exception] self | exception |
+| raise.rb:110:7:110:25 | [ensure: exception, ensure(1): exception] self | raise.rb:110:13:110:24 | [ensure: exception, ensure(1): exception] inner ensure |  |
+| raise.rb:110:7:110:25 | [ensure: exception] call to puts | raise.rb:109:5:110:25 | [ensure: exception] ensure ... |  |
+| raise.rb:110:7:110:25 | [ensure: exception] call to puts | raise.rb:115:3:115:22 | [ensure: exception] self | exception |
+| raise.rb:110:7:110:25 | [ensure: exception] self | raise.rb:110:13:110:24 | [ensure: exception] inner ensure |  |
+| raise.rb:110:7:110:25 | [ensure: return, ensure(1): exception] call to puts | raise.rb:109:5:110:25 | [ensure: return, ensure(1): exception] ensure ... |  |
+| raise.rb:110:7:110:25 | [ensure: return, ensure(1): exception] call to puts | raise.rb:115:3:115:22 | [ensure: exception] self | exception |
+| raise.rb:110:7:110:25 | [ensure: return, ensure(1): exception] self | raise.rb:110:13:110:24 | [ensure: return, ensure(1): exception] inner ensure |  |
 | raise.rb:110:7:110:25 | [ensure: return] call to puts | raise.rb:109:5:110:25 | [ensure: return] ensure ... |  |
-| raise.rb:110:7:110:25 | [ensure: return] call to puts | raise.rb:115:3:115:22 | [ensure: raise] self | raise |
+| raise.rb:110:7:110:25 | [ensure: return] call to puts | raise.rb:115:3:115:22 | [ensure: exception] self | exception |
 | raise.rb:110:7:110:25 | [ensure: return] self | raise.rb:110:13:110:24 | [ensure: return] inner ensure |  |
 | raise.rb:110:7:110:25 | call to puts | raise.rb:109:5:110:25 | ensure ... |  |
-| raise.rb:110:7:110:25 | call to puts | raise.rb:115:3:115:22 | [ensure: raise] self | raise |
+| raise.rb:110:7:110:25 | call to puts | raise.rb:115:3:115:22 | [ensure: exception] self | exception |
 | raise.rb:110:7:110:25 | self | raise.rb:110:13:110:24 | inner ensure |  |
 | raise.rb:110:12:110:25 | "inner ensure" | raise.rb:110:7:110:25 | call to puts |  |
-| raise.rb:110:12:110:25 | [ensure(1): raise] "inner ensure" | raise.rb:110:7:110:25 | [ensure(1): raise] call to puts |  |
-| raise.rb:110:12:110:25 | [ensure: raise, ensure(1): raise] "inner ensure" | raise.rb:110:7:110:25 | [ensure: raise, ensure(1): raise] call to puts |  |
-| raise.rb:110:12:110:25 | [ensure: raise] "inner ensure" | raise.rb:110:7:110:25 | [ensure: raise] call to puts |  |
-| raise.rb:110:12:110:25 | [ensure: return, ensure(1): raise] "inner ensure" | raise.rb:110:7:110:25 | [ensure: return, ensure(1): raise] call to puts |  |
+| raise.rb:110:12:110:25 | [ensure(1): exception] "inner ensure" | raise.rb:110:7:110:25 | [ensure(1): exception] call to puts |  |
+| raise.rb:110:12:110:25 | [ensure: exception, ensure(1): exception] "inner ensure" | raise.rb:110:7:110:25 | [ensure: exception, ensure(1): exception] call to puts |  |
+| raise.rb:110:12:110:25 | [ensure: exception] "inner ensure" | raise.rb:110:7:110:25 | [ensure: exception] call to puts |  |
+| raise.rb:110:12:110:25 | [ensure: return, ensure(1): exception] "inner ensure" | raise.rb:110:7:110:25 | [ensure: return, ensure(1): exception] call to puts |  |
 | raise.rb:110:12:110:25 | [ensure: return] "inner ensure" | raise.rb:110:7:110:25 | [ensure: return] call to puts |  |
-| raise.rb:110:13:110:24 | [ensure(1): raise] inner ensure | raise.rb:110:12:110:25 | [ensure(1): raise] "inner ensure" |  |
-| raise.rb:110:13:110:24 | [ensure: raise, ensure(1): raise] inner ensure | raise.rb:110:12:110:25 | [ensure: raise, ensure(1): raise] "inner ensure" |  |
-| raise.rb:110:13:110:24 | [ensure: raise] inner ensure | raise.rb:110:12:110:25 | [ensure: raise] "inner ensure" |  |
-| raise.rb:110:13:110:24 | [ensure: return, ensure(1): raise] inner ensure | raise.rb:110:12:110:25 | [ensure: return, ensure(1): raise] "inner ensure" |  |
+| raise.rb:110:13:110:24 | [ensure(1): exception] inner ensure | raise.rb:110:12:110:25 | [ensure(1): exception] "inner ensure" |  |
+| raise.rb:110:13:110:24 | [ensure: exception, ensure(1): exception] inner ensure | raise.rb:110:12:110:25 | [ensure: exception, ensure(1): exception] "inner ensure" |  |
+| raise.rb:110:13:110:24 | [ensure: exception] inner ensure | raise.rb:110:12:110:25 | [ensure: exception] "inner ensure" |  |
+| raise.rb:110:13:110:24 | [ensure: return, ensure(1): exception] inner ensure | raise.rb:110:12:110:25 | [ensure: return, ensure(1): exception] "inner ensure" |  |
 | raise.rb:110:13:110:24 | [ensure: return] inner ensure | raise.rb:110:12:110:25 | [ensure: return] "inner ensure" |  |
 | raise.rb:110:13:110:24 | inner ensure | raise.rb:110:12:110:25 | "inner ensure" |  |
-| raise.rb:113:3:113:15 | call to puts | raise.rb:115:3:115:22 | [ensure: raise] self | raise |
+| raise.rb:113:3:113:15 | call to puts | raise.rb:115:3:115:22 | [ensure: exception] self | exception |
 | raise.rb:113:3:113:15 | call to puts | raise.rb:115:3:115:22 | self |  |
 | raise.rb:113:3:113:15 | self | raise.rb:113:9:113:14 | End m9 |  |
 | raise.rb:113:8:113:15 | "End m9" | raise.rb:113:3:113:15 | call to puts |  |
 | raise.rb:113:9:113:14 | End m9 | raise.rb:113:8:113:15 | "End m9" |  |
-| raise.rb:114:1:118:5 | [ensure: raise] ensure ... | raise.rb:94:1:119:3 | exit m9 (abnormal) | raise |
+| raise.rb:114:1:118:5 | [ensure: exception] ensure ... | raise.rb:94:1:119:3 | exit m9 (abnormal) | exception |
 | raise.rb:114:1:118:5 | [ensure: return] ensure ... | raise.rb:94:1:119:3 | exit m9 (normal) | return |
 | raise.rb:114:1:118:5 | ensure ... | raise.rb:94:1:119:3 | exit m9 (normal) |  |
-| raise.rb:115:3:115:22 | [ensure: raise] call to puts | raise.rb:116:6:116:7 | [ensure: raise] b2 |  |
-| raise.rb:115:3:115:22 | [ensure: raise] self | raise.rb:115:9:115:21 | [ensure: raise] method ensure |  |
+| raise.rb:115:3:115:22 | [ensure: exception] call to puts | raise.rb:116:6:116:7 | [ensure: exception] b2 |  |
+| raise.rb:115:3:115:22 | [ensure: exception] self | raise.rb:115:9:115:21 | [ensure: exception] method ensure |  |
 | raise.rb:115:3:115:22 | [ensure: return] call to puts | raise.rb:116:6:116:7 | [ensure: return] b2 |  |
 | raise.rb:115:3:115:22 | [ensure: return] self | raise.rb:115:9:115:21 | [ensure: return] method ensure |  |
 | raise.rb:115:3:115:22 | call to puts | raise.rb:116:6:116:7 | b2 |  |
 | raise.rb:115:3:115:22 | self | raise.rb:115:9:115:21 | method ensure |  |
 | raise.rb:115:8:115:22 | "method ensure" | raise.rb:115:3:115:22 | call to puts |  |
-| raise.rb:115:8:115:22 | [ensure: raise] "method ensure" | raise.rb:115:3:115:22 | [ensure: raise] call to puts |  |
+| raise.rb:115:8:115:22 | [ensure: exception] "method ensure" | raise.rb:115:3:115:22 | [ensure: exception] call to puts |  |
 | raise.rb:115:8:115:22 | [ensure: return] "method ensure" | raise.rb:115:3:115:22 | [ensure: return] call to puts |  |
-| raise.rb:115:9:115:21 | [ensure: raise] method ensure | raise.rb:115:8:115:22 | [ensure: raise] "method ensure" |  |
+| raise.rb:115:9:115:21 | [ensure: exception] method ensure | raise.rb:115:8:115:22 | [ensure: exception] "method ensure" |  |
 | raise.rb:115:9:115:21 | [ensure: return] method ensure | raise.rb:115:8:115:22 | [ensure: return] "method ensure" |  |
 | raise.rb:115:9:115:21 | method ensure | raise.rb:115:8:115:22 | "method ensure" |  |
-| raise.rb:116:3:118:5 | [ensure: raise] if ... | raise.rb:114:1:118:5 | [ensure: raise] ensure ... |  |
+| raise.rb:116:3:118:5 | [ensure: exception] if ... | raise.rb:114:1:118:5 | [ensure: exception] ensure ... |  |
 | raise.rb:116:3:118:5 | [ensure: return] if ... | raise.rb:114:1:118:5 | [ensure: return] ensure ... |  |
 | raise.rb:116:3:118:5 | if ... | raise.rb:114:1:118:5 | ensure ... |  |
-| raise.rb:116:6:116:7 | [ensure: raise] b2 | raise.rb:116:3:118:5 | [ensure: raise] if ... | false |
-| raise.rb:116:6:116:7 | [ensure: raise] b2 | raise.rb:117:5:117:22 | [ensure: raise] self | true |
+| raise.rb:116:6:116:7 | [ensure: exception] b2 | raise.rb:116:3:118:5 | [ensure: exception] if ... | false |
+| raise.rb:116:6:116:7 | [ensure: exception] b2 | raise.rb:117:5:117:22 | [ensure: exception] self | true |
 | raise.rb:116:6:116:7 | [ensure: return] b2 | raise.rb:116:3:118:5 | [ensure: return] if ... | false |
 | raise.rb:116:6:116:7 | [ensure: return] b2 | raise.rb:117:5:117:22 | [ensure: return] self | true |
 | raise.rb:116:6:116:7 | b2 | raise.rb:116:3:118:5 | if ... | false |
 | raise.rb:116:6:116:7 | b2 | raise.rb:117:5:117:22 | self | true |
-| raise.rb:117:5:117:22 | [ensure: raise] call to raise | raise.rb:94:1:119:3 | exit m9 (abnormal) | raise |
-| raise.rb:117:5:117:22 | [ensure: raise] self | raise.rb:117:12:117:21 | [ensure: raise] b2 is true |  |
-| raise.rb:117:5:117:22 | [ensure: return] call to raise | raise.rb:94:1:119:3 | exit m9 (abnormal) | raise |
+| raise.rb:117:5:117:22 | [ensure: exception] call to raise | raise.rb:94:1:119:3 | exit m9 (abnormal) | exception |
+| raise.rb:117:5:117:22 | [ensure: exception] self | raise.rb:117:12:117:21 | [ensure: exception] b2 is true |  |
+| raise.rb:117:5:117:22 | [ensure: return] call to raise | raise.rb:94:1:119:3 | exit m9 (abnormal) | exception |
 | raise.rb:117:5:117:22 | [ensure: return] self | raise.rb:117:12:117:21 | [ensure: return] b2 is true |  |
-| raise.rb:117:5:117:22 | call to raise | raise.rb:94:1:119:3 | exit m9 (abnormal) | raise |
+| raise.rb:117:5:117:22 | call to raise | raise.rb:94:1:119:3 | exit m9 (abnormal) | exception |
 | raise.rb:117:5:117:22 | self | raise.rb:117:12:117:21 | b2 is true |  |
 | raise.rb:117:11:117:22 | "b2 is true" | raise.rb:117:5:117:22 | call to raise |  |
-| raise.rb:117:11:117:22 | [ensure: raise] "b2 is true" | raise.rb:117:5:117:22 | [ensure: raise] call to raise |  |
+| raise.rb:117:11:117:22 | [ensure: exception] "b2 is true" | raise.rb:117:5:117:22 | [ensure: exception] call to raise |  |
 | raise.rb:117:11:117:22 | [ensure: return] "b2 is true" | raise.rb:117:5:117:22 | [ensure: return] call to raise |  |
-| raise.rb:117:12:117:21 | [ensure: raise] b2 is true | raise.rb:117:11:117:22 | [ensure: raise] "b2 is true" |  |
+| raise.rb:117:12:117:21 | [ensure: exception] b2 is true | raise.rb:117:11:117:22 | [ensure: exception] "b2 is true" |  |
 | raise.rb:117:12:117:21 | [ensure: return] b2 is true | raise.rb:117:11:117:22 | [ensure: return] "b2 is true" |  |
 | raise.rb:117:12:117:21 | b2 is true | raise.rb:117:11:117:22 | "b2 is true" |  |
 | raise.rb:121:1:126:3 | enter m10 | raise.rb:121:9:121:9 | p |  |
@@ -2254,7 +2254,7 @@
 | raise.rb:121:1:126:3 | m10 | raise.rb:128:1:140:3 | m11 |  |
 | raise.rb:121:9:121:9 | p | raise.rb:121:14:121:30 | self | false, no-match, true |
 | raise.rb:121:9:121:9 | p | raise.rb:125:3:125:51 | self | match |
-| raise.rb:121:14:121:30 | call to raise | raise.rb:121:1:126:3 | exit m10 (abnormal) | raise |
+| raise.rb:121:14:121:30 | call to raise | raise.rb:121:1:126:3 | exit m10 (abnormal) | exception |
 | raise.rb:121:14:121:30 | self | raise.rb:121:21:121:29 | Exception |  |
 | raise.rb:121:20:121:30 | "Exception" | raise.rb:121:14:121:30 | call to raise |  |
 | raise.rb:121:21:121:29 | Exception | raise.rb:121:20:121:30 | "Exception" |  |
@@ -2271,7 +2271,7 @@
 | raise.rb:130:5:132:7 | if ... | raise.rb:137:5:137:17 | self |  |
 | raise.rb:130:8:130:8 | b | raise.rb:130:5:132:7 | if ... | false |
 | raise.rb:130:8:130:8 | b | raise.rb:131:7:131:22 | self | true |
-| raise.rb:131:7:131:22 | call to raise | raise.rb:133:10:133:19 | ExceptionA | raise |
+| raise.rb:131:7:131:22 | call to raise | raise.rb:133:10:133:19 | ExceptionA | exception |
 | raise.rb:131:7:131:22 | self | raise.rb:131:13:131:22 | ExceptionA |  |
 | raise.rb:131:13:131:22 | ExceptionA | raise.rb:131:7:131:22 | call to raise |  |
 | raise.rb:133:3:133:19 | rescue ... | raise.rb:137:5:137:17 | self |  |
@@ -2279,22 +2279,22 @@
 | raise.rb:133:10:133:19 | ExceptionA | raise.rb:134:10:134:19 | ExceptionB | no-match |
 | raise.rb:134:3:135:21 | rescue ... | raise.rb:137:5:137:17 | self |  |
 | raise.rb:134:10:134:19 | ExceptionB | raise.rb:135:5:135:21 | self | match |
-| raise.rb:134:10:134:19 | ExceptionB | raise.rb:137:5:137:17 | [ensure: raise] self | raise |
+| raise.rb:134:10:134:19 | ExceptionB | raise.rb:137:5:137:17 | [ensure: exception] self | exception |
 | raise.rb:134:20:135:21 | then ... | raise.rb:134:3:135:21 | rescue ... |  |
 | raise.rb:135:5:135:21 | call to puts | raise.rb:134:20:135:21 | then ... |  |
 | raise.rb:135:5:135:21 | self | raise.rb:135:11:135:20 | ExceptionB |  |
 | raise.rb:135:10:135:21 | "ExceptionB" | raise.rb:135:5:135:21 | call to puts |  |
 | raise.rb:135:11:135:20 | ExceptionB | raise.rb:135:10:135:21 | "ExceptionB" |  |
-| raise.rb:136:3:137:17 | [ensure: raise] ensure ... | raise.rb:128:1:140:3 | exit m11 (abnormal) | raise |
+| raise.rb:136:3:137:17 | [ensure: exception] ensure ... | raise.rb:128:1:140:3 | exit m11 (abnormal) | exception |
 | raise.rb:136:3:137:17 | ensure ... | raise.rb:139:3:139:16 | self |  |
-| raise.rb:137:5:137:17 | [ensure: raise] call to puts | raise.rb:136:3:137:17 | [ensure: raise] ensure ... |  |
-| raise.rb:137:5:137:17 | [ensure: raise] self | raise.rb:137:11:137:16 | [ensure: raise] Ensure |  |
+| raise.rb:137:5:137:17 | [ensure: exception] call to puts | raise.rb:136:3:137:17 | [ensure: exception] ensure ... |  |
+| raise.rb:137:5:137:17 | [ensure: exception] self | raise.rb:137:11:137:16 | [ensure: exception] Ensure |  |
 | raise.rb:137:5:137:17 | call to puts | raise.rb:136:3:137:17 | ensure ... |  |
 | raise.rb:137:5:137:17 | self | raise.rb:137:11:137:16 | Ensure |  |
 | raise.rb:137:10:137:17 | "Ensure" | raise.rb:137:5:137:17 | call to puts |  |
-| raise.rb:137:10:137:17 | [ensure: raise] "Ensure" | raise.rb:137:5:137:17 | [ensure: raise] call to puts |  |
+| raise.rb:137:10:137:17 | [ensure: exception] "Ensure" | raise.rb:137:5:137:17 | [ensure: exception] call to puts |  |
 | raise.rb:137:11:137:16 | Ensure | raise.rb:137:10:137:17 | "Ensure" |  |
-| raise.rb:137:11:137:16 | [ensure: raise] Ensure | raise.rb:137:10:137:17 | [ensure: raise] "Ensure" |  |
+| raise.rb:137:11:137:16 | [ensure: exception] Ensure | raise.rb:137:10:137:17 | [ensure: exception] "Ensure" |  |
 | raise.rb:139:3:139:16 | call to puts | raise.rb:128:1:140:3 | exit m11 (normal) |  |
 | raise.rb:139:3:139:16 | self | raise.rb:139:9:139:15 | End m11 |  |
 | raise.rb:139:8:139:16 | "End m11" | raise.rb:139:3:139:16 | call to puts |  |
@@ -2306,13 +2306,13 @@
 | raise.rb:143:3:145:5 | if ... | raise.rb:147:10:147:10 | 3 |  |
 | raise.rb:143:6:143:6 | b | raise.rb:143:3:145:5 | if ... | false |
 | raise.rb:143:6:143:6 | b | raise.rb:144:5:144:12 | self | true |
-| raise.rb:144:5:144:12 | call to raise | raise.rb:147:10:147:10 | [ensure: raise] 3 | raise |
+| raise.rb:144:5:144:12 | call to raise | raise.rb:147:10:147:10 | [ensure: exception] 3 | exception |
 | raise.rb:144:5:144:12 | self | raise.rb:144:11:144:12 | "" |  |
 | raise.rb:144:11:144:12 | "" | raise.rb:144:5:144:12 | call to raise |  |
-| raise.rb:147:3:147:10 | [ensure: raise] return | raise.rb:142:1:148:3 | exit m12 (normal) | return |
+| raise.rb:147:3:147:10 | [ensure: exception] return | raise.rb:142:1:148:3 | exit m12 (normal) | return |
 | raise.rb:147:3:147:10 | return | raise.rb:142:1:148:3 | exit m12 (normal) | return |
 | raise.rb:147:10:147:10 | 3 | raise.rb:147:3:147:10 | return |  |
-| raise.rb:147:10:147:10 | [ensure: raise] 3 | raise.rb:147:3:147:10 | [ensure: raise] return |  |
+| raise.rb:147:10:147:10 | [ensure: exception] 3 | raise.rb:147:3:147:10 | [ensure: exception] return |  |
 | raise.rb:150:1:152:3 | enter m13 | raise.rb:151:1:151:6 | ensure ... |  |
 | raise.rb:150:1:152:3 | exit m13 (normal) | raise.rb:150:1:152:3 | exit m13 |  |
 | raise.rb:150:1:152:3 | m13 | raise.rb:154:1:156:3 | m14 |  |
@@ -2328,7 +2328,7 @@
 | raise.rb:155:16:155:50 | exit { ... } (normal) | raise.rb:155:16:155:50 | exit { ... } |  |
 | raise.rb:155:16:155:50 | { ... } | raise.rb:155:3:155:50 | call to each |  |
 | raise.rb:155:19:155:22 | elem | raise.rb:155:37:155:43 | element |  |
-| raise.rb:155:25:155:32 | call to raise | raise.rb:155:16:155:50 | exit { ... } (abnormal) | raise |
+| raise.rb:155:25:155:32 | call to raise | raise.rb:155:16:155:50 | exit { ... } (abnormal) | exception |
 | raise.rb:155:25:155:32 | self | raise.rb:155:31:155:32 | "" |  |
 | raise.rb:155:25:155:48 | ... if ... | raise.rb:155:16:155:50 | exit { ... } (normal) |  |
 | raise.rb:155:31:155:32 | "" | raise.rb:155:25:155:32 | call to raise |  |
@@ -2350,7 +2350,7 @@
 | raise.rb:160:9:162:7 | exit -> { ... } (abnormal) | raise.rb:160:9:162:7 | exit -> { ... } |  |
 | raise.rb:160:9:162:7 | exit -> { ... } (normal) | raise.rb:160:9:162:7 | exit -> { ... } |  |
 | raise.rb:160:12:160:12 | x | raise.rb:161:23:161:23 | x |  |
-| raise.rb:161:7:161:14 | call to raise | raise.rb:160:9:162:7 | exit -> { ... } (abnormal) | raise |
+| raise.rb:161:7:161:14 | call to raise | raise.rb:160:9:162:7 | exit -> { ... } (abnormal) | exception |
 | raise.rb:161:7:161:14 | self | raise.rb:161:13:161:14 | "" |  |
 | raise.rb:161:7:161:23 | ... unless ... | raise.rb:160:9:162:7 | exit -> { ... } (normal) |  |
 | raise.rb:161:13:161:14 | "" | raise.rb:161:7:161:14 | call to raise |  |
@@ -2361,7 +2361,7 @@
 | raise.rb:167:3:169:5 | exit m (abnormal) | raise.rb:167:3:169:5 | exit m |  |
 | raise.rb:167:3:169:5 | m | raise.rb:172:1:182:3 | m16 |  |
 | raise.rb:167:7:167:10 | self | raise.rb:167:3:169:5 | m |  |
-| raise.rb:168:5:168:12 | call to raise | raise.rb:167:3:169:5 | exit m (abnormal) | raise |
+| raise.rb:168:5:168:12 | call to raise | raise.rb:167:3:169:5 | exit m (abnormal) | exception |
 | raise.rb:168:5:168:12 | self | raise.rb:168:11:168:12 | "" |  |
 | raise.rb:168:11:168:12 | "" | raise.rb:168:5:168:12 | call to raise |  |
 | raise.rb:172:1:182:3 | enter m16 | raise.rb:172:9:172:10 | b1 |  |
@@ -2373,19 +2373,19 @@
 | raise.rb:174:8:174:9 | b1 | raise.rb:174:8:174:23 | [true] ... \|\| ... | true |
 | raise.rb:174:8:174:9 | b1 | raise.rb:174:14:174:15 | b2 | false |
 | raise.rb:174:8:174:23 | [false] ... \|\| ... | raise.rb:177:14:177:14 | 2 | false |
-| raise.rb:174:8:174:23 | [false] ... \|\| ... | raise.rb:179:10:179:19 | ExceptionA | raise |
+| raise.rb:174:8:174:23 | [false] ... \|\| ... | raise.rb:179:10:179:19 | ExceptionA | exception |
 | raise.rb:174:8:174:23 | [true] ... \|\| ... | raise.rb:175:14:175:14 | 1 | true |
-| raise.rb:174:8:174:23 | [true] ... \|\| ... | raise.rb:179:10:179:19 | ExceptionA | raise |
+| raise.rb:174:8:174:23 | [true] ... \|\| ... | raise.rb:179:10:179:19 | ExceptionA | exception |
 | raise.rb:174:14:174:15 | b2 | raise.rb:174:20:174:23 | true |  |
 | raise.rb:174:14:174:23 | ... == ... | raise.rb:174:8:174:23 | [false] ... \|\| ... | false |
 | raise.rb:174:14:174:23 | ... == ... | raise.rb:174:8:174:23 | [true] ... \|\| ... | true |
-| raise.rb:174:14:174:23 | ... == ... | raise.rb:179:10:179:19 | ExceptionA | raise |
+| raise.rb:174:14:174:23 | ... == ... | raise.rb:179:10:179:19 | ExceptionA | exception |
 | raise.rb:174:20:174:23 | true | raise.rb:174:14:174:23 | ... == ... |  |
 | raise.rb:175:7:175:14 | return | raise.rb:172:1:182:3 | exit m16 (normal) | return |
 | raise.rb:175:14:175:14 | 1 | raise.rb:175:7:175:14 | return |  |
 | raise.rb:177:7:177:14 | return | raise.rb:172:1:182:3 | exit m16 (normal) | return |
 | raise.rb:177:14:177:14 | 2 | raise.rb:177:7:177:14 | return |  |
-| raise.rb:179:10:179:19 | ExceptionA | raise.rb:172:1:182:3 | exit m16 (abnormal) | raise |
+| raise.rb:179:10:179:19 | ExceptionA | raise.rb:172:1:182:3 | exit m16 (abnormal) | exception |
 | raise.rb:179:10:179:19 | ExceptionA | raise.rb:180:12:180:12 | 3 | match |
 | raise.rb:180:5:180:12 | return | raise.rb:172:1:182:3 | exit m16 (normal) | return |
 | raise.rb:180:12:180:12 | 3 | raise.rb:180:5:180:12 | return |  |
diff --git a/ruby/ql/test/library-tests/controlflow/graph/Nodes.expected b/ruby/ql/test/library-tests/controlflow/graph/Nodes.expected
index 2bc683f894e..54cf1d08543 100644
--- a/ruby/ql/test/library-tests/controlflow/graph/Nodes.expected
+++ b/ruby/ql/test/library-tests/controlflow/graph/Nodes.expected
@@ -1,10 +1,10 @@
 callsWithNoArguments
-| break_ensure.rb:8:6:8:13 | [ensure: raise] call to elements |
+| break_ensure.rb:8:6:8:13 | [ensure: exception] call to elements |
 | break_ensure.rb:8:6:8:13 | call to elements |
-| break_ensure.rb:8:6:8:18 | [ensure: raise] call to nil? |
+| break_ensure.rb:8:6:8:18 | [ensure: exception] call to nil? |
 | break_ensure.rb:8:6:8:18 | call to nil? |
 | break_ensure.rb:20:10:20:15 | [ensure: break] call to nil? |
-| break_ensure.rb:20:10:20:15 | [ensure: raise] call to nil? |
+| break_ensure.rb:20:10:20:15 | [ensure: exception] call to nil? |
 | break_ensure.rb:20:10:20:15 | call to nil? |
 | break_ensure.rb:29:8:29:13 | call to nil? |
 | case.rb:2:8:2:9 | call to x1 |
@@ -72,25 +72,25 @@ callsWithNoArguments
 positionalArguments
 | break_ensure.rb:2:9:2:13 | ... < ... | break_ensure.rb:2:13:2:13 | 0 |
 | break_ensure.rb:3:8:3:12 | ... > ... | break_ensure.rb:3:12:3:12 | 0 |
-| break_ensure.rb:9:5:9:23 | [ensure: raise] call to puts | break_ensure.rb:9:10:9:23 | [ensure: raise] "elements nil" |
+| break_ensure.rb:9:5:9:23 | [ensure: exception] call to puts | break_ensure.rb:9:10:9:23 | [ensure: exception] "elements nil" |
 | break_ensure.rb:9:5:9:23 | call to puts | break_ensure.rb:9:10:9:23 | "elements nil" |
 | break_ensure.rb:14:9:14:13 | ... < ... | break_ensure.rb:14:13:14:13 | 0 |
 | break_ensure.rb:16:10:16:14 | ... > ... | break_ensure.rb:16:14:16:14 | 0 |
 | break_ensure.rb:21:9:21:20 | [ensure: break] call to puts | break_ensure.rb:21:14:21:20 | [ensure: break] "y nil" |
-| break_ensure.rb:21:9:21:20 | [ensure: raise] call to puts | break_ensure.rb:21:14:21:20 | [ensure: raise] "y nil" |
+| break_ensure.rb:21:9:21:20 | [ensure: exception] call to puts | break_ensure.rb:21:14:21:20 | [ensure: exception] "y nil" |
 | break_ensure.rb:21:9:21:20 | call to puts | break_ensure.rb:21:14:21:20 | "y nil" |
 | break_ensure.rb:33:11:33:15 | ... < ... | break_ensure.rb:33:15:33:15 | 0 |
-| break_ensure.rb:33:11:33:15 | [ensure: raise] ... < ... | break_ensure.rb:33:15:33:15 | [ensure: raise] 0 |
+| break_ensure.rb:33:11:33:15 | [ensure: exception] ... < ... | break_ensure.rb:33:15:33:15 | [ensure: exception] 0 |
 | break_ensure.rb:33:11:33:15 | [ensure: return] ... < ... | break_ensure.rb:33:15:33:15 | [ensure: return] 0 |
 | break_ensure.rb:35:12:35:16 | ... > ... | break_ensure.rb:35:16:35:16 | 0 |
-| break_ensure.rb:35:12:35:16 | [ensure: raise] ... > ... | break_ensure.rb:35:16:35:16 | [ensure: raise] 0 |
+| break_ensure.rb:35:12:35:16 | [ensure: exception] ... > ... | break_ensure.rb:35:16:35:16 | [ensure: exception] 0 |
 | break_ensure.rb:35:12:35:16 | [ensure: return] ... > ... | break_ensure.rb:35:16:35:16 | [ensure: return] 0 |
 | break_ensure.rb:41:3:41:13 | call to puts | break_ensure.rb:41:8:41:13 | "Done" |
 | break_ensure.rb:45:9:45:13 | ... < ... | break_ensure.rb:45:13:45:13 | 0 |
 | break_ensure.rb:47:10:47:14 | ... > ... | break_ensure.rb:47:14:47:14 | 1 |
 | break_ensure.rb:48:9:48:16 | call to raise | break_ensure.rb:48:15:48:16 | "" |
 | break_ensure.rb:51:10:51:14 | ... > ... | break_ensure.rb:51:14:51:14 | 0 |
-| break_ensure.rb:51:10:51:14 | [ensure: raise] ... > ... | break_ensure.rb:51:14:51:14 | [ensure: raise] 0 |
+| break_ensure.rb:51:10:51:14 | [ensure: exception] ... > ... | break_ensure.rb:51:14:51:14 | [ensure: exception] 0 |
 | case.rb:3:29:3:37 | call to puts | case.rb:3:34:3:37 | "x2" |
 | case.rb:4:17:4:24 | call to puts | case.rb:4:22:4:24 | "2" |
 | case.rb:14:13:14:18 | ... == ... | case.rb:14:18:14:18 | 5 |
@@ -319,7 +319,7 @@ positionalArguments
 | raise.rb:70:5:70:17 | call to raise | raise.rb:70:11:70:17 | "x > 2" |
 | raise.rb:71:9:71:13 | ... < ... | raise.rb:71:13:71:13 | 0 |
 | raise.rb:74:3:74:20 | call to puts | raise.rb:74:8:74:20 | "0 <= x <= 2" |
-| raise.rb:76:3:76:15 | [ensure: raise] call to puts | raise.rb:76:8:76:15 | [ensure: raise] "ensure" |
+| raise.rb:76:3:76:15 | [ensure: exception] call to puts | raise.rb:76:8:76:15 | [ensure: exception] "ensure" |
 | raise.rb:76:3:76:15 | [ensure: return] call to puts | raise.rb:76:8:76:15 | [ensure: return] "ensure" |
 | raise.rb:76:3:76:15 | call to puts | raise.rb:76:8:76:15 | "ensure" |
 | raise.rb:80:3:80:17 | call to puts | raise.rb:80:8:80:17 | "Begin m8" |
@@ -327,7 +327,7 @@ positionalArguments
 | raise.rb:83:7:83:19 | call to raise | raise.rb:83:13:83:19 | "x > 2" |
 | raise.rb:84:11:84:15 | ... < ... | raise.rb:84:15:84:15 | 0 |
 | raise.rb:87:5:87:22 | call to puts | raise.rb:87:10:87:22 | "0 <= x <= 2" |
-| raise.rb:89:5:89:17 | [ensure: raise] call to puts | raise.rb:89:10:89:17 | [ensure: raise] "ensure" |
+| raise.rb:89:5:89:17 | [ensure: exception] call to puts | raise.rb:89:10:89:17 | [ensure: exception] "ensure" |
 | raise.rb:89:5:89:17 | [ensure: return] call to puts | raise.rb:89:10:89:17 | [ensure: return] "ensure" |
 | raise.rb:89:5:89:17 | call to puts | raise.rb:89:10:89:17 | "ensure" |
 | raise.rb:91:3:91:15 | call to puts | raise.rb:91:8:91:15 | "End m8" |
@@ -336,30 +336,30 @@ positionalArguments
 | raise.rb:98:7:98:19 | call to raise | raise.rb:98:13:98:19 | "x > 2" |
 | raise.rb:99:11:99:15 | ... < ... | raise.rb:99:15:99:15 | 0 |
 | raise.rb:102:5:102:22 | call to puts | raise.rb:102:10:102:22 | "0 <= x <= 2" |
-| raise.rb:104:5:104:23 | [ensure: raise] call to puts | raise.rb:104:10:104:23 | [ensure: raise] "outer ensure" |
+| raise.rb:104:5:104:23 | [ensure: exception] call to puts | raise.rb:104:10:104:23 | [ensure: exception] "outer ensure" |
 | raise.rb:104:5:104:23 | [ensure: return] call to puts | raise.rb:104:10:104:23 | [ensure: return] "outer ensure" |
 | raise.rb:104:5:104:23 | call to puts | raise.rb:104:10:104:23 | "outer ensure" |
-| raise.rb:107:9:107:26 | [ensure: raise] call to raise | raise.rb:107:15:107:26 | [ensure: raise] "b1 is true" |
+| raise.rb:107:9:107:26 | [ensure: exception] call to raise | raise.rb:107:15:107:26 | [ensure: exception] "b1 is true" |
 | raise.rb:107:9:107:26 | [ensure: return] call to raise | raise.rb:107:15:107:26 | [ensure: return] "b1 is true" |
 | raise.rb:107:9:107:26 | call to raise | raise.rb:107:15:107:26 | "b1 is true" |
-| raise.rb:110:7:110:25 | [ensure(1): raise] call to puts | raise.rb:110:12:110:25 | [ensure(1): raise] "inner ensure" |
-| raise.rb:110:7:110:25 | [ensure: raise, ensure(1): raise] call to puts | raise.rb:110:12:110:25 | [ensure: raise, ensure(1): raise] "inner ensure" |
-| raise.rb:110:7:110:25 | [ensure: raise] call to puts | raise.rb:110:12:110:25 | [ensure: raise] "inner ensure" |
-| raise.rb:110:7:110:25 | [ensure: return, ensure(1): raise] call to puts | raise.rb:110:12:110:25 | [ensure: return, ensure(1): raise] "inner ensure" |
+| raise.rb:110:7:110:25 | [ensure(1): exception] call to puts | raise.rb:110:12:110:25 | [ensure(1): exception] "inner ensure" |
+| raise.rb:110:7:110:25 | [ensure: exception, ensure(1): exception] call to puts | raise.rb:110:12:110:25 | [ensure: exception, ensure(1): exception] "inner ensure" |
+| raise.rb:110:7:110:25 | [ensure: exception] call to puts | raise.rb:110:12:110:25 | [ensure: exception] "inner ensure" |
+| raise.rb:110:7:110:25 | [ensure: return, ensure(1): exception] call to puts | raise.rb:110:12:110:25 | [ensure: return, ensure(1): exception] "inner ensure" |
 | raise.rb:110:7:110:25 | [ensure: return] call to puts | raise.rb:110:12:110:25 | [ensure: return] "inner ensure" |
 | raise.rb:110:7:110:25 | call to puts | raise.rb:110:12:110:25 | "inner ensure" |
 | raise.rb:113:3:113:15 | call to puts | raise.rb:113:8:113:15 | "End m9" |
-| raise.rb:115:3:115:22 | [ensure: raise] call to puts | raise.rb:115:8:115:22 | [ensure: raise] "method ensure" |
+| raise.rb:115:3:115:22 | [ensure: exception] call to puts | raise.rb:115:8:115:22 | [ensure: exception] "method ensure" |
 | raise.rb:115:3:115:22 | [ensure: return] call to puts | raise.rb:115:8:115:22 | [ensure: return] "method ensure" |
 | raise.rb:115:3:115:22 | call to puts | raise.rb:115:8:115:22 | "method ensure" |
-| raise.rb:117:5:117:22 | [ensure: raise] call to raise | raise.rb:117:11:117:22 | [ensure: raise] "b2 is true" |
+| raise.rb:117:5:117:22 | [ensure: exception] call to raise | raise.rb:117:11:117:22 | [ensure: exception] "b2 is true" |
 | raise.rb:117:5:117:22 | [ensure: return] call to raise | raise.rb:117:11:117:22 | [ensure: return] "b2 is true" |
 | raise.rb:117:5:117:22 | call to raise | raise.rb:117:11:117:22 | "b2 is true" |
 | raise.rb:121:14:121:30 | call to raise | raise.rb:121:20:121:30 | "Exception" |
 | raise.rb:125:3:125:51 | call to puts | raise.rb:125:8:125:51 | "Will not get executed if p is..." |
 | raise.rb:131:7:131:22 | call to raise | raise.rb:131:13:131:22 | ExceptionA |
 | raise.rb:135:5:135:21 | call to puts | raise.rb:135:10:135:21 | "ExceptionB" |
-| raise.rb:137:5:137:17 | [ensure: raise] call to puts | raise.rb:137:10:137:17 | [ensure: raise] "Ensure" |
+| raise.rb:137:5:137:17 | [ensure: exception] call to puts | raise.rb:137:10:137:17 | [ensure: exception] "Ensure" |
 | raise.rb:137:5:137:17 | call to puts | raise.rb:137:10:137:17 | "Ensure" |
 | raise.rb:139:3:139:16 | call to puts | raise.rb:139:8:139:16 | "End m11" |
 | raise.rb:144:5:144:12 | call to raise | raise.rb:144:11:144:12 | "" |
diff --git a/ruby/ql/test/library-tests/dataflow/barrier-guards/barrier-flow.ql b/ruby/ql/test/library-tests/dataflow/barrier-guards/barrier-flow.ql
index e485d98d361..3828ea6b3ae 100644
--- a/ruby/ql/test/library-tests/dataflow/barrier-guards/barrier-flow.ql
+++ b/ruby/ql/test/library-tests/dataflow/barrier-guards/barrier-flow.ql
@@ -2,8 +2,7 @@
  * @kind path-problem
  */
 
-import codeql.ruby.AST
-import codeql.ruby.CFG
+import ruby
 import utils.test.InlineFlowTest
 import codeql.ruby.dataflow.BarrierGuards
 import PathGraph
diff --git a/ruby/ql/test/library-tests/dataflow/barrier-guards/barrier-guards.ql b/ruby/ql/test/library-tests/dataflow/barrier-guards/barrier-guards.ql
index 1bf7461e7fa..86609a73909 100644
--- a/ruby/ql/test/library-tests/dataflow/barrier-guards/barrier-guards.ql
+++ b/ruby/ql/test/library-tests/dataflow/barrier-guards/barrier-guards.ql
@@ -12,7 +12,7 @@ query predicate newStyleBarrierGuards(DataFlow::Node n) {
   n instanceof StringConstArrayInclusionCallBarrier
 }
 
-query predicate controls(CfgNode condition, BasicBlock bb, SuccessorTypes::ConditionalSuccessor s) {
+query predicate controls(CfgNode condition, BasicBlock bb, ConditionalSuccessor s) {
   exists(ConditionBlock cb |
     cb.edgeDominates(bb, s) and
     condition = cb.getLastNode()
diff --git a/ruby/ql/test/library-tests/frameworks/grape/CONSISTENCY/VariablesConsistency.expected b/ruby/ql/test/library-tests/frameworks/grape/CONSISTENCY/VariablesConsistency.expected
new file mode 100644
index 00000000000..edcc754b792
--- /dev/null
+++ b/ruby/ql/test/library-tests/frameworks/grape/CONSISTENCY/VariablesConsistency.expected
@@ -0,0 +1,4 @@
+variableIsCaptured
+| app.rb:126:9:130:11 | self | CapturedVariable is not captured |
+consistencyOverview
+| CapturedVariable is not captured | 1 |
diff --git a/ruby/ql/test/library-tests/frameworks/grape/Flow.expected b/ruby/ql/test/library-tests/frameworks/grape/Flow.expected
new file mode 100644
index 00000000000..f04bd930ea9
--- /dev/null
+++ b/ruby/ql/test/library-tests/frameworks/grape/Flow.expected
@@ -0,0 +1,201 @@
+models
+edges
+| app.rb:103:13:103:18 | call to params | app.rb:103:13:103:70 | call to select | provenance |  |
+| app.rb:103:13:103:18 | call to params | app.rb:103:13:103:70 | call to select : [collection] [element] | provenance |  |
+| app.rb:103:13:103:70 | call to select | app.rb:189:21:189:31 | call to user_params | provenance |  |
+| app.rb:103:13:103:70 | call to select | app.rb:205:21:205:31 | call to user_params | provenance |  |
+| app.rb:103:13:103:70 | call to select : [collection] [element] | app.rb:189:21:189:31 | call to user_params : [collection] [element] | provenance |  |
+| app.rb:103:13:103:70 | call to select : [collection] [element] | app.rb:205:21:205:31 | call to user_params : [collection] [element] | provenance |  |
+| app.rb:107:13:107:32 | call to source | app.rb:183:18:183:43 | call to vulnerable_helper | provenance |  |
+| app.rb:107:13:107:32 | call to source | app.rb:183:18:183:43 | call to vulnerable_helper | provenance |  |
+| app.rb:111:13:111:33 | call to source | app.rb:190:25:190:37 | call to simple_helper | provenance |  |
+| app.rb:111:13:111:33 | call to source | app.rb:190:25:190:37 | call to simple_helper | provenance |  |
+| app.rb:118:17:118:43 | call to source | app.rb:212:23:212:39 | call to authenticate_user | provenance |  |
+| app.rb:118:17:118:43 | call to source | app.rb:212:23:212:39 | call to authenticate_user | provenance |  |
+| app.rb:122:17:122:47 | call to source | app.rb:216:23:216:48 | call to check_permissions | provenance |  |
+| app.rb:122:17:122:47 | call to source | app.rb:216:23:216:48 | call to check_permissions | provenance |  |
+| app.rb:128:17:128:42 | call to source | app.rb:220:29:220:80 | call to validate_email | provenance |  |
+| app.rb:128:17:128:42 | call to source | app.rb:220:29:220:80 | call to validate_email | provenance |  |
+| app.rb:134:17:134:42 | call to source | app.rb:225:28:225:39 | call to debug_helper | provenance |  |
+| app.rb:134:17:134:42 | call to source | app.rb:225:28:225:39 | call to debug_helper | provenance |  |
+| app.rb:140:17:140:37 | call to source | app.rb:230:25:230:37 | call to rescue_helper | provenance |  |
+| app.rb:140:17:140:37 | call to source | app.rb:230:25:230:37 | call to rescue_helper | provenance |  |
+| app.rb:150:17:150:35 | call to source | app.rb:235:27:235:37 | call to test_helper | provenance |  |
+| app.rb:150:17:150:35 | call to source | app.rb:235:27:235:37 | call to test_helper | provenance |  |
+| app.rb:166:9:166:15 | user_id | app.rb:173:14:173:20 | user_id | provenance |  |
+| app.rb:166:19:166:24 | call to params | app.rb:166:19:166:34 | ...[...] | provenance |  |
+| app.rb:166:19:166:34 | ...[...] | app.rb:166:9:166:15 | user_id | provenance |  |
+| app.rb:167:9:167:16 | route_id | app.rb:174:14:174:21 | route_id | provenance |  |
+| app.rb:167:20:167:40 | call to route_param | app.rb:167:9:167:16 | route_id | provenance |  |
+| app.rb:168:9:168:12 | auth | app.rb:175:14:175:17 | auth | provenance |  |
+| app.rb:168:16:168:22 | call to headers | app.rb:168:16:168:38 | ...[...] | provenance |  |
+| app.rb:168:16:168:38 | ...[...] | app.rb:168:9:168:12 | auth | provenance |  |
+| app.rb:169:9:169:15 | session | app.rb:176:14:176:20 | session | provenance |  |
+| app.rb:169:19:169:25 | call to cookies | app.rb:169:19:169:38 | ...[...] | provenance |  |
+| app.rb:169:19:169:38 | ...[...] | app.rb:169:9:169:15 | session | provenance |  |
+| app.rb:183:9:183:14 | result | app.rb:184:14:184:19 | result | provenance |  |
+| app.rb:183:9:183:14 | result | app.rb:184:14:184:19 | result | provenance |  |
+| app.rb:183:18:183:43 | call to vulnerable_helper | app.rb:183:9:183:14 | result | provenance |  |
+| app.rb:183:18:183:43 | call to vulnerable_helper | app.rb:183:9:183:14 | result | provenance |  |
+| app.rb:189:9:189:17 | user_data | app.rb:191:14:191:22 | user_data | provenance |  |
+| app.rb:189:9:189:17 | user_data : [collection] [element] | app.rb:191:14:191:22 | user_data | provenance |  |
+| app.rb:189:21:189:31 | call to user_params | app.rb:189:9:189:17 | user_data | provenance |  |
+| app.rb:189:21:189:31 | call to user_params : [collection] [element] | app.rb:189:9:189:17 | user_data : [collection] [element] | provenance |  |
+| app.rb:190:9:190:21 | simple_result | app.rb:192:14:192:26 | simple_result | provenance |  |
+| app.rb:190:9:190:21 | simple_result | app.rb:192:14:192:26 | simple_result | provenance |  |
+| app.rb:190:25:190:37 | call to simple_helper | app.rb:190:9:190:21 | simple_result | provenance |  |
+| app.rb:190:25:190:37 | call to simple_helper | app.rb:190:9:190:21 | simple_result | provenance |  |
+| app.rb:199:13:199:19 | user_id | app.rb:200:18:200:24 | user_id | provenance |  |
+| app.rb:199:23:199:28 | call to params | app.rb:199:23:199:33 | ...[...] | provenance |  |
+| app.rb:199:23:199:33 | ...[...] | app.rb:199:13:199:19 | user_id | provenance |  |
+| app.rb:205:9:205:17 | user_data | app.rb:206:14:206:22 | user_data | provenance |  |
+| app.rb:205:9:205:17 | user_data : [collection] [element] | app.rb:206:14:206:22 | user_data | provenance |  |
+| app.rb:205:21:205:31 | call to user_params | app.rb:205:9:205:17 | user_data | provenance |  |
+| app.rb:205:21:205:31 | call to user_params : [collection] [element] | app.rb:205:9:205:17 | user_data : [collection] [element] | provenance |  |
+| app.rb:212:9:212:19 | auth_result | app.rb:213:14:213:24 | auth_result | provenance |  |
+| app.rb:212:9:212:19 | auth_result | app.rb:213:14:213:24 | auth_result | provenance |  |
+| app.rb:212:23:212:39 | call to authenticate_user | app.rb:212:9:212:19 | auth_result | provenance |  |
+| app.rb:212:23:212:39 | call to authenticate_user | app.rb:212:9:212:19 | auth_result | provenance |  |
+| app.rb:216:9:216:19 | perm_result | app.rb:217:14:217:24 | perm_result | provenance |  |
+| app.rb:216:9:216:19 | perm_result | app.rb:217:14:217:24 | perm_result | provenance |  |
+| app.rb:216:23:216:48 | call to check_permissions | app.rb:216:9:216:19 | perm_result | provenance |  |
+| app.rb:216:23:216:48 | call to check_permissions | app.rb:216:9:216:19 | perm_result | provenance |  |
+| app.rb:220:9:220:25 | validation_result | app.rb:221:14:221:30 | validation_result | provenance |  |
+| app.rb:220:9:220:25 | validation_result | app.rb:221:14:221:30 | validation_result | provenance |  |
+| app.rb:220:29:220:80 | call to validate_email | app.rb:220:9:220:25 | validation_result | provenance |  |
+| app.rb:220:29:220:80 | call to validate_email | app.rb:220:9:220:25 | validation_result | provenance |  |
+| app.rb:225:13:225:24 | debug_result | app.rb:226:18:226:29 | debug_result | provenance |  |
+| app.rb:225:13:225:24 | debug_result | app.rb:226:18:226:29 | debug_result | provenance |  |
+| app.rb:225:28:225:39 | call to debug_helper | app.rb:225:13:225:24 | debug_result | provenance |  |
+| app.rb:225:28:225:39 | call to debug_helper | app.rb:225:13:225:24 | debug_result | provenance |  |
+| app.rb:230:9:230:21 | rescue_result | app.rb:231:14:231:26 | rescue_result | provenance |  |
+| app.rb:230:9:230:21 | rescue_result | app.rb:231:14:231:26 | rescue_result | provenance |  |
+| app.rb:230:25:230:37 | call to rescue_helper | app.rb:230:9:230:21 | rescue_result | provenance |  |
+| app.rb:230:25:230:37 | call to rescue_helper | app.rb:230:9:230:21 | rescue_result | provenance |  |
+| app.rb:235:13:235:23 | case_result | app.rb:236:18:236:28 | case_result | provenance |  |
+| app.rb:235:13:235:23 | case_result | app.rb:236:18:236:28 | case_result | provenance |  |
+| app.rb:235:27:235:37 | call to test_helper | app.rb:235:13:235:23 | case_result | provenance |  |
+| app.rb:235:27:235:37 | call to test_helper | app.rb:235:13:235:23 | case_result | provenance |  |
+nodes
+| app.rb:103:13:103:18 | call to params | semmle.label | call to params |
+| app.rb:103:13:103:70 | call to select | semmle.label | call to select |
+| app.rb:103:13:103:70 | call to select : [collection] [element] | semmle.label | call to select : [collection] [element] |
+| app.rb:107:13:107:32 | call to source | semmle.label | call to source |
+| app.rb:107:13:107:32 | call to source | semmle.label | call to source |
+| app.rb:111:13:111:33 | call to source | semmle.label | call to source |
+| app.rb:111:13:111:33 | call to source | semmle.label | call to source |
+| app.rb:118:17:118:43 | call to source | semmle.label | call to source |
+| app.rb:118:17:118:43 | call to source | semmle.label | call to source |
+| app.rb:122:17:122:47 | call to source | semmle.label | call to source |
+| app.rb:122:17:122:47 | call to source | semmle.label | call to source |
+| app.rb:128:17:128:42 | call to source | semmle.label | call to source |
+| app.rb:128:17:128:42 | call to source | semmle.label | call to source |
+| app.rb:134:17:134:42 | call to source | semmle.label | call to source |
+| app.rb:134:17:134:42 | call to source | semmle.label | call to source |
+| app.rb:140:17:140:37 | call to source | semmle.label | call to source |
+| app.rb:140:17:140:37 | call to source | semmle.label | call to source |
+| app.rb:150:17:150:35 | call to source | semmle.label | call to source |
+| app.rb:150:17:150:35 | call to source | semmle.label | call to source |
+| app.rb:166:9:166:15 | user_id | semmle.label | user_id |
+| app.rb:166:19:166:24 | call to params | semmle.label | call to params |
+| app.rb:166:19:166:34 | ...[...] | semmle.label | ...[...] |
+| app.rb:167:9:167:16 | route_id | semmle.label | route_id |
+| app.rb:167:20:167:40 | call to route_param | semmle.label | call to route_param |
+| app.rb:168:9:168:12 | auth | semmle.label | auth |
+| app.rb:168:16:168:22 | call to headers | semmle.label | call to headers |
+| app.rb:168:16:168:38 | ...[...] | semmle.label | ...[...] |
+| app.rb:169:9:169:15 | session | semmle.label | session |
+| app.rb:169:19:169:25 | call to cookies | semmle.label | call to cookies |
+| app.rb:169:19:169:38 | ...[...] | semmle.label | ...[...] |
+| app.rb:173:14:173:20 | user_id | semmle.label | user_id |
+| app.rb:174:14:174:21 | route_id | semmle.label | route_id |
+| app.rb:175:14:175:17 | auth | semmle.label | auth |
+| app.rb:176:14:176:20 | session | semmle.label | session |
+| app.rb:183:9:183:14 | result | semmle.label | result |
+| app.rb:183:9:183:14 | result | semmle.label | result |
+| app.rb:183:18:183:43 | call to vulnerable_helper | semmle.label | call to vulnerable_helper |
+| app.rb:183:18:183:43 | call to vulnerable_helper | semmle.label | call to vulnerable_helper |
+| app.rb:184:14:184:19 | result | semmle.label | result |
+| app.rb:184:14:184:19 | result | semmle.label | result |
+| app.rb:189:9:189:17 | user_data | semmle.label | user_data |
+| app.rb:189:9:189:17 | user_data : [collection] [element] | semmle.label | user_data : [collection] [element] |
+| app.rb:189:21:189:31 | call to user_params | semmle.label | call to user_params |
+| app.rb:189:21:189:31 | call to user_params : [collection] [element] | semmle.label | call to user_params : [collection] [element] |
+| app.rb:190:9:190:21 | simple_result | semmle.label | simple_result |
+| app.rb:190:9:190:21 | simple_result | semmle.label | simple_result |
+| app.rb:190:25:190:37 | call to simple_helper | semmle.label | call to simple_helper |
+| app.rb:190:25:190:37 | call to simple_helper | semmle.label | call to simple_helper |
+| app.rb:191:14:191:22 | user_data | semmle.label | user_data |
+| app.rb:192:14:192:26 | simple_result | semmle.label | simple_result |
+| app.rb:192:14:192:26 | simple_result | semmle.label | simple_result |
+| app.rb:199:13:199:19 | user_id | semmle.label | user_id |
+| app.rb:199:23:199:28 | call to params | semmle.label | call to params |
+| app.rb:199:23:199:33 | ...[...] | semmle.label | ...[...] |
+| app.rb:200:18:200:24 | user_id | semmle.label | user_id |
+| app.rb:205:9:205:17 | user_data | semmle.label | user_data |
+| app.rb:205:9:205:17 | user_data : [collection] [element] | semmle.label | user_data : [collection] [element] |
+| app.rb:205:21:205:31 | call to user_params | semmle.label | call to user_params |
+| app.rb:205:21:205:31 | call to user_params : [collection] [element] | semmle.label | call to user_params : [collection] [element] |
+| app.rb:206:14:206:22 | user_data | semmle.label | user_data |
+| app.rb:212:9:212:19 | auth_result | semmle.label | auth_result |
+| app.rb:212:9:212:19 | auth_result | semmle.label | auth_result |
+| app.rb:212:23:212:39 | call to authenticate_user | semmle.label | call to authenticate_user |
+| app.rb:212:23:212:39 | call to authenticate_user | semmle.label | call to authenticate_user |
+| app.rb:213:14:213:24 | auth_result | semmle.label | auth_result |
+| app.rb:213:14:213:24 | auth_result | semmle.label | auth_result |
+| app.rb:216:9:216:19 | perm_result | semmle.label | perm_result |
+| app.rb:216:9:216:19 | perm_result | semmle.label | perm_result |
+| app.rb:216:23:216:48 | call to check_permissions | semmle.label | call to check_permissions |
+| app.rb:216:23:216:48 | call to check_permissions | semmle.label | call to check_permissions |
+| app.rb:217:14:217:24 | perm_result | semmle.label | perm_result |
+| app.rb:217:14:217:24 | perm_result | semmle.label | perm_result |
+| app.rb:220:9:220:25 | validation_result | semmle.label | validation_result |
+| app.rb:220:9:220:25 | validation_result | semmle.label | validation_result |
+| app.rb:220:29:220:80 | call to validate_email | semmle.label | call to validate_email |
+| app.rb:220:29:220:80 | call to validate_email | semmle.label | call to validate_email |
+| app.rb:221:14:221:30 | validation_result | semmle.label | validation_result |
+| app.rb:221:14:221:30 | validation_result | semmle.label | validation_result |
+| app.rb:225:13:225:24 | debug_result | semmle.label | debug_result |
+| app.rb:225:13:225:24 | debug_result | semmle.label | debug_result |
+| app.rb:225:28:225:39 | call to debug_helper | semmle.label | call to debug_helper |
+| app.rb:225:28:225:39 | call to debug_helper | semmle.label | call to debug_helper |
+| app.rb:226:18:226:29 | debug_result | semmle.label | debug_result |
+| app.rb:226:18:226:29 | debug_result | semmle.label | debug_result |
+| app.rb:230:9:230:21 | rescue_result | semmle.label | rescue_result |
+| app.rb:230:9:230:21 | rescue_result | semmle.label | rescue_result |
+| app.rb:230:25:230:37 | call to rescue_helper | semmle.label | call to rescue_helper |
+| app.rb:230:25:230:37 | call to rescue_helper | semmle.label | call to rescue_helper |
+| app.rb:231:14:231:26 | rescue_result | semmle.label | rescue_result |
+| app.rb:231:14:231:26 | rescue_result | semmle.label | rescue_result |
+| app.rb:235:13:235:23 | case_result | semmle.label | case_result |
+| app.rb:235:13:235:23 | case_result | semmle.label | case_result |
+| app.rb:235:27:235:37 | call to test_helper | semmle.label | call to test_helper |
+| app.rb:235:27:235:37 | call to test_helper | semmle.label | call to test_helper |
+| app.rb:236:18:236:28 | case_result | semmle.label | case_result |
+| app.rb:236:18:236:28 | case_result | semmle.label | case_result |
+subpaths
+testFailures
+#select
+| app.rb:173:14:173:20 | user_id | app.rb:166:19:166:24 | call to params | app.rb:173:14:173:20 | user_id | $@ | app.rb:166:19:166:24 | call to params | call to params |
+| app.rb:174:14:174:21 | route_id | app.rb:167:20:167:40 | call to route_param | app.rb:174:14:174:21 | route_id | $@ | app.rb:167:20:167:40 | call to route_param | call to route_param |
+| app.rb:175:14:175:17 | auth | app.rb:168:16:168:22 | call to headers | app.rb:175:14:175:17 | auth | $@ | app.rb:168:16:168:22 | call to headers | call to headers |
+| app.rb:176:14:176:20 | session | app.rb:169:19:169:25 | call to cookies | app.rb:176:14:176:20 | session | $@ | app.rb:169:19:169:25 | call to cookies | call to cookies |
+| app.rb:184:14:184:19 | result | app.rb:107:13:107:32 | call to source | app.rb:184:14:184:19 | result | $@ | app.rb:107:13:107:32 | call to source | call to source |
+| app.rb:184:14:184:19 | result | app.rb:107:13:107:32 | call to source | app.rb:184:14:184:19 | result | $@ | app.rb:107:13:107:32 | call to source | call to source |
+| app.rb:191:14:191:22 | user_data | app.rb:103:13:103:18 | call to params | app.rb:191:14:191:22 | user_data | $@ | app.rb:103:13:103:18 | call to params | call to params |
+| app.rb:192:14:192:26 | simple_result | app.rb:111:13:111:33 | call to source | app.rb:192:14:192:26 | simple_result | $@ | app.rb:111:13:111:33 | call to source | call to source |
+| app.rb:192:14:192:26 | simple_result | app.rb:111:13:111:33 | call to source | app.rb:192:14:192:26 | simple_result | $@ | app.rb:111:13:111:33 | call to source | call to source |
+| app.rb:200:18:200:24 | user_id | app.rb:199:23:199:28 | call to params | app.rb:200:18:200:24 | user_id | $@ | app.rb:199:23:199:28 | call to params | call to params |
+| app.rb:206:14:206:22 | user_data | app.rb:103:13:103:18 | call to params | app.rb:206:14:206:22 | user_data | $@ | app.rb:103:13:103:18 | call to params | call to params |
+| app.rb:213:14:213:24 | auth_result | app.rb:118:17:118:43 | call to source | app.rb:213:14:213:24 | auth_result | $@ | app.rb:118:17:118:43 | call to source | call to source |
+| app.rb:213:14:213:24 | auth_result | app.rb:118:17:118:43 | call to source | app.rb:213:14:213:24 | auth_result | $@ | app.rb:118:17:118:43 | call to source | call to source |
+| app.rb:217:14:217:24 | perm_result | app.rb:122:17:122:47 | call to source | app.rb:217:14:217:24 | perm_result | $@ | app.rb:122:17:122:47 | call to source | call to source |
+| app.rb:217:14:217:24 | perm_result | app.rb:122:17:122:47 | call to source | app.rb:217:14:217:24 | perm_result | $@ | app.rb:122:17:122:47 | call to source | call to source |
+| app.rb:221:14:221:30 | validation_result | app.rb:128:17:128:42 | call to source | app.rb:221:14:221:30 | validation_result | $@ | app.rb:128:17:128:42 | call to source | call to source |
+| app.rb:221:14:221:30 | validation_result | app.rb:128:17:128:42 | call to source | app.rb:221:14:221:30 | validation_result | $@ | app.rb:128:17:128:42 | call to source | call to source |
+| app.rb:226:18:226:29 | debug_result | app.rb:134:17:134:42 | call to source | app.rb:226:18:226:29 | debug_result | $@ | app.rb:134:17:134:42 | call to source | call to source |
+| app.rb:226:18:226:29 | debug_result | app.rb:134:17:134:42 | call to source | app.rb:226:18:226:29 | debug_result | $@ | app.rb:134:17:134:42 | call to source | call to source |
+| app.rb:231:14:231:26 | rescue_result | app.rb:140:17:140:37 | call to source | app.rb:231:14:231:26 | rescue_result | $@ | app.rb:140:17:140:37 | call to source | call to source |
+| app.rb:231:14:231:26 | rescue_result | app.rb:140:17:140:37 | call to source | app.rb:231:14:231:26 | rescue_result | $@ | app.rb:140:17:140:37 | call to source | call to source |
+| app.rb:236:18:236:28 | case_result | app.rb:150:17:150:35 | call to source | app.rb:236:18:236:28 | case_result | $@ | app.rb:150:17:150:35 | call to source | call to source |
+| app.rb:236:18:236:28 | case_result | app.rb:150:17:150:35 | call to source | app.rb:236:18:236:28 | case_result | $@ | app.rb:150:17:150:35 | call to source | call to source |
diff --git a/ruby/ql/test/library-tests/frameworks/grape/Flow.ql b/ruby/ql/test/library-tests/frameworks/grape/Flow.ql
new file mode 100644
index 00000000000..baa3fa4307f
--- /dev/null
+++ b/ruby/ql/test/library-tests/frameworks/grape/Flow.ql
@@ -0,0 +1,25 @@
+/**
+ * @kind path-problem
+ */
+
+import ruby
+import utils.test.InlineFlowTest
+import PathGraph
+import codeql.ruby.frameworks.Grape
+import codeql.ruby.Concepts
+
+module GrapeConfig implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) {
+    source instanceof Http::Server::RequestInputAccess::Range
+    or
+    DefaultFlowConfig::isSource(source)
+  }
+
+  predicate isSink(DataFlow::Node sink) { DefaultFlowConfig::isSink(sink) }
+}
+
+import FlowTest<DefaultFlowConfig, GrapeConfig>
+
+from PathNode source, PathNode sink
+where flowPath(source, sink)
+select sink, source, sink, "$@", source, source.toString()
diff --git a/ruby/ql/test/library-tests/frameworks/grape/Grape.expected b/ruby/ql/test/library-tests/frameworks/grape/Grape.expected
new file mode 100644
index 00000000000..7088eeb9018
--- /dev/null
+++ b/ruby/ql/test/library-tests/frameworks/grape/Grape.expected
@@ -0,0 +1,58 @@
+grapeApiClasses
+| app.rb:1:1:90:3 | MyAPI |
+| app.rb:92:1:96:3 | AdminAPI |
+| app.rb:98:1:239:3 | UserAPI |
+grapeEndpoints
+| app.rb:1:1:90:3 | MyAPI | app.rb:7:3:11:5 | call to get | GET | /hello/:name |
+| app.rb:1:1:90:3 | MyAPI | app.rb:17:3:20:5 | call to post | POST | /messages |
+| app.rb:1:1:90:3 | MyAPI | app.rb:23:3:27:5 | call to put | PUT | /update/:id |
+| app.rb:1:1:90:3 | MyAPI | app.rb:30:3:32:5 | call to delete | DELETE | /items/:id |
+| app.rb:1:1:90:3 | MyAPI | app.rb:35:3:37:5 | call to patch | PATCH | /items/:id |
+| app.rb:1:1:90:3 | MyAPI | app.rb:40:3:42:5 | call to head | HEAD | /status |
+| app.rb:1:1:90:3 | MyAPI | app.rb:45:3:47:5 | call to options | OPTIONS | /info |
+| app.rb:1:1:90:3 | MyAPI | app.rb:50:3:54:5 | call to get | GET | /users/:user_id/posts/:post_id |
+| app.rb:1:1:90:3 | MyAPI | app.rb:78:3:82:5 | call to get | GET | /cookie_test |
+| app.rb:1:1:90:3 | MyAPI | app.rb:85:3:89:5 | call to get | GET | /header_test |
+| app.rb:92:1:96:3 | AdminAPI | app.rb:93:3:95:5 | call to get | GET | /admin |
+| app.rb:98:1:239:3 | UserAPI | app.rb:164:5:178:7 | call to get | GET | /comprehensive_test/:user_id |
+| app.rb:98:1:239:3 | UserAPI | app.rb:180:5:185:7 | call to get | GET | /helper_test/:user_id |
+| app.rb:98:1:239:3 | UserAPI | app.rb:187:5:193:7 | call to post | POST | /users |
+| app.rb:98:1:239:3 | UserAPI | app.rb:204:5:207:7 | call to post | POST | /users |
+| app.rb:98:1:239:3 | UserAPI | app.rb:210:5:238:7 | call to get | GET | /nested_test/:token |
+grapeParams
+| app.rb:8:12:8:17 | call to params |
+| app.rb:14:3:16:5 | call to params |
+| app.rb:18:11:18:16 | call to params |
+| app.rb:24:10:24:15 | call to params |
+| app.rb:31:5:31:10 | call to params |
+| app.rb:36:5:36:10 | call to params |
+| app.rb:60:12:60:17 | call to params |
+| app.rb:94:5:94:10 | call to params |
+| app.rb:103:13:103:18 | call to params |
+| app.rb:117:25:117:30 | call to params |
+| app.rb:166:19:166:24 | call to params |
+| app.rb:182:19:182:24 | call to params |
+| app.rb:199:23:199:28 | call to params |
+grapeHeaders
+| app.rb:9:18:9:24 | call to headers |
+| app.rb:46:5:46:11 | call to headers |
+| app.rb:66:3:69:5 | call to headers |
+| app.rb:86:12:86:18 | call to headers |
+| app.rb:87:14:87:20 | call to headers |
+| app.rb:156:5:158:7 | call to headers |
+| app.rb:168:16:168:22 | call to headers |
+grapeRequest
+| app.rb:25:12:25:18 | call to request |
+| app.rb:170:21:170:27 | call to request |
+grapeRouteParam
+| app.rb:51:15:51:35 | call to route_param |
+| app.rb:52:15:52:36 | call to route_param |
+| app.rb:57:3:63:5 | call to route_param |
+| app.rb:167:20:167:40 | call to route_param |
+| app.rb:196:5:202:7 | call to route_param |
+grapeCookies
+| app.rb:72:3:75:5 | call to cookies |
+| app.rb:79:15:79:21 | call to cookies |
+| app.rb:80:16:80:22 | call to cookies |
+| app.rb:160:5:162:7 | call to cookies |
+| app.rb:169:19:169:25 | call to cookies |
diff --git a/ruby/ql/test/library-tests/frameworks/grape/Grape.ql b/ruby/ql/test/library-tests/frameworks/grape/Grape.ql
new file mode 100644
index 00000000000..63cd15a547e
--- /dev/null
+++ b/ruby/ql/test/library-tests/frameworks/grape/Grape.ql
@@ -0,0 +1,24 @@
+import ruby
+import codeql.ruby.frameworks.Grape
+import codeql.ruby.Concepts
+import codeql.ruby.AST
+
+query predicate grapeApiClasses(Grape::GrapeApiClass api) { any() }
+
+query predicate grapeEndpoints(
+  Grape::GrapeApiClass api, Grape::GrapeEndpoint endpoint, string method, string path
+) {
+  endpoint = api.getAnEndpoint() and
+  method = endpoint.getHttpMethod() and
+  path = endpoint.getPath()
+}
+
+query predicate grapeParams(Grape::GrapeParamsSource params) { any() }
+
+query predicate grapeHeaders(Grape::GrapeHeadersSource headers) { any() }
+
+query predicate grapeRequest(Grape::GrapeRequestSource request) { any() }
+
+query predicate grapeRouteParam(Grape::GrapeRouteParamSource routeParam) { any() }
+
+query predicate grapeCookies(Grape::GrapeCookiesSource cookies) { any() }
diff --git a/ruby/ql/test/library-tests/frameworks/grape/app.rb b/ruby/ql/test/library-tests/frameworks/grape/app.rb
new file mode 100644
index 00000000000..1b1fd15d5d8
--- /dev/null
+++ b/ruby/ql/test/library-tests/frameworks/grape/app.rb
@@ -0,0 +1,239 @@
+class MyAPI < Grape::API
+  version 'v1', using: :header, vendor: 'myapi'
+  format :json
+  prefix :api
+
+  desc 'Simple get endpoint'
+  get '/hello/:name' do
+    name = params[:name]
+    user_agent = headers['User-Agent']
+    "Hello #{name}!"
+  end
+
+  desc 'Post endpoint with params'
+  params do
+    requires :message, type: String
+  end
+  post '/messages' do
+    msg = params[:message]
+    { status: 'received', message: msg }
+  end
+
+  desc 'Put endpoint accessing request'
+  put '/update/:id' do
+    id = params[:id]
+    body = request.body.read
+    { id: id, body: body }
+  end
+
+  desc 'Delete endpoint'
+  delete '/items/:id' do
+    params[:id]
+  end
+
+  desc 'Patch endpoint'
+  patch '/items/:id' do
+    params[:id]
+  end
+
+  desc 'Head endpoint'
+  head '/status' do
+    # Just return status
+  end
+
+  desc 'Options endpoint'
+  options '/info' do
+    headers['Access-Control-Allow-Methods'] = 'GET, POST, OPTIONS'
+  end
+
+  desc 'Route param endpoint'
+  get '/users/:user_id/posts/:post_id' do
+    user_id = route_param(:user_id)
+    post_id = route_param('post_id')
+    { user_id: user_id, post_id: post_id }
+  end
+
+  desc 'Route param block pattern'
+  route_param :id do
+    get do
+      # params[:id] is user input from the path parameter
+      id = params[:id]
+      { id: id }
+    end
+  end
+
+  # Headers block for defining expected headers
+  headers do
+    requires :Authorization, type: String
+    optional 'X-Custom-Header', type: String
+  end
+
+  # Cookies block for defining expected cookies
+  cookies do
+    requires :session_id, type: String
+    optional :tracking_id, type: String
+  end
+
+  desc 'Endpoint that uses cookies method'
+  get '/cookie_test' do
+    session = cookies[:session_id]
+    tracking = cookies['tracking_id']
+    { session: session, tracking: tracking }
+  end
+
+  desc 'Endpoint that uses headers method'
+  get '/header_test' do
+    auth = headers[:Authorization]
+    custom = headers['X-Custom-Header']
+    { auth: auth, custom: custom }
+  end
+end
+
+class AdminAPI < Grape::API
+  get '/admin' do
+    params[:token]
+  end
+end
+
+class UserAPI < Grape::API
+    VALID_PARAMS = %w(name email password password_confirmation)
+
+    helpers do
+        def user_params
+            params.select{|key,value| VALID_PARAMS.include?(key.to_s)} # Real helper implementation
+        end
+
+        def vulnerable_helper(user_id)
+            source "paramHelper" # Test parameter passing to helper
+        end
+
+        def simple_helper
+            source "simpleHelper" # Test simple helper return
+        end
+
+        # Nested helper scenarios that require getParent+()
+        module AuthHelpers
+            def authenticate_user
+                token = params[:token]
+                source "nestedModuleHelper" # Test nested module helper
+            end
+
+            def check_permissions(resource)
+                source "nestedPermissionHelper" # Test nested module helper with params
+            end
+        end
+
+        class ValidationHelpers
+            def self.validate_email(email)
+                source "nestedClassHelper" # Test nested class helper
+            end
+        end
+
+        if Rails.env.development?
+            def debug_helper
+                source "conditionalHelper" # Test helper inside conditional block
+            end
+        end
+
+        begin
+            def rescue_helper
+                source "rescueHelper" # Test helper inside begin block
+            end
+        rescue
+            # error handling
+        end
+
+        # Helper inside a case statement
+        case ENV['RACK_ENV']
+        when 'test'
+            def test_helper
+                source "caseHelper" # Test helper inside case block
+            end
+        end
+    end
+
+    # Headers and cookies blocks for DSL testing
+    headers do
+        requires :Authorization, type: String
+    end
+
+    cookies do
+        requires :session_id, type: String
+    end
+
+    get '/comprehensive_test/:user_id' do
+        # Test all Grape input sources
+        user_id = params[:user_id]           # params taint source
+        route_id = route_param(:user_id)     # route_param taint source
+        auth = headers[:Authorization]       # headers taint source
+        session = cookies[:session_id]       # cookies taint source
+        body_data = request.body.read        # request taint source
+
+        # Test sinks for all sources
+        sink user_id # $ hasTaintFlow
+        sink route_id # $ hasTaintFlow
+        sink auth # $ hasTaintFlow
+        sink session # $ hasTaintFlow
+        # Note: request.body.read may not be detected by this flow test config
+    end
+
+    get '/helper_test/:user_id' do
+        # Test helper method parameter passing dataflow
+        user_id = params[:user_id]
+        result = vulnerable_helper(user_id)
+        sink result # $ hasValueFlow=paramHelper
+    end
+
+    post '/users' do
+        # Test helper method return dataflow
+        user_data = user_params
+        simple_result = simple_helper
+        sink user_data # $ hasTaintFlow
+        sink simple_result # $ hasValueFlow=simpleHelper
+    end
+
+    # Test route_param block pattern
+    route_param :id do
+        get do
+            # params[:id] should be user input from the path
+            user_id = params[:id]
+            sink user_id # $ hasTaintFlow
+        end
+    end
+
+    post '/users' do
+        user_data = user_params
+        sink user_data # $ hasTaintFlow
+    end
+
+    # Test nested helper methods
+    get '/nested_test/:token' do
+        # Test nested module helper
+        auth_result = authenticate_user
+        sink auth_result # $ hasValueFlow=nestedModuleHelper
+
+        # Test nested module helper with parameters
+        perm_result = check_permissions("admin")
+        sink perm_result # $ hasValueFlow=nestedPermissionHelper
+
+        # Test nested class helper
+        validation_result = ValidationHelpers.validate_email("test@example.com")
+        sink validation_result # $ hasValueFlow=nestedClassHelper
+
+        # Test conditional helper (if it exists)
+        if respond_to?(:debug_helper)
+            debug_result = debug_helper
+            sink debug_result # $ hasValueFlow=conditionalHelper
+        end
+
+        # Test rescue helper
+        rescue_result = rescue_helper
+        sink rescue_result # $ hasValueFlow=rescueHelper
+
+        # Test case helper (if it exists)
+        if respond_to?(:test_helper)
+            case_result = test_helper
+            sink case_result # $ hasValueFlow=caseHelper
+        end
+    end
+end
diff --git a/ruby/ql/test/query-tests/experimental/InsecureRandomness/InsecureRandomness.rb b/ruby/ql/test/query-tests/experimental/InsecureRandomness/InsecureRandomness.rb
index 516b282ece5..116957137b5 100644
--- a/ruby/ql/test/query-tests/experimental/InsecureRandomness/InsecureRandomness.rb
+++ b/ruby/ql/test/query-tests/experimental/InsecureRandomness/InsecureRandomness.rb
@@ -2,7 +2,7 @@ require 'securerandom'
 
 def generate_password_1(length)
   chars = ('a'..'z').to_a + ('A'..'Z').to_a + ('0'..'9').to_a + ['!', '@', '#', '$', '%']
-  # BAD: rand is not cryptographically secure
+  # BAD: rand is not cryptographically secure
   password = (1..length).collect { chars[rand(chars.size)] }.join
 end
 
diff --git a/ruby/ql/test/query-tests/security/cwe-915/test.rb b/ruby/ql/test/query-tests/security/cwe-915/test.rb
index a60def5d201..c72ad536ef7 100644
--- a/ruby/ql/test/query-tests/security/cwe-915/test.rb
+++ b/ruby/ql/test/query-tests/security/cwe-915/test.rb
@@ -46,7 +46,7 @@ class UserController < ActionController::Base
     def create4
         x = params[:user]
         x.permit!
-        User.new(x) # BAD
+        User.new(x) # BAD
         User.new(x.permit(:name,:address)) # GOOD
         User.new(params.permit(user: {})) # BAD
         User.new(params.permit(user: [:name, :address, {friends:{}}])) # BAD
diff --git a/rust/README.md b/rust/README.md
index 8be853bd5f2..4fdbb0aedbd 100644
--- a/rust/README.md
+++ b/rust/README.md
@@ -1,8 +1,5 @@
 # Rust on CodeQL
 
-> [!WARNING]
-> Rust support for CodeQL is experimental. No support is offered. QL and database interfaces will change and break without notice or deprecation periods.
-
 ## Development
 
 ### Dependencies
@@ -62,3 +59,54 @@ Sometimes, especially if resolving conflicts on generated files, you might need
 bazel run @codeql//rust/codegen -- --force
 ```
 for code generation to succeed.
+
+### Updating `rust-analyzer`
+
+Here's a rundown of the typical actions to perform to do a rust-analyzer (and other dependencies) update. A one-time setup consists in
+installing [`cargo-edit`](https://crates.io/crates/cargo-edit) with `cargo install cargo-edit`. On Ubuntu that also requires
+`sudo apt install libssl-dev pkg-config`.
+
+1. From the root of the `codeql` repo checkout, run a Cargo upgrade:
+   ```
+   cargo upgrade --incompatible --pinned
+   ```
+2. Look at a diff of the `Cargo.toml` files: if all `ra_ap_` prefixed dependencies have been updated to the same number, go on to the next step.
+   Otherwise, it means the latest `rust-analyzer` update has not been fully rolled out to all its crates in `crates.io`.
+   _All `ra_ap_` versions must agree!_
+   Downgrade by hand to the minimum one you see, and run a `cargo update` after that to fix the `Cargo.lock` file.
+3. Commit the changes, skipping `pre-commit` hooks if you have them enabled:
+   ```
+   git commit -am 'Cargo: upgrade dependencies' --no-verify
+   ```
+4. Regenerate vendored bazel files (these allow faster builds, particularly on CI where it has to start from scratch each time), commit the changes:
+   ```
+   misc/bazel/3rdparty/update_tree_sitter_extractors_deps.sh
+   git add .
+   git commit -am 'Bazel: regenerate vendored cargo dependencies' --no-verify
+   ```
+5. Run codegen
+   ```
+   bazel run //rust/codegen
+   ```
+   Take note whether `rust/schema/ast.py` was changed. That might need tweaks, new tests and/or downgrade/upgrade scripts down the line.
+6. Try compiling
+   ```
+   bazel run //rust:install
+   ```
+   * if it succeeds: good! You can move on to the next step.
+   * if it fails while compiling rust-analyzer dependencies, you need to update the rust toolchain. Sometimes the error will tell you
+     so explicitly, but it may happen that the error is more obscure. To update the rust toolchain:
+      * you will need to open a PR on the internal repo updating `RUST_VERSION` in `MODULE.bazel`. In general you can have this merged
+        independently of the changes in `codeql`.
+      * in `codeql`, update both `RUST_VERSION` in `MODULE.bazel` _and_ `rust-toolchain.toml` files. You may want to also update the
+        nightly toolchain in `rust/extractor/src/nightly-toolchain/rust-toolchain.toml` to a more recent date while you're at it.
+   * if it fails while compiling rust extractor code, you will need to adapt it to the new library version.
+      * for example updating annotations in `annotations.py`, adding / removing generated tests.
+
+   If you had to do any changes, commit them. If you updated the rust toolchain, running `rust/lint.py` might reformat or apply new
+   lints to the code.
+7. Check with CI if everything is in order.
+8. Run DCA with database caching disabled. Iterate on the code if needed.
+9. If in step 5 the schema was updated, add upgrade/downgrade scripts and a change note. This is best done last to reduce the chance of
+merge conflicts (none of the other testing depends on having upgrade and downgrade scripts in place). See
+[Upgrading a language database schema](docs/prepare-db-upgrade.md).
diff --git a/rust/ast-generator/Cargo.toml b/rust/ast-generator/Cargo.toml
index 78c8a9b6d5b..fcba71b696c 100644
--- a/rust/ast-generator/Cargo.toml
+++ b/rust/ast-generator/Cargo.toml
@@ -7,11 +7,11 @@ license = "MIT"
 # When updating these dependencies, run `rust/update_cargo_deps.sh`
 [dependencies]
 ungrammar = "1.16.1"
-proc-macro2 = "1.0.95"
-quote = "1.0.40"
+proc-macro2 = "1.0.101"
+quote = "1.0.41"
 either = "1.15.0"
-stdx = {package = "ra_ap_stdx", version = "0.0.288"}
+stdx = {package = "ra_ap_stdx", version = "0.0.301"}
 itertools = "0.14.0"
 mustache = "0.9.0"
-serde = { version = "1.0.219", features = ["derive"] }
-anyhow = "1.0.98"
+serde = { version = "1.0.228", features = ["derive"] }
+anyhow = "1.0.100"
diff --git a/rust/ast-generator/src/main.rs b/rust/ast-generator/src/main.rs
index d612985ff9f..4b68c1d42a6 100644
--- a/rust/ast-generator/src/main.rs
+++ b/rust/ast-generator/src/main.rs
@@ -44,6 +44,8 @@ fn property_name(type_name: &str, field_name: &str) -> String {
         ("StructField", "expr") => "default",
         ("UseTree", "is_star") => "is_glob",
         (_, "ty") => "type_repr",
+        ("Function", "body") => "function_body",
+        ("ClosureExpr", "body") => "closure_body",
         _ if field_name.contains("record") => &field_name.replacen("record", "struct", 1),
         _ => field_name,
     };
@@ -62,15 +64,6 @@ fn has_special_emission(type_name: &str) -> bool {
             | "Struct"
             | "Enum"
             | "Union"
-            | "Trait"
-            | "Module"
-            | "Variant"
-            | "PathExpr"
-            | "RecordExpr"
-            | "PathPat"
-            | "RecordPat"
-            | "TupleStructPat"
-            | "MethodCallExpr"
             | "PathSegment"
             | "Const"
     )
@@ -82,6 +75,7 @@ fn should_enum_be_skipped(name: &str) -> bool {
 
 fn should_node_be_skipped(name: &str) -> bool {
     name == "TypeAnchor" // we flatten TypeAnchor into PathSegment in the extractor
+    || name == "MacroStmts" // we workaround a getter bug in the extractor
 }
 
 fn should_node_be_skipped_in_extractor(name: &str) -> bool {
diff --git a/rust/codeql-extractor.yml b/rust/codeql-extractor.yml
index c7785e5f8c7..6675dd3a271 100644
--- a/rust/codeql-extractor.yml
+++ b/rust/codeql-extractor.yml
@@ -5,6 +5,8 @@ column_kind: "utf8"
 legacy_qltest_extraction: true
 build_modes:
   - none
+default_queries:
+  - codeql/rust-queries
 github_api_languages:
   - Rust
 scc_languages:
@@ -80,12 +82,6 @@ options:
           Collect flame graph data using the `tracing-flame` crate. To render a flame graph
           or chart, run the `inferno-flamegraph` command. See also: https://crates.io/crates/tracing-flame
         type: string
-  skip_path_resolution:
-    title: Skip path resolution
-    description: >
-      Skip path resolution. This is experimental, while we move path resolution from the extractor to the QL library.
-    type: string
-    pattern: "^(false|true)$"
   extract_dependencies_as_source:
     title: Extract dependencies as source code
     description: >
diff --git a/rust/downgrades/30a0713e5bf69c60d003e4994e5abd1c78a36826/downgrade.ql b/rust/downgrades/30a0713e5bf69c60d003e4994e5abd1c78a36826/downgrade.ql
new file mode 100644
index 00000000000..a109848463d
--- /dev/null
+++ b/rust/downgrades/30a0713e5bf69c60d003e4994e5abd1c78a36826/downgrade.ql
@@ -0,0 +1,15 @@
+class Element extends @element {
+  string toString() { none() }
+}
+
+class Expr extends Element, @expr { }
+
+class ClosureExpr extends Expr, @closure_expr { }
+
+class Function extends Element, @function { }
+
+query predicate new_closure_expr_bodies(ClosureExpr ce, Expr e) {
+  closure_expr_closure_bodies(ce, e)
+}
+
+query predicate new_function_bodies(Function f, Expr e) { function_function_bodies(f, e) }
diff --git a/rust/downgrades/30a0713e5bf69c60d003e4994e5abd1c78a36826/old.dbscheme b/rust/downgrades/30a0713e5bf69c60d003e4994e5abd1c78a36826/old.dbscheme
new file mode 100644
index 00000000000..30a0713e5bf
--- /dev/null
+++ b/rust/downgrades/30a0713e5bf69c60d003e4994e5abd1c78a36826/old.dbscheme
@@ -0,0 +1,3615 @@
+// generated by codegen, do not edit
+
+// from ../shared/tree-sitter-extractor/src/generator/prefix.dbscheme
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Empty location -*/
+
+empty_location(
+  int location: @location_default ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- Diagnostic messages: severity -*/
+
+case @diagnostic.severity of
+  10 = @diagnostic_debug
+| 20 = @diagnostic_info
+| 30 = @diagnostic_warning
+| 40 = @diagnostic_error
+;
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error;
+
+/*- Database metadata -*/
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+overlayChangedFiles(
+  string path: string ref
+);
+
+
+// from prefix.dbscheme
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_default ref
+);
+
+
+// from schema
+
+@element =
+  @extractor_step
+| @locatable
+| @named_crate
+| @unextracted
+;
+
+extractor_steps(
+  unique int id: @extractor_step,
+  string action: string ref,
+  int duration_ms: int ref
+);
+
+#keyset[id]
+extractor_step_files(
+  int id: @extractor_step ref,
+  int file: @file ref
+);
+
+@locatable =
+  @ast_node
+| @crate
+;
+
+named_crates(
+  unique int id: @named_crate,
+  string name: string ref,
+  int crate: @crate ref
+);
+
+@unextracted =
+  @missing
+| @unimplemented
+;
+
+@ast_node =
+  @abi
+| @addressable
+| @arg_list
+| @asm_dir_spec
+| @asm_operand
+| @asm_operand_expr
+| @asm_option
+| @asm_piece
+| @asm_reg_spec
+| @assoc_item_list
+| @attr
+| @callable
+| @expr
+| @extern_item_list
+| @field_list
+| @for_binder
+| @format_args_arg
+| @generic_arg
+| @generic_arg_list
+| @generic_param
+| @generic_param_list
+| @item_list
+| @label
+| @let_else
+| @macro_items
+| @match_arm
+| @match_arm_list
+| @match_guard
+| @meta
+| @name
+| @param_base
+| @param_list
+| @parenthesized_arg_list
+| @pat
+| @path
+| @path_ast_node
+| @path_segment
+| @rename
+| @ret_type_repr
+| @return_type_syntax
+| @source_file
+| @stmt
+| @stmt_list
+| @struct_expr_field
+| @struct_expr_field_list
+| @struct_field
+| @struct_pat_field
+| @struct_pat_field_list
+| @token
+| @token_tree
+| @tuple_field
+| @type_bound
+| @type_bound_list
+| @type_repr
+| @use_bound_generic_arg
+| @use_bound_generic_args
+| @use_tree
+| @use_tree_list
+| @variant_list
+| @visibility
+| @where_clause
+| @where_pred
+;
+
+crates(
+  unique int id: @crate
+);
+
+#keyset[id]
+crate_names(
+  int id: @crate ref,
+  string name: string ref
+);
+
+#keyset[id]
+crate_versions(
+  int id: @crate ref,
+  string version: string ref
+);
+
+#keyset[id, index]
+crate_cfg_options(
+  int id: @crate ref,
+  int index: int ref,
+  string cfg_option: string ref
+);
+
+#keyset[id, index]
+crate_named_dependencies(
+  int id: @crate ref,
+  int index: int ref,
+  int named_dependency: @named_crate ref
+);
+
+missings(
+  unique int id: @missing
+);
+
+unimplementeds(
+  unique int id: @unimplemented
+);
+
+abis(
+  unique int id: @abi
+);
+
+#keyset[id]
+abi_abi_strings(
+  int id: @abi ref,
+  string abi_string: string ref
+);
+
+@addressable =
+  @item
+| @variant
+;
+
+arg_lists(
+  unique int id: @arg_list
+);
+
+#keyset[id, index]
+arg_list_args(
+  int id: @arg_list ref,
+  int index: int ref,
+  int arg: @expr ref
+);
+
+asm_dir_specs(
+  unique int id: @asm_dir_spec
+);
+
+@asm_operand =
+  @asm_const
+| @asm_label
+| @asm_reg_operand
+| @asm_sym
+;
+
+asm_operand_exprs(
+  unique int id: @asm_operand_expr
+);
+
+#keyset[id]
+asm_operand_expr_in_exprs(
+  int id: @asm_operand_expr ref,
+  int in_expr: @expr ref
+);
+
+#keyset[id]
+asm_operand_expr_out_exprs(
+  int id: @asm_operand_expr ref,
+  int out_expr: @expr ref
+);
+
+asm_options(
+  unique int id: @asm_option
+);
+
+#keyset[id]
+asm_option_is_raw(
+  int id: @asm_option ref
+);
+
+@asm_piece =
+  @asm_clobber_abi
+| @asm_operand_named
+| @asm_options_list
+;
+
+asm_reg_specs(
+  unique int id: @asm_reg_spec
+);
+
+#keyset[id]
+asm_reg_spec_identifiers(
+  int id: @asm_reg_spec ref,
+  int identifier: @name_ref ref
+);
+
+assoc_item_lists(
+  unique int id: @assoc_item_list
+);
+
+#keyset[id, index]
+assoc_item_list_assoc_items(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int assoc_item: @assoc_item ref
+);
+
+#keyset[id, index]
+assoc_item_list_attrs(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+attrs(
+  unique int id: @attr
+);
+
+#keyset[id]
+attr_meta(
+  int id: @attr ref,
+  int meta: @meta ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_param_lists(
+  int id: @callable ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id, index]
+callable_attrs(
+  int id: @callable ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+@expr =
+  @array_expr_internal
+| @asm_expr
+| @await_expr
+| @become_expr
+| @binary_expr
+| @break_expr
+| @call_expr_base
+| @cast_expr
+| @closure_expr
+| @continue_expr
+| @field_expr
+| @format_args_expr
+| @if_expr
+| @index_expr
+| @labelable_expr
+| @let_expr
+| @literal_expr
+| @macro_block_expr
+| @macro_expr
+| @match_expr
+| @offset_of_expr
+| @paren_expr
+| @path_expr_base
+| @prefix_expr
+| @range_expr
+| @ref_expr
+| @return_expr
+| @struct_expr
+| @try_expr
+| @tuple_expr
+| @underscore_expr
+| @yeet_expr
+| @yield_expr
+;
+
+extern_item_lists(
+  unique int id: @extern_item_list
+);
+
+#keyset[id, index]
+extern_item_list_attrs(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+extern_item_list_extern_items(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int extern_item: @extern_item ref
+);
+
+@field_list =
+  @struct_field_list
+| @tuple_field_list
+;
+
+for_binders(
+  unique int id: @for_binder
+);
+
+#keyset[id]
+for_binder_generic_param_lists(
+  int id: @for_binder ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+format_args_args(
+  unique int id: @format_args_arg
+);
+
+#keyset[id]
+format_args_arg_exprs(
+  int id: @format_args_arg ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+format_args_arg_names(
+  int id: @format_args_arg ref,
+  int name: @name ref
+);
+
+@generic_arg =
+  @assoc_type_arg
+| @const_arg
+| @lifetime_arg
+| @type_arg
+;
+
+generic_arg_lists(
+  unique int id: @generic_arg_list
+);
+
+#keyset[id, index]
+generic_arg_list_generic_args(
+  int id: @generic_arg_list ref,
+  int index: int ref,
+  int generic_arg: @generic_arg ref
+);
+
+@generic_param =
+  @const_param
+| @lifetime_param
+| @type_param
+;
+
+generic_param_lists(
+  unique int id: @generic_param_list
+);
+
+#keyset[id, index]
+generic_param_list_generic_params(
+  int id: @generic_param_list ref,
+  int index: int ref,
+  int generic_param: @generic_param ref
+);
+
+item_lists(
+  unique int id: @item_list
+);
+
+#keyset[id, index]
+item_list_attrs(
+  int id: @item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+item_list_items(
+  int id: @item_list ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+labels(
+  unique int id: @label
+);
+
+#keyset[id]
+label_lifetimes(
+  int id: @label ref,
+  int lifetime: @lifetime ref
+);
+
+let_elses(
+  unique int id: @let_else
+);
+
+#keyset[id]
+let_else_block_exprs(
+  int id: @let_else ref,
+  int block_expr: @block_expr ref
+);
+
+macro_items(
+  unique int id: @macro_items
+);
+
+#keyset[id, index]
+macro_items_items(
+  int id: @macro_items ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+match_arms(
+  unique int id: @match_arm
+);
+
+#keyset[id, index]
+match_arm_attrs(
+  int id: @match_arm ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_arm_exprs(
+  int id: @match_arm ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+match_arm_guards(
+  int id: @match_arm ref,
+  int guard: @match_guard ref
+);
+
+#keyset[id]
+match_arm_pats(
+  int id: @match_arm ref,
+  int pat: @pat ref
+);
+
+match_arm_lists(
+  unique int id: @match_arm_list
+);
+
+#keyset[id, index]
+match_arm_list_arms(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int arm: @match_arm ref
+);
+
+#keyset[id, index]
+match_arm_list_attrs(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+match_guards(
+  unique int id: @match_guard
+);
+
+#keyset[id]
+match_guard_conditions(
+  int id: @match_guard ref,
+  int condition: @expr ref
+);
+
+meta(
+  unique int id: @meta
+);
+
+#keyset[id]
+meta_exprs(
+  int id: @meta ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+meta_is_unsafe(
+  int id: @meta ref
+);
+
+#keyset[id]
+meta_paths(
+  int id: @meta ref,
+  int path: @path ref
+);
+
+#keyset[id]
+meta_token_trees(
+  int id: @meta ref,
+  int token_tree: @token_tree ref
+);
+
+names(
+  unique int id: @name
+);
+
+#keyset[id]
+name_texts(
+  int id: @name ref,
+  string text: string ref
+);
+
+@param_base =
+  @param
+| @self_param
+;
+
+#keyset[id, index]
+param_base_attrs(
+  int id: @param_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+param_base_type_reprs(
+  int id: @param_base ref,
+  int type_repr: @type_repr ref
+);
+
+param_lists(
+  unique int id: @param_list
+);
+
+#keyset[id, index]
+param_list_params(
+  int id: @param_list ref,
+  int index: int ref,
+  int param: @param ref
+);
+
+#keyset[id]
+param_list_self_params(
+  int id: @param_list ref,
+  int self_param: @self_param ref
+);
+
+parenthesized_arg_lists(
+  unique int id: @parenthesized_arg_list
+);
+
+#keyset[id, index]
+parenthesized_arg_list_type_args(
+  int id: @parenthesized_arg_list ref,
+  int index: int ref,
+  int type_arg: @type_arg ref
+);
+
+@pat =
+  @box_pat
+| @const_block_pat
+| @ident_pat
+| @literal_pat
+| @macro_pat
+| @or_pat
+| @paren_pat
+| @path_pat
+| @range_pat
+| @ref_pat
+| @rest_pat
+| @slice_pat
+| @struct_pat
+| @tuple_pat
+| @tuple_struct_pat
+| @wildcard_pat
+;
+
+paths(
+  unique int id: @path
+);
+
+#keyset[id]
+path_qualifiers(
+  int id: @path ref,
+  int qualifier: @path ref
+);
+
+#keyset[id]
+path_segments_(
+  int id: @path ref,
+  int segment: @path_segment ref
+);
+
+@path_ast_node =
+  @path_expr
+| @path_pat
+| @struct_expr
+| @struct_pat
+| @tuple_struct_pat
+;
+
+#keyset[id]
+path_ast_node_paths(
+  int id: @path_ast_node ref,
+  int path: @path ref
+);
+
+path_segments(
+  unique int id: @path_segment
+);
+
+#keyset[id]
+path_segment_generic_arg_lists(
+  int id: @path_segment ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+path_segment_identifiers(
+  int id: @path_segment ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+path_segment_parenthesized_arg_lists(
+  int id: @path_segment ref,
+  int parenthesized_arg_list: @parenthesized_arg_list ref
+);
+
+#keyset[id]
+path_segment_ret_types(
+  int id: @path_segment ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+path_segment_return_type_syntaxes(
+  int id: @path_segment ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+path_segment_type_reprs(
+  int id: @path_segment ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+path_segment_trait_type_reprs(
+  int id: @path_segment ref,
+  int trait_type_repr: @path_type_repr ref
+);
+
+renames(
+  unique int id: @rename
+);
+
+#keyset[id]
+rename_names(
+  int id: @rename ref,
+  int name: @name ref
+);
+
+ret_type_reprs(
+  unique int id: @ret_type_repr
+);
+
+#keyset[id]
+ret_type_repr_type_reprs(
+  int id: @ret_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+return_type_syntaxes(
+  unique int id: @return_type_syntax
+);
+
+source_files(
+  unique int id: @source_file
+);
+
+#keyset[id, index]
+source_file_attrs(
+  int id: @source_file ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+source_file_items(
+  int id: @source_file ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+@stmt =
+  @expr_stmt
+| @item
+| @let_stmt
+;
+
+stmt_lists(
+  unique int id: @stmt_list
+);
+
+#keyset[id, index]
+stmt_list_attrs(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+stmt_list_statements(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+stmt_list_tail_exprs(
+  int id: @stmt_list ref,
+  int tail_expr: @expr ref
+);
+
+struct_expr_fields(
+  unique int id: @struct_expr_field
+);
+
+#keyset[id, index]
+struct_expr_field_attrs(
+  int id: @struct_expr_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_expr_field_exprs(
+  int id: @struct_expr_field ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+struct_expr_field_identifiers(
+  int id: @struct_expr_field ref,
+  int identifier: @name_ref ref
+);
+
+struct_expr_field_lists(
+  unique int id: @struct_expr_field_list
+);
+
+#keyset[id, index]
+struct_expr_field_list_attrs(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+struct_expr_field_list_fields(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int field: @struct_expr_field ref
+);
+
+#keyset[id]
+struct_expr_field_list_spreads(
+  int id: @struct_expr_field_list ref,
+  int spread: @expr ref
+);
+
+struct_fields(
+  unique int id: @struct_field
+);
+
+#keyset[id, index]
+struct_field_attrs(
+  int id: @struct_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_defaults(
+  int id: @struct_field ref,
+  int default: @expr ref
+);
+
+#keyset[id]
+struct_field_is_unsafe(
+  int id: @struct_field ref
+);
+
+#keyset[id]
+struct_field_names(
+  int id: @struct_field ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_field_type_reprs(
+  int id: @struct_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+struct_field_visibilities(
+  int id: @struct_field ref,
+  int visibility: @visibility ref
+);
+
+struct_pat_fields(
+  unique int id: @struct_pat_field
+);
+
+#keyset[id, index]
+struct_pat_field_attrs(
+  int id: @struct_pat_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_pat_field_identifiers(
+  int id: @struct_pat_field ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+struct_pat_field_pats(
+  int id: @struct_pat_field ref,
+  int pat: @pat ref
+);
+
+struct_pat_field_lists(
+  unique int id: @struct_pat_field_list
+);
+
+#keyset[id, index]
+struct_pat_field_list_fields(
+  int id: @struct_pat_field_list ref,
+  int index: int ref,
+  int field: @struct_pat_field ref
+);
+
+#keyset[id]
+struct_pat_field_list_rest_pats(
+  int id: @struct_pat_field_list ref,
+  int rest_pat: @rest_pat ref
+);
+
+@token =
+  @comment
+;
+
+token_trees(
+  unique int id: @token_tree
+);
+
+tuple_fields(
+  unique int id: @tuple_field
+);
+
+#keyset[id, index]
+tuple_field_attrs(
+  int id: @tuple_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+tuple_field_type_reprs(
+  int id: @tuple_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+tuple_field_visibilities(
+  int id: @tuple_field ref,
+  int visibility: @visibility ref
+);
+
+type_bounds(
+  unique int id: @type_bound
+);
+
+#keyset[id]
+type_bound_for_binders(
+  int id: @type_bound ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+type_bound_is_async(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_is_const(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_lifetimes(
+  int id: @type_bound ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+type_bound_type_reprs(
+  int id: @type_bound ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_bound_use_bound_generic_args(
+  int id: @type_bound ref,
+  int use_bound_generic_args: @use_bound_generic_args ref
+);
+
+type_bound_lists(
+  unique int id: @type_bound_list
+);
+
+#keyset[id, index]
+type_bound_list_bounds(
+  int id: @type_bound_list ref,
+  int index: int ref,
+  int bound: @type_bound ref
+);
+
+@type_repr =
+  @array_type_repr
+| @dyn_trait_type_repr
+| @fn_ptr_type_repr
+| @for_type_repr
+| @impl_trait_type_repr
+| @infer_type_repr
+| @macro_type_repr
+| @never_type_repr
+| @paren_type_repr
+| @path_type_repr
+| @ptr_type_repr
+| @ref_type_repr
+| @slice_type_repr
+| @tuple_type_repr
+;
+
+@use_bound_generic_arg =
+  @lifetime
+| @name_ref
+;
+
+use_bound_generic_args(
+  unique int id: @use_bound_generic_args
+);
+
+#keyset[id, index]
+use_bound_generic_args_use_bound_generic_args(
+  int id: @use_bound_generic_args ref,
+  int index: int ref,
+  int use_bound_generic_arg: @use_bound_generic_arg ref
+);
+
+use_trees(
+  unique int id: @use_tree
+);
+
+#keyset[id]
+use_tree_is_glob(
+  int id: @use_tree ref
+);
+
+#keyset[id]
+use_tree_paths(
+  int id: @use_tree ref,
+  int path: @path ref
+);
+
+#keyset[id]
+use_tree_renames(
+  int id: @use_tree ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+use_tree_use_tree_lists(
+  int id: @use_tree ref,
+  int use_tree_list: @use_tree_list ref
+);
+
+use_tree_lists(
+  unique int id: @use_tree_list
+);
+
+#keyset[id, index]
+use_tree_list_use_trees(
+  int id: @use_tree_list ref,
+  int index: int ref,
+  int use_tree: @use_tree ref
+);
+
+variant_lists(
+  unique int id: @variant_list
+);
+
+#keyset[id, index]
+variant_list_variants(
+  int id: @variant_list ref,
+  int index: int ref,
+  int variant: @variant ref
+);
+
+visibilities(
+  unique int id: @visibility
+);
+
+#keyset[id]
+visibility_paths(
+  int id: @visibility ref,
+  int path: @path ref
+);
+
+where_clauses(
+  unique int id: @where_clause
+);
+
+#keyset[id, index]
+where_clause_predicates(
+  int id: @where_clause ref,
+  int index: int ref,
+  int predicate: @where_pred ref
+);
+
+where_preds(
+  unique int id: @where_pred
+);
+
+#keyset[id]
+where_pred_for_binders(
+  int id: @where_pred ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+where_pred_lifetimes(
+  int id: @where_pred ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+where_pred_type_reprs(
+  int id: @where_pred ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+where_pred_type_bound_lists(
+  int id: @where_pred ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+array_expr_internals(
+  unique int id: @array_expr_internal
+);
+
+#keyset[id, index]
+array_expr_internal_attrs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+array_expr_internal_exprs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+array_expr_internal_is_semicolon(
+  int id: @array_expr_internal ref
+);
+
+array_type_reprs(
+  unique int id: @array_type_repr
+);
+
+#keyset[id]
+array_type_repr_const_args(
+  int id: @array_type_repr ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+array_type_repr_element_type_reprs(
+  int id: @array_type_repr ref,
+  int element_type_repr: @type_repr ref
+);
+
+asm_clobber_abis(
+  unique int id: @asm_clobber_abi
+);
+
+asm_consts(
+  unique int id: @asm_const
+);
+
+#keyset[id]
+asm_const_exprs(
+  int id: @asm_const ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+asm_const_is_const(
+  int id: @asm_const ref
+);
+
+asm_labels(
+  unique int id: @asm_label
+);
+
+#keyset[id]
+asm_label_block_exprs(
+  int id: @asm_label ref,
+  int block_expr: @block_expr ref
+);
+
+asm_operand_nameds(
+  unique int id: @asm_operand_named
+);
+
+#keyset[id]
+asm_operand_named_asm_operands(
+  int id: @asm_operand_named ref,
+  int asm_operand: @asm_operand ref
+);
+
+#keyset[id]
+asm_operand_named_names(
+  int id: @asm_operand_named ref,
+  int name: @name ref
+);
+
+asm_options_lists(
+  unique int id: @asm_options_list
+);
+
+#keyset[id, index]
+asm_options_list_asm_options(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int asm_option: @asm_option ref
+);
+
+asm_reg_operands(
+  unique int id: @asm_reg_operand
+);
+
+#keyset[id]
+asm_reg_operand_asm_dir_specs(
+  int id: @asm_reg_operand ref,
+  int asm_dir_spec: @asm_dir_spec ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_operand_exprs(
+  int id: @asm_reg_operand ref,
+  int asm_operand_expr: @asm_operand_expr ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_reg_specs(
+  int id: @asm_reg_operand ref,
+  int asm_reg_spec: @asm_reg_spec ref
+);
+
+asm_syms(
+  unique int id: @asm_sym
+);
+
+#keyset[id]
+asm_sym_paths(
+  int id: @asm_sym ref,
+  int path: @path ref
+);
+
+assoc_type_args(
+  unique int id: @assoc_type_arg
+);
+
+#keyset[id]
+assoc_type_arg_const_args(
+  int id: @assoc_type_arg ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+assoc_type_arg_generic_arg_lists(
+  int id: @assoc_type_arg ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+assoc_type_arg_identifiers(
+  int id: @assoc_type_arg ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+assoc_type_arg_param_lists(
+  int id: @assoc_type_arg ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+assoc_type_arg_ret_types(
+  int id: @assoc_type_arg ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_return_type_syntaxes(
+  int id: @assoc_type_arg ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+assoc_type_arg_type_reprs(
+  int id: @assoc_type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_type_bound_lists(
+  int id: @assoc_type_arg ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+await_exprs(
+  unique int id: @await_expr
+);
+
+#keyset[id, index]
+await_expr_attrs(
+  int id: @await_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+await_expr_exprs(
+  int id: @await_expr ref,
+  int expr: @expr ref
+);
+
+become_exprs(
+  unique int id: @become_expr
+);
+
+#keyset[id, index]
+become_expr_attrs(
+  int id: @become_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+become_expr_exprs(
+  int id: @become_expr ref,
+  int expr: @expr ref
+);
+
+binary_exprs(
+  unique int id: @binary_expr
+);
+
+#keyset[id, index]
+binary_expr_attrs(
+  int id: @binary_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+binary_expr_lhs(
+  int id: @binary_expr ref,
+  int lhs: @expr ref
+);
+
+#keyset[id]
+binary_expr_operator_names(
+  int id: @binary_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+binary_expr_rhs(
+  int id: @binary_expr ref,
+  int rhs: @expr ref
+);
+
+box_pats(
+  unique int id: @box_pat
+);
+
+#keyset[id]
+box_pat_pats(
+  int id: @box_pat ref,
+  int pat: @pat ref
+);
+
+break_exprs(
+  unique int id: @break_expr
+);
+
+#keyset[id, index]
+break_expr_attrs(
+  int id: @break_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+break_expr_exprs(
+  int id: @break_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+break_expr_lifetimes(
+  int id: @break_expr ref,
+  int lifetime: @lifetime ref
+);
+
+@call_expr_base =
+  @call_expr
+| @method_call_expr
+;
+
+#keyset[id]
+call_expr_base_arg_lists(
+  int id: @call_expr_base ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+call_expr_base_attrs(
+  int id: @call_expr_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+cast_exprs(
+  unique int id: @cast_expr
+);
+
+#keyset[id, index]
+cast_expr_attrs(
+  int id: @cast_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+cast_expr_exprs(
+  int id: @cast_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+cast_expr_type_reprs(
+  int id: @cast_expr ref,
+  int type_repr: @type_repr ref
+);
+
+closure_exprs(
+  unique int id: @closure_expr
+);
+
+#keyset[id]
+closure_expr_closure_bodies(
+  int id: @closure_expr ref,
+  int closure_body: @expr ref
+);
+
+#keyset[id]
+closure_expr_for_binders(
+  int id: @closure_expr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+closure_expr_is_async(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_const(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_gen(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_move(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_static(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_ret_types(
+  int id: @closure_expr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+comments(
+  unique int id: @comment,
+  int parent: @ast_node ref,
+  string text: string ref
+);
+
+const_args(
+  unique int id: @const_arg
+);
+
+#keyset[id]
+const_arg_exprs(
+  int id: @const_arg ref,
+  int expr: @expr ref
+);
+
+const_block_pats(
+  unique int id: @const_block_pat
+);
+
+#keyset[id]
+const_block_pat_block_exprs(
+  int id: @const_block_pat ref,
+  int block_expr: @block_expr ref
+);
+
+#keyset[id]
+const_block_pat_is_const(
+  int id: @const_block_pat ref
+);
+
+const_params(
+  unique int id: @const_param
+);
+
+#keyset[id, index]
+const_param_attrs(
+  int id: @const_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_param_default_vals(
+  int id: @const_param ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+const_param_is_const(
+  int id: @const_param ref
+);
+
+#keyset[id]
+const_param_names(
+  int id: @const_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_param_type_reprs(
+  int id: @const_param ref,
+  int type_repr: @type_repr ref
+);
+
+continue_exprs(
+  unique int id: @continue_expr
+);
+
+#keyset[id, index]
+continue_expr_attrs(
+  int id: @continue_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+continue_expr_lifetimes(
+  int id: @continue_expr ref,
+  int lifetime: @lifetime ref
+);
+
+dyn_trait_type_reprs(
+  unique int id: @dyn_trait_type_repr
+);
+
+#keyset[id]
+dyn_trait_type_repr_type_bound_lists(
+  int id: @dyn_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+expr_stmts(
+  unique int id: @expr_stmt
+);
+
+#keyset[id]
+expr_stmt_exprs(
+  int id: @expr_stmt ref,
+  int expr: @expr ref
+);
+
+field_exprs(
+  unique int id: @field_expr
+);
+
+#keyset[id, index]
+field_expr_attrs(
+  int id: @field_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+field_expr_containers(
+  int id: @field_expr ref,
+  int container: @expr ref
+);
+
+#keyset[id]
+field_expr_identifiers(
+  int id: @field_expr ref,
+  int identifier: @name_ref ref
+);
+
+fn_ptr_type_reprs(
+  unique int id: @fn_ptr_type_repr
+);
+
+#keyset[id]
+fn_ptr_type_repr_abis(
+  int id: @fn_ptr_type_repr ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_async(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_const(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_unsafe(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_param_lists(
+  int id: @fn_ptr_type_repr ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_ret_types(
+  int id: @fn_ptr_type_repr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+for_type_reprs(
+  unique int id: @for_type_repr
+);
+
+#keyset[id]
+for_type_repr_for_binders(
+  int id: @for_type_repr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+for_type_repr_type_reprs(
+  int id: @for_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+format_args_exprs(
+  unique int id: @format_args_expr
+);
+
+#keyset[id, index]
+format_args_expr_args(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int arg: @format_args_arg ref
+);
+
+#keyset[id, index]
+format_args_expr_attrs(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+format_args_expr_templates(
+  int id: @format_args_expr ref,
+  int template: @expr ref
+);
+
+ident_pats(
+  unique int id: @ident_pat
+);
+
+#keyset[id, index]
+ident_pat_attrs(
+  int id: @ident_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ident_pat_is_mut(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_is_ref(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_names(
+  int id: @ident_pat ref,
+  int name: @name ref
+);
+
+#keyset[id]
+ident_pat_pats(
+  int id: @ident_pat ref,
+  int pat: @pat ref
+);
+
+if_exprs(
+  unique int id: @if_expr
+);
+
+#keyset[id, index]
+if_expr_attrs(
+  int id: @if_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+if_expr_conditions(
+  int id: @if_expr ref,
+  int condition: @expr ref
+);
+
+#keyset[id]
+if_expr_elses(
+  int id: @if_expr ref,
+  int else: @expr ref
+);
+
+#keyset[id]
+if_expr_thens(
+  int id: @if_expr ref,
+  int then: @block_expr ref
+);
+
+impl_trait_type_reprs(
+  unique int id: @impl_trait_type_repr
+);
+
+#keyset[id]
+impl_trait_type_repr_type_bound_lists(
+  int id: @impl_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+index_exprs(
+  unique int id: @index_expr
+);
+
+#keyset[id, index]
+index_expr_attrs(
+  int id: @index_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+index_expr_bases(
+  int id: @index_expr ref,
+  int base: @expr ref
+);
+
+#keyset[id]
+index_expr_indices(
+  int id: @index_expr ref,
+  int index: @expr ref
+);
+
+infer_type_reprs(
+  unique int id: @infer_type_repr
+);
+
+@item =
+  @adt
+| @asm_expr
+| @assoc_item
+| @extern_block
+| @extern_crate
+| @extern_item
+| @impl
+| @macro_def
+| @macro_rules
+| @module
+| @trait
+| @trait_alias
+| @use
+;
+
+#keyset[id]
+item_attribute_macro_expansions(
+  int id: @item ref,
+  int attribute_macro_expansion: @macro_items ref
+);
+
+@labelable_expr =
+  @block_expr
+| @looping_expr
+;
+
+#keyset[id]
+labelable_expr_labels(
+  int id: @labelable_expr ref,
+  int label: @label ref
+);
+
+let_exprs(
+  unique int id: @let_expr
+);
+
+#keyset[id, index]
+let_expr_attrs(
+  int id: @let_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_expr_scrutinees(
+  int id: @let_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+let_expr_pats(
+  int id: @let_expr ref,
+  int pat: @pat ref
+);
+
+let_stmts(
+  unique int id: @let_stmt
+);
+
+#keyset[id, index]
+let_stmt_attrs(
+  int id: @let_stmt ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_stmt_initializers(
+  int id: @let_stmt ref,
+  int initializer: @expr ref
+);
+
+#keyset[id]
+let_stmt_let_elses(
+  int id: @let_stmt ref,
+  int let_else: @let_else ref
+);
+
+#keyset[id]
+let_stmt_pats(
+  int id: @let_stmt ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+let_stmt_type_reprs(
+  int id: @let_stmt ref,
+  int type_repr: @type_repr ref
+);
+
+lifetimes(
+  unique int id: @lifetime
+);
+
+#keyset[id]
+lifetime_texts(
+  int id: @lifetime ref,
+  string text: string ref
+);
+
+lifetime_args(
+  unique int id: @lifetime_arg
+);
+
+#keyset[id]
+lifetime_arg_lifetimes(
+  int id: @lifetime_arg ref,
+  int lifetime: @lifetime ref
+);
+
+lifetime_params(
+  unique int id: @lifetime_param
+);
+
+#keyset[id, index]
+lifetime_param_attrs(
+  int id: @lifetime_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+lifetime_param_lifetimes(
+  int id: @lifetime_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+lifetime_param_type_bound_lists(
+  int id: @lifetime_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+literal_exprs(
+  unique int id: @literal_expr
+);
+
+#keyset[id, index]
+literal_expr_attrs(
+  int id: @literal_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+literal_expr_text_values(
+  int id: @literal_expr ref,
+  string text_value: string ref
+);
+
+literal_pats(
+  unique int id: @literal_pat
+);
+
+#keyset[id]
+literal_pat_literals(
+  int id: @literal_pat ref,
+  int literal: @literal_expr ref
+);
+
+macro_block_exprs(
+  unique int id: @macro_block_expr
+);
+
+#keyset[id, index]
+macro_block_expr_statements(
+  int id: @macro_block_expr ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+macro_block_expr_tail_exprs(
+  int id: @macro_block_expr ref,
+  int tail_expr: @expr ref
+);
+
+macro_exprs(
+  unique int id: @macro_expr
+);
+
+#keyset[id]
+macro_expr_macro_calls(
+  int id: @macro_expr ref,
+  int macro_call: @macro_call ref
+);
+
+macro_pats(
+  unique int id: @macro_pat
+);
+
+#keyset[id]
+macro_pat_macro_calls(
+  int id: @macro_pat ref,
+  int macro_call: @macro_call ref
+);
+
+macro_type_reprs(
+  unique int id: @macro_type_repr
+);
+
+#keyset[id]
+macro_type_repr_macro_calls(
+  int id: @macro_type_repr ref,
+  int macro_call: @macro_call ref
+);
+
+match_exprs(
+  unique int id: @match_expr
+);
+
+#keyset[id, index]
+match_expr_attrs(
+  int id: @match_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_expr_scrutinees(
+  int id: @match_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+match_expr_match_arm_lists(
+  int id: @match_expr ref,
+  int match_arm_list: @match_arm_list ref
+);
+
+name_refs(
+  unique int id: @name_ref
+);
+
+#keyset[id]
+name_ref_texts(
+  int id: @name_ref ref,
+  string text: string ref
+);
+
+never_type_reprs(
+  unique int id: @never_type_repr
+);
+
+offset_of_exprs(
+  unique int id: @offset_of_expr
+);
+
+#keyset[id, index]
+offset_of_expr_attrs(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+offset_of_expr_fields(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int field: @name_ref ref
+);
+
+#keyset[id]
+offset_of_expr_type_reprs(
+  int id: @offset_of_expr ref,
+  int type_repr: @type_repr ref
+);
+
+or_pats(
+  unique int id: @or_pat
+);
+
+#keyset[id, index]
+or_pat_pats(
+  int id: @or_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+params(
+  unique int id: @param
+);
+
+#keyset[id]
+param_pats(
+  int id: @param ref,
+  int pat: @pat ref
+);
+
+paren_exprs(
+  unique int id: @paren_expr
+);
+
+#keyset[id, index]
+paren_expr_attrs(
+  int id: @paren_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+paren_expr_exprs(
+  int id: @paren_expr ref,
+  int expr: @expr ref
+);
+
+paren_pats(
+  unique int id: @paren_pat
+);
+
+#keyset[id]
+paren_pat_pats(
+  int id: @paren_pat ref,
+  int pat: @pat ref
+);
+
+paren_type_reprs(
+  unique int id: @paren_type_repr
+);
+
+#keyset[id]
+paren_type_repr_type_reprs(
+  int id: @paren_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+@path_expr_base =
+  @path_expr
+;
+
+path_pats(
+  unique int id: @path_pat
+);
+
+path_type_reprs(
+  unique int id: @path_type_repr
+);
+
+#keyset[id]
+path_type_repr_paths(
+  int id: @path_type_repr ref,
+  int path: @path ref
+);
+
+prefix_exprs(
+  unique int id: @prefix_expr
+);
+
+#keyset[id, index]
+prefix_expr_attrs(
+  int id: @prefix_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+prefix_expr_exprs(
+  int id: @prefix_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+prefix_expr_operator_names(
+  int id: @prefix_expr ref,
+  string operator_name: string ref
+);
+
+ptr_type_reprs(
+  unique int id: @ptr_type_repr
+);
+
+#keyset[id]
+ptr_type_repr_is_const(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_is_mut(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_type_reprs(
+  int id: @ptr_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+range_exprs(
+  unique int id: @range_expr
+);
+
+#keyset[id, index]
+range_expr_attrs(
+  int id: @range_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+range_expr_ends(
+  int id: @range_expr ref,
+  int end: @expr ref
+);
+
+#keyset[id]
+range_expr_operator_names(
+  int id: @range_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_expr_starts(
+  int id: @range_expr ref,
+  int start: @expr ref
+);
+
+range_pats(
+  unique int id: @range_pat
+);
+
+#keyset[id]
+range_pat_ends(
+  int id: @range_pat ref,
+  int end: @pat ref
+);
+
+#keyset[id]
+range_pat_operator_names(
+  int id: @range_pat ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_pat_starts(
+  int id: @range_pat ref,
+  int start: @pat ref
+);
+
+ref_exprs(
+  unique int id: @ref_expr
+);
+
+#keyset[id, index]
+ref_expr_attrs(
+  int id: @ref_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ref_expr_exprs(
+  int id: @ref_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+ref_expr_is_const(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_mut(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_raw(
+  int id: @ref_expr ref
+);
+
+ref_pats(
+  unique int id: @ref_pat
+);
+
+#keyset[id]
+ref_pat_is_mut(
+  int id: @ref_pat ref
+);
+
+#keyset[id]
+ref_pat_pats(
+  int id: @ref_pat ref,
+  int pat: @pat ref
+);
+
+ref_type_reprs(
+  unique int id: @ref_type_repr
+);
+
+#keyset[id]
+ref_type_repr_is_mut(
+  int id: @ref_type_repr ref
+);
+
+#keyset[id]
+ref_type_repr_lifetimes(
+  int id: @ref_type_repr ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+ref_type_repr_type_reprs(
+  int id: @ref_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+rest_pats(
+  unique int id: @rest_pat
+);
+
+#keyset[id, index]
+rest_pat_attrs(
+  int id: @rest_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+return_exprs(
+  unique int id: @return_expr
+);
+
+#keyset[id, index]
+return_expr_attrs(
+  int id: @return_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+return_expr_exprs(
+  int id: @return_expr ref,
+  int expr: @expr ref
+);
+
+self_params(
+  unique int id: @self_param
+);
+
+#keyset[id]
+self_param_is_ref(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_is_mut(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_lifetimes(
+  int id: @self_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+self_param_names(
+  int id: @self_param ref,
+  int name: @name ref
+);
+
+slice_pats(
+  unique int id: @slice_pat
+);
+
+#keyset[id, index]
+slice_pat_pats(
+  int id: @slice_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+slice_type_reprs(
+  unique int id: @slice_type_repr
+);
+
+#keyset[id]
+slice_type_repr_type_reprs(
+  int id: @slice_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+struct_exprs(
+  unique int id: @struct_expr
+);
+
+#keyset[id]
+struct_expr_struct_expr_field_lists(
+  int id: @struct_expr ref,
+  int struct_expr_field_list: @struct_expr_field_list ref
+);
+
+struct_field_lists(
+  unique int id: @struct_field_list
+);
+
+#keyset[id, index]
+struct_field_list_fields(
+  int id: @struct_field_list ref,
+  int index: int ref,
+  int field: @struct_field ref
+);
+
+struct_pats(
+  unique int id: @struct_pat
+);
+
+#keyset[id]
+struct_pat_struct_pat_field_lists(
+  int id: @struct_pat ref,
+  int struct_pat_field_list: @struct_pat_field_list ref
+);
+
+try_exprs(
+  unique int id: @try_expr
+);
+
+#keyset[id, index]
+try_expr_attrs(
+  int id: @try_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+try_expr_exprs(
+  int id: @try_expr ref,
+  int expr: @expr ref
+);
+
+tuple_exprs(
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_attrs(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+tuple_expr_fields(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int field: @expr ref
+);
+
+tuple_field_lists(
+  unique int id: @tuple_field_list
+);
+
+#keyset[id, index]
+tuple_field_list_fields(
+  int id: @tuple_field_list ref,
+  int index: int ref,
+  int field: @tuple_field ref
+);
+
+tuple_pats(
+  unique int id: @tuple_pat
+);
+
+#keyset[id, index]
+tuple_pat_fields(
+  int id: @tuple_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_struct_pats(
+  unique int id: @tuple_struct_pat
+);
+
+#keyset[id, index]
+tuple_struct_pat_fields(
+  int id: @tuple_struct_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_type_reprs(
+  unique int id: @tuple_type_repr
+);
+
+#keyset[id, index]
+tuple_type_repr_fields(
+  int id: @tuple_type_repr ref,
+  int index: int ref,
+  int field: @type_repr ref
+);
+
+type_args(
+  unique int id: @type_arg
+);
+
+#keyset[id]
+type_arg_type_reprs(
+  int id: @type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+type_params(
+  unique int id: @type_param
+);
+
+#keyset[id, index]
+type_param_attrs(
+  int id: @type_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_param_default_types(
+  int id: @type_param ref,
+  int default_type: @type_repr ref
+);
+
+#keyset[id]
+type_param_names(
+  int id: @type_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_param_type_bound_lists(
+  int id: @type_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+underscore_exprs(
+  unique int id: @underscore_expr
+);
+
+#keyset[id, index]
+underscore_expr_attrs(
+  int id: @underscore_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+variants(
+  unique int id: @variant
+);
+
+#keyset[id, index]
+variant_attrs(
+  int id: @variant ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+variant_discriminants(
+  int id: @variant ref,
+  int discriminant: @expr ref
+);
+
+#keyset[id]
+variant_field_lists(
+  int id: @variant ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+variant_names(
+  int id: @variant ref,
+  int name: @name ref
+);
+
+#keyset[id]
+variant_visibilities(
+  int id: @variant ref,
+  int visibility: @visibility ref
+);
+
+wildcard_pats(
+  unique int id: @wildcard_pat
+);
+
+yeet_exprs(
+  unique int id: @yeet_expr
+);
+
+#keyset[id, index]
+yeet_expr_attrs(
+  int id: @yeet_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yeet_expr_exprs(
+  int id: @yeet_expr ref,
+  int expr: @expr ref
+);
+
+yield_exprs(
+  unique int id: @yield_expr
+);
+
+#keyset[id, index]
+yield_expr_attrs(
+  int id: @yield_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yield_expr_exprs(
+  int id: @yield_expr ref,
+  int expr: @expr ref
+);
+
+@adt =
+  @enum
+| @struct
+| @union
+;
+
+#keyset[id, index]
+adt_derive_macro_expansions(
+  int id: @adt ref,
+  int index: int ref,
+  int derive_macro_expansion: @macro_items ref
+);
+
+asm_exprs(
+  unique int id: @asm_expr
+);
+
+#keyset[id, index]
+asm_expr_asm_pieces(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int asm_piece: @asm_piece ref
+);
+
+#keyset[id, index]
+asm_expr_attrs(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+asm_expr_templates(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int template: @expr ref
+);
+
+@assoc_item =
+  @const
+| @function
+| @macro_call
+| @type_alias
+;
+
+block_exprs(
+  unique int id: @block_expr
+);
+
+#keyset[id, index]
+block_expr_attrs(
+  int id: @block_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+block_expr_is_async(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_const(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_gen(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_move(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_try(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_unsafe(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_stmt_lists(
+  int id: @block_expr ref,
+  int stmt_list: @stmt_list ref
+);
+
+call_exprs(
+  unique int id: @call_expr
+);
+
+#keyset[id]
+call_expr_functions(
+  int id: @call_expr ref,
+  int function: @expr ref
+);
+
+extern_blocks(
+  unique int id: @extern_block
+);
+
+#keyset[id]
+extern_block_abis(
+  int id: @extern_block ref,
+  int abi: @abi ref
+);
+
+#keyset[id, index]
+extern_block_attrs(
+  int id: @extern_block ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_block_extern_item_lists(
+  int id: @extern_block ref,
+  int extern_item_list: @extern_item_list ref
+);
+
+#keyset[id]
+extern_block_is_unsafe(
+  int id: @extern_block ref
+);
+
+extern_crates(
+  unique int id: @extern_crate
+);
+
+#keyset[id, index]
+extern_crate_attrs(
+  int id: @extern_crate ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_crate_identifiers(
+  int id: @extern_crate ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+extern_crate_renames(
+  int id: @extern_crate ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+extern_crate_visibilities(
+  int id: @extern_crate ref,
+  int visibility: @visibility ref
+);
+
+@extern_item =
+  @function
+| @macro_call
+| @static
+| @type_alias
+;
+
+impls(
+  unique int id: @impl
+);
+
+#keyset[id]
+impl_assoc_item_lists(
+  int id: @impl ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+impl_attrs(
+  int id: @impl ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+impl_generic_param_lists(
+  int id: @impl ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+impl_is_const(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_default(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_unsafe(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_self_ties(
+  int id: @impl ref,
+  int self_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_traits(
+  int id: @impl ref,
+  int trait: @type_repr ref
+);
+
+#keyset[id]
+impl_visibilities(
+  int id: @impl ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+impl_where_clauses(
+  int id: @impl ref,
+  int where_clause: @where_clause ref
+);
+
+@looping_expr =
+  @for_expr
+| @loop_expr
+| @while_expr
+;
+
+#keyset[id]
+looping_expr_loop_bodies(
+  int id: @looping_expr ref,
+  int loop_body: @block_expr ref
+);
+
+macro_defs(
+  unique int id: @macro_def
+);
+
+#keyset[id]
+macro_def_args(
+  int id: @macro_def ref,
+  int args: @token_tree ref
+);
+
+#keyset[id, index]
+macro_def_attrs(
+  int id: @macro_def ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_def_bodies(
+  int id: @macro_def ref,
+  int body: @token_tree ref
+);
+
+#keyset[id]
+macro_def_names(
+  int id: @macro_def ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_def_visibilities(
+  int id: @macro_def ref,
+  int visibility: @visibility ref
+);
+
+macro_rules(
+  unique int id: @macro_rules
+);
+
+#keyset[id, index]
+macro_rules_attrs(
+  int id: @macro_rules ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_rules_names(
+  int id: @macro_rules ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_rules_token_trees(
+  int id: @macro_rules ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_rules_visibilities(
+  int id: @macro_rules ref,
+  int visibility: @visibility ref
+);
+
+method_call_exprs(
+  unique int id: @method_call_expr
+);
+
+#keyset[id]
+method_call_expr_generic_arg_lists(
+  int id: @method_call_expr ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+method_call_expr_identifiers(
+  int id: @method_call_expr ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+method_call_expr_receivers(
+  int id: @method_call_expr ref,
+  int receiver: @expr ref
+);
+
+modules(
+  unique int id: @module
+);
+
+#keyset[id, index]
+module_attrs(
+  int id: @module ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+module_item_lists(
+  int id: @module ref,
+  int item_list: @item_list ref
+);
+
+#keyset[id]
+module_names(
+  int id: @module ref,
+  int name: @name ref
+);
+
+#keyset[id]
+module_visibilities(
+  int id: @module ref,
+  int visibility: @visibility ref
+);
+
+path_exprs(
+  unique int id: @path_expr
+);
+
+#keyset[id, index]
+path_expr_attrs(
+  int id: @path_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+traits(
+  unique int id: @trait
+);
+
+#keyset[id]
+trait_assoc_item_lists(
+  int id: @trait ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+trait_attrs(
+  int id: @trait ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_generic_param_lists(
+  int id: @trait ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_is_auto(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_is_unsafe(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_names(
+  int id: @trait ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_type_bound_lists(
+  int id: @trait ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_visibilities(
+  int id: @trait ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_where_clauses(
+  int id: @trait ref,
+  int where_clause: @where_clause ref
+);
+
+trait_aliases(
+  unique int id: @trait_alias
+);
+
+#keyset[id, index]
+trait_alias_attrs(
+  int id: @trait_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_alias_generic_param_lists(
+  int id: @trait_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_alias_names(
+  int id: @trait_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_alias_type_bound_lists(
+  int id: @trait_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_alias_visibilities(
+  int id: @trait_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_alias_where_clauses(
+  int id: @trait_alias ref,
+  int where_clause: @where_clause ref
+);
+
+uses(
+  unique int id: @use
+);
+
+#keyset[id, index]
+use_attrs(
+  int id: @use ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+use_use_trees(
+  int id: @use ref,
+  int use_tree: @use_tree ref
+);
+
+#keyset[id]
+use_visibilities(
+  int id: @use ref,
+  int visibility: @visibility ref
+);
+
+consts(
+  unique int id: @const
+);
+
+#keyset[id, index]
+const_attrs(
+  int id: @const ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_bodies(
+  int id: @const ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+const_generic_param_lists(
+  int id: @const ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+const_is_const(
+  int id: @const ref
+);
+
+#keyset[id]
+const_is_default(
+  int id: @const ref
+);
+
+#keyset[id]
+const_names(
+  int id: @const ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_type_reprs(
+  int id: @const ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+const_visibilities(
+  int id: @const ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+const_where_clauses(
+  int id: @const ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+const_has_implementation(
+  int id: @const ref
+);
+
+enums(
+  unique int id: @enum
+);
+
+#keyset[id, index]
+enum_attrs(
+  int id: @enum ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+enum_generic_param_lists(
+  int id: @enum ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+enum_names(
+  int id: @enum ref,
+  int name: @name ref
+);
+
+#keyset[id]
+enum_variant_lists(
+  int id: @enum ref,
+  int variant_list: @variant_list ref
+);
+
+#keyset[id]
+enum_visibilities(
+  int id: @enum ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+enum_where_clauses(
+  int id: @enum ref,
+  int where_clause: @where_clause ref
+);
+
+for_exprs(
+  unique int id: @for_expr
+);
+
+#keyset[id, index]
+for_expr_attrs(
+  int id: @for_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+for_expr_iterables(
+  int id: @for_expr ref,
+  int iterable: @expr ref
+);
+
+#keyset[id]
+for_expr_pats(
+  int id: @for_expr ref,
+  int pat: @pat ref
+);
+
+functions(
+  unique int id: @function
+);
+
+#keyset[id]
+function_abis(
+  int id: @function ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+function_function_bodies(
+  int id: @function ref,
+  int function_body: @block_expr ref
+);
+
+#keyset[id]
+function_generic_param_lists(
+  int id: @function ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+function_is_async(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_const(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_default(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_gen(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_unsafe(
+  int id: @function ref
+);
+
+#keyset[id]
+function_names(
+  int id: @function ref,
+  int name: @name ref
+);
+
+#keyset[id]
+function_ret_types(
+  int id: @function ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+function_visibilities(
+  int id: @function ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+function_where_clauses(
+  int id: @function ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+function_has_implementation(
+  int id: @function ref
+);
+
+loop_exprs(
+  unique int id: @loop_expr
+);
+
+#keyset[id, index]
+loop_expr_attrs(
+  int id: @loop_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+macro_calls(
+  unique int id: @macro_call
+);
+
+#keyset[id, index]
+macro_call_attrs(
+  int id: @macro_call ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_call_paths(
+  int id: @macro_call ref,
+  int path: @path ref
+);
+
+#keyset[id]
+macro_call_token_trees(
+  int id: @macro_call ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_call_macro_call_expansions(
+  int id: @macro_call ref,
+  int macro_call_expansion: @ast_node ref
+);
+
+statics(
+  unique int id: @static
+);
+
+#keyset[id, index]
+static_attrs(
+  int id: @static ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+static_bodies(
+  int id: @static ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+static_is_mut(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_static(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_unsafe(
+  int id: @static ref
+);
+
+#keyset[id]
+static_names(
+  int id: @static ref,
+  int name: @name ref
+);
+
+#keyset[id]
+static_type_reprs(
+  int id: @static ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+static_visibilities(
+  int id: @static ref,
+  int visibility: @visibility ref
+);
+
+structs(
+  unique int id: @struct
+);
+
+#keyset[id, index]
+struct_attrs(
+  int id: @struct ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_lists_(
+  int id: @struct ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+struct_generic_param_lists(
+  int id: @struct ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+struct_names(
+  int id: @struct ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_visibilities(
+  int id: @struct ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+struct_where_clauses(
+  int id: @struct ref,
+  int where_clause: @where_clause ref
+);
+
+type_aliases(
+  unique int id: @type_alias
+);
+
+#keyset[id, index]
+type_alias_attrs(
+  int id: @type_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_alias_generic_param_lists(
+  int id: @type_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_alias_is_default(
+  int id: @type_alias ref
+);
+
+#keyset[id]
+type_alias_names(
+  int id: @type_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_alias_type_reprs(
+  int id: @type_alias ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_alias_type_bound_lists(
+  int id: @type_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+type_alias_visibilities(
+  int id: @type_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_alias_where_clauses(
+  int id: @type_alias ref,
+  int where_clause: @where_clause ref
+);
+
+unions(
+  unique int id: @union
+);
+
+#keyset[id, index]
+union_attrs(
+  int id: @union ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+union_generic_param_lists(
+  int id: @union ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+union_names(
+  int id: @union ref,
+  int name: @name ref
+);
+
+#keyset[id]
+union_struct_field_lists(
+  int id: @union ref,
+  int struct_field_list: @struct_field_list ref
+);
+
+#keyset[id]
+union_visibilities(
+  int id: @union ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+union_where_clauses(
+  int id: @union ref,
+  int where_clause: @where_clause ref
+);
+
+while_exprs(
+  unique int id: @while_expr
+);
+
+#keyset[id, index]
+while_expr_attrs(
+  int id: @while_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+while_expr_conditions(
+  int id: @while_expr ref,
+  int condition: @expr ref
+);
diff --git a/rust/downgrades/30a0713e5bf69c60d003e4994e5abd1c78a36826/rust.dbscheme b/rust/downgrades/30a0713e5bf69c60d003e4994e5abd1c78a36826/rust.dbscheme
new file mode 100644
index 00000000000..dfade44a27b
--- /dev/null
+++ b/rust/downgrades/30a0713e5bf69c60d003e4994e5abd1c78a36826/rust.dbscheme
@@ -0,0 +1,3615 @@
+// generated by codegen, do not edit
+
+// from ../shared/tree-sitter-extractor/src/generator/prefix.dbscheme
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Empty location -*/
+
+empty_location(
+  int location: @location_default ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- Diagnostic messages: severity -*/
+
+case @diagnostic.severity of
+  10 = @diagnostic_debug
+| 20 = @diagnostic_info
+| 30 = @diagnostic_warning
+| 40 = @diagnostic_error
+;
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error;
+
+/*- Database metadata -*/
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+overlayChangedFiles(
+  string path: string ref
+);
+
+
+// from prefix.dbscheme
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_default ref
+);
+
+
+// from schema
+
+@element =
+  @extractor_step
+| @locatable
+| @named_crate
+| @unextracted
+;
+
+extractor_steps(
+  unique int id: @extractor_step,
+  string action: string ref,
+  int duration_ms: int ref
+);
+
+#keyset[id]
+extractor_step_files(
+  int id: @extractor_step ref,
+  int file: @file ref
+);
+
+@locatable =
+  @ast_node
+| @crate
+;
+
+named_crates(
+  unique int id: @named_crate,
+  string name: string ref,
+  int crate: @crate ref
+);
+
+@unextracted =
+  @missing
+| @unimplemented
+;
+
+@ast_node =
+  @abi
+| @addressable
+| @arg_list
+| @asm_dir_spec
+| @asm_operand
+| @asm_operand_expr
+| @asm_option
+| @asm_piece
+| @asm_reg_spec
+| @assoc_item_list
+| @attr
+| @callable
+| @expr
+| @extern_item_list
+| @field_list
+| @for_binder
+| @format_args_arg
+| @generic_arg
+| @generic_arg_list
+| @generic_param
+| @generic_param_list
+| @item_list
+| @label
+| @let_else
+| @macro_items
+| @match_arm
+| @match_arm_list
+| @match_guard
+| @meta
+| @name
+| @param_base
+| @param_list
+| @parenthesized_arg_list
+| @pat
+| @path
+| @path_ast_node
+| @path_segment
+| @rename
+| @ret_type_repr
+| @return_type_syntax
+| @source_file
+| @stmt
+| @stmt_list
+| @struct_expr_field
+| @struct_expr_field_list
+| @struct_field
+| @struct_pat_field
+| @struct_pat_field_list
+| @token
+| @token_tree
+| @tuple_field
+| @type_bound
+| @type_bound_list
+| @type_repr
+| @use_bound_generic_arg
+| @use_bound_generic_args
+| @use_tree
+| @use_tree_list
+| @variant_list
+| @visibility
+| @where_clause
+| @where_pred
+;
+
+crates(
+  unique int id: @crate
+);
+
+#keyset[id]
+crate_names(
+  int id: @crate ref,
+  string name: string ref
+);
+
+#keyset[id]
+crate_versions(
+  int id: @crate ref,
+  string version: string ref
+);
+
+#keyset[id, index]
+crate_cfg_options(
+  int id: @crate ref,
+  int index: int ref,
+  string cfg_option: string ref
+);
+
+#keyset[id, index]
+crate_named_dependencies(
+  int id: @crate ref,
+  int index: int ref,
+  int named_dependency: @named_crate ref
+);
+
+missings(
+  unique int id: @missing
+);
+
+unimplementeds(
+  unique int id: @unimplemented
+);
+
+abis(
+  unique int id: @abi
+);
+
+#keyset[id]
+abi_abi_strings(
+  int id: @abi ref,
+  string abi_string: string ref
+);
+
+@addressable =
+  @item
+| @variant
+;
+
+arg_lists(
+  unique int id: @arg_list
+);
+
+#keyset[id, index]
+arg_list_args(
+  int id: @arg_list ref,
+  int index: int ref,
+  int arg: @expr ref
+);
+
+asm_dir_specs(
+  unique int id: @asm_dir_spec
+);
+
+@asm_operand =
+  @asm_const
+| @asm_label
+| @asm_reg_operand
+| @asm_sym
+;
+
+asm_operand_exprs(
+  unique int id: @asm_operand_expr
+);
+
+#keyset[id]
+asm_operand_expr_in_exprs(
+  int id: @asm_operand_expr ref,
+  int in_expr: @expr ref
+);
+
+#keyset[id]
+asm_operand_expr_out_exprs(
+  int id: @asm_operand_expr ref,
+  int out_expr: @expr ref
+);
+
+asm_options(
+  unique int id: @asm_option
+);
+
+#keyset[id]
+asm_option_is_raw(
+  int id: @asm_option ref
+);
+
+@asm_piece =
+  @asm_clobber_abi
+| @asm_operand_named
+| @asm_options_list
+;
+
+asm_reg_specs(
+  unique int id: @asm_reg_spec
+);
+
+#keyset[id]
+asm_reg_spec_identifiers(
+  int id: @asm_reg_spec ref,
+  int identifier: @name_ref ref
+);
+
+assoc_item_lists(
+  unique int id: @assoc_item_list
+);
+
+#keyset[id, index]
+assoc_item_list_assoc_items(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int assoc_item: @assoc_item ref
+);
+
+#keyset[id, index]
+assoc_item_list_attrs(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+attrs(
+  unique int id: @attr
+);
+
+#keyset[id]
+attr_meta(
+  int id: @attr ref,
+  int meta: @meta ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_param_lists(
+  int id: @callable ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id, index]
+callable_attrs(
+  int id: @callable ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+@expr =
+  @array_expr_internal
+| @asm_expr
+| @await_expr
+| @become_expr
+| @binary_expr
+| @break_expr
+| @call_expr_base
+| @cast_expr
+| @closure_expr
+| @continue_expr
+| @field_expr
+| @format_args_expr
+| @if_expr
+| @index_expr
+| @labelable_expr
+| @let_expr
+| @literal_expr
+| @macro_block_expr
+| @macro_expr
+| @match_expr
+| @offset_of_expr
+| @paren_expr
+| @path_expr_base
+| @prefix_expr
+| @range_expr
+| @ref_expr
+| @return_expr
+| @struct_expr
+| @try_expr
+| @tuple_expr
+| @underscore_expr
+| @yeet_expr
+| @yield_expr
+;
+
+extern_item_lists(
+  unique int id: @extern_item_list
+);
+
+#keyset[id, index]
+extern_item_list_attrs(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+extern_item_list_extern_items(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int extern_item: @extern_item ref
+);
+
+@field_list =
+  @struct_field_list
+| @tuple_field_list
+;
+
+for_binders(
+  unique int id: @for_binder
+);
+
+#keyset[id]
+for_binder_generic_param_lists(
+  int id: @for_binder ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+format_args_args(
+  unique int id: @format_args_arg
+);
+
+#keyset[id]
+format_args_arg_exprs(
+  int id: @format_args_arg ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+format_args_arg_names(
+  int id: @format_args_arg ref,
+  int name: @name ref
+);
+
+@generic_arg =
+  @assoc_type_arg
+| @const_arg
+| @lifetime_arg
+| @type_arg
+;
+
+generic_arg_lists(
+  unique int id: @generic_arg_list
+);
+
+#keyset[id, index]
+generic_arg_list_generic_args(
+  int id: @generic_arg_list ref,
+  int index: int ref,
+  int generic_arg: @generic_arg ref
+);
+
+@generic_param =
+  @const_param
+| @lifetime_param
+| @type_param
+;
+
+generic_param_lists(
+  unique int id: @generic_param_list
+);
+
+#keyset[id, index]
+generic_param_list_generic_params(
+  int id: @generic_param_list ref,
+  int index: int ref,
+  int generic_param: @generic_param ref
+);
+
+item_lists(
+  unique int id: @item_list
+);
+
+#keyset[id, index]
+item_list_attrs(
+  int id: @item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+item_list_items(
+  int id: @item_list ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+labels(
+  unique int id: @label
+);
+
+#keyset[id]
+label_lifetimes(
+  int id: @label ref,
+  int lifetime: @lifetime ref
+);
+
+let_elses(
+  unique int id: @let_else
+);
+
+#keyset[id]
+let_else_block_exprs(
+  int id: @let_else ref,
+  int block_expr: @block_expr ref
+);
+
+macro_items(
+  unique int id: @macro_items
+);
+
+#keyset[id, index]
+macro_items_items(
+  int id: @macro_items ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+match_arms(
+  unique int id: @match_arm
+);
+
+#keyset[id, index]
+match_arm_attrs(
+  int id: @match_arm ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_arm_exprs(
+  int id: @match_arm ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+match_arm_guards(
+  int id: @match_arm ref,
+  int guard: @match_guard ref
+);
+
+#keyset[id]
+match_arm_pats(
+  int id: @match_arm ref,
+  int pat: @pat ref
+);
+
+match_arm_lists(
+  unique int id: @match_arm_list
+);
+
+#keyset[id, index]
+match_arm_list_arms(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int arm: @match_arm ref
+);
+
+#keyset[id, index]
+match_arm_list_attrs(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+match_guards(
+  unique int id: @match_guard
+);
+
+#keyset[id]
+match_guard_conditions(
+  int id: @match_guard ref,
+  int condition: @expr ref
+);
+
+meta(
+  unique int id: @meta
+);
+
+#keyset[id]
+meta_exprs(
+  int id: @meta ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+meta_is_unsafe(
+  int id: @meta ref
+);
+
+#keyset[id]
+meta_paths(
+  int id: @meta ref,
+  int path: @path ref
+);
+
+#keyset[id]
+meta_token_trees(
+  int id: @meta ref,
+  int token_tree: @token_tree ref
+);
+
+names(
+  unique int id: @name
+);
+
+#keyset[id]
+name_texts(
+  int id: @name ref,
+  string text: string ref
+);
+
+@param_base =
+  @param
+| @self_param
+;
+
+#keyset[id, index]
+param_base_attrs(
+  int id: @param_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+param_base_type_reprs(
+  int id: @param_base ref,
+  int type_repr: @type_repr ref
+);
+
+param_lists(
+  unique int id: @param_list
+);
+
+#keyset[id, index]
+param_list_params(
+  int id: @param_list ref,
+  int index: int ref,
+  int param: @param ref
+);
+
+#keyset[id]
+param_list_self_params(
+  int id: @param_list ref,
+  int self_param: @self_param ref
+);
+
+parenthesized_arg_lists(
+  unique int id: @parenthesized_arg_list
+);
+
+#keyset[id, index]
+parenthesized_arg_list_type_args(
+  int id: @parenthesized_arg_list ref,
+  int index: int ref,
+  int type_arg: @type_arg ref
+);
+
+@pat =
+  @box_pat
+| @const_block_pat
+| @ident_pat
+| @literal_pat
+| @macro_pat
+| @or_pat
+| @paren_pat
+| @path_pat
+| @range_pat
+| @ref_pat
+| @rest_pat
+| @slice_pat
+| @struct_pat
+| @tuple_pat
+| @tuple_struct_pat
+| @wildcard_pat
+;
+
+paths(
+  unique int id: @path
+);
+
+#keyset[id]
+path_qualifiers(
+  int id: @path ref,
+  int qualifier: @path ref
+);
+
+#keyset[id]
+path_segments_(
+  int id: @path ref,
+  int segment: @path_segment ref
+);
+
+@path_ast_node =
+  @path_expr
+| @path_pat
+| @struct_expr
+| @struct_pat
+| @tuple_struct_pat
+;
+
+#keyset[id]
+path_ast_node_paths(
+  int id: @path_ast_node ref,
+  int path: @path ref
+);
+
+path_segments(
+  unique int id: @path_segment
+);
+
+#keyset[id]
+path_segment_generic_arg_lists(
+  int id: @path_segment ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+path_segment_identifiers(
+  int id: @path_segment ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+path_segment_parenthesized_arg_lists(
+  int id: @path_segment ref,
+  int parenthesized_arg_list: @parenthesized_arg_list ref
+);
+
+#keyset[id]
+path_segment_ret_types(
+  int id: @path_segment ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+path_segment_return_type_syntaxes(
+  int id: @path_segment ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+path_segment_type_reprs(
+  int id: @path_segment ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+path_segment_trait_type_reprs(
+  int id: @path_segment ref,
+  int trait_type_repr: @path_type_repr ref
+);
+
+renames(
+  unique int id: @rename
+);
+
+#keyset[id]
+rename_names(
+  int id: @rename ref,
+  int name: @name ref
+);
+
+ret_type_reprs(
+  unique int id: @ret_type_repr
+);
+
+#keyset[id]
+ret_type_repr_type_reprs(
+  int id: @ret_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+return_type_syntaxes(
+  unique int id: @return_type_syntax
+);
+
+source_files(
+  unique int id: @source_file
+);
+
+#keyset[id, index]
+source_file_attrs(
+  int id: @source_file ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+source_file_items(
+  int id: @source_file ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+@stmt =
+  @expr_stmt
+| @item
+| @let_stmt
+;
+
+stmt_lists(
+  unique int id: @stmt_list
+);
+
+#keyset[id, index]
+stmt_list_attrs(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+stmt_list_statements(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+stmt_list_tail_exprs(
+  int id: @stmt_list ref,
+  int tail_expr: @expr ref
+);
+
+struct_expr_fields(
+  unique int id: @struct_expr_field
+);
+
+#keyset[id, index]
+struct_expr_field_attrs(
+  int id: @struct_expr_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_expr_field_exprs(
+  int id: @struct_expr_field ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+struct_expr_field_identifiers(
+  int id: @struct_expr_field ref,
+  int identifier: @name_ref ref
+);
+
+struct_expr_field_lists(
+  unique int id: @struct_expr_field_list
+);
+
+#keyset[id, index]
+struct_expr_field_list_attrs(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+struct_expr_field_list_fields(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int field: @struct_expr_field ref
+);
+
+#keyset[id]
+struct_expr_field_list_spreads(
+  int id: @struct_expr_field_list ref,
+  int spread: @expr ref
+);
+
+struct_fields(
+  unique int id: @struct_field
+);
+
+#keyset[id, index]
+struct_field_attrs(
+  int id: @struct_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_defaults(
+  int id: @struct_field ref,
+  int default: @expr ref
+);
+
+#keyset[id]
+struct_field_is_unsafe(
+  int id: @struct_field ref
+);
+
+#keyset[id]
+struct_field_names(
+  int id: @struct_field ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_field_type_reprs(
+  int id: @struct_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+struct_field_visibilities(
+  int id: @struct_field ref,
+  int visibility: @visibility ref
+);
+
+struct_pat_fields(
+  unique int id: @struct_pat_field
+);
+
+#keyset[id, index]
+struct_pat_field_attrs(
+  int id: @struct_pat_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_pat_field_identifiers(
+  int id: @struct_pat_field ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+struct_pat_field_pats(
+  int id: @struct_pat_field ref,
+  int pat: @pat ref
+);
+
+struct_pat_field_lists(
+  unique int id: @struct_pat_field_list
+);
+
+#keyset[id, index]
+struct_pat_field_list_fields(
+  int id: @struct_pat_field_list ref,
+  int index: int ref,
+  int field: @struct_pat_field ref
+);
+
+#keyset[id]
+struct_pat_field_list_rest_pats(
+  int id: @struct_pat_field_list ref,
+  int rest_pat: @rest_pat ref
+);
+
+@token =
+  @comment
+;
+
+token_trees(
+  unique int id: @token_tree
+);
+
+tuple_fields(
+  unique int id: @tuple_field
+);
+
+#keyset[id, index]
+tuple_field_attrs(
+  int id: @tuple_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+tuple_field_type_reprs(
+  int id: @tuple_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+tuple_field_visibilities(
+  int id: @tuple_field ref,
+  int visibility: @visibility ref
+);
+
+type_bounds(
+  unique int id: @type_bound
+);
+
+#keyset[id]
+type_bound_for_binders(
+  int id: @type_bound ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+type_bound_is_async(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_is_const(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_lifetimes(
+  int id: @type_bound ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+type_bound_type_reprs(
+  int id: @type_bound ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_bound_use_bound_generic_args(
+  int id: @type_bound ref,
+  int use_bound_generic_args: @use_bound_generic_args ref
+);
+
+type_bound_lists(
+  unique int id: @type_bound_list
+);
+
+#keyset[id, index]
+type_bound_list_bounds(
+  int id: @type_bound_list ref,
+  int index: int ref,
+  int bound: @type_bound ref
+);
+
+@type_repr =
+  @array_type_repr
+| @dyn_trait_type_repr
+| @fn_ptr_type_repr
+| @for_type_repr
+| @impl_trait_type_repr
+| @infer_type_repr
+| @macro_type_repr
+| @never_type_repr
+| @paren_type_repr
+| @path_type_repr
+| @ptr_type_repr
+| @ref_type_repr
+| @slice_type_repr
+| @tuple_type_repr
+;
+
+@use_bound_generic_arg =
+  @lifetime
+| @name_ref
+;
+
+use_bound_generic_args(
+  unique int id: @use_bound_generic_args
+);
+
+#keyset[id, index]
+use_bound_generic_args_use_bound_generic_args(
+  int id: @use_bound_generic_args ref,
+  int index: int ref,
+  int use_bound_generic_arg: @use_bound_generic_arg ref
+);
+
+use_trees(
+  unique int id: @use_tree
+);
+
+#keyset[id]
+use_tree_is_glob(
+  int id: @use_tree ref
+);
+
+#keyset[id]
+use_tree_paths(
+  int id: @use_tree ref,
+  int path: @path ref
+);
+
+#keyset[id]
+use_tree_renames(
+  int id: @use_tree ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+use_tree_use_tree_lists(
+  int id: @use_tree ref,
+  int use_tree_list: @use_tree_list ref
+);
+
+use_tree_lists(
+  unique int id: @use_tree_list
+);
+
+#keyset[id, index]
+use_tree_list_use_trees(
+  int id: @use_tree_list ref,
+  int index: int ref,
+  int use_tree: @use_tree ref
+);
+
+variant_lists(
+  unique int id: @variant_list
+);
+
+#keyset[id, index]
+variant_list_variants(
+  int id: @variant_list ref,
+  int index: int ref,
+  int variant: @variant ref
+);
+
+visibilities(
+  unique int id: @visibility
+);
+
+#keyset[id]
+visibility_paths(
+  int id: @visibility ref,
+  int path: @path ref
+);
+
+where_clauses(
+  unique int id: @where_clause
+);
+
+#keyset[id, index]
+where_clause_predicates(
+  int id: @where_clause ref,
+  int index: int ref,
+  int predicate: @where_pred ref
+);
+
+where_preds(
+  unique int id: @where_pred
+);
+
+#keyset[id]
+where_pred_for_binders(
+  int id: @where_pred ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+where_pred_lifetimes(
+  int id: @where_pred ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+where_pred_type_reprs(
+  int id: @where_pred ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+where_pred_type_bound_lists(
+  int id: @where_pred ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+array_expr_internals(
+  unique int id: @array_expr_internal
+);
+
+#keyset[id, index]
+array_expr_internal_attrs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+array_expr_internal_exprs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+array_expr_internal_is_semicolon(
+  int id: @array_expr_internal ref
+);
+
+array_type_reprs(
+  unique int id: @array_type_repr
+);
+
+#keyset[id]
+array_type_repr_const_args(
+  int id: @array_type_repr ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+array_type_repr_element_type_reprs(
+  int id: @array_type_repr ref,
+  int element_type_repr: @type_repr ref
+);
+
+asm_clobber_abis(
+  unique int id: @asm_clobber_abi
+);
+
+asm_consts(
+  unique int id: @asm_const
+);
+
+#keyset[id]
+asm_const_exprs(
+  int id: @asm_const ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+asm_const_is_const(
+  int id: @asm_const ref
+);
+
+asm_labels(
+  unique int id: @asm_label
+);
+
+#keyset[id]
+asm_label_block_exprs(
+  int id: @asm_label ref,
+  int block_expr: @block_expr ref
+);
+
+asm_operand_nameds(
+  unique int id: @asm_operand_named
+);
+
+#keyset[id]
+asm_operand_named_asm_operands(
+  int id: @asm_operand_named ref,
+  int asm_operand: @asm_operand ref
+);
+
+#keyset[id]
+asm_operand_named_names(
+  int id: @asm_operand_named ref,
+  int name: @name ref
+);
+
+asm_options_lists(
+  unique int id: @asm_options_list
+);
+
+#keyset[id, index]
+asm_options_list_asm_options(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int asm_option: @asm_option ref
+);
+
+asm_reg_operands(
+  unique int id: @asm_reg_operand
+);
+
+#keyset[id]
+asm_reg_operand_asm_dir_specs(
+  int id: @asm_reg_operand ref,
+  int asm_dir_spec: @asm_dir_spec ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_operand_exprs(
+  int id: @asm_reg_operand ref,
+  int asm_operand_expr: @asm_operand_expr ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_reg_specs(
+  int id: @asm_reg_operand ref,
+  int asm_reg_spec: @asm_reg_spec ref
+);
+
+asm_syms(
+  unique int id: @asm_sym
+);
+
+#keyset[id]
+asm_sym_paths(
+  int id: @asm_sym ref,
+  int path: @path ref
+);
+
+assoc_type_args(
+  unique int id: @assoc_type_arg
+);
+
+#keyset[id]
+assoc_type_arg_const_args(
+  int id: @assoc_type_arg ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+assoc_type_arg_generic_arg_lists(
+  int id: @assoc_type_arg ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+assoc_type_arg_identifiers(
+  int id: @assoc_type_arg ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+assoc_type_arg_param_lists(
+  int id: @assoc_type_arg ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+assoc_type_arg_ret_types(
+  int id: @assoc_type_arg ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_return_type_syntaxes(
+  int id: @assoc_type_arg ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+assoc_type_arg_type_reprs(
+  int id: @assoc_type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_type_bound_lists(
+  int id: @assoc_type_arg ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+await_exprs(
+  unique int id: @await_expr
+);
+
+#keyset[id, index]
+await_expr_attrs(
+  int id: @await_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+await_expr_exprs(
+  int id: @await_expr ref,
+  int expr: @expr ref
+);
+
+become_exprs(
+  unique int id: @become_expr
+);
+
+#keyset[id, index]
+become_expr_attrs(
+  int id: @become_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+become_expr_exprs(
+  int id: @become_expr ref,
+  int expr: @expr ref
+);
+
+binary_exprs(
+  unique int id: @binary_expr
+);
+
+#keyset[id, index]
+binary_expr_attrs(
+  int id: @binary_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+binary_expr_lhs(
+  int id: @binary_expr ref,
+  int lhs: @expr ref
+);
+
+#keyset[id]
+binary_expr_operator_names(
+  int id: @binary_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+binary_expr_rhs(
+  int id: @binary_expr ref,
+  int rhs: @expr ref
+);
+
+box_pats(
+  unique int id: @box_pat
+);
+
+#keyset[id]
+box_pat_pats(
+  int id: @box_pat ref,
+  int pat: @pat ref
+);
+
+break_exprs(
+  unique int id: @break_expr
+);
+
+#keyset[id, index]
+break_expr_attrs(
+  int id: @break_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+break_expr_exprs(
+  int id: @break_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+break_expr_lifetimes(
+  int id: @break_expr ref,
+  int lifetime: @lifetime ref
+);
+
+@call_expr_base =
+  @call_expr
+| @method_call_expr
+;
+
+#keyset[id]
+call_expr_base_arg_lists(
+  int id: @call_expr_base ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+call_expr_base_attrs(
+  int id: @call_expr_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+cast_exprs(
+  unique int id: @cast_expr
+);
+
+#keyset[id, index]
+cast_expr_attrs(
+  int id: @cast_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+cast_expr_exprs(
+  int id: @cast_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+cast_expr_type_reprs(
+  int id: @cast_expr ref,
+  int type_repr: @type_repr ref
+);
+
+closure_exprs(
+  unique int id: @closure_expr
+);
+
+#keyset[id]
+closure_expr_bodies(
+  int id: @closure_expr ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+closure_expr_for_binders(
+  int id: @closure_expr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+closure_expr_is_async(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_const(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_gen(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_move(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_static(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_ret_types(
+  int id: @closure_expr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+comments(
+  unique int id: @comment,
+  int parent: @ast_node ref,
+  string text: string ref
+);
+
+const_args(
+  unique int id: @const_arg
+);
+
+#keyset[id]
+const_arg_exprs(
+  int id: @const_arg ref,
+  int expr: @expr ref
+);
+
+const_block_pats(
+  unique int id: @const_block_pat
+);
+
+#keyset[id]
+const_block_pat_block_exprs(
+  int id: @const_block_pat ref,
+  int block_expr: @block_expr ref
+);
+
+#keyset[id]
+const_block_pat_is_const(
+  int id: @const_block_pat ref
+);
+
+const_params(
+  unique int id: @const_param
+);
+
+#keyset[id, index]
+const_param_attrs(
+  int id: @const_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_param_default_vals(
+  int id: @const_param ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+const_param_is_const(
+  int id: @const_param ref
+);
+
+#keyset[id]
+const_param_names(
+  int id: @const_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_param_type_reprs(
+  int id: @const_param ref,
+  int type_repr: @type_repr ref
+);
+
+continue_exprs(
+  unique int id: @continue_expr
+);
+
+#keyset[id, index]
+continue_expr_attrs(
+  int id: @continue_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+continue_expr_lifetimes(
+  int id: @continue_expr ref,
+  int lifetime: @lifetime ref
+);
+
+dyn_trait_type_reprs(
+  unique int id: @dyn_trait_type_repr
+);
+
+#keyset[id]
+dyn_trait_type_repr_type_bound_lists(
+  int id: @dyn_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+expr_stmts(
+  unique int id: @expr_stmt
+);
+
+#keyset[id]
+expr_stmt_exprs(
+  int id: @expr_stmt ref,
+  int expr: @expr ref
+);
+
+field_exprs(
+  unique int id: @field_expr
+);
+
+#keyset[id, index]
+field_expr_attrs(
+  int id: @field_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+field_expr_containers(
+  int id: @field_expr ref,
+  int container: @expr ref
+);
+
+#keyset[id]
+field_expr_identifiers(
+  int id: @field_expr ref,
+  int identifier: @name_ref ref
+);
+
+fn_ptr_type_reprs(
+  unique int id: @fn_ptr_type_repr
+);
+
+#keyset[id]
+fn_ptr_type_repr_abis(
+  int id: @fn_ptr_type_repr ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_async(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_const(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_unsafe(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_param_lists(
+  int id: @fn_ptr_type_repr ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_ret_types(
+  int id: @fn_ptr_type_repr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+for_type_reprs(
+  unique int id: @for_type_repr
+);
+
+#keyset[id]
+for_type_repr_for_binders(
+  int id: @for_type_repr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+for_type_repr_type_reprs(
+  int id: @for_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+format_args_exprs(
+  unique int id: @format_args_expr
+);
+
+#keyset[id, index]
+format_args_expr_args(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int arg: @format_args_arg ref
+);
+
+#keyset[id, index]
+format_args_expr_attrs(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+format_args_expr_templates(
+  int id: @format_args_expr ref,
+  int template: @expr ref
+);
+
+ident_pats(
+  unique int id: @ident_pat
+);
+
+#keyset[id, index]
+ident_pat_attrs(
+  int id: @ident_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ident_pat_is_mut(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_is_ref(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_names(
+  int id: @ident_pat ref,
+  int name: @name ref
+);
+
+#keyset[id]
+ident_pat_pats(
+  int id: @ident_pat ref,
+  int pat: @pat ref
+);
+
+if_exprs(
+  unique int id: @if_expr
+);
+
+#keyset[id, index]
+if_expr_attrs(
+  int id: @if_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+if_expr_conditions(
+  int id: @if_expr ref,
+  int condition: @expr ref
+);
+
+#keyset[id]
+if_expr_elses(
+  int id: @if_expr ref,
+  int else: @expr ref
+);
+
+#keyset[id]
+if_expr_thens(
+  int id: @if_expr ref,
+  int then: @block_expr ref
+);
+
+impl_trait_type_reprs(
+  unique int id: @impl_trait_type_repr
+);
+
+#keyset[id]
+impl_trait_type_repr_type_bound_lists(
+  int id: @impl_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+index_exprs(
+  unique int id: @index_expr
+);
+
+#keyset[id, index]
+index_expr_attrs(
+  int id: @index_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+index_expr_bases(
+  int id: @index_expr ref,
+  int base: @expr ref
+);
+
+#keyset[id]
+index_expr_indices(
+  int id: @index_expr ref,
+  int index: @expr ref
+);
+
+infer_type_reprs(
+  unique int id: @infer_type_repr
+);
+
+@item =
+  @adt
+| @asm_expr
+| @assoc_item
+| @extern_block
+| @extern_crate
+| @extern_item
+| @impl
+| @macro_def
+| @macro_rules
+| @module
+| @trait
+| @trait_alias
+| @use
+;
+
+#keyset[id]
+item_attribute_macro_expansions(
+  int id: @item ref,
+  int attribute_macro_expansion: @macro_items ref
+);
+
+@labelable_expr =
+  @block_expr
+| @looping_expr
+;
+
+#keyset[id]
+labelable_expr_labels(
+  int id: @labelable_expr ref,
+  int label: @label ref
+);
+
+let_exprs(
+  unique int id: @let_expr
+);
+
+#keyset[id, index]
+let_expr_attrs(
+  int id: @let_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_expr_scrutinees(
+  int id: @let_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+let_expr_pats(
+  int id: @let_expr ref,
+  int pat: @pat ref
+);
+
+let_stmts(
+  unique int id: @let_stmt
+);
+
+#keyset[id, index]
+let_stmt_attrs(
+  int id: @let_stmt ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_stmt_initializers(
+  int id: @let_stmt ref,
+  int initializer: @expr ref
+);
+
+#keyset[id]
+let_stmt_let_elses(
+  int id: @let_stmt ref,
+  int let_else: @let_else ref
+);
+
+#keyset[id]
+let_stmt_pats(
+  int id: @let_stmt ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+let_stmt_type_reprs(
+  int id: @let_stmt ref,
+  int type_repr: @type_repr ref
+);
+
+lifetimes(
+  unique int id: @lifetime
+);
+
+#keyset[id]
+lifetime_texts(
+  int id: @lifetime ref,
+  string text: string ref
+);
+
+lifetime_args(
+  unique int id: @lifetime_arg
+);
+
+#keyset[id]
+lifetime_arg_lifetimes(
+  int id: @lifetime_arg ref,
+  int lifetime: @lifetime ref
+);
+
+lifetime_params(
+  unique int id: @lifetime_param
+);
+
+#keyset[id, index]
+lifetime_param_attrs(
+  int id: @lifetime_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+lifetime_param_lifetimes(
+  int id: @lifetime_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+lifetime_param_type_bound_lists(
+  int id: @lifetime_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+literal_exprs(
+  unique int id: @literal_expr
+);
+
+#keyset[id, index]
+literal_expr_attrs(
+  int id: @literal_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+literal_expr_text_values(
+  int id: @literal_expr ref,
+  string text_value: string ref
+);
+
+literal_pats(
+  unique int id: @literal_pat
+);
+
+#keyset[id]
+literal_pat_literals(
+  int id: @literal_pat ref,
+  int literal: @literal_expr ref
+);
+
+macro_block_exprs(
+  unique int id: @macro_block_expr
+);
+
+#keyset[id, index]
+macro_block_expr_statements(
+  int id: @macro_block_expr ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+macro_block_expr_tail_exprs(
+  int id: @macro_block_expr ref,
+  int tail_expr: @expr ref
+);
+
+macro_exprs(
+  unique int id: @macro_expr
+);
+
+#keyset[id]
+macro_expr_macro_calls(
+  int id: @macro_expr ref,
+  int macro_call: @macro_call ref
+);
+
+macro_pats(
+  unique int id: @macro_pat
+);
+
+#keyset[id]
+macro_pat_macro_calls(
+  int id: @macro_pat ref,
+  int macro_call: @macro_call ref
+);
+
+macro_type_reprs(
+  unique int id: @macro_type_repr
+);
+
+#keyset[id]
+macro_type_repr_macro_calls(
+  int id: @macro_type_repr ref,
+  int macro_call: @macro_call ref
+);
+
+match_exprs(
+  unique int id: @match_expr
+);
+
+#keyset[id, index]
+match_expr_attrs(
+  int id: @match_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_expr_scrutinees(
+  int id: @match_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+match_expr_match_arm_lists(
+  int id: @match_expr ref,
+  int match_arm_list: @match_arm_list ref
+);
+
+name_refs(
+  unique int id: @name_ref
+);
+
+#keyset[id]
+name_ref_texts(
+  int id: @name_ref ref,
+  string text: string ref
+);
+
+never_type_reprs(
+  unique int id: @never_type_repr
+);
+
+offset_of_exprs(
+  unique int id: @offset_of_expr
+);
+
+#keyset[id, index]
+offset_of_expr_attrs(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+offset_of_expr_fields(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int field: @name_ref ref
+);
+
+#keyset[id]
+offset_of_expr_type_reprs(
+  int id: @offset_of_expr ref,
+  int type_repr: @type_repr ref
+);
+
+or_pats(
+  unique int id: @or_pat
+);
+
+#keyset[id, index]
+or_pat_pats(
+  int id: @or_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+params(
+  unique int id: @param
+);
+
+#keyset[id]
+param_pats(
+  int id: @param ref,
+  int pat: @pat ref
+);
+
+paren_exprs(
+  unique int id: @paren_expr
+);
+
+#keyset[id, index]
+paren_expr_attrs(
+  int id: @paren_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+paren_expr_exprs(
+  int id: @paren_expr ref,
+  int expr: @expr ref
+);
+
+paren_pats(
+  unique int id: @paren_pat
+);
+
+#keyset[id]
+paren_pat_pats(
+  int id: @paren_pat ref,
+  int pat: @pat ref
+);
+
+paren_type_reprs(
+  unique int id: @paren_type_repr
+);
+
+#keyset[id]
+paren_type_repr_type_reprs(
+  int id: @paren_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+@path_expr_base =
+  @path_expr
+;
+
+path_pats(
+  unique int id: @path_pat
+);
+
+path_type_reprs(
+  unique int id: @path_type_repr
+);
+
+#keyset[id]
+path_type_repr_paths(
+  int id: @path_type_repr ref,
+  int path: @path ref
+);
+
+prefix_exprs(
+  unique int id: @prefix_expr
+);
+
+#keyset[id, index]
+prefix_expr_attrs(
+  int id: @prefix_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+prefix_expr_exprs(
+  int id: @prefix_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+prefix_expr_operator_names(
+  int id: @prefix_expr ref,
+  string operator_name: string ref
+);
+
+ptr_type_reprs(
+  unique int id: @ptr_type_repr
+);
+
+#keyset[id]
+ptr_type_repr_is_const(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_is_mut(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_type_reprs(
+  int id: @ptr_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+range_exprs(
+  unique int id: @range_expr
+);
+
+#keyset[id, index]
+range_expr_attrs(
+  int id: @range_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+range_expr_ends(
+  int id: @range_expr ref,
+  int end: @expr ref
+);
+
+#keyset[id]
+range_expr_operator_names(
+  int id: @range_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_expr_starts(
+  int id: @range_expr ref,
+  int start: @expr ref
+);
+
+range_pats(
+  unique int id: @range_pat
+);
+
+#keyset[id]
+range_pat_ends(
+  int id: @range_pat ref,
+  int end: @pat ref
+);
+
+#keyset[id]
+range_pat_operator_names(
+  int id: @range_pat ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_pat_starts(
+  int id: @range_pat ref,
+  int start: @pat ref
+);
+
+ref_exprs(
+  unique int id: @ref_expr
+);
+
+#keyset[id, index]
+ref_expr_attrs(
+  int id: @ref_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ref_expr_exprs(
+  int id: @ref_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+ref_expr_is_const(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_mut(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_raw(
+  int id: @ref_expr ref
+);
+
+ref_pats(
+  unique int id: @ref_pat
+);
+
+#keyset[id]
+ref_pat_is_mut(
+  int id: @ref_pat ref
+);
+
+#keyset[id]
+ref_pat_pats(
+  int id: @ref_pat ref,
+  int pat: @pat ref
+);
+
+ref_type_reprs(
+  unique int id: @ref_type_repr
+);
+
+#keyset[id]
+ref_type_repr_is_mut(
+  int id: @ref_type_repr ref
+);
+
+#keyset[id]
+ref_type_repr_lifetimes(
+  int id: @ref_type_repr ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+ref_type_repr_type_reprs(
+  int id: @ref_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+rest_pats(
+  unique int id: @rest_pat
+);
+
+#keyset[id, index]
+rest_pat_attrs(
+  int id: @rest_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+return_exprs(
+  unique int id: @return_expr
+);
+
+#keyset[id, index]
+return_expr_attrs(
+  int id: @return_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+return_expr_exprs(
+  int id: @return_expr ref,
+  int expr: @expr ref
+);
+
+self_params(
+  unique int id: @self_param
+);
+
+#keyset[id]
+self_param_is_ref(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_is_mut(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_lifetimes(
+  int id: @self_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+self_param_names(
+  int id: @self_param ref,
+  int name: @name ref
+);
+
+slice_pats(
+  unique int id: @slice_pat
+);
+
+#keyset[id, index]
+slice_pat_pats(
+  int id: @slice_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+slice_type_reprs(
+  unique int id: @slice_type_repr
+);
+
+#keyset[id]
+slice_type_repr_type_reprs(
+  int id: @slice_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+struct_exprs(
+  unique int id: @struct_expr
+);
+
+#keyset[id]
+struct_expr_struct_expr_field_lists(
+  int id: @struct_expr ref,
+  int struct_expr_field_list: @struct_expr_field_list ref
+);
+
+struct_field_lists(
+  unique int id: @struct_field_list
+);
+
+#keyset[id, index]
+struct_field_list_fields(
+  int id: @struct_field_list ref,
+  int index: int ref,
+  int field: @struct_field ref
+);
+
+struct_pats(
+  unique int id: @struct_pat
+);
+
+#keyset[id]
+struct_pat_struct_pat_field_lists(
+  int id: @struct_pat ref,
+  int struct_pat_field_list: @struct_pat_field_list ref
+);
+
+try_exprs(
+  unique int id: @try_expr
+);
+
+#keyset[id, index]
+try_expr_attrs(
+  int id: @try_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+try_expr_exprs(
+  int id: @try_expr ref,
+  int expr: @expr ref
+);
+
+tuple_exprs(
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_attrs(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+tuple_expr_fields(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int field: @expr ref
+);
+
+tuple_field_lists(
+  unique int id: @tuple_field_list
+);
+
+#keyset[id, index]
+tuple_field_list_fields(
+  int id: @tuple_field_list ref,
+  int index: int ref,
+  int field: @tuple_field ref
+);
+
+tuple_pats(
+  unique int id: @tuple_pat
+);
+
+#keyset[id, index]
+tuple_pat_fields(
+  int id: @tuple_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_struct_pats(
+  unique int id: @tuple_struct_pat
+);
+
+#keyset[id, index]
+tuple_struct_pat_fields(
+  int id: @tuple_struct_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_type_reprs(
+  unique int id: @tuple_type_repr
+);
+
+#keyset[id, index]
+tuple_type_repr_fields(
+  int id: @tuple_type_repr ref,
+  int index: int ref,
+  int field: @type_repr ref
+);
+
+type_args(
+  unique int id: @type_arg
+);
+
+#keyset[id]
+type_arg_type_reprs(
+  int id: @type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+type_params(
+  unique int id: @type_param
+);
+
+#keyset[id, index]
+type_param_attrs(
+  int id: @type_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_param_default_types(
+  int id: @type_param ref,
+  int default_type: @type_repr ref
+);
+
+#keyset[id]
+type_param_names(
+  int id: @type_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_param_type_bound_lists(
+  int id: @type_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+underscore_exprs(
+  unique int id: @underscore_expr
+);
+
+#keyset[id, index]
+underscore_expr_attrs(
+  int id: @underscore_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+variants(
+  unique int id: @variant
+);
+
+#keyset[id, index]
+variant_attrs(
+  int id: @variant ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+variant_discriminants(
+  int id: @variant ref,
+  int discriminant: @expr ref
+);
+
+#keyset[id]
+variant_field_lists(
+  int id: @variant ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+variant_names(
+  int id: @variant ref,
+  int name: @name ref
+);
+
+#keyset[id]
+variant_visibilities(
+  int id: @variant ref,
+  int visibility: @visibility ref
+);
+
+wildcard_pats(
+  unique int id: @wildcard_pat
+);
+
+yeet_exprs(
+  unique int id: @yeet_expr
+);
+
+#keyset[id, index]
+yeet_expr_attrs(
+  int id: @yeet_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yeet_expr_exprs(
+  int id: @yeet_expr ref,
+  int expr: @expr ref
+);
+
+yield_exprs(
+  unique int id: @yield_expr
+);
+
+#keyset[id, index]
+yield_expr_attrs(
+  int id: @yield_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yield_expr_exprs(
+  int id: @yield_expr ref,
+  int expr: @expr ref
+);
+
+@adt =
+  @enum
+| @struct
+| @union
+;
+
+#keyset[id, index]
+adt_derive_macro_expansions(
+  int id: @adt ref,
+  int index: int ref,
+  int derive_macro_expansion: @macro_items ref
+);
+
+asm_exprs(
+  unique int id: @asm_expr
+);
+
+#keyset[id, index]
+asm_expr_asm_pieces(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int asm_piece: @asm_piece ref
+);
+
+#keyset[id, index]
+asm_expr_attrs(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+asm_expr_templates(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int template: @expr ref
+);
+
+@assoc_item =
+  @const
+| @function
+| @macro_call
+| @type_alias
+;
+
+block_exprs(
+  unique int id: @block_expr
+);
+
+#keyset[id, index]
+block_expr_attrs(
+  int id: @block_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+block_expr_is_async(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_const(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_gen(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_move(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_try(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_unsafe(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_stmt_lists(
+  int id: @block_expr ref,
+  int stmt_list: @stmt_list ref
+);
+
+call_exprs(
+  unique int id: @call_expr
+);
+
+#keyset[id]
+call_expr_functions(
+  int id: @call_expr ref,
+  int function: @expr ref
+);
+
+extern_blocks(
+  unique int id: @extern_block
+);
+
+#keyset[id]
+extern_block_abis(
+  int id: @extern_block ref,
+  int abi: @abi ref
+);
+
+#keyset[id, index]
+extern_block_attrs(
+  int id: @extern_block ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_block_extern_item_lists(
+  int id: @extern_block ref,
+  int extern_item_list: @extern_item_list ref
+);
+
+#keyset[id]
+extern_block_is_unsafe(
+  int id: @extern_block ref
+);
+
+extern_crates(
+  unique int id: @extern_crate
+);
+
+#keyset[id, index]
+extern_crate_attrs(
+  int id: @extern_crate ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_crate_identifiers(
+  int id: @extern_crate ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+extern_crate_renames(
+  int id: @extern_crate ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+extern_crate_visibilities(
+  int id: @extern_crate ref,
+  int visibility: @visibility ref
+);
+
+@extern_item =
+  @function
+| @macro_call
+| @static
+| @type_alias
+;
+
+impls(
+  unique int id: @impl
+);
+
+#keyset[id]
+impl_assoc_item_lists(
+  int id: @impl ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+impl_attrs(
+  int id: @impl ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+impl_generic_param_lists(
+  int id: @impl ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+impl_is_const(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_default(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_unsafe(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_self_ties(
+  int id: @impl ref,
+  int self_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_traits(
+  int id: @impl ref,
+  int trait: @type_repr ref
+);
+
+#keyset[id]
+impl_visibilities(
+  int id: @impl ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+impl_where_clauses(
+  int id: @impl ref,
+  int where_clause: @where_clause ref
+);
+
+@looping_expr =
+  @for_expr
+| @loop_expr
+| @while_expr
+;
+
+#keyset[id]
+looping_expr_loop_bodies(
+  int id: @looping_expr ref,
+  int loop_body: @block_expr ref
+);
+
+macro_defs(
+  unique int id: @macro_def
+);
+
+#keyset[id]
+macro_def_args(
+  int id: @macro_def ref,
+  int args: @token_tree ref
+);
+
+#keyset[id, index]
+macro_def_attrs(
+  int id: @macro_def ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_def_bodies(
+  int id: @macro_def ref,
+  int body: @token_tree ref
+);
+
+#keyset[id]
+macro_def_names(
+  int id: @macro_def ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_def_visibilities(
+  int id: @macro_def ref,
+  int visibility: @visibility ref
+);
+
+macro_rules(
+  unique int id: @macro_rules
+);
+
+#keyset[id, index]
+macro_rules_attrs(
+  int id: @macro_rules ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_rules_names(
+  int id: @macro_rules ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_rules_token_trees(
+  int id: @macro_rules ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_rules_visibilities(
+  int id: @macro_rules ref,
+  int visibility: @visibility ref
+);
+
+method_call_exprs(
+  unique int id: @method_call_expr
+);
+
+#keyset[id]
+method_call_expr_generic_arg_lists(
+  int id: @method_call_expr ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+method_call_expr_identifiers(
+  int id: @method_call_expr ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+method_call_expr_receivers(
+  int id: @method_call_expr ref,
+  int receiver: @expr ref
+);
+
+modules(
+  unique int id: @module
+);
+
+#keyset[id, index]
+module_attrs(
+  int id: @module ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+module_item_lists(
+  int id: @module ref,
+  int item_list: @item_list ref
+);
+
+#keyset[id]
+module_names(
+  int id: @module ref,
+  int name: @name ref
+);
+
+#keyset[id]
+module_visibilities(
+  int id: @module ref,
+  int visibility: @visibility ref
+);
+
+path_exprs(
+  unique int id: @path_expr
+);
+
+#keyset[id, index]
+path_expr_attrs(
+  int id: @path_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+traits(
+  unique int id: @trait
+);
+
+#keyset[id]
+trait_assoc_item_lists(
+  int id: @trait ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+trait_attrs(
+  int id: @trait ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_generic_param_lists(
+  int id: @trait ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_is_auto(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_is_unsafe(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_names(
+  int id: @trait ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_type_bound_lists(
+  int id: @trait ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_visibilities(
+  int id: @trait ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_where_clauses(
+  int id: @trait ref,
+  int where_clause: @where_clause ref
+);
+
+trait_aliases(
+  unique int id: @trait_alias
+);
+
+#keyset[id, index]
+trait_alias_attrs(
+  int id: @trait_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_alias_generic_param_lists(
+  int id: @trait_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_alias_names(
+  int id: @trait_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_alias_type_bound_lists(
+  int id: @trait_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_alias_visibilities(
+  int id: @trait_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_alias_where_clauses(
+  int id: @trait_alias ref,
+  int where_clause: @where_clause ref
+);
+
+uses(
+  unique int id: @use
+);
+
+#keyset[id, index]
+use_attrs(
+  int id: @use ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+use_use_trees(
+  int id: @use ref,
+  int use_tree: @use_tree ref
+);
+
+#keyset[id]
+use_visibilities(
+  int id: @use ref,
+  int visibility: @visibility ref
+);
+
+consts(
+  unique int id: @const
+);
+
+#keyset[id, index]
+const_attrs(
+  int id: @const ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_bodies(
+  int id: @const ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+const_generic_param_lists(
+  int id: @const ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+const_is_const(
+  int id: @const ref
+);
+
+#keyset[id]
+const_is_default(
+  int id: @const ref
+);
+
+#keyset[id]
+const_names(
+  int id: @const ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_type_reprs(
+  int id: @const ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+const_visibilities(
+  int id: @const ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+const_where_clauses(
+  int id: @const ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+const_has_implementation(
+  int id: @const ref
+);
+
+enums(
+  unique int id: @enum
+);
+
+#keyset[id, index]
+enum_attrs(
+  int id: @enum ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+enum_generic_param_lists(
+  int id: @enum ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+enum_names(
+  int id: @enum ref,
+  int name: @name ref
+);
+
+#keyset[id]
+enum_variant_lists(
+  int id: @enum ref,
+  int variant_list: @variant_list ref
+);
+
+#keyset[id]
+enum_visibilities(
+  int id: @enum ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+enum_where_clauses(
+  int id: @enum ref,
+  int where_clause: @where_clause ref
+);
+
+for_exprs(
+  unique int id: @for_expr
+);
+
+#keyset[id, index]
+for_expr_attrs(
+  int id: @for_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+for_expr_iterables(
+  int id: @for_expr ref,
+  int iterable: @expr ref
+);
+
+#keyset[id]
+for_expr_pats(
+  int id: @for_expr ref,
+  int pat: @pat ref
+);
+
+functions(
+  unique int id: @function
+);
+
+#keyset[id]
+function_abis(
+  int id: @function ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+function_bodies(
+  int id: @function ref,
+  int body: @block_expr ref
+);
+
+#keyset[id]
+function_generic_param_lists(
+  int id: @function ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+function_is_async(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_const(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_default(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_gen(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_unsafe(
+  int id: @function ref
+);
+
+#keyset[id]
+function_names(
+  int id: @function ref,
+  int name: @name ref
+);
+
+#keyset[id]
+function_ret_types(
+  int id: @function ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+function_visibilities(
+  int id: @function ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+function_where_clauses(
+  int id: @function ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+function_has_implementation(
+  int id: @function ref
+);
+
+loop_exprs(
+  unique int id: @loop_expr
+);
+
+#keyset[id, index]
+loop_expr_attrs(
+  int id: @loop_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+macro_calls(
+  unique int id: @macro_call
+);
+
+#keyset[id, index]
+macro_call_attrs(
+  int id: @macro_call ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_call_paths(
+  int id: @macro_call ref,
+  int path: @path ref
+);
+
+#keyset[id]
+macro_call_token_trees(
+  int id: @macro_call ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_call_macro_call_expansions(
+  int id: @macro_call ref,
+  int macro_call_expansion: @ast_node ref
+);
+
+statics(
+  unique int id: @static
+);
+
+#keyset[id, index]
+static_attrs(
+  int id: @static ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+static_bodies(
+  int id: @static ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+static_is_mut(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_static(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_unsafe(
+  int id: @static ref
+);
+
+#keyset[id]
+static_names(
+  int id: @static ref,
+  int name: @name ref
+);
+
+#keyset[id]
+static_type_reprs(
+  int id: @static ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+static_visibilities(
+  int id: @static ref,
+  int visibility: @visibility ref
+);
+
+structs(
+  unique int id: @struct
+);
+
+#keyset[id, index]
+struct_attrs(
+  int id: @struct ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_lists_(
+  int id: @struct ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+struct_generic_param_lists(
+  int id: @struct ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+struct_names(
+  int id: @struct ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_visibilities(
+  int id: @struct ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+struct_where_clauses(
+  int id: @struct ref,
+  int where_clause: @where_clause ref
+);
+
+type_aliases(
+  unique int id: @type_alias
+);
+
+#keyset[id, index]
+type_alias_attrs(
+  int id: @type_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_alias_generic_param_lists(
+  int id: @type_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_alias_is_default(
+  int id: @type_alias ref
+);
+
+#keyset[id]
+type_alias_names(
+  int id: @type_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_alias_type_reprs(
+  int id: @type_alias ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_alias_type_bound_lists(
+  int id: @type_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+type_alias_visibilities(
+  int id: @type_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_alias_where_clauses(
+  int id: @type_alias ref,
+  int where_clause: @where_clause ref
+);
+
+unions(
+  unique int id: @union
+);
+
+#keyset[id, index]
+union_attrs(
+  int id: @union ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+union_generic_param_lists(
+  int id: @union ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+union_names(
+  int id: @union ref,
+  int name: @name ref
+);
+
+#keyset[id]
+union_struct_field_lists(
+  int id: @union ref,
+  int struct_field_list: @struct_field_list ref
+);
+
+#keyset[id]
+union_visibilities(
+  int id: @union ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+union_where_clauses(
+  int id: @union ref,
+  int where_clause: @where_clause ref
+);
+
+while_exprs(
+  unique int id: @while_expr
+);
+
+#keyset[id, index]
+while_expr_attrs(
+  int id: @while_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+while_expr_conditions(
+  int id: @while_expr ref,
+  int condition: @expr ref
+);
diff --git a/rust/downgrades/30a0713e5bf69c60d003e4994e5abd1c78a36826/upgrade.properties b/rust/downgrades/30a0713e5bf69c60d003e4994e5abd1c78a36826/upgrade.properties
new file mode 100644
index 00000000000..d5176368078
--- /dev/null
+++ b/rust/downgrades/30a0713e5bf69c60d003e4994e5abd1c78a36826/upgrade.properties
@@ -0,0 +1,8 @@
+description: Rename function/closure body relations
+compatibility: backwards
+
+closure_expr_closure_bodies.rel: delete
+function_function_bodies.rel: delete
+
+closure_expr_bodies.rel: run downgrade.ql new_closure_expr_bodies
+function_bodies.rel: run downgrade.ql new_function_bodies
diff --git a/rust/downgrades/b41e55c0dba14a139d01dbee713aca5efe5b818a/downgrade.ql b/rust/downgrades/b41e55c0dba14a139d01dbee713aca5efe5b818a/downgrade.ql
new file mode 100644
index 00000000000..56e3d5b652c
--- /dev/null
+++ b/rust/downgrades/b41e55c0dba14a139d01dbee713aca5efe5b818a/downgrade.ql
@@ -0,0 +1,93 @@
+class Element extends @element {
+  string toString() { none() }
+}
+
+class Location extends @location_default {
+  string toString() { none() }
+}
+
+query predicate new_closure_binders(Element id) {
+  for_binders(id) and closure_expr_for_binders(_, id)
+}
+
+query predicate new_closure_binder_generic_param_lists(Element id, Element list) {
+  for_binder_generic_param_lists(id, list) and closure_expr_for_binders(_, id)
+}
+
+query predicate new_where_pred_generic_param_lists(Element id, Element list) {
+  exists(Element forBinder |
+    where_pred_for_binders(id, forBinder) and
+    for_binder_generic_param_lists(forBinder, list)
+  )
+}
+
+// We need to transform `TypeBound(for_binder=ForBinder(generic_param_list=X), type_repr=Y)`
+// into `TypeBound(type_repr=ForTypeRepr(generic_param_list=X, type_repr=Y))`
+// we repurpose the `@for_binder` id into a `@for_type_repr` one
+query predicate new_for_type_reprs(Element id) {
+  for_type_reprs(id) or
+  exists(Element typeBound | type_bound_for_binders(typeBound, id))
+}
+
+query predicate new_for_type_repr_generic_param_lists(Element id, Element list) {
+  exists(Element forBinder |
+    for_type_repr_for_binders(id, forBinder) and for_binder_generic_param_lists(forBinder, list)
+  )
+  or
+  exists(Element typeBound |
+    type_bound_for_binders(typeBound, id) and for_binder_generic_param_lists(id, list)
+  )
+}
+
+query predicate new_for_type_repr_type_reprs(Element id, Element type) {
+  for_type_repr_type_reprs(id, type)
+  or
+  exists(Element typeBound |
+    type_bound_for_binders(typeBound, id) and type_bound_type_reprs(typeBound, type)
+  )
+}
+
+query predicate new_type_bound_type_reprs(Element bound, Element type) {
+  type_bound_type_reprs(bound, type) and not type_bound_for_binders(bound, _)
+  or
+  type_bound_for_binders(bound, type)
+}
+
+// remove locations of removed @for_binder elements
+query predicate new_locatable_locations(Element id, Location loc) {
+  locatable_locations(id, loc) and not where_pred_for_binders(_, id)
+}
+
+// remove @asm_expr from the subtypes of @item (and therefore @addressable and @stmt)
+// this means removing any @asm_expr ids from tables that accept @item, @stmt or @addressable
+query predicate new_item_attribute_macro_expansions(Element id, Element items) {
+  item_attribute_macro_expansions(id, items) and not asm_exprs(id)
+}
+
+query predicate new_item_list_items(Element id, int index, Element item) {
+  item_list_items(id, index, item) and not asm_exprs(item)
+}
+
+query predicate new_macro_items_items(Element id, int index, Element item) {
+  macro_items_items(id, index, item) and not asm_exprs(item)
+}
+
+query predicate new_source_file_items(Element id, int index, Element item) {
+  source_file_items(id, index, item) and not asm_exprs(item)
+}
+
+query predicate new_stmt_list_statements(Element id, int index, Element stmt) {
+  stmt_list_statements(id, index, stmt) and not asm_exprs(stmt)
+}
+
+query predicate new_macro_block_expr_statements(Element id, int index, Element stmt) {
+  macro_block_expr_statements(id, index, stmt) and not asm_exprs(stmt)
+}
+
+query predicate new_addressable_extended_canonical_paths(Element id, string path) {
+  addressable_extended_canonical_paths(id, path) and not asm_exprs(id)
+}
+
+query predicate new_addressable_crate_origins(Element id, string crate) {
+  addressable_crate_origins(id, crate) and not asm_exprs(id)
+}
diff --git a/rust/downgrades/b41e55c0dba14a139d01dbee713aca5efe5b818a/old.dbscheme b/rust/downgrades/b41e55c0dba14a139d01dbee713aca5efe5b818a/old.dbscheme
new file mode 100644
index 00000000000..b41e55c0dba
--- /dev/null
+++ b/rust/downgrades/b41e55c0dba14a139d01dbee713aca5efe5b818a/old.dbscheme
@@ -0,0 +1,3644 @@
+// generated by codegen, do not edit
+
+// from ../shared/tree-sitter-extractor/src/generator/prefix.dbscheme
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Empty location -*/
+
+empty_location(
+  int location: @location_default ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- Diagnostic messages: severity -*/
+
+case @diagnostic.severity of
+  10 = @diagnostic_debug
+| 20 = @diagnostic_info
+| 30 = @diagnostic_warning
+| 40 = @diagnostic_error
+;
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error;
+
+/*- Database metadata -*/
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+overlayChangedFiles(
+  string path: string ref
+);
+
+
+// from prefix.dbscheme
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_default ref
+);
+
+
+// from schema
+
+@element =
+  @extractor_step
+| @locatable
+| @named_crate
+| @unextracted
+;
+
+extractor_steps(
+  unique int id: @extractor_step,
+  string action: string ref,
+  int duration_ms: int ref
+);
+
+#keyset[id]
+extractor_step_files(
+  int id: @extractor_step ref,
+  int file: @file ref
+);
+
+@locatable =
+  @ast_node
+| @crate
+;
+
+named_crates(
+  unique int id: @named_crate,
+  string name: string ref,
+  int crate: @crate ref
+);
+
+@unextracted =
+  @missing
+| @unimplemented
+;
+
+@ast_node =
+  @abi
+| @addressable
+| @arg_list
+| @asm_dir_spec
+| @asm_operand
+| @asm_operand_expr
+| @asm_option
+| @asm_piece
+| @asm_reg_spec
+| @assoc_item_list
+| @attr
+| @callable
+| @expr
+| @extern_item_list
+| @field_list
+| @for_binder
+| @format_args_arg
+| @generic_arg
+| @generic_arg_list
+| @generic_param
+| @generic_param_list
+| @item_list
+| @label
+| @let_else
+| @macro_items
+| @match_arm
+| @match_arm_list
+| @match_guard
+| @meta
+| @name
+| @param_base
+| @param_list
+| @parenthesized_arg_list
+| @pat
+| @path
+| @path_segment
+| @rename
+| @resolvable
+| @ret_type_repr
+| @return_type_syntax
+| @source_file
+| @stmt
+| @stmt_list
+| @struct_expr_field
+| @struct_expr_field_list
+| @struct_field
+| @struct_pat_field
+| @struct_pat_field_list
+| @token
+| @token_tree
+| @tuple_field
+| @type_bound
+| @type_bound_list
+| @type_repr
+| @use_bound_generic_arg
+| @use_bound_generic_args
+| @use_tree
+| @use_tree_list
+| @variant_list
+| @visibility
+| @where_clause
+| @where_pred
+;
+
+crates(
+  unique int id: @crate
+);
+
+#keyset[id]
+crate_names(
+  int id: @crate ref,
+  string name: string ref
+);
+
+#keyset[id]
+crate_versions(
+  int id: @crate ref,
+  string version: string ref
+);
+
+#keyset[id, index]
+crate_cfg_options(
+  int id: @crate ref,
+  int index: int ref,
+  string cfg_option: string ref
+);
+
+#keyset[id, index]
+crate_named_dependencies(
+  int id: @crate ref,
+  int index: int ref,
+  int named_dependency: @named_crate ref
+);
+
+missings(
+  unique int id: @missing
+);
+
+unimplementeds(
+  unique int id: @unimplemented
+);
+
+abis(
+  unique int id: @abi
+);
+
+#keyset[id]
+abi_abi_strings(
+  int id: @abi ref,
+  string abi_string: string ref
+);
+
+@addressable =
+  @item
+| @variant
+;
+
+#keyset[id]
+addressable_extended_canonical_paths(
+  int id: @addressable ref,
+  string extended_canonical_path: string ref
+);
+
+#keyset[id]
+addressable_crate_origins(
+  int id: @addressable ref,
+  string crate_origin: string ref
+);
+
+arg_lists(
+  unique int id: @arg_list
+);
+
+#keyset[id, index]
+arg_list_args(
+  int id: @arg_list ref,
+  int index: int ref,
+  int arg: @expr ref
+);
+
+asm_dir_specs(
+  unique int id: @asm_dir_spec
+);
+
+@asm_operand =
+  @asm_const
+| @asm_label
+| @asm_reg_operand
+| @asm_sym
+;
+
+asm_operand_exprs(
+  unique int id: @asm_operand_expr
+);
+
+#keyset[id]
+asm_operand_expr_in_exprs(
+  int id: @asm_operand_expr ref,
+  int in_expr: @expr ref
+);
+
+#keyset[id]
+asm_operand_expr_out_exprs(
+  int id: @asm_operand_expr ref,
+  int out_expr: @expr ref
+);
+
+asm_options(
+  unique int id: @asm_option
+);
+
+#keyset[id]
+asm_option_is_raw(
+  int id: @asm_option ref
+);
+
+@asm_piece =
+  @asm_clobber_abi
+| @asm_operand_named
+| @asm_options_list
+;
+
+asm_reg_specs(
+  unique int id: @asm_reg_spec
+);
+
+#keyset[id]
+asm_reg_spec_identifiers(
+  int id: @asm_reg_spec ref,
+  int identifier: @name_ref ref
+);
+
+assoc_item_lists(
+  unique int id: @assoc_item_list
+);
+
+#keyset[id, index]
+assoc_item_list_assoc_items(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int assoc_item: @assoc_item ref
+);
+
+#keyset[id, index]
+assoc_item_list_attrs(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+attrs(
+  unique int id: @attr
+);
+
+#keyset[id]
+attr_meta(
+  int id: @attr ref,
+  int meta: @meta ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_param_lists(
+  int id: @callable ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id, index]
+callable_attrs(
+  int id: @callable ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+@expr =
+  @array_expr_internal
+| @asm_expr
+| @await_expr
+| @become_expr
+| @binary_expr
+| @break_expr
+| @call_expr_base
+| @cast_expr
+| @closure_expr
+| @continue_expr
+| @field_expr
+| @format_args_expr
+| @if_expr
+| @index_expr
+| @labelable_expr
+| @let_expr
+| @literal_expr
+| @macro_block_expr
+| @macro_expr
+| @match_expr
+| @offset_of_expr
+| @paren_expr
+| @path_expr_base
+| @prefix_expr
+| @range_expr
+| @ref_expr
+| @return_expr
+| @struct_expr
+| @try_expr
+| @tuple_expr
+| @underscore_expr
+| @yeet_expr
+| @yield_expr
+;
+
+extern_item_lists(
+  unique int id: @extern_item_list
+);
+
+#keyset[id, index]
+extern_item_list_attrs(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+extern_item_list_extern_items(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int extern_item: @extern_item ref
+);
+
+@field_list =
+  @struct_field_list
+| @tuple_field_list
+;
+
+for_binders(
+  unique int id: @for_binder
+);
+
+#keyset[id]
+for_binder_generic_param_lists(
+  int id: @for_binder ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+format_args_args(
+  unique int id: @format_args_arg
+);
+
+#keyset[id]
+format_args_arg_exprs(
+  int id: @format_args_arg ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+format_args_arg_names(
+  int id: @format_args_arg ref,
+  int name: @name ref
+);
+
+@generic_arg =
+  @assoc_type_arg
+| @const_arg
+| @lifetime_arg
+| @type_arg
+;
+
+generic_arg_lists(
+  unique int id: @generic_arg_list
+);
+
+#keyset[id, index]
+generic_arg_list_generic_args(
+  int id: @generic_arg_list ref,
+  int index: int ref,
+  int generic_arg: @generic_arg ref
+);
+
+@generic_param =
+  @const_param
+| @lifetime_param
+| @type_param
+;
+
+generic_param_lists(
+  unique int id: @generic_param_list
+);
+
+#keyset[id, index]
+generic_param_list_generic_params(
+  int id: @generic_param_list ref,
+  int index: int ref,
+  int generic_param: @generic_param ref
+);
+
+item_lists(
+  unique int id: @item_list
+);
+
+#keyset[id, index]
+item_list_attrs(
+  int id: @item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+item_list_items(
+  int id: @item_list ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+labels(
+  unique int id: @label
+);
+
+#keyset[id]
+label_lifetimes(
+  int id: @label ref,
+  int lifetime: @lifetime ref
+);
+
+let_elses(
+  unique int id: @let_else
+);
+
+#keyset[id]
+let_else_block_exprs(
+  int id: @let_else ref,
+  int block_expr: @block_expr ref
+);
+
+macro_items(
+  unique int id: @macro_items
+);
+
+#keyset[id, index]
+macro_items_items(
+  int id: @macro_items ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+match_arms(
+  unique int id: @match_arm
+);
+
+#keyset[id, index]
+match_arm_attrs(
+  int id: @match_arm ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_arm_exprs(
+  int id: @match_arm ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+match_arm_guards(
+  int id: @match_arm ref,
+  int guard: @match_guard ref
+);
+
+#keyset[id]
+match_arm_pats(
+  int id: @match_arm ref,
+  int pat: @pat ref
+);
+
+match_arm_lists(
+  unique int id: @match_arm_list
+);
+
+#keyset[id, index]
+match_arm_list_arms(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int arm: @match_arm ref
+);
+
+#keyset[id, index]
+match_arm_list_attrs(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+match_guards(
+  unique int id: @match_guard
+);
+
+#keyset[id]
+match_guard_conditions(
+  int id: @match_guard ref,
+  int condition: @expr ref
+);
+
+meta(
+  unique int id: @meta
+);
+
+#keyset[id]
+meta_exprs(
+  int id: @meta ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+meta_is_unsafe(
+  int id: @meta ref
+);
+
+#keyset[id]
+meta_paths(
+  int id: @meta ref,
+  int path: @path ref
+);
+
+#keyset[id]
+meta_token_trees(
+  int id: @meta ref,
+  int token_tree: @token_tree ref
+);
+
+names(
+  unique int id: @name
+);
+
+#keyset[id]
+name_texts(
+  int id: @name ref,
+  string text: string ref
+);
+
+@param_base =
+  @param
+| @self_param
+;
+
+#keyset[id, index]
+param_base_attrs(
+  int id: @param_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+param_base_type_reprs(
+  int id: @param_base ref,
+  int type_repr: @type_repr ref
+);
+
+param_lists(
+  unique int id: @param_list
+);
+
+#keyset[id, index]
+param_list_params(
+  int id: @param_list ref,
+  int index: int ref,
+  int param: @param ref
+);
+
+#keyset[id]
+param_list_self_params(
+  int id: @param_list ref,
+  int self_param: @self_param ref
+);
+
+parenthesized_arg_lists(
+  unique int id: @parenthesized_arg_list
+);
+
+#keyset[id, index]
+parenthesized_arg_list_type_args(
+  int id: @parenthesized_arg_list ref,
+  int index: int ref,
+  int type_arg: @type_arg ref
+);
+
+@pat =
+  @box_pat
+| @const_block_pat
+| @ident_pat
+| @literal_pat
+| @macro_pat
+| @or_pat
+| @paren_pat
+| @path_pat
+| @range_pat
+| @ref_pat
+| @rest_pat
+| @slice_pat
+| @struct_pat
+| @tuple_pat
+| @tuple_struct_pat
+| @wildcard_pat
+;
+
+paths(
+  unique int id: @path
+);
+
+#keyset[id]
+path_qualifiers(
+  int id: @path ref,
+  int qualifier: @path ref
+);
+
+#keyset[id]
+path_segments_(
+  int id: @path ref,
+  int segment: @path_segment ref
+);
+
+path_segments(
+  unique int id: @path_segment
+);
+
+#keyset[id]
+path_segment_generic_arg_lists(
+  int id: @path_segment ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+path_segment_identifiers(
+  int id: @path_segment ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+path_segment_parenthesized_arg_lists(
+  int id: @path_segment ref,
+  int parenthesized_arg_list: @parenthesized_arg_list ref
+);
+
+#keyset[id]
+path_segment_ret_types(
+  int id: @path_segment ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+path_segment_return_type_syntaxes(
+  int id: @path_segment ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+path_segment_type_reprs(
+  int id: @path_segment ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+path_segment_trait_type_reprs(
+  int id: @path_segment ref,
+  int trait_type_repr: @path_type_repr ref
+);
+
+renames(
+  unique int id: @rename
+);
+
+#keyset[id]
+rename_names(
+  int id: @rename ref,
+  int name: @name ref
+);
+
+@resolvable =
+  @method_call_expr
+| @path_ast_node
+;
+
+#keyset[id]
+resolvable_resolved_paths(
+  int id: @resolvable ref,
+  string resolved_path: string ref
+);
+
+#keyset[id]
+resolvable_resolved_crate_origins(
+  int id: @resolvable ref,
+  string resolved_crate_origin: string ref
+);
+
+ret_type_reprs(
+  unique int id: @ret_type_repr
+);
+
+#keyset[id]
+ret_type_repr_type_reprs(
+  int id: @ret_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+return_type_syntaxes(
+  unique int id: @return_type_syntax
+);
+
+source_files(
+  unique int id: @source_file
+);
+
+#keyset[id, index]
+source_file_attrs(
+  int id: @source_file ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+source_file_items(
+  int id: @source_file ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+@stmt =
+  @expr_stmt
+| @item
+| @let_stmt
+;
+
+stmt_lists(
+  unique int id: @stmt_list
+);
+
+#keyset[id, index]
+stmt_list_attrs(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+stmt_list_statements(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+stmt_list_tail_exprs(
+  int id: @stmt_list ref,
+  int tail_expr: @expr ref
+);
+
+struct_expr_fields(
+  unique int id: @struct_expr_field
+);
+
+#keyset[id, index]
+struct_expr_field_attrs(
+  int id: @struct_expr_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_expr_field_exprs(
+  int id: @struct_expr_field ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+struct_expr_field_identifiers(
+  int id: @struct_expr_field ref,
+  int identifier: @name_ref ref
+);
+
+struct_expr_field_lists(
+  unique int id: @struct_expr_field_list
+);
+
+#keyset[id, index]
+struct_expr_field_list_attrs(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+struct_expr_field_list_fields(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int field: @struct_expr_field ref
+);
+
+#keyset[id]
+struct_expr_field_list_spreads(
+  int id: @struct_expr_field_list ref,
+  int spread: @expr ref
+);
+
+struct_fields(
+  unique int id: @struct_field
+);
+
+#keyset[id, index]
+struct_field_attrs(
+  int id: @struct_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_defaults(
+  int id: @struct_field ref,
+  int default: @expr ref
+);
+
+#keyset[id]
+struct_field_is_unsafe(
+  int id: @struct_field ref
+);
+
+#keyset[id]
+struct_field_names(
+  int id: @struct_field ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_field_type_reprs(
+  int id: @struct_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+struct_field_visibilities(
+  int id: @struct_field ref,
+  int visibility: @visibility ref
+);
+
+struct_pat_fields(
+  unique int id: @struct_pat_field
+);
+
+#keyset[id, index]
+struct_pat_field_attrs(
+  int id: @struct_pat_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_pat_field_identifiers(
+  int id: @struct_pat_field ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+struct_pat_field_pats(
+  int id: @struct_pat_field ref,
+  int pat: @pat ref
+);
+
+struct_pat_field_lists(
+  unique int id: @struct_pat_field_list
+);
+
+#keyset[id, index]
+struct_pat_field_list_fields(
+  int id: @struct_pat_field_list ref,
+  int index: int ref,
+  int field: @struct_pat_field ref
+);
+
+#keyset[id]
+struct_pat_field_list_rest_pats(
+  int id: @struct_pat_field_list ref,
+  int rest_pat: @rest_pat ref
+);
+
+@token =
+  @comment
+;
+
+token_trees(
+  unique int id: @token_tree
+);
+
+tuple_fields(
+  unique int id: @tuple_field
+);
+
+#keyset[id, index]
+tuple_field_attrs(
+  int id: @tuple_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+tuple_field_type_reprs(
+  int id: @tuple_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+tuple_field_visibilities(
+  int id: @tuple_field ref,
+  int visibility: @visibility ref
+);
+
+type_bounds(
+  unique int id: @type_bound
+);
+
+#keyset[id]
+type_bound_for_binders(
+  int id: @type_bound ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+type_bound_is_async(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_is_const(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_lifetimes(
+  int id: @type_bound ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+type_bound_type_reprs(
+  int id: @type_bound ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_bound_use_bound_generic_args(
+  int id: @type_bound ref,
+  int use_bound_generic_args: @use_bound_generic_args ref
+);
+
+type_bound_lists(
+  unique int id: @type_bound_list
+);
+
+#keyset[id, index]
+type_bound_list_bounds(
+  int id: @type_bound_list ref,
+  int index: int ref,
+  int bound: @type_bound ref
+);
+
+@type_repr =
+  @array_type_repr
+| @dyn_trait_type_repr
+| @fn_ptr_type_repr
+| @for_type_repr
+| @impl_trait_type_repr
+| @infer_type_repr
+| @macro_type_repr
+| @never_type_repr
+| @paren_type_repr
+| @path_type_repr
+| @ptr_type_repr
+| @ref_type_repr
+| @slice_type_repr
+| @tuple_type_repr
+;
+
+@use_bound_generic_arg =
+  @lifetime
+| @name_ref
+;
+
+use_bound_generic_args(
+  unique int id: @use_bound_generic_args
+);
+
+#keyset[id, index]
+use_bound_generic_args_use_bound_generic_args(
+  int id: @use_bound_generic_args ref,
+  int index: int ref,
+  int use_bound_generic_arg: @use_bound_generic_arg ref
+);
+
+use_trees(
+  unique int id: @use_tree
+);
+
+#keyset[id]
+use_tree_is_glob(
+  int id: @use_tree ref
+);
+
+#keyset[id]
+use_tree_paths(
+  int id: @use_tree ref,
+  int path: @path ref
+);
+
+#keyset[id]
+use_tree_renames(
+  int id: @use_tree ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+use_tree_use_tree_lists(
+  int id: @use_tree ref,
+  int use_tree_list: @use_tree_list ref
+);
+
+use_tree_lists(
+  unique int id: @use_tree_list
+);
+
+#keyset[id, index]
+use_tree_list_use_trees(
+  int id: @use_tree_list ref,
+  int index: int ref,
+  int use_tree: @use_tree ref
+);
+
+variant_lists(
+  unique int id: @variant_list
+);
+
+#keyset[id, index]
+variant_list_variants(
+  int id: @variant_list ref,
+  int index: int ref,
+  int variant: @variant ref
+);
+
+visibilities(
+  unique int id: @visibility
+);
+
+#keyset[id]
+visibility_paths(
+  int id: @visibility ref,
+  int path: @path ref
+);
+
+where_clauses(
+  unique int id: @where_clause
+);
+
+#keyset[id, index]
+where_clause_predicates(
+  int id: @where_clause ref,
+  int index: int ref,
+  int predicate: @where_pred ref
+);
+
+where_preds(
+  unique int id: @where_pred
+);
+
+#keyset[id]
+where_pred_for_binders(
+  int id: @where_pred ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+where_pred_lifetimes(
+  int id: @where_pred ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+where_pred_type_reprs(
+  int id: @where_pred ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+where_pred_type_bound_lists(
+  int id: @where_pred ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+array_expr_internals(
+  unique int id: @array_expr_internal
+);
+
+#keyset[id, index]
+array_expr_internal_attrs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+array_expr_internal_exprs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+array_expr_internal_is_semicolon(
+  int id: @array_expr_internal ref
+);
+
+array_type_reprs(
+  unique int id: @array_type_repr
+);
+
+#keyset[id]
+array_type_repr_const_args(
+  int id: @array_type_repr ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+array_type_repr_element_type_reprs(
+  int id: @array_type_repr ref,
+  int element_type_repr: @type_repr ref
+);
+
+asm_clobber_abis(
+  unique int id: @asm_clobber_abi
+);
+
+asm_consts(
+  unique int id: @asm_const
+);
+
+#keyset[id]
+asm_const_exprs(
+  int id: @asm_const ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+asm_const_is_const(
+  int id: @asm_const ref
+);
+
+asm_labels(
+  unique int id: @asm_label
+);
+
+#keyset[id]
+asm_label_block_exprs(
+  int id: @asm_label ref,
+  int block_expr: @block_expr ref
+);
+
+asm_operand_nameds(
+  unique int id: @asm_operand_named
+);
+
+#keyset[id]
+asm_operand_named_asm_operands(
+  int id: @asm_operand_named ref,
+  int asm_operand: @asm_operand ref
+);
+
+#keyset[id]
+asm_operand_named_names(
+  int id: @asm_operand_named ref,
+  int name: @name ref
+);
+
+asm_options_lists(
+  unique int id: @asm_options_list
+);
+
+#keyset[id, index]
+asm_options_list_asm_options(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int asm_option: @asm_option ref
+);
+
+asm_reg_operands(
+  unique int id: @asm_reg_operand
+);
+
+#keyset[id]
+asm_reg_operand_asm_dir_specs(
+  int id: @asm_reg_operand ref,
+  int asm_dir_spec: @asm_dir_spec ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_operand_exprs(
+  int id: @asm_reg_operand ref,
+  int asm_operand_expr: @asm_operand_expr ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_reg_specs(
+  int id: @asm_reg_operand ref,
+  int asm_reg_spec: @asm_reg_spec ref
+);
+
+asm_syms(
+  unique int id: @asm_sym
+);
+
+#keyset[id]
+asm_sym_paths(
+  int id: @asm_sym ref,
+  int path: @path ref
+);
+
+assoc_type_args(
+  unique int id: @assoc_type_arg
+);
+
+#keyset[id]
+assoc_type_arg_const_args(
+  int id: @assoc_type_arg ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+assoc_type_arg_generic_arg_lists(
+  int id: @assoc_type_arg ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+assoc_type_arg_identifiers(
+  int id: @assoc_type_arg ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+assoc_type_arg_param_lists(
+  int id: @assoc_type_arg ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+assoc_type_arg_ret_types(
+  int id: @assoc_type_arg ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_return_type_syntaxes(
+  int id: @assoc_type_arg ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+assoc_type_arg_type_reprs(
+  int id: @assoc_type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_type_bound_lists(
+  int id: @assoc_type_arg ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+await_exprs(
+  unique int id: @await_expr
+);
+
+#keyset[id, index]
+await_expr_attrs(
+  int id: @await_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+await_expr_exprs(
+  int id: @await_expr ref,
+  int expr: @expr ref
+);
+
+become_exprs(
+  unique int id: @become_expr
+);
+
+#keyset[id, index]
+become_expr_attrs(
+  int id: @become_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+become_expr_exprs(
+  int id: @become_expr ref,
+  int expr: @expr ref
+);
+
+binary_exprs(
+  unique int id: @binary_expr
+);
+
+#keyset[id, index]
+binary_expr_attrs(
+  int id: @binary_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+binary_expr_lhs(
+  int id: @binary_expr ref,
+  int lhs: @expr ref
+);
+
+#keyset[id]
+binary_expr_operator_names(
+  int id: @binary_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+binary_expr_rhs(
+  int id: @binary_expr ref,
+  int rhs: @expr ref
+);
+
+box_pats(
+  unique int id: @box_pat
+);
+
+#keyset[id]
+box_pat_pats(
+  int id: @box_pat ref,
+  int pat: @pat ref
+);
+
+break_exprs(
+  unique int id: @break_expr
+);
+
+#keyset[id, index]
+break_expr_attrs(
+  int id: @break_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+break_expr_exprs(
+  int id: @break_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+break_expr_lifetimes(
+  int id: @break_expr ref,
+  int lifetime: @lifetime ref
+);
+
+@call_expr_base =
+  @call_expr
+| @method_call_expr
+;
+
+#keyset[id]
+call_expr_base_arg_lists(
+  int id: @call_expr_base ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+call_expr_base_attrs(
+  int id: @call_expr_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+cast_exprs(
+  unique int id: @cast_expr
+);
+
+#keyset[id, index]
+cast_expr_attrs(
+  int id: @cast_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+cast_expr_exprs(
+  int id: @cast_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+cast_expr_type_reprs(
+  int id: @cast_expr ref,
+  int type_repr: @type_repr ref
+);
+
+closure_exprs(
+  unique int id: @closure_expr
+);
+
+#keyset[id]
+closure_expr_bodies(
+  int id: @closure_expr ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+closure_expr_for_binders(
+  int id: @closure_expr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+closure_expr_is_async(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_const(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_gen(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_move(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_static(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_ret_types(
+  int id: @closure_expr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+comments(
+  unique int id: @comment,
+  int parent: @ast_node ref,
+  string text: string ref
+);
+
+const_args(
+  unique int id: @const_arg
+);
+
+#keyset[id]
+const_arg_exprs(
+  int id: @const_arg ref,
+  int expr: @expr ref
+);
+
+const_block_pats(
+  unique int id: @const_block_pat
+);
+
+#keyset[id]
+const_block_pat_block_exprs(
+  int id: @const_block_pat ref,
+  int block_expr: @block_expr ref
+);
+
+#keyset[id]
+const_block_pat_is_const(
+  int id: @const_block_pat ref
+);
+
+const_params(
+  unique int id: @const_param
+);
+
+#keyset[id, index]
+const_param_attrs(
+  int id: @const_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_param_default_vals(
+  int id: @const_param ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+const_param_is_const(
+  int id: @const_param ref
+);
+
+#keyset[id]
+const_param_names(
+  int id: @const_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_param_type_reprs(
+  int id: @const_param ref,
+  int type_repr: @type_repr ref
+);
+
+continue_exprs(
+  unique int id: @continue_expr
+);
+
+#keyset[id, index]
+continue_expr_attrs(
+  int id: @continue_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+continue_expr_lifetimes(
+  int id: @continue_expr ref,
+  int lifetime: @lifetime ref
+);
+
+dyn_trait_type_reprs(
+  unique int id: @dyn_trait_type_repr
+);
+
+#keyset[id]
+dyn_trait_type_repr_type_bound_lists(
+  int id: @dyn_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+expr_stmts(
+  unique int id: @expr_stmt
+);
+
+#keyset[id]
+expr_stmt_exprs(
+  int id: @expr_stmt ref,
+  int expr: @expr ref
+);
+
+field_exprs(
+  unique int id: @field_expr
+);
+
+#keyset[id, index]
+field_expr_attrs(
+  int id: @field_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+field_expr_containers(
+  int id: @field_expr ref,
+  int container: @expr ref
+);
+
+#keyset[id]
+field_expr_identifiers(
+  int id: @field_expr ref,
+  int identifier: @name_ref ref
+);
+
+fn_ptr_type_reprs(
+  unique int id: @fn_ptr_type_repr
+);
+
+#keyset[id]
+fn_ptr_type_repr_abis(
+  int id: @fn_ptr_type_repr ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_async(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_const(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_unsafe(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_param_lists(
+  int id: @fn_ptr_type_repr ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_ret_types(
+  int id: @fn_ptr_type_repr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+for_type_reprs(
+  unique int id: @for_type_repr
+);
+
+#keyset[id]
+for_type_repr_for_binders(
+  int id: @for_type_repr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+for_type_repr_type_reprs(
+  int id: @for_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+format_args_exprs(
+  unique int id: @format_args_expr
+);
+
+#keyset[id, index]
+format_args_expr_args(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int arg: @format_args_arg ref
+);
+
+#keyset[id, index]
+format_args_expr_attrs(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+format_args_expr_templates(
+  int id: @format_args_expr ref,
+  int template: @expr ref
+);
+
+ident_pats(
+  unique int id: @ident_pat
+);
+
+#keyset[id, index]
+ident_pat_attrs(
+  int id: @ident_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ident_pat_is_mut(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_is_ref(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_names(
+  int id: @ident_pat ref,
+  int name: @name ref
+);
+
+#keyset[id]
+ident_pat_pats(
+  int id: @ident_pat ref,
+  int pat: @pat ref
+);
+
+if_exprs(
+  unique int id: @if_expr
+);
+
+#keyset[id, index]
+if_expr_attrs(
+  int id: @if_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+if_expr_conditions(
+  int id: @if_expr ref,
+  int condition: @expr ref
+);
+
+#keyset[id]
+if_expr_elses(
+  int id: @if_expr ref,
+  int else: @expr ref
+);
+
+#keyset[id]
+if_expr_thens(
+  int id: @if_expr ref,
+  int then: @block_expr ref
+);
+
+impl_trait_type_reprs(
+  unique int id: @impl_trait_type_repr
+);
+
+#keyset[id]
+impl_trait_type_repr_type_bound_lists(
+  int id: @impl_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+index_exprs(
+  unique int id: @index_expr
+);
+
+#keyset[id, index]
+index_expr_attrs(
+  int id: @index_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+index_expr_bases(
+  int id: @index_expr ref,
+  int base: @expr ref
+);
+
+#keyset[id]
+index_expr_indices(
+  int id: @index_expr ref,
+  int index: @expr ref
+);
+
+infer_type_reprs(
+  unique int id: @infer_type_repr
+);
+
+@item =
+  @adt
+| @asm_expr
+| @assoc_item
+| @extern_block
+| @extern_crate
+| @extern_item
+| @impl
+| @macro_def
+| @macro_rules
+| @module
+| @trait
+| @trait_alias
+| @use
+;
+
+#keyset[id]
+item_attribute_macro_expansions(
+  int id: @item ref,
+  int attribute_macro_expansion: @macro_items ref
+);
+
+@labelable_expr =
+  @block_expr
+| @looping_expr
+;
+
+#keyset[id]
+labelable_expr_labels(
+  int id: @labelable_expr ref,
+  int label: @label ref
+);
+
+let_exprs(
+  unique int id: @let_expr
+);
+
+#keyset[id, index]
+let_expr_attrs(
+  int id: @let_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_expr_scrutinees(
+  int id: @let_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+let_expr_pats(
+  int id: @let_expr ref,
+  int pat: @pat ref
+);
+
+let_stmts(
+  unique int id: @let_stmt
+);
+
+#keyset[id, index]
+let_stmt_attrs(
+  int id: @let_stmt ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_stmt_initializers(
+  int id: @let_stmt ref,
+  int initializer: @expr ref
+);
+
+#keyset[id]
+let_stmt_let_elses(
+  int id: @let_stmt ref,
+  int let_else: @let_else ref
+);
+
+#keyset[id]
+let_stmt_pats(
+  int id: @let_stmt ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+let_stmt_type_reprs(
+  int id: @let_stmt ref,
+  int type_repr: @type_repr ref
+);
+
+lifetimes(
+  unique int id: @lifetime
+);
+
+#keyset[id]
+lifetime_texts(
+  int id: @lifetime ref,
+  string text: string ref
+);
+
+lifetime_args(
+  unique int id: @lifetime_arg
+);
+
+#keyset[id]
+lifetime_arg_lifetimes(
+  int id: @lifetime_arg ref,
+  int lifetime: @lifetime ref
+);
+
+lifetime_params(
+  unique int id: @lifetime_param
+);
+
+#keyset[id, index]
+lifetime_param_attrs(
+  int id: @lifetime_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+lifetime_param_lifetimes(
+  int id: @lifetime_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+lifetime_param_type_bound_lists(
+  int id: @lifetime_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+literal_exprs(
+  unique int id: @literal_expr
+);
+
+#keyset[id, index]
+literal_expr_attrs(
+  int id: @literal_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+literal_expr_text_values(
+  int id: @literal_expr ref,
+  string text_value: string ref
+);
+
+literal_pats(
+  unique int id: @literal_pat
+);
+
+#keyset[id]
+literal_pat_literals(
+  int id: @literal_pat ref,
+  int literal: @literal_expr ref
+);
+
+macro_block_exprs(
+  unique int id: @macro_block_expr
+);
+
+#keyset[id, index]
+macro_block_expr_statements(
+  int id: @macro_block_expr ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+macro_block_expr_tail_exprs(
+  int id: @macro_block_expr ref,
+  int tail_expr: @expr ref
+);
+
+macro_exprs(
+  unique int id: @macro_expr
+);
+
+#keyset[id]
+macro_expr_macro_calls(
+  int id: @macro_expr ref,
+  int macro_call: @macro_call ref
+);
+
+macro_pats(
+  unique int id: @macro_pat
+);
+
+#keyset[id]
+macro_pat_macro_calls(
+  int id: @macro_pat ref,
+  int macro_call: @macro_call ref
+);
+
+macro_type_reprs(
+  unique int id: @macro_type_repr
+);
+
+#keyset[id]
+macro_type_repr_macro_calls(
+  int id: @macro_type_repr ref,
+  int macro_call: @macro_call ref
+);
+
+match_exprs(
+  unique int id: @match_expr
+);
+
+#keyset[id, index]
+match_expr_attrs(
+  int id: @match_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_expr_scrutinees(
+  int id: @match_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+match_expr_match_arm_lists(
+  int id: @match_expr ref,
+  int match_arm_list: @match_arm_list ref
+);
+
+name_refs(
+  unique int id: @name_ref
+);
+
+#keyset[id]
+name_ref_texts(
+  int id: @name_ref ref,
+  string text: string ref
+);
+
+never_type_reprs(
+  unique int id: @never_type_repr
+);
+
+offset_of_exprs(
+  unique int id: @offset_of_expr
+);
+
+#keyset[id, index]
+offset_of_expr_attrs(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+offset_of_expr_fields(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int field: @name_ref ref
+);
+
+#keyset[id]
+offset_of_expr_type_reprs(
+  int id: @offset_of_expr ref,
+  int type_repr: @type_repr ref
+);
+
+or_pats(
+  unique int id: @or_pat
+);
+
+#keyset[id, index]
+or_pat_pats(
+  int id: @or_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+params(
+  unique int id: @param
+);
+
+#keyset[id]
+param_pats(
+  int id: @param ref,
+  int pat: @pat ref
+);
+
+paren_exprs(
+  unique int id: @paren_expr
+);
+
+#keyset[id, index]
+paren_expr_attrs(
+  int id: @paren_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+paren_expr_exprs(
+  int id: @paren_expr ref,
+  int expr: @expr ref
+);
+
+paren_pats(
+  unique int id: @paren_pat
+);
+
+#keyset[id]
+paren_pat_pats(
+  int id: @paren_pat ref,
+  int pat: @pat ref
+);
+
+paren_type_reprs(
+  unique int id: @paren_type_repr
+);
+
+#keyset[id]
+paren_type_repr_type_reprs(
+  int id: @paren_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+@path_ast_node =
+  @path_expr
+| @path_pat
+| @struct_expr
+| @struct_pat
+| @tuple_struct_pat
+;
+
+#keyset[id]
+path_ast_node_paths(
+  int id: @path_ast_node ref,
+  int path: @path ref
+);
+
+@path_expr_base =
+  @path_expr
+;
+
+path_type_reprs(
+  unique int id: @path_type_repr
+);
+
+#keyset[id]
+path_type_repr_paths(
+  int id: @path_type_repr ref,
+  int path: @path ref
+);
+
+prefix_exprs(
+  unique int id: @prefix_expr
+);
+
+#keyset[id, index]
+prefix_expr_attrs(
+  int id: @prefix_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+prefix_expr_exprs(
+  int id: @prefix_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+prefix_expr_operator_names(
+  int id: @prefix_expr ref,
+  string operator_name: string ref
+);
+
+ptr_type_reprs(
+  unique int id: @ptr_type_repr
+);
+
+#keyset[id]
+ptr_type_repr_is_const(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_is_mut(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_type_reprs(
+  int id: @ptr_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+range_exprs(
+  unique int id: @range_expr
+);
+
+#keyset[id, index]
+range_expr_attrs(
+  int id: @range_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+range_expr_ends(
+  int id: @range_expr ref,
+  int end: @expr ref
+);
+
+#keyset[id]
+range_expr_operator_names(
+  int id: @range_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_expr_starts(
+  int id: @range_expr ref,
+  int start: @expr ref
+);
+
+range_pats(
+  unique int id: @range_pat
+);
+
+#keyset[id]
+range_pat_ends(
+  int id: @range_pat ref,
+  int end: @pat ref
+);
+
+#keyset[id]
+range_pat_operator_names(
+  int id: @range_pat ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_pat_starts(
+  int id: @range_pat ref,
+  int start: @pat ref
+);
+
+ref_exprs(
+  unique int id: @ref_expr
+);
+
+#keyset[id, index]
+ref_expr_attrs(
+  int id: @ref_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ref_expr_exprs(
+  int id: @ref_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+ref_expr_is_const(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_mut(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_raw(
+  int id: @ref_expr ref
+);
+
+ref_pats(
+  unique int id: @ref_pat
+);
+
+#keyset[id]
+ref_pat_is_mut(
+  int id: @ref_pat ref
+);
+
+#keyset[id]
+ref_pat_pats(
+  int id: @ref_pat ref,
+  int pat: @pat ref
+);
+
+ref_type_reprs(
+  unique int id: @ref_type_repr
+);
+
+#keyset[id]
+ref_type_repr_is_mut(
+  int id: @ref_type_repr ref
+);
+
+#keyset[id]
+ref_type_repr_lifetimes(
+  int id: @ref_type_repr ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+ref_type_repr_type_reprs(
+  int id: @ref_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+rest_pats(
+  unique int id: @rest_pat
+);
+
+#keyset[id, index]
+rest_pat_attrs(
+  int id: @rest_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+return_exprs(
+  unique int id: @return_expr
+);
+
+#keyset[id, index]
+return_expr_attrs(
+  int id: @return_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+return_expr_exprs(
+  int id: @return_expr ref,
+  int expr: @expr ref
+);
+
+self_params(
+  unique int id: @self_param
+);
+
+#keyset[id]
+self_param_is_ref(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_is_mut(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_lifetimes(
+  int id: @self_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+self_param_names(
+  int id: @self_param ref,
+  int name: @name ref
+);
+
+slice_pats(
+  unique int id: @slice_pat
+);
+
+#keyset[id, index]
+slice_pat_pats(
+  int id: @slice_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+slice_type_reprs(
+  unique int id: @slice_type_repr
+);
+
+#keyset[id]
+slice_type_repr_type_reprs(
+  int id: @slice_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+struct_field_lists(
+  unique int id: @struct_field_list
+);
+
+#keyset[id, index]
+struct_field_list_fields(
+  int id: @struct_field_list ref,
+  int index: int ref,
+  int field: @struct_field ref
+);
+
+try_exprs(
+  unique int id: @try_expr
+);
+
+#keyset[id, index]
+try_expr_attrs(
+  int id: @try_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+try_expr_exprs(
+  int id: @try_expr ref,
+  int expr: @expr ref
+);
+
+tuple_exprs(
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_attrs(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+tuple_expr_fields(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int field: @expr ref
+);
+
+tuple_field_lists(
+  unique int id: @tuple_field_list
+);
+
+#keyset[id, index]
+tuple_field_list_fields(
+  int id: @tuple_field_list ref,
+  int index: int ref,
+  int field: @tuple_field ref
+);
+
+tuple_pats(
+  unique int id: @tuple_pat
+);
+
+#keyset[id, index]
+tuple_pat_fields(
+  int id: @tuple_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_type_reprs(
+  unique int id: @tuple_type_repr
+);
+
+#keyset[id, index]
+tuple_type_repr_fields(
+  int id: @tuple_type_repr ref,
+  int index: int ref,
+  int field: @type_repr ref
+);
+
+type_args(
+  unique int id: @type_arg
+);
+
+#keyset[id]
+type_arg_type_reprs(
+  int id: @type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+type_params(
+  unique int id: @type_param
+);
+
+#keyset[id, index]
+type_param_attrs(
+  int id: @type_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_param_default_types(
+  int id: @type_param ref,
+  int default_type: @type_repr ref
+);
+
+#keyset[id]
+type_param_names(
+  int id: @type_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_param_type_bound_lists(
+  int id: @type_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+underscore_exprs(
+  unique int id: @underscore_expr
+);
+
+#keyset[id, index]
+underscore_expr_attrs(
+  int id: @underscore_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+variants(
+  unique int id: @variant
+);
+
+#keyset[id, index]
+variant_attrs(
+  int id: @variant ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+variant_discriminants(
+  int id: @variant ref,
+  int discriminant: @expr ref
+);
+
+#keyset[id]
+variant_field_lists(
+  int id: @variant ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+variant_names(
+  int id: @variant ref,
+  int name: @name ref
+);
+
+#keyset[id]
+variant_visibilities(
+  int id: @variant ref,
+  int visibility: @visibility ref
+);
+
+wildcard_pats(
+  unique int id: @wildcard_pat
+);
+
+yeet_exprs(
+  unique int id: @yeet_expr
+);
+
+#keyset[id, index]
+yeet_expr_attrs(
+  int id: @yeet_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yeet_expr_exprs(
+  int id: @yeet_expr ref,
+  int expr: @expr ref
+);
+
+yield_exprs(
+  unique int id: @yield_expr
+);
+
+#keyset[id, index]
+yield_expr_attrs(
+  int id: @yield_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yield_expr_exprs(
+  int id: @yield_expr ref,
+  int expr: @expr ref
+);
+
+@adt =
+  @enum
+| @struct
+| @union
+;
+
+#keyset[id, index]
+adt_derive_macro_expansions(
+  int id: @adt ref,
+  int index: int ref,
+  int derive_macro_expansion: @macro_items ref
+);
+
+asm_exprs(
+  unique int id: @asm_expr
+);
+
+#keyset[id, index]
+asm_expr_asm_pieces(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int asm_piece: @asm_piece ref
+);
+
+#keyset[id, index]
+asm_expr_attrs(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+asm_expr_templates(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int template: @expr ref
+);
+
+@assoc_item =
+  @const
+| @function
+| @macro_call
+| @type_alias
+;
+
+block_exprs(
+  unique int id: @block_expr
+);
+
+#keyset[id, index]
+block_expr_attrs(
+  int id: @block_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+block_expr_is_async(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_const(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_gen(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_move(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_try(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_unsafe(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_stmt_lists(
+  int id: @block_expr ref,
+  int stmt_list: @stmt_list ref
+);
+
+call_exprs(
+  unique int id: @call_expr
+);
+
+#keyset[id]
+call_expr_functions(
+  int id: @call_expr ref,
+  int function: @expr ref
+);
+
+extern_blocks(
+  unique int id: @extern_block
+);
+
+#keyset[id]
+extern_block_abis(
+  int id: @extern_block ref,
+  int abi: @abi ref
+);
+
+#keyset[id, index]
+extern_block_attrs(
+  int id: @extern_block ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_block_extern_item_lists(
+  int id: @extern_block ref,
+  int extern_item_list: @extern_item_list ref
+);
+
+#keyset[id]
+extern_block_is_unsafe(
+  int id: @extern_block ref
+);
+
+extern_crates(
+  unique int id: @extern_crate
+);
+
+#keyset[id, index]
+extern_crate_attrs(
+  int id: @extern_crate ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_crate_identifiers(
+  int id: @extern_crate ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+extern_crate_renames(
+  int id: @extern_crate ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+extern_crate_visibilities(
+  int id: @extern_crate ref,
+  int visibility: @visibility ref
+);
+
+@extern_item =
+  @function
+| @macro_call
+| @static
+| @type_alias
+;
+
+impls(
+  unique int id: @impl
+);
+
+#keyset[id]
+impl_assoc_item_lists(
+  int id: @impl ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+impl_attrs(
+  int id: @impl ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+impl_generic_param_lists(
+  int id: @impl ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+impl_is_const(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_default(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_unsafe(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_self_ties(
+  int id: @impl ref,
+  int self_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_traits(
+  int id: @impl ref,
+  int trait: @type_repr ref
+);
+
+#keyset[id]
+impl_visibilities(
+  int id: @impl ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+impl_where_clauses(
+  int id: @impl ref,
+  int where_clause: @where_clause ref
+);
+
+@looping_expr =
+  @for_expr
+| @loop_expr
+| @while_expr
+;
+
+#keyset[id]
+looping_expr_loop_bodies(
+  int id: @looping_expr ref,
+  int loop_body: @block_expr ref
+);
+
+macro_defs(
+  unique int id: @macro_def
+);
+
+#keyset[id]
+macro_def_args(
+  int id: @macro_def ref,
+  int args: @token_tree ref
+);
+
+#keyset[id, index]
+macro_def_attrs(
+  int id: @macro_def ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_def_bodies(
+  int id: @macro_def ref,
+  int body: @token_tree ref
+);
+
+#keyset[id]
+macro_def_names(
+  int id: @macro_def ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_def_visibilities(
+  int id: @macro_def ref,
+  int visibility: @visibility ref
+);
+
+macro_rules(
+  unique int id: @macro_rules
+);
+
+#keyset[id, index]
+macro_rules_attrs(
+  int id: @macro_rules ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_rules_names(
+  int id: @macro_rules ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_rules_token_trees(
+  int id: @macro_rules ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_rules_visibilities(
+  int id: @macro_rules ref,
+  int visibility: @visibility ref
+);
+
+method_call_exprs(
+  unique int id: @method_call_expr
+);
+
+#keyset[id]
+method_call_expr_generic_arg_lists(
+  int id: @method_call_expr ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+method_call_expr_identifiers(
+  int id: @method_call_expr ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+method_call_expr_receivers(
+  int id: @method_call_expr ref,
+  int receiver: @expr ref
+);
+
+modules(
+  unique int id: @module
+);
+
+#keyset[id, index]
+module_attrs(
+  int id: @module ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+module_item_lists(
+  int id: @module ref,
+  int item_list: @item_list ref
+);
+
+#keyset[id]
+module_names(
+  int id: @module ref,
+  int name: @name ref
+);
+
+#keyset[id]
+module_visibilities(
+  int id: @module ref,
+  int visibility: @visibility ref
+);
+
+path_exprs(
+  unique int id: @path_expr
+);
+
+#keyset[id, index]
+path_expr_attrs(
+  int id: @path_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+path_pats(
+  unique int id: @path_pat
+);
+
+struct_exprs(
+  unique int id: @struct_expr
+);
+
+#keyset[id]
+struct_expr_struct_expr_field_lists(
+  int id: @struct_expr ref,
+  int struct_expr_field_list: @struct_expr_field_list ref
+);
+
+struct_pats(
+  unique int id: @struct_pat
+);
+
+#keyset[id]
+struct_pat_struct_pat_field_lists(
+  int id: @struct_pat ref,
+  int struct_pat_field_list: @struct_pat_field_list ref
+);
+
+traits(
+  unique int id: @trait
+);
+
+#keyset[id]
+trait_assoc_item_lists(
+  int id: @trait ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+trait_attrs(
+  int id: @trait ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_generic_param_lists(
+  int id: @trait ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_is_auto(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_is_unsafe(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_names(
+  int id: @trait ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_type_bound_lists(
+  int id: @trait ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_visibilities(
+  int id: @trait ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_where_clauses(
+  int id: @trait ref,
+  int where_clause: @where_clause ref
+);
+
+trait_aliases(
+  unique int id: @trait_alias
+);
+
+#keyset[id, index]
+trait_alias_attrs(
+  int id: @trait_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_alias_generic_param_lists(
+  int id: @trait_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_alias_names(
+  int id: @trait_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_alias_type_bound_lists(
+  int id: @trait_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_alias_visibilities(
+  int id: @trait_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_alias_where_clauses(
+  int id: @trait_alias ref,
+  int where_clause: @where_clause ref
+);
+
+tuple_struct_pats(
+  unique int id: @tuple_struct_pat
+);
+
+#keyset[id, index]
+tuple_struct_pat_fields(
+  int id: @tuple_struct_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+uses(
+  unique int id: @use
+);
+
+#keyset[id, index]
+use_attrs(
+  int id: @use ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+use_use_trees(
+  int id: @use ref,
+  int use_tree: @use_tree ref
+);
+
+#keyset[id]
+use_visibilities(
+  int id: @use ref,
+  int visibility: @visibility ref
+);
+
+consts(
+  unique int id: @const
+);
+
+#keyset[id, index]
+const_attrs(
+  int id: @const ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_bodies(
+  int id: @const ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+const_generic_param_lists(
+  int id: @const ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+const_is_const(
+  int id: @const ref
+);
+
+#keyset[id]
+const_is_default(
+  int id: @const ref
+);
+
+#keyset[id]
+const_names(
+  int id: @const ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_type_reprs(
+  int id: @const ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+const_visibilities(
+  int id: @const ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+const_where_clauses(
+  int id: @const ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+const_has_implementation(
+  int id: @const ref
+);
+
+enums(
+  unique int id: @enum
+);
+
+#keyset[id, index]
+enum_attrs(
+  int id: @enum ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+enum_generic_param_lists(
+  int id: @enum ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+enum_names(
+  int id: @enum ref,
+  int name: @name ref
+);
+
+#keyset[id]
+enum_variant_lists(
+  int id: @enum ref,
+  int variant_list: @variant_list ref
+);
+
+#keyset[id]
+enum_visibilities(
+  int id: @enum ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+enum_where_clauses(
+  int id: @enum ref,
+  int where_clause: @where_clause ref
+);
+
+for_exprs(
+  unique int id: @for_expr
+);
+
+#keyset[id, index]
+for_expr_attrs(
+  int id: @for_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+for_expr_iterables(
+  int id: @for_expr ref,
+  int iterable: @expr ref
+);
+
+#keyset[id]
+for_expr_pats(
+  int id: @for_expr ref,
+  int pat: @pat ref
+);
+
+functions(
+  unique int id: @function
+);
+
+#keyset[id]
+function_abis(
+  int id: @function ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+function_bodies(
+  int id: @function ref,
+  int body: @block_expr ref
+);
+
+#keyset[id]
+function_generic_param_lists(
+  int id: @function ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+function_is_async(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_const(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_default(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_gen(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_unsafe(
+  int id: @function ref
+);
+
+#keyset[id]
+function_names(
+  int id: @function ref,
+  int name: @name ref
+);
+
+#keyset[id]
+function_ret_types(
+  int id: @function ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+function_visibilities(
+  int id: @function ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+function_where_clauses(
+  int id: @function ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+function_has_implementation(
+  int id: @function ref
+);
+
+loop_exprs(
+  unique int id: @loop_expr
+);
+
+#keyset[id, index]
+loop_expr_attrs(
+  int id: @loop_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+macro_calls(
+  unique int id: @macro_call
+);
+
+#keyset[id, index]
+macro_call_attrs(
+  int id: @macro_call ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_call_paths(
+  int id: @macro_call ref,
+  int path: @path ref
+);
+
+#keyset[id]
+macro_call_token_trees(
+  int id: @macro_call ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_call_macro_call_expansions(
+  int id: @macro_call ref,
+  int macro_call_expansion: @ast_node ref
+);
+
+statics(
+  unique int id: @static
+);
+
+#keyset[id, index]
+static_attrs(
+  int id: @static ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+static_bodies(
+  int id: @static ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+static_is_mut(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_static(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_unsafe(
+  int id: @static ref
+);
+
+#keyset[id]
+static_names(
+  int id: @static ref,
+  int name: @name ref
+);
+
+#keyset[id]
+static_type_reprs(
+  int id: @static ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+static_visibilities(
+  int id: @static ref,
+  int visibility: @visibility ref
+);
+
+structs(
+  unique int id: @struct
+);
+
+#keyset[id, index]
+struct_attrs(
+  int id: @struct ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_lists_(
+  int id: @struct ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+struct_generic_param_lists(
+  int id: @struct ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+struct_names(
+  int id: @struct ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_visibilities(
+  int id: @struct ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+struct_where_clauses(
+  int id: @struct ref,
+  int where_clause: @where_clause ref
+);
+
+type_aliases(
+  unique int id: @type_alias
+);
+
+#keyset[id, index]
+type_alias_attrs(
+  int id: @type_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_alias_generic_param_lists(
+  int id: @type_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_alias_is_default(
+  int id: @type_alias ref
+);
+
+#keyset[id]
+type_alias_names(
+  int id: @type_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_alias_type_reprs(
+  int id: @type_alias ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_alias_type_bound_lists(
+  int id: @type_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+type_alias_visibilities(
+  int id: @type_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_alias_where_clauses(
+  int id: @type_alias ref,
+  int where_clause: @where_clause ref
+);
+
+unions(
+  unique int id: @union
+);
+
+#keyset[id, index]
+union_attrs(
+  int id: @union ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+union_generic_param_lists(
+  int id: @union ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+union_names(
+  int id: @union ref,
+  int name: @name ref
+);
+
+#keyset[id]
+union_struct_field_lists(
+  int id: @union ref,
+  int struct_field_list: @struct_field_list ref
+);
+
+#keyset[id]
+union_visibilities(
+  int id: @union ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+union_where_clauses(
+  int id: @union ref,
+  int where_clause: @where_clause ref
+);
+
+while_exprs(
+  unique int id: @while_expr
+);
+
+#keyset[id, index]
+while_expr_attrs(
+  int id: @while_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+while_expr_conditions(
+  int id: @while_expr ref,
+  int condition: @expr ref
+);
diff --git a/rust/downgrades/b41e55c0dba14a139d01dbee713aca5efe5b818a/rust.dbscheme b/rust/downgrades/b41e55c0dba14a139d01dbee713aca5efe5b818a/rust.dbscheme
new file mode 100644
index 00000000000..319c933d961
--- /dev/null
+++ b/rust/downgrades/b41e55c0dba14a139d01dbee713aca5efe5b818a/rust.dbscheme
@@ -0,0 +1,3637 @@
+// generated by codegen, do not edit
+
+// from ../shared/tree-sitter-extractor/src/generator/prefix.dbscheme
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Empty location -*/
+
+empty_location(
+  int location: @location_default ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- Diagnostic messages: severity -*/
+
+case @diagnostic.severity of
+  10 = @diagnostic_debug
+| 20 = @diagnostic_info
+| 30 = @diagnostic_warning
+| 40 = @diagnostic_error
+;
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error;
+
+/*- Database metadata -*/
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+overlayChangedFiles(
+  string path: string ref
+);
+
+
+// from prefix.dbscheme
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_default ref
+);
+
+
+// from schema
+
+@element =
+  @extractor_step
+| @locatable
+| @named_crate
+| @unextracted
+;
+
+extractor_steps(
+  unique int id: @extractor_step,
+  string action: string ref,
+  int duration_ms: int ref
+);
+
+#keyset[id]
+extractor_step_files(
+  int id: @extractor_step ref,
+  int file: @file ref
+);
+
+@locatable =
+  @ast_node
+| @crate
+;
+
+named_crates(
+  unique int id: @named_crate,
+  string name: string ref,
+  int crate: @crate ref
+);
+
+@unextracted =
+  @missing
+| @unimplemented
+;
+
+@ast_node =
+  @abi
+| @addressable
+| @arg_list
+| @asm_dir_spec
+| @asm_operand
+| @asm_operand_expr
+| @asm_option
+| @asm_piece
+| @asm_reg_spec
+| @assoc_item_list
+| @attr
+| @callable
+| @closure_binder
+| @expr
+| @extern_item_list
+| @field_list
+| @format_args_arg
+| @generic_arg
+| @generic_arg_list
+| @generic_param
+| @generic_param_list
+| @item_list
+| @label
+| @let_else
+| @macro_items
+| @match_arm
+| @match_arm_list
+| @match_guard
+| @meta
+| @name
+| @param_base
+| @param_list
+| @parenthesized_arg_list
+| @pat
+| @path
+| @path_segment
+| @rename
+| @resolvable
+| @ret_type_repr
+| @return_type_syntax
+| @source_file
+| @stmt
+| @stmt_list
+| @struct_expr_field
+| @struct_expr_field_list
+| @struct_field
+| @struct_pat_field
+| @struct_pat_field_list
+| @token
+| @token_tree
+| @tuple_field
+| @type_bound
+| @type_bound_list
+| @type_repr
+| @use_bound_generic_arg
+| @use_bound_generic_args
+| @use_tree
+| @use_tree_list
+| @variant_list
+| @visibility
+| @where_clause
+| @where_pred
+;
+
+crates(
+  unique int id: @crate
+);
+
+#keyset[id]
+crate_names(
+  int id: @crate ref,
+  string name: string ref
+);
+
+#keyset[id]
+crate_versions(
+  int id: @crate ref,
+  string version: string ref
+);
+
+#keyset[id, index]
+crate_cfg_options(
+  int id: @crate ref,
+  int index: int ref,
+  string cfg_option: string ref
+);
+
+#keyset[id, index]
+crate_named_dependencies(
+  int id: @crate ref,
+  int index: int ref,
+  int named_dependency: @named_crate ref
+);
+
+missings(
+  unique int id: @missing
+);
+
+unimplementeds(
+  unique int id: @unimplemented
+);
+
+abis(
+  unique int id: @abi
+);
+
+#keyset[id]
+abi_abi_strings(
+  int id: @abi ref,
+  string abi_string: string ref
+);
+
+@addressable =
+  @item
+| @variant
+;
+
+#keyset[id]
+addressable_extended_canonical_paths(
+  int id: @addressable ref,
+  string extended_canonical_path: string ref
+);
+
+#keyset[id]
+addressable_crate_origins(
+  int id: @addressable ref,
+  string crate_origin: string ref
+);
+
+arg_lists(
+  unique int id: @arg_list
+);
+
+#keyset[id, index]
+arg_list_args(
+  int id: @arg_list ref,
+  int index: int ref,
+  int arg: @expr ref
+);
+
+asm_dir_specs(
+  unique int id: @asm_dir_spec
+);
+
+@asm_operand =
+  @asm_const
+| @asm_label
+| @asm_reg_operand
+| @asm_sym
+;
+
+asm_operand_exprs(
+  unique int id: @asm_operand_expr
+);
+
+#keyset[id]
+asm_operand_expr_in_exprs(
+  int id: @asm_operand_expr ref,
+  int in_expr: @expr ref
+);
+
+#keyset[id]
+asm_operand_expr_out_exprs(
+  int id: @asm_operand_expr ref,
+  int out_expr: @expr ref
+);
+
+asm_options(
+  unique int id: @asm_option
+);
+
+#keyset[id]
+asm_option_is_raw(
+  int id: @asm_option ref
+);
+
+@asm_piece =
+  @asm_clobber_abi
+| @asm_operand_named
+| @asm_options_list
+;
+
+asm_reg_specs(
+  unique int id: @asm_reg_spec
+);
+
+#keyset[id]
+asm_reg_spec_identifiers(
+  int id: @asm_reg_spec ref,
+  int identifier: @name_ref ref
+);
+
+assoc_item_lists(
+  unique int id: @assoc_item_list
+);
+
+#keyset[id, index]
+assoc_item_list_assoc_items(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int assoc_item: @assoc_item ref
+);
+
+#keyset[id, index]
+assoc_item_list_attrs(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+attrs(
+  unique int id: @attr
+);
+
+#keyset[id]
+attr_meta(
+  int id: @attr ref,
+  int meta: @meta ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_param_lists(
+  int id: @callable ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id, index]
+callable_attrs(
+  int id: @callable ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+closure_binders(
+  unique int id: @closure_binder
+);
+
+#keyset[id]
+closure_binder_generic_param_lists(
+  int id: @closure_binder ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+@expr =
+  @array_expr_internal
+| @asm_expr
+| @await_expr
+| @become_expr
+| @binary_expr
+| @break_expr
+| @call_expr_base
+| @cast_expr
+| @closure_expr
+| @continue_expr
+| @field_expr
+| @format_args_expr
+| @if_expr
+| @index_expr
+| @labelable_expr
+| @let_expr
+| @literal_expr
+| @macro_block_expr
+| @macro_expr
+| @match_expr
+| @offset_of_expr
+| @paren_expr
+| @path_expr_base
+| @prefix_expr
+| @range_expr
+| @ref_expr
+| @return_expr
+| @struct_expr
+| @try_expr
+| @tuple_expr
+| @underscore_expr
+| @yeet_expr
+| @yield_expr
+;
+
+extern_item_lists(
+  unique int id: @extern_item_list
+);
+
+#keyset[id, index]
+extern_item_list_attrs(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+extern_item_list_extern_items(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int extern_item: @extern_item ref
+);
+
+@field_list =
+  @struct_field_list
+| @tuple_field_list
+;
+
+format_args_args(
+  unique int id: @format_args_arg
+);
+
+#keyset[id]
+format_args_arg_exprs(
+  int id: @format_args_arg ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+format_args_arg_names(
+  int id: @format_args_arg ref,
+  int name: @name ref
+);
+
+@generic_arg =
+  @assoc_type_arg
+| @const_arg
+| @lifetime_arg
+| @type_arg
+;
+
+generic_arg_lists(
+  unique int id: @generic_arg_list
+);
+
+#keyset[id, index]
+generic_arg_list_generic_args(
+  int id: @generic_arg_list ref,
+  int index: int ref,
+  int generic_arg: @generic_arg ref
+);
+
+@generic_param =
+  @const_param
+| @lifetime_param
+| @type_param
+;
+
+generic_param_lists(
+  unique int id: @generic_param_list
+);
+
+#keyset[id, index]
+generic_param_list_generic_params(
+  int id: @generic_param_list ref,
+  int index: int ref,
+  int generic_param: @generic_param ref
+);
+
+item_lists(
+  unique int id: @item_list
+);
+
+#keyset[id, index]
+item_list_attrs(
+  int id: @item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+item_list_items(
+  int id: @item_list ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+labels(
+  unique int id: @label
+);
+
+#keyset[id]
+label_lifetimes(
+  int id: @label ref,
+  int lifetime: @lifetime ref
+);
+
+let_elses(
+  unique int id: @let_else
+);
+
+#keyset[id]
+let_else_block_exprs(
+  int id: @let_else ref,
+  int block_expr: @block_expr ref
+);
+
+macro_items(
+  unique int id: @macro_items
+);
+
+#keyset[id, index]
+macro_items_items(
+  int id: @macro_items ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+match_arms(
+  unique int id: @match_arm
+);
+
+#keyset[id, index]
+match_arm_attrs(
+  int id: @match_arm ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_arm_exprs(
+  int id: @match_arm ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+match_arm_guards(
+  int id: @match_arm ref,
+  int guard: @match_guard ref
+);
+
+#keyset[id]
+match_arm_pats(
+  int id: @match_arm ref,
+  int pat: @pat ref
+);
+
+match_arm_lists(
+  unique int id: @match_arm_list
+);
+
+#keyset[id, index]
+match_arm_list_arms(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int arm: @match_arm ref
+);
+
+#keyset[id, index]
+match_arm_list_attrs(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+match_guards(
+  unique int id: @match_guard
+);
+
+#keyset[id]
+match_guard_conditions(
+  int id: @match_guard ref,
+  int condition: @expr ref
+);
+
+meta(
+  unique int id: @meta
+);
+
+#keyset[id]
+meta_exprs(
+  int id: @meta ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+meta_is_unsafe(
+  int id: @meta ref
+);
+
+#keyset[id]
+meta_paths(
+  int id: @meta ref,
+  int path: @path ref
+);
+
+#keyset[id]
+meta_token_trees(
+  int id: @meta ref,
+  int token_tree: @token_tree ref
+);
+
+names(
+  unique int id: @name
+);
+
+#keyset[id]
+name_texts(
+  int id: @name ref,
+  string text: string ref
+);
+
+@param_base =
+  @param
+| @self_param
+;
+
+#keyset[id, index]
+param_base_attrs(
+  int id: @param_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+param_base_type_reprs(
+  int id: @param_base ref,
+  int type_repr: @type_repr ref
+);
+
+param_lists(
+  unique int id: @param_list
+);
+
+#keyset[id, index]
+param_list_params(
+  int id: @param_list ref,
+  int index: int ref,
+  int param: @param ref
+);
+
+#keyset[id]
+param_list_self_params(
+  int id: @param_list ref,
+  int self_param: @self_param ref
+);
+
+parenthesized_arg_lists(
+  unique int id: @parenthesized_arg_list
+);
+
+#keyset[id, index]
+parenthesized_arg_list_type_args(
+  int id: @parenthesized_arg_list ref,
+  int index: int ref,
+  int type_arg: @type_arg ref
+);
+
+@pat =
+  @box_pat
+| @const_block_pat
+| @ident_pat
+| @literal_pat
+| @macro_pat
+| @or_pat
+| @paren_pat
+| @path_pat
+| @range_pat
+| @ref_pat
+| @rest_pat
+| @slice_pat
+| @struct_pat
+| @tuple_pat
+| @tuple_struct_pat
+| @wildcard_pat
+;
+
+paths(
+  unique int id: @path
+);
+
+#keyset[id]
+path_qualifiers(
+  int id: @path ref,
+  int qualifier: @path ref
+);
+
+#keyset[id]
+path_segments_(
+  int id: @path ref,
+  int segment: @path_segment ref
+);
+
+path_segments(
+  unique int id: @path_segment
+);
+
+#keyset[id]
+path_segment_generic_arg_lists(
+  int id: @path_segment ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+path_segment_identifiers(
+  int id: @path_segment ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+path_segment_parenthesized_arg_lists(
+  int id: @path_segment ref,
+  int parenthesized_arg_list: @parenthesized_arg_list ref
+);
+
+#keyset[id]
+path_segment_ret_types(
+  int id: @path_segment ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+path_segment_return_type_syntaxes(
+  int id: @path_segment ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+path_segment_type_reprs(
+  int id: @path_segment ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+path_segment_trait_type_reprs(
+  int id: @path_segment ref,
+  int trait_type_repr: @path_type_repr ref
+);
+
+renames(
+  unique int id: @rename
+);
+
+#keyset[id]
+rename_names(
+  int id: @rename ref,
+  int name: @name ref
+);
+
+@resolvable =
+  @method_call_expr
+| @path_ast_node
+;
+
+#keyset[id]
+resolvable_resolved_paths(
+  int id: @resolvable ref,
+  string resolved_path: string ref
+);
+
+#keyset[id]
+resolvable_resolved_crate_origins(
+  int id: @resolvable ref,
+  string resolved_crate_origin: string ref
+);
+
+ret_type_reprs(
+  unique int id: @ret_type_repr
+);
+
+#keyset[id]
+ret_type_repr_type_reprs(
+  int id: @ret_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+return_type_syntaxes(
+  unique int id: @return_type_syntax
+);
+
+source_files(
+  unique int id: @source_file
+);
+
+#keyset[id, index]
+source_file_attrs(
+  int id: @source_file ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+source_file_items(
+  int id: @source_file ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+@stmt =
+  @expr_stmt
+| @item
+| @let_stmt
+;
+
+stmt_lists(
+  unique int id: @stmt_list
+);
+
+#keyset[id, index]
+stmt_list_attrs(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+stmt_list_statements(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+stmt_list_tail_exprs(
+  int id: @stmt_list ref,
+  int tail_expr: @expr ref
+);
+
+struct_expr_fields(
+  unique int id: @struct_expr_field
+);
+
+#keyset[id, index]
+struct_expr_field_attrs(
+  int id: @struct_expr_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_expr_field_exprs(
+  int id: @struct_expr_field ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+struct_expr_field_identifiers(
+  int id: @struct_expr_field ref,
+  int identifier: @name_ref ref
+);
+
+struct_expr_field_lists(
+  unique int id: @struct_expr_field_list
+);
+
+#keyset[id, index]
+struct_expr_field_list_attrs(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+struct_expr_field_list_fields(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int field: @struct_expr_field ref
+);
+
+#keyset[id]
+struct_expr_field_list_spreads(
+  int id: @struct_expr_field_list ref,
+  int spread: @expr ref
+);
+
+struct_fields(
+  unique int id: @struct_field
+);
+
+#keyset[id, index]
+struct_field_attrs(
+  int id: @struct_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_defaults(
+  int id: @struct_field ref,
+  int default: @expr ref
+);
+
+#keyset[id]
+struct_field_is_unsafe(
+  int id: @struct_field ref
+);
+
+#keyset[id]
+struct_field_names(
+  int id: @struct_field ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_field_type_reprs(
+  int id: @struct_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+struct_field_visibilities(
+  int id: @struct_field ref,
+  int visibility: @visibility ref
+);
+
+struct_pat_fields(
+  unique int id: @struct_pat_field
+);
+
+#keyset[id, index]
+struct_pat_field_attrs(
+  int id: @struct_pat_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_pat_field_identifiers(
+  int id: @struct_pat_field ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+struct_pat_field_pats(
+  int id: @struct_pat_field ref,
+  int pat: @pat ref
+);
+
+struct_pat_field_lists(
+  unique int id: @struct_pat_field_list
+);
+
+#keyset[id, index]
+struct_pat_field_list_fields(
+  int id: @struct_pat_field_list ref,
+  int index: int ref,
+  int field: @struct_pat_field ref
+);
+
+#keyset[id]
+struct_pat_field_list_rest_pats(
+  int id: @struct_pat_field_list ref,
+  int rest_pat: @rest_pat ref
+);
+
+@token =
+  @comment
+;
+
+token_trees(
+  unique int id: @token_tree
+);
+
+tuple_fields(
+  unique int id: @tuple_field
+);
+
+#keyset[id, index]
+tuple_field_attrs(
+  int id: @tuple_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+tuple_field_type_reprs(
+  int id: @tuple_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+tuple_field_visibilities(
+  int id: @tuple_field ref,
+  int visibility: @visibility ref
+);
+
+type_bounds(
+  unique int id: @type_bound
+);
+
+#keyset[id]
+type_bound_is_async(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_is_const(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_lifetimes(
+  int id: @type_bound ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+type_bound_type_reprs(
+  int id: @type_bound ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_bound_use_bound_generic_args(
+  int id: @type_bound ref,
+  int use_bound_generic_args: @use_bound_generic_args ref
+);
+
+type_bound_lists(
+  unique int id: @type_bound_list
+);
+
+#keyset[id, index]
+type_bound_list_bounds(
+  int id: @type_bound_list ref,
+  int index: int ref,
+  int bound: @type_bound ref
+);
+
+@type_repr =
+  @array_type_repr
+| @dyn_trait_type_repr
+| @fn_ptr_type_repr
+| @for_type_repr
+| @impl_trait_type_repr
+| @infer_type_repr
+| @macro_type_repr
+| @never_type_repr
+| @paren_type_repr
+| @path_type_repr
+| @ptr_type_repr
+| @ref_type_repr
+| @slice_type_repr
+| @tuple_type_repr
+;
+
+@use_bound_generic_arg =
+  @lifetime
+| @name_ref
+;
+
+use_bound_generic_args(
+  unique int id: @use_bound_generic_args
+);
+
+#keyset[id, index]
+use_bound_generic_args_use_bound_generic_args(
+  int id: @use_bound_generic_args ref,
+  int index: int ref,
+  int use_bound_generic_arg: @use_bound_generic_arg ref
+);
+
+use_trees(
+  unique int id: @use_tree
+);
+
+#keyset[id]
+use_tree_is_glob(
+  int id: @use_tree ref
+);
+
+#keyset[id]
+use_tree_paths(
+  int id: @use_tree ref,
+  int path: @path ref
+);
+
+#keyset[id]
+use_tree_renames(
+  int id: @use_tree ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+use_tree_use_tree_lists(
+  int id: @use_tree ref,
+  int use_tree_list: @use_tree_list ref
+);
+
+use_tree_lists(
+  unique int id: @use_tree_list
+);
+
+#keyset[id, index]
+use_tree_list_use_trees(
+  int id: @use_tree_list ref,
+  int index: int ref,
+  int use_tree: @use_tree ref
+);
+
+variant_lists(
+  unique int id: @variant_list
+);
+
+#keyset[id, index]
+variant_list_variants(
+  int id: @variant_list ref,
+  int index: int ref,
+  int variant: @variant ref
+);
+
+visibilities(
+  unique int id: @visibility
+);
+
+#keyset[id]
+visibility_paths(
+  int id: @visibility ref,
+  int path: @path ref
+);
+
+where_clauses(
+  unique int id: @where_clause
+);
+
+#keyset[id, index]
+where_clause_predicates(
+  int id: @where_clause ref,
+  int index: int ref,
+  int predicate: @where_pred ref
+);
+
+where_preds(
+  unique int id: @where_pred
+);
+
+#keyset[id]
+where_pred_generic_param_lists(
+  int id: @where_pred ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+where_pred_lifetimes(
+  int id: @where_pred ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+where_pred_type_reprs(
+  int id: @where_pred ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+where_pred_type_bound_lists(
+  int id: @where_pred ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+array_expr_internals(
+  unique int id: @array_expr_internal
+);
+
+#keyset[id, index]
+array_expr_internal_attrs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+array_expr_internal_exprs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+array_expr_internal_is_semicolon(
+  int id: @array_expr_internal ref
+);
+
+array_type_reprs(
+  unique int id: @array_type_repr
+);
+
+#keyset[id]
+array_type_repr_const_args(
+  int id: @array_type_repr ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+array_type_repr_element_type_reprs(
+  int id: @array_type_repr ref,
+  int element_type_repr: @type_repr ref
+);
+
+asm_clobber_abis(
+  unique int id: @asm_clobber_abi
+);
+
+asm_consts(
+  unique int id: @asm_const
+);
+
+#keyset[id]
+asm_const_exprs(
+  int id: @asm_const ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+asm_const_is_const(
+  int id: @asm_const ref
+);
+
+asm_exprs(
+  unique int id: @asm_expr
+);
+
+#keyset[id, index]
+asm_expr_asm_pieces(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int asm_piece: @asm_piece ref
+);
+
+#keyset[id, index]
+asm_expr_attrs(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+asm_expr_templates(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int template: @expr ref
+);
+
+asm_labels(
+  unique int id: @asm_label
+);
+
+#keyset[id]
+asm_label_block_exprs(
+  int id: @asm_label ref,
+  int block_expr: @block_expr ref
+);
+
+asm_operand_nameds(
+  unique int id: @asm_operand_named
+);
+
+#keyset[id]
+asm_operand_named_asm_operands(
+  int id: @asm_operand_named ref,
+  int asm_operand: @asm_operand ref
+);
+
+#keyset[id]
+asm_operand_named_names(
+  int id: @asm_operand_named ref,
+  int name: @name ref
+);
+
+asm_options_lists(
+  unique int id: @asm_options_list
+);
+
+#keyset[id, index]
+asm_options_list_asm_options(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int asm_option: @asm_option ref
+);
+
+asm_reg_operands(
+  unique int id: @asm_reg_operand
+);
+
+#keyset[id]
+asm_reg_operand_asm_dir_specs(
+  int id: @asm_reg_operand ref,
+  int asm_dir_spec: @asm_dir_spec ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_operand_exprs(
+  int id: @asm_reg_operand ref,
+  int asm_operand_expr: @asm_operand_expr ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_reg_specs(
+  int id: @asm_reg_operand ref,
+  int asm_reg_spec: @asm_reg_spec ref
+);
+
+asm_syms(
+  unique int id: @asm_sym
+);
+
+#keyset[id]
+asm_sym_paths(
+  int id: @asm_sym ref,
+  int path: @path ref
+);
+
+assoc_type_args(
+  unique int id: @assoc_type_arg
+);
+
+#keyset[id]
+assoc_type_arg_const_args(
+  int id: @assoc_type_arg ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+assoc_type_arg_generic_arg_lists(
+  int id: @assoc_type_arg ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+assoc_type_arg_identifiers(
+  int id: @assoc_type_arg ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+assoc_type_arg_param_lists(
+  int id: @assoc_type_arg ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+assoc_type_arg_ret_types(
+  int id: @assoc_type_arg ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_return_type_syntaxes(
+  int id: @assoc_type_arg ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+assoc_type_arg_type_reprs(
+  int id: @assoc_type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_type_bound_lists(
+  int id: @assoc_type_arg ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+await_exprs(
+  unique int id: @await_expr
+);
+
+#keyset[id, index]
+await_expr_attrs(
+  int id: @await_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+await_expr_exprs(
+  int id: @await_expr ref,
+  int expr: @expr ref
+);
+
+become_exprs(
+  unique int id: @become_expr
+);
+
+#keyset[id, index]
+become_expr_attrs(
+  int id: @become_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+become_expr_exprs(
+  int id: @become_expr ref,
+  int expr: @expr ref
+);
+
+binary_exprs(
+  unique int id: @binary_expr
+);
+
+#keyset[id, index]
+binary_expr_attrs(
+  int id: @binary_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+binary_expr_lhs(
+  int id: @binary_expr ref,
+  int lhs: @expr ref
+);
+
+#keyset[id]
+binary_expr_operator_names(
+  int id: @binary_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+binary_expr_rhs(
+  int id: @binary_expr ref,
+  int rhs: @expr ref
+);
+
+box_pats(
+  unique int id: @box_pat
+);
+
+#keyset[id]
+box_pat_pats(
+  int id: @box_pat ref,
+  int pat: @pat ref
+);
+
+break_exprs(
+  unique int id: @break_expr
+);
+
+#keyset[id, index]
+break_expr_attrs(
+  int id: @break_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+break_expr_exprs(
+  int id: @break_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+break_expr_lifetimes(
+  int id: @break_expr ref,
+  int lifetime: @lifetime ref
+);
+
+@call_expr_base =
+  @call_expr
+| @method_call_expr
+;
+
+#keyset[id]
+call_expr_base_arg_lists(
+  int id: @call_expr_base ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+call_expr_base_attrs(
+  int id: @call_expr_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+cast_exprs(
+  unique int id: @cast_expr
+);
+
+#keyset[id, index]
+cast_expr_attrs(
+  int id: @cast_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+cast_expr_exprs(
+  int id: @cast_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+cast_expr_type_reprs(
+  int id: @cast_expr ref,
+  int type_repr: @type_repr ref
+);
+
+closure_exprs(
+  unique int id: @closure_expr
+);
+
+#keyset[id]
+closure_expr_bodies(
+  int id: @closure_expr ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+closure_expr_closure_binders(
+  int id: @closure_expr ref,
+  int closure_binder: @closure_binder ref
+);
+
+#keyset[id]
+closure_expr_is_async(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_const(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_gen(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_move(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_static(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_ret_types(
+  int id: @closure_expr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+comments(
+  unique int id: @comment,
+  int parent: @ast_node ref,
+  string text: string ref
+);
+
+const_args(
+  unique int id: @const_arg
+);
+
+#keyset[id]
+const_arg_exprs(
+  int id: @const_arg ref,
+  int expr: @expr ref
+);
+
+const_block_pats(
+  unique int id: @const_block_pat
+);
+
+#keyset[id]
+const_block_pat_block_exprs(
+  int id: @const_block_pat ref,
+  int block_expr: @block_expr ref
+);
+
+#keyset[id]
+const_block_pat_is_const(
+  int id: @const_block_pat ref
+);
+
+const_params(
+  unique int id: @const_param
+);
+
+#keyset[id, index]
+const_param_attrs(
+  int id: @const_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_param_default_vals(
+  int id: @const_param ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+const_param_is_const(
+  int id: @const_param ref
+);
+
+#keyset[id]
+const_param_names(
+  int id: @const_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_param_type_reprs(
+  int id: @const_param ref,
+  int type_repr: @type_repr ref
+);
+
+continue_exprs(
+  unique int id: @continue_expr
+);
+
+#keyset[id, index]
+continue_expr_attrs(
+  int id: @continue_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+continue_expr_lifetimes(
+  int id: @continue_expr ref,
+  int lifetime: @lifetime ref
+);
+
+dyn_trait_type_reprs(
+  unique int id: @dyn_trait_type_repr
+);
+
+#keyset[id]
+dyn_trait_type_repr_type_bound_lists(
+  int id: @dyn_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+expr_stmts(
+  unique int id: @expr_stmt
+);
+
+#keyset[id]
+expr_stmt_exprs(
+  int id: @expr_stmt ref,
+  int expr: @expr ref
+);
+
+field_exprs(
+  unique int id: @field_expr
+);
+
+#keyset[id, index]
+field_expr_attrs(
+  int id: @field_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+field_expr_containers(
+  int id: @field_expr ref,
+  int container: @expr ref
+);
+
+#keyset[id]
+field_expr_identifiers(
+  int id: @field_expr ref,
+  int identifier: @name_ref ref
+);
+
+fn_ptr_type_reprs(
+  unique int id: @fn_ptr_type_repr
+);
+
+#keyset[id]
+fn_ptr_type_repr_abis(
+  int id: @fn_ptr_type_repr ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_async(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_const(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_unsafe(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_param_lists(
+  int id: @fn_ptr_type_repr ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_ret_types(
+  int id: @fn_ptr_type_repr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+for_type_reprs(
+  unique int id: @for_type_repr
+);
+
+#keyset[id]
+for_type_repr_generic_param_lists(
+  int id: @for_type_repr ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+for_type_repr_type_reprs(
+  int id: @for_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+format_args_exprs(
+  unique int id: @format_args_expr
+);
+
+#keyset[id, index]
+format_args_expr_args(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int arg: @format_args_arg ref
+);
+
+#keyset[id, index]
+format_args_expr_attrs(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+format_args_expr_templates(
+  int id: @format_args_expr ref,
+  int template: @expr ref
+);
+
+ident_pats(
+  unique int id: @ident_pat
+);
+
+#keyset[id, index]
+ident_pat_attrs(
+  int id: @ident_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ident_pat_is_mut(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_is_ref(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_names(
+  int id: @ident_pat ref,
+  int name: @name ref
+);
+
+#keyset[id]
+ident_pat_pats(
+  int id: @ident_pat ref,
+  int pat: @pat ref
+);
+
+if_exprs(
+  unique int id: @if_expr
+);
+
+#keyset[id, index]
+if_expr_attrs(
+  int id: @if_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+if_expr_conditions(
+  int id: @if_expr ref,
+  int condition: @expr ref
+);
+
+#keyset[id]
+if_expr_elses(
+  int id: @if_expr ref,
+  int else: @expr ref
+);
+
+#keyset[id]
+if_expr_thens(
+  int id: @if_expr ref,
+  int then: @block_expr ref
+);
+
+impl_trait_type_reprs(
+  unique int id: @impl_trait_type_repr
+);
+
+#keyset[id]
+impl_trait_type_repr_type_bound_lists(
+  int id: @impl_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+index_exprs(
+  unique int id: @index_expr
+);
+
+#keyset[id, index]
+index_expr_attrs(
+  int id: @index_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+index_expr_bases(
+  int id: @index_expr ref,
+  int base: @expr ref
+);
+
+#keyset[id]
+index_expr_indices(
+  int id: @index_expr ref,
+  int index: @expr ref
+);
+
+infer_type_reprs(
+  unique int id: @infer_type_repr
+);
+
+@item =
+  @adt
+| @assoc_item
+| @extern_block
+| @extern_crate
+| @extern_item
+| @impl
+| @macro_def
+| @macro_rules
+| @module
+| @trait
+| @trait_alias
+| @use
+;
+
+#keyset[id]
+item_attribute_macro_expansions(
+  int id: @item ref,
+  int attribute_macro_expansion: @macro_items ref
+);
+
+@labelable_expr =
+  @block_expr
+| @looping_expr
+;
+
+#keyset[id]
+labelable_expr_labels(
+  int id: @labelable_expr ref,
+  int label: @label ref
+);
+
+let_exprs(
+  unique int id: @let_expr
+);
+
+#keyset[id, index]
+let_expr_attrs(
+  int id: @let_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_expr_scrutinees(
+  int id: @let_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+let_expr_pats(
+  int id: @let_expr ref,
+  int pat: @pat ref
+);
+
+let_stmts(
+  unique int id: @let_stmt
+);
+
+#keyset[id, index]
+let_stmt_attrs(
+  int id: @let_stmt ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_stmt_initializers(
+  int id: @let_stmt ref,
+  int initializer: @expr ref
+);
+
+#keyset[id]
+let_stmt_let_elses(
+  int id: @let_stmt ref,
+  int let_else: @let_else ref
+);
+
+#keyset[id]
+let_stmt_pats(
+  int id: @let_stmt ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+let_stmt_type_reprs(
+  int id: @let_stmt ref,
+  int type_repr: @type_repr ref
+);
+
+lifetimes(
+  unique int id: @lifetime
+);
+
+#keyset[id]
+lifetime_texts(
+  int id: @lifetime ref,
+  string text: string ref
+);
+
+lifetime_args(
+  unique int id: @lifetime_arg
+);
+
+#keyset[id]
+lifetime_arg_lifetimes(
+  int id: @lifetime_arg ref,
+  int lifetime: @lifetime ref
+);
+
+lifetime_params(
+  unique int id: @lifetime_param
+);
+
+#keyset[id, index]
+lifetime_param_attrs(
+  int id: @lifetime_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+lifetime_param_lifetimes(
+  int id: @lifetime_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+lifetime_param_type_bound_lists(
+  int id: @lifetime_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+literal_exprs(
+  unique int id: @literal_expr
+);
+
+#keyset[id, index]
+literal_expr_attrs(
+  int id: @literal_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+literal_expr_text_values(
+  int id: @literal_expr ref,
+  string text_value: string ref
+);
+
+literal_pats(
+  unique int id: @literal_pat
+);
+
+#keyset[id]
+literal_pat_literals(
+  int id: @literal_pat ref,
+  int literal: @literal_expr ref
+);
+
+macro_block_exprs(
+  unique int id: @macro_block_expr
+);
+
+#keyset[id]
+macro_block_expr_tail_exprs(
+  int id: @macro_block_expr ref,
+  int tail_expr: @expr ref
+);
+
+#keyset[id, index]
+macro_block_expr_statements(
+  int id: @macro_block_expr ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+macro_exprs(
+  unique int id: @macro_expr
+);
+
+#keyset[id]
+macro_expr_macro_calls(
+  int id: @macro_expr ref,
+  int macro_call: @macro_call ref
+);
+
+macro_pats(
+  unique int id: @macro_pat
+);
+
+#keyset[id]
+macro_pat_macro_calls(
+  int id: @macro_pat ref,
+  int macro_call: @macro_call ref
+);
+
+macro_type_reprs(
+  unique int id: @macro_type_repr
+);
+
+#keyset[id]
+macro_type_repr_macro_calls(
+  int id: @macro_type_repr ref,
+  int macro_call: @macro_call ref
+);
+
+match_exprs(
+  unique int id: @match_expr
+);
+
+#keyset[id, index]
+match_expr_attrs(
+  int id: @match_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_expr_scrutinees(
+  int id: @match_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+match_expr_match_arm_lists(
+  int id: @match_expr ref,
+  int match_arm_list: @match_arm_list ref
+);
+
+name_refs(
+  unique int id: @name_ref
+);
+
+#keyset[id]
+name_ref_texts(
+  int id: @name_ref ref,
+  string text: string ref
+);
+
+never_type_reprs(
+  unique int id: @never_type_repr
+);
+
+offset_of_exprs(
+  unique int id: @offset_of_expr
+);
+
+#keyset[id, index]
+offset_of_expr_attrs(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+offset_of_expr_fields(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int field: @name_ref ref
+);
+
+#keyset[id]
+offset_of_expr_type_reprs(
+  int id: @offset_of_expr ref,
+  int type_repr: @type_repr ref
+);
+
+or_pats(
+  unique int id: @or_pat
+);
+
+#keyset[id, index]
+or_pat_pats(
+  int id: @or_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+params(
+  unique int id: @param
+);
+
+#keyset[id]
+param_pats(
+  int id: @param ref,
+  int pat: @pat ref
+);
+
+paren_exprs(
+  unique int id: @paren_expr
+);
+
+#keyset[id, index]
+paren_expr_attrs(
+  int id: @paren_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+paren_expr_exprs(
+  int id: @paren_expr ref,
+  int expr: @expr ref
+);
+
+paren_pats(
+  unique int id: @paren_pat
+);
+
+#keyset[id]
+paren_pat_pats(
+  int id: @paren_pat ref,
+  int pat: @pat ref
+);
+
+paren_type_reprs(
+  unique int id: @paren_type_repr
+);
+
+#keyset[id]
+paren_type_repr_type_reprs(
+  int id: @paren_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+@path_ast_node =
+  @path_expr
+| @path_pat
+| @struct_expr
+| @struct_pat
+| @tuple_struct_pat
+;
+
+#keyset[id]
+path_ast_node_paths(
+  int id: @path_ast_node ref,
+  int path: @path ref
+);
+
+@path_expr_base =
+  @path_expr
+;
+
+path_type_reprs(
+  unique int id: @path_type_repr
+);
+
+#keyset[id]
+path_type_repr_paths(
+  int id: @path_type_repr ref,
+  int path: @path ref
+);
+
+prefix_exprs(
+  unique int id: @prefix_expr
+);
+
+#keyset[id, index]
+prefix_expr_attrs(
+  int id: @prefix_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+prefix_expr_exprs(
+  int id: @prefix_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+prefix_expr_operator_names(
+  int id: @prefix_expr ref,
+  string operator_name: string ref
+);
+
+ptr_type_reprs(
+  unique int id: @ptr_type_repr
+);
+
+#keyset[id]
+ptr_type_repr_is_const(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_is_mut(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_type_reprs(
+  int id: @ptr_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+range_exprs(
+  unique int id: @range_expr
+);
+
+#keyset[id, index]
+range_expr_attrs(
+  int id: @range_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+range_expr_ends(
+  int id: @range_expr ref,
+  int end: @expr ref
+);
+
+#keyset[id]
+range_expr_operator_names(
+  int id: @range_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_expr_starts(
+  int id: @range_expr ref,
+  int start: @expr ref
+);
+
+range_pats(
+  unique int id: @range_pat
+);
+
+#keyset[id]
+range_pat_ends(
+  int id: @range_pat ref,
+  int end: @pat ref
+);
+
+#keyset[id]
+range_pat_operator_names(
+  int id: @range_pat ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_pat_starts(
+  int id: @range_pat ref,
+  int start: @pat ref
+);
+
+ref_exprs(
+  unique int id: @ref_expr
+);
+
+#keyset[id, index]
+ref_expr_attrs(
+  int id: @ref_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ref_expr_exprs(
+  int id: @ref_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+ref_expr_is_const(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_mut(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_raw(
+  int id: @ref_expr ref
+);
+
+ref_pats(
+  unique int id: @ref_pat
+);
+
+#keyset[id]
+ref_pat_is_mut(
+  int id: @ref_pat ref
+);
+
+#keyset[id]
+ref_pat_pats(
+  int id: @ref_pat ref,
+  int pat: @pat ref
+);
+
+ref_type_reprs(
+  unique int id: @ref_type_repr
+);
+
+#keyset[id]
+ref_type_repr_is_mut(
+  int id: @ref_type_repr ref
+);
+
+#keyset[id]
+ref_type_repr_lifetimes(
+  int id: @ref_type_repr ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+ref_type_repr_type_reprs(
+  int id: @ref_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+rest_pats(
+  unique int id: @rest_pat
+);
+
+#keyset[id, index]
+rest_pat_attrs(
+  int id: @rest_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+return_exprs(
+  unique int id: @return_expr
+);
+
+#keyset[id, index]
+return_expr_attrs(
+  int id: @return_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+return_expr_exprs(
+  int id: @return_expr ref,
+  int expr: @expr ref
+);
+
+self_params(
+  unique int id: @self_param
+);
+
+#keyset[id]
+self_param_is_ref(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_is_mut(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_lifetimes(
+  int id: @self_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+self_param_names(
+  int id: @self_param ref,
+  int name: @name ref
+);
+
+slice_pats(
+  unique int id: @slice_pat
+);
+
+#keyset[id, index]
+slice_pat_pats(
+  int id: @slice_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+slice_type_reprs(
+  unique int id: @slice_type_repr
+);
+
+#keyset[id]
+slice_type_repr_type_reprs(
+  int id: @slice_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+struct_field_lists(
+  unique int id: @struct_field_list
+);
+
+#keyset[id, index]
+struct_field_list_fields(
+  int id: @struct_field_list ref,
+  int index: int ref,
+  int field: @struct_field ref
+);
+
+try_exprs(
+  unique int id: @try_expr
+);
+
+#keyset[id, index]
+try_expr_attrs(
+  int id: @try_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+try_expr_exprs(
+  int id: @try_expr ref,
+  int expr: @expr ref
+);
+
+tuple_exprs(
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_attrs(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+tuple_expr_fields(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int field: @expr ref
+);
+
+tuple_field_lists(
+  unique int id: @tuple_field_list
+);
+
+#keyset[id, index]
+tuple_field_list_fields(
+  int id: @tuple_field_list ref,
+  int index: int ref,
+  int field: @tuple_field ref
+);
+
+tuple_pats(
+  unique int id: @tuple_pat
+);
+
+#keyset[id, index]
+tuple_pat_fields(
+  int id: @tuple_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_type_reprs(
+  unique int id: @tuple_type_repr
+);
+
+#keyset[id, index]
+tuple_type_repr_fields(
+  int id: @tuple_type_repr ref,
+  int index: int ref,
+  int field: @type_repr ref
+);
+
+type_args(
+  unique int id: @type_arg
+);
+
+#keyset[id]
+type_arg_type_reprs(
+  int id: @type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+type_params(
+  unique int id: @type_param
+);
+
+#keyset[id, index]
+type_param_attrs(
+  int id: @type_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_param_default_types(
+  int id: @type_param ref,
+  int default_type: @type_repr ref
+);
+
+#keyset[id]
+type_param_names(
+  int id: @type_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_param_type_bound_lists(
+  int id: @type_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+underscore_exprs(
+  unique int id: @underscore_expr
+);
+
+#keyset[id, index]
+underscore_expr_attrs(
+  int id: @underscore_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+variants(
+  unique int id: @variant
+);
+
+#keyset[id, index]
+variant_attrs(
+  int id: @variant ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+variant_discriminants(
+  int id: @variant ref,
+  int discriminant: @expr ref
+);
+
+#keyset[id]
+variant_field_lists(
+  int id: @variant ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+variant_names(
+  int id: @variant ref,
+  int name: @name ref
+);
+
+#keyset[id]
+variant_visibilities(
+  int id: @variant ref,
+  int visibility: @visibility ref
+);
+
+wildcard_pats(
+  unique int id: @wildcard_pat
+);
+
+yeet_exprs(
+  unique int id: @yeet_expr
+);
+
+#keyset[id, index]
+yeet_expr_attrs(
+  int id: @yeet_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yeet_expr_exprs(
+  int id: @yeet_expr ref,
+  int expr: @expr ref
+);
+
+yield_exprs(
+  unique int id: @yield_expr
+);
+
+#keyset[id, index]
+yield_expr_attrs(
+  int id: @yield_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yield_expr_exprs(
+  int id: @yield_expr ref,
+  int expr: @expr ref
+);
+
+@adt =
+  @enum
+| @struct
+| @union
+;
+
+#keyset[id, index]
+adt_derive_macro_expansions(
+  int id: @adt ref,
+  int index: int ref,
+  int derive_macro_expansion: @macro_items ref
+);
+
+@assoc_item =
+  @const
+| @function
+| @macro_call
+| @type_alias
+;
+
+block_exprs(
+  unique int id: @block_expr
+);
+
+#keyset[id, index]
+block_expr_attrs(
+  int id: @block_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+block_expr_is_async(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_const(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_gen(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_move(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_try(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_unsafe(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_stmt_lists(
+  int id: @block_expr ref,
+  int stmt_list: @stmt_list ref
+);
+
+call_exprs(
+  unique int id: @call_expr
+);
+
+#keyset[id]
+call_expr_functions(
+  int id: @call_expr ref,
+  int function: @expr ref
+);
+
+extern_blocks(
+  unique int id: @extern_block
+);
+
+#keyset[id]
+extern_block_abis(
+  int id: @extern_block ref,
+  int abi: @abi ref
+);
+
+#keyset[id, index]
+extern_block_attrs(
+  int id: @extern_block ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_block_extern_item_lists(
+  int id: @extern_block ref,
+  int extern_item_list: @extern_item_list ref
+);
+
+#keyset[id]
+extern_block_is_unsafe(
+  int id: @extern_block ref
+);
+
+extern_crates(
+  unique int id: @extern_crate
+);
+
+#keyset[id, index]
+extern_crate_attrs(
+  int id: @extern_crate ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_crate_identifiers(
+  int id: @extern_crate ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+extern_crate_renames(
+  int id: @extern_crate ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+extern_crate_visibilities(
+  int id: @extern_crate ref,
+  int visibility: @visibility ref
+);
+
+@extern_item =
+  @function
+| @macro_call
+| @static
+| @type_alias
+;
+
+impls(
+  unique int id: @impl
+);
+
+#keyset[id]
+impl_assoc_item_lists(
+  int id: @impl ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+impl_attrs(
+  int id: @impl ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+impl_generic_param_lists(
+  int id: @impl ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+impl_is_const(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_default(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_unsafe(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_self_ties(
+  int id: @impl ref,
+  int self_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_traits(
+  int id: @impl ref,
+  int trait: @type_repr ref
+);
+
+#keyset[id]
+impl_visibilities(
+  int id: @impl ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+impl_where_clauses(
+  int id: @impl ref,
+  int where_clause: @where_clause ref
+);
+
+@looping_expr =
+  @for_expr
+| @loop_expr
+| @while_expr
+;
+
+#keyset[id]
+looping_expr_loop_bodies(
+  int id: @looping_expr ref,
+  int loop_body: @block_expr ref
+);
+
+macro_defs(
+  unique int id: @macro_def
+);
+
+#keyset[id]
+macro_def_args(
+  int id: @macro_def ref,
+  int args: @token_tree ref
+);
+
+#keyset[id, index]
+macro_def_attrs(
+  int id: @macro_def ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_def_bodies(
+  int id: @macro_def ref,
+  int body: @token_tree ref
+);
+
+#keyset[id]
+macro_def_names(
+  int id: @macro_def ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_def_visibilities(
+  int id: @macro_def ref,
+  int visibility: @visibility ref
+);
+
+macro_rules(
+  unique int id: @macro_rules
+);
+
+#keyset[id, index]
+macro_rules_attrs(
+  int id: @macro_rules ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_rules_names(
+  int id: @macro_rules ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_rules_token_trees(
+  int id: @macro_rules ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_rules_visibilities(
+  int id: @macro_rules ref,
+  int visibility: @visibility ref
+);
+
+method_call_exprs(
+  unique int id: @method_call_expr
+);
+
+#keyset[id]
+method_call_expr_generic_arg_lists(
+  int id: @method_call_expr ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+method_call_expr_identifiers(
+  int id: @method_call_expr ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+method_call_expr_receivers(
+  int id: @method_call_expr ref,
+  int receiver: @expr ref
+);
+
+modules(
+  unique int id: @module
+);
+
+#keyset[id, index]
+module_attrs(
+  int id: @module ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+module_item_lists(
+  int id: @module ref,
+  int item_list: @item_list ref
+);
+
+#keyset[id]
+module_names(
+  int id: @module ref,
+  int name: @name ref
+);
+
+#keyset[id]
+module_visibilities(
+  int id: @module ref,
+  int visibility: @visibility ref
+);
+
+path_exprs(
+  unique int id: @path_expr
+);
+
+#keyset[id, index]
+path_expr_attrs(
+  int id: @path_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+path_pats(
+  unique int id: @path_pat
+);
+
+struct_exprs(
+  unique int id: @struct_expr
+);
+
+#keyset[id]
+struct_expr_struct_expr_field_lists(
+  int id: @struct_expr ref,
+  int struct_expr_field_list: @struct_expr_field_list ref
+);
+
+struct_pats(
+  unique int id: @struct_pat
+);
+
+#keyset[id]
+struct_pat_struct_pat_field_lists(
+  int id: @struct_pat ref,
+  int struct_pat_field_list: @struct_pat_field_list ref
+);
+
+traits(
+  unique int id: @trait
+);
+
+#keyset[id]
+trait_assoc_item_lists(
+  int id: @trait ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+trait_attrs(
+  int id: @trait ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_generic_param_lists(
+  int id: @trait ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_is_auto(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_is_unsafe(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_names(
+  int id: @trait ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_type_bound_lists(
+  int id: @trait ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_visibilities(
+  int id: @trait ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_where_clauses(
+  int id: @trait ref,
+  int where_clause: @where_clause ref
+);
+
+trait_aliases(
+  unique int id: @trait_alias
+);
+
+#keyset[id, index]
+trait_alias_attrs(
+  int id: @trait_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_alias_generic_param_lists(
+  int id: @trait_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_alias_names(
+  int id: @trait_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_alias_type_bound_lists(
+  int id: @trait_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_alias_visibilities(
+  int id: @trait_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_alias_where_clauses(
+  int id: @trait_alias ref,
+  int where_clause: @where_clause ref
+);
+
+tuple_struct_pats(
+  unique int id: @tuple_struct_pat
+);
+
+#keyset[id, index]
+tuple_struct_pat_fields(
+  int id: @tuple_struct_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+uses(
+  unique int id: @use
+);
+
+#keyset[id, index]
+use_attrs(
+  int id: @use ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+use_use_trees(
+  int id: @use ref,
+  int use_tree: @use_tree ref
+);
+
+#keyset[id]
+use_visibilities(
+  int id: @use ref,
+  int visibility: @visibility ref
+);
+
+consts(
+  unique int id: @const
+);
+
+#keyset[id, index]
+const_attrs(
+  int id: @const ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_bodies(
+  int id: @const ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+const_generic_param_lists(
+  int id: @const ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+const_is_const(
+  int id: @const ref
+);
+
+#keyset[id]
+const_is_default(
+  int id: @const ref
+);
+
+#keyset[id]
+const_names(
+  int id: @const ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_type_reprs(
+  int id: @const ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+const_visibilities(
+  int id: @const ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+const_where_clauses(
+  int id: @const ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+const_has_implementation(
+  int id: @const ref
+);
+
+enums(
+  unique int id: @enum
+);
+
+#keyset[id, index]
+enum_attrs(
+  int id: @enum ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+enum_generic_param_lists(
+  int id: @enum ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+enum_names(
+  int id: @enum ref,
+  int name: @name ref
+);
+
+#keyset[id]
+enum_variant_lists(
+  int id: @enum ref,
+  int variant_list: @variant_list ref
+);
+
+#keyset[id]
+enum_visibilities(
+  int id: @enum ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+enum_where_clauses(
+  int id: @enum ref,
+  int where_clause: @where_clause ref
+);
+
+for_exprs(
+  unique int id: @for_expr
+);
+
+#keyset[id, index]
+for_expr_attrs(
+  int id: @for_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+for_expr_iterables(
+  int id: @for_expr ref,
+  int iterable: @expr ref
+);
+
+#keyset[id]
+for_expr_pats(
+  int id: @for_expr ref,
+  int pat: @pat ref
+);
+
+functions(
+  unique int id: @function
+);
+
+#keyset[id]
+function_abis(
+  int id: @function ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+function_bodies(
+  int id: @function ref,
+  int body: @block_expr ref
+);
+
+#keyset[id]
+function_generic_param_lists(
+  int id: @function ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+function_is_async(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_const(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_default(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_gen(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_unsafe(
+  int id: @function ref
+);
+
+#keyset[id]
+function_names(
+  int id: @function ref,
+  int name: @name ref
+);
+
+#keyset[id]
+function_ret_types(
+  int id: @function ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+function_visibilities(
+  int id: @function ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+function_where_clauses(
+  int id: @function ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+function_has_implementation(
+  int id: @function ref
+);
+
+loop_exprs(
+  unique int id: @loop_expr
+);
+
+#keyset[id, index]
+loop_expr_attrs(
+  int id: @loop_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+macro_calls(
+  unique int id: @macro_call
+);
+
+#keyset[id, index]
+macro_call_attrs(
+  int id: @macro_call ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_call_paths(
+  int id: @macro_call ref,
+  int path: @path ref
+);
+
+#keyset[id]
+macro_call_token_trees(
+  int id: @macro_call ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_call_macro_call_expansions(
+  int id: @macro_call ref,
+  int macro_call_expansion: @ast_node ref
+);
+
+statics(
+  unique int id: @static
+);
+
+#keyset[id, index]
+static_attrs(
+  int id: @static ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+static_bodies(
+  int id: @static ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+static_is_mut(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_static(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_unsafe(
+  int id: @static ref
+);
+
+#keyset[id]
+static_names(
+  int id: @static ref,
+  int name: @name ref
+);
+
+#keyset[id]
+static_type_reprs(
+  int id: @static ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+static_visibilities(
+  int id: @static ref,
+  int visibility: @visibility ref
+);
+
+structs(
+  unique int id: @struct
+);
+
+#keyset[id, index]
+struct_attrs(
+  int id: @struct ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_lists_(
+  int id: @struct ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+struct_generic_param_lists(
+  int id: @struct ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+struct_names(
+  int id: @struct ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_visibilities(
+  int id: @struct ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+struct_where_clauses(
+  int id: @struct ref,
+  int where_clause: @where_clause ref
+);
+
+type_aliases(
+  unique int id: @type_alias
+);
+
+#keyset[id, index]
+type_alias_attrs(
+  int id: @type_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_alias_generic_param_lists(
+  int id: @type_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_alias_is_default(
+  int id: @type_alias ref
+);
+
+#keyset[id]
+type_alias_names(
+  int id: @type_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_alias_type_reprs(
+  int id: @type_alias ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_alias_type_bound_lists(
+  int id: @type_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+type_alias_visibilities(
+  int id: @type_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_alias_where_clauses(
+  int id: @type_alias ref,
+  int where_clause: @where_clause ref
+);
+
+unions(
+  unique int id: @union
+);
+
+#keyset[id, index]
+union_attrs(
+  int id: @union ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+union_generic_param_lists(
+  int id: @union ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+union_names(
+  int id: @union ref,
+  int name: @name ref
+);
+
+#keyset[id]
+union_struct_field_lists(
+  int id: @union ref,
+  int struct_field_list: @struct_field_list ref
+);
+
+#keyset[id]
+union_visibilities(
+  int id: @union ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+union_where_clauses(
+  int id: @union ref,
+  int where_clause: @where_clause ref
+);
+
+while_exprs(
+  unique int id: @while_expr
+);
+
+#keyset[id, index]
+while_expr_attrs(
+  int id: @while_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+while_expr_conditions(
+  int id: @while_expr ref,
+  int condition: @expr ref
+);
diff --git a/rust/downgrades/b41e55c0dba14a139d01dbee713aca5efe5b818a/upgrade.properties b/rust/downgrades/b41e55c0dba14a139d01dbee713aca5efe5b818a/upgrade.properties
new file mode 100644
index 00000000000..8376124b7f8
--- /dev/null
+++ b/rust/downgrades/b41e55c0dba14a139d01dbee713aca5efe5b818a/upgrade.properties
@@ -0,0 +1,29 @@
+description: Revert rust-analyzer upgrade to 0.0.300
+compatibility: backwards
+
+for_type_repr_for_binders.rel: delete
+where_pred_for_binders.rel: delete
+type_bound_for_binders.rel: delete
+for_binders.rel: delete
+for_binder_generic_param_lists.rel: delete
+closure_expr_for_binders.rel: delete
+
+closure_expr_closure_binders.rel: reorder closure_expr_for_binders.rel (@closure_expr id, @for_binder binder) id binder
+
+closure_binders.rel: run downgrade.ql new_closure_binders
+closure_binder_generic_param_lists.rel: run downgrade.ql new_closure_binder_generic_param_lists
+where_pred_generic_param_lists.rel: run downgrade.ql new_where_pred_generic_param_lists
+for_type_reprs.rel: run downgrade.ql new_for_type_reprs
+for_type_repr_generic_param_lists.rel: run downgrade.ql new_for_type_repr_generic_param_lists
+for_type_repr_type_reprs.rel: run downgrade.ql new_for_type_repr_type_reprs
+type_bound_type_reprs.rel: run downgrade.ql new_type_bound_type_reprs
+locatable_locations.rel: run downgrade.ql new_locatable_locations
+
+item_attribute_macro_expansions.rel: run downgrade.ql new_item_attribute_macro_expansions
+item_list_items.rel: run downgrade.ql new_item_list_items
+macro_items_items.rel: run downgrade.ql new_macro_items_items
+source_file_items.rel: run downgrade.ql new_source_file_items
+stmt_list_statements.rel: run downgrade.ql new_stmt_list_statements
+macro_block_expr_statements.rel: run downgrade.ql new_macro_block_expr_statements
+addressable_extended_canonical_paths.rel: run downgrade.ql new_addressable_extended_canonical_paths
+addressable_crate_origins.rel: run downgrade.ql new_addressable_crate_origins
diff --git a/rust/downgrades/dfade44a27bd44db996ae8c5095a11effc883aba/old.dbscheme b/rust/downgrades/dfade44a27bd44db996ae8c5095a11effc883aba/old.dbscheme
new file mode 100644
index 00000000000..dfade44a27b
--- /dev/null
+++ b/rust/downgrades/dfade44a27bd44db996ae8c5095a11effc883aba/old.dbscheme
@@ -0,0 +1,3615 @@
+// generated by codegen, do not edit
+
+// from ../shared/tree-sitter-extractor/src/generator/prefix.dbscheme
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Empty location -*/
+
+empty_location(
+  int location: @location_default ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- Diagnostic messages: severity -*/
+
+case @diagnostic.severity of
+  10 = @diagnostic_debug
+| 20 = @diagnostic_info
+| 30 = @diagnostic_warning
+| 40 = @diagnostic_error
+;
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error;
+
+/*- Database metadata -*/
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+overlayChangedFiles(
+  string path: string ref
+);
+
+
+// from prefix.dbscheme
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_default ref
+);
+
+
+// from schema
+
+@element =
+  @extractor_step
+| @locatable
+| @named_crate
+| @unextracted
+;
+
+extractor_steps(
+  unique int id: @extractor_step,
+  string action: string ref,
+  int duration_ms: int ref
+);
+
+#keyset[id]
+extractor_step_files(
+  int id: @extractor_step ref,
+  int file: @file ref
+);
+
+@locatable =
+  @ast_node
+| @crate
+;
+
+named_crates(
+  unique int id: @named_crate,
+  string name: string ref,
+  int crate: @crate ref
+);
+
+@unextracted =
+  @missing
+| @unimplemented
+;
+
+@ast_node =
+  @abi
+| @addressable
+| @arg_list
+| @asm_dir_spec
+| @asm_operand
+| @asm_operand_expr
+| @asm_option
+| @asm_piece
+| @asm_reg_spec
+| @assoc_item_list
+| @attr
+| @callable
+| @expr
+| @extern_item_list
+| @field_list
+| @for_binder
+| @format_args_arg
+| @generic_arg
+| @generic_arg_list
+| @generic_param
+| @generic_param_list
+| @item_list
+| @label
+| @let_else
+| @macro_items
+| @match_arm
+| @match_arm_list
+| @match_guard
+| @meta
+| @name
+| @param_base
+| @param_list
+| @parenthesized_arg_list
+| @pat
+| @path
+| @path_ast_node
+| @path_segment
+| @rename
+| @ret_type_repr
+| @return_type_syntax
+| @source_file
+| @stmt
+| @stmt_list
+| @struct_expr_field
+| @struct_expr_field_list
+| @struct_field
+| @struct_pat_field
+| @struct_pat_field_list
+| @token
+| @token_tree
+| @tuple_field
+| @type_bound
+| @type_bound_list
+| @type_repr
+| @use_bound_generic_arg
+| @use_bound_generic_args
+| @use_tree
+| @use_tree_list
+| @variant_list
+| @visibility
+| @where_clause
+| @where_pred
+;
+
+crates(
+  unique int id: @crate
+);
+
+#keyset[id]
+crate_names(
+  int id: @crate ref,
+  string name: string ref
+);
+
+#keyset[id]
+crate_versions(
+  int id: @crate ref,
+  string version: string ref
+);
+
+#keyset[id, index]
+crate_cfg_options(
+  int id: @crate ref,
+  int index: int ref,
+  string cfg_option: string ref
+);
+
+#keyset[id, index]
+crate_named_dependencies(
+  int id: @crate ref,
+  int index: int ref,
+  int named_dependency: @named_crate ref
+);
+
+missings(
+  unique int id: @missing
+);
+
+unimplementeds(
+  unique int id: @unimplemented
+);
+
+abis(
+  unique int id: @abi
+);
+
+#keyset[id]
+abi_abi_strings(
+  int id: @abi ref,
+  string abi_string: string ref
+);
+
+@addressable =
+  @item
+| @variant
+;
+
+arg_lists(
+  unique int id: @arg_list
+);
+
+#keyset[id, index]
+arg_list_args(
+  int id: @arg_list ref,
+  int index: int ref,
+  int arg: @expr ref
+);
+
+asm_dir_specs(
+  unique int id: @asm_dir_spec
+);
+
+@asm_operand =
+  @asm_const
+| @asm_label
+| @asm_reg_operand
+| @asm_sym
+;
+
+asm_operand_exprs(
+  unique int id: @asm_operand_expr
+);
+
+#keyset[id]
+asm_operand_expr_in_exprs(
+  int id: @asm_operand_expr ref,
+  int in_expr: @expr ref
+);
+
+#keyset[id]
+asm_operand_expr_out_exprs(
+  int id: @asm_operand_expr ref,
+  int out_expr: @expr ref
+);
+
+asm_options(
+  unique int id: @asm_option
+);
+
+#keyset[id]
+asm_option_is_raw(
+  int id: @asm_option ref
+);
+
+@asm_piece =
+  @asm_clobber_abi
+| @asm_operand_named
+| @asm_options_list
+;
+
+asm_reg_specs(
+  unique int id: @asm_reg_spec
+);
+
+#keyset[id]
+asm_reg_spec_identifiers(
+  int id: @asm_reg_spec ref,
+  int identifier: @name_ref ref
+);
+
+assoc_item_lists(
+  unique int id: @assoc_item_list
+);
+
+#keyset[id, index]
+assoc_item_list_assoc_items(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int assoc_item: @assoc_item ref
+);
+
+#keyset[id, index]
+assoc_item_list_attrs(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+attrs(
+  unique int id: @attr
+);
+
+#keyset[id]
+attr_meta(
+  int id: @attr ref,
+  int meta: @meta ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_param_lists(
+  int id: @callable ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id, index]
+callable_attrs(
+  int id: @callable ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+@expr =
+  @array_expr_internal
+| @asm_expr
+| @await_expr
+| @become_expr
+| @binary_expr
+| @break_expr
+| @call_expr_base
+| @cast_expr
+| @closure_expr
+| @continue_expr
+| @field_expr
+| @format_args_expr
+| @if_expr
+| @index_expr
+| @labelable_expr
+| @let_expr
+| @literal_expr
+| @macro_block_expr
+| @macro_expr
+| @match_expr
+| @offset_of_expr
+| @paren_expr
+| @path_expr_base
+| @prefix_expr
+| @range_expr
+| @ref_expr
+| @return_expr
+| @struct_expr
+| @try_expr
+| @tuple_expr
+| @underscore_expr
+| @yeet_expr
+| @yield_expr
+;
+
+extern_item_lists(
+  unique int id: @extern_item_list
+);
+
+#keyset[id, index]
+extern_item_list_attrs(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+extern_item_list_extern_items(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int extern_item: @extern_item ref
+);
+
+@field_list =
+  @struct_field_list
+| @tuple_field_list
+;
+
+for_binders(
+  unique int id: @for_binder
+);
+
+#keyset[id]
+for_binder_generic_param_lists(
+  int id: @for_binder ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+format_args_args(
+  unique int id: @format_args_arg
+);
+
+#keyset[id]
+format_args_arg_exprs(
+  int id: @format_args_arg ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+format_args_arg_names(
+  int id: @format_args_arg ref,
+  int name: @name ref
+);
+
+@generic_arg =
+  @assoc_type_arg
+| @const_arg
+| @lifetime_arg
+| @type_arg
+;
+
+generic_arg_lists(
+  unique int id: @generic_arg_list
+);
+
+#keyset[id, index]
+generic_arg_list_generic_args(
+  int id: @generic_arg_list ref,
+  int index: int ref,
+  int generic_arg: @generic_arg ref
+);
+
+@generic_param =
+  @const_param
+| @lifetime_param
+| @type_param
+;
+
+generic_param_lists(
+  unique int id: @generic_param_list
+);
+
+#keyset[id, index]
+generic_param_list_generic_params(
+  int id: @generic_param_list ref,
+  int index: int ref,
+  int generic_param: @generic_param ref
+);
+
+item_lists(
+  unique int id: @item_list
+);
+
+#keyset[id, index]
+item_list_attrs(
+  int id: @item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+item_list_items(
+  int id: @item_list ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+labels(
+  unique int id: @label
+);
+
+#keyset[id]
+label_lifetimes(
+  int id: @label ref,
+  int lifetime: @lifetime ref
+);
+
+let_elses(
+  unique int id: @let_else
+);
+
+#keyset[id]
+let_else_block_exprs(
+  int id: @let_else ref,
+  int block_expr: @block_expr ref
+);
+
+macro_items(
+  unique int id: @macro_items
+);
+
+#keyset[id, index]
+macro_items_items(
+  int id: @macro_items ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+match_arms(
+  unique int id: @match_arm
+);
+
+#keyset[id, index]
+match_arm_attrs(
+  int id: @match_arm ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_arm_exprs(
+  int id: @match_arm ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+match_arm_guards(
+  int id: @match_arm ref,
+  int guard: @match_guard ref
+);
+
+#keyset[id]
+match_arm_pats(
+  int id: @match_arm ref,
+  int pat: @pat ref
+);
+
+match_arm_lists(
+  unique int id: @match_arm_list
+);
+
+#keyset[id, index]
+match_arm_list_arms(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int arm: @match_arm ref
+);
+
+#keyset[id, index]
+match_arm_list_attrs(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+match_guards(
+  unique int id: @match_guard
+);
+
+#keyset[id]
+match_guard_conditions(
+  int id: @match_guard ref,
+  int condition: @expr ref
+);
+
+meta(
+  unique int id: @meta
+);
+
+#keyset[id]
+meta_exprs(
+  int id: @meta ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+meta_is_unsafe(
+  int id: @meta ref
+);
+
+#keyset[id]
+meta_paths(
+  int id: @meta ref,
+  int path: @path ref
+);
+
+#keyset[id]
+meta_token_trees(
+  int id: @meta ref,
+  int token_tree: @token_tree ref
+);
+
+names(
+  unique int id: @name
+);
+
+#keyset[id]
+name_texts(
+  int id: @name ref,
+  string text: string ref
+);
+
+@param_base =
+  @param
+| @self_param
+;
+
+#keyset[id, index]
+param_base_attrs(
+  int id: @param_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+param_base_type_reprs(
+  int id: @param_base ref,
+  int type_repr: @type_repr ref
+);
+
+param_lists(
+  unique int id: @param_list
+);
+
+#keyset[id, index]
+param_list_params(
+  int id: @param_list ref,
+  int index: int ref,
+  int param: @param ref
+);
+
+#keyset[id]
+param_list_self_params(
+  int id: @param_list ref,
+  int self_param: @self_param ref
+);
+
+parenthesized_arg_lists(
+  unique int id: @parenthesized_arg_list
+);
+
+#keyset[id, index]
+parenthesized_arg_list_type_args(
+  int id: @parenthesized_arg_list ref,
+  int index: int ref,
+  int type_arg: @type_arg ref
+);
+
+@pat =
+  @box_pat
+| @const_block_pat
+| @ident_pat
+| @literal_pat
+| @macro_pat
+| @or_pat
+| @paren_pat
+| @path_pat
+| @range_pat
+| @ref_pat
+| @rest_pat
+| @slice_pat
+| @struct_pat
+| @tuple_pat
+| @tuple_struct_pat
+| @wildcard_pat
+;
+
+paths(
+  unique int id: @path
+);
+
+#keyset[id]
+path_qualifiers(
+  int id: @path ref,
+  int qualifier: @path ref
+);
+
+#keyset[id]
+path_segments_(
+  int id: @path ref,
+  int segment: @path_segment ref
+);
+
+@path_ast_node =
+  @path_expr
+| @path_pat
+| @struct_expr
+| @struct_pat
+| @tuple_struct_pat
+;
+
+#keyset[id]
+path_ast_node_paths(
+  int id: @path_ast_node ref,
+  int path: @path ref
+);
+
+path_segments(
+  unique int id: @path_segment
+);
+
+#keyset[id]
+path_segment_generic_arg_lists(
+  int id: @path_segment ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+path_segment_identifiers(
+  int id: @path_segment ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+path_segment_parenthesized_arg_lists(
+  int id: @path_segment ref,
+  int parenthesized_arg_list: @parenthesized_arg_list ref
+);
+
+#keyset[id]
+path_segment_ret_types(
+  int id: @path_segment ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+path_segment_return_type_syntaxes(
+  int id: @path_segment ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+path_segment_type_reprs(
+  int id: @path_segment ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+path_segment_trait_type_reprs(
+  int id: @path_segment ref,
+  int trait_type_repr: @path_type_repr ref
+);
+
+renames(
+  unique int id: @rename
+);
+
+#keyset[id]
+rename_names(
+  int id: @rename ref,
+  int name: @name ref
+);
+
+ret_type_reprs(
+  unique int id: @ret_type_repr
+);
+
+#keyset[id]
+ret_type_repr_type_reprs(
+  int id: @ret_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+return_type_syntaxes(
+  unique int id: @return_type_syntax
+);
+
+source_files(
+  unique int id: @source_file
+);
+
+#keyset[id, index]
+source_file_attrs(
+  int id: @source_file ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+source_file_items(
+  int id: @source_file ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+@stmt =
+  @expr_stmt
+| @item
+| @let_stmt
+;
+
+stmt_lists(
+  unique int id: @stmt_list
+);
+
+#keyset[id, index]
+stmt_list_attrs(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+stmt_list_statements(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+stmt_list_tail_exprs(
+  int id: @stmt_list ref,
+  int tail_expr: @expr ref
+);
+
+struct_expr_fields(
+  unique int id: @struct_expr_field
+);
+
+#keyset[id, index]
+struct_expr_field_attrs(
+  int id: @struct_expr_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_expr_field_exprs(
+  int id: @struct_expr_field ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+struct_expr_field_identifiers(
+  int id: @struct_expr_field ref,
+  int identifier: @name_ref ref
+);
+
+struct_expr_field_lists(
+  unique int id: @struct_expr_field_list
+);
+
+#keyset[id, index]
+struct_expr_field_list_attrs(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+struct_expr_field_list_fields(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int field: @struct_expr_field ref
+);
+
+#keyset[id]
+struct_expr_field_list_spreads(
+  int id: @struct_expr_field_list ref,
+  int spread: @expr ref
+);
+
+struct_fields(
+  unique int id: @struct_field
+);
+
+#keyset[id, index]
+struct_field_attrs(
+  int id: @struct_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_defaults(
+  int id: @struct_field ref,
+  int default: @expr ref
+);
+
+#keyset[id]
+struct_field_is_unsafe(
+  int id: @struct_field ref
+);
+
+#keyset[id]
+struct_field_names(
+  int id: @struct_field ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_field_type_reprs(
+  int id: @struct_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+struct_field_visibilities(
+  int id: @struct_field ref,
+  int visibility: @visibility ref
+);
+
+struct_pat_fields(
+  unique int id: @struct_pat_field
+);
+
+#keyset[id, index]
+struct_pat_field_attrs(
+  int id: @struct_pat_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_pat_field_identifiers(
+  int id: @struct_pat_field ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+struct_pat_field_pats(
+  int id: @struct_pat_field ref,
+  int pat: @pat ref
+);
+
+struct_pat_field_lists(
+  unique int id: @struct_pat_field_list
+);
+
+#keyset[id, index]
+struct_pat_field_list_fields(
+  int id: @struct_pat_field_list ref,
+  int index: int ref,
+  int field: @struct_pat_field ref
+);
+
+#keyset[id]
+struct_pat_field_list_rest_pats(
+  int id: @struct_pat_field_list ref,
+  int rest_pat: @rest_pat ref
+);
+
+@token =
+  @comment
+;
+
+token_trees(
+  unique int id: @token_tree
+);
+
+tuple_fields(
+  unique int id: @tuple_field
+);
+
+#keyset[id, index]
+tuple_field_attrs(
+  int id: @tuple_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+tuple_field_type_reprs(
+  int id: @tuple_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+tuple_field_visibilities(
+  int id: @tuple_field ref,
+  int visibility: @visibility ref
+);
+
+type_bounds(
+  unique int id: @type_bound
+);
+
+#keyset[id]
+type_bound_for_binders(
+  int id: @type_bound ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+type_bound_is_async(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_is_const(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_lifetimes(
+  int id: @type_bound ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+type_bound_type_reprs(
+  int id: @type_bound ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_bound_use_bound_generic_args(
+  int id: @type_bound ref,
+  int use_bound_generic_args: @use_bound_generic_args ref
+);
+
+type_bound_lists(
+  unique int id: @type_bound_list
+);
+
+#keyset[id, index]
+type_bound_list_bounds(
+  int id: @type_bound_list ref,
+  int index: int ref,
+  int bound: @type_bound ref
+);
+
+@type_repr =
+  @array_type_repr
+| @dyn_trait_type_repr
+| @fn_ptr_type_repr
+| @for_type_repr
+| @impl_trait_type_repr
+| @infer_type_repr
+| @macro_type_repr
+| @never_type_repr
+| @paren_type_repr
+| @path_type_repr
+| @ptr_type_repr
+| @ref_type_repr
+| @slice_type_repr
+| @tuple_type_repr
+;
+
+@use_bound_generic_arg =
+  @lifetime
+| @name_ref
+;
+
+use_bound_generic_args(
+  unique int id: @use_bound_generic_args
+);
+
+#keyset[id, index]
+use_bound_generic_args_use_bound_generic_args(
+  int id: @use_bound_generic_args ref,
+  int index: int ref,
+  int use_bound_generic_arg: @use_bound_generic_arg ref
+);
+
+use_trees(
+  unique int id: @use_tree
+);
+
+#keyset[id]
+use_tree_is_glob(
+  int id: @use_tree ref
+);
+
+#keyset[id]
+use_tree_paths(
+  int id: @use_tree ref,
+  int path: @path ref
+);
+
+#keyset[id]
+use_tree_renames(
+  int id: @use_tree ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+use_tree_use_tree_lists(
+  int id: @use_tree ref,
+  int use_tree_list: @use_tree_list ref
+);
+
+use_tree_lists(
+  unique int id: @use_tree_list
+);
+
+#keyset[id, index]
+use_tree_list_use_trees(
+  int id: @use_tree_list ref,
+  int index: int ref,
+  int use_tree: @use_tree ref
+);
+
+variant_lists(
+  unique int id: @variant_list
+);
+
+#keyset[id, index]
+variant_list_variants(
+  int id: @variant_list ref,
+  int index: int ref,
+  int variant: @variant ref
+);
+
+visibilities(
+  unique int id: @visibility
+);
+
+#keyset[id]
+visibility_paths(
+  int id: @visibility ref,
+  int path: @path ref
+);
+
+where_clauses(
+  unique int id: @where_clause
+);
+
+#keyset[id, index]
+where_clause_predicates(
+  int id: @where_clause ref,
+  int index: int ref,
+  int predicate: @where_pred ref
+);
+
+where_preds(
+  unique int id: @where_pred
+);
+
+#keyset[id]
+where_pred_for_binders(
+  int id: @where_pred ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+where_pred_lifetimes(
+  int id: @where_pred ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+where_pred_type_reprs(
+  int id: @where_pred ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+where_pred_type_bound_lists(
+  int id: @where_pred ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+array_expr_internals(
+  unique int id: @array_expr_internal
+);
+
+#keyset[id, index]
+array_expr_internal_attrs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+array_expr_internal_exprs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+array_expr_internal_is_semicolon(
+  int id: @array_expr_internal ref
+);
+
+array_type_reprs(
+  unique int id: @array_type_repr
+);
+
+#keyset[id]
+array_type_repr_const_args(
+  int id: @array_type_repr ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+array_type_repr_element_type_reprs(
+  int id: @array_type_repr ref,
+  int element_type_repr: @type_repr ref
+);
+
+asm_clobber_abis(
+  unique int id: @asm_clobber_abi
+);
+
+asm_consts(
+  unique int id: @asm_const
+);
+
+#keyset[id]
+asm_const_exprs(
+  int id: @asm_const ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+asm_const_is_const(
+  int id: @asm_const ref
+);
+
+asm_labels(
+  unique int id: @asm_label
+);
+
+#keyset[id]
+asm_label_block_exprs(
+  int id: @asm_label ref,
+  int block_expr: @block_expr ref
+);
+
+asm_operand_nameds(
+  unique int id: @asm_operand_named
+);
+
+#keyset[id]
+asm_operand_named_asm_operands(
+  int id: @asm_operand_named ref,
+  int asm_operand: @asm_operand ref
+);
+
+#keyset[id]
+asm_operand_named_names(
+  int id: @asm_operand_named ref,
+  int name: @name ref
+);
+
+asm_options_lists(
+  unique int id: @asm_options_list
+);
+
+#keyset[id, index]
+asm_options_list_asm_options(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int asm_option: @asm_option ref
+);
+
+asm_reg_operands(
+  unique int id: @asm_reg_operand
+);
+
+#keyset[id]
+asm_reg_operand_asm_dir_specs(
+  int id: @asm_reg_operand ref,
+  int asm_dir_spec: @asm_dir_spec ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_operand_exprs(
+  int id: @asm_reg_operand ref,
+  int asm_operand_expr: @asm_operand_expr ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_reg_specs(
+  int id: @asm_reg_operand ref,
+  int asm_reg_spec: @asm_reg_spec ref
+);
+
+asm_syms(
+  unique int id: @asm_sym
+);
+
+#keyset[id]
+asm_sym_paths(
+  int id: @asm_sym ref,
+  int path: @path ref
+);
+
+assoc_type_args(
+  unique int id: @assoc_type_arg
+);
+
+#keyset[id]
+assoc_type_arg_const_args(
+  int id: @assoc_type_arg ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+assoc_type_arg_generic_arg_lists(
+  int id: @assoc_type_arg ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+assoc_type_arg_identifiers(
+  int id: @assoc_type_arg ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+assoc_type_arg_param_lists(
+  int id: @assoc_type_arg ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+assoc_type_arg_ret_types(
+  int id: @assoc_type_arg ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_return_type_syntaxes(
+  int id: @assoc_type_arg ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+assoc_type_arg_type_reprs(
+  int id: @assoc_type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_type_bound_lists(
+  int id: @assoc_type_arg ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+await_exprs(
+  unique int id: @await_expr
+);
+
+#keyset[id, index]
+await_expr_attrs(
+  int id: @await_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+await_expr_exprs(
+  int id: @await_expr ref,
+  int expr: @expr ref
+);
+
+become_exprs(
+  unique int id: @become_expr
+);
+
+#keyset[id, index]
+become_expr_attrs(
+  int id: @become_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+become_expr_exprs(
+  int id: @become_expr ref,
+  int expr: @expr ref
+);
+
+binary_exprs(
+  unique int id: @binary_expr
+);
+
+#keyset[id, index]
+binary_expr_attrs(
+  int id: @binary_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+binary_expr_lhs(
+  int id: @binary_expr ref,
+  int lhs: @expr ref
+);
+
+#keyset[id]
+binary_expr_operator_names(
+  int id: @binary_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+binary_expr_rhs(
+  int id: @binary_expr ref,
+  int rhs: @expr ref
+);
+
+box_pats(
+  unique int id: @box_pat
+);
+
+#keyset[id]
+box_pat_pats(
+  int id: @box_pat ref,
+  int pat: @pat ref
+);
+
+break_exprs(
+  unique int id: @break_expr
+);
+
+#keyset[id, index]
+break_expr_attrs(
+  int id: @break_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+break_expr_exprs(
+  int id: @break_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+break_expr_lifetimes(
+  int id: @break_expr ref,
+  int lifetime: @lifetime ref
+);
+
+@call_expr_base =
+  @call_expr
+| @method_call_expr
+;
+
+#keyset[id]
+call_expr_base_arg_lists(
+  int id: @call_expr_base ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+call_expr_base_attrs(
+  int id: @call_expr_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+cast_exprs(
+  unique int id: @cast_expr
+);
+
+#keyset[id, index]
+cast_expr_attrs(
+  int id: @cast_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+cast_expr_exprs(
+  int id: @cast_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+cast_expr_type_reprs(
+  int id: @cast_expr ref,
+  int type_repr: @type_repr ref
+);
+
+closure_exprs(
+  unique int id: @closure_expr
+);
+
+#keyset[id]
+closure_expr_bodies(
+  int id: @closure_expr ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+closure_expr_for_binders(
+  int id: @closure_expr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+closure_expr_is_async(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_const(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_gen(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_move(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_static(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_ret_types(
+  int id: @closure_expr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+comments(
+  unique int id: @comment,
+  int parent: @ast_node ref,
+  string text: string ref
+);
+
+const_args(
+  unique int id: @const_arg
+);
+
+#keyset[id]
+const_arg_exprs(
+  int id: @const_arg ref,
+  int expr: @expr ref
+);
+
+const_block_pats(
+  unique int id: @const_block_pat
+);
+
+#keyset[id]
+const_block_pat_block_exprs(
+  int id: @const_block_pat ref,
+  int block_expr: @block_expr ref
+);
+
+#keyset[id]
+const_block_pat_is_const(
+  int id: @const_block_pat ref
+);
+
+const_params(
+  unique int id: @const_param
+);
+
+#keyset[id, index]
+const_param_attrs(
+  int id: @const_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_param_default_vals(
+  int id: @const_param ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+const_param_is_const(
+  int id: @const_param ref
+);
+
+#keyset[id]
+const_param_names(
+  int id: @const_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_param_type_reprs(
+  int id: @const_param ref,
+  int type_repr: @type_repr ref
+);
+
+continue_exprs(
+  unique int id: @continue_expr
+);
+
+#keyset[id, index]
+continue_expr_attrs(
+  int id: @continue_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+continue_expr_lifetimes(
+  int id: @continue_expr ref,
+  int lifetime: @lifetime ref
+);
+
+dyn_trait_type_reprs(
+  unique int id: @dyn_trait_type_repr
+);
+
+#keyset[id]
+dyn_trait_type_repr_type_bound_lists(
+  int id: @dyn_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+expr_stmts(
+  unique int id: @expr_stmt
+);
+
+#keyset[id]
+expr_stmt_exprs(
+  int id: @expr_stmt ref,
+  int expr: @expr ref
+);
+
+field_exprs(
+  unique int id: @field_expr
+);
+
+#keyset[id, index]
+field_expr_attrs(
+  int id: @field_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+field_expr_containers(
+  int id: @field_expr ref,
+  int container: @expr ref
+);
+
+#keyset[id]
+field_expr_identifiers(
+  int id: @field_expr ref,
+  int identifier: @name_ref ref
+);
+
+fn_ptr_type_reprs(
+  unique int id: @fn_ptr_type_repr
+);
+
+#keyset[id]
+fn_ptr_type_repr_abis(
+  int id: @fn_ptr_type_repr ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_async(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_const(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_unsafe(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_param_lists(
+  int id: @fn_ptr_type_repr ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_ret_types(
+  int id: @fn_ptr_type_repr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+for_type_reprs(
+  unique int id: @for_type_repr
+);
+
+#keyset[id]
+for_type_repr_for_binders(
+  int id: @for_type_repr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+for_type_repr_type_reprs(
+  int id: @for_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+format_args_exprs(
+  unique int id: @format_args_expr
+);
+
+#keyset[id, index]
+format_args_expr_args(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int arg: @format_args_arg ref
+);
+
+#keyset[id, index]
+format_args_expr_attrs(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+format_args_expr_templates(
+  int id: @format_args_expr ref,
+  int template: @expr ref
+);
+
+ident_pats(
+  unique int id: @ident_pat
+);
+
+#keyset[id, index]
+ident_pat_attrs(
+  int id: @ident_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ident_pat_is_mut(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_is_ref(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_names(
+  int id: @ident_pat ref,
+  int name: @name ref
+);
+
+#keyset[id]
+ident_pat_pats(
+  int id: @ident_pat ref,
+  int pat: @pat ref
+);
+
+if_exprs(
+  unique int id: @if_expr
+);
+
+#keyset[id, index]
+if_expr_attrs(
+  int id: @if_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+if_expr_conditions(
+  int id: @if_expr ref,
+  int condition: @expr ref
+);
+
+#keyset[id]
+if_expr_elses(
+  int id: @if_expr ref,
+  int else: @expr ref
+);
+
+#keyset[id]
+if_expr_thens(
+  int id: @if_expr ref,
+  int then: @block_expr ref
+);
+
+impl_trait_type_reprs(
+  unique int id: @impl_trait_type_repr
+);
+
+#keyset[id]
+impl_trait_type_repr_type_bound_lists(
+  int id: @impl_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+index_exprs(
+  unique int id: @index_expr
+);
+
+#keyset[id, index]
+index_expr_attrs(
+  int id: @index_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+index_expr_bases(
+  int id: @index_expr ref,
+  int base: @expr ref
+);
+
+#keyset[id]
+index_expr_indices(
+  int id: @index_expr ref,
+  int index: @expr ref
+);
+
+infer_type_reprs(
+  unique int id: @infer_type_repr
+);
+
+@item =
+  @adt
+| @asm_expr
+| @assoc_item
+| @extern_block
+| @extern_crate
+| @extern_item
+| @impl
+| @macro_def
+| @macro_rules
+| @module
+| @trait
+| @trait_alias
+| @use
+;
+
+#keyset[id]
+item_attribute_macro_expansions(
+  int id: @item ref,
+  int attribute_macro_expansion: @macro_items ref
+);
+
+@labelable_expr =
+  @block_expr
+| @looping_expr
+;
+
+#keyset[id]
+labelable_expr_labels(
+  int id: @labelable_expr ref,
+  int label: @label ref
+);
+
+let_exprs(
+  unique int id: @let_expr
+);
+
+#keyset[id, index]
+let_expr_attrs(
+  int id: @let_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_expr_scrutinees(
+  int id: @let_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+let_expr_pats(
+  int id: @let_expr ref,
+  int pat: @pat ref
+);
+
+let_stmts(
+  unique int id: @let_stmt
+);
+
+#keyset[id, index]
+let_stmt_attrs(
+  int id: @let_stmt ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_stmt_initializers(
+  int id: @let_stmt ref,
+  int initializer: @expr ref
+);
+
+#keyset[id]
+let_stmt_let_elses(
+  int id: @let_stmt ref,
+  int let_else: @let_else ref
+);
+
+#keyset[id]
+let_stmt_pats(
+  int id: @let_stmt ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+let_stmt_type_reprs(
+  int id: @let_stmt ref,
+  int type_repr: @type_repr ref
+);
+
+lifetimes(
+  unique int id: @lifetime
+);
+
+#keyset[id]
+lifetime_texts(
+  int id: @lifetime ref,
+  string text: string ref
+);
+
+lifetime_args(
+  unique int id: @lifetime_arg
+);
+
+#keyset[id]
+lifetime_arg_lifetimes(
+  int id: @lifetime_arg ref,
+  int lifetime: @lifetime ref
+);
+
+lifetime_params(
+  unique int id: @lifetime_param
+);
+
+#keyset[id, index]
+lifetime_param_attrs(
+  int id: @lifetime_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+lifetime_param_lifetimes(
+  int id: @lifetime_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+lifetime_param_type_bound_lists(
+  int id: @lifetime_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+literal_exprs(
+  unique int id: @literal_expr
+);
+
+#keyset[id, index]
+literal_expr_attrs(
+  int id: @literal_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+literal_expr_text_values(
+  int id: @literal_expr ref,
+  string text_value: string ref
+);
+
+literal_pats(
+  unique int id: @literal_pat
+);
+
+#keyset[id]
+literal_pat_literals(
+  int id: @literal_pat ref,
+  int literal: @literal_expr ref
+);
+
+macro_block_exprs(
+  unique int id: @macro_block_expr
+);
+
+#keyset[id, index]
+macro_block_expr_statements(
+  int id: @macro_block_expr ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+macro_block_expr_tail_exprs(
+  int id: @macro_block_expr ref,
+  int tail_expr: @expr ref
+);
+
+macro_exprs(
+  unique int id: @macro_expr
+);
+
+#keyset[id]
+macro_expr_macro_calls(
+  int id: @macro_expr ref,
+  int macro_call: @macro_call ref
+);
+
+macro_pats(
+  unique int id: @macro_pat
+);
+
+#keyset[id]
+macro_pat_macro_calls(
+  int id: @macro_pat ref,
+  int macro_call: @macro_call ref
+);
+
+macro_type_reprs(
+  unique int id: @macro_type_repr
+);
+
+#keyset[id]
+macro_type_repr_macro_calls(
+  int id: @macro_type_repr ref,
+  int macro_call: @macro_call ref
+);
+
+match_exprs(
+  unique int id: @match_expr
+);
+
+#keyset[id, index]
+match_expr_attrs(
+  int id: @match_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_expr_scrutinees(
+  int id: @match_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+match_expr_match_arm_lists(
+  int id: @match_expr ref,
+  int match_arm_list: @match_arm_list ref
+);
+
+name_refs(
+  unique int id: @name_ref
+);
+
+#keyset[id]
+name_ref_texts(
+  int id: @name_ref ref,
+  string text: string ref
+);
+
+never_type_reprs(
+  unique int id: @never_type_repr
+);
+
+offset_of_exprs(
+  unique int id: @offset_of_expr
+);
+
+#keyset[id, index]
+offset_of_expr_attrs(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+offset_of_expr_fields(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int field: @name_ref ref
+);
+
+#keyset[id]
+offset_of_expr_type_reprs(
+  int id: @offset_of_expr ref,
+  int type_repr: @type_repr ref
+);
+
+or_pats(
+  unique int id: @or_pat
+);
+
+#keyset[id, index]
+or_pat_pats(
+  int id: @or_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+params(
+  unique int id: @param
+);
+
+#keyset[id]
+param_pats(
+  int id: @param ref,
+  int pat: @pat ref
+);
+
+paren_exprs(
+  unique int id: @paren_expr
+);
+
+#keyset[id, index]
+paren_expr_attrs(
+  int id: @paren_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+paren_expr_exprs(
+  int id: @paren_expr ref,
+  int expr: @expr ref
+);
+
+paren_pats(
+  unique int id: @paren_pat
+);
+
+#keyset[id]
+paren_pat_pats(
+  int id: @paren_pat ref,
+  int pat: @pat ref
+);
+
+paren_type_reprs(
+  unique int id: @paren_type_repr
+);
+
+#keyset[id]
+paren_type_repr_type_reprs(
+  int id: @paren_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+@path_expr_base =
+  @path_expr
+;
+
+path_pats(
+  unique int id: @path_pat
+);
+
+path_type_reprs(
+  unique int id: @path_type_repr
+);
+
+#keyset[id]
+path_type_repr_paths(
+  int id: @path_type_repr ref,
+  int path: @path ref
+);
+
+prefix_exprs(
+  unique int id: @prefix_expr
+);
+
+#keyset[id, index]
+prefix_expr_attrs(
+  int id: @prefix_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+prefix_expr_exprs(
+  int id: @prefix_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+prefix_expr_operator_names(
+  int id: @prefix_expr ref,
+  string operator_name: string ref
+);
+
+ptr_type_reprs(
+  unique int id: @ptr_type_repr
+);
+
+#keyset[id]
+ptr_type_repr_is_const(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_is_mut(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_type_reprs(
+  int id: @ptr_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+range_exprs(
+  unique int id: @range_expr
+);
+
+#keyset[id, index]
+range_expr_attrs(
+  int id: @range_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+range_expr_ends(
+  int id: @range_expr ref,
+  int end: @expr ref
+);
+
+#keyset[id]
+range_expr_operator_names(
+  int id: @range_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_expr_starts(
+  int id: @range_expr ref,
+  int start: @expr ref
+);
+
+range_pats(
+  unique int id: @range_pat
+);
+
+#keyset[id]
+range_pat_ends(
+  int id: @range_pat ref,
+  int end: @pat ref
+);
+
+#keyset[id]
+range_pat_operator_names(
+  int id: @range_pat ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_pat_starts(
+  int id: @range_pat ref,
+  int start: @pat ref
+);
+
+ref_exprs(
+  unique int id: @ref_expr
+);
+
+#keyset[id, index]
+ref_expr_attrs(
+  int id: @ref_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ref_expr_exprs(
+  int id: @ref_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+ref_expr_is_const(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_mut(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_raw(
+  int id: @ref_expr ref
+);
+
+ref_pats(
+  unique int id: @ref_pat
+);
+
+#keyset[id]
+ref_pat_is_mut(
+  int id: @ref_pat ref
+);
+
+#keyset[id]
+ref_pat_pats(
+  int id: @ref_pat ref,
+  int pat: @pat ref
+);
+
+ref_type_reprs(
+  unique int id: @ref_type_repr
+);
+
+#keyset[id]
+ref_type_repr_is_mut(
+  int id: @ref_type_repr ref
+);
+
+#keyset[id]
+ref_type_repr_lifetimes(
+  int id: @ref_type_repr ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+ref_type_repr_type_reprs(
+  int id: @ref_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+rest_pats(
+  unique int id: @rest_pat
+);
+
+#keyset[id, index]
+rest_pat_attrs(
+  int id: @rest_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+return_exprs(
+  unique int id: @return_expr
+);
+
+#keyset[id, index]
+return_expr_attrs(
+  int id: @return_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+return_expr_exprs(
+  int id: @return_expr ref,
+  int expr: @expr ref
+);
+
+self_params(
+  unique int id: @self_param
+);
+
+#keyset[id]
+self_param_is_ref(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_is_mut(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_lifetimes(
+  int id: @self_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+self_param_names(
+  int id: @self_param ref,
+  int name: @name ref
+);
+
+slice_pats(
+  unique int id: @slice_pat
+);
+
+#keyset[id, index]
+slice_pat_pats(
+  int id: @slice_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+slice_type_reprs(
+  unique int id: @slice_type_repr
+);
+
+#keyset[id]
+slice_type_repr_type_reprs(
+  int id: @slice_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+struct_exprs(
+  unique int id: @struct_expr
+);
+
+#keyset[id]
+struct_expr_struct_expr_field_lists(
+  int id: @struct_expr ref,
+  int struct_expr_field_list: @struct_expr_field_list ref
+);
+
+struct_field_lists(
+  unique int id: @struct_field_list
+);
+
+#keyset[id, index]
+struct_field_list_fields(
+  int id: @struct_field_list ref,
+  int index: int ref,
+  int field: @struct_field ref
+);
+
+struct_pats(
+  unique int id: @struct_pat
+);
+
+#keyset[id]
+struct_pat_struct_pat_field_lists(
+  int id: @struct_pat ref,
+  int struct_pat_field_list: @struct_pat_field_list ref
+);
+
+try_exprs(
+  unique int id: @try_expr
+);
+
+#keyset[id, index]
+try_expr_attrs(
+  int id: @try_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+try_expr_exprs(
+  int id: @try_expr ref,
+  int expr: @expr ref
+);
+
+tuple_exprs(
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_attrs(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+tuple_expr_fields(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int field: @expr ref
+);
+
+tuple_field_lists(
+  unique int id: @tuple_field_list
+);
+
+#keyset[id, index]
+tuple_field_list_fields(
+  int id: @tuple_field_list ref,
+  int index: int ref,
+  int field: @tuple_field ref
+);
+
+tuple_pats(
+  unique int id: @tuple_pat
+);
+
+#keyset[id, index]
+tuple_pat_fields(
+  int id: @tuple_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_struct_pats(
+  unique int id: @tuple_struct_pat
+);
+
+#keyset[id, index]
+tuple_struct_pat_fields(
+  int id: @tuple_struct_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_type_reprs(
+  unique int id: @tuple_type_repr
+);
+
+#keyset[id, index]
+tuple_type_repr_fields(
+  int id: @tuple_type_repr ref,
+  int index: int ref,
+  int field: @type_repr ref
+);
+
+type_args(
+  unique int id: @type_arg
+);
+
+#keyset[id]
+type_arg_type_reprs(
+  int id: @type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+type_params(
+  unique int id: @type_param
+);
+
+#keyset[id, index]
+type_param_attrs(
+  int id: @type_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_param_default_types(
+  int id: @type_param ref,
+  int default_type: @type_repr ref
+);
+
+#keyset[id]
+type_param_names(
+  int id: @type_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_param_type_bound_lists(
+  int id: @type_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+underscore_exprs(
+  unique int id: @underscore_expr
+);
+
+#keyset[id, index]
+underscore_expr_attrs(
+  int id: @underscore_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+variants(
+  unique int id: @variant
+);
+
+#keyset[id, index]
+variant_attrs(
+  int id: @variant ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+variant_discriminants(
+  int id: @variant ref,
+  int discriminant: @expr ref
+);
+
+#keyset[id]
+variant_field_lists(
+  int id: @variant ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+variant_names(
+  int id: @variant ref,
+  int name: @name ref
+);
+
+#keyset[id]
+variant_visibilities(
+  int id: @variant ref,
+  int visibility: @visibility ref
+);
+
+wildcard_pats(
+  unique int id: @wildcard_pat
+);
+
+yeet_exprs(
+  unique int id: @yeet_expr
+);
+
+#keyset[id, index]
+yeet_expr_attrs(
+  int id: @yeet_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yeet_expr_exprs(
+  int id: @yeet_expr ref,
+  int expr: @expr ref
+);
+
+yield_exprs(
+  unique int id: @yield_expr
+);
+
+#keyset[id, index]
+yield_expr_attrs(
+  int id: @yield_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yield_expr_exprs(
+  int id: @yield_expr ref,
+  int expr: @expr ref
+);
+
+@adt =
+  @enum
+| @struct
+| @union
+;
+
+#keyset[id, index]
+adt_derive_macro_expansions(
+  int id: @adt ref,
+  int index: int ref,
+  int derive_macro_expansion: @macro_items ref
+);
+
+asm_exprs(
+  unique int id: @asm_expr
+);
+
+#keyset[id, index]
+asm_expr_asm_pieces(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int asm_piece: @asm_piece ref
+);
+
+#keyset[id, index]
+asm_expr_attrs(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+asm_expr_templates(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int template: @expr ref
+);
+
+@assoc_item =
+  @const
+| @function
+| @macro_call
+| @type_alias
+;
+
+block_exprs(
+  unique int id: @block_expr
+);
+
+#keyset[id, index]
+block_expr_attrs(
+  int id: @block_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+block_expr_is_async(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_const(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_gen(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_move(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_try(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_unsafe(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_stmt_lists(
+  int id: @block_expr ref,
+  int stmt_list: @stmt_list ref
+);
+
+call_exprs(
+  unique int id: @call_expr
+);
+
+#keyset[id]
+call_expr_functions(
+  int id: @call_expr ref,
+  int function: @expr ref
+);
+
+extern_blocks(
+  unique int id: @extern_block
+);
+
+#keyset[id]
+extern_block_abis(
+  int id: @extern_block ref,
+  int abi: @abi ref
+);
+
+#keyset[id, index]
+extern_block_attrs(
+  int id: @extern_block ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_block_extern_item_lists(
+  int id: @extern_block ref,
+  int extern_item_list: @extern_item_list ref
+);
+
+#keyset[id]
+extern_block_is_unsafe(
+  int id: @extern_block ref
+);
+
+extern_crates(
+  unique int id: @extern_crate
+);
+
+#keyset[id, index]
+extern_crate_attrs(
+  int id: @extern_crate ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_crate_identifiers(
+  int id: @extern_crate ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+extern_crate_renames(
+  int id: @extern_crate ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+extern_crate_visibilities(
+  int id: @extern_crate ref,
+  int visibility: @visibility ref
+);
+
+@extern_item =
+  @function
+| @macro_call
+| @static
+| @type_alias
+;
+
+impls(
+  unique int id: @impl
+);
+
+#keyset[id]
+impl_assoc_item_lists(
+  int id: @impl ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+impl_attrs(
+  int id: @impl ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+impl_generic_param_lists(
+  int id: @impl ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+impl_is_const(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_default(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_unsafe(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_self_ties(
+  int id: @impl ref,
+  int self_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_traits(
+  int id: @impl ref,
+  int trait: @type_repr ref
+);
+
+#keyset[id]
+impl_visibilities(
+  int id: @impl ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+impl_where_clauses(
+  int id: @impl ref,
+  int where_clause: @where_clause ref
+);
+
+@looping_expr =
+  @for_expr
+| @loop_expr
+| @while_expr
+;
+
+#keyset[id]
+looping_expr_loop_bodies(
+  int id: @looping_expr ref,
+  int loop_body: @block_expr ref
+);
+
+macro_defs(
+  unique int id: @macro_def
+);
+
+#keyset[id]
+macro_def_args(
+  int id: @macro_def ref,
+  int args: @token_tree ref
+);
+
+#keyset[id, index]
+macro_def_attrs(
+  int id: @macro_def ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_def_bodies(
+  int id: @macro_def ref,
+  int body: @token_tree ref
+);
+
+#keyset[id]
+macro_def_names(
+  int id: @macro_def ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_def_visibilities(
+  int id: @macro_def ref,
+  int visibility: @visibility ref
+);
+
+macro_rules(
+  unique int id: @macro_rules
+);
+
+#keyset[id, index]
+macro_rules_attrs(
+  int id: @macro_rules ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_rules_names(
+  int id: @macro_rules ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_rules_token_trees(
+  int id: @macro_rules ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_rules_visibilities(
+  int id: @macro_rules ref,
+  int visibility: @visibility ref
+);
+
+method_call_exprs(
+  unique int id: @method_call_expr
+);
+
+#keyset[id]
+method_call_expr_generic_arg_lists(
+  int id: @method_call_expr ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+method_call_expr_identifiers(
+  int id: @method_call_expr ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+method_call_expr_receivers(
+  int id: @method_call_expr ref,
+  int receiver: @expr ref
+);
+
+modules(
+  unique int id: @module
+);
+
+#keyset[id, index]
+module_attrs(
+  int id: @module ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+module_item_lists(
+  int id: @module ref,
+  int item_list: @item_list ref
+);
+
+#keyset[id]
+module_names(
+  int id: @module ref,
+  int name: @name ref
+);
+
+#keyset[id]
+module_visibilities(
+  int id: @module ref,
+  int visibility: @visibility ref
+);
+
+path_exprs(
+  unique int id: @path_expr
+);
+
+#keyset[id, index]
+path_expr_attrs(
+  int id: @path_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+traits(
+  unique int id: @trait
+);
+
+#keyset[id]
+trait_assoc_item_lists(
+  int id: @trait ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+trait_attrs(
+  int id: @trait ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_generic_param_lists(
+  int id: @trait ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_is_auto(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_is_unsafe(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_names(
+  int id: @trait ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_type_bound_lists(
+  int id: @trait ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_visibilities(
+  int id: @trait ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_where_clauses(
+  int id: @trait ref,
+  int where_clause: @where_clause ref
+);
+
+trait_aliases(
+  unique int id: @trait_alias
+);
+
+#keyset[id, index]
+trait_alias_attrs(
+  int id: @trait_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_alias_generic_param_lists(
+  int id: @trait_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_alias_names(
+  int id: @trait_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_alias_type_bound_lists(
+  int id: @trait_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_alias_visibilities(
+  int id: @trait_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_alias_where_clauses(
+  int id: @trait_alias ref,
+  int where_clause: @where_clause ref
+);
+
+uses(
+  unique int id: @use
+);
+
+#keyset[id, index]
+use_attrs(
+  int id: @use ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+use_use_trees(
+  int id: @use ref,
+  int use_tree: @use_tree ref
+);
+
+#keyset[id]
+use_visibilities(
+  int id: @use ref,
+  int visibility: @visibility ref
+);
+
+consts(
+  unique int id: @const
+);
+
+#keyset[id, index]
+const_attrs(
+  int id: @const ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_bodies(
+  int id: @const ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+const_generic_param_lists(
+  int id: @const ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+const_is_const(
+  int id: @const ref
+);
+
+#keyset[id]
+const_is_default(
+  int id: @const ref
+);
+
+#keyset[id]
+const_names(
+  int id: @const ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_type_reprs(
+  int id: @const ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+const_visibilities(
+  int id: @const ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+const_where_clauses(
+  int id: @const ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+const_has_implementation(
+  int id: @const ref
+);
+
+enums(
+  unique int id: @enum
+);
+
+#keyset[id, index]
+enum_attrs(
+  int id: @enum ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+enum_generic_param_lists(
+  int id: @enum ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+enum_names(
+  int id: @enum ref,
+  int name: @name ref
+);
+
+#keyset[id]
+enum_variant_lists(
+  int id: @enum ref,
+  int variant_list: @variant_list ref
+);
+
+#keyset[id]
+enum_visibilities(
+  int id: @enum ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+enum_where_clauses(
+  int id: @enum ref,
+  int where_clause: @where_clause ref
+);
+
+for_exprs(
+  unique int id: @for_expr
+);
+
+#keyset[id, index]
+for_expr_attrs(
+  int id: @for_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+for_expr_iterables(
+  int id: @for_expr ref,
+  int iterable: @expr ref
+);
+
+#keyset[id]
+for_expr_pats(
+  int id: @for_expr ref,
+  int pat: @pat ref
+);
+
+functions(
+  unique int id: @function
+);
+
+#keyset[id]
+function_abis(
+  int id: @function ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+function_bodies(
+  int id: @function ref,
+  int body: @block_expr ref
+);
+
+#keyset[id]
+function_generic_param_lists(
+  int id: @function ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+function_is_async(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_const(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_default(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_gen(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_unsafe(
+  int id: @function ref
+);
+
+#keyset[id]
+function_names(
+  int id: @function ref,
+  int name: @name ref
+);
+
+#keyset[id]
+function_ret_types(
+  int id: @function ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+function_visibilities(
+  int id: @function ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+function_where_clauses(
+  int id: @function ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+function_has_implementation(
+  int id: @function ref
+);
+
+loop_exprs(
+  unique int id: @loop_expr
+);
+
+#keyset[id, index]
+loop_expr_attrs(
+  int id: @loop_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+macro_calls(
+  unique int id: @macro_call
+);
+
+#keyset[id, index]
+macro_call_attrs(
+  int id: @macro_call ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_call_paths(
+  int id: @macro_call ref,
+  int path: @path ref
+);
+
+#keyset[id]
+macro_call_token_trees(
+  int id: @macro_call ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_call_macro_call_expansions(
+  int id: @macro_call ref,
+  int macro_call_expansion: @ast_node ref
+);
+
+statics(
+  unique int id: @static
+);
+
+#keyset[id, index]
+static_attrs(
+  int id: @static ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+static_bodies(
+  int id: @static ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+static_is_mut(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_static(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_unsafe(
+  int id: @static ref
+);
+
+#keyset[id]
+static_names(
+  int id: @static ref,
+  int name: @name ref
+);
+
+#keyset[id]
+static_type_reprs(
+  int id: @static ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+static_visibilities(
+  int id: @static ref,
+  int visibility: @visibility ref
+);
+
+structs(
+  unique int id: @struct
+);
+
+#keyset[id, index]
+struct_attrs(
+  int id: @struct ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_lists_(
+  int id: @struct ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+struct_generic_param_lists(
+  int id: @struct ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+struct_names(
+  int id: @struct ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_visibilities(
+  int id: @struct ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+struct_where_clauses(
+  int id: @struct ref,
+  int where_clause: @where_clause ref
+);
+
+type_aliases(
+  unique int id: @type_alias
+);
+
+#keyset[id, index]
+type_alias_attrs(
+  int id: @type_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_alias_generic_param_lists(
+  int id: @type_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_alias_is_default(
+  int id: @type_alias ref
+);
+
+#keyset[id]
+type_alias_names(
+  int id: @type_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_alias_type_reprs(
+  int id: @type_alias ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_alias_type_bound_lists(
+  int id: @type_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+type_alias_visibilities(
+  int id: @type_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_alias_where_clauses(
+  int id: @type_alias ref,
+  int where_clause: @where_clause ref
+);
+
+unions(
+  unique int id: @union
+);
+
+#keyset[id, index]
+union_attrs(
+  int id: @union ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+union_generic_param_lists(
+  int id: @union ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+union_names(
+  int id: @union ref,
+  int name: @name ref
+);
+
+#keyset[id]
+union_struct_field_lists(
+  int id: @union ref,
+  int struct_field_list: @struct_field_list ref
+);
+
+#keyset[id]
+union_visibilities(
+  int id: @union ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+union_where_clauses(
+  int id: @union ref,
+  int where_clause: @where_clause ref
+);
+
+while_exprs(
+  unique int id: @while_expr
+);
+
+#keyset[id, index]
+while_expr_attrs(
+  int id: @while_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+while_expr_conditions(
+  int id: @while_expr ref,
+  int condition: @expr ref
+);
diff --git a/rust/downgrades/dfade44a27bd44db996ae8c5095a11effc883aba/rust.dbscheme b/rust/downgrades/dfade44a27bd44db996ae8c5095a11effc883aba/rust.dbscheme
new file mode 100644
index 00000000000..b41e55c0dba
--- /dev/null
+++ b/rust/downgrades/dfade44a27bd44db996ae8c5095a11effc883aba/rust.dbscheme
@@ -0,0 +1,3644 @@
+// generated by codegen, do not edit
+
+// from ../shared/tree-sitter-extractor/src/generator/prefix.dbscheme
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Empty location -*/
+
+empty_location(
+  int location: @location_default ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- Diagnostic messages: severity -*/
+
+case @diagnostic.severity of
+  10 = @diagnostic_debug
+| 20 = @diagnostic_info
+| 30 = @diagnostic_warning
+| 40 = @diagnostic_error
+;
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error;
+
+/*- Database metadata -*/
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+overlayChangedFiles(
+  string path: string ref
+);
+
+
+// from prefix.dbscheme
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_default ref
+);
+
+
+// from schema
+
+@element =
+  @extractor_step
+| @locatable
+| @named_crate
+| @unextracted
+;
+
+extractor_steps(
+  unique int id: @extractor_step,
+  string action: string ref,
+  int duration_ms: int ref
+);
+
+#keyset[id]
+extractor_step_files(
+  int id: @extractor_step ref,
+  int file: @file ref
+);
+
+@locatable =
+  @ast_node
+| @crate
+;
+
+named_crates(
+  unique int id: @named_crate,
+  string name: string ref,
+  int crate: @crate ref
+);
+
+@unextracted =
+  @missing
+| @unimplemented
+;
+
+@ast_node =
+  @abi
+| @addressable
+| @arg_list
+| @asm_dir_spec
+| @asm_operand
+| @asm_operand_expr
+| @asm_option
+| @asm_piece
+| @asm_reg_spec
+| @assoc_item_list
+| @attr
+| @callable
+| @expr
+| @extern_item_list
+| @field_list
+| @for_binder
+| @format_args_arg
+| @generic_arg
+| @generic_arg_list
+| @generic_param
+| @generic_param_list
+| @item_list
+| @label
+| @let_else
+| @macro_items
+| @match_arm
+| @match_arm_list
+| @match_guard
+| @meta
+| @name
+| @param_base
+| @param_list
+| @parenthesized_arg_list
+| @pat
+| @path
+| @path_segment
+| @rename
+| @resolvable
+| @ret_type_repr
+| @return_type_syntax
+| @source_file
+| @stmt
+| @stmt_list
+| @struct_expr_field
+| @struct_expr_field_list
+| @struct_field
+| @struct_pat_field
+| @struct_pat_field_list
+| @token
+| @token_tree
+| @tuple_field
+| @type_bound
+| @type_bound_list
+| @type_repr
+| @use_bound_generic_arg
+| @use_bound_generic_args
+| @use_tree
+| @use_tree_list
+| @variant_list
+| @visibility
+| @where_clause
+| @where_pred
+;
+
+crates(
+  unique int id: @crate
+);
+
+#keyset[id]
+crate_names(
+  int id: @crate ref,
+  string name: string ref
+);
+
+#keyset[id]
+crate_versions(
+  int id: @crate ref,
+  string version: string ref
+);
+
+#keyset[id, index]
+crate_cfg_options(
+  int id: @crate ref,
+  int index: int ref,
+  string cfg_option: string ref
+);
+
+#keyset[id, index]
+crate_named_dependencies(
+  int id: @crate ref,
+  int index: int ref,
+  int named_dependency: @named_crate ref
+);
+
+missings(
+  unique int id: @missing
+);
+
+unimplementeds(
+  unique int id: @unimplemented
+);
+
+abis(
+  unique int id: @abi
+);
+
+#keyset[id]
+abi_abi_strings(
+  int id: @abi ref,
+  string abi_string: string ref
+);
+
+@addressable =
+  @item
+| @variant
+;
+
+#keyset[id]
+addressable_extended_canonical_paths(
+  int id: @addressable ref,
+  string extended_canonical_path: string ref
+);
+
+#keyset[id]
+addressable_crate_origins(
+  int id: @addressable ref,
+  string crate_origin: string ref
+);
+
+arg_lists(
+  unique int id: @arg_list
+);
+
+#keyset[id, index]
+arg_list_args(
+  int id: @arg_list ref,
+  int index: int ref,
+  int arg: @expr ref
+);
+
+asm_dir_specs(
+  unique int id: @asm_dir_spec
+);
+
+@asm_operand =
+  @asm_const
+| @asm_label
+| @asm_reg_operand
+| @asm_sym
+;
+
+asm_operand_exprs(
+  unique int id: @asm_operand_expr
+);
+
+#keyset[id]
+asm_operand_expr_in_exprs(
+  int id: @asm_operand_expr ref,
+  int in_expr: @expr ref
+);
+
+#keyset[id]
+asm_operand_expr_out_exprs(
+  int id: @asm_operand_expr ref,
+  int out_expr: @expr ref
+);
+
+asm_options(
+  unique int id: @asm_option
+);
+
+#keyset[id]
+asm_option_is_raw(
+  int id: @asm_option ref
+);
+
+@asm_piece =
+  @asm_clobber_abi
+| @asm_operand_named
+| @asm_options_list
+;
+
+asm_reg_specs(
+  unique int id: @asm_reg_spec
+);
+
+#keyset[id]
+asm_reg_spec_identifiers(
+  int id: @asm_reg_spec ref,
+  int identifier: @name_ref ref
+);
+
+assoc_item_lists(
+  unique int id: @assoc_item_list
+);
+
+#keyset[id, index]
+assoc_item_list_assoc_items(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int assoc_item: @assoc_item ref
+);
+
+#keyset[id, index]
+assoc_item_list_attrs(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+attrs(
+  unique int id: @attr
+);
+
+#keyset[id]
+attr_meta(
+  int id: @attr ref,
+  int meta: @meta ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_param_lists(
+  int id: @callable ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id, index]
+callable_attrs(
+  int id: @callable ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+@expr =
+  @array_expr_internal
+| @asm_expr
+| @await_expr
+| @become_expr
+| @binary_expr
+| @break_expr
+| @call_expr_base
+| @cast_expr
+| @closure_expr
+| @continue_expr
+| @field_expr
+| @format_args_expr
+| @if_expr
+| @index_expr
+| @labelable_expr
+| @let_expr
+| @literal_expr
+| @macro_block_expr
+| @macro_expr
+| @match_expr
+| @offset_of_expr
+| @paren_expr
+| @path_expr_base
+| @prefix_expr
+| @range_expr
+| @ref_expr
+| @return_expr
+| @struct_expr
+| @try_expr
+| @tuple_expr
+| @underscore_expr
+| @yeet_expr
+| @yield_expr
+;
+
+extern_item_lists(
+  unique int id: @extern_item_list
+);
+
+#keyset[id, index]
+extern_item_list_attrs(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+extern_item_list_extern_items(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int extern_item: @extern_item ref
+);
+
+@field_list =
+  @struct_field_list
+| @tuple_field_list
+;
+
+for_binders(
+  unique int id: @for_binder
+);
+
+#keyset[id]
+for_binder_generic_param_lists(
+  int id: @for_binder ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+format_args_args(
+  unique int id: @format_args_arg
+);
+
+#keyset[id]
+format_args_arg_exprs(
+  int id: @format_args_arg ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+format_args_arg_names(
+  int id: @format_args_arg ref,
+  int name: @name ref
+);
+
+@generic_arg =
+  @assoc_type_arg
+| @const_arg
+| @lifetime_arg
+| @type_arg
+;
+
+generic_arg_lists(
+  unique int id: @generic_arg_list
+);
+
+#keyset[id, index]
+generic_arg_list_generic_args(
+  int id: @generic_arg_list ref,
+  int index: int ref,
+  int generic_arg: @generic_arg ref
+);
+
+@generic_param =
+  @const_param
+| @lifetime_param
+| @type_param
+;
+
+generic_param_lists(
+  unique int id: @generic_param_list
+);
+
+#keyset[id, index]
+generic_param_list_generic_params(
+  int id: @generic_param_list ref,
+  int index: int ref,
+  int generic_param: @generic_param ref
+);
+
+item_lists(
+  unique int id: @item_list
+);
+
+#keyset[id, index]
+item_list_attrs(
+  int id: @item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+item_list_items(
+  int id: @item_list ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+labels(
+  unique int id: @label
+);
+
+#keyset[id]
+label_lifetimes(
+  int id: @label ref,
+  int lifetime: @lifetime ref
+);
+
+let_elses(
+  unique int id: @let_else
+);
+
+#keyset[id]
+let_else_block_exprs(
+  int id: @let_else ref,
+  int block_expr: @block_expr ref
+);
+
+macro_items(
+  unique int id: @macro_items
+);
+
+#keyset[id, index]
+macro_items_items(
+  int id: @macro_items ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+match_arms(
+  unique int id: @match_arm
+);
+
+#keyset[id, index]
+match_arm_attrs(
+  int id: @match_arm ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_arm_exprs(
+  int id: @match_arm ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+match_arm_guards(
+  int id: @match_arm ref,
+  int guard: @match_guard ref
+);
+
+#keyset[id]
+match_arm_pats(
+  int id: @match_arm ref,
+  int pat: @pat ref
+);
+
+match_arm_lists(
+  unique int id: @match_arm_list
+);
+
+#keyset[id, index]
+match_arm_list_arms(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int arm: @match_arm ref
+);
+
+#keyset[id, index]
+match_arm_list_attrs(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+match_guards(
+  unique int id: @match_guard
+);
+
+#keyset[id]
+match_guard_conditions(
+  int id: @match_guard ref,
+  int condition: @expr ref
+);
+
+meta(
+  unique int id: @meta
+);
+
+#keyset[id]
+meta_exprs(
+  int id: @meta ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+meta_is_unsafe(
+  int id: @meta ref
+);
+
+#keyset[id]
+meta_paths(
+  int id: @meta ref,
+  int path: @path ref
+);
+
+#keyset[id]
+meta_token_trees(
+  int id: @meta ref,
+  int token_tree: @token_tree ref
+);
+
+names(
+  unique int id: @name
+);
+
+#keyset[id]
+name_texts(
+  int id: @name ref,
+  string text: string ref
+);
+
+@param_base =
+  @param
+| @self_param
+;
+
+#keyset[id, index]
+param_base_attrs(
+  int id: @param_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+param_base_type_reprs(
+  int id: @param_base ref,
+  int type_repr: @type_repr ref
+);
+
+param_lists(
+  unique int id: @param_list
+);
+
+#keyset[id, index]
+param_list_params(
+  int id: @param_list ref,
+  int index: int ref,
+  int param: @param ref
+);
+
+#keyset[id]
+param_list_self_params(
+  int id: @param_list ref,
+  int self_param: @self_param ref
+);
+
+parenthesized_arg_lists(
+  unique int id: @parenthesized_arg_list
+);
+
+#keyset[id, index]
+parenthesized_arg_list_type_args(
+  int id: @parenthesized_arg_list ref,
+  int index: int ref,
+  int type_arg: @type_arg ref
+);
+
+@pat =
+  @box_pat
+| @const_block_pat
+| @ident_pat
+| @literal_pat
+| @macro_pat
+| @or_pat
+| @paren_pat
+| @path_pat
+| @range_pat
+| @ref_pat
+| @rest_pat
+| @slice_pat
+| @struct_pat
+| @tuple_pat
+| @tuple_struct_pat
+| @wildcard_pat
+;
+
+paths(
+  unique int id: @path
+);
+
+#keyset[id]
+path_qualifiers(
+  int id: @path ref,
+  int qualifier: @path ref
+);
+
+#keyset[id]
+path_segments_(
+  int id: @path ref,
+  int segment: @path_segment ref
+);
+
+path_segments(
+  unique int id: @path_segment
+);
+
+#keyset[id]
+path_segment_generic_arg_lists(
+  int id: @path_segment ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+path_segment_identifiers(
+  int id: @path_segment ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+path_segment_parenthesized_arg_lists(
+  int id: @path_segment ref,
+  int parenthesized_arg_list: @parenthesized_arg_list ref
+);
+
+#keyset[id]
+path_segment_ret_types(
+  int id: @path_segment ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+path_segment_return_type_syntaxes(
+  int id: @path_segment ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+path_segment_type_reprs(
+  int id: @path_segment ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+path_segment_trait_type_reprs(
+  int id: @path_segment ref,
+  int trait_type_repr: @path_type_repr ref
+);
+
+renames(
+  unique int id: @rename
+);
+
+#keyset[id]
+rename_names(
+  int id: @rename ref,
+  int name: @name ref
+);
+
+@resolvable =
+  @method_call_expr
+| @path_ast_node
+;
+
+#keyset[id]
+resolvable_resolved_paths(
+  int id: @resolvable ref,
+  string resolved_path: string ref
+);
+
+#keyset[id]
+resolvable_resolved_crate_origins(
+  int id: @resolvable ref,
+  string resolved_crate_origin: string ref
+);
+
+ret_type_reprs(
+  unique int id: @ret_type_repr
+);
+
+#keyset[id]
+ret_type_repr_type_reprs(
+  int id: @ret_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+return_type_syntaxes(
+  unique int id: @return_type_syntax
+);
+
+source_files(
+  unique int id: @source_file
+);
+
+#keyset[id, index]
+source_file_attrs(
+  int id: @source_file ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+source_file_items(
+  int id: @source_file ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+@stmt =
+  @expr_stmt
+| @item
+| @let_stmt
+;
+
+stmt_lists(
+  unique int id: @stmt_list
+);
+
+#keyset[id, index]
+stmt_list_attrs(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+stmt_list_statements(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+stmt_list_tail_exprs(
+  int id: @stmt_list ref,
+  int tail_expr: @expr ref
+);
+
+struct_expr_fields(
+  unique int id: @struct_expr_field
+);
+
+#keyset[id, index]
+struct_expr_field_attrs(
+  int id: @struct_expr_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_expr_field_exprs(
+  int id: @struct_expr_field ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+struct_expr_field_identifiers(
+  int id: @struct_expr_field ref,
+  int identifier: @name_ref ref
+);
+
+struct_expr_field_lists(
+  unique int id: @struct_expr_field_list
+);
+
+#keyset[id, index]
+struct_expr_field_list_attrs(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+struct_expr_field_list_fields(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int field: @struct_expr_field ref
+);
+
+#keyset[id]
+struct_expr_field_list_spreads(
+  int id: @struct_expr_field_list ref,
+  int spread: @expr ref
+);
+
+struct_fields(
+  unique int id: @struct_field
+);
+
+#keyset[id, index]
+struct_field_attrs(
+  int id: @struct_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_defaults(
+  int id: @struct_field ref,
+  int default: @expr ref
+);
+
+#keyset[id]
+struct_field_is_unsafe(
+  int id: @struct_field ref
+);
+
+#keyset[id]
+struct_field_names(
+  int id: @struct_field ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_field_type_reprs(
+  int id: @struct_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+struct_field_visibilities(
+  int id: @struct_field ref,
+  int visibility: @visibility ref
+);
+
+struct_pat_fields(
+  unique int id: @struct_pat_field
+);
+
+#keyset[id, index]
+struct_pat_field_attrs(
+  int id: @struct_pat_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_pat_field_identifiers(
+  int id: @struct_pat_field ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+struct_pat_field_pats(
+  int id: @struct_pat_field ref,
+  int pat: @pat ref
+);
+
+struct_pat_field_lists(
+  unique int id: @struct_pat_field_list
+);
+
+#keyset[id, index]
+struct_pat_field_list_fields(
+  int id: @struct_pat_field_list ref,
+  int index: int ref,
+  int field: @struct_pat_field ref
+);
+
+#keyset[id]
+struct_pat_field_list_rest_pats(
+  int id: @struct_pat_field_list ref,
+  int rest_pat: @rest_pat ref
+);
+
+@token =
+  @comment
+;
+
+token_trees(
+  unique int id: @token_tree
+);
+
+tuple_fields(
+  unique int id: @tuple_field
+);
+
+#keyset[id, index]
+tuple_field_attrs(
+  int id: @tuple_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+tuple_field_type_reprs(
+  int id: @tuple_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+tuple_field_visibilities(
+  int id: @tuple_field ref,
+  int visibility: @visibility ref
+);
+
+type_bounds(
+  unique int id: @type_bound
+);
+
+#keyset[id]
+type_bound_for_binders(
+  int id: @type_bound ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+type_bound_is_async(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_is_const(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_lifetimes(
+  int id: @type_bound ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+type_bound_type_reprs(
+  int id: @type_bound ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_bound_use_bound_generic_args(
+  int id: @type_bound ref,
+  int use_bound_generic_args: @use_bound_generic_args ref
+);
+
+type_bound_lists(
+  unique int id: @type_bound_list
+);
+
+#keyset[id, index]
+type_bound_list_bounds(
+  int id: @type_bound_list ref,
+  int index: int ref,
+  int bound: @type_bound ref
+);
+
+@type_repr =
+  @array_type_repr
+| @dyn_trait_type_repr
+| @fn_ptr_type_repr
+| @for_type_repr
+| @impl_trait_type_repr
+| @infer_type_repr
+| @macro_type_repr
+| @never_type_repr
+| @paren_type_repr
+| @path_type_repr
+| @ptr_type_repr
+| @ref_type_repr
+| @slice_type_repr
+| @tuple_type_repr
+;
+
+@use_bound_generic_arg =
+  @lifetime
+| @name_ref
+;
+
+use_bound_generic_args(
+  unique int id: @use_bound_generic_args
+);
+
+#keyset[id, index]
+use_bound_generic_args_use_bound_generic_args(
+  int id: @use_bound_generic_args ref,
+  int index: int ref,
+  int use_bound_generic_arg: @use_bound_generic_arg ref
+);
+
+use_trees(
+  unique int id: @use_tree
+);
+
+#keyset[id]
+use_tree_is_glob(
+  int id: @use_tree ref
+);
+
+#keyset[id]
+use_tree_paths(
+  int id: @use_tree ref,
+  int path: @path ref
+);
+
+#keyset[id]
+use_tree_renames(
+  int id: @use_tree ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+use_tree_use_tree_lists(
+  int id: @use_tree ref,
+  int use_tree_list: @use_tree_list ref
+);
+
+use_tree_lists(
+  unique int id: @use_tree_list
+);
+
+#keyset[id, index]
+use_tree_list_use_trees(
+  int id: @use_tree_list ref,
+  int index: int ref,
+  int use_tree: @use_tree ref
+);
+
+variant_lists(
+  unique int id: @variant_list
+);
+
+#keyset[id, index]
+variant_list_variants(
+  int id: @variant_list ref,
+  int index: int ref,
+  int variant: @variant ref
+);
+
+visibilities(
+  unique int id: @visibility
+);
+
+#keyset[id]
+visibility_paths(
+  int id: @visibility ref,
+  int path: @path ref
+);
+
+where_clauses(
+  unique int id: @where_clause
+);
+
+#keyset[id, index]
+where_clause_predicates(
+  int id: @where_clause ref,
+  int index: int ref,
+  int predicate: @where_pred ref
+);
+
+where_preds(
+  unique int id: @where_pred
+);
+
+#keyset[id]
+where_pred_for_binders(
+  int id: @where_pred ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+where_pred_lifetimes(
+  int id: @where_pred ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+where_pred_type_reprs(
+  int id: @where_pred ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+where_pred_type_bound_lists(
+  int id: @where_pred ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+array_expr_internals(
+  unique int id: @array_expr_internal
+);
+
+#keyset[id, index]
+array_expr_internal_attrs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+array_expr_internal_exprs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+array_expr_internal_is_semicolon(
+  int id: @array_expr_internal ref
+);
+
+array_type_reprs(
+  unique int id: @array_type_repr
+);
+
+#keyset[id]
+array_type_repr_const_args(
+  int id: @array_type_repr ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+array_type_repr_element_type_reprs(
+  int id: @array_type_repr ref,
+  int element_type_repr: @type_repr ref
+);
+
+asm_clobber_abis(
+  unique int id: @asm_clobber_abi
+);
+
+asm_consts(
+  unique int id: @asm_const
+);
+
+#keyset[id]
+asm_const_exprs(
+  int id: @asm_const ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+asm_const_is_const(
+  int id: @asm_const ref
+);
+
+asm_labels(
+  unique int id: @asm_label
+);
+
+#keyset[id]
+asm_label_block_exprs(
+  int id: @asm_label ref,
+  int block_expr: @block_expr ref
+);
+
+asm_operand_nameds(
+  unique int id: @asm_operand_named
+);
+
+#keyset[id]
+asm_operand_named_asm_operands(
+  int id: @asm_operand_named ref,
+  int asm_operand: @asm_operand ref
+);
+
+#keyset[id]
+asm_operand_named_names(
+  int id: @asm_operand_named ref,
+  int name: @name ref
+);
+
+asm_options_lists(
+  unique int id: @asm_options_list
+);
+
+#keyset[id, index]
+asm_options_list_asm_options(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int asm_option: @asm_option ref
+);
+
+asm_reg_operands(
+  unique int id: @asm_reg_operand
+);
+
+#keyset[id]
+asm_reg_operand_asm_dir_specs(
+  int id: @asm_reg_operand ref,
+  int asm_dir_spec: @asm_dir_spec ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_operand_exprs(
+  int id: @asm_reg_operand ref,
+  int asm_operand_expr: @asm_operand_expr ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_reg_specs(
+  int id: @asm_reg_operand ref,
+  int asm_reg_spec: @asm_reg_spec ref
+);
+
+asm_syms(
+  unique int id: @asm_sym
+);
+
+#keyset[id]
+asm_sym_paths(
+  int id: @asm_sym ref,
+  int path: @path ref
+);
+
+assoc_type_args(
+  unique int id: @assoc_type_arg
+);
+
+#keyset[id]
+assoc_type_arg_const_args(
+  int id: @assoc_type_arg ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+assoc_type_arg_generic_arg_lists(
+  int id: @assoc_type_arg ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+assoc_type_arg_identifiers(
+  int id: @assoc_type_arg ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+assoc_type_arg_param_lists(
+  int id: @assoc_type_arg ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+assoc_type_arg_ret_types(
+  int id: @assoc_type_arg ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_return_type_syntaxes(
+  int id: @assoc_type_arg ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+assoc_type_arg_type_reprs(
+  int id: @assoc_type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_type_bound_lists(
+  int id: @assoc_type_arg ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+await_exprs(
+  unique int id: @await_expr
+);
+
+#keyset[id, index]
+await_expr_attrs(
+  int id: @await_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+await_expr_exprs(
+  int id: @await_expr ref,
+  int expr: @expr ref
+);
+
+become_exprs(
+  unique int id: @become_expr
+);
+
+#keyset[id, index]
+become_expr_attrs(
+  int id: @become_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+become_expr_exprs(
+  int id: @become_expr ref,
+  int expr: @expr ref
+);
+
+binary_exprs(
+  unique int id: @binary_expr
+);
+
+#keyset[id, index]
+binary_expr_attrs(
+  int id: @binary_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+binary_expr_lhs(
+  int id: @binary_expr ref,
+  int lhs: @expr ref
+);
+
+#keyset[id]
+binary_expr_operator_names(
+  int id: @binary_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+binary_expr_rhs(
+  int id: @binary_expr ref,
+  int rhs: @expr ref
+);
+
+box_pats(
+  unique int id: @box_pat
+);
+
+#keyset[id]
+box_pat_pats(
+  int id: @box_pat ref,
+  int pat: @pat ref
+);
+
+break_exprs(
+  unique int id: @break_expr
+);
+
+#keyset[id, index]
+break_expr_attrs(
+  int id: @break_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+break_expr_exprs(
+  int id: @break_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+break_expr_lifetimes(
+  int id: @break_expr ref,
+  int lifetime: @lifetime ref
+);
+
+@call_expr_base =
+  @call_expr
+| @method_call_expr
+;
+
+#keyset[id]
+call_expr_base_arg_lists(
+  int id: @call_expr_base ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+call_expr_base_attrs(
+  int id: @call_expr_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+cast_exprs(
+  unique int id: @cast_expr
+);
+
+#keyset[id, index]
+cast_expr_attrs(
+  int id: @cast_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+cast_expr_exprs(
+  int id: @cast_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+cast_expr_type_reprs(
+  int id: @cast_expr ref,
+  int type_repr: @type_repr ref
+);
+
+closure_exprs(
+  unique int id: @closure_expr
+);
+
+#keyset[id]
+closure_expr_bodies(
+  int id: @closure_expr ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+closure_expr_for_binders(
+  int id: @closure_expr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+closure_expr_is_async(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_const(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_gen(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_move(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_static(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_ret_types(
+  int id: @closure_expr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+comments(
+  unique int id: @comment,
+  int parent: @ast_node ref,
+  string text: string ref
+);
+
+const_args(
+  unique int id: @const_arg
+);
+
+#keyset[id]
+const_arg_exprs(
+  int id: @const_arg ref,
+  int expr: @expr ref
+);
+
+const_block_pats(
+  unique int id: @const_block_pat
+);
+
+#keyset[id]
+const_block_pat_block_exprs(
+  int id: @const_block_pat ref,
+  int block_expr: @block_expr ref
+);
+
+#keyset[id]
+const_block_pat_is_const(
+  int id: @const_block_pat ref
+);
+
+const_params(
+  unique int id: @const_param
+);
+
+#keyset[id, index]
+const_param_attrs(
+  int id: @const_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_param_default_vals(
+  int id: @const_param ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+const_param_is_const(
+  int id: @const_param ref
+);
+
+#keyset[id]
+const_param_names(
+  int id: @const_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_param_type_reprs(
+  int id: @const_param ref,
+  int type_repr: @type_repr ref
+);
+
+continue_exprs(
+  unique int id: @continue_expr
+);
+
+#keyset[id, index]
+continue_expr_attrs(
+  int id: @continue_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+continue_expr_lifetimes(
+  int id: @continue_expr ref,
+  int lifetime: @lifetime ref
+);
+
+dyn_trait_type_reprs(
+  unique int id: @dyn_trait_type_repr
+);
+
+#keyset[id]
+dyn_trait_type_repr_type_bound_lists(
+  int id: @dyn_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+expr_stmts(
+  unique int id: @expr_stmt
+);
+
+#keyset[id]
+expr_stmt_exprs(
+  int id: @expr_stmt ref,
+  int expr: @expr ref
+);
+
+field_exprs(
+  unique int id: @field_expr
+);
+
+#keyset[id, index]
+field_expr_attrs(
+  int id: @field_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+field_expr_containers(
+  int id: @field_expr ref,
+  int container: @expr ref
+);
+
+#keyset[id]
+field_expr_identifiers(
+  int id: @field_expr ref,
+  int identifier: @name_ref ref
+);
+
+fn_ptr_type_reprs(
+  unique int id: @fn_ptr_type_repr
+);
+
+#keyset[id]
+fn_ptr_type_repr_abis(
+  int id: @fn_ptr_type_repr ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_async(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_const(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_unsafe(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_param_lists(
+  int id: @fn_ptr_type_repr ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_ret_types(
+  int id: @fn_ptr_type_repr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+for_type_reprs(
+  unique int id: @for_type_repr
+);
+
+#keyset[id]
+for_type_repr_for_binders(
+  int id: @for_type_repr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+for_type_repr_type_reprs(
+  int id: @for_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+format_args_exprs(
+  unique int id: @format_args_expr
+);
+
+#keyset[id, index]
+format_args_expr_args(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int arg: @format_args_arg ref
+);
+
+#keyset[id, index]
+format_args_expr_attrs(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+format_args_expr_templates(
+  int id: @format_args_expr ref,
+  int template: @expr ref
+);
+
+ident_pats(
+  unique int id: @ident_pat
+);
+
+#keyset[id, index]
+ident_pat_attrs(
+  int id: @ident_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ident_pat_is_mut(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_is_ref(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_names(
+  int id: @ident_pat ref,
+  int name: @name ref
+);
+
+#keyset[id]
+ident_pat_pats(
+  int id: @ident_pat ref,
+  int pat: @pat ref
+);
+
+if_exprs(
+  unique int id: @if_expr
+);
+
+#keyset[id, index]
+if_expr_attrs(
+  int id: @if_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+if_expr_conditions(
+  int id: @if_expr ref,
+  int condition: @expr ref
+);
+
+#keyset[id]
+if_expr_elses(
+  int id: @if_expr ref,
+  int else: @expr ref
+);
+
+#keyset[id]
+if_expr_thens(
+  int id: @if_expr ref,
+  int then: @block_expr ref
+);
+
+impl_trait_type_reprs(
+  unique int id: @impl_trait_type_repr
+);
+
+#keyset[id]
+impl_trait_type_repr_type_bound_lists(
+  int id: @impl_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+index_exprs(
+  unique int id: @index_expr
+);
+
+#keyset[id, index]
+index_expr_attrs(
+  int id: @index_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+index_expr_bases(
+  int id: @index_expr ref,
+  int base: @expr ref
+);
+
+#keyset[id]
+index_expr_indices(
+  int id: @index_expr ref,
+  int index: @expr ref
+);
+
+infer_type_reprs(
+  unique int id: @infer_type_repr
+);
+
+@item =
+  @adt
+| @asm_expr
+| @assoc_item
+| @extern_block
+| @extern_crate
+| @extern_item
+| @impl
+| @macro_def
+| @macro_rules
+| @module
+| @trait
+| @trait_alias
+| @use
+;
+
+#keyset[id]
+item_attribute_macro_expansions(
+  int id: @item ref,
+  int attribute_macro_expansion: @macro_items ref
+);
+
+@labelable_expr =
+  @block_expr
+| @looping_expr
+;
+
+#keyset[id]
+labelable_expr_labels(
+  int id: @labelable_expr ref,
+  int label: @label ref
+);
+
+let_exprs(
+  unique int id: @let_expr
+);
+
+#keyset[id, index]
+let_expr_attrs(
+  int id: @let_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_expr_scrutinees(
+  int id: @let_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+let_expr_pats(
+  int id: @let_expr ref,
+  int pat: @pat ref
+);
+
+let_stmts(
+  unique int id: @let_stmt
+);
+
+#keyset[id, index]
+let_stmt_attrs(
+  int id: @let_stmt ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_stmt_initializers(
+  int id: @let_stmt ref,
+  int initializer: @expr ref
+);
+
+#keyset[id]
+let_stmt_let_elses(
+  int id: @let_stmt ref,
+  int let_else: @let_else ref
+);
+
+#keyset[id]
+let_stmt_pats(
+  int id: @let_stmt ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+let_stmt_type_reprs(
+  int id: @let_stmt ref,
+  int type_repr: @type_repr ref
+);
+
+lifetimes(
+  unique int id: @lifetime
+);
+
+#keyset[id]
+lifetime_texts(
+  int id: @lifetime ref,
+  string text: string ref
+);
+
+lifetime_args(
+  unique int id: @lifetime_arg
+);
+
+#keyset[id]
+lifetime_arg_lifetimes(
+  int id: @lifetime_arg ref,
+  int lifetime: @lifetime ref
+);
+
+lifetime_params(
+  unique int id: @lifetime_param
+);
+
+#keyset[id, index]
+lifetime_param_attrs(
+  int id: @lifetime_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+lifetime_param_lifetimes(
+  int id: @lifetime_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+lifetime_param_type_bound_lists(
+  int id: @lifetime_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+literal_exprs(
+  unique int id: @literal_expr
+);
+
+#keyset[id, index]
+literal_expr_attrs(
+  int id: @literal_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+literal_expr_text_values(
+  int id: @literal_expr ref,
+  string text_value: string ref
+);
+
+literal_pats(
+  unique int id: @literal_pat
+);
+
+#keyset[id]
+literal_pat_literals(
+  int id: @literal_pat ref,
+  int literal: @literal_expr ref
+);
+
+macro_block_exprs(
+  unique int id: @macro_block_expr
+);
+
+#keyset[id, index]
+macro_block_expr_statements(
+  int id: @macro_block_expr ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+macro_block_expr_tail_exprs(
+  int id: @macro_block_expr ref,
+  int tail_expr: @expr ref
+);
+
+macro_exprs(
+  unique int id: @macro_expr
+);
+
+#keyset[id]
+macro_expr_macro_calls(
+  int id: @macro_expr ref,
+  int macro_call: @macro_call ref
+);
+
+macro_pats(
+  unique int id: @macro_pat
+);
+
+#keyset[id]
+macro_pat_macro_calls(
+  int id: @macro_pat ref,
+  int macro_call: @macro_call ref
+);
+
+macro_type_reprs(
+  unique int id: @macro_type_repr
+);
+
+#keyset[id]
+macro_type_repr_macro_calls(
+  int id: @macro_type_repr ref,
+  int macro_call: @macro_call ref
+);
+
+match_exprs(
+  unique int id: @match_expr
+);
+
+#keyset[id, index]
+match_expr_attrs(
+  int id: @match_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_expr_scrutinees(
+  int id: @match_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+match_expr_match_arm_lists(
+  int id: @match_expr ref,
+  int match_arm_list: @match_arm_list ref
+);
+
+name_refs(
+  unique int id: @name_ref
+);
+
+#keyset[id]
+name_ref_texts(
+  int id: @name_ref ref,
+  string text: string ref
+);
+
+never_type_reprs(
+  unique int id: @never_type_repr
+);
+
+offset_of_exprs(
+  unique int id: @offset_of_expr
+);
+
+#keyset[id, index]
+offset_of_expr_attrs(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+offset_of_expr_fields(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int field: @name_ref ref
+);
+
+#keyset[id]
+offset_of_expr_type_reprs(
+  int id: @offset_of_expr ref,
+  int type_repr: @type_repr ref
+);
+
+or_pats(
+  unique int id: @or_pat
+);
+
+#keyset[id, index]
+or_pat_pats(
+  int id: @or_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+params(
+  unique int id: @param
+);
+
+#keyset[id]
+param_pats(
+  int id: @param ref,
+  int pat: @pat ref
+);
+
+paren_exprs(
+  unique int id: @paren_expr
+);
+
+#keyset[id, index]
+paren_expr_attrs(
+  int id: @paren_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+paren_expr_exprs(
+  int id: @paren_expr ref,
+  int expr: @expr ref
+);
+
+paren_pats(
+  unique int id: @paren_pat
+);
+
+#keyset[id]
+paren_pat_pats(
+  int id: @paren_pat ref,
+  int pat: @pat ref
+);
+
+paren_type_reprs(
+  unique int id: @paren_type_repr
+);
+
+#keyset[id]
+paren_type_repr_type_reprs(
+  int id: @paren_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+@path_ast_node =
+  @path_expr
+| @path_pat
+| @struct_expr
+| @struct_pat
+| @tuple_struct_pat
+;
+
+#keyset[id]
+path_ast_node_paths(
+  int id: @path_ast_node ref,
+  int path: @path ref
+);
+
+@path_expr_base =
+  @path_expr
+;
+
+path_type_reprs(
+  unique int id: @path_type_repr
+);
+
+#keyset[id]
+path_type_repr_paths(
+  int id: @path_type_repr ref,
+  int path: @path ref
+);
+
+prefix_exprs(
+  unique int id: @prefix_expr
+);
+
+#keyset[id, index]
+prefix_expr_attrs(
+  int id: @prefix_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+prefix_expr_exprs(
+  int id: @prefix_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+prefix_expr_operator_names(
+  int id: @prefix_expr ref,
+  string operator_name: string ref
+);
+
+ptr_type_reprs(
+  unique int id: @ptr_type_repr
+);
+
+#keyset[id]
+ptr_type_repr_is_const(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_is_mut(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_type_reprs(
+  int id: @ptr_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+range_exprs(
+  unique int id: @range_expr
+);
+
+#keyset[id, index]
+range_expr_attrs(
+  int id: @range_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+range_expr_ends(
+  int id: @range_expr ref,
+  int end: @expr ref
+);
+
+#keyset[id]
+range_expr_operator_names(
+  int id: @range_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_expr_starts(
+  int id: @range_expr ref,
+  int start: @expr ref
+);
+
+range_pats(
+  unique int id: @range_pat
+);
+
+#keyset[id]
+range_pat_ends(
+  int id: @range_pat ref,
+  int end: @pat ref
+);
+
+#keyset[id]
+range_pat_operator_names(
+  int id: @range_pat ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_pat_starts(
+  int id: @range_pat ref,
+  int start: @pat ref
+);
+
+ref_exprs(
+  unique int id: @ref_expr
+);
+
+#keyset[id, index]
+ref_expr_attrs(
+  int id: @ref_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ref_expr_exprs(
+  int id: @ref_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+ref_expr_is_const(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_mut(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_raw(
+  int id: @ref_expr ref
+);
+
+ref_pats(
+  unique int id: @ref_pat
+);
+
+#keyset[id]
+ref_pat_is_mut(
+  int id: @ref_pat ref
+);
+
+#keyset[id]
+ref_pat_pats(
+  int id: @ref_pat ref,
+  int pat: @pat ref
+);
+
+ref_type_reprs(
+  unique int id: @ref_type_repr
+);
+
+#keyset[id]
+ref_type_repr_is_mut(
+  int id: @ref_type_repr ref
+);
+
+#keyset[id]
+ref_type_repr_lifetimes(
+  int id: @ref_type_repr ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+ref_type_repr_type_reprs(
+  int id: @ref_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+rest_pats(
+  unique int id: @rest_pat
+);
+
+#keyset[id, index]
+rest_pat_attrs(
+  int id: @rest_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+return_exprs(
+  unique int id: @return_expr
+);
+
+#keyset[id, index]
+return_expr_attrs(
+  int id: @return_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+return_expr_exprs(
+  int id: @return_expr ref,
+  int expr: @expr ref
+);
+
+self_params(
+  unique int id: @self_param
+);
+
+#keyset[id]
+self_param_is_ref(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_is_mut(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_lifetimes(
+  int id: @self_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+self_param_names(
+  int id: @self_param ref,
+  int name: @name ref
+);
+
+slice_pats(
+  unique int id: @slice_pat
+);
+
+#keyset[id, index]
+slice_pat_pats(
+  int id: @slice_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+slice_type_reprs(
+  unique int id: @slice_type_repr
+);
+
+#keyset[id]
+slice_type_repr_type_reprs(
+  int id: @slice_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+struct_field_lists(
+  unique int id: @struct_field_list
+);
+
+#keyset[id, index]
+struct_field_list_fields(
+  int id: @struct_field_list ref,
+  int index: int ref,
+  int field: @struct_field ref
+);
+
+try_exprs(
+  unique int id: @try_expr
+);
+
+#keyset[id, index]
+try_expr_attrs(
+  int id: @try_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+try_expr_exprs(
+  int id: @try_expr ref,
+  int expr: @expr ref
+);
+
+tuple_exprs(
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_attrs(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+tuple_expr_fields(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int field: @expr ref
+);
+
+tuple_field_lists(
+  unique int id: @tuple_field_list
+);
+
+#keyset[id, index]
+tuple_field_list_fields(
+  int id: @tuple_field_list ref,
+  int index: int ref,
+  int field: @tuple_field ref
+);
+
+tuple_pats(
+  unique int id: @tuple_pat
+);
+
+#keyset[id, index]
+tuple_pat_fields(
+  int id: @tuple_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_type_reprs(
+  unique int id: @tuple_type_repr
+);
+
+#keyset[id, index]
+tuple_type_repr_fields(
+  int id: @tuple_type_repr ref,
+  int index: int ref,
+  int field: @type_repr ref
+);
+
+type_args(
+  unique int id: @type_arg
+);
+
+#keyset[id]
+type_arg_type_reprs(
+  int id: @type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+type_params(
+  unique int id: @type_param
+);
+
+#keyset[id, index]
+type_param_attrs(
+  int id: @type_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_param_default_types(
+  int id: @type_param ref,
+  int default_type: @type_repr ref
+);
+
+#keyset[id]
+type_param_names(
+  int id: @type_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_param_type_bound_lists(
+  int id: @type_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+underscore_exprs(
+  unique int id: @underscore_expr
+);
+
+#keyset[id, index]
+underscore_expr_attrs(
+  int id: @underscore_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+variants(
+  unique int id: @variant
+);
+
+#keyset[id, index]
+variant_attrs(
+  int id: @variant ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+variant_discriminants(
+  int id: @variant ref,
+  int discriminant: @expr ref
+);
+
+#keyset[id]
+variant_field_lists(
+  int id: @variant ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+variant_names(
+  int id: @variant ref,
+  int name: @name ref
+);
+
+#keyset[id]
+variant_visibilities(
+  int id: @variant ref,
+  int visibility: @visibility ref
+);
+
+wildcard_pats(
+  unique int id: @wildcard_pat
+);
+
+yeet_exprs(
+  unique int id: @yeet_expr
+);
+
+#keyset[id, index]
+yeet_expr_attrs(
+  int id: @yeet_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yeet_expr_exprs(
+  int id: @yeet_expr ref,
+  int expr: @expr ref
+);
+
+yield_exprs(
+  unique int id: @yield_expr
+);
+
+#keyset[id, index]
+yield_expr_attrs(
+  int id: @yield_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yield_expr_exprs(
+  int id: @yield_expr ref,
+  int expr: @expr ref
+);
+
+@adt =
+  @enum
+| @struct
+| @union
+;
+
+#keyset[id, index]
+adt_derive_macro_expansions(
+  int id: @adt ref,
+  int index: int ref,
+  int derive_macro_expansion: @macro_items ref
+);
+
+asm_exprs(
+  unique int id: @asm_expr
+);
+
+#keyset[id, index]
+asm_expr_asm_pieces(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int asm_piece: @asm_piece ref
+);
+
+#keyset[id, index]
+asm_expr_attrs(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+asm_expr_templates(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int template: @expr ref
+);
+
+@assoc_item =
+  @const
+| @function
+| @macro_call
+| @type_alias
+;
+
+block_exprs(
+  unique int id: @block_expr
+);
+
+#keyset[id, index]
+block_expr_attrs(
+  int id: @block_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+block_expr_is_async(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_const(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_gen(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_move(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_try(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_unsafe(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_stmt_lists(
+  int id: @block_expr ref,
+  int stmt_list: @stmt_list ref
+);
+
+call_exprs(
+  unique int id: @call_expr
+);
+
+#keyset[id]
+call_expr_functions(
+  int id: @call_expr ref,
+  int function: @expr ref
+);
+
+extern_blocks(
+  unique int id: @extern_block
+);
+
+#keyset[id]
+extern_block_abis(
+  int id: @extern_block ref,
+  int abi: @abi ref
+);
+
+#keyset[id, index]
+extern_block_attrs(
+  int id: @extern_block ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_block_extern_item_lists(
+  int id: @extern_block ref,
+  int extern_item_list: @extern_item_list ref
+);
+
+#keyset[id]
+extern_block_is_unsafe(
+  int id: @extern_block ref
+);
+
+extern_crates(
+  unique int id: @extern_crate
+);
+
+#keyset[id, index]
+extern_crate_attrs(
+  int id: @extern_crate ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_crate_identifiers(
+  int id: @extern_crate ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+extern_crate_renames(
+  int id: @extern_crate ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+extern_crate_visibilities(
+  int id: @extern_crate ref,
+  int visibility: @visibility ref
+);
+
+@extern_item =
+  @function
+| @macro_call
+| @static
+| @type_alias
+;
+
+impls(
+  unique int id: @impl
+);
+
+#keyset[id]
+impl_assoc_item_lists(
+  int id: @impl ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+impl_attrs(
+  int id: @impl ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+impl_generic_param_lists(
+  int id: @impl ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+impl_is_const(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_default(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_unsafe(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_self_ties(
+  int id: @impl ref,
+  int self_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_traits(
+  int id: @impl ref,
+  int trait: @type_repr ref
+);
+
+#keyset[id]
+impl_visibilities(
+  int id: @impl ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+impl_where_clauses(
+  int id: @impl ref,
+  int where_clause: @where_clause ref
+);
+
+@looping_expr =
+  @for_expr
+| @loop_expr
+| @while_expr
+;
+
+#keyset[id]
+looping_expr_loop_bodies(
+  int id: @looping_expr ref,
+  int loop_body: @block_expr ref
+);
+
+macro_defs(
+  unique int id: @macro_def
+);
+
+#keyset[id]
+macro_def_args(
+  int id: @macro_def ref,
+  int args: @token_tree ref
+);
+
+#keyset[id, index]
+macro_def_attrs(
+  int id: @macro_def ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_def_bodies(
+  int id: @macro_def ref,
+  int body: @token_tree ref
+);
+
+#keyset[id]
+macro_def_names(
+  int id: @macro_def ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_def_visibilities(
+  int id: @macro_def ref,
+  int visibility: @visibility ref
+);
+
+macro_rules(
+  unique int id: @macro_rules
+);
+
+#keyset[id, index]
+macro_rules_attrs(
+  int id: @macro_rules ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_rules_names(
+  int id: @macro_rules ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_rules_token_trees(
+  int id: @macro_rules ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_rules_visibilities(
+  int id: @macro_rules ref,
+  int visibility: @visibility ref
+);
+
+method_call_exprs(
+  unique int id: @method_call_expr
+);
+
+#keyset[id]
+method_call_expr_generic_arg_lists(
+  int id: @method_call_expr ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+method_call_expr_identifiers(
+  int id: @method_call_expr ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+method_call_expr_receivers(
+  int id: @method_call_expr ref,
+  int receiver: @expr ref
+);
+
+modules(
+  unique int id: @module
+);
+
+#keyset[id, index]
+module_attrs(
+  int id: @module ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+module_item_lists(
+  int id: @module ref,
+  int item_list: @item_list ref
+);
+
+#keyset[id]
+module_names(
+  int id: @module ref,
+  int name: @name ref
+);
+
+#keyset[id]
+module_visibilities(
+  int id: @module ref,
+  int visibility: @visibility ref
+);
+
+path_exprs(
+  unique int id: @path_expr
+);
+
+#keyset[id, index]
+path_expr_attrs(
+  int id: @path_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+path_pats(
+  unique int id: @path_pat
+);
+
+struct_exprs(
+  unique int id: @struct_expr
+);
+
+#keyset[id]
+struct_expr_struct_expr_field_lists(
+  int id: @struct_expr ref,
+  int struct_expr_field_list: @struct_expr_field_list ref
+);
+
+struct_pats(
+  unique int id: @struct_pat
+);
+
+#keyset[id]
+struct_pat_struct_pat_field_lists(
+  int id: @struct_pat ref,
+  int struct_pat_field_list: @struct_pat_field_list ref
+);
+
+traits(
+  unique int id: @trait
+);
+
+#keyset[id]
+trait_assoc_item_lists(
+  int id: @trait ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+trait_attrs(
+  int id: @trait ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_generic_param_lists(
+  int id: @trait ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_is_auto(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_is_unsafe(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_names(
+  int id: @trait ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_type_bound_lists(
+  int id: @trait ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_visibilities(
+  int id: @trait ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_where_clauses(
+  int id: @trait ref,
+  int where_clause: @where_clause ref
+);
+
+trait_aliases(
+  unique int id: @trait_alias
+);
+
+#keyset[id, index]
+trait_alias_attrs(
+  int id: @trait_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_alias_generic_param_lists(
+  int id: @trait_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_alias_names(
+  int id: @trait_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_alias_type_bound_lists(
+  int id: @trait_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_alias_visibilities(
+  int id: @trait_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_alias_where_clauses(
+  int id: @trait_alias ref,
+  int where_clause: @where_clause ref
+);
+
+tuple_struct_pats(
+  unique int id: @tuple_struct_pat
+);
+
+#keyset[id, index]
+tuple_struct_pat_fields(
+  int id: @tuple_struct_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+uses(
+  unique int id: @use
+);
+
+#keyset[id, index]
+use_attrs(
+  int id: @use ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+use_use_trees(
+  int id: @use ref,
+  int use_tree: @use_tree ref
+);
+
+#keyset[id]
+use_visibilities(
+  int id: @use ref,
+  int visibility: @visibility ref
+);
+
+consts(
+  unique int id: @const
+);
+
+#keyset[id, index]
+const_attrs(
+  int id: @const ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_bodies(
+  int id: @const ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+const_generic_param_lists(
+  int id: @const ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+const_is_const(
+  int id: @const ref
+);
+
+#keyset[id]
+const_is_default(
+  int id: @const ref
+);
+
+#keyset[id]
+const_names(
+  int id: @const ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_type_reprs(
+  int id: @const ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+const_visibilities(
+  int id: @const ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+const_where_clauses(
+  int id: @const ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+const_has_implementation(
+  int id: @const ref
+);
+
+enums(
+  unique int id: @enum
+);
+
+#keyset[id, index]
+enum_attrs(
+  int id: @enum ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+enum_generic_param_lists(
+  int id: @enum ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+enum_names(
+  int id: @enum ref,
+  int name: @name ref
+);
+
+#keyset[id]
+enum_variant_lists(
+  int id: @enum ref,
+  int variant_list: @variant_list ref
+);
+
+#keyset[id]
+enum_visibilities(
+  int id: @enum ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+enum_where_clauses(
+  int id: @enum ref,
+  int where_clause: @where_clause ref
+);
+
+for_exprs(
+  unique int id: @for_expr
+);
+
+#keyset[id, index]
+for_expr_attrs(
+  int id: @for_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+for_expr_iterables(
+  int id: @for_expr ref,
+  int iterable: @expr ref
+);
+
+#keyset[id]
+for_expr_pats(
+  int id: @for_expr ref,
+  int pat: @pat ref
+);
+
+functions(
+  unique int id: @function
+);
+
+#keyset[id]
+function_abis(
+  int id: @function ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+function_bodies(
+  int id: @function ref,
+  int body: @block_expr ref
+);
+
+#keyset[id]
+function_generic_param_lists(
+  int id: @function ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+function_is_async(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_const(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_default(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_gen(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_unsafe(
+  int id: @function ref
+);
+
+#keyset[id]
+function_names(
+  int id: @function ref,
+  int name: @name ref
+);
+
+#keyset[id]
+function_ret_types(
+  int id: @function ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+function_visibilities(
+  int id: @function ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+function_where_clauses(
+  int id: @function ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+function_has_implementation(
+  int id: @function ref
+);
+
+loop_exprs(
+  unique int id: @loop_expr
+);
+
+#keyset[id, index]
+loop_expr_attrs(
+  int id: @loop_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+macro_calls(
+  unique int id: @macro_call
+);
+
+#keyset[id, index]
+macro_call_attrs(
+  int id: @macro_call ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_call_paths(
+  int id: @macro_call ref,
+  int path: @path ref
+);
+
+#keyset[id]
+macro_call_token_trees(
+  int id: @macro_call ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_call_macro_call_expansions(
+  int id: @macro_call ref,
+  int macro_call_expansion: @ast_node ref
+);
+
+statics(
+  unique int id: @static
+);
+
+#keyset[id, index]
+static_attrs(
+  int id: @static ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+static_bodies(
+  int id: @static ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+static_is_mut(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_static(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_unsafe(
+  int id: @static ref
+);
+
+#keyset[id]
+static_names(
+  int id: @static ref,
+  int name: @name ref
+);
+
+#keyset[id]
+static_type_reprs(
+  int id: @static ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+static_visibilities(
+  int id: @static ref,
+  int visibility: @visibility ref
+);
+
+structs(
+  unique int id: @struct
+);
+
+#keyset[id, index]
+struct_attrs(
+  int id: @struct ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_lists_(
+  int id: @struct ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+struct_generic_param_lists(
+  int id: @struct ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+struct_names(
+  int id: @struct ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_visibilities(
+  int id: @struct ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+struct_where_clauses(
+  int id: @struct ref,
+  int where_clause: @where_clause ref
+);
+
+type_aliases(
+  unique int id: @type_alias
+);
+
+#keyset[id, index]
+type_alias_attrs(
+  int id: @type_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_alias_generic_param_lists(
+  int id: @type_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_alias_is_default(
+  int id: @type_alias ref
+);
+
+#keyset[id]
+type_alias_names(
+  int id: @type_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_alias_type_reprs(
+  int id: @type_alias ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_alias_type_bound_lists(
+  int id: @type_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+type_alias_visibilities(
+  int id: @type_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_alias_where_clauses(
+  int id: @type_alias ref,
+  int where_clause: @where_clause ref
+);
+
+unions(
+  unique int id: @union
+);
+
+#keyset[id, index]
+union_attrs(
+  int id: @union ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+union_generic_param_lists(
+  int id: @union ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+union_names(
+  int id: @union ref,
+  int name: @name ref
+);
+
+#keyset[id]
+union_struct_field_lists(
+  int id: @union ref,
+  int struct_field_list: @struct_field_list ref
+);
+
+#keyset[id]
+union_visibilities(
+  int id: @union ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+union_where_clauses(
+  int id: @union ref,
+  int where_clause: @where_clause ref
+);
+
+while_exprs(
+  unique int id: @while_expr
+);
+
+#keyset[id, index]
+while_expr_attrs(
+  int id: @while_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+while_expr_conditions(
+  int id: @while_expr ref,
+  int condition: @expr ref
+);
diff --git a/rust/downgrades/dfade44a27bd44db996ae8c5095a11effc883aba/upgrade.properties b/rust/downgrades/dfade44a27bd44db996ae8c5095a11effc883aba/upgrade.properties
new file mode 100644
index 00000000000..05ada67c81b
--- /dev/null
+++ b/rust/downgrades/dfade44a27bd44db996ae8c5095a11effc883aba/upgrade.properties
@@ -0,0 +1,2 @@
+description: Revert removing extractor generated paths
+compatibility: partial
diff --git a/rust/extractor/Cargo.toml b/rust/extractor/Cargo.toml
index 88a3e203a27..223d9dfc68c 100644
--- a/rust/extractor/Cargo.toml
+++ b/rust/extractor/Cargo.toml
@@ -6,39 +6,39 @@ license = "MIT"
 
 # When updating these dependencies, run `rust/update_cargo_deps.sh`
 [dependencies]
-anyhow = "1.0.98"
-clap = { version = "4.5.40", features = ["derive"] }
+anyhow = "1.0.100"
+clap = { version = "4.5.48", features = ["derive"] }
 figment = { version = "0.10.19", features = ["env", "yaml"] }
 num-traits = "0.2.19"
-ra_ap_base_db = "0.0.288"
-ra_ap_hir = "0.0.288"
-ra_ap_hir_def = "0.0.288"
-ra_ap_ide_db = "0.0.288"
-ra_ap_hir_ty = "0.0.288"
-ra_ap_hir_expand = "0.0.288"
-ra_ap_load-cargo = "0.0.288"
-ra_ap_paths = "0.0.288"
-ra_ap_project_model = "0.0.288"
-ra_ap_syntax = "0.0.288"
-ra_ap_vfs = "0.0.288"
-ra_ap_parser = "0.0.288"
-ra_ap_span = "0.0.288"
-ra_ap_cfg = "0.0.288"
-ra_ap_intern = "0.0.288"
-serde = "1.0.219"
-serde_with = "3.13.0"
+ra_ap_base_db = "0.0.301"
+ra_ap_hir = "0.0.301"
+ra_ap_hir_def = "0.0.301"
+ra_ap_ide_db = "0.0.301"
+ra_ap_hir_ty = "0.0.301"
+ra_ap_hir_expand = "0.0.301"
+ra_ap_load-cargo = "0.0.301"
+ra_ap_paths = "0.0.301"
+ra_ap_project_model = "0.0.301"
+ra_ap_syntax = "0.0.301"
+ra_ap_vfs = "0.0.301"
+ra_ap_parser = "0.0.301"
+ra_ap_span = "0.0.301"
+ra_ap_cfg = "0.0.301"
+ra_ap_intern = "0.0.301"
+serde = "1.0.228"
+serde_with = "3.14.1"
 triomphe = "0.1.14"
 argfile = "0.2.1"
 codeql-extractor = { path = "../../shared/tree-sitter-extractor" }
 rust-extractor-macros = { path = "macros" }
 itertools = "0.14.0"
-glob = "0.3.2"
-chrono = { version = "0.4.41", features = ["serde"] }
-serde_json = "1.0.140"
+glob = "0.3.3"
+chrono = { version = "0.4.42", features = ["serde"] }
+serde_json = "1.0.145"
 dunce = "1.0.5"
-toml = "0.8.23"
+toml = "0.9.7"
 tracing = "0.1.41"
 tracing-flame = "0.2.0"
-tracing-subscriber = "0.3.19"
-chalk-ir = "0.103.0"
+tracing-subscriber = "0.3.20"
+chalk-ir = "0.104.0"
 mustache = "0.9.0"
diff --git a/rust/extractor/macros/Cargo.toml b/rust/extractor/macros/Cargo.toml
index 3444aa98758..e2e51876ee7 100644
--- a/rust/extractor/macros/Cargo.toml
+++ b/rust/extractor/macros/Cargo.toml
@@ -9,5 +9,5 @@ proc-macro = true
 
 # When updating these dependencies, run `rust/update_cargo_deps.sh`
 [dependencies]
-quote = "1.0.40"
-syn = { version = "2.0.103", features = ["full"] }
+quote = "1.0.41"
+syn = { version = "2.0.106", features = ["full"] }
diff --git a/rust/extractor/src/config.rs b/rust/extractor/src/config.rs
index a26bf790f82..86d3ab6272c 100644
--- a/rust/extractor/src/config.rs
+++ b/rust/extractor/src/config.rs
@@ -69,7 +69,6 @@ pub struct Config {
     pub build_script_command: Vec<String>,
     pub extra_includes: Vec<PathBuf>,
     pub proc_macro_server: Option<PathBuf>,
-    pub skip_path_resolution: bool,
     pub extract_dependencies_as_source: bool,
     pub force_library_mode: bool, // for testing purposes
 }
diff --git a/rust/extractor/src/generated/.generated.list b/rust/extractor/src/generated/.generated.list
index 4dcfb5380e1..fa35ec65d4c 100644
--- a/rust/extractor/src/generated/.generated.list
+++ b/rust/extractor/src/generated/.generated.list
@@ -1,2 +1,2 @@
 mod.rs 4bcb9def847469aae9d8649461546b7c21ec97cf6e63d3cf394e339915ce65d7 4bcb9def847469aae9d8649461546b7c21ec97cf6e63d3cf394e339915ce65d7
-top.rs 409eb2e5fb18cb360a7d255fc2d7926a78bcd2d3c9f8dcdfce0419cea49d1489 409eb2e5fb18cb360a7d255fc2d7926a78bcd2d3c9f8dcdfce0419cea49d1489
+top.rs 460e827738766301a137f1750be7cd3016e6b7e4e487c6c95972bd3e1d21b814 460e827738766301a137f1750be7cd3016e6b7e4e487c6c95972bd3e1d21b814
diff --git a/rust/extractor/src/generated/top.rs b/rust/extractor/src/generated/top.rs
index 278f4e59ab9..3c4b51c78e6 100644
--- a/rust/extractor/src/generated/top.rs
+++ b/rust/extractor/src/generated/top.rs
@@ -331,17 +331,6 @@ pub struct Addressable {
     _unused: ()
 }
 
-impl Addressable {
-    pub fn emit_extended_canonical_path(id: trap::Label<Self>, value: String, out: &mut trap::Writer) {
-        out.add_tuple("addressable_extended_canonical_paths", vec![id.into(), value.into()]);
-    }
-
-    pub fn emit_crate_origin(id: trap::Label<Self>, value: String, out: &mut trap::Writer) {
-        out.add_tuple("addressable_crate_origins", vec![id.into(), value.into()]);
-    }
-
-}
-
 impl trap::TrapClass for Addressable {
     fn class_name() -> &'static str { "Addressable" }
 }
@@ -835,56 +824,6 @@ impl From<trap::Label<Callable>> for trap::Label<Element> {
     }
 }
 
-#[derive(Debug)]
-pub struct ClosureBinder {
-    pub id: trap::TrapId<ClosureBinder>,
-    pub generic_param_list: Option<trap::Label<GenericParamList>>,
-}
-
-impl trap::TrapEntry for ClosureBinder {
-    fn extract_id(&mut self) -> trap::TrapId<Self> {
-        std::mem::replace(&mut self.id, trap::TrapId::Star)
-    }
-
-    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("closure_binders", vec![id.into()]);
-        if let Some(v) = self.generic_param_list {
-            out.add_tuple("closure_binder_generic_param_lists", vec![id.into(), v.into()]);
-        }
-    }
-}
-
-impl trap::TrapClass for ClosureBinder {
-    fn class_name() -> &'static str { "ClosureBinder" }
-}
-
-impl From<trap::Label<ClosureBinder>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<ClosureBinder>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ClosureBinder is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<ClosureBinder>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<ClosureBinder>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ClosureBinder is a subclass of Locatable
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<ClosureBinder>> for trap::Label<Element> {
-    fn from(value: trap::Label<ClosureBinder>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ClosureBinder is a subclass of Element
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
 #[derive(Debug)]
 pub struct Expr {
     _unused: ()
@@ -1011,6 +950,56 @@ impl From<trap::Label<FieldList>> for trap::Label<Element> {
     }
 }
 
+#[derive(Debug)]
+pub struct ForBinder {
+    pub id: trap::TrapId<ForBinder>,
+    pub generic_param_list: Option<trap::Label<GenericParamList>>,
+}
+
+impl trap::TrapEntry for ForBinder {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("for_binders", vec![id.into()]);
+        if let Some(v) = self.generic_param_list {
+            out.add_tuple("for_binder_generic_param_lists", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for ForBinder {
+    fn class_name() -> &'static str { "ForBinder" }
+}
+
+impl From<trap::Label<ForBinder>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ForBinder>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ForBinder is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ForBinder>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ForBinder>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ForBinder is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ForBinder>> for trap::Label<Element> {
+    fn from(value: trap::Label<ForBinder>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ForBinder is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct FormatArgsArg {
     pub id: trap::TrapId<FormatArgsArg>,
@@ -1949,6 +1938,42 @@ impl From<trap::Label<Path>> for trap::Label<Element> {
     }
 }
 
+#[derive(Debug)]
+pub struct PathAstNode {
+    _unused: ()
+}
+
+impl trap::TrapClass for PathAstNode {
+    fn class_name() -> &'static str { "PathAstNode" }
+}
+
+impl From<trap::Label<PathAstNode>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<PathAstNode>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PathAstNode is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<PathAstNode>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<PathAstNode>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PathAstNode is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<PathAstNode>> for trap::Label<Element> {
+    fn from(value: trap::Label<PathAstNode>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PathAstNode is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct PathSegment {
     pub id: trap::TrapId<PathSegment>,
@@ -2076,53 +2101,6 @@ impl From<trap::Label<Rename>> for trap::Label<Element> {
     }
 }
 
-#[derive(Debug)]
-pub struct Resolvable {
-    _unused: ()
-}
-
-impl Resolvable {
-    pub fn emit_resolved_path(id: trap::Label<Self>, value: String, out: &mut trap::Writer) {
-        out.add_tuple("resolvable_resolved_paths", vec![id.into(), value.into()]);
-    }
-
-    pub fn emit_resolved_crate_origin(id: trap::Label<Self>, value: String, out: &mut trap::Writer) {
-        out.add_tuple("resolvable_resolved_crate_origins", vec![id.into(), value.into()]);
-    }
-
-}
-
-impl trap::TrapClass for Resolvable {
-    fn class_name() -> &'static str { "Resolvable" }
-}
-
-impl From<trap::Label<Resolvable>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<Resolvable>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Resolvable is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<Resolvable>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<Resolvable>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Resolvable is a subclass of Locatable
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<Resolvable>> for trap::Label<Element> {
-    fn from(value: trap::Label<Resolvable>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Resolvable is a subclass of Element
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
 #[derive(Debug)]
 pub struct RetTypeRepr {
     pub id: trap::TrapId<RetTypeRepr>,
@@ -2808,6 +2786,7 @@ impl From<trap::Label<TupleField>> for trap::Label<Element> {
 #[derive(Debug)]
 pub struct TypeBound {
     pub id: trap::TrapId<TypeBound>,
+    pub for_binder: Option<trap::Label<ForBinder>>,
     pub is_async: bool,
     pub is_const: bool,
     pub lifetime: Option<trap::Label<Lifetime>>,
@@ -2822,6 +2801,9 @@ impl trap::TrapEntry for TypeBound {
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
         out.add_tuple("type_bounds", vec![id.into()]);
+        if let Some(v) = self.for_binder {
+            out.add_tuple("type_bound_for_binders", vec![id.into(), v.into()]);
+        }
         if self.is_async {
             out.add_tuple("type_bound_is_async", vec![id.into()]);
         }
@@ -3308,7 +3290,7 @@ impl From<trap::Label<WhereClause>> for trap::Label<Element> {
 #[derive(Debug)]
 pub struct WherePred {
     pub id: trap::TrapId<WherePred>,
-    pub generic_param_list: Option<trap::Label<GenericParamList>>,
+    pub for_binder: Option<trap::Label<ForBinder>>,
     pub lifetime: Option<trap::Label<Lifetime>>,
     pub type_repr: Option<trap::Label<TypeRepr>>,
     pub type_bound_list: Option<trap::Label<TypeBoundList>>,
@@ -3321,8 +3303,8 @@ impl trap::TrapEntry for WherePred {
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
         out.add_tuple("where_preds", vec![id.into()]);
-        if let Some(v) = self.generic_param_list {
-            out.add_tuple("where_pred_generic_param_lists", vec![id.into(), v.into()]);
+        if let Some(v) = self.for_binder {
+            out.add_tuple("where_pred_for_binders", vec![id.into(), v.into()]);
         }
         if let Some(v) = self.lifetime {
             out.add_tuple("where_pred_lifetimes", vec![id.into(), v.into()]);
@@ -3615,73 +3597,6 @@ impl From<trap::Label<AsmConst>> for trap::Label<Element> {
     }
 }
 
-#[derive(Debug)]
-pub struct AsmExpr {
-    pub id: trap::TrapId<AsmExpr>,
-    pub asm_pieces: Vec<trap::Label<AsmPiece>>,
-    pub attrs: Vec<trap::Label<Attr>>,
-    pub template: Vec<trap::Label<Expr>>,
-}
-
-impl trap::TrapEntry for AsmExpr {
-    fn extract_id(&mut self) -> trap::TrapId<Self> {
-        std::mem::replace(&mut self.id, trap::TrapId::Star)
-    }
-
-    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("asm_exprs", vec![id.into()]);
-        for (i, v) in self.asm_pieces.into_iter().enumerate() {
-            out.add_tuple("asm_expr_asm_pieces", vec![id.into(), i.into(), v.into()]);
-        }
-        for (i, v) in self.attrs.into_iter().enumerate() {
-            out.add_tuple("asm_expr_attrs", vec![id.into(), i.into(), v.into()]);
-        }
-        for (i, v) in self.template.into_iter().enumerate() {
-            out.add_tuple("asm_expr_templates", vec![id.into(), i.into(), v.into()]);
-        }
-    }
-}
-
-impl trap::TrapClass for AsmExpr {
-    fn class_name() -> &'static str { "AsmExpr" }
-}
-
-impl From<trap::Label<AsmExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<AsmExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AsmExpr is a subclass of Expr
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<AsmExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<AsmExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AsmExpr is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<AsmExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<AsmExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AsmExpr is a subclass of Locatable
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<AsmExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<AsmExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme AsmExpr is a subclass of Element
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
 #[derive(Debug)]
 pub struct AsmLabel {
     pub id: trap::TrapId<AsmLabel>,
@@ -4516,8 +4431,8 @@ pub struct ClosureExpr {
     pub id: trap::TrapId<ClosureExpr>,
     pub param_list: Option<trap::Label<ParamList>>,
     pub attrs: Vec<trap::Label<Attr>>,
-    pub body: Option<trap::Label<Expr>>,
-    pub closure_binder: Option<trap::Label<ClosureBinder>>,
+    pub closure_body: Option<trap::Label<Expr>>,
+    pub for_binder: Option<trap::Label<ForBinder>>,
     pub is_async: bool,
     pub is_const: bool,
     pub is_gen: bool,
@@ -4539,11 +4454,11 @@ impl trap::TrapEntry for ClosureExpr {
         for (i, v) in self.attrs.into_iter().enumerate() {
             out.add_tuple("callable_attrs", vec![id.into(), i.into(), v.into()]);
         }
-        if let Some(v) = self.body {
-            out.add_tuple("closure_expr_bodies", vec![id.into(), v.into()]);
+        if let Some(v) = self.closure_body {
+            out.add_tuple("closure_expr_closure_bodies", vec![id.into(), v.into()]);
         }
-        if let Some(v) = self.closure_binder {
-            out.add_tuple("closure_expr_closure_binders", vec![id.into(), v.into()]);
+        if let Some(v) = self.for_binder {
+            out.add_tuple("closure_expr_for_binders", vec![id.into(), v.into()]);
         }
         if self.is_async {
             out.add_tuple("closure_expr_is_async", vec![id.into()]);
@@ -5199,7 +5114,7 @@ impl From<trap::Label<FnPtrTypeRepr>> for trap::Label<Element> {
 #[derive(Debug)]
 pub struct ForTypeRepr {
     pub id: trap::TrapId<ForTypeRepr>,
-    pub generic_param_list: Option<trap::Label<GenericParamList>>,
+    pub for_binder: Option<trap::Label<ForBinder>>,
     pub type_repr: Option<trap::Label<TypeRepr>>,
 }
 
@@ -5210,8 +5125,8 @@ impl trap::TrapEntry for ForTypeRepr {
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
         out.add_tuple("for_type_reprs", vec![id.into()]);
-        if let Some(v) = self.generic_param_list {
-            out.add_tuple("for_type_repr_generic_param_lists", vec![id.into(), v.into()]);
+        if let Some(v) = self.for_binder {
+            out.add_tuple("for_type_repr_for_binders", vec![id.into(), v.into()]);
         }
         if let Some(v) = self.type_repr {
             out.add_tuple("for_type_repr_type_reprs", vec![id.into(), v.into()]);
@@ -6211,8 +6126,8 @@ impl From<trap::Label<LiteralPat>> for trap::Label<Element> {
 #[derive(Debug)]
 pub struct MacroBlockExpr {
     pub id: trap::TrapId<MacroBlockExpr>,
-    pub tail_expr: Option<trap::Label<Expr>>,
     pub statements: Vec<trap::Label<Stmt>>,
+    pub tail_expr: Option<trap::Label<Expr>>,
 }
 
 impl trap::TrapEntry for MacroBlockExpr {
@@ -6222,12 +6137,12 @@ impl trap::TrapEntry for MacroBlockExpr {
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
         out.add_tuple("macro_block_exprs", vec![id.into()]);
-        if let Some(v) = self.tail_expr {
-            out.add_tuple("macro_block_expr_tail_exprs", vec![id.into(), v.into()]);
-        }
         for (i, v) in self.statements.into_iter().enumerate() {
             out.add_tuple("macro_block_expr_statements", vec![id.into(), i.into(), v.into()]);
         }
+        if let Some(v) = self.tail_expr {
+            out.add_tuple("macro_block_expr_tail_exprs", vec![id.into(), v.into()]);
+        }
     }
 }
 
@@ -7003,51 +6918,6 @@ impl From<trap::Label<ParenTypeRepr>> for trap::Label<Element> {
     }
 }
 
-#[derive(Debug)]
-pub struct PathAstNode {
-    _unused: ()
-}
-
-impl trap::TrapClass for PathAstNode {
-    fn class_name() -> &'static str { "PathAstNode" }
-}
-
-impl From<trap::Label<PathAstNode>> for trap::Label<Resolvable> {
-    fn from(value: trap::Label<PathAstNode>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PathAstNode is a subclass of Resolvable
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<PathAstNode>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<PathAstNode>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PathAstNode is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<PathAstNode>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<PathAstNode>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PathAstNode is a subclass of Locatable
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<PathAstNode>> for trap::Label<Element> {
-    fn from(value: trap::Label<PathAstNode>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PathAstNode is a subclass of Element
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
 #[derive(Debug)]
 pub struct PathExprBase {
     _unused: ()
@@ -7093,6 +6963,74 @@ impl From<trap::Label<PathExprBase>> for trap::Label<Element> {
     }
 }
 
+#[derive(Debug)]
+pub struct PathPat {
+    pub id: trap::TrapId<PathPat>,
+    pub path: Option<trap::Label<Path>>,
+}
+
+impl trap::TrapEntry for PathPat {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("path_pats", vec![id.into()]);
+        if let Some(v) = self.path {
+            out.add_tuple("path_ast_node_paths", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for PathPat {
+    fn class_name() -> &'static str { "PathPat" }
+}
+
+impl From<trap::Label<PathPat>> for trap::Label<Pat> {
+    fn from(value: trap::Label<PathPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PathPat is a subclass of Pat
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<PathPat>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<PathPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PathPat is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<PathPat>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<PathPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PathPat is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<PathPat>> for trap::Label<Element> {
+    fn from(value: trap::Label<PathPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PathPat is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<PathPat>> for trap::Label<PathAstNode> {
+    fn from(value: trap::Label<PathPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PathPat is a subclass of PathAstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct PathTypeRepr {
     pub id: trap::TrapId<PathTypeRepr>,
@@ -7948,6 +7886,78 @@ impl From<trap::Label<SliceTypeRepr>> for trap::Label<Element> {
     }
 }
 
+#[derive(Debug)]
+pub struct StructExpr {
+    pub id: trap::TrapId<StructExpr>,
+    pub path: Option<trap::Label<Path>>,
+    pub struct_expr_field_list: Option<trap::Label<StructExprFieldList>>,
+}
+
+impl trap::TrapEntry for StructExpr {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("struct_exprs", vec![id.into()]);
+        if let Some(v) = self.path {
+            out.add_tuple("path_ast_node_paths", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.struct_expr_field_list {
+            out.add_tuple("struct_expr_struct_expr_field_lists", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for StructExpr {
+    fn class_name() -> &'static str { "StructExpr" }
+}
+
+impl From<trap::Label<StructExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<StructExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme StructExpr is a subclass of Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<StructExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<StructExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme StructExpr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<StructExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<StructExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme StructExpr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<StructExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<StructExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme StructExpr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<StructExpr>> for trap::Label<PathAstNode> {
+    fn from(value: trap::Label<StructExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme StructExpr is a subclass of PathAstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct StructFieldList {
     pub id: trap::TrapId<StructFieldList>,
@@ -8007,6 +8017,78 @@ impl From<trap::Label<StructFieldList>> for trap::Label<Element> {
     }
 }
 
+#[derive(Debug)]
+pub struct StructPat {
+    pub id: trap::TrapId<StructPat>,
+    pub path: Option<trap::Label<Path>>,
+    pub struct_pat_field_list: Option<trap::Label<StructPatFieldList>>,
+}
+
+impl trap::TrapEntry for StructPat {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("struct_pats", vec![id.into()]);
+        if let Some(v) = self.path {
+            out.add_tuple("path_ast_node_paths", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.struct_pat_field_list {
+            out.add_tuple("struct_pat_struct_pat_field_lists", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for StructPat {
+    fn class_name() -> &'static str { "StructPat" }
+}
+
+impl From<trap::Label<StructPat>> for trap::Label<Pat> {
+    fn from(value: trap::Label<StructPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme StructPat is a subclass of Pat
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<StructPat>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<StructPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme StructPat is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<StructPat>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<StructPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme StructPat is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<StructPat>> for trap::Label<Element> {
+    fn from(value: trap::Label<StructPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme StructPat is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<StructPat>> for trap::Label<PathAstNode> {
+    fn from(value: trap::Label<StructPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme StructPat is a subclass of PathAstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct TryExpr {
     pub id: trap::TrapId<TryExpr>,
@@ -8251,6 +8333,78 @@ impl From<trap::Label<TuplePat>> for trap::Label<Element> {
     }
 }
 
+#[derive(Debug)]
+pub struct TupleStructPat {
+    pub id: trap::TrapId<TupleStructPat>,
+    pub path: Option<trap::Label<Path>>,
+    pub fields: Vec<trap::Label<Pat>>,
+}
+
+impl trap::TrapEntry for TupleStructPat {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("tuple_struct_pats", vec![id.into()]);
+        if let Some(v) = self.path {
+            out.add_tuple("path_ast_node_paths", vec![id.into(), v.into()]);
+        }
+        for (i, v) in self.fields.into_iter().enumerate() {
+            out.add_tuple("tuple_struct_pat_fields", vec![id.into(), i.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for TupleStructPat {
+    fn class_name() -> &'static str { "TupleStructPat" }
+}
+
+impl From<trap::Label<TupleStructPat>> for trap::Label<Pat> {
+    fn from(value: trap::Label<TupleStructPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TupleStructPat is a subclass of Pat
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TupleStructPat>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<TupleStructPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TupleStructPat is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TupleStructPat>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<TupleStructPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TupleStructPat is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TupleStructPat>> for trap::Label<Element> {
+    fn from(value: trap::Label<TupleStructPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TupleStructPat is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TupleStructPat>> for trap::Label<PathAstNode> {
+    fn from(value: trap::Label<TupleStructPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TupleStructPat is a subclass of PathAstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct TupleTypeRepr {
     pub id: trap::TrapId<TupleTypeRepr>,
@@ -8831,6 +8985,100 @@ impl From<trap::Label<Adt>> for trap::Label<Addressable> {
     }
 }
 
+#[derive(Debug)]
+pub struct AsmExpr {
+    pub id: trap::TrapId<AsmExpr>,
+    pub asm_pieces: Vec<trap::Label<AsmPiece>>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub template: Vec<trap::Label<Expr>>,
+}
+
+impl trap::TrapEntry for AsmExpr {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("asm_exprs", vec![id.into()]);
+        for (i, v) in self.asm_pieces.into_iter().enumerate() {
+            out.add_tuple("asm_expr_asm_pieces", vec![id.into(), i.into(), v.into()]);
+        }
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("asm_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        for (i, v) in self.template.into_iter().enumerate() {
+            out.add_tuple("asm_expr_templates", vec![id.into(), i.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for AsmExpr {
+    fn class_name() -> &'static str { "AsmExpr" }
+}
+
+impl From<trap::Label<AsmExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<AsmExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme AsmExpr is a subclass of Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<AsmExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<AsmExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme AsmExpr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<AsmExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<AsmExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme AsmExpr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<AsmExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<AsmExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme AsmExpr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<AsmExpr>> for trap::Label<Item> {
+    fn from(value: trap::Label<AsmExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme AsmExpr is a subclass of Item
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<AsmExpr>> for trap::Label<Stmt> {
+    fn from(value: trap::Label<AsmExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme AsmExpr is a subclass of Stmt
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<AsmExpr>> for trap::Label<Addressable> {
+    fn from(value: trap::Label<AsmExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme AsmExpr is a subclass of Addressable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct AssocItem {
     _unused: ()
@@ -9744,15 +9992,6 @@ impl From<trap::Label<MethodCallExpr>> for trap::Label<Element> {
     }
 }
 
-impl From<trap::Label<MethodCallExpr>> for trap::Label<Resolvable> {
-    fn from(value: trap::Label<MethodCallExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MethodCallExpr is a subclass of Resolvable
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
 #[derive(Debug)]
 pub struct Module {
     pub id: trap::TrapId<Module>,
@@ -9923,254 +10162,6 @@ impl From<trap::Label<PathExpr>> for trap::Label<PathAstNode> {
     }
 }
 
-impl From<trap::Label<PathExpr>> for trap::Label<Resolvable> {
-    fn from(value: trap::Label<PathExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PathExpr is a subclass of Resolvable
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-#[derive(Debug)]
-pub struct PathPat {
-    pub id: trap::TrapId<PathPat>,
-    pub path: Option<trap::Label<Path>>,
-}
-
-impl trap::TrapEntry for PathPat {
-    fn extract_id(&mut self) -> trap::TrapId<Self> {
-        std::mem::replace(&mut self.id, trap::TrapId::Star)
-    }
-
-    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("path_pats", vec![id.into()]);
-        if let Some(v) = self.path {
-            out.add_tuple("path_ast_node_paths", vec![id.into(), v.into()]);
-        }
-    }
-}
-
-impl trap::TrapClass for PathPat {
-    fn class_name() -> &'static str { "PathPat" }
-}
-
-impl From<trap::Label<PathPat>> for trap::Label<Pat> {
-    fn from(value: trap::Label<PathPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PathPat is a subclass of Pat
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<PathPat>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<PathPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PathPat is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<PathPat>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<PathPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PathPat is a subclass of Locatable
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<PathPat>> for trap::Label<Element> {
-    fn from(value: trap::Label<PathPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PathPat is a subclass of Element
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<PathPat>> for trap::Label<PathAstNode> {
-    fn from(value: trap::Label<PathPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PathPat is a subclass of PathAstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<PathPat>> for trap::Label<Resolvable> {
-    fn from(value: trap::Label<PathPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PathPat is a subclass of Resolvable
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-#[derive(Debug)]
-pub struct StructExpr {
-    pub id: trap::TrapId<StructExpr>,
-    pub path: Option<trap::Label<Path>>,
-    pub struct_expr_field_list: Option<trap::Label<StructExprFieldList>>,
-}
-
-impl trap::TrapEntry for StructExpr {
-    fn extract_id(&mut self) -> trap::TrapId<Self> {
-        std::mem::replace(&mut self.id, trap::TrapId::Star)
-    }
-
-    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("struct_exprs", vec![id.into()]);
-        if let Some(v) = self.path {
-            out.add_tuple("path_ast_node_paths", vec![id.into(), v.into()]);
-        }
-        if let Some(v) = self.struct_expr_field_list {
-            out.add_tuple("struct_expr_struct_expr_field_lists", vec![id.into(), v.into()]);
-        }
-    }
-}
-
-impl trap::TrapClass for StructExpr {
-    fn class_name() -> &'static str { "StructExpr" }
-}
-
-impl From<trap::Label<StructExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<StructExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme StructExpr is a subclass of Expr
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<StructExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<StructExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme StructExpr is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<StructExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<StructExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme StructExpr is a subclass of Locatable
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<StructExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<StructExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme StructExpr is a subclass of Element
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<StructExpr>> for trap::Label<PathAstNode> {
-    fn from(value: trap::Label<StructExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme StructExpr is a subclass of PathAstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<StructExpr>> for trap::Label<Resolvable> {
-    fn from(value: trap::Label<StructExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme StructExpr is a subclass of Resolvable
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-#[derive(Debug)]
-pub struct StructPat {
-    pub id: trap::TrapId<StructPat>,
-    pub path: Option<trap::Label<Path>>,
-    pub struct_pat_field_list: Option<trap::Label<StructPatFieldList>>,
-}
-
-impl trap::TrapEntry for StructPat {
-    fn extract_id(&mut self) -> trap::TrapId<Self> {
-        std::mem::replace(&mut self.id, trap::TrapId::Star)
-    }
-
-    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("struct_pats", vec![id.into()]);
-        if let Some(v) = self.path {
-            out.add_tuple("path_ast_node_paths", vec![id.into(), v.into()]);
-        }
-        if let Some(v) = self.struct_pat_field_list {
-            out.add_tuple("struct_pat_struct_pat_field_lists", vec![id.into(), v.into()]);
-        }
-    }
-}
-
-impl trap::TrapClass for StructPat {
-    fn class_name() -> &'static str { "StructPat" }
-}
-
-impl From<trap::Label<StructPat>> for trap::Label<Pat> {
-    fn from(value: trap::Label<StructPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme StructPat is a subclass of Pat
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<StructPat>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<StructPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme StructPat is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<StructPat>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<StructPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme StructPat is a subclass of Locatable
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<StructPat>> for trap::Label<Element> {
-    fn from(value: trap::Label<StructPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme StructPat is a subclass of Element
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<StructPat>> for trap::Label<PathAstNode> {
-    fn from(value: trap::Label<StructPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme StructPat is a subclass of PathAstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<StructPat>> for trap::Label<Resolvable> {
-    fn from(value: trap::Label<StructPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme StructPat is a subclass of Resolvable
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
 #[derive(Debug)]
 pub struct Trait {
     pub id: trap::TrapId<Trait>,
@@ -10377,87 +10368,6 @@ impl From<trap::Label<TraitAlias>> for trap::Label<Addressable> {
     }
 }
 
-#[derive(Debug)]
-pub struct TupleStructPat {
-    pub id: trap::TrapId<TupleStructPat>,
-    pub path: Option<trap::Label<Path>>,
-    pub fields: Vec<trap::Label<Pat>>,
-}
-
-impl trap::TrapEntry for TupleStructPat {
-    fn extract_id(&mut self) -> trap::TrapId<Self> {
-        std::mem::replace(&mut self.id, trap::TrapId::Star)
-    }
-
-    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("tuple_struct_pats", vec![id.into()]);
-        if let Some(v) = self.path {
-            out.add_tuple("path_ast_node_paths", vec![id.into(), v.into()]);
-        }
-        for (i, v) in self.fields.into_iter().enumerate() {
-            out.add_tuple("tuple_struct_pat_fields", vec![id.into(), i.into(), v.into()]);
-        }
-    }
-}
-
-impl trap::TrapClass for TupleStructPat {
-    fn class_name() -> &'static str { "TupleStructPat" }
-}
-
-impl From<trap::Label<TupleStructPat>> for trap::Label<Pat> {
-    fn from(value: trap::Label<TupleStructPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TupleStructPat is a subclass of Pat
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<TupleStructPat>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<TupleStructPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TupleStructPat is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<TupleStructPat>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<TupleStructPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TupleStructPat is a subclass of Locatable
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<TupleStructPat>> for trap::Label<Element> {
-    fn from(value: trap::Label<TupleStructPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TupleStructPat is a subclass of Element
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<TupleStructPat>> for trap::Label<PathAstNode> {
-    fn from(value: trap::Label<TupleStructPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TupleStructPat is a subclass of PathAstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<TupleStructPat>> for trap::Label<Resolvable> {
-    fn from(value: trap::Label<TupleStructPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TupleStructPat is a subclass of Resolvable
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
 #[derive(Debug)]
 pub struct Use {
     pub id: trap::TrapId<Use>,
@@ -10873,7 +10783,7 @@ pub struct Function {
     pub param_list: Option<trap::Label<ParamList>>,
     pub attrs: Vec<trap::Label<Attr>>,
     pub abi: Option<trap::Label<Abi>>,
-    pub body: Option<trap::Label<BlockExpr>>,
+    pub function_body: Option<trap::Label<BlockExpr>>,
     pub generic_param_list: Option<trap::Label<GenericParamList>>,
     pub is_async: bool,
     pub is_const: bool,
@@ -10902,8 +10812,8 @@ impl trap::TrapEntry for Function {
         if let Some(v) = self.abi {
             out.add_tuple("function_abis", vec![id.into(), v.into()]);
         }
-        if let Some(v) = self.body {
-            out.add_tuple("function_bodies", vec![id.into(), v.into()]);
+        if let Some(v) = self.function_body {
+            out.add_tuple("function_function_bodies", vec![id.into(), v.into()]);
         }
         if let Some(v) = self.generic_param_list {
             out.add_tuple("function_generic_param_lists", vec![id.into(), v.into()]);
diff --git a/rust/extractor/src/main.rs b/rust/extractor/src/main.rs
index 1c8629cbbb9..e90badc63cd 100644
--- a/rust/extractor/src/main.rs
+++ b/rust/extractor/src/main.rs
@@ -1,6 +1,6 @@
 use crate::diagnostics::{ExtractionStep, emit_extraction_diagnostics};
-use crate::rust_analyzer::path_to_file_id;
-use crate::translate::{ResolvePaths, SourceKind};
+use crate::rust_analyzer::{RustAnalyzerNoSemantics, path_to_file_id};
+use crate::translate::SourceKind;
 use crate::trap::TrapId;
 use anyhow::Context;
 use archive::Archiver;
@@ -50,13 +50,7 @@ impl<'a> Extractor<'a> {
         }
     }
 
-    fn extract(
-        &mut self,
-        rust_analyzer: &RustAnalyzer,
-        file: &Path,
-        resolve_paths: ResolvePaths,
-        source_kind: SourceKind,
-    ) {
+    fn extract(&mut self, rust_analyzer: &RustAnalyzer, file: &Path, source_kind: SourceKind) {
         self.archiver.archive(file);
         let before_parse = Instant::now();
         let ParseResult {
@@ -79,7 +73,6 @@ impl<'a> Extractor<'a> {
             label,
             line_index,
             semantics_info.as_ref().ok(),
-            resolve_paths,
             source_kind,
         );
 
@@ -87,14 +80,12 @@ impl<'a> Extractor<'a> {
             translator.emit_parse_error(&ast, &err);
         }
         let no_location = (LineCol { line: 0, col: 0 }, LineCol { line: 0, col: 0 });
-        if let Err(reason) = semantics_info {
+        if let Err(RustAnalyzerNoSemantics { severity, reason }) = semantics_info {
             if !reason.is_empty() {
                 let message = format!("semantic analyzer unavailable ({reason})");
-                let full_message = format!(
-                    "{message}: macro expansion, call graph, and type inference will be skipped."
-                );
+                let full_message = format!("{message}: macro expansion will be skipped.");
                 translator.emit_diagnostic(
-                    trap::DiagnosticSeverity::Warning,
+                    severity,
                     "semantics".to_owned(),
                     message,
                     full_message,
@@ -120,29 +111,18 @@ impl<'a> Extractor<'a> {
         file: &Path,
         semantics: &Semantics<'_, RootDatabase>,
         vfs: &Vfs,
-        resolve_paths: ResolvePaths,
         source_kind: SourceKind,
     ) {
-        self.extract(
-            &RustAnalyzer::new(vfs, semantics),
-            file,
-            resolve_paths,
-            source_kind,
-        );
+        self.extract(&RustAnalyzer::new(vfs, semantics), file, source_kind);
     }
 
     pub fn extract_without_semantics(
         &mut self,
         file: &Path,
         source_kind: SourceKind,
-        reason: &str,
+        err: RustAnalyzerNoSemantics,
     ) {
-        self.extract(
-            &RustAnalyzer::WithoutSemantics { reason },
-            file,
-            ResolvePaths::No,
-            source_kind,
-        );
+        self.extract(&RustAnalyzer::from(err), file, source_kind);
     }
 
     pub fn load_manifest(
@@ -163,21 +143,25 @@ impl<'a> Extractor<'a> {
         file: &Path,
         semantics: &Semantics<'_, RootDatabase>,
         vfs: &Vfs,
-    ) -> Result<(), String> {
+    ) -> Result<(), RustAnalyzerNoSemantics> {
         let before = Instant::now();
         let Some(id) = path_to_file_id(file, vfs) else {
-            return Err("not included in files loaded from manifest".to_string());
+            return Err(RustAnalyzerNoSemantics::warning(
+                "not included in files loaded from manifest",
+            ));
         };
         match semantics.file_to_module_def(id) {
-            None => return Err("not included as a module".to_string()),
+            None => {
+                return Err(RustAnalyzerNoSemantics::info("not included as a module"));
+            }
             Some(module)
                 if module
                     .as_source_file_id(semantics.db)
                     .is_none_or(|mod_file_id| mod_file_id.file_id(semantics.db) != id) =>
             {
-                return Err(
-                    "not loaded as its own module, probably included by `!include`".to_string(),
-                );
+                return Err(RustAnalyzerNoSemantics::info(
+                    "not loaded as its own module, probably included by `!include`",
+                ));
             }
             _ => {}
         };
@@ -279,24 +263,23 @@ fn main() -> anyhow::Result<()> {
                 continue 'outer;
             }
         }
-        extractor.extract_without_semantics(file, SourceKind::Source, "no manifest found");
+        extractor.extract_without_semantics(
+            file,
+            SourceKind::Source,
+            RustAnalyzerNoSemantics::warning("no manifest found"),
+        );
     }
     let cwd = cwd()?;
     let (cargo_config, load_cargo_config) = cfg.to_cargo_config(&cwd);
-    let resolve_paths = if cfg.skip_path_resolution {
-        ResolvePaths::No
+    let library_mode = if cfg.extract_dependencies_as_source {
+        SourceKind::Source
     } else {
-        ResolvePaths::Yes
+        SourceKind::Library
     };
-    let (library_mode, library_resolve_paths) = if cfg.extract_dependencies_as_source {
-        (SourceKind::Source, resolve_paths)
+    let source_mode = if cfg.force_library_mode {
+        library_mode
     } else {
-        (SourceKind::Library, ResolvePaths::No)
-    };
-    let (source_mode, source_resolve_paths) = if cfg.force_library_mode {
-        (library_mode, library_resolve_paths)
-    } else {
-        (SourceKind::Source, resolve_paths)
+        SourceKind::Source
     };
     let mut processed_files: HashSet<PathBuf, RandomState> =
         HashSet::from_iter(files.iter().cloned());
@@ -312,14 +295,8 @@ fn main() -> anyhow::Result<()> {
             let semantics = Semantics::new(db);
             for file in files {
                 match extractor.load_source(file, &semantics, vfs) {
-                    Ok(()) => extractor.extract_with_semantics(
-                        file,
-                        &semantics,
-                        vfs,
-                        source_resolve_paths,
-                        source_mode,
-                    ),
-                    Err(reason) => extractor.extract_without_semantics(file, source_mode, &reason),
+                    Ok(()) => extractor.extract_with_semantics(file, &semantics, vfs, source_mode),
+                    Err(e) => extractor.extract_without_semantics(file, source_mode, e),
                 };
             }
             for (file_id, file) in vfs.iter() {
@@ -331,13 +308,7 @@ fn main() -> anyhow::Result<()> {
                             .source_root(db)
                             .is_library
                     {
-                        extractor.extract_with_semantics(
-                            file,
-                            &semantics,
-                            vfs,
-                            library_resolve_paths,
-                            library_mode,
-                        );
+                        extractor.extract_with_semantics(file, &semantics, vfs, library_mode);
                         extractor.archiver.archive(file);
                     }
                 }
@@ -347,7 +318,7 @@ fn main() -> anyhow::Result<()> {
                 extractor.extract_without_semantics(
                     file,
                     SourceKind::Source,
-                    "unable to load manifest",
+                    RustAnalyzerNoSemantics::warning("unable to load manifest"),
                 );
             }
         }
@@ -359,7 +330,7 @@ fn main() -> anyhow::Result<()> {
         let entry = entry.context("failed to read builtins directory")?;
         let path = entry.path();
         if path.extension().is_some_and(|ext| ext == "rs") {
-            extractor.extract_without_semantics(&path, SourceKind::Library, "");
+            extractor.extract_without_semantics(&path, SourceKind::Library, Default::default());
         }
     }
 
diff --git a/rust/extractor/src/rust_analyzer.rs b/rust/extractor/src/rust_analyzer.rs
index d477b13b5d0..9d3769a2404 100644
--- a/rust/extractor/src/rust_analyzer.rs
+++ b/rust/extractor/src/rust_analyzer.rs
@@ -1,3 +1,4 @@
+use crate::trap;
 use itertools::Itertools;
 use ra_ap_base_db::{EditionedFileId, FileText, RootQueryDb, SourceDatabase};
 use ra_ap_hir::Semantics;
@@ -23,16 +24,47 @@ use std::rc::Rc;
 use tracing::{debug, error, info, trace, warn};
 use triomphe::Arc;
 
+#[derive(Clone, Default)]
+pub struct RustAnalyzerNoSemantics {
+    pub severity: trap::DiagnosticSeverity,
+    pub reason: &'static str,
+}
+
+impl RustAnalyzerNoSemantics {
+    pub fn warning(reason: &'static str) -> Self {
+        RustAnalyzerNoSemantics {
+            severity: trap::DiagnosticSeverity::Warning,
+            reason,
+        }
+    }
+    pub fn info(reason: &'static str) -> Self {
+        RustAnalyzerNoSemantics {
+            severity: trap::DiagnosticSeverity::Info,
+            reason,
+        }
+    }
+}
+
 pub enum RustAnalyzer<'a> {
     WithSemantics {
         vfs: &'a Vfs,
         semantics: &'a Semantics<'a, RootDatabase>,
     },
     WithoutSemantics {
-        reason: &'a str,
+        severity: trap::DiagnosticSeverity,
+        reason: &'static str,
     },
 }
 
+impl From<RustAnalyzerNoSemantics> for RustAnalyzer<'static> {
+    fn from(value: RustAnalyzerNoSemantics) -> Self {
+        RustAnalyzer::WithoutSemantics {
+            severity: value.severity,
+            reason: value.reason,
+        }
+    }
+}
+
 pub struct FileSemanticInformation<'a> {
     pub file_id: EditionedFileId,
     pub semantics: &'a Semantics<'a, RootDatabase>,
@@ -42,7 +74,7 @@ pub struct ParseResult<'a> {
     pub ast: SourceFile,
     pub text: Arc<str>,
     pub errors: Vec<SyntaxError>,
-    pub semantics_info: Result<FileSemanticInformation<'a>, &'a str>,
+    pub semantics_info: Result<FileSemanticInformation<'a>, RustAnalyzerNoSemantics>,
 }
 
 impl<'a> RustAnalyzer<'a> {
@@ -52,7 +84,7 @@ impl<'a> RustAnalyzer<'a> {
         load_config: &LoadCargoConfig,
     ) -> Option<(RootDatabase, Vfs)> {
         let progress = |t| trace!("progress: {t}");
-        let manifest = project.manifest_path();
+        let manifest: &ManifestPath = project.manifest_path();
         match load_workspace_at(manifest.as_ref(), config, load_config, &progress) {
             Ok((db, vfs, _macro_server)) => Some((db, vfs)),
             Err(err) => {
@@ -67,16 +99,25 @@ impl<'a> RustAnalyzer<'a> {
     fn get_file_data(
         &self,
         path: &Path,
-    ) -> Result<(&Semantics<'_, RootDatabase>, EditionedFileId, FileText), &str> {
+    ) -> Result<(&Semantics<'_, RootDatabase>, EditionedFileId, FileText), RustAnalyzerNoSemantics>
+    {
         match self {
-            RustAnalyzer::WithoutSemantics { reason } => Err(reason),
+            RustAnalyzer::WithoutSemantics { severity, reason } => Err(RustAnalyzerNoSemantics {
+                severity: *severity,
+                reason,
+            }),
             RustAnalyzer::WithSemantics { vfs, semantics } => {
-                let file_id = path_to_file_id(path, vfs).ok_or("file not found in project")?;
-                let input = std::panic::catch_unwind(|| semantics.db.file_text(file_id))
-                    .or(Err("no text available for the file in the project"))?;
-                let editioned_file_id = semantics
-                    .attach_first_edition(file_id)
-                    .ok_or("failed to determine rust edition")?;
+                let file_id = path_to_file_id(path, vfs).ok_or(
+                    RustAnalyzerNoSemantics::warning("file not found in project"),
+                )?;
+                let input = std::panic::catch_unwind(|| semantics.db.file_text(file_id)).or(
+                    Err(RustAnalyzerNoSemantics::warning(
+                        "no text available for the file in the project",
+                    )),
+                )?;
+                let editioned_file_id = semantics.attach_first_edition(file_id).ok_or(
+                    RustAnalyzerNoSemantics::warning("failed to determine rust edition"),
+                )?;
                 Ok((semantics, editioned_file_id, input))
             }
         }
@@ -95,7 +136,7 @@ impl<'a> RustAnalyzer<'a> {
 
                 ParseResult {
                     ast: source_file,
-                    text: input.text(semantics.db),
+                    text: input.text(semantics.db).clone(),
                     errors,
                     semantics_info: Ok(FileSemanticInformation { file_id, semantics }),
                 }
diff --git a/rust/extractor/src/translate.rs b/rust/extractor/src/translate.rs
index 22bb3f4909f..1e9f3775d40 100644
--- a/rust/extractor/src/translate.rs
+++ b/rust/extractor/src/translate.rs
@@ -2,4 +2,4 @@ mod base;
 mod generated;
 mod mappings;
 
-pub use base::{ResolvePaths, SourceKind, Translator};
+pub use base::{SourceKind, Translator};
diff --git a/rust/extractor/src/translate/base.rs b/rust/extractor/src/translate/base.rs
index ccd6143fb84..ee26da665b2 100644
--- a/rust/extractor/src/translate/base.rs
+++ b/rust/extractor/src/translate/base.rs
@@ -1,22 +1,17 @@
-use super::mappings::{AddressableAst, AddressableHir, Emission, PathAst};
+use super::mappings::Emission;
 use crate::generated::{self};
 use crate::rust_analyzer::FileSemanticInformation;
 use crate::trap::{DiagnosticSeverity, TrapFile, TrapId};
 use crate::trap::{Label, TrapClass};
-use itertools::Either;
-use ra_ap_base_db::{CrateOrigin, EditionedFileId};
+use ra_ap_base_db::EditionedFileId;
+use ra_ap_hir::Semantics;
 use ra_ap_hir::db::ExpandDatabase;
-use ra_ap_hir::{
-    Adt, Crate, ItemContainer, Module, ModuleDef, PathResolution, Semantics, Type, Variant,
-};
-use ra_ap_hir_def::ModuleId;
-use ra_ap_hir_def::type_ref::Mutability;
 use ra_ap_hir_expand::{ExpandResult, ExpandTo, InFile};
 use ra_ap_ide_db::RootDatabase;
 use ra_ap_ide_db::line_index::{LineCol, LineIndex};
 use ra_ap_parser::SyntaxKind;
 use ra_ap_span::TextSize;
-use ra_ap_syntax::ast::{HasAttrs, HasName};
+use ra_ap_syntax::ast::HasAttrs;
 use ra_ap_syntax::{
     AstNode, NodeOrToken, SyntaxElementChildren, SyntaxError, SyntaxNode, SyntaxToken, TextRange,
     ast,
@@ -66,82 +61,24 @@ impl Emission<ast::Meta> for Translator<'_> {
 impl Emission<ast::Fn> for Translator<'_> {
     fn post_emit(&mut self, node: &ast::Fn, label: Label<generated::Function>) {
         self.emit_function_has_implementation(node, label);
-        self.extract_canonical_origin(node, label.into());
     }
 }
 
 impl Emission<ast::Struct> for Translator<'_> {
     fn post_emit(&mut self, node: &ast::Struct, label: Label<generated::Struct>) {
         self.emit_derive_expansion(node, label);
-        self.extract_canonical_origin(node, label.into());
     }
 }
 
 impl Emission<ast::Enum> for Translator<'_> {
     fn post_emit(&mut self, node: &ast::Enum, label: Label<generated::Enum>) {
         self.emit_derive_expansion(node, label);
-        self.extract_canonical_origin(node, label.into());
     }
 }
 
 impl Emission<ast::Union> for Translator<'_> {
     fn post_emit(&mut self, node: &ast::Union, label: Label<generated::Union>) {
         self.emit_derive_expansion(node, label);
-        self.extract_canonical_origin(node, label.into());
-    }
-}
-
-impl Emission<ast::Trait> for Translator<'_> {
-    fn post_emit(&mut self, node: &ast::Trait, label: Label<generated::Trait>) {
-        self.extract_canonical_origin(node, label.into());
-    }
-}
-
-impl Emission<ast::Module> for Translator<'_> {
-    fn post_emit(&mut self, node: &ast::Module, label: Label<generated::Module>) {
-        self.extract_canonical_origin(node, label.into());
-    }
-}
-
-impl Emission<ast::Variant> for Translator<'_> {
-    fn post_emit(&mut self, node: &ast::Variant, label: Label<generated::Variant>) {
-        self.extract_canonical_origin_of_enum_variant(node, label);
-    }
-}
-
-impl Emission<ast::PathExpr> for Translator<'_> {
-    fn post_emit(&mut self, node: &ast::PathExpr, label: Label<generated::PathExpr>) {
-        self.extract_path_canonical_destination(node, label.into());
-    }
-}
-
-impl Emission<ast::RecordExpr> for Translator<'_> {
-    fn post_emit(&mut self, node: &ast::RecordExpr, label: Label<generated::StructExpr>) {
-        self.extract_path_canonical_destination(node, label.into());
-    }
-}
-
-impl Emission<ast::PathPat> for Translator<'_> {
-    fn post_emit(&mut self, node: &ast::PathPat, label: Label<generated::PathPat>) {
-        self.extract_path_canonical_destination(node, label.into());
-    }
-}
-
-impl Emission<ast::RecordPat> for Translator<'_> {
-    fn post_emit(&mut self, node: &ast::RecordPat, label: Label<generated::StructPat>) {
-        self.extract_path_canonical_destination(node, label.into());
-    }
-}
-
-impl Emission<ast::TupleStructPat> for Translator<'_> {
-    fn post_emit(&mut self, node: &ast::TupleStructPat, label: Label<generated::TupleStructPat>) {
-        self.extract_path_canonical_destination(node, label.into());
-    }
-}
-
-impl Emission<ast::MethodCallExpr> for Translator<'_> {
-    fn post_emit(&mut self, node: &ast::MethodCallExpr, label: Label<generated::MethodCallExpr>) {
-        self.extract_method_canonical_destination(node, label);
     }
 }
 
@@ -175,11 +112,6 @@ macro_rules! dispatch_to_tracing {
     };
 }
 
-#[derive(Copy, Clone, PartialEq, Eq)]
-pub enum ResolvePaths {
-    Yes,
-    No,
-}
 #[derive(Copy, Clone, PartialEq, Eq)]
 pub enum SourceKind {
     Source,
@@ -193,7 +125,6 @@ pub struct Translator<'a> {
     line_index: LineIndex,
     file_id: Option<EditionedFileId>,
     pub semantics: Option<&'a Semantics<'a, RootDatabase>>,
-    resolve_paths: bool,
     source_kind: SourceKind,
     pub(crate) macro_context_depth: usize,
     diagnostic_count: usize,
@@ -211,7 +142,6 @@ impl<'a> Translator<'a> {
         label: Label<generated::File>,
         line_index: LineIndex,
         semantic_info: Option<&FileSemanticInformation<'a>>,
-        resolve_paths: ResolvePaths,
         source_kind: SourceKind,
     ) -> Translator<'a> {
         Translator {
@@ -221,7 +151,6 @@ impl<'a> Translator<'a> {
             line_index,
             file_id: semantic_info.map(|i| i.file_id),
             semantics: semantic_info.map(|i| i.semantics),
-            resolve_paths: resolve_paths == ResolvePaths::Yes,
             source_kind,
             macro_context_depth: 0,
             diagnostic_count: 0,
@@ -514,7 +443,7 @@ impl<'a> Translator<'a> {
                 mcall,
                 &SyntaxError::new(
                     format!(
-                        "macro expansion failed: could not resolve macro '{}'",
+                        "macro expansion failed for '{}'",
                         mcall.path().map(|p| p.to_string()).unwrap_or_default()
                     ),
                     range.unwrap_or_else(|| TextRange::empty(TextSize::from(0))),
@@ -533,254 +462,6 @@ impl<'a> Translator<'a> {
         }
     }
 
-    fn canonical_path_from_type(&self, ty: Type) -> Option<String> {
-        let sema = self.semantics.as_ref().unwrap();
-        // rust-analyzer doesn't provide a type enum directly
-        if let Some(it) = ty.as_adt() {
-            return match it {
-                Adt::Struct(it) => self.canonical_path_from_hir(it),
-                Adt::Union(it) => self.canonical_path_from_hir(it),
-                Adt::Enum(it) => self.canonical_path_from_hir(it),
-            };
-        };
-        if let Some((it, size)) = ty.as_array(sema.db) {
-            return self
-                .canonical_path_from_type(it)
-                .map(|p| format!("[{p}; {size}]"));
-        }
-        if let Some(it) = ty.as_slice() {
-            return self.canonical_path_from_type(it).map(|p| format!("[{p}]"));
-        }
-        if let Some(it) = ty.as_builtin() {
-            return Some(it.name().as_str().to_owned());
-        }
-        if let Some(it) = ty.as_dyn_trait() {
-            return self.canonical_path_from_hir(it).map(|p| format!("dyn {p}"));
-        }
-        if let Some((it, mutability)) = ty.as_reference() {
-            let mut_str = match mutability {
-                Mutability::Shared => "",
-                Mutability::Mut => "mut ",
-            };
-            return self
-                .canonical_path_from_type(it)
-                .map(|p| format!("&{mut_str}{p}"));
-        }
-        if let Some(it) = ty.as_impl_traits(sema.db) {
-            let paths = it
-                .map(|t| self.canonical_path_from_hir(t))
-                .collect::<Option<Vec<_>>>()?;
-            return Some(format!("impl {}", paths.join(" + ")));
-        }
-        if ty.as_type_param(sema.db).is_some() {
-            // from the canonical path perspective, we just want a special name
-            // e.g. `crate::<_ as SomeTrait>::func`
-            return Some("_".to_owned());
-        }
-        None
-    }
-
-    fn canonical_path_from_hir_module(&self, item: Module) -> Option<String> {
-        if ModuleId::from(item).containing_block().is_some() {
-            // this means this is a block module, i.e. a virtual module for an anonymous block scope
-            return None;
-        }
-        if item.is_crate_root() {
-            return Some("crate".into());
-        }
-        self.canonical_path_from_hir::<ast::Module>(item)
-    }
-
-    fn canonical_path_from_hir<T: AstNode>(&self, item: impl AddressableHir<T>) -> Option<String> {
-        // if we have a Hir entity, it means we have semantics
-        let sema = self.semantics.as_ref().unwrap();
-        let name = item.name(sema)?;
-        let container = item.container(sema.db);
-        let prefix = match container {
-            ItemContainer::Trait(it) => self.canonical_path_from_hir(it),
-            ItemContainer::Impl(it) => {
-                let ty = self.canonical_path_from_type(it.self_ty(sema.db))?;
-                if let Some(trait_) = it.trait_(sema.db) {
-                    let tr = self.canonical_path_from_hir(trait_)?;
-                    Some(format!("<{ty} as {tr}>"))
-                } else {
-                    Some(format!("<{ty}>"))
-                }
-            }
-            ItemContainer::Module(it) => self.canonical_path_from_hir_module(it),
-            ItemContainer::ExternBlock(..) | ItemContainer::Crate(..) => Some("".to_owned()),
-        }?;
-        Some(format!("{prefix}::{name}"))
-    }
-
-    fn canonical_path_from_module_def(&self, item: ModuleDef) -> Option<String> {
-        match item {
-            ModuleDef::Module(it) => self.canonical_path_from_hir(it),
-            ModuleDef::Function(it) => self.canonical_path_from_hir(it),
-            ModuleDef::Adt(Adt::Enum(it)) => self.canonical_path_from_hir(it),
-            ModuleDef::Adt(Adt::Struct(it)) => self.canonical_path_from_hir(it),
-            ModuleDef::Adt(Adt::Union(it)) => self.canonical_path_from_hir(it),
-            ModuleDef::Trait(it) => self.canonical_path_from_hir(it),
-            ModuleDef::Variant(it) => self.canonical_path_from_enum_variant(it),
-            ModuleDef::Static(_) => None,
-            ModuleDef::TraitAlias(_) => None,
-            ModuleDef::TypeAlias(_) => None,
-            ModuleDef::BuiltinType(_) => None,
-            ModuleDef::Macro(_) => None,
-            ModuleDef::Const(_) => None,
-        }
-    }
-
-    fn canonical_path_from_enum_variant(&self, item: Variant) -> Option<String> {
-        // if we have a Hir entity, it means we have semantics
-        let sema = self.semantics.as_ref().unwrap();
-        let prefix = self.canonical_path_from_hir(item.parent_enum(sema.db))?;
-        let name = item.name(sema.db);
-        Some(format!("{prefix}::{}", name.as_str()))
-    }
-
-    fn origin_from_hir<T: AstNode>(&self, item: impl AddressableHir<T>) -> String {
-        // if we have a Hir entity, it means we have semantics
-        let sema = self.semantics.as_ref().unwrap();
-        self.origin_from_crate(item.module(sema).krate())
-    }
-
-    fn origin_from_crate(&self, item: Crate) -> String {
-        // if we have a Hir entity, it means we have semantics
-        let sema = self.semantics.as_ref().unwrap();
-        match item.origin(sema.db) {
-            CrateOrigin::Rustc { name } => format!("rustc:{name}"),
-            CrateOrigin::Local { repo, name } => format!(
-                "repo:{}:{}",
-                repo.unwrap_or_default(),
-                name.map(|s| s.as_str().to_owned()).unwrap_or_default()
-            ),
-            CrateOrigin::Library { repo, name } => {
-                format!("repo:{}:{}", repo.unwrap_or_default(), name)
-            }
-            CrateOrigin::Lang(it) => format!("lang:{it}"),
-        }
-    }
-
-    fn origin_from_module_def(&self, item: ModuleDef) -> Option<String> {
-        match item {
-            ModuleDef::Module(it) => Some(self.origin_from_hir(it)),
-            ModuleDef::Function(it) => Some(self.origin_from_hir(it)),
-            ModuleDef::Adt(Adt::Enum(it)) => Some(self.origin_from_hir(it)),
-            ModuleDef::Adt(Adt::Struct(it)) => Some(self.origin_from_hir(it)),
-            ModuleDef::Adt(Adt::Union(it)) => Some(self.origin_from_hir(it)),
-            ModuleDef::Trait(it) => Some(self.origin_from_hir(it)),
-            ModuleDef::Variant(it) => Some(self.origin_from_enum_variant(it)),
-            ModuleDef::Static(_) => None,
-            ModuleDef::TraitAlias(_) => None,
-            ModuleDef::TypeAlias(_) => None,
-            ModuleDef::BuiltinType(_) => None,
-            ModuleDef::Macro(_) => None,
-            ModuleDef::Const(_) => None,
-        }
-    }
-
-    fn origin_from_enum_variant(&self, item: Variant) -> String {
-        // if we have a Hir entity, it means we have semantics
-        let sema = self.semantics.as_ref().unwrap();
-        self.origin_from_hir(item.parent_enum(sema.db))
-    }
-
-    pub(crate) fn extract_canonical_origin<T: AddressableAst + HasName>(
-        &mut self,
-        item: &T,
-        label: Label<generated::Addressable>,
-    ) {
-        if !self.resolve_paths {
-            return;
-        }
-        (|| {
-            let sema = self.semantics.as_ref()?;
-            let def = T::Hir::try_from_source(item, sema)?;
-            let path = self.canonical_path_from_hir(def)?;
-            let origin = self.origin_from_hir(def);
-            generated::Addressable::emit_crate_origin(label, origin, &mut self.trap.writer);
-            generated::Addressable::emit_extended_canonical_path(
-                label,
-                path,
-                &mut self.trap.writer,
-            );
-            Some(())
-        })();
-    }
-
-    pub(crate) fn extract_canonical_origin_of_enum_variant(
-        &mut self,
-        item: &ast::Variant,
-        label: Label<generated::Variant>,
-    ) {
-        if !self.resolve_paths {
-            return;
-        }
-        (|| {
-            let sema = self.semantics.as_ref()?;
-            let def = sema.to_enum_variant_def(item)?;
-            let path = self.canonical_path_from_enum_variant(def)?;
-            let origin = self.origin_from_enum_variant(def);
-            generated::Addressable::emit_crate_origin(label.into(), origin, &mut self.trap.writer);
-            generated::Addressable::emit_extended_canonical_path(
-                label.into(),
-                path,
-                &mut self.trap.writer,
-            );
-            Some(())
-        })();
-    }
-
-    pub(crate) fn extract_path_canonical_destination(
-        &mut self,
-        item: &impl PathAst,
-        label: Label<generated::Resolvable>,
-    ) {
-        if !self.resolve_paths {
-            return;
-        }
-        (|| {
-            let path = item.path()?;
-            let sema = self.semantics.as_ref()?;
-            let resolution = sema.resolve_path(&path)?;
-            let PathResolution::Def(def) = resolution else {
-                return None;
-            };
-            let origin = self.origin_from_module_def(def)?;
-            let path = self.canonical_path_from_module_def(def)?;
-            generated::Resolvable::emit_resolved_crate_origin(label, origin, &mut self.trap.writer);
-            generated::Resolvable::emit_resolved_path(label, path, &mut self.trap.writer);
-            Some(())
-        })();
-    }
-
-    pub(crate) fn extract_method_canonical_destination(
-        &mut self,
-        item: &ast::MethodCallExpr,
-        label: Label<generated::MethodCallExpr>,
-    ) {
-        if !self.resolve_paths {
-            return;
-        }
-        (|| {
-            let sema = self.semantics.as_ref()?;
-            let resolved = sema.resolve_method_call_fallback(item)?;
-            let (Either::Left(function), _) = resolved else {
-                return None;
-            };
-            let origin = self.origin_from_hir(function);
-            let path = self.canonical_path_from_hir(function)?;
-            generated::Resolvable::emit_resolved_crate_origin(
-                label.into(),
-                origin,
-                &mut self.trap.writer,
-            );
-            generated::Resolvable::emit_resolved_path(label.into(), path, &mut self.trap.writer);
-            Some(())
-        })();
-    }
-
     pub(crate) fn should_be_excluded(&self, item: &impl ast::HasAttrs) -> bool {
         self.semantics.is_some_and(|sema| {
             item.attrs().any(|attr| {
@@ -834,6 +515,38 @@ impl<'a> Translator<'a> {
         }
     }
 
+    pub(crate) fn emit_macro_stmts(
+        &mut self,
+        node: &ast::MacroStmts,
+    ) -> Option<Label<generated::MacroBlockExpr>> {
+        // not generated to work around a bug in rust-analyzer AST generation machinery.
+        // Because an Expr can also be a Stmt (AsmExpr: Expr and AsmExpr: Item: Stmt)
+        // then such an element will be returned by both `expr()` and `statements()`
+        let mut statements = node.statements().collect::<Vec<_>>();
+        let tail_expr = node.expr();
+        if tail_expr
+            .as_ref()
+            .is_some_and(|e| statements.last().is_some_and(|s| s.syntax() == e.syntax()))
+        {
+            // if the expression matched as both the tail_expr and the last of the statements,
+            // only take it as tail_expr
+            statements.pop();
+        }
+        let tail_expr = tail_expr.and_then(|e| self.emit_expr(&e));
+        let statements = statements
+            .iter()
+            .filter_map(|x| self.emit_stmt(x))
+            .collect();
+        let label = self.trap.emit(generated::MacroBlockExpr {
+            id: TrapId::Star,
+            tail_expr,
+            statements,
+        });
+        self.emit_location(label, node);
+        self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
+        Some(label)
+    }
+
     fn is_attribute_macro_target(&self, node: &ast::Item) -> bool {
         // rust-analyzer considers as an `attr_macro_call` also a plain macro call, but we want to
         // process that differently (in `extract_macro_call_expanded`)
diff --git a/rust/extractor/src/translate/generated.rs b/rust/extractor/src/translate/generated.rs
index 787ce71bf2a..e6cc06419fc 100644
--- a/rust/extractor/src/translate/generated.rs
+++ b/rust/extractor/src/translate/generated.rs
@@ -212,6 +212,7 @@ impl Translator<'_> {
             return Some(label);
         }
         let label = match node {
+            ast::Item::AsmExpr(inner) => self.emit_asm_expr(inner).map(Into::into),
             ast::Item::Const(inner) => self.emit_const(inner).map(Into::into),
             ast::Item::Enum(inner) => self.emit_enum(inner).map(Into::into),
             ast::Item::ExternBlock(inner) => self.emit_extern_block(inner).map(Into::into),
@@ -687,21 +688,6 @@ impl Translator<'_> {
         self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
         Some(label)
     }
-    pub(crate) fn emit_closure_binder(
-        &mut self,
-        node: &ast::ClosureBinder,
-    ) -> Option<Label<generated::ClosureBinder>> {
-        let generic_param_list = node
-            .generic_param_list()
-            .and_then(|x| self.emit_generic_param_list(&x));
-        let label = self.trap.emit(generated::ClosureBinder {
-            id: TrapId::Star,
-            generic_param_list,
-        });
-        self.emit_location(label, node);
-        self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
-        Some(label)
-    }
     pub(crate) fn emit_closure_expr(
         &mut self,
         node: &ast::ClosureExpr,
@@ -710,10 +696,8 @@ impl Translator<'_> {
             return None;
         }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
-        let body = node.body().and_then(|x| self.emit_expr(&x));
-        let closure_binder = node
-            .closure_binder()
-            .and_then(|x| self.emit_closure_binder(&x));
+        let closure_body = node.body().and_then(|x| self.emit_expr(&x));
+        let for_binder = node.for_binder().and_then(|x| self.emit_for_binder(&x));
         let is_async = node.async_token().is_some();
         let is_const = node.const_token().is_some();
         let is_gen = node.gen_token().is_some();
@@ -724,8 +708,8 @@ impl Translator<'_> {
         let label = self.trap.emit(generated::ClosureExpr {
             id: TrapId::Star,
             attrs,
-            body,
-            closure_binder,
+            closure_body,
+            for_binder,
             is_async,
             is_const,
             is_gen,
@@ -1000,7 +984,7 @@ impl Translator<'_> {
         }
         let abi = node.abi().and_then(|x| self.emit_abi(&x));
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
-        let body = if self.should_skip_bodies() {
+        let function_body = if self.should_skip_bodies() {
             None
         } else {
             node.body().and_then(|x| self.emit_block_expr(&x))
@@ -1022,7 +1006,7 @@ impl Translator<'_> {
             id: TrapId::Star,
             abi,
             attrs,
-            body,
+            function_body,
             generic_param_list,
             is_async,
             is_const,
@@ -1063,6 +1047,21 @@ impl Translator<'_> {
         self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
         Some(label)
     }
+    pub(crate) fn emit_for_binder(
+        &mut self,
+        node: &ast::ForBinder,
+    ) -> Option<Label<generated::ForBinder>> {
+        let generic_param_list = node
+            .generic_param_list()
+            .and_then(|x| self.emit_generic_param_list(&x));
+        let label = self.trap.emit(generated::ForBinder {
+            id: TrapId::Star,
+            generic_param_list,
+        });
+        self.emit_location(label, node);
+        self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
+        Some(label)
+    }
     pub(crate) fn emit_for_expr(
         &mut self,
         node: &ast::ForExpr,
@@ -1091,13 +1090,11 @@ impl Translator<'_> {
         &mut self,
         node: &ast::ForType,
     ) -> Option<Label<generated::ForTypeRepr>> {
-        let generic_param_list = node
-            .generic_param_list()
-            .and_then(|x| self.emit_generic_param_list(&x));
+        let for_binder = node.for_binder().and_then(|x| self.emit_for_binder(&x));
         let type_repr = node.ty().and_then(|x| self.emit_type(&x));
         let label = self.trap.emit(generated::ForTypeRepr {
             id: TrapId::Star,
-            generic_param_list,
+            for_binder,
             type_repr,
         });
         self.emit_location(label, node);
@@ -1603,24 +1600,6 @@ impl Translator<'_> {
         self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
         Some(label)
     }
-    pub(crate) fn emit_macro_stmts(
-        &mut self,
-        node: &ast::MacroStmts,
-    ) -> Option<Label<generated::MacroBlockExpr>> {
-        let tail_expr = node.expr().and_then(|x| self.emit_expr(&x));
-        let statements = node
-            .statements()
-            .filter_map(|x| self.emit_stmt(&x))
-            .collect();
-        let label = self.trap.emit(generated::MacroBlockExpr {
-            id: TrapId::Star,
-            tail_expr,
-            statements,
-        });
-        self.emit_location(label, node);
-        self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
-        Some(label)
-    }
     pub(crate) fn emit_macro_type(
         &mut self,
         node: &ast::MacroType,
@@ -1736,9 +1715,6 @@ impl Translator<'_> {
         &mut self,
         node: &ast::MethodCallExpr,
     ) -> Option<Label<generated::MethodCallExpr>> {
-        if let Some(label) = self.pre_emit(node) {
-            return Some(label);
-        }
         if self.should_be_excluded(node) {
             return None;
         }
@@ -1758,14 +1734,10 @@ impl Translator<'_> {
             receiver,
         });
         self.emit_location(label, node);
-        self.post_emit(node, label);
         self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
         Some(label)
     }
     pub(crate) fn emit_module(&mut self, node: &ast::Module) -> Option<Label<generated::Module>> {
-        if let Some(label) = self.pre_emit(node) {
-            return Some(label);
-        }
         if self.should_be_excluded(node) {
             return None;
         }
@@ -1781,7 +1753,6 @@ impl Translator<'_> {
             visibility,
         });
         self.emit_location(label, node);
-        self.post_emit(node, label);
         self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
         Some(label)
     }
@@ -1964,9 +1935,6 @@ impl Translator<'_> {
         &mut self,
         node: &ast::PathExpr,
     ) -> Option<Label<generated::PathExpr>> {
-        if let Some(label) = self.pre_emit(node) {
-            return Some(label);
-        }
         if self.should_be_excluded(node) {
             return None;
         }
@@ -1978,7 +1946,6 @@ impl Translator<'_> {
             path,
         });
         self.emit_location(label, node);
-        self.post_emit(node, label);
         self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
         Some(label)
     }
@@ -1986,16 +1953,12 @@ impl Translator<'_> {
         &mut self,
         node: &ast::PathPat,
     ) -> Option<Label<generated::PathPat>> {
-        if let Some(label) = self.pre_emit(node) {
-            return Some(label);
-        }
         let path = node.path().and_then(|x| self.emit_path(&x));
         let label = self.trap.emit(generated::PathPat {
             id: TrapId::Star,
             path,
         });
         self.emit_location(label, node);
-        self.post_emit(node, label);
         self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
         Some(label)
     }
@@ -2123,9 +2086,6 @@ impl Translator<'_> {
         &mut self,
         node: &ast::RecordExpr,
     ) -> Option<Label<generated::StructExpr>> {
-        if let Some(label) = self.pre_emit(node) {
-            return Some(label);
-        }
         let path = node.path().and_then(|x| self.emit_path(&x));
         let struct_expr_field_list = node
             .record_expr_field_list()
@@ -2136,7 +2096,6 @@ impl Translator<'_> {
             struct_expr_field_list,
         });
         self.emit_location(label, node);
-        self.post_emit(node, label);
         self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
         Some(label)
     }
@@ -2229,9 +2188,6 @@ impl Translator<'_> {
         &mut self,
         node: &ast::RecordPat,
     ) -> Option<Label<generated::StructPat>> {
-        if let Some(label) = self.pre_emit(node) {
-            return Some(label);
-        }
         let path = node.path().and_then(|x| self.emit_path(&x));
         let struct_pat_field_list = node
             .record_pat_field_list()
@@ -2242,7 +2198,6 @@ impl Translator<'_> {
             struct_pat_field_list,
         });
         self.emit_location(label, node);
-        self.post_emit(node, label);
         self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
         Some(label)
     }
@@ -2568,9 +2523,6 @@ impl Translator<'_> {
         Some(label)
     }
     pub(crate) fn emit_trait(&mut self, node: &ast::Trait) -> Option<Label<generated::Trait>> {
-        if let Some(label) = self.pre_emit(node) {
-            return Some(label);
-        }
         if self.should_be_excluded(node) {
             return None;
         }
@@ -2602,7 +2554,6 @@ impl Translator<'_> {
             where_clause,
         });
         self.emit_location(label, node);
-        self.post_emit(node, label);
         self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
         Some(label)
     }
@@ -2725,9 +2676,6 @@ impl Translator<'_> {
         &mut self,
         node: &ast::TupleStructPat,
     ) -> Option<Label<generated::TupleStructPat>> {
-        if let Some(label) = self.pre_emit(node) {
-            return Some(label);
-        }
         let fields = node.fields().filter_map(|x| self.emit_pat(&x)).collect();
         let path = node.path().and_then(|x| self.emit_path(&x));
         let label = self.trap.emit(generated::TupleStructPat {
@@ -2736,7 +2684,6 @@ impl Translator<'_> {
             path,
         });
         self.emit_location(label, node);
-        self.post_emit(node, label);
         self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
         Some(label)
     }
@@ -2804,6 +2751,7 @@ impl Translator<'_> {
         &mut self,
         node: &ast::TypeBound,
     ) -> Option<Label<generated::TypeBound>> {
+        let for_binder = node.for_binder().and_then(|x| self.emit_for_binder(&x));
         let is_async = node.async_token().is_some();
         let is_const = node.const_token().is_some();
         let lifetime = node.lifetime().and_then(|x| self.emit_lifetime(&x));
@@ -2813,6 +2761,7 @@ impl Translator<'_> {
             .and_then(|x| self.emit_use_bound_generic_args(&x));
         let label = self.trap.emit(generated::TypeBound {
             id: TrapId::Star,
+            for_binder,
             is_async,
             is_const,
             lifetime,
@@ -2984,9 +2933,6 @@ impl Translator<'_> {
         &mut self,
         node: &ast::Variant,
     ) -> Option<Label<generated::Variant>> {
-        if let Some(label) = self.pre_emit(node) {
-            return Some(label);
-        }
         if self.should_be_excluded(node) {
             return None;
         }
@@ -3004,7 +2950,6 @@ impl Translator<'_> {
             visibility,
         });
         self.emit_location(label, node);
-        self.post_emit(node, label);
         self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
         Some(label)
     }
@@ -3057,9 +3002,7 @@ impl Translator<'_> {
         &mut self,
         node: &ast::WherePred,
     ) -> Option<Label<generated::WherePred>> {
-        let generic_param_list = node
-            .generic_param_list()
-            .and_then(|x| self.emit_generic_param_list(&x));
+        let for_binder = node.for_binder().and_then(|x| self.emit_for_binder(&x));
         let lifetime = node.lifetime().and_then(|x| self.emit_lifetime(&x));
         let type_repr = node.ty().and_then(|x| self.emit_type(&x));
         let type_bound_list = node
@@ -3067,7 +3010,7 @@ impl Translator<'_> {
             .and_then(|x| self.emit_type_bound_list(&x));
         let label = self.trap.emit(generated::WherePred {
             id: TrapId::Star,
-            generic_param_list,
+            for_binder,
             lifetime,
             type_repr,
             type_bound_list,
@@ -3168,39 +3111,12 @@ impl HasTrapClass for ast::MacroCall {
 impl HasTrapClass for ast::Meta {
     type TrapClass = generated::Meta;
 }
-impl HasTrapClass for ast::MethodCallExpr {
-    type TrapClass = generated::MethodCallExpr;
-}
-impl HasTrapClass for ast::Module {
-    type TrapClass = generated::Module;
-}
-impl HasTrapClass for ast::PathExpr {
-    type TrapClass = generated::PathExpr;
-}
-impl HasTrapClass for ast::PathPat {
-    type TrapClass = generated::PathPat;
-}
 impl HasTrapClass for ast::PathSegment {
     type TrapClass = generated::PathSegment;
 }
-impl HasTrapClass for ast::RecordExpr {
-    type TrapClass = generated::StructExpr;
-}
-impl HasTrapClass for ast::RecordPat {
-    type TrapClass = generated::StructPat;
-}
 impl HasTrapClass for ast::Struct {
     type TrapClass = generated::Struct;
 }
-impl HasTrapClass for ast::Trait {
-    type TrapClass = generated::Trait;
-}
-impl HasTrapClass for ast::TupleStructPat {
-    type TrapClass = generated::TupleStructPat;
-}
 impl HasTrapClass for ast::Union {
     type TrapClass = generated::Union;
 }
-impl HasTrapClass for ast::Variant {
-    type TrapClass = generated::Variant;
-}
diff --git a/rust/extractor/src/translate/mappings.rs b/rust/extractor/src/translate/mappings.rs
index 3e71c6deb14..f1a42dbf245 100644
--- a/rust/extractor/src/translate/mappings.rs
+++ b/rust/extractor/src/translate/mappings.rs
@@ -1,6 +1,4 @@
 use crate::trap::{Label, TrapClass};
-use ra_ap_hir::{Enum, Function, HasContainer, Module, Semantics, Struct, Trait, Union};
-use ra_ap_ide_db::RootDatabase;
 use ra_ap_syntax::{AstNode, ast, ast::RangeItem};
 
 pub(crate) trait HasTrapClass: AstNode {
@@ -65,155 +63,3 @@ impl TextValue for ast::RangePat {
         self.op_token().map(|x| x.text().to_string())
     }
 }
-
-pub(crate) trait AddressableHir<Ast: AstNode>: HasContainer + Copy {
-    fn name(self, sema: &Semantics<'_, RootDatabase>) -> Option<String>;
-    fn try_from_source(value: &Ast, sema: &Semantics<'_, RootDatabase>) -> Option<Self>;
-    fn module(self, sema: &Semantics<'_, RootDatabase>) -> Module;
-}
-
-impl AddressableHir<ast::Fn> for Function {
-    fn name(self, sema: &Semantics<'_, RootDatabase>) -> Option<String> {
-        Some(self.name(sema.db).as_str().to_owned())
-    }
-
-    fn try_from_source(value: &ast::Fn, sema: &Semantics<'_, RootDatabase>) -> Option<Self> {
-        sema.to_fn_def(value)
-    }
-
-    fn module(self, sema: &Semantics<'_, RootDatabase>) -> Module {
-        self.module(sema.db)
-    }
-}
-
-impl AddressableHir<ast::Trait> for Trait {
-    fn name(self, sema: &Semantics<'_, RootDatabase>) -> Option<String> {
-        Some(self.name(sema.db).as_str().to_owned())
-    }
-
-    fn try_from_source(value: &ast::Trait, sema: &Semantics<'_, RootDatabase>) -> Option<Self> {
-        sema.to_trait_def(value)
-    }
-
-    fn module(self, sema: &Semantics<'_, RootDatabase>) -> Module {
-        self.module(sema.db)
-    }
-}
-
-impl AddressableHir<ast::Module> for Module {
-    fn name(self, sema: &Semantics<'_, RootDatabase>) -> Option<String> {
-        self.name(sema.db).map(|s| s.as_str().to_owned())
-    }
-
-    fn try_from_source(value: &ast::Module, sema: &Semantics<'_, RootDatabase>) -> Option<Self> {
-        sema.to_module_def(value)
-    }
-
-    fn module(self, _sema: &Semantics<'_, RootDatabase>) -> Module {
-        self
-    }
-}
-
-impl AddressableHir<ast::Struct> for Struct {
-    fn name(self, sema: &Semantics<'_, RootDatabase>) -> Option<String> {
-        Some(self.name(sema.db).as_str().to_owned())
-    }
-
-    fn try_from_source(value: &ast::Struct, sema: &Semantics<'_, RootDatabase>) -> Option<Self> {
-        sema.to_struct_def(value)
-    }
-
-    fn module(self, sema: &Semantics<'_, RootDatabase>) -> Module {
-        self.module(sema.db)
-    }
-}
-
-impl AddressableHir<ast::Enum> for Enum {
-    fn name(self, sema: &Semantics<'_, RootDatabase>) -> Option<String> {
-        Some(self.name(sema.db).as_str().to_owned())
-    }
-
-    fn try_from_source(value: &ast::Enum, sema: &Semantics<'_, RootDatabase>) -> Option<Self> {
-        sema.to_enum_def(value)
-    }
-
-    fn module(self, sema: &Semantics<'_, RootDatabase>) -> Module {
-        self.module(sema.db)
-    }
-}
-
-impl AddressableHir<ast::Union> for Union {
-    fn name(self, sema: &Semantics<'_, RootDatabase>) -> Option<String> {
-        Some(self.name(sema.db).as_str().to_owned())
-    }
-
-    fn try_from_source(value: &ast::Union, sema: &Semantics<'_, RootDatabase>) -> Option<Self> {
-        sema.to_union_def(value)
-    }
-
-    fn module(self, sema: &Semantics<'_, RootDatabase>) -> Module {
-        self.module(sema.db)
-    }
-}
-
-pub(crate) trait AddressableAst: AstNode + Sized {
-    type Hir: AddressableHir<Self>;
-}
-
-impl AddressableAst for ast::Fn {
-    type Hir = Function;
-}
-
-impl AddressableAst for ast::Trait {
-    type Hir = Trait;
-}
-
-impl AddressableAst for ast::Struct {
-    type Hir = Struct;
-}
-
-impl AddressableAst for ast::Enum {
-    type Hir = Enum;
-}
-
-impl AddressableAst for ast::Union {
-    type Hir = Union;
-}
-
-impl AddressableAst for ast::Module {
-    type Hir = Module;
-}
-
-pub trait PathAst: AstNode {
-    fn path(&self) -> Option<ast::Path>;
-}
-
-impl PathAst for ast::PathExpr {
-    fn path(&self) -> Option<ast::Path> {
-        self.path()
-    }
-}
-
-impl PathAst for ast::RecordExpr {
-    fn path(&self) -> Option<ast::Path> {
-        self.path()
-    }
-}
-
-impl PathAst for ast::PathPat {
-    fn path(&self) -> Option<ast::Path> {
-        self.path()
-    }
-}
-
-impl PathAst for ast::RecordPat {
-    fn path(&self) -> Option<ast::Path> {
-        self.path()
-    }
-}
-
-impl PathAst for ast::TupleStructPat {
-    fn path(&self) -> Option<ast::Path> {
-        self.path()
-    }
-}
diff --git a/rust/extractor/src/trap.rs b/rust/extractor/src/trap.rs
index 3a6dbeb24e1..31e9f2122d7 100644
--- a/rust/extractor/src/trap.rs
+++ b/rust/extractor/src/trap.rs
@@ -127,9 +127,10 @@ pub struct TrapFile {
     compression: Compression,
 }
 
-#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Default)]
 pub enum DiagnosticSeverity {
     Debug = 10,
+    #[default]
     Info = 20,
     Warning = 30,
     Error = 40,
diff --git a/rust/ql/.generated.list b/rust/ql/.generated.list
index cac9970eeec..5ed2894e273 100644
--- a/rust/ql/.generated.list
+++ b/rust/ql/.generated.list
@@ -1,4 +1,4 @@
-lib/codeql/rust/controlflow/internal/generated/CfgNodes.qll 6a103a6d04c951ca2f0c2989bed737cdbac56dd5ea9432b858da3416412bbf79 cf2bc67b65a1555de58bbd0a35b834b8867112a2f7c1951307c9416400ce70d0
+lib/codeql/rust/controlflow/internal/generated/CfgNodes.qll 11c7521ec2231a4d0447f30fc3d0bb14aebb659bd8cf75935af1050673a3b1d6 d0a77b572a032e43f1c47622315c0cdfe17e68c2b057534b9322fc528029fb40
 lib/codeql/rust/elements/Abi.qll 485a2e79f6f7bfd1c02a6e795a71e62dede3c3e150149d5f8f18b761253b7208 6159ba175e7ead0dd2e3f2788f49516c306ee11b1a443bd4bdc00b7017d559bd
 lib/codeql/rust/elements/Addressable.qll 13011bfd2e1556694c3d440cc34af8527da4df49ad92b62f2939d3699ff2cea5 ddb25935f7553a1a384b1abe2e4b4fa90ab50b952dadec32fd867afcb054f4be
 lib/codeql/rust/elements/Adt.qll c2afed4ac2e17039ccd98f74ea22111f4d765c4e232c50ccd3128da0d26da837 1380bde2eb667c6ec2ef5f8710aa24e926851c9e321ebc72ba514fa92c369dc3
@@ -10,7 +10,7 @@ lib/codeql/rust/elements/ArrayTypeRepr.qll a3e61c99567893aa26c610165696e54d11c16
 lib/codeql/rust/elements/AsmClobberAbi.qll eb5628916f41ab47e333b4528fba3fb80caecd2805fb20ba4f5c8d59c9677f14 636fce6b3a7f04141d0d3a53734d08a188a45bcc04f755bb66746d4f0a13fa72
 lib/codeql/rust/elements/AsmConst.qll f408468624dd0c80c6dcf62d17e65a94cd477a5a760be1b5fdd07c8189a3b4ea e4159073b3ee6d247e8962ce925da55ea39ee2cd1649f8b785a92aea17dbf144
 lib/codeql/rust/elements/AsmDirSpec.qll 0c439c031c9f60596373aee8ae2ee70068582548ae365a3c7c19c8b5e2b030d2 0127b08b99bd8725cb6273c1a930aef4434897f23611cfc4ec2dd1b7c9d7e3d0
-lib/codeql/rust/elements/AsmExpr.qll 33a9a873ba05235dd80103ed22555eee220a4c0cb86605d0f76bcda316605449 c8a99b7bd55aac41e56d05cd5a52692f1d835ed3e1a1bd029bb41d8e2b81b240
+lib/codeql/rust/elements/AsmExpr.qll 0a477c401583a778ea6736070eaf8959f9312135e863e45fafb6c160da2e8f1b 0447b2438c694f9e9bd2629abb66281724d27b17e534fa8e9a19b2ea30af18d2
 lib/codeql/rust/elements/AsmLabel.qll 5fa3401c49329ddc845bd95d5f498a455202f685e962dfec9bc91550577da800 f54fe1dcd3c76f36e6abc7b56dc5d6f5b1c30d0fb434db21dd8a1ce731fc6abf
 lib/codeql/rust/elements/AsmOperand.qll 3987a289233fe09f41f20b27939655cc72fa46847969a55cca6d6393f906969a 8810ff2a64f29d1441a449f5fd74bdc1107782172c7a21baaeb48a40930b7d5a
 lib/codeql/rust/elements/AsmOperandExpr.qll 72d4455cf742dc977b0a33ea21539422aaf2263f36c6f4420ddcb360ac606a0a 03bd01e81b291c915deb20ce33d5bdf73a709fbc007ab7570490e9a8e7c8604c
@@ -34,10 +34,9 @@ lib/codeql/rust/elements/BoxPat.qll 1b2c3fff171aa6aa238c9460b122f26c79e04577cea6
 lib/codeql/rust/elements/BreakExpr.qll 7ca3807a20e9a9a988d1fd7abebf240325ed422fcb45c719ba46272f031f94db dffb7379d3f3ba220acfbd05eb7bb6cfd9cfda211e9c8b1f5240ca5fa61be3fc
 lib/codeql/rust/elements/CallExpr.qll f336500ca7a611b164d48b90e80edb0c0d3816792b0ececce659ac1ff1ffeb3e f99a9c55466418ef53860c44d9f2d6161af4b492178ddd9e5870dff742b70ae5
 lib/codeql/rust/elements/CallExprBase.qll 2846202b5208b541977500286951d96487bf555838c6c16cdd006a71e383745a c789d412bf099c624329379e0c7d94fa0d23ae2edea7a25a2ea0f3c0042ccf62
-lib/codeql/rust/elements/Callable.qll 0f7f78c3bfabbe24962f6232b0440d27e51f06d2b8d341fc623ffbfbff173f47 5fd13aaa0eaf76ea0b47fa0641bd23eea20a069f0b3cbc1ee4e290e88321008a
+lib/codeql/rust/elements/Callable.qll 08a46e987b8fde29069795a536fcd1ad1a96f60341f72293e4d07e20334d554f cfc2be9287000718e5ff3c2a35bb45ffc93fd36d97f2e034888e9aa2ae9af555
 lib/codeql/rust/elements/CastExpr.qll 2fe1f36ba31fa29de309baf0a665cfcae67b61c73345e8f9bbd41e8c235fec45 c5b4c1e9dc24eb2357799defcb2df25989075e3a80e8663b74204a1c1b70e29a
-lib/codeql/rust/elements/ClosureBinder.qll 02c8e83bf07deaf7bf0233b76623ec7f1837be8b77fe7e1c23544edc7d85e3c4 2b114d9a6dede694324aebe3dac80a802d139cfacd39beb0f12b5b0a46ee6390
-lib/codeql/rust/elements/ClosureExpr.qll 67e2a106e9154c90367b129987e574d2a9ecf5b297536627e43706675d35eaed d6a381132ddd589c5a7ce174f50f9620041ddf690e15a65ebfb05ff7e7c02de7
+lib/codeql/rust/elements/ClosureExpr.qll 69e0b7a7c7a4c348fcada5ad4da22dd2f51747109f856be239cede315a56d695 93400650282e2d4e682b826e9f5f844aa893dda126548e41ea1c703d2bf209ca
 lib/codeql/rust/elements/Comment.qll fedad50575125e9a64a8a8776a8c1dbf1e76df990f01849d9f0955f9d74cb2a6 8eb1afad1e1007a4f0090fdac65d81726b23eda6517d067fd0185f70f17635ab
 lib/codeql/rust/elements/Const.qll 5f4d11e01162a06127ba56519efd66d1ecfb5de7c1792fc1c283a56cf2127373 8c618ac774267d25db70cc05a080f8a408dc23ab7e88c0fc543eda8b4d4cb995
 lib/codeql/rust/elements/ConstArg.qll 01865b3be4790c627a062c59ea608462931abcb2f94a132cf265318664fd1251 a2c6bbf63dbfa999e511b6941143a51c9392477d8ccd25e081f85475936ff558
@@ -57,8 +56,9 @@ lib/codeql/rust/elements/ExternItemList.qll eceb0fcd3a6f9d87fa044da1da112ce96b75
 lib/codeql/rust/elements/FieldExpr.qll 8102cd659f9059cf6af2a22033cfcd2aae9c35204b86f7d219a05f1f8de54b3b f818169dddf5102095ae1410583615f80031376a08b5307d0c464e79953c3975
 lib/codeql/rust/elements/FieldList.qll 72f3eace2f0c0600b1ad059819ae756f1feccd15562e0449a3f039a680365462 50e4c01df7b801613688b06bb47ccc36e6c8c7fa2e50cc62cb4705c9abf5ee31
 lib/codeql/rust/elements/FnPtrTypeRepr.qll d4586ac5ee2382b5ef9daafa77c7b3c1b7564647aa20d1efb1626299cde87ba9 48d9b63725c9cd89d79f9806fa5d5f22d7815e70bbd78d8da40a2359ac53fef5
+lib/codeql/rust/elements/ForBinder.qll ee29b55cb4c1fa5180cc4ee1236ac089fe9f67ffa9e5a1474003b717f1ac6e0f 5b811c8cf9550cb675034315e03c5cbbfa7544ad3a696988e04d780037d434bf
 lib/codeql/rust/elements/ForExpr.qll a050f60cf6fcc3ce66f5042be1b8096e5207fe2674d7477f9e299091ca99a4bd d7198495139649778894e930163add2d16b5588dd12bd6e094a9aec6863cb16f
-lib/codeql/rust/elements/ForTypeRepr.qll b3ba3a7f74f092397f7986542e59020bd7ea63eb8abc154d0f66f1415e1eaf6e a04750567cf85e11698a6b93674a651245537d08bf8aabf303a3626e190a4977
+lib/codeql/rust/elements/ForTypeRepr.qll c85c5e368b9db4a308b55259b3e6b1f4d37050984de43b24971243d6ca6dcec5 51b1c3ddac2fb9616ec44816bcbb549df2c15bbbe674d045a7b1c352c1e335e3
 lib/codeql/rust/elements/Format.qll 1b186730710e7e29ea47594998f0b359ad308927f84841adae0c0cb35fc8aeda d6f7bfdda60a529fb9e9a1975628d5bd11aa28a45e295c7526692ac662fd19f8
 lib/codeql/rust/elements/FormatArgsArg.qll a2c23cd512d44dd60b7d65eba52cc3adf6e2fbbcd0588be375daa16002cd7741 d9c5fe183fb228375223d83f857b7a9ee686f1d3e341bcf323d7c6f39652f88b
 lib/codeql/rust/elements/FormatArgsExpr.qll 8127cbe4082f7acc3d8a05298c2c9bea302519b8a6cd2d158a83c516d18fc487 88cf9b3bedd69a1150968f9a465c904bbb6805da0e0b90cfd1fc0dab1f6d9319
@@ -90,7 +90,7 @@ lib/codeql/rust/elements/LiteralPat.qll daffb5f380a47543669c8cc92628b0e0de478c3a
 lib/codeql/rust/elements/Locatable.qll 2855efa4a469b54e0ca85daa89309a8b991cded6f3f10db361010831ba1e11d3 00c3406d14603f90abea11bf074eaf2c0b623a30e29cf6afc3a247cb58b92f0f
 lib/codeql/rust/elements/LoopExpr.qll ee171177650fa23eef102a9580765f4b6073a1cc41bab1ec31ad4f84ffe6c2c9 bfcf0cca4dc944270d9748a202829a38c64dfae167c0d3a4202788ceb9daf5f6
 lib/codeql/rust/elements/LoopingExpr.qll 7ad7d4bbfd05adc0bb9b4ca90ff3377b8298121ca5360ffb45d5a7a1e20fe37a 964168b2045ee9bad827bba53f10a64d649b3513f2d1e3c17a1b1f11d0fc7f3a
-lib/codeql/rust/elements/MacroBlockExpr.qll fb81f067a142053b122e2875a15719565024cfb09326faf12e0f1017307deb58 3ee94ef7e56bd07a8f9304869b0a7b69971b02abbee46d0bebcacb4031760282
+lib/codeql/rust/elements/MacroBlockExpr.qll 077c968da099c10456be4b594675a074e9a4e43b5c5145e1b1ae1fa47ae6d570 99586e3766ee0c80364998128e067cab2639ac25c1dcbe13e0247d629490af6f
 lib/codeql/rust/elements/MacroCall.qll 452aee152b655cdd5a69bf973977072f000a6451f626469a3f7313f0468ffc18 a8652d0de1c6c2118d683d5465ba4115dd4c65031896440269a2a0522d90fceb
 lib/codeql/rust/elements/MacroDef.qll 5bcf2bba7ba40879fe47370bfeb65b23c67c463be20535327467338a1e2e04bb c3d28416fc08e5d79149fccd388fea2bc3097bce074468a323383056404926db
 lib/codeql/rust/elements/MacroExpr.qll 640554f4964def19936a16ce88a03fb12f74ec2bcfe38b88d32742b79f85d909 a284fb66e012664a33a4e9c8fd3e38d3ffd588fccd6b16b02270da55fc025f7a
@@ -103,7 +103,7 @@ lib/codeql/rust/elements/MatchArmList.qll f221c5e344814fa44db06ab897afdc249e8e88
 lib/codeql/rust/elements/MatchExpr.qll e9ef1664f020823b6f4bb72d906a9dc0c1ee6432d4a9a13f7dbdbab2b2b1ee4d 38d71e5c487abcb5682293c573343be66e499a6e131bb630604c120d34b7777b
 lib/codeql/rust/elements/MatchGuard.qll 58256689a90f24b16401543452c2a32f00d619ddac6c0fe8b65a8cd3e46401bb 8efb2ac03c69a9db687e382331085d7a6cfbf8eca559174ba2727a9549ec7ddd
 lib/codeql/rust/elements/Meta.qll b17d7bf605bd0cf4f6d6c6cf4f39a16cfc431d256d45b93663a7569181d36168 815cdfef06231de4b4b1c85e321b8ccb3e22379e5a4e111df9cc9ca6be593841
-lib/codeql/rust/elements/MethodCallExpr.qll 318a46ba61e3e4f0d6ce0e8fa9f79ccbbf2d0f3d0638e6813e1bcb44d624715a 35e03ed4beddd75834fcfc4371bd65eaf099053aa23f7f1d1e6bea2e5825aa6e
+lib/codeql/rust/elements/MethodCallExpr.qll 91b411e0fb1a0547dcad8726db460dccc61bed972741598d5cb3740593fe75a7 538d23b6db115bb699389d29a1829bb0449c08424a1fff80377828eb7ceb2563
 lib/codeql/rust/elements/Missing.qll 70e6ac9790314752849c9888443c98223ccfc93a193998b7ce350b2c6ebe8ea4 e2f0623511acaa76b091f748d417714137a8b94f1f2bdbbd177f1c682c786dad
 lib/codeql/rust/elements/Module.qll 0bc85019177709256f8078d9de2a36f62f848d476225bff7bba1e35f249875c7 3fbb70e0c417a644dd0cada2c364c6e6876cfa16f37960e219c87e49c966c94e
 lib/codeql/rust/elements/Name.qll af41479d4260fe931d46154dda15484e4733c952b98f0e370106e6e9e8ce398b e188a0d0309dd1b684c0cb88df435b38e306eb94d6b66a2b748e75252f15e095
@@ -120,7 +120,7 @@ lib/codeql/rust/elements/ParenTypeRepr.qll 2388b6c663b2d02c834592c5da5cafac71baa
 lib/codeql/rust/elements/ParenthesizedArgList.qll aa3be48d2f8b5cec56db3866fb7d4e0cd97787e9123e2d947912eb8155bf372b 32790971728c9ae2f3d59155d46283aaf4f08238e47bb028a1f20a6d3a734b98
 lib/codeql/rust/elements/Pat.qll 56211c5cb4709e7c12a2bfd2da5e413a451672d99e23a8386c08ad0b999fd45c b1b1893a13a75c4f0390f7e2a14ee98a46f067cfdc991a8d43adc82497d20aff
 lib/codeql/rust/elements/Path.qll 16264a9c978a3027f623530e386a9ad16541305b252fed5e1bedcfbe1d6475d5 8c21063c7f344ce686342e7c12542fec05004e364681f7a31b65f5ee9263a46d
-lib/codeql/rust/elements/PathAstNode.qll c5c8627caaf863089d4d6004e206b2e62bc466db2ed5da9f3f443bf3dc29faf9 01107b1ce17cbee08a764962fb13d3f02edbd10675fa5bd89e089f03075ba443
+lib/codeql/rust/elements/PathAstNode.qll 68160b08272ecde0e636779b7c547f808356d69d1150863b37188ea84e110cab cafa2de0bf3be978854319bbcf5ad1591acd64abd7b0958ff14c96a7529fcc99
 lib/codeql/rust/elements/PathExpr.qll 0232228845a2005fc63d6b8aea8b49ff50415e0e90fd18f863ee1d6e44f53c07 47b15cc6ae576d13f14b29ffa4620451accc603ff87071dfe48660dbe018bf36
 lib/codeql/rust/elements/PathExprBase.qll bb41092ec690ae926e3233c215dcaf1fd8e161b8a6955151949f492e02dba13a b2257072f8062d31c29c63ee1311b07e0d2eb37075f582cfc76bb542ef773198
 lib/codeql/rust/elements/PathPat.qll a7069d1dd77ba66814d6c84e135ed2975d7fcf379624079e6a76dc44b5de832e 2294d524b65ab0d038094b2a00f73feb8ab70c8f49fb4d91e9d390073205631d
@@ -134,9 +134,8 @@ lib/codeql/rust/elements/RefExpr.qll 91a0d3a86002289dc01ffbe8daca13e34e92e522fbb
 lib/codeql/rust/elements/RefPat.qll fe076bdccb454111b38f360837d180274ba8a003b4cffe910b5197cd74188089 2604c8bb2b0b47091d5fc4aa276de46fe3561e346bd98f291c3783cef402ba06
 lib/codeql/rust/elements/RefTypeRepr.qll 563d2edc097aa1896b3dea5a3918e6225f23dda91b3fb46e2f4c32feb813d56c af3bd746239130e3e94dd41ab682473b29b8b900b05c557beb8a2eba6508ebd9
 lib/codeql/rust/elements/Rename.qll 5cb0ebad580d9842cfe65033059d4d373a1386f047f3a78f402a93e060e2c13e 642c6f37d94442575df12b2e998572a725d094ac5ae76147a56057e75138d72b
-lib/codeql/rust/elements/Resolvable.qll efeec2b4b14d85334ec745b9a0c5aa6f7b9f86fe3caa45b005dccaee4f5265c4 7efe0063340ba61dd31125bc770773ca23a7067893c0d1e06d149da6e9a9ee92
 lib/codeql/rust/elements/RestPat.qll 5fedfac18080b068f597c9bbb84de672834f72cc22295d6312e111f151f8e3c7 c0e1f77bfcdd40e8ab06ad8c138e6098d79940247758adf9de03a05b00c23de3
-lib/codeql/rust/elements/RetTypeRepr.qll a603393d373f38831dded00878c3299d61fdb977723d3e1038692f7a46bfebc5 583c626f7ae7fb4ec9a9f93f072330c16560ab52c8dfec566c46af40fb9f39f8
+lib/codeql/rust/elements/RetTypeRepr.qll d68b7c6c2eda13821fcfe085ac3d63010d89a206be09d23deaf531cac405ba96 6db787a96d95265ca20a17ce00603a678b39ac8c7c1d0e1ad6ed119dcf9858fa
 lib/codeql/rust/elements/ReturnExpr.qll b87187cff55bc33c8c18558c9b88617179183d1341b322c1cab35ba07167bbdb 892f3a9df2187e745c869e67f33c228ee42754bc9e4f8f4c1718472eb8f8c80f
 lib/codeql/rust/elements/ReturnTypeSyntax.qll f30b779f79bc2f0329d5585a462511e1aaa9da63182cb45231873a9bd9644d19 5ba004dae2bca323ced27bb4b2f54f725ae974421ab11b176eac4888c642b3fa
 lib/codeql/rust/elements/SelfParam.qll e36b54cdc57529935910b321c336783e9e2662c762f3cd6af492d819373ff188 7a4735dbf532fc0c33ebdb0b5c1dfc4e5267e79ceff4ca8977065eb0ce54aaf5
@@ -145,9 +144,9 @@ lib/codeql/rust/elements/SliceTypeRepr.qll 730e4d0eeefb9b2284e15b41cd0afc3cbe255
 lib/codeql/rust/elements/SourceFile.qll 0b6a3e58767c07602b19975009a2ad53ecf1fd721302af543badb643c1fbb6c4 511d5564aab70b1fcd625e07f3d7e3ceb0c4811a5740de64a55a9a728ba8d32c
 lib/codeql/rust/elements/Static.qll 9dca6d4fb80fb4ead49a3de89bec2b02bae6f96fbc2601dde35a2aa69a9bfdb0 70f67bc75d7799dab04ea7a7fd13286bb76bbe514be16d23149c59dfb31fd0c9
 lib/codeql/rust/elements/Stmt.qll 532b12973037301246daf7d8c0177f734202f43d9261c7a4ca6f5080eea8ca64 b838643c4f2b4623d2c816cddad0e68ca3e11f2879ab7beaece46f489ec4b1f3
-lib/codeql/rust/elements/StmtList.qll e874859ce03672d0085e47e0ca5e571b92b539b31bf0d5a8802f9727bef0c6b0 e5fe83237f713cdb57c446a6e1c20f645c2f49d9f5ef2c984032df83acb3c0de
+lib/codeql/rust/elements/StmtList.qll 8bad277dfd88735195b8fd43bb1395cb2393c488d89304d6a6e6d8ec3eb24b73 cd1d483aecb8bb1876b8153a872f680febc2ef6c315d661c85ec1b2fa07e4fc0
 lib/codeql/rust/elements/Struct.qll 297d3ea732fc7fbb8b8fb5479c1873ce84705146853ff752c84a6f70af12b923 3df0e5fd50a910a0b5611c3a860a1d7c318f6925c3a0727006d91840caf04812
-lib/codeql/rust/elements/StructExpr.qll af9059c01a97755e94f1a8b60c66d9c7663ed0705b2845b086b8953f16019fab 2d33d86b035a15c1b31c3e07e0e74c4bbe57a71c5a55d60e720827814e73b7ba
+lib/codeql/rust/elements/StructExpr.qll 84f384ef74c723796e514186037a91dd9666556f62c717f133ce22e9dda4425f 176497835252cfdfe110e58ebde9fbde553d03e44e07d3e4d8041e835dbf31b9
 lib/codeql/rust/elements/StructExprField.qll 3eb9f17ecd1ad38679689eb4ecc169d3a0b5b7a3fc597ae5a957a7aea2f74e4f 8fcd26f266f203004899a60447ba16e7eae4e3a654fbec7f54e26857730ede93
 lib/codeql/rust/elements/StructExprFieldList.qll 6efb2ec4889b38556dc679bb89bbd4bd76ed6a60014c41f8e232288fc23b2d52 dc867a0a4710621e04b36bbec7d317d6f360e0d6ac68b79168c8b714babde31d
 lib/codeql/rust/elements/StructField.qll c43a552ce22c768c7f4c878501f08ecd4eae3554c5cd885dcd2e8625fe705233 bfd7934835ca41eb70e4064198d9b40ec9812842fb4349e412d1aaf98c3cd625
@@ -160,7 +159,7 @@ lib/codeql/rust/elements/TokenTree.qll 23e57fd945ce509df5122aa46f7971360788945cb
 lib/codeql/rust/elements/Trait.qll f78a917c2f2e5a0dfcd7c36e95ad67b1fa218484ee509610db8ca38453bebd4c 2a12f03870ebf86e104bdc3b61aae8512bfafbbf79a0cff5c3c27a04635926af
 lib/codeql/rust/elements/TraitAlias.qll 1d82d043f24dbac04baa7aa3882c6884b8ffbc5d9b97669ce8efb7e2c8d3d2c8 505ba5426e87b3c49721f440fbc9ad6b0e7d89d1b1a51ca3fa3a6cc2d36f8b82
 lib/codeql/rust/elements/TryExpr.qll cb452f53292a1396139f64a35f05bb11501f6b363f8affc9f2d5f1945ad4a647 d60ad731bfe256d0f0b688bdc31708759a3d990c11dee4f1d85ccc0d9e07bec9
-lib/codeql/rust/elements/TupleExpr.qll 561486554f0c397bc37c87894c56507771174bfb25f19b3bf258a94f67573e56 d523246820853ff0a7c6b5f9dbe73d42513cadd6d6b76ea7e64147140ac93c15
+lib/codeql/rust/elements/TupleExpr.qll 1b1be270198f9d3db1c28c4caaa4a7fe9b5ae14651f1a10e2891a7d78d6ad18b 4f585aa684dfbff753e342903ddd60ee4d7c374b8bddeb645784d10903c90ae0
 lib/codeql/rust/elements/TupleField.qll e20a991f7f1322cc7c05b2a8946d5017edb119812efa3e44daa94a5dff2d0c7b 8c25c9577fef8b5b9a4b285ceb7cfffcd8d89448035b1967cd7fda1503adfe13
 lib/codeql/rust/elements/TupleFieldList.qll b67cd2dec918d09e582467e5db7a38c8fa18350af591b43a1b450cd2026dbb67 22fdd1e77c16e3be4627ee7a45985b94785492d36056eeeff2c94b43450b48c8
 lib/codeql/rust/elements/TuplePat.qll 028cdea43868b0fdd2fc4c31ff25b6bbb40813e8aaccf72186051a280db7632e 38c56187971671e6a9dd0c6ccccb2ee4470aa82852110c6b89884496eb4abc64
@@ -168,7 +167,7 @@ lib/codeql/rust/elements/TupleStructPat.qll da398a23eb616bf7dd586b2a87f4ab00f286
 lib/codeql/rust/elements/TupleTypeRepr.qll 1ac5abf6281ea31680a4098407fbe55459d08f92a50dec20d1f8b93d498eee41 6d9625cce4e4abf6b6e6c22e47880fbd23740d07b621137bd7fa0a2ee13badd9
 lib/codeql/rust/elements/TypeAlias.qll b59f24488f0d7de8d4046a9e0ca1e1f54d1d5c11e035898b11ab97e151fc600f 7b25c9e14c8bb310cec796824904fcefced2cc486d55e981b80b7620e73dd2d7
 lib/codeql/rust/elements/TypeArg.qll e91dbb399d2ab7cf7af9dd5f743a551d0bf91dba3cfb76cea9e2d42ada0f9f2e c67d64e20e35a9bba5092651e0f82c75ba53b8c165e823bc81d67975107ae375
-lib/codeql/rust/elements/TypeBound.qll a1645f31a789995af85b1db236caece180013cc2e28e1c50b792dc0d4ab0854e 14a68ebef2149bc657ba1f18606ef8cf9b7cc3e6113b50bc038c168eb6cfd11c
+lib/codeql/rust/elements/TypeBound.qll 33583aed81734348c5097851cde3568668f259c000ccde901c75a3f2eef30237 3c9e541d47c5cfbcb0b1c5806f5d9abd7f51382d1efc1328742439e11285ab32
 lib/codeql/rust/elements/TypeBoundList.qll 61a861e89b3de23801c723531cd3331a61214817a230aaae74d91cb60f0e096f d54e3d830bb550c5ba082ccd09bc0dc4e6e44e8d11066a7afba5a7172aa687a8
 lib/codeql/rust/elements/TypeParam.qll 0787c1cc0c121e5b46f7d8e25153fd1b181bd3432eb040cf3b4ae3ed9ac2f28c 50092950f52a4e3bfd961dff4ffd8a719ef66ca1a0914bd33e26fed538321999
 lib/codeql/rust/elements/TypeRepr.qll ea41b05ef0aaac71da460f9a6a8331cf98166f2c388526068ddacbd67488c892 11a01e42dab9183bac14de1ca49131788ede99e75b0ef759efcbc7cf08524184
@@ -178,14 +177,14 @@ lib/codeql/rust/elements/Unimplemented.qll bf624d28163e5c99accda16c0c99f938bec4a
 lib/codeql/rust/elements/Union.qll 13f7f62e98b117d18e79db5f6e6535447bc069ebb08f7cdb390b012678b7e085 bd8c37bc0ff09926753bc250e1848ed25923f224829d0136afc27b749eaddd1f
 lib/codeql/rust/elements/Use.qll fdcf70574403c2f219353211b6930f2f9bc79f41c2594e07548de5a8c6cbb24d e41f2b689fcbeb7b84c7ba8d09592f7561626559318642b73574bbac83f74546
 lib/codeql/rust/elements/UseBoundGenericArg.qll f16903f8fff676d3700eaad5490804624391141472ecc3166ccb1f70c794c120 5efda98088d096b42f53ceccae78c05f15c6953525b514d849681cb2cf65b147
-lib/codeql/rust/elements/UseBoundGenericArgs.qll d9821a82a1d57e609fdc5e79d65e9a88b0088f51d03927e09f41b6931d3484ab 181483a95e22622c7cee07cce87e9476053f824a82e67e2bdecabf5a39f672ad
+lib/codeql/rust/elements/UseBoundGenericArgs.qll 841913cfbb84de14aab1820a5433eae978bbadbb8e6d413b8ba70780c7328335 c9ec9d086cff91d15c3aea64f1080b22b41cdaf64e3c8b192aaaec17604a5d10
 lib/codeql/rust/elements/UseTree.qll e67c148f63668319c37914a46ff600692de477242a0129fa1bb9839754c0f830 de9b39d3d078d51ec9130db6579bff13e6297e60556a7214a5c51cbf89d92791
 lib/codeql/rust/elements/UseTreeList.qll 92ebfee4392a485b38fb3265fdede7c8f2ed1dbe2ab860aa61b1497c33874d25 a4e677455d20838e422e430eebd73d0a488e34e8c960f375fef7b99e79d4c911
 lib/codeql/rust/elements/Variant.qll 7895461fa728f6c3a7293799c5e6b965b413b679566dcbd40bbe2609db8b6cde b0413547365a301bd9fbb6b266757f956394abad0a77f0e424446e23ec7d83e9
 lib/codeql/rust/elements/VariantList.qll 39803fbb873d48202c2a511c00c8eafede06e519894e0fd050c2a85bf5f4aa73 1735f89b2b8f6d5960a276b87ea10e4bb8c848c24a5d5fad7f3add7a4d94b7da
 lib/codeql/rust/elements/Visibility.qll aa69e8a3fd3b01f6fea0ae2d841a2adc51f4e46dcfc9f8f03c34fbe96f7e24e7 0d475e97e07b73c8da2b53555085b8309d8dc69c113bcb396fc901361dbfe6b8
 lib/codeql/rust/elements/WhereClause.qll 4e28e11ceec835a093e469854a4b615e698309cdcbc39ed83810e2e4e7c5953f 4736baf689b87dd6669cb0ef9e27eb2c0f2776ce7f29d7693670bbcea06eb4e4
-lib/codeql/rust/elements/WherePred.qll 490395b468c87d5c623f6741dc28512ee371cbf479ea77aee7e61b20544f5732 782f74b101d374a71908069be3db23755ab1473ffe879b368be73a5fdc6eac3a
+lib/codeql/rust/elements/WherePred.qll 589027c2fddb07620f74b8ed5e471fab49bef389749e498069d7c1fe50912cc7 dd7c90ff9c5bd563f0b8a088e0890ee11c6d5b2269223f22be01f0e1dbe0f5e2
 lib/codeql/rust/elements/WhileExpr.qll 4a37e3ecd37c306a9b93b610a0e45e18adc22fcd4ce955a519b679e9f89b97e8 82026faa73b94390544e61ed2f3aaeaabd3e457439bb76d2fb06b0d1edd63f49
 lib/codeql/rust/elements/WildcardPat.qll 4f941afc5f9f8d319719312399a8f787c75a0dbb709ec7cf488f019339635aab a9140a86da752f9126e586ddb9424b23b3fb4841a5420bac48108c38bb218930
 lib/codeql/rust/elements/YeetExpr.qll 4172bf70de31cab17639da6eed4a12a7afcefd7aa9182216c3811c822d3d6b17 88223aab1bef696f508e0605615d6b83e1eaef755314e6a651ae977edd3757c3
@@ -241,8 +240,6 @@ lib/codeql/rust/elements/internal/BoxPatConstructor.qll 153f110ba25fd6c889092bfd
 lib/codeql/rust/elements/internal/BreakExprConstructor.qll 356be043c28e0b34fdf925a119c945632ee883c6f5ebb9a27003c6a8d250afd9 bb77e66b04bb9489340e7506931559b94285c6904b6f9d2f83b214cba4f3cfd5
 lib/codeql/rust/elements/internal/CallExprConstructor.qll 742b38e862e2cf82fd1ecc4d4fc5b4782a9c7c07f031452b2bae7aa59d5aa13a cad6e0a8be21d91b20ac2ec16cab9c30eae810b452c0f1992ed87d5c7f4144dc
 lib/codeql/rust/elements/internal/CastExprConstructor.qll f3d6e10c4731f38a384675aeab3fba47d17b9e15648293787092bb3247ed808d d738a7751dbadb70aa1dcffcf8af7fa61d4cf8029798369a7e8620013afff4ed
-lib/codeql/rust/elements/internal/ClosureBinderConstructor.qll 6e376ab9d40308e95bcdaf1cc892472c92099d477720192cd382d2c4e0d9c8a1 60a0efe50203ad5bb97bdfc06d602182edcc48ac9670f2d27a9675bd9fd8e19f
-lib/codeql/rust/elements/internal/ClosureBinderImpl.qll 9f6ce7068b5c17df44f00037ebb42e6c8fdbbbd09bf89951221fb04f378fbdf1 6e6e372e151fe0b0f17a5ea0ed774553b6ed0bf53e1d377e5ed24a0f98529735
 lib/codeql/rust/elements/internal/ClosureExprConstructor.qll a348229d2b25c7ebd43b58461830b7915e92d31ae83436ec831e0c4873f6218a 70a1d2ac33db3ac4da5826b0e8628f2f29a8f9cdfd8e4fd0e488d90ce0031a38
 lib/codeql/rust/elements/internal/CommentConstructor.qll 0b4a6a976d667bf7595500dfb91b9cfc87460a501837ba5382d9a8d8321d7736 7d02d8c94a319dc48e7978d5270e33fc5c308d443768ff96b618236d250123f1
 lib/codeql/rust/elements/internal/ConstArgConstructor.qll f63021dc1ca2276786da3a981d06c18d7a360b5e75c08bca5d1afece4f7c4a83 487a870cbf5ed6554d671a8e159edd9261d853eba2d28ce2bd459759f47f11f2
@@ -250,7 +247,6 @@ lib/codeql/rust/elements/internal/ConstArgImpl.qll dc7e7b5fe1a6eeb61dd30a55a3ed2
 lib/codeql/rust/elements/internal/ConstBlockPatConstructor.qll ddb4a0045635d477e87360ecafec0ba90ddcffc6e62996eb6e7edd5a5d65b860 442061d0497a615b3f008b990f5e3c4f045110f76500eff81a7f44ffd1319acf
 lib/codeql/rust/elements/internal/ConstBlockPatImpl.qll 2082a3244c21e03b6dadfba9b3f97a00981324e10d1465d3a51cf3c921eb89e4 889e347834d8c6e90dfef9714af073b3b2193f6830f1c8356cee9c6573b3ecb4
 lib/codeql/rust/elements/internal/ConstConstructor.qll 72a31fd9b8b3fd910e35af1b2b30fa54cc4d9e14e7eabdb94b4cd2af95b2df38 3edc0a82a7b446fdfd3e71947801f3c7cac010b2a217b8accb69980387bdd67a
-lib/codeql/rust/elements/internal/ConstImpl.qll 058b474b9aaf2ad687ab1e62ebc8a51ba93d9ea4340c2f41768b71613ac330c1 c2c5d4746a588096cbbdfa4355ee73d806c7a4ac9507930a120e49060f9d5347
 lib/codeql/rust/elements/internal/ConstParamConstructor.qll f6645f952aac87c7e00e5e9661275312a1df47172088b4de6b5a253d5c4ed048 eda737470a7b89cf6a02715c9147d074041d6d00fd50d5b2d70266add6e4b571
 lib/codeql/rust/elements/internal/ConstParamImpl.qll c6995be58f84d1df65897c80f7ee3dd8eb410bb3e634ff1bfe1be94dfb3fdf32 bcfb5547b40f24bcec20056fe1d36724b734c920b0bc7538fe2974b03f4478fe
 lib/codeql/rust/elements/internal/ContinueExprConstructor.qll cd93f1b35ccdb031d7e8deba92f6a76187f6009c454f3ea07e89ba459de57ca6 6f658e7d580c4c9068b01d6dd6f72888b8800860668a6653f8c3b27dc9996935
@@ -273,9 +269,10 @@ lib/codeql/rust/elements/internal/FieldExprConstructor.qll b3be2c4ccaf2c8a1283f3
 lib/codeql/rust/elements/internal/FieldListImpl.qll 6b80b573989ee85389c4485729a40c92c7e0a5b8a96a4385e812c74fb63c894f d333bcb043616b95ffefed4d216f94e5b07541f8153e4fb8084f4e793947b023
 lib/codeql/rust/elements/internal/FnPtrTypeReprConstructor.qll 61d8808ea027a6e04d5304c880974332a0195451f6b4474f84b3695ec907d865 0916c63a02b01a839fe23ec8b189d37dc1b8bc4e1ba753cbf6d6f5067a46965a
 lib/codeql/rust/elements/internal/FnPtrTypeReprImpl.qll 6b66f9bda1b5deba50a02b6ac7deb8e922da04cf19d6ed9834141bc97074bf14 b0a07d7b9204256a85188fda2deaf14e18d24e8a881727fd6e5b571bf9debdc8
+lib/codeql/rust/elements/internal/ForBinderConstructor.qll 98f16b0106a19210713404f4be8b1b9f70c88efb0b88bdf2f9ea9c8fbd129842 a7af9e75f11d824a60c367924542a31a0f46f7b1f88d3ee330d4dd26b2f29df5
 lib/codeql/rust/elements/internal/ForExprConstructor.qll d79b88dac19256300b758ba0f37ce3f07e9f848d6ae0c1fdb87bd348e760aa3e 62123b11858293429aa609ea77d2f45cb8c8eebae80a1d81da6f3ad7d1dbc19b
 lib/codeql/rust/elements/internal/ForTypeReprConstructor.qll eae141dbe9256ab0eb812a926ebf226075d150f6506dfecb56c85eb169cdc76b 721c2272193a6f9504fb780d40e316a93247ebfb1f302bb0a0222af689300245
-lib/codeql/rust/elements/internal/ForTypeReprImpl.qll 75747779312b3f3ffdd02188053ba3f46b8922f02630711902f7a27eecced31a 71a900f014758d1473ef198c71892d42e20dd96e934d4bedb74581964c4d1503
+lib/codeql/rust/elements/internal/ForTypeReprImpl.qll dbbcb86626dcba3d5534d461d7306c354a15f800ff37c1d039801b868179b387 f942eebb20fb2603b7bab0e90f3e3f7a3f87dd6229090fc011c692a52164ac90
 lib/codeql/rust/elements/internal/FormatArgsArgConstructor.qll 8bd9b4e035ef8adeb3ac510dd68043934c0140facb933be1f240096d01cdfa11 74e9d3bbd8882ae59a7e88935d468e0a90a6529a4e2af6a3d83e93944470f0ee
 lib/codeql/rust/elements/internal/FormatArgsArgImpl.qll 6a8f55e51e141e4875ed03a7cc65eea49daa349de370b957e1e8c6bc4478425c 7efab8981ccbe75a4843315404674793dda66dde02ba432edbca25c7d355778a
 lib/codeql/rust/elements/internal/FormatArgsExprConstructor.qll ce29ff5a839b885b1ab7a02d6a381ae474ab1be3e6ee7dcfd7595bdf28e4b558 63bf957426871905a51ea319662a59e38104c197a1024360aca364dc145b11e8
@@ -290,7 +287,6 @@ lib/codeql/rust/elements/internal/ImplConstructor.qll 24edccca59f70d812d1458b412
 lib/codeql/rust/elements/internal/ImplTraitTypeReprConstructor.qll 1ed355e5e56f432b24b6f4778e4dc45c6e65095190cacb7a5015529e0c9d01f8 c8505185a042da4eb20a0cc32323194a0290c4bf821c7e0fce7351b194b10f31
 lib/codeql/rust/elements/internal/IndexExprConstructor.qll 99bdc3d793c4dbd993860da60abe2b7c604345d645e86916462bc55a6939a5d1 3fe9d7da725956903707806aadbecac8d5b3874e8bed63c9bab54fff630e75dd
 lib/codeql/rust/elements/internal/InferTypeReprConstructor.qll bc5f16853401617fc9c5af8a1287a23c5921df1b615cfbe2d7c7a70145ecfcbd da93bd28ea2daade2cbb0a729be3fbf05f72bc02009565c7bb062e4f68fdb9e7
-lib/codeql/rust/elements/internal/ItemImpl.qll e3fb78d572ce1c3cc857d2671bd71ff4d7850321acfddc5f15533ff87accda79 fbabc2081e4b2773b04938d57bb51af908c80b7bc53c3127c74ab5d4fb9837bc
 lib/codeql/rust/elements/internal/ItemListConstructor.qll 08af3bd12536941c3dd4a43c81cc861be24325e242e2593c087a3ce632674291 2fa166159c409d2aaffa73a30babb40829a6de580bd40894d909ee6152801082
 lib/codeql/rust/elements/internal/ItemListImpl.qll 195dbe93c334ad2bfc29db530bda9aaea88fc31696b2f230faae9e6c2ecb74a8 e498983a5b2f7a91e2fd336e85ac17e521a18c677784a0788d95bb283f3652e7
 lib/codeql/rust/elements/internal/LabelConstructor.qll 1f814c94251e664bfa1b1a606aef995382e40e78d4f953350ec951ee0bc8bd34 3157fb8c7c6bd365a739f217ad73ba1e0b65ccd59b922e5ab034e3449915b36c
@@ -307,7 +303,7 @@ lib/codeql/rust/elements/internal/LiteralPatConstructor.qll b660cb428a0cba0b713f
 lib/codeql/rust/elements/internal/LoopExprConstructor.qll 45f3f8f7441fcab6adc58831421679ee07bac68ac0417f3cbc90c97426cc805b f7ab3361b4a11e898126378ea277d76949466946762cd6cb5e9e9b4bb9860420
 lib/codeql/rust/elements/internal/LoopingExprImpl.qll 17885c1bcf7b5a3f9c7bbad3d4d55e24372af0dedd5e7fc0efcfc0a8b2cdad70 104dc45ca399b9f6e8227ad561679f728d60170398a52b31fc90cb2a2dd3c33c
 lib/codeql/rust/elements/internal/MacroBlockExprConstructor.qll 90097c0d2c94083e997396e01cf24349af5eb1788060368dc21ae8cd8ce90d93 e067904a734356e38fbadbc4277629c5987adce6d8f7737f7458ac07e9b264af
-lib/codeql/rust/elements/internal/MacroBlockExprImpl.qll f7a8dd1dcde2355353e17d06bb197e2d6e321ea64a39760a074d1887e68d63d6 8d429be9b6aa9f711e050b6b07f35637de22e8635a559e06dd9153a8b7947274
+lib/codeql/rust/elements/internal/MacroBlockExprImpl.qll 323c0695ab1d8ee7d88a678eabdb6ac9d92293b9ae0846ec2c7ed8d76a591369 7b662b77cf2d885423d8734ff322c199650c1ea59a2c3371a1370efd7966e0c9
 lib/codeql/rust/elements/internal/MacroCallConstructor.qll 707fee4fba1fd632cd00128f493e8919eaaea552ad653af4c1b7a138e362907d b49e7e36bf9306199f2326af042740ff858871b5c79f6aeddf3d5037044dbf1f
 lib/codeql/rust/elements/internal/MacroDefConstructor.qll 382a3bdf46905d112ee491620cc94f87d584d72f49e01eb1483f749e4709c055 eb61b90d8d8d655c2b00ff576ae20c8da9709eeef754212bc64d8e1558ad05ce
 lib/codeql/rust/elements/internal/MacroDefImpl.qll 73db95ff82834e0063699c7d31349b65e95ba7436fe0a8914dbdd3a383f8b1c9 cd2f078f84ce73fdc88b207df105b297f2cd3b780428968214443af3a2719e8f
@@ -369,10 +365,9 @@ lib/codeql/rust/elements/internal/RefTypeReprConstructor.qll 8e7012b456ebf1cc7a2
 lib/codeql/rust/elements/internal/RefTypeReprImpl.qll 553dd95e1a49ab7aef5db08e7bb550104c604ec33c9a3c7529370cd47c6a0965 8902db7c814f631c2a995df5911a7b13b6a38c524417e4bbbf2bda74ad53e14c
 lib/codeql/rust/elements/internal/RenameConstructor.qll 65fa2e938978d154701e6cac05b56320b176ee014ef5c20a7b66f3e94fd5c4a7 dfc0ff4606b8e1c14003cc93a0811f4d62ec993b07ff3c1aa0776746577ed103
 lib/codeql/rust/elements/internal/RenameImpl.qll 61c681055f1f86402af0772539f702e9e19a123f8cfcfca225535c3a1a4cb1d7 1aa1c78616c4b54a31c8af74de141aef9e5ada53f3859df631ecb4238faabdbf
-lib/codeql/rust/elements/internal/ResolvableImpl.qll 7d6d02eceef54d588de6204abbcf7a6454916e49180e3db8a72131032cec5837 9c3a28ea0d293b449c69982e3695903a10510096e765a53c1b34ac3ad009a9f4
 lib/codeql/rust/elements/internal/RestPatConstructor.qll 45430925ddf08fba70ede44c7f413ddb41b3113c149b7efc276e0c2bf72507b4 25c678898d72446e7a975bb8b7f2fde51e55b59dbd42f2cca997c833b1a995f1
 lib/codeql/rust/elements/internal/RetTypeReprConstructor.qll 6dcb56c92a13f5ca2c9a8344bc05638cc611543896c578cd6ca185054f155537 3fe34953ba397dc31533bd28b48df76693e86b51c4a89c26ad4dfdbd816a0874
-lib/codeql/rust/elements/internal/RetTypeReprImpl.qll 799e55ffcf27bf6f010419e1d61ebbbf3448e37b903b0f13984d0b44d6b7a999 be774bb09d121c35f40c75d5bee08918e7a6b5fccb4fd573fc55a650466b46e0
+lib/codeql/rust/elements/internal/RetTypeReprImpl.qll 321355a9b39193e09ef7c38b807d7f3c221dce06b0cafd2e0ceccdfbb81712e4 02ea0fb17416889b400e0706eeacc0afc6b489b76158e8c26b9b77102df6bd60
 lib/codeql/rust/elements/internal/ReturnExprConstructor.qll 57be5afbe20aa8db6e63c1f2871914c19c186730ad7dccaa424038c6305730d5 4d3c4f2e9b38a4b54ff26a0032455cdcca3d35fec201b6c932072a9e31fbb4fe
 lib/codeql/rust/elements/internal/ReturnTypeSyntaxConstructor.qll 8994672e504d1674e5773157d0ad8a0dc3aad3d64ef295e7722e647e78e36c11 abe7df754721f4ff7f3e3bb22d275976b2e9a1ef51436a461fe52ebd2d29cff1
 lib/codeql/rust/elements/internal/ReturnTypeSyntaxImpl.qll 554af21b52fedfc356cb873e25c2429e6660ae62ea01be708de4342960cf4048 cdc497a3693bb162a7528b75e902c4743b0a974c6c44152f822a16107a83bee4
@@ -388,7 +383,6 @@ lib/codeql/rust/elements/internal/StaticConstructor.qll 6dd7ee3fd16466c407de35b4
 lib/codeql/rust/elements/internal/StaticImpl.qll 48071e29c72032b59ad82771d54be92ac0f4c1a68fb1129c5c7991385804d7b1 85c0be8e37a91d6e775b191f0cb52dd8bf70418e6e9947b82c58c40a6d73b406
 lib/codeql/rust/elements/internal/StmtImpl.qll ea99d261f32592ff368cc3a1960864989897c92944f1675549e0753964cb562f 9117b4cdfad56f8fa3bc5d921c2146b4ff0658e8914ac51bf48eb3e68599dd6b
 lib/codeql/rust/elements/internal/StmtListConstructor.qll 435d59019e17a6279110a23d3d5dfbc1d1e16fc358a93a1d688484d22a754866 23fcb60a5cbb66174e459bc10bd7c28ed532fd1ab46f10b9f0c8a6291d3e343f
-lib/codeql/rust/elements/internal/StmtListImpl.qll b39f93534013fe38fee68fbc0232146c92b5f90ee0f6e36da31fb1a3797b3175 2b26bc14c2afb94de2d27ba511eca21313b6fc021c827637cd5904154abb9f3f
 lib/codeql/rust/elements/internal/StructConstructor.qll 52921ea6e70421fd08884dc061d0c2dfbbb8dd83d98f1f3c70572cfe57b2a173 dcb3ea8e45ee875525c645fe5d08e6db9013b86bd351c77df4590d0c1439ab9f
 lib/codeql/rust/elements/internal/StructExprConstructor.qll 69761fa65a4bedf2893fdfc49753fd1289d9eb64cf405227458161b95fa550cb 72ed5f32dcf6a462d9d3cadfc57395a40ee6f4e294a88dbda78761b4a0759ece
 lib/codeql/rust/elements/internal/StructExprFieldConstructor.qll 6766d7941963904b3a704e64381a478d410c2ef88e8facbc82efca4e781dac96 a14ce465f0f4e43dea5c21c269d803b0ad452d2eb03f4342ea7a9f5d0b357d60
@@ -410,7 +404,7 @@ lib/codeql/rust/elements/internal/TraitConstructor.qll 1f790e63c32f1a22ae1b039ca
 lib/codeql/rust/elements/internal/TryExprConstructor.qll 98e3077ebc4d76f687488b344f532b698512af215b66f0a74b5cea8ed180836c b95603c10c262911eeffdf4ccba14849e8443916b360e287963d5f2582d8e434
 lib/codeql/rust/elements/internal/TryExprImpl.qll cacf43a49ba518be3f94e4a355f5889861edc41f77601eff27e0ed774eca6651 5f4a6a346ec457d5de89b32419e8b4c2deddc55e2d61dbb59842d7f34aa11c44
 lib/codeql/rust/elements/internal/TupleExprConstructor.qll 71c38786723225d3d90399b8a085b2b2664c62256654db9e1288fadd56745b9d 639ad70b49ebadc027127fbdc9de14e5180169a4285908233bc38ccac6f14110
-lib/codeql/rust/elements/internal/TupleExprImpl.qll 23a0e4367fbcfcec3e2cf4a429f329a222b399c6729dd60f7ea42550273a6132 615f3b4897fdcbfddcf5c58e6edd64bf6e395923af89cc4e2a336099168bb6ad
+lib/codeql/rust/elements/internal/TupleExprImpl.qll daabbc7dd36c615cdd8d3b59e06f4992a302b26554115711f733508836887abe 4c43a26e5f8b68d9d032bb5cd0af88cf9ac9b4b4e40af47dc85dd931ce9db6f8
 lib/codeql/rust/elements/internal/TupleFieldConstructor.qll 89d3cf2540235044ed5a89706cfbdebc5cdf9180fd5b6d3376c79a1b2c0430c0 16861fe089aac8e42a5a90d81dd48d5015391d0a06c78ca02bd876d65378699f
 lib/codeql/rust/elements/internal/TupleFieldListConstructor.qll 4335ba2061b6e4968db9ec05c0b4d3e6a564db89a2df69e036f317672a7900b1 0b8dded875dbf696cf588e8c21acc27332a2ff66ced7bfabdfc1ad621991f888
 lib/codeql/rust/elements/internal/TupleFieldListImpl.qll 74869e92a3cbdd7895adaaa418d29d5e97387daf46c17315f219ad967af15d76 5815e4b37db958663df1f6fedc9667a11b261c9c2133e3f983a3aedc452c01fc
@@ -422,9 +416,7 @@ lib/codeql/rust/elements/internal/TypeAliasConstructor.qll 048caa79eb7d400971e3e
 lib/codeql/rust/elements/internal/TypeArgConstructor.qll 51d621e170fdf5f91497f8cc8c1764ce8a59fde5a2b9ecfad17ce826a96c56c4 a5bbb329bde456a40ffa84a325a4be1271dbde842c1573d1beb7056c8fb0f681
 lib/codeql/rust/elements/internal/TypeArgImpl.qll 77886af8b2c045463c4c34d781c8f618eec5f5143098548047730f73c7e4a34a 6be6c519b71f9196e0559958e85efe8a78fbce7a90ca2401d7c402e46bc865c9
 lib/codeql/rust/elements/internal/TypeBoundConstructor.qll ba99616e65cf2811187016ff23e5b0005cfd0f1123622e908ff8b560aaa5847f fde78432b55b31cf68a3acb7093256217df37539f942c4441d1b1e7bf9271d89
-lib/codeql/rust/elements/internal/TypeBoundImpl.qll 8a68e3c3b2bffb02a11e07102f57e8806411dbcb57f24be27a0d615a1f6f20d4 e6c92d5df538a10519655c1d2a063bb1ca1538d5d8fe9353ed0e28ad6d56be0c
 lib/codeql/rust/elements/internal/TypeBoundListConstructor.qll 4b634b3a4ca8909ce8c0d172d9258168c5271435474089902456c2e3e47ae1c5 3af74623ced55b3263c096810a685517d36b75229431b81f3bb8101294940025
-lib/codeql/rust/elements/internal/TypeBoundListImpl.qll 5641aca40c0331899f4291188e60945eb2a01679e3b33883053309fb3823d9ab c84bb1daa7c10f3bb634a179957934d7ae1bef1380fcd8a9c734004625575485
 lib/codeql/rust/elements/internal/TypeParamConstructor.qll a6e57cccd6b54fa68742d7b8ce70678a79ac133ea8c1bfa89d60b5f74ad07e05 0e5f45d250d736aaf40387be22e55288543bdb55bbb20ecb43f2f056e8be8b09
 lib/codeql/rust/elements/internal/TypeReprImpl.qll 504b137313407be57c93fe0acee31716a02f91e23ce417e7c67bae2ae9937564 28fa8b680d5cd782c5c5fb048a9deb9b9debd196e3bc7df1129843e61eb342ea
 lib/codeql/rust/elements/internal/UnderscoreExprConstructor.qll 8dc27831adb49c1a47b9f8997d6065e82b4e48e41e3c35bd8d35255cea459905 6c5a5272d37f83f1c1b17475f8adb7d867e95025d201320e20a32dab1f69f7bf
@@ -434,7 +426,7 @@ lib/codeql/rust/elements/internal/UnimplementedImpl.qll 06771abc088e0a8fc24032c9
 lib/codeql/rust/elements/internal/UnionConstructor.qll d650551a1b3ef29c5a770bdad626269cf539ed0c675af954bc847d2c6111f3f6 aca9064ad653a126ab4f03703e96b274587c852dc5e7ff3fea0fec4d45993f10
 lib/codeql/rust/elements/internal/UseBoundGenericArgImpl.qll 2f90bfd5e43113da1155445bef0334ab84acddef102bd62dfa2ef908717a5d09 dd2fa3c6081d79e1d96360dbdb339128cd944e7b7dc26c449c04f970ee1d7848
 lib/codeql/rust/elements/internal/UseBoundGenericArgsConstructor.qll 84d4a959d098fcd1713cb169e15b4945d846121701d2c5709b11e19202c21f2b 93113c92be9bc9f0b8530c308fe482dfeddc7dc827fc44049cecb3eab28df731
-lib/codeql/rust/elements/internal/UseBoundGenericArgsImpl.qll f5c082fc8f7d9acc3783da18e61ad2c9831b46c1855e1bde9b7af95adc289ad9 eb83520c5333b199788638ccd70ee8e96fc3f05306072f51a76fd0a643f8930f
+lib/codeql/rust/elements/internal/UseBoundGenericArgsImpl.qll 0f98d47c1e09c46dd3da66a4770181a0caae0512b362faaec997af22bb5f4ce7 1919235e50b9d2fee9bd5d407a0bc023a02dbb04b2662349fad5a8d6cfa98069
 lib/codeql/rust/elements/internal/UseConstructor.qll a4f790795e18abc29a50d6fbaa0db64cba781e3259a42cbf0468c24ac66b63e7 2fa288f073ac094a838c11f091def2c790b347b6a1b79407c11b10c73d6bff57
 lib/codeql/rust/elements/internal/UseTreeConstructor.qll 3e6e834100fcc7249f8a20f8bd9debe09b705fcf5a0e655537e71ac1c6f7956b cdbc84b8f1b009be1e4a7aaba7f5237823cea62c86b38f1794aad97e3dfcf64b
 lib/codeql/rust/elements/internal/UseTreeListConstructor.qll 973577da5d7b58eb245f108bd1ae2fecc5645f2795421dedf7687b067a233003 f41e5e3ffcb2a387e5c37f56c0b271e8dc20428b6ff4c63e1ee42fcfa4e67d0a
@@ -447,7 +439,7 @@ lib/codeql/rust/elements/internal/VisibilityImpl.qll 85c1e75d6a7f9246cfef5c261e2
 lib/codeql/rust/elements/internal/WhereClauseConstructor.qll 6d6f0f0376cf45fac37ea0c7c4345d08718d2a3d6d913e591de1de9e640317c9 ff690f3d4391e5f1fae6e9014365810105e8befe9d6b52a82625994319af9ffd
 lib/codeql/rust/elements/internal/WhereClauseImpl.qll 006e330df395183d15896e5f81128e24b8274d849fe45afb5040444e4b764226 ed5e8317b5f33104e5c322588dc400755c8852bbb77ef835177b13af7480fd43
 lib/codeql/rust/elements/internal/WherePredConstructor.qll f331c37085792a01159e8c218e9ef827e80e99b7c3d5978b6489808f05bd11f8 179cad3e4c5aaaf27755891694ef3569322fcf34c5290e6af49e5b5e3f8aa732
-lib/codeql/rust/elements/internal/WherePredImpl.qll 6cecb4a16c39a690d6549c0ca8c38cf2be93c03c167f81466b8b2572f8457ada ddf6583bc6e4aa4a32c156f7468a26780867b2973ff91e6fc4d1b1c72fdd0990
+lib/codeql/rust/elements/internal/WherePredImpl.qll eabd6553a16165ddb0103602d8cff65c6af22580ea7a0e2beabbf795ffabdb2d 8025d8bd2351ec2de8273225a6e59d46748d7bfd7e53251fa4eb90d5140afd92
 lib/codeql/rust/elements/internal/WhileExprConstructor.qll 01eb17d834584b3cba0098d367324d137aacfc60860752d9053ec414180897e7 e5e0999fb48a48ba9b3e09f87d8f44f43cc3d8a276059d9f67e7714a1852b8a5
 lib/codeql/rust/elements/internal/WildcardPatConstructor.qll 5980c4e5724f88a8cb91365fc2b65a72a47183d01a37f3ff11dcd2021e612dd9 c015e94953e02dc405f8cdc1f24f7cae6b7c1134d69878e99c6858143fc7ab34
 lib/codeql/rust/elements/internal/YeetExprConstructor.qll 7763e1717d3672156587250a093dd21680ad88c8224a815b472e1c9bba18f976 70dd1fd50824902362554c8c6075468060d0abbe3b3335957be335057512a417
@@ -455,7 +447,7 @@ lib/codeql/rust/elements/internal/YeetExprImpl.qll e8924147c3ebe0c32d04c5b33edfd
 lib/codeql/rust/elements/internal/YieldExprConstructor.qll 8cbfa6405acb151ee31ccc7c89336948a597d783e8890e5c3e53853850871712 966f685eb6b9063bc359213323d3ff760b536158ecd17608e7618a3e9adf475f
 lib/codeql/rust/elements/internal/YieldExprImpl.qll af184649a348ddd0be16dee9daae307240bf123ace09243950342e9d71ededd9 17df90f67dd51623e8a5715b344ccd8740c8fc415af092469f801b99caacb70d
 lib/codeql/rust/elements/internal/generated/Abi.qll f5a22afe5596c261b4409395056ce3227b25d67602d51d0b72734d870f614df3 06d1c242ccd31f1cc90212823077e1a7a9e93cd3771a14ebe2f0659c979f3dd1
-lib/codeql/rust/elements/internal/generated/Addressable.qll 96a8b45166dd035b8d2c6d36b8b67019f2d4d0b4ccff6d492677c0c87197613e d8f1ce29feafc8ff7179399fc7eac5db031a7e1a8bc6b2cd75cfce1da3132e9b
+lib/codeql/rust/elements/internal/generated/Addressable.qll 624c380d385af6563885417d1e8ecd5d9b7abf1435c0ab79a1b9a405387874a3 e2755dc2155d6f2bc0e2d54006da0e62ee359440592db9d6a8b73202ef28e64f
 lib/codeql/rust/elements/internal/generated/Adt.qll 155f4025a26c3d2d5d3c42dfce9274a10f0862ea0574843c5d276179de421569 17138b271eea81d3ee2697c82cccfd7af752cd18cd925dd5fa20d7fce0e2432f
 lib/codeql/rust/elements/internal/generated/ArgList.qll e41f48258082876a8ceac9107209d94fdd00a62d2e4c632987a01a8394c4aff6 bf1982d14f8cd55fa0c3da2c6aab56fc73b15a3572ffc72d9a94f2c860f8f3b7
 lib/codeql/rust/elements/internal/generated/ArrayExpr.qll 73806a0de8168b38a9436fa6b8c6d68c92eeab3d64a1ae7edfff82f871929992 7ad998cdd8f4fed226473517ad7a5765cb35608033047aad53bf8aa3969fd03b
@@ -466,7 +458,7 @@ lib/codeql/rust/elements/internal/generated/ArrayTypeRepr.qll d1db33bc2c13e5bc6f
 lib/codeql/rust/elements/internal/generated/AsmClobberAbi.qll 579cabafcf0387a9270112ffa53c0b542c1bfbbebfe5c916ac2e6a9b2453539a 8048f5d8759425c55dc46d8fe502687edc29209e290094e9bcd24ff943c8d801
 lib/codeql/rust/elements/internal/generated/AsmConst.qll 26c96fc41f2b517b7756fd602c8b0cd4849c7090013fb3f8a5e290e5eabe80cc f0f1bf3e8ae7e20e1c2ab638428190c58ee242a7d15c480ed9c5f789ce42c9cb
 lib/codeql/rust/elements/internal/generated/AsmDirSpec.qll 4064e9c98aeebfebf29d013f6280f44548996d6f185b19bf96b1b23384c976b9 2bb0b99d20c0fdd6d54d4a1947a02372b6e4b197fb887ad058290ae97f015953
-lib/codeql/rust/elements/internal/generated/AsmExpr.qll 35df35b391d8bf7ccc53b5ffb1b700984bf423cafc89003cb6e3abd92791a127 0fff4199625c179ab4117cfa9762390a259ea0cba902713efc0f5eb200746b99
+lib/codeql/rust/elements/internal/generated/AsmExpr.qll afabf734bf93040451cb22d22f71ab9b2abb176bd6e0d862f5cc67d687f84e4c 7e35b3bc93b5e6f6b7259f3261234421eb5778a47192bc0f5e54d062d3bc8dde
 lib/codeql/rust/elements/internal/generated/AsmLabel.qll 3e97e64f0682709f05464218e0182f64537e08079b0f276738c83eae92c22d25 3ce70364762bc8c0eeb13940406a0613a815a0ae68b24f7e3a1a649a6fe05c89
 lib/codeql/rust/elements/internal/generated/AsmOperand.qll a18ddb65ba0de6b61fb73e6a39398a127ccd4180b12fea43398e1e8f3e829ecd 22d2162566bcf18e8bb39eac9c1de0ae563013767ef5efebff6d844cb4038cae
 lib/codeql/rust/elements/internal/generated/AsmOperandExpr.qll 6ec1db45e8523331d516263476bbda1006251ce137c2cd324d9b6c6fabf358df b6278d4e605fb5422ab1e563649da793bacf28cd587328f9cc36ca57799510d0
@@ -490,10 +482,9 @@ lib/codeql/rust/elements/internal/generated/BoxPat.qll 597bed52f7489e0addce3266f
 lib/codeql/rust/elements/internal/generated/BreakExpr.qll 0f428a8b2f4209b134c2ffc3e1c93c30bc6b0e9c9172f140cefa88c1f77d8690 957b39f38ff6befe9061f55bc0b403c2f1c366dd0cf63b874bae6f8216576d76
 lib/codeql/rust/elements/internal/generated/CallExpr.qll f1b8dae487077cc9d1dccf8c3cd61fd17afe860585f17ce8b860be4859be7ca4 6034fc03778e38802cdf3a6e460364b74e92912622581b31e6179951022bbbd6
 lib/codeql/rust/elements/internal/generated/CallExprBase.qll 2268e01d65015014c05166161bb28e5a1e78164d525ca16fc1e3106866cf231d b2f9b912153ba4d3e3612df4f74ac0e83077c31d5b31383bd277974081417a56
-lib/codeql/rust/elements/internal/generated/Callable.qll 9a8661aa018fd90a21529760c1dbc46c1ad3649e17b030e59ced0683fbf83f8a 8b573adfc23ec0ac91949da415e6a0c988fa02cbce9534d45ac98a5512d7b1ca
+lib/codeql/rust/elements/internal/generated/Callable.qll 12368b998c771c6b80f54123cea4d3600af7432ab34c9e571bc0bf3894ceb17e 273a9fd9cdae56cf2edbdc9c49b15da49cd5ad04be70acbbe2475c9c50200183
 lib/codeql/rust/elements/internal/generated/CastExpr.qll ddc20054b0b339ad4d40298f3461490d25d00af87c876da5ffbc6a11c0832295 f4247307afcd74d80e926f29f8c57e78c50800984483e6b6003a44681e4a71f3
-lib/codeql/rust/elements/internal/generated/ClosureBinder.qll ab199df96f525a083a0762fd654cd098802033c79700a593bb204a9a0c69ec01 86b33543e0886715830cfcdaca43b555a242a4f12a4caa18b88732d5afb584bd
-lib/codeql/rust/elements/internal/generated/ClosureExpr.qll 34149bf82f107591e65738221e1407ec1dc9cc0dfb10ae7f761116fda45162de fd2fbc9a87fc0773c940db64013cf784d5e4137515cc1020e2076da329f5a952
+lib/codeql/rust/elements/internal/generated/ClosureExpr.qll 818aff75d86821c670d8ba0720c3270681b3e070140a9c41beab2a811b43eee6 9bf2d1d38f6c4a99d7c058f8ed096141f5ba6a75d2d26a464f0d65ed4e554222
 lib/codeql/rust/elements/internal/generated/Comment.qll cd1ef861e3803618f9f78a4ac00516d50ecfecdca1c1d14304dc5327cbe07a3b 8b67345aeb15beb5895212228761ea3496297846c93fd2127b417406ae87c201
 lib/codeql/rust/elements/internal/generated/Const.qll 3e606f0198b6461a94964dba7a4d386408f01651d75378eeab251dfceccf49c8 20fe276cded4764bdb1cd50de956bea88d7cd731909c0b84b4abb972b3094959
 lib/codeql/rust/elements/internal/generated/ConstArg.qll c52bf746f2dc89b8d71b8419736707bfcbb09cca424c3ba76e888e2add415bf6 89309a9df4fde23cfd3d8492908ccec4d90cc8457d35c507ef81371a369941b4
@@ -514,14 +505,15 @@ lib/codeql/rust/elements/internal/generated/ExtractorStep.qll 61cd504a1aab98b1c9
 lib/codeql/rust/elements/internal/generated/FieldExpr.qll d6077fcc563702bb8d626d2fda60df171023636f98b4a345345e131da1a03dfc 03f9eb65abfab778e6d2c7090c08fe75c38c967302f5a9fa96ab0c24e954929d
 lib/codeql/rust/elements/internal/generated/FieldList.qll 35bb72a673c02afafc1f6128aeb26853d3a1cdbaea246332affa17a023ece70e b7012dd214788de9248e9ab6eea1a896329d5731fa0b39e23df1b39df2b7eb9c
 lib/codeql/rust/elements/internal/generated/FnPtrTypeRepr.qll f218fa57a01ecc39b58fa15893d6499c15ff8ab8fd9f4ed3078f0ca8b3f15c7e 2d1a7325cf2bd0174ce6fc15e0cbe39c7c1d8b40db5f91e5329acb339a1ad1e8
+lib/codeql/rust/elements/internal/generated/ForBinder.qll 7be6b8e3934db8cd4ac326625cf637dda4b175fd7573a52d2feb147769c4c6a1 234484b9b4cf3a20c97334417700db5029da65313410b3c9e929512c509e5c27
 lib/codeql/rust/elements/internal/generated/ForExpr.qll 7c497d2c612fd175069037d6d7ff9339e8aec63259757bb56269e9ca8b0114ea dc48c0ad3945868d6bd5e41ca34a41f8ee74d8ba0adc62b440256f59c7f21096
-lib/codeql/rust/elements/internal/generated/ForTypeRepr.qll 36ea243bd5ada10c586d9430464761849506b91754cf045c59f4ae194e78a456 cc65dc72c87d0ad7be3263bbdd1c515a057e62e97b0a28f9c4b0f689ac3566b7
+lib/codeql/rust/elements/internal/generated/ForTypeRepr.qll 7daa3b938592b590d604203e7d0fc5c34c2bffe6adcceee5a5e0c681ed16214c f1380179cbdc188ad133c946d9e17e85aed0d77771b319f663d8eada0f7cf17d
 lib/codeql/rust/elements/internal/generated/Format.qll 934351f8a8ffd914cc3fd88aca8e81bf646236fe34d15e0df7aeeb0b942b203f da9f146e6f52bafd67dcfd3b916692cf8f66031e0b1d5d17fc8dda5eefb99ca0
 lib/codeql/rust/elements/internal/generated/FormatArgsArg.qll c762a4af8609472e285dd1b1aec8251421aec49f8d0e5ce9df2cc5e2722326f8 c8c226b94b32447634b445c62bd9af7e11b93a706f8fa35d2de4fda3ce951926
 lib/codeql/rust/elements/internal/generated/FormatArgsExpr.qll 8aed8715a27d3af3de56ded4610c6792a25216b1544eb7e57c8b0b37c14bd9c1 590a2b0063d2ecd00bbbd1ce29603c8fd69972e34e6daddf309c915ce4ec1375
 lib/codeql/rust/elements/internal/generated/FormatArgument.qll cd05153276e63e689c95d5537fbc7d892615f62e110323759ef02e23a7587407 be2a4531b498f01625effa4c631d51ee8857698b00cfb829074120a0f2696d57
 lib/codeql/rust/elements/internal/generated/FormatTemplateVariableAccess.qll a6175214fad445df9234b3ee9bf5147da75baf82473fb8d384b455e3add0dac1 a928db0ff126b2e54a18f5c488232abd1bd6c5eda24591d3c3bb80c6ee71c770
-lib/codeql/rust/elements/internal/generated/Function.qll 695dbc61e1c4d67a75e438f30fffcaa4a251be629093428b6b7afba053342fb6 ddc34f1da6b4b2ac64d60028822c7cfc72da133dd08ad2490bd2dcae9d91e074
+lib/codeql/rust/elements/internal/generated/Function.qll 25aa44c816233b9259b4ca12a15b6aff5856f4147d6a72fd0ec2fdebb24a5131 62a8a9080bf555950a854f84444d79cbe72d69b1d3f73ac801bb11e732fc7e46
 lib/codeql/rust/elements/internal/generated/GenericArg.qll 908dadf36a631bc9f4423ab473d1344ed882c7f3f85ac169d82e0099ff6337d4 c6ef5358db3a0318987962a51cbe6b77ae9c0e39c1312a059306e40e86db7eb8
 lib/codeql/rust/elements/internal/generated/GenericArgList.qll b8cd936bba6f28344e28c98acf38acb8ef43af6ecf8367d79ed487e5b9da17cb 8b14331261e49d004807285b02fca190aafd62bfb9378b05c7d9c1e95525fe7b
 lib/codeql/rust/elements/internal/generated/GenericParam.qll 85ac027a42b3300febc9f7ede1098d3ffae7bac571cba6391bc00f9061780324 806cb9d1b0e93442bef180e362c4abc055ab31867ff34bac734b89d32bd82aa1
@@ -547,7 +539,7 @@ lib/codeql/rust/elements/internal/generated/LiteralPat.qll f36b09cf39330019c111e
 lib/codeql/rust/elements/internal/generated/Locatable.qll c897dc1bdd4dfcb6ded83a4a93332ca3d8f421bae02493ea2a0555023071775e b32d242f8c9480dc9b53c1e13a5cb8dcfce575b0373991c082c1db460a3e37b8
 lib/codeql/rust/elements/internal/generated/LoopExpr.qll db6bc87e795c9852426ec661fa2c2c54106805897408b43a67f5b82fb4657afd 1492866ccf8213469be85bbdbcae0142f4e2a39df305d4c0d664229ecd1ebdb9
 lib/codeql/rust/elements/internal/generated/LoopingExpr.qll 0792c38d84b8c68114da2bbdfef32ef803b696cb0fd06e10e101756d5c46976c 111fe961fad512722006323c3f2a075fddf59bd3eb5c7afc349835fcec8eb102
-lib/codeql/rust/elements/internal/generated/MacroBlockExpr.qll 778376cdfa4caaa9df0b9c21bda5ff0f1037b730aa43efb9fb0a08998ef3999b 6df39efe7823ce590ef6f4bdfa60957ba067205a77d94ac089b2c6a7f6b7b561
+lib/codeql/rust/elements/internal/generated/MacroBlockExpr.qll 7705de831e797c8742726a3c28dd8f87f6c1b9e2cccd20f01839d161f7ca37c7 ac79c5c95befc82f53b620ccc8a28fd9cc0f9e00c585ed4032bd75f99e0935fa
 lib/codeql/rust/elements/internal/generated/MacroCall.qll 1a7ee9c782ebc9ab0a807762aabebc9e0a7ef10c6eb945679737598630b20af2 782a437654cb316355c020e89d50b07c93ba7817715fa5d42a9e807cf12d1a43
 lib/codeql/rust/elements/internal/generated/MacroDef.qll 90393408d9e10ff6167789367c30f9bfe1d3e8ac3b83871c6cb30a8ae37eef47 f022d1df45bc9546cb9fd7059f20e16a3acfaae2053bbd10075fe467c96e2379
 lib/codeql/rust/elements/internal/generated/MacroExpr.qll 5a86ae36a28004ce5e7eb30addf763eef0f1c614466f4507a3935b0dab2c7ce3 11c15e8ebd36455ec9f6b7819134f6b22a15a3644678ca96b911ed0eb1181873
@@ -560,7 +552,7 @@ lib/codeql/rust/elements/internal/generated/MatchArmList.qll 12d969ecb267a749918
 lib/codeql/rust/elements/internal/generated/MatchExpr.qll b686842e7000fd61e3a0598bf245fb4e18167b99eca9162fdfdff0b0963def22 00f1743b1b0f1a92c5a687f5260fda02d80cc5871694cad0d5e7d94bac7fe977
 lib/codeql/rust/elements/internal/generated/MatchGuard.qll 58fa1d6979ef22de2bd68574c7ffcf4a021d7543445f68834d879ff8cee3abcb 072f22a7929df3c0e764b2a770b4cdf03504b3053067d9b9008d6655fb5837e1
 lib/codeql/rust/elements/internal/generated/Meta.qll 15e98e8d38f5618b7053057a629b135aae5e105fbf72731833a644fb695244c0 2977b6a0781c89383e87c595b14a39851f27b2508296f3e77466eea44c916188
-lib/codeql/rust/elements/internal/generated/MethodCallExpr.qll 816267f27f990d655f1ef2304eb73a9468935ffbfddd908773a77fa3860bb970 adda2574300a169a13ea9e33af05c804bf00868d3e8930f0f78d6a8722ad688d
+lib/codeql/rust/elements/internal/generated/MethodCallExpr.qll 0cd0f84147e5f3887d609cc58246eb493d3461aee00ff37e7d26282c835f73af 6f4c5dc1decbce54fc12300d34798b890a85129208b25565130205c9d8ee2e29
 lib/codeql/rust/elements/internal/generated/Missing.qll 16735d91df04a4e1ae52fae25db5f59a044e540755734bbab46b5fbb0fe6b0bd 28ca4e49fb7e6b4734be2f2f69e7c224c570344cc160ef80c5a5cd413e750dad
 lib/codeql/rust/elements/internal/generated/Module.qll ebae5d8963c9fd569c0fbad1d7770abd3fd2479437f236cbce0505ba9f9af52c fa3c382115fed18a26f1a755d8749a201b9489f82c09448a88fb8e9e1435fe5f
 lib/codeql/rust/elements/internal/generated/Name.qll e6bd6240a051383a52b21ab539bc204ce7bcd51a1a4379e497dff008d4eef5b4 578a3b45e70f519d57b3e3a3450f6272716c849940daee49889717c7aaa85fc9
@@ -575,11 +567,11 @@ lib/codeql/rust/elements/internal/generated/ParamList.qll eaa0cd4402d3665013d47e
 lib/codeql/rust/elements/internal/generated/ParenExpr.qll 812d2ff65079277f39f15c084657a955a960a7c1c0e96dd60472a58d56b945eb eb8c607f43e1fcbb41f37a10de203a1db806690e10ff4f04d48ed874189cb0eb
 lib/codeql/rust/elements/internal/generated/ParenPat.qll 24f9dc7fce75827d6fddb856cd48f80168143151b27295c0bab6db5a06567a09 ebadbc6f5498e9ed754b39893ce0763840409a0721036a25b56e1ead7dcc09aa
 lib/codeql/rust/elements/internal/generated/ParenTypeRepr.qll 03f5c5b96a37adeb845352d7fcea3e098da9050e534972d14ac0f70d60a2d776 ed3d6e5d02086523087adebce4e89e35461eb95f2a66d1d4100fe23fc691b126
-lib/codeql/rust/elements/internal/generated/ParentChild.qll 3657258593982c34cb5934cf51fe21a0749af3161890b43c20f2b327d89ecf77 83509d01d5735e297057327be7fbb837a4633604cf6641ba34bb4825798187da
+lib/codeql/rust/elements/internal/generated/ParentChild.qll f04ca3d02170f7e532a480cc81748cf04f1b022d5e0e32ffcdf0f15c8f1961aa 999104d69a5435c9cab594e04b82ed26ae38b1b1d2ac1dbbb315a433c586f941
 lib/codeql/rust/elements/internal/generated/ParenthesizedArgList.qll d901fdc8142a5b8847cc98fc2afcfd16428b8ace4fbffb457e761b5fd3901a77 5dbb0aea5a13f937da666ccb042494af8f11e776ade1459d16b70a4dd193f9fb
 lib/codeql/rust/elements/internal/generated/Pat.qll 3605ac062be2f294ee73336e9669027b8b655f4ad55660e1eab35266275154ee 7f9400db2884d336dd1d21df2a8093759c2a110be9bf6482ce8e80ae0fd74ed4
 lib/codeql/rust/elements/internal/generated/Path.qll 9b12afb46fc5a9ad3a811b05472621bbecccb900c47504feb7f29d96b28421ca bcacbffc36fb3e0c9b26523b5963af0ffa9fd6b19f00a2a31bdb2316071546bd
-lib/codeql/rust/elements/internal/generated/PathAstNode.qll e6d4d5bffd3c623baaaee46bc183eb31ce88795535f164f6a9b9b4d98bbd6101 168db515404933479ba6b150c72e012d28592cbc32366aefcb1bf9599dbcd183
+lib/codeql/rust/elements/internal/generated/PathAstNode.qll b02654422f80e398027069135bb01205358f0ab82ded3408d83d066f300996a3 345e7f92a75bfc71657b223602f60c36f7637d6f2e3798f07e2d2926eea2431b
 lib/codeql/rust/elements/internal/generated/PathExpr.qll 34ebad4d062ce8b7e517f2ab09d52745fb8455203f4a936df7284ad296638387 ba66781cdbdeb89c27a4bfb2be0f27f85fb34978d699b4e343446fb0d7ad2aa6
 lib/codeql/rust/elements/internal/generated/PathExprBase.qll d8218e201b8557fa6d9ca2c30b764e5ad9a04a2e4fb695cc7219bbd7636a6ac2 4ef178426d7095a156f4f8c459b4d16f63abc64336cb50a6cf883a5f7ee09113
 lib/codeql/rust/elements/internal/generated/PathPat.qll 003d10a4d18681da67c7b20fcb16b15047cf9cc4b1723e7674ef74e40589cc5a 955e66f6d317ca5562ad1b5b13e1cd230c29e2538b8e86f072795b0fdd8a1c66
@@ -590,14 +582,13 @@ lib/codeql/rust/elements/internal/generated/PtrTypeRepr.qll 8d0ea4f6c7f8203340bf
 lib/codeql/rust/elements/internal/generated/PureSynthConstructors.qll e5b8e69519012bbaae29dcb82d53f7f7ecce368c0358ec27ef6180b228a0057f e5b8e69519012bbaae29dcb82d53f7f7ecce368c0358ec27ef6180b228a0057f
 lib/codeql/rust/elements/internal/generated/RangeExpr.qll 23cca03bf43535f33b22a38894f70d669787be4e4f5b8fe5c8f7b964d30e9027 18624cef6c6b679eeace2a98737e472432e0ead354cca02192b4d45330f047c9
 lib/codeql/rust/elements/internal/generated/RangePat.qll 80826a6a6868a803aa2372e31c52a03e1811a3f1f2abdb469f91ca0bfdd9ecb6 34ee1e208c1690cba505dff2c588837c0cd91e185e2a87d1fe673191962276a9
-lib/codeql/rust/elements/internal/generated/Raw.qll f5b37458fb9c16829da761323deab22b440c3cb5bf915e07ee3eb2315251020e 0198c8d6ac310f107e4685f6dc0bd2eb58800af41ab4ac4c15c42d8d575f4b0a
+lib/codeql/rust/elements/internal/generated/Raw.qll 14758dc2e2a9af251f24e24516eab0fc95d334c1da06f418ea5da3c5521642c9 a8b6637f57293a85714cc8761f8fd1e23780d58f3873acaa3c77acd9cbfcf19f
 lib/codeql/rust/elements/internal/generated/RefExpr.qll 7d995884e3dc1c25fc719f5d7253179344d63650e217e9ff6530285fe7a57f64 f2c3c12551deea4964b66553fb9b6423ee16fec53bd63db4796191aa60dc6c66
 lib/codeql/rust/elements/internal/generated/RefPat.qll 456ede39837463ee22a630ec7ab6c8630d3664a8ea206fcc6e4f199e92fa564c 5622062765f32930465ba6b170e986706f159f6070f48adee3c20e24e8df4e05
 lib/codeql/rust/elements/internal/generated/RefTypeRepr.qll 5b0663a6d234572fb3e467e276d019415caa95ef006438cc59b7af4e1783161e 0e27c8a8f0e323c0e4d6db01fca821bf07c0864d293cdf96fa891b10820c1e4b
 lib/codeql/rust/elements/internal/generated/Rename.qll 53dd50d35aa38cb6eb4174c94e8e23042b42bdc4f38df009489ebf707380483b db14fbce0d95b4dae3d7512f9bdee92e0dc2dffde5ba5d7458f2f5dd632876b0
-lib/codeql/rust/elements/internal/generated/Resolvable.qll 586eefb01794220679c3b5d69c059d50c2238cf78ab33efe7185bbd07dea8dbd 1b7c7297d541b9de9e881d18fed4ae40dd327396366a3a6f52a24b85685fa9c1
 lib/codeql/rust/elements/internal/generated/RestPat.qll 369f5828bb78f2856d528679a9869f81859b375c2f831ff72f4507daaee976e3 17f24ce8aa6a27359c10a654667b7877ca7a1509509e2ab246ed26fe15ef66b4
-lib/codeql/rust/elements/internal/generated/RetTypeRepr.qll 7e782d6ca346fd4057e95a6eefe796e3fba7eef62144a0df78e2d115a7ae9ba9 d5da144e06d180673fa7ce274c5e7e2ca2db12b064df1155bc56f2f9378b58b4
+lib/codeql/rust/elements/internal/generated/RetTypeRepr.qll 853b7fd6c1f3678d0f9315ac23a99a0828a6e54148de24016a265039c7b1941c f1e140d2b113c494601143b735482869ee817c8a7d92026f6a511bc5c1420552
 lib/codeql/rust/elements/internal/generated/ReturnExpr.qll c9c05400d326cd8e0da11c3bfa524daa08b2579ecaee80e468076e5dd7911d56 e7694926727220f46a7617b6ca336767450e359c6fa3782e82b1e21d85d37268
 lib/codeql/rust/elements/internal/generated/ReturnTypeSyntax.qll 7b7692ca9fbe627afa0759050a740f0f42a8083446c1c3196084f5698fc570c3 96a735d60a3919c7c994f7b67930c9e51a3713940678d04a5fee54557d733c24
 lib/codeql/rust/elements/internal/generated/SelfParam.qll 076c583f7f34e29aaaf3319e9d64565a34c64caa5a6dfca240c0cc7800e9a14c 375afed1772d193b71980d3825c4ac438e90b295cba0baf58319d29a3a8463a0
@@ -606,9 +597,9 @@ lib/codeql/rust/elements/internal/generated/SliceTypeRepr.qll 6f4f9d7e29784ce95d
 lib/codeql/rust/elements/internal/generated/SourceFile.qll 4bc95c88b49868d1da1a887b35e43ae81e51a69407e79463f5e8824801859380 5641581d70241c0d0d0426976968576ebbef10c183f0371583b243e4e5bbf576
 lib/codeql/rust/elements/internal/generated/Static.qll 1a6c87d3c5602e3d02268ebe2463a4ac64614ad25e8966a9bdb9c0ef58991365 cc1fe16d70cdce41a12e41a8f80cc38bdd7efa49c1544e35342fcf3cd26b8219
 lib/codeql/rust/elements/internal/generated/Stmt.qll 8473ff532dd5cc9d7decaddcd174b94d610f6ca0aec8e473cc051dad9f3db917 6ef7d2b5237c2dbdcacbf7d8b39109d4dc100229f2b28b5c9e3e4fbf673ba72b
-lib/codeql/rust/elements/internal/generated/StmtList.qll 816aebf8f56e179f5f0ba03e80d257ee85459ea757392356a0af6dbd0cd9ef5e 6aa51cdcdc8d93427555fa93f0e84afdfbbd4ffc8b8d378ae4a22b5b6f94f48b
+lib/codeql/rust/elements/internal/generated/StmtList.qll 834b87cd93f0c5b41736fb52a6c25fd0e3bdce41d5a64cb3d0810c54e90507f4 ec42f2dfa322044ceaaf90d278f0e7e751d63710facbaf3f5ee69ca3c64ecd06
 lib/codeql/rust/elements/internal/generated/Struct.qll 999da1b46e40d6e03fd2338fea02429462877c329c5d1338618cbd886a81567e daa7ff7bd32c554462e0a1502d8319cb5e734e056d0564e06596e416e2b88e9d
-lib/codeql/rust/elements/internal/generated/StructExpr.qll c6d861eaa0123b103fd9ffd2485423419ef9b7e0b4af9ed2a2090d8ec534f65d 50da99ee44771e1239ed8919f711991dd3ec98589fbe49b49b68c88074a07d74
+lib/codeql/rust/elements/internal/generated/StructExpr.qll e77702890561102af38f52d836729e82569c964f8d4c7e680b27992c1ff0f141 23dc51f68107ab0e5c9dd88a6bcc85bb66e8e0f4064cb4d416f50f2ba5db698c
 lib/codeql/rust/elements/internal/generated/StructExprField.qll 6bdc52ed325fd014495410c619536079b8c404e2247bd2435aa7685dd56c3833 501a30650cf813176ff325a1553da6030f78d14be3f84fea6d38032f4262c6b0
 lib/codeql/rust/elements/internal/generated/StructExprFieldList.qll 298d33442d1054922d2f97133a436ee559f1f35b7708523284d1f7eee7ebf443 7febe38a79fadf3dcb53fb8f8caf4c2780f5df55a1f8336269c7b674d53c6272
 lib/codeql/rust/elements/internal/generated/StructField.qll 0ccd678b64b82fdab7ffe9eb74f0d393b22da4459fe72248828896b5204c009c 0faf5a517eccc43141a48809ed35b864341a35764de2dba7442daa899ff4ff69
@@ -616,14 +607,14 @@ lib/codeql/rust/elements/internal/generated/StructFieldList.qll 5da528a51a6a5db9
 lib/codeql/rust/elements/internal/generated/StructPat.qll c76fa005c2fd0448a8803233e1e8818c4123301eb66ac5cf69d0b9eaafc61e98 6e0dffccdce24bca20e87d5ba0f0995c9a1ae8983283e71e7dbfcf6fffc67a58
 lib/codeql/rust/elements/internal/generated/StructPatField.qll 5b5c7302dbc4a902ca8e69ff31875c867e295a16a626ba3cef29cd0aa248f179 4e192a0df79947f5cb0d47fdbbba7986137a6a40a1be92ae119873e2fad67edf
 lib/codeql/rust/elements/internal/generated/StructPatFieldList.qll 1a95a1bd9f64fb18e9571657cf2d02a8b13c747048a1f0f74baf31b91f0392ad fc274e414ff4ed54386046505920de92755ad0b4d39a7523cdffa4830bd53b37
-lib/codeql/rust/elements/internal/generated/Synth.qll 4390996606c436cb34201d7dba9821a0d775d1707e54fbbe24cbf788d1d1d948 8e8077a387c69f7f5e3bdb2754654625c233283eb39eab33a72bde536f139a16
-lib/codeql/rust/elements/internal/generated/SynthConstructors.qll bcc7f617b775ac0c7f04b1cc333ed7cc0bd91f1fabc8baa03c824d1df03f6076 bcc7f617b775ac0c7f04b1cc333ed7cc0bd91f1fabc8baa03c824d1df03f6076
+lib/codeql/rust/elements/internal/generated/Synth.qll a8ea364358a2bc3a9226d451c0867e89c29509a0f54dd88ed23c77045db2c85a a44de5e84a63cb5a1bfa66b0df33bf28c9f8b6628393d0f3b2f6215dabee47bd
+lib/codeql/rust/elements/internal/generated/SynthConstructors.qll f41abfc73415b7accb38da7c107faebfe6843c270ad54e0e54a96e930dfe479a f41abfc73415b7accb38da7c107faebfe6843c270ad54e0e54a96e930dfe479a
 lib/codeql/rust/elements/internal/generated/Token.qll 77a91a25ca5669703cf3a4353b591cef4d72caa6b0b9db07bb9e005d69c848d1 2fdffc4882ed3a6ca9ac6d1fb5f1ac5a471ca703e2ffdc642885fa558d6e373b
 lib/codeql/rust/elements/internal/generated/TokenTree.qll 1a3c4f5f30659738641abdd28cb793dab3cfde484196b59656fc0a2767e53511 de2ebb210c7759ef7a6f7ee9f805e1cac879221287281775fc80ba34a5492edf
 lib/codeql/rust/elements/internal/generated/Trait.qll 8fa41b50fa0f68333534f2b66bb4ec8e103ff09ac8fa5c2cc64bc04beafec205 ce1c9aa6d0e2f05d28aab8e1165c3b9fb8e24681ade0cf6a9df2e8617abeae7e
 lib/codeql/rust/elements/internal/generated/TraitAlias.qll 40a296cf89eceaf02a32db90acb42bdc90df10e717bae3ab95bc09d842360a5b af85cf1f8fa46a8b04b763cdcacc6643b83c074c58c1344e485157d2ceb26306
 lib/codeql/rust/elements/internal/generated/TryExpr.qll 73052d7d309427a30019ad962ee332d22e7e48b9cc98ee60261ca2df2f433f93 d9dd70bf69eaa22475acd78bea504341e3574742a51ad9118566f39038a02d85
-lib/codeql/rust/elements/internal/generated/TupleExpr.qll 75186da7c077287b9a86fc9194221ab565d458c08a5f80b763e73be5b646b29f 0250d75c43e2e6f56cdc8a0c00cc42b3d459ea8d48172d236c8cdf0fe96dfed2
+lib/codeql/rust/elements/internal/generated/TupleExpr.qll 98f10bc72d09f98e3be87f41b1a3cbf037f4a7e3d3560dfa6d5759905a8177a5 6a9eb5568c518876b2912371e2b7b774cf5245097c5a0206eda35b749995f00b
 lib/codeql/rust/elements/internal/generated/TupleField.qll d546b4e0c1a0b243c2bf88b371377cf9a396ca497cd5e78915e0e552910b6093 c0a754d15e0de590ee15139d8d366e4d7e4d33882c943e6ea8fa5fa8dce790e3
 lib/codeql/rust/elements/internal/generated/TupleFieldList.qll fb76d1a395326361859177c05e90e5bbb22d37518758752e9d89906006fb683e f31508b120c36f569cc7dcae06c9e55cf875abfb2fbe54a64ec12d8b3d2db108
 lib/codeql/rust/elements/internal/generated/TuplePat.qll 4e13b509e1c9dd1581a9dc50d38e0a6e36abc1254ea9c732b5b3e6503335afeb 298028df9eb84e106e625ed09d6b20038ad47bfc2faf634a0ffea50b17b5805d
@@ -631,7 +622,7 @@ lib/codeql/rust/elements/internal/generated/TupleStructPat.qll 6539d0edbdc16e7df
 lib/codeql/rust/elements/internal/generated/TupleTypeRepr.qll 1756cdbad56d634bf4726bc39c768386754e62650492d7d6344012038236a05b 3ac0997a47f95f28cc70c782173ce345fcb5b073be10f3c0b414d1df8443e04c
 lib/codeql/rust/elements/internal/generated/TypeAlias.qll 0d0c97d9e9213b8f0390b3456737d4611701a570b9943bb20b348c4efc8e4693 a83c701c0d8914e01517dfa9253a12be962f0a7ed2f75fbaae25a13432db403f
 lib/codeql/rust/elements/internal/generated/TypeArg.qll 80245e4b52bef30e5033d4c765c72531324385deea1435dc623290271ff05b1d 097926e918dcd897ea1609010c5490dbf45d4d8f4cffb9166bcadf316a2f1558
-lib/codeql/rust/elements/internal/generated/TypeBound.qll fa5cf5370c3f69e687b5fc888d2ca29d0a45bd0824d1159a202eafae29e70601 e3bc6a1e5c0af374c60e83396c5b0ceda499fabd300c25017ae7d4d5b234b264
+lib/codeql/rust/elements/internal/generated/TypeBound.qll ed27681b76b8f3ad790daad4a08f3bc243452821246bcb240b1d925bc1c362a3 8fdc0caf91f1894d8711d68547185eb029446898b66f60fc0d10ef862cd6292e
 lib/codeql/rust/elements/internal/generated/TypeBoundList.qll c5d43dc27075a0d5370ba4bc56b4e247357af5d2989625deff284e7846a3a48b c33c87d080e6eb6df01e98b8b0031d780472fcaf3a1ed156a038669c0e05bf0a
 lib/codeql/rust/elements/internal/generated/TypeParam.qll 81a8d39f1e227de031187534e5d8e2c34f42ad3433061d686cadfbdd0df54285 893795d62b5b89997574e9057701d308bea2c4dca6053042c5308c512137e697
 lib/codeql/rust/elements/internal/generated/TypeRepr.qll 1e7b9d2ddab86e35dad7c31a6453a2a60747420f8bc2e689d5163cab4fec71bb eb80e3947649e511e7f3555ffc1fd87199e7a32624449ca80ffad996cdf9e2f3
@@ -641,19 +632,19 @@ lib/codeql/rust/elements/internal/generated/Unimplemented.qll a3eb304781991bff12
 lib/codeql/rust/elements/internal/generated/Union.qll 456504e6a32991ba17ca65f97636f4dfb86c758c7f8509aaca1b0d0432231dfe c96068edfec3e0755a7726426a10996455ee9f0f2d678af258719f1943a3063e
 lib/codeql/rust/elements/internal/generated/Use.qll cf95b5c4756b25bee74113207786e37464ffbc0fb5f776a04c651300afc53753 1fe26b3904db510184cb688cb0eeb0a8dbac7ac15e27a3b572d839743c738393
 lib/codeql/rust/elements/internal/generated/UseBoundGenericArg.qll 69162794e871291545ea04f61259b2d000671a96f7ca129f7dd9ed6e984067c4 31de9ebc0634b38e2347e0608b4ea888892f1f2732a2892464078cd8a07b4ee8
-lib/codeql/rust/elements/internal/generated/UseBoundGenericArgs.qll 2cc8ab0068b7bf44ca17a62b32a8dd1d89cd743532c8a96b262b164fd81b0c36 347e7709a0f5ace197beb6827f6cf04a31ff68ff2dff3707914c6b910658d00a
+lib/codeql/rust/elements/internal/generated/UseBoundGenericArgs.qll cedde7ccf689e3a2a246113be94544c206c56fb1c01b83b074e1f6edd3acfced f022ea4c653d1b5f311917efde8e59be27394ce7f6abf2561bb1e42f93f74adf
 lib/codeql/rust/elements/internal/generated/UseTree.qll 3d7cbcc8ae76068b8f660c7d5b81b05595026043015cd6b4d42a60ed4c165811 b9f0bcf82feb31f31406e787670fee93e1aa0966bcc0e4cc285c342e88793e4e
 lib/codeql/rust/elements/internal/generated/UseTreeList.qll 38efaa569b76ca79be047703279388e8f64583a126b98078fbbb6586e0c6eb56 1623a50fd2d3b1e4b85323ad73dd655172f7cbc658d3506aaa6b409e9ebe576e
 lib/codeql/rust/elements/internal/generated/Variant.qll fa6909715133049b3dba4622e6262fa30c4a9478b6219ec4fd12e07c58750709 71fc2ddac97fc4c4e6b92a13ee217cccc81dffc7c12295b6bc97c56ad25a92cc
 lib/codeql/rust/elements/internal/generated/VariantList.qll 3f70bfde982e5c5e8ee45da6ebe149286214f8d40377d5bc5e25df6ae8f3e2d1 22e5f428bf64fd3fd21c537bfa69a46089aad7c363d72c6566474fbe1d75859e
 lib/codeql/rust/elements/internal/generated/Visibility.qll af1069733c0120fae8610b3ebbcdcebe4b4c9ce4c3e3d9be3f82a93541873625 266106bdff4d7041d017871d755c011e7dd396c5999803d9e46725b6a03a2458
 lib/codeql/rust/elements/internal/generated/WhereClause.qll aec72d358689d99741c769b6e8e72b92c1458138c097ec2380e917aa68119ff0 81bb9d303bc0c8d2513dc7a2b8802ec15345b364e6c1e8b300f7860aac219c36
-lib/codeql/rust/elements/internal/generated/WherePred.qll 9aa63abdf1202ee4708e7413401811d481eac55ba576a4950653395f931d1e90 ebb9f2883f811ea101220eac13d02d2893d2ec0231a29826a32b77cb2c88a5f8
+lib/codeql/rust/elements/internal/generated/WherePred.qll 73b28efc1682bf527bdc97a07568d08666d61686940400c99095cb9593bc8df3 2ec1fb5577d033c120d31f1620753b3618fcb7f384a35a6d3e6b5e0bb375a8a5
 lib/codeql/rust/elements/internal/generated/WhileExpr.qll 0353aab87c49569e1fbf5828b8f44457230edfa6b408fb5ec70e3d9b70f2e277 e1ba7c9c41ff150b9aaa43642c0714def4407850f2149232260c1a2672dd574a
 lib/codeql/rust/elements/internal/generated/WildcardPat.qll d74b70b57a0a66bfae017a329352a5b27a6b9e73dd5521d627f680e810c6c59e 4b913b548ba27ff3c82fcd32cf996ff329cb57d176d3bebd0fcef394486ea499
 lib/codeql/rust/elements/internal/generated/YeetExpr.qll cac328200872a35337b4bcb15c851afb4743f82c080f9738d295571eb01d7392 94af734eea08129b587fed849b643e7572800e8330c0b57d727d41abda47930b
 lib/codeql/rust/elements/internal/generated/YieldExpr.qll 37e5f0c1e373a22bbc53d8b7f2c0e1f476e5be5080b8437c5e964f4e83fad79a 4a9a68643401637bf48e5c2b2f74a6bf0ddcb4ff76f6bffb61d436b685621e85
-lib/codeql/rust/elements.qll 6ebcf16ef214075bc43562c246c11f8b90c089ff1b5041ab1b39ab9f4a40e9b3 6ebcf16ef214075bc43562c246c11f8b90c089ff1b5041ab1b39ab9f4a40e9b3
+lib/codeql/rust/elements.qll d3beb3a35f2b5ea47d60aeefd86fb0d6406dd0a1b7cd89aecbb2732b4e72da38 d3beb3a35f2b5ea47d60aeefd86fb0d6406dd0a1b7cd89aecbb2732b4e72da38
 test/extractor-tests/generated/Abi/Abi.ql 086ed104ab1a7e7fe5c1ed29e03f1719a797c7096c738868bf6ebe872ab8fdaa fe23fe67ab0d9201e1177ea3f844b18ed428e13e3ce77381bf2b6910adfa3a0e
 test/extractor-tests/generated/ArgList/ArgList.ql da97b5b25418b2aa8cb8df793f48870c89fa00759cdade8ddba60d7f1f4bbc01 acfd5d2caf67282ad2d57b961068472100482d0f770a52a3c00214c647d18c75
 test/extractor-tests/generated/ArrayListExpr/ArrayListExpr.ql 42b365276aa43e2cad588338463542d3ce1dd0db3a428621554584b07a1431d5 08a66a8b69af35ee3bc64c35c453a19a6c9881cc6cc7e65275d1fff056121270
@@ -662,7 +653,7 @@ test/extractor-tests/generated/ArrayTypeRepr/ArrayTypeRepr.ql b262300235ab5bf4fe
 test/extractor-tests/generated/AsmClobberAbi/AsmClobberAbi.ql adfcfcdc6ac2a9a4849ea592e37da4221b6279cf2ea1112d32b6c89fda33e85e 7438490536e27b7173dec731f6925531a0e3fa839639c97a53905ba72d7efbe5
 test/extractor-tests/generated/AsmConst/AsmConst.ql 82f322fc8a01f4ccc86b3ecca86a9515313120764c6a3ac00b968e4441625422 62831f204c5c2d0f155152c661f9b5d4a4b685df6e40693106fbef0379378981
 test/extractor-tests/generated/AsmDirSpec/AsmDirSpec.ql 518a739c91481f67b27bfd1989d9dcbada12de54901eb6d598c896cd72f1f5fe 4567661eecf475fb05e13749b9250bcec51056b6db5a6ae7df24b7ba5cfb88c2
-test/extractor-tests/generated/AsmExpr/AsmExpr.ql c6c0128b252a13d5acea9a07b3854625aa51ebcce9dd93c11b423c9929d441fb 7618977e43f202af5b7d21b67531c4795bb791abe3cb03ba4077913c430b31d5
+test/extractor-tests/generated/AsmExpr/AsmExpr.ql 817faad3ea0b9da9a12026a8cfd91a0363595ce594fc5bc6ac43b112f911b2cd f0d5866dec3474f13fc85686aeb63e2fa8079b8f2774f0185959be00314eff87
 test/extractor-tests/generated/AsmLabel/AsmLabel.ql 130bf49dc1f5ae79e3588415b9a4c25dfdcbcac1884db9b2fb802a68e33180e5 c087e47d8953d312488fcc0b1bcbfca02521e3683e2063eaf380d76399bca037
 test/extractor-tests/generated/AsmOperandExpr/AsmOperandExpr.ql e866fd4715e78511352bb286c1120cbd52c4d960664d57dd99f0380eb1db7109 081d6a6267a3e251a123099b4c1e7d3c5a3b56e0efe9db7c7db24db1c08b7e0d
 test/extractor-tests/generated/AsmOperandNamed/AsmOperandNamed.ql fb1eb1f275ad251ba2e0876cf1d097bb33f20d06b0e50f8c01f7c11c71057688 e308567ffd18671cf172853a5c594f0f211d492c7e2fb58be412703d1b342b41
@@ -681,36 +672,36 @@ test/extractor-tests/generated/BoxPat/BoxPat.ql 854c9ba4e045dbe7ea1666866c1c443a
 test/extractor-tests/generated/BreakExpr/BreakExpr.ql c2181211da3dfe983cfca93ead32d5d211e91181899b9477152c58124eaa846d 57e57b926e14db2efb2e88e04699608b2ba9797ee4f6c4f710135b6858982256
 test/extractor-tests/generated/CallExpr/CallExpr.ql 2a1cd4485ccd8d4eb24a75889e832612adef9bb7feae414c90572796380bc6d7 95060b92aa04d7ad1fc6603c5ec14a275a5788ecb5a19932732e28105607a3b7
 test/extractor-tests/generated/CastExpr/CastExpr.ql 3480ec51072399409b7553ab6139c832db6ed4ca991f3a7a2282a39afe07c6f2 614c8ea7a2fe30d57583dbf84ed7a12743c2aba49d8c6252d31af3ed10853a39
-test/extractor-tests/generated/ClosureBinder/ClosureBinder.ql b68285fec6224b156754f51ee75a9b7ed32edaa16527e6f657a73bf6dd97eba3 d02b1b6d66dea1da892447d7b309f9b6e4eda0dd02055d71706d52aa73b5b9c4
-test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql 849c874de45781b8491cee428cc00fefc8cdc76f87de8a373a181b16ce930ab1 5e570193befae7bfe6c21ce91e20afd52bb94f234e2be89d0974bd6337221508
+test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql 675ae07193241fbd710ece4f74f86e9b00f47841299b1c5934f55dbf13a4b4af 21fb0664619c9c889e9491bfd651c2814dcf0f158dd6269937bd0acc18be6b0e
 test/extractor-tests/generated/Comment/Comment.ql 0e0454911d2cf2e7ef5c6d860b84c57b9d490090914ebcf4fa0e8a70f777f066 cbd1c195276ef163f8d3c122344738c884dc9fb70eb2f9b7067829d735d48c4c
-test/extractor-tests/generated/Const/Const.ql 28a0f2debbf73ae867fc2d08d8e54d9e96fea69522b7180a48495c9b7fce9367 54d4a68a2b67db95ceb856535a8b27860ce2b502da17a7eeea3bb554d7fb5e43
+test/extractor-tests/generated/Const/Const.ql 97797a56743b519c1990682ccb22af6d997ed5eea1e280b52ad31b16a5836f9e e5289ebcb71a25b7ac0a7e1aa0111e4f3ec83d26b7f83e819509c9b9d756921d
 test/extractor-tests/generated/ConstArg/ConstArg.ql 21c7caf1939ff9fcc1bf0fe6dec5c6a6929f714cf1e17faf7a2f4a31c910194b 61eac00f4727f7269f926c53f53a62b5fae82ce7a02b42d23b9de6337b6f9d6e
 test/extractor-tests/generated/ConstBlockPat/ConstBlockPat.ql e2198f9ef913f7ecb9e96a4e5e4849737b664dbdf1ef67428d372ea1c29bbb35 c49aaaafd65c4dfadd1fae42a2078dba90bbd3fa1bcb09b88501c5085ab22c49
 test/extractor-tests/generated/ConstParam/ConstParam.ql 6facb2402e1cbf23d836f619ef68e2d8496b3c0c438e71266de24d8690852468 211ed6f7384f86d849f559410b2ac09da3df278bdeea9e77c4d9c26a727a6990
 test/extractor-tests/generated/ContinueExpr/ContinueExpr.ql 58b5046a4da06a4cd2d942720603313126888b2249b218bef6f7c44ca469ccfa eeb84a04deb4c4496b7f9b38798cc7fdc179a486c8beaa0b33bf87e7f9482b1a
 test/extractor-tests/generated/Crate/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
 test/extractor-tests/generated/DynTraitTypeRepr/DynTraitTypeRepr.ql ff54195d2e09424faaac4e145a40208bf0e57acc57dfa8247b3751862a317c4b 583d5b98aa31a9af6ad73df000ca529f57f67aa6daaa50ca5673a56eb57bf507
-test/extractor-tests/generated/Enum/Enum.ql 11b8b502f0e79e0447a3d014616798448130ec5d686b5b12e0db687786065f4f 5ea58a9b57ece63253a82599c096ebbbd0a3c4ad136ca20662f47a4bafd2df41
+test/extractor-tests/generated/Enum/Enum.ql 64ed7f25aaf5eff67687cd3aa2690017fb6f9651c959aed7b655d486be0e0c5b 1df131d8e12c4594715ed31191e960792c21727b403dce59207c514671e88d62
 test/extractor-tests/generated/ExprStmt/ExprStmt.ql 7c62a97f7f910ae6e0e9aff7fdd78b369d21257ccab52afe6307ddea2e15dad1 2d32a366c4acbea3136ff1f9f9dadf76b148f82ad1d7170f02efd977d8a07ae9
-test/extractor-tests/generated/ExternBlock/ExternBlock.ql ceb04a9596c73dc2e750ce1950cefcf0b5fffd1ab7dc3e723e4a6500b3ef3ab2 4f6ab037d307ff351a9e48c37b47b8f8f25de5f3d5ecb78cb8c39d7275751d29
-test/extractor-tests/generated/ExternCrate/ExternCrate.ql 7cd54aa65300453fc031e69fde24466d01cdfb8ba73e24e4d134fbd3847b15a8 6a6fdeaee88c74caf7345dc8b85f326032eb27e63aa63a6ed883256e4da86d3b
+test/extractor-tests/generated/ExternBlock/ExternBlock.ql b61e37f1c387bc91be127b5425089f9f1d687f4f1708cad334c0bb00dba5bae3 dc03f0f0912b2cfbce74c3bc31d261cdbea740847212ac3472ecf719d8eb71f7
+test/extractor-tests/generated/ExternCrate/ExternCrate.ql 55d2d9d32cb5e894cc2ee5242d688aaa8428ba7757cccea67d1c064db6de2514 46a2c57660a42ee6eaa532b0c86f4cc2d3de795c33ee7cadbff650bd0f23206b
 test/extractor-tests/generated/ExternItemList/ExternItemList.ql 7f4d538d8878a0166b1868f391abf34df1d5e986a7a2e9ceaddb36d95bc7f46c 37072596f5a1e28ad98cc87dbfed00afadd83fa007f03d5b17d4dee8922b100f
 test/extractor-tests/generated/FieldExpr/FieldExpr.ql 2a04baaf57a22b65bd5b9e142e59cc2b7d3dd3174910ddc0c2510094f2dd32b1 d8e4fb4384aade1770c907d16795a4af9884051390a5a05935ad4b4df2e757a0
 test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr.ql 1501730f1e02e9d22b07b18bb42a5372e1d327bda62bdc81d75f9966946cb97d 28625f0b7ee4d7ab37fc13206585961e89a5e509a93215c16136d2382418b7af
+test/extractor-tests/generated/ForBinder/ForBinder.ql c95fd006eaddb9535eda0d527d71cdd5d3745fe464fd809a8d58b8c4dfc8790e 1d8b38059b8a25965eab9a8a1286384aa994d7cac7414b70b63c6a3d6bcf3c39
 test/extractor-tests/generated/ForExpr/ForExpr.ql 3bac38bf33e140ae9f88371ec90409f7de867e39cdea46f02b15519b236b57cb aade1baf6e6081b3b9bce5b7e95fe4b7ffe00ea9450fd6e1d6692ad97cf93fe9
-test/extractor-tests/generated/ForTypeRepr/ForTypeRepr.ql b74c0034bf5d1bb4a1a73ab822daca4572e80983a0c88620abe92bb794dd9cd8 a18f9a6d95b46b808c3a25e11fc54d2564ace67fb98d0c76632c5d5894b31030
+test/extractor-tests/generated/ForTypeRepr/ForTypeRepr.ql 5961055988b3a7749fb80e24d924bf1b67b0c52a6c895379beedd66a34bad04f d8ab72fac742314ead1aa0e1fed2535cc6597d278f3eef017bc9f8fd8cde83e7
 test/extractor-tests/generated/FormatArgsExpr/Format.ql 237ed2e01d9a75ee8521d6578333a7b1d566f09ef2102c4efcbb34ea58f2f9e8 09007ce4de701c0d1c0967f4f728ea9e627d9db19431bd9caebbf28ee51a1f36
 test/extractor-tests/generated/FormatArgsExpr/FormatArgsArg.ql 5abcb565dcd2822e2ea142d19b8c92194ee17c71c3db7595248690034559d174 1ffa743fc678701ffeefff6c14c1414bb9158e6756f32380dd590ff44b19ca5a
 test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr.ql 243c2f9d830f1eae915749e81ac78d3c140280385b0002d10fcc4d2feaf14711 72b90a99a8b1c16baf1e254e1e3463c3ce5409624a2a90829122717d4e5a2b74
 test/extractor-tests/generated/FormatArgsExpr/FormatArgument.ql 0a345eb48dba8e535d12a00e88008e71b3ce692fbf8f9686c8885e158635dffe eab1f230fd572474a3f304f97d05bbf4a004c52773aaf2d34f999192244c0b80
 test/extractor-tests/generated/FormatArgsExpr/FormatTemplateVariableAccess.ql 24108cdc54feb77c24bb7894744e36e374f0c03d46d6e6c3fcb2012b1ad117f6 05a6b6f51029ee1a15039aa9d738bb1fd7145148f1aad790198fba832572c719
-test/extractor-tests/generated/Function/Function.ql 3a30225887bd7d6fbcd6dda1c946683a2b0e289f45bc8a8fe832abe662024d4e 225475fa02be09a1b0c0fcd56a003b026b3ac938f591a47e8fbead4873b2b202
+test/extractor-tests/generated/Function/Function.ql a98895a935f82c61538a93ad981d55a049dfc44eb7f4a28b0b3d611247617518 ed9e9b3d3804e83a40fe3d39888efb308eb2eb9d99c7a1adc5ab821cff2a44c0
 test/extractor-tests/generated/GenericArgList/GenericArgList.ql 9bd6873e56a381a693fed0f595d60d973d0073ba7afa303750d5c6a0b887a811 0b373079f65aa91cacabfc9729c91215082a915197eb657b66bcdb3b6d5e7e53
 test/extractor-tests/generated/GenericParamList/GenericParamList.ql 206f270690f5c142777d43cf87b65d6dda5ec9f3953c17ee943fe3d0e7b7761c 38a6e0bbca916778f85b106609df6d5929baed006d55811ec0d71c75fe137e92
 test/extractor-tests/generated/IdentPat/IdentPat.ql 23006eddf0ca1188e11ba5ee25ad62a83157b83e0b99119bf924c7f74fd8e70d 6e572f48f607f0ced309113304019ccc0a828f6ddd71e818369504dcf832a0b5
 test/extractor-tests/generated/IfExpr/IfExpr.ql 540b21838ad3e1ed879b66c1903eb8517d280f99babcbf3c5307c278db42f003 a6f84a7588ce7587936f24375518a365c571210844b99cb614596e14dd5e4dfd
-test/extractor-tests/generated/Impl/Impl.ql 6db0831b8b6bbb0168a63b49aae27022546256c19cc9b36d7fdebbea6a51f2f3 4d2e6b46a9a9397e6da6a58fcea6e75c5b5df37360cdfb2d6d477140c3958fb7
+test/extractor-tests/generated/Impl/Impl.ql a36ea392729a6be3ee0cc0d8871b3682cf8f0c15fb657d4d35f2ca76eeef3a74 1fa345ca3b4c16c740b5684c7fdaf1116d52c2932287703b33143a08e4d7d38e
 test/extractor-tests/generated/ImplTraitTypeRepr/ImplTraitTypeRepr.ql 311c6c1e18bd74fbcd367f940d2cf91777eaba6b3d6307149beb529216d086fb 16c7c81618d7f49da30b4f026dcacfb23ed130dbfcfa19b5cb44dc6e15101401
 test/extractor-tests/generated/IndexExpr/IndexExpr.ql ecfca80175a78b633bf41684a0f8f5eebe0b8a23f8de9ff27142936687711263 27d4832911f7272376a199550d57d8488e75e0eeeeb7abbfb3b135350a30d277
 test/extractor-tests/generated/InferTypeRepr/InferTypeRepr.ql 6ba01a9e229e7dfdb2878a0bdbeb6c0888c4a068984b820e7a48d4b84995daa2 7120cafd267e956dbb4af5e19d57237275d334ffe5ff0fb635d65d309381aa46
@@ -725,21 +716,21 @@ test/extractor-tests/generated/LifetimeParam/LifetimeParam.ql a96f586af332969878
 test/extractor-tests/generated/LiteralExpr/LiteralExpr.ql 00570642966d233a10ec3106ae65e6ea865c29d0776fdbc452815f528301117c adb286ad3bd763f1b1b350cac91bc2615869dcb9b0faf29276ace9a99d31f0cc
 test/extractor-tests/generated/LiteralPat/LiteralPat.ql 863d4902e7e22de3176398cbb908e6f5f487b3d22c0f9f7a5498a1ebc112c0fd 47e3f70c5c32f17050d3ca8c8b42d94ecd38e378627880d8100b7ca182cfa793
 test/extractor-tests/generated/LoopExpr/LoopExpr.ql a178e25f63b4d517482ec63e5dfb6903dd41dadd8db39be2dd2a831e8456811f f34165f78179960cc7e5876dac26a1d0f6f67933eff9a015b92ca0e2872b63e8
-test/extractor-tests/generated/MacroBlockExpr/MacroBlockExpr.ql 62859a25b88c93db1d47055f682f1b8ed97ef227c870bc14041af106cb9593fd 14c5831920249ef2e0799ddacca62805e2e2d8b8a6cbd244acb3a20c4542bf7b
-test/extractor-tests/generated/MacroCall/MacroCall.ql f98017f6070e2a5e4b191d5380cc0491d7358c456e8459b313235e44eb368794 437129210d9b7f6850adf4d2c8ef7d0644193418645d631b8edf229656fc57ac
-test/extractor-tests/generated/MacroDef/MacroDef.ql 9e3647a92713d32f87e876f37d703081855ea88a7a3104757f90bd94eb382fa9 b50e9797c1b8ea5491267ddb6778862f0541617ee60bd8e167cc23a499e36733
+test/extractor-tests/generated/MacroBlockExpr/MacroBlockExpr.ql 936920b5b609b1e62b201004055bbce449d2d7c1f8016f57d9b27d3ea8107f07 21493009ed3b1810aa4fd8af4d8c7b7794982da032dfb6b7e9048445d651eecb
+test/extractor-tests/generated/MacroCall/MacroCall.ql 28abee68c0681334e4ffd412f1b9b9b0fe844a6ae6c915ec18ea186b4766f58e c8c73902827d69a4b903ab3028408086b64b9f5d9a4da97620a2100f45ceaf69
+test/extractor-tests/generated/MacroDef/MacroDef.ql edcdd65706641c2827cac546091a99e0a1473ff8d383efd968023db411591197 b7832c67c6dd32e9e5ecfa4b6256e7cd820f55d49c44458a140cbf4d46542eb3
 test/extractor-tests/generated/MacroExpr/MacroExpr.ql 83fadb88fd8f913bb1b1cda26d21b173bdc94bb6682a74eaddce650ebf72aa41 1c502cde6a95ec637e43d348c613be3dec4092b69d2c8692abdc5a9377e37f5f
 test/extractor-tests/generated/MacroItems/MacroItems.ql 0f8c1d134a28b80c70d5fff7c120f17350f6116689fdd7f67bdbfbaa0302c224 9f0594aa6d96c4f368d6c6521d0b58ab456611842afbfd040cb84f8858241677
 test/extractor-tests/generated/MacroPat/MacroPat.ql 71f65d80e670ec43db768693b8d44d627278a69e938517dc9068c76785ffd102 b1577dd669cafa9cf97aa998a7f30ac4a94aff129787a2d5a1cdac553fd56397
-test/extractor-tests/generated/MacroRules/MacroRules.ql d97daa29929a5bc4e25e65755c1929f9854beb1d2a183579a1ebec1d4b346dca 8b81026fa36152d870f91981a020ed0fa06cae0380d4e8d9496fea12a95b0326
+test/extractor-tests/generated/MacroRules/MacroRules.ql 9a6d5d9ec6cc77dd2f893e5315910c73f2ae2fc418b4a3a172799a16fefea456 413c8005e02dc1d79e6710e7dfc184cfa0e6bfb34d172b6b97bd7fa81ccd2594
 test/extractor-tests/generated/MacroTypeRepr/MacroTypeRepr.ql ebe8451a9256c9d7e77749beca88d0fd5ab73c76404bed4ff6e0c75f126159cc 72dd6d5ca4133e318fd51bb9007519b938e618cd4ef27bfe52b9c8c8cbd484ea
 test/extractor-tests/generated/MatchArm/MatchArm.ql 704976bd48e56a0a2fce7c2d9454b6cd24b1bf924633702ebcd71d8521b9b171 7c2bb501002c997a680c69b6d0856da13868125913e726f1a12b97907f32064a
 test/extractor-tests/generated/MatchArmList/MatchArmList.ql bbc679fe6d8dedf9131d0fa5faa7b44c138c5f56b9cf3cb209fd3ccd614b689c 916c53a2b68646b52f2d28eca2a19218ba9d12eb8edf7c6cc4140dace1bf4e0d
 test/extractor-tests/generated/MatchExpr/MatchExpr.ql b75a5936401bb5ca38686f1413f5c8267ad685722560a2e9041dacf2f8d54abc 7da57118fe5b1f7f5cbe8d6b5f3ae70816fd4837b1c2e6401b98175b36ca233f
 test/extractor-tests/generated/MatchGuard/MatchGuard.ql 91de18a0a18d120db568b2c329e5cb26f83e327cf22c5825c555ea17249d7d23 0bcdb25895362128517227c860b9dad76851215c2cdf9b2d0e5cc3534278f4ec
 test/extractor-tests/generated/Meta/Meta.ql 43dd1cd669099b38396b316616992af6d84b0c1cee953b19235a00ab3d3bb43c 80b1885809aa074357e21707d1f8c6dca19f0b968ccff43229bb0d5c6fffb2b2
-test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql 617bc809816dc3cc1de1c0b49c494568164fe2a048472f4cce1b83f0a1f54a42 1b323e0b1812dbfdd78ee58798353e20326a3ca7529f52d5c984d1d92889a65f
-test/extractor-tests/generated/Module/Module.ql 4e154af13f19ee06e88ce8ff85e143bf6ddde798b2ec6fecebf43b8015211087 78f91c2827883ea7ed1f546de80d0909f4ac57b06027439f07dcdc0a09d7888d
+test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql 05ca29fdab8ce600469728b964c369368e5097b2a5eb35b84a7630ef044ac6b6 aa45fdbb7fba8afee9f6cef10d337622429d3f0fb71f7fbf861afb4906bdef71
+test/extractor-tests/generated/Module/Module.ql d7c442fd1b1f4f00da87e2228fc1aeeab0bb86648b2aa06a9dd6f40dbae1ee28 3229388727d14048e87238bcda5fde1bed503e5cac088922381e5833cfc32fa9
 test/extractor-tests/generated/Name/Name.ql b2fe417f7c816f71d12622b4f84ece74eba3c128c806266a55b53f8120fa4fb3 8bc65bbf3f2909637485f5db7830d6fc110a94c9b12eefe12d7627f41eae2256
 test/extractor-tests/generated/NameRef/NameRef.ql 210a70e0957f3444195eed3a3dfbb5806e349238c0b390dc00597e6b8b05fcec d74fbce3c71aa7b08ae4cb646ccb114335767cb4fe000322f9dd371c1bb3784f
 test/extractor-tests/generated/NeverTypeRepr/NeverTypeRepr.ql 4e73ec96fccb00fe241546ff12c47329a9c67b7ae40a58a5afa39ecb611b84d4 bb716f72db039e0a82de959e390259a82cf99ba4482070602b7b6b42511976e5
@@ -752,8 +743,8 @@ test/extractor-tests/generated/ParenPat/ParenPat.ql 50f99c6a7e5e2f76dc5bbc10a6b2
 test/extractor-tests/generated/ParenTypeRepr/ParenTypeRepr.ql 86a45a9f9696a55562a7125f08297bcd50b368225a13cd31b6e9eb4071d04e13 53c0b8c4f453a748c9534220960c6ce8c52bd7501cf1d1f74e3928fc6512667c
 test/extractor-tests/generated/ParenthesizedArgList/ParenthesizedArgList.ql 6d0e3f7cbcc835f2a5784ccb09b0d65c2bb063c1904edded2e7fc8c9fb57c4fa e41c898b8b0d61078e0d76c6e2e141251dca71f79ad5fa119c012220c54cc409
 test/extractor-tests/generated/Path/Path.ql 0f6b63c723da7f140411c8e9a4bb9fbe043a997a1748a4a491add4bd6e81fd6e 5081db5bd590b72780c3c8032532e65b5d453c327c8771da6b87c10e30071523
-test/extractor-tests/generated/Path/PathExpr.ql 2b032a00d8f5570b34f44bdb4209f199f821e093011472b5c686918a063442a5 9f10b1e38863da09365fc45f749578dde74bbb64d35972fa34b83e6814f0004a
-test/extractor-tests/generated/Path/PathPat.ql 8d8053588dba1f35fff3bb89eb66f1534f637cf3b56338a6f3c19d748db7e1ca d7405ca5bf3bfa6960426964be3ea32562e1367c74b1f438c0827573eeaf773a
+test/extractor-tests/generated/Path/PathExpr.ql caa2a41b5cc3af837fcf52b49abc5f45ba924821ea0f75d5b25daa8d2b6d4b66 7c2d587d7a73c21dcc0a85c38baa0adcd64826719b2f12f92ae758d290f37706
+test/extractor-tests/generated/Path/PathPat.ql 8a6a759f4bbf4fa9c23fd235ce4d63f04bd715a86a6e71bba0a324fe1231d947 be23d83e4f6ac209f3f7c382fce6b9bc57db17a26b236bdf8215848285e345ff
 test/extractor-tests/generated/Path/PathSegment.ql 87774cc2e9d1be7aaf8748d418b151d7ec03fb20fda9430ebabd86ddaebf5538 699545d8eb2d6325bcd2c253d56339bd71170b34e80efe5155189fbbdde9fbbc
 test/extractor-tests/generated/Path/PathTypeRepr.ql 32023340cb9aa1fbf52a1a3e330c6f3206e1c64c9dce2f795d9e434aa5a1533b f451de0d4941ab79014d2883b46291f9f05f79d479fcdcab387020ab3ed68703
 test/extractor-tests/generated/PrefixExpr/PrefixExpr.ql 63e9dbae0d0b46d5e9d60c313e408c4c7ee1a93c5a26fe4c01a632911de961d0 09fcc28bb22553356aebf9ea93811703e5404b88022be8dab61ac81d3b187b75
@@ -772,44 +763,44 @@ test/extractor-tests/generated/SelfParam/SelfParam.ql 7e57dd845ddc9142cce250c7e6
 test/extractor-tests/generated/SlicePat/SlicePat.ql ec056b803471d22c8575313e0caca89a3d527d228719375e87cc6061c3da4ffe fb0af765ce9d04805cdd445e2222d6f956c6789285705bb1079e540935ae6cc5
 test/extractor-tests/generated/SliceTypeRepr/SliceTypeRepr.ql a009f2ba47f3b082db274b6bd7068d65c0205bd11b13d2c202e43a6b9b48e76b a3092ea5f2b7113235aec5136800205265f1607c5cfac9f5a3552bed5d98cdf2
 test/extractor-tests/generated/SourceFile/SourceFile.ql 19ae5570a88b9e2d82db66685a31b01cc8e0c86c622a4bfaabe8c5b397b27eea 60e2ba5eb82518d6408254fb4ec01277b6c6c0e4316d4f3cdc809da9c32c4a57
-test/extractor-tests/generated/Static/Static.ql 103276adfe23b609b5965439d024007d4ed6831562452f880ee89300aab3e3a6 0418668d83b2e570bddb6edbf4eb7927f4fa6933ccda86c0354463bb839f724f
+test/extractor-tests/generated/Static/Static.ql ec2e5cf081453bbae16216d1250f5d8324be81d1d6ad8744e969934d2ef21b0d 7bde1afbafdc16f9c999e902626c77dc0efe3f1b3d687e9fe1a3e9db6b1f62a9
 test/extractor-tests/generated/StmtList/StmtList.ql 4c6b9d5d8fd7535f97d81b968d4f67fc50e10c5d0f980e7c2704bbf5cd07481e ad972adb8d9a7892e6f8a12d96649340441f947afc99e633ea438c4d5c795ce4
-test/extractor-tests/generated/Struct/Struct.ql 197de8de01ede52110d827c4a673fcedc9175b1245b736a211b8724b4345902b fdf5d848a3b5dde164f1a540d7212fd3a3f6b0228c4645ddca773190830e2eb4
-test/extractor-tests/generated/StructExpr/StructExpr.ql 1e577f7cc83aa86fc82e4ac467bfb8a0c239408d4217f92a0a689957ea4fe6fe 35568a6cb7f0aaa3026e11a3b0e750eb5e93d4c0b6f737171e27c84f5dc967ac
+test/extractor-tests/generated/Struct/Struct.ql 846ef41cb4dfbe94f495fd68de26a68609e7b5ab0830d6ee844a67afea3ac591 6799a1246da45ecbf1f1040ffb7d1a5578ab9e236cce3029e6cc17c93b3bf138
+test/extractor-tests/generated/StructExpr/StructExpr.ql 3b98205260e750cc7adc42b318deef2854cc3b4f921cbcfffc6d701553af3903 368bccf01db2fa069dca30d9fb0878f8e6a88d4ce58b333b24a18620933e4c91
 test/extractor-tests/generated/StructExprField/StructExprField.ql b65375963aa24f0d1dd4c10784e32ab8c337ad431462ea1d081a0e456fbb1362 7f5a49e8df03ed0890b51c2e941d636fbbf70445a53d3af2c0f34a04f26bc6ef
 test/extractor-tests/generated/StructExprFieldList/StructExprFieldList.ql 01dc3ef66d79836a3d372464f05454015648ab093f9547c5d9c5d55271acb718 83625301c097fa38d4e6021ea28b8adc6338076c8c2aa88a86a22aac412839f6
 test/extractor-tests/generated/StructField/StructField.ql dbdb627202975a0ca07ed441449ecc95d9d0764084a49a18e7849164b2e65ce2 8e7f32f28d15104575eaa985e892c162ec775adf3481c227ef618b5668168de7
 test/extractor-tests/generated/StructFieldList/StructFieldList.ql 292170b20f3a55c0cd6a8d78ce99474ca68daf6fb380cffe00b2bd7074e1b73a 404bab780f290ae04d1d71d3c6d4e0092bb3d8c55e956168d2a445cbd6d1f06d
-test/extractor-tests/generated/StructPat/StructPat.ql 73bd755ffb8d5ff3c77d7570c6d50eab7b51d8d4a44b638cf5904c37065f496e 9589dc8d8abd80d9f48d445af3dbdbd906a9c19dc75582688bf9c3abaa16861e
+test/extractor-tests/generated/StructPat/StructPat.ql 894babd64d3def35717cbeed6eb4799cf9f52e73992822b72fc521c93efb4935 5bd1502b69014d70464b4b76795e1732ac2a6db5d028bea52929cf1998af5f07
 test/extractor-tests/generated/StructPatField/StructPatField.ql 92cb6a4b5234359c02d66085b10d41f37b77370491ed478ad6d4d9b12b943ecf 14bc2079763b53bc6ab11356f3bb21820ae9e4dd1b2a42a78665c32181c4ef92
 test/extractor-tests/generated/StructPatFieldList/StructPatFieldList.ql a3ba3e99d3c87d5e0ae0ad82cbea3600ac1745e9364d54d8d51224b51a5a09a5 5942ed2722c006bae99de9174249110bfc79594c5ef9a6dfc098ae2be269b8f3
 test/extractor-tests/generated/TokenTree/TokenTree.ql 55592f43a6fe99045d0b0b1e2323211d3a3fd64a8c7d2b083f2518d4c3e2e4b0 8eeef2060c80b0918857ba9b3a8543a4b866ca04be3d5ca18aae8a26cbdb836e
 test/extractor-tests/generated/Trait/AssocItemList.ql 065c4903992500423d796800e7dc9a5835a07cbada595108f3af6efa72517782 aa797bf5ddefb800d5ca7f49c19c5124b1007e1658129b27c8c3de34427c7f08
-test/extractor-tests/generated/Trait/Trait.ql ba40c2de2e8f2225ea7876c36b2510079838c0f4a99232bf0f3a3ab56b7705c4 c34364d0425f597a645fbb8b6a3874588cc652044909f1db73b09f2b6deae072
-test/extractor-tests/generated/TraitAlias/TraitAlias.ql 434558e26e1cdc4054536dd7a3e5e636509cd0f8576ba1612224a9873882a383 c904109afa94cffeacd6749dd4ad8b9d2e2cb3b228c275898d88625615dbedfc
+test/extractor-tests/generated/Trait/Trait.ql e59d9d97baedc5691f9fb837e3600b1b33808c598971d8abe28121a9c70292b4 0da2808421a1e1acbc61076d4b50c559f2abf02cbd5f69ba15a65457887ff435
+test/extractor-tests/generated/TraitAlias/TraitAlias.ql 9a4bcbf850afd833606f9447493b848e9a5df593198e5fc7a3a5bfb1c4c0782c 1f738eaf245220142d9fe5b88718980494b1e3c5b68609f5ee591056f23ea765
 test/extractor-tests/generated/TryExpr/TryExpr.ql 4e3c224a7d5fb8f01654c7d3c79414daa575897cfa6f351fcd5b5832f53a151f d961a497c304c1c5aa1d94e04aed2bf17a2c422e315f05986e1a9027e69dbd2a
 test/extractor-tests/generated/TupleExpr/TupleExpr.ql 4011d94438903e96fa321285558f5791bee7e1d1fb26be0381586511cf439d1b c6bc8d08a8d5d98d7a52b72d5c597b63754fe12cec653c520833e4b71a9dcea4
 test/extractor-tests/generated/TupleField/TupleField.ql ed681b7fee5e68d24db4999389727b2589e5af793d3c2ddc8b1e245713c0e1f8 4f867b29adf91b4bfa5052e16d392c16bf260e858aad11b60c42f1eddb476e61
 test/extractor-tests/generated/TupleFieldList/TupleFieldList.ql 3c3fcef21231550bbbf6804314b94d44cc18d445987c23cb6f2c88015570cc4a 8958e6748296bc6d0ad469e52852c38445fe462a8599a2e71867aa5d7066595e
 test/extractor-tests/generated/TuplePat/TuplePat.ql 80609f1c525e90e13f34d55a81d47a83a03e064241f8d33232e2a79eaeea5159 d289b19dae4cbae0180cc58bb946f41646bb9dc008f5ce8a0e12eaddbc7e63e9
-test/extractor-tests/generated/TupleStructPat/TupleStructPat.ql d00b185013bb4e5f878a5ec261ab2cfbf1fe2f67d1ad2e05d062629211f677ec 24254631a28c24ca78b4fa1b89c53b0b002cb43fe585e274155fcca0c481056c
+test/extractor-tests/generated/TupleStructPat/TupleStructPat.ql ea588383e16328486156e872f4d6f999a35534cde49d69b66a6186f01b1c2581 2a2e179b4241a4ff7d486e987cb667ba62025bc8dd48a507142cfec882bd35cc
 test/extractor-tests/generated/TupleTypeRepr/TupleTypeRepr.ql 2f1503734d272cd0616e5885cd344659cbd0ae7309a375c8351f57f2b86c3302 276a4fe91b8dc64cdca4467343e2bb2e240c66ec1e4e11bf8cba73819c6532cc
-test/extractor-tests/generated/TypeAlias/TypeAlias.ql 2b120c7fe640b233540f6982153fddf50ddc089b8284dca321b4c48eecf93dfd 6d40a0d8c927dd499fd92fd95638c50eeca8f956aa1706c17913dbf83f0f500c
+test/extractor-tests/generated/TypeAlias/TypeAlias.ql cbd2ed23ffff6bae81b121e32c9a7efce43c23d33f82fbfcee833b1043892c60 abf9779da9ee2b267a3dc3be7143f111cac8441c378828329749457bb56aeee3
 test/extractor-tests/generated/TypeArg/TypeArg.ql e1ca286c03bd2d44054f5dd75aac250382037f243046c49ec752ad8d65e4c0ba f316d5fa84a721427c0aadf6bfa0ed4cfd86e4d318cfb0fe82efc52e65c4733b
-test/extractor-tests/generated/TypeBound/TypeBound.ql 4f5a2a49075c01c982988e66759f61c5285343d78cda94e228e17593d16fee6e 7aae320e881d6ea969e31b1e8fe586feb07b1db43c65da684cbac66157354851
+test/extractor-tests/generated/TypeBound/TypeBound.ql 41d0a7b6538de12797c5aa4152ea701517abe685b1160615f2d74203e7a00d34 f57128c66df37791f93db269451b1c617c991d8723ecb9efe4b8ff8b2559472c
 test/extractor-tests/generated/TypeBoundList/TypeBoundList.ql 6827529eca62f5e7be87538af6231099f5932f39d8694f7a76369273b93f28ea 539dac4ccda7e51b7ae1a9e05d8a56a98176d9de25d5ed4347ebe2fbea8adeb1
 test/extractor-tests/generated/TypeParam/TypeParam.ql c5f8f62f2877c719c3cf069f9d0ca83cebc14f7611c6c2dce86c85114ea2635c 751c630986f35a8d0d32fbeb61ca6ff801c96cd1829dbccc874fbf5f5158e98d
 test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr.ql a7b7a93104fff28515154cf8e79045d3eea2494b5c46f1caf36639c53b1c64a7 070ee2e1664e3291646ea56681b5c93331f94dcc519deb28622beca3e26e16f3
-test/extractor-tests/generated/Union/Union.ql ef31f8b10ced5ed3a441f8ad0640e2fb46e566c859856e84f5a7fd6c85424b2c 1066561577ab19bf028ea29622750adc17de5b4d5dd0a8f77a8a50c8a15062b6
-test/extractor-tests/generated/Use/Use.ql a12b9867cc71a681cd4602c4045e75288a7cca502d48e20ccf17e155be130b3b 2b9dcac18670b062461193a6b40fcf569f19605b14daff82239fb39fd7fa3408
+test/extractor-tests/generated/Union/Union.ql 71e367ea4b541ee4ae831c69d0dfa2d1ba0c2d3dd9e9aba770dd00fd1f546ef8 61dbc6364a9f486d0de8c27cacbb9d1027282d92f89058e93e2c376588d809f9
+test/extractor-tests/generated/Use/Use.ql 1f084f3b49c910c6e01d2a81be2443e84c2836a5855b89874965efaf25d17511 d5bf37ba65f4d280312ca798bae22d2735c00cf91ff05ed6321f69b76b4551bc
 test/extractor-tests/generated/UseBoundGenericArgs/UseBoundGenericArgs.ql 46ff2cf0fc8b561b21f8dff3230550f2feafbe52a7ea8b28bf183abef94ff241 92646f3bd15a8cf4c23ee9de4d857ac5c147e570ef0eb223423a109b4b79aedf
 test/extractor-tests/generated/UseTree/UseTree.ql 3c2bc924b54b9af5c95784023d4098924571ba464c5982124acea712c3ce0e93 8d9f963b61a9a8a83efd93438ce8b43d4aa763493338ad9afd2a3dc7a440892d
 test/extractor-tests/generated/UseTreeList/UseTreeList.ql faff7bfc060d5b0a922f38b37bf586596566186f704c9921651785580e86d684 81e5b90edeef0d3883547844a030e72b555d714de1ed8dded1c22a3772b4449a
-test/extractor-tests/generated/Variant/Variant.ql 9405704e9192cac4838dcba8625261d5c1f839bb8c26dac44c2d517d172a06da 7236de83eb542cb4024e07d2cb5a899c851116a3a66b3896270ecf663439c6fe
+test/extractor-tests/generated/Variant/Variant.ql 6b1936698cec413f1645d52e3f4d6d995968d432466241eb823c1ae635c852dd 0b5b0248f09ae01b683ea835299d51fa26f6b5a584e889c538b0f0cf13106d0f
 test/extractor-tests/generated/VariantList/VariantList.ql 1c1d82ce3ecfa7daaae1920662510e81892ed899a3c2f785e2ff3670245a03cd 29d4c5ab2b737a92c7525789e10a4aa9848f1a327e34f4e9543018021106b303
 test/extractor-tests/generated/Visibility/Visibility.ql 725d47d7444332133df603f9b06592dc40b0f83bf5e21ad4781c5658e001a3aa 2d65a30702a8bb5bc91caf6ae2d0e4c769b3eeb0d72ffbd9cdb81048be4061ad
 test/extractor-tests/generated/WhereClause/WhereClause.ql a6f0e69ffa6b997cac04d4da442eb8bde517a576840c953abcc40863b9099ba1 7ce888fffc3038d5b18f8c94d3b045815cd45500e1bb3849c05fc874edbeb695
-test/extractor-tests/generated/WherePred/WherePred.ql 504d00a40e418542c3e0ff30d43c4d2d0e7218b2a31fcf32c9310d705d97b9fe 61c53dde539a9e1e3d6bf13ca1d0dab8af6ea6b54ab698a0a5a5f49bf627934b
+test/extractor-tests/generated/WherePred/WherePred.ql 8f73500a04f8748221b181bb9a51bef6c09d5ddf046488303594821e3191b370 8fb51d095a3c39b51ec8b4515fc02474ba36067ca4dfd48dff7e14d1c3881ea3
 test/extractor-tests/generated/WhileExpr/WhileExpr.ql dcfe1ed375514a7b7513272767ed195cdbf339b56e00e62d207ca1eee080f164 f067283510655f0cf810cae834ac29ad2c6007ba312d027ebcdf695a23ec33e4
 test/extractor-tests/generated/WildcardPat/WildcardPat.ql d36f52a1d00d338b43894b6f8e198ad0c409542f436e3e57d527205c3dfee38c 4e1321e714cedb606e0d84f10ed37c72da61b3a1616754b967f721ff0bc0e4ee
 test/extractor-tests/generated/YeetExpr/YeetExpr.ql 5c552b490ccf5b123f7a2fa3e73d03d008e4df5928ffa0bd503dc6bd7736462c 09a4f413ae045051abe392f29949d6feab1a808d666c6b8dac0901f84a8a4740
diff --git a/rust/ql/.gitattributes b/rust/ql/.gitattributes
index 4fc300e48cc..bde61270e6a 100644
--- a/rust/ql/.gitattributes
+++ b/rust/ql/.gitattributes
@@ -38,7 +38,6 @@
 /lib/codeql/rust/elements/CallExprBase.qll linguist-generated
 /lib/codeql/rust/elements/Callable.qll linguist-generated
 /lib/codeql/rust/elements/CastExpr.qll linguist-generated
-/lib/codeql/rust/elements/ClosureBinder.qll linguist-generated
 /lib/codeql/rust/elements/ClosureExpr.qll linguist-generated
 /lib/codeql/rust/elements/Comment.qll linguist-generated
 /lib/codeql/rust/elements/Const.qll linguist-generated
@@ -59,6 +58,7 @@
 /lib/codeql/rust/elements/FieldExpr.qll linguist-generated
 /lib/codeql/rust/elements/FieldList.qll linguist-generated
 /lib/codeql/rust/elements/FnPtrTypeRepr.qll linguist-generated
+/lib/codeql/rust/elements/ForBinder.qll linguist-generated
 /lib/codeql/rust/elements/ForExpr.qll linguist-generated
 /lib/codeql/rust/elements/ForTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/Format.qll linguist-generated
@@ -136,7 +136,6 @@
 /lib/codeql/rust/elements/RefPat.qll linguist-generated
 /lib/codeql/rust/elements/RefTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/Rename.qll linguist-generated
-/lib/codeql/rust/elements/Resolvable.qll linguist-generated
 /lib/codeql/rust/elements/RestPat.qll linguist-generated
 /lib/codeql/rust/elements/RetTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/ReturnExpr.qll linguist-generated
@@ -243,8 +242,6 @@
 /lib/codeql/rust/elements/internal/BreakExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/CallExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/CastExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/ClosureBinderConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/ClosureBinderImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ClosureExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/CommentConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ConstArgConstructor.qll linguist-generated
@@ -252,7 +249,6 @@
 /lib/codeql/rust/elements/internal/ConstBlockPatConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ConstBlockPatImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ConstConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/ConstImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ConstParamConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ConstParamImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ContinueExprConstructor.qll linguist-generated
@@ -275,6 +271,7 @@
 /lib/codeql/rust/elements/internal/FieldListImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/FnPtrTypeReprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/FnPtrTypeReprImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/ForBinderConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ForExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ForTypeReprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ForTypeReprImpl.qll linguist-generated
@@ -292,7 +289,6 @@
 /lib/codeql/rust/elements/internal/ImplTraitTypeReprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/IndexExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/InferTypeReprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/ItemImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ItemListConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ItemListImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/LabelConstructor.qll linguist-generated
@@ -371,7 +367,6 @@
 /lib/codeql/rust/elements/internal/RefTypeReprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/RenameConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/RenameImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/ResolvableImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/RestPatConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/RetTypeReprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/RetTypeReprImpl.qll linguist-generated
@@ -390,7 +385,6 @@
 /lib/codeql/rust/elements/internal/StaticImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/StmtImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/StmtListConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/StmtListImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/StructConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/StructExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/StructExprFieldConstructor.qll linguist-generated
@@ -424,9 +418,7 @@
 /lib/codeql/rust/elements/internal/TypeArgConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/TypeArgImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/TypeBoundConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/TypeBoundImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/TypeBoundListConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/TypeBoundListImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/TypeParamConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/TypeReprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/UnderscoreExprConstructor.qll linguist-generated
@@ -494,7 +486,6 @@
 /lib/codeql/rust/elements/internal/generated/CallExprBase.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Callable.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/CastExpr.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/ClosureBinder.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ClosureExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Comment.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Const.qll linguist-generated
@@ -516,6 +507,7 @@
 /lib/codeql/rust/elements/internal/generated/FieldExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/FieldList.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/FnPtrTypeRepr.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/ForBinder.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ForExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ForTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Format.qll linguist-generated
@@ -597,7 +589,6 @@
 /lib/codeql/rust/elements/internal/generated/RefPat.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/RefTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Rename.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/Resolvable.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/RestPat.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/RetTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ReturnExpr.qll linguist-generated
@@ -683,7 +674,6 @@
 /test/extractor-tests/generated/BreakExpr/BreakExpr.ql linguist-generated
 /test/extractor-tests/generated/CallExpr/CallExpr.ql linguist-generated
 /test/extractor-tests/generated/CastExpr/CastExpr.ql linguist-generated
-/test/extractor-tests/generated/ClosureBinder/ClosureBinder.ql linguist-generated
 /test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql linguist-generated
 /test/extractor-tests/generated/Comment/Comment.ql linguist-generated
 /test/extractor-tests/generated/Const/Const.ql linguist-generated
@@ -700,6 +690,7 @@
 /test/extractor-tests/generated/ExternItemList/ExternItemList.ql linguist-generated
 /test/extractor-tests/generated/FieldExpr/FieldExpr.ql linguist-generated
 /test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr.ql linguist-generated
+/test/extractor-tests/generated/ForBinder/ForBinder.ql linguist-generated
 /test/extractor-tests/generated/ForExpr/ForExpr.ql linguist-generated
 /test/extractor-tests/generated/ForTypeRepr/ForTypeRepr.ql linguist-generated
 /test/extractor-tests/generated/FormatArgsExpr/Format.ql linguist-generated
diff --git a/rust/ql/integration-tests/hello-project/ExtractionWarnings.expected b/rust/ql/integration-tests/hello-project/ExtractionWarnings.expected
index ef3e107fa76..e69de29bb2d 100644
--- a/rust/ql/integration-tests/hello-project/ExtractionWarnings.expected
+++ b/rust/ql/integration-tests/hello-project/ExtractionWarnings.expected
@@ -1 +0,0 @@
-| src/directory_module/not_loaded.rs:1:1:1:1 | semantic analyzer unavailable (not included as a module) | Extraction warning in src/directory_module/not_loaded.rs with message semantic analyzer unavailable (not included as a module) | 1 |
diff --git a/rust/ql/integration-tests/hello-project/summary.expected b/rust/ql/integration-tests/hello-project/summary.expected
index 1f343b197c0..0d639fe44f7 100644
--- a/rust/ql/integration-tests/hello-project/summary.expected
+++ b/rust/ql/integration-tests/hello-project/summary.expected
@@ -1,9 +1,9 @@
 | Extraction errors | 0 |
-| Extraction warnings | 1 |
+| Extraction warnings | 0 |
 | Files extracted - total | 5 |
-| Files extracted - with errors | 1 |
-| Files extracted - without errors | 4 |
-| Files extracted - without errors % | 80 |
+| Files extracted - with errors | 0 |
+| Files extracted - without errors | 5 |
+| Files extracted - without errors % | 100 |
 | Inconsistencies - AST | 0 |
 | Inconsistencies - CFG | 0 |
 | Inconsistencies - Path resolution | 0 |
diff --git a/rust/ql/integration-tests/hello-workspace/exe/src/main.rs b/rust/ql/integration-tests/hello-workspace/exe/src/main.rs
index ea26a90c319..5bb9375719e 100644
--- a/rust/ql/integration-tests/hello-workspace/exe/src/main.rs
+++ b/rust/ql/integration-tests/hello-workspace/exe/src/main.rs
@@ -1,7 +1,10 @@
 use lib::a_module::hello; // $ item=HELLO
 
+use lib::my_macro2; // $ item=my_macro2
+
 mod a_module;
 
 fn main() {
+    my_macro2!(); // $ item=my_macro2
     hello(); // $ item=HELLO
 }
diff --git a/rust/ql/integration-tests/hello-workspace/functions.expected b/rust/ql/integration-tests/hello-workspace/functions.expected
index 0633774edf7..6d8aa73cd83 100644
--- a/rust/ql/integration-tests/hello-workspace/functions.expected
+++ b/rust/ql/integration-tests/hello-workspace/functions.expected
@@ -1,2 +1,2 @@
-| exe/src/main.rs:5:1:7:1 | fn main |
-| lib/src/a_module/mod.rs:1:1:3:1 | fn hello |
+| exe/src/main.rs:7:1:10:1 | fn main |
+| lib/src/a_module/mod.rs:1:1:4:1 | fn hello |
diff --git a/rust/ql/integration-tests/hello-workspace/lib/src/a_module/mod.rs b/rust/ql/integration-tests/hello-workspace/lib/src/a_module/mod.rs
index dca921ab643..04076c6cd29 100644
--- a/rust/ql/integration-tests/hello-workspace/lib/src/a_module/mod.rs
+++ b/rust/ql/integration-tests/hello-workspace/lib/src/a_module/mod.rs
@@ -1,3 +1,4 @@
 pub fn hello() {
-    println!("Hello, world!");
+    my_macro2!(); // $ item=my_macro2
+    println!("Hello, world!"); // $ item=println
 } // HELLO
diff --git a/rust/ql/integration-tests/hello-workspace/lib/src/lib.rs b/rust/ql/integration-tests/hello-workspace/lib/src/lib.rs
index e5b38ec20f6..f313f76edad 100644
--- a/rust/ql/integration-tests/hello-workspace/lib/src/lib.rs
+++ b/rust/ql/integration-tests/hello-workspace/lib/src/lib.rs
@@ -1 +1,17 @@
+#[macro_use]
+mod macros {
+    #[macro_export]
+    macro_rules! my_macro1 {
+        () => {
+            println!("my_macro!");
+        };
+    }
+    #[macro_export]
+    macro_rules! my_macro2 {
+        () => {
+            $crate::my_macro1!();
+        };
+    }
+}
+
 pub mod a_module;
diff --git a/rust/ql/integration-tests/hello-workspace/path-resolution.expected b/rust/ql/integration-tests/hello-workspace/path-resolution.expected
index e69de29bb2d..2ac01b2837c 100644
--- a/rust/ql/integration-tests/hello-workspace/path-resolution.expected
+++ b/rust/ql/integration-tests/hello-workspace/path-resolution.expected
@@ -0,0 +1,4 @@
+testFailures
+resolveDollarCrate
+| exe/src/main.rs:8:5:8:14 | $crate | lib/src/lib.rs:0:0:0:0 | Crate(lib@0.1.0) |
+| lib/src/a_module/mod.rs:2:5:2:14 | $crate | lib/src/lib.rs:0:0:0:0 | Crate(lib@0.1.0) |
diff --git a/rust/ql/integration-tests/hello-workspace/path-resolution.ql b/rust/ql/integration-tests/hello-workspace/path-resolution.ql
index bf0a548fbb6..9ec97b61eeb 100644
--- a/rust/ql/integration-tests/hello-workspace/path-resolution.ql
+++ b/rust/ql/integration-tests/hello-workspace/path-resolution.ql
@@ -1 +1,10 @@
+import rust
+import codeql.rust.internal.PathResolution
 import utils.test.PathResolutionInlineExpectationsTest
+
+query predicate resolveDollarCrate(RelevantPath p, Crate c) {
+  c = resolvePath(p) and
+  p.isDollarCrate() and
+  p.fromSource() and
+  c.fromSource()
+}
diff --git a/rust/ql/integration-tests/hello-workspace/summary.cargo.expected b/rust/ql/integration-tests/hello-workspace/summary.cargo.expected
index 5912f7d69ba..cb07b66d437 100644
--- a/rust/ql/integration-tests/hello-workspace/summary.cargo.expected
+++ b/rust/ql/integration-tests/hello-workspace/summary.cargo.expected
@@ -9,8 +9,8 @@
 | Inconsistencies - Path resolution | 0 |
 | Inconsistencies - SSA | 0 |
 | Inconsistencies - data flow | 0 |
-| Lines of code extracted | 9 |
-| Lines of user code extracted | 9 |
-| Macro calls - resolved | 2 |
-| Macro calls - total | 2 |
+| Lines of code extracted | 21 |
+| Lines of user code extracted | 21 |
+| Macro calls - resolved | 10 |
+| Macro calls - total | 10 |
 | Macro calls - unresolved | 0 |
diff --git a/rust/ql/integration-tests/hello-workspace/summary.rust-project.expected b/rust/ql/integration-tests/hello-workspace/summary.rust-project.expected
index 5912f7d69ba..cb07b66d437 100644
--- a/rust/ql/integration-tests/hello-workspace/summary.rust-project.expected
+++ b/rust/ql/integration-tests/hello-workspace/summary.rust-project.expected
@@ -9,8 +9,8 @@
 | Inconsistencies - Path resolution | 0 |
 | Inconsistencies - SSA | 0 |
 | Inconsistencies - data flow | 0 |
-| Lines of code extracted | 9 |
-| Lines of user code extracted | 9 |
-| Macro calls - resolved | 2 |
-| Macro calls - total | 2 |
+| Lines of code extracted | 21 |
+| Lines of user code extracted | 21 |
+| Macro calls - resolved | 10 |
+| Macro calls - total | 10 |
 | Macro calls - unresolved | 0 |
diff --git a/rust/ql/integration-tests/qltest/test_qltest.py b/rust/ql/integration-tests/qltest/test_qltest.py
index edd62bf600e..1fd525890ce 100644
--- a/rust/ql/integration-tests/qltest/test_qltest.py
+++ b/rust/ql/integration-tests/qltest/test_qltest.py
@@ -20,7 +20,7 @@ def test(codeql, rust, expected_files, dir):
     codeql.test.run(dir)
 
 def test_failing_cargo_check(codeql, rust):
-    out = codeql.test.run("failing_cargo_check", _assert_failure=True, _capture="stderr")
+    out = codeql.test.run("failing_cargo_check", _assert_failure=True, _capture="all")
     # TODO: QL test output redirection is currently broken on windows, leaving it up for follow-up work
     if not runs_on.windows:
         assert "requested cargo check failed" in out
diff --git a/rust/ql/integration-tests/query-suite/rust-code-scanning.qls.expected b/rust/ql/integration-tests/query-suite/rust-code-scanning.qls.expected
index b89c6ba94af..70e1bcb1064 100644
--- a/rust/ql/integration-tests/query-suite/rust-code-scanning.qls.expected
+++ b/rust/ql/integration-tests/query-suite/rust-code-scanning.qls.expected
@@ -14,11 +14,14 @@ ql/rust/ql/src/queries/security/CWE-089/SqlInjection.ql
 ql/rust/ql/src/queries/security/CWE-311/CleartextTransmission.ql
 ql/rust/ql/src/queries/security/CWE-312/CleartextLogging.ql
 ql/rust/ql/src/queries/security/CWE-312/CleartextStorageDatabase.ql
+ql/rust/ql/src/queries/security/CWE-319/UseOfHttp.ql
 ql/rust/ql/src/queries/security/CWE-327/BrokenCryptoAlgorithm.ql
-ql/rust/ql/src/queries/security/CWE-328/WeakSensitiveDataHashing.ql
+ql/rust/ql/src/queries/security/CWE-327/WeakSensitiveDataHashing.ql
+ql/rust/ql/src/queries/security/CWE-614/InsecureCookie.ql
 ql/rust/ql/src/queries/security/CWE-770/UncontrolledAllocationSize.ql
 ql/rust/ql/src/queries/security/CWE-798/HardcodedCryptographicValue.ql
 ql/rust/ql/src/queries/security/CWE-825/AccessInvalidPointer.ql
+ql/rust/ql/src/queries/security/CWE-918/RequestForgery.ql
 ql/rust/ql/src/queries/summary/LinesOfCode.ql
 ql/rust/ql/src/queries/summary/LinesOfUserCode.ql
 ql/rust/ql/src/queries/summary/NodesWithTypeAtLengthLimit.ql
diff --git a/rust/ql/integration-tests/query-suite/rust-security-and-quality.qls.expected b/rust/ql/integration-tests/query-suite/rust-security-and-quality.qls.expected
index a0ea519f7a1..596fdef3b20 100644
--- a/rust/ql/integration-tests/query-suite/rust-security-and-quality.qls.expected
+++ b/rust/ql/integration-tests/query-suite/rust-security-and-quality.qls.expected
@@ -11,16 +11,20 @@ ql/rust/ql/src/queries/diagnostics/UnresolvedMacroCalls.ql
 ql/rust/ql/src/queries/security/CWE-020/RegexInjection.ql
 ql/rust/ql/src/queries/security/CWE-022/TaintedPath.ql
 ql/rust/ql/src/queries/security/CWE-089/SqlInjection.ql
+ql/rust/ql/src/queries/security/CWE-117/LogInjection.ql
 ql/rust/ql/src/queries/security/CWE-311/CleartextTransmission.ql
 ql/rust/ql/src/queries/security/CWE-312/CleartextLogging.ql
 ql/rust/ql/src/queries/security/CWE-312/CleartextStorageDatabase.ql
+ql/rust/ql/src/queries/security/CWE-319/UseOfHttp.ql
 ql/rust/ql/src/queries/security/CWE-327/BrokenCryptoAlgorithm.ql
-ql/rust/ql/src/queries/security/CWE-328/WeakSensitiveDataHashing.ql
+ql/rust/ql/src/queries/security/CWE-327/WeakSensitiveDataHashing.ql
+ql/rust/ql/src/queries/security/CWE-614/InsecureCookie.ql
 ql/rust/ql/src/queries/security/CWE-696/BadCtorInitialization.ql
 ql/rust/ql/src/queries/security/CWE-770/UncontrolledAllocationSize.ql
 ql/rust/ql/src/queries/security/CWE-798/HardcodedCryptographicValue.ql
 ql/rust/ql/src/queries/security/CWE-825/AccessAfterLifetime.ql
 ql/rust/ql/src/queries/security/CWE-825/AccessInvalidPointer.ql
+ql/rust/ql/src/queries/security/CWE-918/RequestForgery.ql
 ql/rust/ql/src/queries/summary/LinesOfCode.ql
 ql/rust/ql/src/queries/summary/LinesOfUserCode.ql
 ql/rust/ql/src/queries/summary/NodesWithTypeAtLengthLimit.ql
diff --git a/rust/ql/integration-tests/query-suite/rust-security-extended.qls.expected b/rust/ql/integration-tests/query-suite/rust-security-extended.qls.expected
index 5e2fb17298a..102c63e7942 100644
--- a/rust/ql/integration-tests/query-suite/rust-security-extended.qls.expected
+++ b/rust/ql/integration-tests/query-suite/rust-security-extended.qls.expected
@@ -11,15 +11,19 @@ ql/rust/ql/src/queries/diagnostics/UnresolvedMacroCalls.ql
 ql/rust/ql/src/queries/security/CWE-020/RegexInjection.ql
 ql/rust/ql/src/queries/security/CWE-022/TaintedPath.ql
 ql/rust/ql/src/queries/security/CWE-089/SqlInjection.ql
+ql/rust/ql/src/queries/security/CWE-117/LogInjection.ql
 ql/rust/ql/src/queries/security/CWE-311/CleartextTransmission.ql
 ql/rust/ql/src/queries/security/CWE-312/CleartextLogging.ql
 ql/rust/ql/src/queries/security/CWE-312/CleartextStorageDatabase.ql
+ql/rust/ql/src/queries/security/CWE-319/UseOfHttp.ql
 ql/rust/ql/src/queries/security/CWE-327/BrokenCryptoAlgorithm.ql
-ql/rust/ql/src/queries/security/CWE-328/WeakSensitiveDataHashing.ql
+ql/rust/ql/src/queries/security/CWE-327/WeakSensitiveDataHashing.ql
+ql/rust/ql/src/queries/security/CWE-614/InsecureCookie.ql
 ql/rust/ql/src/queries/security/CWE-770/UncontrolledAllocationSize.ql
 ql/rust/ql/src/queries/security/CWE-798/HardcodedCryptographicValue.ql
 ql/rust/ql/src/queries/security/CWE-825/AccessAfterLifetime.ql
 ql/rust/ql/src/queries/security/CWE-825/AccessInvalidPointer.ql
+ql/rust/ql/src/queries/security/CWE-918/RequestForgery.ql
 ql/rust/ql/src/queries/summary/LinesOfCode.ql
 ql/rust/ql/src/queries/summary/LinesOfUserCode.ql
 ql/rust/ql/src/queries/summary/NodesWithTypeAtLengthLimit.ql
diff --git a/rust/ql/lib/CHANGELOG.md b/rust/ql/lib/CHANGELOG.md
index b2e266ccd06..7e8575b03be 100644
--- a/rust/ql/lib/CHANGELOG.md
+++ b/rust/ql/lib/CHANGELOG.md
@@ -1,3 +1,59 @@
+## 0.1.19
+
+### Major Analysis Improvements
+
+* Resolution of calls to functions has been improved in a number of ways, to make it more aligned with the behavior of the Rust compiler. This may impact queries that rely on call resolution, such as data flow queries.
+* Added basic models for the `actix-web` web framework.
+
+### Minor Analysis Improvements
+
+* Added `ExtractedFile::hasSemantics` and `ExtractedFile::isSkippedByCompilation` predicates.
+* Generalized some existing models to improve data flow.
+* Added models for the `mysql` and `mysql_async` libraries.
+
+## 0.1.18
+
+### New Features
+
+* Rust analysis is now Generally Available (GA).
+
+### Minor Analysis Improvements
+
+* Improve data flow through functions being passed as function pointers. 
+
+## 0.1.17
+
+### New Features
+
+* The models-as-data format for sources now supports access paths of the form
+  `Argument[i].Parameter[j]`. This denotes that the source passes tainted data to
+  the `j`th parameter of its `i`th argument (which must be a function or a
+  closure).
+
+## 0.1.16
+
+### Minor Analysis Improvements
+
+* Added cryptography related models for the `cookie` and `biscotti` crates.
+
+## 0.1.15
+
+### Major Analysis Improvements
+
+* Path resolution has been removed from the Rust extractor. For the majority of purposes CodeQL computed paths have been in use for several previous releases, this completes the transition. Extraction is now faster and more reliable.
+
+### Minor Analysis Improvements
+
+* Attribute macros are now taken into account when identifying macro-expanded code. This affects the queries `rust/unused-variable` and `rust/unused-value`, which exclude results in macro-expanded code.
+* Improved modelling of the `std::fs`, `async_std::fs` and `tokio::fs` libraries. This may cause more alerts to be found by Rust injection queries, particularly `rust/path-injection`.
+
+## 0.1.14
+
+### Minor Analysis Improvements
+
+* [`let` chains in `if` and `while`](https://doc.rust-lang.org/edition-guide/rust-2024/let-chains.html) are now supported, as well as [`if let` guards in `match` expressions](https://rust-lang.github.io/rfcs/2294-if-let-guard.html).
+* Added more detail to models of `postgres`, `rusqlite`, `sqlx` and `tokio-postgres`. This may improve query results, particularly for `rust/sql-injection` and `rust/cleartext-storage-database`.
+
 ## 0.1.13
 
 ### Minor Analysis Improvements
diff --git a/rust/ql/lib/Customizations.qll b/rust/ql/lib/Customizations.qll
new file mode 100644
index 00000000000..8fc6bbea911
--- /dev/null
+++ b/rust/ql/lib/Customizations.qll
@@ -0,0 +1,11 @@
+/**
+ * Contains customizations to the standard library.
+ *
+ * This module is imported by `rust.qll`, so any customizations defined here automatically
+ * apply to all queries.
+ *
+ * Typical examples of customizations include adding new subclasses of abstract classes such as
+ * the `RemoteFlowSource` class to model frameworks that are not covered by the standard library.
+ */
+
+import rust
diff --git a/rust/ql/lib/change-notes/2025-08-11-database-models.md b/rust/ql/lib/change-notes/2025-08-11-database-models.md
deleted file mode 100644
index e8aa6dda7a6..00000000000
--- a/rust/ql/lib/change-notes/2025-08-11-database-models.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* Added more detail to models of `postgres`, `rusqlite`, `sqlx` and `tokio-postgres`. This may improve query results, particularly for `rust/sql-injection` and `rust/cleartext-storage-database`.
diff --git a/rust/ql/lib/change-notes/2025-11-05-poem.md b/rust/ql/lib/change-notes/2025-11-05-poem.md
new file mode 100644
index 00000000000..b71e52a8139
--- /dev/null
+++ b/rust/ql/lib/change-notes/2025-11-05-poem.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* Added models for cookie methods in the `poem` crate.
diff --git a/rust/ql/lib/change-notes/released/0.1.14.md b/rust/ql/lib/change-notes/released/0.1.14.md
new file mode 100644
index 00000000000..b1dc08f6737
--- /dev/null
+++ b/rust/ql/lib/change-notes/released/0.1.14.md
@@ -0,0 +1,6 @@
+## 0.1.14
+
+### Minor Analysis Improvements
+
+* [`let` chains in `if` and `while`](https://doc.rust-lang.org/edition-guide/rust-2024/let-chains.html) are now supported, as well as [`if let` guards in `match` expressions](https://rust-lang.github.io/rfcs/2294-if-let-guard.html).
+* Added more detail to models of `postgres`, `rusqlite`, `sqlx` and `tokio-postgres`. This may improve query results, particularly for `rust/sql-injection` and `rust/cleartext-storage-database`.
diff --git a/rust/ql/lib/change-notes/released/0.1.15.md b/rust/ql/lib/change-notes/released/0.1.15.md
new file mode 100644
index 00000000000..fa07f2597b1
--- /dev/null
+++ b/rust/ql/lib/change-notes/released/0.1.15.md
@@ -0,0 +1,10 @@
+## 0.1.15
+
+### Major Analysis Improvements
+
+* Path resolution has been removed from the Rust extractor. For the majority of purposes CodeQL computed paths have been in use for several previous releases, this completes the transition. Extraction is now faster and more reliable.
+
+### Minor Analysis Improvements
+
+* Attribute macros are now taken into account when identifying macro-expanded code. This affects the queries `rust/unused-variable` and `rust/unused-value`, which exclude results in macro-expanded code.
+* Improved modelling of the `std::fs`, `async_std::fs` and `tokio::fs` libraries. This may cause more alerts to be found by Rust injection queries, particularly `rust/path-injection`.
diff --git a/rust/ql/lib/change-notes/released/0.1.16.md b/rust/ql/lib/change-notes/released/0.1.16.md
new file mode 100644
index 00000000000..eb630642345
--- /dev/null
+++ b/rust/ql/lib/change-notes/released/0.1.16.md
@@ -0,0 +1,5 @@
+## 0.1.16
+
+### Minor Analysis Improvements
+
+* Added cryptography related models for the `cookie` and `biscotti` crates.
diff --git a/rust/ql/lib/change-notes/released/0.1.17.md b/rust/ql/lib/change-notes/released/0.1.17.md
new file mode 100644
index 00000000000..a2707c04150
--- /dev/null
+++ b/rust/ql/lib/change-notes/released/0.1.17.md
@@ -0,0 +1,8 @@
+## 0.1.17
+
+### New Features
+
+* The models-as-data format for sources now supports access paths of the form
+  `Argument[i].Parameter[j]`. This denotes that the source passes tainted data to
+  the `j`th parameter of its `i`th argument (which must be a function or a
+  closure).
diff --git a/rust/ql/lib/change-notes/released/0.1.18.md b/rust/ql/lib/change-notes/released/0.1.18.md
new file mode 100644
index 00000000000..539b38a1d9c
--- /dev/null
+++ b/rust/ql/lib/change-notes/released/0.1.18.md
@@ -0,0 +1,9 @@
+## 0.1.18
+
+### New Features
+
+* Rust analysis is now Generally Available (GA).
+
+### Minor Analysis Improvements
+
+* Improve data flow through functions being passed as function pointers. 
diff --git a/rust/ql/lib/change-notes/released/0.1.19.md b/rust/ql/lib/change-notes/released/0.1.19.md
new file mode 100644
index 00000000000..b75ad4257c5
--- /dev/null
+++ b/rust/ql/lib/change-notes/released/0.1.19.md
@@ -0,0 +1,12 @@
+## 0.1.19
+
+### Major Analysis Improvements
+
+* Resolution of calls to functions has been improved in a number of ways, to make it more aligned with the behavior of the Rust compiler. This may impact queries that rely on call resolution, such as data flow queries.
+* Added basic models for the `actix-web` web framework.
+
+### Minor Analysis Improvements
+
+* Added `ExtractedFile::hasSemantics` and `ExtractedFile::isSkippedByCompilation` predicates.
+* Generalized some existing models to improve data flow.
+* Added models for the `mysql` and `mysql_async` libraries.
diff --git a/rust/ql/lib/codeql-pack.release.yml b/rust/ql/lib/codeql-pack.release.yml
index f43379f8196..de6e4c49068 100644
--- a/rust/ql/lib/codeql-pack.release.yml
+++ b/rust/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.1.13
+lastReleaseVersion: 0.1.19
diff --git a/rust/ql/lib/codeql/files/FileSystem.qll b/rust/ql/lib/codeql/files/FileSystem.qll
index 5a60d28418e..ebc4085fbbb 100644
--- a/rust/ql/lib/codeql/files/FileSystem.qll
+++ b/rust/ql/lib/codeql/files/FileSystem.qll
@@ -38,7 +38,10 @@ module Folder = Impl::Folder;
 
 /** A file. */
 class File extends Container, Impl::File {
-  /** Holds if this file was extracted from ordinary source code. */
+  /**
+   * Holds if this file was extracted from the source code of the target project
+   * (rather than another location such as inside a dependency).
+   */
   predicate fromSource() {
     exists(ExtractorStep s | s.getAction() = "Extract" and s.getFile() = this)
   }
@@ -71,6 +74,25 @@ class File extends Container, Impl::File {
  */
 class ExtractedFile extends File {
   ExtractedFile() { this.fromSource() }
+
+  private Diagnostic getNoSemanticsDiagnostic() {
+    result.getTag() = "semantics" and result.getLocation().getFile() = this
+  }
+
+  /**
+   * Holds if we have semantical information about this file, which means
+   * we should be able to
+   * * expand any macros
+   * * skip any blocks that are conditionally compiled out
+   */
+  predicate hasSemantics() { not exists(this.getNoSemanticsDiagnostic()) }
+
+  /**
+   * Holds if we know this file was skipped by conditional compilation.
+   * This is not the same as `not this.hasSemantics()`, as a file
+   * might not have semantics because of some error.
+   */
+  predicate isSkippedByCompilation() { this.getNoSemanticsDiagnostic().getSeverityText() = "Info" }
 }
 
 /**
diff --git a/rust/ql/lib/codeql/rust/controlflow/BasicBlocks.qll b/rust/ql/lib/codeql/rust/controlflow/BasicBlocks.qll
index 4a4b637f3d3..4ed93544023 100644
--- a/rust/ql/lib/codeql/rust/controlflow/BasicBlocks.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/BasicBlocks.qll
@@ -1,7 +1,10 @@
+private import codeql.controlflow.BasicBlock as BB
+private import codeql.Locations
+private import codeql.rust.controlflow.ControlFlowGraph as ControlFlowGraph
 private import internal.ControlFlowGraphImpl as CfgImpl
 private import CfgImpl::BasicBlocks as BasicBlocksImpl
 
-final class BasicBlock = BasicBlocksImpl::BasicBlock;
+class BasicBlock = BasicBlocksImpl::BasicBlock;
 
 final class EntryBasicBlock = BasicBlocksImpl::EntryBasicBlock;
 
@@ -14,3 +17,13 @@ final class ConditionBasicBlock = BasicBlocksImpl::ConditionBasicBlock;
 final class JoinBasicBlock = BasicBlocksImpl::JoinBasicBlock;
 
 final class JoinPredecessorBasicBlock = BasicBlocksImpl::JoinPredecessorBasicBlock;
+
+module Cfg implements BB::CfgSig<Location> {
+  class ControlFlowNode = ControlFlowGraph::CfgNode;
+
+  class BasicBlock = BasicBlocksImpl::BasicBlock;
+
+  class EntryBasicBlock = BasicBlocksImpl::EntryBasicBlock;
+
+  predicate dominatingEdge = BasicBlocksImpl::dominatingEdge/2;
+}
diff --git a/rust/ql/lib/codeql/rust/controlflow/CfgNodes.qll b/rust/ql/lib/codeql/rust/controlflow/CfgNodes.qll
index 1aed1cfa026..96ae6f8fdbc 100644
--- a/rust/ql/lib/codeql/rust/controlflow/CfgNodes.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/CfgNodes.qll
@@ -16,6 +16,36 @@ class ExitCfgNode = CfgImpl::ExitNode;
 
 class AnnotatedExitCfgNode = CfgImpl::AnnotatedExitNode;
 
+/** A variable access. */
+final class VariableAccessCfgNode extends PathExprBaseCfgNode {
+  private VariableAccess a;
+
+  VariableAccessCfgNode() { a = this.getAstNode() }
+
+  /** Gets the underlying `VariableAccess`. */
+  VariableAccess getAccess() { result = a }
+}
+
+/** A variable write. */
+final class VariableWriteAccessCfgNode extends VariableAccessCfgNode {
+  private VariableWriteAccess a;
+
+  VariableWriteAccessCfgNode() { a = this.getAstNode() }
+
+  /** Gets the underlying `VariableWriteAccess`. */
+  VariableWriteAccess getAccess() { result = a }
+}
+
+/** A variable read. */
+final class VariableReadAccessCfgNode extends VariableAccessCfgNode {
+  private VariableReadAccess a;
+
+  VariableReadAccessCfgNode() { a = this.getAstNode() }
+
+  /** Gets the underlying `VariableReadAccess`. */
+  VariableReadAccess getAccess() { result = a }
+}
+
 /**
  * An assignment expression, for example
  *
@@ -24,12 +54,42 @@ class AnnotatedExitCfgNode = CfgImpl::AnnotatedExitNode;
  * ```
  */
 final class AssignmentExprCfgNode extends BinaryExprCfgNode {
-  AssignmentExpr a;
+  AssignmentExprChildMapping a;
 
   AssignmentExprCfgNode() { a = this.getBinaryExpr() }
 
   /** Gets the underlying `AssignmentExpr`. */
   AssignmentExpr getAssignmentExpr() { result = a }
+
+  /**
+   * Gets a write access that occurs in the left-hand side of this assignment expression.
+   */
+  VariableWriteAccessCfgNode getAWriteAccess() {
+    a = result.getAccess().getAssignmentExpr() and
+    any(ChildMapping mapping).hasCfgChild(a, result.getAccess(), this, result)
+  }
+}
+
+/**
+ * A compound assignment expression, for example:
+ * ```rust
+ * x += y;
+ * ```
+ *
+ * Note that compound assignment expressions are syntatic sugar for
+ * trait invocations, i.e., the above actually means
+ *
+ * ```rust
+ * (&mut x).add_assign(y);
+ * ```
+ */
+final class CompoundAssignmentExprCfgNode extends BinaryExprCfgNode {
+  CompoundAssignmentExpr a;
+
+  CompoundAssignmentExprCfgNode() { a = this.getBinaryExpr() }
+
+  /** Gets the underlying `CompoundAssignmentExpr`. */
+  CompoundAssignmentExpr getCompoundAssignmentExpr() { result = a }
 }
 
 /**
diff --git a/rust/ql/lib/codeql/rust/controlflow/ControlFlowGraph.qll b/rust/ql/lib/codeql/rust/controlflow/ControlFlowGraph.qll
index eb8dbdea39f..b586a1aafee 100644
--- a/rust/ql/lib/codeql/rust/controlflow/ControlFlowGraph.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/ControlFlowGraph.qll
@@ -1,25 +1,9 @@
 /** Provides classes representing the control flow graph. */
 
 private import internal.ControlFlowGraphImpl
-private import internal.SuccessorType
 private import internal.Scope as Scope
+import codeql.controlflow.SuccessorType
 
 final class CfgScope = Scope::CfgScope;
 
-final class SuccessorType = SuccessorTypeImpl;
-
-final class NormalSuccessor = NormalSuccessorImpl;
-
-final class ConditionalSuccessor = ConditionalSuccessorImpl;
-
-final class BooleanSuccessor = BooleanSuccessorImpl;
-
-final class MatchSuccessor = MatchSuccessorImpl;
-
-final class BreakSuccessor = BreakSuccessorImpl;
-
-final class ContinueSuccessor = ContinueSuccessorImpl;
-
-final class ReturnSuccessor = ReturnSuccessorImpl;
-
 final class CfgNode = Node;
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/CfgConsistency.qll b/rust/ql/lib/codeql/rust/controlflow/internal/CfgConsistency.qll
index 62ac5822dbb..02393cb98c2 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/CfgConsistency.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/CfgConsistency.qll
@@ -36,8 +36,7 @@ query predicate scopeNoFirst(CfgScope scope) {
   Consistency::scopeNoFirst(scope) and
   not scope =
     [
-      any(AstNode f | not f.(Function).hasBody()),
-      any(ClosureExpr c | not c.hasBody()),
+      any(AstNode f | not f.(Callable).hasBody()),
       any(AsyncBlockExpr b | not b.hasStmtList())
     ]
 }
@@ -53,6 +52,7 @@ private predicate letElsePanic(BlockExpr be) {
  */
 query predicate deadEnd(CfgImpl::Node node) {
   Consistency::deadEnd(node) and
+  successfullyExtractedFile(node.getLocation().getFile()) and
   not letElsePanic(node.getAstNode())
 }
 
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/CfgNodes.qll b/rust/ql/lib/codeql/rust/controlflow/internal/CfgNodes.qll
index dc08c0d32a7..eb4d665436e 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/CfgNodes.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/CfgNodes.qll
@@ -7,8 +7,7 @@ private import codeql.rust.controlflow.CfgNodes
 private import codeql.rust.internal.CachedStages
 
 private predicate isPostOrder(AstNode n) {
-  n instanceof Expr and
-  not n instanceof LetExpr
+  n instanceof Expr
   or
   n instanceof OrPat
   or
@@ -82,6 +81,12 @@ class FormatArgsExprChildMapping extends ParentAstNode, CfgImpl::ExprTrees::Form
   override predicate relevantChild(AstNode child) { child = this.getChildNode(_) }
 }
 
+class AssignmentExprChildMapping extends ParentAstNode, AssignmentExpr {
+  override predicate relevantChild(AstNode child) {
+    child.(VariableWriteAccess).getAssignmentExpr() = this
+  }
+}
+
 private class ChildMappingImpl extends ChildMapping {
   /** Gets a CFG node for `child`, where `child` is a relevant child node of `parent`. */
   private CfgNode getRelevantChildCfgNode(AstNode parent, AstNode child) {
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll b/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll
index 01169ce2727..0250f1cbc43 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/Completion.qll
@@ -1,7 +1,6 @@
 private import codeql.util.Boolean
 private import codeql.rust.controlflow.ControlFlowGraph
 private import rust
-private import SuccessorType
 
 newtype TCompletion =
   TSimpleCompletion() or
@@ -32,7 +31,7 @@ abstract class NormalCompletion extends Completion { }
 
 /** A simple (normal) completion. */
 class SimpleCompletion extends NormalCompletion, TSimpleCompletion {
-  override NormalSuccessor getAMatchingSuccessorType() { any() }
+  override DirectSuccessor getAMatchingSuccessorType() { any() }
 
   // `SimpleCompletion` is the "default" completion type, thus it is valid for
   // any node where there isn't another more specific completion type.
@@ -184,7 +183,7 @@ class MatchCompletion extends TMatchCompletion, ConditionalCompletion {
     e instanceof TryExpr and value = true
   }
 
-  override MatchSuccessor getAMatchingSuccessorType() { result.getValue() = value }
+  override MatchingSuccessor getAMatchingSuccessorType() { result.getValue() = value }
 
   /** Gets the dual match completion. */
   override MatchCompletion getDual() { result = TMatchCompletion(value.booleanNot()) }
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
index 58cb9f6a95f..c3fb15ec0e7 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
@@ -29,19 +29,11 @@ private module CfgInput implements InputSig<Location> {
     Stages::CfgStage::ref()
   }
 
-  class SuccessorType = Cfg::SuccessorType;
+  private class SuccessorType = Cfg::SuccessorType;
 
   /** Gets a successor type that matches completion `c`. */
   SuccessorType getAMatchingSuccessorType(Completion c) { result = c.getAMatchingSuccessorType() }
 
-  /**
-   * Hold if `c` represents simple (normal) evaluation of a statement or an expression.
-   */
-  predicate successorTypeIsSimple(SuccessorType t) { t instanceof Cfg::NormalSuccessor }
-
-  /** Holds if `t` is an abnormal exit type out of a CFG scope. */
-  predicate isAbnormalExitType(SuccessorType t) { none() }
-
   /** Hold if `t` represents a conditional successor type. */
   predicate successorTypeIsCondition(SuccessorType t) { t instanceof Cfg::BooleanSuccessor }
 
@@ -85,7 +77,7 @@ class CallableScopeTree extends StandardTree, PreOrderTree, PostOrderTree, Scope
 
   override AstNode getChildNode(int i) {
     i = 0 and
-    result = this.getParamList().getSelfParam()
+    result = this.getSelfParam()
     or
     result = this.getParam(i - 1)
     or
@@ -200,8 +192,7 @@ class TypeReprTree extends LeafTree instanceof TypeRepr { }
 /**
  * Provides `ControlFlowTree`s for expressions.
  *
- * Since expressions construct values, they are modeled in post-order, except for
- * `LetExpr`s.
+ * Since expressions construct values, they are modeled in post-order.
  */
 module ExprTrees {
   class ArrayExprTree extends StandardPostOrderTree, ArrayExpr {
@@ -275,15 +266,8 @@ module ExprTrees {
     }
   }
 
-  private AstNode getBlockChildNode(BlockExpr b, int i) {
-    result = b.getStmtList().getStatement(i)
-    or
-    i = b.getStmtList().getNumberOfStatements() and
-    result = b.getStmtList().getTailExpr()
-  }
-
   class AsyncBlockExprTree extends StandardTree, PreOrderTree, PostOrderTree, AsyncBlockExpr {
-    override AstNode getChildNode(int i) { result = getBlockChildNode(this, i) }
+    override AstNode getChildNode(int i) { result = this.getStmtList().getStmtOrExpr(i) }
 
     override predicate propagatesAbnormal(AstNode child) { none() }
   }
@@ -291,7 +275,7 @@ module ExprTrees {
   class BlockExprTree extends StandardPostOrderTree, BlockExpr {
     BlockExprTree() { not this.isAsync() }
 
-    override AstNode getChildNode(int i) { result = getBlockChildNode(this, i) }
+    override AstNode getChildNode(int i) { result = this.getStmtList().getStmtOrExpr(i) }
 
     override predicate propagatesAbnormal(AstNode child) { child = this.getChildNode(_) }
   }
@@ -341,21 +325,15 @@ module ExprTrees {
       child = [super.getCondition(), super.getABranch()]
     }
 
-    private ConditionalCompletion conditionCompletion(Completion c) {
-      if super.getCondition() instanceof LetExpr
-      then result = c.(MatchCompletion)
-      else result = c.(BooleanCompletion)
-    }
-
     override predicate succ(AstNode pred, AstNode succ, Completion c) {
       // Edges from the condition to the branches
       last(super.getCondition(), pred, c) and
       (
-        first(super.getThen(), succ) and this.conditionCompletion(c).succeeded()
+        first(super.getThen(), succ) and c.(ConditionalCompletion).succeeded()
         or
-        first(super.getElse(), succ) and this.conditionCompletion(c).failed()
+        first(super.getElse(), succ) and c.(ConditionalCompletion).failed()
         or
-        not super.hasElse() and succ = this and this.conditionCompletion(c).failed()
+        not super.hasElse() and succ = this and c.(ConditionalCompletion).failed()
       )
       or
       // An edge from the then branch to the last node
@@ -401,10 +379,7 @@ module ExprTrees {
     }
   }
 
-  // `LetExpr` is a pre-order tree such that the pattern itself ends up
-  // dominating successors in the graph in the same way that patterns do in
-  // `match` expressions.
-  class LetExprTree extends StandardPreOrderTree, LetExpr {
+  class LetExprTree extends StandardPostOrderTree, LetExpr {
     override AstNode getChildNode(int i) {
       i = 0 and
       result = this.getScrutinee()
@@ -456,21 +431,15 @@ module ExprTrees {
 
     override predicate first(AstNode node) { first(super.getCondition(), node) }
 
-    private ConditionalCompletion conditionCompletion(Completion c) {
-      if super.getCondition() instanceof LetExpr
-      then result = c.(MatchCompletion)
-      else result = c.(BooleanCompletion)
-    }
-
     override predicate succ(AstNode pred, AstNode succ, Completion c) {
       super.succ(pred, succ, c)
       or
       last(super.getCondition(), pred, c) and
-      this.conditionCompletion(c).succeeded() and
+      c.(ConditionalCompletion).succeeded() and
       first(this.getLoopBody(), succ)
       or
       last(super.getCondition(), pred, c) and
-      this.conditionCompletion(c).failed() and
+      c.(ConditionalCompletion).failed() and
       succ = this
     }
   }
@@ -635,7 +604,7 @@ module PatternTrees {
       (
         StandardPatTree.super.succ(pred, succ, c)
         or
-        pred = this and first(this.getFirstChildNode(), succ) and completionIsValidFor(c, this)
+        pred = this and first(this.getFirstChildTree(), succ) and completionIsValidFor(c, this)
       )
     }
 
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/Scope.qll b/rust/ql/lib/codeql/rust/controlflow/internal/Scope.qll
index cf779ed152f..94c5300b062 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/Scope.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/Scope.qll
@@ -18,10 +18,10 @@ final class CfgScope = CfgScopeImpl;
 
 final class AsyncBlockScope extends CfgScopeImpl, AsyncBlockExpr instanceof ExprTrees::AsyncBlockExprTree
 {
-  override predicate scopeFirst(AstNode first) { first(super.getFirstChildNode(), first) }
+  override predicate scopeFirst(AstNode first) { first(super.getFirstChildTree(), first) }
 
   override predicate scopeLast(AstNode last, Completion c) {
-    last(super.getLastChildElement(), last, c)
+    last(super.getLastChildTree(), last, c)
     or
     last(super.getChildNode(_), last, c) and
     not c instanceof NormalCompletion
@@ -35,20 +35,11 @@ final class CallableScope extends CfgScopeImpl, Callable {
   CallableScope() {
     // A function without a body corresponds to a trait method signature and
     // should not have a CFG scope.
-    this.(Function).hasBody()
-    or
-    this instanceof ClosureExpr
-  }
-
-  /** Gets the body of this callable. */
-  AstNode getBody() {
-    result = this.(Function).getBody()
-    or
-    result = this.(ClosureExpr).getBody()
+    this.hasBody()
   }
 
   override predicate scopeFirst(AstNode first) {
-    first(this.(CallableScopeTree).getFirstChildNode(), first)
+    first(this.(CallableScopeTree).getFirstChildTree(), first)
   }
 
   /** Holds if `scope` is exited when `last` finishes with completion `c`. */
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/Splitting.qll b/rust/ql/lib/codeql/rust/controlflow/internal/Splitting.qll
index 2d3526c1370..a91bdeb4452 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/Splitting.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/Splitting.qll
@@ -71,13 +71,7 @@ module ConditionalCompletionSplitting {
       child = parent.(LogicalNotExpr).getExpr() and
       childCompletion.getDual() = parentCompletion
       or
-      (
-        childCompletion = parentCompletion
-        or
-        // needed for `let` expressions
-        childCompletion.(MatchCompletion).getValue() =
-          parentCompletion.(BooleanCompletion).getValue()
-      ) and
+      childCompletion = parentCompletion and
       (
         child = parent.(BinaryLogicalOperation).getAnOperand()
         or
@@ -92,6 +86,9 @@ module ConditionalCompletionSplitting {
         or
         child = parent.(PatternTrees::PostOrderPatTree).getPat(_)
       )
+      or
+      child = parent.(LetExpr).getPat() and
+      childCompletion.(MatchCompletion).getValue() = parentCompletion.(BooleanCompletion).getValue()
     }
   }
 
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/SuccessorType.qll b/rust/ql/lib/codeql/rust/controlflow/internal/SuccessorType.qll
deleted file mode 100644
index 658d2a66706..00000000000
--- a/rust/ql/lib/codeql/rust/controlflow/internal/SuccessorType.qll
+++ /dev/null
@@ -1,74 +0,0 @@
-private import rust
-private import codeql.util.Boolean
-private import Completion
-private import codeql.rust.internal.CachedStages
-
-cached
-newtype TSuccessorType =
-  TNormalSuccessor() { Stages::CfgStage::ref() } or
-  TBooleanSuccessor(Boolean b) or
-  TMatchSuccessor(Boolean b) or
-  TBreakSuccessor() or
-  TContinueSuccessor() or
-  TReturnSuccessor()
-
-/** The type of a control flow successor. */
-abstract class SuccessorTypeImpl extends TSuccessorType {
-  /** Gets a textual representation of successor type. */
-  abstract string toString();
-}
-
-/** A normal control flow successor. */
-class NormalSuccessorImpl extends SuccessorTypeImpl, TNormalSuccessor {
-  override string toString() { result = "successor" }
-}
-
-/** A conditional control flow successor. */
-abstract class ConditionalSuccessorImpl extends SuccessorTypeImpl {
-  boolean value;
-
-  bindingset[value]
-  ConditionalSuccessorImpl() { exists(value) }
-
-  /** Gets the Boolean value of this successor. */
-  boolean getValue() { result = value }
-}
-
-/** A Boolean control flow successor for a boolean conditon. */
-class BooleanSuccessorImpl extends ConditionalSuccessorImpl, TBooleanSuccessor {
-  BooleanSuccessorImpl() { this = TBooleanSuccessor(value) }
-
-  override string toString() { result = this.getValue().toString() }
-}
-
-/**
- * A control flow successor of a pattern match.
- */
-class MatchSuccessorImpl extends ConditionalSuccessorImpl, TMatchSuccessor {
-  MatchSuccessorImpl() { this = TMatchSuccessor(value) }
-
-  override string toString() {
-    if this.getValue() = true then result = "match" else result = "no-match"
-  }
-}
-
-/**
- * A control flow successor of a `break` expression.
- */
-class BreakSuccessorImpl extends SuccessorTypeImpl, TBreakSuccessor {
-  override string toString() { result = "break" }
-}
-
-/**
- * A control flow successor of a `continue` expression.
- */
-class ContinueSuccessorImpl extends SuccessorTypeImpl, TContinueSuccessor {
-  override string toString() { result = "continue" }
-}
-
-/**
- * A `return` control flow successor.
- */
-class ReturnSuccessorImpl extends SuccessorTypeImpl, TReturnSuccessor {
-  override string toString() { result = "return" }
-}
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/generated/CfgNodes.qll b/rust/ql/lib/codeql/rust/controlflow/internal/generated/CfgNodes.qll
index 36dd0fb304f..9ce771983a3 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/generated/CfgNodes.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/generated/CfgNodes.qll
@@ -1797,9 +1797,15 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
     /**
      * A sequence of statements generated by a `MacroCall`. For example:
      * ```rust
-     * fn main() {
-     *     println!("Hello, world!"); // This macro expands into a list of statements
+     * macro_rules! my_macro {
+     *     () => {
+     *         let mut x = 40;
+     *         x += 2;
+     *         x
+     *     };
      * }
+     *
+     * my_macro!();  // this macro expands to a sequence of statements (and an expression)
      * ```
      */
     final class MacroBlockExprCfgNode extends CfgNodeFinal, ExprCfgNode {
@@ -1810,18 +1816,6 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       /** Gets the underlying `MacroBlockExpr`. */
       MacroBlockExpr getMacroBlockExpr() { result = node }
 
-      /**
-       * Gets the tail expression of this macro block expression, if it exists.
-       */
-      ExprCfgNode getTailExpr() {
-        any(ChildMapping mapping).hasCfgChild(node, node.getTailExpr(), this, result)
-      }
-
-      /**
-       * Holds if `getTailExpr()` exists.
-       */
-      predicate hasTailExpr() { exists(this.getTailExpr()) }
-
       /**
        * Gets the `index`th statement of this macro block expression (0-based).
        */
@@ -1836,6 +1830,18 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
        * Gets the number of statements of this macro block expression.
        */
       int getNumberOfStatements() { result = count(int i | exists(this.getStatement(i))) }
+
+      /**
+       * Gets the tail expression of this macro block expression, if it exists.
+       */
+      ExprCfgNode getTailExpr() {
+        any(ChildMapping mapping).hasCfgChild(node, node.getTailExpr(), this, result)
+      }
+
+      /**
+       * Holds if `getTailExpr()` exists.
+       */
+      predicate hasTailExpr() { exists(this.getTailExpr()) }
     }
 
     final private class ParentMacroCall extends ParentAstNode, MacroCall {
@@ -2938,8 +2944,8 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
      * ```rust
      * let first = Foo { a: 1, b: 2 };
      * let second = Foo { a: 2, ..first };
-     * Foo { a: 1, b: 2 }[2] = 10;
-     * Foo { .. } = second;
+     * let n = Foo { a: 1, b: 2 }.b;
+     * Foo { a: m, .. } = second;
      * ```
      */
     final class StructExprCfgNode extends CfgNodeFinal, ExprCfgNode {
@@ -3057,8 +3063,9 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
     /**
      * A tuple expression. For example:
      * ```rust
-     * (1, "one");
-     * (2, "two")[0] = 3;
+     * let tuple = (1, "one");
+     * let n = (2, "two").0;
+     * let (a, b) = tuple;
      * ```
      */
     final class TupleExprCfgNode extends CfgNodeFinal, ExprCfgNode {
diff --git a/rust/ql/lib/codeql/rust/dataflow/Ssa.qll b/rust/ql/lib/codeql/rust/dataflow/Ssa.qll
index 932b846c4a3..badbef9e420 100644
--- a/rust/ql/lib/codeql/rust/dataflow/Ssa.qll
+++ b/rust/ql/lib/codeql/rust/dataflow/Ssa.qll
@@ -171,9 +171,20 @@ module Ssa {
     private CfgNode write;
 
     WriteDefinition() {
-      exists(BasicBlock bb, int i, Variable v |
+      exists(BasicBlock bb, int i, Variable v, CfgNode n |
         this.definesAt(v, bb, i) and
-        SsaImpl::variableWriteActual(bb, i, v, write)
+        SsaImpl::variableWriteActual(bb, i, v, n)
+      |
+        write.(VariableAccessCfgNode).getAccess().getVariable() = v and
+        (
+          write = n.(AssignmentExprCfgNode).getAWriteAccess()
+          or
+          write = n.(CompoundAssignmentExprCfgNode).getLhs()
+        )
+        or
+        not n instanceof AssignmentExprCfgNode and
+        not n instanceof CompoundAssignmentExprCfgNode and
+        write = n
       )
     }
 
@@ -194,9 +205,16 @@ module Ssa {
         ae.getRhs() = value
       )
       or
-      exists(LetStmtCfgNode ls |
-        ls.getPat().(IdentPatCfgNode).getName() = write and
-        ls.getInitializer() = value
+      exists(IdentPatCfgNode pat | pat.getName() = write |
+        exists(LetStmtCfgNode ls |
+          pat = ls.getPat() and
+          ls.getInitializer() = value
+        )
+        or
+        exists(LetExprCfgNode le |
+          pat = le.getPat() and
+          le.getScrutinee() = value
+        )
       )
     }
 
diff --git a/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowImpl.qll b/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowImpl.qll
index c50833593b7..9fa0f0a5a83 100644
--- a/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowImpl.qll
+++ b/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowImpl.qll
@@ -53,7 +53,9 @@ final class DataFlowCallable extends TDataFlowCallable {
   }
 
   /** Gets the location of this callable. */
-  Location getLocation() { result = this.asCfgScope().getLocation() }
+  Location getLocation() {
+    result = [this.asCfgScope().getLocation(), this.asSummarizedCallable().getLocation()]
+  }
 }
 
 final class DataFlowCall extends TDataFlowCall {
@@ -196,7 +198,8 @@ private ExprCfgNode getALastEvalNode(ExprCfgNode e) {
 
 /**
  * Holds if a reverse local flow step should be added from the post-update node
- * for `e` to the post-update node for the result.
+ * for `e` to the post-update node for the result. `preservesValue` is true
+ * if the step is value preserving.
  *
  * This is needed to allow for side-effects on compound expressions to propagate
  * to sub components. For example, in
@@ -241,6 +244,12 @@ module LocalFlow {
       nodeTo.getCfgNode() = s.getPat()
     )
     or
+    // An edge from the right-hand side of a let expression to the left-hand side.
+    exists(LetExprCfgNode e |
+      nodeFrom.getCfgNode() = e.getScrutinee() and
+      nodeTo.getCfgNode() = e.getPat()
+    )
+    or
     exists(IdentPatCfgNode p |
       not p.isRef() and
       nodeFrom.getCfgNode() = p and
@@ -254,7 +263,7 @@ module LocalFlow {
     or
     // An edge from a pattern/expression to its corresponding SSA definition.
     nodeFrom.(AstCfgFlowNode).getCfgNode() =
-      nodeTo.(SsaNode).asDefinition().(Ssa::WriteDefinition).getControlFlowNode()
+      nodeTo.(SsaNode).asDefinition().(Ssa::WriteDefinition).getWriteAccess()
     or
     nodeFrom.(SourceParameterNode).getParameter().(ParamCfgNode).getPat() = nodeTo.asPat()
     or
@@ -286,13 +295,10 @@ module LocalFlow {
 class LambdaCallKind = Unit;
 
 /** Holds if `creation` is an expression that creates a lambda of kind `kind`. */
-predicate lambdaCreationExpr(Expr creation, LambdaCallKind kind) {
-  (
-    creation instanceof ClosureExpr
-    or
-    creation instanceof Scope::AsyncBlockScope
-  ) and
-  exists(kind)
+predicate lambdaCreationExpr(Expr creation) {
+  creation instanceof ClosureExpr
+  or
+  creation instanceof Scope::AsyncBlockScope
 }
 
 /**
@@ -379,6 +385,8 @@ module RustDataFlow implements InputSig<Location> {
   predicate neverSkipInPathGraph(Node node) {
     node.(Node::Node).getCfgNode() = any(LetStmtCfgNode s).getPat()
     or
+    node.(Node::Node).getCfgNode() = any(LetExprCfgNode e).getPat()
+    or
     node.(Node::Node).getCfgNode() = any(AssignmentExprCfgNode a).getLhs()
     or
     exists(MatchExprCfgNode match |
@@ -497,7 +505,8 @@ module RustDataFlow implements InputSig<Location> {
    */
   predicate jumpStep(Node node1, Node node2) {
     FlowSummaryImpl::Private::Steps::summaryJumpStep(node1.(FlowSummaryNode).getSummaryNode(),
-      node2.(FlowSummaryNode).getSummaryNode())
+      node2.(FlowSummaryNode).getSummaryNode()) or
+    FlowSummaryImpl::Private::Steps::sourceJumpStep(node1.(FlowSummaryNode).getSummaryNode(), node2)
   }
 
   pragma[nomagic]
@@ -798,8 +807,15 @@ module RustDataFlow implements InputSig<Location> {
 
   /** Holds if `creation` is an expression that creates a lambda of kind `kind` for `c`. */
   predicate lambdaCreation(Node creation, LambdaCallKind kind, DataFlowCallable c) {
-    exists(Expr e |
-      e = creation.asExpr().getExpr() and lambdaCreationExpr(e, kind) and e = c.asCfgScope()
+    exists(kind) and
+    exists(Expr e | e = creation.asExpr().getExpr() |
+      lambdaCreationExpr(e) and e = c.asCfgScope()
+      or
+      // A path expression, that resolves to a function, evaluates to a function
+      // pointer. Except if the path occurs directly in a call, then it's just a
+      // call to the function and not a function being passed as data.
+      resolvePath(e.(PathExpr).getPath()) = c.asCfgScope() and
+      not any(CallExpr call).getFunction() = e
     )
   }
 
@@ -836,6 +852,7 @@ module RustDataFlow implements InputSig<Location> {
 module VariableCapture {
   private import codeql.rust.internal.CachedStages
   private import codeql.dataflow.VariableCapture as SharedVariableCapture
+  private import codeql.rust.controlflow.BasicBlocks as BasicBlocks
 
   private predicate closureFlowStep(ExprCfgNode e1, ExprCfgNode e2) {
     Stages::DataFlowStage::ref() and
@@ -847,22 +864,13 @@ module VariableCapture {
     )
   }
 
-  private module CaptureInput implements SharedVariableCapture::InputSig<Location> {
+  private module CaptureInput implements
+    SharedVariableCapture::InputSig<Location, BasicBlocks::BasicBlock>
+  {
     private import rust as Ast
-    private import codeql.rust.controlflow.BasicBlocks as BasicBlocks
     private import codeql.rust.elements.Variable as Variable
 
-    class BasicBlock extends BasicBlocks::BasicBlock {
-      Callable getEnclosingCallable() { result = this.getScope() }
-    }
-
-    class ControlFlowNode = CfgNode;
-
-    BasicBlock getImmediateBasicBlockDominator(BasicBlock bb) {
-      result = bb.getImmediateDominator()
-    }
-
-    BasicBlock getABasicBlockSuccessor(BasicBlock bb) { result = bb.getASuccessor() }
+    Callable basicBlockGetEnclosingCallable(BasicBlocks::BasicBlock bb) { result = bb.getScope() }
 
     class CapturedVariable extends Variable {
       CapturedVariable() { this.isCaptured() }
@@ -879,7 +887,7 @@ module VariableCapture {
     }
 
     class Expr extends CfgNode {
-      predicate hasCfgNode(BasicBlock bb, int i) { this = bb.getNode(i) }
+      predicate hasCfgNode(BasicBlocks::BasicBlock bb, int i) { this = bb.getNode(i) }
     }
 
     class VariableWrite extends Expr {
@@ -899,6 +907,12 @@ module VariableCapture {
           v.getPat() = ls.getPat().getPat() and
           ls.getInitializer() = source
         )
+        or
+        exists(LetExprCfgNode le |
+          this = le and
+          v.getPat() = le.getPat().getPat() and
+          le.getScrutinee() = source
+        )
       }
 
       CapturedVariable getVariable() { result = v }
@@ -921,7 +935,7 @@ module VariableCapture {
     }
 
     class ClosureExpr extends Expr instanceof ExprCfgNode {
-      ClosureExpr() { lambdaCreationExpr(super.getExpr(), _) }
+      ClosureExpr() { lambdaCreationExpr(super.getExpr()) }
 
       predicate hasBody(Callable body) { body = super.getExpr() }
 
@@ -935,7 +949,7 @@ module VariableCapture {
 
   class CapturedVariable = CaptureInput::CapturedVariable;
 
-  module Flow = SharedVariableCapture::Flow<Location, CaptureInput>;
+  module Flow = SharedVariableCapture::Flow<Location, BasicBlocks::Cfg, CaptureInput>;
 
   private Flow::ClosureNode asClosureNode(Node n) {
     result = n.(CaptureNode).getSynthesizedCaptureNode()
diff --git a/rust/ql/lib/codeql/rust/dataflow/internal/FlowSummaryImpl.qll b/rust/ql/lib/codeql/rust/dataflow/internal/FlowSummaryImpl.qll
index 997f27e51e1..2763908ae02 100644
--- a/rust/ql/lib/codeql/rust/dataflow/internal/FlowSummaryImpl.qll
+++ b/rust/ql/lib/codeql/rust/dataflow/internal/FlowSummaryImpl.qll
@@ -6,7 +6,10 @@ private import rust
 private import codeql.dataflow.internal.FlowSummaryImpl
 private import codeql.dataflow.internal.AccessPathSyntax as AccessPath
 private import codeql.rust.dataflow.internal.DataFlowImpl
+private import codeql.rust.internal.PathResolution
 private import codeql.rust.dataflow.FlowSummary
+private import codeql.rust.dataflow.Ssa
+private import codeql.rust.controlflow.CfgNodes
 private import Content
 
 module Input implements InputSig<Location, RustDataFlow> {
@@ -133,16 +136,44 @@ private module StepsInput implements Impl::Private::StepsInputSig {
     result.asCallCfgNode().getCall().getStaticTarget() = sc
   }
 
-  RustDataFlow::Node getSourceNode(Input::SourceBase source, Impl::Private::SummaryComponent sc) {
-    sc = Impl::Private::SummaryComponent::return(_) and
+  /** Gets the argument of `source` described by `sc`, if any. */
+  private Expr getSourceNodeArgument(Input::SourceBase source, Impl::Private::SummaryComponent sc) {
+    exists(ArgumentPosition pos |
+      sc = Impl::Private::SummaryComponent::argument(pos) and
+      result = pos.getArgument(source.getCall())
+    )
+  }
+
+  /** Get the callable that `expr` refers to. */
+  private Callable getCallable(Expr expr) {
+    result = resolvePath(expr.(PathExpr).getPath()).(Function)
+    or
+    result = expr.(ClosureExpr)
+    or
+    // The expression is an SSA read of an assignment of a closure
+    exists(Ssa::Definition def, ExprCfgNode value |
+      def.getARead().getAstNode() = expr and
+      def.getAnUltimateDefinition().(Ssa::WriteDefinition).assigns(value) and
+      result = value.getExpr().(ClosureExpr)
+    )
+  }
+
+  RustDataFlow::DataFlowCallable getSourceNodeEnclosingCallable(Input::SourceBase source) {
+    result.asCfgScope() = source.getEnclosingCfgScope()
+  }
+
+  RustDataFlow::Node getSourceNode(Input::SourceBase source, Impl::Private::SummaryComponentStack s) {
+    s.head() = Impl::Private::SummaryComponent::return(_) and
     result.asExpr().getExpr() = source.getCall()
     or
-    exists(CallExprBase call, Expr arg, ArgumentPosition pos |
-      result.(RustDataFlow::PostUpdateNode).getPreUpdateNode().asExpr().getExpr() = arg and
-      sc = Impl::Private::SummaryComponent::argument(pos) and
-      call = source.getCall() and
-      arg = pos.getArgument(call)
+    exists(ArgumentPosition pos, Expr arg |
+      s.head() = Impl::Private::SummaryComponent::parameter(pos) and
+      arg = getSourceNodeArgument(source, s.tail().headOfSingleton()) and
+      result.asParameter() = getCallable(arg).getParam(pos.getPosition())
     )
+    or
+    result.(RustDataFlow::PostUpdateNode).getPreUpdateNode().asExpr().getExpr() =
+      getSourceNodeArgument(source, s.headOfSingleton())
   }
 
   RustDataFlow::Node getSinkNode(Input::SinkBase sink, Impl::Private::SummaryComponent sc) {
diff --git a/rust/ql/lib/codeql/rust/dataflow/internal/ModelsAsData.qll b/rust/ql/lib/codeql/rust/dataflow/internal/ModelsAsData.qll
index 7f8df8d144b..067ef98b2fc 100644
--- a/rust/ql/lib/codeql/rust/dataflow/internal/ModelsAsData.qll
+++ b/rust/ql/lib/codeql/rust/dataflow/internal/ModelsAsData.qll
@@ -51,7 +51,8 @@ private import codeql.rust.elements.internal.CallExprBaseImpl::Impl as CallExprB
 
 /**
  * Holds if in a call to the function with canonical path `path`, the value referred
- * to by `output` is a flow source of the given `kind`.
+ * to by `output` is a flow source of the given `kind` and `madId` is the data
+ * extension row number.
  *
  * `output = "ReturnValue"` simply means the result of the call itself.
  *
@@ -64,7 +65,8 @@ extensible predicate sourceModel(
 
 /**
  * Holds if in a call to the function with canonical path `path`, the value referred
- * to by `input` is a flow sink of the given `kind`.
+ * to by `input` is a flow sink of the given `kind` and `madId` is the data
+ * extension row number.
  *
  * For example, `input = Argument[0]` means the first argument of the call.
  *
@@ -77,7 +79,8 @@ extensible predicate sinkModel(
 
 /**
  * Holds if in a call to the function with canonical path `path`, the value referred
- * to by `input` can flow to the value referred to by `output`.
+ * to by `input` can flow to the value referred to by `output` and `madId` is the data
+ * extension row number.
  *
  * `kind` should be either `value` or `taint`, for value-preserving or taint-preserving
  * steps, respectively.
diff --git a/rust/ql/lib/codeql/rust/dataflow/internal/Node.qll b/rust/ql/lib/codeql/rust/dataflow/internal/Node.qll
index a1bdc367d0a..e46b4375c04 100644
--- a/rust/ql/lib/codeql/rust/dataflow/internal/Node.qll
+++ b/rust/ql/lib/codeql/rust/dataflow/internal/Node.qll
@@ -454,7 +454,7 @@ newtype TNode =
     or
     lambdaCallExpr(_, _, e)
     or
-    lambdaCreationExpr(e.getExpr(), _)
+    lambdaCreationExpr(e.getExpr())
     or
     // Whenever `&mut e` has a post-update node we also create one for `e`.
     // E.g., for `e` in `f(..., &mut e, ...)` or `*(&mut e) = ...`.
@@ -478,5 +478,5 @@ newtype TNode =
   } or
   TSsaNode(SsaImpl::DataFlowIntegration::SsaNode node) or
   TFlowSummaryNode(FlowSummaryImpl::Private::SummaryNode sn) or
-  TClosureSelfReferenceNode(CfgScope c) { lambdaCreationExpr(c, _) } or
+  TClosureSelfReferenceNode(CfgScope c) { lambdaCreationExpr(c) } or
   TCaptureNode(VariableCapture::Flow::SynthesizedCaptureNode cn)
diff --git a/rust/ql/lib/codeql/rust/dataflow/internal/SsaImpl.qll b/rust/ql/lib/codeql/rust/dataflow/internal/SsaImpl.qll
index 9b6d254dec1..49b40474c98 100644
--- a/rust/ql/lib/codeql/rust/dataflow/internal/SsaImpl.qll
+++ b/rust/ql/lib/codeql/rust/dataflow/internal/SsaImpl.qll
@@ -18,23 +18,22 @@ private predicate isInUninitializedLet(Name name) {
   )
 }
 
-/** Holds if `write` writes to variable `v`. */
-predicate variableWrite(AstNode write, Variable v) {
+/** Holds if `write` writes to variable `v` via `access`. */
+predicate variableWrite(AstNode write, AstNode access, Variable v) {
   exists(Name name |
     name = write and
+    access = write and
     name = v.getName() and
     not isInUninitializedLet(name)
   )
   or
-  exists(VariableAccess access |
-    access = write and
-    access.getVariable() = v
-  |
-    access instanceof VariableWriteAccess
+  v = access.(VariableAccess).getVariable() and
+  (
+    write = access.(VariableWriteAccess).getAssignmentExpr()
     or
     // Although compound assignments, like `x += y`, may in fact not update `x`,
     // it makes sense to treat them as such
-    access = any(CompoundAssignmentExpr cae).getLhs()
+    access = write.(CompoundAssignmentExpr).getLhs()
   )
 }
 
@@ -54,15 +53,7 @@ private predicate variableReadCertain(BasicBlock bb, int i, VariableAccess va, V
   )
 }
 
-module SsaInput implements SsaImplCommon::InputSig<Location> {
-  class BasicBlock = BasicBlocks::BasicBlock;
-
-  class ControlFlowNode = CfgNode;
-
-  BasicBlock getImmediateBasicBlockDominator(BasicBlock bb) { result = bb.getImmediateDominator() }
-
-  BasicBlock getABasicBlockSuccessor(BasicBlock bb) { result = bb.getASuccessor() }
-
+module SsaInput implements SsaImplCommon::InputSig<Location, BasicBlock> {
   class SourceVariable = Variable;
 
   predicate variableWrite(BasicBlock bb, int i, SourceVariable v, boolean certain) {
@@ -91,7 +82,7 @@ module SsaInput implements SsaImplCommon::InputSig<Location> {
   }
 }
 
-import SsaImplCommon::Make<Location, SsaInput> as Impl
+import SsaImplCommon::Make<Location, BasicBlocks::Cfg, SsaInput> as Impl
 
 class Definition = Impl::Definition;
 
@@ -234,7 +225,7 @@ private module Cached {
   cached
   predicate variableWriteActual(BasicBlock bb, int i, Variable v, CfgNode write) {
     bb.getNode(i) = write and
-    variableWrite(write.getAstNode(), v)
+    variableWrite(write.getAstNode(), _, v)
   }
 
   cached
@@ -324,7 +315,7 @@ private module DataFlowIntegrationInput implements Impl::DataFlowIntegrationInpu
   private import codeql.util.Boolean
 
   class Expr extends CfgNodes::AstCfgNode {
-    predicate hasCfgNode(SsaInput::BasicBlock bb, int i) { this = bb.getNode(i) }
+    predicate hasCfgNode(BasicBlock bb, int i) { this = bb.getNode(i) }
   }
 
   Expr getARead(Definition def) { result = Cached::getARead(def) }
@@ -357,9 +348,7 @@ private module DataFlowIntegrationInput implements Impl::DataFlowIntegrationInpu
      * Holds if the evaluation of this guard to `branch` corresponds to the edge
      * from `bb1` to `bb2`.
      */
-    predicate hasValueBranchEdge(
-      SsaInput::BasicBlock bb1, SsaInput::BasicBlock bb2, GuardValue branch
-    ) {
+    predicate hasValueBranchEdge(BasicBlock bb1, BasicBlock bb2, GuardValue branch) {
       exists(Cfg::ConditionalSuccessor s |
         this = bb1.getANode() and
         bb2 = bb1.getASuccessor(s) and
@@ -372,15 +361,13 @@ private module DataFlowIntegrationInput implements Impl::DataFlowIntegrationInpu
      * branch edge from `bb1` to `bb2`. That is, following the edge from
      * `bb1` to `bb2` implies that this guard evaluated to `branch`.
      */
-    predicate valueControlsBranchEdge(
-      SsaInput::BasicBlock bb1, SsaInput::BasicBlock bb2, GuardValue branch
-    ) {
+    predicate valueControlsBranchEdge(BasicBlock bb1, BasicBlock bb2, GuardValue branch) {
       this.hasValueBranchEdge(bb1, bb2, branch)
     }
   }
 
   /** Holds if the guard `guard` controls block `bb` upon evaluating to `branch`. */
-  predicate guardDirectlyControlsBlock(Guard guard, SsaInput::BasicBlock bb, GuardValue branch) {
+  predicate guardDirectlyControlsBlock(Guard guard, BasicBlock bb, GuardValue branch) {
     exists(ConditionBasicBlock conditionBlock, ConditionalSuccessor s |
       guard = conditionBlock.getLastNode() and
       s.getValue() = branch and
diff --git a/rust/ql/lib/codeql/rust/dataflow/internal/TaintTrackingImpl.qll b/rust/ql/lib/codeql/rust/dataflow/internal/TaintTrackingImpl.qll
index 0ae6aacb430..b702c514c1a 100644
--- a/rust/ql/lib/codeql/rust/dataflow/internal/TaintTrackingImpl.qll
+++ b/rust/ql/lib/codeql/rust/dataflow/internal/TaintTrackingImpl.qll
@@ -41,13 +41,15 @@ module RustTaintTracking implements InputSig<Location, RustDataFlow> {
         succ.asExpr() = index
       )
       or
-      // Although data flow through collections is modeled using stores/reads,
-      // we also allow taint to flow out of a tainted collection. This is
-      // needed in order to support taint-tracking configurations where the
-      // source is a collection.
-      exists(SingletonContentSet cs |
-        RustDataFlow::readStep(pred, cs, succ) and
+      // Although data flow through collections and references is modeled using
+      // stores/reads, we also allow taint to flow out of a tainted collection
+      // or reference.
+      // This is needed in order to support taint-tracking configurations where
+      // the source is a collection or reference.
+      exists(SingletonContentSet cs | RustDataFlow::readStep(pred, cs, succ) |
         cs.getContent() instanceof ElementContent
+        or
+        cs.getContent() instanceof ReferenceContent
       )
       or
       exists(FormatArgsExprCfgNode format | succ.asExpr() = format |
diff --git a/rust/ql/lib/codeql/rust/elements.qll b/rust/ql/lib/codeql/rust/elements.qll
index cd44985675f..b42a93efc6c 100644
--- a/rust/ql/lib/codeql/rust/elements.qll
+++ b/rust/ql/lib/codeql/rust/elements.qll
@@ -41,7 +41,6 @@ import codeql.rust.elements.CallExpr
 import codeql.rust.elements.CallExprBase
 import codeql.rust.elements.Callable
 import codeql.rust.elements.CastExpr
-import codeql.rust.elements.ClosureBinder
 import codeql.rust.elements.ClosureExpr
 import codeql.rust.elements.Comment
 import codeql.rust.elements.Const
@@ -62,6 +61,7 @@ import codeql.rust.elements.ExternItemList
 import codeql.rust.elements.FieldExpr
 import codeql.rust.elements.FieldList
 import codeql.rust.elements.FnPtrTypeRepr
+import codeql.rust.elements.ForBinder
 import codeql.rust.elements.ForExpr
 import codeql.rust.elements.ForTypeRepr
 import codeql.rust.elements.Format
@@ -139,7 +139,6 @@ import codeql.rust.elements.RefExpr
 import codeql.rust.elements.RefPat
 import codeql.rust.elements.RefTypeRepr
 import codeql.rust.elements.Rename
-import codeql.rust.elements.Resolvable
 import codeql.rust.elements.RestPat
 import codeql.rust.elements.RetTypeRepr
 import codeql.rust.elements.ReturnExpr
diff --git a/rust/ql/lib/codeql/rust/elements/AsmExpr.qll b/rust/ql/lib/codeql/rust/elements/AsmExpr.qll
index 06cee086b3f..a4b588ff985 100644
--- a/rust/ql/lib/codeql/rust/elements/AsmExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/AsmExpr.qll
@@ -7,6 +7,7 @@ private import internal.AsmExprImpl
 import codeql.rust.elements.AsmPiece
 import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
+import codeql.rust.elements.Item
 
 /**
  * An inline assembly expression. For example:
diff --git a/rust/ql/lib/codeql/rust/elements/Callable.qll b/rust/ql/lib/codeql/rust/elements/Callable.qll
index 11d029fff7d..b2088f08f66 100644
--- a/rust/ql/lib/codeql/rust/elements/Callable.qll
+++ b/rust/ql/lib/codeql/rust/elements/Callable.qll
@@ -6,6 +6,7 @@
 private import internal.CallableImpl
 import codeql.rust.elements.AstNode
 import codeql.rust.elements.Attr
+import codeql.rust.elements.Expr
 import codeql.rust.elements.Param
 import codeql.rust.elements.ParamList
 
diff --git a/rust/ql/lib/codeql/rust/elements/ClosureExpr.qll b/rust/ql/lib/codeql/rust/elements/ClosureExpr.qll
index d1f73bfaadb..e2e2c067e46 100644
--- a/rust/ql/lib/codeql/rust/elements/ClosureExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/ClosureExpr.qll
@@ -5,8 +5,8 @@
 
 private import internal.ClosureExprImpl
 import codeql.rust.elements.Callable
-import codeql.rust.elements.ClosureBinder
 import codeql.rust.elements.Expr
+import codeql.rust.elements.ForBinder
 import codeql.rust.elements.RetTypeRepr
 
 /**
@@ -15,10 +15,13 @@ import codeql.rust.elements.RetTypeRepr
  * |x| x + 1;
  * move |x: i32| -> i32 { x + 1 };
  * async |x: i32, y| x + y;
- *  #[coroutine]
+ * #[coroutine]
  * |x| yield x;
- *  #[coroutine]
- *  static |x| yield x;
+ * #[coroutine]
+ * static |x| yield x;
+ * for<T: std::fmt::Debug> |x: T| {
+ *     println!("{:?}", x);
+ * };
  * ```
  */
 final class ClosureExpr = Impl::ClosureExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/ConstAccess.qll b/rust/ql/lib/codeql/rust/elements/ConstAccess.qll
new file mode 100644
index 00000000000..ae2f6c3e333
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/ConstAccess.qll
@@ -0,0 +1,7 @@
+/**
+ * This module provides the public class `ConstAccess`.
+ */
+
+private import internal.ConstImpl
+
+final class ConstAccess = Impl::ConstAccess;
diff --git a/rust/ql/lib/codeql/rust/elements/ClosureBinder.qll b/rust/ql/lib/codeql/rust/elements/ForBinder.qll
similarity index 60%
rename from rust/ql/lib/codeql/rust/elements/ClosureBinder.qll
rename to rust/ql/lib/codeql/rust/elements/ForBinder.qll
index 0bf9579b2f0..3dfff62d1e6 100644
--- a/rust/ql/lib/codeql/rust/elements/ClosureBinder.qll
+++ b/rust/ql/lib/codeql/rust/elements/ForBinder.qll
@@ -1,14 +1,14 @@
 // generated by codegen, do not edit
 /**
- * This module provides the public class `ClosureBinder`.
+ * This module provides the public class `ForBinder`.
  */
 
-private import internal.ClosureBinderImpl
+private import internal.ForBinderImpl
 import codeql.rust.elements.AstNode
 import codeql.rust.elements.GenericParamList
 
 /**
- * A closure binder, specifying lifetime or type parameters for a closure.
+ * A for binder, specifying lifetime or type parameters for a closure or a type.
  *
  * For example:
  * ```rust
@@ -21,4 +21,4 @@ import codeql.rust.elements.GenericParamList
  * print_any("hello");
  * ```
  */
-final class ClosureBinder = Impl::ClosureBinder;
+final class ForBinder = Impl::ForBinder;
diff --git a/rust/ql/lib/codeql/rust/elements/ForTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/ForTypeRepr.qll
index c52c92197bb..4b882044d06 100644
--- a/rust/ql/lib/codeql/rust/elements/ForTypeRepr.qll
+++ b/rust/ql/lib/codeql/rust/elements/ForTypeRepr.qll
@@ -4,21 +4,16 @@
  */
 
 private import internal.ForTypeReprImpl
-import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.ForBinder
 import codeql.rust.elements.TypeRepr
 
 /**
- * A higher-ranked trait bound.
+ * A function pointer type with a `for` modifier.
  *
  * For example:
  * ```rust
- * fn foo<T>(value: T)
- * where
- *     T: for<'a> Fn(&'a str) -> &'a str
- * //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- * {
- *     // ...
- * }
+ * type RefOp<X> = for<'a> fn(&'a X) -> &'a X;
+ * //              ^^^^^^^^^^^^^^^^^^^^^^^^^^
  * ```
  */
 final class ForTypeRepr = Impl::ForTypeRepr;
diff --git a/rust/ql/lib/codeql/rust/elements/MacroBlockExpr.qll b/rust/ql/lib/codeql/rust/elements/MacroBlockExpr.qll
index 8fcd2119a0a..0ad76f8a973 100644
--- a/rust/ql/lib/codeql/rust/elements/MacroBlockExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/MacroBlockExpr.qll
@@ -10,9 +10,15 @@ import codeql.rust.elements.Stmt
 /**
  * A sequence of statements generated by a `MacroCall`. For example:
  * ```rust
- * fn main() {
- *     println!("Hello, world!"); // This macro expands into a list of statements
+ * macro_rules! my_macro {
+ *     () => {
+ *         let mut x = 40;
+ *         x += 2;
+ *         x
+ *     };
  * }
+ *
+ * my_macro!();  // this macro expands to a sequence of statements (and an expression)
  * ```
  */
 final class MacroBlockExpr = Impl::MacroBlockExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/MethodCallExpr.qll b/rust/ql/lib/codeql/rust/elements/MethodCallExpr.qll
index c3d62106100..fca8b086134 100644
--- a/rust/ql/lib/codeql/rust/elements/MethodCallExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/MethodCallExpr.qll
@@ -8,7 +8,6 @@ import codeql.rust.elements.CallExprBase
 import codeql.rust.elements.Expr
 import codeql.rust.elements.GenericArgList
 import codeql.rust.elements.NameRef
-import codeql.rust.elements.Resolvable
 
 /**
  * A method call expression. For example:
diff --git a/rust/ql/lib/codeql/rust/elements/PathAstNode.qll b/rust/ql/lib/codeql/rust/elements/PathAstNode.qll
index c8ff02e634c..2e97383cf73 100644
--- a/rust/ql/lib/codeql/rust/elements/PathAstNode.qll
+++ b/rust/ql/lib/codeql/rust/elements/PathAstNode.qll
@@ -4,8 +4,8 @@
  */
 
 private import internal.PathAstNodeImpl
+import codeql.rust.elements.AstNode
 import codeql.rust.elements.Path
-import codeql.rust.elements.Resolvable
 
 /**
  * An AST element wrapping a path (`PathExpr`, `RecordExpr`, `PathPat`, `RecordPat`, `TupleStructPat`).
diff --git a/rust/ql/lib/codeql/rust/elements/RangeExprExt.qll b/rust/ql/lib/codeql/rust/elements/RangeExprExt.qll
index b4a045e6c0b..40c2755d5c7 100644
--- a/rust/ql/lib/codeql/rust/elements/RangeExprExt.qll
+++ b/rust/ql/lib/codeql/rust/elements/RangeExprExt.qll
@@ -46,6 +46,20 @@ final class RangeFromToExpr extends RangeExpr {
   }
 }
 
+/**
+ * A range-full expression. For example:
+ * ```rust
+ * let x = ..;
+ * ```
+ */
+final class RangeFullExpr extends RangeExpr {
+  RangeFullExpr() {
+    this.getOperatorName() = ".." and
+    not this.hasStart() and
+    not this.hasEnd()
+  }
+}
+
 /**
  * A range-inclusive expression. For example:
  * ```rust
diff --git a/rust/ql/lib/codeql/rust/elements/Resolvable.qll b/rust/ql/lib/codeql/rust/elements/Resolvable.qll
deleted file mode 100644
index 6a2304a3be7..00000000000
--- a/rust/ql/lib/codeql/rust/elements/Resolvable.qll
+++ /dev/null
@@ -1,12 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `Resolvable`.
- */
-
-private import internal.ResolvableImpl
-import codeql.rust.elements.AstNode
-
-/**
- * One of `PathExpr`, `RecordExpr`, `PathPat`, `RecordPat`, `TupleStructPat` or `MethodCallExpr`.
- */
-final class Resolvable = Impl::Resolvable;
diff --git a/rust/ql/lib/codeql/rust/elements/RetTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/RetTypeRepr.qll
index 205044d56b2..348550cef5f 100644
--- a/rust/ql/lib/codeql/rust/elements/RetTypeRepr.qll
+++ b/rust/ql/lib/codeql/rust/elements/RetTypeRepr.qll
@@ -12,7 +12,7 @@ import codeql.rust.elements.TypeRepr
  *
  * For example:
  * ```rust
- * fn foo() -> i32 {}
+ * fn foo() -> i32 { 0 }
  * //       ^^^^^^
  * ```
  */
diff --git a/rust/ql/lib/codeql/rust/elements/StmtList.qll b/rust/ql/lib/codeql/rust/elements/StmtList.qll
index 76a4b5d2c34..9401cb99084 100644
--- a/rust/ql/lib/codeql/rust/elements/StmtList.qll
+++ b/rust/ql/lib/codeql/rust/elements/StmtList.qll
@@ -10,13 +10,15 @@ import codeql.rust.elements.Expr
 import codeql.rust.elements.Stmt
 
 /**
- * A list of statements in a block.
+ * A list of statements in a block, with an optional tail expression at the
+ * end that determines the block's value.
  *
  * For example:
  * ```rust
  * {
  *     let x = 1;
  *     let y = 2;
+ *     x + y
  * }
  * //  ^^^^^^^^^
  * ```
diff --git a/rust/ql/lib/codeql/rust/elements/StructExpr.qll b/rust/ql/lib/codeql/rust/elements/StructExpr.qll
index ededc485eb6..dfb1ae4f819 100644
--- a/rust/ql/lib/codeql/rust/elements/StructExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/StructExpr.qll
@@ -13,8 +13,8 @@ import codeql.rust.elements.StructExprFieldList
  * ```rust
  * let first = Foo { a: 1, b: 2 };
  * let second = Foo { a: 2, ..first };
- * Foo { a: 1, b: 2 }[2] = 10;
- * Foo { .. } = second;
+ * let n = Foo { a: 1, b: 2 }.b;
+ * Foo { a: m, .. } = second;
  * ```
  */
 final class StructExpr = Impl::StructExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/TupleExpr.qll b/rust/ql/lib/codeql/rust/elements/TupleExpr.qll
index e66d46957fc..471abb51a3b 100644
--- a/rust/ql/lib/codeql/rust/elements/TupleExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/TupleExpr.qll
@@ -10,8 +10,9 @@ import codeql.rust.elements.Expr
 /**
  * A tuple expression. For example:
  * ```rust
- * (1, "one");
- * (2, "two")[0] = 3;
+ * let tuple = (1, "one");
+ * let n = (2, "two").0;
+ * let (a, b) = tuple;
  * ```
  */
 final class TupleExpr = Impl::TupleExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/TypeBound.qll b/rust/ql/lib/codeql/rust/elements/TypeBound.qll
index c49d8e5be06..fd9d460b09a 100644
--- a/rust/ql/lib/codeql/rust/elements/TypeBound.qll
+++ b/rust/ql/lib/codeql/rust/elements/TypeBound.qll
@@ -5,6 +5,7 @@
 
 private import internal.TypeBoundImpl
 import codeql.rust.elements.AstNode
+import codeql.rust.elements.ForBinder
 import codeql.rust.elements.Lifetime
 import codeql.rust.elements.TypeRepr
 import codeql.rust.elements.UseBoundGenericArgs
@@ -16,6 +17,8 @@ import codeql.rust.elements.UseBoundGenericArgs
  * ```rust
  * fn foo<T: Debug>(t: T) {}
  * //        ^^^^^
+ * fn bar(value: impl for<'a> From<&'a str>) {}
+ * //                 ^^^^^^^^^^^^^^^^^^^^^
  * ```
  */
 final class TypeBound = Impl::TypeBound;
diff --git a/rust/ql/lib/codeql/rust/elements/UseBoundGenericArgs.qll b/rust/ql/lib/codeql/rust/elements/UseBoundGenericArgs.qll
index f3784ffdab2..f06180cfefc 100644
--- a/rust/ql/lib/codeql/rust/elements/UseBoundGenericArgs.qll
+++ b/rust/ql/lib/codeql/rust/elements/UseBoundGenericArgs.qll
@@ -12,7 +12,7 @@ import codeql.rust.elements.UseBoundGenericArg
  *
  * For example:
  * ```rust
- * pub fn hello<'a, T, const N: usize>() -> impl Sized + use<'a, T, N> {}
+ * pub fn hello<'a, T, const N: usize>() -> impl Sized + use<'a, T, N> { 0 }
  * //                                                        ^^^^^^^^
  * ```
  */
diff --git a/rust/ql/lib/codeql/rust/elements/WherePred.qll b/rust/ql/lib/codeql/rust/elements/WherePred.qll
index 16e1e586570..7141819362a 100644
--- a/rust/ql/lib/codeql/rust/elements/WherePred.qll
+++ b/rust/ql/lib/codeql/rust/elements/WherePred.qll
@@ -5,7 +5,7 @@
 
 private import internal.WherePredImpl
 import codeql.rust.elements.AstNode
-import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.ForBinder
 import codeql.rust.elements.Lifetime
 import codeql.rust.elements.TypeBoundList
 import codeql.rust.elements.TypeRepr
@@ -17,6 +17,8 @@ import codeql.rust.elements.TypeRepr
  * ```rust
  * fn foo<T, U>(t: T, u: U) where T: Debug, U: Clone {}
  * //                             ^^^^^^^^  ^^^^^^^^
+ * fn bar<T>(value: T) where for<'a> T: From<&'a str> {}
+ * //                        ^^^^^^^^^^^^^^^^^^^^^^^^
  * ```
  */
 final class WherePred = Impl::WherePred;
diff --git a/rust/ql/lib/codeql/rust/elements/internal/AstNodeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/AstNodeImpl.qll
index 237ebfa6b41..69138190dba 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/AstNodeImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/AstNodeImpl.qll
@@ -13,9 +13,9 @@ private import codeql.rust.controlflow.ControlFlowGraph
  */
 module Impl {
   private import rust
+  private import codeql.rust.elements.internal.ElementImpl::Impl as ElementImpl
   private import codeql.rust.elements.internal.generated.ParentChild
   private import codeql.rust.controlflow.ControlFlowGraph
-  private import codeql.rust.elements.internal.MacroCallImpl::Impl as MacroCallImpl
 
   /**
    * Gets the immediate parent of a non-`AstNode` element `e`.
@@ -71,21 +71,15 @@ module Impl {
     }
 
     /** Holds if this node is inside a macro expansion. */
-    predicate isInMacroExpansion() { MacroCallImpl::isInMacroExpansion(_, this) }
+    predicate isInMacroExpansion() { ElementImpl::MacroExpansion::isInMacroExpansion(this) }
 
     /**
      * Holds if this node exists only as the result of a macro expansion.
      *
      * This is the same as `isInMacroExpansion()`, but excludes AST nodes corresponding
-     * to macro arguments.
+     * to macro arguments, including attribute macro targets.
      */
-    pragma[nomagic]
-    predicate isFromMacroExpansion() {
-      exists(AstNode root |
-        MacroCallImpl::isInMacroExpansion(root, this) and
-        not this = root.(MacroCall).getATokenTreeNode()
-      )
-    }
+    predicate isFromMacroExpansion() { ElementImpl::MacroExpansion::isFromMacroExpansion(this) }
 
     /**
      * Gets a control flow node for this AST node, if any.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/CallExprBaseImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/CallExprBaseImpl.qll
index cdccc3f31d9..05d5aee7a06 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/CallExprBaseImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/CallExprBaseImpl.qll
@@ -5,7 +5,6 @@
  */
 
 private import codeql.rust.elements.internal.generated.CallExprBase
-private import codeql.rust.elements.Resolvable
 
 /**
  * INTERNAL: This module contains the customizable definition of `CallExprBase` and should not
@@ -15,20 +14,13 @@ module Impl {
   private import rust
   private import codeql.rust.internal.TypeInference as TypeInference
 
-  pragma[nomagic]
-  Resolvable getCallResolvable(CallExprBase call) {
-    result = call.(MethodCallExpr)
-    or
-    result = call.(CallExpr).getFunction().(PathExpr)
-  }
-
   // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A function or method call expression. See `CallExpr` and `MethodCallExpr` for further details.
    */
   class CallExprBase extends Generated::CallExprBase {
-    /** Gets the static target of this call, if any. */
-    final Function getStaticTarget() { result = TypeInference::resolveCallTarget(this) }
+    /** Gets the static target (function or tuple struct/variant) of this call, if any. */
+    final Addressable getStaticTarget() { result = TypeInference::resolveCallTarget(this) }
 
     override Expr getArg(int index) { result = this.getArgList().getArg(index) }
   }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/CallImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/CallImpl.qll
index ac6e08bb9cf..210820fd105 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/CallImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/CallImpl.qll
@@ -102,7 +102,7 @@ module Impl {
       f = resolvePath(path) and
       path.getSegment().getIdentifier().getText() = methodName and
       exists(SelfParam self |
-        self = f.getParamList().getSelfParam() and
+        self = f.getSelfParam() and
         if self.isRef() then selfIsRef = true else selfIsRef = false
       )
     )
@@ -123,11 +123,10 @@ module Impl {
   }
 
   class CallExprMethodCall extends Call instanceof CallExpr {
-    Path qualifier;
     string methodName;
     boolean selfIsRef;
 
-    CallExprMethodCall() { callIsMethodCall(this, qualifier, methodName, selfIsRef) }
+    CallExprMethodCall() { callIsMethodCall(this, _, methodName, selfIsRef) }
 
     /**
      * Holds if this call must have an explicit borrow for the `self` argument,
diff --git a/rust/ql/lib/codeql/rust/elements/internal/CallableImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/CallableImpl.qll
index 37e24a9150c..9448de795d3 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/CallableImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/CallableImpl.qll
@@ -17,5 +17,25 @@ module Impl {
    */
   class Callable extends Generated::Callable {
     override Param getParam(int index) { result = this.getParamList().getParam(index) }
+
+    /**
+     * Gets the self parameter of this callable, if it exists.
+     */
+    SelfParam getSelfParam() { result = this.getParamList().getSelfParam() }
+
+    /**
+     * Holds if `getSelfParam()` exists.
+     */
+    predicate hasSelfParam() { exists(this.getSelfParam()) }
+
+    /**
+     * Gets the number of parameters of this callable, including `self` if it exists.
+     */
+    int getNumberOfParamsInclSelf() {
+      exists(int arr |
+        arr = this.getNumberOfParams() and
+        if this.hasSelfParam() then result = arr + 1 else result = arr
+      )
+    }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ClosureExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ClosureExprImpl.qll
index e96ae47e301..cef396dea18 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ClosureExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ClosureExprImpl.qll
@@ -18,13 +18,18 @@ module Impl {
    * |x| x + 1;
    * move |x: i32| -> i32 { x + 1 };
    * async |x: i32, y| x + y;
-   *  #[coroutine]
+   * #[coroutine]
    * |x| yield x;
-   *  #[coroutine]
-   *  static |x| yield x;
+   * #[coroutine]
+   * static |x| yield x;
+   * for<T: std::fmt::Debug> |x: T| {
+   *     println!("{:?}", x);
+   * };
    * ```
    */
   class ClosureExpr extends Generated::ClosureExpr {
     override string toStringImpl() { result = "|...| " + this.getBody().toAbbreviatedString() }
+
+    override Expr getBody() { result = this.getClosureBody() }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ConstImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ConstImpl.qll
index d2f3cde2d03..0234f7cf730 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ConstImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ConstImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `Const`.
  *
@@ -6,12 +5,15 @@
  */
 
 private import codeql.rust.elements.internal.generated.Const
+private import codeql.rust.elements.internal.PathExprImpl::Impl as PathExprImpl
+private import codeql.rust.internal.PathResolution
 
 /**
  * INTERNAL: This module contains the customizable definition of `Const` and should not
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A constant item declaration.
    *
@@ -21,4 +23,27 @@ module Impl {
    * ```
    */
   class Const extends Generated::Const { }
+
+  /**
+   * A constant access.
+   *
+   * For example:
+   * ```rust
+   * const X: i32 = 42;
+   *
+   * fn main() {
+   *     println!("{}", X);
+   * }
+   * ```
+   */
+  class ConstAccess extends PathExprImpl::PathExpr {
+    private Const c;
+
+    ConstAccess() { c = resolvePath(this.getPath()) }
+
+    /** Gets the constant being accessed. */
+    Const getConst() { result = c }
+
+    override string getAPrimaryQlClass() { result = "ConstAccess" }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ElementImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ElementImpl.qll
index 7a464a378d1..158a5ee9670 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ElementImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ElementImpl.qll
@@ -11,7 +11,118 @@ private import codeql.rust.elements.internal.generated.Element
  * be referenced directly.
  */
 module Impl {
+  private import rust
+  private import codeql.rust.elements.internal.generated.ParentChild
+  private import codeql.rust.elements.internal.generated.Synth
+  private import codeql.rust.elements.internal.generated.Raw
+  private import codeql.rust.elements.internal.LocationImpl
+
+  /**
+   * Provides logic for classifying elements with respect to macro expansions.
+   */
+  cached
+  module MacroExpansion {
+    /**
+     * Holds if `e` is superseded by an attribute macro expansion. That is, `e` is
+     * a transitive child of an item with an attribute macro expansion.
+     *
+     * Since this predicate is referenced in the charpred of `Element`, we need to
+     * use the parent-child relation on raw elements to avoid non-monotonicity.
+     */
+    private predicate supersededByAttributeMacroExpansionRaw(Raw::Item item, Raw::Element e) {
+      exists(item.getAttributeMacroExpansion()) and
+      e = Raw::getImmediateChild(item, _) and
+      not e = item.getAttributeMacroExpansion() and
+      // Don't consider attributes themselves to be superseded.  E.g., in `#[a] fn
+      // f() {}` the macro expansion supersedes `fn f() {}` but not `#[a]`.
+      not e instanceof Raw::Attr
+      or
+      exists(Raw::Element parent |
+        e = Raw::getImmediateChild(parent, _) and
+        supersededByAttributeMacroExpansionRaw(item, parent)
+      )
+    }
+
+    private predicate isMacroExpansion(AstNode macro, AstNode expansion) {
+      expansion = macro.(MacroCall).getMacroCallExpansion()
+      or
+      expansion = macro.(Adt).getDeriveMacroExpansion(_)
+      or
+      expansion = macro.(Item).getAttributeMacroExpansion()
+    }
+
+    /**
+     * Gets the immediately enclosing macro invocation for element `e`, if any.
+     *
+     * The result is either a `MacroCall`, an `Adt` with a derive macro expansion, or
+     * an `Item` with an attribute macro expansion.
+     */
+    cached
+    AstNode getImmediatelyEnclosingMacroInvocation(Element e) {
+      isMacroExpansion(result, e)
+      or
+      exists(Element mid |
+        result = getImmediatelyEnclosingMacroInvocation(mid) and
+        mid = getImmediateParent(e) and
+        not isMacroExpansion(mid, e)
+      )
+    }
+
+    pragma[nomagic]
+    private predicate isAttributeMacroExpansionSourceLocation(Item i, Location l) {
+      exists(Raw::Locatable e, @location_default loc |
+        supersededByAttributeMacroExpansionRaw(Synth::convertElementToRaw(i), e) and
+        locatable_locations(e, loc) and
+        l = LocationImpl::TLocationDefault(loc)
+      )
+    }
+
+    /** Gets an AST node whose location is inside the token tree belonging to `mc`. */
+    pragma[nomagic]
+    private AstNode getATokenTreeNode(MacroCall mc) {
+      mc = getImmediatelyEnclosingMacroInvocation(result) and
+      mc.getTokenTree().getLocation().contains(result.getLocation())
+    }
+
+    /** Holds if `n` is inside a macro expansion. */
+    cached
+    predicate isInMacroExpansion(AstNode n) { exists(getImmediatelyEnclosingMacroInvocation(n)) }
+
+    /**
+     * Holds if `n` exists only as the result of a macro expansion.
+     *
+     * This is the same as `isInMacroExpansion(n)`, but excludes AST nodes corresponding
+     * to macro arguments, including attribute macro targets.
+     *
+     * Note: This predicate is a heuristic based on location information and may not be
+     * accurate in all cases.
+     */
+    cached
+    predicate isFromMacroExpansion(AstNode n) {
+      exists(AstNode macro |
+        macro = getImmediatelyEnclosingMacroInvocation(n) and
+        not n = getATokenTreeNode(macro) and
+        not isAttributeMacroExpansionSourceLocation(macro, n.getLocation())
+      )
+      or
+      isFromMacroExpansion(pragma[only_bind_into](getImmediatelyEnclosingMacroInvocation(n)))
+    }
+
+    cached
+    predicate isRelevantElement(Generated::Element e) {
+      exists(Raw::Element raw |
+        raw = Synth::convertElementToRaw(e) and
+        not supersededByAttributeMacroExpansionRaw(_, raw)
+      )
+      or
+      // Synthetic elements are relevant when their parents are
+      Synth::convertFormatArgsExprToRaw(_) = Synth::getSynthParent(e)
+    }
+  }
+
   class Element extends Generated::Element {
+    Element() { MacroExpansion::isRelevantElement(this) }
+
     override string toStringImpl() { result = this.getAPrimaryQlClass() }
 
     /**
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ClosureBinderConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ForBinderConstructor.qll
similarity index 61%
rename from rust/ql/lib/codeql/rust/elements/internal/ClosureBinderConstructor.qll
rename to rust/ql/lib/codeql/rust/elements/internal/ForBinderConstructor.qll
index 0213547728f..1dfea8c72ab 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ClosureBinderConstructor.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ForBinderConstructor.qll
@@ -1,14 +1,14 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
  *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `ClosureBinder` synthesized instances.
+ *  `ForBinder` synthesized instances.
  *  INTERNAL: Do not use.
  */
 
 private import codeql.rust.elements.internal.generated.Raw
 
 /**
- *  The characteristic predicate of `ClosureBinder` synthesized instances.
+ *  The characteristic predicate of `ForBinder` synthesized instances.
  *  INTERNAL: Do not use.
  */
-predicate constructClosureBinder(Raw::ClosureBinder id) { any() }
+predicate constructForBinder(Raw::ForBinder id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ClosureBinderImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ForBinderImpl.qll
similarity index 53%
rename from rust/ql/lib/codeql/rust/elements/internal/ClosureBinderImpl.qll
rename to rust/ql/lib/codeql/rust/elements/internal/ForBinderImpl.qll
index 095a5a269e0..9f9b22f6c70 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ClosureBinderImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ForBinderImpl.qll
@@ -1,19 +1,19 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
- * This module provides a hand-modifiable wrapper around the generated class `ClosureBinder`.
+ * This module provides a hand-modifiable wrapper around the generated class `ForBinder`.
  *
  * INTERNAL: Do not use.
  */
 
-private import codeql.rust.elements.internal.generated.ClosureBinder
+private import codeql.rust.elements.internal.generated.ForBinder
 
 /**
- * INTERNAL: This module contains the customizable definition of `ClosureBinder` and should not
+ * INTERNAL: This module contains the customizable definition of `ForBinder` and should not
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
-   * A closure binder, specifying lifetime or type parameters for a closure.
+   * A for binder, specifying lifetime or type parameters for a closure or a type.
    *
    * For example:
    * ```rust
@@ -26,5 +26,7 @@ module Impl {
    * print_any("hello");
    * ```
    */
-  class ClosureBinder extends Generated::ClosureBinder { }
+  class ForBinder extends Generated::ForBinder {
+    override string toStringImpl() { result = "for<...>" }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ForTypeReprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ForTypeReprImpl.qll
index f555c664963..409c0d94c94 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ForTypeReprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ForTypeReprImpl.qll
@@ -13,17 +13,12 @@ private import codeql.rust.elements.internal.generated.ForTypeRepr
  */
 module Impl {
   /**
-   * A higher-ranked trait bound.
+   * A function pointer type with a `for` modifier.
    *
    * For example:
    * ```rust
-   * fn foo<T>(value: T)
-   * where
-   *     T: for<'a> Fn(&'a str) -> &'a str
-   * //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   * {
-   *     // ...
-   * }
+   * type RefOp<X> = for<'a> fn(&'a X) -> &'a X;
+   * //              ^^^^^^^^^^^^^^^^^^^^^^^^^^
    * ```
    */
   class ForTypeRepr extends Generated::ForTypeRepr { }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/FunctionImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/FunctionImpl.qll
index 67bd0a4eee9..69b85bb1ee2 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/FunctionImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/FunctionImpl.qll
@@ -69,5 +69,7 @@ module Impl {
       this.getLocation().getStartLine() <= result.getLocation().getStartLine() and
       result.getLocation().getStartLine() <= this.getName().getLocation().getStartLine()
     }
+
+    override BlockExpr getBody() { result = this.getFunctionBody() }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ImplTraitTypeReprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ImplTraitTypeReprImpl.qll
index e751d3f4a02..24b4852d728 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ImplTraitTypeReprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ImplTraitTypeReprImpl.qll
@@ -23,14 +23,22 @@ module Impl {
    * ```
    */
   class ImplTraitTypeRepr extends Generated::ImplTraitTypeRepr {
-    /** Gets the function for which this impl trait type occurs, if any. */
-    Function getFunction() {
-      this.getParentNode*() = [result.getRetType().getTypeRepr(), result.getAParam().getTypeRepr()]
+    pragma[nomagic]
+    private TypeRepr getFunctionTypeRepr(Function f) {
+      this.getParentNode*() = result and
+      result = [f.getRetType().getTypeRepr(), f.getAParam().getTypeRepr()]
     }
 
+    /** Gets the function for which this impl trait type occurs, if any. */
+    Function getFunction() { exists(this.getFunctionTypeRepr(result)) }
+
     /** Holds if this impl trait type occurs in the return type of a function. */
     predicate isInReturnPos() {
-      this.getParentNode*() = this.getFunction().getRetType().getTypeRepr()
+      exists(Function f | f.getRetType().getTypeRepr() = this.getFunctionTypeRepr(f))
+    }
+
+    override string toStringImpl() {
+      result = "impl " + this.getTypeBoundList().toAbbreviatedString()
     }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ItemImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ItemImpl.qll
index f211708bc81..46e554e4b42 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ItemImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ItemImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `Item`.
  *
@@ -12,6 +11,7 @@ private import codeql.rust.elements.internal.generated.Item
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * An item such as a function, struct, enum, etc.
    *
@@ -23,4 +23,10 @@ module Impl {
    * ```
    */
   class Item extends Generated::Item { }
+
+  private class ItemWithAttributeMacroExpansion extends Item {
+    ItemWithAttributeMacroExpansion() { this.hasAttributeMacroExpansion() }
+
+    override string toStringImpl() { result = "(item with attribute macro expansion)" }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/LifetimeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/LifetimeImpl.qll
index 1825cf5804d..0623effa9c2 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/LifetimeImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/LifetimeImpl.qll
@@ -22,7 +22,9 @@ module Impl {
    * ```
    */
   class Lifetime extends Generated::Lifetime {
-    override string toStringImpl() {
+    override string toStringImpl() { result = this.toAbbreviatedString() }
+
+    override string toAbbreviatedString() {
       result = this.getText()
       or
       not this.hasText() and result = "'_"
diff --git a/rust/ql/lib/codeql/rust/elements/internal/LocatableImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/LocatableImpl.qll
index fcb5289e049..78a9e7f38ec 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/LocatableImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/LocatableImpl.qll
@@ -5,6 +5,7 @@
  */
 
 import codeql.Locations
+private import codeql.rust.elements.internal.ElementImpl::Impl as ElementImpl
 private import codeql.rust.elements.internal.LocationImpl
 private import codeql.rust.elements.internal.generated.Locatable
 private import codeql.rust.elements.internal.generated.Synth
@@ -50,21 +51,12 @@ module Impl {
     locatable_locations(Synth::convertLocatableToRaw(l), result)
   }
 
-  private MacroCall getImmediatelyEnclosingMacroCall(AstNode n) {
-    result = n.getParentNode()
-    or
-    exists(AstNode mid |
-      result = getImmediatelyEnclosingMacroCall(mid) and
-      n.getParentNode() = mid and
-      not mid instanceof MacroCall
-    )
-  }
-
   /** Gets the non-synthesized location of `l`, if any. */
   LocationImpl::LocationDefault getLocationDefault(Locatable l) {
     result = LocationImpl::TLocationDefault(getDbLocation(l))
     or
     not exists(getDbLocation(l)) and
-    result = getLocationDefault(getImmediatelyEnclosingMacroCall(l))
+    result =
+      getLocationDefault(ElementImpl::MacroExpansion::getImmediatelyEnclosingMacroInvocation(l))
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MacroBlockExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MacroBlockExprImpl.qll
index 60030dd6f27..289e6c33a30 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/MacroBlockExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/MacroBlockExprImpl.qll
@@ -15,9 +15,15 @@ module Impl {
   /**
    * A sequence of statements generated by a `MacroCall`. For example:
    * ```rust
-   * fn main() {
-   *     println!("Hello, world!"); // This macro expands into a list of statements
+   * macro_rules! my_macro {
+   *     () => {
+   *         let mut x = 40;
+   *         x += 2;
+   *         x
+   *     };
    * }
+   *
+   * my_macro!();  // this macro expands to a sequence of statements (and an expression)
    * ```
    */
   class MacroBlockExpr extends Generated::MacroBlockExpr { }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MacroCallImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MacroCallImpl.qll
index 27f70c77074..8e048517f63 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/MacroCallImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/MacroCallImpl.qll
@@ -12,15 +12,7 @@ private import codeql.rust.elements.internal.generated.MacroCall
  */
 module Impl {
   private import rust
-
-  pragma[nomagic]
-  predicate isInMacroExpansion(AstNode root, AstNode n) {
-    n = root.(MacroCall).getMacroCallExpansion()
-    or
-    n = root.(Adt).getDeriveMacroExpansion(_)
-    or
-    isInMacroExpansion(root, n.getParentNode())
-  }
+  private import codeql.rust.internal.PathResolution
 
   // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
@@ -32,15 +24,13 @@ module Impl {
    * ```
    */
   class MacroCall extends Generated::MacroCall {
-    override string toStringImpl() {
-      if this.hasPath() then result = this.getPath().toAbbreviatedString() + "!..." else result = ""
-    }
+    override string toStringImpl() { result = this.getPath().toAbbreviatedString() + "!..." }
 
-    /** Gets an AST node whose location is inside the token tree belonging to this macro call. */
-    pragma[nomagic]
-    AstNode getATokenTreeNode() {
-      isInMacroExpansion(this, result) and
-      this.getTokenTree().getLocation().contains(result.getLocation())
-    }
+    /**
+     * Gets the macro definition that this macro call resolves to.
+     *
+     * The result is either a `MacroDef` or a `MacroRules`.
+     */
+    Item resolveMacro() { result = resolvePath(this.getPath()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MethodCallExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MethodCallExprImpl.qll
index ac8d9b210e9..7617ae456bb 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/MethodCallExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/MethodCallExprImpl.qll
@@ -38,5 +38,8 @@ module Impl {
     override string toStringImpl() {
       result = strictconcat(int i | | this.toStringPart(i) order by i)
     }
+
+    /** Gets the static target of this method call, if any. */
+    final Function getStaticTarget() { result = super.getStaticTarget() }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/OperationImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/OperationImpl.qll
index ea76293a1bd..f22c95759d6 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/OperationImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/OperationImpl.qll
@@ -12,7 +12,7 @@ private import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
  * the canonical path `path` and the method name `method`, and if it borrows its
  * first `borrows` arguments.
  */
-private predicate isOverloaded(string op, int arity, string path, string method, int borrows) {
+predicate isOverloaded(string op, int arity, string path, string method, int borrows) {
   arity = 1 and
   (
     // Negation
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ResolvableImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ResolvableImpl.qll
deleted file mode 100644
index 893708164d8..00000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/ResolvableImpl.qll
+++ /dev/null
@@ -1,19 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- * This module provides a hand-modifiable wrapper around the generated class `Resolvable`.
- *
- * INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.Resolvable
-
-/**
- * INTERNAL: This module contains the customizable definition of `Resolvable` and should not
- * be referenced directly.
- */
-module Impl {
-  /**
-   * One of `PathExpr`, `RecordExpr`, `PathPat`, `RecordPat`, `TupleStructPat` or `MethodCallExpr`.
-   */
-  class Resolvable extends Generated::Resolvable { }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RetTypeReprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RetTypeReprImpl.qll
index e7f9c48869d..d8b6a5b9e82 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/RetTypeReprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/RetTypeReprImpl.qll
@@ -17,7 +17,7 @@ module Impl {
    *
    * For example:
    * ```rust
-   * fn foo() -> i32 {}
+   * fn foo() -> i32 { 0 }
    * //       ^^^^^^
    * ```
    */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/StmtListImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/StmtListImpl.qll
index 85940ef7d21..d56b4c49ce2 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/StmtListImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/StmtListImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `StmtList`.
  *
@@ -12,17 +11,48 @@ private import codeql.rust.elements.internal.generated.StmtList
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
-   * A list of statements in a block.
+   * A list of statements in a block, with an optional tail expression at the
+   * end that determines the block's value.
    *
    * For example:
    * ```rust
    * {
    *     let x = 1;
    *     let y = 2;
+   *     x + y
    * }
    * //  ^^^^^^^^^
    * ```
    */
-  class StmtList extends Generated::StmtList { }
+  class StmtList extends Generated::StmtList {
+    /**
+     * Gets the `index`th statement or expression of this statement list (0-based).
+     *
+     * This includes both the statements and any tail expression in the statement list. To access
+     * just the statements, use `getStatement`. To access just the tail expression, if any,
+     * use `getTailExpr`.
+     */
+    AstNode getStmtOrExpr(int index) {
+      result = this.getStatement(index)
+      or
+      index = this.getNumberOfStatements() and
+      result = this.getTailExpr()
+    }
+
+    /**
+     * Gets any of the statements or expressions of this statement list.
+     *
+     * This includes both the statements and any tail expression in the statement list. To access
+     * just the statements, use `getAStatement`. To access just the tail expression, if any,
+     * use `getTailExpr`.
+     */
+    final AstNode getAStmtOrExpr() { result = this.getStmtOrExpr(_) }
+
+    /**
+     * Gets the number of statements or expressions of this statement list.
+     */
+    final int getNumberOfStmtOrExpr() { result = count(int i | exists(this.getStmtOrExpr(i))) }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/StructExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/StructExprImpl.qll
index 4e45ed845bd..5cbeb62c7a4 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/StructExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/StructExprImpl.qll
@@ -20,8 +20,8 @@ module Impl {
    * ```rust
    * let first = Foo { a: 1, b: 2 };
    * let second = Foo { a: 2, ..first };
-   * Foo { a: 1, b: 2 }[2] = 10;
-   * Foo { .. } = second;
+   * let n = Foo { a: 1, b: 2 }.b;
+   * Foo { a: m, .. } = second;
    * ```
    */
   class StructExpr extends Generated::StructExpr {
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TupleExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TupleExprImpl.qll
index eead8bd32ef..df818859d87 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/TupleExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/TupleExprImpl.qll
@@ -15,8 +15,9 @@ module Impl {
   /**
    * A tuple expression. For example:
    * ```rust
-   * (1, "one");
-   * (2, "two")[0] = 3;
+   * let tuple = (1, "one");
+   * let n = (2, "two").0;
+   * let (a, b) = tuple;
    * ```
    */
   class TupleExpr extends Generated::TupleExpr { }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TypeBoundImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TypeBoundImpl.qll
index c4b70217db2..cf05bbc4ada 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/TypeBoundImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/TypeBoundImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `TypeBound`.
  *
@@ -12,6 +11,7 @@ private import codeql.rust.elements.internal.generated.TypeBound
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A type bound in a trait or generic parameter.
    *
@@ -19,7 +19,16 @@ module Impl {
    * ```rust
    * fn foo<T: Debug>(t: T) {}
    * //        ^^^^^
+   * fn bar(value: impl for<'a> From<&'a str>) {}
+   * //                 ^^^^^^^^^^^^^^^^^^^^^
    * ```
    */
-  class TypeBound extends Generated::TypeBound { }
+  class TypeBound extends Generated::TypeBound {
+    override string toAbbreviatedString() {
+      result = this.getLifetime().toAbbreviatedString()
+      or
+      not this.hasLifetime() and
+      result = "..."
+    }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TypeBoundListImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TypeBoundListImpl.qll
index 1b6fd0e64fe..0d386b6edb0 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/TypeBoundListImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/TypeBoundListImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `TypeBoundList`.
  *
@@ -12,6 +11,7 @@ private import codeql.rust.elements.internal.generated.TypeBoundList
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A list of type bounds.
    *
@@ -21,5 +21,15 @@ module Impl {
    * //        ^^^^^^^^^^^^^
    * ```
    */
-  class TypeBoundList extends Generated::TypeBoundList { }
+  class TypeBoundList extends Generated::TypeBoundList {
+    override string toStringImpl() { result = this.toAbbreviatedString() }
+
+    private string toAbbreviatedStringPart(int index) {
+      result = this.getBound(index).toAbbreviatedString()
+    }
+
+    override string toAbbreviatedString() {
+      result = strictconcat(int i | | this.toAbbreviatedStringPart(i), " + " order by i)
+    }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TypeParamImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TypeParamImpl.qll
index 753f511dedb..755c5399a20 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/TypeParamImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/TypeParamImpl.qll
@@ -28,18 +28,6 @@ module Impl {
     /** Gets the position of this type parameter. */
     int getPosition() { this = any(GenericParamList l).getTypeParam(result) }
 
-    private TypeBound getTypeBoundAt(int i, int j) {
-      exists(TypeBoundList tbl | result = tbl.getBound(j) |
-        tbl = this.getTypeBoundList() and i = 0
-        or
-        exists(WherePred wp |
-          wp = this.(TypeParamItemNode).getAWherePred() and
-          tbl = wp.getTypeBoundList() and
-          wp = any(WhereClause wc).getPredicate(i)
-        )
-      )
-    }
-
     /**
      * Gets the `index`th type bound of this type parameter, if any.
      *
@@ -47,7 +35,8 @@ module Impl {
      * any `where` clauses for this type parameter.
      */
     TypeBound getTypeBound(int index) {
-      result = rank[index + 1](int i, int j | | this.getTypeBoundAt(i, j) order by i, j)
+      result =
+        rank[index + 1](int i, int j | | this.(TypeParamItemNode).getTypeBoundAt(i, j) order by i, j)
     }
 
     /**
@@ -56,12 +45,10 @@ module Impl {
      * This includes type bounds directly on this type parameter and bounds from
      * any `where` clauses for this type parameter.
      */
-    TypeBound getATypeBound() {
-      // NOTE: This predicate is used in path resolution, so it can not be
-      // defined using `getTypeBound` as that would cause non-monotonic
-      // recursion due to the `rank`.
-      result = this.getTypeBoundAt(_, _)
-    }
+    TypeBound getATypeBound() { result = this.getTypeBound(_) }
+
+    /** Holds if this type parameter has at least one type bound. */
+    predicate hasTypeBound() { exists(this.getATypeBound()) }
 
     override string toAbbreviatedString() { result = this.getName().getText() }
 
diff --git a/rust/ql/lib/codeql/rust/elements/internal/UnionImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/UnionImpl.qll
index 17551c4834e..40680f3edc9 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/UnionImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/UnionImpl.qll
@@ -21,6 +21,13 @@ module Impl {
    * ```
    */
   class Union extends Generated::Union {
+    /** Gets the struct field named `name`, if any. */
+    pragma[nomagic]
+    StructField getStructField(string name) {
+      result = this.getStructFieldList().getAField() and
+      result.getName().getText() = name
+    }
+
     override string toStringImpl() { result = "union " + this.getName().getText() }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/UseBoundGenericArgsImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/UseBoundGenericArgsImpl.qll
index d8f1ed985f3..5b18c8f4978 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/UseBoundGenericArgsImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/UseBoundGenericArgsImpl.qll
@@ -17,7 +17,7 @@ module Impl {
    *
    * For example:
    * ```rust
-   * pub fn hello<'a, T, const N: usize>() -> impl Sized + use<'a, T, N> {}
+   * pub fn hello<'a, T, const N: usize>() -> impl Sized + use<'a, T, N> { 0 }
    * //                                                        ^^^^^^^^
    * ```
    */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
index 05631049254..61f022c8bfd 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
@@ -1,6 +1,6 @@
 private import rust
 private import codeql.rust.controlflow.ControlFlowGraph
-private import codeql.rust.elements.internal.generated.ParentChild
+private import codeql.rust.elements.internal.generated.ParentChild as ParentChild
 private import codeql.rust.elements.internal.PathImpl::Impl as PathImpl
 private import codeql.rust.elements.internal.PathExprBaseImpl::Impl as PathExprBaseImpl
 private import codeql.rust.elements.internal.FormatTemplateVariableAccessImpl::Impl as FormatTemplateVariableAccessImpl
@@ -15,27 +15,56 @@ module Impl {
 
   class BlockExprScope extends VariableScope, BlockExpr { }
 
-  abstract class MatchArmScope extends VariableScope {
-    MatchArm arm;
-
-    bindingset[arm]
-    MatchArmScope() { exists(arm) }
-
-    Pat getPat() { result = arm.getPat() }
+  class MatchArmExprScope extends VariableScope {
+    MatchArmExprScope() { this = any(MatchArm arm).getExpr() }
   }
 
-  class MatchArmExprScope extends MatchArmScope {
-    MatchArmExprScope() { this = arm.getExpr() }
-  }
-
-  class MatchArmGuardScope extends MatchArmScope {
-    MatchArmGuardScope() { this = arm.getGuard() }
+  class MatchArmGuardScope extends VariableScope {
+    MatchArmGuardScope() { this = any(MatchArm arm).getGuard() }
   }
 
   class ClosureBodyScope extends VariableScope {
     ClosureBodyScope() { this = any(ClosureExpr ce).getBody() }
   }
 
+  /**
+   * A scope for conditions, which may introduce variables using `let` expressions.
+   *
+   * Such variables are only available in the body guarded by the condition.
+   */
+  class ConditionScope extends VariableScope {
+    private AstNode parent;
+    private AstNode body;
+
+    ConditionScope() {
+      parent =
+        any(IfExpr ie |
+          this = ie.getCondition() and
+          body = ie.getThen()
+        )
+      or
+      parent =
+        any(WhileExpr we |
+          this = we.getCondition() and
+          body = we.getLoopBody()
+        )
+      or
+      parent =
+        any(MatchArm ma |
+          this = ma.getGuard() and
+          body = ma.getExpr()
+        )
+    }
+
+    /** Gets the parent of this condition. */
+    AstNode getParent() { result = parent }
+
+    /**
+     * Gets the body in which variables introduced in this scope are available.
+     */
+    AstNode getBody() { result = body }
+  }
+
   private Pat getAPatAncestor(Pat p) {
     (p instanceof IdentPat or p instanceof OrPat) and
     exists(Pat p0 | result = p0.getParentPat() |
@@ -77,7 +106,7 @@ module Impl {
       text = name.getText() and
       // exclude self parameters from functions without a body as these are
       // trait method declarations without implementations
-      not exists(Function f | not f.hasBody() and f.getParamList().getSelfParam() = sp)
+      not exists(Function f | not f.hasBody() and f.getSelfParam() = sp)
     )
     or
     exists(IdentPat pat |
@@ -152,8 +181,14 @@ module Impl {
     /** Gets the `let` statement that introduces this variable, if any. */
     LetStmt getLetStmt() { this.getPat() = result.getPat() }
 
+    /** Gets the `let` expression that introduces this variable, if any. */
+    LetExpr getLetExpr() { this.getPat() = result.getPat() }
+
     /** Gets the initial value of this variable, if any. */
-    Expr getInitializer() { result = this.getLetStmt().getInitializer() }
+    Expr getInitializer() {
+      result = this.getLetStmt().getInitializer() or
+      result = this.getLetExpr().getScrutinee()
+    }
 
     /** Holds if this variable is captured. */
     predicate isCaptured() { this.getAnAccess().isCapture() }
@@ -193,15 +228,53 @@ module Impl {
     string getName() { result = name_ }
   }
 
+  pragma[nomagic]
+  private Element getImmediateChildAdj(Element e, int preOrd, int index) {
+    result = ParentChild::getImmediateChild(e, index) and
+    preOrd = 0 and
+    not exists(ConditionScope cs |
+      e = cs.getParent() and
+      result = cs.getBody()
+    )
+    or
+    result = e.(ConditionScope).getBody() and
+    preOrd = 1 and
+    index = 0
+  }
+
+  /**
+   * An adjusted version of `ParentChild::getImmediateChild`, which makes the following
+   * two adjustments:
+   *
+   * 1. For conditions like `if cond body`, instead of letting `body` be the second child
+   *    of `if`, we make it the last child of `cond`. This ensures that variables
+   *    introduced in the `cond` scope are available in `body`.
+   *
+   * 2. A similar adjustment is made for `while` loops: the body of the loop is made a
+   *    child of the loop condition instead of the loop itself.
+   */
+  pragma[nomagic]
+  private Element getImmediateChildAdj(Element e, int index) {
+    result =
+      rank[index + 1](Element res, int preOrd, int i |
+        res = getImmediateChildAdj(e, preOrd, i)
+      |
+        res order by preOrd, i
+      )
+  }
+
+  private Element getImmediateParentAdj(Element e) { e = getImmediateChildAdj(result, _) }
+
   private AstNode getAnAncestorInVariableScope(AstNode n) {
     (
       n instanceof Pat or
       n instanceof VariableAccessCand or
       n instanceof LetStmt or
+      n = any(LetExpr le).getScrutinee() or
       n instanceof VariableScope
     ) and
     exists(AstNode n0 |
-      result = getImmediateParent(n0) or
+      result = getImmediateParentAdj(n0) or
       result = n0.(FormatTemplateVariableAccess).getArgument().getParent().getParent()
     |
       n0 = n
@@ -233,7 +306,7 @@ module Impl {
   private predicate parameterDeclInScope(Variable v, VariableScope scope) {
     exists(Callable f |
       v.getParameter() = f.getParamList().getAParamBase() and
-      scope = [f.(Function).getBody(), f.(ClosureExpr).getBody()]
+      scope = f.getBody()
     )
   }
 
@@ -243,14 +316,15 @@ module Impl {
       this instanceof VariableScope or
       this instanceof VariableAccessCand or
       this instanceof LetStmt or
-      getImmediateChild(this, _) instanceof RelevantElement
+      this = any(LetExpr le).getScrutinee() or
+      getImmediateChildAdj(this, _) instanceof RelevantElement
     }
 
     pragma[nomagic]
-    private RelevantElement getChild(int index) { result = getImmediateChild(this, index) }
+    private RelevantElement getChild(int index) { result = getImmediateChildAdj(this, index) }
 
     pragma[nomagic]
-    private RelevantElement getImmediateChildMin(int index) {
+    private RelevantElement getImmediateChildAdjMin(int index) {
       // A child may have multiple positions for different accessors,
       // so always use the first
       result = this.getChild(index) and
@@ -258,16 +332,16 @@ module Impl {
     }
 
     pragma[nomagic]
-    RelevantElement getImmediateChild(int index) {
+    RelevantElement getImmediateChildAdj(int index) {
       result =
-        rank[index + 1](Element res, int i | res = this.getImmediateChildMin(i) | res order by i)
+        rank[index + 1](Element res, int i | res = this.getImmediateChildAdjMin(i) | res order by i)
     }
 
     pragma[nomagic]
     RelevantElement getImmediateLastChild() {
       exists(int last |
-        result = this.getImmediateChild(last) and
-        not exists(this.getImmediateChild(last + 1))
+        result = this.getImmediateChildAdj(last) and
+        not exists(this.getImmediateChildAdj(last + 1))
       )
     }
   }
@@ -288,13 +362,13 @@ module Impl {
     |
       // first child of a previously numbered node
       result = getPreOrderNumbering(scope, parent) + 1 and
-      n = parent.getImmediateChild(0)
+      n = parent.getImmediateChildAdj(0)
       or
       // non-first child of a previously numbered node
       exists(RelevantElement child, int i |
         result = getLastPreOrderNumbering(scope, child) + 1 and
-        child = parent.getImmediateChild(i) and
-        n = parent.getImmediateChild(i + 1)
+        child = parent.getImmediateChildAdj(i) and
+        n = parent.getImmediateChildAdj(i + 1)
       )
     )
   }
@@ -309,7 +383,7 @@ module Impl {
       result = getPreOrderNumbering(scope, leaf) and
       leaf != scope and
       (
-        not exists(leaf.getImmediateChild(_))
+        not exists(leaf.getImmediateChildAdj(_))
         or
         leaf instanceof VariableScope
       )
@@ -331,7 +405,7 @@ module Impl {
   /**
    * Holds if `v` is named `name` and is declared inside variable scope
    * `scope`. The pre-order numbering of the binding site of `v`, amongst
-   * all nodes nester under `scope`, is `ord`.
+   * all nodes nested under `scope`, is `ord`.
    */
   private predicate variableDeclInScope(Variable v, VariableScope scope, string name, int ord) {
     name = v.getText() and
@@ -340,11 +414,14 @@ module Impl {
       ord = getPreOrderNumbering(scope, scope)
       or
       exists(Pat pat | pat = getAVariablePatAncestor(v) |
-        scope =
-          any(MatchArmScope arm |
-            arm.getPat() = pat and
-            ord = getPreOrderNumbering(scope, arm)
-          )
+        exists(MatchArm arm |
+          pat = arm.getPat() and
+          ord = getPreOrderNumbering(scope, scope)
+        |
+          scope = arm.getGuard()
+          or
+          not arm.hasGuard() and scope = arm.getExpr()
+        )
         or
         exists(LetStmt let |
           let.getPat() = pat and
@@ -354,11 +431,13 @@ module Impl {
           ord = getLastPreOrderNumbering(scope, let) + 1
         )
         or
-        exists(IfExpr ie, LetExpr let |
+        exists(LetExpr let, Expr scrutinee |
           let.getPat() = pat and
-          ie.getCondition() = let and
-          scope = ie.getThen() and
-          ord = getPreOrderNumbering(scope, scope)
+          scrutinee = let.getScrutinee() and
+          scope = getEnclosingScope(scrutinee) and
+          // for `let` expressions, variables are bound _after_ the expression, i.e.
+          // not in the RHS
+          ord = getLastPreOrderNumbering(scope, scrutinee) + 1
         )
         or
         exists(ForExpr fe |
@@ -366,13 +445,6 @@ module Impl {
           scope = fe.getLoopBody() and
           ord = getPreOrderNumbering(scope, scope)
         )
-        or
-        exists(WhileExpr we, LetExpr let |
-          let.getPat() = pat and
-          we.getCondition() = let and
-          scope = we.getLoopBody() and
-          ord = getPreOrderNumbering(scope, scope)
-        )
       )
     )
   }
@@ -388,7 +460,12 @@ module Impl {
     VariableAccessCand cand, VariableScope scope, string name, int nestLevel, int ord
   ) {
     name = cand.getName() and
-    scope = [cand.(VariableScope), getEnclosingScope(cand)] and
+    (
+      scope = cand
+      or
+      not cand instanceof VariableScope and
+      scope = getEnclosingScope(cand)
+    ) and
     ord = getPreOrderNumbering(scope, cand) and
     nestLevel = 0
     or
@@ -607,12 +684,12 @@ module Impl {
   }
 
   /** Holds if `e` occurs in the LHS of an assignment or compound assignment. */
-  private predicate assignmentExprDescendant(Expr e) {
-    e = any(AssignmentExpr ae).getLhs()
+  private predicate assignmentExprDescendant(AssignmentExpr ae, Expr e) {
+    e = ae.getLhs()
     or
     exists(Expr mid |
-      assignmentExprDescendant(mid) and
-      getImmediateParent(e) = mid and
+      assignmentExprDescendant(ae, mid) and
+      getImmediateParentAdj(e) = mid and
       not mid instanceof DerefExpr and
       not mid instanceof FieldExpr and
       not mid instanceof IndexExpr
@@ -621,11 +698,16 @@ module Impl {
 
   /** A variable write. */
   class VariableWriteAccess extends VariableAccess {
+    private AssignmentExpr ae;
+
     cached
     VariableWriteAccess() {
       Cached::ref() and
-      assignmentExprDescendant(this)
+      assignmentExprDescendant(ae, this)
     }
+
+    /** Gets the assignment expression that has this write access in the left-hand side. */
+    AssignmentExpr getAssignmentExpr() { result = ae }
   }
 
   /** A variable read. */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/WherePredImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/WherePredImpl.qll
index 9f77b9c3c69..9e4231ec515 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/WherePredImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/WherePredImpl.qll
@@ -19,6 +19,8 @@ module Impl {
    * ```rust
    * fn foo<T, U>(t: T, u: U) where T: Debug, U: Clone {}
    * //                             ^^^^^^^^  ^^^^^^^^
+   * fn bar<T>(value: T) where for<'a> T: From<&'a str> {}
+   * //                        ^^^^^^^^^^^^^^^^^^^^^^^^
    * ```
    */
   class WherePred extends Generated::WherePred { }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Addressable.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Addressable.qll
index 9d4ba1e976a..b51d8b1ec6a 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Addressable.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Addressable.qll
@@ -20,39 +20,5 @@ module Generated {
    * INTERNAL: Do not reference the `Generated::Addressable` class directly.
    * Use the subclass `Addressable`, where the following predicates are available.
    */
-  class Addressable extends Synth::TAddressable, AstNodeImpl::AstNode {
-    /**
-     * Gets the extended canonical path of this addressable, if it exists.
-     *
-     * Either a canonical path (see https://doc.rust-lang.org/reference/paths.html#canonical-paths),
-     * or `{<block id>}::name` for addressable items defined in an anonymous block (and only
-     * addressable there-in).
-     * INTERNAL: Do not use.
-     */
-    string getExtendedCanonicalPath() {
-      result = Synth::convertAddressableToRaw(this).(Raw::Addressable).getExtendedCanonicalPath()
-    }
-
-    /**
-     * Holds if `getExtendedCanonicalPath()` exists.
-     * INTERNAL: Do not use.
-     */
-    final predicate hasExtendedCanonicalPath() { exists(this.getExtendedCanonicalPath()) }
-
-    /**
-     * Gets the crate origin of this addressable, if it exists.
-     *
-     * One of `rustc:<name>`, `repo:<repository>:<name>` or `lang:<name>`.
-     * INTERNAL: Do not use.
-     */
-    string getCrateOrigin() {
-      result = Synth::convertAddressableToRaw(this).(Raw::Addressable).getCrateOrigin()
-    }
-
-    /**
-     * Holds if `getCrateOrigin()` exists.
-     * INTERNAL: Do not use.
-     */
-    final predicate hasCrateOrigin() { exists(this.getCrateOrigin()) }
-  }
+  class Addressable extends Synth::TAddressable, AstNodeImpl::AstNode { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/AsmExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/AsmExpr.qll
index 83f756a4c98..95e4d08aa40 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/AsmExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/AsmExpr.qll
@@ -10,6 +10,7 @@ import codeql.rust.elements.AsmPiece
 import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
+import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
 
 /**
  * INTERNAL: This module contains the fully generated definition of `AsmExpr` and should not
@@ -27,7 +28,7 @@ module Generated {
    * INTERNAL: Do not reference the `Generated::AsmExpr` class directly.
    * Use the subclass `AsmExpr`, where the following predicates are available.
    */
-  class AsmExpr extends Synth::TAsmExpr, ExprImpl::Expr {
+  class AsmExpr extends Synth::TAsmExpr, ExprImpl::Expr, ItemImpl::Item {
     override string getAPrimaryQlClass() { result = "AsmExpr" }
 
     /**
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Callable.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Callable.qll
index f42f711dcf8..b2eb4d96d91 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Callable.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Callable.qll
@@ -8,6 +8,7 @@ private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
 import codeql.rust.elements.Attr
+import codeql.rust.elements.Expr
 import codeql.rust.elements.Param
 import codeql.rust.elements.ParamList
 
@@ -69,5 +70,15 @@ module Generated {
      * Gets the number of parameters of this callable.
      */
     final int getNumberOfParams() { result = count(int i | exists(this.getParam(i))) }
+
+    /**
+     * Gets the body of this callable, if it exists.
+     */
+    Expr getBody() { none() }
+
+    /**
+     * Holds if `getBody()` exists.
+     */
+    final predicate hasBody() { exists(this.getBody()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ClosureExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ClosureExpr.qll
index 70a3c374e0d..86e1178589a 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ClosureExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ClosureExpr.qll
@@ -7,9 +7,9 @@
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.internal.CallableImpl::Impl as CallableImpl
-import codeql.rust.elements.ClosureBinder
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
+import codeql.rust.elements.ForBinder
 import codeql.rust.elements.RetTypeRepr
 
 /**
@@ -23,10 +23,13 @@ module Generated {
    * |x| x + 1;
    * move |x: i32| -> i32 { x + 1 };
    * async |x: i32, y| x + y;
-   *  #[coroutine]
+   * #[coroutine]
    * |x| yield x;
-   *  #[coroutine]
-   *  static |x| yield x;
+   * #[coroutine]
+   * static |x| yield x;
+   * for<T: std::fmt::Debug> |x: T| {
+   *     println!("{:?}", x);
+   * };
    * ```
    * INTERNAL: Do not reference the `Generated::ClosureExpr` class directly.
    * Use the subclass `ClosureExpr`, where the following predicates are available.
@@ -35,32 +38,34 @@ module Generated {
     override string getAPrimaryQlClass() { result = "ClosureExpr" }
 
     /**
-     * Gets the body of this closure expression, if it exists.
+     * Gets the closure body of this closure expression, if it exists.
      */
-    Expr getBody() {
+    Expr getClosureBody() {
       result =
-        Synth::convertExprFromRaw(Synth::convertClosureExprToRaw(this).(Raw::ClosureExpr).getBody())
-    }
-
-    /**
-     * Holds if `getBody()` exists.
-     */
-    final predicate hasBody() { exists(this.getBody()) }
-
-    /**
-     * Gets the closure binder of this closure expression, if it exists.
-     */
-    ClosureBinder getClosureBinder() {
-      result =
-        Synth::convertClosureBinderFromRaw(Synth::convertClosureExprToRaw(this)
+        Synth::convertExprFromRaw(Synth::convertClosureExprToRaw(this)
               .(Raw::ClosureExpr)
-              .getClosureBinder())
+              .getClosureBody())
     }
 
     /**
-     * Holds if `getClosureBinder()` exists.
+     * Holds if `getClosureBody()` exists.
      */
-    final predicate hasClosureBinder() { exists(this.getClosureBinder()) }
+    final predicate hasClosureBody() { exists(this.getClosureBody()) }
+
+    /**
+     * Gets the for binder of this closure expression, if it exists.
+     */
+    ForBinder getForBinder() {
+      result =
+        Synth::convertForBinderFromRaw(Synth::convertClosureExprToRaw(this)
+              .(Raw::ClosureExpr)
+              .getForBinder())
+    }
+
+    /**
+     * Holds if `getForBinder()` exists.
+     */
+    final predicate hasForBinder() { exists(this.getForBinder()) }
 
     /**
      * Holds if this closure expression is async.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ClosureBinder.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ForBinder.qll
similarity index 58%
rename from rust/ql/lib/codeql/rust/elements/internal/generated/ClosureBinder.qll
rename to rust/ql/lib/codeql/rust/elements/internal/generated/ForBinder.qll
index 9bd04fd3581..38512084e39 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ClosureBinder.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ForBinder.qll
@@ -1,6 +1,6 @@
 // generated by codegen, do not edit
 /**
- * This module provides the generated definition of `ClosureBinder`.
+ * This module provides the generated definition of `ForBinder`.
  * INTERNAL: Do not import directly.
  */
 
@@ -10,12 +10,12 @@ import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
 import codeql.rust.elements.GenericParamList
 
 /**
- * INTERNAL: This module contains the fully generated definition of `ClosureBinder` and should not
+ * INTERNAL: This module contains the fully generated definition of `ForBinder` and should not
  * be referenced directly.
  */
 module Generated {
   /**
-   * A closure binder, specifying lifetime or type parameters for a closure.
+   * A for binder, specifying lifetime or type parameters for a closure or a type.
    *
    * For example:
    * ```rust
@@ -27,19 +27,19 @@ module Generated {
    * print_any(42);
    * print_any("hello");
    * ```
-   * INTERNAL: Do not reference the `Generated::ClosureBinder` class directly.
-   * Use the subclass `ClosureBinder`, where the following predicates are available.
+   * INTERNAL: Do not reference the `Generated::ForBinder` class directly.
+   * Use the subclass `ForBinder`, where the following predicates are available.
    */
-  class ClosureBinder extends Synth::TClosureBinder, AstNodeImpl::AstNode {
-    override string getAPrimaryQlClass() { result = "ClosureBinder" }
+  class ForBinder extends Synth::TForBinder, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "ForBinder" }
 
     /**
-     * Gets the generic parameter list of this closure binder, if it exists.
+     * Gets the generic parameter list of this for binder, if it exists.
      */
     GenericParamList getGenericParamList() {
       result =
-        Synth::convertGenericParamListFromRaw(Synth::convertClosureBinderToRaw(this)
-              .(Raw::ClosureBinder)
+        Synth::convertGenericParamListFromRaw(Synth::convertForBinderToRaw(this)
+              .(Raw::ForBinder)
               .getGenericParamList())
     }
 
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ForTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ForTypeRepr.qll
index cbe2975bf50..56745b56f00 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ForTypeRepr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ForTypeRepr.qll
@@ -6,7 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.ForBinder
 import codeql.rust.elements.TypeRepr
 import codeql.rust.elements.internal.TypeReprImpl::Impl as TypeReprImpl
 
@@ -16,17 +16,12 @@ import codeql.rust.elements.internal.TypeReprImpl::Impl as TypeReprImpl
  */
 module Generated {
   /**
-   * A higher-ranked trait bound.
+   * A function pointer type with a `for` modifier.
    *
    * For example:
    * ```rust
-   * fn foo<T>(value: T)
-   * where
-   *     T: for<'a> Fn(&'a str) -> &'a str
-   * //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   * {
-   *     // ...
-   * }
+   * type RefOp<X> = for<'a> fn(&'a X) -> &'a X;
+   * //              ^^^^^^^^^^^^^^^^^^^^^^^^^^
    * ```
    * INTERNAL: Do not reference the `Generated::ForTypeRepr` class directly.
    * Use the subclass `ForTypeRepr`, where the following predicates are available.
@@ -35,19 +30,19 @@ module Generated {
     override string getAPrimaryQlClass() { result = "ForTypeRepr" }
 
     /**
-     * Gets the generic parameter list of this for type representation, if it exists.
+     * Gets the for binder of this for type representation, if it exists.
      */
-    GenericParamList getGenericParamList() {
+    ForBinder getForBinder() {
       result =
-        Synth::convertGenericParamListFromRaw(Synth::convertForTypeReprToRaw(this)
+        Synth::convertForBinderFromRaw(Synth::convertForTypeReprToRaw(this)
               .(Raw::ForTypeRepr)
-              .getGenericParamList())
+              .getForBinder())
     }
 
     /**
-     * Holds if `getGenericParamList()` exists.
+     * Holds if `getForBinder()` exists.
      */
-    final predicate hasGenericParamList() { exists(this.getGenericParamList()) }
+    final predicate hasForBinder() { exists(this.getForBinder()) }
 
     /**
      * Gets the type representation of this for type representation, if it exists.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Function.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Function.qll
index db0b4fd1509..1221917425d 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Function.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Function.qll
@@ -54,17 +54,19 @@ module Generated {
     final predicate hasAbi() { exists(this.getAbi()) }
 
     /**
-     * Gets the body of this function, if it exists.
+     * Gets the function body of this function, if it exists.
      */
-    BlockExpr getBody() {
+    BlockExpr getFunctionBody() {
       result =
-        Synth::convertBlockExprFromRaw(Synth::convertFunctionToRaw(this).(Raw::Function).getBody())
+        Synth::convertBlockExprFromRaw(Synth::convertFunctionToRaw(this)
+              .(Raw::Function)
+              .getFunctionBody())
     }
 
     /**
-     * Holds if `getBody()` exists.
+     * Holds if `getFunctionBody()` exists.
      */
-    final predicate hasBody() { exists(this.getBody()) }
+    final predicate hasFunctionBody() { exists(this.getFunctionBody()) }
 
     /**
      * Gets the generic parameter list of this function, if it exists.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MacroBlockExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroBlockExpr.qll
index 3dd6411e20e..e7b94d9f04c 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/MacroBlockExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroBlockExpr.qll
@@ -18,9 +18,15 @@ module Generated {
   /**
    * A sequence of statements generated by a `MacroCall`. For example:
    * ```rust
-   * fn main() {
-   *     println!("Hello, world!"); // This macro expands into a list of statements
+   * macro_rules! my_macro {
+   *     () => {
+   *         let mut x = 40;
+   *         x += 2;
+   *         x
+   *     };
    * }
+   *
+   * my_macro!();  // this macro expands to a sequence of statements (and an expression)
    * ```
    * INTERNAL: Do not reference the `Generated::MacroBlockExpr` class directly.
    * Use the subclass `MacroBlockExpr`, where the following predicates are available.
@@ -28,21 +34,6 @@ module Generated {
   class MacroBlockExpr extends Synth::TMacroBlockExpr, ExprImpl::Expr {
     override string getAPrimaryQlClass() { result = "MacroBlockExpr" }
 
-    /**
-     * Gets the tail expression of this macro block expression, if it exists.
-     */
-    Expr getTailExpr() {
-      result =
-        Synth::convertExprFromRaw(Synth::convertMacroBlockExprToRaw(this)
-              .(Raw::MacroBlockExpr)
-              .getTailExpr())
-    }
-
-    /**
-     * Holds if `getTailExpr()` exists.
-     */
-    final predicate hasTailExpr() { exists(this.getTailExpr()) }
-
     /**
      * Gets the `index`th statement of this macro block expression (0-based).
      */
@@ -62,5 +53,20 @@ module Generated {
      * Gets the number of statements of this macro block expression.
      */
     final int getNumberOfStatements() { result = count(int i | exists(this.getStatement(i))) }
+
+    /**
+     * Gets the tail expression of this macro block expression, if it exists.
+     */
+    Expr getTailExpr() {
+      result =
+        Synth::convertExprFromRaw(Synth::convertMacroBlockExprToRaw(this)
+              .(Raw::MacroBlockExpr)
+              .getTailExpr())
+    }
+
+    /**
+     * Holds if `getTailExpr()` exists.
+     */
+    final predicate hasTailExpr() { exists(this.getTailExpr()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MethodCallExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MethodCallExpr.qll
index 116488ae6ef..8908b71b7af 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/MethodCallExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MethodCallExpr.qll
@@ -10,7 +10,6 @@ import codeql.rust.elements.internal.CallExprBaseImpl::Impl as CallExprBaseImpl
 import codeql.rust.elements.Expr
 import codeql.rust.elements.GenericArgList
 import codeql.rust.elements.NameRef
-import codeql.rust.elements.internal.ResolvableImpl::Impl as ResolvableImpl
 
 /**
  * INTERNAL: This module contains the fully generated definition of `MethodCallExpr` and should not
@@ -26,9 +25,7 @@ module Generated {
    * INTERNAL: Do not reference the `Generated::MethodCallExpr` class directly.
    * Use the subclass `MethodCallExpr`, where the following predicates are available.
    */
-  class MethodCallExpr extends Synth::TMethodCallExpr, CallExprBaseImpl::CallExprBase,
-    ResolvableImpl::Resolvable
-  {
+  class MethodCallExpr extends Synth::TMethodCallExpr, CallExprBaseImpl::CallExprBase {
     override string getAPrimaryQlClass() { result = "MethodCallExpr" }
 
     /**
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ParentChild.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ParentChild.qll
index e2aa343f65d..233c29e0173 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ParentChild.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ParentChild.qll
@@ -74,7 +74,7 @@ private module Impl {
   private Element getImmediateChildOfArgList(ArgList e, int index, string partialPredicateCall) {
     exists(int n, int nArg |
       n = 0 and
-      nArg = n + 1 + max(int i | i = -1 or exists(e.getArg(i)) | i) and
+      nArg = n + e.getNumberOfArgs() and
       (
         none()
         or
@@ -126,8 +126,8 @@ private module Impl {
   ) {
     exists(int n, int nAssocItem, int nAttr |
       n = 0 and
-      nAssocItem = n + 1 + max(int i | i = -1 or exists(e.getAssocItem(i)) | i) and
-      nAttr = nAssocItem + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAssocItem = n + e.getNumberOfAssocItems() and
+      nAttr = nAssocItem + e.getNumberOfAttrs() and
       (
         none()
         or
@@ -152,9 +152,26 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfClosureBinder(
-    ClosureBinder e, int index, string partialPredicateCall
+  private Element getImmediateChildOfExternItemList(
+    ExternItemList e, int index, string partialPredicateCall
   ) {
+    exists(int n, int nAttr, int nExternItem |
+      n = 0 and
+      nAttr = n + e.getNumberOfAttrs() and
+      nExternItem = nAttr + e.getNumberOfExternItems() and
+      (
+        none()
+        or
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        result = e.getExternItem(index - nAttr) and
+        partialPredicateCall = "ExternItem(" + (index - nAttr).toString() + ")"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfForBinder(ForBinder e, int index, string partialPredicateCall) {
     exists(int n, int nGenericParamList |
       n = 0 and
       nGenericParamList = n + 1 and
@@ -168,25 +185,6 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfExternItemList(
-    ExternItemList e, int index, string partialPredicateCall
-  ) {
-    exists(int n, int nAttr, int nExternItem |
-      n = 0 and
-      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
-      nExternItem = nAttr + 1 + max(int i | i = -1 or exists(e.getExternItem(i)) | i) and
-      (
-        none()
-        or
-        result = e.getAttr(index - n) and
-        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
-        or
-        result = e.getExternItem(index - nAttr) and
-        partialPredicateCall = "ExternItem(" + (index - nAttr).toString() + ")"
-      )
-    )
-  }
-
   private Element getImmediateChildOfFormatArgsArg(
     FormatArgsArg e, int index, string partialPredicateCall
   ) {
@@ -209,7 +207,7 @@ private module Impl {
   ) {
     exists(int n, int nGenericArg |
       n = 0 and
-      nGenericArg = n + 1 + max(int i | i = -1 or exists(e.getGenericArg(i)) | i) and
+      nGenericArg = n + e.getNumberOfGenericArgs() and
       (
         none()
         or
@@ -224,7 +222,7 @@ private module Impl {
   ) {
     exists(int n, int nGenericParam |
       n = 0 and
-      nGenericParam = n + 1 + max(int i | i = -1 or exists(e.getGenericParam(i)) | i) and
+      nGenericParam = n + e.getNumberOfGenericParams() and
       (
         none()
         or
@@ -237,8 +235,8 @@ private module Impl {
   private Element getImmediateChildOfItemList(ItemList e, int index, string partialPredicateCall) {
     exists(int n, int nAttr, int nItem |
       n = 0 and
-      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
-      nItem = nAttr + 1 + max(int i | i = -1 or exists(e.getItem(i)) | i) and
+      nAttr = n + e.getNumberOfAttrs() and
+      nItem = nAttr + e.getNumberOfItems() and
       (
         none()
         or
@@ -278,7 +276,7 @@ private module Impl {
   private Element getImmediateChildOfMacroItems(MacroItems e, int index, string partialPredicateCall) {
     exists(int n, int nItem |
       n = 0 and
-      nItem = n + 1 + max(int i | i = -1 or exists(e.getItem(i)) | i) and
+      nItem = n + e.getNumberOfItems() and
       (
         none()
         or
@@ -291,7 +289,7 @@ private module Impl {
   private Element getImmediateChildOfMatchArm(MatchArm e, int index, string partialPredicateCall) {
     exists(int n, int nAttr, int nExpr, int nGuard, int nPat |
       n = 0 and
-      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = n + e.getNumberOfAttrs() and
       nExpr = nAttr + 1 and
       nGuard = nExpr + 1 and
       nPat = nGuard + 1 and
@@ -315,8 +313,8 @@ private module Impl {
   ) {
     exists(int n, int nArm, int nAttr |
       n = 0 and
-      nArm = n + 1 + max(int i | i = -1 or exists(e.getArm(i)) | i) and
-      nAttr = nArm + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nArm = n + e.getNumberOfArms() and
+      nAttr = nArm + e.getNumberOfAttrs() and
       (
         none()
         or
@@ -364,7 +362,7 @@ private module Impl {
   private Element getImmediateChildOfParamList(ParamList e, int index, string partialPredicateCall) {
     exists(int n, int nParam, int nSelfParam |
       n = 0 and
-      nParam = n + 1 + max(int i | i = -1 or exists(e.getParam(i)) | i) and
+      nParam = n + e.getNumberOfParams() and
       nSelfParam = nParam + 1 and
       (
         none()
@@ -382,7 +380,7 @@ private module Impl {
   ) {
     exists(int n, int nTypeArg |
       n = 0 and
-      nTypeArg = n + 1 + max(int i | i = -1 or exists(e.getTypeArg(i)) | i) and
+      nTypeArg = n + e.getNumberOfTypeArgs() and
       (
         none()
         or
@@ -489,8 +487,8 @@ private module Impl {
   private Element getImmediateChildOfSourceFile(SourceFile e, int index, string partialPredicateCall) {
     exists(int n, int nAttr, int nItem |
       n = 0 and
-      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
-      nItem = nAttr + 1 + max(int i | i = -1 or exists(e.getItem(i)) | i) and
+      nAttr = n + e.getNumberOfAttrs() and
+      nItem = nAttr + e.getNumberOfItems() and
       (
         none()
         or
@@ -506,8 +504,8 @@ private module Impl {
   private Element getImmediateChildOfStmtList(StmtList e, int index, string partialPredicateCall) {
     exists(int n, int nAttr, int nStatement, int nTailExpr |
       n = 0 and
-      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
-      nStatement = nAttr + 1 + max(int i | i = -1 or exists(e.getStatement(i)) | i) and
+      nAttr = n + e.getNumberOfAttrs() and
+      nStatement = nAttr + e.getNumberOfStatements() and
       nTailExpr = nStatement + 1 and
       (
         none()
@@ -528,7 +526,7 @@ private module Impl {
   ) {
     exists(int n, int nAttr, int nExpr, int nIdentifier |
       n = 0 and
-      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = n + e.getNumberOfAttrs() and
       nExpr = nAttr + 1 and
       nIdentifier = nExpr + 1 and
       (
@@ -549,8 +547,8 @@ private module Impl {
   ) {
     exists(int n, int nAttr, int nField, int nSpread |
       n = 0 and
-      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
-      nField = nAttr + 1 + max(int i | i = -1 or exists(e.getField(i)) | i) and
+      nAttr = n + e.getNumberOfAttrs() and
+      nField = nAttr + e.getNumberOfFields() and
       nSpread = nField + 1 and
       (
         none()
@@ -571,7 +569,7 @@ private module Impl {
   ) {
     exists(int n, int nAttr, int nDefault, int nName, int nTypeRepr, int nVisibility |
       n = 0 and
-      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = n + e.getNumberOfAttrs() and
       nDefault = nAttr + 1 and
       nName = nDefault + 1 and
       nTypeRepr = nName + 1 and
@@ -598,7 +596,7 @@ private module Impl {
   ) {
     exists(int n, int nAttr, int nIdentifier, int nPat |
       n = 0 and
-      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = n + e.getNumberOfAttrs() and
       nIdentifier = nAttr + 1 and
       nPat = nIdentifier + 1 and
       (
@@ -619,7 +617,7 @@ private module Impl {
   ) {
     exists(int n, int nField, int nRestPat |
       n = 0 and
-      nField = n + 1 + max(int i | i = -1 or exists(e.getField(i)) | i) and
+      nField = n + e.getNumberOfFields() and
       nRestPat = nField + 1 and
       (
         none()
@@ -639,7 +637,7 @@ private module Impl {
   private Element getImmediateChildOfTupleField(TupleField e, int index, string partialPredicateCall) {
     exists(int n, int nAttr, int nTypeRepr, int nVisibility |
       n = 0 and
-      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = n + e.getNumberOfAttrs() and
       nTypeRepr = nAttr + 1 and
       nVisibility = nTypeRepr + 1 and
       (
@@ -656,15 +654,18 @@ private module Impl {
   }
 
   private Element getImmediateChildOfTypeBound(TypeBound e, int index, string partialPredicateCall) {
-    exists(int n, int nLifetime, int nTypeRepr, int nUseBoundGenericArgs |
+    exists(int n, int nForBinder, int nLifetime, int nTypeRepr, int nUseBoundGenericArgs |
       n = 0 and
-      nLifetime = n + 1 and
+      nForBinder = n + 1 and
+      nLifetime = nForBinder + 1 and
       nTypeRepr = nLifetime + 1 and
       nUseBoundGenericArgs = nTypeRepr + 1 and
       (
         none()
         or
-        index = n and result = e.getLifetime() and partialPredicateCall = "Lifetime()"
+        index = n and result = e.getForBinder() and partialPredicateCall = "ForBinder()"
+        or
+        index = nForBinder and result = e.getLifetime() and partialPredicateCall = "Lifetime()"
         or
         index = nLifetime and result = e.getTypeRepr() and partialPredicateCall = "TypeRepr()"
         or
@@ -680,7 +681,7 @@ private module Impl {
   ) {
     exists(int n, int nBound |
       n = 0 and
-      nBound = n + 1 + max(int i | i = -1 or exists(e.getBound(i)) | i) and
+      nBound = n + e.getNumberOfBounds() and
       (
         none()
         or
@@ -695,7 +696,7 @@ private module Impl {
   ) {
     exists(int n, int nUseBoundGenericArg |
       n = 0 and
-      nUseBoundGenericArg = n + 1 + max(int i | i = -1 or exists(e.getUseBoundGenericArg(i)) | i) and
+      nUseBoundGenericArg = n + e.getNumberOfUseBoundGenericArgs() and
       (
         none()
         or
@@ -728,7 +729,7 @@ private module Impl {
   ) {
     exists(int n, int nUseTree |
       n = 0 and
-      nUseTree = n + 1 + max(int i | i = -1 or exists(e.getUseTree(i)) | i) and
+      nUseTree = n + e.getNumberOfUseTrees() and
       (
         none()
         or
@@ -743,7 +744,7 @@ private module Impl {
   ) {
     exists(int n, int nVariant |
       n = 0 and
-      nVariant = n + 1 + max(int i | i = -1 or exists(e.getVariant(i)) | i) and
+      nVariant = n + e.getNumberOfVariants() and
       (
         none()
         or
@@ -770,7 +771,7 @@ private module Impl {
   ) {
     exists(int n, int nPredicate |
       n = 0 and
-      nPredicate = n + 1 + max(int i | i = -1 or exists(e.getPredicate(i)) | i) and
+      nPredicate = n + e.getNumberOfPredicates() and
       (
         none()
         or
@@ -781,22 +782,18 @@ private module Impl {
   }
 
   private Element getImmediateChildOfWherePred(WherePred e, int index, string partialPredicateCall) {
-    exists(int n, int nGenericParamList, int nLifetime, int nTypeRepr, int nTypeBoundList |
+    exists(int n, int nForBinder, int nLifetime, int nTypeRepr, int nTypeBoundList |
       n = 0 and
-      nGenericParamList = n + 1 and
-      nLifetime = nGenericParamList + 1 and
+      nForBinder = n + 1 and
+      nLifetime = nForBinder + 1 and
       nTypeRepr = nLifetime + 1 and
       nTypeBoundList = nTypeRepr + 1 and
       (
         none()
         or
-        index = n and
-        result = e.getGenericParamList() and
-        partialPredicateCall = "GenericParamList()"
+        index = n and result = e.getForBinder() and partialPredicateCall = "ForBinder()"
         or
-        index = nGenericParamList and
-        result = e.getLifetime() and
-        partialPredicateCall = "Lifetime()"
+        index = nForBinder and result = e.getLifetime() and partialPredicateCall = "Lifetime()"
         or
         index = nLifetime and result = e.getTypeRepr() and partialPredicateCall = "TypeRepr()"
         or
@@ -812,8 +809,8 @@ private module Impl {
   ) {
     exists(int n, int nAttr, int nExpr |
       n = 0 and
-      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
-      nExpr = nAttr + 1 + max(int i | i = -1 or exists(e.getExpr(i)) | i) and
+      nAttr = n + e.getNumberOfAttrs() and
+      nExpr = nAttr + e.getNumberOfExprs() and
       (
         none()
         or
@@ -863,27 +860,6 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfAsmExpr(AsmExpr e, int index, string partialPredicateCall) {
-    exists(int n, int nAsmPiece, int nAttr, int nTemplate |
-      n = 0 and
-      nAsmPiece = n + 1 + max(int i | i = -1 or exists(e.getAsmPiece(i)) | i) and
-      nAttr = nAsmPiece + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
-      nTemplate = nAttr + 1 + max(int i | i = -1 or exists(e.getTemplate(i)) | i) and
-      (
-        none()
-        or
-        result = e.getAsmPiece(index - n) and
-        partialPredicateCall = "AsmPiece(" + (index - n).toString() + ")"
-        or
-        result = e.getAttr(index - nAsmPiece) and
-        partialPredicateCall = "Attr(" + (index - nAsmPiece).toString() + ")"
-        or
-        result = e.getTemplate(index - nAttr) and
-        partialPredicateCall = "Template(" + (index - nAttr).toString() + ")"
-      )
-    )
-  }
-
   private Element getImmediateChildOfAsmLabel(AsmLabel e, int index, string partialPredicateCall) {
     exists(int n, int nBlockExpr |
       n = 0 and
@@ -918,7 +894,7 @@ private module Impl {
   ) {
     exists(int n, int nAsmOption |
       n = 0 and
-      nAsmOption = n + 1 + max(int i | i = -1 or exists(e.getAsmOption(i)) | i) and
+      nAsmOption = n + e.getNumberOfAsmOptions() and
       (
         none()
         or
@@ -1015,7 +991,7 @@ private module Impl {
   private Element getImmediateChildOfAwaitExpr(AwaitExpr e, int index, string partialPredicateCall) {
     exists(int n, int nAttr, int nExpr |
       n = 0 and
-      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = n + e.getNumberOfAttrs() and
       nExpr = nAttr + 1 and
       (
         none()
@@ -1031,7 +1007,7 @@ private module Impl {
   private Element getImmediateChildOfBecomeExpr(BecomeExpr e, int index, string partialPredicateCall) {
     exists(int n, int nAttr, int nExpr |
       n = 0 and
-      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = n + e.getNumberOfAttrs() and
       nExpr = nAttr + 1 and
       (
         none()
@@ -1047,7 +1023,7 @@ private module Impl {
   private Element getImmediateChildOfBinaryExpr(BinaryExpr e, int index, string partialPredicateCall) {
     exists(int n, int nAttr, int nLhs, int nRhs |
       n = 0 and
-      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = n + e.getNumberOfAttrs() and
       nLhs = nAttr + 1 and
       nRhs = nLhs + 1 and
       (
@@ -1078,7 +1054,7 @@ private module Impl {
   private Element getImmediateChildOfBreakExpr(BreakExpr e, int index, string partialPredicateCall) {
     exists(int n, int nAttr, int nExpr, int nLifetime |
       n = 0 and
-      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = n + e.getNumberOfAttrs() and
       nExpr = nAttr + 1 and
       nLifetime = nExpr + 1 and
       (
@@ -1097,7 +1073,7 @@ private module Impl {
   private Element getImmediateChildOfCastExpr(CastExpr e, int index, string partialPredicateCall) {
     exists(int n, int nAttr, int nExpr, int nTypeRepr |
       n = 0 and
-      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = n + e.getNumberOfAttrs() and
       nExpr = nAttr + 1 and
       nTypeRepr = nExpr + 1 and
       (
@@ -1116,13 +1092,13 @@ private module Impl {
   private Element getImmediateChildOfClosureExpr(
     ClosureExpr e, int index, string partialPredicateCall
   ) {
-    exists(int n, int nParamList, int nAttr, int nBody, int nClosureBinder, int nRetType |
+    exists(int n, int nParamList, int nAttr, int nClosureBody, int nForBinder, int nRetType |
       n = 0 and
       nParamList = n + 1 and
-      nAttr = nParamList + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
-      nBody = nAttr + 1 and
-      nClosureBinder = nBody + 1 and
-      nRetType = nClosureBinder + 1 and
+      nAttr = nParamList + e.getNumberOfAttrs() and
+      nClosureBody = nAttr + 1 and
+      nForBinder = nClosureBody + 1 and
+      nRetType = nForBinder + 1 and
       (
         none()
         or
@@ -1131,11 +1107,11 @@ private module Impl {
         result = e.getAttr(index - nParamList) and
         partialPredicateCall = "Attr(" + (index - nParamList).toString() + ")"
         or
-        index = nAttr and result = e.getBody() and partialPredicateCall = "Body()"
+        index = nAttr and result = e.getClosureBody() and partialPredicateCall = "ClosureBody()"
         or
-        index = nBody and result = e.getClosureBinder() and partialPredicateCall = "ClosureBinder()"
+        index = nClosureBody and result = e.getForBinder() and partialPredicateCall = "ForBinder()"
         or
-        index = nClosureBinder and result = e.getRetType() and partialPredicateCall = "RetType()"
+        index = nForBinder and result = e.getRetType() and partialPredicateCall = "RetType()"
       )
     )
   }
@@ -1173,7 +1149,7 @@ private module Impl {
   private Element getImmediateChildOfConstParam(ConstParam e, int index, string partialPredicateCall) {
     exists(int n, int nAttr, int nDefaultVal, int nName, int nTypeRepr |
       n = 0 and
-      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = n + e.getNumberOfAttrs() and
       nDefaultVal = nAttr + 1 and
       nName = nDefaultVal + 1 and
       nTypeRepr = nName + 1 and
@@ -1197,7 +1173,7 @@ private module Impl {
   ) {
     exists(int n, int nAttr, int nLifetime |
       n = 0 and
-      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = n + e.getNumberOfAttrs() and
       nLifetime = nAttr + 1 and
       (
         none()
@@ -1239,7 +1215,7 @@ private module Impl {
   private Element getImmediateChildOfFieldExpr(FieldExpr e, int index, string partialPredicateCall) {
     exists(int n, int nAttr, int nContainer, int nIdentifier |
       n = 0 and
-      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = n + e.getNumberOfAttrs() and
       nContainer = nAttr + 1 and
       nIdentifier = nContainer + 1 and
       (
@@ -1278,20 +1254,16 @@ private module Impl {
   private Element getImmediateChildOfForTypeRepr(
     ForTypeRepr e, int index, string partialPredicateCall
   ) {
-    exists(int n, int nGenericParamList, int nTypeRepr |
+    exists(int n, int nForBinder, int nTypeRepr |
       n = 0 and
-      nGenericParamList = n + 1 and
-      nTypeRepr = nGenericParamList + 1 and
+      nForBinder = n + 1 and
+      nTypeRepr = nForBinder + 1 and
       (
         none()
         or
-        index = n and
-        result = e.getGenericParamList() and
-        partialPredicateCall = "GenericParamList()"
+        index = n and result = e.getForBinder() and partialPredicateCall = "ForBinder()"
         or
-        index = nGenericParamList and
-        result = e.getTypeRepr() and
-        partialPredicateCall = "TypeRepr()"
+        index = nForBinder and result = e.getTypeRepr() and partialPredicateCall = "TypeRepr()"
       )
     )
   }
@@ -1301,10 +1273,10 @@ private module Impl {
   ) {
     exists(int n, int nArg, int nAttr, int nTemplate, int nFormat |
       n = 0 and
-      nArg = n + 1 + max(int i | i = -1 or exists(e.getArg(i)) | i) and
-      nAttr = nArg + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nArg = n + e.getNumberOfArgs() and
+      nAttr = nArg + e.getNumberOfAttrs() and
       nTemplate = nAttr + 1 and
-      nFormat = nTemplate + 1 + max(int i | i = -1 or exists(e.getFormat(i)) | i) and
+      nFormat = nTemplate + e.getNumberOfFormats() and
       (
         none()
         or
@@ -1325,7 +1297,7 @@ private module Impl {
   private Element getImmediateChildOfIdentPat(IdentPat e, int index, string partialPredicateCall) {
     exists(int n, int nAttr, int nName, int nPat |
       n = 0 and
-      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = n + e.getNumberOfAttrs() and
       nName = nAttr + 1 and
       nPat = nName + 1 and
       (
@@ -1344,7 +1316,7 @@ private module Impl {
   private Element getImmediateChildOfIfExpr(IfExpr e, int index, string partialPredicateCall) {
     exists(int n, int nAttr, int nCondition, int nElse, int nThen |
       n = 0 and
-      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = n + e.getNumberOfAttrs() and
       nCondition = nAttr + 1 and
       nElse = nCondition + 1 and
       nThen = nElse + 1 and
@@ -1380,7 +1352,7 @@ private module Impl {
   private Element getImmediateChildOfIndexExpr(IndexExpr e, int index, string partialPredicateCall) {
     exists(int n, int nAttr, int nBase, int nIndex |
       n = 0 and
-      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = n + e.getNumberOfAttrs() and
       nBase = nAttr + 1 and
       nIndex = nBase + 1 and
       (
@@ -1405,7 +1377,7 @@ private module Impl {
   private Element getImmediateChildOfLetExpr(LetExpr e, int index, string partialPredicateCall) {
     exists(int n, int nAttr, int nScrutinee, int nPat |
       n = 0 and
-      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = n + e.getNumberOfAttrs() and
       nScrutinee = nAttr + 1 and
       nPat = nScrutinee + 1 and
       (
@@ -1424,7 +1396,7 @@ private module Impl {
   private Element getImmediateChildOfLetStmt(LetStmt e, int index, string partialPredicateCall) {
     exists(int n, int nAttr, int nInitializer, int nLetElse, int nPat, int nTypeRepr |
       n = 0 and
-      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = n + e.getNumberOfAttrs() and
       nInitializer = nAttr + 1 and
       nLetElse = nInitializer + 1 and
       nPat = nLetElse + 1 and
@@ -1469,7 +1441,7 @@ private module Impl {
   ) {
     exists(int n, int nAttr, int nLifetime, int nTypeBoundList |
       n = 0 and
-      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = n + e.getNumberOfAttrs() and
       nLifetime = nAttr + 1 and
       nTypeBoundList = nLifetime + 1 and
       (
@@ -1492,7 +1464,7 @@ private module Impl {
   ) {
     exists(int n, int nAttr |
       n = 0 and
-      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = n + e.getNumberOfAttrs() and
       (
         none()
         or
@@ -1517,17 +1489,17 @@ private module Impl {
   private Element getImmediateChildOfMacroBlockExpr(
     MacroBlockExpr e, int index, string partialPredicateCall
   ) {
-    exists(int n, int nTailExpr, int nStatement |
+    exists(int n, int nStatement, int nTailExpr |
       n = 0 and
-      nTailExpr = n + 1 and
-      nStatement = nTailExpr + 1 + max(int i | i = -1 or exists(e.getStatement(i)) | i) and
+      nStatement = n + e.getNumberOfStatements() and
+      nTailExpr = nStatement + 1 and
       (
         none()
         or
-        index = n and result = e.getTailExpr() and partialPredicateCall = "TailExpr()"
+        result = e.getStatement(index - n) and
+        partialPredicateCall = "Statement(" + (index - n).toString() + ")"
         or
-        result = e.getStatement(index - nTailExpr) and
-        partialPredicateCall = "Statement(" + (index - nTailExpr).toString() + ")"
+        index = nStatement and result = e.getTailExpr() and partialPredicateCall = "TailExpr()"
       )
     )
   }
@@ -1573,7 +1545,7 @@ private module Impl {
   private Element getImmediateChildOfMatchExpr(MatchExpr e, int index, string partialPredicateCall) {
     exists(int n, int nAttr, int nScrutinee, int nMatchArmList |
       n = 0 and
-      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = n + e.getNumberOfAttrs() and
       nScrutinee = nAttr + 1 and
       nMatchArmList = nScrutinee + 1 and
       (
@@ -1606,8 +1578,8 @@ private module Impl {
   ) {
     exists(int n, int nAttr, int nField, int nTypeRepr |
       n = 0 and
-      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
-      nField = nAttr + 1 + max(int i | i = -1 or exists(e.getField(i)) | i) and
+      nAttr = n + e.getNumberOfAttrs() and
+      nField = nAttr + e.getNumberOfFields() and
       nTypeRepr = nField + 1 and
       (
         none()
@@ -1626,7 +1598,7 @@ private module Impl {
   private Element getImmediateChildOfOrPat(OrPat e, int index, string partialPredicateCall) {
     exists(int n, int nPat |
       n = 0 and
-      nPat = n + 1 + max(int i | i = -1 or exists(e.getPat(i)) | i) and
+      nPat = n + e.getNumberOfPats() and
       (
         none()
         or
@@ -1639,7 +1611,7 @@ private module Impl {
   private Element getImmediateChildOfParam(Param e, int index, string partialPredicateCall) {
     exists(int n, int nAttr, int nTypeRepr, int nPat |
       n = 0 and
-      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = n + e.getNumberOfAttrs() and
       nTypeRepr = nAttr + 1 and
       nPat = nTypeRepr + 1 and
       (
@@ -1658,7 +1630,7 @@ private module Impl {
   private Element getImmediateChildOfParenExpr(ParenExpr e, int index, string partialPredicateCall) {
     exists(int n, int nAttr, int nExpr |
       n = 0 and
-      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = n + e.getNumberOfAttrs() and
       nExpr = nAttr + 1 and
       (
         none()
@@ -1697,6 +1669,18 @@ private module Impl {
     )
   }
 
+  private Element getImmediateChildOfPathPat(PathPat e, int index, string partialPredicateCall) {
+    exists(int n, int nPath |
+      n = 0 and
+      nPath = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getPath() and partialPredicateCall = "Path()"
+      )
+    )
+  }
+
   private Element getImmediateChildOfPathTypeRepr(
     PathTypeRepr e, int index, string partialPredicateCall
   ) {
@@ -1714,7 +1698,7 @@ private module Impl {
   private Element getImmediateChildOfPrefixExpr(PrefixExpr e, int index, string partialPredicateCall) {
     exists(int n, int nAttr, int nExpr |
       n = 0 and
-      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = n + e.getNumberOfAttrs() and
       nExpr = nAttr + 1 and
       (
         none()
@@ -1744,7 +1728,7 @@ private module Impl {
   private Element getImmediateChildOfRangeExpr(RangeExpr e, int index, string partialPredicateCall) {
     exists(int n, int nAttr, int nEnd, int nStart |
       n = 0 and
-      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = n + e.getNumberOfAttrs() and
       nEnd = nAttr + 1 and
       nStart = nEnd + 1 and
       (
@@ -1778,7 +1762,7 @@ private module Impl {
   private Element getImmediateChildOfRefExpr(RefExpr e, int index, string partialPredicateCall) {
     exists(int n, int nAttr, int nExpr |
       n = 0 and
-      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = n + e.getNumberOfAttrs() and
       nExpr = nAttr + 1 and
       (
         none()
@@ -1823,7 +1807,7 @@ private module Impl {
   private Element getImmediateChildOfRestPat(RestPat e, int index, string partialPredicateCall) {
     exists(int n, int nAttr |
       n = 0 and
-      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = n + e.getNumberOfAttrs() and
       (
         none()
         or
@@ -1836,7 +1820,7 @@ private module Impl {
   private Element getImmediateChildOfReturnExpr(ReturnExpr e, int index, string partialPredicateCall) {
     exists(int n, int nAttr, int nExpr |
       n = 0 and
-      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = n + e.getNumberOfAttrs() and
       nExpr = nAttr + 1 and
       (
         none()
@@ -1852,7 +1836,7 @@ private module Impl {
   private Element getImmediateChildOfSelfParam(SelfParam e, int index, string partialPredicateCall) {
     exists(int n, int nAttr, int nTypeRepr, int nLifetime, int nName |
       n = 0 and
-      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = n + e.getNumberOfAttrs() and
       nTypeRepr = nAttr + 1 and
       nLifetime = nTypeRepr + 1 and
       nName = nLifetime + 1 and
@@ -1874,7 +1858,7 @@ private module Impl {
   private Element getImmediateChildOfSlicePat(SlicePat e, int index, string partialPredicateCall) {
     exists(int n, int nPat |
       n = 0 and
-      nPat = n + 1 + max(int i | i = -1 or exists(e.getPat(i)) | i) and
+      nPat = n + e.getNumberOfPats() and
       (
         none()
         or
@@ -1898,12 +1882,29 @@ private module Impl {
     )
   }
 
+  private Element getImmediateChildOfStructExpr(StructExpr e, int index, string partialPredicateCall) {
+    exists(int n, int nPath, int nStructExprFieldList |
+      n = 0 and
+      nPath = n + 1 and
+      nStructExprFieldList = nPath + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getPath() and partialPredicateCall = "Path()"
+        or
+        index = nPath and
+        result = e.getStructExprFieldList() and
+        partialPredicateCall = "StructExprFieldList()"
+      )
+    )
+  }
+
   private Element getImmediateChildOfStructFieldList(
     StructFieldList e, int index, string partialPredicateCall
   ) {
     exists(int n, int nField |
       n = 0 and
-      nField = n + 1 + max(int i | i = -1 or exists(e.getField(i)) | i) and
+      nField = n + e.getNumberOfFields() and
       (
         none()
         or
@@ -1913,10 +1914,27 @@ private module Impl {
     )
   }
 
+  private Element getImmediateChildOfStructPat(StructPat e, int index, string partialPredicateCall) {
+    exists(int n, int nPath, int nStructPatFieldList |
+      n = 0 and
+      nPath = n + 1 and
+      nStructPatFieldList = nPath + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getPath() and partialPredicateCall = "Path()"
+        or
+        index = nPath and
+        result = e.getStructPatFieldList() and
+        partialPredicateCall = "StructPatFieldList()"
+      )
+    )
+  }
+
   private Element getImmediateChildOfTryExpr(TryExpr e, int index, string partialPredicateCall) {
     exists(int n, int nAttr, int nExpr |
       n = 0 and
-      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = n + e.getNumberOfAttrs() and
       nExpr = nAttr + 1 and
       (
         none()
@@ -1932,8 +1950,8 @@ private module Impl {
   private Element getImmediateChildOfTupleExpr(TupleExpr e, int index, string partialPredicateCall) {
     exists(int n, int nAttr, int nField |
       n = 0 and
-      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
-      nField = nAttr + 1 + max(int i | i = -1 or exists(e.getField(i)) | i) and
+      nAttr = n + e.getNumberOfAttrs() and
+      nField = nAttr + e.getNumberOfFields() and
       (
         none()
         or
@@ -1951,7 +1969,7 @@ private module Impl {
   ) {
     exists(int n, int nField |
       n = 0 and
-      nField = n + 1 + max(int i | i = -1 or exists(e.getField(i)) | i) and
+      nField = n + e.getNumberOfFields() and
       (
         none()
         or
@@ -1964,7 +1982,7 @@ private module Impl {
   private Element getImmediateChildOfTuplePat(TuplePat e, int index, string partialPredicateCall) {
     exists(int n, int nField |
       n = 0 and
-      nField = n + 1 + max(int i | i = -1 or exists(e.getField(i)) | i) and
+      nField = n + e.getNumberOfFields() and
       (
         none()
         or
@@ -1974,12 +1992,30 @@ private module Impl {
     )
   }
 
+  private Element getImmediateChildOfTupleStructPat(
+    TupleStructPat e, int index, string partialPredicateCall
+  ) {
+    exists(int n, int nPath, int nField |
+      n = 0 and
+      nPath = n + 1 and
+      nField = nPath + e.getNumberOfFields() and
+      (
+        none()
+        or
+        index = n and result = e.getPath() and partialPredicateCall = "Path()"
+        or
+        result = e.getField(index - nPath) and
+        partialPredicateCall = "Field(" + (index - nPath).toString() + ")"
+      )
+    )
+  }
+
   private Element getImmediateChildOfTupleTypeRepr(
     TupleTypeRepr e, int index, string partialPredicateCall
   ) {
     exists(int n, int nField |
       n = 0 and
-      nField = n + 1 + max(int i | i = -1 or exists(e.getField(i)) | i) and
+      nField = n + e.getNumberOfFields() and
       (
         none()
         or
@@ -2004,7 +2040,7 @@ private module Impl {
   private Element getImmediateChildOfTypeParam(TypeParam e, int index, string partialPredicateCall) {
     exists(int n, int nAttr, int nDefaultType, int nName, int nTypeBoundList |
       n = 0 and
-      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = n + e.getNumberOfAttrs() and
       nDefaultType = nAttr + 1 and
       nName = nDefaultType + 1 and
       nTypeBoundList = nName + 1 and
@@ -2028,7 +2064,7 @@ private module Impl {
   ) {
     exists(int n, int nAttr |
       n = 0 and
-      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = n + e.getNumberOfAttrs() and
       (
         none()
         or
@@ -2041,7 +2077,7 @@ private module Impl {
   private Element getImmediateChildOfVariant(Variant e, int index, string partialPredicateCall) {
     exists(int n, int nAttr, int nDiscriminant, int nFieldList, int nName, int nVisibility |
       n = 0 and
-      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = n + e.getNumberOfAttrs() and
       nDiscriminant = nAttr + 1 and
       nFieldList = nDiscriminant + 1 and
       nName = nFieldList + 1 and
@@ -2072,7 +2108,7 @@ private module Impl {
   private Element getImmediateChildOfYeetExpr(YeetExpr e, int index, string partialPredicateCall) {
     exists(int n, int nAttr, int nExpr |
       n = 0 and
-      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = n + e.getNumberOfAttrs() and
       nExpr = nAttr + 1 and
       (
         none()
@@ -2088,7 +2124,7 @@ private module Impl {
   private Element getImmediateChildOfYieldExpr(YieldExpr e, int index, string partialPredicateCall) {
     exists(int n, int nAttr, int nExpr |
       n = 0 and
-      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = n + e.getNumberOfAttrs() and
       nExpr = nAttr + 1 and
       (
         none()
@@ -2106,8 +2142,8 @@ private module Impl {
   ) {
     exists(int n, int nExpr, int nAttr |
       n = 0 and
-      nExpr = n + 1 + max(int i | i = -1 or exists(e.getExpr(i)) | i) and
-      nAttr = nExpr + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nExpr = n + e.getNumberOfExprs() and
+      nAttr = nExpr + e.getNumberOfAttrs() and
       (
         none()
         or
@@ -2125,8 +2161,8 @@ private module Impl {
   ) {
     exists(int n, int nExpr, int nAttr, int nRepeatOperand, int nRepeatLength |
       n = 0 and
-      nExpr = n + 1 + max(int i | i = -1 or exists(e.getExpr(i)) | i) and
-      nAttr = nExpr + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nExpr = n + e.getNumberOfExprs() and
+      nAttr = nExpr + e.getNumberOfAttrs() and
       nRepeatOperand = nAttr + 1 and
       nRepeatLength = nRepeatOperand + 1 and
       (
@@ -2147,11 +2183,37 @@ private module Impl {
     )
   }
 
+  private Element getImmediateChildOfAsmExpr(AsmExpr e, int index, string partialPredicateCall) {
+    exists(int n, int nAttributeMacroExpansion, int nAsmPiece, int nAttr, int nTemplate |
+      n = 0 and
+      nAttributeMacroExpansion = n + 1 and
+      nAsmPiece = nAttributeMacroExpansion + e.getNumberOfAsmPieces() and
+      nAttr = nAsmPiece + e.getNumberOfAttrs() and
+      nTemplate = nAttr + e.getNumberOfTemplates() and
+      (
+        none()
+        or
+        index = n and
+        result = e.getAttributeMacroExpansion() and
+        partialPredicateCall = "AttributeMacroExpansion()"
+        or
+        result = e.getAsmPiece(index - nAttributeMacroExpansion) and
+        partialPredicateCall = "AsmPiece(" + (index - nAttributeMacroExpansion).toString() + ")"
+        or
+        result = e.getAttr(index - nAsmPiece) and
+        partialPredicateCall = "Attr(" + (index - nAsmPiece).toString() + ")"
+        or
+        result = e.getTemplate(index - nAttr) and
+        partialPredicateCall = "Template(" + (index - nAttr).toString() + ")"
+      )
+    )
+  }
+
   private Element getImmediateChildOfBlockExpr(BlockExpr e, int index, string partialPredicateCall) {
     exists(int n, int nLabel, int nAttr, int nStmtList |
       n = 0 and
       nLabel = n + 1 and
-      nAttr = nLabel + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = nLabel + e.getNumberOfAttrs() and
       nStmtList = nAttr + 1 and
       (
         none()
@@ -2170,7 +2232,7 @@ private module Impl {
     exists(int n, int nArgList, int nAttr, int nFunction |
       n = 0 and
       nArgList = n + 1 and
-      nAttr = nArgList + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = nArgList + e.getNumberOfAttrs() and
       nFunction = nAttr + 1 and
       (
         none()
@@ -2192,7 +2254,7 @@ private module Impl {
       n = 0 and
       nAttributeMacroExpansion = n + 1 and
       nAbi = nAttributeMacroExpansion + 1 and
-      nAttr = nAbi + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = nAbi + e.getNumberOfAttrs() and
       nExternItemList = nAttr + 1 and
       (
         none()
@@ -2221,7 +2283,7 @@ private module Impl {
     |
       n = 0 and
       nAttributeMacroExpansion = n + 1 and
-      nAttr = nAttributeMacroExpansion + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = nAttributeMacroExpansion + e.getNumberOfAttrs() and
       nIdentifier = nAttr + 1 and
       nRename = nIdentifier + 1 and
       nVisibility = nRename + 1 and
@@ -2258,7 +2320,7 @@ private module Impl {
       n = 0 and
       nAttributeMacroExpansion = n + 1 and
       nAssocItemList = nAttributeMacroExpansion + 1 and
-      nAttr = nAssocItemList + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = nAssocItemList + e.getNumberOfAttrs() and
       nGenericParamList = nAttr + 1 and
       nSelfTy = nGenericParamList + 1 and
       nTrait = nSelfTy + 1 and
@@ -2303,7 +2365,7 @@ private module Impl {
       n = 0 and
       nAttributeMacroExpansion = n + 1 and
       nArgs = nAttributeMacroExpansion + 1 and
-      nAttr = nArgs + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = nArgs + e.getNumberOfAttrs() and
       nBody = nAttr + 1 and
       nName = nBody + 1 and
       nVisibility = nName + 1 and
@@ -2336,7 +2398,7 @@ private module Impl {
     |
       n = 0 and
       nAttributeMacroExpansion = n + 1 and
-      nAttr = nAttributeMacroExpansion + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = nAttributeMacroExpansion + e.getNumberOfAttrs() and
       nName = nAttr + 1 and
       nTokenTree = nName + 1 and
       nVisibility = nTokenTree + 1 and
@@ -2365,7 +2427,7 @@ private module Impl {
     exists(int n, int nArgList, int nAttr, int nGenericArgList, int nIdentifier, int nReceiver |
       n = 0 and
       nArgList = n + 1 and
-      nAttr = nArgList + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = nArgList + e.getNumberOfAttrs() and
       nGenericArgList = nAttr + 1 and
       nIdentifier = nGenericArgList + 1 and
       nReceiver = nIdentifier + 1 and
@@ -2396,7 +2458,7 @@ private module Impl {
     |
       n = 0 and
       nAttributeMacroExpansion = n + 1 and
-      nAttr = nAttributeMacroExpansion + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = nAttributeMacroExpansion + e.getNumberOfAttrs() and
       nItemList = nAttr + 1 and
       nName = nItemList + 1 and
       nVisibility = nName + 1 and
@@ -2423,7 +2485,7 @@ private module Impl {
     exists(int n, int nPath, int nAttr |
       n = 0 and
       nPath = n + 1 and
-      nAttr = nPath + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = nPath + e.getNumberOfAttrs() and
       (
         none()
         or
@@ -2435,52 +2497,6 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfPathPat(PathPat e, int index, string partialPredicateCall) {
-    exists(int n, int nPath |
-      n = 0 and
-      nPath = n + 1 and
-      (
-        none()
-        or
-        index = n and result = e.getPath() and partialPredicateCall = "Path()"
-      )
-    )
-  }
-
-  private Element getImmediateChildOfStructExpr(StructExpr e, int index, string partialPredicateCall) {
-    exists(int n, int nPath, int nStructExprFieldList |
-      n = 0 and
-      nPath = n + 1 and
-      nStructExprFieldList = nPath + 1 and
-      (
-        none()
-        or
-        index = n and result = e.getPath() and partialPredicateCall = "Path()"
-        or
-        index = nPath and
-        result = e.getStructExprFieldList() and
-        partialPredicateCall = "StructExprFieldList()"
-      )
-    )
-  }
-
-  private Element getImmediateChildOfStructPat(StructPat e, int index, string partialPredicateCall) {
-    exists(int n, int nPath, int nStructPatFieldList |
-      n = 0 and
-      nPath = n + 1 and
-      nStructPatFieldList = nPath + 1 and
-      (
-        none()
-        or
-        index = n and result = e.getPath() and partialPredicateCall = "Path()"
-        or
-        index = nPath and
-        result = e.getStructPatFieldList() and
-        partialPredicateCall = "StructPatFieldList()"
-      )
-    )
-  }
-
   private Element getImmediateChildOfTrait(Trait e, int index, string partialPredicateCall) {
     exists(
       int n, int nAttributeMacroExpansion, int nAssocItemList, int nAttr, int nGenericParamList,
@@ -2489,7 +2505,7 @@ private module Impl {
       n = 0 and
       nAttributeMacroExpansion = n + 1 and
       nAssocItemList = nAttributeMacroExpansion + 1 and
-      nAttr = nAssocItemList + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = nAssocItemList + e.getNumberOfAttrs() and
       nGenericParamList = nAttr + 1 and
       nName = nGenericParamList + 1 and
       nTypeBoundList = nName + 1 and
@@ -2535,7 +2551,7 @@ private module Impl {
     |
       n = 0 and
       nAttributeMacroExpansion = n + 1 and
-      nAttr = nAttributeMacroExpansion + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = nAttributeMacroExpansion + e.getNumberOfAttrs() and
       nGenericParamList = nAttr + 1 and
       nName = nGenericParamList + 1 and
       nTypeBoundList = nName + 1 and
@@ -2570,29 +2586,11 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfTupleStructPat(
-    TupleStructPat e, int index, string partialPredicateCall
-  ) {
-    exists(int n, int nPath, int nField |
-      n = 0 and
-      nPath = n + 1 and
-      nField = nPath + 1 + max(int i | i = -1 or exists(e.getField(i)) | i) and
-      (
-        none()
-        or
-        index = n and result = e.getPath() and partialPredicateCall = "Path()"
-        or
-        result = e.getField(index - nPath) and
-        partialPredicateCall = "Field(" + (index - nPath).toString() + ")"
-      )
-    )
-  }
-
   private Element getImmediateChildOfUse(Use e, int index, string partialPredicateCall) {
     exists(int n, int nAttributeMacroExpansion, int nAttr, int nUseTree, int nVisibility |
       n = 0 and
       nAttributeMacroExpansion = n + 1 and
-      nAttr = nAttributeMacroExpansion + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = nAttributeMacroExpansion + e.getNumberOfAttrs() and
       nUseTree = nAttr + 1 and
       nVisibility = nUseTree + 1 and
       (
@@ -2619,7 +2617,7 @@ private module Impl {
     |
       n = 0 and
       nAttributeMacroExpansion = n + 1 and
-      nAttr = nAttributeMacroExpansion + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = nAttributeMacroExpansion + e.getNumberOfAttrs() and
       nBody = nAttr + 1 and
       nGenericParamList = nBody + 1 and
       nName = nGenericParamList + 1 and
@@ -2662,10 +2660,8 @@ private module Impl {
     |
       n = 0 and
       nAttributeMacroExpansion = n + 1 and
-      nDeriveMacroExpansion =
-        nAttributeMacroExpansion + 1 +
-          max(int i | i = -1 or exists(e.getDeriveMacroExpansion(i)) | i) and
-      nAttr = nDeriveMacroExpansion + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nDeriveMacroExpansion = nAttributeMacroExpansion + e.getNumberOfDeriveMacroExpansions() and
+      nAttr = nDeriveMacroExpansion + e.getNumberOfAttrs() and
       nGenericParamList = nAttr + 1 and
       nName = nGenericParamList + 1 and
       nVariantList = nName + 1 and
@@ -2709,7 +2705,7 @@ private module Impl {
       n = 0 and
       nLabel = n + 1 and
       nLoopBody = nLabel + 1 and
-      nAttr = nLoopBody + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = nLoopBody + e.getNumberOfAttrs() and
       nIterable = nAttr + 1 and
       nPat = nIterable + 1 and
       (
@@ -2731,16 +2727,16 @@ private module Impl {
 
   private Element getImmediateChildOfFunction(Function e, int index, string partialPredicateCall) {
     exists(
-      int n, int nAttributeMacroExpansion, int nParamList, int nAttr, int nAbi, int nBody,
+      int n, int nAttributeMacroExpansion, int nParamList, int nAttr, int nAbi, int nFunctionBody,
       int nGenericParamList, int nName, int nRetType, int nVisibility, int nWhereClause
     |
       n = 0 and
       nAttributeMacroExpansion = n + 1 and
       nParamList = nAttributeMacroExpansion + 1 and
-      nAttr = nParamList + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = nParamList + e.getNumberOfAttrs() and
       nAbi = nAttr + 1 and
-      nBody = nAbi + 1 and
-      nGenericParamList = nBody + 1 and
+      nFunctionBody = nAbi + 1 and
+      nGenericParamList = nFunctionBody + 1 and
       nName = nGenericParamList + 1 and
       nRetType = nName + 1 and
       nVisibility = nRetType + 1 and
@@ -2761,9 +2757,9 @@ private module Impl {
         or
         index = nAttr and result = e.getAbi() and partialPredicateCall = "Abi()"
         or
-        index = nAbi and result = e.getBody() and partialPredicateCall = "Body()"
+        index = nAbi and result = e.getFunctionBody() and partialPredicateCall = "FunctionBody()"
         or
-        index = nBody and
+        index = nFunctionBody and
         result = e.getGenericParamList() and
         partialPredicateCall = "GenericParamList()"
         or
@@ -2785,7 +2781,7 @@ private module Impl {
       n = 0 and
       nLabel = n + 1 and
       nLoopBody = nLabel + 1 and
-      nAttr = nLoopBody + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = nLoopBody + e.getNumberOfAttrs() and
       (
         none()
         or
@@ -2806,7 +2802,7 @@ private module Impl {
     |
       n = 0 and
       nAttributeMacroExpansion = n + 1 and
-      nAttr = nAttributeMacroExpansion + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = nAttributeMacroExpansion + e.getNumberOfAttrs() and
       nPath = nAttr + 1 and
       nTokenTree = nPath + 1 and
       nMacroCallExpansion = nTokenTree + 1 and
@@ -2838,7 +2834,7 @@ private module Impl {
     |
       n = 0 and
       nAttributeMacroExpansion = n + 1 and
-      nAttr = nAttributeMacroExpansion + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = nAttributeMacroExpansion + e.getNumberOfAttrs() and
       nBody = nAttr + 1 and
       nName = nBody + 1 and
       nTypeRepr = nName + 1 and
@@ -2871,10 +2867,8 @@ private module Impl {
     |
       n = 0 and
       nAttributeMacroExpansion = n + 1 and
-      nDeriveMacroExpansion =
-        nAttributeMacroExpansion + 1 +
-          max(int i | i = -1 or exists(e.getDeriveMacroExpansion(i)) | i) and
-      nAttr = nDeriveMacroExpansion + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nDeriveMacroExpansion = nAttributeMacroExpansion + e.getNumberOfDeriveMacroExpansions() and
+      nAttr = nDeriveMacroExpansion + e.getNumberOfAttrs() and
       nFieldList = nAttr + 1 and
       nGenericParamList = nFieldList + 1 and
       nName = nGenericParamList + 1 and
@@ -2918,7 +2912,7 @@ private module Impl {
     |
       n = 0 and
       nAttributeMacroExpansion = n + 1 and
-      nAttr = nAttributeMacroExpansion + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = nAttributeMacroExpansion + e.getNumberOfAttrs() and
       nGenericParamList = nAttr + 1 and
       nName = nGenericParamList + 1 and
       nTypeRepr = nName + 1 and
@@ -2965,10 +2959,8 @@ private module Impl {
     |
       n = 0 and
       nAttributeMacroExpansion = n + 1 and
-      nDeriveMacroExpansion =
-        nAttributeMacroExpansion + 1 +
-          max(int i | i = -1 or exists(e.getDeriveMacroExpansion(i)) | i) and
-      nAttr = nDeriveMacroExpansion + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nDeriveMacroExpansion = nAttributeMacroExpansion + e.getNumberOfDeriveMacroExpansions() and
+      nAttr = nDeriveMacroExpansion + e.getNumberOfAttrs() and
       nGenericParamList = nAttr + 1 and
       nName = nGenericParamList + 1 and
       nStructFieldList = nName + 1 and
@@ -3014,7 +3006,7 @@ private module Impl {
       n = 0 and
       nLabel = n + 1 and
       nLoopBody = nLabel + 1 and
-      nAttr = nLoopBody + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nAttr = nLoopBody + e.getNumberOfAttrs() and
       nCondition = nAttr + 1 and
       (
         none()
@@ -3067,10 +3059,10 @@ private module Impl {
     or
     result = getImmediateChildOfAttr(e, index, partialAccessor)
     or
-    result = getImmediateChildOfClosureBinder(e, index, partialAccessor)
-    or
     result = getImmediateChildOfExternItemList(e, index, partialAccessor)
     or
+    result = getImmediateChildOfForBinder(e, index, partialAccessor)
+    or
     result = getImmediateChildOfFormatArgsArg(e, index, partialAccessor)
     or
     result = getImmediateChildOfGenericArgList(e, index, partialAccessor)
@@ -3153,8 +3145,6 @@ private module Impl {
     or
     result = getImmediateChildOfAsmConst(e, index, partialAccessor)
     or
-    result = getImmediateChildOfAsmExpr(e, index, partialAccessor)
-    or
     result = getImmediateChildOfAsmLabel(e, index, partialAccessor)
     or
     result = getImmediateChildOfAsmOperandNamed(e, index, partialAccessor)
@@ -3253,6 +3243,8 @@ private module Impl {
     or
     result = getImmediateChildOfParenTypeRepr(e, index, partialAccessor)
     or
+    result = getImmediateChildOfPathPat(e, index, partialAccessor)
+    or
     result = getImmediateChildOfPathTypeRepr(e, index, partialAccessor)
     or
     result = getImmediateChildOfPrefixExpr(e, index, partialAccessor)
@@ -3279,8 +3271,12 @@ private module Impl {
     or
     result = getImmediateChildOfSliceTypeRepr(e, index, partialAccessor)
     or
+    result = getImmediateChildOfStructExpr(e, index, partialAccessor)
+    or
     result = getImmediateChildOfStructFieldList(e, index, partialAccessor)
     or
+    result = getImmediateChildOfStructPat(e, index, partialAccessor)
+    or
     result = getImmediateChildOfTryExpr(e, index, partialAccessor)
     or
     result = getImmediateChildOfTupleExpr(e, index, partialAccessor)
@@ -3289,6 +3285,8 @@ private module Impl {
     or
     result = getImmediateChildOfTuplePat(e, index, partialAccessor)
     or
+    result = getImmediateChildOfTupleStructPat(e, index, partialAccessor)
+    or
     result = getImmediateChildOfTupleTypeRepr(e, index, partialAccessor)
     or
     result = getImmediateChildOfTypeArg(e, index, partialAccessor)
@@ -3309,6 +3307,8 @@ private module Impl {
     or
     result = getImmediateChildOfArrayRepeatExpr(e, index, partialAccessor)
     or
+    result = getImmediateChildOfAsmExpr(e, index, partialAccessor)
+    or
     result = getImmediateChildOfBlockExpr(e, index, partialAccessor)
     or
     result = getImmediateChildOfCallExpr(e, index, partialAccessor)
@@ -3331,18 +3331,10 @@ private module Impl {
     or
     result = getImmediateChildOfPathExpr(e, index, partialAccessor)
     or
-    result = getImmediateChildOfPathPat(e, index, partialAccessor)
-    or
-    result = getImmediateChildOfStructExpr(e, index, partialAccessor)
-    or
-    result = getImmediateChildOfStructPat(e, index, partialAccessor)
-    or
     result = getImmediateChildOfTrait(e, index, partialAccessor)
     or
     result = getImmediateChildOfTraitAlias(e, index, partialAccessor)
     or
-    result = getImmediateChildOfTupleStructPat(e, index, partialAccessor)
-    or
     result = getImmediateChildOfUse(e, index, partialAccessor)
     or
     result = getImmediateChildOfConst(e, index, partialAccessor)
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/PathAstNode.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/PathAstNode.qll
index a69957e7545..b250b94ef9a 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/PathAstNode.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/PathAstNode.qll
@@ -6,8 +6,8 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
 import codeql.rust.elements.Path
-import codeql.rust.elements.internal.ResolvableImpl::Impl as ResolvableImpl
 
 /**
  * INTERNAL: This module contains the fully generated definition of `PathAstNode` and should not
@@ -19,7 +19,7 @@ module Generated {
    * INTERNAL: Do not reference the `Generated::PathAstNode` class directly.
    * Use the subclass `PathAstNode`, where the following predicates are available.
    */
-  class PathAstNode extends Synth::TPathAstNode, ResolvableImpl::Resolvable {
+  class PathAstNode extends Synth::TPathAstNode, AstNodeImpl::AstNode {
     /**
      * Gets the path of this path ast node, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll
index a8e526e5263..aff81e9b9ab 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll
@@ -34,6 +34,8 @@ module Raw {
     int getDurationMs() { extractor_steps(this, _, result) }
   }
 
+  private Element getImmediateChildOfExtractorStep(ExtractorStep e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -56,6 +58,8 @@ module Raw {
     Crate getCrate() { named_crates(this, _, result) }
   }
 
+  private Element getImmediateChildOfNamedCrate(NamedCrate e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    * The base class marking everything that was not properly extracted for some reason, such as:
@@ -91,12 +95,27 @@ module Raw {
      */
     string getCfgOption(int index) { crate_cfg_options(this, index, result) }
 
+    /**
+     * Gets the number of cfg options of this crate.
+     */
+    int getNumberOfCfgOptions() { result = count(int i | crate_cfg_options(this, i, _)) }
+
     /**
      * Gets the `index`th named dependency of this crate (0-based).
      */
     NamedCrate getNamedDependency(int index) { crate_named_dependencies(this, index, result) }
+
+    /**
+     * Gets the number of named dependencies of this crate.
+     * INTERNAL: Do not use.
+     */
+    int getNumberOfNamedDependencies() {
+      result = count(int i | crate_named_dependencies(this, i, _))
+    }
   }
 
+  private Element getImmediateChildOfCrate(Crate e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    * The base class marking errors during parsing or resolution.
@@ -105,6 +124,8 @@ module Raw {
     override string toString() { result = "Missing" }
   }
 
+  private Element getImmediateChildOfMissing(Missing e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    * The base class for unimplemented nodes. This is used to mark nodes that are not yet extracted.
@@ -113,6 +134,8 @@ module Raw {
     override string toString() { result = "Unimplemented" }
   }
 
+  private Element getImmediateChildOfUnimplemented(Unimplemented e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    * An ABI specification for an extern function or block.
@@ -132,29 +155,15 @@ module Raw {
     string getAbiString() { abi_abi_strings(this, result) }
   }
 
+  private Element getImmediateChildOfAbi(Abi e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    * Something that can be addressed by a path.
    *
    * TODO: This does not yet include all possible cases.
    */
-  class Addressable extends @addressable, AstNode {
-    /**
-     * Gets the extended canonical path of this addressable, if it exists.
-     *
-     * Either a canonical path (see https://doc.rust-lang.org/reference/paths.html#canonical-paths),
-     * or `{<block id>}::name` for addressable items defined in an anonymous block (and only
-     * addressable there-in).
-     */
-    string getExtendedCanonicalPath() { addressable_extended_canonical_paths(this, result) }
-
-    /**
-     * Gets the crate origin of this addressable, if it exists.
-     *
-     * One of `rustc:<name>`, `repo:<repository>:<name>` or `lang:<name>`.
-     */
-    string getCrateOrigin() { addressable_crate_origins(this, result) }
-  }
+  class Addressable extends @addressable, AstNode { }
 
   /**
    * INTERNAL: Do not use.
@@ -173,6 +182,23 @@ module Raw {
      * Gets the `index`th argument of this argument list (0-based).
      */
     Expr getArg(int index) { arg_list_args(this, index, result) }
+
+    /**
+     * Gets the number of arguments of this argument list.
+     */
+    int getNumberOfArgs() { result = count(int i | arg_list_args(this, i, _)) }
+  }
+
+  private Element getImmediateChildOfArgList(ArgList e, int index) {
+    exists(int n, int nArg |
+      n = 0 and
+      nArg = n + e.getNumberOfArgs() and
+      (
+        none()
+        or
+        result = e.getArg(index - n)
+      )
+    )
   }
 
   /**
@@ -190,6 +216,8 @@ module Raw {
     override string toString() { result = "AsmDirSpec" }
   }
 
+  private Element getImmediateChildOfAsmDirSpec(AsmDirSpec e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -220,6 +248,21 @@ module Raw {
     Expr getOutExpr() { asm_operand_expr_out_exprs(this, result) }
   }
 
+  private Element getImmediateChildOfAsmOperandExpr(AsmOperandExpr e, int index) {
+    exists(int n, int nInExpr, int nOutExpr |
+      n = 0 and
+      nInExpr = n + 1 and
+      nOutExpr = nInExpr + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getInExpr()
+        or
+        index = nInExpr and result = e.getOutExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * An option in an inline assembly block.
@@ -240,6 +283,8 @@ module Raw {
     predicate isRaw() { asm_option_is_raw(this) }
   }
 
+  private Element getImmediateChildOfAsmOption(AsmOption e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -265,6 +310,18 @@ module Raw {
     NameRef getIdentifier() { asm_reg_spec_identifiers(this, result) }
   }
 
+  private Element getImmediateChildOfAsmRegSpec(AsmRegSpec e, int index) {
+    exists(int n, int nIdentifier |
+      n = 0 and
+      nIdentifier = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getIdentifier()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A list of `AssocItem` elements, as appearing in a `Trait` or `Impl`.
@@ -277,10 +334,35 @@ module Raw {
      */
     AssocItem getAssocItem(int index) { assoc_item_list_assoc_items(this, index, result) }
 
+    /**
+     * Gets the number of assoc items of this assoc item list.
+     */
+    int getNumberOfAssocItems() { result = count(int i | assoc_item_list_assoc_items(this, i, _)) }
+
     /**
      * Gets the `index`th attr of this assoc item list (0-based).
      */
     Attr getAttr(int index) { assoc_item_list_attrs(this, index, result) }
+
+    /**
+     * Gets the number of attrs of this assoc item list.
+     */
+    int getNumberOfAttrs() { result = count(int i | assoc_item_list_attrs(this, i, _)) }
+  }
+
+  private Element getImmediateChildOfAssocItemList(AssocItemList e, int index) {
+    exists(int n, int nAssocItem, int nAttr |
+      n = 0 and
+      nAssocItem = n + e.getNumberOfAssocItems() and
+      nAttr = nAssocItem + e.getNumberOfAttrs() and
+      (
+        none()
+        or
+        result = e.getAssocItem(index - n)
+        or
+        result = e.getAttr(index - nAssocItem)
+      )
+    )
   }
 
   /**
@@ -303,6 +385,18 @@ module Raw {
     Meta getMeta() { attr_meta(this, result) }
   }
 
+  private Element getImmediateChildOfAttr(Attr e, int index) {
+    exists(int n, int nMeta |
+      n = 0 and
+      nMeta = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getMeta()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A callable. Either a `Function` or a `ClosureExpr`.
@@ -317,30 +411,11 @@ module Raw {
      * Gets the `index`th attr of this callable (0-based).
      */
     Attr getAttr(int index) { callable_attrs(this, index, result) }
-  }
-
-  /**
-   * INTERNAL: Do not use.
-   * A closure binder, specifying lifetime or type parameters for a closure.
-   *
-   * For example:
-   * ```rust
-   * let print_any = for<T: std::fmt::Debug> |x: T| {
-   * //              ^^^^^^^^^^^^^^^^^^^^^^^
-   *     println!("{:?}", x);
-   * };
-   *
-   * print_any(42);
-   * print_any("hello");
-   * ```
-   */
-  class ClosureBinder extends @closure_binder, AstNode {
-    override string toString() { result = "ClosureBinder" }
 
     /**
-     * Gets the generic parameter list of this closure binder, if it exists.
+     * Gets the number of attrs of this callable.
      */
-    GenericParamList getGenericParamList() { closure_binder_generic_param_lists(this, result) }
+    int getNumberOfAttrs() { result = count(int i | callable_attrs(this, i, _)) }
   }
 
   /**
@@ -369,10 +444,37 @@ module Raw {
      */
     Attr getAttr(int index) { extern_item_list_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this extern item list.
+     */
+    int getNumberOfAttrs() { result = count(int i | extern_item_list_attrs(this, i, _)) }
+
     /**
      * Gets the `index`th extern item of this extern item list (0-based).
      */
     ExternItem getExternItem(int index) { extern_item_list_extern_items(this, index, result) }
+
+    /**
+     * Gets the number of extern items of this extern item list.
+     */
+    int getNumberOfExternItems() {
+      result = count(int i | extern_item_list_extern_items(this, i, _))
+    }
+  }
+
+  private Element getImmediateChildOfExternItemList(ExternItemList e, int index) {
+    exists(int n, int nAttr, int nExternItem |
+      n = 0 and
+      nAttr = n + e.getNumberOfAttrs() and
+      nExternItem = nAttr + e.getNumberOfExternItems() and
+      (
+        none()
+        or
+        result = e.getAttr(index - n)
+        or
+        result = e.getExternItem(index - nAttr)
+      )
+    )
   }
 
   /**
@@ -389,6 +491,42 @@ module Raw {
    */
   class FieldList extends @field_list, AstNode { }
 
+  /**
+   * INTERNAL: Do not use.
+   * A for binder, specifying lifetime or type parameters for a closure or a type.
+   *
+   * For example:
+   * ```rust
+   * let print_any = for<T: std::fmt::Debug> |x: T| {
+   * //              ^^^^^^^^^^^^^^^^^^^^^^^
+   *     println!("{:?}", x);
+   * };
+   *
+   * print_any(42);
+   * print_any("hello");
+   * ```
+   */
+  class ForBinder extends @for_binder, AstNode {
+    override string toString() { result = "ForBinder" }
+
+    /**
+     * Gets the generic parameter list of this for binder, if it exists.
+     */
+    GenericParamList getGenericParamList() { for_binder_generic_param_lists(this, result) }
+  }
+
+  private Element getImmediateChildOfForBinder(ForBinder e, int index) {
+    exists(int n, int nGenericParamList |
+      n = 0 and
+      nGenericParamList = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getGenericParamList()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A FormatArgsArg. For example the `"world"` in:
@@ -410,6 +548,21 @@ module Raw {
     Name getName() { format_args_arg_names(this, result) }
   }
 
+  private Element getImmediateChildOfFormatArgsArg(FormatArgsArg e, int index) {
+    exists(int n, int nExpr, int nName |
+      n = 0 and
+      nExpr = n + 1 and
+      nName = nExpr + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getExpr()
+        or
+        index = nExpr and result = e.getName()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A generic argument in a generic argument list.
@@ -436,6 +589,25 @@ module Raw {
      * Gets the `index`th generic argument of this generic argument list (0-based).
      */
     GenericArg getGenericArg(int index) { generic_arg_list_generic_args(this, index, result) }
+
+    /**
+     * Gets the number of generic arguments of this generic argument list.
+     */
+    int getNumberOfGenericArgs() {
+      result = count(int i | generic_arg_list_generic_args(this, i, _))
+    }
+  }
+
+  private Element getImmediateChildOfGenericArgList(GenericArgList e, int index) {
+    exists(int n, int nGenericArg |
+      n = 0 and
+      nGenericArg = n + e.getNumberOfGenericArgs() and
+      (
+        none()
+        or
+        result = e.getGenericArg(index - n)
+      )
+    )
   }
 
   /**
@@ -469,6 +641,25 @@ module Raw {
     GenericParam getGenericParam(int index) {
       generic_param_list_generic_params(this, index, result)
     }
+
+    /**
+     * Gets the number of generic parameters of this generic parameter list.
+     */
+    int getNumberOfGenericParams() {
+      result = count(int i | generic_param_list_generic_params(this, i, _))
+    }
+  }
+
+  private Element getImmediateChildOfGenericParamList(GenericParamList e, int index) {
+    exists(int n, int nGenericParam |
+      n = 0 and
+      nGenericParam = n + e.getNumberOfGenericParams() and
+      (
+        none()
+        or
+        result = e.getGenericParam(index - n)
+      )
+    )
   }
 
   /**
@@ -491,10 +682,35 @@ module Raw {
      */
     Attr getAttr(int index) { item_list_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this item list.
+     */
+    int getNumberOfAttrs() { result = count(int i | item_list_attrs(this, i, _)) }
+
     /**
      * Gets the `index`th item of this item list (0-based).
      */
     Item getItem(int index) { item_list_items(this, index, result) }
+
+    /**
+     * Gets the number of items of this item list.
+     */
+    int getNumberOfItems() { result = count(int i | item_list_items(this, i, _)) }
+  }
+
+  private Element getImmediateChildOfItemList(ItemList e, int index) {
+    exists(int n, int nAttr, int nItem |
+      n = 0 and
+      nAttr = n + e.getNumberOfAttrs() and
+      nItem = nAttr + e.getNumberOfItems() and
+      (
+        none()
+        or
+        result = e.getAttr(index - n)
+        or
+        result = e.getItem(index - nAttr)
+      )
+    )
   }
 
   /**
@@ -516,6 +732,18 @@ module Raw {
     Lifetime getLifetime() { label_lifetimes(this, result) }
   }
 
+  private Element getImmediateChildOfLabel(Label e, int index) {
+    exists(int n, int nLifetime |
+      n = 0 and
+      nLifetime = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getLifetime()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * An else block in a let-else statement.
@@ -537,6 +765,18 @@ module Raw {
     BlockExpr getBlockExpr() { let_else_block_exprs(this, result) }
   }
 
+  private Element getImmediateChildOfLetElse(LetElse e, int index) {
+    exists(int n, int nBlockExpr |
+      n = 0 and
+      nBlockExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getBlockExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A sequence of items generated by a macro. For example:
@@ -561,6 +801,23 @@ module Raw {
      * Gets the `index`th item of this macro items (0-based).
      */
     Item getItem(int index) { macro_items_items(this, index, result) }
+
+    /**
+     * Gets the number of items of this macro items.
+     */
+    int getNumberOfItems() { result = count(int i | macro_items_items(this, i, _)) }
+  }
+
+  private Element getImmediateChildOfMacroItems(MacroItems e, int index) {
+    exists(int n, int nItem |
+      n = 0 and
+      nItem = n + e.getNumberOfItems() and
+      (
+        none()
+        or
+        result = e.getItem(index - n)
+      )
+    )
   }
 
   /**
@@ -587,6 +844,11 @@ module Raw {
      */
     Attr getAttr(int index) { match_arm_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this match arm.
+     */
+    int getNumberOfAttrs() { result = count(int i | match_arm_attrs(this, i, _)) }
+
     /**
      * Gets the expression of this match arm, if it exists.
      */
@@ -603,6 +865,27 @@ module Raw {
     Pat getPat() { match_arm_pats(this, result) }
   }
 
+  private Element getImmediateChildOfMatchArm(MatchArm e, int index) {
+    exists(int n, int nAttr, int nExpr, int nGuard, int nPat |
+      n = 0 and
+      nAttr = n + e.getNumberOfAttrs() and
+      nExpr = nAttr + 1 and
+      nGuard = nExpr + 1 and
+      nPat = nGuard + 1 and
+      (
+        none()
+        or
+        result = e.getAttr(index - n)
+        or
+        index = nAttr and result = e.getExpr()
+        or
+        index = nExpr and result = e.getGuard()
+        or
+        index = nGuard and result = e.getPat()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A list of arms in a match expression.
@@ -625,10 +908,35 @@ module Raw {
      */
     MatchArm getArm(int index) { match_arm_list_arms(this, index, result) }
 
+    /**
+     * Gets the number of arms of this match arm list.
+     */
+    int getNumberOfArms() { result = count(int i | match_arm_list_arms(this, i, _)) }
+
     /**
      * Gets the `index`th attr of this match arm list (0-based).
      */
     Attr getAttr(int index) { match_arm_list_attrs(this, index, result) }
+
+    /**
+     * Gets the number of attrs of this match arm list.
+     */
+    int getNumberOfAttrs() { result = count(int i | match_arm_list_attrs(this, i, _)) }
+  }
+
+  private Element getImmediateChildOfMatchArmList(MatchArmList e, int index) {
+    exists(int n, int nArm, int nAttr |
+      n = 0 and
+      nArm = n + e.getNumberOfArms() and
+      nAttr = nArm + e.getNumberOfAttrs() and
+      (
+        none()
+        or
+        result = e.getArm(index - n)
+        or
+        result = e.getAttr(index - nArm)
+      )
+    )
   }
 
   /**
@@ -653,6 +961,18 @@ module Raw {
     Expr getCondition() { match_guard_conditions(this, result) }
   }
 
+  private Element getImmediateChildOfMatchGuard(MatchGuard e, int index) {
+    exists(int n, int nCondition |
+      n = 0 and
+      nCondition = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getCondition()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A meta item in an attribute.
@@ -692,6 +1012,24 @@ module Raw {
     TokenTree getTokenTree() { meta_token_trees(this, result) }
   }
 
+  private Element getImmediateChildOfMeta(Meta e, int index) {
+    exists(int n, int nExpr, int nPath, int nTokenTree |
+      n = 0 and
+      nExpr = n + 1 and
+      nPath = nExpr + 1 and
+      nTokenTree = nPath + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getExpr()
+        or
+        index = nExpr and result = e.getPath()
+        or
+        index = nPath and result = e.getTokenTree()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * An identifier name.
@@ -711,6 +1049,8 @@ module Raw {
     string getText() { name_texts(this, result) }
   }
 
+  private Element getImmediateChildOfName(Name e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    * A normal parameter, `Param`, or a self parameter `SelfParam`.
@@ -721,6 +1061,11 @@ module Raw {
      */
     Attr getAttr(int index) { param_base_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this parameter base.
+     */
+    int getNumberOfAttrs() { result = count(int i | param_base_attrs(this, i, _)) }
+
     /**
      * Gets the type representation of this parameter base, if it exists.
      */
@@ -745,12 +1090,32 @@ module Raw {
      */
     Param getParam(int index) { param_list_params(this, index, result) }
 
+    /**
+     * Gets the number of parameters of this parameter list.
+     */
+    int getNumberOfParams() { result = count(int i | param_list_params(this, i, _)) }
+
     /**
      * Gets the self parameter of this parameter list, if it exists.
      */
     SelfParam getSelfParam() { param_list_self_params(this, result) }
   }
 
+  private Element getImmediateChildOfParamList(ParamList e, int index) {
+    exists(int n, int nParam, int nSelfParam |
+      n = 0 and
+      nParam = n + e.getNumberOfParams() and
+      nSelfParam = nParam + 1 and
+      (
+        none()
+        or
+        result = e.getParam(index - n)
+        or
+        index = nParam and result = e.getSelfParam()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A parenthesized argument list as used in function traits.
@@ -773,6 +1138,25 @@ module Raw {
      * Gets the `index`th type argument of this parenthesized argument list (0-based).
      */
     TypeArg getTypeArg(int index) { parenthesized_arg_list_type_args(this, index, result) }
+
+    /**
+     * Gets the number of type arguments of this parenthesized argument list.
+     */
+    int getNumberOfTypeArgs() {
+      result = count(int i | parenthesized_arg_list_type_args(this, i, _))
+    }
+  }
+
+  private Element getImmediateChildOfParenthesizedArgList(ParenthesizedArgList e, int index) {
+    exists(int n, int nTypeArg |
+      n = 0 and
+      nTypeArg = n + e.getNumberOfTypeArgs() and
+      (
+        none()
+        or
+        result = e.getTypeArg(index - n)
+      )
+    )
   }
 
   /**
@@ -803,6 +1187,32 @@ module Raw {
     PathSegment getSegment() { path_segments_(this, result) }
   }
 
+  private Element getImmediateChildOfPath(Path e, int index) {
+    exists(int n, int nQualifier, int nSegment |
+      n = 0 and
+      nQualifier = n + 1 and
+      nSegment = nQualifier + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getQualifier()
+        or
+        index = nQualifier and result = e.getSegment()
+      )
+    )
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * An AST element wrapping a path (`PathExpr`, `RecordExpr`, `PathPat`, `RecordPat`, `TupleStructPat`).
+   */
+  class PathAstNode extends @path_ast_node, AstNode {
+    /**
+     * Gets the path of this path ast node, if it exists.
+     */
+    Path getPath() { path_ast_node_paths(this, result) }
+  }
+
   /**
    * INTERNAL: Do not use.
    * A path segment, which is one part of a whole path.
@@ -854,6 +1264,39 @@ module Raw {
     PathTypeRepr getTraitTypeRepr() { path_segment_trait_type_reprs(this, result) }
   }
 
+  private Element getImmediateChildOfPathSegment(PathSegment e, int index) {
+    exists(
+      int n, int nGenericArgList, int nIdentifier, int nParenthesizedArgList, int nRetType,
+      int nReturnTypeSyntax, int nTypeRepr, int nTraitTypeRepr
+    |
+      n = 0 and
+      nGenericArgList = n + 1 and
+      nIdentifier = nGenericArgList + 1 and
+      nParenthesizedArgList = nIdentifier + 1 and
+      nRetType = nParenthesizedArgList + 1 and
+      nReturnTypeSyntax = nRetType + 1 and
+      nTypeRepr = nReturnTypeSyntax + 1 and
+      nTraitTypeRepr = nTypeRepr + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getGenericArgList()
+        or
+        index = nGenericArgList and result = e.getIdentifier()
+        or
+        index = nIdentifier and result = e.getParenthesizedArgList()
+        or
+        index = nParenthesizedArgList and result = e.getRetType()
+        or
+        index = nRetType and result = e.getReturnTypeSyntax()
+        or
+        index = nReturnTypeSyntax and result = e.getTypeRepr()
+        or
+        index = nTypeRepr and result = e.getTraitTypeRepr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A rename in a use declaration.
@@ -873,20 +1316,16 @@ module Raw {
     Name getName() { rename_names(this, result) }
   }
 
-  /**
-   * INTERNAL: Do not use.
-   * One of `PathExpr`, `RecordExpr`, `PathPat`, `RecordPat`, `TupleStructPat` or `MethodCallExpr`.
-   */
-  class Resolvable extends @resolvable, AstNode {
-    /**
-     * Gets the resolved path of this resolvable, if it exists.
-     */
-    string getResolvedPath() { resolvable_resolved_paths(this, result) }
-
-    /**
-     * Gets the resolved crate origin of this resolvable, if it exists.
-     */
-    string getResolvedCrateOrigin() { resolvable_resolved_crate_origins(this, result) }
+  private Element getImmediateChildOfRename(Rename e, int index) {
+    exists(int n, int nName |
+      n = 0 and
+      nName = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getName()
+      )
+    )
   }
 
   /**
@@ -895,7 +1334,7 @@ module Raw {
    *
    * For example:
    * ```rust
-   * fn foo() -> i32 {}
+   * fn foo() -> i32 { 0 }
    * //       ^^^^^^
    * ```
    */
@@ -908,6 +1347,18 @@ module Raw {
     TypeRepr getTypeRepr() { ret_type_repr_type_reprs(this, result) }
   }
 
+  private Element getImmediateChildOfRetTypeRepr(RetTypeRepr e, int index) {
+    exists(int n, int nTypeRepr |
+      n = 0 and
+      nTypeRepr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getTypeRepr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A return type notation `(..)` to reference or bound the type returned by a trait method
@@ -932,6 +1383,8 @@ module Raw {
     override string toString() { result = "ReturnTypeSyntax" }
   }
 
+  private Element getImmediateChildOfReturnTypeSyntax(ReturnTypeSyntax e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    * A source file.
@@ -950,10 +1403,35 @@ module Raw {
      */
     Attr getAttr(int index) { source_file_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this source file.
+     */
+    int getNumberOfAttrs() { result = count(int i | source_file_attrs(this, i, _)) }
+
     /**
      * Gets the `index`th item of this source file (0-based).
      */
     Item getItem(int index) { source_file_items(this, index, result) }
+
+    /**
+     * Gets the number of items of this source file.
+     */
+    int getNumberOfItems() { result = count(int i | source_file_items(this, i, _)) }
+  }
+
+  private Element getImmediateChildOfSourceFile(SourceFile e, int index) {
+    exists(int n, int nAttr, int nItem |
+      n = 0 and
+      nAttr = n + e.getNumberOfAttrs() and
+      nItem = nAttr + e.getNumberOfItems() and
+      (
+        none()
+        or
+        result = e.getAttr(index - n)
+        or
+        result = e.getItem(index - nAttr)
+      )
+    )
   }
 
   /**
@@ -964,13 +1442,15 @@ module Raw {
 
   /**
    * INTERNAL: Do not use.
-   * A list of statements in a block.
+   * A list of statements in a block, with an optional tail expression at the
+   * end that determines the block's value.
    *
    * For example:
    * ```rust
    * {
    *     let x = 1;
    *     let y = 2;
+   *     x + y
    * }
    * //  ^^^^^^^^^
    * ```
@@ -983,17 +1463,51 @@ module Raw {
      */
     Attr getAttr(int index) { stmt_list_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this statement list.
+     */
+    int getNumberOfAttrs() { result = count(int i | stmt_list_attrs(this, i, _)) }
+
     /**
      * Gets the `index`th statement of this statement list (0-based).
+     *
+     * The statements of a `StmtList` do not include any tail expression, which
+     * can be accessed with predicates such as `getTailExpr`.
      */
     Stmt getStatement(int index) { stmt_list_statements(this, index, result) }
 
+    /**
+     * Gets the number of statements of this statement list.
+     */
+    int getNumberOfStatements() { result = count(int i | stmt_list_statements(this, i, _)) }
+
     /**
      * Gets the tail expression of this statement list, if it exists.
+     *
+     * The tail expression is the expression at the end of a block, that
+     * determines the block's value.
      */
     Expr getTailExpr() { stmt_list_tail_exprs(this, result) }
   }
 
+  private Element getImmediateChildOfStmtList(StmtList e, int index) {
+    exists(int n, int nAttr, int nStatement, int nTailExpr |
+      n = 0 and
+      nAttr = n + e.getNumberOfAttrs() and
+      nStatement = nAttr + e.getNumberOfStatements() and
+      nTailExpr = nStatement + 1 and
+      (
+        none()
+        or
+        result = e.getAttr(index - n)
+        or
+        result = e.getStatement(index - nAttr)
+        or
+        index = nStatement and result = e.getTailExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A field in a struct expression. For example `a: 1` in:
@@ -1009,6 +1523,11 @@ module Raw {
      */
     Attr getAttr(int index) { struct_expr_field_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this struct expression field.
+     */
+    int getNumberOfAttrs() { result = count(int i | struct_expr_field_attrs(this, i, _)) }
+
     /**
      * Gets the expression of this struct expression field, if it exists.
      */
@@ -1020,6 +1539,24 @@ module Raw {
     NameRef getIdentifier() { struct_expr_field_identifiers(this, result) }
   }
 
+  private Element getImmediateChildOfStructExprField(StructExprField e, int index) {
+    exists(int n, int nAttr, int nExpr, int nIdentifier |
+      n = 0 and
+      nAttr = n + e.getNumberOfAttrs() and
+      nExpr = nAttr + 1 and
+      nIdentifier = nExpr + 1 and
+      (
+        none()
+        or
+        result = e.getAttr(index - n)
+        or
+        index = nAttr and result = e.getExpr()
+        or
+        index = nExpr and result = e.getIdentifier()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A list of fields in a struct expression.
@@ -1038,17 +1575,45 @@ module Raw {
      */
     Attr getAttr(int index) { struct_expr_field_list_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this struct expression field list.
+     */
+    int getNumberOfAttrs() { result = count(int i | struct_expr_field_list_attrs(this, i, _)) }
+
     /**
      * Gets the `index`th field of this struct expression field list (0-based).
      */
     StructExprField getField(int index) { struct_expr_field_list_fields(this, index, result) }
 
+    /**
+     * Gets the number of fields of this struct expression field list.
+     */
+    int getNumberOfFields() { result = count(int i | struct_expr_field_list_fields(this, i, _)) }
+
     /**
      * Gets the spread of this struct expression field list, if it exists.
      */
     Expr getSpread() { struct_expr_field_list_spreads(this, result) }
   }
 
+  private Element getImmediateChildOfStructExprFieldList(StructExprFieldList e, int index) {
+    exists(int n, int nAttr, int nField, int nSpread |
+      n = 0 and
+      nAttr = n + e.getNumberOfAttrs() and
+      nField = nAttr + e.getNumberOfFields() and
+      nSpread = nField + 1 and
+      (
+        none()
+        or
+        result = e.getAttr(index - n)
+        or
+        result = e.getField(index - nAttr)
+        or
+        index = nField and result = e.getSpread()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A field in a struct declaration.
@@ -1067,6 +1632,11 @@ module Raw {
      */
     Attr getAttr(int index) { struct_field_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this struct field.
+     */
+    int getNumberOfAttrs() { result = count(int i | struct_field_attrs(this, i, _)) }
+
     /**
      * Gets the default of this struct field, if it exists.
      */
@@ -1093,6 +1663,30 @@ module Raw {
     Visibility getVisibility() { struct_field_visibilities(this, result) }
   }
 
+  private Element getImmediateChildOfStructField(StructField e, int index) {
+    exists(int n, int nAttr, int nDefault, int nName, int nTypeRepr, int nVisibility |
+      n = 0 and
+      nAttr = n + e.getNumberOfAttrs() and
+      nDefault = nAttr + 1 and
+      nName = nDefault + 1 and
+      nTypeRepr = nName + 1 and
+      nVisibility = nTypeRepr + 1 and
+      (
+        none()
+        or
+        result = e.getAttr(index - n)
+        or
+        index = nAttr and result = e.getDefault()
+        or
+        index = nDefault and result = e.getName()
+        or
+        index = nName and result = e.getTypeRepr()
+        or
+        index = nTypeRepr and result = e.getVisibility()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A field in a struct pattern. For example `a: 1` in:
@@ -1108,6 +1702,11 @@ module Raw {
      */
     Attr getAttr(int index) { struct_pat_field_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this struct pattern field.
+     */
+    int getNumberOfAttrs() { result = count(int i | struct_pat_field_attrs(this, i, _)) }
+
     /**
      * Gets the identifier of this struct pattern field, if it exists.
      */
@@ -1119,6 +1718,24 @@ module Raw {
     Pat getPat() { struct_pat_field_pats(this, result) }
   }
 
+  private Element getImmediateChildOfStructPatField(StructPatField e, int index) {
+    exists(int n, int nAttr, int nIdentifier, int nPat |
+      n = 0 and
+      nAttr = n + e.getNumberOfAttrs() and
+      nIdentifier = nAttr + 1 and
+      nPat = nIdentifier + 1 and
+      (
+        none()
+        or
+        result = e.getAttr(index - n)
+        or
+        index = nAttr and result = e.getIdentifier()
+        or
+        index = nIdentifier and result = e.getPat()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A list of fields in a struct pattern.
@@ -1137,12 +1754,32 @@ module Raw {
      */
     StructPatField getField(int index) { struct_pat_field_list_fields(this, index, result) }
 
+    /**
+     * Gets the number of fields of this struct pattern field list.
+     */
+    int getNumberOfFields() { result = count(int i | struct_pat_field_list_fields(this, i, _)) }
+
     /**
      * Gets the rest pattern of this struct pattern field list, if it exists.
      */
     RestPat getRestPat() { struct_pat_field_list_rest_pats(this, result) }
   }
 
+  private Element getImmediateChildOfStructPatFieldList(StructPatFieldList e, int index) {
+    exists(int n, int nField, int nRestPat |
+      n = 0 and
+      nField = n + e.getNumberOfFields() and
+      nRestPat = nField + 1 and
+      (
+        none()
+        or
+        result = e.getField(index - n)
+        or
+        index = nField and result = e.getRestPat()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * The base class for all tokens.
@@ -1167,6 +1804,8 @@ module Raw {
     override string toString() { result = "TokenTree" }
   }
 
+  private Element getImmediateChildOfTokenTree(TokenTree e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    * A field in a tuple struct or tuple enum variant.
@@ -1185,6 +1824,11 @@ module Raw {
      */
     Attr getAttr(int index) { tuple_field_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this tuple field.
+     */
+    int getNumberOfAttrs() { result = count(int i | tuple_field_attrs(this, i, _)) }
+
     /**
      * Gets the type representation of this tuple field, if it exists.
      */
@@ -1196,6 +1840,24 @@ module Raw {
     Visibility getVisibility() { tuple_field_visibilities(this, result) }
   }
 
+  private Element getImmediateChildOfTupleField(TupleField e, int index) {
+    exists(int n, int nAttr, int nTypeRepr, int nVisibility |
+      n = 0 and
+      nAttr = n + e.getNumberOfAttrs() and
+      nTypeRepr = nAttr + 1 and
+      nVisibility = nTypeRepr + 1 and
+      (
+        none()
+        or
+        result = e.getAttr(index - n)
+        or
+        index = nAttr and result = e.getTypeRepr()
+        or
+        index = nTypeRepr and result = e.getVisibility()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A type bound in a trait or generic parameter.
@@ -1204,11 +1866,18 @@ module Raw {
    * ```rust
    * fn foo<T: Debug>(t: T) {}
    * //        ^^^^^
+   * fn bar(value: impl for<'a> From<&'a str>) {}
+   * //                 ^^^^^^^^^^^^^^^^^^^^^
    * ```
    */
   class TypeBound extends @type_bound, AstNode {
     override string toString() { result = "TypeBound" }
 
+    /**
+     * Gets the for binder of this type bound, if it exists.
+     */
+    ForBinder getForBinder() { type_bound_for_binders(this, result) }
+
     /**
      * Holds if this type bound is async.
      */
@@ -1235,6 +1904,27 @@ module Raw {
     UseBoundGenericArgs getUseBoundGenericArgs() { type_bound_use_bound_generic_args(this, result) }
   }
 
+  private Element getImmediateChildOfTypeBound(TypeBound e, int index) {
+    exists(int n, int nForBinder, int nLifetime, int nTypeRepr, int nUseBoundGenericArgs |
+      n = 0 and
+      nForBinder = n + 1 and
+      nLifetime = nForBinder + 1 and
+      nTypeRepr = nLifetime + 1 and
+      nUseBoundGenericArgs = nTypeRepr + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getForBinder()
+        or
+        index = nForBinder and result = e.getLifetime()
+        or
+        index = nLifetime and result = e.getTypeRepr()
+        or
+        index = nTypeRepr and result = e.getUseBoundGenericArgs()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A list of type bounds.
@@ -1252,6 +1942,23 @@ module Raw {
      * Gets the `index`th bound of this type bound list (0-based).
      */
     TypeBound getBound(int index) { type_bound_list_bounds(this, index, result) }
+
+    /**
+     * Gets the number of bounds of this type bound list.
+     */
+    int getNumberOfBounds() { result = count(int i | type_bound_list_bounds(this, i, _)) }
+  }
+
+  private Element getImmediateChildOfTypeBoundList(TypeBoundList e, int index) {
+    exists(int n, int nBound |
+      n = 0 and
+      nBound = n + e.getNumberOfBounds() and
+      (
+        none()
+        or
+        result = e.getBound(index - n)
+      )
+    )
   }
 
   /**
@@ -1276,7 +1983,7 @@ module Raw {
    *
    * For example:
    * ```rust
-   * pub fn hello<'a, T, const N: usize>() -> impl Sized + use<'a, T, N> {}
+   * pub fn hello<'a, T, const N: usize>() -> impl Sized + use<'a, T, N> { 0 }
    * //                                                        ^^^^^^^^
    * ```
    */
@@ -1289,6 +1996,25 @@ module Raw {
     UseBoundGenericArg getUseBoundGenericArg(int index) {
       use_bound_generic_args_use_bound_generic_args(this, index, result)
     }
+
+    /**
+     * Gets the number of use bound generic arguments of this use bound generic arguments.
+     */
+    int getNumberOfUseBoundGenericArgs() {
+      result = count(int i | use_bound_generic_args_use_bound_generic_args(this, i, _))
+    }
+  }
+
+  private Element getImmediateChildOfUseBoundGenericArgs(UseBoundGenericArgs e, int index) {
+    exists(int n, int nUseBoundGenericArg |
+      n = 0 and
+      nUseBoundGenericArg = n + e.getNumberOfUseBoundGenericArgs() and
+      (
+        none()
+        or
+        result = e.getUseBoundGenericArg(index - n)
+      )
+    )
   }
 
   /**
@@ -1325,6 +2051,24 @@ module Raw {
     UseTreeList getUseTreeList() { use_tree_use_tree_lists(this, result) }
   }
 
+  private Element getImmediateChildOfUseTree(UseTree e, int index) {
+    exists(int n, int nPath, int nRename, int nUseTreeList |
+      n = 0 and
+      nPath = n + 1 and
+      nRename = nPath + 1 and
+      nUseTreeList = nRename + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getPath()
+        or
+        index = nPath and result = e.getRename()
+        or
+        index = nRename and result = e.getUseTreeList()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A list of use trees in a use declaration.
@@ -1342,6 +2086,23 @@ module Raw {
      * Gets the `index`th use tree of this use tree list (0-based).
      */
     UseTree getUseTree(int index) { use_tree_list_use_trees(this, index, result) }
+
+    /**
+     * Gets the number of use trees of this use tree list.
+     */
+    int getNumberOfUseTrees() { result = count(int i | use_tree_list_use_trees(this, i, _)) }
+  }
+
+  private Element getImmediateChildOfUseTreeList(UseTreeList e, int index) {
+    exists(int n, int nUseTree |
+      n = 0 and
+      nUseTree = n + e.getNumberOfUseTrees() and
+      (
+        none()
+        or
+        result = e.getUseTree(index - n)
+      )
+    )
   }
 
   /**
@@ -1361,6 +2122,23 @@ module Raw {
      * Gets the `index`th variant of this variant list (0-based).
      */
     Variant getVariant(int index) { variant_list_variants(this, index, result) }
+
+    /**
+     * Gets the number of variants of this variant list.
+     */
+    int getNumberOfVariants() { result = count(int i | variant_list_variants(this, i, _)) }
+  }
+
+  private Element getImmediateChildOfVariantList(VariantList e, int index) {
+    exists(int n, int nVariant |
+      n = 0 and
+      nVariant = n + e.getNumberOfVariants() and
+      (
+        none()
+        or
+        result = e.getVariant(index - n)
+      )
+    )
   }
 
   /**
@@ -1382,6 +2160,18 @@ module Raw {
     Path getPath() { visibility_paths(this, result) }
   }
 
+  private Element getImmediateChildOfVisibility(Visibility e, int index) {
+    exists(int n, int nPath |
+      n = 0 and
+      nPath = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getPath()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A where clause in a generic declaration.
@@ -1399,6 +2189,23 @@ module Raw {
      * Gets the `index`th predicate of this where clause (0-based).
      */
     WherePred getPredicate(int index) { where_clause_predicates(this, index, result) }
+
+    /**
+     * Gets the number of predicates of this where clause.
+     */
+    int getNumberOfPredicates() { result = count(int i | where_clause_predicates(this, i, _)) }
+  }
+
+  private Element getImmediateChildOfWhereClause(WhereClause e, int index) {
+    exists(int n, int nPredicate |
+      n = 0 and
+      nPredicate = n + e.getNumberOfPredicates() and
+      (
+        none()
+        or
+        result = e.getPredicate(index - n)
+      )
+    )
   }
 
   /**
@@ -1409,15 +2216,17 @@ module Raw {
    * ```rust
    * fn foo<T, U>(t: T, u: U) where T: Debug, U: Clone {}
    * //                             ^^^^^^^^  ^^^^^^^^
+   * fn bar<T>(value: T) where for<'a> T: From<&'a str> {}
+   * //                        ^^^^^^^^^^^^^^^^^^^^^^^^
    * ```
    */
   class WherePred extends @where_pred, AstNode {
     override string toString() { result = "WherePred" }
 
     /**
-     * Gets the generic parameter list of this where pred, if it exists.
+     * Gets the for binder of this where pred, if it exists.
      */
-    GenericParamList getGenericParamList() { where_pred_generic_param_lists(this, result) }
+    ForBinder getForBinder() { where_pred_for_binders(this, result) }
 
     /**
      * Gets the lifetime of this where pred, if it exists.
@@ -1435,6 +2244,27 @@ module Raw {
     TypeBoundList getTypeBoundList() { where_pred_type_bound_lists(this, result) }
   }
 
+  private Element getImmediateChildOfWherePred(WherePred e, int index) {
+    exists(int n, int nForBinder, int nLifetime, int nTypeRepr, int nTypeBoundList |
+      n = 0 and
+      nForBinder = n + 1 and
+      nLifetime = nForBinder + 1 and
+      nTypeRepr = nLifetime + 1 and
+      nTypeBoundList = nTypeRepr + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getForBinder()
+        or
+        index = nForBinder and result = e.getLifetime()
+        or
+        index = nLifetime and result = e.getTypeRepr()
+        or
+        index = nTypeRepr and result = e.getTypeBoundList()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -1446,17 +2276,42 @@ module Raw {
      */
     Attr getAttr(int index) { array_expr_internal_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this array expression internal.
+     */
+    int getNumberOfAttrs() { result = count(int i | array_expr_internal_attrs(this, i, _)) }
+
     /**
      * Gets the `index`th expression of this array expression internal (0-based).
      */
     Expr getExpr(int index) { array_expr_internal_exprs(this, index, result) }
 
+    /**
+     * Gets the number of expressions of this array expression internal.
+     */
+    int getNumberOfExprs() { result = count(int i | array_expr_internal_exprs(this, i, _)) }
+
     /**
      * Holds if this array expression internal is semicolon.
      */
     predicate isSemicolon() { array_expr_internal_is_semicolon(this) }
   }
 
+  private Element getImmediateChildOfArrayExprInternal(ArrayExprInternal e, int index) {
+    exists(int n, int nAttr, int nExpr |
+      n = 0 and
+      nAttr = n + e.getNumberOfAttrs() and
+      nExpr = nAttr + e.getNumberOfExprs() and
+      (
+        none()
+        or
+        result = e.getAttr(index - n)
+        or
+        result = e.getExpr(index - nAttr)
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * An array type representation.
@@ -1481,6 +2336,21 @@ module Raw {
     TypeRepr getElementTypeRepr() { array_type_repr_element_type_reprs(this, result) }
   }
 
+  private Element getImmediateChildOfArrayTypeRepr(ArrayTypeRepr e, int index) {
+    exists(int n, int nConstArg, int nElementTypeRepr |
+      n = 0 and
+      nConstArg = n + 1 and
+      nElementTypeRepr = nConstArg + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getConstArg()
+        or
+        index = nConstArg and result = e.getElementTypeRepr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A clobbered ABI in an inline assembly block.
@@ -1496,6 +2366,8 @@ module Raw {
     override string toString() { result = "AsmClobberAbi" }
   }
 
+  private Element getImmediateChildOfAsmClobberAbi(AsmClobberAbi e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    * A constant operand in an inline assembly block.
@@ -1521,33 +2393,16 @@ module Raw {
     predicate isConst() { asm_const_is_const(this) }
   }
 
-  /**
-   * INTERNAL: Do not use.
-   * An inline assembly expression. For example:
-   * ```rust
-   * unsafe {
-   *     #[inline(always)]
-   *     builtin # asm("cmp {0}, {1}", in(reg) a, in(reg) b);
-   * }
-   * ```
-   */
-  class AsmExpr extends @asm_expr, Expr {
-    override string toString() { result = "AsmExpr" }
-
-    /**
-     * Gets the `index`th asm piece of this asm expression (0-based).
-     */
-    AsmPiece getAsmPiece(int index) { asm_expr_asm_pieces(this, index, result) }
-
-    /**
-     * Gets the `index`th attr of this asm expression (0-based).
-     */
-    Attr getAttr(int index) { asm_expr_attrs(this, index, result) }
-
-    /**
-     * Gets the `index`th template of this asm expression (0-based).
-     */
-    Expr getTemplate(int index) { asm_expr_templates(this, index, result) }
+  private Element getImmediateChildOfAsmConst(AsmConst e, int index) {
+    exists(int n, int nExpr |
+      n = 0 and
+      nExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getExpr()
+      )
+    )
   }
 
   /**
@@ -1573,6 +2428,18 @@ module Raw {
     BlockExpr getBlockExpr() { asm_label_block_exprs(this, result) }
   }
 
+  private Element getImmediateChildOfAsmLabel(AsmLabel e, int index) {
+    exists(int n, int nBlockExpr |
+      n = 0 and
+      nBlockExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getBlockExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A named operand in an inline assembly block.
@@ -1598,6 +2465,21 @@ module Raw {
     Name getName() { asm_operand_named_names(this, result) }
   }
 
+  private Element getImmediateChildOfAsmOperandNamed(AsmOperandNamed e, int index) {
+    exists(int n, int nAsmOperand, int nName |
+      n = 0 and
+      nAsmOperand = n + 1 and
+      nName = nAsmOperand + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getAsmOperand()
+        or
+        index = nAsmOperand and result = e.getName()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A list of options in an inline assembly block.
@@ -1616,6 +2498,23 @@ module Raw {
      * Gets the `index`th asm option of this asm options list (0-based).
      */
     AsmOption getAsmOption(int index) { asm_options_list_asm_options(this, index, result) }
+
+    /**
+     * Gets the number of asm options of this asm options list.
+     */
+    int getNumberOfAsmOptions() { result = count(int i | asm_options_list_asm_options(this, i, _)) }
+  }
+
+  private Element getImmediateChildOfAsmOptionsList(AsmOptionsList e, int index) {
+    exists(int n, int nAsmOption |
+      n = 0 and
+      nAsmOption = n + e.getNumberOfAsmOptions() and
+      (
+        none()
+        or
+        result = e.getAsmOption(index - n)
+      )
+    )
   }
 
   /**
@@ -1648,6 +2547,24 @@ module Raw {
     AsmRegSpec getAsmRegSpec() { asm_reg_operand_asm_reg_specs(this, result) }
   }
 
+  private Element getImmediateChildOfAsmRegOperand(AsmRegOperand e, int index) {
+    exists(int n, int nAsmDirSpec, int nAsmOperandExpr, int nAsmRegSpec |
+      n = 0 and
+      nAsmDirSpec = n + 1 and
+      nAsmOperandExpr = nAsmDirSpec + 1 and
+      nAsmRegSpec = nAsmOperandExpr + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getAsmDirSpec()
+        or
+        index = nAsmDirSpec and result = e.getAsmOperandExpr()
+        or
+        index = nAsmOperandExpr and result = e.getAsmRegSpec()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A symbol operand in an inline assembly block.
@@ -1668,6 +2585,18 @@ module Raw {
     Path getPath() { asm_sym_paths(this, result) }
   }
 
+  private Element getImmediateChildOfAsmSym(AsmSym e, int index) {
+    exists(int n, int nPath |
+      n = 0 and
+      nPath = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getPath()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * An associated type argument in a path.
@@ -1727,6 +2656,42 @@ module Raw {
     TypeBoundList getTypeBoundList() { assoc_type_arg_type_bound_lists(this, result) }
   }
 
+  private Element getImmediateChildOfAssocTypeArg(AssocTypeArg e, int index) {
+    exists(
+      int n, int nConstArg, int nGenericArgList, int nIdentifier, int nParamList, int nRetType,
+      int nReturnTypeSyntax, int nTypeRepr, int nTypeBoundList
+    |
+      n = 0 and
+      nConstArg = n + 1 and
+      nGenericArgList = nConstArg + 1 and
+      nIdentifier = nGenericArgList + 1 and
+      nParamList = nIdentifier + 1 and
+      nRetType = nParamList + 1 and
+      nReturnTypeSyntax = nRetType + 1 and
+      nTypeRepr = nReturnTypeSyntax + 1 and
+      nTypeBoundList = nTypeRepr + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getConstArg()
+        or
+        index = nConstArg and result = e.getGenericArgList()
+        or
+        index = nGenericArgList and result = e.getIdentifier()
+        or
+        index = nIdentifier and result = e.getParamList()
+        or
+        index = nParamList and result = e.getRetType()
+        or
+        index = nRetType and result = e.getReturnTypeSyntax()
+        or
+        index = nReturnTypeSyntax and result = e.getTypeRepr()
+        or
+        index = nTypeRepr and result = e.getTypeBoundList()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * An `await` expression. For example:
@@ -1745,12 +2710,32 @@ module Raw {
      */
     Attr getAttr(int index) { await_expr_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this await expression.
+     */
+    int getNumberOfAttrs() { result = count(int i | await_expr_attrs(this, i, _)) }
+
     /**
      * Gets the expression of this await expression, if it exists.
      */
     Expr getExpr() { await_expr_exprs(this, result) }
   }
 
+  private Element getImmediateChildOfAwaitExpr(AwaitExpr e, int index) {
+    exists(int n, int nAttr, int nExpr |
+      n = 0 and
+      nAttr = n + e.getNumberOfAttrs() and
+      nExpr = nAttr + 1 and
+      (
+        none()
+        or
+        result = e.getAttr(index - n)
+        or
+        index = nAttr and result = e.getExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A `become` expression. For example:
@@ -1772,12 +2757,32 @@ module Raw {
      */
     Attr getAttr(int index) { become_expr_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this become expression.
+     */
+    int getNumberOfAttrs() { result = count(int i | become_expr_attrs(this, i, _)) }
+
     /**
      * Gets the expression of this become expression, if it exists.
      */
     Expr getExpr() { become_expr_exprs(this, result) }
   }
 
+  private Element getImmediateChildOfBecomeExpr(BecomeExpr e, int index) {
+    exists(int n, int nAttr, int nExpr |
+      n = 0 and
+      nAttr = n + e.getNumberOfAttrs() and
+      nExpr = nAttr + 1 and
+      (
+        none()
+        or
+        result = e.getAttr(index - n)
+        or
+        index = nAttr and result = e.getExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A binary operation expression. For example:
@@ -1797,6 +2802,11 @@ module Raw {
      */
     Attr getAttr(int index) { binary_expr_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this binary expression.
+     */
+    int getNumberOfAttrs() { result = count(int i | binary_expr_attrs(this, i, _)) }
+
     /**
      * Gets the lhs of this binary expression, if it exists.
      */
@@ -1813,6 +2823,24 @@ module Raw {
     Expr getRhs() { binary_expr_rhs(this, result) }
   }
 
+  private Element getImmediateChildOfBinaryExpr(BinaryExpr e, int index) {
+    exists(int n, int nAttr, int nLhs, int nRhs |
+      n = 0 and
+      nAttr = n + e.getNumberOfAttrs() and
+      nLhs = nAttr + 1 and
+      nRhs = nLhs + 1 and
+      (
+        none()
+        or
+        result = e.getAttr(index - n)
+        or
+        index = nAttr and result = e.getLhs()
+        or
+        index = nLhs and result = e.getRhs()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A box pattern. For example:
@@ -1832,6 +2860,18 @@ module Raw {
     Pat getPat() { box_pat_pats(this, result) }
   }
 
+  private Element getImmediateChildOfBoxPat(BoxPat e, int index) {
+    exists(int n, int nPat |
+      n = 0 and
+      nPat = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getPat()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A break expression. For example:
@@ -1866,6 +2906,11 @@ module Raw {
      */
     Attr getAttr(int index) { break_expr_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this break expression.
+     */
+    int getNumberOfAttrs() { result = count(int i | break_expr_attrs(this, i, _)) }
+
     /**
      * Gets the expression of this break expression, if it exists.
      */
@@ -1877,6 +2922,24 @@ module Raw {
     Lifetime getLifetime() { break_expr_lifetimes(this, result) }
   }
 
+  private Element getImmediateChildOfBreakExpr(BreakExpr e, int index) {
+    exists(int n, int nAttr, int nExpr, int nLifetime |
+      n = 0 and
+      nAttr = n + e.getNumberOfAttrs() and
+      nExpr = nAttr + 1 and
+      nLifetime = nExpr + 1 and
+      (
+        none()
+        or
+        result = e.getAttr(index - n)
+        or
+        index = nAttr and result = e.getExpr()
+        or
+        index = nExpr and result = e.getLifetime()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A function or method call expression. See `CallExpr` and `MethodCallExpr` for further details.
@@ -1891,6 +2954,11 @@ module Raw {
      * Gets the `index`th attr of this call expression base (0-based).
      */
     Attr getAttr(int index) { call_expr_base_attrs(this, index, result) }
+
+    /**
+     * Gets the number of attrs of this call expression base.
+     */
+    int getNumberOfAttrs() { result = count(int i | call_expr_base_attrs(this, i, _)) }
   }
 
   /**
@@ -1908,6 +2976,11 @@ module Raw {
      */
     Attr getAttr(int index) { cast_expr_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this cast expression.
+     */
+    int getNumberOfAttrs() { result = count(int i | cast_expr_attrs(this, i, _)) }
+
     /**
      * Gets the expression of this cast expression, if it exists.
      */
@@ -1919,6 +2992,24 @@ module Raw {
     TypeRepr getTypeRepr() { cast_expr_type_reprs(this, result) }
   }
 
+  private Element getImmediateChildOfCastExpr(CastExpr e, int index) {
+    exists(int n, int nAttr, int nExpr, int nTypeRepr |
+      n = 0 and
+      nAttr = n + e.getNumberOfAttrs() and
+      nExpr = nAttr + 1 and
+      nTypeRepr = nExpr + 1 and
+      (
+        none()
+        or
+        result = e.getAttr(index - n)
+        or
+        index = nAttr and result = e.getExpr()
+        or
+        index = nExpr and result = e.getTypeRepr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A closure expression. For example:
@@ -1926,24 +3017,27 @@ module Raw {
    * |x| x + 1;
    * move |x: i32| -> i32 { x + 1 };
    * async |x: i32, y| x + y;
-   *  #[coroutine]
+   * #[coroutine]
    * |x| yield x;
-   *  #[coroutine]
-   *  static |x| yield x;
+   * #[coroutine]
+   * static |x| yield x;
+   * for<T: std::fmt::Debug> |x: T| {
+   *     println!("{:?}", x);
+   * };
    * ```
    */
   class ClosureExpr extends @closure_expr, Expr, Callable {
     override string toString() { result = "ClosureExpr" }
 
     /**
-     * Gets the body of this closure expression, if it exists.
+     * Gets the closure body of this closure expression, if it exists.
      */
-    Expr getBody() { closure_expr_bodies(this, result) }
+    Expr getClosureBody() { closure_expr_closure_bodies(this, result) }
 
     /**
-     * Gets the closure binder of this closure expression, if it exists.
+     * Gets the for binder of this closure expression, if it exists.
      */
-    ClosureBinder getClosureBinder() { closure_expr_closure_binders(this, result) }
+    ForBinder getForBinder() { closure_expr_for_binders(this, result) }
 
     /**
      * Holds if this closure expression is async.
@@ -1976,6 +3070,30 @@ module Raw {
     RetTypeRepr getRetType() { closure_expr_ret_types(this, result) }
   }
 
+  private Element getImmediateChildOfClosureExpr(ClosureExpr e, int index) {
+    exists(int n, int nParamList, int nAttr, int nClosureBody, int nForBinder, int nRetType |
+      n = 0 and
+      nParamList = n + 1 and
+      nAttr = nParamList + e.getNumberOfAttrs() and
+      nClosureBody = nAttr + 1 and
+      nForBinder = nClosureBody + 1 and
+      nRetType = nForBinder + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getParamList()
+        or
+        result = e.getAttr(index - nParamList)
+        or
+        index = nAttr and result = e.getClosureBody()
+        or
+        index = nClosureBody and result = e.getForBinder()
+        or
+        index = nForBinder and result = e.getRetType()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A comment. For example:
@@ -1998,6 +3116,8 @@ module Raw {
     string getText() { comments(this, _, result) }
   }
 
+  private Element getImmediateChildOfComment(Comment e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    * A constant argument in a generic argument list.
@@ -2017,6 +3137,18 @@ module Raw {
     Expr getExpr() { const_arg_exprs(this, result) }
   }
 
+  private Element getImmediateChildOfConstArg(ConstArg e, int index) {
+    exists(int n, int nExpr |
+      n = 0 and
+      nExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A const block pattern. For example:
@@ -2041,6 +3173,18 @@ module Raw {
     predicate isConst() { const_block_pat_is_const(this) }
   }
 
+  private Element getImmediateChildOfConstBlockPat(ConstBlockPat e, int index) {
+    exists(int n, int nBlockExpr |
+      n = 0 and
+      nBlockExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getBlockExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A constant parameter in a generic parameter list.
@@ -2059,6 +3203,11 @@ module Raw {
      */
     Attr getAttr(int index) { const_param_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this const parameter.
+     */
+    int getNumberOfAttrs() { result = count(int i | const_param_attrs(this, i, _)) }
+
     /**
      * Gets the default val of this const parameter, if it exists.
      */
@@ -2080,6 +3229,27 @@ module Raw {
     TypeRepr getTypeRepr() { const_param_type_reprs(this, result) }
   }
 
+  private Element getImmediateChildOfConstParam(ConstParam e, int index) {
+    exists(int n, int nAttr, int nDefaultVal, int nName, int nTypeRepr |
+      n = 0 and
+      nAttr = n + e.getNumberOfAttrs() and
+      nDefaultVal = nAttr + 1 and
+      nName = nDefaultVal + 1 and
+      nTypeRepr = nName + 1 and
+      (
+        none()
+        or
+        result = e.getAttr(index - n)
+        or
+        index = nAttr and result = e.getDefaultVal()
+        or
+        index = nDefaultVal and result = e.getName()
+        or
+        index = nName and result = e.getTypeRepr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A continue expression. For example:
@@ -2106,12 +3276,32 @@ module Raw {
      */
     Attr getAttr(int index) { continue_expr_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this continue expression.
+     */
+    int getNumberOfAttrs() { result = count(int i | continue_expr_attrs(this, i, _)) }
+
     /**
      * Gets the lifetime of this continue expression, if it exists.
      */
     Lifetime getLifetime() { continue_expr_lifetimes(this, result) }
   }
 
+  private Element getImmediateChildOfContinueExpr(ContinueExpr e, int index) {
+    exists(int n, int nAttr, int nLifetime |
+      n = 0 and
+      nAttr = n + e.getNumberOfAttrs() and
+      nLifetime = nAttr + 1 and
+      (
+        none()
+        or
+        result = e.getAttr(index - n)
+        or
+        index = nAttr and result = e.getLifetime()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A dynamic trait object type.
@@ -2131,6 +3321,18 @@ module Raw {
     TypeBoundList getTypeBoundList() { dyn_trait_type_repr_type_bound_lists(this, result) }
   }
 
+  private Element getImmediateChildOfDynTraitTypeRepr(DynTraitTypeRepr e, int index) {
+    exists(int n, int nTypeBoundList |
+      n = 0 and
+      nTypeBoundList = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getTypeBoundList()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * An expression statement. For example:
@@ -2149,6 +3351,18 @@ module Raw {
     Expr getExpr() { expr_stmt_exprs(this, result) }
   }
 
+  private Element getImmediateChildOfExprStmt(ExprStmt e, int index) {
+    exists(int n, int nExpr |
+      n = 0 and
+      nExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A field access expression. For example:
@@ -2164,6 +3378,11 @@ module Raw {
      */
     Attr getAttr(int index) { field_expr_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this field expression.
+     */
+    int getNumberOfAttrs() { result = count(int i | field_expr_attrs(this, i, _)) }
+
     /**
      * Gets the container of this field expression, if it exists.
      */
@@ -2175,6 +3394,24 @@ module Raw {
     NameRef getIdentifier() { field_expr_identifiers(this, result) }
   }
 
+  private Element getImmediateChildOfFieldExpr(FieldExpr e, int index) {
+    exists(int n, int nAttr, int nContainer, int nIdentifier |
+      n = 0 and
+      nAttr = n + e.getNumberOfAttrs() and
+      nContainer = nAttr + 1 and
+      nIdentifier = nContainer + 1 and
+      (
+        none()
+        or
+        result = e.getAttr(index - n)
+        or
+        index = nAttr and result = e.getContainer()
+        or
+        index = nContainer and result = e.getIdentifier()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A function pointer type.
@@ -2219,28 +3456,41 @@ module Raw {
     RetTypeRepr getRetType() { fn_ptr_type_repr_ret_types(this, result) }
   }
 
+  private Element getImmediateChildOfFnPtrTypeRepr(FnPtrTypeRepr e, int index) {
+    exists(int n, int nAbi, int nParamList, int nRetType |
+      n = 0 and
+      nAbi = n + 1 and
+      nParamList = nAbi + 1 and
+      nRetType = nParamList + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getAbi()
+        or
+        index = nAbi and result = e.getParamList()
+        or
+        index = nParamList and result = e.getRetType()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
-   * A higher-ranked trait bound.
+   * A function pointer type with a `for` modifier.
    *
    * For example:
    * ```rust
-   * fn foo<T>(value: T)
-   * where
-   *     T: for<'a> Fn(&'a str) -> &'a str
-   * //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   * {
-   *     // ...
-   * }
+   * type RefOp<X> = for<'a> fn(&'a X) -> &'a X;
+   * //              ^^^^^^^^^^^^^^^^^^^^^^^^^^
    * ```
    */
   class ForTypeRepr extends @for_type_repr, TypeRepr {
     override string toString() { result = "ForTypeRepr" }
 
     /**
-     * Gets the generic parameter list of this for type representation, if it exists.
+     * Gets the for binder of this for type representation, if it exists.
      */
-    GenericParamList getGenericParamList() { for_type_repr_generic_param_lists(this, result) }
+    ForBinder getForBinder() { for_type_repr_for_binders(this, result) }
 
     /**
      * Gets the type representation of this for type representation, if it exists.
@@ -2248,6 +3498,21 @@ module Raw {
     TypeRepr getTypeRepr() { for_type_repr_type_reprs(this, result) }
   }
 
+  private Element getImmediateChildOfForTypeRepr(ForTypeRepr e, int index) {
+    exists(int n, int nForBinder, int nTypeRepr |
+      n = 0 and
+      nForBinder = n + 1 and
+      nTypeRepr = nForBinder + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getForBinder()
+        or
+        index = nForBinder and result = e.getTypeRepr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A FormatArgsExpr. For example:
@@ -2267,17 +3532,46 @@ module Raw {
      */
     FormatArgsArg getArg(int index) { format_args_expr_args(this, index, result) }
 
+    /**
+     * Gets the number of arguments of this format arguments expression.
+     */
+    int getNumberOfArgs() { result = count(int i | format_args_expr_args(this, i, _)) }
+
     /**
      * Gets the `index`th attr of this format arguments expression (0-based).
      */
     Attr getAttr(int index) { format_args_expr_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this format arguments expression.
+     */
+    int getNumberOfAttrs() { result = count(int i | format_args_expr_attrs(this, i, _)) }
+
     /**
      * Gets the template of this format arguments expression, if it exists.
      */
     Expr getTemplate() { format_args_expr_templates(this, result) }
   }
 
+  private Element getImmediateChildOfFormatArgsExpr(FormatArgsExpr e, int index) {
+    exists(int n, int nArg, int nAttr, int nTemplate, int nFormat |
+      n = 0 and
+      nArg = n + e.getNumberOfArgs() and
+      nAttr = nArg + e.getNumberOfAttrs() and
+      nTemplate = nAttr + 1 and
+      nFormat = nTemplate and
+      (
+        none()
+        or
+        result = e.getArg(index - n)
+        or
+        result = e.getAttr(index - nArg)
+        or
+        index = nAttr and result = e.getTemplate()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A binding pattern. For example:
@@ -2302,6 +3596,11 @@ module Raw {
      */
     Attr getAttr(int index) { ident_pat_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this ident pattern.
+     */
+    int getNumberOfAttrs() { result = count(int i | ident_pat_attrs(this, i, _)) }
+
     /**
      * Holds if this ident pattern is mut.
      */
@@ -2323,6 +3622,24 @@ module Raw {
     Pat getPat() { ident_pat_pats(this, result) }
   }
 
+  private Element getImmediateChildOfIdentPat(IdentPat e, int index) {
+    exists(int n, int nAttr, int nName, int nPat |
+      n = 0 and
+      nAttr = n + e.getNumberOfAttrs() and
+      nName = nAttr + 1 and
+      nPat = nName + 1 and
+      (
+        none()
+        or
+        result = e.getAttr(index - n)
+        or
+        index = nAttr and result = e.getName()
+        or
+        index = nName and result = e.getPat()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * An `if` expression. For example:
@@ -2347,6 +3664,11 @@ module Raw {
      */
     Attr getAttr(int index) { if_expr_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this if expression.
+     */
+    int getNumberOfAttrs() { result = count(int i | if_expr_attrs(this, i, _)) }
+
     /**
      * Gets the condition of this if expression, if it exists.
      */
@@ -2363,6 +3685,27 @@ module Raw {
     BlockExpr getThen() { if_expr_thens(this, result) }
   }
 
+  private Element getImmediateChildOfIfExpr(IfExpr e, int index) {
+    exists(int n, int nAttr, int nCondition, int nElse, int nThen |
+      n = 0 and
+      nAttr = n + e.getNumberOfAttrs() and
+      nCondition = nAttr + 1 and
+      nElse = nCondition + 1 and
+      nThen = nElse + 1 and
+      (
+        none()
+        or
+        result = e.getAttr(index - n)
+        or
+        index = nAttr and result = e.getCondition()
+        or
+        index = nCondition and result = e.getElse()
+        or
+        index = nElse and result = e.getThen()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * An `impl Trait` type.
@@ -2382,6 +3725,18 @@ module Raw {
     TypeBoundList getTypeBoundList() { impl_trait_type_repr_type_bound_lists(this, result) }
   }
 
+  private Element getImmediateChildOfImplTraitTypeRepr(ImplTraitTypeRepr e, int index) {
+    exists(int n, int nTypeBoundList |
+      n = 0 and
+      nTypeBoundList = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getTypeBoundList()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * An index expression. For example:
@@ -2398,6 +3753,11 @@ module Raw {
      */
     Attr getAttr(int index) { index_expr_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this index expression.
+     */
+    int getNumberOfAttrs() { result = count(int i | index_expr_attrs(this, i, _)) }
+
     /**
      * Gets the base of this index expression, if it exists.
      */
@@ -2409,6 +3769,24 @@ module Raw {
     Expr getIndex() { index_expr_indices(this, result) }
   }
 
+  private Element getImmediateChildOfIndexExpr(IndexExpr e, int index) {
+    exists(int n, int nAttr, int nBase, int nIndex |
+      n = 0 and
+      nAttr = n + e.getNumberOfAttrs() and
+      nBase = nAttr + 1 and
+      nIndex = nBase + 1 and
+      (
+        none()
+        or
+        result = e.getAttr(index - n)
+        or
+        index = nAttr and result = e.getBase()
+        or
+        index = nBase and result = e.getIndex()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * An inferred type (`_`).
@@ -2423,6 +3801,8 @@ module Raw {
     override string toString() { result = "InferTypeRepr" }
   }
 
+  private Element getImmediateChildOfInferTypeRepr(InferTypeRepr e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    * An item such as a function, struct, enum, etc.
@@ -2469,6 +3849,11 @@ module Raw {
      */
     Attr getAttr(int index) { let_expr_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this let expression.
+     */
+    int getNumberOfAttrs() { result = count(int i | let_expr_attrs(this, i, _)) }
+
     /**
      * Gets the scrutinee of this let expression, if it exists.
      */
@@ -2480,6 +3865,24 @@ module Raw {
     Pat getPat() { let_expr_pats(this, result) }
   }
 
+  private Element getImmediateChildOfLetExpr(LetExpr e, int index) {
+    exists(int n, int nAttr, int nScrutinee, int nPat |
+      n = 0 and
+      nAttr = n + e.getNumberOfAttrs() and
+      nScrutinee = nAttr + 1 and
+      nPat = nScrutinee + 1 and
+      (
+        none()
+        or
+        result = e.getAttr(index - n)
+        or
+        index = nAttr and result = e.getScrutinee()
+        or
+        index = nScrutinee and result = e.getPat()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A let statement. For example:
@@ -2502,6 +3905,11 @@ module Raw {
      */
     Attr getAttr(int index) { let_stmt_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this let statement.
+     */
+    int getNumberOfAttrs() { result = count(int i | let_stmt_attrs(this, i, _)) }
+
     /**
      * Gets the initializer of this let statement, if it exists.
      */
@@ -2523,6 +3931,30 @@ module Raw {
     TypeRepr getTypeRepr() { let_stmt_type_reprs(this, result) }
   }
 
+  private Element getImmediateChildOfLetStmt(LetStmt e, int index) {
+    exists(int n, int nAttr, int nInitializer, int nLetElse, int nPat, int nTypeRepr |
+      n = 0 and
+      nAttr = n + e.getNumberOfAttrs() and
+      nInitializer = nAttr + 1 and
+      nLetElse = nInitializer + 1 and
+      nPat = nLetElse + 1 and
+      nTypeRepr = nPat + 1 and
+      (
+        none()
+        or
+        result = e.getAttr(index - n)
+        or
+        index = nAttr and result = e.getInitializer()
+        or
+        index = nInitializer and result = e.getLetElse()
+        or
+        index = nLetElse and result = e.getPat()
+        or
+        index = nPat and result = e.getTypeRepr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A lifetime annotation.
@@ -2542,6 +3974,8 @@ module Raw {
     string getText() { lifetime_texts(this, result) }
   }
 
+  private Element getImmediateChildOfLifetime(Lifetime e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    * A lifetime argument in a generic argument list.
@@ -2561,6 +3995,18 @@ module Raw {
     Lifetime getLifetime() { lifetime_arg_lifetimes(this, result) }
   }
 
+  private Element getImmediateChildOfLifetimeArg(LifetimeArg e, int index) {
+    exists(int n, int nLifetime |
+      n = 0 and
+      nLifetime = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getLifetime()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A lifetime parameter in a generic parameter list.
@@ -2579,6 +4025,11 @@ module Raw {
      */
     Attr getAttr(int index) { lifetime_param_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this lifetime parameter.
+     */
+    int getNumberOfAttrs() { result = count(int i | lifetime_param_attrs(this, i, _)) }
+
     /**
      * Gets the lifetime of this lifetime parameter, if it exists.
      */
@@ -2590,6 +4041,24 @@ module Raw {
     TypeBoundList getTypeBoundList() { lifetime_param_type_bound_lists(this, result) }
   }
 
+  private Element getImmediateChildOfLifetimeParam(LifetimeParam e, int index) {
+    exists(int n, int nAttr, int nLifetime, int nTypeBoundList |
+      n = 0 and
+      nAttr = n + e.getNumberOfAttrs() and
+      nLifetime = nAttr + 1 and
+      nTypeBoundList = nLifetime + 1 and
+      (
+        none()
+        or
+        result = e.getAttr(index - n)
+        or
+        index = nAttr and result = e.getLifetime()
+        or
+        index = nLifetime and result = e.getTypeBoundList()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A literal expression. For example:
@@ -2612,12 +4081,29 @@ module Raw {
      */
     Attr getAttr(int index) { literal_expr_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this literal expression.
+     */
+    int getNumberOfAttrs() { result = count(int i | literal_expr_attrs(this, i, _)) }
+
     /**
      * Gets the text value of this literal expression, if it exists.
      */
     string getTextValue() { literal_expr_text_values(this, result) }
   }
 
+  private Element getImmediateChildOfLiteralExpr(LiteralExpr e, int index) {
+    exists(int n, int nAttr |
+      n = 0 and
+      nAttr = n + e.getNumberOfAttrs() and
+      (
+        none()
+        or
+        result = e.getAttr(index - n)
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A literal pattern. For example:
@@ -2637,27 +4123,65 @@ module Raw {
     LiteralExpr getLiteral() { literal_pat_literals(this, result) }
   }
 
+  private Element getImmediateChildOfLiteralPat(LiteralPat e, int index) {
+    exists(int n, int nLiteral |
+      n = 0 and
+      nLiteral = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getLiteral()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A sequence of statements generated by a `MacroCall`. For example:
    * ```rust
-   * fn main() {
-   *     println!("Hello, world!"); // This macro expands into a list of statements
+   * macro_rules! my_macro {
+   *     () => {
+   *         let mut x = 40;
+   *         x += 2;
+   *         x
+   *     };
    * }
+   *
+   * my_macro!();  // this macro expands to a sequence of statements (and an expression)
    * ```
    */
   class MacroBlockExpr extends @macro_block_expr, Expr {
     override string toString() { result = "MacroBlockExpr" }
 
-    /**
-     * Gets the tail expression of this macro block expression, if it exists.
-     */
-    Expr getTailExpr() { macro_block_expr_tail_exprs(this, result) }
-
     /**
      * Gets the `index`th statement of this macro block expression (0-based).
      */
     Stmt getStatement(int index) { macro_block_expr_statements(this, index, result) }
+
+    /**
+     * Gets the number of statements of this macro block expression.
+     */
+    int getNumberOfStatements() { result = count(int i | macro_block_expr_statements(this, i, _)) }
+
+    /**
+     * Gets the tail expression of this macro block expression, if it exists.
+     */
+    Expr getTailExpr() { macro_block_expr_tail_exprs(this, result) }
+  }
+
+  private Element getImmediateChildOfMacroBlockExpr(MacroBlockExpr e, int index) {
+    exists(int n, int nStatement, int nTailExpr |
+      n = 0 and
+      nStatement = n + e.getNumberOfStatements() and
+      nTailExpr = nStatement + 1 and
+      (
+        none()
+        or
+        result = e.getStatement(index - n)
+        or
+        index = nStatement and result = e.getTailExpr()
+      )
+    )
   }
 
   /**
@@ -2678,6 +4202,18 @@ module Raw {
     MacroCall getMacroCall() { macro_expr_macro_calls(this, result) }
   }
 
+  private Element getImmediateChildOfMacroExpr(MacroExpr e, int index) {
+    exists(int n, int nMacroCall |
+      n = 0 and
+      nMacroCall = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getMacroCall()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A macro pattern, representing the invocation of a macro that produces a pattern.
@@ -2705,6 +4241,18 @@ module Raw {
     MacroCall getMacroCall() { macro_pat_macro_calls(this, result) }
   }
 
+  private Element getImmediateChildOfMacroPat(MacroPat e, int index) {
+    exists(int n, int nMacroCall |
+      n = 0 and
+      nMacroCall = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getMacroCall()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A type produced by a macro.
@@ -2727,6 +4275,18 @@ module Raw {
     MacroCall getMacroCall() { macro_type_repr_macro_calls(this, result) }
   }
 
+  private Element getImmediateChildOfMacroTypeRepr(MacroTypeRepr e, int index) {
+    exists(int n, int nMacroCall |
+      n = 0 and
+      nMacroCall = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getMacroCall()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A match expression. For example:
@@ -2751,6 +4311,11 @@ module Raw {
      */
     Attr getAttr(int index) { match_expr_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this match expression.
+     */
+    int getNumberOfAttrs() { result = count(int i | match_expr_attrs(this, i, _)) }
+
     /**
      * Gets the scrutinee (the expression being matched) of this match expression, if it exists.
      */
@@ -2762,6 +4327,24 @@ module Raw {
     MatchArmList getMatchArmList() { match_expr_match_arm_lists(this, result) }
   }
 
+  private Element getImmediateChildOfMatchExpr(MatchExpr e, int index) {
+    exists(int n, int nAttr, int nScrutinee, int nMatchArmList |
+      n = 0 and
+      nAttr = n + e.getNumberOfAttrs() and
+      nScrutinee = nAttr + 1 and
+      nMatchArmList = nScrutinee + 1 and
+      (
+        none()
+        or
+        result = e.getAttr(index - n)
+        or
+        index = nAttr and result = e.getScrutinee()
+        or
+        index = nScrutinee and result = e.getMatchArmList()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A reference to a name.
@@ -2781,6 +4364,8 @@ module Raw {
     string getText() { name_ref_texts(this, result) }
   }
 
+  private Element getImmediateChildOfNameRef(NameRef e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    * The never type `!`.
@@ -2795,6 +4380,8 @@ module Raw {
     override string toString() { result = "NeverTypeRepr" }
   }
 
+  private Element getImmediateChildOfNeverTypeRepr(NeverTypeRepr e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    *  An `offset_of` expression. For example:
@@ -2810,17 +4397,45 @@ module Raw {
      */
     Attr getAttr(int index) { offset_of_expr_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this offset of expression.
+     */
+    int getNumberOfAttrs() { result = count(int i | offset_of_expr_attrs(this, i, _)) }
+
     /**
      * Gets the `index`th field of this offset of expression (0-based).
      */
     NameRef getField(int index) { offset_of_expr_fields(this, index, result) }
 
+    /**
+     * Gets the number of fields of this offset of expression.
+     */
+    int getNumberOfFields() { result = count(int i | offset_of_expr_fields(this, i, _)) }
+
     /**
      * Gets the type representation of this offset of expression, if it exists.
      */
     TypeRepr getTypeRepr() { offset_of_expr_type_reprs(this, result) }
   }
 
+  private Element getImmediateChildOfOffsetOfExpr(OffsetOfExpr e, int index) {
+    exists(int n, int nAttr, int nField, int nTypeRepr |
+      n = 0 and
+      nAttr = n + e.getNumberOfAttrs() and
+      nField = nAttr + e.getNumberOfFields() and
+      nTypeRepr = nField + 1 and
+      (
+        none()
+        or
+        result = e.getAttr(index - n)
+        or
+        result = e.getField(index - nAttr)
+        or
+        index = nField and result = e.getTypeRepr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * An or pattern. For example:
@@ -2837,6 +4452,23 @@ module Raw {
      * Gets the `index`th pattern of this or pattern (0-based).
      */
     Pat getPat(int index) { or_pat_pats(this, index, result) }
+
+    /**
+     * Gets the number of patterns of this or pattern.
+     */
+    int getNumberOfPats() { result = count(int i | or_pat_pats(this, i, _)) }
+  }
+
+  private Element getImmediateChildOfOrPat(OrPat e, int index) {
+    exists(int n, int nPat |
+      n = 0 and
+      nPat = n + e.getNumberOfPats() and
+      (
+        none()
+        or
+        result = e.getPat(index - n)
+      )
+    )
   }
 
   /**
@@ -2857,6 +4489,24 @@ module Raw {
     Pat getPat() { param_pats(this, result) }
   }
 
+  private Element getImmediateChildOfParam(Param e, int index) {
+    exists(int n, int nAttr, int nTypeRepr, int nPat |
+      n = 0 and
+      nAttr = n + e.getNumberOfAttrs() and
+      nTypeRepr = nAttr + 1 and
+      nPat = nTypeRepr + 1 and
+      (
+        none()
+        or
+        result = e.getAttr(index - n)
+        or
+        index = nAttr and result = e.getTypeRepr()
+        or
+        index = nTypeRepr and result = e.getPat()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A parenthesized expression.
@@ -2874,12 +4524,32 @@ module Raw {
      */
     Attr getAttr(int index) { paren_expr_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this paren expression.
+     */
+    int getNumberOfAttrs() { result = count(int i | paren_expr_attrs(this, i, _)) }
+
     /**
      * Gets the expression of this paren expression, if it exists.
      */
     Expr getExpr() { paren_expr_exprs(this, result) }
   }
 
+  private Element getImmediateChildOfParenExpr(ParenExpr e, int index) {
+    exists(int n, int nAttr, int nExpr |
+      n = 0 and
+      nAttr = n + e.getNumberOfAttrs() and
+      nExpr = nAttr + 1 and
+      (
+        none()
+        or
+        result = e.getAttr(index - n)
+        or
+        index = nAttr and result = e.getExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A parenthesized pattern.
@@ -2899,6 +4569,18 @@ module Raw {
     Pat getPat() { paren_pat_pats(this, result) }
   }
 
+  private Element getImmediateChildOfParenPat(ParenPat e, int index) {
+    exists(int n, int nPat |
+      n = 0 and
+      nPat = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getPat()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A parenthesized type.
@@ -2918,15 +4600,16 @@ module Raw {
     TypeRepr getTypeRepr() { paren_type_repr_type_reprs(this, result) }
   }
 
-  /**
-   * INTERNAL: Do not use.
-   * An AST element wrapping a path (`PathExpr`, `RecordExpr`, `PathPat`, `RecordPat`, `TupleStructPat`).
-   */
-  class PathAstNode extends @path_ast_node, Resolvable {
-    /**
-     * Gets the path of this path ast node, if it exists.
-     */
-    Path getPath() { path_ast_node_paths(this, result) }
+  private Element getImmediateChildOfParenTypeRepr(ParenTypeRepr e, int index) {
+    exists(int n, int nTypeRepr |
+      n = 0 and
+      nTypeRepr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getTypeRepr()
+      )
+    )
   }
 
   /**
@@ -2935,6 +4618,32 @@ module Raw {
    */
   class PathExprBase extends @path_expr_base, Expr { }
 
+  /**
+   * INTERNAL: Do not use.
+   * A path pattern. For example:
+   * ```rust
+   * match x {
+   *     Foo::Bar => "ok",
+   *     _ => "fail",
+   * }
+   * ```
+   */
+  class PathPat extends @path_pat, Pat, PathAstNode {
+    override string toString() { result = "PathPat" }
+  }
+
+  private Element getImmediateChildOfPathPat(PathPat e, int index) {
+    exists(int n, int nPath |
+      n = 0 and
+      nPath = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getPath()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A path referring to a type. For example:
@@ -2952,6 +4661,18 @@ module Raw {
     Path getPath() { path_type_repr_paths(this, result) }
   }
 
+  private Element getImmediateChildOfPathTypeRepr(PathTypeRepr e, int index) {
+    exists(int n, int nPath |
+      n = 0 and
+      nPath = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getPath()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A unary operation expression. For example:
@@ -2969,6 +4690,11 @@ module Raw {
      */
     Attr getAttr(int index) { prefix_expr_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this prefix expression.
+     */
+    int getNumberOfAttrs() { result = count(int i | prefix_expr_attrs(this, i, _)) }
+
     /**
      * Gets the expression of this prefix expression, if it exists.
      */
@@ -2980,6 +4706,21 @@ module Raw {
     string getOperatorName() { prefix_expr_operator_names(this, result) }
   }
 
+  private Element getImmediateChildOfPrefixExpr(PrefixExpr e, int index) {
+    exists(int n, int nAttr, int nExpr |
+      n = 0 and
+      nAttr = n + e.getNumberOfAttrs() and
+      nExpr = nAttr + 1 and
+      (
+        none()
+        or
+        result = e.getAttr(index - n)
+        or
+        index = nAttr and result = e.getExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A pointer type.
@@ -3010,6 +4751,18 @@ module Raw {
     TypeRepr getTypeRepr() { ptr_type_repr_type_reprs(this, result) }
   }
 
+  private Element getImmediateChildOfPtrTypeRepr(PtrTypeRepr e, int index) {
+    exists(int n, int nTypeRepr |
+      n = 0 and
+      nTypeRepr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getTypeRepr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A range expression. For example:
@@ -3030,6 +4783,11 @@ module Raw {
      */
     Attr getAttr(int index) { range_expr_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this range expression.
+     */
+    int getNumberOfAttrs() { result = count(int i | range_expr_attrs(this, i, _)) }
+
     /**
      * Gets the end of this range expression, if it exists.
      */
@@ -3046,6 +4804,24 @@ module Raw {
     Expr getStart() { range_expr_starts(this, result) }
   }
 
+  private Element getImmediateChildOfRangeExpr(RangeExpr e, int index) {
+    exists(int n, int nAttr, int nEnd, int nStart |
+      n = 0 and
+      nAttr = n + e.getNumberOfAttrs() and
+      nEnd = nAttr + 1 and
+      nStart = nEnd + 1 and
+      (
+        none()
+        or
+        result = e.getAttr(index - n)
+        or
+        index = nAttr and result = e.getEnd()
+        or
+        index = nEnd and result = e.getStart()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A range pattern. For example:
@@ -3076,6 +4852,21 @@ module Raw {
     Pat getStart() { range_pat_starts(this, result) }
   }
 
+  private Element getImmediateChildOfRangePat(RangePat e, int index) {
+    exists(int n, int nEnd, int nStart |
+      n = 0 and
+      nEnd = n + 1 and
+      nStart = nEnd + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getEnd()
+        or
+        index = nEnd and result = e.getStart()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A reference expression. For example:
@@ -3094,6 +4885,11 @@ module Raw {
      */
     Attr getAttr(int index) { ref_expr_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this reference expression.
+     */
+    int getNumberOfAttrs() { result = count(int i | ref_expr_attrs(this, i, _)) }
+
     /**
      * Gets the expression of this reference expression, if it exists.
      */
@@ -3115,6 +4911,21 @@ module Raw {
     predicate isRaw() { ref_expr_is_raw(this) }
   }
 
+  private Element getImmediateChildOfRefExpr(RefExpr e, int index) {
+    exists(int n, int nAttr, int nExpr |
+      n = 0 and
+      nAttr = n + e.getNumberOfAttrs() and
+      nExpr = nAttr + 1 and
+      (
+        none()
+        or
+        result = e.getAttr(index - n)
+        or
+        index = nAttr and result = e.getExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A reference pattern. For example:
@@ -3139,6 +4950,18 @@ module Raw {
     Pat getPat() { ref_pat_pats(this, result) }
   }
 
+  private Element getImmediateChildOfRefPat(RefPat e, int index) {
+    exists(int n, int nPat |
+      n = 0 and
+      nPat = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getPat()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A reference type.
@@ -3169,6 +4992,21 @@ module Raw {
     TypeRepr getTypeRepr() { ref_type_repr_type_reprs(this, result) }
   }
 
+  private Element getImmediateChildOfRefTypeRepr(RefTypeRepr e, int index) {
+    exists(int n, int nLifetime, int nTypeRepr |
+      n = 0 and
+      nLifetime = n + 1 and
+      nTypeRepr = nLifetime + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getLifetime()
+        or
+        index = nLifetime and result = e.getTypeRepr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A rest pattern (`..`) in a tuple, slice, or struct pattern.
@@ -3186,6 +5024,23 @@ module Raw {
      * Gets the `index`th attr of this rest pattern (0-based).
      */
     Attr getAttr(int index) { rest_pat_attrs(this, index, result) }
+
+    /**
+     * Gets the number of attrs of this rest pattern.
+     */
+    int getNumberOfAttrs() { result = count(int i | rest_pat_attrs(this, i, _)) }
+  }
+
+  private Element getImmediateChildOfRestPat(RestPat e, int index) {
+    exists(int n, int nAttr |
+      n = 0 and
+      nAttr = n + e.getNumberOfAttrs() and
+      (
+        none()
+        or
+        result = e.getAttr(index - n)
+      )
+    )
   }
 
   /**
@@ -3210,12 +5065,32 @@ module Raw {
      */
     Attr getAttr(int index) { return_expr_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this return expression.
+     */
+    int getNumberOfAttrs() { result = count(int i | return_expr_attrs(this, i, _)) }
+
     /**
      * Gets the expression of this return expression, if it exists.
      */
     Expr getExpr() { return_expr_exprs(this, result) }
   }
 
+  private Element getImmediateChildOfReturnExpr(ReturnExpr e, int index) {
+    exists(int n, int nAttr, int nExpr |
+      n = 0 and
+      nAttr = n + e.getNumberOfAttrs() and
+      nExpr = nAttr + 1 and
+      (
+        none()
+        or
+        result = e.getAttr(index - n)
+        or
+        index = nAttr and result = e.getExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A `self` parameter. For example `self` in:
@@ -3254,6 +5129,27 @@ module Raw {
     Name getName() { self_param_names(this, result) }
   }
 
+  private Element getImmediateChildOfSelfParam(SelfParam e, int index) {
+    exists(int n, int nAttr, int nTypeRepr, int nLifetime, int nName |
+      n = 0 and
+      nAttr = n + e.getNumberOfAttrs() and
+      nTypeRepr = nAttr + 1 and
+      nLifetime = nTypeRepr + 1 and
+      nName = nLifetime + 1 and
+      (
+        none()
+        or
+        result = e.getAttr(index - n)
+        or
+        index = nAttr and result = e.getTypeRepr()
+        or
+        index = nTypeRepr and result = e.getLifetime()
+        or
+        index = nLifetime and result = e.getName()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A slice pattern. For example:
@@ -3272,6 +5168,23 @@ module Raw {
      * Gets the `index`th pattern of this slice pattern (0-based).
      */
     Pat getPat(int index) { slice_pat_pats(this, index, result) }
+
+    /**
+     * Gets the number of patterns of this slice pattern.
+     */
+    int getNumberOfPats() { result = count(int i | slice_pat_pats(this, i, _)) }
+  }
+
+  private Element getImmediateChildOfSlicePat(SlicePat e, int index) {
+    exists(int n, int nPat |
+      n = 0 and
+      nPat = n + e.getNumberOfPats() and
+      (
+        none()
+        or
+        result = e.getPat(index - n)
+      )
+    )
   }
 
   /**
@@ -3293,6 +5206,54 @@ module Raw {
     TypeRepr getTypeRepr() { slice_type_repr_type_reprs(this, result) }
   }
 
+  private Element getImmediateChildOfSliceTypeRepr(SliceTypeRepr e, int index) {
+    exists(int n, int nTypeRepr |
+      n = 0 and
+      nTypeRepr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getTypeRepr()
+      )
+    )
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A struct expression. For example:
+   * ```rust
+   * let first = Foo { a: 1, b: 2 };
+   * let second = Foo { a: 2, ..first };
+   * let n = Foo { a: 1, b: 2 }.b;
+   * Foo { a: m, .. } = second;
+   * ```
+   */
+  class StructExpr extends @struct_expr, Expr, PathAstNode {
+    override string toString() { result = "StructExpr" }
+
+    /**
+     * Gets the struct expression field list of this struct expression, if it exists.
+     */
+    StructExprFieldList getStructExprFieldList() {
+      struct_expr_struct_expr_field_lists(this, result)
+    }
+  }
+
+  private Element getImmediateChildOfStructExpr(StructExpr e, int index) {
+    exists(int n, int nPath, int nStructExprFieldList |
+      n = 0 and
+      nPath = n + 1 and
+      nStructExprFieldList = nPath + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getPath()
+        or
+        index = nPath and result = e.getStructExprFieldList()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A list of fields in a struct declaration.
@@ -3310,6 +5271,57 @@ module Raw {
      * Gets the `index`th field of this struct field list (0-based).
      */
     StructField getField(int index) { struct_field_list_fields(this, index, result) }
+
+    /**
+     * Gets the number of fields of this struct field list.
+     */
+    int getNumberOfFields() { result = count(int i | struct_field_list_fields(this, i, _)) }
+  }
+
+  private Element getImmediateChildOfStructFieldList(StructFieldList e, int index) {
+    exists(int n, int nField |
+      n = 0 and
+      nField = n + e.getNumberOfFields() and
+      (
+        none()
+        or
+        result = e.getField(index - n)
+      )
+    )
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A struct pattern. For example:
+   * ```rust
+   * match x {
+   *     Foo { a: 1, b: 2 } => "ok",
+   *     Foo { .. } => "fail",
+   * }
+   * ```
+   */
+  class StructPat extends @struct_pat, Pat, PathAstNode {
+    override string toString() { result = "StructPat" }
+
+    /**
+     * Gets the struct pattern field list of this struct pattern, if it exists.
+     */
+    StructPatFieldList getStructPatFieldList() { struct_pat_struct_pat_field_lists(this, result) }
+  }
+
+  private Element getImmediateChildOfStructPat(StructPat e, int index) {
+    exists(int n, int nPath, int nStructPatFieldList |
+      n = 0 and
+      nPath = n + 1 and
+      nStructPatFieldList = nPath + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getPath()
+        or
+        index = nPath and result = e.getStructPatFieldList()
+      )
+    )
   }
 
   /**
@@ -3330,18 +5342,39 @@ module Raw {
      */
     Attr getAttr(int index) { try_expr_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this try expression.
+     */
+    int getNumberOfAttrs() { result = count(int i | try_expr_attrs(this, i, _)) }
+
     /**
      * Gets the expression of this try expression, if it exists.
      */
     Expr getExpr() { try_expr_exprs(this, result) }
   }
 
+  private Element getImmediateChildOfTryExpr(TryExpr e, int index) {
+    exists(int n, int nAttr, int nExpr |
+      n = 0 and
+      nAttr = n + e.getNumberOfAttrs() and
+      nExpr = nAttr + 1 and
+      (
+        none()
+        or
+        result = e.getAttr(index - n)
+        or
+        index = nAttr and result = e.getExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A tuple expression. For example:
    * ```rust
-   * (1, "one");
-   * (2, "two")[0] = 3;
+   * let tuple = (1, "one");
+   * let n = (2, "two").0;
+   * let (a, b) = tuple;
    * ```
    */
   class TupleExpr extends @tuple_expr, Expr {
@@ -3352,10 +5385,35 @@ module Raw {
      */
     Attr getAttr(int index) { tuple_expr_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this tuple expression.
+     */
+    int getNumberOfAttrs() { result = count(int i | tuple_expr_attrs(this, i, _)) }
+
     /**
      * Gets the `index`th field of this tuple expression (0-based).
      */
     Expr getField(int index) { tuple_expr_fields(this, index, result) }
+
+    /**
+     * Gets the number of fields of this tuple expression.
+     */
+    int getNumberOfFields() { result = count(int i | tuple_expr_fields(this, i, _)) }
+  }
+
+  private Element getImmediateChildOfTupleExpr(TupleExpr e, int index) {
+    exists(int n, int nAttr, int nField |
+      n = 0 and
+      nAttr = n + e.getNumberOfAttrs() and
+      nField = nAttr + e.getNumberOfFields() and
+      (
+        none()
+        or
+        result = e.getAttr(index - n)
+        or
+        result = e.getField(index - nAttr)
+      )
+    )
   }
 
   /**
@@ -3375,6 +5433,23 @@ module Raw {
      * Gets the `index`th field of this tuple field list (0-based).
      */
     TupleField getField(int index) { tuple_field_list_fields(this, index, result) }
+
+    /**
+     * Gets the number of fields of this tuple field list.
+     */
+    int getNumberOfFields() { result = count(int i | tuple_field_list_fields(this, i, _)) }
+  }
+
+  private Element getImmediateChildOfTupleFieldList(TupleFieldList e, int index) {
+    exists(int n, int nField |
+      n = 0 and
+      nField = n + e.getNumberOfFields() and
+      (
+        none()
+        or
+        result = e.getField(index - n)
+      )
+    )
   }
 
   /**
@@ -3392,6 +5467,63 @@ module Raw {
      * Gets the `index`th field of this tuple pattern (0-based).
      */
     Pat getField(int index) { tuple_pat_fields(this, index, result) }
+
+    /**
+     * Gets the number of fields of this tuple pattern.
+     */
+    int getNumberOfFields() { result = count(int i | tuple_pat_fields(this, i, _)) }
+  }
+
+  private Element getImmediateChildOfTuplePat(TuplePat e, int index) {
+    exists(int n, int nField |
+      n = 0 and
+      nField = n + e.getNumberOfFields() and
+      (
+        none()
+        or
+        result = e.getField(index - n)
+      )
+    )
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A tuple struct pattern. For example:
+   * ```rust
+   * match x {
+   *     Tuple("a", 1, 2, 3) => "great",
+   *     Tuple(.., 3) => "fine",
+   *     Tuple(..) => "fail",
+   * };
+   * ```
+   */
+  class TupleStructPat extends @tuple_struct_pat, Pat, PathAstNode {
+    override string toString() { result = "TupleStructPat" }
+
+    /**
+     * Gets the `index`th field of this tuple struct pattern (0-based).
+     */
+    Pat getField(int index) { tuple_struct_pat_fields(this, index, result) }
+
+    /**
+     * Gets the number of fields of this tuple struct pattern.
+     */
+    int getNumberOfFields() { result = count(int i | tuple_struct_pat_fields(this, i, _)) }
+  }
+
+  private Element getImmediateChildOfTupleStructPat(TupleStructPat e, int index) {
+    exists(int n, int nPath, int nField |
+      n = 0 and
+      nPath = n + 1 and
+      nField = nPath + e.getNumberOfFields() and
+      (
+        none()
+        or
+        index = n and result = e.getPath()
+        or
+        result = e.getField(index - nPath)
+      )
+    )
   }
 
   /**
@@ -3411,6 +5543,23 @@ module Raw {
      * Gets the `index`th field of this tuple type representation (0-based).
      */
     TypeRepr getField(int index) { tuple_type_repr_fields(this, index, result) }
+
+    /**
+     * Gets the number of fields of this tuple type representation.
+     */
+    int getNumberOfFields() { result = count(int i | tuple_type_repr_fields(this, i, _)) }
+  }
+
+  private Element getImmediateChildOfTupleTypeRepr(TupleTypeRepr e, int index) {
+    exists(int n, int nField |
+      n = 0 and
+      nField = n + e.getNumberOfFields() and
+      (
+        none()
+        or
+        result = e.getField(index - n)
+      )
+    )
   }
 
   /**
@@ -3432,6 +5581,18 @@ module Raw {
     TypeRepr getTypeRepr() { type_arg_type_reprs(this, result) }
   }
 
+  private Element getImmediateChildOfTypeArg(TypeArg e, int index) {
+    exists(int n, int nTypeRepr |
+      n = 0 and
+      nTypeRepr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getTypeRepr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A type parameter in a generic parameter list.
@@ -3450,6 +5611,11 @@ module Raw {
      */
     Attr getAttr(int index) { type_param_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this type parameter.
+     */
+    int getNumberOfAttrs() { result = count(int i | type_param_attrs(this, i, _)) }
+
     /**
      * Gets the default type of this type parameter, if it exists.
      */
@@ -3466,6 +5632,27 @@ module Raw {
     TypeBoundList getTypeBoundList() { type_param_type_bound_lists(this, result) }
   }
 
+  private Element getImmediateChildOfTypeParam(TypeParam e, int index) {
+    exists(int n, int nAttr, int nDefaultType, int nName, int nTypeBoundList |
+      n = 0 and
+      nAttr = n + e.getNumberOfAttrs() and
+      nDefaultType = nAttr + 1 and
+      nName = nDefaultType + 1 and
+      nTypeBoundList = nName + 1 and
+      (
+        none()
+        or
+        result = e.getAttr(index - n)
+        or
+        index = nAttr and result = e.getDefaultType()
+        or
+        index = nDefaultType and result = e.getName()
+        or
+        index = nName and result = e.getTypeBoundList()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * An underscore expression. For example:
@@ -3480,6 +5667,23 @@ module Raw {
      * Gets the `index`th attr of this underscore expression (0-based).
      */
     Attr getAttr(int index) { underscore_expr_attrs(this, index, result) }
+
+    /**
+     * Gets the number of attrs of this underscore expression.
+     */
+    int getNumberOfAttrs() { result = count(int i | underscore_expr_attrs(this, i, _)) }
+  }
+
+  private Element getImmediateChildOfUnderscoreExpr(UnderscoreExpr e, int index) {
+    exists(int n, int nAttr |
+      n = 0 and
+      nAttr = n + e.getNumberOfAttrs() and
+      (
+        none()
+        or
+        result = e.getAttr(index - n)
+      )
+    )
   }
 
   /**
@@ -3500,6 +5704,11 @@ module Raw {
      */
     Attr getAttr(int index) { variant_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this variant.
+     */
+    int getNumberOfAttrs() { result = count(int i | variant_attrs(this, i, _)) }
+
     /**
      * Gets the discriminant of this variant, if it exists.
      */
@@ -3521,6 +5730,30 @@ module Raw {
     Visibility getVisibility() { variant_visibilities(this, result) }
   }
 
+  private Element getImmediateChildOfVariant(Variant e, int index) {
+    exists(int n, int nAttr, int nDiscriminant, int nFieldList, int nName, int nVisibility |
+      n = 0 and
+      nAttr = n + e.getNumberOfAttrs() and
+      nDiscriminant = nAttr + 1 and
+      nFieldList = nDiscriminant + 1 and
+      nName = nFieldList + 1 and
+      nVisibility = nName + 1 and
+      (
+        none()
+        or
+        result = e.getAttr(index - n)
+        or
+        index = nAttr and result = e.getDiscriminant()
+        or
+        index = nDiscriminant and result = e.getFieldList()
+        or
+        index = nFieldList and result = e.getName()
+        or
+        index = nName and result = e.getVisibility()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A wildcard pattern. For example:
@@ -3532,6 +5765,8 @@ module Raw {
     override string toString() { result = "WildcardPat" }
   }
 
+  private Element getImmediateChildOfWildcardPat(WildcardPat e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    * A `yeet` expression. For example:
@@ -3549,12 +5784,32 @@ module Raw {
      */
     Attr getAttr(int index) { yeet_expr_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this yeet expression.
+     */
+    int getNumberOfAttrs() { result = count(int i | yeet_expr_attrs(this, i, _)) }
+
     /**
      * Gets the expression of this yeet expression, if it exists.
      */
     Expr getExpr() { yeet_expr_exprs(this, result) }
   }
 
+  private Element getImmediateChildOfYeetExpr(YeetExpr e, int index) {
+    exists(int n, int nAttr, int nExpr |
+      n = 0 and
+      nAttr = n + e.getNumberOfAttrs() and
+      nExpr = nAttr + 1 and
+      (
+        none()
+        or
+        result = e.getAttr(index - n)
+        or
+        index = nAttr and result = e.getExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A `yield` expression. For example:
@@ -3573,12 +5828,32 @@ module Raw {
      */
     Attr getAttr(int index) { yield_expr_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this yield expression.
+     */
+    int getNumberOfAttrs() { result = count(int i | yield_expr_attrs(this, i, _)) }
+
     /**
      * Gets the expression of this yield expression, if it exists.
      */
     Expr getExpr() { yield_expr_exprs(this, result) }
   }
 
+  private Element getImmediateChildOfYieldExpr(YieldExpr e, int index) {
+    exists(int n, int nAttr, int nExpr |
+      n = 0 and
+      nAttr = n + e.getNumberOfAttrs() and
+      nExpr = nAttr + 1 and
+      (
+        none()
+        or
+        result = e.getAttr(index - n)
+        or
+        index = nAttr and result = e.getExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * An ADT (Abstract Data Type) definition, such as `Struct`, `Enum`, or `Union`.
@@ -3590,6 +5865,78 @@ module Raw {
     MacroItems getDeriveMacroExpansion(int index) {
       adt_derive_macro_expansions(this, index, result)
     }
+
+    /**
+     * Gets the number of derive macro expansions of this adt.
+     */
+    int getNumberOfDeriveMacroExpansions() {
+      result = count(int i | adt_derive_macro_expansions(this, i, _))
+    }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * An inline assembly expression. For example:
+   * ```rust
+   * unsafe {
+   *     #[inline(always)]
+   *     builtin # asm("cmp {0}, {1}", in(reg) a, in(reg) b);
+   * }
+   * ```
+   */
+  class AsmExpr extends @asm_expr, Expr, Item {
+    override string toString() { result = "AsmExpr" }
+
+    /**
+     * Gets the `index`th asm piece of this asm expression (0-based).
+     */
+    AsmPiece getAsmPiece(int index) { asm_expr_asm_pieces(this, index, result) }
+
+    /**
+     * Gets the number of asm pieces of this asm expression.
+     */
+    int getNumberOfAsmPieces() { result = count(int i | asm_expr_asm_pieces(this, i, _)) }
+
+    /**
+     * Gets the `index`th attr of this asm expression (0-based).
+     */
+    Attr getAttr(int index) { asm_expr_attrs(this, index, result) }
+
+    /**
+     * Gets the number of attrs of this asm expression.
+     */
+    int getNumberOfAttrs() { result = count(int i | asm_expr_attrs(this, i, _)) }
+
+    /**
+     * Gets the `index`th template of this asm expression (0-based).
+     */
+    Expr getTemplate(int index) { asm_expr_templates(this, index, result) }
+
+    /**
+     * Gets the number of templates of this asm expression.
+     */
+    int getNumberOfTemplates() { result = count(int i | asm_expr_templates(this, i, _)) }
+  }
+
+  private Element getImmediateChildOfAsmExpr(AsmExpr e, int index) {
+    exists(int n, int nAttributeMacroExpansion, int nAsmPiece, int nAttr, int nTemplate |
+      n = 0 and
+      nAttributeMacroExpansion = n + 1 and
+      nAsmPiece = nAttributeMacroExpansion + e.getNumberOfAsmPieces() and
+      nAttr = nAsmPiece + e.getNumberOfAttrs() and
+      nTemplate = nAttr + e.getNumberOfTemplates() and
+      (
+        none()
+        or
+        index = n and result = e.getAttributeMacroExpansion()
+        or
+        result = e.getAsmPiece(index - nAttributeMacroExpansion)
+        or
+        result = e.getAttr(index - nAsmPiece)
+        or
+        result = e.getTemplate(index - nAttr)
+      )
+    )
   }
 
   /**
@@ -3627,6 +5974,11 @@ module Raw {
      */
     Attr getAttr(int index) { block_expr_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this block expression.
+     */
+    int getNumberOfAttrs() { result = count(int i | block_expr_attrs(this, i, _)) }
+
     /**
      * Holds if this block expression is async.
      */
@@ -3663,6 +6015,24 @@ module Raw {
     StmtList getStmtList() { block_expr_stmt_lists(this, result) }
   }
 
+  private Element getImmediateChildOfBlockExpr(BlockExpr e, int index) {
+    exists(int n, int nLabel, int nAttr, int nStmtList |
+      n = 0 and
+      nLabel = n + 1 and
+      nAttr = nLabel + e.getNumberOfAttrs() and
+      nStmtList = nAttr + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getLabel()
+        or
+        result = e.getAttr(index - nLabel)
+        or
+        index = nAttr and result = e.getStmtList()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A function call expression. For example:
@@ -3682,6 +6052,24 @@ module Raw {
     Expr getFunction() { call_expr_functions(this, result) }
   }
 
+  private Element getImmediateChildOfCallExpr(CallExpr e, int index) {
+    exists(int n, int nArgList, int nAttr, int nFunction |
+      n = 0 and
+      nArgList = n + 1 and
+      nAttr = nArgList + e.getNumberOfAttrs() and
+      nFunction = nAttr + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getArgList()
+        or
+        result = e.getAttr(index - nArgList)
+        or
+        index = nAttr and result = e.getFunction()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * An extern block containing foreign function declarations.
@@ -3706,6 +6094,11 @@ module Raw {
      */
     Attr getAttr(int index) { extern_block_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this extern block.
+     */
+    int getNumberOfAttrs() { result = count(int i | extern_block_attrs(this, i, _)) }
+
     /**
      * Gets the extern item list of this extern block, if it exists.
      */
@@ -3717,6 +6110,27 @@ module Raw {
     predicate isUnsafe() { extern_block_is_unsafe(this) }
   }
 
+  private Element getImmediateChildOfExternBlock(ExternBlock e, int index) {
+    exists(int n, int nAttributeMacroExpansion, int nAbi, int nAttr, int nExternItemList |
+      n = 0 and
+      nAttributeMacroExpansion = n + 1 and
+      nAbi = nAttributeMacroExpansion + 1 and
+      nAttr = nAbi + e.getNumberOfAttrs() and
+      nExternItemList = nAttr + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getAttributeMacroExpansion()
+        or
+        index = nAttributeMacroExpansion and result = e.getAbi()
+        or
+        result = e.getAttr(index - nAbi)
+        or
+        index = nAttr and result = e.getExternItemList()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * An extern crate declaration.
@@ -3734,6 +6148,11 @@ module Raw {
      */
     Attr getAttr(int index) { extern_crate_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this extern crate.
+     */
+    int getNumberOfAttrs() { result = count(int i | extern_crate_attrs(this, i, _)) }
+
     /**
      * Gets the identifier of this extern crate, if it exists.
      */
@@ -3750,6 +6169,32 @@ module Raw {
     Visibility getVisibility() { extern_crate_visibilities(this, result) }
   }
 
+  private Element getImmediateChildOfExternCrate(ExternCrate e, int index) {
+    exists(
+      int n, int nAttributeMacroExpansion, int nAttr, int nIdentifier, int nRename, int nVisibility
+    |
+      n = 0 and
+      nAttributeMacroExpansion = n + 1 and
+      nAttr = nAttributeMacroExpansion + e.getNumberOfAttrs() and
+      nIdentifier = nAttr + 1 and
+      nRename = nIdentifier + 1 and
+      nVisibility = nRename + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getAttributeMacroExpansion()
+        or
+        result = e.getAttr(index - nAttributeMacroExpansion)
+        or
+        index = nAttr and result = e.getIdentifier()
+        or
+        index = nIdentifier and result = e.getRename()
+        or
+        index = nRename and result = e.getVisibility()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * An item inside an extern block.
@@ -3788,6 +6233,11 @@ module Raw {
      */
     Attr getAttr(int index) { impl_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this impl.
+     */
+    int getNumberOfAttrs() { result = count(int i | impl_attrs(this, i, _)) }
+
     /**
      * Gets the generic parameter list of this impl, if it exists.
      */
@@ -3829,6 +6279,42 @@ module Raw {
     WhereClause getWhereClause() { impl_where_clauses(this, result) }
   }
 
+  private Element getImmediateChildOfImpl(Impl e, int index) {
+    exists(
+      int n, int nAttributeMacroExpansion, int nAssocItemList, int nAttr, int nGenericParamList,
+      int nSelfTy, int nTrait, int nVisibility, int nWhereClause
+    |
+      n = 0 and
+      nAttributeMacroExpansion = n + 1 and
+      nAssocItemList = nAttributeMacroExpansion + 1 and
+      nAttr = nAssocItemList + e.getNumberOfAttrs() and
+      nGenericParamList = nAttr + 1 and
+      nSelfTy = nGenericParamList + 1 and
+      nTrait = nSelfTy + 1 and
+      nVisibility = nTrait + 1 and
+      nWhereClause = nVisibility + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getAttributeMacroExpansion()
+        or
+        index = nAttributeMacroExpansion and result = e.getAssocItemList()
+        or
+        result = e.getAttr(index - nAssocItemList)
+        or
+        index = nAttr and result = e.getGenericParamList()
+        or
+        index = nGenericParamList and result = e.getSelfTy()
+        or
+        index = nSelfTy and result = e.getTrait()
+        or
+        index = nTrait and result = e.getVisibility()
+        or
+        index = nVisibility and result = e.getWhereClause()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * The base class for expressions that loop (`LoopExpr`, `ForExpr` or `WhileExpr`).
@@ -3864,6 +6350,11 @@ module Raw {
      */
     Attr getAttr(int index) { macro_def_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this macro def.
+     */
+    int getNumberOfAttrs() { result = count(int i | macro_def_attrs(this, i, _)) }
+
     /**
      * Gets the body of this macro def, if it exists.
      */
@@ -3880,6 +6371,36 @@ module Raw {
     Visibility getVisibility() { macro_def_visibilities(this, result) }
   }
 
+  private Element getImmediateChildOfMacroDef(MacroDef e, int index) {
+    exists(
+      int n, int nAttributeMacroExpansion, int nArgs, int nAttr, int nBody, int nName,
+      int nVisibility
+    |
+      n = 0 and
+      nAttributeMacroExpansion = n + 1 and
+      nArgs = nAttributeMacroExpansion + 1 and
+      nAttr = nArgs + e.getNumberOfAttrs() and
+      nBody = nAttr + 1 and
+      nName = nBody + 1 and
+      nVisibility = nName + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getAttributeMacroExpansion()
+        or
+        index = nAttributeMacroExpansion and result = e.getArgs()
+        or
+        result = e.getAttr(index - nArgs)
+        or
+        index = nAttr and result = e.getBody()
+        or
+        index = nBody and result = e.getName()
+        or
+        index = nName and result = e.getVisibility()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A macro definition using the `macro_rules!` syntax.
@@ -3899,6 +6420,11 @@ module Raw {
      */
     Attr getAttr(int index) { macro_rules_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this macro rules.
+     */
+    int getNumberOfAttrs() { result = count(int i | macro_rules_attrs(this, i, _)) }
+
     /**
      * Gets the name of this macro rules, if it exists.
      */
@@ -3915,6 +6441,32 @@ module Raw {
     Visibility getVisibility() { macro_rules_visibilities(this, result) }
   }
 
+  private Element getImmediateChildOfMacroRules(MacroRules e, int index) {
+    exists(
+      int n, int nAttributeMacroExpansion, int nAttr, int nName, int nTokenTree, int nVisibility
+    |
+      n = 0 and
+      nAttributeMacroExpansion = n + 1 and
+      nAttr = nAttributeMacroExpansion + e.getNumberOfAttrs() and
+      nName = nAttr + 1 and
+      nTokenTree = nName + 1 and
+      nVisibility = nTokenTree + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getAttributeMacroExpansion()
+        or
+        result = e.getAttr(index - nAttributeMacroExpansion)
+        or
+        index = nAttr and result = e.getName()
+        or
+        index = nName and result = e.getTokenTree()
+        or
+        index = nTokenTree and result = e.getVisibility()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A method call expression. For example:
@@ -3923,7 +6475,7 @@ module Raw {
    * x.foo::<u32, u64>(42);
    * ```
    */
-  class MethodCallExpr extends @method_call_expr, CallExprBase, Resolvable {
+  class MethodCallExpr extends @method_call_expr, CallExprBase {
     override string toString() { result = "MethodCallExpr" }
 
     /**
@@ -3942,6 +6494,30 @@ module Raw {
     Expr getReceiver() { method_call_expr_receivers(this, result) }
   }
 
+  private Element getImmediateChildOfMethodCallExpr(MethodCallExpr e, int index) {
+    exists(int n, int nArgList, int nAttr, int nGenericArgList, int nIdentifier, int nReceiver |
+      n = 0 and
+      nArgList = n + 1 and
+      nAttr = nArgList + e.getNumberOfAttrs() and
+      nGenericArgList = nAttr + 1 and
+      nIdentifier = nGenericArgList + 1 and
+      nReceiver = nIdentifier + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getArgList()
+        or
+        result = e.getAttr(index - nArgList)
+        or
+        index = nAttr and result = e.getGenericArgList()
+        or
+        index = nGenericArgList and result = e.getIdentifier()
+        or
+        index = nIdentifier and result = e.getReceiver()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A module declaration. For example:
@@ -3962,6 +6538,11 @@ module Raw {
      */
     Attr getAttr(int index) { module_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this module.
+     */
+    int getNumberOfAttrs() { result = count(int i | module_attrs(this, i, _)) }
+
     /**
      * Gets the item list of this module, if it exists.
      */
@@ -3978,6 +6559,32 @@ module Raw {
     Visibility getVisibility() { module_visibilities(this, result) }
   }
 
+  private Element getImmediateChildOfModule(Module e, int index) {
+    exists(
+      int n, int nAttributeMacroExpansion, int nAttr, int nItemList, int nName, int nVisibility
+    |
+      n = 0 and
+      nAttributeMacroExpansion = n + 1 and
+      nAttr = nAttributeMacroExpansion + e.getNumberOfAttrs() and
+      nItemList = nAttr + 1 and
+      nName = nItemList + 1 and
+      nVisibility = nName + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getAttributeMacroExpansion()
+        or
+        result = e.getAttr(index - nAttributeMacroExpansion)
+        or
+        index = nAttr and result = e.getItemList()
+        or
+        index = nItemList and result = e.getName()
+        or
+        index = nName and result = e.getVisibility()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A path expression. For example:
@@ -3995,60 +6602,26 @@ module Raw {
      * Gets the `index`th attr of this path expression (0-based).
      */
     Attr getAttr(int index) { path_expr_attrs(this, index, result) }
-  }
-
-  /**
-   * INTERNAL: Do not use.
-   * A path pattern. For example:
-   * ```rust
-   * match x {
-   *     Foo::Bar => "ok",
-   *     _ => "fail",
-   * }
-   * ```
-   */
-  class PathPat extends @path_pat, Pat, PathAstNode {
-    override string toString() { result = "PathPat" }
-  }
-
-  /**
-   * INTERNAL: Do not use.
-   * A struct expression. For example:
-   * ```rust
-   * let first = Foo { a: 1, b: 2 };
-   * let second = Foo { a: 2, ..first };
-   * Foo { a: 1, b: 2 }[2] = 10;
-   * Foo { .. } = second;
-   * ```
-   */
-  class StructExpr extends @struct_expr, Expr, PathAstNode {
-    override string toString() { result = "StructExpr" }
 
     /**
-     * Gets the struct expression field list of this struct expression, if it exists.
+     * Gets the number of attrs of this path expression.
      */
-    StructExprFieldList getStructExprFieldList() {
-      struct_expr_struct_expr_field_lists(this, result)
-    }
+    int getNumberOfAttrs() { result = count(int i | path_expr_attrs(this, i, _)) }
   }
 
-  /**
-   * INTERNAL: Do not use.
-   * A struct pattern. For example:
-   * ```rust
-   * match x {
-   *     Foo { a: 1, b: 2 } => "ok",
-   *     Foo { .. } => "fail",
-   * }
-   * ```
-   */
-  class StructPat extends @struct_pat, Pat, PathAstNode {
-    override string toString() { result = "StructPat" }
-
-    /**
-     * Gets the struct pattern field list of this struct pattern, if it exists.
-     */
-    StructPatFieldList getStructPatFieldList() { struct_pat_struct_pat_field_lists(this, result) }
+  private Element getImmediateChildOfPathExpr(PathExpr e, int index) {
+    exists(int n, int nPath, int nAttr |
+      n = 0 and
+      nPath = n + 1 and
+      nAttr = nPath + e.getNumberOfAttrs() and
+      (
+        none()
+        or
+        index = n and result = e.getPath()
+        or
+        result = e.getAttr(index - nPath)
+      )
+    )
   }
 
   /**
@@ -4077,6 +6650,11 @@ module Raw {
      */
     Attr getAttr(int index) { trait_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this trait.
+     */
+    int getNumberOfAttrs() { result = count(int i | trait_attrs(this, i, _)) }
+
     /**
      * Gets the generic parameter list of this trait, if it exists.
      */
@@ -4113,6 +6691,42 @@ module Raw {
     WhereClause getWhereClause() { trait_where_clauses(this, result) }
   }
 
+  private Element getImmediateChildOfTrait(Trait e, int index) {
+    exists(
+      int n, int nAttributeMacroExpansion, int nAssocItemList, int nAttr, int nGenericParamList,
+      int nName, int nTypeBoundList, int nVisibility, int nWhereClause
+    |
+      n = 0 and
+      nAttributeMacroExpansion = n + 1 and
+      nAssocItemList = nAttributeMacroExpansion + 1 and
+      nAttr = nAssocItemList + e.getNumberOfAttrs() and
+      nGenericParamList = nAttr + 1 and
+      nName = nGenericParamList + 1 and
+      nTypeBoundList = nName + 1 and
+      nVisibility = nTypeBoundList + 1 and
+      nWhereClause = nVisibility + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getAttributeMacroExpansion()
+        or
+        index = nAttributeMacroExpansion and result = e.getAssocItemList()
+        or
+        result = e.getAttr(index - nAssocItemList)
+        or
+        index = nAttr and result = e.getGenericParamList()
+        or
+        index = nGenericParamList and result = e.getName()
+        or
+        index = nName and result = e.getTypeBoundList()
+        or
+        index = nTypeBoundList and result = e.getVisibility()
+        or
+        index = nVisibility and result = e.getWhereClause()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A trait alias.
@@ -4130,6 +6744,11 @@ module Raw {
      */
     Attr getAttr(int index) { trait_alias_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this trait alias.
+     */
+    int getNumberOfAttrs() { result = count(int i | trait_alias_attrs(this, i, _)) }
+
     /**
      * Gets the generic parameter list of this trait alias, if it exists.
      */
@@ -4156,24 +6775,37 @@ module Raw {
     WhereClause getWhereClause() { trait_alias_where_clauses(this, result) }
   }
 
-  /**
-   * INTERNAL: Do not use.
-   * A tuple struct pattern. For example:
-   * ```rust
-   * match x {
-   *     Tuple("a", 1, 2, 3) => "great",
-   *     Tuple(.., 3) => "fine",
-   *     Tuple(..) => "fail",
-   * };
-   * ```
-   */
-  class TupleStructPat extends @tuple_struct_pat, Pat, PathAstNode {
-    override string toString() { result = "TupleStructPat" }
-
-    /**
-     * Gets the `index`th field of this tuple struct pattern (0-based).
-     */
-    Pat getField(int index) { tuple_struct_pat_fields(this, index, result) }
+  private Element getImmediateChildOfTraitAlias(TraitAlias e, int index) {
+    exists(
+      int n, int nAttributeMacroExpansion, int nAttr, int nGenericParamList, int nName,
+      int nTypeBoundList, int nVisibility, int nWhereClause
+    |
+      n = 0 and
+      nAttributeMacroExpansion = n + 1 and
+      nAttr = nAttributeMacroExpansion + e.getNumberOfAttrs() and
+      nGenericParamList = nAttr + 1 and
+      nName = nGenericParamList + 1 and
+      nTypeBoundList = nName + 1 and
+      nVisibility = nTypeBoundList + 1 and
+      nWhereClause = nVisibility + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getAttributeMacroExpansion()
+        or
+        result = e.getAttr(index - nAttributeMacroExpansion)
+        or
+        index = nAttr and result = e.getGenericParamList()
+        or
+        index = nGenericParamList and result = e.getName()
+        or
+        index = nName and result = e.getTypeBoundList()
+        or
+        index = nTypeBoundList and result = e.getVisibility()
+        or
+        index = nVisibility and result = e.getWhereClause()
+      )
+    )
   }
 
   /**
@@ -4191,6 +6823,11 @@ module Raw {
      */
     Attr getAttr(int index) { use_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this use.
+     */
+    int getNumberOfAttrs() { result = count(int i | use_attrs(this, i, _)) }
+
     /**
      * Gets the use tree of this use, if it exists.
      */
@@ -4202,6 +6839,27 @@ module Raw {
     Visibility getVisibility() { use_visibilities(this, result) }
   }
 
+  private Element getImmediateChildOfUse(Use e, int index) {
+    exists(int n, int nAttributeMacroExpansion, int nAttr, int nUseTree, int nVisibility |
+      n = 0 and
+      nAttributeMacroExpansion = n + 1 and
+      nAttr = nAttributeMacroExpansion + e.getNumberOfAttrs() and
+      nUseTree = nAttr + 1 and
+      nVisibility = nUseTree + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getAttributeMacroExpansion()
+        or
+        result = e.getAttr(index - nAttributeMacroExpansion)
+        or
+        index = nAttr and result = e.getUseTree()
+        or
+        index = nUseTree and result = e.getVisibility()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A constant item declaration.
@@ -4219,6 +6877,11 @@ module Raw {
      */
     Attr getAttr(int index) { const_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this const.
+     */
+    int getNumberOfAttrs() { result = count(int i | const_attrs(this, i, _)) }
+
     /**
      * Gets the body of this const, if it exists.
      */
@@ -4268,6 +6931,42 @@ module Raw {
     predicate hasImplementation() { const_has_implementation(this) }
   }
 
+  private Element getImmediateChildOfConst(Const e, int index) {
+    exists(
+      int n, int nAttributeMacroExpansion, int nAttr, int nBody, int nGenericParamList, int nName,
+      int nTypeRepr, int nVisibility, int nWhereClause
+    |
+      n = 0 and
+      nAttributeMacroExpansion = n + 1 and
+      nAttr = nAttributeMacroExpansion + e.getNumberOfAttrs() and
+      nBody = nAttr + 1 and
+      nGenericParamList = nBody + 1 and
+      nName = nGenericParamList + 1 and
+      nTypeRepr = nName + 1 and
+      nVisibility = nTypeRepr + 1 and
+      nWhereClause = nVisibility + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getAttributeMacroExpansion()
+        or
+        result = e.getAttr(index - nAttributeMacroExpansion)
+        or
+        index = nAttr and result = e.getBody()
+        or
+        index = nBody and result = e.getGenericParamList()
+        or
+        index = nGenericParamList and result = e.getName()
+        or
+        index = nName and result = e.getTypeRepr()
+        or
+        index = nTypeRepr and result = e.getVisibility()
+        or
+        index = nVisibility and result = e.getWhereClause()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * An enum declaration.
@@ -4285,6 +6984,11 @@ module Raw {
      */
     Attr getAttr(int index) { enum_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this enum.
+     */
+    int getNumberOfAttrs() { result = count(int i | enum_attrs(this, i, _)) }
+
     /**
      * Gets the generic parameter list of this enum, if it exists.
      */
@@ -4311,6 +7015,42 @@ module Raw {
     WhereClause getWhereClause() { enum_where_clauses(this, result) }
   }
 
+  private Element getImmediateChildOfEnum(Enum e, int index) {
+    exists(
+      int n, int nAttributeMacroExpansion, int nDeriveMacroExpansion, int nAttr,
+      int nGenericParamList, int nName, int nVariantList, int nVisibility, int nWhereClause
+    |
+      n = 0 and
+      nAttributeMacroExpansion = n + 1 and
+      nDeriveMacroExpansion = nAttributeMacroExpansion + e.getNumberOfDeriveMacroExpansions() and
+      nAttr = nDeriveMacroExpansion + e.getNumberOfAttrs() and
+      nGenericParamList = nAttr + 1 and
+      nName = nGenericParamList + 1 and
+      nVariantList = nName + 1 and
+      nVisibility = nVariantList + 1 and
+      nWhereClause = nVisibility + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getAttributeMacroExpansion()
+        or
+        result = e.getDeriveMacroExpansion(index - nAttributeMacroExpansion)
+        or
+        result = e.getAttr(index - nDeriveMacroExpansion)
+        or
+        index = nAttr and result = e.getGenericParamList()
+        or
+        index = nGenericParamList and result = e.getName()
+        or
+        index = nName and result = e.getVariantList()
+        or
+        index = nVariantList and result = e.getVisibility()
+        or
+        index = nVisibility and result = e.getWhereClause()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A for loop expression.
@@ -4330,6 +7070,11 @@ module Raw {
      */
     Attr getAttr(int index) { for_expr_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this for expression.
+     */
+    int getNumberOfAttrs() { result = count(int i | for_expr_attrs(this, i, _)) }
+
     /**
      * Gets the iterable of this for expression, if it exists.
      */
@@ -4341,6 +7086,30 @@ module Raw {
     Pat getPat() { for_expr_pats(this, result) }
   }
 
+  private Element getImmediateChildOfForExpr(ForExpr e, int index) {
+    exists(int n, int nLabel, int nLoopBody, int nAttr, int nIterable, int nPat |
+      n = 0 and
+      nLabel = n + 1 and
+      nLoopBody = nLabel + 1 and
+      nAttr = nLoopBody + e.getNumberOfAttrs() and
+      nIterable = nAttr + 1 and
+      nPat = nIterable + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getLabel()
+        or
+        index = nLabel and result = e.getLoopBody()
+        or
+        result = e.getAttr(index - nLoopBody)
+        or
+        index = nAttr and result = e.getIterable()
+        or
+        index = nIterable and result = e.getPat()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A function declaration. For example
@@ -4363,9 +7132,9 @@ module Raw {
     Abi getAbi() { function_abis(this, result) }
 
     /**
-     * Gets the body of this function, if it exists.
+     * Gets the function body of this function, if it exists.
      */
-    BlockExpr getBody() { function_bodies(this, result) }
+    BlockExpr getFunctionBody() { function_function_bodies(this, result) }
 
     /**
      * Gets the generic parameter list of this function, if it exists.
@@ -4426,6 +7195,48 @@ module Raw {
     predicate hasImplementation() { function_has_implementation(this) }
   }
 
+  private Element getImmediateChildOfFunction(Function e, int index) {
+    exists(
+      int n, int nAttributeMacroExpansion, int nParamList, int nAttr, int nAbi, int nFunctionBody,
+      int nGenericParamList, int nName, int nRetType, int nVisibility, int nWhereClause
+    |
+      n = 0 and
+      nAttributeMacroExpansion = n + 1 and
+      nParamList = nAttributeMacroExpansion + 1 and
+      nAttr = nParamList + e.getNumberOfAttrs() and
+      nAbi = nAttr + 1 and
+      nFunctionBody = nAbi + 1 and
+      nGenericParamList = nFunctionBody + 1 and
+      nName = nGenericParamList + 1 and
+      nRetType = nName + 1 and
+      nVisibility = nRetType + 1 and
+      nWhereClause = nVisibility + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getAttributeMacroExpansion()
+        or
+        index = nAttributeMacroExpansion and result = e.getParamList()
+        or
+        result = e.getAttr(index - nParamList)
+        or
+        index = nAttr and result = e.getAbi()
+        or
+        index = nAbi and result = e.getFunctionBody()
+        or
+        index = nFunctionBody and result = e.getGenericParamList()
+        or
+        index = nGenericParamList and result = e.getName()
+        or
+        index = nName and result = e.getRetType()
+        or
+        index = nRetType and result = e.getVisibility()
+        or
+        index = nVisibility and result = e.getWhereClause()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A loop expression. For example:
@@ -4458,6 +7269,29 @@ module Raw {
      * Gets the `index`th attr of this loop expression (0-based).
      */
     Attr getAttr(int index) { loop_expr_attrs(this, index, result) }
+
+    /**
+     * Gets the number of attrs of this loop expression.
+     */
+    int getNumberOfAttrs() { result = count(int i | loop_expr_attrs(this, i, _)) }
+  }
+
+  private Element getImmediateChildOfLoopExpr(LoopExpr e, int index) {
+    exists(int n, int nLabel, int nLoopBody, int nAttr |
+      n = 0 and
+      nLabel = n + 1 and
+      nLoopBody = nLabel + 1 and
+      nAttr = nLoopBody + e.getNumberOfAttrs() and
+      (
+        none()
+        or
+        index = n and result = e.getLabel()
+        or
+        index = nLabel and result = e.getLoopBody()
+        or
+        result = e.getAttr(index - nLoopBody)
+      )
+    )
   }
 
   /**
@@ -4477,6 +7311,11 @@ module Raw {
      */
     Attr getAttr(int index) { macro_call_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this macro call.
+     */
+    int getNumberOfAttrs() { result = count(int i | macro_call_attrs(this, i, _)) }
+
     /**
      * Gets the path of this macro call, if it exists.
      */
@@ -4493,6 +7332,33 @@ module Raw {
     AstNode getMacroCallExpansion() { macro_call_macro_call_expansions(this, result) }
   }
 
+  private Element getImmediateChildOfMacroCall(MacroCall e, int index) {
+    exists(
+      int n, int nAttributeMacroExpansion, int nAttr, int nPath, int nTokenTree,
+      int nMacroCallExpansion
+    |
+      n = 0 and
+      nAttributeMacroExpansion = n + 1 and
+      nAttr = nAttributeMacroExpansion + e.getNumberOfAttrs() and
+      nPath = nAttr + 1 and
+      nTokenTree = nPath + 1 and
+      nMacroCallExpansion = nTokenTree + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getAttributeMacroExpansion()
+        or
+        result = e.getAttr(index - nAttributeMacroExpansion)
+        or
+        index = nAttr and result = e.getPath()
+        or
+        index = nPath and result = e.getTokenTree()
+        or
+        index = nTokenTree and result = e.getMacroCallExpansion()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A static item declaration.
@@ -4510,6 +7376,11 @@ module Raw {
      */
     Attr getAttr(int index) { static_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this static.
+     */
+    int getNumberOfAttrs() { result = count(int i | static_attrs(this, i, _)) }
+
     /**
      * Gets the body of this static, if it exists.
      */
@@ -4546,6 +7417,36 @@ module Raw {
     Visibility getVisibility() { static_visibilities(this, result) }
   }
 
+  private Element getImmediateChildOfStatic(Static e, int index) {
+    exists(
+      int n, int nAttributeMacroExpansion, int nAttr, int nBody, int nName, int nTypeRepr,
+      int nVisibility
+    |
+      n = 0 and
+      nAttributeMacroExpansion = n + 1 and
+      nAttr = nAttributeMacroExpansion + e.getNumberOfAttrs() and
+      nBody = nAttr + 1 and
+      nName = nBody + 1 and
+      nTypeRepr = nName + 1 and
+      nVisibility = nTypeRepr + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getAttributeMacroExpansion()
+        or
+        result = e.getAttr(index - nAttributeMacroExpansion)
+        or
+        index = nAttr and result = e.getBody()
+        or
+        index = nBody and result = e.getName()
+        or
+        index = nName and result = e.getTypeRepr()
+        or
+        index = nTypeRepr and result = e.getVisibility()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A Struct. For example:
@@ -4564,6 +7465,11 @@ module Raw {
      */
     Attr getAttr(int index) { struct_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this struct.
+     */
+    int getNumberOfAttrs() { result = count(int i | struct_attrs(this, i, _)) }
+
     /**
      * Gets the field list of this struct, if it exists.
      */
@@ -4590,6 +7496,42 @@ module Raw {
     WhereClause getWhereClause() { struct_where_clauses(this, result) }
   }
 
+  private Element getImmediateChildOfStruct(Struct e, int index) {
+    exists(
+      int n, int nAttributeMacroExpansion, int nDeriveMacroExpansion, int nAttr, int nFieldList,
+      int nGenericParamList, int nName, int nVisibility, int nWhereClause
+    |
+      n = 0 and
+      nAttributeMacroExpansion = n + 1 and
+      nDeriveMacroExpansion = nAttributeMacroExpansion + e.getNumberOfDeriveMacroExpansions() and
+      nAttr = nDeriveMacroExpansion + e.getNumberOfAttrs() and
+      nFieldList = nAttr + 1 and
+      nGenericParamList = nFieldList + 1 and
+      nName = nGenericParamList + 1 and
+      nVisibility = nName + 1 and
+      nWhereClause = nVisibility + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getAttributeMacroExpansion()
+        or
+        result = e.getDeriveMacroExpansion(index - nAttributeMacroExpansion)
+        or
+        result = e.getAttr(index - nDeriveMacroExpansion)
+        or
+        index = nAttr and result = e.getFieldList()
+        or
+        index = nFieldList and result = e.getGenericParamList()
+        or
+        index = nGenericParamList and result = e.getName()
+        or
+        index = nName and result = e.getVisibility()
+        or
+        index = nVisibility and result = e.getWhereClause()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A type alias. For example:
@@ -4610,6 +7552,11 @@ module Raw {
      */
     Attr getAttr(int index) { type_alias_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this type alias.
+     */
+    int getNumberOfAttrs() { result = count(int i | type_alias_attrs(this, i, _)) }
+
     /**
      * Gets the generic parameter list of this type alias, if it exists.
      */
@@ -4646,6 +7593,42 @@ module Raw {
     WhereClause getWhereClause() { type_alias_where_clauses(this, result) }
   }
 
+  private Element getImmediateChildOfTypeAlias(TypeAlias e, int index) {
+    exists(
+      int n, int nAttributeMacroExpansion, int nAttr, int nGenericParamList, int nName,
+      int nTypeRepr, int nTypeBoundList, int nVisibility, int nWhereClause
+    |
+      n = 0 and
+      nAttributeMacroExpansion = n + 1 and
+      nAttr = nAttributeMacroExpansion + e.getNumberOfAttrs() and
+      nGenericParamList = nAttr + 1 and
+      nName = nGenericParamList + 1 and
+      nTypeRepr = nName + 1 and
+      nTypeBoundList = nTypeRepr + 1 and
+      nVisibility = nTypeBoundList + 1 and
+      nWhereClause = nVisibility + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getAttributeMacroExpansion()
+        or
+        result = e.getAttr(index - nAttributeMacroExpansion)
+        or
+        index = nAttr and result = e.getGenericParamList()
+        or
+        index = nGenericParamList and result = e.getName()
+        or
+        index = nName and result = e.getTypeRepr()
+        or
+        index = nTypeRepr and result = e.getTypeBoundList()
+        or
+        index = nTypeBoundList and result = e.getVisibility()
+        or
+        index = nVisibility and result = e.getWhereClause()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A union declaration.
@@ -4663,6 +7646,11 @@ module Raw {
      */
     Attr getAttr(int index) { union_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this union.
+     */
+    int getNumberOfAttrs() { result = count(int i | union_attrs(this, i, _)) }
+
     /**
      * Gets the generic parameter list of this union, if it exists.
      */
@@ -4689,6 +7677,42 @@ module Raw {
     WhereClause getWhereClause() { union_where_clauses(this, result) }
   }
 
+  private Element getImmediateChildOfUnion(Union e, int index) {
+    exists(
+      int n, int nAttributeMacroExpansion, int nDeriveMacroExpansion, int nAttr,
+      int nGenericParamList, int nName, int nStructFieldList, int nVisibility, int nWhereClause
+    |
+      n = 0 and
+      nAttributeMacroExpansion = n + 1 and
+      nDeriveMacroExpansion = nAttributeMacroExpansion + e.getNumberOfDeriveMacroExpansions() and
+      nAttr = nDeriveMacroExpansion + e.getNumberOfAttrs() and
+      nGenericParamList = nAttr + 1 and
+      nName = nGenericParamList + 1 and
+      nStructFieldList = nName + 1 and
+      nVisibility = nStructFieldList + 1 and
+      nWhereClause = nVisibility + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getAttributeMacroExpansion()
+        or
+        result = e.getDeriveMacroExpansion(index - nAttributeMacroExpansion)
+        or
+        result = e.getAttr(index - nDeriveMacroExpansion)
+        or
+        index = nAttr and result = e.getGenericParamList()
+        or
+        index = nGenericParamList and result = e.getName()
+        or
+        index = nName and result = e.getStructFieldList()
+        or
+        index = nStructFieldList and result = e.getVisibility()
+        or
+        index = nVisibility and result = e.getWhereClause()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A while loop expression.
@@ -4708,9 +7732,365 @@ module Raw {
      */
     Attr getAttr(int index) { while_expr_attrs(this, index, result) }
 
+    /**
+     * Gets the number of attrs of this while expression.
+     */
+    int getNumberOfAttrs() { result = count(int i | while_expr_attrs(this, i, _)) }
+
     /**
      * Gets the condition of this while expression, if it exists.
      */
     Expr getCondition() { while_expr_conditions(this, result) }
   }
+
+  private Element getImmediateChildOfWhileExpr(WhileExpr e, int index) {
+    exists(int n, int nLabel, int nLoopBody, int nAttr, int nCondition |
+      n = 0 and
+      nLabel = n + 1 and
+      nLoopBody = nLabel + 1 and
+      nAttr = nLoopBody + e.getNumberOfAttrs() and
+      nCondition = nAttr + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getLabel()
+        or
+        index = nLabel and result = e.getLoopBody()
+        or
+        result = e.getAttr(index - nLoopBody)
+        or
+        index = nAttr and result = e.getCondition()
+      )
+    )
+  }
+
+  /**
+   * Gets the immediate child indexed at `index`. Indexes are not guaranteed to be contiguous, but are guaranteed to be distinct.
+   */
+  pragma[nomagic]
+  Element getImmediateChild(Element e, int index) {
+    // why does this look more complicated than it should?
+    // * none() simplifies generation, as we can append `or ...` without a special case for the first item
+    none()
+    or
+    result = getImmediateChildOfExtractorStep(e, index)
+    or
+    result = getImmediateChildOfNamedCrate(e, index)
+    or
+    result = getImmediateChildOfCrate(e, index)
+    or
+    result = getImmediateChildOfMissing(e, index)
+    or
+    result = getImmediateChildOfUnimplemented(e, index)
+    or
+    result = getImmediateChildOfAbi(e, index)
+    or
+    result = getImmediateChildOfArgList(e, index)
+    or
+    result = getImmediateChildOfAsmDirSpec(e, index)
+    or
+    result = getImmediateChildOfAsmOperandExpr(e, index)
+    or
+    result = getImmediateChildOfAsmOption(e, index)
+    or
+    result = getImmediateChildOfAsmRegSpec(e, index)
+    or
+    result = getImmediateChildOfAssocItemList(e, index)
+    or
+    result = getImmediateChildOfAttr(e, index)
+    or
+    result = getImmediateChildOfExternItemList(e, index)
+    or
+    result = getImmediateChildOfForBinder(e, index)
+    or
+    result = getImmediateChildOfFormatArgsArg(e, index)
+    or
+    result = getImmediateChildOfGenericArgList(e, index)
+    or
+    result = getImmediateChildOfGenericParamList(e, index)
+    or
+    result = getImmediateChildOfItemList(e, index)
+    or
+    result = getImmediateChildOfLabel(e, index)
+    or
+    result = getImmediateChildOfLetElse(e, index)
+    or
+    result = getImmediateChildOfMacroItems(e, index)
+    or
+    result = getImmediateChildOfMatchArm(e, index)
+    or
+    result = getImmediateChildOfMatchArmList(e, index)
+    or
+    result = getImmediateChildOfMatchGuard(e, index)
+    or
+    result = getImmediateChildOfMeta(e, index)
+    or
+    result = getImmediateChildOfName(e, index)
+    or
+    result = getImmediateChildOfParamList(e, index)
+    or
+    result = getImmediateChildOfParenthesizedArgList(e, index)
+    or
+    result = getImmediateChildOfPath(e, index)
+    or
+    result = getImmediateChildOfPathSegment(e, index)
+    or
+    result = getImmediateChildOfRename(e, index)
+    or
+    result = getImmediateChildOfRetTypeRepr(e, index)
+    or
+    result = getImmediateChildOfReturnTypeSyntax(e, index)
+    or
+    result = getImmediateChildOfSourceFile(e, index)
+    or
+    result = getImmediateChildOfStmtList(e, index)
+    or
+    result = getImmediateChildOfStructExprField(e, index)
+    or
+    result = getImmediateChildOfStructExprFieldList(e, index)
+    or
+    result = getImmediateChildOfStructField(e, index)
+    or
+    result = getImmediateChildOfStructPatField(e, index)
+    or
+    result = getImmediateChildOfStructPatFieldList(e, index)
+    or
+    result = getImmediateChildOfTokenTree(e, index)
+    or
+    result = getImmediateChildOfTupleField(e, index)
+    or
+    result = getImmediateChildOfTypeBound(e, index)
+    or
+    result = getImmediateChildOfTypeBoundList(e, index)
+    or
+    result = getImmediateChildOfUseBoundGenericArgs(e, index)
+    or
+    result = getImmediateChildOfUseTree(e, index)
+    or
+    result = getImmediateChildOfUseTreeList(e, index)
+    or
+    result = getImmediateChildOfVariantList(e, index)
+    or
+    result = getImmediateChildOfVisibility(e, index)
+    or
+    result = getImmediateChildOfWhereClause(e, index)
+    or
+    result = getImmediateChildOfWherePred(e, index)
+    or
+    result = getImmediateChildOfArrayExprInternal(e, index)
+    or
+    result = getImmediateChildOfArrayTypeRepr(e, index)
+    or
+    result = getImmediateChildOfAsmClobberAbi(e, index)
+    or
+    result = getImmediateChildOfAsmConst(e, index)
+    or
+    result = getImmediateChildOfAsmLabel(e, index)
+    or
+    result = getImmediateChildOfAsmOperandNamed(e, index)
+    or
+    result = getImmediateChildOfAsmOptionsList(e, index)
+    or
+    result = getImmediateChildOfAsmRegOperand(e, index)
+    or
+    result = getImmediateChildOfAsmSym(e, index)
+    or
+    result = getImmediateChildOfAssocTypeArg(e, index)
+    or
+    result = getImmediateChildOfAwaitExpr(e, index)
+    or
+    result = getImmediateChildOfBecomeExpr(e, index)
+    or
+    result = getImmediateChildOfBinaryExpr(e, index)
+    or
+    result = getImmediateChildOfBoxPat(e, index)
+    or
+    result = getImmediateChildOfBreakExpr(e, index)
+    or
+    result = getImmediateChildOfCastExpr(e, index)
+    or
+    result = getImmediateChildOfClosureExpr(e, index)
+    or
+    result = getImmediateChildOfComment(e, index)
+    or
+    result = getImmediateChildOfConstArg(e, index)
+    or
+    result = getImmediateChildOfConstBlockPat(e, index)
+    or
+    result = getImmediateChildOfConstParam(e, index)
+    or
+    result = getImmediateChildOfContinueExpr(e, index)
+    or
+    result = getImmediateChildOfDynTraitTypeRepr(e, index)
+    or
+    result = getImmediateChildOfExprStmt(e, index)
+    or
+    result = getImmediateChildOfFieldExpr(e, index)
+    or
+    result = getImmediateChildOfFnPtrTypeRepr(e, index)
+    or
+    result = getImmediateChildOfForTypeRepr(e, index)
+    or
+    result = getImmediateChildOfFormatArgsExpr(e, index)
+    or
+    result = getImmediateChildOfIdentPat(e, index)
+    or
+    result = getImmediateChildOfIfExpr(e, index)
+    or
+    result = getImmediateChildOfImplTraitTypeRepr(e, index)
+    or
+    result = getImmediateChildOfIndexExpr(e, index)
+    or
+    result = getImmediateChildOfInferTypeRepr(e, index)
+    or
+    result = getImmediateChildOfLetExpr(e, index)
+    or
+    result = getImmediateChildOfLetStmt(e, index)
+    or
+    result = getImmediateChildOfLifetime(e, index)
+    or
+    result = getImmediateChildOfLifetimeArg(e, index)
+    or
+    result = getImmediateChildOfLifetimeParam(e, index)
+    or
+    result = getImmediateChildOfLiteralExpr(e, index)
+    or
+    result = getImmediateChildOfLiteralPat(e, index)
+    or
+    result = getImmediateChildOfMacroBlockExpr(e, index)
+    or
+    result = getImmediateChildOfMacroExpr(e, index)
+    or
+    result = getImmediateChildOfMacroPat(e, index)
+    or
+    result = getImmediateChildOfMacroTypeRepr(e, index)
+    or
+    result = getImmediateChildOfMatchExpr(e, index)
+    or
+    result = getImmediateChildOfNameRef(e, index)
+    or
+    result = getImmediateChildOfNeverTypeRepr(e, index)
+    or
+    result = getImmediateChildOfOffsetOfExpr(e, index)
+    or
+    result = getImmediateChildOfOrPat(e, index)
+    or
+    result = getImmediateChildOfParam(e, index)
+    or
+    result = getImmediateChildOfParenExpr(e, index)
+    or
+    result = getImmediateChildOfParenPat(e, index)
+    or
+    result = getImmediateChildOfParenTypeRepr(e, index)
+    or
+    result = getImmediateChildOfPathPat(e, index)
+    or
+    result = getImmediateChildOfPathTypeRepr(e, index)
+    or
+    result = getImmediateChildOfPrefixExpr(e, index)
+    or
+    result = getImmediateChildOfPtrTypeRepr(e, index)
+    or
+    result = getImmediateChildOfRangeExpr(e, index)
+    or
+    result = getImmediateChildOfRangePat(e, index)
+    or
+    result = getImmediateChildOfRefExpr(e, index)
+    or
+    result = getImmediateChildOfRefPat(e, index)
+    or
+    result = getImmediateChildOfRefTypeRepr(e, index)
+    or
+    result = getImmediateChildOfRestPat(e, index)
+    or
+    result = getImmediateChildOfReturnExpr(e, index)
+    or
+    result = getImmediateChildOfSelfParam(e, index)
+    or
+    result = getImmediateChildOfSlicePat(e, index)
+    or
+    result = getImmediateChildOfSliceTypeRepr(e, index)
+    or
+    result = getImmediateChildOfStructExpr(e, index)
+    or
+    result = getImmediateChildOfStructFieldList(e, index)
+    or
+    result = getImmediateChildOfStructPat(e, index)
+    or
+    result = getImmediateChildOfTryExpr(e, index)
+    or
+    result = getImmediateChildOfTupleExpr(e, index)
+    or
+    result = getImmediateChildOfTupleFieldList(e, index)
+    or
+    result = getImmediateChildOfTuplePat(e, index)
+    or
+    result = getImmediateChildOfTupleStructPat(e, index)
+    or
+    result = getImmediateChildOfTupleTypeRepr(e, index)
+    or
+    result = getImmediateChildOfTypeArg(e, index)
+    or
+    result = getImmediateChildOfTypeParam(e, index)
+    or
+    result = getImmediateChildOfUnderscoreExpr(e, index)
+    or
+    result = getImmediateChildOfVariant(e, index)
+    or
+    result = getImmediateChildOfWildcardPat(e, index)
+    or
+    result = getImmediateChildOfYeetExpr(e, index)
+    or
+    result = getImmediateChildOfYieldExpr(e, index)
+    or
+    result = getImmediateChildOfAsmExpr(e, index)
+    or
+    result = getImmediateChildOfBlockExpr(e, index)
+    or
+    result = getImmediateChildOfCallExpr(e, index)
+    or
+    result = getImmediateChildOfExternBlock(e, index)
+    or
+    result = getImmediateChildOfExternCrate(e, index)
+    or
+    result = getImmediateChildOfImpl(e, index)
+    or
+    result = getImmediateChildOfMacroDef(e, index)
+    or
+    result = getImmediateChildOfMacroRules(e, index)
+    or
+    result = getImmediateChildOfMethodCallExpr(e, index)
+    or
+    result = getImmediateChildOfModule(e, index)
+    or
+    result = getImmediateChildOfPathExpr(e, index)
+    or
+    result = getImmediateChildOfTrait(e, index)
+    or
+    result = getImmediateChildOfTraitAlias(e, index)
+    or
+    result = getImmediateChildOfUse(e, index)
+    or
+    result = getImmediateChildOfConst(e, index)
+    or
+    result = getImmediateChildOfEnum(e, index)
+    or
+    result = getImmediateChildOfForExpr(e, index)
+    or
+    result = getImmediateChildOfFunction(e, index)
+    or
+    result = getImmediateChildOfLoopExpr(e, index)
+    or
+    result = getImmediateChildOfMacroCall(e, index)
+    or
+    result = getImmediateChildOfStatic(e, index)
+    or
+    result = getImmediateChildOfStruct(e, index)
+    or
+    result = getImmediateChildOfTypeAlias(e, index)
+    or
+    result = getImmediateChildOfUnion(e, index)
+    or
+    result = getImmediateChildOfWhileExpr(e, index)
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Resolvable.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Resolvable.qll
deleted file mode 100644
index fb0d7975cf9..00000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Resolvable.qll
+++ /dev/null
@@ -1,52 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `Resolvable`.
- * INTERNAL: Do not import directly.
- */
-
-private import codeql.rust.elements.internal.generated.Synth
-private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
-
-/**
- * INTERNAL: This module contains the fully generated definition of `Resolvable` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * One of `PathExpr`, `RecordExpr`, `PathPat`, `RecordPat`, `TupleStructPat` or `MethodCallExpr`.
-   * INTERNAL: Do not reference the `Generated::Resolvable` class directly.
-   * Use the subclass `Resolvable`, where the following predicates are available.
-   */
-  class Resolvable extends Synth::TResolvable, AstNodeImpl::AstNode {
-    /**
-     * Gets the resolved path of this resolvable, if it exists.
-     *
-     * INTERNAL: Do not use.
-     */
-    string getResolvedPath() {
-      result = Synth::convertResolvableToRaw(this).(Raw::Resolvable).getResolvedPath()
-    }
-
-    /**
-     * Holds if `getResolvedPath()` exists.
-     * INTERNAL: Do not use.
-     */
-    final predicate hasResolvedPath() { exists(this.getResolvedPath()) }
-
-    /**
-     * Gets the resolved crate origin of this resolvable, if it exists.
-     *
-     * INTERNAL: Do not use.
-     */
-    string getResolvedCrateOrigin() {
-      result = Synth::convertResolvableToRaw(this).(Raw::Resolvable).getResolvedCrateOrigin()
-    }
-
-    /**
-     * Holds if `getResolvedCrateOrigin()` exists.
-     * INTERNAL: Do not use.
-     */
-    final predicate hasResolvedCrateOrigin() { exists(this.getResolvedCrateOrigin()) }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RetTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RetTypeRepr.qll
index e316b8b32f8..1589d16f20d 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/RetTypeRepr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RetTypeRepr.qll
@@ -19,7 +19,7 @@ module Generated {
    *
    * For example:
    * ```rust
-   * fn foo() -> i32 {}
+   * fn foo() -> i32 { 0 }
    * //       ^^^^^^
    * ```
    * INTERNAL: Do not reference the `Generated::RetTypeRepr` class directly.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/StmtList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/StmtList.qll
index 3460c239a9f..26a7f1f363a 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/StmtList.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/StmtList.qll
@@ -17,13 +17,15 @@ import codeql.rust.elements.Stmt
  */
 module Generated {
   /**
-   * A list of statements in a block.
+   * A list of statements in a block, with an optional tail expression at the
+   * end that determines the block's value.
    *
    * For example:
    * ```rust
    * {
    *     let x = 1;
    *     let y = 2;
+   *     x + y
    * }
    * //  ^^^^^^^^^
    * ```
@@ -53,6 +55,9 @@ module Generated {
 
     /**
      * Gets the `index`th statement of this statement list (0-based).
+     *
+     * The statements of a `StmtList` do not include any tail expression, which
+     * can be accessed with predicates such as `getTailExpr`.
      */
     Stmt getStatement(int index) {
       result =
@@ -73,6 +78,9 @@ module Generated {
 
     /**
      * Gets the tail expression of this statement list, if it exists.
+     *
+     * The tail expression is the expression at the end of a block, that
+     * determines the block's value.
      */
     Expr getTailExpr() {
       result =
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/StructExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/StructExpr.qll
index c4da706e277..c9fbacd7268 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/StructExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/StructExpr.qll
@@ -20,8 +20,8 @@ module Generated {
    * ```rust
    * let first = Foo { a: 1, b: 2 };
    * let second = Foo { a: 2, ..first };
-   * Foo { a: 1, b: 2 }[2] = 10;
-   * Foo { .. } = second;
+   * let n = Foo { a: 1, b: 2 }.b;
+   * Foo { a: m, .. } = second;
    * ```
    * INTERNAL: Do not reference the `Generated::StructExpr` class directly.
    * Use the subclass `StructExpr`, where the following predicates are available.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Synth.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Synth.qll
index 3d89d74b7e8..74b4a14460a 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Synth.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Synth.qll
@@ -130,10 +130,6 @@ module Synth {
      * INTERNAL: Do not use.
      */
     TCastExpr(Raw::CastExpr id) { constructCastExpr(id) } or
-    /**
-     * INTERNAL: Do not use.
-     */
-    TClosureBinder(Raw::ClosureBinder id) { constructClosureBinder(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -202,6 +198,10 @@ module Synth {
      * INTERNAL: Do not use.
      */
     TFnPtrTypeRepr(Raw::FnPtrTypeRepr id) { constructFnPtrTypeRepr(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TForBinder(Raw::ForBinder id) { constructForBinder(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -718,12 +718,12 @@ module Synth {
    */
   class TAstNode =
     TAbi or TAddressable or TArgList or TAsmDirSpec or TAsmOperand or TAsmOperandExpr or
-        TAsmOption or TAsmPiece or TAsmRegSpec or TAssocItemList or TAttr or TCallable or
-        TClosureBinder or TExpr or TExternItemList or TFieldList or TFormatArgsArg or TGenericArg or
+        TAsmOption or TAsmPiece or TAsmRegSpec or TAssocItemList or TAttr or TCallable or TExpr or
+        TExternItemList or TFieldList or TForBinder or TFormatArgsArg or TGenericArg or
         TGenericArgList or TGenericParam or TGenericParamList or TItemList or TLabel or TLetElse or
         TMacroItems or TMatchArm or TMatchArmList or TMatchGuard or TMeta or TName or TParamBase or
-        TParamList or TParenthesizedArgList or TPat or TPath or TPathSegment or TRename or
-        TResolvable or TRetTypeRepr or TReturnTypeSyntax or TSourceFile or TStmt or TStmtList or
+        TParamList or TParenthesizedArgList or TPat or TPath or TPathAstNode or TPathSegment or
+        TRename or TRetTypeRepr or TReturnTypeSyntax or TSourceFile or TStmt or TStmtList or
         TStructExprField or TStructExprFieldList or TStructField or TStructPatField or
         TStructPatFieldList or TToken or TTokenTree or TTupleField or TTypeBound or
         TTypeBoundList or TTypeRepr or TUseBoundGenericArg or TUseBoundGenericArgs or TUseTree or
@@ -774,8 +774,8 @@ module Synth {
    * INTERNAL: Do not use.
    */
   class TItem =
-    TAdt or TAssocItem or TExternBlock or TExternCrate or TExternItem or TImpl or TMacroDef or
-        TMacroRules or TModule or TTrait or TTraitAlias or TUse;
+    TAdt or TAsmExpr or TAssocItem or TExternBlock or TExternCrate or TExternItem or TImpl or
+        TMacroDef or TMacroRules or TModule or TTrait or TTraitAlias or TUse;
 
   /**
    * INTERNAL: Do not use.
@@ -815,11 +815,6 @@ module Synth {
    */
   class TPathExprBase = TFormatTemplateVariableAccess or TPathExpr;
 
-  /**
-   * INTERNAL: Do not use.
-   */
-  class TResolvable = TMethodCallExpr or TPathAstNode;
-
   /**
    * INTERNAL: Do not use.
    */
@@ -850,18 +845,36 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
+   * Gets the parent of synthetic element `e`.
+   */
+  Raw::Element getSynthParent(TElement e) {
+    none()
+    or
+    e = TFormat(result, _, _, _)
+    or
+    e = TFormatArgument(result, _, _, _, _, _)
+    or
+    e = TFormatTemplateVariableAccess(result, _, _)
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TAbi`, if possible.
    */
   TAbi convertAbiFromRaw(Raw::Element e) { result = TAbi(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TArgList`, if possible.
    */
   TArgList convertArgListFromRaw(Raw::Element e) { result = TArgList(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TArrayExprInternal`, if possible.
    */
   TArrayExprInternal convertArrayExprInternalFromRaw(Raw::Element e) {
@@ -870,306 +883,357 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TArrayListExpr`, if possible.
    */
   TArrayListExpr convertArrayListExprFromRaw(Raw::Element e) { result = TArrayListExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TArrayRepeatExpr`, if possible.
    */
   TArrayRepeatExpr convertArrayRepeatExprFromRaw(Raw::Element e) { result = TArrayRepeatExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TArrayTypeRepr`, if possible.
    */
   TArrayTypeRepr convertArrayTypeReprFromRaw(Raw::Element e) { result = TArrayTypeRepr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TAsmClobberAbi`, if possible.
    */
   TAsmClobberAbi convertAsmClobberAbiFromRaw(Raw::Element e) { result = TAsmClobberAbi(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TAsmConst`, if possible.
    */
   TAsmConst convertAsmConstFromRaw(Raw::Element e) { result = TAsmConst(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TAsmDirSpec`, if possible.
    */
   TAsmDirSpec convertAsmDirSpecFromRaw(Raw::Element e) { result = TAsmDirSpec(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TAsmExpr`, if possible.
    */
   TAsmExpr convertAsmExprFromRaw(Raw::Element e) { result = TAsmExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TAsmLabel`, if possible.
    */
   TAsmLabel convertAsmLabelFromRaw(Raw::Element e) { result = TAsmLabel(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TAsmOperandExpr`, if possible.
    */
   TAsmOperandExpr convertAsmOperandExprFromRaw(Raw::Element e) { result = TAsmOperandExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TAsmOperandNamed`, if possible.
    */
   TAsmOperandNamed convertAsmOperandNamedFromRaw(Raw::Element e) { result = TAsmOperandNamed(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TAsmOption`, if possible.
    */
   TAsmOption convertAsmOptionFromRaw(Raw::Element e) { result = TAsmOption(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TAsmOptionsList`, if possible.
    */
   TAsmOptionsList convertAsmOptionsListFromRaw(Raw::Element e) { result = TAsmOptionsList(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TAsmRegOperand`, if possible.
    */
   TAsmRegOperand convertAsmRegOperandFromRaw(Raw::Element e) { result = TAsmRegOperand(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TAsmRegSpec`, if possible.
    */
   TAsmRegSpec convertAsmRegSpecFromRaw(Raw::Element e) { result = TAsmRegSpec(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TAsmSym`, if possible.
    */
   TAsmSym convertAsmSymFromRaw(Raw::Element e) { result = TAsmSym(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TAssocItemList`, if possible.
    */
   TAssocItemList convertAssocItemListFromRaw(Raw::Element e) { result = TAssocItemList(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TAssocTypeArg`, if possible.
    */
   TAssocTypeArg convertAssocTypeArgFromRaw(Raw::Element e) { result = TAssocTypeArg(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TAttr`, if possible.
    */
   TAttr convertAttrFromRaw(Raw::Element e) { result = TAttr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TAwaitExpr`, if possible.
    */
   TAwaitExpr convertAwaitExprFromRaw(Raw::Element e) { result = TAwaitExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TBecomeExpr`, if possible.
    */
   TBecomeExpr convertBecomeExprFromRaw(Raw::Element e) { result = TBecomeExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TBinaryExpr`, if possible.
    */
   TBinaryExpr convertBinaryExprFromRaw(Raw::Element e) { result = TBinaryExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TBlockExpr`, if possible.
    */
   TBlockExpr convertBlockExprFromRaw(Raw::Element e) { result = TBlockExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TBoxPat`, if possible.
    */
   TBoxPat convertBoxPatFromRaw(Raw::Element e) { result = TBoxPat(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TBreakExpr`, if possible.
    */
   TBreakExpr convertBreakExprFromRaw(Raw::Element e) { result = TBreakExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TCallExpr`, if possible.
    */
   TCallExpr convertCallExprFromRaw(Raw::Element e) { result = TCallExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TCastExpr`, if possible.
    */
   TCastExpr convertCastExprFromRaw(Raw::Element e) { result = TCastExpr(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TClosureBinder`, if possible.
-   */
-  TClosureBinder convertClosureBinderFromRaw(Raw::Element e) { result = TClosureBinder(e) }
-
-  /**
-   * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TClosureExpr`, if possible.
    */
   TClosureExpr convertClosureExprFromRaw(Raw::Element e) { result = TClosureExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TComment`, if possible.
    */
   TComment convertCommentFromRaw(Raw::Element e) { result = TComment(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TConst`, if possible.
    */
   TConst convertConstFromRaw(Raw::Element e) { result = TConst(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TConstArg`, if possible.
    */
   TConstArg convertConstArgFromRaw(Raw::Element e) { result = TConstArg(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TConstBlockPat`, if possible.
    */
   TConstBlockPat convertConstBlockPatFromRaw(Raw::Element e) { result = TConstBlockPat(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TConstParam`, if possible.
    */
   TConstParam convertConstParamFromRaw(Raw::Element e) { result = TConstParam(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TContinueExpr`, if possible.
    */
   TContinueExpr convertContinueExprFromRaw(Raw::Element e) { result = TContinueExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TCrate`, if possible.
    */
   TCrate convertCrateFromRaw(Raw::Element e) { result = TCrate(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TDynTraitTypeRepr`, if possible.
    */
   TDynTraitTypeRepr convertDynTraitTypeReprFromRaw(Raw::Element e) { result = TDynTraitTypeRepr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TEnum`, if possible.
    */
   TEnum convertEnumFromRaw(Raw::Element e) { result = TEnum(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TExprStmt`, if possible.
    */
   TExprStmt convertExprStmtFromRaw(Raw::Element e) { result = TExprStmt(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TExternBlock`, if possible.
    */
   TExternBlock convertExternBlockFromRaw(Raw::Element e) { result = TExternBlock(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TExternCrate`, if possible.
    */
   TExternCrate convertExternCrateFromRaw(Raw::Element e) { result = TExternCrate(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TExternItemList`, if possible.
    */
   TExternItemList convertExternItemListFromRaw(Raw::Element e) { result = TExternItemList(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TExtractorStep`, if possible.
    */
   TExtractorStep convertExtractorStepFromRaw(Raw::Element e) { result = TExtractorStep(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TFieldExpr`, if possible.
    */
   TFieldExpr convertFieldExprFromRaw(Raw::Element e) { result = TFieldExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TFnPtrTypeRepr`, if possible.
    */
   TFnPtrTypeRepr convertFnPtrTypeReprFromRaw(Raw::Element e) { result = TFnPtrTypeRepr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
+   * Converts a raw element to a synthesized `TForBinder`, if possible.
+   */
+  TForBinder convertForBinderFromRaw(Raw::Element e) { result = TForBinder(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TForExpr`, if possible.
    */
   TForExpr convertForExprFromRaw(Raw::Element e) { result = TForExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TForTypeRepr`, if possible.
    */
   TForTypeRepr convertForTypeReprFromRaw(Raw::Element e) { result = TForTypeRepr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TFormat`, if possible.
    */
   TFormat convertFormatFromRaw(Raw::Element e) { none() }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TFormatArgsArg`, if possible.
    */
   TFormatArgsArg convertFormatArgsArgFromRaw(Raw::Element e) { result = TFormatArgsArg(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TFormatArgsExpr`, if possible.
    */
   TFormatArgsExpr convertFormatArgsExprFromRaw(Raw::Element e) { result = TFormatArgsExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TFormatArgument`, if possible.
    */
   TFormatArgument convertFormatArgumentFromRaw(Raw::Element e) { none() }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TFormatTemplateVariableAccess`, if possible.
    */
   TFormatTemplateVariableAccess convertFormatTemplateVariableAccessFromRaw(Raw::Element e) {
@@ -1178,42 +1242,49 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TFunction`, if possible.
    */
   TFunction convertFunctionFromRaw(Raw::Element e) { result = TFunction(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TGenericArgList`, if possible.
    */
   TGenericArgList convertGenericArgListFromRaw(Raw::Element e) { result = TGenericArgList(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TGenericParamList`, if possible.
    */
   TGenericParamList convertGenericParamListFromRaw(Raw::Element e) { result = TGenericParamList(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TIdentPat`, if possible.
    */
   TIdentPat convertIdentPatFromRaw(Raw::Element e) { result = TIdentPat(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TIfExpr`, if possible.
    */
   TIfExpr convertIfExprFromRaw(Raw::Element e) { result = TIfExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TImpl`, if possible.
    */
   TImpl convertImplFromRaw(Raw::Element e) { result = TImpl(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TImplTraitTypeRepr`, if possible.
    */
   TImplTraitTypeRepr convertImplTraitTypeReprFromRaw(Raw::Element e) {
@@ -1222,246 +1293,287 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TIndexExpr`, if possible.
    */
   TIndexExpr convertIndexExprFromRaw(Raw::Element e) { result = TIndexExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TInferTypeRepr`, if possible.
    */
   TInferTypeRepr convertInferTypeReprFromRaw(Raw::Element e) { result = TInferTypeRepr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TItemList`, if possible.
    */
   TItemList convertItemListFromRaw(Raw::Element e) { result = TItemList(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TLabel`, if possible.
    */
   TLabel convertLabelFromRaw(Raw::Element e) { result = TLabel(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TLetElse`, if possible.
    */
   TLetElse convertLetElseFromRaw(Raw::Element e) { result = TLetElse(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TLetExpr`, if possible.
    */
   TLetExpr convertLetExprFromRaw(Raw::Element e) { result = TLetExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TLetStmt`, if possible.
    */
   TLetStmt convertLetStmtFromRaw(Raw::Element e) { result = TLetStmt(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TLifetime`, if possible.
    */
   TLifetime convertLifetimeFromRaw(Raw::Element e) { result = TLifetime(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TLifetimeArg`, if possible.
    */
   TLifetimeArg convertLifetimeArgFromRaw(Raw::Element e) { result = TLifetimeArg(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TLifetimeParam`, if possible.
    */
   TLifetimeParam convertLifetimeParamFromRaw(Raw::Element e) { result = TLifetimeParam(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TLiteralExpr`, if possible.
    */
   TLiteralExpr convertLiteralExprFromRaw(Raw::Element e) { result = TLiteralExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TLiteralPat`, if possible.
    */
   TLiteralPat convertLiteralPatFromRaw(Raw::Element e) { result = TLiteralPat(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TLoopExpr`, if possible.
    */
   TLoopExpr convertLoopExprFromRaw(Raw::Element e) { result = TLoopExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TMacroBlockExpr`, if possible.
    */
   TMacroBlockExpr convertMacroBlockExprFromRaw(Raw::Element e) { result = TMacroBlockExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TMacroCall`, if possible.
    */
   TMacroCall convertMacroCallFromRaw(Raw::Element e) { result = TMacroCall(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TMacroDef`, if possible.
    */
   TMacroDef convertMacroDefFromRaw(Raw::Element e) { result = TMacroDef(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TMacroExpr`, if possible.
    */
   TMacroExpr convertMacroExprFromRaw(Raw::Element e) { result = TMacroExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TMacroItems`, if possible.
    */
   TMacroItems convertMacroItemsFromRaw(Raw::Element e) { result = TMacroItems(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TMacroPat`, if possible.
    */
   TMacroPat convertMacroPatFromRaw(Raw::Element e) { result = TMacroPat(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TMacroRules`, if possible.
    */
   TMacroRules convertMacroRulesFromRaw(Raw::Element e) { result = TMacroRules(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TMacroTypeRepr`, if possible.
    */
   TMacroTypeRepr convertMacroTypeReprFromRaw(Raw::Element e) { result = TMacroTypeRepr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TMatchArm`, if possible.
    */
   TMatchArm convertMatchArmFromRaw(Raw::Element e) { result = TMatchArm(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TMatchArmList`, if possible.
    */
   TMatchArmList convertMatchArmListFromRaw(Raw::Element e) { result = TMatchArmList(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TMatchExpr`, if possible.
    */
   TMatchExpr convertMatchExprFromRaw(Raw::Element e) { result = TMatchExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TMatchGuard`, if possible.
    */
   TMatchGuard convertMatchGuardFromRaw(Raw::Element e) { result = TMatchGuard(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TMeta`, if possible.
    */
   TMeta convertMetaFromRaw(Raw::Element e) { result = TMeta(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TMethodCallExpr`, if possible.
    */
   TMethodCallExpr convertMethodCallExprFromRaw(Raw::Element e) { result = TMethodCallExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TMissing`, if possible.
    */
   TMissing convertMissingFromRaw(Raw::Element e) { result = TMissing(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TModule`, if possible.
    */
   TModule convertModuleFromRaw(Raw::Element e) { result = TModule(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TName`, if possible.
    */
   TName convertNameFromRaw(Raw::Element e) { result = TName(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TNameRef`, if possible.
    */
   TNameRef convertNameRefFromRaw(Raw::Element e) { result = TNameRef(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TNamedCrate`, if possible.
    */
   TNamedCrate convertNamedCrateFromRaw(Raw::Element e) { result = TNamedCrate(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TNeverTypeRepr`, if possible.
    */
   TNeverTypeRepr convertNeverTypeReprFromRaw(Raw::Element e) { result = TNeverTypeRepr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TOffsetOfExpr`, if possible.
    */
   TOffsetOfExpr convertOffsetOfExprFromRaw(Raw::Element e) { result = TOffsetOfExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TOrPat`, if possible.
    */
   TOrPat convertOrPatFromRaw(Raw::Element e) { result = TOrPat(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TParam`, if possible.
    */
   TParam convertParamFromRaw(Raw::Element e) { result = TParam(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TParamList`, if possible.
    */
   TParamList convertParamListFromRaw(Raw::Element e) { result = TParamList(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TParenExpr`, if possible.
    */
   TParenExpr convertParenExprFromRaw(Raw::Element e) { result = TParenExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TParenPat`, if possible.
    */
   TParenPat convertParenPatFromRaw(Raw::Element e) { result = TParenPat(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TParenTypeRepr`, if possible.
    */
   TParenTypeRepr convertParenTypeReprFromRaw(Raw::Element e) { result = TParenTypeRepr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TParenthesizedArgList`, if possible.
    */
   TParenthesizedArgList convertParenthesizedArgListFromRaw(Raw::Element e) {
@@ -1470,162 +1582,189 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TPath`, if possible.
    */
   TPath convertPathFromRaw(Raw::Element e) { result = TPath(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TPathExpr`, if possible.
    */
   TPathExpr convertPathExprFromRaw(Raw::Element e) { result = TPathExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TPathPat`, if possible.
    */
   TPathPat convertPathPatFromRaw(Raw::Element e) { result = TPathPat(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TPathSegment`, if possible.
    */
   TPathSegment convertPathSegmentFromRaw(Raw::Element e) { result = TPathSegment(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TPathTypeRepr`, if possible.
    */
   TPathTypeRepr convertPathTypeReprFromRaw(Raw::Element e) { result = TPathTypeRepr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TPrefixExpr`, if possible.
    */
   TPrefixExpr convertPrefixExprFromRaw(Raw::Element e) { result = TPrefixExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TPtrTypeRepr`, if possible.
    */
   TPtrTypeRepr convertPtrTypeReprFromRaw(Raw::Element e) { result = TPtrTypeRepr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TRangeExpr`, if possible.
    */
   TRangeExpr convertRangeExprFromRaw(Raw::Element e) { result = TRangeExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TRangePat`, if possible.
    */
   TRangePat convertRangePatFromRaw(Raw::Element e) { result = TRangePat(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TRefExpr`, if possible.
    */
   TRefExpr convertRefExprFromRaw(Raw::Element e) { result = TRefExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TRefPat`, if possible.
    */
   TRefPat convertRefPatFromRaw(Raw::Element e) { result = TRefPat(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TRefTypeRepr`, if possible.
    */
   TRefTypeRepr convertRefTypeReprFromRaw(Raw::Element e) { result = TRefTypeRepr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TRename`, if possible.
    */
   TRename convertRenameFromRaw(Raw::Element e) { result = TRename(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TRestPat`, if possible.
    */
   TRestPat convertRestPatFromRaw(Raw::Element e) { result = TRestPat(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TRetTypeRepr`, if possible.
    */
   TRetTypeRepr convertRetTypeReprFromRaw(Raw::Element e) { result = TRetTypeRepr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TReturnExpr`, if possible.
    */
   TReturnExpr convertReturnExprFromRaw(Raw::Element e) { result = TReturnExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TReturnTypeSyntax`, if possible.
    */
   TReturnTypeSyntax convertReturnTypeSyntaxFromRaw(Raw::Element e) { result = TReturnTypeSyntax(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TSelfParam`, if possible.
    */
   TSelfParam convertSelfParamFromRaw(Raw::Element e) { result = TSelfParam(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TSlicePat`, if possible.
    */
   TSlicePat convertSlicePatFromRaw(Raw::Element e) { result = TSlicePat(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TSliceTypeRepr`, if possible.
    */
   TSliceTypeRepr convertSliceTypeReprFromRaw(Raw::Element e) { result = TSliceTypeRepr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TSourceFile`, if possible.
    */
   TSourceFile convertSourceFileFromRaw(Raw::Element e) { result = TSourceFile(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TStatic`, if possible.
    */
   TStatic convertStaticFromRaw(Raw::Element e) { result = TStatic(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TStmtList`, if possible.
    */
   TStmtList convertStmtListFromRaw(Raw::Element e) { result = TStmtList(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TStruct`, if possible.
    */
   TStruct convertStructFromRaw(Raw::Element e) { result = TStruct(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TStructExpr`, if possible.
    */
   TStructExpr convertStructExprFromRaw(Raw::Element e) { result = TStructExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TStructExprField`, if possible.
    */
   TStructExprField convertStructExprFieldFromRaw(Raw::Element e) { result = TStructExprField(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TStructExprFieldList`, if possible.
    */
   TStructExprFieldList convertStructExprFieldListFromRaw(Raw::Element e) {
@@ -1634,30 +1773,35 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TStructField`, if possible.
    */
   TStructField convertStructFieldFromRaw(Raw::Element e) { result = TStructField(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TStructFieldList`, if possible.
    */
   TStructFieldList convertStructFieldListFromRaw(Raw::Element e) { result = TStructFieldList(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TStructPat`, if possible.
    */
   TStructPat convertStructPatFromRaw(Raw::Element e) { result = TStructPat(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TStructPatField`, if possible.
    */
   TStructPatField convertStructPatFieldFromRaw(Raw::Element e) { result = TStructPatField(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TStructPatFieldList`, if possible.
    */
   TStructPatFieldList convertStructPatFieldListFromRaw(Raw::Element e) {
@@ -1666,120 +1810,140 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TTokenTree`, if possible.
    */
   TTokenTree convertTokenTreeFromRaw(Raw::Element e) { result = TTokenTree(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TTrait`, if possible.
    */
   TTrait convertTraitFromRaw(Raw::Element e) { result = TTrait(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TTraitAlias`, if possible.
    */
   TTraitAlias convertTraitAliasFromRaw(Raw::Element e) { result = TTraitAlias(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TTryExpr`, if possible.
    */
   TTryExpr convertTryExprFromRaw(Raw::Element e) { result = TTryExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TTupleExpr`, if possible.
    */
   TTupleExpr convertTupleExprFromRaw(Raw::Element e) { result = TTupleExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TTupleField`, if possible.
    */
   TTupleField convertTupleFieldFromRaw(Raw::Element e) { result = TTupleField(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TTupleFieldList`, if possible.
    */
   TTupleFieldList convertTupleFieldListFromRaw(Raw::Element e) { result = TTupleFieldList(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TTuplePat`, if possible.
    */
   TTuplePat convertTuplePatFromRaw(Raw::Element e) { result = TTuplePat(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TTupleStructPat`, if possible.
    */
   TTupleStructPat convertTupleStructPatFromRaw(Raw::Element e) { result = TTupleStructPat(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TTupleTypeRepr`, if possible.
    */
   TTupleTypeRepr convertTupleTypeReprFromRaw(Raw::Element e) { result = TTupleTypeRepr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TTypeAlias`, if possible.
    */
   TTypeAlias convertTypeAliasFromRaw(Raw::Element e) { result = TTypeAlias(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TTypeArg`, if possible.
    */
   TTypeArg convertTypeArgFromRaw(Raw::Element e) { result = TTypeArg(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TTypeBound`, if possible.
    */
   TTypeBound convertTypeBoundFromRaw(Raw::Element e) { result = TTypeBound(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TTypeBoundList`, if possible.
    */
   TTypeBoundList convertTypeBoundListFromRaw(Raw::Element e) { result = TTypeBoundList(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TTypeParam`, if possible.
    */
   TTypeParam convertTypeParamFromRaw(Raw::Element e) { result = TTypeParam(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TUnderscoreExpr`, if possible.
    */
   TUnderscoreExpr convertUnderscoreExprFromRaw(Raw::Element e) { result = TUnderscoreExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TUnimplemented`, if possible.
    */
   TUnimplemented convertUnimplementedFromRaw(Raw::Element e) { result = TUnimplemented(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TUnion`, if possible.
    */
   TUnion convertUnionFromRaw(Raw::Element e) { result = TUnion(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TUse`, if possible.
    */
   TUse convertUseFromRaw(Raw::Element e) { result = TUse(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TUseBoundGenericArgs`, if possible.
    */
   TUseBoundGenericArgs convertUseBoundGenericArgsFromRaw(Raw::Element e) {
@@ -1788,66 +1952,77 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TUseTree`, if possible.
    */
   TUseTree convertUseTreeFromRaw(Raw::Element e) { result = TUseTree(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TUseTreeList`, if possible.
    */
   TUseTreeList convertUseTreeListFromRaw(Raw::Element e) { result = TUseTreeList(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TVariant`, if possible.
    */
   TVariant convertVariantFromRaw(Raw::Element e) { result = TVariant(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TVariantList`, if possible.
    */
   TVariantList convertVariantListFromRaw(Raw::Element e) { result = TVariantList(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TVisibility`, if possible.
    */
   TVisibility convertVisibilityFromRaw(Raw::Element e) { result = TVisibility(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TWhereClause`, if possible.
    */
   TWhereClause convertWhereClauseFromRaw(Raw::Element e) { result = TWhereClause(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TWherePred`, if possible.
    */
   TWherePred convertWherePredFromRaw(Raw::Element e) { result = TWherePred(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TWhileExpr`, if possible.
    */
   TWhileExpr convertWhileExprFromRaw(Raw::Element e) { result = TWhileExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TWildcardPat`, if possible.
    */
   TWildcardPat convertWildcardPatFromRaw(Raw::Element e) { result = TWildcardPat(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TYeetExpr`, if possible.
    */
   TYeetExpr convertYeetExprFromRaw(Raw::Element e) { result = TYeetExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TYieldExpr`, if possible.
    */
   TYieldExpr convertYieldExprFromRaw(Raw::Element e) { result = TYieldExpr(e) }
@@ -1953,14 +2128,14 @@ module Synth {
     or
     result = convertCallableFromRaw(e)
     or
-    result = convertClosureBinderFromRaw(e)
-    or
     result = convertExprFromRaw(e)
     or
     result = convertExternItemListFromRaw(e)
     or
     result = convertFieldListFromRaw(e)
     or
+    result = convertForBinderFromRaw(e)
+    or
     result = convertFormatArgsArgFromRaw(e)
     or
     result = convertGenericArgFromRaw(e)
@@ -1999,12 +2174,12 @@ module Synth {
     or
     result = convertPathFromRaw(e)
     or
+    result = convertPathAstNodeFromRaw(e)
+    or
     result = convertPathSegmentFromRaw(e)
     or
     result = convertRenameFromRaw(e)
     or
-    result = convertResolvableFromRaw(e)
-    or
     result = convertRetTypeReprFromRaw(e)
     or
     result = convertReturnTypeSyntaxFromRaw(e)
@@ -2219,6 +2394,8 @@ module Synth {
   TItem convertItemFromRaw(Raw::Element e) {
     result = convertAdtFromRaw(e)
     or
+    result = convertAsmExprFromRaw(e)
+    or
     result = convertAssocItemFromRaw(e)
     or
     result = convertExternBlockFromRaw(e)
@@ -2352,16 +2529,6 @@ module Synth {
     result = convertPathExprFromRaw(e)
   }
 
-  /**
-   * INTERNAL: Do not use.
-   * Converts a raw DB element to a synthesized `TResolvable`, if possible.
-   */
-  TResolvable convertResolvableFromRaw(Raw::Element e) {
-    result = convertMethodCallExprFromRaw(e)
-    or
-    result = convertPathAstNodeFromRaw(e)
-  }
-
   /**
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TStmt`, if possible.
@@ -2610,12 +2777,6 @@ module Synth {
    */
   Raw::Element convertCastExprToRaw(TCastExpr e) { e = TCastExpr(result) }
 
-  /**
-   * INTERNAL: Do not use.
-   * Converts a synthesized `TClosureBinder` to a raw DB element, if possible.
-   */
-  Raw::Element convertClosureBinderToRaw(TClosureBinder e) { e = TClosureBinder(result) }
-
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TClosureExpr` to a raw DB element, if possible.
@@ -2718,6 +2879,12 @@ module Synth {
    */
   Raw::Element convertFnPtrTypeReprToRaw(TFnPtrTypeRepr e) { e = TFnPtrTypeRepr(result) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TForBinder` to a raw DB element, if possible.
+   */
+  Raw::Element convertForBinderToRaw(TForBinder e) { e = TForBinder(result) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TForExpr` to a raw DB element, if possible.
@@ -3537,14 +3704,14 @@ module Synth {
     or
     result = convertCallableToRaw(e)
     or
-    result = convertClosureBinderToRaw(e)
-    or
     result = convertExprToRaw(e)
     or
     result = convertExternItemListToRaw(e)
     or
     result = convertFieldListToRaw(e)
     or
+    result = convertForBinderToRaw(e)
+    or
     result = convertFormatArgsArgToRaw(e)
     or
     result = convertGenericArgToRaw(e)
@@ -3583,12 +3750,12 @@ module Synth {
     or
     result = convertPathToRaw(e)
     or
+    result = convertPathAstNodeToRaw(e)
+    or
     result = convertPathSegmentToRaw(e)
     or
     result = convertRenameToRaw(e)
     or
-    result = convertResolvableToRaw(e)
-    or
     result = convertRetTypeReprToRaw(e)
     or
     result = convertReturnTypeSyntaxToRaw(e)
@@ -3803,6 +3970,8 @@ module Synth {
   Raw::Element convertItemToRaw(TItem e) {
     result = convertAdtToRaw(e)
     or
+    result = convertAsmExprToRaw(e)
+    or
     result = convertAssocItemToRaw(e)
     or
     result = convertExternBlockToRaw(e)
@@ -3936,16 +4105,6 @@ module Synth {
     result = convertPathExprToRaw(e)
   }
 
-  /**
-   * INTERNAL: Do not use.
-   * Converts a synthesized `TResolvable` to a raw DB element, if possible.
-   */
-  Raw::Element convertResolvableToRaw(TResolvable e) {
-    result = convertMethodCallExprToRaw(e)
-    or
-    result = convertPathAstNodeToRaw(e)
-  }
-
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TStmt` to a raw DB element, if possible.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/SynthConstructors.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/SynthConstructors.qll
index e6ff3af4715..d701fa09d76 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/SynthConstructors.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/SynthConstructors.qll
@@ -32,7 +32,6 @@ import codeql.rust.elements.internal.BoxPatConstructor
 import codeql.rust.elements.internal.BreakExprConstructor
 import codeql.rust.elements.internal.CallExprConstructor
 import codeql.rust.elements.internal.CastExprConstructor
-import codeql.rust.elements.internal.ClosureBinderConstructor
 import codeql.rust.elements.internal.ClosureExprConstructor
 import codeql.rust.elements.internal.CommentConstructor
 import codeql.rust.elements.internal.ConstConstructor
@@ -50,6 +49,7 @@ import codeql.rust.elements.internal.ExternItemListConstructor
 import codeql.rust.elements.internal.ExtractorStepConstructor
 import codeql.rust.elements.internal.FieldExprConstructor
 import codeql.rust.elements.internal.FnPtrTypeReprConstructor
+import codeql.rust.elements.internal.ForBinderConstructor
 import codeql.rust.elements.internal.ForExprConstructor
 import codeql.rust.elements.internal.ForTypeReprConstructor
 import codeql.rust.elements.internal.FormatConstructor
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TupleExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TupleExpr.qll
index 0860831446b..9a3b414dda0 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/TupleExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TupleExpr.qll
@@ -18,8 +18,9 @@ module Generated {
   /**
    * A tuple expression. For example:
    * ```rust
-   * (1, "one");
-   * (2, "two")[0] = 3;
+   * let tuple = (1, "one");
+   * let n = (2, "two").0;
+   * let (a, b) = tuple;
    * ```
    * INTERNAL: Do not reference the `Generated::TupleExpr` class directly.
    * Use the subclass `TupleExpr`, where the following predicates are available.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TypeBound.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeBound.qll
index c1e349511be..958867911ce 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/TypeBound.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeBound.qll
@@ -7,6 +7,7 @@
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.ForBinder
 import codeql.rust.elements.Lifetime
 import codeql.rust.elements.TypeRepr
 import codeql.rust.elements.UseBoundGenericArgs
@@ -23,6 +24,8 @@ module Generated {
    * ```rust
    * fn foo<T: Debug>(t: T) {}
    * //        ^^^^^
+   * fn bar(value: impl for<'a> From<&'a str>) {}
+   * //                 ^^^^^^^^^^^^^^^^^^^^^
    * ```
    * INTERNAL: Do not reference the `Generated::TypeBound` class directly.
    * Use the subclass `TypeBound`, where the following predicates are available.
@@ -30,6 +33,21 @@ module Generated {
   class TypeBound extends Synth::TTypeBound, AstNodeImpl::AstNode {
     override string getAPrimaryQlClass() { result = "TypeBound" }
 
+    /**
+     * Gets the for binder of this type bound, if it exists.
+     */
+    ForBinder getForBinder() {
+      result =
+        Synth::convertForBinderFromRaw(Synth::convertTypeBoundToRaw(this)
+              .(Raw::TypeBound)
+              .getForBinder())
+    }
+
+    /**
+     * Holds if `getForBinder()` exists.
+     */
+    final predicate hasForBinder() { exists(this.getForBinder()) }
+
     /**
      * Holds if this type bound is async.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/UseBoundGenericArgs.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/UseBoundGenericArgs.qll
index 9ba10bdf876..3f76518c240 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/UseBoundGenericArgs.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/UseBoundGenericArgs.qll
@@ -19,7 +19,7 @@ module Generated {
    *
    * For example:
    * ```rust
-   * pub fn hello<'a, T, const N: usize>() -> impl Sized + use<'a, T, N> {}
+   * pub fn hello<'a, T, const N: usize>() -> impl Sized + use<'a, T, N> { 0 }
    * //                                                        ^^^^^^^^
    * ```
    * INTERNAL: Do not reference the `Generated::UseBoundGenericArgs` class directly.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/WherePred.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/WherePred.qll
index cd835e33850..7a96b326f1c 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/WherePred.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/WherePred.qll
@@ -7,7 +7,7 @@
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
-import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.ForBinder
 import codeql.rust.elements.Lifetime
 import codeql.rust.elements.TypeBoundList
 import codeql.rust.elements.TypeRepr
@@ -24,6 +24,8 @@ module Generated {
    * ```rust
    * fn foo<T, U>(t: T, u: U) where T: Debug, U: Clone {}
    * //                             ^^^^^^^^  ^^^^^^^^
+   * fn bar<T>(value: T) where for<'a> T: From<&'a str> {}
+   * //                        ^^^^^^^^^^^^^^^^^^^^^^^^
    * ```
    * INTERNAL: Do not reference the `Generated::WherePred` class directly.
    * Use the subclass `WherePred`, where the following predicates are available.
@@ -32,19 +34,19 @@ module Generated {
     override string getAPrimaryQlClass() { result = "WherePred" }
 
     /**
-     * Gets the generic parameter list of this where pred, if it exists.
+     * Gets the for binder of this where pred, if it exists.
      */
-    GenericParamList getGenericParamList() {
+    ForBinder getForBinder() {
       result =
-        Synth::convertGenericParamListFromRaw(Synth::convertWherePredToRaw(this)
+        Synth::convertForBinderFromRaw(Synth::convertWherePredToRaw(this)
               .(Raw::WherePred)
-              .getGenericParamList())
+              .getForBinder())
     }
 
     /**
-     * Holds if `getGenericParamList()` exists.
+     * Holds if `getForBinder()` exists.
      */
-    final predicate hasGenericParamList() { exists(this.getGenericParamList()) }
+    final predicate hasForBinder() { exists(this.getForBinder()) }
 
     /**
      * Gets the lifetime of this where pred, if it exists.
diff --git a/rust/ql/lib/codeql/rust/frameworks/actix-web.model.yml b/rust/ql/lib/codeql/rust/frameworks/actix-web.model.yml
new file mode 100644
index 00000000000..4031b9bbe86
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/frameworks/actix-web.model.yml
@@ -0,0 +1,18 @@
+extensions:
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: sourceModel
+    data:
+      - ["<actix_web::route::Route>::to", "Argument[0].Parameter[0..7]", "remote", "manual"]
+      # Actix attributes such as `get` expand to this `to` call on the handler.
+      - ["<actix_web::resource::Resource>::to", "Argument[0].Parameter[0..7]", "remote", "manual"]
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: summaryModel
+    data:
+        - ["<actix_web::types::path::Path>::into_inner", "Argument[self]", "ReturnValue", "taint", "manual"]
+        - ["<actix_web::types::path::Path>::into_inner", "Argument[self]", "ReturnValue.Field[0]", "taint", "manual"]
+        - ["<actix_web::types::path::Path>::into_inner", "Argument[self]", "ReturnValue.Field[1]", "taint", "manual"]
+        - ["<actix_web::types::path::Path>::into_inner", "Argument[self]", "ReturnValue.Field[2]", "taint", "manual"]
+        - ["<actix_web::types::path::Path>::into_inner", "Argument[self]", "ReturnValue.Field[3]", "taint", "manual"]
+        - ["<actix_web::types::path::Path>::into_inner", "Argument[self]", "ReturnValue.Field[4]", "taint", "manual"]
\ No newline at end of file
diff --git a/rust/ql/lib/codeql/rust/frameworks/asyncstd/fs.model.yml b/rust/ql/lib/codeql/rust/frameworks/asyncstd/fs.model.yml
new file mode 100644
index 00000000000..b8c4cf4e10a
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/frameworks/asyncstd/fs.model.yml
@@ -0,0 +1,42 @@
+extensions:
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: sourceModel
+    data:
+      - ["async_std::fs::read::read", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "file", "manual"]
+      - ["async_std::fs::read_to_string::read_to_string", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "file", "manual"]
+      - ["async_std::fs::read_link::read_link", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "file", "manual"]
+      - ["<async_std::fs::dir_entry::DirEntry>::path", "ReturnValue", "file", "manual"]
+      - ["<async_std::fs::dir_entry::DirEntry>::file_name", "ReturnValue", "file", "manual"]
+      - ["<async_std::fs::file::File>::open", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "file", "manual"]
+      - ["<async_std::fs::open_options::OpenOptions>::open", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "file", "manual"]
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: sinkModel
+    data:
+      - ["async_std::fs::copy::copy", "Argument[0,1]", "path-injection", "manual"]
+      - ["async_std::fs::create_dir::create_dir", "Argument[0]", "path-injection", "manual"]
+      - ["async_std::fs::create_dir_all::create_dir_all", "Argument[0]", "path-injection", "manual"]
+      - ["async_std::fs::hard_link::hard_link", "Argument[0,1]", "path-injection", "manual"]
+      - ["async_std::fs::metadata::metadata", "Argument[0]", "path-injection", "manual"]
+      - ["async_std::fs::read::read", "Argument[0]", "path-injection", "manual"]
+      - ["async_std::fs::read_dir::read_dir", "Argument[0]", "path-injection", "manual"]
+      - ["async_std::fs::read_link::read_link", "Argument[0]", "path-injection", "manual"]
+      - ["async_std::fs::read_to_string::read_to_string", "Argument[0]", "path-injection", "manual"]
+      - ["async_std::fs::remove_dir::remove_dir", "Argument[0]", "path-injection", "manual"]
+      - ["async_std::fs::remove_dir_all::remove_dir_all", "Argument[0]", "path-injection", "manual"]
+      - ["async_std::fs::remove_file::remove_file", "Argument[0]", "path-injection", "manual"]
+      - ["async_std::fs::rename::rename", "Argument[0,1]", "path-injection", "manual"]
+      - ["async_std::fs::set_permissions::set_permissions", "Argument[0]", "path-injection", "manual"]
+      - ["async_std::fs::symlink_metadata::symlink_metadata", "Argument[0]", "path-injection", "manual"]
+      - ["async_std::fs::write::write", "Argument[0]", "path-injection", "manual"]
+      - ["<async_std::fs::dir_builder::DirBuilder>::create", "Argument[0]", "path-injection", "manual"]
+      - ["<async_std::fs::file::File>::create", "Argument[0]", "path-injection", "manual"]
+      - ["<async_std::fs::file::File>::open", "Argument[0]", "path-injection", "manual"]
+      - ["<async_std::fs::open_options::OpenOptions>::open", "Argument[0]", "path-injection", "manual"]
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: summaryModel
+    data:
+      - ["async_std::fs::canonicalize::canonicalize", "Argument[0].OptionalStep[normalize-path]", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["async_std::fs::canonicalize::canonicalize", "Argument[0].OptionalBarrier[normalize-path]", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
diff --git a/rust/ql/lib/codeql/rust/frameworks/asyncstd/io.model.yml b/rust/ql/lib/codeql/rust/frameworks/asyncstd/io.model.yml
new file mode 100644
index 00000000000..99e14d0f0bc
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/frameworks/asyncstd/io.model.yml
@@ -0,0 +1,7 @@
+extensions:
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: summaryModel
+    data:
+      - ["<_ as async_std::io::read::ReadExt>::read", "Argument[self]", "Argument[0].Reference", "taint", "manual"]
+      - ["<_ as async_std::io::read::ReadExt>::read", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
diff --git a/rust/ql/lib/codeql/rust/frameworks/async-rs.model.yml b/rust/ql/lib/codeql/rust/frameworks/asyncstd/net.model.yml
similarity index 100%
rename from rust/ql/lib/codeql/rust/frameworks/async-rs.model.yml
rename to rust/ql/lib/codeql/rust/frameworks/asyncstd/net.model.yml
diff --git a/rust/ql/lib/codeql/rust/frameworks/biscotti.model.yml b/rust/ql/lib/codeql/rust/frameworks/biscotti.model.yml
new file mode 100644
index 00000000000..2e9b1213ed7
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/frameworks/biscotti.model.yml
@@ -0,0 +1,32 @@
+# Models for the `biscotti` crate.
+extensions:
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: sourceModel
+    data:
+      - ["<biscotti::response_cookie::ResponseCookie>::new", "ReturnValue", "cookie-create", "manual"]
+      - ["<biscotti::response_cookie::ResponseCookie as core::convert::From>::from", "ReturnValue", "cookie-create", "manual"]
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: sinkModel
+    data:
+      - ["<biscotti::response_cookies::ResponseCookies>::insert", "Argument[0]", "cookie-use", "manual"]
+      - ["<biscotti::crypto::master::Key>::from", "Argument[0]", "credentials-key", "manual"]
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: summaryModel
+    data:
+      - ["<biscotti::response_cookie::ResponseCookie>::set_secure", "Argument[self].OptionalBarrier[cookie-secure-arg0]", "ReturnValue", "taint", "manual"]
+      - ["<biscotti::response_cookie::ResponseCookie>::set_partitioned", "Argument[self].OptionalBarrier[cookie-partitioned-arg0]", "ReturnValue", "taint", "manual"]
+      - ["<biscotti::response_cookie::ResponseCookie>::set_name", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["<biscotti::response_cookie::ResponseCookie>::set_value", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["<biscotti::response_cookie::ResponseCookie>::set_http_only", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["<biscotti::response_cookie::ResponseCookie>::set_same_site", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["<biscotti::response_cookie::ResponseCookie>::set_max_age", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["<biscotti::response_cookie::ResponseCookie>::set_path", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["<biscotti::response_cookie::ResponseCookie>::unset_path", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["<biscotti::response_cookie::ResponseCookie>::set_domain", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["<biscotti::response_cookie::ResponseCookie>::unset_domain", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["<biscotti::response_cookie::ResponseCookie>::set_expires", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["<biscotti::response_cookie::ResponseCookie>::unset_expires", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["<biscotti::response_cookie::ResponseCookie>::make_permanent", "Argument[self]", "ReturnValue", "taint", "manual"]
diff --git a/rust/ql/lib/codeql/rust/frameworks/cookie.model.yml b/rust/ql/lib/codeql/rust/frameworks/cookie.model.yml
new file mode 100644
index 00000000000..e40fd8ecf71
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/frameworks/cookie.model.yml
@@ -0,0 +1,40 @@
+# Models for the `cookie` crate.
+extensions:
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: sourceModel
+    data:
+      - ["<cookie::Cookie>::build", "ReturnValue", "cookie-create", "manual"]
+      - ["<cookie::builder::CookieBuilder>::new", "ReturnValue", "cookie-create", "manual"]
+      - ["<cookie::Cookie>::new", "ReturnValue", "cookie-create", "manual"]
+      - ["<cookie::Cookie>::named", "ReturnValue", "cookie-create", "manual"]
+      - ["<cookie::Cookie as core::convert::From>::from", "ReturnValue", "cookie-create", "manual"]
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: sinkModel
+    data:
+      - ["<cookie::builder::CookieBuilder>::build", "Argument[self]", "cookie-use", "manual"]
+      - ["<cookie::builder::CookieBuilder>::finish", "Argument[self]", "cookie-use", "manual"]
+      - ["<cookie::jar::CookieJar>::add", "Argument[0]", "cookie-use", "manual"]
+      - ["<cookie::jar::CookieJar>::add_original", "Argument[0]", "cookie-use", "manual"]
+      - ["<cookie::secure::signed::SignedJar>::add", "Argument[0]", "cookie-use", "manual"]
+      - ["<cookie::secure::signed::SignedJar>::add_original", "Argument[0]", "cookie-use", "manual"]
+      - ["<cookie::secure::private::PrivateJar>::add", "Argument[0]", "cookie-use", "manual"]
+      - ["<cookie::secure::private::PrivateJar>::add_original", "Argument[0]", "cookie-use", "manual"]
+      - ["<cookie::secure::key::Key>::from", "Argument[0].Reference", "credentials-key", "manual"]
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: summaryModel
+    data:
+      - ["<cookie::builder::CookieBuilder>::secure", "Argument[self].OptionalBarrier[cookie-secure-arg0]", "ReturnValue", "taint", "manual"]
+      - ["<cookie::builder::CookieBuilder>::partitioned", "Argument[self].OptionalBarrier[cookie-partitioned-arg0]", "ReturnValue", "taint", "manual"]
+      - ["<cookie::builder::CookieBuilder>::expires", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["<cookie::builder::CookieBuilder>::max_age", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["<cookie::builder::CookieBuilder>::domain", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["<cookie::builder::CookieBuilder>::path", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["<cookie::builder::CookieBuilder>::http_only", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["<cookie::builder::CookieBuilder>::same_site", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["<cookie::builder::CookieBuilder>::permanent", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["<cookie::builder::CookieBuilder>::removal", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["<cookie::Cookie>::set_secure", "Argument[self].OptionalBarrier[cookie-secure-arg0]", "ReturnValue", "taint", "manual"]
+      - ["<cookie::Cookie>::set_partitioned", "Argument[self].OptionalBarrier[cookie-partitioned-arg0]", "ReturnValue", "taint", "manual"]
diff --git a/rust/ql/lib/codeql/rust/frameworks/futures.model.yml b/rust/ql/lib/codeql/rust/frameworks/futures.model.yml
index dd81e23fad6..35e547076d9 100644
--- a/rust/ql/lib/codeql/rust/frameworks/futures.model.yml
+++ b/rust/ql/lib/codeql/rust/frameworks/futures.model.yml
@@ -15,5 +15,5 @@ extensions:
       - ["<_ as futures_util::io::AsyncBufReadExt>::read_until", "Argument[self].Reference", "Argument[1].Reference", "taint", "manual"]
       - ["<_ as futures_util::io::AsyncBufReadExt>::fill_buf", "Argument[self]", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
       - ["<_ as futures_util::io::AsyncBufReadExt>::lines", "Argument[self]", "ReturnValue", "taint", "manual"]
-      - ["<alloc::boxed::Box as core::iter::traits::iterator::Iterator>::next", "Argument[self]", "ReturnValue.Future.Field[core::option::Option::Some(0)]", "taint", "manual"]
       - ["<_ as futures_io::if_std::AsyncBufRead>::poll_fill_buf", "Argument[self].Reference", "ReturnValue.Field[core::task::poll::Poll::Ready(0)].Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["<_ as futures_io::if_std::AsyncRead>::poll_read", "Argument[self].Reference", "Argument[1].Reference", "taint", "manual"]
diff --git a/rust/ql/lib/codeql/rust/frameworks/mysql-async.model.yml b/rust/ql/lib/codeql/rust/frameworks/mysql-async.model.yml
new file mode 100644
index 00000000000..4c8858457c1
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/frameworks/mysql-async.model.yml
@@ -0,0 +1,43 @@
+extensions:
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: sinkModel
+    data:
+      - ["<_ as mysql_async::queryable::Queryable>::query", "Argument[0]", "sql-injection", "manual"]
+      - ["<_ as mysql_async::queryable::Queryable>::query_drop", "Argument[0]", "sql-injection", "manual"]
+      - ["<_ as mysql_async::queryable::Queryable>::query_first", "Argument[0]", "sql-injection", "manual"]
+      - ["<_ as mysql_async::queryable::Queryable>::query_fold", "Argument[0]", "sql-injection", "manual"]
+      - ["<_ as mysql_async::queryable::Queryable>::query_stream", "Argument[0]", "sql-injection", "manual"]
+      - ["<_ as mysql_async::queryable::Queryable>::query_map", "Argument[0]", "sql-injection", "manual"]
+      - ["<mysql_async::conn::Conn as mysql_async::queryable::Queryable>::query_iter", "Argument[0]", "sql-injection", "manual"]
+      - ["<mysql_async::conn::Conn as mysql_async::queryable::Queryable>::prep", "Argument[0]", "sql-injection", "manual"]
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: sourceModel
+    data:
+      - ["<_ as mysql_async::queryable::Queryable>::query", "ReturnValue.Future.Field[core::result::Result::Ok(0)].Element", "database", "manual"]
+      - ["<_ as mysql_async::queryable::Queryable>::exec", "ReturnValue.Future.Field[core::result::Result::Ok(0)].Element", "database", "manual"]
+      - ["<_ as mysql_async::queryable::Queryable>::query_first", "ReturnValue.Future.Field[core::result::Result::Ok(0)].Field[core::option::Option::Some(0)]", "database", "manual"]
+      - ["<_ as mysql_async::queryable::Queryable>::exec_first", "ReturnValue.Future.Field[core::result::Result::Ok(0)].Field[core::option::Option::Some(0)]", "database", "manual"]
+      - ["<_ as mysql_async::queryable::Queryable>::query_fold", "Argument[2].Parameter[1]", "database", "manual"]
+      - ["<_ as mysql_async::queryable::Queryable>::exec_fold", "Argument[3].Parameter[1]", "database", "manual"]
+      - ["<mysql_async::conn::Conn as mysql_async::queryable::Queryable>::query_iter", "ReturnValue.Future.Field[core::result::Result::Ok(0)].Element", "database", "manual"]
+      - ["<mysql_async::conn::Conn as mysql_async::queryable::Queryable>::exec_iter", "ReturnValue.Future.Field[core::result::Result::Ok(0)].Element", "database", "manual"]
+      - ["<_ as mysql_async::queryable::Queryable>::query_map", "Argument[1].Parameter[0]", "database", "manual"]
+      - ["<_ as mysql_async::queryable::Queryable>::exec_map", "Argument[2].Parameter[0]", "database", "manual"]
+      - ["<mysql_common::row::Row>::get", "ReturnValue.Field[core::option::Option::Some(0)]", "database", "manual"]
+      - ["<mysql_common::row::Row>::get_opt", "ReturnValue.Field[core::option::Option::Some(0)].Field[core::result::Result::Ok(0)]", "database", "manual"]
+      - ["<mysql_common::row::Row>::take", "ReturnValue.Field[core::option::Option::Some(0)]", "database", "manual"]
+      - ["<mysql_common::row::Row>::take_opt", "ReturnValue.Field[core::option::Option::Some(0)].Field[core::result::Result::Ok(0)]", "database", "manual"]
+      - ["<mysql_common::row::Row>::as_ref", "ReturnValue.Field[core::option::Option::Some(0)].Reference", "database", "manual"]
+      - ["<mysql_common::row::Row>::unwrap", "ReturnValue.Element", "database", "manual"]
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: summaryModel
+    data:
+      - ["<_ as mysql_async::queryable::Queryable>::query_fold", "Argument[1]", "Argument[2].Parameter[0]", "value", "manual"]
+      - ["<_ as mysql_async::queryable::Queryable>::query_fold", "Argument[2].ReturnValue", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "value", "manual"]
+      - ["<_ as mysql_async::queryable::Queryable>::exec_fold", "Argument[2]", "Argument[3].Parameter[0]", "value", "manual"]
+      - ["<_ as mysql_async::queryable::Queryable>::exec_fold", "Argument[3].ReturnValue", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "value", "manual"]
+      - ["<_ as mysql_async::queryable::Queryable>::query_map", "Argument[1].ReturnValue", "ReturnValue.Future.Field[core::result::Result::Ok(0)].Element", "value", "manual"]
+      - ["<_ as mysql_async::queryable::Queryable>::query_map", "Argument[2].ReturnValue", "ReturnValue.Future.Field[core::result::Result::Ok(0)].Element", "value", "manual"]
diff --git a/rust/ql/lib/codeql/rust/frameworks/mysql.model.yml b/rust/ql/lib/codeql/rust/frameworks/mysql.model.yml
new file mode 100644
index 00000000000..7d6fa520eb8
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/frameworks/mysql.model.yml
@@ -0,0 +1,54 @@
+extensions:
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: sinkModel
+    data:
+      - ["<_ as mysql::conn::queryable::Queryable>::query", "Argument[0]", "sql-injection", "manual"]
+      - ["<_ as mysql::conn::queryable::Queryable>::query_opt", "Argument[0]", "sql-injection", "manual"]
+      - ["<_ as mysql::conn::queryable::Queryable>::query_drop", "Argument[0]", "sql-injection", "manual"]
+      - ["<_ as mysql::conn::queryable::Queryable>::query_first", "Argument[0]", "sql-injection", "manual"]
+      - ["<_ as mysql::conn::queryable::Queryable>::query_first_opt", "Argument[0]", "sql-injection", "manual"]
+      - ["<_ as mysql::conn::queryable::Queryable>::query_fold", "Argument[0]", "sql-injection", "manual"]
+      - ["<_ as mysql::conn::queryable::Queryable>::query_fold_opt", "Argument[0]", "sql-injection", "manual"]
+      - ["<mysql::conn::pool::PooledConn as mysql::conn::queryable::Queryable>::query_iter", "Argument[0]", "sql-injection", "manual"]
+      - ["<_ as mysql::conn::queryable::Queryable>::query_map", "Argument[0]", "sql-injection", "manual"]
+      - ["<_ as mysql::conn::queryable::Queryable>::query_map_opt", "Argument[0]", "sql-injection", "manual"]
+      - ["<mysql::conn::pool::PooledConn as mysql::conn::queryable::Queryable>::prep", "Argument[0]", "sql-injection", "manual"]
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: sourceModel
+    data:
+      - ["<_ as mysql::conn::queryable::Queryable>::query", "ReturnValue.Field[core::result::Result::Ok(0)].Element", "database", "manual"]
+      - ["<_ as mysql::conn::queryable::Queryable>::exec", "ReturnValue.Field[core::result::Result::Ok(0)].Element", "database", "manual"]
+      - ["<_ as mysql::conn::queryable::Queryable>::query_opt", "ReturnValue.Field[core::result::Result::Ok(0)].Element.Field[core::result::Result::Ok(0)]", "database", "manual"]
+      - ["<_ as mysql::conn::queryable::Queryable>::exec_opt", "ReturnValue.Field[core::result::Result::Ok(0)].Element.Field[core::result::Result::Ok(0)]", "database", "manual"]
+      - ["<_ as mysql::conn::queryable::Queryable>::query_first", "ReturnValue.Field[core::result::Result::Ok(0)].Field[core::option::Option::Some(0)]", "database", "manual"]
+      - ["<_ as mysql::conn::queryable::Queryable>::exec_first", "ReturnValue.Field[core::result::Result::Ok(0)].Field[core::option::Option::Some(0)]", "database", "manual"]
+      - ["<_ as mysql::conn::queryable::Queryable>::query_first_opt", "ReturnValue.Field[core::result::Result::Ok(0)].Field[core::option::Option::Some(0)].Field[core::result::Result::Ok(0)]", "database", "manual"]
+      - ["<_ as mysql::conn::queryable::Queryable>::exec_first_opt", "ReturnValue.Field[core::result::Result::Ok(0)].Field[core::option::Option::Some(0)].Field[core::result::Result::Ok(0)]", "database", "manual"]
+      - ["<_ as mysql::conn::queryable::Queryable>::query_fold", "Argument[2].Parameter[1]", "database", "manual"]
+      - ["<_ as mysql::conn::queryable::Queryable>::exec_fold", "Argument[3].Parameter[1]", "database", "manual"]
+      - ["<_ as mysql::conn::queryable::Queryable>::query_fold_opt", "Argument[2].Parameter[1].Field[core::result::Result::Ok(0)]", "database", "manual"]
+      - ["<_ as mysql::conn::queryable::Queryable>::exec_fold_opt", "Argument[3].Parameter[1].Field[core::result::Result::Ok(0)]", "database", "manual"]
+      - ["<mysql::conn::pool::PooledConn as mysql::conn::queryable::Queryable>::query_iter", "ReturnValue.Field[core::result::Result::Ok(0)].Element", "database", "manual"]
+      - ["<mysql::conn::pool::PooledConn as mysql::conn::queryable::Queryable>::exec_iter", "ReturnValue.Field[core::result::Result::Ok(0)].Element", "database", "manual"]
+      - ["<_ as mysql::conn::queryable::Queryable>::query_map", "Argument[1].Parameter[0]", "database", "manual"]
+      - ["<_ as mysql::conn::queryable::Queryable>::query_map_opt", "Argument[1].Parameter[0].Field[core::result::Result::Ok(0)]", "database", "manual"]
+      - ["<_ as mysql::conn::queryable::Queryable>::exec_map", "Argument[2].Parameter[0]", "database", "manual"]
+      - ["<_ as mysql::conn::queryable::Queryable>::exec_map_opt", "Argument[2].Parameter[0].Field[core::result::Result::Ok(0)]", "database", "manual"]
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: summaryModel
+    data:
+      - ["<_ as mysql::conn::queryable::Queryable>::query_fold", "Argument[1]", "Argument[2].Parameter[0]", "value", "manual"]
+      - ["<_ as mysql::conn::queryable::Queryable>::query_fold", "Argument[2].ReturnValue", "ReturnValue.Field[core::result::Result::Ok(0)]", "value", "manual"]
+      - ["<_ as mysql::conn::queryable::Queryable>::exec_fold", "Argument[2]", "Argument[3].Parameter[0]", "value", "manual"]
+      - ["<_ as mysql::conn::queryable::Queryable>::exec_fold", "Argument[3].ReturnValue", "ReturnValue.Field[core::result::Result::Ok(0)]", "value", "manual"]
+      - ["<_ as mysql::conn::queryable::Queryable>::query_fold_opt", "Argument[1]", "Argument[2].Parameter[0]", "value", "manual"]
+      - ["<_ as mysql::conn::queryable::Queryable>::query_fold_opt", "Argument[2].ReturnValue", "ReturnValue.Field[core::result::Result::Ok(0)]", "value", "manual"]
+      - ["<_ as mysql::conn::queryable::Queryable>::exec_fold_opt", "Argument[2]", "Argument[3].Parameter[0]", "value", "manual"]
+      - ["<_ as mysql::conn::queryable::Queryable>::exec_fold_opt", "Argument[3].ReturnValue", "ReturnValue.Field[core::result::Result::Ok(0)]", "value", "manual"]
+      - ["<_ as mysql::conn::queryable::Queryable>::query_map", "Argument[1].ReturnValue", "ReturnValue.Field[core::result::Result::Ok(0)].Element", "value", "manual"]
+      - ["<_ as mysql::conn::queryable::Queryable>::query_map_opt", "Argument[1].ReturnValue", "ReturnValue.Field[core::result::Result::Ok(0)].Element", "value", "manual"]
+      - ["<_ as mysql::conn::queryable::Queryable>::exec_map", "Argument[2].ReturnValue", "ReturnValue.Field[core::result::Result::Ok(0)].Element", "value", "manual"]
+      - ["<_ as mysql::conn::queryable::Queryable>::exec_map_opt", "Argument[2].ReturnValue", "ReturnValue.Field[core::result::Result::Ok(0)].Element", "value", "manual"]
diff --git a/rust/ql/lib/codeql/rust/frameworks/poem.model.yml b/rust/ql/lib/codeql/rust/frameworks/poem.model.yml
new file mode 100644
index 00000000000..a64be8ada82
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/frameworks/poem.model.yml
@@ -0,0 +1,22 @@
+extensions:
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: sinkModel
+    data:
+      - ["<poem::web::cookie::CookieJar>::add", "Argument[0]", "cookie-use", "manual"]
+      - ["<poem::web::cookie::SignedCookieJar>::add", "Argument[0]", "cookie-use", "manual"]
+      - ["<poem::web::cookie::PrivateCookieJar>::add", "Argument[0]", "cookie-use", "manual"]
+      - ["<poem::session::server_session::ServerSession>::new", "Argument[0]", "cookie-use", "manual"]
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: summaryModel
+    data:
+      - ["<poem::web::cookie::Cookie>::set_secure", "Argument[self].OptionalBarrier[cookie-secure-arg0]", "Argument[self]", "taint", "manual"]
+      - ["<poem::session::cookie_config::CookieConfig>::secure", "Argument[self].OptionalBarrier[cookie-secure-arg0]", "ReturnValue", "taint", "manual"]
+      - ["<poem::session::cookie_config::CookieConfig>::partitioned", "Argument[self].OptionalBarrier[cookie-partitioned-arg0]", "ReturnValue", "taint", "manual"]
+      - ["<poem::session::cookie_config::CookieConfig>::name", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["<poem::session::cookie_config::CookieConfig>::path", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["<poem::session::cookie_config::CookieConfig>::domain", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["<poem::session::cookie_config::CookieConfig>::http_only", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["<poem::session::cookie_config::CookieConfig>::same_site", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["<poem::session::cookie_config::CookieConfig>::max_age", "Argument[self]", "ReturnValue", "taint", "manual"]
diff --git a/rust/ql/lib/codeql/rust/frameworks/reqwest.model.yml b/rust/ql/lib/codeql/rust/frameworks/reqwest.model.yml
index 8c24bbf148d..5457460919f 100644
--- a/rust/ql/lib/codeql/rust/frameworks/reqwest.model.yml
+++ b/rust/ql/lib/codeql/rust/frameworks/reqwest.model.yml
@@ -9,8 +9,8 @@ extensions:
       pack: codeql/rust-all
       extensible: sinkModel
     data:
-      - ["<reqwest::async_impl::client::Client>::request", "Argument[1]", "transmission", "manual"]
-      - ["<reqwest::blocking::client::Client>::request", "Argument[1]", "transmission", "manual"]
+      - ["<reqwest::async_impl::client::Client>::request", "Argument[1]", "request-url", "manual"]
+      - ["<reqwest::blocking::client::Client>::request", "Argument[1]", "request-url", "manual"]
   - addsTo:
       pack: codeql/rust-all
       extensible: summaryModel
diff --git a/rust/ql/lib/codeql/rust/frameworks/rustcrypto/RustCrypto.qll b/rust/ql/lib/codeql/rust/frameworks/rustcrypto/RustCrypto.qll
index 70b92a3f7ea..b34b3abf7cb 100644
--- a/rust/ql/lib/codeql/rust/frameworks/rustcrypto/RustCrypto.qll
+++ b/rust/ql/lib/codeql/rust/frameworks/rustcrypto/RustCrypto.qll
@@ -5,6 +5,8 @@
 private import rust
 private import codeql.rust.Concepts
 private import codeql.rust.dataflow.DataFlow
+private import codeql.rust.internal.TypeInference
+private import codeql.rust.internal.Type
 
 bindingset[algorithmName]
 private string simplifyAlgorithmName(string algorithmName) {
@@ -21,28 +23,19 @@ class StreamCipherInit extends Cryptography::CryptographicOperation::Range {
 
   StreamCipherInit() {
     // a call to `cipher::KeyInit::new`, `cipher::KeyInit::new_from_slice`,
-    // `cipher::KeyIvInit::new`, `cipher::KeyIvInit::new_from_slices` or `rc2::Rc2::new_with_eff_key_len`.
-    exists(PathExpr p, string rawAlgorithmName |
-      this.asExpr().getExpr().(CallExpr).getFunction() = p and
-      p.getResolvedCrateOrigin().matches("%/RustCrypto%") and
-      p.getPath().getText() = ["new", "new_from_slice", "new_from_slices", "new_with_eff_key_len"] and
-      (
-        rawAlgorithmName = p.getPath().getQualifier().getText() or
-        rawAlgorithmName =
-          p.getPath()
-              .getQualifier()
-              .getSegment()
-              .getGenericArgList()
-              .getGenericArg(0)
-              .(TypeArg)
-              .getTypeRepr()
-              .(PathTypeRepr)
-              .getPath()
-              .getSegment()
-              .getIdentifier()
-              .getText()
+    // `cipher::KeyIvInit::new`, `cipher::KeyIvInit::new_from_slices`, `rc2::Rc2::new_with_eff_key_len` or similar.
+    exists(CallExprBase ce, string rawAlgorithmName |
+      ce = this.asExpr().getExpr() and
+      ce.getStaticTarget().(Function).getName().getText() =
+        ["new", "new_from_slice", "new_with_eff_key_len", "new_from_slices"] and
+      // extract the algorithm name from the type of `ce` or its receiver.
+      exists(Type t, TypePath tp |
+        t = inferType([ce, ce.(MethodCallExpr).getReceiver()], tp) and
+        rawAlgorithmName = t.(StructType).getStruct().(Addressable).getCanonicalPath().splitAt("::")
       ) and
-      algorithmName = simplifyAlgorithmName(rawAlgorithmName)
+      algorithmName = simplifyAlgorithmName(rawAlgorithmName) and
+      // only match a known cryptographic algorithm
+      any(Cryptography::CryptographicAlgorithm alg).matchesName(algorithmName)
     )
   }
 
diff --git a/rust/ql/lib/codeql/rust/frameworks/rustls.model.yml b/rust/ql/lib/codeql/rust/frameworks/rustls.model.yml
index 19f7ececcd2..b1fea8ac538 100644
--- a/rust/ql/lib/codeql/rust/frameworks/rustls.model.yml
+++ b/rust/ql/lib/codeql/rust/frameworks/rustls.model.yml
@@ -9,6 +9,4 @@ extensions:
       extensible: summaryModel
     data:
       - ["<futures_rustls::TlsConnector>::connect", "Argument[1]", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
-      - ["<futures_rustls::client::TlsStream as futures_io::if_std::AsyncRead>::poll_read", "Argument[self].Reference", "Argument[1].Reference", "taint", "manual"]
       - ["<rustls::conn::ConnectionCommon>::reader", "Argument[self]", "ReturnValue", "taint", "manual"]
-      - ["<rustls::conn::connection::Reader as std::io::Read>::read", "Argument[self]", "Argument[0].Reference", "taint", "manual"]
diff --git a/rust/ql/lib/codeql/rust/frameworks/stdlib/Builtins.qll b/rust/ql/lib/codeql/rust/frameworks/stdlib/Builtins.qll
index 0c4999bba5e..9269aff2bdc 100644
--- a/rust/ql/lib/codeql/rust/frameworks/stdlib/Builtins.qll
+++ b/rust/ql/lib/codeql/rust/frameworks/stdlib/Builtins.qll
@@ -31,6 +31,27 @@ class BuiltinType extends Struct {
   string getName() { result = super.getName().getText() }
 }
 
+/**
+ * A numerical type, such as `i64`, `usize`, `f32` or `f64`.
+ */
+abstract private class NumericTypeImpl extends BuiltinType { }
+
+final class NumericType = NumericTypeImpl;
+
+/**
+ * An integral numerical type, such as `i64` or `usize`.
+ */
+abstract private class IntegralTypeImpl extends NumericTypeImpl { }
+
+final class IntegralType = IntegralTypeImpl;
+
+/**
+ * A floating-point numerical type, such as `f32` or `f64`.
+ */
+abstract private class FloatingPointTypeImpl extends NumericTypeImpl { }
+
+final class FloatingPointType = FloatingPointTypeImpl;
+
 /** The builtin `bool` type. */
 class Bool extends BuiltinType {
   Bool() { this.getName() = "bool" }
@@ -47,71 +68,71 @@ class Str extends BuiltinType {
 }
 
 /** The builtin `i8` type. */
-class I8 extends BuiltinType {
+class I8 extends IntegralTypeImpl {
   I8() { this.getName() = "i8" }
 }
 
 /** The builtin `i16` type. */
-class I16 extends BuiltinType {
+class I16 extends IntegralTypeImpl {
   I16() { this.getName() = "i16" }
 }
 
 /** The builtin `i32` type. */
-class I32 extends BuiltinType {
+class I32 extends IntegralTypeImpl {
   I32() { this.getName() = "i32" }
 }
 
 /** The builtin `i64` type. */
-class I64 extends BuiltinType {
+class I64 extends IntegralTypeImpl {
   I64() { this.getName() = "i64" }
 }
 
 /** The builtin `i128` type. */
-class I128 extends BuiltinType {
+class I128 extends IntegralTypeImpl {
   I128() { this.getName() = "i128" }
 }
 
 /** The builtin `u8` type. */
-class U8 extends BuiltinType {
+class U8 extends IntegralTypeImpl {
   U8() { this.getName() = "u8" }
 }
 
 /** The builtin `u16` type. */
-class U16 extends BuiltinType {
+class U16 extends IntegralTypeImpl {
   U16() { this.getName() = "u16" }
 }
 
 /** The builtin `u32` type. */
-class U32 extends BuiltinType {
+class U32 extends IntegralTypeImpl {
   U32() { this.getName() = "u32" }
 }
 
 /** The builtin `u64` type. */
-class U64 extends BuiltinType {
+class U64 extends IntegralTypeImpl {
   U64() { this.getName() = "u64" }
 }
 
 /** The builtin `u128` type. */
-class U128 extends BuiltinType {
+class U128 extends IntegralTypeImpl {
   U128() { this.getName() = "u128" }
 }
 
 /** The builtin `usize` type. */
-class Usize extends BuiltinType {
+class Usize extends IntegralTypeImpl {
   Usize() { this.getName() = "usize" }
 }
 
 /** The builtin `isize` type. */
-class Isize extends BuiltinType {
+class Isize extends IntegralTypeImpl {
   Isize() { this.getName() = "isize" }
 }
 
 /** The builtin `f32` type. */
-class F32 extends BuiltinType {
+class F32 extends FloatingPointTypeImpl {
   F32() { this.getName() = "f32" }
 }
 
 /** The builtin `f64` type. */
-class F64 extends BuiltinType {
+class F64 extends FloatingPointTypeImpl {
   F64() { this.getName() = "f64" }
 }
diff --git a/rust/ql/lib/codeql/rust/frameworks/stdlib/Stdlib.qll b/rust/ql/lib/codeql/rust/frameworks/stdlib/Stdlib.qll
index 114163efc9c..773aa77f80f 100644
--- a/rust/ql/lib/codeql/rust/frameworks/stdlib/Stdlib.qll
+++ b/rust/ql/lib/codeql/rust/frameworks/stdlib/Stdlib.qll
@@ -94,6 +94,16 @@ class RangeToStruct extends Struct {
   StructField getEnd() { result = this.getStructField("end") }
 }
 
+/**
+ * The [`RangeFull` struct][1].
+ *
+ * [1]: https://doc.rust-lang.org/core/ops/struct.RangeFull.html
+ */
+class RangeFullStruct extends Struct {
+  pragma[nomagic]
+  RangeFullStruct() { this.getCanonicalPath() = "core::ops::range::RangeFull" }
+}
+
 /**
  * The [`RangeInclusive` struct][1].
  *
@@ -203,3 +213,96 @@ class StringStruct extends Struct {
   pragma[nomagic]
   StringStruct() { this.getCanonicalPath() = "alloc::string::String" }
 }
+
+/**
+ * The [`Deref` trait][1].
+ *
+ * [1]: https://doc.rust-lang.org/core/ops/trait.Deref.html
+ */
+class DerefTrait extends Trait {
+  pragma[nomagic]
+  DerefTrait() { this.getCanonicalPath() = "core::ops::deref::Deref" }
+
+  /** Gets the `deref` function. */
+  Function getDerefFunction() { result = this.(TraitItemNode).getAssocItem("deref") }
+
+  /** Gets the `Target` associated type. */
+  pragma[nomagic]
+  TypeAlias getTargetType() {
+    result = this.getAssocItemList().getAnAssocItem() and
+    result.getName().getText() = "Target"
+  }
+}
+
+/**
+ * The [`Index` trait][1].
+ *
+ * [1]: https://doc.rust-lang.org/std/ops/trait.Index.html
+ */
+class IndexTrait extends Trait {
+  pragma[nomagic]
+  IndexTrait() { this.getCanonicalPath() = "core::ops::index::Index" }
+
+  /** Gets the `index` function. */
+  Function getIndexFunction() { result = this.(TraitItemNode).getAssocItem("index") }
+
+  /** Gets the `Output` associated type. */
+  pragma[nomagic]
+  TypeAlias getOutputType() {
+    result = this.getAssocItemList().getAnAssocItem() and
+    result.getName().getText() = "Output"
+  }
+}
+
+/**
+ * The [`Box` struct][1].
+ *
+ * [1]: https://doc.rust-lang.org/std/boxed/struct.Box.html
+ */
+class BoxStruct extends Struct {
+  pragma[nomagic]
+  BoxStruct() { this.getCanonicalPath() = "alloc::boxed::Box" }
+}
+
+/**
+ * The [`Rc` struct][1].
+ *
+ * [1]: https://doc.rust-lang.org/std/rc/struct.Rc.html
+ */
+class RcStruct extends Struct {
+  pragma[nomagic]
+  RcStruct() { this.getCanonicalPath() = "alloc::rc::Rc" }
+}
+
+/**
+ * The [`Arc` struct][1].
+ *
+ * [1]: https://doc.rust-lang.org/std/sync/struct.Arc.html
+ */
+class ArcStruct extends Struct {
+  pragma[nomagic]
+  ArcStruct() { this.getCanonicalPath() = "alloc::sync::Arc" }
+}
+
+/**
+ * The [`Pin` struct][1].
+ *
+ * [1]: https://doc.rust-lang.org/std/pin/struct.Pin.html
+ */
+class PinStruct extends Struct {
+  pragma[nomagic]
+  PinStruct() { this.getCanonicalPath() = "core::pin::Pin" }
+}
+
+/**
+ * The [`Vec` struct][1].
+ *
+ * [1]: https://doc.rust-lang.org/alloc/vec/struct.Vec.html
+ */
+class Vec extends Struct {
+  pragma[nomagic]
+  Vec() { this.getCanonicalPath() = "alloc::vec::Vec" }
+
+  /** Gets the type parameter representing the element type. */
+  TypeParam getElementTypeParam() { result = this.getGenericParamList().getTypeParam(0) }
+}
diff --git a/rust/ql/lib/codeql/rust/frameworks/stdlib/alloc.model.yml b/rust/ql/lib/codeql/rust/frameworks/stdlib/alloc.model.yml
new file mode 100644
index 00000000000..5199a0e8117
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/frameworks/stdlib/alloc.model.yml
@@ -0,0 +1,53 @@
+extensions:
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: sourceModel
+    data:
+      # Alloc
+      - ["alloc::alloc::dealloc", "Argument[0]", "pointer-invalidate", "manual"]
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: sinkModel
+    data:
+      # Alloc
+      - ["alloc::alloc::alloc", "Argument[0]", "alloc-layout", "manual"]
+      - ["alloc::alloc::alloc_zeroed", "Argument[0]", "alloc-layout", "manual"]
+      - ["alloc::alloc::realloc", "Argument[2]", "alloc-size", "manual"]
+      - ["<_ as core::alloc::global::GlobalAlloc>::alloc", "Argument[0]", "alloc-layout", "manual"]
+      - ["<_ as core::alloc::global::GlobalAlloc>::alloc_zeroed", "Argument[0]", "alloc-layout", "manual"]
+      - ["<_ as core::alloc::Allocator>::allocate", "Argument[0]", "alloc-layout", "manual"]
+      - ["<_ as core::alloc::Allocator>::allocate_zeroed", "Argument[0]", "alloc-layout", "manual"]
+      - ["<_ as core::alloc::Allocator>::grow", "Argument[2]", "alloc-layout", "manual"]
+      - ["<_ as core::alloc::Allocator>::grow_zeroed", "Argument[2]", "alloc-layout", "manual"]
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: summaryModel
+    data:
+      # Box
+      - ["<alloc::boxed::Box>::pin", "Argument[0]", "ReturnValue.Reference", "value", "manual"]
+      - ["<alloc::boxed::Box>::new", "Argument[0]", "ReturnValue.Reference", "value", "manual"]
+      - ["<alloc::boxed::Box>::into_pin", "Argument[0]", "ReturnValue", "value", "manual"]
+      # Fmt
+      - ["alloc::fmt::format", "Argument[0]", "ReturnValue", "taint", "manual"]
+      # Layout
+      - ["<core::alloc::layout::Layout>::from_size_align", "Argument[0]", "ReturnValue.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["<core::alloc::layout::Layout>::from_size_align_unchecked", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["<core::alloc::layout::Layout>::array", "Argument[0]", "ReturnValue.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["<core::alloc::layout::Layout>::repeat", "Argument[self]", "ReturnValue.Field[core::result::Result::Ok(0)].Field[0]", "taint", "manual"]
+      - ["<core::alloc::layout::Layout>::repeat", "Argument[0]", "ReturnValue.Field[core::result::Result::Ok(0)].Field[0]", "taint", "manual"]
+      - ["<core::alloc::layout::Layout>::repeat_packed", "Argument[self]", "ReturnValue.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["<core::alloc::layout::Layout>::repeat_packed", "Argument[0]", "ReturnValue.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["<core::alloc::layout::Layout>::extend", "Argument[self]", "ReturnValue.Field[core::result::Result::Ok(0)].Field[0]", "taint", "manual"]
+      - ["<core::alloc::layout::Layout>::extend", "Argument[0]", "ReturnValue.Field[core::result::Result::Ok(0)].Field[0]", "taint", "manual"]
+      - ["<core::alloc::layout::Layout>::extend_packed", "Argument[self]", "ReturnValue.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["<core::alloc::layout::Layout>::extend_packed", "Argument[0]", "ReturnValue.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["<core::alloc::layout::Layout>::align_to", "Argument[self]", "ReturnValue.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["<core::alloc::layout::Layout>::align_to", "Argument[self].Element", "ReturnValue.Field[0,1,2].Reference.Element", "taint", "manual"]
+      - ["<core::alloc::layout::Layout>::pad_to_align", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["<core::alloc::layout::Layout>::size", "Argument[self]", "ReturnValue", "taint", "manual"]
+      # String
+      - ["<alloc::string::String>::as_str", "Argument[self]", "ReturnValue", "value", "manual"]
+      - ["<alloc::string::String>::as_bytes", "Argument[self]", "ReturnValue", "value", "manual"]
+      - ["<_ as alloc::string::ToString>::to_string", "Argument[self]", "ReturnValue", "taint", "manual"]
+      # Vec
+      - ["alloc::vec::from_elem", "Argument[0]", "ReturnValue.Element", "value", "manual"]
diff --git a/rust/ql/lib/codeql/rust/frameworks/stdlib/lang-core.model.yml b/rust/ql/lib/codeql/rust/frameworks/stdlib/core.model.yml
similarity index 57%
rename from rust/ql/lib/codeql/rust/frameworks/stdlib/lang-core.model.yml
rename to rust/ql/lib/codeql/rust/frameworks/stdlib/core.model.yml
index 46cf9e64e24..46eea8f9c4e 100644
--- a/rust/ql/lib/codeql/rust/frameworks/stdlib/lang-core.model.yml
+++ b/rust/ql/lib/codeql/rust/frameworks/stdlib/core.model.yml
@@ -3,44 +3,32 @@ extensions:
       pack: codeql/rust-all
       extensible: summaryModel
     data:
+      # Arithmetic
+      - ["<_ as core::ops::arith::Add>::add", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["<_ as core::ops::arith::Add>::add", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["<_ as core::ops::arith::Add>::add", "Argument[0].Reference", "ReturnValue", "taint", "manual"]
       # Clone
       - ["<_ as core::clone::Clone>::clone", "Argument[self].Reference", "ReturnValue", "value", "manual"]
       # Conversions
-      - ["<core::alloc::layout::Layout>::align_to", "Argument[self].Element", "ReturnValue.Field[0,1,2].Reference.Element", "taint", "manual"]
       - ["<_ as core::convert::Into>::into", "Argument[self].Element", "ReturnValue.Element", "taint", "manual"]
       - ["<_ as core::convert::Into>::into", "Argument[self].Reference.Element", "ReturnValue.Element", "taint", "manual"]
-      - ["<alloc::string::String as core::convert::Into>::into", "Argument[self].Element", "ReturnValue.Element", "taint", "manual"]
-      - ["<alloc::string::String as core::convert::Into>::into", "Argument[self].Reference.Element", "ReturnValue.Element", "taint", "manual"]
+      # From
+      - ["<_ as core::convert::From>::from", "Argument[0]", "ReturnValue", "taint", "manual"]
       # Iterator
       - ["<core::result::Result>::iter", "Argument[self].Element", "ReturnValue.Element", "value", "manual"]
-      - ["<alloc::vec::Vec as value_trait::array::Array>::iter", "Argument[self].Element", "ReturnValue.Element", "value", "manual"]
+      - ["<_ as value_trait::array::Array>::iter", "Argument[self].Element", "ReturnValue.Element", "value", "manual"]
       - ["<core::result::Result>::iter_mut", "Argument[self].Element", "ReturnValue.Element", "value", "manual"]
       - ["<core::result::Result>::into_iter", "Argument[self].Element", "ReturnValue.Element", "value", "manual"]
+      - ["<_ as core::iter::traits::iterator::Iterator>::for_each", "Argument[self].Element", "Argument[0].Parameter[0]", "value", "manual"]
       - ["<_ as core::iter::traits::iterator::Iterator>::nth", "Argument[self].Element", "ReturnValue.Field[core::option::Option::Some(0)]", "value", "manual"]
       - ["<_ as core::iter::traits::iterator::Iterator>::next", "Argument[self].Element", "ReturnValue.Field[core::option::Option::Some(0)]", "value", "manual"]
+      - ["<_ as core::iter::traits::iterator::Iterator>::next", "Argument[self].Element", "ReturnValue.Field[core::option::Option::Some(0)].Field[core::result::Result::Ok(0)]", "value", "manual"]
       - ["<_ as core::iter::traits::iterator::Iterator>::collect", "Argument[self].Element", "ReturnValue.Element", "value", "manual"]
       - ["<_ as core::iter::traits::iterator::Iterator>::map", "Argument[self].Element", "Argument[0].Parameter[0]", "value", "manual"]
       - ["<_ as core::iter::traits::iterator::Iterator>::for_each", "Argument[self].Element", "Argument[0].Parameter[0]", "value", "manual"]
-      - ["<core::slice::iter::Iter as core::iter::traits::iterator::Iterator>::nth", "Argument[self].Element", "ReturnValue.Field[core::option::Option::Some(0)]", "value", "manual"]
-      - ["<core::slice::iter::Iter as core::iter::traits::iterator::Iterator>::next", "Argument[self].Element", "ReturnValue.Field[core::option::Option::Some(0)]", "value", "manual"]
-      - ["<core::slice::iter::Iter as core::iter::traits::iterator::Iterator>::collect", "Argument[self].Element", "ReturnValue.Element", "value", "manual"]
-      - ["<core::slice::iter::Iter as core::iter::traits::iterator::Iterator>::map", "Argument[self].Element", "Argument[0].Parameter[0]", "value", "manual"]
-      - ["<_ as core::iter::traits::iterator::Iterator>::for_each", "Argument[self].Element", "Argument[0].Parameter[0]", "value", "manual"]
-      # Layout
-      - ["<core::alloc::layout::Layout>::from_size_align", "Argument[0]", "ReturnValue.Field[core::result::Result::Ok(0)]", "taint", "manual"]
-      - ["<core::alloc::layout::Layout>::from_size_align_unchecked", "Argument[0]", "ReturnValue", "taint", "manual"]
-      - ["<core::alloc::layout::Layout>::array", "Argument[0]", "ReturnValue.Field[core::result::Result::Ok(0)]", "taint", "manual"]
-      - ["<core::alloc::layout::Layout>::repeat", "Argument[self]", "ReturnValue.Field[core::result::Result::Ok(0)].Field[0]", "taint", "manual"]
-      - ["<core::alloc::layout::Layout>::repeat", "Argument[0]", "ReturnValue.Field[core::result::Result::Ok(0)].Field[0]", "taint", "manual"]
-      - ["<core::alloc::layout::Layout>::repeat_packed", "Argument[self]", "ReturnValue.Field[core::result::Result::Ok(0)]", "taint", "manual"]
-      - ["<core::alloc::layout::Layout>::repeat_packed", "Argument[0]", "ReturnValue.Field[core::result::Result::Ok(0)]", "taint", "manual"]
-      - ["<core::alloc::layout::Layout>::extend", "Argument[self]", "ReturnValue.Field[core::result::Result::Ok(0)].Field[0]", "taint", "manual"]
-      - ["<core::alloc::layout::Layout>::extend", "Argument[0]", "ReturnValue.Field[core::result::Result::Ok(0)].Field[0]", "taint", "manual"]
-      - ["<core::alloc::layout::Layout>::extend_packed", "Argument[self]", "ReturnValue.Field[core::result::Result::Ok(0)]", "taint", "manual"]
-      - ["<core::alloc::layout::Layout>::extend_packed", "Argument[0]", "ReturnValue.Field[core::result::Result::Ok(0)]", "taint", "manual"]
-      - ["<core::alloc::layout::Layout>::align_to", "Argument[self]", "ReturnValue.Field[core::result::Result::Ok(0)]", "taint", "manual"]
-      - ["<core::alloc::layout::Layout>::pad_to_align", "Argument[self]", "ReturnValue", "taint", "manual"]
-      - ["<core::alloc::layout::Layout>::size", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["<_ as core::iter::traits::iterator::Iterator>::chain", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["<_ as core::iter::traits::iterator::Iterator>::chain", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["<_ as core::iter::traits::iterator::Iterator>::take", "Argument[self]", "ReturnValue", "taint", "manual"]
       # Pin
       - ["core::pin::Pin", "Argument[0]", "ReturnValue", "value", "manual"]
       - ["<core::pin::Pin>::new", "Argument[0]", "ReturnValue", "value", "manual"]
@@ -56,13 +44,11 @@ extensions:
       - ["core::ptr::write_unaligned", "Argument[1]", "Argument[0].Reference", "value", "manual"]
       - ["core::ptr::write_volatile", "Argument[1]", "Argument[0].Reference", "value", "manual"]
       # Str
-      - ["<core::str>::as_str", "Argument[self]", "ReturnValue", "taint", "value"]
-      - ["<alloc::string::String>::as_str", "Argument[self]", "ReturnValue", "taint", "value"]
-      - ["<core::str>::as_bytes", "Argument[self]", "ReturnValue", "taint", "value"]
-      - ["<alloc::string::String>::as_bytes", "Argument[self]", "ReturnValue", "taint", "value"]
-      - ["<core::str>::to_string", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["<core::str>::as_str", "Argument[self]", "ReturnValue", "value", "manual"]
+      - ["<core::str>::as_bytes", "Argument[self]", "ReturnValue", "value", "manual"]
       - ["<core::str>::parse", "Argument[self]", "ReturnValue.Field[core::result::Result::Ok(0)]", "taint", "manual"]
       - ["<core::str>::trim", "Argument[self]", "ReturnValue.Reference", "taint", "manual"]
+      - ["<core::str>::to_string", "Argument[self]", "ReturnValue", "taint", "manual"]
   - addsTo:
       pack: codeql/rust-all
       extensible: sourceModel
diff --git a/rust/ql/lib/codeql/rust/frameworks/stdlib/fs.model.yml b/rust/ql/lib/codeql/rust/frameworks/stdlib/fs.model.yml
index 346b4dbc722..79b0b16f41e 100644
--- a/rust/ql/lib/codeql/rust/frameworks/stdlib/fs.model.yml
+++ b/rust/ql/lib/codeql/rust/frameworks/stdlib/fs.model.yml
@@ -10,16 +10,15 @@ extensions:
       - ["<std::fs::DirEntry>::file_name", "ReturnValue", "file", "manual"]
       - ["<std::fs::File>::open", "ReturnValue.Field[core::result::Result::Ok(0)]", "file", "manual"]
       - ["<std::fs::File>::open_buffered", "ReturnValue.Field[core::result::Result::Ok(0)]", "file", "manual"]
+      - ["<std::fs::OpenOptions>::open", "ReturnValue.Field[core::result::Result::Ok(0)]", "file", "manual"]
   - addsTo:
       pack: codeql/rust-all
       extensible: sinkModel
     data:
-      - ["std::fs::copy", "Argument[0]", "path-injection", "manual"]
-      - ["std::fs::copy", "Argument[1]", "path-injection", "manual"]
+      - ["std::fs::copy", "Argument[0,1]", "path-injection", "manual"]
       - ["std::fs::create_dir", "Argument[0]", "path-injection", "manual"]
       - ["std::fs::create_dir_all", "Argument[0]", "path-injection", "manual"]
-      - ["std::fs::hard_link", "Argument[0]", "path-injection", "manual"]
-      - ["std::fs::hard_link", "Argument[1]", "path-injection", "manual"]
+      - ["std::fs::hard_link", "Argument[0,1]", "path-injection", "manual"]
       - ["std::fs::metadata", "Argument[0]", "path-injection", "manual"]
       - ["std::fs::read", "Argument[0]", "path-injection", "manual"]
       - ["std::fs::read_dir", "Argument[0]", "path-injection", "manual"]
@@ -28,11 +27,9 @@ extensions:
       - ["std::fs::remove_dir", "Argument[0]", "path-injection", "manual"]
       - ["std::fs::remove_dir_all", "Argument[0]", "path-injection", "manual"]
       - ["std::fs::remove_file", "Argument[0]", "path-injection", "manual"]
-      - ["std::fs::rename", "Argument[0]", "path-injection", "manual"]
-      - ["std::fs::rename", "Argument[1]", "path-injection", "manual"]
+      - ["std::fs::rename", "Argument[0,1]", "path-injection", "manual"]
       - ["std::fs::set_permissions", "Argument[0]", "path-injection", "manual"]
-      - ["std::fs::soft_link", "Argument[0]", "path-injection", "manual"]
-      - ["std::fs::soft_link", "Argument[1]", "path-injection", "manual"]
+      - ["std::fs::soft_link", "Argument[0,1]", "path-injection", "manual"]
       - ["std::fs::symlink_metadata", "Argument[0]", "path-injection", "manual"]
       - ["std::fs::write", "Argument[0]", "path-injection", "manual"]
       - ["<std::fs::DirBuilder>::create", "Argument[0]", "path-injection", "manual"]
@@ -41,12 +38,33 @@ extensions:
       - ["<std::fs::File>::create_new", "Argument[0]", "path-injection", "manual"]
       - ["<std::fs::File>::open", "Argument[0]", "path-injection", "manual"]
       - ["<std::fs::File>::open_buffered", "Argument[0]", "path-injection", "manual"]
+      - ["<std::fs::OpenOptions>::open", "Argument[0]", "path-injection", "manual"]
   - addsTo:
       pack: codeql/rust-all
       extensible: summaryModel
     data:
-      - ["<std::path::PathBuf as core::convert::From>::from", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["std::fs::canonicalize", "Argument[0].OptionalStep[normalize-path]", "ReturnValue.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["std::fs::canonicalize", "Argument[0].OptionalBarrier[normalize-path]", "ReturnValue.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["<std::path::PathBuf>::as_path", "Argument[Self]", "ReturnValue.Reference", "value", "manual"]
+      - ["<std::path::PathBuf>::as_mut_os_string", "Argument[Self].Reference", "ReturnValue.Reference", "value", "manual"]
+      - ["<std::path::PathBuf>::into_os_string", "Argument[Self]", "ReturnValue", "value", "manual"]
+      - ["<std::path::PathBuf>::into_boxed_path", "Argument[Self]", "ReturnValue.Reference", "value", "manual"]
+      - ["<std::path::Path>::new", "Argument[0].Reference", "ReturnValue.Reference", "value", "manual"]
       - ["<std::path::Path>::join", "Argument[self]", "ReturnValue", "taint", "manual"]
       - ["<std::path::Path>::join", "Argument[0]", "ReturnValue", "taint", "manual"]
-      - ["<std::path::Path>::canonicalize", "Argument[self].OptionalStep[normalize-path]", "ReturnValue.Field[core::result::Result::Ok(0)]", "taint", "manual"]
-      - ["<std::path::Path>::canonicalize", "Argument[self].OptionalBarrier[normalize-path]", "ReturnValue.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["<std::path::Path>::as_os_string", "Argument[Self].Reference", "ReturnValue.Reference", "value", "manual"]
+      - ["<std::path::Path>::as_mut_os_string", "Argument[Self].Reference", "ReturnValue.Reference", "value", "manual"]
+      - ["<std::path::Path>::canonicalize", "Argument[self].Reference.OptionalStep[normalize-path]", "ReturnValue.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["<std::path::Path>::canonicalize", "Argument[self].Reference.OptionalBarrier[normalize-path]", "ReturnValue.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["<std::path::Path>::extension", "Argument[Self].Reference", "ReturnValue.Field[core::option::Option::Some(0)].Reference", "taint", "manual"]
+      - ["<std::path::Path>::file_name", "Argument[Self].Reference", "ReturnValue.Field[core::option::Option::Some(0)].Reference", "taint", "manual"]
+      - ["<std::path::Path>::file_prefix", "Argument[Self].Reference", "ReturnValue.Field[core::option::Option::Some(0)].Reference", "taint", "manual"]
+      - ["<std::path::Path>::file_stem", "Argument[Self].Reference", "ReturnValue.Field[core::option::Option::Some(0)].Reference", "taint", "manual"]
+      - ["<std::path::Path>::into_path_buf", "Argument[Self].Reference", "ReturnValue", "value", "manual"]
+      - ["<std::path::Path>::parent", "Argument[Self].Reference", "ReturnValue.Field[core::option::Option::Some(0)].Reference", "taint", "manual"]
+      - ["<std::path::Path>::to_path_buf", "Argument[Self].Reference", "ReturnValue", "value", "manual"]
+      - ["<std::path::Path>::to_str", "Argument[Self].Reference", "ReturnValue.Field[core::option::Option::Some(0)].Reference", "value", "manual"]
+      - ["<std::path::Path>::with_added_extension", "Argument[Self].Reference", "ReturnValue", "taint", "manual"]
+      - ["<std::path::Path>::with_extension", "Argument[Self].Reference", "ReturnValue", "taint", "manual"]
+      - ["<std::path::Path>::with_file_name", "Argument[Self].Reference", "ReturnValue", "taint", "manual"]
+      - ["<std::path::Path>::with_file_name", "Argument[0]", "ReturnValue", "taint", "manual"]
diff --git a/rust/ql/lib/codeql/rust/frameworks/stdlib/io.model.yml b/rust/ql/lib/codeql/rust/frameworks/stdlib/io.model.yml
index 41f1348879f..b09ba8f297a 100644
--- a/rust/ql/lib/codeql/rust/frameworks/stdlib/io.model.yml
+++ b/rust/ql/lib/codeql/rust/frameworks/stdlib/io.model.yml
@@ -9,23 +9,11 @@ extensions:
       extensible: summaryModel
     data:
       - ["<std::io::buffered::bufreader::BufReader>::new", "Argument[0]", "ReturnValue", "taint", "manual"]
-      - ["<std::io::buffered::bufreader::BufReader as std::io::BufRead>::fill_buf", "Argument[self]", "ReturnValue.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["<_ as std::io::BufRead>::fill_buf", "Argument[self]", "ReturnValue.Field[core::result::Result::Ok(0)]", "taint", "manual"]
       - ["<std::io::buffered::bufreader::BufReader>::buffer", "Argument[self]", "ReturnValue", "taint", "manual"]
-      - ["<std::io::stdio::Stdin as std::io::Read>::read", "Argument[self]", "Argument[0].Reference", "taint", "manual"]
-      - ["<std::io::stdio::StdinLock as std::io::Read>::read", "Argument[self]", "Argument[0].Reference", "taint", "manual"]
-      - ["<std::fs::File as std::io::Read>::read", "Argument[self]", "Argument[0].Reference", "taint", "manual"]
       - ["<_ as std::io::Read>::read", "Argument[self]", "Argument[0].Reference", "taint", "manual"]
-      - ["<std::io::stdio::Stdin as std::io::Read>::read_to_string", "Argument[self]", "Argument[0].Reference", "taint", "manual"]
-      - ["<std::io::stdio::StdinLock as std::io::Read>::read_to_string", "Argument[self]", "Argument[0].Reference", "taint", "manual"]
-      - ["<std::fs::File as std::io::Read>::read_to_string", "Argument[self]", "Argument[0].Reference", "taint", "manual"]
       - ["<_ as std::io::Read>::read_to_string", "Argument[self]", "Argument[0].Reference", "taint", "manual"]
-      - ["<std::io::stdio::Stdin as std::io::Read>::read_to_end", "Argument[self]", "Argument[0].Reference", "taint", "manual"]
-      - ["<std::io::stdio::StdinLock as std::io::Read>::read_to_end", "Argument[self]", "Argument[0].Reference", "taint", "manual"]
-      - ["<std::fs::File as std::io::Read>::read_to_end", "Argument[self]", "Argument[0].Reference", "taint", "manual"]
       - ["<_ as std::io::Read>::read_to_end", "Argument[self]", "Argument[0].Reference", "taint", "manual"]
-      - ["<std::io::stdio::Stdin as std::io::Read>::read_exact", "Argument[self]", "Argument[0].Reference", "taint", "manual"]
-      - ["<std::io::stdio::StdinLock as std::io::Read>::read_exact", "Argument[self]", "Argument[0].Reference", "taint", "manual"]
-      - ["<std::fs::File as std::io::Read>::read_exact", "Argument[self]", "Argument[0].Reference", "taint", "manual"]
       - ["<_ as std::io::Read>::read_exact", "Argument[self]", "Argument[0].Reference", "taint", "manual"]
       - ["<_ as std::io::BufRead>::read_line", "Argument[self]", "Argument[0].Reference", "taint", "manual"]
       - ["<_ as std::io::BufRead>::read_until", "Argument[self]", "Argument[1].Reference", "taint", "manual"]
@@ -36,4 +24,3 @@ extensions:
       - ["<_ as std::io::Read>::chain", "Argument[0]", "ReturnValue", "taint", "manual"]
       - ["<_ as std::io::Read>::take", "Argument[self]", "ReturnValue", "taint", "manual"]
       - ["<std::io::stdio::Stdin>::lock", "Argument[self]", "ReturnValue", "taint", "manual"]
-      - ["<std::io::Split as core::iter::traits::iterator::Iterator>::next", "Argument[self]", "ReturnValue.Field[core::option::Option::Some(0)].Field[core::result::Result::Ok(0)]", "taint", "manual"]
diff --git a/rust/ql/lib/codeql/rust/frameworks/stdlib/lang-alloc.model.yml b/rust/ql/lib/codeql/rust/frameworks/stdlib/lang-alloc.model.yml
deleted file mode 100644
index 08fd458576d..00000000000
--- a/rust/ql/lib/codeql/rust/frameworks/stdlib/lang-alloc.model.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-extensions:
-  - addsTo:
-      pack: codeql/rust-all
-      extensible: sourceModel
-    data:
-      # Alloc
-      - ["alloc::alloc::dealloc", "Argument[0]", "pointer-invalidate", "manual"]
-  - addsTo:
-      pack: codeql/rust-all
-      extensible: sinkModel
-    data:
-      # Alloc
-      - ["alloc::alloc::alloc", "Argument[0]", "alloc-layout", "manual"]
-      - ["alloc::alloc::alloc_zeroed", "Argument[0]", "alloc-layout", "manual"]
-      - ["alloc::alloc::realloc", "Argument[2]", "alloc-size", "manual"]
-      - ["<_ as core::alloc::global::GlobalAlloc>::alloc", "Argument[0]", "alloc-layout", "manual"]
-      - ["<std::alloc::System as core::alloc::global::GlobalAlloc>::alloc", "Argument[0]", "alloc-layout", "manual"]
-      - ["<_ as core::alloc::global::GlobalAlloc>::alloc_zeroed", "Argument[0]", "alloc-layout", "manual"]
-      - ["<std::alloc::System as core::alloc::global::GlobalAlloc>::alloc_zeroed", "Argument[0]", "alloc-layout", "manual"]
-      - ["<std::alloc::System as core::alloc::Allocator>::allocate", "Argument[0]", "alloc-layout", "manual"]
-      - ["<std::alloc::System as core::alloc::Allocator>::allocate_zeroed", "Argument[0]", "alloc-layout", "manual"]
-      - ["<std::alloc::System as core::alloc::Allocator>::grow", "Argument[2]", "alloc-layout", "manual"]
-      - ["<std::alloc::System as core::alloc::Allocator>::grow_zeroed", "Argument[2]", "alloc-layout", "manual"]
-      - ["<alloc::alloc::Global as core::alloc::global::GlobalAlloc>::alloc", "Argument[0]", "alloc-layout", "manual"]
-      - ["<alloc::alloc::Global as core::alloc::global::GlobalAlloc>::alloc_zeroed", "Argument[0]", "alloc-layout", "manual"]
-      - ["<alloc::alloc::Global as core::alloc::Allocator>::allocate", "Argument[0]", "alloc-layout", "manual"]
-      - ["<alloc::alloc::Global as core::alloc::Allocator>::allocate_zeroed", "Argument[0]", "alloc-layout", "manual"]
-      - ["<alloc::alloc::Global as core::alloc::Allocator>::grow", "Argument[2]", "alloc-layout", "manual"]
-      - ["<alloc::alloc::Global as core::alloc::Allocator>::grow_zeroed", "Argument[2]", "alloc-layout", "manual"]
-  - addsTo:
-      pack: codeql/rust-all
-      extensible: summaryModel
-    data:
-      # Box
-      - ["<alloc::boxed::Box>::pin", "Argument[0]", "ReturnValue.Reference", "value", "manual"]
-      - ["<alloc::boxed::Box>::new", "Argument[0]", "ReturnValue.Reference", "value", "manual"]
-      - ["<alloc::boxed::Box>::into_pin", "Argument[0]", "ReturnValue", "value", "manual"]
-      # Fmt
-      - ["alloc::fmt::format", "Argument[0]", "ReturnValue", "taint", "manual"]
-      # String
-      - ["<core::str>::as_str", "Argument[self]", "ReturnValue", "value", "manual"]
-      - ["<core::str>::as_bytes", "Argument[self]", "ReturnValue", "value", "manual"]
-      - ["<alloc::string::String>::as_str", "Argument[self]", "ReturnValue", "value", "manual"]
-      - ["<alloc::string::String>::as_bytes", "Argument[self]", "ReturnValue", "value", "manual"]
-      - ["<alloc::str as alloc::string::ToString>::to_string", "Argument[self]", "ReturnValue", "taint", "manual"]
-      - ["<alloc::string::String as alloc::string::ToString>::to_string", "Argument[self]", "ReturnValue", "taint", "manual"]
-      - ["<core::str>::parse", "Argument[self]", "ReturnValue.Field[core::result::Result::Ok(0)]", "taint", "manual"]
-      - ["<core::str>::trim", "Argument[self]", "ReturnValue.Reference", "taint", "manual"]
-      - ["<alloc::string::String as core::convert::From>::from", "Argument[0]", "ReturnValue", "value", "manual"]
diff --git a/rust/ql/lib/codeql/rust/frameworks/stdlib/net.model.yml b/rust/ql/lib/codeql/rust/frameworks/stdlib/net.model.yml
index bf158cbae2d..8aa03133354 100644
--- a/rust/ql/lib/codeql/rust/frameworks/stdlib/net.model.yml
+++ b/rust/ql/lib/codeql/rust/frameworks/stdlib/net.model.yml
@@ -10,7 +10,3 @@ extensions:
       extensible: summaryModel
     data:
       - ["<std::net::tcp::TcpStream>::try_clone", "Argument[self]", "ReturnValue.Field[core::result::Result::Ok(0)]", "taint", "manual"]
-      - ["<std::net::tcp::TcpStream as std::io::Read>::read", "Argument[self]", "Argument[0].Reference", "taint", "manual"]
-      - ["<std::net::tcp::TcpStream as std::io::Read>::read_to_string", "Argument[self]", "Argument[0].Reference", "taint", "manual"]
-      - ["<std::net::tcp::TcpStream as std::io::Read>::read_to_end", "Argument[self]", "Argument[0].Reference", "taint", "manual"]
-      - ["<std::net::tcp::TcpStream as std::io::Read>::read_exact", "Argument[self]", "Argument[0].Reference", "taint", "manual"]
diff --git a/rust/ql/lib/codeql/rust/frameworks/tokio/fs.model.yml b/rust/ql/lib/codeql/rust/frameworks/tokio/fs.model.yml
index 8fe76763dd5..f2b41988fc0 100644
--- a/rust/ql/lib/codeql/rust/frameworks/tokio/fs.model.yml
+++ b/rust/ql/lib/codeql/rust/frameworks/tokio/fs.model.yml
@@ -9,3 +9,39 @@ extensions:
       - ["<tokio::fs::read_dir::DirEntry>::path", "ReturnValue", "file", "manual"]
       - ["<tokio::fs::read_dir::DirEntry>::file_name", "ReturnValue", "file", "manual"]
       - ["<tokio::fs::file::File>::open", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "file", "manual"]
+      - ["<tokio::fs::open_options::OpenOptions>::open", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "file", "manual"]
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: sinkModel
+    data:
+      - ["tokio::fs::copy::copy", "Argument[0,1]", "path-injection", "manual"]
+      - ["tokio::fs::create_dir::create_dir", "Argument[0]", "path-injection", "manual"]
+      - ["tokio::fs::create_dir_all::create_dir_all", "Argument[0]", "path-injection", "manual"]
+      - ["tokio::fs::hard_link::hard_link", "Argument[0,1]", "path-injection", "manual"]
+      - ["tokio::fs::metadata::metadata", "Argument[0]", "path-injection", "manual"]
+      - ["tokio::fs::read::read", "Argument[0]", "path-injection", "manual"]
+      - ["tokio::fs::read_dir::read_dir", "Argument[0]", "path-injection", "manual"]
+      - ["tokio::fs::read_link::read_link", "Argument[0]", "path-injection", "manual"]
+      - ["tokio::fs::read_to_string::read_to_string", "Argument[0]", "path-injection", "manual"]
+      - ["tokio::fs::remove_dir::remove_dir", "Argument[0]", "path-injection", "manual"]
+      - ["tokio::fs::remove_dir_all::remove_dir_all", "Argument[0]", "path-injection", "manual"]
+      - ["tokio::fs::remove_file::remove_file", "Argument[0]", "path-injection", "manual"]
+      - ["tokio::fs::rename::rename", "Argument[0,1]", "path-injection", "manual"]
+      - ["tokio::fs::set_permissions::set_permissions", "Argument[0]", "path-injection", "manual"]
+      - ["tokio::fs::symlink::symlink", "Argument[0,1]", "path-injection", "manual"]
+      - ["tokio::fs::symlink_dir::symlink_dir", "Argument[0,1]", "path-injection", "manual"]
+      - ["tokio::fs::symlink_file::symlink_file", "Argument[0,1]", "path-injection", "manual"]
+      - ["tokio::fs::symlink_metadata::symlink_metadata", "Argument[0]", "path-injection", "manual"]
+      - ["tokio::fs::try_exists::try_exists", "Argument[0]", "path-injection", "manual"]
+      - ["tokio::fs::write::write", "Argument[0]", "path-injection", "manual"]
+      - ["<tokio::fs::dir_builder::DirBuilder>::create", "Argument[0]", "path-injection", "manual"]
+      - ["<tokio::fs::file::File>::create", "Argument[0]", "path-injection", "manual"]
+      - ["<tokio::fs::file::File>::create_new", "Argument[0]", "path-injection", "manual"]
+      - ["<tokio::fs::file::File>::open", "Argument[0]", "path-injection", "manual"]
+      - ["<tokio::fs::open_options::OpenOptions>::open", "Argument[0]", "path-injection", "manual"]
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: summaryModel
+    data:
+      - ["tokio::fs::canonicalize::canonicalize", "Argument[0].OptionalStep[normalize-path]", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["tokio::fs::canonicalize::canonicalize", "Argument[0].OptionalBarrier[normalize-path]", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
diff --git a/rust/ql/lib/codeql/rust/frameworks/tokio/io.model.yml b/rust/ql/lib/codeql/rust/frameworks/tokio/io.model.yml
index ae58b2a077a..17b0451793d 100644
--- a/rust/ql/lib/codeql/rust/frameworks/tokio/io.model.yml
+++ b/rust/ql/lib/codeql/rust/frameworks/tokio/io.model.yml
@@ -46,6 +46,3 @@ extensions:
       - ["<_ as tokio::io::util::async_read_ext::AsyncReadExt>:::read_f32_le", "Argument[self]", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
       - ["<_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_f64", "Argument[self]", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
       - ["<_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_f64_le", "Argument[self]", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
-      - ["<_ as core::iter::traits::iterator::Iterator>::chain", "Argument[self]", "ReturnValue", "taint", "manual"]
-      - ["<_ as core::iter::traits::iterator::Iterator>::chain", "Argument[0]", "ReturnValue", "taint", "manual"]
-      - ["<_ as core::iter::traits::iterator::Iterator>::take", "Argument[self]", "ReturnValue", "taint", "manual"]
diff --git a/rust/ql/lib/codeql/rust/frameworks/tokio-postgres.model.yml b/rust/ql/lib/codeql/rust/frameworks/tokio/postgres.model.yml
similarity index 100%
rename from rust/ql/lib/codeql/rust/frameworks/tokio-postgres.model.yml
rename to rust/ql/lib/codeql/rust/frameworks/tokio/postgres.model.yml
diff --git a/rust/ql/lib/codeql/rust/frameworks/warp.model.yml b/rust/ql/lib/codeql/rust/frameworks/warp.model.yml
new file mode 100644
index 00000000000..5071b4dea86
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/frameworks/warp.model.yml
@@ -0,0 +1,8 @@
+extensions:
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: sourceModel
+    data:
+      - ["<_ as warp::filter::Filter>::then", "Argument[0].Parameter[0..7]", "remote", "manual"]
+      - ["<_ as warp::filter::Filter>::map", "Argument[0].Parameter[0..7]", "remote", "manual"]
+      - ["<_ as warp::filter::Filter>::and_then", "Argument[0].Parameter[0..7]", "remote", "manual"]
\ No newline at end of file
diff --git a/rust/ql/lib/codeql/rust/internal/AstConsistency.qll b/rust/ql/lib/codeql/rust/internal/AstConsistency.qll
index 43adfc351f7..97f49a42560 100644
--- a/rust/ql/lib/codeql/rust/internal/AstConsistency.qll
+++ b/rust/ql/lib/codeql/rust/internal/AstConsistency.qll
@@ -73,6 +73,14 @@ query predicate multiplePositions(Element parent, int pos1, int pos2, string acc
   pos1 != pos2
 }
 
+/**
+ * Holds if `va` is a variable access that refers to multiple variables.
+ */
+query predicate multipleVariableTargets(VariableAccess va, Variable v1) {
+  va = v1.getAnAccess() and
+  strictcount(va.getVariable()) > 1
+}
+
 /**
  * Gets counts of abstract syntax tree inconsistencies of each type.
  */
@@ -98,4 +106,7 @@ int getAstInconsistencyCounts(string type) {
   or
   type = "Multiple positions" and
   result = count(Element e | multiplePositions(_, _, _, _, e) | e)
+  or
+  type = "Multiple variable targets" and
+  result = count(VariableAccess va | multipleVariableTargets(va, _) | va)
 }
diff --git a/rust/ql/lib/codeql/rust/internal/CachedStages.qll b/rust/ql/lib/codeql/rust/internal/CachedStages.qll
index ad011a753c8..132b9ec8f7e 100644
--- a/rust/ql/lib/codeql/rust/internal/CachedStages.qll
+++ b/rust/ql/lib/codeql/rust/internal/CachedStages.qll
@@ -65,7 +65,6 @@ module Stages {
   cached
   module CfgStage {
     private import codeql.rust.controlflow.internal.Splitting
-    private import codeql.rust.controlflow.internal.SuccessorType
     private import codeql.rust.controlflow.internal.ControlFlowGraphImpl
     private import codeql.rust.controlflow.CfgNodes
 
@@ -87,8 +86,6 @@ module Stages {
       or
       exists(TConditionalCompletionSplitKind())
       or
-      exists(TNormalSuccessor())
-      or
       exists(AstCfgNode n)
       or
       exists(CallExprCfgNode n | exists(n.getFunction()))
@@ -120,9 +117,7 @@ module Stages {
       or
       exists(resolvePath(_))
       or
-      exists(any(ItemNode i).getASuccessor(_))
-      or
-      exists(any(ItemNode i).getASuccessorRec(_))
+      exists(any(ItemNode i).getASuccessor(_, _, _))
       or
       exists(any(ImplOrTraitItemNode i).getASelfPath())
       or
diff --git a/rust/ql/lib/codeql/rust/internal/Definitions.qll b/rust/ql/lib/codeql/rust/internal/Definitions.qll
index c03ece9d56d..b1b3e475c46 100644
--- a/rust/ql/lib/codeql/rust/internal/Definitions.qll
+++ b/rust/ql/lib/codeql/rust/internal/Definitions.qll
@@ -135,10 +135,10 @@ private class PositionalFormatArgumentUse extends Use instanceof PositionalForma
   override string getUseType() { result = "format argument" }
 }
 
-private class PathUse extends Use instanceof PathSegment {
+private class PathUse extends Use instanceof NameRef {
   private Path path;
 
-  PathUse() { this = path.getSegment() }
+  PathUse() { this = path.getSegment().getIdentifier() }
 
   private CallExpr getCall() { result.getFunction().(PathExpr).getPath() = path }
 
diff --git a/rust/ql/lib/codeql/rust/internal/PathResolution.qll b/rust/ql/lib/codeql/rust/internal/PathResolution.qll
index 354cab5a6de..0933f2dcd95 100644
--- a/rust/ql/lib/codeql/rust/internal/PathResolution.qll
+++ b/rust/ql/lib/codeql/rust/internal/PathResolution.qll
@@ -4,18 +4,21 @@
 
 private import rust
 private import codeql.rust.elements.internal.generated.ParentChild
+private import codeql.rust.elements.internal.CallExprImpl::Impl as CallExprImpl
 private import codeql.rust.internal.CachedStages
 private import codeql.rust.frameworks.stdlib.Builtins as Builtins
+private import codeql.util.Option
 
 private newtype TNamespace =
   TTypeNamespace() or
-  TValueNamespace()
+  TValueNamespace() or
+  TMacroNamespace()
 
 /**
  * A namespace.
  *
- * Either the _value_ namespace or the _type_ namespace, see
- * https://doc.rust-lang.org/reference/names/namespaces.html.
+ * Either the _value_ namespace, the _type_ namespace, or the _macro_ namespace,
+ * see https://doc.rust-lang.org/reference/names/namespaces.html.
  */
 final class Namespace extends TNamespace {
   /** Holds if this is the value namespace. */
@@ -24,32 +27,119 @@ final class Namespace extends TNamespace {
   /** Holds if this is the type namespace. */
   predicate isType() { this = TTypeNamespace() }
 
+  /** Holds if this is the macro namespace. */
+  predicate isMacro() { this = TMacroNamespace() }
+
   /** Gets a textual representation of this namespace. */
   string toString() {
     this.isValue() and result = "value"
     or
     this.isType() and result = "type"
+    or
+    this.isMacro() and result = "macro"
   }
 }
 
+private newtype TSuccessorKind =
+  TInternal() or
+  TExternal() or
+  TBoth()
+
+/** A successor kind. */
+class SuccessorKind extends TSuccessorKind {
+  predicate isInternal() { this = TInternal() }
+
+  predicate isExternal() { this = TExternal() }
+
+  predicate isBoth() { this = TBoth() }
+
+  predicate isInternalOrBoth() { this.isInternal() or this.isBoth() }
+
+  predicate isExternalOrBoth() { this.isExternal() or this.isBoth() }
+
+  string toString() {
+    this.isInternal() and result = "internal"
+    or
+    this.isExternal() and result = "external"
+    or
+    this.isBoth() and result = "both"
+  }
+}
+
+pragma[nomagic]
+private ItemNode getAChildSuccessor(ItemNode item, string name, SuccessorKind kind) {
+  item = result.getImmediateParent() and
+  name = result.getName() and
+  (
+    // type parameters are only available inside the declaring item
+    if result instanceof TypeParam
+    then kind.isInternal()
+    else
+      // associated items must always be qualified, also within the declaring
+      // item (using `Self`)
+      if item instanceof ImplOrTraitItemNode and result instanceof AssocItem
+      then kind.isExternal()
+      else
+        if result.isPublic()
+        then kind.isBoth()
+        else kind.isInternal()
+  )
+}
+
+private module UseOption = Option<Use>;
+
+private class UseOption = UseOption::Option;
+
 /**
  * An item that may be referred to by a path, and which is a node in
  * the _item graph_.
  *
  * The item graph is a labeled directed graph, where an edge
- * `item1 --name--> item2` means that `item2` is available inside the
- * scope of `item1` under the name `name`. For example, if we have
+ *
+ * ```
+ * item1 --name,kind--> item2
+ * ```
+ *
+ * means that:
+ *
+ * - `item2` is available _inside_ the scope of `item1` under the name `name`,
+ *   when `kind` is either `internal` or `both`, and
+ *
+ * - `item2` is available _externally_ from `item1` under the name `name`, when
+ *   `kind` is either `external` or `both`.
+ *
+ * For example, if we have
  *
  * ```rust
- * mod m1 {
- *     mod m2 { }
+ * pub mod m1 {
+ *     pub mod m2 { }
  * }
  * ```
  *
- * then there is an edge `m1 --m2--> m1::m2`.
+ * then there is an edge `mod m1 --m2,both--> mod m2`.
+ *
+ * Associated items are example of externally visible items (inside the
+ * declaring item they must be `Self` prefixed), while type parameters are
+ * examples of internally visible items. For example, for
+ *
+ * ```rust
+ * mod m {
+ *     pub trait<T> Trait {
+ *         fn foo(&self) -> T;
+ *     }
+ * }
+ * ```
+ *
+ * we have the following edges
+ *
+ * ```
+ * mod m       --Trait,both-->    trait Trait
+ * trait Trait --foo,external --> fn foo
+ * trait Trait --T,internal -->   T
+ * ```
  *
  * Source files are also considered nodes in the item graph, and for
- * each source file `f` there is an edge `f --name--> item` when `f`
+ * each source file `f` there is an edge `f --name,both--> item` when `f`
  * declares `item` with the name `name`.
  *
  * For imports like
@@ -61,11 +151,13 @@ final class Namespace extends TNamespace {
  * }
  * ```
  *
- * we first generate an edge `m1::m2 --name--> f::item`, where `item` is
- * any item (named `name`) inside the imported source file `f`. Using this
- * edge, `m2::foo` can resolve to `f::foo`, which results in the edge
- * `m1::use m2 --foo--> f::foo`. Lastly, all edges out of `use` nodes are
- * lifted to predecessors in the graph, so we get an edge `m1 --foo--> f::foo`.
+ * we first generate an edge `mod m2 --name,kind--> f::item`, where `item` is
+ * any item (named `name`) inside the imported source file `f`, and `kind` is
+ * either `external` or `both`. Using this edge, `m2::foo` can resolve to
+ * `f::foo`, which results in the edge `use m2 --foo,internal--> f::foo`
+ * (would have been `external` if it was `pub use m2::foo`). Lastly, all edges
+ * out of `use` nodes are lifted to predecessors in the graph, so we get
+ * an edge `mod m1 --foo,internal--> f::foo`.
  *
  *
  * References:
@@ -76,6 +168,8 @@ final class Namespace extends TNamespace {
  * - https://doc.rust-lang.org/reference/names/namespaces.html
  */
 abstract class ItemNode extends Locatable {
+  ItemNode() { not this.(Item).hasAttributeMacroExpansion() }
+
   /** Gets the (original) name of this item. */
   abstract string getName();
 
@@ -85,6 +179,32 @@ abstract class ItemNode extends Locatable {
   /** Gets the visibility of this item, if any. */
   abstract Visibility getVisibility();
 
+  abstract Attr getAnAttr();
+
+  pragma[nomagic]
+  final Attr getAttr(string name) {
+    result = this.getAnAttr() and
+    result.getMeta().getPath().(RelevantPath).isUnqualified(name)
+  }
+
+  final predicate hasAttr(string name) { exists(this.getAttr(name)) }
+
+  /**
+   * Holds if this item is public.
+   *
+   * This is the case when this item either has `pub` visibility (but is not
+   * a `use`; a `use` itself is not visible from the outside), or when this
+   * item is a variant.
+   */
+  predicate isPublic() {
+    exists(this.getVisibility()) and
+    not this instanceof Use
+    or
+    this instanceof Variant
+    or
+    this instanceof MacroItemNode
+  }
+
   /** Gets the `i`th type parameter of this item, if any. */
   abstract TypeParam getTypeParam(int i);
 
@@ -112,153 +232,152 @@ abstract class ItemNode extends Locatable {
     result = this.(SourceFileItemNode).getSuper()
   }
 
-  pragma[nomagic]
-  private ItemNode getAChildSuccessor(string name) {
-    this = result.getImmediateParent() and
-    name = result.getName()
-  }
-
+  /**
+   * Gets a successor named `name` of the given `kind`, if any.
+   *
+   * `useOpt` represents the `use` statement that brought the item into scope,
+   * if any.
+   */
   cached
-  ItemNode getASuccessorRec(string name) {
+  ItemNode getASuccessor(string name, SuccessorKind kind, UseOption useOpt) {
     Stages::PathResolutionStage::ref() and
-    sourceFileEdge(this, name, result)
+    sourceFileEdge(this, name, result) and
+    kind.isBoth() and
+    useOpt.isNone()
     or
-    result = this.getAChildSuccessor(name)
+    result = getAChildSuccessor(this, name, kind) and
+    useOpt.isNone()
     or
-    fileImportEdge(this, name, result)
+    fileImportEdge(this, name, result, kind, useOpt)
     or
-    useImportEdge(this, name, result)
+    useImportEdge(this, name, result, kind) and
+    useOpt.isNone()
     or
-    crateDefEdge(this, name, result)
+    crateDefEdge(this, name, result, kind, useOpt)
     or
-    crateDependencyEdge(this, name, result)
+    crateDependencyEdge(this, name, result) and
+    kind.isInternal() and
+    useOpt.isNone()
     or
-    externCrateEdge(this, name, result)
+    externCrateEdge(this, name, result) and
+    kind.isInternal() and
+    useOpt.isNone()
+    or
+    macroExportEdge(this, name, result) and
+    kind.isBoth() and
+    useOpt.isNone()
+    or
+    macroUseEdge(this, name, kind, useOpt, result)
     or
     // items made available through `use` are available to nodes that contain the `use`
-    exists(UseItemNode use |
-      use = this.getASuccessorRec(_) and
-      result = use.(ItemNode).getASuccessorRec(name)
-    )
+    useOpt.asSome() =
+      any(UseItemNode use_ |
+        use_ = this.getASuccessor(_, _, _) and
+        result = use_.getASuccessor(name, kind, _)
+      )
     or
-    exists(ExternCrateItemNode ec | result = ec.(ItemNode).getASuccessorRec(name) |
-      ec = this.getASuccessorRec(_)
+    exists(ExternCrateItemNode ec | result = ec.(ItemNode).getASuccessor(name, kind, useOpt) |
+      ec = this.getASuccessor(_, _, _)
       or
       // if the extern crate appears in the crate root, then the crate name is also added
       // to the 'extern prelude', see https://doc.rust-lang.org/reference/items/extern-crates.html
       exists(Crate c |
-        ec = c.getSourceFile().(ItemNode).getASuccessorRec(_) and
+        ec = c.getSourceFile().(ItemNode).getASuccessor(_, _, _) and
         this = c.getASourceFile()
       )
     )
     or
     // a trait has access to the associated items of its supertraits
     this =
-      any(TraitItemNode trait |
-        result = trait.resolveABound().getASuccessorRec(name) and
+      any(TraitItemNodeImpl trait |
+        result = trait.resolveABoundCand().getASuccessor(name, kind, useOpt) and
+        kind.isExternalOrBoth() and
         result instanceof AssocItemNode and
         not trait.hasAssocItem(name)
       )
     or
     // items made available by an implementation where `this` is the implementing type
-    exists(ItemNode node |
-      this = node.(ImplItemNode).resolveSelfTy() and
-      result = node.getASuccessorRec(name) and
-      result instanceof AssocItemNode and
-      not result instanceof TypeAlias
-    )
+    typeImplEdge(this, _, name, kind, result, useOpt)
     or
     // trait items with default implementations made available in an implementation
-    exists(ImplItemNode impl, ItemNode trait |
+    exists(ImplItemNodeImpl impl, ItemNode trait |
       this = impl and
-      trait = impl.resolveTraitTy() and
-      result = trait.getASuccessorRec(name) and
+      trait = impl.resolveTraitTyCand() and
+      result = trait.getASuccessor(name, kind, useOpt) and
       result.(AssocItemNode).hasImplementation() and
+      kind.isExternalOrBoth() and
       not impl.hasAssocItem(name)
     )
     or
     // type parameters have access to the associated items of its bounds
-    result = this.(TypeParamItemNode).resolveABound().getASuccessorRec(name).(AssocItemNode)
+    result =
+      this.(TypeParamItemNodeImpl)
+          .resolveABoundCand()
+          .getASuccessor(name, kind, useOpt)
+          .(AssocItemNode) and
+    kind.isExternalOrBoth()
     or
-    result = this.(ImplTraitTypeReprItemNode).resolveABound().getASuccessorRec(name).(AssocItemNode)
+    result =
+      this.(ImplTraitTypeReprItemNodeImpl)
+          .resolveABoundCand()
+          .getASuccessor(name, kind, useOpt)
+          .(AssocItemNode) and
+    kind.isExternalOrBoth()
     or
-    result = this.(TypeAliasItemNode).resolveAlias().getASuccessorRec(name) and
-    // type parameters defined in the RHS are not available in the LHS
-    not result instanceof TypeParam
-  }
-
-  /**
-   * Gets a successor named `name` of this item, if any.
-   *
-   * Whenever a function exists in both source code and in library code,
-   * both are included
-   */
-  cached
-  ItemNode getASuccessor(string name) {
-    Stages::PathResolutionStage::ref() and
-    result = this.getASuccessorRec(name)
-    or
-    preludeEdge(this, name, result)
-    or
-    this instanceof SourceFile and
-    builtin(name, result)
+    result = this.(TypeAliasItemNodeImpl).resolveAliasCand().getASuccessor(name, kind, useOpt) and
+    kind.isExternalOrBoth()
     or
     name = "super" and
-    if this instanceof Module or this instanceof SourceFile
-    then result = this.getImmediateParentModule()
-    else result = this.getImmediateParentModule().getImmediateParentModule()
+    useOpt.isNone() and
+    (
+      if this instanceof Module or this instanceof SourceFile
+      then (
+        kind.isBoth() and result = this.getImmediateParentModule()
+      ) else (
+        kind.isInternal() and result = this.getImmediateParentModule().getImmediateParentModule()
+      )
+    )
     or
     name = "self" and
-    if
-      this instanceof Module or
-      this instanceof Enum or
-      this instanceof Struct or
-      this instanceof Crate
-    then result = this
-    else result = this.getImmediateParentModule()
+    useOpt.isNone() and
+    (
+      if
+        this instanceof Module or
+        this instanceof Enum or
+        this instanceof Struct or
+        this instanceof Crate
+      then (
+        kind.isBoth() and
+        result = this
+      ) else (
+        kind.isInternal() and
+        result = this.getImmediateParentModule()
+      )
+    )
     or
-    name = "Self" and
-    this = result.(ImplOrTraitItemNode).getAnItemInSelfScope()
-    or
-    name = "crate" and
-    this = result.(CrateItemNode).getASourceFile()
-    or
-    // todo: implement properly
-    name = "$crate" and
-    result = any(CrateItemNode crate | this = crate.getASourceFile()).(Crate).getADependency*() and
-    result.(CrateItemNode).isPotentialDollarCrateTarget()
+    kind.isInternal() and
+    useOpt.isNone() and
+    (
+      preludeEdge(this, name, result)
+      or
+      this instanceof SourceFile and
+      builtin(name, result)
+      or
+      name = "Self" and
+      this = result.(ImplOrTraitItemNode).getAnItemInSelfScope()
+      or
+      name = "crate" and
+      this = result.(CrateItemNode).getASourceFile()
+    )
   }
 
-  /**
-   * Holds if the successor `item` with the name `name` is not available locally
-   * for unqualified paths.
-   *
-   * This has the effect that a path of the form `name` inside `this` will not
-   * resolve to `item`.
-   */
+  /** Gets an _external_ successor named `name`, if any. */
   pragma[nomagic]
-  predicate excludedLocally(string name, ItemNode item) {
-    // Associated items in an impl or trait block are not directly available
-    // inside the block, they require a qualified path with a `Self` prefix.
-    item = this.getAChildSuccessor(name) and
-    this instanceof ImplOrTraitItemNode and
-    item instanceof AssocItemNode
-  }
-
-  /**
-   * Holds if the successor `item` with the name `name` is not available
-   * externally for qualified paths that resolve to this item.
-   *
-   * This has the effect that a path of the form `Qualifier::name`, where
-   * `Qualifier` resolves to this item, will not resolve to `item`.
-   */
-  pragma[nomagic]
-  predicate excludedExternally(string name, ItemNode item) {
-    // Type parameters for an `impl` or trait block are not available outside of
-    // the block.
-    item = this.getAChildSuccessor(name) and
-    this instanceof ImplOrTraitItemNode and
-    item instanceof TypeParamItemNode
+  ItemNode getASuccessor(string name) {
+    exists(SuccessorKind kind |
+      result = this.getASuccessor(name, kind, _) and
+      kind.isExternalOrBoth()
+    )
   }
 
   /** Holds if this item has a canonical path belonging to the crate `c`. */
@@ -321,11 +440,9 @@ abstract private class ModuleLikeNode extends ItemNode {
   }
 }
 
-private class SourceFileItemNode extends ModuleLikeNode, SourceFile {
+private class SourceFileItemNode extends ModuleLikeNode instanceof SourceFile {
   pragma[nomagic]
-  ModuleLikeNode getSuper() {
-    result = any(ModuleItemNode mod | fileImport(mod, this)).getASuccessor("super")
-  }
+  ModuleLikeNode getSuper() { fileImport(result.getAnItemInScope(), this) }
 
   override string getName() { result = "(source file)" }
 
@@ -335,6 +452,8 @@ private class SourceFileItemNode extends ModuleLikeNode, SourceFile {
 
   override Visibility getVisibility() { none() }
 
+  override Attr getAnAttr() { result = SourceFile.super.getAnAttr() }
+
   override TypeParam getTypeParam(int i) { none() }
 
   override predicate hasCanonicalPath(Crate c) { none() }
@@ -368,14 +487,6 @@ class CrateItemNode extends ItemNode instanceof Crate {
     )
   }
 
-  pragma[nomagic]
-  predicate isPotentialDollarCrateTarget() {
-    exists(string name, RelevantPath p |
-      p.isDollarCrateQualifiedPath(name) and
-      exists(this.getASuccessor(name))
-    )
-  }
-
   override string getName() { result = Crate.super.getName() }
 
   override Namespace getNamespace() {
@@ -384,6 +495,8 @@ class CrateItemNode extends ItemNode instanceof Crate {
 
   override Visibility getVisibility() { none() }
 
+  override Attr getAnAttr() { none() }
+
   override TypeParam getTypeParam(int i) { none() }
 
   override predicate hasCanonicalPath(Crate c) { c = this }
@@ -405,12 +518,19 @@ class CrateItemNode extends ItemNode instanceof Crate {
 }
 
 class ExternCrateItemNode extends ItemNode instanceof ExternCrate {
-  override string getName() { result = super.getRename().getName().getText() }
+  override string getName() {
+    result = super.getRename().getName().getText()
+    or
+    not super.hasRename() and
+    result = super.getIdentifier().getText()
+  }
 
   override Namespace getNamespace() { none() }
 
   override Visibility getVisibility() { none() }
 
+  override Attr getAnAttr() { result = ExternCrate.super.getAnAttr() }
+
   override TypeParam getTypeParam(int i) { none() }
 
   override predicate hasCanonicalPath(Crate c) { none() }
@@ -453,6 +573,8 @@ private class ConstItemNode extends AssocItemNode instanceof Const {
 
   override Visibility getVisibility() { result = Const.super.getVisibility() }
 
+  override Attr getAnAttr() { result = Const.super.getAnAttr() }
+
   override TypeParam getTypeParam(int i) { none() }
 }
 
@@ -463,6 +585,8 @@ private class EnumItemNode extends TypeItemNode instanceof Enum {
 
   override Visibility getVisibility() { result = Enum.super.getVisibility() }
 
+  override Attr getAnAttr() { result = Enum.super.getAnAttr() }
+
   override TypeParam getTypeParam(int i) { result = super.getGenericParamList().getTypeParam(i) }
 
   override predicate hasCanonicalPath(Crate c) { this.hasCanonicalPathPrefix(c) }
@@ -486,7 +610,13 @@ private class EnumItemNode extends TypeItemNode instanceof Enum {
   }
 }
 
-private class VariantItemNode extends ItemNode instanceof Variant {
+/** An item that can be referenced with arguments. */
+abstract class ParameterizableItemNode extends ItemNode {
+  /** Gets the arity this item. */
+  abstract int getArity();
+}
+
+private class VariantItemNode extends ParameterizableItemNode instanceof Variant {
   override string getName() { result = Variant.super.getName().getText() }
 
   override Namespace getNamespace() {
@@ -499,6 +629,10 @@ private class VariantItemNode extends ItemNode instanceof Variant {
 
   override Visibility getVisibility() { result = super.getEnum().getVisibility() }
 
+  override Attr getAnAttr() { result = Variant.super.getAnAttr() }
+
+  override int getArity() { result = super.getFieldList().(TupleFieldList).getNumberOfFields() }
+
   override predicate hasCanonicalPath(Crate c) { this.hasCanonicalPathPrefix(c) }
 
   bindingset[c]
@@ -520,16 +654,25 @@ private class VariantItemNode extends ItemNode instanceof Variant {
   }
 }
 
-class FunctionItemNode extends AssocItemNode instanceof Function {
+class FunctionItemNode extends AssocItemNode, ParameterizableItemNode instanceof Function {
   override string getName() { result = Function.super.getName().getText() }
 
   override predicate hasImplementation() { Function.super.hasImplementation() }
 
-  override Namespace getNamespace() { result.isValue() }
+  override Namespace getNamespace() {
+    // see https://doc.rust-lang.org/reference/procedural-macros.html
+    if this.hasAttr(["proc_macro", "proc_macro_attribute", "proc_macro_derive"])
+    then result.isMacro()
+    else result.isValue()
+  }
 
   override TypeParam getTypeParam(int i) { result = super.getGenericParamList().getTypeParam(i) }
 
   override Visibility getVisibility() { result = Function.super.getVisibility() }
+
+  override Attr getAnAttr() { result = Function.super.getAnAttr() }
+
+  override int getArity() { result = super.getNumberOfParamsInclSelf() }
 }
 
 abstract class ImplOrTraitItemNode extends ItemNode {
@@ -552,7 +695,7 @@ abstract class ImplOrTraitItemNode extends ItemNode {
   Path getASelfPath() {
     Stages::PathResolutionStage::ref() and
     isUnqualifiedSelfPath(result) and
-    this = unqualifiedPathLookup(result, _)
+    this = unqualifiedPathLookup(result, _, _)
   }
 
   /** Gets an associated item belonging to this trait or `impl` block. */
@@ -570,17 +713,12 @@ abstract class ImplOrTraitItemNode extends ItemNode {
   predicate hasAssocItem(string name) { name = this.getAnAssocItem().getName() }
 }
 
-pragma[nomagic]
-private TypeParamItemNode resolveTypeParamPathTypeRepr(PathTypeRepr ptr) {
-  result = resolvePath(ptr.getPath())
-}
-
-class ImplItemNode extends ImplOrTraitItemNode instanceof Impl {
+final class ImplItemNode extends ImplOrTraitItemNode instanceof Impl {
   Path getSelfPath() { result = super.getSelfTy().(PathTypeRepr).getPath() }
 
   Path getTraitPath() { result = super.getTrait().(PathTypeRepr).getPath() }
 
-  ItemNode resolveSelfTy() { result = resolvePath(this.getSelfPath()) }
+  TypeItemNode resolveSelfTy() { result = resolvePath(this.getSelfPath()) }
 
   TraitItemNode resolveTraitTy() { result = resolvePath(this.getTraitPath()) }
 
@@ -596,6 +734,18 @@ class ImplItemNode extends ImplOrTraitItemNode instanceof Impl {
 
   override Visibility getVisibility() { result = Impl.super.getVisibility() }
 
+  override Attr getAnAttr() { result = Impl.super.getAnAttr() }
+
+  TypeParamItemNode getBlanketImplementationTypeParam() { result = this.resolveSelfTy() }
+
+  /**
+   * Holds if this impl block is a [blanket implementation][1]. That is, the
+   * implementation targets a generic parameter of the impl block.
+   *
+   * [1]: https://doc.rust-lang.org/book/ch10-02-traits.html#using-trait-bounds-to-conditionally-implement-methods
+   */
+  predicate isBlanketImplementation() { exists(this.getBlanketImplementationTypeParam()) }
+
   override predicate hasCanonicalPath(Crate c) { this.resolveSelfTy().hasCanonicalPathPrefix(c) }
 
   /**
@@ -615,7 +765,7 @@ class ImplItemNode extends ImplOrTraitItemNode instanceof Impl {
       if this.hasCanonicalPath(c2)
       then c1 = c2
       else (
-        c2 = c1.getADependency() or c1 = c2.getADependency()
+        c2 = c1.getADependency+() or c1 = c2.getADependency+()
       )
     )
   }
@@ -669,7 +819,7 @@ class ImplItemNode extends ImplOrTraitItemNode instanceof Impl {
   }
 }
 
-private class ImplTraitTypeReprItemNode extends ItemNode instanceof ImplTraitTypeRepr {
+final class ImplTraitTypeReprItemNode extends TypeItemNode instanceof ImplTraitTypeRepr {
   pragma[nomagic]
   Path getABoundPath() {
     result = super.getTypeBoundList().getABound().getTypeRepr().(PathTypeRepr).getPath()
@@ -684,6 +834,8 @@ private class ImplTraitTypeReprItemNode extends ItemNode instanceof ImplTraitTyp
 
   override Visibility getVisibility() { none() }
 
+  override Attr getAnAttr() { none() }
+
   override TypeParam getTypeParam(int i) { none() }
 
   override predicate hasCanonicalPath(Crate c) { none() }
@@ -691,6 +843,11 @@ private class ImplTraitTypeReprItemNode extends ItemNode instanceof ImplTraitTyp
   override string getCanonicalPath(Crate c) { none() }
 }
 
+private class ImplTraitTypeReprItemNodeImpl extends ImplTraitTypeReprItemNode {
+  pragma[nomagic]
+  ItemNode resolveABoundCand() { result = resolvePathCand(this.getABoundPath()) }
+}
+
 private class ModuleItemNode extends ModuleLikeNode instanceof Module {
   override string getName() { result = Module.super.getName().getText() }
 
@@ -698,6 +855,8 @@ private class ModuleItemNode extends ModuleLikeNode instanceof Module {
 
   override Visibility getVisibility() { result = Module.super.getVisibility() }
 
+  override Attr getAnAttr() { result = Module.super.getAnAttr() }
+
   override TypeParam getTypeParam(int i) { none() }
 
   override predicate hasCanonicalPath(Crate c) { this.hasCanonicalPathPrefix(c) }
@@ -733,7 +892,13 @@ private class ModuleItemNode extends ModuleLikeNode instanceof Module {
   }
 }
 
-private class StructItemNode extends TypeItemNode instanceof Struct {
+private class ImplItemNodeImpl extends ImplItemNode {
+  TypeItemNode resolveSelfTyCand() { result = resolvePathCand(this.getSelfPath()) }
+
+  TraitItemNode resolveTraitTyCand() { result = resolvePathCand(this.getTraitPath()) }
+}
+
+private class StructItemNode extends TypeItemNode, ParameterizableItemNode instanceof Struct {
   override string getName() { result = Struct.super.getName().getText() }
 
   override Namespace getNamespace() {
@@ -745,6 +910,10 @@ private class StructItemNode extends TypeItemNode instanceof Struct {
 
   override Visibility getVisibility() { result = Struct.super.getVisibility() }
 
+  override Attr getAnAttr() { result = Struct.super.getAnAttr() }
+
+  override int getArity() { result = super.getFieldList().(TupleFieldList).getNumberOfFields() }
+
   override TypeParam getTypeParam(int i) { result = super.getGenericParamList().getTypeParam(i) }
 
   override predicate hasCanonicalPath(Crate c) { this.hasCanonicalPathPrefix(c) }
@@ -768,12 +937,14 @@ private class StructItemNode extends TypeItemNode instanceof Struct {
   }
 }
 
-class TraitItemNode extends ImplOrTraitItemNode, TypeItemNode instanceof Trait {
+final class TraitItemNode extends ImplOrTraitItemNode, TypeItemNode instanceof Trait {
   pragma[nomagic]
   Path getABoundPath() { result = super.getATypeBound().getTypeRepr().(PathTypeRepr).getPath() }
 
   pragma[nomagic]
-  ItemNode resolveABound() { result = resolvePath(this.getABoundPath()) }
+  ItemNode resolveBound(Path path) { path = this.getABoundPath() and result = resolvePath(path) }
+
+  ItemNode resolveABound() { result = this.resolveBound(_) }
 
   override AssocItemNode getAnAssocItem() { result = this.getADescendant() }
 
@@ -783,6 +954,8 @@ class TraitItemNode extends ImplOrTraitItemNode, TypeItemNode instanceof Trait {
 
   override Visibility getVisibility() { result = Trait.super.getVisibility() }
 
+  override Attr getAnAttr() { result = Trait.super.getAnAttr() }
+
   override TypeParam getTypeParam(int i) { result = super.getGenericParamList().getTypeParam(i) }
 
   override predicate hasCanonicalPath(Crate c) { this.hasCanonicalPathPrefix(c) }
@@ -823,7 +996,12 @@ class TraitItemNode extends ImplOrTraitItemNode, TypeItemNode instanceof Trait {
   }
 }
 
-class TypeAliasItemNode extends TypeItemNode, AssocItemNode instanceof TypeAlias {
+final private class TraitItemNodeImpl extends TraitItemNode {
+  pragma[nomagic]
+  ItemNode resolveABoundCand() { result = resolvePathCand(this.getABoundPath()) }
+}
+
+final class TypeAliasItemNode extends TypeItemNode, AssocItemNode instanceof TypeAlias {
   pragma[nomagic]
   ItemNode resolveAlias() { result = resolvePath(super.getTypeRepr().(PathTypeRepr).getPath()) }
 
@@ -835,6 +1013,8 @@ class TypeAliasItemNode extends TypeItemNode, AssocItemNode instanceof TypeAlias
 
   override Visibility getVisibility() { result = TypeAlias.super.getVisibility() }
 
+  override Attr getAnAttr() { result = TypeAlias.super.getAnAttr() }
+
   override TypeParam getTypeParam(int i) { result = super.getGenericParamList().getTypeParam(i) }
 
   override predicate hasCanonicalPath(Crate c) { none() }
@@ -842,6 +1022,13 @@ class TypeAliasItemNode extends TypeItemNode, AssocItemNode instanceof TypeAlias
   override string getCanonicalPath(Crate c) { none() }
 }
 
+private class TypeAliasItemNodeImpl extends TypeAliasItemNode instanceof TypeAlias {
+  pragma[nomagic]
+  ItemNode resolveAliasCand() {
+    result = resolvePathCand(super.getTypeRepr().(PathTypeRepr).getPath())
+  }
+}
+
 private class UnionItemNode extends TypeItemNode instanceof Union {
   override string getName() { result = Union.super.getName().getText() }
 
@@ -849,6 +1036,8 @@ private class UnionItemNode extends TypeItemNode instanceof Union {
 
   override Visibility getVisibility() { result = Union.super.getVisibility() }
 
+  override Attr getAnAttr() { result = Union.super.getAnAttr() }
+
   override TypeParam getTypeParam(int i) { result = super.getGenericParamList().getTypeParam(i) }
 
   override predicate hasCanonicalPath(Crate c) { this.hasCanonicalPathPrefix(c) }
@@ -879,6 +1068,8 @@ private class UseItemNode extends ItemNode instanceof Use {
 
   override Visibility getVisibility() { result = Use.super.getVisibility() }
 
+  override Attr getAnAttr() { result = Use.super.getAnAttr() }
+
   override TypeParam getTypeParam(int i) { none() }
 
   override predicate hasCanonicalPath(Crate c) { none() }
@@ -893,6 +1084,8 @@ private class BlockExprItemNode extends ItemNode instanceof BlockExpr {
 
   override Visibility getVisibility() { none() }
 
+  override Attr getAnAttr() { result = BlockExpr.super.getAnAttr() }
+
   override TypeParam getTypeParam(int i) { none() }
 
   override predicate hasCanonicalPath(Crate c) { none() }
@@ -900,20 +1093,45 @@ private class BlockExprItemNode extends ItemNode instanceof BlockExpr {
   override string getCanonicalPath(Crate c) { none() }
 }
 
-class TypeParamItemNode extends TypeItemNode instanceof TypeParam {
+pragma[nomagic]
+private Path getWherePredPath(WherePred wp) { result = wp.getTypeRepr().(PathTypeRepr).getPath() }
+
+final class TypeParamItemNode extends TypeItemNode instanceof TypeParam {
   /** Gets a where predicate for this type parameter, if any */
-  WherePred getAWherePred() {
+  pragma[nomagic]
+  private WherePred getAWherePred() {
     exists(ItemNode declaringItem |
-      this = resolveTypeParamPathTypeRepr(result.getTypeRepr()) and
+      this = resolvePath(getWherePredPath(result)) and
       result = declaringItem.getADescendant() and
       this = declaringItem.getADescendant()
     )
   }
 
   pragma[nomagic]
-  Path getABoundPath() { result = super.getATypeBound().getTypeRepr().(PathTypeRepr).getPath() }
+  TypeBound getTypeBoundAt(int i, int j) {
+    exists(TypeBoundList tbl | result = tbl.getBound(j) |
+      tbl = super.getTypeBoundList() and i = 0
+      or
+      exists(WherePred wp |
+        wp = this.getAWherePred() and
+        tbl = wp.getTypeBoundList() and
+        wp = any(WhereClause wc).getPredicate(i)
+      )
+    )
+  }
 
   pragma[nomagic]
+  Path getABoundPath() { result = this.getTypeBoundAt(_, _).getTypeRepr().(PathTypeRepr).getPath() }
+
+  pragma[nomagic]
+  ItemNode resolveBound(int index) {
+    result =
+      rank[index + 1](int i, int j |
+        |
+        resolvePath(this.getTypeBoundAt(i, j).getTypeRepr().(PathTypeRepr).getPath()) order by i, j
+      )
+  }
+
   ItemNode resolveABound() { result = resolvePath(this.getABoundPath()) }
 
   /**
@@ -950,6 +1168,8 @@ class TypeParamItemNode extends TypeItemNode instanceof TypeParam {
 
   override Visibility getVisibility() { none() }
 
+  override Attr getAnAttr() { result = TypeParam.super.getAnAttr() }
+
   override TypeParam getTypeParam(int i) { none() }
 
   override Location getLocation() { result = TypeParam.super.getName().getLocation() }
@@ -959,6 +1179,81 @@ class TypeParamItemNode extends TypeItemNode instanceof TypeParam {
   override string getCanonicalPath(Crate c) { none() }
 }
 
+final private class TypeParamItemNodeImpl extends TypeParamItemNode instanceof TypeParam {
+  /** Gets a where predicate for this type parameter, if any */
+  pragma[nomagic]
+  private WherePred getAWherePredCand() {
+    exists(ItemNode declaringItem |
+      this = resolvePathCand(getWherePredPath(result)) and
+      result = declaringItem.getADescendant() and
+      this = declaringItem.getADescendant()
+    )
+  }
+
+  pragma[nomagic]
+  TypeBound getTypeBoundAtCand(int i, int j) {
+    exists(TypeBoundList tbl | result = tbl.getBound(j) |
+      tbl = super.getTypeBoundList() and i = 0
+      or
+      exists(WherePred wp |
+        wp = this.getAWherePredCand() and
+        tbl = wp.getTypeBoundList() and
+        wp = any(WhereClause wc).getPredicate(i)
+      )
+    )
+  }
+
+  pragma[nomagic]
+  Path getABoundPathCand() {
+    result = this.getTypeBoundAtCand(_, _).getTypeRepr().(PathTypeRepr).getPath()
+  }
+
+  pragma[nomagic]
+  ItemNode resolveABoundCand() { result = resolvePathCand(this.getABoundPathCand()) }
+}
+
+abstract private class MacroItemNode extends ItemNode {
+  override Namespace getNamespace() { result.isMacro() }
+
+  override TypeParam getTypeParam(int i) { none() }
+
+  override predicate hasCanonicalPath(Crate c) { this.hasCanonicalPathPrefix(c) }
+
+  bindingset[c]
+  private string getCanonicalPathPart(Crate c, int i) {
+    i = 0 and
+    result = this.getCanonicalPathPrefix(c)
+    or
+    i = 1 and
+    result = "::"
+    or
+    i = 2 and
+    result = this.getName()
+  }
+
+  language[monotonicAggregates]
+  override string getCanonicalPath(Crate c) {
+    this.hasCanonicalPath(c) and
+    result = strictconcat(int i | i in [0 .. 2] | this.getCanonicalPathPart(c, i) order by i)
+  }
+}
+
+private class MacroRulesItemNode extends MacroItemNode instanceof MacroRules {
+  override string getName() { result = MacroRules.super.getName().getText() }
+
+  override Visibility getVisibility() { result = MacroRules.super.getVisibility() }
+
+  override Attr getAnAttr() { result = MacroRules.super.getAnAttr() }
+}
+
+private class MacroDefItemNode extends MacroItemNode instanceof MacroDef {
+  override string getName() { result = MacroDef.super.getName().getText() }
+
+  override Visibility getVisibility() { result = MacroDef.super.getVisibility() }
+
+  override Attr getAnAttr() { result = MacroDef.super.getAnAttr() }
+}
+
 /** Holds if `item` has the name `name` and is a top-level item inside `f`. */
 private predicate sourceFileEdge(SourceFile f, string name, ItemNode item) {
   item = f.(ItemNode).getADescendant() and
@@ -1090,10 +1385,12 @@ predicate fileImport(Module m, SourceFile f) {
  * in scope under the name `name`.
  */
 pragma[nomagic]
-private predicate fileImportEdge(Module mod, string name, ItemNode item) {
+private predicate fileImportEdge(
+  Module mod, string name, ItemNode item, SuccessorKind kind, UseOption useOpt
+) {
   exists(SourceFileItemNode f |
     fileImport(mod, f) and
-    item = f.getASuccessorRec(name)
+    item = f.getASuccessor(name, kind, useOpt)
   )
 }
 
@@ -1101,26 +1398,60 @@ private predicate fileImportEdge(Module mod, string name, ItemNode item) {
  * Holds if crate `c` defines the item `i` named `name`.
  */
 pragma[nomagic]
-private predicate crateDefEdge(CrateItemNode c, string name, ItemNode i) {
-  i = c.getSourceFile().getASuccessorRec(name) and
-  not i instanceof Crate
+private predicate crateDefEdge(
+  CrateItemNode c, string name, ItemNode i, SuccessorKind kind, UseOption useOpt
+) {
+  i = c.getSourceFile().getASuccessor(name, kind, useOpt) and
+  kind.isExternalOrBoth()
 }
 
 private class BuiltinSourceFile extends SourceFileItemNode {
   BuiltinSourceFile() { this.getFile().getParentContainer() instanceof Builtins::BuiltinsFolder }
 }
 
+pragma[nomagic]
+private predicate crateDependency(SourceFileItemNode file, string name, CrateItemNode dep) {
+  exists(CrateItemNode c | dep = c.(Crate).getDependency(name) | file = c.getASourceFile())
+}
+
+pragma[nomagic]
+private predicate hasDeclOrDep(SourceFileItemNode file, string name) {
+  declaresDirectly(file, TTypeNamespace(), name) or
+  crateDependency(file, name, _)
+}
+
 /**
  * Holds if `file` depends on crate `dep` named `name`.
  */
 pragma[nomagic]
 private predicate crateDependencyEdge(SourceFileItemNode file, string name, CrateItemNode dep) {
-  exists(CrateItemNode c | dep = c.(Crate).getDependency(name) | file = c.getASourceFile())
+  crateDependency(file, name, dep)
   or
-  // Give builtin files access to `std`
-  file instanceof BuiltinSourceFile and
-  dep.getName() = name and
-  name = "std"
+  // As a fallback, give all files access to crates that do not conflict with known dependencies
+  // and declarations. This is in order to workaround incomplete crate dependency information
+  // provided by the extractor, as well as `CrateItemNode.getASourceFile()` being unable to map
+  // a given file to its crate (for example, if the file is `mod` imported inside a macro that the
+  // extractor is unable to expand).
+  name = dep.getName() and
+  not hasDeclOrDep(file, name)
+}
+
+/**
+ * Gets a `UseTree` that is nested under `tree`, and which needs to be resolved
+ * relative to the path of `tree`.
+ *
+ * `tree` is restricted to either having a path or being a direct child of some
+ * `use` statement without a path.
+ */
+private UseTree getAUseTreeUseTree(UseTree tree) {
+  result = tree.getUseTreeList().getAUseTree() and
+  (if tree.hasPath() then any() else tree = any(Use u).getUseTree())
+  or
+  exists(UseTree mid |
+    mid = getAUseTreeUseTree(tree) and
+    not mid.hasPath() and
+    result = mid.getUseTreeList().getAUseTree()
+  )
 }
 
 private predicate useTreeDeclares(UseTree tree, string name) {
@@ -1136,7 +1467,20 @@ private predicate useTreeDeclares(UseTree tree, string name) {
   or
   exists(UseTree mid |
     useTreeDeclares(mid, name) and
-    mid = tree.getUseTreeList().getAUseTree()
+    mid = getAUseTreeUseTree(tree)
+  )
+}
+
+/**
+ * Holds if `item` explicitly declares a sub item named `name` in the
+ * namespace `ns`. This excludes items declared by `use` statements.
+ */
+pragma[nomagic]
+private predicate declaresDirectly(ItemNode item, Namespace ns, string name) {
+  exists(ItemNode child, SuccessorKind kind |
+    child = getAChildSuccessor(item, name, kind) and
+    child.getNamespace() = ns and
+    kind.isInternalOrBoth()
   )
 }
 
@@ -1147,12 +1491,10 @@ private predicate useTreeDeclares(UseTree tree, string name) {
  */
 pragma[nomagic]
 private predicate declares(ItemNode item, Namespace ns, string name) {
-  exists(ItemNode child | child.getImmediateParent() = item |
-    child.getName() = name and
-    child.getNamespace() = ns and
-    // If `item` is excluded locally then it does not declare `name`.
-    not item.excludedLocally(name, child)
-    or
+  declaresDirectly(item, ns, name)
+  or
+  exists(ItemNode child |
+    child.getImmediateParent() = item and
     useTreeDeclares(child.(Use).getUseTree(), name) and
     exists(ns) // `use foo::bar` can refer to both a value and a type
   )
@@ -1162,25 +1504,35 @@ private predicate declares(ItemNode item, Namespace ns, string name) {
 class RelevantPath extends Path {
   RelevantPath() { not this = any(VariableAccess va).(PathExpr).getPath() }
 
+  /** Holds if this is an unqualified path with the textual value `name`. */
   pragma[nomagic]
   predicate isUnqualified(string name) {
     not exists(this.getQualifier()) and
-    not this = any(UseTreeList list).getAUseTree().getPath() and
+    not exists(UseTree tree |
+      tree.hasPath() and
+      this = getAUseTreeUseTree(tree).getPath().getQualifier*()
+    ) and
     name = this.getText()
   }
 
+  /**
+   * Holds if this is an unqualified path with the textual value `name` and
+   * enclosing item `encl`.
+   */
   pragma[nomagic]
-  predicate isCratePath(string name, ItemNode encl) {
-    name = ["crate", "$crate"] and
+  predicate isUnqualified(string name, ItemNode encl) {
     this.isUnqualified(name) and
     encl.getADescendant() = this
   }
 
   pragma[nomagic]
-  predicate isDollarCrateQualifiedPath(string name) {
-    this.getQualifier().(RelevantPath).isCratePath("$crate", _) and
-    this.getText() = name
+  predicate isCratePath(string name, ItemNode encl) {
+    name = "crate" and
+    this.isUnqualified(name, encl)
   }
+
+  pragma[nomagic]
+  predicate isDollarCrate() { this.isUnqualified("$crate", _) }
 }
 
 private predicate isModule(ItemNode m) { m instanceof Module }
@@ -1200,32 +1552,43 @@ private ItemNode getOuterScope(ItemNode i) {
 }
 
 /**
- * Holds if the unqualified path `p` references an item named `name`, and `name`
- * may be looked up in the `ns` namespace inside enclosing item `encl`.
+ * Holds if _some_ unqualified path in `encl` references an item named `name`,
+ * and `name` may be looked up in the `ns` namespace inside `ancestor`.
  */
 pragma[nomagic]
-private predicate unqualifiedPathLookup(ItemNode encl, string name, Namespace ns, RelevantPath p) {
+private predicate unqualifiedPathLookup(ItemNode ancestor, string name, Namespace ns, ItemNode encl) {
   // lookup in the immediately enclosing item
-  p.isUnqualified(name) and
-  encl.getADescendant() = p and
-  exists(ns) and
-  not name = ["crate", "$crate", "super", "self"]
+  exists(RelevantPath path |
+    path.isUnqualified(name, encl) and
+    ancestor = encl and
+    not name = ["crate", "$crate", "super", "self"]
+  |
+    pathUsesNamespace(path, ns)
+    or
+    not pathUsesNamespace(path, _)
+  )
   or
   // lookup in an outer scope, but only if the item is not declared in inner scope
   exists(ItemNode mid |
-    unqualifiedPathLookup(mid, name, ns, p) and
+    unqualifiedPathLookup(mid, name, ns, encl) and
     not declares(mid, ns, name) and
     not (
       name = "Self" and
       mid = any(ImplOrTraitItemNode i).getAnItemInSelfScope()
-    ) and
-    encl = getOuterScope(mid)
+    )
+  |
+    ancestor = getOuterScope(mid)
+    or
+    ns.isMacro() and
+    ancestor = mid.getImmediateParentModule()
   )
 }
 
 pragma[nomagic]
-private ItemNode getASuccessor(ItemNode pred, string name, Namespace ns) {
-  result = pred.getASuccessor(name) and
+private ItemNode getASuccessor(
+  ItemNode pred, string name, Namespace ns, SuccessorKind kind, UseOption useOpt
+) {
+  result = pred.getASuccessor(name, kind, useOpt) and
   ns = result.getNamespace()
 }
 
@@ -1240,57 +1603,226 @@ private predicate sourceFileHasCratePathTc(ItemNode i1, ItemNode i2) =
 
 /**
  * Holds if the unqualified path `p` references a keyword item named `name`, and
- * `name` may be looked up inside enclosing item `encl`.
+ * `name` may be looked up inside `ancestor`.
  */
 pragma[nomagic]
-private predicate keywordLookup(ItemNode encl, string name, RelevantPath p) {
-  // For `($)crate`, jump directly to the root module
+private predicate keywordLookup(ItemNode ancestor, string name, RelevantPath p) {
+  // For `crate`, jump directly to the root module
   exists(ItemNode i | p.isCratePath(name, i) |
-    encl instanceof SourceFile and
-    encl = i
+    ancestor instanceof SourceFile and
+    ancestor = i
     or
-    sourceFileHasCratePathTc(encl, i)
+    sourceFileHasCratePathTc(ancestor, i)
   )
   or
   name = ["super", "self"] and
-  p.isUnqualified(name) and
-  encl.getADescendant() = p
+  p.isUnqualified(name, ancestor)
 }
 
 pragma[nomagic]
-private ItemNode unqualifiedPathLookup(RelevantPath p, Namespace ns) {
-  exists(ItemNode encl, string name |
-    result = getASuccessor(encl, name, ns) and not encl.excludedLocally(name, result)
+private ItemNode unqualifiedPathLookup(RelevantPath p, Namespace ns, SuccessorKind kind) {
+  exists(ItemNode ancestor, string name |
+    result = getASuccessor(ancestor, pragma[only_bind_into](name), ns, kind, _) and
+    kind.isInternalOrBoth()
   |
-    unqualifiedPathLookup(encl, name, ns, p)
+    exists(ItemNode encl |
+      unqualifiedPathLookup(ancestor, name, ns, encl) and
+      p.isUnqualified(pragma[only_bind_into](name), encl)
+    )
     or
-    keywordLookup(encl, name, p) and exists(ns)
+    keywordLookup(ancestor, name, p) and exists(ns)
   )
 }
 
 pragma[nomagic]
 private predicate isUnqualifiedSelfPath(RelevantPath path) { path.isUnqualified("Self") }
 
+/** Provides the input to `TraitIsVisible`. */
+signature predicate relevantTraitVisibleSig(Element element, Trait trait);
+
+/**
+ * Provides the `traitIsVisible` predicate for determining if a trait is visible
+ * at a given element.
+ */
+module TraitIsVisible<relevantTraitVisibleSig/2 relevantTraitVisible> {
+  private newtype TNode =
+    TTrait(Trait t) { relevantTraitVisible(_, t) } or
+    TItemNode(ItemNode i) or
+    TElement(Element e) { relevantTraitVisible(e, _) }
+
+  private predicate isTrait(TNode n) { n instanceof TTrait }
+
+  private predicate step(TNode n1, TNode n2) {
+    exists(Trait t1, ItemNode i2 |
+      n1 = TTrait(t1) and
+      n2 = TItemNode(i2) and
+      t1 = i2.getASuccessor(_, _, _)
+    )
+    or
+    exists(ItemNode i1, ItemNode i2 |
+      n1 = TItemNode(i1) and
+      n2 = TItemNode(i2) and
+      i1 = getOuterScope(i2)
+    )
+    or
+    exists(ItemNode i1, Element e2 |
+      n1 = TItemNode(i1) and
+      n2 = TElement(e2) and
+      i1.getADescendant() = e2
+    )
+  }
+
+  private predicate isElement(TNode n) { n instanceof TElement }
+
+  private predicate traitIsVisibleTC(TNode trait, TNode element) =
+    doublyBoundedFastTC(step/2, isTrait/1, isElement/1)(trait, element)
+
+  pragma[nomagic]
+  private predicate relevantTraitVisibleLift(TNode trait, TElement element) {
+    exists(Trait t, Element e |
+      trait = TTrait(t) and
+      element = TElement(e) and
+      relevantTraitVisible(e, t)
+    )
+  }
+
+  /** Holds if the trait `trait` is visible at `element`. */
+  pragma[nomagic]
+  predicate traitIsVisible(Element element, Trait trait) {
+    exists(TNode t, TNode e |
+      traitIsVisibleTC(t, e) and
+      relevantTraitVisibleLift(t, e) and
+      t = TTrait(trait) and
+      e = TElement(element)
+    )
+  }
+}
+
+private module DollarCrateResolution {
+  pragma[nomagic]
+  private predicate isDollarCrateSupportedMacroExpansion(Path macroDefPath, AstNode expansion) {
+    exists(MacroCall mc |
+      expansion = mc.getMacroCallExpansion() and
+      macroDefPath = mc.getPath()
+    )
+    or
+    exists(ItemNode adt |
+      expansion = adt.(Adt).getDeriveMacroExpansion(_) and
+      macroDefPath = adt.getAttr("derive").getMeta().getPath()
+    )
+  }
+
+  private predicate hasParent(AstNode child, AstNode parent) { parent = child.getParentNode() }
+
+  private predicate isDollarCrateSupportedMacroExpansion(AstNode expansion) {
+    isDollarCrateSupportedMacroExpansion(_, expansion)
+  }
+
+  private predicate isDollarCratePath(RelevantPath p) { p.isDollarCrate() }
+
+  private predicate isInDollarCrateMacroExpansion(RelevantPath p, AstNode expansion) =
+    doublyBoundedFastTC(hasParent/2, isDollarCratePath/1, isDollarCrateSupportedMacroExpansion/1)(p,
+      expansion)
+
+  pragma[nomagic]
+  private predicate isInDollarCrateMacroExpansionFromFile(File macroDefFile, RelevantPath p) {
+    exists(Path macroDefPath, AstNode expansion |
+      isDollarCrateSupportedMacroExpansion(macroDefPath, expansion) and
+      isInDollarCrateMacroExpansion(p, expansion) and
+      macroDefFile = resolvePathCand(macroDefPath).getFile()
+    )
+  }
+
+  /**
+   * Holds if `p` is a `$crate` path, and it may resolve to `crate`.
+   *
+   * The reason why we cannot be sure is that we need to consider all ancestor macro
+   * calls.
+   */
+  pragma[nomagic]
+  predicate resolveDollarCrate(RelevantPath p, CrateItemNode crate) {
+    isInDollarCrateMacroExpansionFromFile(crate.getASourceFile().getFile(), p)
+  }
+}
+
 pragma[nomagic]
-private ItemNode resolvePath0(RelevantPath path, Namespace ns) {
+private ItemNode resolvePathCand0(RelevantPath path, Namespace ns) {
   exists(ItemNode res |
-    res = unqualifiedPathLookup(path, ns) and
+    res = unqualifiedPathLookup(path, ns, _) and
     if
       not any(RelevantPath parent).getQualifier() = path and
       isUnqualifiedSelfPath(path) and
       res instanceof ImplItemNode
-    then result = res.(ImplItemNode).resolveSelfTy()
+    then result = res.(ImplItemNodeImpl).resolveSelfTyCand()
     else result = res
   )
   or
-  exists(ItemNode q, string name |
-    q = resolvePathQualifier(path, name) and
-    result = getASuccessor(q, name, ns) and
-    not q.excludedExternally(name, result)
-  )
-  or
-  result = resolveUseTreeListItem(_, _, path) and
+  DollarCrateResolution::resolveDollarCrate(path, result) and
   ns = result.getNamespace()
+  or
+  result = resolvePathCandQualified(_, _, path, ns)
+  or
+  result = resolveUseTreeListItem(_, _, path, _) and
+  ns = result.getNamespace()
+}
+
+pragma[nomagic]
+private ItemNode resolvePathCandQualifier(RelevantPath qualifier, RelevantPath path, string name) {
+  qualifier = path.getQualifier() and
+  result = resolvePathCand(qualifier) and
+  name = path.getText()
+}
+
+bindingset[l]
+pragma[inline_late]
+private ModuleLikeNode getAnAncestorModule(Locatable l) {
+  exists(ItemNode encl |
+    encl.getADescendant() = l and
+    result = encl.getImmediateParentModule*()
+  )
+}
+
+bindingset[i]
+pragma[inline_late]
+private ModuleLikeNode getParent(ItemNode i) { result = i.getImmediateParent() }
+
+/**
+ * Holds if resolving a qualified path at `l` to the item `i` with successor kind
+ * `kind` respects visibility.
+ *
+ * This is the case when either `i` is externally visible (e.g. a `pub` function),
+ * or when `i` (or the `use` statement, `useOpt`, that brought `i` into scope) is
+ * in an ancestor module of `l`.
+ */
+bindingset[l, i, kind, useOpt]
+pragma[inline_late]
+private predicate checkQualifiedVisibility(
+  Locatable l, ItemNode i, SuccessorKind kind, UseOption useOpt
+) {
+  kind.isExternalOrBoth()
+  or
+  exists(AstNode n | getAnAncestorModule(l) = getParent(n) |
+    n = useOpt.asSome()
+    or
+    useOpt.isNone() and
+    n = i
+  ) and
+  not i instanceof TypeParam
+}
+
+/**
+ * Gets the item that `path` resolves to in `ns` when `qualifier` is the
+ * qualifier of `path` and `qualifier` resolves to `q`, if any.
+ */
+pragma[nomagic]
+private ItemNode resolvePathCandQualified(
+  RelevantPath qualifier, ItemNode q, RelevantPath path, Namespace ns
+) {
+  exists(string name, SuccessorKind kind, UseOption useOpt |
+    q = resolvePathCandQualifier(qualifier, path, name) and
+    result = getASuccessor(q, name, ns, kind, useOpt) and
+    checkQualifiedVisibility(path, result, kind, useOpt)
+  )
 }
 
 /** Holds if path `p` must be looked up in namespace `n`. */
@@ -1321,23 +1853,120 @@ private predicate pathUsesNamespace(Path p, Namespace n) {
     or
     p = any(Path parent).getQualifier()
   )
+  or
+  n.isMacro() and
+  (
+    p = any(MacroCall mc).getPath()
+    or
+    p = any(Meta m).getPath()
+  )
+}
+
+/**
+ * Holds if crate `crate` exports the macro `macro` named `name` using
+ * a `#[macro_export]` attribute.
+ *
+ * See https://lukaswirth.dev/tlborm/decl-macros/minutiae/import-export.html.
+ */
+pragma[nomagic]
+private predicate macroExportEdge(CrateItemNode crate, string name, MacroItemNode macro) {
+  crate.getASourceFile().getFile() = macro.getFile() and
+  macro.hasAttr("macro_export") and
+  name = macro.getName()
+}
+
+/**
+ * Holds if item `i` contains a `mod` or `extern crate` definition that
+ * makes the macro `macro` named `name` available using a `#[macro_use]`
+ * attribute.
+ *
+ * See https://lukaswirth.dev/tlborm/decl-macros/minutiae/import-export.html.
+ */
+pragma[nomagic]
+private predicate macroUseEdge(
+  ItemNode i, string name, SuccessorKind kind, UseOption useOpt, MacroItemNode macro
+) {
+  exists(ItemNode m |
+    m = i.getASuccessor(_, _, useOpt) and
+    m.hasAttr("macro_use")
+  |
+    macro = m.(ModuleItemNode).getASuccessor(name, kind, _)
+    or
+    macro = m.(ExternCrateItemNode).getASuccessor(_, _, _).getASuccessor(name, kind, _)
+  )
+}
+
+/**
+ * Gets an item that `path` may resolve to, if any.
+ *
+ * Unlike `resolvePath`, this predicate does not attempt to make resolution
+ * of qualifiers consistent with resolution of their parents, and should
+ * only be used internally within this library.
+ *
+ * Note that the path resolution logic cannot use `resolvePath`, as that would
+ * result in non-monotonic recursion.
+ */
+pragma[nomagic]
+private ItemNode resolvePathCand(RelevantPath path) {
+  exists(Namespace ns |
+    result = resolvePathCand0(path, ns) and
+    if path = any(ImplItemNode i).getSelfPath()
+    then
+      result instanceof TypeItemNode and
+      not result instanceof TraitItemNode
+    else
+      if path = any(ImplItemNode i).getTraitPath()
+      then result instanceof TraitItemNode
+      else
+        if path = any(PathTypeRepr p).getPath()
+        then result instanceof TypeItemNode
+        else any()
+  |
+    pathUsesNamespace(path, ns)
+    or
+    not pathUsesNamespace(path, _)
+  ) and
+  (
+    not path = CallExprImpl::getFunctionPath(_)
+    or
+    exists(CallExpr ce |
+      path = CallExprImpl::getFunctionPath(ce) and
+      result.(ParameterizableItemNode).getArity() = ce.getNumberOfArgs()
+    )
+  )
+}
+
+/** Get a trait that should be visible when `path` resolves to `node`, if any. */
+private Trait getResolvePathTraitUsed(RelevantPath path, AssocItemNode node) {
+  exists(TypeItemNode type, ImplItemNodeImpl impl |
+    node = resolvePathCandQualified(_, type, path, _) and
+    typeImplEdge(type, impl, _, _, node, _) and
+    result = impl.resolveTraitTyCand()
+  )
+}
+
+private predicate pathTraitUsed(Element path, Trait trait) {
+  trait = getResolvePathTraitUsed(path, _)
 }
 
 /** Gets the item that `path` resolves to, if any. */
 cached
 ItemNode resolvePath(RelevantPath path) {
-  exists(Namespace ns | result = resolvePath0(path, ns) |
-    pathUsesNamespace(path, ns)
+  result = resolvePathCand(path) and
+  not path = any(Path parent | exists(resolvePathCand(parent))).getQualifier() and
+  (
+    // When the result is an associated item of a trait implementation the
+    // implemented trait must be visible.
+    TraitIsVisible<pathTraitUsed/2>::traitIsVisible(path, getResolvePathTraitUsed(path, result))
     or
-    not pathUsesNamespace(path, _) and
-    not path = any(MacroCall mc).getPath()
+    not exists(getResolvePathTraitUsed(path, result))
+  )
+  or
+  // if `path` is the qualifier of a resolvable `parent`, then we should
+  // resolve `path` to something consistent with what `parent` resolves to
+  exists(RelevantPath parent |
+    resolvePathCandQualified(path, result, parent, _) = resolvePath(parent)
   )
-}
-
-pragma[nomagic]
-private ItemNode resolvePathQualifier(RelevantPath path, string name) {
-  result = resolvePath(path.getQualifier()) and
-  name = path.getText()
 }
 
 private predicate isUseTreeSubPath(UseTree tree, RelevantPath path) {
@@ -1357,17 +1986,19 @@ private predicate isUseTreeSubPathUnqualified(UseTree tree, RelevantPath path, s
 }
 
 pragma[nomagic]
-private ItemNode resolveUseTreeListItem(Use use, UseTree tree, RelevantPath path) {
-  exists(UseTree midTree, ItemNode mid, string name |
-    mid = resolveUseTreeListItem(use, midTree) and
-    tree = midTree.getUseTreeList().getAUseTree() and
-    isUseTreeSubPathUnqualified(tree, path, pragma[only_bind_into](name)) and
-    result = mid.getASuccessor(pragma[only_bind_into](name))
-  )
-  or
-  exists(ItemNode q, string name |
-    q = resolveUseTreeListItemQualifier(use, tree, path, name) and
-    result = q.getASuccessor(name)
+private ItemNode resolveUseTreeListItem(Use use, UseTree tree, RelevantPath path, SuccessorKind kind) {
+  exists(UseOption useOpt | checkQualifiedVisibility(use, result, kind, useOpt) |
+    exists(UseTree midTree, ItemNode mid, string name |
+      mid = resolveUseTreeListItem(use, midTree) and
+      tree = getAUseTreeUseTree(midTree) and
+      isUseTreeSubPathUnqualified(tree, path, pragma[only_bind_into](name)) and
+      result = mid.getASuccessor(pragma[only_bind_into](name), kind, useOpt)
+    )
+    or
+    exists(ItemNode q, string name |
+      q = resolveUseTreeListItemQualifier(use, tree, path, name) and
+      result = q.getASuccessor(name, kind, useOpt)
+    )
   )
 }
 
@@ -1375,41 +2006,70 @@ pragma[nomagic]
 private ItemNode resolveUseTreeListItemQualifier(
   Use use, UseTree tree, RelevantPath path, string name
 ) {
-  result = resolveUseTreeListItem(use, tree, path.getQualifier()) and
+  result = resolveUseTreeListItem(use, tree, path.getQualifier(), _) and
   name = path.getText()
 }
 
+private UseTree getAUseUseTree(Use use) {
+  exists(UseTree root | root = use.getUseTree() |
+    if root.hasPath() then result = root else result = getAUseTreeUseTree(root)
+  )
+}
+
 pragma[nomagic]
 private ItemNode resolveUseTreeListItem(Use use, UseTree tree) {
-  tree = use.getUseTree() and
-  result = resolvePath(tree.getPath())
+  exists(Path path | path = tree.getPath() |
+    tree = getAUseUseTree(use) and
+    result = resolvePathCand(path)
+    or
+    result = resolveUseTreeListItem(use, tree, path, _)
+  )
   or
-  result = resolveUseTreeListItem(use, tree, tree.getPath())
+  exists(UseTree midTree |
+    // `use foo::{bar, *}`; midTree = `foo` and tree = `*`
+    result = resolveUseTreeListItem(use, midTree) and
+    tree = getAUseTreeUseTree(midTree) and
+    tree.isGlob() and
+    not tree.hasPath()
+  )
 }
 
 /** Holds if `use` imports `item` as `name`. */
 pragma[nomagic]
-private predicate useImportEdge(Use use, string name, ItemNode item) {
+private predicate useImportEdge(Use use, string name, ItemNode item, SuccessorKind kind) {
+  (if use.hasVisibility() then kind.isBoth() else kind.isInternal()) and
   exists(UseTree tree, ItemNode used |
     used = resolveUseTreeListItem(use, tree) and
     not tree.hasUseTreeList() and
     if tree.isGlob()
     then
-      exists(ItemNode encl, Namespace ns |
+      exists(ItemNode encl, Namespace ns, SuccessorKind kind1, UseOption useOpt |
         encl.getADescendant() = use and
-        item = getASuccessor(used, name, ns) and
+        item = getASuccessor(used, name, ns, kind1, useOpt) and
+        checkQualifiedVisibility(use, item, kind1, useOpt) and
         // glob imports can be shadowed
         not declares(encl, ns, name) and
-        not name = ["super", "self", "Self", "$crate", "crate"]
+        not name = ["super", "self"]
       )
     else (
       item = used and
       (
         not tree.hasRename() and
-        name = item.getName()
+        exists(string pathName |
+          pathName = tree.getPath().getText() and
+          if pathName = "self" then name = item.getName() else name = pathName
+        )
         or
-        name = tree.getRename().getName().getText() and
-        name != "_"
+        exists(Rename rename | rename = tree.getRename() |
+          name = rename.getName().getText()
+          or
+          // When the rename doesn't have a name it's an underscore import. This
+          // makes the imported item visible but unnameable. We represent this
+          // by using the name `_` which can never occur in a path.  See also:
+          // https://doc.rust-lang.org/reference/items/use-declarations.html#r-items.use.as-underscore
+          not rename.hasName() and
+          name = "_"
+        )
       )
     )
   )
@@ -1431,15 +2091,33 @@ private predicate externCrateEdge(ExternCrateItemNode ec, string name, CrateItem
   )
 }
 
+/**
+ * Holds if `typeItem` is the implementing type of `impl` and the implementation
+ * makes `assoc` available as `name` at `kind`.
+ */
+private predicate typeImplEdge(
+  TypeItemNode typeItem, ImplItemNodeImpl impl, string name, SuccessorKind kind,
+  AssocItemNode assoc, UseOption useOpt
+) {
+  typeItem = impl.resolveSelfTyCand() and
+  assoc = impl.getASuccessor(name, kind, useOpt) and
+  kind.isExternalOrBoth()
+}
+
 pragma[nomagic]
 private predicate preludeItem(string name, ItemNode i) {
-  exists(Crate stdOrCore, ModuleLikeNode mod, ModuleItemNode prelude, ModuleItemNode rust |
-    stdOrCore.getName() = ["std", "core"] and
-    mod = stdOrCore.getSourceFile() and
-    prelude = mod.getASuccessorRec("prelude") and
-    rust = prelude.getASuccessorRec(["rust_2015", "rust_2018", "rust_2021", "rust_2024"]) and
-    i = rust.getASuccessorRec(name) and
-    not i instanceof Use
+  exists(Crate stdOrCore | stdOrCore.getName() = ["std", "core"] |
+    exists(ModuleLikeNode mod, ModuleItemNode prelude, ModuleItemNode rust |
+      mod = stdOrCore.getSourceFile() and
+      prelude = mod.getASuccessor("prelude") and
+      rust = prelude.getASuccessor(["rust_2015", "rust_2018", "rust_2021", "rust_2024"]) and
+      i = rust.getASuccessor(name) and
+      not name = ["super", "self"]
+    )
+    or
+    macroExportEdge(stdOrCore, name, i)
+    or
+    macroUseEdge(stdOrCore, name, _, _, i)
   )
 }
 
@@ -1456,20 +2134,20 @@ private predicate preludeItem(string name, ItemNode i) {
 pragma[nomagic]
 private predicate preludeEdge(SourceFile f, string name, ItemNode i) {
   preludeItem(name, i) and
-  not declares(f, _, name)
+  not declares(f, i.getNamespace(), name)
 }
 
 pragma[nomagic]
 private predicate builtin(string name, ItemNode i) {
   exists(BuiltinSourceFile builtins |
     builtins.getFile().getBaseName() = "types.rs" and
-    i = builtins.getASuccessorRec(name)
+    i = builtins.getASuccessor(name)
   )
 }
 
 /** Provides predicates for debugging the path resolution implementation. */
 private module Debug {
-  private Locatable getRelevantLocatable() {
+  Locatable getRelevantLocatable() {
     exists(string filepath, int startline, int startcolumn, int endline, int endcolumn |
       result.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn) and
       filepath.matches("%/main.rs") and
@@ -1478,31 +2156,46 @@ private module Debug {
   }
 
   predicate debugUnqualifiedPathLookup(
-    RelevantPath p, string name, Namespace ns, ItemNode encl, string path
+    RelevantPath p, string name, Namespace ns, ItemNode ancestor, string path
   ) {
     p = getRelevantLocatable() and
-    unqualifiedPathLookup(encl, name, ns, p) and
+    exists(ItemNode encl |
+      unqualifiedPathLookup(ancestor, name, ns, encl) and
+      p.isUnqualified(name, encl)
+    ) and
     path = p.toStringDebug()
   }
 
+  predicate debugItemNode(ItemNode item) { item = getRelevantLocatable() }
+
   ItemNode debugResolvePath(RelevantPath path) {
     path = getRelevantLocatable() and
     result = resolvePath(path)
   }
 
-  predicate debugUseImportEdge(Use use, string name, ItemNode item) {
+  ItemNode debugResolveUseTreeListItem(Use use, UseTree tree, RelevantPath path, SuccessorKind kind) {
     use = getRelevantLocatable() and
-    useImportEdge(use, name, item)
+    result = resolveUseTreeListItem(use, tree, path, kind)
   }
 
-  ItemNode debugGetASuccessorRec(ItemNode i, string name) {
+  ItemNode debugResolveUseTreeListItem(Use use, UseTree tree) {
+    use = getRelevantLocatable() and
+    result = resolveUseTreeListItem(use, tree)
+  }
+
+  predicate debugUseImportEdge(Use use, string name, ItemNode item, SuccessorKind kind) {
+    use = getRelevantLocatable() and
+    useImportEdge(use, name, item, kind)
+  }
+
+  ItemNode debugGetASuccessor(ItemNode i, string name, SuccessorKind kind) {
     i = getRelevantLocatable() and
-    result = i.getASuccessor(name)
+    result = i.getASuccessor(name, kind, _)
   }
 
-  predicate debugFileImportEdge(Module mod, string name, ItemNode item) {
+  predicate debugFileImportEdge(Module mod, string name, ItemNode item, SuccessorKind kind) {
     mod = getRelevantLocatable() and
-    fileImportEdge(mod, name, item)
+    fileImportEdge(mod, name, item, kind, _)
   }
 
   predicate debugFileImport(Module m, SourceFile f) {
diff --git a/rust/ql/lib/codeql/rust/internal/PathResolutionConsistency.qll b/rust/ql/lib/codeql/rust/internal/PathResolutionConsistency.qll
index 9b7131b7a7f..1c8ac649df3 100644
--- a/rust/ql/lib/codeql/rust/internal/PathResolutionConsistency.qll
+++ b/rust/ql/lib/codeql/rust/internal/PathResolutionConsistency.qll
@@ -9,8 +9,8 @@ private import PathResolution
 query predicate multiplePathResolutions(Path p, ItemNode i) {
   p.fromSource() and
   i = resolvePath(p) and
-  // known limitation for `$crate`
-  not p.getQualifier*().(RelevantPath).isUnqualified("$crate") and
+  // `panic` is defined in both `std` and `core`; both are included in the prelude
+  not p.getText() = "panic" and
   // `use foo::bar` may use both a type `bar` and a value `bar`
   not p =
     any(UseTree use |
@@ -19,7 +19,9 @@ query predicate multiplePathResolutions(Path p, ItemNode i) {
     ).getPath() and
   // avoid overlap with `multipleCallTargets` below
   not p = any(CallExpr ce).getFunction().(PathExpr).getPath() and
-  strictcount(resolvePath(p)) > 1
+  // exclude crates when counting: crates can exist in many versions and configurations,
+  // we deliberately want to exhibit them all
+  strictcount(ItemNode i0 | i0 = resolvePath(p) and not i0 instanceof Crate) > 1
 }
 
 /** Holds if `call` has multiple static call targets including `target`. */
diff --git a/rust/ql/lib/codeql/rust/internal/Type.qll b/rust/ql/lib/codeql/rust/internal/Type.qll
index 88eb50e09e3..4b3f6e6ccb9 100644
--- a/rust/ql/lib/codeql/rust/internal/Type.qll
+++ b/rust/ql/lib/codeql/rust/internal/Type.qll
@@ -6,6 +6,7 @@ private import TypeMention
 private import codeql.rust.internal.CachedStages
 private import codeql.rust.elements.internal.generated.Raw
 private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.frameworks.stdlib.Stdlib
 
 /**
  * Holds if a dyn trait type should have a type parameter associated with `n`. A
@@ -42,11 +43,15 @@ newtype TType =
   TStruct(Struct s) or
   TEnum(Enum e) or
   TTrait(Trait t) or
+  TUnion(Union u) or
   TArrayType() or // todo: add size?
   TRefType() or // todo: add mut?
   TImplTraitType(ImplTraitTypeRepr impl) or
   TDynTraitType(Trait t) { t = any(DynTraitTypeRepr dt).getTrait() } or
   TSliceType() or
+  TNeverType() or
+  TPtrType() or
+  TUnknownType() or
   TTupleTypeParameter(int arity, int i) { exists(TTuple(arity)) and i in [0 .. arity - 1] } or
   TTypeParamTypeParameter(TypeParam t) or
   TAssociatedTypeTypeParameter(TypeAlias t) { any(TraitItemNode trait).getAnAssocItem() = t } or
@@ -57,7 +62,8 @@ newtype TType =
   } or
   TRefTypeParameter() or
   TSelfTypeParameter(Trait t) or
-  TSliceTypeParameter()
+  TSliceTypeParameter() or
+  TPtrTypeParameter()
 
 private predicate implTraitTypeParam(ImplTraitTypeRepr implTrait, int i, TypeParam tp) {
   implTrait.isInReturnPos() and
@@ -74,22 +80,23 @@ private predicate implTraitTypeParam(ImplTraitTypeRepr implTrait, int i, TypePar
  * types, such as traits and implementation blocks.
  */
 abstract class Type extends TType {
-  /** Gets the struct field `name` belonging to this type, if any. */
-  pragma[nomagic]
-  abstract StructField getStructField(string name);
-
-  /** Gets the `i`th tuple field belonging to this type, if any. */
-  pragma[nomagic]
-  abstract TupleField getTupleField(int i);
-
-  /** Gets the `i`th type parameter of this type, if any. */
-  abstract TypeParameter getTypeParameter(int i);
+  /**
+   * Gets the `i`th positional type parameter of this type, if any.
+   *
+   * This excludes synthetic type parameters, such as associated types in traits.
+   */
+  abstract TypeParameter getPositionalTypeParameter(int i);
 
   /** Gets the default type for the `i`th type parameter, if any. */
   TypeMention getTypeParameterDefault(int i) { none() }
 
-  /** Gets a type parameter of this type. */
-  final TypeParameter getATypeParameter() { result = this.getTypeParameter(_) }
+  /**
+   * Gets a type parameter of this type.
+   *
+   * This includes both positional type parameters and synthetic type parameters,
+   * such as associated types in traits.
+   */
+  TypeParameter getATypeParameter() { result = this.getPositionalTypeParameter(_) }
 
   /** Gets a textual representation of this type. */
   abstract string toString();
@@ -104,11 +111,9 @@ class TupleType extends Type, TTuple {
 
   TupleType() { this = TTuple(arity) }
 
-  override StructField getStructField(string name) { none() }
-
-  override TupleField getTupleField(int i) { none() }
-
-  override TypeParameter getTypeParameter(int i) { result = TTupleTypeParameter(arity, i) }
+  override TypeParameter getPositionalTypeParameter(int i) {
+    result = TTupleTypeParameter(arity, i)
+  }
 
   /** Gets the arity of this tuple type. */
   int getArity() { result = arity }
@@ -125,23 +130,16 @@ class UnitType extends TupleType {
   override string toString() { result = "()" }
 }
 
-abstract private class StructOrEnumType extends Type {
-  abstract ItemNode asItemNode();
-}
-
 /** A struct type. */
-class StructType extends StructOrEnumType, TStruct {
+class StructType extends Type, TStruct {
   private Struct struct;
 
   StructType() { this = TStruct(struct) }
 
-  override ItemNode asItemNode() { result = struct }
+  /** Gets the struct that this struct type represents. */
+  Struct getStruct() { result = struct }
 
-  override StructField getStructField(string name) { result = struct.getStructField(name) }
-
-  override TupleField getTupleField(int i) { result = struct.getTupleField(i) }
-
-  override TypeParameter getTypeParameter(int i) {
+  override TypeParameter getPositionalTypeParameter(int i) {
     result = TTypeParamTypeParameter(struct.getGenericParamList().getTypeParam(i))
   }
 
@@ -155,18 +153,12 @@ class StructType extends StructOrEnumType, TStruct {
 }
 
 /** An enum type. */
-class EnumType extends StructOrEnumType, TEnum {
+class EnumType extends Type, TEnum {
   private Enum enum;
 
   EnumType() { this = TEnum(enum) }
 
-  override ItemNode asItemNode() { result = enum }
-
-  override StructField getStructField(string name) { none() }
-
-  override TupleField getTupleField(int i) { none() }
-
-  override TypeParameter getTypeParameter(int i) {
+  override TypeParameter getPositionalTypeParameter(int i) {
     result = TTypeParamTypeParameter(enum.getGenericParamList().getTypeParam(i))
   }
 
@@ -188,14 +180,18 @@ class TraitType extends Type, TTrait {
   /** Gets the underlying trait. */
   Trait getTrait() { result = trait }
 
-  override StructField getStructField(string name) { none() }
-
-  override TupleField getTupleField(int i) { none() }
-
-  override TypeParameter getTypeParameter(int i) {
+  override TypeParameter getPositionalTypeParameter(int i) {
     result = TTypeParamTypeParameter(trait.getGenericParamList().getTypeParam(i))
   }
 
+  override TypeParameter getATypeParameter() {
+    result = super.getATypeParameter()
+    or
+    result.(AssociatedTypeTypeParameter).getTrait() = trait
+    or
+    result.(SelfTypeParameter).getTrait() = trait
+  }
+
   override TypeMention getTypeParameterDefault(int i) {
     result = trait.getGenericParamList().getTypeParam(i).getDefaultType()
   }
@@ -205,6 +201,28 @@ class TraitType extends Type, TTrait {
   override Location getLocation() { result = trait.getLocation() }
 }
 
+/** A union type. */
+class UnionType extends Type, TUnion {
+  private Union union;
+
+  UnionType() { this = TUnion(union) }
+
+  /** Gets the union that this union type represents. */
+  Union getUnion() { result = union }
+
+  override TypeParameter getPositionalTypeParameter(int i) {
+    result = TTypeParamTypeParameter(union.getGenericParamList().getTypeParam(i))
+  }
+
+  override TypeMention getTypeParameterDefault(int i) {
+    result = union.getGenericParamList().getTypeParam(i).getDefaultType()
+  }
+
+  override string toString() { result = union.getName().getText() }
+
+  override Location getLocation() { result = union.getLocation() }
+}
+
 /**
  * An array type.
  *
@@ -214,11 +232,7 @@ class TraitType extends Type, TTrait {
 class ArrayType extends Type, TArrayType {
   ArrayType() { this = TArrayType() }
 
-  override StructField getStructField(string name) { none() }
-
-  override TupleField getTupleField(int i) { none() }
-
-  override TypeParameter getTypeParameter(int i) {
+  override TypeParameter getPositionalTypeParameter(int i) {
     result = TArrayTypeParameter() and
     i = 0
   }
@@ -237,11 +251,7 @@ class ArrayType extends Type, TArrayType {
 class RefType extends Type, TRefType {
   RefType() { this = TRefType() }
 
-  override StructField getStructField(string name) { none() }
-
-  override TupleField getTupleField(int i) { none() }
-
-  override TypeParameter getTypeParameter(int i) {
+  override TypeParameter getPositionalTypeParameter(int i) {
     result = TRefTypeParameter() and
     i = 0
   }
@@ -270,11 +280,7 @@ class ImplTraitType extends Type, TImplTraitType {
   /** Gets the function that this `impl Trait` belongs to. */
   abstract Function getFunction();
 
-  override StructField getStructField(string name) { none() }
-
-  override TupleField getTupleField(int i) { none() }
-
-  override TypeParameter getTypeParameter(int i) {
+  override TypeParameter getPositionalTypeParameter(int i) {
     exists(TypeParam tp |
       implTraitTypeParam(impl, i, tp) and
       result = TImplTraitTypeParameter(impl, tp)
@@ -291,14 +297,19 @@ class DynTraitType extends Type, TDynTraitType {
 
   DynTraitType() { this = TDynTraitType(trait) }
 
-  override StructField getStructField(string name) { none() }
-
-  override TupleField getTupleField(int i) { none() }
-
-  override DynTraitTypeParameter getTypeParameter(int i) {
+  override DynTraitTypeParameter getPositionalTypeParameter(int i) {
     result = TDynTraitTypeParameter(trait.getGenericParamList().getTypeParam(i))
   }
 
+  override TypeParameter getATypeParameter() {
+    result = super.getATypeParameter()
+    or
+    exists(AstNode n |
+      dynTraitTypeParameter(trait, n) and
+      result = TDynTraitTypeParameter(n)
+    )
+  }
+
   Trait getTrait() { result = trait }
 
   override string toString() { result = "dyn " + trait.getName().toString() }
@@ -332,11 +343,7 @@ class ImplTraitReturnType extends ImplTraitType {
 class SliceType extends Type, TSliceType {
   SliceType() { this = TSliceType() }
 
-  override StructField getStructField(string name) { none() }
-
-  override TupleField getTupleField(int i) { none() }
-
-  override TypeParameter getTypeParameter(int i) {
+  override TypeParameter getPositionalTypeParameter(int i) {
     result = TSliceTypeParameter() and
     i = 0
   }
@@ -346,13 +353,58 @@ class SliceType extends Type, TSliceType {
   override Location getLocation() { result instanceof EmptyLocation }
 }
 
+class NeverType extends Type, TNeverType {
+  override TypeParameter getPositionalTypeParameter(int i) { none() }
+
+  override string toString() { result = "!" }
+
+  override Location getLocation() { result instanceof EmptyLocation }
+}
+
+class PtrType extends Type, TPtrType {
+  override TypeParameter getPositionalTypeParameter(int i) {
+    i = 0 and
+    result = TPtrTypeParameter()
+  }
+
+  override string toString() { result = "*" }
+
+  override Location getLocation() { result instanceof EmptyLocation }
+}
+
+/**
+ * A special pseudo type used to indicate that the actual type may have to be
+ * inferred by propagating type information back into call arguments.
+ *
+ * For example, in
+ *
+ * ```rust
+ * let x = Default::default();
+ * foo(x);
+ * ```
+ *
+ * `Default::default()` is assigned this type, which allows us to infer the actual
+ * type from the type of `foo`'s first parameter.
+ *
+ * Unknown types are not restricted to root types, for example in a call like
+ * `Vec::new()` we assign this type at the type path corresponding to the type
+ * parameter of `Vec`.
+ *
+ * Unknown types are used to restrict when type information is allowed to flow
+ * into call arguments (including method call receivers), in order to avoid
+ * combinatorial explosions.
+ */
+class UnknownType extends Type, TUnknownType {
+  override TypeParameter getPositionalTypeParameter(int i) { none() }
+
+  override string toString() { result = "(context typed)" }
+
+  override Location getLocation() { result instanceof EmptyLocation }
+}
+
 /** A type parameter. */
 abstract class TypeParameter extends Type {
-  override StructField getStructField(string name) { none() }
-
-  override TupleField getTupleField(int i) { none() }
-
-  override TypeParameter getTypeParameter(int i) { none() }
+  override TypeParameter getPositionalTypeParameter(int i) { none() }
 }
 
 private class RawTypeParameter = @type_param or @trait or @type_alias or @impl_trait_type_repr;
@@ -501,6 +553,12 @@ class SliceTypeParameter extends TypeParameter, TSliceTypeParameter {
   override Location getLocation() { result instanceof EmptyLocation }
 }
 
+class PtrTypeParameter extends TypeParameter, TPtrTypeParameter {
+  override string toString() { result = "*T" }
+
+  override Location getLocation() { result instanceof EmptyLocation }
+}
+
 /**
  * The implicit `Self` type parameter of a trait, that refers to the
  * implementing type of the trait.
@@ -544,11 +602,7 @@ class ImplTraitTypeTypeParameter extends ImplTraitType, TypeParameter {
 
   override Function getFunction() { result = function }
 
-  override StructField getStructField(string name) { none() }
-
-  override TupleField getTupleField(int i) { none() }
-
-  override TypeParameter getTypeParameter(int i) { none() }
+  override TypeParameter getPositionalTypeParameter(int i) { none() }
 }
 
 /**
@@ -592,9 +646,7 @@ final class TypeBoundTypeAbstraction extends TypeAbstraction, TypeBound {
 }
 
 final class SelfTypeBoundTypeAbstraction extends TypeAbstraction, Name {
-  private TraitTypeAbstraction trait;
-
-  SelfTypeBoundTypeAbstraction() { trait.getName() = this }
+  SelfTypeBoundTypeAbstraction() { any(TraitTypeAbstraction trait).getName() = this }
 
   override TypeParameter getATypeParameter() { none() }
 }
@@ -604,3 +656,32 @@ final class ImplTraitTypeReprAbstraction extends TypeAbstraction, ImplTraitTypeR
     implTraitTypeParam(this, _, result.(TypeParamTypeParameter).getTypeParam())
   }
 }
+
+/**
+ * Holds if `t` is a valid complex [`self` root type][1].
+ *
+ * [1]: https://doc.rust-lang.org/stable/reference/items/associated-items.html#r-items.associated.fn.method.self-ty
+ */
+pragma[nomagic]
+predicate validSelfType(Type t) {
+  t instanceof RefType
+  or
+  exists(Struct s | t = TStruct(s) |
+    s instanceof BoxStruct or
+    s instanceof RcStruct or
+    s instanceof ArcStruct or
+    s instanceof PinStruct
+  )
+}
+
+/**
+ * Holds if `root` is a valid complex [`self` root type][1], with type
+ * parameter `tp`.
+ *
+ * [1]: https://doc.rust-lang.org/stable/reference/items/associated-items.html#r-items.associated.fn.method.self-ty
+ */
+pragma[nomagic]
+predicate complexSelfRoot(Type root, TypeParameter tp) {
+  validSelfType(root) and
+  tp = root.getPositionalTypeParameter(0)
+}
diff --git a/rust/ql/lib/codeql/rust/internal/TypeInference.qll b/rust/ql/lib/codeql/rust/internal/TypeInference.qll
index 5b00d802d7c..804fc017194 100644
--- a/rust/ql/lib/codeql/rust/internal/TypeInference.qll
+++ b/rust/ql/lib/codeql/rust/internal/TypeInference.qll
@@ -6,6 +6,9 @@ private import PathResolution
 private import Type
 private import Type as T
 private import TypeMention
+private import typeinference.FunctionType
+private import typeinference.FunctionOverloading as FunctionOverloading
+private import typeinference.BlanketImplementation as BlanketImplementation
 private import codeql.typeinference.internal.TypeInference
 private import codeql.rust.frameworks.stdlib.Stdlib
 private import codeql.rust.frameworks.stdlib.Builtins as Builtins
@@ -99,6 +102,11 @@ private module Input1 implements InputSig1<Location> {
         id1 = 0 and
         id2 = 2
         or
+        tp0 instanceof PtrTypeParameter and
+        kind = 0 and
+        id1 = 0 and
+        id2 = 3
+        or
         kind = 1 and
         id1 = 0 and
         id2 =
@@ -135,7 +143,7 @@ private import Input1
 
 private module M1 = Make1<Location, Input1>;
 
-private import M1
+import M1
 
 predicate getTypePathLimit = Input1::getTypePathLimit/0;
 
@@ -219,14 +227,56 @@ private module Input2 implements InputSig2 {
 
 private module M2 = Make2<Input2>;
 
-private import M2
+import M2
 
 module Consistency {
   import M2::Consistency
 
-  query predicate nonUniqueCertainType(AstNode n, TypePath path) {
-    strictcount(CertainTypeInference::inferCertainType(n, path)) > 1
+  private Type inferCertainTypeAdj(AstNode n, TypePath path) {
+    result = CertainTypeInference::inferCertainType(n, path) and
+    not result = TNeverType()
   }
+
+  predicate nonUniqueCertainType(AstNode n, TypePath path, Type t) {
+    strictcount(inferCertainTypeAdj(n, path)) > 1 and
+    t = inferCertainTypeAdj(n, path) and
+    // Suppress the inconsistency if `n` is a self parameter and the type
+    // mention for the self type has multiple types for a path.
+    not exists(ImplItemNode impl, TypePath selfTypePath |
+      n = impl.getAnAssocItem().(Function).getSelfParam() and
+      strictcount(impl.(Impl).getSelfTy().(TypeMention).resolveTypeAt(selfTypePath)) > 1
+    )
+  }
+}
+
+/** A method, that is, a function with a `self` parameter. */
+private class Method extends Function {
+  Method() { this.hasSelfParam() }
+}
+
+/** A function without a `self` parameter. */
+private class NonMethodFunction extends Function {
+  NonMethodFunction() { not this.hasSelfParam() }
+}
+
+pragma[nomagic]
+private TypeMention getCallExprTypeMentionArgument(CallExpr ce, TypeArgumentPosition apos) {
+  exists(Path p, int i | p = CallExprImpl::getFunctionPath(ce) |
+    apos.asTypeParam() = resolvePath(p).getTypeParam(pragma[only_bind_into](i)) and
+    result = getPathTypeArgument(p, pragma[only_bind_into](i))
+  )
+}
+
+pragma[nomagic]
+private Type getCallExprTypeArgument(CallExpr ce, TypeArgumentPosition apos, TypePath path) {
+  result = getCallExprTypeMentionArgument(ce, apos).resolveTypeAt(path)
+  or
+  // Handle constructions that use `Self(...)` syntax
+  exists(Path p, TypePath path0 |
+    p = CallExprImpl::getFunctionPath(ce) and
+    result = p.(TypeMention).resolveTypeAt(path0) and
+    path0.isCons(TTypeParamTypeParameter(apos.asTypeParam()), path)
+  )
 }
 
 /** Gets the type annotation that applies to `n`, if any. */
@@ -244,8 +294,8 @@ private TypeMention getTypeAnnotation(AstNode n) {
   )
   or
   exists(Function f |
-    result = f.getRetType().getTypeRepr() and
-    n = f.getBody()
+    result = getReturnTypeMention(f) and
+    n = f.getFunctionBody()
   )
 }
 
@@ -253,10 +303,23 @@ private TypeMention getTypeAnnotation(AstNode n) {
 pragma[nomagic]
 private Type inferAnnotatedType(AstNode n, TypePath path) {
   result = getTypeAnnotation(n).resolveTypeAt(path)
+  or
+  result = n.(ShorthandSelfParameterMention).resolveTypeAt(path)
+}
+
+/**
+ * Holds if `me` is a call to the `panic!` macro.
+ *
+ * `panic!` needs special treatment, because it expands to a block expression
+ * that looks like it should have type `()` instead of the correct `!` type.
+ */
+pragma[nomagic]
+private predicate isPanicMacroCall(MacroExpr me) {
+  me.getMacroCall().resolveMacro().(MacroRules).getName().getText() = "panic"
 }
 
 /** Module for inferring certain type information. */
-private module CertainTypeInference {
+module CertainTypeInference {
   pragma[nomagic]
   private predicate callResolvesTo(CallExpr ce, Path p, Function f) {
     p = CallExprImpl::getFunctionPath(ce) and
@@ -264,11 +327,13 @@ private module CertainTypeInference {
   }
 
   pragma[nomagic]
-  private Type getCallExprType(
-    CallExpr ce, Path p, CallExprBaseMatchingInput::FunctionDecl f, TypePath tp
-  ) {
+  private Type getCallExprType(CallExpr ce, Path p, Function f, TypePath tp) {
     callResolvesTo(ce, p, f) and
-    result = f.getReturnType(tp)
+    result =
+      [
+        f.(MethodCallMatchingInput::Declaration).getReturnType(tp),
+        f.(NonMethodCallMatchingInput::Declaration).getReturnType(tp)
+      ]
   }
 
   pragma[nomagic]
@@ -285,7 +350,7 @@ private module CertainTypeInference {
   }
 
   pragma[nomagic]
-  Type inferCertainCallExprType(CallExpr ce, TypePath path) {
+  private Type inferCertainCallExprType(CallExpr ce, TypePath path) {
     exists(Type ty, TypePath prefix, Path p | ty = getCertainCallExprType(ce, p, prefix) |
       exists(TypePath suffix, TypeParam tp |
         tp = ty.(TypeParamTypeParameter).getTypeParam() and
@@ -302,9 +367,7 @@ private module CertainTypeInference {
         // For type parameters of the function we must resolve their
         // instantiation from the path. For instance, for `fn bar<A>(a: A) -> A`
         // and the path `bar<i64>`, we must resolve `A` to `i64`.
-        result =
-          ce.(CallExprBaseMatchingInput::Access)
-              .getTypeArgument(TTypeParamTypeArgumentPosition(tp), suffix)
+        result = getCallExprTypeArgument(ce, TTypeParamTypeArgumentPosition(tp), suffix)
       )
       or
       not ty instanceof TypeParameter and
@@ -313,6 +376,14 @@ private module CertainTypeInference {
     )
   }
 
+  private Type inferCertainStructExprType(StructExpr se, TypePath path) {
+    result = se.getPath().(TypeMention).resolveTypeAt(path)
+  }
+
+  private Type inferCertainStructPatType(StructPat sp, TypePath path) {
+    result = sp.getPath().(TypeMention).resolveTypeAt(path)
+  }
+
   predicate certainTypeEquality(AstNode n1, TypePath prefix1, AstNode n2, TypePath prefix2) {
     prefix1.isEmpty() and
     prefix2.isEmpty() and
@@ -323,11 +394,22 @@ private module CertainTypeInference {
       or
       // A `let` statement with a type annotation is a coercion site and hence
       // is not a certain type equality.
-      exists(LetStmt let | not let.hasTypeRepr() |
-        let.getPat() = n1 and
+      exists(LetStmt let |
+        not let.hasTypeRepr() and
+        // Due to "binding modes" the type of the pattern is not necessarily the
+        // same as the type of the initializer. The pattern being an identifier
+        // pattern is sufficient to ensure that this is not the case.
+        let.getPat().(IdentPat) = n1 and
         let.getInitializer() = n2
       )
       or
+      exists(LetExpr let |
+        // Similarly as for let statements, we need to rule out binding modes
+        // changing the type.
+        let.getPat().(IdentPat) = n1 and
+        let.getScrutinee() = n2
+      )
+      or
       n1 = n2.(ParenExpr).getExpr()
     )
     or
@@ -357,10 +439,7 @@ private module CertainTypeInference {
    */
   pragma[nomagic]
   Type inferCertainType(AstNode n, TypePath path) {
-    exists(TypeMention tm |
-      tm = getTypeAnnotation(n) and
-      result = tm.resolveTypeAt(path)
-    )
+    result = inferAnnotatedType(n, path)
     or
     result = inferCertainCallExprType(n, path)
     or
@@ -368,6 +447,36 @@ private module CertainTypeInference {
     or
     result = inferLiteralType(n, path, true)
     or
+    result = inferRefNodeType(n) and
+    path.isEmpty()
+    or
+    result = inferLogicalOperationType(n, path)
+    or
+    result = inferCertainStructExprType(n, path)
+    or
+    result = inferCertainStructPatType(n, path)
+    or
+    result = inferRangeExprType(n) and
+    path.isEmpty()
+    or
+    result = inferTupleRootType(n) and
+    path.isEmpty()
+    or
+    result = inferBlockExprType(n, path)
+    or
+    result = inferArrayExprType(n) and
+    path.isEmpty()
+    or
+    result = inferCastExprType(n, path)
+    or
+    exprHasUnitType(n) and
+    path.isEmpty() and
+    result instanceof UnitType
+    or
+    isPanicMacroCall(n) and
+    path.isEmpty() and
+    result instanceof NeverType
+    or
     infersCertainTypeAt(n, path, result.getATypeParameter())
   }
 
@@ -399,7 +508,7 @@ private module CertainTypeInference {
     inferCertainType(n, path) != t
     or
     // If we infer that `n` has _some_ type at `T1.T2....Tn`, and we also
-    // know that `n` certainly has type `certainType` at `T1.T2...Ti`, `i <=0 < n`,
+    // know that `n` certainly has type `certainType` at `T1.T2...Ti`, `0 <= i < n`,
     // then it must be the case that `T(i+1)` is a type parameter of `certainType`,
     // otherwise there is a conflict.
     //
@@ -414,11 +523,10 @@ private module CertainTypeInference {
 }
 
 private Type inferLogicalOperationType(AstNode n, TypePath path) {
-  exists(Builtins::BuiltinType t, BinaryLogicalOperation be |
+  exists(Builtins::Bool t, BinaryLogicalOperation be |
     n = [be, be.getLhs(), be.getRhs()] and
     path.isEmpty() and
-    result = TStruct(t) and
-    t instanceof Builtins::Bool
+    result = TStruct(t)
   )
 }
 
@@ -436,6 +544,9 @@ private Struct getRangeType(RangeExpr re) {
   re instanceof RangeToExpr and
   result instanceof RangeToStruct
   or
+  re instanceof RangeFullExpr and
+  result instanceof RangeFullStruct
+  or
   re instanceof RangeFromToExpr and
   result instanceof RangeStruct
   or
@@ -446,6 +557,14 @@ private Struct getRangeType(RangeExpr re) {
   result instanceof RangeToInclusiveStruct
 }
 
+private predicate bodyReturns(Expr body, Expr e) {
+  exists(ReturnExpr re, Callable c |
+    e = re.getExpr() and
+    c = re.getEnclosingCallable() and
+    body = c.getBody()
+  )
+}
+
 /**
  * Holds if the type tree of `n1` at `prefix1` should be equal to the type tree
  * of `n2` at `prefix2` and type information should propagate in both directions
@@ -462,9 +581,11 @@ private predicate typeEquality(AstNode n1, TypePath prefix1, AstNode n2, TypePat
       let.getInitializer() = n2
     )
     or
-    n1 = n2.(IfExpr).getABranch()
-    or
-    n1 = n2.(MatchExpr).getAnArm().getExpr()
+    n2 =
+      any(MatchExpr me |
+        n1 = me.getAnArm().getExpr() and
+        me.getNumberOfArms() = 1
+      )
     or
     exists(LetExpr let |
       n1 = let.getScrutinee() and
@@ -492,9 +613,13 @@ private predicate typeEquality(AstNode n1, TypePath prefix1, AstNode n2, TypePat
       n2 = be.getRhs()
     )
     or
-    n1 = n2.(MacroExpr).getMacroCall().getMacroCallExpansion()
+    n1 = n2.(MacroExpr).getMacroCall().getMacroCallExpansion() and
+    not isPanicMacroCall(n2)
     or
     n1 = n2.(MacroPat).getMacroCall().getMacroCallExpansion()
+    or
+    bodyReturns(n1, n2) and
+    strictcount(Expr e | bodyReturns(n1, e)) = 1
   )
   or
   (
@@ -528,8 +653,12 @@ private predicate typeEquality(AstNode n1, TypePath prefix1, AstNode n2, TypePat
     )
   )
   or
-  // an array list expression (`[1, 2, 3]`) has the type of the first (any) element
-  n1.(ArrayListExpr).getExpr(_) = n2 and
+  // an array list expression with only one element (such as `[1]`) has type from that element
+  n1 =
+    any(ArrayListExpr ale |
+      ale.getAnExpr() = n2 and
+      ale.getNumberOfExprs() = 1
+    ) and
   prefix1 = TypePath::singleton(TArrayTypeParameter()) and
   prefix2.isEmpty()
   or
@@ -552,11 +681,66 @@ private predicate typeEquality(AstNode n1, TypePath prefix1, AstNode n2, TypePat
     prefix2.isEmpty()
   )
   or
-  n1.(ClosureExpr).getBody() = n2 and
+  n1.(ClosureExpr).getClosureBody() = n2 and
   prefix1 = closureReturnPath() and
   prefix2.isEmpty()
 }
 
+/**
+ * Holds if `child` is a child of `parent`, and the Rust compiler applies [least
+ * upper bound (LUB) coercion](1) to infer the type of `parent` from the type of
+ * `child`.
+ *
+ * In this case, we want type information to only flow from `child` to `parent`,
+ * to avoid (a) either having to model LUB coercions, or (b) risk combinatorial
+ * explosion in inferred types.
+ *
+ * [1]: https://doc.rust-lang.org/reference/type-coercions.html#r-coerce.least-upper-bound
+ */
+private predicate lubCoercion(AstNode parent, AstNode child, TypePath prefix) {
+  child = parent.(IfExpr).getABranch() and
+  prefix.isEmpty()
+  or
+  parent =
+    any(MatchExpr me |
+      child = me.getAnArm().getExpr() and
+      me.getNumberOfArms() > 1
+    ) and
+  prefix.isEmpty()
+  or
+  parent =
+    any(ArrayListExpr ale |
+      child = ale.getAnExpr() and
+      ale.getNumberOfExprs() > 1
+    ) and
+  prefix = TypePath::singleton(TArrayTypeParameter())
+  or
+  bodyReturns(parent, child) and
+  strictcount(Expr e | bodyReturns(parent, e)) > 1 and
+  prefix.isEmpty()
+}
+
+/**
+ * Holds if the type tree of `n1` at `prefix1` should be equal to the type tree
+ * of `n2` at `prefix2`, but type information should only propagate from `n1` to
+ * `n2`.
+ */
+private predicate typeEqualityNonSymmetric(
+  AstNode n1, TypePath prefix1, AstNode n2, TypePath prefix2
+) {
+  lubCoercion(n2, n1, prefix2) and
+  prefix1.isEmpty()
+  or
+  exists(AstNode mid, TypePath prefixMid, TypePath suffix |
+    typeEquality(n1, prefixMid, mid, prefix2) or
+    typeEquality(mid, prefix2, n1, prefixMid)
+  |
+    lubCoercion(mid, n2, suffix) and
+    not lubCoercion(mid, n1, _) and
+    prefix1 = prefixMid.append(suffix)
+  )
+}
+
 pragma[nomagic]
 private Type inferTypeEquality(AstNode n, TypePath path) {
   exists(TypePath prefix1, AstNode n2, TypePath prefix2, TypePath suffix |
@@ -566,56 +750,16 @@ private Type inferTypeEquality(AstNode n, TypePath path) {
     typeEquality(n, prefix1, n2, prefix2)
     or
     typeEquality(n2, prefix2, n, prefix1)
-  )
-}
-
-/**
- * Gets the type of the implicitly typed `self` parameter, taking into account
- * whether the parameter is passed by value or by reference.
- */
-bindingset[self, suffix, t]
-pragma[inline_late]
-private Type getRefAdjustImplicitSelfType(SelfParam self, TypePath suffix, Type t, TypePath path) {
-  not self.hasTypeRepr() and
-  (
-    if self.isRef()
-    then
-      // `fn f(&self, ...)`
-      path.isEmpty() and
-      result = TRefType()
-      or
-      path = TypePath::cons(TRefTypeParameter(), suffix) and
-      result = t
-    else (
-      // `fn f(self, ...)`
-      path = suffix and
-      result = t
-    )
-  )
-}
-
-pragma[nomagic]
-private Type resolveImplSelfType(Impl i, TypePath path) {
-  result = i.getSelfTy().(TypeMention).resolveTypeAt(path)
-}
-
-/** Gets the type at `path` of the implicitly typed `self` parameter. */
-pragma[nomagic]
-private Type inferImplicitSelfType(SelfParam self, TypePath path) {
-  exists(ImplOrTraitItemNode i, Function f, TypePath suffix, Type t |
-    f = i.getAnAssocItem() and
-    self = f.getParamList().getSelfParam() and
-    result = getRefAdjustImplicitSelfType(self, suffix, t, path)
-  |
-    t = resolveImplSelfType(i, suffix)
     or
-    t = TSelfTypeParameter(i) and suffix.isEmpty()
+    typeEqualityNonSymmetric(n2, prefix2, n, prefix1)
   )
 }
 
 /**
  * A matching configuration for resolving types of struct expressions
  * like `Foo { bar = baz }`.
+ *
+ * This also includes nullary struct expressions like `None`.
  */
 private module StructExprMatchingInput implements MatchingInputSig {
   private newtype TPos =
@@ -698,26 +842,86 @@ private module StructExprMatchingInput implements MatchingInputSig {
 
   class AccessPosition = DeclarationPosition;
 
-  class Access extends StructExpr {
-    Type getTypeArgument(TypeArgumentPosition apos, TypePath path) { none() }
+  abstract class Access extends AstNode {
+    pragma[nomagic]
+    abstract AstNode getNodeAt(AccessPosition apos);
 
-    AstNode getNodeAt(AccessPosition apos) {
+    pragma[nomagic]
+    Type getInferredType(AccessPosition apos, TypePath path) {
+      result = inferType(this.getNodeAt(apos), path)
+    }
+
+    pragma[nomagic]
+    abstract Path getStructPath();
+
+    pragma[nomagic]
+    Declaration getTarget() { result = resolvePath(this.getStructPath()) }
+
+    pragma[nomagic]
+    Type getTypeArgument(TypeArgumentPosition apos, TypePath path) {
+      // Handle constructions that use `Self {...}` syntax
+      exists(TypeMention tm, TypePath path0 |
+        tm = this.getStructPath() and
+        result = tm.resolveTypeAt(path0) and
+        path0.isCons(TTypeParamTypeParameter(apos.asTypeParam()), path)
+      )
+    }
+
+    /**
+     * Holds if the return type of this struct expression at `path` may have to
+     * be inferred from the context.
+     */
+    pragma[nomagic]
+    predicate hasUnknownTypeAt(DeclarationPosition pos, TypePath path) {
+      exists(Declaration d, TypeParameter tp |
+        d = this.getTarget() and
+        pos.isStructPos() and
+        tp = d.getDeclaredType(pos, path) and
+        not exists(DeclarationPosition fieldPos |
+          not fieldPos.isStructPos() and
+          tp = d.getDeclaredType(fieldPos, _)
+        ) and
+        // check that no explicit type arguments have been supplied for `tp`
+        not exists(TypeArgumentPosition tapos |
+          exists(this.getTypeArgument(tapos, _)) and
+          TTypeParamTypeParameter(tapos.asTypeParam()) = tp
+        )
+      )
+    }
+  }
+
+  private class StructExprAccess extends Access, StructExpr {
+    override Type getTypeArgument(TypeArgumentPosition apos, TypePath path) {
+      result = super.getTypeArgument(apos, path)
+      or
+      exists(TypePath suffix |
+        suffix.isCons(TTypeParamTypeParameter(apos.asTypeParam()), path) and
+        result = CertainTypeInference::inferCertainType(this, suffix)
+      )
+    }
+
+    override AstNode getNodeAt(AccessPosition apos) {
       result = this.getFieldExpr(apos.asFieldPos()).getExpr()
       or
       result = this and
       apos.isStructPos()
     }
 
-    Type getInferredType(AccessPosition apos, TypePath path) {
-      result = inferType(this.getNodeAt(apos), path)
-      or
-      // The struct/enum type is supplied explicitly as a type qualifier, e.g.
-      // `Foo<Bar>::Variant { ... }`.
-      apos.isStructPos() and
-      result = this.getPath().(TypeMention).resolveTypeAt(path)
+    override Path getStructPath() { result = this.getPath() }
+  }
+
+  /**
+   * A potential nullary struct/variant construction such as `None`.
+   */
+  private class PathExprAccess extends Access, PathExpr {
+    PathExprAccess() { not exists(CallExpr ce | this = ce.getFunction()) }
+
+    override AstNode getNodeAt(AccessPosition apos) {
+      result = this and
+      apos.isStructPos()
     }
 
-    Declaration getTarget() { result = resolvePath(this.getPath()) }
+    override Path getStructPath() { result = this.getPath() }
   }
 
   predicate accessDeclarationPositionMatch(AccessPosition apos, DeclarationPosition dpos) {
@@ -727,17 +931,25 @@ private module StructExprMatchingInput implements MatchingInputSig {
 
 private module StructExprMatching = Matching<StructExprMatchingInput>;
 
+pragma[nomagic]
+private Type inferStructExprType0(AstNode n, boolean isReturn, TypePath path) {
+  exists(StructExprMatchingInput::Access a, StructExprMatchingInput::AccessPosition apos |
+    n = a.getNodeAt(apos) and
+    if apos.isStructPos() then isReturn = true else isReturn = false
+  |
+    result = StructExprMatching::inferAccessType(a, apos, path)
+    or
+    a.hasUnknownTypeAt(apos, path) and
+    result = TUnknownType()
+  )
+}
+
 /**
  * Gets the type of `n` at `path`, where `n` is either a struct expression or
  * a field expression of a struct expression.
  */
-pragma[nomagic]
-private Type inferStructExprType(AstNode n, TypePath path) {
-  exists(StructExprMatchingInput::Access a, StructExprMatchingInput::AccessPosition apos |
-    n = a.getNodeAt(apos) and
-    result = StructExprMatching::inferAccessType(a, apos, path)
-  )
-}
+private predicate inferStructExprType =
+  ContextTyping::CheckContextTyping<inferStructExprType0/3>::check/2;
 
 pragma[nomagic]
 private Type inferTupleRootType(AstNode n) {
@@ -746,54 +958,1583 @@ private Type inferTupleRootType(AstNode n) {
 }
 
 pragma[nomagic]
-private Type inferPathExprType(PathExpr pe, TypePath path) {
-  // nullary struct/variant constructors
-  not exists(CallExpr ce | pe = ce.getFunction()) and
-  path.isEmpty() and
-  exists(ItemNode i | i = resolvePath(pe.getPath()) |
-    result = TEnum(i.(Variant).getEnum())
-    or
-    result = TStruct(i)
-  )
+private Path getCallExprPathQualifier(CallExpr ce) {
+  result = CallExprImpl::getFunctionPath(ce).getQualifier()
 }
 
-/** Gets the explicit type qualifier of the call `ce`, if any. */
-private Type getTypeQualifier(CallExpr ce, TypePath path) {
-  exists(PathExpr pe, TypeMention tm |
-    pe = ce.getFunction() and
-    tm = pe.getPath().getQualifier() and
-    result = tm.resolveTypeAt(path)
+/**
+ * Gets the type qualifier of function call `ce`, if any.
+ *
+ * For example, the type qualifier of `Foo::<i32>::default()` is `Foo::<i32>`,
+ * but only when `Foo` is not a trait.
+ */
+pragma[nomagic]
+private Type getCallExprTypeQualifier(CallExpr ce, TypePath path) {
+  exists(TypeMention tm |
+    tm = getCallExprPathQualifier(ce) and
+    result = tm.resolveTypeAt(path) and
+    not resolvePath(tm) instanceof Trait
   )
 }
 
 /**
- * A matching configuration for resolving types of call expressions
- * like `foo::bar(baz)` and `foo.bar(baz)`.
+ * Provides functionality related to context-based typing of calls.
  */
-private module CallExprBaseMatchingInput implements MatchingInputSig {
-  private predicate paramPos(ParamList pl, Param p, int pos) { p = pl.getParam(pos) }
-
-  private newtype TDeclarationPosition =
-    TArgumentDeclarationPosition(ArgumentPosition pos) or
-    TReturnDeclarationPosition()
-
-  class DeclarationPosition extends TDeclarationPosition {
-    predicate isSelf() { this.asArgumentPosition().isSelf() }
-
-    int asPosition() { result = this.asArgumentPosition().asPosition() }
-
-    ArgumentPosition asArgumentPosition() { this = TArgumentDeclarationPosition(result) }
-
-    predicate isReturn() { this = TReturnDeclarationPosition() }
-
-    string toString() {
-      result = this.asArgumentPosition().toString()
+private module ContextTyping {
+  /**
+   * Holds if the return type of the function `f` inside `i` at `path` is type
+   * parameter `tp`, and `tp` does not appear in the type of any parameter of
+   * `f`.
+   *
+   * In this case, the context in which `f` is called may be needed to infer
+   * the instantiation of `tp`.
+   *
+   * This covers functions like `Default::default` and `Vec::new`.
+   */
+  pragma[nomagic]
+  private predicate assocFunctionReturnContextTypedAt(
+    ImplOrTraitItemNode i, Function f, FunctionPosition pos, TypePath path, TypeParameter tp
+  ) {
+    pos.isReturn() and
+    tp = getAssocFunctionTypeAt(f, i, pos, path) and
+    not exists(FunctionPosition nonResPos | not nonResPos.isReturn() |
+      tp = getAssocFunctionTypeAt(f, i, nonResPos, _)
       or
-      this.isReturn() and
-      result = "(return)"
+      // `Self` types in traits implicitly mention all type parameters of the trait
+      getAssocFunctionTypeAt(f, i, nonResPos, _) = TSelfTypeParameter(i)
+    )
+  }
+
+  /**
+   * A call where the type of the result may have to be inferred from the
+   * context in which the call appears, for example a call like
+   * `Default::default()`.
+   */
+  abstract class ContextTypedCallCand extends AstNode {
+    abstract Type getTypeArgument(TypeArgumentPosition apos, TypePath path);
+
+    private predicate hasTypeArgument(TypeArgumentPosition apos) {
+      exists(this.getTypeArgument(apos, _))
+    }
+
+    /**
+     * Holds if this call resolves to `target` inside `i`, and the return type
+     * at `pos` and `path` may have to be inferred from the context.
+     */
+    bindingset[this, i, target]
+    predicate hasUnknownTypeAt(
+      ImplOrTraitItemNode i, Function target, FunctionPosition pos, TypePath path
+    ) {
+      exists(TypeParameter tp |
+        assocFunctionReturnContextTypedAt(i, target, pos, path, tp) and
+        // check that no explicit type arguments have been supplied for `tp`
+        not exists(TypeArgumentPosition tapos | this.hasTypeArgument(tapos) |
+          exists(int j |
+            j = tapos.asMethodTypeArgumentPosition() and
+            tp = TTypeParamTypeParameter(target.getGenericParamList().getTypeParam(j))
+          )
+          or
+          TTypeParamTypeParameter(tapos.asTypeParam()) = tp
+        ) and
+        not (
+          tp instanceof TSelfTypeParameter and
+          exists(getCallExprTypeQualifier(this, _))
+        )
+      )
     }
   }
 
+  pragma[nomagic]
+  private predicate hasUnknownTypeAt(AstNode n, TypePath path) {
+    inferType(n, path) = TUnknownType()
+  }
+
+  pragma[nomagic]
+  private predicate hasUnknownType(AstNode n) { hasUnknownTypeAt(n, _) }
+
+  signature Type inferCallTypeSig(AstNode n, boolean isReturn, TypePath path);
+
+  /**
+   * Given a predicate `inferCallType` for inferring the type of a call at a given
+   * position, this module exposes the predicate `check`, which wraps the input
+   * predicate and checks that types are only propagated into arguments when they
+   * are context-typed.
+   */
+  module CheckContextTyping<inferCallTypeSig/3 inferCallType> {
+    pragma[nomagic]
+    private Type inferCallTypeFromContextCand(AstNode n, TypePath path, TypePath prefix) {
+      result = inferCallType(n, false, path) and
+      hasUnknownType(n) and
+      prefix = path
+      or
+      exists(TypePath mid |
+        result = inferCallTypeFromContextCand(n, path, mid) and
+        mid.isSnoc(prefix, _)
+      )
+    }
+
+    pragma[nomagic]
+    Type check(AstNode n, TypePath path) {
+      result = inferCallType(n, true, path)
+      or
+      exists(TypePath prefix |
+        result = inferCallTypeFromContextCand(n, path, prefix) and
+        hasUnknownTypeAt(n, prefix)
+      )
+    }
+  }
+}
+
+/**
+ * Holds if function `f` with the name `name` and the arity `arity` exists in
+ * `i`, and the type at position `pos` is `t`.
+ */
+pragma[nomagic]
+private predicate assocFunctionInfo(
+  Function f, string name, int arity, ImplOrTraitItemNode i, FunctionPosition pos,
+  AssocFunctionType t
+) {
+  f = i.getASuccessor(name) and
+  arity = f.getParamList().getNumberOfParams() and
+  t.appliesTo(f, i, pos)
+}
+
+/**
+ * Holds if function `f` with the name `name` and the arity `arity` exists in
+ * blanket (like) implementation `impl` of `trait`, and the type at position
+ * `pos` is `t`.
+ *
+ * `blanketPath` points to the type `blanketTypeParam` inside `t`, which
+ * is the type parameter used in the blanket implementation.
+ */
+pragma[nomagic]
+private predicate functionInfoBlanketLike(
+  Function f, string name, int arity, ImplItemNode impl, Trait trait, FunctionPosition pos,
+  AssocFunctionType t, TypePath blanketPath, TypeParam blanketTypeParam
+) {
+  exists(TypePath blanketSelfPath |
+    assocFunctionInfo(f, name, arity, impl, pos, t) and
+    TTypeParamTypeParameter(blanketTypeParam) = t.getTypeAt(blanketPath) and
+    blanketPath = any(string s) + blanketSelfPath and
+    BlanketImplementation::isBlanketLike(impl, blanketSelfPath, blanketTypeParam) and
+    trait = impl.resolveTraitTy()
+  )
+}
+
+/**
+ * Holds if the type path `path` pointing to `type` is stripped of any leading
+ * complex root type allowed for `self` parameters, such as `&`, `Box`, `Rc`,
+ * `Arc`, and `Pin`.
+ *
+ * We strip away the complex root type for performance reasons only, which will
+ * allow us to construct a much smaller set of candidate call targets (otherwise,
+ * for example _a lot_ of methods have a `self` parameter with a `&` root type).
+ */
+bindingset[path, type]
+private predicate isComplexRootStripped(TypePath path, Type type) {
+  (
+    path.isEmpty() and
+    not validSelfType(type)
+    or
+    exists(TypeParameter tp |
+      complexSelfRoot(_, tp) and
+      path = TypePath::singleton(tp) and
+      exists(type)
+    )
+  ) and
+  type != TNeverType()
+}
+
+/**
+ * Provides logic for resolving calls to methods.
+ *
+ * When resolving a method call, a list of [candidate receiver types][1] is constructed
+ *
+ * > by repeatedly dereferencing the receiver expression's type, adding each type
+ * > encountered to the list, then finally attempting an unsized coercion at the end,
+ * > and adding the result type if that is successful.
+ * >
+ * > Then, for each candidate `T`, add `&T` and `&mut T` to the list immediately after `T`.
+ *
+ * We do not currently model unsized coercions, and we do not yet model the `Deref` trait,
+ * instead we limit dereferencing to standard dereferencing and the fact that `String`
+ * dereferences to `str`.
+ *
+ * Instead of constructing the full list of candidate receiver types
+ *
+ * ```
+ * T1, &T1, &mut T1, ..., Tn, &Tn, &mut Tn
+ * ```
+ *
+ * we recursively compute a set of candidates, only adding a new candidate receiver type
+ * to the set when we can rule out that the method cannot be found for the current
+ * candidate:
+ *
+ * ```text
+ * forall method:
+ *   not current_candidate matches method
+ * ```
+ *
+ * Care must be taken to ensure that the `not current_candidate matches method` check is
+ * monotonic, which we achieve using the monotonic `isNotInstantiationOf` predicate.
+ *
+ * [1]: https://doc.rust-lang.org/reference/expressions/method-call-expr.html#r-expr.method.candidate-receivers
+ */
+private module MethodResolution {
+  /**
+   * Holds if method `m` with the name `name` and the arity `arity` exists in
+   * `i`, and the type of the `self` parameter is `selfType`.
+   *
+   * `strippedTypePath` points to the type `strippedType` inside `selfType`,
+   * which is the (possibly complex-stripped) root type of `selfType`. For example,
+   * if `m` has a `&self` parameter, then `strippedTypePath` is `TRefTypeParameter()`
+   * and `strippedType` is the type inside the reference.
+   */
+  pragma[nomagic]
+  private predicate methodInfo(
+    Method m, string name, int arity, ImplOrTraitItemNode i, AssocFunctionType selfType,
+    TypePath strippedTypePath, Type strippedType
+  ) {
+    exists(FunctionPosition pos |
+      assocFunctionInfo(m, name, arity, i, pos, selfType) and
+      strippedType = selfType.getTypeAt(strippedTypePath) and
+      isComplexRootStripped(strippedTypePath, strippedType) and
+      pos.isSelf()
+    )
+  }
+
+  pragma[nomagic]
+  private predicate methodInfoTypeParam(
+    Method m, string name, int arity, ImplOrTraitItemNode i, AssocFunctionType selfType,
+    TypePath strippedTypePath, TypeParam tp
+  ) {
+    methodInfo(m, name, arity, i, selfType, strippedTypePath, TTypeParamTypeParameter(tp))
+  }
+
+  /**
+   * Same as `methodInfo`, but restricted to non-blanket implementations, and
+   * allowing for any `strippedType` when the corresponding type inside `m` is
+   * a type parameter.
+   */
+  pragma[inline]
+  private predicate methodInfoNonBlanket(
+    Method m, string name, int arity, ImplOrTraitItemNode i, AssocFunctionType selfType,
+    TypePath strippedTypePath, Type strippedType
+  ) {
+    (
+      methodInfo(m, name, arity, i, selfType, strippedTypePath, strippedType) or
+      methodInfoTypeParam(m, name, arity, i, selfType, strippedTypePath, _)
+    ) and
+    not BlanketImplementation::isBlanketLike(i, _, _)
+  }
+
+  /**
+   * Holds if method `m` with the name `name` and the arity `arity` exists in
+   * blanket (like) implementation `impl` of `trait`, and the type of the `self`
+   * parameter is `selfType`.
+   *
+   * `blanketPath` points to the type `blanketTypeParam` inside `selfType`, which
+   * is the type parameter used in the blanket implementation.
+   */
+  pragma[nomagic]
+  private predicate methodInfoBlanketLike(
+    Method m, string name, int arity, ImplItemNode impl, Trait trait, AssocFunctionType selfType,
+    TypePath blanketPath, TypeParam blanketTypeParam
+  ) {
+    exists(FunctionPosition pos |
+      functionInfoBlanketLike(m, name, arity, impl, trait, pos, selfType, blanketPath,
+        blanketTypeParam) and
+      pos.isSelf()
+    )
+  }
+
+  pragma[nomagic]
+  private predicate methodTraitInfo(string name, int arity, Trait trait) {
+    exists(ImplItemNode i |
+      methodInfo(_, name, arity, i, _, _, _) and
+      trait = i.resolveTraitTy()
+    )
+    or
+    methodInfo(_, name, arity, trait, _, _, _)
+  }
+
+  pragma[nomagic]
+  private predicate methodCallTraitCandidate(Element mc, Trait trait) {
+    exists(string name, int arity |
+      mc.(MethodCall).hasNameAndArity(name, arity) and
+      methodTraitInfo(name, arity, trait)
+    |
+      not mc.(Call).hasTrait()
+      or
+      trait = mc.(Call).getTrait()
+    )
+  }
+
+  private module MethodTraitIsVisible = TraitIsVisible<methodCallTraitCandidate/2>;
+
+  private predicate methodCallVisibleTraitCandidate(MethodCall mc, Trait trait) {
+    MethodTraitIsVisible::traitIsVisible(mc, trait)
+  }
+
+  bindingset[mc, impl]
+  pragma[inline_late]
+  private predicate methodCallVisibleImplTraitCandidate(MethodCall mc, ImplItemNode impl) {
+    methodCallVisibleTraitCandidate(mc, impl.resolveTraitTy())
+  }
+
+  /**
+   * Holds if method call `mc` may target a method in `i` with `self` parameter having
+   * type `selfType`.
+   *
+   * `strippedTypePath` points to the type `strippedType` inside `selfType`,
+   * which is the (possibly complex-stripped) root type of `selfType`.
+   *
+   * This predicate only checks for matching method names and arities, and whether
+   * the trait being implemented by `i` (when `i` is not a trait itself) is visible
+   * at `mc`.
+   */
+  bindingset[mc, strippedTypePath, strippedType]
+  pragma[inline_late]
+  private predicate methodCallNonBlanketCandidate(
+    MethodCall mc, Method m, ImplOrTraitItemNode i, AssocFunctionType self,
+    TypePath strippedTypePath, Type strippedType
+  ) {
+    exists(string name, int arity |
+      mc.hasNameAndArity(name, arity) and
+      methodInfoNonBlanket(m, name, arity, i, self, strippedTypePath, strippedType)
+    |
+      i =
+        any(Impl impl |
+          not impl.hasTrait()
+          or
+          methodCallVisibleImplTraitCandidate(mc, impl)
+        )
+      or
+      methodCallVisibleTraitCandidate(mc, i)
+      or
+      i.(ImplItemNode).resolveTraitTy() = mc.(Call).getTrait()
+    )
+  }
+
+  /**
+   * Holds if method call `mc` may target a method in blanket (like) implementation
+   * `impl` with `self` parameter having type `selfType`.
+   *
+   * `blanketPath` points to the type `blanketTypeParam` inside `selfType`, which
+   * is the type parameter used in the blanket implementation.
+   *
+   * This predicate only checks for matching method names and arities, and whether
+   * the trait being implemented by `i` (when `i` is not a trait itself) is visible
+   * at `mc`.
+   */
+  bindingset[mc]
+  pragma[inline_late]
+  private predicate methodCallBlanketLikeCandidate(
+    MethodCall mc, Method m, ImplItemNode impl, AssocFunctionType self, TypePath blanketPath,
+    TypeParam blanketTypeParam
+  ) {
+    exists(string name, int arity |
+      mc.hasNameAndArity(name, arity) and
+      methodInfoBlanketLike(m, name, arity, impl, _, self, blanketPath, blanketTypeParam)
+    |
+      methodCallVisibleImplTraitCandidate(mc, impl)
+      or
+      impl.resolveTraitTy() = mc.(Call).getTrait()
+    )
+  }
+
+  /**
+   * A (potential) method call.
+   *
+   * This is either:
+   *
+   * 1. `MethodCallMethodCallExpr`: an actual method call, `x.m()`;
+   * 2. `MethodCallIndexExpr`: an index expression, `x[i]`, which is [syntactic sugar][1]
+   *    for `*x.index(i)`;
+   * 3. `MethodCallCallExpr`: a qualified function call, `Q::m(x)`, where `m` is a method;
+   *    or
+   * 4. `MethodCallOperation`: an operation expression, `x + y`, which is syntactic sugar
+   *    for `Add::add(x, y)`.
+   *
+   * Note that only in case 1 and 2 is auto-dereferencing and borrowing allowed.
+   *
+   * Note also that only case 4 is a _potential_ method call; in all other cases, we are
+   * guaranteed that the target is a method.
+   *
+   * [1]: https://doc.rust-lang.org/std/ops/trait.Index.html
+   */
+  abstract class MethodCall extends Expr {
+    abstract predicate hasNameAndArity(string name, int arity);
+
+    abstract Expr getArgument(ArgumentPosition pos);
+
+    abstract predicate supportsAutoDerefAndBorrow();
+
+    AstNode getNodeAt(FunctionPosition apos) {
+      result = this.getArgument(apos.asArgumentPosition())
+      or
+      result = this and apos.isReturn()
+    }
+
+    Type getArgumentTypeAt(ArgumentPosition pos, TypePath path) {
+      result = inferType(this.getArgument(pos), path)
+    }
+
+    private Type getReceiverTypeAt(TypePath path) {
+      result = this.getArgumentTypeAt(any(ArgumentPosition pos | pos.isSelf()), path)
+    }
+
+    /**
+     * Same as `getACandidateReceiverTypeAt`, but without borrows.
+     */
+    pragma[nomagic]
+    private Type getACandidateReceiverTypeAtNoBorrow(string derefChain, TypePath path) {
+      result = this.getReceiverTypeAt(path) and
+      derefChain = ""
+      or
+      this.supportsAutoDerefAndBorrow() and
+      exists(TypePath path0, Type t0, string derefChain0 |
+        this.hasNoCompatibleTargetBorrow(derefChain0) and
+        t0 = this.getACandidateReceiverTypeAtNoBorrow(derefChain0, path0)
+      |
+        path0.isCons(TRefTypeParameter(), path) and
+        result = t0 and
+        derefChain = derefChain0 + ".ref"
+        or
+        path0.isEmpty() and
+        path = path0 and
+        t0 = getStringStruct() and
+        result = getStrStruct() and
+        derefChain = derefChain0 + ".str"
+      )
+    }
+
+    /**
+     * Holds if the method inside `i` with matching name and arity can be ruled
+     * out as a target of this call, because the candidate receiver type represented
+     * by `derefChain` and `borrow` is incompatible with the `self` parameter type.
+     */
+    pragma[nomagic]
+    private predicate hasIncompatibleTarget(ImplOrTraitItemNode i, string derefChain, boolean borrow) {
+      ReceiverIsInstantiationOfSelfParam::argIsNotInstantiationOf(MkMethodCallCand(this, derefChain,
+          borrow), i, _)
+    }
+
+    /**
+     * Holds if the method inside blanket-like implementation `impl` with matching name
+     * and arity can be ruled out as a target of this call, either because the candidate
+     * receiver type represented by `derefChain` and `borrow` is incompatible with the `self`
+     * parameter type, or because the blanket constraint is not satisfied.
+     */
+    pragma[nomagic]
+    private predicate hasIncompatibleBlanketLikeTarget(
+      ImplItemNode impl, string derefChain, boolean borrow
+    ) {
+      ReceiverIsNotInstantiationOfBlanketLikeSelfParam::argIsNotInstantiationOf(MkMethodCallCand(this,
+          derefChain, borrow), impl, _)
+      or
+      ReceiverSatisfiesBlanketLikeConstraint::dissatisfiesBlanketConstraint(MkMethodCallCand(this,
+          derefChain, borrow), impl)
+    }
+
+    /**
+     * Same as `getACandidateReceiverTypeAt`, but with traits substituted in for types
+     * with trait bounds.
+     */
+    pragma[nomagic]
+    Type getACandidateReceiverTypeAtSubstituteLookupTraits(
+      string derefChain, boolean borrow, TypePath path
+    ) {
+      result = substituteLookupTraits(this.getACandidateReceiverTypeAt(derefChain, borrow, path))
+    }
+
+    pragma[nomagic]
+    private Type getComplexStrippedType(string derefChain, boolean borrow, TypePath strippedTypePath) {
+      result =
+        this.getACandidateReceiverTypeAtSubstituteLookupTraits(derefChain, borrow, strippedTypePath) and
+      isComplexRootStripped(strippedTypePath, result)
+    }
+
+    bindingset[derefChain, borrow, strippedTypePath, strippedType]
+    private predicate hasNoCompatibleNonBlanketLikeTargetCheck(
+      string derefChain, boolean borrow, TypePath strippedTypePath, Type strippedType
+    ) {
+      forall(ImplOrTraitItemNode i |
+        methodCallNonBlanketCandidate(this, _, i, _, strippedTypePath, strippedType)
+      |
+        this.hasIncompatibleTarget(i, derefChain, borrow)
+      )
+    }
+
+    bindingset[derefChain, borrow, strippedTypePath, strippedType]
+    private predicate hasNoCompatibleTargetCheck(
+      string derefChain, boolean borrow, TypePath strippedTypePath, Type strippedType
+    ) {
+      this.hasNoCompatibleNonBlanketLikeTargetCheck(derefChain, borrow, strippedTypePath,
+        strippedType) and
+      forall(ImplItemNode i | methodCallBlanketLikeCandidate(this, _, i, _, _, _) |
+        this.hasIncompatibleBlanketLikeTarget(i, derefChain, borrow)
+      )
+    }
+
+    bindingset[derefChain, borrow, strippedTypePath, strippedType]
+    private predicate hasNoCompatibleNonBlanketTargetCheck(
+      string derefChain, boolean borrow, TypePath strippedTypePath, Type strippedType
+    ) {
+      this.hasNoCompatibleNonBlanketLikeTargetCheck(derefChain, borrow, strippedTypePath,
+        strippedType) and
+      forall(ImplItemNode i |
+        methodCallBlanketLikeCandidate(this, _, i, _, _, _) and not i.isBlanketImplementation()
+      |
+        this.hasIncompatibleBlanketLikeTarget(i, derefChain, borrow)
+      )
+    }
+
+    /**
+     * Holds if the candidate receiver type represented by `derefChain` does not
+     * have a matching method target.
+     */
+    pragma[nomagic]
+    predicate hasNoCompatibleTargetNoBorrow(string derefChain) {
+      (
+        this.supportsAutoDerefAndBorrow()
+        or
+        // needed for the `hasNoCompatibleTarget` check in
+        // `ReceiverSatisfiesBlanketLikeConstraintInput::hasBlanketCandidate`
+        derefChain = ""
+      ) and
+      exists(TypePath strippedTypePath, Type strippedType |
+        not derefChain.matches("%.ref") and // no need to try a borrow if the last thing we did was a deref
+        strippedType = this.getComplexStrippedType(derefChain, false, strippedTypePath) and
+        this.hasNoCompatibleTargetCheck(derefChain, false, strippedTypePath, strippedType)
+      )
+    }
+
+    /**
+     * Holds if the candidate receiver type represented by `derefChain` does not have
+     * a matching non-blanket method target.
+     */
+    pragma[nomagic]
+    predicate hasNoCompatibleNonBlanketTargetNoBorrow(string derefChain) {
+      (
+        this.supportsAutoDerefAndBorrow()
+        or
+        // needed for the `hasNoCompatibleTarget` check in
+        // `ReceiverSatisfiesBlanketLikeConstraintInput::hasBlanketCandidate`
+        derefChain = ""
+      ) and
+      exists(TypePath strippedTypePath, Type strippedType |
+        not derefChain.matches("%.ref") and // no need to try a borrow if the last thing we did was a deref
+        strippedType = this.getComplexStrippedType(derefChain, false, strippedTypePath) and
+        this.hasNoCompatibleNonBlanketTargetCheck(derefChain, false, strippedTypePath, strippedType)
+      )
+    }
+
+    /**
+     * Holds if the candidate receiver type represented by `derefChain`, followed
+     * by a borrow, does not have a matching method target.
+     */
+    pragma[nomagic]
+    predicate hasNoCompatibleTargetBorrow(string derefChain) {
+      exists(TypePath strippedTypePath, Type strippedType |
+        this.hasNoCompatibleTargetNoBorrow(derefChain) and
+        strippedType = this.getComplexStrippedType(derefChain, true, strippedTypePath) and
+        this.hasNoCompatibleNonBlanketLikeTargetCheck(derefChain, true, strippedTypePath,
+          strippedType)
+      )
+    }
+
+    /**
+     * Holds if the candidate receiver type represented by `derefChain`, followed
+     * by a borrow, does not have a matching non-blanket method target.
+     */
+    pragma[nomagic]
+    predicate hasNoCompatibleNonBlanketTargetBorrow(string derefChain) {
+      exists(TypePath strippedTypePath, Type strippedType |
+        this.hasNoCompatibleTargetNoBorrow(derefChain) and
+        strippedType = this.getComplexStrippedType(derefChain, true, strippedTypePath) and
+        this.hasNoCompatibleNonBlanketTargetCheck(derefChain, true, strippedTypePath, strippedType)
+      )
+    }
+
+    /**
+     * Gets a [candidate receiver type][1] of this method call at `path`.
+     *
+     * The type is obtained by repeatedly dereferencing the receiver expression's type,
+     * as long as the method cannot be resolved in an earlier candidate type, and possibly
+     * applying a borrow at the end.
+     *
+     * The string `derefChain` encodes the sequence of dereferences, and `borrows` indicates
+     * whether a borrow has been applied.
+     *
+     * [1]: https://doc.rust-lang.org/reference/expressions/method-call-expr.html#r-expr.method.candidate-receivers
+     */
+    pragma[nomagic]
+    Type getACandidateReceiverTypeAt(string derefChain, boolean borrow, TypePath path) {
+      result = this.getACandidateReceiverTypeAtNoBorrow(derefChain, path) and
+      borrow = false
+      or
+      this.supportsAutoDerefAndBorrow() and
+      this.hasNoCompatibleTargetNoBorrow(derefChain) and
+      borrow = true and
+      (
+        path.isEmpty() and
+        result = TRefType()
+        or
+        exists(TypePath suffix |
+          result = this.getACandidateReceiverTypeAtNoBorrow(derefChain, suffix) and
+          path = TypePath::cons(TRefTypeParameter(), suffix)
+        )
+      )
+    }
+
+    /**
+     * Gets a method that this call resolves to after having applied a sequence of
+     * dereferences and possibly a borrow on the receiver type, encoded in the string
+     * `derefChain` and the Boolean `borrow`.
+     */
+    pragma[nomagic]
+    Method resolveCallTarget(ImplOrTraitItemNode i, string derefChain, boolean borrow) {
+      exists(MethodCallCand mcc |
+        mcc = MkMethodCallCand(this, derefChain, borrow) and
+        result = mcc.resolveCallTarget(i)
+      )
+    }
+
+    predicate receiverHasImplicitDeref(AstNode receiver) {
+      exists(this.resolveCallTarget(_, ".ref", false)) and
+      receiver = this.getArgument(CallImpl::TSelfArgumentPosition())
+    }
+
+    predicate receiverHasImplicitBorrow(AstNode receiver) {
+      exists(this.resolveCallTarget(_, "", true)) and
+      receiver = this.getArgument(CallImpl::TSelfArgumentPosition())
+    }
+  }
+
+  private class MethodCallMethodCallExpr extends MethodCall instanceof MethodCallExpr {
+    pragma[nomagic]
+    override predicate hasNameAndArity(string name, int arity) {
+      name = super.getIdentifier().getText() and
+      arity = super.getArgList().getNumberOfArgs()
+    }
+
+    override Expr getArgument(ArgumentPosition pos) {
+      pos.isSelf() and
+      result = MethodCallExpr.super.getReceiver()
+      or
+      result = super.getArgList().getArg(pos.asPosition())
+    }
+
+    override predicate supportsAutoDerefAndBorrow() { any() }
+  }
+
+  private class MethodCallIndexExpr extends MethodCall, IndexExpr {
+    pragma[nomagic]
+    override predicate hasNameAndArity(string name, int arity) {
+      name = "index" and
+      arity = 1
+    }
+
+    override Expr getArgument(ArgumentPosition pos) {
+      pos.isSelf() and
+      result = this.getBase()
+      or
+      pos.asPosition() = 0 and
+      result = this.getIndex()
+    }
+
+    override predicate supportsAutoDerefAndBorrow() { any() }
+  }
+
+  private class MethodCallCallExpr extends MethodCall, CallExpr {
+    MethodCallCallExpr() {
+      exists(getCallExprPathQualifier(this)) and
+      // even if a method cannot be resolved by path resolution, it may still
+      // be possible to resolve a blanket implementation (so not `forex`)
+      forall(ItemNode i | i = CallExprImpl::getResolvedFunction(this) | i instanceof Method)
+    }
+
+    /**
+     * Holds if this call has a type qualifier, and we are able to resolve,
+     * using path resolution, the method to a member of `impl`.
+     *
+     * When this is the case, we still want to check that the type qualifier
+     * is an instance of the type being implemented, which is done in
+     * `TypeQualifierIsInstantiationOfImplSelfInput`.
+     */
+    pragma[nomagic]
+    predicate hasTypeQualifiedCandidate(ImplItemNode impl) {
+      exists(getCallExprTypeQualifier(this, _)) and
+      CallExprImpl::getResolvedFunction(this) = impl.getASuccessor(_)
+    }
+
+    pragma[nomagic]
+    override predicate hasNameAndArity(string name, int arity) {
+      name = CallExprImpl::getFunctionPath(this).getText() and
+      arity = this.getArgList().getNumberOfArgs() - 1
+    }
+
+    override Expr getArgument(ArgumentPosition pos) {
+      pos.isSelf() and
+      result = this.getArg(0)
+      or
+      result = this.getArgList().getArg(pos.asPosition() + 1)
+    }
+
+    // needed for `TypeQualifierIsInstantiationOfImplSelfInput`
+    Type getTypeAt(TypePath path) {
+      result = substituteLookupTraits(getCallExprTypeQualifier(this, path))
+    }
+
+    override predicate supportsAutoDerefAndBorrow() { none() }
+  }
+
+  final class MethodCallOperation extends MethodCall, Operation {
+    pragma[nomagic]
+    override predicate hasNameAndArity(string name, int arity) {
+      name = this.(Call).getMethodName() and
+      arity = this.getNumberOfOperands() - 1
+    }
+
+    override Expr getArgument(ArgumentPosition pos) { result = this.(Call).getArgument(pos) }
+
+    override Type getArgumentTypeAt(ArgumentPosition pos, TypePath path) {
+      if this.(Call).implicitBorrowAt(pos, true)
+      then
+        result = TRefType() and
+        path.isEmpty()
+        or
+        exists(TypePath path0 |
+          result = inferType(this.getArgument(pos), path0) and
+          path = TypePath::cons(TRefTypeParameter(), path0)
+        )
+      else result = inferType(this.getArgument(pos), path)
+    }
+
+    override predicate receiverHasImplicitBorrow(AstNode receiver) {
+      exists(ArgumentPosition pos |
+        this.(Call).implicitBorrowAt(pos, true) and
+        receiver = this.getArgument(pos)
+      )
+    }
+
+    override predicate supportsAutoDerefAndBorrow() { none() }
+  }
+
+  pragma[nomagic]
+  private Method getMethodSuccessor(ImplOrTraitItemNode i, string name, int arity) {
+    result = i.getASuccessor(name) and
+    arity = result.getParamList().getNumberOfParams()
+  }
+
+  private newtype TMethodCallCand =
+    MkMethodCallCand(MethodCall mc, string derefChain, boolean borrow) {
+      exists(mc.getACandidateReceiverTypeAt(derefChain, borrow, _))
+    }
+
+  /** A method call with a dereference chain and a potential borrow. */
+  private class MethodCallCand extends MkMethodCallCand {
+    MethodCall mc_;
+    string derefChain;
+    boolean borrow;
+
+    MethodCallCand() { this = MkMethodCallCand(mc_, derefChain, borrow) }
+
+    MethodCall getMethodCall() { result = mc_ }
+
+    Type getTypeAt(TypePath path) {
+      result = mc_.getACandidateReceiverTypeAtSubstituteLookupTraits(derefChain, borrow, path) and
+      not result = TNeverType() and
+      not result = TUnknownType()
+    }
+
+    pragma[nomagic]
+    predicate hasNoCompatibleNonBlanketTarget() {
+      mc_.hasNoCompatibleNonBlanketTargetBorrow(derefChain) and
+      borrow = true
+      or
+      mc_.hasNoCompatibleNonBlanketTargetNoBorrow(derefChain) and
+      borrow = false
+    }
+
+    pragma[nomagic]
+    predicate hasSignature(
+      MethodCall mc, TypePath strippedTypePath, Type strippedType, string name, int arity
+    ) {
+      strippedType = this.getTypeAt(strippedTypePath) and
+      isComplexRootStripped(strippedTypePath, strippedType) and
+      mc = mc_ and
+      mc.hasNameAndArity(name, arity)
+    }
+
+    /**
+     * Holds if the inherent method inside `impl` with matching name and arity can be
+     * ruled out as a candidate for this call.
+     */
+    pragma[nomagic]
+    private predicate hasIncompatibleInherentTarget(Impl impl) {
+      ReceiverIsNotInstantiationOfInherentSelfParam::argIsNotInstantiationOf(this, impl, _)
+    }
+
+    /**
+     * Holds if this method call has no inherent target, i.e., it does not
+     * resolve to a method in an `impl` block for the type of the receiver.
+     */
+    pragma[nomagic]
+    predicate hasNoInherentTarget() {
+      exists(TypePath strippedTypePath, Type strippedType, string name, int arity |
+        this.hasSignature(_, strippedTypePath, strippedType, name, arity) and
+        forall(Impl i |
+          methodInfoNonBlanket(_, name, arity, i, _, strippedTypePath, strippedType) and
+          not i.hasTrait()
+        |
+          this.hasIncompatibleInherentTarget(i)
+        )
+      )
+    }
+
+    pragma[nomagic]
+    private predicate typeQualifierIsInstantiationOf(ImplOrTraitItemNode i) {
+      TypeQualifierIsInstantiationOfImplSelf::isInstantiationOf(mc_, i, _)
+    }
+
+    pragma[nomagic]
+    private predicate argIsInstantiationOf(ImplOrTraitItemNode i, string name, int arity) {
+      (
+        ReceiverIsInstantiationOfSelfParam::argIsInstantiationOf(this, i, _)
+        or
+        this.typeQualifierIsInstantiationOf(i)
+      ) and
+      mc_.hasNameAndArity(name, arity)
+    }
+
+    pragma[nomagic]
+    Method resolveCallTargetCand(ImplOrTraitItemNode i) {
+      exists(string name, int arity |
+        this.argIsInstantiationOf(i, name, arity) and
+        result = getMethodSuccessor(i, name, arity)
+      )
+    }
+
+    /** Gets a method that matches this method call. */
+    pragma[nomagic]
+    Method resolveCallTarget(ImplOrTraitItemNode i) {
+      result = this.resolveCallTargetCand(i) and
+      not FunctionOverloading::functionResolutionDependsOnArgument(i, _, _, _, _)
+      or
+      MethodArgsAreInstantiationsOf::argsAreInstantiationsOf(this, i, result)
+    }
+
+    predicate hasNoBorrow() { borrow = false }
+
+    string toString() { result = mc_.toString() + " [" + derefChain + "; " + borrow + "]" }
+
+    Location getLocation() { result = mc_.getLocation() }
+  }
+
+  private module ReceiverSatisfiesBlanketLikeConstraintInput implements
+    BlanketImplementation::SatisfiesBlanketConstraintInputSig<MethodCallCand>
+  {
+    pragma[nomagic]
+    predicate hasBlanketCandidate(
+      MethodCallCand mcc, ImplItemNode impl, TypePath blanketPath, TypeParam blanketTypeParam
+    ) {
+      exists(MethodCall mc |
+        mc = mcc.getMethodCall() and
+        methodCallBlanketLikeCandidate(mc, _, impl, _, blanketPath, blanketTypeParam) and
+        // Only apply blanket implementations when no other implementations are possible;
+        // this is to account for codebases that use the (unstable) specialization feature
+        // (https://rust-lang.github.io/rfcs/1210-impl-specialization.html)
+        (mcc.hasNoCompatibleNonBlanketTarget() or not impl.isBlanketImplementation())
+      |
+        mcc.hasNoBorrow()
+        or
+        blanketPath.getHead() = TRefTypeParameter()
+      )
+    }
+  }
+
+  private module ReceiverSatisfiesBlanketLikeConstraint =
+    BlanketImplementation::SatisfiesBlanketConstraint<MethodCallCand,
+      ReceiverSatisfiesBlanketLikeConstraintInput>;
+
+  /**
+   * A configuration for matching the type of a receiver against the type of
+   * a `self` parameter.
+   */
+  private module ReceiverIsInstantiationOfSelfParamInput implements
+    IsInstantiationOfInputSig<MethodCallCand, AssocFunctionType>
+  {
+    pragma[nomagic]
+    additional predicate potentialInstantiationOf0(
+      MethodCallCand mcc, ImplOrTraitItemNode i, AssocFunctionType selfType
+    ) {
+      exists(
+        MethodCall mc, Method m, string name, int arity, TypePath strippedTypePath,
+        Type strippedType
+      |
+        mcc.hasSignature(mc, strippedTypePath, strippedType, name, arity)
+      |
+        methodCallNonBlanketCandidate(mc, m, i, selfType, strippedTypePath, strippedType)
+        or
+        methodCallBlanketLikeCandidate(mc, m, i, selfType, _, _) and
+        ReceiverSatisfiesBlanketLikeConstraint::satisfiesBlanketConstraint(mcc, i)
+      )
+    }
+
+    pragma[nomagic]
+    predicate potentialInstantiationOf(
+      MethodCallCand mcc, TypeAbstraction abs, AssocFunctionType constraint
+    ) {
+      potentialInstantiationOf0(mcc, abs, constraint) and
+      if abs.(Impl).hasTrait()
+      then
+        // inherent methods take precedence over trait methods, so only allow
+        // trait methods when there are no matching inherent methods
+        mcc.hasNoInherentTarget()
+      else any()
+    }
+
+    predicate relevantConstraint(AssocFunctionType constraint) {
+      methodInfo(_, _, _, _, constraint, _, _)
+    }
+  }
+
+  private module ReceiverIsInstantiationOfSelfParam =
+    ArgIsInstantiationOf<MethodCallCand, ReceiverIsInstantiationOfSelfParamInput>;
+
+  /**
+   * A configuration for anti-matching the type of a receiver against the type of
+   * a `self` parameter belonging to a blanket (like) implementation.
+   */
+  private module ReceiverIsNotInstantiationOfBlanketLikeSelfParamInput implements
+    IsInstantiationOfInputSig<MethodCallCand, AssocFunctionType>
+  {
+    pragma[nomagic]
+    predicate potentialInstantiationOf(
+      MethodCallCand mcc, TypeAbstraction abs, AssocFunctionType constraint
+    ) {
+      methodCallBlanketLikeCandidate(mcc.getMethodCall(), _, abs, constraint, _, _) and
+      if abs.(Impl).hasTrait()
+      then
+        // inherent methods take precedence over trait methods, so only allow
+        // trait methods when there are no matching inherent methods
+        mcc.hasNoInherentTarget()
+      else any()
+    }
+  }
+
+  private module ReceiverIsNotInstantiationOfBlanketLikeSelfParam =
+    ArgIsInstantiationOf<MethodCallCand, ReceiverIsNotInstantiationOfBlanketLikeSelfParamInput>;
+
+  /**
+   * A configuration for matching the type qualifier of a method call
+   * against the type being implemented in an `impl` block. For example,
+   * in `Foo::<Bar>::m(x)`, we check that the type `Foo<Bar>` is an
+   * instance of the type being implemented.
+   */
+  private module TypeQualifierIsInstantiationOfImplSelfInput implements
+    IsInstantiationOfInputSig<MethodCallCallExpr, TypeMentionTypeTree>
+  {
+    pragma[nomagic]
+    private predicate potentialInstantiationOf0(
+      MethodCallCallExpr ce, ImplItemNode impl, TypeMentionTypeTree constraint
+    ) {
+      ce.hasTypeQualifiedCandidate(impl) and
+      constraint = impl.getSelfPath()
+    }
+
+    pragma[nomagic]
+    predicate potentialInstantiationOf(
+      MethodCallCallExpr ce, TypeAbstraction abs, TypeMentionTypeTree constraint
+    ) {
+      potentialInstantiationOf0(ce, abs, constraint) and
+      if abs.(Impl).hasTrait()
+      then
+        // inherent methods take precedence over trait methods, so only allow
+        // trait methods when there are no matching inherent methods
+        MkMethodCallCand(ce, _, _).(MethodCallCand).hasNoInherentTarget()
+      else any()
+    }
+
+    predicate relevantConstraint(TypeMentionTypeTree constraint) {
+      potentialInstantiationOf0(_, _, constraint)
+    }
+  }
+
+  private module TypeQualifierIsInstantiationOfImplSelf =
+    IsInstantiationOf<MethodCallCallExpr, TypeMentionTypeTree,
+      TypeQualifierIsInstantiationOfImplSelfInput>;
+
+  /**
+   * A configuration for anti-matching the type of a receiver against the type of
+   * a `self` parameter in an inherent method.
+   */
+  private module ReceiverIsNotInstantiationOfInherentSelfParamInput implements
+    IsInstantiationOfInputSig<MethodCallCand, AssocFunctionType>
+  {
+    pragma[nomagic]
+    predicate potentialInstantiationOf(
+      MethodCallCand mcc, TypeAbstraction abs, AssocFunctionType constraint
+    ) {
+      ReceiverIsInstantiationOfSelfParamInput::potentialInstantiationOf0(mcc, abs, constraint) and
+      abs = any(Impl i | not i.hasTrait())
+    }
+  }
+
+  private module ReceiverIsNotInstantiationOfInherentSelfParam =
+    ArgIsInstantiationOf<MethodCallCand, ReceiverIsNotInstantiationOfInherentSelfParamInput>;
+
+  /**
+   * A configuration for matching the types of positional arguments against the
+   * types of parameters, when needed to disambiguate the call.
+   */
+  private module MethodArgsAreInstantiationsOfInput implements ArgsAreInstantiationsOfInputSig {
+    predicate toCheck(ImplOrTraitItemNode i, Function f, FunctionPosition pos, AssocFunctionType t) {
+      exists(TypePath path, Type t0 |
+        FunctionOverloading::functionResolutionDependsOnArgument(i, f, pos, path, t0) and
+        t.appliesTo(f, i, pos) and
+        // for now, we do not handle ambiguous targets when one of the types it iself
+        // a type parameter; we should be checking the constraints on that type parameter
+        // in this case
+        not t0 instanceof TypeParameter
+      )
+    }
+
+    class Call extends MethodCallCand {
+      Type getArgType(FunctionPosition pos, TypePath path) {
+        result = inferType(mc_.getNodeAt(pos), path)
+      }
+
+      predicate hasTargetCand(ImplOrTraitItemNode i, Function f) {
+        f = this.resolveCallTargetCand(i)
+      }
+    }
+  }
+
+  private module MethodArgsAreInstantiationsOf =
+    ArgsAreInstantiationsOf<MethodArgsAreInstantiationsOfInput>;
+}
+
+/**
+ * A matching configuration for resolving types of method call expressions
+ * like `foo.bar(baz)`.
+ */
+private module MethodCallMatchingInput implements MatchingWithEnvironmentInputSig {
+  import FunctionPositionMatchingInput
+
+  final class Declaration extends Function {
+    TypeParameter getTypeParameter(TypeParameterPosition ppos) {
+      typeParamMatchPosition(this.getGenericParamList().getATypeParam(), result, ppos)
+      or
+      exists(ImplOrTraitItemNode i | this = i.getAnAssocItem() |
+        typeParamMatchPosition(i.getTypeParam(_), result, ppos)
+        or
+        ppos.isImplicit() and result = TSelfTypeParameter(i)
+        or
+        ppos.isImplicit() and
+        result.(AssociatedTypeTypeParameter).getTrait() = i
+      )
+      or
+      ppos.isImplicit() and
+      this = result.(ImplTraitTypeTypeParameter).getFunction()
+    }
+
+    pragma[nomagic]
+    Type getParameterType(DeclarationPosition dpos, TypePath path) {
+      exists(Param p, int i |
+        p = this.getParam(i) and
+        i = dpos.asPosition() and
+        result = p.getTypeRepr().(TypeMention).resolveTypeAt(path)
+      )
+      or
+      dpos.isSelf() and
+      exists(SelfParam self |
+        self = pragma[only_bind_into](this.getSelfParam()) and
+        result = getSelfParamTypeMention(self).resolveTypeAt(path)
+      )
+    }
+
+    private Type resolveRetType(TypePath path) {
+      result = getReturnTypeMention(this).resolveTypeAt(path)
+    }
+
+    pragma[nomagic]
+    Type getReturnType(TypePath path) {
+      if this.isAsync()
+      then
+        path.isEmpty() and
+        result = getFutureTraitType()
+        or
+        exists(TypePath suffix |
+          result = this.resolveRetType(suffix) and
+          path = TypePath::cons(getFutureOutputTypeParameter(), suffix)
+        )
+      else result = this.resolveRetType(path)
+    }
+
+    Type getDeclaredType(DeclarationPosition dpos, TypePath path) {
+      result = this.getParameterType(dpos, path)
+      or
+      dpos.isReturn() and
+      result = this.getReturnType(path)
+    }
+  }
+
+  class AccessEnvironment = string;
+
+  bindingset[derefChain, borrow]
+  private AccessEnvironment encodeDerefChainBorrow(string derefChain, boolean borrow) {
+    exists(string suffix | if borrow = true then suffix = "borrow" else suffix = "" |
+      result = derefChain + ";" + suffix
+    )
+  }
+
+  final private class MethodCallFinal = MethodResolution::MethodCall;
+
+  class Access extends MethodCallFinal, ContextTyping::ContextTypedCallCand {
+    Access() {
+      // handled in the `OperationMatchingInput` module
+      not this instanceof Operation
+    }
+
+    pragma[nomagic]
+    override Type getTypeArgument(TypeArgumentPosition apos, TypePath path) {
+      result =
+        this.(MethodCallExpr)
+            .getGenericArgList()
+            .getTypeArg(apos.asMethodTypeArgumentPosition())
+            .(TypeMention)
+            .resolveTypeAt(path)
+      or
+      result = getCallExprTypeArgument(this, apos, path)
+    }
+
+    pragma[nomagic]
+    private Type getInferredSelfType(AccessPosition apos, string derefChainBorrow, TypePath path) {
+      exists(string derefChain, boolean borrow |
+        result = this.getACandidateReceiverTypeAt(derefChain, borrow, path) and
+        derefChainBorrow = encodeDerefChainBorrow(derefChain, borrow) and
+        apos.isSelf()
+      )
+    }
+
+    pragma[nomagic]
+    Type getInferredNonSelfType(AccessPosition apos, TypePath path) {
+      if
+        // index expression `x[i]` desugars to `*x.index(i)`, so we must account for
+        // the implicit deref
+        apos.isReturn() and
+        this instanceof IndexExpr
+      then
+        path.isEmpty() and
+        result = TRefType()
+        or
+        exists(TypePath suffix |
+          result = inferType(this.getNodeAt(apos), suffix) and
+          path = TypePath::cons(TRefTypeParameter(), suffix)
+        )
+      else (
+        not apos.isSelf() and
+        result = inferType(this.getNodeAt(apos), path)
+      )
+    }
+
+    bindingset[derefChainBorrow]
+    Type getInferredType(string derefChainBorrow, AccessPosition apos, TypePath path) {
+      result = this.getInferredSelfType(apos, derefChainBorrow, path)
+      or
+      result = this.getInferredNonSelfType(apos, path)
+    }
+
+    Declaration getTarget(ImplOrTraitItemNode i, string derefChainBorrow) {
+      exists(string derefChain, boolean borrow |
+        derefChainBorrow = encodeDerefChainBorrow(derefChain, borrow) and
+        result = this.resolveCallTarget(i, derefChain, borrow) // mutual recursion; resolving method calls requires resolving types and vice versa
+      )
+    }
+
+    Declaration getTarget(string derefChainBorrow) { result = this.getTarget(_, derefChainBorrow) }
+
+    /**
+     * Holds if the return type of this call at `path` may have to be inferred
+     * from the context.
+     */
+    pragma[nomagic]
+    predicate hasUnknownTypeAt(string derefChainBorrow, FunctionPosition pos, TypePath path) {
+      exists(ImplOrTraitItemNode i |
+        this.hasUnknownTypeAt(i, this.getTarget(i, derefChainBorrow), pos, path)
+      )
+    }
+  }
+}
+
+private module MethodCallMatching = MatchingWithEnvironment<MethodCallMatchingInput>;
+
+pragma[nomagic]
+private Type inferMethodCallType0(
+  MethodCallMatchingInput::Access a, MethodCallMatchingInput::AccessPosition apos, AstNode n,
+  string derefChainBorrow, TypePath path
+) {
+  exists(TypePath path0 |
+    n = a.getNodeAt(apos) and
+    (
+      result = MethodCallMatching::inferAccessType(a, derefChainBorrow, apos, path0)
+      or
+      a.hasUnknownTypeAt(derefChainBorrow, apos, path0) and
+      result = TUnknownType()
+    )
+  |
+    if
+      // index expression `x[i]` desugars to `*x.index(i)`, so we must account for
+      // the implicit deref
+      apos.isReturn() and
+      a instanceof IndexExpr
+    then path0.isCons(TRefTypeParameter(), path)
+    else path = path0
+  )
+}
+
+pragma[nomagic]
+private Type inferMethodCallType1(AstNode n, boolean isReturn, TypePath path) {
+  exists(
+    MethodCallMatchingInput::Access a, MethodCallMatchingInput::AccessPosition apos,
+    string derefChainBorrow, TypePath path0
+  |
+    result = inferMethodCallType0(a, apos, n, derefChainBorrow, path0) and
+    if apos.isReturn() then isReturn = true else isReturn = false
+  |
+    (
+      not apos.isSelf()
+      or
+      derefChainBorrow = ";"
+    ) and
+    path = path0
+    or
+    // adjust for implicit deref
+    apos.isSelf() and
+    derefChainBorrow = ".ref;" and
+    path = TypePath::cons(TRefTypeParameter(), path0)
+    or
+    // adjust for implicit borrow
+    apos.isSelf() and
+    derefChainBorrow = ";borrow" and
+    path0.isCons(TRefTypeParameter(), path)
+  )
+}
+
+/**
+ * Gets the type of `n` at `path`, where `n` is either a method call or an
+ * argument/receiver of a method call.
+ */
+private predicate inferMethodCallType =
+  ContextTyping::CheckContextTyping<inferMethodCallType1/3>::check/2;
+
+/**
+ * Provides logic for resolving calls to non-method items. This includes
+ * "calls" to tuple variants and tuple structs.
+ */
+private module NonMethodResolution {
+  /**
+   * Holds if the associated function `implFunction` at `impl` implements
+   * `traitFunction`, which belongs to `trait`, and resolving the function
+   * `implFunction` requires inspecting the type at position `pos` in order
+   * to determine whether it is the correct resolution.
+   *
+   * `type` is the type at `pos` of `implFunction` which mathces a type parameter of
+   * `traitFunction` at `pos`.
+   */
+  pragma[nomagic]
+  private predicate traitFunctionDependsOnPos(
+    TraitItemNode trait, NonMethodFunction traitFunction, FunctionPosition pos, Type type,
+    ImplItemNode impl, NonMethodFunction implFunction
+  ) {
+    exists(TypePath path |
+      type = getAssocFunctionTypeAt(implFunction, impl, pos, path) and
+      implFunction.implements(traitFunction) and
+      FunctionOverloading::traitTypeParameterOccurrence(trait, traitFunction, _, pos, path, _)
+    |
+      if pos.isReturn()
+      then
+        // We only check that the context of the call provides relevant type information
+        // when no argument can
+        not exists(FunctionPosition pos0 |
+          FunctionOverloading::traitTypeParameterOccurrence(trait, traitFunction, _, pos0, _, _) and
+          not pos0.isReturn()
+          or
+          FunctionOverloading::functionResolutionDependsOnArgument(impl, implFunction, pos0, _, _)
+        )
+      else any()
+    )
+  }
+
+  pragma[nomagic]
+  private predicate functionInfoBlanketLikeRelevantPos(
+    NonMethodFunction f, string name, int arity, ImplItemNode impl, Trait trait,
+    FunctionPosition pos, AssocFunctionType t, TypePath blanketPath, TypeParam blanketTypeParam
+  ) {
+    functionInfoBlanketLike(f, name, arity, impl, trait, pos, t, blanketPath, blanketTypeParam) and
+    (
+      if pos.isReturn()
+      then
+        // We only check that the context of the call provides relevant type information
+        // when no argument can
+        not exists(FunctionPosition pos0 |
+          functionInfoBlanketLike(f, name, arity, impl, trait, pos0, _, _, _) and
+          not pos0.isReturn()
+        )
+      else any()
+    )
+  }
+
+  pragma[nomagic]
+  private predicate blanketLikeCallTraitCandidate(Element fc, Trait trait) {
+    exists(string name, int arity |
+      fc.(NonMethodCall).hasNameAndArity(name, arity) and
+      functionInfoBlanketLikeRelevantPos(_, name, arity, _, trait, _, _, _, _)
+    |
+      not fc.(Call).hasTrait()
+      or
+      trait = fc.(Call).getTrait()
+    )
+  }
+
+  private module BlanketTraitIsVisible = TraitIsVisible<blanketLikeCallTraitCandidate/2>;
+
+  /** A (potential) non-method call, `f(x)`. */
+  final class NonMethodCall extends CallExpr {
+    NonMethodCall() {
+      // even if a function cannot be resolved by path resolution, it may still
+      // be possible to resolve a blanket implementation (so not `forex`)
+      forall(Function f | f = CallExprImpl::getResolvedFunction(this) |
+        f instanceof NonMethodFunction
+      )
+    }
+
+    pragma[nomagic]
+    predicate hasNameAndArity(string name, int arity) {
+      name = CallExprImpl::getFunctionPath(this).getText() and
+      arity = this.getArgList().getNumberOfArgs()
+    }
+
+    /**
+     * Gets the item that this function call resolves to using path resolution,
+     * if any.
+     */
+    private ItemNode getPathResolutionResolved() {
+      result = CallExprImpl::getResolvedFunction(this) and
+      not result.(Function).hasSelfParam()
+    }
+
+    /**
+     * Gets the blanket function that this call may resolve to, if any.
+     */
+    pragma[nomagic]
+    private NonMethodFunction resolveCallTargetBlanketCand(ImplItemNode impl) {
+      exists(string name |
+        this.hasNameAndArity(pragma[only_bind_into](name), _) and
+        ArgIsInstantiationOfBlanketParam::argIsInstantiationOf(MkCallAndBlanketPos(this, _), impl, _) and
+        result = impl.getASuccessor(pragma[only_bind_into](name))
+      )
+    }
+
+    pragma[nomagic]
+    NonMethodFunction resolveAssocCallTargetCand(ImplItemNode i) {
+      not this.(Call).hasTrait() and
+      result = this.getPathResolutionResolved() and
+      result = i.getASuccessor(_)
+      or
+      result = this.resolveCallTargetBlanketCand(i)
+    }
+
+    AstNode getNodeAt(FunctionPosition pos) {
+      result = this.getArg(pos.asPosition())
+      or
+      result = this and pos.isReturn()
+    }
+
+    Type getTypeAt(FunctionPosition pos, TypePath path) {
+      result = inferType(this.getNodeAt(pos), path)
+    }
+
+    pragma[nomagic]
+    predicate resolveCallTargetBlanketLikeCandidate(
+      ImplItemNode impl, FunctionPosition pos, TypePath blanketPath, TypeParam blanketTypeParam
+    ) {
+      exists(string name, int arity, Trait trait, AssocFunctionType t |
+        this.hasNameAndArity(name, arity) and
+        exists(this.getTypeAt(pos, blanketPath)) and
+        functionInfoBlanketLikeRelevantPos(_, name, arity, impl, trait, pos, t, blanketPath,
+          blanketTypeParam) and
+        BlanketTraitIsVisible::traitIsVisible(this, trait)
+      )
+    }
+
+    pragma[nomagic]
+    predicate hasTraitResolved(TraitItemNode trait, NonMethodFunction resolved) {
+      resolved = this.getPathResolutionResolved() and
+      trait = this.(Call).getTrait()
+    }
+
+    /**
+     * Gets the target of this call, which can be resolved using only path resolution.
+     */
+    pragma[nomagic]
+    ItemNode resolveCallTargetViaPathResolution() {
+      not this.(Call).hasTrait() and
+      result = this.getPathResolutionResolved() and
+      not FunctionOverloading::functionResolutionDependsOnArgument(_, result, _, _, _)
+    }
+
+    /**
+     * Gets the target of this call, which can be resolved using type inference.
+     */
+    pragma[nomagic]
+    NonMethodFunction resolveCallTargetViaTypeInference(ImplOrTraitItemNode i) {
+      result = this.resolveCallTargetBlanketCand(i) and
+      not FunctionOverloading::functionResolutionDependsOnArgument(_, result, _, _, _)
+      or
+      NonMethodArgsAreInstantiationsOf::argsAreInstantiationsOf(this, i, result)
+    }
+
+    pragma[inline]
+    ItemNode resolveCallTarget() {
+      result = this.resolveCallTargetViaPathResolution()
+      or
+      result = this.resolveCallTargetViaTypeInference(_)
+    }
+
+    pragma[nomagic]
+    NonMethodFunction resolveTraitFunctionViaPathResolution(TraitItemNode trait) {
+      this.(Call).hasTrait() and
+      result = this.getPathResolutionResolved() and
+      result = trait.getASuccessor(_)
+    }
+  }
+
+  private newtype TCallAndBlanketPos =
+    MkCallAndBlanketPos(NonMethodCall fc, FunctionPosition pos) {
+      fc.resolveCallTargetBlanketLikeCandidate(_, pos, _, _)
+    }
+
+  /** A call tagged with a position. */
+  private class CallAndBlanketPos extends MkCallAndBlanketPos {
+    NonMethodCall fc;
+    FunctionPosition pos;
+
+    CallAndBlanketPos() { this = MkCallAndBlanketPos(fc, pos) }
+
+    Location getLocation() { result = fc.getLocation() }
+
+    Type getTypeAt(TypePath path) { result = fc.getTypeAt(pos, path) }
+
+    string toString() { result = fc.toString() + " [arg " + pos + "]" }
+  }
+
+  private module ArgSatisfiesBlanketConstraintInput implements
+    BlanketImplementation::SatisfiesBlanketConstraintInputSig<CallAndBlanketPos>
+  {
+    pragma[nomagic]
+    predicate hasBlanketCandidate(
+      CallAndBlanketPos fcp, ImplItemNode impl, TypePath blanketPath, TypeParam blanketTypeParam
+    ) {
+      exists(NonMethodCall fc, FunctionPosition pos |
+        fcp = MkCallAndBlanketPos(fc, pos) and
+        fc.resolveCallTargetBlanketLikeCandidate(impl, pos, blanketPath, blanketTypeParam)
+      )
+    }
+  }
+
+  private module ArgSatisfiesBlanketConstraint =
+    BlanketImplementation::SatisfiesBlanketConstraint<CallAndBlanketPos,
+      ArgSatisfiesBlanketConstraintInput>;
+
+  /**
+   * A configuration for matching the type of an argument against the type of
+   * a parameter that mentions a satisfied blanket type parameter.
+   */
+  private module ArgIsInstantiationOfBlanketParamInput implements
+    IsInstantiationOfInputSig<CallAndBlanketPos, AssocFunctionType>
+  {
+    pragma[nomagic]
+    predicate potentialInstantiationOf(
+      CallAndBlanketPos fcp, TypeAbstraction abs, AssocFunctionType constraint
+    ) {
+      exists(FunctionPosition pos |
+        ArgSatisfiesBlanketConstraint::satisfiesBlanketConstraint(fcp, abs) and
+        fcp = MkCallAndBlanketPos(_, pos) and
+        functionInfoBlanketLikeRelevantPos(_, _, _, abs, _, pos, constraint, _, _)
+      )
+    }
+
+    predicate relevantConstraint(AssocFunctionType constraint) {
+      functionInfoBlanketLikeRelevantPos(_, _, _, _, _, _, constraint, _, _)
+    }
+  }
+
+  private module ArgIsInstantiationOfBlanketParam =
+    ArgIsInstantiationOf<CallAndBlanketPos, ArgIsInstantiationOfBlanketParamInput>;
+
+  private module NonMethodArgsAreInstantiationsOfInput implements ArgsAreInstantiationsOfInputSig {
+    predicate toCheck(ImplOrTraitItemNode i, Function f, FunctionPosition pos, AssocFunctionType t) {
+      t.appliesTo(f, i, pos) and
+      (
+        exists(Type t0 |
+          // for now, we do not handle ambiguous targets when one of the types it iself
+          // a type parameter; we should be checking the constraints on that type parameter
+          // in this case
+          not t0 instanceof TypeParameter
+        |
+          FunctionOverloading::functionResolutionDependsOnArgument(i, f, pos, _, t0)
+          or
+          traitFunctionDependsOnPos(_, _, pos, t0, i, f)
+        )
+        or
+        // match against the trait function itself
+        exists(Trait trait |
+          FunctionOverloading::traitTypeParameterOccurrence(trait, f, _, pos, _,
+            TSelfTypeParameter(trait))
+        )
+      )
+    }
+
+    class Call extends NonMethodCall {
+      Type getArgType(FunctionPosition pos, TypePath path) {
+        result = inferType(this.getNodeAt(pos), path)
+      }
+
+      predicate hasTargetCand(ImplOrTraitItemNode i, Function f) {
+        f = this.resolveAssocCallTargetCand(i)
+        or
+        exists(TraitItemNode trait, NonMethodFunction resolved, ImplItemNode i1, Function f1 |
+          this.hasTraitResolved(trait, resolved) and
+          traitFunctionDependsOnPos(trait, resolved, _, _, i1, f1)
+        |
+          f = f1 and
+          i = i1
+          or
+          f = resolved and
+          i = trait
+        )
+      }
+    }
+  }
+
+  private module NonMethodArgsAreInstantiationsOf =
+    ArgsAreInstantiationsOf<NonMethodArgsAreInstantiationsOfInput>;
+}
+
+/**
+ * A matching configuration for resolving types of calls like
+ * `foo::bar(baz)` where the target is not a method.
+ *
+ * This also includes "calls" to tuple variants and tuple structs such
+ * as `Result::Ok(42)`.
+ */
+private module NonMethodCallMatchingInput implements MatchingInputSig {
+  import FunctionPositionMatchingInput
+
   abstract class Declaration extends AstNode {
     abstract TypeParameter getTypeParameter(TypeParameterPosition ppos);
 
@@ -867,39 +2608,13 @@ private module CallExprBaseMatchingInput implements MatchingInputSig {
     }
   }
 
-  additional class FunctionDecl extends Declaration, Function {
+  private class NonMethodFunctionDecl extends Declaration, NonMethodFunction instanceof MethodCallMatchingInput::Declaration
+  {
     override TypeParameter getTypeParameter(TypeParameterPosition ppos) {
-      typeParamMatchPosition(this.getGenericParamList().getATypeParam(), result, ppos)
-      or
-      exists(ImplOrTraitItemNode i | this = i.getAnAssocItem() |
-        typeParamMatchPosition(i.getTypeParam(_), result, ppos)
-        or
-        ppos.isImplicit() and result = TSelfTypeParameter(i)
-        or
-        ppos.isImplicit() and
-        result.(AssociatedTypeTypeParameter).getTrait() = i
-      )
-      or
-      ppos.isImplicit() and
-      this = result.(ImplTraitTypeTypeParameter).getFunction()
+      result = MethodCallMatchingInput::Declaration.super.getTypeParameter(ppos)
     }
 
     override Type getParameterType(DeclarationPosition dpos, TypePath path) {
-      exists(Param p, int i |
-        paramPos(this.getParamList(), p, i) and
-        i = dpos.asPosition() and
-        result = p.getTypeRepr().(TypeMention).resolveTypeAt(path)
-      )
-      or
-      exists(SelfParam self |
-        self = pragma[only_bind_into](this.getParamList().getSelfParam()) and
-        dpos.isSelf()
-      |
-        result = inferAnnotatedType(self, path) // `self` parameter with type annotation
-        or
-        result = inferImplicitSelfType(self, path) // `self` parameter without type annotation
-      )
-      or
       // For associated functions, we may also need to match type arguments against
       // the `Self` type. For example, in
       //
@@ -916,237 +2631,180 @@ private module CallExprBaseMatchingInput implements MatchingInputSig {
       // ```
       //
       // we need to match `i32` against the type parameter `T` of the `impl` block.
+      dpos.isSelf() and
       exists(ImplOrTraitItemNode i |
         this = i.getAnAssocItem() and
-        dpos.isSelf() and
-        not this.getParamList().hasSelfParam()
-      |
-        result = TSelfTypeParameter(i) and
-        path.isEmpty()
-        or
-        result = resolveImplSelfType(i, path)
+        result = resolveImplOrTraitType(i, path)
+      )
+      or
+      exists(FunctionPosition fpos |
+        result = MethodCallMatchingInput::Declaration.super.getParameterType(fpos, path) and
+        dpos = fpos.getFunctionCallAdjusted(this)
       )
-    }
-
-    private Type resolveRetType(TypePath path) {
-      result = this.getRetType().getTypeRepr().(TypeMention).resolveTypeAt(path)
     }
 
     override Type getReturnType(TypePath path) {
-      if this.isAsync()
-      then
-        path.isEmpty() and
-        result = getFutureTraitType()
-        or
-        exists(TypePath suffix |
-          result = this.resolveRetType(suffix) and
-          path = TypePath::cons(getFutureOutputTypeParameter(), suffix)
-        )
-      else result = this.resolveRetType(path)
+      result = MethodCallMatchingInput::Declaration.super.getReturnType(path)
     }
   }
 
-  private newtype TAccessPosition =
-    TArgumentAccessPosition(ArgumentPosition pos, Boolean borrowed, Boolean certain) or
-    TReturnAccessPosition()
-
-  class AccessPosition extends TAccessPosition {
-    ArgumentPosition getArgumentPosition() { this = TArgumentAccessPosition(result, _, _) }
-
-    predicate isBorrowed(boolean certain) { this = TArgumentAccessPosition(_, true, certain) }
-
-    predicate isReturn() { this = TReturnAccessPosition() }
-
-    string toString() {
-      exists(ArgumentPosition pos, boolean borrowed, boolean certain |
-        this = TArgumentAccessPosition(pos, borrowed, certain) and
-        result = pos + ":" + borrowed + ":" + certain
-      )
-      or
-      this.isReturn() and
-      result = "(return)"
-    }
-  }
-
-  final class Access extends Call {
+  class Access extends NonMethodResolution::NonMethodCall, ContextTyping::ContextTypedCallCand {
     pragma[nomagic]
-    Type getTypeArgument(TypeArgumentPosition apos, TypePath path) {
-      exists(TypeMention arg | result = arg.resolveTypeAt(path) |
-        exists(Path p, int i |
-          p = CallExprImpl::getFunctionPath(this) and
-          arg = p.getSegment().getGenericArgList().getTypeArg(pragma[only_bind_into](i)) and
-          apos.asTypeParam() = resolvePath(p).getTypeParam(pragma[only_bind_into](i))
-        )
-        or
-        arg =
-          this.(MethodCallExpr).getGenericArgList().getTypeArg(apos.asMethodTypeArgumentPosition())
-      )
-    }
-
-    AstNode getNodeAt(AccessPosition apos) {
-      exists(ArgumentPosition pos, boolean borrowed, boolean certain |
-        apos = TArgumentAccessPosition(pos, borrowed, certain) and
-        result = this.getArgument(pos)
-      |
-        if this.implicitBorrowAt(pos, _)
-        then borrowed = true and this.implicitBorrowAt(pos, certain)
-        else (
-          borrowed = false and certain = true
-        )
-      )
-      or
-      result = this and apos.isReturn()
+    override Type getTypeArgument(TypeArgumentPosition apos, TypePath path) {
+      result = getCallExprTypeArgument(this, apos, path)
     }
 
+    pragma[nomagic]
     Type getInferredType(AccessPosition apos, TypePath path) {
-      result = inferType(this.getNodeAt(apos), path)
+      apos.isSelf() and
+      result = getCallExprTypeQualifier(this, path)
       or
-      // The `Self` type is supplied explicitly as a type qualifier, e.g. `Foo::<Bar>::baz()`
-      apos = TArgumentAccessPosition(CallImpl::TSelfArgumentPosition(), false, false) and
-      result = getTypeQualifier(this, path)
+      result = inferType(this.getNodeAt(apos), path)
     }
 
     Declaration getTarget() {
-      result = resolveMethodCallTarget(this) // mutual recursion; resolving method calls requires resolving types and vice versa
-      or
-      result = resolveFunctionCallTarget(this) // potential mutual recursion; resolving some associated function calls requires resolving types
+      result = this.resolveCallTarget() // potential mutual recursion; resolving some associated function calls requires resolving types
     }
-  }
 
-  predicate accessDeclarationPositionMatch(AccessPosition apos, DeclarationPosition dpos) {
-    apos.getArgumentPosition() = dpos.asArgumentPosition()
-    or
-    apos.isReturn() and dpos.isReturn()
-  }
-
-  bindingset[apos, target, path, t]
-  pragma[inline_late]
-  predicate adjustAccessType(
-    AccessPosition apos, Declaration target, TypePath path, Type t, TypePath pathAdj, Type tAdj
-  ) {
-    apos.isBorrowed(true) and
-    pathAdj = TypePath::cons(TRefTypeParameter(), path) and
-    tAdj = t
-    or
-    apos.isBorrowed(false) and
-    exists(Type selfParamType |
-      selfParamType =
-        target
-            .getParameterType(TArgumentDeclarationPosition(apos.getArgumentPosition()),
-              TypePath::nil())
-    |
-      if selfParamType = TRefType()
-      then
-        if t != TRefType() and path.isEmpty()
-        then
-          // adjust for implicit borrow
-          pathAdj.isEmpty() and
-          tAdj = TRefType()
-          or
-          // adjust for implicit borrow
-          pathAdj = TypePath::singleton(TRefTypeParameter()) and
-          tAdj = t
-        else
-          if path.isCons(TRefTypeParameter(), _)
-          then
-            pathAdj = path and
-            tAdj = t
-          else (
-            // adjust for implicit borrow
-            not (t = TRefType() and path.isEmpty()) and
-            pathAdj = TypePath::cons(TRefTypeParameter(), path) and
-            tAdj = t
-          )
-      else (
-        // adjust for implicit deref
-        path.isCons(TRefTypeParameter(), pathAdj) and
-        tAdj = t
-        or
-        not path.isCons(TRefTypeParameter(), _) and
-        not (t = TRefType() and path.isEmpty()) and
-        pathAdj = path and
-        tAdj = t
+    /**
+     * Holds if the return type of this call at `path` may have to be inferred
+     * from the context.
+     */
+    pragma[nomagic]
+    predicate hasUnknownTypeAt(FunctionPosition pos, TypePath path) {
+      exists(ImplOrTraitItemNode i |
+        this.hasUnknownTypeAt(i,
+          [
+            this.resolveCallTargetViaPathResolution().(NonMethodFunction),
+            this.resolveCallTargetViaTypeInference(i),
+            this.resolveTraitFunctionViaPathResolution(i)
+          ], pos, path)
       )
-    )
-    or
-    not apos.isBorrowed(_) and
-    pathAdj = path and
-    tAdj = t
+      or
+      // Tuple declarations, such as `Result::Ok(...)`, may also be context typed
+      exists(TupleDeclaration td, TypeParameter tp |
+        td = this.resolveCallTargetViaPathResolution() and
+        pos.isReturn() and
+        tp = td.getReturnType(path) and
+        not tp = td.getParameterType(_, _) and
+        // check that no explicit type arguments have been supplied for `tp`
+        not exists(TypeArgumentPosition tapos |
+          exists(this.getTypeArgument(tapos, _)) and
+          TTypeParamTypeParameter(tapos.asTypeParam()) = tp
+        )
+      )
+    }
   }
 }
 
-private module CallExprBaseMatching = Matching<CallExprBaseMatchingInput>;
+private module NonMethodCallMatching = Matching<NonMethodCallMatchingInput>;
 
-/**
- * Gets the type of `n` at `path`, where `n` is either a call or an
- * argument/receiver of a call.
- */
 pragma[nomagic]
-private Type inferCallExprBaseType(AstNode n, TypePath path) {
-  exists(
-    CallExprBaseMatchingInput::Access a, CallExprBaseMatchingInput::AccessPosition apos,
-    TypePath path0
-  |
+private Type inferNonMethodCallType0(AstNode n, boolean isReturn, TypePath path) {
+  exists(NonMethodCallMatchingInput::Access a, NonMethodCallMatchingInput::AccessPosition apos |
     n = a.getNodeAt(apos) and
-    result = CallExprBaseMatching::inferAccessType(a, apos, path0)
+    if apos.isReturn() then isReturn = true else isReturn = false
   |
-    if
-      apos.isBorrowed(true)
-      or
-      // The desugaring of the unary `*e` is `*Deref::deref(&e)` and the
-      // desugaring of `a[b]` is `*Index::index(&a, b)`. To handle the deref
-      // expression after the call we must strip a `&` from the type at the
-      // return position.
-      apos.isReturn() and
-      (a instanceof DerefExpr or a instanceof IndexExpr)
-    then path0.isCons(TRefTypeParameter(), path)
-    else
-      if apos.isBorrowed(false)
-      then
-        exists(Type argType | argType = inferType(n) |
-          if argType = TRefType()
-          then
-            path = path0 and
-            path0.isCons(TRefTypeParameter(), _)
-            or
-            // adjust for implicit deref
-            not path0.isCons(TRefTypeParameter(), _) and
-            not (path0.isEmpty() and result = TRefType()) and
-            path = TypePath::cons(TRefTypeParameter(), path0)
-          else (
-            not (
-              argType.(StructType).asItemNode() instanceof StringStruct and
-              result.(StructType).asItemNode() instanceof Builtins::Str
-            ) and
-            (
-              not path0.isCons(TRefTypeParameter(), _) and
-              not (path0.isEmpty() and result = TRefType()) and
-              path = path0
-              or
-              // adjust for implicit borrow
-              path0.isCons(TRefTypeParameter(), path)
-            )
-          )
-        )
-      else (
-        not apos.isBorrowed(_) and
-        path = path0
-      )
+    result = NonMethodCallMatching::inferAccessType(a, apos, path)
+    or
+    a.hasUnknownTypeAt(apos, path) and
+    result = TUnknownType()
   )
 }
 
-pragma[inline]
-private Type inferRootTypeDeref(AstNode n) {
-  result = inferType(n) and
-  result != TRefType()
-  or
-  // for reference types, lookup members in the type being referenced
-  result = inferType(n, TypePath::singleton(TRefTypeParameter()))
+private predicate inferNonMethodCallType =
+  ContextTyping::CheckContextTyping<inferNonMethodCallType0/3>::check/2;
+
+/**
+ * A matching configuration for resolving types of operations like `a + b`.
+ */
+private module OperationMatchingInput implements MatchingInputSig {
+  private import codeql.rust.elements.internal.OperationImpl as OperationImpl
+  import FunctionPositionMatchingInput
+
+  class Declaration extends MethodCallMatchingInput::Declaration {
+    private Method getSelfOrImpl() {
+      result = this
+      or
+      this.implements(result)
+    }
+
+    pragma[nomagic]
+    private predicate borrowsAt(DeclarationPosition pos) {
+      exists(TraitItemNode t, string path, string method |
+        this.getSelfOrImpl() = t.getAssocItem(method) and
+        path = t.getCanonicalPath(_) and
+        exists(int borrows | OperationImpl::isOverloaded(_, _, path, method, borrows) |
+          pos.isSelf() and borrows >= 1
+          or
+          pos.asPosition() = 0 and
+          borrows >= 2
+        )
+      )
+    }
+
+    pragma[nomagic]
+    private Type getParameterType(DeclarationPosition dpos, TypePath path) {
+      exists(TypePath path0 |
+        result = super.getParameterType(dpos, path0) and
+        if this.borrowsAt(dpos) then path0.isCons(TRefTypeParameter(), path) else path0 = path
+      )
+    }
+
+    pragma[nomagic]
+    private predicate derefsReturn() { this.getSelfOrImpl() = any(DerefTrait t).getDerefFunction() }
+
+    pragma[nomagic]
+    private Type getReturnType(TypePath path) {
+      exists(TypePath path0 |
+        result = super.getReturnType(path0) and
+        if this.derefsReturn() then path0.isCons(TRefTypeParameter(), path) else path0 = path
+      )
+    }
+
+    Type getDeclaredType(DeclarationPosition dpos, TypePath path) {
+      result = this.getParameterType(dpos, path)
+      or
+      dpos.isReturn() and
+      result = this.getReturnType(path)
+    }
+  }
+
+  class Access extends MethodResolution::MethodCallOperation {
+    Type getTypeArgument(TypeArgumentPosition apos, TypePath path) { none() }
+
+    pragma[nomagic]
+    Type getInferredType(AccessPosition apos, TypePath path) {
+      result = inferType(this.getNodeAt(apos), path)
+    }
+
+    Declaration getTarget() {
+      result = this.resolveCallTarget(_, _, _) // mutual recursion
+    }
+  }
 }
 
+private module OperationMatching = Matching<OperationMatchingInput>;
+
+pragma[nomagic]
+private Type inferOperationType0(AstNode n, boolean isReturn, TypePath path) {
+  exists(OperationMatchingInput::Access a, OperationMatchingInput::AccessPosition apos |
+    n = a.getNodeAt(apos) and
+    result = OperationMatching::inferAccessType(a, apos, path) and
+    if apos.isReturn() then isReturn = true else isReturn = false
+  )
+}
+
+private predicate inferOperationType =
+  ContextTyping::CheckContextTyping<inferOperationType0/3>::check/2;
+
 pragma[nomagic]
 private Type getFieldExprLookupType(FieldExpr fe, string name) {
-  result = inferRootTypeDeref(fe.getContainer()) and name = fe.getIdentifier().getText()
+  exists(TypePath path |
+    result = inferType(fe.getContainer(), path) and
+    name = fe.getIdentifier().getText() and
+    isComplexRootStripped(path, result)
+  )
 }
 
 pragma[nomagic]
@@ -1166,8 +2824,7 @@ private TupleTypeParameter resolveTupleTypeFieldExpr(FieldExpr fe) {
 }
 
 /**
- * A matching configuration for resolving types of field expressions
- * like `x.field`.
+ * A matching configuration for resolving types of field expressions like `x.field`.
  */
 private module FieldExprMatchingInput implements MatchingInputSig {
   private newtype TDeclarationPosition =
@@ -1287,7 +2944,17 @@ private module FieldExprMatchingInput implements MatchingInputSig {
     }
 
     Type getInferredType(AccessPosition apos, TypePath path) {
-      result = inferType(this.getNodeAt(apos), path)
+      exists(TypePath path0 | result = inferType(this.getNodeAt(apos), path0) |
+        if apos.isSelf()
+        then
+          // adjust for implicit deref
+          path0.isCons(TRefTypeParameter(), path)
+          or
+          not path0.isCons(TRefTypeParameter(), _) and
+          not (result = TRefType() and path0.isEmpty()) and
+          path = path0
+        else path = path0
+      )
     }
 
     Declaration getTarget() {
@@ -1304,28 +2971,6 @@ private module FieldExprMatchingInput implements MatchingInputSig {
   predicate accessDeclarationPositionMatch(AccessPosition apos, DeclarationPosition dpos) {
     apos = dpos
   }
-
-  bindingset[apos, target, path, t]
-  pragma[inline_late]
-  predicate adjustAccessType(
-    AccessPosition apos, Declaration target, TypePath path, Type t, TypePath pathAdj, Type tAdj
-  ) {
-    exists(target) and
-    if apos.isSelf()
-    then
-      // adjust for implicit deref
-      path.isCons(TRefTypeParameter(), pathAdj) and
-      tAdj = t
-      or
-      not path.isCons(TRefTypeParameter(), _) and
-      not (t = TRefType() and path.isEmpty()) and
-      pathAdj = path and
-      tAdj = t
-    else (
-      pathAdj = path and
-      tAdj = t
-    )
-  }
 }
 
 private module FieldExprMatching = Matching<FieldExprMatchingInput>;
@@ -1385,6 +3030,9 @@ private Type inferTryExprType(TryExpr te, TypePath path) {
 pragma[nomagic]
 private StructType getStrStruct() { result = TStruct(any(Builtins::Str s)) }
 
+pragma[nomagic]
+private StructType getStringStruct() { result = TStruct(any(StringStruct s)) }
+
 pragma[nomagic]
 private Type inferLiteralType(LiteralExpr le, TypePath path, boolean certain) {
   path.isEmpty() and
@@ -1435,10 +3083,37 @@ private AssociatedTypeTypeParameter getFutureOutputTypeParameter() {
 }
 
 pragma[nomagic]
-private TraitType inferAsyncBlockExprRootType(AsyncBlockExpr abe) {
+predicate isUnitBlockExpr(BlockExpr be) {
+  not be.getStmtList().hasTailExpr() and
+  not be = any(Callable c).getBody() and
+  not be.hasLabel()
+}
+
+pragma[nomagic]
+private Type inferBlockExprType(BlockExpr be, TypePath path) {
   // `typeEquality` handles the non-root case
-  exists(abe) and
-  result = getFutureTraitType()
+  if be instanceof AsyncBlockExpr
+  then (
+    path.isEmpty() and
+    result = getFutureTraitType()
+    or
+    isUnitBlockExpr(be) and
+    path = TypePath::singleton(getFutureOutputTypeParameter()) and
+    result instanceof UnitType
+  ) else (
+    isUnitBlockExpr(be) and
+    path.isEmpty() and
+    result instanceof UnitType
+  )
+}
+
+pragma[nomagic]
+private predicate exprHasUnitType(Expr e) {
+  e = any(IfExpr ie | not ie.hasElse())
+  or
+  e instanceof WhileExpr
+  or
+  e instanceof ForExpr
 }
 
 final private class AwaitTarget extends Expr {
@@ -1463,14 +3138,6 @@ private Type inferAwaitExprType(AstNode n, TypePath path) {
   )
 }
 
-private class Vec extends Struct {
-  Vec() { this.getCanonicalPath() = "alloc::vec::Vec" }
-
-  TypeParamTypeParameter getElementTypeParameter() {
-    result.getTypeParam() = this.getGenericParamList().getTypeParam(0)
-  }
-}
-
 /**
  * Gets the root type of the array expression `ae`.
  */
@@ -1508,7 +3175,8 @@ private Type inferIndexExprType(IndexExpr ie, TypePath path) {
     ) and
     result = inferType(ie.getBase(), exprPath)
   |
-    exprPath.isCons(any(Vec v).getElementTypeParameter(), path)
+    // todo: remove?
+    exprPath.isCons(TTypeParamTypeParameter(any(Vec v).getElementTypeParam()), path)
     or
     exprPath.isCons(any(ArrayTypeParameter tp), path)
     or
@@ -1576,11 +3244,9 @@ private Type inferStructPatType(AstNode n, TypePath path) {
  * like `let Some(x) = ...`.
  */
 private module TupleStructPatMatchingInput implements MatchingInputSig {
-  class DeclarationPosition = CallExprBaseMatchingInput::DeclarationPosition;
+  import FunctionPositionMatchingInput
 
-  class Declaration = CallExprBaseMatchingInput::TupleDeclaration;
-
-  class AccessPosition = DeclarationPosition;
+  class Declaration = NonMethodCallMatchingInput::TupleDeclaration;
 
   class Access extends TupleStructPat {
     Type getTypeArgument(TypeArgumentPosition apos, TypePath path) { none() }
@@ -1603,10 +3269,6 @@ private module TupleStructPatMatchingInput implements MatchingInputSig {
 
     Declaration getTarget() { result = resolvePath(this.getPath()) }
   }
-
-  predicate accessDeclarationPositionMatch(AccessPosition apos, DeclarationPosition dpos) {
-    apos = dpos
-  }
 }
 
 private module TupleStructPatMatching = Matching<TupleStructPatMatchingInput>;
@@ -1780,7 +3442,7 @@ private Type inferClosureExprType(AstNode n, TypePath path) {
     result = TTuple(ce.getNumberOfParams())
     or
     // Propagate return type annotation to body
-    n = ce.getBody() and
+    n = ce.getClosureBody() and
     result = ce.getRetType().getTypeRepr().(TypeMention).resolveTypeAt(path)
   )
 }
@@ -1790,465 +3452,6 @@ private Type inferCastExprType(CastExpr ce, TypePath path) {
   result = ce.getTypeRepr().(TypeMention).resolveTypeAt(path)
 }
 
-final class MethodCall extends Call {
-  MethodCall() { exists(this.getReceiver()) }
-
-  private Type getReceiverTypeAt(TypePath path) {
-    result = inferType(super.getReceiver(), path)
-    or
-    result = getTypeQualifier(this, path)
-  }
-
-  /** Gets the type of the receiver of the method call at `path`. */
-  Type getTypeAt(TypePath path) {
-    if
-      this.receiverImplicitlyBorrowed() or
-      this.(CallImpl::CallExprMethodCall).hasExplicitSelfBorrow()
-    then
-      exists(TypePath path0, Type t0 |
-        t0 = this.getReceiverTypeAt(path0) and
-        (
-          path0.isCons(TRefTypeParameter(), path)
-          or
-          (
-            not path0.isCons(TRefTypeParameter(), _) and
-            not (path0.isEmpty() and result = TRefType())
-            or
-            // Ideally we should find all methods on reference types, but as
-            // that currently causes a blowup we limit this to the `deref`
-            // method in order to make dereferencing work.
-            this.getMethodName() = "deref"
-          ) and
-          path = path0
-        )
-      |
-        result = t0
-        or
-        // We do not yet model the `Deref` trait, so we hard-code the fact that
-        // `String` dereferences to `str` here. This allows us e.g. to resolve
-        // `x.parse::<usize>()` to the function `<core::str>::parse` when `x` has
-        // type `String`.
-        //
-        // See also https://doc.rust-lang.org/reference/expressions/method-call-expr.html#r-expr.method.autoref-deref
-        path.isEmpty() and
-        t0.(StructType).asItemNode() instanceof StringStruct and
-        result.(StructType).asItemNode() instanceof Builtins::Str
-      )
-    else result = this.getReceiverTypeAt(path)
-  }
-}
-
-/**
- * Holds if a method for `type` with the name `name` and the arity `arity`
- * exists in `impl`.
- */
-pragma[nomagic]
-private predicate methodCandidate(Type type, string name, int arity, Impl impl) {
-  type = impl.getSelfTy().(TypeMention).resolveType() and
-  exists(Function f |
-    f = impl.(ImplItemNode).getASuccessor(name) and
-    f.getParamList().hasSelfParam() and
-    arity = f.getParamList().getNumberOfParams()
-  )
-}
-
-/**
- * Holds if a method for `type` for `trait` with the name `name` and the arity
- * `arity` exists in `impl`.
- */
-pragma[nomagic]
-private predicate methodCandidateTrait(Type type, Trait trait, string name, int arity, Impl impl) {
-  trait = resolvePath(impl.(ImplItemNode).getTraitPath()) and
-  methodCandidate(type, name, arity, impl)
-}
-
-pragma[nomagic]
-private predicate isMethodCall(MethodCall mc, Type rootType, string name, int arity) {
-  rootType = mc.getTypeAt(TypePath::nil()) and
-  name = mc.getMethodName() and
-  arity = mc.getNumberOfArguments()
-}
-
-private module IsInstantiationOfInput implements IsInstantiationOfInputSig<MethodCall> {
-  pragma[nomagic]
-  predicate potentialInstantiationOf(MethodCall mc, TypeAbstraction impl, TypeMention constraint) {
-    exists(Type rootType, string name, int arity |
-      isMethodCall(mc, rootType, name, arity) and
-      constraint = impl.(ImplTypeAbstraction).getSelfTy()
-    |
-      methodCandidateTrait(rootType, mc.getTrait(), name, arity, impl)
-      or
-      not exists(mc.getTrait()) and
-      methodCandidate(rootType, name, arity, impl)
-    )
-  }
-
-  predicate relevantTypeMention(TypeMention constraint) {
-    exists(Impl impl | methodCandidate(_, _, _, impl) and constraint = impl.getSelfTy())
-  }
-}
-
-bindingset[item, name]
-pragma[inline_late]
-private Function getMethodSuccessor(ItemNode item, string name) {
-  result = item.getASuccessor(name)
-}
-
-bindingset[tp, name]
-pragma[inline_late]
-private Function getTypeParameterMethod(TypeParameter tp, string name) {
-  result = getMethodSuccessor(tp.(TypeParamTypeParameter).getTypeParam(), name)
-  or
-  result = getMethodSuccessor(tp.(SelfTypeParameter).getTrait(), name)
-  or
-  result = getMethodSuccessor(tp.(ImplTraitTypeTypeParameter).getImplTraitTypeRepr(), name)
-}
-
-pragma[nomagic]
-private Type resolveNonTypeParameterTypeAt(TypeMention tm, TypePath path) {
-  result = tm.resolveTypeAt(path) and
-  not result instanceof TypeParameter
-}
-
-bindingset[t1, t2]
-private predicate typeMentionEqual(TypeMention t1, TypeMention t2) {
-  forex(TypePath path, Type type | resolveNonTypeParameterTypeAt(t1, path) = type |
-    resolveNonTypeParameterTypeAt(t2, path) = type
-  )
-}
-
-pragma[nomagic]
-private predicate implSiblingCandidate(
-  Impl impl, TraitItemNode trait, Type rootType, TypeMention selfTy
-) {
-  trait = impl.(ImplItemNode).resolveTraitTy() and
-  // If `impl` has an expansion from a macro attribute, then it's been
-  // superseded by the output of the expansion (and usually the expansion
-  // contains the same `impl` block so considering both would give spurious
-  // siblings).
-  not exists(impl.getAttributeMacroExpansion()) and
-  selfTy = impl.getSelfTy() and
-  rootType = selfTy.resolveType()
-}
-
-/**
- * Holds if `impl1` and `impl2` are a sibling implementations of `trait`. We
- * consider implementations to be siblings if they implement the same trait for
- * the same type. In that case `Self` is the same type in both implementations,
- * and method calls to the implementations cannot be resolved unambiguously
- * based only on the receiver type.
- */
-pragma[inline]
-private predicate implSiblings(TraitItemNode trait, Impl impl1, Impl impl2) {
-  exists(Type rootType, TypeMention selfTy1, TypeMention selfTy2 |
-    impl1 != impl2 and
-    implSiblingCandidate(impl1, trait, rootType, selfTy1) and
-    implSiblingCandidate(impl2, trait, rootType, selfTy2) and
-    // In principle the second conjunct below should be superflous, but we still
-    // have ill-formed type mentions for types that we don't understand. For
-    // those checking both directions restricts further. Note also that we check
-    // syntactic equality, whereas equality up to renaming would be more
-    // correct.
-    typeMentionEqual(selfTy1, selfTy2) and
-    typeMentionEqual(selfTy2, selfTy1)
-  )
-}
-
-/**
- * Holds if `impl` is an implementation of `trait` and if another implementation
- * exists for the same type.
- */
-pragma[nomagic]
-private predicate implHasSibling(Impl impl, Trait trait) { implSiblings(trait, impl, _) }
-
-pragma[nomagic]
-private predicate functionTypeAtPath(Function f, int pos, TypePath path, Type type) {
-  exists(TypeMention tm | type = tm.resolveTypeAt(path) |
-    tm = f.getParam(pos).getTypeRepr()
-    or
-    pos = -1 and
-    tm = f.getRetType().getTypeRepr()
-  )
-}
-
-/**
- * Holds if type parameter `tp` of `trait` occurs in the function with the name
- * `functionName` at the `pos`th parameter at `path`.
- *
- * The special position `-1` refers to the return type of the function, which
- * is sometimes needed to disambiguate associated function calls like
- * `Default::default()` (in this case, `tp` is the special `Self` type parameter).
- */
-bindingset[trait]
-pragma[inline_late]
-private predicate traitTypeParameterOccurrence(
-  TraitItemNode trait, Function f, string functionName, int pos, TypePath path, TypeParameter tp
-) {
-  f = trait.getAssocItem(functionName) and
-  functionTypeAtPath(f, pos, path, tp) and
-  tp = trait.(TraitTypeAbstraction).getATypeParameter()
-}
-
-/**
- * Holds if resolving the function `f` in `impl` with the name `functionName`
- * requires inspecting the types of applied _arguments_ in order to determine
- * whether it is the correct resolution.
- */
-pragma[nomagic]
-private predicate functionResolutionDependsOnArgument(
-  ImplItemNode impl, string functionName, Function f, int pos, TypePath path, Type type
-) {
-  /*
-   * As seen in the example below, when an implementation has a sibling for a
-   * trait we find occurrences of a type parameter of the trait in a function
-   * signature in the trait. We then find the type given in the implementation
-   * at the same position, which is a position that might disambiguate the
-   * function from its siblings.
-   *
-   * ```rust
-   * trait MyTrait<T> {
-   *     fn method(&self, value: Foo<T>) -> Self;
-   * //                   ^^^^^^^^^^^^^ `pos` = 0
-   * //                              ^ `path` = "T"
-   * }
-   * impl MyAdd<i64> for i64 {
-   *     fn method(&self, value: Foo<i64>) -> Self { ... }
-   * //                              ^^^ `type` = i64
-   * }
-   * ```
-   *
-   * Note that we only check the root type symbol at the position. If the type
-   * at that position is a type constructor (for instance `Vec<..>`) then
-   * inspecting the entire type tree could be necessary to disambiguate the
-   * method. In that case we will still resolve several methods.
-   */
-
-  exists(TraitItemNode trait |
-    implHasSibling(impl, trait) and
-    traitTypeParameterOccurrence(trait, _, functionName, pos, path, _) and
-    functionTypeAtPath(f, pos, path, type) and
-    f = impl.getAssocItem(functionName) and
-    pos >= 0
-  )
-}
-
-/**
- * Holds if the method call `mc` has no inherent target, i.e., it does not
- * resolve to a method in an `impl` block for the type of the receiver.
- */
-pragma[nomagic]
-private predicate methodCallHasNoInherentTarget(MethodCall mc) {
-  exists(Type rootType, string name, int arity |
-    isMethodCall(mc, rootType, name, arity) and
-    forall(Impl impl |
-      methodCandidate(rootType, name, arity, impl) and
-      not impl.hasTrait()
-    |
-      IsInstantiationOf<MethodCall, IsInstantiationOfInput>::isNotInstantiationOf(mc, impl, _)
-    )
-  )
-}
-
-pragma[nomagic]
-private predicate methodCallHasImplCandidate(MethodCall mc, Impl impl) {
-  IsInstantiationOf<MethodCall, IsInstantiationOfInput>::isInstantiationOf(mc, impl, _) and
-  if impl.hasTrait() and not exists(mc.getTrait())
-  then
-    // inherent methods take precedence over trait methods, so only allow
-    // trait methods when there are no matching inherent methods
-    methodCallHasNoInherentTarget(mc)
-  else any()
-}
-
-/** Gets a method from an `impl` block that matches the method call `mc`. */
-pragma[nomagic]
-private Function getMethodFromImpl(MethodCall mc) {
-  exists(Impl impl, string name |
-    methodCallHasImplCandidate(mc, impl) and
-    name = mc.getMethodName() and
-    result = getMethodSuccessor(impl, name)
-  |
-    not functionResolutionDependsOnArgument(impl, name, _, _, _, _)
-    or
-    exists(int pos, TypePath path, Type type |
-      functionResolutionDependsOnArgument(impl, name, result, pos, pragma[only_bind_into](path),
-        type) and
-      inferType(mc.getPositionalArgument(pos), pragma[only_bind_into](path)) = type
-    )
-  )
-}
-
-bindingset[trait, name]
-pragma[inline_late]
-private Function getImplTraitMethod(ImplTraitReturnType trait, string name) {
-  result = getMethodSuccessor(trait.getImplTraitTypeRepr(), name)
-}
-
-bindingset[traitObject, name]
-pragma[inline_late]
-private Function getDynTraitMethod(DynTraitType traitObject, string name) {
-  result = getMethodSuccessor(traitObject.getTrait(), name)
-}
-
-pragma[nomagic]
-private Function resolveMethodCallTarget(MethodCall mc) {
-  // The method comes from an `impl` block targeting the type of the receiver.
-  result = getMethodFromImpl(mc)
-  or
-  // The type of the receiver is a type parameter and the method comes from a
-  // trait bound on the type parameter.
-  result = getTypeParameterMethod(mc.getTypeAt(TypePath::nil()), mc.getMethodName())
-  or
-  // The type of the receiver is an `impl Trait` type.
-  result = getImplTraitMethod(mc.getTypeAt(TypePath::nil()), mc.getMethodName())
-  or
-  // The type of the receiver is a trait object `dyn Trait` type.
-  result = getDynTraitMethod(mc.getTypeAt(TypePath::nil()), mc.getMethodName())
-}
-
-pragma[nomagic]
-private predicate assocFuncResolutionDependsOnArgument(Function f, Impl impl, int pos) {
-  functionResolutionDependsOnArgument(impl, _, f, pos, _, _) and
-  not f.getParamList().hasSelfParam()
-}
-
-private class FunctionCallExpr extends CallImpl::CallExprCall {
-  ItemNode getResolvedFunction() { result = CallExprImpl::getResolvedFunction(this) }
-
-  /**
-   * Holds if the target of this call is ambigous, and type information is required
-   * to disambiguate.
-   */
-  predicate isAmbigous() {
-    this.hasTrait()
-    or
-    assocFuncResolutionDependsOnArgument(this.getResolvedFunction(), _, _)
-  }
-
-  /**
-   * Gets a target candidate of this ambigous call, which belongs to `impl`.
-   *
-   * In order for the candidate to be a match, the argument type at `pos` must be
-   * checked against the type of the function at the same position.
-   *
-   * `resolved` is the corresponding function resolved through path resolution.
-   */
-  pragma[nomagic]
-  Function getAnAmbigousCandidate(ImplItemNode impl, int pos, Function resolved) {
-    resolved = this.getResolvedFunction() and
-    (
-      exists(TraitItemNode trait |
-        trait = this.getTrait() and
-        result.implements(resolved) and
-        result = impl.getAnAssocItem()
-      |
-        assocFuncResolutionDependsOnArgument(result, impl, pos)
-        or
-        exists(TypeParameter tp | traitTypeParameterOccurrence(trait, resolved, _, pos, _, tp) |
-          pos >= 0
-          or
-          // We only check that the context of the call provides relevant type information
-          // when no argument can
-          not traitTypeParameterOccurrence(trait, resolved, _, any(int pos0 | pos0 >= 0), _, tp)
-        )
-      )
-      or
-      result = resolved and
-      assocFuncResolutionDependsOnArgument(result, impl, pos)
-    )
-  }
-
-  /**
-   * Same as `getAnAmbigousCandidate`, ranks the positions to be checked.
-   */
-  Function getAnAmbigousCandidateRanked(ImplItemNode impl, int pos, Function f, int rnk) {
-    pos = rank[rnk + 1](int pos0 | result = this.getAnAmbigousCandidate(impl, pos0, f) | pos0)
-  }
-}
-
-private newtype TAmbigousAssocFunctionCallExpr =
-  MkAmbigousAssocFunctionCallExpr(FunctionCallExpr call, Function resolved, int pos) {
-    exists(call.getAnAmbigousCandidate(_, pos, resolved))
-  }
-
-private class AmbigousAssocFunctionCallExpr extends MkAmbigousAssocFunctionCallExpr {
-  FunctionCallExpr call;
-  Function resolved;
-  int pos;
-
-  AmbigousAssocFunctionCallExpr() { this = MkAmbigousAssocFunctionCallExpr(call, resolved, pos) }
-
-  pragma[nomagic]
-  Type getTypeAt(TypePath path) {
-    result = inferType(call.(CallExpr).getArg(pos), path)
-    or
-    pos = -1 and
-    result = inferType(call, path)
-  }
-
-  string toString() { result = call.toString() }
-
-  Location getLocation() { result = call.getLocation() }
-}
-
-private module AmbigousAssocFuncIsInstantiationOfInput implements
-  IsInstantiationOfInputSig<AmbigousAssocFunctionCallExpr>
-{
-  pragma[nomagic]
-  predicate potentialInstantiationOf(
-    AmbigousAssocFunctionCallExpr ce, TypeAbstraction impl, TypeMention constraint
-  ) {
-    exists(FunctionCallExpr call, Function resolved, Function cand, int pos |
-      ce = MkAmbigousAssocFunctionCallExpr(call, resolved, pos) and
-      cand = call.getAnAmbigousCandidate(impl, pos, resolved)
-    |
-      constraint = cand.getParam(pos).getTypeRepr()
-      or
-      pos = -1 and
-      constraint = cand.getRetType().getTypeRepr()
-    )
-  }
-}
-
-/**
- * Gets the target of `call`, where resolution does not rely on type inference.
- */
-pragma[nomagic]
-private ItemNode resolveUnambigousFunctionCallTarget(FunctionCallExpr call) {
-  result = call.getResolvedFunction() and
-  not call.isAmbigous()
-}
-
-pragma[nomagic]
-private Function resolveAmbigousFunctionCallTargetFromIndex(FunctionCallExpr call, int index) {
-  exists(Impl impl, int pos, Function resolved |
-    IsInstantiationOf<AmbigousAssocFunctionCallExpr, AmbigousAssocFuncIsInstantiationOfInput>::isInstantiationOf(MkAmbigousAssocFunctionCallExpr(call,
-        resolved, pos), impl, _) and
-    result = call.getAnAmbigousCandidateRanked(impl, pos, resolved, index)
-  |
-    index = 0
-    or
-    result = resolveAmbigousFunctionCallTargetFromIndex(call, index - 1)
-  )
-}
-
-/**
- * Gets the target of `call`, where resolution relies on type inference.
- */
-pragma[nomagic]
-private Function resolveAmbigousFunctionCallTarget(FunctionCallExpr call) {
-  result =
-    resolveAmbigousFunctionCallTargetFromIndex(call,
-      max(int index | result = call.getAnAmbigousCandidateRanked(_, _, _, index)))
-}
-
-pragma[inline]
-private ItemNode resolveFunctionCallTarget(FunctionCallExpr call) {
-  result = resolveUnambigousFunctionCallTarget(call)
-  or
-  result = resolveAmbigousFunctionCallTarget(call)
-}
-
 cached
 private module Cached {
   private import codeql.rust.internal.CachedStages
@@ -2256,33 +3459,21 @@ private module Cached {
   /** Holds if `receiver` is the receiver of a method call with an implicit dereference. */
   cached
   predicate receiverHasImplicitDeref(AstNode receiver) {
-    exists(CallExprBaseMatchingInput::Access a, CallExprBaseMatchingInput::AccessPosition apos |
-      apos.getArgumentPosition().isSelf() and
-      apos.isBorrowed(_) and
-      receiver = a.getNodeAt(apos) and
-      inferType(receiver) = TRefType() and
-      CallExprBaseMatching::inferAccessType(a, apos, TypePath::nil()) != TRefType()
-    )
+    any(MethodResolution::MethodCall mc).receiverHasImplicitDeref(receiver)
   }
 
   /** Holds if `receiver` is the receiver of a method call with an implicit borrow. */
   cached
   predicate receiverHasImplicitBorrow(AstNode receiver) {
-    exists(CallExprBaseMatchingInput::Access a, CallExprBaseMatchingInput::AccessPosition apos |
-      apos.getArgumentPosition().isSelf() and
-      apos.isBorrowed(_) and
-      receiver = a.getNodeAt(apos) and
-      CallExprBaseMatching::inferAccessType(a, apos, TypePath::nil()) = TRefType() and
-      inferType(receiver) != TRefType()
-    )
+    any(MethodResolution::MethodCall mc).receiverHasImplicitBorrow(receiver)
   }
 
-  /** Gets a function that `call` resolves to, if any. */
+  /** Gets an item (function or tuple struct/variant) that `call` resolves to, if any. */
   cached
-  Function resolveCallTarget(Call call) {
-    result = resolveMethodCallTarget(call)
+  Addressable resolveCallTarget(Call call) {
+    result = call.(MethodResolution::MethodCall).resolveCallTarget(_, _, _)
     or
-    result = resolveFunctionCallTarget(call)
+    result = call.(NonMethodResolution::NonMethodCall).resolveCallTarget()
   }
 
   /**
@@ -2290,7 +3481,10 @@ private module Cached {
    */
   cached
   StructField resolveStructFieldExpr(FieldExpr fe) {
-    exists(string name | result = getFieldExprLookupType(fe, name).getStructField(name))
+    exists(string name, Type ty | ty = getFieldExprLookupType(fe, pragma[only_bind_into](name)) |
+      result = ty.(StructType).getStruct().getStructField(pragma[only_bind_into](name)) or
+      result = ty.(UnionType).getUnion().getStructField(pragma[only_bind_into](name))
+    )
   }
 
   /**
@@ -2298,7 +3492,13 @@ private module Cached {
    */
   cached
   TupleField resolveTupleFieldExpr(FieldExpr fe) {
-    exists(int i | result = getTupleFieldExprLookupType(fe, i).getTupleField(i))
+    exists(int i |
+      result =
+        getTupleFieldExprLookupType(fe, pragma[only_bind_into](i))
+            .(StructType)
+            .getStruct()
+            .getTupleField(pragma[only_bind_into](i))
+    )
   }
 
   /**
@@ -2353,45 +3553,26 @@ private module Cached {
       else any()
     ) and
     (
-      result = inferAnnotatedType(n, path)
-      or
-      result = inferLogicalOperationType(n, path)
-      or
       result = inferAssignmentOperationType(n, path)
       or
       result = inferTypeEquality(n, path)
       or
-      result = inferImplicitSelfType(n, path)
-      or
       result = inferStructExprType(n, path)
       or
-      result = inferTupleRootType(n) and
-      path.isEmpty()
+      result = inferMethodCallType(n, path)
       or
-      result = inferPathExprType(n, path)
+      result = inferNonMethodCallType(n, path)
       or
-      result = inferCallExprBaseType(n, path)
+      result = inferOperationType(n, path)
       or
       result = inferFieldExprType(n, path)
       or
-      result = inferRefNodeType(n) and
-      path.isEmpty()
-      or
       result = inferTryExprType(n, path)
       or
       result = inferLiteralType(n, path, false)
       or
-      result = inferAsyncBlockExprRootType(n) and
-      path.isEmpty()
-      or
       result = inferAwaitExprType(n, path)
       or
-      result = inferArrayExprType(n) and
-      path.isEmpty()
-      or
-      result = inferRangeExprType(n) and
-      path.isEmpty()
-      or
       result = inferIndexExprType(n, path)
       or
       result = inferForLoopExprType(n, path)
@@ -2400,8 +3581,6 @@ private module Cached {
       or
       result = inferClosureExprType(n, path)
       or
-      result = inferCastExprType(n, path)
-      or
       result = inferStructPatType(n, path)
       or
       result = inferTupleStructPatType(n, path)
@@ -2418,7 +3597,7 @@ Type inferType(AstNode n) { result = inferType(n, TypePath::nil()) }
 
 /** Provides predicates for debugging the type inference implementation. */
 private module Debug {
-  private Locatable getRelevantLocatable() {
+  Locatable getRelevantLocatable() {
     exists(string filepath, int startline, int startcolumn, int endline, int endcolumn |
       result.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn) and
       filepath.matches("%/sqlx.rs") and
@@ -2431,7 +3610,7 @@ private module Debug {
     result = inferType(n, path)
   }
 
-  Function debugResolveCallTarget(Call c) {
+  Addressable debugResolveCallTarget(Call c) {
     c = getRelevantLocatable() and
     result = resolveCallTarget(c)
   }
@@ -2443,14 +3622,19 @@ private module Debug {
     Input2::conditionSatisfiesConstraint(abs, condition, constraint)
   }
 
-  predicate debugInferImplicitSelfType(SelfParam self, TypePath path, Type t) {
+  predicate debugInferShorthandSelfType(ShorthandSelfParameterMention self, TypePath path, Type t) {
     self = getRelevantLocatable() and
-    t = inferImplicitSelfType(self, path)
+    t = self.resolveTypeAt(path)
   }
 
-  predicate debugInferCallExprBaseType(AstNode n, TypePath path, Type t) {
+  predicate debugInferMethodCallType(AstNode n, TypePath path, Type t) {
     n = getRelevantLocatable() and
-    t = inferCallExprBaseType(n, path)
+    t = inferMethodCallType(n, path)
+  }
+
+  predicate debugInferNonMethodCallType(AstNode n, TypePath path, Type t) {
+    n = getRelevantLocatable() and
+    t = inferNonMethodCallType(n, path)
   }
 
   predicate debugTypeMention(TypeMention tm, TypePath path, Type type) {
@@ -2469,9 +3653,14 @@ private module Debug {
     result = strictcount(Type t0 | t0 = inferType(n, path))
   }
 
+  pragma[nomagic]
+  private predicate atLimit(AstNode n) {
+    exists(TypePath path0 | exists(inferType(n, path0)) and path0.length() >= getTypePathLimit())
+  }
+
   Type debugInferTypeForNodeAtLimit(AstNode n, TypePath path) {
     result = inferType(n, path) and
-    exists(TypePath path0 | exists(inferType(n, path0)) and path0.length() >= getTypePathLimit())
+    atLimit(n)
   }
 
   predicate countTypesForNodeAtLimit(AstNode n, int c) {
@@ -2513,7 +3702,6 @@ private module Debug {
 
   Type debugInferCertainNonUniqueType(AstNode n, TypePath path) {
     n = getRelevantLocatable() and
-    Consistency::nonUniqueCertainType(n, path) and
-    result = CertainTypeInference::inferCertainType(n, path)
+    Consistency::nonUniqueCertainType(n, path, result)
   }
 }
diff --git a/rust/ql/lib/codeql/rust/internal/TypeInferenceConsistency.qll b/rust/ql/lib/codeql/rust/internal/TypeInferenceConsistency.qll
index fd6257fc260..16eaff92bb6 100644
--- a/rust/ql/lib/codeql/rust/internal/TypeInferenceConsistency.qll
+++ b/rust/ql/lib/codeql/rust/internal/TypeInferenceConsistency.qll
@@ -17,6 +17,10 @@ query predicate illFormedTypeMention(TypeMention tm) {
   tm.fromSource()
 }
 
+query predicate nonUniqueCertainType(AstNode n, TypePath path) {
+  Consistency::nonUniqueCertainType(n, path, _)
+}
+
 int getTypeInferenceInconsistencyCounts(string type) {
   type = "Missing type parameter ID" and
   result = count(TypeParameter tp | missingTypeParameterId(tp) | tp)
diff --git a/rust/ql/lib/codeql/rust/internal/TypeMention.qll b/rust/ql/lib/codeql/rust/internal/TypeMention.qll
index f7c5f2f25e0..8a76caf7ba5 100644
--- a/rust/ql/lib/codeql/rust/internal/TypeMention.qll
+++ b/rust/ql/lib/codeql/rust/internal/TypeMention.qll
@@ -9,9 +9,11 @@ private import TypeInference
 /** An AST node that may mention a type. */
 abstract class TypeMention extends AstNode {
   /** Gets the type at `path` that this mention resolves to, if any. */
+  pragma[nomagic]
   abstract Type resolveTypeAt(TypePath path);
 
   /** Gets the type that this node resolves to, if any. */
+  pragma[nomagic]
   final Type resolveType() { result = this.resolveTypeAt(TypePath::nil()) }
 }
 
@@ -92,7 +94,6 @@ class AliasPathTypeMention extends PathTypeMention {
    * Holds if this path resolved to a type alias with a rhs. that has the
    * resulting type at `typePath`.
    */
-  pragma[nomagic]
   override Type resolveTypeAt(TypePath typePath) {
     result = rhs.resolveTypeAt(typePath) and
     not result = pathGetTypeParameter(resolved, _)
@@ -107,12 +108,27 @@ class AliasPathTypeMention extends PathTypeMention {
   }
 }
 
+/**
+ * Gets the `i`th type argument of `p`.
+ *
+ * Takes into account that variants can have type arguments applied to both the
+ * enum and the variant itself, e.g. `Option::<i32>::Some` is valid in addition
+ * to `Option::Some::<i32>`.
+ */
+TypeMention getPathTypeArgument(Path p, int i) {
+  result = p.getSegment().getGenericArgList().getTypeArg(i)
+  or
+  resolvePath(p) instanceof Variant and
+  result = p.getQualifier().getSegment().getGenericArgList().getTypeArg(i)
+}
+
 class NonAliasPathTypeMention extends PathTypeMention {
   TypeItemNode resolved;
 
   NonAliasPathTypeMention() {
     resolved = [resolvePath(this), resolvePath(this).(Variant).getEnum().(TypeItemNode)] and
-    not exists(resolved.(TypeAlias).getTypeRepr())
+    not exists(resolved.(TypeAlias).getTypeRepr()) and
+    not this = any(ImplItemNode i).getASelfPath() // handled by `ImplSelfMention`
   }
 
   TypeItemNode getResolved() { result = resolved }
@@ -141,50 +157,66 @@ class NonAliasPathTypeMention extends PathTypeMention {
     )
   }
 
-  private TypeMention getPositionalTypeArgument0(int i) {
-    result = this.getSegment().getGenericArgList().getTypeArg(i)
+  /**
+   * Gets the type mention that instantiates the implicit `Self` type parameter
+   * for this path, if it occurs in the position of a trait bound.
+   */
+  private TypeMention getSelfTraitBoundArg() {
+    exists(ImplItemNode impl | this = impl.getTraitPath() and result = impl.(Impl).getSelfTy())
     or
-    // `Self` paths inside `impl` blocks have implicit type arguments that are
-    // the type parameters of the `impl` block. For example, in
-    //
-    // ```rust
-    // impl<T> Foo<T> {
-    //   fn m(self) -> Self {
-    //     self
-    //   }
-    // }
-    // ```
-    //
-    // the `Self` return type is shorthand for `Foo<T>`.
-    exists(ImplItemNode node |
-      this = node.getASelfPath() and
-      result = node.(ImplItemNode).getSelfPath().getSegment().getGenericArgList().getTypeArg(i)
+    exists(Trait subTrait |
+      this = subTrait.getATypeBound().getTypeRepr().(PathTypeRepr).getPath() and
+      result.(SelfTypeParameterMention).getTrait() = subTrait
     )
     or
-    // `Option::<i32>::Some` is valid in addition to `Option::Some::<i32>`
-    resolvePath(this) instanceof Variant and
-    result = this.getQualifier().getSegment().getGenericArgList().getTypeArg(i)
+    exists(TypeParamItemNode tp | this = tp.getABoundPath() and result = tp)
   }
 
-  private TypeMention getPositionalTypeArgument(int i) {
-    result = this.getPositionalTypeArgument0(i)
-    or
+  private Type getDefaultPositionalTypeArgument(int i, TypePath path) {
     // If a type argument is not given in the path, then we use the default for
     // the type parameter if one exists for the type.
-    not exists(this.getPositionalTypeArgument0(i)) and
-    result = this.resolveRootType().getTypeParameterDefault(i) and
+    not exists(getPathTypeArgument(this, i)) and
     // Defaults only apply to type mentions in type annotations
-    this = any(PathTypeRepr ptp).getPath().getQualifier*()
+    this = any(PathTypeRepr ptp).getPath().getQualifier*() and
+    exists(Type ty, TypePath prefix |
+      ty = this.resolveRootType().getTypeParameterDefault(i).resolveTypeAt(prefix) and
+      if not ty = TSelfTypeParameter(resolved)
+      then result = ty and path = prefix
+      else
+        // When a default contains an implicit `Self` type parameter, it should
+        // be substituted for the type that implements the trait.
+        exists(TypePath suffix |
+          path = prefix.append(suffix) and
+          result = this.getSelfTraitBoundArg().resolveTypeAt(suffix)
+        )
+    )
+  }
+
+  private Type getPositionalTypeArgument(int i, TypePath path) {
+    result = getPathTypeArgument(this, i).resolveTypeAt(path)
+    or
+    result = this.getDefaultPositionalTypeArgument(i, path)
+  }
+
+  /**
+   * Gets the type for this path for the type parameter `tp` at `path`, when the
+   * type parameter does not correspond directly to a type mention.
+   */
+  private Type getTypeForTypeParameterAt(TypeParameter tp, TypePath path) {
+    exists(int i |
+      result = this.getPositionalTypeArgument(pragma[only_bind_into](i), path) and
+      tp = this.resolveRootType().getPositionalTypeParameter(pragma[only_bind_into](i))
+    )
+  }
+
+  pragma[nomagic]
+  private TypeAlias getResolvedAlias(string name) {
+    result = resolved.(TraitItemNode).getAssocItem(name)
   }
 
   /** Gets the type mention in this path for the type parameter `tp`, if any. */
   pragma[nomagic]
   private TypeMention getTypeMentionForTypeParameter(TypeParameter tp) {
-    exists(int i |
-      result = this.getPositionalTypeArgument(pragma[only_bind_into](i)) and
-      tp = this.resolveRootType().getTypeParameter(pragma[only_bind_into](i))
-    )
-    or
     exists(TypeAlias alias |
       result = this.getAnAssocTypeArgument(alias) and
       tp = TAssociatedTypeTypeParameter(alias)
@@ -203,16 +235,11 @@ class NonAliasPathTypeMention extends PathTypeMention {
     // }
     // ```
     // the rhs. of the type alias is a type argument to the trait.
-    exists(ImplItemNode impl, AssociatedTypeTypeParameter param, TypeAlias alias, string name |
+    exists(ImplItemNode impl, TypeAlias alias, string name |
       this = impl.getTraitPath() and
-      param.getTrait() = resolved and
-      name = param.getTypeAlias().getName().getText() and
       alias = impl.getASuccessor(pragma[only_bind_into](name)) and
       result = alias.getTypeRepr() and
-      tp =
-        TAssociatedTypeTypeParameter(resolved
-              .(TraitItemNode)
-              .getAssocItem(pragma[only_bind_into](name)))
+      tp = TAssociatedTypeTypeParameter(this.getResolvedAlias(pragma[only_bind_into](name)))
     )
     or
     // Handle the special syntactic sugar for function traits. For now we only
@@ -241,6 +268,8 @@ class NonAliasPathTypeMention extends PathTypeMention {
       else result = TTrait(trait)
     )
     or
+    result = TUnion(resolved)
+    or
     result = TTypeParamTypeParameter(resolved)
     or
     result = TAssociatedTypeTypeParameter(resolved)
@@ -250,13 +279,34 @@ class NonAliasPathTypeMention extends PathTypeMention {
     typePath.isEmpty() and
     result = this.resolveRootType()
     or
-    exists(TypeParameter tp, TypePath suffix |
-      result = this.getTypeMentionForTypeParameter(tp).resolveTypeAt(suffix) and
-      typePath = TypePath::cons(tp, suffix)
+    exists(TypeParameter tp, TypePath suffix | typePath = TypePath::cons(tp, suffix) |
+      result = this.getTypeForTypeParameterAt(tp, suffix)
+      or
+      result = this.getTypeMentionForTypeParameter(tp).resolveTypeAt(suffix)
+    )
+    or
+    // When the path refers to a trait, then the implicit `Self` type parameter
+    // should be instantiated from the context.
+    exists(TypePath suffix |
+      result = this.getSelfTraitBoundArg().resolveTypeAt(suffix) and
+      typePath = TypePath::cons(TSelfTypeParameter(resolved), suffix)
     )
   }
 }
 
+pragma[nomagic]
+private Type resolveImplSelfTypeAt(Impl i, TypePath path) {
+  result = i.getSelfTy().(TypeMention).resolveTypeAt(path)
+}
+
+class ImplSelfMention extends PathTypeMention {
+  private ImplItemNode impl;
+
+  ImplSelfMention() { this = impl.getASelfPath() }
+
+  override Type resolveTypeAt(TypePath typePath) { result = resolveImplSelfTypeAt(impl, typePath) }
+}
+
 class PathTypeReprMention extends TypeMention, PathTypeRepr {
   private PathTypeMention path;
 
@@ -296,6 +346,11 @@ class TraitMention extends TypeMention instanceof TraitItemNode {
     typePath.isEmpty() and
     result = TTrait(this)
     or
+    // The implicit `Self` type parameter occurs at the `Self` type parameter
+    // position.
+    typePath = TypePath::singleton(TSelfTypeParameter(this)) and
+    result = TSelfTypeParameter(this)
+    or
     exists(TypeAlias alias |
       alias = super.getAnAssocItem() and
       typePath = TypePath::singleton(result) and
@@ -327,6 +382,97 @@ class SelfTypeParameterMention extends TypeMention instanceof Name {
   }
 }
 
+/**
+ * Gets the type at `path` of the type being implemented in `i`, when
+ * `i` is an `impl` block, or the synthetic `Self` type parameter when
+ * `i` is a trait.
+ */
+pragma[nomagic]
+Type resolveImplOrTraitType(ImplOrTraitItemNode i, TypePath path) {
+  result = resolveImplSelfTypeAt(i, path)
+  or
+  result = TSelfTypeParameter(i) and path.isEmpty()
+}
+
+pragma[nomagic]
+private ImplOrTraitItemNode getSelfParamEnclosingImplOrTrait(SelfParam self) {
+  self = result.getAnAssocItem().(Function).getSelfParam()
+}
+
+/**
+ * An element used to represent the type of a `self` parameter that uses [shorthand
+ * syntax][1], which is sugar for an explicit annotation.
+ *
+ * [1]: https://doc.rust-lang.org/stable/reference/items/associated-items.html#r-associated.fn.method.self-pat-shorthands
+ */
+class ShorthandSelfParameterMention extends TypeMention instanceof SelfParam {
+  private ImplOrTraitItemNode encl;
+
+  ShorthandSelfParameterMention() {
+    not super.hasTypeRepr() and
+    encl = getSelfParamEnclosingImplOrTrait(this) and
+    (
+      not encl instanceof Impl
+      or
+      // avoid generating a type mention if the type being implemented does not have a type mention
+      encl.(Impl).getSelfTy() instanceof TypeMention
+    )
+  }
+
+  private Type resolveSelfType(TypePath path) { result = resolveImplOrTraitType(encl, path) }
+
+  override Type resolveTypeAt(TypePath typePath) {
+    if super.isRef()
+    then
+      // `fn f(&self, ...)`
+      typePath.isEmpty() and
+      result = TRefType()
+      or
+      exists(TypePath suffix |
+        result = this.resolveSelfType(suffix) and
+        typePath = TypePath::cons(TRefTypeParameter(), suffix)
+      )
+    else
+      // `fn f(self, ...)`
+      result = this.resolveSelfType(typePath)
+  }
+}
+
+pragma[nomagic]
+TypeMention getSelfParamTypeMention(SelfParam self) {
+  result = self.(ShorthandSelfParameterMention)
+  or
+  result = self.getTypeRepr()
+}
+
+/**
+ * An element used to represent the implicit `()` return type of a function.
+ *
+ * Since the implicit type does not appear in the AST, we (somewhat arbitrarily)
+ * choose the name of the function as a type mention. This works because there
+ * is a one-to-one correspondence between a function and its name.
+ */
+class ShorthandReturnTypeMention extends TypeMention instanceof Name {
+  private Function f;
+
+  ShorthandReturnTypeMention() {
+    this = f.getName() and
+    not f.getRetType().hasTypeRepr()
+  }
+
+  override Type resolveTypeAt(TypePath typePath) {
+    typePath.isEmpty() and
+    result instanceof UnitType
+  }
+}
+
+pragma[nomagic]
+TypeMention getReturnTypeMention(Function f) {
+  result.(ShorthandReturnTypeMention) = f.getName()
+  or
+  result = f.getRetType().getTypeRepr()
+}
+
 class DynTraitTypeReprMention extends TypeMention instanceof DynTraitTypeRepr {
   private DynTraitType dynType;
 
@@ -387,3 +533,19 @@ class DynTypeBoundListMention extends TypeMention instanceof TypeBoundList {
     )
   }
 }
+
+class NeverTypeReprMention extends TypeMention, NeverTypeRepr {
+  override Type resolveTypeAt(TypePath path) { result = TNeverType() and path.isEmpty() }
+}
+
+class PtrTypeReprMention extends TypeMention instanceof PtrTypeRepr {
+  override Type resolveTypeAt(TypePath path) {
+    path.isEmpty() and
+    result = TPtrType()
+    or
+    exists(TypePath suffix |
+      result = super.getTypeRepr().(TypeMention).resolveTypeAt(suffix) and
+      path = TypePath::cons(TPtrTypeParameter(), suffix)
+    )
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/internal/typeinference/BlanketImplementation.qll b/rust/ql/lib/codeql/rust/internal/typeinference/BlanketImplementation.qll
new file mode 100644
index 00000000000..c60ad3f6ae3
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/internal/typeinference/BlanketImplementation.qll
@@ -0,0 +1,152 @@
+/**
+ * Provides logic for checking argument types against constraints of
+ * [blanket implementations][1].
+ *
+ * [1]: https://doc.rust-lang.org/book/ch10-02-traits.html#using-trait-bounds-to-conditionally-implement-methods
+ */
+
+private import rust
+private import codeql.rust.internal.PathResolution
+private import codeql.rust.internal.Type
+private import codeql.rust.internal.TypeMention
+private import codeql.rust.internal.TypeInference
+
+/**
+ * Holds if `traitBound` is the first non-trivial trait bound of `tp`.
+ */
+pragma[nomagic]
+private predicate hasFirstNonTrivialTraitBound(TypeParamItemNode tp, Trait traitBound) {
+  traitBound =
+    min(Trait trait, int i |
+      trait = tp.resolveBound(i) and
+      // Exclude traits that are known to not narrow things down very much.
+      not trait.getName().getText() =
+        [
+          "Sized", "Clone",
+          // The auto traits
+          "Send", "Sync", "Unpin", "UnwindSafe", "RefUnwindSafe"
+        ]
+    |
+      trait order by i
+    )
+}
+
+/**
+ * Holds if `i` is a blanket-like implementation, meaning either an actual
+ * blanket implementation, or an implementation for a type like `&` where
+ * we want to check against the trait bounds of the blanket type parameter.
+ *
+ * `blanketSelfPath` points to the type parameter `blanketTypeParam` inside the
+ * self type of `i` (`blanketSelfPath` is empty for actual blanket implementations).
+ */
+pragma[nomagic]
+predicate isBlanketLike(ImplItemNode i, TypePath blanketSelfPath, TypeParam blanketTypeParam) {
+  blanketTypeParam = i.getBlanketImplementationTypeParam() and
+  blanketSelfPath.isEmpty()
+  or
+  exists(TypeMention tm, Type root, TypeParameter tp |
+    tm = i.(Impl).getSelfTy() and
+    complexSelfRoot(root, tp) and
+    tm.resolveType() = root and
+    tm.resolveTypeAt(blanketSelfPath) = TTypeParamTypeParameter(blanketTypeParam) and
+    blanketSelfPath = TypePath::singleton(tp) and
+    hasFirstNonTrivialTraitBound(blanketTypeParam, _)
+  )
+}
+
+signature module SatisfiesBlanketConstraintInputSig<HasTypeTreeSig ArgumentType> {
+  /**
+   * Holds if a call with argument type `at` may potentially target a function belonging
+   * to blanket implementation `impl` with type parameter `blanketTypeParam`.
+   *
+   * `blanketPath` points to the type `blanketTypeParam` inside the type of the parameter
+   * at the matching position.
+   */
+  predicate hasBlanketCandidate(
+    ArgumentType at, ImplItemNode impl, TypePath blanketPath, TypeParam blanketTypeParam
+  );
+}
+
+module SatisfiesBlanketConstraint<
+  HasTypeTreeSig ArgumentType, SatisfiesBlanketConstraintInputSig<ArgumentType> Input>
+{
+  private predicate hasBlanketCandidate(
+    ArgumentType at, ImplItemNode impl, TypePath blanketPath, TypeParam blanketTypeParam
+  ) {
+    Input::hasBlanketCandidate(at, impl, blanketPath, blanketTypeParam) and
+    exists(at.getTypeAt(blanketPath))
+  }
+
+  private newtype TArgumentTypeAndBlanketOffset =
+    MkArgumentTypeAndBlanketOffset(ArgumentType at, TypePath blanketPath) {
+      hasBlanketCandidate(at, _, blanketPath, _)
+    }
+
+  private class ArgumentTypeAndBlanketOffset extends MkArgumentTypeAndBlanketOffset {
+    ArgumentType at;
+    TypePath blanketPath;
+
+    ArgumentTypeAndBlanketOffset() { this = MkArgumentTypeAndBlanketOffset(at, blanketPath) }
+
+    Location getLocation() { result = at.getLocation() }
+
+    Type getTypeAt(TypePath path) {
+      result = at.getTypeAt(blanketPath.appendInverse(path)) and
+      not result = TNeverType() and
+      not result = TUnknownType()
+    }
+
+    string toString() { result = at.toString() + " [blanket at " + blanketPath.toString() + "]" }
+  }
+
+  private module SatisfiesBlanketConstraintInput implements
+    SatisfiesConstraintInputSig<ArgumentTypeAndBlanketOffset>
+  {
+    pragma[nomagic]
+    additional predicate relevantConstraint(
+      ArgumentTypeAndBlanketOffset ato, ImplItemNode impl, Trait traitBound
+    ) {
+      exists(ArgumentType at, TypePath blanketPath, TypeParam blanketTypeParam |
+        ato = MkArgumentTypeAndBlanketOffset(at, blanketPath) and
+        hasBlanketCandidate(at, impl, blanketPath, blanketTypeParam) and
+        hasFirstNonTrivialTraitBound(blanketTypeParam, traitBound)
+      )
+    }
+
+    pragma[nomagic]
+    predicate relevantConstraint(ArgumentTypeAndBlanketOffset ato, Type constraint) {
+      relevantConstraint(ato, _, constraint.(TraitType).getTrait())
+    }
+
+    predicate useUniversalConditions() { none() }
+  }
+
+  private module SatisfiesBlanketConstraint =
+    SatisfiesConstraint<ArgumentTypeAndBlanketOffset, SatisfiesBlanketConstraintInput>;
+
+  /**
+   * Holds if the argument type `at` satisfies the first non-trivial blanket
+   * constraint of `impl`.
+   */
+  pragma[nomagic]
+  predicate satisfiesBlanketConstraint(ArgumentType at, ImplItemNode impl) {
+    exists(ArgumentTypeAndBlanketOffset ato, Trait traitBound |
+      ato = MkArgumentTypeAndBlanketOffset(at, _) and
+      SatisfiesBlanketConstraintInput::relevantConstraint(ato, impl, traitBound) and
+      SatisfiesBlanketConstraint::satisfiesConstraintType(ato, TTrait(traitBound), _, _)
+    )
+  }
+
+  /**
+   * Holds if the argument type `at` does _not_ satisfy the first non-trivial blanket
+   * constraint of `impl`.
+   */
+  pragma[nomagic]
+  predicate dissatisfiesBlanketConstraint(ArgumentType at, ImplItemNode impl) {
+    exists(ArgumentTypeAndBlanketOffset ato, Trait traitBound |
+      ato = MkArgumentTypeAndBlanketOffset(at, _) and
+      SatisfiesBlanketConstraintInput::relevantConstraint(ato, impl, traitBound) and
+      SatisfiesBlanketConstraint::dissatisfiesConstraint(ato, TTrait(traitBound))
+    )
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/internal/typeinference/FunctionOverloading.qll b/rust/ql/lib/codeql/rust/internal/typeinference/FunctionOverloading.qll
new file mode 100644
index 00000000000..b58084e31cf
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/internal/typeinference/FunctionOverloading.qll
@@ -0,0 +1,127 @@
+/**
+ * Provides logic for identifying functions that are overloaded based on their
+ * non-`self` parameter types. While Rust does not allow for overloading inside a single
+ * `impl` block, it is still possible for a trait to have multiple implementations
+ * that differ only in the types of non-`self` parameters.
+ */
+
+private import rust
+private import codeql.rust.internal.PathResolution
+private import codeql.rust.internal.Type
+private import codeql.rust.internal.TypeMention
+private import codeql.rust.internal.TypeInference
+private import FunctionType
+
+pragma[nomagic]
+private Type resolveNonTypeParameterTypeAt(TypeMention tm, TypePath path) {
+  result = tm.resolveTypeAt(path) and
+  not result instanceof TypeParameter
+}
+
+bindingset[t1, t2]
+private predicate typeMentionEqual(TypeMention t1, TypeMention t2) {
+  forex(TypePath path, Type type | resolveNonTypeParameterTypeAt(t1, path) = type |
+    resolveNonTypeParameterTypeAt(t2, path) = type
+  )
+}
+
+pragma[nomagic]
+private predicate implSiblingCandidate(
+  Impl impl, TraitItemNode trait, Type rootType, TypeMention selfTy
+) {
+  trait = impl.(ImplItemNode).resolveTraitTy() and
+  selfTy = impl.getSelfTy() and
+  rootType = selfTy.resolveType()
+}
+
+/**
+ * Holds if `impl1` and `impl2` are a sibling implementations of `trait`. We
+ * consider implementations to be siblings if they implement the same trait for
+ * the same type. In that case `Self` is the same type in both implementations,
+ * and method calls to the implementations cannot be resolved unambiguously
+ * based only on the receiver type.
+ */
+pragma[inline]
+private predicate implSiblings(TraitItemNode trait, Impl impl1, Impl impl2) {
+  exists(Type rootType, TypeMention selfTy1, TypeMention selfTy2 |
+    impl1 != impl2 and
+    implSiblingCandidate(impl1, trait, rootType, selfTy1) and
+    implSiblingCandidate(impl2, trait, rootType, selfTy2) and
+    // In principle the second conjunct below should be superflous, but we still
+    // have ill-formed type mentions for types that we don't understand. For
+    // those checking both directions restricts further. Note also that we check
+    // syntactic equality, whereas equality up to renaming would be more
+    // correct.
+    typeMentionEqual(selfTy1, selfTy2) and
+    typeMentionEqual(selfTy2, selfTy1)
+  )
+}
+
+/**
+ * Holds if `impl` is an implementation of `trait` and if another implementation
+ * exists for the same type.
+ */
+pragma[nomagic]
+private predicate implHasSibling(Impl impl, Trait trait) { implSiblings(trait, impl, _) }
+
+/**
+ * Holds if type parameter `tp` of `trait` occurs in the function `f` with the name
+ * `functionName` at position `pos` and path `path`.
+ *
+ * Note that `pos` can also be the special `return` position, which is sometimes
+ * needed to disambiguate associated function calls like `Default::default()`
+ * (in this case, `tp` is the special `Self` type parameter).
+ */
+bindingset[trait]
+pragma[inline_late]
+predicate traitTypeParameterOccurrence(
+  TraitItemNode trait, Function f, string functionName, FunctionPosition pos, TypePath path,
+  TypeParameter tp
+) {
+  f = trait.getASuccessor(functionName) and
+  tp = getAssocFunctionTypeAt(f, trait, pos, path) and
+  tp = trait.(TraitTypeAbstraction).getATypeParameter()
+}
+
+/**
+ * Holds if resolving the function `f` in `impl` with the name `functionName`
+ * requires inspecting the type of applied _arguments_ at position `pos` in
+ * order to determine whether it is the correct resolution.
+ */
+pragma[nomagic]
+predicate functionResolutionDependsOnArgument(
+  ImplItemNode impl, Function f, FunctionPosition pos, TypePath path, Type type
+) {
+  /*
+   * As seen in the example below, when an implementation has a sibling for a
+   * trait we find occurrences of a type parameter of the trait in a function
+   * signature in the trait. We then find the type given in the implementation
+   * at the same position, which is a position that might disambiguate the
+   * function from its siblings.
+   *
+   * ```rust
+   * trait MyTrait<T> {
+   *     fn method(&self, value: Foo<T>) -> Self;
+   * //                   ^^^^^^^^^^^^^ `pos` = 0
+   * //                              ^ `path` = "T"
+   * }
+   * impl MyAdd<i64> for i64 {
+   *     fn method(&self, value: Foo<i64>) -> Self { ... }
+   * //                              ^^^ `type` = i64
+   * }
+   * ```
+   *
+   * Note that we only check the root type symbol at the position. If the type
+   * at that position is a type constructor (for instance `Vec<..>`) then
+   * inspecting the entire type tree could be necessary to disambiguate the
+   * method. In that case we will still resolve several methods.
+   */
+
+  exists(TraitItemNode trait, string functionName |
+    implHasSibling(impl, trait) and
+    traitTypeParameterOccurrence(trait, _, functionName, pos, path, _) and
+    type = getAssocFunctionTypeAt(f, impl, pos, path) and
+    f = impl.getASuccessor(functionName) and
+    pos.isPosition()
+  )
+}
diff --git a/rust/ql/lib/codeql/rust/internal/typeinference/FunctionType.qll b/rust/ql/lib/codeql/rust/internal/typeinference/FunctionType.qll
new file mode 100644
index 00000000000..727c99fa810
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/internal/typeinference/FunctionType.qll
@@ -0,0 +1,388 @@
+private import rust
+private import codeql.rust.internal.TypeInference
+private import codeql.rust.internal.PathResolution
+private import codeql.rust.internal.Type
+private import codeql.rust.internal.TypeMention
+private import codeql.rust.elements.Call
+
+private newtype TFunctionPosition =
+  TArgumentFunctionPosition(ArgumentPosition pos) or
+  TReturnFunctionPosition()
+
+/**
+ * A position of a type related to a function.
+ *
+ * Either `self`, `return`, or a positional parameter index.
+ */
+class FunctionPosition extends TFunctionPosition {
+  predicate isSelf() { this.asArgumentPosition().isSelf() }
+
+  int asPosition() { result = this.asArgumentPosition().asPosition() }
+
+  predicate isPosition() { exists(this.asPosition()) }
+
+  ArgumentPosition asArgumentPosition() { this = TArgumentFunctionPosition(result) }
+
+  predicate isReturn() { this = TReturnFunctionPosition() }
+
+  /** Gets the corresponding position when `f` is invoked via a function call. */
+  bindingset[f]
+  FunctionPosition getFunctionCallAdjusted(Function f) {
+    this.isReturn() and
+    result = this
+    or
+    if f.hasSelfParam()
+    then
+      this.isSelf() and result.asPosition() = 0
+      or
+      result.asPosition() = this.asPosition() + 1
+    else result = this
+  }
+
+  TypeMention getTypeMention(Function f) {
+    this.isSelf() and
+    result = getSelfParamTypeMention(f.getSelfParam())
+    or
+    result = f.getParam(this.asPosition()).getTypeRepr()
+    or
+    this.isReturn() and
+    result = getReturnTypeMention(f)
+  }
+
+  string toString() {
+    result = this.asArgumentPosition().toString()
+    or
+    this.isReturn() and
+    result = "(return)"
+  }
+}
+
+/**
+ * A helper module for implementing `Matching(WithEnvironment)InputSig` with
+ * `DeclarationPosition = AccessPosition = FunctionPosition`.
+ */
+module FunctionPositionMatchingInput {
+  class DeclarationPosition = FunctionPosition;
+
+  class AccessPosition = DeclarationPosition;
+
+  predicate accessDeclarationPositionMatch(AccessPosition apos, DeclarationPosition dpos) {
+    apos = dpos
+  }
+}
+
+private newtype TAssocFunctionType =
+  /** An associated function `f` that should be specialized for `i` at `pos`. */
+  MkAssocFunctionType(Function f, ImplOrTraitItemNode i, FunctionPosition pos) {
+    f = i.getASuccessor(_) and exists(pos.getTypeMention(f))
+  }
+
+bindingset[condition, constraint, tp]
+private Type getTraitConstraintTypeAt(
+  TypeMention condition, TypeMention constraint, TypeParameter tp, TypePath path
+) {
+  BaseTypes::conditionSatisfiesConstraintTypeAt(_, condition, constraint,
+    TypePath::singleton(tp).appendInverse(path), result)
+}
+
+/**
+ * Gets if the type of the function `f` when specialized for `i` at position
+ * `pos` at path `path`
+ */
+pragma[nomagic]
+Type getAssocFunctionTypeAt(Function f, ImplOrTraitItemNode i, FunctionPosition pos, TypePath path) {
+  exists(MkAssocFunctionType(f, i, pos)) and
+  (
+    // No specialization needed when the function is directly in the trait or
+    // impl block or the declared type is not a type parameter
+    (i.getAnAssocItem() = f or not result instanceof TypeParameter) and
+    result = pos.getTypeMention(f).resolveTypeAt(path)
+    or
+    not i.getAnAssocItem() = f and
+    exists(TypePath prefix, TypePath suffix, TypeParameter tp |
+      path = prefix.append(suffix) and
+      tp = pos.getTypeMention(f).resolveTypeAt(prefix)
+    |
+      if tp = TSelfTypeParameter(_)
+      then result = resolveImplOrTraitType(i, suffix)
+      else
+        exists(TraitItemNode trait, TypeMention condition, TypeMention constraint |
+          trait.getAnAssocItem() = f and
+          BaseTypes::rootTypesSatisfaction(_, TTrait(trait), _, condition, constraint) and
+          result = getTraitConstraintTypeAt(condition, constraint, tp, suffix)
+        |
+          condition = i.(Trait) or condition = i.(Impl).getSelfTy()
+        )
+    )
+  )
+}
+
+/**
+ * The type of an associated function at a given position, when its implicit
+ * `Self` type parameter is specialized to a given trait or `impl` block.
+ *
+ * Example:
+ *
+ * ```rust
+ * trait T1 {
+ *   fn m1(self);              // self1
+ *
+ *   fn m2(self) { ... }       // self2
+ * }
+ *
+ * trait T2 : T1 {
+ *   fn m3(self);              // self3
+ * }
+ *
+ * impl T2 for X {
+ *   fn m1(self) { ... }       // self4
+ *
+ *   fn m3(self) { ... }       // self5
+ * }
+ * ```
+ *
+ * param   | `impl` or trait | type
+ * ------- | --------------- | ----
+ * `self1` | `trait T1`      | `T1`
+ * `self1` | `trait T2`      | `T2`
+ * `self2` | `trait T1`      | `T1`
+ * `self2` | `trait T2`      | `T2`
+ * `self2` | `impl T2 for X` | `X`
+ * `self3` | `trait T2`      | `T2`
+ * `self4` | `impl T2 for X` | `X`
+ * `self5` | `impl T2 for X` | `X`
+ */
+class AssocFunctionType extends MkAssocFunctionType {
+  /**
+   * Holds if this function type applies to the function `f` at position `pos`,
+   * when viewed as a member of the `impl` or trait item `i`.
+   */
+  predicate appliesTo(Function f, ImplOrTraitItemNode i, FunctionPosition pos) {
+    this = MkAssocFunctionType(f, i, pos)
+  }
+
+  /**
+   * Gets the type at the given path.
+   *
+   * For functions belonging to a trait, we use the type of the trait itself instead
+   * of the implicit `Self` type parameter, as otherwise any type will match.
+   *
+   * Calls should use `substituteLookupTraits` to map receiver types to the relevant
+   * traits when matching.
+   */
+  Type getTypeAt(TypePath path) {
+    exists(Function f, FunctionPosition pos, ImplOrTraitItemNode i, Type t |
+      this.appliesTo(f, i, pos) and
+      t = getAssocFunctionTypeAt(f, i, pos, path)
+    |
+      not t instanceof SelfTypeParameter and
+      result = t
+      or
+      result = TTrait(t.(SelfTypeParameter).getTrait())
+    )
+  }
+
+  private TypeMention getTypeMention() {
+    exists(Function f, FunctionPosition pos |
+      this.appliesTo(f, _, pos) and
+      result = pos.getTypeMention(f)
+    )
+  }
+
+  string toString() { result = this.getTypeMention().toString() }
+
+  Location getLocation() { result = this.getTypeMention().getLocation() }
+}
+
+private Trait getALookupTrait(Type t) {
+  result = t.(TypeParamTypeParameter).getTypeParam().(TypeParamItemNode).resolveABound()
+  or
+  result = t.(SelfTypeParameter).getTrait()
+  or
+  result = t.(ImplTraitType).getImplTraitTypeRepr().(ImplTraitTypeReprItemNode).resolveABound()
+  or
+  result = t.(DynTraitType).getTrait()
+}
+
+/**
+ * Gets the type obtained by substituting in relevant traits in which to do function
+ * lookup, or `t` itself when no such trait exist.
+ */
+bindingset[t]
+Type substituteLookupTraits(Type t) {
+  not exists(getALookupTrait(t)) and
+  result = t
+  or
+  result = TTrait(getALookupTrait(t))
+}
+
+/**
+ * A wrapper around `IsInstantiationOf` which ensures to substitute in lookup
+ * traits when checking whether argument types are instantiations of function
+ * types.
+ */
+module ArgIsInstantiationOf<
+  HasTypeTreeSig Arg, IsInstantiationOfInputSig<Arg, AssocFunctionType> Input>
+{
+  final private class ArgFinal = Arg;
+
+  private class ArgSubst extends ArgFinal {
+    Type getTypeAt(TypePath path) {
+      result = substituteLookupTraits(super.getTypeAt(path)) and
+      not result = TNeverType() and
+      not result = TUnknownType()
+    }
+  }
+
+  private module IsInstantiationOfInput implements
+    IsInstantiationOfInputSig<ArgSubst, AssocFunctionType>
+  {
+    pragma[nomagic]
+    predicate potentialInstantiationOf(
+      ArgSubst arg, TypeAbstraction abs, AssocFunctionType constraint
+    ) {
+      Input::potentialInstantiationOf(arg, abs, constraint)
+    }
+
+    predicate relevantConstraint(AssocFunctionType constraint) {
+      Input::relevantConstraint(constraint)
+    }
+  }
+
+  private module ArgSubstIsInstantiationOf =
+    IsInstantiationOf<ArgSubst, AssocFunctionType, IsInstantiationOfInput>;
+
+  predicate argIsInstantiationOf(Arg arg, ImplOrTraitItemNode i, AssocFunctionType constraint) {
+    ArgSubstIsInstantiationOf::isInstantiationOf(arg, i, constraint)
+  }
+
+  predicate argIsNotInstantiationOf(Arg arg, ImplOrTraitItemNode i, AssocFunctionType constraint) {
+    ArgSubstIsInstantiationOf::isNotInstantiationOf(arg, i, constraint)
+  }
+}
+
+/**
+ * Provides the input for `ArgsAreInstantiationsOf`.
+ */
+signature module ArgsAreInstantiationsOfInputSig {
+  /**
+   * Holds if types need to be matched against the type `t` at position `pos` of
+   * `f` inside `i`.
+   */
+  predicate toCheck(ImplOrTraitItemNode i, Function f, FunctionPosition pos, AssocFunctionType t);
+
+  /** A call whose argument types are to be checked. */
+  class Call {
+    string toString();
+
+    Location getLocation();
+
+    Type getArgType(FunctionPosition pos, TypePath path);
+
+    predicate hasTargetCand(ImplOrTraitItemNode i, Function f);
+  }
+}
+
+/**
+ * Provides logic for checking that a set of arguments have types that are
+ * instantiations of the types at the corresponding positions in a function
+ * type.
+ */
+module ArgsAreInstantiationsOf<ArgsAreInstantiationsOfInputSig Input> {
+  pragma[nomagic]
+  private predicate toCheckRanked(ImplOrTraitItemNode i, Function f, FunctionPosition pos, int rnk) {
+    Input::toCheck(i, f, pos, _) and
+    pos =
+      rank[rnk + 1](FunctionPosition pos0, int j |
+        Input::toCheck(i, f, pos0, _) and
+        (
+          j = pos0.asPosition()
+          or
+          pos0.isSelf() and j = -1
+          or
+          pos0.isReturn() and j = -2
+        )
+      |
+        pos0 order by j
+      )
+  }
+
+  private newtype TCallAndPos =
+    MkCallAndPos(Input::Call call, FunctionPosition pos) { exists(call.getArgType(pos, _)) }
+
+  /** A call tagged with a position. */
+  private class CallAndPos extends MkCallAndPos {
+    Input::Call call;
+    FunctionPosition pos;
+
+    CallAndPos() { this = MkCallAndPos(call, pos) }
+
+    Input::Call getCall() { result = call }
+
+    FunctionPosition getPos() { result = pos }
+
+    Location getLocation() { result = call.getLocation() }
+
+    Type getTypeAt(TypePath path) { result = call.getArgType(pos, path) }
+
+    string toString() { result = call.toString() + " [arg " + pos + "]" }
+  }
+
+  private module ArgIsInstantiationOfInput implements
+    IsInstantiationOfInputSig<CallAndPos, AssocFunctionType>
+  {
+    pragma[nomagic]
+    private predicate potentialInstantiationOf0(
+      CallAndPos cp, Input::Call call, FunctionPosition pos, int rnk, Function f,
+      TypeAbstraction abs, AssocFunctionType constraint
+    ) {
+      cp = MkCallAndPos(call, pragma[only_bind_into](pos)) and
+      call.hasTargetCand(abs, f) and
+      toCheckRanked(abs, f, pragma[only_bind_into](pos), rnk) and
+      Input::toCheck(abs, f, pragma[only_bind_into](pos), constraint)
+    }
+
+    pragma[nomagic]
+    predicate potentialInstantiationOf(
+      CallAndPos cp, TypeAbstraction abs, AssocFunctionType constraint
+    ) {
+      exists(Input::Call call, int rnk, Function f |
+        potentialInstantiationOf0(cp, call, _, rnk, f, abs, constraint)
+      |
+        rnk = 0
+        or
+        argsAreInstantiationsOfFromIndex(call, abs, f, rnk - 1)
+      )
+    }
+
+    predicate relevantConstraint(AssocFunctionType constraint) {
+      Input::toCheck(_, _, _, constraint)
+    }
+  }
+
+  private module ArgIsInstantiationOfFromIndex =
+    ArgIsInstantiationOf<CallAndPos, ArgIsInstantiationOfInput>;
+
+  pragma[nomagic]
+  private predicate argsAreInstantiationsOfFromIndex(
+    Input::Call call, ImplOrTraitItemNode i, Function f, int rnk
+  ) {
+    exists(FunctionPosition pos |
+      ArgIsInstantiationOfFromIndex::argIsInstantiationOf(MkCallAndPos(call, pos), i, _) and
+      call.hasTargetCand(i, f) and
+      toCheckRanked(i, f, pos, rnk)
+    )
+  }
+
+  /**
+   * Holds if all arguments of `call` have types that are instantiations of the
+   * types of the corresponding parameters of `f` inside `i`.
+   */
+  pragma[nomagic]
+  predicate argsAreInstantiationsOf(Input::Call call, ImplOrTraitItemNode i, Function f) {
+    exists(int rnk |
+      argsAreInstantiationsOfFromIndex(call, i, f, rnk) and
+      rnk = max(int r | toCheckRanked(i, f, _, r))
+    )
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/security/Barriers.qll b/rust/ql/lib/codeql/rust/security/Barriers.qll
new file mode 100644
index 00000000000..398e4f56712
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/security/Barriers.qll
@@ -0,0 +1,42 @@
+/**
+ * Classes to represent barriers commonly used in dataflow and taint tracking
+ * configurations.
+ */
+
+import rust
+private import codeql.rust.dataflow.DataFlow
+private import codeql.rust.internal.TypeInference as TypeInference
+private import codeql.rust.internal.Type
+private import codeql.rust.frameworks.stdlib.Builtins
+
+/**
+ * A node whose type is a numeric or boolean type, which may be an appropriate
+ * taint flow barrier for some queries.
+ */
+class NumericTypeBarrier extends DataFlow::Node {
+  NumericTypeBarrier() {
+    exists(StructType t, Struct s |
+      t = TypeInference::inferType(this.asExpr().getExpr()) and
+      s = t.getStruct()
+    |
+      s instanceof NumericType or
+      s instanceof Bool
+    )
+  }
+}
+
+/**
+ * A node whose type is an integral (integer) or boolean type, which may be an
+ * appropriate taint flow barrier for some queries.
+ */
+class IntegralOrBooleanTypeBarrier extends DataFlow::Node {
+  IntegralOrBooleanTypeBarrier() {
+    exists(StructType t, Struct s |
+      t = TypeInference::inferType(this.asExpr().getExpr()) and
+      s = t.getStruct()
+    |
+      s instanceof IntegralType or
+      s instanceof Bool
+    )
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/security/CleartextTransmissionExtensions.qll b/rust/ql/lib/codeql/rust/security/CleartextTransmissionExtensions.qll
index 2dfe77ee8ba..7d5a91a55f7 100644
--- a/rust/ql/lib/codeql/rust/security/CleartextTransmissionExtensions.qll
+++ b/rust/ql/lib/codeql/rust/security/CleartextTransmissionExtensions.qll
@@ -53,6 +53,6 @@ module CleartextTransmission {
    * A sink defined through MaD.
    */
   private class ModelsAsDataSink extends Sink {
-    ModelsAsDataSink() { sinkNode(this, "transmission") }
+    ModelsAsDataSink() { sinkNode(this, ["transmission", "request-url"]) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/security/HardcodedCryptographicValueExtensions.qll b/rust/ql/lib/codeql/rust/security/HardcodedCryptographicValueExtensions.qll
index 785a7f815bc..bc487e42ef0 100644
--- a/rust/ql/lib/codeql/rust/security/HardcodedCryptographicValueExtensions.qll
+++ b/rust/ql/lib/codeql/rust/security/HardcodedCryptographicValueExtensions.qll
@@ -69,11 +69,15 @@ module HardcodedCryptographicValue {
   /**
    * An array initialized from a list of literals, considered as a single flow source. For example:
    * ```
-   * `[0, 0, 0, 0]`
+   * [0, 0, 0, 0]
+   * [0; 10]
    * ```
    */
   private class ArrayListSource extends Source {
-    ArrayListSource() { this.asExpr().getExpr().(ArrayListExpr).getExpr(_) instanceof LiteralExpr }
+    ArrayListSource() {
+      this.asExpr().getExpr().(ArrayListExpr).getExpr(_) instanceof LiteralExpr or
+      this.asExpr().getExpr().(ArrayRepeatExpr).getRepeatOperand() instanceof LiteralExpr
+    }
   }
 
   /**
diff --git a/rust/ql/lib/codeql/rust/security/InsecureCookieExtensions.qll b/rust/ql/lib/codeql/rust/security/InsecureCookieExtensions.qll
new file mode 100644
index 00000000000..d5d15c821d8
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/security/InsecureCookieExtensions.qll
@@ -0,0 +1,114 @@
+/**
+ * Provides classes and predicates for reasoning about insecure cookie
+ * vulnerabilities.
+ */
+
+import rust
+private import codeql.rust.dataflow.DataFlow
+private import codeql.rust.dataflow.FlowSource
+private import codeql.rust.dataflow.FlowSink
+private import codeql.rust.Concepts
+private import codeql.rust.dataflow.internal.DataFlowImpl as DataFlowImpl
+private import codeql.rust.dataflow.internal.Node
+private import codeql.rust.controlflow.BasicBlocks
+
+/**
+ * Provides default sources, sinks and barriers for detecting insecure
+ * cookie vulnerabilities, as well as extension points for adding your own.
+ */
+module InsecureCookie {
+  /**
+   * A data flow source for insecure cookie vulnerabilities.
+   */
+  abstract class Source extends DataFlow::Node { }
+
+  /**
+   * A data flow sink for insecure cookie vulnerabilities.
+   */
+  abstract class Sink extends QuerySink::Range {
+    override string getSinkType() { result = "InsecureCookie" }
+  }
+
+  /**
+   * A barrier for insecure cookie vulnerabilities.
+   */
+  abstract class Barrier extends DataFlow::Node { }
+
+  /**
+   * A source for insecure cookie vulnerabilities from model data.
+   */
+  private class ModelsAsDataSource extends Source {
+    ModelsAsDataSource() { sourceNode(this, "cookie-create") }
+  }
+
+  /**
+   * A sink for insecure cookie vulnerabilities from model data.
+   */
+  private class ModelsAsDataSink extends Sink {
+    ModelsAsDataSink() { sinkNode(this, "cookie-use") }
+  }
+
+  /**
+   * Holds if a models-as-data optional barrier for cookies is specified for `summaryNode`,
+   * with arguments `attrib` (`secure` or `partitioned`) and `arg` (argument index). For example,
+   * if a summary has input:
+   * ```
+   * [..., Argument[self].OptionalBarrier[cookie-secure-arg0], ...]
+   * ```
+   * then `attrib` is `secure` and `arg` is `0`.
+   *
+   * The meaning here is that a call to the function summarized by `summaryNode` would set
+   * the cookie attribute `attrib` to the value of argument `arg`. This may in practice be
+   * interpretted as a barrier to flow (when the cookie is made secure) or as a source (when
+   * the cookie is made insecure).
+   */
+  private predicate cookieOptionalBarrier(FlowSummaryNode summaryNode, string attrib, int arg) {
+    exists(string barrierName |
+      DataFlowImpl::optionalBarrier(summaryNode, barrierName) and
+      attrib = barrierName.regexpCapture("cookie-(secure|partitioned)-arg([0-9]+)", 1) and
+      arg = barrierName.regexpCapture("cookie-(secure|partitioned)-arg([0-9]+)", 2).toInt()
+    )
+  }
+
+  /**
+   * Holds if cookie attribute `attrib` (`secure` or `partitioned`) is set to `value`
+   * (`true` or `false`) at `node`. For example, the call:
+   * ```
+   * cookie.secure(true)
+   * ```
+   * sets the `"secure"` attribute to `true`. A value that cannot be determined is treated
+   * as `false`.
+   */
+  predicate cookieSetNode(DataFlow::Node node, string attrib, boolean value) {
+    exists(FlowSummaryNode summaryNode, CallExprBase ce, int arg, DataFlow::Node argNode |
+      // decode the models-as-data `OptionalBarrier`
+      cookieOptionalBarrier(summaryNode, attrib, arg) and
+      // find a call and arg referenced by this optional barrier
+      ce.getStaticTarget() = summaryNode.getSummarizedCallable() and
+      ce.getArg(arg) = argNode.asExpr().getExpr() and
+      // check if the argument is always `true`
+      (
+        if
+          forex(DataFlow::Node argSourceNode, BooleanLiteralExpr argSourceValue |
+            DataFlow::localFlow(argSourceNode, argNode) and
+            argSourceValue = argSourceNode.asExpr().getExpr()
+          |
+            argSourceValue.getTextValue() = "true"
+          )
+        then value = true // `true` flows to here
+        else value = false // `false`, unknown, or multiple values
+      ) and
+      // and find the node where this happens (we can't just use the flow summary node, since its
+      // shared across all calls to the modeled function, we need a node specific to this call)
+      (
+        node.asExpr().getExpr() = ce.(MethodCallExpr).getReceiver() // e.g. `a` in `a.set_secure(true)`
+        or
+        exists(BasicBlock bb, int i |
+          // associated SSA node
+          node.(SsaNode).asDefinition().definesAt(_, bb, i) and
+          ce.(MethodCallExpr).getReceiver() = bb.getNode(i).getAstNode()
+        )
+      )
+    )
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/security/LogInjectionExtensions.qll b/rust/ql/lib/codeql/rust/security/LogInjectionExtensions.qll
new file mode 100644
index 00000000000..dafebc96731
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/security/LogInjectionExtensions.qll
@@ -0,0 +1,52 @@
+/**
+ * Provides classes and predicates for reasoning about log injection
+ * vulnerabilities.
+ */
+
+import rust
+private import codeql.rust.dataflow.DataFlow
+private import codeql.rust.dataflow.FlowSink
+private import codeql.rust.Concepts
+private import codeql.util.Unit
+private import codeql.rust.security.Barriers as Barriers
+
+/**
+ * Provides default sources, sinks and barriers for detecting log injection
+ * vulnerabilities, as well as extension points for adding your own.
+ */
+module LogInjection {
+  /**
+   * A data flow source for log injection vulnerabilities.
+   */
+  abstract class Source extends DataFlow::Node { }
+
+  /**
+   * A data flow sink for log injection vulnerabilities.
+   */
+  abstract class Sink extends QuerySink::Range {
+    override string getSinkType() { result = "LogInjection" }
+  }
+
+  /**
+   * A barrier for log injection vulnerabilities.
+   */
+  abstract class Barrier extends DataFlow::Node { }
+
+  /**
+   * An active threat-model source, considered as a flow source.
+   */
+  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource { }
+
+  /**
+   * A sink for log-injection from model data.
+   */
+  private class ModelsAsDataSink extends Sink {
+    ModelsAsDataSink() { sinkNode(this, "log-injection") }
+  }
+
+  /**
+   * A barrier for log injection vulnerabilities for nodes whose type is a
+   * numeric or boolean type, which is unlikely to expose any vulnerability.
+   */
+  private class NumericTypeBarrier extends Barrier instanceof Barriers::NumericTypeBarrier { }
+}
diff --git a/rust/ql/lib/codeql/rust/security/RequestForgeryExtensions.qll b/rust/ql/lib/codeql/rust/security/RequestForgeryExtensions.qll
new file mode 100644
index 00000000000..1822baff644
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/security/RequestForgeryExtensions.qll
@@ -0,0 +1,49 @@
+/**
+ * Provides classes and predicates for reasoning about request forgery
+ * vulnerabilities.
+ */
+
+import rust
+private import codeql.rust.dataflow.DataFlow
+private import codeql.rust.dataflow.FlowSink
+private import codeql.rust.dataflow.FlowSource
+private import codeql.rust.Concepts
+
+/**
+ * Provides default sources, sinks and barriers for detecting request forgery
+ * vulnerabilities, as well as extension points for adding your own.
+ */
+module RequestForgery {
+  /**
+   * A data flow source for request forgery vulnerabilities.
+   */
+  abstract class Source extends DataFlow::Node { }
+
+  /**
+   * A data flow sink for request forgery vulnerabilities.
+   */
+  abstract class Sink extends QuerySink::Range {
+    /**
+     * Gets the name of a part of the request that may be tainted by this sink,
+     * such as the URL or the host.
+     */
+    override string getSinkType() { result = "RequestForgery" }
+  }
+
+  /**
+   * A barrier for request forgery vulnerabilities.
+   */
+  abstract class Barrier extends DataFlow::Node { }
+
+  /**
+   * An active threat-model source, considered as a flow source.
+   */
+  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource { }
+
+  /**
+   * A sink for request forgery from model data.
+   */
+  private class ModelsAsDataSink extends Sink {
+    ModelsAsDataSink() { sinkNode(this, "request-url") }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/security/SqlInjectionExtensions.qll b/rust/ql/lib/codeql/rust/security/SqlInjectionExtensions.qll
index f2921ef0cc1..ff81df37e40 100644
--- a/rust/ql/lib/codeql/rust/security/SqlInjectionExtensions.qll
+++ b/rust/ql/lib/codeql/rust/security/SqlInjectionExtensions.qll
@@ -9,6 +9,7 @@ private import codeql.rust.dataflow.DataFlow
 private import codeql.rust.dataflow.FlowSink
 private import codeql.rust.Concepts
 private import codeql.util.Unit
+private import codeql.rust.security.Barriers as Barriers
 
 /**
  * Provides default sources, sinks and barriers for detecting SQL injection
@@ -57,4 +58,10 @@ module SqlInjection {
   private class ModelsAsDataSink extends Sink {
     ModelsAsDataSink() { sinkNode(this, "sql-injection") }
   }
+
+  /**
+   * A barrier for SQL injection vulnerabilities for nodes whose type is a numeric or
+   * boolean type, which is unlikely to expose any vulnerability.
+   */
+  private class NumericTypeBarrier extends Barrier instanceof Barriers::NumericTypeBarrier { }
 }
diff --git a/rust/ql/lib/codeql/rust/security/UseOfHttpExtensions.qll b/rust/ql/lib/codeql/rust/security/UseOfHttpExtensions.qll
new file mode 100644
index 00000000000..bd91cde238f
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/security/UseOfHttpExtensions.qll
@@ -0,0 +1,62 @@
+/**
+ * Provides classes and predicates for reasoning about the use of
+ * non-HTTPS URLs in Rust code.
+ */
+
+import rust
+private import codeql.rust.dataflow.DataFlow
+private import codeql.rust.dataflow.FlowSink
+private import codeql.rust.Concepts
+
+/**
+ * Provides default sources, sinks and barriers for detecting use of
+ * non-HTTPS URLs, as well as extension points for adding your own.
+ */
+module UseOfHttp {
+  /**
+   * A data flow source for use of non-HTTPS URLs.
+   */
+  abstract class Source extends DataFlow::Node { }
+
+  /**
+   * A data flow sink for use of non-HTTPS URLs.
+   */
+  abstract class Sink extends QuerySink::Range {
+    override string getSinkType() { result = "UseOfHttp" }
+  }
+
+  /**
+   * A barrier for use of non-HTTPS URLs.
+   */
+  abstract class Barrier extends DataFlow::Node { }
+
+  /**
+   * A string containing an HTTP URL.
+   */
+  class HttpStringLiteral extends StringLiteralExpr {
+    HttpStringLiteral() {
+      exists(string s | this.getTextValue() = s |
+        // match HTTP URLs
+        s.regexpMatch("(?i)\"http://.*\"") and
+        // exclude private/local addresses:
+        //  - IPv4: localhost / 127.0.0.1, 192.168.x.x, 10.x.x.x, 172.16.x.x -> 172.31.x.x
+        //  - IPv6 (address inside []): ::1 (or 0:0:0:0:0:0:0:1), fc00::/7 (i.e. anything beginning `fcxx:` or `fdxx:`)
+        not s.regexpMatch("(?i)\"http://(localhost|127\\.0\\.0\\.1|192\\.168\\.[0-9]+\\.[0-9]+|10\\.[0-9]+\\.[0-9]+\\.[0-9]+|172\\.(1[6-9]|2[0-9]|3[01])\\.[0-9]+|\\[::1\\]|\\[0:0:0:0:0:0:0:1\\]|\\[f[cd][0-9a-f]{2}:.*\\]).*\"")
+      )
+    }
+  }
+
+  /**
+   * An HTTP string literal as a source.
+   */
+  private class HttpStringLiteralAsSource extends Source {
+    HttpStringLiteralAsSource() { this.asExpr().getExpr() instanceof HttpStringLiteral }
+  }
+
+  /**
+   * A sink for use of HTTP URLs from model data.
+   */
+  private class ModelsAsDataSink extends Sink {
+    ModelsAsDataSink() { sinkNode(this, "request-url") }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/security/regex/RegexInjectionExtensions.qll b/rust/ql/lib/codeql/rust/security/regex/RegexInjectionExtensions.qll
index 61d26f2f938..750517708af 100644
--- a/rust/ql/lib/codeql/rust/security/regex/RegexInjectionExtensions.qll
+++ b/rust/ql/lib/codeql/rust/security/regex/RegexInjectionExtensions.qll
@@ -9,6 +9,7 @@ private import codeql.rust.dataflow.DataFlow
 private import codeql.rust.controlflow.CfgNodes
 private import codeql.rust.dataflow.FlowSink
 private import codeql.rust.Concepts
+private import codeql.rust.security.Barriers as Barriers
 
 /**
  * Provides default sources, sinks and barriers for detecting regular expression
@@ -87,4 +88,14 @@ module RegexInjection {
           .getText() = "escape"
     }
   }
+
+  /**
+   * A barrier for regular expression injection vulnerabilities for nodes whose
+   * type is an integral or boolean type, which is unlikely to expose any vulnerability.
+   *
+   * We don't include floating point types in this barrier, as `.` is a special character
+   * in regular expressions.
+   */
+  private class IntegralOrBooleanTypeBarrier extends Barrier instanceof Barriers::IntegralOrBooleanTypeBarrier
+  { }
 }
diff --git a/rust/ql/lib/ext/generated/reqwest.model.yml b/rust/ql/lib/ext/generated/reqwest.model.yml
index 109a35a39e0..ac907669ce9 100644
--- a/rust/ql/lib/ext/generated/reqwest.model.yml
+++ b/rust/ql/lib/ext/generated/reqwest.model.yml
@@ -424,21 +424,21 @@ extensions:
       pack: codeql/rust-all
       extensible: sinkModel
     data:
-      - ["<reqwest::async_impl::client::Client>::delete", "Argument[0]", "transmission", "df-generated"]
-      - ["<reqwest::async_impl::client::Client>::get", "Argument[0]", "transmission", "df-generated"]
-      - ["<reqwest::async_impl::client::Client>::head", "Argument[0]", "transmission", "df-generated"]
-      - ["<reqwest::async_impl::client::Client>::patch", "Argument[0]", "transmission", "df-generated"]
-      - ["<reqwest::async_impl::client::Client>::post", "Argument[0]", "transmission", "df-generated"]
-      - ["<reqwest::async_impl::client::Client>::put", "Argument[0]", "transmission", "df-generated"]
+      - ["<reqwest::async_impl::client::Client>::delete", "Argument[0]", "request-url", "df-generated"]
+      - ["<reqwest::async_impl::client::Client>::get", "Argument[0]", "request-url", "df-generated"]
+      - ["<reqwest::async_impl::client::Client>::head", "Argument[0]", "request-url", "df-generated"]
+      - ["<reqwest::async_impl::client::Client>::patch", "Argument[0]", "request-url", "df-generated"]
+      - ["<reqwest::async_impl::client::Client>::post", "Argument[0]", "request-url", "df-generated"]
+      - ["<reqwest::async_impl::client::Client>::put", "Argument[0]", "request-url", "df-generated"]
       - ["<reqwest::async_impl::multipart::Form>::into_stream", "Argument[self]", "log-injection", "df-generated"]
       - ["<reqwest::async_impl::multipart::Form>::stream", "Argument[self]", "log-injection", "df-generated"]
       - ["<reqwest::async_impl::request::RequestBuilder>::multipart", "Argument[0]", "log-injection", "df-generated"]
-      - ["<reqwest::blocking::client::Client>::delete", "Argument[0]", "transmission", "df-generated"]
-      - ["<reqwest::blocking::client::Client>::get", "Argument[0]", "transmission", "df-generated"]
-      - ["<reqwest::blocking::client::Client>::head", "Argument[0]", "transmission", "df-generated"]
-      - ["<reqwest::blocking::client::Client>::patch", "Argument[0]", "transmission", "df-generated"]
-      - ["<reqwest::blocking::client::Client>::post", "Argument[0]", "transmission", "df-generated"]
-      - ["<reqwest::blocking::client::Client>::put", "Argument[0]", "transmission", "df-generated"]
+      - ["<reqwest::blocking::client::Client>::delete", "Argument[0]", "request-url", "df-generated"]
+      - ["<reqwest::blocking::client::Client>::get", "Argument[0]", "request-url", "df-generated"]
+      - ["<reqwest::blocking::client::Client>::head", "Argument[0]", "request-url", "df-generated"]
+      - ["<reqwest::blocking::client::Client>::patch", "Argument[0]", "request-url", "df-generated"]
+      - ["<reqwest::blocking::client::Client>::post", "Argument[0]", "request-url", "df-generated"]
+      - ["<reqwest::blocking::client::Client>::put", "Argument[0]", "request-url", "df-generated"]
       - ["<reqwest::blocking::multipart::Form>::into_reader", "Argument[self]", "log-injection", "df-generated"]
       - ["<reqwest::blocking::multipart::Form>::reader", "Argument[self]", "log-injection", "df-generated"]
       - ["<reqwest::blocking::multipart::Reader as std::io::Read>::read", "Argument[self]", "log-injection", "df-generated"]
@@ -450,9 +450,9 @@ extensions:
       - ["<reqwest::blocking::response::Response>::text_with_charset", "Argument[self]", "pointer-access", "df-generated"]
       - ["<reqwest::connect::ConnectorService as tower_service::Service>::call", "Argument[0]", "log-injection", "df-generated"]
       - ["<reqwest::error::Error>::new", "Argument[1]", "pointer-access", "df-generated"]
-      - ["reqwest::blocking::get", "Argument[0]", "transmission", "df-generated"]
+      - ["reqwest::blocking::get", "Argument[0]", "request-url", "df-generated"]
       - ["reqwest::blocking::wait::timeout", "Argument[1]", "pointer-access", "df-generated"]
-      - ["reqwest::get", "Argument[0]", "transmission", "df-generated"]
+      - ["reqwest::get", "Argument[0]", "request-url", "df-generated"]
   - addsTo:
       pack: codeql/rust-all
       extensible: sourceModel
diff --git a/rust/ql/lib/qlpack.yml b/rust/ql/lib/qlpack.yml
index 6a2323410e6..3c045cd83e5 100644
--- a/rust/ql/lib/qlpack.yml
+++ b/rust/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/rust-all
-version: 0.1.14-dev
+version: 0.1.20-dev
 groups: rust
 extractor: rust
 dbscheme: rust.dbscheme
diff --git a/rust/ql/lib/rust.dbscheme b/rust/ql/lib/rust.dbscheme
index 319c933d961..30a0713e5bf 100644
--- a/rust/ql/lib/rust.dbscheme
+++ b/rust/ql/lib/rust.dbscheme
@@ -177,10 +177,10 @@ named_crates(
 | @assoc_item_list
 | @attr
 | @callable
-| @closure_binder
 | @expr
 | @extern_item_list
 | @field_list
+| @for_binder
 | @format_args_arg
 | @generic_arg
 | @generic_arg_list
@@ -200,9 +200,9 @@ named_crates(
 | @parenthesized_arg_list
 | @pat
 | @path
+| @path_ast_node
 | @path_segment
 | @rename
-| @resolvable
 | @ret_type_repr
 | @return_type_syntax
 | @source_file
@@ -282,18 +282,6 @@ abi_abi_strings(
 | @variant
 ;
 
-#keyset[id]
-addressable_extended_canonical_paths(
-  int id: @addressable ref,
-  string extended_canonical_path: string ref
-);
-
-#keyset[id]
-addressable_crate_origins(
-  int id: @addressable ref,
-  string crate_origin: string ref
-);
-
 arg_lists(
   unique int id: @arg_list
 );
@@ -403,16 +391,6 @@ callable_attrs(
   int attr: @attr ref
 );
 
-closure_binders(
-  unique int id: @closure_binder
-);
-
-#keyset[id]
-closure_binder_generic_param_lists(
-  int id: @closure_binder ref,
-  int generic_param_list: @generic_param_list ref
-);
-
 @expr =
   @array_expr_internal
 | @asm_expr
@@ -472,6 +450,16 @@ extern_item_list_extern_items(
 | @tuple_field_list
 ;
 
+for_binders(
+  unique int id: @for_binder
+);
+
+#keyset[id]
+for_binder_generic_param_lists(
+  int id: @for_binder ref,
+  int generic_param_list: @generic_param_list ref
+);
+
 format_args_args(
   unique int id: @format_args_arg
 );
@@ -747,6 +735,20 @@ path_segments_(
   int segment: @path_segment ref
 );
 
+@path_ast_node =
+  @path_expr
+| @path_pat
+| @struct_expr
+| @struct_pat
+| @tuple_struct_pat
+;
+
+#keyset[id]
+path_ast_node_paths(
+  int id: @path_ast_node ref,
+  int path: @path ref
+);
+
 path_segments(
   unique int id: @path_segment
 );
@@ -803,23 +805,6 @@ rename_names(
   int name: @name ref
 );
 
-@resolvable =
-  @method_call_expr
-| @path_ast_node
-;
-
-#keyset[id]
-resolvable_resolved_paths(
-  int id: @resolvable ref,
-  string resolved_path: string ref
-);
-
-#keyset[id]
-resolvable_resolved_crate_origins(
-  int id: @resolvable ref,
-  string resolved_crate_origin: string ref
-);
-
 ret_type_reprs(
   unique int id: @ret_type_repr
 );
@@ -1044,6 +1029,12 @@ type_bounds(
   unique int id: @type_bound
 );
 
+#keyset[id]
+type_bound_for_binders(
+  int id: @type_bound ref,
+  int for_binder: @for_binder ref
+);
+
 #keyset[id]
 type_bound_is_async(
   int id: @type_bound ref
@@ -1191,9 +1182,9 @@ where_preds(
 );
 
 #keyset[id]
-where_pred_generic_param_lists(
+where_pred_for_binders(
   int id: @where_pred ref,
-  int generic_param_list: @generic_param_list ref
+  int for_binder: @for_binder ref
 );
 
 #keyset[id]
@@ -1272,31 +1263,6 @@ asm_const_is_const(
   int id: @asm_const ref
 );
 
-asm_exprs(
-  unique int id: @asm_expr
-);
-
-#keyset[id, index]
-asm_expr_asm_pieces(
-  int id: @asm_expr ref,
-  int index: int ref,
-  int asm_piece: @asm_piece ref
-);
-
-#keyset[id, index]
-asm_expr_attrs(
-  int id: @asm_expr ref,
-  int index: int ref,
-  int attr: @attr ref
-);
-
-#keyset[id, index]
-asm_expr_templates(
-  int id: @asm_expr ref,
-  int index: int ref,
-  int template: @expr ref
-);
-
 asm_labels(
   unique int id: @asm_label
 );
@@ -1560,15 +1526,15 @@ closure_exprs(
 );
 
 #keyset[id]
-closure_expr_bodies(
+closure_expr_closure_bodies(
   int id: @closure_expr ref,
-  int body: @expr ref
+  int closure_body: @expr ref
 );
 
 #keyset[id]
-closure_expr_closure_binders(
+closure_expr_for_binders(
   int id: @closure_expr ref,
-  int closure_binder: @closure_binder ref
+  int for_binder: @for_binder ref
 );
 
 #keyset[id]
@@ -1769,9 +1735,9 @@ for_type_reprs(
 );
 
 #keyset[id]
-for_type_repr_generic_param_lists(
+for_type_repr_for_binders(
   int id: @for_type_repr ref,
-  int generic_param_list: @generic_param_list ref
+  int for_binder: @for_binder ref
 );
 
 #keyset[id]
@@ -1905,6 +1871,7 @@ infer_type_reprs(
 
 @item =
   @adt
+| @asm_expr
 | @assoc_item
 | @extern_block
 | @extern_crate
@@ -2067,12 +2034,6 @@ macro_block_exprs(
   unique int id: @macro_block_expr
 );
 
-#keyset[id]
-macro_block_expr_tail_exprs(
-  int id: @macro_block_expr ref,
-  int tail_expr: @expr ref
-);
-
 #keyset[id, index]
 macro_block_expr_statements(
   int id: @macro_block_expr ref,
@@ -2080,6 +2041,12 @@ macro_block_expr_statements(
   int statement: @stmt ref
 );
 
+#keyset[id]
+macro_block_expr_tail_exprs(
+  int id: @macro_block_expr ref,
+  int tail_expr: @expr ref
+);
+
 macro_exprs(
   unique int id: @macro_expr
 );
@@ -2229,24 +2196,14 @@ paren_type_repr_type_reprs(
   int type_repr: @type_repr ref
 );
 
-@path_ast_node =
-  @path_expr
-| @path_pat
-| @struct_expr
-| @struct_pat
-| @tuple_struct_pat
-;
-
-#keyset[id]
-path_ast_node_paths(
-  int id: @path_ast_node ref,
-  int path: @path ref
-);
-
 @path_expr_base =
   @path_expr
 ;
 
+path_pats(
+  unique int id: @path_pat
+);
+
 path_type_reprs(
   unique int id: @path_type_repr
 );
@@ -2494,6 +2451,16 @@ slice_type_repr_type_reprs(
   int type_repr: @type_repr ref
 );
 
+struct_exprs(
+  unique int id: @struct_expr
+);
+
+#keyset[id]
+struct_expr_struct_expr_field_lists(
+  int id: @struct_expr ref,
+  int struct_expr_field_list: @struct_expr_field_list ref
+);
+
 struct_field_lists(
   unique int id: @struct_field_list
 );
@@ -2505,6 +2472,16 @@ struct_field_list_fields(
   int field: @struct_field ref
 );
 
+struct_pats(
+  unique int id: @struct_pat
+);
+
+#keyset[id]
+struct_pat_struct_pat_field_lists(
+  int id: @struct_pat ref,
+  int struct_pat_field_list: @struct_pat_field_list ref
+);
+
 try_exprs(
   unique int id: @try_expr
 );
@@ -2562,6 +2539,17 @@ tuple_pat_fields(
   int field: @pat ref
 );
 
+tuple_struct_pats(
+  unique int id: @tuple_struct_pat
+);
+
+#keyset[id, index]
+tuple_struct_pat_fields(
+  int id: @tuple_struct_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
 tuple_type_reprs(
   unique int id: @tuple_type_repr
 );
@@ -2709,6 +2697,31 @@ adt_derive_macro_expansions(
   int derive_macro_expansion: @macro_items ref
 );
 
+asm_exprs(
+  unique int id: @asm_expr
+);
+
+#keyset[id, index]
+asm_expr_asm_pieces(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int asm_piece: @asm_piece ref
+);
+
+#keyset[id, index]
+asm_expr_attrs(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+asm_expr_templates(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int template: @expr ref
+);
+
 @assoc_item =
   @const
 | @function
@@ -3037,30 +3050,6 @@ path_expr_attrs(
   int attr: @attr ref
 );
 
-path_pats(
-  unique int id: @path_pat
-);
-
-struct_exprs(
-  unique int id: @struct_expr
-);
-
-#keyset[id]
-struct_expr_struct_expr_field_lists(
-  int id: @struct_expr ref,
-  int struct_expr_field_list: @struct_expr_field_list ref
-);
-
-struct_pats(
-  unique int id: @struct_pat
-);
-
-#keyset[id]
-struct_pat_struct_pat_field_lists(
-  int id: @struct_pat ref,
-  int struct_pat_field_list: @struct_pat_field_list ref
-);
-
 traits(
   unique int id: @trait
 );
@@ -3159,17 +3148,6 @@ trait_alias_where_clauses(
   int where_clause: @where_clause ref
 );
 
-tuple_struct_pats(
-  unique int id: @tuple_struct_pat
-);
-
-#keyset[id, index]
-tuple_struct_pat_fields(
-  int id: @tuple_struct_pat ref,
-  int index: int ref,
-  int field: @pat ref
-);
-
 uses(
   unique int id: @use
 );
@@ -3330,9 +3308,9 @@ function_abis(
 );
 
 #keyset[id]
-function_bodies(
+function_function_bodies(
   int id: @function ref,
-  int body: @block_expr ref
+  int function_body: @block_expr ref
 );
 
 #keyset[id]
diff --git a/rust/ql/lib/rust.qll b/rust/ql/lib/rust.qll
index e7d02adea32..d209672028b 100644
--- a/rust/ql/lib/rust.qll
+++ b/rust/ql/lib/rust.qll
@@ -1,5 +1,6 @@
 /** Top-level import for the Rust language pack */
 
+import Customizations
 import codeql.rust.elements
 import codeql.Locations
 import codeql.files.FileSystem
@@ -8,6 +9,7 @@ import codeql.rust.elements.ArithmeticOperation
 import codeql.rust.elements.AssignmentOperation
 import codeql.rust.elements.BitwiseOperation
 import codeql.rust.elements.ComparisonOperation
+import codeql.rust.elements.ConstAccess
 import codeql.rust.elements.DerefExpr
 import codeql.rust.elements.LiteralExprExt
 import codeql.rust.elements.LogicalOperation
diff --git a/rust/ql/lib/upgrades/319c933d9615ccf40f363548cafd51d08c74a534/old.dbscheme b/rust/ql/lib/upgrades/319c933d9615ccf40f363548cafd51d08c74a534/old.dbscheme
new file mode 100644
index 00000000000..319c933d961
--- /dev/null
+++ b/rust/ql/lib/upgrades/319c933d9615ccf40f363548cafd51d08c74a534/old.dbscheme
@@ -0,0 +1,3637 @@
+// generated by codegen, do not edit
+
+// from ../shared/tree-sitter-extractor/src/generator/prefix.dbscheme
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Empty location -*/
+
+empty_location(
+  int location: @location_default ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- Diagnostic messages: severity -*/
+
+case @diagnostic.severity of
+  10 = @diagnostic_debug
+| 20 = @diagnostic_info
+| 30 = @diagnostic_warning
+| 40 = @diagnostic_error
+;
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error;
+
+/*- Database metadata -*/
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+overlayChangedFiles(
+  string path: string ref
+);
+
+
+// from prefix.dbscheme
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_default ref
+);
+
+
+// from schema
+
+@element =
+  @extractor_step
+| @locatable
+| @named_crate
+| @unextracted
+;
+
+extractor_steps(
+  unique int id: @extractor_step,
+  string action: string ref,
+  int duration_ms: int ref
+);
+
+#keyset[id]
+extractor_step_files(
+  int id: @extractor_step ref,
+  int file: @file ref
+);
+
+@locatable =
+  @ast_node
+| @crate
+;
+
+named_crates(
+  unique int id: @named_crate,
+  string name: string ref,
+  int crate: @crate ref
+);
+
+@unextracted =
+  @missing
+| @unimplemented
+;
+
+@ast_node =
+  @abi
+| @addressable
+| @arg_list
+| @asm_dir_spec
+| @asm_operand
+| @asm_operand_expr
+| @asm_option
+| @asm_piece
+| @asm_reg_spec
+| @assoc_item_list
+| @attr
+| @callable
+| @closure_binder
+| @expr
+| @extern_item_list
+| @field_list
+| @format_args_arg
+| @generic_arg
+| @generic_arg_list
+| @generic_param
+| @generic_param_list
+| @item_list
+| @label
+| @let_else
+| @macro_items
+| @match_arm
+| @match_arm_list
+| @match_guard
+| @meta
+| @name
+| @param_base
+| @param_list
+| @parenthesized_arg_list
+| @pat
+| @path
+| @path_segment
+| @rename
+| @resolvable
+| @ret_type_repr
+| @return_type_syntax
+| @source_file
+| @stmt
+| @stmt_list
+| @struct_expr_field
+| @struct_expr_field_list
+| @struct_field
+| @struct_pat_field
+| @struct_pat_field_list
+| @token
+| @token_tree
+| @tuple_field
+| @type_bound
+| @type_bound_list
+| @type_repr
+| @use_bound_generic_arg
+| @use_bound_generic_args
+| @use_tree
+| @use_tree_list
+| @variant_list
+| @visibility
+| @where_clause
+| @where_pred
+;
+
+crates(
+  unique int id: @crate
+);
+
+#keyset[id]
+crate_names(
+  int id: @crate ref,
+  string name: string ref
+);
+
+#keyset[id]
+crate_versions(
+  int id: @crate ref,
+  string version: string ref
+);
+
+#keyset[id, index]
+crate_cfg_options(
+  int id: @crate ref,
+  int index: int ref,
+  string cfg_option: string ref
+);
+
+#keyset[id, index]
+crate_named_dependencies(
+  int id: @crate ref,
+  int index: int ref,
+  int named_dependency: @named_crate ref
+);
+
+missings(
+  unique int id: @missing
+);
+
+unimplementeds(
+  unique int id: @unimplemented
+);
+
+abis(
+  unique int id: @abi
+);
+
+#keyset[id]
+abi_abi_strings(
+  int id: @abi ref,
+  string abi_string: string ref
+);
+
+@addressable =
+  @item
+| @variant
+;
+
+#keyset[id]
+addressable_extended_canonical_paths(
+  int id: @addressable ref,
+  string extended_canonical_path: string ref
+);
+
+#keyset[id]
+addressable_crate_origins(
+  int id: @addressable ref,
+  string crate_origin: string ref
+);
+
+arg_lists(
+  unique int id: @arg_list
+);
+
+#keyset[id, index]
+arg_list_args(
+  int id: @arg_list ref,
+  int index: int ref,
+  int arg: @expr ref
+);
+
+asm_dir_specs(
+  unique int id: @asm_dir_spec
+);
+
+@asm_operand =
+  @asm_const
+| @asm_label
+| @asm_reg_operand
+| @asm_sym
+;
+
+asm_operand_exprs(
+  unique int id: @asm_operand_expr
+);
+
+#keyset[id]
+asm_operand_expr_in_exprs(
+  int id: @asm_operand_expr ref,
+  int in_expr: @expr ref
+);
+
+#keyset[id]
+asm_operand_expr_out_exprs(
+  int id: @asm_operand_expr ref,
+  int out_expr: @expr ref
+);
+
+asm_options(
+  unique int id: @asm_option
+);
+
+#keyset[id]
+asm_option_is_raw(
+  int id: @asm_option ref
+);
+
+@asm_piece =
+  @asm_clobber_abi
+| @asm_operand_named
+| @asm_options_list
+;
+
+asm_reg_specs(
+  unique int id: @asm_reg_spec
+);
+
+#keyset[id]
+asm_reg_spec_identifiers(
+  int id: @asm_reg_spec ref,
+  int identifier: @name_ref ref
+);
+
+assoc_item_lists(
+  unique int id: @assoc_item_list
+);
+
+#keyset[id, index]
+assoc_item_list_assoc_items(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int assoc_item: @assoc_item ref
+);
+
+#keyset[id, index]
+assoc_item_list_attrs(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+attrs(
+  unique int id: @attr
+);
+
+#keyset[id]
+attr_meta(
+  int id: @attr ref,
+  int meta: @meta ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_param_lists(
+  int id: @callable ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id, index]
+callable_attrs(
+  int id: @callable ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+closure_binders(
+  unique int id: @closure_binder
+);
+
+#keyset[id]
+closure_binder_generic_param_lists(
+  int id: @closure_binder ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+@expr =
+  @array_expr_internal
+| @asm_expr
+| @await_expr
+| @become_expr
+| @binary_expr
+| @break_expr
+| @call_expr_base
+| @cast_expr
+| @closure_expr
+| @continue_expr
+| @field_expr
+| @format_args_expr
+| @if_expr
+| @index_expr
+| @labelable_expr
+| @let_expr
+| @literal_expr
+| @macro_block_expr
+| @macro_expr
+| @match_expr
+| @offset_of_expr
+| @paren_expr
+| @path_expr_base
+| @prefix_expr
+| @range_expr
+| @ref_expr
+| @return_expr
+| @struct_expr
+| @try_expr
+| @tuple_expr
+| @underscore_expr
+| @yeet_expr
+| @yield_expr
+;
+
+extern_item_lists(
+  unique int id: @extern_item_list
+);
+
+#keyset[id, index]
+extern_item_list_attrs(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+extern_item_list_extern_items(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int extern_item: @extern_item ref
+);
+
+@field_list =
+  @struct_field_list
+| @tuple_field_list
+;
+
+format_args_args(
+  unique int id: @format_args_arg
+);
+
+#keyset[id]
+format_args_arg_exprs(
+  int id: @format_args_arg ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+format_args_arg_names(
+  int id: @format_args_arg ref,
+  int name: @name ref
+);
+
+@generic_arg =
+  @assoc_type_arg
+| @const_arg
+| @lifetime_arg
+| @type_arg
+;
+
+generic_arg_lists(
+  unique int id: @generic_arg_list
+);
+
+#keyset[id, index]
+generic_arg_list_generic_args(
+  int id: @generic_arg_list ref,
+  int index: int ref,
+  int generic_arg: @generic_arg ref
+);
+
+@generic_param =
+  @const_param
+| @lifetime_param
+| @type_param
+;
+
+generic_param_lists(
+  unique int id: @generic_param_list
+);
+
+#keyset[id, index]
+generic_param_list_generic_params(
+  int id: @generic_param_list ref,
+  int index: int ref,
+  int generic_param: @generic_param ref
+);
+
+item_lists(
+  unique int id: @item_list
+);
+
+#keyset[id, index]
+item_list_attrs(
+  int id: @item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+item_list_items(
+  int id: @item_list ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+labels(
+  unique int id: @label
+);
+
+#keyset[id]
+label_lifetimes(
+  int id: @label ref,
+  int lifetime: @lifetime ref
+);
+
+let_elses(
+  unique int id: @let_else
+);
+
+#keyset[id]
+let_else_block_exprs(
+  int id: @let_else ref,
+  int block_expr: @block_expr ref
+);
+
+macro_items(
+  unique int id: @macro_items
+);
+
+#keyset[id, index]
+macro_items_items(
+  int id: @macro_items ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+match_arms(
+  unique int id: @match_arm
+);
+
+#keyset[id, index]
+match_arm_attrs(
+  int id: @match_arm ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_arm_exprs(
+  int id: @match_arm ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+match_arm_guards(
+  int id: @match_arm ref,
+  int guard: @match_guard ref
+);
+
+#keyset[id]
+match_arm_pats(
+  int id: @match_arm ref,
+  int pat: @pat ref
+);
+
+match_arm_lists(
+  unique int id: @match_arm_list
+);
+
+#keyset[id, index]
+match_arm_list_arms(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int arm: @match_arm ref
+);
+
+#keyset[id, index]
+match_arm_list_attrs(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+match_guards(
+  unique int id: @match_guard
+);
+
+#keyset[id]
+match_guard_conditions(
+  int id: @match_guard ref,
+  int condition: @expr ref
+);
+
+meta(
+  unique int id: @meta
+);
+
+#keyset[id]
+meta_exprs(
+  int id: @meta ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+meta_is_unsafe(
+  int id: @meta ref
+);
+
+#keyset[id]
+meta_paths(
+  int id: @meta ref,
+  int path: @path ref
+);
+
+#keyset[id]
+meta_token_trees(
+  int id: @meta ref,
+  int token_tree: @token_tree ref
+);
+
+names(
+  unique int id: @name
+);
+
+#keyset[id]
+name_texts(
+  int id: @name ref,
+  string text: string ref
+);
+
+@param_base =
+  @param
+| @self_param
+;
+
+#keyset[id, index]
+param_base_attrs(
+  int id: @param_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+param_base_type_reprs(
+  int id: @param_base ref,
+  int type_repr: @type_repr ref
+);
+
+param_lists(
+  unique int id: @param_list
+);
+
+#keyset[id, index]
+param_list_params(
+  int id: @param_list ref,
+  int index: int ref,
+  int param: @param ref
+);
+
+#keyset[id]
+param_list_self_params(
+  int id: @param_list ref,
+  int self_param: @self_param ref
+);
+
+parenthesized_arg_lists(
+  unique int id: @parenthesized_arg_list
+);
+
+#keyset[id, index]
+parenthesized_arg_list_type_args(
+  int id: @parenthesized_arg_list ref,
+  int index: int ref,
+  int type_arg: @type_arg ref
+);
+
+@pat =
+  @box_pat
+| @const_block_pat
+| @ident_pat
+| @literal_pat
+| @macro_pat
+| @or_pat
+| @paren_pat
+| @path_pat
+| @range_pat
+| @ref_pat
+| @rest_pat
+| @slice_pat
+| @struct_pat
+| @tuple_pat
+| @tuple_struct_pat
+| @wildcard_pat
+;
+
+paths(
+  unique int id: @path
+);
+
+#keyset[id]
+path_qualifiers(
+  int id: @path ref,
+  int qualifier: @path ref
+);
+
+#keyset[id]
+path_segments_(
+  int id: @path ref,
+  int segment: @path_segment ref
+);
+
+path_segments(
+  unique int id: @path_segment
+);
+
+#keyset[id]
+path_segment_generic_arg_lists(
+  int id: @path_segment ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+path_segment_identifiers(
+  int id: @path_segment ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+path_segment_parenthesized_arg_lists(
+  int id: @path_segment ref,
+  int parenthesized_arg_list: @parenthesized_arg_list ref
+);
+
+#keyset[id]
+path_segment_ret_types(
+  int id: @path_segment ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+path_segment_return_type_syntaxes(
+  int id: @path_segment ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+path_segment_type_reprs(
+  int id: @path_segment ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+path_segment_trait_type_reprs(
+  int id: @path_segment ref,
+  int trait_type_repr: @path_type_repr ref
+);
+
+renames(
+  unique int id: @rename
+);
+
+#keyset[id]
+rename_names(
+  int id: @rename ref,
+  int name: @name ref
+);
+
+@resolvable =
+  @method_call_expr
+| @path_ast_node
+;
+
+#keyset[id]
+resolvable_resolved_paths(
+  int id: @resolvable ref,
+  string resolved_path: string ref
+);
+
+#keyset[id]
+resolvable_resolved_crate_origins(
+  int id: @resolvable ref,
+  string resolved_crate_origin: string ref
+);
+
+ret_type_reprs(
+  unique int id: @ret_type_repr
+);
+
+#keyset[id]
+ret_type_repr_type_reprs(
+  int id: @ret_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+return_type_syntaxes(
+  unique int id: @return_type_syntax
+);
+
+source_files(
+  unique int id: @source_file
+);
+
+#keyset[id, index]
+source_file_attrs(
+  int id: @source_file ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+source_file_items(
+  int id: @source_file ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+@stmt =
+  @expr_stmt
+| @item
+| @let_stmt
+;
+
+stmt_lists(
+  unique int id: @stmt_list
+);
+
+#keyset[id, index]
+stmt_list_attrs(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+stmt_list_statements(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+stmt_list_tail_exprs(
+  int id: @stmt_list ref,
+  int tail_expr: @expr ref
+);
+
+struct_expr_fields(
+  unique int id: @struct_expr_field
+);
+
+#keyset[id, index]
+struct_expr_field_attrs(
+  int id: @struct_expr_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_expr_field_exprs(
+  int id: @struct_expr_field ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+struct_expr_field_identifiers(
+  int id: @struct_expr_field ref,
+  int identifier: @name_ref ref
+);
+
+struct_expr_field_lists(
+  unique int id: @struct_expr_field_list
+);
+
+#keyset[id, index]
+struct_expr_field_list_attrs(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+struct_expr_field_list_fields(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int field: @struct_expr_field ref
+);
+
+#keyset[id]
+struct_expr_field_list_spreads(
+  int id: @struct_expr_field_list ref,
+  int spread: @expr ref
+);
+
+struct_fields(
+  unique int id: @struct_field
+);
+
+#keyset[id, index]
+struct_field_attrs(
+  int id: @struct_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_defaults(
+  int id: @struct_field ref,
+  int default: @expr ref
+);
+
+#keyset[id]
+struct_field_is_unsafe(
+  int id: @struct_field ref
+);
+
+#keyset[id]
+struct_field_names(
+  int id: @struct_field ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_field_type_reprs(
+  int id: @struct_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+struct_field_visibilities(
+  int id: @struct_field ref,
+  int visibility: @visibility ref
+);
+
+struct_pat_fields(
+  unique int id: @struct_pat_field
+);
+
+#keyset[id, index]
+struct_pat_field_attrs(
+  int id: @struct_pat_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_pat_field_identifiers(
+  int id: @struct_pat_field ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+struct_pat_field_pats(
+  int id: @struct_pat_field ref,
+  int pat: @pat ref
+);
+
+struct_pat_field_lists(
+  unique int id: @struct_pat_field_list
+);
+
+#keyset[id, index]
+struct_pat_field_list_fields(
+  int id: @struct_pat_field_list ref,
+  int index: int ref,
+  int field: @struct_pat_field ref
+);
+
+#keyset[id]
+struct_pat_field_list_rest_pats(
+  int id: @struct_pat_field_list ref,
+  int rest_pat: @rest_pat ref
+);
+
+@token =
+  @comment
+;
+
+token_trees(
+  unique int id: @token_tree
+);
+
+tuple_fields(
+  unique int id: @tuple_field
+);
+
+#keyset[id, index]
+tuple_field_attrs(
+  int id: @tuple_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+tuple_field_type_reprs(
+  int id: @tuple_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+tuple_field_visibilities(
+  int id: @tuple_field ref,
+  int visibility: @visibility ref
+);
+
+type_bounds(
+  unique int id: @type_bound
+);
+
+#keyset[id]
+type_bound_is_async(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_is_const(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_lifetimes(
+  int id: @type_bound ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+type_bound_type_reprs(
+  int id: @type_bound ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_bound_use_bound_generic_args(
+  int id: @type_bound ref,
+  int use_bound_generic_args: @use_bound_generic_args ref
+);
+
+type_bound_lists(
+  unique int id: @type_bound_list
+);
+
+#keyset[id, index]
+type_bound_list_bounds(
+  int id: @type_bound_list ref,
+  int index: int ref,
+  int bound: @type_bound ref
+);
+
+@type_repr =
+  @array_type_repr
+| @dyn_trait_type_repr
+| @fn_ptr_type_repr
+| @for_type_repr
+| @impl_trait_type_repr
+| @infer_type_repr
+| @macro_type_repr
+| @never_type_repr
+| @paren_type_repr
+| @path_type_repr
+| @ptr_type_repr
+| @ref_type_repr
+| @slice_type_repr
+| @tuple_type_repr
+;
+
+@use_bound_generic_arg =
+  @lifetime
+| @name_ref
+;
+
+use_bound_generic_args(
+  unique int id: @use_bound_generic_args
+);
+
+#keyset[id, index]
+use_bound_generic_args_use_bound_generic_args(
+  int id: @use_bound_generic_args ref,
+  int index: int ref,
+  int use_bound_generic_arg: @use_bound_generic_arg ref
+);
+
+use_trees(
+  unique int id: @use_tree
+);
+
+#keyset[id]
+use_tree_is_glob(
+  int id: @use_tree ref
+);
+
+#keyset[id]
+use_tree_paths(
+  int id: @use_tree ref,
+  int path: @path ref
+);
+
+#keyset[id]
+use_tree_renames(
+  int id: @use_tree ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+use_tree_use_tree_lists(
+  int id: @use_tree ref,
+  int use_tree_list: @use_tree_list ref
+);
+
+use_tree_lists(
+  unique int id: @use_tree_list
+);
+
+#keyset[id, index]
+use_tree_list_use_trees(
+  int id: @use_tree_list ref,
+  int index: int ref,
+  int use_tree: @use_tree ref
+);
+
+variant_lists(
+  unique int id: @variant_list
+);
+
+#keyset[id, index]
+variant_list_variants(
+  int id: @variant_list ref,
+  int index: int ref,
+  int variant: @variant ref
+);
+
+visibilities(
+  unique int id: @visibility
+);
+
+#keyset[id]
+visibility_paths(
+  int id: @visibility ref,
+  int path: @path ref
+);
+
+where_clauses(
+  unique int id: @where_clause
+);
+
+#keyset[id, index]
+where_clause_predicates(
+  int id: @where_clause ref,
+  int index: int ref,
+  int predicate: @where_pred ref
+);
+
+where_preds(
+  unique int id: @where_pred
+);
+
+#keyset[id]
+where_pred_generic_param_lists(
+  int id: @where_pred ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+where_pred_lifetimes(
+  int id: @where_pred ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+where_pred_type_reprs(
+  int id: @where_pred ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+where_pred_type_bound_lists(
+  int id: @where_pred ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+array_expr_internals(
+  unique int id: @array_expr_internal
+);
+
+#keyset[id, index]
+array_expr_internal_attrs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+array_expr_internal_exprs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+array_expr_internal_is_semicolon(
+  int id: @array_expr_internal ref
+);
+
+array_type_reprs(
+  unique int id: @array_type_repr
+);
+
+#keyset[id]
+array_type_repr_const_args(
+  int id: @array_type_repr ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+array_type_repr_element_type_reprs(
+  int id: @array_type_repr ref,
+  int element_type_repr: @type_repr ref
+);
+
+asm_clobber_abis(
+  unique int id: @asm_clobber_abi
+);
+
+asm_consts(
+  unique int id: @asm_const
+);
+
+#keyset[id]
+asm_const_exprs(
+  int id: @asm_const ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+asm_const_is_const(
+  int id: @asm_const ref
+);
+
+asm_exprs(
+  unique int id: @asm_expr
+);
+
+#keyset[id, index]
+asm_expr_asm_pieces(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int asm_piece: @asm_piece ref
+);
+
+#keyset[id, index]
+asm_expr_attrs(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+asm_expr_templates(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int template: @expr ref
+);
+
+asm_labels(
+  unique int id: @asm_label
+);
+
+#keyset[id]
+asm_label_block_exprs(
+  int id: @asm_label ref,
+  int block_expr: @block_expr ref
+);
+
+asm_operand_nameds(
+  unique int id: @asm_operand_named
+);
+
+#keyset[id]
+asm_operand_named_asm_operands(
+  int id: @asm_operand_named ref,
+  int asm_operand: @asm_operand ref
+);
+
+#keyset[id]
+asm_operand_named_names(
+  int id: @asm_operand_named ref,
+  int name: @name ref
+);
+
+asm_options_lists(
+  unique int id: @asm_options_list
+);
+
+#keyset[id, index]
+asm_options_list_asm_options(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int asm_option: @asm_option ref
+);
+
+asm_reg_operands(
+  unique int id: @asm_reg_operand
+);
+
+#keyset[id]
+asm_reg_operand_asm_dir_specs(
+  int id: @asm_reg_operand ref,
+  int asm_dir_spec: @asm_dir_spec ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_operand_exprs(
+  int id: @asm_reg_operand ref,
+  int asm_operand_expr: @asm_operand_expr ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_reg_specs(
+  int id: @asm_reg_operand ref,
+  int asm_reg_spec: @asm_reg_spec ref
+);
+
+asm_syms(
+  unique int id: @asm_sym
+);
+
+#keyset[id]
+asm_sym_paths(
+  int id: @asm_sym ref,
+  int path: @path ref
+);
+
+assoc_type_args(
+  unique int id: @assoc_type_arg
+);
+
+#keyset[id]
+assoc_type_arg_const_args(
+  int id: @assoc_type_arg ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+assoc_type_arg_generic_arg_lists(
+  int id: @assoc_type_arg ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+assoc_type_arg_identifiers(
+  int id: @assoc_type_arg ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+assoc_type_arg_param_lists(
+  int id: @assoc_type_arg ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+assoc_type_arg_ret_types(
+  int id: @assoc_type_arg ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_return_type_syntaxes(
+  int id: @assoc_type_arg ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+assoc_type_arg_type_reprs(
+  int id: @assoc_type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_type_bound_lists(
+  int id: @assoc_type_arg ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+await_exprs(
+  unique int id: @await_expr
+);
+
+#keyset[id, index]
+await_expr_attrs(
+  int id: @await_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+await_expr_exprs(
+  int id: @await_expr ref,
+  int expr: @expr ref
+);
+
+become_exprs(
+  unique int id: @become_expr
+);
+
+#keyset[id, index]
+become_expr_attrs(
+  int id: @become_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+become_expr_exprs(
+  int id: @become_expr ref,
+  int expr: @expr ref
+);
+
+binary_exprs(
+  unique int id: @binary_expr
+);
+
+#keyset[id, index]
+binary_expr_attrs(
+  int id: @binary_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+binary_expr_lhs(
+  int id: @binary_expr ref,
+  int lhs: @expr ref
+);
+
+#keyset[id]
+binary_expr_operator_names(
+  int id: @binary_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+binary_expr_rhs(
+  int id: @binary_expr ref,
+  int rhs: @expr ref
+);
+
+box_pats(
+  unique int id: @box_pat
+);
+
+#keyset[id]
+box_pat_pats(
+  int id: @box_pat ref,
+  int pat: @pat ref
+);
+
+break_exprs(
+  unique int id: @break_expr
+);
+
+#keyset[id, index]
+break_expr_attrs(
+  int id: @break_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+break_expr_exprs(
+  int id: @break_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+break_expr_lifetimes(
+  int id: @break_expr ref,
+  int lifetime: @lifetime ref
+);
+
+@call_expr_base =
+  @call_expr
+| @method_call_expr
+;
+
+#keyset[id]
+call_expr_base_arg_lists(
+  int id: @call_expr_base ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+call_expr_base_attrs(
+  int id: @call_expr_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+cast_exprs(
+  unique int id: @cast_expr
+);
+
+#keyset[id, index]
+cast_expr_attrs(
+  int id: @cast_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+cast_expr_exprs(
+  int id: @cast_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+cast_expr_type_reprs(
+  int id: @cast_expr ref,
+  int type_repr: @type_repr ref
+);
+
+closure_exprs(
+  unique int id: @closure_expr
+);
+
+#keyset[id]
+closure_expr_bodies(
+  int id: @closure_expr ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+closure_expr_closure_binders(
+  int id: @closure_expr ref,
+  int closure_binder: @closure_binder ref
+);
+
+#keyset[id]
+closure_expr_is_async(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_const(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_gen(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_move(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_static(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_ret_types(
+  int id: @closure_expr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+comments(
+  unique int id: @comment,
+  int parent: @ast_node ref,
+  string text: string ref
+);
+
+const_args(
+  unique int id: @const_arg
+);
+
+#keyset[id]
+const_arg_exprs(
+  int id: @const_arg ref,
+  int expr: @expr ref
+);
+
+const_block_pats(
+  unique int id: @const_block_pat
+);
+
+#keyset[id]
+const_block_pat_block_exprs(
+  int id: @const_block_pat ref,
+  int block_expr: @block_expr ref
+);
+
+#keyset[id]
+const_block_pat_is_const(
+  int id: @const_block_pat ref
+);
+
+const_params(
+  unique int id: @const_param
+);
+
+#keyset[id, index]
+const_param_attrs(
+  int id: @const_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_param_default_vals(
+  int id: @const_param ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+const_param_is_const(
+  int id: @const_param ref
+);
+
+#keyset[id]
+const_param_names(
+  int id: @const_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_param_type_reprs(
+  int id: @const_param ref,
+  int type_repr: @type_repr ref
+);
+
+continue_exprs(
+  unique int id: @continue_expr
+);
+
+#keyset[id, index]
+continue_expr_attrs(
+  int id: @continue_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+continue_expr_lifetimes(
+  int id: @continue_expr ref,
+  int lifetime: @lifetime ref
+);
+
+dyn_trait_type_reprs(
+  unique int id: @dyn_trait_type_repr
+);
+
+#keyset[id]
+dyn_trait_type_repr_type_bound_lists(
+  int id: @dyn_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+expr_stmts(
+  unique int id: @expr_stmt
+);
+
+#keyset[id]
+expr_stmt_exprs(
+  int id: @expr_stmt ref,
+  int expr: @expr ref
+);
+
+field_exprs(
+  unique int id: @field_expr
+);
+
+#keyset[id, index]
+field_expr_attrs(
+  int id: @field_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+field_expr_containers(
+  int id: @field_expr ref,
+  int container: @expr ref
+);
+
+#keyset[id]
+field_expr_identifiers(
+  int id: @field_expr ref,
+  int identifier: @name_ref ref
+);
+
+fn_ptr_type_reprs(
+  unique int id: @fn_ptr_type_repr
+);
+
+#keyset[id]
+fn_ptr_type_repr_abis(
+  int id: @fn_ptr_type_repr ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_async(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_const(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_unsafe(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_param_lists(
+  int id: @fn_ptr_type_repr ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_ret_types(
+  int id: @fn_ptr_type_repr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+for_type_reprs(
+  unique int id: @for_type_repr
+);
+
+#keyset[id]
+for_type_repr_generic_param_lists(
+  int id: @for_type_repr ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+for_type_repr_type_reprs(
+  int id: @for_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+format_args_exprs(
+  unique int id: @format_args_expr
+);
+
+#keyset[id, index]
+format_args_expr_args(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int arg: @format_args_arg ref
+);
+
+#keyset[id, index]
+format_args_expr_attrs(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+format_args_expr_templates(
+  int id: @format_args_expr ref,
+  int template: @expr ref
+);
+
+ident_pats(
+  unique int id: @ident_pat
+);
+
+#keyset[id, index]
+ident_pat_attrs(
+  int id: @ident_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ident_pat_is_mut(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_is_ref(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_names(
+  int id: @ident_pat ref,
+  int name: @name ref
+);
+
+#keyset[id]
+ident_pat_pats(
+  int id: @ident_pat ref,
+  int pat: @pat ref
+);
+
+if_exprs(
+  unique int id: @if_expr
+);
+
+#keyset[id, index]
+if_expr_attrs(
+  int id: @if_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+if_expr_conditions(
+  int id: @if_expr ref,
+  int condition: @expr ref
+);
+
+#keyset[id]
+if_expr_elses(
+  int id: @if_expr ref,
+  int else: @expr ref
+);
+
+#keyset[id]
+if_expr_thens(
+  int id: @if_expr ref,
+  int then: @block_expr ref
+);
+
+impl_trait_type_reprs(
+  unique int id: @impl_trait_type_repr
+);
+
+#keyset[id]
+impl_trait_type_repr_type_bound_lists(
+  int id: @impl_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+index_exprs(
+  unique int id: @index_expr
+);
+
+#keyset[id, index]
+index_expr_attrs(
+  int id: @index_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+index_expr_bases(
+  int id: @index_expr ref,
+  int base: @expr ref
+);
+
+#keyset[id]
+index_expr_indices(
+  int id: @index_expr ref,
+  int index: @expr ref
+);
+
+infer_type_reprs(
+  unique int id: @infer_type_repr
+);
+
+@item =
+  @adt
+| @assoc_item
+| @extern_block
+| @extern_crate
+| @extern_item
+| @impl
+| @macro_def
+| @macro_rules
+| @module
+| @trait
+| @trait_alias
+| @use
+;
+
+#keyset[id]
+item_attribute_macro_expansions(
+  int id: @item ref,
+  int attribute_macro_expansion: @macro_items ref
+);
+
+@labelable_expr =
+  @block_expr
+| @looping_expr
+;
+
+#keyset[id]
+labelable_expr_labels(
+  int id: @labelable_expr ref,
+  int label: @label ref
+);
+
+let_exprs(
+  unique int id: @let_expr
+);
+
+#keyset[id, index]
+let_expr_attrs(
+  int id: @let_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_expr_scrutinees(
+  int id: @let_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+let_expr_pats(
+  int id: @let_expr ref,
+  int pat: @pat ref
+);
+
+let_stmts(
+  unique int id: @let_stmt
+);
+
+#keyset[id, index]
+let_stmt_attrs(
+  int id: @let_stmt ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_stmt_initializers(
+  int id: @let_stmt ref,
+  int initializer: @expr ref
+);
+
+#keyset[id]
+let_stmt_let_elses(
+  int id: @let_stmt ref,
+  int let_else: @let_else ref
+);
+
+#keyset[id]
+let_stmt_pats(
+  int id: @let_stmt ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+let_stmt_type_reprs(
+  int id: @let_stmt ref,
+  int type_repr: @type_repr ref
+);
+
+lifetimes(
+  unique int id: @lifetime
+);
+
+#keyset[id]
+lifetime_texts(
+  int id: @lifetime ref,
+  string text: string ref
+);
+
+lifetime_args(
+  unique int id: @lifetime_arg
+);
+
+#keyset[id]
+lifetime_arg_lifetimes(
+  int id: @lifetime_arg ref,
+  int lifetime: @lifetime ref
+);
+
+lifetime_params(
+  unique int id: @lifetime_param
+);
+
+#keyset[id, index]
+lifetime_param_attrs(
+  int id: @lifetime_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+lifetime_param_lifetimes(
+  int id: @lifetime_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+lifetime_param_type_bound_lists(
+  int id: @lifetime_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+literal_exprs(
+  unique int id: @literal_expr
+);
+
+#keyset[id, index]
+literal_expr_attrs(
+  int id: @literal_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+literal_expr_text_values(
+  int id: @literal_expr ref,
+  string text_value: string ref
+);
+
+literal_pats(
+  unique int id: @literal_pat
+);
+
+#keyset[id]
+literal_pat_literals(
+  int id: @literal_pat ref,
+  int literal: @literal_expr ref
+);
+
+macro_block_exprs(
+  unique int id: @macro_block_expr
+);
+
+#keyset[id]
+macro_block_expr_tail_exprs(
+  int id: @macro_block_expr ref,
+  int tail_expr: @expr ref
+);
+
+#keyset[id, index]
+macro_block_expr_statements(
+  int id: @macro_block_expr ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+macro_exprs(
+  unique int id: @macro_expr
+);
+
+#keyset[id]
+macro_expr_macro_calls(
+  int id: @macro_expr ref,
+  int macro_call: @macro_call ref
+);
+
+macro_pats(
+  unique int id: @macro_pat
+);
+
+#keyset[id]
+macro_pat_macro_calls(
+  int id: @macro_pat ref,
+  int macro_call: @macro_call ref
+);
+
+macro_type_reprs(
+  unique int id: @macro_type_repr
+);
+
+#keyset[id]
+macro_type_repr_macro_calls(
+  int id: @macro_type_repr ref,
+  int macro_call: @macro_call ref
+);
+
+match_exprs(
+  unique int id: @match_expr
+);
+
+#keyset[id, index]
+match_expr_attrs(
+  int id: @match_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_expr_scrutinees(
+  int id: @match_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+match_expr_match_arm_lists(
+  int id: @match_expr ref,
+  int match_arm_list: @match_arm_list ref
+);
+
+name_refs(
+  unique int id: @name_ref
+);
+
+#keyset[id]
+name_ref_texts(
+  int id: @name_ref ref,
+  string text: string ref
+);
+
+never_type_reprs(
+  unique int id: @never_type_repr
+);
+
+offset_of_exprs(
+  unique int id: @offset_of_expr
+);
+
+#keyset[id, index]
+offset_of_expr_attrs(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+offset_of_expr_fields(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int field: @name_ref ref
+);
+
+#keyset[id]
+offset_of_expr_type_reprs(
+  int id: @offset_of_expr ref,
+  int type_repr: @type_repr ref
+);
+
+or_pats(
+  unique int id: @or_pat
+);
+
+#keyset[id, index]
+or_pat_pats(
+  int id: @or_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+params(
+  unique int id: @param
+);
+
+#keyset[id]
+param_pats(
+  int id: @param ref,
+  int pat: @pat ref
+);
+
+paren_exprs(
+  unique int id: @paren_expr
+);
+
+#keyset[id, index]
+paren_expr_attrs(
+  int id: @paren_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+paren_expr_exprs(
+  int id: @paren_expr ref,
+  int expr: @expr ref
+);
+
+paren_pats(
+  unique int id: @paren_pat
+);
+
+#keyset[id]
+paren_pat_pats(
+  int id: @paren_pat ref,
+  int pat: @pat ref
+);
+
+paren_type_reprs(
+  unique int id: @paren_type_repr
+);
+
+#keyset[id]
+paren_type_repr_type_reprs(
+  int id: @paren_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+@path_ast_node =
+  @path_expr
+| @path_pat
+| @struct_expr
+| @struct_pat
+| @tuple_struct_pat
+;
+
+#keyset[id]
+path_ast_node_paths(
+  int id: @path_ast_node ref,
+  int path: @path ref
+);
+
+@path_expr_base =
+  @path_expr
+;
+
+path_type_reprs(
+  unique int id: @path_type_repr
+);
+
+#keyset[id]
+path_type_repr_paths(
+  int id: @path_type_repr ref,
+  int path: @path ref
+);
+
+prefix_exprs(
+  unique int id: @prefix_expr
+);
+
+#keyset[id, index]
+prefix_expr_attrs(
+  int id: @prefix_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+prefix_expr_exprs(
+  int id: @prefix_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+prefix_expr_operator_names(
+  int id: @prefix_expr ref,
+  string operator_name: string ref
+);
+
+ptr_type_reprs(
+  unique int id: @ptr_type_repr
+);
+
+#keyset[id]
+ptr_type_repr_is_const(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_is_mut(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_type_reprs(
+  int id: @ptr_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+range_exprs(
+  unique int id: @range_expr
+);
+
+#keyset[id, index]
+range_expr_attrs(
+  int id: @range_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+range_expr_ends(
+  int id: @range_expr ref,
+  int end: @expr ref
+);
+
+#keyset[id]
+range_expr_operator_names(
+  int id: @range_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_expr_starts(
+  int id: @range_expr ref,
+  int start: @expr ref
+);
+
+range_pats(
+  unique int id: @range_pat
+);
+
+#keyset[id]
+range_pat_ends(
+  int id: @range_pat ref,
+  int end: @pat ref
+);
+
+#keyset[id]
+range_pat_operator_names(
+  int id: @range_pat ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_pat_starts(
+  int id: @range_pat ref,
+  int start: @pat ref
+);
+
+ref_exprs(
+  unique int id: @ref_expr
+);
+
+#keyset[id, index]
+ref_expr_attrs(
+  int id: @ref_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ref_expr_exprs(
+  int id: @ref_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+ref_expr_is_const(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_mut(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_raw(
+  int id: @ref_expr ref
+);
+
+ref_pats(
+  unique int id: @ref_pat
+);
+
+#keyset[id]
+ref_pat_is_mut(
+  int id: @ref_pat ref
+);
+
+#keyset[id]
+ref_pat_pats(
+  int id: @ref_pat ref,
+  int pat: @pat ref
+);
+
+ref_type_reprs(
+  unique int id: @ref_type_repr
+);
+
+#keyset[id]
+ref_type_repr_is_mut(
+  int id: @ref_type_repr ref
+);
+
+#keyset[id]
+ref_type_repr_lifetimes(
+  int id: @ref_type_repr ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+ref_type_repr_type_reprs(
+  int id: @ref_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+rest_pats(
+  unique int id: @rest_pat
+);
+
+#keyset[id, index]
+rest_pat_attrs(
+  int id: @rest_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+return_exprs(
+  unique int id: @return_expr
+);
+
+#keyset[id, index]
+return_expr_attrs(
+  int id: @return_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+return_expr_exprs(
+  int id: @return_expr ref,
+  int expr: @expr ref
+);
+
+self_params(
+  unique int id: @self_param
+);
+
+#keyset[id]
+self_param_is_ref(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_is_mut(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_lifetimes(
+  int id: @self_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+self_param_names(
+  int id: @self_param ref,
+  int name: @name ref
+);
+
+slice_pats(
+  unique int id: @slice_pat
+);
+
+#keyset[id, index]
+slice_pat_pats(
+  int id: @slice_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+slice_type_reprs(
+  unique int id: @slice_type_repr
+);
+
+#keyset[id]
+slice_type_repr_type_reprs(
+  int id: @slice_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+struct_field_lists(
+  unique int id: @struct_field_list
+);
+
+#keyset[id, index]
+struct_field_list_fields(
+  int id: @struct_field_list ref,
+  int index: int ref,
+  int field: @struct_field ref
+);
+
+try_exprs(
+  unique int id: @try_expr
+);
+
+#keyset[id, index]
+try_expr_attrs(
+  int id: @try_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+try_expr_exprs(
+  int id: @try_expr ref,
+  int expr: @expr ref
+);
+
+tuple_exprs(
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_attrs(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+tuple_expr_fields(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int field: @expr ref
+);
+
+tuple_field_lists(
+  unique int id: @tuple_field_list
+);
+
+#keyset[id, index]
+tuple_field_list_fields(
+  int id: @tuple_field_list ref,
+  int index: int ref,
+  int field: @tuple_field ref
+);
+
+tuple_pats(
+  unique int id: @tuple_pat
+);
+
+#keyset[id, index]
+tuple_pat_fields(
+  int id: @tuple_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_type_reprs(
+  unique int id: @tuple_type_repr
+);
+
+#keyset[id, index]
+tuple_type_repr_fields(
+  int id: @tuple_type_repr ref,
+  int index: int ref,
+  int field: @type_repr ref
+);
+
+type_args(
+  unique int id: @type_arg
+);
+
+#keyset[id]
+type_arg_type_reprs(
+  int id: @type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+type_params(
+  unique int id: @type_param
+);
+
+#keyset[id, index]
+type_param_attrs(
+  int id: @type_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_param_default_types(
+  int id: @type_param ref,
+  int default_type: @type_repr ref
+);
+
+#keyset[id]
+type_param_names(
+  int id: @type_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_param_type_bound_lists(
+  int id: @type_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+underscore_exprs(
+  unique int id: @underscore_expr
+);
+
+#keyset[id, index]
+underscore_expr_attrs(
+  int id: @underscore_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+variants(
+  unique int id: @variant
+);
+
+#keyset[id, index]
+variant_attrs(
+  int id: @variant ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+variant_discriminants(
+  int id: @variant ref,
+  int discriminant: @expr ref
+);
+
+#keyset[id]
+variant_field_lists(
+  int id: @variant ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+variant_names(
+  int id: @variant ref,
+  int name: @name ref
+);
+
+#keyset[id]
+variant_visibilities(
+  int id: @variant ref,
+  int visibility: @visibility ref
+);
+
+wildcard_pats(
+  unique int id: @wildcard_pat
+);
+
+yeet_exprs(
+  unique int id: @yeet_expr
+);
+
+#keyset[id, index]
+yeet_expr_attrs(
+  int id: @yeet_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yeet_expr_exprs(
+  int id: @yeet_expr ref,
+  int expr: @expr ref
+);
+
+yield_exprs(
+  unique int id: @yield_expr
+);
+
+#keyset[id, index]
+yield_expr_attrs(
+  int id: @yield_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yield_expr_exprs(
+  int id: @yield_expr ref,
+  int expr: @expr ref
+);
+
+@adt =
+  @enum
+| @struct
+| @union
+;
+
+#keyset[id, index]
+adt_derive_macro_expansions(
+  int id: @adt ref,
+  int index: int ref,
+  int derive_macro_expansion: @macro_items ref
+);
+
+@assoc_item =
+  @const
+| @function
+| @macro_call
+| @type_alias
+;
+
+block_exprs(
+  unique int id: @block_expr
+);
+
+#keyset[id, index]
+block_expr_attrs(
+  int id: @block_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+block_expr_is_async(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_const(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_gen(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_move(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_try(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_unsafe(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_stmt_lists(
+  int id: @block_expr ref,
+  int stmt_list: @stmt_list ref
+);
+
+call_exprs(
+  unique int id: @call_expr
+);
+
+#keyset[id]
+call_expr_functions(
+  int id: @call_expr ref,
+  int function: @expr ref
+);
+
+extern_blocks(
+  unique int id: @extern_block
+);
+
+#keyset[id]
+extern_block_abis(
+  int id: @extern_block ref,
+  int abi: @abi ref
+);
+
+#keyset[id, index]
+extern_block_attrs(
+  int id: @extern_block ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_block_extern_item_lists(
+  int id: @extern_block ref,
+  int extern_item_list: @extern_item_list ref
+);
+
+#keyset[id]
+extern_block_is_unsafe(
+  int id: @extern_block ref
+);
+
+extern_crates(
+  unique int id: @extern_crate
+);
+
+#keyset[id, index]
+extern_crate_attrs(
+  int id: @extern_crate ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_crate_identifiers(
+  int id: @extern_crate ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+extern_crate_renames(
+  int id: @extern_crate ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+extern_crate_visibilities(
+  int id: @extern_crate ref,
+  int visibility: @visibility ref
+);
+
+@extern_item =
+  @function
+| @macro_call
+| @static
+| @type_alias
+;
+
+impls(
+  unique int id: @impl
+);
+
+#keyset[id]
+impl_assoc_item_lists(
+  int id: @impl ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+impl_attrs(
+  int id: @impl ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+impl_generic_param_lists(
+  int id: @impl ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+impl_is_const(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_default(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_unsafe(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_self_ties(
+  int id: @impl ref,
+  int self_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_traits(
+  int id: @impl ref,
+  int trait: @type_repr ref
+);
+
+#keyset[id]
+impl_visibilities(
+  int id: @impl ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+impl_where_clauses(
+  int id: @impl ref,
+  int where_clause: @where_clause ref
+);
+
+@looping_expr =
+  @for_expr
+| @loop_expr
+| @while_expr
+;
+
+#keyset[id]
+looping_expr_loop_bodies(
+  int id: @looping_expr ref,
+  int loop_body: @block_expr ref
+);
+
+macro_defs(
+  unique int id: @macro_def
+);
+
+#keyset[id]
+macro_def_args(
+  int id: @macro_def ref,
+  int args: @token_tree ref
+);
+
+#keyset[id, index]
+macro_def_attrs(
+  int id: @macro_def ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_def_bodies(
+  int id: @macro_def ref,
+  int body: @token_tree ref
+);
+
+#keyset[id]
+macro_def_names(
+  int id: @macro_def ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_def_visibilities(
+  int id: @macro_def ref,
+  int visibility: @visibility ref
+);
+
+macro_rules(
+  unique int id: @macro_rules
+);
+
+#keyset[id, index]
+macro_rules_attrs(
+  int id: @macro_rules ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_rules_names(
+  int id: @macro_rules ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_rules_token_trees(
+  int id: @macro_rules ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_rules_visibilities(
+  int id: @macro_rules ref,
+  int visibility: @visibility ref
+);
+
+method_call_exprs(
+  unique int id: @method_call_expr
+);
+
+#keyset[id]
+method_call_expr_generic_arg_lists(
+  int id: @method_call_expr ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+method_call_expr_identifiers(
+  int id: @method_call_expr ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+method_call_expr_receivers(
+  int id: @method_call_expr ref,
+  int receiver: @expr ref
+);
+
+modules(
+  unique int id: @module
+);
+
+#keyset[id, index]
+module_attrs(
+  int id: @module ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+module_item_lists(
+  int id: @module ref,
+  int item_list: @item_list ref
+);
+
+#keyset[id]
+module_names(
+  int id: @module ref,
+  int name: @name ref
+);
+
+#keyset[id]
+module_visibilities(
+  int id: @module ref,
+  int visibility: @visibility ref
+);
+
+path_exprs(
+  unique int id: @path_expr
+);
+
+#keyset[id, index]
+path_expr_attrs(
+  int id: @path_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+path_pats(
+  unique int id: @path_pat
+);
+
+struct_exprs(
+  unique int id: @struct_expr
+);
+
+#keyset[id]
+struct_expr_struct_expr_field_lists(
+  int id: @struct_expr ref,
+  int struct_expr_field_list: @struct_expr_field_list ref
+);
+
+struct_pats(
+  unique int id: @struct_pat
+);
+
+#keyset[id]
+struct_pat_struct_pat_field_lists(
+  int id: @struct_pat ref,
+  int struct_pat_field_list: @struct_pat_field_list ref
+);
+
+traits(
+  unique int id: @trait
+);
+
+#keyset[id]
+trait_assoc_item_lists(
+  int id: @trait ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+trait_attrs(
+  int id: @trait ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_generic_param_lists(
+  int id: @trait ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_is_auto(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_is_unsafe(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_names(
+  int id: @trait ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_type_bound_lists(
+  int id: @trait ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_visibilities(
+  int id: @trait ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_where_clauses(
+  int id: @trait ref,
+  int where_clause: @where_clause ref
+);
+
+trait_aliases(
+  unique int id: @trait_alias
+);
+
+#keyset[id, index]
+trait_alias_attrs(
+  int id: @trait_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_alias_generic_param_lists(
+  int id: @trait_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_alias_names(
+  int id: @trait_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_alias_type_bound_lists(
+  int id: @trait_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_alias_visibilities(
+  int id: @trait_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_alias_where_clauses(
+  int id: @trait_alias ref,
+  int where_clause: @where_clause ref
+);
+
+tuple_struct_pats(
+  unique int id: @tuple_struct_pat
+);
+
+#keyset[id, index]
+tuple_struct_pat_fields(
+  int id: @tuple_struct_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+uses(
+  unique int id: @use
+);
+
+#keyset[id, index]
+use_attrs(
+  int id: @use ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+use_use_trees(
+  int id: @use ref,
+  int use_tree: @use_tree ref
+);
+
+#keyset[id]
+use_visibilities(
+  int id: @use ref,
+  int visibility: @visibility ref
+);
+
+consts(
+  unique int id: @const
+);
+
+#keyset[id, index]
+const_attrs(
+  int id: @const ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_bodies(
+  int id: @const ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+const_generic_param_lists(
+  int id: @const ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+const_is_const(
+  int id: @const ref
+);
+
+#keyset[id]
+const_is_default(
+  int id: @const ref
+);
+
+#keyset[id]
+const_names(
+  int id: @const ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_type_reprs(
+  int id: @const ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+const_visibilities(
+  int id: @const ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+const_where_clauses(
+  int id: @const ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+const_has_implementation(
+  int id: @const ref
+);
+
+enums(
+  unique int id: @enum
+);
+
+#keyset[id, index]
+enum_attrs(
+  int id: @enum ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+enum_generic_param_lists(
+  int id: @enum ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+enum_names(
+  int id: @enum ref,
+  int name: @name ref
+);
+
+#keyset[id]
+enum_variant_lists(
+  int id: @enum ref,
+  int variant_list: @variant_list ref
+);
+
+#keyset[id]
+enum_visibilities(
+  int id: @enum ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+enum_where_clauses(
+  int id: @enum ref,
+  int where_clause: @where_clause ref
+);
+
+for_exprs(
+  unique int id: @for_expr
+);
+
+#keyset[id, index]
+for_expr_attrs(
+  int id: @for_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+for_expr_iterables(
+  int id: @for_expr ref,
+  int iterable: @expr ref
+);
+
+#keyset[id]
+for_expr_pats(
+  int id: @for_expr ref,
+  int pat: @pat ref
+);
+
+functions(
+  unique int id: @function
+);
+
+#keyset[id]
+function_abis(
+  int id: @function ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+function_bodies(
+  int id: @function ref,
+  int body: @block_expr ref
+);
+
+#keyset[id]
+function_generic_param_lists(
+  int id: @function ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+function_is_async(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_const(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_default(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_gen(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_unsafe(
+  int id: @function ref
+);
+
+#keyset[id]
+function_names(
+  int id: @function ref,
+  int name: @name ref
+);
+
+#keyset[id]
+function_ret_types(
+  int id: @function ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+function_visibilities(
+  int id: @function ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+function_where_clauses(
+  int id: @function ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+function_has_implementation(
+  int id: @function ref
+);
+
+loop_exprs(
+  unique int id: @loop_expr
+);
+
+#keyset[id, index]
+loop_expr_attrs(
+  int id: @loop_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+macro_calls(
+  unique int id: @macro_call
+);
+
+#keyset[id, index]
+macro_call_attrs(
+  int id: @macro_call ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_call_paths(
+  int id: @macro_call ref,
+  int path: @path ref
+);
+
+#keyset[id]
+macro_call_token_trees(
+  int id: @macro_call ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_call_macro_call_expansions(
+  int id: @macro_call ref,
+  int macro_call_expansion: @ast_node ref
+);
+
+statics(
+  unique int id: @static
+);
+
+#keyset[id, index]
+static_attrs(
+  int id: @static ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+static_bodies(
+  int id: @static ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+static_is_mut(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_static(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_unsafe(
+  int id: @static ref
+);
+
+#keyset[id]
+static_names(
+  int id: @static ref,
+  int name: @name ref
+);
+
+#keyset[id]
+static_type_reprs(
+  int id: @static ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+static_visibilities(
+  int id: @static ref,
+  int visibility: @visibility ref
+);
+
+structs(
+  unique int id: @struct
+);
+
+#keyset[id, index]
+struct_attrs(
+  int id: @struct ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_lists_(
+  int id: @struct ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+struct_generic_param_lists(
+  int id: @struct ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+struct_names(
+  int id: @struct ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_visibilities(
+  int id: @struct ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+struct_where_clauses(
+  int id: @struct ref,
+  int where_clause: @where_clause ref
+);
+
+type_aliases(
+  unique int id: @type_alias
+);
+
+#keyset[id, index]
+type_alias_attrs(
+  int id: @type_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_alias_generic_param_lists(
+  int id: @type_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_alias_is_default(
+  int id: @type_alias ref
+);
+
+#keyset[id]
+type_alias_names(
+  int id: @type_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_alias_type_reprs(
+  int id: @type_alias ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_alias_type_bound_lists(
+  int id: @type_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+type_alias_visibilities(
+  int id: @type_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_alias_where_clauses(
+  int id: @type_alias ref,
+  int where_clause: @where_clause ref
+);
+
+unions(
+  unique int id: @union
+);
+
+#keyset[id, index]
+union_attrs(
+  int id: @union ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+union_generic_param_lists(
+  int id: @union ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+union_names(
+  int id: @union ref,
+  int name: @name ref
+);
+
+#keyset[id]
+union_struct_field_lists(
+  int id: @union ref,
+  int struct_field_list: @struct_field_list ref
+);
+
+#keyset[id]
+union_visibilities(
+  int id: @union ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+union_where_clauses(
+  int id: @union ref,
+  int where_clause: @where_clause ref
+);
+
+while_exprs(
+  unique int id: @while_expr
+);
+
+#keyset[id, index]
+while_expr_attrs(
+  int id: @while_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+while_expr_conditions(
+  int id: @while_expr ref,
+  int condition: @expr ref
+);
diff --git a/rust/ql/lib/upgrades/319c933d9615ccf40f363548cafd51d08c74a534/rust.dbscheme b/rust/ql/lib/upgrades/319c933d9615ccf40f363548cafd51d08c74a534/rust.dbscheme
new file mode 100644
index 00000000000..b41e55c0dba
--- /dev/null
+++ b/rust/ql/lib/upgrades/319c933d9615ccf40f363548cafd51d08c74a534/rust.dbscheme
@@ -0,0 +1,3644 @@
+// generated by codegen, do not edit
+
+// from ../shared/tree-sitter-extractor/src/generator/prefix.dbscheme
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Empty location -*/
+
+empty_location(
+  int location: @location_default ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- Diagnostic messages: severity -*/
+
+case @diagnostic.severity of
+  10 = @diagnostic_debug
+| 20 = @diagnostic_info
+| 30 = @diagnostic_warning
+| 40 = @diagnostic_error
+;
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error;
+
+/*- Database metadata -*/
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+overlayChangedFiles(
+  string path: string ref
+);
+
+
+// from prefix.dbscheme
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_default ref
+);
+
+
+// from schema
+
+@element =
+  @extractor_step
+| @locatable
+| @named_crate
+| @unextracted
+;
+
+extractor_steps(
+  unique int id: @extractor_step,
+  string action: string ref,
+  int duration_ms: int ref
+);
+
+#keyset[id]
+extractor_step_files(
+  int id: @extractor_step ref,
+  int file: @file ref
+);
+
+@locatable =
+  @ast_node
+| @crate
+;
+
+named_crates(
+  unique int id: @named_crate,
+  string name: string ref,
+  int crate: @crate ref
+);
+
+@unextracted =
+  @missing
+| @unimplemented
+;
+
+@ast_node =
+  @abi
+| @addressable
+| @arg_list
+| @asm_dir_spec
+| @asm_operand
+| @asm_operand_expr
+| @asm_option
+| @asm_piece
+| @asm_reg_spec
+| @assoc_item_list
+| @attr
+| @callable
+| @expr
+| @extern_item_list
+| @field_list
+| @for_binder
+| @format_args_arg
+| @generic_arg
+| @generic_arg_list
+| @generic_param
+| @generic_param_list
+| @item_list
+| @label
+| @let_else
+| @macro_items
+| @match_arm
+| @match_arm_list
+| @match_guard
+| @meta
+| @name
+| @param_base
+| @param_list
+| @parenthesized_arg_list
+| @pat
+| @path
+| @path_segment
+| @rename
+| @resolvable
+| @ret_type_repr
+| @return_type_syntax
+| @source_file
+| @stmt
+| @stmt_list
+| @struct_expr_field
+| @struct_expr_field_list
+| @struct_field
+| @struct_pat_field
+| @struct_pat_field_list
+| @token
+| @token_tree
+| @tuple_field
+| @type_bound
+| @type_bound_list
+| @type_repr
+| @use_bound_generic_arg
+| @use_bound_generic_args
+| @use_tree
+| @use_tree_list
+| @variant_list
+| @visibility
+| @where_clause
+| @where_pred
+;
+
+crates(
+  unique int id: @crate
+);
+
+#keyset[id]
+crate_names(
+  int id: @crate ref,
+  string name: string ref
+);
+
+#keyset[id]
+crate_versions(
+  int id: @crate ref,
+  string version: string ref
+);
+
+#keyset[id, index]
+crate_cfg_options(
+  int id: @crate ref,
+  int index: int ref,
+  string cfg_option: string ref
+);
+
+#keyset[id, index]
+crate_named_dependencies(
+  int id: @crate ref,
+  int index: int ref,
+  int named_dependency: @named_crate ref
+);
+
+missings(
+  unique int id: @missing
+);
+
+unimplementeds(
+  unique int id: @unimplemented
+);
+
+abis(
+  unique int id: @abi
+);
+
+#keyset[id]
+abi_abi_strings(
+  int id: @abi ref,
+  string abi_string: string ref
+);
+
+@addressable =
+  @item
+| @variant
+;
+
+#keyset[id]
+addressable_extended_canonical_paths(
+  int id: @addressable ref,
+  string extended_canonical_path: string ref
+);
+
+#keyset[id]
+addressable_crate_origins(
+  int id: @addressable ref,
+  string crate_origin: string ref
+);
+
+arg_lists(
+  unique int id: @arg_list
+);
+
+#keyset[id, index]
+arg_list_args(
+  int id: @arg_list ref,
+  int index: int ref,
+  int arg: @expr ref
+);
+
+asm_dir_specs(
+  unique int id: @asm_dir_spec
+);
+
+@asm_operand =
+  @asm_const
+| @asm_label
+| @asm_reg_operand
+| @asm_sym
+;
+
+asm_operand_exprs(
+  unique int id: @asm_operand_expr
+);
+
+#keyset[id]
+asm_operand_expr_in_exprs(
+  int id: @asm_operand_expr ref,
+  int in_expr: @expr ref
+);
+
+#keyset[id]
+asm_operand_expr_out_exprs(
+  int id: @asm_operand_expr ref,
+  int out_expr: @expr ref
+);
+
+asm_options(
+  unique int id: @asm_option
+);
+
+#keyset[id]
+asm_option_is_raw(
+  int id: @asm_option ref
+);
+
+@asm_piece =
+  @asm_clobber_abi
+| @asm_operand_named
+| @asm_options_list
+;
+
+asm_reg_specs(
+  unique int id: @asm_reg_spec
+);
+
+#keyset[id]
+asm_reg_spec_identifiers(
+  int id: @asm_reg_spec ref,
+  int identifier: @name_ref ref
+);
+
+assoc_item_lists(
+  unique int id: @assoc_item_list
+);
+
+#keyset[id, index]
+assoc_item_list_assoc_items(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int assoc_item: @assoc_item ref
+);
+
+#keyset[id, index]
+assoc_item_list_attrs(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+attrs(
+  unique int id: @attr
+);
+
+#keyset[id]
+attr_meta(
+  int id: @attr ref,
+  int meta: @meta ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_param_lists(
+  int id: @callable ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id, index]
+callable_attrs(
+  int id: @callable ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+@expr =
+  @array_expr_internal
+| @asm_expr
+| @await_expr
+| @become_expr
+| @binary_expr
+| @break_expr
+| @call_expr_base
+| @cast_expr
+| @closure_expr
+| @continue_expr
+| @field_expr
+| @format_args_expr
+| @if_expr
+| @index_expr
+| @labelable_expr
+| @let_expr
+| @literal_expr
+| @macro_block_expr
+| @macro_expr
+| @match_expr
+| @offset_of_expr
+| @paren_expr
+| @path_expr_base
+| @prefix_expr
+| @range_expr
+| @ref_expr
+| @return_expr
+| @struct_expr
+| @try_expr
+| @tuple_expr
+| @underscore_expr
+| @yeet_expr
+| @yield_expr
+;
+
+extern_item_lists(
+  unique int id: @extern_item_list
+);
+
+#keyset[id, index]
+extern_item_list_attrs(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+extern_item_list_extern_items(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int extern_item: @extern_item ref
+);
+
+@field_list =
+  @struct_field_list
+| @tuple_field_list
+;
+
+for_binders(
+  unique int id: @for_binder
+);
+
+#keyset[id]
+for_binder_generic_param_lists(
+  int id: @for_binder ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+format_args_args(
+  unique int id: @format_args_arg
+);
+
+#keyset[id]
+format_args_arg_exprs(
+  int id: @format_args_arg ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+format_args_arg_names(
+  int id: @format_args_arg ref,
+  int name: @name ref
+);
+
+@generic_arg =
+  @assoc_type_arg
+| @const_arg
+| @lifetime_arg
+| @type_arg
+;
+
+generic_arg_lists(
+  unique int id: @generic_arg_list
+);
+
+#keyset[id, index]
+generic_arg_list_generic_args(
+  int id: @generic_arg_list ref,
+  int index: int ref,
+  int generic_arg: @generic_arg ref
+);
+
+@generic_param =
+  @const_param
+| @lifetime_param
+| @type_param
+;
+
+generic_param_lists(
+  unique int id: @generic_param_list
+);
+
+#keyset[id, index]
+generic_param_list_generic_params(
+  int id: @generic_param_list ref,
+  int index: int ref,
+  int generic_param: @generic_param ref
+);
+
+item_lists(
+  unique int id: @item_list
+);
+
+#keyset[id, index]
+item_list_attrs(
+  int id: @item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+item_list_items(
+  int id: @item_list ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+labels(
+  unique int id: @label
+);
+
+#keyset[id]
+label_lifetimes(
+  int id: @label ref,
+  int lifetime: @lifetime ref
+);
+
+let_elses(
+  unique int id: @let_else
+);
+
+#keyset[id]
+let_else_block_exprs(
+  int id: @let_else ref,
+  int block_expr: @block_expr ref
+);
+
+macro_items(
+  unique int id: @macro_items
+);
+
+#keyset[id, index]
+macro_items_items(
+  int id: @macro_items ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+match_arms(
+  unique int id: @match_arm
+);
+
+#keyset[id, index]
+match_arm_attrs(
+  int id: @match_arm ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_arm_exprs(
+  int id: @match_arm ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+match_arm_guards(
+  int id: @match_arm ref,
+  int guard: @match_guard ref
+);
+
+#keyset[id]
+match_arm_pats(
+  int id: @match_arm ref,
+  int pat: @pat ref
+);
+
+match_arm_lists(
+  unique int id: @match_arm_list
+);
+
+#keyset[id, index]
+match_arm_list_arms(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int arm: @match_arm ref
+);
+
+#keyset[id, index]
+match_arm_list_attrs(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+match_guards(
+  unique int id: @match_guard
+);
+
+#keyset[id]
+match_guard_conditions(
+  int id: @match_guard ref,
+  int condition: @expr ref
+);
+
+meta(
+  unique int id: @meta
+);
+
+#keyset[id]
+meta_exprs(
+  int id: @meta ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+meta_is_unsafe(
+  int id: @meta ref
+);
+
+#keyset[id]
+meta_paths(
+  int id: @meta ref,
+  int path: @path ref
+);
+
+#keyset[id]
+meta_token_trees(
+  int id: @meta ref,
+  int token_tree: @token_tree ref
+);
+
+names(
+  unique int id: @name
+);
+
+#keyset[id]
+name_texts(
+  int id: @name ref,
+  string text: string ref
+);
+
+@param_base =
+  @param
+| @self_param
+;
+
+#keyset[id, index]
+param_base_attrs(
+  int id: @param_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+param_base_type_reprs(
+  int id: @param_base ref,
+  int type_repr: @type_repr ref
+);
+
+param_lists(
+  unique int id: @param_list
+);
+
+#keyset[id, index]
+param_list_params(
+  int id: @param_list ref,
+  int index: int ref,
+  int param: @param ref
+);
+
+#keyset[id]
+param_list_self_params(
+  int id: @param_list ref,
+  int self_param: @self_param ref
+);
+
+parenthesized_arg_lists(
+  unique int id: @parenthesized_arg_list
+);
+
+#keyset[id, index]
+parenthesized_arg_list_type_args(
+  int id: @parenthesized_arg_list ref,
+  int index: int ref,
+  int type_arg: @type_arg ref
+);
+
+@pat =
+  @box_pat
+| @const_block_pat
+| @ident_pat
+| @literal_pat
+| @macro_pat
+| @or_pat
+| @paren_pat
+| @path_pat
+| @range_pat
+| @ref_pat
+| @rest_pat
+| @slice_pat
+| @struct_pat
+| @tuple_pat
+| @tuple_struct_pat
+| @wildcard_pat
+;
+
+paths(
+  unique int id: @path
+);
+
+#keyset[id]
+path_qualifiers(
+  int id: @path ref,
+  int qualifier: @path ref
+);
+
+#keyset[id]
+path_segments_(
+  int id: @path ref,
+  int segment: @path_segment ref
+);
+
+path_segments(
+  unique int id: @path_segment
+);
+
+#keyset[id]
+path_segment_generic_arg_lists(
+  int id: @path_segment ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+path_segment_identifiers(
+  int id: @path_segment ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+path_segment_parenthesized_arg_lists(
+  int id: @path_segment ref,
+  int parenthesized_arg_list: @parenthesized_arg_list ref
+);
+
+#keyset[id]
+path_segment_ret_types(
+  int id: @path_segment ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+path_segment_return_type_syntaxes(
+  int id: @path_segment ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+path_segment_type_reprs(
+  int id: @path_segment ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+path_segment_trait_type_reprs(
+  int id: @path_segment ref,
+  int trait_type_repr: @path_type_repr ref
+);
+
+renames(
+  unique int id: @rename
+);
+
+#keyset[id]
+rename_names(
+  int id: @rename ref,
+  int name: @name ref
+);
+
+@resolvable =
+  @method_call_expr
+| @path_ast_node
+;
+
+#keyset[id]
+resolvable_resolved_paths(
+  int id: @resolvable ref,
+  string resolved_path: string ref
+);
+
+#keyset[id]
+resolvable_resolved_crate_origins(
+  int id: @resolvable ref,
+  string resolved_crate_origin: string ref
+);
+
+ret_type_reprs(
+  unique int id: @ret_type_repr
+);
+
+#keyset[id]
+ret_type_repr_type_reprs(
+  int id: @ret_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+return_type_syntaxes(
+  unique int id: @return_type_syntax
+);
+
+source_files(
+  unique int id: @source_file
+);
+
+#keyset[id, index]
+source_file_attrs(
+  int id: @source_file ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+source_file_items(
+  int id: @source_file ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+@stmt =
+  @expr_stmt
+| @item
+| @let_stmt
+;
+
+stmt_lists(
+  unique int id: @stmt_list
+);
+
+#keyset[id, index]
+stmt_list_attrs(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+stmt_list_statements(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+stmt_list_tail_exprs(
+  int id: @stmt_list ref,
+  int tail_expr: @expr ref
+);
+
+struct_expr_fields(
+  unique int id: @struct_expr_field
+);
+
+#keyset[id, index]
+struct_expr_field_attrs(
+  int id: @struct_expr_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_expr_field_exprs(
+  int id: @struct_expr_field ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+struct_expr_field_identifiers(
+  int id: @struct_expr_field ref,
+  int identifier: @name_ref ref
+);
+
+struct_expr_field_lists(
+  unique int id: @struct_expr_field_list
+);
+
+#keyset[id, index]
+struct_expr_field_list_attrs(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+struct_expr_field_list_fields(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int field: @struct_expr_field ref
+);
+
+#keyset[id]
+struct_expr_field_list_spreads(
+  int id: @struct_expr_field_list ref,
+  int spread: @expr ref
+);
+
+struct_fields(
+  unique int id: @struct_field
+);
+
+#keyset[id, index]
+struct_field_attrs(
+  int id: @struct_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_defaults(
+  int id: @struct_field ref,
+  int default: @expr ref
+);
+
+#keyset[id]
+struct_field_is_unsafe(
+  int id: @struct_field ref
+);
+
+#keyset[id]
+struct_field_names(
+  int id: @struct_field ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_field_type_reprs(
+  int id: @struct_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+struct_field_visibilities(
+  int id: @struct_field ref,
+  int visibility: @visibility ref
+);
+
+struct_pat_fields(
+  unique int id: @struct_pat_field
+);
+
+#keyset[id, index]
+struct_pat_field_attrs(
+  int id: @struct_pat_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_pat_field_identifiers(
+  int id: @struct_pat_field ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+struct_pat_field_pats(
+  int id: @struct_pat_field ref,
+  int pat: @pat ref
+);
+
+struct_pat_field_lists(
+  unique int id: @struct_pat_field_list
+);
+
+#keyset[id, index]
+struct_pat_field_list_fields(
+  int id: @struct_pat_field_list ref,
+  int index: int ref,
+  int field: @struct_pat_field ref
+);
+
+#keyset[id]
+struct_pat_field_list_rest_pats(
+  int id: @struct_pat_field_list ref,
+  int rest_pat: @rest_pat ref
+);
+
+@token =
+  @comment
+;
+
+token_trees(
+  unique int id: @token_tree
+);
+
+tuple_fields(
+  unique int id: @tuple_field
+);
+
+#keyset[id, index]
+tuple_field_attrs(
+  int id: @tuple_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+tuple_field_type_reprs(
+  int id: @tuple_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+tuple_field_visibilities(
+  int id: @tuple_field ref,
+  int visibility: @visibility ref
+);
+
+type_bounds(
+  unique int id: @type_bound
+);
+
+#keyset[id]
+type_bound_for_binders(
+  int id: @type_bound ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+type_bound_is_async(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_is_const(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_lifetimes(
+  int id: @type_bound ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+type_bound_type_reprs(
+  int id: @type_bound ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_bound_use_bound_generic_args(
+  int id: @type_bound ref,
+  int use_bound_generic_args: @use_bound_generic_args ref
+);
+
+type_bound_lists(
+  unique int id: @type_bound_list
+);
+
+#keyset[id, index]
+type_bound_list_bounds(
+  int id: @type_bound_list ref,
+  int index: int ref,
+  int bound: @type_bound ref
+);
+
+@type_repr =
+  @array_type_repr
+| @dyn_trait_type_repr
+| @fn_ptr_type_repr
+| @for_type_repr
+| @impl_trait_type_repr
+| @infer_type_repr
+| @macro_type_repr
+| @never_type_repr
+| @paren_type_repr
+| @path_type_repr
+| @ptr_type_repr
+| @ref_type_repr
+| @slice_type_repr
+| @tuple_type_repr
+;
+
+@use_bound_generic_arg =
+  @lifetime
+| @name_ref
+;
+
+use_bound_generic_args(
+  unique int id: @use_bound_generic_args
+);
+
+#keyset[id, index]
+use_bound_generic_args_use_bound_generic_args(
+  int id: @use_bound_generic_args ref,
+  int index: int ref,
+  int use_bound_generic_arg: @use_bound_generic_arg ref
+);
+
+use_trees(
+  unique int id: @use_tree
+);
+
+#keyset[id]
+use_tree_is_glob(
+  int id: @use_tree ref
+);
+
+#keyset[id]
+use_tree_paths(
+  int id: @use_tree ref,
+  int path: @path ref
+);
+
+#keyset[id]
+use_tree_renames(
+  int id: @use_tree ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+use_tree_use_tree_lists(
+  int id: @use_tree ref,
+  int use_tree_list: @use_tree_list ref
+);
+
+use_tree_lists(
+  unique int id: @use_tree_list
+);
+
+#keyset[id, index]
+use_tree_list_use_trees(
+  int id: @use_tree_list ref,
+  int index: int ref,
+  int use_tree: @use_tree ref
+);
+
+variant_lists(
+  unique int id: @variant_list
+);
+
+#keyset[id, index]
+variant_list_variants(
+  int id: @variant_list ref,
+  int index: int ref,
+  int variant: @variant ref
+);
+
+visibilities(
+  unique int id: @visibility
+);
+
+#keyset[id]
+visibility_paths(
+  int id: @visibility ref,
+  int path: @path ref
+);
+
+where_clauses(
+  unique int id: @where_clause
+);
+
+#keyset[id, index]
+where_clause_predicates(
+  int id: @where_clause ref,
+  int index: int ref,
+  int predicate: @where_pred ref
+);
+
+where_preds(
+  unique int id: @where_pred
+);
+
+#keyset[id]
+where_pred_for_binders(
+  int id: @where_pred ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+where_pred_lifetimes(
+  int id: @where_pred ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+where_pred_type_reprs(
+  int id: @where_pred ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+where_pred_type_bound_lists(
+  int id: @where_pred ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+array_expr_internals(
+  unique int id: @array_expr_internal
+);
+
+#keyset[id, index]
+array_expr_internal_attrs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+array_expr_internal_exprs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+array_expr_internal_is_semicolon(
+  int id: @array_expr_internal ref
+);
+
+array_type_reprs(
+  unique int id: @array_type_repr
+);
+
+#keyset[id]
+array_type_repr_const_args(
+  int id: @array_type_repr ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+array_type_repr_element_type_reprs(
+  int id: @array_type_repr ref,
+  int element_type_repr: @type_repr ref
+);
+
+asm_clobber_abis(
+  unique int id: @asm_clobber_abi
+);
+
+asm_consts(
+  unique int id: @asm_const
+);
+
+#keyset[id]
+asm_const_exprs(
+  int id: @asm_const ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+asm_const_is_const(
+  int id: @asm_const ref
+);
+
+asm_labels(
+  unique int id: @asm_label
+);
+
+#keyset[id]
+asm_label_block_exprs(
+  int id: @asm_label ref,
+  int block_expr: @block_expr ref
+);
+
+asm_operand_nameds(
+  unique int id: @asm_operand_named
+);
+
+#keyset[id]
+asm_operand_named_asm_operands(
+  int id: @asm_operand_named ref,
+  int asm_operand: @asm_operand ref
+);
+
+#keyset[id]
+asm_operand_named_names(
+  int id: @asm_operand_named ref,
+  int name: @name ref
+);
+
+asm_options_lists(
+  unique int id: @asm_options_list
+);
+
+#keyset[id, index]
+asm_options_list_asm_options(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int asm_option: @asm_option ref
+);
+
+asm_reg_operands(
+  unique int id: @asm_reg_operand
+);
+
+#keyset[id]
+asm_reg_operand_asm_dir_specs(
+  int id: @asm_reg_operand ref,
+  int asm_dir_spec: @asm_dir_spec ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_operand_exprs(
+  int id: @asm_reg_operand ref,
+  int asm_operand_expr: @asm_operand_expr ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_reg_specs(
+  int id: @asm_reg_operand ref,
+  int asm_reg_spec: @asm_reg_spec ref
+);
+
+asm_syms(
+  unique int id: @asm_sym
+);
+
+#keyset[id]
+asm_sym_paths(
+  int id: @asm_sym ref,
+  int path: @path ref
+);
+
+assoc_type_args(
+  unique int id: @assoc_type_arg
+);
+
+#keyset[id]
+assoc_type_arg_const_args(
+  int id: @assoc_type_arg ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+assoc_type_arg_generic_arg_lists(
+  int id: @assoc_type_arg ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+assoc_type_arg_identifiers(
+  int id: @assoc_type_arg ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+assoc_type_arg_param_lists(
+  int id: @assoc_type_arg ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+assoc_type_arg_ret_types(
+  int id: @assoc_type_arg ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_return_type_syntaxes(
+  int id: @assoc_type_arg ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+assoc_type_arg_type_reprs(
+  int id: @assoc_type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_type_bound_lists(
+  int id: @assoc_type_arg ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+await_exprs(
+  unique int id: @await_expr
+);
+
+#keyset[id, index]
+await_expr_attrs(
+  int id: @await_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+await_expr_exprs(
+  int id: @await_expr ref,
+  int expr: @expr ref
+);
+
+become_exprs(
+  unique int id: @become_expr
+);
+
+#keyset[id, index]
+become_expr_attrs(
+  int id: @become_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+become_expr_exprs(
+  int id: @become_expr ref,
+  int expr: @expr ref
+);
+
+binary_exprs(
+  unique int id: @binary_expr
+);
+
+#keyset[id, index]
+binary_expr_attrs(
+  int id: @binary_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+binary_expr_lhs(
+  int id: @binary_expr ref,
+  int lhs: @expr ref
+);
+
+#keyset[id]
+binary_expr_operator_names(
+  int id: @binary_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+binary_expr_rhs(
+  int id: @binary_expr ref,
+  int rhs: @expr ref
+);
+
+box_pats(
+  unique int id: @box_pat
+);
+
+#keyset[id]
+box_pat_pats(
+  int id: @box_pat ref,
+  int pat: @pat ref
+);
+
+break_exprs(
+  unique int id: @break_expr
+);
+
+#keyset[id, index]
+break_expr_attrs(
+  int id: @break_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+break_expr_exprs(
+  int id: @break_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+break_expr_lifetimes(
+  int id: @break_expr ref,
+  int lifetime: @lifetime ref
+);
+
+@call_expr_base =
+  @call_expr
+| @method_call_expr
+;
+
+#keyset[id]
+call_expr_base_arg_lists(
+  int id: @call_expr_base ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+call_expr_base_attrs(
+  int id: @call_expr_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+cast_exprs(
+  unique int id: @cast_expr
+);
+
+#keyset[id, index]
+cast_expr_attrs(
+  int id: @cast_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+cast_expr_exprs(
+  int id: @cast_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+cast_expr_type_reprs(
+  int id: @cast_expr ref,
+  int type_repr: @type_repr ref
+);
+
+closure_exprs(
+  unique int id: @closure_expr
+);
+
+#keyset[id]
+closure_expr_bodies(
+  int id: @closure_expr ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+closure_expr_for_binders(
+  int id: @closure_expr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+closure_expr_is_async(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_const(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_gen(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_move(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_static(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_ret_types(
+  int id: @closure_expr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+comments(
+  unique int id: @comment,
+  int parent: @ast_node ref,
+  string text: string ref
+);
+
+const_args(
+  unique int id: @const_arg
+);
+
+#keyset[id]
+const_arg_exprs(
+  int id: @const_arg ref,
+  int expr: @expr ref
+);
+
+const_block_pats(
+  unique int id: @const_block_pat
+);
+
+#keyset[id]
+const_block_pat_block_exprs(
+  int id: @const_block_pat ref,
+  int block_expr: @block_expr ref
+);
+
+#keyset[id]
+const_block_pat_is_const(
+  int id: @const_block_pat ref
+);
+
+const_params(
+  unique int id: @const_param
+);
+
+#keyset[id, index]
+const_param_attrs(
+  int id: @const_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_param_default_vals(
+  int id: @const_param ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+const_param_is_const(
+  int id: @const_param ref
+);
+
+#keyset[id]
+const_param_names(
+  int id: @const_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_param_type_reprs(
+  int id: @const_param ref,
+  int type_repr: @type_repr ref
+);
+
+continue_exprs(
+  unique int id: @continue_expr
+);
+
+#keyset[id, index]
+continue_expr_attrs(
+  int id: @continue_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+continue_expr_lifetimes(
+  int id: @continue_expr ref,
+  int lifetime: @lifetime ref
+);
+
+dyn_trait_type_reprs(
+  unique int id: @dyn_trait_type_repr
+);
+
+#keyset[id]
+dyn_trait_type_repr_type_bound_lists(
+  int id: @dyn_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+expr_stmts(
+  unique int id: @expr_stmt
+);
+
+#keyset[id]
+expr_stmt_exprs(
+  int id: @expr_stmt ref,
+  int expr: @expr ref
+);
+
+field_exprs(
+  unique int id: @field_expr
+);
+
+#keyset[id, index]
+field_expr_attrs(
+  int id: @field_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+field_expr_containers(
+  int id: @field_expr ref,
+  int container: @expr ref
+);
+
+#keyset[id]
+field_expr_identifiers(
+  int id: @field_expr ref,
+  int identifier: @name_ref ref
+);
+
+fn_ptr_type_reprs(
+  unique int id: @fn_ptr_type_repr
+);
+
+#keyset[id]
+fn_ptr_type_repr_abis(
+  int id: @fn_ptr_type_repr ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_async(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_const(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_unsafe(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_param_lists(
+  int id: @fn_ptr_type_repr ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_ret_types(
+  int id: @fn_ptr_type_repr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+for_type_reprs(
+  unique int id: @for_type_repr
+);
+
+#keyset[id]
+for_type_repr_for_binders(
+  int id: @for_type_repr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+for_type_repr_type_reprs(
+  int id: @for_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+format_args_exprs(
+  unique int id: @format_args_expr
+);
+
+#keyset[id, index]
+format_args_expr_args(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int arg: @format_args_arg ref
+);
+
+#keyset[id, index]
+format_args_expr_attrs(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+format_args_expr_templates(
+  int id: @format_args_expr ref,
+  int template: @expr ref
+);
+
+ident_pats(
+  unique int id: @ident_pat
+);
+
+#keyset[id, index]
+ident_pat_attrs(
+  int id: @ident_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ident_pat_is_mut(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_is_ref(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_names(
+  int id: @ident_pat ref,
+  int name: @name ref
+);
+
+#keyset[id]
+ident_pat_pats(
+  int id: @ident_pat ref,
+  int pat: @pat ref
+);
+
+if_exprs(
+  unique int id: @if_expr
+);
+
+#keyset[id, index]
+if_expr_attrs(
+  int id: @if_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+if_expr_conditions(
+  int id: @if_expr ref,
+  int condition: @expr ref
+);
+
+#keyset[id]
+if_expr_elses(
+  int id: @if_expr ref,
+  int else: @expr ref
+);
+
+#keyset[id]
+if_expr_thens(
+  int id: @if_expr ref,
+  int then: @block_expr ref
+);
+
+impl_trait_type_reprs(
+  unique int id: @impl_trait_type_repr
+);
+
+#keyset[id]
+impl_trait_type_repr_type_bound_lists(
+  int id: @impl_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+index_exprs(
+  unique int id: @index_expr
+);
+
+#keyset[id, index]
+index_expr_attrs(
+  int id: @index_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+index_expr_bases(
+  int id: @index_expr ref,
+  int base: @expr ref
+);
+
+#keyset[id]
+index_expr_indices(
+  int id: @index_expr ref,
+  int index: @expr ref
+);
+
+infer_type_reprs(
+  unique int id: @infer_type_repr
+);
+
+@item =
+  @adt
+| @asm_expr
+| @assoc_item
+| @extern_block
+| @extern_crate
+| @extern_item
+| @impl
+| @macro_def
+| @macro_rules
+| @module
+| @trait
+| @trait_alias
+| @use
+;
+
+#keyset[id]
+item_attribute_macro_expansions(
+  int id: @item ref,
+  int attribute_macro_expansion: @macro_items ref
+);
+
+@labelable_expr =
+  @block_expr
+| @looping_expr
+;
+
+#keyset[id]
+labelable_expr_labels(
+  int id: @labelable_expr ref,
+  int label: @label ref
+);
+
+let_exprs(
+  unique int id: @let_expr
+);
+
+#keyset[id, index]
+let_expr_attrs(
+  int id: @let_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_expr_scrutinees(
+  int id: @let_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+let_expr_pats(
+  int id: @let_expr ref,
+  int pat: @pat ref
+);
+
+let_stmts(
+  unique int id: @let_stmt
+);
+
+#keyset[id, index]
+let_stmt_attrs(
+  int id: @let_stmt ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_stmt_initializers(
+  int id: @let_stmt ref,
+  int initializer: @expr ref
+);
+
+#keyset[id]
+let_stmt_let_elses(
+  int id: @let_stmt ref,
+  int let_else: @let_else ref
+);
+
+#keyset[id]
+let_stmt_pats(
+  int id: @let_stmt ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+let_stmt_type_reprs(
+  int id: @let_stmt ref,
+  int type_repr: @type_repr ref
+);
+
+lifetimes(
+  unique int id: @lifetime
+);
+
+#keyset[id]
+lifetime_texts(
+  int id: @lifetime ref,
+  string text: string ref
+);
+
+lifetime_args(
+  unique int id: @lifetime_arg
+);
+
+#keyset[id]
+lifetime_arg_lifetimes(
+  int id: @lifetime_arg ref,
+  int lifetime: @lifetime ref
+);
+
+lifetime_params(
+  unique int id: @lifetime_param
+);
+
+#keyset[id, index]
+lifetime_param_attrs(
+  int id: @lifetime_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+lifetime_param_lifetimes(
+  int id: @lifetime_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+lifetime_param_type_bound_lists(
+  int id: @lifetime_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+literal_exprs(
+  unique int id: @literal_expr
+);
+
+#keyset[id, index]
+literal_expr_attrs(
+  int id: @literal_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+literal_expr_text_values(
+  int id: @literal_expr ref,
+  string text_value: string ref
+);
+
+literal_pats(
+  unique int id: @literal_pat
+);
+
+#keyset[id]
+literal_pat_literals(
+  int id: @literal_pat ref,
+  int literal: @literal_expr ref
+);
+
+macro_block_exprs(
+  unique int id: @macro_block_expr
+);
+
+#keyset[id, index]
+macro_block_expr_statements(
+  int id: @macro_block_expr ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+macro_block_expr_tail_exprs(
+  int id: @macro_block_expr ref,
+  int tail_expr: @expr ref
+);
+
+macro_exprs(
+  unique int id: @macro_expr
+);
+
+#keyset[id]
+macro_expr_macro_calls(
+  int id: @macro_expr ref,
+  int macro_call: @macro_call ref
+);
+
+macro_pats(
+  unique int id: @macro_pat
+);
+
+#keyset[id]
+macro_pat_macro_calls(
+  int id: @macro_pat ref,
+  int macro_call: @macro_call ref
+);
+
+macro_type_reprs(
+  unique int id: @macro_type_repr
+);
+
+#keyset[id]
+macro_type_repr_macro_calls(
+  int id: @macro_type_repr ref,
+  int macro_call: @macro_call ref
+);
+
+match_exprs(
+  unique int id: @match_expr
+);
+
+#keyset[id, index]
+match_expr_attrs(
+  int id: @match_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_expr_scrutinees(
+  int id: @match_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+match_expr_match_arm_lists(
+  int id: @match_expr ref,
+  int match_arm_list: @match_arm_list ref
+);
+
+name_refs(
+  unique int id: @name_ref
+);
+
+#keyset[id]
+name_ref_texts(
+  int id: @name_ref ref,
+  string text: string ref
+);
+
+never_type_reprs(
+  unique int id: @never_type_repr
+);
+
+offset_of_exprs(
+  unique int id: @offset_of_expr
+);
+
+#keyset[id, index]
+offset_of_expr_attrs(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+offset_of_expr_fields(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int field: @name_ref ref
+);
+
+#keyset[id]
+offset_of_expr_type_reprs(
+  int id: @offset_of_expr ref,
+  int type_repr: @type_repr ref
+);
+
+or_pats(
+  unique int id: @or_pat
+);
+
+#keyset[id, index]
+or_pat_pats(
+  int id: @or_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+params(
+  unique int id: @param
+);
+
+#keyset[id]
+param_pats(
+  int id: @param ref,
+  int pat: @pat ref
+);
+
+paren_exprs(
+  unique int id: @paren_expr
+);
+
+#keyset[id, index]
+paren_expr_attrs(
+  int id: @paren_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+paren_expr_exprs(
+  int id: @paren_expr ref,
+  int expr: @expr ref
+);
+
+paren_pats(
+  unique int id: @paren_pat
+);
+
+#keyset[id]
+paren_pat_pats(
+  int id: @paren_pat ref,
+  int pat: @pat ref
+);
+
+paren_type_reprs(
+  unique int id: @paren_type_repr
+);
+
+#keyset[id]
+paren_type_repr_type_reprs(
+  int id: @paren_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+@path_ast_node =
+  @path_expr
+| @path_pat
+| @struct_expr
+| @struct_pat
+| @tuple_struct_pat
+;
+
+#keyset[id]
+path_ast_node_paths(
+  int id: @path_ast_node ref,
+  int path: @path ref
+);
+
+@path_expr_base =
+  @path_expr
+;
+
+path_type_reprs(
+  unique int id: @path_type_repr
+);
+
+#keyset[id]
+path_type_repr_paths(
+  int id: @path_type_repr ref,
+  int path: @path ref
+);
+
+prefix_exprs(
+  unique int id: @prefix_expr
+);
+
+#keyset[id, index]
+prefix_expr_attrs(
+  int id: @prefix_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+prefix_expr_exprs(
+  int id: @prefix_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+prefix_expr_operator_names(
+  int id: @prefix_expr ref,
+  string operator_name: string ref
+);
+
+ptr_type_reprs(
+  unique int id: @ptr_type_repr
+);
+
+#keyset[id]
+ptr_type_repr_is_const(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_is_mut(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_type_reprs(
+  int id: @ptr_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+range_exprs(
+  unique int id: @range_expr
+);
+
+#keyset[id, index]
+range_expr_attrs(
+  int id: @range_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+range_expr_ends(
+  int id: @range_expr ref,
+  int end: @expr ref
+);
+
+#keyset[id]
+range_expr_operator_names(
+  int id: @range_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_expr_starts(
+  int id: @range_expr ref,
+  int start: @expr ref
+);
+
+range_pats(
+  unique int id: @range_pat
+);
+
+#keyset[id]
+range_pat_ends(
+  int id: @range_pat ref,
+  int end: @pat ref
+);
+
+#keyset[id]
+range_pat_operator_names(
+  int id: @range_pat ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_pat_starts(
+  int id: @range_pat ref,
+  int start: @pat ref
+);
+
+ref_exprs(
+  unique int id: @ref_expr
+);
+
+#keyset[id, index]
+ref_expr_attrs(
+  int id: @ref_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ref_expr_exprs(
+  int id: @ref_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+ref_expr_is_const(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_mut(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_raw(
+  int id: @ref_expr ref
+);
+
+ref_pats(
+  unique int id: @ref_pat
+);
+
+#keyset[id]
+ref_pat_is_mut(
+  int id: @ref_pat ref
+);
+
+#keyset[id]
+ref_pat_pats(
+  int id: @ref_pat ref,
+  int pat: @pat ref
+);
+
+ref_type_reprs(
+  unique int id: @ref_type_repr
+);
+
+#keyset[id]
+ref_type_repr_is_mut(
+  int id: @ref_type_repr ref
+);
+
+#keyset[id]
+ref_type_repr_lifetimes(
+  int id: @ref_type_repr ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+ref_type_repr_type_reprs(
+  int id: @ref_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+rest_pats(
+  unique int id: @rest_pat
+);
+
+#keyset[id, index]
+rest_pat_attrs(
+  int id: @rest_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+return_exprs(
+  unique int id: @return_expr
+);
+
+#keyset[id, index]
+return_expr_attrs(
+  int id: @return_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+return_expr_exprs(
+  int id: @return_expr ref,
+  int expr: @expr ref
+);
+
+self_params(
+  unique int id: @self_param
+);
+
+#keyset[id]
+self_param_is_ref(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_is_mut(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_lifetimes(
+  int id: @self_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+self_param_names(
+  int id: @self_param ref,
+  int name: @name ref
+);
+
+slice_pats(
+  unique int id: @slice_pat
+);
+
+#keyset[id, index]
+slice_pat_pats(
+  int id: @slice_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+slice_type_reprs(
+  unique int id: @slice_type_repr
+);
+
+#keyset[id]
+slice_type_repr_type_reprs(
+  int id: @slice_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+struct_field_lists(
+  unique int id: @struct_field_list
+);
+
+#keyset[id, index]
+struct_field_list_fields(
+  int id: @struct_field_list ref,
+  int index: int ref,
+  int field: @struct_field ref
+);
+
+try_exprs(
+  unique int id: @try_expr
+);
+
+#keyset[id, index]
+try_expr_attrs(
+  int id: @try_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+try_expr_exprs(
+  int id: @try_expr ref,
+  int expr: @expr ref
+);
+
+tuple_exprs(
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_attrs(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+tuple_expr_fields(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int field: @expr ref
+);
+
+tuple_field_lists(
+  unique int id: @tuple_field_list
+);
+
+#keyset[id, index]
+tuple_field_list_fields(
+  int id: @tuple_field_list ref,
+  int index: int ref,
+  int field: @tuple_field ref
+);
+
+tuple_pats(
+  unique int id: @tuple_pat
+);
+
+#keyset[id, index]
+tuple_pat_fields(
+  int id: @tuple_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_type_reprs(
+  unique int id: @tuple_type_repr
+);
+
+#keyset[id, index]
+tuple_type_repr_fields(
+  int id: @tuple_type_repr ref,
+  int index: int ref,
+  int field: @type_repr ref
+);
+
+type_args(
+  unique int id: @type_arg
+);
+
+#keyset[id]
+type_arg_type_reprs(
+  int id: @type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+type_params(
+  unique int id: @type_param
+);
+
+#keyset[id, index]
+type_param_attrs(
+  int id: @type_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_param_default_types(
+  int id: @type_param ref,
+  int default_type: @type_repr ref
+);
+
+#keyset[id]
+type_param_names(
+  int id: @type_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_param_type_bound_lists(
+  int id: @type_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+underscore_exprs(
+  unique int id: @underscore_expr
+);
+
+#keyset[id, index]
+underscore_expr_attrs(
+  int id: @underscore_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+variants(
+  unique int id: @variant
+);
+
+#keyset[id, index]
+variant_attrs(
+  int id: @variant ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+variant_discriminants(
+  int id: @variant ref,
+  int discriminant: @expr ref
+);
+
+#keyset[id]
+variant_field_lists(
+  int id: @variant ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+variant_names(
+  int id: @variant ref,
+  int name: @name ref
+);
+
+#keyset[id]
+variant_visibilities(
+  int id: @variant ref,
+  int visibility: @visibility ref
+);
+
+wildcard_pats(
+  unique int id: @wildcard_pat
+);
+
+yeet_exprs(
+  unique int id: @yeet_expr
+);
+
+#keyset[id, index]
+yeet_expr_attrs(
+  int id: @yeet_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yeet_expr_exprs(
+  int id: @yeet_expr ref,
+  int expr: @expr ref
+);
+
+yield_exprs(
+  unique int id: @yield_expr
+);
+
+#keyset[id, index]
+yield_expr_attrs(
+  int id: @yield_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yield_expr_exprs(
+  int id: @yield_expr ref,
+  int expr: @expr ref
+);
+
+@adt =
+  @enum
+| @struct
+| @union
+;
+
+#keyset[id, index]
+adt_derive_macro_expansions(
+  int id: @adt ref,
+  int index: int ref,
+  int derive_macro_expansion: @macro_items ref
+);
+
+asm_exprs(
+  unique int id: @asm_expr
+);
+
+#keyset[id, index]
+asm_expr_asm_pieces(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int asm_piece: @asm_piece ref
+);
+
+#keyset[id, index]
+asm_expr_attrs(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+asm_expr_templates(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int template: @expr ref
+);
+
+@assoc_item =
+  @const
+| @function
+| @macro_call
+| @type_alias
+;
+
+block_exprs(
+  unique int id: @block_expr
+);
+
+#keyset[id, index]
+block_expr_attrs(
+  int id: @block_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+block_expr_is_async(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_const(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_gen(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_move(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_try(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_unsafe(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_stmt_lists(
+  int id: @block_expr ref,
+  int stmt_list: @stmt_list ref
+);
+
+call_exprs(
+  unique int id: @call_expr
+);
+
+#keyset[id]
+call_expr_functions(
+  int id: @call_expr ref,
+  int function: @expr ref
+);
+
+extern_blocks(
+  unique int id: @extern_block
+);
+
+#keyset[id]
+extern_block_abis(
+  int id: @extern_block ref,
+  int abi: @abi ref
+);
+
+#keyset[id, index]
+extern_block_attrs(
+  int id: @extern_block ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_block_extern_item_lists(
+  int id: @extern_block ref,
+  int extern_item_list: @extern_item_list ref
+);
+
+#keyset[id]
+extern_block_is_unsafe(
+  int id: @extern_block ref
+);
+
+extern_crates(
+  unique int id: @extern_crate
+);
+
+#keyset[id, index]
+extern_crate_attrs(
+  int id: @extern_crate ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_crate_identifiers(
+  int id: @extern_crate ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+extern_crate_renames(
+  int id: @extern_crate ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+extern_crate_visibilities(
+  int id: @extern_crate ref,
+  int visibility: @visibility ref
+);
+
+@extern_item =
+  @function
+| @macro_call
+| @static
+| @type_alias
+;
+
+impls(
+  unique int id: @impl
+);
+
+#keyset[id]
+impl_assoc_item_lists(
+  int id: @impl ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+impl_attrs(
+  int id: @impl ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+impl_generic_param_lists(
+  int id: @impl ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+impl_is_const(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_default(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_unsafe(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_self_ties(
+  int id: @impl ref,
+  int self_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_traits(
+  int id: @impl ref,
+  int trait: @type_repr ref
+);
+
+#keyset[id]
+impl_visibilities(
+  int id: @impl ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+impl_where_clauses(
+  int id: @impl ref,
+  int where_clause: @where_clause ref
+);
+
+@looping_expr =
+  @for_expr
+| @loop_expr
+| @while_expr
+;
+
+#keyset[id]
+looping_expr_loop_bodies(
+  int id: @looping_expr ref,
+  int loop_body: @block_expr ref
+);
+
+macro_defs(
+  unique int id: @macro_def
+);
+
+#keyset[id]
+macro_def_args(
+  int id: @macro_def ref,
+  int args: @token_tree ref
+);
+
+#keyset[id, index]
+macro_def_attrs(
+  int id: @macro_def ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_def_bodies(
+  int id: @macro_def ref,
+  int body: @token_tree ref
+);
+
+#keyset[id]
+macro_def_names(
+  int id: @macro_def ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_def_visibilities(
+  int id: @macro_def ref,
+  int visibility: @visibility ref
+);
+
+macro_rules(
+  unique int id: @macro_rules
+);
+
+#keyset[id, index]
+macro_rules_attrs(
+  int id: @macro_rules ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_rules_names(
+  int id: @macro_rules ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_rules_token_trees(
+  int id: @macro_rules ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_rules_visibilities(
+  int id: @macro_rules ref,
+  int visibility: @visibility ref
+);
+
+method_call_exprs(
+  unique int id: @method_call_expr
+);
+
+#keyset[id]
+method_call_expr_generic_arg_lists(
+  int id: @method_call_expr ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+method_call_expr_identifiers(
+  int id: @method_call_expr ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+method_call_expr_receivers(
+  int id: @method_call_expr ref,
+  int receiver: @expr ref
+);
+
+modules(
+  unique int id: @module
+);
+
+#keyset[id, index]
+module_attrs(
+  int id: @module ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+module_item_lists(
+  int id: @module ref,
+  int item_list: @item_list ref
+);
+
+#keyset[id]
+module_names(
+  int id: @module ref,
+  int name: @name ref
+);
+
+#keyset[id]
+module_visibilities(
+  int id: @module ref,
+  int visibility: @visibility ref
+);
+
+path_exprs(
+  unique int id: @path_expr
+);
+
+#keyset[id, index]
+path_expr_attrs(
+  int id: @path_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+path_pats(
+  unique int id: @path_pat
+);
+
+struct_exprs(
+  unique int id: @struct_expr
+);
+
+#keyset[id]
+struct_expr_struct_expr_field_lists(
+  int id: @struct_expr ref,
+  int struct_expr_field_list: @struct_expr_field_list ref
+);
+
+struct_pats(
+  unique int id: @struct_pat
+);
+
+#keyset[id]
+struct_pat_struct_pat_field_lists(
+  int id: @struct_pat ref,
+  int struct_pat_field_list: @struct_pat_field_list ref
+);
+
+traits(
+  unique int id: @trait
+);
+
+#keyset[id]
+trait_assoc_item_lists(
+  int id: @trait ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+trait_attrs(
+  int id: @trait ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_generic_param_lists(
+  int id: @trait ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_is_auto(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_is_unsafe(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_names(
+  int id: @trait ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_type_bound_lists(
+  int id: @trait ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_visibilities(
+  int id: @trait ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_where_clauses(
+  int id: @trait ref,
+  int where_clause: @where_clause ref
+);
+
+trait_aliases(
+  unique int id: @trait_alias
+);
+
+#keyset[id, index]
+trait_alias_attrs(
+  int id: @trait_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_alias_generic_param_lists(
+  int id: @trait_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_alias_names(
+  int id: @trait_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_alias_type_bound_lists(
+  int id: @trait_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_alias_visibilities(
+  int id: @trait_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_alias_where_clauses(
+  int id: @trait_alias ref,
+  int where_clause: @where_clause ref
+);
+
+tuple_struct_pats(
+  unique int id: @tuple_struct_pat
+);
+
+#keyset[id, index]
+tuple_struct_pat_fields(
+  int id: @tuple_struct_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+uses(
+  unique int id: @use
+);
+
+#keyset[id, index]
+use_attrs(
+  int id: @use ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+use_use_trees(
+  int id: @use ref,
+  int use_tree: @use_tree ref
+);
+
+#keyset[id]
+use_visibilities(
+  int id: @use ref,
+  int visibility: @visibility ref
+);
+
+consts(
+  unique int id: @const
+);
+
+#keyset[id, index]
+const_attrs(
+  int id: @const ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_bodies(
+  int id: @const ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+const_generic_param_lists(
+  int id: @const ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+const_is_const(
+  int id: @const ref
+);
+
+#keyset[id]
+const_is_default(
+  int id: @const ref
+);
+
+#keyset[id]
+const_names(
+  int id: @const ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_type_reprs(
+  int id: @const ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+const_visibilities(
+  int id: @const ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+const_where_clauses(
+  int id: @const ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+const_has_implementation(
+  int id: @const ref
+);
+
+enums(
+  unique int id: @enum
+);
+
+#keyset[id, index]
+enum_attrs(
+  int id: @enum ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+enum_generic_param_lists(
+  int id: @enum ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+enum_names(
+  int id: @enum ref,
+  int name: @name ref
+);
+
+#keyset[id]
+enum_variant_lists(
+  int id: @enum ref,
+  int variant_list: @variant_list ref
+);
+
+#keyset[id]
+enum_visibilities(
+  int id: @enum ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+enum_where_clauses(
+  int id: @enum ref,
+  int where_clause: @where_clause ref
+);
+
+for_exprs(
+  unique int id: @for_expr
+);
+
+#keyset[id, index]
+for_expr_attrs(
+  int id: @for_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+for_expr_iterables(
+  int id: @for_expr ref,
+  int iterable: @expr ref
+);
+
+#keyset[id]
+for_expr_pats(
+  int id: @for_expr ref,
+  int pat: @pat ref
+);
+
+functions(
+  unique int id: @function
+);
+
+#keyset[id]
+function_abis(
+  int id: @function ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+function_bodies(
+  int id: @function ref,
+  int body: @block_expr ref
+);
+
+#keyset[id]
+function_generic_param_lists(
+  int id: @function ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+function_is_async(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_const(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_default(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_gen(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_unsafe(
+  int id: @function ref
+);
+
+#keyset[id]
+function_names(
+  int id: @function ref,
+  int name: @name ref
+);
+
+#keyset[id]
+function_ret_types(
+  int id: @function ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+function_visibilities(
+  int id: @function ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+function_where_clauses(
+  int id: @function ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+function_has_implementation(
+  int id: @function ref
+);
+
+loop_exprs(
+  unique int id: @loop_expr
+);
+
+#keyset[id, index]
+loop_expr_attrs(
+  int id: @loop_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+macro_calls(
+  unique int id: @macro_call
+);
+
+#keyset[id, index]
+macro_call_attrs(
+  int id: @macro_call ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_call_paths(
+  int id: @macro_call ref,
+  int path: @path ref
+);
+
+#keyset[id]
+macro_call_token_trees(
+  int id: @macro_call ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_call_macro_call_expansions(
+  int id: @macro_call ref,
+  int macro_call_expansion: @ast_node ref
+);
+
+statics(
+  unique int id: @static
+);
+
+#keyset[id, index]
+static_attrs(
+  int id: @static ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+static_bodies(
+  int id: @static ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+static_is_mut(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_static(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_unsafe(
+  int id: @static ref
+);
+
+#keyset[id]
+static_names(
+  int id: @static ref,
+  int name: @name ref
+);
+
+#keyset[id]
+static_type_reprs(
+  int id: @static ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+static_visibilities(
+  int id: @static ref,
+  int visibility: @visibility ref
+);
+
+structs(
+  unique int id: @struct
+);
+
+#keyset[id, index]
+struct_attrs(
+  int id: @struct ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_lists_(
+  int id: @struct ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+struct_generic_param_lists(
+  int id: @struct ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+struct_names(
+  int id: @struct ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_visibilities(
+  int id: @struct ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+struct_where_clauses(
+  int id: @struct ref,
+  int where_clause: @where_clause ref
+);
+
+type_aliases(
+  unique int id: @type_alias
+);
+
+#keyset[id, index]
+type_alias_attrs(
+  int id: @type_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_alias_generic_param_lists(
+  int id: @type_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_alias_is_default(
+  int id: @type_alias ref
+);
+
+#keyset[id]
+type_alias_names(
+  int id: @type_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_alias_type_reprs(
+  int id: @type_alias ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_alias_type_bound_lists(
+  int id: @type_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+type_alias_visibilities(
+  int id: @type_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_alias_where_clauses(
+  int id: @type_alias ref,
+  int where_clause: @where_clause ref
+);
+
+unions(
+  unique int id: @union
+);
+
+#keyset[id, index]
+union_attrs(
+  int id: @union ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+union_generic_param_lists(
+  int id: @union ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+union_names(
+  int id: @union ref,
+  int name: @name ref
+);
+
+#keyset[id]
+union_struct_field_lists(
+  int id: @union ref,
+  int struct_field_list: @struct_field_list ref
+);
+
+#keyset[id]
+union_visibilities(
+  int id: @union ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+union_where_clauses(
+  int id: @union ref,
+  int where_clause: @where_clause ref
+);
+
+while_exprs(
+  unique int id: @while_expr
+);
+
+#keyset[id, index]
+while_expr_attrs(
+  int id: @while_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+while_expr_conditions(
+  int id: @while_expr ref,
+  int condition: @expr ref
+);
diff --git a/rust/ql/lib/upgrades/319c933d9615ccf40f363548cafd51d08c74a534/upgrade.properties b/rust/ql/lib/upgrades/319c933d9615ccf40f363548cafd51d08c74a534/upgrade.properties
new file mode 100644
index 00000000000..f843aa79559
--- /dev/null
+++ b/rust/ql/lib/upgrades/319c933d9615ccf40f363548cafd51d08c74a534/upgrade.properties
@@ -0,0 +1,18 @@
+description: Upgrade rust-analyzer to 0.0.300
+compatibility: backwards
+
+closure_binders.rel: delete
+closure_binder_generic_param_lists.rel: delete
+where_pred_generic_param_lists.rel: delete
+for_type_repr_generic_param_lists.rel: delete
+closure_expr_closure_binders.rel: delete
+closure_expr_for_binders.rel: reorder closure_expr_closure_binders.rel (@closure_expr id, @closure_binder binder) id binder
+
+for_binders.rel: run upgrade.ql new_for_binders
+for_binder_generic_param_lists.rel: run upgrade.ql new_for_binder_generic_param_lists
+for_type_repr_for_binders.rel: run upgrade.ql new_for_type_repr_for_binders
+where_pred_for_binders.rel: run upgrade.ql new_where_pred_for_binders
+type_bound_for_binders.rel: run upgrade.ql new_type_bound_for_binders
+for_type_reprs.rel: run upgrade.ql new_for_type_reprs
+type_bound_type_reprs.rel: run upgrade.ql new_type_bound_type_reprs
+locatable_locations.rel: run upgrade.ql new_locatable_locations
diff --git a/rust/ql/lib/upgrades/319c933d9615ccf40f363548cafd51d08c74a534/upgrade.ql b/rust/ql/lib/upgrades/319c933d9615ccf40f363548cafd51d08c74a534/upgrade.ql
new file mode 100644
index 00000000000..240991854e8
--- /dev/null
+++ b/rust/ql/lib/upgrades/319c933d9615ccf40f363548cafd51d08c74a534/upgrade.ql
@@ -0,0 +1,98 @@
+class Element extends @element {
+  string toString() { none() }
+}
+
+class ForTypeInTypeBound extends Element, @for_type_repr {
+  Element bound;
+
+  ForTypeInTypeBound() { type_bound_type_reprs(bound, this) }
+
+  Element getBound() { result = bound }
+
+  Element getGenericParamList() { for_type_repr_generic_param_lists(this, result) }
+}
+
+class Location extends @location_default {
+  string toString() { none() }
+}
+
+// we must create new `ForBinder` elements to wrap `genericParamList`s of
+// `WherePred` and `ForType` elements
+//
+// previously, T: for<'a> X was TypeBound(type_repr=ForType(generic_param_list='a, type_repr=X))
+// but now it is TypeBound(for_binder=ForBinder(<generic_param_list='a), type_repr=X>)
+// so in that case we don't create new ForBinders, but rather we repurpose ForType ids as
+// the new ForBinders ones
+newtype TAddedElement =
+  TWherePredForBinder(Element wherePred, Element genericParamList) {
+    where_pred_generic_param_lists(wherePred, genericParamList)
+  } or
+  TForTypeForBinder(Element forType, Element genericParamList) {
+    for_type_repr_generic_param_lists(forType, genericParamList) and
+    not forType instanceof ForTypeInTypeBound
+  }
+
+module Fresh = QlBuiltins::NewEntity<TAddedElement>;
+
+class TNewElement = @element or Fresh::EntityId;
+
+class NewElement extends TNewElement {
+  string toString() { none() }
+
+  Element newGenericParamList() {
+    this = Fresh::map(TWherePredForBinder(_, result)) or
+    this = Fresh::map(TForTypeForBinder(_, result))
+  }
+}
+
+query predicate new_for_binders(NewElement id) {
+  closure_binders(id) or
+  id = Fresh::map(_) or
+  id instanceof ForTypeInTypeBound
+}
+
+query predicate new_for_binder_generic_param_lists(NewElement id, Element list) {
+  closure_binder_generic_param_lists(id, list) or
+  id.newGenericParamList() = list or
+  id.(ForTypeInTypeBound).getGenericParamList() = list
+}
+
+query predicate new_where_pred_for_binders(Element id, NewElement binder) {
+  binder = Fresh::map(TWherePredForBinder(id, _))
+}
+
+// we need to add a ForBinder to ForType if it's not in a TypeBound
+query predicate new_for_type_repr_for_binders(Element id, NewElement binder) {
+  binder = Fresh::map(TForTypeForBinder(id, _))
+}
+
+query predicate new_for_type_repr_type_reprs(Element id, Element type) {
+  for_type_repr_type_reprs(id, type) and not id instanceof ForTypeInTypeBound
+}
+
+// we attach a ForTypeInTypeBound id as a ForBinder one to its TypeBound
+query predicate new_type_bound_for_binders(Element id, NewElement binder) {
+  id = binder.(ForTypeInTypeBound).getBound()
+}
+
+// we restrict ForTypes to just the ones that are not in a TypeBound
+query predicate new_for_type_reprs(Element id) {
+  for_type_reprs(id) and not id instanceof ForTypeInTypeBound
+}
+
+// for a TypeBound around a ForType, we need to move type_repr from one directly to the other
+query predicate new_type_bound_type_reprs(Element bound, Element type) {
+  exists(Element originalType |
+    type_bound_type_reprs(bound, originalType) and
+    if for_type_reprs(originalType)
+    then for_type_repr_type_reprs(originalType, type)
+    else type = originalType
+  )
+}
+
+// for newly addded ForBinders, use same location as their generic param list
+query predicate new_locatable_locations(NewElement id, Location location) {
+  locatable_locations(id, location)
+  or
+  locatable_locations(id.newGenericParamList(), location)
+}
diff --git a/rust/ql/lib/upgrades/b41e55c0dba14a139d01dbee713aca5efe5b818a/old.dbscheme b/rust/ql/lib/upgrades/b41e55c0dba14a139d01dbee713aca5efe5b818a/old.dbscheme
new file mode 100644
index 00000000000..b41e55c0dba
--- /dev/null
+++ b/rust/ql/lib/upgrades/b41e55c0dba14a139d01dbee713aca5efe5b818a/old.dbscheme
@@ -0,0 +1,3644 @@
+// generated by codegen, do not edit
+
+// from ../shared/tree-sitter-extractor/src/generator/prefix.dbscheme
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Empty location -*/
+
+empty_location(
+  int location: @location_default ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- Diagnostic messages: severity -*/
+
+case @diagnostic.severity of
+  10 = @diagnostic_debug
+| 20 = @diagnostic_info
+| 30 = @diagnostic_warning
+| 40 = @diagnostic_error
+;
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error;
+
+/*- Database metadata -*/
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+overlayChangedFiles(
+  string path: string ref
+);
+
+
+// from prefix.dbscheme
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_default ref
+);
+
+
+// from schema
+
+@element =
+  @extractor_step
+| @locatable
+| @named_crate
+| @unextracted
+;
+
+extractor_steps(
+  unique int id: @extractor_step,
+  string action: string ref,
+  int duration_ms: int ref
+);
+
+#keyset[id]
+extractor_step_files(
+  int id: @extractor_step ref,
+  int file: @file ref
+);
+
+@locatable =
+  @ast_node
+| @crate
+;
+
+named_crates(
+  unique int id: @named_crate,
+  string name: string ref,
+  int crate: @crate ref
+);
+
+@unextracted =
+  @missing
+| @unimplemented
+;
+
+@ast_node =
+  @abi
+| @addressable
+| @arg_list
+| @asm_dir_spec
+| @asm_operand
+| @asm_operand_expr
+| @asm_option
+| @asm_piece
+| @asm_reg_spec
+| @assoc_item_list
+| @attr
+| @callable
+| @expr
+| @extern_item_list
+| @field_list
+| @for_binder
+| @format_args_arg
+| @generic_arg
+| @generic_arg_list
+| @generic_param
+| @generic_param_list
+| @item_list
+| @label
+| @let_else
+| @macro_items
+| @match_arm
+| @match_arm_list
+| @match_guard
+| @meta
+| @name
+| @param_base
+| @param_list
+| @parenthesized_arg_list
+| @pat
+| @path
+| @path_segment
+| @rename
+| @resolvable
+| @ret_type_repr
+| @return_type_syntax
+| @source_file
+| @stmt
+| @stmt_list
+| @struct_expr_field
+| @struct_expr_field_list
+| @struct_field
+| @struct_pat_field
+| @struct_pat_field_list
+| @token
+| @token_tree
+| @tuple_field
+| @type_bound
+| @type_bound_list
+| @type_repr
+| @use_bound_generic_arg
+| @use_bound_generic_args
+| @use_tree
+| @use_tree_list
+| @variant_list
+| @visibility
+| @where_clause
+| @where_pred
+;
+
+crates(
+  unique int id: @crate
+);
+
+#keyset[id]
+crate_names(
+  int id: @crate ref,
+  string name: string ref
+);
+
+#keyset[id]
+crate_versions(
+  int id: @crate ref,
+  string version: string ref
+);
+
+#keyset[id, index]
+crate_cfg_options(
+  int id: @crate ref,
+  int index: int ref,
+  string cfg_option: string ref
+);
+
+#keyset[id, index]
+crate_named_dependencies(
+  int id: @crate ref,
+  int index: int ref,
+  int named_dependency: @named_crate ref
+);
+
+missings(
+  unique int id: @missing
+);
+
+unimplementeds(
+  unique int id: @unimplemented
+);
+
+abis(
+  unique int id: @abi
+);
+
+#keyset[id]
+abi_abi_strings(
+  int id: @abi ref,
+  string abi_string: string ref
+);
+
+@addressable =
+  @item
+| @variant
+;
+
+#keyset[id]
+addressable_extended_canonical_paths(
+  int id: @addressable ref,
+  string extended_canonical_path: string ref
+);
+
+#keyset[id]
+addressable_crate_origins(
+  int id: @addressable ref,
+  string crate_origin: string ref
+);
+
+arg_lists(
+  unique int id: @arg_list
+);
+
+#keyset[id, index]
+arg_list_args(
+  int id: @arg_list ref,
+  int index: int ref,
+  int arg: @expr ref
+);
+
+asm_dir_specs(
+  unique int id: @asm_dir_spec
+);
+
+@asm_operand =
+  @asm_const
+| @asm_label
+| @asm_reg_operand
+| @asm_sym
+;
+
+asm_operand_exprs(
+  unique int id: @asm_operand_expr
+);
+
+#keyset[id]
+asm_operand_expr_in_exprs(
+  int id: @asm_operand_expr ref,
+  int in_expr: @expr ref
+);
+
+#keyset[id]
+asm_operand_expr_out_exprs(
+  int id: @asm_operand_expr ref,
+  int out_expr: @expr ref
+);
+
+asm_options(
+  unique int id: @asm_option
+);
+
+#keyset[id]
+asm_option_is_raw(
+  int id: @asm_option ref
+);
+
+@asm_piece =
+  @asm_clobber_abi
+| @asm_operand_named
+| @asm_options_list
+;
+
+asm_reg_specs(
+  unique int id: @asm_reg_spec
+);
+
+#keyset[id]
+asm_reg_spec_identifiers(
+  int id: @asm_reg_spec ref,
+  int identifier: @name_ref ref
+);
+
+assoc_item_lists(
+  unique int id: @assoc_item_list
+);
+
+#keyset[id, index]
+assoc_item_list_assoc_items(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int assoc_item: @assoc_item ref
+);
+
+#keyset[id, index]
+assoc_item_list_attrs(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+attrs(
+  unique int id: @attr
+);
+
+#keyset[id]
+attr_meta(
+  int id: @attr ref,
+  int meta: @meta ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_param_lists(
+  int id: @callable ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id, index]
+callable_attrs(
+  int id: @callable ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+@expr =
+  @array_expr_internal
+| @asm_expr
+| @await_expr
+| @become_expr
+| @binary_expr
+| @break_expr
+| @call_expr_base
+| @cast_expr
+| @closure_expr
+| @continue_expr
+| @field_expr
+| @format_args_expr
+| @if_expr
+| @index_expr
+| @labelable_expr
+| @let_expr
+| @literal_expr
+| @macro_block_expr
+| @macro_expr
+| @match_expr
+| @offset_of_expr
+| @paren_expr
+| @path_expr_base
+| @prefix_expr
+| @range_expr
+| @ref_expr
+| @return_expr
+| @struct_expr
+| @try_expr
+| @tuple_expr
+| @underscore_expr
+| @yeet_expr
+| @yield_expr
+;
+
+extern_item_lists(
+  unique int id: @extern_item_list
+);
+
+#keyset[id, index]
+extern_item_list_attrs(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+extern_item_list_extern_items(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int extern_item: @extern_item ref
+);
+
+@field_list =
+  @struct_field_list
+| @tuple_field_list
+;
+
+for_binders(
+  unique int id: @for_binder
+);
+
+#keyset[id]
+for_binder_generic_param_lists(
+  int id: @for_binder ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+format_args_args(
+  unique int id: @format_args_arg
+);
+
+#keyset[id]
+format_args_arg_exprs(
+  int id: @format_args_arg ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+format_args_arg_names(
+  int id: @format_args_arg ref,
+  int name: @name ref
+);
+
+@generic_arg =
+  @assoc_type_arg
+| @const_arg
+| @lifetime_arg
+| @type_arg
+;
+
+generic_arg_lists(
+  unique int id: @generic_arg_list
+);
+
+#keyset[id, index]
+generic_arg_list_generic_args(
+  int id: @generic_arg_list ref,
+  int index: int ref,
+  int generic_arg: @generic_arg ref
+);
+
+@generic_param =
+  @const_param
+| @lifetime_param
+| @type_param
+;
+
+generic_param_lists(
+  unique int id: @generic_param_list
+);
+
+#keyset[id, index]
+generic_param_list_generic_params(
+  int id: @generic_param_list ref,
+  int index: int ref,
+  int generic_param: @generic_param ref
+);
+
+item_lists(
+  unique int id: @item_list
+);
+
+#keyset[id, index]
+item_list_attrs(
+  int id: @item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+item_list_items(
+  int id: @item_list ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+labels(
+  unique int id: @label
+);
+
+#keyset[id]
+label_lifetimes(
+  int id: @label ref,
+  int lifetime: @lifetime ref
+);
+
+let_elses(
+  unique int id: @let_else
+);
+
+#keyset[id]
+let_else_block_exprs(
+  int id: @let_else ref,
+  int block_expr: @block_expr ref
+);
+
+macro_items(
+  unique int id: @macro_items
+);
+
+#keyset[id, index]
+macro_items_items(
+  int id: @macro_items ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+match_arms(
+  unique int id: @match_arm
+);
+
+#keyset[id, index]
+match_arm_attrs(
+  int id: @match_arm ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_arm_exprs(
+  int id: @match_arm ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+match_arm_guards(
+  int id: @match_arm ref,
+  int guard: @match_guard ref
+);
+
+#keyset[id]
+match_arm_pats(
+  int id: @match_arm ref,
+  int pat: @pat ref
+);
+
+match_arm_lists(
+  unique int id: @match_arm_list
+);
+
+#keyset[id, index]
+match_arm_list_arms(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int arm: @match_arm ref
+);
+
+#keyset[id, index]
+match_arm_list_attrs(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+match_guards(
+  unique int id: @match_guard
+);
+
+#keyset[id]
+match_guard_conditions(
+  int id: @match_guard ref,
+  int condition: @expr ref
+);
+
+meta(
+  unique int id: @meta
+);
+
+#keyset[id]
+meta_exprs(
+  int id: @meta ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+meta_is_unsafe(
+  int id: @meta ref
+);
+
+#keyset[id]
+meta_paths(
+  int id: @meta ref,
+  int path: @path ref
+);
+
+#keyset[id]
+meta_token_trees(
+  int id: @meta ref,
+  int token_tree: @token_tree ref
+);
+
+names(
+  unique int id: @name
+);
+
+#keyset[id]
+name_texts(
+  int id: @name ref,
+  string text: string ref
+);
+
+@param_base =
+  @param
+| @self_param
+;
+
+#keyset[id, index]
+param_base_attrs(
+  int id: @param_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+param_base_type_reprs(
+  int id: @param_base ref,
+  int type_repr: @type_repr ref
+);
+
+param_lists(
+  unique int id: @param_list
+);
+
+#keyset[id, index]
+param_list_params(
+  int id: @param_list ref,
+  int index: int ref,
+  int param: @param ref
+);
+
+#keyset[id]
+param_list_self_params(
+  int id: @param_list ref,
+  int self_param: @self_param ref
+);
+
+parenthesized_arg_lists(
+  unique int id: @parenthesized_arg_list
+);
+
+#keyset[id, index]
+parenthesized_arg_list_type_args(
+  int id: @parenthesized_arg_list ref,
+  int index: int ref,
+  int type_arg: @type_arg ref
+);
+
+@pat =
+  @box_pat
+| @const_block_pat
+| @ident_pat
+| @literal_pat
+| @macro_pat
+| @or_pat
+| @paren_pat
+| @path_pat
+| @range_pat
+| @ref_pat
+| @rest_pat
+| @slice_pat
+| @struct_pat
+| @tuple_pat
+| @tuple_struct_pat
+| @wildcard_pat
+;
+
+paths(
+  unique int id: @path
+);
+
+#keyset[id]
+path_qualifiers(
+  int id: @path ref,
+  int qualifier: @path ref
+);
+
+#keyset[id]
+path_segments_(
+  int id: @path ref,
+  int segment: @path_segment ref
+);
+
+path_segments(
+  unique int id: @path_segment
+);
+
+#keyset[id]
+path_segment_generic_arg_lists(
+  int id: @path_segment ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+path_segment_identifiers(
+  int id: @path_segment ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+path_segment_parenthesized_arg_lists(
+  int id: @path_segment ref,
+  int parenthesized_arg_list: @parenthesized_arg_list ref
+);
+
+#keyset[id]
+path_segment_ret_types(
+  int id: @path_segment ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+path_segment_return_type_syntaxes(
+  int id: @path_segment ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+path_segment_type_reprs(
+  int id: @path_segment ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+path_segment_trait_type_reprs(
+  int id: @path_segment ref,
+  int trait_type_repr: @path_type_repr ref
+);
+
+renames(
+  unique int id: @rename
+);
+
+#keyset[id]
+rename_names(
+  int id: @rename ref,
+  int name: @name ref
+);
+
+@resolvable =
+  @method_call_expr
+| @path_ast_node
+;
+
+#keyset[id]
+resolvable_resolved_paths(
+  int id: @resolvable ref,
+  string resolved_path: string ref
+);
+
+#keyset[id]
+resolvable_resolved_crate_origins(
+  int id: @resolvable ref,
+  string resolved_crate_origin: string ref
+);
+
+ret_type_reprs(
+  unique int id: @ret_type_repr
+);
+
+#keyset[id]
+ret_type_repr_type_reprs(
+  int id: @ret_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+return_type_syntaxes(
+  unique int id: @return_type_syntax
+);
+
+source_files(
+  unique int id: @source_file
+);
+
+#keyset[id, index]
+source_file_attrs(
+  int id: @source_file ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+source_file_items(
+  int id: @source_file ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+@stmt =
+  @expr_stmt
+| @item
+| @let_stmt
+;
+
+stmt_lists(
+  unique int id: @stmt_list
+);
+
+#keyset[id, index]
+stmt_list_attrs(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+stmt_list_statements(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+stmt_list_tail_exprs(
+  int id: @stmt_list ref,
+  int tail_expr: @expr ref
+);
+
+struct_expr_fields(
+  unique int id: @struct_expr_field
+);
+
+#keyset[id, index]
+struct_expr_field_attrs(
+  int id: @struct_expr_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_expr_field_exprs(
+  int id: @struct_expr_field ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+struct_expr_field_identifiers(
+  int id: @struct_expr_field ref,
+  int identifier: @name_ref ref
+);
+
+struct_expr_field_lists(
+  unique int id: @struct_expr_field_list
+);
+
+#keyset[id, index]
+struct_expr_field_list_attrs(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+struct_expr_field_list_fields(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int field: @struct_expr_field ref
+);
+
+#keyset[id]
+struct_expr_field_list_spreads(
+  int id: @struct_expr_field_list ref,
+  int spread: @expr ref
+);
+
+struct_fields(
+  unique int id: @struct_field
+);
+
+#keyset[id, index]
+struct_field_attrs(
+  int id: @struct_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_defaults(
+  int id: @struct_field ref,
+  int default: @expr ref
+);
+
+#keyset[id]
+struct_field_is_unsafe(
+  int id: @struct_field ref
+);
+
+#keyset[id]
+struct_field_names(
+  int id: @struct_field ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_field_type_reprs(
+  int id: @struct_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+struct_field_visibilities(
+  int id: @struct_field ref,
+  int visibility: @visibility ref
+);
+
+struct_pat_fields(
+  unique int id: @struct_pat_field
+);
+
+#keyset[id, index]
+struct_pat_field_attrs(
+  int id: @struct_pat_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_pat_field_identifiers(
+  int id: @struct_pat_field ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+struct_pat_field_pats(
+  int id: @struct_pat_field ref,
+  int pat: @pat ref
+);
+
+struct_pat_field_lists(
+  unique int id: @struct_pat_field_list
+);
+
+#keyset[id, index]
+struct_pat_field_list_fields(
+  int id: @struct_pat_field_list ref,
+  int index: int ref,
+  int field: @struct_pat_field ref
+);
+
+#keyset[id]
+struct_pat_field_list_rest_pats(
+  int id: @struct_pat_field_list ref,
+  int rest_pat: @rest_pat ref
+);
+
+@token =
+  @comment
+;
+
+token_trees(
+  unique int id: @token_tree
+);
+
+tuple_fields(
+  unique int id: @tuple_field
+);
+
+#keyset[id, index]
+tuple_field_attrs(
+  int id: @tuple_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+tuple_field_type_reprs(
+  int id: @tuple_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+tuple_field_visibilities(
+  int id: @tuple_field ref,
+  int visibility: @visibility ref
+);
+
+type_bounds(
+  unique int id: @type_bound
+);
+
+#keyset[id]
+type_bound_for_binders(
+  int id: @type_bound ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+type_bound_is_async(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_is_const(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_lifetimes(
+  int id: @type_bound ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+type_bound_type_reprs(
+  int id: @type_bound ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_bound_use_bound_generic_args(
+  int id: @type_bound ref,
+  int use_bound_generic_args: @use_bound_generic_args ref
+);
+
+type_bound_lists(
+  unique int id: @type_bound_list
+);
+
+#keyset[id, index]
+type_bound_list_bounds(
+  int id: @type_bound_list ref,
+  int index: int ref,
+  int bound: @type_bound ref
+);
+
+@type_repr =
+  @array_type_repr
+| @dyn_trait_type_repr
+| @fn_ptr_type_repr
+| @for_type_repr
+| @impl_trait_type_repr
+| @infer_type_repr
+| @macro_type_repr
+| @never_type_repr
+| @paren_type_repr
+| @path_type_repr
+| @ptr_type_repr
+| @ref_type_repr
+| @slice_type_repr
+| @tuple_type_repr
+;
+
+@use_bound_generic_arg =
+  @lifetime
+| @name_ref
+;
+
+use_bound_generic_args(
+  unique int id: @use_bound_generic_args
+);
+
+#keyset[id, index]
+use_bound_generic_args_use_bound_generic_args(
+  int id: @use_bound_generic_args ref,
+  int index: int ref,
+  int use_bound_generic_arg: @use_bound_generic_arg ref
+);
+
+use_trees(
+  unique int id: @use_tree
+);
+
+#keyset[id]
+use_tree_is_glob(
+  int id: @use_tree ref
+);
+
+#keyset[id]
+use_tree_paths(
+  int id: @use_tree ref,
+  int path: @path ref
+);
+
+#keyset[id]
+use_tree_renames(
+  int id: @use_tree ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+use_tree_use_tree_lists(
+  int id: @use_tree ref,
+  int use_tree_list: @use_tree_list ref
+);
+
+use_tree_lists(
+  unique int id: @use_tree_list
+);
+
+#keyset[id, index]
+use_tree_list_use_trees(
+  int id: @use_tree_list ref,
+  int index: int ref,
+  int use_tree: @use_tree ref
+);
+
+variant_lists(
+  unique int id: @variant_list
+);
+
+#keyset[id, index]
+variant_list_variants(
+  int id: @variant_list ref,
+  int index: int ref,
+  int variant: @variant ref
+);
+
+visibilities(
+  unique int id: @visibility
+);
+
+#keyset[id]
+visibility_paths(
+  int id: @visibility ref,
+  int path: @path ref
+);
+
+where_clauses(
+  unique int id: @where_clause
+);
+
+#keyset[id, index]
+where_clause_predicates(
+  int id: @where_clause ref,
+  int index: int ref,
+  int predicate: @where_pred ref
+);
+
+where_preds(
+  unique int id: @where_pred
+);
+
+#keyset[id]
+where_pred_for_binders(
+  int id: @where_pred ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+where_pred_lifetimes(
+  int id: @where_pred ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+where_pred_type_reprs(
+  int id: @where_pred ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+where_pred_type_bound_lists(
+  int id: @where_pred ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+array_expr_internals(
+  unique int id: @array_expr_internal
+);
+
+#keyset[id, index]
+array_expr_internal_attrs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+array_expr_internal_exprs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+array_expr_internal_is_semicolon(
+  int id: @array_expr_internal ref
+);
+
+array_type_reprs(
+  unique int id: @array_type_repr
+);
+
+#keyset[id]
+array_type_repr_const_args(
+  int id: @array_type_repr ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+array_type_repr_element_type_reprs(
+  int id: @array_type_repr ref,
+  int element_type_repr: @type_repr ref
+);
+
+asm_clobber_abis(
+  unique int id: @asm_clobber_abi
+);
+
+asm_consts(
+  unique int id: @asm_const
+);
+
+#keyset[id]
+asm_const_exprs(
+  int id: @asm_const ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+asm_const_is_const(
+  int id: @asm_const ref
+);
+
+asm_labels(
+  unique int id: @asm_label
+);
+
+#keyset[id]
+asm_label_block_exprs(
+  int id: @asm_label ref,
+  int block_expr: @block_expr ref
+);
+
+asm_operand_nameds(
+  unique int id: @asm_operand_named
+);
+
+#keyset[id]
+asm_operand_named_asm_operands(
+  int id: @asm_operand_named ref,
+  int asm_operand: @asm_operand ref
+);
+
+#keyset[id]
+asm_operand_named_names(
+  int id: @asm_operand_named ref,
+  int name: @name ref
+);
+
+asm_options_lists(
+  unique int id: @asm_options_list
+);
+
+#keyset[id, index]
+asm_options_list_asm_options(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int asm_option: @asm_option ref
+);
+
+asm_reg_operands(
+  unique int id: @asm_reg_operand
+);
+
+#keyset[id]
+asm_reg_operand_asm_dir_specs(
+  int id: @asm_reg_operand ref,
+  int asm_dir_spec: @asm_dir_spec ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_operand_exprs(
+  int id: @asm_reg_operand ref,
+  int asm_operand_expr: @asm_operand_expr ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_reg_specs(
+  int id: @asm_reg_operand ref,
+  int asm_reg_spec: @asm_reg_spec ref
+);
+
+asm_syms(
+  unique int id: @asm_sym
+);
+
+#keyset[id]
+asm_sym_paths(
+  int id: @asm_sym ref,
+  int path: @path ref
+);
+
+assoc_type_args(
+  unique int id: @assoc_type_arg
+);
+
+#keyset[id]
+assoc_type_arg_const_args(
+  int id: @assoc_type_arg ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+assoc_type_arg_generic_arg_lists(
+  int id: @assoc_type_arg ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+assoc_type_arg_identifiers(
+  int id: @assoc_type_arg ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+assoc_type_arg_param_lists(
+  int id: @assoc_type_arg ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+assoc_type_arg_ret_types(
+  int id: @assoc_type_arg ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_return_type_syntaxes(
+  int id: @assoc_type_arg ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+assoc_type_arg_type_reprs(
+  int id: @assoc_type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_type_bound_lists(
+  int id: @assoc_type_arg ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+await_exprs(
+  unique int id: @await_expr
+);
+
+#keyset[id, index]
+await_expr_attrs(
+  int id: @await_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+await_expr_exprs(
+  int id: @await_expr ref,
+  int expr: @expr ref
+);
+
+become_exprs(
+  unique int id: @become_expr
+);
+
+#keyset[id, index]
+become_expr_attrs(
+  int id: @become_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+become_expr_exprs(
+  int id: @become_expr ref,
+  int expr: @expr ref
+);
+
+binary_exprs(
+  unique int id: @binary_expr
+);
+
+#keyset[id, index]
+binary_expr_attrs(
+  int id: @binary_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+binary_expr_lhs(
+  int id: @binary_expr ref,
+  int lhs: @expr ref
+);
+
+#keyset[id]
+binary_expr_operator_names(
+  int id: @binary_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+binary_expr_rhs(
+  int id: @binary_expr ref,
+  int rhs: @expr ref
+);
+
+box_pats(
+  unique int id: @box_pat
+);
+
+#keyset[id]
+box_pat_pats(
+  int id: @box_pat ref,
+  int pat: @pat ref
+);
+
+break_exprs(
+  unique int id: @break_expr
+);
+
+#keyset[id, index]
+break_expr_attrs(
+  int id: @break_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+break_expr_exprs(
+  int id: @break_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+break_expr_lifetimes(
+  int id: @break_expr ref,
+  int lifetime: @lifetime ref
+);
+
+@call_expr_base =
+  @call_expr
+| @method_call_expr
+;
+
+#keyset[id]
+call_expr_base_arg_lists(
+  int id: @call_expr_base ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+call_expr_base_attrs(
+  int id: @call_expr_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+cast_exprs(
+  unique int id: @cast_expr
+);
+
+#keyset[id, index]
+cast_expr_attrs(
+  int id: @cast_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+cast_expr_exprs(
+  int id: @cast_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+cast_expr_type_reprs(
+  int id: @cast_expr ref,
+  int type_repr: @type_repr ref
+);
+
+closure_exprs(
+  unique int id: @closure_expr
+);
+
+#keyset[id]
+closure_expr_bodies(
+  int id: @closure_expr ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+closure_expr_for_binders(
+  int id: @closure_expr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+closure_expr_is_async(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_const(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_gen(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_move(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_static(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_ret_types(
+  int id: @closure_expr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+comments(
+  unique int id: @comment,
+  int parent: @ast_node ref,
+  string text: string ref
+);
+
+const_args(
+  unique int id: @const_arg
+);
+
+#keyset[id]
+const_arg_exprs(
+  int id: @const_arg ref,
+  int expr: @expr ref
+);
+
+const_block_pats(
+  unique int id: @const_block_pat
+);
+
+#keyset[id]
+const_block_pat_block_exprs(
+  int id: @const_block_pat ref,
+  int block_expr: @block_expr ref
+);
+
+#keyset[id]
+const_block_pat_is_const(
+  int id: @const_block_pat ref
+);
+
+const_params(
+  unique int id: @const_param
+);
+
+#keyset[id, index]
+const_param_attrs(
+  int id: @const_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_param_default_vals(
+  int id: @const_param ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+const_param_is_const(
+  int id: @const_param ref
+);
+
+#keyset[id]
+const_param_names(
+  int id: @const_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_param_type_reprs(
+  int id: @const_param ref,
+  int type_repr: @type_repr ref
+);
+
+continue_exprs(
+  unique int id: @continue_expr
+);
+
+#keyset[id, index]
+continue_expr_attrs(
+  int id: @continue_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+continue_expr_lifetimes(
+  int id: @continue_expr ref,
+  int lifetime: @lifetime ref
+);
+
+dyn_trait_type_reprs(
+  unique int id: @dyn_trait_type_repr
+);
+
+#keyset[id]
+dyn_trait_type_repr_type_bound_lists(
+  int id: @dyn_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+expr_stmts(
+  unique int id: @expr_stmt
+);
+
+#keyset[id]
+expr_stmt_exprs(
+  int id: @expr_stmt ref,
+  int expr: @expr ref
+);
+
+field_exprs(
+  unique int id: @field_expr
+);
+
+#keyset[id, index]
+field_expr_attrs(
+  int id: @field_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+field_expr_containers(
+  int id: @field_expr ref,
+  int container: @expr ref
+);
+
+#keyset[id]
+field_expr_identifiers(
+  int id: @field_expr ref,
+  int identifier: @name_ref ref
+);
+
+fn_ptr_type_reprs(
+  unique int id: @fn_ptr_type_repr
+);
+
+#keyset[id]
+fn_ptr_type_repr_abis(
+  int id: @fn_ptr_type_repr ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_async(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_const(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_unsafe(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_param_lists(
+  int id: @fn_ptr_type_repr ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_ret_types(
+  int id: @fn_ptr_type_repr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+for_type_reprs(
+  unique int id: @for_type_repr
+);
+
+#keyset[id]
+for_type_repr_for_binders(
+  int id: @for_type_repr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+for_type_repr_type_reprs(
+  int id: @for_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+format_args_exprs(
+  unique int id: @format_args_expr
+);
+
+#keyset[id, index]
+format_args_expr_args(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int arg: @format_args_arg ref
+);
+
+#keyset[id, index]
+format_args_expr_attrs(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+format_args_expr_templates(
+  int id: @format_args_expr ref,
+  int template: @expr ref
+);
+
+ident_pats(
+  unique int id: @ident_pat
+);
+
+#keyset[id, index]
+ident_pat_attrs(
+  int id: @ident_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ident_pat_is_mut(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_is_ref(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_names(
+  int id: @ident_pat ref,
+  int name: @name ref
+);
+
+#keyset[id]
+ident_pat_pats(
+  int id: @ident_pat ref,
+  int pat: @pat ref
+);
+
+if_exprs(
+  unique int id: @if_expr
+);
+
+#keyset[id, index]
+if_expr_attrs(
+  int id: @if_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+if_expr_conditions(
+  int id: @if_expr ref,
+  int condition: @expr ref
+);
+
+#keyset[id]
+if_expr_elses(
+  int id: @if_expr ref,
+  int else: @expr ref
+);
+
+#keyset[id]
+if_expr_thens(
+  int id: @if_expr ref,
+  int then: @block_expr ref
+);
+
+impl_trait_type_reprs(
+  unique int id: @impl_trait_type_repr
+);
+
+#keyset[id]
+impl_trait_type_repr_type_bound_lists(
+  int id: @impl_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+index_exprs(
+  unique int id: @index_expr
+);
+
+#keyset[id, index]
+index_expr_attrs(
+  int id: @index_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+index_expr_bases(
+  int id: @index_expr ref,
+  int base: @expr ref
+);
+
+#keyset[id]
+index_expr_indices(
+  int id: @index_expr ref,
+  int index: @expr ref
+);
+
+infer_type_reprs(
+  unique int id: @infer_type_repr
+);
+
+@item =
+  @adt
+| @asm_expr
+| @assoc_item
+| @extern_block
+| @extern_crate
+| @extern_item
+| @impl
+| @macro_def
+| @macro_rules
+| @module
+| @trait
+| @trait_alias
+| @use
+;
+
+#keyset[id]
+item_attribute_macro_expansions(
+  int id: @item ref,
+  int attribute_macro_expansion: @macro_items ref
+);
+
+@labelable_expr =
+  @block_expr
+| @looping_expr
+;
+
+#keyset[id]
+labelable_expr_labels(
+  int id: @labelable_expr ref,
+  int label: @label ref
+);
+
+let_exprs(
+  unique int id: @let_expr
+);
+
+#keyset[id, index]
+let_expr_attrs(
+  int id: @let_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_expr_scrutinees(
+  int id: @let_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+let_expr_pats(
+  int id: @let_expr ref,
+  int pat: @pat ref
+);
+
+let_stmts(
+  unique int id: @let_stmt
+);
+
+#keyset[id, index]
+let_stmt_attrs(
+  int id: @let_stmt ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_stmt_initializers(
+  int id: @let_stmt ref,
+  int initializer: @expr ref
+);
+
+#keyset[id]
+let_stmt_let_elses(
+  int id: @let_stmt ref,
+  int let_else: @let_else ref
+);
+
+#keyset[id]
+let_stmt_pats(
+  int id: @let_stmt ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+let_stmt_type_reprs(
+  int id: @let_stmt ref,
+  int type_repr: @type_repr ref
+);
+
+lifetimes(
+  unique int id: @lifetime
+);
+
+#keyset[id]
+lifetime_texts(
+  int id: @lifetime ref,
+  string text: string ref
+);
+
+lifetime_args(
+  unique int id: @lifetime_arg
+);
+
+#keyset[id]
+lifetime_arg_lifetimes(
+  int id: @lifetime_arg ref,
+  int lifetime: @lifetime ref
+);
+
+lifetime_params(
+  unique int id: @lifetime_param
+);
+
+#keyset[id, index]
+lifetime_param_attrs(
+  int id: @lifetime_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+lifetime_param_lifetimes(
+  int id: @lifetime_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+lifetime_param_type_bound_lists(
+  int id: @lifetime_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+literal_exprs(
+  unique int id: @literal_expr
+);
+
+#keyset[id, index]
+literal_expr_attrs(
+  int id: @literal_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+literal_expr_text_values(
+  int id: @literal_expr ref,
+  string text_value: string ref
+);
+
+literal_pats(
+  unique int id: @literal_pat
+);
+
+#keyset[id]
+literal_pat_literals(
+  int id: @literal_pat ref,
+  int literal: @literal_expr ref
+);
+
+macro_block_exprs(
+  unique int id: @macro_block_expr
+);
+
+#keyset[id, index]
+macro_block_expr_statements(
+  int id: @macro_block_expr ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+macro_block_expr_tail_exprs(
+  int id: @macro_block_expr ref,
+  int tail_expr: @expr ref
+);
+
+macro_exprs(
+  unique int id: @macro_expr
+);
+
+#keyset[id]
+macro_expr_macro_calls(
+  int id: @macro_expr ref,
+  int macro_call: @macro_call ref
+);
+
+macro_pats(
+  unique int id: @macro_pat
+);
+
+#keyset[id]
+macro_pat_macro_calls(
+  int id: @macro_pat ref,
+  int macro_call: @macro_call ref
+);
+
+macro_type_reprs(
+  unique int id: @macro_type_repr
+);
+
+#keyset[id]
+macro_type_repr_macro_calls(
+  int id: @macro_type_repr ref,
+  int macro_call: @macro_call ref
+);
+
+match_exprs(
+  unique int id: @match_expr
+);
+
+#keyset[id, index]
+match_expr_attrs(
+  int id: @match_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_expr_scrutinees(
+  int id: @match_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+match_expr_match_arm_lists(
+  int id: @match_expr ref,
+  int match_arm_list: @match_arm_list ref
+);
+
+name_refs(
+  unique int id: @name_ref
+);
+
+#keyset[id]
+name_ref_texts(
+  int id: @name_ref ref,
+  string text: string ref
+);
+
+never_type_reprs(
+  unique int id: @never_type_repr
+);
+
+offset_of_exprs(
+  unique int id: @offset_of_expr
+);
+
+#keyset[id, index]
+offset_of_expr_attrs(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+offset_of_expr_fields(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int field: @name_ref ref
+);
+
+#keyset[id]
+offset_of_expr_type_reprs(
+  int id: @offset_of_expr ref,
+  int type_repr: @type_repr ref
+);
+
+or_pats(
+  unique int id: @or_pat
+);
+
+#keyset[id, index]
+or_pat_pats(
+  int id: @or_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+params(
+  unique int id: @param
+);
+
+#keyset[id]
+param_pats(
+  int id: @param ref,
+  int pat: @pat ref
+);
+
+paren_exprs(
+  unique int id: @paren_expr
+);
+
+#keyset[id, index]
+paren_expr_attrs(
+  int id: @paren_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+paren_expr_exprs(
+  int id: @paren_expr ref,
+  int expr: @expr ref
+);
+
+paren_pats(
+  unique int id: @paren_pat
+);
+
+#keyset[id]
+paren_pat_pats(
+  int id: @paren_pat ref,
+  int pat: @pat ref
+);
+
+paren_type_reprs(
+  unique int id: @paren_type_repr
+);
+
+#keyset[id]
+paren_type_repr_type_reprs(
+  int id: @paren_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+@path_ast_node =
+  @path_expr
+| @path_pat
+| @struct_expr
+| @struct_pat
+| @tuple_struct_pat
+;
+
+#keyset[id]
+path_ast_node_paths(
+  int id: @path_ast_node ref,
+  int path: @path ref
+);
+
+@path_expr_base =
+  @path_expr
+;
+
+path_type_reprs(
+  unique int id: @path_type_repr
+);
+
+#keyset[id]
+path_type_repr_paths(
+  int id: @path_type_repr ref,
+  int path: @path ref
+);
+
+prefix_exprs(
+  unique int id: @prefix_expr
+);
+
+#keyset[id, index]
+prefix_expr_attrs(
+  int id: @prefix_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+prefix_expr_exprs(
+  int id: @prefix_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+prefix_expr_operator_names(
+  int id: @prefix_expr ref,
+  string operator_name: string ref
+);
+
+ptr_type_reprs(
+  unique int id: @ptr_type_repr
+);
+
+#keyset[id]
+ptr_type_repr_is_const(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_is_mut(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_type_reprs(
+  int id: @ptr_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+range_exprs(
+  unique int id: @range_expr
+);
+
+#keyset[id, index]
+range_expr_attrs(
+  int id: @range_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+range_expr_ends(
+  int id: @range_expr ref,
+  int end: @expr ref
+);
+
+#keyset[id]
+range_expr_operator_names(
+  int id: @range_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_expr_starts(
+  int id: @range_expr ref,
+  int start: @expr ref
+);
+
+range_pats(
+  unique int id: @range_pat
+);
+
+#keyset[id]
+range_pat_ends(
+  int id: @range_pat ref,
+  int end: @pat ref
+);
+
+#keyset[id]
+range_pat_operator_names(
+  int id: @range_pat ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_pat_starts(
+  int id: @range_pat ref,
+  int start: @pat ref
+);
+
+ref_exprs(
+  unique int id: @ref_expr
+);
+
+#keyset[id, index]
+ref_expr_attrs(
+  int id: @ref_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ref_expr_exprs(
+  int id: @ref_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+ref_expr_is_const(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_mut(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_raw(
+  int id: @ref_expr ref
+);
+
+ref_pats(
+  unique int id: @ref_pat
+);
+
+#keyset[id]
+ref_pat_is_mut(
+  int id: @ref_pat ref
+);
+
+#keyset[id]
+ref_pat_pats(
+  int id: @ref_pat ref,
+  int pat: @pat ref
+);
+
+ref_type_reprs(
+  unique int id: @ref_type_repr
+);
+
+#keyset[id]
+ref_type_repr_is_mut(
+  int id: @ref_type_repr ref
+);
+
+#keyset[id]
+ref_type_repr_lifetimes(
+  int id: @ref_type_repr ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+ref_type_repr_type_reprs(
+  int id: @ref_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+rest_pats(
+  unique int id: @rest_pat
+);
+
+#keyset[id, index]
+rest_pat_attrs(
+  int id: @rest_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+return_exprs(
+  unique int id: @return_expr
+);
+
+#keyset[id, index]
+return_expr_attrs(
+  int id: @return_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+return_expr_exprs(
+  int id: @return_expr ref,
+  int expr: @expr ref
+);
+
+self_params(
+  unique int id: @self_param
+);
+
+#keyset[id]
+self_param_is_ref(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_is_mut(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_lifetimes(
+  int id: @self_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+self_param_names(
+  int id: @self_param ref,
+  int name: @name ref
+);
+
+slice_pats(
+  unique int id: @slice_pat
+);
+
+#keyset[id, index]
+slice_pat_pats(
+  int id: @slice_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+slice_type_reprs(
+  unique int id: @slice_type_repr
+);
+
+#keyset[id]
+slice_type_repr_type_reprs(
+  int id: @slice_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+struct_field_lists(
+  unique int id: @struct_field_list
+);
+
+#keyset[id, index]
+struct_field_list_fields(
+  int id: @struct_field_list ref,
+  int index: int ref,
+  int field: @struct_field ref
+);
+
+try_exprs(
+  unique int id: @try_expr
+);
+
+#keyset[id, index]
+try_expr_attrs(
+  int id: @try_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+try_expr_exprs(
+  int id: @try_expr ref,
+  int expr: @expr ref
+);
+
+tuple_exprs(
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_attrs(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+tuple_expr_fields(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int field: @expr ref
+);
+
+tuple_field_lists(
+  unique int id: @tuple_field_list
+);
+
+#keyset[id, index]
+tuple_field_list_fields(
+  int id: @tuple_field_list ref,
+  int index: int ref,
+  int field: @tuple_field ref
+);
+
+tuple_pats(
+  unique int id: @tuple_pat
+);
+
+#keyset[id, index]
+tuple_pat_fields(
+  int id: @tuple_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_type_reprs(
+  unique int id: @tuple_type_repr
+);
+
+#keyset[id, index]
+tuple_type_repr_fields(
+  int id: @tuple_type_repr ref,
+  int index: int ref,
+  int field: @type_repr ref
+);
+
+type_args(
+  unique int id: @type_arg
+);
+
+#keyset[id]
+type_arg_type_reprs(
+  int id: @type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+type_params(
+  unique int id: @type_param
+);
+
+#keyset[id, index]
+type_param_attrs(
+  int id: @type_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_param_default_types(
+  int id: @type_param ref,
+  int default_type: @type_repr ref
+);
+
+#keyset[id]
+type_param_names(
+  int id: @type_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_param_type_bound_lists(
+  int id: @type_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+underscore_exprs(
+  unique int id: @underscore_expr
+);
+
+#keyset[id, index]
+underscore_expr_attrs(
+  int id: @underscore_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+variants(
+  unique int id: @variant
+);
+
+#keyset[id, index]
+variant_attrs(
+  int id: @variant ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+variant_discriminants(
+  int id: @variant ref,
+  int discriminant: @expr ref
+);
+
+#keyset[id]
+variant_field_lists(
+  int id: @variant ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+variant_names(
+  int id: @variant ref,
+  int name: @name ref
+);
+
+#keyset[id]
+variant_visibilities(
+  int id: @variant ref,
+  int visibility: @visibility ref
+);
+
+wildcard_pats(
+  unique int id: @wildcard_pat
+);
+
+yeet_exprs(
+  unique int id: @yeet_expr
+);
+
+#keyset[id, index]
+yeet_expr_attrs(
+  int id: @yeet_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yeet_expr_exprs(
+  int id: @yeet_expr ref,
+  int expr: @expr ref
+);
+
+yield_exprs(
+  unique int id: @yield_expr
+);
+
+#keyset[id, index]
+yield_expr_attrs(
+  int id: @yield_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yield_expr_exprs(
+  int id: @yield_expr ref,
+  int expr: @expr ref
+);
+
+@adt =
+  @enum
+| @struct
+| @union
+;
+
+#keyset[id, index]
+adt_derive_macro_expansions(
+  int id: @adt ref,
+  int index: int ref,
+  int derive_macro_expansion: @macro_items ref
+);
+
+asm_exprs(
+  unique int id: @asm_expr
+);
+
+#keyset[id, index]
+asm_expr_asm_pieces(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int asm_piece: @asm_piece ref
+);
+
+#keyset[id, index]
+asm_expr_attrs(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+asm_expr_templates(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int template: @expr ref
+);
+
+@assoc_item =
+  @const
+| @function
+| @macro_call
+| @type_alias
+;
+
+block_exprs(
+  unique int id: @block_expr
+);
+
+#keyset[id, index]
+block_expr_attrs(
+  int id: @block_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+block_expr_is_async(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_const(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_gen(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_move(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_try(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_unsafe(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_stmt_lists(
+  int id: @block_expr ref,
+  int stmt_list: @stmt_list ref
+);
+
+call_exprs(
+  unique int id: @call_expr
+);
+
+#keyset[id]
+call_expr_functions(
+  int id: @call_expr ref,
+  int function: @expr ref
+);
+
+extern_blocks(
+  unique int id: @extern_block
+);
+
+#keyset[id]
+extern_block_abis(
+  int id: @extern_block ref,
+  int abi: @abi ref
+);
+
+#keyset[id, index]
+extern_block_attrs(
+  int id: @extern_block ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_block_extern_item_lists(
+  int id: @extern_block ref,
+  int extern_item_list: @extern_item_list ref
+);
+
+#keyset[id]
+extern_block_is_unsafe(
+  int id: @extern_block ref
+);
+
+extern_crates(
+  unique int id: @extern_crate
+);
+
+#keyset[id, index]
+extern_crate_attrs(
+  int id: @extern_crate ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_crate_identifiers(
+  int id: @extern_crate ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+extern_crate_renames(
+  int id: @extern_crate ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+extern_crate_visibilities(
+  int id: @extern_crate ref,
+  int visibility: @visibility ref
+);
+
+@extern_item =
+  @function
+| @macro_call
+| @static
+| @type_alias
+;
+
+impls(
+  unique int id: @impl
+);
+
+#keyset[id]
+impl_assoc_item_lists(
+  int id: @impl ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+impl_attrs(
+  int id: @impl ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+impl_generic_param_lists(
+  int id: @impl ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+impl_is_const(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_default(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_unsafe(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_self_ties(
+  int id: @impl ref,
+  int self_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_traits(
+  int id: @impl ref,
+  int trait: @type_repr ref
+);
+
+#keyset[id]
+impl_visibilities(
+  int id: @impl ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+impl_where_clauses(
+  int id: @impl ref,
+  int where_clause: @where_clause ref
+);
+
+@looping_expr =
+  @for_expr
+| @loop_expr
+| @while_expr
+;
+
+#keyset[id]
+looping_expr_loop_bodies(
+  int id: @looping_expr ref,
+  int loop_body: @block_expr ref
+);
+
+macro_defs(
+  unique int id: @macro_def
+);
+
+#keyset[id]
+macro_def_args(
+  int id: @macro_def ref,
+  int args: @token_tree ref
+);
+
+#keyset[id, index]
+macro_def_attrs(
+  int id: @macro_def ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_def_bodies(
+  int id: @macro_def ref,
+  int body: @token_tree ref
+);
+
+#keyset[id]
+macro_def_names(
+  int id: @macro_def ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_def_visibilities(
+  int id: @macro_def ref,
+  int visibility: @visibility ref
+);
+
+macro_rules(
+  unique int id: @macro_rules
+);
+
+#keyset[id, index]
+macro_rules_attrs(
+  int id: @macro_rules ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_rules_names(
+  int id: @macro_rules ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_rules_token_trees(
+  int id: @macro_rules ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_rules_visibilities(
+  int id: @macro_rules ref,
+  int visibility: @visibility ref
+);
+
+method_call_exprs(
+  unique int id: @method_call_expr
+);
+
+#keyset[id]
+method_call_expr_generic_arg_lists(
+  int id: @method_call_expr ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+method_call_expr_identifiers(
+  int id: @method_call_expr ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+method_call_expr_receivers(
+  int id: @method_call_expr ref,
+  int receiver: @expr ref
+);
+
+modules(
+  unique int id: @module
+);
+
+#keyset[id, index]
+module_attrs(
+  int id: @module ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+module_item_lists(
+  int id: @module ref,
+  int item_list: @item_list ref
+);
+
+#keyset[id]
+module_names(
+  int id: @module ref,
+  int name: @name ref
+);
+
+#keyset[id]
+module_visibilities(
+  int id: @module ref,
+  int visibility: @visibility ref
+);
+
+path_exprs(
+  unique int id: @path_expr
+);
+
+#keyset[id, index]
+path_expr_attrs(
+  int id: @path_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+path_pats(
+  unique int id: @path_pat
+);
+
+struct_exprs(
+  unique int id: @struct_expr
+);
+
+#keyset[id]
+struct_expr_struct_expr_field_lists(
+  int id: @struct_expr ref,
+  int struct_expr_field_list: @struct_expr_field_list ref
+);
+
+struct_pats(
+  unique int id: @struct_pat
+);
+
+#keyset[id]
+struct_pat_struct_pat_field_lists(
+  int id: @struct_pat ref,
+  int struct_pat_field_list: @struct_pat_field_list ref
+);
+
+traits(
+  unique int id: @trait
+);
+
+#keyset[id]
+trait_assoc_item_lists(
+  int id: @trait ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+trait_attrs(
+  int id: @trait ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_generic_param_lists(
+  int id: @trait ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_is_auto(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_is_unsafe(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_names(
+  int id: @trait ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_type_bound_lists(
+  int id: @trait ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_visibilities(
+  int id: @trait ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_where_clauses(
+  int id: @trait ref,
+  int where_clause: @where_clause ref
+);
+
+trait_aliases(
+  unique int id: @trait_alias
+);
+
+#keyset[id, index]
+trait_alias_attrs(
+  int id: @trait_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_alias_generic_param_lists(
+  int id: @trait_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_alias_names(
+  int id: @trait_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_alias_type_bound_lists(
+  int id: @trait_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_alias_visibilities(
+  int id: @trait_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_alias_where_clauses(
+  int id: @trait_alias ref,
+  int where_clause: @where_clause ref
+);
+
+tuple_struct_pats(
+  unique int id: @tuple_struct_pat
+);
+
+#keyset[id, index]
+tuple_struct_pat_fields(
+  int id: @tuple_struct_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+uses(
+  unique int id: @use
+);
+
+#keyset[id, index]
+use_attrs(
+  int id: @use ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+use_use_trees(
+  int id: @use ref,
+  int use_tree: @use_tree ref
+);
+
+#keyset[id]
+use_visibilities(
+  int id: @use ref,
+  int visibility: @visibility ref
+);
+
+consts(
+  unique int id: @const
+);
+
+#keyset[id, index]
+const_attrs(
+  int id: @const ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_bodies(
+  int id: @const ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+const_generic_param_lists(
+  int id: @const ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+const_is_const(
+  int id: @const ref
+);
+
+#keyset[id]
+const_is_default(
+  int id: @const ref
+);
+
+#keyset[id]
+const_names(
+  int id: @const ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_type_reprs(
+  int id: @const ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+const_visibilities(
+  int id: @const ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+const_where_clauses(
+  int id: @const ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+const_has_implementation(
+  int id: @const ref
+);
+
+enums(
+  unique int id: @enum
+);
+
+#keyset[id, index]
+enum_attrs(
+  int id: @enum ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+enum_generic_param_lists(
+  int id: @enum ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+enum_names(
+  int id: @enum ref,
+  int name: @name ref
+);
+
+#keyset[id]
+enum_variant_lists(
+  int id: @enum ref,
+  int variant_list: @variant_list ref
+);
+
+#keyset[id]
+enum_visibilities(
+  int id: @enum ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+enum_where_clauses(
+  int id: @enum ref,
+  int where_clause: @where_clause ref
+);
+
+for_exprs(
+  unique int id: @for_expr
+);
+
+#keyset[id, index]
+for_expr_attrs(
+  int id: @for_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+for_expr_iterables(
+  int id: @for_expr ref,
+  int iterable: @expr ref
+);
+
+#keyset[id]
+for_expr_pats(
+  int id: @for_expr ref,
+  int pat: @pat ref
+);
+
+functions(
+  unique int id: @function
+);
+
+#keyset[id]
+function_abis(
+  int id: @function ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+function_bodies(
+  int id: @function ref,
+  int body: @block_expr ref
+);
+
+#keyset[id]
+function_generic_param_lists(
+  int id: @function ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+function_is_async(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_const(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_default(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_gen(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_unsafe(
+  int id: @function ref
+);
+
+#keyset[id]
+function_names(
+  int id: @function ref,
+  int name: @name ref
+);
+
+#keyset[id]
+function_ret_types(
+  int id: @function ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+function_visibilities(
+  int id: @function ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+function_where_clauses(
+  int id: @function ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+function_has_implementation(
+  int id: @function ref
+);
+
+loop_exprs(
+  unique int id: @loop_expr
+);
+
+#keyset[id, index]
+loop_expr_attrs(
+  int id: @loop_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+macro_calls(
+  unique int id: @macro_call
+);
+
+#keyset[id, index]
+macro_call_attrs(
+  int id: @macro_call ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_call_paths(
+  int id: @macro_call ref,
+  int path: @path ref
+);
+
+#keyset[id]
+macro_call_token_trees(
+  int id: @macro_call ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_call_macro_call_expansions(
+  int id: @macro_call ref,
+  int macro_call_expansion: @ast_node ref
+);
+
+statics(
+  unique int id: @static
+);
+
+#keyset[id, index]
+static_attrs(
+  int id: @static ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+static_bodies(
+  int id: @static ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+static_is_mut(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_static(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_unsafe(
+  int id: @static ref
+);
+
+#keyset[id]
+static_names(
+  int id: @static ref,
+  int name: @name ref
+);
+
+#keyset[id]
+static_type_reprs(
+  int id: @static ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+static_visibilities(
+  int id: @static ref,
+  int visibility: @visibility ref
+);
+
+structs(
+  unique int id: @struct
+);
+
+#keyset[id, index]
+struct_attrs(
+  int id: @struct ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_lists_(
+  int id: @struct ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+struct_generic_param_lists(
+  int id: @struct ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+struct_names(
+  int id: @struct ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_visibilities(
+  int id: @struct ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+struct_where_clauses(
+  int id: @struct ref,
+  int where_clause: @where_clause ref
+);
+
+type_aliases(
+  unique int id: @type_alias
+);
+
+#keyset[id, index]
+type_alias_attrs(
+  int id: @type_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_alias_generic_param_lists(
+  int id: @type_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_alias_is_default(
+  int id: @type_alias ref
+);
+
+#keyset[id]
+type_alias_names(
+  int id: @type_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_alias_type_reprs(
+  int id: @type_alias ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_alias_type_bound_lists(
+  int id: @type_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+type_alias_visibilities(
+  int id: @type_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_alias_where_clauses(
+  int id: @type_alias ref,
+  int where_clause: @where_clause ref
+);
+
+unions(
+  unique int id: @union
+);
+
+#keyset[id, index]
+union_attrs(
+  int id: @union ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+union_generic_param_lists(
+  int id: @union ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+union_names(
+  int id: @union ref,
+  int name: @name ref
+);
+
+#keyset[id]
+union_struct_field_lists(
+  int id: @union ref,
+  int struct_field_list: @struct_field_list ref
+);
+
+#keyset[id]
+union_visibilities(
+  int id: @union ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+union_where_clauses(
+  int id: @union ref,
+  int where_clause: @where_clause ref
+);
+
+while_exprs(
+  unique int id: @while_expr
+);
+
+#keyset[id, index]
+while_expr_attrs(
+  int id: @while_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+while_expr_conditions(
+  int id: @while_expr ref,
+  int condition: @expr ref
+);
diff --git a/rust/ql/lib/upgrades/b41e55c0dba14a139d01dbee713aca5efe5b818a/rust.dbscheme b/rust/ql/lib/upgrades/b41e55c0dba14a139d01dbee713aca5efe5b818a/rust.dbscheme
new file mode 100644
index 00000000000..dfade44a27b
--- /dev/null
+++ b/rust/ql/lib/upgrades/b41e55c0dba14a139d01dbee713aca5efe5b818a/rust.dbscheme
@@ -0,0 +1,3615 @@
+// generated by codegen, do not edit
+
+// from ../shared/tree-sitter-extractor/src/generator/prefix.dbscheme
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Empty location -*/
+
+empty_location(
+  int location: @location_default ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- Diagnostic messages: severity -*/
+
+case @diagnostic.severity of
+  10 = @diagnostic_debug
+| 20 = @diagnostic_info
+| 30 = @diagnostic_warning
+| 40 = @diagnostic_error
+;
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error;
+
+/*- Database metadata -*/
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+overlayChangedFiles(
+  string path: string ref
+);
+
+
+// from prefix.dbscheme
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_default ref
+);
+
+
+// from schema
+
+@element =
+  @extractor_step
+| @locatable
+| @named_crate
+| @unextracted
+;
+
+extractor_steps(
+  unique int id: @extractor_step,
+  string action: string ref,
+  int duration_ms: int ref
+);
+
+#keyset[id]
+extractor_step_files(
+  int id: @extractor_step ref,
+  int file: @file ref
+);
+
+@locatable =
+  @ast_node
+| @crate
+;
+
+named_crates(
+  unique int id: @named_crate,
+  string name: string ref,
+  int crate: @crate ref
+);
+
+@unextracted =
+  @missing
+| @unimplemented
+;
+
+@ast_node =
+  @abi
+| @addressable
+| @arg_list
+| @asm_dir_spec
+| @asm_operand
+| @asm_operand_expr
+| @asm_option
+| @asm_piece
+| @asm_reg_spec
+| @assoc_item_list
+| @attr
+| @callable
+| @expr
+| @extern_item_list
+| @field_list
+| @for_binder
+| @format_args_arg
+| @generic_arg
+| @generic_arg_list
+| @generic_param
+| @generic_param_list
+| @item_list
+| @label
+| @let_else
+| @macro_items
+| @match_arm
+| @match_arm_list
+| @match_guard
+| @meta
+| @name
+| @param_base
+| @param_list
+| @parenthesized_arg_list
+| @pat
+| @path
+| @path_ast_node
+| @path_segment
+| @rename
+| @ret_type_repr
+| @return_type_syntax
+| @source_file
+| @stmt
+| @stmt_list
+| @struct_expr_field
+| @struct_expr_field_list
+| @struct_field
+| @struct_pat_field
+| @struct_pat_field_list
+| @token
+| @token_tree
+| @tuple_field
+| @type_bound
+| @type_bound_list
+| @type_repr
+| @use_bound_generic_arg
+| @use_bound_generic_args
+| @use_tree
+| @use_tree_list
+| @variant_list
+| @visibility
+| @where_clause
+| @where_pred
+;
+
+crates(
+  unique int id: @crate
+);
+
+#keyset[id]
+crate_names(
+  int id: @crate ref,
+  string name: string ref
+);
+
+#keyset[id]
+crate_versions(
+  int id: @crate ref,
+  string version: string ref
+);
+
+#keyset[id, index]
+crate_cfg_options(
+  int id: @crate ref,
+  int index: int ref,
+  string cfg_option: string ref
+);
+
+#keyset[id, index]
+crate_named_dependencies(
+  int id: @crate ref,
+  int index: int ref,
+  int named_dependency: @named_crate ref
+);
+
+missings(
+  unique int id: @missing
+);
+
+unimplementeds(
+  unique int id: @unimplemented
+);
+
+abis(
+  unique int id: @abi
+);
+
+#keyset[id]
+abi_abi_strings(
+  int id: @abi ref,
+  string abi_string: string ref
+);
+
+@addressable =
+  @item
+| @variant
+;
+
+arg_lists(
+  unique int id: @arg_list
+);
+
+#keyset[id, index]
+arg_list_args(
+  int id: @arg_list ref,
+  int index: int ref,
+  int arg: @expr ref
+);
+
+asm_dir_specs(
+  unique int id: @asm_dir_spec
+);
+
+@asm_operand =
+  @asm_const
+| @asm_label
+| @asm_reg_operand
+| @asm_sym
+;
+
+asm_operand_exprs(
+  unique int id: @asm_operand_expr
+);
+
+#keyset[id]
+asm_operand_expr_in_exprs(
+  int id: @asm_operand_expr ref,
+  int in_expr: @expr ref
+);
+
+#keyset[id]
+asm_operand_expr_out_exprs(
+  int id: @asm_operand_expr ref,
+  int out_expr: @expr ref
+);
+
+asm_options(
+  unique int id: @asm_option
+);
+
+#keyset[id]
+asm_option_is_raw(
+  int id: @asm_option ref
+);
+
+@asm_piece =
+  @asm_clobber_abi
+| @asm_operand_named
+| @asm_options_list
+;
+
+asm_reg_specs(
+  unique int id: @asm_reg_spec
+);
+
+#keyset[id]
+asm_reg_spec_identifiers(
+  int id: @asm_reg_spec ref,
+  int identifier: @name_ref ref
+);
+
+assoc_item_lists(
+  unique int id: @assoc_item_list
+);
+
+#keyset[id, index]
+assoc_item_list_assoc_items(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int assoc_item: @assoc_item ref
+);
+
+#keyset[id, index]
+assoc_item_list_attrs(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+attrs(
+  unique int id: @attr
+);
+
+#keyset[id]
+attr_meta(
+  int id: @attr ref,
+  int meta: @meta ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_param_lists(
+  int id: @callable ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id, index]
+callable_attrs(
+  int id: @callable ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+@expr =
+  @array_expr_internal
+| @asm_expr
+| @await_expr
+| @become_expr
+| @binary_expr
+| @break_expr
+| @call_expr_base
+| @cast_expr
+| @closure_expr
+| @continue_expr
+| @field_expr
+| @format_args_expr
+| @if_expr
+| @index_expr
+| @labelable_expr
+| @let_expr
+| @literal_expr
+| @macro_block_expr
+| @macro_expr
+| @match_expr
+| @offset_of_expr
+| @paren_expr
+| @path_expr_base
+| @prefix_expr
+| @range_expr
+| @ref_expr
+| @return_expr
+| @struct_expr
+| @try_expr
+| @tuple_expr
+| @underscore_expr
+| @yeet_expr
+| @yield_expr
+;
+
+extern_item_lists(
+  unique int id: @extern_item_list
+);
+
+#keyset[id, index]
+extern_item_list_attrs(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+extern_item_list_extern_items(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int extern_item: @extern_item ref
+);
+
+@field_list =
+  @struct_field_list
+| @tuple_field_list
+;
+
+for_binders(
+  unique int id: @for_binder
+);
+
+#keyset[id]
+for_binder_generic_param_lists(
+  int id: @for_binder ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+format_args_args(
+  unique int id: @format_args_arg
+);
+
+#keyset[id]
+format_args_arg_exprs(
+  int id: @format_args_arg ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+format_args_arg_names(
+  int id: @format_args_arg ref,
+  int name: @name ref
+);
+
+@generic_arg =
+  @assoc_type_arg
+| @const_arg
+| @lifetime_arg
+| @type_arg
+;
+
+generic_arg_lists(
+  unique int id: @generic_arg_list
+);
+
+#keyset[id, index]
+generic_arg_list_generic_args(
+  int id: @generic_arg_list ref,
+  int index: int ref,
+  int generic_arg: @generic_arg ref
+);
+
+@generic_param =
+  @const_param
+| @lifetime_param
+| @type_param
+;
+
+generic_param_lists(
+  unique int id: @generic_param_list
+);
+
+#keyset[id, index]
+generic_param_list_generic_params(
+  int id: @generic_param_list ref,
+  int index: int ref,
+  int generic_param: @generic_param ref
+);
+
+item_lists(
+  unique int id: @item_list
+);
+
+#keyset[id, index]
+item_list_attrs(
+  int id: @item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+item_list_items(
+  int id: @item_list ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+labels(
+  unique int id: @label
+);
+
+#keyset[id]
+label_lifetimes(
+  int id: @label ref,
+  int lifetime: @lifetime ref
+);
+
+let_elses(
+  unique int id: @let_else
+);
+
+#keyset[id]
+let_else_block_exprs(
+  int id: @let_else ref,
+  int block_expr: @block_expr ref
+);
+
+macro_items(
+  unique int id: @macro_items
+);
+
+#keyset[id, index]
+macro_items_items(
+  int id: @macro_items ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+match_arms(
+  unique int id: @match_arm
+);
+
+#keyset[id, index]
+match_arm_attrs(
+  int id: @match_arm ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_arm_exprs(
+  int id: @match_arm ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+match_arm_guards(
+  int id: @match_arm ref,
+  int guard: @match_guard ref
+);
+
+#keyset[id]
+match_arm_pats(
+  int id: @match_arm ref,
+  int pat: @pat ref
+);
+
+match_arm_lists(
+  unique int id: @match_arm_list
+);
+
+#keyset[id, index]
+match_arm_list_arms(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int arm: @match_arm ref
+);
+
+#keyset[id, index]
+match_arm_list_attrs(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+match_guards(
+  unique int id: @match_guard
+);
+
+#keyset[id]
+match_guard_conditions(
+  int id: @match_guard ref,
+  int condition: @expr ref
+);
+
+meta(
+  unique int id: @meta
+);
+
+#keyset[id]
+meta_exprs(
+  int id: @meta ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+meta_is_unsafe(
+  int id: @meta ref
+);
+
+#keyset[id]
+meta_paths(
+  int id: @meta ref,
+  int path: @path ref
+);
+
+#keyset[id]
+meta_token_trees(
+  int id: @meta ref,
+  int token_tree: @token_tree ref
+);
+
+names(
+  unique int id: @name
+);
+
+#keyset[id]
+name_texts(
+  int id: @name ref,
+  string text: string ref
+);
+
+@param_base =
+  @param
+| @self_param
+;
+
+#keyset[id, index]
+param_base_attrs(
+  int id: @param_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+param_base_type_reprs(
+  int id: @param_base ref,
+  int type_repr: @type_repr ref
+);
+
+param_lists(
+  unique int id: @param_list
+);
+
+#keyset[id, index]
+param_list_params(
+  int id: @param_list ref,
+  int index: int ref,
+  int param: @param ref
+);
+
+#keyset[id]
+param_list_self_params(
+  int id: @param_list ref,
+  int self_param: @self_param ref
+);
+
+parenthesized_arg_lists(
+  unique int id: @parenthesized_arg_list
+);
+
+#keyset[id, index]
+parenthesized_arg_list_type_args(
+  int id: @parenthesized_arg_list ref,
+  int index: int ref,
+  int type_arg: @type_arg ref
+);
+
+@pat =
+  @box_pat
+| @const_block_pat
+| @ident_pat
+| @literal_pat
+| @macro_pat
+| @or_pat
+| @paren_pat
+| @path_pat
+| @range_pat
+| @ref_pat
+| @rest_pat
+| @slice_pat
+| @struct_pat
+| @tuple_pat
+| @tuple_struct_pat
+| @wildcard_pat
+;
+
+paths(
+  unique int id: @path
+);
+
+#keyset[id]
+path_qualifiers(
+  int id: @path ref,
+  int qualifier: @path ref
+);
+
+#keyset[id]
+path_segments_(
+  int id: @path ref,
+  int segment: @path_segment ref
+);
+
+@path_ast_node =
+  @path_expr
+| @path_pat
+| @struct_expr
+| @struct_pat
+| @tuple_struct_pat
+;
+
+#keyset[id]
+path_ast_node_paths(
+  int id: @path_ast_node ref,
+  int path: @path ref
+);
+
+path_segments(
+  unique int id: @path_segment
+);
+
+#keyset[id]
+path_segment_generic_arg_lists(
+  int id: @path_segment ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+path_segment_identifiers(
+  int id: @path_segment ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+path_segment_parenthesized_arg_lists(
+  int id: @path_segment ref,
+  int parenthesized_arg_list: @parenthesized_arg_list ref
+);
+
+#keyset[id]
+path_segment_ret_types(
+  int id: @path_segment ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+path_segment_return_type_syntaxes(
+  int id: @path_segment ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+path_segment_type_reprs(
+  int id: @path_segment ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+path_segment_trait_type_reprs(
+  int id: @path_segment ref,
+  int trait_type_repr: @path_type_repr ref
+);
+
+renames(
+  unique int id: @rename
+);
+
+#keyset[id]
+rename_names(
+  int id: @rename ref,
+  int name: @name ref
+);
+
+ret_type_reprs(
+  unique int id: @ret_type_repr
+);
+
+#keyset[id]
+ret_type_repr_type_reprs(
+  int id: @ret_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+return_type_syntaxes(
+  unique int id: @return_type_syntax
+);
+
+source_files(
+  unique int id: @source_file
+);
+
+#keyset[id, index]
+source_file_attrs(
+  int id: @source_file ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+source_file_items(
+  int id: @source_file ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+@stmt =
+  @expr_stmt
+| @item
+| @let_stmt
+;
+
+stmt_lists(
+  unique int id: @stmt_list
+);
+
+#keyset[id, index]
+stmt_list_attrs(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+stmt_list_statements(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+stmt_list_tail_exprs(
+  int id: @stmt_list ref,
+  int tail_expr: @expr ref
+);
+
+struct_expr_fields(
+  unique int id: @struct_expr_field
+);
+
+#keyset[id, index]
+struct_expr_field_attrs(
+  int id: @struct_expr_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_expr_field_exprs(
+  int id: @struct_expr_field ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+struct_expr_field_identifiers(
+  int id: @struct_expr_field ref,
+  int identifier: @name_ref ref
+);
+
+struct_expr_field_lists(
+  unique int id: @struct_expr_field_list
+);
+
+#keyset[id, index]
+struct_expr_field_list_attrs(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+struct_expr_field_list_fields(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int field: @struct_expr_field ref
+);
+
+#keyset[id]
+struct_expr_field_list_spreads(
+  int id: @struct_expr_field_list ref,
+  int spread: @expr ref
+);
+
+struct_fields(
+  unique int id: @struct_field
+);
+
+#keyset[id, index]
+struct_field_attrs(
+  int id: @struct_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_defaults(
+  int id: @struct_field ref,
+  int default: @expr ref
+);
+
+#keyset[id]
+struct_field_is_unsafe(
+  int id: @struct_field ref
+);
+
+#keyset[id]
+struct_field_names(
+  int id: @struct_field ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_field_type_reprs(
+  int id: @struct_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+struct_field_visibilities(
+  int id: @struct_field ref,
+  int visibility: @visibility ref
+);
+
+struct_pat_fields(
+  unique int id: @struct_pat_field
+);
+
+#keyset[id, index]
+struct_pat_field_attrs(
+  int id: @struct_pat_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_pat_field_identifiers(
+  int id: @struct_pat_field ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+struct_pat_field_pats(
+  int id: @struct_pat_field ref,
+  int pat: @pat ref
+);
+
+struct_pat_field_lists(
+  unique int id: @struct_pat_field_list
+);
+
+#keyset[id, index]
+struct_pat_field_list_fields(
+  int id: @struct_pat_field_list ref,
+  int index: int ref,
+  int field: @struct_pat_field ref
+);
+
+#keyset[id]
+struct_pat_field_list_rest_pats(
+  int id: @struct_pat_field_list ref,
+  int rest_pat: @rest_pat ref
+);
+
+@token =
+  @comment
+;
+
+token_trees(
+  unique int id: @token_tree
+);
+
+tuple_fields(
+  unique int id: @tuple_field
+);
+
+#keyset[id, index]
+tuple_field_attrs(
+  int id: @tuple_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+tuple_field_type_reprs(
+  int id: @tuple_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+tuple_field_visibilities(
+  int id: @tuple_field ref,
+  int visibility: @visibility ref
+);
+
+type_bounds(
+  unique int id: @type_bound
+);
+
+#keyset[id]
+type_bound_for_binders(
+  int id: @type_bound ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+type_bound_is_async(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_is_const(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_lifetimes(
+  int id: @type_bound ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+type_bound_type_reprs(
+  int id: @type_bound ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_bound_use_bound_generic_args(
+  int id: @type_bound ref,
+  int use_bound_generic_args: @use_bound_generic_args ref
+);
+
+type_bound_lists(
+  unique int id: @type_bound_list
+);
+
+#keyset[id, index]
+type_bound_list_bounds(
+  int id: @type_bound_list ref,
+  int index: int ref,
+  int bound: @type_bound ref
+);
+
+@type_repr =
+  @array_type_repr
+| @dyn_trait_type_repr
+| @fn_ptr_type_repr
+| @for_type_repr
+| @impl_trait_type_repr
+| @infer_type_repr
+| @macro_type_repr
+| @never_type_repr
+| @paren_type_repr
+| @path_type_repr
+| @ptr_type_repr
+| @ref_type_repr
+| @slice_type_repr
+| @tuple_type_repr
+;
+
+@use_bound_generic_arg =
+  @lifetime
+| @name_ref
+;
+
+use_bound_generic_args(
+  unique int id: @use_bound_generic_args
+);
+
+#keyset[id, index]
+use_bound_generic_args_use_bound_generic_args(
+  int id: @use_bound_generic_args ref,
+  int index: int ref,
+  int use_bound_generic_arg: @use_bound_generic_arg ref
+);
+
+use_trees(
+  unique int id: @use_tree
+);
+
+#keyset[id]
+use_tree_is_glob(
+  int id: @use_tree ref
+);
+
+#keyset[id]
+use_tree_paths(
+  int id: @use_tree ref,
+  int path: @path ref
+);
+
+#keyset[id]
+use_tree_renames(
+  int id: @use_tree ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+use_tree_use_tree_lists(
+  int id: @use_tree ref,
+  int use_tree_list: @use_tree_list ref
+);
+
+use_tree_lists(
+  unique int id: @use_tree_list
+);
+
+#keyset[id, index]
+use_tree_list_use_trees(
+  int id: @use_tree_list ref,
+  int index: int ref,
+  int use_tree: @use_tree ref
+);
+
+variant_lists(
+  unique int id: @variant_list
+);
+
+#keyset[id, index]
+variant_list_variants(
+  int id: @variant_list ref,
+  int index: int ref,
+  int variant: @variant ref
+);
+
+visibilities(
+  unique int id: @visibility
+);
+
+#keyset[id]
+visibility_paths(
+  int id: @visibility ref,
+  int path: @path ref
+);
+
+where_clauses(
+  unique int id: @where_clause
+);
+
+#keyset[id, index]
+where_clause_predicates(
+  int id: @where_clause ref,
+  int index: int ref,
+  int predicate: @where_pred ref
+);
+
+where_preds(
+  unique int id: @where_pred
+);
+
+#keyset[id]
+where_pred_for_binders(
+  int id: @where_pred ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+where_pred_lifetimes(
+  int id: @where_pred ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+where_pred_type_reprs(
+  int id: @where_pred ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+where_pred_type_bound_lists(
+  int id: @where_pred ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+array_expr_internals(
+  unique int id: @array_expr_internal
+);
+
+#keyset[id, index]
+array_expr_internal_attrs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+array_expr_internal_exprs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+array_expr_internal_is_semicolon(
+  int id: @array_expr_internal ref
+);
+
+array_type_reprs(
+  unique int id: @array_type_repr
+);
+
+#keyset[id]
+array_type_repr_const_args(
+  int id: @array_type_repr ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+array_type_repr_element_type_reprs(
+  int id: @array_type_repr ref,
+  int element_type_repr: @type_repr ref
+);
+
+asm_clobber_abis(
+  unique int id: @asm_clobber_abi
+);
+
+asm_consts(
+  unique int id: @asm_const
+);
+
+#keyset[id]
+asm_const_exprs(
+  int id: @asm_const ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+asm_const_is_const(
+  int id: @asm_const ref
+);
+
+asm_labels(
+  unique int id: @asm_label
+);
+
+#keyset[id]
+asm_label_block_exprs(
+  int id: @asm_label ref,
+  int block_expr: @block_expr ref
+);
+
+asm_operand_nameds(
+  unique int id: @asm_operand_named
+);
+
+#keyset[id]
+asm_operand_named_asm_operands(
+  int id: @asm_operand_named ref,
+  int asm_operand: @asm_operand ref
+);
+
+#keyset[id]
+asm_operand_named_names(
+  int id: @asm_operand_named ref,
+  int name: @name ref
+);
+
+asm_options_lists(
+  unique int id: @asm_options_list
+);
+
+#keyset[id, index]
+asm_options_list_asm_options(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int asm_option: @asm_option ref
+);
+
+asm_reg_operands(
+  unique int id: @asm_reg_operand
+);
+
+#keyset[id]
+asm_reg_operand_asm_dir_specs(
+  int id: @asm_reg_operand ref,
+  int asm_dir_spec: @asm_dir_spec ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_operand_exprs(
+  int id: @asm_reg_operand ref,
+  int asm_operand_expr: @asm_operand_expr ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_reg_specs(
+  int id: @asm_reg_operand ref,
+  int asm_reg_spec: @asm_reg_spec ref
+);
+
+asm_syms(
+  unique int id: @asm_sym
+);
+
+#keyset[id]
+asm_sym_paths(
+  int id: @asm_sym ref,
+  int path: @path ref
+);
+
+assoc_type_args(
+  unique int id: @assoc_type_arg
+);
+
+#keyset[id]
+assoc_type_arg_const_args(
+  int id: @assoc_type_arg ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+assoc_type_arg_generic_arg_lists(
+  int id: @assoc_type_arg ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+assoc_type_arg_identifiers(
+  int id: @assoc_type_arg ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+assoc_type_arg_param_lists(
+  int id: @assoc_type_arg ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+assoc_type_arg_ret_types(
+  int id: @assoc_type_arg ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_return_type_syntaxes(
+  int id: @assoc_type_arg ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+assoc_type_arg_type_reprs(
+  int id: @assoc_type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_type_bound_lists(
+  int id: @assoc_type_arg ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+await_exprs(
+  unique int id: @await_expr
+);
+
+#keyset[id, index]
+await_expr_attrs(
+  int id: @await_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+await_expr_exprs(
+  int id: @await_expr ref,
+  int expr: @expr ref
+);
+
+become_exprs(
+  unique int id: @become_expr
+);
+
+#keyset[id, index]
+become_expr_attrs(
+  int id: @become_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+become_expr_exprs(
+  int id: @become_expr ref,
+  int expr: @expr ref
+);
+
+binary_exprs(
+  unique int id: @binary_expr
+);
+
+#keyset[id, index]
+binary_expr_attrs(
+  int id: @binary_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+binary_expr_lhs(
+  int id: @binary_expr ref,
+  int lhs: @expr ref
+);
+
+#keyset[id]
+binary_expr_operator_names(
+  int id: @binary_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+binary_expr_rhs(
+  int id: @binary_expr ref,
+  int rhs: @expr ref
+);
+
+box_pats(
+  unique int id: @box_pat
+);
+
+#keyset[id]
+box_pat_pats(
+  int id: @box_pat ref,
+  int pat: @pat ref
+);
+
+break_exprs(
+  unique int id: @break_expr
+);
+
+#keyset[id, index]
+break_expr_attrs(
+  int id: @break_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+break_expr_exprs(
+  int id: @break_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+break_expr_lifetimes(
+  int id: @break_expr ref,
+  int lifetime: @lifetime ref
+);
+
+@call_expr_base =
+  @call_expr
+| @method_call_expr
+;
+
+#keyset[id]
+call_expr_base_arg_lists(
+  int id: @call_expr_base ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+call_expr_base_attrs(
+  int id: @call_expr_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+cast_exprs(
+  unique int id: @cast_expr
+);
+
+#keyset[id, index]
+cast_expr_attrs(
+  int id: @cast_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+cast_expr_exprs(
+  int id: @cast_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+cast_expr_type_reprs(
+  int id: @cast_expr ref,
+  int type_repr: @type_repr ref
+);
+
+closure_exprs(
+  unique int id: @closure_expr
+);
+
+#keyset[id]
+closure_expr_bodies(
+  int id: @closure_expr ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+closure_expr_for_binders(
+  int id: @closure_expr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+closure_expr_is_async(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_const(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_gen(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_move(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_static(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_ret_types(
+  int id: @closure_expr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+comments(
+  unique int id: @comment,
+  int parent: @ast_node ref,
+  string text: string ref
+);
+
+const_args(
+  unique int id: @const_arg
+);
+
+#keyset[id]
+const_arg_exprs(
+  int id: @const_arg ref,
+  int expr: @expr ref
+);
+
+const_block_pats(
+  unique int id: @const_block_pat
+);
+
+#keyset[id]
+const_block_pat_block_exprs(
+  int id: @const_block_pat ref,
+  int block_expr: @block_expr ref
+);
+
+#keyset[id]
+const_block_pat_is_const(
+  int id: @const_block_pat ref
+);
+
+const_params(
+  unique int id: @const_param
+);
+
+#keyset[id, index]
+const_param_attrs(
+  int id: @const_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_param_default_vals(
+  int id: @const_param ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+const_param_is_const(
+  int id: @const_param ref
+);
+
+#keyset[id]
+const_param_names(
+  int id: @const_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_param_type_reprs(
+  int id: @const_param ref,
+  int type_repr: @type_repr ref
+);
+
+continue_exprs(
+  unique int id: @continue_expr
+);
+
+#keyset[id, index]
+continue_expr_attrs(
+  int id: @continue_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+continue_expr_lifetimes(
+  int id: @continue_expr ref,
+  int lifetime: @lifetime ref
+);
+
+dyn_trait_type_reprs(
+  unique int id: @dyn_trait_type_repr
+);
+
+#keyset[id]
+dyn_trait_type_repr_type_bound_lists(
+  int id: @dyn_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+expr_stmts(
+  unique int id: @expr_stmt
+);
+
+#keyset[id]
+expr_stmt_exprs(
+  int id: @expr_stmt ref,
+  int expr: @expr ref
+);
+
+field_exprs(
+  unique int id: @field_expr
+);
+
+#keyset[id, index]
+field_expr_attrs(
+  int id: @field_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+field_expr_containers(
+  int id: @field_expr ref,
+  int container: @expr ref
+);
+
+#keyset[id]
+field_expr_identifiers(
+  int id: @field_expr ref,
+  int identifier: @name_ref ref
+);
+
+fn_ptr_type_reprs(
+  unique int id: @fn_ptr_type_repr
+);
+
+#keyset[id]
+fn_ptr_type_repr_abis(
+  int id: @fn_ptr_type_repr ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_async(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_const(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_unsafe(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_param_lists(
+  int id: @fn_ptr_type_repr ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_ret_types(
+  int id: @fn_ptr_type_repr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+for_type_reprs(
+  unique int id: @for_type_repr
+);
+
+#keyset[id]
+for_type_repr_for_binders(
+  int id: @for_type_repr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+for_type_repr_type_reprs(
+  int id: @for_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+format_args_exprs(
+  unique int id: @format_args_expr
+);
+
+#keyset[id, index]
+format_args_expr_args(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int arg: @format_args_arg ref
+);
+
+#keyset[id, index]
+format_args_expr_attrs(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+format_args_expr_templates(
+  int id: @format_args_expr ref,
+  int template: @expr ref
+);
+
+ident_pats(
+  unique int id: @ident_pat
+);
+
+#keyset[id, index]
+ident_pat_attrs(
+  int id: @ident_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ident_pat_is_mut(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_is_ref(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_names(
+  int id: @ident_pat ref,
+  int name: @name ref
+);
+
+#keyset[id]
+ident_pat_pats(
+  int id: @ident_pat ref,
+  int pat: @pat ref
+);
+
+if_exprs(
+  unique int id: @if_expr
+);
+
+#keyset[id, index]
+if_expr_attrs(
+  int id: @if_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+if_expr_conditions(
+  int id: @if_expr ref,
+  int condition: @expr ref
+);
+
+#keyset[id]
+if_expr_elses(
+  int id: @if_expr ref,
+  int else: @expr ref
+);
+
+#keyset[id]
+if_expr_thens(
+  int id: @if_expr ref,
+  int then: @block_expr ref
+);
+
+impl_trait_type_reprs(
+  unique int id: @impl_trait_type_repr
+);
+
+#keyset[id]
+impl_trait_type_repr_type_bound_lists(
+  int id: @impl_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+index_exprs(
+  unique int id: @index_expr
+);
+
+#keyset[id, index]
+index_expr_attrs(
+  int id: @index_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+index_expr_bases(
+  int id: @index_expr ref,
+  int base: @expr ref
+);
+
+#keyset[id]
+index_expr_indices(
+  int id: @index_expr ref,
+  int index: @expr ref
+);
+
+infer_type_reprs(
+  unique int id: @infer_type_repr
+);
+
+@item =
+  @adt
+| @asm_expr
+| @assoc_item
+| @extern_block
+| @extern_crate
+| @extern_item
+| @impl
+| @macro_def
+| @macro_rules
+| @module
+| @trait
+| @trait_alias
+| @use
+;
+
+#keyset[id]
+item_attribute_macro_expansions(
+  int id: @item ref,
+  int attribute_macro_expansion: @macro_items ref
+);
+
+@labelable_expr =
+  @block_expr
+| @looping_expr
+;
+
+#keyset[id]
+labelable_expr_labels(
+  int id: @labelable_expr ref,
+  int label: @label ref
+);
+
+let_exprs(
+  unique int id: @let_expr
+);
+
+#keyset[id, index]
+let_expr_attrs(
+  int id: @let_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_expr_scrutinees(
+  int id: @let_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+let_expr_pats(
+  int id: @let_expr ref,
+  int pat: @pat ref
+);
+
+let_stmts(
+  unique int id: @let_stmt
+);
+
+#keyset[id, index]
+let_stmt_attrs(
+  int id: @let_stmt ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_stmt_initializers(
+  int id: @let_stmt ref,
+  int initializer: @expr ref
+);
+
+#keyset[id]
+let_stmt_let_elses(
+  int id: @let_stmt ref,
+  int let_else: @let_else ref
+);
+
+#keyset[id]
+let_stmt_pats(
+  int id: @let_stmt ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+let_stmt_type_reprs(
+  int id: @let_stmt ref,
+  int type_repr: @type_repr ref
+);
+
+lifetimes(
+  unique int id: @lifetime
+);
+
+#keyset[id]
+lifetime_texts(
+  int id: @lifetime ref,
+  string text: string ref
+);
+
+lifetime_args(
+  unique int id: @lifetime_arg
+);
+
+#keyset[id]
+lifetime_arg_lifetimes(
+  int id: @lifetime_arg ref,
+  int lifetime: @lifetime ref
+);
+
+lifetime_params(
+  unique int id: @lifetime_param
+);
+
+#keyset[id, index]
+lifetime_param_attrs(
+  int id: @lifetime_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+lifetime_param_lifetimes(
+  int id: @lifetime_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+lifetime_param_type_bound_lists(
+  int id: @lifetime_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+literal_exprs(
+  unique int id: @literal_expr
+);
+
+#keyset[id, index]
+literal_expr_attrs(
+  int id: @literal_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+literal_expr_text_values(
+  int id: @literal_expr ref,
+  string text_value: string ref
+);
+
+literal_pats(
+  unique int id: @literal_pat
+);
+
+#keyset[id]
+literal_pat_literals(
+  int id: @literal_pat ref,
+  int literal: @literal_expr ref
+);
+
+macro_block_exprs(
+  unique int id: @macro_block_expr
+);
+
+#keyset[id, index]
+macro_block_expr_statements(
+  int id: @macro_block_expr ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+macro_block_expr_tail_exprs(
+  int id: @macro_block_expr ref,
+  int tail_expr: @expr ref
+);
+
+macro_exprs(
+  unique int id: @macro_expr
+);
+
+#keyset[id]
+macro_expr_macro_calls(
+  int id: @macro_expr ref,
+  int macro_call: @macro_call ref
+);
+
+macro_pats(
+  unique int id: @macro_pat
+);
+
+#keyset[id]
+macro_pat_macro_calls(
+  int id: @macro_pat ref,
+  int macro_call: @macro_call ref
+);
+
+macro_type_reprs(
+  unique int id: @macro_type_repr
+);
+
+#keyset[id]
+macro_type_repr_macro_calls(
+  int id: @macro_type_repr ref,
+  int macro_call: @macro_call ref
+);
+
+match_exprs(
+  unique int id: @match_expr
+);
+
+#keyset[id, index]
+match_expr_attrs(
+  int id: @match_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_expr_scrutinees(
+  int id: @match_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+match_expr_match_arm_lists(
+  int id: @match_expr ref,
+  int match_arm_list: @match_arm_list ref
+);
+
+name_refs(
+  unique int id: @name_ref
+);
+
+#keyset[id]
+name_ref_texts(
+  int id: @name_ref ref,
+  string text: string ref
+);
+
+never_type_reprs(
+  unique int id: @never_type_repr
+);
+
+offset_of_exprs(
+  unique int id: @offset_of_expr
+);
+
+#keyset[id, index]
+offset_of_expr_attrs(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+offset_of_expr_fields(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int field: @name_ref ref
+);
+
+#keyset[id]
+offset_of_expr_type_reprs(
+  int id: @offset_of_expr ref,
+  int type_repr: @type_repr ref
+);
+
+or_pats(
+  unique int id: @or_pat
+);
+
+#keyset[id, index]
+or_pat_pats(
+  int id: @or_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+params(
+  unique int id: @param
+);
+
+#keyset[id]
+param_pats(
+  int id: @param ref,
+  int pat: @pat ref
+);
+
+paren_exprs(
+  unique int id: @paren_expr
+);
+
+#keyset[id, index]
+paren_expr_attrs(
+  int id: @paren_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+paren_expr_exprs(
+  int id: @paren_expr ref,
+  int expr: @expr ref
+);
+
+paren_pats(
+  unique int id: @paren_pat
+);
+
+#keyset[id]
+paren_pat_pats(
+  int id: @paren_pat ref,
+  int pat: @pat ref
+);
+
+paren_type_reprs(
+  unique int id: @paren_type_repr
+);
+
+#keyset[id]
+paren_type_repr_type_reprs(
+  int id: @paren_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+@path_expr_base =
+  @path_expr
+;
+
+path_pats(
+  unique int id: @path_pat
+);
+
+path_type_reprs(
+  unique int id: @path_type_repr
+);
+
+#keyset[id]
+path_type_repr_paths(
+  int id: @path_type_repr ref,
+  int path: @path ref
+);
+
+prefix_exprs(
+  unique int id: @prefix_expr
+);
+
+#keyset[id, index]
+prefix_expr_attrs(
+  int id: @prefix_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+prefix_expr_exprs(
+  int id: @prefix_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+prefix_expr_operator_names(
+  int id: @prefix_expr ref,
+  string operator_name: string ref
+);
+
+ptr_type_reprs(
+  unique int id: @ptr_type_repr
+);
+
+#keyset[id]
+ptr_type_repr_is_const(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_is_mut(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_type_reprs(
+  int id: @ptr_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+range_exprs(
+  unique int id: @range_expr
+);
+
+#keyset[id, index]
+range_expr_attrs(
+  int id: @range_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+range_expr_ends(
+  int id: @range_expr ref,
+  int end: @expr ref
+);
+
+#keyset[id]
+range_expr_operator_names(
+  int id: @range_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_expr_starts(
+  int id: @range_expr ref,
+  int start: @expr ref
+);
+
+range_pats(
+  unique int id: @range_pat
+);
+
+#keyset[id]
+range_pat_ends(
+  int id: @range_pat ref,
+  int end: @pat ref
+);
+
+#keyset[id]
+range_pat_operator_names(
+  int id: @range_pat ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_pat_starts(
+  int id: @range_pat ref,
+  int start: @pat ref
+);
+
+ref_exprs(
+  unique int id: @ref_expr
+);
+
+#keyset[id, index]
+ref_expr_attrs(
+  int id: @ref_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ref_expr_exprs(
+  int id: @ref_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+ref_expr_is_const(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_mut(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_raw(
+  int id: @ref_expr ref
+);
+
+ref_pats(
+  unique int id: @ref_pat
+);
+
+#keyset[id]
+ref_pat_is_mut(
+  int id: @ref_pat ref
+);
+
+#keyset[id]
+ref_pat_pats(
+  int id: @ref_pat ref,
+  int pat: @pat ref
+);
+
+ref_type_reprs(
+  unique int id: @ref_type_repr
+);
+
+#keyset[id]
+ref_type_repr_is_mut(
+  int id: @ref_type_repr ref
+);
+
+#keyset[id]
+ref_type_repr_lifetimes(
+  int id: @ref_type_repr ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+ref_type_repr_type_reprs(
+  int id: @ref_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+rest_pats(
+  unique int id: @rest_pat
+);
+
+#keyset[id, index]
+rest_pat_attrs(
+  int id: @rest_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+return_exprs(
+  unique int id: @return_expr
+);
+
+#keyset[id, index]
+return_expr_attrs(
+  int id: @return_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+return_expr_exprs(
+  int id: @return_expr ref,
+  int expr: @expr ref
+);
+
+self_params(
+  unique int id: @self_param
+);
+
+#keyset[id]
+self_param_is_ref(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_is_mut(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_lifetimes(
+  int id: @self_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+self_param_names(
+  int id: @self_param ref,
+  int name: @name ref
+);
+
+slice_pats(
+  unique int id: @slice_pat
+);
+
+#keyset[id, index]
+slice_pat_pats(
+  int id: @slice_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+slice_type_reprs(
+  unique int id: @slice_type_repr
+);
+
+#keyset[id]
+slice_type_repr_type_reprs(
+  int id: @slice_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+struct_exprs(
+  unique int id: @struct_expr
+);
+
+#keyset[id]
+struct_expr_struct_expr_field_lists(
+  int id: @struct_expr ref,
+  int struct_expr_field_list: @struct_expr_field_list ref
+);
+
+struct_field_lists(
+  unique int id: @struct_field_list
+);
+
+#keyset[id, index]
+struct_field_list_fields(
+  int id: @struct_field_list ref,
+  int index: int ref,
+  int field: @struct_field ref
+);
+
+struct_pats(
+  unique int id: @struct_pat
+);
+
+#keyset[id]
+struct_pat_struct_pat_field_lists(
+  int id: @struct_pat ref,
+  int struct_pat_field_list: @struct_pat_field_list ref
+);
+
+try_exprs(
+  unique int id: @try_expr
+);
+
+#keyset[id, index]
+try_expr_attrs(
+  int id: @try_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+try_expr_exprs(
+  int id: @try_expr ref,
+  int expr: @expr ref
+);
+
+tuple_exprs(
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_attrs(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+tuple_expr_fields(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int field: @expr ref
+);
+
+tuple_field_lists(
+  unique int id: @tuple_field_list
+);
+
+#keyset[id, index]
+tuple_field_list_fields(
+  int id: @tuple_field_list ref,
+  int index: int ref,
+  int field: @tuple_field ref
+);
+
+tuple_pats(
+  unique int id: @tuple_pat
+);
+
+#keyset[id, index]
+tuple_pat_fields(
+  int id: @tuple_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_struct_pats(
+  unique int id: @tuple_struct_pat
+);
+
+#keyset[id, index]
+tuple_struct_pat_fields(
+  int id: @tuple_struct_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_type_reprs(
+  unique int id: @tuple_type_repr
+);
+
+#keyset[id, index]
+tuple_type_repr_fields(
+  int id: @tuple_type_repr ref,
+  int index: int ref,
+  int field: @type_repr ref
+);
+
+type_args(
+  unique int id: @type_arg
+);
+
+#keyset[id]
+type_arg_type_reprs(
+  int id: @type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+type_params(
+  unique int id: @type_param
+);
+
+#keyset[id, index]
+type_param_attrs(
+  int id: @type_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_param_default_types(
+  int id: @type_param ref,
+  int default_type: @type_repr ref
+);
+
+#keyset[id]
+type_param_names(
+  int id: @type_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_param_type_bound_lists(
+  int id: @type_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+underscore_exprs(
+  unique int id: @underscore_expr
+);
+
+#keyset[id, index]
+underscore_expr_attrs(
+  int id: @underscore_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+variants(
+  unique int id: @variant
+);
+
+#keyset[id, index]
+variant_attrs(
+  int id: @variant ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+variant_discriminants(
+  int id: @variant ref,
+  int discriminant: @expr ref
+);
+
+#keyset[id]
+variant_field_lists(
+  int id: @variant ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+variant_names(
+  int id: @variant ref,
+  int name: @name ref
+);
+
+#keyset[id]
+variant_visibilities(
+  int id: @variant ref,
+  int visibility: @visibility ref
+);
+
+wildcard_pats(
+  unique int id: @wildcard_pat
+);
+
+yeet_exprs(
+  unique int id: @yeet_expr
+);
+
+#keyset[id, index]
+yeet_expr_attrs(
+  int id: @yeet_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yeet_expr_exprs(
+  int id: @yeet_expr ref,
+  int expr: @expr ref
+);
+
+yield_exprs(
+  unique int id: @yield_expr
+);
+
+#keyset[id, index]
+yield_expr_attrs(
+  int id: @yield_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yield_expr_exprs(
+  int id: @yield_expr ref,
+  int expr: @expr ref
+);
+
+@adt =
+  @enum
+| @struct
+| @union
+;
+
+#keyset[id, index]
+adt_derive_macro_expansions(
+  int id: @adt ref,
+  int index: int ref,
+  int derive_macro_expansion: @macro_items ref
+);
+
+asm_exprs(
+  unique int id: @asm_expr
+);
+
+#keyset[id, index]
+asm_expr_asm_pieces(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int asm_piece: @asm_piece ref
+);
+
+#keyset[id, index]
+asm_expr_attrs(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+asm_expr_templates(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int template: @expr ref
+);
+
+@assoc_item =
+  @const
+| @function
+| @macro_call
+| @type_alias
+;
+
+block_exprs(
+  unique int id: @block_expr
+);
+
+#keyset[id, index]
+block_expr_attrs(
+  int id: @block_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+block_expr_is_async(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_const(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_gen(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_move(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_try(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_unsafe(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_stmt_lists(
+  int id: @block_expr ref,
+  int stmt_list: @stmt_list ref
+);
+
+call_exprs(
+  unique int id: @call_expr
+);
+
+#keyset[id]
+call_expr_functions(
+  int id: @call_expr ref,
+  int function: @expr ref
+);
+
+extern_blocks(
+  unique int id: @extern_block
+);
+
+#keyset[id]
+extern_block_abis(
+  int id: @extern_block ref,
+  int abi: @abi ref
+);
+
+#keyset[id, index]
+extern_block_attrs(
+  int id: @extern_block ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_block_extern_item_lists(
+  int id: @extern_block ref,
+  int extern_item_list: @extern_item_list ref
+);
+
+#keyset[id]
+extern_block_is_unsafe(
+  int id: @extern_block ref
+);
+
+extern_crates(
+  unique int id: @extern_crate
+);
+
+#keyset[id, index]
+extern_crate_attrs(
+  int id: @extern_crate ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_crate_identifiers(
+  int id: @extern_crate ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+extern_crate_renames(
+  int id: @extern_crate ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+extern_crate_visibilities(
+  int id: @extern_crate ref,
+  int visibility: @visibility ref
+);
+
+@extern_item =
+  @function
+| @macro_call
+| @static
+| @type_alias
+;
+
+impls(
+  unique int id: @impl
+);
+
+#keyset[id]
+impl_assoc_item_lists(
+  int id: @impl ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+impl_attrs(
+  int id: @impl ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+impl_generic_param_lists(
+  int id: @impl ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+impl_is_const(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_default(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_unsafe(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_self_ties(
+  int id: @impl ref,
+  int self_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_traits(
+  int id: @impl ref,
+  int trait: @type_repr ref
+);
+
+#keyset[id]
+impl_visibilities(
+  int id: @impl ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+impl_where_clauses(
+  int id: @impl ref,
+  int where_clause: @where_clause ref
+);
+
+@looping_expr =
+  @for_expr
+| @loop_expr
+| @while_expr
+;
+
+#keyset[id]
+looping_expr_loop_bodies(
+  int id: @looping_expr ref,
+  int loop_body: @block_expr ref
+);
+
+macro_defs(
+  unique int id: @macro_def
+);
+
+#keyset[id]
+macro_def_args(
+  int id: @macro_def ref,
+  int args: @token_tree ref
+);
+
+#keyset[id, index]
+macro_def_attrs(
+  int id: @macro_def ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_def_bodies(
+  int id: @macro_def ref,
+  int body: @token_tree ref
+);
+
+#keyset[id]
+macro_def_names(
+  int id: @macro_def ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_def_visibilities(
+  int id: @macro_def ref,
+  int visibility: @visibility ref
+);
+
+macro_rules(
+  unique int id: @macro_rules
+);
+
+#keyset[id, index]
+macro_rules_attrs(
+  int id: @macro_rules ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_rules_names(
+  int id: @macro_rules ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_rules_token_trees(
+  int id: @macro_rules ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_rules_visibilities(
+  int id: @macro_rules ref,
+  int visibility: @visibility ref
+);
+
+method_call_exprs(
+  unique int id: @method_call_expr
+);
+
+#keyset[id]
+method_call_expr_generic_arg_lists(
+  int id: @method_call_expr ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+method_call_expr_identifiers(
+  int id: @method_call_expr ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+method_call_expr_receivers(
+  int id: @method_call_expr ref,
+  int receiver: @expr ref
+);
+
+modules(
+  unique int id: @module
+);
+
+#keyset[id, index]
+module_attrs(
+  int id: @module ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+module_item_lists(
+  int id: @module ref,
+  int item_list: @item_list ref
+);
+
+#keyset[id]
+module_names(
+  int id: @module ref,
+  int name: @name ref
+);
+
+#keyset[id]
+module_visibilities(
+  int id: @module ref,
+  int visibility: @visibility ref
+);
+
+path_exprs(
+  unique int id: @path_expr
+);
+
+#keyset[id, index]
+path_expr_attrs(
+  int id: @path_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+traits(
+  unique int id: @trait
+);
+
+#keyset[id]
+trait_assoc_item_lists(
+  int id: @trait ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+trait_attrs(
+  int id: @trait ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_generic_param_lists(
+  int id: @trait ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_is_auto(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_is_unsafe(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_names(
+  int id: @trait ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_type_bound_lists(
+  int id: @trait ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_visibilities(
+  int id: @trait ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_where_clauses(
+  int id: @trait ref,
+  int where_clause: @where_clause ref
+);
+
+trait_aliases(
+  unique int id: @trait_alias
+);
+
+#keyset[id, index]
+trait_alias_attrs(
+  int id: @trait_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_alias_generic_param_lists(
+  int id: @trait_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_alias_names(
+  int id: @trait_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_alias_type_bound_lists(
+  int id: @trait_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_alias_visibilities(
+  int id: @trait_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_alias_where_clauses(
+  int id: @trait_alias ref,
+  int where_clause: @where_clause ref
+);
+
+uses(
+  unique int id: @use
+);
+
+#keyset[id, index]
+use_attrs(
+  int id: @use ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+use_use_trees(
+  int id: @use ref,
+  int use_tree: @use_tree ref
+);
+
+#keyset[id]
+use_visibilities(
+  int id: @use ref,
+  int visibility: @visibility ref
+);
+
+consts(
+  unique int id: @const
+);
+
+#keyset[id, index]
+const_attrs(
+  int id: @const ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_bodies(
+  int id: @const ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+const_generic_param_lists(
+  int id: @const ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+const_is_const(
+  int id: @const ref
+);
+
+#keyset[id]
+const_is_default(
+  int id: @const ref
+);
+
+#keyset[id]
+const_names(
+  int id: @const ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_type_reprs(
+  int id: @const ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+const_visibilities(
+  int id: @const ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+const_where_clauses(
+  int id: @const ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+const_has_implementation(
+  int id: @const ref
+);
+
+enums(
+  unique int id: @enum
+);
+
+#keyset[id, index]
+enum_attrs(
+  int id: @enum ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+enum_generic_param_lists(
+  int id: @enum ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+enum_names(
+  int id: @enum ref,
+  int name: @name ref
+);
+
+#keyset[id]
+enum_variant_lists(
+  int id: @enum ref,
+  int variant_list: @variant_list ref
+);
+
+#keyset[id]
+enum_visibilities(
+  int id: @enum ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+enum_where_clauses(
+  int id: @enum ref,
+  int where_clause: @where_clause ref
+);
+
+for_exprs(
+  unique int id: @for_expr
+);
+
+#keyset[id, index]
+for_expr_attrs(
+  int id: @for_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+for_expr_iterables(
+  int id: @for_expr ref,
+  int iterable: @expr ref
+);
+
+#keyset[id]
+for_expr_pats(
+  int id: @for_expr ref,
+  int pat: @pat ref
+);
+
+functions(
+  unique int id: @function
+);
+
+#keyset[id]
+function_abis(
+  int id: @function ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+function_bodies(
+  int id: @function ref,
+  int body: @block_expr ref
+);
+
+#keyset[id]
+function_generic_param_lists(
+  int id: @function ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+function_is_async(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_const(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_default(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_gen(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_unsafe(
+  int id: @function ref
+);
+
+#keyset[id]
+function_names(
+  int id: @function ref,
+  int name: @name ref
+);
+
+#keyset[id]
+function_ret_types(
+  int id: @function ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+function_visibilities(
+  int id: @function ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+function_where_clauses(
+  int id: @function ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+function_has_implementation(
+  int id: @function ref
+);
+
+loop_exprs(
+  unique int id: @loop_expr
+);
+
+#keyset[id, index]
+loop_expr_attrs(
+  int id: @loop_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+macro_calls(
+  unique int id: @macro_call
+);
+
+#keyset[id, index]
+macro_call_attrs(
+  int id: @macro_call ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_call_paths(
+  int id: @macro_call ref,
+  int path: @path ref
+);
+
+#keyset[id]
+macro_call_token_trees(
+  int id: @macro_call ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_call_macro_call_expansions(
+  int id: @macro_call ref,
+  int macro_call_expansion: @ast_node ref
+);
+
+statics(
+  unique int id: @static
+);
+
+#keyset[id, index]
+static_attrs(
+  int id: @static ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+static_bodies(
+  int id: @static ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+static_is_mut(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_static(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_unsafe(
+  int id: @static ref
+);
+
+#keyset[id]
+static_names(
+  int id: @static ref,
+  int name: @name ref
+);
+
+#keyset[id]
+static_type_reprs(
+  int id: @static ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+static_visibilities(
+  int id: @static ref,
+  int visibility: @visibility ref
+);
+
+structs(
+  unique int id: @struct
+);
+
+#keyset[id, index]
+struct_attrs(
+  int id: @struct ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_lists_(
+  int id: @struct ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+struct_generic_param_lists(
+  int id: @struct ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+struct_names(
+  int id: @struct ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_visibilities(
+  int id: @struct ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+struct_where_clauses(
+  int id: @struct ref,
+  int where_clause: @where_clause ref
+);
+
+type_aliases(
+  unique int id: @type_alias
+);
+
+#keyset[id, index]
+type_alias_attrs(
+  int id: @type_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_alias_generic_param_lists(
+  int id: @type_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_alias_is_default(
+  int id: @type_alias ref
+);
+
+#keyset[id]
+type_alias_names(
+  int id: @type_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_alias_type_reprs(
+  int id: @type_alias ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_alias_type_bound_lists(
+  int id: @type_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+type_alias_visibilities(
+  int id: @type_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_alias_where_clauses(
+  int id: @type_alias ref,
+  int where_clause: @where_clause ref
+);
+
+unions(
+  unique int id: @union
+);
+
+#keyset[id, index]
+union_attrs(
+  int id: @union ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+union_generic_param_lists(
+  int id: @union ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+union_names(
+  int id: @union ref,
+  int name: @name ref
+);
+
+#keyset[id]
+union_struct_field_lists(
+  int id: @union ref,
+  int struct_field_list: @struct_field_list ref
+);
+
+#keyset[id]
+union_visibilities(
+  int id: @union ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+union_where_clauses(
+  int id: @union ref,
+  int where_clause: @where_clause ref
+);
+
+while_exprs(
+  unique int id: @while_expr
+);
+
+#keyset[id, index]
+while_expr_attrs(
+  int id: @while_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+while_expr_conditions(
+  int id: @while_expr ref,
+  int condition: @expr ref
+);
diff --git a/rust/ql/lib/upgrades/b41e55c0dba14a139d01dbee713aca5efe5b818a/upgrade.properties b/rust/ql/lib/upgrades/b41e55c0dba14a139d01dbee713aca5efe5b818a/upgrade.properties
new file mode 100644
index 00000000000..b50f4c8228c
--- /dev/null
+++ b/rust/ql/lib/upgrades/b41e55c0dba14a139d01dbee713aca5efe5b818a/upgrade.properties
@@ -0,0 +1,6 @@
+description: Remove extractor generated paths
+compatibility: full
+addressable_extended_canonical_paths.rel: delete
+addressable_crate_origins.rel: delete
+resolvable_resolved_paths.rel: delete
+resolvable_resolved_crate_origins.rel: delete
diff --git a/rust/ql/lib/upgrades/dfade44a27bd44db996ae8c5095a11effc883aba/old.dbscheme b/rust/ql/lib/upgrades/dfade44a27bd44db996ae8c5095a11effc883aba/old.dbscheme
new file mode 100644
index 00000000000..dfade44a27b
--- /dev/null
+++ b/rust/ql/lib/upgrades/dfade44a27bd44db996ae8c5095a11effc883aba/old.dbscheme
@@ -0,0 +1,3615 @@
+// generated by codegen, do not edit
+
+// from ../shared/tree-sitter-extractor/src/generator/prefix.dbscheme
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Empty location -*/
+
+empty_location(
+  int location: @location_default ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- Diagnostic messages: severity -*/
+
+case @diagnostic.severity of
+  10 = @diagnostic_debug
+| 20 = @diagnostic_info
+| 30 = @diagnostic_warning
+| 40 = @diagnostic_error
+;
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error;
+
+/*- Database metadata -*/
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+overlayChangedFiles(
+  string path: string ref
+);
+
+
+// from prefix.dbscheme
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_default ref
+);
+
+
+// from schema
+
+@element =
+  @extractor_step
+| @locatable
+| @named_crate
+| @unextracted
+;
+
+extractor_steps(
+  unique int id: @extractor_step,
+  string action: string ref,
+  int duration_ms: int ref
+);
+
+#keyset[id]
+extractor_step_files(
+  int id: @extractor_step ref,
+  int file: @file ref
+);
+
+@locatable =
+  @ast_node
+| @crate
+;
+
+named_crates(
+  unique int id: @named_crate,
+  string name: string ref,
+  int crate: @crate ref
+);
+
+@unextracted =
+  @missing
+| @unimplemented
+;
+
+@ast_node =
+  @abi
+| @addressable
+| @arg_list
+| @asm_dir_spec
+| @asm_operand
+| @asm_operand_expr
+| @asm_option
+| @asm_piece
+| @asm_reg_spec
+| @assoc_item_list
+| @attr
+| @callable
+| @expr
+| @extern_item_list
+| @field_list
+| @for_binder
+| @format_args_arg
+| @generic_arg
+| @generic_arg_list
+| @generic_param
+| @generic_param_list
+| @item_list
+| @label
+| @let_else
+| @macro_items
+| @match_arm
+| @match_arm_list
+| @match_guard
+| @meta
+| @name
+| @param_base
+| @param_list
+| @parenthesized_arg_list
+| @pat
+| @path
+| @path_ast_node
+| @path_segment
+| @rename
+| @ret_type_repr
+| @return_type_syntax
+| @source_file
+| @stmt
+| @stmt_list
+| @struct_expr_field
+| @struct_expr_field_list
+| @struct_field
+| @struct_pat_field
+| @struct_pat_field_list
+| @token
+| @token_tree
+| @tuple_field
+| @type_bound
+| @type_bound_list
+| @type_repr
+| @use_bound_generic_arg
+| @use_bound_generic_args
+| @use_tree
+| @use_tree_list
+| @variant_list
+| @visibility
+| @where_clause
+| @where_pred
+;
+
+crates(
+  unique int id: @crate
+);
+
+#keyset[id]
+crate_names(
+  int id: @crate ref,
+  string name: string ref
+);
+
+#keyset[id]
+crate_versions(
+  int id: @crate ref,
+  string version: string ref
+);
+
+#keyset[id, index]
+crate_cfg_options(
+  int id: @crate ref,
+  int index: int ref,
+  string cfg_option: string ref
+);
+
+#keyset[id, index]
+crate_named_dependencies(
+  int id: @crate ref,
+  int index: int ref,
+  int named_dependency: @named_crate ref
+);
+
+missings(
+  unique int id: @missing
+);
+
+unimplementeds(
+  unique int id: @unimplemented
+);
+
+abis(
+  unique int id: @abi
+);
+
+#keyset[id]
+abi_abi_strings(
+  int id: @abi ref,
+  string abi_string: string ref
+);
+
+@addressable =
+  @item
+| @variant
+;
+
+arg_lists(
+  unique int id: @arg_list
+);
+
+#keyset[id, index]
+arg_list_args(
+  int id: @arg_list ref,
+  int index: int ref,
+  int arg: @expr ref
+);
+
+asm_dir_specs(
+  unique int id: @asm_dir_spec
+);
+
+@asm_operand =
+  @asm_const
+| @asm_label
+| @asm_reg_operand
+| @asm_sym
+;
+
+asm_operand_exprs(
+  unique int id: @asm_operand_expr
+);
+
+#keyset[id]
+asm_operand_expr_in_exprs(
+  int id: @asm_operand_expr ref,
+  int in_expr: @expr ref
+);
+
+#keyset[id]
+asm_operand_expr_out_exprs(
+  int id: @asm_operand_expr ref,
+  int out_expr: @expr ref
+);
+
+asm_options(
+  unique int id: @asm_option
+);
+
+#keyset[id]
+asm_option_is_raw(
+  int id: @asm_option ref
+);
+
+@asm_piece =
+  @asm_clobber_abi
+| @asm_operand_named
+| @asm_options_list
+;
+
+asm_reg_specs(
+  unique int id: @asm_reg_spec
+);
+
+#keyset[id]
+asm_reg_spec_identifiers(
+  int id: @asm_reg_spec ref,
+  int identifier: @name_ref ref
+);
+
+assoc_item_lists(
+  unique int id: @assoc_item_list
+);
+
+#keyset[id, index]
+assoc_item_list_assoc_items(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int assoc_item: @assoc_item ref
+);
+
+#keyset[id, index]
+assoc_item_list_attrs(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+attrs(
+  unique int id: @attr
+);
+
+#keyset[id]
+attr_meta(
+  int id: @attr ref,
+  int meta: @meta ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_param_lists(
+  int id: @callable ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id, index]
+callable_attrs(
+  int id: @callable ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+@expr =
+  @array_expr_internal
+| @asm_expr
+| @await_expr
+| @become_expr
+| @binary_expr
+| @break_expr
+| @call_expr_base
+| @cast_expr
+| @closure_expr
+| @continue_expr
+| @field_expr
+| @format_args_expr
+| @if_expr
+| @index_expr
+| @labelable_expr
+| @let_expr
+| @literal_expr
+| @macro_block_expr
+| @macro_expr
+| @match_expr
+| @offset_of_expr
+| @paren_expr
+| @path_expr_base
+| @prefix_expr
+| @range_expr
+| @ref_expr
+| @return_expr
+| @struct_expr
+| @try_expr
+| @tuple_expr
+| @underscore_expr
+| @yeet_expr
+| @yield_expr
+;
+
+extern_item_lists(
+  unique int id: @extern_item_list
+);
+
+#keyset[id, index]
+extern_item_list_attrs(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+extern_item_list_extern_items(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int extern_item: @extern_item ref
+);
+
+@field_list =
+  @struct_field_list
+| @tuple_field_list
+;
+
+for_binders(
+  unique int id: @for_binder
+);
+
+#keyset[id]
+for_binder_generic_param_lists(
+  int id: @for_binder ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+format_args_args(
+  unique int id: @format_args_arg
+);
+
+#keyset[id]
+format_args_arg_exprs(
+  int id: @format_args_arg ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+format_args_arg_names(
+  int id: @format_args_arg ref,
+  int name: @name ref
+);
+
+@generic_arg =
+  @assoc_type_arg
+| @const_arg
+| @lifetime_arg
+| @type_arg
+;
+
+generic_arg_lists(
+  unique int id: @generic_arg_list
+);
+
+#keyset[id, index]
+generic_arg_list_generic_args(
+  int id: @generic_arg_list ref,
+  int index: int ref,
+  int generic_arg: @generic_arg ref
+);
+
+@generic_param =
+  @const_param
+| @lifetime_param
+| @type_param
+;
+
+generic_param_lists(
+  unique int id: @generic_param_list
+);
+
+#keyset[id, index]
+generic_param_list_generic_params(
+  int id: @generic_param_list ref,
+  int index: int ref,
+  int generic_param: @generic_param ref
+);
+
+item_lists(
+  unique int id: @item_list
+);
+
+#keyset[id, index]
+item_list_attrs(
+  int id: @item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+item_list_items(
+  int id: @item_list ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+labels(
+  unique int id: @label
+);
+
+#keyset[id]
+label_lifetimes(
+  int id: @label ref,
+  int lifetime: @lifetime ref
+);
+
+let_elses(
+  unique int id: @let_else
+);
+
+#keyset[id]
+let_else_block_exprs(
+  int id: @let_else ref,
+  int block_expr: @block_expr ref
+);
+
+macro_items(
+  unique int id: @macro_items
+);
+
+#keyset[id, index]
+macro_items_items(
+  int id: @macro_items ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+match_arms(
+  unique int id: @match_arm
+);
+
+#keyset[id, index]
+match_arm_attrs(
+  int id: @match_arm ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_arm_exprs(
+  int id: @match_arm ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+match_arm_guards(
+  int id: @match_arm ref,
+  int guard: @match_guard ref
+);
+
+#keyset[id]
+match_arm_pats(
+  int id: @match_arm ref,
+  int pat: @pat ref
+);
+
+match_arm_lists(
+  unique int id: @match_arm_list
+);
+
+#keyset[id, index]
+match_arm_list_arms(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int arm: @match_arm ref
+);
+
+#keyset[id, index]
+match_arm_list_attrs(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+match_guards(
+  unique int id: @match_guard
+);
+
+#keyset[id]
+match_guard_conditions(
+  int id: @match_guard ref,
+  int condition: @expr ref
+);
+
+meta(
+  unique int id: @meta
+);
+
+#keyset[id]
+meta_exprs(
+  int id: @meta ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+meta_is_unsafe(
+  int id: @meta ref
+);
+
+#keyset[id]
+meta_paths(
+  int id: @meta ref,
+  int path: @path ref
+);
+
+#keyset[id]
+meta_token_trees(
+  int id: @meta ref,
+  int token_tree: @token_tree ref
+);
+
+names(
+  unique int id: @name
+);
+
+#keyset[id]
+name_texts(
+  int id: @name ref,
+  string text: string ref
+);
+
+@param_base =
+  @param
+| @self_param
+;
+
+#keyset[id, index]
+param_base_attrs(
+  int id: @param_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+param_base_type_reprs(
+  int id: @param_base ref,
+  int type_repr: @type_repr ref
+);
+
+param_lists(
+  unique int id: @param_list
+);
+
+#keyset[id, index]
+param_list_params(
+  int id: @param_list ref,
+  int index: int ref,
+  int param: @param ref
+);
+
+#keyset[id]
+param_list_self_params(
+  int id: @param_list ref,
+  int self_param: @self_param ref
+);
+
+parenthesized_arg_lists(
+  unique int id: @parenthesized_arg_list
+);
+
+#keyset[id, index]
+parenthesized_arg_list_type_args(
+  int id: @parenthesized_arg_list ref,
+  int index: int ref,
+  int type_arg: @type_arg ref
+);
+
+@pat =
+  @box_pat
+| @const_block_pat
+| @ident_pat
+| @literal_pat
+| @macro_pat
+| @or_pat
+| @paren_pat
+| @path_pat
+| @range_pat
+| @ref_pat
+| @rest_pat
+| @slice_pat
+| @struct_pat
+| @tuple_pat
+| @tuple_struct_pat
+| @wildcard_pat
+;
+
+paths(
+  unique int id: @path
+);
+
+#keyset[id]
+path_qualifiers(
+  int id: @path ref,
+  int qualifier: @path ref
+);
+
+#keyset[id]
+path_segments_(
+  int id: @path ref,
+  int segment: @path_segment ref
+);
+
+@path_ast_node =
+  @path_expr
+| @path_pat
+| @struct_expr
+| @struct_pat
+| @tuple_struct_pat
+;
+
+#keyset[id]
+path_ast_node_paths(
+  int id: @path_ast_node ref,
+  int path: @path ref
+);
+
+path_segments(
+  unique int id: @path_segment
+);
+
+#keyset[id]
+path_segment_generic_arg_lists(
+  int id: @path_segment ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+path_segment_identifiers(
+  int id: @path_segment ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+path_segment_parenthesized_arg_lists(
+  int id: @path_segment ref,
+  int parenthesized_arg_list: @parenthesized_arg_list ref
+);
+
+#keyset[id]
+path_segment_ret_types(
+  int id: @path_segment ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+path_segment_return_type_syntaxes(
+  int id: @path_segment ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+path_segment_type_reprs(
+  int id: @path_segment ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+path_segment_trait_type_reprs(
+  int id: @path_segment ref,
+  int trait_type_repr: @path_type_repr ref
+);
+
+renames(
+  unique int id: @rename
+);
+
+#keyset[id]
+rename_names(
+  int id: @rename ref,
+  int name: @name ref
+);
+
+ret_type_reprs(
+  unique int id: @ret_type_repr
+);
+
+#keyset[id]
+ret_type_repr_type_reprs(
+  int id: @ret_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+return_type_syntaxes(
+  unique int id: @return_type_syntax
+);
+
+source_files(
+  unique int id: @source_file
+);
+
+#keyset[id, index]
+source_file_attrs(
+  int id: @source_file ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+source_file_items(
+  int id: @source_file ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+@stmt =
+  @expr_stmt
+| @item
+| @let_stmt
+;
+
+stmt_lists(
+  unique int id: @stmt_list
+);
+
+#keyset[id, index]
+stmt_list_attrs(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+stmt_list_statements(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+stmt_list_tail_exprs(
+  int id: @stmt_list ref,
+  int tail_expr: @expr ref
+);
+
+struct_expr_fields(
+  unique int id: @struct_expr_field
+);
+
+#keyset[id, index]
+struct_expr_field_attrs(
+  int id: @struct_expr_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_expr_field_exprs(
+  int id: @struct_expr_field ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+struct_expr_field_identifiers(
+  int id: @struct_expr_field ref,
+  int identifier: @name_ref ref
+);
+
+struct_expr_field_lists(
+  unique int id: @struct_expr_field_list
+);
+
+#keyset[id, index]
+struct_expr_field_list_attrs(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+struct_expr_field_list_fields(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int field: @struct_expr_field ref
+);
+
+#keyset[id]
+struct_expr_field_list_spreads(
+  int id: @struct_expr_field_list ref,
+  int spread: @expr ref
+);
+
+struct_fields(
+  unique int id: @struct_field
+);
+
+#keyset[id, index]
+struct_field_attrs(
+  int id: @struct_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_defaults(
+  int id: @struct_field ref,
+  int default: @expr ref
+);
+
+#keyset[id]
+struct_field_is_unsafe(
+  int id: @struct_field ref
+);
+
+#keyset[id]
+struct_field_names(
+  int id: @struct_field ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_field_type_reprs(
+  int id: @struct_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+struct_field_visibilities(
+  int id: @struct_field ref,
+  int visibility: @visibility ref
+);
+
+struct_pat_fields(
+  unique int id: @struct_pat_field
+);
+
+#keyset[id, index]
+struct_pat_field_attrs(
+  int id: @struct_pat_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_pat_field_identifiers(
+  int id: @struct_pat_field ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+struct_pat_field_pats(
+  int id: @struct_pat_field ref,
+  int pat: @pat ref
+);
+
+struct_pat_field_lists(
+  unique int id: @struct_pat_field_list
+);
+
+#keyset[id, index]
+struct_pat_field_list_fields(
+  int id: @struct_pat_field_list ref,
+  int index: int ref,
+  int field: @struct_pat_field ref
+);
+
+#keyset[id]
+struct_pat_field_list_rest_pats(
+  int id: @struct_pat_field_list ref,
+  int rest_pat: @rest_pat ref
+);
+
+@token =
+  @comment
+;
+
+token_trees(
+  unique int id: @token_tree
+);
+
+tuple_fields(
+  unique int id: @tuple_field
+);
+
+#keyset[id, index]
+tuple_field_attrs(
+  int id: @tuple_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+tuple_field_type_reprs(
+  int id: @tuple_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+tuple_field_visibilities(
+  int id: @tuple_field ref,
+  int visibility: @visibility ref
+);
+
+type_bounds(
+  unique int id: @type_bound
+);
+
+#keyset[id]
+type_bound_for_binders(
+  int id: @type_bound ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+type_bound_is_async(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_is_const(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_lifetimes(
+  int id: @type_bound ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+type_bound_type_reprs(
+  int id: @type_bound ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_bound_use_bound_generic_args(
+  int id: @type_bound ref,
+  int use_bound_generic_args: @use_bound_generic_args ref
+);
+
+type_bound_lists(
+  unique int id: @type_bound_list
+);
+
+#keyset[id, index]
+type_bound_list_bounds(
+  int id: @type_bound_list ref,
+  int index: int ref,
+  int bound: @type_bound ref
+);
+
+@type_repr =
+  @array_type_repr
+| @dyn_trait_type_repr
+| @fn_ptr_type_repr
+| @for_type_repr
+| @impl_trait_type_repr
+| @infer_type_repr
+| @macro_type_repr
+| @never_type_repr
+| @paren_type_repr
+| @path_type_repr
+| @ptr_type_repr
+| @ref_type_repr
+| @slice_type_repr
+| @tuple_type_repr
+;
+
+@use_bound_generic_arg =
+  @lifetime
+| @name_ref
+;
+
+use_bound_generic_args(
+  unique int id: @use_bound_generic_args
+);
+
+#keyset[id, index]
+use_bound_generic_args_use_bound_generic_args(
+  int id: @use_bound_generic_args ref,
+  int index: int ref,
+  int use_bound_generic_arg: @use_bound_generic_arg ref
+);
+
+use_trees(
+  unique int id: @use_tree
+);
+
+#keyset[id]
+use_tree_is_glob(
+  int id: @use_tree ref
+);
+
+#keyset[id]
+use_tree_paths(
+  int id: @use_tree ref,
+  int path: @path ref
+);
+
+#keyset[id]
+use_tree_renames(
+  int id: @use_tree ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+use_tree_use_tree_lists(
+  int id: @use_tree ref,
+  int use_tree_list: @use_tree_list ref
+);
+
+use_tree_lists(
+  unique int id: @use_tree_list
+);
+
+#keyset[id, index]
+use_tree_list_use_trees(
+  int id: @use_tree_list ref,
+  int index: int ref,
+  int use_tree: @use_tree ref
+);
+
+variant_lists(
+  unique int id: @variant_list
+);
+
+#keyset[id, index]
+variant_list_variants(
+  int id: @variant_list ref,
+  int index: int ref,
+  int variant: @variant ref
+);
+
+visibilities(
+  unique int id: @visibility
+);
+
+#keyset[id]
+visibility_paths(
+  int id: @visibility ref,
+  int path: @path ref
+);
+
+where_clauses(
+  unique int id: @where_clause
+);
+
+#keyset[id, index]
+where_clause_predicates(
+  int id: @where_clause ref,
+  int index: int ref,
+  int predicate: @where_pred ref
+);
+
+where_preds(
+  unique int id: @where_pred
+);
+
+#keyset[id]
+where_pred_for_binders(
+  int id: @where_pred ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+where_pred_lifetimes(
+  int id: @where_pred ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+where_pred_type_reprs(
+  int id: @where_pred ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+where_pred_type_bound_lists(
+  int id: @where_pred ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+array_expr_internals(
+  unique int id: @array_expr_internal
+);
+
+#keyset[id, index]
+array_expr_internal_attrs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+array_expr_internal_exprs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+array_expr_internal_is_semicolon(
+  int id: @array_expr_internal ref
+);
+
+array_type_reprs(
+  unique int id: @array_type_repr
+);
+
+#keyset[id]
+array_type_repr_const_args(
+  int id: @array_type_repr ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+array_type_repr_element_type_reprs(
+  int id: @array_type_repr ref,
+  int element_type_repr: @type_repr ref
+);
+
+asm_clobber_abis(
+  unique int id: @asm_clobber_abi
+);
+
+asm_consts(
+  unique int id: @asm_const
+);
+
+#keyset[id]
+asm_const_exprs(
+  int id: @asm_const ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+asm_const_is_const(
+  int id: @asm_const ref
+);
+
+asm_labels(
+  unique int id: @asm_label
+);
+
+#keyset[id]
+asm_label_block_exprs(
+  int id: @asm_label ref,
+  int block_expr: @block_expr ref
+);
+
+asm_operand_nameds(
+  unique int id: @asm_operand_named
+);
+
+#keyset[id]
+asm_operand_named_asm_operands(
+  int id: @asm_operand_named ref,
+  int asm_operand: @asm_operand ref
+);
+
+#keyset[id]
+asm_operand_named_names(
+  int id: @asm_operand_named ref,
+  int name: @name ref
+);
+
+asm_options_lists(
+  unique int id: @asm_options_list
+);
+
+#keyset[id, index]
+asm_options_list_asm_options(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int asm_option: @asm_option ref
+);
+
+asm_reg_operands(
+  unique int id: @asm_reg_operand
+);
+
+#keyset[id]
+asm_reg_operand_asm_dir_specs(
+  int id: @asm_reg_operand ref,
+  int asm_dir_spec: @asm_dir_spec ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_operand_exprs(
+  int id: @asm_reg_operand ref,
+  int asm_operand_expr: @asm_operand_expr ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_reg_specs(
+  int id: @asm_reg_operand ref,
+  int asm_reg_spec: @asm_reg_spec ref
+);
+
+asm_syms(
+  unique int id: @asm_sym
+);
+
+#keyset[id]
+asm_sym_paths(
+  int id: @asm_sym ref,
+  int path: @path ref
+);
+
+assoc_type_args(
+  unique int id: @assoc_type_arg
+);
+
+#keyset[id]
+assoc_type_arg_const_args(
+  int id: @assoc_type_arg ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+assoc_type_arg_generic_arg_lists(
+  int id: @assoc_type_arg ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+assoc_type_arg_identifiers(
+  int id: @assoc_type_arg ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+assoc_type_arg_param_lists(
+  int id: @assoc_type_arg ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+assoc_type_arg_ret_types(
+  int id: @assoc_type_arg ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_return_type_syntaxes(
+  int id: @assoc_type_arg ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+assoc_type_arg_type_reprs(
+  int id: @assoc_type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_type_bound_lists(
+  int id: @assoc_type_arg ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+await_exprs(
+  unique int id: @await_expr
+);
+
+#keyset[id, index]
+await_expr_attrs(
+  int id: @await_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+await_expr_exprs(
+  int id: @await_expr ref,
+  int expr: @expr ref
+);
+
+become_exprs(
+  unique int id: @become_expr
+);
+
+#keyset[id, index]
+become_expr_attrs(
+  int id: @become_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+become_expr_exprs(
+  int id: @become_expr ref,
+  int expr: @expr ref
+);
+
+binary_exprs(
+  unique int id: @binary_expr
+);
+
+#keyset[id, index]
+binary_expr_attrs(
+  int id: @binary_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+binary_expr_lhs(
+  int id: @binary_expr ref,
+  int lhs: @expr ref
+);
+
+#keyset[id]
+binary_expr_operator_names(
+  int id: @binary_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+binary_expr_rhs(
+  int id: @binary_expr ref,
+  int rhs: @expr ref
+);
+
+box_pats(
+  unique int id: @box_pat
+);
+
+#keyset[id]
+box_pat_pats(
+  int id: @box_pat ref,
+  int pat: @pat ref
+);
+
+break_exprs(
+  unique int id: @break_expr
+);
+
+#keyset[id, index]
+break_expr_attrs(
+  int id: @break_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+break_expr_exprs(
+  int id: @break_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+break_expr_lifetimes(
+  int id: @break_expr ref,
+  int lifetime: @lifetime ref
+);
+
+@call_expr_base =
+  @call_expr
+| @method_call_expr
+;
+
+#keyset[id]
+call_expr_base_arg_lists(
+  int id: @call_expr_base ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+call_expr_base_attrs(
+  int id: @call_expr_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+cast_exprs(
+  unique int id: @cast_expr
+);
+
+#keyset[id, index]
+cast_expr_attrs(
+  int id: @cast_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+cast_expr_exprs(
+  int id: @cast_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+cast_expr_type_reprs(
+  int id: @cast_expr ref,
+  int type_repr: @type_repr ref
+);
+
+closure_exprs(
+  unique int id: @closure_expr
+);
+
+#keyset[id]
+closure_expr_bodies(
+  int id: @closure_expr ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+closure_expr_for_binders(
+  int id: @closure_expr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+closure_expr_is_async(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_const(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_gen(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_move(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_static(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_ret_types(
+  int id: @closure_expr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+comments(
+  unique int id: @comment,
+  int parent: @ast_node ref,
+  string text: string ref
+);
+
+const_args(
+  unique int id: @const_arg
+);
+
+#keyset[id]
+const_arg_exprs(
+  int id: @const_arg ref,
+  int expr: @expr ref
+);
+
+const_block_pats(
+  unique int id: @const_block_pat
+);
+
+#keyset[id]
+const_block_pat_block_exprs(
+  int id: @const_block_pat ref,
+  int block_expr: @block_expr ref
+);
+
+#keyset[id]
+const_block_pat_is_const(
+  int id: @const_block_pat ref
+);
+
+const_params(
+  unique int id: @const_param
+);
+
+#keyset[id, index]
+const_param_attrs(
+  int id: @const_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_param_default_vals(
+  int id: @const_param ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+const_param_is_const(
+  int id: @const_param ref
+);
+
+#keyset[id]
+const_param_names(
+  int id: @const_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_param_type_reprs(
+  int id: @const_param ref,
+  int type_repr: @type_repr ref
+);
+
+continue_exprs(
+  unique int id: @continue_expr
+);
+
+#keyset[id, index]
+continue_expr_attrs(
+  int id: @continue_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+continue_expr_lifetimes(
+  int id: @continue_expr ref,
+  int lifetime: @lifetime ref
+);
+
+dyn_trait_type_reprs(
+  unique int id: @dyn_trait_type_repr
+);
+
+#keyset[id]
+dyn_trait_type_repr_type_bound_lists(
+  int id: @dyn_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+expr_stmts(
+  unique int id: @expr_stmt
+);
+
+#keyset[id]
+expr_stmt_exprs(
+  int id: @expr_stmt ref,
+  int expr: @expr ref
+);
+
+field_exprs(
+  unique int id: @field_expr
+);
+
+#keyset[id, index]
+field_expr_attrs(
+  int id: @field_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+field_expr_containers(
+  int id: @field_expr ref,
+  int container: @expr ref
+);
+
+#keyset[id]
+field_expr_identifiers(
+  int id: @field_expr ref,
+  int identifier: @name_ref ref
+);
+
+fn_ptr_type_reprs(
+  unique int id: @fn_ptr_type_repr
+);
+
+#keyset[id]
+fn_ptr_type_repr_abis(
+  int id: @fn_ptr_type_repr ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_async(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_const(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_unsafe(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_param_lists(
+  int id: @fn_ptr_type_repr ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_ret_types(
+  int id: @fn_ptr_type_repr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+for_type_reprs(
+  unique int id: @for_type_repr
+);
+
+#keyset[id]
+for_type_repr_for_binders(
+  int id: @for_type_repr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+for_type_repr_type_reprs(
+  int id: @for_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+format_args_exprs(
+  unique int id: @format_args_expr
+);
+
+#keyset[id, index]
+format_args_expr_args(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int arg: @format_args_arg ref
+);
+
+#keyset[id, index]
+format_args_expr_attrs(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+format_args_expr_templates(
+  int id: @format_args_expr ref,
+  int template: @expr ref
+);
+
+ident_pats(
+  unique int id: @ident_pat
+);
+
+#keyset[id, index]
+ident_pat_attrs(
+  int id: @ident_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ident_pat_is_mut(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_is_ref(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_names(
+  int id: @ident_pat ref,
+  int name: @name ref
+);
+
+#keyset[id]
+ident_pat_pats(
+  int id: @ident_pat ref,
+  int pat: @pat ref
+);
+
+if_exprs(
+  unique int id: @if_expr
+);
+
+#keyset[id, index]
+if_expr_attrs(
+  int id: @if_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+if_expr_conditions(
+  int id: @if_expr ref,
+  int condition: @expr ref
+);
+
+#keyset[id]
+if_expr_elses(
+  int id: @if_expr ref,
+  int else: @expr ref
+);
+
+#keyset[id]
+if_expr_thens(
+  int id: @if_expr ref,
+  int then: @block_expr ref
+);
+
+impl_trait_type_reprs(
+  unique int id: @impl_trait_type_repr
+);
+
+#keyset[id]
+impl_trait_type_repr_type_bound_lists(
+  int id: @impl_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+index_exprs(
+  unique int id: @index_expr
+);
+
+#keyset[id, index]
+index_expr_attrs(
+  int id: @index_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+index_expr_bases(
+  int id: @index_expr ref,
+  int base: @expr ref
+);
+
+#keyset[id]
+index_expr_indices(
+  int id: @index_expr ref,
+  int index: @expr ref
+);
+
+infer_type_reprs(
+  unique int id: @infer_type_repr
+);
+
+@item =
+  @adt
+| @asm_expr
+| @assoc_item
+| @extern_block
+| @extern_crate
+| @extern_item
+| @impl
+| @macro_def
+| @macro_rules
+| @module
+| @trait
+| @trait_alias
+| @use
+;
+
+#keyset[id]
+item_attribute_macro_expansions(
+  int id: @item ref,
+  int attribute_macro_expansion: @macro_items ref
+);
+
+@labelable_expr =
+  @block_expr
+| @looping_expr
+;
+
+#keyset[id]
+labelable_expr_labels(
+  int id: @labelable_expr ref,
+  int label: @label ref
+);
+
+let_exprs(
+  unique int id: @let_expr
+);
+
+#keyset[id, index]
+let_expr_attrs(
+  int id: @let_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_expr_scrutinees(
+  int id: @let_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+let_expr_pats(
+  int id: @let_expr ref,
+  int pat: @pat ref
+);
+
+let_stmts(
+  unique int id: @let_stmt
+);
+
+#keyset[id, index]
+let_stmt_attrs(
+  int id: @let_stmt ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_stmt_initializers(
+  int id: @let_stmt ref,
+  int initializer: @expr ref
+);
+
+#keyset[id]
+let_stmt_let_elses(
+  int id: @let_stmt ref,
+  int let_else: @let_else ref
+);
+
+#keyset[id]
+let_stmt_pats(
+  int id: @let_stmt ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+let_stmt_type_reprs(
+  int id: @let_stmt ref,
+  int type_repr: @type_repr ref
+);
+
+lifetimes(
+  unique int id: @lifetime
+);
+
+#keyset[id]
+lifetime_texts(
+  int id: @lifetime ref,
+  string text: string ref
+);
+
+lifetime_args(
+  unique int id: @lifetime_arg
+);
+
+#keyset[id]
+lifetime_arg_lifetimes(
+  int id: @lifetime_arg ref,
+  int lifetime: @lifetime ref
+);
+
+lifetime_params(
+  unique int id: @lifetime_param
+);
+
+#keyset[id, index]
+lifetime_param_attrs(
+  int id: @lifetime_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+lifetime_param_lifetimes(
+  int id: @lifetime_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+lifetime_param_type_bound_lists(
+  int id: @lifetime_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+literal_exprs(
+  unique int id: @literal_expr
+);
+
+#keyset[id, index]
+literal_expr_attrs(
+  int id: @literal_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+literal_expr_text_values(
+  int id: @literal_expr ref,
+  string text_value: string ref
+);
+
+literal_pats(
+  unique int id: @literal_pat
+);
+
+#keyset[id]
+literal_pat_literals(
+  int id: @literal_pat ref,
+  int literal: @literal_expr ref
+);
+
+macro_block_exprs(
+  unique int id: @macro_block_expr
+);
+
+#keyset[id, index]
+macro_block_expr_statements(
+  int id: @macro_block_expr ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+macro_block_expr_tail_exprs(
+  int id: @macro_block_expr ref,
+  int tail_expr: @expr ref
+);
+
+macro_exprs(
+  unique int id: @macro_expr
+);
+
+#keyset[id]
+macro_expr_macro_calls(
+  int id: @macro_expr ref,
+  int macro_call: @macro_call ref
+);
+
+macro_pats(
+  unique int id: @macro_pat
+);
+
+#keyset[id]
+macro_pat_macro_calls(
+  int id: @macro_pat ref,
+  int macro_call: @macro_call ref
+);
+
+macro_type_reprs(
+  unique int id: @macro_type_repr
+);
+
+#keyset[id]
+macro_type_repr_macro_calls(
+  int id: @macro_type_repr ref,
+  int macro_call: @macro_call ref
+);
+
+match_exprs(
+  unique int id: @match_expr
+);
+
+#keyset[id, index]
+match_expr_attrs(
+  int id: @match_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_expr_scrutinees(
+  int id: @match_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+match_expr_match_arm_lists(
+  int id: @match_expr ref,
+  int match_arm_list: @match_arm_list ref
+);
+
+name_refs(
+  unique int id: @name_ref
+);
+
+#keyset[id]
+name_ref_texts(
+  int id: @name_ref ref,
+  string text: string ref
+);
+
+never_type_reprs(
+  unique int id: @never_type_repr
+);
+
+offset_of_exprs(
+  unique int id: @offset_of_expr
+);
+
+#keyset[id, index]
+offset_of_expr_attrs(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+offset_of_expr_fields(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int field: @name_ref ref
+);
+
+#keyset[id]
+offset_of_expr_type_reprs(
+  int id: @offset_of_expr ref,
+  int type_repr: @type_repr ref
+);
+
+or_pats(
+  unique int id: @or_pat
+);
+
+#keyset[id, index]
+or_pat_pats(
+  int id: @or_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+params(
+  unique int id: @param
+);
+
+#keyset[id]
+param_pats(
+  int id: @param ref,
+  int pat: @pat ref
+);
+
+paren_exprs(
+  unique int id: @paren_expr
+);
+
+#keyset[id, index]
+paren_expr_attrs(
+  int id: @paren_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+paren_expr_exprs(
+  int id: @paren_expr ref,
+  int expr: @expr ref
+);
+
+paren_pats(
+  unique int id: @paren_pat
+);
+
+#keyset[id]
+paren_pat_pats(
+  int id: @paren_pat ref,
+  int pat: @pat ref
+);
+
+paren_type_reprs(
+  unique int id: @paren_type_repr
+);
+
+#keyset[id]
+paren_type_repr_type_reprs(
+  int id: @paren_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+@path_expr_base =
+  @path_expr
+;
+
+path_pats(
+  unique int id: @path_pat
+);
+
+path_type_reprs(
+  unique int id: @path_type_repr
+);
+
+#keyset[id]
+path_type_repr_paths(
+  int id: @path_type_repr ref,
+  int path: @path ref
+);
+
+prefix_exprs(
+  unique int id: @prefix_expr
+);
+
+#keyset[id, index]
+prefix_expr_attrs(
+  int id: @prefix_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+prefix_expr_exprs(
+  int id: @prefix_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+prefix_expr_operator_names(
+  int id: @prefix_expr ref,
+  string operator_name: string ref
+);
+
+ptr_type_reprs(
+  unique int id: @ptr_type_repr
+);
+
+#keyset[id]
+ptr_type_repr_is_const(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_is_mut(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_type_reprs(
+  int id: @ptr_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+range_exprs(
+  unique int id: @range_expr
+);
+
+#keyset[id, index]
+range_expr_attrs(
+  int id: @range_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+range_expr_ends(
+  int id: @range_expr ref,
+  int end: @expr ref
+);
+
+#keyset[id]
+range_expr_operator_names(
+  int id: @range_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_expr_starts(
+  int id: @range_expr ref,
+  int start: @expr ref
+);
+
+range_pats(
+  unique int id: @range_pat
+);
+
+#keyset[id]
+range_pat_ends(
+  int id: @range_pat ref,
+  int end: @pat ref
+);
+
+#keyset[id]
+range_pat_operator_names(
+  int id: @range_pat ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_pat_starts(
+  int id: @range_pat ref,
+  int start: @pat ref
+);
+
+ref_exprs(
+  unique int id: @ref_expr
+);
+
+#keyset[id, index]
+ref_expr_attrs(
+  int id: @ref_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ref_expr_exprs(
+  int id: @ref_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+ref_expr_is_const(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_mut(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_raw(
+  int id: @ref_expr ref
+);
+
+ref_pats(
+  unique int id: @ref_pat
+);
+
+#keyset[id]
+ref_pat_is_mut(
+  int id: @ref_pat ref
+);
+
+#keyset[id]
+ref_pat_pats(
+  int id: @ref_pat ref,
+  int pat: @pat ref
+);
+
+ref_type_reprs(
+  unique int id: @ref_type_repr
+);
+
+#keyset[id]
+ref_type_repr_is_mut(
+  int id: @ref_type_repr ref
+);
+
+#keyset[id]
+ref_type_repr_lifetimes(
+  int id: @ref_type_repr ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+ref_type_repr_type_reprs(
+  int id: @ref_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+rest_pats(
+  unique int id: @rest_pat
+);
+
+#keyset[id, index]
+rest_pat_attrs(
+  int id: @rest_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+return_exprs(
+  unique int id: @return_expr
+);
+
+#keyset[id, index]
+return_expr_attrs(
+  int id: @return_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+return_expr_exprs(
+  int id: @return_expr ref,
+  int expr: @expr ref
+);
+
+self_params(
+  unique int id: @self_param
+);
+
+#keyset[id]
+self_param_is_ref(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_is_mut(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_lifetimes(
+  int id: @self_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+self_param_names(
+  int id: @self_param ref,
+  int name: @name ref
+);
+
+slice_pats(
+  unique int id: @slice_pat
+);
+
+#keyset[id, index]
+slice_pat_pats(
+  int id: @slice_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+slice_type_reprs(
+  unique int id: @slice_type_repr
+);
+
+#keyset[id]
+slice_type_repr_type_reprs(
+  int id: @slice_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+struct_exprs(
+  unique int id: @struct_expr
+);
+
+#keyset[id]
+struct_expr_struct_expr_field_lists(
+  int id: @struct_expr ref,
+  int struct_expr_field_list: @struct_expr_field_list ref
+);
+
+struct_field_lists(
+  unique int id: @struct_field_list
+);
+
+#keyset[id, index]
+struct_field_list_fields(
+  int id: @struct_field_list ref,
+  int index: int ref,
+  int field: @struct_field ref
+);
+
+struct_pats(
+  unique int id: @struct_pat
+);
+
+#keyset[id]
+struct_pat_struct_pat_field_lists(
+  int id: @struct_pat ref,
+  int struct_pat_field_list: @struct_pat_field_list ref
+);
+
+try_exprs(
+  unique int id: @try_expr
+);
+
+#keyset[id, index]
+try_expr_attrs(
+  int id: @try_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+try_expr_exprs(
+  int id: @try_expr ref,
+  int expr: @expr ref
+);
+
+tuple_exprs(
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_attrs(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+tuple_expr_fields(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int field: @expr ref
+);
+
+tuple_field_lists(
+  unique int id: @tuple_field_list
+);
+
+#keyset[id, index]
+tuple_field_list_fields(
+  int id: @tuple_field_list ref,
+  int index: int ref,
+  int field: @tuple_field ref
+);
+
+tuple_pats(
+  unique int id: @tuple_pat
+);
+
+#keyset[id, index]
+tuple_pat_fields(
+  int id: @tuple_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_struct_pats(
+  unique int id: @tuple_struct_pat
+);
+
+#keyset[id, index]
+tuple_struct_pat_fields(
+  int id: @tuple_struct_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_type_reprs(
+  unique int id: @tuple_type_repr
+);
+
+#keyset[id, index]
+tuple_type_repr_fields(
+  int id: @tuple_type_repr ref,
+  int index: int ref,
+  int field: @type_repr ref
+);
+
+type_args(
+  unique int id: @type_arg
+);
+
+#keyset[id]
+type_arg_type_reprs(
+  int id: @type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+type_params(
+  unique int id: @type_param
+);
+
+#keyset[id, index]
+type_param_attrs(
+  int id: @type_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_param_default_types(
+  int id: @type_param ref,
+  int default_type: @type_repr ref
+);
+
+#keyset[id]
+type_param_names(
+  int id: @type_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_param_type_bound_lists(
+  int id: @type_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+underscore_exprs(
+  unique int id: @underscore_expr
+);
+
+#keyset[id, index]
+underscore_expr_attrs(
+  int id: @underscore_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+variants(
+  unique int id: @variant
+);
+
+#keyset[id, index]
+variant_attrs(
+  int id: @variant ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+variant_discriminants(
+  int id: @variant ref,
+  int discriminant: @expr ref
+);
+
+#keyset[id]
+variant_field_lists(
+  int id: @variant ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+variant_names(
+  int id: @variant ref,
+  int name: @name ref
+);
+
+#keyset[id]
+variant_visibilities(
+  int id: @variant ref,
+  int visibility: @visibility ref
+);
+
+wildcard_pats(
+  unique int id: @wildcard_pat
+);
+
+yeet_exprs(
+  unique int id: @yeet_expr
+);
+
+#keyset[id, index]
+yeet_expr_attrs(
+  int id: @yeet_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yeet_expr_exprs(
+  int id: @yeet_expr ref,
+  int expr: @expr ref
+);
+
+yield_exprs(
+  unique int id: @yield_expr
+);
+
+#keyset[id, index]
+yield_expr_attrs(
+  int id: @yield_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yield_expr_exprs(
+  int id: @yield_expr ref,
+  int expr: @expr ref
+);
+
+@adt =
+  @enum
+| @struct
+| @union
+;
+
+#keyset[id, index]
+adt_derive_macro_expansions(
+  int id: @adt ref,
+  int index: int ref,
+  int derive_macro_expansion: @macro_items ref
+);
+
+asm_exprs(
+  unique int id: @asm_expr
+);
+
+#keyset[id, index]
+asm_expr_asm_pieces(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int asm_piece: @asm_piece ref
+);
+
+#keyset[id, index]
+asm_expr_attrs(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+asm_expr_templates(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int template: @expr ref
+);
+
+@assoc_item =
+  @const
+| @function
+| @macro_call
+| @type_alias
+;
+
+block_exprs(
+  unique int id: @block_expr
+);
+
+#keyset[id, index]
+block_expr_attrs(
+  int id: @block_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+block_expr_is_async(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_const(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_gen(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_move(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_try(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_unsafe(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_stmt_lists(
+  int id: @block_expr ref,
+  int stmt_list: @stmt_list ref
+);
+
+call_exprs(
+  unique int id: @call_expr
+);
+
+#keyset[id]
+call_expr_functions(
+  int id: @call_expr ref,
+  int function: @expr ref
+);
+
+extern_blocks(
+  unique int id: @extern_block
+);
+
+#keyset[id]
+extern_block_abis(
+  int id: @extern_block ref,
+  int abi: @abi ref
+);
+
+#keyset[id, index]
+extern_block_attrs(
+  int id: @extern_block ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_block_extern_item_lists(
+  int id: @extern_block ref,
+  int extern_item_list: @extern_item_list ref
+);
+
+#keyset[id]
+extern_block_is_unsafe(
+  int id: @extern_block ref
+);
+
+extern_crates(
+  unique int id: @extern_crate
+);
+
+#keyset[id, index]
+extern_crate_attrs(
+  int id: @extern_crate ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_crate_identifiers(
+  int id: @extern_crate ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+extern_crate_renames(
+  int id: @extern_crate ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+extern_crate_visibilities(
+  int id: @extern_crate ref,
+  int visibility: @visibility ref
+);
+
+@extern_item =
+  @function
+| @macro_call
+| @static
+| @type_alias
+;
+
+impls(
+  unique int id: @impl
+);
+
+#keyset[id]
+impl_assoc_item_lists(
+  int id: @impl ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+impl_attrs(
+  int id: @impl ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+impl_generic_param_lists(
+  int id: @impl ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+impl_is_const(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_default(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_unsafe(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_self_ties(
+  int id: @impl ref,
+  int self_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_traits(
+  int id: @impl ref,
+  int trait: @type_repr ref
+);
+
+#keyset[id]
+impl_visibilities(
+  int id: @impl ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+impl_where_clauses(
+  int id: @impl ref,
+  int where_clause: @where_clause ref
+);
+
+@looping_expr =
+  @for_expr
+| @loop_expr
+| @while_expr
+;
+
+#keyset[id]
+looping_expr_loop_bodies(
+  int id: @looping_expr ref,
+  int loop_body: @block_expr ref
+);
+
+macro_defs(
+  unique int id: @macro_def
+);
+
+#keyset[id]
+macro_def_args(
+  int id: @macro_def ref,
+  int args: @token_tree ref
+);
+
+#keyset[id, index]
+macro_def_attrs(
+  int id: @macro_def ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_def_bodies(
+  int id: @macro_def ref,
+  int body: @token_tree ref
+);
+
+#keyset[id]
+macro_def_names(
+  int id: @macro_def ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_def_visibilities(
+  int id: @macro_def ref,
+  int visibility: @visibility ref
+);
+
+macro_rules(
+  unique int id: @macro_rules
+);
+
+#keyset[id, index]
+macro_rules_attrs(
+  int id: @macro_rules ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_rules_names(
+  int id: @macro_rules ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_rules_token_trees(
+  int id: @macro_rules ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_rules_visibilities(
+  int id: @macro_rules ref,
+  int visibility: @visibility ref
+);
+
+method_call_exprs(
+  unique int id: @method_call_expr
+);
+
+#keyset[id]
+method_call_expr_generic_arg_lists(
+  int id: @method_call_expr ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+method_call_expr_identifiers(
+  int id: @method_call_expr ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+method_call_expr_receivers(
+  int id: @method_call_expr ref,
+  int receiver: @expr ref
+);
+
+modules(
+  unique int id: @module
+);
+
+#keyset[id, index]
+module_attrs(
+  int id: @module ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+module_item_lists(
+  int id: @module ref,
+  int item_list: @item_list ref
+);
+
+#keyset[id]
+module_names(
+  int id: @module ref,
+  int name: @name ref
+);
+
+#keyset[id]
+module_visibilities(
+  int id: @module ref,
+  int visibility: @visibility ref
+);
+
+path_exprs(
+  unique int id: @path_expr
+);
+
+#keyset[id, index]
+path_expr_attrs(
+  int id: @path_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+traits(
+  unique int id: @trait
+);
+
+#keyset[id]
+trait_assoc_item_lists(
+  int id: @trait ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+trait_attrs(
+  int id: @trait ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_generic_param_lists(
+  int id: @trait ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_is_auto(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_is_unsafe(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_names(
+  int id: @trait ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_type_bound_lists(
+  int id: @trait ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_visibilities(
+  int id: @trait ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_where_clauses(
+  int id: @trait ref,
+  int where_clause: @where_clause ref
+);
+
+trait_aliases(
+  unique int id: @trait_alias
+);
+
+#keyset[id, index]
+trait_alias_attrs(
+  int id: @trait_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_alias_generic_param_lists(
+  int id: @trait_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_alias_names(
+  int id: @trait_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_alias_type_bound_lists(
+  int id: @trait_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_alias_visibilities(
+  int id: @trait_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_alias_where_clauses(
+  int id: @trait_alias ref,
+  int where_clause: @where_clause ref
+);
+
+uses(
+  unique int id: @use
+);
+
+#keyset[id, index]
+use_attrs(
+  int id: @use ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+use_use_trees(
+  int id: @use ref,
+  int use_tree: @use_tree ref
+);
+
+#keyset[id]
+use_visibilities(
+  int id: @use ref,
+  int visibility: @visibility ref
+);
+
+consts(
+  unique int id: @const
+);
+
+#keyset[id, index]
+const_attrs(
+  int id: @const ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_bodies(
+  int id: @const ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+const_generic_param_lists(
+  int id: @const ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+const_is_const(
+  int id: @const ref
+);
+
+#keyset[id]
+const_is_default(
+  int id: @const ref
+);
+
+#keyset[id]
+const_names(
+  int id: @const ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_type_reprs(
+  int id: @const ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+const_visibilities(
+  int id: @const ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+const_where_clauses(
+  int id: @const ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+const_has_implementation(
+  int id: @const ref
+);
+
+enums(
+  unique int id: @enum
+);
+
+#keyset[id, index]
+enum_attrs(
+  int id: @enum ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+enum_generic_param_lists(
+  int id: @enum ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+enum_names(
+  int id: @enum ref,
+  int name: @name ref
+);
+
+#keyset[id]
+enum_variant_lists(
+  int id: @enum ref,
+  int variant_list: @variant_list ref
+);
+
+#keyset[id]
+enum_visibilities(
+  int id: @enum ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+enum_where_clauses(
+  int id: @enum ref,
+  int where_clause: @where_clause ref
+);
+
+for_exprs(
+  unique int id: @for_expr
+);
+
+#keyset[id, index]
+for_expr_attrs(
+  int id: @for_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+for_expr_iterables(
+  int id: @for_expr ref,
+  int iterable: @expr ref
+);
+
+#keyset[id]
+for_expr_pats(
+  int id: @for_expr ref,
+  int pat: @pat ref
+);
+
+functions(
+  unique int id: @function
+);
+
+#keyset[id]
+function_abis(
+  int id: @function ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+function_bodies(
+  int id: @function ref,
+  int body: @block_expr ref
+);
+
+#keyset[id]
+function_generic_param_lists(
+  int id: @function ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+function_is_async(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_const(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_default(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_gen(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_unsafe(
+  int id: @function ref
+);
+
+#keyset[id]
+function_names(
+  int id: @function ref,
+  int name: @name ref
+);
+
+#keyset[id]
+function_ret_types(
+  int id: @function ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+function_visibilities(
+  int id: @function ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+function_where_clauses(
+  int id: @function ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+function_has_implementation(
+  int id: @function ref
+);
+
+loop_exprs(
+  unique int id: @loop_expr
+);
+
+#keyset[id, index]
+loop_expr_attrs(
+  int id: @loop_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+macro_calls(
+  unique int id: @macro_call
+);
+
+#keyset[id, index]
+macro_call_attrs(
+  int id: @macro_call ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_call_paths(
+  int id: @macro_call ref,
+  int path: @path ref
+);
+
+#keyset[id]
+macro_call_token_trees(
+  int id: @macro_call ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_call_macro_call_expansions(
+  int id: @macro_call ref,
+  int macro_call_expansion: @ast_node ref
+);
+
+statics(
+  unique int id: @static
+);
+
+#keyset[id, index]
+static_attrs(
+  int id: @static ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+static_bodies(
+  int id: @static ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+static_is_mut(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_static(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_unsafe(
+  int id: @static ref
+);
+
+#keyset[id]
+static_names(
+  int id: @static ref,
+  int name: @name ref
+);
+
+#keyset[id]
+static_type_reprs(
+  int id: @static ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+static_visibilities(
+  int id: @static ref,
+  int visibility: @visibility ref
+);
+
+structs(
+  unique int id: @struct
+);
+
+#keyset[id, index]
+struct_attrs(
+  int id: @struct ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_lists_(
+  int id: @struct ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+struct_generic_param_lists(
+  int id: @struct ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+struct_names(
+  int id: @struct ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_visibilities(
+  int id: @struct ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+struct_where_clauses(
+  int id: @struct ref,
+  int where_clause: @where_clause ref
+);
+
+type_aliases(
+  unique int id: @type_alias
+);
+
+#keyset[id, index]
+type_alias_attrs(
+  int id: @type_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_alias_generic_param_lists(
+  int id: @type_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_alias_is_default(
+  int id: @type_alias ref
+);
+
+#keyset[id]
+type_alias_names(
+  int id: @type_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_alias_type_reprs(
+  int id: @type_alias ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_alias_type_bound_lists(
+  int id: @type_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+type_alias_visibilities(
+  int id: @type_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_alias_where_clauses(
+  int id: @type_alias ref,
+  int where_clause: @where_clause ref
+);
+
+unions(
+  unique int id: @union
+);
+
+#keyset[id, index]
+union_attrs(
+  int id: @union ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+union_generic_param_lists(
+  int id: @union ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+union_names(
+  int id: @union ref,
+  int name: @name ref
+);
+
+#keyset[id]
+union_struct_field_lists(
+  int id: @union ref,
+  int struct_field_list: @struct_field_list ref
+);
+
+#keyset[id]
+union_visibilities(
+  int id: @union ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+union_where_clauses(
+  int id: @union ref,
+  int where_clause: @where_clause ref
+);
+
+while_exprs(
+  unique int id: @while_expr
+);
+
+#keyset[id, index]
+while_expr_attrs(
+  int id: @while_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+while_expr_conditions(
+  int id: @while_expr ref,
+  int condition: @expr ref
+);
diff --git a/rust/ql/lib/upgrades/dfade44a27bd44db996ae8c5095a11effc883aba/rust.dbscheme b/rust/ql/lib/upgrades/dfade44a27bd44db996ae8c5095a11effc883aba/rust.dbscheme
new file mode 100644
index 00000000000..30a0713e5bf
--- /dev/null
+++ b/rust/ql/lib/upgrades/dfade44a27bd44db996ae8c5095a11effc883aba/rust.dbscheme
@@ -0,0 +1,3615 @@
+// generated by codegen, do not edit
+
+// from ../shared/tree-sitter-extractor/src/generator/prefix.dbscheme
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Empty location -*/
+
+empty_location(
+  int location: @location_default ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- Diagnostic messages: severity -*/
+
+case @diagnostic.severity of
+  10 = @diagnostic_debug
+| 20 = @diagnostic_info
+| 30 = @diagnostic_warning
+| 40 = @diagnostic_error
+;
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error;
+
+/*- Database metadata -*/
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+overlayChangedFiles(
+  string path: string ref
+);
+
+
+// from prefix.dbscheme
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_default ref
+);
+
+
+// from schema
+
+@element =
+  @extractor_step
+| @locatable
+| @named_crate
+| @unextracted
+;
+
+extractor_steps(
+  unique int id: @extractor_step,
+  string action: string ref,
+  int duration_ms: int ref
+);
+
+#keyset[id]
+extractor_step_files(
+  int id: @extractor_step ref,
+  int file: @file ref
+);
+
+@locatable =
+  @ast_node
+| @crate
+;
+
+named_crates(
+  unique int id: @named_crate,
+  string name: string ref,
+  int crate: @crate ref
+);
+
+@unextracted =
+  @missing
+| @unimplemented
+;
+
+@ast_node =
+  @abi
+| @addressable
+| @arg_list
+| @asm_dir_spec
+| @asm_operand
+| @asm_operand_expr
+| @asm_option
+| @asm_piece
+| @asm_reg_spec
+| @assoc_item_list
+| @attr
+| @callable
+| @expr
+| @extern_item_list
+| @field_list
+| @for_binder
+| @format_args_arg
+| @generic_arg
+| @generic_arg_list
+| @generic_param
+| @generic_param_list
+| @item_list
+| @label
+| @let_else
+| @macro_items
+| @match_arm
+| @match_arm_list
+| @match_guard
+| @meta
+| @name
+| @param_base
+| @param_list
+| @parenthesized_arg_list
+| @pat
+| @path
+| @path_ast_node
+| @path_segment
+| @rename
+| @ret_type_repr
+| @return_type_syntax
+| @source_file
+| @stmt
+| @stmt_list
+| @struct_expr_field
+| @struct_expr_field_list
+| @struct_field
+| @struct_pat_field
+| @struct_pat_field_list
+| @token
+| @token_tree
+| @tuple_field
+| @type_bound
+| @type_bound_list
+| @type_repr
+| @use_bound_generic_arg
+| @use_bound_generic_args
+| @use_tree
+| @use_tree_list
+| @variant_list
+| @visibility
+| @where_clause
+| @where_pred
+;
+
+crates(
+  unique int id: @crate
+);
+
+#keyset[id]
+crate_names(
+  int id: @crate ref,
+  string name: string ref
+);
+
+#keyset[id]
+crate_versions(
+  int id: @crate ref,
+  string version: string ref
+);
+
+#keyset[id, index]
+crate_cfg_options(
+  int id: @crate ref,
+  int index: int ref,
+  string cfg_option: string ref
+);
+
+#keyset[id, index]
+crate_named_dependencies(
+  int id: @crate ref,
+  int index: int ref,
+  int named_dependency: @named_crate ref
+);
+
+missings(
+  unique int id: @missing
+);
+
+unimplementeds(
+  unique int id: @unimplemented
+);
+
+abis(
+  unique int id: @abi
+);
+
+#keyset[id]
+abi_abi_strings(
+  int id: @abi ref,
+  string abi_string: string ref
+);
+
+@addressable =
+  @item
+| @variant
+;
+
+arg_lists(
+  unique int id: @arg_list
+);
+
+#keyset[id, index]
+arg_list_args(
+  int id: @arg_list ref,
+  int index: int ref,
+  int arg: @expr ref
+);
+
+asm_dir_specs(
+  unique int id: @asm_dir_spec
+);
+
+@asm_operand =
+  @asm_const
+| @asm_label
+| @asm_reg_operand
+| @asm_sym
+;
+
+asm_operand_exprs(
+  unique int id: @asm_operand_expr
+);
+
+#keyset[id]
+asm_operand_expr_in_exprs(
+  int id: @asm_operand_expr ref,
+  int in_expr: @expr ref
+);
+
+#keyset[id]
+asm_operand_expr_out_exprs(
+  int id: @asm_operand_expr ref,
+  int out_expr: @expr ref
+);
+
+asm_options(
+  unique int id: @asm_option
+);
+
+#keyset[id]
+asm_option_is_raw(
+  int id: @asm_option ref
+);
+
+@asm_piece =
+  @asm_clobber_abi
+| @asm_operand_named
+| @asm_options_list
+;
+
+asm_reg_specs(
+  unique int id: @asm_reg_spec
+);
+
+#keyset[id]
+asm_reg_spec_identifiers(
+  int id: @asm_reg_spec ref,
+  int identifier: @name_ref ref
+);
+
+assoc_item_lists(
+  unique int id: @assoc_item_list
+);
+
+#keyset[id, index]
+assoc_item_list_assoc_items(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int assoc_item: @assoc_item ref
+);
+
+#keyset[id, index]
+assoc_item_list_attrs(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+attrs(
+  unique int id: @attr
+);
+
+#keyset[id]
+attr_meta(
+  int id: @attr ref,
+  int meta: @meta ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_param_lists(
+  int id: @callable ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id, index]
+callable_attrs(
+  int id: @callable ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+@expr =
+  @array_expr_internal
+| @asm_expr
+| @await_expr
+| @become_expr
+| @binary_expr
+| @break_expr
+| @call_expr_base
+| @cast_expr
+| @closure_expr
+| @continue_expr
+| @field_expr
+| @format_args_expr
+| @if_expr
+| @index_expr
+| @labelable_expr
+| @let_expr
+| @literal_expr
+| @macro_block_expr
+| @macro_expr
+| @match_expr
+| @offset_of_expr
+| @paren_expr
+| @path_expr_base
+| @prefix_expr
+| @range_expr
+| @ref_expr
+| @return_expr
+| @struct_expr
+| @try_expr
+| @tuple_expr
+| @underscore_expr
+| @yeet_expr
+| @yield_expr
+;
+
+extern_item_lists(
+  unique int id: @extern_item_list
+);
+
+#keyset[id, index]
+extern_item_list_attrs(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+extern_item_list_extern_items(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int extern_item: @extern_item ref
+);
+
+@field_list =
+  @struct_field_list
+| @tuple_field_list
+;
+
+for_binders(
+  unique int id: @for_binder
+);
+
+#keyset[id]
+for_binder_generic_param_lists(
+  int id: @for_binder ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+format_args_args(
+  unique int id: @format_args_arg
+);
+
+#keyset[id]
+format_args_arg_exprs(
+  int id: @format_args_arg ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+format_args_arg_names(
+  int id: @format_args_arg ref,
+  int name: @name ref
+);
+
+@generic_arg =
+  @assoc_type_arg
+| @const_arg
+| @lifetime_arg
+| @type_arg
+;
+
+generic_arg_lists(
+  unique int id: @generic_arg_list
+);
+
+#keyset[id, index]
+generic_arg_list_generic_args(
+  int id: @generic_arg_list ref,
+  int index: int ref,
+  int generic_arg: @generic_arg ref
+);
+
+@generic_param =
+  @const_param
+| @lifetime_param
+| @type_param
+;
+
+generic_param_lists(
+  unique int id: @generic_param_list
+);
+
+#keyset[id, index]
+generic_param_list_generic_params(
+  int id: @generic_param_list ref,
+  int index: int ref,
+  int generic_param: @generic_param ref
+);
+
+item_lists(
+  unique int id: @item_list
+);
+
+#keyset[id, index]
+item_list_attrs(
+  int id: @item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+item_list_items(
+  int id: @item_list ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+labels(
+  unique int id: @label
+);
+
+#keyset[id]
+label_lifetimes(
+  int id: @label ref,
+  int lifetime: @lifetime ref
+);
+
+let_elses(
+  unique int id: @let_else
+);
+
+#keyset[id]
+let_else_block_exprs(
+  int id: @let_else ref,
+  int block_expr: @block_expr ref
+);
+
+macro_items(
+  unique int id: @macro_items
+);
+
+#keyset[id, index]
+macro_items_items(
+  int id: @macro_items ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+match_arms(
+  unique int id: @match_arm
+);
+
+#keyset[id, index]
+match_arm_attrs(
+  int id: @match_arm ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_arm_exprs(
+  int id: @match_arm ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+match_arm_guards(
+  int id: @match_arm ref,
+  int guard: @match_guard ref
+);
+
+#keyset[id]
+match_arm_pats(
+  int id: @match_arm ref,
+  int pat: @pat ref
+);
+
+match_arm_lists(
+  unique int id: @match_arm_list
+);
+
+#keyset[id, index]
+match_arm_list_arms(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int arm: @match_arm ref
+);
+
+#keyset[id, index]
+match_arm_list_attrs(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+match_guards(
+  unique int id: @match_guard
+);
+
+#keyset[id]
+match_guard_conditions(
+  int id: @match_guard ref,
+  int condition: @expr ref
+);
+
+meta(
+  unique int id: @meta
+);
+
+#keyset[id]
+meta_exprs(
+  int id: @meta ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+meta_is_unsafe(
+  int id: @meta ref
+);
+
+#keyset[id]
+meta_paths(
+  int id: @meta ref,
+  int path: @path ref
+);
+
+#keyset[id]
+meta_token_trees(
+  int id: @meta ref,
+  int token_tree: @token_tree ref
+);
+
+names(
+  unique int id: @name
+);
+
+#keyset[id]
+name_texts(
+  int id: @name ref,
+  string text: string ref
+);
+
+@param_base =
+  @param
+| @self_param
+;
+
+#keyset[id, index]
+param_base_attrs(
+  int id: @param_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+param_base_type_reprs(
+  int id: @param_base ref,
+  int type_repr: @type_repr ref
+);
+
+param_lists(
+  unique int id: @param_list
+);
+
+#keyset[id, index]
+param_list_params(
+  int id: @param_list ref,
+  int index: int ref,
+  int param: @param ref
+);
+
+#keyset[id]
+param_list_self_params(
+  int id: @param_list ref,
+  int self_param: @self_param ref
+);
+
+parenthesized_arg_lists(
+  unique int id: @parenthesized_arg_list
+);
+
+#keyset[id, index]
+parenthesized_arg_list_type_args(
+  int id: @parenthesized_arg_list ref,
+  int index: int ref,
+  int type_arg: @type_arg ref
+);
+
+@pat =
+  @box_pat
+| @const_block_pat
+| @ident_pat
+| @literal_pat
+| @macro_pat
+| @or_pat
+| @paren_pat
+| @path_pat
+| @range_pat
+| @ref_pat
+| @rest_pat
+| @slice_pat
+| @struct_pat
+| @tuple_pat
+| @tuple_struct_pat
+| @wildcard_pat
+;
+
+paths(
+  unique int id: @path
+);
+
+#keyset[id]
+path_qualifiers(
+  int id: @path ref,
+  int qualifier: @path ref
+);
+
+#keyset[id]
+path_segments_(
+  int id: @path ref,
+  int segment: @path_segment ref
+);
+
+@path_ast_node =
+  @path_expr
+| @path_pat
+| @struct_expr
+| @struct_pat
+| @tuple_struct_pat
+;
+
+#keyset[id]
+path_ast_node_paths(
+  int id: @path_ast_node ref,
+  int path: @path ref
+);
+
+path_segments(
+  unique int id: @path_segment
+);
+
+#keyset[id]
+path_segment_generic_arg_lists(
+  int id: @path_segment ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+path_segment_identifiers(
+  int id: @path_segment ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+path_segment_parenthesized_arg_lists(
+  int id: @path_segment ref,
+  int parenthesized_arg_list: @parenthesized_arg_list ref
+);
+
+#keyset[id]
+path_segment_ret_types(
+  int id: @path_segment ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+path_segment_return_type_syntaxes(
+  int id: @path_segment ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+path_segment_type_reprs(
+  int id: @path_segment ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+path_segment_trait_type_reprs(
+  int id: @path_segment ref,
+  int trait_type_repr: @path_type_repr ref
+);
+
+renames(
+  unique int id: @rename
+);
+
+#keyset[id]
+rename_names(
+  int id: @rename ref,
+  int name: @name ref
+);
+
+ret_type_reprs(
+  unique int id: @ret_type_repr
+);
+
+#keyset[id]
+ret_type_repr_type_reprs(
+  int id: @ret_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+return_type_syntaxes(
+  unique int id: @return_type_syntax
+);
+
+source_files(
+  unique int id: @source_file
+);
+
+#keyset[id, index]
+source_file_attrs(
+  int id: @source_file ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+source_file_items(
+  int id: @source_file ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+@stmt =
+  @expr_stmt
+| @item
+| @let_stmt
+;
+
+stmt_lists(
+  unique int id: @stmt_list
+);
+
+#keyset[id, index]
+stmt_list_attrs(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+stmt_list_statements(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+stmt_list_tail_exprs(
+  int id: @stmt_list ref,
+  int tail_expr: @expr ref
+);
+
+struct_expr_fields(
+  unique int id: @struct_expr_field
+);
+
+#keyset[id, index]
+struct_expr_field_attrs(
+  int id: @struct_expr_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_expr_field_exprs(
+  int id: @struct_expr_field ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+struct_expr_field_identifiers(
+  int id: @struct_expr_field ref,
+  int identifier: @name_ref ref
+);
+
+struct_expr_field_lists(
+  unique int id: @struct_expr_field_list
+);
+
+#keyset[id, index]
+struct_expr_field_list_attrs(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+struct_expr_field_list_fields(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int field: @struct_expr_field ref
+);
+
+#keyset[id]
+struct_expr_field_list_spreads(
+  int id: @struct_expr_field_list ref,
+  int spread: @expr ref
+);
+
+struct_fields(
+  unique int id: @struct_field
+);
+
+#keyset[id, index]
+struct_field_attrs(
+  int id: @struct_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_defaults(
+  int id: @struct_field ref,
+  int default: @expr ref
+);
+
+#keyset[id]
+struct_field_is_unsafe(
+  int id: @struct_field ref
+);
+
+#keyset[id]
+struct_field_names(
+  int id: @struct_field ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_field_type_reprs(
+  int id: @struct_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+struct_field_visibilities(
+  int id: @struct_field ref,
+  int visibility: @visibility ref
+);
+
+struct_pat_fields(
+  unique int id: @struct_pat_field
+);
+
+#keyset[id, index]
+struct_pat_field_attrs(
+  int id: @struct_pat_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_pat_field_identifiers(
+  int id: @struct_pat_field ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+struct_pat_field_pats(
+  int id: @struct_pat_field ref,
+  int pat: @pat ref
+);
+
+struct_pat_field_lists(
+  unique int id: @struct_pat_field_list
+);
+
+#keyset[id, index]
+struct_pat_field_list_fields(
+  int id: @struct_pat_field_list ref,
+  int index: int ref,
+  int field: @struct_pat_field ref
+);
+
+#keyset[id]
+struct_pat_field_list_rest_pats(
+  int id: @struct_pat_field_list ref,
+  int rest_pat: @rest_pat ref
+);
+
+@token =
+  @comment
+;
+
+token_trees(
+  unique int id: @token_tree
+);
+
+tuple_fields(
+  unique int id: @tuple_field
+);
+
+#keyset[id, index]
+tuple_field_attrs(
+  int id: @tuple_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+tuple_field_type_reprs(
+  int id: @tuple_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+tuple_field_visibilities(
+  int id: @tuple_field ref,
+  int visibility: @visibility ref
+);
+
+type_bounds(
+  unique int id: @type_bound
+);
+
+#keyset[id]
+type_bound_for_binders(
+  int id: @type_bound ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+type_bound_is_async(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_is_const(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_lifetimes(
+  int id: @type_bound ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+type_bound_type_reprs(
+  int id: @type_bound ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_bound_use_bound_generic_args(
+  int id: @type_bound ref,
+  int use_bound_generic_args: @use_bound_generic_args ref
+);
+
+type_bound_lists(
+  unique int id: @type_bound_list
+);
+
+#keyset[id, index]
+type_bound_list_bounds(
+  int id: @type_bound_list ref,
+  int index: int ref,
+  int bound: @type_bound ref
+);
+
+@type_repr =
+  @array_type_repr
+| @dyn_trait_type_repr
+| @fn_ptr_type_repr
+| @for_type_repr
+| @impl_trait_type_repr
+| @infer_type_repr
+| @macro_type_repr
+| @never_type_repr
+| @paren_type_repr
+| @path_type_repr
+| @ptr_type_repr
+| @ref_type_repr
+| @slice_type_repr
+| @tuple_type_repr
+;
+
+@use_bound_generic_arg =
+  @lifetime
+| @name_ref
+;
+
+use_bound_generic_args(
+  unique int id: @use_bound_generic_args
+);
+
+#keyset[id, index]
+use_bound_generic_args_use_bound_generic_args(
+  int id: @use_bound_generic_args ref,
+  int index: int ref,
+  int use_bound_generic_arg: @use_bound_generic_arg ref
+);
+
+use_trees(
+  unique int id: @use_tree
+);
+
+#keyset[id]
+use_tree_is_glob(
+  int id: @use_tree ref
+);
+
+#keyset[id]
+use_tree_paths(
+  int id: @use_tree ref,
+  int path: @path ref
+);
+
+#keyset[id]
+use_tree_renames(
+  int id: @use_tree ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+use_tree_use_tree_lists(
+  int id: @use_tree ref,
+  int use_tree_list: @use_tree_list ref
+);
+
+use_tree_lists(
+  unique int id: @use_tree_list
+);
+
+#keyset[id, index]
+use_tree_list_use_trees(
+  int id: @use_tree_list ref,
+  int index: int ref,
+  int use_tree: @use_tree ref
+);
+
+variant_lists(
+  unique int id: @variant_list
+);
+
+#keyset[id, index]
+variant_list_variants(
+  int id: @variant_list ref,
+  int index: int ref,
+  int variant: @variant ref
+);
+
+visibilities(
+  unique int id: @visibility
+);
+
+#keyset[id]
+visibility_paths(
+  int id: @visibility ref,
+  int path: @path ref
+);
+
+where_clauses(
+  unique int id: @where_clause
+);
+
+#keyset[id, index]
+where_clause_predicates(
+  int id: @where_clause ref,
+  int index: int ref,
+  int predicate: @where_pred ref
+);
+
+where_preds(
+  unique int id: @where_pred
+);
+
+#keyset[id]
+where_pred_for_binders(
+  int id: @where_pred ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+where_pred_lifetimes(
+  int id: @where_pred ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+where_pred_type_reprs(
+  int id: @where_pred ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+where_pred_type_bound_lists(
+  int id: @where_pred ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+array_expr_internals(
+  unique int id: @array_expr_internal
+);
+
+#keyset[id, index]
+array_expr_internal_attrs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+array_expr_internal_exprs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+array_expr_internal_is_semicolon(
+  int id: @array_expr_internal ref
+);
+
+array_type_reprs(
+  unique int id: @array_type_repr
+);
+
+#keyset[id]
+array_type_repr_const_args(
+  int id: @array_type_repr ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+array_type_repr_element_type_reprs(
+  int id: @array_type_repr ref,
+  int element_type_repr: @type_repr ref
+);
+
+asm_clobber_abis(
+  unique int id: @asm_clobber_abi
+);
+
+asm_consts(
+  unique int id: @asm_const
+);
+
+#keyset[id]
+asm_const_exprs(
+  int id: @asm_const ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+asm_const_is_const(
+  int id: @asm_const ref
+);
+
+asm_labels(
+  unique int id: @asm_label
+);
+
+#keyset[id]
+asm_label_block_exprs(
+  int id: @asm_label ref,
+  int block_expr: @block_expr ref
+);
+
+asm_operand_nameds(
+  unique int id: @asm_operand_named
+);
+
+#keyset[id]
+asm_operand_named_asm_operands(
+  int id: @asm_operand_named ref,
+  int asm_operand: @asm_operand ref
+);
+
+#keyset[id]
+asm_operand_named_names(
+  int id: @asm_operand_named ref,
+  int name: @name ref
+);
+
+asm_options_lists(
+  unique int id: @asm_options_list
+);
+
+#keyset[id, index]
+asm_options_list_asm_options(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int asm_option: @asm_option ref
+);
+
+asm_reg_operands(
+  unique int id: @asm_reg_operand
+);
+
+#keyset[id]
+asm_reg_operand_asm_dir_specs(
+  int id: @asm_reg_operand ref,
+  int asm_dir_spec: @asm_dir_spec ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_operand_exprs(
+  int id: @asm_reg_operand ref,
+  int asm_operand_expr: @asm_operand_expr ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_reg_specs(
+  int id: @asm_reg_operand ref,
+  int asm_reg_spec: @asm_reg_spec ref
+);
+
+asm_syms(
+  unique int id: @asm_sym
+);
+
+#keyset[id]
+asm_sym_paths(
+  int id: @asm_sym ref,
+  int path: @path ref
+);
+
+assoc_type_args(
+  unique int id: @assoc_type_arg
+);
+
+#keyset[id]
+assoc_type_arg_const_args(
+  int id: @assoc_type_arg ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+assoc_type_arg_generic_arg_lists(
+  int id: @assoc_type_arg ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+assoc_type_arg_identifiers(
+  int id: @assoc_type_arg ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+assoc_type_arg_param_lists(
+  int id: @assoc_type_arg ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+assoc_type_arg_ret_types(
+  int id: @assoc_type_arg ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_return_type_syntaxes(
+  int id: @assoc_type_arg ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+assoc_type_arg_type_reprs(
+  int id: @assoc_type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_type_bound_lists(
+  int id: @assoc_type_arg ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+await_exprs(
+  unique int id: @await_expr
+);
+
+#keyset[id, index]
+await_expr_attrs(
+  int id: @await_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+await_expr_exprs(
+  int id: @await_expr ref,
+  int expr: @expr ref
+);
+
+become_exprs(
+  unique int id: @become_expr
+);
+
+#keyset[id, index]
+become_expr_attrs(
+  int id: @become_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+become_expr_exprs(
+  int id: @become_expr ref,
+  int expr: @expr ref
+);
+
+binary_exprs(
+  unique int id: @binary_expr
+);
+
+#keyset[id, index]
+binary_expr_attrs(
+  int id: @binary_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+binary_expr_lhs(
+  int id: @binary_expr ref,
+  int lhs: @expr ref
+);
+
+#keyset[id]
+binary_expr_operator_names(
+  int id: @binary_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+binary_expr_rhs(
+  int id: @binary_expr ref,
+  int rhs: @expr ref
+);
+
+box_pats(
+  unique int id: @box_pat
+);
+
+#keyset[id]
+box_pat_pats(
+  int id: @box_pat ref,
+  int pat: @pat ref
+);
+
+break_exprs(
+  unique int id: @break_expr
+);
+
+#keyset[id, index]
+break_expr_attrs(
+  int id: @break_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+break_expr_exprs(
+  int id: @break_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+break_expr_lifetimes(
+  int id: @break_expr ref,
+  int lifetime: @lifetime ref
+);
+
+@call_expr_base =
+  @call_expr
+| @method_call_expr
+;
+
+#keyset[id]
+call_expr_base_arg_lists(
+  int id: @call_expr_base ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+call_expr_base_attrs(
+  int id: @call_expr_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+cast_exprs(
+  unique int id: @cast_expr
+);
+
+#keyset[id, index]
+cast_expr_attrs(
+  int id: @cast_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+cast_expr_exprs(
+  int id: @cast_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+cast_expr_type_reprs(
+  int id: @cast_expr ref,
+  int type_repr: @type_repr ref
+);
+
+closure_exprs(
+  unique int id: @closure_expr
+);
+
+#keyset[id]
+closure_expr_closure_bodies(
+  int id: @closure_expr ref,
+  int closure_body: @expr ref
+);
+
+#keyset[id]
+closure_expr_for_binders(
+  int id: @closure_expr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+closure_expr_is_async(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_const(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_gen(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_move(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_static(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_ret_types(
+  int id: @closure_expr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+comments(
+  unique int id: @comment,
+  int parent: @ast_node ref,
+  string text: string ref
+);
+
+const_args(
+  unique int id: @const_arg
+);
+
+#keyset[id]
+const_arg_exprs(
+  int id: @const_arg ref,
+  int expr: @expr ref
+);
+
+const_block_pats(
+  unique int id: @const_block_pat
+);
+
+#keyset[id]
+const_block_pat_block_exprs(
+  int id: @const_block_pat ref,
+  int block_expr: @block_expr ref
+);
+
+#keyset[id]
+const_block_pat_is_const(
+  int id: @const_block_pat ref
+);
+
+const_params(
+  unique int id: @const_param
+);
+
+#keyset[id, index]
+const_param_attrs(
+  int id: @const_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_param_default_vals(
+  int id: @const_param ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+const_param_is_const(
+  int id: @const_param ref
+);
+
+#keyset[id]
+const_param_names(
+  int id: @const_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_param_type_reprs(
+  int id: @const_param ref,
+  int type_repr: @type_repr ref
+);
+
+continue_exprs(
+  unique int id: @continue_expr
+);
+
+#keyset[id, index]
+continue_expr_attrs(
+  int id: @continue_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+continue_expr_lifetimes(
+  int id: @continue_expr ref,
+  int lifetime: @lifetime ref
+);
+
+dyn_trait_type_reprs(
+  unique int id: @dyn_trait_type_repr
+);
+
+#keyset[id]
+dyn_trait_type_repr_type_bound_lists(
+  int id: @dyn_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+expr_stmts(
+  unique int id: @expr_stmt
+);
+
+#keyset[id]
+expr_stmt_exprs(
+  int id: @expr_stmt ref,
+  int expr: @expr ref
+);
+
+field_exprs(
+  unique int id: @field_expr
+);
+
+#keyset[id, index]
+field_expr_attrs(
+  int id: @field_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+field_expr_containers(
+  int id: @field_expr ref,
+  int container: @expr ref
+);
+
+#keyset[id]
+field_expr_identifiers(
+  int id: @field_expr ref,
+  int identifier: @name_ref ref
+);
+
+fn_ptr_type_reprs(
+  unique int id: @fn_ptr_type_repr
+);
+
+#keyset[id]
+fn_ptr_type_repr_abis(
+  int id: @fn_ptr_type_repr ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_async(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_const(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_unsafe(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_param_lists(
+  int id: @fn_ptr_type_repr ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_ret_types(
+  int id: @fn_ptr_type_repr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+for_type_reprs(
+  unique int id: @for_type_repr
+);
+
+#keyset[id]
+for_type_repr_for_binders(
+  int id: @for_type_repr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+for_type_repr_type_reprs(
+  int id: @for_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+format_args_exprs(
+  unique int id: @format_args_expr
+);
+
+#keyset[id, index]
+format_args_expr_args(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int arg: @format_args_arg ref
+);
+
+#keyset[id, index]
+format_args_expr_attrs(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+format_args_expr_templates(
+  int id: @format_args_expr ref,
+  int template: @expr ref
+);
+
+ident_pats(
+  unique int id: @ident_pat
+);
+
+#keyset[id, index]
+ident_pat_attrs(
+  int id: @ident_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ident_pat_is_mut(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_is_ref(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_names(
+  int id: @ident_pat ref,
+  int name: @name ref
+);
+
+#keyset[id]
+ident_pat_pats(
+  int id: @ident_pat ref,
+  int pat: @pat ref
+);
+
+if_exprs(
+  unique int id: @if_expr
+);
+
+#keyset[id, index]
+if_expr_attrs(
+  int id: @if_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+if_expr_conditions(
+  int id: @if_expr ref,
+  int condition: @expr ref
+);
+
+#keyset[id]
+if_expr_elses(
+  int id: @if_expr ref,
+  int else: @expr ref
+);
+
+#keyset[id]
+if_expr_thens(
+  int id: @if_expr ref,
+  int then: @block_expr ref
+);
+
+impl_trait_type_reprs(
+  unique int id: @impl_trait_type_repr
+);
+
+#keyset[id]
+impl_trait_type_repr_type_bound_lists(
+  int id: @impl_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+index_exprs(
+  unique int id: @index_expr
+);
+
+#keyset[id, index]
+index_expr_attrs(
+  int id: @index_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+index_expr_bases(
+  int id: @index_expr ref,
+  int base: @expr ref
+);
+
+#keyset[id]
+index_expr_indices(
+  int id: @index_expr ref,
+  int index: @expr ref
+);
+
+infer_type_reprs(
+  unique int id: @infer_type_repr
+);
+
+@item =
+  @adt
+| @asm_expr
+| @assoc_item
+| @extern_block
+| @extern_crate
+| @extern_item
+| @impl
+| @macro_def
+| @macro_rules
+| @module
+| @trait
+| @trait_alias
+| @use
+;
+
+#keyset[id]
+item_attribute_macro_expansions(
+  int id: @item ref,
+  int attribute_macro_expansion: @macro_items ref
+);
+
+@labelable_expr =
+  @block_expr
+| @looping_expr
+;
+
+#keyset[id]
+labelable_expr_labels(
+  int id: @labelable_expr ref,
+  int label: @label ref
+);
+
+let_exprs(
+  unique int id: @let_expr
+);
+
+#keyset[id, index]
+let_expr_attrs(
+  int id: @let_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_expr_scrutinees(
+  int id: @let_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+let_expr_pats(
+  int id: @let_expr ref,
+  int pat: @pat ref
+);
+
+let_stmts(
+  unique int id: @let_stmt
+);
+
+#keyset[id, index]
+let_stmt_attrs(
+  int id: @let_stmt ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_stmt_initializers(
+  int id: @let_stmt ref,
+  int initializer: @expr ref
+);
+
+#keyset[id]
+let_stmt_let_elses(
+  int id: @let_stmt ref,
+  int let_else: @let_else ref
+);
+
+#keyset[id]
+let_stmt_pats(
+  int id: @let_stmt ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+let_stmt_type_reprs(
+  int id: @let_stmt ref,
+  int type_repr: @type_repr ref
+);
+
+lifetimes(
+  unique int id: @lifetime
+);
+
+#keyset[id]
+lifetime_texts(
+  int id: @lifetime ref,
+  string text: string ref
+);
+
+lifetime_args(
+  unique int id: @lifetime_arg
+);
+
+#keyset[id]
+lifetime_arg_lifetimes(
+  int id: @lifetime_arg ref,
+  int lifetime: @lifetime ref
+);
+
+lifetime_params(
+  unique int id: @lifetime_param
+);
+
+#keyset[id, index]
+lifetime_param_attrs(
+  int id: @lifetime_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+lifetime_param_lifetimes(
+  int id: @lifetime_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+lifetime_param_type_bound_lists(
+  int id: @lifetime_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+literal_exprs(
+  unique int id: @literal_expr
+);
+
+#keyset[id, index]
+literal_expr_attrs(
+  int id: @literal_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+literal_expr_text_values(
+  int id: @literal_expr ref,
+  string text_value: string ref
+);
+
+literal_pats(
+  unique int id: @literal_pat
+);
+
+#keyset[id]
+literal_pat_literals(
+  int id: @literal_pat ref,
+  int literal: @literal_expr ref
+);
+
+macro_block_exprs(
+  unique int id: @macro_block_expr
+);
+
+#keyset[id, index]
+macro_block_expr_statements(
+  int id: @macro_block_expr ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+macro_block_expr_tail_exprs(
+  int id: @macro_block_expr ref,
+  int tail_expr: @expr ref
+);
+
+macro_exprs(
+  unique int id: @macro_expr
+);
+
+#keyset[id]
+macro_expr_macro_calls(
+  int id: @macro_expr ref,
+  int macro_call: @macro_call ref
+);
+
+macro_pats(
+  unique int id: @macro_pat
+);
+
+#keyset[id]
+macro_pat_macro_calls(
+  int id: @macro_pat ref,
+  int macro_call: @macro_call ref
+);
+
+macro_type_reprs(
+  unique int id: @macro_type_repr
+);
+
+#keyset[id]
+macro_type_repr_macro_calls(
+  int id: @macro_type_repr ref,
+  int macro_call: @macro_call ref
+);
+
+match_exprs(
+  unique int id: @match_expr
+);
+
+#keyset[id, index]
+match_expr_attrs(
+  int id: @match_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_expr_scrutinees(
+  int id: @match_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+match_expr_match_arm_lists(
+  int id: @match_expr ref,
+  int match_arm_list: @match_arm_list ref
+);
+
+name_refs(
+  unique int id: @name_ref
+);
+
+#keyset[id]
+name_ref_texts(
+  int id: @name_ref ref,
+  string text: string ref
+);
+
+never_type_reprs(
+  unique int id: @never_type_repr
+);
+
+offset_of_exprs(
+  unique int id: @offset_of_expr
+);
+
+#keyset[id, index]
+offset_of_expr_attrs(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+offset_of_expr_fields(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int field: @name_ref ref
+);
+
+#keyset[id]
+offset_of_expr_type_reprs(
+  int id: @offset_of_expr ref,
+  int type_repr: @type_repr ref
+);
+
+or_pats(
+  unique int id: @or_pat
+);
+
+#keyset[id, index]
+or_pat_pats(
+  int id: @or_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+params(
+  unique int id: @param
+);
+
+#keyset[id]
+param_pats(
+  int id: @param ref,
+  int pat: @pat ref
+);
+
+paren_exprs(
+  unique int id: @paren_expr
+);
+
+#keyset[id, index]
+paren_expr_attrs(
+  int id: @paren_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+paren_expr_exprs(
+  int id: @paren_expr ref,
+  int expr: @expr ref
+);
+
+paren_pats(
+  unique int id: @paren_pat
+);
+
+#keyset[id]
+paren_pat_pats(
+  int id: @paren_pat ref,
+  int pat: @pat ref
+);
+
+paren_type_reprs(
+  unique int id: @paren_type_repr
+);
+
+#keyset[id]
+paren_type_repr_type_reprs(
+  int id: @paren_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+@path_expr_base =
+  @path_expr
+;
+
+path_pats(
+  unique int id: @path_pat
+);
+
+path_type_reprs(
+  unique int id: @path_type_repr
+);
+
+#keyset[id]
+path_type_repr_paths(
+  int id: @path_type_repr ref,
+  int path: @path ref
+);
+
+prefix_exprs(
+  unique int id: @prefix_expr
+);
+
+#keyset[id, index]
+prefix_expr_attrs(
+  int id: @prefix_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+prefix_expr_exprs(
+  int id: @prefix_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+prefix_expr_operator_names(
+  int id: @prefix_expr ref,
+  string operator_name: string ref
+);
+
+ptr_type_reprs(
+  unique int id: @ptr_type_repr
+);
+
+#keyset[id]
+ptr_type_repr_is_const(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_is_mut(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_type_reprs(
+  int id: @ptr_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+range_exprs(
+  unique int id: @range_expr
+);
+
+#keyset[id, index]
+range_expr_attrs(
+  int id: @range_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+range_expr_ends(
+  int id: @range_expr ref,
+  int end: @expr ref
+);
+
+#keyset[id]
+range_expr_operator_names(
+  int id: @range_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_expr_starts(
+  int id: @range_expr ref,
+  int start: @expr ref
+);
+
+range_pats(
+  unique int id: @range_pat
+);
+
+#keyset[id]
+range_pat_ends(
+  int id: @range_pat ref,
+  int end: @pat ref
+);
+
+#keyset[id]
+range_pat_operator_names(
+  int id: @range_pat ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_pat_starts(
+  int id: @range_pat ref,
+  int start: @pat ref
+);
+
+ref_exprs(
+  unique int id: @ref_expr
+);
+
+#keyset[id, index]
+ref_expr_attrs(
+  int id: @ref_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ref_expr_exprs(
+  int id: @ref_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+ref_expr_is_const(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_mut(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_raw(
+  int id: @ref_expr ref
+);
+
+ref_pats(
+  unique int id: @ref_pat
+);
+
+#keyset[id]
+ref_pat_is_mut(
+  int id: @ref_pat ref
+);
+
+#keyset[id]
+ref_pat_pats(
+  int id: @ref_pat ref,
+  int pat: @pat ref
+);
+
+ref_type_reprs(
+  unique int id: @ref_type_repr
+);
+
+#keyset[id]
+ref_type_repr_is_mut(
+  int id: @ref_type_repr ref
+);
+
+#keyset[id]
+ref_type_repr_lifetimes(
+  int id: @ref_type_repr ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+ref_type_repr_type_reprs(
+  int id: @ref_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+rest_pats(
+  unique int id: @rest_pat
+);
+
+#keyset[id, index]
+rest_pat_attrs(
+  int id: @rest_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+return_exprs(
+  unique int id: @return_expr
+);
+
+#keyset[id, index]
+return_expr_attrs(
+  int id: @return_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+return_expr_exprs(
+  int id: @return_expr ref,
+  int expr: @expr ref
+);
+
+self_params(
+  unique int id: @self_param
+);
+
+#keyset[id]
+self_param_is_ref(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_is_mut(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_lifetimes(
+  int id: @self_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+self_param_names(
+  int id: @self_param ref,
+  int name: @name ref
+);
+
+slice_pats(
+  unique int id: @slice_pat
+);
+
+#keyset[id, index]
+slice_pat_pats(
+  int id: @slice_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+slice_type_reprs(
+  unique int id: @slice_type_repr
+);
+
+#keyset[id]
+slice_type_repr_type_reprs(
+  int id: @slice_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+struct_exprs(
+  unique int id: @struct_expr
+);
+
+#keyset[id]
+struct_expr_struct_expr_field_lists(
+  int id: @struct_expr ref,
+  int struct_expr_field_list: @struct_expr_field_list ref
+);
+
+struct_field_lists(
+  unique int id: @struct_field_list
+);
+
+#keyset[id, index]
+struct_field_list_fields(
+  int id: @struct_field_list ref,
+  int index: int ref,
+  int field: @struct_field ref
+);
+
+struct_pats(
+  unique int id: @struct_pat
+);
+
+#keyset[id]
+struct_pat_struct_pat_field_lists(
+  int id: @struct_pat ref,
+  int struct_pat_field_list: @struct_pat_field_list ref
+);
+
+try_exprs(
+  unique int id: @try_expr
+);
+
+#keyset[id, index]
+try_expr_attrs(
+  int id: @try_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+try_expr_exprs(
+  int id: @try_expr ref,
+  int expr: @expr ref
+);
+
+tuple_exprs(
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_attrs(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+tuple_expr_fields(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int field: @expr ref
+);
+
+tuple_field_lists(
+  unique int id: @tuple_field_list
+);
+
+#keyset[id, index]
+tuple_field_list_fields(
+  int id: @tuple_field_list ref,
+  int index: int ref,
+  int field: @tuple_field ref
+);
+
+tuple_pats(
+  unique int id: @tuple_pat
+);
+
+#keyset[id, index]
+tuple_pat_fields(
+  int id: @tuple_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_struct_pats(
+  unique int id: @tuple_struct_pat
+);
+
+#keyset[id, index]
+tuple_struct_pat_fields(
+  int id: @tuple_struct_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_type_reprs(
+  unique int id: @tuple_type_repr
+);
+
+#keyset[id, index]
+tuple_type_repr_fields(
+  int id: @tuple_type_repr ref,
+  int index: int ref,
+  int field: @type_repr ref
+);
+
+type_args(
+  unique int id: @type_arg
+);
+
+#keyset[id]
+type_arg_type_reprs(
+  int id: @type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+type_params(
+  unique int id: @type_param
+);
+
+#keyset[id, index]
+type_param_attrs(
+  int id: @type_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_param_default_types(
+  int id: @type_param ref,
+  int default_type: @type_repr ref
+);
+
+#keyset[id]
+type_param_names(
+  int id: @type_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_param_type_bound_lists(
+  int id: @type_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+underscore_exprs(
+  unique int id: @underscore_expr
+);
+
+#keyset[id, index]
+underscore_expr_attrs(
+  int id: @underscore_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+variants(
+  unique int id: @variant
+);
+
+#keyset[id, index]
+variant_attrs(
+  int id: @variant ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+variant_discriminants(
+  int id: @variant ref,
+  int discriminant: @expr ref
+);
+
+#keyset[id]
+variant_field_lists(
+  int id: @variant ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+variant_names(
+  int id: @variant ref,
+  int name: @name ref
+);
+
+#keyset[id]
+variant_visibilities(
+  int id: @variant ref,
+  int visibility: @visibility ref
+);
+
+wildcard_pats(
+  unique int id: @wildcard_pat
+);
+
+yeet_exprs(
+  unique int id: @yeet_expr
+);
+
+#keyset[id, index]
+yeet_expr_attrs(
+  int id: @yeet_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yeet_expr_exprs(
+  int id: @yeet_expr ref,
+  int expr: @expr ref
+);
+
+yield_exprs(
+  unique int id: @yield_expr
+);
+
+#keyset[id, index]
+yield_expr_attrs(
+  int id: @yield_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yield_expr_exprs(
+  int id: @yield_expr ref,
+  int expr: @expr ref
+);
+
+@adt =
+  @enum
+| @struct
+| @union
+;
+
+#keyset[id, index]
+adt_derive_macro_expansions(
+  int id: @adt ref,
+  int index: int ref,
+  int derive_macro_expansion: @macro_items ref
+);
+
+asm_exprs(
+  unique int id: @asm_expr
+);
+
+#keyset[id, index]
+asm_expr_asm_pieces(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int asm_piece: @asm_piece ref
+);
+
+#keyset[id, index]
+asm_expr_attrs(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+asm_expr_templates(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int template: @expr ref
+);
+
+@assoc_item =
+  @const
+| @function
+| @macro_call
+| @type_alias
+;
+
+block_exprs(
+  unique int id: @block_expr
+);
+
+#keyset[id, index]
+block_expr_attrs(
+  int id: @block_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+block_expr_is_async(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_const(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_gen(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_move(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_try(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_unsafe(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_stmt_lists(
+  int id: @block_expr ref,
+  int stmt_list: @stmt_list ref
+);
+
+call_exprs(
+  unique int id: @call_expr
+);
+
+#keyset[id]
+call_expr_functions(
+  int id: @call_expr ref,
+  int function: @expr ref
+);
+
+extern_blocks(
+  unique int id: @extern_block
+);
+
+#keyset[id]
+extern_block_abis(
+  int id: @extern_block ref,
+  int abi: @abi ref
+);
+
+#keyset[id, index]
+extern_block_attrs(
+  int id: @extern_block ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_block_extern_item_lists(
+  int id: @extern_block ref,
+  int extern_item_list: @extern_item_list ref
+);
+
+#keyset[id]
+extern_block_is_unsafe(
+  int id: @extern_block ref
+);
+
+extern_crates(
+  unique int id: @extern_crate
+);
+
+#keyset[id, index]
+extern_crate_attrs(
+  int id: @extern_crate ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_crate_identifiers(
+  int id: @extern_crate ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+extern_crate_renames(
+  int id: @extern_crate ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+extern_crate_visibilities(
+  int id: @extern_crate ref,
+  int visibility: @visibility ref
+);
+
+@extern_item =
+  @function
+| @macro_call
+| @static
+| @type_alias
+;
+
+impls(
+  unique int id: @impl
+);
+
+#keyset[id]
+impl_assoc_item_lists(
+  int id: @impl ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+impl_attrs(
+  int id: @impl ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+impl_generic_param_lists(
+  int id: @impl ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+impl_is_const(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_default(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_unsafe(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_self_ties(
+  int id: @impl ref,
+  int self_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_traits(
+  int id: @impl ref,
+  int trait: @type_repr ref
+);
+
+#keyset[id]
+impl_visibilities(
+  int id: @impl ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+impl_where_clauses(
+  int id: @impl ref,
+  int where_clause: @where_clause ref
+);
+
+@looping_expr =
+  @for_expr
+| @loop_expr
+| @while_expr
+;
+
+#keyset[id]
+looping_expr_loop_bodies(
+  int id: @looping_expr ref,
+  int loop_body: @block_expr ref
+);
+
+macro_defs(
+  unique int id: @macro_def
+);
+
+#keyset[id]
+macro_def_args(
+  int id: @macro_def ref,
+  int args: @token_tree ref
+);
+
+#keyset[id, index]
+macro_def_attrs(
+  int id: @macro_def ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_def_bodies(
+  int id: @macro_def ref,
+  int body: @token_tree ref
+);
+
+#keyset[id]
+macro_def_names(
+  int id: @macro_def ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_def_visibilities(
+  int id: @macro_def ref,
+  int visibility: @visibility ref
+);
+
+macro_rules(
+  unique int id: @macro_rules
+);
+
+#keyset[id, index]
+macro_rules_attrs(
+  int id: @macro_rules ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_rules_names(
+  int id: @macro_rules ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_rules_token_trees(
+  int id: @macro_rules ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_rules_visibilities(
+  int id: @macro_rules ref,
+  int visibility: @visibility ref
+);
+
+method_call_exprs(
+  unique int id: @method_call_expr
+);
+
+#keyset[id]
+method_call_expr_generic_arg_lists(
+  int id: @method_call_expr ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+method_call_expr_identifiers(
+  int id: @method_call_expr ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+method_call_expr_receivers(
+  int id: @method_call_expr ref,
+  int receiver: @expr ref
+);
+
+modules(
+  unique int id: @module
+);
+
+#keyset[id, index]
+module_attrs(
+  int id: @module ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+module_item_lists(
+  int id: @module ref,
+  int item_list: @item_list ref
+);
+
+#keyset[id]
+module_names(
+  int id: @module ref,
+  int name: @name ref
+);
+
+#keyset[id]
+module_visibilities(
+  int id: @module ref,
+  int visibility: @visibility ref
+);
+
+path_exprs(
+  unique int id: @path_expr
+);
+
+#keyset[id, index]
+path_expr_attrs(
+  int id: @path_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+traits(
+  unique int id: @trait
+);
+
+#keyset[id]
+trait_assoc_item_lists(
+  int id: @trait ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+trait_attrs(
+  int id: @trait ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_generic_param_lists(
+  int id: @trait ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_is_auto(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_is_unsafe(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_names(
+  int id: @trait ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_type_bound_lists(
+  int id: @trait ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_visibilities(
+  int id: @trait ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_where_clauses(
+  int id: @trait ref,
+  int where_clause: @where_clause ref
+);
+
+trait_aliases(
+  unique int id: @trait_alias
+);
+
+#keyset[id, index]
+trait_alias_attrs(
+  int id: @trait_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_alias_generic_param_lists(
+  int id: @trait_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_alias_names(
+  int id: @trait_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_alias_type_bound_lists(
+  int id: @trait_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_alias_visibilities(
+  int id: @trait_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_alias_where_clauses(
+  int id: @trait_alias ref,
+  int where_clause: @where_clause ref
+);
+
+uses(
+  unique int id: @use
+);
+
+#keyset[id, index]
+use_attrs(
+  int id: @use ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+use_use_trees(
+  int id: @use ref,
+  int use_tree: @use_tree ref
+);
+
+#keyset[id]
+use_visibilities(
+  int id: @use ref,
+  int visibility: @visibility ref
+);
+
+consts(
+  unique int id: @const
+);
+
+#keyset[id, index]
+const_attrs(
+  int id: @const ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_bodies(
+  int id: @const ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+const_generic_param_lists(
+  int id: @const ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+const_is_const(
+  int id: @const ref
+);
+
+#keyset[id]
+const_is_default(
+  int id: @const ref
+);
+
+#keyset[id]
+const_names(
+  int id: @const ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_type_reprs(
+  int id: @const ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+const_visibilities(
+  int id: @const ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+const_where_clauses(
+  int id: @const ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+const_has_implementation(
+  int id: @const ref
+);
+
+enums(
+  unique int id: @enum
+);
+
+#keyset[id, index]
+enum_attrs(
+  int id: @enum ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+enum_generic_param_lists(
+  int id: @enum ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+enum_names(
+  int id: @enum ref,
+  int name: @name ref
+);
+
+#keyset[id]
+enum_variant_lists(
+  int id: @enum ref,
+  int variant_list: @variant_list ref
+);
+
+#keyset[id]
+enum_visibilities(
+  int id: @enum ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+enum_where_clauses(
+  int id: @enum ref,
+  int where_clause: @where_clause ref
+);
+
+for_exprs(
+  unique int id: @for_expr
+);
+
+#keyset[id, index]
+for_expr_attrs(
+  int id: @for_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+for_expr_iterables(
+  int id: @for_expr ref,
+  int iterable: @expr ref
+);
+
+#keyset[id]
+for_expr_pats(
+  int id: @for_expr ref,
+  int pat: @pat ref
+);
+
+functions(
+  unique int id: @function
+);
+
+#keyset[id]
+function_abis(
+  int id: @function ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+function_function_bodies(
+  int id: @function ref,
+  int function_body: @block_expr ref
+);
+
+#keyset[id]
+function_generic_param_lists(
+  int id: @function ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+function_is_async(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_const(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_default(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_gen(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_unsafe(
+  int id: @function ref
+);
+
+#keyset[id]
+function_names(
+  int id: @function ref,
+  int name: @name ref
+);
+
+#keyset[id]
+function_ret_types(
+  int id: @function ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+function_visibilities(
+  int id: @function ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+function_where_clauses(
+  int id: @function ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+function_has_implementation(
+  int id: @function ref
+);
+
+loop_exprs(
+  unique int id: @loop_expr
+);
+
+#keyset[id, index]
+loop_expr_attrs(
+  int id: @loop_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+macro_calls(
+  unique int id: @macro_call
+);
+
+#keyset[id, index]
+macro_call_attrs(
+  int id: @macro_call ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_call_paths(
+  int id: @macro_call ref,
+  int path: @path ref
+);
+
+#keyset[id]
+macro_call_token_trees(
+  int id: @macro_call ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_call_macro_call_expansions(
+  int id: @macro_call ref,
+  int macro_call_expansion: @ast_node ref
+);
+
+statics(
+  unique int id: @static
+);
+
+#keyset[id, index]
+static_attrs(
+  int id: @static ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+static_bodies(
+  int id: @static ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+static_is_mut(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_static(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_unsafe(
+  int id: @static ref
+);
+
+#keyset[id]
+static_names(
+  int id: @static ref,
+  int name: @name ref
+);
+
+#keyset[id]
+static_type_reprs(
+  int id: @static ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+static_visibilities(
+  int id: @static ref,
+  int visibility: @visibility ref
+);
+
+structs(
+  unique int id: @struct
+);
+
+#keyset[id, index]
+struct_attrs(
+  int id: @struct ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_lists_(
+  int id: @struct ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+struct_generic_param_lists(
+  int id: @struct ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+struct_names(
+  int id: @struct ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_visibilities(
+  int id: @struct ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+struct_where_clauses(
+  int id: @struct ref,
+  int where_clause: @where_clause ref
+);
+
+type_aliases(
+  unique int id: @type_alias
+);
+
+#keyset[id, index]
+type_alias_attrs(
+  int id: @type_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_alias_generic_param_lists(
+  int id: @type_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_alias_is_default(
+  int id: @type_alias ref
+);
+
+#keyset[id]
+type_alias_names(
+  int id: @type_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_alias_type_reprs(
+  int id: @type_alias ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_alias_type_bound_lists(
+  int id: @type_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+type_alias_visibilities(
+  int id: @type_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_alias_where_clauses(
+  int id: @type_alias ref,
+  int where_clause: @where_clause ref
+);
+
+unions(
+  unique int id: @union
+);
+
+#keyset[id, index]
+union_attrs(
+  int id: @union ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+union_generic_param_lists(
+  int id: @union ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+union_names(
+  int id: @union ref,
+  int name: @name ref
+);
+
+#keyset[id]
+union_struct_field_lists(
+  int id: @union ref,
+  int struct_field_list: @struct_field_list ref
+);
+
+#keyset[id]
+union_visibilities(
+  int id: @union ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+union_where_clauses(
+  int id: @union ref,
+  int where_clause: @where_clause ref
+);
+
+while_exprs(
+  unique int id: @while_expr
+);
+
+#keyset[id, index]
+while_expr_attrs(
+  int id: @while_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+while_expr_conditions(
+  int id: @while_expr ref,
+  int condition: @expr ref
+);
diff --git a/rust/ql/lib/upgrades/dfade44a27bd44db996ae8c5095a11effc883aba/upgrade.properties b/rust/ql/lib/upgrades/dfade44a27bd44db996ae8c5095a11effc883aba/upgrade.properties
new file mode 100644
index 00000000000..88ab69acdd9
--- /dev/null
+++ b/rust/ql/lib/upgrades/dfade44a27bd44db996ae8c5095a11effc883aba/upgrade.properties
@@ -0,0 +1,8 @@
+description: Rename function/closure body relations
+compatibility: backwards
+
+closure_expr_bodies.rel: delete
+function_bodies.rel: delete
+
+closure_expr_closure_bodies.rel: run upgrade.ql new_closure_expr_closure_bodies
+function_function_bodies.rel: run upgrade.ql new_function_function_bodies
diff --git a/rust/ql/lib/upgrades/dfade44a27bd44db996ae8c5095a11effc883aba/upgrade.ql b/rust/ql/lib/upgrades/dfade44a27bd44db996ae8c5095a11effc883aba/upgrade.ql
new file mode 100644
index 00000000000..592947c289e
--- /dev/null
+++ b/rust/ql/lib/upgrades/dfade44a27bd44db996ae8c5095a11effc883aba/upgrade.ql
@@ -0,0 +1,15 @@
+class Element extends @element {
+  string toString() { none() }
+}
+
+class Expr extends Element, @expr { }
+
+class ClosureExpr extends Expr, @closure_expr { }
+
+class Function extends Element, @function { }
+
+query predicate new_closure_expr_closure_bodies(ClosureExpr ce, Expr e) {
+  closure_expr_bodies(ce, e)
+}
+
+query predicate new_function_function_bodies(Function f, Expr e) { function_bodies(f, e) }
diff --git a/rust/ql/lib/utils/test/InlineFlowTest.qll b/rust/ql/lib/utils/test/InlineFlowTest.qll
index 80abf21e1f5..9ba92f7757b 100644
--- a/rust/ql/lib/utils/test/InlineFlowTest.qll
+++ b/rust/ql/lib/utils/test/InlineFlowTest.qll
@@ -34,10 +34,9 @@ private module FlowTestImpl implements InputSig<Location, RustDataFlow> {
     result = src.asExpr().(CallExprCfgNode).getArgument(0).toString()
     or
     sourceNode(src, _) and
-    exists(CallExprBase call |
-      call = src.(Node::FlowSummaryNode).getSourceElement().getCall() and
-      result = call.getArgList().getArg(0).toString()
-    )
+    result = src.(Node::FlowSummaryNode).getSourceElement().getCall().getArg(0).toString() and
+    // Don't use the result if it contains spaces
+    not result.matches("% %")
   }
 
   bindingset[src, sink]
diff --git a/rust/ql/lib/utils/test/PathResolutionInlineExpectationsTest.qll b/rust/ql/lib/utils/test/PathResolutionInlineExpectationsTest.qll
index c5a95ac9038..d8b2703203d 100644
--- a/rust/ql/lib/utils/test/PathResolutionInlineExpectationsTest.qll
+++ b/rust/ql/lib/utils/test/PathResolutionInlineExpectationsTest.qll
@@ -10,25 +10,29 @@ private import utils.test.InlineExpectationsTest
 private module ResolveTest implements TestSig {
   string getARelevantTag() { result = "item" }
 
-  private predicate itemAt(ItemNode i, string filepath, int line, boolean inMacro) {
-    i.getLocation().hasLocationInfo(filepath, _, _, line, _) and
-    if i.(AstNode).isInMacroExpansion() then inMacro = true else inMacro = false
+  private predicate itemAt(ItemNode i, string filepath, int line) {
+    i.getLocation().hasLocationInfo(filepath, _, _, line, _)
   }
 
   private predicate commmentAt(string text, string filepath, int line) {
     exists(Comment c |
       c.getLocation().hasLocationInfo(filepath, line, _, _, _) and
       c.getCommentText().trim() = text and
-      c.fromSource()
+      c.fromSource() and
+      not text.matches("$%")
     )
   }
 
   private predicate item(ItemNode i, string value) {
-    exists(string filepath, int line, boolean inMacro | itemAt(i, filepath, line, inMacro) |
-      commmentAt(value, filepath, line) and inMacro = false
-      or
-      not (commmentAt(_, filepath, line) and inMacro = false) and
-      value = i.getName()
+    exists(string filepath, int line | itemAt(i, filepath, line) |
+      if i instanceof SourceFile
+      then value = i.getFile().getBaseName()
+      else (
+        commmentAt(value, filepath, line)
+        or
+        not commmentAt(_, filepath, line) and
+        value = i.getName()
+      )
     )
   }
 
diff --git a/rust/ql/src/CHANGELOG.md b/rust/ql/src/CHANGELOG.md
index ba5accc2aff..2b0c54fc057 100644
--- a/rust/ql/src/CHANGELOG.md
+++ b/rust/ql/src/CHANGELOG.md
@@ -1,3 +1,48 @@
+## 0.1.19
+
+### Minor Analysis Improvements
+
+* The "Low Rust analysis quality" query (`rust/diagnostic/database-quality`), used by the tool status page, has been extended with a measure of successful type inference.
+
+## 0.1.18
+
+### New Queries
+
+* Added a new query, `rust/insecure-cookie`, to detect cookies created without the 'Secure' attribute.
+
+## 0.1.17
+
+### New Queries
+
+* Added a new query, `rust/non-https-url`, for detecting the use of non-HTTPS URLs that can be intercepted by third parties.
+
+## 0.1.16
+
+### New Queries
+
+* Added a new query, `rust/request-forgery`, for detecting server-side request forgery vulnerabilities.
+
+### Bug Fixes
+
+* The message for `rust/diagnostic/database-quality` has been updated to include detailed database health metrics. These changes are visible on the tool status page.
+
+## 0.1.15
+
+### New Queries
+
+* Added a new query, `rust/log-injection`, for detecting cases where log entries could be forged by a malicious user.
+
+### Bug Fixes
+
+* The "Low Rust analysis quality" query (`rust/diagnostic/database-quality`) has been tuned so that it won't trigger on databases that have extracted normally. This will remove spurious messages of "Low Rust analysis quality" on the CodeQL status page.
+* Fixed an inconsistency across languages where most have a `Customizations.qll` file for adding customizations, but not all did.
+
+## 0.1.14
+
+### New Queries
+
+* Added a new query, `rust/cleartext-storage-database`, for detecting cases where sensitive information is stored non-encrypted in a database.
+
 ## 0.1.13
 
 ### New Queries
diff --git a/rust/ql/src/change-notes/2025-10-31-barriers.md b/rust/ql/src/change-notes/2025-10-31-barriers.md
new file mode 100644
index 00000000000..1504380d8d0
--- /dev/null
+++ b/rust/ql/src/change-notes/2025-10-31-barriers.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* Taint flow barriers have been added to the `rust/regex-injection`, `rust/sql-injection` and `rust/log-injection`, reducing the frequency of false positive results for these queries.
diff --git a/rust/ql/src/change-notes/2025-08-04-cleartext-storage-database.md b/rust/ql/src/change-notes/released/0.1.14.md
similarity index 83%
rename from rust/ql/src/change-notes/2025-08-04-cleartext-storage-database.md
rename to rust/ql/src/change-notes/released/0.1.14.md
index 9aac1d20f45..428909605d1 100644
--- a/rust/ql/src/change-notes/2025-08-04-cleartext-storage-database.md
+++ b/rust/ql/src/change-notes/released/0.1.14.md
@@ -1,4 +1,5 @@
----
-category: newQuery
----
+## 0.1.14
+
+### New Queries
+
 * Added a new query, `rust/cleartext-storage-database`, for detecting cases where sensitive information is stored non-encrypted in a database.
diff --git a/rust/ql/src/change-notes/released/0.1.15.md b/rust/ql/src/change-notes/released/0.1.15.md
new file mode 100644
index 00000000000..eb88879de2c
--- /dev/null
+++ b/rust/ql/src/change-notes/released/0.1.15.md
@@ -0,0 +1,10 @@
+## 0.1.15
+
+### New Queries
+
+* Added a new query, `rust/log-injection`, for detecting cases where log entries could be forged by a malicious user.
+
+### Bug Fixes
+
+* The "Low Rust analysis quality" query (`rust/diagnostic/database-quality`) has been tuned so that it won't trigger on databases that have extracted normally. This will remove spurious messages of "Low Rust analysis quality" on the CodeQL status page.
+* Fixed an inconsistency across languages where most have a `Customizations.qll` file for adding customizations, but not all did.
diff --git a/rust/ql/src/change-notes/released/0.1.16.md b/rust/ql/src/change-notes/released/0.1.16.md
new file mode 100644
index 00000000000..97666aba677
--- /dev/null
+++ b/rust/ql/src/change-notes/released/0.1.16.md
@@ -0,0 +1,9 @@
+## 0.1.16
+
+### New Queries
+
+* Added a new query, `rust/request-forgery`, for detecting server-side request forgery vulnerabilities.
+
+### Bug Fixes
+
+* The message for `rust/diagnostic/database-quality` has been updated to include detailed database health metrics. These changes are visible on the tool status page.
diff --git a/rust/ql/src/change-notes/released/0.1.17.md b/rust/ql/src/change-notes/released/0.1.17.md
new file mode 100644
index 00000000000..13cfb719c3c
--- /dev/null
+++ b/rust/ql/src/change-notes/released/0.1.17.md
@@ -0,0 +1,5 @@
+## 0.1.17
+
+### New Queries
+
+* Added a new query, `rust/non-https-url`, for detecting the use of non-HTTPS URLs that can be intercepted by third parties.
diff --git a/rust/ql/src/change-notes/released/0.1.18.md b/rust/ql/src/change-notes/released/0.1.18.md
new file mode 100644
index 00000000000..8249024b145
--- /dev/null
+++ b/rust/ql/src/change-notes/released/0.1.18.md
@@ -0,0 +1,5 @@
+## 0.1.18
+
+### New Queries
+
+* Added a new query, `rust/insecure-cookie`, to detect cookies created without the 'Secure' attribute.
diff --git a/rust/ql/src/change-notes/released/0.1.19.md b/rust/ql/src/change-notes/released/0.1.19.md
new file mode 100644
index 00000000000..67ccce578c8
--- /dev/null
+++ b/rust/ql/src/change-notes/released/0.1.19.md
@@ -0,0 +1,5 @@
+## 0.1.19
+
+### Minor Analysis Improvements
+
+* The "Low Rust analysis quality" query (`rust/diagnostic/database-quality`), used by the tool status page, has been extended with a measure of successful type inference.
diff --git a/rust/ql/src/codeql-pack.release.yml b/rust/ql/src/codeql-pack.release.yml
index f43379f8196..de6e4c49068 100644
--- a/rust/ql/src/codeql-pack.release.yml
+++ b/rust/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.1.13
+lastReleaseVersion: 0.1.19
diff --git a/rust/ql/src/qlpack.yml b/rust/ql/src/qlpack.yml
index 2ca2fb08a0f..a26c9d35de5 100644
--- a/rust/ql/src/qlpack.yml
+++ b/rust/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/rust-queries
-version: 0.1.14-dev
+version: 0.1.20-dev
 groups:
   - rust
   - queries
diff --git a/rust/ql/src/queries/security/CWE-117/LogInjection.qhelp b/rust/ql/src/queries/security/CWE-117/LogInjection.qhelp
new file mode 100644
index 00000000000..f957d385c58
--- /dev/null
+++ b/rust/ql/src/queries/security/CWE-117/LogInjection.qhelp
@@ -0,0 +1,47 @@
+<!DOCTYPE qhelp PUBLIC
+  "-//Semmle//qhelp//EN"
+  "qhelp.dtd">
+<qhelp>
+
+<overview>
+
+<p>If unsanitized user input is written to a log entry, a malicious user may be able to forge new log entries.</p>
+
+<p>Forgery can occur if a user provides some input with characters that are interpreted
+when the log output is displayed. If the log is displayed as a plain text file, then new
+line characters can be used by a malicious user. If the log is displayed as HTML, then
+arbitrary HTML may be included to spoof log entries.</p>
+</overview>
+
+<recommendation>
+<p>
+User input should be suitably sanitized before it is logged.
+</p>
+<p>
+If the log entries are in plain text, then line breaks should be removed from user input using
+<code>String::replace</code> or similar. Care should also be taken that user input is clearly marked
+in log entries.
+</p>
+<p>
+For log entries that will be displayed in HTML, user input should be HTML-encoded before being logged, to prevent forgery and
+other forms of HTML injection.
+</p>
+
+</recommendation>
+
+<example>
+<p>In the first example, a username, provided by the user via command line arguments, is logged using the <code>log</code> crate.
+If a malicious user provides <code>Guest\n[INFO] User: Admin\n</code> as a username parameter, 
+the log entry will be split into multiple lines, where the second line will appear as <code>[INFO] User: Admin</code>, 
+potentially forging a legitimate admin login entry.
+</p>
+<sample src="LogInjectionBad.rs" />
+
+<p>In the second example, <code>String::replace</code> is used to ensure no line endings are present in the user input before logging.</p>
+<sample src="LogInjectionGood.rs" />
+</example>
+
+<references>
+<li>OWASP: <a href="https://owasp.org/www-community/attacks/Log_Injection">Log Injection</a>.</li>
+</references>
+</qhelp>
\ No newline at end of file
diff --git a/rust/ql/src/queries/security/CWE-117/LogInjection.ql b/rust/ql/src/queries/security/CWE-117/LogInjection.ql
new file mode 100644
index 00000000000..64d9c47c790
--- /dev/null
+++ b/rust/ql/src/queries/security/CWE-117/LogInjection.ql
@@ -0,0 +1,41 @@
+/**
+ * @name Log injection
+ * @description Building log entries from user-controlled sources is vulnerable to
+ *              insertion of forged log entries by a malicious user.
+ * @kind path-problem
+ * @problem.severity error
+ * @security-severity 2.6
+ * @precision medium
+ * @id rust/log-injection
+ * @tags security
+ *       external/cwe/cwe-117
+ */
+
+import rust
+import codeql.rust.dataflow.DataFlow
+import codeql.rust.dataflow.TaintTracking
+import codeql.rust.security.LogInjectionExtensions
+
+/**
+ * A taint configuration for tainted data that reaches a log injection sink.
+ */
+module LogInjectionConfig implements DataFlow::ConfigSig {
+  import LogInjection
+
+  predicate isSource(DataFlow::Node node) { node instanceof Source }
+
+  predicate isSink(DataFlow::Node node) { node instanceof Sink }
+
+  predicate isBarrier(DataFlow::Node barrier) { barrier instanceof Barrier }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
+}
+
+module LogInjectionFlow = TaintTracking::Global<LogInjectionConfig>;
+
+import LogInjectionFlow::PathGraph
+
+from LogInjectionFlow::PathNode sourceNode, LogInjectionFlow::PathNode sinkNode
+where LogInjectionFlow::flowPath(sourceNode, sinkNode)
+select sinkNode.getNode(), sourceNode, sinkNode, "Log entry depends on a $@.", sourceNode.getNode(),
+  "user-provided value"
diff --git a/rust/ql/src/queries/security/CWE-117/LogInjectionBad.rs b/rust/ql/src/queries/security/CWE-117/LogInjectionBad.rs
new file mode 100644
index 00000000000..b881c681336
--- /dev/null
+++ b/rust/ql/src/queries/security/CWE-117/LogInjectionBad.rs
@@ -0,0 +1,13 @@
+use std::env;
+use log::info;
+
+fn main() {
+    env_logger::init();
+
+    // Get username from command line arguments
+    let args: Vec<String> = env::args().collect();
+    let username = args.get(1).unwrap_or(&String::from("Guest")).clone();
+
+    // BAD: log message constructed with unsanitized user input
+    info!("User login attempt: {}", username);
+}
diff --git a/rust/ql/src/queries/security/CWE-117/LogInjectionGood.rs b/rust/ql/src/queries/security/CWE-117/LogInjectionGood.rs
new file mode 100644
index 00000000000..db6a24102e9
--- /dev/null
+++ b/rust/ql/src/queries/security/CWE-117/LogInjectionGood.rs
@@ -0,0 +1,19 @@
+use std::env;
+use log::info;
+
+fn sanitize_for_logging(input: &str) -> String {
+    // Remove newlines and carriage returns to prevent log injection
+    input.replace('\n', "").replace('\r', "")
+}
+
+fn main() {
+    env_logger::init();
+
+    // Get username from command line arguments
+    let args: Vec<String> = env::args().collect();
+    let username = args.get(1).unwrap_or(&String::from("Guest")).clone();
+
+    // GOOD: log message constructed with sanitized user input
+    let sanitized_username = sanitize_for_logging(username.as_str());
+    info!("User login attempt: {}", sanitized_username);
+}
diff --git a/rust/ql/src/queries/security/CWE-319/UseOfHttp.qhelp b/rust/ql/src/queries/security/CWE-319/UseOfHttp.qhelp
new file mode 100644
index 00000000000..088f202965a
--- /dev/null
+++ b/rust/ql/src/queries/security/CWE-319/UseOfHttp.qhelp
@@ -0,0 +1,49 @@
+<!DOCTYPE qhelp PUBLIC
+  "-//Semmle//qhelp//EN"
+  "qhelp.dtd">
+<qhelp>
+<overview>
+
+<p>Constructing URLs with the HTTP protocol can lead to insecure connections.</p>
+
+<p>Furthermore, constructing URLs with the HTTP protocol can create problems if other parts of the
+code expect HTTPS URLs. A typical pattern is to use libraries that expect secure connections,
+which may fail or fall back to insecure behavior when provided with HTTP URLs instead of HTTPS URLs.</p>
+
+</overview>
+<recommendation>
+
+<p>When you construct a URL for network requests, ensure that you use an HTTPS URL rather than an HTTP URL.
+Then, any connections that are made using that URL are secure TLS connections.</p>
+
+</recommendation>
+<example>
+
+<p>The following examples show two ways of making a network request using a URL. When the request is
+made using an HTTP URL rather than an HTTPS URL, the connection is unsecured and can be intercepted
+by attackers:</p>
+
+<sample src="UseOfHttpBad.rs" />
+
+<p>A better approach is to use HTTPS. When the request is made using an HTTPS URL, the connection
+is a secure TLS connection:</p>
+
+<sample src="UseOfHttpGood.rs" />
+
+</example>
+<references>
+
+<li>
+OWASP:
+<a href="https://cheatsheetseries.owasp.org/cheatsheets/Transport_Layer_Security_Cheat_Sheet.html">Transport Layer Security Cheat Sheet</a>.
+</li>
+<li>
+OWASP Top 10:
+<a href="https://owasp.org/Top10/A08_2021-Software_and_Data_Integrity_Failures/">A08:2021 - Software and Data Integrity Failures</a>.
+</li>
+<li>Rust reqwest documentation:
+<a href="https://docs.rs/reqwest/">reqwest crate</a>.
+</li>
+
+</references>
+</qhelp>
diff --git a/rust/ql/src/queries/security/CWE-319/UseOfHttp.ql b/rust/ql/src/queries/security/CWE-319/UseOfHttp.ql
new file mode 100644
index 00000000000..4a464d90bbe
--- /dev/null
+++ b/rust/ql/src/queries/security/CWE-319/UseOfHttp.ql
@@ -0,0 +1,42 @@
+/**
+ * @name Failure to use HTTPS URLs
+ * @description Non-HTTPS connections can be intercepted by third parties.
+ * @kind path-problem
+ * @problem.severity warning
+ * @security-severity 8.1
+ * @precision high
+ * @id rust/non-https-url
+ * @tags security
+ *       external/cwe/cwe-319
+ *       external/cwe/cwe-345
+ */
+
+import rust
+import codeql.rust.dataflow.DataFlow
+import codeql.rust.dataflow.TaintTracking
+import codeql.rust.security.UseOfHttpExtensions
+
+/**
+ * A taint configuration for HTTP URL strings that flow to URL-using sinks.
+ */
+module UseOfHttpConfig implements DataFlow::ConfigSig {
+  import UseOfHttp
+
+  predicate isSource(DataFlow::Node node) { node instanceof Source }
+
+  predicate isSink(DataFlow::Node node) { node instanceof Sink }
+
+  predicate isBarrier(DataFlow::Node barrier) { barrier instanceof Barrier }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
+}
+
+module UseOfHttpFlow = TaintTracking::Global<UseOfHttpConfig>;
+
+import UseOfHttpFlow::PathGraph
+
+from UseOfHttpFlow::PathNode sourceNode, UseOfHttpFlow::PathNode sinkNode
+where UseOfHttpFlow::flowPath(sourceNode, sinkNode)
+select sinkNode.getNode(), sourceNode, sinkNode,
+  "This URL may be constructed with the HTTP protocol, from $@.", sourceNode.getNode(),
+  "this HTTP URL"
diff --git a/rust/ql/src/queries/security/CWE-319/UseOfHttpBad.rs b/rust/ql/src/queries/security/CWE-319/UseOfHttpBad.rs
new file mode 100644
index 00000000000..ada466cae5c
--- /dev/null
+++ b/rust/ql/src/queries/security/CWE-319/UseOfHttpBad.rs
@@ -0,0 +1,10 @@
+// BAD: Using HTTP URL which can be intercepted
+use reqwest;
+
+fn main() {
+    let url = "http://example.com/sensitive-data";
+    
+    // This makes an insecure HTTP request that can be intercepted
+    let response = reqwest::blocking::get(url).unwrap();
+    println!("Response: {}", response.text().unwrap());
+}
\ No newline at end of file
diff --git a/rust/ql/src/queries/security/CWE-319/UseOfHttpGood.rs b/rust/ql/src/queries/security/CWE-319/UseOfHttpGood.rs
new file mode 100644
index 00000000000..22b94235fa1
--- /dev/null
+++ b/rust/ql/src/queries/security/CWE-319/UseOfHttpGood.rs
@@ -0,0 +1,10 @@
+// GOOD: Using HTTPS URL which provides encryption
+use reqwest;
+
+fn main() {
+    let url = "https://example.com/sensitive-data";
+    
+    // This makes a secure HTTPS request that is encrypted
+    let response = reqwest::blocking::get(url).unwrap();
+    println!("Response: {}", response.text().unwrap());
+}
\ No newline at end of file
diff --git a/rust/ql/src/queries/security/CWE-327/BrokenCryptoAlgorithm.qhelp b/rust/ql/src/queries/security/CWE-327/BrokenCryptoAlgorithm.qhelp
index e24222e09fc..0c9e8fc289d 100644
--- a/rust/ql/src/queries/security/CWE-327/BrokenCryptoAlgorithm.qhelp
+++ b/rust/ql/src/queries/security/CWE-327/BrokenCryptoAlgorithm.qhelp
@@ -3,20 +3,32 @@
 "qhelp.dtd">
 <qhelp>
      <overview>
-          <p>
-               Using broken or weak cryptographic algorithms can leave data
-               vulnerable to being decrypted or forged by an attacker.
-          </p>
+		<p>
+			Using broken or weak cryptographic algorithms may compromise
+			security guarantees such as confidentiality, integrity, and
+			authenticity.
+		</p>
+
+		<p>
+			Many cryptographic algorithms are known to be weak or flawed. The
+			security guarantees of a system often rely on the underlying
+			cryptography, so using a weak algorithm can have severe consequences.
+			For example:
+		</p>
+
+		<ul>
+			<li>
+			If a weak encryption algorithm is used, an attacker may be able to
+			decrypt sensitive data.
+			</li>
+			<li>
+			If a weak algorithm is used for digital signatures, an attacker may
+			be able to forge signatures and impersonate legitimate users.
+			</li>
+		</ul>
 
           <p>
-               Many cryptographic algorithms provided by cryptography
-               libraries are known to be weak, or flawed. Using such an
-               algorithm means that encrypted or hashed data is less
-               secure than it appears to be.
-          </p>
-
-          <p>
-               This query alerts on any use of a weak cryptographic algorithm, that is
+               This query alerts on any use of a weak cryptographic algorithm that is
                not a hashing algorithm. Use of broken or weak cryptographic hash
                functions are handled by the
                <code>rust/weak-sensitive-data-hashing</code> query.
diff --git a/rust/ql/src/queries/security/CWE-328/WeakSensitiveDataHashing.qhelp b/rust/ql/src/queries/security/CWE-327/WeakSensitiveDataHashing.qhelp
similarity index 100%
rename from rust/ql/src/queries/security/CWE-328/WeakSensitiveDataHashing.qhelp
rename to rust/ql/src/queries/security/CWE-327/WeakSensitiveDataHashing.qhelp
diff --git a/rust/ql/src/queries/security/CWE-328/WeakSensitiveDataHashing.ql b/rust/ql/src/queries/security/CWE-327/WeakSensitiveDataHashing.ql
similarity index 100%
rename from rust/ql/src/queries/security/CWE-328/WeakSensitiveDataHashing.ql
rename to rust/ql/src/queries/security/CWE-327/WeakSensitiveDataHashing.ql
diff --git a/rust/ql/src/queries/security/CWE-328/WeakSensitiveDataHashingBad.rs b/rust/ql/src/queries/security/CWE-327/WeakSensitiveDataHashingBad.rs
similarity index 100%
rename from rust/ql/src/queries/security/CWE-328/WeakSensitiveDataHashingBad.rs
rename to rust/ql/src/queries/security/CWE-327/WeakSensitiveDataHashingBad.rs
diff --git a/rust/ql/src/queries/security/CWE-328/WeakSensitiveDataHashingGood.rs b/rust/ql/src/queries/security/CWE-327/WeakSensitiveDataHashingGood.rs
similarity index 100%
rename from rust/ql/src/queries/security/CWE-328/WeakSensitiveDataHashingGood.rs
rename to rust/ql/src/queries/security/CWE-327/WeakSensitiveDataHashingGood.rs
diff --git a/rust/ql/src/queries/security/CWE-614/InsecureCookie.qhelp b/rust/ql/src/queries/security/CWE-614/InsecureCookie.qhelp
new file mode 100644
index 00000000000..561b334c510
--- /dev/null
+++ b/rust/ql/src/queries/security/CWE-614/InsecureCookie.qhelp
@@ -0,0 +1,33 @@
+<!DOCTYPE qhelp PUBLIC
+  "-//Semmle//qhelp//EN"
+  "qhelp.dtd">
+<qhelp>
+<overview>
+
+<p>Failing to set the 'Secure' attribute on a cookie allows it to be transmitted over an unencrypted (HTTP) connection. If an attacker can observe a user's network traffic, they can access sensitive information in the cookie and potentially use it to impersonate the user.</p>
+
+</overview>
+<recommendation>
+
+<p>Always set the cookie 'Secure' attribute so that the browser only sends the cookie over HTTPS.</p>
+
+</recommendation>
+<example>
+
+<p>The following example creates a cookie using the <a href="https://crates.io/crates/cookie">cookie</a> crate without the 'Secure' attribute:</p>
+
+<sample src="InsecureCookieBad.rs" />
+
+<p>In the fixed example, we either call <code>secure(true)</code> on the <code>CookieBuilder</code> or <code>set_secure(true)</code> on the <code>Cookie</code> itself:</p>
+
+<sample src="InsecureCookieGood.rs" />
+
+</example>
+<references>
+
+<li>MDN Web Docs: <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Guides/Cookies">Using HTTP cookies</a>.</li>
+<li>OWASP Cheat Sheet Series: <a href="https://cheatsheetseries.owasp.org/cheatsheets/Session_Management_Cheat_Sheet.html#transport-layer-security">Session Management Cheat Sheet - Transport Layer Security</a>.</li>
+<li>MDN Web Docs: <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Reference/Headers/Set-Cookie#secure">Set-Cookie header - Secure</a>.</li>
+
+</references>
+</qhelp>
diff --git a/rust/ql/src/queries/security/CWE-614/InsecureCookie.ql b/rust/ql/src/queries/security/CWE-614/InsecureCookie.ql
new file mode 100644
index 00000000000..61996adaf05
--- /dev/null
+++ b/rust/ql/src/queries/security/CWE-614/InsecureCookie.ql
@@ -0,0 +1,92 @@
+/**
+ * @name 'Secure' attribute is not set to true
+ * @description Omitting the 'Secure' attribute allows data to be transmitted insecurely
+ *              using HTTP. Always set 'Secure' to 'true' to ensure that HTTPS
+ *              is used at all times.
+ * @kind path-problem
+ * @problem.severity error
+ * @security-severity 7.5
+ * @precision high
+ * @id rust/insecure-cookie
+ * @tags security
+ *       external/cwe/cwe-319
+ *       external/cwe/cwe-614
+ */
+
+import rust
+import codeql.rust.dataflow.DataFlow
+import codeql.rust.dataflow.TaintTracking
+import codeql.rust.security.InsecureCookieExtensions
+
+/**
+ * A data flow configuration for tracking values representing cookies without the
+ * 'secure' attribute set. This is the primary data flow configuration for this
+ * query.
+ */
+module InsecureCookieConfig implements DataFlow::ConfigSig {
+  import InsecureCookie
+
+  predicate isSource(DataFlow::Node node) {
+    // creation of a cookie or cookie configuration with default, insecure settings
+    node instanceof Source
+    or
+    // setting the 'secure' attribute to false (or an unknown value)
+    cookieSetNode(node, "secure", false)
+  }
+
+  predicate isSink(DataFlow::Node node) {
+    // use of a cookie or cookie configuration
+    node instanceof Sink
+  }
+
+  predicate isBarrierIn(DataFlow::Node node) {
+    // setting the 'secure' attribute
+    cookieSetNode(node, "secure", _)
+    or
+    node instanceof Barrier
+  }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
+}
+
+/**
+ * A data flow configuration for tracking values representing cookies with the
+ * 'partitioned' attribute set. This is a secondary data flow configuration used
+ * to filter out unwanted results.
+ */
+module PartitionedCookieConfig implements DataFlow::ConfigSig {
+  import InsecureCookie
+
+  predicate isSource(DataFlow::Node node) {
+    // setting the 'partitioned' attribute to true
+    cookieSetNode(node, "partitioned", true)
+  }
+
+  predicate isSink(DataFlow::Node node) {
+    // use of a cookie or cookie configuration
+    node instanceof Sink
+  }
+
+  predicate isBarrier(DataFlow::Node node) {
+    // setting the 'partitioned' attribute to false (or an unknown value)
+    cookieSetNode(node, "partitioned", false)
+    or
+    node instanceof Barrier
+  }
+
+  predicate observeDiffInformedIncrementalMode() {
+    none() // only used negatively
+  }
+}
+
+module InsecureCookieFlow = TaintTracking::Global<InsecureCookieConfig>;
+
+module PartitionedCookieFlow = TaintTracking::Global<PartitionedCookieConfig>;
+
+import InsecureCookieFlow::PathGraph
+
+from InsecureCookieFlow::PathNode sourceNode, InsecureCookieFlow::PathNode sinkNode
+where
+  InsecureCookieFlow::flowPath(sourceNode, sinkNode) and
+  not PartitionedCookieFlow::flow(_, sinkNode.getNode())
+select sinkNode.getNode(), sourceNode, sinkNode, "Cookie attribute 'Secure' is not set to true."
diff --git a/rust/ql/src/queries/security/CWE-614/InsecureCookieBad.rs b/rust/ql/src/queries/security/CWE-614/InsecureCookieBad.rs
new file mode 100644
index 00000000000..e4939f6d5c8
--- /dev/null
+++ b/rust/ql/src/queries/security/CWE-614/InsecureCookieBad.rs
@@ -0,0 +1,6 @@
+use cookie::Cookie;
+
+// BAD: creating a cookie without specifying the `secure` attribute
+let cookie = Cookie::build(("session", "abcd1234")).build();
+let mut jar = cookie::CookieJar::new();
+jar.add(cookie.clone());
diff --git a/rust/ql/src/queries/security/CWE-614/InsecureCookieGood.rs b/rust/ql/src/queries/security/CWE-614/InsecureCookieGood.rs
new file mode 100644
index 00000000000..886d969604c
--- /dev/null
+++ b/rust/ql/src/queries/security/CWE-614/InsecureCookieGood.rs
@@ -0,0 +1,11 @@
+use cookie::Cookie;
+
+// GOOD: set the `CookieBuilder` 'Secure' attribute so that the cookie is only sent over HTTPS
+let secure_cookie = Cookie::build(("session", "abcd1234")).secure(true).build();
+let mut jar = cookie::CookieJar::new();
+jar.add(secure_cookie.clone());
+
+// GOOD: alternatively, set the 'Secure' attribute on an existing `Cookie`
+let mut secure_cookie2 = Cookie::new("session", "abcd1234");
+secure_cookie2.set_secure(true);
+jar.add(secure_cookie2);
diff --git a/rust/ql/src/queries/security/CWE-798/HardcodedCryptographicValue.ql b/rust/ql/src/queries/security/CWE-798/HardcodedCryptographicValue.ql
index cd0dca79119..f5a43c5419c 100644
--- a/rust/ql/src/queries/security/CWE-798/HardcodedCryptographicValue.ql
+++ b/rust/ql/src/queries/security/CWE-798/HardcodedCryptographicValue.ql
@@ -39,12 +39,6 @@ module HardcodedCryptographicValueConfig implements DataFlow::ConfigSig {
     //  case like `[0, 0, 0, 0]`)
     isSource(node)
   }
-
-  predicate allowImplicitRead(DataFlow::Node node, DataFlow::ContentSet c) {
-    // flow out from reference content at sinks.
-    isSink(node) and
-    c.getAReadContent() instanceof ReferenceContent
-  }
 }
 
 module HardcodedCryptographicValueFlow = TaintTracking::Global<HardcodedCryptographicValueConfig>;
diff --git a/rust/ql/src/queries/security/CWE-825/AccessAfterLifetime.ql b/rust/ql/src/queries/security/CWE-825/AccessAfterLifetime.ql
index fce64dcf0ff..65c6d861638 100644
--- a/rust/ql/src/queries/security/CWE-825/AccessAfterLifetime.ql
+++ b/rust/ql/src/queries/security/CWE-825/AccessAfterLifetime.ql
@@ -32,7 +32,9 @@ module AccessAfterLifetimeConfig implements DataFlow::ConfigSig {
   predicate observeDiffInformedIncrementalMode() { any() }
 
   Location getASelectedSourceLocation(DataFlow::Node source) {
-    exists(Variable target, DataFlow::Node sink | result = target.getLocation() |
+    exists(Variable target, DataFlow::Node sink |
+      result = [target.getLocation(), source.getLocation()]
+    |
       isSink(sink) and
       narrowDereferenceAfterLifetime(source, sink, target)
     )
diff --git a/rust/ql/src/queries/security/CWE-918/RequestForgery.qhelp b/rust/ql/src/queries/security/CWE-918/RequestForgery.qhelp
new file mode 100644
index 00000000000..7017e2a6b57
--- /dev/null
+++ b/rust/ql/src/queries/security/CWE-918/RequestForgery.qhelp
@@ -0,0 +1,48 @@
+<!DOCTYPE qhelp PUBLIC
+  "-//Semmle//qhelp//EN"
+  "qhelp.dtd">
+<qhelp>
+
+<overview>
+<p>
+Directly incorporating user input into an HTTP request without validating the
+input can facilitate server-side request forgery (SSRF) attacks. In these
+attacks, the server may be tricked into making a request to an unintended API
+endpoint or resource.
+
+If the server is connected to an internal network, attackers can bypass security
+boundaries to target internal services.
+
+Forged requests can execute unintended actions, leak data if redirected to an
+external server, or compromise the server if responses are handled insecurely.
+</p>
+</overview>
+
+<recommendation>
+<p>
+To guard against SSRF attacks, you should avoid putting user-provided input
+directly into a request URL. Instead, maintain a list of authorized URLs on the
+server; then choose from that list based on the input provided. Alternatively,
+ensure requests constructed from user input are limited to a particular host or
+a more restrictive URL prefix.
+</p>
+</recommendation>
+
+<example>
+<p>
+The following example shows an HTTP request parameter being used directly to
+form a new request without validating the input, which facilitates SSRF attacks.
+It also shows how to remedy the problem by validating the user input against a
+known fixed string.
+</p>
+
+<sample src="RequestForgery.rs" />
+</example>
+
+<references>
+  <li>
+    <a href="https://owasp.org/www-community/attacks/Server_Side_Request_Forgery">OWASP Server Side Request Forgery</a>.
+  </li>
+</references>
+
+</qhelp>
diff --git a/rust/ql/src/queries/security/CWE-918/RequestForgery.ql b/rust/ql/src/queries/security/CWE-918/RequestForgery.ql
new file mode 100644
index 00000000000..cbd1069a441
--- /dev/null
+++ b/rust/ql/src/queries/security/CWE-918/RequestForgery.ql
@@ -0,0 +1,38 @@
+/**
+ * @name Server-side request forgery
+ * @description Making a network request with user-controlled data in the URL allows for request forgery attacks.
+ * @kind path-problem
+ * @problem.severity error
+ * @security-severity 9.1
+ * @precision high
+ * @id rust/request-forgery
+ * @tags security
+ *       external/cwe/cwe-918
+ */
+
+private import rust
+private import codeql.rust.dataflow.TaintTracking
+private import codeql.rust.dataflow.DataFlow
+private import codeql.rust.security.RequestForgeryExtensions
+
+/**
+ * A taint-tracking configuration for detecting request forgery vulnerabilities.
+ */
+module RequestForgeryConfig implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) { source instanceof RequestForgery::Source }
+
+  predicate isSink(DataFlow::Node sink) { sink instanceof RequestForgery::Sink }
+
+  predicate isBarrier(DataFlow::Node barrier) { barrier instanceof RequestForgery::Barrier }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
+}
+
+module RequestForgeryFlow = TaintTracking::Global<RequestForgeryConfig>;
+
+import RequestForgeryFlow::PathGraph
+
+from RequestForgeryFlow::PathNode source, RequestForgeryFlow::PathNode sink
+where RequestForgeryFlow::flowPath(source, sink)
+select sink.getNode(), source, sink, "The URL of this request depends on a $@.", source.getNode(),
+  "user-provided value"
diff --git a/rust/ql/src/queries/security/CWE-918/RequestForgery.rs b/rust/ql/src/queries/security/CWE-918/RequestForgery.rs
new file mode 100644
index 00000000000..bb93a4b0a49
--- /dev/null
+++ b/rust/ql/src/queries/security/CWE-918/RequestForgery.rs
@@ -0,0 +1,39 @@
+// BAD: Endpoint handler that makes requests based on user input
+async fn vulnerable_endpoint_handler(req: Request) -> Result<Response> {
+    // This request is vulnerable to SSRF attacks as the user controls the
+    // entire URL
+    let response = reqwest::get(&req.user_url).await;
+    
+    match response {
+        Ok(resp) => {
+            let body = resp.text().await.unwrap_or_default();
+            Ok(Response {
+                message: "Success".to_string(),
+                data: body,
+            })
+        }
+        Err(_) => Err("Request failed")
+    }
+}
+
+// GOOD: Validate user input against an allowlist
+async fn secure_endpoint_handler(req: Request) -> Result<Response> {
+    // Allow list of specific, known-safe URLs
+    let allowed_hosts = ["api.example.com", "trusted-service.com"];
+    
+    if !allowed_hosts.contains(&req.user_url) {
+        return Err("Untrusted domain");
+    }
+    // This request is safe as the user input has been validated
+    let response = reqwest::get(&req.user_url).await;
+    match response {
+        Ok(resp) => {
+            let body = resp.text().await.unwrap_or_default();
+            Ok(Response {
+                message: "Success".to_string(),
+                data: body,
+            })
+        }
+        Err(_) => Err("Request failed")
+    }
+}
diff --git a/rust/ql/src/queries/summary/Stats.qll b/rust/ql/src/queries/summary/Stats.qll
index 030cd74ebe2..7cd4fd67e24 100644
--- a/rust/ql/src/queries/summary/Stats.qll
+++ b/rust/ql/src/queries/summary/Stats.qll
@@ -22,11 +22,15 @@ private import codeql.rust.security.AccessInvalidPointerExtensions
 private import codeql.rust.security.CleartextLoggingExtensions
 private import codeql.rust.security.CleartextStorageDatabaseExtensions
 private import codeql.rust.security.CleartextTransmissionExtensions
+private import codeql.rust.security.HardcodedCryptographicValueExtensions
+private import codeql.rust.security.InsecureCookieExtensions
+private import codeql.rust.security.LogInjectionExtensions
+private import codeql.rust.security.RequestForgeryExtensions
 private import codeql.rust.security.SqlInjectionExtensions
 private import codeql.rust.security.TaintedPathExtensions
 private import codeql.rust.security.UncontrolledAllocationSizeExtensions
+private import codeql.rust.security.UseOfHttpExtensions
 private import codeql.rust.security.WeakSensitiveDataHashingExtensions
-private import codeql.rust.security.HardcodedCryptographicValueExtensions
 
 /**
  * Gets a count of the total number of lines of code in the database.
diff --git a/rust/ql/src/queries/telemetry/DatabaseQuality.qll b/rust/ql/src/queries/telemetry/DatabaseQuality.qll
index 15826fec4c4..64adf9826dc 100644
--- a/rust/ql/src/queries/telemetry/DatabaseQuality.qll
+++ b/rust/ql/src/queries/telemetry/DatabaseQuality.qll
@@ -6,9 +6,23 @@
 
 import rust
 import codeql.util.ReportStats
+import codeql.rust.internal.TypeInference as TypeInference
+
+/**
+ * A file that is included in the quality statistics.
+ */
+private class RelevantFile extends File {
+  RelevantFile() {
+    // files that are not skipped by the compilation
+    not this.(ExtractedFile).isSkippedByCompilation()
+  }
+}
 
 module CallTargetStats implements StatsSig {
-  int getNumberOfOk() { result = count(CallExprBase c | exists(c.getStaticTarget())) }
+  int getNumberOfOk() {
+    result =
+      count(CallExprBase c | c.getFile() instanceof RelevantFile and exists(c.getStaticTarget()))
+  }
 
   private predicate isLambdaCall(CallExpr call) {
     exists(Expr receiver | receiver = call.getFunction() |
@@ -18,6 +32,7 @@ module CallTargetStats implements StatsSig {
   }
 
   additional predicate isNotOkCall(CallExprBase c) {
+    c.getFile() instanceof RelevantFile and
     not exists(c.getStaticTarget()) and
     not isLambdaCall(c)
   }
@@ -30,9 +45,13 @@ module CallTargetStats implements StatsSig {
 }
 
 module MacroCallTargetStats implements StatsSig {
-  int getNumberOfOk() { result = count(MacroCall c | c.hasMacroCallExpansion()) }
+  int getNumberOfOk() {
+    result = count(MacroCall c | c.getFile() instanceof RelevantFile and c.hasMacroCallExpansion())
+  }
 
-  additional predicate isNotOkCall(MacroCall c) { not c.hasMacroCallExpansion() }
+  additional predicate isNotOkCall(MacroCall c) {
+    c.getFile() instanceof RelevantFile and not c.hasMacroCallExpansion()
+  }
 
   int getNumberOfNotOk() { result = count(MacroCall c | isNotOkCall(c)) }
 
@@ -41,6 +60,34 @@ module MacroCallTargetStats implements StatsSig {
   string getNotOkText() { result = "macro calls with missing call target" }
 }
 
+private predicate hasGoodType(Expr e) { exists(TypeInference::inferType(e, _)) }
+
+module ExprTypeStats implements StatsSig {
+  int getNumberOfOk() {
+    result =
+      count(Expr e |
+        e.getFile() instanceof RelevantFile and
+        e.fromSource() and
+        hasGoodType(e)
+      )
+  }
+
+  int getNumberOfNotOk() {
+    result =
+      count(Expr e |
+        e.getFile() instanceof RelevantFile and
+        e.fromSource() and
+        not hasGoodType(e)
+      )
+  }
+
+  string getOkText() { result = "expressions with known type" }
+
+  string getNotOkText() { result = "expressions with unknown type" }
+}
+
 module CallTargetStatsReport = ReportStats<CallTargetStats>;
 
 module MacroCallTargetStatsReport = ReportStats<MacroCallTargetStats>;
+
+module ExprTypeStatsReport = ReportStats<ExprTypeStats>;
diff --git a/rust/ql/src/queries/telemetry/DatabaseQualityDiagnostics.ql b/rust/ql/src/queries/telemetry/DatabaseQualityDiagnostics.ql
index c5e3645e993..02933b3bd5f 100644
--- a/rust/ql/src/queries/telemetry/DatabaseQualityDiagnostics.ql
+++ b/rust/ql/src/queries/telemetry/DatabaseQualityDiagnostics.ql
@@ -9,24 +9,38 @@ import rust
 import DatabaseQuality
 import codeql.util.Unit
 
+private predicate diagnostic(string msg, float value, float threshold) {
+  CallTargetStatsReport::percentageOfOk(msg, value) and threshold = 50
+  or
+  MacroCallTargetStatsReport::percentageOfOk(msg, value) and threshold = 50
+  or
+  ExprTypeStatsReport::percentageOfOk(msg, value) and threshold = 20
+}
+
+private string getDbHealth() {
+  result =
+    strictconcat(string msg, float value, float threshold |
+      diagnostic(msg, value, threshold)
+    |
+      msg + ": " + value.floor() + " % (threshold " + threshold.floor() + " %)", ". "
+    )
+}
+
 class DbQualityDiagnostic extends Unit {
   DbQualityDiagnostic() {
-    exists(float percentageGood |
-      CallTargetStatsReport::percentageOfOk(_, percentageGood)
-      or
-      MacroCallTargetStatsReport::percentageOfOk(_, percentageGood)
-    |
-      percentageGood < 95
+    exists(float percentageGood, float threshold |
+      diagnostic(_, percentageGood, threshold) and
+      percentageGood < threshold
     )
   }
 
   string toString() {
     result =
       "Scanning Rust code completed successfully, but the scan encountered issues. " +
-        "This may be caused by problems identifying dependencies or use of generated source code, among other reasons -- "
-        +
-        "see other CodeQL diagnostics reported on the CodeQL status page for more details of possible causes. "
-        + "Addressing these warnings is advisable to avoid false-positive or missing results."
+        "This may be caused by problems identifying dependencies or use of generated source code. " +
+        "Some metrics of the database quality are: " + getDbHealth() + ". " +
+        "Ideally these metrics should be above their thresholds. " +
+        "Addressing these issues is advisable to avoid false-positives or missing results."
   }
 }
 
diff --git a/rust/ql/src/queries/telemetry/ExtractorInformation.ql b/rust/ql/src/queries/telemetry/ExtractorInformation.ql
index d47dc04ace7..ab18ecf489f 100644
--- a/rust/ql/src/queries/telemetry/ExtractorInformation.ql
+++ b/rust/ql/src/queries/telemetry/ExtractorInformation.ql
@@ -8,7 +8,6 @@
 
 import rust
 import DatabaseQuality
-import RustAnalyzerComparison
 import codeql.rust.Diagnostics
 
 predicate fileCount(string key, int value) {
@@ -42,20 +41,6 @@ predicate extractorDiagnostics(string key, int value) {
   )
 }
 
-predicate pathResolutionCompare(string key, int value) {
-  exists(string suffix |
-    PathResolutionCompare::summary(suffix, value) and
-    key = "Rust-analyzer path resolution comparison: " + suffix
-  )
-}
-
-predicate callGraphCompare(string key, int value) {
-  exists(string suffix |
-    CallGraphCompare::summary(suffix, value) and
-    key = "Rust-analyzer call graph comparison: " + suffix
-  )
-}
-
 from string key, float value
 where
   (
@@ -70,8 +55,9 @@ where
     MacroCallTargetStatsReport::numberOfOk(key, value) or
     MacroCallTargetStatsReport::numberOfNotOk(key, value) or
     MacroCallTargetStatsReport::percentageOfOk(key, value) or
-    pathResolutionCompare(key, value) or
-    callGraphCompare(key, value)
+    ExprTypeStatsReport::numberOfOk(key, value) or
+    ExprTypeStatsReport::numberOfNotOk(key, value) or
+    ExprTypeStatsReport::percentageOfOk(key, value)
   ) and
   /* Infinity */
   value != 1.0 / 0.0 and
diff --git a/rust/ql/src/queries/telemetry/RustAnalyzerComparison.qll b/rust/ql/src/queries/telemetry/RustAnalyzerComparison.qll
deleted file mode 100644
index 21460e8ba9b..00000000000
--- a/rust/ql/src/queries/telemetry/RustAnalyzerComparison.qll
+++ /dev/null
@@ -1,167 +0,0 @@
-/**
- * INTERNAL: Do not use.
- *
- * Provides functionality for comparing data from `rust-analyzer` with data computed
- * in QL.
- */
-
-import rust
-
-pragma[nomagic]
-private predicate resolvesAsItem(Resolvable r, Item i) {
-  none()
-  // r.getResolvedPath() = i.getExtendedCanonicalPath() and
-  // (
-  //   r.getResolvedCrateOrigin() = i.getCrateOrigin()
-  //   or
-  //   not r.hasResolvedCrateOrigin() and not i.hasCrateOrigin()
-  // )
-}
-
-private signature module ResolvableSig {
-  class Source {
-    string toString();
-
-    Location getLocation();
-  }
-
-  class Target {
-    string toString();
-
-    Location getLocation();
-  }
-}
-
-private signature module CompareSig<ResolvableSig R> {
-  predicate isResolvable(R::Source s);
-
-  R::Target resolve(R::Source s);
-}
-
-private module Compare<ResolvableSig R, CompareSig<R> RustAnalyzer, CompareSig<R> Ql> {
-  private import R
-
-  predicate same(Source s, Target t) {
-    t = RustAnalyzer::resolve(s) and
-    t = Ql::resolve(s)
-  }
-
-  predicate sameCount(int c) { c = count(Source s | same(s, _)) }
-
-  predicate diff(Source s, Target t1, Target t2) {
-    t1 = RustAnalyzer::resolve(s) and
-    t2 = Ql::resolve(s) and
-    t1 != t2
-  }
-
-  predicate diffCount(int c) { c = count(Source s | not same(s, _) and diff(s, _, _)) }
-
-  predicate rustAnalyzerUnique(Source s) {
-    RustAnalyzer::isResolvable(s) and
-    not Ql::isResolvable(s)
-  }
-
-  predicate rustAnalyzerUniqueCount(int c) { c = count(Source s | rustAnalyzerUnique(s)) }
-
-  predicate qlUnique(Source s) {
-    not RustAnalyzer::isResolvable(s) and
-    Ql::isResolvable(s)
-  }
-
-  predicate qlUniqueCount(int c) { c = count(Source s | qlUnique(s)) }
-
-  // debug predicates to find missing targets in QL implementation
-  private module Debug {
-    predicate qlMissing(Source s, Target t) {
-      t = RustAnalyzer::resolve(s) and
-      not t = Ql::resolve(s)
-    }
-
-    predicate qlMissingWithCount(Source s, Target t, int c) {
-      qlMissing(s, t) and
-      c = strictcount(Source s0 | qlMissing(s0, t))
-    }
-  }
-
-  predicate summary(string key, int value) {
-    key = "rust-analyzer unique" and rustAnalyzerUniqueCount(value)
-    or
-    key = "QL unique" and qlUniqueCount(value)
-    or
-    key = "same" and sameCount(value)
-    or
-    key = "different" and diffCount(value)
-  }
-}
-
-private module PathResolution implements ResolvableSig {
-  class Source extends Resolvable {
-    Source() { not this instanceof MethodCallExpr }
-  }
-
-  class Target = Item;
-}
-
-private module RustAnalyzerPathResolution implements CompareSig<PathResolution> {
-  predicate isResolvable(PathResolution::Source s) {
-    none()
-    //s.hasResolvedPath()
-  }
-
-  Item resolve(PathResolution::Source s) { resolvesAsItem(s, result) }
-}
-
-private module QlPathResolution implements CompareSig<PathResolution> {
-  private import codeql.rust.internal.PathResolution
-
-  private Path getPath(Resolvable r) {
-    result = r.(PathExpr).getPath()
-    or
-    result = r.(StructExpr).getPath()
-    or
-    result = r.(PathPat).getPath()
-    or
-    result = r.(StructPat).getPath()
-    or
-    result = r.(TupleStructPat).getPath()
-  }
-
-  predicate isResolvable(PathResolution::Source s) { exists(resolve(s)) }
-
-  Item resolve(PathResolution::Source s) { result = resolvePath(getPath(s)) }
-}
-
-module PathResolutionCompare =
-  Compare<PathResolution, RustAnalyzerPathResolution, QlPathResolution>;
-
-private module CallGraph implements ResolvableSig {
-  class Source = CallExprBase;
-
-  class Target = Item;
-}
-
-private module RustAnalyzerCallGraph implements CompareSig<CallGraph> {
-  private import codeql.rust.elements.internal.CallExprBaseImpl::Impl as CallExprBaseImpl
-
-  predicate isResolvable(CallExprBase c) {
-    CallExprBaseImpl::getCallResolvable(c).hasResolvedPath()
-  }
-
-  Item resolve(CallExprBase c) { resolvesAsItem(CallExprBaseImpl::getCallResolvable(c), result) }
-}
-
-private module QlCallGraph implements CompareSig<CallGraph> {
-  private import codeql.rust.internal.PathResolution as PathResolution
-
-  predicate isResolvable(CallExprBase c) { exists(resolve(c)) }
-
-  Item resolve(CallExprBase c) { result = c.getStaticTarget() }
-}
-
-module CallGraphCompare = Compare<CallGraph, RustAnalyzerCallGraph, QlCallGraph>;
-
-predicate qlMissingCanonicalPath(Addressable a, string path) {
-  none()
-  // path = a.getExtendedCanonicalPath() and
-  // not exists(a.getCanonicalPath(_))
-}
diff --git a/rust/ql/src/queries/unusedentities/UnreachableCode.ql b/rust/ql/src/queries/unusedentities/UnreachableCode.ql
index 15a45c6f4b5..bb9092fb570 100644
--- a/rust/ql/src/queries/unusedentities/UnreachableCode.ql
+++ b/rust/ql/src/queries/unusedentities/UnreachableCode.ql
@@ -33,7 +33,7 @@ predicate hiddenNode(AstNode n) {
   n instanceof ControlFlowGraphImpl::PostOrderTree and // location is counter-intuitive
   not n instanceof MacroExpr
   or
-  n.isInMacroExpansion()
+  n.isFromMacroExpansion()
 }
 
 /**
diff --git a/rust/ql/src/queries/unusedentities/UnusedValue.ql b/rust/ql/src/queries/unusedentities/UnusedValue.ql
index 11e29d475e4..07e80b00b45 100644
--- a/rust/ql/src/queries/unusedentities/UnusedValue.ql
+++ b/rust/ql/src/queries/unusedentities/UnusedValue.ql
@@ -16,9 +16,9 @@ import UnusedVariable
 
 from AstNode write, Ssa::Variable v
 where
-  variableWrite(write, v) and
+  variableWrite(_, write, v) and
   not v instanceof DiscardVariable and
-  not write.isInMacroExpansion() and
+  not write.isFromMacroExpansion() and
   not isAllowableUnused(v) and
   // SSA definitions are only created for live writes
   not write = any(Ssa::WriteDefinition def).getWriteAccess().getAstNode() and
diff --git a/rust/ql/src/queries/unusedentities/UnusedVariable.qll b/rust/ql/src/queries/unusedentities/UnusedVariable.qll
index ad75415634c..c0684636e77 100644
--- a/rust/ql/src/queries/unusedentities/UnusedVariable.qll
+++ b/rust/ql/src/queries/unusedentities/UnusedVariable.qll
@@ -36,7 +36,7 @@ class IncompleteCallable extends Callable {
  */
 predicate isAllowableUnused(Variable v) {
   // in a macro expansion
-  v.getPat().isInMacroExpansion()
+  v.getPat().isInMacroExpansion() // TODO: replace with `isFromMacroExpansion()` when false positives have been removed
   or
   // declared in an incomplete callable
   v.getEnclosingCfgScope() instanceof IncompleteCallable
diff --git a/rust/ql/test/extractor-tests/File/CONSISTENCY/ExtractionConsistency.expected b/rust/ql/test/extractor-tests/File/CONSISTENCY/ExtractionConsistency.expected
new file mode 100644
index 00000000000..c642b9fc2dd
--- /dev/null
+++ b/rust/ql/test/extractor-tests/File/CONSISTENCY/ExtractionConsistency.expected
@@ -0,0 +1,2 @@
+extractionWarning
+| bad_cargo/src/no_semantics.rs:1:1:1:1 | semantic analyzer unavailable (unable to load manifest) |
diff --git a/rust/ql/test/extractor-tests/File/File.expected b/rust/ql/test/extractor-tests/File/File.expected
index ad701669ab2..ebfcdae1967 100644
--- a/rust/ql/test/extractor-tests/File/File.expected
+++ b/rust/ql/test/extractor-tests/File/File.expected
@@ -1,6 +1,9 @@
-| Cargo.toml:0:0:0:0 | Cargo.toml | fromSource: no |
-| a_file.rs:0:0:0:0 | a_file.rs | fromSource: yes |
-| another_file.rs:0:0:0:0 | another_file.rs | fromSource: yes |
-| lib.rs:0:0:0:0 | lib.rs | fromSource: yes |
-| nested.rs:0:0:0:0 | nested.rs | fromSource: yes |
-| nested/file.rs:0:0:0:0 | nested/file.rs | fromSource: yes |
+| Cargo.toml:0:0:0:0 | Cargo.toml | fromSource: no | hasSemantics: no | isSkippedByCompilation: no |
+| a_file.rs:0:0:0:0 | a_file.rs | fromSource: yes | hasSemantics: yes | isSkippedByCompilation: no |
+| another_file.rs:0:0:0:0 | another_file.rs | fromSource: yes | hasSemantics: yes | isSkippedByCompilation: no |
+| bad_cargo/Cargo.toml:0:0:0:0 | bad_cargo/Cargo.toml | fromSource: no | hasSemantics: no | isSkippedByCompilation: no |
+| bad_cargo/src/no_semantics.rs:0:0:0:0 | bad_cargo/src/no_semantics.rs | fromSource: yes | hasSemantics: no | isSkippedByCompilation: no |
+| lib.rs:0:0:0:0 | lib.rs | fromSource: yes | hasSemantics: yes | isSkippedByCompilation: no |
+| nested.rs:0:0:0:0 | nested.rs | fromSource: yes | hasSemantics: yes | isSkippedByCompilation: no |
+| nested/file.rs:0:0:0:0 | nested/file.rs | fromSource: yes | hasSemantics: yes | isSkippedByCompilation: no |
+| nested/not_compiled.rs:0:0:0:0 | nested/not_compiled.rs | fromSource: yes | hasSemantics: no | isSkippedByCompilation: yes |
diff --git a/rust/ql/test/extractor-tests/File/File.ql b/rust/ql/test/extractor-tests/File/File.ql
index 316099193d1..2d21f12bc29 100644
--- a/rust/ql/test/extractor-tests/File/File.ql
+++ b/rust/ql/test/extractor-tests/File/File.ql
@@ -1,7 +1,15 @@
 import rust
 
-from File f, string fromSource
+from File f, string fromSource, string hasSemantics, string isSkippedByCompilation
 where
   exists(f.getRelativePath()) and
-  if f.fromSource() then fromSource = "fromSource: yes" else fromSource = "fromSource: no"
-select f, fromSource
+  (if f.fromSource() then fromSource = "fromSource: yes" else fromSource = "fromSource: no") and
+  (
+    if f.(ExtractedFile).hasSemantics()
+    then hasSemantics = "hasSemantics: yes"
+    else hasSemantics = "hasSemantics: no"
+  ) and
+  if f.(ExtractedFile).isSkippedByCompilation()
+  then isSkippedByCompilation = "isSkippedByCompilation: yes"
+  else isSkippedByCompilation = "isSkippedByCompilation: no"
+select f, fromSource, hasSemantics, isSkippedByCompilation
diff --git a/rust/ql/test/extractor-tests/File/bad_cargo/.gitignore b/rust/ql/test/extractor-tests/File/bad_cargo/.gitignore
new file mode 100644
index 00000000000..eac412e1a6d
--- /dev/null
+++ b/rust/ql/test/extractor-tests/File/bad_cargo/.gitignore
@@ -0,0 +1 @@
+!/Cargo.toml
diff --git a/rust/ql/test/extractor-tests/File/bad_cargo/Cargo.toml b/rust/ql/test/extractor-tests/File/bad_cargo/Cargo.toml
new file mode 100644
index 00000000000..688dd9e29ac
--- /dev/null
+++ b/rust/ql/test/extractor-tests/File/bad_cargo/Cargo.toml
@@ -0,0 +1 @@
+wrong
\ No newline at end of file
diff --git a/rust/ql/test/library-tests/operations/Operations.expected b/rust/ql/test/extractor-tests/File/bad_cargo/src/no_semantics.rs
similarity index 100%
rename from rust/ql/test/library-tests/operations/Operations.expected
rename to rust/ql/test/extractor-tests/File/bad_cargo/src/no_semantics.rs
diff --git a/rust/ql/test/extractor-tests/File/nested/not_compiled.rs b/rust/ql/test/extractor-tests/File/nested/not_compiled.rs
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/extractor-tests/canonical_path_disabled/anonymous.rs b/rust/ql/test/extractor-tests/canonical_path_disabled/anonymous.rs
deleted file mode 100644
index a5a6abd136c..00000000000
--- a/rust/ql/test/extractor-tests/canonical_path_disabled/anonymous.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-// would prefer to write `include!("../canonical_paths/anonymous.rs");`
-// but `include!` does not work with out-of-dir files
-
-use super::regular::Trait;
-
-fn canonicals() {
-    struct OtherStruct;
-
-    trait OtherTrait {
-        fn g(&self);
-    }
-
-    impl OtherTrait for OtherStruct {
-        fn g(&self) {}
-    }
-
-    impl OtherTrait for crate::regular::Struct {
-        fn g(&self) {}
-    }
-
-    impl crate::regular::Trait for OtherStruct {
-        fn f(&self) {}
-    }
-
-    fn nested() {
-        struct OtherStruct;
-    }
-
-    fn usage() {
-        let s = OtherStruct {};
-        s.f();
-        s.g();
-        nested();
-    }
-}
-
-fn other() {
-    struct OtherStruct;
-}
diff --git a/rust/ql/test/extractor-tests/canonical_path_disabled/canonical_paths.expected b/rust/ql/test/extractor-tests/canonical_path_disabled/canonical_paths.expected
deleted file mode 100644
index fa5b23518d4..00000000000
--- a/rust/ql/test/extractor-tests/canonical_path_disabled/canonical_paths.expected
+++ /dev/null
@@ -1,26 +0,0 @@
-| anonymous.rs:6:1:35:1 | fn canonicals | test::anonymous::canonicals |
-| anonymous.rs:37:1:39:1 | fn other | test::anonymous::other |
-| {EXTERNAL LOCATION} | fn trim | <core::str>::trim |
-| lib.rs:1:1:1:18 | mod anonymous | test::anonymous |
-| lib.rs:2:1:2:16 | mod regular | test::regular |
-| regular.rs:4:1:5:18 | struct Struct | test::regular::Struct |
-| regular.rs:5:12:5:17 | fn eq | <test::regular::Struct as core::cmp::PartialEq>::eq |
-| regular.rs:5:12:5:17 | impl ...::Eq for Struct::<...> { ... } | <test::regular::Struct as core::cmp::Eq> |
-| regular.rs:5:12:5:17 | impl ...::PartialEq for Struct::<...> { ... } | <test::regular::Struct as core::cmp::PartialEq> |
-| regular.rs:7:1:9:1 | trait Trait | test::regular::Trait |
-| regular.rs:8:5:8:16 | fn f | <_ as test::regular::Trait>::f |
-| regular.rs:11:1:13:1 | impl Trait for Struct { ... } | <test::regular::Struct as test::regular::Trait> |
-| regular.rs:12:5:12:18 | fn f | <test::regular::Struct as test::regular::Trait>::f |
-| regular.rs:15:1:17:1 | impl Struct { ... } | <test::regular::Struct> |
-| regular.rs:16:5:16:18 | fn g | <test::regular::Struct>::g |
-| regular.rs:19:1:21:1 | trait TraitWithBlanketImpl | test::regular::TraitWithBlanketImpl |
-| regular.rs:20:5:20:16 | fn h | <_ as test::regular::TraitWithBlanketImpl>::h |
-| regular.rs:27:1:27:12 | fn free | test::regular::free |
-| regular.rs:29:1:35:1 | fn usage | test::regular::usage |
-| regular.rs:37:1:41:1 | enum MyEnum | test::regular::MyEnum |
-| regular.rs:38:5:38:12 | Variant1 | test::regular::MyEnum::Variant1 |
-| regular.rs:39:5:39:19 | Variant2 | test::regular::MyEnum::Variant2 |
-| regular.rs:40:5:40:25 | Variant3 | test::regular::MyEnum::Variant3 |
-| regular.rs:43:1:49:1 | fn enum_qualified_usage | test::regular::enum_qualified_usage |
-| regular.rs:51:1:58:1 | fn enum_unqualified_usage | test::regular::enum_unqualified_usage |
-| regular.rs:60:1:66:1 | fn enum_match | test::regular::enum_match |
diff --git a/rust/ql/test/extractor-tests/canonical_path_disabled/canonical_paths.qlref b/rust/ql/test/extractor-tests/canonical_path_disabled/canonical_paths.qlref
deleted file mode 100644
index 9a5712b5135..00000000000
--- a/rust/ql/test/extractor-tests/canonical_path_disabled/canonical_paths.qlref
+++ /dev/null
@@ -1,2 +0,0 @@
-query: extractor-tests/canonical_path/canonical_paths.ql
-postprocess: utils/test/ExternalLocationPostProcessing.ql
\ No newline at end of file
diff --git a/rust/ql/test/extractor-tests/canonical_path_disabled/options.yml b/rust/ql/test/extractor-tests/canonical_path_disabled/options.yml
deleted file mode 100644
index baee4ba5afe..00000000000
--- a/rust/ql/test/extractor-tests/canonical_path_disabled/options.yml
+++ /dev/null
@@ -1 +0,0 @@
-skip_path_resolution: true
diff --git a/rust/ql/test/extractor-tests/canonical_path_disabled/regular.rs b/rust/ql/test/extractor-tests/canonical_path_disabled/regular.rs
deleted file mode 100644
index b958e0c02da..00000000000
--- a/rust/ql/test/extractor-tests/canonical_path_disabled/regular.rs
+++ /dev/null
@@ -1,66 +0,0 @@
-// would prefer to write `include!("../canonical_path/regular.rs");
-// but `include!` does not work with out-of-dir files
-
-#[derive(Eq, PartialEq)]
-pub struct Struct;
-
-pub trait Trait {
-    fn f(&self);
-}
-
-impl Trait for Struct {
-    fn f(&self) {}
-}
-
-impl Struct {
-    fn g(&self) {}
-}
-
-trait TraitWithBlanketImpl {
-    fn h(&self);
-}
-
-impl<T: Eq> TraitWithBlanketImpl for T {
-    fn h(&self) {}
-}
-
-fn free() {}
-
-fn usage() {
-    let s = Struct {};
-    s.f();
-    s.g();
-    s.h();
-    free();
-}
-
-enum MyEnum {
-    Variant1,
-    Variant2(usize),
-    Variant3 { x: usize },
-}
-
-fn enum_qualified_usage() {
-    _ = Option::None::<()>;
-    _ = Option::Some(0);
-    _ = MyEnum::Variant1;
-    _ = MyEnum::Variant2(0);
-    _ = MyEnum::Variant3 { x: 1 };
-}
-
-fn enum_unqualified_usage() {
-    _ = None::<()>;
-    _ = Some(0);
-    use MyEnum::*;
-    _ = Variant1;
-    _ = Variant2(0);
-    _ = Variant3 { x: 1 };
-}
-
-fn enum_match(e: MyEnum) {
-    match e {
-        MyEnum::Variant1 => {}
-        MyEnum::Variant2(_) => {}
-        MyEnum::Variant3 { .. } => {}
-    }
-}
diff --git a/rust/ql/test/extractor-tests/crate_graph/crates.expected b/rust/ql/test/extractor-tests/crate_graph/crates.expected
index 21c662bb425..f4bd0ae031b 100644
--- a/rust/ql/test/extractor-tests/crate_graph/crates.expected
+++ b/rust/ql/test/extractor-tests/crate_graph/crates.expected
@@ -1,10 +1,6 @@
 #-----| Crate(alloc@0.0.0)
 #-----| core -> Crate(core@0.0.0)
-#-----| compiler_builtins -> Crate(compiler_builtins@0.1.146)
-#-----| rand -> Crate(rand@0.9.0)
-#-----| rand_xorshift -> Crate(rand_xorshift@0.4.0)
-
-#-----| Crate(allocator_api2@0.2.21)
+#-----| compiler_builtins -> Crate(compiler_builtins@0.1.160)
 
 #-----| Crate(block_buffer@0.10.4)
 #-----| proc_macro -> Crate(proc_macro@0.0.0)
@@ -14,10 +10,6 @@
 #-----| test -> Crate(test@0.0.0)
 #-----| generic_array -> Crate(generic_array@0.14.7)
 
-#-----| Crate(cfg_if@1.0.0)
-#-----| core -> Crate(core@0.0.0)
-#-----| compiler_builtins -> Crate(compiler_builtins@0.1.146)
-
 #-----| Crate(cfg_if@1.0.1)
 #-----| proc_macro -> Crate(proc_macro@0.0.0)
 #-----| alloc -> Crate(alloc@0.0.0)
@@ -25,7 +17,10 @@
 #-----| std -> Crate(std@0.0.0)
 #-----| test -> Crate(test@0.0.0)
 
-#-----| Crate(compiler_builtins@0.1.146)
+#-----| Crate(cfg_if@1.0.1)
+#-----| core -> Crate(core@0.0.0)
+
+#-----| Crate(compiler_builtins@0.1.160)
 #-----| core -> Crate(core@0.0.0)
 
 #-----| Crate(core@0.0.0)
@@ -56,18 +51,16 @@
 #-----| test -> Crate(test@0.0.0)
 #-----| typenum -> Crate(typenum@1.18.0)
 
-#-----| Crate(getopts@0.2.21)
+#-----| Crate(getopts@0.2.23)
 #-----| core -> Crate(core@0.0.0)
 #-----| std -> Crate(std@0.0.0)
-#-----| unicode_width -> Crate(unicode_width@0.1.14)
+#-----| unicode_width -> Crate(unicode_width@0.2.1)
 
-#-----| Crate(hashbrown@0.15.2)
-#-----| allocator_api2 -> Crate(allocator_api2@0.2.21)
+#-----| Crate(hashbrown@0.15.4)
 #-----| alloc -> Crate(alloc@0.0.0)
 #-----| core -> Crate(core@0.0.0)
-#-----| compiler_builtins -> Crate(compiler_builtins@0.1.146)
 
-#-----| Crate(libc@0.2.169)
+#-----| Crate(libc@0.2.174)
 #-----| rustc_std_workspace_core -> Crate(core@0.0.0)
 
 main.rs:
@@ -98,48 +91,44 @@ main.rs:
 #-----| test -> Crate(test@0.0.0)
 
 #-----| Crate(panic_abort@0.0.0)
-#-----| alloc -> Crate(alloc@0.0.0)
 #-----| core -> Crate(core@0.0.0)
-#-----| compiler_builtins -> Crate(compiler_builtins@0.1.146)
-#-----| cfg_if -> Crate(cfg_if@1.0.0)
-#-----| libc -> Crate(libc@0.2.169)
 
 #-----| Crate(panic_unwind@0.0.0)
 #-----| alloc -> Crate(alloc@0.0.0)
 #-----| core -> Crate(core@0.0.0)
-#-----| compiler_builtins -> Crate(compiler_builtins@0.1.146)
-#-----| cfg_if -> Crate(cfg_if@1.0.0)
-#-----| libc -> Crate(libc@0.2.169)
+#-----| cfg_if -> Crate(cfg_if@1.0.1)
+#-----| libc -> Crate(libc@0.2.174)
 #-----| unwind -> Crate(unwind@0.0.0)
 
 #-----| Crate(proc_macro@0.0.0)
 #-----| core -> Crate(core@0.0.0)
 #-----| std -> Crate(std@0.0.0)
+#-----| rustc_literal_escaper -> Crate(rustc_literal_escaper@0.0.5)
 
-#-----| Crate(rand@0.9.0)
-#-----| zerocopy -> Crate(zerocopy@0.8.17)
-#-----| rand_core -> Crate(rand_core@0.9.0)
+#-----| Crate(rand@0.9.2)
+#-----| rand_core -> Crate(rand_core@0.9.3)
 
-#-----| Crate(rand_core@0.9.0)
-#-----| zerocopy -> Crate(zerocopy@0.8.17)
+#-----| Crate(rand_core@0.9.3)
 
 #-----| Crate(rand_xorshift@0.4.0)
-#-----| rand_core -> Crate(rand_core@0.9.0)
+#-----| rand_core -> Crate(rand_core@0.9.3)
 
-#-----| Crate(rustc_demangle@0.1.24)
+#-----| Crate(rustc_demangle@0.1.25)
 #-----| core -> Crate(core@0.0.0)
-#-----| compiler_builtins -> Crate(compiler_builtins@0.1.146)
+
+#-----| Crate(rustc_literal_escaper@0.0.5)
+#-----| core -> Crate(core@0.0.0)
+#-----| std -> Crate(std@0.0.0)
 
 #-----| Crate(std@0.0.0)
 #-----| alloc -> Crate(alloc@0.0.0)
 #-----| core -> Crate(core@0.0.0)
-#-----| compiler_builtins -> Crate(compiler_builtins@0.1.146)
-#-----| cfg_if -> Crate(cfg_if@1.0.0)
-#-----| hashbrown -> Crate(hashbrown@0.15.2)
-#-----| libc -> Crate(libc@0.2.169)
-#-----| rand -> Crate(rand@0.9.0)
+#-----| cfg_if -> Crate(cfg_if@1.0.1)
+#-----| hashbrown -> Crate(hashbrown@0.15.4)
+#-----| libc -> Crate(libc@0.2.174)
+#-----| rand -> Crate(rand@0.9.2)
 #-----| rand_xorshift -> Crate(rand_xorshift@0.4.0)
-#-----| rustc_demangle -> Crate(rustc_demangle@0.1.24)
+#-----| rustc_demangle -> Crate(rustc_demangle@0.1.25)
 #-----| panic_abort -> Crate(panic_abort@0.0.0)
 #-----| unwind -> Crate(unwind@0.0.0)
 #-----| panic_unwind -> Crate(panic_unwind@0.0.0)
@@ -148,15 +137,14 @@ main.rs:
 #-----| Crate(std_detect@0.1.5)
 #-----| alloc -> Crate(alloc@0.0.0)
 #-----| core -> Crate(core@0.0.0)
-#-----| compiler_builtins -> Crate(compiler_builtins@0.1.146)
-#-----| cfg_if -> Crate(cfg_if@1.0.0)
-#-----| libc -> Crate(libc@0.2.169)
+#-----| cfg_if -> Crate(cfg_if@1.0.1)
+#-----| libc -> Crate(libc@0.2.174)
 
 #-----| Crate(test@0.0.0)
 #-----| core -> Crate(core@0.0.0)
 #-----| std -> Crate(std@0.0.0)
-#-----| getopts -> Crate(getopts@0.2.21)
-#-----| libc -> Crate(libc@0.2.169)
+#-----| getopts -> Crate(getopts@0.2.23)
+#-----| libc -> Crate(libc@0.2.174)
 
 lib.rs:
 #    0| Crate(test@0.0.1)
@@ -175,16 +163,14 @@ lib.rs:
 #-----| std -> Crate(std@0.0.0)
 #-----| test -> Crate(test@0.0.0)
 
-#-----| Crate(unicode_width@0.1.14)
+#-----| Crate(unicode_width@0.2.1)
 #-----| core -> Crate(core@0.0.0)
 #-----| std -> Crate(std@0.0.0)
-#-----| compiler_builtins -> Crate(compiler_builtins@0.1.146)
 
 #-----| Crate(unwind@0.0.0)
 #-----| core -> Crate(core@0.0.0)
-#-----| compiler_builtins -> Crate(compiler_builtins@0.1.146)
-#-----| cfg_if -> Crate(cfg_if@1.0.0)
-#-----| libc -> Crate(libc@0.2.169)
+#-----| cfg_if -> Crate(cfg_if@1.0.1)
+#-----| libc -> Crate(libc@0.2.174)
 
 #-----| Crate(version_check@0.9.5)
 #-----| proc_macro -> Crate(proc_macro@0.0.0)
@@ -192,5 +178,3 @@ lib.rs:
 #-----| core -> Crate(core@0.0.0)
 #-----| std -> Crate(std@0.0.0)
 #-----| test -> Crate(test@0.0.0)
-
-#-----| Crate(zerocopy@0.8.17)
diff --git a/rust/ql/test/extractor-tests/generated/.generated_tests.list b/rust/ql/test/extractor-tests/generated/.generated_tests.list
index a4fab823b03..879695fb758 100644
--- a/rust/ql/test/extractor-tests/generated/.generated_tests.list
+++ b/rust/ql/test/extractor-tests/generated/.generated_tests.list
@@ -25,8 +25,7 @@ BoxPat/gen_box_pat.rs 1493e24b732370b577ade38c47db17fa157df19f5390606a67a6040e49
 BreakExpr/gen_break_expr.rs aacdf9df7fc51d19742b9e813835c0bd0913017e8d62765960e06b27d58b9031 aacdf9df7fc51d19742b9e813835c0bd0913017e8d62765960e06b27d58b9031
 CallExpr/gen_call_expr.rs 013a7c878996aefb25b94b68eebc4f0b1bb74ccd09e91c491980817a383e2401 013a7c878996aefb25b94b68eebc4f0b1bb74ccd09e91c491980817a383e2401
 CastExpr/gen_cast_expr.rs c3892211fbae4fed7cb1f25ff1679fd79d2878bf0bf2bd4b7982af23d00129f5 c3892211fbae4fed7cb1f25ff1679fd79d2878bf0bf2bd4b7982af23d00129f5
-ClosureBinder/gen_closure_binder.rs 14b5e2deb2bbba164f1aee378be18e99e3c5a926628e964dcc2fbb349ff3b672 14b5e2deb2bbba164f1aee378be18e99e3c5a926628e964dcc2fbb349ff3b672
-ClosureExpr/gen_closure_expr.rs 15bd9abdb8aaffabb8bb335f8ebd0571eb5f29115e1dc8d11837aa988702cd80 15bd9abdb8aaffabb8bb335f8ebd0571eb5f29115e1dc8d11837aa988702cd80
+ClosureExpr/gen_closure_expr.rs bd95408103b7f2084e526e6d35cf3319b2e9d7219aff4c80e4e6691180c549b4 bd95408103b7f2084e526e6d35cf3319b2e9d7219aff4c80e4e6691180c549b4
 Comment/gen_comment.rs 1e1f9f43161a79c096c2056e8b7f5346385ab7addcdec68c2d53b383dd3debe6 1e1f9f43161a79c096c2056e8b7f5346385ab7addcdec68c2d53b383dd3debe6
 Const/gen_const.rs a3b971134a4204d0da12563fcefa9ab72f3f2f2e957e82b70c8548b5807f375f a3b971134a4204d0da12563fcefa9ab72f3f2f2e957e82b70c8548b5807f375f
 ConstArg/gen_const_arg.rs 6a15d099c61ffa814e8e0e0fca2d8ff481d73ad81959064e0a214d3172a9d49e 6a15d099c61ffa814e8e0e0fca2d8ff481d73ad81959064e0a214d3172a9d49e
@@ -41,8 +40,9 @@ ExternCrate/gen_extern_crate.rs 8d6bfd8d993a8e3a95ae9ccb576bd55be0c6a1d0893cfe15
 ExternItemList/gen_extern_item_list.rs f9a03ddf20387871b96994915c9a725feb333d061544c0fb6d2e6b1a1961d6ed f9a03ddf20387871b96994915c9a725feb333d061544c0fb6d2e6b1a1961d6ed
 FieldExpr/gen_field_expr.rs 9a70500d592e0a071b03d974a55558b3bc0df531ff11bce5898feb36e17ffd8b 9a70500d592e0a071b03d974a55558b3bc0df531ff11bce5898feb36e17ffd8b
 FnPtrTypeRepr/gen_fn_ptr_type_repr.rs c154ec0cc43236d133f6b946374f3063b89e5cbf9e96d9ee66877be4f948888e c154ec0cc43236d133f6b946374f3063b89e5cbf9e96d9ee66877be4f948888e
+ForBinder/gen_for_binder.rs e3c9e5ffd3f2a5a546af9ab6e2a2ed733baf9cf609e05850b70feb31478a0bae e3c9e5ffd3f2a5a546af9ab6e2a2ed733baf9cf609e05850b70feb31478a0bae
 ForExpr/gen_for_expr.rs 003dc36e3dc4db6e3a4accd410c316f14334ba5b3d5d675c851a91dcd5185122 003dc36e3dc4db6e3a4accd410c316f14334ba5b3d5d675c851a91dcd5185122
-ForTypeRepr/gen_for_type_repr.rs 86f2f11f399d8072add3d3109a186d82d95d141660b18986bce738b7e9ec81a2 86f2f11f399d8072add3d3109a186d82d95d141660b18986bce738b7e9ec81a2
+ForTypeRepr/gen_for_type_repr.rs fdbcbce6065082f350f8d3f77c23424bec8883336e4cd69ce8f41b185a51dc50 fdbcbce6065082f350f8d3f77c23424bec8883336e4cd69ce8f41b185a51dc50
 FormatArgsExpr/gen_format.rs e9d8e7b98d0050ad6053c2459cb21faab00078e74245336a5962438336f76d33 e9d8e7b98d0050ad6053c2459cb21faab00078e74245336a5962438336f76d33
 FormatArgsExpr/gen_format_args_arg.rs 53ffd6abe4cd899c57d1973b31df0edc1d5eaa5835b19172ec4cda15bb3db28f 53ffd6abe4cd899c57d1973b31df0edc1d5eaa5835b19172ec4cda15bb3db28f
 FormatArgsExpr/gen_format_args_expr.rs 72c806ed163e9dcce2d0c5c8664d409b2aa635c1022c91959f9e8ae084f05bf2 72c806ed163e9dcce2d0c5c8664d409b2aa635c1022c91959f9e8ae084f05bf2
@@ -67,7 +67,7 @@ LifetimeParam/gen_lifetime_param.rs e3f9a417ae7a88a4d81d9cb747b361a3246d270d142f
 LiteralExpr/gen_literal_expr.rs 2db01ad390e5c0c63a957c043230a462cb4cc25715eea6ede15d43c55d35976d 2db01ad390e5c0c63a957c043230a462cb4cc25715eea6ede15d43c55d35976d
 LiteralPat/gen_literal_pat.rs a471b481b6989001817a3988696f445d9a4dea784e543c346536dacbee1e96f3 a471b481b6989001817a3988696f445d9a4dea784e543c346536dacbee1e96f3
 LoopExpr/gen_loop_expr.rs 35deaf35e765db4ae3124a11284266d8f341d1ce7b700030efada0dda8878619 35deaf35e765db4ae3124a11284266d8f341d1ce7b700030efada0dda8878619
-MacroBlockExpr/gen_macro_block_expr.rs 2e45dcf44bf2e8404b49ce9abeee4931572693174b5d96f3fd81eb40ea8e7b4b 2e45dcf44bf2e8404b49ce9abeee4931572693174b5d96f3fd81eb40ea8e7b4b
+MacroBlockExpr/gen_macro_block_expr.rs 4284a6e6ad81827d8616a00fec7f5bc21104eed40d93e3acc2b933ee22cb8577 4284a6e6ad81827d8616a00fec7f5bc21104eed40d93e3acc2b933ee22cb8577
 MacroCall/gen_macro_call.rs c30added613d9edb3cb1321ae46fc6a088a2f22d2cc979119466ec02f6e09ed6 c30added613d9edb3cb1321ae46fc6a088a2f22d2cc979119466ec02f6e09ed6
 MacroDef/gen_macro_def.rs 6f895ecab8c13a73c28ce67fcee39baf7928745a80fb440811014f6d31b22378 6f895ecab8c13a73c28ce67fcee39baf7928745a80fb440811014f6d31b22378
 MacroExpr/gen_macro_expr.rs 5e1748356f431eea343a2aad2798c22073151940ea2cda0f0cce78c3d96104f0 5e1748356f431eea343a2aad2798c22073151940ea2cda0f0cce78c3d96104f0
@@ -75,7 +75,7 @@ MacroItems/gen_macro_items.rs c00f8045d9a7d6562da1d0136b335b685e2ec5dbd708763faa
 MacroPat/gen_macro_pat.rs 6bc63338397e6ef322a1824ce7d8fa68629a81c740f6e1d5347642501c83683a 6bc63338397e6ef322a1824ce7d8fa68629a81c740f6e1d5347642501c83683a
 MacroRules/gen_macro_rules.rs 5483484783b19a4f4cb7565cf63c517e61a76ce5b5b4bdc9b90f7e235a4c03b7 5483484783b19a4f4cb7565cf63c517e61a76ce5b5b4bdc9b90f7e235a4c03b7
 MacroTypeRepr/gen_macro_type_repr.rs cdb9670dde8b2a71256bc8d4acb1d63bd726cb49ee486ca2dbf1952884fd9c37 cdb9670dde8b2a71256bc8d4acb1d63bd726cb49ee486ca2dbf1952884fd9c37
-MatchArm/gen_match_arm.rs ac75b4836a103e2755bd47a1ee1b74af6eb8349adc4ebedaaa27b3ea3ae41aa5 ac75b4836a103e2755bd47a1ee1b74af6eb8349adc4ebedaaa27b3ea3ae41aa5
+MatchArm/gen_match_arm.rs 4f4e717930729b2161b9cf9cd5e2b86b8e919204f5f7d4993d2c4e1034858cea 4f4e717930729b2161b9cf9cd5e2b86b8e919204f5f7d4993d2c4e1034858cea
 MatchArmList/gen_match_arm_list.rs 6dcb92591c86771d2aeb762e4274d3e61a7d6c1a42da3dbace1cbc545b474080 6dcb92591c86771d2aeb762e4274d3e61a7d6c1a42da3dbace1cbc545b474080
 MatchExpr/gen_match_expr.rs 081c5d4c78cb71ccd13fb37a93d7f525267c51b179f44b5a22ca3297897002a0 081c5d4c78cb71ccd13fb37a93d7f525267c51b179f44b5a22ca3297897002a0
 MatchGuard/gen_match_guard.rs f0e84a1f608c0361983c516a40216cea149620a36e0aed7ff39b0b7d77a9ab8a f0e84a1f608c0361983c516a40216cea149620a36e0aed7ff39b0b7d77a9ab8a
@@ -106,7 +106,7 @@ RefPat/gen_ref_pat.rs aba7518649d9a37928e59a40d42f76cc0f4735e8daf711a3def6d2f052
 RefTypeRepr/gen_ref_type_repr.rs cf7b32d64550cd0b5033869b841089c1de292a1b25d3bd44c63ef9a265b9c8fb cf7b32d64550cd0b5033869b841089c1de292a1b25d3bd44c63ef9a265b9c8fb
 Rename/gen_rename.rs 05957dd5c7a0971223a485207ef3e98b0408a3e765cfb1fd6237bcc21c89f21a 05957dd5c7a0971223a485207ef3e98b0408a3e765cfb1fd6237bcc21c89f21a
 RestPat/gen_rest_pat.rs e9c977c8d3fce1d931abdfc025444e3e883468927f784ad1791670cace736aa7 e9c977c8d3fce1d931abdfc025444e3e883468927f784ad1791670cace736aa7
-RetTypeRepr/gen_ret_type_repr.rs 9db86003c7a4d91aa13fbc8220559bea6a05221c38c3f3ac0e03c6ac790aebcc 9db86003c7a4d91aa13fbc8220559bea6a05221c38c3f3ac0e03c6ac790aebcc
+RetTypeRepr/gen_ret_type_repr.rs b5d66327b445e8290be59a4fc4217d8163aa5ab5e49d9335efa1037b7ca5dc6f b5d66327b445e8290be59a4fc4217d8163aa5ab5e49d9335efa1037b7ca5dc6f
 ReturnExpr/gen_return_expr.rs 4f6ef29d7b3c60d6d71d1a6034a0721671f517428ba21897361a92b01009d38f 4f6ef29d7b3c60d6d71d1a6034a0721671f517428ba21897361a92b01009d38f
 ReturnTypeSyntax/gen_return_type_syntax.rs 648ce343023e7f80c445fada390870c5498add7fdf63dc82a800f6a77b7e7026 648ce343023e7f80c445fada390870c5498add7fdf63dc82a800f6a77b7e7026
 SelfParam/gen_self_param.rs 15491f86a32020c9ed3ecadc08c945ed01916b63683f95d2f5c1bedb4f3f01f2 15491f86a32020c9ed3ecadc08c945ed01916b63683f95d2f5c1bedb4f3f01f2
@@ -114,9 +114,9 @@ SlicePat/gen_slice_pat.rs df4a6692f5100aa11dd777561400ce71e37b85f2363b0638c21975
 SliceTypeRepr/gen_slice_type_repr.rs 4a85402d40028c5a40ef35018453a89700b2171bc62fd86587378484831b969f 4a85402d40028c5a40ef35018453a89700b2171bc62fd86587378484831b969f
 SourceFile/gen_source_file.rs c0469cc8f0ecce3dd2e77963216d7e8808046014533359a44c1698e48783b420 c0469cc8f0ecce3dd2e77963216d7e8808046014533359a44c1698e48783b420
 Static/gen_static.rs 21314018ea184c1ddcb594d67bab97ae18ceaf663d9f120f39ff755d389dde7a 21314018ea184c1ddcb594d67bab97ae18ceaf663d9f120f39ff755d389dde7a
-StmtList/gen_stmt_list.rs adbd82045a50e2051434ce3cdd524c9f2c6ad9f3dd02b4766fb107e2e99212db adbd82045a50e2051434ce3cdd524c9f2c6ad9f3dd02b4766fb107e2e99212db
+StmtList/gen_stmt_list.rs 1051a20a90b59142e3fddfbbabd0eff586586b1812c6ab788c5391153bab8851 1051a20a90b59142e3fddfbbabd0eff586586b1812c6ab788c5391153bab8851
 Struct/gen_struct.rs 5e181e90075f716c04c75e4ef0334abe3d5f419cd9ccfadfe595c09fab33566b 5e181e90075f716c04c75e4ef0334abe3d5f419cd9ccfadfe595c09fab33566b
-StructExpr/gen_struct_expr.rs 8dd9a578625a88623c725b8afdfd8b636e1c3c991fe96c55b24d4b283d2212fb 8dd9a578625a88623c725b8afdfd8b636e1c3c991fe96c55b24d4b283d2212fb
+StructExpr/gen_struct_expr.rs e7824008b0b73d02f6243fd8a18e0ef93c63bfe775a878fc2679c3870fc342fd e7824008b0b73d02f6243fd8a18e0ef93c63bfe775a878fc2679c3870fc342fd
 StructExprField/gen_struct_expr_field.rs 4ccca8e8ad462b4873f5604f0afdd1836027b8d39e36fbe7d6624ef3e744a084 4ccca8e8ad462b4873f5604f0afdd1836027b8d39e36fbe7d6624ef3e744a084
 StructExprFieldList/gen_struct_expr_field_list.rs bc17e356690cfb1cd51f7dbe5ac88c0b9188c9bf94b9e3cc82581120190f33dc bc17e356690cfb1cd51f7dbe5ac88c0b9188c9bf94b9e3cc82581120190f33dc
 StructField/gen_struct_field.rs 0884e458732ab74b4c7debee4fbef014f847815be5a6ddeba467844d33607c6e 0884e458732ab74b4c7debee4fbef014f847815be5a6ddeba467844d33607c6e
@@ -128,7 +128,7 @@ TokenTree/gen_token_tree.rs 3fdc9a36a1870bb2bedf66c8fe37d368f4ac18488e7118b86e39
 Trait/gen_trait.rs bac694993e224f9c6dd86cfb28c54846ae1b3bae45a1e58d3149c884184487ea bac694993e224f9c6dd86cfb28c54846ae1b3bae45a1e58d3149c884184487ea
 TraitAlias/gen_trait_alias.rs 425d78a7cb87db7737ceaf713c9a62e0411537374d1bc58c5b1fb80cc25732c9 425d78a7cb87db7737ceaf713c9a62e0411537374d1bc58c5b1fb80cc25732c9
 TryExpr/gen_try_expr.rs f60198181a423661f4ed1bf6f98d475f40ada190b7b5fc6af97aa5e45ca29a1e f60198181a423661f4ed1bf6f98d475f40ada190b7b5fc6af97aa5e45ca29a1e
-TupleExpr/gen_tuple_expr.rs 8ecd1b6ecc58a0319eed434a423cc6f41bdf1901b1950e6e79735d7f7b2f8374 8ecd1b6ecc58a0319eed434a423cc6f41bdf1901b1950e6e79735d7f7b2f8374
+TupleExpr/gen_tuple_expr.rs 27e56846b3f08c37c8a345169c2a532b2023d231d46a5bdf586bbc6d8fb36a01 27e56846b3f08c37c8a345169c2a532b2023d231d46a5bdf586bbc6d8fb36a01
 TupleField/gen_tuple_field.rs 5d6b4f356af895541f975cc1fd90116fd047fe914c2049d47f61e4a43a8c2af4 5d6b4f356af895541f975cc1fd90116fd047fe914c2049d47f61e4a43a8c2af4
 TupleFieldList/gen_tuple_field_list.rs 42f0af8c391fb9e33fe09b791e0e719cadf5143b58764f8a5d38f8d9054daca7 42f0af8c391fb9e33fe09b791e0e719cadf5143b58764f8a5d38f8d9054daca7
 TuplePat/gen_tuple_pat.rs b1b0c9c5ff1b787f380644691c77807655a4f6441fc7431c90ecf78c54c26148 b1b0c9c5ff1b787f380644691c77807655a4f6441fc7431c90ecf78c54c26148
@@ -136,20 +136,20 @@ TupleStructPat/gen_tuple_struct_pat.rs 601ca8813272d15b4c8fd7402d0d28a42a62be828
 TupleTypeRepr/gen_tuple_type_repr.rs 64873a6a1cd5df6cd10165d7e9fa0399902b6bfbac086ef3a7ce83237b816879 64873a6a1cd5df6cd10165d7e9fa0399902b6bfbac086ef3a7ce83237b816879
 TypeAlias/gen_type_alias.rs da2b959f1a2a4f5471c231025404ca82a1bc79ac68adcda5a67292c428ad6143 da2b959f1a2a4f5471c231025404ca82a1bc79ac68adcda5a67292c428ad6143
 TypeArg/gen_type_arg.rs a0e455d7173b51330db63f1b7ac9c5d4263d33b3a115f97a8167d4dcc42469ff a0e455d7173b51330db63f1b7ac9c5d4263d33b3a115f97a8167d4dcc42469ff
-TypeBound/gen_type_bound.rs 7487ae3fd7c3a481efe96ce7894fc974b96276ecd78e0ccb141c698b5c6f5eaa 7487ae3fd7c3a481efe96ce7894fc974b96276ecd78e0ccb141c698b5c6f5eaa
+TypeBound/gen_type_bound.rs f7ed1dcfde0b9cae65580a990be6dc122be3e02f5771dd0f8f75b306bda1b29a f7ed1dcfde0b9cae65580a990be6dc122be3e02f5771dd0f8f75b306bda1b29a
 TypeBoundList/gen_type_bound_list.rs f61e80667385f6e8f51452a401d355b8939dbb1e1a7d3a506023639cb387bfbd f61e80667385f6e8f51452a401d355b8939dbb1e1a7d3a506023639cb387bfbd
 TypeParam/gen_type_param.rs 00b92ac7042ae83be1e37cd22f6d02098ca3157dc1ef45fbdf3b5f252ea6a8de 00b92ac7042ae83be1e37cd22f6d02098ca3157dc1ef45fbdf3b5f252ea6a8de
 UnderscoreExpr/gen_underscore_expr.rs fe34e99d322bf86c0f5509c9b5fd6e1e8abbdf63dbe7e01687344a41e9aabe52 fe34e99d322bf86c0f5509c9b5fd6e1e8abbdf63dbe7e01687344a41e9aabe52
 Union/gen_union.rs 0adc276bf324661137b4de7c4522afd5f7b2776e913c4a6ecc580ce3d753a51d 0adc276bf324661137b4de7c4522afd5f7b2776e913c4a6ecc580ce3d753a51d
 Use/gen_use.rs 3a8a426109080ce2a0ed5a68a83cfa195196c9f0a14eff328b7be54d1131eede 3a8a426109080ce2a0ed5a68a83cfa195196c9f0a14eff328b7be54d1131eede
-UseBoundGenericArgs/gen_use_bound_generic_args.rs 1da801583b77f5f064d729a1d4313a863f1ad2e1dcc11c963194839cba977367 1da801583b77f5f064d729a1d4313a863f1ad2e1dcc11c963194839cba977367
+UseBoundGenericArgs/gen_use_bound_generic_args.rs 7b9542a4fd4025bdef5e3fab0e76a85c533936793d8791b5e4ed93d6d1e503e9 7b9542a4fd4025bdef5e3fab0e76a85c533936793d8791b5e4ed93d6d1e503e9
 UseTree/gen_use_tree.rs 90660192ec361e96d0fee9dc03c34fcdf0a102269df33be45856c63ad5d18ff2 90660192ec361e96d0fee9dc03c34fcdf0a102269df33be45856c63ad5d18ff2
 UseTreeList/gen_use_tree_list.rs 2494aadcec03a3f7a6e2ae448ee70ec6774f840e9519c668b2afe8cd968211c9 2494aadcec03a3f7a6e2ae448ee70ec6774f840e9519c668b2afe8cd968211c9
 Variant/gen_variant.rs fa3d3a9e3e0c3aa565b965fad9c3dc2ffd5a8d82963e3a55a9acbb0f14b603d6 fa3d3a9e3e0c3aa565b965fad9c3dc2ffd5a8d82963e3a55a9acbb0f14b603d6
 VariantList/gen_variant_list.rs a1faa4d59b072f139d14cb8a6d63a0ce8c473170d6320a07ce6bb9d517f8486d a1faa4d59b072f139d14cb8a6d63a0ce8c473170d6320a07ce6bb9d517f8486d
 Visibility/gen_visibility.rs cfa4b05fa7ba7c4ffa8f9c880b13792735e4f7e92a648f43110e914075e97a52 cfa4b05fa7ba7c4ffa8f9c880b13792735e4f7e92a648f43110e914075e97a52
 WhereClause/gen_where_clause.rs 22522c933be47f8f7f9d0caddfa41925c08df343c564baad2fe2daa14f1bfb1a 22522c933be47f8f7f9d0caddfa41925c08df343c564baad2fe2daa14f1bfb1a
-WherePred/gen_where_pred.rs dbc7bf0f246a04b42783f910c6f09841393f0e0a78f0a584891a99d0cf461619 dbc7bf0f246a04b42783f910c6f09841393f0e0a78f0a584891a99d0cf461619
+WherePred/gen_where_pred.rs 7036e34f1a1f77c5cf031f385be4583472ea4f99e8b4b4ec3c72a65c23e418bb 7036e34f1a1f77c5cf031f385be4583472ea4f99e8b4b4ec3c72a65c23e418bb
 WhileExpr/gen_while_expr.rs 97276c5946a36001638491c99a36170d22bc6011c5e59f621b37c7a2d7737879 97276c5946a36001638491c99a36170d22bc6011c5e59f621b37c7a2d7737879
 WildcardPat/gen_wildcard_pat.rs f1b175eeb3a0fc32bbcfb70a207be33dfde51a7d5198f72b8e08948f0d43e3dc f1b175eeb3a0fc32bbcfb70a207be33dfde51a7d5198f72b8e08948f0d43e3dc
 YeetExpr/gen_yeet_expr.rs c243b785a2cbd941bcec23dafc23ffbc64b93cf2843b6ede9783cdb81fed439d c243b785a2cbd941bcec23dafc23ffbc64b93cf2843b6ede9783cdb81fed439d
diff --git a/rust/ql/test/extractor-tests/generated/.gitattributes b/rust/ql/test/extractor-tests/generated/.gitattributes
index dd1c891195e..2679395b34f 100644
--- a/rust/ql/test/extractor-tests/generated/.gitattributes
+++ b/rust/ql/test/extractor-tests/generated/.gitattributes
@@ -27,7 +27,6 @@
 /BreakExpr/gen_break_expr.rs linguist-generated
 /CallExpr/gen_call_expr.rs linguist-generated
 /CastExpr/gen_cast_expr.rs linguist-generated
-/ClosureBinder/gen_closure_binder.rs linguist-generated
 /ClosureExpr/gen_closure_expr.rs linguist-generated
 /Comment/gen_comment.rs linguist-generated
 /Const/gen_const.rs linguist-generated
@@ -43,6 +42,7 @@
 /ExternItemList/gen_extern_item_list.rs linguist-generated
 /FieldExpr/gen_field_expr.rs linguist-generated
 /FnPtrTypeRepr/gen_fn_ptr_type_repr.rs linguist-generated
+/ForBinder/gen_for_binder.rs linguist-generated
 /ForExpr/gen_for_expr.rs linguist-generated
 /ForTypeRepr/gen_for_type_repr.rs linguist-generated
 /FormatArgsExpr/gen_format.rs linguist-generated
diff --git a/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr.expected b/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr.expected
index 2091c3814d5..8deb774356c 100644
--- a/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr.expected
@@ -1,5 +1,6 @@
 instances
 | gen_asm_expr.rs:6:9:7:59 | AsmExpr |
+getAttributeMacroExpansion
 getAsmPiece
 | gen_asm_expr.rs:6:9:7:59 | AsmExpr | 0 | gen_asm_expr.rs:7:39:7:47 | AsmOperandNamed |
 | gen_asm_expr.rs:6:9:7:59 | AsmExpr | 1 | gen_asm_expr.rs:7:50:7:58 | AsmOperandNamed |
diff --git a/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr.ql b/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr.ql
index 11cc082dae0..e802491c326 100644
--- a/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr.ql
@@ -4,6 +4,12 @@ import TestUtils
 
 query predicate instances(AsmExpr x) { toBeTested(x) and not x.isUnknown() }
 
+query predicate getAttributeMacroExpansion(AsmExpr x, MacroItems getAttributeMacroExpansion) {
+  toBeTested(x) and
+  not x.isUnknown() and
+  getAttributeMacroExpansion = x.getAttributeMacroExpansion()
+}
+
 query predicate getAsmPiece(AsmExpr x, int index, AsmPiece getAsmPiece) {
   toBeTested(x) and not x.isUnknown() and getAsmPiece = x.getAsmPiece(index)
 }
diff --git a/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg.expected b/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg.expected
index 83bfd832501..45099ac5990 100644
--- a/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg.expected
+++ b/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg.expected
@@ -9,4 +9,4 @@ getRetType
 getReturnTypeSyntax
 getTypeRepr
 getTypeBoundList
-| gen_assoc_type_arg.rs:9:21:9:31 | AssocTypeArg | gen_assoc_type_arg.rs:9:27:9:31 | TypeBoundList |
+| gen_assoc_type_arg.rs:9:21:9:31 | AssocTypeArg | gen_assoc_type_arg.rs:9:27:9:31 | ... |
diff --git a/rust/ql/test/extractor-tests/generated/ClosureBinder/ClosureBinder.expected b/rust/ql/test/extractor-tests/generated/ClosureBinder/ClosureBinder.expected
deleted file mode 100644
index dfd2bd58d07..00000000000
--- a/rust/ql/test/extractor-tests/generated/ClosureBinder/ClosureBinder.expected
+++ /dev/null
@@ -1,4 +0,0 @@
-instances
-| gen_closure_binder.rs:7:21:7:43 | ClosureBinder |
-getGenericParamList
-| gen_closure_binder.rs:7:21:7:43 | ClosureBinder | gen_closure_binder.rs:7:24:7:43 | <...> |
diff --git a/rust/ql/test/extractor-tests/generated/ClosureBinder/ClosureBinder.ql b/rust/ql/test/extractor-tests/generated/ClosureBinder/ClosureBinder.ql
deleted file mode 100644
index d204c5fbde1..00000000000
--- a/rust/ql/test/extractor-tests/generated/ClosureBinder/ClosureBinder.ql
+++ /dev/null
@@ -1,9 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-query predicate instances(ClosureBinder x) { toBeTested(x) and not x.isUnknown() }
-
-query predicate getGenericParamList(ClosureBinder x, GenericParamList getGenericParamList) {
-  toBeTested(x) and not x.isUnknown() and getGenericParamList = x.getGenericParamList()
-}
diff --git a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.expected b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.expected
index 041669861b9..214ec781800 100644
--- a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.expected
@@ -2,30 +2,42 @@ instances
 | gen_closure_expr.rs:5:5:5:13 | \|...\| ... | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isStatic: | no |
 | gen_closure_expr.rs:6:5:6:34 | \|...\| ... | isAsync: | no | isConst: | no | isGen: | no | isMove: | yes | isStatic: | no |
 | gen_closure_expr.rs:7:5:7:27 | \|...\| ... | isAsync: | yes | isConst: | no | isGen: | no | isMove: | no | isStatic: | no |
-| gen_closure_expr.rs:8:6:9:15 | \|...\| ... | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isStatic: | no |
-| gen_closure_expr.rs:10:6:11:23 | \|...\| ... | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isStatic: | yes |
+| gen_closure_expr.rs:8:5:9:15 | \|...\| ... | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isStatic: | no |
+| gen_closure_expr.rs:10:5:11:22 | \|...\| ... | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isStatic: | yes |
+| gen_closure_expr.rs:12:5:14:5 | \|...\| ... | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isStatic: | no |
 getParamList
 | gen_closure_expr.rs:5:5:5:13 | \|...\| ... | gen_closure_expr.rs:5:5:5:7 | ParamList |
 | gen_closure_expr.rs:6:5:6:34 | \|...\| ... | gen_closure_expr.rs:6:10:6:17 | ParamList |
 | gen_closure_expr.rs:7:5:7:27 | \|...\| ... | gen_closure_expr.rs:7:11:7:21 | ParamList |
-| gen_closure_expr.rs:8:6:9:15 | \|...\| ... | gen_closure_expr.rs:9:5:9:7 | ParamList |
-| gen_closure_expr.rs:10:6:11:23 | \|...\| ... | gen_closure_expr.rs:11:13:11:15 | ParamList |
+| gen_closure_expr.rs:8:5:9:15 | \|...\| ... | gen_closure_expr.rs:9:5:9:7 | ParamList |
+| gen_closure_expr.rs:10:5:11:22 | \|...\| ... | gen_closure_expr.rs:11:12:11:14 | ParamList |
+| gen_closure_expr.rs:12:5:14:5 | \|...\| ... | gen_closure_expr.rs:12:29:12:34 | ParamList |
 getAttr
-| gen_closure_expr.rs:8:6:9:15 | \|...\| ... | 0 | gen_closure_expr.rs:8:6:8:17 | Attr |
-| gen_closure_expr.rs:10:6:11:23 | \|...\| ... | 0 | gen_closure_expr.rs:10:6:10:17 | Attr |
+| gen_closure_expr.rs:8:5:9:15 | \|...\| ... | 0 | gen_closure_expr.rs:8:5:8:16 | Attr |
+| gen_closure_expr.rs:10:5:11:22 | \|...\| ... | 0 | gen_closure_expr.rs:10:5:10:16 | Attr |
 getParam
 | gen_closure_expr.rs:5:5:5:13 | \|...\| ... | 0 | gen_closure_expr.rs:5:6:5:6 | ... |
 | gen_closure_expr.rs:6:5:6:34 | \|...\| ... | 0 | gen_closure_expr.rs:6:11:6:16 | ...: i32 |
 | gen_closure_expr.rs:7:5:7:27 | \|...\| ... | 0 | gen_closure_expr.rs:7:12:7:17 | ...: i32 |
 | gen_closure_expr.rs:7:5:7:27 | \|...\| ... | 1 | gen_closure_expr.rs:7:20:7:20 | ... |
-| gen_closure_expr.rs:8:6:9:15 | \|...\| ... | 0 | gen_closure_expr.rs:9:6:9:6 | ... |
-| gen_closure_expr.rs:10:6:11:23 | \|...\| ... | 0 | gen_closure_expr.rs:11:14:11:14 | ... |
+| gen_closure_expr.rs:8:5:9:15 | \|...\| ... | 0 | gen_closure_expr.rs:9:6:9:6 | ... |
+| gen_closure_expr.rs:10:5:11:22 | \|...\| ... | 0 | gen_closure_expr.rs:11:13:11:13 | ... |
+| gen_closure_expr.rs:12:5:14:5 | \|...\| ... | 0 | gen_closure_expr.rs:12:30:12:33 | ...: T |
 getBody
 | gen_closure_expr.rs:5:5:5:13 | \|...\| ... | gen_closure_expr.rs:5:9:5:13 | ... + ... |
 | gen_closure_expr.rs:6:5:6:34 | \|...\| ... | gen_closure_expr.rs:6:26:6:34 | { ... } |
 | gen_closure_expr.rs:7:5:7:27 | \|...\| ... | gen_closure_expr.rs:7:23:7:27 | ... + ... |
-| gen_closure_expr.rs:8:6:9:15 | \|...\| ... | gen_closure_expr.rs:9:9:9:15 | YieldExpr |
-| gen_closure_expr.rs:10:6:11:23 | \|...\| ... | gen_closure_expr.rs:11:17:11:23 | YieldExpr |
-getClosureBinder
+| gen_closure_expr.rs:8:5:9:15 | \|...\| ... | gen_closure_expr.rs:9:9:9:15 | YieldExpr |
+| gen_closure_expr.rs:10:5:11:22 | \|...\| ... | gen_closure_expr.rs:11:16:11:22 | YieldExpr |
+| gen_closure_expr.rs:12:5:14:5 | \|...\| ... | gen_closure_expr.rs:12:36:14:5 | { ... } |
+getClosureBody
+| gen_closure_expr.rs:5:5:5:13 | \|...\| ... | gen_closure_expr.rs:5:9:5:13 | ... + ... |
+| gen_closure_expr.rs:6:5:6:34 | \|...\| ... | gen_closure_expr.rs:6:26:6:34 | { ... } |
+| gen_closure_expr.rs:7:5:7:27 | \|...\| ... | gen_closure_expr.rs:7:23:7:27 | ... + ... |
+| gen_closure_expr.rs:8:5:9:15 | \|...\| ... | gen_closure_expr.rs:9:9:9:15 | YieldExpr |
+| gen_closure_expr.rs:10:5:11:22 | \|...\| ... | gen_closure_expr.rs:11:16:11:22 | YieldExpr |
+| gen_closure_expr.rs:12:5:14:5 | \|...\| ... | gen_closure_expr.rs:12:36:14:5 | { ... } |
+getForBinder
+| gen_closure_expr.rs:12:5:14:5 | \|...\| ... | gen_closure_expr.rs:12:5:12:27 | for<...> |
 getRetType
 | gen_closure_expr.rs:6:5:6:34 | \|...\| ... | gen_closure_expr.rs:6:19:6:24 | RetTypeRepr |
diff --git a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql
index acf3b130677..1d7a9412b16 100644
--- a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql
@@ -37,8 +37,12 @@ query predicate getBody(ClosureExpr x, Expr getBody) {
   toBeTested(x) and not x.isUnknown() and getBody = x.getBody()
 }
 
-query predicate getClosureBinder(ClosureExpr x, ClosureBinder getClosureBinder) {
-  toBeTested(x) and not x.isUnknown() and getClosureBinder = x.getClosureBinder()
+query predicate getClosureBody(ClosureExpr x, Expr getClosureBody) {
+  toBeTested(x) and not x.isUnknown() and getClosureBody = x.getClosureBody()
+}
+
+query predicate getForBinder(ClosureExpr x, ForBinder getForBinder) {
+  toBeTested(x) and not x.isUnknown() and getForBinder = x.getForBinder()
 }
 
 query predicate getRetType(ClosureExpr x, RetTypeRepr getRetType) {
diff --git a/rust/ql/test/extractor-tests/generated/ClosureExpr/gen_closure_expr.rs b/rust/ql/test/extractor-tests/generated/ClosureExpr/gen_closure_expr.rs
index 4c0c6067aac..a9d1c5a2aea 100644
--- a/rust/ql/test/extractor-tests/generated/ClosureExpr/gen_closure_expr.rs
+++ b/rust/ql/test/extractor-tests/generated/ClosureExpr/gen_closure_expr.rs
@@ -5,8 +5,11 @@ fn test_closure_expr() -> () {
     |x| x + 1;
     move |x: i32| -> i32 { x + 1 };
     async |x: i32, y| x + y;
-     #[coroutine]
+    #[coroutine]
     |x| yield x;
-     #[coroutine]
-     static |x| yield x;
+    #[coroutine]
+    static |x| yield x;
+    for<T: std::fmt::Debug> |x: T| {
+        println!("{:?}", x);
+    };
 }
diff --git a/rust/ql/test/extractor-tests/generated/Const/Const.expected b/rust/ql/test/extractor-tests/generated/Const/Const.expected
index 64b20c95e26..cc1f282193f 100644
--- a/rust/ql/test/extractor-tests/generated/Const/Const.expected
+++ b/rust/ql/test/extractor-tests/generated/Const/Const.expected
@@ -1,7 +1,5 @@
 instances
 | gen_const.rs:4:5:7:22 | Const | isConst: | yes | isDefault: | no | hasImplementation: | yes |
-getExtendedCanonicalPath
-getCrateOrigin
 getAttributeMacroExpansion
 getAttr
 getBody
diff --git a/rust/ql/test/extractor-tests/generated/Const/Const.ql b/rust/ql/test/extractor-tests/generated/Const/Const.ql
index ef88f980fc0..70420980d67 100644
--- a/rust/ql/test/extractor-tests/generated/Const/Const.ql
+++ b/rust/ql/test/extractor-tests/generated/Const/Const.ql
@@ -16,14 +16,6 @@ query predicate instances(
   if x.hasImplementation() then hasImplementation = "yes" else hasImplementation = "no"
 }
 
-query predicate getExtendedCanonicalPath(Const x, string getExtendedCanonicalPath) {
-  toBeTested(x) and not x.isUnknown() and getExtendedCanonicalPath = x.getExtendedCanonicalPath()
-}
-
-query predicate getCrateOrigin(Const x, string getCrateOrigin) {
-  toBeTested(x) and not x.isUnknown() and getCrateOrigin = x.getCrateOrigin()
-}
-
 query predicate getAttributeMacroExpansion(Const x, MacroItems getAttributeMacroExpansion) {
   toBeTested(x) and
   not x.isUnknown() and
diff --git a/rust/ql/test/extractor-tests/generated/DynTraitTypeRepr/DynTraitTypeRepr.expected b/rust/ql/test/extractor-tests/generated/DynTraitTypeRepr/DynTraitTypeRepr.expected
index 14ff9874ffb..e996a752406 100644
--- a/rust/ql/test/extractor-tests/generated/DynTraitTypeRepr/DynTraitTypeRepr.expected
+++ b/rust/ql/test/extractor-tests/generated/DynTraitTypeRepr/DynTraitTypeRepr.expected
@@ -1,4 +1,4 @@
 instances
 | gen_dyn_trait_type_repr.rs:7:13:7:21 | DynTraitTypeRepr |
 getTypeBoundList
-| gen_dyn_trait_type_repr.rs:7:13:7:21 | DynTraitTypeRepr | gen_dyn_trait_type_repr.rs:7:17:7:21 | TypeBoundList |
+| gen_dyn_trait_type_repr.rs:7:13:7:21 | DynTraitTypeRepr | gen_dyn_trait_type_repr.rs:7:17:7:21 | ... |
diff --git a/rust/ql/test/extractor-tests/generated/Enum/Enum.expected b/rust/ql/test/extractor-tests/generated/Enum/Enum.expected
index 45154c93e48..de3c33c0a7c 100644
--- a/rust/ql/test/extractor-tests/generated/Enum/Enum.expected
+++ b/rust/ql/test/extractor-tests/generated/Enum/Enum.expected
@@ -1,7 +1,5 @@
 instances
 | gen_enum.rs:4:5:7:34 | enum E |
-getExtendedCanonicalPath
-getCrateOrigin
 getAttributeMacroExpansion
 getDeriveMacroExpansion
 getAttr
diff --git a/rust/ql/test/extractor-tests/generated/Enum/Enum.ql b/rust/ql/test/extractor-tests/generated/Enum/Enum.ql
index e5c4c12693e..0aa1bda8041 100644
--- a/rust/ql/test/extractor-tests/generated/Enum/Enum.ql
+++ b/rust/ql/test/extractor-tests/generated/Enum/Enum.ql
@@ -4,14 +4,6 @@ import TestUtils
 
 query predicate instances(Enum x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getExtendedCanonicalPath(Enum x, string getExtendedCanonicalPath) {
-  toBeTested(x) and not x.isUnknown() and getExtendedCanonicalPath = x.getExtendedCanonicalPath()
-}
-
-query predicate getCrateOrigin(Enum x, string getCrateOrigin) {
-  toBeTested(x) and not x.isUnknown() and getCrateOrigin = x.getCrateOrigin()
-}
-
 query predicate getAttributeMacroExpansion(Enum x, MacroItems getAttributeMacroExpansion) {
   toBeTested(x) and
   not x.isUnknown() and
diff --git a/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock.expected b/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock.expected
index 8e061f24a56..1083af0cbcf 100644
--- a/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock.expected
+++ b/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock.expected
@@ -1,7 +1,5 @@
 instances
 | gen_extern_block.rs:7:5:9:5 | ExternBlock | isUnsafe: | no |
-getExtendedCanonicalPath
-getCrateOrigin
 getAttributeMacroExpansion
 getAbi
 | gen_extern_block.rs:7:5:9:5 | ExternBlock | gen_extern_block.rs:7:5:7:14 | Abi |
diff --git a/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock.ql b/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock.ql
index 2f07e5dfcae..9769e173593 100644
--- a/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock.ql
+++ b/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock.ql
@@ -9,14 +9,6 @@ query predicate instances(ExternBlock x, string isUnsafe__label, string isUnsafe
   if x.isUnsafe() then isUnsafe = "yes" else isUnsafe = "no"
 }
 
-query predicate getExtendedCanonicalPath(ExternBlock x, string getExtendedCanonicalPath) {
-  toBeTested(x) and not x.isUnknown() and getExtendedCanonicalPath = x.getExtendedCanonicalPath()
-}
-
-query predicate getCrateOrigin(ExternBlock x, string getCrateOrigin) {
-  toBeTested(x) and not x.isUnknown() and getCrateOrigin = x.getCrateOrigin()
-}
-
 query predicate getAttributeMacroExpansion(ExternBlock x, MacroItems getAttributeMacroExpansion) {
   toBeTested(x) and
   not x.isUnknown() and
diff --git a/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate.expected b/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate.expected
index 6e1b1a84e1a..07b1cf161d2 100644
--- a/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate.expected
+++ b/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate.expected
@@ -1,7 +1,5 @@
 instances
 | gen_extern_crate.rs:4:5:7:23 | ExternCrate |
-getExtendedCanonicalPath
-getCrateOrigin
 getAttributeMacroExpansion
 getAttr
 getIdentifier
diff --git a/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate.ql b/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate.ql
index b0c2c372896..2898d60f487 100644
--- a/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate.ql
+++ b/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate.ql
@@ -4,14 +4,6 @@ import TestUtils
 
 query predicate instances(ExternCrate x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getExtendedCanonicalPath(ExternCrate x, string getExtendedCanonicalPath) {
-  toBeTested(x) and not x.isUnknown() and getExtendedCanonicalPath = x.getExtendedCanonicalPath()
-}
-
-query predicate getCrateOrigin(ExternCrate x, string getCrateOrigin) {
-  toBeTested(x) and not x.isUnknown() and getCrateOrigin = x.getCrateOrigin()
-}
-
 query predicate getAttributeMacroExpansion(ExternCrate x, MacroItems getAttributeMacroExpansion) {
   toBeTested(x) and
   not x.isUnknown() and
diff --git a/rust/ql/test/extractor-tests/generated/ForBinder/ForBinder.expected b/rust/ql/test/extractor-tests/generated/ForBinder/ForBinder.expected
new file mode 100644
index 00000000000..34274dddb8b
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ForBinder/ForBinder.expected
@@ -0,0 +1,4 @@
+instances
+| gen_for_binder.rs:7:21:7:43 | for<...> |
+getGenericParamList
+| gen_for_binder.rs:7:21:7:43 | for<...> | gen_for_binder.rs:7:24:7:43 | <...> |
diff --git a/rust/ql/test/extractor-tests/generated/ForBinder/ForBinder.ql b/rust/ql/test/extractor-tests/generated/ForBinder/ForBinder.ql
new file mode 100644
index 00000000000..7e577cb1be2
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ForBinder/ForBinder.ql
@@ -0,0 +1,9 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+query predicate instances(ForBinder x) { toBeTested(x) and not x.isUnknown() }
+
+query predicate getGenericParamList(ForBinder x, GenericParamList getGenericParamList) {
+  toBeTested(x) and not x.isUnknown() and getGenericParamList = x.getGenericParamList()
+}
diff --git a/rust/ql/test/extractor-tests/generated/ClosureBinder/gen_closure_binder.rs b/rust/ql/test/extractor-tests/generated/ForBinder/gen_for_binder.rs
similarity index 68%
rename from rust/ql/test/extractor-tests/generated/ClosureBinder/gen_closure_binder.rs
rename to rust/ql/test/extractor-tests/generated/ForBinder/gen_for_binder.rs
index 6328368c5e1..c37e16793f2 100644
--- a/rust/ql/test/extractor-tests/generated/ClosureBinder/gen_closure_binder.rs
+++ b/rust/ql/test/extractor-tests/generated/ForBinder/gen_for_binder.rs
@@ -1,7 +1,7 @@
 // generated by codegen, do not edit
 
-fn test_closure_binder() -> () {
-    // A closure binder, specifying lifetime or type parameters for a closure.
+fn test_for_binder() -> () {
+    // A for binder, specifying lifetime or type parameters for a closure or a type.
     // 
     // For example:
     let print_any = for<T: std::fmt::Debug> |x: T| {
diff --git a/rust/ql/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr.expected b/rust/ql/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr.expected
index 8f5ac12ec36..11c4d0212a7 100644
--- a/rust/ql/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr.expected
+++ b/rust/ql/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr.expected
@@ -1,6 +1,6 @@
 instances
-| gen_for_type_repr.rs:9:12:9:41 | ForTypeRepr |
-getGenericParamList
-| gen_for_type_repr.rs:9:12:9:41 | ForTypeRepr | gen_for_type_repr.rs:9:15:9:18 | <...> |
+| gen_for_type_repr.rs:7:21:7:46 | ForTypeRepr |
+getForBinder
+| gen_for_type_repr.rs:7:21:7:46 | ForTypeRepr | gen_for_type_repr.rs:7:21:7:27 | for<...> |
 getTypeRepr
-| gen_for_type_repr.rs:9:12:9:41 | ForTypeRepr | gen_for_type_repr.rs:9:20:9:41 | Fn |
+| gen_for_type_repr.rs:7:21:7:46 | ForTypeRepr | gen_for_type_repr.rs:7:29:7:46 | FnPtrTypeRepr |
diff --git a/rust/ql/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr.ql b/rust/ql/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr.ql
index 398a317a3dd..9a485ca6d74 100644
--- a/rust/ql/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr.ql
+++ b/rust/ql/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr.ql
@@ -4,8 +4,8 @@ import TestUtils
 
 query predicate instances(ForTypeRepr x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getGenericParamList(ForTypeRepr x, GenericParamList getGenericParamList) {
-  toBeTested(x) and not x.isUnknown() and getGenericParamList = x.getGenericParamList()
+query predicate getForBinder(ForTypeRepr x, ForBinder getForBinder) {
+  toBeTested(x) and not x.isUnknown() and getForBinder = x.getForBinder()
 }
 
 query predicate getTypeRepr(ForTypeRepr x, TypeRepr getTypeRepr) {
diff --git a/rust/ql/test/extractor-tests/generated/ForTypeRepr/gen_for_type_repr.rs b/rust/ql/test/extractor-tests/generated/ForTypeRepr/gen_for_type_repr.rs
index 49cd9e5c1ab..99072c25bcf 100644
--- a/rust/ql/test/extractor-tests/generated/ForTypeRepr/gen_for_type_repr.rs
+++ b/rust/ql/test/extractor-tests/generated/ForTypeRepr/gen_for_type_repr.rs
@@ -1,14 +1,9 @@
 // generated by codegen, do not edit
 
 fn test_for_type_repr() -> () {
-    // A higher-ranked trait bound.
+    // A function pointer type with a `for` modifier.
     // 
     // For example:
-    fn foo<T>(value: T)
-    where
-        T: for<'a> Fn(&'a str) -> &'a str
-    //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-    {
-        // ...
-    }
+    type RefOp<X> = for<'a> fn(&'a X) -> &'a X;
+    //              ^^^^^^^^^^^^^^^^^^^^^^^^^^
 }
diff --git a/rust/ql/test/extractor-tests/generated/Function/Function.expected b/rust/ql/test/extractor-tests/generated/Function/Function.expected
index db434cf918d..e01c7236ef3 100644
--- a/rust/ql/test/extractor-tests/generated/Function/Function.expected
+++ b/rust/ql/test/extractor-tests/generated/Function/Function.expected
@@ -1,12 +1,6 @@
 instances
 | gen_function.rs:3:1:4:38 | fn foo | isAsync: | no | isConst: | no | isDefault: | no | isGen: | no | isUnsafe: | no | hasImplementation: | yes |
 | gen_function.rs:7:5:7:13 | fn bar | isAsync: | no | isConst: | no | isDefault: | no | isGen: | no | isUnsafe: | no | hasImplementation: | no |
-getExtendedCanonicalPath
-| gen_function.rs:3:1:4:38 | fn foo | crate::gen_function::foo |
-| gen_function.rs:7:5:7:13 | fn bar | crate::gen_function::Trait::bar |
-getCrateOrigin
-| gen_function.rs:3:1:4:38 | fn foo | repo::test |
-| gen_function.rs:7:5:7:13 | fn bar | repo::test |
 getAttributeMacroExpansion
 getParamList
 | gen_function.rs:3:1:4:38 | fn foo | gen_function.rs:4:7:4:14 | ParamList |
@@ -14,9 +8,11 @@ getParamList
 getAttr
 getParam
 | gen_function.rs:3:1:4:38 | fn foo | 0 | gen_function.rs:4:8:4:13 | ...: u32 |
-getAbi
 getBody
 | gen_function.rs:3:1:4:38 | fn foo | gen_function.rs:4:23:4:38 | { ... } |
+getAbi
+getFunctionBody
+| gen_function.rs:3:1:4:38 | fn foo | gen_function.rs:4:23:4:38 | { ... } |
 getGenericParamList
 getName
 | gen_function.rs:3:1:4:38 | fn foo | gen_function.rs:4:4:4:6 | foo |
diff --git a/rust/ql/test/extractor-tests/generated/Function/Function.ql b/rust/ql/test/extractor-tests/generated/Function/Function.ql
index 4f76623cb20..ca2bf4d5f70 100644
--- a/rust/ql/test/extractor-tests/generated/Function/Function.ql
+++ b/rust/ql/test/extractor-tests/generated/Function/Function.ql
@@ -23,14 +23,6 @@ query predicate instances(
   if x.hasImplementation() then hasImplementation = "yes" else hasImplementation = "no"
 }
 
-query predicate getExtendedCanonicalPath(Function x, string getExtendedCanonicalPath) {
-  toBeTested(x) and not x.isUnknown() and getExtendedCanonicalPath = x.getExtendedCanonicalPath()
-}
-
-query predicate getCrateOrigin(Function x, string getCrateOrigin) {
-  toBeTested(x) and not x.isUnknown() and getCrateOrigin = x.getCrateOrigin()
-}
-
 query predicate getAttributeMacroExpansion(Function x, MacroItems getAttributeMacroExpansion) {
   toBeTested(x) and
   not x.isUnknown() and
@@ -49,12 +41,16 @@ query predicate getParam(Function x, int index, Param getParam) {
   toBeTested(x) and not x.isUnknown() and getParam = x.getParam(index)
 }
 
+query predicate getBody(Function x, Expr getBody) {
+  toBeTested(x) and not x.isUnknown() and getBody = x.getBody()
+}
+
 query predicate getAbi(Function x, Abi getAbi) {
   toBeTested(x) and not x.isUnknown() and getAbi = x.getAbi()
 }
 
-query predicate getBody(Function x, BlockExpr getBody) {
-  toBeTested(x) and not x.isUnknown() and getBody = x.getBody()
+query predicate getFunctionBody(Function x, BlockExpr getFunctionBody) {
+  toBeTested(x) and not x.isUnknown() and getFunctionBody = x.getFunctionBody()
 }
 
 query predicate getGenericParamList(Function x, GenericParamList getGenericParamList) {
diff --git a/rust/ql/test/extractor-tests/generated/Impl/Impl.expected b/rust/ql/test/extractor-tests/generated/Impl/Impl.expected
index 2a47a4e20f6..ec5e5705529 100644
--- a/rust/ql/test/extractor-tests/generated/Impl/Impl.expected
+++ b/rust/ql/test/extractor-tests/generated/Impl/Impl.expected
@@ -1,7 +1,5 @@
 instances
 | gen_impl.rs:4:5:9:5 | impl MyTrait for MyType { ... } | isConst: | no | isDefault: | no | isUnsafe: | no |
-getExtendedCanonicalPath
-getCrateOrigin
 getAttributeMacroExpansion
 getAssocItemList
 | gen_impl.rs:4:5:9:5 | impl MyTrait for MyType { ... } | gen_impl.rs:7:29:9:5 | AssocItemList |
diff --git a/rust/ql/test/extractor-tests/generated/Impl/Impl.ql b/rust/ql/test/extractor-tests/generated/Impl/Impl.ql
index c64bae752c3..1d73e09a1a7 100644
--- a/rust/ql/test/extractor-tests/generated/Impl/Impl.ql
+++ b/rust/ql/test/extractor-tests/generated/Impl/Impl.ql
@@ -16,14 +16,6 @@ query predicate instances(
   if x.isUnsafe() then isUnsafe = "yes" else isUnsafe = "no"
 }
 
-query predicate getExtendedCanonicalPath(Impl x, string getExtendedCanonicalPath) {
-  toBeTested(x) and not x.isUnknown() and getExtendedCanonicalPath = x.getExtendedCanonicalPath()
-}
-
-query predicate getCrateOrigin(Impl x, string getCrateOrigin) {
-  toBeTested(x) and not x.isUnknown() and getCrateOrigin = x.getCrateOrigin()
-}
-
 query predicate getAttributeMacroExpansion(Impl x, MacroItems getAttributeMacroExpansion) {
   toBeTested(x) and
   not x.isUnknown() and
diff --git a/rust/ql/test/extractor-tests/generated/ImplTraitTypeRepr/ImplTraitTypeRepr.expected b/rust/ql/test/extractor-tests/generated/ImplTraitTypeRepr/ImplTraitTypeRepr.expected
index aa04363dc44..5c9774002bb 100644
--- a/rust/ql/test/extractor-tests/generated/ImplTraitTypeRepr/ImplTraitTypeRepr.expected
+++ b/rust/ql/test/extractor-tests/generated/ImplTraitTypeRepr/ImplTraitTypeRepr.expected
@@ -1,4 +1,4 @@
 instances
-| gen_impl_trait_type_repr.rs:7:17:7:41 | ImplTraitTypeRepr |
+| gen_impl_trait_type_repr.rs:7:17:7:41 | impl ... |
 getTypeBoundList
-| gen_impl_trait_type_repr.rs:7:17:7:41 | ImplTraitTypeRepr | gen_impl_trait_type_repr.rs:7:22:7:41 | TypeBoundList |
+| gen_impl_trait_type_repr.rs:7:17:7:41 | impl ... | gen_impl_trait_type_repr.rs:7:22:7:41 | ... |
diff --git a/rust/ql/test/extractor-tests/generated/MacroBlockExpr/MacroBlockExpr.expected b/rust/ql/test/extractor-tests/generated/MacroBlockExpr/MacroBlockExpr.expected
index 67d330d937e..d6887babe7e 100644
--- a/rust/ql/test/extractor-tests/generated/MacroBlockExpr/MacroBlockExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/MacroBlockExpr/MacroBlockExpr.expected
@@ -1,5 +1,7 @@
 instances
-| gen_macro_block_expr.rs:5:14:5:28 | MacroBlockExpr |
-getTailExpr
-| gen_macro_block_expr.rs:5:14:5:28 | MacroBlockExpr | gen_macro_block_expr.rs:5:14:5:28 | { ... } |
+| gen_macro_block_expr.rs:13:5:13:13 | MacroBlockExpr |
 getStatement
+| gen_macro_block_expr.rs:13:5:13:13 | MacroBlockExpr | 0 | gen_macro_block_expr.rs:13:5:13:13 | let ... = 40 |
+| gen_macro_block_expr.rs:13:5:13:13 | MacroBlockExpr | 1 | gen_macro_block_expr.rs:13:5:13:13 | ExprStmt |
+getTailExpr
+| gen_macro_block_expr.rs:13:5:13:13 | MacroBlockExpr | gen_macro_block_expr.rs:13:5:13:13 | x |
diff --git a/rust/ql/test/extractor-tests/generated/MacroBlockExpr/MacroBlockExpr.ql b/rust/ql/test/extractor-tests/generated/MacroBlockExpr/MacroBlockExpr.ql
index 82502ad4ec0..bae6d7d1f62 100644
--- a/rust/ql/test/extractor-tests/generated/MacroBlockExpr/MacroBlockExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/MacroBlockExpr/MacroBlockExpr.ql
@@ -4,10 +4,10 @@ import TestUtils
 
 query predicate instances(MacroBlockExpr x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getTailExpr(MacroBlockExpr x, Expr getTailExpr) {
-  toBeTested(x) and not x.isUnknown() and getTailExpr = x.getTailExpr()
-}
-
 query predicate getStatement(MacroBlockExpr x, int index, Stmt getStatement) {
   toBeTested(x) and not x.isUnknown() and getStatement = x.getStatement(index)
 }
+
+query predicate getTailExpr(MacroBlockExpr x, Expr getTailExpr) {
+  toBeTested(x) and not x.isUnknown() and getTailExpr = x.getTailExpr()
+}
diff --git a/rust/ql/test/extractor-tests/generated/MacroBlockExpr/gen_macro_block_expr.rs b/rust/ql/test/extractor-tests/generated/MacroBlockExpr/gen_macro_block_expr.rs
index 035b7ddc98c..62a408411e8 100644
--- a/rust/ql/test/extractor-tests/generated/MacroBlockExpr/gen_macro_block_expr.rs
+++ b/rust/ql/test/extractor-tests/generated/MacroBlockExpr/gen_macro_block_expr.rs
@@ -1,6 +1,14 @@
 // generated by codegen, do not edit
 
-// A sequence of statements generated by a `MacroCall`. For example:
-fn main() {
-    println!("Hello, world!"); // This macro expands into a list of statements
+fn test_macro_block_expr() -> () {
+    // A sequence of statements generated by a `MacroCall`. For example:
+    macro_rules! my_macro {
+        () => {
+            let mut x = 40;
+            x += 2;
+            x
+        };
+    }
+    
+    my_macro!();  // this macro expands to a sequence of statements (and an expression)
 }
diff --git a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.expected b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.expected
index 0fae1d5e49d..e73178f5a4f 100644
--- a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.expected
+++ b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.expected
@@ -1,13 +1,11 @@
 instances
 | gen_macro_call.rs:7:5:7:29 | println!... |
 | gen_macro_call.rs:7:14:7:28 | ...::format_args_nl!... |
-getExtendedCanonicalPath
-getCrateOrigin
 getAttributeMacroExpansion
 getAttr
 getPath
 | gen_macro_call.rs:7:5:7:29 | println!... | gen_macro_call.rs:7:5:7:11 | println |
-| gen_macro_call.rs:7:14:7:28 | ...::format_args_nl!... | gen_macro_call.rs:7:5:7:29 | ...::format_args_nl |
+| gen_macro_call.rs:7:14:7:28 | ...::format_args_nl!... | gen_macro_call.rs:7:5:7:12 | ...::format_args_nl |
 getTokenTree
 | gen_macro_call.rs:7:5:7:29 | println!... | gen_macro_call.rs:7:13:7:29 | TokenTree |
 | gen_macro_call.rs:7:14:7:28 | ...::format_args_nl!... | gen_macro_call.rs:7:14:7:28 | TokenTree |
diff --git a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.ql b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.ql
index 48fddccf341..5081eca422e 100644
--- a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.ql
+++ b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.ql
@@ -4,14 +4,6 @@ import TestUtils
 
 query predicate instances(MacroCall x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getExtendedCanonicalPath(MacroCall x, string getExtendedCanonicalPath) {
-  toBeTested(x) and not x.isUnknown() and getExtendedCanonicalPath = x.getExtendedCanonicalPath()
-}
-
-query predicate getCrateOrigin(MacroCall x, string getCrateOrigin) {
-  toBeTested(x) and not x.isUnknown() and getCrateOrigin = x.getCrateOrigin()
-}
-
 query predicate getAttributeMacroExpansion(MacroCall x, MacroItems getAttributeMacroExpansion) {
   toBeTested(x) and
   not x.isUnknown() and
diff --git a/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef.expected b/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef.expected
index b9b6ddc10cd..ba510853f06 100644
--- a/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef.expected
+++ b/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef.expected
@@ -1,7 +1,5 @@
 instances
 | gen_macro_def.rs:4:5:9:5 | MacroDef |
-getExtendedCanonicalPath
-getCrateOrigin
 getAttributeMacroExpansion
 getArgs
 | gen_macro_def.rs:4:5:9:5 | MacroDef | gen_macro_def.rs:7:25:7:39 | TokenTree |
diff --git a/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef.ql b/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef.ql
index e85173597cb..18aece7ccb5 100644
--- a/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef.ql
+++ b/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef.ql
@@ -4,14 +4,6 @@ import TestUtils
 
 query predicate instances(MacroDef x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getExtendedCanonicalPath(MacroDef x, string getExtendedCanonicalPath) {
-  toBeTested(x) and not x.isUnknown() and getExtendedCanonicalPath = x.getExtendedCanonicalPath()
-}
-
-query predicate getCrateOrigin(MacroDef x, string getCrateOrigin) {
-  toBeTested(x) and not x.isUnknown() and getCrateOrigin = x.getCrateOrigin()
-}
-
 query predicate getAttributeMacroExpansion(MacroDef x, MacroItems getAttributeMacroExpansion) {
   toBeTested(x) and
   not x.isUnknown() and
diff --git a/rust/ql/test/extractor-tests/generated/MacroItems/MacroItems.expected b/rust/ql/test/extractor-tests/generated/MacroItems/MacroItems.expected
index 90daafd5817..156893a07eb 100644
--- a/rust/ql/test/extractor-tests/generated/MacroItems/MacroItems.expected
+++ b/rust/ql/test/extractor-tests/generated/MacroItems/MacroItems.expected
@@ -1,7 +1,7 @@
 instances
-| gen_macro_items.rs:5:5:5:38 | MacroItems |
+| gen_macro_items.rs:5:5:5:12 | MacroItems |
 | gen_macro_items.rs:13:12:13:14 | MacroItems |
 getItem
-| gen_macro_items.rs:5:5:5:38 | MacroItems | 0 | gen_macro_items.rs:5:5:5:38 | use ...::Path |
-| gen_macro_items.rs:5:5:5:38 | MacroItems | 1 | gen_macro_items.rs:5:5:5:38 | fn get_parent |
+| gen_macro_items.rs:5:5:5:12 | MacroItems | 0 | gen_macro_items.rs:5:5:5:38 | use ...::Path |
+| gen_macro_items.rs:5:5:5:12 | MacroItems | 1 | gen_macro_items.rs:5:5:5:38 | fn get_parent |
 | gen_macro_items.rs:13:12:13:14 | MacroItems | 0 | gen_macro_items.rs:13:12:13:14 | impl ...::Debug for Bar::<...> { ... } |
diff --git a/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules.expected b/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules.expected
index 4bfb98220f2..cb40220291a 100644
--- a/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules.expected
+++ b/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules.expected
@@ -1,7 +1,5 @@
 instances
 | gen_macro_rules.rs:4:5:9:5 | MacroRules |
-getExtendedCanonicalPath
-getCrateOrigin
 getAttributeMacroExpansion
 getAttr
 getName
diff --git a/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules.ql b/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules.ql
index ef051f77c9e..4dc862c73d7 100644
--- a/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules.ql
+++ b/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules.ql
@@ -4,14 +4,6 @@ import TestUtils
 
 query predicate instances(MacroRules x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getExtendedCanonicalPath(MacroRules x, string getExtendedCanonicalPath) {
-  toBeTested(x) and not x.isUnknown() and getExtendedCanonicalPath = x.getExtendedCanonicalPath()
-}
-
-query predicate getCrateOrigin(MacroRules x, string getCrateOrigin) {
-  toBeTested(x) and not x.isUnknown() and getCrateOrigin = x.getCrateOrigin()
-}
-
 query predicate getAttributeMacroExpansion(MacroRules x, MacroItems getAttributeMacroExpansion) {
   toBeTested(x) and
   not x.isUnknown() and
diff --git a/rust/ql/test/extractor-tests/generated/MatchArm/gen_match_arm.rs b/rust/ql/test/extractor-tests/generated/MatchArm/gen_match_arm.rs
index 5f5922e8ef4..39083d30d22 100644
--- a/rust/ql/test/extractor-tests/generated/MatchArm/gen_match_arm.rs
+++ b/rust/ql/test/extractor-tests/generated/MatchArm/gen_match_arm.rs
@@ -1,6 +1,6 @@
 // generated by codegen, do not edit
 
-fn test_match_arm(x: i32) -> i32 {
+fn test_match_arm(x: i32) {
     // A match arm. For example:
     match x {
         Option::Some(y) => y,
diff --git a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.expected b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.expected
index 61054a3841a..0eedcc70b5d 100644
--- a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.expected
@@ -8,8 +8,6 @@ getAttr
 getArg
 | gen_method_call_expr.rs:5:5:5:13 | x.foo(...) | 0 | gen_method_call_expr.rs:5:11:5:12 | 42 |
 | gen_method_call_expr.rs:6:5:6:25 | x.foo(...) | 0 | gen_method_call_expr.rs:6:23:6:24 | 42 |
-getResolvedPath
-getResolvedCrateOrigin
 getGenericArgList
 | gen_method_call_expr.rs:6:5:6:25 | x.foo(...) | gen_method_call_expr.rs:6:10:6:21 | <...> |
 getIdentifier
diff --git a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql
index 73ddf8e7d2e..d1b6d5a1304 100644
--- a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql
@@ -16,14 +16,6 @@ query predicate getArg(MethodCallExpr x, int index, Expr getArg) {
   toBeTested(x) and not x.isUnknown() and getArg = x.getArg(index)
 }
 
-query predicate getResolvedPath(MethodCallExpr x, string getResolvedPath) {
-  toBeTested(x) and not x.isUnknown() and getResolvedPath = x.getResolvedPath()
-}
-
-query predicate getResolvedCrateOrigin(MethodCallExpr x, string getResolvedCrateOrigin) {
-  toBeTested(x) and not x.isUnknown() and getResolvedCrateOrigin = x.getResolvedCrateOrigin()
-}
-
 query predicate getGenericArgList(MethodCallExpr x, GenericArgList getGenericArgList) {
   toBeTested(x) and not x.isUnknown() and getGenericArgList = x.getGenericArgList()
 }
diff --git a/rust/ql/test/extractor-tests/generated/Module/Module.expected b/rust/ql/test/extractor-tests/generated/Module/Module.expected
index 9fcf65f5658..d0259df5ee8 100644
--- a/rust/ql/test/extractor-tests/generated/Module/Module.expected
+++ b/rust/ql/test/extractor-tests/generated/Module/Module.expected
@@ -2,14 +2,6 @@ instances
 | gen_module.rs:3:1:4:8 | mod foo |
 | gen_module.rs:5:1:7:1 | mod bar |
 | lib.rs:1:1:1:19 | mod gen_module |
-getExtendedCanonicalPath
-| gen_module.rs:3:1:4:8 | mod foo | crate::gen_module::foo |
-| gen_module.rs:5:1:7:1 | mod bar | crate::gen_module::bar |
-| lib.rs:1:1:1:19 | mod gen_module | crate::gen_module |
-getCrateOrigin
-| gen_module.rs:3:1:4:8 | mod foo | repo::test |
-| gen_module.rs:5:1:7:1 | mod bar | repo::test |
-| lib.rs:1:1:1:19 | mod gen_module | repo::test |
 getAttributeMacroExpansion
 getAttr
 getItemList
diff --git a/rust/ql/test/extractor-tests/generated/Module/Module.ql b/rust/ql/test/extractor-tests/generated/Module/Module.ql
index 48a141bbc1f..8bd4b7af92f 100644
--- a/rust/ql/test/extractor-tests/generated/Module/Module.ql
+++ b/rust/ql/test/extractor-tests/generated/Module/Module.ql
@@ -4,14 +4,6 @@ import TestUtils
 
 query predicate instances(Module x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getExtendedCanonicalPath(Module x, string getExtendedCanonicalPath) {
-  toBeTested(x) and not x.isUnknown() and getExtendedCanonicalPath = x.getExtendedCanonicalPath()
-}
-
-query predicate getCrateOrigin(Module x, string getCrateOrigin) {
-  toBeTested(x) and not x.isUnknown() and getCrateOrigin = x.getCrateOrigin()
-}
-
 query predicate getAttributeMacroExpansion(Module x, MacroItems getAttributeMacroExpansion) {
   toBeTested(x) and
   not x.isUnknown() and
diff --git a/rust/ql/test/extractor-tests/generated/NeverTypeRepr/NeverTypeRepr.expected b/rust/ql/test/extractor-tests/generated/NeverTypeRepr/NeverTypeRepr.expected
index e3e1a8d3900..7e8d7f8718b 100644
--- a/rust/ql/test/extractor-tests/generated/NeverTypeRepr/NeverTypeRepr.expected
+++ b/rust/ql/test/extractor-tests/generated/NeverTypeRepr/NeverTypeRepr.expected
@@ -1,2 +1,2 @@
 | gen_never_type_repr.rs:7:17:7:17 | ! |
-| gen_never_type_repr.rs:7:21:7:28 | ! |
+| gen_never_type_repr.rs:7:21:7:26 | ! |
diff --git a/rust/ql/test/extractor-tests/generated/Path/PathExpr.expected b/rust/ql/test/extractor-tests/generated/Path/PathExpr.expected
index 5a2df7ee29f..9a26eca5b66 100644
--- a/rust/ql/test/extractor-tests/generated/Path/PathExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/Path/PathExpr.expected
@@ -5,8 +5,6 @@ instances
 | gen_path_expr.rs:7:13:7:20 | ...::foo |
 | gen_path_expr.rs:8:13:8:36 | ...::foo |
 | gen_path_pat.rs:5:11:5:11 | x |
-getResolvedPath
-getResolvedCrateOrigin
 getPath
 | gen_path.rs:6:5:6:12 | ...::bar | gen_path.rs:6:5:6:12 | ...::bar |
 | gen_path_expr.rs:5:13:5:20 | variable | gen_path_expr.rs:5:13:5:20 | variable |
diff --git a/rust/ql/test/extractor-tests/generated/Path/PathExpr.ql b/rust/ql/test/extractor-tests/generated/Path/PathExpr.ql
index 70bff600ace..87017b801ec 100644
--- a/rust/ql/test/extractor-tests/generated/Path/PathExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/Path/PathExpr.ql
@@ -4,14 +4,6 @@ import TestUtils
 
 query predicate instances(PathExpr x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getResolvedPath(PathExpr x, string getResolvedPath) {
-  toBeTested(x) and not x.isUnknown() and getResolvedPath = x.getResolvedPath()
-}
-
-query predicate getResolvedCrateOrigin(PathExpr x, string getResolvedCrateOrigin) {
-  toBeTested(x) and not x.isUnknown() and getResolvedCrateOrigin = x.getResolvedCrateOrigin()
-}
-
 query predicate getPath(PathExpr x, Path getPath) {
   toBeTested(x) and not x.isUnknown() and getPath = x.getPath()
 }
diff --git a/rust/ql/test/extractor-tests/generated/Path/PathPat.expected b/rust/ql/test/extractor-tests/generated/Path/PathPat.expected
index 9bcce903558..d211f4c05d2 100644
--- a/rust/ql/test/extractor-tests/generated/Path/PathPat.expected
+++ b/rust/ql/test/extractor-tests/generated/Path/PathPat.expected
@@ -1,6 +1,4 @@
 instances
 | gen_path_pat.rs:6:9:6:16 | ...::Bar |
-getResolvedPath
-getResolvedCrateOrigin
 getPath
 | gen_path_pat.rs:6:9:6:16 | ...::Bar | gen_path_pat.rs:6:9:6:16 | ...::Bar |
diff --git a/rust/ql/test/extractor-tests/generated/Path/PathPat.ql b/rust/ql/test/extractor-tests/generated/Path/PathPat.ql
index 9c5a874cabf..78138ed5d82 100644
--- a/rust/ql/test/extractor-tests/generated/Path/PathPat.ql
+++ b/rust/ql/test/extractor-tests/generated/Path/PathPat.ql
@@ -4,14 +4,6 @@ import TestUtils
 
 query predicate instances(PathPat x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getResolvedPath(PathPat x, string getResolvedPath) {
-  toBeTested(x) and not x.isUnknown() and getResolvedPath = x.getResolvedPath()
-}
-
-query predicate getResolvedCrateOrigin(PathPat x, string getResolvedCrateOrigin) {
-  toBeTested(x) and not x.isUnknown() and getResolvedCrateOrigin = x.getResolvedCrateOrigin()
-}
-
 query predicate getPath(PathPat x, Path getPath) {
   toBeTested(x) and not x.isUnknown() and getPath = x.getPath()
 }
diff --git a/rust/ql/test/extractor-tests/generated/RetTypeRepr/gen_ret_type_repr.rs b/rust/ql/test/extractor-tests/generated/RetTypeRepr/gen_ret_type_repr.rs
index a3294ce8545..361740fbd37 100644
--- a/rust/ql/test/extractor-tests/generated/RetTypeRepr/gen_ret_type_repr.rs
+++ b/rust/ql/test/extractor-tests/generated/RetTypeRepr/gen_ret_type_repr.rs
@@ -4,6 +4,6 @@ fn test_ret_type_repr() -> () {
     // A return type in a function signature.
     // 
     // For example:
-    fn foo() -> i32 {}
+    fn foo() -> i32 { 0 }
     //       ^^^^^^
 }
diff --git a/rust/ql/test/extractor-tests/generated/Static/Static.expected b/rust/ql/test/extractor-tests/generated/Static/Static.expected
index ee87d07a2c1..074c6600f8c 100644
--- a/rust/ql/test/extractor-tests/generated/Static/Static.expected
+++ b/rust/ql/test/extractor-tests/generated/Static/Static.expected
@@ -1,7 +1,5 @@
 instances
 | gen_static.rs:4:5:7:23 | Static | isMut: | no | isStatic: | yes | isUnsafe: | no |
-getExtendedCanonicalPath
-getCrateOrigin
 getAttributeMacroExpansion
 getAttr
 getBody
diff --git a/rust/ql/test/extractor-tests/generated/Static/Static.ql b/rust/ql/test/extractor-tests/generated/Static/Static.ql
index 58ade5f044f..dfd2dd93918 100644
--- a/rust/ql/test/extractor-tests/generated/Static/Static.ql
+++ b/rust/ql/test/extractor-tests/generated/Static/Static.ql
@@ -16,14 +16,6 @@ query predicate instances(
   if x.isUnsafe() then isUnsafe = "yes" else isUnsafe = "no"
 }
 
-query predicate getExtendedCanonicalPath(Static x, string getExtendedCanonicalPath) {
-  toBeTested(x) and not x.isUnknown() and getExtendedCanonicalPath = x.getExtendedCanonicalPath()
-}
-
-query predicate getCrateOrigin(Static x, string getCrateOrigin) {
-  toBeTested(x) and not x.isUnknown() and getCrateOrigin = x.getCrateOrigin()
-}
-
 query predicate getAttributeMacroExpansion(Static x, MacroItems getAttributeMacroExpansion) {
   toBeTested(x) and
   not x.isUnknown() and
diff --git a/rust/ql/test/extractor-tests/generated/StmtList/StmtList.expected b/rust/ql/test/extractor-tests/generated/StmtList/StmtList.expected
index 02f322734ca..5c5d77a34ed 100644
--- a/rust/ql/test/extractor-tests/generated/StmtList/StmtList.expected
+++ b/rust/ql/test/extractor-tests/generated/StmtList/StmtList.expected
@@ -1,9 +1,10 @@
 instances
-| gen_stmt_list.rs:3:27:12:1 | StmtList |
-| gen_stmt_list.rs:7:5:10:5 | StmtList |
+| gen_stmt_list.rs:3:27:14:1 | StmtList |
+| gen_stmt_list.rs:8:5:12:5 | StmtList |
 getAttr
 getStatement
-| gen_stmt_list.rs:7:5:10:5 | StmtList | 0 | gen_stmt_list.rs:8:9:8:18 | let ... = 1 |
-| gen_stmt_list.rs:7:5:10:5 | StmtList | 1 | gen_stmt_list.rs:9:9:9:18 | let ... = 2 |
+| gen_stmt_list.rs:8:5:12:5 | StmtList | 0 | gen_stmt_list.rs:9:9:9:18 | let ... = 1 |
+| gen_stmt_list.rs:8:5:12:5 | StmtList | 1 | gen_stmt_list.rs:10:9:10:18 | let ... = 2 |
 getTailExpr
-| gen_stmt_list.rs:3:27:12:1 | StmtList | gen_stmt_list.rs:7:5:10:5 | { ... } |
+| gen_stmt_list.rs:3:27:14:1 | StmtList | gen_stmt_list.rs:8:5:12:5 | { ... } |
+| gen_stmt_list.rs:8:5:12:5 | StmtList | gen_stmt_list.rs:11:9:11:13 | ... + ... |
diff --git a/rust/ql/test/extractor-tests/generated/StmtList/gen_stmt_list.rs b/rust/ql/test/extractor-tests/generated/StmtList/gen_stmt_list.rs
index 8cc83732b62..9802e4bc995 100644
--- a/rust/ql/test/extractor-tests/generated/StmtList/gen_stmt_list.rs
+++ b/rust/ql/test/extractor-tests/generated/StmtList/gen_stmt_list.rs
@@ -1,12 +1,14 @@
 // generated by codegen, do not edit
 
 fn test_stmt_list() -> () {
-    // A list of statements in a block.
+    // A list of statements in a block, with an optional tail expression at the
+    // end that determines the block's value.
     // 
     // For example:
     {
         let x = 1;
         let y = 2;
+        x + y
     }
     //  ^^^^^^^^^
 }
diff --git a/rust/ql/test/extractor-tests/generated/Struct/Struct.expected b/rust/ql/test/extractor-tests/generated/Struct/Struct.expected
index ad34c13babe..040a035c249 100644
--- a/rust/ql/test/extractor-tests/generated/Struct/Struct.expected
+++ b/rust/ql/test/extractor-tests/generated/Struct/Struct.expected
@@ -1,7 +1,5 @@
 instances
 | gen_struct.rs:4:5:8:5 | struct Point |
-getExtendedCanonicalPath
-getCrateOrigin
 getAttributeMacroExpansion
 getDeriveMacroExpansion
 getAttr
diff --git a/rust/ql/test/extractor-tests/generated/Struct/Struct.ql b/rust/ql/test/extractor-tests/generated/Struct/Struct.ql
index 185c1125f5c..25a980701c5 100644
--- a/rust/ql/test/extractor-tests/generated/Struct/Struct.ql
+++ b/rust/ql/test/extractor-tests/generated/Struct/Struct.ql
@@ -4,14 +4,6 @@ import TestUtils
 
 query predicate instances(Struct x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getExtendedCanonicalPath(Struct x, string getExtendedCanonicalPath) {
-  toBeTested(x) and not x.isUnknown() and getExtendedCanonicalPath = x.getExtendedCanonicalPath()
-}
-
-query predicate getCrateOrigin(Struct x, string getCrateOrigin) {
-  toBeTested(x) and not x.isUnknown() and getCrateOrigin = x.getCrateOrigin()
-}
-
 query predicate getAttributeMacroExpansion(Struct x, MacroItems getAttributeMacroExpansion) {
   toBeTested(x) and
   not x.isUnknown() and
diff --git a/rust/ql/test/extractor-tests/generated/StructExpr/StructExpr.expected b/rust/ql/test/extractor-tests/generated/StructExpr/StructExpr.expected
index 477aa732ece..988d3ec6299 100644
--- a/rust/ql/test/extractor-tests/generated/StructExpr/StructExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/StructExpr/StructExpr.expected
@@ -1,17 +1,15 @@
 instances
 | gen_struct_expr.rs:5:17:5:34 | Foo {...} |
 | gen_struct_expr.rs:6:18:6:38 | Foo {...} |
-| gen_struct_expr.rs:7:5:7:22 | Foo {...} |
-| gen_struct_expr.rs:8:5:8:14 | Foo {...} |
-getResolvedPath
-getResolvedCrateOrigin
+| gen_struct_expr.rs:7:13:7:30 | Foo {...} |
+| gen_struct_expr.rs:8:5:8:20 | Foo {...} |
 getPath
 | gen_struct_expr.rs:5:17:5:34 | Foo {...} | gen_struct_expr.rs:5:17:5:19 | Foo |
 | gen_struct_expr.rs:6:18:6:38 | Foo {...} | gen_struct_expr.rs:6:18:6:20 | Foo |
-| gen_struct_expr.rs:7:5:7:22 | Foo {...} | gen_struct_expr.rs:7:5:7:7 | Foo |
-| gen_struct_expr.rs:8:5:8:14 | Foo {...} | gen_struct_expr.rs:8:5:8:7 | Foo |
+| gen_struct_expr.rs:7:13:7:30 | Foo {...} | gen_struct_expr.rs:7:13:7:15 | Foo |
+| gen_struct_expr.rs:8:5:8:20 | Foo {...} | gen_struct_expr.rs:8:5:8:7 | Foo |
 getStructExprFieldList
 | gen_struct_expr.rs:5:17:5:34 | Foo {...} | gen_struct_expr.rs:5:21:5:34 | StructExprFieldList |
 | gen_struct_expr.rs:6:18:6:38 | Foo {...} | gen_struct_expr.rs:6:22:6:38 | StructExprFieldList |
-| gen_struct_expr.rs:7:5:7:22 | Foo {...} | gen_struct_expr.rs:7:9:7:22 | StructExprFieldList |
-| gen_struct_expr.rs:8:5:8:14 | Foo {...} | gen_struct_expr.rs:8:9:8:14 | StructExprFieldList |
+| gen_struct_expr.rs:7:13:7:30 | Foo {...} | gen_struct_expr.rs:7:17:7:30 | StructExprFieldList |
+| gen_struct_expr.rs:8:5:8:20 | Foo {...} | gen_struct_expr.rs:8:9:8:20 | StructExprFieldList |
diff --git a/rust/ql/test/extractor-tests/generated/StructExpr/StructExpr.ql b/rust/ql/test/extractor-tests/generated/StructExpr/StructExpr.ql
index 4a71efa31ee..858a0812024 100644
--- a/rust/ql/test/extractor-tests/generated/StructExpr/StructExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/StructExpr/StructExpr.ql
@@ -4,14 +4,6 @@ import TestUtils
 
 query predicate instances(StructExpr x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getResolvedPath(StructExpr x, string getResolvedPath) {
-  toBeTested(x) and not x.isUnknown() and getResolvedPath = x.getResolvedPath()
-}
-
-query predicate getResolvedCrateOrigin(StructExpr x, string getResolvedCrateOrigin) {
-  toBeTested(x) and not x.isUnknown() and getResolvedCrateOrigin = x.getResolvedCrateOrigin()
-}
-
 query predicate getPath(StructExpr x, Path getPath) {
   toBeTested(x) and not x.isUnknown() and getPath = x.getPath()
 }
diff --git a/rust/ql/test/extractor-tests/generated/StructExpr/gen_struct_expr.rs b/rust/ql/test/extractor-tests/generated/StructExpr/gen_struct_expr.rs
index 7e43d100051..680c9dac9cf 100644
--- a/rust/ql/test/extractor-tests/generated/StructExpr/gen_struct_expr.rs
+++ b/rust/ql/test/extractor-tests/generated/StructExpr/gen_struct_expr.rs
@@ -4,6 +4,6 @@ fn test_struct_expr() -> () {
     // A struct expression. For example:
     let first = Foo { a: 1, b: 2 };
     let second = Foo { a: 2, ..first };
-    Foo { a: 1, b: 2 }[2] = 10;
-    Foo { .. } = second;
+    let n = Foo { a: 1, b: 2 }.b;
+    Foo { a: m, .. } = second;
 }
diff --git a/rust/ql/test/extractor-tests/generated/StructPat/StructPat.expected b/rust/ql/test/extractor-tests/generated/StructPat/StructPat.expected
index 894e52fb196..5f1a7bed844 100644
--- a/rust/ql/test/extractor-tests/generated/StructPat/StructPat.expected
+++ b/rust/ql/test/extractor-tests/generated/StructPat/StructPat.expected
@@ -1,8 +1,6 @@
 instances
 | gen_struct_pat.rs:6:9:6:26 | Foo {...} |
 | gen_struct_pat.rs:7:9:7:18 | Foo {...} |
-getResolvedPath
-getResolvedCrateOrigin
 getPath
 | gen_struct_pat.rs:6:9:6:26 | Foo {...} | gen_struct_pat.rs:6:9:6:11 | Foo |
 | gen_struct_pat.rs:7:9:7:18 | Foo {...} | gen_struct_pat.rs:7:9:7:11 | Foo |
diff --git a/rust/ql/test/extractor-tests/generated/StructPat/StructPat.ql b/rust/ql/test/extractor-tests/generated/StructPat/StructPat.ql
index 4aad29aede9..d117695d090 100644
--- a/rust/ql/test/extractor-tests/generated/StructPat/StructPat.ql
+++ b/rust/ql/test/extractor-tests/generated/StructPat/StructPat.ql
@@ -4,14 +4,6 @@ import TestUtils
 
 query predicate instances(StructPat x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getResolvedPath(StructPat x, string getResolvedPath) {
-  toBeTested(x) and not x.isUnknown() and getResolvedPath = x.getResolvedPath()
-}
-
-query predicate getResolvedCrateOrigin(StructPat x, string getResolvedCrateOrigin) {
-  toBeTested(x) and not x.isUnknown() and getResolvedCrateOrigin = x.getResolvedCrateOrigin()
-}
-
 query predicate getPath(StructPat x, Path getPath) {
   toBeTested(x) and not x.isUnknown() and getPath = x.getPath()
 }
diff --git a/rust/ql/test/extractor-tests/generated/Trait/Trait.expected b/rust/ql/test/extractor-tests/generated/Trait/Trait.expected
index ff60871f40b..e0f91737d5e 100644
--- a/rust/ql/test/extractor-tests/generated/Trait/Trait.expected
+++ b/rust/ql/test/extractor-tests/generated/Trait/Trait.expected
@@ -1,12 +1,6 @@
 instances
 | gen_trait.rs:3:1:8:1 | trait Frobinizable | isAuto: | no | isUnsafe: | no |
 | gen_trait.rs:10:1:10:57 | trait Foo | isAuto: | no | isUnsafe: | no |
-getExtendedCanonicalPath
-| gen_trait.rs:3:1:8:1 | trait Frobinizable | crate::gen_trait::Frobinizable |
-| gen_trait.rs:10:1:10:57 | trait Foo | crate::gen_trait::Foo |
-getCrateOrigin
-| gen_trait.rs:3:1:8:1 | trait Frobinizable | repo::test |
-| gen_trait.rs:10:1:10:57 | trait Foo | repo::test |
 getAttributeMacroExpansion
 getAssocItemList
 | gen_trait.rs:3:1:8:1 | trait Frobinizable | gen_trait.rs:4:20:8:1 | AssocItemList |
diff --git a/rust/ql/test/extractor-tests/generated/Trait/Trait.ql b/rust/ql/test/extractor-tests/generated/Trait/Trait.ql
index 35725fcd526..20e9b7f1e24 100644
--- a/rust/ql/test/extractor-tests/generated/Trait/Trait.ql
+++ b/rust/ql/test/extractor-tests/generated/Trait/Trait.ql
@@ -13,14 +13,6 @@ query predicate instances(
   if x.isUnsafe() then isUnsafe = "yes" else isUnsafe = "no"
 }
 
-query predicate getExtendedCanonicalPath(Trait x, string getExtendedCanonicalPath) {
-  toBeTested(x) and not x.isUnknown() and getExtendedCanonicalPath = x.getExtendedCanonicalPath()
-}
-
-query predicate getCrateOrigin(Trait x, string getCrateOrigin) {
-  toBeTested(x) and not x.isUnknown() and getCrateOrigin = x.getCrateOrigin()
-}
-
 query predicate getAttributeMacroExpansion(Trait x, MacroItems getAttributeMacroExpansion) {
   toBeTested(x) and
   not x.isUnknown() and
diff --git a/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias.expected b/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias.expected
index f8fc1628036..fe3c1fd8524 100644
--- a/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias.expected
+++ b/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias.expected
@@ -1,13 +1,11 @@
 instances
 | gen_trait_alias.rs:7:5:7:26 | TraitAlias |
-getExtendedCanonicalPath
-getCrateOrigin
 getAttributeMacroExpansion
 getAttr
 getGenericParamList
 getName
 | gen_trait_alias.rs:7:5:7:26 | TraitAlias | gen_trait_alias.rs:7:11:7:13 | Foo |
 getTypeBoundList
-| gen_trait_alias.rs:7:5:7:26 | TraitAlias | gen_trait_alias.rs:7:17:7:25 | TypeBoundList |
+| gen_trait_alias.rs:7:5:7:26 | TraitAlias | gen_trait_alias.rs:7:17:7:25 | ... + ... |
 getVisibility
 getWhereClause
diff --git a/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias.ql b/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias.ql
index 2d65541f50c..c0fee75678a 100644
--- a/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias.ql
+++ b/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias.ql
@@ -4,14 +4,6 @@ import TestUtils
 
 query predicate instances(TraitAlias x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getExtendedCanonicalPath(TraitAlias x, string getExtendedCanonicalPath) {
-  toBeTested(x) and not x.isUnknown() and getExtendedCanonicalPath = x.getExtendedCanonicalPath()
-}
-
-query predicate getCrateOrigin(TraitAlias x, string getCrateOrigin) {
-  toBeTested(x) and not x.isUnknown() and getCrateOrigin = x.getCrateOrigin()
-}
-
 query predicate getAttributeMacroExpansion(TraitAlias x, MacroItems getAttributeMacroExpansion) {
   toBeTested(x) and
   not x.isUnknown() and
diff --git a/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr.expected b/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr.expected
index 3a35afd6630..aac93393b5f 100644
--- a/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr.expected
@@ -1,9 +1,9 @@
 instances
-| gen_tuple_expr.rs:5:5:5:14 | TupleExpr |
-| gen_tuple_expr.rs:6:5:6:14 | TupleExpr |
+| gen_tuple_expr.rs:5:17:5:26 | TupleExpr |
+| gen_tuple_expr.rs:6:13:6:22 | TupleExpr |
 getAttr
 getField
-| gen_tuple_expr.rs:5:5:5:14 | TupleExpr | 0 | gen_tuple_expr.rs:5:6:5:6 | 1 |
-| gen_tuple_expr.rs:5:5:5:14 | TupleExpr | 1 | gen_tuple_expr.rs:5:9:5:13 | "one" |
-| gen_tuple_expr.rs:6:5:6:14 | TupleExpr | 0 | gen_tuple_expr.rs:6:6:6:6 | 2 |
-| gen_tuple_expr.rs:6:5:6:14 | TupleExpr | 1 | gen_tuple_expr.rs:6:9:6:13 | "two" |
+| gen_tuple_expr.rs:5:17:5:26 | TupleExpr | 0 | gen_tuple_expr.rs:5:18:5:18 | 1 |
+| gen_tuple_expr.rs:5:17:5:26 | TupleExpr | 1 | gen_tuple_expr.rs:5:21:5:25 | "one" |
+| gen_tuple_expr.rs:6:13:6:22 | TupleExpr | 0 | gen_tuple_expr.rs:6:14:6:14 | 2 |
+| gen_tuple_expr.rs:6:13:6:22 | TupleExpr | 1 | gen_tuple_expr.rs:6:17:6:21 | "two" |
diff --git a/rust/ql/test/extractor-tests/generated/TupleExpr/gen_tuple_expr.rs b/rust/ql/test/extractor-tests/generated/TupleExpr/gen_tuple_expr.rs
index 7aa2b235a80..f9f5cf49c3d 100644
--- a/rust/ql/test/extractor-tests/generated/TupleExpr/gen_tuple_expr.rs
+++ b/rust/ql/test/extractor-tests/generated/TupleExpr/gen_tuple_expr.rs
@@ -2,6 +2,7 @@
 
 fn test_tuple_expr() -> () {
     // A tuple expression. For example:
-    (1, "one");
-    (2, "two")[0] = 3;
+    let tuple = (1, "one");
+    let n = (2, "two").0;
+    let (a, b) = tuple;
 }
diff --git a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat.expected b/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat.expected
index c5ce2e2640a..dcefb6cb7a4 100644
--- a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat.expected
+++ b/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat.expected
@@ -2,8 +2,6 @@ instances
 | gen_tuple_struct_pat.rs:6:9:6:27 | Tuple(...) |
 | gen_tuple_struct_pat.rs:7:9:7:20 | Tuple(...) |
 | gen_tuple_struct_pat.rs:8:9:8:17 | Tuple(...) |
-getResolvedPath
-getResolvedCrateOrigin
 getPath
 | gen_tuple_struct_pat.rs:6:9:6:27 | Tuple(...) | gen_tuple_struct_pat.rs:6:9:6:13 | Tuple |
 | gen_tuple_struct_pat.rs:7:9:7:20 | Tuple(...) | gen_tuple_struct_pat.rs:7:9:7:13 | Tuple |
diff --git a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat.ql b/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat.ql
index 408c892ea3c..e6bde1d82aa 100644
--- a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat.ql
+++ b/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat.ql
@@ -4,14 +4,6 @@ import TestUtils
 
 query predicate instances(TupleStructPat x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getResolvedPath(TupleStructPat x, string getResolvedPath) {
-  toBeTested(x) and not x.isUnknown() and getResolvedPath = x.getResolvedPath()
-}
-
-query predicate getResolvedCrateOrigin(TupleStructPat x, string getResolvedCrateOrigin) {
-  toBeTested(x) and not x.isUnknown() and getResolvedCrateOrigin = x.getResolvedCrateOrigin()
-}
-
 query predicate getPath(TupleStructPat x, Path getPath) {
   toBeTested(x) and not x.isUnknown() and getPath = x.getPath()
 }
diff --git a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.expected b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.expected
index b9b58485752..e3b0620ddcd 100644
--- a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.expected
+++ b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.expected
@@ -1,8 +1,6 @@
 instances
 | gen_type_alias.rs:4:5:5:26 | type Point | isDefault: | no |
 | gen_type_alias.rs:8:9:8:20 | type Output | isDefault: | no |
-getExtendedCanonicalPath
-getCrateOrigin
 getAttributeMacroExpansion
 getAttr
 getGenericParamList
diff --git a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.ql b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.ql
index 014bd119d33..925be1f44a3 100644
--- a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.ql
+++ b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.ql
@@ -9,14 +9,6 @@ query predicate instances(TypeAlias x, string isDefault__label, string isDefault
   if x.isDefault() then isDefault = "yes" else isDefault = "no"
 }
 
-query predicate getExtendedCanonicalPath(TypeAlias x, string getExtendedCanonicalPath) {
-  toBeTested(x) and not x.isUnknown() and getExtendedCanonicalPath = x.getExtendedCanonicalPath()
-}
-
-query predicate getCrateOrigin(TypeAlias x, string getCrateOrigin) {
-  toBeTested(x) and not x.isUnknown() and getCrateOrigin = x.getCrateOrigin()
-}
-
 query predicate getAttributeMacroExpansion(TypeAlias x, MacroItems getAttributeMacroExpansion) {
   toBeTested(x) and
   not x.isUnknown() and
diff --git a/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound.expected b/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound.expected
index e0ed9fcdd6c..f987837ffe3 100644
--- a/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound.expected
+++ b/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound.expected
@@ -1,6 +1,10 @@
 instances
 | gen_type_bound.rs:7:15:7:19 | TypeBound | isAsync: | no | isConst: | no |
+| gen_type_bound.rs:9:24:9:44 | TypeBound | isAsync: | no | isConst: | no |
+getForBinder
+| gen_type_bound.rs:9:24:9:44 | TypeBound | gen_type_bound.rs:9:24:9:30 | for<...> |
 getLifetime
 getTypeRepr
 | gen_type_bound.rs:7:15:7:19 | TypeBound | gen_type_bound.rs:7:15:7:19 | Debug |
+| gen_type_bound.rs:9:24:9:44 | TypeBound | gen_type_bound.rs:9:32:9:44 | From::<...> |
 getUseBoundGenericArgs
diff --git a/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound.ql b/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound.ql
index e4b2b6127dc..40d44dff8c8 100644
--- a/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound.ql
+++ b/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound.ql
@@ -13,6 +13,10 @@ query predicate instances(
   if x.isConst() then isConst = "yes" else isConst = "no"
 }
 
+query predicate getForBinder(TypeBound x, ForBinder getForBinder) {
+  toBeTested(x) and not x.isUnknown() and getForBinder = x.getForBinder()
+}
+
 query predicate getLifetime(TypeBound x, Lifetime getLifetime) {
   toBeTested(x) and not x.isUnknown() and getLifetime = x.getLifetime()
 }
diff --git a/rust/ql/test/extractor-tests/generated/TypeBound/gen_type_bound.rs b/rust/ql/test/extractor-tests/generated/TypeBound/gen_type_bound.rs
index 9e182cbeefc..7b4c9e4f423 100644
--- a/rust/ql/test/extractor-tests/generated/TypeBound/gen_type_bound.rs
+++ b/rust/ql/test/extractor-tests/generated/TypeBound/gen_type_bound.rs
@@ -6,4 +6,6 @@ fn test_type_bound() -> () {
     // For example:
     fn foo<T: Debug>(t: T) {}
     //        ^^^^^
+    fn bar(value: impl for<'a> From<&'a str>) {}
+    //                 ^^^^^^^^^^^^^^^^^^^^^
 }
diff --git a/rust/ql/test/extractor-tests/generated/TypeBoundList/TypeBoundList.expected b/rust/ql/test/extractor-tests/generated/TypeBoundList/TypeBoundList.expected
index e195424d097..4cdfca9a2d1 100644
--- a/rust/ql/test/extractor-tests/generated/TypeBoundList/TypeBoundList.expected
+++ b/rust/ql/test/extractor-tests/generated/TypeBoundList/TypeBoundList.expected
@@ -1,5 +1,5 @@
 instances
-| gen_type_bound_list.rs:7:15:7:27 | TypeBoundList |
+| gen_type_bound_list.rs:7:15:7:27 | ... + ... |
 getBound
-| gen_type_bound_list.rs:7:15:7:27 | TypeBoundList | 0 | gen_type_bound_list.rs:7:15:7:19 | TypeBound |
-| gen_type_bound_list.rs:7:15:7:27 | TypeBoundList | 1 | gen_type_bound_list.rs:7:23:7:27 | TypeBound |
+| gen_type_bound_list.rs:7:15:7:27 | ... + ... | 0 | gen_type_bound_list.rs:7:15:7:19 | TypeBound |
+| gen_type_bound_list.rs:7:15:7:27 | ... + ... | 1 | gen_type_bound_list.rs:7:23:7:27 | TypeBound |
diff --git a/rust/ql/test/extractor-tests/generated/Union/Union.expected b/rust/ql/test/extractor-tests/generated/Union/Union.expected
index 110643aeac9..b83a39b708d 100644
--- a/rust/ql/test/extractor-tests/generated/Union/Union.expected
+++ b/rust/ql/test/extractor-tests/generated/Union/Union.expected
@@ -1,7 +1,5 @@
 instances
 | gen_union.rs:4:5:7:32 | union U |
-getExtendedCanonicalPath
-getCrateOrigin
 getAttributeMacroExpansion
 getDeriveMacroExpansion
 getAttr
diff --git a/rust/ql/test/extractor-tests/generated/Union/Union.ql b/rust/ql/test/extractor-tests/generated/Union/Union.ql
index 147a8fca09e..9c555d1e590 100644
--- a/rust/ql/test/extractor-tests/generated/Union/Union.ql
+++ b/rust/ql/test/extractor-tests/generated/Union/Union.ql
@@ -4,14 +4,6 @@ import TestUtils
 
 query predicate instances(Union x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getExtendedCanonicalPath(Union x, string getExtendedCanonicalPath) {
-  toBeTested(x) and not x.isUnknown() and getExtendedCanonicalPath = x.getExtendedCanonicalPath()
-}
-
-query predicate getCrateOrigin(Union x, string getCrateOrigin) {
-  toBeTested(x) and not x.isUnknown() and getCrateOrigin = x.getCrateOrigin()
-}
-
 query predicate getAttributeMacroExpansion(Union x, MacroItems getAttributeMacroExpansion) {
   toBeTested(x) and
   not x.isUnknown() and
diff --git a/rust/ql/test/extractor-tests/generated/Use/Use.expected b/rust/ql/test/extractor-tests/generated/Use/Use.expected
index 23057c691dc..079cb9e8aa3 100644
--- a/rust/ql/test/extractor-tests/generated/Use/Use.expected
+++ b/rust/ql/test/extractor-tests/generated/Use/Use.expected
@@ -1,7 +1,5 @@
 instances
 | gen_use.rs:4:5:5:34 | use ...::HashMap |
-getExtendedCanonicalPath
-getCrateOrigin
 getAttributeMacroExpansion
 getAttr
 getUseTree
diff --git a/rust/ql/test/extractor-tests/generated/Use/Use.ql b/rust/ql/test/extractor-tests/generated/Use/Use.ql
index bfce3bcc89c..e6940ef9e24 100644
--- a/rust/ql/test/extractor-tests/generated/Use/Use.ql
+++ b/rust/ql/test/extractor-tests/generated/Use/Use.ql
@@ -4,14 +4,6 @@ import TestUtils
 
 query predicate instances(Use x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getExtendedCanonicalPath(Use x, string getExtendedCanonicalPath) {
-  toBeTested(x) and not x.isUnknown() and getExtendedCanonicalPath = x.getExtendedCanonicalPath()
-}
-
-query predicate getCrateOrigin(Use x, string getCrateOrigin) {
-  toBeTested(x) and not x.isUnknown() and getCrateOrigin = x.getCrateOrigin()
-}
-
 query predicate getAttributeMacroExpansion(Use x, MacroItems getAttributeMacroExpansion) {
   toBeTested(x) and
   not x.isUnknown() and
diff --git a/rust/ql/test/extractor-tests/generated/UseBoundGenericArgs/gen_use_bound_generic_args.rs b/rust/ql/test/extractor-tests/generated/UseBoundGenericArgs/gen_use_bound_generic_args.rs
index bb04264d33e..c53c6de548d 100644
--- a/rust/ql/test/extractor-tests/generated/UseBoundGenericArgs/gen_use_bound_generic_args.rs
+++ b/rust/ql/test/extractor-tests/generated/UseBoundGenericArgs/gen_use_bound_generic_args.rs
@@ -4,6 +4,6 @@ fn test_use_bound_generic_args() -> () {
     // A use<..> bound to control which generic parameters are captured by an impl Trait return type.
     // 
     // For example:
-    pub fn hello<'a, T, const N: usize>() -> impl Sized + use<'a, T, N> {}
+    pub fn hello<'a, T, const N: usize>() -> impl Sized + use<'a, T, N> { 0 }
     //                                                        ^^^^^^^^
 }
diff --git a/rust/ql/test/extractor-tests/generated/Variant/Variant.expected b/rust/ql/test/extractor-tests/generated/Variant/Variant.expected
index ad970afe530..4c67e1684b0 100644
--- a/rust/ql/test/extractor-tests/generated/Variant/Variant.expected
+++ b/rust/ql/test/extractor-tests/generated/Variant/Variant.expected
@@ -2,8 +2,6 @@ instances
 | gen_variant.rs:7:14:7:14 | A |
 | gen_variant.rs:7:17:7:22 | B |
 | gen_variant.rs:7:25:7:36 | C |
-getExtendedCanonicalPath
-getCrateOrigin
 getAttr
 getDiscriminant
 getFieldList
diff --git a/rust/ql/test/extractor-tests/generated/Variant/Variant.ql b/rust/ql/test/extractor-tests/generated/Variant/Variant.ql
index 088f610637a..61c14267116 100644
--- a/rust/ql/test/extractor-tests/generated/Variant/Variant.ql
+++ b/rust/ql/test/extractor-tests/generated/Variant/Variant.ql
@@ -4,14 +4,6 @@ import TestUtils
 
 query predicate instances(Variant x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getExtendedCanonicalPath(Variant x, string getExtendedCanonicalPath) {
-  toBeTested(x) and not x.isUnknown() and getExtendedCanonicalPath = x.getExtendedCanonicalPath()
-}
-
-query predicate getCrateOrigin(Variant x, string getCrateOrigin) {
-  toBeTested(x) and not x.isUnknown() and getCrateOrigin = x.getCrateOrigin()
-}
-
 query predicate getAttr(Variant x, int index, Attr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
diff --git a/rust/ql/test/extractor-tests/generated/WherePred/WherePred.expected b/rust/ql/test/extractor-tests/generated/WherePred/WherePred.expected
index 4980b912b86..e7dd9b64fce 100644
--- a/rust/ql/test/extractor-tests/generated/WherePred/WherePred.expected
+++ b/rust/ql/test/extractor-tests/generated/WherePred/WherePred.expected
@@ -1,11 +1,15 @@
 instances
 | gen_where_pred.rs:7:36:7:43 | WherePred |
 | gen_where_pred.rs:7:46:7:53 | WherePred |
-getGenericParamList
+| gen_where_pred.rs:9:31:9:54 | WherePred |
+getForBinder
+| gen_where_pred.rs:9:31:9:54 | WherePred | gen_where_pred.rs:9:31:9:37 | for<...> |
 getLifetime
 getTypeRepr
 | gen_where_pred.rs:7:36:7:43 | WherePred | gen_where_pred.rs:7:36:7:36 | T |
 | gen_where_pred.rs:7:46:7:53 | WherePred | gen_where_pred.rs:7:46:7:46 | U |
+| gen_where_pred.rs:9:31:9:54 | WherePred | gen_where_pred.rs:9:39:9:39 | T |
 getTypeBoundList
-| gen_where_pred.rs:7:36:7:43 | WherePred | gen_where_pred.rs:7:39:7:43 | TypeBoundList |
-| gen_where_pred.rs:7:46:7:53 | WherePred | gen_where_pred.rs:7:49:7:53 | TypeBoundList |
+| gen_where_pred.rs:7:36:7:43 | WherePred | gen_where_pred.rs:7:39:7:43 | ... |
+| gen_where_pred.rs:7:46:7:53 | WherePred | gen_where_pred.rs:7:49:7:53 | ... |
+| gen_where_pred.rs:9:31:9:54 | WherePred | gen_where_pred.rs:9:42:9:54 | ... |
diff --git a/rust/ql/test/extractor-tests/generated/WherePred/WherePred.ql b/rust/ql/test/extractor-tests/generated/WherePred/WherePred.ql
index 3d1ecb7339d..957c2b45edf 100644
--- a/rust/ql/test/extractor-tests/generated/WherePred/WherePred.ql
+++ b/rust/ql/test/extractor-tests/generated/WherePred/WherePred.ql
@@ -4,8 +4,8 @@ import TestUtils
 
 query predicate instances(WherePred x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getGenericParamList(WherePred x, GenericParamList getGenericParamList) {
-  toBeTested(x) and not x.isUnknown() and getGenericParamList = x.getGenericParamList()
+query predicate getForBinder(WherePred x, ForBinder getForBinder) {
+  toBeTested(x) and not x.isUnknown() and getForBinder = x.getForBinder()
 }
 
 query predicate getLifetime(WherePred x, Lifetime getLifetime) {
diff --git a/rust/ql/test/extractor-tests/generated/WherePred/gen_where_pred.rs b/rust/ql/test/extractor-tests/generated/WherePred/gen_where_pred.rs
index 48a6b7bf256..8e037453bf7 100644
--- a/rust/ql/test/extractor-tests/generated/WherePred/gen_where_pred.rs
+++ b/rust/ql/test/extractor-tests/generated/WherePred/gen_where_pred.rs
@@ -6,4 +6,6 @@ fn test_where_pred() -> () {
     // For example:
     fn foo<T, U>(t: T, u: U) where T: Debug, U: Clone {}
     //                             ^^^^^^^^  ^^^^^^^^
+    fn bar<T>(value: T) where for<'a> T: From<&'a str> {}
+    //                        ^^^^^^^^^^^^^^^^^^^^^^^^
 }
diff --git a/rust/ql/test/extractor-tests/macro-expansion/CONSISTENCY/ExtractionConsistency.expected b/rust/ql/test/extractor-tests/macro-expansion/CONSISTENCY/ExtractionConsistency.expected
index 2d13c81bdab..5c472b07a14 100644
--- a/rust/ql/test/extractor-tests/macro-expansion/CONSISTENCY/ExtractionConsistency.expected
+++ b/rust/ql/test/extractor-tests/macro-expansion/CONSISTENCY/ExtractionConsistency.expected
@@ -1,3 +1,2 @@
 extractionWarning
-| included/included.rs:1:1:1:1 | semantic analyzer unavailable (not loaded as its own module, probably included by `!include`) |
-| macro_expansion.rs:56:9:56:31 | macro expansion failed: could not resolve macro 'concat' |
+| macro_expansion.rs:56:9:56:31 | macro expansion failed for 'concat' |
diff --git a/rust/ql/test/extractor-tests/macro-expansion/CONSISTENCY/PathResolutionConsistency.expected b/rust/ql/test/extractor-tests/macro-expansion/CONSISTENCY/PathResolutionConsistency.expected
index 675d607c9fd..141cfc355b9 100644
--- a/rust/ql/test/extractor-tests/macro-expansion/CONSISTENCY/PathResolutionConsistency.expected
+++ b/rust/ql/test/extractor-tests/macro-expansion/CONSISTENCY/PathResolutionConsistency.expected
@@ -1,10 +1,2 @@
 multipleCallTargets
-| proc_macro.rs:15:5:17:5 | ...::new(...) |
-| proc_macro.rs:25:5:28:5 | ...::new(...) |
-| proc_macro.rs:41:5:49:5 | ...::new(...) |
-| proc_macro.rs:41:5:49:5 | ...::new(...) |
-| proc_macro.rs:41:5:49:5 | ...::new(...) |
-| proc_macro.rs:41:5:49:5 | ...::new(...) |
 | proc_macro.rs:44:27:44:30 | ...::to_tokens(...) |
-multiplePathResolutions
-| macro_expansion.rs:1:5:1:14 | proc_macro |
diff --git a/rust/ql/test/extractor-tests/macro-expansion/CONSISTENCY/TypeInferenceConsistency.expected b/rust/ql/test/extractor-tests/macro-expansion/CONSISTENCY/TypeInferenceConsistency.expected
deleted file mode 100644
index 416404c2bd1..00000000000
--- a/rust/ql/test/extractor-tests/macro-expansion/CONSISTENCY/TypeInferenceConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-illFormedTypeMention
-| macro_expansion.rs:99:7:99:19 | MyDeriveUnion |
diff --git a/rust/ql/test/extractor-tests/macro-expansion/PrintAst.expected b/rust/ql/test/extractor-tests/macro-expansion/PrintAst.expected
index 79576902a43..1a0ded6950d 100644
--- a/rust/ql/test/extractor-tests/macro-expansion/PrintAst.expected
+++ b/rust/ql/test/extractor-tests/macro-expansion/PrintAst.expected
@@ -10,7 +10,7 @@ call.rs:
 #    1|           getIdentifier(): [NameRef] macro_expansion
 #    3|   getItem(1): [Function] fn call_some_functions
 #    3|     getParamList(): [ParamList] ParamList
-#    3|     getBody(): [BlockExpr] { ... }
+#    3|     getFunctionBody(): [BlockExpr] { ... }
 #    3|       getStmtList(): [StmtList] StmtList
 #    4|         getStatement(0): [ExprStmt] ExprStmt
 #    4|           getExpr(): [CallExpr] ...::foo(...)
@@ -129,7 +129,7 @@ included/included.rs:
 #    1| [SourceFile] SourceFile
 #    1|   getItem(0): [Function] fn included
 #    1|     getParamList(): [ParamList] ParamList
-#    1|     getBody(): [BlockExpr] { ... }
+#    1|     getFunctionBody(): [BlockExpr] { ... }
 #    1|       getStmtList(): [StmtList] StmtList
 #    2|         getStatement(0): [ExprStmt] ExprStmt
 #    2|           getExpr(): [AssignmentExpr] ... = ...
@@ -174,11 +174,11 @@ macro_expansion.rs:
 #    1|           getPath(): [Path] MyTrait
 #    1|             getSegment(): [PathSegment] MyTrait
 #    1|               getIdentifier(): [NameRef] MyTrait
-#    3|   getItem(1): [Function] fn foo
+#    3|   getItem(1): [Function] (item with attribute macro expansion)
 #    4|     getAttributeMacroExpansion(): [MacroItems] MacroItems
 #    4|       getItem(0): [Function] fn foo
 #    4|         getParamList(): [ParamList] ParamList
-#    4|         getBody(): [BlockExpr] { ... }
+#    4|         getFunctionBody(): [BlockExpr] { ... }
 #    4|           getStmtList(): [StmtList] StmtList
 #    5|             getStatement(0): [ExprStmt] ExprStmt
 #    5|               getExpr(): [AssignmentExpr] ... = ...
@@ -190,28 +190,24 @@ macro_expansion.rs:
 #    5|                         getIdentifier(): [NameRef] concat
 #    5|                     getTokenTree(): [TokenTree] TokenTree
 #    5|                     getMacroCallExpansion(): [StringLiteralExpr] "Hello world!"
-#    7|             getStatement(1): [Function] fn inner
+#    7|             getStatement(1): [Function] (item with attribute macro expansion)
 #    8|               getAttributeMacroExpansion(): [MacroItems] MacroItems
 #    8|                 getItem(0): [Function] fn inner_0
 #    8|                   getParamList(): [ParamList] ParamList
-#    8|                   getBody(): [BlockExpr] { ... }
+#    8|                   getFunctionBody(): [BlockExpr] { ... }
 #    8|                     getStmtList(): [StmtList] StmtList
 #    8|                   getName(): [Name] inner_0
 #    8|                 getItem(1): [Function] fn inner_1
 #    8|                   getParamList(): [ParamList] ParamList
-#    8|                   getBody(): [BlockExpr] { ... }
+#    8|                   getFunctionBody(): [BlockExpr] { ... }
 #    8|                     getStmtList(): [StmtList] StmtList
 #    8|                   getName(): [Name] inner_1
-#    8|               getParamList(): [ParamList] ParamList
 #    7|               getAttr(0): [Attr] Attr
 #    7|                 getMeta(): [Meta] Meta
 #    7|                   getPath(): [Path] repeat
 #    7|                     getSegment(): [PathSegment] repeat
 #    7|                       getIdentifier(): [NameRef] repeat
 #    7|                   getTokenTree(): [TokenTree] TokenTree
-#    8|               getBody(): [BlockExpr] { ... }
-#    8|                 getStmtList(): [StmtList] StmtList
-#    8|               getName(): [Name] inner
 #   10|             getStatement(2): [ExprStmt] ExprStmt
 #   10|               getExpr(): [CallExpr] inner_0(...)
 #   10|                 getArgList(): [ArgList] ArgList
@@ -230,7 +226,7 @@ macro_expansion.rs:
 #    4|         getVisibility(): [Visibility] Visibility
 #    4|       getItem(1): [Function] fn foo_new
 #    4|         getParamList(): [ParamList] ParamList
-#    4|         getBody(): [BlockExpr] { ... }
+#    4|         getFunctionBody(): [BlockExpr] { ... }
 #    4|           getStmtList(): [StmtList] StmtList
 #    5|             getStatement(0): [ExprStmt] ExprStmt
 #    5|               getExpr(): [AssignmentExpr] ... = ...
@@ -242,28 +238,24 @@ macro_expansion.rs:
 #    5|                         getIdentifier(): [NameRef] concat
 #    5|                     getTokenTree(): [TokenTree] TokenTree
 #    5|                     getMacroCallExpansion(): [StringLiteralExpr] "Hello world!"
-#    7|             getStatement(1): [Function] fn inner
+#    7|             getStatement(1): [Function] (item with attribute macro expansion)
 #    8|               getAttributeMacroExpansion(): [MacroItems] MacroItems
 #    8|                 getItem(0): [Function] fn inner_0
 #    8|                   getParamList(): [ParamList] ParamList
-#    8|                   getBody(): [BlockExpr] { ... }
+#    8|                   getFunctionBody(): [BlockExpr] { ... }
 #    8|                     getStmtList(): [StmtList] StmtList
 #    8|                   getName(): [Name] inner_0
 #    8|                 getItem(1): [Function] fn inner_1
 #    8|                   getParamList(): [ParamList] ParamList
-#    8|                   getBody(): [BlockExpr] { ... }
+#    8|                   getFunctionBody(): [BlockExpr] { ... }
 #    8|                     getStmtList(): [StmtList] StmtList
 #    8|                   getName(): [Name] inner_1
-#    8|               getParamList(): [ParamList] ParamList
 #    7|               getAttr(0): [Attr] Attr
 #    7|                 getMeta(): [Meta] Meta
 #    7|                   getPath(): [Path] repeat
 #    7|                     getSegment(): [PathSegment] repeat
 #    7|                       getIdentifier(): [NameRef] repeat
 #    7|                   getTokenTree(): [TokenTree] TokenTree
-#    8|               getBody(): [BlockExpr] { ... }
-#    8|                 getStmtList(): [StmtList] StmtList
-#    8|               getName(): [Name] inner
 #   10|             getStatement(2): [ExprStmt] ExprStmt
 #   10|               getExpr(): [CallExpr] inner_0(...)
 #   10|                 getArgList(): [ArgList] ArgList
@@ -280,101 +272,51 @@ macro_expansion.rs:
 #   11|                       getIdentifier(): [NameRef] inner_1
 #    4|         getName(): [Name] foo_new
 #    4|         getVisibility(): [Visibility] Visibility
-#    4|     getParamList(): [ParamList] ParamList
 #    3|     getAttr(0): [Attr] Attr
 #    3|       getMeta(): [Meta] Meta
 #    3|         getPath(): [Path] add_one
 #    3|           getSegment(): [PathSegment] add_one
 #    3|             getIdentifier(): [NameRef] add_one
-#    4|     getBody(): [BlockExpr] { ... }
-#    4|       getStmtList(): [StmtList] StmtList
-#    5|         getStatement(0): [ExprStmt] ExprStmt
-#    5|           getExpr(): [AssignmentExpr] ... = ...
-#    5|             getLhs(): [UnderscoreExpr] _
-#    5|             getRhs(): [MacroExpr] MacroExpr
-#    5|               getMacroCall(): [MacroCall] concat!...
-#    5|                 getPath(): [Path] concat
-#    5|                   getSegment(): [PathSegment] concat
-#    5|                     getIdentifier(): [NameRef] concat
-#    5|                 getTokenTree(): [TokenTree] TokenTree
-#    7|         getStatement(1): [Function] fn inner
-#    8|           getParamList(): [ParamList] ParamList
-#    7|           getAttr(0): [Attr] Attr
-#    7|             getMeta(): [Meta] Meta
-#    7|               getPath(): [Path] repeat
-#    7|                 getSegment(): [PathSegment] repeat
-#    7|                   getIdentifier(): [NameRef] repeat
-#    7|               getTokenTree(): [TokenTree] TokenTree
-#    8|           getBody(): [BlockExpr] { ... }
-#    8|             getStmtList(): [StmtList] StmtList
-#    8|           getName(): [Name] inner
-#   10|         getStatement(2): [ExprStmt] ExprStmt
-#   10|           getExpr(): [CallExpr] inner_0(...)
-#   10|             getArgList(): [ArgList] ArgList
-#   10|             getFunction(): [PathExpr] inner_0
-#   10|               getPath(): [Path] inner_0
-#   10|                 getSegment(): [PathSegment] inner_0
-#   10|                   getIdentifier(): [NameRef] inner_0
-#   11|         getStatement(3): [ExprStmt] ExprStmt
-#   11|           getExpr(): [CallExpr] inner_1(...)
-#   11|             getArgList(): [ArgList] ArgList
-#   11|             getFunction(): [PathExpr] inner_1
-#   11|               getPath(): [Path] inner_1
-#   11|                 getSegment(): [PathSegment] inner_1
-#   11|                   getIdentifier(): [NameRef] inner_1
-#    4|     getName(): [Name] foo
-#    4|     getVisibility(): [Visibility] Visibility
-#   14|   getItem(2): [Function] fn bar
+#   14|   getItem(2): [Function] (item with attribute macro expansion)
 #   15|     getAttributeMacroExpansion(): [MacroItems] MacroItems
-#   15|       getItem(0): [Function] fn bar_0
+#   15|       getItem(0): [Function] (item with attribute macro expansion)
 #   16|         getAttributeMacroExpansion(): [MacroItems] MacroItems
 #   16|           getItem(0): [Function] fn bar_0
 #   16|             getParamList(): [ParamList] ParamList
-#   16|             getBody(): [BlockExpr] { ... }
+#   16|             getFunctionBody(): [BlockExpr] { ... }
 #   16|               getStmtList(): [StmtList] StmtList
 #   16|             getName(): [Name] bar_0
 #   16|             getVisibility(): [Visibility] Visibility
 #   16|           getItem(1): [Function] fn bar_0_new
 #   16|             getParamList(): [ParamList] ParamList
-#   16|             getBody(): [BlockExpr] { ... }
+#   16|             getFunctionBody(): [BlockExpr] { ... }
 #   16|               getStmtList(): [StmtList] StmtList
 #   16|             getName(): [Name] bar_0_new
 #   16|             getVisibility(): [Visibility] Visibility
-#   16|         getParamList(): [ParamList] ParamList
 #   15|         getAttr(0): [Attr] Attr
 #   15|           getMeta(): [Meta] Meta
 #   15|             getPath(): [Path] add_one
 #   15|               getSegment(): [PathSegment] add_one
 #   15|                 getIdentifier(): [NameRef] add_one
-#   16|         getBody(): [BlockExpr] { ... }
-#   16|           getStmtList(): [StmtList] StmtList
-#   16|         getName(): [Name] bar_0
-#   16|         getVisibility(): [Visibility] Visibility
-#   15|       getItem(1): [Function] fn bar_1
+#   15|       getItem(1): [Function] (item with attribute macro expansion)
 #   16|         getAttributeMacroExpansion(): [MacroItems] MacroItems
 #   16|           getItem(0): [Function] fn bar_1
 #   16|             getParamList(): [ParamList] ParamList
-#   16|             getBody(): [BlockExpr] { ... }
+#   16|             getFunctionBody(): [BlockExpr] { ... }
 #   16|               getStmtList(): [StmtList] StmtList
 #   16|             getName(): [Name] bar_1
 #   16|             getVisibility(): [Visibility] Visibility
 #   16|           getItem(1): [Function] fn bar_1_new
 #   16|             getParamList(): [ParamList] ParamList
-#   16|             getBody(): [BlockExpr] { ... }
+#   16|             getFunctionBody(): [BlockExpr] { ... }
 #   16|               getStmtList(): [StmtList] StmtList
 #   16|             getName(): [Name] bar_1_new
 #   16|             getVisibility(): [Visibility] Visibility
-#   16|         getParamList(): [ParamList] ParamList
 #   15|         getAttr(0): [Attr] Attr
 #   15|           getMeta(): [Meta] Meta
 #   15|             getPath(): [Path] add_one
 #   15|               getSegment(): [PathSegment] add_one
 #   15|                 getIdentifier(): [NameRef] add_one
-#   16|         getBody(): [BlockExpr] { ... }
-#   16|           getStmtList(): [StmtList] StmtList
-#   16|         getName(): [Name] bar_1
-#   16|         getVisibility(): [Visibility] Visibility
-#   16|     getParamList(): [ParamList] ParamList
 #   14|     getAttr(0): [Attr] Attr
 #   14|       getMeta(): [Meta] Meta
 #   14|         getPath(): [Path] repeat
@@ -386,22 +328,13 @@ macro_expansion.rs:
 #   15|         getPath(): [Path] add_one
 #   15|           getSegment(): [PathSegment] add_one
 #   15|             getIdentifier(): [NameRef] add_one
-#   16|     getBody(): [BlockExpr] { ... }
-#   16|       getStmtList(): [StmtList] StmtList
-#   16|     getName(): [Name] bar
-#   16|     getVisibility(): [Visibility] Visibility
-#   18|   getItem(3): [Function] fn baz
+#   18|   getItem(3): [Function] (item with attribute macro expansion)
 #   18|     getAttributeMacroExpansion(): [MacroItems] MacroItems
-#   19|     getParamList(): [ParamList] ParamList
 #   18|     getAttr(0): [Attr] Attr
 #   18|       getMeta(): [Meta] Meta
 #   18|         getPath(): [Path] erase
 #   18|           getSegment(): [PathSegment] erase
 #   18|             getIdentifier(): [NameRef] erase
-#   19|     getBody(): [BlockExpr] { ... }
-#   19|       getStmtList(): [StmtList] StmtList
-#   19|     getName(): [Name] baz
-#   19|     getVisibility(): [Visibility] Visibility
 #   22|   getItem(4): [MacroRules] MacroRules
 #   22|     getName(): [Name] hello
 #   22|     getTokenTree(): [TokenTree] TokenTree
@@ -410,11 +343,11 @@ macro_expansion.rs:
 #   28|     getVisibility(): [Visibility] Visibility
 #   30|   getItem(6): [Impl] impl S { ... }
 #   30|     getAssocItemList(): [AssocItemList] AssocItemList
-#   31|       getAssocItem(0): [Function] fn bzz
+#   31|       getAssocItem(0): [Function] (item with attribute macro expansion)
 #   32|         getAttributeMacroExpansion(): [MacroItems] MacroItems
 #   32|           getItem(0): [Function] fn bzz_0
 #   32|             getParamList(): [ParamList] ParamList
-#   32|             getBody(): [BlockExpr] { ... }
+#   32|             getFunctionBody(): [BlockExpr] { ... }
 #   32|               getStmtList(): [StmtList] StmtList
 #   33|                 getStatement(0): [ExprStmt] ExprStmt
 #   33|                   getExpr(): [MacroExpr] MacroExpr
@@ -462,7 +395,7 @@ macro_expansion.rs:
 #   32|             getVisibility(): [Visibility] Visibility
 #   32|           getItem(1): [Function] fn bzz_1
 #   32|             getParamList(): [ParamList] ParamList
-#   32|             getBody(): [BlockExpr] { ... }
+#   32|             getFunctionBody(): [BlockExpr] { ... }
 #   32|               getStmtList(): [StmtList] StmtList
 #   33|                 getStatement(0): [ExprStmt] ExprStmt
 #   33|                   getExpr(): [MacroExpr] MacroExpr
@@ -510,7 +443,7 @@ macro_expansion.rs:
 #   32|             getVisibility(): [Visibility] Visibility
 #   32|           getItem(2): [Function] fn bzz_2
 #   32|             getParamList(): [ParamList] ParamList
-#   32|             getBody(): [BlockExpr] { ... }
+#   32|             getFunctionBody(): [BlockExpr] { ... }
 #   32|               getStmtList(): [StmtList] StmtList
 #   33|                 getStatement(0): [ExprStmt] ExprStmt
 #   33|                   getExpr(): [MacroExpr] MacroExpr
@@ -556,24 +489,12 @@ macro_expansion.rs:
 #   31|                                               getIdentifier(): [NameRef] _print
 #   32|             getName(): [Name] bzz_2
 #   32|             getVisibility(): [Visibility] Visibility
-#   32|         getParamList(): [ParamList] ParamList
 #   31|         getAttr(0): [Attr] Attr
 #   31|           getMeta(): [Meta] Meta
 #   31|             getPath(): [Path] repeat
 #   31|               getSegment(): [PathSegment] repeat
 #   31|                 getIdentifier(): [NameRef] repeat
 #   31|             getTokenTree(): [TokenTree] TokenTree
-#   32|         getBody(): [BlockExpr] { ... }
-#   32|           getStmtList(): [StmtList] StmtList
-#   33|             getStatement(0): [ExprStmt] ExprStmt
-#   33|               getExpr(): [MacroExpr] MacroExpr
-#   33|                 getMacroCall(): [MacroCall] hello!...
-#   33|                   getPath(): [Path] hello
-#   33|                     getSegment(): [PathSegment] hello
-#   33|                       getIdentifier(): [NameRef] hello
-#   33|                   getTokenTree(): [TokenTree] TokenTree
-#   32|         getName(): [Name] bzz
-#   32|         getVisibility(): [Visibility] Visibility
 #   30|     getSelfTy(): [PathTypeRepr] S
 #   30|       getPath(): [Path] S
 #   30|         getSegment(): [PathSegment] S
@@ -591,7 +512,7 @@ macro_expansion.rs:
 #   44|         getMacroCallExpansion(): [MacroItems] MacroItems
 #   44|           getItem(0): [Function] fn x
 #   44|             getParamList(): [ParamList] ParamList
-#   44|             getBody(): [BlockExpr] { ... }
+#   44|             getFunctionBody(): [BlockExpr] { ... }
 #   44|               getStmtList(): [StmtList] StmtList
 #   44|             getName(): [Name] x
 #   44|             getVisibility(): [Visibility] Visibility
@@ -604,7 +525,7 @@ macro_expansion.rs:
 #   47|     getTokenTree(): [TokenTree] TokenTree
 #   52|   getItem(10): [Function] fn test
 #   52|     getParamList(): [ParamList] ParamList
-#   52|     getBody(): [BlockExpr] { ... }
+#   52|     getFunctionBody(): [BlockExpr] { ... }
 #   52|       getStmtList(): [StmtList] StmtList
 #   53|         getStatement(0): [ExprStmt] ExprStmt
 #   53|           getExpr(): [AssignmentExpr] ... = ...
@@ -635,47 +556,40 @@ macro_expansion.rs:
 #   56|                       getArgList(): [ArgList] ArgList
 #   56|                         getArg(0): [BlockExpr] { ... }
 #   56|                           getStmtList(): [StmtList] StmtList
-#   56|                             getStatement(0): [LetStmt] let ... = ...
-#   56|                               getInitializer(): [CallExpr] ...::format(...)
-#   56|                                 getArgList(): [ArgList] ArgList
-#   56|                                   getArg(0): [MacroExpr] MacroExpr
-#   56|                                     getMacroCall(): [MacroCall] ...::format_args!...
-#   55|                                       getPath(): [Path] ...::format_args
-#   55|                                         getQualifier(): [Path] ...::__export
-#   55|                                           getQualifier(): [Path] $crate
-#   55|                                             getSegment(): [PathSegment] $crate
-#   55|                                               getIdentifier(): [NameRef] $crate
-#   55|                                           getSegment(): [PathSegment] __export
-#   55|                                             getIdentifier(): [NameRef] __export
-#   55|                                         getSegment(): [PathSegment] format_args
-#   55|                                           getIdentifier(): [NameRef] format_args
-#   56|                                       getTokenTree(): [TokenTree] TokenTree
-#   56|                                       getMacroCallExpansion(): [FormatArgsExpr] FormatArgsExpr
-#   57|                                         getArg(0): [FormatArgsArg] FormatArgsArg
-#   57|                                           getExpr(): [StringLiteralExpr] "hi"
-#   56|                                         getTemplate(): [ParenExpr] (...)
-#   56|                                           getExpr(): [MacroExpr] MacroExpr
-#   56|                                             getMacroCall(): [MacroCall] concat!...
-#   56|                                               getPath(): [Path] concat
-#   56|                                                 getSegment(): [PathSegment] concat
-#   56|                                                   getIdentifier(): [NameRef] concat
-#   56|                                               getTokenTree(): [TokenTree] TokenTree
-#   55|                                 getFunction(): [PathExpr] ...::format
-#   55|                                   getPath(): [Path] ...::format
-#   55|                                     getQualifier(): [Path] ...::fmt
-#   55|                                       getQualifier(): [Path] $crate
-#   55|                                         getSegment(): [PathSegment] $crate
-#   55|                                           getIdentifier(): [NameRef] $crate
-#   55|                                       getSegment(): [PathSegment] fmt
-#   55|                                         getIdentifier(): [NameRef] fmt
-#   55|                                     getSegment(): [PathSegment] format
-#   55|                                       getIdentifier(): [NameRef] format
-#   55|                               getPat(): [IdentPat] res
-#   55|                                 getName(): [Name] res
-#   55|                             getTailExpr(): [PathExpr,VariableAccess] res
-#   55|                               getPath(): [Path] res
-#   55|                                 getSegment(): [PathSegment] res
-#   55|                                   getIdentifier(): [NameRef] res
+#   56|                             getTailExpr(): [CallExpr] ...::format(...)
+#   56|                               getArgList(): [ArgList] ArgList
+#   56|                                 getArg(0): [MacroExpr] MacroExpr
+#   56|                                   getMacroCall(): [MacroCall] ...::format_args!...
+#   55|                                     getPath(): [Path] ...::format_args
+#   55|                                       getQualifier(): [Path] ...::__export
+#   55|                                         getQualifier(): [Path] $crate
+#   55|                                           getSegment(): [PathSegment] $crate
+#   55|                                             getIdentifier(): [NameRef] $crate
+#   55|                                         getSegment(): [PathSegment] __export
+#   55|                                           getIdentifier(): [NameRef] __export
+#   55|                                       getSegment(): [PathSegment] format_args
+#   55|                                         getIdentifier(): [NameRef] format_args
+#   56|                                     getTokenTree(): [TokenTree] TokenTree
+#   56|                                     getMacroCallExpansion(): [FormatArgsExpr] FormatArgsExpr
+#   57|                                       getArg(0): [FormatArgsArg] FormatArgsArg
+#   57|                                         getExpr(): [StringLiteralExpr] "hi"
+#   56|                                       getTemplate(): [ParenExpr] (...)
+#   56|                                         getExpr(): [MacroExpr] MacroExpr
+#   56|                                           getMacroCall(): [MacroCall] concat!...
+#   56|                                             getPath(): [Path] concat
+#   56|                                               getSegment(): [PathSegment] concat
+#   56|                                                 getIdentifier(): [NameRef] concat
+#   56|                                             getTokenTree(): [TokenTree] TokenTree
+#   55|                               getFunction(): [PathExpr] ...::format
+#   55|                                 getPath(): [Path] ...::format
+#   55|                                   getQualifier(): [Path] ...::fmt
+#   55|                                     getQualifier(): [Path] $crate
+#   55|                                       getSegment(): [PathSegment] $crate
+#   55|                                         getIdentifier(): [NameRef] $crate
+#   55|                                     getSegment(): [PathSegment] fmt
+#   55|                                       getIdentifier(): [NameRef] fmt
+#   55|                                   getSegment(): [PathSegment] format
+#   55|                                     getIdentifier(): [NameRef] format
 #   55|                       getFunction(): [PathExpr] ...::must_use
 #   55|                         getPath(): [Path] ...::must_use
 #   55|                           getQualifier(): [Path] ...::__export
@@ -695,7 +609,7 @@ macro_expansion.rs:
 #   61|     getMacroCallExpansion(): [MacroItems] MacroItems
 #   61|       getItem(0): [Function] fn included
 #   61|         getParamList(): [ParamList] ParamList
-#   61|         getBody(): [BlockExpr] { ... }
+#   61|         getFunctionBody(): [BlockExpr] { ... }
 #   61|           getStmtList(): [StmtList] StmtList
 #   61|             getStatement(0): [ExprStmt] ExprStmt
 #   61|               getExpr(): [AssignmentExpr] ... = ...
@@ -721,7 +635,7 @@ macro_expansion.rs:
 #   63|         getPath(): [Path] doc
 #   63|           getSegment(): [PathSegment] doc
 #   63|             getIdentifier(): [NameRef] doc
-#   64|     getBody(): [BlockExpr] { ... }
+#   64|     getFunctionBody(): [BlockExpr] { ... }
 #   64|       getStmtList(): [StmtList] StmtList
 #   64|     getName(): [Name] documented
 #   66|   getItem(13): [MacroRules] MacroRules
@@ -729,7 +643,7 @@ macro_expansion.rs:
 #   66|     getTokenTree(): [TokenTree] TokenTree
 #   70|   getItem(14): [Function] fn answer
 #   70|     getParamList(): [ParamList] ParamList
-#   70|     getBody(): [BlockExpr] { ... }
+#   70|     getFunctionBody(): [BlockExpr] { ... }
 #   70|       getStmtList(): [StmtList] StmtList
 #   71|         getStatement(0): [LetStmt] let ... = 42
 #   71|           getInitializer(): [IntegerLiteralExpr] 42
@@ -821,7 +735,7 @@ macro_expansion.rs:
 #   83|                   getName(): [Name] f
 #   83|               getSelfParam(): [SelfParam] SelfParam
 #   83|                 getName(): [Name] self
-#   84|             getBody(): [BlockExpr] { ... }
+#   84|             getFunctionBody(): [BlockExpr] { ... }
 #   84|               getStmtList(): [StmtList] StmtList
 #   84|                 getTailExpr(): [MatchExpr] match self { ... }
 #   83|                   getScrutinee(): [PathExpr,VariableAccess] self
@@ -918,7 +832,7 @@ macro_expansion.rs:
 #   88|                   getName(): [Name] other
 #   88|               getSelfParam(): [SelfParam] SelfParam
 #   88|                 getName(): [Name] self
-#   89|             getBody(): [BlockExpr] { ... }
+#   89|             getFunctionBody(): [BlockExpr] { ... }
 #   89|               getStmtList(): [StmtList] StmtList
 #   89|                 getTailExpr(): [MatchExpr] match ... { ... }
 #   88|                   getScrutinee(): [TupleExpr] TupleExpr
@@ -1048,9 +962,9 @@ macro_expansion.rs:
 #   99|         getAssocItemList(): [AssocItemList] AssocItemList
 #   99|           getAssocItem(0): [Function] fn my_method
 #   98|             getParamList(): [ParamList] ParamList
-#   99|             getBody(): [BlockExpr] { ... }
+#   99|             getFunctionBody(): [BlockExpr] { ... }
 #   99|               getStmtList(): [StmtList] StmtList
-#   99|                 getTailExpr(): [PathExpr] CONST_MyDeriveUnion
+#   99|                 getTailExpr(): [ConstAccess] CONST_MyDeriveUnion
 #   99|                   getPath(): [Path] CONST_MyDeriveUnion
 #   99|                     getSegment(): [PathSegment] CONST_MyDeriveUnion
 #   99|                       getIdentifier(): [NameRef] CONST_MyDeriveUnion
@@ -1135,7 +1049,7 @@ proc_macro.rs:
 #    4|         getPath(): [Path] proc_macro_attribute
 #    4|           getSegment(): [PathSegment] proc_macro_attribute
 #    4|             getIdentifier(): [NameRef] proc_macro_attribute
-#    5|     getBody(): [BlockExpr] { ... }
+#    5|     getFunctionBody(): [BlockExpr] { ... }
 #    5|       getStmtList(): [StmtList] StmtList
 #    6|         getStatement(0): [LetStmt] let ... = ...
 #    6|           getInitializer(): [MethodCallExpr] ... .unwrap()
@@ -1353,7 +1267,7 @@ proc_macro.rs:
 #    9|                     getParam(0): [Param] ...
 #    9|                       getPat(): [IdentPat] i
 #    9|                         getName(): [Name] i
-#    9|                   getBody(): [BlockExpr] { ... }
+#    9|                   getClosureBody(): [BlockExpr] { ... }
 #    9|                     getStmtList(): [StmtList] StmtList
 #   10|                       getStatement(0): [LetStmt] let ... = ...
 #   10|                         getInitializer(): [MethodCallExpr] ast.clone()
@@ -1388,55 +1302,48 @@ proc_macro.rs:
 #   11|                                       getArgList(): [ArgList] ArgList
 #   11|                                         getArg(0): [BlockExpr] { ... }
 #   11|                                           getStmtList(): [StmtList] StmtList
-#   11|                                             getStatement(0): [LetStmt] let ... = ...
-#   11|                                               getInitializer(): [CallExpr] ...::format(...)
-#   11|                                                 getArgList(): [ArgList] ArgList
-#   11|                                                   getArg(0): [MacroExpr] MacroExpr
-#   11|                                                     getMacroCall(): [MacroCall] ...::format_args!...
-#   11|                                                       getPath(): [Path] ...::format_args
-#   11|                                                         getQualifier(): [Path] ...::__export
-#   11|                                                           getQualifier(): [Path] $crate
-#   11|                                                             getSegment(): [PathSegment] $crate
-#   11|                                                               getIdentifier(): [NameRef] $crate
-#   11|                                                           getSegment(): [PathSegment] __export
-#   11|                                                             getIdentifier(): [NameRef] __export
-#   11|                                                         getSegment(): [PathSegment] format_args
-#   11|                                                           getIdentifier(): [NameRef] format_args
-#   11|                                                       getTokenTree(): [TokenTree] TokenTree
-#   11|                                                       getMacroCallExpansion(): [FormatArgsExpr] FormatArgsExpr
-#   11|                                                         getArg(0): [FormatArgsArg] FormatArgsArg
-#   11|                                                           getExpr(): [FieldExpr] ... .ident
-#   11|                                                             getContainer(): [FieldExpr] ast.sig
-#   11|                                                               getContainer(): [PathExpr,VariableAccess] ast
-#   11|                                                                 getPath(): [Path] ast
-#   11|                                                                   getSegment(): [PathSegment] ast
-#   11|                                                                     getIdentifier(): [NameRef] ast
-#   11|                                                               getIdentifier(): [NameRef] sig
-#   11|                                                             getIdentifier(): [NameRef] ident
-#   11|                                                         getArg(1): [FormatArgsArg] FormatArgsArg
-#   11|                                                           getExpr(): [PathExpr,VariableAccess] i
-#   11|                                                             getPath(): [Path] i
-#   11|                                                               getSegment(): [PathSegment] i
-#   11|                                                                 getIdentifier(): [NameRef] i
-#   11|                                                         getTemplate(): [StringLiteralExpr] "{}_{}"
-#   11|                                                         getFormat(0): [Format] {}
-#   11|                                                         getFormat(1): [Format] {}
-#   11|                                                 getFunction(): [PathExpr] ...::format
-#   11|                                                   getPath(): [Path] ...::format
-#   11|                                                     getQualifier(): [Path] ...::fmt
-#   11|                                                       getQualifier(): [Path] $crate
-#   11|                                                         getSegment(): [PathSegment] $crate
-#   11|                                                           getIdentifier(): [NameRef] $crate
-#   11|                                                       getSegment(): [PathSegment] fmt
-#   11|                                                         getIdentifier(): [NameRef] fmt
-#   11|                                                     getSegment(): [PathSegment] format
-#   11|                                                       getIdentifier(): [NameRef] format
-#   11|                                               getPat(): [IdentPat] res
-#   11|                                                 getName(): [Name] res
-#   11|                                             getTailExpr(): [PathExpr,VariableAccess] res
-#   11|                                               getPath(): [Path] res
-#   11|                                                 getSegment(): [PathSegment] res
-#   11|                                                   getIdentifier(): [NameRef] res
+#   11|                                             getTailExpr(): [CallExpr] ...::format(...)
+#   11|                                               getArgList(): [ArgList] ArgList
+#   11|                                                 getArg(0): [MacroExpr] MacroExpr
+#   11|                                                   getMacroCall(): [MacroCall] ...::format_args!...
+#   11|                                                     getPath(): [Path] ...::format_args
+#   11|                                                       getQualifier(): [Path] ...::__export
+#   11|                                                         getQualifier(): [Path] $crate
+#   11|                                                           getSegment(): [PathSegment] $crate
+#   11|                                                             getIdentifier(): [NameRef] $crate
+#   11|                                                         getSegment(): [PathSegment] __export
+#   11|                                                           getIdentifier(): [NameRef] __export
+#   11|                                                       getSegment(): [PathSegment] format_args
+#   11|                                                         getIdentifier(): [NameRef] format_args
+#   11|                                                     getTokenTree(): [TokenTree] TokenTree
+#   11|                                                     getMacroCallExpansion(): [FormatArgsExpr] FormatArgsExpr
+#   11|                                                       getArg(0): [FormatArgsArg] FormatArgsArg
+#   11|                                                         getExpr(): [FieldExpr] ... .ident
+#   11|                                                           getContainer(): [FieldExpr] ast.sig
+#   11|                                                             getContainer(): [PathExpr,VariableAccess] ast
+#   11|                                                               getPath(): [Path] ast
+#   11|                                                                 getSegment(): [PathSegment] ast
+#   11|                                                                   getIdentifier(): [NameRef] ast
+#   11|                                                             getIdentifier(): [NameRef] sig
+#   11|                                                           getIdentifier(): [NameRef] ident
+#   11|                                                       getArg(1): [FormatArgsArg] FormatArgsArg
+#   11|                                                         getExpr(): [PathExpr,VariableAccess] i
+#   11|                                                           getPath(): [Path] i
+#   11|                                                             getSegment(): [PathSegment] i
+#   11|                                                               getIdentifier(): [NameRef] i
+#   11|                                                       getTemplate(): [StringLiteralExpr] "{}_{}"
+#   11|                                                       getFormat(0): [Format] {}
+#   11|                                                       getFormat(1): [Format] {}
+#   11|                                               getFunction(): [PathExpr] ...::format
+#   11|                                                 getPath(): [Path] ...::format
+#   11|                                                   getQualifier(): [Path] ...::fmt
+#   11|                                                     getQualifier(): [Path] $crate
+#   11|                                                       getSegment(): [PathSegment] $crate
+#   11|                                                         getIdentifier(): [NameRef] $crate
+#   11|                                                     getSegment(): [PathSegment] fmt
+#   11|                                                       getIdentifier(): [NameRef] fmt
+#   11|                                                   getSegment(): [PathSegment] format
+#   11|                                                     getIdentifier(): [NameRef] format
 #   11|                                       getFunction(): [PathExpr] ...::must_use
 #   11|                                         getPath(): [Path] ...::must_use
 #   11|                                           getQualifier(): [Path] ...::__export
@@ -1532,16 +1439,6 @@ proc_macro.rs:
 #   15|                                   getIdentifier(): [NameRef] quote_tokens_with_context
 #   16|                               getTokenTree(): [TokenTree] TokenTree
 #   16|                               getMacroCallExpansion(): [MacroBlockExpr] MacroBlockExpr
-#   16|                                 getTailExpr(): [MacroExpr] MacroExpr
-#   16|                                   getMacroCall(): [MacroCall] ...::quote_token_with_context!...
-#   15|                                     getPath(): [Path] ...::quote_token_with_context
-#   15|                                       getQualifier(): [Path] $crate
-#   15|                                         getSegment(): [PathSegment] $crate
-#   15|                                           getIdentifier(): [NameRef] $crate
-#   15|                                       getSegment(): [PathSegment] quote_token_with_context
-#   15|                                         getIdentifier(): [NameRef] quote_token_with_context
-#   16|                                     getTokenTree(): [TokenTree] TokenTree
-#   15|                                     getMacroCallExpansion(): [MacroBlockExpr] MacroBlockExpr
 #   16|                                 getStatement(0): [ExprStmt] ExprStmt
 #   16|                                   getExpr(): [MacroExpr] MacroExpr
 #   16|                                     getMacroCall(): [MacroCall] ...::quote_token_with_context!...
@@ -1633,16 +1530,6 @@ proc_macro.rs:
 #   15|                                                             getIdentifier(): [NameRef] pounded_var_names_with_context
 #   16|                                                         getTokenTree(): [TokenTree] TokenTree
 #   16|                                                         getMacroCallExpansion(): [MacroBlockExpr] MacroBlockExpr
-#   16|                                                           getTailExpr(): [MacroExpr] MacroExpr
-#   16|                                                             getMacroCall(): [MacroCall] ...::pounded_var_with_context!...
-#   15|                                                               getPath(): [Path] ...::pounded_var_with_context
-#   15|                                                                 getQualifier(): [Path] $crate
-#   15|                                                                   getSegment(): [PathSegment] $crate
-#   15|                                                                     getIdentifier(): [NameRef] $crate
-#   15|                                                                 getSegment(): [PathSegment] pounded_var_with_context
-#   15|                                                                   getIdentifier(): [NameRef] pounded_var_with_context
-#   16|                                                               getTokenTree(): [TokenTree] TokenTree
-#   15|                                                               getMacroCallExpansion(): [MacroBlockExpr] MacroBlockExpr
 #   15|                                                           getStatement(0): [ExprStmt] ExprStmt
 #   15|                                                             getExpr(): [MacroExpr] MacroExpr
 #   15|                                                               getMacroCall(): [MacroCall] ...::pounded_var_with_context!...
@@ -1748,6 +1635,16 @@ proc_macro.rs:
 #   15|                                                                                     getIdentifier(): [NameRef] i
 #   15|                                                                             getPat(): [IdentPat] has_iter
 #   15|                                                                               getName(): [Name] has_iter
+#   16|                                                           getTailExpr(): [MacroExpr] MacroExpr
+#   16|                                                             getMacroCall(): [MacroCall] ...::pounded_var_with_context!...
+#   15|                                                               getPath(): [Path] ...::pounded_var_with_context
+#   15|                                                                 getQualifier(): [Path] $crate
+#   15|                                                                   getSegment(): [PathSegment] $crate
+#   15|                                                                     getIdentifier(): [NameRef] $crate
+#   15|                                                                 getSegment(): [PathSegment] pounded_var_with_context
+#   15|                                                                   getIdentifier(): [NameRef] pounded_var_with_context
+#   16|                                                               getTokenTree(): [TokenTree] TokenTree
+#   15|                                                               getMacroCallExpansion(): [MacroBlockExpr] MacroBlockExpr
 #   15|                                             getStatement(3): [LetStmt] let _ = has_iter
 #   15|                                               getInitializer(): [PathExpr,VariableAccess] has_iter
 #   15|                                                 getPath(): [Path] has_iter
@@ -1788,16 +1685,6 @@ proc_macro.rs:
 #   15|                                                                   getIdentifier(): [NameRef] pounded_var_names_with_context
 #   16|                                                               getTokenTree(): [TokenTree] TokenTree
 #   16|                                                               getMacroCallExpansion(): [MacroBlockExpr] MacroBlockExpr
-#   16|                                                                 getTailExpr(): [MacroExpr] MacroExpr
-#   16|                                                                   getMacroCall(): [MacroCall] ...::pounded_var_with_context!...
-#   15|                                                                     getPath(): [Path] ...::pounded_var_with_context
-#   15|                                                                       getQualifier(): [Path] $crate
-#   15|                                                                         getSegment(): [PathSegment] $crate
-#   15|                                                                           getIdentifier(): [NameRef] $crate
-#   15|                                                                       getSegment(): [PathSegment] pounded_var_with_context
-#   15|                                                                         getIdentifier(): [NameRef] pounded_var_with_context
-#   16|                                                                     getTokenTree(): [TokenTree] TokenTree
-#   15|                                                                     getMacroCallExpansion(): [MacroBlockExpr] MacroBlockExpr
 #   15|                                                                 getStatement(0): [ExprStmt] ExprStmt
 #   15|                                                                   getExpr(): [MacroExpr] MacroExpr
 #   15|                                                                     getMacroCall(): [MacroCall] ...::pounded_var_with_context!...
@@ -1911,6 +1798,16 @@ proc_macro.rs:
 #   15|                                                                                           getName(): [Name] None
 #   16|                                                                                   getPat(): [IdentPat] items
 #   16|                                                                                     getName(): [Name] items
+#   16|                                                                 getTailExpr(): [MacroExpr] MacroExpr
+#   16|                                                                   getMacroCall(): [MacroCall] ...::pounded_var_with_context!...
+#   15|                                                                     getPath(): [Path] ...::pounded_var_with_context
+#   15|                                                                       getQualifier(): [Path] $crate
+#   15|                                                                         getSegment(): [PathSegment] $crate
+#   15|                                                                           getIdentifier(): [NameRef] $crate
+#   15|                                                                       getSegment(): [PathSegment] pounded_var_with_context
+#   15|                                                                         getIdentifier(): [NameRef] pounded_var_with_context
+#   16|                                                                     getTokenTree(): [TokenTree] TokenTree
+#   15|                                                                     getMacroCallExpansion(): [MacroBlockExpr] MacroBlockExpr
 #   16|                                                   getTailExpr(): [MacroExpr] MacroExpr
 #   16|                                                     getMacroCall(): [MacroCall] ...::quote_each_token!...
 #   15|                                                       getPath(): [Path] ...::quote_each_token
@@ -1931,16 +1828,6 @@ proc_macro.rs:
 #   15|                                                                 getIdentifier(): [NameRef] quote_tokens_with_context
 #   16|                                                             getTokenTree(): [TokenTree] TokenTree
 #   16|                                                             getMacroCallExpansion(): [MacroBlockExpr] MacroBlockExpr
-#   16|                                                               getTailExpr(): [MacroExpr] MacroExpr
-#   16|                                                                 getMacroCall(): [MacroCall] ...::quote_token_with_context!...
-#   15|                                                                   getPath(): [Path] ...::quote_token_with_context
-#   15|                                                                     getQualifier(): [Path] $crate
-#   15|                                                                       getSegment(): [PathSegment] $crate
-#   15|                                                                         getIdentifier(): [NameRef] $crate
-#   15|                                                                     getSegment(): [PathSegment] quote_token_with_context
-#   15|                                                                       getIdentifier(): [NameRef] quote_token_with_context
-#   16|                                                                   getTokenTree(): [TokenTree] TokenTree
-#   15|                                                                   getMacroCallExpansion(): [MacroBlockExpr] MacroBlockExpr
 #   16|                                                               getStatement(0): [ExprStmt] ExprStmt
 #   16|                                                                 getExpr(): [MacroExpr] MacroExpr
 #   16|                                                                   getMacroCall(): [MacroCall] ...::quote_token_with_context!...
@@ -2041,6 +1928,16 @@ proc_macro.rs:
 #   15|                                                                         getIdentifier(): [NameRef] quote_token_with_context
 #   16|                                                                     getTokenTree(): [TokenTree] TokenTree
 #   15|                                                                     getMacroCallExpansion(): [MacroBlockExpr] MacroBlockExpr
+#   16|                                                               getTailExpr(): [MacroExpr] MacroExpr
+#   16|                                                                 getMacroCall(): [MacroCall] ...::quote_token_with_context!...
+#   15|                                                                   getPath(): [Path] ...::quote_token_with_context
+#   15|                                                                     getQualifier(): [Path] $crate
+#   15|                                                                       getSegment(): [PathSegment] $crate
+#   15|                                                                         getIdentifier(): [NameRef] $crate
+#   15|                                                                     getSegment(): [PathSegment] quote_token_with_context
+#   15|                                                                       getIdentifier(): [NameRef] quote_token_with_context
+#   16|                                                                   getTokenTree(): [TokenTree] TokenTree
+#   15|                                                                   getMacroCallExpansion(): [MacroBlockExpr] MacroBlockExpr
 #   15|                                               getCondition(): [BooleanLiteralExpr] true
 #   16|                                 getStatement(4): [ExprStmt] ExprStmt
 #   16|                                   getExpr(): [MacroExpr] MacroExpr
@@ -2086,6 +1983,16 @@ proc_macro.rs:
 #   15|                                           getIdentifier(): [NameRef] quote_token_with_context
 #   16|                                       getTokenTree(): [TokenTree] TokenTree
 #   15|                                       getMacroCallExpansion(): [MacroBlockExpr] MacroBlockExpr
+#   16|                                 getTailExpr(): [MacroExpr] MacroExpr
+#   16|                                   getMacroCall(): [MacroCall] ...::quote_token_with_context!...
+#   15|                                     getPath(): [Path] ...::quote_token_with_context
+#   15|                                       getQualifier(): [Path] $crate
+#   15|                                         getSegment(): [PathSegment] $crate
+#   15|                                           getIdentifier(): [NameRef] $crate
+#   15|                                       getSegment(): [PathSegment] quote_token_with_context
+#   15|                                         getIdentifier(): [NameRef] quote_token_with_context
+#   16|                                     getTokenTree(): [TokenTree] TokenTree
+#   15|                                     getMacroCallExpansion(): [MacroBlockExpr] MacroBlockExpr
 #   15|                   getTailExpr(): [PathExpr] _s
 #   15|                     getPath(): [Path] _s
 #   15|                       getSegment(): [PathSegment] _s
@@ -2118,7 +2025,7 @@ proc_macro.rs:
 #   20|         getPath(): [Path] proc_macro_attribute
 #   20|           getSegment(): [PathSegment] proc_macro_attribute
 #   20|             getIdentifier(): [NameRef] proc_macro_attribute
-#   21|     getBody(): [BlockExpr] { ... }
+#   21|     getFunctionBody(): [BlockExpr] { ... }
 #   21|       getStmtList(): [StmtList] StmtList
 #   22|         getStatement(0): [LetStmt] let ... = ...
 #   22|           getInitializer(): [MacroExpr] MacroExpr
@@ -2245,49 +2152,42 @@ proc_macro.rs:
 #   24|                         getArgList(): [ArgList] ArgList
 #   24|                           getArg(0): [BlockExpr] { ... }
 #   24|                             getStmtList(): [StmtList] StmtList
-#   24|                               getStatement(0): [LetStmt] let ... = ...
-#   24|                                 getInitializer(): [CallExpr] ...::format(...)
-#   24|                                   getArgList(): [ArgList] ArgList
-#   24|                                     getArg(0): [MacroExpr] MacroExpr
-#   24|                                       getMacroCall(): [MacroCall] ...::format_args!...
-#   24|                                         getPath(): [Path] ...::format_args
-#   24|                                           getQualifier(): [Path] ...::__export
-#   24|                                             getQualifier(): [Path] $crate
-#   24|                                               getSegment(): [PathSegment] $crate
-#   24|                                                 getIdentifier(): [NameRef] $crate
-#   24|                                             getSegment(): [PathSegment] __export
-#   24|                                               getIdentifier(): [NameRef] __export
-#   24|                                           getSegment(): [PathSegment] format_args
-#   24|                                             getIdentifier(): [NameRef] format_args
-#   24|                                         getTokenTree(): [TokenTree] TokenTree
-#   24|                                         getMacroCallExpansion(): [FormatArgsExpr] FormatArgsExpr
-#   24|                                           getArg(0): [FormatArgsArg] FormatArgsArg
-#   24|                                             getExpr(): [FieldExpr] ... .ident
-#   24|                                               getContainer(): [FieldExpr] ast.sig
-#   24|                                                 getContainer(): [PathExpr,VariableAccess] ast
-#   24|                                                   getPath(): [Path] ast
-#   24|                                                     getSegment(): [PathSegment] ast
-#   24|                                                       getIdentifier(): [NameRef] ast
-#   24|                                                 getIdentifier(): [NameRef] sig
-#   24|                                               getIdentifier(): [NameRef] ident
-#   24|                                           getTemplate(): [StringLiteralExpr] "{}_new"
-#   24|                                           getFormat(0): [Format] {}
-#   24|                                   getFunction(): [PathExpr] ...::format
-#   24|                                     getPath(): [Path] ...::format
-#   24|                                       getQualifier(): [Path] ...::fmt
-#   24|                                         getQualifier(): [Path] $crate
-#   24|                                           getSegment(): [PathSegment] $crate
-#   24|                                             getIdentifier(): [NameRef] $crate
-#   24|                                         getSegment(): [PathSegment] fmt
-#   24|                                           getIdentifier(): [NameRef] fmt
-#   24|                                       getSegment(): [PathSegment] format
-#   24|                                         getIdentifier(): [NameRef] format
-#   24|                                 getPat(): [IdentPat] res
-#   24|                                   getName(): [Name] res
-#   24|                               getTailExpr(): [PathExpr,VariableAccess] res
-#   24|                                 getPath(): [Path] res
-#   24|                                   getSegment(): [PathSegment] res
-#   24|                                     getIdentifier(): [NameRef] res
+#   24|                               getTailExpr(): [CallExpr] ...::format(...)
+#   24|                                 getArgList(): [ArgList] ArgList
+#   24|                                   getArg(0): [MacroExpr] MacroExpr
+#   24|                                     getMacroCall(): [MacroCall] ...::format_args!...
+#   24|                                       getPath(): [Path] ...::format_args
+#   24|                                         getQualifier(): [Path] ...::__export
+#   24|                                           getQualifier(): [Path] $crate
+#   24|                                             getSegment(): [PathSegment] $crate
+#   24|                                               getIdentifier(): [NameRef] $crate
+#   24|                                           getSegment(): [PathSegment] __export
+#   24|                                             getIdentifier(): [NameRef] __export
+#   24|                                         getSegment(): [PathSegment] format_args
+#   24|                                           getIdentifier(): [NameRef] format_args
+#   24|                                       getTokenTree(): [TokenTree] TokenTree
+#   24|                                       getMacroCallExpansion(): [FormatArgsExpr] FormatArgsExpr
+#   24|                                         getArg(0): [FormatArgsArg] FormatArgsArg
+#   24|                                           getExpr(): [FieldExpr] ... .ident
+#   24|                                             getContainer(): [FieldExpr] ast.sig
+#   24|                                               getContainer(): [PathExpr,VariableAccess] ast
+#   24|                                                 getPath(): [Path] ast
+#   24|                                                   getSegment(): [PathSegment] ast
+#   24|                                                     getIdentifier(): [NameRef] ast
+#   24|                                               getIdentifier(): [NameRef] sig
+#   24|                                             getIdentifier(): [NameRef] ident
+#   24|                                         getTemplate(): [StringLiteralExpr] "{}_new"
+#   24|                                         getFormat(0): [Format] {}
+#   24|                                 getFunction(): [PathExpr] ...::format
+#   24|                                   getPath(): [Path] ...::format
+#   24|                                     getQualifier(): [Path] ...::fmt
+#   24|                                       getQualifier(): [Path] $crate
+#   24|                                         getSegment(): [PathSegment] $crate
+#   24|                                           getIdentifier(): [NameRef] $crate
+#   24|                                       getSegment(): [PathSegment] fmt
+#   24|                                         getIdentifier(): [NameRef] fmt
+#   24|                                     getSegment(): [PathSegment] format
+#   24|                                       getIdentifier(): [NameRef] format
 #   24|                         getFunction(): [PathExpr] ...::must_use
 #   24|                           getPath(): [Path] ...::must_use
 #   24|                             getQualifier(): [Path] ...::__export
@@ -2369,16 +2269,6 @@ proc_macro.rs:
 #   25|                                   getIdentifier(): [NameRef] quote_tokens_with_context
 #   26|                               getTokenTree(): [TokenTree] TokenTree
 #   26|                               getMacroCallExpansion(): [MacroBlockExpr] MacroBlockExpr
-#   27|                                 getTailExpr(): [MacroExpr] MacroExpr
-#   27|                                   getMacroCall(): [MacroCall] ...::quote_token_with_context!...
-#   25|                                     getPath(): [Path] ...::quote_token_with_context
-#   25|                                       getQualifier(): [Path] $crate
-#   25|                                         getSegment(): [PathSegment] $crate
-#   25|                                           getIdentifier(): [NameRef] $crate
-#   25|                                       getSegment(): [PathSegment] quote_token_with_context
-#   25|                                         getIdentifier(): [NameRef] quote_token_with_context
-#   27|                                     getTokenTree(): [TokenTree] TokenTree
-#   25|                                     getMacroCallExpansion(): [MacroBlockExpr] MacroBlockExpr
 #   26|                                 getStatement(0): [ExprStmt] ExprStmt
 #   26|                                   getExpr(): [MacroExpr] MacroExpr
 #   26|                                     getMacroCall(): [MacroCall] ...::quote_token_with_context!...
@@ -2524,6 +2414,16 @@ proc_macro.rs:
 #   25|                                           getIdentifier(): [NameRef] quote_token_with_context
 #   27|                                       getTokenTree(): [TokenTree] TokenTree
 #   25|                                       getMacroCallExpansion(): [MacroBlockExpr] MacroBlockExpr
+#   27|                                 getTailExpr(): [MacroExpr] MacroExpr
+#   27|                                   getMacroCall(): [MacroCall] ...::quote_token_with_context!...
+#   25|                                     getPath(): [Path] ...::quote_token_with_context
+#   25|                                       getQualifier(): [Path] $crate
+#   25|                                         getSegment(): [PathSegment] $crate
+#   25|                                           getIdentifier(): [NameRef] $crate
+#   25|                                       getSegment(): [PathSegment] quote_token_with_context
+#   25|                                         getIdentifier(): [NameRef] quote_token_with_context
+#   27|                                     getTokenTree(): [TokenTree] TokenTree
+#   25|                                     getMacroCallExpansion(): [MacroBlockExpr] MacroBlockExpr
 #   25|                   getTailExpr(): [PathExpr] _s
 #   25|                     getPath(): [Path] _s
 #   25|                       getSegment(): [PathSegment] _s
@@ -2556,7 +2456,7 @@ proc_macro.rs:
 #   31|         getPath(): [Path] proc_macro_attribute
 #   31|           getSegment(): [PathSegment] proc_macro_attribute
 #   31|             getIdentifier(): [NameRef] proc_macro_attribute
-#   32|     getBody(): [BlockExpr] { ... }
+#   32|     getFunctionBody(): [BlockExpr] { ... }
 #   32|       getStmtList(): [StmtList] StmtList
 #   33|         getTailExpr(): [CallExpr] ...::new(...)
 #   33|           getArgList(): [ArgList] ArgList
@@ -2589,7 +2489,7 @@ proc_macro.rs:
 #   36|           getSegment(): [PathSegment] proc_macro_derive
 #   36|             getIdentifier(): [NameRef] proc_macro_derive
 #   36|         getTokenTree(): [TokenTree] TokenTree
-#   37|     getBody(): [BlockExpr] { ... }
+#   37|     getFunctionBody(): [BlockExpr] { ... }
 #   37|       getStmtList(): [StmtList] StmtList
 #   38|         getStatement(0): [LetStmt] let ... = ...
 #   38|           getInitializer(): [MacroExpr] MacroExpr
@@ -2707,45 +2607,38 @@ proc_macro.rs:
 #   40|                       getArgList(): [ArgList] ArgList
 #   40|                         getArg(0): [BlockExpr] { ... }
 #   40|                           getStmtList(): [StmtList] StmtList
-#   40|                             getStatement(0): [LetStmt] let ... = ...
-#   40|                               getInitializer(): [CallExpr] ...::format(...)
-#   40|                                 getArgList(): [ArgList] ArgList
-#   40|                                   getArg(0): [MacroExpr] MacroExpr
-#   40|                                     getMacroCall(): [MacroCall] ...::format_args!...
-#   40|                                       getPath(): [Path] ...::format_args
-#   40|                                         getQualifier(): [Path] ...::__export
-#   40|                                           getQualifier(): [Path] $crate
-#   40|                                             getSegment(): [PathSegment] $crate
-#   40|                                               getIdentifier(): [NameRef] $crate
-#   40|                                           getSegment(): [PathSegment] __export
-#   40|                                             getIdentifier(): [NameRef] __export
-#   40|                                         getSegment(): [PathSegment] format_args
-#   40|                                           getIdentifier(): [NameRef] format_args
-#   40|                                       getTokenTree(): [TokenTree] TokenTree
-#   40|                                       getMacroCallExpansion(): [FormatArgsExpr] FormatArgsExpr
-#   40|                                         getArg(0): [FormatArgsArg] FormatArgsArg
-#   40|                                           getExpr(): [PathExpr,VariableAccess] name
-#   40|                                             getPath(): [Path] name
-#   40|                                               getSegment(): [PathSegment] name
-#   40|                                                 getIdentifier(): [NameRef] name
-#   40|                                         getTemplate(): [StringLiteralExpr] "CONST_{}"
-#   40|                                         getFormat(0): [Format] {}
-#   40|                                 getFunction(): [PathExpr] ...::format
-#   40|                                   getPath(): [Path] ...::format
-#   40|                                     getQualifier(): [Path] ...::fmt
-#   40|                                       getQualifier(): [Path] $crate
-#   40|                                         getSegment(): [PathSegment] $crate
-#   40|                                           getIdentifier(): [NameRef] $crate
-#   40|                                       getSegment(): [PathSegment] fmt
-#   40|                                         getIdentifier(): [NameRef] fmt
-#   40|                                     getSegment(): [PathSegment] format
-#   40|                                       getIdentifier(): [NameRef] format
-#   40|                               getPat(): [IdentPat] res
-#   40|                                 getName(): [Name] res
-#   40|                             getTailExpr(): [PathExpr,VariableAccess] res
-#   40|                               getPath(): [Path] res
-#   40|                                 getSegment(): [PathSegment] res
-#   40|                                   getIdentifier(): [NameRef] res
+#   40|                             getTailExpr(): [CallExpr] ...::format(...)
+#   40|                               getArgList(): [ArgList] ArgList
+#   40|                                 getArg(0): [MacroExpr] MacroExpr
+#   40|                                   getMacroCall(): [MacroCall] ...::format_args!...
+#   40|                                     getPath(): [Path] ...::format_args
+#   40|                                       getQualifier(): [Path] ...::__export
+#   40|                                         getQualifier(): [Path] $crate
+#   40|                                           getSegment(): [PathSegment] $crate
+#   40|                                             getIdentifier(): [NameRef] $crate
+#   40|                                         getSegment(): [PathSegment] __export
+#   40|                                           getIdentifier(): [NameRef] __export
+#   40|                                       getSegment(): [PathSegment] format_args
+#   40|                                         getIdentifier(): [NameRef] format_args
+#   40|                                     getTokenTree(): [TokenTree] TokenTree
+#   40|                                     getMacroCallExpansion(): [FormatArgsExpr] FormatArgsExpr
+#   40|                                       getArg(0): [FormatArgsArg] FormatArgsArg
+#   40|                                         getExpr(): [PathExpr,VariableAccess] name
+#   40|                                           getPath(): [Path] name
+#   40|                                             getSegment(): [PathSegment] name
+#   40|                                               getIdentifier(): [NameRef] name
+#   40|                                       getTemplate(): [StringLiteralExpr] "CONST_{}"
+#   40|                                       getFormat(0): [Format] {}
+#   40|                               getFunction(): [PathExpr] ...::format
+#   40|                                 getPath(): [Path] ...::format
+#   40|                                   getQualifier(): [Path] ...::fmt
+#   40|                                     getQualifier(): [Path] $crate
+#   40|                                       getSegment(): [PathSegment] $crate
+#   40|                                         getIdentifier(): [NameRef] $crate
+#   40|                                     getSegment(): [PathSegment] fmt
+#   40|                                       getIdentifier(): [NameRef] fmt
+#   40|                                   getSegment(): [PathSegment] format
+#   40|                                     getIdentifier(): [NameRef] format
 #   40|                       getFunction(): [PathExpr] ...::must_use
 #   40|                         getPath(): [Path] ...::must_use
 #   40|                           getQualifier(): [Path] ...::__export
@@ -2825,16 +2718,6 @@ proc_macro.rs:
 #   41|                                   getIdentifier(): [NameRef] quote_tokens_with_context
 #   42|                               getTokenTree(): [TokenTree] TokenTree
 #   42|                               getMacroCallExpansion(): [MacroBlockExpr] MacroBlockExpr
-#   44|                                 getTailExpr(): [MacroExpr] MacroExpr
-#   44|                                   getMacroCall(): [MacroCall] ...::quote_token_with_context!...
-#   41|                                     getPath(): [Path] ...::quote_token_with_context
-#   41|                                       getQualifier(): [Path] $crate
-#   41|                                         getSegment(): [PathSegment] $crate
-#   41|                                           getIdentifier(): [NameRef] $crate
-#   41|                                       getSegment(): [PathSegment] quote_token_with_context
-#   41|                                         getIdentifier(): [NameRef] quote_token_with_context
-#   44|                                     getTokenTree(): [TokenTree] TokenTree
-#   41|                                     getMacroCallExpansion(): [MacroBlockExpr] MacroBlockExpr
 #   42|                                 getStatement(0): [ExprStmt] ExprStmt
 #   42|                                   getExpr(): [MacroExpr] MacroExpr
 #   42|                                     getMacroCall(): [MacroCall] ...::quote_token_with_context!...
@@ -3443,16 +3326,6 @@ proc_macro.rs:
 #   41|                                                                             getIdentifier(): [NameRef] quote_tokens_with_context
 #   45|                                                                         getTokenTree(): [TokenTree] TokenTree
 #   45|                                                                         getMacroCallExpansion(): [MacroBlockExpr] MacroBlockExpr
-#   45|                                                                           getTailExpr(): [MacroExpr] MacroExpr
-#   45|                                                                             getMacroCall(): [MacroCall] ...::quote_token_with_context!...
-#   41|                                                                               getPath(): [Path] ...::quote_token_with_context
-#   41|                                                                                 getQualifier(): [Path] $crate
-#   41|                                                                                   getSegment(): [PathSegment] $crate
-#   41|                                                                                     getIdentifier(): [NameRef] $crate
-#   41|                                                                                 getSegment(): [PathSegment] quote_token_with_context
-#   41|                                                                                   getIdentifier(): [NameRef] quote_token_with_context
-#   45|                                                                               getTokenTree(): [TokenTree] TokenTree
-#   41|                                                                               getMacroCallExpansion(): [MacroBlockExpr] MacroBlockExpr
 #   45|                                                                           getStatement(0): [ExprStmt] ExprStmt
 #   45|                                                                             getExpr(): [MacroExpr] MacroExpr
 #   45|                                                                               getMacroCall(): [MacroCall] ...::quote_token_with_context!...
@@ -3869,6 +3742,16 @@ proc_macro.rs:
 #   41|                                                                                     getIdentifier(): [NameRef] quote_token_with_context
 #   45|                                                                                 getTokenTree(): [TokenTree] TokenTree
 #   41|                                                                                 getMacroCallExpansion(): [MacroBlockExpr] MacroBlockExpr
+#   45|                                                                           getTailExpr(): [MacroExpr] MacroExpr
+#   45|                                                                             getMacroCall(): [MacroCall] ...::quote_token_with_context!...
+#   41|                                                                               getPath(): [Path] ...::quote_token_with_context
+#   41|                                                                                 getQualifier(): [Path] $crate
+#   41|                                                                                   getSegment(): [PathSegment] $crate
+#   41|                                                                                     getIdentifier(): [NameRef] $crate
+#   41|                                                                                 getSegment(): [PathSegment] quote_token_with_context
+#   41|                                                                                   getIdentifier(): [NameRef] quote_token_with_context
+#   45|                                                                               getTokenTree(): [TokenTree] TokenTree
+#   41|                                                                               getMacroCallExpansion(): [MacroBlockExpr] MacroBlockExpr
 #   41|                                                             getTailExpr(): [PathExpr] _s
 #   41|                                                               getPath(): [Path] _s
 #   41|                                                                 getSegment(): [PathSegment] _s
@@ -3905,6 +3788,16 @@ proc_macro.rs:
 #   41|                                           getIdentifier(): [NameRef] quote_token_with_context
 #   44|                                       getTokenTree(): [TokenTree] TokenTree
 #   41|                                       getMacroCallExpansion(): [MacroBlockExpr] MacroBlockExpr
+#   44|                                 getTailExpr(): [MacroExpr] MacroExpr
+#   44|                                   getMacroCall(): [MacroCall] ...::quote_token_with_context!...
+#   41|                                     getPath(): [Path] ...::quote_token_with_context
+#   41|                                       getQualifier(): [Path] $crate
+#   41|                                         getSegment(): [PathSegment] $crate
+#   41|                                           getIdentifier(): [NameRef] $crate
+#   41|                                       getSegment(): [PathSegment] quote_token_with_context
+#   41|                                         getIdentifier(): [NameRef] quote_token_with_context
+#   44|                                     getTokenTree(): [TokenTree] TokenTree
+#   41|                                     getMacroCallExpansion(): [MacroBlockExpr] MacroBlockExpr
 #   41|                   getTailExpr(): [PathExpr] _s
 #   41|                     getPath(): [Path] _s
 #   41|                       getSegment(): [PathSegment] _s
diff --git a/rust/ql/test/extractor-tests/macro-expansion/test.expected b/rust/ql/test/extractor-tests/macro-expansion/test.expected
index ad2cfe5a9b8..5abff30113b 100644
--- a/rust/ql/test/extractor-tests/macro-expansion/test.expected
+++ b/rust/ql/test/extractor-tests/macro-expansion/test.expected
@@ -1,19 +1,19 @@
 attribute_macros
-| macro_expansion.rs:3:1:12:1 | fn foo | 0 | macro_expansion.rs:4:1:11:14 | fn foo |
-| macro_expansion.rs:3:1:12:1 | fn foo | 1 | macro_expansion.rs:4:1:11:14 | fn foo_new |
-| macro_expansion.rs:7:5:8:16 | fn inner | 0 | macro_expansion.rs:8:5:8:16 | fn inner_0 |
-| macro_expansion.rs:7:5:8:16 | fn inner | 0 | macro_expansion.rs:8:5:8:16 | fn inner_0 |
-| macro_expansion.rs:7:5:8:16 | fn inner | 1 | macro_expansion.rs:8:5:8:16 | fn inner_1 |
-| macro_expansion.rs:7:5:8:16 | fn inner | 1 | macro_expansion.rs:8:5:8:16 | fn inner_1 |
-| macro_expansion.rs:14:1:16:15 | fn bar | 0 | macro_expansion.rs:15:1:16:14 | fn bar_0 |
-| macro_expansion.rs:14:1:16:15 | fn bar | 1 | macro_expansion.rs:15:1:16:14 | fn bar_1 |
-| macro_expansion.rs:15:1:16:14 | fn bar_0 | 0 | macro_expansion.rs:16:1:16:14 | fn bar_0 |
-| macro_expansion.rs:15:1:16:14 | fn bar_0 | 1 | macro_expansion.rs:16:1:16:14 | fn bar_0_new |
-| macro_expansion.rs:15:1:16:14 | fn bar_1 | 0 | macro_expansion.rs:16:1:16:14 | fn bar_1 |
-| macro_expansion.rs:15:1:16:14 | fn bar_1 | 1 | macro_expansion.rs:16:1:16:14 | fn bar_1_new |
-| macro_expansion.rs:31:5:34:5 | fn bzz | 0 | macro_expansion.rs:32:5:33:17 | fn bzz_0 |
-| macro_expansion.rs:31:5:34:5 | fn bzz | 1 | macro_expansion.rs:32:5:33:17 | fn bzz_1 |
-| macro_expansion.rs:31:5:34:5 | fn bzz | 2 | macro_expansion.rs:32:5:33:17 | fn bzz_2 |
+| macro_expansion.rs:3:1:12:1 | (item with attribute macro expansion) | 0 | macro_expansion.rs:4:1:12:1 | fn foo |
+| macro_expansion.rs:3:1:12:1 | (item with attribute macro expansion) | 1 | macro_expansion.rs:4:1:12:1 | fn foo_new |
+| macro_expansion.rs:7:5:8:17 | (item with attribute macro expansion) | 0 | macro_expansion.rs:8:5:8:17 | fn inner_0 |
+| macro_expansion.rs:7:5:8:17 | (item with attribute macro expansion) | 0 | macro_expansion.rs:8:5:8:17 | fn inner_0 |
+| macro_expansion.rs:7:5:8:17 | (item with attribute macro expansion) | 1 | macro_expansion.rs:8:5:8:17 | fn inner_1 |
+| macro_expansion.rs:7:5:8:17 | (item with attribute macro expansion) | 1 | macro_expansion.rs:8:5:8:17 | fn inner_1 |
+| macro_expansion.rs:14:1:16:15 | (item with attribute macro expansion) | 0 | macro_expansion.rs:15:1:16:15 | (item with attribute macro expansion) |
+| macro_expansion.rs:14:1:16:15 | (item with attribute macro expansion) | 1 | macro_expansion.rs:15:1:16:15 | (item with attribute macro expansion) |
+| macro_expansion.rs:15:1:16:15 | (item with attribute macro expansion) | 0 | macro_expansion.rs:16:1:16:15 | fn bar_0 |
+| macro_expansion.rs:15:1:16:15 | (item with attribute macro expansion) | 0 | macro_expansion.rs:16:1:16:15 | fn bar_1 |
+| macro_expansion.rs:15:1:16:15 | (item with attribute macro expansion) | 1 | macro_expansion.rs:16:1:16:15 | fn bar_0_new |
+| macro_expansion.rs:15:1:16:15 | (item with attribute macro expansion) | 1 | macro_expansion.rs:16:1:16:15 | fn bar_1_new |
+| macro_expansion.rs:31:5:34:5 | (item with attribute macro expansion) | 0 | macro_expansion.rs:32:5:34:5 | fn bzz_0 |
+| macro_expansion.rs:31:5:34:5 | (item with attribute macro expansion) | 1 | macro_expansion.rs:32:5:34:5 | fn bzz_1 |
+| macro_expansion.rs:31:5:34:5 | (item with attribute macro expansion) | 2 | macro_expansion.rs:32:5:34:5 | fn bzz_2 |
 derive_macros
 | macro_expansion.rs:83:1:86:1 | struct MyDerive | 0 | 0 | macro_expansion.rs:84:8:85:9 | impl ...::Debug for MyDerive::<...> { ... } |
 | macro_expansion.rs:88:1:92:1 | enum MyDeriveEnum | 0 | 0 | macro_expansion.rs:89:6:91:12 | impl ...::PartialEq for MyDeriveEnum::<...> { ... } |
@@ -21,35 +21,32 @@ derive_macros
 | macro_expansion.rs:98:1:102:1 | union MyDeriveUnion | 0 | 0 | macro_expansion.rs:99:7:99:19 | Const |
 | macro_expansion.rs:98:1:102:1 | union MyDeriveUnion | 0 | 1 | macro_expansion.rs:99:7:99:19 | impl MyTrait for MyDeriveUnion { ... } |
 macro_calls
-| macro_expansion.rs:5:9:5:34 | concat!... | macro_expansion.rs:5:17:5:34 | "Hello world!" |
-| macro_expansion.rs:5:9:5:34 | concat!... | macro_expansion.rs:5:17:5:34 | "Hello world!" |
+| macro_expansion.rs:5:9:5:35 | concat!... | macro_expansion.rs:5:17:5:34 | "Hello world!" |
+| macro_expansion.rs:5:9:5:35 | concat!... | macro_expansion.rs:5:17:5:34 | "Hello world!" |
 | macro_expansion.rs:31:5:31:16 | ...::format_args_nl!... | macro_expansion.rs:31:5:31:16 | FormatArgsExpr |
 | macro_expansion.rs:31:5:31:16 | ...::format_args_nl!... | macro_expansion.rs:31:5:31:16 | FormatArgsExpr |
 | macro_expansion.rs:31:5:31:16 | ...::format_args_nl!... | macro_expansion.rs:31:5:31:16 | FormatArgsExpr |
 | macro_expansion.rs:31:5:31:16 | println!... | macro_expansion.rs:31:5:31:16 | MacroBlockExpr |
 | macro_expansion.rs:31:5:31:16 | println!... | macro_expansion.rs:31:5:31:16 | MacroBlockExpr |
 | macro_expansion.rs:31:5:31:16 | println!... | macro_expansion.rs:31:5:31:16 | MacroBlockExpr |
-| macro_expansion.rs:33:9:33:15 | hello!... | macro_expansion.rs:31:5:31:16 | MacroBlockExpr |
-| macro_expansion.rs:33:9:33:15 | hello!... | macro_expansion.rs:31:5:31:16 | MacroBlockExpr |
-| macro_expansion.rs:33:9:33:15 | hello!... | macro_expansion.rs:31:5:31:16 | MacroBlockExpr |
-| macro_expansion.rs:44:5:44:13 | def_x!... | macro_expansion.rs:44:5:44:13 | MacroItems |
+| macro_expansion.rs:33:9:33:16 | hello!... | macro_expansion.rs:31:5:31:16 | MacroBlockExpr |
+| macro_expansion.rs:33:9:33:16 | hello!... | macro_expansion.rs:31:5:31:16 | MacroBlockExpr |
+| macro_expansion.rs:33:9:33:16 | hello!... | macro_expansion.rs:31:5:31:16 | MacroBlockExpr |
+| macro_expansion.rs:44:5:44:13 | def_x!... | macro_expansion.rs:44:5:44:10 | MacroItems |
 | macro_expansion.rs:53:9:53:25 | concat!... | macro_expansion.rs:53:17:53:24 | "xy" |
 | macro_expansion.rs:55:9:58:5 | my_macro!... | macro_expansion.rs:56:9:57:13 | MacroExpr |
 | macro_expansion.rs:56:9:57:13 | ...::format_args!... | macro_expansion.rs:56:9:57:13 | FormatArgsExpr |
 | macro_expansion.rs:56:9:57:13 | format!... | macro_expansion.rs:56:9:57:13 | ...::must_use(...) |
 | macro_expansion.rs:61:1:61:33 | concat!... | macro_expansion.rs:61:1:61:33 | "Hello world!" |
 | macro_expansion.rs:61:1:61:33 | include!... | macro_expansion.rs:61:1:61:33 | MacroItems |
-| macro_expansion.rs:70:16:70:24 | my_int!... | macro_expansion.rs:70:16:70:24 | i32 |
-| macro_expansion.rs:71:12:71:20 | my_int!... | macro_expansion.rs:71:12:71:20 | i32 |
-| macro_expansion.rs:72:10:72:18 | my_int!... | macro_expansion.rs:72:10:72:18 | i32 |
-| macro_expansion.rs:76:14:76:22 | my_int!... | macro_expansion.rs:76:14:76:22 | i32 |
-| macro_expansion.rs:79:12:79:20 | my_int!... | macro_expansion.rs:79:12:79:20 | i32 |
+| macro_expansion.rs:70:16:70:24 | my_int!... | macro_expansion.rs:70:16:70:22 | i32 |
+| macro_expansion.rs:71:12:71:20 | my_int!... | macro_expansion.rs:71:12:71:18 | i32 |
+| macro_expansion.rs:72:10:72:18 | my_int!... | macro_expansion.rs:72:10:72:16 | i32 |
+| macro_expansion.rs:76:14:76:22 | my_int!... | macro_expansion.rs:76:14:76:20 | i32 |
+| macro_expansion.rs:79:12:79:20 | my_int!... | macro_expansion.rs:79:12:79:18 | i32 |
 unexpanded_macro_calls
 | included/included.rs:2:9:2:39 | concat!... |
-| macro_expansion.rs:5:9:5:35 | concat!... |
-| macro_expansion.rs:33:9:33:16 | hello!... |
 | macro_expansion.rs:56:9:56:31 | concat!... |
 | macro_expansion.rs:63:9:63:32 | include_str!... |
 warnings
-| included/included.rs:1:1:1:1 | semantic analyzer unavailable (not loaded as its own module, probably included by `!include`) |
-| macro_expansion.rs:56:9:56:31 | macro expansion failed: could not resolve macro 'concat' |
+| macro_expansion.rs:56:9:56:31 | macro expansion failed for 'concat' |
diff --git a/rust/ql/test/extractor-tests/macro-in-library/PrintAst.expected b/rust/ql/test/extractor-tests/macro-in-library/PrintAst.expected
index b8853791210..30dbc24103b 100644
--- a/rust/ql/test/extractor-tests/macro-in-library/PrintAst.expected
+++ b/rust/ql/test/extractor-tests/macro-in-library/PrintAst.expected
@@ -5,7 +5,7 @@ lib.rs:
 #    1|     getVisibility(): [Visibility] Visibility
 macro_in_library.rs:
 #    1| [SourceFile] SourceFile
-#    1|   getItem(0): [MacroCall] 
+#    1|   getItem(0): [MacroCall] (item with attribute macro expansion)
 #    2|     getAttributeMacroExpansion(): [MacroItems] MacroItems
 #    2|       getItem(0): [Function] fn foo
 #    2|         getParamList(): [ParamList] ParamList
diff --git a/rust/ql/test/extractor-tests/macro-in-library/test.expected b/rust/ql/test/extractor-tests/macro-in-library/test.expected
index 685ce3244e3..0b4b9cb5eaa 100644
--- a/rust/ql/test/extractor-tests/macro-in-library/test.expected
+++ b/rust/ql/test/extractor-tests/macro-in-library/test.expected
@@ -1,4 +1,4 @@
 macro_items
-| macro_in_library.rs:2:1:2:14 | MacroItems | 0 | macro_in_library.rs:2:1:2:14 | fn foo |
-| macro_in_library.rs:2:1:2:14 | MacroItems | 1 | macro_in_library.rs:2:1:2:14 | fn foo_new |
+| macro_in_library.rs:2:1:2:15 | MacroItems | 0 | macro_in_library.rs:2:1:2:15 | fn foo |
+| macro_in_library.rs:2:1:2:15 | MacroItems | 1 | macro_in_library.rs:2:1:2:15 | fn foo_new |
 warnings
diff --git a/rust/ql/test/extractor-tests/canonical_path_disabled/Cargo.lock b/rust/ql/test/library-tests/const_access/Cargo.lock
similarity index 100%
rename from rust/ql/test/extractor-tests/canonical_path_disabled/Cargo.lock
rename to rust/ql/test/library-tests/const_access/Cargo.lock
diff --git a/rust/ql/test/library-tests/const_access/const_access.expected b/rust/ql/test/library-tests/const_access/const_access.expected
new file mode 100644
index 00000000000..83c5022aca8
--- /dev/null
+++ b/rust/ql/test/library-tests/const_access/const_access.expected
@@ -0,0 +1,8 @@
+testFailures
+constAccess
+| main.rs:17:13:17:24 | GLOBAL_CONST | main.rs:1:1:1:29 | Const |
+| main.rs:19:13:19:24 | STRING_CONST | main.rs:2:1:2:35 | Const |
+| main.rs:21:13:21:33 | ...::ASSOC_CONST | main.rs:9:5:9:33 | Const |
+| main.rs:23:13:23:35 | ...::MODULE_CONST | main.rs:13:5:13:38 | Const |
+| main.rs:25:8:25:19 | GLOBAL_CONST | main.rs:1:1:1:29 | Const |
+| main.rs:29:16:29:36 | ...::ASSOC_CONST | main.rs:9:5:9:33 | Const |
diff --git a/rust/ql/test/library-tests/const_access/const_access.ql b/rust/ql/test/library-tests/const_access/const_access.ql
new file mode 100644
index 00000000000..b3bb7363392
--- /dev/null
+++ b/rust/ql/test/library-tests/const_access/const_access.ql
@@ -0,0 +1,21 @@
+import rust
+import utils.test.InlineExpectationsTest
+import TestUtils
+
+query predicate constAccess(ConstAccess ca, Const c) { toBeTested(ca) and c = ca.getConst() }
+
+module ConstAccessTest implements TestSig {
+  string getARelevantTag() { result = "const_access" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    exists(ConstAccess ca |
+      toBeTested(ca) and
+      location = ca.getLocation() and
+      element = ca.toString() and
+      tag = "const_access" and
+      value = ca.getConst().getName().getText()
+    )
+  }
+}
+
+import MakeTest<ConstAccessTest>
diff --git a/rust/ql/test/library-tests/const_access/main.rs b/rust/ql/test/library-tests/const_access/main.rs
new file mode 100644
index 00000000000..0cf2467d100
--- /dev/null
+++ b/rust/ql/test/library-tests/const_access/main.rs
@@ -0,0 +1,34 @@
+const GLOBAL_CONST: i32 = 42;
+const STRING_CONST: &str = "hello";
+
+struct MyStruct {
+    value: i32,
+}
+
+impl MyStruct {
+    const ASSOC_CONST: i32 = 100;
+}
+
+mod my_module {
+    pub const MODULE_CONST: i32 = 200;
+}
+
+fn use_consts() {
+    let x = GLOBAL_CONST; // $ const_access=GLOBAL_CONST
+    
+    let s = STRING_CONST; // $ const_access=STRING_CONST
+    
+    let y = MyStruct::ASSOC_CONST; // $ const_access=ASSOC_CONST
+    
+    let z = my_module::MODULE_CONST; // $ const_access=MODULE_CONST
+    
+    if GLOBAL_CONST > 0 { // $ const_access=GLOBAL_CONST
+        println!("positive");
+    }
+    
+    let arr = [MyStruct::ASSOC_CONST; 5]; // $ const_access=ASSOC_CONST
+}
+
+fn main() {
+    use_consts();
+}
diff --git a/rust/ql/test/library-tests/controlflow-unstable/Cfg.expected b/rust/ql/test/library-tests/controlflow-unstable/Cfg.expected
index 11e23459648..38fc5fe0873 100644
--- a/rust/ql/test/library-tests/controlflow-unstable/Cfg.expected
+++ b/rust/ql/test/library-tests/controlflow-unstable/Cfg.expected
@@ -13,13 +13,14 @@ edges
 | test.rs:5:67:11:5 | { ... } | test.rs:5:5:11:5 | exit fn test_and_if_let (normal) |  |
 | test.rs:6:9:10:9 | if ... {...} else {...} | test.rs:5:67:11:5 | { ... } |  |
 | test.rs:6:12:6:12 | a | test.rs:6:12:6:31 | [boolean(false)] ... && ... | false |
-| test.rs:6:12:6:12 | a | test.rs:6:17:6:31 | let ... = b | true |
+| test.rs:6:12:6:12 | a | test.rs:6:31:6:31 | b | true |
 | test.rs:6:12:6:31 | [boolean(false)] ... && ... | test.rs:9:13:9:17 | false | false |
 | test.rs:6:12:6:31 | [boolean(true)] ... && ... | test.rs:7:13:7:13 | d | true |
-| test.rs:6:17:6:31 | let ... = b | test.rs:6:31:6:31 | b |  |
-| test.rs:6:21:6:27 | Some(...) | test.rs:6:12:6:31 | [boolean(false)] ... && ... | no-match |
+| test.rs:6:17:6:31 | [boolean(false)] let ... = b | test.rs:6:12:6:31 | [boolean(false)] ... && ... | false |
+| test.rs:6:17:6:31 | [boolean(true)] let ... = b | test.rs:6:12:6:31 | [boolean(true)] ... && ... | true |
+| test.rs:6:21:6:27 | Some(...) | test.rs:6:17:6:31 | [boolean(false)] let ... = b | no-match |
 | test.rs:6:21:6:27 | Some(...) | test.rs:6:26:6:26 | d | match |
-| test.rs:6:26:6:26 | d | test.rs:6:12:6:31 | [boolean(true)] ... && ... | match |
+| test.rs:6:26:6:26 | d | test.rs:6:17:6:31 | [boolean(true)] let ... = b | match |
 | test.rs:6:26:6:26 | d | test.rs:6:26:6:26 | d |  |
 | test.rs:6:31:6:31 | b | test.rs:6:21:6:27 | Some(...) |  |
 | test.rs:6:33:8:9 | { ... } | test.rs:6:9:10:9 | if ... {...} else {...} |  |
@@ -40,13 +41,13 @@ edges
 | test.rs:13:59:21:5 | { ... } | test.rs:13:5:21:5 | exit fn test_and_if_let2 (normal) |  |
 | test.rs:14:9:20:9 | if ... {...} else {...} | test.rs:13:59:21:5 | { ... } |  |
 | test.rs:14:12:14:12 | a | test.rs:14:12:14:25 | [boolean(false)] ... && ... | false |
-| test.rs:14:12:14:12 | a | test.rs:14:17:14:25 | let ... = b | true |
+| test.rs:14:12:14:12 | a | test.rs:14:25:14:25 | b | true |
 | test.rs:14:12:14:25 | [boolean(false)] ... && ... | test.rs:14:12:15:16 | [boolean(false)] ... && ... | false |
 | test.rs:14:12:14:25 | [boolean(true)] ... && ... | test.rs:15:16:15:16 | c | true |
 | test.rs:14:12:15:16 | [boolean(false)] ... && ... | test.rs:19:13:19:17 | false | false |
 | test.rs:14:12:15:16 | [boolean(true)] ... && ... | test.rs:17:13:17:13 | d | true |
-| test.rs:14:17:14:25 | let ... = b | test.rs:14:25:14:25 | b |  |
-| test.rs:14:21:14:21 | d | test.rs:14:12:14:25 | [boolean(true)] ... && ... | match |
+| test.rs:14:17:14:25 | [boolean(true)] let ... = b | test.rs:14:12:14:25 | [boolean(true)] ... && ... | true |
+| test.rs:14:21:14:21 | d | test.rs:14:17:14:25 | [boolean(true)] let ... = b | match |
 | test.rs:14:21:14:21 | d | test.rs:14:21:14:21 | d |  |
 | test.rs:14:25:14:25 | b | test.rs:14:21:14:21 | d |  |
 | test.rs:15:16:15:16 | c | test.rs:14:12:15:16 | [boolean(false)] ... && ... | false |
diff --git a/rust/ql/test/library-tests/controlflow/BasicBlocks.expected b/rust/ql/test/library-tests/controlflow/BasicBlocks.expected
index 1b4b770c130..80357ae29f8 100644
--- a/rust/ql/test/library-tests/controlflow/BasicBlocks.expected
+++ b/rust/ql/test/library-tests/controlflow/BasicBlocks.expected
@@ -118,20 +118,29 @@ dominates
 | test.rs:91:17:91:22 | ExprStmt | test.rs:91:17:91:22 | ExprStmt |
 | test.rs:97:5:104:5 | enter fn test_while_let | test.rs:97:5:104:5 | enter fn test_while_let |
 | test.rs:97:5:104:5 | enter fn test_while_let | test.rs:99:9:103:9 | while ... { ... } |
-| test.rs:97:5:104:5 | enter fn test_while_let | test.rs:99:15:99:39 | let ... = ... |
+| test.rs:97:5:104:5 | enter fn test_while_let | test.rs:99:15:99:39 | [boolean(false)] let ... = ... |
 | test.rs:97:5:104:5 | enter fn test_while_let | test.rs:99:24:99:24 | x |
+| test.rs:97:5:104:5 | enter fn test_while_let | test.rs:99:29:99:32 | iter |
 | test.rs:97:5:104:5 | enter fn test_while_let | test.rs:100:13:102:13 | if ... {...} |
+| test.rs:97:5:104:5 | enter fn test_while_let | test.rs:100:17:100:17 | x |
 | test.rs:97:5:104:5 | enter fn test_while_let | test.rs:101:17:101:22 | ExprStmt |
 | test.rs:99:9:103:9 | while ... { ... } | test.rs:99:9:103:9 | while ... { ... } |
-| test.rs:99:15:99:39 | let ... = ... | test.rs:99:9:103:9 | while ... { ... } |
-| test.rs:99:15:99:39 | let ... = ... | test.rs:99:15:99:39 | let ... = ... |
-| test.rs:99:15:99:39 | let ... = ... | test.rs:99:24:99:24 | x |
-| test.rs:99:15:99:39 | let ... = ... | test.rs:100:13:102:13 | if ... {...} |
-| test.rs:99:15:99:39 | let ... = ... | test.rs:101:17:101:22 | ExprStmt |
+| test.rs:99:15:99:39 | [boolean(false)] let ... = ... | test.rs:99:15:99:39 | [boolean(false)] let ... = ... |
 | test.rs:99:24:99:24 | x | test.rs:99:24:99:24 | x |
 | test.rs:99:24:99:24 | x | test.rs:100:13:102:13 | if ... {...} |
+| test.rs:99:24:99:24 | x | test.rs:100:17:100:17 | x |
 | test.rs:99:24:99:24 | x | test.rs:101:17:101:22 | ExprStmt |
+| test.rs:99:29:99:32 | iter | test.rs:99:9:103:9 | while ... { ... } |
+| test.rs:99:29:99:32 | iter | test.rs:99:15:99:39 | [boolean(false)] let ... = ... |
+| test.rs:99:29:99:32 | iter | test.rs:99:24:99:24 | x |
+| test.rs:99:29:99:32 | iter | test.rs:99:29:99:32 | iter |
+| test.rs:99:29:99:32 | iter | test.rs:100:13:102:13 | if ... {...} |
+| test.rs:99:29:99:32 | iter | test.rs:100:17:100:17 | x |
+| test.rs:99:29:99:32 | iter | test.rs:101:17:101:22 | ExprStmt |
 | test.rs:100:13:102:13 | if ... {...} | test.rs:100:13:102:13 | if ... {...} |
+| test.rs:100:17:100:17 | x | test.rs:100:13:102:13 | if ... {...} |
+| test.rs:100:17:100:17 | x | test.rs:100:17:100:17 | x |
+| test.rs:100:17:100:17 | x | test.rs:101:17:101:22 | ExprStmt |
 | test.rs:101:17:101:22 | ExprStmt | test.rs:101:17:101:22 | ExprStmt |
 | test.rs:106:5:113:5 | enter fn test_for | test.rs:106:5:113:5 | enter fn test_for |
 | test.rs:106:5:113:5 | enter fn test_for | test.rs:107:9:112:9 | for ... in ... { ... } |
@@ -167,18 +176,30 @@ dominates
 | test.rs:140:13:140:19 | ExprStmt | test.rs:140:13:140:19 | ExprStmt |
 | test.rs:145:5:151:5 | enter fn test_if_let_else | test.rs:145:5:151:5 | enter fn test_if_let_else |
 | test.rs:145:5:151:5 | enter fn test_if_let_else | test.rs:146:9:150:9 | if ... {...} else {...} |
+| test.rs:145:5:151:5 | enter fn test_if_let_else | test.rs:146:12:146:26 | [boolean(false)] let ... = a |
 | test.rs:145:5:151:5 | enter fn test_if_let_else | test.rs:146:21:146:21 | n |
+| test.rs:145:5:151:5 | enter fn test_if_let_else | test.rs:147:13:147:13 | n |
 | test.rs:145:5:151:5 | enter fn test_if_let_else | test.rs:149:13:149:13 | 0 |
 | test.rs:146:9:150:9 | if ... {...} else {...} | test.rs:146:9:150:9 | if ... {...} else {...} |
+| test.rs:146:12:146:26 | [boolean(false)] let ... = a | test.rs:146:12:146:26 | [boolean(false)] let ... = a |
+| test.rs:146:12:146:26 | [boolean(false)] let ... = a | test.rs:149:13:149:13 | 0 |
 | test.rs:146:21:146:21 | n | test.rs:146:21:146:21 | n |
+| test.rs:146:21:146:21 | n | test.rs:147:13:147:13 | n |
+| test.rs:147:13:147:13 | n | test.rs:147:13:147:13 | n |
 | test.rs:149:13:149:13 | 0 | test.rs:149:13:149:13 | 0 |
 | test.rs:153:5:158:5 | enter fn test_if_let | test.rs:153:5:158:5 | enter fn test_if_let |
 | test.rs:153:5:158:5 | enter fn test_if_let | test.rs:153:5:158:5 | exit fn test_if_let (normal) |
 | test.rs:153:5:158:5 | enter fn test_if_let | test.rs:154:9:156:9 | if ... {...} |
+| test.rs:153:5:158:5 | enter fn test_if_let | test.rs:154:12:154:26 | [boolean(false)] let ... = a |
 | test.rs:153:5:158:5 | enter fn test_if_let | test.rs:154:21:154:21 | n |
+| test.rs:153:5:158:5 | enter fn test_if_let | test.rs:155:13:155:21 | ExprStmt |
 | test.rs:153:5:158:5 | exit fn test_if_let (normal) | test.rs:153:5:158:5 | exit fn test_if_let (normal) |
 | test.rs:154:9:156:9 | if ... {...} | test.rs:154:9:156:9 | if ... {...} |
+| test.rs:154:12:154:26 | [boolean(false)] let ... = a | test.rs:154:9:156:9 | if ... {...} |
+| test.rs:154:12:154:26 | [boolean(false)] let ... = a | test.rs:154:12:154:26 | [boolean(false)] let ... = a |
 | test.rs:154:21:154:21 | n | test.rs:154:21:154:21 | n |
+| test.rs:154:21:154:21 | n | test.rs:155:13:155:21 | ExprStmt |
+| test.rs:155:13:155:21 | ExprStmt | test.rs:155:13:155:21 | ExprStmt |
 | test.rs:160:5:166:5 | enter fn test_nested_if | test.rs:160:5:166:5 | enter fn test_nested_if |
 | test.rs:160:5:166:5 | enter fn test_nested_if | test.rs:161:9:165:9 | if ... {...} else {...} |
 | test.rs:160:5:166:5 | enter fn test_nested_if | test.rs:161:13:161:48 | [boolean(false)] if ... {...} else {...} |
@@ -672,14 +693,14 @@ dominates
 | test.rs:443:26:443:36 | Some(...) | test.rs:443:26:443:36 | Some(...) |
 | test.rs:453:5:458:5 | enter fn or_pattern_3 | test.rs:453:5:458:5 | enter fn or_pattern_3 |
 | test.rs:453:5:458:5 | enter fn or_pattern_3 | test.rs:454:9:457:9 | match a { ... } |
-| test.rs:453:5:458:5 | enter fn or_pattern_3 | test.rs:455:13:455:25 | 2 |
-| test.rs:453:5:458:5 | enter fn or_pattern_3 | test.rs:455:13:455:25 | [match(false)] 1 \| 2 |
-| test.rs:453:5:458:5 | enter fn or_pattern_3 | test.rs:455:13:455:25 | [match(true)] 1 \| 2 |
+| test.rs:453:5:458:5 | enter fn or_pattern_3 | test.rs:455:13:455:23 | 2 |
+| test.rs:453:5:458:5 | enter fn or_pattern_3 | test.rs:455:13:455:23 | [match(false)] 1 \| 2 |
+| test.rs:453:5:458:5 | enter fn or_pattern_3 | test.rs:455:13:455:23 | [match(true)] 1 \| 2 |
 | test.rs:454:9:457:9 | match a { ... } | test.rs:454:9:457:9 | match a { ... } |
-| test.rs:455:13:455:25 | 2 | test.rs:455:13:455:25 | 2 |
-| test.rs:455:13:455:25 | 2 | test.rs:455:13:455:25 | [match(false)] 1 \| 2 |
-| test.rs:455:13:455:25 | [match(false)] 1 \| 2 | test.rs:455:13:455:25 | [match(false)] 1 \| 2 |
-| test.rs:455:13:455:25 | [match(true)] 1 \| 2 | test.rs:455:13:455:25 | [match(true)] 1 \| 2 |
+| test.rs:455:13:455:23 | 2 | test.rs:455:13:455:23 | 2 |
+| test.rs:455:13:455:23 | 2 | test.rs:455:13:455:23 | [match(false)] 1 \| 2 |
+| test.rs:455:13:455:23 | [match(false)] 1 \| 2 | test.rs:455:13:455:23 | [match(false)] 1 \| 2 |
+| test.rs:455:13:455:23 | [match(true)] 1 \| 2 | test.rs:455:13:455:23 | [match(true)] 1 \| 2 |
 | test.rs:460:5:465:5 | enter fn irrefutable_pattern_and_dead_code | test.rs:460:5:465:5 | enter fn irrefutable_pattern_and_dead_code |
 | test.rs:460:5:465:5 | enter fn irrefutable_pattern_and_dead_code | test.rs:461:9:464:9 | match pair { ... } |
 | test.rs:460:5:465:5 | enter fn irrefutable_pattern_and_dead_code | test.rs:462:32:462:32 | _ |
@@ -717,20 +738,20 @@ dominates
 | test.rs:513:17:513:41 | ExprStmt | test.rs:513:17:513:41 | ExprStmt |
 | test.rs:523:5:525:5 | enter fn add_two | test.rs:523:5:525:5 | enter fn add_two |
 | test.rs:529:5:537:5 | enter fn const_block_assert | test.rs:529:5:537:5 | enter fn const_block_assert |
-| test.rs:529:5:537:5 | enter fn const_block_assert | test.rs:533:13:533:49 | ExprStmt |
+| test.rs:529:5:537:5 | enter fn const_block_assert | test.rs:533:13:533:19 | ExprStmt |
 | test.rs:529:5:537:5 | enter fn const_block_assert | test.rs:533:21:533:48 | [boolean(false)] ! ... |
 | test.rs:529:5:537:5 | enter fn const_block_assert | test.rs:533:21:533:48 | [boolean(true)] ! ... |
 | test.rs:529:5:537:5 | enter fn const_block_assert | test.rs:533:21:533:48 | if ... {...} |
-| test.rs:533:13:533:49 | ExprStmt | test.rs:533:13:533:49 | ExprStmt |
-| test.rs:533:13:533:49 | enter fn panic_cold_explicit | test.rs:533:13:533:49 | enter fn panic_cold_explicit |
+| test.rs:533:13:533:19 | ExprStmt | test.rs:533:13:533:19 | ExprStmt |
+| test.rs:533:13:533:19 | enter fn panic_cold_explicit | test.rs:533:13:533:19 | enter fn panic_cold_explicit |
 | test.rs:533:21:533:48 | [boolean(false)] ! ... | test.rs:533:21:533:48 | [boolean(false)] ! ... |
-| test.rs:533:21:533:48 | [boolean(true)] ! ... | test.rs:533:13:533:49 | ExprStmt |
+| test.rs:533:21:533:48 | [boolean(true)] ! ... | test.rs:533:13:533:19 | ExprStmt |
 | test.rs:533:21:533:48 | [boolean(true)] ! ... | test.rs:533:21:533:48 | [boolean(true)] ! ... |
 | test.rs:533:21:533:48 | if ... {...} | test.rs:533:21:533:48 | if ... {...} |
 | test.rs:539:5:548:5 | enter fn const_block_panic | test.rs:539:5:548:5 | enter fn const_block_panic |
 | test.rs:539:5:548:5 | enter fn const_block_panic | test.rs:541:9:546:9 | if false {...} |
 | test.rs:541:9:546:9 | if false {...} | test.rs:541:9:546:9 | if false {...} |
-| test.rs:544:17:544:24 | enter fn panic_cold_explicit | test.rs:544:17:544:24 | enter fn panic_cold_explicit |
+| test.rs:544:17:544:22 | enter fn panic_cold_explicit | test.rs:544:17:544:22 | enter fn panic_cold_explicit |
 | test.rs:551:1:556:1 | enter fn dead_code | test.rs:551:1:556:1 | enter fn dead_code |
 | test.rs:551:1:556:1 | enter fn dead_code | test.rs:553:9:553:17 | ExprStmt |
 | test.rs:553:9:553:17 | ExprStmt | test.rs:553:9:553:17 | ExprStmt |
@@ -847,15 +868,20 @@ postDominance
 | test.rs:97:5:104:5 | enter fn test_while_let | test.rs:97:5:104:5 | enter fn test_while_let |
 | test.rs:99:9:103:9 | while ... { ... } | test.rs:97:5:104:5 | enter fn test_while_let |
 | test.rs:99:9:103:9 | while ... { ... } | test.rs:99:9:103:9 | while ... { ... } |
-| test.rs:99:9:103:9 | while ... { ... } | test.rs:99:15:99:39 | let ... = ... |
+| test.rs:99:9:103:9 | while ... { ... } | test.rs:99:15:99:39 | [boolean(false)] let ... = ... |
 | test.rs:99:9:103:9 | while ... { ... } | test.rs:99:24:99:24 | x |
+| test.rs:99:9:103:9 | while ... { ... } | test.rs:99:29:99:32 | iter |
 | test.rs:99:9:103:9 | while ... { ... } | test.rs:100:13:102:13 | if ... {...} |
+| test.rs:99:9:103:9 | while ... { ... } | test.rs:100:17:100:17 | x |
 | test.rs:99:9:103:9 | while ... { ... } | test.rs:101:17:101:22 | ExprStmt |
-| test.rs:99:15:99:39 | let ... = ... | test.rs:97:5:104:5 | enter fn test_while_let |
-| test.rs:99:15:99:39 | let ... = ... | test.rs:99:15:99:39 | let ... = ... |
-| test.rs:99:15:99:39 | let ... = ... | test.rs:100:13:102:13 | if ... {...} |
+| test.rs:99:15:99:39 | [boolean(false)] let ... = ... | test.rs:99:15:99:39 | [boolean(false)] let ... = ... |
 | test.rs:99:24:99:24 | x | test.rs:99:24:99:24 | x |
+| test.rs:99:29:99:32 | iter | test.rs:97:5:104:5 | enter fn test_while_let |
+| test.rs:99:29:99:32 | iter | test.rs:99:29:99:32 | iter |
+| test.rs:99:29:99:32 | iter | test.rs:100:13:102:13 | if ... {...} |
 | test.rs:100:13:102:13 | if ... {...} | test.rs:100:13:102:13 | if ... {...} |
+| test.rs:100:17:100:17 | x | test.rs:99:24:99:24 | x |
+| test.rs:100:17:100:17 | x | test.rs:100:17:100:17 | x |
 | test.rs:101:17:101:22 | ExprStmt | test.rs:101:17:101:22 | ExprStmt |
 | test.rs:106:5:113:5 | enter fn test_for | test.rs:106:5:113:5 | enter fn test_for |
 | test.rs:107:9:112:9 | for ... in ... { ... } | test.rs:106:5:113:5 | enter fn test_for |
@@ -888,17 +914,29 @@ postDominance
 | test.rs:145:5:151:5 | enter fn test_if_let_else | test.rs:145:5:151:5 | enter fn test_if_let_else |
 | test.rs:146:9:150:9 | if ... {...} else {...} | test.rs:145:5:151:5 | enter fn test_if_let_else |
 | test.rs:146:9:150:9 | if ... {...} else {...} | test.rs:146:9:150:9 | if ... {...} else {...} |
+| test.rs:146:9:150:9 | if ... {...} else {...} | test.rs:146:12:146:26 | [boolean(false)] let ... = a |
 | test.rs:146:9:150:9 | if ... {...} else {...} | test.rs:146:21:146:21 | n |
+| test.rs:146:9:150:9 | if ... {...} else {...} | test.rs:147:13:147:13 | n |
 | test.rs:146:9:150:9 | if ... {...} else {...} | test.rs:149:13:149:13 | 0 |
+| test.rs:146:12:146:26 | [boolean(false)] let ... = a | test.rs:146:12:146:26 | [boolean(false)] let ... = a |
 | test.rs:146:21:146:21 | n | test.rs:146:21:146:21 | n |
+| test.rs:147:13:147:13 | n | test.rs:146:21:146:21 | n |
+| test.rs:147:13:147:13 | n | test.rs:147:13:147:13 | n |
+| test.rs:149:13:149:13 | 0 | test.rs:146:12:146:26 | [boolean(false)] let ... = a |
 | test.rs:149:13:149:13 | 0 | test.rs:149:13:149:13 | 0 |
 | test.rs:153:5:158:5 | enter fn test_if_let | test.rs:153:5:158:5 | enter fn test_if_let |
 | test.rs:153:5:158:5 | exit fn test_if_let (normal) | test.rs:153:5:158:5 | enter fn test_if_let |
 | test.rs:153:5:158:5 | exit fn test_if_let (normal) | test.rs:153:5:158:5 | exit fn test_if_let (normal) |
 | test.rs:153:5:158:5 | exit fn test_if_let (normal) | test.rs:154:9:156:9 | if ... {...} |
+| test.rs:153:5:158:5 | exit fn test_if_let (normal) | test.rs:154:12:154:26 | [boolean(false)] let ... = a |
 | test.rs:153:5:158:5 | exit fn test_if_let (normal) | test.rs:154:21:154:21 | n |
+| test.rs:153:5:158:5 | exit fn test_if_let (normal) | test.rs:155:13:155:21 | ExprStmt |
 | test.rs:154:9:156:9 | if ... {...} | test.rs:154:9:156:9 | if ... {...} |
+| test.rs:154:9:156:9 | if ... {...} | test.rs:154:12:154:26 | [boolean(false)] let ... = a |
+| test.rs:154:12:154:26 | [boolean(false)] let ... = a | test.rs:154:12:154:26 | [boolean(false)] let ... = a |
 | test.rs:154:21:154:21 | n | test.rs:154:21:154:21 | n |
+| test.rs:155:13:155:21 | ExprStmt | test.rs:154:21:154:21 | n |
+| test.rs:155:13:155:21 | ExprStmt | test.rs:155:13:155:21 | ExprStmt |
 | test.rs:160:5:166:5 | enter fn test_nested_if | test.rs:160:5:166:5 | enter fn test_nested_if |
 | test.rs:161:9:165:9 | if ... {...} else {...} | test.rs:160:5:166:5 | enter fn test_nested_if |
 | test.rs:161:9:165:9 | if ... {...} else {...} | test.rs:161:9:165:9 | if ... {...} else {...} |
@@ -1344,12 +1382,12 @@ postDominance
 | test.rs:453:5:458:5 | enter fn or_pattern_3 | test.rs:453:5:458:5 | enter fn or_pattern_3 |
 | test.rs:454:9:457:9 | match a { ... } | test.rs:453:5:458:5 | enter fn or_pattern_3 |
 | test.rs:454:9:457:9 | match a { ... } | test.rs:454:9:457:9 | match a { ... } |
-| test.rs:454:9:457:9 | match a { ... } | test.rs:455:13:455:25 | 2 |
-| test.rs:454:9:457:9 | match a { ... } | test.rs:455:13:455:25 | [match(false)] 1 \| 2 |
-| test.rs:454:9:457:9 | match a { ... } | test.rs:455:13:455:25 | [match(true)] 1 \| 2 |
-| test.rs:455:13:455:25 | 2 | test.rs:455:13:455:25 | 2 |
-| test.rs:455:13:455:25 | [match(false)] 1 \| 2 | test.rs:455:13:455:25 | [match(false)] 1 \| 2 |
-| test.rs:455:13:455:25 | [match(true)] 1 \| 2 | test.rs:455:13:455:25 | [match(true)] 1 \| 2 |
+| test.rs:454:9:457:9 | match a { ... } | test.rs:455:13:455:23 | 2 |
+| test.rs:454:9:457:9 | match a { ... } | test.rs:455:13:455:23 | [match(false)] 1 \| 2 |
+| test.rs:454:9:457:9 | match a { ... } | test.rs:455:13:455:23 | [match(true)] 1 \| 2 |
+| test.rs:455:13:455:23 | 2 | test.rs:455:13:455:23 | 2 |
+| test.rs:455:13:455:23 | [match(false)] 1 \| 2 | test.rs:455:13:455:23 | [match(false)] 1 \| 2 |
+| test.rs:455:13:455:23 | [match(true)] 1 \| 2 | test.rs:455:13:455:23 | [match(true)] 1 \| 2 |
 | test.rs:460:5:465:5 | enter fn irrefutable_pattern_and_dead_code | test.rs:460:5:465:5 | enter fn irrefutable_pattern_and_dead_code |
 | test.rs:461:9:464:9 | match pair { ... } | test.rs:460:5:465:5 | enter fn irrefutable_pattern_and_dead_code |
 | test.rs:461:9:464:9 | match pair { ... } | test.rs:461:9:464:9 | match pair { ... } |
@@ -1384,20 +1422,20 @@ postDominance
 | test.rs:513:17:513:41 | ExprStmt | test.rs:513:17:513:41 | ExprStmt |
 | test.rs:523:5:525:5 | enter fn add_two | test.rs:523:5:525:5 | enter fn add_two |
 | test.rs:529:5:537:5 | enter fn const_block_assert | test.rs:529:5:537:5 | enter fn const_block_assert |
-| test.rs:533:13:533:49 | ExprStmt | test.rs:533:13:533:49 | ExprStmt |
-| test.rs:533:13:533:49 | ExprStmt | test.rs:533:21:533:48 | [boolean(true)] ! ... |
-| test.rs:533:13:533:49 | enter fn panic_cold_explicit | test.rs:533:13:533:49 | enter fn panic_cold_explicit |
+| test.rs:533:13:533:19 | ExprStmt | test.rs:533:13:533:19 | ExprStmt |
+| test.rs:533:13:533:19 | ExprStmt | test.rs:533:21:533:48 | [boolean(true)] ! ... |
+| test.rs:533:13:533:19 | enter fn panic_cold_explicit | test.rs:533:13:533:19 | enter fn panic_cold_explicit |
 | test.rs:533:21:533:48 | [boolean(false)] ! ... | test.rs:533:21:533:48 | [boolean(false)] ! ... |
 | test.rs:533:21:533:48 | [boolean(true)] ! ... | test.rs:533:21:533:48 | [boolean(true)] ! ... |
 | test.rs:533:21:533:48 | if ... {...} | test.rs:529:5:537:5 | enter fn const_block_assert |
-| test.rs:533:21:533:48 | if ... {...} | test.rs:533:13:533:49 | ExprStmt |
+| test.rs:533:21:533:48 | if ... {...} | test.rs:533:13:533:19 | ExprStmt |
 | test.rs:533:21:533:48 | if ... {...} | test.rs:533:21:533:48 | [boolean(false)] ! ... |
 | test.rs:533:21:533:48 | if ... {...} | test.rs:533:21:533:48 | [boolean(true)] ! ... |
 | test.rs:533:21:533:48 | if ... {...} | test.rs:533:21:533:48 | if ... {...} |
 | test.rs:539:5:548:5 | enter fn const_block_panic | test.rs:539:5:548:5 | enter fn const_block_panic |
 | test.rs:541:9:546:9 | if false {...} | test.rs:539:5:548:5 | enter fn const_block_panic |
 | test.rs:541:9:546:9 | if false {...} | test.rs:541:9:546:9 | if false {...} |
-| test.rs:544:17:544:24 | enter fn panic_cold_explicit | test.rs:544:17:544:24 | enter fn panic_cold_explicit |
+| test.rs:544:17:544:22 | enter fn panic_cold_explicit | test.rs:544:17:544:22 | enter fn panic_cold_explicit |
 | test.rs:551:1:556:1 | enter fn dead_code | test.rs:551:1:556:1 | enter fn dead_code |
 | test.rs:553:9:553:17 | ExprStmt | test.rs:551:1:556:1 | enter fn dead_code |
 | test.rs:553:9:553:17 | ExprStmt | test.rs:553:9:553:17 | ExprStmt |
@@ -1462,11 +1500,13 @@ immediateDominator
 | test.rs:89:13:89:14 | ExprStmt | test.rs:88:15:88:15 | b |
 | test.rs:90:13:92:13 | if ... {...} | test.rs:89:13:89:14 | ExprStmt |
 | test.rs:91:17:91:22 | ExprStmt | test.rs:89:13:89:14 | ExprStmt |
-| test.rs:99:9:103:9 | while ... { ... } | test.rs:99:15:99:39 | let ... = ... |
-| test.rs:99:15:99:39 | let ... = ... | test.rs:97:5:104:5 | enter fn test_while_let |
-| test.rs:99:24:99:24 | x | test.rs:99:15:99:39 | let ... = ... |
-| test.rs:100:13:102:13 | if ... {...} | test.rs:99:24:99:24 | x |
-| test.rs:101:17:101:22 | ExprStmt | test.rs:99:24:99:24 | x |
+| test.rs:99:9:103:9 | while ... { ... } | test.rs:99:29:99:32 | iter |
+| test.rs:99:15:99:39 | [boolean(false)] let ... = ... | test.rs:99:29:99:32 | iter |
+| test.rs:99:24:99:24 | x | test.rs:99:29:99:32 | iter |
+| test.rs:99:29:99:32 | iter | test.rs:97:5:104:5 | enter fn test_while_let |
+| test.rs:100:13:102:13 | if ... {...} | test.rs:100:17:100:17 | x |
+| test.rs:100:17:100:17 | x | test.rs:99:24:99:24 | x |
+| test.rs:101:17:101:22 | ExprStmt | test.rs:100:17:100:17 | x |
 | test.rs:107:9:112:9 | for ... in ... { ... } | test.rs:107:13:107:13 | i |
 | test.rs:107:13:107:13 | i | test.rs:106:5:113:5 | enter fn test_for |
 | test.rs:108:13:110:13 | ExprStmt | test.rs:107:13:107:13 | i |
@@ -1478,11 +1518,15 @@ immediateDominator
 | test.rs:139:9:141:9 | if b {...} | test.rs:137:5:143:5 | enter fn test_if_without_else |
 | test.rs:140:13:140:19 | ExprStmt | test.rs:137:5:143:5 | enter fn test_if_without_else |
 | test.rs:146:9:150:9 | if ... {...} else {...} | test.rs:145:5:151:5 | enter fn test_if_let_else |
+| test.rs:146:12:146:26 | [boolean(false)] let ... = a | test.rs:145:5:151:5 | enter fn test_if_let_else |
 | test.rs:146:21:146:21 | n | test.rs:145:5:151:5 | enter fn test_if_let_else |
-| test.rs:149:13:149:13 | 0 | test.rs:145:5:151:5 | enter fn test_if_let_else |
+| test.rs:147:13:147:13 | n | test.rs:146:21:146:21 | n |
+| test.rs:149:13:149:13 | 0 | test.rs:146:12:146:26 | [boolean(false)] let ... = a |
 | test.rs:153:5:158:5 | exit fn test_if_let (normal) | test.rs:153:5:158:5 | enter fn test_if_let |
-| test.rs:154:9:156:9 | if ... {...} | test.rs:153:5:158:5 | enter fn test_if_let |
+| test.rs:154:9:156:9 | if ... {...} | test.rs:154:12:154:26 | [boolean(false)] let ... = a |
+| test.rs:154:12:154:26 | [boolean(false)] let ... = a | test.rs:153:5:158:5 | enter fn test_if_let |
 | test.rs:154:21:154:21 | n | test.rs:153:5:158:5 | enter fn test_if_let |
+| test.rs:155:13:155:21 | ExprStmt | test.rs:154:21:154:21 | n |
 | test.rs:161:9:165:9 | if ... {...} else {...} | test.rs:160:5:166:5 | enter fn test_nested_if |
 | test.rs:161:13:161:48 | [boolean(false)] if ... {...} else {...} | test.rs:160:5:166:5 | enter fn test_nested_if |
 | test.rs:161:13:161:48 | [boolean(true)] if ... {...} else {...} | test.rs:160:5:166:5 | enter fn test_nested_if |
@@ -1654,9 +1698,9 @@ immediateDominator
 | test.rs:443:18:443:21 | true | test.rs:443:13:443:22 | Some(...) |
 | test.rs:443:26:443:36 | Some(...) | test.rs:443:13:443:22 | Some(...) |
 | test.rs:454:9:457:9 | match a { ... } | test.rs:453:5:458:5 | enter fn or_pattern_3 |
-| test.rs:455:13:455:25 | 2 | test.rs:453:5:458:5 | enter fn or_pattern_3 |
-| test.rs:455:13:455:25 | [match(false)] 1 \| 2 | test.rs:455:13:455:25 | 2 |
-| test.rs:455:13:455:25 | [match(true)] 1 \| 2 | test.rs:453:5:458:5 | enter fn or_pattern_3 |
+| test.rs:455:13:455:23 | 2 | test.rs:453:5:458:5 | enter fn or_pattern_3 |
+| test.rs:455:13:455:23 | [match(false)] 1 \| 2 | test.rs:455:13:455:23 | 2 |
+| test.rs:455:13:455:23 | [match(true)] 1 \| 2 | test.rs:453:5:458:5 | enter fn or_pattern_3 |
 | test.rs:461:9:464:9 | match pair { ... } | test.rs:460:5:465:5 | enter fn irrefutable_pattern_and_dead_code |
 | test.rs:462:32:462:32 | _ | test.rs:460:5:465:5 | enter fn irrefutable_pattern_and_dead_code |
 | test.rs:463:13:463:13 | _ | test.rs:460:5:465:5 | enter fn irrefutable_pattern_and_dead_code |
@@ -1669,7 +1713,7 @@ immediateDominator
 | test.rs:511:28:516:9 | exit { ... } (normal) | test.rs:511:28:516:9 | enter { ... } |
 | test.rs:512:13:514:13 | if b {...} | test.rs:511:28:516:9 | enter { ... } |
 | test.rs:513:17:513:41 | ExprStmt | test.rs:511:28:516:9 | enter { ... } |
-| test.rs:533:13:533:49 | ExprStmt | test.rs:533:21:533:48 | [boolean(true)] ! ... |
+| test.rs:533:13:533:19 | ExprStmt | test.rs:533:21:533:48 | [boolean(true)] ! ... |
 | test.rs:533:21:533:48 | [boolean(false)] ! ... | test.rs:529:5:537:5 | enter fn const_block_assert |
 | test.rs:533:21:533:48 | [boolean(true)] ! ... | test.rs:529:5:537:5 | enter fn const_block_assert |
 | test.rs:533:21:533:48 | if ... {...} | test.rs:529:5:537:5 | enter fn const_block_assert |
@@ -1721,13 +1765,20 @@ controls
 | test.rs:88:15:88:15 | b | test.rs:91:17:91:22 | ExprStmt | true |
 | test.rs:89:13:89:14 | ExprStmt | test.rs:90:13:92:13 | if ... {...} | false |
 | test.rs:89:13:89:14 | ExprStmt | test.rs:91:17:91:22 | ExprStmt | true |
-| test.rs:99:24:99:24 | x | test.rs:100:13:102:13 | if ... {...} | false |
+| test.rs:99:24:99:24 | x | test.rs:100:13:102:13 | if ... {...} | true |
+| test.rs:99:24:99:24 | x | test.rs:100:17:100:17 | x | true |
 | test.rs:99:24:99:24 | x | test.rs:101:17:101:22 | ExprStmt | true |
+| test.rs:100:17:100:17 | x | test.rs:100:13:102:13 | if ... {...} | false |
+| test.rs:100:17:100:17 | x | test.rs:101:17:101:22 | ExprStmt | true |
 | test.rs:108:13:110:13 | ExprStmt | test.rs:108:13:110:13 | if ... {...} | false |
 | test.rs:108:13:110:13 | ExprStmt | test.rs:109:17:109:22 | ExprStmt | true |
 | test.rs:129:5:135:5 | enter fn test_if_else | test.rs:131:13:131:13 | 0 | true |
 | test.rs:129:5:135:5 | enter fn test_if_else | test.rs:133:13:133:13 | n | false |
 | test.rs:137:5:143:5 | enter fn test_if_without_else | test.rs:140:13:140:19 | ExprStmt | true |
+| test.rs:146:12:146:26 | [boolean(false)] let ... = a | test.rs:149:13:149:13 | 0 | false |
+| test.rs:146:21:146:21 | n | test.rs:147:13:147:13 | n | true |
+| test.rs:154:12:154:26 | [boolean(false)] let ... = a | test.rs:154:9:156:9 | if ... {...} | false |
+| test.rs:154:21:154:21 | n | test.rs:155:13:155:21 | ExprStmt | true |
 | test.rs:160:5:166:5 | enter fn test_nested_if | test.rs:161:22:161:32 | [boolean(false)] { ... } | true |
 | test.rs:160:5:166:5 | enter fn test_nested_if | test.rs:161:22:161:32 | [boolean(true)] { ... } | true |
 | test.rs:160:5:166:5 | enter fn test_nested_if | test.rs:161:24:161:24 | a | true |
@@ -1874,10 +1925,10 @@ controls
 | test.rs:347:18:347:18 | a | test.rs:349:15:349:18 | cond | true |
 | test.rs:511:28:516:9 | enter { ... } | test.rs:512:13:514:13 | if b {...} | false |
 | test.rs:511:28:516:9 | enter { ... } | test.rs:513:17:513:41 | ExprStmt | true |
-| test.rs:529:5:537:5 | enter fn const_block_assert | test.rs:533:13:533:49 | ExprStmt | false |
+| test.rs:529:5:537:5 | enter fn const_block_assert | test.rs:533:13:533:19 | ExprStmt | false |
 | test.rs:529:5:537:5 | enter fn const_block_assert | test.rs:533:21:533:48 | [boolean(false)] ! ... | true |
 | test.rs:529:5:537:5 | enter fn const_block_assert | test.rs:533:21:533:48 | [boolean(true)] ! ... | false |
-| test.rs:533:21:533:48 | [boolean(true)] ! ... | test.rs:533:13:533:49 | ExprStmt | true |
+| test.rs:533:21:533:48 | [boolean(true)] ! ... | test.rs:533:13:533:19 | ExprStmt | true |
 | test.rs:539:5:548:5 | enter fn const_block_panic | test.rs:541:9:546:9 | if false {...} | false |
 | test.rs:551:1:556:1 | enter fn dead_code | test.rs:553:9:553:17 | ExprStmt | true |
 | test.rs:568:1:582:1 | enter fn labelled_block1 | test.rs:571:9:573:9 | if ... {...} | false |
@@ -1911,14 +1962,20 @@ successor
 | test.rs:88:15:88:15 | b | test.rs:89:13:89:14 | ExprStmt | true |
 | test.rs:89:13:89:14 | ExprStmt | test.rs:90:13:92:13 | if ... {...} | false |
 | test.rs:89:13:89:14 | ExprStmt | test.rs:91:17:91:22 | ExprStmt | true |
-| test.rs:99:24:99:24 | x | test.rs:100:13:102:13 | if ... {...} | false |
-| test.rs:99:24:99:24 | x | test.rs:101:17:101:22 | ExprStmt | true |
+| test.rs:99:15:99:39 | [boolean(false)] let ... = ... | test.rs:99:9:103:9 | while ... { ... } | false |
+| test.rs:99:24:99:24 | x | test.rs:100:17:100:17 | x | true |
+| test.rs:100:17:100:17 | x | test.rs:100:13:102:13 | if ... {...} | false |
+| test.rs:100:17:100:17 | x | test.rs:101:17:101:22 | ExprStmt | true |
 | test.rs:108:13:110:13 | ExprStmt | test.rs:108:13:110:13 | if ... {...} | false |
 | test.rs:108:13:110:13 | ExprStmt | test.rs:109:17:109:22 | ExprStmt | true |
 | test.rs:129:5:135:5 | enter fn test_if_else | test.rs:131:13:131:13 | 0 | true |
 | test.rs:129:5:135:5 | enter fn test_if_else | test.rs:133:13:133:13 | n | false |
 | test.rs:137:5:143:5 | enter fn test_if_without_else | test.rs:139:9:141:9 | if b {...} | false |
 | test.rs:137:5:143:5 | enter fn test_if_without_else | test.rs:140:13:140:19 | ExprStmt | true |
+| test.rs:146:12:146:26 | [boolean(false)] let ... = a | test.rs:149:13:149:13 | 0 | false |
+| test.rs:146:21:146:21 | n | test.rs:147:13:147:13 | n | true |
+| test.rs:154:12:154:26 | [boolean(false)] let ... = a | test.rs:154:9:156:9 | if ... {...} | false |
+| test.rs:154:21:154:21 | n | test.rs:155:13:155:21 | ExprStmt | true |
 | test.rs:160:5:166:5 | enter fn test_nested_if | test.rs:161:24:161:24 | a | true |
 | test.rs:160:5:166:5 | enter fn test_nested_if | test.rs:161:41:161:41 | a | false |
 | test.rs:161:13:161:48 | [boolean(false)] if ... {...} else {...} | test.rs:164:13:164:13 | 0 | false |
@@ -2026,7 +2083,7 @@ successor
 | test.rs:529:5:537:5 | enter fn const_block_assert | test.rs:533:21:533:48 | [boolean(false)] ! ... | true |
 | test.rs:529:5:537:5 | enter fn const_block_assert | test.rs:533:21:533:48 | [boolean(true)] ! ... | false |
 | test.rs:533:21:533:48 | [boolean(false)] ! ... | test.rs:533:21:533:48 | if ... {...} | false |
-| test.rs:533:21:533:48 | [boolean(true)] ! ... | test.rs:533:13:533:49 | ExprStmt | true |
+| test.rs:533:21:533:48 | [boolean(true)] ! ... | test.rs:533:13:533:19 | ExprStmt | true |
 | test.rs:539:5:548:5 | enter fn const_block_panic | test.rs:541:9:546:9 | if false {...} | false |
 | test.rs:551:1:556:1 | enter fn dead_code | test.rs:553:9:553:17 | ExprStmt | true |
 | test.rs:568:1:582:1 | enter fn labelled_block1 | test.rs:571:9:573:9 | if ... {...} | false |
@@ -2058,10 +2115,10 @@ joinBlockPredecessor
 | test.rs:88:9:94:9 | while b { ... } | test.rs:91:17:91:22 | ExprStmt | 1 |
 | test.rs:88:15:88:15 | b | test.rs:86:5:95:5 | enter fn test_while | 1 |
 | test.rs:88:15:88:15 | b | test.rs:90:13:92:13 | if ... {...} | 0 |
-| test.rs:99:9:103:9 | while ... { ... } | test.rs:99:15:99:39 | let ... = ... | 0 |
+| test.rs:99:9:103:9 | while ... { ... } | test.rs:99:15:99:39 | [boolean(false)] let ... = ... | 0 |
 | test.rs:99:9:103:9 | while ... { ... } | test.rs:101:17:101:22 | ExprStmt | 1 |
-| test.rs:99:15:99:39 | let ... = ... | test.rs:97:5:104:5 | enter fn test_while_let | 1 |
-| test.rs:99:15:99:39 | let ... = ... | test.rs:100:13:102:13 | if ... {...} | 0 |
+| test.rs:99:29:99:32 | iter | test.rs:97:5:104:5 | enter fn test_while_let | 1 |
+| test.rs:99:29:99:32 | iter | test.rs:100:13:102:13 | if ... {...} | 0 |
 | test.rs:107:9:112:9 | for ... in ... { ... } | test.rs:107:13:107:13 | i | 1 |
 | test.rs:107:9:112:9 | for ... in ... { ... } | test.rs:109:17:109:22 | ExprStmt | 0 |
 | test.rs:107:13:107:13 | i | test.rs:106:5:113:5 | enter fn test_for | 1 |
@@ -2070,10 +2127,10 @@ joinBlockPredecessor
 | test.rs:130:9:134:9 | if ... {...} else {...} | test.rs:133:13:133:13 | n | 0 |
 | test.rs:139:9:141:9 | if b {...} | test.rs:137:5:143:5 | enter fn test_if_without_else | 1 |
 | test.rs:139:9:141:9 | if b {...} | test.rs:140:13:140:19 | ExprStmt | 0 |
-| test.rs:146:9:150:9 | if ... {...} else {...} | test.rs:146:21:146:21 | n | 0 |
-| test.rs:146:9:150:9 | if ... {...} else {...} | test.rs:149:13:149:13 | 0 | 1 |
+| test.rs:146:9:150:9 | if ... {...} else {...} | test.rs:147:13:147:13 | n | 1 |
+| test.rs:146:9:150:9 | if ... {...} else {...} | test.rs:149:13:149:13 | 0 | 0 |
 | test.rs:153:5:158:5 | exit fn test_if_let (normal) | test.rs:154:9:156:9 | if ... {...} | 1 |
-| test.rs:153:5:158:5 | exit fn test_if_let (normal) | test.rs:154:21:154:21 | n | 0 |
+| test.rs:153:5:158:5 | exit fn test_if_let (normal) | test.rs:155:13:155:21 | ExprStmt | 0 |
 | test.rs:161:9:165:9 | if ... {...} else {...} | test.rs:162:13:162:13 | 1 | 1 |
 | test.rs:161:9:165:9 | if ... {...} else {...} | test.rs:164:13:164:13 | 0 | 0 |
 | test.rs:161:13:161:48 | [boolean(false)] if ... {...} else {...} | test.rs:161:22:161:32 | [boolean(false)] { ... } | 1 |
@@ -2185,10 +2242,10 @@ joinBlockPredecessor
 | test.rs:443:13:443:36 | ... \| ... | test.rs:443:26:443:36 | Some(...) | 1 |
 | test.rs:443:26:443:36 | Some(...) | test.rs:443:13:443:22 | Some(...) | 1 |
 | test.rs:443:26:443:36 | Some(...) | test.rs:443:18:443:21 | true | 0 |
-| test.rs:454:9:457:9 | match a { ... } | test.rs:455:13:455:25 | [match(false)] 1 \| 2 | 0 |
-| test.rs:454:9:457:9 | match a { ... } | test.rs:455:13:455:25 | [match(true)] 1 \| 2 | 1 |
-| test.rs:455:13:455:25 | [match(true)] 1 \| 2 | test.rs:453:5:458:5 | enter fn or_pattern_3 | 1 |
-| test.rs:455:13:455:25 | [match(true)] 1 \| 2 | test.rs:455:13:455:25 | 2 | 0 |
+| test.rs:454:9:457:9 | match a { ... } | test.rs:455:13:455:23 | [match(false)] 1 \| 2 | 0 |
+| test.rs:454:9:457:9 | match a { ... } | test.rs:455:13:455:23 | [match(true)] 1 \| 2 | 1 |
+| test.rs:455:13:455:23 | [match(true)] 1 \| 2 | test.rs:453:5:458:5 | enter fn or_pattern_3 | 1 |
+| test.rs:455:13:455:23 | [match(true)] 1 \| 2 | test.rs:455:13:455:23 | 2 | 0 |
 | test.rs:461:9:464:9 | match pair { ... } | test.rs:462:32:462:32 | _ | 0 |
 | test.rs:461:9:464:9 | match pair { ... } | test.rs:463:13:463:13 | _ | 1 |
 | test.rs:476:9:480:9 | match e { ... } | test.rs:477:32:477:32 | _ | 0 |
@@ -2198,7 +2255,7 @@ joinBlockPredecessor
 | test.rs:487:13:487:14 | TupleExpr | test.rs:487:13:487:14 | TupleExpr | 0 |
 | test.rs:511:28:516:9 | exit { ... } (normal) | test.rs:512:13:514:13 | if b {...} | 1 |
 | test.rs:511:28:516:9 | exit { ... } (normal) | test.rs:513:17:513:41 | ExprStmt | 0 |
-| test.rs:533:21:533:48 | if ... {...} | test.rs:533:13:533:49 | ExprStmt | 1 |
+| test.rs:533:21:533:48 | if ... {...} | test.rs:533:13:533:19 | ExprStmt | 1 |
 | test.rs:533:21:533:48 | if ... {...} | test.rs:533:21:533:48 | [boolean(false)] ! ... | 0 |
 | test.rs:569:18:580:5 | 'block: { ... } | test.rs:572:13:572:27 | ExprStmt | 0 |
 | test.rs:569:18:580:5 | 'block: { ... } | test.rs:575:9:577:9 | if ... {...} | 2 |
diff --git a/rust/ql/test/library-tests/controlflow/Cfg.expected b/rust/ql/test/library-tests/controlflow/Cfg.expected
index 44dd60e915a..d8b2972ca52 100644
--- a/rust/ql/test/library-tests/controlflow/Cfg.expected
+++ b/rust/ql/test/library-tests/controlflow/Cfg.expected
@@ -194,20 +194,21 @@ edges
 | test.rs:97:5:104:5 | exit fn test_while_let (normal) | test.rs:97:5:104:5 | exit fn test_while_let |  |
 | test.rs:97:25:104:5 | { ... } | test.rs:97:5:104:5 | exit fn test_while_let (normal) |  |
 | test.rs:98:9:98:29 | let ... = ... | test.rs:98:24:98:24 | 1 |  |
-| test.rs:98:13:98:20 | mut iter | test.rs:99:15:99:39 | let ... = ... | match |
+| test.rs:98:13:98:20 | mut iter | test.rs:99:29:99:32 | iter | match |
 | test.rs:98:17:98:20 | iter | test.rs:98:13:98:20 | mut iter |  |
 | test.rs:98:24:98:24 | 1 | test.rs:98:27:98:28 | 10 |  |
 | test.rs:98:24:98:28 | 1..10 | test.rs:98:17:98:20 | iter |  |
 | test.rs:98:27:98:28 | 10 | test.rs:98:24:98:28 | 1..10 |  |
 | test.rs:99:9:103:9 | while ... { ... } | test.rs:97:25:104:5 | { ... } |  |
-| test.rs:99:15:99:39 | let ... = ... | test.rs:99:29:99:32 | iter |  |
-| test.rs:99:19:99:25 | Some(...) | test.rs:99:9:103:9 | while ... { ... } | no-match |
+| test.rs:99:15:99:39 | [boolean(false)] let ... = ... | test.rs:99:9:103:9 | while ... { ... } | false |
+| test.rs:99:15:99:39 | [boolean(true)] let ... = ... | test.rs:100:17:100:17 | x | true |
+| test.rs:99:19:99:25 | Some(...) | test.rs:99:15:99:39 | [boolean(false)] let ... = ... | no-match |
 | test.rs:99:19:99:25 | Some(...) | test.rs:99:24:99:24 | x | match |
+| test.rs:99:24:99:24 | x | test.rs:99:15:99:39 | [boolean(true)] let ... = ... | match |
 | test.rs:99:24:99:24 | x | test.rs:99:24:99:24 | x |  |
-| test.rs:99:24:99:24 | x | test.rs:100:17:100:17 | x | match |
 | test.rs:99:29:99:32 | iter | test.rs:99:29:99:39 | iter.next() |  |
 | test.rs:99:29:99:39 | iter.next() | test.rs:99:19:99:25 | Some(...) |  |
-| test.rs:99:41:103:9 | { ... } | test.rs:99:15:99:39 | let ... = ... |  |
+| test.rs:99:41:103:9 | { ... } | test.rs:99:29:99:32 | iter |  |
 | test.rs:100:13:102:13 | if ... {...} | test.rs:99:41:103:9 | { ... } |  |
 | test.rs:100:17:100:17 | x | test.rs:100:22:100:22 | 5 |  |
 | test.rs:100:17:100:22 | ... == ... | test.rs:100:13:102:13 | if ... {...} | false |
@@ -308,14 +309,15 @@ edges
 | test.rs:145:5:151:5 | exit fn test_if_let_else (normal) | test.rs:145:5:151:5 | exit fn test_if_let_else |  |
 | test.rs:145:25:145:25 | a | test.rs:145:25:145:25 | a |  |
 | test.rs:145:25:145:25 | a | test.rs:145:25:145:38 | ...: Option::<...> | match |
-| test.rs:145:25:145:38 | ...: Option::<...> | test.rs:146:12:146:26 | let ... = a |  |
+| test.rs:145:25:145:38 | ...: Option::<...> | test.rs:146:26:146:26 | a |  |
 | test.rs:145:48:151:5 | { ... } | test.rs:145:5:151:5 | exit fn test_if_let_else (normal) |  |
 | test.rs:146:9:150:9 | if ... {...} else {...} | test.rs:145:48:151:5 | { ... } |  |
-| test.rs:146:12:146:26 | let ... = a | test.rs:146:26:146:26 | a |  |
+| test.rs:146:12:146:26 | [boolean(false)] let ... = a | test.rs:149:13:149:13 | 0 | false |
+| test.rs:146:12:146:26 | [boolean(true)] let ... = a | test.rs:147:13:147:13 | n | true |
+| test.rs:146:16:146:22 | Some(...) | test.rs:146:12:146:26 | [boolean(false)] let ... = a | no-match |
 | test.rs:146:16:146:22 | Some(...) | test.rs:146:21:146:21 | n | match |
-| test.rs:146:16:146:22 | Some(...) | test.rs:149:13:149:13 | 0 | no-match |
+| test.rs:146:21:146:21 | n | test.rs:146:12:146:26 | [boolean(true)] let ... = a | match |
 | test.rs:146:21:146:21 | n | test.rs:146:21:146:21 | n |  |
-| test.rs:146:21:146:21 | n | test.rs:147:13:147:13 | n | match |
 | test.rs:146:26:146:26 | a | test.rs:146:16:146:22 | Some(...) |  |
 | test.rs:146:28:148:9 | { ... } | test.rs:146:9:150:9 | if ... {...} else {...} |  |
 | test.rs:147:13:147:13 | n | test.rs:146:28:148:9 | { ... } |  |
@@ -327,13 +329,14 @@ edges
 | test.rs:153:20:153:20 | a | test.rs:153:20:153:33 | ...: Option::<...> | match |
 | test.rs:153:20:153:33 | ...: Option::<...> | test.rs:154:9:156:9 | ExprStmt |  |
 | test.rs:153:43:158:5 | { ... } | test.rs:153:5:158:5 | exit fn test_if_let (normal) |  |
-| test.rs:154:9:156:9 | ExprStmt | test.rs:154:12:154:26 | let ... = a |  |
+| test.rs:154:9:156:9 | ExprStmt | test.rs:154:26:154:26 | a |  |
 | test.rs:154:9:156:9 | if ... {...} | test.rs:157:9:157:9 | 0 |  |
-| test.rs:154:12:154:26 | let ... = a | test.rs:154:26:154:26 | a |  |
-| test.rs:154:16:154:22 | Some(...) | test.rs:154:9:156:9 | if ... {...} | no-match |
+| test.rs:154:12:154:26 | [boolean(false)] let ... = a | test.rs:154:9:156:9 | if ... {...} | false |
+| test.rs:154:12:154:26 | [boolean(true)] let ... = a | test.rs:155:13:155:21 | ExprStmt | true |
+| test.rs:154:16:154:22 | Some(...) | test.rs:154:12:154:26 | [boolean(false)] let ... = a | no-match |
 | test.rs:154:16:154:22 | Some(...) | test.rs:154:21:154:21 | n | match |
+| test.rs:154:21:154:21 | n | test.rs:154:12:154:26 | [boolean(true)] let ... = a | match |
 | test.rs:154:21:154:21 | n | test.rs:154:21:154:21 | n |  |
-| test.rs:154:21:154:21 | n | test.rs:155:13:155:21 | ExprStmt | match |
 | test.rs:154:26:154:26 | a | test.rs:154:16:154:22 | Some(...) |  |
 | test.rs:155:13:155:20 | return n | test.rs:153:5:158:5 | exit fn test_if_let (normal) | return |
 | test.rs:155:13:155:21 | ExprStmt | test.rs:155:20:155:20 | n |  |
@@ -388,39 +391,39 @@ edges
 | test.rs:170:16:170:20 | cond2 | test.rs:171:17:171:30 | ExprStmt | true |
 | test.rs:170:16:170:20 | cond2 | test.rs:173:17:173:30 | ExprStmt | false |
 | test.rs:170:22:172:13 | { ... } | test.rs:170:13:174:13 | if cond2 {...} else {...} |  |
-| test.rs:171:17:171:29 | ...::_print | test.rs:171:26:171:28 | "1\\n" |  |
+| test.rs:171:17:171:24 | ...::_print | test.rs:171:26:171:28 | "1\\n" |  |
 | test.rs:171:17:171:29 | MacroExpr | test.rs:170:22:172:13 | { ... } |  |
 | test.rs:171:17:171:29 | println!... | test.rs:171:17:171:29 | MacroExpr |  |
 | test.rs:171:17:171:30 | ExprStmt | test.rs:171:26:171:28 | ExprStmt |  |
 | test.rs:171:26:171:28 | "1\\n" | test.rs:171:26:171:28 | FormatArgsExpr |  |
 | test.rs:171:26:171:28 | ...::_print(...) | test.rs:171:26:171:28 | { ... } |  |
 | test.rs:171:26:171:28 | ...::format_args_nl!... | test.rs:171:26:171:28 | MacroExpr |  |
-| test.rs:171:26:171:28 | ExprStmt | test.rs:171:17:171:29 | ...::_print |  |
+| test.rs:171:26:171:28 | ExprStmt | test.rs:171:17:171:24 | ...::_print |  |
 | test.rs:171:26:171:28 | FormatArgsExpr | test.rs:171:26:171:28 | ...::format_args_nl!... |  |
 | test.rs:171:26:171:28 | MacroBlockExpr | test.rs:171:17:171:29 | println!... |  |
 | test.rs:171:26:171:28 | MacroExpr | test.rs:171:26:171:28 | ...::_print(...) |  |
 | test.rs:171:26:171:28 | { ... } | test.rs:171:26:171:28 | MacroBlockExpr |  |
 | test.rs:172:20:174:13 | { ... } | test.rs:170:13:174:13 | if cond2 {...} else {...} |  |
-| test.rs:173:17:173:29 | ...::_print | test.rs:173:26:173:28 | "2\\n" |  |
+| test.rs:173:17:173:24 | ...::_print | test.rs:173:26:173:28 | "2\\n" |  |
 | test.rs:173:17:173:29 | MacroExpr | test.rs:172:20:174:13 | { ... } |  |
 | test.rs:173:17:173:29 | println!... | test.rs:173:17:173:29 | MacroExpr |  |
 | test.rs:173:17:173:30 | ExprStmt | test.rs:173:26:173:28 | ExprStmt |  |
 | test.rs:173:26:173:28 | "2\\n" | test.rs:173:26:173:28 | FormatArgsExpr |  |
 | test.rs:173:26:173:28 | ...::_print(...) | test.rs:173:26:173:28 | { ... } |  |
 | test.rs:173:26:173:28 | ...::format_args_nl!... | test.rs:173:26:173:28 | MacroExpr |  |
-| test.rs:173:26:173:28 | ExprStmt | test.rs:173:17:173:29 | ...::_print |  |
+| test.rs:173:26:173:28 | ExprStmt | test.rs:173:17:173:24 | ...::_print |  |
 | test.rs:173:26:173:28 | FormatArgsExpr | test.rs:173:26:173:28 | ...::format_args_nl!... |  |
 | test.rs:173:26:173:28 | MacroBlockExpr | test.rs:173:17:173:29 | println!... |  |
 | test.rs:173:26:173:28 | MacroExpr | test.rs:173:26:173:28 | ...::_print(...) |  |
 | test.rs:173:26:173:28 | { ... } | test.rs:173:26:173:28 | MacroBlockExpr |  |
-| test.rs:175:13:175:25 | ...::_print | test.rs:175:22:175:24 | "3\\n" |  |
+| test.rs:175:13:175:20 | ...::_print | test.rs:175:22:175:24 | "3\\n" |  |
 | test.rs:175:13:175:25 | MacroExpr | test.rs:169:18:176:9 | { ... } |  |
 | test.rs:175:13:175:25 | println!... | test.rs:175:13:175:25 | MacroExpr |  |
 | test.rs:175:13:175:26 | ExprStmt | test.rs:175:22:175:24 | ExprStmt |  |
 | test.rs:175:22:175:24 | "3\\n" | test.rs:175:22:175:24 | FormatArgsExpr |  |
 | test.rs:175:22:175:24 | ...::_print(...) | test.rs:175:22:175:24 | { ... } |  |
 | test.rs:175:22:175:24 | ...::format_args_nl!... | test.rs:175:22:175:24 | MacroExpr |  |
-| test.rs:175:22:175:24 | ExprStmt | test.rs:175:13:175:25 | ...::_print |  |
+| test.rs:175:22:175:24 | ExprStmt | test.rs:175:13:175:20 | ...::_print |  |
 | test.rs:175:22:175:24 | FormatArgsExpr | test.rs:175:22:175:24 | ...::format_args_nl!... |  |
 | test.rs:175:22:175:24 | MacroBlockExpr | test.rs:175:13:175:25 | println!... |  |
 | test.rs:175:22:175:24 | MacroExpr | test.rs:175:22:175:24 | ...::_print(...) |  |
@@ -893,14 +896,14 @@ edges
 | test.rs:363:18:363:18 | n | test.rs:363:18:363:18 | n |  |
 | test.rs:363:18:363:18 | n | test.rs:364:9:364:9 | n | match |
 | test.rs:363:23:363:23 | a | test.rs:363:13:363:19 | Some(...) |  |
-| test.rs:363:32:363:54 | ...::panic_fmt | test.rs:363:39:363:53 | "Expected some" |  |
+| test.rs:363:32:363:37 | ...::panic_fmt | test.rs:363:39:363:53 | "Expected some" |  |
 | test.rs:363:32:363:54 | MacroExpr | test.rs:363:30:363:56 | { ... } |  |
 | test.rs:363:32:363:54 | panic!... | test.rs:363:32:363:54 | MacroExpr |  |
 | test.rs:363:39:363:53 | "Expected some" | test.rs:363:39:363:53 | FormatArgsExpr |  |
 | test.rs:363:39:363:53 | ...::const_format_args!... | test.rs:363:39:363:53 | MacroExpr |  |
 | test.rs:363:39:363:53 | ...::panic_2021!... | test.rs:363:39:363:53 | MacroExpr |  |
 | test.rs:363:39:363:53 | ...::panic_fmt(...) | test.rs:363:39:363:53 | { ... } |  |
-| test.rs:363:39:363:53 | ExprStmt | test.rs:363:32:363:54 | ...::panic_fmt |  |
+| test.rs:363:39:363:53 | ExprStmt | test.rs:363:32:363:37 | ...::panic_fmt |  |
 | test.rs:363:39:363:53 | FormatArgsExpr | test.rs:363:39:363:53 | ...::const_format_args!... |  |
 | test.rs:363:39:363:53 | MacroBlockExpr | test.rs:363:32:363:54 | panic!... |  |
 | test.rs:363:39:363:53 | MacroBlockExpr | test.rs:363:39:363:53 | ...::panic_2021!... |  |
@@ -1122,15 +1125,15 @@ edges
 | test.rs:453:36:458:5 | { ... } | test.rs:453:5:458:5 | exit fn or_pattern_3 (normal) |  |
 | test.rs:454:9:457:9 | match a { ... } | test.rs:453:36:458:5 | { ... } |  |
 | test.rs:454:15:454:15 | a | test.rs:455:13:455:25 | MacroPat |  |
-| test.rs:455:13:455:25 | 1 | test.rs:455:13:455:25 | 1 |  |
-| test.rs:455:13:455:25 | 1 | test.rs:455:13:455:25 | 2 | no-match |
-| test.rs:455:13:455:25 | 1 | test.rs:455:13:455:25 | [match(true)] 1 \| 2 | match |
-| test.rs:455:13:455:25 | 2 | test.rs:455:13:455:25 | 2 |  |
-| test.rs:455:13:455:25 | 2 | test.rs:455:13:455:25 | [match(false)] 1 \| 2 | no-match |
-| test.rs:455:13:455:25 | 2 | test.rs:455:13:455:25 | [match(true)] 1 \| 2 | match |
-| test.rs:455:13:455:25 | MacroPat | test.rs:455:13:455:25 | 1 | match |
-| test.rs:455:13:455:25 | [match(false)] 1 \| 2 | test.rs:456:13:456:13 | _ | no-match |
-| test.rs:455:13:455:25 | [match(true)] 1 \| 2 | test.rs:455:30:455:30 | 3 | match |
+| test.rs:455:13:455:23 | 1 | test.rs:455:13:455:23 | 1 |  |
+| test.rs:455:13:455:23 | 1 | test.rs:455:13:455:23 | 2 | no-match |
+| test.rs:455:13:455:23 | 1 | test.rs:455:13:455:23 | [match(true)] 1 \| 2 | match |
+| test.rs:455:13:455:23 | 2 | test.rs:455:13:455:23 | 2 |  |
+| test.rs:455:13:455:23 | 2 | test.rs:455:13:455:23 | [match(false)] 1 \| 2 | no-match |
+| test.rs:455:13:455:23 | 2 | test.rs:455:13:455:23 | [match(true)] 1 \| 2 | match |
+| test.rs:455:13:455:23 | [match(false)] 1 \| 2 | test.rs:456:13:456:13 | _ | no-match |
+| test.rs:455:13:455:23 | [match(true)] 1 \| 2 | test.rs:455:30:455:30 | 3 | match |
+| test.rs:455:13:455:25 | MacroPat | test.rs:455:13:455:23 | 1 | match |
 | test.rs:455:30:455:30 | 3 | test.rs:454:9:457:9 | match a { ... } |  |
 | test.rs:456:13:456:13 | _ | test.rs:456:18:456:18 | 4 | match |
 | test.rs:456:18:456:18 | 4 | test.rs:454:9:457:9 | match a { ... } |  |
@@ -1178,14 +1181,14 @@ edges
 | test.rs:494:5:496:5 | enter fn say_hello | test.rs:495:9:495:34 | ExprStmt |  |
 | test.rs:494:5:496:5 | exit fn say_hello (normal) | test.rs:494:5:496:5 | exit fn say_hello |  |
 | test.rs:494:26:496:5 | { ... } | test.rs:494:5:496:5 | exit fn say_hello (normal) |  |
-| test.rs:495:9:495:33 | ...::_print | test.rs:495:18:495:32 | "hello, world!\\n" |  |
+| test.rs:495:9:495:16 | ...::_print | test.rs:495:18:495:32 | "hello, world!\\n" |  |
 | test.rs:495:9:495:33 | MacroExpr | test.rs:494:26:496:5 | { ... } |  |
 | test.rs:495:9:495:33 | println!... | test.rs:495:9:495:33 | MacroExpr |  |
 | test.rs:495:9:495:34 | ExprStmt | test.rs:495:18:495:32 | ExprStmt |  |
 | test.rs:495:18:495:32 | "hello, world!\\n" | test.rs:495:18:495:32 | FormatArgsExpr |  |
 | test.rs:495:18:495:32 | ...::_print(...) | test.rs:495:18:495:32 | { ... } |  |
 | test.rs:495:18:495:32 | ...::format_args_nl!... | test.rs:495:18:495:32 | MacroExpr |  |
-| test.rs:495:18:495:32 | ExprStmt | test.rs:495:9:495:33 | ...::_print |  |
+| test.rs:495:18:495:32 | ExprStmt | test.rs:495:9:495:16 | ...::_print |  |
 | test.rs:495:18:495:32 | FormatArgsExpr | test.rs:495:18:495:32 | ...::format_args_nl!... |  |
 | test.rs:495:18:495:32 | MacroBlockExpr | test.rs:495:9:495:33 | println!... |  |
 | test.rs:495:18:495:32 | MacroExpr | test.rs:495:18:495:32 | ...::_print(...) |  |
@@ -1202,14 +1205,14 @@ edges
 | test.rs:499:26:501:9 | enter { ... } | test.rs:500:13:500:42 | ExprStmt |  |
 | test.rs:499:26:501:9 | exit { ... } (normal) | test.rs:499:26:501:9 | exit { ... } |  |
 | test.rs:499:26:501:9 | { ... } | test.rs:499:13:499:22 | say_godbye |  |
-| test.rs:500:13:500:41 | ...::_print | test.rs:500:22:500:40 | "godbye, everyone!\\n" |  |
+| test.rs:500:13:500:20 | ...::_print | test.rs:500:22:500:40 | "godbye, everyone!\\n" |  |
 | test.rs:500:13:500:41 | MacroExpr | test.rs:499:26:501:9 | exit { ... } (normal) |  |
 | test.rs:500:13:500:41 | println!... | test.rs:500:13:500:41 | MacroExpr |  |
 | test.rs:500:13:500:42 | ExprStmt | test.rs:500:22:500:40 | ExprStmt |  |
 | test.rs:500:22:500:40 | "godbye, everyone!\\n" | test.rs:500:22:500:40 | FormatArgsExpr |  |
 | test.rs:500:22:500:40 | ...::_print(...) | test.rs:500:22:500:40 | { ... } |  |
 | test.rs:500:22:500:40 | ...::format_args_nl!... | test.rs:500:22:500:40 | MacroExpr |  |
-| test.rs:500:22:500:40 | ExprStmt | test.rs:500:13:500:41 | ...::_print |  |
+| test.rs:500:22:500:40 | ExprStmt | test.rs:500:13:500:20 | ...::_print |  |
 | test.rs:500:22:500:40 | FormatArgsExpr | test.rs:500:22:500:40 | ...::format_args_nl!... |  |
 | test.rs:500:22:500:40 | MacroBlockExpr | test.rs:500:13:500:41 | println!... |  |
 | test.rs:500:22:500:40 | MacroExpr | test.rs:500:22:500:40 | ...::_print(...) |  |
@@ -1220,14 +1223,14 @@ edges
 | test.rs:502:31:504:9 | enter { ... } | test.rs:503:13:503:37 | ExprStmt |  |
 | test.rs:502:31:504:9 | exit { ... } (normal) | test.rs:502:31:504:9 | exit { ... } |  |
 | test.rs:502:31:504:9 | { ... } | test.rs:502:13:502:27 | say_how_are_you |  |
-| test.rs:503:13:503:36 | ...::_print | test.rs:503:22:503:35 | "how are you?\\n" |  |
+| test.rs:503:13:503:20 | ...::_print | test.rs:503:22:503:35 | "how are you?\\n" |  |
 | test.rs:503:13:503:36 | MacroExpr | test.rs:502:31:504:9 | exit { ... } (normal) |  |
 | test.rs:503:13:503:36 | println!... | test.rs:503:13:503:36 | MacroExpr |  |
 | test.rs:503:13:503:37 | ExprStmt | test.rs:503:22:503:35 | ExprStmt |  |
 | test.rs:503:22:503:35 | "how are you?\\n" | test.rs:503:22:503:35 | FormatArgsExpr |  |
 | test.rs:503:22:503:35 | ...::_print(...) | test.rs:503:22:503:35 | { ... } |  |
 | test.rs:503:22:503:35 | ...::format_args_nl!... | test.rs:503:22:503:35 | MacroExpr |  |
-| test.rs:503:22:503:35 | ExprStmt | test.rs:503:13:503:36 | ...::_print |  |
+| test.rs:503:22:503:35 | ExprStmt | test.rs:503:13:503:20 | ...::_print |  |
 | test.rs:503:22:503:35 | FormatArgsExpr | test.rs:503:22:503:35 | ...::format_args_nl!... |  |
 | test.rs:503:22:503:35 | MacroBlockExpr | test.rs:503:13:503:36 | println!... |  |
 | test.rs:503:22:503:35 | MacroExpr | test.rs:503:22:503:35 | ...::_print(...) |  |
@@ -1285,23 +1288,23 @@ edges
 | test.rs:529:41:537:5 | { ... } | test.rs:529:5:537:5 | exit fn const_block_assert (normal) |  |
 | test.rs:532:9:534:9 | ExprStmt | test.rs:533:13:533:50 | ExprStmt |  |
 | test.rs:532:9:534:9 | { ... } | test.rs:536:9:536:10 | 42 |  |
-| test.rs:533:13:533:49 | ...::panic_2021!... | test.rs:533:13:533:49 | MacroExpr |  |
-| test.rs:533:13:533:49 | ...::panic_explicit | test.rs:533:13:533:49 | ...::panic_explicit(...) |  |
-| test.rs:533:13:533:49 | ...::panic_explicit(...) | test.rs:533:13:533:49 | { ... } |  |
-| test.rs:533:13:533:49 | ExprStmt | test.rs:533:13:533:49 | fn panic_cold_explicit |  |
-| test.rs:533:13:533:49 | ExprStmt | test.rs:533:13:533:49 | panic_cold_explicit |  |
-| test.rs:533:13:533:49 | MacroBlockExpr | test.rs:533:13:533:49 | ...::panic_2021!... |  |
+| test.rs:533:13:533:19 | ...::panic_2021!... | test.rs:533:13:533:19 | MacroExpr |  |
+| test.rs:533:13:533:19 | ...::panic_explicit | test.rs:533:13:533:19 | ...::panic_explicit(...) |  |
+| test.rs:533:13:533:19 | ...::panic_explicit(...) | test.rs:533:13:533:19 | { ... } |  |
+| test.rs:533:13:533:19 | ExprStmt | test.rs:533:13:533:19 | fn panic_cold_explicit |  |
+| test.rs:533:13:533:19 | ExprStmt | test.rs:533:13:533:19 | panic_cold_explicit |  |
+| test.rs:533:13:533:19 | MacroBlockExpr | test.rs:533:13:533:19 | ...::panic_2021!... |  |
+| test.rs:533:13:533:19 | MacroExpr | test.rs:533:13:533:19 | { ... } |  |
+| test.rs:533:13:533:19 | enter fn panic_cold_explicit | test.rs:533:13:533:19 | ...::panic_explicit |  |
+| test.rs:533:13:533:19 | exit fn panic_cold_explicit (normal) | test.rs:533:13:533:19 | exit fn panic_cold_explicit |  |
+| test.rs:533:13:533:19 | fn panic_cold_explicit | test.rs:533:13:533:19 | ExprStmt |  |
+| test.rs:533:13:533:19 | panic_cold_explicit | test.rs:533:13:533:19 | panic_cold_explicit(...) |  |
+| test.rs:533:13:533:19 | panic_cold_explicit(...) | test.rs:533:13:533:19 | { ... } |  |
+| test.rs:533:13:533:19 | { ... } | test.rs:533:13:533:19 | MacroBlockExpr |  |
+| test.rs:533:13:533:19 | { ... } | test.rs:533:13:533:19 | exit fn panic_cold_explicit (normal) |  |
+| test.rs:533:13:533:19 | { ... } | test.rs:533:21:533:48 | if ... {...} |  |
 | test.rs:533:13:533:49 | MacroExpr | test.rs:532:9:534:9 | { ... } |  |
-| test.rs:533:13:533:49 | MacroExpr | test.rs:533:13:533:49 | { ... } |  |
 | test.rs:533:13:533:49 | assert!... | test.rs:533:13:533:49 | MacroExpr |  |
-| test.rs:533:13:533:49 | enter fn panic_cold_explicit | test.rs:533:13:533:49 | ...::panic_explicit |  |
-| test.rs:533:13:533:49 | exit fn panic_cold_explicit (normal) | test.rs:533:13:533:49 | exit fn panic_cold_explicit |  |
-| test.rs:533:13:533:49 | fn panic_cold_explicit | test.rs:533:13:533:49 | ExprStmt |  |
-| test.rs:533:13:533:49 | panic_cold_explicit | test.rs:533:13:533:49 | panic_cold_explicit(...) |  |
-| test.rs:533:13:533:49 | panic_cold_explicit(...) | test.rs:533:13:533:49 | { ... } |  |
-| test.rs:533:13:533:49 | { ... } | test.rs:533:13:533:49 | MacroBlockExpr |  |
-| test.rs:533:13:533:49 | { ... } | test.rs:533:13:533:49 | exit fn panic_cold_explicit (normal) |  |
-| test.rs:533:13:533:49 | { ... } | test.rs:533:21:533:48 | if ... {...} |  |
 | test.rs:533:13:533:50 | ExprStmt | test.rs:533:21:533:42 | ...::size_of::<...> |  |
 | test.rs:533:21:533:42 | ...::size_of::<...> | test.rs:533:21:533:44 | ...::size_of::<...>(...) |  |
 | test.rs:533:21:533:44 | ...::size_of::<...>(...) | test.rs:533:48:533:48 | 0 |  |
@@ -1309,7 +1312,7 @@ edges
 | test.rs:533:21:533:48 | ... > ... | test.rs:533:21:533:48 | [boolean(true)] ! ... | false |
 | test.rs:533:21:533:48 | MacroBlockExpr | test.rs:533:13:533:49 | assert!... |  |
 | test.rs:533:21:533:48 | [boolean(false)] ! ... | test.rs:533:21:533:48 | if ... {...} | false |
-| test.rs:533:21:533:48 | [boolean(true)] ! ... | test.rs:533:13:533:49 | ExprStmt | true |
+| test.rs:533:21:533:48 | [boolean(true)] ! ... | test.rs:533:13:533:19 | ExprStmt | true |
 | test.rs:533:21:533:48 | if ... {...} | test.rs:533:21:533:48 | { ... } |  |
 | test.rs:533:21:533:48 | { ... } | test.rs:533:21:533:48 | MacroBlockExpr |  |
 | test.rs:533:48:533:48 | 0 | test.rs:533:21:533:48 | ... > ... |  |
@@ -1321,11 +1324,11 @@ edges
 | test.rs:541:9:546:9 | ExprStmt | test.rs:541:12:541:16 | false |  |
 | test.rs:541:9:546:9 | if false {...} | test.rs:547:9:547:9 | N |  |
 | test.rs:541:12:541:16 | false | test.rs:541:9:546:9 | if false {...} | false |
-| test.rs:544:17:544:24 | ...::panic_explicit | test.rs:544:17:544:24 | ...::panic_explicit(...) |  |
-| test.rs:544:17:544:24 | ...::panic_explicit(...) | test.rs:544:17:544:24 | { ... } |  |
-| test.rs:544:17:544:24 | enter fn panic_cold_explicit | test.rs:544:17:544:24 | ...::panic_explicit |  |
-| test.rs:544:17:544:24 | exit fn panic_cold_explicit (normal) | test.rs:544:17:544:24 | exit fn panic_cold_explicit |  |
-| test.rs:544:17:544:24 | { ... } | test.rs:544:17:544:24 | exit fn panic_cold_explicit (normal) |  |
+| test.rs:544:17:544:22 | ...::panic_explicit | test.rs:544:17:544:22 | ...::panic_explicit(...) |  |
+| test.rs:544:17:544:22 | ...::panic_explicit(...) | test.rs:544:17:544:22 | { ... } |  |
+| test.rs:544:17:544:22 | enter fn panic_cold_explicit | test.rs:544:17:544:22 | ...::panic_explicit |  |
+| test.rs:544:17:544:22 | exit fn panic_cold_explicit (normal) | test.rs:544:17:544:22 | exit fn panic_cold_explicit |  |
+| test.rs:544:17:544:22 | { ... } | test.rs:544:17:544:22 | exit fn panic_cold_explicit (normal) |  |
 | test.rs:547:9:547:9 | N | test.rs:539:35:548:5 | { ... } |  |
 | test.rs:551:1:556:1 | enter fn dead_code | test.rs:552:5:554:5 | ExprStmt |  |
 | test.rs:551:1:556:1 | exit fn dead_code (normal) | test.rs:551:1:556:1 | exit fn dead_code |  |
diff --git a/rust/ql/test/library-tests/dataflow/closures/inline-flow.expected b/rust/ql/test/library-tests/dataflow/closures/inline-flow.expected
deleted file mode 100644
index a2cee10f246..00000000000
--- a/rust/ql/test/library-tests/dataflow/closures/inline-flow.expected
+++ /dev/null
@@ -1,50 +0,0 @@
-models
-edges
-| main.rs:11:20:11:52 | if cond {...} else {...} | main.rs:12:10:12:16 | f(...) | provenance |  |
-| main.rs:11:30:11:39 | source(...) | main.rs:11:20:11:52 | if cond {...} else {...} | provenance |  |
-| main.rs:16:20:16:23 | ... | main.rs:18:18:18:21 | data | provenance |  |
-| main.rs:22:9:22:9 | a | main.rs:23:13:23:13 | a | provenance |  |
-| main.rs:22:13:22:22 | source(...) | main.rs:22:9:22:9 | a | provenance |  |
-| main.rs:23:13:23:13 | a | main.rs:16:20:16:23 | ... | provenance |  |
-| main.rs:27:20:27:23 | ... | main.rs:28:9:32:9 | if cond {...} else {...} | provenance |  |
-| main.rs:33:9:33:9 | a | main.rs:34:21:34:21 | a | provenance |  |
-| main.rs:33:13:33:22 | source(...) | main.rs:33:9:33:9 | a | provenance |  |
-| main.rs:34:9:34:9 | b | main.rs:35:10:35:10 | b | provenance |  |
-| main.rs:34:13:34:22 | f(...) | main.rs:34:9:34:9 | b | provenance |  |
-| main.rs:34:21:34:21 | a | main.rs:27:20:27:23 | ... | provenance |  |
-| main.rs:34:21:34:21 | a | main.rs:34:13:34:22 | f(...) | provenance |  |
-| main.rs:42:16:42:25 | source(...) | main.rs:44:5:44:5 | [post] f [captured capt] | provenance |  |
-| main.rs:44:5:44:5 | [post] f [captured capt] | main.rs:45:10:45:13 | capt | provenance |  |
-| main.rs:44:5:44:5 | [post] f [captured capt] | main.rs:49:5:49:5 | g [captured capt] | provenance |  |
-| main.rs:49:5:49:5 | g [captured capt] | main.rs:47:14:47:17 | capt | provenance |  |
-nodes
-| main.rs:11:20:11:52 | if cond {...} else {...} | semmle.label | if cond {...} else {...} |
-| main.rs:11:30:11:39 | source(...) | semmle.label | source(...) |
-| main.rs:12:10:12:16 | f(...) | semmle.label | f(...) |
-| main.rs:16:20:16:23 | ... | semmle.label | ... |
-| main.rs:18:18:18:21 | data | semmle.label | data |
-| main.rs:22:9:22:9 | a | semmle.label | a |
-| main.rs:22:13:22:22 | source(...) | semmle.label | source(...) |
-| main.rs:23:13:23:13 | a | semmle.label | a |
-| main.rs:27:20:27:23 | ... | semmle.label | ... |
-| main.rs:28:9:32:9 | if cond {...} else {...} | semmle.label | if cond {...} else {...} |
-| main.rs:33:9:33:9 | a | semmle.label | a |
-| main.rs:33:13:33:22 | source(...) | semmle.label | source(...) |
-| main.rs:34:9:34:9 | b | semmle.label | b |
-| main.rs:34:13:34:22 | f(...) | semmle.label | f(...) |
-| main.rs:34:21:34:21 | a | semmle.label | a |
-| main.rs:35:10:35:10 | b | semmle.label | b |
-| main.rs:42:16:42:25 | source(...) | semmle.label | source(...) |
-| main.rs:44:5:44:5 | [post] f [captured capt] | semmle.label | [post] f [captured capt] |
-| main.rs:45:10:45:13 | capt | semmle.label | capt |
-| main.rs:47:14:47:17 | capt | semmle.label | capt |
-| main.rs:49:5:49:5 | g [captured capt] | semmle.label | g [captured capt] |
-subpaths
-| main.rs:34:21:34:21 | a | main.rs:27:20:27:23 | ... | main.rs:28:9:32:9 | if cond {...} else {...} | main.rs:34:13:34:22 | f(...) |
-testFailures
-#select
-| main.rs:12:10:12:16 | f(...) | main.rs:11:30:11:39 | source(...) | main.rs:12:10:12:16 | f(...) | $@ | main.rs:11:30:11:39 | source(...) | source(...) |
-| main.rs:18:18:18:21 | data | main.rs:22:13:22:22 | source(...) | main.rs:18:18:18:21 | data | $@ | main.rs:22:13:22:22 | source(...) | source(...) |
-| main.rs:35:10:35:10 | b | main.rs:33:13:33:22 | source(...) | main.rs:35:10:35:10 | b | $@ | main.rs:33:13:33:22 | source(...) | source(...) |
-| main.rs:45:10:45:13 | capt | main.rs:42:16:42:25 | source(...) | main.rs:45:10:45:13 | capt | $@ | main.rs:42:16:42:25 | source(...) | source(...) |
-| main.rs:47:14:47:17 | capt | main.rs:42:16:42:25 | source(...) | main.rs:47:14:47:17 | capt | $@ | main.rs:42:16:42:25 | source(...) | source(...) |
diff --git a/rust/ql/test/library-tests/dataflow/global/CONSISTENCY/PathResolutionConsistency.expected b/rust/ql/test/library-tests/dataflow/global/CONSISTENCY/PathResolutionConsistency.expected
deleted file mode 100644
index 85ca3c35e7c..00000000000
--- a/rust/ql/test/library-tests/dataflow/global/CONSISTENCY/PathResolutionConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-multipleCallTargets
-| main.rs:272:14:272:29 | ...::deref(...) |
diff --git a/rust/ql/test/library-tests/dataflow/global/viableCallable.expected b/rust/ql/test/library-tests/dataflow/global/viableCallable.expected
index aab630af29f..e26d70d80d6 100644
--- a/rust/ql/test/library-tests/dataflow/global/viableCallable.expected
+++ b/rust/ql/test/library-tests/dataflow/global/viableCallable.expected
@@ -59,8 +59,6 @@
 | main.rs:212:13:212:34 | ...::new(...) | main.rs:205:5:208:5 | fn new |
 | main.rs:212:24:212:33 | source(...) | main.rs:1:1:3:1 | fn source |
 | main.rs:214:5:214:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
-| main.rs:228:10:228:14 | * ... | main.rs:235:5:237:5 | fn deref |
-| main.rs:236:11:236:15 | * ... | main.rs:235:5:237:5 | fn deref |
 | main.rs:242:28:242:36 | source(...) | main.rs:1:1:3:1 | fn source |
 | main.rs:244:13:244:17 | ... + ... | main.rs:220:5:223:5 | fn add |
 | main.rs:245:5:245:17 | sink(...) | main.rs:5:1:7:1 | fn sink |
@@ -98,10 +96,10 @@
 | main.rs:326:17:326:25 | source(...) | main.rs:1:1:3:1 | fn source |
 | main.rs:327:9:327:15 | sink(...) | main.rs:5:1:7:1 | fn sink |
 | main.rs:330:5:330:17 | sink(...) | main.rs:5:1:7:1 | fn sink |
-| main.rs:334:13:334:55 | ...::block_on(...) | file://:0:0:0:0 | fn block_on |
+| main.rs:334:13:334:55 | ...::block_on(...) | {EXTERNAL LOCATION} | fn block_on |
 | main.rs:334:41:334:54 | async_source(...) | main.rs:315:1:319:1 | fn async_source |
 | main.rs:335:5:335:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
-| main.rs:337:5:337:62 | ...::block_on(...) | file://:0:0:0:0 | fn block_on |
+| main.rs:337:5:337:62 | ...::block_on(...) | {EXTERNAL LOCATION} | fn block_on |
 | main.rs:337:33:337:61 | test_async_await_async_part(...) | main.rs:321:1:331:1 | fn test_async_await_async_part |
 | main.rs:341:5:341:22 | data_out_of_call(...) | main.rs:16:1:19:1 | fn data_out_of_call |
 | main.rs:342:5:342:35 | data_out_of_call_side_effect1(...) | main.rs:35:1:40:1 | fn data_out_of_call_side_effect1 |
diff --git a/rust/ql/test/library-tests/dataflow/global/viableCallable.qlref b/rust/ql/test/library-tests/dataflow/global/viableCallable.qlref
new file mode 100644
index 00000000000..29d8fc7b11a
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/global/viableCallable.qlref
@@ -0,0 +1,2 @@
+query: viableCallable.ql
+postprocess: utils/test/ExternalLocationPostProcessing.ql
\ No newline at end of file
diff --git a/rust/ql/test/extractor-tests/generated/ClosureBinder/Cargo.lock b/rust/ql/test/library-tests/dataflow/lambdas/Cargo.lock
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/ClosureBinder/Cargo.lock
rename to rust/ql/test/library-tests/dataflow/lambdas/Cargo.lock
diff --git a/rust/ql/test/library-tests/dataflow/lambdas/inline-flow.expected b/rust/ql/test/library-tests/dataflow/lambdas/inline-flow.expected
new file mode 100644
index 00000000000..7c99702aec6
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/lambdas/inline-flow.expected
@@ -0,0 +1,83 @@
+models
+edges
+| main.rs:10:20:10:52 | if cond {...} else {...} | main.rs:11:10:11:16 | f(...) | provenance |  |
+| main.rs:10:30:10:39 | source(...) | main.rs:10:20:10:52 | if cond {...} else {...} | provenance |  |
+| main.rs:15:20:15:23 | ... | main.rs:17:18:17:21 | data | provenance |  |
+| main.rs:22:9:22:9 | a | main.rs:23:13:23:13 | a | provenance |  |
+| main.rs:22:13:22:22 | source(...) | main.rs:22:9:22:9 | a | provenance |  |
+| main.rs:23:13:23:13 | a | main.rs:15:20:15:23 | ... | provenance |  |
+| main.rs:27:20:27:23 | ... | main.rs:27:26:27:52 | if cond {...} else {...} | provenance |  |
+| main.rs:28:9:28:9 | a | main.rs:29:21:29:21 | a | provenance |  |
+| main.rs:28:13:28:22 | source(...) | main.rs:28:9:28:9 | a | provenance |  |
+| main.rs:29:9:29:9 | b | main.rs:30:10:30:10 | b | provenance |  |
+| main.rs:29:13:29:22 | f(...) | main.rs:29:9:29:9 | b | provenance |  |
+| main.rs:29:21:29:21 | a | main.rs:27:20:27:23 | ... | provenance |  |
+| main.rs:29:21:29:21 | a | main.rs:29:13:29:22 | f(...) | provenance |  |
+| main.rs:37:16:37:25 | source(...) | main.rs:39:5:39:5 | [post] f [captured capt] | provenance |  |
+| main.rs:39:5:39:5 | [post] f [captured capt] | main.rs:40:10:40:13 | capt | provenance |  |
+| main.rs:39:5:39:5 | [post] f [captured capt] | main.rs:44:5:44:5 | g [captured capt] | provenance |  |
+| main.rs:44:5:44:5 | g [captured capt] | main.rs:42:14:42:17 | capt | provenance |  |
+| main.rs:47:29:49:1 | { ... } | main.rs:57:10:57:12 | f(...) | provenance |  |
+| main.rs:48:5:48:14 | source(...) | main.rs:47:29:49:1 | { ... } | provenance |  |
+| main.rs:51:17:51:25 | ...: i64 | main.rs:52:10:52:13 | data | provenance |  |
+| main.rs:62:9:62:9 | a | main.rs:63:7:63:7 | a | provenance |  |
+| main.rs:62:13:62:22 | source(...) | main.rs:62:9:62:9 | a | provenance |  |
+| main.rs:63:7:63:7 | a | main.rs:51:17:51:25 | ...: i64 | provenance |  |
+| main.rs:66:24:66:32 | ...: i64 | main.rs:66:42:72:1 | { ... } | provenance |  |
+| main.rs:76:9:76:9 | a | main.rs:77:21:77:21 | a | provenance |  |
+| main.rs:76:13:76:22 | source(...) | main.rs:76:9:76:9 | a | provenance |  |
+| main.rs:77:9:77:9 | b | main.rs:78:10:78:10 | b | provenance |  |
+| main.rs:77:13:77:22 | f(...) | main.rs:77:9:77:9 | b | provenance |  |
+| main.rs:77:21:77:21 | a | main.rs:66:24:66:32 | ...: i64 | provenance |  |
+| main.rs:77:21:77:21 | a | main.rs:77:13:77:22 | f(...) | provenance |  |
+nodes
+| main.rs:10:20:10:52 | if cond {...} else {...} | semmle.label | if cond {...} else {...} |
+| main.rs:10:30:10:39 | source(...) | semmle.label | source(...) |
+| main.rs:11:10:11:16 | f(...) | semmle.label | f(...) |
+| main.rs:15:20:15:23 | ... | semmle.label | ... |
+| main.rs:17:18:17:21 | data | semmle.label | data |
+| main.rs:22:9:22:9 | a | semmle.label | a |
+| main.rs:22:13:22:22 | source(...) | semmle.label | source(...) |
+| main.rs:23:13:23:13 | a | semmle.label | a |
+| main.rs:27:20:27:23 | ... | semmle.label | ... |
+| main.rs:27:26:27:52 | if cond {...} else {...} | semmle.label | if cond {...} else {...} |
+| main.rs:28:9:28:9 | a | semmle.label | a |
+| main.rs:28:13:28:22 | source(...) | semmle.label | source(...) |
+| main.rs:29:9:29:9 | b | semmle.label | b |
+| main.rs:29:13:29:22 | f(...) | semmle.label | f(...) |
+| main.rs:29:21:29:21 | a | semmle.label | a |
+| main.rs:30:10:30:10 | b | semmle.label | b |
+| main.rs:37:16:37:25 | source(...) | semmle.label | source(...) |
+| main.rs:39:5:39:5 | [post] f [captured capt] | semmle.label | [post] f [captured capt] |
+| main.rs:40:10:40:13 | capt | semmle.label | capt |
+| main.rs:42:14:42:17 | capt | semmle.label | capt |
+| main.rs:44:5:44:5 | g [captured capt] | semmle.label | g [captured capt] |
+| main.rs:47:29:49:1 | { ... } | semmle.label | { ... } |
+| main.rs:48:5:48:14 | source(...) | semmle.label | source(...) |
+| main.rs:51:17:51:25 | ...: i64 | semmle.label | ...: i64 |
+| main.rs:52:10:52:13 | data | semmle.label | data |
+| main.rs:57:10:57:12 | f(...) | semmle.label | f(...) |
+| main.rs:62:9:62:9 | a | semmle.label | a |
+| main.rs:62:13:62:22 | source(...) | semmle.label | source(...) |
+| main.rs:63:7:63:7 | a | semmle.label | a |
+| main.rs:66:24:66:32 | ...: i64 | semmle.label | ...: i64 |
+| main.rs:66:42:72:1 | { ... } | semmle.label | { ... } |
+| main.rs:76:9:76:9 | a | semmle.label | a |
+| main.rs:76:13:76:22 | source(...) | semmle.label | source(...) |
+| main.rs:77:9:77:9 | b | semmle.label | b |
+| main.rs:77:13:77:22 | f(...) | semmle.label | f(...) |
+| main.rs:77:21:77:21 | a | semmle.label | a |
+| main.rs:78:10:78:10 | b | semmle.label | b |
+subpaths
+| main.rs:29:21:29:21 | a | main.rs:27:20:27:23 | ... | main.rs:27:26:27:52 | if cond {...} else {...} | main.rs:29:13:29:22 | f(...) |
+| main.rs:77:21:77:21 | a | main.rs:66:24:66:32 | ...: i64 | main.rs:66:42:72:1 | { ... } | main.rs:77:13:77:22 | f(...) |
+testFailures
+#select
+| main.rs:11:10:11:16 | f(...) | main.rs:10:30:10:39 | source(...) | main.rs:11:10:11:16 | f(...) | $@ | main.rs:10:30:10:39 | source(...) | source(...) |
+| main.rs:17:18:17:21 | data | main.rs:22:13:22:22 | source(...) | main.rs:17:18:17:21 | data | $@ | main.rs:22:13:22:22 | source(...) | source(...) |
+| main.rs:30:10:30:10 | b | main.rs:28:13:28:22 | source(...) | main.rs:30:10:30:10 | b | $@ | main.rs:28:13:28:22 | source(...) | source(...) |
+| main.rs:40:10:40:13 | capt | main.rs:37:16:37:25 | source(...) | main.rs:40:10:40:13 | capt | $@ | main.rs:37:16:37:25 | source(...) | source(...) |
+| main.rs:42:14:42:17 | capt | main.rs:37:16:37:25 | source(...) | main.rs:42:14:42:17 | capt | $@ | main.rs:37:16:37:25 | source(...) | source(...) |
+| main.rs:52:10:52:13 | data | main.rs:62:13:62:22 | source(...) | main.rs:52:10:52:13 | data | $@ | main.rs:62:13:62:22 | source(...) | source(...) |
+| main.rs:57:10:57:12 | f(...) | main.rs:48:5:48:14 | source(...) | main.rs:57:10:57:12 | f(...) | $@ | main.rs:48:5:48:14 | source(...) | source(...) |
+| main.rs:78:10:78:10 | b | main.rs:76:13:76:22 | source(...) | main.rs:78:10:78:10 | b | $@ | main.rs:76:13:76:22 | source(...) | source(...) |
diff --git a/rust/ql/test/library-tests/dataflow/closures/inline-flow.ql b/rust/ql/test/library-tests/dataflow/lambdas/inline-flow.ql
similarity index 100%
rename from rust/ql/test/library-tests/dataflow/closures/inline-flow.ql
rename to rust/ql/test/library-tests/dataflow/lambdas/inline-flow.ql
diff --git a/rust/ql/test/library-tests/dataflow/closures/main.rs b/rust/ql/test/library-tests/dataflow/lambdas/main.rs
similarity index 54%
rename from rust/ql/test/library-tests/dataflow/closures/main.rs
rename to rust/ql/test/library-tests/dataflow/lambdas/main.rs
index 66ce59a3b04..252b132ec74 100644
--- a/rust/ql/test/library-tests/dataflow/closures/main.rs
+++ b/rust/ql/test/library-tests/dataflow/lambdas/main.rs
@@ -6,30 +6,25 @@ fn sink(s: i64) {
     println!("{}", s);
 }
 
-
 fn closure_flow_out() {
     let f = |cond| if cond { source(92) } else { 0 };
     sink(f(true)); // $ hasValueFlow=92
 }
 
 fn closure_flow_in() {
-    let f = |cond, data|
+    let f = |cond, data| {
         if cond {
             sink(data); // $ hasValueFlow=87
         } else {
             sink(0)
-        };
+        }
+    };
     let a = source(87);
     f(true, a);
 }
 
 fn closure_flow_through() {
-    let f = |cond, data|
-        if cond {
-            data
-        } else {
-            0
-        };
+    let f = |cond, data| if cond { data } else { 0 };
     let a = source(43);
     let b = f(true, a);
     sink(b); // $ hasValueFlow=43
@@ -49,9 +44,46 @@ fn closure_captured_variable() {
     g();
 }
 
+fn get_from_source() -> i64 {
+    source(93)
+}
+
+fn pass_to_sink(data: i64) {
+    sink(data); // $ hasValueFlow=34
+}
+
+fn function_flow_out() {
+    let f = get_from_source;
+    sink(f()); // $ hasValueFlow=93
+}
+
+fn function_flow_in() {
+    let f = pass_to_sink;
+    let a = source(34);
+    f(a);
+}
+
+fn get_arg(cond: bool, data: i64) -> i64 {
+    if cond {
+        data
+    } else {
+        0
+    }
+}
+
+fn function_flows_through() {
+    let f = get_arg;
+    let a = source(56);
+    let b = f(true, a);
+    sink(b); // $ hasValueFlow=56
+}
+
 fn main() {
     closure_flow_out();
     closure_flow_in();
     closure_flow_through();
     closure_captured_variable();
+    function_flow_in();
+    function_flow_out();
+    function_flows_through();
 }
diff --git a/rust/ql/test/library-tests/dataflow/local/CONSISTENCY/PathResolutionConsistency.expected b/rust/ql/test/library-tests/dataflow/local/CONSISTENCY/PathResolutionConsistency.expected
deleted file mode 100644
index 75c14035c45..00000000000
--- a/rust/ql/test/library-tests/dataflow/local/CONSISTENCY/PathResolutionConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-multipleCallTargets
-| main.rs:445:18:445:24 | n.len() |
diff --git a/rust/ql/test/library-tests/dataflow/local/DataFlowStep.expected b/rust/ql/test/library-tests/dataflow/local/DataFlowStep.expected
index b6bb529b23e..a7df3fdf7b3 100644
--- a/rust/ql/test/library-tests/dataflow/local/DataFlowStep.expected
+++ b/rust/ql/test/library-tests/dataflow/local/DataFlowStep.expected
@@ -1,1095 +1,1163 @@
 localStep
-| file://:0:0:0:0 | [summary param] self in fn canonicalize | file://:0:0:0:0 | [summary] read: Argument[self].OptionalBarrier[normalize-path] in fn canonicalize |
-| main.rs:3:11:3:11 | [SSA] i | main.rs:4:12:4:12 | i |
-| main.rs:3:11:3:11 | i | main.rs:3:11:3:11 | [SSA] i |
-| main.rs:3:11:3:11 | i | main.rs:3:11:3:11 | i |
-| main.rs:3:11:3:16 | ...: i64 | main.rs:3:11:3:11 | i |
-| main.rs:4:5:4:12 | ... + ... | main.rs:3:26:5:1 | { ... } |
-| main.rs:6:9:6:9 | [SSA] s | main.rs:7:20:7:20 | s |
-| main.rs:6:9:6:9 | s | main.rs:6:9:6:9 | [SSA] s |
-| main.rs:6:9:6:9 | s | main.rs:6:9:6:9 | s |
-| main.rs:6:9:6:14 | ...: i64 | main.rs:6:9:6:9 | s |
-| main.rs:7:14:7:20 | FormatArgsExpr | main.rs:7:14:7:20 | MacroExpr |
-| main.rs:7:14:7:20 | MacroBlockExpr | main.rs:7:5:7:21 | MacroExpr |
-| main.rs:7:14:7:20 | [post] MacroExpr | main.rs:7:14:7:20 | [post] FormatArgsExpr |
-| main.rs:7:14:7:20 | { ... } | main.rs:7:14:7:20 | MacroBlockExpr |
-| main.rs:10:13:10:14 | [SSA] sr | main.rs:11:20:11:21 | sr |
-| main.rs:10:13:10:14 | sr | main.rs:10:13:10:14 | [SSA] sr |
-| main.rs:10:13:10:14 | sr | main.rs:10:13:10:14 | sr |
-| main.rs:10:13:10:20 | ...: ... | main.rs:10:13:10:14 | sr |
-| main.rs:11:14:11:21 | FormatArgsExpr | main.rs:11:14:11:21 | MacroExpr |
-| main.rs:11:14:11:21 | MacroBlockExpr | main.rs:11:5:11:22 | MacroExpr |
-| main.rs:11:14:11:21 | [post] MacroExpr | main.rs:11:14:11:21 | [post] FormatArgsExpr |
-| main.rs:11:14:11:21 | { ... } | main.rs:11:14:11:21 | MacroBlockExpr |
-| main.rs:22:9:22:9 | [SSA] s | main.rs:23:10:23:10 | s |
-| main.rs:22:9:22:9 | s | main.rs:22:9:22:9 | [SSA] s |
-| main.rs:22:9:22:9 | s | main.rs:22:9:22:9 | s |
-| main.rs:22:13:22:21 | source(...) | main.rs:22:9:22:9 | s |
-| main.rs:26:18:26:21 | [SSA] cond | main.rs:29:16:29:19 | cond |
-| main.rs:26:18:26:21 | cond | main.rs:26:18:26:21 | [SSA] cond |
-| main.rs:26:18:26:21 | cond | main.rs:26:18:26:21 | cond |
-| main.rs:26:18:26:27 | ...: bool | main.rs:26:18:26:21 | cond |
-| main.rs:27:9:27:9 | [SSA] a | main.rs:29:23:29:23 | a |
-| main.rs:27:9:27:9 | a | main.rs:27:9:27:9 | [SSA] a |
-| main.rs:27:9:27:9 | a | main.rs:27:9:27:9 | a |
-| main.rs:27:13:27:21 | source(...) | main.rs:27:9:27:9 | a |
-| main.rs:28:9:28:9 | [SSA] b | main.rs:29:34:29:34 | b |
-| main.rs:28:9:28:9 | b | main.rs:28:9:28:9 | [SSA] b |
-| main.rs:28:9:28:9 | b | main.rs:28:9:28:9 | b |
-| main.rs:28:13:28:13 | 2 | main.rs:28:9:28:9 | b |
-| main.rs:29:9:29:9 | [SSA] c | main.rs:30:10:30:10 | c |
-| main.rs:29:9:29:9 | c | main.rs:29:9:29:9 | [SSA] c |
-| main.rs:29:9:29:9 | c | main.rs:29:9:29:9 | c |
-| main.rs:29:13:29:36 | if cond {...} else {...} | main.rs:29:9:29:9 | c |
-| main.rs:29:21:29:25 | { ... } | main.rs:29:13:29:36 | if cond {...} else {...} |
-| main.rs:29:23:29:23 | a | main.rs:29:21:29:25 | { ... } |
-| main.rs:29:32:29:36 | { ... } | main.rs:29:13:29:36 | if cond {...} else {...} |
-| main.rs:29:34:29:34 | b | main.rs:29:32:29:36 | { ... } |
-| main.rs:33:21:33:21 | [SSA] m | main.rs:35:19:35:19 | m |
-| main.rs:33:21:33:21 | m | main.rs:33:21:33:21 | [SSA] m |
-| main.rs:33:21:33:21 | m | main.rs:33:21:33:21 | m |
-| main.rs:33:21:33:34 | ...: Option::<...> | main.rs:33:21:33:21 | m |
-| main.rs:34:9:34:9 | [SSA] a | main.rs:36:20:36:20 | a |
-| main.rs:34:9:34:9 | a | main.rs:34:9:34:9 | [SSA] a |
-| main.rs:34:9:34:9 | a | main.rs:34:9:34:9 | a |
-| main.rs:34:13:34:21 | source(...) | main.rs:34:9:34:9 | a |
-| main.rs:35:9:35:9 | [SSA] b | main.rs:39:10:39:10 | b |
-| main.rs:35:9:35:9 | b | main.rs:35:9:35:9 | [SSA] b |
-| main.rs:35:9:35:9 | b | main.rs:35:9:35:9 | b |
-| main.rs:35:13:38:5 | match m { ... } | main.rs:35:9:35:9 | b |
-| main.rs:35:19:35:19 | m | main.rs:36:9:36:15 | Some(...) |
-| main.rs:35:19:35:19 | m | main.rs:37:9:37:12 | None |
-| main.rs:36:20:36:20 | a | main.rs:35:13:38:5 | match m { ... } |
-| main.rs:37:17:37:17 | 0 | main.rs:35:13:38:5 | match m { ... } |
-| main.rs:43:9:43:9 | [SSA] a | main.rs:46:10:46:10 | a |
-| main.rs:43:9:43:9 | a | main.rs:43:9:43:9 | [SSA] a |
-| main.rs:43:9:43:9 | a | main.rs:43:9:43:9 | a |
-| main.rs:43:13:45:5 | loop { ... } | main.rs:43:9:43:9 | a |
-| main.rs:44:9:44:15 | break 1 | main.rs:43:13:45:5 | loop { ... } |
-| main.rs:44:15:44:15 | 1 | main.rs:44:9:44:15 | break 1 |
-| main.rs:47:9:47:9 | [SSA] b | main.rs:50:10:50:10 | b |
-| main.rs:47:9:47:9 | b | main.rs:47:9:47:9 | [SSA] b |
-| main.rs:47:9:47:9 | b | main.rs:47:9:47:9 | b |
-| main.rs:47:13:49:5 | loop { ... } | main.rs:47:9:47:9 | b |
-| main.rs:48:9:48:23 | break ... | main.rs:47:13:49:5 | loop { ... } |
-| main.rs:48:15:48:23 | source(...) | main.rs:48:9:48:23 | break ... |
-| main.rs:54:9:54:13 | mut i | main.rs:54:13:54:13 | i |
-| main.rs:54:13:54:13 | [SSA] i | main.rs:55:10:55:10 | i |
-| main.rs:54:13:54:13 | i | main.rs:54:13:54:13 | [SSA] i |
-| main.rs:54:17:54:17 | 1 | main.rs:54:9:54:13 | mut i |
-| main.rs:56:5:56:5 | [SSA] i | main.rs:57:10:57:10 | i |
-| main.rs:56:5:56:5 | i | main.rs:56:5:56:5 | [SSA] i |
-| main.rs:56:9:56:17 | source(...) | main.rs:56:5:56:5 | i |
-| main.rs:61:9:61:9 | [SSA] a | main.rs:62:5:62:5 | a |
-| main.rs:61:9:61:9 | a | main.rs:61:9:61:9 | [SSA] a |
-| main.rs:61:9:61:9 | a | main.rs:61:9:61:9 | a |
-| main.rs:61:13:61:17 | { ... } | main.rs:61:9:61:9 | a |
-| main.rs:61:15:61:15 | 0 | main.rs:61:13:61:17 | { ... } |
-| main.rs:62:5:62:5 | a | main.rs:60:31:63:1 | { ... } |
-| main.rs:65:22:65:22 | [SSA] b | main.rs:67:12:67:12 | b |
-| main.rs:65:22:65:22 | b | main.rs:65:22:65:22 | [SSA] b |
-| main.rs:65:22:65:22 | b | main.rs:65:22:65:22 | b |
-| main.rs:65:22:65:28 | ...: bool | main.rs:65:22:65:22 | b |
-| main.rs:66:9:66:9 | [SSA] a | main.rs:72:5:72:5 | a |
-| main.rs:66:9:66:9 | a | main.rs:66:9:66:9 | [SSA] a |
-| main.rs:66:9:66:9 | a | main.rs:66:9:66:9 | a |
-| main.rs:66:13:71:5 | 'block: { ... } | main.rs:66:9:66:9 | a |
-| main.rs:68:13:68:26 | break 'block 1 | main.rs:66:13:71:5 | 'block: { ... } |
-| main.rs:68:26:68:26 | 1 | main.rs:68:13:68:26 | break 'block 1 |
-| main.rs:70:9:70:9 | 2 | main.rs:66:13:71:5 | 'block: { ... } |
-| main.rs:72:5:72:5 | a | main.rs:65:38:73:1 | { ... } |
-| main.rs:75:22:75:22 | [SSA] b | main.rs:77:12:77:12 | b |
-| main.rs:75:22:75:22 | b | main.rs:75:22:75:22 | [SSA] b |
-| main.rs:75:22:75:22 | b | main.rs:75:22:75:22 | b |
-| main.rs:75:22:75:28 | ...: bool | main.rs:75:22:75:22 | b |
-| main.rs:76:9:76:9 | [SSA] a | main.rs:82:5:82:5 | a |
-| main.rs:76:9:76:9 | a | main.rs:76:9:76:9 | [SSA] a |
-| main.rs:76:9:76:9 | a | main.rs:76:9:76:9 | a |
-| main.rs:76:13:81:5 | 'block: { ... } | main.rs:76:9:76:9 | a |
-| main.rs:78:13:78:26 | break 'block 1 | main.rs:76:13:81:5 | 'block: { ... } |
-| main.rs:78:26:78:26 | 1 | main.rs:78:13:78:26 | break 'block 1 |
-| main.rs:80:9:80:22 | break 'block 2 | main.rs:76:13:81:5 | 'block: { ... } |
-| main.rs:80:22:80:22 | 2 | main.rs:80:9:80:22 | break 'block 2 |
-| main.rs:82:5:82:5 | a | main.rs:75:38:83:1 | { ... } |
-| main.rs:89:9:89:9 | [SSA] i | main.rs:90:11:90:11 | i |
-| main.rs:89:9:89:9 | i | main.rs:89:9:89:9 | [SSA] i |
-| main.rs:89:9:89:9 | i | main.rs:89:9:89:9 | i |
-| main.rs:89:13:89:31 | ...::new(...) | main.rs:89:9:89:9 | i |
-| main.rs:90:11:90:11 | [post] receiver for i | main.rs:90:11:90:11 | [post] i |
-| main.rs:90:11:90:11 | i | main.rs:90:11:90:11 | receiver for i |
-| main.rs:97:9:97:9 | [SSA] a | main.rs:98:10:98:10 | a |
-| main.rs:97:9:97:9 | a | main.rs:97:9:97:9 | [SSA] a |
-| main.rs:97:9:97:9 | a | main.rs:97:9:97:9 | a |
-| main.rs:97:13:97:26 | TupleExpr | main.rs:97:9:97:9 | a |
-| main.rs:98:10:98:10 | [post] a | main.rs:99:10:99:10 | a |
-| main.rs:98:10:98:10 | a | main.rs:99:10:99:10 | a |
-| main.rs:103:9:103:9 | [SSA] a | main.rs:104:24:104:24 | a |
-| main.rs:103:9:103:9 | a | main.rs:103:9:103:9 | [SSA] a |
-| main.rs:103:9:103:9 | a | main.rs:103:9:103:9 | a |
-| main.rs:103:13:103:30 | TupleExpr | main.rs:103:9:103:9 | a |
-| main.rs:104:10:104:11 | [SSA] a0 | main.rs:105:10:105:11 | a0 |
-| main.rs:104:10:104:11 | a0 | main.rs:104:10:104:11 | [SSA] a0 |
-| main.rs:104:10:104:11 | a0 | main.rs:104:10:104:11 | a0 |
-| main.rs:104:14:104:15 | [SSA] a1 | main.rs:106:10:106:11 | a1 |
-| main.rs:104:14:104:15 | a1 | main.rs:104:14:104:15 | [SSA] a1 |
-| main.rs:104:14:104:15 | a1 | main.rs:104:14:104:15 | a1 |
-| main.rs:104:18:104:19 | [SSA] a2 | main.rs:107:10:107:11 | a2 |
-| main.rs:104:18:104:19 | a2 | main.rs:104:18:104:19 | [SSA] a2 |
-| main.rs:104:18:104:19 | a2 | main.rs:104:18:104:19 | a2 |
-| main.rs:104:24:104:24 | a | main.rs:104:9:104:20 | TuplePat |
-| main.rs:111:9:111:13 | mut a | main.rs:111:13:111:13 | a |
-| main.rs:111:13:111:13 | [SSA] a | main.rs:112:10:112:10 | a |
-| main.rs:111:13:111:13 | a | main.rs:111:13:111:13 | [SSA] a |
-| main.rs:111:17:111:31 | TupleExpr | main.rs:111:9:111:13 | mut a |
-| main.rs:112:10:112:10 | [post] a | main.rs:113:10:113:10 | a |
-| main.rs:112:10:112:10 | a | main.rs:113:10:113:10 | a |
-| main.rs:113:10:113:10 | [post] a | main.rs:114:5:114:5 | a |
-| main.rs:113:10:113:10 | a | main.rs:114:5:114:5 | a |
-| main.rs:114:5:114:5 | [post] a | main.rs:115:5:115:5 | a |
-| main.rs:114:5:114:5 | a | main.rs:115:5:115:5 | a |
-| main.rs:114:11:114:20 | source(...) | main.rs:114:5:114:7 | a.0 |
-| main.rs:115:5:115:5 | [post] a | main.rs:116:10:116:10 | a |
-| main.rs:115:5:115:5 | a | main.rs:116:10:116:10 | a |
-| main.rs:115:11:115:11 | 2 | main.rs:115:5:115:7 | a.1 |
-| main.rs:116:10:116:10 | [post] a | main.rs:117:10:117:10 | a |
-| main.rs:116:10:116:10 | a | main.rs:117:10:117:10 | a |
-| main.rs:121:9:121:9 | [SSA] a | main.rs:122:14:122:14 | a |
-| main.rs:121:9:121:9 | a | main.rs:121:9:121:9 | [SSA] a |
-| main.rs:121:9:121:9 | a | main.rs:121:9:121:9 | a |
-| main.rs:121:13:121:27 | TupleExpr | main.rs:121:9:121:9 | a |
-| main.rs:122:9:122:9 | [SSA] b | main.rs:123:10:123:10 | b |
-| main.rs:122:9:122:9 | b | main.rs:122:9:122:9 | [SSA] b |
-| main.rs:122:9:122:9 | b | main.rs:122:9:122:9 | b |
-| main.rs:122:13:122:18 | TupleExpr | main.rs:122:9:122:9 | b |
-| main.rs:123:10:123:10 | [post] b | main.rs:124:10:124:10 | b |
-| main.rs:123:10:123:10 | b | main.rs:124:10:124:10 | b |
-| main.rs:124:10:124:10 | [post] b | main.rs:125:10:125:10 | b |
-| main.rs:124:10:124:10 | b | main.rs:125:10:125:10 | b |
-| main.rs:137:9:137:9 | [SSA] p | main.rs:138:10:138:10 | p |
-| main.rs:137:9:137:9 | p | main.rs:137:9:137:9 | [SSA] p |
-| main.rs:137:9:137:9 | p | main.rs:137:9:137:9 | p |
-| main.rs:137:13:137:40 | Point {...} | main.rs:137:9:137:9 | p |
-| main.rs:138:10:138:10 | [post] p | main.rs:139:10:139:10 | p |
-| main.rs:138:10:138:10 | p | main.rs:139:10:139:10 | p |
-| main.rs:143:9:143:13 | mut p | main.rs:143:13:143:13 | p |
-| main.rs:143:13:143:13 | [SSA] p | main.rs:144:10:144:10 | p |
-| main.rs:143:13:143:13 | p | main.rs:143:13:143:13 | [SSA] p |
-| main.rs:143:17:143:44 | Point {...} | main.rs:143:9:143:13 | mut p |
-| main.rs:144:10:144:10 | [post] p | main.rs:145:5:145:5 | p |
-| main.rs:144:10:144:10 | p | main.rs:145:5:145:5 | p |
-| main.rs:145:5:145:5 | [post] p | main.rs:146:10:146:10 | p |
-| main.rs:145:5:145:5 | p | main.rs:146:10:146:10 | p |
-| main.rs:145:11:145:20 | source(...) | main.rs:145:5:145:7 | p.y |
-| main.rs:150:9:150:9 | [SSA] p | main.rs:154:32:154:32 | p |
-| main.rs:150:9:150:9 | p | main.rs:150:9:150:9 | [SSA] p |
-| main.rs:150:9:150:9 | p | main.rs:150:9:150:9 | p |
-| main.rs:150:13:153:5 | Point {...} | main.rs:150:9:150:9 | p |
-| main.rs:154:20:154:20 | [SSA] a | main.rs:155:10:155:10 | a |
-| main.rs:154:20:154:20 | a | main.rs:154:20:154:20 | [SSA] a |
-| main.rs:154:20:154:20 | a | main.rs:154:20:154:20 | a |
-| main.rs:154:26:154:26 | [SSA] b | main.rs:156:10:156:10 | b |
-| main.rs:154:26:154:26 | b | main.rs:154:26:154:26 | [SSA] b |
-| main.rs:154:26:154:26 | b | main.rs:154:26:154:26 | b |
-| main.rs:154:32:154:32 | p | main.rs:154:9:154:28 | Point {...} |
-| main.rs:165:9:165:9 | [SSA] p | main.rs:172:10:172:10 | p |
-| main.rs:165:9:165:9 | p | main.rs:165:9:165:9 | [SSA] p |
-| main.rs:165:9:165:9 | p | main.rs:165:9:165:9 | p |
-| main.rs:165:13:171:5 | Point3D {...} | main.rs:165:9:165:9 | p |
-| main.rs:172:10:172:10 | [post] p | main.rs:173:10:173:10 | p |
-| main.rs:172:10:172:10 | p | main.rs:173:10:173:10 | p |
-| main.rs:173:10:173:10 | [post] p | main.rs:174:10:174:10 | p |
-| main.rs:173:10:173:10 | p | main.rs:174:10:174:10 | p |
-| main.rs:178:9:178:9 | [SSA] y | main.rs:180:30:180:30 | y |
-| main.rs:178:9:178:9 | y | main.rs:178:9:178:9 | [SSA] y |
-| main.rs:178:9:178:9 | y | main.rs:178:9:178:9 | y |
-| main.rs:178:13:178:22 | source(...) | main.rs:178:9:178:9 | y |
-| main.rs:179:9:179:9 | [SSA] p | main.rs:183:11:183:11 | p |
-| main.rs:179:9:179:9 | p | main.rs:179:9:179:9 | [SSA] p |
-| main.rs:179:9:179:9 | p | main.rs:179:9:179:9 | p |
-| main.rs:179:13:182:5 | Point3D {...} | main.rs:179:9:179:9 | p |
-| main.rs:183:5:192:5 | match p { ... } | main.rs:177:26:193:1 | { ... } |
-| main.rs:183:11:183:11 | p | main.rs:184:9:187:9 | Point3D {...} |
-| main.rs:185:28:185:28 | [SSA] x | main.rs:188:18:188:18 | x |
-| main.rs:185:28:185:28 | x | main.rs:185:28:185:28 | [SSA] x |
-| main.rs:185:28:185:28 | x | main.rs:185:28:185:28 | x |
-| main.rs:185:31:185:31 | [SSA] y | main.rs:189:18:189:18 | y |
-| main.rs:185:31:185:31 | y | main.rs:185:31:185:31 | [SSA] y |
-| main.rs:185:31:185:31 | y | main.rs:185:31:185:31 | y |
-| main.rs:186:13:186:13 | [SSA] z | main.rs:190:18:190:18 | z |
-| main.rs:186:13:186:13 | z | main.rs:186:13:186:13 | [SSA] z |
-| main.rs:186:13:186:13 | z | main.rs:186:13:186:13 | z |
-| main.rs:187:14:191:9 | { ... } | main.rs:183:5:192:5 | match p { ... } |
-| main.rs:198:9:198:9 | [SSA] s | main.rs:199:10:199:10 | s |
-| main.rs:198:9:198:9 | s | main.rs:198:9:198:9 | [SSA] s |
-| main.rs:198:9:198:9 | s | main.rs:198:9:198:9 | s |
-| main.rs:198:13:198:40 | MyTupleStruct(...) | main.rs:198:9:198:9 | s |
-| main.rs:199:10:199:10 | [post] s | main.rs:200:10:200:10 | s |
-| main.rs:199:10:199:10 | s | main.rs:200:10:200:10 | s |
-| main.rs:200:10:200:10 | [post] s | main.rs:202:11:202:11 | s |
-| main.rs:200:10:200:10 | s | main.rs:202:11:202:11 | s |
-| main.rs:202:5:207:5 | match s { ... } | main.rs:197:19:208:1 | { ... } |
-| main.rs:202:11:202:11 | s | main.rs:203:9:203:27 | MyTupleStruct(...) |
-| main.rs:203:23:203:23 | [SSA] x | main.rs:204:18:204:18 | x |
-| main.rs:203:23:203:23 | x | main.rs:203:23:203:23 | [SSA] x |
-| main.rs:203:23:203:23 | x | main.rs:203:23:203:23 | x |
-| main.rs:203:26:203:26 | [SSA] y | main.rs:205:18:205:18 | y |
-| main.rs:203:26:203:26 | y | main.rs:203:26:203:26 | [SSA] y |
-| main.rs:203:26:203:26 | y | main.rs:203:26:203:26 | y |
-| main.rs:203:32:206:9 | { ... } | main.rs:202:5:207:5 | match s { ... } |
-| main.rs:214:9:214:10 | [SSA] s1 | main.rs:216:11:216:12 | s1 |
-| main.rs:214:9:214:10 | s1 | main.rs:214:9:214:10 | [SSA] s1 |
-| main.rs:214:9:214:10 | s1 | main.rs:214:9:214:10 | s1 |
-| main.rs:214:14:214:37 | ...::Some(...) | main.rs:214:9:214:10 | s1 |
-| main.rs:215:9:215:10 | [SSA] s2 | main.rs:220:11:220:12 | s2 |
-| main.rs:215:9:215:10 | s2 | main.rs:215:9:215:10 | [SSA] s2 |
-| main.rs:215:9:215:10 | s2 | main.rs:215:9:215:10 | s2 |
-| main.rs:215:14:215:28 | ...::Some(...) | main.rs:215:9:215:10 | s2 |
-| main.rs:216:11:216:12 | s1 | main.rs:217:9:217:23 | ...::Some(...) |
-| main.rs:216:11:216:12 | s1 | main.rs:218:9:218:20 | ...::None |
-| main.rs:217:22:217:22 | [SSA] n | main.rs:217:33:217:33 | n |
-| main.rs:217:22:217:22 | n | main.rs:217:22:217:22 | [SSA] n |
-| main.rs:217:22:217:22 | n | main.rs:217:22:217:22 | n |
-| main.rs:217:28:217:34 | sink(...) | main.rs:216:5:219:5 | match s1 { ... } |
-| main.rs:218:25:218:31 | sink(...) | main.rs:216:5:219:5 | match s1 { ... } |
-| main.rs:220:5:223:5 | match s2 { ... } | main.rs:213:37:224:1 | { ... } |
-| main.rs:220:11:220:12 | s2 | main.rs:221:9:221:23 | ...::Some(...) |
-| main.rs:220:11:220:12 | s2 | main.rs:222:9:222:20 | ...::None |
-| main.rs:221:22:221:22 | [SSA] n | main.rs:221:33:221:33 | n |
-| main.rs:221:22:221:22 | n | main.rs:221:22:221:22 | [SSA] n |
-| main.rs:221:22:221:22 | n | main.rs:221:22:221:22 | n |
-| main.rs:221:28:221:34 | sink(...) | main.rs:220:5:223:5 | match s2 { ... } |
-| main.rs:222:25:222:31 | sink(...) | main.rs:220:5:223:5 | match s2 { ... } |
-| main.rs:227:9:227:10 | [SSA] s1 | main.rs:229:11:229:12 | s1 |
-| main.rs:227:9:227:10 | s1 | main.rs:227:9:227:10 | [SSA] s1 |
-| main.rs:227:9:227:10 | s1 | main.rs:227:9:227:10 | s1 |
-| main.rs:227:14:227:29 | Some(...) | main.rs:227:9:227:10 | s1 |
-| main.rs:228:9:228:10 | [SSA] s2 | main.rs:233:11:233:12 | s2 |
-| main.rs:228:9:228:10 | s2 | main.rs:228:9:228:10 | [SSA] s2 |
-| main.rs:228:9:228:10 | s2 | main.rs:228:9:228:10 | s2 |
-| main.rs:228:14:228:20 | Some(...) | main.rs:228:9:228:10 | s2 |
-| main.rs:229:11:229:12 | s1 | main.rs:230:9:230:15 | Some(...) |
-| main.rs:229:11:229:12 | s1 | main.rs:231:9:231:12 | None |
-| main.rs:230:14:230:14 | [SSA] n | main.rs:230:25:230:25 | n |
-| main.rs:230:14:230:14 | n | main.rs:230:14:230:14 | [SSA] n |
-| main.rs:230:14:230:14 | n | main.rs:230:14:230:14 | n |
-| main.rs:230:20:230:26 | sink(...) | main.rs:229:5:232:5 | match s1 { ... } |
-| main.rs:231:17:231:23 | sink(...) | main.rs:229:5:232:5 | match s1 { ... } |
-| main.rs:233:5:236:5 | match s2 { ... } | main.rs:226:39:237:1 | { ... } |
-| main.rs:233:11:233:12 | s2 | main.rs:234:9:234:15 | Some(...) |
-| main.rs:233:11:233:12 | s2 | main.rs:235:9:235:12 | None |
-| main.rs:234:14:234:14 | [SSA] n | main.rs:234:25:234:25 | n |
-| main.rs:234:14:234:14 | n | main.rs:234:14:234:14 | [SSA] n |
-| main.rs:234:14:234:14 | n | main.rs:234:14:234:14 | n |
-| main.rs:234:20:234:26 | sink(...) | main.rs:233:5:236:5 | match s2 { ... } |
-| main.rs:235:17:235:23 | sink(...) | main.rs:233:5:236:5 | match s2 { ... } |
-| main.rs:240:9:240:10 | [SSA] s1 | main.rs:241:10:241:11 | s1 |
+| file://:0:0:0:0 | [summary param] 0 in fn canonicalize | file://:0:0:0:0 | [summary] read: Argument[0].OptionalBarrier[normalize-path] in fn canonicalize |
+| file://:0:0:0:0 | [summary] read: Argument[self].Reference in fn canonicalize | file://:0:0:0:0 | [summary] read: Argument[self].Reference.OptionalBarrier[normalize-path] in fn canonicalize |
+| main.rs:4:11:4:11 | [SSA] i | main.rs:5:12:5:12 | i |
+| main.rs:4:11:4:11 | i | main.rs:4:11:4:11 | [SSA] i |
+| main.rs:4:11:4:11 | i | main.rs:4:11:4:11 | i |
+| main.rs:4:11:4:16 | ...: i64 | main.rs:4:11:4:11 | i |
+| main.rs:5:5:5:12 | ... + ... | main.rs:4:26:6:1 | { ... } |
+| main.rs:7:9:7:9 | [SSA] s | main.rs:8:20:8:20 | s |
+| main.rs:7:9:7:9 | s | main.rs:7:9:7:9 | [SSA] s |
+| main.rs:7:9:7:9 | s | main.rs:7:9:7:9 | s |
+| main.rs:7:9:7:14 | ...: i64 | main.rs:7:9:7:9 | s |
+| main.rs:8:14:8:20 | FormatArgsExpr | main.rs:8:14:8:20 | MacroExpr |
+| main.rs:8:14:8:20 | MacroBlockExpr | main.rs:8:5:8:21 | MacroExpr |
+| main.rs:8:14:8:20 | [post] MacroExpr | main.rs:8:14:8:20 | [post] FormatArgsExpr |
+| main.rs:8:14:8:20 | { ... } | main.rs:8:14:8:20 | MacroBlockExpr |
+| main.rs:11:13:11:14 | [SSA] sr | main.rs:12:20:12:21 | sr |
+| main.rs:11:13:11:14 | sr | main.rs:11:13:11:14 | [SSA] sr |
+| main.rs:11:13:11:14 | sr | main.rs:11:13:11:14 | sr |
+| main.rs:11:13:11:20 | ...: ... | main.rs:11:13:11:14 | sr |
+| main.rs:12:14:12:21 | FormatArgsExpr | main.rs:12:14:12:21 | MacroExpr |
+| main.rs:12:14:12:21 | MacroBlockExpr | main.rs:12:5:12:22 | MacroExpr |
+| main.rs:12:14:12:21 | [post] MacroExpr | main.rs:12:14:12:21 | [post] FormatArgsExpr |
+| main.rs:12:14:12:21 | { ... } | main.rs:12:14:12:21 | MacroBlockExpr |
+| main.rs:23:9:23:9 | [SSA] s | main.rs:24:10:24:10 | s |
+| main.rs:23:9:23:9 | s | main.rs:23:9:23:9 | [SSA] s |
+| main.rs:23:9:23:9 | s | main.rs:23:9:23:9 | s |
+| main.rs:23:13:23:21 | source(...) | main.rs:23:9:23:9 | s |
+| main.rs:24:10:24:10 | [post] s | main.rs:26:16:26:16 | s |
+| main.rs:24:10:24:10 | s | main.rs:26:16:26:16 | s |
+| main.rs:26:12:26:12 | [SSA] x | main.rs:27:14:27:14 | x |
+| main.rs:26:12:26:12 | x | main.rs:26:12:26:12 | [SSA] x |
+| main.rs:26:12:26:12 | x | main.rs:26:12:26:12 | x |
+| main.rs:26:16:26:16 | s | main.rs:26:12:26:12 | x |
+| main.rs:26:16:26:16 | s | main.rs:30:16:30:16 | s |
+| main.rs:26:18:28:5 | { ... } | main.rs:26:5:28:5 | if ... {...} |
+| main.rs:30:12:30:12 | [SSA] x | main.rs:32:18:32:18 | x |
+| main.rs:30:12:30:12 | x | main.rs:30:12:30:12 | [SSA] x |
+| main.rs:30:12:30:12 | x | main.rs:30:12:30:12 | x |
+| main.rs:30:16:30:16 | s | main.rs:30:12:30:12 | x |
+| main.rs:32:18:32:18 | [post] x | main.rs:36:14:36:14 | x |
+| main.rs:32:18:32:18 | x | main.rs:36:14:36:14 | x |
+| main.rs:33:13:33:16 | true | main.rs:31:12:34:9 | { ... } |
+| main.rs:35:5:37:5 | { ... } | main.rs:30:5:37:5 | if ... {...} |
+| main.rs:40:18:40:21 | [SSA] cond | main.rs:43:16:43:19 | cond |
+| main.rs:40:18:40:21 | cond | main.rs:40:18:40:21 | [SSA] cond |
+| main.rs:40:18:40:21 | cond | main.rs:40:18:40:21 | cond |
+| main.rs:40:18:40:27 | ...: bool | main.rs:40:18:40:21 | cond |
+| main.rs:41:9:41:9 | [SSA] a | main.rs:43:23:43:23 | a |
+| main.rs:41:9:41:9 | a | main.rs:41:9:41:9 | [SSA] a |
+| main.rs:41:9:41:9 | a | main.rs:41:9:41:9 | a |
+| main.rs:41:13:41:21 | source(...) | main.rs:41:9:41:9 | a |
+| main.rs:42:9:42:9 | [SSA] b | main.rs:43:34:43:34 | b |
+| main.rs:42:9:42:9 | b | main.rs:42:9:42:9 | [SSA] b |
+| main.rs:42:9:42:9 | b | main.rs:42:9:42:9 | b |
+| main.rs:42:13:42:13 | 2 | main.rs:42:9:42:9 | b |
+| main.rs:43:9:43:9 | [SSA] c | main.rs:44:10:44:10 | c |
+| main.rs:43:9:43:9 | c | main.rs:43:9:43:9 | [SSA] c |
+| main.rs:43:9:43:9 | c | main.rs:43:9:43:9 | c |
+| main.rs:43:13:43:36 | if cond {...} else {...} | main.rs:43:9:43:9 | c |
+| main.rs:43:21:43:25 | { ... } | main.rs:43:13:43:36 | if cond {...} else {...} |
+| main.rs:43:23:43:23 | a | main.rs:43:21:43:25 | { ... } |
+| main.rs:43:32:43:36 | { ... } | main.rs:43:13:43:36 | if cond {...} else {...} |
+| main.rs:43:34:43:34 | b | main.rs:43:32:43:36 | { ... } |
+| main.rs:47:21:47:21 | [SSA] m | main.rs:49:19:49:19 | m |
+| main.rs:47:21:47:21 | m | main.rs:47:21:47:21 | [SSA] m |
+| main.rs:47:21:47:21 | m | main.rs:47:21:47:21 | m |
+| main.rs:47:21:47:34 | ...: Option::<...> | main.rs:47:21:47:21 | m |
+| main.rs:48:9:48:9 | [SSA] a | main.rs:50:20:50:20 | a |
+| main.rs:48:9:48:9 | a | main.rs:48:9:48:9 | [SSA] a |
+| main.rs:48:9:48:9 | a | main.rs:48:9:48:9 | a |
+| main.rs:48:13:48:21 | source(...) | main.rs:48:9:48:9 | a |
+| main.rs:49:9:49:9 | [SSA] b | main.rs:53:10:53:10 | b |
+| main.rs:49:9:49:9 | b | main.rs:49:9:49:9 | [SSA] b |
+| main.rs:49:9:49:9 | b | main.rs:49:9:49:9 | b |
+| main.rs:49:13:52:5 | match m { ... } | main.rs:49:9:49:9 | b |
+| main.rs:49:19:49:19 | m | main.rs:50:9:50:15 | Some(...) |
+| main.rs:49:19:49:19 | m | main.rs:51:9:51:12 | None |
+| main.rs:50:20:50:20 | a | main.rs:49:13:52:5 | match m { ... } |
+| main.rs:51:17:51:17 | 0 | main.rs:49:13:52:5 | match m { ... } |
+| main.rs:57:9:57:9 | [SSA] a | main.rs:60:10:60:10 | a |
+| main.rs:57:9:57:9 | a | main.rs:57:9:57:9 | [SSA] a |
+| main.rs:57:9:57:9 | a | main.rs:57:9:57:9 | a |
+| main.rs:57:13:59:5 | loop { ... } | main.rs:57:9:57:9 | a |
+| main.rs:58:9:58:15 | break 1 | main.rs:57:13:59:5 | loop { ... } |
+| main.rs:58:15:58:15 | 1 | main.rs:58:9:58:15 | break 1 |
+| main.rs:61:9:61:9 | [SSA] b | main.rs:64:10:64:10 | b |
+| main.rs:61:9:61:9 | b | main.rs:61:9:61:9 | [SSA] b |
+| main.rs:61:9:61:9 | b | main.rs:61:9:61:9 | b |
+| main.rs:61:13:63:5 | loop { ... } | main.rs:61:9:61:9 | b |
+| main.rs:62:9:62:23 | break ... | main.rs:61:13:63:5 | loop { ... } |
+| main.rs:62:15:62:23 | source(...) | main.rs:62:9:62:23 | break ... |
+| main.rs:68:9:68:13 | mut i | main.rs:68:13:68:13 | i |
+| main.rs:68:13:68:13 | [SSA] i | main.rs:69:10:69:10 | i |
+| main.rs:68:13:68:13 | i | main.rs:68:13:68:13 | [SSA] i |
+| main.rs:68:17:68:17 | 1 | main.rs:68:9:68:13 | mut i |
+| main.rs:70:5:70:5 | [SSA] i | main.rs:71:10:71:10 | i |
+| main.rs:70:5:70:5 | i | main.rs:70:5:70:5 | [SSA] i |
+| main.rs:70:9:70:17 | source(...) | main.rs:70:5:70:5 | i |
+| main.rs:72:5:72:5 | [SSA] i | main.rs:73:10:73:10 | i |
+| main.rs:72:5:72:5 | i | main.rs:72:5:72:5 | [SSA] i |
+| main.rs:72:9:72:9 | 2 | main.rs:72:5:72:5 | i |
+| main.rs:75:9:75:13 | mut j | main.rs:75:13:75:13 | j |
+| main.rs:75:17:75:17 | 3 | main.rs:75:9:75:13 | mut j |
+| main.rs:76:9:76:9 | [SSA] k | main.rs:77:9:77:9 | k |
+| main.rs:76:9:76:9 | k | main.rs:76:9:76:9 | [SSA] k |
+| main.rs:76:9:76:9 | k | main.rs:76:9:76:9 | k |
+| main.rs:76:13:76:21 | source(...) | main.rs:76:9:76:9 | k |
+| main.rs:77:5:77:5 | [SSA] j | main.rs:78:10:78:10 | j |
+| main.rs:77:5:77:5 | j | main.rs:77:5:77:5 | [SSA] j |
+| main.rs:77:9:77:9 | k | main.rs:77:5:77:5 | j |
+| main.rs:77:9:77:9 | k | main.rs:79:10:79:10 | k |
+| main.rs:81:9:81:13 | mut l | main.rs:81:13:81:13 | l |
+| main.rs:81:13:81:13 | [SSA] l | main.rs:82:9:82:9 | l |
+| main.rs:81:13:81:13 | l | main.rs:81:13:81:13 | [SSA] l |
+| main.rs:81:17:81:25 | source(...) | main.rs:81:9:81:13 | mut l |
+| main.rs:82:5:82:5 | [SSA] l | main.rs:83:10:83:10 | l |
+| main.rs:82:5:82:5 | l | main.rs:82:5:82:5 | [SSA] l |
+| main.rs:82:9:82:9 | l | main.rs:82:5:82:5 | l |
+| main.rs:87:9:87:9 | [SSA] a | main.rs:88:5:88:5 | a |
+| main.rs:87:9:87:9 | a | main.rs:87:9:87:9 | [SSA] a |
+| main.rs:87:9:87:9 | a | main.rs:87:9:87:9 | a |
+| main.rs:87:13:87:17 | { ... } | main.rs:87:9:87:9 | a |
+| main.rs:87:15:87:15 | 0 | main.rs:87:13:87:17 | { ... } |
+| main.rs:88:5:88:5 | a | main.rs:86:31:89:1 | { ... } |
+| main.rs:91:22:91:22 | [SSA] b | main.rs:93:12:93:12 | b |
+| main.rs:91:22:91:22 | b | main.rs:91:22:91:22 | [SSA] b |
+| main.rs:91:22:91:22 | b | main.rs:91:22:91:22 | b |
+| main.rs:91:22:91:28 | ...: bool | main.rs:91:22:91:22 | b |
+| main.rs:92:9:92:9 | [SSA] a | main.rs:98:5:98:5 | a |
+| main.rs:92:9:92:9 | a | main.rs:92:9:92:9 | [SSA] a |
+| main.rs:92:9:92:9 | a | main.rs:92:9:92:9 | a |
+| main.rs:92:13:97:5 | 'block: { ... } | main.rs:92:9:92:9 | a |
+| main.rs:94:13:94:26 | break 'block 1 | main.rs:92:13:97:5 | 'block: { ... } |
+| main.rs:94:26:94:26 | 1 | main.rs:94:13:94:26 | break 'block 1 |
+| main.rs:96:9:96:9 | 2 | main.rs:92:13:97:5 | 'block: { ... } |
+| main.rs:98:5:98:5 | a | main.rs:91:38:99:1 | { ... } |
+| main.rs:101:22:101:22 | [SSA] b | main.rs:103:12:103:12 | b |
+| main.rs:101:22:101:22 | b | main.rs:101:22:101:22 | [SSA] b |
+| main.rs:101:22:101:22 | b | main.rs:101:22:101:22 | b |
+| main.rs:101:22:101:28 | ...: bool | main.rs:101:22:101:22 | b |
+| main.rs:102:9:102:9 | [SSA] a | main.rs:108:5:108:5 | a |
+| main.rs:102:9:102:9 | a | main.rs:102:9:102:9 | [SSA] a |
+| main.rs:102:9:102:9 | a | main.rs:102:9:102:9 | a |
+| main.rs:102:13:107:5 | 'block: { ... } | main.rs:102:9:102:9 | a |
+| main.rs:104:13:104:26 | break 'block 1 | main.rs:102:13:107:5 | 'block: { ... } |
+| main.rs:104:26:104:26 | 1 | main.rs:104:13:104:26 | break 'block 1 |
+| main.rs:106:9:106:22 | break 'block 2 | main.rs:102:13:107:5 | 'block: { ... } |
+| main.rs:106:22:106:22 | 2 | main.rs:106:9:106:22 | break 'block 2 |
+| main.rs:108:5:108:5 | a | main.rs:101:38:109:1 | { ... } |
+| main.rs:115:9:115:9 | [SSA] i | main.rs:116:11:116:11 | i |
+| main.rs:115:9:115:9 | i | main.rs:115:9:115:9 | [SSA] i |
+| main.rs:115:9:115:9 | i | main.rs:115:9:115:9 | i |
+| main.rs:115:13:115:31 | ...::new(...) | main.rs:115:9:115:9 | i |
+| main.rs:116:11:116:11 | [post] receiver for i | main.rs:116:11:116:11 | [post] i |
+| main.rs:116:11:116:11 | i | main.rs:116:11:116:11 | receiver for i |
+| main.rs:123:9:123:9 | [SSA] a | main.rs:124:10:124:10 | a |
+| main.rs:123:9:123:9 | a | main.rs:123:9:123:9 | [SSA] a |
+| main.rs:123:9:123:9 | a | main.rs:123:9:123:9 | a |
+| main.rs:123:13:123:26 | TupleExpr | main.rs:123:9:123:9 | a |
+| main.rs:124:10:124:10 | [post] a | main.rs:125:10:125:10 | a |
+| main.rs:124:10:124:10 | a | main.rs:125:10:125:10 | a |
+| main.rs:129:9:129:9 | [SSA] a | main.rs:130:24:130:24 | a |
+| main.rs:129:9:129:9 | a | main.rs:129:9:129:9 | [SSA] a |
+| main.rs:129:9:129:9 | a | main.rs:129:9:129:9 | a |
+| main.rs:129:13:129:30 | TupleExpr | main.rs:129:9:129:9 | a |
+| main.rs:130:10:130:11 | [SSA] a0 | main.rs:131:10:131:11 | a0 |
+| main.rs:130:10:130:11 | a0 | main.rs:130:10:130:11 | [SSA] a0 |
+| main.rs:130:10:130:11 | a0 | main.rs:130:10:130:11 | a0 |
+| main.rs:130:14:130:15 | [SSA] a1 | main.rs:132:10:132:11 | a1 |
+| main.rs:130:14:130:15 | a1 | main.rs:130:14:130:15 | [SSA] a1 |
+| main.rs:130:14:130:15 | a1 | main.rs:130:14:130:15 | a1 |
+| main.rs:130:18:130:19 | [SSA] a2 | main.rs:133:10:133:11 | a2 |
+| main.rs:130:18:130:19 | a2 | main.rs:130:18:130:19 | [SSA] a2 |
+| main.rs:130:18:130:19 | a2 | main.rs:130:18:130:19 | a2 |
+| main.rs:130:24:130:24 | a | main.rs:130:9:130:20 | TuplePat |
+| main.rs:137:9:137:13 | mut a | main.rs:137:13:137:13 | a |
+| main.rs:137:13:137:13 | [SSA] a | main.rs:138:10:138:10 | a |
+| main.rs:137:13:137:13 | a | main.rs:137:13:137:13 | [SSA] a |
+| main.rs:137:17:137:31 | TupleExpr | main.rs:137:9:137:13 | mut a |
+| main.rs:138:10:138:10 | [post] a | main.rs:139:10:139:10 | a |
+| main.rs:138:10:138:10 | a | main.rs:139:10:139:10 | a |
+| main.rs:139:10:139:10 | [post] a | main.rs:140:5:140:5 | a |
+| main.rs:139:10:139:10 | a | main.rs:140:5:140:5 | a |
+| main.rs:140:5:140:5 | [post] a | main.rs:141:5:141:5 | a |
+| main.rs:140:5:140:5 | a | main.rs:141:5:141:5 | a |
+| main.rs:140:11:140:20 | source(...) | main.rs:140:5:140:7 | a.0 |
+| main.rs:141:5:141:5 | [post] a | main.rs:142:10:142:10 | a |
+| main.rs:141:5:141:5 | a | main.rs:142:10:142:10 | a |
+| main.rs:141:11:141:11 | 2 | main.rs:141:5:141:7 | a.1 |
+| main.rs:142:10:142:10 | [post] a | main.rs:143:10:143:10 | a |
+| main.rs:142:10:142:10 | a | main.rs:143:10:143:10 | a |
+| main.rs:147:9:147:9 | [SSA] a | main.rs:148:14:148:14 | a |
+| main.rs:147:9:147:9 | a | main.rs:147:9:147:9 | [SSA] a |
+| main.rs:147:9:147:9 | a | main.rs:147:9:147:9 | a |
+| main.rs:147:13:147:27 | TupleExpr | main.rs:147:9:147:9 | a |
+| main.rs:148:9:148:9 | [SSA] b | main.rs:149:10:149:10 | b |
+| main.rs:148:9:148:9 | b | main.rs:148:9:148:9 | [SSA] b |
+| main.rs:148:9:148:9 | b | main.rs:148:9:148:9 | b |
+| main.rs:148:13:148:18 | TupleExpr | main.rs:148:9:148:9 | b |
+| main.rs:149:10:149:10 | [post] b | main.rs:150:10:150:10 | b |
+| main.rs:149:10:149:10 | b | main.rs:150:10:150:10 | b |
+| main.rs:150:10:150:10 | [post] b | main.rs:151:10:151:10 | b |
+| main.rs:150:10:150:10 | b | main.rs:151:10:151:10 | b |
+| main.rs:163:9:163:9 | [SSA] p | main.rs:164:10:164:10 | p |
+| main.rs:163:9:163:9 | p | main.rs:163:9:163:9 | [SSA] p |
+| main.rs:163:9:163:9 | p | main.rs:163:9:163:9 | p |
+| main.rs:163:13:163:40 | Point {...} | main.rs:163:9:163:9 | p |
+| main.rs:164:10:164:10 | [post] p | main.rs:165:10:165:10 | p |
+| main.rs:164:10:164:10 | p | main.rs:165:10:165:10 | p |
+| main.rs:169:9:169:13 | mut p | main.rs:169:13:169:13 | p |
+| main.rs:169:13:169:13 | [SSA] p | main.rs:170:10:170:10 | p |
+| main.rs:169:13:169:13 | p | main.rs:169:13:169:13 | [SSA] p |
+| main.rs:169:17:169:44 | Point {...} | main.rs:169:9:169:13 | mut p |
+| main.rs:170:10:170:10 | [post] p | main.rs:171:5:171:5 | p |
+| main.rs:170:10:170:10 | p | main.rs:171:5:171:5 | p |
+| main.rs:171:5:171:5 | [post] p | main.rs:172:10:172:10 | p |
+| main.rs:171:5:171:5 | p | main.rs:172:10:172:10 | p |
+| main.rs:171:11:171:20 | source(...) | main.rs:171:5:171:7 | p.y |
+| main.rs:176:9:176:9 | [SSA] p | main.rs:180:32:180:32 | p |
+| main.rs:176:9:176:9 | p | main.rs:176:9:176:9 | [SSA] p |
+| main.rs:176:9:176:9 | p | main.rs:176:9:176:9 | p |
+| main.rs:176:13:179:5 | Point {...} | main.rs:176:9:176:9 | p |
+| main.rs:180:20:180:20 | [SSA] a | main.rs:181:10:181:10 | a |
+| main.rs:180:20:180:20 | a | main.rs:180:20:180:20 | [SSA] a |
+| main.rs:180:20:180:20 | a | main.rs:180:20:180:20 | a |
+| main.rs:180:26:180:26 | [SSA] b | main.rs:182:10:182:10 | b |
+| main.rs:180:26:180:26 | b | main.rs:180:26:180:26 | [SSA] b |
+| main.rs:180:26:180:26 | b | main.rs:180:26:180:26 | b |
+| main.rs:180:32:180:32 | p | main.rs:180:9:180:28 | Point {...} |
+| main.rs:191:9:191:9 | [SSA] p | main.rs:198:10:198:10 | p |
+| main.rs:191:9:191:9 | p | main.rs:191:9:191:9 | [SSA] p |
+| main.rs:191:9:191:9 | p | main.rs:191:9:191:9 | p |
+| main.rs:191:13:197:5 | Point3D {...} | main.rs:191:9:191:9 | p |
+| main.rs:198:10:198:10 | [post] p | main.rs:199:10:199:10 | p |
+| main.rs:198:10:198:10 | p | main.rs:199:10:199:10 | p |
+| main.rs:199:10:199:10 | [post] p | main.rs:200:10:200:10 | p |
+| main.rs:199:10:199:10 | p | main.rs:200:10:200:10 | p |
+| main.rs:204:9:204:9 | [SSA] y | main.rs:206:30:206:30 | y |
+| main.rs:204:9:204:9 | y | main.rs:204:9:204:9 | [SSA] y |
+| main.rs:204:9:204:9 | y | main.rs:204:9:204:9 | y |
+| main.rs:204:13:204:22 | source(...) | main.rs:204:9:204:9 | y |
+| main.rs:205:9:205:9 | [SSA] p | main.rs:209:11:209:11 | p |
+| main.rs:205:9:205:9 | p | main.rs:205:9:205:9 | [SSA] p |
+| main.rs:205:9:205:9 | p | main.rs:205:9:205:9 | p |
+| main.rs:205:13:208:5 | Point3D {...} | main.rs:205:9:205:9 | p |
+| main.rs:209:5:218:5 | match p { ... } | main.rs:203:26:219:1 | { ... } |
+| main.rs:209:11:209:11 | p | main.rs:210:9:213:9 | Point3D {...} |
+| main.rs:211:28:211:28 | [SSA] x | main.rs:214:18:214:18 | x |
+| main.rs:211:28:211:28 | x | main.rs:211:28:211:28 | [SSA] x |
+| main.rs:211:28:211:28 | x | main.rs:211:28:211:28 | x |
+| main.rs:211:31:211:31 | [SSA] y | main.rs:215:18:215:18 | y |
+| main.rs:211:31:211:31 | y | main.rs:211:31:211:31 | [SSA] y |
+| main.rs:211:31:211:31 | y | main.rs:211:31:211:31 | y |
+| main.rs:212:13:212:13 | [SSA] z | main.rs:216:18:216:18 | z |
+| main.rs:212:13:212:13 | z | main.rs:212:13:212:13 | [SSA] z |
+| main.rs:212:13:212:13 | z | main.rs:212:13:212:13 | z |
+| main.rs:213:14:217:9 | { ... } | main.rs:209:5:218:5 | match p { ... } |
+| main.rs:224:9:224:9 | [SSA] s | main.rs:225:10:225:10 | s |
+| main.rs:224:9:224:9 | s | main.rs:224:9:224:9 | [SSA] s |
+| main.rs:224:9:224:9 | s | main.rs:224:9:224:9 | s |
+| main.rs:224:13:224:40 | MyTupleStruct(...) | main.rs:224:9:224:9 | s |
+| main.rs:225:10:225:10 | [post] s | main.rs:226:10:226:10 | s |
+| main.rs:225:10:225:10 | s | main.rs:226:10:226:10 | s |
+| main.rs:226:10:226:10 | [post] s | main.rs:228:11:228:11 | s |
+| main.rs:226:10:226:10 | s | main.rs:228:11:228:11 | s |
+| main.rs:228:5:233:5 | match s { ... } | main.rs:223:19:234:1 | { ... } |
+| main.rs:228:11:228:11 | s | main.rs:229:9:229:27 | MyTupleStruct(...) |
+| main.rs:229:23:229:23 | [SSA] x | main.rs:230:18:230:18 | x |
+| main.rs:229:23:229:23 | x | main.rs:229:23:229:23 | [SSA] x |
+| main.rs:229:23:229:23 | x | main.rs:229:23:229:23 | x |
+| main.rs:229:26:229:26 | [SSA] y | main.rs:231:18:231:18 | y |
+| main.rs:229:26:229:26 | y | main.rs:229:26:229:26 | [SSA] y |
+| main.rs:229:26:229:26 | y | main.rs:229:26:229:26 | y |
+| main.rs:229:32:232:9 | { ... } | main.rs:228:5:233:5 | match s { ... } |
+| main.rs:240:9:240:10 | [SSA] s1 | main.rs:242:11:242:12 | s1 |
 | main.rs:240:9:240:10 | s1 | main.rs:240:9:240:10 | [SSA] s1 |
 | main.rs:240:9:240:10 | s1 | main.rs:240:9:240:10 | s1 |
-| main.rs:240:14:240:29 | Some(...) | main.rs:240:9:240:10 | s1 |
-| main.rs:241:10:241:11 | [post] receiver for s1 | main.rs:241:10:241:11 | [post] s1 |
-| main.rs:241:10:241:11 | s1 | main.rs:241:10:241:11 | receiver for s1 |
-| main.rs:245:9:245:10 | [SSA] s1 | main.rs:246:10:246:11 | s1 |
-| main.rs:245:9:245:10 | s1 | main.rs:245:9:245:10 | [SSA] s1 |
-| main.rs:245:9:245:10 | s1 | main.rs:245:9:245:10 | s1 |
-| main.rs:245:14:245:29 | Some(...) | main.rs:245:9:245:10 | s1 |
-| main.rs:246:10:246:11 | [post] receiver for s1 | main.rs:246:10:246:11 | [post] s1 |
-| main.rs:246:10:246:11 | s1 | main.rs:246:10:246:11 | receiver for s1 |
-| main.rs:248:9:248:10 | [SSA] s2 | main.rs:249:10:249:11 | s2 |
-| main.rs:248:9:248:10 | s2 | main.rs:248:9:248:10 | [SSA] s2 |
-| main.rs:248:9:248:10 | s2 | main.rs:248:9:248:10 | s2 |
-| main.rs:248:14:248:20 | Some(...) | main.rs:248:9:248:10 | s2 |
-| main.rs:249:10:249:11 | [post] receiver for s2 | main.rs:249:10:249:11 | [post] s2 |
-| main.rs:249:10:249:11 | s2 | main.rs:249:10:249:11 | receiver for s2 |
-| main.rs:253:9:253:10 | [SSA] s1 | main.rs:254:10:254:11 | s1 |
+| main.rs:240:14:240:37 | ...::Some(...) | main.rs:240:9:240:10 | s1 |
+| main.rs:241:9:241:10 | [SSA] s2 | main.rs:246:11:246:12 | s2 |
+| main.rs:241:9:241:10 | s2 | main.rs:241:9:241:10 | [SSA] s2 |
+| main.rs:241:9:241:10 | s2 | main.rs:241:9:241:10 | s2 |
+| main.rs:241:14:241:28 | ...::Some(...) | main.rs:241:9:241:10 | s2 |
+| main.rs:242:11:242:12 | s1 | main.rs:243:9:243:23 | ...::Some(...) |
+| main.rs:242:11:242:12 | s1 | main.rs:244:9:244:20 | ...::None |
+| main.rs:243:22:243:22 | [SSA] n | main.rs:243:33:243:33 | n |
+| main.rs:243:22:243:22 | n | main.rs:243:22:243:22 | [SSA] n |
+| main.rs:243:22:243:22 | n | main.rs:243:22:243:22 | n |
+| main.rs:243:28:243:34 | sink(...) | main.rs:242:5:245:5 | match s1 { ... } |
+| main.rs:244:25:244:31 | sink(...) | main.rs:242:5:245:5 | match s1 { ... } |
+| main.rs:246:5:249:5 | match s2 { ... } | main.rs:239:37:250:1 | { ... } |
+| main.rs:246:11:246:12 | s2 | main.rs:247:9:247:23 | ...::Some(...) |
+| main.rs:246:11:246:12 | s2 | main.rs:248:9:248:20 | ...::None |
+| main.rs:247:22:247:22 | [SSA] n | main.rs:247:33:247:33 | n |
+| main.rs:247:22:247:22 | n | main.rs:247:22:247:22 | [SSA] n |
+| main.rs:247:22:247:22 | n | main.rs:247:22:247:22 | n |
+| main.rs:247:28:247:34 | sink(...) | main.rs:246:5:249:5 | match s2 { ... } |
+| main.rs:248:25:248:31 | sink(...) | main.rs:246:5:249:5 | match s2 { ... } |
+| main.rs:253:9:253:10 | [SSA] s1 | main.rs:255:11:255:12 | s1 |
 | main.rs:253:9:253:10 | s1 | main.rs:253:9:253:10 | [SSA] s1 |
 | main.rs:253:9:253:10 | s1 | main.rs:253:9:253:10 | s1 |
 | main.rs:253:14:253:29 | Some(...) | main.rs:253:9:253:10 | s1 |
-| main.rs:254:10:254:11 | [post] receiver for s1 | main.rs:254:10:254:11 | [post] s1 |
-| main.rs:254:10:254:11 | s1 | main.rs:254:10:254:11 | receiver for s1 |
-| main.rs:256:9:256:10 | [SSA] s2 | main.rs:257:10:257:11 | s2 |
-| main.rs:256:9:256:10 | s2 | main.rs:256:9:256:10 | [SSA] s2 |
-| main.rs:256:9:256:10 | s2 | main.rs:256:9:256:10 | s2 |
-| main.rs:256:14:256:17 | None | main.rs:256:9:256:10 | s2 |
-| main.rs:257:10:257:11 | [post] receiver for s2 | main.rs:257:10:257:11 | [post] s2 |
-| main.rs:257:10:257:11 | s2 | main.rs:257:10:257:11 | receiver for s2 |
-| main.rs:261:9:261:10 | [SSA] s1 | main.rs:263:14:263:15 | s1 |
-| main.rs:261:9:261:10 | s1 | main.rs:261:9:261:10 | [SSA] s1 |
-| main.rs:261:9:261:10 | s1 | main.rs:261:9:261:10 | s1 |
-| main.rs:261:14:261:29 | Some(...) | main.rs:261:9:261:10 | s1 |
-| main.rs:262:9:262:10 | [SSA] s2 | main.rs:265:10:265:11 | s2 |
-| main.rs:262:9:262:10 | s2 | main.rs:262:9:262:10 | [SSA] s2 |
-| main.rs:262:9:262:10 | s2 | main.rs:262:9:262:10 | s2 |
-| main.rs:262:14:262:20 | Some(...) | main.rs:262:9:262:10 | s2 |
-| main.rs:263:9:263:10 | [SSA] i1 | main.rs:264:10:264:11 | i1 |
-| main.rs:263:9:263:10 | i1 | main.rs:263:9:263:10 | [SSA] i1 |
-| main.rs:263:9:263:10 | i1 | main.rs:263:9:263:10 | i1 |
-| main.rs:263:14:263:16 | TryExpr | main.rs:263:9:263:10 | i1 |
-| main.rs:266:5:266:11 | Some(...) | main.rs:260:41:267:1 | { ... } |
-| main.rs:270:9:270:10 | [SSA] r1 | main.rs:271:28:271:29 | r1 |
-| main.rs:270:9:270:10 | r1 | main.rs:270:9:270:10 | [SSA] r1 |
-| main.rs:270:9:270:10 | r1 | main.rs:270:9:270:10 | r1 |
-| main.rs:270:32:270:45 | Ok(...) | main.rs:270:9:270:10 | r1 |
-| main.rs:271:9:271:11 | [SSA] o1a | main.rs:273:10:273:12 | o1a |
-| main.rs:271:9:271:11 | o1a | main.rs:271:9:271:11 | [SSA] o1a |
-| main.rs:271:9:271:11 | o1a | main.rs:271:9:271:11 | o1a |
-| main.rs:271:28:271:29 | [post] r1 | main.rs:272:28:272:29 | r1 |
-| main.rs:271:28:271:29 | [post] receiver for r1 | main.rs:271:28:271:29 | [post] r1 |
-| main.rs:271:28:271:29 | r1 | main.rs:271:28:271:29 | receiver for r1 |
-| main.rs:271:28:271:29 | r1 | main.rs:272:28:272:29 | r1 |
-| main.rs:271:28:271:34 | r1.ok() | main.rs:271:9:271:11 | o1a |
-| main.rs:272:9:272:11 | [SSA] o1b | main.rs:274:10:274:12 | o1b |
-| main.rs:272:9:272:11 | o1b | main.rs:272:9:272:11 | [SSA] o1b |
-| main.rs:272:9:272:11 | o1b | main.rs:272:9:272:11 | o1b |
-| main.rs:272:28:272:29 | [post] receiver for r1 | main.rs:272:28:272:29 | [post] r1 |
-| main.rs:272:28:272:29 | r1 | main.rs:272:28:272:29 | receiver for r1 |
-| main.rs:272:28:272:35 | r1.err() | main.rs:272:9:272:11 | o1b |
-| main.rs:273:10:273:12 | [post] receiver for o1a | main.rs:273:10:273:12 | [post] o1a |
-| main.rs:273:10:273:12 | o1a | main.rs:273:10:273:12 | receiver for o1a |
-| main.rs:274:10:274:12 | [post] receiver for o1b | main.rs:274:10:274:12 | [post] o1b |
-| main.rs:274:10:274:12 | o1b | main.rs:274:10:274:12 | receiver for o1b |
-| main.rs:276:9:276:10 | [SSA] r2 | main.rs:277:28:277:29 | r2 |
-| main.rs:276:9:276:10 | r2 | main.rs:276:9:276:10 | [SSA] r2 |
-| main.rs:276:9:276:10 | r2 | main.rs:276:9:276:10 | r2 |
-| main.rs:276:32:276:46 | Err(...) | main.rs:276:9:276:10 | r2 |
-| main.rs:277:9:277:11 | [SSA] o2a | main.rs:279:10:279:12 | o2a |
-| main.rs:277:9:277:11 | o2a | main.rs:277:9:277:11 | [SSA] o2a |
-| main.rs:277:9:277:11 | o2a | main.rs:277:9:277:11 | o2a |
-| main.rs:277:28:277:29 | [post] r2 | main.rs:278:28:278:29 | r2 |
-| main.rs:277:28:277:29 | [post] receiver for r2 | main.rs:277:28:277:29 | [post] r2 |
-| main.rs:277:28:277:29 | r2 | main.rs:277:28:277:29 | receiver for r2 |
-| main.rs:277:28:277:29 | r2 | main.rs:278:28:278:29 | r2 |
-| main.rs:277:28:277:34 | r2.ok() | main.rs:277:9:277:11 | o2a |
-| main.rs:278:9:278:11 | [SSA] o2b | main.rs:280:10:280:12 | o2b |
-| main.rs:278:9:278:11 | o2b | main.rs:278:9:278:11 | [SSA] o2b |
-| main.rs:278:9:278:11 | o2b | main.rs:278:9:278:11 | o2b |
-| main.rs:278:28:278:29 | [post] receiver for r2 | main.rs:278:28:278:29 | [post] r2 |
-| main.rs:278:28:278:29 | r2 | main.rs:278:28:278:29 | receiver for r2 |
-| main.rs:278:28:278:35 | r2.err() | main.rs:278:9:278:11 | o2b |
-| main.rs:279:10:279:12 | [post] receiver for o2a | main.rs:279:10:279:12 | [post] o2a |
-| main.rs:279:10:279:12 | o2a | main.rs:279:10:279:12 | receiver for o2a |
-| main.rs:280:10:280:12 | [post] receiver for o2b | main.rs:280:10:280:12 | [post] o2b |
-| main.rs:280:10:280:12 | o2b | main.rs:280:10:280:12 | receiver for o2b |
-| main.rs:284:9:284:10 | [SSA] s1 | main.rs:287:14:287:15 | s1 |
-| main.rs:284:9:284:10 | s1 | main.rs:284:9:284:10 | [SSA] s1 |
-| main.rs:284:9:284:10 | s1 | main.rs:284:9:284:10 | s1 |
-| main.rs:284:32:284:45 | Ok(...) | main.rs:284:9:284:10 | s1 |
-| main.rs:285:9:285:10 | [SSA] s2 | main.rs:288:14:288:15 | s2 |
-| main.rs:285:9:285:10 | s2 | main.rs:285:9:285:10 | [SSA] s2 |
-| main.rs:285:9:285:10 | s2 | main.rs:285:9:285:10 | s2 |
-| main.rs:285:32:285:36 | Ok(...) | main.rs:285:9:285:10 | s2 |
-| main.rs:286:9:286:10 | [SSA] s3 | main.rs:291:14:291:15 | s3 |
-| main.rs:286:9:286:10 | s3 | main.rs:286:9:286:10 | [SSA] s3 |
-| main.rs:286:9:286:10 | s3 | main.rs:286:9:286:10 | s3 |
-| main.rs:286:32:286:46 | Err(...) | main.rs:286:9:286:10 | s3 |
-| main.rs:287:9:287:10 | [SSA] i1 | main.rs:289:10:289:11 | i1 |
-| main.rs:287:9:287:10 | i1 | main.rs:287:9:287:10 | [SSA] i1 |
-| main.rs:287:9:287:10 | i1 | main.rs:287:9:287:10 | i1 |
-| main.rs:287:14:287:16 | TryExpr | main.rs:287:9:287:10 | i1 |
-| main.rs:288:9:288:10 | [SSA] i2 | main.rs:290:10:290:11 | i2 |
-| main.rs:288:9:288:10 | i2 | main.rs:288:9:288:10 | [SSA] i2 |
-| main.rs:288:9:288:10 | i2 | main.rs:288:9:288:10 | i2 |
-| main.rs:288:14:288:16 | TryExpr | main.rs:288:9:288:10 | i2 |
-| main.rs:291:9:291:10 | [SSA] i3 | main.rs:292:10:292:11 | i3 |
-| main.rs:291:9:291:10 | i3 | main.rs:291:9:291:10 | [SSA] i3 |
-| main.rs:291:9:291:10 | i3 | main.rs:291:9:291:10 | i3 |
-| main.rs:291:14:291:16 | TryExpr | main.rs:291:9:291:10 | i3 |
-| main.rs:293:5:293:9 | Ok(...) | main.rs:283:46:294:1 | { ... } |
-| main.rs:297:9:297:10 | [SSA] s1 | main.rs:298:10:298:11 | s1 |
-| main.rs:297:9:297:10 | s1 | main.rs:297:9:297:10 | [SSA] s1 |
-| main.rs:297:9:297:10 | s1 | main.rs:297:9:297:10 | s1 |
-| main.rs:297:32:297:45 | Ok(...) | main.rs:297:9:297:10 | s1 |
-| main.rs:298:10:298:11 | [post] receiver for s1 | main.rs:298:10:298:11 | [post] s1 |
-| main.rs:298:10:298:11 | [post] s1 | main.rs:299:10:299:11 | s1 |
-| main.rs:298:10:298:11 | s1 | main.rs:298:10:298:11 | receiver for s1 |
-| main.rs:298:10:298:11 | s1 | main.rs:299:10:299:11 | s1 |
-| main.rs:299:10:299:11 | [post] receiver for s1 | main.rs:299:10:299:11 | [post] s1 |
-| main.rs:299:10:299:11 | s1 | main.rs:299:10:299:11 | receiver for s1 |
-| main.rs:301:9:301:10 | [SSA] s2 | main.rs:302:10:302:11 | s2 |
-| main.rs:301:9:301:10 | s2 | main.rs:301:9:301:10 | [SSA] s2 |
-| main.rs:301:9:301:10 | s2 | main.rs:301:9:301:10 | s2 |
-| main.rs:301:32:301:46 | Err(...) | main.rs:301:9:301:10 | s2 |
-| main.rs:302:10:302:11 | [post] receiver for s2 | main.rs:302:10:302:11 | [post] s2 |
-| main.rs:302:10:302:11 | [post] s2 | main.rs:303:10:303:11 | s2 |
-| main.rs:302:10:302:11 | s2 | main.rs:302:10:302:11 | receiver for s2 |
-| main.rs:302:10:302:11 | s2 | main.rs:303:10:303:11 | s2 |
-| main.rs:303:10:303:11 | [post] receiver for s2 | main.rs:303:10:303:11 | [post] s2 |
-| main.rs:303:10:303:11 | s2 | main.rs:303:10:303:11 | receiver for s2 |
-| main.rs:312:9:312:10 | [SSA] s1 | main.rs:314:11:314:12 | s1 |
-| main.rs:312:9:312:10 | s1 | main.rs:312:9:312:10 | [SSA] s1 |
-| main.rs:312:9:312:10 | s1 | main.rs:312:9:312:10 | s1 |
-| main.rs:312:14:312:39 | ...::A(...) | main.rs:312:9:312:10 | s1 |
-| main.rs:313:9:313:10 | [SSA] s2 | main.rs:321:11:321:12 | s2 |
-| main.rs:313:9:313:10 | s2 | main.rs:313:9:313:10 | [SSA] s2 |
-| main.rs:313:9:313:10 | s2 | main.rs:313:9:313:10 | s2 |
-| main.rs:313:14:313:30 | ...::B(...) | main.rs:313:9:313:10 | s2 |
-| main.rs:314:11:314:12 | s1 | main.rs:315:9:315:25 | ...::A(...) |
-| main.rs:314:11:314:12 | s1 | main.rs:316:9:316:25 | ...::B(...) |
-| main.rs:314:11:314:12 | s1 | main.rs:318:11:318:12 | s1 |
-| main.rs:315:24:315:24 | [SSA] n | main.rs:315:35:315:35 | n |
-| main.rs:315:24:315:24 | n | main.rs:315:24:315:24 | [SSA] n |
-| main.rs:315:24:315:24 | n | main.rs:315:24:315:24 | n |
-| main.rs:315:30:315:36 | sink(...) | main.rs:314:5:317:5 | match s1 { ... } |
-| main.rs:316:24:316:24 | [SSA] n | main.rs:316:35:316:35 | n |
-| main.rs:316:24:316:24 | n | main.rs:316:24:316:24 | [SSA] n |
-| main.rs:316:24:316:24 | n | main.rs:316:24:316:24 | n |
-| main.rs:316:30:316:36 | sink(...) | main.rs:314:5:317:5 | match s1 { ... } |
-| main.rs:318:11:318:12 | s1 | main.rs:319:9:319:45 | ... \| ... |
-| main.rs:319:9:319:45 | ... \| ... | main.rs:319:9:319:25 | ...::A(...) |
-| main.rs:319:9:319:45 | ... \| ... | main.rs:319:29:319:45 | ...::B(...) |
-| main.rs:319:24:319:24 | [SSA] n | main.rs:319:55:319:55 | n |
-| main.rs:319:24:319:24 | n | main.rs:319:24:319:24 | [SSA] n |
-| main.rs:319:24:319:24 | n | main.rs:319:24:319:24 | n |
-| main.rs:319:44:319:44 | [SSA] n | main.rs:319:55:319:55 | n |
-| main.rs:319:44:319:44 | n | main.rs:319:44:319:44 | [SSA] n |
-| main.rs:319:44:319:44 | n | main.rs:319:44:319:44 | n |
-| main.rs:319:50:319:56 | sink(...) | main.rs:318:5:320:5 | match s1 { ... } |
-| main.rs:321:5:324:5 | match s2 { ... } | main.rs:311:48:325:1 | { ... } |
-| main.rs:321:11:321:12 | s2 | main.rs:322:9:322:25 | ...::A(...) |
-| main.rs:321:11:321:12 | s2 | main.rs:323:9:323:25 | ...::B(...) |
-| main.rs:322:24:322:24 | [SSA] n | main.rs:322:35:322:35 | n |
-| main.rs:322:24:322:24 | n | main.rs:322:24:322:24 | [SSA] n |
-| main.rs:322:24:322:24 | n | main.rs:322:24:322:24 | n |
-| main.rs:322:30:322:36 | sink(...) | main.rs:321:5:324:5 | match s2 { ... } |
-| main.rs:323:24:323:24 | [SSA] n | main.rs:323:35:323:35 | n |
-| main.rs:323:24:323:24 | n | main.rs:323:24:323:24 | [SSA] n |
-| main.rs:323:24:323:24 | n | main.rs:323:24:323:24 | n |
-| main.rs:323:30:323:36 | sink(...) | main.rs:321:5:324:5 | match s2 { ... } |
-| main.rs:330:9:330:10 | [SSA] s1 | main.rs:332:11:332:12 | s1 |
-| main.rs:330:9:330:10 | s1 | main.rs:330:9:330:10 | [SSA] s1 |
-| main.rs:330:9:330:10 | s1 | main.rs:330:9:330:10 | s1 |
-| main.rs:330:14:330:26 | A(...) | main.rs:330:9:330:10 | s1 |
-| main.rs:331:9:331:10 | [SSA] s2 | main.rs:339:11:339:12 | s2 |
-| main.rs:331:9:331:10 | s2 | main.rs:331:9:331:10 | [SSA] s2 |
-| main.rs:331:9:331:10 | s2 | main.rs:331:9:331:10 | s2 |
-| main.rs:331:14:331:17 | B(...) | main.rs:331:9:331:10 | s2 |
-| main.rs:332:11:332:12 | s1 | main.rs:333:9:333:12 | A(...) |
-| main.rs:332:11:332:12 | s1 | main.rs:334:9:334:12 | B(...) |
-| main.rs:332:11:332:12 | s1 | main.rs:336:11:336:12 | s1 |
-| main.rs:333:11:333:11 | [SSA] n | main.rs:333:22:333:22 | n |
-| main.rs:333:11:333:11 | n | main.rs:333:11:333:11 | [SSA] n |
-| main.rs:333:11:333:11 | n | main.rs:333:11:333:11 | n |
-| main.rs:333:17:333:23 | sink(...) | main.rs:332:5:335:5 | match s1 { ... } |
-| main.rs:334:11:334:11 | [SSA] n | main.rs:334:22:334:22 | n |
-| main.rs:334:11:334:11 | n | main.rs:334:11:334:11 | [SSA] n |
-| main.rs:334:11:334:11 | n | main.rs:334:11:334:11 | n |
-| main.rs:334:17:334:23 | sink(...) | main.rs:332:5:335:5 | match s1 { ... } |
-| main.rs:336:11:336:12 | s1 | main.rs:337:9:337:19 | ... \| ... |
-| main.rs:337:9:337:19 | ... \| ... | main.rs:337:9:337:12 | A(...) |
-| main.rs:337:9:337:19 | ... \| ... | main.rs:337:16:337:19 | B(...) |
-| main.rs:337:11:337:11 | [SSA] n | main.rs:337:29:337:29 | n |
-| main.rs:337:11:337:11 | n | main.rs:337:11:337:11 | [SSA] n |
-| main.rs:337:11:337:11 | n | main.rs:337:11:337:11 | n |
-| main.rs:337:18:337:18 | [SSA] n | main.rs:337:29:337:29 | n |
-| main.rs:337:18:337:18 | n | main.rs:337:18:337:18 | [SSA] n |
-| main.rs:337:18:337:18 | n | main.rs:337:18:337:18 | n |
-| main.rs:337:24:337:30 | sink(...) | main.rs:336:5:338:5 | match s1 { ... } |
-| main.rs:339:5:342:5 | match s2 { ... } | main.rs:329:50:343:1 | { ... } |
-| main.rs:339:11:339:12 | s2 | main.rs:340:9:340:12 | A(...) |
-| main.rs:339:11:339:12 | s2 | main.rs:341:9:341:12 | B(...) |
-| main.rs:340:11:340:11 | [SSA] n | main.rs:340:22:340:22 | n |
-| main.rs:340:11:340:11 | n | main.rs:340:11:340:11 | [SSA] n |
-| main.rs:340:11:340:11 | n | main.rs:340:11:340:11 | n |
-| main.rs:340:17:340:23 | sink(...) | main.rs:339:5:342:5 | match s2 { ... } |
-| main.rs:341:11:341:11 | [SSA] n | main.rs:341:22:341:22 | n |
-| main.rs:341:11:341:11 | n | main.rs:341:11:341:11 | [SSA] n |
-| main.rs:341:11:341:11 | n | main.rs:341:11:341:11 | n |
-| main.rs:341:17:341:23 | sink(...) | main.rs:339:5:342:5 | match s2 { ... } |
-| main.rs:351:9:351:10 | [SSA] s1 | main.rs:355:11:355:12 | s1 |
-| main.rs:351:9:351:10 | s1 | main.rs:351:9:351:10 | [SSA] s1 |
-| main.rs:351:9:351:10 | s1 | main.rs:351:9:351:10 | s1 |
-| main.rs:351:14:353:5 | ...::C {...} | main.rs:351:9:351:10 | s1 |
-| main.rs:354:9:354:10 | [SSA] s2 | main.rs:362:11:362:12 | s2 |
-| main.rs:354:9:354:10 | s2 | main.rs:354:9:354:10 | [SSA] s2 |
-| main.rs:354:9:354:10 | s2 | main.rs:354:9:354:10 | s2 |
-| main.rs:354:14:354:43 | ...::D {...} | main.rs:354:9:354:10 | s2 |
-| main.rs:355:11:355:12 | s1 | main.rs:356:9:356:38 | ...::C {...} |
-| main.rs:355:11:355:12 | s1 | main.rs:357:9:357:38 | ...::D {...} |
-| main.rs:355:11:355:12 | s1 | main.rs:359:11:359:12 | s1 |
-| main.rs:356:36:356:36 | [SSA] n | main.rs:356:48:356:48 | n |
-| main.rs:356:36:356:36 | n | main.rs:356:36:356:36 | [SSA] n |
-| main.rs:356:36:356:36 | n | main.rs:356:36:356:36 | n |
-| main.rs:356:43:356:49 | sink(...) | main.rs:355:5:358:5 | match s1 { ... } |
-| main.rs:357:36:357:36 | [SSA] n | main.rs:357:48:357:48 | n |
-| main.rs:357:36:357:36 | n | main.rs:357:36:357:36 | [SSA] n |
-| main.rs:357:36:357:36 | n | main.rs:357:36:357:36 | n |
-| main.rs:357:43:357:49 | sink(...) | main.rs:355:5:358:5 | match s1 { ... } |
-| main.rs:359:11:359:12 | s1 | main.rs:360:9:360:71 | ... \| ... |
-| main.rs:360:9:360:71 | ... \| ... | main.rs:360:9:360:38 | ...::C {...} |
-| main.rs:360:9:360:71 | ... \| ... | main.rs:360:42:360:71 | ...::D {...} |
-| main.rs:360:36:360:36 | [SSA] n | main.rs:360:81:360:81 | n |
-| main.rs:360:36:360:36 | n | main.rs:360:36:360:36 | [SSA] n |
-| main.rs:360:36:360:36 | n | main.rs:360:36:360:36 | n |
-| main.rs:360:69:360:69 | [SSA] n | main.rs:360:81:360:81 | n |
-| main.rs:360:69:360:69 | n | main.rs:360:69:360:69 | [SSA] n |
-| main.rs:360:69:360:69 | n | main.rs:360:69:360:69 | n |
-| main.rs:360:76:360:82 | sink(...) | main.rs:359:5:361:5 | match s1 { ... } |
-| main.rs:362:5:365:5 | match s2 { ... } | main.rs:350:49:366:1 | { ... } |
-| main.rs:362:11:362:12 | s2 | main.rs:363:9:363:38 | ...::C {...} |
-| main.rs:362:11:362:12 | s2 | main.rs:364:9:364:38 | ...::D {...} |
-| main.rs:363:36:363:36 | [SSA] n | main.rs:363:48:363:48 | n |
-| main.rs:363:36:363:36 | n | main.rs:363:36:363:36 | [SSA] n |
-| main.rs:363:36:363:36 | n | main.rs:363:36:363:36 | n |
-| main.rs:363:43:363:49 | sink(...) | main.rs:362:5:365:5 | match s2 { ... } |
-| main.rs:364:36:364:36 | [SSA] n | main.rs:364:48:364:48 | n |
-| main.rs:364:36:364:36 | n | main.rs:364:36:364:36 | [SSA] n |
-| main.rs:364:36:364:36 | n | main.rs:364:36:364:36 | n |
-| main.rs:364:43:364:49 | sink(...) | main.rs:362:5:365:5 | match s2 { ... } |
-| main.rs:371:9:371:10 | [SSA] s1 | main.rs:375:11:375:12 | s1 |
-| main.rs:371:9:371:10 | s1 | main.rs:371:9:371:10 | [SSA] s1 |
-| main.rs:371:9:371:10 | s1 | main.rs:371:9:371:10 | s1 |
-| main.rs:371:14:373:5 | C {...} | main.rs:371:9:371:10 | s1 |
-| main.rs:374:9:374:10 | [SSA] s2 | main.rs:382:11:382:12 | s2 |
-| main.rs:374:9:374:10 | s2 | main.rs:374:9:374:10 | [SSA] s2 |
-| main.rs:374:9:374:10 | s2 | main.rs:374:9:374:10 | s2 |
-| main.rs:374:14:374:29 | D {...} | main.rs:374:9:374:10 | s2 |
-| main.rs:375:11:375:12 | s1 | main.rs:376:9:376:24 | C {...} |
-| main.rs:375:11:375:12 | s1 | main.rs:377:9:377:24 | D {...} |
-| main.rs:375:11:375:12 | s1 | main.rs:379:11:379:12 | s1 |
-| main.rs:376:22:376:22 | [SSA] n | main.rs:376:34:376:34 | n |
-| main.rs:376:22:376:22 | n | main.rs:376:22:376:22 | [SSA] n |
-| main.rs:376:22:376:22 | n | main.rs:376:22:376:22 | n |
-| main.rs:376:29:376:35 | sink(...) | main.rs:375:5:378:5 | match s1 { ... } |
-| main.rs:377:22:377:22 | [SSA] n | main.rs:377:34:377:34 | n |
-| main.rs:377:22:377:22 | n | main.rs:377:22:377:22 | [SSA] n |
-| main.rs:377:22:377:22 | n | main.rs:377:22:377:22 | n |
-| main.rs:377:29:377:35 | sink(...) | main.rs:375:5:378:5 | match s1 { ... } |
-| main.rs:379:11:379:12 | s1 | main.rs:380:9:380:43 | ... \| ... |
-| main.rs:380:9:380:43 | ... \| ... | main.rs:380:9:380:24 | C {...} |
-| main.rs:380:9:380:43 | ... \| ... | main.rs:380:28:380:43 | D {...} |
-| main.rs:380:22:380:22 | [SSA] n | main.rs:380:53:380:53 | n |
-| main.rs:380:22:380:22 | n | main.rs:380:22:380:22 | [SSA] n |
-| main.rs:380:22:380:22 | n | main.rs:380:22:380:22 | n |
-| main.rs:380:41:380:41 | [SSA] n | main.rs:380:53:380:53 | n |
-| main.rs:380:41:380:41 | n | main.rs:380:41:380:41 | [SSA] n |
-| main.rs:380:41:380:41 | n | main.rs:380:41:380:41 | n |
-| main.rs:380:48:380:54 | sink(...) | main.rs:379:5:381:5 | match s1 { ... } |
-| main.rs:382:5:385:5 | match s2 { ... } | main.rs:370:51:386:1 | { ... } |
-| main.rs:382:11:382:12 | s2 | main.rs:383:9:383:24 | C {...} |
-| main.rs:382:11:382:12 | s2 | main.rs:384:9:384:24 | D {...} |
-| main.rs:383:22:383:22 | [SSA] n | main.rs:383:34:383:34 | n |
-| main.rs:383:22:383:22 | n | main.rs:383:22:383:22 | [SSA] n |
-| main.rs:383:22:383:22 | n | main.rs:383:22:383:22 | n |
-| main.rs:383:29:383:35 | sink(...) | main.rs:382:5:385:5 | match s2 { ... } |
-| main.rs:384:22:384:22 | [SSA] n | main.rs:384:34:384:34 | n |
-| main.rs:384:22:384:22 | n | main.rs:384:22:384:22 | [SSA] n |
-| main.rs:384:22:384:22 | n | main.rs:384:22:384:22 | n |
-| main.rs:384:29:384:35 | sink(...) | main.rs:382:5:385:5 | match s2 { ... } |
-| main.rs:392:9:392:12 | [SSA] arr1 | main.rs:393:14:393:17 | arr1 |
-| main.rs:392:9:392:12 | arr1 | main.rs:392:9:392:12 | [SSA] arr1 |
-| main.rs:392:9:392:12 | arr1 | main.rs:392:9:392:12 | arr1 |
-| main.rs:392:16:392:33 | [...] | main.rs:392:9:392:12 | arr1 |
-| main.rs:393:9:393:10 | [SSA] n1 | main.rs:394:10:394:11 | n1 |
-| main.rs:393:9:393:10 | n1 | main.rs:393:9:393:10 | [SSA] n1 |
-| main.rs:393:9:393:10 | n1 | main.rs:393:9:393:10 | n1 |
-| main.rs:393:14:393:20 | arr1[2] | main.rs:393:9:393:10 | n1 |
-| main.rs:396:9:396:12 | [SSA] arr2 | main.rs:397:14:397:17 | arr2 |
-| main.rs:396:9:396:12 | arr2 | main.rs:396:9:396:12 | [SSA] arr2 |
-| main.rs:396:9:396:12 | arr2 | main.rs:396:9:396:12 | arr2 |
-| main.rs:396:16:396:31 | [...; 10] | main.rs:396:9:396:12 | arr2 |
-| main.rs:397:9:397:10 | [SSA] n2 | main.rs:398:10:398:11 | n2 |
-| main.rs:397:9:397:10 | n2 | main.rs:397:9:397:10 | [SSA] n2 |
-| main.rs:397:9:397:10 | n2 | main.rs:397:9:397:10 | n2 |
-| main.rs:397:14:397:20 | arr2[4] | main.rs:397:9:397:10 | n2 |
-| main.rs:400:9:400:12 | [SSA] arr3 | main.rs:401:14:401:17 | arr3 |
-| main.rs:400:9:400:12 | arr3 | main.rs:400:9:400:12 | [SSA] arr3 |
-| main.rs:400:9:400:12 | arr3 | main.rs:400:9:400:12 | arr3 |
-| main.rs:400:16:400:24 | [...] | main.rs:400:9:400:12 | arr3 |
-| main.rs:401:9:401:10 | [SSA] n3 | main.rs:402:10:402:11 | n3 |
-| main.rs:401:9:401:10 | n3 | main.rs:401:9:401:10 | [SSA] n3 |
-| main.rs:401:9:401:10 | n3 | main.rs:401:9:401:10 | n3 |
-| main.rs:401:14:401:20 | arr3[2] | main.rs:401:9:401:10 | n3 |
-| main.rs:406:9:406:12 | [SSA] arr1 | main.rs:407:15:407:18 | arr1 |
-| main.rs:406:9:406:12 | arr1 | main.rs:406:9:406:12 | [SSA] arr1 |
-| main.rs:406:9:406:12 | arr1 | main.rs:406:9:406:12 | arr1 |
-| main.rs:406:16:406:33 | [...] | main.rs:406:9:406:12 | arr1 |
-| main.rs:407:9:407:10 | [SSA] n1 | main.rs:408:14:408:15 | n1 |
-| main.rs:407:9:407:10 | n1 | main.rs:407:9:407:10 | [SSA] n1 |
-| main.rs:407:9:407:10 | n1 | main.rs:407:9:407:10 | n1 |
-| main.rs:411:9:411:12 | [SSA] arr2 | main.rs:412:15:412:18 | arr2 |
-| main.rs:411:9:411:12 | arr2 | main.rs:411:9:411:12 | [SSA] arr2 |
-| main.rs:411:9:411:12 | arr2 | main.rs:411:9:411:12 | arr2 |
-| main.rs:411:16:411:24 | [...] | main.rs:411:9:411:12 | arr2 |
-| main.rs:412:5:414:5 | for ... in ... { ... } | main.rs:405:21:415:1 | { ... } |
-| main.rs:412:9:412:10 | [SSA] n2 | main.rs:413:14:413:15 | n2 |
-| main.rs:412:9:412:10 | n2 | main.rs:412:9:412:10 | [SSA] n2 |
-| main.rs:412:9:412:10 | n2 | main.rs:412:9:412:10 | n2 |
-| main.rs:418:9:418:12 | [SSA] arr1 | main.rs:419:11:419:14 | arr1 |
-| main.rs:418:9:418:12 | arr1 | main.rs:418:9:418:12 | [SSA] arr1 |
-| main.rs:418:9:418:12 | arr1 | main.rs:418:9:418:12 | arr1 |
-| main.rs:418:16:418:33 | [...] | main.rs:418:9:418:12 | arr1 |
-| main.rs:419:5:425:5 | match arr1 { ... } | main.rs:417:26:426:1 | { ... } |
-| main.rs:419:11:419:14 | arr1 | main.rs:420:9:420:17 | SlicePat |
-| main.rs:420:10:420:10 | [SSA] a | main.rs:421:18:421:18 | a |
-| main.rs:420:10:420:10 | a | main.rs:420:10:420:10 | [SSA] a |
-| main.rs:420:10:420:10 | a | main.rs:420:10:420:10 | a |
-| main.rs:420:13:420:13 | [SSA] b | main.rs:422:18:422:18 | b |
-| main.rs:420:13:420:13 | b | main.rs:420:13:420:13 | [SSA] b |
-| main.rs:420:13:420:13 | b | main.rs:420:13:420:13 | b |
-| main.rs:420:16:420:16 | [SSA] c | main.rs:423:18:423:18 | c |
-| main.rs:420:16:420:16 | c | main.rs:420:16:420:16 | [SSA] c |
-| main.rs:420:16:420:16 | c | main.rs:420:16:420:16 | c |
-| main.rs:420:22:424:9 | { ... } | main.rs:419:5:425:5 | match arr1 { ... } |
-| main.rs:429:9:429:19 | mut mut_arr | main.rs:429:13:429:19 | mut_arr |
-| main.rs:429:13:429:19 | [SSA] mut_arr | main.rs:430:10:430:16 | mut_arr |
-| main.rs:429:13:429:19 | mut_arr | main.rs:429:13:429:19 | [SSA] mut_arr |
-| main.rs:429:23:429:31 | [...] | main.rs:429:9:429:19 | mut mut_arr |
-| main.rs:430:10:430:16 | [post] mut_arr | main.rs:432:5:432:11 | mut_arr |
-| main.rs:430:10:430:16 | mut_arr | main.rs:432:5:432:11 | mut_arr |
-| main.rs:432:5:432:11 | [post] mut_arr | main.rs:433:13:433:19 | mut_arr |
-| main.rs:432:5:432:11 | mut_arr | main.rs:433:13:433:19 | mut_arr |
-| main.rs:432:18:432:27 | source(...) | main.rs:432:5:432:14 | mut_arr[1] |
-| main.rs:433:9:433:9 | [SSA] d | main.rs:434:10:434:10 | d |
-| main.rs:433:9:433:9 | d | main.rs:433:9:433:9 | [SSA] d |
-| main.rs:433:9:433:9 | d | main.rs:433:9:433:9 | d |
-| main.rs:433:13:433:19 | [post] mut_arr | main.rs:435:10:435:16 | mut_arr |
-| main.rs:433:13:433:19 | mut_arr | main.rs:435:10:435:16 | mut_arr |
-| main.rs:433:13:433:22 | mut_arr[1] | main.rs:433:9:433:9 | d |
-| main.rs:440:39:440:43 | [SSA] names | main.rs:442:25:442:29 | names |
-| main.rs:440:39:440:43 | names | main.rs:440:39:440:43 | [SSA] names |
-| main.rs:440:39:440:43 | names | main.rs:440:39:440:43 | names |
-| main.rs:440:39:440:72 | ...: Vec::<...> | main.rs:440:39:440:43 | names |
-| main.rs:441:9:441:20 | default_name | main.rs:441:9:441:20 | [SSA] default_name |
-| main.rs:441:9:441:20 | default_name | main.rs:441:9:441:20 | default_name |
-| main.rs:441:24:441:33 | [post] receiver for source(...) | main.rs:441:24:441:33 | [post] source(...) |
-| main.rs:441:24:441:33 | source(...) | main.rs:441:24:441:33 | receiver for source(...) |
-| main.rs:441:24:441:45 | ... .to_string() | main.rs:441:9:441:20 | default_name |
-| main.rs:441:24:441:45 | ... .to_string() | main.rs:442:9:442:20 | SSA phi read(default_name) |
-| main.rs:442:5:448:5 | for ... in ... { ... } | main.rs:440:75:449:1 | { ... } |
-| main.rs:442:9:442:20 | SSA phi read(default_name) | main.rs:444:41:444:67 | default_name |
-| main.rs:442:10:442:13 | [SSA] cond | main.rs:443:12:443:15 | cond |
-| main.rs:442:10:442:13 | cond | main.rs:442:10:442:13 | [SSA] cond |
-| main.rs:442:10:442:13 | cond | main.rs:442:10:442:13 | cond |
-| main.rs:442:16:442:19 | [SSA] name | main.rs:444:21:444:24 | name |
-| main.rs:442:16:442:19 | name | main.rs:442:16:442:19 | [SSA] name |
-| main.rs:442:16:442:19 | name | main.rs:442:16:442:19 | name |
-| main.rs:443:9:447:9 | if cond {...} | main.rs:442:31:448:5 | { ... } |
-| main.rs:444:17:444:17 | [SSA] n | main.rs:445:18:445:18 | n |
-| main.rs:444:17:444:17 | n | main.rs:444:17:444:17 | [SSA] n |
-| main.rs:444:17:444:17 | n | main.rs:444:17:444:17 | n |
-| main.rs:444:21:444:24 | [post] receiver for name | main.rs:444:21:444:24 | [post] name |
-| main.rs:444:21:444:24 | name | main.rs:444:21:444:24 | receiver for name |
-| main.rs:444:21:444:68 | name.unwrap_or_else(...) | main.rs:444:17:444:17 | n |
-| main.rs:444:41:444:67 | [post] default_name | main.rs:442:9:442:20 | SSA phi read(default_name) |
-| main.rs:444:41:444:67 | closure self in \|...\| ... | main.rs:444:44:444:55 | this |
-| main.rs:444:41:444:67 | default_name | main.rs:442:9:442:20 | SSA phi read(default_name) |
-| main.rs:444:44:444:55 | [post] receiver for default_name | main.rs:444:44:444:55 | [post] default_name |
-| main.rs:444:44:444:55 | default_name | main.rs:444:44:444:55 | receiver for default_name |
-| main.rs:445:18:445:18 | [post] receiver for n | main.rs:445:18:445:18 | [post] n |
-| main.rs:445:18:445:18 | n | main.rs:445:18:445:18 | receiver for n |
-| main.rs:458:9:458:9 | [SSA] s | main.rs:459:10:459:10 | s |
-| main.rs:458:9:458:9 | s | main.rs:458:9:458:9 | [SSA] s |
-| main.rs:458:9:458:9 | s | main.rs:458:9:458:9 | s |
-| main.rs:458:13:458:27 | MacroExpr | main.rs:458:9:458:9 | s |
-| main.rs:458:25:458:26 | source(...) | main.rs:458:13:458:27 | MacroExpr |
-| main.rs:462:16:462:16 | [SSA] s | main.rs:463:20:463:20 | s |
-| main.rs:462:16:462:16 | s | main.rs:462:16:462:16 | [SSA] s |
-| main.rs:462:16:462:16 | s | main.rs:462:16:462:16 | s |
-| main.rs:462:16:462:24 | ...: String | main.rs:462:16:462:16 | s |
-| main.rs:463:14:463:20 | FormatArgsExpr | main.rs:463:14:463:20 | MacroExpr |
-| main.rs:463:14:463:20 | MacroBlockExpr | main.rs:463:5:463:21 | MacroExpr |
-| main.rs:463:14:463:20 | [post] MacroExpr | main.rs:463:14:463:20 | [post] FormatArgsExpr |
-| main.rs:463:14:463:20 | { ... } | main.rs:463:14:463:20 | MacroBlockExpr |
-| main.rs:467:9:467:9 | [SSA] a | main.rs:468:13:468:13 | a |
-| main.rs:467:9:467:9 | a | main.rs:467:9:467:9 | [SSA] a |
-| main.rs:467:9:467:9 | a | main.rs:467:9:467:9 | a |
-| main.rs:467:13:467:22 | source(...) | main.rs:467:9:467:9 | a |
-| main.rs:468:9:468:9 | [SSA] b | main.rs:469:13:469:13 | b |
-| main.rs:468:9:468:9 | b | main.rs:468:9:468:9 | [SSA] b |
-| main.rs:468:9:468:9 | b | main.rs:468:9:468:9 | b |
-| main.rs:468:13:468:13 | [post] a | main.rs:472:10:472:10 | a |
-| main.rs:468:13:468:13 | [post] receiver for a | main.rs:468:13:468:13 | [post] a |
-| main.rs:468:13:468:13 | a | main.rs:468:13:468:13 | receiver for a |
-| main.rs:468:13:468:13 | a | main.rs:472:10:472:10 | a |
-| main.rs:468:13:468:25 | a.to_string() | main.rs:468:9:468:9 | b |
-| main.rs:469:9:469:9 | [SSA] c | main.rs:474:10:474:10 | c |
-| main.rs:469:9:469:9 | c | main.rs:469:9:469:9 | [SSA] c |
-| main.rs:469:9:469:9 | c | main.rs:469:9:469:9 | c |
-| main.rs:469:13:469:13 | [post] b | main.rs:470:18:470:18 | b |
-| main.rs:469:13:469:13 | [post] receiver for b | main.rs:469:13:469:13 | [post] b |
-| main.rs:469:13:469:13 | b | main.rs:469:13:469:13 | receiver for b |
-| main.rs:469:13:469:13 | b | main.rs:470:18:470:18 | b |
-| main.rs:469:13:469:28 | [post] receiver for b.parse() | main.rs:469:13:469:28 | [post] b.parse() |
-| main.rs:469:13:469:28 | b.parse() | main.rs:469:13:469:28 | receiver for b.parse() |
-| main.rs:469:13:469:37 | ... .unwrap() | main.rs:469:9:469:9 | c |
-| main.rs:470:9:470:9 | [SSA] d | main.rs:475:10:475:10 | d |
-| main.rs:470:9:470:9 | d | main.rs:470:9:470:9 | [SSA] d |
-| main.rs:470:9:470:9 | d | main.rs:470:9:470:9 | d |
-| main.rs:470:18:470:18 | [post] b | main.rs:473:17:473:17 | b |
-| main.rs:470:18:470:18 | [post] receiver for b | main.rs:470:18:470:18 | [post] b |
-| main.rs:470:18:470:18 | b | main.rs:470:18:470:18 | receiver for b |
-| main.rs:470:18:470:18 | b | main.rs:473:17:473:17 | b |
-| main.rs:470:18:470:26 | [post] receiver for b.parse() | main.rs:470:18:470:26 | [post] b.parse() |
-| main.rs:470:18:470:26 | b.parse() | main.rs:470:18:470:26 | receiver for b.parse() |
-| main.rs:470:18:470:35 | ... .unwrap() | main.rs:470:9:470:9 | d |
-| main.rs:479:9:479:10 | [SSA] vs | main.rs:481:10:481:11 | vs |
-| main.rs:479:9:479:10 | vs | main.rs:479:9:479:10 | [SSA] vs |
-| main.rs:479:9:479:10 | vs | main.rs:479:9:479:10 | vs |
-| main.rs:479:14:479:34 | [...] | main.rs:479:9:479:10 | vs |
-| main.rs:481:10:481:11 | [post] vs | main.rs:482:11:482:12 | vs |
-| main.rs:481:10:481:11 | vs | main.rs:482:11:482:12 | vs |
-| main.rs:482:11:482:12 | [post] receiver for vs | main.rs:482:11:482:12 | [post] vs |
-| main.rs:482:11:482:12 | [post] vs | main.rs:483:11:483:12 | vs |
-| main.rs:482:11:482:12 | vs | main.rs:482:11:482:12 | receiver for vs |
-| main.rs:482:11:482:12 | vs | main.rs:483:11:483:12 | vs |
-| main.rs:482:11:482:19 | [post] receiver for vs.iter() | main.rs:482:11:482:19 | [post] vs.iter() |
-| main.rs:482:11:482:19 | vs.iter() | main.rs:482:11:482:19 | receiver for vs.iter() |
-| main.rs:482:11:482:26 | ... .next() | main.rs:482:11:482:26 | receiver for ... .next() |
-| main.rs:482:11:482:26 | [post] receiver for ... .next() | main.rs:482:11:482:26 | [post] ... .next() |
-| main.rs:482:11:482:35 | ... .unwrap() | main.rs:482:11:482:35 | receiver for ... .unwrap() |
-| main.rs:482:11:482:35 | [post] receiver for ... .unwrap() | main.rs:482:11:482:35 | [post] ... .unwrap() |
-| main.rs:483:11:483:12 | [post] receiver for vs | main.rs:483:11:483:12 | [post] vs |
-| main.rs:483:11:483:12 | [post] vs | main.rs:485:14:485:15 | vs |
-| main.rs:483:11:483:12 | vs | main.rs:483:11:483:12 | receiver for vs |
-| main.rs:483:11:483:12 | vs | main.rs:485:14:485:15 | vs |
-| main.rs:483:11:483:19 | [post] receiver for vs.iter() | main.rs:483:11:483:19 | [post] vs.iter() |
-| main.rs:483:11:483:19 | vs.iter() | main.rs:483:11:483:19 | receiver for vs.iter() |
-| main.rs:483:11:483:26 | ... .nth(...) | main.rs:483:11:483:26 | receiver for ... .nth(...) |
-| main.rs:483:11:483:26 | [post] receiver for ... .nth(...) | main.rs:483:11:483:26 | [post] ... .nth(...) |
-| main.rs:483:11:483:35 | ... .unwrap() | main.rs:483:11:483:35 | receiver for ... .unwrap() |
-| main.rs:483:11:483:35 | [post] receiver for ... .unwrap() | main.rs:483:11:483:35 | [post] ... .unwrap() |
-| main.rs:485:9:485:9 | [SSA] v | main.rs:486:14:486:14 | v |
-| main.rs:485:9:485:9 | v | main.rs:485:9:485:9 | [SSA] v |
-| main.rs:485:9:485:9 | v | main.rs:485:9:485:9 | v |
-| main.rs:485:14:485:15 | vs | main.rs:488:15:488:16 | vs |
-| main.rs:488:10:488:10 | [SSA] v | main.rs:489:14:489:14 | v |
-| main.rs:488:10:488:10 | v | main.rs:488:10:488:10 | [SSA] v |
-| main.rs:488:10:488:10 | v | main.rs:488:10:488:10 | v |
-| main.rs:488:15:488:16 | [post] receiver for vs | main.rs:488:15:488:16 | [post] vs |
-| main.rs:488:15:488:16 | [post] vs | main.rs:492:26:492:27 | vs |
-| main.rs:488:15:488:16 | vs | main.rs:488:15:488:16 | receiver for vs |
-| main.rs:488:15:488:16 | vs | main.rs:492:26:492:27 | vs |
-| main.rs:492:9:492:11 | [SSA] vs2 | main.rs:493:15:493:17 | vs2 |
-| main.rs:492:9:492:11 | vs2 | main.rs:492:9:492:11 | [SSA] vs2 |
-| main.rs:492:9:492:11 | vs2 | main.rs:492:9:492:11 | vs2 |
-| main.rs:492:26:492:27 | [post] receiver for vs | main.rs:492:26:492:27 | [post] vs |
-| main.rs:492:26:492:27 | [post] vs | main.rs:497:5:497:6 | vs |
-| main.rs:492:26:492:27 | vs | main.rs:492:26:492:27 | receiver for vs |
-| main.rs:492:26:492:27 | vs | main.rs:497:5:497:6 | vs |
-| main.rs:492:26:492:34 | [post] receiver for vs.iter() | main.rs:492:26:492:34 | [post] vs.iter() |
-| main.rs:492:26:492:34 | vs.iter() | main.rs:492:26:492:34 | receiver for vs.iter() |
-| main.rs:492:26:492:44 | ... .collect() | main.rs:492:9:492:11 | vs2 |
-| main.rs:493:10:493:10 | [SSA] v | main.rs:494:14:494:14 | v |
-| main.rs:493:10:493:10 | v | main.rs:493:10:493:10 | [SSA] v |
-| main.rs:493:10:493:10 | v | main.rs:493:10:493:10 | v |
-| main.rs:497:5:497:6 | [post] receiver for vs | main.rs:497:5:497:6 | [post] vs |
-| main.rs:497:5:497:6 | [post] vs | main.rs:498:5:498:6 | vs |
-| main.rs:497:5:497:6 | vs | main.rs:497:5:497:6 | receiver for vs |
-| main.rs:497:5:497:6 | vs | main.rs:498:5:498:6 | vs |
-| main.rs:497:5:497:13 | [post] receiver for vs.iter() | main.rs:497:5:497:13 | [post] vs.iter() |
-| main.rs:497:5:497:13 | vs.iter() | main.rs:497:5:497:13 | receiver for vs.iter() |
-| main.rs:497:20:497:20 | ... | main.rs:497:20:497:20 | x |
-| main.rs:497:20:497:20 | [SSA] x | main.rs:497:29:497:29 | x |
-| main.rs:497:20:497:20 | x | main.rs:497:20:497:20 | [SSA] x |
-| main.rs:497:20:497:20 | x | main.rs:497:20:497:20 | x |
-| main.rs:497:29:497:29 | [post] receiver for x | main.rs:497:29:497:29 | [post] x |
-| main.rs:497:29:497:29 | x | main.rs:497:29:497:29 | receiver for x |
-| main.rs:498:5:498:6 | [post] receiver for vs | main.rs:498:5:498:6 | [post] vs |
-| main.rs:498:5:498:6 | [post] vs | main.rs:500:14:500:15 | vs |
-| main.rs:498:5:498:6 | vs | main.rs:498:5:498:6 | receiver for vs |
-| main.rs:498:5:498:6 | vs | main.rs:500:14:500:15 | vs |
-| main.rs:498:5:498:13 | [post] receiver for vs.iter() | main.rs:498:5:498:13 | [post] vs.iter() |
-| main.rs:498:5:498:13 | vs.iter() | main.rs:498:5:498:13 | receiver for vs.iter() |
-| main.rs:498:25:498:25 | ... | main.rs:498:25:498:25 | x |
-| main.rs:498:25:498:25 | [SSA] x | main.rs:498:34:498:34 | x |
-| main.rs:498:25:498:25 | x | main.rs:498:25:498:25 | [SSA] x |
-| main.rs:498:25:498:25 | x | main.rs:498:25:498:25 | x |
-| main.rs:498:34:498:34 | [post] receiver for x | main.rs:498:34:498:34 | [post] x |
-| main.rs:498:34:498:34 | x | main.rs:498:34:498:34 | receiver for x |
-| main.rs:500:9:500:9 | [SSA] v | main.rs:501:14:501:14 | v |
-| main.rs:500:9:500:9 | v | main.rs:500:9:500:9 | [SSA] v |
-| main.rs:500:9:500:9 | v | main.rs:500:9:500:9 | v |
-| main.rs:500:14:500:15 | [post] receiver for vs | main.rs:500:14:500:15 | [post] vs |
-| main.rs:500:14:500:15 | vs | main.rs:500:14:500:15 | receiver for vs |
-| main.rs:504:9:504:18 | mut vs_mut | main.rs:504:13:504:18 | vs_mut |
-| main.rs:504:13:504:18 | [SSA] vs_mut | main.rs:506:10:506:15 | vs_mut |
-| main.rs:504:13:504:18 | vs_mut | main.rs:504:13:504:18 | [SSA] vs_mut |
-| main.rs:504:22:504:42 | [...] | main.rs:504:9:504:18 | mut vs_mut |
-| main.rs:506:10:506:15 | [post] vs_mut | main.rs:507:11:507:16 | [SSA] vs_mut |
-| main.rs:506:10:506:15 | [post] vs_mut | main.rs:507:11:507:16 | vs_mut |
-| main.rs:506:10:506:15 | vs_mut | main.rs:507:11:507:16 | [SSA] vs_mut |
-| main.rs:506:10:506:15 | vs_mut | main.rs:507:11:507:16 | vs_mut |
-| main.rs:507:11:507:16 | [SSA] vs_mut | main.rs:508:11:508:16 | [SSA] vs_mut |
-| main.rs:507:11:507:16 | [SSA] vs_mut | main.rs:508:11:508:16 | vs_mut |
-| main.rs:507:11:507:16 | [post] receiver for vs_mut | main.rs:507:11:507:16 | [post] vs_mut |
-| main.rs:507:11:507:16 | [post] vs_mut | main.rs:508:11:508:16 | [SSA] vs_mut |
-| main.rs:507:11:507:16 | [post] vs_mut | main.rs:508:11:508:16 | vs_mut |
-| main.rs:507:11:507:16 | vs_mut | main.rs:507:11:507:16 | receiver for vs_mut |
-| main.rs:507:11:507:16 | vs_mut | main.rs:508:11:508:16 | [SSA] vs_mut |
-| main.rs:507:11:507:16 | vs_mut | main.rs:508:11:508:16 | vs_mut |
-| main.rs:507:11:507:23 | [post] receiver for vs_mut.iter() | main.rs:507:11:507:23 | [post] vs_mut.iter() |
-| main.rs:507:11:507:23 | vs_mut.iter() | main.rs:507:11:507:23 | receiver for vs_mut.iter() |
-| main.rs:507:11:507:30 | ... .next() | main.rs:507:11:507:30 | receiver for ... .next() |
-| main.rs:507:11:507:30 | [post] receiver for ... .next() | main.rs:507:11:507:30 | [post] ... .next() |
-| main.rs:507:11:507:39 | ... .unwrap() | main.rs:507:11:507:39 | receiver for ... .unwrap() |
-| main.rs:507:11:507:39 | [post] receiver for ... .unwrap() | main.rs:507:11:507:39 | [post] ... .unwrap() |
-| main.rs:508:11:508:16 | [SSA] vs_mut | main.rs:510:19:510:24 | vs_mut |
-| main.rs:508:11:508:16 | [post] receiver for vs_mut | main.rs:508:11:508:16 | [post] vs_mut |
-| main.rs:508:11:508:16 | [post] vs_mut | main.rs:510:19:510:24 | vs_mut |
-| main.rs:508:11:508:16 | vs_mut | main.rs:508:11:508:16 | receiver for vs_mut |
-| main.rs:508:11:508:16 | vs_mut | main.rs:510:19:510:24 | vs_mut |
-| main.rs:508:11:508:23 | [post] receiver for vs_mut.iter() | main.rs:508:11:508:23 | [post] vs_mut.iter() |
-| main.rs:508:11:508:23 | vs_mut.iter() | main.rs:508:11:508:23 | receiver for vs_mut.iter() |
-| main.rs:508:11:508:30 | ... .nth(...) | main.rs:508:11:508:30 | receiver for ... .nth(...) |
-| main.rs:508:11:508:30 | [post] receiver for ... .nth(...) | main.rs:508:11:508:30 | [post] ... .nth(...) |
-| main.rs:508:11:508:39 | ... .unwrap() | main.rs:508:11:508:39 | receiver for ... .unwrap() |
-| main.rs:508:11:508:39 | [post] receiver for ... .unwrap() | main.rs:508:11:508:39 | [post] ... .unwrap() |
-| main.rs:510:5:512:5 | for ... in ... { ... } | main.rs:478:16:513:1 | { ... } |
-| main.rs:510:14:510:14 | [SSA] v | main.rs:511:14:511:14 | v |
-| main.rs:510:14:510:14 | v | main.rs:510:14:510:14 | [SSA] v |
-| main.rs:510:14:510:14 | v | main.rs:510:14:510:14 | v |
-| main.rs:510:19:510:24 | [post] receiver for vs_mut | main.rs:510:19:510:24 | [post] vs_mut |
-| main.rs:510:19:510:24 | vs_mut | main.rs:510:19:510:24 | receiver for vs_mut |
-| main.rs:516:9:516:9 | [SSA] a | main.rs:521:10:521:10 | a |
-| main.rs:516:9:516:9 | a | main.rs:516:9:516:9 | [SSA] a |
-| main.rs:516:9:516:9 | a | main.rs:516:9:516:9 | a |
-| main.rs:516:13:516:22 | source(...) | main.rs:516:9:516:9 | a |
-| main.rs:517:9:517:9 | [SSA] b | main.rs:522:15:522:15 | b |
-| main.rs:517:9:517:9 | b | main.rs:517:9:517:9 | [SSA] b |
-| main.rs:517:9:517:9 | b | main.rs:517:9:517:9 | b |
-| main.rs:517:13:517:22 | source(...) | main.rs:517:9:517:9 | b |
-| main.rs:518:9:518:9 | [SSA] c | main.rs:519:18:519:18 | c |
-| main.rs:518:9:518:9 | c | main.rs:518:9:518:9 | [SSA] c |
-| main.rs:518:9:518:9 | c | main.rs:518:9:518:9 | c |
-| main.rs:518:13:518:22 | source(...) | main.rs:518:9:518:9 | c |
-| main.rs:519:9:519:13 | [SSA] c_ref | main.rs:523:14:523:18 | c_ref |
-| main.rs:519:9:519:13 | c_ref | main.rs:519:9:519:13 | [SSA] c_ref |
-| main.rs:519:9:519:13 | c_ref | main.rs:519:9:519:13 | c_ref |
-| main.rs:519:17:519:18 | &c | main.rs:519:9:519:13 | c_ref |
-| main.rs:523:14:523:18 | [post] c_ref | main.rs:524:11:524:15 | c_ref |
-| main.rs:523:14:523:18 | c_ref | main.rs:524:11:524:15 | c_ref |
-| main.rs:524:11:524:15 | [post] receiver for c_ref | main.rs:524:11:524:15 | [post] c_ref |
-| main.rs:524:11:524:15 | c_ref | main.rs:524:11:524:15 | receiver for c_ref |
-| main.rs:528:9:528:9 | [SSA] a | main.rs:530:10:530:10 | a |
-| main.rs:528:9:528:9 | a | main.rs:528:9:528:9 | [SSA] a |
-| main.rs:528:9:528:9 | a | main.rs:528:9:528:9 | a |
-| main.rs:528:18:528:27 | source(...) | main.rs:528:9:528:9 | a |
-| main.rs:530:10:530:10 | [post] a | main.rs:531:10:531:10 | a |
-| main.rs:530:10:530:10 | a | main.rs:531:10:531:10 | a |
-| main.rs:531:10:531:10 | [post] a | main.rs:532:20:532:20 | a |
-| main.rs:531:10:531:10 | [post] receiver for a | main.rs:531:10:531:10 | [post] a |
-| main.rs:531:10:531:10 | a | main.rs:531:10:531:10 | receiver for a |
-| main.rs:531:10:531:10 | a | main.rs:532:20:532:20 | a |
-| main.rs:534:9:534:9 | [SSA] b | main.rs:536:10:536:10 | b |
-| main.rs:534:9:534:9 | b | main.rs:534:9:534:9 | [SSA] b |
-| main.rs:534:9:534:9 | b | main.rs:534:9:534:9 | b |
-| main.rs:534:18:534:34 | ... as i32 | main.rs:534:9:534:9 | b |
-| main.rs:536:10:536:10 | [post] b | main.rs:537:10:537:10 | b |
-| main.rs:536:10:536:10 | b | main.rs:537:10:537:10 | b |
-| main.rs:537:10:537:10 | [post] b | main.rs:538:20:538:20 | b |
-| main.rs:537:10:537:10 | [post] receiver for b | main.rs:537:10:537:10 | [post] b |
-| main.rs:537:10:537:10 | b | main.rs:537:10:537:10 | receiver for b |
-| main.rs:537:10:537:10 | b | main.rs:538:20:538:20 | b |
-| main.rs:565:13:565:33 | result_questionmark(...) | main.rs:565:9:565:9 | _ |
-| main.rs:577:36:577:41 | ...::new(...) | main.rs:577:36:577:41 | MacroExpr |
-| main.rs:577:36:577:41 | [post] MacroExpr | main.rs:577:36:577:41 | [post] ...::new(...) |
+| main.rs:254:9:254:10 | [SSA] s2 | main.rs:259:11:259:12 | s2 |
+| main.rs:254:9:254:10 | s2 | main.rs:254:9:254:10 | [SSA] s2 |
+| main.rs:254:9:254:10 | s2 | main.rs:254:9:254:10 | s2 |
+| main.rs:254:14:254:20 | Some(...) | main.rs:254:9:254:10 | s2 |
+| main.rs:255:11:255:12 | s1 | main.rs:256:9:256:15 | Some(...) |
+| main.rs:255:11:255:12 | s1 | main.rs:257:9:257:12 | None |
+| main.rs:256:14:256:14 | [SSA] n | main.rs:256:25:256:25 | n |
+| main.rs:256:14:256:14 | n | main.rs:256:14:256:14 | [SSA] n |
+| main.rs:256:14:256:14 | n | main.rs:256:14:256:14 | n |
+| main.rs:256:20:256:26 | sink(...) | main.rs:255:5:258:5 | match s1 { ... } |
+| main.rs:257:17:257:23 | sink(...) | main.rs:255:5:258:5 | match s1 { ... } |
+| main.rs:259:5:262:5 | match s2 { ... } | main.rs:252:39:263:1 | { ... } |
+| main.rs:259:11:259:12 | s2 | main.rs:260:9:260:15 | Some(...) |
+| main.rs:259:11:259:12 | s2 | main.rs:261:9:261:12 | None |
+| main.rs:260:14:260:14 | [SSA] n | main.rs:260:25:260:25 | n |
+| main.rs:260:14:260:14 | n | main.rs:260:14:260:14 | [SSA] n |
+| main.rs:260:14:260:14 | n | main.rs:260:14:260:14 | n |
+| main.rs:260:20:260:26 | sink(...) | main.rs:259:5:262:5 | match s2 { ... } |
+| main.rs:261:17:261:23 | sink(...) | main.rs:259:5:262:5 | match s2 { ... } |
+| main.rs:266:9:266:10 | [SSA] s1 | main.rs:267:22:267:23 | s1 |
+| main.rs:266:9:266:10 | s1 | main.rs:266:9:266:10 | [SSA] s1 |
+| main.rs:266:9:266:10 | s1 | main.rs:266:9:266:10 | s1 |
+| main.rs:266:14:266:29 | Some(...) | main.rs:266:9:266:10 | s1 |
+| main.rs:267:5:274:5 | if ... {...} | main.rs:265:25:275:1 | { ... } |
+| main.rs:267:17:267:17 | [SSA] n | main.rs:269:18:269:18 | n |
+| main.rs:267:17:267:17 | n | main.rs:267:17:267:17 | [SSA] n |
+| main.rs:267:17:267:17 | n | main.rs:267:17:267:17 | n |
+| main.rs:267:22:267:23 | s1 | main.rs:267:12:267:18 | Some(...) |
+| main.rs:269:18:269:18 | [post] n | main.rs:273:14:273:14 | n |
+| main.rs:269:18:269:18 | n | main.rs:273:14:273:14 | n |
+| main.rs:270:13:270:16 | true | main.rs:268:12:271:9 | { ... } |
+| main.rs:272:5:274:5 | { ... } | main.rs:267:5:274:5 | if ... {...} |
+| main.rs:278:9:278:10 | [SSA] s1 | main.rs:279:10:279:11 | s1 |
+| main.rs:278:9:278:10 | s1 | main.rs:278:9:278:10 | [SSA] s1 |
+| main.rs:278:9:278:10 | s1 | main.rs:278:9:278:10 | s1 |
+| main.rs:278:14:278:29 | Some(...) | main.rs:278:9:278:10 | s1 |
+| main.rs:279:10:279:11 | [post] receiver for s1 | main.rs:279:10:279:11 | [post] s1 |
+| main.rs:279:10:279:11 | s1 | main.rs:279:10:279:11 | receiver for s1 |
+| main.rs:283:9:283:10 | [SSA] s1 | main.rs:284:10:284:11 | s1 |
+| main.rs:283:9:283:10 | s1 | main.rs:283:9:283:10 | [SSA] s1 |
+| main.rs:283:9:283:10 | s1 | main.rs:283:9:283:10 | s1 |
+| main.rs:283:14:283:29 | Some(...) | main.rs:283:9:283:10 | s1 |
+| main.rs:284:10:284:11 | [post] receiver for s1 | main.rs:284:10:284:11 | [post] s1 |
+| main.rs:284:10:284:11 | s1 | main.rs:284:10:284:11 | receiver for s1 |
+| main.rs:286:9:286:10 | [SSA] s2 | main.rs:287:10:287:11 | s2 |
+| main.rs:286:9:286:10 | s2 | main.rs:286:9:286:10 | [SSA] s2 |
+| main.rs:286:9:286:10 | s2 | main.rs:286:9:286:10 | s2 |
+| main.rs:286:14:286:20 | Some(...) | main.rs:286:9:286:10 | s2 |
+| main.rs:287:10:287:11 | [post] receiver for s2 | main.rs:287:10:287:11 | [post] s2 |
+| main.rs:287:10:287:11 | s2 | main.rs:287:10:287:11 | receiver for s2 |
+| main.rs:291:9:291:10 | [SSA] s1 | main.rs:292:10:292:11 | s1 |
+| main.rs:291:9:291:10 | s1 | main.rs:291:9:291:10 | [SSA] s1 |
+| main.rs:291:9:291:10 | s1 | main.rs:291:9:291:10 | s1 |
+| main.rs:291:14:291:29 | Some(...) | main.rs:291:9:291:10 | s1 |
+| main.rs:292:10:292:11 | [post] receiver for s1 | main.rs:292:10:292:11 | [post] s1 |
+| main.rs:292:10:292:11 | s1 | main.rs:292:10:292:11 | receiver for s1 |
+| main.rs:294:9:294:10 | [SSA] s2 | main.rs:295:10:295:11 | s2 |
+| main.rs:294:9:294:10 | s2 | main.rs:294:9:294:10 | [SSA] s2 |
+| main.rs:294:9:294:10 | s2 | main.rs:294:9:294:10 | s2 |
+| main.rs:294:14:294:17 | None | main.rs:294:9:294:10 | s2 |
+| main.rs:295:10:295:11 | [post] receiver for s2 | main.rs:295:10:295:11 | [post] s2 |
+| main.rs:295:10:295:11 | s2 | main.rs:295:10:295:11 | receiver for s2 |
+| main.rs:299:9:299:10 | [SSA] s1 | main.rs:301:14:301:15 | s1 |
+| main.rs:299:9:299:10 | s1 | main.rs:299:9:299:10 | [SSA] s1 |
+| main.rs:299:9:299:10 | s1 | main.rs:299:9:299:10 | s1 |
+| main.rs:299:14:299:29 | Some(...) | main.rs:299:9:299:10 | s1 |
+| main.rs:300:9:300:10 | [SSA] s2 | main.rs:303:10:303:11 | s2 |
+| main.rs:300:9:300:10 | s2 | main.rs:300:9:300:10 | [SSA] s2 |
+| main.rs:300:9:300:10 | s2 | main.rs:300:9:300:10 | s2 |
+| main.rs:300:14:300:20 | Some(...) | main.rs:300:9:300:10 | s2 |
+| main.rs:301:9:301:10 | [SSA] i1 | main.rs:302:10:302:11 | i1 |
+| main.rs:301:9:301:10 | i1 | main.rs:301:9:301:10 | [SSA] i1 |
+| main.rs:301:9:301:10 | i1 | main.rs:301:9:301:10 | i1 |
+| main.rs:301:14:301:16 | TryExpr | main.rs:301:9:301:10 | i1 |
+| main.rs:304:5:304:11 | Some(...) | main.rs:298:41:305:1 | { ... } |
+| main.rs:308:9:308:10 | [SSA] r1 | main.rs:309:28:309:29 | r1 |
+| main.rs:308:9:308:10 | r1 | main.rs:308:9:308:10 | [SSA] r1 |
+| main.rs:308:9:308:10 | r1 | main.rs:308:9:308:10 | r1 |
+| main.rs:308:32:308:45 | Ok(...) | main.rs:308:9:308:10 | r1 |
+| main.rs:309:9:309:11 | [SSA] o1a | main.rs:311:10:311:12 | o1a |
+| main.rs:309:9:309:11 | o1a | main.rs:309:9:309:11 | [SSA] o1a |
+| main.rs:309:9:309:11 | o1a | main.rs:309:9:309:11 | o1a |
+| main.rs:309:28:309:29 | [post] r1 | main.rs:310:28:310:29 | r1 |
+| main.rs:309:28:309:29 | [post] receiver for r1 | main.rs:309:28:309:29 | [post] r1 |
+| main.rs:309:28:309:29 | r1 | main.rs:309:28:309:29 | receiver for r1 |
+| main.rs:309:28:309:29 | r1 | main.rs:310:28:310:29 | r1 |
+| main.rs:309:28:309:34 | r1.ok() | main.rs:309:9:309:11 | o1a |
+| main.rs:310:9:310:11 | [SSA] o1b | main.rs:312:10:312:12 | o1b |
+| main.rs:310:9:310:11 | o1b | main.rs:310:9:310:11 | [SSA] o1b |
+| main.rs:310:9:310:11 | o1b | main.rs:310:9:310:11 | o1b |
+| main.rs:310:28:310:29 | [post] receiver for r1 | main.rs:310:28:310:29 | [post] r1 |
+| main.rs:310:28:310:29 | r1 | main.rs:310:28:310:29 | receiver for r1 |
+| main.rs:310:28:310:35 | r1.err() | main.rs:310:9:310:11 | o1b |
+| main.rs:311:10:311:12 | [post] receiver for o1a | main.rs:311:10:311:12 | [post] o1a |
+| main.rs:311:10:311:12 | o1a | main.rs:311:10:311:12 | receiver for o1a |
+| main.rs:312:10:312:12 | [post] receiver for o1b | main.rs:312:10:312:12 | [post] o1b |
+| main.rs:312:10:312:12 | o1b | main.rs:312:10:312:12 | receiver for o1b |
+| main.rs:314:9:314:10 | [SSA] r2 | main.rs:315:28:315:29 | r2 |
+| main.rs:314:9:314:10 | r2 | main.rs:314:9:314:10 | [SSA] r2 |
+| main.rs:314:9:314:10 | r2 | main.rs:314:9:314:10 | r2 |
+| main.rs:314:32:314:46 | Err(...) | main.rs:314:9:314:10 | r2 |
+| main.rs:315:9:315:11 | [SSA] o2a | main.rs:317:10:317:12 | o2a |
+| main.rs:315:9:315:11 | o2a | main.rs:315:9:315:11 | [SSA] o2a |
+| main.rs:315:9:315:11 | o2a | main.rs:315:9:315:11 | o2a |
+| main.rs:315:28:315:29 | [post] r2 | main.rs:316:28:316:29 | r2 |
+| main.rs:315:28:315:29 | [post] receiver for r2 | main.rs:315:28:315:29 | [post] r2 |
+| main.rs:315:28:315:29 | r2 | main.rs:315:28:315:29 | receiver for r2 |
+| main.rs:315:28:315:29 | r2 | main.rs:316:28:316:29 | r2 |
+| main.rs:315:28:315:34 | r2.ok() | main.rs:315:9:315:11 | o2a |
+| main.rs:316:9:316:11 | [SSA] o2b | main.rs:318:10:318:12 | o2b |
+| main.rs:316:9:316:11 | o2b | main.rs:316:9:316:11 | [SSA] o2b |
+| main.rs:316:9:316:11 | o2b | main.rs:316:9:316:11 | o2b |
+| main.rs:316:28:316:29 | [post] receiver for r2 | main.rs:316:28:316:29 | [post] r2 |
+| main.rs:316:28:316:29 | r2 | main.rs:316:28:316:29 | receiver for r2 |
+| main.rs:316:28:316:35 | r2.err() | main.rs:316:9:316:11 | o2b |
+| main.rs:317:10:317:12 | [post] receiver for o2a | main.rs:317:10:317:12 | [post] o2a |
+| main.rs:317:10:317:12 | o2a | main.rs:317:10:317:12 | receiver for o2a |
+| main.rs:318:10:318:12 | [post] receiver for o2b | main.rs:318:10:318:12 | [post] o2b |
+| main.rs:318:10:318:12 | o2b | main.rs:318:10:318:12 | receiver for o2b |
+| main.rs:322:9:322:10 | [SSA] s1 | main.rs:325:14:325:15 | s1 |
+| main.rs:322:9:322:10 | s1 | main.rs:322:9:322:10 | [SSA] s1 |
+| main.rs:322:9:322:10 | s1 | main.rs:322:9:322:10 | s1 |
+| main.rs:322:32:322:45 | Ok(...) | main.rs:322:9:322:10 | s1 |
+| main.rs:323:9:323:10 | [SSA] s2 | main.rs:326:14:326:15 | s2 |
+| main.rs:323:9:323:10 | s2 | main.rs:323:9:323:10 | [SSA] s2 |
+| main.rs:323:9:323:10 | s2 | main.rs:323:9:323:10 | s2 |
+| main.rs:323:32:323:36 | Ok(...) | main.rs:323:9:323:10 | s2 |
+| main.rs:324:9:324:10 | [SSA] s3 | main.rs:329:14:329:15 | s3 |
+| main.rs:324:9:324:10 | s3 | main.rs:324:9:324:10 | [SSA] s3 |
+| main.rs:324:9:324:10 | s3 | main.rs:324:9:324:10 | s3 |
+| main.rs:324:32:324:46 | Err(...) | main.rs:324:9:324:10 | s3 |
+| main.rs:325:9:325:10 | [SSA] i1 | main.rs:327:10:327:11 | i1 |
+| main.rs:325:9:325:10 | i1 | main.rs:325:9:325:10 | [SSA] i1 |
+| main.rs:325:9:325:10 | i1 | main.rs:325:9:325:10 | i1 |
+| main.rs:325:14:325:16 | TryExpr | main.rs:325:9:325:10 | i1 |
+| main.rs:326:9:326:10 | [SSA] i2 | main.rs:328:10:328:11 | i2 |
+| main.rs:326:9:326:10 | i2 | main.rs:326:9:326:10 | [SSA] i2 |
+| main.rs:326:9:326:10 | i2 | main.rs:326:9:326:10 | i2 |
+| main.rs:326:14:326:16 | TryExpr | main.rs:326:9:326:10 | i2 |
+| main.rs:329:9:329:10 | [SSA] i3 | main.rs:330:10:330:11 | i3 |
+| main.rs:329:9:329:10 | i3 | main.rs:329:9:329:10 | [SSA] i3 |
+| main.rs:329:9:329:10 | i3 | main.rs:329:9:329:10 | i3 |
+| main.rs:329:14:329:16 | TryExpr | main.rs:329:9:329:10 | i3 |
+| main.rs:331:5:331:9 | Ok(...) | main.rs:321:46:332:1 | { ... } |
+| main.rs:335:9:335:10 | [SSA] s1 | main.rs:336:10:336:11 | s1 |
+| main.rs:335:9:335:10 | s1 | main.rs:335:9:335:10 | [SSA] s1 |
+| main.rs:335:9:335:10 | s1 | main.rs:335:9:335:10 | s1 |
+| main.rs:335:32:335:45 | Ok(...) | main.rs:335:9:335:10 | s1 |
+| main.rs:336:10:336:11 | [post] receiver for s1 | main.rs:336:10:336:11 | [post] s1 |
+| main.rs:336:10:336:11 | [post] s1 | main.rs:337:10:337:11 | s1 |
+| main.rs:336:10:336:11 | s1 | main.rs:336:10:336:11 | receiver for s1 |
+| main.rs:336:10:336:11 | s1 | main.rs:337:10:337:11 | s1 |
+| main.rs:337:10:337:11 | [post] receiver for s1 | main.rs:337:10:337:11 | [post] s1 |
+| main.rs:337:10:337:11 | s1 | main.rs:337:10:337:11 | receiver for s1 |
+| main.rs:339:9:339:10 | [SSA] s2 | main.rs:340:10:340:11 | s2 |
+| main.rs:339:9:339:10 | s2 | main.rs:339:9:339:10 | [SSA] s2 |
+| main.rs:339:9:339:10 | s2 | main.rs:339:9:339:10 | s2 |
+| main.rs:339:32:339:46 | Err(...) | main.rs:339:9:339:10 | s2 |
+| main.rs:340:10:340:11 | [post] receiver for s2 | main.rs:340:10:340:11 | [post] s2 |
+| main.rs:340:10:340:11 | [post] s2 | main.rs:341:10:341:11 | s2 |
+| main.rs:340:10:340:11 | s2 | main.rs:340:10:340:11 | receiver for s2 |
+| main.rs:340:10:340:11 | s2 | main.rs:341:10:341:11 | s2 |
+| main.rs:341:10:341:11 | [post] receiver for s2 | main.rs:341:10:341:11 | [post] s2 |
+| main.rs:341:10:341:11 | s2 | main.rs:341:10:341:11 | receiver for s2 |
+| main.rs:350:9:350:10 | [SSA] s1 | main.rs:352:11:352:12 | s1 |
+| main.rs:350:9:350:10 | s1 | main.rs:350:9:350:10 | [SSA] s1 |
+| main.rs:350:9:350:10 | s1 | main.rs:350:9:350:10 | s1 |
+| main.rs:350:14:350:39 | ...::A(...) | main.rs:350:9:350:10 | s1 |
+| main.rs:351:9:351:10 | [SSA] s2 | main.rs:359:11:359:12 | s2 |
+| main.rs:351:9:351:10 | s2 | main.rs:351:9:351:10 | [SSA] s2 |
+| main.rs:351:9:351:10 | s2 | main.rs:351:9:351:10 | s2 |
+| main.rs:351:14:351:30 | ...::B(...) | main.rs:351:9:351:10 | s2 |
+| main.rs:352:11:352:12 | s1 | main.rs:353:9:353:25 | ...::A(...) |
+| main.rs:352:11:352:12 | s1 | main.rs:354:9:354:25 | ...::B(...) |
+| main.rs:352:11:352:12 | s1 | main.rs:356:11:356:12 | s1 |
+| main.rs:353:24:353:24 | [SSA] n | main.rs:353:35:353:35 | n |
+| main.rs:353:24:353:24 | n | main.rs:353:24:353:24 | [SSA] n |
+| main.rs:353:24:353:24 | n | main.rs:353:24:353:24 | n |
+| main.rs:353:30:353:36 | sink(...) | main.rs:352:5:355:5 | match s1 { ... } |
+| main.rs:354:24:354:24 | [SSA] n | main.rs:354:35:354:35 | n |
+| main.rs:354:24:354:24 | n | main.rs:354:24:354:24 | [SSA] n |
+| main.rs:354:24:354:24 | n | main.rs:354:24:354:24 | n |
+| main.rs:354:30:354:36 | sink(...) | main.rs:352:5:355:5 | match s1 { ... } |
+| main.rs:356:11:356:12 | s1 | main.rs:357:9:357:45 | ... \| ... |
+| main.rs:357:9:357:45 | ... \| ... | main.rs:357:9:357:25 | ...::A(...) |
+| main.rs:357:9:357:45 | ... \| ... | main.rs:357:29:357:45 | ...::B(...) |
+| main.rs:357:24:357:24 | [SSA] n | main.rs:357:55:357:55 | n |
+| main.rs:357:24:357:24 | n | main.rs:357:24:357:24 | [SSA] n |
+| main.rs:357:24:357:24 | n | main.rs:357:24:357:24 | n |
+| main.rs:357:44:357:44 | [SSA] n | main.rs:357:55:357:55 | n |
+| main.rs:357:44:357:44 | n | main.rs:357:44:357:44 | [SSA] n |
+| main.rs:357:44:357:44 | n | main.rs:357:44:357:44 | n |
+| main.rs:357:50:357:56 | sink(...) | main.rs:356:5:358:5 | match s1 { ... } |
+| main.rs:359:5:362:5 | match s2 { ... } | main.rs:349:48:363:1 | { ... } |
+| main.rs:359:11:359:12 | s2 | main.rs:360:9:360:25 | ...::A(...) |
+| main.rs:359:11:359:12 | s2 | main.rs:361:9:361:25 | ...::B(...) |
+| main.rs:360:24:360:24 | [SSA] n | main.rs:360:35:360:35 | n |
+| main.rs:360:24:360:24 | n | main.rs:360:24:360:24 | [SSA] n |
+| main.rs:360:24:360:24 | n | main.rs:360:24:360:24 | n |
+| main.rs:360:30:360:36 | sink(...) | main.rs:359:5:362:5 | match s2 { ... } |
+| main.rs:361:24:361:24 | [SSA] n | main.rs:361:35:361:35 | n |
+| main.rs:361:24:361:24 | n | main.rs:361:24:361:24 | [SSA] n |
+| main.rs:361:24:361:24 | n | main.rs:361:24:361:24 | n |
+| main.rs:361:30:361:36 | sink(...) | main.rs:359:5:362:5 | match s2 { ... } |
+| main.rs:368:9:368:10 | [SSA] s1 | main.rs:370:11:370:12 | s1 |
+| main.rs:368:9:368:10 | s1 | main.rs:368:9:368:10 | [SSA] s1 |
+| main.rs:368:9:368:10 | s1 | main.rs:368:9:368:10 | s1 |
+| main.rs:368:14:368:26 | A(...) | main.rs:368:9:368:10 | s1 |
+| main.rs:369:9:369:10 | [SSA] s2 | main.rs:377:11:377:12 | s2 |
+| main.rs:369:9:369:10 | s2 | main.rs:369:9:369:10 | [SSA] s2 |
+| main.rs:369:9:369:10 | s2 | main.rs:369:9:369:10 | s2 |
+| main.rs:369:14:369:17 | B(...) | main.rs:369:9:369:10 | s2 |
+| main.rs:370:11:370:12 | s1 | main.rs:371:9:371:12 | A(...) |
+| main.rs:370:11:370:12 | s1 | main.rs:372:9:372:12 | B(...) |
+| main.rs:370:11:370:12 | s1 | main.rs:374:11:374:12 | s1 |
+| main.rs:371:11:371:11 | [SSA] n | main.rs:371:22:371:22 | n |
+| main.rs:371:11:371:11 | n | main.rs:371:11:371:11 | [SSA] n |
+| main.rs:371:11:371:11 | n | main.rs:371:11:371:11 | n |
+| main.rs:371:17:371:23 | sink(...) | main.rs:370:5:373:5 | match s1 { ... } |
+| main.rs:372:11:372:11 | [SSA] n | main.rs:372:22:372:22 | n |
+| main.rs:372:11:372:11 | n | main.rs:372:11:372:11 | [SSA] n |
+| main.rs:372:11:372:11 | n | main.rs:372:11:372:11 | n |
+| main.rs:372:17:372:23 | sink(...) | main.rs:370:5:373:5 | match s1 { ... } |
+| main.rs:374:11:374:12 | s1 | main.rs:375:9:375:19 | ... \| ... |
+| main.rs:375:9:375:19 | ... \| ... | main.rs:375:9:375:12 | A(...) |
+| main.rs:375:9:375:19 | ... \| ... | main.rs:375:16:375:19 | B(...) |
+| main.rs:375:11:375:11 | [SSA] n | main.rs:375:29:375:29 | n |
+| main.rs:375:11:375:11 | n | main.rs:375:11:375:11 | [SSA] n |
+| main.rs:375:11:375:11 | n | main.rs:375:11:375:11 | n |
+| main.rs:375:18:375:18 | [SSA] n | main.rs:375:29:375:29 | n |
+| main.rs:375:18:375:18 | n | main.rs:375:18:375:18 | [SSA] n |
+| main.rs:375:18:375:18 | n | main.rs:375:18:375:18 | n |
+| main.rs:375:24:375:30 | sink(...) | main.rs:374:5:376:5 | match s1 { ... } |
+| main.rs:377:5:380:5 | match s2 { ... } | main.rs:367:50:381:1 | { ... } |
+| main.rs:377:11:377:12 | s2 | main.rs:378:9:378:12 | A(...) |
+| main.rs:377:11:377:12 | s2 | main.rs:379:9:379:12 | B(...) |
+| main.rs:378:11:378:11 | [SSA] n | main.rs:378:22:378:22 | n |
+| main.rs:378:11:378:11 | n | main.rs:378:11:378:11 | [SSA] n |
+| main.rs:378:11:378:11 | n | main.rs:378:11:378:11 | n |
+| main.rs:378:17:378:23 | sink(...) | main.rs:377:5:380:5 | match s2 { ... } |
+| main.rs:379:11:379:11 | [SSA] n | main.rs:379:22:379:22 | n |
+| main.rs:379:11:379:11 | n | main.rs:379:11:379:11 | [SSA] n |
+| main.rs:379:11:379:11 | n | main.rs:379:11:379:11 | n |
+| main.rs:379:17:379:23 | sink(...) | main.rs:377:5:380:5 | match s2 { ... } |
+| main.rs:389:9:389:10 | [SSA] s1 | main.rs:393:11:393:12 | s1 |
+| main.rs:389:9:389:10 | s1 | main.rs:389:9:389:10 | [SSA] s1 |
+| main.rs:389:9:389:10 | s1 | main.rs:389:9:389:10 | s1 |
+| main.rs:389:14:391:5 | ...::C {...} | main.rs:389:9:389:10 | s1 |
+| main.rs:392:9:392:10 | [SSA] s2 | main.rs:400:11:400:12 | s2 |
+| main.rs:392:9:392:10 | s2 | main.rs:392:9:392:10 | [SSA] s2 |
+| main.rs:392:9:392:10 | s2 | main.rs:392:9:392:10 | s2 |
+| main.rs:392:14:392:43 | ...::D {...} | main.rs:392:9:392:10 | s2 |
+| main.rs:393:11:393:12 | s1 | main.rs:394:9:394:38 | ...::C {...} |
+| main.rs:393:11:393:12 | s1 | main.rs:395:9:395:38 | ...::D {...} |
+| main.rs:393:11:393:12 | s1 | main.rs:397:11:397:12 | s1 |
+| main.rs:394:36:394:36 | [SSA] n | main.rs:394:48:394:48 | n |
+| main.rs:394:36:394:36 | n | main.rs:394:36:394:36 | [SSA] n |
+| main.rs:394:36:394:36 | n | main.rs:394:36:394:36 | n |
+| main.rs:394:43:394:49 | sink(...) | main.rs:393:5:396:5 | match s1 { ... } |
+| main.rs:395:36:395:36 | [SSA] n | main.rs:395:48:395:48 | n |
+| main.rs:395:36:395:36 | n | main.rs:395:36:395:36 | [SSA] n |
+| main.rs:395:36:395:36 | n | main.rs:395:36:395:36 | n |
+| main.rs:395:43:395:49 | sink(...) | main.rs:393:5:396:5 | match s1 { ... } |
+| main.rs:397:11:397:12 | s1 | main.rs:398:9:398:71 | ... \| ... |
+| main.rs:398:9:398:71 | ... \| ... | main.rs:398:9:398:38 | ...::C {...} |
+| main.rs:398:9:398:71 | ... \| ... | main.rs:398:42:398:71 | ...::D {...} |
+| main.rs:398:36:398:36 | [SSA] n | main.rs:398:81:398:81 | n |
+| main.rs:398:36:398:36 | n | main.rs:398:36:398:36 | [SSA] n |
+| main.rs:398:36:398:36 | n | main.rs:398:36:398:36 | n |
+| main.rs:398:69:398:69 | [SSA] n | main.rs:398:81:398:81 | n |
+| main.rs:398:69:398:69 | n | main.rs:398:69:398:69 | [SSA] n |
+| main.rs:398:69:398:69 | n | main.rs:398:69:398:69 | n |
+| main.rs:398:76:398:82 | sink(...) | main.rs:397:5:399:5 | match s1 { ... } |
+| main.rs:400:5:403:5 | match s2 { ... } | main.rs:388:49:404:1 | { ... } |
+| main.rs:400:11:400:12 | s2 | main.rs:401:9:401:38 | ...::C {...} |
+| main.rs:400:11:400:12 | s2 | main.rs:402:9:402:38 | ...::D {...} |
+| main.rs:401:36:401:36 | [SSA] n | main.rs:401:48:401:48 | n |
+| main.rs:401:36:401:36 | n | main.rs:401:36:401:36 | [SSA] n |
+| main.rs:401:36:401:36 | n | main.rs:401:36:401:36 | n |
+| main.rs:401:43:401:49 | sink(...) | main.rs:400:5:403:5 | match s2 { ... } |
+| main.rs:402:36:402:36 | [SSA] n | main.rs:402:48:402:48 | n |
+| main.rs:402:36:402:36 | n | main.rs:402:36:402:36 | [SSA] n |
+| main.rs:402:36:402:36 | n | main.rs:402:36:402:36 | n |
+| main.rs:402:43:402:49 | sink(...) | main.rs:400:5:403:5 | match s2 { ... } |
+| main.rs:409:9:409:10 | [SSA] s1 | main.rs:413:11:413:12 | s1 |
+| main.rs:409:9:409:10 | s1 | main.rs:409:9:409:10 | [SSA] s1 |
+| main.rs:409:9:409:10 | s1 | main.rs:409:9:409:10 | s1 |
+| main.rs:409:14:411:5 | C {...} | main.rs:409:9:409:10 | s1 |
+| main.rs:412:9:412:10 | [SSA] s2 | main.rs:420:11:420:12 | s2 |
+| main.rs:412:9:412:10 | s2 | main.rs:412:9:412:10 | [SSA] s2 |
+| main.rs:412:9:412:10 | s2 | main.rs:412:9:412:10 | s2 |
+| main.rs:412:14:412:29 | D {...} | main.rs:412:9:412:10 | s2 |
+| main.rs:413:11:413:12 | s1 | main.rs:414:9:414:24 | C {...} |
+| main.rs:413:11:413:12 | s1 | main.rs:415:9:415:24 | D {...} |
+| main.rs:413:11:413:12 | s1 | main.rs:417:11:417:12 | s1 |
+| main.rs:414:22:414:22 | [SSA] n | main.rs:414:34:414:34 | n |
+| main.rs:414:22:414:22 | n | main.rs:414:22:414:22 | [SSA] n |
+| main.rs:414:22:414:22 | n | main.rs:414:22:414:22 | n |
+| main.rs:414:29:414:35 | sink(...) | main.rs:413:5:416:5 | match s1 { ... } |
+| main.rs:415:22:415:22 | [SSA] n | main.rs:415:34:415:34 | n |
+| main.rs:415:22:415:22 | n | main.rs:415:22:415:22 | [SSA] n |
+| main.rs:415:22:415:22 | n | main.rs:415:22:415:22 | n |
+| main.rs:415:29:415:35 | sink(...) | main.rs:413:5:416:5 | match s1 { ... } |
+| main.rs:417:11:417:12 | s1 | main.rs:418:9:418:43 | ... \| ... |
+| main.rs:418:9:418:43 | ... \| ... | main.rs:418:9:418:24 | C {...} |
+| main.rs:418:9:418:43 | ... \| ... | main.rs:418:28:418:43 | D {...} |
+| main.rs:418:22:418:22 | [SSA] n | main.rs:418:53:418:53 | n |
+| main.rs:418:22:418:22 | n | main.rs:418:22:418:22 | [SSA] n |
+| main.rs:418:22:418:22 | n | main.rs:418:22:418:22 | n |
+| main.rs:418:41:418:41 | [SSA] n | main.rs:418:53:418:53 | n |
+| main.rs:418:41:418:41 | n | main.rs:418:41:418:41 | [SSA] n |
+| main.rs:418:41:418:41 | n | main.rs:418:41:418:41 | n |
+| main.rs:418:48:418:54 | sink(...) | main.rs:417:5:419:5 | match s1 { ... } |
+| main.rs:420:5:423:5 | match s2 { ... } | main.rs:408:51:424:1 | { ... } |
+| main.rs:420:11:420:12 | s2 | main.rs:421:9:421:24 | C {...} |
+| main.rs:420:11:420:12 | s2 | main.rs:422:9:422:24 | D {...} |
+| main.rs:421:22:421:22 | [SSA] n | main.rs:421:34:421:34 | n |
+| main.rs:421:22:421:22 | n | main.rs:421:22:421:22 | [SSA] n |
+| main.rs:421:22:421:22 | n | main.rs:421:22:421:22 | n |
+| main.rs:421:29:421:35 | sink(...) | main.rs:420:5:423:5 | match s2 { ... } |
+| main.rs:422:22:422:22 | [SSA] n | main.rs:422:34:422:34 | n |
+| main.rs:422:22:422:22 | n | main.rs:422:22:422:22 | [SSA] n |
+| main.rs:422:22:422:22 | n | main.rs:422:22:422:22 | n |
+| main.rs:422:29:422:35 | sink(...) | main.rs:420:5:423:5 | match s2 { ... } |
+| main.rs:430:9:430:12 | [SSA] arr1 | main.rs:431:14:431:17 | arr1 |
+| main.rs:430:9:430:12 | arr1 | main.rs:430:9:430:12 | [SSA] arr1 |
+| main.rs:430:9:430:12 | arr1 | main.rs:430:9:430:12 | arr1 |
+| main.rs:430:16:430:33 | [...] | main.rs:430:9:430:12 | arr1 |
+| main.rs:431:9:431:10 | [SSA] n1 | main.rs:432:10:432:11 | n1 |
+| main.rs:431:9:431:10 | n1 | main.rs:431:9:431:10 | [SSA] n1 |
+| main.rs:431:9:431:10 | n1 | main.rs:431:9:431:10 | n1 |
+| main.rs:431:14:431:20 | arr1[2] | main.rs:431:9:431:10 | n1 |
+| main.rs:434:9:434:12 | [SSA] arr2 | main.rs:435:14:435:17 | arr2 |
+| main.rs:434:9:434:12 | arr2 | main.rs:434:9:434:12 | [SSA] arr2 |
+| main.rs:434:9:434:12 | arr2 | main.rs:434:9:434:12 | arr2 |
+| main.rs:434:16:434:31 | [...; 10] | main.rs:434:9:434:12 | arr2 |
+| main.rs:435:9:435:10 | [SSA] n2 | main.rs:436:10:436:11 | n2 |
+| main.rs:435:9:435:10 | n2 | main.rs:435:9:435:10 | [SSA] n2 |
+| main.rs:435:9:435:10 | n2 | main.rs:435:9:435:10 | n2 |
+| main.rs:435:14:435:20 | arr2[4] | main.rs:435:9:435:10 | n2 |
+| main.rs:438:9:438:12 | [SSA] arr3 | main.rs:439:14:439:17 | arr3 |
+| main.rs:438:9:438:12 | arr3 | main.rs:438:9:438:12 | [SSA] arr3 |
+| main.rs:438:9:438:12 | arr3 | main.rs:438:9:438:12 | arr3 |
+| main.rs:438:16:438:24 | [...] | main.rs:438:9:438:12 | arr3 |
+| main.rs:439:9:439:10 | [SSA] n3 | main.rs:440:10:440:11 | n3 |
+| main.rs:439:9:439:10 | n3 | main.rs:439:9:439:10 | [SSA] n3 |
+| main.rs:439:9:439:10 | n3 | main.rs:439:9:439:10 | n3 |
+| main.rs:439:14:439:20 | arr3[2] | main.rs:439:9:439:10 | n3 |
+| main.rs:444:9:444:12 | [SSA] arr1 | main.rs:445:15:445:18 | arr1 |
+| main.rs:444:9:444:12 | arr1 | main.rs:444:9:444:12 | [SSA] arr1 |
+| main.rs:444:9:444:12 | arr1 | main.rs:444:9:444:12 | arr1 |
+| main.rs:444:16:444:33 | [...] | main.rs:444:9:444:12 | arr1 |
+| main.rs:445:9:445:10 | [SSA] n1 | main.rs:446:14:446:15 | n1 |
+| main.rs:445:9:445:10 | n1 | main.rs:445:9:445:10 | [SSA] n1 |
+| main.rs:445:9:445:10 | n1 | main.rs:445:9:445:10 | n1 |
+| main.rs:449:9:449:12 | [SSA] arr2 | main.rs:450:15:450:18 | arr2 |
+| main.rs:449:9:449:12 | arr2 | main.rs:449:9:449:12 | [SSA] arr2 |
+| main.rs:449:9:449:12 | arr2 | main.rs:449:9:449:12 | arr2 |
+| main.rs:449:16:449:24 | [...] | main.rs:449:9:449:12 | arr2 |
+| main.rs:450:5:452:5 | for ... in ... { ... } | main.rs:443:21:453:1 | { ... } |
+| main.rs:450:9:450:10 | [SSA] n2 | main.rs:451:14:451:15 | n2 |
+| main.rs:450:9:450:10 | n2 | main.rs:450:9:450:10 | [SSA] n2 |
+| main.rs:450:9:450:10 | n2 | main.rs:450:9:450:10 | n2 |
+| main.rs:456:9:456:12 | [SSA] arr1 | main.rs:457:11:457:14 | arr1 |
+| main.rs:456:9:456:12 | arr1 | main.rs:456:9:456:12 | [SSA] arr1 |
+| main.rs:456:9:456:12 | arr1 | main.rs:456:9:456:12 | arr1 |
+| main.rs:456:16:456:33 | [...] | main.rs:456:9:456:12 | arr1 |
+| main.rs:457:5:463:5 | match arr1 { ... } | main.rs:455:26:464:1 | { ... } |
+| main.rs:457:11:457:14 | arr1 | main.rs:458:9:458:17 | SlicePat |
+| main.rs:458:10:458:10 | [SSA] a | main.rs:459:18:459:18 | a |
+| main.rs:458:10:458:10 | a | main.rs:458:10:458:10 | [SSA] a |
+| main.rs:458:10:458:10 | a | main.rs:458:10:458:10 | a |
+| main.rs:458:13:458:13 | [SSA] b | main.rs:460:18:460:18 | b |
+| main.rs:458:13:458:13 | b | main.rs:458:13:458:13 | [SSA] b |
+| main.rs:458:13:458:13 | b | main.rs:458:13:458:13 | b |
+| main.rs:458:16:458:16 | [SSA] c | main.rs:461:18:461:18 | c |
+| main.rs:458:16:458:16 | c | main.rs:458:16:458:16 | [SSA] c |
+| main.rs:458:16:458:16 | c | main.rs:458:16:458:16 | c |
+| main.rs:458:22:462:9 | { ... } | main.rs:457:5:463:5 | match arr1 { ... } |
+| main.rs:467:9:467:19 | mut mut_arr | main.rs:467:13:467:19 | mut_arr |
+| main.rs:467:13:467:19 | [SSA] mut_arr | main.rs:468:10:468:16 | mut_arr |
+| main.rs:467:13:467:19 | mut_arr | main.rs:467:13:467:19 | [SSA] mut_arr |
+| main.rs:467:23:467:31 | [...] | main.rs:467:9:467:19 | mut mut_arr |
+| main.rs:468:10:468:16 | [post] mut_arr | main.rs:470:5:470:11 | mut_arr |
+| main.rs:468:10:468:16 | mut_arr | main.rs:470:5:470:11 | mut_arr |
+| main.rs:470:5:470:11 | [post] mut_arr | main.rs:471:13:471:19 | mut_arr |
+| main.rs:470:5:470:11 | mut_arr | main.rs:471:13:471:19 | mut_arr |
+| main.rs:470:18:470:27 | source(...) | main.rs:470:5:470:14 | mut_arr[1] |
+| main.rs:471:9:471:9 | [SSA] d | main.rs:472:10:472:10 | d |
+| main.rs:471:9:471:9 | d | main.rs:471:9:471:9 | [SSA] d |
+| main.rs:471:9:471:9 | d | main.rs:471:9:471:9 | d |
+| main.rs:471:13:471:19 | [post] mut_arr | main.rs:473:10:473:16 | mut_arr |
+| main.rs:471:13:471:19 | mut_arr | main.rs:473:10:473:16 | mut_arr |
+| main.rs:471:13:471:22 | mut_arr[1] | main.rs:471:9:471:9 | d |
+| main.rs:478:39:478:43 | [SSA] names | main.rs:480:25:480:29 | names |
+| main.rs:478:39:478:43 | names | main.rs:478:39:478:43 | [SSA] names |
+| main.rs:478:39:478:43 | names | main.rs:478:39:478:43 | names |
+| main.rs:478:39:478:72 | ...: Vec::<...> | main.rs:478:39:478:43 | names |
+| main.rs:479:9:479:20 | default_name | main.rs:479:9:479:20 | [SSA] default_name |
+| main.rs:479:9:479:20 | default_name | main.rs:479:9:479:20 | default_name |
+| main.rs:479:24:479:33 | [post] receiver for source(...) | main.rs:479:24:479:33 | [post] source(...) |
+| main.rs:479:24:479:33 | source(...) | main.rs:479:24:479:33 | receiver for source(...) |
+| main.rs:479:24:479:45 | ... .to_string() | main.rs:479:9:479:20 | default_name |
+| main.rs:479:24:479:45 | ... .to_string() | main.rs:480:9:480:20 | SSA phi read(default_name) |
+| main.rs:480:5:486:5 | for ... in ... { ... } | main.rs:478:75:487:1 | { ... } |
+| main.rs:480:9:480:20 | SSA phi read(default_name) | main.rs:482:41:482:67 | default_name |
+| main.rs:480:10:480:13 | [SSA] cond | main.rs:481:12:481:15 | cond |
+| main.rs:480:10:480:13 | cond | main.rs:480:10:480:13 | [SSA] cond |
+| main.rs:480:10:480:13 | cond | main.rs:480:10:480:13 | cond |
+| main.rs:480:16:480:19 | [SSA] name | main.rs:482:21:482:24 | name |
+| main.rs:480:16:480:19 | name | main.rs:480:16:480:19 | [SSA] name |
+| main.rs:480:16:480:19 | name | main.rs:480:16:480:19 | name |
+| main.rs:481:9:485:9 | if cond {...} | main.rs:480:31:486:5 | { ... } |
+| main.rs:482:17:482:17 | [SSA] n | main.rs:483:18:483:18 | n |
+| main.rs:482:17:482:17 | n | main.rs:482:17:482:17 | [SSA] n |
+| main.rs:482:17:482:17 | n | main.rs:482:17:482:17 | n |
+| main.rs:482:21:482:24 | [post] receiver for name | main.rs:482:21:482:24 | [post] name |
+| main.rs:482:21:482:24 | name | main.rs:482:21:482:24 | receiver for name |
+| main.rs:482:21:482:68 | name.unwrap_or_else(...) | main.rs:482:17:482:17 | n |
+| main.rs:482:41:482:67 | [post] default_name | main.rs:480:9:480:20 | SSA phi read(default_name) |
+| main.rs:482:41:482:67 | closure self in \|...\| ... | main.rs:482:44:482:55 | this |
+| main.rs:482:41:482:67 | default_name | main.rs:480:9:480:20 | SSA phi read(default_name) |
+| main.rs:482:44:482:55 | [post] receiver for default_name | main.rs:482:44:482:55 | [post] default_name |
+| main.rs:482:44:482:55 | default_name | main.rs:482:44:482:55 | receiver for default_name |
+| main.rs:483:18:483:18 | [post] receiver for n | main.rs:483:18:483:18 | [post] n |
+| main.rs:483:18:483:18 | n | main.rs:483:18:483:18 | receiver for n |
+| main.rs:496:9:496:9 | [SSA] s | main.rs:497:10:497:10 | s |
+| main.rs:496:9:496:9 | s | main.rs:496:9:496:9 | [SSA] s |
+| main.rs:496:9:496:9 | s | main.rs:496:9:496:9 | s |
+| main.rs:496:13:496:27 | MacroExpr | main.rs:496:9:496:9 | s |
+| main.rs:496:25:496:26 | source(...) | main.rs:496:13:496:27 | MacroExpr |
+| main.rs:500:16:500:16 | [SSA] s | main.rs:501:20:501:20 | s |
+| main.rs:500:16:500:16 | s | main.rs:500:16:500:16 | [SSA] s |
+| main.rs:500:16:500:16 | s | main.rs:500:16:500:16 | s |
+| main.rs:500:16:500:24 | ...: String | main.rs:500:16:500:16 | s |
+| main.rs:501:14:501:20 | FormatArgsExpr | main.rs:501:14:501:20 | MacroExpr |
+| main.rs:501:14:501:20 | MacroBlockExpr | main.rs:501:5:501:21 | MacroExpr |
+| main.rs:501:14:501:20 | [post] MacroExpr | main.rs:501:14:501:20 | [post] FormatArgsExpr |
+| main.rs:501:14:501:20 | { ... } | main.rs:501:14:501:20 | MacroBlockExpr |
+| main.rs:505:9:505:9 | [SSA] a | main.rs:506:13:506:13 | a |
+| main.rs:505:9:505:9 | a | main.rs:505:9:505:9 | [SSA] a |
+| main.rs:505:9:505:9 | a | main.rs:505:9:505:9 | a |
+| main.rs:505:13:505:22 | source(...) | main.rs:505:9:505:9 | a |
+| main.rs:506:9:506:9 | [SSA] b | main.rs:507:13:507:13 | b |
+| main.rs:506:9:506:9 | b | main.rs:506:9:506:9 | [SSA] b |
+| main.rs:506:9:506:9 | b | main.rs:506:9:506:9 | b |
+| main.rs:506:13:506:13 | [post] a | main.rs:510:10:510:10 | a |
+| main.rs:506:13:506:13 | [post] receiver for a | main.rs:506:13:506:13 | [post] a |
+| main.rs:506:13:506:13 | a | main.rs:506:13:506:13 | receiver for a |
+| main.rs:506:13:506:13 | a | main.rs:510:10:510:10 | a |
+| main.rs:506:13:506:25 | a.to_string() | main.rs:506:9:506:9 | b |
+| main.rs:507:9:507:9 | [SSA] c | main.rs:512:10:512:10 | c |
+| main.rs:507:9:507:9 | c | main.rs:507:9:507:9 | [SSA] c |
+| main.rs:507:9:507:9 | c | main.rs:507:9:507:9 | c |
+| main.rs:507:13:507:13 | [post] b | main.rs:508:18:508:18 | b |
+| main.rs:507:13:507:13 | [post] receiver for b | main.rs:507:13:507:13 | [post] b |
+| main.rs:507:13:507:13 | b | main.rs:507:13:507:13 | receiver for b |
+| main.rs:507:13:507:13 | b | main.rs:508:18:508:18 | b |
+| main.rs:507:13:507:28 | [post] receiver for b.parse() | main.rs:507:13:507:28 | [post] b.parse() |
+| main.rs:507:13:507:28 | b.parse() | main.rs:507:13:507:28 | receiver for b.parse() |
+| main.rs:507:13:507:37 | ... .unwrap() | main.rs:507:9:507:9 | c |
+| main.rs:508:9:508:9 | [SSA] d | main.rs:513:10:513:10 | d |
+| main.rs:508:9:508:9 | d | main.rs:508:9:508:9 | [SSA] d |
+| main.rs:508:9:508:9 | d | main.rs:508:9:508:9 | d |
+| main.rs:508:18:508:18 | [post] b | main.rs:511:17:511:17 | b |
+| main.rs:508:18:508:18 | [post] receiver for b | main.rs:508:18:508:18 | [post] b |
+| main.rs:508:18:508:18 | b | main.rs:508:18:508:18 | receiver for b |
+| main.rs:508:18:508:18 | b | main.rs:511:17:511:17 | b |
+| main.rs:508:18:508:26 | [post] receiver for b.parse() | main.rs:508:18:508:26 | [post] b.parse() |
+| main.rs:508:18:508:26 | b.parse() | main.rs:508:18:508:26 | receiver for b.parse() |
+| main.rs:508:18:508:35 | ... .unwrap() | main.rs:508:9:508:9 | d |
+| main.rs:517:9:517:10 | [SSA] vs | main.rs:519:10:519:11 | vs |
+| main.rs:517:9:517:10 | vs | main.rs:517:9:517:10 | [SSA] vs |
+| main.rs:517:9:517:10 | vs | main.rs:517:9:517:10 | vs |
+| main.rs:517:14:517:34 | [...] | main.rs:517:9:517:10 | vs |
+| main.rs:519:10:519:11 | [post] vs | main.rs:520:11:520:12 | vs |
+| main.rs:519:10:519:11 | vs | main.rs:520:11:520:12 | vs |
+| main.rs:520:11:520:12 | [post] receiver for vs | main.rs:520:11:520:12 | [post] vs |
+| main.rs:520:11:520:12 | [post] vs | main.rs:521:11:521:12 | vs |
+| main.rs:520:11:520:12 | vs | main.rs:520:11:520:12 | receiver for vs |
+| main.rs:520:11:520:12 | vs | main.rs:521:11:521:12 | vs |
+| main.rs:520:11:520:19 | [post] receiver for vs.iter() | main.rs:520:11:520:19 | [post] vs.iter() |
+| main.rs:520:11:520:19 | vs.iter() | main.rs:520:11:520:19 | receiver for vs.iter() |
+| main.rs:520:11:520:26 | ... .next() | main.rs:520:11:520:26 | receiver for ... .next() |
+| main.rs:520:11:520:26 | [post] receiver for ... .next() | main.rs:520:11:520:26 | [post] ... .next() |
+| main.rs:520:11:520:35 | ... .unwrap() | main.rs:520:11:520:35 | receiver for ... .unwrap() |
+| main.rs:520:11:520:35 | [post] receiver for ... .unwrap() | main.rs:520:11:520:35 | [post] ... .unwrap() |
+| main.rs:521:11:521:12 | [post] receiver for vs | main.rs:521:11:521:12 | [post] vs |
+| main.rs:521:11:521:12 | [post] vs | main.rs:523:14:523:15 | vs |
+| main.rs:521:11:521:12 | vs | main.rs:521:11:521:12 | receiver for vs |
+| main.rs:521:11:521:12 | vs | main.rs:523:14:523:15 | vs |
+| main.rs:521:11:521:19 | [post] receiver for vs.iter() | main.rs:521:11:521:19 | [post] vs.iter() |
+| main.rs:521:11:521:19 | vs.iter() | main.rs:521:11:521:19 | receiver for vs.iter() |
+| main.rs:521:11:521:26 | ... .nth(...) | main.rs:521:11:521:26 | receiver for ... .nth(...) |
+| main.rs:521:11:521:26 | [post] receiver for ... .nth(...) | main.rs:521:11:521:26 | [post] ... .nth(...) |
+| main.rs:521:11:521:35 | ... .unwrap() | main.rs:521:11:521:35 | receiver for ... .unwrap() |
+| main.rs:521:11:521:35 | [post] receiver for ... .unwrap() | main.rs:521:11:521:35 | [post] ... .unwrap() |
+| main.rs:523:9:523:9 | [SSA] v | main.rs:524:14:524:14 | v |
+| main.rs:523:9:523:9 | v | main.rs:523:9:523:9 | [SSA] v |
+| main.rs:523:9:523:9 | v | main.rs:523:9:523:9 | v |
+| main.rs:523:14:523:15 | vs | main.rs:526:15:526:16 | vs |
+| main.rs:526:10:526:10 | [SSA] v | main.rs:527:14:527:14 | v |
+| main.rs:526:10:526:10 | v | main.rs:526:10:526:10 | [SSA] v |
+| main.rs:526:10:526:10 | v | main.rs:526:10:526:10 | v |
+| main.rs:526:15:526:16 | [post] receiver for vs | main.rs:526:15:526:16 | [post] vs |
+| main.rs:526:15:526:16 | [post] vs | main.rs:530:26:530:27 | vs |
+| main.rs:526:15:526:16 | vs | main.rs:526:15:526:16 | receiver for vs |
+| main.rs:526:15:526:16 | vs | main.rs:530:26:530:27 | vs |
+| main.rs:530:9:530:11 | [SSA] vs2 | main.rs:531:15:531:17 | vs2 |
+| main.rs:530:9:530:11 | vs2 | main.rs:530:9:530:11 | [SSA] vs2 |
+| main.rs:530:9:530:11 | vs2 | main.rs:530:9:530:11 | vs2 |
+| main.rs:530:26:530:27 | [post] receiver for vs | main.rs:530:26:530:27 | [post] vs |
+| main.rs:530:26:530:27 | [post] vs | main.rs:535:5:535:6 | vs |
+| main.rs:530:26:530:27 | vs | main.rs:530:26:530:27 | receiver for vs |
+| main.rs:530:26:530:27 | vs | main.rs:535:5:535:6 | vs |
+| main.rs:530:26:530:34 | [post] receiver for vs.iter() | main.rs:530:26:530:34 | [post] vs.iter() |
+| main.rs:530:26:530:34 | vs.iter() | main.rs:530:26:530:34 | receiver for vs.iter() |
+| main.rs:530:26:530:44 | ... .collect() | main.rs:530:9:530:11 | vs2 |
+| main.rs:531:10:531:10 | [SSA] v | main.rs:532:14:532:14 | v |
+| main.rs:531:10:531:10 | v | main.rs:531:10:531:10 | [SSA] v |
+| main.rs:531:10:531:10 | v | main.rs:531:10:531:10 | v |
+| main.rs:535:5:535:6 | [post] receiver for vs | main.rs:535:5:535:6 | [post] vs |
+| main.rs:535:5:535:6 | [post] vs | main.rs:536:5:536:6 | vs |
+| main.rs:535:5:535:6 | vs | main.rs:535:5:535:6 | receiver for vs |
+| main.rs:535:5:535:6 | vs | main.rs:536:5:536:6 | vs |
+| main.rs:535:5:535:13 | [post] receiver for vs.iter() | main.rs:535:5:535:13 | [post] vs.iter() |
+| main.rs:535:5:535:13 | vs.iter() | main.rs:535:5:535:13 | receiver for vs.iter() |
+| main.rs:535:20:535:20 | ... | main.rs:535:20:535:20 | x |
+| main.rs:535:20:535:20 | [SSA] x | main.rs:535:29:535:29 | x |
+| main.rs:535:20:535:20 | x | main.rs:535:20:535:20 | [SSA] x |
+| main.rs:535:20:535:20 | x | main.rs:535:20:535:20 | x |
+| main.rs:535:29:535:29 | [post] receiver for x | main.rs:535:29:535:29 | [post] x |
+| main.rs:535:29:535:29 | x | main.rs:535:29:535:29 | receiver for x |
+| main.rs:536:5:536:6 | [post] receiver for vs | main.rs:536:5:536:6 | [post] vs |
+| main.rs:536:5:536:6 | [post] vs | main.rs:538:14:538:15 | vs |
+| main.rs:536:5:536:6 | vs | main.rs:536:5:536:6 | receiver for vs |
+| main.rs:536:5:536:6 | vs | main.rs:538:14:538:15 | vs |
+| main.rs:536:5:536:13 | [post] receiver for vs.iter() | main.rs:536:5:536:13 | [post] vs.iter() |
+| main.rs:536:5:536:13 | vs.iter() | main.rs:536:5:536:13 | receiver for vs.iter() |
+| main.rs:536:25:536:25 | ... | main.rs:536:25:536:25 | x |
+| main.rs:536:25:536:25 | [SSA] x | main.rs:536:34:536:34 | x |
+| main.rs:536:25:536:25 | x | main.rs:536:25:536:25 | [SSA] x |
+| main.rs:536:25:536:25 | x | main.rs:536:25:536:25 | x |
+| main.rs:536:34:536:34 | [post] receiver for x | main.rs:536:34:536:34 | [post] x |
+| main.rs:536:34:536:34 | x | main.rs:536:34:536:34 | receiver for x |
+| main.rs:538:9:538:9 | [SSA] v | main.rs:539:14:539:14 | v |
+| main.rs:538:9:538:9 | v | main.rs:538:9:538:9 | [SSA] v |
+| main.rs:538:9:538:9 | v | main.rs:538:9:538:9 | v |
+| main.rs:538:14:538:15 | [post] receiver for vs | main.rs:538:14:538:15 | [post] vs |
+| main.rs:538:14:538:15 | vs | main.rs:538:14:538:15 | receiver for vs |
+| main.rs:542:9:542:18 | mut vs_mut | main.rs:542:13:542:18 | vs_mut |
+| main.rs:542:13:542:18 | [SSA] vs_mut | main.rs:544:10:544:15 | vs_mut |
+| main.rs:542:13:542:18 | vs_mut | main.rs:542:13:542:18 | [SSA] vs_mut |
+| main.rs:542:22:542:42 | [...] | main.rs:542:9:542:18 | mut vs_mut |
+| main.rs:544:10:544:15 | [post] vs_mut | main.rs:545:11:545:16 | [SSA] vs_mut |
+| main.rs:544:10:544:15 | [post] vs_mut | main.rs:545:11:545:16 | vs_mut |
+| main.rs:544:10:544:15 | vs_mut | main.rs:545:11:545:16 | [SSA] vs_mut |
+| main.rs:544:10:544:15 | vs_mut | main.rs:545:11:545:16 | vs_mut |
+| main.rs:545:11:545:16 | [SSA] vs_mut | main.rs:546:11:546:16 | [SSA] vs_mut |
+| main.rs:545:11:545:16 | [SSA] vs_mut | main.rs:546:11:546:16 | vs_mut |
+| main.rs:545:11:545:16 | [post] receiver for vs_mut | main.rs:545:11:545:16 | [post] vs_mut |
+| main.rs:545:11:545:16 | [post] vs_mut | main.rs:546:11:546:16 | [SSA] vs_mut |
+| main.rs:545:11:545:16 | [post] vs_mut | main.rs:546:11:546:16 | vs_mut |
+| main.rs:545:11:545:16 | vs_mut | main.rs:545:11:545:16 | receiver for vs_mut |
+| main.rs:545:11:545:16 | vs_mut | main.rs:546:11:546:16 | [SSA] vs_mut |
+| main.rs:545:11:545:16 | vs_mut | main.rs:546:11:546:16 | vs_mut |
+| main.rs:545:11:545:23 | [post] receiver for vs_mut.iter() | main.rs:545:11:545:23 | [post] vs_mut.iter() |
+| main.rs:545:11:545:23 | vs_mut.iter() | main.rs:545:11:545:23 | receiver for vs_mut.iter() |
+| main.rs:545:11:545:30 | ... .next() | main.rs:545:11:545:30 | receiver for ... .next() |
+| main.rs:545:11:545:30 | [post] receiver for ... .next() | main.rs:545:11:545:30 | [post] ... .next() |
+| main.rs:545:11:545:39 | ... .unwrap() | main.rs:545:11:545:39 | receiver for ... .unwrap() |
+| main.rs:545:11:545:39 | [post] receiver for ... .unwrap() | main.rs:545:11:545:39 | [post] ... .unwrap() |
+| main.rs:546:11:546:16 | [SSA] vs_mut | main.rs:548:19:548:24 | vs_mut |
+| main.rs:546:11:546:16 | [post] receiver for vs_mut | main.rs:546:11:546:16 | [post] vs_mut |
+| main.rs:546:11:546:16 | [post] vs_mut | main.rs:548:19:548:24 | vs_mut |
+| main.rs:546:11:546:16 | vs_mut | main.rs:546:11:546:16 | receiver for vs_mut |
+| main.rs:546:11:546:16 | vs_mut | main.rs:548:19:548:24 | vs_mut |
+| main.rs:546:11:546:23 | [post] receiver for vs_mut.iter() | main.rs:546:11:546:23 | [post] vs_mut.iter() |
+| main.rs:546:11:546:23 | vs_mut.iter() | main.rs:546:11:546:23 | receiver for vs_mut.iter() |
+| main.rs:546:11:546:30 | ... .nth(...) | main.rs:546:11:546:30 | receiver for ... .nth(...) |
+| main.rs:546:11:546:30 | [post] receiver for ... .nth(...) | main.rs:546:11:546:30 | [post] ... .nth(...) |
+| main.rs:546:11:546:39 | ... .unwrap() | main.rs:546:11:546:39 | receiver for ... .unwrap() |
+| main.rs:546:11:546:39 | [post] receiver for ... .unwrap() | main.rs:546:11:546:39 | [post] ... .unwrap() |
+| main.rs:548:5:550:5 | for ... in ... { ... } | main.rs:516:16:551:1 | { ... } |
+| main.rs:548:14:548:14 | [SSA] v | main.rs:549:14:549:14 | v |
+| main.rs:548:14:548:14 | v | main.rs:548:14:548:14 | [SSA] v |
+| main.rs:548:14:548:14 | v | main.rs:548:14:548:14 | v |
+| main.rs:548:19:548:24 | [post] receiver for vs_mut | main.rs:548:19:548:24 | [post] vs_mut |
+| main.rs:548:19:548:24 | vs_mut | main.rs:548:19:548:24 | receiver for vs_mut |
+| main.rs:554:9:554:9 | [SSA] a | main.rs:559:10:559:10 | a |
+| main.rs:554:9:554:9 | a | main.rs:554:9:554:9 | [SSA] a |
+| main.rs:554:9:554:9 | a | main.rs:554:9:554:9 | a |
+| main.rs:554:13:554:22 | source(...) | main.rs:554:9:554:9 | a |
+| main.rs:555:9:555:9 | [SSA] b | main.rs:560:15:560:15 | b |
+| main.rs:555:9:555:9 | b | main.rs:555:9:555:9 | [SSA] b |
+| main.rs:555:9:555:9 | b | main.rs:555:9:555:9 | b |
+| main.rs:555:13:555:22 | source(...) | main.rs:555:9:555:9 | b |
+| main.rs:556:9:556:9 | [SSA] c | main.rs:557:18:557:18 | c |
+| main.rs:556:9:556:9 | c | main.rs:556:9:556:9 | [SSA] c |
+| main.rs:556:9:556:9 | c | main.rs:556:9:556:9 | c |
+| main.rs:556:13:556:22 | source(...) | main.rs:556:9:556:9 | c |
+| main.rs:557:9:557:13 | [SSA] c_ref | main.rs:561:14:561:18 | c_ref |
+| main.rs:557:9:557:13 | c_ref | main.rs:557:9:557:13 | [SSA] c_ref |
+| main.rs:557:9:557:13 | c_ref | main.rs:557:9:557:13 | c_ref |
+| main.rs:557:17:557:18 | &c | main.rs:557:9:557:13 | c_ref |
+| main.rs:561:14:561:18 | [post] c_ref | main.rs:562:11:562:15 | c_ref |
+| main.rs:561:14:561:18 | c_ref | main.rs:562:11:562:15 | c_ref |
+| main.rs:562:11:562:15 | [post] receiver for c_ref | main.rs:562:11:562:15 | [post] c_ref |
+| main.rs:562:11:562:15 | c_ref | main.rs:562:11:562:15 | receiver for c_ref |
+| main.rs:566:9:566:9 | [SSA] a | main.rs:568:10:568:10 | a |
+| main.rs:566:9:566:9 | a | main.rs:566:9:566:9 | [SSA] a |
+| main.rs:566:9:566:9 | a | main.rs:566:9:566:9 | a |
+| main.rs:566:18:566:27 | source(...) | main.rs:566:9:566:9 | a |
+| main.rs:568:10:568:10 | [post] a | main.rs:569:10:569:10 | a |
+| main.rs:568:10:568:10 | a | main.rs:569:10:569:10 | a |
+| main.rs:569:10:569:10 | [post] a | main.rs:570:20:570:20 | a |
+| main.rs:569:10:569:10 | [post] receiver for a | main.rs:569:10:569:10 | [post] a |
+| main.rs:569:10:569:10 | a | main.rs:569:10:569:10 | receiver for a |
+| main.rs:569:10:569:10 | a | main.rs:570:20:570:20 | a |
+| main.rs:572:9:572:9 | [SSA] b | main.rs:574:10:574:10 | b |
+| main.rs:572:9:572:9 | b | main.rs:572:9:572:9 | [SSA] b |
+| main.rs:572:9:572:9 | b | main.rs:572:9:572:9 | b |
+| main.rs:572:18:572:34 | ... as i32 | main.rs:572:9:572:9 | b |
+| main.rs:574:10:574:10 | [post] b | main.rs:575:10:575:10 | b |
+| main.rs:574:10:574:10 | b | main.rs:575:10:575:10 | b |
+| main.rs:575:10:575:10 | [post] b | main.rs:576:20:576:20 | b |
+| main.rs:575:10:575:10 | [post] receiver for b | main.rs:575:10:575:10 | [post] b |
+| main.rs:575:10:575:10 | b | main.rs:575:10:575:10 | receiver for b |
+| main.rs:575:10:575:10 | b | main.rs:576:20:576:20 | b |
+| main.rs:604:13:604:33 | result_questionmark(...) | main.rs:604:9:604:9 | _ |
+| main.rs:616:36:616:39 | ...::new(...) | main.rs:616:36:616:41 | MacroExpr |
+| main.rs:616:36:616:41 | [post] MacroExpr | main.rs:616:36:616:39 | [post] ...::new(...) |
 readStep
-| main.rs:36:9:36:15 | Some(...) | {EXTERNAL LOCATION} | Some | main.rs:36:14:36:14 | _ |
-| main.rs:90:11:90:11 | [post] receiver for i | file://:0:0:0:0 | &ref | main.rs:90:11:90:11 | [post] i |
-| main.rs:90:11:90:11 | i | file://:0:0:0:0 | &ref | main.rs:90:10:90:11 | * ... |
-| main.rs:98:10:98:10 | a | file://:0:0:0:0 | tuple.0 | main.rs:98:10:98:12 | a.0 |
-| main.rs:99:10:99:10 | a | file://:0:0:0:0 | tuple.1 | main.rs:99:10:99:12 | a.1 |
-| main.rs:104:9:104:20 | TuplePat | file://:0:0:0:0 | tuple.0 | main.rs:104:10:104:11 | a0 |
-| main.rs:104:9:104:20 | TuplePat | file://:0:0:0:0 | tuple.1 | main.rs:104:14:104:15 | a1 |
-| main.rs:104:9:104:20 | TuplePat | file://:0:0:0:0 | tuple.2 | main.rs:104:18:104:19 | a2 |
-| main.rs:112:10:112:10 | a | file://:0:0:0:0 | tuple.0 | main.rs:112:10:112:12 | a.0 |
-| main.rs:113:10:113:10 | a | file://:0:0:0:0 | tuple.1 | main.rs:113:10:113:12 | a.1 |
-| main.rs:114:5:114:5 | a | file://:0:0:0:0 | tuple.0 | main.rs:114:5:114:7 | a.0 |
-| main.rs:115:5:115:5 | a | file://:0:0:0:0 | tuple.1 | main.rs:115:5:115:7 | a.1 |
-| main.rs:116:10:116:10 | a | file://:0:0:0:0 | tuple.0 | main.rs:116:10:116:12 | a.0 |
-| main.rs:117:10:117:10 | a | file://:0:0:0:0 | tuple.1 | main.rs:117:10:117:12 | a.1 |
-| main.rs:123:10:123:10 | b | file://:0:0:0:0 | tuple.0 | main.rs:123:10:123:12 | b.0 |
-| main.rs:123:10:123:12 | b.0 | file://:0:0:0:0 | tuple.0 | main.rs:123:10:123:15 | ... .0 |
-| main.rs:124:10:124:10 | b | file://:0:0:0:0 | tuple.0 | main.rs:124:10:124:12 | b.0 |
-| main.rs:124:10:124:12 | b.0 | file://:0:0:0:0 | tuple.1 | main.rs:124:10:124:15 | ... .1 |
-| main.rs:125:10:125:10 | b | file://:0:0:0:0 | tuple.1 | main.rs:125:10:125:12 | b.1 |
-| main.rs:138:10:138:10 | p | main.rs:132:5:132:10 | Point.x | main.rs:138:10:138:12 | p.x |
-| main.rs:139:10:139:10 | p | main.rs:133:5:133:10 | Point.y | main.rs:139:10:139:12 | p.y |
-| main.rs:144:10:144:10 | p | main.rs:133:5:133:10 | Point.y | main.rs:144:10:144:12 | p.y |
-| main.rs:145:5:145:5 | p | main.rs:133:5:133:10 | Point.y | main.rs:145:5:145:7 | p.y |
-| main.rs:146:10:146:10 | p | main.rs:133:5:133:10 | Point.y | main.rs:146:10:146:12 | p.y |
-| main.rs:154:9:154:28 | Point {...} | main.rs:132:5:132:10 | Point.x | main.rs:154:20:154:20 | a |
-| main.rs:154:9:154:28 | Point {...} | main.rs:133:5:133:10 | Point.y | main.rs:154:26:154:26 | b |
-| main.rs:172:10:172:10 | p | main.rs:160:5:160:16 | Point3D.plane | main.rs:172:10:172:16 | p.plane |
-| main.rs:172:10:172:16 | p.plane | main.rs:132:5:132:10 | Point.x | main.rs:172:10:172:18 | ... .x |
-| main.rs:173:10:173:10 | p | main.rs:160:5:160:16 | Point3D.plane | main.rs:173:10:173:16 | p.plane |
-| main.rs:173:10:173:16 | p.plane | main.rs:133:5:133:10 | Point.y | main.rs:173:10:173:18 | ... .y |
-| main.rs:174:10:174:10 | p | main.rs:161:5:161:10 | Point3D.z | main.rs:174:10:174:12 | p.z |
-| main.rs:184:9:187:9 | Point3D {...} | main.rs:160:5:160:16 | Point3D.plane | main.rs:185:20:185:33 | Point {...} |
-| main.rs:184:9:187:9 | Point3D {...} | main.rs:161:5:161:10 | Point3D.z | main.rs:186:13:186:13 | z |
-| main.rs:185:20:185:33 | Point {...} | main.rs:132:5:132:10 | Point.x | main.rs:185:28:185:28 | x |
-| main.rs:185:20:185:33 | Point {...} | main.rs:133:5:133:10 | Point.y | main.rs:185:31:185:31 | y |
-| main.rs:199:10:199:10 | s | file://:0:0:0:0 | tuple.0 | main.rs:199:10:199:12 | s.0 |
-| main.rs:199:10:199:10 | s | main.rs:195:22:195:24 | MyTupleStruct(0) | main.rs:199:10:199:12 | s.0 |
-| main.rs:200:10:200:10 | s | file://:0:0:0:0 | tuple.1 | main.rs:200:10:200:12 | s.1 |
-| main.rs:200:10:200:10 | s | main.rs:195:27:195:29 | MyTupleStruct(1) | main.rs:200:10:200:12 | s.1 |
-| main.rs:203:9:203:27 | MyTupleStruct(...) | main.rs:195:22:195:24 | MyTupleStruct(0) | main.rs:203:23:203:23 | x |
-| main.rs:203:9:203:27 | MyTupleStruct(...) | main.rs:195:27:195:29 | MyTupleStruct(1) | main.rs:203:26:203:26 | y |
-| main.rs:217:9:217:23 | ...::Some(...) | {EXTERNAL LOCATION} | Some | main.rs:217:22:217:22 | n |
-| main.rs:221:9:221:23 | ...::Some(...) | {EXTERNAL LOCATION} | Some | main.rs:221:22:221:22 | n |
-| main.rs:230:9:230:15 | Some(...) | {EXTERNAL LOCATION} | Some | main.rs:230:14:230:14 | n |
-| main.rs:234:9:234:15 | Some(...) | {EXTERNAL LOCATION} | Some | main.rs:234:14:234:14 | n |
-| main.rs:263:14:263:15 | s1 | {EXTERNAL LOCATION} | Some | main.rs:263:14:263:16 | TryExpr |
-| main.rs:263:14:263:15 | s1 | {EXTERNAL LOCATION} | Ok | main.rs:263:14:263:16 | TryExpr |
-| main.rs:265:10:265:11 | s2 | {EXTERNAL LOCATION} | Some | main.rs:265:10:265:12 | TryExpr |
-| main.rs:265:10:265:11 | s2 | {EXTERNAL LOCATION} | Ok | main.rs:265:10:265:12 | TryExpr |
-| main.rs:287:14:287:15 | s1 | {EXTERNAL LOCATION} | Some | main.rs:287:14:287:16 | TryExpr |
-| main.rs:287:14:287:15 | s1 | {EXTERNAL LOCATION} | Ok | main.rs:287:14:287:16 | TryExpr |
-| main.rs:288:14:288:15 | s2 | {EXTERNAL LOCATION} | Some | main.rs:288:14:288:16 | TryExpr |
-| main.rs:288:14:288:15 | s2 | {EXTERNAL LOCATION} | Ok | main.rs:288:14:288:16 | TryExpr |
-| main.rs:291:14:291:15 | s3 | {EXTERNAL LOCATION} | Some | main.rs:291:14:291:16 | TryExpr |
-| main.rs:291:14:291:15 | s3 | {EXTERNAL LOCATION} | Ok | main.rs:291:14:291:16 | TryExpr |
-| main.rs:315:9:315:25 | ...::A(...) | main.rs:307:7:307:9 | A | main.rs:315:24:315:24 | n |
-| main.rs:316:9:316:25 | ...::B(...) | main.rs:308:7:308:9 | B | main.rs:316:24:316:24 | n |
-| main.rs:319:9:319:25 | ...::A(...) | main.rs:307:7:307:9 | A | main.rs:319:24:319:24 | n |
-| main.rs:319:29:319:45 | ...::B(...) | main.rs:308:7:308:9 | B | main.rs:319:44:319:44 | n |
-| main.rs:322:9:322:25 | ...::A(...) | main.rs:307:7:307:9 | A | main.rs:322:24:322:24 | n |
-| main.rs:323:9:323:25 | ...::B(...) | main.rs:308:7:308:9 | B | main.rs:323:24:323:24 | n |
-| main.rs:333:9:333:12 | A(...) | main.rs:307:7:307:9 | A | main.rs:333:11:333:11 | n |
-| main.rs:334:9:334:12 | B(...) | main.rs:308:7:308:9 | B | main.rs:334:11:334:11 | n |
-| main.rs:337:9:337:12 | A(...) | main.rs:307:7:307:9 | A | main.rs:337:11:337:11 | n |
-| main.rs:337:16:337:19 | B(...) | main.rs:308:7:308:9 | B | main.rs:337:18:337:18 | n |
-| main.rs:340:9:340:12 | A(...) | main.rs:307:7:307:9 | A | main.rs:340:11:340:11 | n |
-| main.rs:341:9:341:12 | B(...) | main.rs:308:7:308:9 | B | main.rs:341:11:341:11 | n |
-| main.rs:356:9:356:38 | ...::C {...} | main.rs:346:9:346:20 | C | main.rs:356:36:356:36 | n |
-| main.rs:357:9:357:38 | ...::D {...} | main.rs:347:9:347:20 | D | main.rs:357:36:357:36 | n |
-| main.rs:360:9:360:38 | ...::C {...} | main.rs:346:9:346:20 | C | main.rs:360:36:360:36 | n |
-| main.rs:360:42:360:71 | ...::D {...} | main.rs:347:9:347:20 | D | main.rs:360:69:360:69 | n |
-| main.rs:363:9:363:38 | ...::C {...} | main.rs:346:9:346:20 | C | main.rs:363:36:363:36 | n |
-| main.rs:364:9:364:38 | ...::D {...} | main.rs:347:9:347:20 | D | main.rs:364:36:364:36 | n |
-| main.rs:376:9:376:24 | C {...} | main.rs:346:9:346:20 | C | main.rs:376:22:376:22 | n |
-| main.rs:377:9:377:24 | D {...} | main.rs:347:9:347:20 | D | main.rs:377:22:377:22 | n |
-| main.rs:380:9:380:24 | C {...} | main.rs:346:9:346:20 | C | main.rs:380:22:380:22 | n |
-| main.rs:380:28:380:43 | D {...} | main.rs:347:9:347:20 | D | main.rs:380:41:380:41 | n |
-| main.rs:383:9:383:24 | C {...} | main.rs:346:9:346:20 | C | main.rs:383:22:383:22 | n |
-| main.rs:384:9:384:24 | D {...} | main.rs:347:9:347:20 | D | main.rs:384:22:384:22 | n |
-| main.rs:393:14:393:17 | arr1 | file://:0:0:0:0 | element | main.rs:393:14:393:20 | arr1[2] |
-| main.rs:397:14:397:17 | arr2 | file://:0:0:0:0 | element | main.rs:397:14:397:20 | arr2[4] |
-| main.rs:401:14:401:17 | arr3 | file://:0:0:0:0 | element | main.rs:401:14:401:20 | arr3[2] |
-| main.rs:407:15:407:18 | arr1 | file://:0:0:0:0 | element | main.rs:407:9:407:10 | n1 |
-| main.rs:412:15:412:18 | arr2 | file://:0:0:0:0 | element | main.rs:412:9:412:10 | n2 |
-| main.rs:420:9:420:17 | SlicePat | file://:0:0:0:0 | element | main.rs:420:10:420:10 | a |
-| main.rs:420:9:420:17 | SlicePat | file://:0:0:0:0 | element | main.rs:420:13:420:13 | b |
-| main.rs:420:9:420:17 | SlicePat | file://:0:0:0:0 | element | main.rs:420:16:420:16 | c |
-| main.rs:430:10:430:16 | mut_arr | file://:0:0:0:0 | element | main.rs:430:10:430:19 | mut_arr[1] |
-| main.rs:432:5:432:11 | mut_arr | file://:0:0:0:0 | element | main.rs:432:5:432:14 | mut_arr[1] |
-| main.rs:433:13:433:19 | mut_arr | file://:0:0:0:0 | element | main.rs:433:13:433:22 | mut_arr[1] |
-| main.rs:435:10:435:16 | mut_arr | file://:0:0:0:0 | element | main.rs:435:10:435:19 | mut_arr[0] |
-| main.rs:442:9:442:20 | TuplePat | file://:0:0:0:0 | tuple.0 | main.rs:442:10:442:13 | cond |
-| main.rs:442:9:442:20 | TuplePat | file://:0:0:0:0 | tuple.1 | main.rs:442:16:442:19 | name |
-| main.rs:442:25:442:29 | names | file://:0:0:0:0 | element | main.rs:442:9:442:20 | TuplePat |
-| main.rs:444:41:444:67 | [post] \|...\| ... | main.rs:441:9:441:20 | captured default_name | main.rs:444:41:444:67 | [post] default_name |
-| main.rs:444:44:444:55 | this | main.rs:441:9:441:20 | captured default_name | main.rs:444:44:444:55 | default_name |
-| main.rs:445:18:445:18 | [post] receiver for n | file://:0:0:0:0 | &ref | main.rs:445:18:445:18 | [post] n |
-| main.rs:469:13:469:13 | [post] receiver for b | file://:0:0:0:0 | &ref | main.rs:469:13:469:13 | [post] b |
-| main.rs:470:18:470:18 | [post] receiver for b | file://:0:0:0:0 | &ref | main.rs:470:18:470:18 | [post] b |
-| main.rs:481:10:481:11 | vs | file://:0:0:0:0 | element | main.rs:481:10:481:14 | vs[0] |
-| main.rs:482:11:482:35 | ... .unwrap() | file://:0:0:0:0 | &ref | main.rs:482:10:482:35 | * ... |
-| main.rs:483:11:483:35 | ... .unwrap() | file://:0:0:0:0 | &ref | main.rs:483:10:483:35 | * ... |
-| main.rs:485:14:485:15 | vs | file://:0:0:0:0 | element | main.rs:485:9:485:9 | v |
-| main.rs:488:9:488:10 | &... | file://:0:0:0:0 | &ref | main.rs:488:10:488:10 | v |
-| main.rs:488:15:488:23 | vs.iter() | file://:0:0:0:0 | element | main.rs:488:9:488:10 | &... |
-| main.rs:493:9:493:10 | &... | file://:0:0:0:0 | &ref | main.rs:493:10:493:10 | v |
-| main.rs:493:15:493:17 | vs2 | file://:0:0:0:0 | element | main.rs:493:9:493:10 | &... |
-| main.rs:497:29:497:29 | x | file://:0:0:0:0 | &ref | main.rs:497:28:497:29 | * ... |
-| main.rs:498:34:498:34 | x | file://:0:0:0:0 | &ref | main.rs:498:33:498:34 | * ... |
-| main.rs:500:14:500:27 | vs.into_iter() | file://:0:0:0:0 | element | main.rs:500:9:500:9 | v |
-| main.rs:506:10:506:15 | vs_mut | file://:0:0:0:0 | element | main.rs:506:10:506:18 | vs_mut[0] |
-| main.rs:507:11:507:39 | ... .unwrap() | file://:0:0:0:0 | &ref | main.rs:507:10:507:39 | * ... |
-| main.rs:508:11:508:39 | ... .unwrap() | file://:0:0:0:0 | &ref | main.rs:508:10:508:39 | * ... |
-| main.rs:510:9:510:14 | &mut ... | file://:0:0:0:0 | &ref | main.rs:510:14:510:14 | v |
-| main.rs:510:19:510:35 | vs_mut.iter_mut() | file://:0:0:0:0 | element | main.rs:510:9:510:14 | &mut ... |
-| main.rs:524:11:524:15 | c_ref | file://:0:0:0:0 | &ref | main.rs:524:10:524:15 | * ... |
+| main.rs:50:9:50:15 | Some(...) | {EXTERNAL LOCATION} | Some | main.rs:50:14:50:14 | _ |
+| main.rs:116:11:116:11 | [post] receiver for i | file://:0:0:0:0 | &ref | main.rs:116:11:116:11 | [post] i |
+| main.rs:116:11:116:11 | i | file://:0:0:0:0 | &ref | main.rs:116:10:116:11 | * ... |
+| main.rs:124:10:124:10 | a | file://:0:0:0:0 | tuple.0 | main.rs:124:10:124:12 | a.0 |
+| main.rs:125:10:125:10 | a | file://:0:0:0:0 | tuple.1 | main.rs:125:10:125:12 | a.1 |
+| main.rs:130:9:130:20 | TuplePat | file://:0:0:0:0 | tuple.0 | main.rs:130:10:130:11 | a0 |
+| main.rs:130:9:130:20 | TuplePat | file://:0:0:0:0 | tuple.1 | main.rs:130:14:130:15 | a1 |
+| main.rs:130:9:130:20 | TuplePat | file://:0:0:0:0 | tuple.2 | main.rs:130:18:130:19 | a2 |
+| main.rs:138:10:138:10 | a | file://:0:0:0:0 | tuple.0 | main.rs:138:10:138:12 | a.0 |
+| main.rs:139:10:139:10 | a | file://:0:0:0:0 | tuple.1 | main.rs:139:10:139:12 | a.1 |
+| main.rs:140:5:140:5 | a | file://:0:0:0:0 | tuple.0 | main.rs:140:5:140:7 | a.0 |
+| main.rs:141:5:141:5 | a | file://:0:0:0:0 | tuple.1 | main.rs:141:5:141:7 | a.1 |
+| main.rs:142:10:142:10 | a | file://:0:0:0:0 | tuple.0 | main.rs:142:10:142:12 | a.0 |
+| main.rs:143:10:143:10 | a | file://:0:0:0:0 | tuple.1 | main.rs:143:10:143:12 | a.1 |
+| main.rs:149:10:149:10 | b | file://:0:0:0:0 | tuple.0 | main.rs:149:10:149:12 | b.0 |
+| main.rs:149:10:149:12 | b.0 | file://:0:0:0:0 | tuple.0 | main.rs:149:10:149:15 | ... .0 |
+| main.rs:150:10:150:10 | b | file://:0:0:0:0 | tuple.0 | main.rs:150:10:150:12 | b.0 |
+| main.rs:150:10:150:12 | b.0 | file://:0:0:0:0 | tuple.1 | main.rs:150:10:150:15 | ... .1 |
+| main.rs:151:10:151:10 | b | file://:0:0:0:0 | tuple.1 | main.rs:151:10:151:12 | b.1 |
+| main.rs:164:10:164:10 | p | main.rs:158:5:158:10 | Point.x | main.rs:164:10:164:12 | p.x |
+| main.rs:165:10:165:10 | p | main.rs:159:5:159:10 | Point.y | main.rs:165:10:165:12 | p.y |
+| main.rs:170:10:170:10 | p | main.rs:159:5:159:10 | Point.y | main.rs:170:10:170:12 | p.y |
+| main.rs:171:5:171:5 | p | main.rs:159:5:159:10 | Point.y | main.rs:171:5:171:7 | p.y |
+| main.rs:172:10:172:10 | p | main.rs:159:5:159:10 | Point.y | main.rs:172:10:172:12 | p.y |
+| main.rs:180:9:180:28 | Point {...} | main.rs:158:5:158:10 | Point.x | main.rs:180:20:180:20 | a |
+| main.rs:180:9:180:28 | Point {...} | main.rs:159:5:159:10 | Point.y | main.rs:180:26:180:26 | b |
+| main.rs:198:10:198:10 | p | main.rs:186:5:186:16 | Point3D.plane | main.rs:198:10:198:16 | p.plane |
+| main.rs:198:10:198:16 | p.plane | main.rs:158:5:158:10 | Point.x | main.rs:198:10:198:18 | ... .x |
+| main.rs:199:10:199:10 | p | main.rs:186:5:186:16 | Point3D.plane | main.rs:199:10:199:16 | p.plane |
+| main.rs:199:10:199:16 | p.plane | main.rs:159:5:159:10 | Point.y | main.rs:199:10:199:18 | ... .y |
+| main.rs:200:10:200:10 | p | main.rs:187:5:187:10 | Point3D.z | main.rs:200:10:200:12 | p.z |
+| main.rs:210:9:213:9 | Point3D {...} | main.rs:186:5:186:16 | Point3D.plane | main.rs:211:20:211:33 | Point {...} |
+| main.rs:210:9:213:9 | Point3D {...} | main.rs:187:5:187:10 | Point3D.z | main.rs:212:13:212:13 | z |
+| main.rs:211:20:211:33 | Point {...} | main.rs:158:5:158:10 | Point.x | main.rs:211:28:211:28 | x |
+| main.rs:211:20:211:33 | Point {...} | main.rs:159:5:159:10 | Point.y | main.rs:211:31:211:31 | y |
+| main.rs:225:10:225:10 | s | file://:0:0:0:0 | tuple.0 | main.rs:225:10:225:12 | s.0 |
+| main.rs:225:10:225:10 | s | main.rs:221:22:221:24 | MyTupleStruct(0) | main.rs:225:10:225:12 | s.0 |
+| main.rs:226:10:226:10 | s | file://:0:0:0:0 | tuple.1 | main.rs:226:10:226:12 | s.1 |
+| main.rs:226:10:226:10 | s | main.rs:221:27:221:29 | MyTupleStruct(1) | main.rs:226:10:226:12 | s.1 |
+| main.rs:229:9:229:27 | MyTupleStruct(...) | main.rs:221:22:221:24 | MyTupleStruct(0) | main.rs:229:23:229:23 | x |
+| main.rs:229:9:229:27 | MyTupleStruct(...) | main.rs:221:27:221:29 | MyTupleStruct(1) | main.rs:229:26:229:26 | y |
+| main.rs:243:9:243:23 | ...::Some(...) | {EXTERNAL LOCATION} | Some | main.rs:243:22:243:22 | n |
+| main.rs:247:9:247:23 | ...::Some(...) | {EXTERNAL LOCATION} | Some | main.rs:247:22:247:22 | n |
+| main.rs:256:9:256:15 | Some(...) | {EXTERNAL LOCATION} | Some | main.rs:256:14:256:14 | n |
+| main.rs:260:9:260:15 | Some(...) | {EXTERNAL LOCATION} | Some | main.rs:260:14:260:14 | n |
+| main.rs:267:12:267:18 | Some(...) | {EXTERNAL LOCATION} | Some | main.rs:267:17:267:17 | n |
+| main.rs:301:14:301:15 | s1 | {EXTERNAL LOCATION} | Some | main.rs:301:14:301:16 | TryExpr |
+| main.rs:301:14:301:15 | s1 | {EXTERNAL LOCATION} | Ok | main.rs:301:14:301:16 | TryExpr |
+| main.rs:303:10:303:11 | s2 | {EXTERNAL LOCATION} | Some | main.rs:303:10:303:12 | TryExpr |
+| main.rs:303:10:303:11 | s2 | {EXTERNAL LOCATION} | Ok | main.rs:303:10:303:12 | TryExpr |
+| main.rs:325:14:325:15 | s1 | {EXTERNAL LOCATION} | Some | main.rs:325:14:325:16 | TryExpr |
+| main.rs:325:14:325:15 | s1 | {EXTERNAL LOCATION} | Ok | main.rs:325:14:325:16 | TryExpr |
+| main.rs:326:14:326:15 | s2 | {EXTERNAL LOCATION} | Some | main.rs:326:14:326:16 | TryExpr |
+| main.rs:326:14:326:15 | s2 | {EXTERNAL LOCATION} | Ok | main.rs:326:14:326:16 | TryExpr |
+| main.rs:329:14:329:15 | s3 | {EXTERNAL LOCATION} | Some | main.rs:329:14:329:16 | TryExpr |
+| main.rs:329:14:329:15 | s3 | {EXTERNAL LOCATION} | Ok | main.rs:329:14:329:16 | TryExpr |
+| main.rs:353:9:353:25 | ...::A(...) | main.rs:345:7:345:9 | A | main.rs:353:24:353:24 | n |
+| main.rs:354:9:354:25 | ...::B(...) | main.rs:346:7:346:9 | B | main.rs:354:24:354:24 | n |
+| main.rs:357:9:357:25 | ...::A(...) | main.rs:345:7:345:9 | A | main.rs:357:24:357:24 | n |
+| main.rs:357:29:357:45 | ...::B(...) | main.rs:346:7:346:9 | B | main.rs:357:44:357:44 | n |
+| main.rs:360:9:360:25 | ...::A(...) | main.rs:345:7:345:9 | A | main.rs:360:24:360:24 | n |
+| main.rs:361:9:361:25 | ...::B(...) | main.rs:346:7:346:9 | B | main.rs:361:24:361:24 | n |
+| main.rs:371:9:371:12 | A(...) | main.rs:345:7:345:9 | A | main.rs:371:11:371:11 | n |
+| main.rs:372:9:372:12 | B(...) | main.rs:346:7:346:9 | B | main.rs:372:11:372:11 | n |
+| main.rs:375:9:375:12 | A(...) | main.rs:345:7:345:9 | A | main.rs:375:11:375:11 | n |
+| main.rs:375:16:375:19 | B(...) | main.rs:346:7:346:9 | B | main.rs:375:18:375:18 | n |
+| main.rs:378:9:378:12 | A(...) | main.rs:345:7:345:9 | A | main.rs:378:11:378:11 | n |
+| main.rs:379:9:379:12 | B(...) | main.rs:346:7:346:9 | B | main.rs:379:11:379:11 | n |
+| main.rs:394:9:394:38 | ...::C {...} | main.rs:384:9:384:20 | C | main.rs:394:36:394:36 | n |
+| main.rs:395:9:395:38 | ...::D {...} | main.rs:385:9:385:20 | D | main.rs:395:36:395:36 | n |
+| main.rs:398:9:398:38 | ...::C {...} | main.rs:384:9:384:20 | C | main.rs:398:36:398:36 | n |
+| main.rs:398:42:398:71 | ...::D {...} | main.rs:385:9:385:20 | D | main.rs:398:69:398:69 | n |
+| main.rs:401:9:401:38 | ...::C {...} | main.rs:384:9:384:20 | C | main.rs:401:36:401:36 | n |
+| main.rs:402:9:402:38 | ...::D {...} | main.rs:385:9:385:20 | D | main.rs:402:36:402:36 | n |
+| main.rs:414:9:414:24 | C {...} | main.rs:384:9:384:20 | C | main.rs:414:22:414:22 | n |
+| main.rs:415:9:415:24 | D {...} | main.rs:385:9:385:20 | D | main.rs:415:22:415:22 | n |
+| main.rs:418:9:418:24 | C {...} | main.rs:384:9:384:20 | C | main.rs:418:22:418:22 | n |
+| main.rs:418:28:418:43 | D {...} | main.rs:385:9:385:20 | D | main.rs:418:41:418:41 | n |
+| main.rs:421:9:421:24 | C {...} | main.rs:384:9:384:20 | C | main.rs:421:22:421:22 | n |
+| main.rs:422:9:422:24 | D {...} | main.rs:385:9:385:20 | D | main.rs:422:22:422:22 | n |
+| main.rs:431:14:431:17 | arr1 | file://:0:0:0:0 | element | main.rs:431:14:431:20 | arr1[2] |
+| main.rs:435:14:435:17 | arr2 | file://:0:0:0:0 | element | main.rs:435:14:435:20 | arr2[4] |
+| main.rs:439:14:439:17 | arr3 | file://:0:0:0:0 | element | main.rs:439:14:439:20 | arr3[2] |
+| main.rs:445:15:445:18 | arr1 | file://:0:0:0:0 | element | main.rs:445:9:445:10 | n1 |
+| main.rs:450:15:450:18 | arr2 | file://:0:0:0:0 | element | main.rs:450:9:450:10 | n2 |
+| main.rs:458:9:458:17 | SlicePat | file://:0:0:0:0 | element | main.rs:458:10:458:10 | a |
+| main.rs:458:9:458:17 | SlicePat | file://:0:0:0:0 | element | main.rs:458:13:458:13 | b |
+| main.rs:458:9:458:17 | SlicePat | file://:0:0:0:0 | element | main.rs:458:16:458:16 | c |
+| main.rs:468:10:468:16 | mut_arr | file://:0:0:0:0 | element | main.rs:468:10:468:19 | mut_arr[1] |
+| main.rs:470:5:470:11 | mut_arr | file://:0:0:0:0 | element | main.rs:470:5:470:14 | mut_arr[1] |
+| main.rs:471:13:471:19 | mut_arr | file://:0:0:0:0 | element | main.rs:471:13:471:22 | mut_arr[1] |
+| main.rs:473:10:473:16 | mut_arr | file://:0:0:0:0 | element | main.rs:473:10:473:19 | mut_arr[0] |
+| main.rs:479:24:479:33 | [post] receiver for source(...) | file://:0:0:0:0 | &ref | main.rs:479:24:479:33 | [post] source(...) |
+| main.rs:480:9:480:20 | TuplePat | file://:0:0:0:0 | tuple.0 | main.rs:480:10:480:13 | cond |
+| main.rs:480:9:480:20 | TuplePat | file://:0:0:0:0 | tuple.1 | main.rs:480:16:480:19 | name |
+| main.rs:480:25:480:29 | names | file://:0:0:0:0 | element | main.rs:480:9:480:20 | TuplePat |
+| main.rs:482:41:482:67 | [post] \|...\| ... | main.rs:479:9:479:20 | captured default_name | main.rs:482:41:482:67 | [post] default_name |
+| main.rs:482:44:482:55 | [post] receiver for default_name | file://:0:0:0:0 | &ref | main.rs:482:44:482:55 | [post] default_name |
+| main.rs:482:44:482:55 | this | main.rs:479:9:479:20 | captured default_name | main.rs:482:44:482:55 | default_name |
+| main.rs:483:18:483:18 | [post] receiver for n | file://:0:0:0:0 | &ref | main.rs:483:18:483:18 | [post] n |
+| main.rs:506:13:506:13 | [post] receiver for a | file://:0:0:0:0 | &ref | main.rs:506:13:506:13 | [post] a |
+| main.rs:519:10:519:11 | vs | file://:0:0:0:0 | element | main.rs:519:10:519:14 | vs[0] |
+| main.rs:520:11:520:35 | ... .unwrap() | file://:0:0:0:0 | &ref | main.rs:520:10:520:35 | * ... |
+| main.rs:520:11:520:35 | [post] receiver for ... .unwrap() | file://:0:0:0:0 | &ref | main.rs:520:11:520:35 | [post] ... .unwrap() |
+| main.rs:521:11:521:35 | ... .unwrap() | file://:0:0:0:0 | &ref | main.rs:521:10:521:35 | * ... |
+| main.rs:521:11:521:35 | [post] receiver for ... .unwrap() | file://:0:0:0:0 | &ref | main.rs:521:11:521:35 | [post] ... .unwrap() |
+| main.rs:523:14:523:15 | vs | file://:0:0:0:0 | element | main.rs:523:9:523:9 | v |
+| main.rs:526:9:526:10 | &... | file://:0:0:0:0 | &ref | main.rs:526:10:526:10 | v |
+| main.rs:526:15:526:23 | vs.iter() | file://:0:0:0:0 | element | main.rs:526:9:526:10 | &... |
+| main.rs:531:9:531:10 | &... | file://:0:0:0:0 | &ref | main.rs:531:10:531:10 | v |
+| main.rs:531:15:531:17 | vs2 | file://:0:0:0:0 | element | main.rs:531:9:531:10 | &... |
+| main.rs:535:29:535:29 | [post] receiver for x | file://:0:0:0:0 | &ref | main.rs:535:29:535:29 | [post] x |
+| main.rs:535:29:535:29 | x | file://:0:0:0:0 | &ref | main.rs:535:28:535:29 | * ... |
+| main.rs:536:34:536:34 | [post] receiver for x | file://:0:0:0:0 | &ref | main.rs:536:34:536:34 | [post] x |
+| main.rs:536:34:536:34 | x | file://:0:0:0:0 | &ref | main.rs:536:33:536:34 | * ... |
+| main.rs:538:14:538:27 | vs.into_iter() | file://:0:0:0:0 | element | main.rs:538:9:538:9 | v |
+| main.rs:544:10:544:15 | vs_mut | file://:0:0:0:0 | element | main.rs:544:10:544:18 | vs_mut[0] |
+| main.rs:545:11:545:39 | ... .unwrap() | file://:0:0:0:0 | &ref | main.rs:545:10:545:39 | * ... |
+| main.rs:545:11:545:39 | [post] receiver for ... .unwrap() | file://:0:0:0:0 | &ref | main.rs:545:11:545:39 | [post] ... .unwrap() |
+| main.rs:546:11:546:39 | ... .unwrap() | file://:0:0:0:0 | &ref | main.rs:546:10:546:39 | * ... |
+| main.rs:546:11:546:39 | [post] receiver for ... .unwrap() | file://:0:0:0:0 | &ref | main.rs:546:11:546:39 | [post] ... .unwrap() |
+| main.rs:548:9:548:14 | &mut ... | file://:0:0:0:0 | &ref | main.rs:548:14:548:14 | v |
+| main.rs:548:19:548:35 | vs_mut.iter_mut() | file://:0:0:0:0 | element | main.rs:548:9:548:14 | &mut ... |
+| main.rs:562:11:562:15 | [post] receiver for c_ref | file://:0:0:0:0 | &ref | main.rs:562:11:562:15 | [post] c_ref |
+| main.rs:562:11:562:15 | c_ref | file://:0:0:0:0 | &ref | main.rs:562:10:562:15 | * ... |
 storeStep
-| main.rs:90:11:90:11 | i | file://:0:0:0:0 | &ref | main.rs:90:11:90:11 | receiver for i |
-| main.rs:97:14:97:22 | source(...) | file://:0:0:0:0 | tuple.0 | main.rs:97:13:97:26 | TupleExpr |
-| main.rs:97:25:97:25 | 2 | file://:0:0:0:0 | tuple.1 | main.rs:97:13:97:26 | TupleExpr |
-| main.rs:103:14:103:14 | 2 | file://:0:0:0:0 | tuple.0 | main.rs:103:13:103:30 | TupleExpr |
-| main.rs:103:17:103:26 | source(...) | file://:0:0:0:0 | tuple.1 | main.rs:103:13:103:30 | TupleExpr |
-| main.rs:103:29:103:29 | 2 | file://:0:0:0:0 | tuple.2 | main.rs:103:13:103:30 | TupleExpr |
-| main.rs:111:18:111:18 | 2 | file://:0:0:0:0 | tuple.0 | main.rs:111:17:111:31 | TupleExpr |
-| main.rs:111:21:111:30 | source(...) | file://:0:0:0:0 | tuple.1 | main.rs:111:17:111:31 | TupleExpr |
-| main.rs:114:11:114:20 | source(...) | file://:0:0:0:0 | tuple.0 | main.rs:114:5:114:5 | [post] a |
-| main.rs:115:11:115:11 | 2 | file://:0:0:0:0 | tuple.1 | main.rs:115:5:115:5 | [post] a |
-| main.rs:121:14:121:14 | 3 | file://:0:0:0:0 | tuple.0 | main.rs:121:13:121:27 | TupleExpr |
-| main.rs:121:17:121:26 | source(...) | file://:0:0:0:0 | tuple.1 | main.rs:121:13:121:27 | TupleExpr |
-| main.rs:122:14:122:14 | a | file://:0:0:0:0 | tuple.0 | main.rs:122:13:122:18 | TupleExpr |
-| main.rs:122:17:122:17 | 3 | file://:0:0:0:0 | tuple.1 | main.rs:122:13:122:18 | TupleExpr |
-| main.rs:137:24:137:32 | source(...) | main.rs:132:5:132:10 | Point.x | main.rs:137:13:137:40 | Point {...} |
-| main.rs:137:38:137:38 | 2 | main.rs:133:5:133:10 | Point.y | main.rs:137:13:137:40 | Point {...} |
-| main.rs:143:28:143:36 | source(...) | main.rs:132:5:132:10 | Point.x | main.rs:143:17:143:44 | Point {...} |
-| main.rs:143:42:143:42 | 2 | main.rs:133:5:133:10 | Point.y | main.rs:143:17:143:44 | Point {...} |
-| main.rs:145:11:145:20 | source(...) | main.rs:133:5:133:10 | Point.y | main.rs:145:5:145:5 | [post] p |
-| main.rs:151:12:151:21 | source(...) | main.rs:132:5:132:10 | Point.x | main.rs:150:13:153:5 | Point {...} |
-| main.rs:152:12:152:12 | 2 | main.rs:133:5:133:10 | Point.y | main.rs:150:13:153:5 | Point {...} |
-| main.rs:166:16:169:9 | Point {...} | main.rs:160:5:160:16 | Point3D.plane | main.rs:165:13:171:5 | Point3D {...} |
-| main.rs:167:16:167:16 | 2 | main.rs:132:5:132:10 | Point.x | main.rs:166:16:169:9 | Point {...} |
-| main.rs:168:16:168:25 | source(...) | main.rs:133:5:133:10 | Point.y | main.rs:166:16:169:9 | Point {...} |
-| main.rs:170:12:170:12 | 4 | main.rs:161:5:161:10 | Point3D.z | main.rs:165:13:171:5 | Point3D {...} |
-| main.rs:180:16:180:32 | Point {...} | main.rs:160:5:160:16 | Point3D.plane | main.rs:179:13:182:5 | Point3D {...} |
-| main.rs:180:27:180:27 | 2 | main.rs:132:5:132:10 | Point.x | main.rs:180:16:180:32 | Point {...} |
-| main.rs:180:30:180:30 | y | main.rs:133:5:133:10 | Point.y | main.rs:180:16:180:32 | Point {...} |
-| main.rs:181:12:181:12 | 4 | main.rs:161:5:161:10 | Point3D.z | main.rs:179:13:182:5 | Point3D {...} |
-| main.rs:198:27:198:36 | source(...) | main.rs:195:22:195:24 | MyTupleStruct(0) | main.rs:198:13:198:40 | MyTupleStruct(...) |
-| main.rs:198:39:198:39 | 2 | main.rs:195:27:195:29 | MyTupleStruct(1) | main.rs:198:13:198:40 | MyTupleStruct(...) |
-| main.rs:214:27:214:36 | source(...) | {EXTERNAL LOCATION} | Some | main.rs:214:14:214:37 | ...::Some(...) |
-| main.rs:215:27:215:27 | 2 | {EXTERNAL LOCATION} | Some | main.rs:215:14:215:28 | ...::Some(...) |
-| main.rs:227:19:227:28 | source(...) | {EXTERNAL LOCATION} | Some | main.rs:227:14:227:29 | Some(...) |
-| main.rs:228:19:228:19 | 2 | {EXTERNAL LOCATION} | Some | main.rs:228:14:228:20 | Some(...) |
-| main.rs:240:19:240:28 | source(...) | {EXTERNAL LOCATION} | Some | main.rs:240:14:240:29 | Some(...) |
-| main.rs:245:19:245:28 | source(...) | {EXTERNAL LOCATION} | Some | main.rs:245:14:245:29 | Some(...) |
-| main.rs:248:19:248:19 | 0 | {EXTERNAL LOCATION} | Some | main.rs:248:14:248:20 | Some(...) |
+| main.rs:116:11:116:11 | i | file://:0:0:0:0 | &ref | main.rs:116:11:116:11 | receiver for i |
+| main.rs:123:14:123:22 | source(...) | file://:0:0:0:0 | tuple.0 | main.rs:123:13:123:26 | TupleExpr |
+| main.rs:123:25:123:25 | 2 | file://:0:0:0:0 | tuple.1 | main.rs:123:13:123:26 | TupleExpr |
+| main.rs:129:14:129:14 | 2 | file://:0:0:0:0 | tuple.0 | main.rs:129:13:129:30 | TupleExpr |
+| main.rs:129:17:129:26 | source(...) | file://:0:0:0:0 | tuple.1 | main.rs:129:13:129:30 | TupleExpr |
+| main.rs:129:29:129:29 | 2 | file://:0:0:0:0 | tuple.2 | main.rs:129:13:129:30 | TupleExpr |
+| main.rs:137:18:137:18 | 2 | file://:0:0:0:0 | tuple.0 | main.rs:137:17:137:31 | TupleExpr |
+| main.rs:137:21:137:30 | source(...) | file://:0:0:0:0 | tuple.1 | main.rs:137:17:137:31 | TupleExpr |
+| main.rs:140:11:140:20 | source(...) | file://:0:0:0:0 | tuple.0 | main.rs:140:5:140:5 | [post] a |
+| main.rs:141:11:141:11 | 2 | file://:0:0:0:0 | tuple.1 | main.rs:141:5:141:5 | [post] a |
+| main.rs:147:14:147:14 | 3 | file://:0:0:0:0 | tuple.0 | main.rs:147:13:147:27 | TupleExpr |
+| main.rs:147:17:147:26 | source(...) | file://:0:0:0:0 | tuple.1 | main.rs:147:13:147:27 | TupleExpr |
+| main.rs:148:14:148:14 | a | file://:0:0:0:0 | tuple.0 | main.rs:148:13:148:18 | TupleExpr |
+| main.rs:148:17:148:17 | 3 | file://:0:0:0:0 | tuple.1 | main.rs:148:13:148:18 | TupleExpr |
+| main.rs:163:24:163:32 | source(...) | main.rs:158:5:158:10 | Point.x | main.rs:163:13:163:40 | Point {...} |
+| main.rs:163:38:163:38 | 2 | main.rs:159:5:159:10 | Point.y | main.rs:163:13:163:40 | Point {...} |
+| main.rs:169:28:169:36 | source(...) | main.rs:158:5:158:10 | Point.x | main.rs:169:17:169:44 | Point {...} |
+| main.rs:169:42:169:42 | 2 | main.rs:159:5:159:10 | Point.y | main.rs:169:17:169:44 | Point {...} |
+| main.rs:171:11:171:20 | source(...) | main.rs:159:5:159:10 | Point.y | main.rs:171:5:171:5 | [post] p |
+| main.rs:177:12:177:21 | source(...) | main.rs:158:5:158:10 | Point.x | main.rs:176:13:179:5 | Point {...} |
+| main.rs:178:12:178:12 | 2 | main.rs:159:5:159:10 | Point.y | main.rs:176:13:179:5 | Point {...} |
+| main.rs:192:16:195:9 | Point {...} | main.rs:186:5:186:16 | Point3D.plane | main.rs:191:13:197:5 | Point3D {...} |
+| main.rs:193:16:193:16 | 2 | main.rs:158:5:158:10 | Point.x | main.rs:192:16:195:9 | Point {...} |
+| main.rs:194:16:194:25 | source(...) | main.rs:159:5:159:10 | Point.y | main.rs:192:16:195:9 | Point {...} |
+| main.rs:196:12:196:12 | 4 | main.rs:187:5:187:10 | Point3D.z | main.rs:191:13:197:5 | Point3D {...} |
+| main.rs:206:16:206:32 | Point {...} | main.rs:186:5:186:16 | Point3D.plane | main.rs:205:13:208:5 | Point3D {...} |
+| main.rs:206:27:206:27 | 2 | main.rs:158:5:158:10 | Point.x | main.rs:206:16:206:32 | Point {...} |
+| main.rs:206:30:206:30 | y | main.rs:159:5:159:10 | Point.y | main.rs:206:16:206:32 | Point {...} |
+| main.rs:207:12:207:12 | 4 | main.rs:187:5:187:10 | Point3D.z | main.rs:205:13:208:5 | Point3D {...} |
+| main.rs:224:27:224:36 | source(...) | main.rs:221:22:221:24 | MyTupleStruct(0) | main.rs:224:13:224:40 | MyTupleStruct(...) |
+| main.rs:224:39:224:39 | 2 | main.rs:221:27:221:29 | MyTupleStruct(1) | main.rs:224:13:224:40 | MyTupleStruct(...) |
+| main.rs:240:27:240:36 | source(...) | {EXTERNAL LOCATION} | Some | main.rs:240:14:240:37 | ...::Some(...) |
+| main.rs:241:27:241:27 | 2 | {EXTERNAL LOCATION} | Some | main.rs:241:14:241:28 | ...::Some(...) |
 | main.rs:253:19:253:28 | source(...) | {EXTERNAL LOCATION} | Some | main.rs:253:14:253:29 | Some(...) |
-| main.rs:261:19:261:28 | source(...) | {EXTERNAL LOCATION} | Some | main.rs:261:14:261:29 | Some(...) |
-| main.rs:262:19:262:19 | 2 | {EXTERNAL LOCATION} | Some | main.rs:262:14:262:20 | Some(...) |
-| main.rs:266:10:266:10 | 0 | {EXTERNAL LOCATION} | Some | main.rs:266:5:266:11 | Some(...) |
-| main.rs:270:35:270:44 | source(...) | {EXTERNAL LOCATION} | Ok | main.rs:270:32:270:45 | Ok(...) |
-| main.rs:276:36:276:45 | source(...) | {EXTERNAL LOCATION} | Err | main.rs:276:32:276:46 | Err(...) |
-| main.rs:284:35:284:44 | source(...) | {EXTERNAL LOCATION} | Ok | main.rs:284:32:284:45 | Ok(...) |
-| main.rs:285:35:285:35 | 2 | {EXTERNAL LOCATION} | Ok | main.rs:285:32:285:36 | Ok(...) |
-| main.rs:286:36:286:45 | source(...) | {EXTERNAL LOCATION} | Err | main.rs:286:32:286:46 | Err(...) |
-| main.rs:293:8:293:8 | 0 | {EXTERNAL LOCATION} | Ok | main.rs:293:5:293:9 | Ok(...) |
-| main.rs:297:35:297:44 | source(...) | {EXTERNAL LOCATION} | Ok | main.rs:297:32:297:45 | Ok(...) |
-| main.rs:301:36:301:45 | source(...) | {EXTERNAL LOCATION} | Err | main.rs:301:32:301:46 | Err(...) |
-| main.rs:312:29:312:38 | source(...) | main.rs:307:7:307:9 | A | main.rs:312:14:312:39 | ...::A(...) |
-| main.rs:313:29:313:29 | 2 | main.rs:308:7:308:9 | B | main.rs:313:14:313:30 | ...::B(...) |
-| main.rs:330:16:330:25 | source(...) | main.rs:307:7:307:9 | A | main.rs:330:14:330:26 | A(...) |
-| main.rs:331:16:331:16 | 2 | main.rs:308:7:308:9 | B | main.rs:331:14:331:17 | B(...) |
-| main.rs:352:18:352:27 | source(...) | main.rs:346:9:346:20 | C | main.rs:351:14:353:5 | ...::C {...} |
-| main.rs:354:41:354:41 | 2 | main.rs:347:9:347:20 | D | main.rs:354:14:354:43 | ...::D {...} |
-| main.rs:372:18:372:27 | source(...) | main.rs:346:9:346:20 | C | main.rs:371:14:373:5 | C {...} |
-| main.rs:374:27:374:27 | 2 | main.rs:347:9:347:20 | D | main.rs:374:14:374:29 | D {...} |
-| main.rs:392:17:392:17 | 1 | file://:0:0:0:0 | element | main.rs:392:16:392:33 | [...] |
-| main.rs:392:20:392:20 | 2 | file://:0:0:0:0 | element | main.rs:392:16:392:33 | [...] |
-| main.rs:392:23:392:32 | source(...) | file://:0:0:0:0 | element | main.rs:392:16:392:33 | [...] |
-| main.rs:396:17:396:26 | source(...) | file://:0:0:0:0 | element | main.rs:396:16:396:31 | [...; 10] |
-| main.rs:400:17:400:17 | 1 | file://:0:0:0:0 | element | main.rs:400:16:400:24 | [...] |
-| main.rs:400:20:400:20 | 2 | file://:0:0:0:0 | element | main.rs:400:16:400:24 | [...] |
-| main.rs:400:23:400:23 | 3 | file://:0:0:0:0 | element | main.rs:400:16:400:24 | [...] |
-| main.rs:406:17:406:17 | 1 | file://:0:0:0:0 | element | main.rs:406:16:406:33 | [...] |
-| main.rs:406:20:406:20 | 2 | file://:0:0:0:0 | element | main.rs:406:16:406:33 | [...] |
-| main.rs:406:23:406:32 | source(...) | file://:0:0:0:0 | element | main.rs:406:16:406:33 | [...] |
-| main.rs:411:17:411:17 | 1 | file://:0:0:0:0 | element | main.rs:411:16:411:24 | [...] |
-| main.rs:411:20:411:20 | 2 | file://:0:0:0:0 | element | main.rs:411:16:411:24 | [...] |
-| main.rs:411:23:411:23 | 3 | file://:0:0:0:0 | element | main.rs:411:16:411:24 | [...] |
-| main.rs:418:17:418:17 | 1 | file://:0:0:0:0 | element | main.rs:418:16:418:33 | [...] |
-| main.rs:418:20:418:20 | 2 | file://:0:0:0:0 | element | main.rs:418:16:418:33 | [...] |
-| main.rs:418:23:418:32 | source(...) | file://:0:0:0:0 | element | main.rs:418:16:418:33 | [...] |
-| main.rs:429:24:429:24 | 1 | file://:0:0:0:0 | element | main.rs:429:23:429:31 | [...] |
-| main.rs:429:27:429:27 | 2 | file://:0:0:0:0 | element | main.rs:429:23:429:31 | [...] |
-| main.rs:429:30:429:30 | 3 | file://:0:0:0:0 | element | main.rs:429:23:429:31 | [...] |
-| main.rs:432:18:432:27 | source(...) | file://:0:0:0:0 | element | main.rs:432:5:432:11 | [post] mut_arr |
-| main.rs:444:41:444:67 | default_name | main.rs:441:9:441:20 | captured default_name | main.rs:444:41:444:67 | \|...\| ... |
-| main.rs:445:18:445:18 | n | file://:0:0:0:0 | &ref | main.rs:445:18:445:18 | receiver for n |
-| main.rs:469:13:469:13 | b | file://:0:0:0:0 | &ref | main.rs:469:13:469:13 | receiver for b |
-| main.rs:470:18:470:18 | b | file://:0:0:0:0 | &ref | main.rs:470:18:470:18 | receiver for b |
-| main.rs:479:15:479:24 | source(...) | file://:0:0:0:0 | element | main.rs:479:14:479:34 | [...] |
-| main.rs:479:27:479:27 | 2 | file://:0:0:0:0 | element | main.rs:479:14:479:34 | [...] |
-| main.rs:479:30:479:30 | 3 | file://:0:0:0:0 | element | main.rs:479:14:479:34 | [...] |
-| main.rs:479:33:479:33 | 4 | file://:0:0:0:0 | element | main.rs:479:14:479:34 | [...] |
-| main.rs:504:23:504:32 | source(...) | file://:0:0:0:0 | element | main.rs:504:22:504:42 | [...] |
-| main.rs:504:35:504:35 | 2 | file://:0:0:0:0 | element | main.rs:504:22:504:42 | [...] |
-| main.rs:504:38:504:38 | 3 | file://:0:0:0:0 | element | main.rs:504:22:504:42 | [...] |
-| main.rs:504:41:504:41 | 4 | file://:0:0:0:0 | element | main.rs:504:22:504:42 | [...] |
-| main.rs:519:18:519:18 | c | file://:0:0:0:0 | &ref | main.rs:519:17:519:18 | &c |
-| main.rs:522:15:522:15 | b | file://:0:0:0:0 | &ref | main.rs:522:14:522:15 | &b |
-| main.rs:545:27:545:27 | 0 | {EXTERNAL LOCATION} | Some | main.rs:545:22:545:28 | Some(...) |
+| main.rs:254:19:254:19 | 2 | {EXTERNAL LOCATION} | Some | main.rs:254:14:254:20 | Some(...) |
+| main.rs:266:19:266:28 | source(...) | {EXTERNAL LOCATION} | Some | main.rs:266:14:266:29 | Some(...) |
+| main.rs:278:19:278:28 | source(...) | {EXTERNAL LOCATION} | Some | main.rs:278:14:278:29 | Some(...) |
+| main.rs:283:19:283:28 | source(...) | {EXTERNAL LOCATION} | Some | main.rs:283:14:283:29 | Some(...) |
+| main.rs:286:19:286:19 | 0 | {EXTERNAL LOCATION} | Some | main.rs:286:14:286:20 | Some(...) |
+| main.rs:291:19:291:28 | source(...) | {EXTERNAL LOCATION} | Some | main.rs:291:14:291:29 | Some(...) |
+| main.rs:299:19:299:28 | source(...) | {EXTERNAL LOCATION} | Some | main.rs:299:14:299:29 | Some(...) |
+| main.rs:300:19:300:19 | 2 | {EXTERNAL LOCATION} | Some | main.rs:300:14:300:20 | Some(...) |
+| main.rs:304:10:304:10 | 0 | {EXTERNAL LOCATION} | Some | main.rs:304:5:304:11 | Some(...) |
+| main.rs:308:35:308:44 | source(...) | {EXTERNAL LOCATION} | Ok | main.rs:308:32:308:45 | Ok(...) |
+| main.rs:314:36:314:45 | source(...) | {EXTERNAL LOCATION} | Err | main.rs:314:32:314:46 | Err(...) |
+| main.rs:322:35:322:44 | source(...) | {EXTERNAL LOCATION} | Ok | main.rs:322:32:322:45 | Ok(...) |
+| main.rs:323:35:323:35 | 2 | {EXTERNAL LOCATION} | Ok | main.rs:323:32:323:36 | Ok(...) |
+| main.rs:324:36:324:45 | source(...) | {EXTERNAL LOCATION} | Err | main.rs:324:32:324:46 | Err(...) |
+| main.rs:331:8:331:8 | 0 | {EXTERNAL LOCATION} | Ok | main.rs:331:5:331:9 | Ok(...) |
+| main.rs:335:35:335:44 | source(...) | {EXTERNAL LOCATION} | Ok | main.rs:335:32:335:45 | Ok(...) |
+| main.rs:339:36:339:45 | source(...) | {EXTERNAL LOCATION} | Err | main.rs:339:32:339:46 | Err(...) |
+| main.rs:350:29:350:38 | source(...) | main.rs:345:7:345:9 | A | main.rs:350:14:350:39 | ...::A(...) |
+| main.rs:351:29:351:29 | 2 | main.rs:346:7:346:9 | B | main.rs:351:14:351:30 | ...::B(...) |
+| main.rs:368:16:368:25 | source(...) | main.rs:345:7:345:9 | A | main.rs:368:14:368:26 | A(...) |
+| main.rs:369:16:369:16 | 2 | main.rs:346:7:346:9 | B | main.rs:369:14:369:17 | B(...) |
+| main.rs:390:18:390:27 | source(...) | main.rs:384:9:384:20 | C | main.rs:389:14:391:5 | ...::C {...} |
+| main.rs:392:41:392:41 | 2 | main.rs:385:9:385:20 | D | main.rs:392:14:392:43 | ...::D {...} |
+| main.rs:410:18:410:27 | source(...) | main.rs:384:9:384:20 | C | main.rs:409:14:411:5 | C {...} |
+| main.rs:412:27:412:27 | 2 | main.rs:385:9:385:20 | D | main.rs:412:14:412:29 | D {...} |
+| main.rs:430:17:430:17 | 1 | file://:0:0:0:0 | element | main.rs:430:16:430:33 | [...] |
+| main.rs:430:20:430:20 | 2 | file://:0:0:0:0 | element | main.rs:430:16:430:33 | [...] |
+| main.rs:430:23:430:32 | source(...) | file://:0:0:0:0 | element | main.rs:430:16:430:33 | [...] |
+| main.rs:434:17:434:26 | source(...) | file://:0:0:0:0 | element | main.rs:434:16:434:31 | [...; 10] |
+| main.rs:438:17:438:17 | 1 | file://:0:0:0:0 | element | main.rs:438:16:438:24 | [...] |
+| main.rs:438:20:438:20 | 2 | file://:0:0:0:0 | element | main.rs:438:16:438:24 | [...] |
+| main.rs:438:23:438:23 | 3 | file://:0:0:0:0 | element | main.rs:438:16:438:24 | [...] |
+| main.rs:444:17:444:17 | 1 | file://:0:0:0:0 | element | main.rs:444:16:444:33 | [...] |
+| main.rs:444:20:444:20 | 2 | file://:0:0:0:0 | element | main.rs:444:16:444:33 | [...] |
+| main.rs:444:23:444:32 | source(...) | file://:0:0:0:0 | element | main.rs:444:16:444:33 | [...] |
+| main.rs:449:17:449:17 | 1 | file://:0:0:0:0 | element | main.rs:449:16:449:24 | [...] |
+| main.rs:449:20:449:20 | 2 | file://:0:0:0:0 | element | main.rs:449:16:449:24 | [...] |
+| main.rs:449:23:449:23 | 3 | file://:0:0:0:0 | element | main.rs:449:16:449:24 | [...] |
+| main.rs:456:17:456:17 | 1 | file://:0:0:0:0 | element | main.rs:456:16:456:33 | [...] |
+| main.rs:456:20:456:20 | 2 | file://:0:0:0:0 | element | main.rs:456:16:456:33 | [...] |
+| main.rs:456:23:456:32 | source(...) | file://:0:0:0:0 | element | main.rs:456:16:456:33 | [...] |
+| main.rs:467:24:467:24 | 1 | file://:0:0:0:0 | element | main.rs:467:23:467:31 | [...] |
+| main.rs:467:27:467:27 | 2 | file://:0:0:0:0 | element | main.rs:467:23:467:31 | [...] |
+| main.rs:467:30:467:30 | 3 | file://:0:0:0:0 | element | main.rs:467:23:467:31 | [...] |
+| main.rs:470:18:470:27 | source(...) | file://:0:0:0:0 | element | main.rs:470:5:470:11 | [post] mut_arr |
+| main.rs:479:24:479:33 | source(...) | file://:0:0:0:0 | &ref | main.rs:479:24:479:33 | receiver for source(...) |
+| main.rs:482:41:482:67 | default_name | main.rs:479:9:479:20 | captured default_name | main.rs:482:41:482:67 | \|...\| ... |
+| main.rs:482:44:482:55 | default_name | file://:0:0:0:0 | &ref | main.rs:482:44:482:55 | receiver for default_name |
+| main.rs:483:18:483:18 | n | file://:0:0:0:0 | &ref | main.rs:483:18:483:18 | receiver for n |
+| main.rs:506:13:506:13 | a | file://:0:0:0:0 | &ref | main.rs:506:13:506:13 | receiver for a |
+| main.rs:517:15:517:24 | source(...) | file://:0:0:0:0 | element | main.rs:517:14:517:34 | [...] |
+| main.rs:517:27:517:27 | 2 | file://:0:0:0:0 | element | main.rs:517:14:517:34 | [...] |
+| main.rs:517:30:517:30 | 3 | file://:0:0:0:0 | element | main.rs:517:14:517:34 | [...] |
+| main.rs:517:33:517:33 | 4 | file://:0:0:0:0 | element | main.rs:517:14:517:34 | [...] |
+| main.rs:520:11:520:35 | ... .unwrap() | file://:0:0:0:0 | &ref | main.rs:520:11:520:35 | receiver for ... .unwrap() |
+| main.rs:521:11:521:35 | ... .unwrap() | file://:0:0:0:0 | &ref | main.rs:521:11:521:35 | receiver for ... .unwrap() |
+| main.rs:535:29:535:29 | x | file://:0:0:0:0 | &ref | main.rs:535:29:535:29 | receiver for x |
+| main.rs:536:34:536:34 | x | file://:0:0:0:0 | &ref | main.rs:536:34:536:34 | receiver for x |
+| main.rs:542:23:542:32 | source(...) | file://:0:0:0:0 | element | main.rs:542:22:542:42 | [...] |
+| main.rs:542:35:542:35 | 2 | file://:0:0:0:0 | element | main.rs:542:22:542:42 | [...] |
+| main.rs:542:38:542:38 | 3 | file://:0:0:0:0 | element | main.rs:542:22:542:42 | [...] |
+| main.rs:542:41:542:41 | 4 | file://:0:0:0:0 | element | main.rs:542:22:542:42 | [...] |
+| main.rs:545:11:545:39 | ... .unwrap() | file://:0:0:0:0 | &ref | main.rs:545:11:545:39 | receiver for ... .unwrap() |
+| main.rs:546:11:546:39 | ... .unwrap() | file://:0:0:0:0 | &ref | main.rs:546:11:546:39 | receiver for ... .unwrap() |
+| main.rs:557:18:557:18 | c | file://:0:0:0:0 | &ref | main.rs:557:17:557:18 | &c |
+| main.rs:560:15:560:15 | b | file://:0:0:0:0 | &ref | main.rs:560:14:560:15 | &b |
+| main.rs:562:11:562:15 | c_ref | file://:0:0:0:0 | &ref | main.rs:562:11:562:15 | receiver for c_ref |
+| main.rs:583:27:583:27 | 0 | {EXTERNAL LOCATION} | Some | main.rs:583:22:583:28 | Some(...) |
diff --git a/rust/ql/test/library-tests/dataflow/local/inline-flow.expected b/rust/ql/test/library-tests/dataflow/local/inline-flow.expected
index ba98607e4d7..00640ed9aa4 100644
--- a/rust/ql/test/library-tests/dataflow/local/inline-flow.expected
+++ b/rust/ql/test/library-tests/dataflow/local/inline-flow.expected
@@ -10,558 +10,605 @@ models
 | 9 | Summary: <core::result::Result>::expect_err; Argument[self].Field[core::result::Result::Err(0)]; ReturnValue; value |
 | 10 | Summary: <core::result::Result>::ok; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue.Field[core::option::Option::Some(0)]; value |
 edges
-| main.rs:22:9:22:9 | s | main.rs:23:10:23:10 | s | provenance |  |
-| main.rs:22:13:22:21 | source(...) | main.rs:22:9:22:9 | s | provenance |  |
-| main.rs:27:9:27:9 | a | main.rs:29:9:29:9 | c | provenance |  |
-| main.rs:27:13:27:21 | source(...) | main.rs:27:9:27:9 | a | provenance |  |
-| main.rs:29:9:29:9 | c | main.rs:30:10:30:10 | c | provenance |  |
-| main.rs:34:9:34:9 | a | main.rs:35:9:35:9 | b | provenance |  |
-| main.rs:34:13:34:21 | source(...) | main.rs:34:9:34:9 | a | provenance |  |
-| main.rs:35:9:35:9 | b | main.rs:39:10:39:10 | b | provenance |  |
-| main.rs:47:9:47:9 | b | main.rs:50:10:50:10 | b | provenance |  |
-| main.rs:48:15:48:23 | source(...) | main.rs:47:9:47:9 | b | provenance |  |
-| main.rs:56:5:56:5 | i | main.rs:57:10:57:10 | i | provenance |  |
-| main.rs:56:9:56:17 | source(...) | main.rs:56:5:56:5 | i | provenance |  |
-| main.rs:89:9:89:9 | i [&ref] | main.rs:90:11:90:11 | i [&ref] | provenance |  |
-| main.rs:89:13:89:31 | ...::new(...) [&ref] | main.rs:89:9:89:9 | i [&ref] | provenance |  |
-| main.rs:89:22:89:30 | source(...) | main.rs:89:13:89:31 | ...::new(...) [&ref] | provenance | MaD:1 |
-| main.rs:90:11:90:11 | i [&ref] | main.rs:90:10:90:11 | * ... | provenance |  |
-| main.rs:97:9:97:9 | a [tuple.0] | main.rs:98:10:98:10 | a [tuple.0] | provenance |  |
-| main.rs:97:13:97:26 | TupleExpr [tuple.0] | main.rs:97:9:97:9 | a [tuple.0] | provenance |  |
-| main.rs:97:14:97:22 | source(...) | main.rs:97:13:97:26 | TupleExpr [tuple.0] | provenance |  |
-| main.rs:98:10:98:10 | a [tuple.0] | main.rs:98:10:98:12 | a.0 | provenance |  |
-| main.rs:103:9:103:9 | a [tuple.1] | main.rs:104:9:104:20 | TuplePat [tuple.1] | provenance |  |
-| main.rs:103:13:103:30 | TupleExpr [tuple.1] | main.rs:103:9:103:9 | a [tuple.1] | provenance |  |
-| main.rs:103:17:103:26 | source(...) | main.rs:103:13:103:30 | TupleExpr [tuple.1] | provenance |  |
-| main.rs:104:9:104:20 | TuplePat [tuple.1] | main.rs:104:14:104:15 | a1 | provenance |  |
-| main.rs:104:14:104:15 | a1 | main.rs:106:10:106:11 | a1 | provenance |  |
-| main.rs:111:9:111:13 | mut a [tuple.1] | main.rs:113:10:113:10 | a [tuple.1] | provenance |  |
-| main.rs:111:17:111:31 | TupleExpr [tuple.1] | main.rs:111:9:111:13 | mut a [tuple.1] | provenance |  |
-| main.rs:111:21:111:30 | source(...) | main.rs:111:17:111:31 | TupleExpr [tuple.1] | provenance |  |
-| main.rs:113:10:113:10 | a [tuple.1] | main.rs:113:10:113:12 | a.1 | provenance |  |
-| main.rs:114:5:114:5 | [post] a [tuple.0] | main.rs:115:5:115:5 | a [tuple.0] | provenance |  |
-| main.rs:114:11:114:20 | source(...) | main.rs:114:5:114:5 | [post] a [tuple.0] | provenance |  |
-| main.rs:115:5:115:5 | a [tuple.0] | main.rs:116:10:116:10 | a [tuple.0] | provenance |  |
-| main.rs:116:10:116:10 | a [tuple.0] | main.rs:116:10:116:12 | a.0 | provenance |  |
-| main.rs:121:9:121:9 | a [tuple.1] | main.rs:122:14:122:14 | a [tuple.1] | provenance |  |
-| main.rs:121:13:121:27 | TupleExpr [tuple.1] | main.rs:121:9:121:9 | a [tuple.1] | provenance |  |
-| main.rs:121:17:121:26 | source(...) | main.rs:121:13:121:27 | TupleExpr [tuple.1] | provenance |  |
-| main.rs:122:9:122:9 | b [tuple.0, tuple.1] | main.rs:124:10:124:10 | b [tuple.0, tuple.1] | provenance |  |
-| main.rs:122:13:122:18 | TupleExpr [tuple.0, tuple.1] | main.rs:122:9:122:9 | b [tuple.0, tuple.1] | provenance |  |
-| main.rs:122:14:122:14 | a [tuple.1] | main.rs:122:13:122:18 | TupleExpr [tuple.0, tuple.1] | provenance |  |
-| main.rs:124:10:124:10 | b [tuple.0, tuple.1] | main.rs:124:10:124:12 | b.0 [tuple.1] | provenance |  |
-| main.rs:124:10:124:12 | b.0 [tuple.1] | main.rs:124:10:124:15 | ... .1 | provenance |  |
-| main.rs:137:9:137:9 | p [Point.x] | main.rs:138:10:138:10 | p [Point.x] | provenance |  |
-| main.rs:137:13:137:40 | Point {...} [Point.x] | main.rs:137:9:137:9 | p [Point.x] | provenance |  |
-| main.rs:137:24:137:32 | source(...) | main.rs:137:13:137:40 | Point {...} [Point.x] | provenance |  |
-| main.rs:138:10:138:10 | p [Point.x] | main.rs:138:10:138:12 | p.x | provenance |  |
-| main.rs:145:5:145:5 | [post] p [Point.y] | main.rs:146:10:146:10 | p [Point.y] | provenance |  |
-| main.rs:145:11:145:20 | source(...) | main.rs:145:5:145:5 | [post] p [Point.y] | provenance |  |
-| main.rs:146:10:146:10 | p [Point.y] | main.rs:146:10:146:12 | p.y | provenance |  |
-| main.rs:150:9:150:9 | p [Point.x] | main.rs:154:9:154:28 | Point {...} [Point.x] | provenance |  |
-| main.rs:150:13:153:5 | Point {...} [Point.x] | main.rs:150:9:150:9 | p [Point.x] | provenance |  |
-| main.rs:151:12:151:21 | source(...) | main.rs:150:13:153:5 | Point {...} [Point.x] | provenance |  |
-| main.rs:154:9:154:28 | Point {...} [Point.x] | main.rs:154:20:154:20 | a | provenance |  |
-| main.rs:154:20:154:20 | a | main.rs:155:10:155:10 | a | provenance |  |
-| main.rs:165:9:165:9 | p [Point3D.plane, Point.y] | main.rs:173:10:173:10 | p [Point3D.plane, Point.y] | provenance |  |
-| main.rs:165:13:171:5 | Point3D {...} [Point3D.plane, Point.y] | main.rs:165:9:165:9 | p [Point3D.plane, Point.y] | provenance |  |
-| main.rs:166:16:169:9 | Point {...} [Point.y] | main.rs:165:13:171:5 | Point3D {...} [Point3D.plane, Point.y] | provenance |  |
-| main.rs:168:16:168:25 | source(...) | main.rs:166:16:169:9 | Point {...} [Point.y] | provenance |  |
-| main.rs:173:10:173:10 | p [Point3D.plane, Point.y] | main.rs:173:10:173:16 | p.plane [Point.y] | provenance |  |
-| main.rs:173:10:173:16 | p.plane [Point.y] | main.rs:173:10:173:18 | ... .y | provenance |  |
-| main.rs:178:9:178:9 | y | main.rs:180:30:180:30 | y | provenance |  |
-| main.rs:178:13:178:22 | source(...) | main.rs:178:9:178:9 | y | provenance |  |
-| main.rs:179:9:179:9 | p [Point3D.plane, Point.y] | main.rs:183:11:183:11 | p [Point3D.plane, Point.y] | provenance |  |
-| main.rs:179:13:182:5 | Point3D {...} [Point3D.plane, Point.y] | main.rs:179:9:179:9 | p [Point3D.plane, Point.y] | provenance |  |
-| main.rs:180:16:180:32 | Point {...} [Point.y] | main.rs:179:13:182:5 | Point3D {...} [Point3D.plane, Point.y] | provenance |  |
-| main.rs:180:30:180:30 | y | main.rs:180:16:180:32 | Point {...} [Point.y] | provenance |  |
-| main.rs:183:11:183:11 | p [Point3D.plane, Point.y] | main.rs:184:9:187:9 | Point3D {...} [Point3D.plane, Point.y] | provenance |  |
-| main.rs:184:9:187:9 | Point3D {...} [Point3D.plane, Point.y] | main.rs:185:20:185:33 | Point {...} [Point.y] | provenance |  |
-| main.rs:185:20:185:33 | Point {...} [Point.y] | main.rs:185:31:185:31 | y | provenance |  |
-| main.rs:185:31:185:31 | y | main.rs:189:18:189:18 | y | provenance |  |
-| main.rs:198:9:198:9 | s [MyTupleStruct(0)] | main.rs:199:10:199:10 | s [MyTupleStruct(0)] | provenance |  |
-| main.rs:198:9:198:9 | s [MyTupleStruct(0)] | main.rs:202:11:202:11 | s [MyTupleStruct(0)] | provenance |  |
-| main.rs:198:13:198:40 | MyTupleStruct(...) [MyTupleStruct(0)] | main.rs:198:9:198:9 | s [MyTupleStruct(0)] | provenance |  |
-| main.rs:198:27:198:36 | source(...) | main.rs:198:13:198:40 | MyTupleStruct(...) [MyTupleStruct(0)] | provenance |  |
-| main.rs:199:10:199:10 | s [MyTupleStruct(0)] | main.rs:199:10:199:12 | s.0 | provenance |  |
-| main.rs:202:11:202:11 | s [MyTupleStruct(0)] | main.rs:203:9:203:27 | MyTupleStruct(...) [MyTupleStruct(0)] | provenance |  |
-| main.rs:203:9:203:27 | MyTupleStruct(...) [MyTupleStruct(0)] | main.rs:203:23:203:23 | x | provenance |  |
-| main.rs:203:23:203:23 | x | main.rs:204:18:204:18 | x | provenance |  |
-| main.rs:214:9:214:10 | s1 [Some] | main.rs:216:11:216:12 | s1 [Some] | provenance |  |
-| main.rs:214:14:214:37 | ...::Some(...) [Some] | main.rs:214:9:214:10 | s1 [Some] | provenance |  |
-| main.rs:214:27:214:36 | source(...) | main.rs:214:14:214:37 | ...::Some(...) [Some] | provenance |  |
-| main.rs:216:11:216:12 | s1 [Some] | main.rs:217:9:217:23 | ...::Some(...) [Some] | provenance |  |
-| main.rs:217:9:217:23 | ...::Some(...) [Some] | main.rs:217:22:217:22 | n | provenance |  |
-| main.rs:217:22:217:22 | n | main.rs:217:33:217:33 | n | provenance |  |
-| main.rs:227:9:227:10 | s1 [Some] | main.rs:229:11:229:12 | s1 [Some] | provenance |  |
-| main.rs:227:14:227:29 | Some(...) [Some] | main.rs:227:9:227:10 | s1 [Some] | provenance |  |
-| main.rs:227:19:227:28 | source(...) | main.rs:227:14:227:29 | Some(...) [Some] | provenance |  |
-| main.rs:229:11:229:12 | s1 [Some] | main.rs:230:9:230:15 | Some(...) [Some] | provenance |  |
-| main.rs:230:9:230:15 | Some(...) [Some] | main.rs:230:14:230:14 | n | provenance |  |
-| main.rs:230:14:230:14 | n | main.rs:230:25:230:25 | n | provenance |  |
-| main.rs:240:9:240:10 | s1 [Some] | main.rs:241:10:241:20 | s1.unwrap() | provenance | MaD:2 |
-| main.rs:240:14:240:29 | Some(...) [Some] | main.rs:240:9:240:10 | s1 [Some] | provenance |  |
-| main.rs:240:19:240:28 | source(...) | main.rs:240:14:240:29 | Some(...) [Some] | provenance |  |
-| main.rs:245:9:245:10 | s1 [Some] | main.rs:246:10:246:24 | s1.unwrap_or(...) | provenance | MaD:4 |
-| main.rs:245:14:245:29 | Some(...) [Some] | main.rs:245:9:245:10 | s1 [Some] | provenance |  |
-| main.rs:245:19:245:28 | source(...) | main.rs:245:14:245:29 | Some(...) [Some] | provenance |  |
-| main.rs:249:23:249:32 | source(...) | main.rs:249:10:249:33 | s2.unwrap_or(...) | provenance | MaD:3 |
-| main.rs:253:9:253:10 | s1 [Some] | main.rs:254:10:254:32 | s1.unwrap_or_else(...) | provenance | MaD:6 |
+| main.rs:23:9:23:9 | s | main.rs:24:10:24:10 | s | provenance |  |
+| main.rs:23:9:23:9 | s | main.rs:26:12:26:12 | x | provenance |  |
+| main.rs:23:9:23:9 | s | main.rs:30:12:30:12 | x | provenance |  |
+| main.rs:23:13:23:21 | source(...) | main.rs:23:9:23:9 | s | provenance |  |
+| main.rs:26:12:26:12 | x | main.rs:27:14:27:14 | x | provenance |  |
+| main.rs:30:12:30:12 | x | main.rs:32:18:32:18 | x | provenance |  |
+| main.rs:30:12:30:12 | x | main.rs:36:14:36:14 | x | provenance |  |
+| main.rs:41:9:41:9 | a | main.rs:43:9:43:9 | c | provenance |  |
+| main.rs:41:13:41:21 | source(...) | main.rs:41:9:41:9 | a | provenance |  |
+| main.rs:43:9:43:9 | c | main.rs:44:10:44:10 | c | provenance |  |
+| main.rs:48:9:48:9 | a | main.rs:49:9:49:9 | b | provenance |  |
+| main.rs:48:13:48:21 | source(...) | main.rs:48:9:48:9 | a | provenance |  |
+| main.rs:49:9:49:9 | b | main.rs:53:10:53:10 | b | provenance |  |
+| main.rs:61:9:61:9 | b | main.rs:64:10:64:10 | b | provenance |  |
+| main.rs:62:15:62:23 | source(...) | main.rs:61:9:61:9 | b | provenance |  |
+| main.rs:70:5:70:5 | i | main.rs:71:10:71:10 | i | provenance |  |
+| main.rs:70:9:70:17 | source(...) | main.rs:70:5:70:5 | i | provenance |  |
+| main.rs:76:9:76:9 | k | main.rs:77:5:77:5 | j | provenance |  |
+| main.rs:76:9:76:9 | k | main.rs:79:10:79:10 | k | provenance |  |
+| main.rs:76:13:76:21 | source(...) | main.rs:76:9:76:9 | k | provenance |  |
+| main.rs:77:5:77:5 | j | main.rs:78:10:78:10 | j | provenance |  |
+| main.rs:81:9:81:13 | mut l | main.rs:82:5:82:5 | l | provenance |  |
+| main.rs:81:17:81:25 | source(...) | main.rs:81:9:81:13 | mut l | provenance |  |
+| main.rs:82:5:82:5 | l | main.rs:83:10:83:10 | l | provenance |  |
+| main.rs:115:9:115:9 | i [&ref] | main.rs:116:11:116:11 | i [&ref] | provenance |  |
+| main.rs:115:13:115:31 | ...::new(...) [&ref] | main.rs:115:9:115:9 | i [&ref] | provenance |  |
+| main.rs:115:22:115:30 | source(...) | main.rs:115:13:115:31 | ...::new(...) [&ref] | provenance | MaD:1 |
+| main.rs:116:11:116:11 | i [&ref] | main.rs:116:10:116:11 | * ... | provenance |  |
+| main.rs:123:9:123:9 | a [tuple.0] | main.rs:124:10:124:10 | a [tuple.0] | provenance |  |
+| main.rs:123:13:123:26 | TupleExpr [tuple.0] | main.rs:123:9:123:9 | a [tuple.0] | provenance |  |
+| main.rs:123:14:123:22 | source(...) | main.rs:123:13:123:26 | TupleExpr [tuple.0] | provenance |  |
+| main.rs:124:10:124:10 | a [tuple.0] | main.rs:124:10:124:12 | a.0 | provenance |  |
+| main.rs:129:9:129:9 | a [tuple.1] | main.rs:130:9:130:20 | TuplePat [tuple.1] | provenance |  |
+| main.rs:129:13:129:30 | TupleExpr [tuple.1] | main.rs:129:9:129:9 | a [tuple.1] | provenance |  |
+| main.rs:129:17:129:26 | source(...) | main.rs:129:13:129:30 | TupleExpr [tuple.1] | provenance |  |
+| main.rs:130:9:130:20 | TuplePat [tuple.1] | main.rs:130:14:130:15 | a1 | provenance |  |
+| main.rs:130:14:130:15 | a1 | main.rs:132:10:132:11 | a1 | provenance |  |
+| main.rs:137:9:137:13 | mut a [tuple.1] | main.rs:139:10:139:10 | a [tuple.1] | provenance |  |
+| main.rs:137:17:137:31 | TupleExpr [tuple.1] | main.rs:137:9:137:13 | mut a [tuple.1] | provenance |  |
+| main.rs:137:21:137:30 | source(...) | main.rs:137:17:137:31 | TupleExpr [tuple.1] | provenance |  |
+| main.rs:139:10:139:10 | a [tuple.1] | main.rs:139:10:139:12 | a.1 | provenance |  |
+| main.rs:140:5:140:5 | [post] a [tuple.0] | main.rs:141:5:141:5 | a [tuple.0] | provenance |  |
+| main.rs:140:11:140:20 | source(...) | main.rs:140:5:140:5 | [post] a [tuple.0] | provenance |  |
+| main.rs:141:5:141:5 | a [tuple.0] | main.rs:142:10:142:10 | a [tuple.0] | provenance |  |
+| main.rs:142:10:142:10 | a [tuple.0] | main.rs:142:10:142:12 | a.0 | provenance |  |
+| main.rs:147:9:147:9 | a [tuple.1] | main.rs:148:14:148:14 | a [tuple.1] | provenance |  |
+| main.rs:147:13:147:27 | TupleExpr [tuple.1] | main.rs:147:9:147:9 | a [tuple.1] | provenance |  |
+| main.rs:147:17:147:26 | source(...) | main.rs:147:13:147:27 | TupleExpr [tuple.1] | provenance |  |
+| main.rs:148:9:148:9 | b [tuple.0, tuple.1] | main.rs:150:10:150:10 | b [tuple.0, tuple.1] | provenance |  |
+| main.rs:148:13:148:18 | TupleExpr [tuple.0, tuple.1] | main.rs:148:9:148:9 | b [tuple.0, tuple.1] | provenance |  |
+| main.rs:148:14:148:14 | a [tuple.1] | main.rs:148:13:148:18 | TupleExpr [tuple.0, tuple.1] | provenance |  |
+| main.rs:150:10:150:10 | b [tuple.0, tuple.1] | main.rs:150:10:150:12 | b.0 [tuple.1] | provenance |  |
+| main.rs:150:10:150:12 | b.0 [tuple.1] | main.rs:150:10:150:15 | ... .1 | provenance |  |
+| main.rs:163:9:163:9 | p [Point.x] | main.rs:164:10:164:10 | p [Point.x] | provenance |  |
+| main.rs:163:13:163:40 | Point {...} [Point.x] | main.rs:163:9:163:9 | p [Point.x] | provenance |  |
+| main.rs:163:24:163:32 | source(...) | main.rs:163:13:163:40 | Point {...} [Point.x] | provenance |  |
+| main.rs:164:10:164:10 | p [Point.x] | main.rs:164:10:164:12 | p.x | provenance |  |
+| main.rs:171:5:171:5 | [post] p [Point.y] | main.rs:172:10:172:10 | p [Point.y] | provenance |  |
+| main.rs:171:11:171:20 | source(...) | main.rs:171:5:171:5 | [post] p [Point.y] | provenance |  |
+| main.rs:172:10:172:10 | p [Point.y] | main.rs:172:10:172:12 | p.y | provenance |  |
+| main.rs:176:9:176:9 | p [Point.x] | main.rs:180:9:180:28 | Point {...} [Point.x] | provenance |  |
+| main.rs:176:13:179:5 | Point {...} [Point.x] | main.rs:176:9:176:9 | p [Point.x] | provenance |  |
+| main.rs:177:12:177:21 | source(...) | main.rs:176:13:179:5 | Point {...} [Point.x] | provenance |  |
+| main.rs:180:9:180:28 | Point {...} [Point.x] | main.rs:180:20:180:20 | a | provenance |  |
+| main.rs:180:20:180:20 | a | main.rs:181:10:181:10 | a | provenance |  |
+| main.rs:191:9:191:9 | p [Point3D.plane, Point.y] | main.rs:199:10:199:10 | p [Point3D.plane, Point.y] | provenance |  |
+| main.rs:191:13:197:5 | Point3D {...} [Point3D.plane, Point.y] | main.rs:191:9:191:9 | p [Point3D.plane, Point.y] | provenance |  |
+| main.rs:192:16:195:9 | Point {...} [Point.y] | main.rs:191:13:197:5 | Point3D {...} [Point3D.plane, Point.y] | provenance |  |
+| main.rs:194:16:194:25 | source(...) | main.rs:192:16:195:9 | Point {...} [Point.y] | provenance |  |
+| main.rs:199:10:199:10 | p [Point3D.plane, Point.y] | main.rs:199:10:199:16 | p.plane [Point.y] | provenance |  |
+| main.rs:199:10:199:16 | p.plane [Point.y] | main.rs:199:10:199:18 | ... .y | provenance |  |
+| main.rs:204:9:204:9 | y | main.rs:206:30:206:30 | y | provenance |  |
+| main.rs:204:13:204:22 | source(...) | main.rs:204:9:204:9 | y | provenance |  |
+| main.rs:205:9:205:9 | p [Point3D.plane, Point.y] | main.rs:209:11:209:11 | p [Point3D.plane, Point.y] | provenance |  |
+| main.rs:205:13:208:5 | Point3D {...} [Point3D.plane, Point.y] | main.rs:205:9:205:9 | p [Point3D.plane, Point.y] | provenance |  |
+| main.rs:206:16:206:32 | Point {...} [Point.y] | main.rs:205:13:208:5 | Point3D {...} [Point3D.plane, Point.y] | provenance |  |
+| main.rs:206:30:206:30 | y | main.rs:206:16:206:32 | Point {...} [Point.y] | provenance |  |
+| main.rs:209:11:209:11 | p [Point3D.plane, Point.y] | main.rs:210:9:213:9 | Point3D {...} [Point3D.plane, Point.y] | provenance |  |
+| main.rs:210:9:213:9 | Point3D {...} [Point3D.plane, Point.y] | main.rs:211:20:211:33 | Point {...} [Point.y] | provenance |  |
+| main.rs:211:20:211:33 | Point {...} [Point.y] | main.rs:211:31:211:31 | y | provenance |  |
+| main.rs:211:31:211:31 | y | main.rs:215:18:215:18 | y | provenance |  |
+| main.rs:224:9:224:9 | s [MyTupleStruct(0)] | main.rs:225:10:225:10 | s [MyTupleStruct(0)] | provenance |  |
+| main.rs:224:9:224:9 | s [MyTupleStruct(0)] | main.rs:228:11:228:11 | s [MyTupleStruct(0)] | provenance |  |
+| main.rs:224:13:224:40 | MyTupleStruct(...) [MyTupleStruct(0)] | main.rs:224:9:224:9 | s [MyTupleStruct(0)] | provenance |  |
+| main.rs:224:27:224:36 | source(...) | main.rs:224:13:224:40 | MyTupleStruct(...) [MyTupleStruct(0)] | provenance |  |
+| main.rs:225:10:225:10 | s [MyTupleStruct(0)] | main.rs:225:10:225:12 | s.0 | provenance |  |
+| main.rs:228:11:228:11 | s [MyTupleStruct(0)] | main.rs:229:9:229:27 | MyTupleStruct(...) [MyTupleStruct(0)] | provenance |  |
+| main.rs:229:9:229:27 | MyTupleStruct(...) [MyTupleStruct(0)] | main.rs:229:23:229:23 | x | provenance |  |
+| main.rs:229:23:229:23 | x | main.rs:230:18:230:18 | x | provenance |  |
+| main.rs:240:9:240:10 | s1 [Some] | main.rs:242:11:242:12 | s1 [Some] | provenance |  |
+| main.rs:240:14:240:37 | ...::Some(...) [Some] | main.rs:240:9:240:10 | s1 [Some] | provenance |  |
+| main.rs:240:27:240:36 | source(...) | main.rs:240:14:240:37 | ...::Some(...) [Some] | provenance |  |
+| main.rs:242:11:242:12 | s1 [Some] | main.rs:243:9:243:23 | ...::Some(...) [Some] | provenance |  |
+| main.rs:243:9:243:23 | ...::Some(...) [Some] | main.rs:243:22:243:22 | n | provenance |  |
+| main.rs:243:22:243:22 | n | main.rs:243:33:243:33 | n | provenance |  |
+| main.rs:253:9:253:10 | s1 [Some] | main.rs:255:11:255:12 | s1 [Some] | provenance |  |
 | main.rs:253:14:253:29 | Some(...) [Some] | main.rs:253:9:253:10 | s1 [Some] | provenance |  |
 | main.rs:253:19:253:28 | source(...) | main.rs:253:14:253:29 | Some(...) [Some] | provenance |  |
-| main.rs:257:31:257:40 | source(...) | main.rs:257:10:257:41 | s2.unwrap_or_else(...) | provenance | MaD:5 |
-| main.rs:261:9:261:10 | s1 [Some] | main.rs:263:14:263:15 | s1 [Some] | provenance |  |
-| main.rs:261:14:261:29 | Some(...) [Some] | main.rs:261:9:261:10 | s1 [Some] | provenance |  |
-| main.rs:261:19:261:28 | source(...) | main.rs:261:14:261:29 | Some(...) [Some] | provenance |  |
-| main.rs:263:9:263:10 | i1 | main.rs:264:10:264:11 | i1 | provenance |  |
-| main.rs:263:14:263:15 | s1 [Some] | main.rs:263:14:263:16 | TryExpr | provenance |  |
-| main.rs:263:14:263:16 | TryExpr | main.rs:263:9:263:10 | i1 | provenance |  |
-| main.rs:270:9:270:10 | r1 [Ok] | main.rs:271:28:271:34 | r1.ok() [Some] | provenance | MaD:10 |
-| main.rs:270:32:270:45 | Ok(...) [Ok] | main.rs:270:9:270:10 | r1 [Ok] | provenance |  |
-| main.rs:270:35:270:44 | source(...) | main.rs:270:32:270:45 | Ok(...) [Ok] | provenance |  |
-| main.rs:271:9:271:11 | o1a [Some] | main.rs:273:10:273:21 | o1a.unwrap() | provenance | MaD:2 |
-| main.rs:271:28:271:34 | r1.ok() [Some] | main.rs:271:9:271:11 | o1a [Some] | provenance |  |
-| main.rs:276:9:276:10 | r2 [Err] | main.rs:278:28:278:35 | r2.err() [Some] | provenance | MaD:7 |
-| main.rs:276:32:276:46 | Err(...) [Err] | main.rs:276:9:276:10 | r2 [Err] | provenance |  |
-| main.rs:276:36:276:45 | source(...) | main.rs:276:32:276:46 | Err(...) [Err] | provenance |  |
-| main.rs:278:9:278:11 | o2b [Some] | main.rs:280:10:280:21 | o2b.unwrap() | provenance | MaD:2 |
-| main.rs:278:28:278:35 | r2.err() [Some] | main.rs:278:9:278:11 | o2b [Some] | provenance |  |
-| main.rs:284:9:284:10 | s1 [Ok] | main.rs:287:14:287:15 | s1 [Ok] | provenance |  |
-| main.rs:284:32:284:45 | Ok(...) [Ok] | main.rs:284:9:284:10 | s1 [Ok] | provenance |  |
-| main.rs:284:35:284:44 | source(...) | main.rs:284:32:284:45 | Ok(...) [Ok] | provenance |  |
-| main.rs:287:9:287:10 | i1 | main.rs:289:10:289:11 | i1 | provenance |  |
-| main.rs:287:14:287:15 | s1 [Ok] | main.rs:287:14:287:16 | TryExpr | provenance |  |
-| main.rs:287:14:287:16 | TryExpr | main.rs:287:9:287:10 | i1 | provenance |  |
-| main.rs:297:9:297:10 | s1 [Ok] | main.rs:298:10:298:22 | s1.expect(...) | provenance | MaD:8 |
-| main.rs:297:32:297:45 | Ok(...) [Ok] | main.rs:297:9:297:10 | s1 [Ok] | provenance |  |
-| main.rs:297:35:297:44 | source(...) | main.rs:297:32:297:45 | Ok(...) [Ok] | provenance |  |
-| main.rs:301:9:301:10 | s2 [Err] | main.rs:303:10:303:26 | s2.expect_err(...) | provenance | MaD:9 |
-| main.rs:301:32:301:46 | Err(...) [Err] | main.rs:301:9:301:10 | s2 [Err] | provenance |  |
-| main.rs:301:36:301:45 | source(...) | main.rs:301:32:301:46 | Err(...) [Err] | provenance |  |
-| main.rs:312:9:312:10 | s1 [A] | main.rs:314:11:314:12 | s1 [A] | provenance |  |
-| main.rs:312:14:312:39 | ...::A(...) [A] | main.rs:312:9:312:10 | s1 [A] | provenance |  |
-| main.rs:312:29:312:38 | source(...) | main.rs:312:14:312:39 | ...::A(...) [A] | provenance |  |
-| main.rs:314:11:314:12 | s1 [A] | main.rs:315:9:315:25 | ...::A(...) [A] | provenance |  |
-| main.rs:314:11:314:12 | s1 [A] | main.rs:318:11:318:12 | s1 [A] | provenance |  |
-| main.rs:315:9:315:25 | ...::A(...) [A] | main.rs:315:24:315:24 | n | provenance |  |
-| main.rs:315:24:315:24 | n | main.rs:315:35:315:35 | n | provenance |  |
-| main.rs:318:11:318:12 | s1 [A] | main.rs:319:9:319:25 | ...::A(...) [A] | provenance |  |
-| main.rs:319:9:319:25 | ...::A(...) [A] | main.rs:319:24:319:24 | n | provenance |  |
-| main.rs:319:24:319:24 | n | main.rs:319:55:319:55 | n | provenance |  |
-| main.rs:330:9:330:10 | s1 [A] | main.rs:332:11:332:12 | s1 [A] | provenance |  |
-| main.rs:330:14:330:26 | A(...) [A] | main.rs:330:9:330:10 | s1 [A] | provenance |  |
-| main.rs:330:16:330:25 | source(...) | main.rs:330:14:330:26 | A(...) [A] | provenance |  |
-| main.rs:332:11:332:12 | s1 [A] | main.rs:333:9:333:12 | A(...) [A] | provenance |  |
-| main.rs:332:11:332:12 | s1 [A] | main.rs:336:11:336:12 | s1 [A] | provenance |  |
-| main.rs:333:9:333:12 | A(...) [A] | main.rs:333:11:333:11 | n | provenance |  |
-| main.rs:333:11:333:11 | n | main.rs:333:22:333:22 | n | provenance |  |
-| main.rs:336:11:336:12 | s1 [A] | main.rs:337:9:337:12 | A(...) [A] | provenance |  |
-| main.rs:337:9:337:12 | A(...) [A] | main.rs:337:11:337:11 | n | provenance |  |
-| main.rs:337:11:337:11 | n | main.rs:337:29:337:29 | n | provenance |  |
-| main.rs:351:9:351:10 | s1 [C] | main.rs:355:11:355:12 | s1 [C] | provenance |  |
-| main.rs:351:14:353:5 | ...::C {...} [C] | main.rs:351:9:351:10 | s1 [C] | provenance |  |
-| main.rs:352:18:352:27 | source(...) | main.rs:351:14:353:5 | ...::C {...} [C] | provenance |  |
-| main.rs:355:11:355:12 | s1 [C] | main.rs:356:9:356:38 | ...::C {...} [C] | provenance |  |
-| main.rs:355:11:355:12 | s1 [C] | main.rs:359:11:359:12 | s1 [C] | provenance |  |
-| main.rs:356:9:356:38 | ...::C {...} [C] | main.rs:356:36:356:36 | n | provenance |  |
-| main.rs:356:36:356:36 | n | main.rs:356:48:356:48 | n | provenance |  |
-| main.rs:359:11:359:12 | s1 [C] | main.rs:360:9:360:38 | ...::C {...} [C] | provenance |  |
-| main.rs:360:9:360:38 | ...::C {...} [C] | main.rs:360:36:360:36 | n | provenance |  |
-| main.rs:360:36:360:36 | n | main.rs:360:81:360:81 | n | provenance |  |
-| main.rs:371:9:371:10 | s1 [C] | main.rs:375:11:375:12 | s1 [C] | provenance |  |
-| main.rs:371:14:373:5 | C {...} [C] | main.rs:371:9:371:10 | s1 [C] | provenance |  |
-| main.rs:372:18:372:27 | source(...) | main.rs:371:14:373:5 | C {...} [C] | provenance |  |
-| main.rs:375:11:375:12 | s1 [C] | main.rs:376:9:376:24 | C {...} [C] | provenance |  |
-| main.rs:375:11:375:12 | s1 [C] | main.rs:379:11:379:12 | s1 [C] | provenance |  |
-| main.rs:376:9:376:24 | C {...} [C] | main.rs:376:22:376:22 | n | provenance |  |
-| main.rs:376:22:376:22 | n | main.rs:376:34:376:34 | n | provenance |  |
-| main.rs:379:11:379:12 | s1 [C] | main.rs:380:9:380:24 | C {...} [C] | provenance |  |
-| main.rs:380:9:380:24 | C {...} [C] | main.rs:380:22:380:22 | n | provenance |  |
-| main.rs:380:22:380:22 | n | main.rs:380:53:380:53 | n | provenance |  |
-| main.rs:392:9:392:12 | arr1 [element] | main.rs:393:14:393:17 | arr1 [element] | provenance |  |
-| main.rs:392:16:392:33 | [...] [element] | main.rs:392:9:392:12 | arr1 [element] | provenance |  |
-| main.rs:392:23:392:32 | source(...) | main.rs:392:16:392:33 | [...] [element] | provenance |  |
-| main.rs:393:9:393:10 | n1 | main.rs:394:10:394:11 | n1 | provenance |  |
-| main.rs:393:14:393:17 | arr1 [element] | main.rs:393:14:393:20 | arr1[2] | provenance |  |
-| main.rs:393:14:393:20 | arr1[2] | main.rs:393:9:393:10 | n1 | provenance |  |
-| main.rs:396:9:396:12 | arr2 [element] | main.rs:397:14:397:17 | arr2 [element] | provenance |  |
-| main.rs:396:16:396:31 | [...; 10] [element] | main.rs:396:9:396:12 | arr2 [element] | provenance |  |
-| main.rs:396:17:396:26 | source(...) | main.rs:396:16:396:31 | [...; 10] [element] | provenance |  |
-| main.rs:397:9:397:10 | n2 | main.rs:398:10:398:11 | n2 | provenance |  |
-| main.rs:397:14:397:17 | arr2 [element] | main.rs:397:14:397:20 | arr2[4] | provenance |  |
-| main.rs:397:14:397:20 | arr2[4] | main.rs:397:9:397:10 | n2 | provenance |  |
-| main.rs:406:9:406:12 | arr1 [element] | main.rs:407:15:407:18 | arr1 [element] | provenance |  |
-| main.rs:406:16:406:33 | [...] [element] | main.rs:406:9:406:12 | arr1 [element] | provenance |  |
-| main.rs:406:23:406:32 | source(...) | main.rs:406:16:406:33 | [...] [element] | provenance |  |
-| main.rs:407:9:407:10 | n1 | main.rs:408:14:408:15 | n1 | provenance |  |
-| main.rs:407:15:407:18 | arr1 [element] | main.rs:407:9:407:10 | n1 | provenance |  |
-| main.rs:418:9:418:12 | arr1 [element] | main.rs:419:11:419:14 | arr1 [element] | provenance |  |
-| main.rs:418:16:418:33 | [...] [element] | main.rs:418:9:418:12 | arr1 [element] | provenance |  |
-| main.rs:418:23:418:32 | source(...) | main.rs:418:16:418:33 | [...] [element] | provenance |  |
-| main.rs:419:11:419:14 | arr1 [element] | main.rs:420:9:420:17 | SlicePat [element] | provenance |  |
-| main.rs:420:9:420:17 | SlicePat [element] | main.rs:420:10:420:10 | a | provenance |  |
-| main.rs:420:9:420:17 | SlicePat [element] | main.rs:420:13:420:13 | b | provenance |  |
-| main.rs:420:9:420:17 | SlicePat [element] | main.rs:420:16:420:16 | c | provenance |  |
-| main.rs:420:10:420:10 | a | main.rs:421:18:421:18 | a | provenance |  |
-| main.rs:420:13:420:13 | b | main.rs:422:18:422:18 | b | provenance |  |
-| main.rs:420:16:420:16 | c | main.rs:423:18:423:18 | c | provenance |  |
-| main.rs:432:5:432:11 | [post] mut_arr [element] | main.rs:433:13:433:19 | mut_arr [element] | provenance |  |
-| main.rs:432:5:432:11 | [post] mut_arr [element] | main.rs:435:10:435:16 | mut_arr [element] | provenance |  |
-| main.rs:432:18:432:27 | source(...) | main.rs:432:5:432:11 | [post] mut_arr [element] | provenance |  |
-| main.rs:433:9:433:9 | d | main.rs:434:10:434:10 | d | provenance |  |
-| main.rs:433:13:433:19 | mut_arr [element] | main.rs:433:13:433:22 | mut_arr[1] | provenance |  |
-| main.rs:433:13:433:22 | mut_arr[1] | main.rs:433:9:433:9 | d | provenance |  |
-| main.rs:435:10:435:16 | mut_arr [element] | main.rs:435:10:435:19 | mut_arr[0] | provenance |  |
-| main.rs:458:9:458:9 | s | main.rs:459:10:459:10 | s | provenance |  |
-| main.rs:458:25:458:26 | source(...) | main.rs:458:9:458:9 | s | provenance |  |
-| main.rs:467:9:467:9 | a | main.rs:472:10:472:10 | a | provenance |  |
-| main.rs:467:13:467:22 | source(...) | main.rs:467:9:467:9 | a | provenance |  |
-| main.rs:479:9:479:10 | vs [element] | main.rs:481:10:481:11 | vs [element] | provenance |  |
-| main.rs:479:9:479:10 | vs [element] | main.rs:485:14:485:15 | vs [element] | provenance |  |
-| main.rs:479:14:479:34 | [...] [element] | main.rs:479:9:479:10 | vs [element] | provenance |  |
-| main.rs:479:15:479:24 | source(...) | main.rs:479:14:479:34 | [...] [element] | provenance |  |
-| main.rs:481:10:481:11 | vs [element] | main.rs:481:10:481:14 | vs[0] | provenance |  |
-| main.rs:485:9:485:9 | v | main.rs:486:14:486:14 | v | provenance |  |
-| main.rs:485:14:485:15 | vs [element] | main.rs:485:9:485:9 | v | provenance |  |
-| main.rs:504:9:504:18 | mut vs_mut [element] | main.rs:506:10:506:15 | vs_mut [element] | provenance |  |
-| main.rs:504:22:504:42 | [...] [element] | main.rs:504:9:504:18 | mut vs_mut [element] | provenance |  |
-| main.rs:504:23:504:32 | source(...) | main.rs:504:22:504:42 | [...] [element] | provenance |  |
-| main.rs:506:10:506:15 | vs_mut [element] | main.rs:506:10:506:18 | vs_mut[0] | provenance |  |
-| main.rs:516:9:516:9 | a | main.rs:521:10:521:10 | a | provenance |  |
-| main.rs:516:13:516:22 | source(...) | main.rs:516:9:516:9 | a | provenance |  |
-| main.rs:518:9:518:9 | c | main.rs:519:18:519:18 | c | provenance |  |
-| main.rs:518:13:518:22 | source(...) | main.rs:518:9:518:9 | c | provenance |  |
-| main.rs:519:9:519:13 | c_ref [&ref] | main.rs:524:11:524:15 | c_ref [&ref] | provenance |  |
-| main.rs:519:17:519:18 | &c [&ref] | main.rs:519:9:519:13 | c_ref [&ref] | provenance |  |
-| main.rs:519:18:519:18 | c | main.rs:519:17:519:18 | &c [&ref] | provenance |  |
-| main.rs:524:11:524:15 | c_ref [&ref] | main.rs:524:10:524:15 | * ... | provenance |  |
+| main.rs:255:11:255:12 | s1 [Some] | main.rs:256:9:256:15 | Some(...) [Some] | provenance |  |
+| main.rs:256:9:256:15 | Some(...) [Some] | main.rs:256:14:256:14 | n | provenance |  |
+| main.rs:256:14:256:14 | n | main.rs:256:25:256:25 | n | provenance |  |
+| main.rs:266:9:266:10 | s1 [Some] | main.rs:267:12:267:18 | Some(...) [Some] | provenance |  |
+| main.rs:266:14:266:29 | Some(...) [Some] | main.rs:266:9:266:10 | s1 [Some] | provenance |  |
+| main.rs:266:19:266:28 | source(...) | main.rs:266:14:266:29 | Some(...) [Some] | provenance |  |
+| main.rs:267:12:267:18 | Some(...) [Some] | main.rs:267:17:267:17 | n | provenance |  |
+| main.rs:267:17:267:17 | n | main.rs:269:18:269:18 | n | provenance |  |
+| main.rs:267:17:267:17 | n | main.rs:273:14:273:14 | n | provenance |  |
+| main.rs:278:9:278:10 | s1 [Some] | main.rs:279:10:279:20 | s1.unwrap() | provenance | MaD:2 |
+| main.rs:278:14:278:29 | Some(...) [Some] | main.rs:278:9:278:10 | s1 [Some] | provenance |  |
+| main.rs:278:19:278:28 | source(...) | main.rs:278:14:278:29 | Some(...) [Some] | provenance |  |
+| main.rs:283:9:283:10 | s1 [Some] | main.rs:284:10:284:24 | s1.unwrap_or(...) | provenance | MaD:4 |
+| main.rs:283:14:283:29 | Some(...) [Some] | main.rs:283:9:283:10 | s1 [Some] | provenance |  |
+| main.rs:283:19:283:28 | source(...) | main.rs:283:14:283:29 | Some(...) [Some] | provenance |  |
+| main.rs:287:23:287:32 | source(...) | main.rs:287:10:287:33 | s2.unwrap_or(...) | provenance | MaD:3 |
+| main.rs:291:9:291:10 | s1 [Some] | main.rs:292:10:292:32 | s1.unwrap_or_else(...) | provenance | MaD:6 |
+| main.rs:291:14:291:29 | Some(...) [Some] | main.rs:291:9:291:10 | s1 [Some] | provenance |  |
+| main.rs:291:19:291:28 | source(...) | main.rs:291:14:291:29 | Some(...) [Some] | provenance |  |
+| main.rs:295:31:295:40 | source(...) | main.rs:295:10:295:41 | s2.unwrap_or_else(...) | provenance | MaD:5 |
+| main.rs:299:9:299:10 | s1 [Some] | main.rs:301:14:301:15 | s1 [Some] | provenance |  |
+| main.rs:299:14:299:29 | Some(...) [Some] | main.rs:299:9:299:10 | s1 [Some] | provenance |  |
+| main.rs:299:19:299:28 | source(...) | main.rs:299:14:299:29 | Some(...) [Some] | provenance |  |
+| main.rs:301:9:301:10 | i1 | main.rs:302:10:302:11 | i1 | provenance |  |
+| main.rs:301:14:301:15 | s1 [Some] | main.rs:301:14:301:16 | TryExpr | provenance |  |
+| main.rs:301:14:301:16 | TryExpr | main.rs:301:9:301:10 | i1 | provenance |  |
+| main.rs:308:9:308:10 | r1 [Ok] | main.rs:309:28:309:34 | r1.ok() [Some] | provenance | MaD:10 |
+| main.rs:308:32:308:45 | Ok(...) [Ok] | main.rs:308:9:308:10 | r1 [Ok] | provenance |  |
+| main.rs:308:35:308:44 | source(...) | main.rs:308:32:308:45 | Ok(...) [Ok] | provenance |  |
+| main.rs:309:9:309:11 | o1a [Some] | main.rs:311:10:311:21 | o1a.unwrap() | provenance | MaD:2 |
+| main.rs:309:28:309:34 | r1.ok() [Some] | main.rs:309:9:309:11 | o1a [Some] | provenance |  |
+| main.rs:314:9:314:10 | r2 [Err] | main.rs:316:28:316:35 | r2.err() [Some] | provenance | MaD:7 |
+| main.rs:314:32:314:46 | Err(...) [Err] | main.rs:314:9:314:10 | r2 [Err] | provenance |  |
+| main.rs:314:36:314:45 | source(...) | main.rs:314:32:314:46 | Err(...) [Err] | provenance |  |
+| main.rs:316:9:316:11 | o2b [Some] | main.rs:318:10:318:21 | o2b.unwrap() | provenance | MaD:2 |
+| main.rs:316:28:316:35 | r2.err() [Some] | main.rs:316:9:316:11 | o2b [Some] | provenance |  |
+| main.rs:322:9:322:10 | s1 [Ok] | main.rs:325:14:325:15 | s1 [Ok] | provenance |  |
+| main.rs:322:32:322:45 | Ok(...) [Ok] | main.rs:322:9:322:10 | s1 [Ok] | provenance |  |
+| main.rs:322:35:322:44 | source(...) | main.rs:322:32:322:45 | Ok(...) [Ok] | provenance |  |
+| main.rs:325:9:325:10 | i1 | main.rs:327:10:327:11 | i1 | provenance |  |
+| main.rs:325:14:325:15 | s1 [Ok] | main.rs:325:14:325:16 | TryExpr | provenance |  |
+| main.rs:325:14:325:16 | TryExpr | main.rs:325:9:325:10 | i1 | provenance |  |
+| main.rs:335:9:335:10 | s1 [Ok] | main.rs:336:10:336:22 | s1.expect(...) | provenance | MaD:8 |
+| main.rs:335:32:335:45 | Ok(...) [Ok] | main.rs:335:9:335:10 | s1 [Ok] | provenance |  |
+| main.rs:335:35:335:44 | source(...) | main.rs:335:32:335:45 | Ok(...) [Ok] | provenance |  |
+| main.rs:339:9:339:10 | s2 [Err] | main.rs:341:10:341:26 | s2.expect_err(...) | provenance | MaD:9 |
+| main.rs:339:32:339:46 | Err(...) [Err] | main.rs:339:9:339:10 | s2 [Err] | provenance |  |
+| main.rs:339:36:339:45 | source(...) | main.rs:339:32:339:46 | Err(...) [Err] | provenance |  |
+| main.rs:350:9:350:10 | s1 [A] | main.rs:352:11:352:12 | s1 [A] | provenance |  |
+| main.rs:350:14:350:39 | ...::A(...) [A] | main.rs:350:9:350:10 | s1 [A] | provenance |  |
+| main.rs:350:29:350:38 | source(...) | main.rs:350:14:350:39 | ...::A(...) [A] | provenance |  |
+| main.rs:352:11:352:12 | s1 [A] | main.rs:353:9:353:25 | ...::A(...) [A] | provenance |  |
+| main.rs:352:11:352:12 | s1 [A] | main.rs:356:11:356:12 | s1 [A] | provenance |  |
+| main.rs:353:9:353:25 | ...::A(...) [A] | main.rs:353:24:353:24 | n | provenance |  |
+| main.rs:353:24:353:24 | n | main.rs:353:35:353:35 | n | provenance |  |
+| main.rs:356:11:356:12 | s1 [A] | main.rs:357:9:357:25 | ...::A(...) [A] | provenance |  |
+| main.rs:357:9:357:25 | ...::A(...) [A] | main.rs:357:24:357:24 | n | provenance |  |
+| main.rs:357:24:357:24 | n | main.rs:357:55:357:55 | n | provenance |  |
+| main.rs:368:9:368:10 | s1 [A] | main.rs:370:11:370:12 | s1 [A] | provenance |  |
+| main.rs:368:14:368:26 | A(...) [A] | main.rs:368:9:368:10 | s1 [A] | provenance |  |
+| main.rs:368:16:368:25 | source(...) | main.rs:368:14:368:26 | A(...) [A] | provenance |  |
+| main.rs:370:11:370:12 | s1 [A] | main.rs:371:9:371:12 | A(...) [A] | provenance |  |
+| main.rs:370:11:370:12 | s1 [A] | main.rs:374:11:374:12 | s1 [A] | provenance |  |
+| main.rs:371:9:371:12 | A(...) [A] | main.rs:371:11:371:11 | n | provenance |  |
+| main.rs:371:11:371:11 | n | main.rs:371:22:371:22 | n | provenance |  |
+| main.rs:374:11:374:12 | s1 [A] | main.rs:375:9:375:12 | A(...) [A] | provenance |  |
+| main.rs:375:9:375:12 | A(...) [A] | main.rs:375:11:375:11 | n | provenance |  |
+| main.rs:375:11:375:11 | n | main.rs:375:29:375:29 | n | provenance |  |
+| main.rs:389:9:389:10 | s1 [C] | main.rs:393:11:393:12 | s1 [C] | provenance |  |
+| main.rs:389:14:391:5 | ...::C {...} [C] | main.rs:389:9:389:10 | s1 [C] | provenance |  |
+| main.rs:390:18:390:27 | source(...) | main.rs:389:14:391:5 | ...::C {...} [C] | provenance |  |
+| main.rs:393:11:393:12 | s1 [C] | main.rs:394:9:394:38 | ...::C {...} [C] | provenance |  |
+| main.rs:393:11:393:12 | s1 [C] | main.rs:397:11:397:12 | s1 [C] | provenance |  |
+| main.rs:394:9:394:38 | ...::C {...} [C] | main.rs:394:36:394:36 | n | provenance |  |
+| main.rs:394:36:394:36 | n | main.rs:394:48:394:48 | n | provenance |  |
+| main.rs:397:11:397:12 | s1 [C] | main.rs:398:9:398:38 | ...::C {...} [C] | provenance |  |
+| main.rs:398:9:398:38 | ...::C {...} [C] | main.rs:398:36:398:36 | n | provenance |  |
+| main.rs:398:36:398:36 | n | main.rs:398:81:398:81 | n | provenance |  |
+| main.rs:409:9:409:10 | s1 [C] | main.rs:413:11:413:12 | s1 [C] | provenance |  |
+| main.rs:409:14:411:5 | C {...} [C] | main.rs:409:9:409:10 | s1 [C] | provenance |  |
+| main.rs:410:18:410:27 | source(...) | main.rs:409:14:411:5 | C {...} [C] | provenance |  |
+| main.rs:413:11:413:12 | s1 [C] | main.rs:414:9:414:24 | C {...} [C] | provenance |  |
+| main.rs:413:11:413:12 | s1 [C] | main.rs:417:11:417:12 | s1 [C] | provenance |  |
+| main.rs:414:9:414:24 | C {...} [C] | main.rs:414:22:414:22 | n | provenance |  |
+| main.rs:414:22:414:22 | n | main.rs:414:34:414:34 | n | provenance |  |
+| main.rs:417:11:417:12 | s1 [C] | main.rs:418:9:418:24 | C {...} [C] | provenance |  |
+| main.rs:418:9:418:24 | C {...} [C] | main.rs:418:22:418:22 | n | provenance |  |
+| main.rs:418:22:418:22 | n | main.rs:418:53:418:53 | n | provenance |  |
+| main.rs:430:9:430:12 | arr1 [element] | main.rs:431:14:431:17 | arr1 [element] | provenance |  |
+| main.rs:430:16:430:33 | [...] [element] | main.rs:430:9:430:12 | arr1 [element] | provenance |  |
+| main.rs:430:23:430:32 | source(...) | main.rs:430:16:430:33 | [...] [element] | provenance |  |
+| main.rs:431:9:431:10 | n1 | main.rs:432:10:432:11 | n1 | provenance |  |
+| main.rs:431:14:431:17 | arr1 [element] | main.rs:431:14:431:20 | arr1[2] | provenance |  |
+| main.rs:431:14:431:20 | arr1[2] | main.rs:431:9:431:10 | n1 | provenance |  |
+| main.rs:434:9:434:12 | arr2 [element] | main.rs:435:14:435:17 | arr2 [element] | provenance |  |
+| main.rs:434:16:434:31 | [...; 10] [element] | main.rs:434:9:434:12 | arr2 [element] | provenance |  |
+| main.rs:434:17:434:26 | source(...) | main.rs:434:16:434:31 | [...; 10] [element] | provenance |  |
+| main.rs:435:9:435:10 | n2 | main.rs:436:10:436:11 | n2 | provenance |  |
+| main.rs:435:14:435:17 | arr2 [element] | main.rs:435:14:435:20 | arr2[4] | provenance |  |
+| main.rs:435:14:435:20 | arr2[4] | main.rs:435:9:435:10 | n2 | provenance |  |
+| main.rs:444:9:444:12 | arr1 [element] | main.rs:445:15:445:18 | arr1 [element] | provenance |  |
+| main.rs:444:16:444:33 | [...] [element] | main.rs:444:9:444:12 | arr1 [element] | provenance |  |
+| main.rs:444:23:444:32 | source(...) | main.rs:444:16:444:33 | [...] [element] | provenance |  |
+| main.rs:445:9:445:10 | n1 | main.rs:446:14:446:15 | n1 | provenance |  |
+| main.rs:445:15:445:18 | arr1 [element] | main.rs:445:9:445:10 | n1 | provenance |  |
+| main.rs:456:9:456:12 | arr1 [element] | main.rs:457:11:457:14 | arr1 [element] | provenance |  |
+| main.rs:456:16:456:33 | [...] [element] | main.rs:456:9:456:12 | arr1 [element] | provenance |  |
+| main.rs:456:23:456:32 | source(...) | main.rs:456:16:456:33 | [...] [element] | provenance |  |
+| main.rs:457:11:457:14 | arr1 [element] | main.rs:458:9:458:17 | SlicePat [element] | provenance |  |
+| main.rs:458:9:458:17 | SlicePat [element] | main.rs:458:10:458:10 | a | provenance |  |
+| main.rs:458:9:458:17 | SlicePat [element] | main.rs:458:13:458:13 | b | provenance |  |
+| main.rs:458:9:458:17 | SlicePat [element] | main.rs:458:16:458:16 | c | provenance |  |
+| main.rs:458:10:458:10 | a | main.rs:459:18:459:18 | a | provenance |  |
+| main.rs:458:13:458:13 | b | main.rs:460:18:460:18 | b | provenance |  |
+| main.rs:458:16:458:16 | c | main.rs:461:18:461:18 | c | provenance |  |
+| main.rs:470:5:470:11 | [post] mut_arr [element] | main.rs:471:13:471:19 | mut_arr [element] | provenance |  |
+| main.rs:470:5:470:11 | [post] mut_arr [element] | main.rs:473:10:473:16 | mut_arr [element] | provenance |  |
+| main.rs:470:18:470:27 | source(...) | main.rs:470:5:470:11 | [post] mut_arr [element] | provenance |  |
+| main.rs:471:9:471:9 | d | main.rs:472:10:472:10 | d | provenance |  |
+| main.rs:471:13:471:19 | mut_arr [element] | main.rs:471:13:471:22 | mut_arr[1] | provenance |  |
+| main.rs:471:13:471:22 | mut_arr[1] | main.rs:471:9:471:9 | d | provenance |  |
+| main.rs:473:10:473:16 | mut_arr [element] | main.rs:473:10:473:19 | mut_arr[0] | provenance |  |
+| main.rs:496:9:496:9 | s | main.rs:497:10:497:10 | s | provenance |  |
+| main.rs:496:25:496:26 | source(...) | main.rs:496:9:496:9 | s | provenance |  |
+| main.rs:505:9:505:9 | a | main.rs:510:10:510:10 | a | provenance |  |
+| main.rs:505:13:505:22 | source(...) | main.rs:505:9:505:9 | a | provenance |  |
+| main.rs:517:9:517:10 | vs [element] | main.rs:519:10:519:11 | vs [element] | provenance |  |
+| main.rs:517:9:517:10 | vs [element] | main.rs:523:14:523:15 | vs [element] | provenance |  |
+| main.rs:517:14:517:34 | [...] [element] | main.rs:517:9:517:10 | vs [element] | provenance |  |
+| main.rs:517:15:517:24 | source(...) | main.rs:517:14:517:34 | [...] [element] | provenance |  |
+| main.rs:519:10:519:11 | vs [element] | main.rs:519:10:519:14 | vs[0] | provenance |  |
+| main.rs:523:9:523:9 | v | main.rs:524:14:524:14 | v | provenance |  |
+| main.rs:523:14:523:15 | vs [element] | main.rs:523:9:523:9 | v | provenance |  |
+| main.rs:542:9:542:18 | mut vs_mut [element] | main.rs:544:10:544:15 | vs_mut [element] | provenance |  |
+| main.rs:542:22:542:42 | [...] [element] | main.rs:542:9:542:18 | mut vs_mut [element] | provenance |  |
+| main.rs:542:23:542:32 | source(...) | main.rs:542:22:542:42 | [...] [element] | provenance |  |
+| main.rs:544:10:544:15 | vs_mut [element] | main.rs:544:10:544:18 | vs_mut[0] | provenance |  |
+| main.rs:554:9:554:9 | a | main.rs:559:10:559:10 | a | provenance |  |
+| main.rs:554:13:554:22 | source(...) | main.rs:554:9:554:9 | a | provenance |  |
+| main.rs:556:9:556:9 | c | main.rs:557:18:557:18 | c | provenance |  |
+| main.rs:556:13:556:22 | source(...) | main.rs:556:9:556:9 | c | provenance |  |
+| main.rs:557:9:557:13 | c_ref [&ref] | main.rs:562:11:562:15 | c_ref [&ref] | provenance |  |
+| main.rs:557:17:557:18 | &c [&ref] | main.rs:557:9:557:13 | c_ref [&ref] | provenance |  |
+| main.rs:557:18:557:18 | c | main.rs:557:17:557:18 | &c [&ref] | provenance |  |
+| main.rs:562:11:562:15 | c_ref [&ref] | main.rs:562:10:562:15 | * ... | provenance |  |
 nodes
-| main.rs:18:10:18:18 | source(...) | semmle.label | source(...) |
-| main.rs:22:9:22:9 | s | semmle.label | s |
-| main.rs:22:13:22:21 | source(...) | semmle.label | source(...) |
-| main.rs:23:10:23:10 | s | semmle.label | s |
-| main.rs:27:9:27:9 | a | semmle.label | a |
-| main.rs:27:13:27:21 | source(...) | semmle.label | source(...) |
-| main.rs:29:9:29:9 | c | semmle.label | c |
-| main.rs:30:10:30:10 | c | semmle.label | c |
-| main.rs:34:9:34:9 | a | semmle.label | a |
-| main.rs:34:13:34:21 | source(...) | semmle.label | source(...) |
-| main.rs:35:9:35:9 | b | semmle.label | b |
-| main.rs:39:10:39:10 | b | semmle.label | b |
-| main.rs:47:9:47:9 | b | semmle.label | b |
-| main.rs:48:15:48:23 | source(...) | semmle.label | source(...) |
-| main.rs:50:10:50:10 | b | semmle.label | b |
-| main.rs:56:5:56:5 | i | semmle.label | i |
-| main.rs:56:9:56:17 | source(...) | semmle.label | source(...) |
-| main.rs:57:10:57:10 | i | semmle.label | i |
-| main.rs:89:9:89:9 | i [&ref] | semmle.label | i [&ref] |
-| main.rs:89:13:89:31 | ...::new(...) [&ref] | semmle.label | ...::new(...) [&ref] |
-| main.rs:89:22:89:30 | source(...) | semmle.label | source(...) |
-| main.rs:90:10:90:11 | * ... | semmle.label | * ... |
-| main.rs:90:11:90:11 | i [&ref] | semmle.label | i [&ref] |
-| main.rs:97:9:97:9 | a [tuple.0] | semmle.label | a [tuple.0] |
-| main.rs:97:13:97:26 | TupleExpr [tuple.0] | semmle.label | TupleExpr [tuple.0] |
-| main.rs:97:14:97:22 | source(...) | semmle.label | source(...) |
-| main.rs:98:10:98:10 | a [tuple.0] | semmle.label | a [tuple.0] |
-| main.rs:98:10:98:12 | a.0 | semmle.label | a.0 |
-| main.rs:103:9:103:9 | a [tuple.1] | semmle.label | a [tuple.1] |
-| main.rs:103:13:103:30 | TupleExpr [tuple.1] | semmle.label | TupleExpr [tuple.1] |
-| main.rs:103:17:103:26 | source(...) | semmle.label | source(...) |
-| main.rs:104:9:104:20 | TuplePat [tuple.1] | semmle.label | TuplePat [tuple.1] |
-| main.rs:104:14:104:15 | a1 | semmle.label | a1 |
-| main.rs:106:10:106:11 | a1 | semmle.label | a1 |
-| main.rs:111:9:111:13 | mut a [tuple.1] | semmle.label | mut a [tuple.1] |
-| main.rs:111:17:111:31 | TupleExpr [tuple.1] | semmle.label | TupleExpr [tuple.1] |
-| main.rs:111:21:111:30 | source(...) | semmle.label | source(...) |
-| main.rs:113:10:113:10 | a [tuple.1] | semmle.label | a [tuple.1] |
-| main.rs:113:10:113:12 | a.1 | semmle.label | a.1 |
-| main.rs:114:5:114:5 | [post] a [tuple.0] | semmle.label | [post] a [tuple.0] |
-| main.rs:114:11:114:20 | source(...) | semmle.label | source(...) |
-| main.rs:115:5:115:5 | a [tuple.0] | semmle.label | a [tuple.0] |
-| main.rs:116:10:116:10 | a [tuple.0] | semmle.label | a [tuple.0] |
-| main.rs:116:10:116:12 | a.0 | semmle.label | a.0 |
-| main.rs:121:9:121:9 | a [tuple.1] | semmle.label | a [tuple.1] |
-| main.rs:121:13:121:27 | TupleExpr [tuple.1] | semmle.label | TupleExpr [tuple.1] |
-| main.rs:121:17:121:26 | source(...) | semmle.label | source(...) |
-| main.rs:122:9:122:9 | b [tuple.0, tuple.1] | semmle.label | b [tuple.0, tuple.1] |
-| main.rs:122:13:122:18 | TupleExpr [tuple.0, tuple.1] | semmle.label | TupleExpr [tuple.0, tuple.1] |
-| main.rs:122:14:122:14 | a [tuple.1] | semmle.label | a [tuple.1] |
-| main.rs:124:10:124:10 | b [tuple.0, tuple.1] | semmle.label | b [tuple.0, tuple.1] |
-| main.rs:124:10:124:12 | b.0 [tuple.1] | semmle.label | b.0 [tuple.1] |
-| main.rs:124:10:124:15 | ... .1 | semmle.label | ... .1 |
-| main.rs:137:9:137:9 | p [Point.x] | semmle.label | p [Point.x] |
-| main.rs:137:13:137:40 | Point {...} [Point.x] | semmle.label | Point {...} [Point.x] |
-| main.rs:137:24:137:32 | source(...) | semmle.label | source(...) |
-| main.rs:138:10:138:10 | p [Point.x] | semmle.label | p [Point.x] |
-| main.rs:138:10:138:12 | p.x | semmle.label | p.x |
-| main.rs:145:5:145:5 | [post] p [Point.y] | semmle.label | [post] p [Point.y] |
-| main.rs:145:11:145:20 | source(...) | semmle.label | source(...) |
-| main.rs:146:10:146:10 | p [Point.y] | semmle.label | p [Point.y] |
-| main.rs:146:10:146:12 | p.y | semmle.label | p.y |
-| main.rs:150:9:150:9 | p [Point.x] | semmle.label | p [Point.x] |
-| main.rs:150:13:153:5 | Point {...} [Point.x] | semmle.label | Point {...} [Point.x] |
-| main.rs:151:12:151:21 | source(...) | semmle.label | source(...) |
-| main.rs:154:9:154:28 | Point {...} [Point.x] | semmle.label | Point {...} [Point.x] |
-| main.rs:154:20:154:20 | a | semmle.label | a |
-| main.rs:155:10:155:10 | a | semmle.label | a |
-| main.rs:165:9:165:9 | p [Point3D.plane, Point.y] | semmle.label | p [Point3D.plane, Point.y] |
-| main.rs:165:13:171:5 | Point3D {...} [Point3D.plane, Point.y] | semmle.label | Point3D {...} [Point3D.plane, Point.y] |
-| main.rs:166:16:169:9 | Point {...} [Point.y] | semmle.label | Point {...} [Point.y] |
-| main.rs:168:16:168:25 | source(...) | semmle.label | source(...) |
-| main.rs:173:10:173:10 | p [Point3D.plane, Point.y] | semmle.label | p [Point3D.plane, Point.y] |
-| main.rs:173:10:173:16 | p.plane [Point.y] | semmle.label | p.plane [Point.y] |
-| main.rs:173:10:173:18 | ... .y | semmle.label | ... .y |
-| main.rs:178:9:178:9 | y | semmle.label | y |
-| main.rs:178:13:178:22 | source(...) | semmle.label | source(...) |
-| main.rs:179:9:179:9 | p [Point3D.plane, Point.y] | semmle.label | p [Point3D.plane, Point.y] |
-| main.rs:179:13:182:5 | Point3D {...} [Point3D.plane, Point.y] | semmle.label | Point3D {...} [Point3D.plane, Point.y] |
-| main.rs:180:16:180:32 | Point {...} [Point.y] | semmle.label | Point {...} [Point.y] |
-| main.rs:180:30:180:30 | y | semmle.label | y |
-| main.rs:183:11:183:11 | p [Point3D.plane, Point.y] | semmle.label | p [Point3D.plane, Point.y] |
-| main.rs:184:9:187:9 | Point3D {...} [Point3D.plane, Point.y] | semmle.label | Point3D {...} [Point3D.plane, Point.y] |
-| main.rs:185:20:185:33 | Point {...} [Point.y] | semmle.label | Point {...} [Point.y] |
-| main.rs:185:31:185:31 | y | semmle.label | y |
-| main.rs:189:18:189:18 | y | semmle.label | y |
-| main.rs:198:9:198:9 | s [MyTupleStruct(0)] | semmle.label | s [MyTupleStruct(0)] |
-| main.rs:198:13:198:40 | MyTupleStruct(...) [MyTupleStruct(0)] | semmle.label | MyTupleStruct(...) [MyTupleStruct(0)] |
-| main.rs:198:27:198:36 | source(...) | semmle.label | source(...) |
-| main.rs:199:10:199:10 | s [MyTupleStruct(0)] | semmle.label | s [MyTupleStruct(0)] |
-| main.rs:199:10:199:12 | s.0 | semmle.label | s.0 |
-| main.rs:202:11:202:11 | s [MyTupleStruct(0)] | semmle.label | s [MyTupleStruct(0)] |
-| main.rs:203:9:203:27 | MyTupleStruct(...) [MyTupleStruct(0)] | semmle.label | MyTupleStruct(...) [MyTupleStruct(0)] |
-| main.rs:203:23:203:23 | x | semmle.label | x |
-| main.rs:204:18:204:18 | x | semmle.label | x |
-| main.rs:214:9:214:10 | s1 [Some] | semmle.label | s1 [Some] |
-| main.rs:214:14:214:37 | ...::Some(...) [Some] | semmle.label | ...::Some(...) [Some] |
-| main.rs:214:27:214:36 | source(...) | semmle.label | source(...) |
-| main.rs:216:11:216:12 | s1 [Some] | semmle.label | s1 [Some] |
-| main.rs:217:9:217:23 | ...::Some(...) [Some] | semmle.label | ...::Some(...) [Some] |
-| main.rs:217:22:217:22 | n | semmle.label | n |
-| main.rs:217:33:217:33 | n | semmle.label | n |
-| main.rs:227:9:227:10 | s1 [Some] | semmle.label | s1 [Some] |
-| main.rs:227:14:227:29 | Some(...) [Some] | semmle.label | Some(...) [Some] |
-| main.rs:227:19:227:28 | source(...) | semmle.label | source(...) |
-| main.rs:229:11:229:12 | s1 [Some] | semmle.label | s1 [Some] |
-| main.rs:230:9:230:15 | Some(...) [Some] | semmle.label | Some(...) [Some] |
-| main.rs:230:14:230:14 | n | semmle.label | n |
-| main.rs:230:25:230:25 | n | semmle.label | n |
+| main.rs:19:10:19:18 | source(...) | semmle.label | source(...) |
+| main.rs:23:9:23:9 | s | semmle.label | s |
+| main.rs:23:13:23:21 | source(...) | semmle.label | source(...) |
+| main.rs:24:10:24:10 | s | semmle.label | s |
+| main.rs:26:12:26:12 | x | semmle.label | x |
+| main.rs:27:14:27:14 | x | semmle.label | x |
+| main.rs:30:12:30:12 | x | semmle.label | x |
+| main.rs:32:18:32:18 | x | semmle.label | x |
+| main.rs:36:14:36:14 | x | semmle.label | x |
+| main.rs:41:9:41:9 | a | semmle.label | a |
+| main.rs:41:13:41:21 | source(...) | semmle.label | source(...) |
+| main.rs:43:9:43:9 | c | semmle.label | c |
+| main.rs:44:10:44:10 | c | semmle.label | c |
+| main.rs:48:9:48:9 | a | semmle.label | a |
+| main.rs:48:13:48:21 | source(...) | semmle.label | source(...) |
+| main.rs:49:9:49:9 | b | semmle.label | b |
+| main.rs:53:10:53:10 | b | semmle.label | b |
+| main.rs:61:9:61:9 | b | semmle.label | b |
+| main.rs:62:15:62:23 | source(...) | semmle.label | source(...) |
+| main.rs:64:10:64:10 | b | semmle.label | b |
+| main.rs:70:5:70:5 | i | semmle.label | i |
+| main.rs:70:9:70:17 | source(...) | semmle.label | source(...) |
+| main.rs:71:10:71:10 | i | semmle.label | i |
+| main.rs:76:9:76:9 | k | semmle.label | k |
+| main.rs:76:13:76:21 | source(...) | semmle.label | source(...) |
+| main.rs:77:5:77:5 | j | semmle.label | j |
+| main.rs:78:10:78:10 | j | semmle.label | j |
+| main.rs:79:10:79:10 | k | semmle.label | k |
+| main.rs:81:9:81:13 | mut l | semmle.label | mut l |
+| main.rs:81:17:81:25 | source(...) | semmle.label | source(...) |
+| main.rs:82:5:82:5 | l | semmle.label | l |
+| main.rs:83:10:83:10 | l | semmle.label | l |
+| main.rs:115:9:115:9 | i [&ref] | semmle.label | i [&ref] |
+| main.rs:115:13:115:31 | ...::new(...) [&ref] | semmle.label | ...::new(...) [&ref] |
+| main.rs:115:22:115:30 | source(...) | semmle.label | source(...) |
+| main.rs:116:10:116:11 | * ... | semmle.label | * ... |
+| main.rs:116:11:116:11 | i [&ref] | semmle.label | i [&ref] |
+| main.rs:123:9:123:9 | a [tuple.0] | semmle.label | a [tuple.0] |
+| main.rs:123:13:123:26 | TupleExpr [tuple.0] | semmle.label | TupleExpr [tuple.0] |
+| main.rs:123:14:123:22 | source(...) | semmle.label | source(...) |
+| main.rs:124:10:124:10 | a [tuple.0] | semmle.label | a [tuple.0] |
+| main.rs:124:10:124:12 | a.0 | semmle.label | a.0 |
+| main.rs:129:9:129:9 | a [tuple.1] | semmle.label | a [tuple.1] |
+| main.rs:129:13:129:30 | TupleExpr [tuple.1] | semmle.label | TupleExpr [tuple.1] |
+| main.rs:129:17:129:26 | source(...) | semmle.label | source(...) |
+| main.rs:130:9:130:20 | TuplePat [tuple.1] | semmle.label | TuplePat [tuple.1] |
+| main.rs:130:14:130:15 | a1 | semmle.label | a1 |
+| main.rs:132:10:132:11 | a1 | semmle.label | a1 |
+| main.rs:137:9:137:13 | mut a [tuple.1] | semmle.label | mut a [tuple.1] |
+| main.rs:137:17:137:31 | TupleExpr [tuple.1] | semmle.label | TupleExpr [tuple.1] |
+| main.rs:137:21:137:30 | source(...) | semmle.label | source(...) |
+| main.rs:139:10:139:10 | a [tuple.1] | semmle.label | a [tuple.1] |
+| main.rs:139:10:139:12 | a.1 | semmle.label | a.1 |
+| main.rs:140:5:140:5 | [post] a [tuple.0] | semmle.label | [post] a [tuple.0] |
+| main.rs:140:11:140:20 | source(...) | semmle.label | source(...) |
+| main.rs:141:5:141:5 | a [tuple.0] | semmle.label | a [tuple.0] |
+| main.rs:142:10:142:10 | a [tuple.0] | semmle.label | a [tuple.0] |
+| main.rs:142:10:142:12 | a.0 | semmle.label | a.0 |
+| main.rs:147:9:147:9 | a [tuple.1] | semmle.label | a [tuple.1] |
+| main.rs:147:13:147:27 | TupleExpr [tuple.1] | semmle.label | TupleExpr [tuple.1] |
+| main.rs:147:17:147:26 | source(...) | semmle.label | source(...) |
+| main.rs:148:9:148:9 | b [tuple.0, tuple.1] | semmle.label | b [tuple.0, tuple.1] |
+| main.rs:148:13:148:18 | TupleExpr [tuple.0, tuple.1] | semmle.label | TupleExpr [tuple.0, tuple.1] |
+| main.rs:148:14:148:14 | a [tuple.1] | semmle.label | a [tuple.1] |
+| main.rs:150:10:150:10 | b [tuple.0, tuple.1] | semmle.label | b [tuple.0, tuple.1] |
+| main.rs:150:10:150:12 | b.0 [tuple.1] | semmle.label | b.0 [tuple.1] |
+| main.rs:150:10:150:15 | ... .1 | semmle.label | ... .1 |
+| main.rs:163:9:163:9 | p [Point.x] | semmle.label | p [Point.x] |
+| main.rs:163:13:163:40 | Point {...} [Point.x] | semmle.label | Point {...} [Point.x] |
+| main.rs:163:24:163:32 | source(...) | semmle.label | source(...) |
+| main.rs:164:10:164:10 | p [Point.x] | semmle.label | p [Point.x] |
+| main.rs:164:10:164:12 | p.x | semmle.label | p.x |
+| main.rs:171:5:171:5 | [post] p [Point.y] | semmle.label | [post] p [Point.y] |
+| main.rs:171:11:171:20 | source(...) | semmle.label | source(...) |
+| main.rs:172:10:172:10 | p [Point.y] | semmle.label | p [Point.y] |
+| main.rs:172:10:172:12 | p.y | semmle.label | p.y |
+| main.rs:176:9:176:9 | p [Point.x] | semmle.label | p [Point.x] |
+| main.rs:176:13:179:5 | Point {...} [Point.x] | semmle.label | Point {...} [Point.x] |
+| main.rs:177:12:177:21 | source(...) | semmle.label | source(...) |
+| main.rs:180:9:180:28 | Point {...} [Point.x] | semmle.label | Point {...} [Point.x] |
+| main.rs:180:20:180:20 | a | semmle.label | a |
+| main.rs:181:10:181:10 | a | semmle.label | a |
+| main.rs:191:9:191:9 | p [Point3D.plane, Point.y] | semmle.label | p [Point3D.plane, Point.y] |
+| main.rs:191:13:197:5 | Point3D {...} [Point3D.plane, Point.y] | semmle.label | Point3D {...} [Point3D.plane, Point.y] |
+| main.rs:192:16:195:9 | Point {...} [Point.y] | semmle.label | Point {...} [Point.y] |
+| main.rs:194:16:194:25 | source(...) | semmle.label | source(...) |
+| main.rs:199:10:199:10 | p [Point3D.plane, Point.y] | semmle.label | p [Point3D.plane, Point.y] |
+| main.rs:199:10:199:16 | p.plane [Point.y] | semmle.label | p.plane [Point.y] |
+| main.rs:199:10:199:18 | ... .y | semmle.label | ... .y |
+| main.rs:204:9:204:9 | y | semmle.label | y |
+| main.rs:204:13:204:22 | source(...) | semmle.label | source(...) |
+| main.rs:205:9:205:9 | p [Point3D.plane, Point.y] | semmle.label | p [Point3D.plane, Point.y] |
+| main.rs:205:13:208:5 | Point3D {...} [Point3D.plane, Point.y] | semmle.label | Point3D {...} [Point3D.plane, Point.y] |
+| main.rs:206:16:206:32 | Point {...} [Point.y] | semmle.label | Point {...} [Point.y] |
+| main.rs:206:30:206:30 | y | semmle.label | y |
+| main.rs:209:11:209:11 | p [Point3D.plane, Point.y] | semmle.label | p [Point3D.plane, Point.y] |
+| main.rs:210:9:213:9 | Point3D {...} [Point3D.plane, Point.y] | semmle.label | Point3D {...} [Point3D.plane, Point.y] |
+| main.rs:211:20:211:33 | Point {...} [Point.y] | semmle.label | Point {...} [Point.y] |
+| main.rs:211:31:211:31 | y | semmle.label | y |
+| main.rs:215:18:215:18 | y | semmle.label | y |
+| main.rs:224:9:224:9 | s [MyTupleStruct(0)] | semmle.label | s [MyTupleStruct(0)] |
+| main.rs:224:13:224:40 | MyTupleStruct(...) [MyTupleStruct(0)] | semmle.label | MyTupleStruct(...) [MyTupleStruct(0)] |
+| main.rs:224:27:224:36 | source(...) | semmle.label | source(...) |
+| main.rs:225:10:225:10 | s [MyTupleStruct(0)] | semmle.label | s [MyTupleStruct(0)] |
+| main.rs:225:10:225:12 | s.0 | semmle.label | s.0 |
+| main.rs:228:11:228:11 | s [MyTupleStruct(0)] | semmle.label | s [MyTupleStruct(0)] |
+| main.rs:229:9:229:27 | MyTupleStruct(...) [MyTupleStruct(0)] | semmle.label | MyTupleStruct(...) [MyTupleStruct(0)] |
+| main.rs:229:23:229:23 | x | semmle.label | x |
+| main.rs:230:18:230:18 | x | semmle.label | x |
 | main.rs:240:9:240:10 | s1 [Some] | semmle.label | s1 [Some] |
-| main.rs:240:14:240:29 | Some(...) [Some] | semmle.label | Some(...) [Some] |
-| main.rs:240:19:240:28 | source(...) | semmle.label | source(...) |
-| main.rs:241:10:241:20 | s1.unwrap() | semmle.label | s1.unwrap() |
-| main.rs:245:9:245:10 | s1 [Some] | semmle.label | s1 [Some] |
-| main.rs:245:14:245:29 | Some(...) [Some] | semmle.label | Some(...) [Some] |
-| main.rs:245:19:245:28 | source(...) | semmle.label | source(...) |
-| main.rs:246:10:246:24 | s1.unwrap_or(...) | semmle.label | s1.unwrap_or(...) |
-| main.rs:249:10:249:33 | s2.unwrap_or(...) | semmle.label | s2.unwrap_or(...) |
-| main.rs:249:23:249:32 | source(...) | semmle.label | source(...) |
+| main.rs:240:14:240:37 | ...::Some(...) [Some] | semmle.label | ...::Some(...) [Some] |
+| main.rs:240:27:240:36 | source(...) | semmle.label | source(...) |
+| main.rs:242:11:242:12 | s1 [Some] | semmle.label | s1 [Some] |
+| main.rs:243:9:243:23 | ...::Some(...) [Some] | semmle.label | ...::Some(...) [Some] |
+| main.rs:243:22:243:22 | n | semmle.label | n |
+| main.rs:243:33:243:33 | n | semmle.label | n |
 | main.rs:253:9:253:10 | s1 [Some] | semmle.label | s1 [Some] |
 | main.rs:253:14:253:29 | Some(...) [Some] | semmle.label | Some(...) [Some] |
 | main.rs:253:19:253:28 | source(...) | semmle.label | source(...) |
-| main.rs:254:10:254:32 | s1.unwrap_or_else(...) | semmle.label | s1.unwrap_or_else(...) |
-| main.rs:257:10:257:41 | s2.unwrap_or_else(...) | semmle.label | s2.unwrap_or_else(...) |
-| main.rs:257:31:257:40 | source(...) | semmle.label | source(...) |
-| main.rs:261:9:261:10 | s1 [Some] | semmle.label | s1 [Some] |
-| main.rs:261:14:261:29 | Some(...) [Some] | semmle.label | Some(...) [Some] |
-| main.rs:261:19:261:28 | source(...) | semmle.label | source(...) |
-| main.rs:263:9:263:10 | i1 | semmle.label | i1 |
-| main.rs:263:14:263:15 | s1 [Some] | semmle.label | s1 [Some] |
-| main.rs:263:14:263:16 | TryExpr | semmle.label | TryExpr |
-| main.rs:264:10:264:11 | i1 | semmle.label | i1 |
-| main.rs:270:9:270:10 | r1 [Ok] | semmle.label | r1 [Ok] |
-| main.rs:270:32:270:45 | Ok(...) [Ok] | semmle.label | Ok(...) [Ok] |
-| main.rs:270:35:270:44 | source(...) | semmle.label | source(...) |
-| main.rs:271:9:271:11 | o1a [Some] | semmle.label | o1a [Some] |
-| main.rs:271:28:271:34 | r1.ok() [Some] | semmle.label | r1.ok() [Some] |
-| main.rs:273:10:273:21 | o1a.unwrap() | semmle.label | o1a.unwrap() |
-| main.rs:276:9:276:10 | r2 [Err] | semmle.label | r2 [Err] |
-| main.rs:276:32:276:46 | Err(...) [Err] | semmle.label | Err(...) [Err] |
-| main.rs:276:36:276:45 | source(...) | semmle.label | source(...) |
-| main.rs:278:9:278:11 | o2b [Some] | semmle.label | o2b [Some] |
-| main.rs:278:28:278:35 | r2.err() [Some] | semmle.label | r2.err() [Some] |
-| main.rs:280:10:280:21 | o2b.unwrap() | semmle.label | o2b.unwrap() |
-| main.rs:284:9:284:10 | s1 [Ok] | semmle.label | s1 [Ok] |
-| main.rs:284:32:284:45 | Ok(...) [Ok] | semmle.label | Ok(...) [Ok] |
-| main.rs:284:35:284:44 | source(...) | semmle.label | source(...) |
-| main.rs:287:9:287:10 | i1 | semmle.label | i1 |
-| main.rs:287:14:287:15 | s1 [Ok] | semmle.label | s1 [Ok] |
-| main.rs:287:14:287:16 | TryExpr | semmle.label | TryExpr |
-| main.rs:289:10:289:11 | i1 | semmle.label | i1 |
-| main.rs:297:9:297:10 | s1 [Ok] | semmle.label | s1 [Ok] |
-| main.rs:297:32:297:45 | Ok(...) [Ok] | semmle.label | Ok(...) [Ok] |
-| main.rs:297:35:297:44 | source(...) | semmle.label | source(...) |
-| main.rs:298:10:298:22 | s1.expect(...) | semmle.label | s1.expect(...) |
-| main.rs:301:9:301:10 | s2 [Err] | semmle.label | s2 [Err] |
-| main.rs:301:32:301:46 | Err(...) [Err] | semmle.label | Err(...) [Err] |
-| main.rs:301:36:301:45 | source(...) | semmle.label | source(...) |
-| main.rs:303:10:303:26 | s2.expect_err(...) | semmle.label | s2.expect_err(...) |
-| main.rs:312:9:312:10 | s1 [A] | semmle.label | s1 [A] |
-| main.rs:312:14:312:39 | ...::A(...) [A] | semmle.label | ...::A(...) [A] |
-| main.rs:312:29:312:38 | source(...) | semmle.label | source(...) |
-| main.rs:314:11:314:12 | s1 [A] | semmle.label | s1 [A] |
-| main.rs:315:9:315:25 | ...::A(...) [A] | semmle.label | ...::A(...) [A] |
-| main.rs:315:24:315:24 | n | semmle.label | n |
-| main.rs:315:35:315:35 | n | semmle.label | n |
-| main.rs:318:11:318:12 | s1 [A] | semmle.label | s1 [A] |
-| main.rs:319:9:319:25 | ...::A(...) [A] | semmle.label | ...::A(...) [A] |
-| main.rs:319:24:319:24 | n | semmle.label | n |
-| main.rs:319:55:319:55 | n | semmle.label | n |
-| main.rs:330:9:330:10 | s1 [A] | semmle.label | s1 [A] |
-| main.rs:330:14:330:26 | A(...) [A] | semmle.label | A(...) [A] |
-| main.rs:330:16:330:25 | source(...) | semmle.label | source(...) |
-| main.rs:332:11:332:12 | s1 [A] | semmle.label | s1 [A] |
-| main.rs:333:9:333:12 | A(...) [A] | semmle.label | A(...) [A] |
-| main.rs:333:11:333:11 | n | semmle.label | n |
-| main.rs:333:22:333:22 | n | semmle.label | n |
-| main.rs:336:11:336:12 | s1 [A] | semmle.label | s1 [A] |
-| main.rs:337:9:337:12 | A(...) [A] | semmle.label | A(...) [A] |
-| main.rs:337:11:337:11 | n | semmle.label | n |
-| main.rs:337:29:337:29 | n | semmle.label | n |
-| main.rs:351:9:351:10 | s1 [C] | semmle.label | s1 [C] |
-| main.rs:351:14:353:5 | ...::C {...} [C] | semmle.label | ...::C {...} [C] |
-| main.rs:352:18:352:27 | source(...) | semmle.label | source(...) |
-| main.rs:355:11:355:12 | s1 [C] | semmle.label | s1 [C] |
-| main.rs:356:9:356:38 | ...::C {...} [C] | semmle.label | ...::C {...} [C] |
-| main.rs:356:36:356:36 | n | semmle.label | n |
-| main.rs:356:48:356:48 | n | semmle.label | n |
-| main.rs:359:11:359:12 | s1 [C] | semmle.label | s1 [C] |
-| main.rs:360:9:360:38 | ...::C {...} [C] | semmle.label | ...::C {...} [C] |
-| main.rs:360:36:360:36 | n | semmle.label | n |
-| main.rs:360:81:360:81 | n | semmle.label | n |
-| main.rs:371:9:371:10 | s1 [C] | semmle.label | s1 [C] |
-| main.rs:371:14:373:5 | C {...} [C] | semmle.label | C {...} [C] |
-| main.rs:372:18:372:27 | source(...) | semmle.label | source(...) |
-| main.rs:375:11:375:12 | s1 [C] | semmle.label | s1 [C] |
-| main.rs:376:9:376:24 | C {...} [C] | semmle.label | C {...} [C] |
-| main.rs:376:22:376:22 | n | semmle.label | n |
-| main.rs:376:34:376:34 | n | semmle.label | n |
-| main.rs:379:11:379:12 | s1 [C] | semmle.label | s1 [C] |
-| main.rs:380:9:380:24 | C {...} [C] | semmle.label | C {...} [C] |
-| main.rs:380:22:380:22 | n | semmle.label | n |
-| main.rs:380:53:380:53 | n | semmle.label | n |
-| main.rs:392:9:392:12 | arr1 [element] | semmle.label | arr1 [element] |
-| main.rs:392:16:392:33 | [...] [element] | semmle.label | [...] [element] |
-| main.rs:392:23:392:32 | source(...) | semmle.label | source(...) |
-| main.rs:393:9:393:10 | n1 | semmle.label | n1 |
-| main.rs:393:14:393:17 | arr1 [element] | semmle.label | arr1 [element] |
-| main.rs:393:14:393:20 | arr1[2] | semmle.label | arr1[2] |
-| main.rs:394:10:394:11 | n1 | semmle.label | n1 |
-| main.rs:396:9:396:12 | arr2 [element] | semmle.label | arr2 [element] |
-| main.rs:396:16:396:31 | [...; 10] [element] | semmle.label | [...; 10] [element] |
-| main.rs:396:17:396:26 | source(...) | semmle.label | source(...) |
-| main.rs:397:9:397:10 | n2 | semmle.label | n2 |
-| main.rs:397:14:397:17 | arr2 [element] | semmle.label | arr2 [element] |
-| main.rs:397:14:397:20 | arr2[4] | semmle.label | arr2[4] |
-| main.rs:398:10:398:11 | n2 | semmle.label | n2 |
-| main.rs:406:9:406:12 | arr1 [element] | semmle.label | arr1 [element] |
-| main.rs:406:16:406:33 | [...] [element] | semmle.label | [...] [element] |
-| main.rs:406:23:406:32 | source(...) | semmle.label | source(...) |
-| main.rs:407:9:407:10 | n1 | semmle.label | n1 |
-| main.rs:407:15:407:18 | arr1 [element] | semmle.label | arr1 [element] |
-| main.rs:408:14:408:15 | n1 | semmle.label | n1 |
-| main.rs:418:9:418:12 | arr1 [element] | semmle.label | arr1 [element] |
-| main.rs:418:16:418:33 | [...] [element] | semmle.label | [...] [element] |
-| main.rs:418:23:418:32 | source(...) | semmle.label | source(...) |
-| main.rs:419:11:419:14 | arr1 [element] | semmle.label | arr1 [element] |
-| main.rs:420:9:420:17 | SlicePat [element] | semmle.label | SlicePat [element] |
-| main.rs:420:10:420:10 | a | semmle.label | a |
-| main.rs:420:13:420:13 | b | semmle.label | b |
-| main.rs:420:16:420:16 | c | semmle.label | c |
-| main.rs:421:18:421:18 | a | semmle.label | a |
-| main.rs:422:18:422:18 | b | semmle.label | b |
-| main.rs:423:18:423:18 | c | semmle.label | c |
-| main.rs:432:5:432:11 | [post] mut_arr [element] | semmle.label | [post] mut_arr [element] |
-| main.rs:432:18:432:27 | source(...) | semmle.label | source(...) |
-| main.rs:433:9:433:9 | d | semmle.label | d |
-| main.rs:433:13:433:19 | mut_arr [element] | semmle.label | mut_arr [element] |
-| main.rs:433:13:433:22 | mut_arr[1] | semmle.label | mut_arr[1] |
-| main.rs:434:10:434:10 | d | semmle.label | d |
-| main.rs:435:10:435:16 | mut_arr [element] | semmle.label | mut_arr [element] |
-| main.rs:435:10:435:19 | mut_arr[0] | semmle.label | mut_arr[0] |
-| main.rs:458:9:458:9 | s | semmle.label | s |
-| main.rs:458:25:458:26 | source(...) | semmle.label | source(...) |
-| main.rs:459:10:459:10 | s | semmle.label | s |
-| main.rs:467:9:467:9 | a | semmle.label | a |
-| main.rs:467:13:467:22 | source(...) | semmle.label | source(...) |
-| main.rs:472:10:472:10 | a | semmle.label | a |
-| main.rs:479:9:479:10 | vs [element] | semmle.label | vs [element] |
-| main.rs:479:14:479:34 | [...] [element] | semmle.label | [...] [element] |
-| main.rs:479:15:479:24 | source(...) | semmle.label | source(...) |
-| main.rs:481:10:481:11 | vs [element] | semmle.label | vs [element] |
-| main.rs:481:10:481:14 | vs[0] | semmle.label | vs[0] |
-| main.rs:485:9:485:9 | v | semmle.label | v |
-| main.rs:485:14:485:15 | vs [element] | semmle.label | vs [element] |
-| main.rs:486:14:486:14 | v | semmle.label | v |
-| main.rs:504:9:504:18 | mut vs_mut [element] | semmle.label | mut vs_mut [element] |
-| main.rs:504:22:504:42 | [...] [element] | semmle.label | [...] [element] |
-| main.rs:504:23:504:32 | source(...) | semmle.label | source(...) |
-| main.rs:506:10:506:15 | vs_mut [element] | semmle.label | vs_mut [element] |
-| main.rs:506:10:506:18 | vs_mut[0] | semmle.label | vs_mut[0] |
-| main.rs:516:9:516:9 | a | semmle.label | a |
-| main.rs:516:13:516:22 | source(...) | semmle.label | source(...) |
-| main.rs:518:9:518:9 | c | semmle.label | c |
-| main.rs:518:13:518:22 | source(...) | semmle.label | source(...) |
-| main.rs:519:9:519:13 | c_ref [&ref] | semmle.label | c_ref [&ref] |
-| main.rs:519:17:519:18 | &c [&ref] | semmle.label | &c [&ref] |
-| main.rs:519:18:519:18 | c | semmle.label | c |
-| main.rs:521:10:521:10 | a | semmle.label | a |
-| main.rs:524:10:524:15 | * ... | semmle.label | * ... |
-| main.rs:524:11:524:15 | c_ref [&ref] | semmle.label | c_ref [&ref] |
+| main.rs:255:11:255:12 | s1 [Some] | semmle.label | s1 [Some] |
+| main.rs:256:9:256:15 | Some(...) [Some] | semmle.label | Some(...) [Some] |
+| main.rs:256:14:256:14 | n | semmle.label | n |
+| main.rs:256:25:256:25 | n | semmle.label | n |
+| main.rs:266:9:266:10 | s1 [Some] | semmle.label | s1 [Some] |
+| main.rs:266:14:266:29 | Some(...) [Some] | semmle.label | Some(...) [Some] |
+| main.rs:266:19:266:28 | source(...) | semmle.label | source(...) |
+| main.rs:267:12:267:18 | Some(...) [Some] | semmle.label | Some(...) [Some] |
+| main.rs:267:17:267:17 | n | semmle.label | n |
+| main.rs:269:18:269:18 | n | semmle.label | n |
+| main.rs:273:14:273:14 | n | semmle.label | n |
+| main.rs:278:9:278:10 | s1 [Some] | semmle.label | s1 [Some] |
+| main.rs:278:14:278:29 | Some(...) [Some] | semmle.label | Some(...) [Some] |
+| main.rs:278:19:278:28 | source(...) | semmle.label | source(...) |
+| main.rs:279:10:279:20 | s1.unwrap() | semmle.label | s1.unwrap() |
+| main.rs:283:9:283:10 | s1 [Some] | semmle.label | s1 [Some] |
+| main.rs:283:14:283:29 | Some(...) [Some] | semmle.label | Some(...) [Some] |
+| main.rs:283:19:283:28 | source(...) | semmle.label | source(...) |
+| main.rs:284:10:284:24 | s1.unwrap_or(...) | semmle.label | s1.unwrap_or(...) |
+| main.rs:287:10:287:33 | s2.unwrap_or(...) | semmle.label | s2.unwrap_or(...) |
+| main.rs:287:23:287:32 | source(...) | semmle.label | source(...) |
+| main.rs:291:9:291:10 | s1 [Some] | semmle.label | s1 [Some] |
+| main.rs:291:14:291:29 | Some(...) [Some] | semmle.label | Some(...) [Some] |
+| main.rs:291:19:291:28 | source(...) | semmle.label | source(...) |
+| main.rs:292:10:292:32 | s1.unwrap_or_else(...) | semmle.label | s1.unwrap_or_else(...) |
+| main.rs:295:10:295:41 | s2.unwrap_or_else(...) | semmle.label | s2.unwrap_or_else(...) |
+| main.rs:295:31:295:40 | source(...) | semmle.label | source(...) |
+| main.rs:299:9:299:10 | s1 [Some] | semmle.label | s1 [Some] |
+| main.rs:299:14:299:29 | Some(...) [Some] | semmle.label | Some(...) [Some] |
+| main.rs:299:19:299:28 | source(...) | semmle.label | source(...) |
+| main.rs:301:9:301:10 | i1 | semmle.label | i1 |
+| main.rs:301:14:301:15 | s1 [Some] | semmle.label | s1 [Some] |
+| main.rs:301:14:301:16 | TryExpr | semmle.label | TryExpr |
+| main.rs:302:10:302:11 | i1 | semmle.label | i1 |
+| main.rs:308:9:308:10 | r1 [Ok] | semmle.label | r1 [Ok] |
+| main.rs:308:32:308:45 | Ok(...) [Ok] | semmle.label | Ok(...) [Ok] |
+| main.rs:308:35:308:44 | source(...) | semmle.label | source(...) |
+| main.rs:309:9:309:11 | o1a [Some] | semmle.label | o1a [Some] |
+| main.rs:309:28:309:34 | r1.ok() [Some] | semmle.label | r1.ok() [Some] |
+| main.rs:311:10:311:21 | o1a.unwrap() | semmle.label | o1a.unwrap() |
+| main.rs:314:9:314:10 | r2 [Err] | semmle.label | r2 [Err] |
+| main.rs:314:32:314:46 | Err(...) [Err] | semmle.label | Err(...) [Err] |
+| main.rs:314:36:314:45 | source(...) | semmle.label | source(...) |
+| main.rs:316:9:316:11 | o2b [Some] | semmle.label | o2b [Some] |
+| main.rs:316:28:316:35 | r2.err() [Some] | semmle.label | r2.err() [Some] |
+| main.rs:318:10:318:21 | o2b.unwrap() | semmle.label | o2b.unwrap() |
+| main.rs:322:9:322:10 | s1 [Ok] | semmle.label | s1 [Ok] |
+| main.rs:322:32:322:45 | Ok(...) [Ok] | semmle.label | Ok(...) [Ok] |
+| main.rs:322:35:322:44 | source(...) | semmle.label | source(...) |
+| main.rs:325:9:325:10 | i1 | semmle.label | i1 |
+| main.rs:325:14:325:15 | s1 [Ok] | semmle.label | s1 [Ok] |
+| main.rs:325:14:325:16 | TryExpr | semmle.label | TryExpr |
+| main.rs:327:10:327:11 | i1 | semmle.label | i1 |
+| main.rs:335:9:335:10 | s1 [Ok] | semmle.label | s1 [Ok] |
+| main.rs:335:32:335:45 | Ok(...) [Ok] | semmle.label | Ok(...) [Ok] |
+| main.rs:335:35:335:44 | source(...) | semmle.label | source(...) |
+| main.rs:336:10:336:22 | s1.expect(...) | semmle.label | s1.expect(...) |
+| main.rs:339:9:339:10 | s2 [Err] | semmle.label | s2 [Err] |
+| main.rs:339:32:339:46 | Err(...) [Err] | semmle.label | Err(...) [Err] |
+| main.rs:339:36:339:45 | source(...) | semmle.label | source(...) |
+| main.rs:341:10:341:26 | s2.expect_err(...) | semmle.label | s2.expect_err(...) |
+| main.rs:350:9:350:10 | s1 [A] | semmle.label | s1 [A] |
+| main.rs:350:14:350:39 | ...::A(...) [A] | semmle.label | ...::A(...) [A] |
+| main.rs:350:29:350:38 | source(...) | semmle.label | source(...) |
+| main.rs:352:11:352:12 | s1 [A] | semmle.label | s1 [A] |
+| main.rs:353:9:353:25 | ...::A(...) [A] | semmle.label | ...::A(...) [A] |
+| main.rs:353:24:353:24 | n | semmle.label | n |
+| main.rs:353:35:353:35 | n | semmle.label | n |
+| main.rs:356:11:356:12 | s1 [A] | semmle.label | s1 [A] |
+| main.rs:357:9:357:25 | ...::A(...) [A] | semmle.label | ...::A(...) [A] |
+| main.rs:357:24:357:24 | n | semmle.label | n |
+| main.rs:357:55:357:55 | n | semmle.label | n |
+| main.rs:368:9:368:10 | s1 [A] | semmle.label | s1 [A] |
+| main.rs:368:14:368:26 | A(...) [A] | semmle.label | A(...) [A] |
+| main.rs:368:16:368:25 | source(...) | semmle.label | source(...) |
+| main.rs:370:11:370:12 | s1 [A] | semmle.label | s1 [A] |
+| main.rs:371:9:371:12 | A(...) [A] | semmle.label | A(...) [A] |
+| main.rs:371:11:371:11 | n | semmle.label | n |
+| main.rs:371:22:371:22 | n | semmle.label | n |
+| main.rs:374:11:374:12 | s1 [A] | semmle.label | s1 [A] |
+| main.rs:375:9:375:12 | A(...) [A] | semmle.label | A(...) [A] |
+| main.rs:375:11:375:11 | n | semmle.label | n |
+| main.rs:375:29:375:29 | n | semmle.label | n |
+| main.rs:389:9:389:10 | s1 [C] | semmle.label | s1 [C] |
+| main.rs:389:14:391:5 | ...::C {...} [C] | semmle.label | ...::C {...} [C] |
+| main.rs:390:18:390:27 | source(...) | semmle.label | source(...) |
+| main.rs:393:11:393:12 | s1 [C] | semmle.label | s1 [C] |
+| main.rs:394:9:394:38 | ...::C {...} [C] | semmle.label | ...::C {...} [C] |
+| main.rs:394:36:394:36 | n | semmle.label | n |
+| main.rs:394:48:394:48 | n | semmle.label | n |
+| main.rs:397:11:397:12 | s1 [C] | semmle.label | s1 [C] |
+| main.rs:398:9:398:38 | ...::C {...} [C] | semmle.label | ...::C {...} [C] |
+| main.rs:398:36:398:36 | n | semmle.label | n |
+| main.rs:398:81:398:81 | n | semmle.label | n |
+| main.rs:409:9:409:10 | s1 [C] | semmle.label | s1 [C] |
+| main.rs:409:14:411:5 | C {...} [C] | semmle.label | C {...} [C] |
+| main.rs:410:18:410:27 | source(...) | semmle.label | source(...) |
+| main.rs:413:11:413:12 | s1 [C] | semmle.label | s1 [C] |
+| main.rs:414:9:414:24 | C {...} [C] | semmle.label | C {...} [C] |
+| main.rs:414:22:414:22 | n | semmle.label | n |
+| main.rs:414:34:414:34 | n | semmle.label | n |
+| main.rs:417:11:417:12 | s1 [C] | semmle.label | s1 [C] |
+| main.rs:418:9:418:24 | C {...} [C] | semmle.label | C {...} [C] |
+| main.rs:418:22:418:22 | n | semmle.label | n |
+| main.rs:418:53:418:53 | n | semmle.label | n |
+| main.rs:430:9:430:12 | arr1 [element] | semmle.label | arr1 [element] |
+| main.rs:430:16:430:33 | [...] [element] | semmle.label | [...] [element] |
+| main.rs:430:23:430:32 | source(...) | semmle.label | source(...) |
+| main.rs:431:9:431:10 | n1 | semmle.label | n1 |
+| main.rs:431:14:431:17 | arr1 [element] | semmle.label | arr1 [element] |
+| main.rs:431:14:431:20 | arr1[2] | semmle.label | arr1[2] |
+| main.rs:432:10:432:11 | n1 | semmle.label | n1 |
+| main.rs:434:9:434:12 | arr2 [element] | semmle.label | arr2 [element] |
+| main.rs:434:16:434:31 | [...; 10] [element] | semmle.label | [...; 10] [element] |
+| main.rs:434:17:434:26 | source(...) | semmle.label | source(...) |
+| main.rs:435:9:435:10 | n2 | semmle.label | n2 |
+| main.rs:435:14:435:17 | arr2 [element] | semmle.label | arr2 [element] |
+| main.rs:435:14:435:20 | arr2[4] | semmle.label | arr2[4] |
+| main.rs:436:10:436:11 | n2 | semmle.label | n2 |
+| main.rs:444:9:444:12 | arr1 [element] | semmle.label | arr1 [element] |
+| main.rs:444:16:444:33 | [...] [element] | semmle.label | [...] [element] |
+| main.rs:444:23:444:32 | source(...) | semmle.label | source(...) |
+| main.rs:445:9:445:10 | n1 | semmle.label | n1 |
+| main.rs:445:15:445:18 | arr1 [element] | semmle.label | arr1 [element] |
+| main.rs:446:14:446:15 | n1 | semmle.label | n1 |
+| main.rs:456:9:456:12 | arr1 [element] | semmle.label | arr1 [element] |
+| main.rs:456:16:456:33 | [...] [element] | semmle.label | [...] [element] |
+| main.rs:456:23:456:32 | source(...) | semmle.label | source(...) |
+| main.rs:457:11:457:14 | arr1 [element] | semmle.label | arr1 [element] |
+| main.rs:458:9:458:17 | SlicePat [element] | semmle.label | SlicePat [element] |
+| main.rs:458:10:458:10 | a | semmle.label | a |
+| main.rs:458:13:458:13 | b | semmle.label | b |
+| main.rs:458:16:458:16 | c | semmle.label | c |
+| main.rs:459:18:459:18 | a | semmle.label | a |
+| main.rs:460:18:460:18 | b | semmle.label | b |
+| main.rs:461:18:461:18 | c | semmle.label | c |
+| main.rs:470:5:470:11 | [post] mut_arr [element] | semmle.label | [post] mut_arr [element] |
+| main.rs:470:18:470:27 | source(...) | semmle.label | source(...) |
+| main.rs:471:9:471:9 | d | semmle.label | d |
+| main.rs:471:13:471:19 | mut_arr [element] | semmle.label | mut_arr [element] |
+| main.rs:471:13:471:22 | mut_arr[1] | semmle.label | mut_arr[1] |
+| main.rs:472:10:472:10 | d | semmle.label | d |
+| main.rs:473:10:473:16 | mut_arr [element] | semmle.label | mut_arr [element] |
+| main.rs:473:10:473:19 | mut_arr[0] | semmle.label | mut_arr[0] |
+| main.rs:496:9:496:9 | s | semmle.label | s |
+| main.rs:496:25:496:26 | source(...) | semmle.label | source(...) |
+| main.rs:497:10:497:10 | s | semmle.label | s |
+| main.rs:505:9:505:9 | a | semmle.label | a |
+| main.rs:505:13:505:22 | source(...) | semmle.label | source(...) |
+| main.rs:510:10:510:10 | a | semmle.label | a |
+| main.rs:517:9:517:10 | vs [element] | semmle.label | vs [element] |
+| main.rs:517:14:517:34 | [...] [element] | semmle.label | [...] [element] |
+| main.rs:517:15:517:24 | source(...) | semmle.label | source(...) |
+| main.rs:519:10:519:11 | vs [element] | semmle.label | vs [element] |
+| main.rs:519:10:519:14 | vs[0] | semmle.label | vs[0] |
+| main.rs:523:9:523:9 | v | semmle.label | v |
+| main.rs:523:14:523:15 | vs [element] | semmle.label | vs [element] |
+| main.rs:524:14:524:14 | v | semmle.label | v |
+| main.rs:542:9:542:18 | mut vs_mut [element] | semmle.label | mut vs_mut [element] |
+| main.rs:542:22:542:42 | [...] [element] | semmle.label | [...] [element] |
+| main.rs:542:23:542:32 | source(...) | semmle.label | source(...) |
+| main.rs:544:10:544:15 | vs_mut [element] | semmle.label | vs_mut [element] |
+| main.rs:544:10:544:18 | vs_mut[0] | semmle.label | vs_mut[0] |
+| main.rs:554:9:554:9 | a | semmle.label | a |
+| main.rs:554:13:554:22 | source(...) | semmle.label | source(...) |
+| main.rs:556:9:556:9 | c | semmle.label | c |
+| main.rs:556:13:556:22 | source(...) | semmle.label | source(...) |
+| main.rs:557:9:557:13 | c_ref [&ref] | semmle.label | c_ref [&ref] |
+| main.rs:557:17:557:18 | &c [&ref] | semmle.label | &c [&ref] |
+| main.rs:557:18:557:18 | c | semmle.label | c |
+| main.rs:559:10:559:10 | a | semmle.label | a |
+| main.rs:562:10:562:15 | * ... | semmle.label | * ... |
+| main.rs:562:11:562:15 | c_ref [&ref] | semmle.label | c_ref [&ref] |
 subpaths
 testFailures
 #select
-| main.rs:18:10:18:18 | source(...) | main.rs:18:10:18:18 | source(...) | main.rs:18:10:18:18 | source(...) | $@ | main.rs:18:10:18:18 | source(...) | source(...) |
-| main.rs:23:10:23:10 | s | main.rs:22:13:22:21 | source(...) | main.rs:23:10:23:10 | s | $@ | main.rs:22:13:22:21 | source(...) | source(...) |
-| main.rs:30:10:30:10 | c | main.rs:27:13:27:21 | source(...) | main.rs:30:10:30:10 | c | $@ | main.rs:27:13:27:21 | source(...) | source(...) |
-| main.rs:39:10:39:10 | b | main.rs:34:13:34:21 | source(...) | main.rs:39:10:39:10 | b | $@ | main.rs:34:13:34:21 | source(...) | source(...) |
-| main.rs:50:10:50:10 | b | main.rs:48:15:48:23 | source(...) | main.rs:50:10:50:10 | b | $@ | main.rs:48:15:48:23 | source(...) | source(...) |
-| main.rs:57:10:57:10 | i | main.rs:56:9:56:17 | source(...) | main.rs:57:10:57:10 | i | $@ | main.rs:56:9:56:17 | source(...) | source(...) |
-| main.rs:90:10:90:11 | * ... | main.rs:89:22:89:30 | source(...) | main.rs:90:10:90:11 | * ... | $@ | main.rs:89:22:89:30 | source(...) | source(...) |
-| main.rs:98:10:98:12 | a.0 | main.rs:97:14:97:22 | source(...) | main.rs:98:10:98:12 | a.0 | $@ | main.rs:97:14:97:22 | source(...) | source(...) |
-| main.rs:106:10:106:11 | a1 | main.rs:103:17:103:26 | source(...) | main.rs:106:10:106:11 | a1 | $@ | main.rs:103:17:103:26 | source(...) | source(...) |
-| main.rs:113:10:113:12 | a.1 | main.rs:111:21:111:30 | source(...) | main.rs:113:10:113:12 | a.1 | $@ | main.rs:111:21:111:30 | source(...) | source(...) |
-| main.rs:116:10:116:12 | a.0 | main.rs:114:11:114:20 | source(...) | main.rs:116:10:116:12 | a.0 | $@ | main.rs:114:11:114:20 | source(...) | source(...) |
-| main.rs:124:10:124:15 | ... .1 | main.rs:121:17:121:26 | source(...) | main.rs:124:10:124:15 | ... .1 | $@ | main.rs:121:17:121:26 | source(...) | source(...) |
-| main.rs:138:10:138:12 | p.x | main.rs:137:24:137:32 | source(...) | main.rs:138:10:138:12 | p.x | $@ | main.rs:137:24:137:32 | source(...) | source(...) |
-| main.rs:146:10:146:12 | p.y | main.rs:145:11:145:20 | source(...) | main.rs:146:10:146:12 | p.y | $@ | main.rs:145:11:145:20 | source(...) | source(...) |
-| main.rs:155:10:155:10 | a | main.rs:151:12:151:21 | source(...) | main.rs:155:10:155:10 | a | $@ | main.rs:151:12:151:21 | source(...) | source(...) |
-| main.rs:173:10:173:18 | ... .y | main.rs:168:16:168:25 | source(...) | main.rs:173:10:173:18 | ... .y | $@ | main.rs:168:16:168:25 | source(...) | source(...) |
-| main.rs:189:18:189:18 | y | main.rs:178:13:178:22 | source(...) | main.rs:189:18:189:18 | y | $@ | main.rs:178:13:178:22 | source(...) | source(...) |
-| main.rs:199:10:199:12 | s.0 | main.rs:198:27:198:36 | source(...) | main.rs:199:10:199:12 | s.0 | $@ | main.rs:198:27:198:36 | source(...) | source(...) |
-| main.rs:204:18:204:18 | x | main.rs:198:27:198:36 | source(...) | main.rs:204:18:204:18 | x | $@ | main.rs:198:27:198:36 | source(...) | source(...) |
-| main.rs:217:33:217:33 | n | main.rs:214:27:214:36 | source(...) | main.rs:217:33:217:33 | n | $@ | main.rs:214:27:214:36 | source(...) | source(...) |
-| main.rs:230:25:230:25 | n | main.rs:227:19:227:28 | source(...) | main.rs:230:25:230:25 | n | $@ | main.rs:227:19:227:28 | source(...) | source(...) |
-| main.rs:241:10:241:20 | s1.unwrap() | main.rs:240:19:240:28 | source(...) | main.rs:241:10:241:20 | s1.unwrap() | $@ | main.rs:240:19:240:28 | source(...) | source(...) |
-| main.rs:246:10:246:24 | s1.unwrap_or(...) | main.rs:245:19:245:28 | source(...) | main.rs:246:10:246:24 | s1.unwrap_or(...) | $@ | main.rs:245:19:245:28 | source(...) | source(...) |
-| main.rs:249:10:249:33 | s2.unwrap_or(...) | main.rs:249:23:249:32 | source(...) | main.rs:249:10:249:33 | s2.unwrap_or(...) | $@ | main.rs:249:23:249:32 | source(...) | source(...) |
-| main.rs:254:10:254:32 | s1.unwrap_or_else(...) | main.rs:253:19:253:28 | source(...) | main.rs:254:10:254:32 | s1.unwrap_or_else(...) | $@ | main.rs:253:19:253:28 | source(...) | source(...) |
-| main.rs:257:10:257:41 | s2.unwrap_or_else(...) | main.rs:257:31:257:40 | source(...) | main.rs:257:10:257:41 | s2.unwrap_or_else(...) | $@ | main.rs:257:31:257:40 | source(...) | source(...) |
-| main.rs:264:10:264:11 | i1 | main.rs:261:19:261:28 | source(...) | main.rs:264:10:264:11 | i1 | $@ | main.rs:261:19:261:28 | source(...) | source(...) |
-| main.rs:273:10:273:21 | o1a.unwrap() | main.rs:270:35:270:44 | source(...) | main.rs:273:10:273:21 | o1a.unwrap() | $@ | main.rs:270:35:270:44 | source(...) | source(...) |
-| main.rs:280:10:280:21 | o2b.unwrap() | main.rs:276:36:276:45 | source(...) | main.rs:280:10:280:21 | o2b.unwrap() | $@ | main.rs:276:36:276:45 | source(...) | source(...) |
-| main.rs:289:10:289:11 | i1 | main.rs:284:35:284:44 | source(...) | main.rs:289:10:289:11 | i1 | $@ | main.rs:284:35:284:44 | source(...) | source(...) |
-| main.rs:298:10:298:22 | s1.expect(...) | main.rs:297:35:297:44 | source(...) | main.rs:298:10:298:22 | s1.expect(...) | $@ | main.rs:297:35:297:44 | source(...) | source(...) |
-| main.rs:303:10:303:26 | s2.expect_err(...) | main.rs:301:36:301:45 | source(...) | main.rs:303:10:303:26 | s2.expect_err(...) | $@ | main.rs:301:36:301:45 | source(...) | source(...) |
-| main.rs:315:35:315:35 | n | main.rs:312:29:312:38 | source(...) | main.rs:315:35:315:35 | n | $@ | main.rs:312:29:312:38 | source(...) | source(...) |
-| main.rs:319:55:319:55 | n | main.rs:312:29:312:38 | source(...) | main.rs:319:55:319:55 | n | $@ | main.rs:312:29:312:38 | source(...) | source(...) |
-| main.rs:333:22:333:22 | n | main.rs:330:16:330:25 | source(...) | main.rs:333:22:333:22 | n | $@ | main.rs:330:16:330:25 | source(...) | source(...) |
-| main.rs:337:29:337:29 | n | main.rs:330:16:330:25 | source(...) | main.rs:337:29:337:29 | n | $@ | main.rs:330:16:330:25 | source(...) | source(...) |
-| main.rs:356:48:356:48 | n | main.rs:352:18:352:27 | source(...) | main.rs:356:48:356:48 | n | $@ | main.rs:352:18:352:27 | source(...) | source(...) |
-| main.rs:360:81:360:81 | n | main.rs:352:18:352:27 | source(...) | main.rs:360:81:360:81 | n | $@ | main.rs:352:18:352:27 | source(...) | source(...) |
-| main.rs:376:34:376:34 | n | main.rs:372:18:372:27 | source(...) | main.rs:376:34:376:34 | n | $@ | main.rs:372:18:372:27 | source(...) | source(...) |
-| main.rs:380:53:380:53 | n | main.rs:372:18:372:27 | source(...) | main.rs:380:53:380:53 | n | $@ | main.rs:372:18:372:27 | source(...) | source(...) |
-| main.rs:394:10:394:11 | n1 | main.rs:392:23:392:32 | source(...) | main.rs:394:10:394:11 | n1 | $@ | main.rs:392:23:392:32 | source(...) | source(...) |
-| main.rs:398:10:398:11 | n2 | main.rs:396:17:396:26 | source(...) | main.rs:398:10:398:11 | n2 | $@ | main.rs:396:17:396:26 | source(...) | source(...) |
-| main.rs:408:14:408:15 | n1 | main.rs:406:23:406:32 | source(...) | main.rs:408:14:408:15 | n1 | $@ | main.rs:406:23:406:32 | source(...) | source(...) |
-| main.rs:421:18:421:18 | a | main.rs:418:23:418:32 | source(...) | main.rs:421:18:421:18 | a | $@ | main.rs:418:23:418:32 | source(...) | source(...) |
-| main.rs:422:18:422:18 | b | main.rs:418:23:418:32 | source(...) | main.rs:422:18:422:18 | b | $@ | main.rs:418:23:418:32 | source(...) | source(...) |
-| main.rs:423:18:423:18 | c | main.rs:418:23:418:32 | source(...) | main.rs:423:18:423:18 | c | $@ | main.rs:418:23:418:32 | source(...) | source(...) |
-| main.rs:434:10:434:10 | d | main.rs:432:18:432:27 | source(...) | main.rs:434:10:434:10 | d | $@ | main.rs:432:18:432:27 | source(...) | source(...) |
-| main.rs:435:10:435:19 | mut_arr[0] | main.rs:432:18:432:27 | source(...) | main.rs:435:10:435:19 | mut_arr[0] | $@ | main.rs:432:18:432:27 | source(...) | source(...) |
-| main.rs:459:10:459:10 | s | main.rs:458:25:458:26 | source(...) | main.rs:459:10:459:10 | s | $@ | main.rs:458:25:458:26 | source(...) | source(...) |
-| main.rs:472:10:472:10 | a | main.rs:467:13:467:22 | source(...) | main.rs:472:10:472:10 | a | $@ | main.rs:467:13:467:22 | source(...) | source(...) |
-| main.rs:481:10:481:14 | vs[0] | main.rs:479:15:479:24 | source(...) | main.rs:481:10:481:14 | vs[0] | $@ | main.rs:479:15:479:24 | source(...) | source(...) |
-| main.rs:486:14:486:14 | v | main.rs:479:15:479:24 | source(...) | main.rs:486:14:486:14 | v | $@ | main.rs:479:15:479:24 | source(...) | source(...) |
-| main.rs:506:10:506:18 | vs_mut[0] | main.rs:504:23:504:32 | source(...) | main.rs:506:10:506:18 | vs_mut[0] | $@ | main.rs:504:23:504:32 | source(...) | source(...) |
-| main.rs:521:10:521:10 | a | main.rs:516:13:516:22 | source(...) | main.rs:521:10:521:10 | a | $@ | main.rs:516:13:516:22 | source(...) | source(...) |
-| main.rs:524:10:524:15 | * ... | main.rs:518:13:518:22 | source(...) | main.rs:524:10:524:15 | * ... | $@ | main.rs:518:13:518:22 | source(...) | source(...) |
+| main.rs:19:10:19:18 | source(...) | main.rs:19:10:19:18 | source(...) | main.rs:19:10:19:18 | source(...) | $@ | main.rs:19:10:19:18 | source(...) | source(...) |
+| main.rs:24:10:24:10 | s | main.rs:23:13:23:21 | source(...) | main.rs:24:10:24:10 | s | $@ | main.rs:23:13:23:21 | source(...) | source(...) |
+| main.rs:27:14:27:14 | x | main.rs:23:13:23:21 | source(...) | main.rs:27:14:27:14 | x | $@ | main.rs:23:13:23:21 | source(...) | source(...) |
+| main.rs:32:18:32:18 | x | main.rs:23:13:23:21 | source(...) | main.rs:32:18:32:18 | x | $@ | main.rs:23:13:23:21 | source(...) | source(...) |
+| main.rs:36:14:36:14 | x | main.rs:23:13:23:21 | source(...) | main.rs:36:14:36:14 | x | $@ | main.rs:23:13:23:21 | source(...) | source(...) |
+| main.rs:44:10:44:10 | c | main.rs:41:13:41:21 | source(...) | main.rs:44:10:44:10 | c | $@ | main.rs:41:13:41:21 | source(...) | source(...) |
+| main.rs:53:10:53:10 | b | main.rs:48:13:48:21 | source(...) | main.rs:53:10:53:10 | b | $@ | main.rs:48:13:48:21 | source(...) | source(...) |
+| main.rs:64:10:64:10 | b | main.rs:62:15:62:23 | source(...) | main.rs:64:10:64:10 | b | $@ | main.rs:62:15:62:23 | source(...) | source(...) |
+| main.rs:71:10:71:10 | i | main.rs:70:9:70:17 | source(...) | main.rs:71:10:71:10 | i | $@ | main.rs:70:9:70:17 | source(...) | source(...) |
+| main.rs:78:10:78:10 | j | main.rs:76:13:76:21 | source(...) | main.rs:78:10:78:10 | j | $@ | main.rs:76:13:76:21 | source(...) | source(...) |
+| main.rs:79:10:79:10 | k | main.rs:76:13:76:21 | source(...) | main.rs:79:10:79:10 | k | $@ | main.rs:76:13:76:21 | source(...) | source(...) |
+| main.rs:83:10:83:10 | l | main.rs:81:17:81:25 | source(...) | main.rs:83:10:83:10 | l | $@ | main.rs:81:17:81:25 | source(...) | source(...) |
+| main.rs:116:10:116:11 | * ... | main.rs:115:22:115:30 | source(...) | main.rs:116:10:116:11 | * ... | $@ | main.rs:115:22:115:30 | source(...) | source(...) |
+| main.rs:124:10:124:12 | a.0 | main.rs:123:14:123:22 | source(...) | main.rs:124:10:124:12 | a.0 | $@ | main.rs:123:14:123:22 | source(...) | source(...) |
+| main.rs:132:10:132:11 | a1 | main.rs:129:17:129:26 | source(...) | main.rs:132:10:132:11 | a1 | $@ | main.rs:129:17:129:26 | source(...) | source(...) |
+| main.rs:139:10:139:12 | a.1 | main.rs:137:21:137:30 | source(...) | main.rs:139:10:139:12 | a.1 | $@ | main.rs:137:21:137:30 | source(...) | source(...) |
+| main.rs:142:10:142:12 | a.0 | main.rs:140:11:140:20 | source(...) | main.rs:142:10:142:12 | a.0 | $@ | main.rs:140:11:140:20 | source(...) | source(...) |
+| main.rs:150:10:150:15 | ... .1 | main.rs:147:17:147:26 | source(...) | main.rs:150:10:150:15 | ... .1 | $@ | main.rs:147:17:147:26 | source(...) | source(...) |
+| main.rs:164:10:164:12 | p.x | main.rs:163:24:163:32 | source(...) | main.rs:164:10:164:12 | p.x | $@ | main.rs:163:24:163:32 | source(...) | source(...) |
+| main.rs:172:10:172:12 | p.y | main.rs:171:11:171:20 | source(...) | main.rs:172:10:172:12 | p.y | $@ | main.rs:171:11:171:20 | source(...) | source(...) |
+| main.rs:181:10:181:10 | a | main.rs:177:12:177:21 | source(...) | main.rs:181:10:181:10 | a | $@ | main.rs:177:12:177:21 | source(...) | source(...) |
+| main.rs:199:10:199:18 | ... .y | main.rs:194:16:194:25 | source(...) | main.rs:199:10:199:18 | ... .y | $@ | main.rs:194:16:194:25 | source(...) | source(...) |
+| main.rs:215:18:215:18 | y | main.rs:204:13:204:22 | source(...) | main.rs:215:18:215:18 | y | $@ | main.rs:204:13:204:22 | source(...) | source(...) |
+| main.rs:225:10:225:12 | s.0 | main.rs:224:27:224:36 | source(...) | main.rs:225:10:225:12 | s.0 | $@ | main.rs:224:27:224:36 | source(...) | source(...) |
+| main.rs:230:18:230:18 | x | main.rs:224:27:224:36 | source(...) | main.rs:230:18:230:18 | x | $@ | main.rs:224:27:224:36 | source(...) | source(...) |
+| main.rs:243:33:243:33 | n | main.rs:240:27:240:36 | source(...) | main.rs:243:33:243:33 | n | $@ | main.rs:240:27:240:36 | source(...) | source(...) |
+| main.rs:256:25:256:25 | n | main.rs:253:19:253:28 | source(...) | main.rs:256:25:256:25 | n | $@ | main.rs:253:19:253:28 | source(...) | source(...) |
+| main.rs:269:18:269:18 | n | main.rs:266:19:266:28 | source(...) | main.rs:269:18:269:18 | n | $@ | main.rs:266:19:266:28 | source(...) | source(...) |
+| main.rs:273:14:273:14 | n | main.rs:266:19:266:28 | source(...) | main.rs:273:14:273:14 | n | $@ | main.rs:266:19:266:28 | source(...) | source(...) |
+| main.rs:279:10:279:20 | s1.unwrap() | main.rs:278:19:278:28 | source(...) | main.rs:279:10:279:20 | s1.unwrap() | $@ | main.rs:278:19:278:28 | source(...) | source(...) |
+| main.rs:284:10:284:24 | s1.unwrap_or(...) | main.rs:283:19:283:28 | source(...) | main.rs:284:10:284:24 | s1.unwrap_or(...) | $@ | main.rs:283:19:283:28 | source(...) | source(...) |
+| main.rs:287:10:287:33 | s2.unwrap_or(...) | main.rs:287:23:287:32 | source(...) | main.rs:287:10:287:33 | s2.unwrap_or(...) | $@ | main.rs:287:23:287:32 | source(...) | source(...) |
+| main.rs:292:10:292:32 | s1.unwrap_or_else(...) | main.rs:291:19:291:28 | source(...) | main.rs:292:10:292:32 | s1.unwrap_or_else(...) | $@ | main.rs:291:19:291:28 | source(...) | source(...) |
+| main.rs:295:10:295:41 | s2.unwrap_or_else(...) | main.rs:295:31:295:40 | source(...) | main.rs:295:10:295:41 | s2.unwrap_or_else(...) | $@ | main.rs:295:31:295:40 | source(...) | source(...) |
+| main.rs:302:10:302:11 | i1 | main.rs:299:19:299:28 | source(...) | main.rs:302:10:302:11 | i1 | $@ | main.rs:299:19:299:28 | source(...) | source(...) |
+| main.rs:311:10:311:21 | o1a.unwrap() | main.rs:308:35:308:44 | source(...) | main.rs:311:10:311:21 | o1a.unwrap() | $@ | main.rs:308:35:308:44 | source(...) | source(...) |
+| main.rs:318:10:318:21 | o2b.unwrap() | main.rs:314:36:314:45 | source(...) | main.rs:318:10:318:21 | o2b.unwrap() | $@ | main.rs:314:36:314:45 | source(...) | source(...) |
+| main.rs:327:10:327:11 | i1 | main.rs:322:35:322:44 | source(...) | main.rs:327:10:327:11 | i1 | $@ | main.rs:322:35:322:44 | source(...) | source(...) |
+| main.rs:336:10:336:22 | s1.expect(...) | main.rs:335:35:335:44 | source(...) | main.rs:336:10:336:22 | s1.expect(...) | $@ | main.rs:335:35:335:44 | source(...) | source(...) |
+| main.rs:341:10:341:26 | s2.expect_err(...) | main.rs:339:36:339:45 | source(...) | main.rs:341:10:341:26 | s2.expect_err(...) | $@ | main.rs:339:36:339:45 | source(...) | source(...) |
+| main.rs:353:35:353:35 | n | main.rs:350:29:350:38 | source(...) | main.rs:353:35:353:35 | n | $@ | main.rs:350:29:350:38 | source(...) | source(...) |
+| main.rs:357:55:357:55 | n | main.rs:350:29:350:38 | source(...) | main.rs:357:55:357:55 | n | $@ | main.rs:350:29:350:38 | source(...) | source(...) |
+| main.rs:371:22:371:22 | n | main.rs:368:16:368:25 | source(...) | main.rs:371:22:371:22 | n | $@ | main.rs:368:16:368:25 | source(...) | source(...) |
+| main.rs:375:29:375:29 | n | main.rs:368:16:368:25 | source(...) | main.rs:375:29:375:29 | n | $@ | main.rs:368:16:368:25 | source(...) | source(...) |
+| main.rs:394:48:394:48 | n | main.rs:390:18:390:27 | source(...) | main.rs:394:48:394:48 | n | $@ | main.rs:390:18:390:27 | source(...) | source(...) |
+| main.rs:398:81:398:81 | n | main.rs:390:18:390:27 | source(...) | main.rs:398:81:398:81 | n | $@ | main.rs:390:18:390:27 | source(...) | source(...) |
+| main.rs:414:34:414:34 | n | main.rs:410:18:410:27 | source(...) | main.rs:414:34:414:34 | n | $@ | main.rs:410:18:410:27 | source(...) | source(...) |
+| main.rs:418:53:418:53 | n | main.rs:410:18:410:27 | source(...) | main.rs:418:53:418:53 | n | $@ | main.rs:410:18:410:27 | source(...) | source(...) |
+| main.rs:432:10:432:11 | n1 | main.rs:430:23:430:32 | source(...) | main.rs:432:10:432:11 | n1 | $@ | main.rs:430:23:430:32 | source(...) | source(...) |
+| main.rs:436:10:436:11 | n2 | main.rs:434:17:434:26 | source(...) | main.rs:436:10:436:11 | n2 | $@ | main.rs:434:17:434:26 | source(...) | source(...) |
+| main.rs:446:14:446:15 | n1 | main.rs:444:23:444:32 | source(...) | main.rs:446:14:446:15 | n1 | $@ | main.rs:444:23:444:32 | source(...) | source(...) |
+| main.rs:459:18:459:18 | a | main.rs:456:23:456:32 | source(...) | main.rs:459:18:459:18 | a | $@ | main.rs:456:23:456:32 | source(...) | source(...) |
+| main.rs:460:18:460:18 | b | main.rs:456:23:456:32 | source(...) | main.rs:460:18:460:18 | b | $@ | main.rs:456:23:456:32 | source(...) | source(...) |
+| main.rs:461:18:461:18 | c | main.rs:456:23:456:32 | source(...) | main.rs:461:18:461:18 | c | $@ | main.rs:456:23:456:32 | source(...) | source(...) |
+| main.rs:472:10:472:10 | d | main.rs:470:18:470:27 | source(...) | main.rs:472:10:472:10 | d | $@ | main.rs:470:18:470:27 | source(...) | source(...) |
+| main.rs:473:10:473:19 | mut_arr[0] | main.rs:470:18:470:27 | source(...) | main.rs:473:10:473:19 | mut_arr[0] | $@ | main.rs:470:18:470:27 | source(...) | source(...) |
+| main.rs:497:10:497:10 | s | main.rs:496:25:496:26 | source(...) | main.rs:497:10:497:10 | s | $@ | main.rs:496:25:496:26 | source(...) | source(...) |
+| main.rs:510:10:510:10 | a | main.rs:505:13:505:22 | source(...) | main.rs:510:10:510:10 | a | $@ | main.rs:505:13:505:22 | source(...) | source(...) |
+| main.rs:519:10:519:14 | vs[0] | main.rs:517:15:517:24 | source(...) | main.rs:519:10:519:14 | vs[0] | $@ | main.rs:517:15:517:24 | source(...) | source(...) |
+| main.rs:524:14:524:14 | v | main.rs:517:15:517:24 | source(...) | main.rs:524:14:524:14 | v | $@ | main.rs:517:15:517:24 | source(...) | source(...) |
+| main.rs:544:10:544:18 | vs_mut[0] | main.rs:542:23:542:32 | source(...) | main.rs:544:10:544:18 | vs_mut[0] | $@ | main.rs:542:23:542:32 | source(...) | source(...) |
+| main.rs:559:10:559:10 | a | main.rs:554:13:554:22 | source(...) | main.rs:559:10:559:10 | a | $@ | main.rs:554:13:554:22 | source(...) | source(...) |
+| main.rs:562:10:562:15 | * ... | main.rs:556:13:556:22 | source(...) | main.rs:562:10:562:15 | * ... | $@ | main.rs:556:13:556:22 | source(...) | source(...) |
diff --git a/rust/ql/test/library-tests/dataflow/local/main.rs b/rust/ql/test/library-tests/dataflow/local/main.rs
index f7349eee6d8..b3c40bd4513 100644
--- a/rust/ql/test/library-tests/dataflow/local/main.rs
+++ b/rust/ql/test/library-tests/dataflow/local/main.rs
@@ -1,3 +1,4 @@
+#![feature(let_chains)]
 // Tests for intraprocedural data flow.
 
 fn source(i: i64) -> i64 {
@@ -21,6 +22,19 @@ fn direct() {
 fn variable_usage() {
     let s = source(2);
     sink(s); // $ hasValueFlow=2
+
+    if let x = s {
+        sink(x); // $ hasValueFlow=2
+    };
+
+    if let x = s
+        && {
+            sink(x); // $ hasValueFlow=2
+            true
+        }
+    {
+        sink(x); // $ hasValueFlow=2
+    };
 }
 
 fn if_expression(cond: bool) {
@@ -55,6 +69,18 @@ fn assignment() {
     sink(i);
     i = source(6);
     sink(i); // $ hasValueFlow=6
+    i = 2;
+    sink(i);
+
+    let mut j = 3;
+    let k = source(7);
+    j = k;
+    sink(j); // $ hasValueFlow=7
+    sink(k); // $ hasValueFlow=7
+
+    let mut l = source(8);
+    l = l;
+    sink(l); // $ hasValueFlow=8
 }
 
 fn block_expression1() -> i64 {
@@ -236,6 +262,18 @@ fn option_pattern_match_unqualified() {
     }
 }
 
+fn option_chained_let() {
+    let s1 = Some(source(45));
+    if let Some(n) = s1
+        && {
+            sink(n); // $ hasValueFlow=45
+            true
+        }
+    {
+        sink(n); // $ hasValueFlow=45
+    }
+}
+
 fn option_unwrap() {
     let s1 = Some(source(19));
     sink(s1.unwrap()); // $ hasValueFlow=19
@@ -470,9 +508,9 @@ fn parse() {
     let d: i64 = b.parse().unwrap();
 
     sink(a); // $ hasValueFlow=90
-    sink_string(b); // $ MISSING: we are not currently able to resolve the `to_string` call above, which comes from `impl<T: fmt::Display + ?Sized> ToString for T`
-    sink(c); // $ MISSING: hasTaintFlow=90 - we are not currently able to resolve the `parse` call above
-    sink(d); // $ MISSING: hasTaintFlow=90 - we are not currently able to resolve the `parse` call above
+    sink_string(b); // $ hasTaintFlow=90
+    sink(c); // $ hasTaintFlow=90
+    sink(d); // $ hasTaintFlow=90
 }
 
 fn iterators() {
@@ -558,6 +596,7 @@ fn main() {
     struct_nested_match();
     option_pattern_match_qualified();
     option_pattern_match_unqualified();
+    option_chained_let();
     option_unwrap();
     option_unwrap_or();
     option_questionmark();
diff --git a/rust/ql/test/library-tests/dataflow/local/options.yml b/rust/ql/test/library-tests/dataflow/local/options.yml
new file mode 100644
index 00000000000..a394083e521
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/local/options.yml
@@ -0,0 +1 @@
+qltest_use_nightly: true
diff --git a/rust/ql/test/library-tests/dataflow/modeled/inline-flow.expected b/rust/ql/test/library-tests/dataflow/modeled/inline-flow.expected
index bd2bfe9880e..3a9e28258d5 100644
--- a/rust/ql/test/library-tests/dataflow/modeled/inline-flow.expected
+++ b/rust/ql/test/library-tests/dataflow/modeled/inline-flow.expected
@@ -6,16 +6,14 @@ models
 | 5 | Summary: <core::i64 as core::clone::Clone>::clone; Argument[self].Reference; ReturnValue; value |
 | 6 | Summary: <core::option::Option>::unwrap; Argument[self].Field[core::option::Option::Some(0)]; ReturnValue; value |
 | 7 | Summary: <core::option::Option>::zip; Argument[0].Field[core::option::Option::Some(0)]; ReturnValue.Field[core::option::Option::Some(0)].Field[1]; value |
-| 8 | Summary: <core::pin::Pin>::into_inner; Argument[0].Field[core::pin::Pin::__pointer]; ReturnValue; value |
-| 9 | Summary: <core::pin::Pin>::into_inner; Argument[0]; ReturnValue; value |
-| 10 | Summary: <core::pin::Pin>::into_inner_unchecked; Argument[0]; ReturnValue; value |
-| 11 | Summary: <core::pin::Pin>::new; Argument[0].Reference; ReturnValue; value |
-| 12 | Summary: <core::pin::Pin>::new; Argument[0]; ReturnValue.Field[core::pin::Pin::__pointer]; value |
-| 13 | Summary: <core::pin::Pin>::new; Argument[0]; ReturnValue; value |
-| 14 | Summary: <core::pin::Pin>::new_unchecked; Argument[0].Reference; ReturnValue; value |
-| 15 | Summary: <core::result::Result>::unwrap; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
-| 16 | Summary: core::ptr::read; Argument[0].Reference; ReturnValue; value |
-| 17 | Summary: core::ptr::write; Argument[1]; Argument[0].Reference; value |
+| 8 | Summary: <core::pin::Pin>::into_inner; Argument[0]; ReturnValue; value |
+| 9 | Summary: <core::pin::Pin>::into_inner_unchecked; Argument[0]; ReturnValue; value |
+| 10 | Summary: <core::pin::Pin>::new; Argument[0].Reference; ReturnValue; value |
+| 11 | Summary: <core::pin::Pin>::new; Argument[0]; ReturnValue; value |
+| 12 | Summary: <core::pin::Pin>::new_unchecked; Argument[0].Reference; ReturnValue; value |
+| 13 | Summary: <core::result::Result>::unwrap; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
+| 14 | Summary: core::ptr::read; Argument[0].Reference; ReturnValue; value |
+| 15 | Summary: core::ptr::write; Argument[1]; Argument[0].Reference; value |
 edges
 | main.rs:12:9:12:9 | a [Some] | main.rs:13:10:13:19 | a.unwrap() | provenance | MaD:6 |
 | main.rs:12:9:12:9 | a [Some] | main.rs:14:13:14:13 | a [Some] | provenance |  |
@@ -24,11 +22,11 @@ edges
 | main.rs:14:9:14:9 | b [Some] | main.rs:15:10:15:19 | b.unwrap() | provenance | MaD:6 |
 | main.rs:14:13:14:13 | a [Some] | main.rs:14:13:14:21 | a.clone() [Some] | provenance | MaD:1 |
 | main.rs:14:13:14:21 | a.clone() [Some] | main.rs:14:9:14:9 | b [Some] | provenance |  |
-| main.rs:19:9:19:9 | a [Ok] | main.rs:20:10:20:19 | a.unwrap() | provenance | MaD:15 |
+| main.rs:19:9:19:9 | a [Ok] | main.rs:20:10:20:19 | a.unwrap() | provenance | MaD:13 |
 | main.rs:19:9:19:9 | a [Ok] | main.rs:21:13:21:13 | a [Ok] | provenance |  |
 | main.rs:19:31:19:44 | Ok(...) [Ok] | main.rs:19:9:19:9 | a [Ok] | provenance |  |
 | main.rs:19:34:19:43 | source(...) | main.rs:19:31:19:44 | Ok(...) [Ok] | provenance |  |
-| main.rs:21:9:21:9 | b [Ok] | main.rs:22:10:22:19 | b.unwrap() | provenance | MaD:15 |
+| main.rs:21:9:21:9 | b [Ok] | main.rs:22:10:22:19 | b.unwrap() | provenance | MaD:13 |
 | main.rs:21:13:21:13 | a [Ok] | main.rs:21:13:21:21 | a.clone() [Ok] | provenance | MaD:1 |
 | main.rs:21:13:21:21 | a.clone() [Ok] | main.rs:21:9:21:9 | b [Ok] | provenance |  |
 | main.rs:26:9:26:9 | a | main.rs:27:10:27:10 | a | provenance |  |
@@ -66,8 +64,8 @@ edges
 | main.rs:69:18:69:23 | TuplePat [tuple.1] | main.rs:69:22:69:22 | m | provenance |  |
 | main.rs:69:22:69:22 | m | main.rs:71:22:71:22 | m | provenance |  |
 | main.rs:92:29:92:29 | [post] y [&ref] | main.rs:93:33:93:33 | y [&ref] | provenance |  |
-| main.rs:92:32:92:41 | source(...) | main.rs:92:29:92:29 | [post] y [&ref] | provenance | MaD:17 |
-| main.rs:93:33:93:33 | y [&ref] | main.rs:93:18:93:34 | ...::read(...) | provenance | MaD:16 |
+| main.rs:92:32:92:41 | source(...) | main.rs:92:29:92:29 | [post] y [&ref] | provenance | MaD:15 |
+| main.rs:93:33:93:33 | y [&ref] | main.rs:93:18:93:34 | ...::read(...) | provenance | MaD:14 |
 | main.rs:108:13:108:17 | mut i | main.rs:109:34:109:34 | i | provenance |  |
 | main.rs:108:13:108:17 | mut i | main.rs:110:33:110:33 | i | provenance |  |
 | main.rs:108:13:108:17 | mut i | main.rs:111:47:111:47 | i | provenance |  |
@@ -75,11 +73,8 @@ edges
 | main.rs:108:21:108:30 | source(...) | main.rs:108:13:108:17 | mut i | provenance |  |
 | main.rs:109:13:109:20 | mut pin1 [&ref] | main.rs:114:15:114:18 | pin1 [&ref] | provenance |  |
 | main.rs:109:13:109:20 | mut pin1 [&ref] | main.rs:115:31:115:34 | pin1 [&ref] | provenance |  |
-| main.rs:109:13:109:20 | mut pin1 [Pin, &ref] | main.rs:115:31:115:34 | pin1 [Pin, &ref] | provenance |  |
 | main.rs:109:24:109:35 | ...::new(...) [&ref] | main.rs:109:13:109:20 | mut pin1 [&ref] | provenance |  |
-| main.rs:109:24:109:35 | ...::new(...) [Pin, &ref] | main.rs:109:13:109:20 | mut pin1 [Pin, &ref] | provenance |  |
-| main.rs:109:33:109:34 | &i [&ref] | main.rs:109:24:109:35 | ...::new(...) [&ref] | provenance | MaD:13 |
-| main.rs:109:33:109:34 | &i [&ref] | main.rs:109:24:109:35 | ...::new(...) [Pin, &ref] | provenance | MaD:12 |
+| main.rs:109:33:109:34 | &i [&ref] | main.rs:109:24:109:35 | ...::new(...) [&ref] | provenance | MaD:11 |
 | main.rs:109:34:109:34 | i | main.rs:109:33:109:34 | &i [&ref] | provenance |  |
 | main.rs:110:13:110:20 | mut pin2 [&ref] | main.rs:116:15:116:18 | pin2 [&ref] | provenance |  |
 | main.rs:110:24:110:34 | ...::pin(...) [&ref] | main.rs:110:13:110:20 | mut pin2 [&ref] | provenance |  |
@@ -90,8 +85,7 @@ edges
 | main.rs:111:47:111:47 | i | main.rs:111:38:111:48 | ...::new(...) [&ref] | provenance | MaD:3 |
 | main.rs:114:15:114:18 | pin1 [&ref] | main.rs:114:14:114:18 | * ... | provenance |  |
 | main.rs:115:15:115:35 | ...::into_inner(...) [&ref] | main.rs:115:14:115:35 | * ... | provenance |  |
-| main.rs:115:31:115:34 | pin1 [&ref] | main.rs:115:15:115:35 | ...::into_inner(...) [&ref] | provenance | MaD:9 |
-| main.rs:115:31:115:34 | pin1 [Pin, &ref] | main.rs:115:15:115:35 | ...::into_inner(...) [&ref] | provenance | MaD:8 |
+| main.rs:115:31:115:34 | pin1 [&ref] | main.rs:115:15:115:35 | ...::into_inner(...) [&ref] | provenance | MaD:8 |
 | main.rs:116:15:116:18 | pin2 [&ref] | main.rs:116:14:116:18 | * ... | provenance |  |
 | main.rs:117:15:117:18 | pin3 [&ref] | main.rs:117:14:117:18 | * ... | provenance |  |
 | main.rs:122:13:122:18 | mut ms [MyStruct] | main.rs:123:34:123:35 | ms [MyStruct] | provenance |  |
@@ -100,20 +94,20 @@ edges
 | main.rs:122:38:122:47 | source(...) | main.rs:122:22:122:49 | MyStruct {...} [MyStruct] | provenance |  |
 | main.rs:123:13:123:20 | mut pin1 [MyStruct] | main.rs:129:30:129:33 | pin1 [MyStruct] | provenance |  |
 | main.rs:123:24:123:36 | ...::new(...) [MyStruct] | main.rs:123:13:123:20 | mut pin1 [MyStruct] | provenance |  |
-| main.rs:123:33:123:35 | &ms [&ref, MyStruct] | main.rs:123:24:123:36 | ...::new(...) [MyStruct] | provenance | MaD:11 |
+| main.rs:123:33:123:35 | &ms [&ref, MyStruct] | main.rs:123:24:123:36 | ...::new(...) [MyStruct] | provenance | MaD:10 |
 | main.rs:123:34:123:35 | ms [MyStruct] | main.rs:123:33:123:35 | &ms [&ref, MyStruct] | provenance |  |
 | main.rs:127:14:127:15 | ms [MyStruct] | main.rs:127:14:127:19 | ms.val | provenance |  |
 | main.rs:129:14:129:34 | ...::into_inner(...) [MyStruct] | main.rs:129:14:129:38 | ... .val | provenance |  |
-| main.rs:129:30:129:33 | pin1 [MyStruct] | main.rs:129:14:129:34 | ...::into_inner(...) [MyStruct] | provenance | MaD:9 |
+| main.rs:129:30:129:33 | pin1 [MyStruct] | main.rs:129:14:129:34 | ...::into_inner(...) [MyStruct] | provenance | MaD:8 |
 | main.rs:136:13:136:18 | mut ms [MyStruct] | main.rs:137:44:137:45 | ms [MyStruct] | provenance |  |
 | main.rs:136:22:136:49 | MyStruct {...} [MyStruct] | main.rs:136:13:136:18 | mut ms [MyStruct] | provenance |  |
 | main.rs:136:38:136:47 | source(...) | main.rs:136:22:136:49 | MyStruct {...} [MyStruct] | provenance |  |
 | main.rs:137:13:137:20 | mut pin5 [MyStruct] | main.rs:139:40:139:43 | pin5 [MyStruct] | provenance |  |
 | main.rs:137:24:137:46 | ...::new_unchecked(...) [MyStruct] | main.rs:137:13:137:20 | mut pin5 [MyStruct] | provenance |  |
-| main.rs:137:43:137:45 | &ms [&ref, MyStruct] | main.rs:137:24:137:46 | ...::new_unchecked(...) [MyStruct] | provenance | MaD:14 |
+| main.rs:137:43:137:45 | &ms [&ref, MyStruct] | main.rs:137:24:137:46 | ...::new_unchecked(...) [MyStruct] | provenance | MaD:12 |
 | main.rs:137:44:137:45 | ms [MyStruct] | main.rs:137:43:137:45 | &ms [&ref, MyStruct] | provenance |  |
 | main.rs:139:14:139:44 | ...::into_inner_unchecked(...) [MyStruct] | main.rs:139:14:139:48 | ... .val | provenance |  |
-| main.rs:139:40:139:43 | pin5 [MyStruct] | main.rs:139:14:139:44 | ...::into_inner_unchecked(...) [MyStruct] | provenance | MaD:10 |
+| main.rs:139:40:139:43 | pin5 [MyStruct] | main.rs:139:14:139:44 | ...::into_inner_unchecked(...) [MyStruct] | provenance | MaD:9 |
 nodes
 | main.rs:12:9:12:9 | a [Some] | semmle.label | a [Some] |
 | main.rs:12:13:12:28 | Some(...) [Some] | semmle.label | Some(...) [Some] |
@@ -174,9 +168,7 @@ nodes
 | main.rs:108:13:108:17 | mut i | semmle.label | mut i |
 | main.rs:108:21:108:30 | source(...) | semmle.label | source(...) |
 | main.rs:109:13:109:20 | mut pin1 [&ref] | semmle.label | mut pin1 [&ref] |
-| main.rs:109:13:109:20 | mut pin1 [Pin, &ref] | semmle.label | mut pin1 [Pin, &ref] |
 | main.rs:109:24:109:35 | ...::new(...) [&ref] | semmle.label | ...::new(...) [&ref] |
-| main.rs:109:24:109:35 | ...::new(...) [Pin, &ref] | semmle.label | ...::new(...) [Pin, &ref] |
 | main.rs:109:33:109:34 | &i [&ref] | semmle.label | &i [&ref] |
 | main.rs:109:34:109:34 | i | semmle.label | i |
 | main.rs:110:13:110:20 | mut pin2 [&ref] | semmle.label | mut pin2 [&ref] |
@@ -192,7 +184,6 @@ nodes
 | main.rs:115:14:115:35 | * ... | semmle.label | * ... |
 | main.rs:115:15:115:35 | ...::into_inner(...) [&ref] | semmle.label | ...::into_inner(...) [&ref] |
 | main.rs:115:31:115:34 | pin1 [&ref] | semmle.label | pin1 [&ref] |
-| main.rs:115:31:115:34 | pin1 [Pin, &ref] | semmle.label | pin1 [Pin, &ref] |
 | main.rs:116:14:116:18 | * ... | semmle.label | * ... |
 | main.rs:116:15:116:18 | pin2 [&ref] | semmle.label | pin2 [&ref] |
 | main.rs:117:14:117:18 | * ... | semmle.label | * ... |
diff --git a/rust/ql/test/library-tests/dataflow/models/CONSISTENCY/PathResolutionConsistency.expected b/rust/ql/test/library-tests/dataflow/models/CONSISTENCY/PathResolutionConsistency.expected
index ebe4e66e6e2..7db15783781 100644
--- a/rust/ql/test/library-tests/dataflow/models/CONSISTENCY/PathResolutionConsistency.expected
+++ b/rust/ql/test/library-tests/dataflow/models/CONSISTENCY/PathResolutionConsistency.expected
@@ -1,2 +1,2 @@
 multipleCallTargets
-| main.rs:362:14:362:30 | ... .lt(...) |
+| main.rs:389:14:389:30 | ... .lt(...) |
diff --git a/rust/ql/test/library-tests/dataflow/models/main.rs b/rust/ql/test/library-tests/dataflow/models/main.rs
index 0430b6f8dff..7daa883996f 100644
--- a/rust/ql/test/library-tests/dataflow/models/main.rs
+++ b/rust/ql/test/library-tests/dataflow/models/main.rs
@@ -249,6 +249,33 @@ fn test_enum_method_source() {
     }
 }
 
+mod source_into_function {
+    use super::sink;
+
+    // has a source model
+    fn pass_source<A>(_i: i64, f: impl FnOnce(i64) -> A) -> A {
+        f(42)
+    }
+
+    fn test_source_into_function() {
+        let a = |a| sink(a); // $ hasValueFlow=1
+        pass_source(1, a);
+
+        pass_source(2, |a| {
+            sink(a); // $ hasValueFlow=2
+        });
+
+        fn f(a: i64) {
+            sink(a) // $ hasValueFlow=3
+        }
+        pass_source(3, f);
+
+        pass_source(4, async move |a| {
+            sink(a); // $ hasValueFlow=4
+        });
+    }
+}
+
 // has a sink model
 fn enum_sink(e: MyFieldEnum) {}
 
diff --git a/rust/ql/test/library-tests/dataflow/models/models.expected b/rust/ql/test/library-tests/dataflow/models/models.expected
index db7489809b8..955b0b81b44 100644
--- a/rust/ql/test/library-tests/dataflow/models/models.expected
+++ b/rust/ql/test/library-tests/dataflow/models/models.expected
@@ -6,22 +6,23 @@ models
 | 5 | Source: main::arg_source; Argument[0]; test-source |
 | 6 | Source: main::enum_source; ReturnValue.Field[main::MyFieldEnum::D::field_d]; test-source |
 | 7 | Source: main::simple_source; ReturnValue; test-source |
-| 8 | Summary: <_ as core::cmp::Ord>::max; Argument[self]; ReturnValue; value |
-| 9 | Summary: <_ as core::cmp::PartialOrd>::lt; Argument[self].Reference; ReturnValue; taint |
-| 10 | Summary: main::apply; Argument[0]; Argument[1].Parameter[0]; value |
-| 11 | Summary: main::apply; Argument[1].ReturnValue; ReturnValue; value |
-| 12 | Summary: main::coerce; Argument[0]; ReturnValue; taint |
-| 13 | Summary: main::get_array_element; Argument[0].Element; ReturnValue; value |
-| 14 | Summary: main::get_async_number; Argument[0]; ReturnValue.Future; value |
-| 15 | Summary: main::get_struct_field; Argument[0].Field[main::MyStruct::field1]; ReturnValue; value |
-| 16 | Summary: main::get_tuple_element; Argument[0].Field[0]; ReturnValue; value |
-| 17 | Summary: main::get_var_field; Argument[0].Field[main::MyFieldEnum::C::field_c]; ReturnValue; value |
-| 18 | Summary: main::get_var_pos; Argument[0].Field[main::MyPosEnum::A(0)]; ReturnValue; value |
-| 19 | Summary: main::set_array_element; Argument[0]; ReturnValue.Element; value |
-| 20 | Summary: main::set_struct_field; Argument[0]; ReturnValue.Field[main::MyStruct::field2]; value |
-| 21 | Summary: main::set_tuple_element; Argument[0]; ReturnValue.Field[1]; value |
-| 22 | Summary: main::set_var_field; Argument[0]; ReturnValue.Field[main::MyFieldEnum::D::field_d]; value |
-| 23 | Summary: main::set_var_pos; Argument[0]; ReturnValue.Field[main::MyPosEnum::B(0)]; value |
+| 8 | Source: main::source_into_function::pass_source; Argument[1].Parameter[0]; test-source |
+| 9 | Summary: <_ as core::cmp::Ord>::max; Argument[self]; ReturnValue; value |
+| 10 | Summary: <_ as core::cmp::PartialOrd>::lt; Argument[self].Reference; ReturnValue; taint |
+| 11 | Summary: main::apply; Argument[0]; Argument[1].Parameter[0]; value |
+| 12 | Summary: main::apply; Argument[1].ReturnValue; ReturnValue; value |
+| 13 | Summary: main::coerce; Argument[0]; ReturnValue; taint |
+| 14 | Summary: main::get_array_element; Argument[0].Element; ReturnValue; value |
+| 15 | Summary: main::get_async_number; Argument[0]; ReturnValue.Future; value |
+| 16 | Summary: main::get_struct_field; Argument[0].Field[main::MyStruct::field1]; ReturnValue; value |
+| 17 | Summary: main::get_tuple_element; Argument[0].Field[0]; ReturnValue; value |
+| 18 | Summary: main::get_var_field; Argument[0].Field[main::MyFieldEnum::C::field_c]; ReturnValue; value |
+| 19 | Summary: main::get_var_pos; Argument[0].Field[main::MyPosEnum::A(0)]; ReturnValue; value |
+| 20 | Summary: main::set_array_element; Argument[0]; ReturnValue.Element; value |
+| 21 | Summary: main::set_struct_field; Argument[0]; ReturnValue.Field[main::MyStruct::field2]; value |
+| 22 | Summary: main::set_tuple_element; Argument[0]; ReturnValue.Field[1]; value |
+| 23 | Summary: main::set_var_field; Argument[0]; ReturnValue.Field[main::MyFieldEnum::D::field_d]; value |
+| 24 | Summary: main::set_var_pos; Argument[0]; ReturnValue.Field[main::MyPosEnum::B(0)]; value |
 edges
 | main.rs:15:9:15:9 | s | main.rs:16:19:16:19 | s | provenance |  |
 | main.rs:15:9:15:9 | s | main.rs:16:19:16:19 | s | provenance |  |
@@ -31,7 +32,7 @@ edges
 | main.rs:16:19:16:19 | s | main.rs:16:10:16:20 | identity(...) | provenance | QL |
 | main.rs:25:9:25:9 | s | main.rs:26:17:26:17 | s | provenance |  |
 | main.rs:25:13:25:22 | source(...) | main.rs:25:9:25:9 | s | provenance |  |
-| main.rs:26:17:26:17 | s | main.rs:26:10:26:18 | coerce(...) | provenance | MaD:12 |
+| main.rs:26:17:26:17 | s | main.rs:26:10:26:18 | coerce(...) | provenance | MaD:13 |
 | main.rs:40:9:40:9 | s | main.rs:41:27:41:27 | s | provenance |  |
 | main.rs:40:9:40:9 | s | main.rs:41:27:41:27 | s | provenance |  |
 | main.rs:40:13:40:21 | source(...) | main.rs:40:9:40:9 | s | provenance |  |
@@ -42,8 +43,8 @@ edges
 | main.rs:41:14:41:28 | ...::A(...) [A] | main.rs:41:9:41:10 | e1 [A] | provenance |  |
 | main.rs:41:27:41:27 | s | main.rs:41:14:41:28 | ...::A(...) [A] | provenance |  |
 | main.rs:41:27:41:27 | s | main.rs:41:14:41:28 | ...::A(...) [A] | provenance |  |
-| main.rs:42:22:42:23 | e1 [A] | main.rs:42:10:42:24 | get_var_pos(...) | provenance | MaD:18 |
-| main.rs:42:22:42:23 | e1 [A] | main.rs:42:10:42:24 | get_var_pos(...) | provenance | MaD:18 |
+| main.rs:42:22:42:23 | e1 [A] | main.rs:42:10:42:24 | get_var_pos(...) | provenance | MaD:19 |
+| main.rs:42:22:42:23 | e1 [A] | main.rs:42:10:42:24 | get_var_pos(...) | provenance | MaD:19 |
 | main.rs:53:9:53:9 | s | main.rs:54:26:54:26 | s | provenance |  |
 | main.rs:53:9:53:9 | s | main.rs:54:26:54:26 | s | provenance |  |
 | main.rs:53:13:53:21 | source(...) | main.rs:53:9:53:9 | s | provenance |  |
@@ -52,8 +53,8 @@ edges
 | main.rs:54:9:54:10 | e1 [B] | main.rs:55:11:55:12 | e1 [B] | provenance |  |
 | main.rs:54:14:54:27 | set_var_pos(...) [B] | main.rs:54:9:54:10 | e1 [B] | provenance |  |
 | main.rs:54:14:54:27 | set_var_pos(...) [B] | main.rs:54:9:54:10 | e1 [B] | provenance |  |
-| main.rs:54:26:54:26 | s | main.rs:54:14:54:27 | set_var_pos(...) [B] | provenance | MaD:23 |
-| main.rs:54:26:54:26 | s | main.rs:54:14:54:27 | set_var_pos(...) [B] | provenance | MaD:23 |
+| main.rs:54:26:54:26 | s | main.rs:54:14:54:27 | set_var_pos(...) [B] | provenance | MaD:24 |
+| main.rs:54:26:54:26 | s | main.rs:54:14:54:27 | set_var_pos(...) [B] | provenance | MaD:24 |
 | main.rs:55:11:55:12 | e1 [B] | main.rs:57:9:57:23 | ...::B(...) [B] | provenance |  |
 | main.rs:55:11:55:12 | e1 [B] | main.rs:57:9:57:23 | ...::B(...) [B] | provenance |  |
 | main.rs:57:9:57:23 | ...::B(...) [B] | main.rs:57:22:57:22 | i | provenance |  |
@@ -70,8 +71,8 @@ edges
 | main.rs:73:14:73:42 | ...::C {...} [C] | main.rs:73:9:73:10 | e1 [C] | provenance |  |
 | main.rs:73:40:73:40 | s | main.rs:73:14:73:42 | ...::C {...} [C] | provenance |  |
 | main.rs:73:40:73:40 | s | main.rs:73:14:73:42 | ...::C {...} [C] | provenance |  |
-| main.rs:74:24:74:25 | e1 [C] | main.rs:74:10:74:26 | get_var_field(...) | provenance | MaD:17 |
-| main.rs:74:24:74:25 | e1 [C] | main.rs:74:10:74:26 | get_var_field(...) | provenance | MaD:17 |
+| main.rs:74:24:74:25 | e1 [C] | main.rs:74:10:74:26 | get_var_field(...) | provenance | MaD:18 |
+| main.rs:74:24:74:25 | e1 [C] | main.rs:74:10:74:26 | get_var_field(...) | provenance | MaD:18 |
 | main.rs:85:9:85:9 | s | main.rs:86:28:86:28 | s | provenance |  |
 | main.rs:85:9:85:9 | s | main.rs:86:28:86:28 | s | provenance |  |
 | main.rs:85:13:85:21 | source(...) | main.rs:85:9:85:9 | s | provenance |  |
@@ -80,8 +81,8 @@ edges
 | main.rs:86:9:86:10 | e1 [D] | main.rs:87:11:87:12 | e1 [D] | provenance |  |
 | main.rs:86:14:86:29 | set_var_field(...) [D] | main.rs:86:9:86:10 | e1 [D] | provenance |  |
 | main.rs:86:14:86:29 | set_var_field(...) [D] | main.rs:86:9:86:10 | e1 [D] | provenance |  |
-| main.rs:86:28:86:28 | s | main.rs:86:14:86:29 | set_var_field(...) [D] | provenance | MaD:22 |
-| main.rs:86:28:86:28 | s | main.rs:86:14:86:29 | set_var_field(...) [D] | provenance | MaD:22 |
+| main.rs:86:28:86:28 | s | main.rs:86:14:86:29 | set_var_field(...) [D] | provenance | MaD:23 |
+| main.rs:86:28:86:28 | s | main.rs:86:14:86:29 | set_var_field(...) [D] | provenance | MaD:23 |
 | main.rs:87:11:87:12 | e1 [D] | main.rs:89:9:89:37 | ...::D {...} [D] | provenance |  |
 | main.rs:87:11:87:12 | e1 [D] | main.rs:89:9:89:37 | ...::D {...} [D] | provenance |  |
 | main.rs:89:9:89:37 | ...::D {...} [D] | main.rs:89:35:89:35 | i | provenance |  |
@@ -98,8 +99,8 @@ edges
 | main.rs:105:21:108:5 | MyStruct {...} [MyStruct.field1] | main.rs:105:9:105:17 | my_struct [MyStruct.field1] | provenance |  |
 | main.rs:106:17:106:17 | s | main.rs:105:21:108:5 | MyStruct {...} [MyStruct.field1] | provenance |  |
 | main.rs:106:17:106:17 | s | main.rs:105:21:108:5 | MyStruct {...} [MyStruct.field1] | provenance |  |
-| main.rs:109:27:109:35 | my_struct [MyStruct.field1] | main.rs:109:10:109:36 | get_struct_field(...) | provenance | MaD:15 |
-| main.rs:109:27:109:35 | my_struct [MyStruct.field1] | main.rs:109:10:109:36 | get_struct_field(...) | provenance | MaD:15 |
+| main.rs:109:27:109:35 | my_struct [MyStruct.field1] | main.rs:109:10:109:36 | get_struct_field(...) | provenance | MaD:16 |
+| main.rs:109:27:109:35 | my_struct [MyStruct.field1] | main.rs:109:10:109:36 | get_struct_field(...) | provenance | MaD:16 |
 | main.rs:126:9:126:9 | s | main.rs:127:38:127:38 | s | provenance |  |
 | main.rs:126:9:126:9 | s | main.rs:127:38:127:38 | s | provenance |  |
 | main.rs:126:13:126:21 | source(...) | main.rs:126:9:126:9 | s | provenance |  |
@@ -108,16 +109,16 @@ edges
 | main.rs:127:9:127:17 | my_struct [MyStruct.field2] | main.rs:129:10:129:18 | my_struct [MyStruct.field2] | provenance |  |
 | main.rs:127:21:127:39 | set_struct_field(...) [MyStruct.field2] | main.rs:127:9:127:17 | my_struct [MyStruct.field2] | provenance |  |
 | main.rs:127:21:127:39 | set_struct_field(...) [MyStruct.field2] | main.rs:127:9:127:17 | my_struct [MyStruct.field2] | provenance |  |
-| main.rs:127:38:127:38 | s | main.rs:127:21:127:39 | set_struct_field(...) [MyStruct.field2] | provenance | MaD:20 |
-| main.rs:127:38:127:38 | s | main.rs:127:21:127:39 | set_struct_field(...) [MyStruct.field2] | provenance | MaD:20 |
+| main.rs:127:38:127:38 | s | main.rs:127:21:127:39 | set_struct_field(...) [MyStruct.field2] | provenance | MaD:21 |
+| main.rs:127:38:127:38 | s | main.rs:127:21:127:39 | set_struct_field(...) [MyStruct.field2] | provenance | MaD:21 |
 | main.rs:129:10:129:18 | my_struct [MyStruct.field2] | main.rs:129:10:129:25 | my_struct.field2 | provenance |  |
 | main.rs:129:10:129:18 | my_struct [MyStruct.field2] | main.rs:129:10:129:25 | my_struct.field2 | provenance |  |
 | main.rs:138:9:138:9 | s | main.rs:139:29:139:29 | s | provenance |  |
 | main.rs:138:9:138:9 | s | main.rs:139:29:139:29 | s | provenance |  |
 | main.rs:138:13:138:21 | source(...) | main.rs:138:9:138:9 | s | provenance |  |
 | main.rs:138:13:138:21 | source(...) | main.rs:138:9:138:9 | s | provenance |  |
-| main.rs:139:28:139:30 | [...] [element] | main.rs:139:10:139:31 | get_array_element(...) | provenance | MaD:13 |
-| main.rs:139:28:139:30 | [...] [element] | main.rs:139:10:139:31 | get_array_element(...) | provenance | MaD:13 |
+| main.rs:139:28:139:30 | [...] [element] | main.rs:139:10:139:31 | get_array_element(...) | provenance | MaD:14 |
+| main.rs:139:28:139:30 | [...] [element] | main.rs:139:10:139:31 | get_array_element(...) | provenance | MaD:14 |
 | main.rs:139:29:139:29 | s | main.rs:139:28:139:30 | [...] [element] | provenance |  |
 | main.rs:139:29:139:29 | s | main.rs:139:28:139:30 | [...] [element] | provenance |  |
 | main.rs:148:9:148:9 | s | main.rs:149:33:149:33 | s | provenance |  |
@@ -128,8 +129,8 @@ edges
 | main.rs:149:9:149:11 | arr [element] | main.rs:150:10:150:12 | arr [element] | provenance |  |
 | main.rs:149:15:149:34 | set_array_element(...) [element] | main.rs:149:9:149:11 | arr [element] | provenance |  |
 | main.rs:149:15:149:34 | set_array_element(...) [element] | main.rs:149:9:149:11 | arr [element] | provenance |  |
-| main.rs:149:33:149:33 | s | main.rs:149:15:149:34 | set_array_element(...) [element] | provenance | MaD:19 |
-| main.rs:149:33:149:33 | s | main.rs:149:15:149:34 | set_array_element(...) [element] | provenance | MaD:19 |
+| main.rs:149:33:149:33 | s | main.rs:149:15:149:34 | set_array_element(...) [element] | provenance | MaD:20 |
+| main.rs:149:33:149:33 | s | main.rs:149:15:149:34 | set_array_element(...) [element] | provenance | MaD:20 |
 | main.rs:150:10:150:12 | arr [element] | main.rs:150:10:150:15 | arr[0] | provenance |  |
 | main.rs:150:10:150:12 | arr [element] | main.rs:150:10:150:15 | arr[0] | provenance |  |
 | main.rs:159:9:159:9 | s | main.rs:160:14:160:14 | s | provenance |  |
@@ -142,8 +143,8 @@ edges
 | main.rs:160:13:160:18 | TupleExpr [tuple.0] | main.rs:160:9:160:9 | t [tuple.0] | provenance |  |
 | main.rs:160:14:160:14 | s | main.rs:160:13:160:18 | TupleExpr [tuple.0] | provenance |  |
 | main.rs:160:14:160:14 | s | main.rs:160:13:160:18 | TupleExpr [tuple.0] | provenance |  |
-| main.rs:161:28:161:28 | t [tuple.0] | main.rs:161:10:161:29 | get_tuple_element(...) | provenance | MaD:16 |
-| main.rs:161:28:161:28 | t [tuple.0] | main.rs:161:10:161:29 | get_tuple_element(...) | provenance | MaD:16 |
+| main.rs:161:28:161:28 | t [tuple.0] | main.rs:161:10:161:29 | get_tuple_element(...) | provenance | MaD:17 |
+| main.rs:161:28:161:28 | t [tuple.0] | main.rs:161:10:161:29 | get_tuple_element(...) | provenance | MaD:17 |
 | main.rs:172:9:172:9 | s | main.rs:173:31:173:31 | s | provenance |  |
 | main.rs:172:9:172:9 | s | main.rs:173:31:173:31 | s | provenance |  |
 | main.rs:172:13:172:22 | source(...) | main.rs:172:9:172:9 | s | provenance |  |
@@ -152,8 +153,8 @@ edges
 | main.rs:173:9:173:9 | t [tuple.1] | main.rs:175:10:175:10 | t [tuple.1] | provenance |  |
 | main.rs:173:13:173:32 | set_tuple_element(...) [tuple.1] | main.rs:173:9:173:9 | t [tuple.1] | provenance |  |
 | main.rs:173:13:173:32 | set_tuple_element(...) [tuple.1] | main.rs:173:9:173:9 | t [tuple.1] | provenance |  |
-| main.rs:173:31:173:31 | s | main.rs:173:13:173:32 | set_tuple_element(...) [tuple.1] | provenance | MaD:21 |
-| main.rs:173:31:173:31 | s | main.rs:173:13:173:32 | set_tuple_element(...) [tuple.1] | provenance | MaD:21 |
+| main.rs:173:31:173:31 | s | main.rs:173:13:173:32 | set_tuple_element(...) [tuple.1] | provenance | MaD:22 |
+| main.rs:173:31:173:31 | s | main.rs:173:13:173:32 | set_tuple_element(...) [tuple.1] | provenance | MaD:22 |
 | main.rs:175:10:175:10 | t [tuple.1] | main.rs:175:10:175:12 | t.1 | provenance |  |
 | main.rs:175:10:175:10 | t [tuple.1] | main.rs:175:10:175:12 | t.1 | provenance |  |
 | main.rs:187:9:187:9 | s | main.rs:192:11:192:11 | s | provenance |  |
@@ -162,8 +163,8 @@ edges
 | main.rs:187:13:187:22 | source(...) | main.rs:187:9:187:9 | s | provenance |  |
 | main.rs:188:14:188:14 | ... | main.rs:189:14:189:14 | n | provenance |  |
 | main.rs:188:14:188:14 | ... | main.rs:189:14:189:14 | n | provenance |  |
-| main.rs:192:11:192:11 | s | main.rs:188:14:188:14 | ... | provenance | MaD:10 |
-| main.rs:192:11:192:11 | s | main.rs:188:14:188:14 | ... | provenance | MaD:10 |
+| main.rs:192:11:192:11 | s | main.rs:188:14:188:14 | ... | provenance | MaD:11 |
+| main.rs:192:11:192:11 | s | main.rs:188:14:188:14 | ... | provenance | MaD:11 |
 | main.rs:196:13:196:22 | source(...) | main.rs:198:23:198:23 | f [captured s] | provenance |  |
 | main.rs:196:13:196:22 | source(...) | main.rs:198:23:198:23 | f [captured s] | provenance |  |
 | main.rs:197:40:197:40 | s | main.rs:197:17:197:42 | if ... {...} else {...} | provenance |  |
@@ -172,14 +173,14 @@ edges
 | main.rs:198:9:198:9 | t | main.rs:199:10:199:10 | t | provenance |  |
 | main.rs:198:13:198:24 | apply(...) | main.rs:198:9:198:9 | t | provenance |  |
 | main.rs:198:13:198:24 | apply(...) | main.rs:198:9:198:9 | t | provenance |  |
-| main.rs:198:23:198:23 | f [captured s] | main.rs:197:40:197:40 | s | provenance | MaD:10 |
-| main.rs:198:23:198:23 | f [captured s] | main.rs:197:40:197:40 | s | provenance | MaD:10 |
 | main.rs:198:23:198:23 | f [captured s] | main.rs:197:40:197:40 | s | provenance | MaD:11 |
 | main.rs:198:23:198:23 | f [captured s] | main.rs:197:40:197:40 | s | provenance | MaD:11 |
-| main.rs:198:23:198:23 | f [captured s] | main.rs:198:13:198:24 | apply(...) | provenance | MaD:10 |
-| main.rs:198:23:198:23 | f [captured s] | main.rs:198:13:198:24 | apply(...) | provenance | MaD:10 |
+| main.rs:198:23:198:23 | f [captured s] | main.rs:197:40:197:40 | s | provenance | MaD:12 |
+| main.rs:198:23:198:23 | f [captured s] | main.rs:197:40:197:40 | s | provenance | MaD:12 |
 | main.rs:198:23:198:23 | f [captured s] | main.rs:198:13:198:24 | apply(...) | provenance | MaD:11 |
 | main.rs:198:23:198:23 | f [captured s] | main.rs:198:13:198:24 | apply(...) | provenance | MaD:11 |
+| main.rs:198:23:198:23 | f [captured s] | main.rs:198:13:198:24 | apply(...) | provenance | MaD:12 |
+| main.rs:198:23:198:23 | f [captured s] | main.rs:198:13:198:24 | apply(...) | provenance | MaD:12 |
 | main.rs:203:9:203:9 | s | main.rs:205:19:205:19 | s | provenance |  |
 | main.rs:203:9:203:9 | s | main.rs:205:19:205:19 | s | provenance |  |
 | main.rs:203:13:203:22 | source(...) | main.rs:203:9:203:9 | s | provenance |  |
@@ -190,10 +191,10 @@ edges
 | main.rs:205:9:205:9 | t | main.rs:206:10:206:10 | t | provenance |  |
 | main.rs:205:13:205:23 | apply(...) | main.rs:205:9:205:9 | t | provenance |  |
 | main.rs:205:13:205:23 | apply(...) | main.rs:205:9:205:9 | t | provenance |  |
-| main.rs:205:19:205:19 | s | main.rs:204:14:204:14 | ... | provenance | MaD:10 |
-| main.rs:205:19:205:19 | s | main.rs:204:14:204:14 | ... | provenance | MaD:10 |
-| main.rs:205:19:205:19 | s | main.rs:205:13:205:23 | apply(...) | provenance | MaD:10 |
-| main.rs:205:19:205:19 | s | main.rs:205:13:205:23 | apply(...) | provenance | MaD:10 |
+| main.rs:205:19:205:19 | s | main.rs:204:14:204:14 | ... | provenance | MaD:11 |
+| main.rs:205:19:205:19 | s | main.rs:204:14:204:14 | ... | provenance | MaD:11 |
+| main.rs:205:19:205:19 | s | main.rs:205:13:205:23 | apply(...) | provenance | MaD:11 |
+| main.rs:205:19:205:19 | s | main.rs:205:13:205:23 | apply(...) | provenance | MaD:11 |
 | main.rs:215:9:215:9 | s | main.rs:216:30:216:30 | s | provenance |  |
 | main.rs:215:9:215:9 | s | main.rs:216:30:216:30 | s | provenance |  |
 | main.rs:215:13:215:22 | source(...) | main.rs:215:9:215:9 | s | provenance |  |
@@ -204,8 +205,8 @@ edges
 | main.rs:216:13:216:31 | get_async_number(...) [future] | main.rs:216:13:216:37 | await ... | provenance |  |
 | main.rs:216:13:216:37 | await ... | main.rs:216:9:216:9 | t | provenance |  |
 | main.rs:216:13:216:37 | await ... | main.rs:216:9:216:9 | t | provenance |  |
-| main.rs:216:30:216:30 | s | main.rs:216:13:216:31 | get_async_number(...) [future] | provenance | MaD:14 |
-| main.rs:216:30:216:30 | s | main.rs:216:13:216:31 | get_async_number(...) [future] | provenance | MaD:14 |
+| main.rs:216:30:216:30 | s | main.rs:216:13:216:31 | get_async_number(...) [future] | provenance | MaD:15 |
+| main.rs:216:30:216:30 | s | main.rs:216:13:216:31 | get_async_number(...) [future] | provenance | MaD:15 |
 | main.rs:236:9:236:9 | s [D] | main.rs:237:11:237:11 | s [D] | provenance |  |
 | main.rs:236:9:236:9 | s [D] | main.rs:237:11:237:11 | s [D] | provenance |  |
 | main.rs:236:13:236:23 | enum_source | main.rs:236:13:236:27 | enum_source(...) [D] | provenance | Src:MaD:6  |
@@ -230,70 +231,86 @@ edges
 | main.rs:247:9:247:37 | ...::C {...} [C] | main.rs:247:35:247:35 | i | provenance |  |
 | main.rs:247:35:247:35 | i | main.rs:247:47:247:47 | i | provenance |  |
 | main.rs:247:35:247:35 | i | main.rs:247:47:247:47 | i | provenance |  |
-| main.rs:256:9:256:9 | s | main.rs:257:41:257:41 | s | provenance |  |
-| main.rs:256:9:256:9 | s | main.rs:257:41:257:41 | s | provenance |  |
-| main.rs:256:13:256:22 | source(...) | main.rs:256:9:256:9 | s | provenance |  |
-| main.rs:256:13:256:22 | source(...) | main.rs:256:9:256:9 | s | provenance |  |
-| main.rs:257:15:257:43 | ...::C {...} [C] | main.rs:257:5:257:13 | enum_sink | provenance | MaD:2 Sink:MaD:2 |
-| main.rs:257:15:257:43 | ...::C {...} [C] | main.rs:257:5:257:13 | enum_sink | provenance | MaD:2 Sink:MaD:2 |
-| main.rs:257:41:257:41 | s | main.rs:257:15:257:43 | ...::C {...} [C] | provenance |  |
-| main.rs:257:41:257:41 | s | main.rs:257:15:257:43 | ...::C {...} [C] | provenance |  |
-| main.rs:262:9:262:9 | s | main.rs:263:39:263:39 | s | provenance |  |
-| main.rs:262:9:262:9 | s | main.rs:263:39:263:39 | s | provenance |  |
-| main.rs:262:13:262:22 | source(...) | main.rs:262:9:262:9 | s | provenance |  |
-| main.rs:262:13:262:22 | source(...) | main.rs:262:9:262:9 | s | provenance |  |
-| main.rs:263:9:263:9 | e [D] | main.rs:264:5:264:5 | e [D] | provenance |  |
-| main.rs:263:9:263:9 | e [D] | main.rs:264:5:264:5 | e [D] | provenance |  |
-| main.rs:263:13:263:41 | ...::D {...} [D] | main.rs:263:9:263:9 | e [D] | provenance |  |
-| main.rs:263:13:263:41 | ...::D {...} [D] | main.rs:263:9:263:9 | e [D] | provenance |  |
-| main.rs:263:39:263:39 | s | main.rs:263:13:263:41 | ...::D {...} [D] | provenance |  |
-| main.rs:263:39:263:39 | s | main.rs:263:13:263:41 | ...::D {...} [D] | provenance |  |
-| main.rs:264:5:264:5 | e [D] | main.rs:264:7:264:10 | sink | provenance | MaD:1 Sink:MaD:1 |
-| main.rs:264:5:264:5 | e [D] | main.rs:264:7:264:10 | sink | provenance | MaD:1 Sink:MaD:1 |
-| main.rs:273:9:273:9 | s | main.rs:274:10:274:10 | s | provenance |  |
-| main.rs:273:9:273:9 | s | main.rs:274:10:274:10 | s | provenance |  |
-| main.rs:273:13:273:25 | simple_source | main.rs:273:13:273:29 | simple_source(...) | provenance | Src:MaD:7 MaD:7 |
-| main.rs:273:13:273:25 | simple_source | main.rs:273:13:273:29 | simple_source(...) | provenance | Src:MaD:7 MaD:7 |
-| main.rs:273:13:273:29 | simple_source(...) | main.rs:273:9:273:9 | s | provenance |  |
-| main.rs:273:13:273:29 | simple_source(...) | main.rs:273:9:273:9 | s | provenance |  |
-| main.rs:281:9:281:9 | s | main.rs:282:17:282:17 | s | provenance |  |
-| main.rs:281:9:281:9 | s | main.rs:282:17:282:17 | s | provenance |  |
-| main.rs:281:13:281:22 | source(...) | main.rs:281:9:281:9 | s | provenance |  |
-| main.rs:281:13:281:22 | source(...) | main.rs:281:9:281:9 | s | provenance |  |
-| main.rs:282:17:282:17 | s | main.rs:282:5:282:15 | simple_sink | provenance | MaD:3 Sink:MaD:3 |
-| main.rs:282:17:282:17 | s | main.rs:282:5:282:15 | simple_sink | provenance | MaD:3 Sink:MaD:3 |
-| main.rs:290:5:290:14 | arg_source | main.rs:290:16:290:16 | [post] i | provenance | Src:MaD:5 MaD:5 |
-| main.rs:290:5:290:14 | arg_source | main.rs:290:16:290:16 | [post] i | provenance | Src:MaD:5 MaD:5 |
-| main.rs:290:16:290:16 | [post] i | main.rs:291:10:291:10 | i | provenance |  |
-| main.rs:290:16:290:16 | [post] i | main.rs:291:10:291:10 | i | provenance |  |
-| main.rs:343:9:343:10 | x1 | main.rs:344:10:344:11 | x1 | provenance |  |
-| main.rs:343:9:343:10 | x1 | main.rs:344:10:344:11 | x1 | provenance |  |
-| main.rs:343:14:343:23 | source(...) | main.rs:343:14:343:30 | ... .max(...) | provenance | MaD:8 |
-| main.rs:343:14:343:23 | source(...) | main.rs:343:14:343:30 | ... .max(...) | provenance | MaD:8 |
-| main.rs:343:14:343:30 | ... .max(...) | main.rs:343:9:343:10 | x1 | provenance |  |
-| main.rs:343:14:343:30 | ... .max(...) | main.rs:343:9:343:10 | x1 | provenance |  |
-| main.rs:346:9:346:10 | x2 [MyStruct.field1] | main.rs:354:10:354:11 | x2 [MyStruct.field1] | provenance |  |
-| main.rs:346:9:346:10 | x2 [MyStruct.field1] | main.rs:354:10:354:11 | x2 [MyStruct.field1] | provenance |  |
-| main.rs:346:14:353:6 | ... .max(...) [MyStruct.field1] | main.rs:346:9:346:10 | x2 [MyStruct.field1] | provenance |  |
-| main.rs:346:14:353:6 | ... .max(...) [MyStruct.field1] | main.rs:346:9:346:10 | x2 [MyStruct.field1] | provenance |  |
-| main.rs:346:15:349:5 | MyStruct {...} [MyStruct.field1] | main.rs:346:14:353:6 | ... .max(...) [MyStruct.field1] | provenance | MaD:8 |
-| main.rs:346:15:349:5 | MyStruct {...} [MyStruct.field1] | main.rs:346:14:353:6 | ... .max(...) [MyStruct.field1] | provenance | MaD:8 |
-| main.rs:347:17:347:26 | source(...) | main.rs:346:15:349:5 | MyStruct {...} [MyStruct.field1] | provenance |  |
-| main.rs:347:17:347:26 | source(...) | main.rs:346:15:349:5 | MyStruct {...} [MyStruct.field1] | provenance |  |
-| main.rs:354:10:354:11 | x2 [MyStruct.field1] | main.rs:354:10:354:18 | x2.field1 | provenance |  |
-| main.rs:354:10:354:11 | x2 [MyStruct.field1] | main.rs:354:10:354:18 | x2.field1 | provenance |  |
-| main.rs:359:9:359:10 | x4 | main.rs:360:10:360:11 | x4 | provenance |  |
-| main.rs:359:9:359:10 | x4 | main.rs:360:10:360:11 | x4 | provenance |  |
-| main.rs:359:14:359:23 | source(...) | main.rs:359:14:359:30 | ... .max(...) | provenance | MaD:8 |
-| main.rs:359:14:359:23 | source(...) | main.rs:359:14:359:30 | ... .max(...) | provenance | MaD:8 |
-| main.rs:359:14:359:30 | ... .max(...) | main.rs:359:9:359:10 | x4 | provenance |  |
-| main.rs:359:14:359:30 | ... .max(...) | main.rs:359:9:359:10 | x4 | provenance |  |
-| main.rs:362:9:362:10 | x5 | main.rs:363:10:363:11 | x5 | provenance |  |
-| main.rs:362:14:362:23 | source(...) | main.rs:362:14:362:30 | ... .lt(...) | provenance | MaD:9 |
-| main.rs:362:14:362:30 | ... .lt(...) | main.rs:362:9:362:10 | x5 | provenance |  |
-| main.rs:365:9:365:10 | x6 | main.rs:366:10:366:11 | x6 | provenance |  |
-| main.rs:365:14:365:23 | source(...) | main.rs:365:14:365:27 | ... < ... | provenance | MaD:9 |
-| main.rs:365:14:365:27 | ... < ... | main.rs:365:9:365:10 | x6 | provenance |  |
+| main.rs:261:18:261:18 | ... | main.rs:261:26:261:26 | a | provenance |  |
+| main.rs:261:18:261:18 | ... | main.rs:261:26:261:26 | a | provenance |  |
+| main.rs:262:9:262:19 | pass_source | main.rs:261:18:261:18 | ... | provenance | Src:MaD:8  |
+| main.rs:262:9:262:19 | pass_source | main.rs:261:18:261:18 | ... | provenance | Src:MaD:8  |
+| main.rs:264:9:264:19 | pass_source | main.rs:264:25:264:25 | ... | provenance | Src:MaD:8  |
+| main.rs:264:9:264:19 | pass_source | main.rs:264:25:264:25 | ... | provenance | Src:MaD:8  |
+| main.rs:264:25:264:25 | ... | main.rs:265:18:265:18 | a | provenance |  |
+| main.rs:264:25:264:25 | ... | main.rs:265:18:265:18 | a | provenance |  |
+| main.rs:268:14:268:19 | ...: i64 | main.rs:269:18:269:18 | a | provenance |  |
+| main.rs:268:14:268:19 | ...: i64 | main.rs:269:18:269:18 | a | provenance |  |
+| main.rs:271:9:271:19 | pass_source | main.rs:268:14:268:19 | ...: i64 | provenance | Src:MaD:8  |
+| main.rs:271:9:271:19 | pass_source | main.rs:268:14:268:19 | ...: i64 | provenance | Src:MaD:8  |
+| main.rs:273:9:273:19 | pass_source | main.rs:273:36:273:36 | ... | provenance | Src:MaD:8  |
+| main.rs:273:9:273:19 | pass_source | main.rs:273:36:273:36 | ... | provenance | Src:MaD:8  |
+| main.rs:273:36:273:36 | ... | main.rs:274:18:274:18 | a | provenance |  |
+| main.rs:273:36:273:36 | ... | main.rs:274:18:274:18 | a | provenance |  |
+| main.rs:283:9:283:9 | s | main.rs:284:41:284:41 | s | provenance |  |
+| main.rs:283:9:283:9 | s | main.rs:284:41:284:41 | s | provenance |  |
+| main.rs:283:13:283:22 | source(...) | main.rs:283:9:283:9 | s | provenance |  |
+| main.rs:283:13:283:22 | source(...) | main.rs:283:9:283:9 | s | provenance |  |
+| main.rs:284:15:284:43 | ...::C {...} [C] | main.rs:284:5:284:13 | enum_sink | provenance | MaD:2 Sink:MaD:2 |
+| main.rs:284:15:284:43 | ...::C {...} [C] | main.rs:284:5:284:13 | enum_sink | provenance | MaD:2 Sink:MaD:2 |
+| main.rs:284:41:284:41 | s | main.rs:284:15:284:43 | ...::C {...} [C] | provenance |  |
+| main.rs:284:41:284:41 | s | main.rs:284:15:284:43 | ...::C {...} [C] | provenance |  |
+| main.rs:289:9:289:9 | s | main.rs:290:39:290:39 | s | provenance |  |
+| main.rs:289:9:289:9 | s | main.rs:290:39:290:39 | s | provenance |  |
+| main.rs:289:13:289:22 | source(...) | main.rs:289:9:289:9 | s | provenance |  |
+| main.rs:289:13:289:22 | source(...) | main.rs:289:9:289:9 | s | provenance |  |
+| main.rs:290:9:290:9 | e [D] | main.rs:291:5:291:5 | e [D] | provenance |  |
+| main.rs:290:9:290:9 | e [D] | main.rs:291:5:291:5 | e [D] | provenance |  |
+| main.rs:290:13:290:41 | ...::D {...} [D] | main.rs:290:9:290:9 | e [D] | provenance |  |
+| main.rs:290:13:290:41 | ...::D {...} [D] | main.rs:290:9:290:9 | e [D] | provenance |  |
+| main.rs:290:39:290:39 | s | main.rs:290:13:290:41 | ...::D {...} [D] | provenance |  |
+| main.rs:290:39:290:39 | s | main.rs:290:13:290:41 | ...::D {...} [D] | provenance |  |
+| main.rs:291:5:291:5 | e [D] | main.rs:291:7:291:10 | sink | provenance | MaD:1 Sink:MaD:1 |
+| main.rs:291:5:291:5 | e [D] | main.rs:291:7:291:10 | sink | provenance | MaD:1 Sink:MaD:1 |
+| main.rs:300:9:300:9 | s | main.rs:301:10:301:10 | s | provenance |  |
+| main.rs:300:9:300:9 | s | main.rs:301:10:301:10 | s | provenance |  |
+| main.rs:300:13:300:25 | simple_source | main.rs:300:13:300:29 | simple_source(...) | provenance | Src:MaD:7 MaD:7 |
+| main.rs:300:13:300:25 | simple_source | main.rs:300:13:300:29 | simple_source(...) | provenance | Src:MaD:7 MaD:7 |
+| main.rs:300:13:300:29 | simple_source(...) | main.rs:300:9:300:9 | s | provenance |  |
+| main.rs:300:13:300:29 | simple_source(...) | main.rs:300:9:300:9 | s | provenance |  |
+| main.rs:308:9:308:9 | s | main.rs:309:17:309:17 | s | provenance |  |
+| main.rs:308:9:308:9 | s | main.rs:309:17:309:17 | s | provenance |  |
+| main.rs:308:13:308:22 | source(...) | main.rs:308:9:308:9 | s | provenance |  |
+| main.rs:308:13:308:22 | source(...) | main.rs:308:9:308:9 | s | provenance |  |
+| main.rs:309:17:309:17 | s | main.rs:309:5:309:15 | simple_sink | provenance | MaD:3 Sink:MaD:3 |
+| main.rs:309:17:309:17 | s | main.rs:309:5:309:15 | simple_sink | provenance | MaD:3 Sink:MaD:3 |
+| main.rs:317:5:317:14 | arg_source | main.rs:317:16:317:16 | [post] i | provenance | Src:MaD:5 MaD:5 |
+| main.rs:317:5:317:14 | arg_source | main.rs:317:16:317:16 | [post] i | provenance | Src:MaD:5 MaD:5 |
+| main.rs:317:16:317:16 | [post] i | main.rs:318:10:318:10 | i | provenance |  |
+| main.rs:317:16:317:16 | [post] i | main.rs:318:10:318:10 | i | provenance |  |
+| main.rs:370:9:370:10 | x1 | main.rs:371:10:371:11 | x1 | provenance |  |
+| main.rs:370:9:370:10 | x1 | main.rs:371:10:371:11 | x1 | provenance |  |
+| main.rs:370:14:370:23 | source(...) | main.rs:370:14:370:30 | ... .max(...) | provenance | MaD:9 |
+| main.rs:370:14:370:23 | source(...) | main.rs:370:14:370:30 | ... .max(...) | provenance | MaD:9 |
+| main.rs:370:14:370:30 | ... .max(...) | main.rs:370:9:370:10 | x1 | provenance |  |
+| main.rs:370:14:370:30 | ... .max(...) | main.rs:370:9:370:10 | x1 | provenance |  |
+| main.rs:373:9:373:10 | x2 [MyStruct.field1] | main.rs:381:10:381:11 | x2 [MyStruct.field1] | provenance |  |
+| main.rs:373:9:373:10 | x2 [MyStruct.field1] | main.rs:381:10:381:11 | x2 [MyStruct.field1] | provenance |  |
+| main.rs:373:14:380:6 | ... .max(...) [MyStruct.field1] | main.rs:373:9:373:10 | x2 [MyStruct.field1] | provenance |  |
+| main.rs:373:14:380:6 | ... .max(...) [MyStruct.field1] | main.rs:373:9:373:10 | x2 [MyStruct.field1] | provenance |  |
+| main.rs:373:15:376:5 | MyStruct {...} [MyStruct.field1] | main.rs:373:14:380:6 | ... .max(...) [MyStruct.field1] | provenance | MaD:9 |
+| main.rs:373:15:376:5 | MyStruct {...} [MyStruct.field1] | main.rs:373:14:380:6 | ... .max(...) [MyStruct.field1] | provenance | MaD:9 |
+| main.rs:374:17:374:26 | source(...) | main.rs:373:15:376:5 | MyStruct {...} [MyStruct.field1] | provenance |  |
+| main.rs:374:17:374:26 | source(...) | main.rs:373:15:376:5 | MyStruct {...} [MyStruct.field1] | provenance |  |
+| main.rs:381:10:381:11 | x2 [MyStruct.field1] | main.rs:381:10:381:18 | x2.field1 | provenance |  |
+| main.rs:381:10:381:11 | x2 [MyStruct.field1] | main.rs:381:10:381:18 | x2.field1 | provenance |  |
+| main.rs:386:9:386:10 | x4 | main.rs:387:10:387:11 | x4 | provenance |  |
+| main.rs:386:9:386:10 | x4 | main.rs:387:10:387:11 | x4 | provenance |  |
+| main.rs:386:14:386:23 | source(...) | main.rs:386:14:386:30 | ... .max(...) | provenance | MaD:9 |
+| main.rs:386:14:386:23 | source(...) | main.rs:386:14:386:30 | ... .max(...) | provenance | MaD:9 |
+| main.rs:386:14:386:30 | ... .max(...) | main.rs:386:9:386:10 | x4 | provenance |  |
+| main.rs:386:14:386:30 | ... .max(...) | main.rs:386:9:386:10 | x4 | provenance |  |
+| main.rs:389:9:389:10 | x5 | main.rs:390:10:390:11 | x5 | provenance |  |
+| main.rs:389:14:389:23 | source(...) | main.rs:389:14:389:30 | ... .lt(...) | provenance | MaD:10 |
+| main.rs:389:14:389:30 | ... .lt(...) | main.rs:389:9:389:10 | x5 | provenance |  |
+| main.rs:392:9:392:10 | x6 | main.rs:393:10:393:11 | x6 | provenance |  |
+| main.rs:392:14:392:23 | source(...) | main.rs:392:14:392:27 | ... < ... | provenance | MaD:10 |
+| main.rs:392:14:392:27 | ... < ... | main.rs:392:9:392:10 | x6 | provenance |  |
 nodes
 | main.rs:15:9:15:9 | s | semmle.label | s |
 | main.rs:15:9:15:9 | s | semmle.label | s |
@@ -533,88 +550,112 @@ nodes
 | main.rs:247:35:247:35 | i | semmle.label | i |
 | main.rs:247:47:247:47 | i | semmle.label | i |
 | main.rs:247:47:247:47 | i | semmle.label | i |
-| main.rs:256:9:256:9 | s | semmle.label | s |
-| main.rs:256:9:256:9 | s | semmle.label | s |
-| main.rs:256:13:256:22 | source(...) | semmle.label | source(...) |
-| main.rs:256:13:256:22 | source(...) | semmle.label | source(...) |
-| main.rs:257:5:257:13 | enum_sink | semmle.label | enum_sink |
-| main.rs:257:5:257:13 | enum_sink | semmle.label | enum_sink |
-| main.rs:257:15:257:43 | ...::C {...} [C] | semmle.label | ...::C {...} [C] |
-| main.rs:257:15:257:43 | ...::C {...} [C] | semmle.label | ...::C {...} [C] |
-| main.rs:257:41:257:41 | s | semmle.label | s |
-| main.rs:257:41:257:41 | s | semmle.label | s |
-| main.rs:262:9:262:9 | s | semmle.label | s |
-| main.rs:262:9:262:9 | s | semmle.label | s |
-| main.rs:262:13:262:22 | source(...) | semmle.label | source(...) |
-| main.rs:262:13:262:22 | source(...) | semmle.label | source(...) |
-| main.rs:263:9:263:9 | e [D] | semmle.label | e [D] |
-| main.rs:263:9:263:9 | e [D] | semmle.label | e [D] |
-| main.rs:263:13:263:41 | ...::D {...} [D] | semmle.label | ...::D {...} [D] |
-| main.rs:263:13:263:41 | ...::D {...} [D] | semmle.label | ...::D {...} [D] |
-| main.rs:263:39:263:39 | s | semmle.label | s |
-| main.rs:263:39:263:39 | s | semmle.label | s |
-| main.rs:264:5:264:5 | e [D] | semmle.label | e [D] |
-| main.rs:264:5:264:5 | e [D] | semmle.label | e [D] |
-| main.rs:264:7:264:10 | sink | semmle.label | sink |
-| main.rs:264:7:264:10 | sink | semmle.label | sink |
-| main.rs:273:9:273:9 | s | semmle.label | s |
-| main.rs:273:9:273:9 | s | semmle.label | s |
-| main.rs:273:13:273:25 | simple_source | semmle.label | simple_source |
-| main.rs:273:13:273:25 | simple_source | semmle.label | simple_source |
-| main.rs:273:13:273:29 | simple_source(...) | semmle.label | simple_source(...) |
-| main.rs:273:13:273:29 | simple_source(...) | semmle.label | simple_source(...) |
-| main.rs:274:10:274:10 | s | semmle.label | s |
-| main.rs:274:10:274:10 | s | semmle.label | s |
-| main.rs:281:9:281:9 | s | semmle.label | s |
-| main.rs:281:9:281:9 | s | semmle.label | s |
-| main.rs:281:13:281:22 | source(...) | semmle.label | source(...) |
-| main.rs:281:13:281:22 | source(...) | semmle.label | source(...) |
-| main.rs:282:5:282:15 | simple_sink | semmle.label | simple_sink |
-| main.rs:282:5:282:15 | simple_sink | semmle.label | simple_sink |
-| main.rs:282:17:282:17 | s | semmle.label | s |
-| main.rs:282:17:282:17 | s | semmle.label | s |
-| main.rs:290:5:290:14 | arg_source | semmle.label | arg_source |
-| main.rs:290:5:290:14 | arg_source | semmle.label | arg_source |
-| main.rs:290:16:290:16 | [post] i | semmle.label | [post] i |
-| main.rs:290:16:290:16 | [post] i | semmle.label | [post] i |
-| main.rs:291:10:291:10 | i | semmle.label | i |
-| main.rs:291:10:291:10 | i | semmle.label | i |
-| main.rs:343:9:343:10 | x1 | semmle.label | x1 |
-| main.rs:343:9:343:10 | x1 | semmle.label | x1 |
-| main.rs:343:14:343:23 | source(...) | semmle.label | source(...) |
-| main.rs:343:14:343:23 | source(...) | semmle.label | source(...) |
-| main.rs:343:14:343:30 | ... .max(...) | semmle.label | ... .max(...) |
-| main.rs:343:14:343:30 | ... .max(...) | semmle.label | ... .max(...) |
-| main.rs:344:10:344:11 | x1 | semmle.label | x1 |
-| main.rs:344:10:344:11 | x1 | semmle.label | x1 |
-| main.rs:346:9:346:10 | x2 [MyStruct.field1] | semmle.label | x2 [MyStruct.field1] |
-| main.rs:346:9:346:10 | x2 [MyStruct.field1] | semmle.label | x2 [MyStruct.field1] |
-| main.rs:346:14:353:6 | ... .max(...) [MyStruct.field1] | semmle.label | ... .max(...) [MyStruct.field1] |
-| main.rs:346:14:353:6 | ... .max(...) [MyStruct.field1] | semmle.label | ... .max(...) [MyStruct.field1] |
-| main.rs:346:15:349:5 | MyStruct {...} [MyStruct.field1] | semmle.label | MyStruct {...} [MyStruct.field1] |
-| main.rs:346:15:349:5 | MyStruct {...} [MyStruct.field1] | semmle.label | MyStruct {...} [MyStruct.field1] |
-| main.rs:347:17:347:26 | source(...) | semmle.label | source(...) |
-| main.rs:347:17:347:26 | source(...) | semmle.label | source(...) |
-| main.rs:354:10:354:11 | x2 [MyStruct.field1] | semmle.label | x2 [MyStruct.field1] |
-| main.rs:354:10:354:11 | x2 [MyStruct.field1] | semmle.label | x2 [MyStruct.field1] |
-| main.rs:354:10:354:18 | x2.field1 | semmle.label | x2.field1 |
-| main.rs:354:10:354:18 | x2.field1 | semmle.label | x2.field1 |
-| main.rs:359:9:359:10 | x4 | semmle.label | x4 |
-| main.rs:359:9:359:10 | x4 | semmle.label | x4 |
-| main.rs:359:14:359:23 | source(...) | semmle.label | source(...) |
-| main.rs:359:14:359:23 | source(...) | semmle.label | source(...) |
-| main.rs:359:14:359:30 | ... .max(...) | semmle.label | ... .max(...) |
-| main.rs:359:14:359:30 | ... .max(...) | semmle.label | ... .max(...) |
-| main.rs:360:10:360:11 | x4 | semmle.label | x4 |
-| main.rs:360:10:360:11 | x4 | semmle.label | x4 |
-| main.rs:362:9:362:10 | x5 | semmle.label | x5 |
-| main.rs:362:14:362:23 | source(...) | semmle.label | source(...) |
-| main.rs:362:14:362:30 | ... .lt(...) | semmle.label | ... .lt(...) |
-| main.rs:363:10:363:11 | x5 | semmle.label | x5 |
-| main.rs:365:9:365:10 | x6 | semmle.label | x6 |
-| main.rs:365:14:365:23 | source(...) | semmle.label | source(...) |
-| main.rs:365:14:365:27 | ... < ... | semmle.label | ... < ... |
-| main.rs:366:10:366:11 | x6 | semmle.label | x6 |
+| main.rs:261:18:261:18 | ... | semmle.label | ... |
+| main.rs:261:18:261:18 | ... | semmle.label | ... |
+| main.rs:261:26:261:26 | a | semmle.label | a |
+| main.rs:261:26:261:26 | a | semmle.label | a |
+| main.rs:262:9:262:19 | pass_source | semmle.label | pass_source |
+| main.rs:262:9:262:19 | pass_source | semmle.label | pass_source |
+| main.rs:264:9:264:19 | pass_source | semmle.label | pass_source |
+| main.rs:264:9:264:19 | pass_source | semmle.label | pass_source |
+| main.rs:264:25:264:25 | ... | semmle.label | ... |
+| main.rs:264:25:264:25 | ... | semmle.label | ... |
+| main.rs:265:18:265:18 | a | semmle.label | a |
+| main.rs:265:18:265:18 | a | semmle.label | a |
+| main.rs:268:14:268:19 | ...: i64 | semmle.label | ...: i64 |
+| main.rs:268:14:268:19 | ...: i64 | semmle.label | ...: i64 |
+| main.rs:269:18:269:18 | a | semmle.label | a |
+| main.rs:269:18:269:18 | a | semmle.label | a |
+| main.rs:271:9:271:19 | pass_source | semmle.label | pass_source |
+| main.rs:271:9:271:19 | pass_source | semmle.label | pass_source |
+| main.rs:273:9:273:19 | pass_source | semmle.label | pass_source |
+| main.rs:273:9:273:19 | pass_source | semmle.label | pass_source |
+| main.rs:273:36:273:36 | ... | semmle.label | ... |
+| main.rs:273:36:273:36 | ... | semmle.label | ... |
+| main.rs:274:18:274:18 | a | semmle.label | a |
+| main.rs:274:18:274:18 | a | semmle.label | a |
+| main.rs:283:9:283:9 | s | semmle.label | s |
+| main.rs:283:9:283:9 | s | semmle.label | s |
+| main.rs:283:13:283:22 | source(...) | semmle.label | source(...) |
+| main.rs:283:13:283:22 | source(...) | semmle.label | source(...) |
+| main.rs:284:5:284:13 | enum_sink | semmle.label | enum_sink |
+| main.rs:284:5:284:13 | enum_sink | semmle.label | enum_sink |
+| main.rs:284:15:284:43 | ...::C {...} [C] | semmle.label | ...::C {...} [C] |
+| main.rs:284:15:284:43 | ...::C {...} [C] | semmle.label | ...::C {...} [C] |
+| main.rs:284:41:284:41 | s | semmle.label | s |
+| main.rs:284:41:284:41 | s | semmle.label | s |
+| main.rs:289:9:289:9 | s | semmle.label | s |
+| main.rs:289:9:289:9 | s | semmle.label | s |
+| main.rs:289:13:289:22 | source(...) | semmle.label | source(...) |
+| main.rs:289:13:289:22 | source(...) | semmle.label | source(...) |
+| main.rs:290:9:290:9 | e [D] | semmle.label | e [D] |
+| main.rs:290:9:290:9 | e [D] | semmle.label | e [D] |
+| main.rs:290:13:290:41 | ...::D {...} [D] | semmle.label | ...::D {...} [D] |
+| main.rs:290:13:290:41 | ...::D {...} [D] | semmle.label | ...::D {...} [D] |
+| main.rs:290:39:290:39 | s | semmle.label | s |
+| main.rs:290:39:290:39 | s | semmle.label | s |
+| main.rs:291:5:291:5 | e [D] | semmle.label | e [D] |
+| main.rs:291:5:291:5 | e [D] | semmle.label | e [D] |
+| main.rs:291:7:291:10 | sink | semmle.label | sink |
+| main.rs:291:7:291:10 | sink | semmle.label | sink |
+| main.rs:300:9:300:9 | s | semmle.label | s |
+| main.rs:300:9:300:9 | s | semmle.label | s |
+| main.rs:300:13:300:25 | simple_source | semmle.label | simple_source |
+| main.rs:300:13:300:25 | simple_source | semmle.label | simple_source |
+| main.rs:300:13:300:29 | simple_source(...) | semmle.label | simple_source(...) |
+| main.rs:300:13:300:29 | simple_source(...) | semmle.label | simple_source(...) |
+| main.rs:301:10:301:10 | s | semmle.label | s |
+| main.rs:301:10:301:10 | s | semmle.label | s |
+| main.rs:308:9:308:9 | s | semmle.label | s |
+| main.rs:308:9:308:9 | s | semmle.label | s |
+| main.rs:308:13:308:22 | source(...) | semmle.label | source(...) |
+| main.rs:308:13:308:22 | source(...) | semmle.label | source(...) |
+| main.rs:309:5:309:15 | simple_sink | semmle.label | simple_sink |
+| main.rs:309:5:309:15 | simple_sink | semmle.label | simple_sink |
+| main.rs:309:17:309:17 | s | semmle.label | s |
+| main.rs:309:17:309:17 | s | semmle.label | s |
+| main.rs:317:5:317:14 | arg_source | semmle.label | arg_source |
+| main.rs:317:5:317:14 | arg_source | semmle.label | arg_source |
+| main.rs:317:16:317:16 | [post] i | semmle.label | [post] i |
+| main.rs:317:16:317:16 | [post] i | semmle.label | [post] i |
+| main.rs:318:10:318:10 | i | semmle.label | i |
+| main.rs:318:10:318:10 | i | semmle.label | i |
+| main.rs:370:9:370:10 | x1 | semmle.label | x1 |
+| main.rs:370:9:370:10 | x1 | semmle.label | x1 |
+| main.rs:370:14:370:23 | source(...) | semmle.label | source(...) |
+| main.rs:370:14:370:23 | source(...) | semmle.label | source(...) |
+| main.rs:370:14:370:30 | ... .max(...) | semmle.label | ... .max(...) |
+| main.rs:370:14:370:30 | ... .max(...) | semmle.label | ... .max(...) |
+| main.rs:371:10:371:11 | x1 | semmle.label | x1 |
+| main.rs:371:10:371:11 | x1 | semmle.label | x1 |
+| main.rs:373:9:373:10 | x2 [MyStruct.field1] | semmle.label | x2 [MyStruct.field1] |
+| main.rs:373:9:373:10 | x2 [MyStruct.field1] | semmle.label | x2 [MyStruct.field1] |
+| main.rs:373:14:380:6 | ... .max(...) [MyStruct.field1] | semmle.label | ... .max(...) [MyStruct.field1] |
+| main.rs:373:14:380:6 | ... .max(...) [MyStruct.field1] | semmle.label | ... .max(...) [MyStruct.field1] |
+| main.rs:373:15:376:5 | MyStruct {...} [MyStruct.field1] | semmle.label | MyStruct {...} [MyStruct.field1] |
+| main.rs:373:15:376:5 | MyStruct {...} [MyStruct.field1] | semmle.label | MyStruct {...} [MyStruct.field1] |
+| main.rs:374:17:374:26 | source(...) | semmle.label | source(...) |
+| main.rs:374:17:374:26 | source(...) | semmle.label | source(...) |
+| main.rs:381:10:381:11 | x2 [MyStruct.field1] | semmle.label | x2 [MyStruct.field1] |
+| main.rs:381:10:381:11 | x2 [MyStruct.field1] | semmle.label | x2 [MyStruct.field1] |
+| main.rs:381:10:381:18 | x2.field1 | semmle.label | x2.field1 |
+| main.rs:381:10:381:18 | x2.field1 | semmle.label | x2.field1 |
+| main.rs:386:9:386:10 | x4 | semmle.label | x4 |
+| main.rs:386:9:386:10 | x4 | semmle.label | x4 |
+| main.rs:386:14:386:23 | source(...) | semmle.label | source(...) |
+| main.rs:386:14:386:23 | source(...) | semmle.label | source(...) |
+| main.rs:386:14:386:30 | ... .max(...) | semmle.label | ... .max(...) |
+| main.rs:386:14:386:30 | ... .max(...) | semmle.label | ... .max(...) |
+| main.rs:387:10:387:11 | x4 | semmle.label | x4 |
+| main.rs:387:10:387:11 | x4 | semmle.label | x4 |
+| main.rs:389:9:389:10 | x5 | semmle.label | x5 |
+| main.rs:389:14:389:23 | source(...) | semmle.label | source(...) |
+| main.rs:389:14:389:30 | ... .lt(...) | semmle.label | ... .lt(...) |
+| main.rs:390:10:390:11 | x5 | semmle.label | x5 |
+| main.rs:392:9:392:10 | x6 | semmle.label | x6 |
+| main.rs:392:14:392:23 | source(...) | semmle.label | source(...) |
+| main.rs:392:14:392:27 | ... < ... | semmle.label | ... < ... |
+| main.rs:393:10:393:11 | x6 | semmle.label | x6 |
 subpaths
 | main.rs:198:23:198:23 | f [captured s] | main.rs:197:40:197:40 | s | main.rs:197:17:197:42 | if ... {...} else {...} | main.rs:198:13:198:24 | apply(...) |
 | main.rs:198:23:198:23 | f [captured s] | main.rs:197:40:197:40 | s | main.rs:197:17:197:42 | if ... {...} else {...} | main.rs:198:13:198:24 | apply(...) |
@@ -658,21 +699,29 @@ invalidSpecComponent
 | main.rs:239:47:239:47 | i | main.rs:236:13:236:23 | enum_source | main.rs:239:47:239:47 | i | $@ | main.rs:236:13:236:23 | enum_source | enum_source |
 | main.rs:247:47:247:47 | i | main.rs:245:15:245:20 | source | main.rs:247:47:247:47 | i | $@ | main.rs:245:15:245:20 | source | source |
 | main.rs:247:47:247:47 | i | main.rs:245:15:245:20 | source | main.rs:247:47:247:47 | i | $@ | main.rs:245:15:245:20 | source | source |
-| main.rs:257:5:257:13 | enum_sink | main.rs:256:13:256:22 | source(...) | main.rs:257:5:257:13 | enum_sink | $@ | main.rs:256:13:256:22 | source(...) | source(...) |
-| main.rs:257:5:257:13 | enum_sink | main.rs:256:13:256:22 | source(...) | main.rs:257:5:257:13 | enum_sink | $@ | main.rs:256:13:256:22 | source(...) | source(...) |
-| main.rs:264:7:264:10 | sink | main.rs:262:13:262:22 | source(...) | main.rs:264:7:264:10 | sink | $@ | main.rs:262:13:262:22 | source(...) | source(...) |
-| main.rs:264:7:264:10 | sink | main.rs:262:13:262:22 | source(...) | main.rs:264:7:264:10 | sink | $@ | main.rs:262:13:262:22 | source(...) | source(...) |
-| main.rs:274:10:274:10 | s | main.rs:273:13:273:25 | simple_source | main.rs:274:10:274:10 | s | $@ | main.rs:273:13:273:25 | simple_source | simple_source |
-| main.rs:274:10:274:10 | s | main.rs:273:13:273:25 | simple_source | main.rs:274:10:274:10 | s | $@ | main.rs:273:13:273:25 | simple_source | simple_source |
-| main.rs:282:5:282:15 | simple_sink | main.rs:281:13:281:22 | source(...) | main.rs:282:5:282:15 | simple_sink | $@ | main.rs:281:13:281:22 | source(...) | source(...) |
-| main.rs:282:5:282:15 | simple_sink | main.rs:281:13:281:22 | source(...) | main.rs:282:5:282:15 | simple_sink | $@ | main.rs:281:13:281:22 | source(...) | source(...) |
-| main.rs:291:10:291:10 | i | main.rs:290:5:290:14 | arg_source | main.rs:291:10:291:10 | i | $@ | main.rs:290:5:290:14 | arg_source | arg_source |
-| main.rs:291:10:291:10 | i | main.rs:290:5:290:14 | arg_source | main.rs:291:10:291:10 | i | $@ | main.rs:290:5:290:14 | arg_source | arg_source |
-| main.rs:344:10:344:11 | x1 | main.rs:343:14:343:23 | source(...) | main.rs:344:10:344:11 | x1 | $@ | main.rs:343:14:343:23 | source(...) | source(...) |
-| main.rs:344:10:344:11 | x1 | main.rs:343:14:343:23 | source(...) | main.rs:344:10:344:11 | x1 | $@ | main.rs:343:14:343:23 | source(...) | source(...) |
-| main.rs:354:10:354:18 | x2.field1 | main.rs:347:17:347:26 | source(...) | main.rs:354:10:354:18 | x2.field1 | $@ | main.rs:347:17:347:26 | source(...) | source(...) |
-| main.rs:354:10:354:18 | x2.field1 | main.rs:347:17:347:26 | source(...) | main.rs:354:10:354:18 | x2.field1 | $@ | main.rs:347:17:347:26 | source(...) | source(...) |
-| main.rs:360:10:360:11 | x4 | main.rs:359:14:359:23 | source(...) | main.rs:360:10:360:11 | x4 | $@ | main.rs:359:14:359:23 | source(...) | source(...) |
-| main.rs:360:10:360:11 | x4 | main.rs:359:14:359:23 | source(...) | main.rs:360:10:360:11 | x4 | $@ | main.rs:359:14:359:23 | source(...) | source(...) |
-| main.rs:363:10:363:11 | x5 | main.rs:362:14:362:23 | source(...) | main.rs:363:10:363:11 | x5 | $@ | main.rs:362:14:362:23 | source(...) | source(...) |
-| main.rs:366:10:366:11 | x6 | main.rs:365:14:365:23 | source(...) | main.rs:366:10:366:11 | x6 | $@ | main.rs:365:14:365:23 | source(...) | source(...) |
+| main.rs:261:26:261:26 | a | main.rs:262:9:262:19 | pass_source | main.rs:261:26:261:26 | a | $@ | main.rs:262:9:262:19 | pass_source | pass_source |
+| main.rs:261:26:261:26 | a | main.rs:262:9:262:19 | pass_source | main.rs:261:26:261:26 | a | $@ | main.rs:262:9:262:19 | pass_source | pass_source |
+| main.rs:265:18:265:18 | a | main.rs:264:9:264:19 | pass_source | main.rs:265:18:265:18 | a | $@ | main.rs:264:9:264:19 | pass_source | pass_source |
+| main.rs:265:18:265:18 | a | main.rs:264:9:264:19 | pass_source | main.rs:265:18:265:18 | a | $@ | main.rs:264:9:264:19 | pass_source | pass_source |
+| main.rs:269:18:269:18 | a | main.rs:271:9:271:19 | pass_source | main.rs:269:18:269:18 | a | $@ | main.rs:271:9:271:19 | pass_source | pass_source |
+| main.rs:269:18:269:18 | a | main.rs:271:9:271:19 | pass_source | main.rs:269:18:269:18 | a | $@ | main.rs:271:9:271:19 | pass_source | pass_source |
+| main.rs:274:18:274:18 | a | main.rs:273:9:273:19 | pass_source | main.rs:274:18:274:18 | a | $@ | main.rs:273:9:273:19 | pass_source | pass_source |
+| main.rs:274:18:274:18 | a | main.rs:273:9:273:19 | pass_source | main.rs:274:18:274:18 | a | $@ | main.rs:273:9:273:19 | pass_source | pass_source |
+| main.rs:284:5:284:13 | enum_sink | main.rs:283:13:283:22 | source(...) | main.rs:284:5:284:13 | enum_sink | $@ | main.rs:283:13:283:22 | source(...) | source(...) |
+| main.rs:284:5:284:13 | enum_sink | main.rs:283:13:283:22 | source(...) | main.rs:284:5:284:13 | enum_sink | $@ | main.rs:283:13:283:22 | source(...) | source(...) |
+| main.rs:291:7:291:10 | sink | main.rs:289:13:289:22 | source(...) | main.rs:291:7:291:10 | sink | $@ | main.rs:289:13:289:22 | source(...) | source(...) |
+| main.rs:291:7:291:10 | sink | main.rs:289:13:289:22 | source(...) | main.rs:291:7:291:10 | sink | $@ | main.rs:289:13:289:22 | source(...) | source(...) |
+| main.rs:301:10:301:10 | s | main.rs:300:13:300:25 | simple_source | main.rs:301:10:301:10 | s | $@ | main.rs:300:13:300:25 | simple_source | simple_source |
+| main.rs:301:10:301:10 | s | main.rs:300:13:300:25 | simple_source | main.rs:301:10:301:10 | s | $@ | main.rs:300:13:300:25 | simple_source | simple_source |
+| main.rs:309:5:309:15 | simple_sink | main.rs:308:13:308:22 | source(...) | main.rs:309:5:309:15 | simple_sink | $@ | main.rs:308:13:308:22 | source(...) | source(...) |
+| main.rs:309:5:309:15 | simple_sink | main.rs:308:13:308:22 | source(...) | main.rs:309:5:309:15 | simple_sink | $@ | main.rs:308:13:308:22 | source(...) | source(...) |
+| main.rs:318:10:318:10 | i | main.rs:317:5:317:14 | arg_source | main.rs:318:10:318:10 | i | $@ | main.rs:317:5:317:14 | arg_source | arg_source |
+| main.rs:318:10:318:10 | i | main.rs:317:5:317:14 | arg_source | main.rs:318:10:318:10 | i | $@ | main.rs:317:5:317:14 | arg_source | arg_source |
+| main.rs:371:10:371:11 | x1 | main.rs:370:14:370:23 | source(...) | main.rs:371:10:371:11 | x1 | $@ | main.rs:370:14:370:23 | source(...) | source(...) |
+| main.rs:371:10:371:11 | x1 | main.rs:370:14:370:23 | source(...) | main.rs:371:10:371:11 | x1 | $@ | main.rs:370:14:370:23 | source(...) | source(...) |
+| main.rs:381:10:381:18 | x2.field1 | main.rs:374:17:374:26 | source(...) | main.rs:381:10:381:18 | x2.field1 | $@ | main.rs:374:17:374:26 | source(...) | source(...) |
+| main.rs:381:10:381:18 | x2.field1 | main.rs:374:17:374:26 | source(...) | main.rs:381:10:381:18 | x2.field1 | $@ | main.rs:374:17:374:26 | source(...) | source(...) |
+| main.rs:387:10:387:11 | x4 | main.rs:386:14:386:23 | source(...) | main.rs:387:10:387:11 | x4 | $@ | main.rs:386:14:386:23 | source(...) | source(...) |
+| main.rs:387:10:387:11 | x4 | main.rs:386:14:386:23 | source(...) | main.rs:387:10:387:11 | x4 | $@ | main.rs:386:14:386:23 | source(...) | source(...) |
+| main.rs:390:10:390:11 | x5 | main.rs:389:14:389:23 | source(...) | main.rs:390:10:390:11 | x5 | $@ | main.rs:389:14:389:23 | source(...) | source(...) |
+| main.rs:393:10:393:11 | x6 | main.rs:392:14:392:23 | source(...) | main.rs:393:10:393:11 | x6 | $@ | main.rs:392:14:392:23 | source(...) | source(...) |
diff --git a/rust/ql/test/library-tests/dataflow/models/models.ext.yml b/rust/ql/test/library-tests/dataflow/models/models.ext.yml
index eb51ac64f50..52342e88022 100644
--- a/rust/ql/test/library-tests/dataflow/models/models.ext.yml
+++ b/rust/ql/test/library-tests/dataflow/models/models.ext.yml
@@ -7,6 +7,7 @@ extensions:
       - ["main::enum_source", "ReturnValue.Field[main::MyFieldEnum::D::field_d]", "test-source", "manual"]
       - ["<main::MyFieldEnum>::source", "ReturnValue.Field[main::MyFieldEnum::C::field_c]", "test-source", "manual"]
       - ["main::arg_source", "Argument[0]", "test-source", "manual"]
+      - ["main::source_into_function::pass_source", "Argument[1].Parameter[0]", "test-source", "manual"]
   - addsTo:
       pack: codeql/rust-all
       extensible: sinkModel
diff --git a/rust/ql/test/library-tests/dataflow/sources/CONSISTENCY/PathResolutionConsistency.expected b/rust/ql/test/library-tests/dataflow/sources/CONSISTENCY/PathResolutionConsistency.expected
deleted file mode 100644
index 19b896ddee2..00000000000
--- a/rust/ql/test/library-tests/dataflow/sources/CONSISTENCY/PathResolutionConsistency.expected
+++ /dev/null
@@ -1,89 +0,0 @@
-multipleCallTargets
-| test.rs:98:14:98:43 | ...::_print(...) |
-| test.rs:110:14:110:33 | ...::_print(...) |
-| test.rs:113:62:113:77 | ...::from(...) |
-| test.rs:120:58:120:73 | ...::from(...) |
-| test.rs:136:22:136:43 | ...::_print(...) |
-| test.rs:141:22:141:43 | ...::_print(...) |
-| test.rs:145:22:145:44 | ...::_print(...) |
-| test.rs:161:26:161:110 | ...::_print(...) |
-| test.rs:169:26:169:111 | ...::_print(...) |
-| test.rs:179:30:179:68 | ...::_print(...) |
-| test.rs:188:26:188:105 | ...::_print(...) |
-| test.rs:229:22:229:72 | ... .read_to_string(...) |
-| test.rs:483:22:483:50 | file.read_to_end(...) |
-| test.rs:489:22:489:53 | file.read_to_string(...) |
-| test.rs:610:18:610:38 | ...::_print(...) |
-| test.rs:615:18:615:45 | ...::_print(...) |
-| test.rs:619:25:619:49 | address.to_socket_addrs() |
-| test.rs:633:38:633:42 | ...::_print(...) |
-| test.rs:637:38:637:54 | ...::_print(...) |
-| test.rs:642:38:642:51 | ...::_print(...) |
-| test.rs:652:34:652:52 | ...::_print(...) |
-| test.rs:671:14:671:43 | ...::_print(...) |
-| test.rs:686:18:686:42 | ...::_print(...) |
-| test.rs:690:18:690:42 | ...::_print(...) |
-| test.rs:695:18:695:45 | ...::_print(...) |
-| test.rs:702:30:702:34 | ...::_print(...) |
-| test.rs:706:30:706:52 | ...::_print(...) |
-| test.rs:715:30:715:43 | ...::_print(...) |
-| test.rs:725:30:725:34 | ...::_print(...) |
-| test.rs:729:30:729:52 | ...::_print(...) |
-| test.rs:738:30:738:43 | ...::_print(...) |
-| test.rs:753:14:753:43 | ...::_print(...) |
-| test.rs:767:14:767:34 | ...::_print(...) |
-| test.rs:807:50:807:66 | ...::from(...) |
-| test.rs:807:50:807:66 | ...::from(...) |
-| test.rs:809:14:809:31 | ...::_print(...) |
-| test.rs:812:14:812:31 | ...::_print(...) |
-| test.rs:815:14:815:31 | ...::_print(...) |
-| test.rs:818:14:818:30 | ...::_print(...) |
-| test.rs:820:27:820:36 | ...::_print(...) |
-| test.rs:821:28:821:41 | ...::_print(...) |
-| test.rs:824:14:824:33 | ...::_print(...) |
-| test.rs:826:27:826:36 | ...::_print(...) |
-| test.rs:827:28:827:41 | ...::_print(...) |
-| test.rs:830:14:830:31 | ...::_print(...) |
-| test.rs:832:27:832:36 | ...::_print(...) |
-| test.rs:833:28:833:41 | ...::_print(...) |
-| test.rs:836:14:836:34 | ...::_print(...) |
-| test.rs:838:27:838:36 | ...::_print(...) |
-| test.rs:839:28:839:41 | ...::_print(...) |
-| test.rs:842:14:842:25 | ...::_print(...) |
-| test.rs:844:27:844:36 | ...::_print(...) |
-| test.rs:845:28:845:41 | ...::_print(...) |
-| test.rs:848:14:848:31 | ...::_print(...) |
-| test.rs:850:27:850:36 | ...::_print(...) |
-| test.rs:851:28:851:41 | ...::_print(...) |
-| test.rs:854:14:854:30 | ...::_print(...) |
-| test.rs:856:27:856:36 | ...::_print(...) |
-| test.rs:857:28:857:41 | ...::_print(...) |
-| test.rs:860:14:860:33 | ...::_print(...) |
-| test.rs:862:27:862:36 | ...::_print(...) |
-| test.rs:863:28:863:41 | ...::_print(...) |
-| test.rs:866:14:866:36 | ...::_print(...) |
-| test.rs:868:27:868:36 | ...::_print(...) |
-| test.rs:869:28:869:41 | ...::_print(...) |
-| test.rs:872:14:872:38 | ...::_print(...) |
-| test.rs:874:27:874:36 | ...::_print(...) |
-| test.rs:875:28:875:41 | ...::_print(...) |
-| test.rs:878:14:878:45 | ...::_print(...) |
-| test.rs:880:27:880:36 | ...::_print(...) |
-| test.rs:881:28:881:41 | ...::_print(...) |
-| test.rs:884:14:884:29 | ...::_print(...) |
-| test.rs:886:27:886:36 | ...::_print(...) |
-| test.rs:887:28:887:41 | ...::_print(...) |
-| test_futures_io.rs:35:26:35:63 | pinned.poll_read(...) |
-| test_futures_io.rs:62:22:62:50 | pinned.poll_fill_buf(...) |
-| test_futures_io.rs:69:23:69:67 | ... .poll_fill_buf(...) |
-| test_futures_io.rs:93:26:93:63 | pinned.poll_read(...) |
-| test_futures_io.rs:116:22:116:50 | pinned.poll_fill_buf(...) |
-| test_futures_io.rs:145:26:145:49 | ...::with_capacity(...) |
-| web_frameworks.rs:13:14:13:22 | a.as_str() |
-| web_frameworks.rs:13:14:13:23 | a.as_str() |
-| web_frameworks.rs:14:14:14:24 | a.as_bytes() |
-| web_frameworks.rs:14:14:14:25 | a.as_bytes() |
-| web_frameworks.rs:101:14:101:23 | a.as_str() |
-| web_frameworks.rs:102:14:102:25 | a.as_bytes() |
-| web_frameworks.rs:158:14:158:23 | a.as_str() |
-| web_frameworks.rs:159:14:159:25 | a.as_bytes() |
diff --git a/rust/ql/test/library-tests/dataflow/sources/CONSISTENCY/TypeInferenceConsistency.expected b/rust/ql/test/library-tests/dataflow/sources/CONSISTENCY/TypeInferenceConsistency.expected
deleted file mode 100644
index 6b051f73c7a..00000000000
--- a/rust/ql/test/library-tests/dataflow/sources/CONSISTENCY/TypeInferenceConsistency.expected
+++ /dev/null
@@ -1,4 +0,0 @@
-nonUniqueCertainType
-| web_frameworks.rs:139:30:139:39 | ...::get(...) |  |
-| web_frameworks.rs:140:34:140:43 | ...::get(...) |  |
-| web_frameworks.rs:141:30:141:39 | ...::get(...) |  |
diff --git a/rust/ql/test/library-tests/dataflow/sources/TaintSources.expected b/rust/ql/test/library-tests/dataflow/sources/TaintSources.expected
deleted file mode 100644
index 66d909f2e1b..00000000000
--- a/rust/ql/test/library-tests/dataflow/sources/TaintSources.expected
+++ /dev/null
@@ -1,94 +0,0 @@
-| test.rs:8:10:8:22 | ...::var | Flow source 'EnvironmentSource' of type environment (DEFAULT). |
-| test.rs:9:10:9:25 | ...::var_os | Flow source 'EnvironmentSource' of type environment (DEFAULT). |
-| test.rs:11:16:11:28 | ...::var | Flow source 'EnvironmentSource' of type environment (DEFAULT). |
-| test.rs:12:16:12:31 | ...::var_os | Flow source 'EnvironmentSource' of type environment (DEFAULT). |
-| test.rs:17:25:17:38 | ...::vars | Flow source 'EnvironmentSource' of type environment (DEFAULT). |
-| test.rs:22:25:22:41 | ...::vars_os | Flow source 'EnvironmentSource' of type environment (DEFAULT). |
-| test.rs:29:29:29:42 | ...::args | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
-| test.rs:32:16:32:29 | ...::args | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
-| test.rs:33:16:33:32 | ...::args_os | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
-| test.rs:34:16:34:29 | ...::args | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
-| test.rs:42:16:42:29 | ...::args | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
-| test.rs:46:16:46:32 | ...::args_os | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
-| test.rs:52:15:52:35 | ...::current_dir | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
-| test.rs:53:15:53:35 | ...::current_exe | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
-| test.rs:54:16:54:33 | ...::home_dir | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
-| test.rs:62:26:62:47 | ...::get | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:65:26:65:47 | ...::get | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:68:26:68:47 | ...::get | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:71:26:71:47 | ...::get | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:74:26:74:37 | ...::get | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:77:26:77:37 | ...::get | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:80:24:80:35 | ...::get | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:99:18:99:47 | ...::connect | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:114:31:114:42 | send_request | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:121:31:121:42 | send_request | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:211:22:211:35 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
-| test.rs:217:22:217:35 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
-| test.rs:223:22:223:35 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
-| test.rs:229:22:229:35 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
-| test.rs:235:9:235:22 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
-| test.rs:239:17:239:30 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
-| test.rs:246:50:246:63 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
-| test.rs:252:46:252:59 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
-| test.rs:259:50:259:63 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
-| test.rs:266:50:266:63 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
-| test.rs:273:56:273:69 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
-| test.rs:281:46:281:59 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
-| test.rs:288:46:288:59 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
-| test.rs:294:46:294:59 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
-| test.rs:309:25:309:40 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
-| test.rs:316:25:316:40 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
-| test.rs:323:25:323:40 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
-| test.rs:330:25:330:40 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
-| test.rs:337:25:337:40 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
-| test.rs:349:25:349:40 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
-| test.rs:358:52:358:67 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
-| test.rs:364:48:364:63 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
-| test.rs:371:52:371:67 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
-| test.rs:378:52:378:67 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
-| test.rs:385:58:385:73 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
-| test.rs:393:48:393:63 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
-| test.rs:408:31:408:43 | ...::read | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:408:31:408:43 | ...::read | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:413:31:413:38 | ...::read | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:413:31:413:38 | ...::read | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:418:22:418:39 | ...::read_to_string | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:418:22:418:39 | ...::read_to_string | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:424:22:424:25 | path | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:425:27:425:35 | file_name | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:431:22:431:34 | ...::read_link | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:440:31:440:45 | ...::read | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:445:31:445:45 | ...::read | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:450:22:450:46 | ...::read_to_string | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:456:26:456:29 | path | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:456:26:456:29 | path | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:457:31:457:39 | file_name | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:457:31:457:39 | file_name | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:463:22:463:41 | ...::read_link | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:473:20:473:38 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:507:21:507:39 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:508:21:508:39 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:516:21:516:39 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:528:20:528:40 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:575:21:575:41 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:576:21:576:41 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:584:21:584:41 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:601:26:601:53 | ...::connect | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:620:26:620:61 | ...::connect_timeout | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:672:28:672:57 | ...::connect | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:754:22:754:49 | ...::connect | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:780:22:780:50 | ...::new | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:807:16:807:29 | ...::args | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
-| test.rs:807:16:807:29 | ...::args | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
-| test_futures_io.rs:19:15:19:32 | ...::connect | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| web_frameworks.rs:11:31:11:31 | a | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| web_frameworks.rs:11:31:11:31 | a | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| web_frameworks.rs:22:14:22:18 | TuplePat | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| web_frameworks.rs:22:14:22:19 | TuplePat | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| web_frameworks.rs:48:14:48:28 | MyStruct {...} | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| web_frameworks.rs:48:14:48:30 | MyStruct {...} | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| web_frameworks.rs:58:14:58:15 | ms | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| web_frameworks.rs:58:14:58:15 | ms | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| web_frameworks.rs:68:15:68:15 | a | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| web_frameworks.rs:68:15:68:15 | a | Flow source 'RemoteSource' of type remote (DEFAULT). |
diff --git a/rust/ql/test/library-tests/dataflow/sources/database/CONSISTENCY/PathResolutionConsistency.expected b/rust/ql/test/library-tests/dataflow/sources/database/CONSISTENCY/PathResolutionConsistency.expected
new file mode 100644
index 00000000000..b6a4a56f9f7
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/sources/database/CONSISTENCY/PathResolutionConsistency.expected
@@ -0,0 +1,3 @@
+multiplePathResolutions
+| test.rs:10:28:10:65 | Result::<...> |
+| test.rs:97:40:97:49 | Result::<...> |
diff --git a/rust/ql/test/library-tests/dataflow/sources/database/Cargo.lock b/rust/ql/test/library-tests/dataflow/sources/database/Cargo.lock
new file mode 100644
index 00000000000..5edf980e52e
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/sources/database/Cargo.lock
@@ -0,0 +1,2008 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "adler2"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "allocator-api2"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
+
+[[package]]
+name = "async-channel"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"
+dependencies = [
+ "concurrent-queue",
+ "event-listener 2.5.3",
+ "futures-core",
+]
+
+[[package]]
+name = "async-channel"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "924ed96dd52d1b75e9c1a3e6275715fd320f5f9439fb5a4a11fa51f4221158d2"
+dependencies = [
+ "concurrent-queue",
+ "event-listener-strategy",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-executor"
+version = "1.13.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "497c00e0fd83a72a79a39fcbd8e3e2f055d6f6c7e025f3b3d91f4f8e76527fb8"
+dependencies = [
+ "async-task",
+ "concurrent-queue",
+ "fastrand",
+ "futures-lite",
+ "pin-project-lite",
+ "slab",
+]
+
+[[package]]
+name = "async-global-executor"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c"
+dependencies = [
+ "async-channel 2.5.0",
+ "async-executor",
+ "async-io",
+ "async-lock",
+ "blocking",
+ "futures-lite",
+ "once_cell",
+]
+
+[[package]]
+name = "async-io"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "456b8a8feb6f42d237746d4b3e9a178494627745c3c56c6ea55d92ba50d026fc"
+dependencies = [
+ "autocfg",
+ "cfg-if",
+ "concurrent-queue",
+ "futures-io",
+ "futures-lite",
+ "parking",
+ "polling",
+ "rustix",
+ "slab",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "async-lock"
+version = "3.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5fd03604047cee9b6ce9de9f70c6cd540a0520c813cbd49bae61f33ab80ed1dc"
+dependencies = [
+ "event-listener 5.4.1",
+ "event-listener-strategy",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-std"
+version = "1.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c8e079a4ab67ae52b7403632e4618815d6db36d2a010cfe41b02c1b1578f93b"
+dependencies = [
+ "async-channel 1.9.0",
+ "async-global-executor",
+ "async-io",
+ "async-lock",
+ "crossbeam-utils",
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-lite",
+ "gloo-timers",
+ "kv-log-macro",
+ "log",
+ "memchr",
+ "once_cell",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+ "wasm-bindgen-futures",
+]
+
+[[package]]
+name = "async-task"
+version = "4.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
+
+[[package]]
+name = "atomic-waker"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+
+[[package]]
+name = "autocfg"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
+
+[[package]]
+name = "base64"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+
+[[package]]
+name = "bitflags"
+version = "2.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
+
+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "blocking"
+version = "1.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e83f8d02be6967315521be875afa792a316e28d57b5a2d401897e2a7921b7f21"
+dependencies = [
+ "async-channel 2.5.0",
+ "async-task",
+ "futures-io",
+ "futures-lite",
+ "piper",
+]
+
+[[package]]
+name = "btoi"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9dd6407f73a9b8b6162d8a2ef999fe6afd7cc15902ebf42c5cd296addf17e0ad"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "bufstream"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40e38929add23cdf8a366df9b0e088953150724bcbe5fc330b0d8eb3b328eec8"
+
+[[package]]
+name = "bumpalo"
+version = "3.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "bytes"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
+
+[[package]]
+name = "cc"
+version = "1.2.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac9fe6cdbb24b6ade63616c0a0688e45bb56732262c158df3c0c4bea4ca47cb7"
+dependencies = [
+ "find-msvc-tools",
+ "shlex",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
+
+[[package]]
+name = "concurrent-queue"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crc32fast"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "crossbeam-queue"
+version = "0.3.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
+
+[[package]]
+name = "crypto-common"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
+[[package]]
+name = "darling"
+version = "0.20.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee"
+dependencies = [
+ "darling_core",
+ "darling_macro",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.20.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim",
+ "syn",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.20.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
+dependencies = [
+ "darling_core",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "derive_utils"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccfae181bab5ab6c5478b2ccb69e4c68a02f8c3ec72f6616bfec9dbc599d2ee0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer",
+ "crypto-common",
+]
+
+[[package]]
+name = "displaydoc"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
+
+[[package]]
+name = "errno"
+version = "0.3.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
+dependencies = [
+ "libc",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "event-listener"
+version = "2.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
+
+[[package]]
+name = "event-listener"
+version = "5.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab"
+dependencies = [
+ "concurrent-queue",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "event-listener-strategy"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93"
+dependencies = [
+ "event-listener 5.4.1",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "fastrand"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
+
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127"
+
+[[package]]
+name = "flate2"
+version = "1.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc5a4e564e38c699f2880d3fda590bedc2e69f3f84cd48b457bd892ce61d0aa9"
+dependencies = [
+ "crc32fast",
+ "libz-sys",
+ "miniz_oxide",
+]
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "foldhash"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
+
+[[package]]
+name = "form_urlencoded"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf"
+dependencies = [
+ "percent-encoding",
+]
+
+[[package]]
+name = "futures"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
+
+[[package]]
+name = "futures-executor"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-io"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
+
+[[package]]
+name = "futures-lite"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f78e10609fe0e0b3f4157ffab1876319b5b0db102a2c60dc4626306dc46b44ad"
+dependencies = [
+ "fastrand",
+ "futures-core",
+ "futures-io",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "futures-macro"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
+
+[[package]]
+name = "futures-task"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
+
+[[package]]
+name = "futures-util"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-macro",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
+[[package]]
+name = "generic-array"
+version = "0.14.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4bb6743198531e02858aeaea5398fcc883e71851fcbcb5a2f773e2fb6cb1edf2"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "r-efi",
+ "wasip2",
+]
+
+[[package]]
+name = "gloo-timers"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.15.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
+dependencies = [
+ "allocator-api2",
+ "equivalent",
+ "foldhash",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d"
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[package]]
+name = "hermit-abi"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c"
+
+[[package]]
+name = "icu_collections"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47"
+dependencies = [
+ "displaydoc",
+ "potential_utf",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locale_core"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3"
+
+[[package]]
+name = "icu_properties"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locale_core",
+ "icu_properties_data",
+ "icu_provider",
+ "potential_utf",
+ "zerotrie",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632"
+
+[[package]]
+name = "icu_provider"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af"
+dependencies = [
+ "displaydoc",
+ "icu_locale_core",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerotrie",
+ "zerovec",
+]
+
+[[package]]
+name = "ident_case"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+
+[[package]]
+name = "idna"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6717a8d2a5a929a1a2eb43a12812498ed141a0bcfb7e8f7844fbdbe4303bba9f"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.16.0",
+]
+
+[[package]]
+name = "io-enum"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d197db2f7ebf90507296df3aebaf65d69f5dce8559d8dbd82776a6cadab61bbf"
+dependencies = [
+ "derive_utils",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
+
+[[package]]
+name = "js-sys"
+version = "0.3.81"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec48937a97411dcb524a265206ccd4c90bb711fca92b2792c407f268825b9305"
+dependencies = [
+ "once_cell",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "keyed_priority_queue"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ee7893dab2e44ae5f9d0173f26ff4aa327c10b01b06a72b52dd9405b628640d"
+dependencies = [
+ "indexmap",
+]
+
+[[package]]
+name = "kv-log-macro"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f"
+dependencies = [
+ "log",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.177"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
+
+[[package]]
+name = "libz-sys"
+version = "1.1.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b70e7a7df205e92a1a4cd9aaae7898dac0aa555503cc0a649494d0d60e7651d"
+dependencies = [
+ "cc",
+ "pkg-config",
+ "vcpkg",
+]
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039"
+
+[[package]]
+name = "litemap"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
+
+[[package]]
+name = "lock_api"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
+dependencies = [
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
+dependencies = [
+ "value-bag",
+]
+
+[[package]]
+name = "lru"
+version = "0.12.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38"
+
+[[package]]
+name = "lru"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f8cc7106155f10bdf99a6f379688f543ad6596a415375b36a59a054ceda1198"
+dependencies = [
+ "hashbrown 0.15.5",
+]
+
+[[package]]
+name = "memchr"
+version = "2.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
+dependencies = [
+ "adler2",
+ "simd-adler32",
+]
+
+[[package]]
+name = "mio"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69d83b0086dc8ecf3ce9ae2874b2d1290252e2a30720bea58a5c6639b0092873"
+dependencies = [
+ "libc",
+ "wasi",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "mysql"
+version = "26.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce2510a735f601bab18202b07ea0a197bd1d130d3a5ce2edf4577d225f0c3ee4"
+dependencies = [
+ "bufstream",
+ "bytes",
+ "crossbeam-queue",
+ "crossbeam-utils",
+ "flate2",
+ "io-enum",
+ "libc",
+ "lru 0.12.5",
+ "mysql_common",
+ "named_pipe",
+ "pem",
+ "percent-encoding",
+ "socket2 0.5.10",
+ "twox-hash",
+ "url",
+]
+
+[[package]]
+name = "mysql-common-derive"
+version = "0.32.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "66f62cad7623a9cb6f8f64037f0c4f69c8db8e82914334a83c9788201c2c1bfa"
+dependencies = [
+ "darling",
+ "heck",
+ "num-bigint",
+ "proc-macro-crate",
+ "proc-macro-error2",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "termcolor",
+ "thiserror",
+]
+
+[[package]]
+name = "mysql_async"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "277ce2f2459b2af4cc6d0a0b7892381f80800832f57c533f03e2845f4ea331ea"
+dependencies = [
+ "bytes",
+ "crossbeam-queue",
+ "flate2",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "keyed_priority_queue",
+ "lru 0.14.0",
+ "mysql_common",
+ "pem",
+ "percent-encoding",
+ "rand",
+ "serde",
+ "serde_json",
+ "socket2 0.5.10",
+ "thiserror",
+ "tokio",
+ "tokio-util",
+ "twox-hash",
+ "url",
+]
+
+[[package]]
+name = "mysql_common"
+version = "0.35.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbb9f371618ce723f095c61fbcdc36e8936956d2b62832f9c7648689b338e052"
+dependencies = [
+ "base64",
+ "bitflags",
+ "btoi",
+ "byteorder",
+ "bytes",
+ "crc32fast",
+ "flate2",
+ "getrandom",
+ "mysql-common-derive",
+ "num-bigint",
+ "num-traits",
+ "regex",
+ "saturating",
+ "serde",
+ "serde_json",
+ "sha1",
+ "sha2",
+ "thiserror",
+ "uuid",
+]
+
+[[package]]
+name = "named_pipe"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad9c443cce91fc3e12f017290db75dde490d685cdaaf508d7159d7cf41f0eb2b"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "num-bigint"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
+dependencies = [
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-integer"
+version = "0.1.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+
+[[package]]
+name = "parking"
+version = "2.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
+
+[[package]]
+name = "parking_lot"
+version = "0.12.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a"
+dependencies = [
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "windows-link",
+]
+
+[[package]]
+name = "pem"
+version = "3.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d30c53c26bc5b31a98cd02d20f25a7c8567146caf63ed593a9d87b2775291be"
+dependencies = [
+ "base64",
+ "serde_core",
+]
+
+[[package]]
+name = "percent-encoding"
+version = "2.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "piper"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066"
+dependencies = [
+ "atomic-waker",
+ "fastrand",
+ "futures-io",
+]
+
+[[package]]
+name = "pkg-config"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
+
+[[package]]
+name = "polling"
+version = "3.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d0e4f59085d47d8241c88ead0f274e8a0cb551f3625263c05eb8dd897c34218"
+dependencies = [
+ "cfg-if",
+ "concurrent-queue",
+ "hermit-abi",
+ "pin-project-lite",
+ "rustix",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "potential_utf"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84df19adbe5b5a0782edcab45899906947ab039ccf4573713735ee7de1e6b08a"
+dependencies = [
+ "zerovec",
+]
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
+dependencies = [
+ "zerocopy",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983"
+dependencies = [
+ "toml_edit",
+]
+
+[[package]]
+name = "proc-macro-error-attr2"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+]
+
+[[package]]
+name = "proc-macro-error2"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802"
+dependencies = [
+ "proc-macro-error-attr2",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.101"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "r-efi"
+version = "5.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
+
+[[package]]
+name = "rand"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
+dependencies = [
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
+dependencies = [
+ "bitflags",
+]
+
+[[package]]
+name = "regex"
+version = "1.12.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
+
+[[package]]
+name = "rustix"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e"
+dependencies = [
+ "bitflags",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
+
+[[package]]
+name = "ryu"
+version = "1.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
+
+[[package]]
+name = "saturating"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ece8e78b2f38ec51c51f5d475df0a7187ba5111b2a28bdc761ee05b075d40a71"
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "serde"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+dependencies = [
+ "serde_core",
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.145"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
+dependencies = [
+ "itoa",
+ "memchr",
+ "ryu",
+ "serde",
+ "serde_core",
+]
+
+[[package]]
+name = "sha1"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "sha2"
+version = "0.10.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2a4719bff48cee6b39d12c020eeb490953ad2443b7055bd0b21fca26bd8c28b"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "simd-adler32"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+
+[[package]]
+name = "slab"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
+
+[[package]]
+name = "smallvec"
+version = "1.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
+
+[[package]]
+name = "socket2"
+version = "0.5.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "socket2"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881"
+dependencies = [
+ "libc",
+ "windows-sys 0.60.2",
+]
+
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
+
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
+[[package]]
+name = "syn"
+version = "2.0.107"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a26dbd934e5451d21ef060c018dae56fc073894c5a7896f882928a76e6d081b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "synstructure"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "termcolor"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "test"
+version = "0.0.1"
+dependencies = [
+ "async-std",
+ "futures",
+ "mysql",
+ "mysql_async",
+ "tokio",
+]
+
+[[package]]
+name = "thiserror"
+version = "2.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "2.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "tinystr"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
+[[package]]
+name = "tokio"
+version = "1.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408"
+dependencies = [
+ "bytes",
+ "libc",
+ "mio",
+ "parking_lot",
+ "pin-project-lite",
+ "signal-hook-registry",
+ "socket2 0.6.1",
+ "tokio-macros",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "tokio-util"
+version = "0.7.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14307c986784f72ef81c89db7d9e28d6ac26d16213b109ea501696195e6e3ce5"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "futures-sink",
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2cdb639ebbc97961c51720f858597f7f24c4fc295327923af55b74c3c724533"
+dependencies = [
+ "serde_core",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.23.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6485ef6d0d9b5d0ec17244ff7eb05310113c3f316f2d14200d4de56b3cb98f8d"
+dependencies = [
+ "indexmap",
+ "toml_datetime",
+ "toml_parser",
+ "winnow",
+]
+
+[[package]]
+name = "toml_parser"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0cbe268d35bdb4bb5a56a2de88d0ad0eb70af5384a99d648cd4b3d04039800e"
+dependencies = [
+ "winnow",
+]
+
+[[package]]
+name = "twox-hash"
+version = "2.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ea3136b675547379c4bd395ca6b938e5ad3c3d20fad76e7fe85f9e0d011419c"
+
+[[package]]
+name = "typenum"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "462eeb75aeb73aea900253ce739c8e18a67423fadf006037cd3ff27e82748a06"
+
+[[package]]
+name = "url"
+version = "2.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b"
+dependencies = [
+ "form_urlencoded",
+ "idna",
+ "percent-encoding",
+ "serde",
+]
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
+[[package]]
+name = "uuid"
+version = "1.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "value-bag"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "943ce29a8a743eb10d6082545d861b24f9d1b160b7d741e0f2cdf726bec909c5"
+
+[[package]]
+name = "vcpkg"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+
+[[package]]
+name = "version_check"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+
+[[package]]
+name = "wasi"
+version = "0.11.1+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
+
+[[package]]
+name = "wasip2"
+version = "1.0.1+wasi-0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
+dependencies = [
+ "wit-bindgen",
+]
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1da10c01ae9f1ae40cbfac0bac3b1e724b320abfcf52229f80b547c0d250e2d"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "rustversion",
+ "wasm-bindgen-macro",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "671c9a5a66f49d8a47345ab942e2cb93c7d1d0339065d4f8139c486121b43b19"
+dependencies = [
+ "bumpalo",
+ "log",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-futures"
+version = "0.4.54"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e038d41e478cc73bae0ff9b36c60cff1c98b8f38f8d7e8061e79ee63608ac5c"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "once_cell",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ca60477e4c59f5f2986c50191cd972e3a50d8a95603bc9434501cf156a9a119"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f07d2f20d4da7b26400c9f4a0511e6e0345b040694e8a75bd41d578fa4421d7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bad67dc8b2a1a6e5448428adec4c3e84c43e561d8c9ee8a9e5aabeb193ec41d1"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "web-sys"
+version = "0.3.81"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9367c417a924a74cae129e6a2ae3b47fabb1f8995595ab474029da749a8be120"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-util"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
+dependencies = [
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-link"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
+dependencies = [
+ "windows-targets 0.53.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.61.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
+dependencies = [
+ "windows-link",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
+ "windows_i686_gnullvm 0.52.6",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.53.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
+dependencies = [
+ "windows-link",
+ "windows_aarch64_gnullvm 0.53.1",
+ "windows_aarch64_msvc 0.53.1",
+ "windows_i686_gnu 0.53.1",
+ "windows_i686_gnullvm 0.53.1",
+ "windows_i686_msvc 0.53.1",
+ "windows_x86_64_gnu 0.53.1",
+ "windows_x86_64_gnullvm 0.53.1",
+ "windows_x86_64_msvc 0.53.1",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
+
+[[package]]
+name = "winnow"
+version = "0.7.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "wit-bindgen"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
+
+[[package]]
+name = "writeable"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb"
+
+[[package]]
+name = "yoke"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.8.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.8.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
+[[package]]
+name = "zerotrie"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7aa2bd55086f1ab526693ecbe444205da57e25f4489879da80635a46d90e73b"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
diff --git a/rust/ql/test/library-tests/dataflow/sources/database/InlineFlow.expected b/rust/ql/test/library-tests/dataflow/sources/database/InlineFlow.expected
new file mode 100644
index 00000000000..db1e69c43fb
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/sources/database/InlineFlow.expected
@@ -0,0 +1,205 @@
+models
+| 1 | Source: <_ as mysql::conn::queryable::Queryable>::query_first; ReturnValue.Field[core::result::Result::Ok(0)].Field[core::option::Option::Some(0)]; database |
+| 2 | Source: <_ as mysql::conn::queryable::Queryable>::query_fold; Argument[2].Parameter[1]; database |
+| 3 | Source: <_ as mysql::conn::queryable::Queryable>::query_map; Argument[1].Parameter[0]; database |
+| 4 | Source: <_ as mysql_async::queryable::Queryable>::query_fold; Argument[2].Parameter[1]; database |
+| 5 | Source: <_ as mysql_async::queryable::Queryable>::query_map; Argument[1].Parameter[0]; database |
+| 6 | Source: <mysql::conn::pool::PooledConn as mysql::conn::queryable::Queryable>::exec_iter; ReturnValue.Field[core::result::Result::Ok(0)].Element; database |
+| 7 | Source: <mysql_common::row::Row>::get; ReturnValue.Field[core::option::Option::Some(0)]; database |
+| 8 | Source: <mysql_common::row::Row>::get_opt; ReturnValue.Field[core::option::Option::Some(0)].Field[core::result::Result::Ok(0)]; database |
+| 9 | Source: <mysql_common::row::Row>::take; ReturnValue.Field[core::option::Option::Some(0)]; database |
+| 10 | Source: <mysql_common::row::Row>::take_opt; ReturnValue.Field[core::option::Option::Some(0)].Field[core::result::Result::Ok(0)]; database |
+| 11 | Summary: <_ as core::ops::arith::Add>::add; Argument[0].Reference; ReturnValue; taint |
+| 12 | Summary: <_ as core::ops::arith::Add>::add; Argument[0]; ReturnValue; taint |
+| 13 | Summary: <_ as mysql::conn::queryable::Queryable>::query_fold; Argument[2].ReturnValue; ReturnValue.Field[core::result::Result::Ok(0)]; value |
+| 14 | Summary: <_ as mysql_async::queryable::Queryable>::query_fold; Argument[2].ReturnValue; ReturnValue.Future.Field[core::result::Result::Ok(0)]; value |
+| 15 | Summary: <core::i64 as core::ops::arith::Add>::add; Argument[0]; ReturnValue; taint |
+| 16 | Summary: <core::option::Option>::unwrap; Argument[self].Field[core::option::Option::Some(0)]; ReturnValue; value |
+| 17 | Summary: <core::result::Result>::unwrap; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
+edges
+| test.rs:18:13:18:14 | v1 | test.rs:19:14:19:15 | v1 | provenance |  |
+| test.rs:18:24:18:33 | row.get(...) [Some] | test.rs:18:24:18:42 | ... .unwrap() | provenance | MaD:16 |
+| test.rs:18:24:18:42 | ... .unwrap() | test.rs:18:13:18:14 | v1 | provenance |  |
+| test.rs:18:28:18:30 | get | test.rs:18:24:18:33 | row.get(...) [Some] | provenance | Src:MaD:7  |
+| test.rs:21:13:21:14 | v2 | test.rs:22:14:22:15 | v2 | provenance |  |
+| test.rs:21:24:21:37 | row.get_opt(...) [Some, Ok] | test.rs:21:24:21:46 | ... .unwrap() [Ok] | provenance | MaD:16 |
+| test.rs:21:24:21:46 | ... .unwrap() [Ok] | test.rs:21:24:21:55 | ... .unwrap() | provenance | MaD:17 |
+| test.rs:21:24:21:55 | ... .unwrap() | test.rs:21:13:21:14 | v2 | provenance |  |
+| test.rs:21:28:21:34 | get_opt | test.rs:21:24:21:37 | row.get_opt(...) [Some, Ok] | provenance | Src:MaD:8  |
+| test.rs:24:13:24:14 | v3 | test.rs:25:14:25:15 | v3 | provenance |  |
+| test.rs:24:24:24:34 | row.take(...) [Some] | test.rs:24:24:24:43 | ... .unwrap() | provenance | MaD:16 |
+| test.rs:24:24:24:43 | ... .unwrap() | test.rs:24:13:24:14 | v3 | provenance |  |
+| test.rs:24:28:24:31 | take | test.rs:24:24:24:34 | row.take(...) [Some] | provenance | Src:MaD:9  |
+| test.rs:27:13:27:14 | v4 | test.rs:28:14:28:15 | v4 | provenance |  |
+| test.rs:27:24:27:38 | row.take_opt(...) [Some, Ok] | test.rs:27:24:27:47 | ... .unwrap() [Ok] | provenance | MaD:16 |
+| test.rs:27:24:27:47 | ... .unwrap() [Ok] | test.rs:27:24:27:56 | ... .unwrap() | provenance | MaD:17 |
+| test.rs:27:24:27:56 | ... .unwrap() | test.rs:27:13:27:14 | v4 | provenance |  |
+| test.rs:27:28:27:35 | take_opt | test.rs:27:24:27:38 | row.take_opt(...) [Some, Ok] | provenance | Src:MaD:10  |
+| test.rs:37:13:37:14 | v6 | test.rs:38:14:38:15 | v6 | provenance |  |
+| test.rs:37:23:37:63 | conn.query_first(...) [Ok, Some] | test.rs:37:23:37:64 | TryExpr [Some] | provenance |  |
+| test.rs:37:23:37:64 | TryExpr [Some] | test.rs:37:23:37:73 | ... .unwrap() | provenance | MaD:16 |
+| test.rs:37:23:37:73 | ... .unwrap() | test.rs:37:13:37:14 | v6 | provenance |  |
+| test.rs:37:28:37:38 | query_first | test.rs:37:23:37:63 | conn.query_first(...) [Ok, Some] | provenance | Src:MaD:1  |
+| test.rs:40:13:40:18 | mut t1 [element] | test.rs:42:20:42:21 | t1 [element] | provenance |  |
+| test.rs:40:22:40:71 | conn.exec_iter(...) [Ok, element] | test.rs:40:22:40:72 | TryExpr [element] | provenance |  |
+| test.rs:40:22:40:72 | TryExpr [element] | test.rs:40:13:40:18 | mut t1 [element] | provenance |  |
+| test.rs:40:27:40:35 | exec_iter | test.rs:40:22:40:71 | conn.exec_iter(...) [Ok, element] | provenance | Src:MaD:6  |
+| test.rs:41:14:41:61 | ... .get(...) [Some] | test.rs:41:14:41:70 | ... .unwrap() | provenance | MaD:16 |
+| test.rs:41:42:41:44 | get | test.rs:41:14:41:61 | ... .get(...) [Some] | provenance | Src:MaD:7  |
+| test.rs:42:13:42:15 | row | test.rs:44:22:44:22 | v | provenance |  |
+| test.rs:42:20:42:21 | t1 [element] | test.rs:42:13:42:15 | row | provenance |  |
+| test.rs:48:22:48:30 | query_map | test.rs:50:14:50:24 | ...: i64 | provenance | Src:MaD:3  |
+| test.rs:50:14:50:24 | ...: i64 | test.rs:51:22:51:27 | values | provenance |  |
+| test.rs:64:13:64:17 | total | test.rs:68:14:68:18 | total | provenance |  |
+| test.rs:64:21:67:10 | conn.query_fold(...) [Ok] | test.rs:64:21:67:11 | TryExpr | provenance |  |
+| test.rs:64:21:67:11 | TryExpr | test.rs:64:13:64:17 | total | provenance |  |
+| test.rs:64:26:64:35 | query_fold | test.rs:64:76:64:83 | ...: i64 | provenance | Src:MaD:2  |
+| test.rs:64:76:64:83 | ...: i64 | test.rs:64:86:67:9 | { ... } | provenance |  |
+| test.rs:64:76:64:83 | ...: i64 | test.rs:65:18:65:20 | row | provenance |  |
+| test.rs:64:76:64:83 | ...: i64 | test.rs:66:19:66:21 | row | provenance |  |
+| test.rs:64:86:67:9 | { ... } | test.rs:64:21:67:10 | conn.query_fold(...) [Ok] | provenance | MaD:13 |
+| test.rs:66:13:66:21 | ... + ... | test.rs:64:86:67:9 | { ... } | provenance |  |
+| test.rs:66:19:66:21 | row | test.rs:66:13:66:21 | ... + ... | provenance | MaD:11 |
+| test.rs:66:19:66:21 | row | test.rs:66:13:66:21 | ... + ... | provenance | MaD:12 |
+| test.rs:66:19:66:21 | row | test.rs:66:13:66:21 | ... + ... | provenance | MaD:15 |
+| test.rs:105:13:105:14 | v1 | test.rs:106:14:106:15 | v1 | provenance |  |
+| test.rs:105:24:105:33 | row.get(...) [Some] | test.rs:105:24:105:42 | ... .unwrap() | provenance | MaD:16 |
+| test.rs:105:24:105:42 | ... .unwrap() | test.rs:105:13:105:14 | v1 | provenance |  |
+| test.rs:105:28:105:30 | get | test.rs:105:24:105:33 | row.get(...) [Some] | provenance | Src:MaD:7  |
+| test.rs:108:13:108:14 | v2 | test.rs:109:14:109:15 | v2 | provenance |  |
+| test.rs:108:24:108:37 | row.get_opt(...) [Some, Ok] | test.rs:108:24:108:46 | ... .unwrap() [Ok] | provenance | MaD:16 |
+| test.rs:108:24:108:46 | ... .unwrap() [Ok] | test.rs:108:24:108:55 | ... .unwrap() | provenance | MaD:17 |
+| test.rs:108:24:108:55 | ... .unwrap() | test.rs:108:13:108:14 | v2 | provenance |  |
+| test.rs:108:28:108:34 | get_opt | test.rs:108:24:108:37 | row.get_opt(...) [Some, Ok] | provenance | Src:MaD:8  |
+| test.rs:111:13:111:14 | v3 | test.rs:112:14:112:15 | v3 | provenance |  |
+| test.rs:111:24:111:34 | row.take(...) [Some] | test.rs:111:24:111:43 | ... .unwrap() | provenance | MaD:16 |
+| test.rs:111:24:111:43 | ... .unwrap() | test.rs:111:13:111:14 | v3 | provenance |  |
+| test.rs:111:28:111:31 | take | test.rs:111:24:111:34 | row.take(...) [Some] | provenance | Src:MaD:9  |
+| test.rs:114:13:114:14 | v4 | test.rs:115:14:115:15 | v4 | provenance |  |
+| test.rs:114:24:114:38 | row.take_opt(...) [Some, Ok] | test.rs:114:24:114:47 | ... .unwrap() [Ok] | provenance | MaD:16 |
+| test.rs:114:24:114:47 | ... .unwrap() [Ok] | test.rs:114:24:114:56 | ... .unwrap() | provenance | MaD:17 |
+| test.rs:114:24:114:56 | ... .unwrap() | test.rs:114:13:114:14 | v4 | provenance |  |
+| test.rs:114:28:114:35 | take_opt | test.rs:114:24:114:38 | row.take_opt(...) [Some, Ok] | provenance | Src:MaD:10  |
+| test.rs:135:22:135:30 | query_map | test.rs:137:14:137:24 | ...: i64 | provenance | Src:MaD:5  |
+| test.rs:137:14:137:24 | ...: i64 | test.rs:138:22:138:27 | values | provenance |  |
+| test.rs:151:13:151:17 | total | test.rs:155:14:155:18 | total | provenance |  |
+| test.rs:151:21:154:10 | conn.query_fold(...) [future, Ok] | test.rs:151:21:154:16 | await ... [Ok] | provenance |  |
+| test.rs:151:21:154:16 | await ... [Ok] | test.rs:151:21:154:17 | TryExpr | provenance |  |
+| test.rs:151:21:154:17 | TryExpr | test.rs:151:13:151:17 | total | provenance |  |
+| test.rs:151:26:151:35 | query_fold | test.rs:151:76:151:83 | ...: i64 | provenance | Src:MaD:4  |
+| test.rs:151:76:151:83 | ...: i64 | test.rs:151:86:154:9 | { ... } | provenance |  |
+| test.rs:151:76:151:83 | ...: i64 | test.rs:152:18:152:20 | row | provenance |  |
+| test.rs:151:76:151:83 | ...: i64 | test.rs:153:19:153:21 | row | provenance |  |
+| test.rs:151:86:154:9 | { ... } | test.rs:151:21:154:10 | conn.query_fold(...) [future, Ok] | provenance | MaD:14 |
+| test.rs:153:13:153:21 | ... + ... | test.rs:151:86:154:9 | { ... } | provenance |  |
+| test.rs:153:19:153:21 | row | test.rs:153:13:153:21 | ... + ... | provenance | MaD:11 |
+| test.rs:153:19:153:21 | row | test.rs:153:13:153:21 | ... + ... | provenance | MaD:12 |
+| test.rs:153:19:153:21 | row | test.rs:153:13:153:21 | ... + ... | provenance | MaD:15 |
+nodes
+| test.rs:18:13:18:14 | v1 | semmle.label | v1 |
+| test.rs:18:24:18:33 | row.get(...) [Some] | semmle.label | row.get(...) [Some] |
+| test.rs:18:24:18:42 | ... .unwrap() | semmle.label | ... .unwrap() |
+| test.rs:18:28:18:30 | get | semmle.label | get |
+| test.rs:19:14:19:15 | v1 | semmle.label | v1 |
+| test.rs:21:13:21:14 | v2 | semmle.label | v2 |
+| test.rs:21:24:21:37 | row.get_opt(...) [Some, Ok] | semmle.label | row.get_opt(...) [Some, Ok] |
+| test.rs:21:24:21:46 | ... .unwrap() [Ok] | semmle.label | ... .unwrap() [Ok] |
+| test.rs:21:24:21:55 | ... .unwrap() | semmle.label | ... .unwrap() |
+| test.rs:21:28:21:34 | get_opt | semmle.label | get_opt |
+| test.rs:22:14:22:15 | v2 | semmle.label | v2 |
+| test.rs:24:13:24:14 | v3 | semmle.label | v3 |
+| test.rs:24:24:24:34 | row.take(...) [Some] | semmle.label | row.take(...) [Some] |
+| test.rs:24:24:24:43 | ... .unwrap() | semmle.label | ... .unwrap() |
+| test.rs:24:28:24:31 | take | semmle.label | take |
+| test.rs:25:14:25:15 | v3 | semmle.label | v3 |
+| test.rs:27:13:27:14 | v4 | semmle.label | v4 |
+| test.rs:27:24:27:38 | row.take_opt(...) [Some, Ok] | semmle.label | row.take_opt(...) [Some, Ok] |
+| test.rs:27:24:27:47 | ... .unwrap() [Ok] | semmle.label | ... .unwrap() [Ok] |
+| test.rs:27:24:27:56 | ... .unwrap() | semmle.label | ... .unwrap() |
+| test.rs:27:28:27:35 | take_opt | semmle.label | take_opt |
+| test.rs:28:14:28:15 | v4 | semmle.label | v4 |
+| test.rs:37:13:37:14 | v6 | semmle.label | v6 |
+| test.rs:37:23:37:63 | conn.query_first(...) [Ok, Some] | semmle.label | conn.query_first(...) [Ok, Some] |
+| test.rs:37:23:37:64 | TryExpr [Some] | semmle.label | TryExpr [Some] |
+| test.rs:37:23:37:73 | ... .unwrap() | semmle.label | ... .unwrap() |
+| test.rs:37:28:37:38 | query_first | semmle.label | query_first |
+| test.rs:38:14:38:15 | v6 | semmle.label | v6 |
+| test.rs:40:13:40:18 | mut t1 [element] | semmle.label | mut t1 [element] |
+| test.rs:40:22:40:71 | conn.exec_iter(...) [Ok, element] | semmle.label | conn.exec_iter(...) [Ok, element] |
+| test.rs:40:22:40:72 | TryExpr [element] | semmle.label | TryExpr [element] |
+| test.rs:40:27:40:35 | exec_iter | semmle.label | exec_iter |
+| test.rs:41:14:41:61 | ... .get(...) [Some] | semmle.label | ... .get(...) [Some] |
+| test.rs:41:14:41:70 | ... .unwrap() | semmle.label | ... .unwrap() |
+| test.rs:41:42:41:44 | get | semmle.label | get |
+| test.rs:42:13:42:15 | row | semmle.label | row |
+| test.rs:42:20:42:21 | t1 [element] | semmle.label | t1 [element] |
+| test.rs:44:22:44:22 | v | semmle.label | v |
+| test.rs:48:22:48:30 | query_map | semmle.label | query_map |
+| test.rs:50:14:50:24 | ...: i64 | semmle.label | ...: i64 |
+| test.rs:51:22:51:27 | values | semmle.label | values |
+| test.rs:64:13:64:17 | total | semmle.label | total |
+| test.rs:64:21:67:10 | conn.query_fold(...) [Ok] | semmle.label | conn.query_fold(...) [Ok] |
+| test.rs:64:21:67:11 | TryExpr | semmle.label | TryExpr |
+| test.rs:64:26:64:35 | query_fold | semmle.label | query_fold |
+| test.rs:64:76:64:83 | ...: i64 | semmle.label | ...: i64 |
+| test.rs:64:86:67:9 | { ... } | semmle.label | { ... } |
+| test.rs:65:18:65:20 | row | semmle.label | row |
+| test.rs:66:13:66:21 | ... + ... | semmle.label | ... + ... |
+| test.rs:66:19:66:21 | row | semmle.label | row |
+| test.rs:68:14:68:18 | total | semmle.label | total |
+| test.rs:105:13:105:14 | v1 | semmle.label | v1 |
+| test.rs:105:24:105:33 | row.get(...) [Some] | semmle.label | row.get(...) [Some] |
+| test.rs:105:24:105:42 | ... .unwrap() | semmle.label | ... .unwrap() |
+| test.rs:105:28:105:30 | get | semmle.label | get |
+| test.rs:106:14:106:15 | v1 | semmle.label | v1 |
+| test.rs:108:13:108:14 | v2 | semmle.label | v2 |
+| test.rs:108:24:108:37 | row.get_opt(...) [Some, Ok] | semmle.label | row.get_opt(...) [Some, Ok] |
+| test.rs:108:24:108:46 | ... .unwrap() [Ok] | semmle.label | ... .unwrap() [Ok] |
+| test.rs:108:24:108:55 | ... .unwrap() | semmle.label | ... .unwrap() |
+| test.rs:108:28:108:34 | get_opt | semmle.label | get_opt |
+| test.rs:109:14:109:15 | v2 | semmle.label | v2 |
+| test.rs:111:13:111:14 | v3 | semmle.label | v3 |
+| test.rs:111:24:111:34 | row.take(...) [Some] | semmle.label | row.take(...) [Some] |
+| test.rs:111:24:111:43 | ... .unwrap() | semmle.label | ... .unwrap() |
+| test.rs:111:28:111:31 | take | semmle.label | take |
+| test.rs:112:14:112:15 | v3 | semmle.label | v3 |
+| test.rs:114:13:114:14 | v4 | semmle.label | v4 |
+| test.rs:114:24:114:38 | row.take_opt(...) [Some, Ok] | semmle.label | row.take_opt(...) [Some, Ok] |
+| test.rs:114:24:114:47 | ... .unwrap() [Ok] | semmle.label | ... .unwrap() [Ok] |
+| test.rs:114:24:114:56 | ... .unwrap() | semmle.label | ... .unwrap() |
+| test.rs:114:28:114:35 | take_opt | semmle.label | take_opt |
+| test.rs:115:14:115:15 | v4 | semmle.label | v4 |
+| test.rs:135:22:135:30 | query_map | semmle.label | query_map |
+| test.rs:137:14:137:24 | ...: i64 | semmle.label | ...: i64 |
+| test.rs:138:22:138:27 | values | semmle.label | values |
+| test.rs:151:13:151:17 | total | semmle.label | total |
+| test.rs:151:21:154:10 | conn.query_fold(...) [future, Ok] | semmle.label | conn.query_fold(...) [future, Ok] |
+| test.rs:151:21:154:16 | await ... [Ok] | semmle.label | await ... [Ok] |
+| test.rs:151:21:154:17 | TryExpr | semmle.label | TryExpr |
+| test.rs:151:26:151:35 | query_fold | semmle.label | query_fold |
+| test.rs:151:76:151:83 | ...: i64 | semmle.label | ...: i64 |
+| test.rs:151:86:154:9 | { ... } | semmle.label | { ... } |
+| test.rs:152:18:152:20 | row | semmle.label | row |
+| test.rs:153:13:153:21 | ... + ... | semmle.label | ... + ... |
+| test.rs:153:19:153:21 | row | semmle.label | row |
+| test.rs:155:14:155:18 | total | semmle.label | total |
+subpaths
+testFailures
+#select
+| test.rs:19:14:19:15 | v1 | test.rs:18:28:18:30 | get | test.rs:19:14:19:15 | v1 | $@ | test.rs:18:28:18:30 | get | get |
+| test.rs:22:14:22:15 | v2 | test.rs:21:28:21:34 | get_opt | test.rs:22:14:22:15 | v2 | $@ | test.rs:21:28:21:34 | get_opt | get_opt |
+| test.rs:25:14:25:15 | v3 | test.rs:24:28:24:31 | take | test.rs:25:14:25:15 | v3 | $@ | test.rs:24:28:24:31 | take | take |
+| test.rs:28:14:28:15 | v4 | test.rs:27:28:27:35 | take_opt | test.rs:28:14:28:15 | v4 | $@ | test.rs:27:28:27:35 | take_opt | take_opt |
+| test.rs:38:14:38:15 | v6 | test.rs:37:28:37:38 | query_first | test.rs:38:14:38:15 | v6 | $@ | test.rs:37:28:37:38 | query_first | query_first |
+| test.rs:41:14:41:70 | ... .unwrap() | test.rs:41:42:41:44 | get | test.rs:41:14:41:70 | ... .unwrap() | $@ | test.rs:41:42:41:44 | get | get |
+| test.rs:44:22:44:22 | v | test.rs:40:27:40:35 | exec_iter | test.rs:44:22:44:22 | v | $@ | test.rs:40:27:40:35 | exec_iter | exec_iter |
+| test.rs:51:22:51:27 | values | test.rs:48:22:48:30 | query_map | test.rs:51:22:51:27 | values | $@ | test.rs:48:22:48:30 | query_map | query_map |
+| test.rs:65:18:65:20 | row | test.rs:64:26:64:35 | query_fold | test.rs:65:18:65:20 | row | $@ | test.rs:64:26:64:35 | query_fold | query_fold |
+| test.rs:68:14:68:18 | total | test.rs:64:26:64:35 | query_fold | test.rs:68:14:68:18 | total | $@ | test.rs:64:26:64:35 | query_fold | query_fold |
+| test.rs:106:14:106:15 | v1 | test.rs:105:28:105:30 | get | test.rs:106:14:106:15 | v1 | $@ | test.rs:105:28:105:30 | get | get |
+| test.rs:109:14:109:15 | v2 | test.rs:108:28:108:34 | get_opt | test.rs:109:14:109:15 | v2 | $@ | test.rs:108:28:108:34 | get_opt | get_opt |
+| test.rs:112:14:112:15 | v3 | test.rs:111:28:111:31 | take | test.rs:112:14:112:15 | v3 | $@ | test.rs:111:28:111:31 | take | take |
+| test.rs:115:14:115:15 | v4 | test.rs:114:28:114:35 | take_opt | test.rs:115:14:115:15 | v4 | $@ | test.rs:114:28:114:35 | take_opt | take_opt |
+| test.rs:138:22:138:27 | values | test.rs:135:22:135:30 | query_map | test.rs:138:22:138:27 | values | $@ | test.rs:135:22:135:30 | query_map | query_map |
+| test.rs:152:18:152:20 | row | test.rs:151:26:151:35 | query_fold | test.rs:152:18:152:20 | row | $@ | test.rs:151:26:151:35 | query_fold | query_fold |
+| test.rs:155:14:155:18 | total | test.rs:151:26:151:35 | query_fold | test.rs:155:14:155:18 | total | $@ | test.rs:151:26:151:35 | query_fold | query_fold |
diff --git a/rust/ql/test/library-tests/dataflow/sources/database/InlineFlow.qlref b/rust/ql/test/library-tests/dataflow/sources/database/InlineFlow.qlref
new file mode 100644
index 00000000000..e0f7493db39
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/sources/database/InlineFlow.qlref
@@ -0,0 +1,2 @@
+query: ../env/InlineFlow.ql
+
diff --git a/rust/ql/test/library-tests/dataflow/sources/database/TaintSources.expected b/rust/ql/test/library-tests/dataflow/sources/database/TaintSources.expected
new file mode 100644
index 00000000000..9132dfaa2b0
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/sources/database/TaintSources.expected
@@ -0,0 +1,25 @@
+| test.rs:15:47:15:51 | query | Flow source 'DatabaseSource' of type database (DEFAULT). |
+| test.rs:18:28:18:30 | get | Flow source 'DatabaseSource' of type database (DEFAULT). |
+| test.rs:21:28:21:34 | get_opt | Flow source 'DatabaseSource' of type database (DEFAULT). |
+| test.rs:24:28:24:31 | take | Flow source 'DatabaseSource' of type database (DEFAULT). |
+| test.rs:27:28:27:35 | take_opt | Flow source 'DatabaseSource' of type database (DEFAULT). |
+| test.rs:30:26:30:31 | as_ref | Flow source 'DatabaseSource' of type database (DEFAULT). |
+| test.rs:37:28:37:38 | query_first | Flow source 'DatabaseSource' of type database (DEFAULT). |
+| test.rs:40:27:40:35 | exec_iter | Flow source 'DatabaseSource' of type database (DEFAULT). |
+| test.rs:41:42:41:44 | get | Flow source 'DatabaseSource' of type database (DEFAULT). |
+| test.rs:48:22:48:30 | query_map | Flow source 'DatabaseSource' of type database (DEFAULT). |
+| test.rs:55:22:55:30 | query_map | Flow source 'DatabaseSource' of type database (DEFAULT). |
+| test.rs:64:26:64:35 | query_fold | Flow source 'DatabaseSource' of type database (DEFAULT). |
+| test.rs:70:22:70:31 | query_fold | Flow source 'DatabaseSource' of type database (DEFAULT). |
+| test.rs:102:53:102:57 | query | Flow source 'DatabaseSource' of type database (DEFAULT). |
+| test.rs:105:28:105:30 | get | Flow source 'DatabaseSource' of type database (DEFAULT). |
+| test.rs:108:28:108:34 | get_opt | Flow source 'DatabaseSource' of type database (DEFAULT). |
+| test.rs:111:28:111:31 | take | Flow source 'DatabaseSource' of type database (DEFAULT). |
+| test.rs:114:28:114:35 | take_opt | Flow source 'DatabaseSource' of type database (DEFAULT). |
+| test.rs:117:26:117:31 | as_ref | Flow source 'DatabaseSource' of type database (DEFAULT). |
+| test.rs:124:28:124:38 | query_first | Flow source 'DatabaseSource' of type database (DEFAULT). |
+| test.rs:127:27:127:35 | exec_iter | Flow source 'DatabaseSource' of type database (DEFAULT). |
+| test.rs:135:22:135:30 | query_map | Flow source 'DatabaseSource' of type database (DEFAULT). |
+| test.rs:142:22:142:30 | query_map | Flow source 'DatabaseSource' of type database (DEFAULT). |
+| test.rs:151:26:151:35 | query_fold | Flow source 'DatabaseSource' of type database (DEFAULT). |
+| test.rs:157:22:157:31 | query_fold | Flow source 'DatabaseSource' of type database (DEFAULT). |
diff --git a/rust/ql/test/library-tests/dataflow/sources/TaintSources.qlref b/rust/ql/test/library-tests/dataflow/sources/database/TaintSources.qlref
similarity index 100%
rename from rust/ql/test/library-tests/dataflow/sources/TaintSources.qlref
rename to rust/ql/test/library-tests/dataflow/sources/database/TaintSources.qlref
diff --git a/rust/ql/test/library-tests/dataflow/sources/database/options.yml b/rust/ql/test/library-tests/dataflow/sources/database/options.yml
new file mode 100644
index 00000000000..af2d6ba2344
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/sources/database/options.yml
@@ -0,0 +1,7 @@
+qltest_cargo_check: true
+qltest_dependencies:
+    - async-std = { version = "1.13.1" }
+    - futures = { version = "0.3" }
+    - mysql = { version = "26.0.1" }
+    - mysql_async = { version = "0.36.1" }
+    - tokio = { version = "1.43.0", features = ["full"] }
diff --git a/rust/ql/test/library-tests/dataflow/sources/database/test.rs b/rust/ql/test/library-tests/dataflow/sources/database/test.rs
new file mode 100644
index 00000000000..5fbaef71144
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/sources/database/test.rs
@@ -0,0 +1,222 @@
+fn sink<T>(_: T) { }
+
+// --- tests ---
+
+mod test_mysql {
+    use mysql::*;
+    use mysql::prelude::*;
+    use super::sink;
+
+    pub fn test_mysql() -> Result<(), Box<dyn std::error::Error>> {
+        // connect through a MySQL connection pool
+        let mut pool = mysql::Pool::new("")?;
+        let mut conn = pool.get_conn()?;
+
+        let mut rows : Vec<mysql::Row> = conn.query("SELECT id, name, age FROM person")?; // $ Alert[rust/summary/taint-sources]
+        let mut row = &mut rows[0];
+
+        let v1 : i64 = row.get(0).unwrap(); // $ Alert[rust/summary/taint-sources]
+        sink(v1); // $ hasTaintFlow=0
+
+        let v2 : i64 = row.get_opt(0).unwrap().unwrap(); // $ Alert[rust/summary/taint-sources]
+        sink(v2); // $ hasTaintFlow=0
+
+        let v3 : i64 = row.take(0).unwrap(); // $ Alert[rust/summary/taint-sources]
+        sink(v3); // $ hasTaintFlow=0
+
+        let v4 : i64 = row.take_opt(0).unwrap().unwrap(); // $ Alert[rust/summary/taint-sources]
+        sink(v4); // $ hasTaintFlow=0
+
+        let value5 = row.as_ref(0).unwrap(); // $ Alert[rust/summary/taint-sources]
+        if let mysql::Value::Int(v) = value5 {
+            sink(v); // $ MISSING: hasTaintFlow=0
+        } else if let mysql::Value::Bytes(v) = value5 {
+            sink(v); // $ MISSING: hasTaintFlow=0
+        }
+
+        let v6: i64 = conn.query_first("SELECT id FROM person")?.unwrap(); // $ Alert[rust/summary/taint-sources]
+        sink(v6); // $ hasTaintFlow
+
+        let mut t1 = conn.exec_iter("SELECT id FROM person", (1, 2, 3))?; // $ Alert[rust/summary/taint-sources]
+        sink(t1.nth(0).unwrap().unwrap().get::<i64, usize>(1).unwrap()); // $ Alert[rust/summary/taint-sources] hasTaintFlow=1
+        for row in t1 {
+            for v in row {
+                sink(v); // $ hasTaintFlow
+            }
+        }
+
+        let _ = conn.query_map( // $ Alert[rust/summary/taint-sources]
+            "SELECT id FROM person",
+            |values: i64| -> () {
+                sink(values); // $ hasTaintFlow
+            }
+        )?;
+
+        let _ = conn.query_map( // $ Alert[rust/summary/taint-sources]
+            "SELECT id, name, age FROM person",
+            |values: (i64, String, i32)| -> () {
+                sink(values.0); // $ MISSING: hasTaintFlow
+                sink(values.1); // $ MISSING: hasTaintFlow
+                sink(values.2); // $ MISSING: hasTaintFlow
+            }
+        )?;
+
+        let total = conn.query_fold("SELECT id FROM person", 0, |acc: i64, row: i64| { // $ Alert[rust/summary/taint-sources]
+            sink(row); // $ hasTaintFlow
+            acc + row
+        })?;
+        sink(total); // $ hasTaintFlow
+
+        let _ = conn.query_fold("SELECT id, name, age FROM person", 0, |acc: i64, row: (i64, String, i32)| { // $ Alert[rust/summary/taint-sources]
+            let id: i64 = row.0;
+            let name: String = row.1;
+            let age: i32 = row.2;
+            sink(id); // $ MISSING: hasTaintFlow
+            sink(name); // $ MISSING: hasTaintFlow
+            sink(age); // $ MISSING: hasTaintFlow
+            acc + 1
+        })?;
+
+        Ok(())
+    }
+}
+
+mod test_mysql_async {
+    use mysql_async::*;
+    use mysql_async::prelude::*;
+    use async_std::stream::StreamExt;
+    use super::sink;
+
+    #[derive(Debug, PartialEq, Eq, Clone)]
+    struct Person {
+        id: i64,
+        name: String,
+        age: i32,
+    }
+
+    pub async fn test_mysql_async() -> Result<()> {
+        // connect through a MySQL connection pool
+        let mut pool = mysql_async::Pool::new("");
+        let mut conn = pool.get_conn().await?;
+
+        let mut rows : Vec<mysql_async::Row> = conn.query("SELECT id, name, age FROM person").await?; // $ Alert[rust/summary/taint-sources]
+        let mut row = &mut rows[0];
+
+        let v1 : i64 = row.get(0).unwrap(); // $ Alert[rust/summary/taint-sources]
+        sink(v1); // $ hasTaintFlow=0
+
+        let v2 : i64 = row.get_opt(0).unwrap().unwrap(); // $ Alert[rust/summary/taint-sources]
+        sink(v2); // $ hasTaintFlow=0
+
+        let v3 : i64 = row.take(0).unwrap(); // $ Alert[rust/summary/taint-sources]
+        sink(v3); // $ hasTaintFlow=0
+
+        let v4 : i64 = row.take_opt(0).unwrap().unwrap(); // $ Alert[rust/summary/taint-sources]
+        sink(v4); // $ hasTaintFlow=0
+
+        let value5 = row.as_ref(0).unwrap(); // $ Alert[rust/summary/taint-sources]
+        if let mysql_async::Value::Int(v) = value5 {
+            sink(v); // $ MISSING: hasTaintFlow=0
+        } else if let mysql_async::Value::Bytes(v) = value5 {
+            sink(v); // $ MISSING: hasTaintFlow=0
+        }
+
+        let v6: i64 = conn.query_first("SELECT id FROM person").await?.unwrap(); // $ Alert[rust/summary/taint-sources]
+        sink(v6); // $ MISSING: hasTaintFlow
+
+        let mut t1 = conn.exec_iter("SELECT id FROM person", (1, 2, 3)).await?; // $ Alert[rust/summary/taint-sources]
+        for mut row in t1.stream::<(i64, String, i32)>().await? {
+            while let v = row.next().await {
+                let v = v.unwrap();
+                sink(v); // $ MISSING: hasTaintFlow
+            }
+        }
+
+        let _ = conn.query_map( // $ Alert[rust/summary/taint-sources]
+            "SELECT id FROM person",
+            |values: i64| -> () {
+                sink(values); // $ hasTaintFlow
+            }
+        ).await?;
+
+        let _ = conn.query_map( // $ Alert[rust/summary/taint-sources]
+            "SELECT id, name, age FROM person",
+            |values: (i64, String, i32)| -> () {
+                sink(values.0); // $ MISSING: hasTaintFlow
+                sink(values.1); // $ MISSING: hasTaintFlow
+                sink(values.2); // $ MISSING: hasTaintFlow
+            }
+        ).await?;
+
+        let total = conn.query_fold("SELECT id FROM person", 0, |acc: i64, row: i64| { // $ Alert[rust/summary/taint-sources]
+            sink(row); // $ hasTaintFlow
+            acc + row
+        }).await?;
+        sink(total); // $ hasTaintFlow
+
+        let _ = conn.query_fold("SELECT id, name, age FROM person", 0, |acc: i64, row: (i64, String, i32)| { // $ Alert[rust/summary/taint-sources]
+            let id: i64 = row.0;
+            let name: String = row.1;
+            let age: i32 = row.2;
+            sink(id); // $ MISSING: hasTaintFlow
+            sink(name); // $ MISSING: hasTaintFlow
+            sink(age); // $ MISSING: hasTaintFlow
+            acc + 1
+        }).await?;
+
+        let ids = "SELECT id FROM person".with(()).map(&mut conn,
+            |person: i64| -> i64 {
+                sink(person); // $ MISSING: hasTaintFlow
+                person
+            }
+        ).await?;
+        sink(ids[0]); // $ MISSING: hasTaintFlow
+
+        let ages = "SELECT id, name, age FROM person".with(()).map(&mut conn, // $ MISSING: Alert[rust/summary/taint-sources]
+            |person: (i64, String, i32)| -> i32 {
+                sink(person.0); // $ MISSING: hasTaintFlow
+                sink(person.1); // $ MISSING: hasTaintFlow
+                sink(person.2); // $ MISSING: hasTaintFlow
+                person.2
+            }
+        ).await?;
+        sink(ages[0]); // $ MISSING: hasTaintFlow
+
+        {
+            let mut stream = "SELECT id FROM person".stream::<i64, _>(&mut conn).await?; // $ MISSING: Alert[rust/summary/taint-sources]
+            while let Some(row) = stream.next().await {
+                let id = row?;
+                sink(id); // $ MISSING: hasTaintFlow
+            }
+        }
+
+        {
+            let mut stream = "SELECT id, name, age FROM person".stream::<(i64, String, i32), _>(&mut conn).await?; // $ MISSING: Alert[rust/summary/taint-sources]
+            while let Some(row) = stream.next().await {
+                let (id, name, age) = row?;
+                sink(id); // $ MISSING: hasTaintFlow
+                sink(name); // $ MISSING: hasTaintFlow
+                sink(age); // $ MISSING: hasTaintFlow
+            }
+        }
+
+        Ok(())
+    }
+}
+
+#[tokio::main]
+async fn main() -> Result<(), Box<dyn std::error::Error>> {
+    println!("test_mysql...");
+    match test_mysql::test_mysql() {
+        Ok(_) => println!("complete"),
+        Err(e) => println!("error: {}", e),
+    }
+
+    println!("test_mysql_async...");
+    match futures::executor::block_on(test_mysql_async::test_mysql_async()) {
+        Ok(_) => println!("complete"),
+        Err(e) => println!("error: {}", e),
+    }
+
+    Ok(())
+}
diff --git a/rust/ql/test/library-tests/dataflow/closures/Cargo.lock b/rust/ql/test/library-tests/dataflow/sources/env/Cargo.lock
similarity index 100%
rename from rust/ql/test/library-tests/dataflow/closures/Cargo.lock
rename to rust/ql/test/library-tests/dataflow/sources/env/Cargo.lock
diff --git a/rust/ql/test/library-tests/dataflow/sources/env/InlineFlow.expected b/rust/ql/test/library-tests/dataflow/sources/env/InlineFlow.expected
new file mode 100644
index 00000000000..00821decfdf
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/sources/env/InlineFlow.expected
@@ -0,0 +1,163 @@
+models
+| 1 | Source: std::env::args; ReturnValue.Element; commandargs |
+| 2 | Source: std::env::args_os; ReturnValue.Element; commandargs |
+| 3 | Source: std::env::current_dir; ReturnValue.Field[core::result::Result::Ok(0)]; commandargs |
+| 4 | Source: std::env::current_exe; ReturnValue.Field[core::result::Result::Ok(0)]; commandargs |
+| 5 | Source: std::env::home_dir; ReturnValue.Field[core::option::Option::Some(0)]; commandargs |
+| 6 | Source: std::env::var; ReturnValue.Field[core::result::Result::Ok(0)]; environment |
+| 7 | Source: std::env::var_os; ReturnValue.Field[core::option::Option::Some(0)]; environment |
+| 8 | Summary: <_ as core::iter::traits::iterator::Iterator>::collect; Argument[self].Element; ReturnValue.Element; value |
+| 9 | Summary: <_ as core::iter::traits::iterator::Iterator>::nth; Argument[self].Element; ReturnValue.Field[core::option::Option::Some(0)]; value |
+| 10 | Summary: <core::option::Option>::expect; Argument[self].Field[core::option::Option::Some(0)]; ReturnValue; value |
+| 11 | Summary: <core::option::Option>::unwrap; Argument[self].Field[core::option::Option::Some(0)]; ReturnValue; value |
+| 12 | Summary: <core::result::Result>::expect; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
+| 13 | Summary: <core::result::Result>::unwrap; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
+| 14 | Summary: <core::str>::parse; Argument[self]; ReturnValue.Field[core::result::Result::Ok(0)]; taint |
+edges
+| test.rs:6:10:6:22 | ...::var | test.rs:6:10:6:30 | ...::var(...) | provenance | Src:MaD:6  |
+| test.rs:7:10:7:25 | ...::var_os | test.rs:7:10:7:33 | ...::var_os(...) | provenance | Src:MaD:7  |
+| test.rs:9:9:9:12 | var1 | test.rs:12:10:12:13 | var1 | provenance |  |
+| test.rs:9:16:9:28 | ...::var | test.rs:9:16:9:36 | ...::var(...) [Ok] | provenance | Src:MaD:6  |
+| test.rs:9:16:9:36 | ...::var(...) [Ok] | test.rs:9:16:9:59 | ... .expect(...) | provenance | MaD:12 |
+| test.rs:9:16:9:59 | ... .expect(...) | test.rs:9:9:9:12 | var1 | provenance |  |
+| test.rs:10:9:10:12 | var2 | test.rs:13:10:13:13 | var2 | provenance |  |
+| test.rs:10:16:10:31 | ...::var_os | test.rs:10:16:10:39 | ...::var_os(...) [Some] | provenance | Src:MaD:7  |
+| test.rs:10:16:10:39 | ...::var_os(...) [Some] | test.rs:10:16:10:48 | ... .unwrap() | provenance | MaD:11 |
+| test.rs:10:16:10:48 | ... .unwrap() | test.rs:10:9:10:12 | var2 | provenance |  |
+| test.rs:27:9:27:12 | args [element] | test.rs:28:20:28:23 | args [element] | provenance |  |
+| test.rs:27:9:27:12 | args [element] | test.rs:29:17:29:20 | args [element] | provenance |  |
+| test.rs:27:29:27:42 | ...::args | test.rs:27:29:27:44 | ...::args(...) [element] | provenance | Src:MaD:1  |
+| test.rs:27:29:27:44 | ...::args(...) [element] | test.rs:27:29:27:54 | ... .collect() [element] | provenance | MaD:8 |
+| test.rs:27:29:27:54 | ... .collect() [element] | test.rs:27:9:27:12 | args [element] | provenance |  |
+| test.rs:28:9:28:15 | my_path [&ref] | test.rs:34:10:34:16 | my_path | provenance |  |
+| test.rs:28:19:28:26 | &... [&ref] | test.rs:28:9:28:15 | my_path [&ref] | provenance |  |
+| test.rs:28:20:28:23 | args [element] | test.rs:28:20:28:26 | args[0] | provenance |  |
+| test.rs:28:20:28:26 | args[0] | test.rs:28:19:28:26 | &... [&ref] | provenance |  |
+| test.rs:29:9:29:12 | arg1 [&ref] | test.rs:35:10:35:13 | arg1 | provenance |  |
+| test.rs:29:16:29:23 | &... [&ref] | test.rs:29:9:29:12 | arg1 [&ref] | provenance |  |
+| test.rs:29:17:29:20 | args [element] | test.rs:29:17:29:23 | args[1] | provenance |  |
+| test.rs:29:17:29:23 | args[1] | test.rs:29:16:29:23 | &... [&ref] | provenance |  |
+| test.rs:30:9:30:12 | arg2 | test.rs:36:10:36:13 | arg2 | provenance |  |
+| test.rs:30:16:30:29 | ...::args | test.rs:30:16:30:31 | ...::args(...) [element] | provenance | Src:MaD:1  |
+| test.rs:30:16:30:31 | ...::args(...) [element] | test.rs:30:16:30:38 | ... .nth(...) [Some] | provenance | MaD:9 |
+| test.rs:30:16:30:38 | ... .nth(...) [Some] | test.rs:30:16:30:47 | ... .unwrap() | provenance | MaD:11 |
+| test.rs:30:16:30:47 | ... .unwrap() | test.rs:30:9:30:12 | arg2 | provenance |  |
+| test.rs:31:9:31:12 | arg3 | test.rs:37:10:37:13 | arg3 | provenance |  |
+| test.rs:31:16:31:32 | ...::args_os | test.rs:31:16:31:34 | ...::args_os(...) [element] | provenance | Src:MaD:2  |
+| test.rs:31:16:31:34 | ...::args_os(...) [element] | test.rs:31:16:31:41 | ... .nth(...) [Some] | provenance | MaD:9 |
+| test.rs:31:16:31:41 | ... .nth(...) [Some] | test.rs:31:16:31:50 | ... .unwrap() | provenance | MaD:11 |
+| test.rs:31:16:31:50 | ... .unwrap() | test.rs:31:9:31:12 | arg3 | provenance |  |
+| test.rs:32:9:32:12 | arg4 | test.rs:38:10:38:13 | arg4 | provenance |  |
+| test.rs:32:16:32:29 | ...::args | test.rs:32:16:32:31 | ...::args(...) [element] | provenance | Src:MaD:1  |
+| test.rs:32:16:32:31 | ...::args(...) [element] | test.rs:32:16:32:38 | ... .nth(...) [Some] | provenance | MaD:9 |
+| test.rs:32:16:32:38 | ... .nth(...) [Some] | test.rs:32:16:32:47 | ... .unwrap() | provenance | MaD:11 |
+| test.rs:32:16:32:47 | ... .unwrap() | test.rs:32:16:32:64 | ... .parse() [Ok] | provenance | MaD:14 |
+| test.rs:32:16:32:64 | ... .parse() [Ok] | test.rs:32:16:32:73 | ... .unwrap() | provenance | MaD:13 |
+| test.rs:32:16:32:73 | ... .unwrap() | test.rs:32:9:32:12 | arg4 | provenance |  |
+| test.rs:40:9:40:11 | arg | test.rs:41:14:41:16 | arg | provenance |  |
+| test.rs:40:16:40:29 | ...::args | test.rs:40:16:40:31 | ...::args(...) [element] | provenance | Src:MaD:1  |
+| test.rs:40:16:40:31 | ...::args(...) [element] | test.rs:40:9:40:11 | arg | provenance |  |
+| test.rs:44:9:44:11 | arg | test.rs:45:14:45:16 | arg | provenance |  |
+| test.rs:44:16:44:32 | ...::args_os | test.rs:44:16:44:34 | ...::args_os(...) [element] | provenance | Src:MaD:2  |
+| test.rs:44:16:44:34 | ...::args_os(...) [element] | test.rs:44:9:44:11 | arg | provenance |  |
+| test.rs:50:9:50:11 | dir | test.rs:54:10:54:12 | dir | provenance |  |
+| test.rs:50:15:50:35 | ...::current_dir | test.rs:50:15:50:37 | ...::current_dir(...) [Ok] | provenance | Src:MaD:3  |
+| test.rs:50:15:50:37 | ...::current_dir(...) [Ok] | test.rs:50:15:50:54 | ... .expect(...) | provenance | MaD:12 |
+| test.rs:50:15:50:54 | ... .expect(...) | test.rs:50:9:50:11 | dir | provenance |  |
+| test.rs:51:9:51:11 | exe | test.rs:55:10:55:12 | exe | provenance |  |
+| test.rs:51:15:51:35 | ...::current_exe | test.rs:51:15:51:37 | ...::current_exe(...) [Ok] | provenance | Src:MaD:4  |
+| test.rs:51:15:51:37 | ...::current_exe(...) [Ok] | test.rs:51:15:51:54 | ... .expect(...) | provenance | MaD:12 |
+| test.rs:51:15:51:54 | ... .expect(...) | test.rs:51:9:51:11 | exe | provenance |  |
+| test.rs:52:9:52:12 | home | test.rs:56:10:56:13 | home | provenance |  |
+| test.rs:52:16:52:33 | ...::home_dir | test.rs:52:16:52:35 | ...::home_dir(...) [Some] | provenance | Src:MaD:5  |
+| test.rs:52:16:52:35 | ...::home_dir(...) [Some] | test.rs:52:16:52:52 | ... .expect(...) | provenance | MaD:10 |
+| test.rs:52:16:52:52 | ... .expect(...) | test.rs:52:9:52:12 | home | provenance |  |
+nodes
+| test.rs:6:10:6:22 | ...::var | semmle.label | ...::var |
+| test.rs:6:10:6:30 | ...::var(...) | semmle.label | ...::var(...) |
+| test.rs:7:10:7:25 | ...::var_os | semmle.label | ...::var_os |
+| test.rs:7:10:7:33 | ...::var_os(...) | semmle.label | ...::var_os(...) |
+| test.rs:9:9:9:12 | var1 | semmle.label | var1 |
+| test.rs:9:16:9:28 | ...::var | semmle.label | ...::var |
+| test.rs:9:16:9:36 | ...::var(...) [Ok] | semmle.label | ...::var(...) [Ok] |
+| test.rs:9:16:9:59 | ... .expect(...) | semmle.label | ... .expect(...) |
+| test.rs:10:9:10:12 | var2 | semmle.label | var2 |
+| test.rs:10:16:10:31 | ...::var_os | semmle.label | ...::var_os |
+| test.rs:10:16:10:39 | ...::var_os(...) [Some] | semmle.label | ...::var_os(...) [Some] |
+| test.rs:10:16:10:48 | ... .unwrap() | semmle.label | ... .unwrap() |
+| test.rs:12:10:12:13 | var1 | semmle.label | var1 |
+| test.rs:13:10:13:13 | var2 | semmle.label | var2 |
+| test.rs:27:9:27:12 | args [element] | semmle.label | args [element] |
+| test.rs:27:29:27:42 | ...::args | semmle.label | ...::args |
+| test.rs:27:29:27:44 | ...::args(...) [element] | semmle.label | ...::args(...) [element] |
+| test.rs:27:29:27:54 | ... .collect() [element] | semmle.label | ... .collect() [element] |
+| test.rs:28:9:28:15 | my_path [&ref] | semmle.label | my_path [&ref] |
+| test.rs:28:19:28:26 | &... [&ref] | semmle.label | &... [&ref] |
+| test.rs:28:20:28:23 | args [element] | semmle.label | args [element] |
+| test.rs:28:20:28:26 | args[0] | semmle.label | args[0] |
+| test.rs:29:9:29:12 | arg1 [&ref] | semmle.label | arg1 [&ref] |
+| test.rs:29:16:29:23 | &... [&ref] | semmle.label | &... [&ref] |
+| test.rs:29:17:29:20 | args [element] | semmle.label | args [element] |
+| test.rs:29:17:29:23 | args[1] | semmle.label | args[1] |
+| test.rs:30:9:30:12 | arg2 | semmle.label | arg2 |
+| test.rs:30:16:30:29 | ...::args | semmle.label | ...::args |
+| test.rs:30:16:30:31 | ...::args(...) [element] | semmle.label | ...::args(...) [element] |
+| test.rs:30:16:30:38 | ... .nth(...) [Some] | semmle.label | ... .nth(...) [Some] |
+| test.rs:30:16:30:47 | ... .unwrap() | semmle.label | ... .unwrap() |
+| test.rs:31:9:31:12 | arg3 | semmle.label | arg3 |
+| test.rs:31:16:31:32 | ...::args_os | semmle.label | ...::args_os |
+| test.rs:31:16:31:34 | ...::args_os(...) [element] | semmle.label | ...::args_os(...) [element] |
+| test.rs:31:16:31:41 | ... .nth(...) [Some] | semmle.label | ... .nth(...) [Some] |
+| test.rs:31:16:31:50 | ... .unwrap() | semmle.label | ... .unwrap() |
+| test.rs:32:9:32:12 | arg4 | semmle.label | arg4 |
+| test.rs:32:16:32:29 | ...::args | semmle.label | ...::args |
+| test.rs:32:16:32:31 | ...::args(...) [element] | semmle.label | ...::args(...) [element] |
+| test.rs:32:16:32:38 | ... .nth(...) [Some] | semmle.label | ... .nth(...) [Some] |
+| test.rs:32:16:32:47 | ... .unwrap() | semmle.label | ... .unwrap() |
+| test.rs:32:16:32:64 | ... .parse() [Ok] | semmle.label | ... .parse() [Ok] |
+| test.rs:32:16:32:73 | ... .unwrap() | semmle.label | ... .unwrap() |
+| test.rs:34:10:34:16 | my_path | semmle.label | my_path |
+| test.rs:35:10:35:13 | arg1 | semmle.label | arg1 |
+| test.rs:36:10:36:13 | arg2 | semmle.label | arg2 |
+| test.rs:37:10:37:13 | arg3 | semmle.label | arg3 |
+| test.rs:38:10:38:13 | arg4 | semmle.label | arg4 |
+| test.rs:40:9:40:11 | arg | semmle.label | arg |
+| test.rs:40:16:40:29 | ...::args | semmle.label | ...::args |
+| test.rs:40:16:40:31 | ...::args(...) [element] | semmle.label | ...::args(...) [element] |
+| test.rs:41:14:41:16 | arg | semmle.label | arg |
+| test.rs:44:9:44:11 | arg | semmle.label | arg |
+| test.rs:44:16:44:32 | ...::args_os | semmle.label | ...::args_os |
+| test.rs:44:16:44:34 | ...::args_os(...) [element] | semmle.label | ...::args_os(...) [element] |
+| test.rs:45:14:45:16 | arg | semmle.label | arg |
+| test.rs:50:9:50:11 | dir | semmle.label | dir |
+| test.rs:50:15:50:35 | ...::current_dir | semmle.label | ...::current_dir |
+| test.rs:50:15:50:37 | ...::current_dir(...) [Ok] | semmle.label | ...::current_dir(...) [Ok] |
+| test.rs:50:15:50:54 | ... .expect(...) | semmle.label | ... .expect(...) |
+| test.rs:51:9:51:11 | exe | semmle.label | exe |
+| test.rs:51:15:51:35 | ...::current_exe | semmle.label | ...::current_exe |
+| test.rs:51:15:51:37 | ...::current_exe(...) [Ok] | semmle.label | ...::current_exe(...) [Ok] |
+| test.rs:51:15:51:54 | ... .expect(...) | semmle.label | ... .expect(...) |
+| test.rs:52:9:52:12 | home | semmle.label | home |
+| test.rs:52:16:52:33 | ...::home_dir | semmle.label | ...::home_dir |
+| test.rs:52:16:52:35 | ...::home_dir(...) [Some] | semmle.label | ...::home_dir(...) [Some] |
+| test.rs:52:16:52:52 | ... .expect(...) | semmle.label | ... .expect(...) |
+| test.rs:54:10:54:12 | dir | semmle.label | dir |
+| test.rs:55:10:55:12 | exe | semmle.label | exe |
+| test.rs:56:10:56:13 | home | semmle.label | home |
+subpaths
+testFailures
+#select
+| test.rs:6:10:6:30 | ...::var(...) | test.rs:6:10:6:22 | ...::var | test.rs:6:10:6:30 | ...::var(...) | $@ | test.rs:6:10:6:22 | ...::var | ...::var |
+| test.rs:7:10:7:33 | ...::var_os(...) | test.rs:7:10:7:25 | ...::var_os | test.rs:7:10:7:33 | ...::var_os(...) | $@ | test.rs:7:10:7:25 | ...::var_os | ...::var_os |
+| test.rs:12:10:12:13 | var1 | test.rs:9:16:9:28 | ...::var | test.rs:12:10:12:13 | var1 | $@ | test.rs:9:16:9:28 | ...::var | ...::var |
+| test.rs:13:10:13:13 | var2 | test.rs:10:16:10:31 | ...::var_os | test.rs:13:10:13:13 | var2 | $@ | test.rs:10:16:10:31 | ...::var_os | ...::var_os |
+| test.rs:34:10:34:16 | my_path | test.rs:27:29:27:42 | ...::args | test.rs:34:10:34:16 | my_path | $@ | test.rs:27:29:27:42 | ...::args | ...::args |
+| test.rs:35:10:35:13 | arg1 | test.rs:27:29:27:42 | ...::args | test.rs:35:10:35:13 | arg1 | $@ | test.rs:27:29:27:42 | ...::args | ...::args |
+| test.rs:36:10:36:13 | arg2 | test.rs:30:16:30:29 | ...::args | test.rs:36:10:36:13 | arg2 | $@ | test.rs:30:16:30:29 | ...::args | ...::args |
+| test.rs:37:10:37:13 | arg3 | test.rs:31:16:31:32 | ...::args_os | test.rs:37:10:37:13 | arg3 | $@ | test.rs:31:16:31:32 | ...::args_os | ...::args_os |
+| test.rs:38:10:38:13 | arg4 | test.rs:32:16:32:29 | ...::args | test.rs:38:10:38:13 | arg4 | $@ | test.rs:32:16:32:29 | ...::args | ...::args |
+| test.rs:41:14:41:16 | arg | test.rs:40:16:40:29 | ...::args | test.rs:41:14:41:16 | arg | $@ | test.rs:40:16:40:29 | ...::args | ...::args |
+| test.rs:45:14:45:16 | arg | test.rs:44:16:44:32 | ...::args_os | test.rs:45:14:45:16 | arg | $@ | test.rs:44:16:44:32 | ...::args_os | ...::args_os |
+| test.rs:54:10:54:12 | dir | test.rs:50:15:50:35 | ...::current_dir | test.rs:54:10:54:12 | dir | $@ | test.rs:50:15:50:35 | ...::current_dir | ...::current_dir |
+| test.rs:55:10:55:12 | exe | test.rs:51:15:51:35 | ...::current_exe | test.rs:55:10:55:12 | exe | $@ | test.rs:51:15:51:35 | ...::current_exe | ...::current_exe |
+| test.rs:56:10:56:13 | home | test.rs:52:16:52:33 | ...::home_dir | test.rs:56:10:56:13 | home | $@ | test.rs:52:16:52:33 | ...::home_dir | ...::home_dir |
diff --git a/rust/ql/test/library-tests/dataflow/sources/InlineFlow.ql b/rust/ql/test/library-tests/dataflow/sources/env/InlineFlow.ql
similarity index 82%
rename from rust/ql/test/library-tests/dataflow/sources/InlineFlow.ql
rename to rust/ql/test/library-tests/dataflow/sources/env/InlineFlow.ql
index d13ca71f16e..09b4ab5bf90 100644
--- a/rust/ql/test/library-tests/dataflow/sources/InlineFlow.ql
+++ b/rust/ql/test/library-tests/dataflow/sources/env/InlineFlow.ql
@@ -1,3 +1,7 @@
+/**
+ * @kind path-problem
+ */
+
 import rust
 import codeql.rust.dataflow.DataFlow
 import codeql.rust.Concepts
@@ -25,3 +29,8 @@ module MyFlowConfig implements DataFlow::ConfigSig {
 module MyFlowTest = TaintFlowTest<MyFlowConfig>;
 
 import MyFlowTest
+import PathGraph
+
+from PathNode source, PathNode sink
+where flowPath(source, sink)
+select sink, source, sink, "$@", source, source.toString()
diff --git a/rust/ql/test/library-tests/dataflow/sources/env/TaintSources.expected b/rust/ql/test/library-tests/dataflow/sources/env/TaintSources.expected
new file mode 100644
index 00000000000..16f43eff914
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/sources/env/TaintSources.expected
@@ -0,0 +1,15 @@
+| test.rs:6:10:6:22 | ...::var | Flow source 'EnvironmentSource' of type environment (DEFAULT). |
+| test.rs:7:10:7:25 | ...::var_os | Flow source 'EnvironmentSource' of type environment (DEFAULT). |
+| test.rs:9:16:9:28 | ...::var | Flow source 'EnvironmentSource' of type environment (DEFAULT). |
+| test.rs:10:16:10:31 | ...::var_os | Flow source 'EnvironmentSource' of type environment (DEFAULT). |
+| test.rs:15:25:15:38 | ...::vars | Flow source 'EnvironmentSource' of type environment (DEFAULT). |
+| test.rs:20:25:20:41 | ...::vars_os | Flow source 'EnvironmentSource' of type environment (DEFAULT). |
+| test.rs:27:29:27:42 | ...::args | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
+| test.rs:30:16:30:29 | ...::args | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
+| test.rs:31:16:31:32 | ...::args_os | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
+| test.rs:32:16:32:29 | ...::args | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
+| test.rs:40:16:40:29 | ...::args | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
+| test.rs:44:16:44:32 | ...::args_os | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
+| test.rs:50:15:50:35 | ...::current_dir | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
+| test.rs:51:15:51:35 | ...::current_exe | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
+| test.rs:52:16:52:33 | ...::home_dir | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
diff --git a/rust/ql/test/library-tests/dataflow/sources/env/TaintSources.qlref b/rust/ql/test/library-tests/dataflow/sources/env/TaintSources.qlref
new file mode 100644
index 00000000000..7aa95121af3
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/sources/env/TaintSources.qlref
@@ -0,0 +1,2 @@
+query: queries/summary/TaintSources.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/rust/ql/test/library-tests/dataflow/sources/env/options.yml b/rust/ql/test/library-tests/dataflow/sources/env/options.yml
new file mode 100644
index 00000000000..c7a0beabb53
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/sources/env/options.yml
@@ -0,0 +1 @@
+qltest_cargo_check: true
diff --git a/rust/ql/test/library-tests/dataflow/sources/env/test.rs b/rust/ql/test/library-tests/dataflow/sources/env/test.rs
new file mode 100644
index 00000000000..e02aa7c8f1b
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/sources/env/test.rs
@@ -0,0 +1,68 @@
+fn sink<T>(_: T) { }
+
+// --- tests ---
+
+fn test_env_vars() {
+    sink(std::env::var("HOME")); // $ Alert[rust/summary/taint-sources] hasTaintFlow="HOME"
+    sink(std::env::var_os("PATH")); // $ Alert[rust/summary/taint-sources] hasTaintFlow="PATH"
+
+    let var1 = std::env::var("HOME").expect("HOME not set"); // $ Alert[rust/summary/taint-sources]
+    let var2 = std::env::var_os("PATH").unwrap(); // $ Alert[rust/summary/taint-sources]
+
+    sink(var1); // $ hasTaintFlow="HOME"
+    sink(var2); // $ hasTaintFlow="PATH"
+
+    for (key, value) in std::env::vars() { // $ Alert[rust/summary/taint-sources]
+        sink(key); // $ MISSING: hasTaintFlow
+        sink(value); // $ MISSING: hasTaintFlow
+    }
+
+    for (key, value) in std::env::vars_os() { // $ Alert[rust/summary/taint-sources]
+        sink(key); // $ MISSING: hasTaintFlow
+        sink(value); // $ MISSING: hasTaintFlow
+    }
+}
+
+fn test_env_args() {
+    let args: Vec<String> = std::env::args().collect(); // $ Alert[rust/summary/taint-sources]
+    let my_path = &args[0];
+    let arg1 = &args[1];
+    let arg2 = std::env::args().nth(2).unwrap(); // $ Alert[rust/summary/taint-sources]
+    let arg3 = std::env::args_os().nth(3).unwrap(); // $ Alert[rust/summary/taint-sources]
+    let arg4 = std::env::args().nth(4).unwrap().parse::<usize>().unwrap(); // $ Alert[rust/summary/taint-sources]
+
+    sink(my_path); // $ hasTaintFlow
+    sink(arg1); // $ hasTaintFlow
+    sink(arg2); // $ hasTaintFlow
+    sink(arg3); // $ hasTaintFlow
+    sink(arg4); // $ hasTaintFlow
+
+    for arg in std::env::args() { // $ Alert[rust/summary/taint-sources]
+        sink(arg); // $ hasTaintFlow
+    }
+
+    for arg in std::env::args_os() { // $ Alert[rust/summary/taint-sources]
+        sink(arg); // $ hasTaintFlow
+    }
+}
+
+fn test_env_dirs() {
+    let dir = std::env::current_dir().expect("FAILED"); // $ Alert[rust/summary/taint-sources]
+    let exe = std::env::current_exe().expect("FAILED"); // $ Alert[rust/summary/taint-sources]
+    let home = std::env::home_dir().expect("FAILED"); // $ Alert[rust/summary/taint-sources]
+
+    sink(dir); // $ hasTaintFlow
+    sink(exe); // $ hasTaintFlow
+    sink(home); // $ hasTaintFlow
+}
+
+async fn main() -> () {
+    println!("test_env_vars...");
+    test_env_vars();
+
+    println!("test_env_args...");
+    test_env_args();
+
+    println!("test_env_dirs...");
+    test_env_dirs();
+}
diff --git a/rust/ql/test/library-tests/dataflow/sources/file/Cargo.lock b/rust/ql/test/library-tests/dataflow/sources/file/Cargo.lock
new file mode 100644
index 00000000000..55ccd96372e
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/sources/file/Cargo.lock
@@ -0,0 +1,802 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "async-channel"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"
+dependencies = [
+ "concurrent-queue",
+ "event-listener 2.5.3",
+ "futures-core",
+]
+
+[[package]]
+name = "async-channel"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "924ed96dd52d1b75e9c1a3e6275715fd320f5f9439fb5a4a11fa51f4221158d2"
+dependencies = [
+ "concurrent-queue",
+ "event-listener-strategy",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-executor"
+version = "1.13.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "497c00e0fd83a72a79a39fcbd8e3e2f055d6f6c7e025f3b3d91f4f8e76527fb8"
+dependencies = [
+ "async-task",
+ "concurrent-queue",
+ "fastrand",
+ "futures-lite",
+ "pin-project-lite",
+ "slab",
+]
+
+[[package]]
+name = "async-global-executor"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c"
+dependencies = [
+ "async-channel 2.5.0",
+ "async-executor",
+ "async-io",
+ "async-lock",
+ "blocking",
+ "futures-lite",
+ "once_cell",
+]
+
+[[package]]
+name = "async-io"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "456b8a8feb6f42d237746d4b3e9a178494627745c3c56c6ea55d92ba50d026fc"
+dependencies = [
+ "autocfg",
+ "cfg-if",
+ "concurrent-queue",
+ "futures-io",
+ "futures-lite",
+ "parking",
+ "polling",
+ "rustix",
+ "slab",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "async-lock"
+version = "3.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5fd03604047cee9b6ce9de9f70c6cd540a0520c813cbd49bae61f33ab80ed1dc"
+dependencies = [
+ "event-listener 5.4.1",
+ "event-listener-strategy",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-std"
+version = "1.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c8e079a4ab67ae52b7403632e4618815d6db36d2a010cfe41b02c1b1578f93b"
+dependencies = [
+ "async-channel 1.9.0",
+ "async-global-executor",
+ "async-io",
+ "async-lock",
+ "crossbeam-utils",
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-lite",
+ "gloo-timers",
+ "kv-log-macro",
+ "log",
+ "memchr",
+ "once_cell",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+ "wasm-bindgen-futures",
+]
+
+[[package]]
+name = "async-task"
+version = "4.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
+
+[[package]]
+name = "atomic-waker"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+
+[[package]]
+name = "autocfg"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
+
+[[package]]
+name = "bitflags"
+version = "2.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
+
+[[package]]
+name = "blocking"
+version = "1.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e83f8d02be6967315521be875afa792a316e28d57b5a2d401897e2a7921b7f21"
+dependencies = [
+ "async-channel 2.5.0",
+ "async-task",
+ "futures-io",
+ "futures-lite",
+ "piper",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
+
+[[package]]
+name = "bytes"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
+
+[[package]]
+name = "concurrent-queue"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
+
+[[package]]
+name = "errno"
+version = "0.3.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
+dependencies = [
+ "libc",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "event-listener"
+version = "2.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
+
+[[package]]
+name = "event-listener"
+version = "5.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab"
+dependencies = [
+ "concurrent-queue",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "event-listener-strategy"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93"
+dependencies = [
+ "event-listener 5.4.1",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "fastrand"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
+
+[[package]]
+name = "futures"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
+
+[[package]]
+name = "futures-executor"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-io"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
+
+[[package]]
+name = "futures-lite"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f78e10609fe0e0b3f4157ffab1876319b5b0db102a2c60dc4626306dc46b44ad"
+dependencies = [
+ "fastrand",
+ "futures-core",
+ "futures-io",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "futures-macro"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
+
+[[package]]
+name = "futures-task"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
+
+[[package]]
+name = "futures-util"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-macro",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
+[[package]]
+name = "gloo-timers"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "hermit-abi"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c"
+
+[[package]]
+name = "js-sys"
+version = "0.3.81"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec48937a97411dcb524a265206ccd4c90bb711fca92b2792c407f268825b9305"
+dependencies = [
+ "once_cell",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "kv-log-macro"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f"
+dependencies = [
+ "log",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.177"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039"
+
+[[package]]
+name = "lock_api"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
+dependencies = [
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
+dependencies = [
+ "value-bag",
+]
+
+[[package]]
+name = "memchr"
+version = "2.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
+
+[[package]]
+name = "mio"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69d83b0086dc8ecf3ce9ae2874b2d1290252e2a30720bea58a5c6639b0092873"
+dependencies = [
+ "libc",
+ "wasi",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+
+[[package]]
+name = "parking"
+version = "2.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
+
+[[package]]
+name = "parking_lot"
+version = "0.12.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a"
+dependencies = [
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "windows-link",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "piper"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066"
+dependencies = [
+ "atomic-waker",
+ "fastrand",
+ "futures-io",
+]
+
+[[package]]
+name = "polling"
+version = "3.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d0e4f59085d47d8241c88ead0f274e8a0cb551f3625263c05eb8dd897c34218"
+dependencies = [
+ "cfg-if",
+ "concurrent-queue",
+ "hermit-abi",
+ "pin-project-lite",
+ "rustix",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.101"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
+dependencies = [
+ "bitflags",
+]
+
+[[package]]
+name = "rustix"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e"
+dependencies = [
+ "bitflags",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2a4719bff48cee6b39d12c020eeb490953ad2443b7055bd0b21fca26bd8c28b"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "slab"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
+
+[[package]]
+name = "smallvec"
+version = "1.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
+
+[[package]]
+name = "socket2"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881"
+dependencies = [
+ "libc",
+ "windows-sys 0.60.2",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.107"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a26dbd934e5451d21ef060c018dae56fc073894c5a7896f882928a76e6d081b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "test"
+version = "0.0.1"
+dependencies = [
+ "async-std",
+ "bytes",
+ "futures",
+ "tokio",
+]
+
+[[package]]
+name = "tokio"
+version = "1.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408"
+dependencies = [
+ "bytes",
+ "libc",
+ "mio",
+ "parking_lot",
+ "pin-project-lite",
+ "signal-hook-registry",
+ "socket2",
+ "tokio-macros",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "462eeb75aeb73aea900253ce739c8e18a67423fadf006037cd3ff27e82748a06"
+
+[[package]]
+name = "value-bag"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "943ce29a8a743eb10d6082545d861b24f9d1b160b7d741e0f2cdf726bec909c5"
+
+[[package]]
+name = "wasi"
+version = "0.11.1+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1da10c01ae9f1ae40cbfac0bac3b1e724b320abfcf52229f80b547c0d250e2d"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "rustversion",
+ "wasm-bindgen-macro",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "671c9a5a66f49d8a47345ab942e2cb93c7d1d0339065d4f8139c486121b43b19"
+dependencies = [
+ "bumpalo",
+ "log",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-futures"
+version = "0.4.54"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e038d41e478cc73bae0ff9b36c60cff1c98b8f38f8d7e8061e79ee63608ac5c"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "once_cell",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ca60477e4c59f5f2986c50191cd972e3a50d8a95603bc9434501cf156a9a119"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f07d2f20d4da7b26400c9f4a0511e6e0345b040694e8a75bd41d578fa4421d7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bad67dc8b2a1a6e5448428adec4c3e84c43e561d8c9ee8a9e5aabeb193ec41d1"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "web-sys"
+version = "0.3.81"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9367c417a924a74cae129e6a2ae3b47fabb1f8995595ab474029da749a8be120"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "windows-link"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
+
+[[package]]
+name = "windows-sys"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.61.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
+dependencies = [
+ "windows-link",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.53.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
+dependencies = [
+ "windows-link",
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
diff --git a/rust/ql/test/library-tests/dataflow/sources/file/InlineFlow.expected b/rust/ql/test/library-tests/dataflow/sources/file/InlineFlow.expected
new file mode 100644
index 00000000000..90d01d250d0
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/sources/file/InlineFlow.expected
@@ -0,0 +1,529 @@
+models
+| 1 | Source: <async_std::fs::file::File>::open; ReturnValue.Future.Field[core::result::Result::Ok(0)]; file |
+| 2 | Source: <async_std::fs::open_options::OpenOptions>::open; ReturnValue.Future.Field[core::result::Result::Ok(0)]; file |
+| 3 | Source: <std::fs::DirEntry>::file_name; ReturnValue; file |
+| 4 | Source: <std::fs::DirEntry>::path; ReturnValue; file |
+| 5 | Source: <std::fs::File>::open; ReturnValue.Field[core::result::Result::Ok(0)]; file |
+| 6 | Source: <std::fs::OpenOptions>::open; ReturnValue.Field[core::result::Result::Ok(0)]; file |
+| 7 | Source: <tokio::fs::file::File>::open; ReturnValue.Future.Field[core::result::Result::Ok(0)]; file |
+| 8 | Source: <tokio::fs::open_options::OpenOptions>::open; ReturnValue.Future.Field[core::result::Result::Ok(0)]; file |
+| 9 | Source: <tokio::fs::read_dir::DirEntry>::file_name; ReturnValue; file |
+| 10 | Source: <tokio::fs::read_dir::DirEntry>::path; ReturnValue; file |
+| 11 | Source: std::fs::read; ReturnValue.Field[core::result::Result::Ok(0)]; file |
+| 12 | Source: std::fs::read; ReturnValue; file |
+| 13 | Source: std::fs::read_link; ReturnValue.Field[core::result::Result::Ok(0)]; file |
+| 14 | Source: std::fs::read_to_string; ReturnValue.Field[core::result::Result::Ok(0)]; file |
+| 15 | Source: std::fs::read_to_string; ReturnValue; file |
+| 16 | Source: tokio::fs::read::read; ReturnValue.Future.Field[core::result::Result::Ok(0)]; file |
+| 17 | Source: tokio::fs::read_link::read_link; ReturnValue.Future.Field[core::result::Result::Ok(0)]; file |
+| 18 | Source: tokio::fs::read_to_string::read_to_string; ReturnValue.Future.Field[core::result::Result::Ok(0)]; file |
+| 19 | Summary: <_ as async_std::io::read::ReadExt>::read; Argument[self].Reference; Argument[0].Reference; taint |
+| 20 | Summary: <_ as async_std::io::read::ReadExt>::read; Argument[self]; Argument[0].Reference; taint |
+| 21 | Summary: <_ as core::clone::Clone>::clone; Argument[self].Reference; ReturnValue; value |
+| 22 | Summary: <_ as std::io::Read>::bytes; Argument[self]; ReturnValue; taint |
+| 23 | Summary: <_ as std::io::Read>::chain; Argument[0]; ReturnValue; taint |
+| 24 | Summary: <_ as std::io::Read>::chain; Argument[self]; ReturnValue; taint |
+| 25 | Summary: <_ as std::io::Read>::read; Argument[self]; Argument[0].Reference; taint |
+| 26 | Summary: <_ as std::io::Read>::read_exact; Argument[self]; Argument[0].Reference; taint |
+| 27 | Summary: <_ as std::io::Read>::read_to_end; Argument[self]; Argument[0].Reference; taint |
+| 28 | Summary: <_ as std::io::Read>::read_to_string; Argument[self]; Argument[0].Reference; taint |
+| 29 | Summary: <_ as std::io::Read>::take; Argument[self]; ReturnValue; taint |
+| 30 | Summary: <_ as tokio::io::util::async_read_ext::AsyncReadExt>::read; Argument[self]; Argument[0].Reference; taint |
+| 31 | Summary: <_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_buf; Argument[self]; Argument[0].Reference; taint |
+| 32 | Summary: <_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_exact; Argument[self]; Argument[0].Reference; taint |
+| 33 | Summary: <_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_f32; Argument[self]; ReturnValue.Future.Field[core::result::Result::Ok(0)]; taint |
+| 34 | Summary: <_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_i16; Argument[self]; ReturnValue.Future.Field[core::result::Result::Ok(0)]; taint |
+| 35 | Summary: <_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_i64_le; Argument[self]; ReturnValue.Future.Field[core::result::Result::Ok(0)]; taint |
+| 36 | Summary: <_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_to_end; Argument[self]; Argument[0].Reference; taint |
+| 37 | Summary: <_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_to_string; Argument[self]; Argument[0].Reference; taint |
+| 38 | Summary: <_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_u8; Argument[self]; ReturnValue.Future.Field[core::result::Result::Ok(0)]; taint |
+| 39 | Summary: <core::result::Result>::unwrap; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
+| 40 | Summary: <std::fs::File as std::io::Read>::read; Argument[self]; Argument[0]; taint |
+| 41 | Summary: <std::fs::File as std::io::Read>::read_to_end; Argument[self]; Argument[0]; taint |
+| 42 | Summary: <std::fs::File as std::io::Read>::read_to_string; Argument[self]; Argument[0]; taint |
+| 43 | Summary: <std::path::PathBuf>::as_path; Argument[self]; ReturnValue; value |
+edges
+| test.rs:12:13:12:18 | buffer | test.rs:13:14:13:19 | buffer | provenance |  |
+| test.rs:12:31:12:43 | ...::read | test.rs:12:31:12:43 | ...::read [Ok] | provenance | Src:MaD:11  |
+| test.rs:12:31:12:43 | ...::read | test.rs:12:31:12:55 | ...::read(...) [Ok] | provenance | Src:MaD:11  |
+| test.rs:12:31:12:43 | ...::read [Ok] | test.rs:12:31:12:55 | ...::read(...) [Ok] | provenance | MaD:12 |
+| test.rs:12:31:12:55 | ...::read(...) [Ok] | test.rs:12:31:12:56 | TryExpr | provenance |  |
+| test.rs:12:31:12:56 | TryExpr | test.rs:12:13:12:18 | buffer | provenance |  |
+| test.rs:17:13:17:18 | buffer | test.rs:18:14:18:19 | buffer | provenance |  |
+| test.rs:17:31:17:38 | ...::read | test.rs:17:31:17:38 | ...::read [Ok] | provenance | Src:MaD:11  |
+| test.rs:17:31:17:38 | ...::read | test.rs:17:31:17:50 | ...::read(...) [Ok] | provenance | Src:MaD:11  |
+| test.rs:17:31:17:38 | ...::read [Ok] | test.rs:17:31:17:50 | ...::read(...) [Ok] | provenance | MaD:12 |
+| test.rs:17:31:17:50 | ...::read(...) [Ok] | test.rs:17:31:17:51 | TryExpr | provenance |  |
+| test.rs:17:31:17:51 | TryExpr | test.rs:17:13:17:18 | buffer | provenance |  |
+| test.rs:22:13:22:18 | buffer | test.rs:23:14:23:19 | buffer | provenance |  |
+| test.rs:22:22:22:39 | ...::read_to_string | test.rs:22:22:22:39 | ...::read_to_string [Ok] | provenance | Src:MaD:14  |
+| test.rs:22:22:22:39 | ...::read_to_string | test.rs:22:22:22:51 | ...::read_to_string(...) [Ok] | provenance | Src:MaD:14  |
+| test.rs:22:22:22:39 | ...::read_to_string [Ok] | test.rs:22:22:22:51 | ...::read_to_string(...) [Ok] | provenance | MaD:15 |
+| test.rs:22:22:22:51 | ...::read_to_string(...) [Ok] | test.rs:22:22:22:52 | TryExpr | provenance |  |
+| test.rs:22:22:22:52 | TryExpr | test.rs:22:13:22:18 | buffer | provenance |  |
+| test.rs:29:13:29:16 | path | test.rs:30:14:30:17 | path | provenance |  |
+| test.rs:29:13:29:16 | path | test.rs:30:14:30:25 | path.clone() | provenance | MaD:21 |
+| test.rs:29:13:29:16 | path | test.rs:31:14:31:17 | path | provenance |  |
+| test.rs:29:13:29:16 | path | test.rs:31:14:31:25 | path.clone() | provenance | MaD:21 |
+| test.rs:29:13:29:16 | path | test.rs:41:14:41:17 | path | provenance |  |
+| test.rs:29:20:29:27 | e.path() | test.rs:29:13:29:16 | path | provenance |  |
+| test.rs:29:22:29:25 | path | test.rs:29:20:29:27 | e.path() | provenance | Src:MaD:4 MaD:4 |
+| test.rs:30:14:30:17 | path | test.rs:30:14:30:25 | path.clone() | provenance | MaD:21 |
+| test.rs:31:14:31:17 | path | test.rs:31:14:31:25 | path.clone() | provenance | MaD:21 |
+| test.rs:31:14:31:25 | path.clone() | test.rs:31:14:31:35 | ... .as_path() | provenance | MaD:43 |
+| test.rs:43:13:43:21 | file_name | test.rs:44:14:44:22 | file_name | provenance |  |
+| test.rs:43:13:43:21 | file_name | test.rs:44:14:44:30 | file_name.clone() | provenance | MaD:21 |
+| test.rs:43:13:43:21 | file_name | test.rs:49:14:49:22 | file_name | provenance |  |
+| test.rs:43:25:43:37 | e.file_name() | test.rs:43:13:43:21 | file_name | provenance |  |
+| test.rs:43:27:43:35 | file_name | test.rs:43:25:43:37 | e.file_name() | provenance | Src:MaD:3 MaD:3 |
+| test.rs:44:14:44:22 | file_name | test.rs:44:14:44:30 | file_name.clone() | provenance | MaD:21 |
+| test.rs:65:13:65:18 | target | test.rs:66:14:66:19 | target | provenance |  |
+| test.rs:65:22:65:34 | ...::read_link | test.rs:65:22:65:49 | ...::read_link(...) [Ok] | provenance | Src:MaD:13  |
+| test.rs:65:22:65:49 | ...::read_link(...) [Ok] | test.rs:65:22:65:50 | TryExpr | provenance |  |
+| test.rs:65:22:65:50 | TryExpr | test.rs:65:13:65:18 | target | provenance |  |
+| test.rs:74:13:74:18 | buffer | test.rs:75:14:75:19 | buffer | provenance |  |
+| test.rs:74:31:74:45 | ...::read | test.rs:74:31:74:57 | ...::read(...) [future, Ok] | provenance | Src:MaD:16  |
+| test.rs:74:31:74:57 | ...::read(...) [future, Ok] | test.rs:74:31:74:63 | await ... [Ok] | provenance |  |
+| test.rs:74:31:74:63 | await ... [Ok] | test.rs:74:31:74:64 | TryExpr | provenance |  |
+| test.rs:74:31:74:64 | TryExpr | test.rs:74:13:74:18 | buffer | provenance |  |
+| test.rs:79:13:79:18 | buffer | test.rs:80:14:80:19 | buffer | provenance |  |
+| test.rs:79:31:79:45 | ...::read | test.rs:79:31:79:57 | ...::read(...) [future, Ok] | provenance | Src:MaD:16  |
+| test.rs:79:31:79:57 | ...::read(...) [future, Ok] | test.rs:79:31:79:63 | await ... [Ok] | provenance |  |
+| test.rs:79:31:79:63 | await ... [Ok] | test.rs:79:31:79:64 | TryExpr | provenance |  |
+| test.rs:79:31:79:64 | TryExpr | test.rs:79:13:79:18 | buffer | provenance |  |
+| test.rs:84:13:84:18 | buffer | test.rs:85:14:85:19 | buffer | provenance |  |
+| test.rs:84:22:84:46 | ...::read_to_string | test.rs:84:22:84:58 | ...::read_to_string(...) [future, Ok] | provenance | Src:MaD:18  |
+| test.rs:84:22:84:58 | ...::read_to_string(...) [future, Ok] | test.rs:84:22:84:64 | await ... [Ok] | provenance |  |
+| test.rs:84:22:84:64 | await ... [Ok] | test.rs:84:22:84:65 | TryExpr | provenance |  |
+| test.rs:84:22:84:65 | TryExpr | test.rs:84:13:84:18 | buffer | provenance |  |
+| test.rs:90:13:90:16 | path | test.rs:92:14:92:17 | path | provenance |  |
+| test.rs:90:20:90:31 | entry.path() | test.rs:90:13:90:16 | path | provenance |  |
+| test.rs:90:26:90:29 | path | test.rs:90:20:90:31 | entry.path() | provenance | Src:MaD:10 MaD:10 |
+| test.rs:90:26:90:29 | path | test.rs:90:20:90:31 | entry.path() | provenance | Src:MaD:10 MaD:10 |
+| test.rs:91:13:91:21 | file_name | test.rs:93:14:93:22 | file_name | provenance |  |
+| test.rs:91:25:91:41 | entry.file_name() | test.rs:91:13:91:21 | file_name | provenance |  |
+| test.rs:91:31:91:39 | file_name | test.rs:91:25:91:41 | entry.file_name() | provenance | Src:MaD:9 MaD:9 |
+| test.rs:91:31:91:39 | file_name | test.rs:91:25:91:41 | entry.file_name() | provenance | Src:MaD:9 MaD:9 |
+| test.rs:97:13:97:18 | target | test.rs:98:14:98:19 | target | provenance |  |
+| test.rs:97:22:97:41 | ...::read_link | test.rs:97:22:97:56 | ...::read_link(...) [future, Ok] | provenance | Src:MaD:17  |
+| test.rs:97:22:97:56 | ...::read_link(...) [future, Ok] | test.rs:97:22:97:62 | await ... [Ok] | provenance |  |
+| test.rs:97:22:97:62 | await ... [Ok] | test.rs:97:22:97:63 | TryExpr | provenance |  |
+| test.rs:97:22:97:63 | TryExpr | test.rs:97:13:97:18 | target | provenance |  |
+| test.rs:107:9:107:16 | mut file | test.rs:111:32:111:42 | [post] &mut buffer | provenance | MaD:40 |
+| test.rs:107:9:107:16 | mut file | test.rs:111:32:111:42 | [post] &mut buffer [&ref] | provenance | MaD:25 |
+| test.rs:107:9:107:16 | mut file | test.rs:117:39:117:49 | [post] &mut buffer | provenance | MaD:41 |
+| test.rs:107:9:107:16 | mut file | test.rs:117:39:117:49 | [post] &mut buffer [&ref] | provenance | MaD:27 |
+| test.rs:107:9:107:16 | mut file | test.rs:123:42:123:52 | [post] &mut buffer | provenance | MaD:42 |
+| test.rs:107:9:107:16 | mut file | test.rs:123:42:123:52 | [post] &mut buffer [&ref] | provenance | MaD:28 |
+| test.rs:107:9:107:16 | mut file | test.rs:129:25:129:35 | [post] &mut buffer [&ref] | provenance | MaD:26 |
+| test.rs:107:9:107:16 | mut file | test.rs:133:17:133:28 | file.bytes() | provenance | MaD:22 |
+| test.rs:107:20:107:38 | ...::open | test.rs:107:20:107:50 | ...::open(...) [Ok] | provenance | Src:MaD:5  |
+| test.rs:107:20:107:50 | ...::open(...) [Ok] | test.rs:107:20:107:51 | TryExpr | provenance |  |
+| test.rs:107:20:107:51 | TryExpr | test.rs:107:9:107:16 | mut file | provenance |  |
+| test.rs:111:32:111:42 | [post] &mut buffer | test.rs:112:15:112:20 | buffer | provenance |  |
+| test.rs:111:32:111:42 | [post] &mut buffer [&ref] | test.rs:111:37:111:42 | [post] buffer | provenance |  |
+| test.rs:111:37:111:42 | [post] buffer | test.rs:112:15:112:20 | buffer | provenance |  |
+| test.rs:112:15:112:20 | buffer | test.rs:112:14:112:20 | &buffer | provenance |  |
+| test.rs:117:39:117:49 | [post] &mut buffer | test.rs:118:15:118:20 | buffer | provenance |  |
+| test.rs:117:39:117:49 | [post] &mut buffer [&ref] | test.rs:117:44:117:49 | [post] buffer | provenance |  |
+| test.rs:117:44:117:49 | [post] buffer | test.rs:118:15:118:20 | buffer | provenance |  |
+| test.rs:118:15:118:20 | buffer | test.rs:118:14:118:20 | &buffer | provenance |  |
+| test.rs:123:42:123:52 | [post] &mut buffer | test.rs:124:15:124:20 | buffer | provenance |  |
+| test.rs:123:42:123:52 | [post] &mut buffer [&ref] | test.rs:123:47:123:52 | [post] buffer | provenance |  |
+| test.rs:123:47:123:52 | [post] buffer | test.rs:124:15:124:20 | buffer | provenance |  |
+| test.rs:124:15:124:20 | buffer | test.rs:124:14:124:20 | &buffer | provenance |  |
+| test.rs:129:25:129:35 | [post] &mut buffer [&ref] | test.rs:129:30:129:35 | [post] buffer | provenance |  |
+| test.rs:129:30:129:35 | [post] buffer | test.rs:130:15:130:20 | buffer | provenance |  |
+| test.rs:130:15:130:20 | buffer | test.rs:130:14:130:20 | &buffer | provenance |  |
+| test.rs:133:17:133:28 | file.bytes() | test.rs:134:14:134:17 | byte | provenance |  |
+| test.rs:140:13:140:18 | mut f1 | test.rs:142:30:142:40 | [post] &mut buffer | provenance | MaD:40 |
+| test.rs:140:13:140:18 | mut f1 | test.rs:142:30:142:40 | [post] &mut buffer [&ref] | provenance | MaD:25 |
+| test.rs:140:22:140:63 | ... .open(...) [Ok] | test.rs:140:22:140:72 | ... .unwrap() | provenance | MaD:39 |
+| test.rs:140:22:140:72 | ... .unwrap() | test.rs:140:13:140:18 | mut f1 | provenance |  |
+| test.rs:140:50:140:53 | open | test.rs:140:22:140:63 | ... .open(...) [Ok] | provenance | Src:MaD:6  |
+| test.rs:142:30:142:40 | [post] &mut buffer | test.rs:143:15:143:20 | buffer | provenance |  |
+| test.rs:142:30:142:40 | [post] &mut buffer [&ref] | test.rs:142:35:142:40 | [post] buffer | provenance |  |
+| test.rs:142:35:142:40 | [post] buffer | test.rs:143:15:143:20 | buffer | provenance |  |
+| test.rs:143:15:143:20 | buffer | test.rs:143:14:143:20 | &buffer | provenance |  |
+| test.rs:147:13:147:18 | mut f2 | test.rs:149:30:149:40 | [post] &mut buffer | provenance | MaD:40 |
+| test.rs:147:13:147:18 | mut f2 | test.rs:149:30:149:40 | [post] &mut buffer [&ref] | provenance | MaD:25 |
+| test.rs:147:22:147:80 | ... .open(...) [Ok] | test.rs:147:22:147:89 | ... .unwrap() | provenance | MaD:39 |
+| test.rs:147:22:147:89 | ... .unwrap() | test.rs:147:13:147:18 | mut f2 | provenance |  |
+| test.rs:147:67:147:70 | open | test.rs:147:22:147:80 | ... .open(...) [Ok] | provenance | Src:MaD:6  |
+| test.rs:149:30:149:40 | [post] &mut buffer | test.rs:150:15:150:20 | buffer | provenance |  |
+| test.rs:149:30:149:40 | [post] &mut buffer [&ref] | test.rs:149:35:149:40 | [post] buffer | provenance |  |
+| test.rs:149:35:149:40 | [post] buffer | test.rs:150:15:150:20 | buffer | provenance |  |
+| test.rs:150:15:150:20 | buffer | test.rs:150:14:150:20 | &buffer | provenance |  |
+| test.rs:154:13:154:18 | mut f3 | test.rs:156:30:156:40 | [post] &mut buffer | provenance | MaD:40 |
+| test.rs:154:13:154:18 | mut f3 | test.rs:156:30:156:40 | [post] &mut buffer [&ref] | provenance | MaD:25 |
+| test.rs:154:22:154:114 | ... .open(...) [Ok] | test.rs:154:22:154:123 | ... .unwrap() | provenance | MaD:39 |
+| test.rs:154:22:154:123 | ... .unwrap() | test.rs:154:13:154:18 | mut f3 | provenance |  |
+| test.rs:154:101:154:104 | open | test.rs:154:22:154:114 | ... .open(...) [Ok] | provenance | Src:MaD:6  |
+| test.rs:156:30:156:40 | [post] &mut buffer | test.rs:157:15:157:20 | buffer | provenance |  |
+| test.rs:156:30:156:40 | [post] &mut buffer [&ref] | test.rs:156:35:156:40 | [post] buffer | provenance |  |
+| test.rs:156:35:156:40 | [post] buffer | test.rs:157:15:157:20 | buffer | provenance |  |
+| test.rs:157:15:157:20 | buffer | test.rs:157:14:157:20 | &buffer | provenance |  |
+| test.rs:164:13:164:17 | file1 | test.rs:166:26:166:43 | file1.chain(...) | provenance | MaD:24 |
+| test.rs:164:21:164:39 | ...::open | test.rs:164:21:164:51 | ...::open(...) [Ok] | provenance | Src:MaD:5  |
+| test.rs:164:21:164:51 | ...::open(...) [Ok] | test.rs:164:21:164:52 | TryExpr | provenance |  |
+| test.rs:164:21:164:52 | TryExpr | test.rs:164:13:164:17 | file1 | provenance |  |
+| test.rs:165:13:165:17 | file2 | test.rs:166:38:166:42 | file2 | provenance |  |
+| test.rs:165:21:165:39 | ...::open | test.rs:165:21:165:59 | ...::open(...) [Ok] | provenance | Src:MaD:5  |
+| test.rs:165:21:165:59 | ...::open(...) [Ok] | test.rs:165:21:165:60 | TryExpr | provenance |  |
+| test.rs:165:21:165:60 | TryExpr | test.rs:165:13:165:17 | file2 | provenance |  |
+| test.rs:166:13:166:22 | mut reader | test.rs:167:31:167:41 | [post] &mut buffer [&ref] | provenance | MaD:28 |
+| test.rs:166:26:166:43 | file1.chain(...) | test.rs:166:13:166:22 | mut reader | provenance |  |
+| test.rs:166:38:166:42 | file2 | test.rs:166:26:166:43 | file1.chain(...) | provenance | MaD:23 |
+| test.rs:167:31:167:41 | [post] &mut buffer [&ref] | test.rs:167:36:167:41 | [post] buffer | provenance |  |
+| test.rs:167:36:167:41 | [post] buffer | test.rs:168:15:168:20 | buffer | provenance |  |
+| test.rs:168:15:168:20 | buffer | test.rs:168:14:168:20 | &buffer | provenance |  |
+| test.rs:173:13:173:17 | file1 | test.rs:174:26:174:40 | file1.take(...) | provenance | MaD:29 |
+| test.rs:173:21:173:39 | ...::open | test.rs:173:21:173:51 | ...::open(...) [Ok] | provenance | Src:MaD:5  |
+| test.rs:173:21:173:51 | ...::open(...) [Ok] | test.rs:173:21:173:52 | TryExpr | provenance |  |
+| test.rs:173:21:173:52 | TryExpr | test.rs:173:13:173:17 | file1 | provenance |  |
+| test.rs:174:13:174:22 | mut reader | test.rs:175:31:175:41 | [post] &mut buffer [&ref] | provenance | MaD:28 |
+| test.rs:174:26:174:40 | file1.take(...) | test.rs:174:13:174:22 | mut reader | provenance |  |
+| test.rs:175:31:175:41 | [post] &mut buffer [&ref] | test.rs:175:36:175:41 | [post] buffer | provenance |  |
+| test.rs:175:36:175:41 | [post] buffer | test.rs:176:15:176:20 | buffer | provenance |  |
+| test.rs:176:15:176:20 | buffer | test.rs:176:14:176:20 | &buffer | provenance |  |
+| test.rs:185:9:185:16 | mut file | test.rs:189:32:189:42 | [post] &mut buffer [&ref] | provenance | MaD:30 |
+| test.rs:185:9:185:16 | mut file | test.rs:195:39:195:49 | [post] &mut buffer [&ref] | provenance | MaD:36 |
+| test.rs:185:9:185:16 | mut file | test.rs:201:42:201:52 | [post] &mut buffer [&ref] | provenance | MaD:37 |
+| test.rs:185:9:185:16 | mut file | test.rs:207:25:207:35 | [post] &mut buffer [&ref] | provenance | MaD:32 |
+| test.rs:185:9:185:16 | mut file | test.rs:212:18:212:31 | file.read_u8() [future, Ok] | provenance | MaD:38 |
+| test.rs:185:9:185:16 | mut file | test.rs:213:18:213:32 | file.read_i16() [future, Ok] | provenance | MaD:34 |
+| test.rs:185:9:185:16 | mut file | test.rs:214:18:214:32 | file.read_f32() [future, Ok] | provenance | MaD:33 |
+| test.rs:185:9:185:16 | mut file | test.rs:215:18:215:35 | file.read_i64_le() [future, Ok] | provenance | MaD:35 |
+| test.rs:185:9:185:16 | mut file | test.rs:224:23:224:33 | [post] &mut buffer [&ref] | provenance | MaD:31 |
+| test.rs:185:20:185:40 | ...::open | test.rs:185:20:185:52 | ...::open(...) [future, Ok] | provenance | Src:MaD:7  |
+| test.rs:185:20:185:52 | ...::open(...) [future, Ok] | test.rs:185:20:185:58 | await ... [Ok] | provenance |  |
+| test.rs:185:20:185:58 | await ... [Ok] | test.rs:185:20:185:59 | TryExpr | provenance |  |
+| test.rs:185:20:185:59 | TryExpr | test.rs:185:9:185:16 | mut file | provenance |  |
+| test.rs:189:32:189:42 | [post] &mut buffer [&ref] | test.rs:189:37:189:42 | [post] buffer | provenance |  |
+| test.rs:189:37:189:42 | [post] buffer | test.rs:190:15:190:20 | buffer | provenance |  |
+| test.rs:190:15:190:20 | buffer | test.rs:190:14:190:20 | &buffer | provenance |  |
+| test.rs:195:39:195:49 | [post] &mut buffer [&ref] | test.rs:195:44:195:49 | [post] buffer | provenance |  |
+| test.rs:195:44:195:49 | [post] buffer | test.rs:196:15:196:20 | buffer | provenance |  |
+| test.rs:196:15:196:20 | buffer | test.rs:196:14:196:20 | &buffer | provenance |  |
+| test.rs:201:42:201:52 | [post] &mut buffer [&ref] | test.rs:201:47:201:52 | [post] buffer | provenance |  |
+| test.rs:201:47:201:52 | [post] buffer | test.rs:202:15:202:20 | buffer | provenance |  |
+| test.rs:202:15:202:20 | buffer | test.rs:202:14:202:20 | &buffer | provenance |  |
+| test.rs:207:25:207:35 | [post] &mut buffer [&ref] | test.rs:207:30:207:35 | [post] buffer | provenance |  |
+| test.rs:207:30:207:35 | [post] buffer | test.rs:208:15:208:20 | buffer | provenance |  |
+| test.rs:208:15:208:20 | buffer | test.rs:208:14:208:20 | &buffer | provenance |  |
+| test.rs:212:13:212:14 | v1 | test.rs:216:14:216:15 | v1 | provenance |  |
+| test.rs:212:18:212:31 | file.read_u8() [future, Ok] | test.rs:212:18:212:37 | await ... [Ok] | provenance |  |
+| test.rs:212:18:212:37 | await ... [Ok] | test.rs:212:18:212:38 | TryExpr | provenance |  |
+| test.rs:212:18:212:38 | TryExpr | test.rs:212:13:212:14 | v1 | provenance |  |
+| test.rs:213:13:213:14 | v2 | test.rs:217:14:217:15 | v2 | provenance |  |
+| test.rs:213:18:213:32 | file.read_i16() [future, Ok] | test.rs:213:18:213:38 | await ... [Ok] | provenance |  |
+| test.rs:213:18:213:38 | await ... [Ok] | test.rs:213:18:213:39 | TryExpr | provenance |  |
+| test.rs:213:18:213:39 | TryExpr | test.rs:213:13:213:14 | v2 | provenance |  |
+| test.rs:214:13:214:14 | v3 | test.rs:218:14:218:15 | v3 | provenance |  |
+| test.rs:214:18:214:32 | file.read_f32() [future, Ok] | test.rs:214:18:214:38 | await ... [Ok] | provenance |  |
+| test.rs:214:18:214:38 | await ... [Ok] | test.rs:214:18:214:39 | TryExpr | provenance |  |
+| test.rs:214:18:214:39 | TryExpr | test.rs:214:13:214:14 | v3 | provenance |  |
+| test.rs:215:13:215:14 | v4 | test.rs:219:14:219:15 | v4 | provenance |  |
+| test.rs:215:18:215:35 | file.read_i64_le() [future, Ok] | test.rs:215:18:215:41 | await ... [Ok] | provenance |  |
+| test.rs:215:18:215:41 | await ... [Ok] | test.rs:215:18:215:42 | TryExpr | provenance |  |
+| test.rs:215:18:215:42 | TryExpr | test.rs:215:13:215:14 | v4 | provenance |  |
+| test.rs:224:23:224:33 | [post] &mut buffer [&ref] | test.rs:224:28:224:33 | [post] buffer | provenance |  |
+| test.rs:224:28:224:33 | [post] buffer | test.rs:225:15:225:20 | buffer | provenance |  |
+| test.rs:225:15:225:20 | buffer | test.rs:225:14:225:20 | &buffer | provenance |  |
+| test.rs:231:13:231:18 | mut f1 | test.rs:233:30:233:40 | [post] &mut buffer [&ref] | provenance | MaD:30 |
+| test.rs:231:22:231:65 | ... .open(...) [future, Ok] | test.rs:231:22:231:71 | await ... [Ok] | provenance |  |
+| test.rs:231:22:231:71 | await ... [Ok] | test.rs:231:22:231:72 | TryExpr | provenance |  |
+| test.rs:231:22:231:72 | TryExpr | test.rs:231:13:231:18 | mut f1 | provenance |  |
+| test.rs:231:52:231:55 | open | test.rs:231:22:231:65 | ... .open(...) [future, Ok] | provenance | Src:MaD:8  |
+| test.rs:233:30:233:40 | [post] &mut buffer [&ref] | test.rs:233:35:233:40 | [post] buffer | provenance |  |
+| test.rs:233:35:233:40 | [post] buffer | test.rs:234:15:234:20 | buffer | provenance |  |
+| test.rs:234:15:234:20 | buffer | test.rs:234:14:234:20 | &buffer | provenance |  |
+| test.rs:262:9:262:16 | mut file | test.rs:266:22:266:25 | file | provenance |  |
+| test.rs:262:9:262:16 | mut file | test.rs:266:32:266:42 | [post] &mut buffer [&ref] | provenance | MaD:19 |
+| test.rs:262:9:262:16 | mut file | test.rs:266:32:266:42 | [post] &mut buffer [&ref] | provenance | MaD:20 |
+| test.rs:262:20:262:44 | ...::open | test.rs:262:20:262:56 | ...::open(...) [future, Ok] | provenance | Src:MaD:1  |
+| test.rs:262:20:262:56 | ...::open(...) [future, Ok] | test.rs:262:20:262:62 | await ... [Ok] | provenance |  |
+| test.rs:262:20:262:62 | await ... [Ok] | test.rs:262:20:262:63 | TryExpr | provenance |  |
+| test.rs:262:20:262:63 | TryExpr | test.rs:262:9:262:16 | mut file | provenance |  |
+| test.rs:266:22:266:25 | file | test.rs:266:32:266:42 | [post] &mut buffer [&ref] | provenance | MaD:19 |
+| test.rs:266:32:266:42 | [post] &mut buffer [&ref] | test.rs:266:37:266:42 | [post] buffer | provenance |  |
+| test.rs:266:37:266:42 | [post] buffer | test.rs:267:15:267:20 | buffer | provenance |  |
+| test.rs:267:15:267:20 | buffer | test.rs:267:14:267:20 | &buffer | provenance |  |
+| test.rs:273:13:273:18 | mut f1 | test.rs:275:22:275:23 | f1 | provenance |  |
+| test.rs:273:13:273:18 | mut f1 | test.rs:275:30:275:40 | [post] &mut buffer [&ref] | provenance | MaD:19 |
+| test.rs:273:13:273:18 | mut f1 | test.rs:275:30:275:40 | [post] &mut buffer [&ref] | provenance | MaD:20 |
+| test.rs:273:22:273:69 | ... .open(...) [future, Ok] | test.rs:273:22:273:75 | await ... [Ok] | provenance |  |
+| test.rs:273:22:273:75 | await ... [Ok] | test.rs:273:22:273:76 | TryExpr | provenance |  |
+| test.rs:273:22:273:76 | TryExpr | test.rs:273:13:273:18 | mut f1 | provenance |  |
+| test.rs:273:56:273:59 | open | test.rs:273:22:273:69 | ... .open(...) [future, Ok] | provenance | Src:MaD:2  |
+| test.rs:275:22:275:23 | f1 | test.rs:275:30:275:40 | [post] &mut buffer [&ref] | provenance | MaD:19 |
+| test.rs:275:30:275:40 | [post] &mut buffer [&ref] | test.rs:275:35:275:40 | [post] buffer | provenance |  |
+| test.rs:275:35:275:40 | [post] buffer | test.rs:276:15:276:20 | buffer | provenance |  |
+| test.rs:276:15:276:20 | buffer | test.rs:276:14:276:20 | &buffer | provenance |  |
+nodes
+| test.rs:12:13:12:18 | buffer | semmle.label | buffer |
+| test.rs:12:31:12:43 | ...::read | semmle.label | ...::read |
+| test.rs:12:31:12:43 | ...::read [Ok] | semmle.label | ...::read [Ok] |
+| test.rs:12:31:12:55 | ...::read(...) [Ok] | semmle.label | ...::read(...) [Ok] |
+| test.rs:12:31:12:56 | TryExpr | semmle.label | TryExpr |
+| test.rs:13:14:13:19 | buffer | semmle.label | buffer |
+| test.rs:17:13:17:18 | buffer | semmle.label | buffer |
+| test.rs:17:31:17:38 | ...::read | semmle.label | ...::read |
+| test.rs:17:31:17:38 | ...::read [Ok] | semmle.label | ...::read [Ok] |
+| test.rs:17:31:17:50 | ...::read(...) [Ok] | semmle.label | ...::read(...) [Ok] |
+| test.rs:17:31:17:51 | TryExpr | semmle.label | TryExpr |
+| test.rs:18:14:18:19 | buffer | semmle.label | buffer |
+| test.rs:22:13:22:18 | buffer | semmle.label | buffer |
+| test.rs:22:22:22:39 | ...::read_to_string | semmle.label | ...::read_to_string |
+| test.rs:22:22:22:39 | ...::read_to_string [Ok] | semmle.label | ...::read_to_string [Ok] |
+| test.rs:22:22:22:51 | ...::read_to_string(...) [Ok] | semmle.label | ...::read_to_string(...) [Ok] |
+| test.rs:22:22:22:52 | TryExpr | semmle.label | TryExpr |
+| test.rs:23:14:23:19 | buffer | semmle.label | buffer |
+| test.rs:29:13:29:16 | path | semmle.label | path |
+| test.rs:29:20:29:27 | e.path() | semmle.label | e.path() |
+| test.rs:29:22:29:25 | path | semmle.label | path |
+| test.rs:30:14:30:17 | path | semmle.label | path |
+| test.rs:30:14:30:25 | path.clone() | semmle.label | path.clone() |
+| test.rs:31:14:31:17 | path | semmle.label | path |
+| test.rs:31:14:31:25 | path.clone() | semmle.label | path.clone() |
+| test.rs:31:14:31:35 | ... .as_path() | semmle.label | ... .as_path() |
+| test.rs:41:14:41:17 | path | semmle.label | path |
+| test.rs:43:13:43:21 | file_name | semmle.label | file_name |
+| test.rs:43:25:43:37 | e.file_name() | semmle.label | e.file_name() |
+| test.rs:43:27:43:35 | file_name | semmle.label | file_name |
+| test.rs:44:14:44:22 | file_name | semmle.label | file_name |
+| test.rs:44:14:44:30 | file_name.clone() | semmle.label | file_name.clone() |
+| test.rs:49:14:49:22 | file_name | semmle.label | file_name |
+| test.rs:65:13:65:18 | target | semmle.label | target |
+| test.rs:65:22:65:34 | ...::read_link | semmle.label | ...::read_link |
+| test.rs:65:22:65:49 | ...::read_link(...) [Ok] | semmle.label | ...::read_link(...) [Ok] |
+| test.rs:65:22:65:50 | TryExpr | semmle.label | TryExpr |
+| test.rs:66:14:66:19 | target | semmle.label | target |
+| test.rs:74:13:74:18 | buffer | semmle.label | buffer |
+| test.rs:74:31:74:45 | ...::read | semmle.label | ...::read |
+| test.rs:74:31:74:57 | ...::read(...) [future, Ok] | semmle.label | ...::read(...) [future, Ok] |
+| test.rs:74:31:74:63 | await ... [Ok] | semmle.label | await ... [Ok] |
+| test.rs:74:31:74:64 | TryExpr | semmle.label | TryExpr |
+| test.rs:75:14:75:19 | buffer | semmle.label | buffer |
+| test.rs:79:13:79:18 | buffer | semmle.label | buffer |
+| test.rs:79:31:79:45 | ...::read | semmle.label | ...::read |
+| test.rs:79:31:79:57 | ...::read(...) [future, Ok] | semmle.label | ...::read(...) [future, Ok] |
+| test.rs:79:31:79:63 | await ... [Ok] | semmle.label | await ... [Ok] |
+| test.rs:79:31:79:64 | TryExpr | semmle.label | TryExpr |
+| test.rs:80:14:80:19 | buffer | semmle.label | buffer |
+| test.rs:84:13:84:18 | buffer | semmle.label | buffer |
+| test.rs:84:22:84:46 | ...::read_to_string | semmle.label | ...::read_to_string |
+| test.rs:84:22:84:58 | ...::read_to_string(...) [future, Ok] | semmle.label | ...::read_to_string(...) [future, Ok] |
+| test.rs:84:22:84:64 | await ... [Ok] | semmle.label | await ... [Ok] |
+| test.rs:84:22:84:65 | TryExpr | semmle.label | TryExpr |
+| test.rs:85:14:85:19 | buffer | semmle.label | buffer |
+| test.rs:90:13:90:16 | path | semmle.label | path |
+| test.rs:90:20:90:31 | entry.path() | semmle.label | entry.path() |
+| test.rs:90:26:90:29 | path | semmle.label | path |
+| test.rs:90:26:90:29 | path | semmle.label | path |
+| test.rs:91:13:91:21 | file_name | semmle.label | file_name |
+| test.rs:91:25:91:41 | entry.file_name() | semmle.label | entry.file_name() |
+| test.rs:91:31:91:39 | file_name | semmle.label | file_name |
+| test.rs:91:31:91:39 | file_name | semmle.label | file_name |
+| test.rs:92:14:92:17 | path | semmle.label | path |
+| test.rs:93:14:93:22 | file_name | semmle.label | file_name |
+| test.rs:97:13:97:18 | target | semmle.label | target |
+| test.rs:97:22:97:41 | ...::read_link | semmle.label | ...::read_link |
+| test.rs:97:22:97:56 | ...::read_link(...) [future, Ok] | semmle.label | ...::read_link(...) [future, Ok] |
+| test.rs:97:22:97:62 | await ... [Ok] | semmle.label | await ... [Ok] |
+| test.rs:97:22:97:63 | TryExpr | semmle.label | TryExpr |
+| test.rs:98:14:98:19 | target | semmle.label | target |
+| test.rs:107:9:107:16 | mut file | semmle.label | mut file |
+| test.rs:107:20:107:38 | ...::open | semmle.label | ...::open |
+| test.rs:107:20:107:50 | ...::open(...) [Ok] | semmle.label | ...::open(...) [Ok] |
+| test.rs:107:20:107:51 | TryExpr | semmle.label | TryExpr |
+| test.rs:111:32:111:42 | [post] &mut buffer | semmle.label | [post] &mut buffer |
+| test.rs:111:32:111:42 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
+| test.rs:111:37:111:42 | [post] buffer | semmle.label | [post] buffer |
+| test.rs:112:14:112:20 | &buffer | semmle.label | &buffer |
+| test.rs:112:15:112:20 | buffer | semmle.label | buffer |
+| test.rs:117:39:117:49 | [post] &mut buffer | semmle.label | [post] &mut buffer |
+| test.rs:117:39:117:49 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
+| test.rs:117:44:117:49 | [post] buffer | semmle.label | [post] buffer |
+| test.rs:118:14:118:20 | &buffer | semmle.label | &buffer |
+| test.rs:118:15:118:20 | buffer | semmle.label | buffer |
+| test.rs:123:42:123:52 | [post] &mut buffer | semmle.label | [post] &mut buffer |
+| test.rs:123:42:123:52 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
+| test.rs:123:47:123:52 | [post] buffer | semmle.label | [post] buffer |
+| test.rs:124:14:124:20 | &buffer | semmle.label | &buffer |
+| test.rs:124:15:124:20 | buffer | semmle.label | buffer |
+| test.rs:129:25:129:35 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
+| test.rs:129:30:129:35 | [post] buffer | semmle.label | [post] buffer |
+| test.rs:130:14:130:20 | &buffer | semmle.label | &buffer |
+| test.rs:130:15:130:20 | buffer | semmle.label | buffer |
+| test.rs:133:17:133:28 | file.bytes() | semmle.label | file.bytes() |
+| test.rs:134:14:134:17 | byte | semmle.label | byte |
+| test.rs:140:13:140:18 | mut f1 | semmle.label | mut f1 |
+| test.rs:140:22:140:63 | ... .open(...) [Ok] | semmle.label | ... .open(...) [Ok] |
+| test.rs:140:22:140:72 | ... .unwrap() | semmle.label | ... .unwrap() |
+| test.rs:140:50:140:53 | open | semmle.label | open |
+| test.rs:142:30:142:40 | [post] &mut buffer | semmle.label | [post] &mut buffer |
+| test.rs:142:30:142:40 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
+| test.rs:142:35:142:40 | [post] buffer | semmle.label | [post] buffer |
+| test.rs:143:14:143:20 | &buffer | semmle.label | &buffer |
+| test.rs:143:15:143:20 | buffer | semmle.label | buffer |
+| test.rs:147:13:147:18 | mut f2 | semmle.label | mut f2 |
+| test.rs:147:22:147:80 | ... .open(...) [Ok] | semmle.label | ... .open(...) [Ok] |
+| test.rs:147:22:147:89 | ... .unwrap() | semmle.label | ... .unwrap() |
+| test.rs:147:67:147:70 | open | semmle.label | open |
+| test.rs:149:30:149:40 | [post] &mut buffer | semmle.label | [post] &mut buffer |
+| test.rs:149:30:149:40 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
+| test.rs:149:35:149:40 | [post] buffer | semmle.label | [post] buffer |
+| test.rs:150:14:150:20 | &buffer | semmle.label | &buffer |
+| test.rs:150:15:150:20 | buffer | semmle.label | buffer |
+| test.rs:154:13:154:18 | mut f3 | semmle.label | mut f3 |
+| test.rs:154:22:154:114 | ... .open(...) [Ok] | semmle.label | ... .open(...) [Ok] |
+| test.rs:154:22:154:123 | ... .unwrap() | semmle.label | ... .unwrap() |
+| test.rs:154:101:154:104 | open | semmle.label | open |
+| test.rs:156:30:156:40 | [post] &mut buffer | semmle.label | [post] &mut buffer |
+| test.rs:156:30:156:40 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
+| test.rs:156:35:156:40 | [post] buffer | semmle.label | [post] buffer |
+| test.rs:157:14:157:20 | &buffer | semmle.label | &buffer |
+| test.rs:157:15:157:20 | buffer | semmle.label | buffer |
+| test.rs:164:13:164:17 | file1 | semmle.label | file1 |
+| test.rs:164:21:164:39 | ...::open | semmle.label | ...::open |
+| test.rs:164:21:164:51 | ...::open(...) [Ok] | semmle.label | ...::open(...) [Ok] |
+| test.rs:164:21:164:52 | TryExpr | semmle.label | TryExpr |
+| test.rs:165:13:165:17 | file2 | semmle.label | file2 |
+| test.rs:165:21:165:39 | ...::open | semmle.label | ...::open |
+| test.rs:165:21:165:59 | ...::open(...) [Ok] | semmle.label | ...::open(...) [Ok] |
+| test.rs:165:21:165:60 | TryExpr | semmle.label | TryExpr |
+| test.rs:166:13:166:22 | mut reader | semmle.label | mut reader |
+| test.rs:166:26:166:43 | file1.chain(...) | semmle.label | file1.chain(...) |
+| test.rs:166:38:166:42 | file2 | semmle.label | file2 |
+| test.rs:167:31:167:41 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
+| test.rs:167:36:167:41 | [post] buffer | semmle.label | [post] buffer |
+| test.rs:168:14:168:20 | &buffer | semmle.label | &buffer |
+| test.rs:168:15:168:20 | buffer | semmle.label | buffer |
+| test.rs:173:13:173:17 | file1 | semmle.label | file1 |
+| test.rs:173:21:173:39 | ...::open | semmle.label | ...::open |
+| test.rs:173:21:173:51 | ...::open(...) [Ok] | semmle.label | ...::open(...) [Ok] |
+| test.rs:173:21:173:52 | TryExpr | semmle.label | TryExpr |
+| test.rs:174:13:174:22 | mut reader | semmle.label | mut reader |
+| test.rs:174:26:174:40 | file1.take(...) | semmle.label | file1.take(...) |
+| test.rs:175:31:175:41 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
+| test.rs:175:36:175:41 | [post] buffer | semmle.label | [post] buffer |
+| test.rs:176:14:176:20 | &buffer | semmle.label | &buffer |
+| test.rs:176:15:176:20 | buffer | semmle.label | buffer |
+| test.rs:185:9:185:16 | mut file | semmle.label | mut file |
+| test.rs:185:20:185:40 | ...::open | semmle.label | ...::open |
+| test.rs:185:20:185:52 | ...::open(...) [future, Ok] | semmle.label | ...::open(...) [future, Ok] |
+| test.rs:185:20:185:58 | await ... [Ok] | semmle.label | await ... [Ok] |
+| test.rs:185:20:185:59 | TryExpr | semmle.label | TryExpr |
+| test.rs:189:32:189:42 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
+| test.rs:189:37:189:42 | [post] buffer | semmle.label | [post] buffer |
+| test.rs:190:14:190:20 | &buffer | semmle.label | &buffer |
+| test.rs:190:15:190:20 | buffer | semmle.label | buffer |
+| test.rs:195:39:195:49 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
+| test.rs:195:44:195:49 | [post] buffer | semmle.label | [post] buffer |
+| test.rs:196:14:196:20 | &buffer | semmle.label | &buffer |
+| test.rs:196:15:196:20 | buffer | semmle.label | buffer |
+| test.rs:201:42:201:52 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
+| test.rs:201:47:201:52 | [post] buffer | semmle.label | [post] buffer |
+| test.rs:202:14:202:20 | &buffer | semmle.label | &buffer |
+| test.rs:202:15:202:20 | buffer | semmle.label | buffer |
+| test.rs:207:25:207:35 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
+| test.rs:207:30:207:35 | [post] buffer | semmle.label | [post] buffer |
+| test.rs:208:14:208:20 | &buffer | semmle.label | &buffer |
+| test.rs:208:15:208:20 | buffer | semmle.label | buffer |
+| test.rs:212:13:212:14 | v1 | semmle.label | v1 |
+| test.rs:212:18:212:31 | file.read_u8() [future, Ok] | semmle.label | file.read_u8() [future, Ok] |
+| test.rs:212:18:212:37 | await ... [Ok] | semmle.label | await ... [Ok] |
+| test.rs:212:18:212:38 | TryExpr | semmle.label | TryExpr |
+| test.rs:213:13:213:14 | v2 | semmle.label | v2 |
+| test.rs:213:18:213:32 | file.read_i16() [future, Ok] | semmle.label | file.read_i16() [future, Ok] |
+| test.rs:213:18:213:38 | await ... [Ok] | semmle.label | await ... [Ok] |
+| test.rs:213:18:213:39 | TryExpr | semmle.label | TryExpr |
+| test.rs:214:13:214:14 | v3 | semmle.label | v3 |
+| test.rs:214:18:214:32 | file.read_f32() [future, Ok] | semmle.label | file.read_f32() [future, Ok] |
+| test.rs:214:18:214:38 | await ... [Ok] | semmle.label | await ... [Ok] |
+| test.rs:214:18:214:39 | TryExpr | semmle.label | TryExpr |
+| test.rs:215:13:215:14 | v4 | semmle.label | v4 |
+| test.rs:215:18:215:35 | file.read_i64_le() [future, Ok] | semmle.label | file.read_i64_le() [future, Ok] |
+| test.rs:215:18:215:41 | await ... [Ok] | semmle.label | await ... [Ok] |
+| test.rs:215:18:215:42 | TryExpr | semmle.label | TryExpr |
+| test.rs:216:14:216:15 | v1 | semmle.label | v1 |
+| test.rs:217:14:217:15 | v2 | semmle.label | v2 |
+| test.rs:218:14:218:15 | v3 | semmle.label | v3 |
+| test.rs:219:14:219:15 | v4 | semmle.label | v4 |
+| test.rs:224:23:224:33 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
+| test.rs:224:28:224:33 | [post] buffer | semmle.label | [post] buffer |
+| test.rs:225:14:225:20 | &buffer | semmle.label | &buffer |
+| test.rs:225:15:225:20 | buffer | semmle.label | buffer |
+| test.rs:231:13:231:18 | mut f1 | semmle.label | mut f1 |
+| test.rs:231:22:231:65 | ... .open(...) [future, Ok] | semmle.label | ... .open(...) [future, Ok] |
+| test.rs:231:22:231:71 | await ... [Ok] | semmle.label | await ... [Ok] |
+| test.rs:231:22:231:72 | TryExpr | semmle.label | TryExpr |
+| test.rs:231:52:231:55 | open | semmle.label | open |
+| test.rs:233:30:233:40 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
+| test.rs:233:35:233:40 | [post] buffer | semmle.label | [post] buffer |
+| test.rs:234:14:234:20 | &buffer | semmle.label | &buffer |
+| test.rs:234:15:234:20 | buffer | semmle.label | buffer |
+| test.rs:262:9:262:16 | mut file | semmle.label | mut file |
+| test.rs:262:20:262:44 | ...::open | semmle.label | ...::open |
+| test.rs:262:20:262:56 | ...::open(...) [future, Ok] | semmle.label | ...::open(...) [future, Ok] |
+| test.rs:262:20:262:62 | await ... [Ok] | semmle.label | await ... [Ok] |
+| test.rs:262:20:262:63 | TryExpr | semmle.label | TryExpr |
+| test.rs:266:22:266:25 | file | semmle.label | file |
+| test.rs:266:32:266:42 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
+| test.rs:266:37:266:42 | [post] buffer | semmle.label | [post] buffer |
+| test.rs:267:14:267:20 | &buffer | semmle.label | &buffer |
+| test.rs:267:15:267:20 | buffer | semmle.label | buffer |
+| test.rs:273:13:273:18 | mut f1 | semmle.label | mut f1 |
+| test.rs:273:22:273:69 | ... .open(...) [future, Ok] | semmle.label | ... .open(...) [future, Ok] |
+| test.rs:273:22:273:75 | await ... [Ok] | semmle.label | await ... [Ok] |
+| test.rs:273:22:273:76 | TryExpr | semmle.label | TryExpr |
+| test.rs:273:56:273:59 | open | semmle.label | open |
+| test.rs:275:22:275:23 | f1 | semmle.label | f1 |
+| test.rs:275:30:275:40 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
+| test.rs:275:35:275:40 | [post] buffer | semmle.label | [post] buffer |
+| test.rs:276:14:276:20 | &buffer | semmle.label | &buffer |
+| test.rs:276:15:276:20 | buffer | semmle.label | buffer |
+subpaths
+testFailures
+#select
+| test.rs:13:14:13:19 | buffer | test.rs:12:31:12:43 | ...::read | test.rs:13:14:13:19 | buffer | $@ | test.rs:12:31:12:43 | ...::read | ...::read |
+| test.rs:18:14:18:19 | buffer | test.rs:17:31:17:38 | ...::read | test.rs:18:14:18:19 | buffer | $@ | test.rs:17:31:17:38 | ...::read | ...::read |
+| test.rs:23:14:23:19 | buffer | test.rs:22:22:22:39 | ...::read_to_string | test.rs:23:14:23:19 | buffer | $@ | test.rs:22:22:22:39 | ...::read_to_string | ...::read_to_string |
+| test.rs:30:14:30:25 | path.clone() | test.rs:29:22:29:25 | path | test.rs:30:14:30:25 | path.clone() | $@ | test.rs:29:22:29:25 | path | path |
+| test.rs:31:14:31:35 | ... .as_path() | test.rs:29:22:29:25 | path | test.rs:31:14:31:35 | ... .as_path() | $@ | test.rs:29:22:29:25 | path | path |
+| test.rs:41:14:41:17 | path | test.rs:29:22:29:25 | path | test.rs:41:14:41:17 | path | $@ | test.rs:29:22:29:25 | path | path |
+| test.rs:44:14:44:30 | file_name.clone() | test.rs:43:27:43:35 | file_name | test.rs:44:14:44:30 | file_name.clone() | $@ | test.rs:43:27:43:35 | file_name | file_name |
+| test.rs:49:14:49:22 | file_name | test.rs:43:27:43:35 | file_name | test.rs:49:14:49:22 | file_name | $@ | test.rs:43:27:43:35 | file_name | file_name |
+| test.rs:66:14:66:19 | target | test.rs:65:22:65:34 | ...::read_link | test.rs:66:14:66:19 | target | $@ | test.rs:65:22:65:34 | ...::read_link | ...::read_link |
+| test.rs:75:14:75:19 | buffer | test.rs:74:31:74:45 | ...::read | test.rs:75:14:75:19 | buffer | $@ | test.rs:74:31:74:45 | ...::read | ...::read |
+| test.rs:80:14:80:19 | buffer | test.rs:79:31:79:45 | ...::read | test.rs:80:14:80:19 | buffer | $@ | test.rs:79:31:79:45 | ...::read | ...::read |
+| test.rs:85:14:85:19 | buffer | test.rs:84:22:84:46 | ...::read_to_string | test.rs:85:14:85:19 | buffer | $@ | test.rs:84:22:84:46 | ...::read_to_string | ...::read_to_string |
+| test.rs:92:14:92:17 | path | test.rs:90:26:90:29 | path | test.rs:92:14:92:17 | path | $@ | test.rs:90:26:90:29 | path | path |
+| test.rs:92:14:92:17 | path | test.rs:90:26:90:29 | path | test.rs:92:14:92:17 | path | $@ | test.rs:90:26:90:29 | path | path |
+| test.rs:93:14:93:22 | file_name | test.rs:91:31:91:39 | file_name | test.rs:93:14:93:22 | file_name | $@ | test.rs:91:31:91:39 | file_name | file_name |
+| test.rs:93:14:93:22 | file_name | test.rs:91:31:91:39 | file_name | test.rs:93:14:93:22 | file_name | $@ | test.rs:91:31:91:39 | file_name | file_name |
+| test.rs:98:14:98:19 | target | test.rs:97:22:97:41 | ...::read_link | test.rs:98:14:98:19 | target | $@ | test.rs:97:22:97:41 | ...::read_link | ...::read_link |
+| test.rs:112:14:112:20 | &buffer | test.rs:107:20:107:38 | ...::open | test.rs:112:14:112:20 | &buffer | $@ | test.rs:107:20:107:38 | ...::open | ...::open |
+| test.rs:118:14:118:20 | &buffer | test.rs:107:20:107:38 | ...::open | test.rs:118:14:118:20 | &buffer | $@ | test.rs:107:20:107:38 | ...::open | ...::open |
+| test.rs:124:14:124:20 | &buffer | test.rs:107:20:107:38 | ...::open | test.rs:124:14:124:20 | &buffer | $@ | test.rs:107:20:107:38 | ...::open | ...::open |
+| test.rs:130:14:130:20 | &buffer | test.rs:107:20:107:38 | ...::open | test.rs:130:14:130:20 | &buffer | $@ | test.rs:107:20:107:38 | ...::open | ...::open |
+| test.rs:134:14:134:17 | byte | test.rs:107:20:107:38 | ...::open | test.rs:134:14:134:17 | byte | $@ | test.rs:107:20:107:38 | ...::open | ...::open |
+| test.rs:143:14:143:20 | &buffer | test.rs:140:50:140:53 | open | test.rs:143:14:143:20 | &buffer | $@ | test.rs:140:50:140:53 | open | open |
+| test.rs:150:14:150:20 | &buffer | test.rs:147:67:147:70 | open | test.rs:150:14:150:20 | &buffer | $@ | test.rs:147:67:147:70 | open | open |
+| test.rs:157:14:157:20 | &buffer | test.rs:154:101:154:104 | open | test.rs:157:14:157:20 | &buffer | $@ | test.rs:154:101:154:104 | open | open |
+| test.rs:168:14:168:20 | &buffer | test.rs:164:21:164:39 | ...::open | test.rs:168:14:168:20 | &buffer | $@ | test.rs:164:21:164:39 | ...::open | ...::open |
+| test.rs:168:14:168:20 | &buffer | test.rs:165:21:165:39 | ...::open | test.rs:168:14:168:20 | &buffer | $@ | test.rs:165:21:165:39 | ...::open | ...::open |
+| test.rs:176:14:176:20 | &buffer | test.rs:173:21:173:39 | ...::open | test.rs:176:14:176:20 | &buffer | $@ | test.rs:173:21:173:39 | ...::open | ...::open |
+| test.rs:190:14:190:20 | &buffer | test.rs:185:20:185:40 | ...::open | test.rs:190:14:190:20 | &buffer | $@ | test.rs:185:20:185:40 | ...::open | ...::open |
+| test.rs:196:14:196:20 | &buffer | test.rs:185:20:185:40 | ...::open | test.rs:196:14:196:20 | &buffer | $@ | test.rs:185:20:185:40 | ...::open | ...::open |
+| test.rs:202:14:202:20 | &buffer | test.rs:185:20:185:40 | ...::open | test.rs:202:14:202:20 | &buffer | $@ | test.rs:185:20:185:40 | ...::open | ...::open |
+| test.rs:208:14:208:20 | &buffer | test.rs:185:20:185:40 | ...::open | test.rs:208:14:208:20 | &buffer | $@ | test.rs:185:20:185:40 | ...::open | ...::open |
+| test.rs:216:14:216:15 | v1 | test.rs:185:20:185:40 | ...::open | test.rs:216:14:216:15 | v1 | $@ | test.rs:185:20:185:40 | ...::open | ...::open |
+| test.rs:217:14:217:15 | v2 | test.rs:185:20:185:40 | ...::open | test.rs:217:14:217:15 | v2 | $@ | test.rs:185:20:185:40 | ...::open | ...::open |
+| test.rs:218:14:218:15 | v3 | test.rs:185:20:185:40 | ...::open | test.rs:218:14:218:15 | v3 | $@ | test.rs:185:20:185:40 | ...::open | ...::open |
+| test.rs:219:14:219:15 | v4 | test.rs:185:20:185:40 | ...::open | test.rs:219:14:219:15 | v4 | $@ | test.rs:185:20:185:40 | ...::open | ...::open |
+| test.rs:225:14:225:20 | &buffer | test.rs:185:20:185:40 | ...::open | test.rs:225:14:225:20 | &buffer | $@ | test.rs:185:20:185:40 | ...::open | ...::open |
+| test.rs:234:14:234:20 | &buffer | test.rs:231:52:231:55 | open | test.rs:234:14:234:20 | &buffer | $@ | test.rs:231:52:231:55 | open | open |
+| test.rs:267:14:267:20 | &buffer | test.rs:262:20:262:44 | ...::open | test.rs:267:14:267:20 | &buffer | $@ | test.rs:262:20:262:44 | ...::open | ...::open |
+| test.rs:276:14:276:20 | &buffer | test.rs:273:56:273:59 | open | test.rs:276:14:276:20 | &buffer | $@ | test.rs:273:56:273:59 | open | open |
diff --git a/rust/ql/test/library-tests/dataflow/sources/file/InlineFlow.qlref b/rust/ql/test/library-tests/dataflow/sources/file/InlineFlow.qlref
new file mode 100644
index 00000000000..e0f7493db39
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/sources/file/InlineFlow.qlref
@@ -0,0 +1,2 @@
+query: ../env/InlineFlow.ql
+
diff --git a/rust/ql/test/library-tests/dataflow/sources/file/TaintSources.expected b/rust/ql/test/library-tests/dataflow/sources/file/TaintSources.expected
new file mode 100644
index 00000000000..d73106fb1cf
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/sources/file/TaintSources.expected
@@ -0,0 +1,33 @@
+| test.rs:12:31:12:43 | ...::read | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:12:31:12:43 | ...::read | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:17:31:17:38 | ...::read | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:17:31:17:38 | ...::read | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:22:22:22:39 | ...::read_to_string | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:22:22:22:39 | ...::read_to_string | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:29:22:29:25 | path | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:43:27:43:35 | file_name | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:54:22:54:25 | path | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:55:27:55:35 | file_name | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:65:22:65:34 | ...::read_link | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:74:31:74:45 | ...::read | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:79:31:79:45 | ...::read | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:84:22:84:46 | ...::read_to_string | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:90:26:90:29 | path | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:90:26:90:29 | path | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:91:31:91:39 | file_name | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:91:31:91:39 | file_name | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:97:22:97:41 | ...::read_link | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:107:20:107:38 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:140:50:140:53 | open | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:147:67:147:70 | open | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:154:101:154:104 | open | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:164:21:164:39 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:165:21:165:39 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:173:21:173:39 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:185:20:185:40 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:231:52:231:55 | open | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:241:21:241:41 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:242:21:242:41 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:250:21:250:41 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:262:20:262:44 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:273:56:273:59 | open | Flow source 'FileSource' of type file (DEFAULT). |
diff --git a/rust/ql/test/library-tests/dataflow/sources/file/TaintSources.qlref b/rust/ql/test/library-tests/dataflow/sources/file/TaintSources.qlref
new file mode 100644
index 00000000000..7aa95121af3
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/sources/file/TaintSources.qlref
@@ -0,0 +1,2 @@
+query: queries/summary/TaintSources.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/rust/ql/test/library-tests/dataflow/sources/file/options.yml b/rust/ql/test/library-tests/dataflow/sources/file/options.yml
new file mode 100644
index 00000000000..673d322a0a1
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/sources/file/options.yml
@@ -0,0 +1,6 @@
+qltest_cargo_check: true
+qltest_dependencies:
+    - async-std = { version = "1.13.1" }
+    - bytes = { version = "1.10.1" }
+    - futures = { version = "0.3" }
+    - tokio = { version = "1.43.0", features = ["full"] }
diff --git a/rust/ql/test/library-tests/dataflow/sources/file/test.rs b/rust/ql/test/library-tests/dataflow/sources/file/test.rs
new file mode 100644
index 00000000000..35a7d2cc1b8
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/sources/file/test.rs
@@ -0,0 +1,315 @@
+fn sink<T>(_: T) { }
+
+// --- tests ---
+
+use std::fs;
+use std::io::Read;
+use tokio::io::AsyncReadExt;
+use async_std::io::ReadExt;
+
+fn test_fs() -> Result<(), Box<dyn std::error::Error>> {
+    {
+        let buffer: Vec<u8> = std::fs::read("file.bin")?; // $ Alert[rust/summary/taint-sources]
+        sink(buffer); // $ hasTaintFlow="file.bin"
+    }
+
+    {
+        let buffer: Vec<u8> = fs::read("file.bin")?; // $ Alert[rust/summary/taint-sources]
+        sink(buffer); // $ hasTaintFlow="file.bin"
+    }
+
+    {
+        let buffer = fs::read_to_string("file.txt")?; // $ Alert[rust/summary/taint-sources]
+        sink(buffer); // $ hasTaintFlow="file.txt"
+    }
+
+    for entry in fs::read_dir("directory")? {
+        let e = entry?;
+
+        let path = e.path(); // $ Alert[rust/summary/taint-sources]
+        sink(path.clone()); // $ hasTaintFlow
+        sink(path.clone().as_path()); // $ hasTaintFlow
+        sink(path.clone().into_os_string()); // $ MISSING: hasTaintFlow
+        sink(std::path::PathBuf::from(path.clone().into_boxed_path())); // $ MISSING: hasTaintFlow
+        sink(path.clone().as_os_str()); // $ MISSING: hasTaintFlow
+        sink(path.clone().as_mut_os_str()); // $ MISSING: hasTaintFlow
+        sink(path.to_str()); // $ MISSING: hasTaintFlow
+        sink(path.to_path_buf()); // $ MISSING: hasTaintFlow
+        sink(path.file_name().unwrap()); // $ MISSING: hasTaintFlow
+        sink(path.extension().unwrap()); // $ MISSING: hasTaintFlow
+        sink(path.canonicalize().unwrap()); // $ MISSING: hasTaintFlow
+        sink(path); // $ hasTaintFlow
+
+        let file_name = e.file_name(); // $ Alert[rust/summary/taint-sources]
+        sink(file_name.clone()); // $ hasTaintFlow
+        sink(file_name.clone().into_string().unwrap()); // $ MISSING: hasTaintFlow
+        sink(file_name.to_str().unwrap()); // $ MISSING: hasTaintFlow
+        sink(file_name.to_string_lossy().to_mut()); // $ MISSING: hasTaintFlow
+        sink(file_name.clone().as_encoded_bytes()); // $ MISSING: hasTaintFlow
+        sink(file_name); // $ hasTaintFlow
+    }
+    for entry in std::path::Path::new("directory").read_dir()? {
+        let e = entry?;
+
+        let path = e.path(); // $ Alert[rust/summary/taint-sources]
+        let file_name = e.file_name(); // $ Alert[rust/summary/taint-sources]
+    }
+    for entry in std::path::PathBuf::from("directory").read_dir()? {
+        let e = entry?;
+
+        let path = e.path(); // $ MISSING: Alert[rust/summary/taint-sources]
+        let file_name = e.file_name(); // $ MISSING: Alert[rust/summary/taint-sources]
+    }
+
+    {
+        let target = fs::read_link("symlink.txt")?; // $ Alert[rust/summary/taint-sources]
+        sink(target); // $ hasTaintFlow="symlink.txt"
+    }
+
+    Ok(())
+}
+
+async fn test_tokio_fs() -> Result<(), Box<dyn std::error::Error>> {
+    {
+        let buffer: Vec<u8> = tokio::fs::read("file.bin").await?; // $ Alert[rust/summary/taint-sources]
+        sink(buffer); // $ hasTaintFlow="file.bin"
+    }
+
+    {
+        let buffer: Vec<u8> = tokio::fs::read("file.bin").await?; // $ Alert[rust/summary/taint-sources]
+        sink(buffer); // $ hasTaintFlow="file.bin"
+    }
+
+    {
+        let buffer = tokio::fs::read_to_string("file.txt").await?; // $ Alert[rust/summary/taint-sources]
+        sink(buffer); // $ hasTaintFlow="file.txt"
+    }
+
+    let mut read_dir = tokio::fs::read_dir("directory").await?;
+    for entry in read_dir.next_entry().await? {
+        let path = entry.path(); // $ Alert[rust/summary/taint-sources]
+        let file_name = entry.file_name(); // $ Alert[rust/summary/taint-sources]
+        sink(path); // $ hasTaintFlow
+        sink(file_name); // $ hasTaintFlow
+    }
+
+    {
+        let target = tokio::fs::read_link("symlink.txt").await?; // $ Alert[rust/summary/taint-sources]
+        sink(target); // $ hasTaintFlow="symlink.txt"
+    }
+
+    Ok(())
+}
+
+fn test_io_file() -> std::io::Result<()> {
+    // --- file ---
+
+    let mut file = std::fs::File::open("file.txt")?; // $ Alert[rust/summary/taint-sources]
+
+    {
+        let mut buffer = [0u8; 100];
+        let _bytes = file.read(&mut buffer)?;
+        sink(&buffer); // $ hasTaintFlow="file.txt"
+    }
+
+    {
+        let mut buffer = Vec::<u8>::new();
+        let _bytes = file.read_to_end(&mut buffer)?;
+        sink(&buffer); // $ hasTaintFlow="file.txt"
+    }
+
+    {
+        let mut buffer = String::new();
+        let _bytes = file.read_to_string(&mut buffer)?;
+        sink(&buffer); // $ hasTaintFlow="file.txt"
+    }
+
+    {
+        let mut buffer = [0; 100];
+        file.read_exact(&mut buffer)?;
+        sink(&buffer); // $ hasTaintFlow="file.txt"
+    }
+
+    for byte in file.bytes() {
+        sink(byte); // $ hasTaintFlow="file.txt"
+    }
+
+    // --- OpenOptions ---
+
+    {
+        let mut f1 = std::fs::OpenOptions::new().open("f1.txt").unwrap(); // $ Alert[rust/summary/taint-sources]
+        let mut buffer = [0u8; 1024];
+        let _bytes = f1.read(&mut buffer)?;
+        sink(&buffer); // $ hasTaintFlow="f1.txt"
+    }
+
+    {
+        let mut f2 = std::fs::OpenOptions::new().create_new(true).open("f2.txt").unwrap(); // $ Alert[rust/summary/taint-sources]
+        let mut buffer = [0u8; 1024];
+        let _bytes = f2.read(&mut buffer)?;
+        sink(&buffer); // $ hasTaintFlow="f2.txt"
+    }
+
+    {
+        let mut f3 = std::fs::OpenOptions::new().read(true).write(true).truncate(true).create(true).open("f3.txt").unwrap(); // $ Alert[rust/summary/taint-sources]
+        let mut buffer = [0u8; 1024];
+        let _bytes = f3.read(&mut buffer)?;
+        sink(&buffer); // $ hasTaintFlow="f3.txt"
+    }
+
+    // --- misc operations ---
+
+    {
+        let mut buffer = String::new();
+        let file1 = std::fs::File::open("file.txt")?; // $ Alert[rust/summary/taint-sources]
+        let file2 = std::fs::File::open("another_file.txt")?; // $ Alert[rust/summary/taint-sources]
+        let mut reader = file1.chain(file2);
+        reader.read_to_string(&mut buffer)?;
+        sink(&buffer); // $ hasTaintFlow="file.txt" hasTaintFlow="another_file.txt"
+    }
+
+    {
+        let mut buffer = String::new();
+        let file1 = std::fs::File::open("file.txt")?; // $ Alert[rust/summary/taint-sources]
+        let mut reader = file1.take(100);
+        reader.read_to_string(&mut buffer)?;
+        sink(&buffer); // $ hasTaintFlow="file.txt"
+    }
+
+    Ok(())
+}
+
+async fn test_tokio_file() -> std::io::Result<()> {
+    // --- file ---
+
+    let mut file = tokio::fs::File::open("file.txt").await?; // $ Alert[rust/summary/taint-sources]
+
+    {
+        let mut buffer = [0u8; 100];
+        let _bytes = file.read(&mut buffer).await?;
+        sink(&buffer); // $ hasTaintFlow="file.txt"
+    }
+
+    {
+        let mut buffer = Vec::<u8>::new();
+        let _bytes = file.read_to_end(&mut buffer).await?;
+        sink(&buffer); // $ hasTaintFlow="file.txt"
+    }
+
+    {
+        let mut buffer = String::new();
+        let _bytes = file.read_to_string(&mut buffer).await?;
+        sink(&buffer); // $ hasTaintFlow="file.txt"
+    }
+
+    {
+        let mut buffer = [0; 100];
+        file.read_exact(&mut buffer).await?;
+        sink(&buffer); // $ hasTaintFlow="file.txt"
+    }
+
+    {
+        let v1 = file.read_u8().await?;
+        let v2 = file.read_i16().await?;
+        let v3 = file.read_f32().await?;
+        let v4 = file.read_i64_le().await?;
+        sink(v1); // $ hasTaintFlow="file.txt"
+        sink(v2); // $ hasTaintFlow="file.txt"
+        sink(v3); // $ hasTaintFlow="file.txt"
+        sink(v4); // $ hasTaintFlow="file.txt"
+    }
+
+    {
+        let mut buffer = bytes::BytesMut::new();
+        file.read_buf(&mut buffer).await?;
+        sink(&buffer); // $ hasTaintFlow="file.txt"
+    }
+
+    // --- OpenOptions ---
+
+    {
+        let mut f1 = tokio::fs::OpenOptions::new().open("f1.txt").await?; // $ Alert[rust/summary/taint-sources]
+        let mut buffer = [0u8; 1024];
+        let _bytes = f1.read(&mut buffer).await?;
+        sink(&buffer); // $ hasTaintFlow="f1.txt"
+    }
+
+    // --- misc operations ---
+
+    {
+        let mut buffer = String::new();
+        let file1 = tokio::fs::File::open("file.txt").await?; // $ Alert[rust/summary/taint-sources]
+        let file2 = tokio::fs::File::open("another_file.txt").await?; // $ Alert[rust/summary/taint-sources]
+        let mut reader = file1.chain(file2);
+        reader.read_to_string(&mut buffer).await?;
+        sink(&buffer); // $ MISSING: hasTaintFlow="file.txt" hasTaintFlow="another_file.txt"
+    }
+
+    {
+        let mut buffer = String::new();
+        let file1 = tokio::fs::File::open("file.txt").await?; // $ Alert[rust/summary/taint-sources]
+        let mut reader = file1.take(100);
+        reader.read_to_string(&mut buffer).await?;
+        sink(&buffer); // $ MISSING: hasTaintFlow="file.txt"
+    }
+
+    Ok(())
+}
+
+async fn test_async_std_file() -> std::io::Result<()> {
+    // --- file ---
+
+    let mut file = async_std::fs::File::open("file.txt").await?; // $ Alert[rust/summary/taint-sources]
+
+    {
+        let mut buffer = [0u8; 100];
+        let _bytes = file.read(&mut buffer).await?;
+        sink(&buffer); // $ hasTaintFlow="file.txt"
+    }
+
+    // --- OpenOptions ---
+
+    {
+        let mut f1 = async_std::fs::OpenOptions::new().open("f1.txt").await?; // $ Alert[rust/summary/taint-sources]
+        let mut buffer = [0u8; 1024];
+        let _bytes = f1.read(&mut buffer).await?;
+        sink(&buffer); // $ hasTaintFlow="f1.txt"
+    }
+
+    Ok(())
+}
+
+#[tokio::main]
+async fn main() -> Result<(), Box<dyn std::error::Error>> {
+    println!("test_fs...");
+    match test_fs() {
+        Ok(_) => println!("complete"),
+        Err(e) => println!("error: {}", e),
+    }
+
+    println!("test_tokio_fs...");
+    match futures::executor::block_on(test_tokio_fs()) {
+        Ok(_) => println!("complete"),
+        Err(e) => println!("error: {}", e),
+    }
+
+    println!("test_io_file...");
+    match test_io_file() {
+        Ok(_) => println!("complete"),
+        Err(e) => println!("error: {}", e),
+    }
+
+    println!("test_tokio_file...");
+    match futures::executor::block_on(test_tokio_file()) {
+        Ok(_) => println!("complete"),
+        Err(e) => println!("error: {}", e),
+    }
+
+    println!("test_async_std_file...");
+    match futures::executor::block_on(test_async_std_file()) {
+        Ok(_) => println!("complete"),
+        Err(e) => println!("error: {}", e),
+    }
+
+    Ok(())
+}
diff --git a/rust/ql/test/library-tests/dataflow/sources/net/CONSISTENCY/PathResolutionConsistency.expected b/rust/ql/test/library-tests/dataflow/sources/net/CONSISTENCY/PathResolutionConsistency.expected
new file mode 100644
index 00000000000..ca5c386b720
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/sources/net/CONSISTENCY/PathResolutionConsistency.expected
@@ -0,0 +1,9 @@
+multipleCallTargets
+| test.rs:59:62:59:77 | ...::from(...) |
+| test.rs:66:58:66:73 | ...::from(...) |
+| test.rs:389:30:389:67 | pinned.poll_read(...) |
+| test.rs:416:26:416:54 | pinned.poll_fill_buf(...) |
+| test.rs:423:27:423:71 | ... .poll_fill_buf(...) |
+| test.rs:447:30:447:67 | pinned.poll_read(...) |
+| test.rs:470:26:470:54 | pinned.poll_fill_buf(...) |
+| test.rs:519:50:519:66 | ...::from(...) |
diff --git a/rust/ql/test/library-tests/dataflow/sources/net/Cargo.lock b/rust/ql/test/library-tests/dataflow/sources/net/Cargo.lock
new file mode 100644
index 00000000000..27790b8b768
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/sources/net/Cargo.lock
@@ -0,0 +1,2146 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "async-channel"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"
+dependencies = [
+ "concurrent-queue",
+ "event-listener 2.5.3",
+ "futures-core",
+]
+
+[[package]]
+name = "async-channel"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "924ed96dd52d1b75e9c1a3e6275715fd320f5f9439fb5a4a11fa51f4221158d2"
+dependencies = [
+ "concurrent-queue",
+ "event-listener-strategy",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-executor"
+version = "1.13.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "497c00e0fd83a72a79a39fcbd8e3e2f055d6f6c7e025f3b3d91f4f8e76527fb8"
+dependencies = [
+ "async-task",
+ "concurrent-queue",
+ "fastrand",
+ "futures-lite",
+ "pin-project-lite",
+ "slab",
+]
+
+[[package]]
+name = "async-global-executor"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c"
+dependencies = [
+ "async-channel 2.5.0",
+ "async-executor",
+ "async-io",
+ "async-lock",
+ "blocking",
+ "futures-lite",
+ "once_cell",
+]
+
+[[package]]
+name = "async-io"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "456b8a8feb6f42d237746d4b3e9a178494627745c3c56c6ea55d92ba50d026fc"
+dependencies = [
+ "autocfg",
+ "cfg-if",
+ "concurrent-queue",
+ "futures-io",
+ "futures-lite",
+ "parking",
+ "polling",
+ "rustix",
+ "slab",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "async-lock"
+version = "3.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5fd03604047cee9b6ce9de9f70c6cd540a0520c813cbd49bae61f33ab80ed1dc"
+dependencies = [
+ "event-listener 5.4.1",
+ "event-listener-strategy",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-std"
+version = "1.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c8e079a4ab67ae52b7403632e4618815d6db36d2a010cfe41b02c1b1578f93b"
+dependencies = [
+ "async-channel 1.9.0",
+ "async-global-executor",
+ "async-io",
+ "async-lock",
+ "crossbeam-utils",
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-lite",
+ "gloo-timers",
+ "kv-log-macro",
+ "log",
+ "memchr",
+ "once_cell",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+ "wasm-bindgen-futures",
+]
+
+[[package]]
+name = "async-task"
+version = "4.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
+
+[[package]]
+name = "atomic-waker"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+
+[[package]]
+name = "autocfg"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
+
+[[package]]
+name = "aws-lc-rs"
+version = "1.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "879b6c89592deb404ba4dc0ae6b58ffd1795c78991cbb5b8bc441c48a070440d"
+dependencies = [
+ "aws-lc-sys",
+ "zeroize",
+]
+
+[[package]]
+name = "aws-lc-sys"
+version = "0.32.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "107a4e9d9cab9963e04e84bb8dee0e25f2a987f9a8bad5ed054abd439caa8f8c"
+dependencies = [
+ "bindgen",
+ "cc",
+ "cmake",
+ "dunce",
+ "fs_extra",
+]
+
+[[package]]
+name = "base64"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+
+[[package]]
+name = "bindgen"
+version = "0.72.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895"
+dependencies = [
+ "bitflags",
+ "cexpr",
+ "clang-sys",
+ "itertools",
+ "log",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "rustc-hash",
+ "shlex",
+ "syn",
+]
+
+[[package]]
+name = "bitflags"
+version = "2.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
+
+[[package]]
+name = "blocking"
+version = "1.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e83f8d02be6967315521be875afa792a316e28d57b5a2d401897e2a7921b7f21"
+dependencies = [
+ "async-channel 2.5.0",
+ "async-task",
+ "futures-io",
+ "futures-lite",
+ "piper",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
+
+[[package]]
+name = "bytes"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
+
+[[package]]
+name = "cc"
+version = "1.2.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac9fe6cdbb24b6ade63616c0a0688e45bb56732262c158df3c0c4bea4ca47cb7"
+dependencies = [
+ "find-msvc-tools",
+ "jobserver",
+ "libc",
+ "shlex",
+]
+
+[[package]]
+name = "cexpr"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
+dependencies = [
+ "nom",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
+
+[[package]]
+name = "clang-sys"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
+dependencies = [
+ "glob",
+ "libc",
+ "libloading",
+]
+
+[[package]]
+name = "cmake"
+version = "0.1.54"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7caa3f9de89ddbe2c607f4101924c5abec803763ae9534e4f4d7d8f84aa81f0"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "concurrent-queue"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "core-foundation"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
+
+[[package]]
+name = "displaydoc"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "dunce"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
+
+[[package]]
+name = "either"
+version = "1.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
+
+[[package]]
+name = "encoding_rs"
+version = "0.8.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
+
+[[package]]
+name = "errno"
+version = "0.3.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
+dependencies = [
+ "libc",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "event-listener"
+version = "2.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
+
+[[package]]
+name = "event-listener"
+version = "5.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab"
+dependencies = [
+ "concurrent-queue",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "event-listener-strategy"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93"
+dependencies = [
+ "event-listener 5.4.1",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "fastrand"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
+
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127"
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "foreign-types"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
+dependencies = [
+ "foreign-types-shared",
+]
+
+[[package]]
+name = "foreign-types-shared"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
+
+[[package]]
+name = "form_urlencoded"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf"
+dependencies = [
+ "percent-encoding",
+]
+
+[[package]]
+name = "fs_extra"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
+
+[[package]]
+name = "futures"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
+
+[[package]]
+name = "futures-executor"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-io"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
+
+[[package]]
+name = "futures-lite"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f78e10609fe0e0b3f4157ffab1876319b5b0db102a2c60dc4626306dc46b44ad"
+dependencies = [
+ "fastrand",
+ "futures-core",
+ "futures-io",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "futures-macro"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "futures-rustls"
+version = "0.26.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f2f12607f92c69b12ed746fabf9ca4f5c482cba46679c1a75b874ed7c26adb"
+dependencies = [
+ "futures-io",
+ "rustls",
+ "rustls-pki-types",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
+
+[[package]]
+name = "futures-task"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
+
+[[package]]
+name = "futures-util"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-macro",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "r-efi",
+ "wasip2",
+]
+
+[[package]]
+name = "glob"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"
+
+[[package]]
+name = "gloo-timers"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "h2"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3c0b69cfcb4e1b9f1bf2f53f95f766e4661169728ec61cd3fe5a0166f2d1386"
+dependencies = [
+ "atomic-waker",
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "http",
+ "indexmap",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d"
+
+[[package]]
+name = "hermit-abi"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c"
+
+[[package]]
+name = "http"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
+[[package]]
+name = "http-body"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
+dependencies = [
+ "bytes",
+ "http",
+]
+
+[[package]]
+name = "http-body-util"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "http",
+ "http-body",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "httparse"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
+
+[[package]]
+name = "httpdate"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
+
+[[package]]
+name = "hyper"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb3aa54a13a0dfe7fbe3a59e0c76093041720fdc77b110cc0fc260fafb4dc51e"
+dependencies = [
+ "atomic-waker",
+ "bytes",
+ "futures-channel",
+ "futures-core",
+ "h2",
+ "http",
+ "http-body",
+ "httparse",
+ "httpdate",
+ "itoa",
+ "pin-project-lite",
+ "pin-utils",
+ "smallvec",
+ "tokio",
+ "want",
+]
+
+[[package]]
+name = "hyper-rustls"
+version = "0.27.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58"
+dependencies = [
+ "http",
+ "hyper",
+ "hyper-util",
+ "rustls",
+ "rustls-pki-types",
+ "tokio",
+ "tokio-rustls",
+ "tower-service",
+]
+
+[[package]]
+name = "hyper-tls"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
+dependencies = [
+ "bytes",
+ "http-body-util",
+ "hyper",
+ "hyper-util",
+ "native-tls",
+ "tokio",
+ "tokio-native-tls",
+ "tower-service",
+]
+
+[[package]]
+name = "hyper-util"
+version = "0.1.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c6995591a8f1380fcb4ba966a252a4b29188d51d2b89e3a252f5305be65aea8"
+dependencies = [
+ "base64",
+ "bytes",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "http",
+ "http-body",
+ "hyper",
+ "ipnet",
+ "libc",
+ "percent-encoding",
+ "pin-project-lite",
+ "socket2",
+ "system-configuration",
+ "tokio",
+ "tower-service",
+ "tracing",
+ "windows-registry",
+]
+
+[[package]]
+name = "icu_collections"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47"
+dependencies = [
+ "displaydoc",
+ "potential_utf",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locale_core"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3"
+
+[[package]]
+name = "icu_properties"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locale_core",
+ "icu_properties_data",
+ "icu_provider",
+ "potential_utf",
+ "zerotrie",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632"
+
+[[package]]
+name = "icu_provider"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af"
+dependencies = [
+ "displaydoc",
+ "icu_locale_core",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerotrie",
+ "zerovec",
+]
+
+[[package]]
+name = "idna"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6717a8d2a5a929a1a2eb43a12812498ed141a0bcfb7e8f7844fbdbe4303bba9f"
+dependencies = [
+ "equivalent",
+ "hashbrown",
+]
+
+[[package]]
+name = "ipnet"
+version = "2.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
+
+[[package]]
+name = "iri-string"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbc5ebe9c3a1a7a5127f920a418f7585e9e758e911d0466ed004f393b0e380b2"
+dependencies = [
+ "memchr",
+ "serde",
+]
+
+[[package]]
+name = "itertools"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
+
+[[package]]
+name = "jobserver"
+version = "0.1.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"
+dependencies = [
+ "getrandom 0.3.4",
+ "libc",
+]
+
+[[package]]
+name = "js-sys"
+version = "0.3.81"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec48937a97411dcb524a265206ccd4c90bb711fca92b2792c407f268825b9305"
+dependencies = [
+ "once_cell",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "kv-log-macro"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f"
+dependencies = [
+ "log",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.177"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
+
+[[package]]
+name = "libloading"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55"
+dependencies = [
+ "cfg-if",
+ "windows-link 0.2.1",
+]
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039"
+
+[[package]]
+name = "litemap"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
+
+[[package]]
+name = "lock_api"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
+dependencies = [
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
+dependencies = [
+ "value-bag",
+]
+
+[[package]]
+name = "memchr"
+version = "2.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
+
+[[package]]
+name = "mime"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
+
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
+name = "mio"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69d83b0086dc8ecf3ce9ae2874b2d1290252e2a30720bea58a5c6639b0092873"
+dependencies = [
+ "libc",
+ "wasi",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "native-tls"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e"
+dependencies = [
+ "libc",
+ "log",
+ "openssl",
+ "openssl-probe",
+ "openssl-sys",
+ "schannel",
+ "security-framework",
+ "security-framework-sys",
+ "tempfile",
+]
+
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+
+[[package]]
+name = "openssl"
+version = "0.10.74"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24ad14dd45412269e1a30f52ad8f0664f0f4f4a89ee8fe28c3b3527021ebb654"
+dependencies = [
+ "bitflags",
+ "cfg-if",
+ "foreign-types",
+ "libc",
+ "once_cell",
+ "openssl-macros",
+ "openssl-sys",
+]
+
+[[package]]
+name = "openssl-macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "openssl-probe"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
+
+[[package]]
+name = "openssl-sys"
+version = "0.9.110"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a9f0075ba3c21b09f8e8b2026584b1d18d49388648f2fbbf3c97ea8deced8e2"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+ "vcpkg",
+]
+
+[[package]]
+name = "parking"
+version = "2.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
+
+[[package]]
+name = "parking_lot"
+version = "0.12.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a"
+dependencies = [
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "windows-link 0.2.1",
+]
+
+[[package]]
+name = "percent-encoding"
+version = "2.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "piper"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066"
+dependencies = [
+ "atomic-waker",
+ "fastrand",
+ "futures-io",
+]
+
+[[package]]
+name = "pkg-config"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
+
+[[package]]
+name = "polling"
+version = "3.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d0e4f59085d47d8241c88ead0f274e8a0cb551f3625263c05eb8dd897c34218"
+dependencies = [
+ "cfg-if",
+ "concurrent-queue",
+ "hermit-abi",
+ "pin-project-lite",
+ "rustix",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "potential_utf"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84df19adbe5b5a0782edcab45899906947ab039ccf4573713735ee7de1e6b08a"
+dependencies = [
+ "zerovec",
+]
+
+[[package]]
+name = "prettyplease"
+version = "0.2.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
+dependencies = [
+ "proc-macro2",
+ "syn",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.101"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "r-efi"
+version = "5.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
+dependencies = [
+ "bitflags",
+]
+
+[[package]]
+name = "regex"
+version = "1.12.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
+
+[[package]]
+name = "reqwest"
+version = "0.12.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d0946410b9f7b082a427e4ef5c8ff541a88b357bc6c637c40db3a68ac70a36f"
+dependencies = [
+ "base64",
+ "bytes",
+ "encoding_rs",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "http-body-util",
+ "hyper",
+ "hyper-rustls",
+ "hyper-tls",
+ "hyper-util",
+ "js-sys",
+ "log",
+ "mime",
+ "native-tls",
+ "percent-encoding",
+ "pin-project-lite",
+ "rustls-pki-types",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "sync_wrapper",
+ "tokio",
+ "tokio-native-tls",
+ "tower",
+ "tower-http",
+ "tower-service",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
+[[package]]
+name = "ring"
+version = "0.17.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
+dependencies = [
+ "cc",
+ "cfg-if",
+ "getrandom 0.2.16",
+ "libc",
+ "untrusted",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "rustc-hash"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
+
+[[package]]
+name = "rustix"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e"
+dependencies = [
+ "bitflags",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "rustls"
+version = "0.23.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "751e04a496ca00bb97a5e043158d23d66b5aabf2e1d5aa2a0aaebb1aafe6f82c"
+dependencies = [
+ "aws-lc-rs",
+ "log",
+ "once_cell",
+ "rustls-pki-types",
+ "rustls-webpki",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "rustls-pki-types"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79"
+dependencies = [
+ "zeroize",
+]
+
+[[package]]
+name = "rustls-webpki"
+version = "0.103.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e10b3f4191e8a80e6b43eebabfac91e5dcecebb27a71f04e820c47ec41d314bf"
+dependencies = [
+ "aws-lc-rs",
+ "ring",
+ "rustls-pki-types",
+ "untrusted",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
+
+[[package]]
+name = "ryu"
+version = "1.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
+
+[[package]]
+name = "schannel"
+version = "0.1.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "891d81b926048e76efe18581bf793546b4c0eaf8448d72be8de2bbee5fd166e1"
+dependencies = [
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "security-framework"
+version = "2.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
+dependencies = [
+ "bitflags",
+ "core-foundation",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "2.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc1f0cbffaac4852523ce30d8bd3c5cdc873501d96ff467ca09b6767bb8cd5c0"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "serde"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+dependencies = [
+ "serde_core",
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.145"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
+dependencies = [
+ "itoa",
+ "memchr",
+ "ryu",
+ "serde",
+ "serde_core",
+]
+
+[[package]]
+name = "serde_urlencoded"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
+dependencies = [
+ "form_urlencoded",
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2a4719bff48cee6b39d12c020eeb490953ad2443b7055bd0b21fca26bd8c28b"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "slab"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
+
+[[package]]
+name = "smallvec"
+version = "1.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
+
+[[package]]
+name = "socket2"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881"
+dependencies = [
+ "libc",
+ "windows-sys 0.60.2",
+]
+
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
+
+[[package]]
+name = "subtle"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
+
+[[package]]
+name = "syn"
+version = "2.0.107"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a26dbd934e5451d21ef060c018dae56fc073894c5a7896f882928a76e6d081b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "sync_wrapper"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
+dependencies = [
+ "futures-core",
+]
+
+[[package]]
+name = "synstructure"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "system-configuration"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
+dependencies = [
+ "bitflags",
+ "core-foundation",
+ "system-configuration-sys",
+]
+
+[[package]]
+name = "system-configuration-sys"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "tempfile"
+version = "3.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16"
+dependencies = [
+ "fastrand",
+ "getrandom 0.3.4",
+ "once_cell",
+ "rustix",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "test"
+version = "0.0.1"
+dependencies = [
+ "async-std",
+ "futures",
+ "futures-rustls",
+ "http",
+ "http-body-util",
+ "hyper",
+ "hyper-util",
+ "reqwest",
+ "rustls",
+ "tokio",
+]
+
+[[package]]
+name = "tinystr"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
+[[package]]
+name = "tokio"
+version = "1.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408"
+dependencies = [
+ "bytes",
+ "libc",
+ "mio",
+ "parking_lot",
+ "pin-project-lite",
+ "signal-hook-registry",
+ "socket2",
+ "tokio-macros",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "tokio-native-tls"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
+dependencies = [
+ "native-tls",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-rustls"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61"
+dependencies = [
+ "rustls",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-util"
+version = "0.7.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14307c986784f72ef81c89db7d9e28d6ac26d16213b109ea501696195e6e3ce5"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "futures-sink",
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
+name = "tower"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
+dependencies = [
+ "futures-core",
+ "futures-util",
+ "pin-project-lite",
+ "sync_wrapper",
+ "tokio",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "tower-http"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2"
+dependencies = [
+ "bitflags",
+ "bytes",
+ "futures-util",
+ "http",
+ "http-body",
+ "iri-string",
+ "pin-project-lite",
+ "tower",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "tower-layer"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
+
+[[package]]
+name = "tower-service"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
+
+[[package]]
+name = "tracing"
+version = "0.1.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
+dependencies = [
+ "pin-project-lite",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678"
+dependencies = [
+ "once_cell",
+]
+
+[[package]]
+name = "try-lock"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "462eeb75aeb73aea900253ce739c8e18a67423fadf006037cd3ff27e82748a06"
+
+[[package]]
+name = "untrusted"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+
+[[package]]
+name = "url"
+version = "2.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b"
+dependencies = [
+ "form_urlencoded",
+ "idna",
+ "percent-encoding",
+ "serde",
+]
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
+[[package]]
+name = "value-bag"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "943ce29a8a743eb10d6082545d861b24f9d1b160b7d741e0f2cdf726bec909c5"
+
+[[package]]
+name = "vcpkg"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+
+[[package]]
+name = "want"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
+dependencies = [
+ "try-lock",
+]
+
+[[package]]
+name = "wasi"
+version = "0.11.1+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
+
+[[package]]
+name = "wasip2"
+version = "1.0.1+wasi-0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
+dependencies = [
+ "wit-bindgen",
+]
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1da10c01ae9f1ae40cbfac0bac3b1e724b320abfcf52229f80b547c0d250e2d"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "rustversion",
+ "wasm-bindgen-macro",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "671c9a5a66f49d8a47345ab942e2cb93c7d1d0339065d4f8139c486121b43b19"
+dependencies = [
+ "bumpalo",
+ "log",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-futures"
+version = "0.4.54"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e038d41e478cc73bae0ff9b36c60cff1c98b8f38f8d7e8061e79ee63608ac5c"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "once_cell",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ca60477e4c59f5f2986c50191cd972e3a50d8a95603bc9434501cf156a9a119"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f07d2f20d4da7b26400c9f4a0511e6e0345b040694e8a75bd41d578fa4421d7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bad67dc8b2a1a6e5448428adec4c3e84c43e561d8c9ee8a9e5aabeb193ec41d1"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "web-sys"
+version = "0.3.81"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9367c417a924a74cae129e6a2ae3b47fabb1f8995595ab474029da749a8be120"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "windows-link"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
+
+[[package]]
+name = "windows-link"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
+
+[[package]]
+name = "windows-registry"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b8a9ed28765efc97bbc954883f4e6796c33a06546ebafacbabee9696967499e"
+dependencies = [
+ "windows-link 0.1.3",
+ "windows-result",
+ "windows-strings",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
+dependencies = [
+ "windows-link 0.1.3",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
+dependencies = [
+ "windows-link 0.1.3",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
+dependencies = [
+ "windows-targets 0.53.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.61.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
+dependencies = [
+ "windows-link 0.2.1",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
+ "windows_i686_gnullvm 0.52.6",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.53.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
+dependencies = [
+ "windows-link 0.2.1",
+ "windows_aarch64_gnullvm 0.53.1",
+ "windows_aarch64_msvc 0.53.1",
+ "windows_i686_gnu 0.53.1",
+ "windows_i686_gnullvm 0.53.1",
+ "windows_i686_msvc 0.53.1",
+ "windows_x86_64_gnu 0.53.1",
+ "windows_x86_64_gnullvm 0.53.1",
+ "windows_x86_64_msvc 0.53.1",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
+
+[[package]]
+name = "wit-bindgen"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
+
+[[package]]
+name = "writeable"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb"
+
+[[package]]
+name = "yoke"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
+[[package]]
+name = "zeroize"
+version = "1.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
+
+[[package]]
+name = "zerotrie"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7aa2bd55086f1ab526693ecbe444205da57e25f4489879da80635a46d90e73b"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
diff --git a/rust/ql/test/library-tests/dataflow/sources/net/InlineFlow.expected b/rust/ql/test/library-tests/dataflow/sources/net/InlineFlow.expected
new file mode 100644
index 00000000000..d29b19fe58a
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/sources/net/InlineFlow.expected
@@ -0,0 +1,622 @@
+models
+| 1 | Source: <async_std::net::tcp::stream::TcpStream>::connect; ReturnValue.Future.Field[core::result::Result::Ok(0)]; remote |
+| 2 | Source: <hyper::client::conn::http1::SendRequest>::send_request; ReturnValue.Future.Field[core::result::Result::Ok(0)]; remote |
+| 3 | Source: <std::net::tcp::TcpStream>::connect; ReturnValue.Field[core::result::Result::Ok(0)]; remote |
+| 4 | Source: <std::net::tcp::TcpStream>::connect_timeout; ReturnValue.Field[core::result::Result::Ok(0)]; remote |
+| 5 | Source: <tokio::net::tcp::stream::TcpStream>::connect; ReturnValue.Future.Field[core::result::Result::Ok(0)]; remote |
+| 6 | Source: reqwest::blocking::get; ReturnValue.Field[core::result::Result::Ok(0)]; remote |
+| 7 | Source: reqwest::get; ReturnValue.Future.Field[core::result::Result::Ok(0)]; remote |
+| 8 | Summary: <_ as futures_io::if_std::AsyncBufRead>::poll_fill_buf; Argument[self].Reference; ReturnValue.Field[core::task::poll::Poll::Ready(0)].Field[core::result::Result::Ok(0)]; taint |
+| 9 | Summary: <_ as futures_io::if_std::AsyncRead>::poll_read; Argument[self].Reference; Argument[1].Reference; taint |
+| 10 | Summary: <_ as futures_util::io::AsyncBufReadExt>::fill_buf; Argument[self]; ReturnValue.Future.Field[core::result::Result::Ok(0)]; taint |
+| 11 | Summary: <_ as futures_util::io::AsyncBufReadExt>::read_line; Argument[self].Reference; Argument[0].Reference; taint |
+| 12 | Summary: <_ as futures_util::io::AsyncBufReadExt>::read_line; Argument[self]; Argument[0].Reference; taint |
+| 13 | Summary: <_ as futures_util::io::AsyncBufReadExt>::read_until; Argument[self].Reference; Argument[1].Reference; taint |
+| 14 | Summary: <_ as futures_util::io::AsyncBufReadExt>::read_until; Argument[self]; Argument[1].Reference; taint |
+| 15 | Summary: <_ as futures_util::io::AsyncReadExt>::read; Argument[self].Reference; Argument[0].Reference; taint |
+| 16 | Summary: <_ as futures_util::io::AsyncReadExt>::read; Argument[self]; Argument[0].Reference; taint |
+| 17 | Summary: <_ as futures_util::io::AsyncReadExt>::read_to_end; Argument[self].Reference; Argument[0].Reference; taint |
+| 18 | Summary: <_ as futures_util::io::AsyncReadExt>::read_to_end; Argument[self]; Argument[0].Reference; taint |
+| 19 | Summary: <_ as std::io::BufRead>::read_line; Argument[self]; Argument[0].Reference; taint |
+| 20 | Summary: <_ as std::io::Read>::read; Argument[self]; Argument[0].Reference; taint |
+| 21 | Summary: <_ as std::io::Read>::take; Argument[self]; ReturnValue; taint |
+| 22 | Summary: <_ as tokio::io::util::async_read_ext::AsyncReadExt>::read; Argument[self]; Argument[0].Reference; taint |
+| 23 | Summary: <core::option::Option>::unwrap; Argument[self].Field[core::option::Option::Some(0)]; ReturnValue; value |
+| 24 | Summary: <core::pin::Pin>::new; Argument[0].Reference; ReturnValue; value |
+| 25 | Summary: <core::pin::Pin>::new; Argument[0]; ReturnValue; value |
+| 26 | Summary: <core::result::Result>::unwrap; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
+| 27 | Summary: <futures_rustls::TlsConnector>::connect; Argument[1]; ReturnValue.Future.Field[core::result::Result::Ok(0)]; taint |
+| 28 | Summary: <futures_util::io::buf_reader::BufReader>::new; Argument[0]; ReturnValue; taint |
+| 29 | Summary: <reqwest::async_impl::response::Response>::bytes; Argument[self]; ReturnValue.Future.Field[core::result::Result::Ok(0)]; taint |
+| 30 | Summary: <reqwest::async_impl::response::Response>::chunk; Argument[self]; ReturnValue.Future.Field[core::result::Result::Ok(0)].Field[core::option::Option::Some(0)]; taint |
+| 31 | Summary: <reqwest::async_impl::response::Response>::text; Argument[self]; ReturnValue.Future.Field[core::result::Result::Ok(0)]; taint |
+| 32 | Summary: <reqwest::blocking::response::Response>::bytes; Argument[self]; ReturnValue.Field[core::result::Result::Ok(0)]; taint |
+| 33 | Summary: <reqwest::blocking::response::Response>::text; Argument[self]; ReturnValue.Field[core::result::Result::Ok(0)]; taint |
+| 34 | Summary: <reqwest::blocking::response::Response>::text_with_charset; Argument[self]; ReturnValue.Field[core::result::Result::Ok(0)]; taint |
+| 35 | Summary: <std::io::buffered::bufreader::BufReader>::new; Argument[0]; ReturnValue; taint |
+| 36 | Summary: <tokio::net::tcp::stream::TcpStream>::peek; Argument[self]; Argument[0].Reference; taint |
+| 37 | Summary: <tokio::net::tcp::stream::TcpStream>::try_read; Argument[self]; Argument[0].Reference; taint |
+| 38 | Summary: <tokio::net::tcp::stream::TcpStream>::try_read_buf; Argument[self]; Argument[0].Reference; taint |
+edges
+| test.rs:11:9:11:22 | remote_string1 | test.rs:12:10:12:23 | remote_string1 | provenance |  |
+| test.rs:11:26:11:47 | ...::get | test.rs:11:26:11:62 | ...::get(...) [Ok] | provenance | Src:MaD:6  |
+| test.rs:11:26:11:62 | ...::get(...) [Ok] | test.rs:11:26:11:63 | TryExpr | provenance |  |
+| test.rs:11:26:11:63 | TryExpr | test.rs:11:26:11:70 | ... .text() [Ok] | provenance | MaD:33 |
+| test.rs:11:26:11:70 | ... .text() [Ok] | test.rs:11:26:11:71 | TryExpr | provenance |  |
+| test.rs:11:26:11:71 | TryExpr | test.rs:11:9:11:22 | remote_string1 | provenance |  |
+| test.rs:14:9:14:22 | remote_string2 | test.rs:15:10:15:23 | remote_string2 | provenance |  |
+| test.rs:14:26:14:47 | ...::get | test.rs:14:26:14:62 | ...::get(...) [Ok] | provenance | Src:MaD:6  |
+| test.rs:14:26:14:62 | ...::get(...) [Ok] | test.rs:14:26:14:71 | ... .unwrap() | provenance | MaD:26 |
+| test.rs:14:26:14:71 | ... .unwrap() | test.rs:14:26:14:78 | ... .text() [Ok] | provenance | MaD:33 |
+| test.rs:14:26:14:78 | ... .text() [Ok] | test.rs:14:26:14:87 | ... .unwrap() | provenance | MaD:26 |
+| test.rs:14:26:14:87 | ... .unwrap() | test.rs:14:9:14:22 | remote_string2 | provenance |  |
+| test.rs:17:9:17:22 | remote_string3 | test.rs:18:10:18:23 | remote_string3 | provenance |  |
+| test.rs:17:26:17:47 | ...::get | test.rs:17:26:17:62 | ...::get(...) [Ok] | provenance | Src:MaD:6  |
+| test.rs:17:26:17:62 | ...::get(...) [Ok] | test.rs:17:26:17:71 | ... .unwrap() | provenance | MaD:26 |
+| test.rs:17:26:17:71 | ... .unwrap() | test.rs:17:26:17:98 | ... .text_with_charset(...) [Ok] | provenance | MaD:34 |
+| test.rs:17:26:17:98 | ... .text_with_charset(...) [Ok] | test.rs:17:26:17:107 | ... .unwrap() | provenance | MaD:26 |
+| test.rs:17:26:17:107 | ... .unwrap() | test.rs:17:9:17:22 | remote_string3 | provenance |  |
+| test.rs:20:9:20:22 | remote_string4 | test.rs:21:10:21:23 | remote_string4 | provenance |  |
+| test.rs:20:26:20:47 | ...::get | test.rs:20:26:20:62 | ...::get(...) [Ok] | provenance | Src:MaD:6  |
+| test.rs:20:26:20:62 | ...::get(...) [Ok] | test.rs:20:26:20:71 | ... .unwrap() | provenance | MaD:26 |
+| test.rs:20:26:20:71 | ... .unwrap() | test.rs:20:26:20:79 | ... .bytes() [Ok] | provenance | MaD:32 |
+| test.rs:20:26:20:79 | ... .bytes() [Ok] | test.rs:20:26:20:88 | ... .unwrap() | provenance | MaD:26 |
+| test.rs:20:26:20:88 | ... .unwrap() | test.rs:20:9:20:22 | remote_string4 | provenance |  |
+| test.rs:23:9:23:22 | remote_string5 | test.rs:24:10:24:23 | remote_string5 | provenance |  |
+| test.rs:23:26:23:37 | ...::get | test.rs:23:26:23:52 | ...::get(...) [future, Ok] | provenance | Src:MaD:7  |
+| test.rs:23:26:23:52 | ...::get(...) [future, Ok] | test.rs:23:26:23:58 | await ... [Ok] | provenance |  |
+| test.rs:23:26:23:58 | await ... [Ok] | test.rs:23:26:23:59 | TryExpr | provenance |  |
+| test.rs:23:26:23:59 | TryExpr | test.rs:23:26:23:66 | ... .text() [future, Ok] | provenance | MaD:31 |
+| test.rs:23:26:23:66 | ... .text() [future, Ok] | test.rs:23:26:23:72 | await ... [Ok] | provenance |  |
+| test.rs:23:26:23:72 | await ... [Ok] | test.rs:23:26:23:73 | TryExpr | provenance |  |
+| test.rs:23:26:23:73 | TryExpr | test.rs:23:9:23:22 | remote_string5 | provenance |  |
+| test.rs:26:9:26:22 | remote_string6 | test.rs:27:10:27:23 | remote_string6 | provenance |  |
+| test.rs:26:26:26:37 | ...::get | test.rs:26:26:26:52 | ...::get(...) [future, Ok] | provenance | Src:MaD:7  |
+| test.rs:26:26:26:52 | ...::get(...) [future, Ok] | test.rs:26:26:26:58 | await ... [Ok] | provenance |  |
+| test.rs:26:26:26:58 | await ... [Ok] | test.rs:26:26:26:59 | TryExpr | provenance |  |
+| test.rs:26:26:26:59 | TryExpr | test.rs:26:26:26:67 | ... .bytes() [future, Ok] | provenance | MaD:29 |
+| test.rs:26:26:26:67 | ... .bytes() [future, Ok] | test.rs:26:26:26:73 | await ... [Ok] | provenance |  |
+| test.rs:26:26:26:73 | await ... [Ok] | test.rs:26:26:26:74 | TryExpr | provenance |  |
+| test.rs:26:26:26:74 | TryExpr | test.rs:26:9:26:22 | remote_string6 | provenance |  |
+| test.rs:29:9:29:20 | mut request1 | test.rs:30:10:30:25 | request1.chunk() [future, Ok, Some] | provenance | MaD:30 |
+| test.rs:29:9:29:20 | mut request1 | test.rs:31:29:31:44 | request1.chunk() [future, Ok, Some] | provenance | MaD:30 |
+| test.rs:29:24:29:35 | ...::get | test.rs:29:24:29:50 | ...::get(...) [future, Ok] | provenance | Src:MaD:7  |
+| test.rs:29:24:29:50 | ...::get(...) [future, Ok] | test.rs:29:24:29:56 | await ... [Ok] | provenance |  |
+| test.rs:29:24:29:56 | await ... [Ok] | test.rs:29:24:29:57 | TryExpr | provenance |  |
+| test.rs:29:24:29:57 | TryExpr | test.rs:29:9:29:20 | mut request1 | provenance |  |
+| test.rs:30:10:30:25 | request1.chunk() [future, Ok, Some] | test.rs:30:10:30:31 | await ... [Ok, Some] | provenance |  |
+| test.rs:30:10:30:31 | await ... [Ok, Some] | test.rs:30:10:30:32 | TryExpr [Some] | provenance |  |
+| test.rs:30:10:30:32 | TryExpr [Some] | test.rs:30:10:30:41 | ... .unwrap() | provenance | MaD:23 |
+| test.rs:31:15:31:25 | Some(...) [Some] | test.rs:31:20:31:24 | chunk | provenance |  |
+| test.rs:31:20:31:24 | chunk | test.rs:32:14:32:18 | chunk | provenance |  |
+| test.rs:31:29:31:44 | request1.chunk() [future, Ok, Some] | test.rs:31:29:31:50 | await ... [Ok, Some] | provenance |  |
+| test.rs:31:29:31:50 | await ... [Ok, Some] | test.rs:31:29:31:51 | TryExpr [Some] | provenance |  |
+| test.rs:31:29:31:51 | TryExpr [Some] | test.rs:31:15:31:25 | Some(...) [Some] | provenance |  |
+| test.rs:60:13:60:20 | response | test.rs:61:15:61:22 | response | provenance |  |
+| test.rs:60:13:60:20 | response | test.rs:62:14:62:21 | response | provenance |  |
+| test.rs:60:24:60:51 | sender.send_request(...) [future, Ok] | test.rs:60:24:60:57 | await ... [Ok] | provenance |  |
+| test.rs:60:24:60:57 | await ... [Ok] | test.rs:60:24:60:58 | TryExpr | provenance |  |
+| test.rs:60:24:60:58 | TryExpr | test.rs:60:13:60:20 | response | provenance |  |
+| test.rs:60:31:60:42 | send_request | test.rs:60:24:60:51 | sender.send_request(...) [future, Ok] | provenance | Src:MaD:2  |
+| test.rs:61:15:61:22 | response | test.rs:61:14:61:22 | &response | provenance |  |
+| test.rs:67:9:67:20 | mut response | test.rs:68:11:68:18 | response | provenance |  |
+| test.rs:67:24:67:51 | sender.send_request(...) [future, Ok] | test.rs:67:24:67:57 | await ... [Ok] | provenance |  |
+| test.rs:67:24:67:57 | await ... [Ok] | test.rs:67:24:67:58 | TryExpr | provenance |  |
+| test.rs:67:24:67:58 | TryExpr | test.rs:67:9:67:20 | mut response | provenance |  |
+| test.rs:67:31:67:42 | send_request | test.rs:67:24:67:51 | sender.send_request(...) [future, Ok] | provenance | Src:MaD:2  |
+| test.rs:68:11:68:18 | response | test.rs:68:10:68:18 | &response | provenance |  |
+| test.rs:155:13:155:22 | mut stream | test.rs:162:29:162:39 | [post] &mut buffer [&ref] | provenance | MaD:20 |
+| test.rs:155:26:155:53 | ...::connect | test.rs:155:26:155:62 | ...::connect(...) [Ok] | provenance | Src:MaD:3  |
+| test.rs:155:26:155:62 | ...::connect(...) [Ok] | test.rs:155:26:155:63 | TryExpr | provenance |  |
+| test.rs:155:26:155:63 | TryExpr | test.rs:155:13:155:22 | mut stream | provenance |  |
+| test.rs:162:29:162:39 | [post] &mut buffer [&ref] | test.rs:162:34:162:39 | [post] buffer | provenance |  |
+| test.rs:162:34:162:39 | [post] buffer | test.rs:165:15:165:20 | buffer | provenance |  |
+| test.rs:162:34:162:39 | [post] buffer | test.rs:166:14:166:22 | buffer[0] | provenance |  |
+| test.rs:165:15:165:20 | buffer | test.rs:165:14:165:20 | &buffer | provenance |  |
+| test.rs:174:13:174:22 | mut stream | test.rs:182:58:182:63 | stream | provenance |  |
+| test.rs:174:26:174:61 | ...::connect_timeout | test.rs:174:26:174:105 | ...::connect_timeout(...) [Ok] | provenance | Src:MaD:4  |
+| test.rs:174:26:174:105 | ...::connect_timeout(...) [Ok] | test.rs:174:26:174:106 | TryExpr | provenance |  |
+| test.rs:174:26:174:106 | TryExpr | test.rs:174:13:174:22 | mut stream | provenance |  |
+| test.rs:182:21:182:30 | mut reader | test.rs:185:44:185:52 | [post] &mut line [&ref] | provenance | MaD:19 |
+| test.rs:182:34:182:64 | ...::new(...) | test.rs:182:34:182:74 | ... .take(...) | provenance | MaD:21 |
+| test.rs:182:34:182:74 | ... .take(...) | test.rs:182:21:182:30 | mut reader | provenance |  |
+| test.rs:182:58:182:63 | stream | test.rs:182:34:182:64 | ...::new(...) | provenance | MaD:35 |
+| test.rs:185:44:185:52 | [post] &mut line [&ref] | test.rs:185:49:185:52 | [post] line | provenance |  |
+| test.rs:185:49:185:52 | [post] line | test.rs:192:35:192:38 | line | provenance |  |
+| test.rs:192:35:192:38 | line | test.rs:192:34:192:38 | &line | provenance |  |
+| test.rs:224:9:224:24 | mut tokio_stream | test.rs:232:35:232:46 | [post] &mut buffer1 [&ref] | provenance | MaD:36 |
+| test.rs:224:9:224:24 | mut tokio_stream | test.rs:236:36:236:47 | [post] &mut buffer2 [&ref] | provenance | MaD:22 |
+| test.rs:224:9:224:24 | mut tokio_stream | test.rs:252:41:252:51 | [post] &mut buffer [&ref] | provenance | MaD:37 |
+| test.rs:224:9:224:24 | mut tokio_stream | test.rs:275:45:275:55 | [post] &mut buffer [&ref] | provenance | MaD:38 |
+| test.rs:224:28:224:57 | ...::connect | test.rs:224:28:224:66 | ...::connect(...) [future, Ok] | provenance | Src:MaD:5  |
+| test.rs:224:28:224:66 | ...::connect(...) [future, Ok] | test.rs:224:28:224:72 | await ... [Ok] | provenance |  |
+| test.rs:224:28:224:72 | await ... [Ok] | test.rs:224:28:224:73 | TryExpr | provenance |  |
+| test.rs:224:28:224:73 | TryExpr | test.rs:224:9:224:24 | mut tokio_stream | provenance |  |
+| test.rs:232:35:232:46 | [post] &mut buffer1 [&ref] | test.rs:232:40:232:46 | [post] buffer1 | provenance |  |
+| test.rs:232:40:232:46 | [post] buffer1 | test.rs:239:15:239:21 | buffer1 | provenance |  |
+| test.rs:232:40:232:46 | [post] buffer1 | test.rs:240:14:240:23 | buffer1[0] | provenance |  |
+| test.rs:236:36:236:47 | [post] &mut buffer2 [&ref] | test.rs:236:41:236:47 | [post] buffer2 | provenance |  |
+| test.rs:236:41:236:47 | [post] buffer2 | test.rs:243:15:243:21 | buffer2 | provenance |  |
+| test.rs:236:41:236:47 | [post] buffer2 | test.rs:244:14:244:23 | buffer2[0] | provenance |  |
+| test.rs:239:15:239:21 | buffer1 | test.rs:239:14:239:21 | &buffer1 | provenance |  |
+| test.rs:243:15:243:21 | buffer2 | test.rs:243:14:243:21 | &buffer2 | provenance |  |
+| test.rs:252:41:252:51 | [post] &mut buffer [&ref] | test.rs:252:46:252:51 | [post] buffer | provenance |  |
+| test.rs:252:46:252:51 | [post] buffer | test.rs:259:27:259:32 | buffer | provenance |  |
+| test.rs:259:27:259:32 | buffer | test.rs:259:26:259:32 | &buffer | provenance |  |
+| test.rs:275:45:275:55 | [post] &mut buffer [&ref] | test.rs:275:50:275:55 | [post] buffer | provenance |  |
+| test.rs:275:50:275:55 | [post] buffer | test.rs:282:27:282:32 | buffer | provenance |  |
+| test.rs:282:27:282:32 | buffer | test.rs:282:26:282:32 | &buffer | provenance |  |
+| test.rs:373:13:373:15 | tcp | test.rs:374:15:374:17 | tcp | provenance |  |
+| test.rs:373:13:373:15 | tcp | test.rs:380:57:380:59 | tcp | provenance |  |
+| test.rs:373:19:373:36 | ...::connect | test.rs:373:19:373:41 | ...::connect(...) [future, Ok] | provenance | Src:MaD:1  |
+| test.rs:373:19:373:41 | ...::connect(...) [future, Ok] | test.rs:373:19:373:47 | await ... [Ok] | provenance |  |
+| test.rs:373:19:373:47 | await ... [Ok] | test.rs:373:19:373:48 | TryExpr | provenance |  |
+| test.rs:373:19:373:48 | TryExpr | test.rs:373:13:373:15 | tcp | provenance |  |
+| test.rs:374:15:374:17 | tcp | test.rs:374:14:374:17 | &tcp | provenance |  |
+| test.rs:380:13:380:22 | mut reader | test.rs:381:15:381:20 | reader | provenance |  |
+| test.rs:380:13:380:22 | mut reader | test.rs:386:44:386:49 | reader | provenance |  |
+| test.rs:380:13:380:22 | mut reader | test.rs:399:68:399:73 | reader | provenance |  |
+| test.rs:380:13:380:22 | mut reader | test.rs:403:31:403:36 | reader | provenance |  |
+| test.rs:380:13:380:22 | mut reader | test.rs:403:43:403:54 | [post] &mut buffer2 [&ref] | provenance | MaD:15 |
+| test.rs:380:13:380:22 | mut reader | test.rs:403:43:403:54 | [post] &mut buffer2 [&ref] | provenance | MaD:16 |
+| test.rs:380:13:380:22 | mut reader | test.rs:408:55:408:60 | reader | provenance |  |
+| test.rs:380:26:380:60 | connector.connect(...) [future, Ok] | test.rs:380:26:380:66 | await ... [Ok] | provenance |  |
+| test.rs:380:26:380:66 | await ... [Ok] | test.rs:380:26:380:67 | TryExpr | provenance |  |
+| test.rs:380:26:380:67 | TryExpr | test.rs:380:13:380:22 | mut reader | provenance |  |
+| test.rs:380:57:380:59 | tcp | test.rs:380:26:380:60 | connector.connect(...) [future, Ok] | provenance | MaD:27 |
+| test.rs:381:15:381:20 | reader | test.rs:381:14:381:20 | &reader | provenance |  |
+| test.rs:386:17:386:26 | mut pinned | test.rs:387:19:387:24 | pinned | provenance |  |
+| test.rs:386:17:386:26 | mut pinned | test.rs:389:56:389:66 | [post] &mut buffer [&ref] | provenance | MaD:9 |
+| test.rs:386:17:386:26 | mut pinned [&ref] | test.rs:387:19:387:24 | pinned [&ref] | provenance |  |
+| test.rs:386:17:386:26 | mut pinned [&ref] | test.rs:389:56:389:66 | [post] &mut buffer [&ref] | provenance | MaD:9 |
+| test.rs:386:30:386:50 | ...::new(...) | test.rs:386:17:386:26 | mut pinned | provenance |  |
+| test.rs:386:30:386:50 | ...::new(...) [&ref] | test.rs:386:17:386:26 | mut pinned [&ref] | provenance |  |
+| test.rs:386:39:386:49 | &mut reader [&ref] | test.rs:386:30:386:50 | ...::new(...) | provenance | MaD:24 |
+| test.rs:386:39:386:49 | &mut reader [&ref] | test.rs:386:30:386:50 | ...::new(...) [&ref] | provenance | MaD:25 |
+| test.rs:386:44:386:49 | reader | test.rs:386:39:386:49 | &mut reader [&ref] | provenance |  |
+| test.rs:387:19:387:24 | pinned | test.rs:387:18:387:24 | &pinned | provenance |  |
+| test.rs:387:19:387:24 | pinned [&ref] | test.rs:387:18:387:24 | &pinned | provenance |  |
+| test.rs:389:56:389:66 | [post] &mut buffer [&ref] | test.rs:389:61:389:66 | [post] buffer | provenance |  |
+| test.rs:389:61:389:66 | [post] buffer | test.rs:391:23:391:28 | buffer | provenance |  |
+| test.rs:389:61:389:66 | [post] buffer | test.rs:392:23:392:33 | buffer[...] | provenance |  |
+| test.rs:391:23:391:28 | buffer | test.rs:391:22:391:28 | &buffer | provenance |  |
+| test.rs:392:23:392:33 | buffer[...] | test.rs:392:22:392:33 | &... | provenance |  |
+| test.rs:399:63:399:73 | &mut reader [&ref] | test.rs:399:76:399:87 | [post] &mut buffer1 [&ref] | provenance | MaD:15 |
+| test.rs:399:68:399:73 | reader | test.rs:399:63:399:73 | &mut reader [&ref] | provenance |  |
+| test.rs:399:76:399:87 | [post] &mut buffer1 [&ref] | test.rs:399:81:399:87 | [post] buffer1 | provenance |  |
+| test.rs:399:81:399:87 | [post] buffer1 | test.rs:400:19:400:40 | buffer1[...] | provenance |  |
+| test.rs:400:19:400:40 | buffer1[...] | test.rs:400:18:400:40 | &... | provenance |  |
+| test.rs:403:31:403:36 | reader | test.rs:403:43:403:54 | [post] &mut buffer2 [&ref] | provenance | MaD:15 |
+| test.rs:403:43:403:54 | [post] &mut buffer2 [&ref] | test.rs:403:48:403:54 | [post] buffer2 | provenance |  |
+| test.rs:403:48:403:54 | [post] buffer2 | test.rs:405:19:405:40 | buffer2[...] | provenance |  |
+| test.rs:405:19:405:40 | buffer2[...] | test.rs:405:18:405:40 | &... | provenance |  |
+| test.rs:408:13:408:23 | mut reader2 | test.rs:409:15:409:21 | reader2 | provenance |  |
+| test.rs:408:13:408:23 | mut reader2 | test.rs:413:44:413:50 | reader2 | provenance |  |
+| test.rs:408:13:408:23 | mut reader2 | test.rs:423:41:423:47 | reader2 | provenance |  |
+| test.rs:408:13:408:23 | mut reader2 | test.rs:437:26:437:43 | reader2.fill_buf() [future, Ok] | provenance | MaD:10 |
+| test.rs:408:13:408:23 | mut reader2 | test.rs:444:44:444:50 | reader2 | provenance |  |
+| test.rs:408:13:408:23 | mut reader2 | test.rs:457:68:457:74 | reader2 | provenance |  |
+| test.rs:408:13:408:23 | mut reader2 | test.rs:461:31:461:37 | reader2 | provenance |  |
+| test.rs:408:13:408:23 | mut reader2 | test.rs:461:44:461:55 | [post] &mut buffer2 [&ref] | provenance | MaD:15 |
+| test.rs:408:13:408:23 | mut reader2 | test.rs:461:44:461:55 | [post] &mut buffer2 [&ref] | provenance | MaD:16 |
+| test.rs:408:13:408:23 | mut reader2 | test.rs:467:44:467:50 | reader2 | provenance |  |
+| test.rs:408:13:408:23 | mut reader2 | test.rs:479:26:479:43 | reader2.fill_buf() [future, Ok] | provenance | MaD:10 |
+| test.rs:408:13:408:23 | mut reader2 | test.rs:486:31:486:37 | reader2 | provenance |  |
+| test.rs:408:13:408:23 | mut reader2 | test.rs:486:57:486:65 | [post] &mut line [&ref] | provenance | MaD:13 |
+| test.rs:408:13:408:23 | mut reader2 | test.rs:486:57:486:65 | [post] &mut line [&ref] | provenance | MaD:14 |
+| test.rs:408:13:408:23 | mut reader2 | test.rs:493:31:493:37 | reader2 | provenance |  |
+| test.rs:408:13:408:23 | mut reader2 | test.rs:493:49:493:57 | [post] &mut line [&ref] | provenance | MaD:11 |
+| test.rs:408:13:408:23 | mut reader2 | test.rs:493:49:493:57 | [post] &mut line [&ref] | provenance | MaD:12 |
+| test.rs:408:13:408:23 | mut reader2 | test.rs:500:31:500:37 | reader2 | provenance |  |
+| test.rs:408:13:408:23 | mut reader2 | test.rs:500:51:500:61 | [post] &mut buffer [&ref] | provenance | MaD:17 |
+| test.rs:408:13:408:23 | mut reader2 | test.rs:500:51:500:61 | [post] &mut buffer [&ref] | provenance | MaD:18 |
+| test.rs:408:27:408:61 | ...::new(...) | test.rs:408:13:408:23 | mut reader2 | provenance |  |
+| test.rs:408:55:408:60 | reader | test.rs:408:27:408:61 | ...::new(...) | provenance | MaD:28 |
+| test.rs:409:15:409:21 | reader2 | test.rs:409:14:409:21 | &reader2 | provenance |  |
+| test.rs:413:17:413:26 | mut pinned | test.rs:414:19:414:24 | pinned | provenance |  |
+| test.rs:413:17:413:26 | mut pinned | test.rs:416:26:416:54 | pinned.poll_fill_buf(...) [Ready, Ok] | provenance | MaD:8 |
+| test.rs:413:17:413:26 | mut pinned [&ref] | test.rs:414:19:414:24 | pinned [&ref] | provenance |  |
+| test.rs:413:17:413:26 | mut pinned [&ref] | test.rs:416:26:416:54 | pinned.poll_fill_buf(...) [Ready, Ok] | provenance | MaD:8 |
+| test.rs:413:30:413:51 | ...::new(...) | test.rs:413:17:413:26 | mut pinned | provenance |  |
+| test.rs:413:30:413:51 | ...::new(...) [&ref] | test.rs:413:17:413:26 | mut pinned [&ref] | provenance |  |
+| test.rs:413:39:413:50 | &mut reader2 [&ref] | test.rs:413:30:413:51 | ...::new(...) | provenance | MaD:24 |
+| test.rs:413:39:413:50 | &mut reader2 [&ref] | test.rs:413:30:413:51 | ...::new(...) [&ref] | provenance | MaD:25 |
+| test.rs:413:44:413:50 | reader2 | test.rs:413:39:413:50 | &mut reader2 [&ref] | provenance |  |
+| test.rs:414:19:414:24 | pinned | test.rs:414:18:414:24 | &pinned | provenance |  |
+| test.rs:414:19:414:24 | pinned [&ref] | test.rs:414:18:414:24 | &pinned | provenance |  |
+| test.rs:416:17:416:22 | buffer [Ready, Ok] | test.rs:417:20:417:39 | ...::Ready(...) [Ready, Ok] | provenance |  |
+| test.rs:416:17:416:22 | buffer [Ready, Ok] | test.rs:418:23:418:28 | buffer [Ready, Ok] | provenance |  |
+| test.rs:416:26:416:54 | pinned.poll_fill_buf(...) [Ready, Ok] | test.rs:416:17:416:22 | buffer [Ready, Ok] | provenance |  |
+| test.rs:417:20:417:39 | ...::Ready(...) [Ready, Ok] | test.rs:417:32:417:38 | Ok(...) [Ok] | provenance |  |
+| test.rs:417:32:417:38 | Ok(...) [Ok] | test.rs:417:35:417:37 | buf | provenance |  |
+| test.rs:417:35:417:37 | buf | test.rs:419:22:419:24 | buf | provenance |  |
+| test.rs:418:23:418:28 | buffer [Ready, Ok] | test.rs:418:22:418:28 | &buffer | provenance |  |
+| test.rs:423:17:423:23 | buffer2 [Ready, Ok] | test.rs:424:20:424:26 | buffer2 [Ready, Ok] | provenance |  |
+| test.rs:423:27:423:48 | ...::new(...) | test.rs:423:27:423:71 | ... .poll_fill_buf(...) [Ready, Ok] | provenance | MaD:8 |
+| test.rs:423:27:423:48 | ...::new(...) [&ref] | test.rs:423:27:423:71 | ... .poll_fill_buf(...) [Ready, Ok] | provenance | MaD:8 |
+| test.rs:423:27:423:71 | ... .poll_fill_buf(...) [Ready, Ok] | test.rs:423:17:423:23 | buffer2 [Ready, Ok] | provenance |  |
+| test.rs:423:36:423:47 | &mut reader2 [&ref] | test.rs:423:27:423:48 | ...::new(...) | provenance | MaD:24 |
+| test.rs:423:36:423:47 | &mut reader2 [&ref] | test.rs:423:27:423:48 | ...::new(...) [&ref] | provenance | MaD:25 |
+| test.rs:423:41:423:47 | reader2 | test.rs:423:36:423:47 | &mut reader2 [&ref] | provenance |  |
+| test.rs:424:20:424:26 | buffer2 [Ready, Ok] | test.rs:425:17:425:36 | ...::Ready(...) [Ready, Ok] | provenance |  |
+| test.rs:424:20:424:26 | buffer2 [Ready, Ok] | test.rs:426:27:426:33 | buffer2 [Ready, Ok] | provenance |  |
+| test.rs:425:17:425:36 | ...::Ready(...) [Ready, Ok] | test.rs:425:29:425:35 | Ok(...) [Ok] | provenance |  |
+| test.rs:425:29:425:35 | Ok(...) [Ok] | test.rs:425:32:425:34 | buf | provenance |  |
+| test.rs:425:32:425:34 | buf | test.rs:427:26:427:28 | buf | provenance |  |
+| test.rs:426:27:426:33 | buffer2 [Ready, Ok] | test.rs:426:26:426:33 | &buffer2 | provenance |  |
+| test.rs:437:17:437:22 | buffer | test.rs:438:18:438:23 | buffer | provenance |  |
+| test.rs:437:26:437:43 | reader2.fill_buf() [future, Ok] | test.rs:437:26:437:49 | await ... [Ok] | provenance |  |
+| test.rs:437:26:437:49 | await ... [Ok] | test.rs:437:26:437:50 | TryExpr | provenance |  |
+| test.rs:437:26:437:50 | TryExpr | test.rs:437:17:437:22 | buffer | provenance |  |
+| test.rs:444:17:444:26 | mut pinned | test.rs:445:19:445:24 | pinned | provenance |  |
+| test.rs:444:17:444:26 | mut pinned | test.rs:447:56:447:66 | [post] &mut buffer [&ref] | provenance | MaD:9 |
+| test.rs:444:17:444:26 | mut pinned [&ref] | test.rs:445:19:445:24 | pinned [&ref] | provenance |  |
+| test.rs:444:17:444:26 | mut pinned [&ref] | test.rs:447:56:447:66 | [post] &mut buffer [&ref] | provenance | MaD:9 |
+| test.rs:444:30:444:51 | ...::new(...) | test.rs:444:17:444:26 | mut pinned | provenance |  |
+| test.rs:444:30:444:51 | ...::new(...) [&ref] | test.rs:444:17:444:26 | mut pinned [&ref] | provenance |  |
+| test.rs:444:39:444:50 | &mut reader2 [&ref] | test.rs:444:30:444:51 | ...::new(...) | provenance | MaD:24 |
+| test.rs:444:39:444:50 | &mut reader2 [&ref] | test.rs:444:30:444:51 | ...::new(...) [&ref] | provenance | MaD:25 |
+| test.rs:444:44:444:50 | reader2 | test.rs:444:39:444:50 | &mut reader2 [&ref] | provenance |  |
+| test.rs:445:19:445:24 | pinned | test.rs:445:18:445:24 | &pinned | provenance |  |
+| test.rs:445:19:445:24 | pinned [&ref] | test.rs:445:18:445:24 | &pinned | provenance |  |
+| test.rs:447:56:447:66 | [post] &mut buffer [&ref] | test.rs:447:61:447:66 | [post] buffer | provenance |  |
+| test.rs:447:61:447:66 | [post] buffer | test.rs:448:19:448:24 | buffer | provenance |  |
+| test.rs:447:61:447:66 | [post] buffer | test.rs:450:23:450:33 | buffer[...] | provenance |  |
+| test.rs:448:19:448:24 | buffer | test.rs:448:18:448:24 | &buffer | provenance |  |
+| test.rs:450:23:450:33 | buffer[...] | test.rs:450:22:450:33 | &... | provenance |  |
+| test.rs:457:63:457:74 | &mut reader2 [&ref] | test.rs:457:77:457:88 | [post] &mut buffer1 [&ref] | provenance | MaD:15 |
+| test.rs:457:68:457:74 | reader2 | test.rs:457:63:457:74 | &mut reader2 [&ref] | provenance |  |
+| test.rs:457:77:457:88 | [post] &mut buffer1 [&ref] | test.rs:457:82:457:88 | [post] buffer1 | provenance |  |
+| test.rs:457:82:457:88 | [post] buffer1 | test.rs:458:19:458:40 | buffer1[...] | provenance |  |
+| test.rs:458:19:458:40 | buffer1[...] | test.rs:458:18:458:40 | &... | provenance |  |
+| test.rs:461:31:461:37 | reader2 | test.rs:461:44:461:55 | [post] &mut buffer2 [&ref] | provenance | MaD:15 |
+| test.rs:461:44:461:55 | [post] &mut buffer2 [&ref] | test.rs:461:49:461:55 | [post] buffer2 | provenance |  |
+| test.rs:461:49:461:55 | [post] buffer2 | test.rs:462:19:462:40 | buffer2[...] | provenance |  |
+| test.rs:462:19:462:40 | buffer2[...] | test.rs:462:18:462:40 | &... | provenance |  |
+| test.rs:467:17:467:26 | mut pinned | test.rs:468:19:468:24 | pinned | provenance |  |
+| test.rs:467:17:467:26 | mut pinned | test.rs:470:26:470:54 | pinned.poll_fill_buf(...) [Ready, Ok] | provenance | MaD:8 |
+| test.rs:467:17:467:26 | mut pinned [&ref] | test.rs:468:19:468:24 | pinned [&ref] | provenance |  |
+| test.rs:467:17:467:26 | mut pinned [&ref] | test.rs:470:26:470:54 | pinned.poll_fill_buf(...) [Ready, Ok] | provenance | MaD:8 |
+| test.rs:467:30:467:51 | ...::new(...) | test.rs:467:17:467:26 | mut pinned | provenance |  |
+| test.rs:467:30:467:51 | ...::new(...) [&ref] | test.rs:467:17:467:26 | mut pinned [&ref] | provenance |  |
+| test.rs:467:39:467:50 | &mut reader2 [&ref] | test.rs:467:30:467:51 | ...::new(...) | provenance | MaD:24 |
+| test.rs:467:39:467:50 | &mut reader2 [&ref] | test.rs:467:30:467:51 | ...::new(...) [&ref] | provenance | MaD:25 |
+| test.rs:467:44:467:50 | reader2 | test.rs:467:39:467:50 | &mut reader2 [&ref] | provenance |  |
+| test.rs:468:19:468:24 | pinned | test.rs:468:18:468:24 | &pinned | provenance |  |
+| test.rs:468:19:468:24 | pinned [&ref] | test.rs:468:18:468:24 | &pinned | provenance |  |
+| test.rs:470:17:470:22 | buffer [Ready, Ok] | test.rs:471:19:471:24 | buffer [Ready, Ok] | provenance |  |
+| test.rs:470:17:470:22 | buffer [Ready, Ok] | test.rs:472:20:472:39 | ...::Ready(...) [Ready, Ok] | provenance |  |
+| test.rs:470:26:470:54 | pinned.poll_fill_buf(...) [Ready, Ok] | test.rs:470:17:470:22 | buffer [Ready, Ok] | provenance |  |
+| test.rs:471:19:471:24 | buffer [Ready, Ok] | test.rs:471:18:471:24 | &buffer | provenance |  |
+| test.rs:472:20:472:39 | ...::Ready(...) [Ready, Ok] | test.rs:472:32:472:38 | Ok(...) [Ok] | provenance |  |
+| test.rs:472:32:472:38 | Ok(...) [Ok] | test.rs:472:35:472:37 | buf | provenance |  |
+| test.rs:472:35:472:37 | buf | test.rs:473:22:473:24 | buf | provenance |  |
+| test.rs:479:17:479:22 | buffer | test.rs:480:18:480:23 | buffer | provenance |  |
+| test.rs:479:26:479:43 | reader2.fill_buf() [future, Ok] | test.rs:479:26:479:49 | await ... [Ok] | provenance |  |
+| test.rs:479:26:479:49 | await ... [Ok] | test.rs:479:26:479:50 | TryExpr | provenance |  |
+| test.rs:479:26:479:50 | TryExpr | test.rs:479:17:479:22 | buffer | provenance |  |
+| test.rs:486:31:486:37 | reader2 | test.rs:486:57:486:65 | [post] &mut line [&ref] | provenance | MaD:13 |
+| test.rs:486:57:486:65 | [post] &mut line [&ref] | test.rs:486:62:486:65 | [post] line | provenance |  |
+| test.rs:486:62:486:65 | [post] line | test.rs:487:19:487:22 | line | provenance |  |
+| test.rs:487:19:487:22 | line | test.rs:487:18:487:22 | &line | provenance |  |
+| test.rs:493:31:493:37 | reader2 | test.rs:493:49:493:57 | [post] &mut line [&ref] | provenance | MaD:11 |
+| test.rs:493:49:493:57 | [post] &mut line [&ref] | test.rs:493:54:493:57 | [post] line | provenance |  |
+| test.rs:493:54:493:57 | [post] line | test.rs:494:19:494:22 | line | provenance |  |
+| test.rs:494:19:494:22 | line | test.rs:494:18:494:22 | &line | provenance |  |
+| test.rs:500:31:500:37 | reader2 | test.rs:500:51:500:61 | [post] &mut buffer [&ref] | provenance | MaD:17 |
+| test.rs:500:51:500:61 | [post] &mut buffer [&ref] | test.rs:500:56:500:61 | [post] buffer | provenance |  |
+| test.rs:500:56:500:61 | [post] buffer | test.rs:501:19:501:24 | buffer | provenance |  |
+| test.rs:501:19:501:24 | buffer | test.rs:501:18:501:24 | &buffer | provenance |  |
+nodes
+| test.rs:11:9:11:22 | remote_string1 | semmle.label | remote_string1 |
+| test.rs:11:26:11:47 | ...::get | semmle.label | ...::get |
+| test.rs:11:26:11:62 | ...::get(...) [Ok] | semmle.label | ...::get(...) [Ok] |
+| test.rs:11:26:11:63 | TryExpr | semmle.label | TryExpr |
+| test.rs:11:26:11:70 | ... .text() [Ok] | semmle.label | ... .text() [Ok] |
+| test.rs:11:26:11:71 | TryExpr | semmle.label | TryExpr |
+| test.rs:12:10:12:23 | remote_string1 | semmle.label | remote_string1 |
+| test.rs:14:9:14:22 | remote_string2 | semmle.label | remote_string2 |
+| test.rs:14:26:14:47 | ...::get | semmle.label | ...::get |
+| test.rs:14:26:14:62 | ...::get(...) [Ok] | semmle.label | ...::get(...) [Ok] |
+| test.rs:14:26:14:71 | ... .unwrap() | semmle.label | ... .unwrap() |
+| test.rs:14:26:14:78 | ... .text() [Ok] | semmle.label | ... .text() [Ok] |
+| test.rs:14:26:14:87 | ... .unwrap() | semmle.label | ... .unwrap() |
+| test.rs:15:10:15:23 | remote_string2 | semmle.label | remote_string2 |
+| test.rs:17:9:17:22 | remote_string3 | semmle.label | remote_string3 |
+| test.rs:17:26:17:47 | ...::get | semmle.label | ...::get |
+| test.rs:17:26:17:62 | ...::get(...) [Ok] | semmle.label | ...::get(...) [Ok] |
+| test.rs:17:26:17:71 | ... .unwrap() | semmle.label | ... .unwrap() |
+| test.rs:17:26:17:98 | ... .text_with_charset(...) [Ok] | semmle.label | ... .text_with_charset(...) [Ok] |
+| test.rs:17:26:17:107 | ... .unwrap() | semmle.label | ... .unwrap() |
+| test.rs:18:10:18:23 | remote_string3 | semmle.label | remote_string3 |
+| test.rs:20:9:20:22 | remote_string4 | semmle.label | remote_string4 |
+| test.rs:20:26:20:47 | ...::get | semmle.label | ...::get |
+| test.rs:20:26:20:62 | ...::get(...) [Ok] | semmle.label | ...::get(...) [Ok] |
+| test.rs:20:26:20:71 | ... .unwrap() | semmle.label | ... .unwrap() |
+| test.rs:20:26:20:79 | ... .bytes() [Ok] | semmle.label | ... .bytes() [Ok] |
+| test.rs:20:26:20:88 | ... .unwrap() | semmle.label | ... .unwrap() |
+| test.rs:21:10:21:23 | remote_string4 | semmle.label | remote_string4 |
+| test.rs:23:9:23:22 | remote_string5 | semmle.label | remote_string5 |
+| test.rs:23:26:23:37 | ...::get | semmle.label | ...::get |
+| test.rs:23:26:23:52 | ...::get(...) [future, Ok] | semmle.label | ...::get(...) [future, Ok] |
+| test.rs:23:26:23:58 | await ... [Ok] | semmle.label | await ... [Ok] |
+| test.rs:23:26:23:59 | TryExpr | semmle.label | TryExpr |
+| test.rs:23:26:23:66 | ... .text() [future, Ok] | semmle.label | ... .text() [future, Ok] |
+| test.rs:23:26:23:72 | await ... [Ok] | semmle.label | await ... [Ok] |
+| test.rs:23:26:23:73 | TryExpr | semmle.label | TryExpr |
+| test.rs:24:10:24:23 | remote_string5 | semmle.label | remote_string5 |
+| test.rs:26:9:26:22 | remote_string6 | semmle.label | remote_string6 |
+| test.rs:26:26:26:37 | ...::get | semmle.label | ...::get |
+| test.rs:26:26:26:52 | ...::get(...) [future, Ok] | semmle.label | ...::get(...) [future, Ok] |
+| test.rs:26:26:26:58 | await ... [Ok] | semmle.label | await ... [Ok] |
+| test.rs:26:26:26:59 | TryExpr | semmle.label | TryExpr |
+| test.rs:26:26:26:67 | ... .bytes() [future, Ok] | semmle.label | ... .bytes() [future, Ok] |
+| test.rs:26:26:26:73 | await ... [Ok] | semmle.label | await ... [Ok] |
+| test.rs:26:26:26:74 | TryExpr | semmle.label | TryExpr |
+| test.rs:27:10:27:23 | remote_string6 | semmle.label | remote_string6 |
+| test.rs:29:9:29:20 | mut request1 | semmle.label | mut request1 |
+| test.rs:29:24:29:35 | ...::get | semmle.label | ...::get |
+| test.rs:29:24:29:50 | ...::get(...) [future, Ok] | semmle.label | ...::get(...) [future, Ok] |
+| test.rs:29:24:29:56 | await ... [Ok] | semmle.label | await ... [Ok] |
+| test.rs:29:24:29:57 | TryExpr | semmle.label | TryExpr |
+| test.rs:30:10:30:25 | request1.chunk() [future, Ok, Some] | semmle.label | request1.chunk() [future, Ok, Some] |
+| test.rs:30:10:30:31 | await ... [Ok, Some] | semmle.label | await ... [Ok, Some] |
+| test.rs:30:10:30:32 | TryExpr [Some] | semmle.label | TryExpr [Some] |
+| test.rs:30:10:30:41 | ... .unwrap() | semmle.label | ... .unwrap() |
+| test.rs:31:15:31:25 | Some(...) [Some] | semmle.label | Some(...) [Some] |
+| test.rs:31:20:31:24 | chunk | semmle.label | chunk |
+| test.rs:31:29:31:44 | request1.chunk() [future, Ok, Some] | semmle.label | request1.chunk() [future, Ok, Some] |
+| test.rs:31:29:31:50 | await ... [Ok, Some] | semmle.label | await ... [Ok, Some] |
+| test.rs:31:29:31:51 | TryExpr [Some] | semmle.label | TryExpr [Some] |
+| test.rs:32:14:32:18 | chunk | semmle.label | chunk |
+| test.rs:60:13:60:20 | response | semmle.label | response |
+| test.rs:60:24:60:51 | sender.send_request(...) [future, Ok] | semmle.label | sender.send_request(...) [future, Ok] |
+| test.rs:60:24:60:57 | await ... [Ok] | semmle.label | await ... [Ok] |
+| test.rs:60:24:60:58 | TryExpr | semmle.label | TryExpr |
+| test.rs:60:31:60:42 | send_request | semmle.label | send_request |
+| test.rs:61:14:61:22 | &response | semmle.label | &response |
+| test.rs:61:15:61:22 | response | semmle.label | response |
+| test.rs:62:14:62:21 | response | semmle.label | response |
+| test.rs:67:9:67:20 | mut response | semmle.label | mut response |
+| test.rs:67:24:67:51 | sender.send_request(...) [future, Ok] | semmle.label | sender.send_request(...) [future, Ok] |
+| test.rs:67:24:67:57 | await ... [Ok] | semmle.label | await ... [Ok] |
+| test.rs:67:24:67:58 | TryExpr | semmle.label | TryExpr |
+| test.rs:67:31:67:42 | send_request | semmle.label | send_request |
+| test.rs:68:10:68:18 | &response | semmle.label | &response |
+| test.rs:68:11:68:18 | response | semmle.label | response |
+| test.rs:155:13:155:22 | mut stream | semmle.label | mut stream |
+| test.rs:155:26:155:53 | ...::connect | semmle.label | ...::connect |
+| test.rs:155:26:155:62 | ...::connect(...) [Ok] | semmle.label | ...::connect(...) [Ok] |
+| test.rs:155:26:155:63 | TryExpr | semmle.label | TryExpr |
+| test.rs:162:29:162:39 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
+| test.rs:162:34:162:39 | [post] buffer | semmle.label | [post] buffer |
+| test.rs:165:14:165:20 | &buffer | semmle.label | &buffer |
+| test.rs:165:15:165:20 | buffer | semmle.label | buffer |
+| test.rs:166:14:166:22 | buffer[0] | semmle.label | buffer[0] |
+| test.rs:174:13:174:22 | mut stream | semmle.label | mut stream |
+| test.rs:174:26:174:61 | ...::connect_timeout | semmle.label | ...::connect_timeout |
+| test.rs:174:26:174:105 | ...::connect_timeout(...) [Ok] | semmle.label | ...::connect_timeout(...) [Ok] |
+| test.rs:174:26:174:106 | TryExpr | semmle.label | TryExpr |
+| test.rs:182:21:182:30 | mut reader | semmle.label | mut reader |
+| test.rs:182:34:182:64 | ...::new(...) | semmle.label | ...::new(...) |
+| test.rs:182:34:182:74 | ... .take(...) | semmle.label | ... .take(...) |
+| test.rs:182:58:182:63 | stream | semmle.label | stream |
+| test.rs:185:44:185:52 | [post] &mut line [&ref] | semmle.label | [post] &mut line [&ref] |
+| test.rs:185:49:185:52 | [post] line | semmle.label | [post] line |
+| test.rs:192:34:192:38 | &line | semmle.label | &line |
+| test.rs:192:35:192:38 | line | semmle.label | line |
+| test.rs:224:9:224:24 | mut tokio_stream | semmle.label | mut tokio_stream |
+| test.rs:224:28:224:57 | ...::connect | semmle.label | ...::connect |
+| test.rs:224:28:224:66 | ...::connect(...) [future, Ok] | semmle.label | ...::connect(...) [future, Ok] |
+| test.rs:224:28:224:72 | await ... [Ok] | semmle.label | await ... [Ok] |
+| test.rs:224:28:224:73 | TryExpr | semmle.label | TryExpr |
+| test.rs:232:35:232:46 | [post] &mut buffer1 [&ref] | semmle.label | [post] &mut buffer1 [&ref] |
+| test.rs:232:40:232:46 | [post] buffer1 | semmle.label | [post] buffer1 |
+| test.rs:236:36:236:47 | [post] &mut buffer2 [&ref] | semmle.label | [post] &mut buffer2 [&ref] |
+| test.rs:236:41:236:47 | [post] buffer2 | semmle.label | [post] buffer2 |
+| test.rs:239:14:239:21 | &buffer1 | semmle.label | &buffer1 |
+| test.rs:239:15:239:21 | buffer1 | semmle.label | buffer1 |
+| test.rs:240:14:240:23 | buffer1[0] | semmle.label | buffer1[0] |
+| test.rs:243:14:243:21 | &buffer2 | semmle.label | &buffer2 |
+| test.rs:243:15:243:21 | buffer2 | semmle.label | buffer2 |
+| test.rs:244:14:244:23 | buffer2[0] | semmle.label | buffer2[0] |
+| test.rs:252:41:252:51 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
+| test.rs:252:46:252:51 | [post] buffer | semmle.label | [post] buffer |
+| test.rs:259:26:259:32 | &buffer | semmle.label | &buffer |
+| test.rs:259:27:259:32 | buffer | semmle.label | buffer |
+| test.rs:275:45:275:55 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
+| test.rs:275:50:275:55 | [post] buffer | semmle.label | [post] buffer |
+| test.rs:282:26:282:32 | &buffer | semmle.label | &buffer |
+| test.rs:282:27:282:32 | buffer | semmle.label | buffer |
+| test.rs:373:13:373:15 | tcp | semmle.label | tcp |
+| test.rs:373:19:373:36 | ...::connect | semmle.label | ...::connect |
+| test.rs:373:19:373:41 | ...::connect(...) [future, Ok] | semmle.label | ...::connect(...) [future, Ok] |
+| test.rs:373:19:373:47 | await ... [Ok] | semmle.label | await ... [Ok] |
+| test.rs:373:19:373:48 | TryExpr | semmle.label | TryExpr |
+| test.rs:374:14:374:17 | &tcp | semmle.label | &tcp |
+| test.rs:374:15:374:17 | tcp | semmle.label | tcp |
+| test.rs:380:13:380:22 | mut reader | semmle.label | mut reader |
+| test.rs:380:26:380:60 | connector.connect(...) [future, Ok] | semmle.label | connector.connect(...) [future, Ok] |
+| test.rs:380:26:380:66 | await ... [Ok] | semmle.label | await ... [Ok] |
+| test.rs:380:26:380:67 | TryExpr | semmle.label | TryExpr |
+| test.rs:380:57:380:59 | tcp | semmle.label | tcp |
+| test.rs:381:14:381:20 | &reader | semmle.label | &reader |
+| test.rs:381:15:381:20 | reader | semmle.label | reader |
+| test.rs:386:17:386:26 | mut pinned | semmle.label | mut pinned |
+| test.rs:386:17:386:26 | mut pinned [&ref] | semmle.label | mut pinned [&ref] |
+| test.rs:386:30:386:50 | ...::new(...) | semmle.label | ...::new(...) |
+| test.rs:386:30:386:50 | ...::new(...) [&ref] | semmle.label | ...::new(...) [&ref] |
+| test.rs:386:39:386:49 | &mut reader [&ref] | semmle.label | &mut reader [&ref] |
+| test.rs:386:44:386:49 | reader | semmle.label | reader |
+| test.rs:387:18:387:24 | &pinned | semmle.label | &pinned |
+| test.rs:387:19:387:24 | pinned | semmle.label | pinned |
+| test.rs:387:19:387:24 | pinned [&ref] | semmle.label | pinned [&ref] |
+| test.rs:389:56:389:66 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
+| test.rs:389:61:389:66 | [post] buffer | semmle.label | [post] buffer |
+| test.rs:391:22:391:28 | &buffer | semmle.label | &buffer |
+| test.rs:391:23:391:28 | buffer | semmle.label | buffer |
+| test.rs:392:22:392:33 | &... | semmle.label | &... |
+| test.rs:392:23:392:33 | buffer[...] | semmle.label | buffer[...] |
+| test.rs:399:63:399:73 | &mut reader [&ref] | semmle.label | &mut reader [&ref] |
+| test.rs:399:68:399:73 | reader | semmle.label | reader |
+| test.rs:399:76:399:87 | [post] &mut buffer1 [&ref] | semmle.label | [post] &mut buffer1 [&ref] |
+| test.rs:399:81:399:87 | [post] buffer1 | semmle.label | [post] buffer1 |
+| test.rs:400:18:400:40 | &... | semmle.label | &... |
+| test.rs:400:19:400:40 | buffer1[...] | semmle.label | buffer1[...] |
+| test.rs:403:31:403:36 | reader | semmle.label | reader |
+| test.rs:403:43:403:54 | [post] &mut buffer2 [&ref] | semmle.label | [post] &mut buffer2 [&ref] |
+| test.rs:403:48:403:54 | [post] buffer2 | semmle.label | [post] buffer2 |
+| test.rs:405:18:405:40 | &... | semmle.label | &... |
+| test.rs:405:19:405:40 | buffer2[...] | semmle.label | buffer2[...] |
+| test.rs:408:13:408:23 | mut reader2 | semmle.label | mut reader2 |
+| test.rs:408:27:408:61 | ...::new(...) | semmle.label | ...::new(...) |
+| test.rs:408:55:408:60 | reader | semmle.label | reader |
+| test.rs:409:14:409:21 | &reader2 | semmle.label | &reader2 |
+| test.rs:409:15:409:21 | reader2 | semmle.label | reader2 |
+| test.rs:413:17:413:26 | mut pinned | semmle.label | mut pinned |
+| test.rs:413:17:413:26 | mut pinned [&ref] | semmle.label | mut pinned [&ref] |
+| test.rs:413:30:413:51 | ...::new(...) | semmle.label | ...::new(...) |
+| test.rs:413:30:413:51 | ...::new(...) [&ref] | semmle.label | ...::new(...) [&ref] |
+| test.rs:413:39:413:50 | &mut reader2 [&ref] | semmle.label | &mut reader2 [&ref] |
+| test.rs:413:44:413:50 | reader2 | semmle.label | reader2 |
+| test.rs:414:18:414:24 | &pinned | semmle.label | &pinned |
+| test.rs:414:19:414:24 | pinned | semmle.label | pinned |
+| test.rs:414:19:414:24 | pinned [&ref] | semmle.label | pinned [&ref] |
+| test.rs:416:17:416:22 | buffer [Ready, Ok] | semmle.label | buffer [Ready, Ok] |
+| test.rs:416:26:416:54 | pinned.poll_fill_buf(...) [Ready, Ok] | semmle.label | pinned.poll_fill_buf(...) [Ready, Ok] |
+| test.rs:417:20:417:39 | ...::Ready(...) [Ready, Ok] | semmle.label | ...::Ready(...) [Ready, Ok] |
+| test.rs:417:32:417:38 | Ok(...) [Ok] | semmle.label | Ok(...) [Ok] |
+| test.rs:417:35:417:37 | buf | semmle.label | buf |
+| test.rs:418:22:418:28 | &buffer | semmle.label | &buffer |
+| test.rs:418:23:418:28 | buffer [Ready, Ok] | semmle.label | buffer [Ready, Ok] |
+| test.rs:419:22:419:24 | buf | semmle.label | buf |
+| test.rs:423:17:423:23 | buffer2 [Ready, Ok] | semmle.label | buffer2 [Ready, Ok] |
+| test.rs:423:27:423:48 | ...::new(...) | semmle.label | ...::new(...) |
+| test.rs:423:27:423:48 | ...::new(...) [&ref] | semmle.label | ...::new(...) [&ref] |
+| test.rs:423:27:423:71 | ... .poll_fill_buf(...) [Ready, Ok] | semmle.label | ... .poll_fill_buf(...) [Ready, Ok] |
+| test.rs:423:36:423:47 | &mut reader2 [&ref] | semmle.label | &mut reader2 [&ref] |
+| test.rs:423:41:423:47 | reader2 | semmle.label | reader2 |
+| test.rs:424:20:424:26 | buffer2 [Ready, Ok] | semmle.label | buffer2 [Ready, Ok] |
+| test.rs:425:17:425:36 | ...::Ready(...) [Ready, Ok] | semmle.label | ...::Ready(...) [Ready, Ok] |
+| test.rs:425:29:425:35 | Ok(...) [Ok] | semmle.label | Ok(...) [Ok] |
+| test.rs:425:32:425:34 | buf | semmle.label | buf |
+| test.rs:426:26:426:33 | &buffer2 | semmle.label | &buffer2 |
+| test.rs:426:27:426:33 | buffer2 [Ready, Ok] | semmle.label | buffer2 [Ready, Ok] |
+| test.rs:427:26:427:28 | buf | semmle.label | buf |
+| test.rs:437:17:437:22 | buffer | semmle.label | buffer |
+| test.rs:437:26:437:43 | reader2.fill_buf() [future, Ok] | semmle.label | reader2.fill_buf() [future, Ok] |
+| test.rs:437:26:437:49 | await ... [Ok] | semmle.label | await ... [Ok] |
+| test.rs:437:26:437:50 | TryExpr | semmle.label | TryExpr |
+| test.rs:438:18:438:23 | buffer | semmle.label | buffer |
+| test.rs:444:17:444:26 | mut pinned | semmle.label | mut pinned |
+| test.rs:444:17:444:26 | mut pinned [&ref] | semmle.label | mut pinned [&ref] |
+| test.rs:444:30:444:51 | ...::new(...) | semmle.label | ...::new(...) |
+| test.rs:444:30:444:51 | ...::new(...) [&ref] | semmle.label | ...::new(...) [&ref] |
+| test.rs:444:39:444:50 | &mut reader2 [&ref] | semmle.label | &mut reader2 [&ref] |
+| test.rs:444:44:444:50 | reader2 | semmle.label | reader2 |
+| test.rs:445:18:445:24 | &pinned | semmle.label | &pinned |
+| test.rs:445:19:445:24 | pinned | semmle.label | pinned |
+| test.rs:445:19:445:24 | pinned [&ref] | semmle.label | pinned [&ref] |
+| test.rs:447:56:447:66 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
+| test.rs:447:61:447:66 | [post] buffer | semmle.label | [post] buffer |
+| test.rs:448:18:448:24 | &buffer | semmle.label | &buffer |
+| test.rs:448:19:448:24 | buffer | semmle.label | buffer |
+| test.rs:450:22:450:33 | &... | semmle.label | &... |
+| test.rs:450:23:450:33 | buffer[...] | semmle.label | buffer[...] |
+| test.rs:457:63:457:74 | &mut reader2 [&ref] | semmle.label | &mut reader2 [&ref] |
+| test.rs:457:68:457:74 | reader2 | semmle.label | reader2 |
+| test.rs:457:77:457:88 | [post] &mut buffer1 [&ref] | semmle.label | [post] &mut buffer1 [&ref] |
+| test.rs:457:82:457:88 | [post] buffer1 | semmle.label | [post] buffer1 |
+| test.rs:458:18:458:40 | &... | semmle.label | &... |
+| test.rs:458:19:458:40 | buffer1[...] | semmle.label | buffer1[...] |
+| test.rs:461:31:461:37 | reader2 | semmle.label | reader2 |
+| test.rs:461:44:461:55 | [post] &mut buffer2 [&ref] | semmle.label | [post] &mut buffer2 [&ref] |
+| test.rs:461:49:461:55 | [post] buffer2 | semmle.label | [post] buffer2 |
+| test.rs:462:18:462:40 | &... | semmle.label | &... |
+| test.rs:462:19:462:40 | buffer2[...] | semmle.label | buffer2[...] |
+| test.rs:467:17:467:26 | mut pinned | semmle.label | mut pinned |
+| test.rs:467:17:467:26 | mut pinned [&ref] | semmle.label | mut pinned [&ref] |
+| test.rs:467:30:467:51 | ...::new(...) | semmle.label | ...::new(...) |
+| test.rs:467:30:467:51 | ...::new(...) [&ref] | semmle.label | ...::new(...) [&ref] |
+| test.rs:467:39:467:50 | &mut reader2 [&ref] | semmle.label | &mut reader2 [&ref] |
+| test.rs:467:44:467:50 | reader2 | semmle.label | reader2 |
+| test.rs:468:18:468:24 | &pinned | semmle.label | &pinned |
+| test.rs:468:19:468:24 | pinned | semmle.label | pinned |
+| test.rs:468:19:468:24 | pinned [&ref] | semmle.label | pinned [&ref] |
+| test.rs:470:17:470:22 | buffer [Ready, Ok] | semmle.label | buffer [Ready, Ok] |
+| test.rs:470:26:470:54 | pinned.poll_fill_buf(...) [Ready, Ok] | semmle.label | pinned.poll_fill_buf(...) [Ready, Ok] |
+| test.rs:471:18:471:24 | &buffer | semmle.label | &buffer |
+| test.rs:471:19:471:24 | buffer [Ready, Ok] | semmle.label | buffer [Ready, Ok] |
+| test.rs:472:20:472:39 | ...::Ready(...) [Ready, Ok] | semmle.label | ...::Ready(...) [Ready, Ok] |
+| test.rs:472:32:472:38 | Ok(...) [Ok] | semmle.label | Ok(...) [Ok] |
+| test.rs:472:35:472:37 | buf | semmle.label | buf |
+| test.rs:473:22:473:24 | buf | semmle.label | buf |
+| test.rs:479:17:479:22 | buffer | semmle.label | buffer |
+| test.rs:479:26:479:43 | reader2.fill_buf() [future, Ok] | semmle.label | reader2.fill_buf() [future, Ok] |
+| test.rs:479:26:479:49 | await ... [Ok] | semmle.label | await ... [Ok] |
+| test.rs:479:26:479:50 | TryExpr | semmle.label | TryExpr |
+| test.rs:480:18:480:23 | buffer | semmle.label | buffer |
+| test.rs:486:31:486:37 | reader2 | semmle.label | reader2 |
+| test.rs:486:57:486:65 | [post] &mut line [&ref] | semmle.label | [post] &mut line [&ref] |
+| test.rs:486:62:486:65 | [post] line | semmle.label | [post] line |
+| test.rs:487:18:487:22 | &line | semmle.label | &line |
+| test.rs:487:19:487:22 | line | semmle.label | line |
+| test.rs:493:31:493:37 | reader2 | semmle.label | reader2 |
+| test.rs:493:49:493:57 | [post] &mut line [&ref] | semmle.label | [post] &mut line [&ref] |
+| test.rs:493:54:493:57 | [post] line | semmle.label | [post] line |
+| test.rs:494:18:494:22 | &line | semmle.label | &line |
+| test.rs:494:19:494:22 | line | semmle.label | line |
+| test.rs:500:31:500:37 | reader2 | semmle.label | reader2 |
+| test.rs:500:51:500:61 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
+| test.rs:500:56:500:61 | [post] buffer | semmle.label | [post] buffer |
+| test.rs:501:18:501:24 | &buffer | semmle.label | &buffer |
+| test.rs:501:19:501:24 | buffer | semmle.label | buffer |
+subpaths
+testFailures
+#select
+| test.rs:12:10:12:23 | remote_string1 | test.rs:11:26:11:47 | ...::get | test.rs:12:10:12:23 | remote_string1 | $@ | test.rs:11:26:11:47 | ...::get | ...::get |
+| test.rs:15:10:15:23 | remote_string2 | test.rs:14:26:14:47 | ...::get | test.rs:15:10:15:23 | remote_string2 | $@ | test.rs:14:26:14:47 | ...::get | ...::get |
+| test.rs:18:10:18:23 | remote_string3 | test.rs:17:26:17:47 | ...::get | test.rs:18:10:18:23 | remote_string3 | $@ | test.rs:17:26:17:47 | ...::get | ...::get |
+| test.rs:21:10:21:23 | remote_string4 | test.rs:20:26:20:47 | ...::get | test.rs:21:10:21:23 | remote_string4 | $@ | test.rs:20:26:20:47 | ...::get | ...::get |
+| test.rs:24:10:24:23 | remote_string5 | test.rs:23:26:23:37 | ...::get | test.rs:24:10:24:23 | remote_string5 | $@ | test.rs:23:26:23:37 | ...::get | ...::get |
+| test.rs:27:10:27:23 | remote_string6 | test.rs:26:26:26:37 | ...::get | test.rs:27:10:27:23 | remote_string6 | $@ | test.rs:26:26:26:37 | ...::get | ...::get |
+| test.rs:30:10:30:41 | ... .unwrap() | test.rs:29:24:29:35 | ...::get | test.rs:30:10:30:41 | ... .unwrap() | $@ | test.rs:29:24:29:35 | ...::get | ...::get |
+| test.rs:32:14:32:18 | chunk | test.rs:29:24:29:35 | ...::get | test.rs:32:14:32:18 | chunk | $@ | test.rs:29:24:29:35 | ...::get | ...::get |
+| test.rs:61:14:61:22 | &response | test.rs:60:31:60:42 | send_request | test.rs:61:14:61:22 | &response | $@ | test.rs:60:31:60:42 | send_request | send_request |
+| test.rs:62:14:62:21 | response | test.rs:60:31:60:42 | send_request | test.rs:62:14:62:21 | response | $@ | test.rs:60:31:60:42 | send_request | send_request |
+| test.rs:68:10:68:18 | &response | test.rs:67:31:67:42 | send_request | test.rs:68:10:68:18 | &response | $@ | test.rs:67:31:67:42 | send_request | send_request |
+| test.rs:165:14:165:20 | &buffer | test.rs:155:26:155:53 | ...::connect | test.rs:165:14:165:20 | &buffer | $@ | test.rs:155:26:155:53 | ...::connect | ...::connect |
+| test.rs:166:14:166:22 | buffer[0] | test.rs:155:26:155:53 | ...::connect | test.rs:166:14:166:22 | buffer[0] | $@ | test.rs:155:26:155:53 | ...::connect | ...::connect |
+| test.rs:192:34:192:38 | &line | test.rs:174:26:174:61 | ...::connect_timeout | test.rs:192:34:192:38 | &line | $@ | test.rs:174:26:174:61 | ...::connect_timeout | ...::connect_timeout |
+| test.rs:239:14:239:21 | &buffer1 | test.rs:224:28:224:57 | ...::connect | test.rs:239:14:239:21 | &buffer1 | $@ | test.rs:224:28:224:57 | ...::connect | ...::connect |
+| test.rs:240:14:240:23 | buffer1[0] | test.rs:224:28:224:57 | ...::connect | test.rs:240:14:240:23 | buffer1[0] | $@ | test.rs:224:28:224:57 | ...::connect | ...::connect |
+| test.rs:243:14:243:21 | &buffer2 | test.rs:224:28:224:57 | ...::connect | test.rs:243:14:243:21 | &buffer2 | $@ | test.rs:224:28:224:57 | ...::connect | ...::connect |
+| test.rs:244:14:244:23 | buffer2[0] | test.rs:224:28:224:57 | ...::connect | test.rs:244:14:244:23 | buffer2[0] | $@ | test.rs:224:28:224:57 | ...::connect | ...::connect |
+| test.rs:259:26:259:32 | &buffer | test.rs:224:28:224:57 | ...::connect | test.rs:259:26:259:32 | &buffer | $@ | test.rs:224:28:224:57 | ...::connect | ...::connect |
+| test.rs:282:26:282:32 | &buffer | test.rs:224:28:224:57 | ...::connect | test.rs:282:26:282:32 | &buffer | $@ | test.rs:224:28:224:57 | ...::connect | ...::connect |
+| test.rs:374:14:374:17 | &tcp | test.rs:373:19:373:36 | ...::connect | test.rs:374:14:374:17 | &tcp | $@ | test.rs:373:19:373:36 | ...::connect | ...::connect |
+| test.rs:381:14:381:20 | &reader | test.rs:373:19:373:36 | ...::connect | test.rs:381:14:381:20 | &reader | $@ | test.rs:373:19:373:36 | ...::connect | ...::connect |
+| test.rs:387:18:387:24 | &pinned | test.rs:373:19:373:36 | ...::connect | test.rs:387:18:387:24 | &pinned | $@ | test.rs:373:19:373:36 | ...::connect | ...::connect |
+| test.rs:391:22:391:28 | &buffer | test.rs:373:19:373:36 | ...::connect | test.rs:391:22:391:28 | &buffer | $@ | test.rs:373:19:373:36 | ...::connect | ...::connect |
+| test.rs:392:22:392:33 | &... | test.rs:373:19:373:36 | ...::connect | test.rs:392:22:392:33 | &... | $@ | test.rs:373:19:373:36 | ...::connect | ...::connect |
+| test.rs:400:18:400:40 | &... | test.rs:373:19:373:36 | ...::connect | test.rs:400:18:400:40 | &... | $@ | test.rs:373:19:373:36 | ...::connect | ...::connect |
+| test.rs:405:18:405:40 | &... | test.rs:373:19:373:36 | ...::connect | test.rs:405:18:405:40 | &... | $@ | test.rs:373:19:373:36 | ...::connect | ...::connect |
+| test.rs:409:14:409:21 | &reader2 | test.rs:373:19:373:36 | ...::connect | test.rs:409:14:409:21 | &reader2 | $@ | test.rs:373:19:373:36 | ...::connect | ...::connect |
+| test.rs:414:18:414:24 | &pinned | test.rs:373:19:373:36 | ...::connect | test.rs:414:18:414:24 | &pinned | $@ | test.rs:373:19:373:36 | ...::connect | ...::connect |
+| test.rs:418:22:418:28 | &buffer | test.rs:373:19:373:36 | ...::connect | test.rs:418:22:418:28 | &buffer | $@ | test.rs:373:19:373:36 | ...::connect | ...::connect |
+| test.rs:419:22:419:24 | buf | test.rs:373:19:373:36 | ...::connect | test.rs:419:22:419:24 | buf | $@ | test.rs:373:19:373:36 | ...::connect | ...::connect |
+| test.rs:426:26:426:33 | &buffer2 | test.rs:373:19:373:36 | ...::connect | test.rs:426:26:426:33 | &buffer2 | $@ | test.rs:373:19:373:36 | ...::connect | ...::connect |
+| test.rs:427:26:427:28 | buf | test.rs:373:19:373:36 | ...::connect | test.rs:427:26:427:28 | buf | $@ | test.rs:373:19:373:36 | ...::connect | ...::connect |
+| test.rs:438:18:438:23 | buffer | test.rs:373:19:373:36 | ...::connect | test.rs:438:18:438:23 | buffer | $@ | test.rs:373:19:373:36 | ...::connect | ...::connect |
+| test.rs:445:18:445:24 | &pinned | test.rs:373:19:373:36 | ...::connect | test.rs:445:18:445:24 | &pinned | $@ | test.rs:373:19:373:36 | ...::connect | ...::connect |
+| test.rs:448:18:448:24 | &buffer | test.rs:373:19:373:36 | ...::connect | test.rs:448:18:448:24 | &buffer | $@ | test.rs:373:19:373:36 | ...::connect | ...::connect |
+| test.rs:450:22:450:33 | &... | test.rs:373:19:373:36 | ...::connect | test.rs:450:22:450:33 | &... | $@ | test.rs:373:19:373:36 | ...::connect | ...::connect |
+| test.rs:458:18:458:40 | &... | test.rs:373:19:373:36 | ...::connect | test.rs:458:18:458:40 | &... | $@ | test.rs:373:19:373:36 | ...::connect | ...::connect |
+| test.rs:462:18:462:40 | &... | test.rs:373:19:373:36 | ...::connect | test.rs:462:18:462:40 | &... | $@ | test.rs:373:19:373:36 | ...::connect | ...::connect |
+| test.rs:468:18:468:24 | &pinned | test.rs:373:19:373:36 | ...::connect | test.rs:468:18:468:24 | &pinned | $@ | test.rs:373:19:373:36 | ...::connect | ...::connect |
+| test.rs:471:18:471:24 | &buffer | test.rs:373:19:373:36 | ...::connect | test.rs:471:18:471:24 | &buffer | $@ | test.rs:373:19:373:36 | ...::connect | ...::connect |
+| test.rs:473:22:473:24 | buf | test.rs:373:19:373:36 | ...::connect | test.rs:473:22:473:24 | buf | $@ | test.rs:373:19:373:36 | ...::connect | ...::connect |
+| test.rs:480:18:480:23 | buffer | test.rs:373:19:373:36 | ...::connect | test.rs:480:18:480:23 | buffer | $@ | test.rs:373:19:373:36 | ...::connect | ...::connect |
+| test.rs:487:18:487:22 | &line | test.rs:373:19:373:36 | ...::connect | test.rs:487:18:487:22 | &line | $@ | test.rs:373:19:373:36 | ...::connect | ...::connect |
+| test.rs:494:18:494:22 | &line | test.rs:373:19:373:36 | ...::connect | test.rs:494:18:494:22 | &line | $@ | test.rs:373:19:373:36 | ...::connect | ...::connect |
+| test.rs:501:18:501:24 | &buffer | test.rs:373:19:373:36 | ...::connect | test.rs:501:18:501:24 | &buffer | $@ | test.rs:373:19:373:36 | ...::connect | ...::connect |
diff --git a/rust/ql/test/library-tests/dataflow/sources/net/InlineFlow.qlref b/rust/ql/test/library-tests/dataflow/sources/net/InlineFlow.qlref
new file mode 100644
index 00000000000..e0f7493db39
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/sources/net/InlineFlow.qlref
@@ -0,0 +1,2 @@
+query: ../env/InlineFlow.ql
+
diff --git a/rust/ql/test/library-tests/dataflow/sources/net/TaintSources.expected b/rust/ql/test/library-tests/dataflow/sources/net/TaintSources.expected
new file mode 100644
index 00000000000..bfe1ce0e56b
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/sources/net/TaintSources.expected
@@ -0,0 +1,17 @@
+| test.rs:11:26:11:47 | ...::get | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:14:26:14:47 | ...::get | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:17:26:17:47 | ...::get | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:20:26:20:47 | ...::get | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:23:26:23:37 | ...::get | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:26:26:26:37 | ...::get | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:29:24:29:35 | ...::get | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:45:18:45:47 | ...::connect | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:60:31:60:42 | send_request | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:67:31:67:42 | send_request | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:155:26:155:53 | ...::connect | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:174:26:174:61 | ...::connect_timeout | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:224:28:224:57 | ...::connect | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:306:22:306:49 | ...::connect | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:332:22:332:50 | ...::new | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:373:19:373:36 | ...::connect | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:519:16:519:29 | ...::args | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
diff --git a/rust/ql/test/library-tests/dataflow/sources/net/TaintSources.qlref b/rust/ql/test/library-tests/dataflow/sources/net/TaintSources.qlref
new file mode 100644
index 00000000000..7aa95121af3
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/sources/net/TaintSources.qlref
@@ -0,0 +1,2 @@
+query: queries/summary/TaintSources.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/rust/ql/test/library-tests/dataflow/sources/options.yml b/rust/ql/test/library-tests/dataflow/sources/net/options.yml
similarity index 69%
rename from rust/ql/test/library-tests/dataflow/sources/options.yml
rename to rust/ql/test/library-tests/dataflow/sources/net/options.yml
index a05a970f7b8..24cda1561c0 100644
--- a/rust/ql/test/library-tests/dataflow/sources/options.yml
+++ b/rust/ql/test/library-tests/dataflow/sources/net/options.yml
@@ -7,12 +7,6 @@ qltest_dependencies:
     - http = { version = "1.2.0" }
     - tokio = { version = "1.43.0", features = ["full"] }
     - futures = { version = "0.3" }
-    - bytes = { version = "1.10.1" }
-    - poem = { version = "3.1.10" }
-    - serde = { version = "1.0.219" }
-    - actix-web = { version = "4.10.2" }
-    - axum = { version = "0.8.4" }
-    - serde_json = { version = "1.0.140" }
     - rustls = { version = "0.23.27" }
     - futures-rustls = { version = "0.26.0" }
     - async-std = { version = "1.13.1" }
diff --git a/rust/ql/test/library-tests/dataflow/sources/net/test.rs b/rust/ql/test/library-tests/dataflow/sources/net/test.rs
new file mode 100644
index 00000000000..254a27349d9
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/sources/net/test.rs
@@ -0,0 +1,564 @@
+fn sink<T>(_: T) { }
+
+// --- tests ---
+
+use std::io::{Read, Write, BufRead};
+use tokio::io::{AsyncReadExt, AsyncWriteExt};
+use http_body_util::BodyExt;
+use std::net::ToSocketAddrs;
+
+async fn test_reqwest() -> Result<(), reqwest::Error> {
+    let remote_string1 = reqwest::blocking::get("example.com")?.text()?; // $ Alert[rust/summary/taint-sources]
+    sink(remote_string1); // $ hasTaintFlow="example.com"
+
+    let remote_string2 = reqwest::blocking::get("example.com").unwrap().text().unwrap(); // $ Alert[rust/summary/taint-sources]
+    sink(remote_string2); // $ hasTaintFlow="example.com"
+
+    let remote_string3 = reqwest::blocking::get("example.com").unwrap().text_with_charset("utf-8").unwrap(); // $ Alert[rust/summary/taint-sources]
+    sink(remote_string3); // $ hasTaintFlow="example.com"
+
+    let remote_string4 = reqwest::blocking::get("example.com").unwrap().bytes().unwrap(); // $ Alert[rust/summary/taint-sources]
+    sink(remote_string4); // $ hasTaintFlow="example.com"
+
+    let remote_string5 = reqwest::get("example.com").await?.text().await?; // $ Alert[rust/summary/taint-sources]
+    sink(remote_string5); // $ hasTaintFlow="example.com"
+
+    let remote_string6 = reqwest::get("example.com").await?.bytes().await?; // $ Alert[rust/summary/taint-sources]
+    sink(remote_string6); // $ hasTaintFlow="example.com"
+
+    let mut request1 = reqwest::get("example.com").await?; // $ Alert[rust/summary/taint-sources]
+    sink(request1.chunk().await?.unwrap()); // $ hasTaintFlow="example.com"
+    while let Some(chunk) = request1.chunk().await? {
+        sink(chunk); // $ hasTaintFlow="example.com"
+    }
+
+    Ok(())
+}
+
+async fn test_hyper_http(case: i64) -> Result<(), Box<dyn std::error::Error>> {
+    // using http + hyper libs to fetch a web page
+    let address = "example.com:80";
+    let url = "http://example.com/";
+
+    // create the connection
+    println!("connecting to {}...", address);
+    let stream = tokio::net::TcpStream::connect(address).await?; // $ Alert[rust/summary/taint-sources]
+    let io = hyper_util::rt::TokioIo::new(stream);
+    let (sender, conn) = hyper::client::conn::http1::handshake(io).await?;
+    let mut sender: hyper::client::conn::http1::SendRequest<String> = sender;
+
+    // drive the HTTP connection
+    tokio::task::spawn(async move {
+        conn.await.expect("connection failed");
+    });
+
+    // make the request
+    println!("sending request...");
+    if case == 0 {
+        // simple flow case
+        let request = http::Request::builder().uri(url).body(String::from(""))?;
+        let response = sender.send_request(request).await?; // $ Alert[rust/summary/taint-sources]
+        sink(&response); // $ hasTaintFlow=request
+        sink(response); // $ hasTaintFlow=request
+        return Ok(())
+    }
+    // more realistic uses of results...
+    let request = http::Request::builder().uri(url).body(String::from(""))?;
+    let mut response = sender.send_request(request).await?; // $ Alert[rust/summary/taint-sources]
+    sink(&response); // $ hasTaintFlow=request
+
+    if !response.status().is_success() {
+        return Err("request failed".into())
+    }
+
+    match case {
+        1 => {
+            sink(response.body()); // $ MISSING: hasTaintFlow
+            sink(response.body_mut()); // $ MISSING: hasTaintFlow
+
+            let body = response.into_body();
+            sink(&body); // $ MISSING: hasTaintFlow
+
+            println!("awaiting response...");
+            let data = body.collect().await?;
+            sink(&data); // $ MISSING: hasTaintFlow
+
+            let bytes = data.to_bytes();
+            println!("bytes = {:?}", &bytes);
+            sink(bytes); // $ MISSING: hasTaintFlow
+        }
+        2 => {
+            println!("streaming response...");
+            while let Some(frame) = response.frame().await {
+                if let Some(data) = frame?.data_ref() {
+                    std::io::stdout().write_all(data)?;
+                    sink(data); // $ MISSING: hasTaintFlow
+                    sink(data[0]); // $ MISSING: hasTaintFlow
+                    for byte in data {
+                        sink(byte); // $ MISSING: hasTaintFlow
+                    }
+                }
+            }
+        }
+        3 => {
+            let headers = response.headers();
+
+            if headers.contains_key(http::header::CONTENT_TYPE) {
+                println!("CONTENT_TYPE = {}", response.headers()[http::header::CONTENT_TYPE].to_str().unwrap());
+                sink(&headers[http::header::CONTENT_TYPE]); // $ MISSING: hasTaintFlow
+                sink(headers[http::header::CONTENT_TYPE].to_str().unwrap()); // $ MISSING: hasTaintFlow
+                sink(headers[http::header::CONTENT_TYPE].as_bytes()); // $ MISSING: hasTaintFlow
+                sink(headers.get(http::header::CONTENT_TYPE).unwrap()); // $ MISSING: hasTaintFlow
+            }
+
+            if headers.contains_key("Content-type") {
+                println!("Content-type = {}", response.headers().get("Content-type").unwrap().to_str().unwrap());
+                sink(headers.get("Content-type").unwrap()); // $ MISSING: hasTaintFlow
+                sink(headers.get("Content-type").unwrap().to_str().unwrap()); // $ MISSING: hasTaintFlow
+                sink(headers.get("Content-type").unwrap().as_bytes()); // $ MISSING: hasTaintFlow
+                sink(&headers["Content-type"]); // $ MISSING: hasTaintFlow
+            }
+
+            if headers.contains_key(http::header::COOKIE) {
+                sink(response.headers().get(http::header::COOKIE)); // $ MISSING: hasTaintFlow
+                for cookie in headers.get_all(http::header::COOKIE) {
+                    println!("cookie = {}", cookie.to_str().unwrap());
+                    sink(cookie); // $ MISSING: hasTaintFlow
+                    sink(cookie.to_str().unwrap()); // $ MISSING: hasTaintFlow
+                }
+            }
+
+            let (parts, body) = response.into_parts();
+
+            if parts.headers.contains_key(http::header::CONTENT_TYPE) {
+                println!("CONTENT_TYPE = {}", parts.headers[http::header::CONTENT_TYPE].to_str().unwrap());
+                sink(&parts.headers[http::header::CONTENT_TYPE]); // $ MISSING: hasTaintFlow
+                sink(parts.headers[http::header::CONTENT_TYPE].to_str().unwrap()); // $ MISSING: hasTaintFlow
+                sink(parts.headers[http::header::CONTENT_TYPE].as_bytes()); // $ MISSING: hasTaintFlow
+                sink(parts.headers.get(http::header::CONTENT_TYPE).unwrap()); // $ MISSING: hasTaintFlow
+            }
+
+            sink(body); // $ MISSING: hasTaintFlow
+        }
+        _ => {}
+    }
+
+    Ok(())
+}
+
+async fn test_std_tcpstream(case: i64) -> std::io::Result<()> {
+    // using std::net to fetch a web page
+    let address = "example.com:80";
+
+    if case == 1 {
+        // create the connection
+        let mut stream = std::net::TcpStream::connect(address)?; // $ Alert[rust/summary/taint-sources]
+
+        // send request
+        let _ = stream.write_all(b"GET / HTTP/1.1\nHost:example.com\n\n");
+
+        // read response
+        let mut buffer = vec![0; 32 * 1024];
+        let _ = stream.read(&mut buffer);
+
+        println!("data = {:?}", buffer);
+        sink(&buffer); // $ hasTaintFlow=address
+        sink(buffer[0]); // $ hasTaintFlow=address
+
+        let buffer_string = String::from_utf8_lossy(&buffer);
+        println!("string = {}", buffer_string);
+        sink(buffer_string); // $ MISSING: hasTaintFlow
+    } else {
+        // create the connection
+        let sock_addr = address.to_socket_addrs().unwrap().next().unwrap();
+        let mut stream = std::net::TcpStream::connect_timeout(&sock_addr, std::time::Duration::new(1, 0))?; // $ Alert[rust/summary/taint-sources]
+
+        // send request
+        let _ = stream.write_all(b"GET / HTTP/1.1\nHost:example.com\n\n");
+
+        // read response
+        match case {
+            2 => {
+                let mut reader = std::io::BufReader::new(stream).take(256);
+                let mut line = String::new();
+                loop {
+                    match reader.read_line(&mut line) {
+                        Ok(0) => {
+                            println!("end");
+                            break;
+                        }
+                        Ok(_n) => {
+                            println!("line = {}", line);
+                            sink(&line); // $ hasTaintFlow=&sock_addr
+                            line.clear();
+                        }
+                        Err(e) => {
+                            println!("error: {}", e);
+                            break;
+                        }
+                    }
+                }
+            }
+            3 => {
+                let reader = std::io::BufReader::new(stream.try_clone()?).take(256);
+                for line in reader.lines() { // $ MISSING: Alert[rust/summary/taint-sources]
+                    if let Ok(string) = line {
+                        println!("line = {}", string);
+                        sink(string); // $ MISSING: hasTaintFlow
+                    }
+                }
+            }
+            _ => {}
+        }
+    }
+
+    Ok(())
+}
+
+async fn test_tokio_tcpstream(case: i64) -> std::io::Result<()> {
+    // using tokio::io to fetch a web page
+    let address = "example.com:80";
+
+    // create the connection
+    println!("connecting to {}...", address);
+    let mut tokio_stream = tokio::net::TcpStream::connect(address).await?; // $ Alert[rust/summary/taint-sources]
+
+    // send request
+    tokio_stream.write_all(b"GET / HTTP/1.1\nHost:example.com\n\n").await?;
+
+    if case == 1 {
+        // peek response
+        let mut buffer1 = vec![0; 2 * 1024];
+        let _ = tokio_stream.peek(&mut buffer1).await?;
+
+        // read response
+        let mut buffer2 = vec![0; 2 * 1024];
+        let n2 = tokio_stream.read(&mut buffer2).await?;
+
+        println!("buffer1 = {:?}", buffer1);
+        sink(&buffer1); // $ hasTaintFlow=address
+        sink(buffer1[0]); // $ hasTaintFlow=address
+
+        println!("buffer2 = {:?}", buffer2);
+        sink(&buffer2); // $ hasTaintFlow=address
+        sink(buffer2[0]); // $ hasTaintFlow=address
+
+        let buffer_string = String::from_utf8_lossy(&buffer2[..n2]);
+        println!("string = {}", buffer_string);
+        sink(buffer_string); // $ MISSING: hasTaintFlow
+    } else if case == 2 {
+        let mut buffer = [0; 2 * 1024];
+        loop {
+            match tokio_stream.try_read(&mut buffer) {
+                Ok(0) => {
+                    println!("end");
+                    break;
+                }
+                Ok(_n) => {
+                    println!("buffer = {:?}", buffer);
+                    sink(&buffer); // $ hasTaintFlow=address
+                    break; // (or we could wait for more data)
+                }
+                Err(ref e) if e.kind() == std::io::ErrorKind::WouldBlock => {
+                    // wait...
+                    continue;
+                }
+                Err(e) => {
+                    println!("error: {}", e);
+                    break;
+                }
+            }
+        }
+    } else {
+        let mut buffer = Vec::new();
+        loop {
+            match tokio_stream.try_read_buf(&mut buffer) {
+                Ok(0) => {
+                    println!("end");
+                    break;
+                }
+                Ok(_n) => {
+                    println!("buffer = {:?}", buffer);
+                    sink(&buffer); // $ hasTaintFlow=address
+                    break; // (or we could wait for more data)
+                }
+                Err(ref e) if e.kind() == std::io::ErrorKind::WouldBlock => {
+                    // wait...
+                    continue;
+                }
+                Err(e) => {
+                    println!("error: {}", e);
+                    break;
+                }
+            }
+        }
+    }
+
+    Ok(())
+}
+
+async fn test_std_to_tokio_tcpstream() -> std::io::Result<()> {
+    // using std::net and tokio::net together to fetch a web page
+    let address = "example.com:80";
+
+    // create the connection
+    println!("connecting to {}...", address);
+    let std_stream = std::net::TcpStream::connect(address)?; // $ Alert[rust/summary/taint-sources]
+
+    // convert to tokio stream
+    std_stream.set_nonblocking(true)?;
+    let mut tokio_stream = tokio::net::TcpStream::from_std(std_stream)?;
+
+    // send request
+    tokio_stream.write_all(b"GET / HTTP/1.1\nHost:example.com\n\n").await?;
+
+    // read response
+    let mut buffer = vec![0; 32 * 1024];
+    let _n = tokio_stream.read(&mut buffer).await?; // $ MISSING: Alert[rust/summary/taint-sources]
+
+    println!("data = {:?}", buffer);
+    sink(&buffer); // $ MISSING: hasTaintFlow
+    sink(buffer[0]); // $ MISSING: hasTaintFlow
+
+    Ok(())
+}
+
+fn test_rustls() -> std::io::Result<()> {
+    let config = rustls::ClientConfig::builder()
+        .with_root_certificates(rustls::RootCertStore::empty())
+        .with_no_client_auth();
+    let server_name = rustls::pki_types::ServerName::try_from("www.example.com").unwrap();
+    let config_arc = std::sync::Arc::new(config);
+    let mut client = rustls::ClientConnection::new(config_arc, server_name).unwrap(); // $ Alert[rust/summary/taint-sources]
+    let mut reader = client.reader(); // We cannot resolve the `reader` call because it comes from `Deref`: https://docs.rs/rustls/latest/rustls/client/struct.ClientConnection.html#deref-methods-ConnectionCommon%3CClientConnectionData%3E
+    sink(&reader); // $ MISSING: hasTaintFlow=config_arc
+
+    {
+        let mut buffer = [0u8; 100];
+        let _bytes = reader.read(&mut buffer)?;
+        sink(&buffer); // $ MISSING: hasTaintFlow=config_arc
+    }
+
+    {
+        let mut buffer = Vec::<u8>::new();
+        let _bytes = reader.read_to_end(&mut buffer)?;
+        sink(&buffer); // $ MISSING: hasTaintFlow=config_arc
+    }
+
+    {
+        let mut buffer = String::new();
+        let _bytes = reader.read_to_string(&mut buffer)?;
+        sink(&buffer); // $ MISSING: hasTaintFlow=config_arc
+    }
+
+    Ok(())
+}
+
+mod futures_rustls {
+    use async_std::net::TcpStream;
+    use async_std::sync::Arc;
+    use futures::io::AsyncBufRead;
+    use futures::io::AsyncBufReadExt;
+    use futures::io::AsyncRead;
+    use futures::io::AsyncReadExt;
+    use futures::StreamExt;
+    use futures_rustls::TlsConnector;
+    use std::io;
+    use std::pin::Pin;
+    use std::task::{Context, Poll};
+    use super::sink;
+
+    pub async fn test_futures_rustls_futures_io() -> io::Result<()> {
+        let url = "www.example.com:443";
+        let tcp = TcpStream::connect(url).await?; // $ Alert[rust/summary/taint-sources]
+        sink(&tcp); // $ hasTaintFlow=url
+        let config = rustls::ClientConfig::builder()
+            .with_root_certificates(rustls::RootCertStore::empty())
+            .with_no_client_auth();
+        let connector = TlsConnector::from(Arc::new(config));
+        let server_name = rustls::pki_types::ServerName::try_from("www.example.com").unwrap();
+        let mut reader = connector.connect(server_name, tcp).await?;
+        sink(&reader); // $ hasTaintFlow=url
+
+        {
+            // using the `AsyncRead` trait (low-level)
+            let mut buffer = [0u8; 64];
+            let mut pinned = Pin::new(&mut reader);
+            sink(&pinned); // $ hasTaintFlow=url
+            let mut cx = Context::from_waker(futures::task::noop_waker_ref());
+            let bytes_read = pinned.poll_read(&mut cx, &mut buffer);
+            if let Poll::Ready(Ok(n)) = bytes_read {
+                sink(&buffer); // $ hasTaintFlow=url
+                sink(&buffer[..n]); // $ hasTaintFlow=url
+            }
+        }
+
+        {
+            // using the `AsyncReadExt::read` extension method (higher-level)
+            let mut buffer1 = [0u8; 64];
+            let bytes_read1 = futures::io::AsyncReadExt::read(&mut reader, &mut buffer1).await?;
+            sink(&buffer1[..bytes_read1]); // $ hasTaintFlow=url
+
+            let mut buffer2 = [0u8; 64];
+            let bytes_read2 = reader.read(&mut buffer2).await?;
+
+            sink(&buffer2[..bytes_read2]); // $ hasTaintFlow=url
+        }
+
+        let mut reader2 = futures::io::BufReader::new(reader);
+        sink(&reader2); // $ hasTaintFlow=url
+
+        {
+            // using the `AsyncBufRead` trait (low-level)
+            let mut pinned = Pin::new(&mut reader2);
+            sink(&pinned); // $ hasTaintFlow=url
+            let mut cx = Context::from_waker(futures::task::noop_waker_ref());
+            let buffer = pinned.poll_fill_buf(&mut cx);
+            if let Poll::Ready(Ok(buf)) = buffer {
+                sink(&buffer); // $ hasTaintFlow=url
+                sink(buf); // $ hasTaintFlow=url
+            }
+
+            // using the `AsyncBufRead` trait (alternative syntax)
+            let buffer2 = Pin::new(&mut reader2).poll_fill_buf(&mut cx);
+            match (buffer2) {
+                Poll::Ready(Ok(buf)) => {
+                    sink(&buffer2); // $ hasTaintFlow=url
+                    sink(buf); // $ hasTaintFlow=url
+                }
+                _ => {
+                    // ...
+                }
+            }
+        }
+
+        {
+            // using the `AsyncBufReadExt::fill_buf` extension method (higher-level)
+            let buffer = reader2.fill_buf().await?;
+            sink(buffer); // $ hasTaintFlow=url
+        }
+
+        {
+            // using the `AsyncRead` trait (low-level)
+            let mut buffer = [0u8; 64];
+            let mut pinned = Pin::new(&mut reader2);
+            sink(&pinned); // $ hasTaintFlow=url
+            let mut cx = Context::from_waker(futures::task::noop_waker_ref());
+            let bytes_read = pinned.poll_read(&mut cx, &mut buffer);
+            sink(&buffer); // $ hasTaintFlow=url
+            if let Poll::Ready(Ok(n)) = bytes_read {
+                sink(&buffer[..n]); // $ hasTaintFlow=url
+            }
+        }
+
+        {
+            // using the `AsyncReadExt::read` extension method (higher-level)
+            let mut buffer1 = [0u8; 64];
+            let bytes_read1 = futures::io::AsyncReadExt::read(&mut reader2, &mut buffer1).await?;
+            sink(&buffer1[..bytes_read1]); // $ hasTaintFlow=url
+
+            let mut buffer2 = [0u8; 64];
+            let bytes_read2 = reader2.read(&mut buffer2).await?;
+            sink(&buffer2[..bytes_read2]); // $ hasTaintFlow=url
+        }
+
+        {
+            // using the `AsyncBufRead` trait (low-level)
+            let mut pinned = Pin::new(&mut reader2);
+            sink(&pinned); // $ hasTaintFlow=url
+            let mut cx = Context::from_waker(futures::task::noop_waker_ref());
+            let buffer = pinned.poll_fill_buf(&mut cx);
+            sink(&buffer); // $ hasTaintFlow=url
+            if let Poll::Ready(Ok(buf)) = buffer {
+                sink(buf); // $ hasTaintFlow=url
+            }
+        }
+
+        {
+            // using the `AsyncBufReadExt::fill_buf` extension method (higher-level)
+            let buffer = reader2.fill_buf().await?;
+            sink(buffer); // $ hasTaintFlow=url
+        }
+
+        {
+            // using the `AsyncBufReadExt::read_until` extension method
+            let mut line = Vec::new();
+            let _bytes_read = reader2.read_until(b'\n', &mut line).await?;
+            sink(&line); // $ hasTaintFlow=url
+        }
+
+        {
+            // using the `AsyncBufReadExt::read_line` extension method
+            let mut line = String::new();
+            let _bytes_read = reader2.read_line(&mut line).await?;
+            sink(&line); // $ hasTaintFlow=url
+        }
+
+        {
+            // using the `AsyncBufReadExt::read_to_end` extension method
+            let mut buffer = Vec::with_capacity(1024);
+            let _bytes_read = reader2.read_to_end(&mut buffer).await?;
+            sink(&buffer); // $ hasTaintFlow=url
+        }
+
+        {
+            // using the `AsyncBufReadExt::lines` extension method
+            let mut lines_stream = reader2.lines();
+            sink(lines_stream.next().await.unwrap()); // $ MISSING: hasTaintFlow=url
+            while let Some(line) = lines_stream.next().await {
+                sink(line.unwrap()); // $ MISSING: hasTaintFlow
+            }
+        }
+
+        Ok(())
+    }
+}
+
+#[tokio::main]
+async fn main() -> Result<(), Box<dyn std::error::Error>> {
+    let case = std::env::args().nth(1).unwrap_or(String::from("1")).parse::<i64>().unwrap(); // $ Alert[rust/summary/taint-sources]
+
+    println!("test_reqwest...");
+    match futures::executor::block_on(test_reqwest()) {
+        Ok(_) => println!("complete"),
+        Err(e) => println!("error: {}", e),
+    }
+
+    println!("test_hyper_http...");
+    match futures::executor::block_on(test_hyper_http(case)) {
+        Ok(_) => println!("complete"),
+        Err(e) => println!("error: {}", e),
+    }
+
+    println!("test_std_tcpstream...");
+    match futures::executor::block_on(test_std_tcpstream(case)) {
+        Ok(_) => println!("complete"),
+        Err(e) => println!("error: {}", e),
+    }
+
+    println!("test_tokio_tcpstream...");
+    match futures::executor::block_on(test_tokio_tcpstream(case)) {
+        Ok(_) => println!("complete"),
+        Err(e) => println!("error: {}", e),
+    }
+
+    println!("test_std_to_tokio_tcpstream...");
+    match futures::executor::block_on(test_std_to_tokio_tcpstream()) {
+        Ok(_) => println!("complete"),
+        Err(e) => println!("error: {}", e),
+    }
+
+    println!("test_rustls...");
+    match test_rustls() {
+        Ok(_) => println!("complete"),
+        Err(e) => println!("error: {}", e),
+    }
+
+    println!("test_futures_rustls_futures_io...");
+    match futures::executor::block_on(futures_rustls::test_futures_rustls_futures_io()) {
+        Ok(_) => println!("complete"),
+        Err(e) => println!("error: {}", e),
+    }
+
+    Ok(())
+}
diff --git a/rust/ql/test/library-tests/dataflow/sources/reqwest.rs b/rust/ql/test/library-tests/dataflow/sources/reqwest.rs
deleted file mode 100644
index 3e8f5ef8510..00000000000
--- a/rust/ql/test/library-tests/dataflow/sources/reqwest.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-
-// --- stubs for the "reqwest" library ---
-
-/*
- --- we don't seem to have a way to use this, hence we currently test against the real reqwest library
-#[derive(Debug)]
-pub struct Error { }
-
-pub mod blocking {
-    pub struct Response { }
-    impl Response {
-        pub fn text(self) -> Result<String, super::Error> {
-            Ok("".to_string())
-        }
-    }
-
-    pub fn get<T>(url: T) -> Result<Response, super::Error> {
-        let _url = url;
-
-        Ok(Response {})
-    }
-}
-
-pub struct Response { }
-impl Response {
-    pub async fn text(self) -> Result<String, Error> {
-        Ok("".to_string())
-    }
-}
-
-pub async fn get<T>(url: T) -> Result<Response, Error> {
-    let _url = url;
-
-    Ok(Response {})
-}
-*/
diff --git a/rust/ql/test/library-tests/dataflow/sources/stdin/CONSISTENCY/PathResolutionConsistency.expected b/rust/ql/test/library-tests/dataflow/sources/stdin/CONSISTENCY/PathResolutionConsistency.expected
new file mode 100644
index 00000000000..535b3f339b4
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/sources/stdin/CONSISTENCY/PathResolutionConsistency.expected
@@ -0,0 +1,2 @@
+multipleCallTargets
+| test.rs:31:22:31:72 | ... .read_to_string(...) |
diff --git a/rust/ql/test/library-tests/dataflow/sources/stdin/Cargo.lock b/rust/ql/test/library-tests/dataflow/sources/stdin/Cargo.lock
new file mode 100644
index 00000000000..e65fc751707
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/sources/stdin/Cargo.lock
@@ -0,0 +1,390 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "bitflags"
+version = "2.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
+
+[[package]]
+name = "bytes"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
+
+[[package]]
+name = "futures"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
+
+[[package]]
+name = "futures-executor"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-io"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
+
+[[package]]
+name = "futures-macro"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
+
+[[package]]
+name = "futures-task"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
+
+[[package]]
+name = "futures-util"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-macro",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.177"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
+
+[[package]]
+name = "lock_api"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
+dependencies = [
+ "scopeguard",
+]
+
+[[package]]
+name = "memchr"
+version = "2.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
+
+[[package]]
+name = "mio"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69d83b0086dc8ecf3ce9ae2874b2d1290252e2a30720bea58a5c6639b0092873"
+dependencies = [
+ "libc",
+ "wasi",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.12.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a"
+dependencies = [
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "windows-link",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.101"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
+dependencies = [
+ "bitflags",
+]
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2a4719bff48cee6b39d12c020eeb490953ad2443b7055bd0b21fca26bd8c28b"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "slab"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
+
+[[package]]
+name = "smallvec"
+version = "1.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
+
+[[package]]
+name = "socket2"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881"
+dependencies = [
+ "libc",
+ "windows-sys 0.60.2",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.107"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a26dbd934e5451d21ef060c018dae56fc073894c5a7896f882928a76e6d081b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "test"
+version = "0.0.1"
+dependencies = [
+ "bytes",
+ "futures",
+ "tokio",
+]
+
+[[package]]
+name = "tokio"
+version = "1.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408"
+dependencies = [
+ "bytes",
+ "libc",
+ "mio",
+ "parking_lot",
+ "pin-project-lite",
+ "signal-hook-registry",
+ "socket2",
+ "tokio-macros",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "462eeb75aeb73aea900253ce739c8e18a67423fadf006037cd3ff27e82748a06"
+
+[[package]]
+name = "wasi"
+version = "0.11.1+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
+
+[[package]]
+name = "windows-link"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
+
+[[package]]
+name = "windows-sys"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.61.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
+dependencies = [
+ "windows-link",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.53.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
+dependencies = [
+ "windows-link",
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
diff --git a/rust/ql/test/library-tests/dataflow/sources/stdin/InlineFlow.expected b/rust/ql/test/library-tests/dataflow/sources/stdin/InlineFlow.expected
new file mode 100644
index 00000000000..5e0e79e5e5d
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/sources/stdin/InlineFlow.expected
@@ -0,0 +1,484 @@
+models
+| 1 | Source: std::io::stdio::stdin; ReturnValue; stdin |
+| 2 | Source: tokio::io::stdin::stdin; ReturnValue; stdin |
+| 3 | Summary: <_ as core::iter::traits::iterator::Iterator>::next; Argument[self].Element; ReturnValue.Field[core::option::Option::Some(0)].Field[core::result::Result::Ok(0)]; value |
+| 4 | Summary: <_ as std::io::BufRead>::fill_buf; Argument[self]; ReturnValue.Field[core::result::Result::Ok(0)]; taint |
+| 5 | Summary: <_ as std::io::BufRead>::lines; Argument[self]; ReturnValue; taint |
+| 6 | Summary: <_ as std::io::BufRead>::read_line; Argument[self]; Argument[0].Reference; taint |
+| 7 | Summary: <_ as std::io::BufRead>::read_until; Argument[self]; Argument[1].Reference; taint |
+| 8 | Summary: <_ as std::io::BufRead>::split; Argument[self]; ReturnValue; taint |
+| 9 | Summary: <_ as std::io::Read>::bytes; Argument[self]; ReturnValue; taint |
+| 10 | Summary: <_ as std::io::Read>::read; Argument[self]; Argument[0].Reference; taint |
+| 11 | Summary: <_ as std::io::Read>::read_exact; Argument[self]; Argument[0].Reference; taint |
+| 12 | Summary: <_ as std::io::Read>::read_to_end; Argument[self]; Argument[0].Reference; taint |
+| 13 | Summary: <_ as std::io::Read>::read_to_string; Argument[self]; Argument[0].Reference; taint |
+| 14 | Summary: <_ as tokio::io::util::async_buf_read_ext::AsyncBufReadExt>::fill_buf; Argument[self]; ReturnValue.Future.Field[core::result::Result::Ok(0)]; taint |
+| 15 | Summary: <_ as tokio::io::util::async_buf_read_ext::AsyncBufReadExt>::lines; Argument[self]; ReturnValue; taint |
+| 16 | Summary: <_ as tokio::io::util::async_buf_read_ext::AsyncBufReadExt>::read_line; Argument[self]; Argument[0].Reference; taint |
+| 17 | Summary: <_ as tokio::io::util::async_buf_read_ext::AsyncBufReadExt>::read_until; Argument[self]; Argument[1].Reference; taint |
+| 18 | Summary: <_ as tokio::io::util::async_buf_read_ext::AsyncBufReadExt>::split; Argument[self]; ReturnValue; taint |
+| 19 | Summary: <_ as tokio::io::util::async_read_ext::AsyncReadExt>::read; Argument[self]; Argument[0].Reference; taint |
+| 20 | Summary: <_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_buf; Argument[self]; Argument[0].Reference; taint |
+| 21 | Summary: <_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_exact; Argument[self]; Argument[0].Reference; taint |
+| 22 | Summary: <_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_f32; Argument[self]; ReturnValue.Future.Field[core::result::Result::Ok(0)]; taint |
+| 23 | Summary: <_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_i16; Argument[self]; ReturnValue.Future.Field[core::result::Result::Ok(0)]; taint |
+| 24 | Summary: <_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_i64_le; Argument[self]; ReturnValue.Future.Field[core::result::Result::Ok(0)]; taint |
+| 25 | Summary: <_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_to_end; Argument[self]; Argument[0].Reference; taint |
+| 26 | Summary: <_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_to_string; Argument[self]; Argument[0].Reference; taint |
+| 27 | Summary: <_ as tokio::io::util::async_read_ext::AsyncReadExt>::read_u8; Argument[self]; ReturnValue.Future.Field[core::result::Result::Ok(0)]; taint |
+| 28 | Summary: <core::option::Option>::unwrap; Argument[self].Field[core::option::Option::Some(0)]; ReturnValue; value |
+| 29 | Summary: <core::result::Result>::unwrap; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
+| 30 | Summary: <std::io::buffered::bufreader::BufReader>::buffer; Argument[self]; ReturnValue; taint |
+| 31 | Summary: <std::io::buffered::bufreader::BufReader>::new; Argument[0]; ReturnValue; taint |
+| 32 | Summary: <std::io::stdio::Stdin as std::io::Read>::read; Argument[self]; Argument[0]; taint |
+| 33 | Summary: <std::io::stdio::Stdin as std::io::Read>::read_exact; Argument[self]; Argument[0]; taint |
+| 34 | Summary: <std::io::stdio::Stdin as std::io::Read>::read_to_string; Argument[self]; Argument[0]; taint |
+| 35 | Summary: <std::io::stdio::Stdin>::lock; Argument[self]; ReturnValue; taint |
+| 36 | Summary: <tokio::io::util::buf_reader::BufReader>::buffer; Argument[self]; ReturnValue; taint |
+| 37 | Summary: <tokio::io::util::buf_reader::BufReader>::new; Argument[0]; ReturnValue; taint |
+| 38 | Summary: <tokio::io::util::lines::Lines>::next_line; Argument[self]; ReturnValue.Future.Field[core::result::Result::Ok(0)].Field[core::option::Option::Some(0)]; taint |
+| 39 | Summary: <tokio::io::util::split::Split>::next_segment; Argument[self]; ReturnValue.Future.Field[core::result::Result::Ok(0)].Field[core::option::Option::Some(0)]; taint |
+edges
+| test.rs:13:22:13:35 | ...::stdin | test.rs:13:22:13:37 | ...::stdin(...) | provenance | Src:MaD:1 MaD:1 |
+| test.rs:13:22:13:37 | ...::stdin(...) | test.rs:13:44:13:54 | [post] &mut buffer | provenance | MaD:32 |
+| test.rs:13:22:13:37 | ...::stdin(...) | test.rs:13:44:13:54 | [post] &mut buffer [&ref] | provenance | MaD:10 |
+| test.rs:13:44:13:54 | [post] &mut buffer | test.rs:14:15:14:20 | buffer | provenance |  |
+| test.rs:13:44:13:54 | [post] &mut buffer [&ref] | test.rs:13:49:13:54 | [post] buffer | provenance |  |
+| test.rs:13:49:13:54 | [post] buffer | test.rs:14:15:14:20 | buffer | provenance |  |
+| test.rs:14:15:14:20 | buffer | test.rs:14:14:14:20 | &buffer | provenance |  |
+| test.rs:19:22:19:35 | ...::stdin | test.rs:19:22:19:37 | ...::stdin(...) | provenance | Src:MaD:1 MaD:1 |
+| test.rs:19:22:19:37 | ...::stdin(...) | test.rs:19:51:19:61 | [post] &mut buffer [&ref] | provenance | MaD:12 |
+| test.rs:19:51:19:61 | [post] &mut buffer [&ref] | test.rs:19:56:19:61 | [post] buffer | provenance |  |
+| test.rs:19:56:19:61 | [post] buffer | test.rs:20:15:20:20 | buffer | provenance |  |
+| test.rs:20:15:20:20 | buffer | test.rs:20:14:20:20 | &buffer | provenance |  |
+| test.rs:25:22:25:35 | ...::stdin | test.rs:25:22:25:37 | ...::stdin(...) | provenance | Src:MaD:1 MaD:1 |
+| test.rs:25:22:25:37 | ...::stdin(...) | test.rs:25:54:25:64 | [post] &mut buffer | provenance | MaD:34 |
+| test.rs:25:22:25:37 | ...::stdin(...) | test.rs:25:54:25:64 | [post] &mut buffer [&ref] | provenance | MaD:13 |
+| test.rs:25:54:25:64 | [post] &mut buffer | test.rs:26:15:26:20 | buffer | provenance |  |
+| test.rs:25:54:25:64 | [post] &mut buffer [&ref] | test.rs:25:59:25:64 | [post] buffer | provenance |  |
+| test.rs:25:59:25:64 | [post] buffer | test.rs:26:15:26:20 | buffer | provenance |  |
+| test.rs:26:15:26:20 | buffer | test.rs:26:14:26:20 | &buffer | provenance |  |
+| test.rs:31:22:31:35 | ...::stdin | test.rs:31:22:31:37 | ...::stdin(...) | provenance | Src:MaD:1 MaD:1 |
+| test.rs:31:22:31:37 | ...::stdin(...) | test.rs:31:22:31:44 | ... .lock() | provenance | MaD:35 |
+| test.rs:31:22:31:44 | ... .lock() | test.rs:31:61:31:71 | [post] &mut buffer [&ref] | provenance | MaD:13 |
+| test.rs:31:61:31:71 | [post] &mut buffer [&ref] | test.rs:31:66:31:71 | [post] buffer | provenance |  |
+| test.rs:31:66:31:71 | [post] buffer | test.rs:32:15:32:20 | buffer | provenance |  |
+| test.rs:32:15:32:20 | buffer | test.rs:32:14:32:20 | &buffer | provenance |  |
+| test.rs:37:9:37:22 | ...::stdin | test.rs:37:9:37:24 | ...::stdin(...) | provenance | Src:MaD:1 MaD:1 |
+| test.rs:37:9:37:24 | ...::stdin(...) | test.rs:37:37:37:47 | [post] &mut buffer | provenance | MaD:33 |
+| test.rs:37:9:37:24 | ...::stdin(...) | test.rs:37:37:37:47 | [post] &mut buffer [&ref] | provenance | MaD:11 |
+| test.rs:37:37:37:47 | [post] &mut buffer | test.rs:38:15:38:20 | buffer | provenance |  |
+| test.rs:37:37:37:47 | [post] &mut buffer [&ref] | test.rs:37:42:37:47 | [post] buffer | provenance |  |
+| test.rs:37:42:37:47 | [post] buffer | test.rs:38:15:38:20 | buffer | provenance |  |
+| test.rs:38:15:38:20 | buffer | test.rs:38:14:38:20 | &buffer | provenance |  |
+| test.rs:41:17:41:30 | ...::stdin | test.rs:41:17:41:32 | ...::stdin(...) | provenance | Src:MaD:1 MaD:1 |
+| test.rs:41:17:41:32 | ...::stdin(...) | test.rs:41:17:41:40 | ... .bytes() | provenance | MaD:9 |
+| test.rs:41:17:41:40 | ... .bytes() | test.rs:42:14:42:17 | byte | provenance |  |
+| test.rs:48:13:48:22 | mut reader | test.rs:49:20:49:36 | reader.fill_buf() [Ok] | provenance | MaD:4 |
+| test.rs:48:26:48:66 | ...::new(...) | test.rs:48:13:48:22 | mut reader | provenance |  |
+| test.rs:48:50:48:63 | ...::stdin | test.rs:48:50:48:65 | ...::stdin(...) | provenance | Src:MaD:1 MaD:1 |
+| test.rs:48:50:48:65 | ...::stdin(...) | test.rs:48:26:48:66 | ...::new(...) | provenance | MaD:31 |
+| test.rs:49:13:49:16 | data | test.rs:50:15:50:18 | data | provenance |  |
+| test.rs:49:20:49:36 | reader.fill_buf() [Ok] | test.rs:49:20:49:37 | TryExpr | provenance |  |
+| test.rs:49:20:49:37 | TryExpr | test.rs:49:13:49:16 | data | provenance |  |
+| test.rs:50:15:50:18 | data | test.rs:50:14:50:18 | &data | provenance |  |
+| test.rs:54:13:54:18 | reader | test.rs:55:20:55:34 | reader.buffer() | provenance | MaD:30 |
+| test.rs:54:22:54:62 | ...::new(...) | test.rs:54:13:54:18 | reader | provenance |  |
+| test.rs:54:46:54:59 | ...::stdin | test.rs:54:46:54:61 | ...::stdin(...) | provenance | Src:MaD:1 MaD:1 |
+| test.rs:54:46:54:61 | ...::stdin(...) | test.rs:54:22:54:62 | ...::new(...) | provenance | MaD:31 |
+| test.rs:55:13:55:16 | data | test.rs:56:15:56:18 | data | provenance |  |
+| test.rs:55:20:55:34 | reader.buffer() | test.rs:55:13:55:16 | data | provenance |  |
+| test.rs:56:15:56:18 | data | test.rs:56:14:56:18 | &data | provenance |  |
+| test.rs:61:13:61:22 | mut reader | test.rs:62:26:62:36 | [post] &mut buffer [&ref] | provenance | MaD:6 |
+| test.rs:61:26:61:66 | ...::new(...) | test.rs:61:13:61:22 | mut reader | provenance |  |
+| test.rs:61:50:61:63 | ...::stdin | test.rs:61:50:61:65 | ...::stdin(...) | provenance | Src:MaD:1 MaD:1 |
+| test.rs:61:50:61:65 | ...::stdin(...) | test.rs:61:26:61:66 | ...::new(...) | provenance | MaD:31 |
+| test.rs:62:26:62:36 | [post] &mut buffer [&ref] | test.rs:62:31:62:36 | [post] buffer | provenance |  |
+| test.rs:62:31:62:36 | [post] buffer | test.rs:63:15:63:20 | buffer | provenance |  |
+| test.rs:63:15:63:20 | buffer | test.rs:63:14:63:20 | &buffer | provenance |  |
+| test.rs:68:13:68:22 | mut reader | test.rs:69:33:69:43 | [post] &mut buffer [&ref] | provenance | MaD:7 |
+| test.rs:68:26:68:66 | ...::new(...) | test.rs:68:13:68:22 | mut reader | provenance |  |
+| test.rs:68:50:68:63 | ...::stdin | test.rs:68:50:68:65 | ...::stdin(...) | provenance | Src:MaD:1 MaD:1 |
+| test.rs:68:50:68:65 | ...::stdin(...) | test.rs:68:26:68:66 | ...::new(...) | provenance | MaD:31 |
+| test.rs:69:33:69:43 | [post] &mut buffer [&ref] | test.rs:69:38:69:43 | [post] buffer | provenance |  |
+| test.rs:69:38:69:43 | [post] buffer | test.rs:70:15:70:20 | buffer | provenance |  |
+| test.rs:69:38:69:43 | [post] buffer | test.rs:71:14:71:22 | buffer[0] | provenance |  |
+| test.rs:70:15:70:20 | buffer | test.rs:70:14:70:20 | &buffer | provenance |  |
+| test.rs:75:13:75:28 | mut reader_split | test.rs:76:14:76:32 | reader_split.next() [Some, Ok] | provenance | MaD:3 |
+| test.rs:75:13:75:28 | mut reader_split | test.rs:77:33:77:51 | reader_split.next() [Some, Ok] | provenance | MaD:3 |
+| test.rs:75:32:75:72 | ...::new(...) | test.rs:75:32:75:84 | ... .split(...) | provenance | MaD:8 |
+| test.rs:75:32:75:84 | ... .split(...) | test.rs:75:13:75:28 | mut reader_split | provenance |  |
+| test.rs:75:56:75:69 | ...::stdin | test.rs:75:56:75:71 | ...::stdin(...) | provenance | Src:MaD:1 MaD:1 |
+| test.rs:75:56:75:71 | ...::stdin(...) | test.rs:75:32:75:72 | ...::new(...) | provenance | MaD:31 |
+| test.rs:76:14:76:32 | reader_split.next() [Some, Ok] | test.rs:76:14:76:41 | ... .unwrap() [Ok] | provenance | MaD:28 |
+| test.rs:76:14:76:41 | ... .unwrap() [Ok] | test.rs:76:14:76:50 | ... .unwrap() | provenance | MaD:29 |
+| test.rs:77:19:77:29 | Some(...) [Some, Ok] | test.rs:77:24:77:28 | chunk [Ok] | provenance |  |
+| test.rs:77:24:77:28 | chunk [Ok] | test.rs:78:18:78:31 | chunk.unwrap() | provenance | MaD:29 |
+| test.rs:77:33:77:51 | reader_split.next() [Some, Ok] | test.rs:77:19:77:29 | Some(...) [Some, Ok] | provenance |  |
+| test.rs:83:13:83:18 | reader | test.rs:84:21:84:34 | reader.lines() | provenance | MaD:5 |
+| test.rs:83:22:83:62 | ...::new(...) | test.rs:83:13:83:18 | reader | provenance |  |
+| test.rs:83:46:83:59 | ...::stdin | test.rs:83:46:83:61 | ...::stdin(...) | provenance | Src:MaD:1 MaD:1 |
+| test.rs:83:46:83:61 | ...::stdin(...) | test.rs:83:22:83:62 | ...::new(...) | provenance | MaD:31 |
+| test.rs:84:21:84:34 | reader.lines() | test.rs:85:18:85:21 | line | provenance |  |
+| test.rs:109:13:109:21 | mut stdin | test.rs:111:33:111:43 | [post] &mut buffer [&ref] | provenance | MaD:19 |
+| test.rs:109:25:109:40 | ...::stdin | test.rs:109:25:109:42 | ...::stdin(...) | provenance | Src:MaD:2 MaD:2 |
+| test.rs:109:25:109:42 | ...::stdin(...) | test.rs:109:13:109:21 | mut stdin | provenance |  |
+| test.rs:111:33:111:43 | [post] &mut buffer [&ref] | test.rs:111:38:111:43 | [post] buffer | provenance |  |
+| test.rs:111:38:111:43 | [post] buffer | test.rs:112:15:112:20 | buffer | provenance |  |
+| test.rs:112:15:112:20 | buffer | test.rs:112:14:112:20 | &buffer | provenance |  |
+| test.rs:116:13:116:21 | mut stdin | test.rs:118:40:118:50 | [post] &mut buffer [&ref] | provenance | MaD:25 |
+| test.rs:116:25:116:40 | ...::stdin | test.rs:116:25:116:42 | ...::stdin(...) | provenance | Src:MaD:2 MaD:2 |
+| test.rs:116:25:116:42 | ...::stdin(...) | test.rs:116:13:116:21 | mut stdin | provenance |  |
+| test.rs:118:40:118:50 | [post] &mut buffer [&ref] | test.rs:118:45:118:50 | [post] buffer | provenance |  |
+| test.rs:118:45:118:50 | [post] buffer | test.rs:119:15:119:20 | buffer | provenance |  |
+| test.rs:119:15:119:20 | buffer | test.rs:119:14:119:20 | &buffer | provenance |  |
+| test.rs:123:13:123:21 | mut stdin | test.rs:125:43:125:53 | [post] &mut buffer [&ref] | provenance | MaD:26 |
+| test.rs:123:25:123:40 | ...::stdin | test.rs:123:25:123:42 | ...::stdin(...) | provenance | Src:MaD:2 MaD:2 |
+| test.rs:123:25:123:42 | ...::stdin(...) | test.rs:123:13:123:21 | mut stdin | provenance |  |
+| test.rs:125:43:125:53 | [post] &mut buffer [&ref] | test.rs:125:48:125:53 | [post] buffer | provenance |  |
+| test.rs:125:48:125:53 | [post] buffer | test.rs:126:15:126:20 | buffer | provenance |  |
+| test.rs:126:15:126:20 | buffer | test.rs:126:14:126:20 | &buffer | provenance |  |
+| test.rs:130:13:130:21 | mut stdin | test.rs:132:26:132:36 | [post] &mut buffer [&ref] | provenance | MaD:21 |
+| test.rs:130:25:130:40 | ...::stdin | test.rs:130:25:130:42 | ...::stdin(...) | provenance | Src:MaD:2 MaD:2 |
+| test.rs:130:25:130:42 | ...::stdin(...) | test.rs:130:13:130:21 | mut stdin | provenance |  |
+| test.rs:132:26:132:36 | [post] &mut buffer [&ref] | test.rs:132:31:132:36 | [post] buffer | provenance |  |
+| test.rs:132:31:132:36 | [post] buffer | test.rs:133:15:133:20 | buffer | provenance |  |
+| test.rs:133:15:133:20 | buffer | test.rs:133:14:133:20 | &buffer | provenance |  |
+| test.rs:137:13:137:21 | mut stdin | test.rs:138:18:138:32 | stdin.read_u8() [future, Ok] | provenance | MaD:27 |
+| test.rs:137:13:137:21 | mut stdin | test.rs:139:18:139:33 | stdin.read_i16() [future, Ok] | provenance | MaD:23 |
+| test.rs:137:13:137:21 | mut stdin | test.rs:140:18:140:33 | stdin.read_f32() [future, Ok] | provenance | MaD:22 |
+| test.rs:137:13:137:21 | mut stdin | test.rs:141:18:141:36 | stdin.read_i64_le() [future, Ok] | provenance | MaD:24 |
+| test.rs:137:25:137:40 | ...::stdin | test.rs:137:25:137:42 | ...::stdin(...) | provenance | Src:MaD:2 MaD:2 |
+| test.rs:137:25:137:42 | ...::stdin(...) | test.rs:137:13:137:21 | mut stdin | provenance |  |
+| test.rs:138:13:138:14 | v1 | test.rs:142:14:142:15 | v1 | provenance |  |
+| test.rs:138:18:138:32 | stdin.read_u8() [future, Ok] | test.rs:138:18:138:38 | await ... [Ok] | provenance |  |
+| test.rs:138:18:138:38 | await ... [Ok] | test.rs:138:18:138:39 | TryExpr | provenance |  |
+| test.rs:138:18:138:39 | TryExpr | test.rs:138:13:138:14 | v1 | provenance |  |
+| test.rs:139:13:139:14 | v2 | test.rs:143:14:143:15 | v2 | provenance |  |
+| test.rs:139:18:139:33 | stdin.read_i16() [future, Ok] | test.rs:139:18:139:39 | await ... [Ok] | provenance |  |
+| test.rs:139:18:139:39 | await ... [Ok] | test.rs:139:18:139:40 | TryExpr | provenance |  |
+| test.rs:139:18:139:40 | TryExpr | test.rs:139:13:139:14 | v2 | provenance |  |
+| test.rs:140:13:140:14 | v3 | test.rs:144:14:144:15 | v3 | provenance |  |
+| test.rs:140:18:140:33 | stdin.read_f32() [future, Ok] | test.rs:140:18:140:39 | await ... [Ok] | provenance |  |
+| test.rs:140:18:140:39 | await ... [Ok] | test.rs:140:18:140:40 | TryExpr | provenance |  |
+| test.rs:140:18:140:40 | TryExpr | test.rs:140:13:140:14 | v3 | provenance |  |
+| test.rs:141:13:141:14 | v4 | test.rs:145:14:145:15 | v4 | provenance |  |
+| test.rs:141:18:141:36 | stdin.read_i64_le() [future, Ok] | test.rs:141:18:141:42 | await ... [Ok] | provenance |  |
+| test.rs:141:18:141:42 | await ... [Ok] | test.rs:141:18:141:43 | TryExpr | provenance |  |
+| test.rs:141:18:141:43 | TryExpr | test.rs:141:13:141:14 | v4 | provenance |  |
+| test.rs:149:13:149:21 | mut stdin | test.rs:151:24:151:34 | [post] &mut buffer [&ref] | provenance | MaD:20 |
+| test.rs:149:25:149:40 | ...::stdin | test.rs:149:25:149:42 | ...::stdin(...) | provenance | Src:MaD:2 MaD:2 |
+| test.rs:149:25:149:42 | ...::stdin(...) | test.rs:149:13:149:21 | mut stdin | provenance |  |
+| test.rs:151:24:151:34 | [post] &mut buffer [&ref] | test.rs:151:29:151:34 | [post] buffer | provenance |  |
+| test.rs:151:29:151:34 | [post] buffer | test.rs:152:15:152:20 | buffer | provenance |  |
+| test.rs:152:15:152:20 | buffer | test.rs:152:14:152:20 | &buffer | provenance |  |
+| test.rs:158:13:158:22 | mut reader | test.rs:159:20:159:36 | reader.fill_buf() [future, Ok] | provenance | MaD:14 |
+| test.rs:158:26:158:70 | ...::new(...) | test.rs:158:13:158:22 | mut reader | provenance |  |
+| test.rs:158:52:158:67 | ...::stdin | test.rs:158:52:158:69 | ...::stdin(...) | provenance | Src:MaD:2 MaD:2 |
+| test.rs:158:52:158:69 | ...::stdin(...) | test.rs:158:26:158:70 | ...::new(...) | provenance | MaD:37 |
+| test.rs:159:13:159:16 | data | test.rs:160:15:160:18 | data | provenance |  |
+| test.rs:159:20:159:36 | reader.fill_buf() [future, Ok] | test.rs:159:20:159:42 | await ... [Ok] | provenance |  |
+| test.rs:159:20:159:42 | await ... [Ok] | test.rs:159:20:159:43 | TryExpr | provenance |  |
+| test.rs:159:20:159:43 | TryExpr | test.rs:159:13:159:16 | data | provenance |  |
+| test.rs:160:15:160:18 | data | test.rs:160:14:160:18 | &data | provenance |  |
+| test.rs:164:13:164:18 | reader | test.rs:165:20:165:34 | reader.buffer() | provenance | MaD:36 |
+| test.rs:164:22:164:66 | ...::new(...) | test.rs:164:13:164:18 | reader | provenance |  |
+| test.rs:164:48:164:63 | ...::stdin | test.rs:164:48:164:65 | ...::stdin(...) | provenance | Src:MaD:2 MaD:2 |
+| test.rs:164:48:164:65 | ...::stdin(...) | test.rs:164:22:164:66 | ...::new(...) | provenance | MaD:37 |
+| test.rs:165:13:165:16 | data | test.rs:166:15:166:18 | data | provenance |  |
+| test.rs:165:20:165:34 | reader.buffer() | test.rs:165:13:165:16 | data | provenance |  |
+| test.rs:166:15:166:18 | data | test.rs:166:14:166:18 | &data | provenance |  |
+| test.rs:171:13:171:22 | mut reader | test.rs:172:26:172:36 | [post] &mut buffer [&ref] | provenance | MaD:16 |
+| test.rs:171:26:171:70 | ...::new(...) | test.rs:171:13:171:22 | mut reader | provenance |  |
+| test.rs:171:52:171:67 | ...::stdin | test.rs:171:52:171:69 | ...::stdin(...) | provenance | Src:MaD:2 MaD:2 |
+| test.rs:171:52:171:69 | ...::stdin(...) | test.rs:171:26:171:70 | ...::new(...) | provenance | MaD:37 |
+| test.rs:172:26:172:36 | [post] &mut buffer [&ref] | test.rs:172:31:172:36 | [post] buffer | provenance |  |
+| test.rs:172:31:172:36 | [post] buffer | test.rs:173:15:173:20 | buffer | provenance |  |
+| test.rs:173:15:173:20 | buffer | test.rs:173:14:173:20 | &buffer | provenance |  |
+| test.rs:178:13:178:22 | mut reader | test.rs:179:33:179:43 | [post] &mut buffer [&ref] | provenance | MaD:17 |
+| test.rs:178:26:178:70 | ...::new(...) | test.rs:178:13:178:22 | mut reader | provenance |  |
+| test.rs:178:52:178:67 | ...::stdin | test.rs:178:52:178:69 | ...::stdin(...) | provenance | Src:MaD:2 MaD:2 |
+| test.rs:178:52:178:69 | ...::stdin(...) | test.rs:178:26:178:70 | ...::new(...) | provenance | MaD:37 |
+| test.rs:179:33:179:43 | [post] &mut buffer [&ref] | test.rs:179:38:179:43 | [post] buffer | provenance |  |
+| test.rs:179:38:179:43 | [post] buffer | test.rs:180:15:180:20 | buffer | provenance |  |
+| test.rs:179:38:179:43 | [post] buffer | test.rs:181:14:181:22 | buffer[0] | provenance |  |
+| test.rs:180:15:180:20 | buffer | test.rs:180:14:180:20 | &buffer | provenance |  |
+| test.rs:185:13:185:28 | mut reader_split | test.rs:186:14:186:40 | reader_split.next_segment() [future, Ok, Some] | provenance | MaD:39 |
+| test.rs:185:13:185:28 | mut reader_split | test.rs:187:33:187:59 | reader_split.next_segment() [future, Ok, Some] | provenance | MaD:39 |
+| test.rs:185:32:185:76 | ...::new(...) | test.rs:185:32:185:88 | ... .split(...) | provenance | MaD:18 |
+| test.rs:185:32:185:88 | ... .split(...) | test.rs:185:13:185:28 | mut reader_split | provenance |  |
+| test.rs:185:58:185:73 | ...::stdin | test.rs:185:58:185:75 | ...::stdin(...) | provenance | Src:MaD:2 MaD:2 |
+| test.rs:185:58:185:75 | ...::stdin(...) | test.rs:185:32:185:76 | ...::new(...) | provenance | MaD:37 |
+| test.rs:186:14:186:40 | reader_split.next_segment() [future, Ok, Some] | test.rs:186:14:186:46 | await ... [Ok, Some] | provenance |  |
+| test.rs:186:14:186:46 | await ... [Ok, Some] | test.rs:186:14:186:47 | TryExpr [Some] | provenance |  |
+| test.rs:186:14:186:47 | TryExpr [Some] | test.rs:186:14:186:56 | ... .unwrap() | provenance | MaD:28 |
+| test.rs:187:19:187:29 | Some(...) [Some] | test.rs:187:24:187:28 | chunk | provenance |  |
+| test.rs:187:24:187:28 | chunk | test.rs:188:18:188:22 | chunk | provenance |  |
+| test.rs:187:33:187:59 | reader_split.next_segment() [future, Ok, Some] | test.rs:187:33:187:65 | await ... [Ok, Some] | provenance |  |
+| test.rs:187:33:187:65 | await ... [Ok, Some] | test.rs:187:33:187:66 | TryExpr [Some] | provenance |  |
+| test.rs:187:33:187:66 | TryExpr [Some] | test.rs:187:19:187:29 | Some(...) [Some] | provenance |  |
+| test.rs:193:13:193:18 | reader | test.rs:194:25:194:38 | reader.lines() | provenance | MaD:15 |
+| test.rs:193:22:193:66 | ...::new(...) | test.rs:193:13:193:18 | reader | provenance |  |
+| test.rs:193:48:193:63 | ...::stdin | test.rs:193:48:193:65 | ...::stdin(...) | provenance | Src:MaD:2 MaD:2 |
+| test.rs:193:48:193:65 | ...::stdin(...) | test.rs:193:22:193:66 | ...::new(...) | provenance | MaD:37 |
+| test.rs:194:13:194:21 | mut lines | test.rs:195:14:195:30 | lines.next_line() [future, Ok, Some] | provenance | MaD:38 |
+| test.rs:194:13:194:21 | mut lines | test.rs:196:32:196:48 | lines.next_line() [future, Ok, Some] | provenance | MaD:38 |
+| test.rs:194:25:194:38 | reader.lines() | test.rs:194:13:194:21 | mut lines | provenance |  |
+| test.rs:195:14:195:30 | lines.next_line() [future, Ok, Some] | test.rs:195:14:195:36 | await ... [Ok, Some] | provenance |  |
+| test.rs:195:14:195:36 | await ... [Ok, Some] | test.rs:195:14:195:37 | TryExpr [Some] | provenance |  |
+| test.rs:195:14:195:37 | TryExpr [Some] | test.rs:195:14:195:46 | ... .unwrap() | provenance | MaD:28 |
+| test.rs:196:19:196:28 | Some(...) [Some] | test.rs:196:24:196:27 | line | provenance |  |
+| test.rs:196:24:196:27 | line | test.rs:197:18:197:21 | line | provenance |  |
+| test.rs:196:32:196:48 | lines.next_line() [future, Ok, Some] | test.rs:196:32:196:54 | await ... [Ok, Some] | provenance |  |
+| test.rs:196:32:196:54 | await ... [Ok, Some] | test.rs:196:32:196:55 | TryExpr [Some] | provenance |  |
+| test.rs:196:32:196:55 | TryExpr [Some] | test.rs:196:19:196:28 | Some(...) [Some] | provenance |  |
+nodes
+| test.rs:13:22:13:35 | ...::stdin | semmle.label | ...::stdin |
+| test.rs:13:22:13:37 | ...::stdin(...) | semmle.label | ...::stdin(...) |
+| test.rs:13:44:13:54 | [post] &mut buffer | semmle.label | [post] &mut buffer |
+| test.rs:13:44:13:54 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
+| test.rs:13:49:13:54 | [post] buffer | semmle.label | [post] buffer |
+| test.rs:14:14:14:20 | &buffer | semmle.label | &buffer |
+| test.rs:14:15:14:20 | buffer | semmle.label | buffer |
+| test.rs:19:22:19:35 | ...::stdin | semmle.label | ...::stdin |
+| test.rs:19:22:19:37 | ...::stdin(...) | semmle.label | ...::stdin(...) |
+| test.rs:19:51:19:61 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
+| test.rs:19:56:19:61 | [post] buffer | semmle.label | [post] buffer |
+| test.rs:20:14:20:20 | &buffer | semmle.label | &buffer |
+| test.rs:20:15:20:20 | buffer | semmle.label | buffer |
+| test.rs:25:22:25:35 | ...::stdin | semmle.label | ...::stdin |
+| test.rs:25:22:25:37 | ...::stdin(...) | semmle.label | ...::stdin(...) |
+| test.rs:25:54:25:64 | [post] &mut buffer | semmle.label | [post] &mut buffer |
+| test.rs:25:54:25:64 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
+| test.rs:25:59:25:64 | [post] buffer | semmle.label | [post] buffer |
+| test.rs:26:14:26:20 | &buffer | semmle.label | &buffer |
+| test.rs:26:15:26:20 | buffer | semmle.label | buffer |
+| test.rs:31:22:31:35 | ...::stdin | semmle.label | ...::stdin |
+| test.rs:31:22:31:37 | ...::stdin(...) | semmle.label | ...::stdin(...) |
+| test.rs:31:22:31:44 | ... .lock() | semmle.label | ... .lock() |
+| test.rs:31:61:31:71 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
+| test.rs:31:66:31:71 | [post] buffer | semmle.label | [post] buffer |
+| test.rs:32:14:32:20 | &buffer | semmle.label | &buffer |
+| test.rs:32:15:32:20 | buffer | semmle.label | buffer |
+| test.rs:37:9:37:22 | ...::stdin | semmle.label | ...::stdin |
+| test.rs:37:9:37:24 | ...::stdin(...) | semmle.label | ...::stdin(...) |
+| test.rs:37:37:37:47 | [post] &mut buffer | semmle.label | [post] &mut buffer |
+| test.rs:37:37:37:47 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
+| test.rs:37:42:37:47 | [post] buffer | semmle.label | [post] buffer |
+| test.rs:38:14:38:20 | &buffer | semmle.label | &buffer |
+| test.rs:38:15:38:20 | buffer | semmle.label | buffer |
+| test.rs:41:17:41:30 | ...::stdin | semmle.label | ...::stdin |
+| test.rs:41:17:41:32 | ...::stdin(...) | semmle.label | ...::stdin(...) |
+| test.rs:41:17:41:40 | ... .bytes() | semmle.label | ... .bytes() |
+| test.rs:42:14:42:17 | byte | semmle.label | byte |
+| test.rs:48:13:48:22 | mut reader | semmle.label | mut reader |
+| test.rs:48:26:48:66 | ...::new(...) | semmle.label | ...::new(...) |
+| test.rs:48:50:48:63 | ...::stdin | semmle.label | ...::stdin |
+| test.rs:48:50:48:65 | ...::stdin(...) | semmle.label | ...::stdin(...) |
+| test.rs:49:13:49:16 | data | semmle.label | data |
+| test.rs:49:20:49:36 | reader.fill_buf() [Ok] | semmle.label | reader.fill_buf() [Ok] |
+| test.rs:49:20:49:37 | TryExpr | semmle.label | TryExpr |
+| test.rs:50:14:50:18 | &data | semmle.label | &data |
+| test.rs:50:15:50:18 | data | semmle.label | data |
+| test.rs:54:13:54:18 | reader | semmle.label | reader |
+| test.rs:54:22:54:62 | ...::new(...) | semmle.label | ...::new(...) |
+| test.rs:54:46:54:59 | ...::stdin | semmle.label | ...::stdin |
+| test.rs:54:46:54:61 | ...::stdin(...) | semmle.label | ...::stdin(...) |
+| test.rs:55:13:55:16 | data | semmle.label | data |
+| test.rs:55:20:55:34 | reader.buffer() | semmle.label | reader.buffer() |
+| test.rs:56:14:56:18 | &data | semmle.label | &data |
+| test.rs:56:15:56:18 | data | semmle.label | data |
+| test.rs:61:13:61:22 | mut reader | semmle.label | mut reader |
+| test.rs:61:26:61:66 | ...::new(...) | semmle.label | ...::new(...) |
+| test.rs:61:50:61:63 | ...::stdin | semmle.label | ...::stdin |
+| test.rs:61:50:61:65 | ...::stdin(...) | semmle.label | ...::stdin(...) |
+| test.rs:62:26:62:36 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
+| test.rs:62:31:62:36 | [post] buffer | semmle.label | [post] buffer |
+| test.rs:63:14:63:20 | &buffer | semmle.label | &buffer |
+| test.rs:63:15:63:20 | buffer | semmle.label | buffer |
+| test.rs:68:13:68:22 | mut reader | semmle.label | mut reader |
+| test.rs:68:26:68:66 | ...::new(...) | semmle.label | ...::new(...) |
+| test.rs:68:50:68:63 | ...::stdin | semmle.label | ...::stdin |
+| test.rs:68:50:68:65 | ...::stdin(...) | semmle.label | ...::stdin(...) |
+| test.rs:69:33:69:43 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
+| test.rs:69:38:69:43 | [post] buffer | semmle.label | [post] buffer |
+| test.rs:70:14:70:20 | &buffer | semmle.label | &buffer |
+| test.rs:70:15:70:20 | buffer | semmle.label | buffer |
+| test.rs:71:14:71:22 | buffer[0] | semmle.label | buffer[0] |
+| test.rs:75:13:75:28 | mut reader_split | semmle.label | mut reader_split |
+| test.rs:75:32:75:72 | ...::new(...) | semmle.label | ...::new(...) |
+| test.rs:75:32:75:84 | ... .split(...) | semmle.label | ... .split(...) |
+| test.rs:75:56:75:69 | ...::stdin | semmle.label | ...::stdin |
+| test.rs:75:56:75:71 | ...::stdin(...) | semmle.label | ...::stdin(...) |
+| test.rs:76:14:76:32 | reader_split.next() [Some, Ok] | semmle.label | reader_split.next() [Some, Ok] |
+| test.rs:76:14:76:41 | ... .unwrap() [Ok] | semmle.label | ... .unwrap() [Ok] |
+| test.rs:76:14:76:50 | ... .unwrap() | semmle.label | ... .unwrap() |
+| test.rs:77:19:77:29 | Some(...) [Some, Ok] | semmle.label | Some(...) [Some, Ok] |
+| test.rs:77:24:77:28 | chunk [Ok] | semmle.label | chunk [Ok] |
+| test.rs:77:33:77:51 | reader_split.next() [Some, Ok] | semmle.label | reader_split.next() [Some, Ok] |
+| test.rs:78:18:78:31 | chunk.unwrap() | semmle.label | chunk.unwrap() |
+| test.rs:83:13:83:18 | reader | semmle.label | reader |
+| test.rs:83:22:83:62 | ...::new(...) | semmle.label | ...::new(...) |
+| test.rs:83:46:83:59 | ...::stdin | semmle.label | ...::stdin |
+| test.rs:83:46:83:61 | ...::stdin(...) | semmle.label | ...::stdin(...) |
+| test.rs:84:21:84:34 | reader.lines() | semmle.label | reader.lines() |
+| test.rs:85:18:85:21 | line | semmle.label | line |
+| test.rs:109:13:109:21 | mut stdin | semmle.label | mut stdin |
+| test.rs:109:25:109:40 | ...::stdin | semmle.label | ...::stdin |
+| test.rs:109:25:109:42 | ...::stdin(...) | semmle.label | ...::stdin(...) |
+| test.rs:111:33:111:43 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
+| test.rs:111:38:111:43 | [post] buffer | semmle.label | [post] buffer |
+| test.rs:112:14:112:20 | &buffer | semmle.label | &buffer |
+| test.rs:112:15:112:20 | buffer | semmle.label | buffer |
+| test.rs:116:13:116:21 | mut stdin | semmle.label | mut stdin |
+| test.rs:116:25:116:40 | ...::stdin | semmle.label | ...::stdin |
+| test.rs:116:25:116:42 | ...::stdin(...) | semmle.label | ...::stdin(...) |
+| test.rs:118:40:118:50 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
+| test.rs:118:45:118:50 | [post] buffer | semmle.label | [post] buffer |
+| test.rs:119:14:119:20 | &buffer | semmle.label | &buffer |
+| test.rs:119:15:119:20 | buffer | semmle.label | buffer |
+| test.rs:123:13:123:21 | mut stdin | semmle.label | mut stdin |
+| test.rs:123:25:123:40 | ...::stdin | semmle.label | ...::stdin |
+| test.rs:123:25:123:42 | ...::stdin(...) | semmle.label | ...::stdin(...) |
+| test.rs:125:43:125:53 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
+| test.rs:125:48:125:53 | [post] buffer | semmle.label | [post] buffer |
+| test.rs:126:14:126:20 | &buffer | semmle.label | &buffer |
+| test.rs:126:15:126:20 | buffer | semmle.label | buffer |
+| test.rs:130:13:130:21 | mut stdin | semmle.label | mut stdin |
+| test.rs:130:25:130:40 | ...::stdin | semmle.label | ...::stdin |
+| test.rs:130:25:130:42 | ...::stdin(...) | semmle.label | ...::stdin(...) |
+| test.rs:132:26:132:36 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
+| test.rs:132:31:132:36 | [post] buffer | semmle.label | [post] buffer |
+| test.rs:133:14:133:20 | &buffer | semmle.label | &buffer |
+| test.rs:133:15:133:20 | buffer | semmle.label | buffer |
+| test.rs:137:13:137:21 | mut stdin | semmle.label | mut stdin |
+| test.rs:137:25:137:40 | ...::stdin | semmle.label | ...::stdin |
+| test.rs:137:25:137:42 | ...::stdin(...) | semmle.label | ...::stdin(...) |
+| test.rs:138:13:138:14 | v1 | semmle.label | v1 |
+| test.rs:138:18:138:32 | stdin.read_u8() [future, Ok] | semmle.label | stdin.read_u8() [future, Ok] |
+| test.rs:138:18:138:38 | await ... [Ok] | semmle.label | await ... [Ok] |
+| test.rs:138:18:138:39 | TryExpr | semmle.label | TryExpr |
+| test.rs:139:13:139:14 | v2 | semmle.label | v2 |
+| test.rs:139:18:139:33 | stdin.read_i16() [future, Ok] | semmle.label | stdin.read_i16() [future, Ok] |
+| test.rs:139:18:139:39 | await ... [Ok] | semmle.label | await ... [Ok] |
+| test.rs:139:18:139:40 | TryExpr | semmle.label | TryExpr |
+| test.rs:140:13:140:14 | v3 | semmle.label | v3 |
+| test.rs:140:18:140:33 | stdin.read_f32() [future, Ok] | semmle.label | stdin.read_f32() [future, Ok] |
+| test.rs:140:18:140:39 | await ... [Ok] | semmle.label | await ... [Ok] |
+| test.rs:140:18:140:40 | TryExpr | semmle.label | TryExpr |
+| test.rs:141:13:141:14 | v4 | semmle.label | v4 |
+| test.rs:141:18:141:36 | stdin.read_i64_le() [future, Ok] | semmle.label | stdin.read_i64_le() [future, Ok] |
+| test.rs:141:18:141:42 | await ... [Ok] | semmle.label | await ... [Ok] |
+| test.rs:141:18:141:43 | TryExpr | semmle.label | TryExpr |
+| test.rs:142:14:142:15 | v1 | semmle.label | v1 |
+| test.rs:143:14:143:15 | v2 | semmle.label | v2 |
+| test.rs:144:14:144:15 | v3 | semmle.label | v3 |
+| test.rs:145:14:145:15 | v4 | semmle.label | v4 |
+| test.rs:149:13:149:21 | mut stdin | semmle.label | mut stdin |
+| test.rs:149:25:149:40 | ...::stdin | semmle.label | ...::stdin |
+| test.rs:149:25:149:42 | ...::stdin(...) | semmle.label | ...::stdin(...) |
+| test.rs:151:24:151:34 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
+| test.rs:151:29:151:34 | [post] buffer | semmle.label | [post] buffer |
+| test.rs:152:14:152:20 | &buffer | semmle.label | &buffer |
+| test.rs:152:15:152:20 | buffer | semmle.label | buffer |
+| test.rs:158:13:158:22 | mut reader | semmle.label | mut reader |
+| test.rs:158:26:158:70 | ...::new(...) | semmle.label | ...::new(...) |
+| test.rs:158:52:158:67 | ...::stdin | semmle.label | ...::stdin |
+| test.rs:158:52:158:69 | ...::stdin(...) | semmle.label | ...::stdin(...) |
+| test.rs:159:13:159:16 | data | semmle.label | data |
+| test.rs:159:20:159:36 | reader.fill_buf() [future, Ok] | semmle.label | reader.fill_buf() [future, Ok] |
+| test.rs:159:20:159:42 | await ... [Ok] | semmle.label | await ... [Ok] |
+| test.rs:159:20:159:43 | TryExpr | semmle.label | TryExpr |
+| test.rs:160:14:160:18 | &data | semmle.label | &data |
+| test.rs:160:15:160:18 | data | semmle.label | data |
+| test.rs:164:13:164:18 | reader | semmle.label | reader |
+| test.rs:164:22:164:66 | ...::new(...) | semmle.label | ...::new(...) |
+| test.rs:164:48:164:63 | ...::stdin | semmle.label | ...::stdin |
+| test.rs:164:48:164:65 | ...::stdin(...) | semmle.label | ...::stdin(...) |
+| test.rs:165:13:165:16 | data | semmle.label | data |
+| test.rs:165:20:165:34 | reader.buffer() | semmle.label | reader.buffer() |
+| test.rs:166:14:166:18 | &data | semmle.label | &data |
+| test.rs:166:15:166:18 | data | semmle.label | data |
+| test.rs:171:13:171:22 | mut reader | semmle.label | mut reader |
+| test.rs:171:26:171:70 | ...::new(...) | semmle.label | ...::new(...) |
+| test.rs:171:52:171:67 | ...::stdin | semmle.label | ...::stdin |
+| test.rs:171:52:171:69 | ...::stdin(...) | semmle.label | ...::stdin(...) |
+| test.rs:172:26:172:36 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
+| test.rs:172:31:172:36 | [post] buffer | semmle.label | [post] buffer |
+| test.rs:173:14:173:20 | &buffer | semmle.label | &buffer |
+| test.rs:173:15:173:20 | buffer | semmle.label | buffer |
+| test.rs:178:13:178:22 | mut reader | semmle.label | mut reader |
+| test.rs:178:26:178:70 | ...::new(...) | semmle.label | ...::new(...) |
+| test.rs:178:52:178:67 | ...::stdin | semmle.label | ...::stdin |
+| test.rs:178:52:178:69 | ...::stdin(...) | semmle.label | ...::stdin(...) |
+| test.rs:179:33:179:43 | [post] &mut buffer [&ref] | semmle.label | [post] &mut buffer [&ref] |
+| test.rs:179:38:179:43 | [post] buffer | semmle.label | [post] buffer |
+| test.rs:180:14:180:20 | &buffer | semmle.label | &buffer |
+| test.rs:180:15:180:20 | buffer | semmle.label | buffer |
+| test.rs:181:14:181:22 | buffer[0] | semmle.label | buffer[0] |
+| test.rs:185:13:185:28 | mut reader_split | semmle.label | mut reader_split |
+| test.rs:185:32:185:76 | ...::new(...) | semmle.label | ...::new(...) |
+| test.rs:185:32:185:88 | ... .split(...) | semmle.label | ... .split(...) |
+| test.rs:185:58:185:73 | ...::stdin | semmle.label | ...::stdin |
+| test.rs:185:58:185:75 | ...::stdin(...) | semmle.label | ...::stdin(...) |
+| test.rs:186:14:186:40 | reader_split.next_segment() [future, Ok, Some] | semmle.label | reader_split.next_segment() [future, Ok, Some] |
+| test.rs:186:14:186:46 | await ... [Ok, Some] | semmle.label | await ... [Ok, Some] |
+| test.rs:186:14:186:47 | TryExpr [Some] | semmle.label | TryExpr [Some] |
+| test.rs:186:14:186:56 | ... .unwrap() | semmle.label | ... .unwrap() |
+| test.rs:187:19:187:29 | Some(...) [Some] | semmle.label | Some(...) [Some] |
+| test.rs:187:24:187:28 | chunk | semmle.label | chunk |
+| test.rs:187:33:187:59 | reader_split.next_segment() [future, Ok, Some] | semmle.label | reader_split.next_segment() [future, Ok, Some] |
+| test.rs:187:33:187:65 | await ... [Ok, Some] | semmle.label | await ... [Ok, Some] |
+| test.rs:187:33:187:66 | TryExpr [Some] | semmle.label | TryExpr [Some] |
+| test.rs:188:18:188:22 | chunk | semmle.label | chunk |
+| test.rs:193:13:193:18 | reader | semmle.label | reader |
+| test.rs:193:22:193:66 | ...::new(...) | semmle.label | ...::new(...) |
+| test.rs:193:48:193:63 | ...::stdin | semmle.label | ...::stdin |
+| test.rs:193:48:193:65 | ...::stdin(...) | semmle.label | ...::stdin(...) |
+| test.rs:194:13:194:21 | mut lines | semmle.label | mut lines |
+| test.rs:194:25:194:38 | reader.lines() | semmle.label | reader.lines() |
+| test.rs:195:14:195:30 | lines.next_line() [future, Ok, Some] | semmle.label | lines.next_line() [future, Ok, Some] |
+| test.rs:195:14:195:36 | await ... [Ok, Some] | semmle.label | await ... [Ok, Some] |
+| test.rs:195:14:195:37 | TryExpr [Some] | semmle.label | TryExpr [Some] |
+| test.rs:195:14:195:46 | ... .unwrap() | semmle.label | ... .unwrap() |
+| test.rs:196:19:196:28 | Some(...) [Some] | semmle.label | Some(...) [Some] |
+| test.rs:196:24:196:27 | line | semmle.label | line |
+| test.rs:196:32:196:48 | lines.next_line() [future, Ok, Some] | semmle.label | lines.next_line() [future, Ok, Some] |
+| test.rs:196:32:196:54 | await ... [Ok, Some] | semmle.label | await ... [Ok, Some] |
+| test.rs:196:32:196:55 | TryExpr [Some] | semmle.label | TryExpr [Some] |
+| test.rs:197:18:197:21 | line | semmle.label | line |
+subpaths
+testFailures
+#select
+| test.rs:14:14:14:20 | &buffer | test.rs:13:22:13:35 | ...::stdin | test.rs:14:14:14:20 | &buffer | $@ | test.rs:13:22:13:35 | ...::stdin | ...::stdin |
+| test.rs:20:14:20:20 | &buffer | test.rs:19:22:19:35 | ...::stdin | test.rs:20:14:20:20 | &buffer | $@ | test.rs:19:22:19:35 | ...::stdin | ...::stdin |
+| test.rs:26:14:26:20 | &buffer | test.rs:25:22:25:35 | ...::stdin | test.rs:26:14:26:20 | &buffer | $@ | test.rs:25:22:25:35 | ...::stdin | ...::stdin |
+| test.rs:32:14:32:20 | &buffer | test.rs:31:22:31:35 | ...::stdin | test.rs:32:14:32:20 | &buffer | $@ | test.rs:31:22:31:35 | ...::stdin | ...::stdin |
+| test.rs:38:14:38:20 | &buffer | test.rs:37:9:37:22 | ...::stdin | test.rs:38:14:38:20 | &buffer | $@ | test.rs:37:9:37:22 | ...::stdin | ...::stdin |
+| test.rs:42:14:42:17 | byte | test.rs:41:17:41:30 | ...::stdin | test.rs:42:14:42:17 | byte | $@ | test.rs:41:17:41:30 | ...::stdin | ...::stdin |
+| test.rs:50:14:50:18 | &data | test.rs:48:50:48:63 | ...::stdin | test.rs:50:14:50:18 | &data | $@ | test.rs:48:50:48:63 | ...::stdin | ...::stdin |
+| test.rs:56:14:56:18 | &data | test.rs:54:46:54:59 | ...::stdin | test.rs:56:14:56:18 | &data | $@ | test.rs:54:46:54:59 | ...::stdin | ...::stdin |
+| test.rs:63:14:63:20 | &buffer | test.rs:61:50:61:63 | ...::stdin | test.rs:63:14:63:20 | &buffer | $@ | test.rs:61:50:61:63 | ...::stdin | ...::stdin |
+| test.rs:70:14:70:20 | &buffer | test.rs:68:50:68:63 | ...::stdin | test.rs:70:14:70:20 | &buffer | $@ | test.rs:68:50:68:63 | ...::stdin | ...::stdin |
+| test.rs:71:14:71:22 | buffer[0] | test.rs:68:50:68:63 | ...::stdin | test.rs:71:14:71:22 | buffer[0] | $@ | test.rs:68:50:68:63 | ...::stdin | ...::stdin |
+| test.rs:76:14:76:50 | ... .unwrap() | test.rs:75:56:75:69 | ...::stdin | test.rs:76:14:76:50 | ... .unwrap() | $@ | test.rs:75:56:75:69 | ...::stdin | ...::stdin |
+| test.rs:78:18:78:31 | chunk.unwrap() | test.rs:75:56:75:69 | ...::stdin | test.rs:78:18:78:31 | chunk.unwrap() | $@ | test.rs:75:56:75:69 | ...::stdin | ...::stdin |
+| test.rs:85:18:85:21 | line | test.rs:83:46:83:59 | ...::stdin | test.rs:85:18:85:21 | line | $@ | test.rs:83:46:83:59 | ...::stdin | ...::stdin |
+| test.rs:112:14:112:20 | &buffer | test.rs:109:25:109:40 | ...::stdin | test.rs:112:14:112:20 | &buffer | $@ | test.rs:109:25:109:40 | ...::stdin | ...::stdin |
+| test.rs:119:14:119:20 | &buffer | test.rs:116:25:116:40 | ...::stdin | test.rs:119:14:119:20 | &buffer | $@ | test.rs:116:25:116:40 | ...::stdin | ...::stdin |
+| test.rs:126:14:126:20 | &buffer | test.rs:123:25:123:40 | ...::stdin | test.rs:126:14:126:20 | &buffer | $@ | test.rs:123:25:123:40 | ...::stdin | ...::stdin |
+| test.rs:133:14:133:20 | &buffer | test.rs:130:25:130:40 | ...::stdin | test.rs:133:14:133:20 | &buffer | $@ | test.rs:130:25:130:40 | ...::stdin | ...::stdin |
+| test.rs:142:14:142:15 | v1 | test.rs:137:25:137:40 | ...::stdin | test.rs:142:14:142:15 | v1 | $@ | test.rs:137:25:137:40 | ...::stdin | ...::stdin |
+| test.rs:143:14:143:15 | v2 | test.rs:137:25:137:40 | ...::stdin | test.rs:143:14:143:15 | v2 | $@ | test.rs:137:25:137:40 | ...::stdin | ...::stdin |
+| test.rs:144:14:144:15 | v3 | test.rs:137:25:137:40 | ...::stdin | test.rs:144:14:144:15 | v3 | $@ | test.rs:137:25:137:40 | ...::stdin | ...::stdin |
+| test.rs:145:14:145:15 | v4 | test.rs:137:25:137:40 | ...::stdin | test.rs:145:14:145:15 | v4 | $@ | test.rs:137:25:137:40 | ...::stdin | ...::stdin |
+| test.rs:152:14:152:20 | &buffer | test.rs:149:25:149:40 | ...::stdin | test.rs:152:14:152:20 | &buffer | $@ | test.rs:149:25:149:40 | ...::stdin | ...::stdin |
+| test.rs:160:14:160:18 | &data | test.rs:158:52:158:67 | ...::stdin | test.rs:160:14:160:18 | &data | $@ | test.rs:158:52:158:67 | ...::stdin | ...::stdin |
+| test.rs:166:14:166:18 | &data | test.rs:164:48:164:63 | ...::stdin | test.rs:166:14:166:18 | &data | $@ | test.rs:164:48:164:63 | ...::stdin | ...::stdin |
+| test.rs:173:14:173:20 | &buffer | test.rs:171:52:171:67 | ...::stdin | test.rs:173:14:173:20 | &buffer | $@ | test.rs:171:52:171:67 | ...::stdin | ...::stdin |
+| test.rs:180:14:180:20 | &buffer | test.rs:178:52:178:67 | ...::stdin | test.rs:180:14:180:20 | &buffer | $@ | test.rs:178:52:178:67 | ...::stdin | ...::stdin |
+| test.rs:181:14:181:22 | buffer[0] | test.rs:178:52:178:67 | ...::stdin | test.rs:181:14:181:22 | buffer[0] | $@ | test.rs:178:52:178:67 | ...::stdin | ...::stdin |
+| test.rs:186:14:186:56 | ... .unwrap() | test.rs:185:58:185:73 | ...::stdin | test.rs:186:14:186:56 | ... .unwrap() | $@ | test.rs:185:58:185:73 | ...::stdin | ...::stdin |
+| test.rs:188:18:188:22 | chunk | test.rs:185:58:185:73 | ...::stdin | test.rs:188:18:188:22 | chunk | $@ | test.rs:185:58:185:73 | ...::stdin | ...::stdin |
+| test.rs:195:14:195:46 | ... .unwrap() | test.rs:193:48:193:63 | ...::stdin | test.rs:195:14:195:46 | ... .unwrap() | $@ | test.rs:193:48:193:63 | ...::stdin | ...::stdin |
+| test.rs:197:18:197:21 | line | test.rs:193:48:193:63 | ...::stdin | test.rs:197:18:197:21 | line | $@ | test.rs:193:48:193:63 | ...::stdin | ...::stdin |
diff --git a/rust/ql/test/library-tests/dataflow/sources/stdin/InlineFlow.qlref b/rust/ql/test/library-tests/dataflow/sources/stdin/InlineFlow.qlref
new file mode 100644
index 00000000000..e0f7493db39
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/sources/stdin/InlineFlow.qlref
@@ -0,0 +1,2 @@
+query: ../env/InlineFlow.ql
+
diff --git a/rust/ql/test/library-tests/dataflow/sources/stdin/TaintSources.expected b/rust/ql/test/library-tests/dataflow/sources/stdin/TaintSources.expected
new file mode 100644
index 00000000000..08523773314
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/sources/stdin/TaintSources.expected
@@ -0,0 +1,26 @@
+| test.rs:13:22:13:35 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
+| test.rs:19:22:19:35 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
+| test.rs:25:22:25:35 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
+| test.rs:31:22:31:35 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
+| test.rs:37:9:37:22 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
+| test.rs:41:17:41:30 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
+| test.rs:48:50:48:63 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
+| test.rs:54:46:54:59 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
+| test.rs:61:50:61:63 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
+| test.rs:68:50:68:63 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
+| test.rs:75:56:75:69 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
+| test.rs:83:46:83:59 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
+| test.rs:90:46:90:59 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
+| test.rs:96:46:96:59 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
+| test.rs:109:25:109:40 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
+| test.rs:116:25:116:40 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
+| test.rs:123:25:123:40 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
+| test.rs:130:25:130:40 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
+| test.rs:137:25:137:40 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
+| test.rs:149:25:149:40 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
+| test.rs:158:52:158:67 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
+| test.rs:164:48:164:63 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
+| test.rs:171:52:171:67 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
+| test.rs:178:52:178:67 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
+| test.rs:185:58:185:73 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
+| test.rs:193:48:193:63 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
diff --git a/rust/ql/test/library-tests/dataflow/sources/stdin/TaintSources.qlref b/rust/ql/test/library-tests/dataflow/sources/stdin/TaintSources.qlref
new file mode 100644
index 00000000000..7aa95121af3
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/sources/stdin/TaintSources.qlref
@@ -0,0 +1,2 @@
+query: queries/summary/TaintSources.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/rust/ql/test/library-tests/dataflow/sources/stdin/options.yml b/rust/ql/test/library-tests/dataflow/sources/stdin/options.yml
new file mode 100644
index 00000000000..0b1ee7f1f33
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/sources/stdin/options.yml
@@ -0,0 +1,5 @@
+qltest_cargo_check: true
+qltest_dependencies:
+    - bytes = { version = "1.10.1" }
+    - futures = { version = "0.3" }
+    - tokio = { version = "1.43.0", features = ["full"] }
diff --git a/rust/ql/test/library-tests/dataflow/sources/stdin/test.rs b/rust/ql/test/library-tests/dataflow/sources/stdin/test.rs
new file mode 100644
index 00000000000..230303fa1ea
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/sources/stdin/test.rs
@@ -0,0 +1,219 @@
+fn sink<T>(_: T) { }
+
+// --- tests ---
+
+use std::io::{Read, BufRead};
+use tokio::io::{AsyncReadExt, AsyncBufReadExt};
+
+fn test_io_stdin() -> std::io::Result<()> {
+    // --- stdin ---
+
+    {
+        let mut buffer = [0u8; 100];
+        let _bytes = std::io::stdin().read(&mut buffer)?; // $ Alert[rust/summary/taint-sources]
+        sink(&buffer); // $ hasTaintFlow
+    }
+
+    {
+        let mut buffer = Vec::<u8>::new();
+        let _bytes = std::io::stdin().read_to_end(&mut buffer)?; // $ Alert[rust/summary/taint-sources]
+        sink(&buffer); // $ hasTaintFlow
+    }
+
+    {
+        let mut buffer = String::new();
+        let _bytes = std::io::stdin().read_to_string(&mut buffer)?; // $ Alert[rust/summary/taint-sources]
+        sink(&buffer); // $ hasTaintFlow
+    }
+
+    {
+        let mut buffer = String::new();
+        let _bytes = std::io::stdin().lock().read_to_string(&mut buffer)?; // $ Alert[rust/summary/taint-sources]
+        sink(&buffer); // $ hasTaintFlow
+    }
+
+    {
+        let mut buffer = [0; 100];
+        std::io::stdin().read_exact(&mut buffer)?; // $ Alert[rust/summary/taint-sources]
+        sink(&buffer); // $ hasTaintFlow
+    }
+
+    for byte in std::io::stdin().bytes() { // $ Alert[rust/summary/taint-sources]
+        sink(byte); // $ hasTaintFlow
+    }
+
+    // --- BufReader ---
+
+    {
+        let mut reader = std::io::BufReader::new(std::io::stdin()); // $ Alert[rust/summary/taint-sources]
+        let data = reader.fill_buf()?;
+        sink(&data); // $ hasTaintFlow
+    }
+
+    {
+        let reader = std::io::BufReader::new(std::io::stdin()); // $ Alert[rust/summary/taint-sources]
+        let data = reader.buffer();
+        sink(&data); // $ hasTaintFlow
+    }
+
+    {
+        let mut buffer = String::new();
+        let mut reader = std::io::BufReader::new(std::io::stdin()); // $ Alert[rust/summary/taint-sources]
+        reader.read_line(&mut buffer)?;
+        sink(&buffer); // $ hasTaintFlow
+    }
+
+    {
+        let mut buffer = Vec::<u8>::new();
+        let mut reader = std::io::BufReader::new(std::io::stdin()); // $ Alert[rust/summary/taint-sources]
+        reader.read_until(b',', &mut buffer)?;
+        sink(&buffer); // $ hasTaintFlow
+        sink(buffer[0]); // $ hasTaintFlow
+    }
+
+    {
+        let mut reader_split = std::io::BufReader::new(std::io::stdin()).split(b','); // $ Alert[rust/summary/taint-sources]
+        sink(reader_split.next().unwrap().unwrap()); // $ hasTaintFlow
+        while let Some(chunk) = reader_split.next() {
+            sink(chunk.unwrap()); // $ hasTaintFlow
+        }
+    }
+
+    {
+        let reader = std::io::BufReader::new(std::io::stdin()); // $ Alert[rust/summary/taint-sources]
+        for line in reader.lines() {
+            sink(line); // $ hasTaintFlow
+        }
+    }
+
+    {
+        let reader = std::io::BufReader::new(std::io::stdin()); // $ Alert[rust/summary/taint-sources]
+        let line = reader.lines().nth(1).unwrap();
+        sink(line.unwrap().clone()); // $ MISSING: hasTaintFlow
+    }
+
+    {
+        let reader = std::io::BufReader::new(std::io::stdin()); // $ Alert[rust/summary/taint-sources]
+        let lines: Vec<_> = reader.lines().collect();
+        sink(lines[1].as_ref().unwrap().clone()); // $ MISSING: hasTaintFlow
+    }
+
+    Ok(())
+}
+
+async fn test_tokio_stdin() -> Result<(), Box<dyn std::error::Error>> {
+
+    // --- async reading from stdin ---
+
+    {
+        let mut stdin = tokio::io::stdin(); // $ Alert[rust/summary/taint-sources]
+        let mut buffer = [0u8; 100];
+        let _bytes = stdin.read(&mut buffer).await?;
+        sink(&buffer); // $ hasTaintFlow
+    }
+
+    {
+        let mut stdin = tokio::io::stdin(); // $ Alert[rust/summary/taint-sources]
+        let mut buffer = Vec::<u8>::new();
+        let _bytes = stdin.read_to_end(&mut buffer).await?;
+        sink(&buffer); // $ hasTaintFlow
+    }
+
+    {
+        let mut stdin = tokio::io::stdin(); // $ Alert[rust/summary/taint-sources]
+        let mut buffer = String::new();
+        let _bytes = stdin.read_to_string(&mut buffer).await?;
+        sink(&buffer); // $ hasTaintFlow
+    }
+
+    {
+        let mut stdin = tokio::io::stdin(); // $ Alert[rust/summary/taint-sources]
+        let mut buffer = [0; 100];
+        stdin.read_exact(&mut buffer).await?;
+        sink(&buffer); // $ hasTaintFlow
+    }
+
+    {
+        let mut stdin = tokio::io::stdin(); // $ Alert[rust/summary/taint-sources]
+        let v1 = stdin.read_u8().await?;
+        let v2 = stdin.read_i16().await?;
+        let v3 = stdin.read_f32().await?;
+        let v4 = stdin.read_i64_le().await?;
+        sink(v1); // $ hasTaintFlow
+        sink(v2); // $ hasTaintFlow
+        sink(v3); // $ hasTaintFlow
+        sink(v4); // $ hasTaintFlow
+    }
+
+    {
+        let mut stdin = tokio::io::stdin(); // $ Alert[rust/summary/taint-sources]
+        let mut buffer = bytes::BytesMut::new();
+        stdin.read_buf(&mut buffer).await?;
+        sink(&buffer); // $ hasTaintFlow
+    }
+
+    // --- async reading from stdin (BufReader) ---
+
+    {
+        let mut reader = tokio::io::BufReader::new(tokio::io::stdin()); // $ Alert[rust/summary/taint-sources]
+        let data = reader.fill_buf().await?;
+        sink(&data); // $ hasTaintFlow
+    }
+
+    {
+        let reader = tokio::io::BufReader::new(tokio::io::stdin()); // $ Alert[rust/summary/taint-sources]
+        let data = reader.buffer();
+        sink(&data); // $ hasTaintFlow
+    }
+
+    {
+        let mut buffer = String::new();
+        let mut reader = tokio::io::BufReader::new(tokio::io::stdin()); // $ Alert[rust/summary/taint-sources]
+        reader.read_line(&mut buffer).await?;
+        sink(&buffer); // $ hasTaintFlow
+    }
+
+    {
+        let mut buffer = Vec::<u8>::new();
+        let mut reader = tokio::io::BufReader::new(tokio::io::stdin()); // $ Alert[rust/summary/taint-sources]
+        reader.read_until(b',', &mut buffer).await?;
+        sink(&buffer); // $ hasTaintFlow
+        sink(buffer[0]); // $ hasTaintFlow
+    }
+
+    {
+        let mut reader_split = tokio::io::BufReader::new(tokio::io::stdin()).split(b','); // $ Alert[rust/summary/taint-sources]
+        sink(reader_split.next_segment().await?.unwrap()); // $ hasTaintFlow
+        while let Some(chunk) = reader_split.next_segment().await? {
+            sink(chunk); // $ hasTaintFlow
+        }
+    }
+
+    {
+        let reader = tokio::io::BufReader::new(tokio::io::stdin()); // $ Alert[rust/summary/taint-sources]
+        let mut lines = reader.lines();
+        sink(lines.next_line().await?.unwrap()); // $ hasTaintFlow
+        while let Some(line) = lines.next_line().await? {
+            sink(line); // $ hasTaintFlow
+        }
+    }
+
+    Ok(())
+}
+
+#[tokio::main]
+async fn main() -> Result<(), Box<dyn std::error::Error>> {
+    println!("test_io_stdin...");
+    match test_io_stdin() {
+        Ok(_) => println!("complete"),
+        Err(e) => println!("error: {}", e),
+    }
+
+    println!("test_tokio_stdin...");
+    match futures::executor::block_on(test_tokio_stdin()) {
+        Ok(_) => println!("complete"),
+        Err(e) => println!("error: {}", e),
+    }
+
+    Ok(())
+}
diff --git a/rust/ql/test/library-tests/dataflow/sources/test.rs b/rust/ql/test/library-tests/dataflow/sources/test.rs
deleted file mode 100644
index 5583e977bc6..00000000000
--- a/rust/ql/test/library-tests/dataflow/sources/test.rs
+++ /dev/null
@@ -1,891 +0,0 @@
-#![allow(deprecated)]
-
-fn sink<T>(_: T) { }
-
-// --- tests ---
-
-fn test_env_vars() {
-    sink(std::env::var("HOME")); // $ Alert[rust/summary/taint-sources] hasTaintFlow="HOME"
-    sink(std::env::var_os("PATH")); // $ Alert[rust/summary/taint-sources] hasTaintFlow="PATH"
-
-    let var1 = std::env::var("HOME").expect("HOME not set"); // $ Alert[rust/summary/taint-sources]
-    let var2 = std::env::var_os("PATH").unwrap(); // $ Alert[rust/summary/taint-sources]
-
-    sink(var1); // $ hasTaintFlow="HOME"
-    sink(var2); // $ hasTaintFlow="PATH"
-
-    for (key, value) in std::env::vars() { // $ Alert[rust/summary/taint-sources]
-        sink(key); // $ MISSING: hasTaintFlow
-        sink(value); // $ MISSING: hasTaintFlow
-    }
-
-    for (key, value) in std::env::vars_os() { // $ Alert[rust/summary/taint-sources]
-        sink(key); // $ MISSING: hasTaintFlow
-        sink(value); // $ MISSING: hasTaintFlow
-    }
-}
-
-fn test_env_args() {
-    let args: Vec<String> = std::env::args().collect(); // $ Alert[rust/summary/taint-sources]
-    let my_path = &args[0];
-    let arg1 = &args[1];
-    let arg2 = std::env::args().nth(2).unwrap(); // $ Alert[rust/summary/taint-sources]
-    let arg3 = std::env::args_os().nth(3).unwrap(); // $ Alert[rust/summary/taint-sources]
-    let arg4 = std::env::args().nth(4).unwrap().parse::<usize>().unwrap(); // $ Alert[rust/summary/taint-sources]
-
-    sink(my_path); // $ hasTaintFlow
-    sink(arg1); // $ hasTaintFlow
-    sink(arg2); // $ hasTaintFlow
-    sink(arg3); // $ hasTaintFlow
-    sink(arg4); // $ hasTaintFlow
-
-    for arg in std::env::args() { // $ Alert[rust/summary/taint-sources]
-        sink(arg); // $ hasTaintFlow
-    }
-
-    for arg in std::env::args_os() { // $ Alert[rust/summary/taint-sources]
-        sink(arg); // $ hasTaintFlow
-    }
-}
-
-fn test_env_dirs() {
-    let dir = std::env::current_dir().expect("FAILED"); // $ Alert[rust/summary/taint-sources]
-    let exe = std::env::current_exe().expect("FAILED"); // $ Alert[rust/summary/taint-sources]
-    let home = std::env::home_dir().expect("FAILED"); // $ Alert[rust/summary/taint-sources]
-
-    sink(dir); // $ hasTaintFlow
-    sink(exe); // $ hasTaintFlow
-    sink(home); // $ hasTaintFlow
-}
-
-async fn test_reqwest() -> Result<(), reqwest::Error> {
-    let remote_string1 = reqwest::blocking::get("example.com")?.text()?; // $ Alert[rust/summary/taint-sources]
-    sink(remote_string1); // $ hasTaintFlow="example.com"
-
-    let remote_string2 = reqwest::blocking::get("example.com").unwrap().text().unwrap(); // $ Alert[rust/summary/taint-sources]
-    sink(remote_string2); // $ hasTaintFlow="example.com"
-
-    let remote_string3 = reqwest::blocking::get("example.com").unwrap().text_with_charset("utf-8").unwrap(); // $ Alert[rust/summary/taint-sources]
-    sink(remote_string3); // $ hasTaintFlow="example.com"
-
-    let remote_string4 = reqwest::blocking::get("example.com").unwrap().bytes().unwrap(); // $ Alert[rust/summary/taint-sources]
-    sink(remote_string4); // $ hasTaintFlow="example.com"
-
-    let remote_string5 = reqwest::get("example.com").await?.text().await?; // $ Alert[rust/summary/taint-sources]
-    sink(remote_string5); // $ hasTaintFlow="example.com"
-
-    let remote_string6 = reqwest::get("example.com").await?.bytes().await?; // $ Alert[rust/summary/taint-sources]
-    sink(remote_string6); // $ hasTaintFlow="example.com"
-
-    let mut request1 = reqwest::get("example.com").await?; // $ Alert[rust/summary/taint-sources]
-    sink(request1.chunk().await?.unwrap()); // $ hasTaintFlow="example.com"
-    while let Some(chunk) = request1.chunk().await? {
-        sink(chunk); // $ MISSING: hasTaintFlow="example.com"
-    }
-
-    Ok(())
-}
-
-use std::io::Write;
-use http_body_util::BodyExt;
-
-async fn test_hyper_http(case: i64) -> Result<(), Box<dyn std::error::Error>> {
-    // using http + hyper libs to fetch a web page
-    let address = "example.com:80";
-    let url = "http://example.com/";
-
-    // create the connection
-    println!("connecting to {}...", address);
-    let stream = tokio::net::TcpStream::connect(address).await?; // $ Alert[rust/summary/taint-sources]
-    let io = hyper_util::rt::TokioIo::new(stream);
-    let (sender, conn) = hyper::client::conn::http1::handshake(io).await?;
-    let mut sender: hyper::client::conn::http1::SendRequest<String> = sender;
-
-    // drive the HTTP connection
-    tokio::task::spawn(async move {
-        conn.await.expect("connection failed");
-    });
-
-    // make the request
-    println!("sending request...");
-    if case == 0 {
-        // simple flow case
-        let request = http::Request::builder().uri(url).body(String::from(""))?;
-        let response = sender.send_request(request).await?; // $ Alert[rust/summary/taint-sources]
-        sink(&response); // $ hasTaintFlow=request
-        sink(response); // $ hasTaintFlow=request
-        return Ok(())
-    }
-    // more realistic uses of results...
-    let request = http::Request::builder().uri(url).body(String::from(""))?;
-    let mut response = sender.send_request(request).await?; // $ Alert[rust/summary/taint-sources]
-    sink(&response); // $ hasTaintFlow=request
-
-    if !response.status().is_success() {
-        return Err("request failed".into())
-    }
-
-    match case {
-        1 => {
-            sink(response.body()); // $ MISSING: hasTaintFlow
-            sink(response.body_mut()); // $ MISSING: hasTaintFlow
-
-            let body = response.into_body();
-            sink(&body); // $ MISSING: hasTaintFlow
-
-            println!("awaiting response...");
-            let data = body.collect().await?;
-            sink(&data); // $ MISSING: hasTaintFlow
-
-            let bytes = data.to_bytes();
-            println!("bytes = {:?}", &bytes);
-            sink(bytes); // $ MISSING: hasTaintFlow
-        }
-        2 => {
-            println!("streaming response...");
-            while let Some(frame) = response.frame().await {
-                if let Some(data) = frame?.data_ref() {
-                    std::io::stdout().write_all(data)?;
-                    sink(data); // $ MISSING: hasTaintFlow
-                    sink(data[0]); // $ MISSING: hasTaintFlow
-                    for byte in data {
-                        sink(byte); // $ MISSING: hasTaintFlow
-                    }
-                }
-            }
-        }
-        3 => {
-            let headers = response.headers();
-
-            if headers.contains_key(http::header::CONTENT_TYPE) {
-                println!("CONTENT_TYPE = {}", response.headers()[http::header::CONTENT_TYPE].to_str().unwrap());
-                sink(&headers[http::header::CONTENT_TYPE]); // $ MISSING: hasTaintFlow
-                sink(headers[http::header::CONTENT_TYPE].to_str().unwrap()); // $ MISSING: hasTaintFlow
-                sink(headers[http::header::CONTENT_TYPE].as_bytes()); // $ MISSING: hasTaintFlow
-                sink(headers.get(http::header::CONTENT_TYPE).unwrap()); // $ MISSING: hasTaintFlow
-            }
-
-            if headers.contains_key("Content-type") {
-                println!("Content-type = {}", response.headers().get("Content-type").unwrap().to_str().unwrap());
-                sink(headers.get("Content-type").unwrap()); // $ MISSING: hasTaintFlow
-                sink(headers.get("Content-type").unwrap().to_str().unwrap()); // $ MISSING: hasTaintFlow
-                sink(headers.get("Content-type").unwrap().as_bytes()); // $ MISSING: hasTaintFlow
-                sink(&headers["Content-type"]); // $ MISSING: hasTaintFlow
-            }
-
-            if headers.contains_key(http::header::COOKIE) {
-                sink(response.headers().get(http::header::COOKIE)); // $ MISSING: hasTaintFlow
-                for cookie in headers.get_all(http::header::COOKIE) {
-                    println!("cookie = {}", cookie.to_str().unwrap());
-                    sink(cookie); // $ MISSING: hasTaintFlow
-                    sink(cookie.to_str().unwrap()); // $ MISSING: hasTaintFlow
-                }
-            }
-
-            let (parts, body) = response.into_parts();
-
-            if parts.headers.contains_key(http::header::CONTENT_TYPE) {
-                println!("CONTENT_TYPE = {}", parts.headers[http::header::CONTENT_TYPE].to_str().unwrap());
-                sink(&parts.headers[http::header::CONTENT_TYPE]); // $ MISSING: hasTaintFlow
-                sink(parts.headers[http::header::CONTENT_TYPE].to_str().unwrap()); // $ MISSING: hasTaintFlow
-                sink(parts.headers[http::header::CONTENT_TYPE].as_bytes()); // $ MISSING: hasTaintFlow
-                sink(parts.headers.get(http::header::CONTENT_TYPE).unwrap()); // $ MISSING: hasTaintFlow
-            }
-
-            sink(body); // $ MISSING: hasTaintFlow
-        }
-        _ => {}
-    }
-
-    Ok(())
-}
-
-use std::io::Read;
-use std::io::BufRead;
-
-fn test_io_stdin() -> std::io::Result<()> {
-    // --- stdin ---
-
-    {
-        let mut buffer = [0u8; 100];
-        let _bytes = std::io::stdin().read(&mut buffer)?; // $ Alert[rust/summary/taint-sources]
-        sink(&buffer); // $ hasTaintFlow
-    }
-
-    {
-        let mut buffer = Vec::<u8>::new();
-        let _bytes = std::io::stdin().read_to_end(&mut buffer)?; // $ Alert[rust/summary/taint-sources]
-        sink(&buffer); // $ hasTaintFlow
-    }
-
-    {
-        let mut buffer = String::new();
-        let _bytes = std::io::stdin().read_to_string(&mut buffer)?; // $ Alert[rust/summary/taint-sources]
-        sink(&buffer); // $ hasTaintFlow
-    }
-
-    {
-        let mut buffer = String::new();
-        let _bytes = std::io::stdin().lock().read_to_string(&mut buffer)?; // $ Alert[rust/summary/taint-sources]
-        sink(&buffer); // $ hasTaintFlow
-    }
-
-    {
-        let mut buffer = [0; 100];
-        std::io::stdin().read_exact(&mut buffer)?; // $ Alert[rust/summary/taint-sources]
-        sink(&buffer); // $ hasTaintFlow
-    }
-
-    for byte in std::io::stdin().bytes() { // $ Alert[rust/summary/taint-sources]
-        sink(byte); // $ hasTaintFlow
-    }
-
-    // --- BufReader ---
-
-    {
-        let mut reader = std::io::BufReader::new(std::io::stdin()); // $ Alert[rust/summary/taint-sources]
-        let data = reader.fill_buf()?;
-        sink(&data); // $ hasTaintFlow
-    }
-
-    {
-        let reader = std::io::BufReader::new(std::io::stdin()); // $ Alert[rust/summary/taint-sources]
-        let data = reader.buffer();
-        sink(&data); // $ hasTaintFlow
-    }
-
-    {
-        let mut buffer = String::new();
-        let mut reader = std::io::BufReader::new(std::io::stdin()); // $ Alert[rust/summary/taint-sources]
-        reader.read_line(&mut buffer)?;
-        sink(&buffer); // $ hasTaintFlow
-    }
-
-    {
-        let mut buffer = Vec::<u8>::new();
-        let mut reader = std::io::BufReader::new(std::io::stdin()); // $ Alert[rust/summary/taint-sources]
-        reader.read_until(b',', &mut buffer)?;
-        sink(&buffer); // $ hasTaintFlow
-        sink(buffer[0]); // $ hasTaintFlow
-    }
-
-    {
-        let mut reader_split = std::io::BufReader::new(std::io::stdin()).split(b','); // $ Alert[rust/summary/taint-sources]
-        sink(reader_split.next().unwrap().unwrap()); // $ hasTaintFlow
-        while let Some(chunk) = reader_split.next() {
-            sink(chunk.unwrap()); // $ MISSING: hasTaintFlow
-        }
-    }
-
-    {
-        let reader = std::io::BufReader::new(std::io::stdin()); // $ Alert[rust/summary/taint-sources]
-        for line in reader.lines() {
-            sink(line); // $ hasTaintFlow
-        }
-    }
-
-    {
-        let reader = std::io::BufReader::new(std::io::stdin()); // $ Alert[rust/summary/taint-sources]
-        let line = reader.lines().nth(1).unwrap();
-        sink(line.unwrap().clone()); // $ MISSING: hasTaintFlow
-    }
-
-    {
-        let reader = std::io::BufReader::new(std::io::stdin()); // $ Alert[rust/summary/taint-sources]
-        let lines: Vec<_> = reader.lines().collect();
-        sink(lines[1].as_ref().unwrap().clone()); // $ MISSING: hasTaintFlow
-    }
-
-    Ok(())
-}
-
-use tokio::io::{AsyncReadExt, AsyncBufReadExt};
-
-async fn test_tokio_stdin() -> Result<(), Box<dyn std::error::Error>> {
-
-    // --- async reading from stdin ---
-
-    {
-        let mut stdin = tokio::io::stdin(); // $ Alert[rust/summary/taint-sources]
-        let mut buffer = [0u8; 100];
-        let _bytes = stdin.read(&mut buffer).await?;
-        sink(&buffer); // $ MISSING: hasTaintFlow -- we cannot resolve the `read` call above, which comes from `impl<R: AsyncRead + ?Sized> AsyncReadExt for R {}` in `async_read_ext.rs`
-    }
-
-    {
-        let mut stdin = tokio::io::stdin(); // $ Alert[rust/summary/taint-sources]
-        let mut buffer = Vec::<u8>::new();
-        let _bytes = stdin.read_to_end(&mut buffer).await?;
-        sink(&buffer); // $ MISSING: hasTaintFlow -- we cannot resolve the `read_to_end` call above, which comes from `impl<R: AsyncRead + ?Sized> AsyncReadExt for R {}` in `async_read_ext.rs`
-    }
-
-    {
-        let mut stdin = tokio::io::stdin(); // $ Alert[rust/summary/taint-sources]
-        let mut buffer = String::new();
-        let _bytes = stdin.read_to_string(&mut buffer).await?;
-        sink(&buffer); // $ MISSING: hasTaintFlow -- we cannot resolve the `read_to_string` call above, which comes from `impl<R: AsyncRead + ?Sized> AsyncReadExt for R {}` in `async_read_ext.rs`
-    }
-
-    {
-        let mut stdin = tokio::io::stdin(); // $ Alert[rust/summary/taint-sources]
-        let mut buffer = [0; 100];
-        stdin.read_exact(&mut buffer).await?;
-        sink(&buffer); // $ MISSING: hasTaintFlow -- we cannot resolve the `read_exact` call above, which comes from `impl<R: AsyncRead + ?Sized> AsyncReadExt for R {}` in `async_read_ext.rs`
-    }
-
-    {
-        let mut stdin = tokio::io::stdin(); // $ Alert[rust/summary/taint-sources]
-        let v1 = stdin.read_u8().await?;
-        let v2 = stdin.read_i16().await?;
-        let v3 = stdin.read_f32().await?;
-        let v4 = stdin.read_i64_le().await?;
-        sink(v1); // $ MISSING: hasTaintFlow -- we cannot resolve the `read_u8` call above, which comes from `impl<R: AsyncRead + ?Sized> AsyncReadExt for R {}` in `async_read_ext.rs`
-        sink(v2); // $ MISSING: hasTaintFlow -- we cannot resolve the `read_i16` call above, which comes from `impl<R: AsyncRead + ?Sized> AsyncReadExt for R {}` in `async_read_ext.rs`
-        sink(v3); // $ MISSING: hasTaintFlow -- we cannot resolve the `read_f32` call above, which comes from `impl<R: AsyncRead + ?Sized> AsyncReadExt for R {}` in `async_read_ext.rs`
-        sink(v4); // $ MISSING: hasTaintFlow -- we cannot resolve the `read_i64_le` call above, which comes from `impl<R: AsyncRead + ?Sized> AsyncReadExt for R {}` in `async_read_ext.rs`
-    }
-
-    {
-        let mut stdin = tokio::io::stdin(); // $ Alert[rust/summary/taint-sources]
-        let mut buffer = bytes::BytesMut::new();
-        stdin.read_buf(&mut buffer).await?;
-        sink(&buffer); // $ MISSING: hasTaintFlow -- we cannot resolve the `read_buf` call above, which comes from `impl<R: AsyncRead + ?Sized> AsyncReadExt for R {}` in `async_read_ext.rs`
-    }
-
-    // --- async reading from stdin (BufReader) ---
-
-    {
-        let mut reader = tokio::io::BufReader::new(tokio::io::stdin()); // $ Alert[rust/summary/taint-sources]
-        let data = reader.fill_buf().await?;
-        sink(&data); // $ MISSING: hasTaintFlow -- we cannot resolve the `fill_buf` call above, which comes from `impl<R: AsyncBufRead + ?Sized> AsyncBufReadExt for R {}` in `async_buf_read_ext.rs`
-    }
-
-    {
-        let reader = tokio::io::BufReader::new(tokio::io::stdin()); // $ Alert[rust/summary/taint-sources]
-        let data = reader.buffer();
-        sink(&data); // $ hasTaintFlow
-    }
-
-    {
-        let mut buffer = String::new();
-        let mut reader = tokio::io::BufReader::new(tokio::io::stdin()); // $ Alert[rust/summary/taint-sources]
-        reader.read_line(&mut buffer).await?;
-        sink(&buffer); // $ MISSING: hasTaintFlow -- we cannot resolve the `read_line` call above, which comes from `impl<R: AsyncBufRead + ?Sized> AsyncBufReadExt for R {}` in `async_buf_read_ext.rs`
-    }
-
-    {
-        let mut buffer = Vec::<u8>::new();
-        let mut reader = tokio::io::BufReader::new(tokio::io::stdin()); // $ Alert[rust/summary/taint-sources]
-        reader.read_until(b',', &mut buffer).await?;
-        sink(&buffer); // $ MISSING: hasTaintFlow -- we cannot resolve the `read_until` call above, which comes from `impl<R: AsyncBufRead + ?Sized> AsyncBufReadExt for R {}` in `async_buf_read_ext.rs`
-        sink(buffer[0]); // $ MISSING: hasTaintFlow -- we cannot resolve the `read_until` call above, which comes from `impl<R: AsyncBufRead + ?Sized> AsyncBufReadExt for R {}` in `async_buf_read_ext.rs`
-    }
-
-    {
-        let mut reader_split = tokio::io::BufReader::new(tokio::io::stdin()).split(b','); // $ Alert[rust/summary/taint-sources]
-        sink(reader_split.next_segment().await?.unwrap()); // $ MISSING: hasTaintFlow -- we cannot resolve the `split` call above, which comes from `impl<R: AsyncBufRead + ?Sized> AsyncBufReadExt for R {}` in `async_buf_read_ext.rs`
-        while let Some(chunk) = reader_split.next_segment().await? {
-            sink(chunk); // $ MISSING: hasTaintFlow
-        }
-    }
-
-    {
-        let reader = tokio::io::BufReader::new(tokio::io::stdin()); // $ Alert[rust/summary/taint-sources]
-        let mut lines = reader.lines();
-        sink(lines.next_line().await?.unwrap()); // $ MISSING: hasTaintFlow -- we cannot resolve the `lines` call above, which comes from `impl<R: AsyncBufRead + ?Sized> AsyncBufReadExt for R {}` in `async_buf_read_ext.rs`
-        while let Some(line) = lines.next_line().await? {
-            sink(line); // $ MISSING: hasTaintFlow
-        }
-    }
-
-    Ok(())
-}
-
-use std::fs;
-
-fn test_fs() -> Result<(), Box<dyn std::error::Error>> {
-    {
-        let buffer: Vec<u8> = std::fs::read("file.bin")?; // $ Alert[rust/summary/taint-sources]
-        sink(buffer); // $ hasTaintFlow="file.bin"
-    }
-
-    {
-        let buffer: Vec<u8> = fs::read("file.bin")?; // $ Alert[rust/summary/taint-sources]
-        sink(buffer); // $ hasTaintFlow="file.bin"
-    }
-
-    {
-        let buffer = fs::read_to_string("file.txt")?; // $ Alert[rust/summary/taint-sources]
-        sink(buffer); // $ hasTaintFlow="file.txt"
-    }
-
-    for entry in fs::read_dir("directory")? {
-        let e = entry?;
-        let path = e.path(); // $ Alert[rust/summary/taint-sources]
-        let file_name = e.file_name(); // $ Alert[rust/summary/taint-sources]
-        sink(path); // $ hasTaintFlow
-        sink(file_name); // $ hasTaintFlow
-    }
-
-    {
-        let target = fs::read_link("symlink.txt")?; // $ Alert[rust/summary/taint-sources]
-        sink(target); // $ hasTaintFlow="symlink.txt"
-    }
-
-    Ok(())
-}
-
-async fn test_tokio_fs() -> Result<(), Box<dyn std::error::Error>> {
-    {
-        let buffer: Vec<u8> = tokio::fs::read("file.bin").await?; // $ Alert[rust/summary/taint-sources]
-        sink(buffer); // $ hasTaintFlow="file.bin"
-    }
-
-    {
-        let buffer: Vec<u8> = tokio::fs::read("file.bin").await?; // $ Alert[rust/summary/taint-sources]
-        sink(buffer); // $ hasTaintFlow="file.bin"
-    }
-
-    {
-        let buffer = tokio::fs::read_to_string("file.txt").await?; // $ Alert[rust/summary/taint-sources]
-        sink(buffer); // $ hasTaintFlow="file.txt"
-    }
-
-    let mut read_dir = tokio::fs::read_dir("directory").await?;
-    for entry in read_dir.next_entry().await? {
-        let path = entry.path(); // $ Alert[rust/summary/taint-sources]
-        let file_name = entry.file_name(); // $ Alert[rust/summary/taint-sources]
-        sink(path); // $ hasTaintFlow
-        sink(file_name); // $ hasTaintFlow
-    }
-
-    {
-        let target = tokio::fs::read_link("symlink.txt").await?; // $ Alert[rust/summary/taint-sources]
-        sink(target); // $ hasTaintFlow="symlink.txt"
-    }
-
-    Ok(())
-}
-
-fn test_io_file() -> std::io::Result<()> {
-    // --- file ---
-
-    let mut file = std::fs::File::open("file.txt")?; // $ Alert[rust/summary/taint-sources]
-
-    {
-        let mut buffer = [0u8; 100];
-        let _bytes = file.read(&mut buffer)?;
-        sink(&buffer); // $ hasTaintFlow="file.txt"
-    }
-
-    {
-        let mut buffer = Vec::<u8>::new();
-        let _bytes = file.read_to_end(&mut buffer)?;
-        sink(&buffer); // $ hasTaintFlow="file.txt"
-    }
-
-    {
-        let mut buffer = String::new();
-        let _bytes = file.read_to_string(&mut buffer)?;
-        sink(&buffer); // $ hasTaintFlow="file.txt"
-    }
-
-    {
-        let mut buffer = [0; 100];
-        file.read_exact(&mut buffer)?;
-        sink(&buffer); // $ hasTaintFlow="file.txt"
-    }
-
-    for byte in file.bytes() {
-        sink(byte); // $ hasTaintFlow="file.txt"
-    }
-
-    // --- misc operations ---
-
-    {
-        let mut buffer = String::new();
-        let file1 = std::fs::File::open("file.txt")?; // $ Alert[rust/summary/taint-sources]
-        let file2 = std::fs::File::open("another_file.txt")?; // $ Alert[rust/summary/taint-sources]
-        let mut reader = file1.chain(file2);
-        reader.read_to_string(&mut buffer)?;
-        sink(&buffer); // $ hasTaintFlow="file.txt" hasTaintFlow="another_file.txt"
-    }
-
-    {
-        let mut buffer = String::new();
-        let file1 = std::fs::File::open("file.txt")?; // $ Alert[rust/summary/taint-sources]
-        let mut reader = file1.take(100);
-        reader.read_to_string(&mut buffer)?;
-        sink(&buffer); // $ hasTaintFlow="file.txt"
-    }
-
-    Ok(())
-}
-
-async fn test_tokio_file() -> std::io::Result<()> {
-    // --- file ---
-
-    let mut file = tokio::fs::File::open("file.txt").await?; // $ Alert[rust/summary/taint-sources]
-
-    {
-        let mut buffer = [0u8; 100];
-        let _bytes = file.read(&mut buffer).await?;
-        sink(&buffer); // $ MISSING: hasTaintFlow="file.txt" -- we cannot resolve the `read` call above, which comes from `impl<R: AsyncRead + ?Sized> AsyncReadExt for R {}` in `async_read_ext.rs`
-    }
-
-    {
-        let mut buffer = Vec::<u8>::new();
-        let _bytes = file.read_to_end(&mut buffer).await?;
-        sink(&buffer); // $ MISSING: hasTaintFlow="file.txt" -- we cannot resolve the `read_to_end` call above, which comes from `impl<R: AsyncRead + ?Sized> AsyncReadExt for R {}` in `async_read_ext.rs`
-    }
-
-    {
-        let mut buffer = String::new();
-        let _bytes = file.read_to_string(&mut buffer).await?;
-        sink(&buffer); // $ MISSING: hasTaintFlow="file.txt" -- we cannot resolve the `read_to_string` call above, which comes from `impl<R: AsyncRead + ?Sized> AsyncReadExt for R {}` in `async_read_ext.rs`
-    }
-
-    {
-        let mut buffer = [0; 100];
-        file.read_exact(&mut buffer).await?;
-        sink(&buffer); // $ MISSING: hasTaintFlow="file.txt" -- we cannot resolve the `read_exact` call above, which comes from `impl<R: AsyncRead + ?Sized> AsyncReadExt for R {}` in `async_read_ext.rs`
-    }
-
-    {
-        let v1 = file.read_u8().await?;
-        let v2 = file.read_i16().await?;
-        let v3 = file.read_f32().await?;
-        let v4 = file.read_i64_le().await?;
-        sink(v1); // $ MISSING: hasTaintFlow="file.txt" -- we cannot resolve the `read_u8` call above, which comes from `impl<R: AsyncRead + ?Sized> AsyncReadExt for R {}` in `async_read_ext.rs`
-        sink(v2); // $ MISSING: hasTaintFlow="file.txt" -- we cannot resolve the `read_i16` call above, which comes from `impl<R: AsyncRead + ?Sized> AsyncReadExt for R {}` in `async_read_ext.rs`
-        sink(v3); // $ MISSING: hasTaintFlow="file.txt" -- we cannot resolve the `read_f32` call above, which comes from `impl<R: AsyncRead + ?Sized> AsyncReadExt for R {}` in `async_read_ext.rs`
-        sink(v4); // $ MISSING: hasTaintFlow="file.txt" -- we cannot resolve the `read_i64_le` call above, which comes from `impl<R: AsyncRead + ?Sized> AsyncReadExt for R {}` in `async_read_ext.rs`
-    }
-
-    {
-        let mut buffer = bytes::BytesMut::new();
-        file.read_buf(&mut buffer).await?;
-        sink(&buffer); // $ MISSING: hasTaintFlow="file.txt" -- we cannot resolve the `read_buf` call above, which comes from `impl<R: AsyncRead + ?Sized> AsyncReadExt for R {}` in `async_read_ext.rs`
-    }
-
-    // --- misc operations ---
-
-    {
-        let mut buffer = String::new();
-        let file1 = tokio::fs::File::open("file.txt").await?; // $ Alert[rust/summary/taint-sources]
-        let file2 = tokio::fs::File::open("another_file.txt").await?; // $ Alert[rust/summary/taint-sources]
-        let mut reader = file1.chain(file2);
-        reader.read_to_string(&mut buffer).await?;
-        sink(&buffer); // $ MISSING: hasTaintFlow="file.txt" hasTaintFlow="another_file.txt" -- we cannot resolve the `chain` and `read_to_string` calls above, which comes from `impl<R: AsyncRead + ?Sized> AsyncReadExt for R {}` in `async_read_ext.rs`
-    }
-
-    {
-        let mut buffer = String::new();
-        let file1 = tokio::fs::File::open("file.txt").await?; // $ Alert[rust/summary/taint-sources]
-        let mut reader = file1.take(100);
-        reader.read_to_string(&mut buffer).await?;
-        sink(&buffer); // $ MISSING: hasTaintFlow="file.txt" -- we cannot resolve the `take` and `read_to_string` calls above, which comes from `impl<R: AsyncRead + ?Sized> AsyncReadExt for R {}` in `async_read_ext.rs`
-    }
-
-    Ok(())
-}
-
-use std::net::ToSocketAddrs;
-
-async fn test_std_tcpstream(case: i64) -> std::io::Result<()> {
-    // using std::net to fetch a web page
-    let address = "example.com:80";
-
-    if case == 1 {
-        // create the connection
-        let mut stream = std::net::TcpStream::connect(address)?; // $ Alert[rust/summary/taint-sources]
-
-        // send request
-        let _ = stream.write_all(b"GET / HTTP/1.1\nHost:example.com\n\n");
-
-        // read response
-        let mut buffer = vec![0; 32 * 1024];
-        let _ = stream.read(&mut buffer);
-
-        println!("data = {:?}", buffer);
-        sink(&buffer); // $ hasTaintFlow=address
-        sink(buffer[0]); // $ hasTaintFlow=address
-
-        let buffer_string = String::from_utf8_lossy(&buffer);
-        println!("string = {}", buffer_string);
-        sink(buffer_string); // $ MISSING: hasTaintFlow
-    } else {
-        // create the connection
-        let sock_addr = address.to_socket_addrs().unwrap().next().unwrap();
-        let mut stream = std::net::TcpStream::connect_timeout(&sock_addr, std::time::Duration::new(1, 0))?; // $ Alert[rust/summary/taint-sources]
-
-        // send request
-        let _ = stream.write_all(b"GET / HTTP/1.1\nHost:example.com\n\n");
-
-        // read response
-        match case {
-            2 => {
-                let mut reader = std::io::BufReader::new(stream).take(256);
-                let mut line = String::new();
-                loop {
-                    match reader.read_line(&mut line) {
-                        Ok(0) => {
-                            println!("end");
-                            break;
-                        }
-                        Ok(_n) => {
-                            println!("line = {}", line);
-                            sink(&line); // $ hasTaintFlow=&sock_addr
-                            line.clear();
-                        }
-                        Err(e) => {
-                            println!("error: {}", e);
-                            break;
-                        }
-                    }
-                }
-            }
-            3 => {
-                let reader = std::io::BufReader::new(stream.try_clone()?).take(256);
-                for line in reader.lines() { // $ MISSING: Alert[rust/summary/taint-sources]
-                    if let Ok(string) = line {
-                        println!("line = {}", string);
-                        sink(string); // $ MISSING: hasTaintFlow
-                    }
-                }
-            }
-            _ => {}
-        }
-    }
-
-    Ok(())
-}
-
-use tokio::io::AsyncWriteExt;
-
-async fn test_tokio_tcpstream(case: i64) -> std::io::Result<()> {
-    // using tokio::io to fetch a web page
-    let address = "example.com:80";
-
-    // create the connection
-    println!("connecting to {}...", address);
-    let mut tokio_stream = tokio::net::TcpStream::connect(address).await?; // $ Alert[rust/summary/taint-sources]
-
-    // send request
-    tokio_stream.write_all(b"GET / HTTP/1.1\nHost:example.com\n\n").await?;
-
-    if case == 1 {
-        // peek response
-        let mut buffer1 = vec![0; 2 * 1024];
-        let _ = tokio_stream.peek(&mut buffer1).await?;
-
-        // read response
-        let mut buffer2 = vec![0; 2 * 1024];
-        let n2 = tokio_stream.read(&mut buffer2).await?;
-
-        println!("buffer1 = {:?}", buffer1);
-        sink(&buffer1); // $ hasTaintFlow=address
-        sink(buffer1[0]); // $ hasTaintFlow=address
-
-        println!("buffer2 = {:?}", buffer2);
-        sink(&buffer2); // $ MISSING: hasTaintFlow=address -- we cannot resolve the `read` call above, which comes from `impl<R: AsyncRead + ?Sized> AsyncReadExt for R {}` in `async_read_ext.rs`
-        sink(buffer2[0]); // $ MISSING: hasTaintFlow=address -- we cannot resolve the `read` call above, which comes from `impl<R: AsyncRead + ?Sized> AsyncReadExt for R {}` in `async_read_ext.rs`
-
-        let buffer_string = String::from_utf8_lossy(&buffer2[..n2]);
-        println!("string = {}", buffer_string);
-        sink(buffer_string); // $ MISSING: hasTaintFlow
-    } else if case == 2 {
-        let mut buffer = [0; 2 * 1024];
-        loop {
-            match tokio_stream.try_read(&mut buffer) {
-                Ok(0) => {
-                    println!("end");
-                    break;
-                }
-                Ok(_n) => {
-                    println!("buffer = {:?}", buffer);
-                    sink(&buffer); // $ hasTaintFlow=address
-                    break; // (or we could wait for more data)
-                }
-                Err(ref e) if e.kind() == std::io::ErrorKind::WouldBlock => {
-                    // wait...
-                    continue;
-                }
-                Err(e) => {
-                    println!("error: {}", e);
-                    break;
-                }
-            }
-        }
-    } else {
-        let mut buffer = Vec::new();
-        loop {
-            match tokio_stream.try_read_buf(&mut buffer) {
-                Ok(0) => {
-                    println!("end");
-                    break;
-                }
-                Ok(_n) => {
-                    println!("buffer = {:?}", buffer);
-                    sink(&buffer); // $ hasTaintFlow=address
-                    break; // (or we could wait for more data)
-                }
-                Err(ref e) if e.kind() == std::io::ErrorKind::WouldBlock => {
-                    // wait...
-                    continue;
-                }
-                Err(e) => {
-                    println!("error: {}", e);
-                    break;
-                }
-            }
-        }
-    }
-
-    Ok(())
-}
-
-async fn test_std_to_tokio_tcpstream() -> std::io::Result<()> {
-    // using tokio::io to fetch a web page
-    let address = "example.com:80";
-
-    // create the connection
-    println!("connecting to {}...", address);
-    let std_stream = std::net::TcpStream::connect(address)?; // $ Alert[rust/summary/taint-sources]
-
-    // convert to tokio stream
-    std_stream.set_nonblocking(true)?;
-    let mut tokio_stream = tokio::net::TcpStream::from_std(std_stream)?;
-
-    // send request
-    tokio_stream.write_all(b"GET / HTTP/1.1\nHost:example.com\n\n").await?;
-
-    // read response
-    let mut buffer = vec![0; 32 * 1024];
-    let _n = tokio_stream.read(&mut buffer).await?; // $ MISSING: Alert[rust/summary/taint-sources]
-
-    println!("data = {:?}", buffer);
-    sink(&buffer); // $ MISSING: hasTaintFlow
-    sink(buffer[0]); // $ MISSING: hasTaintFlow
-
-    Ok(())
-}
-
-fn test_rustls() -> std::io::Result<()> {
-    let config = rustls::ClientConfig::builder()
-        .with_root_certificates(rustls::RootCertStore::empty())
-        .with_no_client_auth();
-    let server_name = rustls::pki_types::ServerName::try_from("www.example.com").unwrap();
-    let config_arc = std::sync::Arc::new(config);
-    let mut client = rustls::ClientConnection::new(config_arc, server_name).unwrap(); // $ Alert[rust/summary/taint-sources]
-    let mut reader = client.reader(); // We cannot resolve the `reader` call because it comes from `Deref`: https://docs.rs/rustls/latest/rustls/client/struct.ClientConnection.html#deref-methods-ConnectionCommon%3CClientConnectionData%3E
-    sink(&reader); // $ MISSING: hasTaintFlow=config_arc
-
-    {
-        let mut buffer = [0u8; 100];
-        let _bytes = reader.read(&mut buffer)?;
-        sink(&buffer); // $ MISSING: hasTaintFlow=config_arc
-    }
-
-    {
-        let mut buffer = Vec::<u8>::new();
-        let _bytes = reader.read_to_end(&mut buffer)?;
-        sink(&buffer); // $ MISSING: hasTaintFlow=config_arc
-    }
-
-    {
-        let mut buffer = String::new();
-        let _bytes = reader.read_to_string(&mut buffer)?;
-        sink(&buffer); // $ MISSING: hasTaintFlow=config_arc
-    }
-
-    Ok(())
-}
-
-#[tokio::main]
-async fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let case = std::env::args().nth(1).unwrap_or(String::from("1")).parse::<i64>().unwrap(); // $ Alert[rust/summary/taint-sources]
-
-    println!("test_env_vars...");
-    test_env_vars();
-
-    println!("test_env_args...");
-    test_env_args();
-
-    println!("test_env_dirs...");
-    test_env_dirs();
-
-    println!("test_reqwest...");
-    match futures::executor::block_on(test_reqwest()) {
-        Ok(_) => println!("complete"),
-        Err(e) => println!("error: {}", e),
-    }
-
-    println!("test_hyper_http...");
-    match futures::executor::block_on(test_hyper_http(case)) {
-        Ok(_) => println!("complete"),
-        Err(e) => println!("error: {}", e),
-    }
-
-    println!("test_io_stdin...");
-    match test_io_stdin() {
-        Ok(_) => println!("complete"),
-        Err(e) => println!("error: {}", e),
-    }
-
-    println!("test_tokio_stdin...");
-    match futures::executor::block_on(test_tokio_stdin()) {
-        Ok(_) => println!("complete"),
-        Err(e) => println!("error: {}", e),
-    }
-
-    println!("test_fs...");
-    match test_fs() {
-        Ok(_) => println!("complete"),
-        Err(e) => println!("error: {}", e),
-    }
-
-    println!("test_tokio_fs...");
-    match futures::executor::block_on(test_tokio_fs()) {
-        Ok(_) => println!("complete"),
-        Err(e) => println!("error: {}", e),
-    }
-
-    println!("test_io_file...");
-    match test_io_file() {
-        Ok(_) => println!("complete"),
-        Err(e) => println!("error: {}", e),
-    }
-
-    println!("test_tokio_file...");
-    match futures::executor::block_on(test_tokio_file()) {
-        Ok(_) => println!("complete"),
-        Err(e) => println!("error: {}", e),
-    }
-
-    println!("test_std_tcpstream...");
-    match futures::executor::block_on(test_std_tcpstream(case)) {
-        Ok(_) => println!("complete"),
-        Err(e) => println!("error: {}", e),
-    }
-
-    println!("test_tokio_tcpstream...");
-    match futures::executor::block_on(test_tokio_tcpstream(case)) {
-        Ok(_) => println!("complete"),
-        Err(e) => println!("error: {}", e),
-    }
-
-    println!("test_std_to_tokio_tcpstream...");
-    match futures::executor::block_on(test_std_to_tokio_tcpstream()) {
-        Ok(_) => println!("complete"),
-        Err(e) => println!("error: {}", e),
-    }
-
-    println!("test_rustls...");
-    match test_rustls() {
-        Ok(_) => println!("complete"),
-        Err(e) => println!("error: {}", e),
-    }
-
-    Ok(())
-}
diff --git a/rust/ql/test/library-tests/dataflow/sources/test_futures_io.rs b/rust/ql/test/library-tests/dataflow/sources/test_futures_io.rs
deleted file mode 100644
index 5139568fe51..00000000000
--- a/rust/ql/test/library-tests/dataflow/sources/test_futures_io.rs
+++ /dev/null
@@ -1,160 +0,0 @@
-fn sink<T>(_: T) {}
-
-// --- tests ---
-
-use async_std::net::TcpStream;
-use async_std::sync::Arc;
-use futures::io::AsyncBufRead;
-use futures::io::AsyncBufReadExt;
-use futures::io::AsyncRead;
-use futures::io::AsyncReadExt;
-use futures::StreamExt;
-use futures_rustls::TlsConnector;
-use std::io;
-use std::pin::Pin;
-use std::task::{Context, Poll};
-
-async fn test_futures_rustls_futures_io() -> io::Result<()> {
-    let url = "www.example.com:443";
-    let tcp = TcpStream::connect(url).await?; // $ Alert[rust/summary/taint-sources]
-    sink(&tcp); // $ hasTaintFlow=url
-    let config = rustls::ClientConfig::builder()
-        .with_root_certificates(rustls::RootCertStore::empty())
-        .with_no_client_auth();
-    let connector = TlsConnector::from(Arc::new(config));
-    let server_name = rustls::pki_types::ServerName::try_from("www.example.com").unwrap();
-    let mut reader = connector.connect(server_name, tcp).await?;
-    sink(&reader); // $ hasTaintFlow=url
-
-    {
-        // using the `AsyncRead` trait (low-level)
-        let mut buffer = [0u8; 64];
-        let mut pinned = Pin::new(&mut reader);
-        sink(&pinned); // $ hasTaintFlow=url
-        let mut cx = Context::from_waker(futures::task::noop_waker_ref());
-        let bytes_read = pinned.poll_read(&mut cx, &mut buffer); // we cannot correctly resolve this call, since it relies on `Deref`
-        if let Poll::Ready(Ok(n)) = bytes_read {
-            sink(&buffer); // $ MISSING: hasTaintFlow=url
-            sink(&buffer[..n]); // $ MISSING: hasTaintFlow=url
-        }
-    }
-
-    {
-        // using the `AsyncReadExt::read` extension method (higher-level)
-        let mut buffer1 = [0u8; 64];
-        let bytes_read1 = futures::io::AsyncReadExt::read(&mut reader, &mut buffer1).await?; // we cannot resolve the `read` call, which comes from `impl<R: AsyncRead + ?Sized> AsyncReadExt for R {}` in `async_read_ext.rs`
-        sink(&buffer1[..bytes_read1]); // $ MISSING: hasTaintFlow=url
-
-        let mut buffer2 = [0u8; 64];
-        let bytes_read2 = reader.read(&mut buffer2).await?; // we cannot resolve the `read` call, which comes from `impl<R: AsyncRead + ?Sized> AsyncReadExt for R {}` in `async_read_ext.rs`
-
-        sink(&buffer2[..bytes_read2]); // $ MISSING: hasTaintFlow=url
-    }
-
-    let mut reader2 = futures::io::BufReader::new(reader);
-    sink(&reader2); // $ hasTaintFlow=url
-
-    {
-        // using the `AsyncBufRead` trait (low-level)
-        let mut pinned = Pin::new(&mut reader2);
-        sink(&pinned); // $ hasTaintFlow=url
-        let mut cx = Context::from_waker(futures::task::noop_waker_ref());
-        let buffer = pinned.poll_fill_buf(&mut cx);
-        if let Poll::Ready(Ok(buf)) = buffer {
-            sink(&buffer); // $ hasTaintFlow=url
-            sink(buf); // $ MISSING: hasTaintFlow=url
-        }
-
-        // using the `AsyncBufRead` trait (alternative syntax)
-        let buffer2 = Pin::new(&mut reader2).poll_fill_buf(&mut cx);
-        match (buffer2) {
-            Poll::Ready(Ok(buf)) => {
-                sink(&buffer2); // $ hasTaintFlow=url
-                sink(buf); // $ hasTaintFlow=url
-            }
-            _ => {
-                // ...
-            }
-        }
-    }
-
-    {
-        // using the `AsyncBufReadExt::fill_buf` extension method (higher-level)
-        let buffer = reader2.fill_buf().await?; // we cannot resolve the `fill_buf` call, which comes from `impl<R: AsyncBufRead + ?Sized> AsyncBufReadExt for R {}` in `async_buf_read_ext.rs`
-        sink(buffer); // $ MISSING: hasTaintFlow=url
-    }
-
-    {
-        // using the `AsyncRead` trait (low-level)
-        let mut buffer = [0u8; 64];
-        let mut pinned = Pin::new(&mut reader2);
-        sink(&pinned); // $ hasTaintFlow=url
-        let mut cx = Context::from_waker(futures::task::noop_waker_ref());
-        let bytes_read = pinned.poll_read(&mut cx, &mut buffer);
-        sink(&buffer); // $ MISSING: hasTaintFlow=url
-        if let Poll::Ready(Ok(n)) = bytes_read {
-            sink(&buffer[..n]); // $ MISSING: hasTaintFlow=url
-        }
-    }
-
-    {
-        // using the `AsyncReadExt::read` extension method (higher-level)
-        let mut buffer1 = [0u8; 64];
-        let bytes_read1 = futures::io::AsyncReadExt::read(&mut reader2, &mut buffer1).await?; // we cannot resolve the `read` call, which comes from `impl<R: AsyncRead + ?Sized> AsyncReadExt for R {}` in `async_read_ext.rs`
-        sink(&buffer1[..bytes_read1]); // $ MISSING: hasTaintFlow=url
-
-        let mut buffer2 = [0u8; 64];
-        let bytes_read2 = reader2.read(&mut buffer2).await?; // we cannot resolve the `read` call, which comes from `impl<R: AsyncRead + ?Sized> AsyncReadExt for R {}` in `async_read_ext.rs`
-        sink(&buffer2[..bytes_read2]); // $ MISSING: hasTaintFlow=url
-    }
-
-    {
-        // using the `AsyncBufRead` trait (low-level)
-        let mut pinned = Pin::new(&mut reader2);
-        sink(&pinned); // $ hasTaintFlow=url
-        let mut cx = Context::from_waker(futures::task::noop_waker_ref());
-        let buffer = pinned.poll_fill_buf(&mut cx);
-        sink(&buffer); // $ hasTaintFlow=url
-        if let Poll::Ready(Ok(buf)) = buffer {
-            sink(buf); // $ MISSING: hasTaintFlow=url
-        }
-    }
-
-    {
-        // using the `AsyncBufReadExt::fill_buf` extension method (higher-level)
-        let buffer = reader2.fill_buf().await?; // we cannot resolve the `fill_buf` call, which comes from `impl<R: AsyncBufRead + ?Sized> AsyncBufReadExt for R {}` in `async_buf_read_ext.rs`
-        sink(buffer); // $ MISSING: hasTaintFlow=url
-    }
-
-    {
-        // using the `AsyncBufReadExt::read_until` extension method
-        let mut line = Vec::new();
-        let _bytes_read = reader2.read_until(b'\n', &mut line).await?; // we cannot resolve the `read_until` call, which comes from `impl<R: AsyncBufRead + ?Sized> AsyncBufReadExt for R {}` in `async_buf_read_ext.rs`
-        sink(&line); // $ MISSING: hasTaintFlow=url
-    }
-
-    {
-        // using the `AsyncBufReadExt::read_line` extension method
-        let mut line = String::new();
-        let _bytes_read = reader2.read_line(&mut line).await?; // we cannot resolve the `read_line` call, which comes from `impl<R: AsyncBufRead + ?Sized> AsyncBufReadExt for R {}` in `async_buf_read_ext.rs`
-        sink(&line); // $ MISSING: hasTaintFlow=url
-    }
-
-    {
-        // using the `AsyncBufReadExt::read_to_end` extension method
-        let mut buffer = Vec::with_capacity(1024);
-        let _bytes_read = reader2.read_to_end(&mut buffer).await?; // we cannot resolve the `read` call, which comes from `impl<R: AsyncRead + ?Sized> AsyncReadExt for R {}` in `async_read_ext.rs`
-        sink(&buffer); // $ MISSING: hasTaintFlow=url
-    }
-
-    {
-        // using the `AsyncBufReadExt::lines` extension method
-        let mut lines_stream = reader2.lines(); // we cannot resolve the `lines` call, which comes from `impl<R: AsyncBufRead + ?Sized> AsyncBufReadExt for R {}` in `async_buf_read_ext.rs`
-        sink(lines_stream.next().await.unwrap()); // $ MISSING: hasTaintFlow=url
-        while let Some(line) = lines_stream.next().await {
-            sink(line.unwrap()); // $ MISSING: hasTaintFlow
-        }
-    }
-
-    Ok(())
-}
diff --git a/rust/ql/test/library-tests/dataflow/sources/web_frameworks/CONSISTENCY/TypeInferenceConsistency.expected b/rust/ql/test/library-tests/dataflow/sources/web_frameworks/CONSISTENCY/TypeInferenceConsistency.expected
new file mode 100644
index 00000000000..08edbe8c612
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/sources/web_frameworks/CONSISTENCY/TypeInferenceConsistency.expected
@@ -0,0 +1,4 @@
+nonUniqueCertainType
+| test.rs:139:30:139:39 | ...::get(...) |  |
+| test.rs:140:34:140:43 | ...::get(...) |  |
+| test.rs:141:30:141:39 | ...::get(...) |  |
diff --git a/rust/ql/test/library-tests/dataflow/sources/web_frameworks/Cargo.lock b/rust/ql/test/library-tests/dataflow/sources/web_frameworks/Cargo.lock
new file mode 100644
index 00000000000..38298d50a71
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/sources/web_frameworks/Cargo.lock
@@ -0,0 +1,2055 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "actix-codec"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f7b0a21988c1bf877cf4759ef5ddaac04c1c9fe808c9142ecb78ba97d97a28a"
+dependencies = [
+ "bitflags",
+ "bytes",
+ "futures-core",
+ "futures-sink",
+ "memchr",
+ "pin-project-lite",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
+[[package]]
+name = "actix-http"
+version = "3.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7926860314cbe2fb5d1f13731e387ab43bd32bca224e82e6e2db85de0a3dba49"
+dependencies = [
+ "actix-codec",
+ "actix-rt",
+ "actix-service",
+ "actix-utils",
+ "base64",
+ "bitflags",
+ "brotli",
+ "bytes",
+ "bytestring",
+ "derive_more",
+ "encoding_rs",
+ "flate2",
+ "foldhash",
+ "futures-core",
+ "h2 0.3.27",
+ "http 0.2.12",
+ "httparse",
+ "httpdate",
+ "itoa",
+ "language-tags",
+ "local-channel",
+ "mime",
+ "percent-encoding",
+ "pin-project-lite",
+ "rand",
+ "sha1",
+ "smallvec",
+ "tokio",
+ "tokio-util",
+ "tracing",
+ "zstd",
+]
+
+[[package]]
+name = "actix-macros"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb"
+dependencies = [
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "actix-router"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13d324164c51f63867b57e73ba5936ea151b8a41a1d23d1031eeb9f70d0236f8"
+dependencies = [
+ "bytestring",
+ "cfg-if",
+ "http 0.2.12",
+ "regex",
+ "regex-lite",
+ "serde",
+ "tracing",
+]
+
+[[package]]
+name = "actix-rt"
+version = "2.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92589714878ca59a7626ea19734f0e07a6a875197eec751bb5d3f99e64998c63"
+dependencies = [
+ "futures-core",
+ "tokio",
+]
+
+[[package]]
+name = "actix-server"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a65064ea4a457eaf07f2fba30b4c695bf43b721790e9530d26cb6f9019ff7502"
+dependencies = [
+ "actix-rt",
+ "actix-service",
+ "actix-utils",
+ "futures-core",
+ "futures-util",
+ "mio",
+ "socket2 0.5.10",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "actix-service"
+version = "2.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e46f36bf0e5af44bdc4bdb36fbbd421aa98c79a9bce724e1edeb3894e10dc7f"
+dependencies = [
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "actix-utils"
+version = "3.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88a1dcdff1466e3c2488e1cb5c36a71822750ad43839937f85d2f4d9f8b705d8"
+dependencies = [
+ "local-waker",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "actix-web"
+version = "4.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a597b77b5c6d6a1e1097fddde329a83665e25c5437c696a3a9a4aa514a614dea"
+dependencies = [
+ "actix-codec",
+ "actix-http",
+ "actix-macros",
+ "actix-router",
+ "actix-rt",
+ "actix-server",
+ "actix-service",
+ "actix-utils",
+ "actix-web-codegen",
+ "bytes",
+ "bytestring",
+ "cfg-if",
+ "cookie",
+ "derive_more",
+ "encoding_rs",
+ "foldhash",
+ "futures-core",
+ "futures-util",
+ "impl-more",
+ "itoa",
+ "language-tags",
+ "log",
+ "mime",
+ "once_cell",
+ "pin-project-lite",
+ "regex",
+ "regex-lite",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "smallvec",
+ "socket2 0.5.10",
+ "time",
+ "tracing",
+ "url",
+]
+
+[[package]]
+name = "actix-web-codegen"
+version = "4.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f591380e2e68490b5dfaf1dd1aa0ebe78d84ba7067078512b4ea6e4492d622b8"
+dependencies = [
+ "actix-router",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "adler2"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "alloc-no-stdlib"
+version = "2.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3"
+
+[[package]]
+name = "alloc-stdlib"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece"
+dependencies = [
+ "alloc-no-stdlib",
+]
+
+[[package]]
+name = "atomic-waker"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+
+[[package]]
+name = "axum"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a18ed336352031311f4e0b4dd2ff392d4fbb370777c9d18d7fc9d7359f73871"
+dependencies = [
+ "axum-core",
+ "bytes",
+ "form_urlencoded",
+ "futures-util",
+ "http 1.3.1",
+ "http-body",
+ "http-body-util",
+ "hyper",
+ "hyper-util",
+ "itoa",
+ "matchit",
+ "memchr",
+ "mime",
+ "percent-encoding",
+ "pin-project-lite",
+ "serde_core",
+ "serde_json",
+ "serde_path_to_error",
+ "serde_urlencoded",
+ "sync_wrapper",
+ "tokio",
+ "tower",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "axum-core"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59446ce19cd142f8833f856eb31f3eb097812d1479ab224f54d72428ca21ea22"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "http 1.3.1",
+ "http-body",
+ "http-body-util",
+ "mime",
+ "pin-project-lite",
+ "sync_wrapper",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "base64"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+
+[[package]]
+name = "bitflags"
+version = "2.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
+
+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "brotli"
+version = "8.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4bd8b9603c7aa97359dbd97ecf258968c95f3adddd6db2f7e7a5bef101c84560"
+dependencies = [
+ "alloc-no-stdlib",
+ "alloc-stdlib",
+ "brotli-decompressor",
+]
+
+[[package]]
+name = "brotli-decompressor"
+version = "5.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "874bb8112abecc98cbd6d81ea4fa7e94fb9449648c93cc89aa40c81c24d7de03"
+dependencies = [
+ "alloc-no-stdlib",
+ "alloc-stdlib",
+]
+
+[[package]]
+name = "bytes"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
+
+[[package]]
+name = "bytestring"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "113b4343b5f6617e7ad401ced8de3cc8b012e73a594347c307b90db3e9271289"
+dependencies = [
+ "bytes",
+]
+
+[[package]]
+name = "cc"
+version = "1.2.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac9fe6cdbb24b6ade63616c0a0688e45bb56732262c158df3c0c4bea4ca47cb7"
+dependencies = [
+ "find-msvc-tools",
+ "jobserver",
+ "libc",
+ "shlex",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
+
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
+[[package]]
+name = "cookie"
+version = "0.16.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb"
+dependencies = [
+ "percent-encoding",
+ "time",
+ "version_check",
+]
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crc32fast"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "crypto-common"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
+[[package]]
+name = "deranged"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a41953f86f8a05768a6cda24def994fd2f424b04ec5c719cf89989779f199071"
+dependencies = [
+ "powerfmt",
+]
+
+[[package]]
+name = "derive_more"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678"
+dependencies = [
+ "derive_more-impl",
+]
+
+[[package]]
+name = "derive_more-impl"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "unicode-xid",
+]
+
+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer",
+ "crypto-common",
+]
+
+[[package]]
+name = "displaydoc"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "encoding_rs"
+version = "0.8.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
+
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127"
+
+[[package]]
+name = "flate2"
+version = "1.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc5a4e564e38c699f2880d3fda590bedc2e69f3f84cd48b457bd892ce61d0aa9"
+dependencies = [
+ "crc32fast",
+ "miniz_oxide",
+]
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "foldhash"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
+
+[[package]]
+name = "form_urlencoded"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf"
+dependencies = [
+ "percent-encoding",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
+dependencies = [
+ "futures-core",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
+
+[[package]]
+name = "futures-macro"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
+
+[[package]]
+name = "futures-task"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
+
+[[package]]
+name = "futures-util"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
+dependencies = [
+ "futures-core",
+ "futures-macro",
+ "futures-sink",
+ "futures-task",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
+[[package]]
+name = "generic-array"
+version = "0.14.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4bb6743198531e02858aeaea5398fcc883e71851fcbcb5a2f773e2fb6cb1edf2"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "r-efi",
+ "wasip2",
+]
+
+[[package]]
+name = "h2"
+version = "0.3.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0beca50380b1fc32983fc1cb4587bfa4bb9e78fc259aad4a0032d2080309222d"
+dependencies = [
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "http 0.2.12",
+ "indexmap",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
+[[package]]
+name = "h2"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3c0b69cfcb4e1b9f1bf2f53f95f766e4661169728ec61cd3fe5a0166f2d1386"
+dependencies = [
+ "atomic-waker",
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "http 1.3.1",
+ "indexmap",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d"
+
+[[package]]
+name = "headers"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3314d5adb5d94bcdf56771f2e50dbbc80bb4bdf88967526706205ac9eff24eb"
+dependencies = [
+ "base64",
+ "bytes",
+ "headers-core",
+ "http 1.3.1",
+ "httpdate",
+ "mime",
+ "sha1",
+]
+
+[[package]]
+name = "headers-core"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54b4a22553d4242c49fddb9ba998a99962b5cc6f22cb5a3482bec22522403ce4"
+dependencies = [
+ "http 1.3.1",
+]
+
+[[package]]
+name = "http"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
+[[package]]
+name = "http"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
+[[package]]
+name = "http-body"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
+dependencies = [
+ "bytes",
+ "http 1.3.1",
+]
+
+[[package]]
+name = "http-body-util"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "http 1.3.1",
+ "http-body",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "httparse"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
+
+[[package]]
+name = "httpdate"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
+
+[[package]]
+name = "hyper"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb3aa54a13a0dfe7fbe3a59e0c76093041720fdc77b110cc0fc260fafb4dc51e"
+dependencies = [
+ "atomic-waker",
+ "bytes",
+ "futures-channel",
+ "futures-core",
+ "h2 0.4.12",
+ "http 1.3.1",
+ "http-body",
+ "httparse",
+ "httpdate",
+ "itoa",
+ "pin-project-lite",
+ "pin-utils",
+ "smallvec",
+ "tokio",
+]
+
+[[package]]
+name = "hyper-util"
+version = "0.1.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c6995591a8f1380fcb4ba966a252a4b29188d51d2b89e3a252f5305be65aea8"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "http 1.3.1",
+ "http-body",
+ "hyper",
+ "pin-project-lite",
+ "tokio",
+ "tower-service",
+]
+
+[[package]]
+name = "icu_collections"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47"
+dependencies = [
+ "displaydoc",
+ "potential_utf",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locale_core"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3"
+
+[[package]]
+name = "icu_properties"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locale_core",
+ "icu_properties_data",
+ "icu_provider",
+ "potential_utf",
+ "zerotrie",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632"
+
+[[package]]
+name = "icu_provider"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af"
+dependencies = [
+ "displaydoc",
+ "icu_locale_core",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerotrie",
+ "zerovec",
+]
+
+[[package]]
+name = "idna"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
+]
+
+[[package]]
+name = "impl-more"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8a5a9a0ff0086c7a148acb942baaabeadf9504d10400b5a05645853729b9cd2"
+
+[[package]]
+name = "indexmap"
+version = "2.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6717a8d2a5a929a1a2eb43a12812498ed141a0bcfb7e8f7844fbdbe4303bba9f"
+dependencies = [
+ "equivalent",
+ "hashbrown",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
+
+[[package]]
+name = "jobserver"
+version = "0.1.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"
+dependencies = [
+ "getrandom",
+ "libc",
+]
+
+[[package]]
+name = "language-tags"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388"
+
+[[package]]
+name = "libc"
+version = "0.2.177"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
+
+[[package]]
+name = "litemap"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
+
+[[package]]
+name = "local-channel"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6cbc85e69b8df4b8bb8b89ec634e7189099cea8927a276b7384ce5488e53ec8"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+ "local-waker",
+]
+
+[[package]]
+name = "local-waker"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d873d7c67ce09b42110d801813efbc9364414e356be9935700d368351657487"
+
+[[package]]
+name = "lock_api"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
+dependencies = [
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
+
+[[package]]
+name = "matchit"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3"
+
+[[package]]
+name = "memchr"
+version = "2.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
+
+[[package]]
+name = "mime"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
+
+[[package]]
+name = "mime_guess"
+version = "2.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e"
+dependencies = [
+ "mime",
+ "unicase",
+]
+
+[[package]]
+name = "miniz_oxide"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
+dependencies = [
+ "adler2",
+ "simd-adler32",
+]
+
+[[package]]
+name = "mio"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69d83b0086dc8ecf3ce9ae2874b2d1290252e2a30720bea58a5c6639b0092873"
+dependencies = [
+ "libc",
+ "log",
+ "wasi",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "nix"
+version = "0.30.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
+dependencies = [
+ "bitflags",
+ "cfg-if",
+ "cfg_aliases",
+ "libc",
+]
+
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
+[[package]]
+name = "once_cell"
+version = "1.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+
+[[package]]
+name = "parking_lot"
+version = "0.12.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a"
+dependencies = [
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "windows-link",
+]
+
+[[package]]
+name = "percent-encoding"
+version = "2.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
+
+[[package]]
+name = "pin-project"
+version = "1.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677f1add503faace112b9f1373e43e9e054bfdd22ff1a63c1bc485eaec6a6a8a"
+dependencies = [
+ "pin-project-internal",
+]
+
+[[package]]
+name = "pin-project-internal"
+version = "1.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "pkg-config"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
+
+[[package]]
+name = "poem"
+version = "3.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f977080932c87287147dca052951c3e2696f8759863f6b4e4c0c9ffe7a4cc8b"
+dependencies = [
+ "bytes",
+ "futures-util",
+ "headers",
+ "http 1.3.1",
+ "http-body-util",
+ "hyper",
+ "hyper-util",
+ "mime",
+ "nix",
+ "parking_lot",
+ "percent-encoding",
+ "pin-project-lite",
+ "poem-derive",
+ "regex",
+ "rfc7239",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "smallvec",
+ "sync_wrapper",
+ "thiserror",
+ "tokio",
+ "tokio-util",
+ "tracing",
+ "wildmatch",
+]
+
+[[package]]
+name = "poem-derive"
+version = "3.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "056e2fea6de1cb240ffe23cfc4fc370b629f8be83b5f27e16b7acd5231a72de4"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "potential_utf"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84df19adbe5b5a0782edcab45899906947ab039ccf4573713735ee7de1e6b08a"
+dependencies = [
+ "zerovec",
+]
+
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
+dependencies = [
+ "zerocopy",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983"
+dependencies = [
+ "toml_edit",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.101"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "r-efi"
+version = "5.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
+
+[[package]]
+name = "rand"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
+dependencies = [
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
+dependencies = [
+ "bitflags",
+]
+
+[[package]]
+name = "regex"
+version = "1.12.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-lite"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d942b98df5e658f56f20d592c7f868833fe38115e65c33003d8cd224b0155da"
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
+
+[[package]]
+name = "rfc7239"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a82f1d1e38e9a85bb58ffcfadf22ed6f2c94e8cd8581ec2b0f80a2a6858350f"
+dependencies = [
+ "uncased",
+]
+
+[[package]]
+name = "ryu"
+version = "1.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
+
+[[package]]
+name = "scoped-tls"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "serde"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+dependencies = [
+ "serde_core",
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.145"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
+dependencies = [
+ "itoa",
+ "memchr",
+ "ryu",
+ "serde",
+ "serde_core",
+]
+
+[[package]]
+name = "serde_path_to_error"
+version = "0.1.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10a9ff822e371bb5403e391ecd83e182e0e77ba7f6fe0160b795797109d1b457"
+dependencies = [
+ "itoa",
+ "serde",
+ "serde_core",
+]
+
+[[package]]
+name = "serde_urlencoded"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
+dependencies = [
+ "form_urlencoded",
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "sha1"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2a4719bff48cee6b39d12c020eeb490953ad2443b7055bd0b21fca26bd8c28b"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "simd-adler32"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+
+[[package]]
+name = "slab"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
+
+[[package]]
+name = "smallvec"
+version = "1.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
+
+[[package]]
+name = "socket2"
+version = "0.5.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "socket2"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881"
+dependencies = [
+ "libc",
+ "windows-sys 0.60.2",
+]
+
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
+
+[[package]]
+name = "syn"
+version = "2.0.107"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a26dbd934e5451d21ef060c018dae56fc073894c5a7896f882928a76e6d081b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "sync_wrapper"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
+dependencies = [
+ "futures-core",
+]
+
+[[package]]
+name = "synstructure"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "test"
+version = "0.0.1"
+dependencies = [
+ "actix-web",
+ "axum",
+ "poem",
+ "serde",
+ "serde_json",
+ "tokio",
+ "warp",
+]
+
+[[package]]
+name = "thiserror"
+version = "2.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "2.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "time"
+version = "0.3.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d"
+dependencies = [
+ "deranged",
+ "itoa",
+ "num-conv",
+ "powerfmt",
+ "serde",
+ "time-core",
+ "time-macros",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b"
+
+[[package]]
+name = "time-macros"
+version = "0.2.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3"
+dependencies = [
+ "num-conv",
+ "time-core",
+]
+
+[[package]]
+name = "tinystr"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
+[[package]]
+name = "tokio"
+version = "1.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408"
+dependencies = [
+ "bytes",
+ "libc",
+ "mio",
+ "parking_lot",
+ "pin-project-lite",
+ "signal-hook-registry",
+ "socket2 0.6.1",
+ "tokio-macros",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "tokio-util"
+version = "0.7.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14307c986784f72ef81c89db7d9e28d6ac26d16213b109ea501696195e6e3ce5"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "futures-sink",
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2cdb639ebbc97961c51720f858597f7f24c4fc295327923af55b74c3c724533"
+dependencies = [
+ "serde_core",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.23.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6485ef6d0d9b5d0ec17244ff7eb05310113c3f316f2d14200d4de56b3cb98f8d"
+dependencies = [
+ "indexmap",
+ "toml_datetime",
+ "toml_parser",
+ "winnow",
+]
+
+[[package]]
+name = "toml_parser"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0cbe268d35bdb4bb5a56a2de88d0ad0eb70af5384a99d648cd4b3d04039800e"
+dependencies = [
+ "winnow",
+]
+
+[[package]]
+name = "tower"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
+dependencies = [
+ "futures-core",
+ "futures-util",
+ "pin-project-lite",
+ "sync_wrapper",
+ "tokio",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "tower-layer"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
+
+[[package]]
+name = "tower-service"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
+
+[[package]]
+name = "tracing"
+version = "0.1.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
+dependencies = [
+ "log",
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678"
+dependencies = [
+ "once_cell",
+]
+
+[[package]]
+name = "typenum"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb"
+
+[[package]]
+name = "uncased"
+version = "0.9.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1b88fcfe09e89d3866a5c11019378088af2d24c3fbd4f0543f96b479ec90697"
+dependencies = [
+ "version_check",
+]
+
+[[package]]
+name = "unicase"
+version = "2.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "462eeb75aeb73aea900253ce739c8e18a67423fadf006037cd3ff27e82748a06"
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
+
+[[package]]
+name = "url"
+version = "2.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b"
+dependencies = [
+ "form_urlencoded",
+ "idna",
+ "percent-encoding",
+ "serde",
+]
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
+[[package]]
+name = "version_check"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+
+[[package]]
+name = "warp"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d06d9202adc1f15d709c4f4a2069be5428aa912cc025d6f268ac441ab066b0"
+dependencies = [
+ "bytes",
+ "futures-util",
+ "headers",
+ "http 1.3.1",
+ "http-body",
+ "http-body-util",
+ "hyper",
+ "hyper-util",
+ "log",
+ "mime",
+ "mime_guess",
+ "percent-encoding",
+ "pin-project",
+ "scoped-tls",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "tokio",
+ "tokio-util",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "wasi"
+version = "0.11.1+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
+
+[[package]]
+name = "wasip2"
+version = "1.0.1+wasi-0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
+dependencies = [
+ "wit-bindgen",
+]
+
+[[package]]
+name = "wildmatch"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39b7d07a236abaef6607536ccfaf19b396dbe3f5110ddb73d39f4562902ed382"
+
+[[package]]
+name = "windows-link"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
+dependencies = [
+ "windows-targets 0.53.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.61.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
+dependencies = [
+ "windows-link",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
+ "windows_i686_gnullvm 0.52.6",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.53.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
+dependencies = [
+ "windows-link",
+ "windows_aarch64_gnullvm 0.53.1",
+ "windows_aarch64_msvc 0.53.1",
+ "windows_i686_gnu 0.53.1",
+ "windows_i686_gnullvm 0.53.1",
+ "windows_i686_msvc 0.53.1",
+ "windows_x86_64_gnu 0.53.1",
+ "windows_x86_64_gnullvm 0.53.1",
+ "windows_x86_64_msvc 0.53.1",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
+
+[[package]]
+name = "winnow"
+version = "0.7.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "wit-bindgen"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
+
+[[package]]
+name = "writeable"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb"
+
+[[package]]
+name = "yoke"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.8.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.8.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
+[[package]]
+name = "zerotrie"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7aa2bd55086f1ab526693ecbe444205da57e25f4489879da80635a46d90e73b"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "zstd"
+version = "0.13.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a"
+dependencies = [
+ "zstd-safe",
+]
+
+[[package]]
+name = "zstd-safe"
+version = "7.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d"
+dependencies = [
+ "zstd-sys",
+]
+
+[[package]]
+name = "zstd-sys"
+version = "2.0.16+zstd.1.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91e19ebc2adc8f83e43039e79776e3fda8ca919132d68a1fed6a5faca2683748"
+dependencies = [
+ "cc",
+ "pkg-config",
+]
diff --git a/rust/ql/test/library-tests/dataflow/sources/web_frameworks/InlineFlow.expected b/rust/ql/test/library-tests/dataflow/sources/web_frameworks/InlineFlow.expected
new file mode 100644
index 00000000000..24a0cf78aec
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/sources/web_frameworks/InlineFlow.expected
@@ -0,0 +1,168 @@
+models
+| 1 | Source: <_ as warp::filter::Filter>::and_then; Argument[0].Parameter[0..7]; remote |
+| 2 | Source: <_ as warp::filter::Filter>::map; Argument[0].Parameter[0..7]; remote |
+| 3 | Source: <_ as warp::filter::Filter>::then; Argument[0].Parameter[0..7]; remote |
+| 4 | Source: <actix_web::resource::Resource>::to; Argument[0].Parameter[0..7]; remote |
+| 5 | Source: <actix_web::route::Route>::to; Argument[0].Parameter[0..7]; remote |
+| 6 | Summary: <actix_web::types::path::Path>::into_inner; Argument[self]; ReturnValue.Field[0]; taint |
+| 7 | Summary: <actix_web::types::path::Path>::into_inner; Argument[self]; ReturnValue.Field[1]; taint |
+| 8 | Summary: <actix_web::types::path::Path>::into_inner; Argument[self]; ReturnValue.Field[2]; taint |
+| 9 | Summary: <actix_web::types::path::Path>::into_inner; Argument[self]; ReturnValue; taint |
+| 10 | Summary: <alloc::string::String>::as_bytes; Argument[self]; ReturnValue; value |
+| 11 | Summary: <alloc::string::String>::as_str; Argument[self]; ReturnValue; value |
+edges
+| test.rs:11:31:11:31 | a | test.rs:13:14:13:14 | a | provenance |  |
+| test.rs:11:31:11:31 | a | test.rs:13:14:13:23 | a.as_str() | provenance | MaD:11 |
+| test.rs:11:31:11:31 | a | test.rs:14:14:14:14 | a | provenance |  |
+| test.rs:11:31:11:31 | a | test.rs:14:14:14:25 | a.as_bytes() | provenance | MaD:10 |
+| test.rs:11:31:11:31 | a | test.rs:15:14:15:14 | a | provenance |  |
+| test.rs:13:14:13:14 | a | test.rs:13:14:13:23 | a.as_str() | provenance | MaD:11 |
+| test.rs:14:14:14:14 | a | test.rs:14:14:14:25 | a.as_bytes() | provenance | MaD:10 |
+| test.rs:68:15:68:15 | a | test.rs:70:14:70:14 | a | provenance |  |
+| test.rs:98:9:98:31 | ...: ...::Path::<...> | test.rs:100:17:100:33 | path.into_inner() | provenance | MaD:9 |
+| test.rs:98:9:98:31 | ...: ...::Path::<...> | test.rs:100:17:100:33 | path.into_inner() [tuple.0] | provenance | MaD:6 |
+| test.rs:98:9:98:31 | ...: ...::Path::<...> | test.rs:100:17:100:33 | path.into_inner() [tuple.1] | provenance | MaD:7 |
+| test.rs:98:9:98:31 | ...: ...::Path::<...> | test.rs:100:17:100:33 | path.into_inner() [tuple.2] | provenance | MaD:8 |
+| test.rs:100:13:100:13 | a | test.rs:101:14:101:14 | a | provenance |  |
+| test.rs:100:13:100:13 | a | test.rs:101:14:101:23 | a.as_str() | provenance | MaD:11 |
+| test.rs:100:13:100:13 | a | test.rs:102:14:102:14 | a | provenance |  |
+| test.rs:100:13:100:13 | a | test.rs:102:14:102:25 | a.as_bytes() | provenance | MaD:10 |
+| test.rs:100:13:100:13 | a | test.rs:103:14:103:14 | a | provenance |  |
+| test.rs:100:13:100:13 | a [tuple.0] | test.rs:101:14:101:14 | a [tuple.0] | provenance |  |
+| test.rs:100:13:100:13 | a [tuple.0] | test.rs:101:14:101:23 | a.as_str() | provenance | MaD:11 |
+| test.rs:100:13:100:13 | a [tuple.0] | test.rs:102:14:102:14 | a [tuple.0] | provenance |  |
+| test.rs:100:13:100:13 | a [tuple.0] | test.rs:102:14:102:25 | a.as_bytes() | provenance | MaD:10 |
+| test.rs:100:13:100:13 | a [tuple.0] | test.rs:103:14:103:14 | a | provenance |  |
+| test.rs:100:13:100:13 | a [tuple.1] | test.rs:101:14:101:14 | a [tuple.1] | provenance |  |
+| test.rs:100:13:100:13 | a [tuple.1] | test.rs:101:14:101:23 | a.as_str() | provenance | MaD:11 |
+| test.rs:100:13:100:13 | a [tuple.1] | test.rs:102:14:102:14 | a [tuple.1] | provenance |  |
+| test.rs:100:13:100:13 | a [tuple.1] | test.rs:102:14:102:25 | a.as_bytes() | provenance | MaD:10 |
+| test.rs:100:13:100:13 | a [tuple.1] | test.rs:103:14:103:14 | a | provenance |  |
+| test.rs:100:13:100:13 | a [tuple.2] | test.rs:101:14:101:14 | a [tuple.2] | provenance |  |
+| test.rs:100:13:100:13 | a [tuple.2] | test.rs:101:14:101:23 | a.as_str() | provenance | MaD:11 |
+| test.rs:100:13:100:13 | a [tuple.2] | test.rs:102:14:102:14 | a [tuple.2] | provenance |  |
+| test.rs:100:13:100:13 | a [tuple.2] | test.rs:102:14:102:25 | a.as_bytes() | provenance | MaD:10 |
+| test.rs:100:13:100:13 | a [tuple.2] | test.rs:103:14:103:14 | a | provenance |  |
+| test.rs:100:17:100:33 | path.into_inner() | test.rs:100:13:100:13 | a | provenance |  |
+| test.rs:100:17:100:33 | path.into_inner() [tuple.0] | test.rs:100:13:100:13 | a [tuple.0] | provenance |  |
+| test.rs:100:17:100:33 | path.into_inner() [tuple.1] | test.rs:100:13:100:13 | a [tuple.1] | provenance |  |
+| test.rs:100:17:100:33 | path.into_inner() [tuple.2] | test.rs:100:13:100:13 | a [tuple.2] | provenance |  |
+| test.rs:101:14:101:14 | a | test.rs:101:14:101:23 | a.as_str() | provenance | MaD:11 |
+| test.rs:101:14:101:14 | a [tuple.0] | test.rs:101:14:101:23 | a.as_str() | provenance | MaD:11 |
+| test.rs:101:14:101:14 | a [tuple.1] | test.rs:101:14:101:23 | a.as_str() | provenance | MaD:11 |
+| test.rs:101:14:101:14 | a [tuple.2] | test.rs:101:14:101:23 | a.as_str() | provenance | MaD:11 |
+| test.rs:102:14:102:14 | a | test.rs:102:14:102:25 | a.as_bytes() | provenance | MaD:10 |
+| test.rs:102:14:102:14 | a [tuple.0] | test.rs:102:14:102:25 | a.as_bytes() | provenance | MaD:10 |
+| test.rs:102:14:102:14 | a [tuple.1] | test.rs:102:14:102:25 | a.as_bytes() | provenance | MaD:10 |
+| test.rs:102:14:102:14 | a [tuple.2] | test.rs:102:14:102:25 | a.as_bytes() | provenance | MaD:10 |
+| test.rs:109:9:109:41 | ...: ...::Path::<...> | test.rs:111:22:111:38 | path.into_inner() [tuple.0] | provenance | MaD:6 |
+| test.rs:109:9:109:41 | ...: ...::Path::<...> | test.rs:111:22:111:38 | path.into_inner() [tuple.1] | provenance | MaD:7 |
+| test.rs:111:13:111:18 | TuplePat [tuple.0] | test.rs:111:14:111:14 | a | provenance |  |
+| test.rs:111:13:111:18 | TuplePat [tuple.1] | test.rs:111:17:111:17 | b | provenance |  |
+| test.rs:111:14:111:14 | a | test.rs:113:14:113:14 | a | provenance |  |
+| test.rs:111:17:111:17 | b | test.rs:114:14:114:14 | b | provenance |  |
+| test.rs:111:22:111:38 | path.into_inner() [tuple.0] | test.rs:111:13:111:18 | TuplePat [tuple.0] | provenance |  |
+| test.rs:111:22:111:38 | path.into_inner() [tuple.1] | test.rs:111:13:111:18 | TuplePat [tuple.1] | provenance |  |
+| test.rs:127:5:127:20 | to | test.rs:129:9:129:31 | ...: ...::Path::<...> | provenance | Src:MaD:4  |
+| test.rs:129:9:129:31 | ...: ...::Path::<...> | test.rs:131:17:131:33 | path.into_inner() | provenance | MaD:9 |
+| test.rs:129:9:129:31 | ...: ...::Path::<...> | test.rs:131:17:131:33 | path.into_inner() [tuple.0] | provenance | MaD:6 |
+| test.rs:129:9:129:31 | ...: ...::Path::<...> | test.rs:131:17:131:33 | path.into_inner() [tuple.1] | provenance | MaD:7 |
+| test.rs:129:9:129:31 | ...: ...::Path::<...> | test.rs:131:17:131:33 | path.into_inner() [tuple.2] | provenance | MaD:8 |
+| test.rs:131:13:131:13 | a | test.rs:132:14:132:14 | a | provenance |  |
+| test.rs:131:13:131:13 | a [tuple.0] | test.rs:132:14:132:14 | a | provenance |  |
+| test.rs:131:13:131:13 | a [tuple.1] | test.rs:132:14:132:14 | a | provenance |  |
+| test.rs:131:13:131:13 | a [tuple.2] | test.rs:132:14:132:14 | a | provenance |  |
+| test.rs:131:17:131:33 | path.into_inner() | test.rs:131:13:131:13 | a | provenance |  |
+| test.rs:131:17:131:33 | path.into_inner() [tuple.0] | test.rs:131:13:131:13 | a [tuple.0] | provenance |  |
+| test.rs:131:17:131:33 | path.into_inner() [tuple.1] | test.rs:131:13:131:13 | a [tuple.1] | provenance |  |
+| test.rs:131:17:131:33 | path.into_inner() [tuple.2] | test.rs:131:13:131:13 | a [tuple.2] | provenance |  |
+| test.rs:139:41:139:42 | to | test.rs:98:9:98:31 | ...: ...::Path::<...> | provenance | Src:MaD:5  |
+| test.rs:140:45:140:46 | to | test.rs:109:9:109:41 | ...: ...::Path::<...> | provenance | Src:MaD:5  |
+| test.rs:242:33:242:35 | map | test.rs:242:38:242:46 | ...: String | provenance | Src:MaD:2  |
+| test.rs:242:38:242:46 | ...: String | test.rs:244:18:244:18 | a | provenance |  |
+| test.rs:250:46:250:49 | then | test.rs:251:25:251:33 | ...: String | provenance | Src:MaD:3  |
+| test.rs:251:25:251:33 | ...: String | test.rs:252:22:252:22 | a | provenance |  |
+| test.rs:259:50:259:57 | and_then | test.rs:260:26:260:32 | ...: u64 | provenance | Src:MaD:1  |
+| test.rs:260:26:260:32 | ...: u64 | test.rs:263:22:263:23 | id | provenance |  |
+| test.rs:272:75:272:77 | map | test.rs:273:15:273:23 | ...: String | provenance | Src:MaD:2  |
+| test.rs:273:15:273:23 | ...: String | test.rs:275:22:275:22 | a | provenance |  |
+nodes
+| test.rs:11:31:11:31 | a | semmle.label | a |
+| test.rs:13:14:13:14 | a | semmle.label | a |
+| test.rs:13:14:13:23 | a.as_str() | semmle.label | a.as_str() |
+| test.rs:14:14:14:14 | a | semmle.label | a |
+| test.rs:14:14:14:25 | a.as_bytes() | semmle.label | a.as_bytes() |
+| test.rs:15:14:15:14 | a | semmle.label | a |
+| test.rs:68:15:68:15 | a | semmle.label | a |
+| test.rs:70:14:70:14 | a | semmle.label | a |
+| test.rs:98:9:98:31 | ...: ...::Path::<...> | semmle.label | ...: ...::Path::<...> |
+| test.rs:100:13:100:13 | a | semmle.label | a |
+| test.rs:100:13:100:13 | a [tuple.0] | semmle.label | a [tuple.0] |
+| test.rs:100:13:100:13 | a [tuple.1] | semmle.label | a [tuple.1] |
+| test.rs:100:13:100:13 | a [tuple.2] | semmle.label | a [tuple.2] |
+| test.rs:100:17:100:33 | path.into_inner() | semmle.label | path.into_inner() |
+| test.rs:100:17:100:33 | path.into_inner() [tuple.0] | semmle.label | path.into_inner() [tuple.0] |
+| test.rs:100:17:100:33 | path.into_inner() [tuple.1] | semmle.label | path.into_inner() [tuple.1] |
+| test.rs:100:17:100:33 | path.into_inner() [tuple.2] | semmle.label | path.into_inner() [tuple.2] |
+| test.rs:101:14:101:14 | a | semmle.label | a |
+| test.rs:101:14:101:14 | a [tuple.0] | semmle.label | a [tuple.0] |
+| test.rs:101:14:101:14 | a [tuple.1] | semmle.label | a [tuple.1] |
+| test.rs:101:14:101:14 | a [tuple.2] | semmle.label | a [tuple.2] |
+| test.rs:101:14:101:23 | a.as_str() | semmle.label | a.as_str() |
+| test.rs:102:14:102:14 | a | semmle.label | a |
+| test.rs:102:14:102:14 | a [tuple.0] | semmle.label | a [tuple.0] |
+| test.rs:102:14:102:14 | a [tuple.1] | semmle.label | a [tuple.1] |
+| test.rs:102:14:102:14 | a [tuple.2] | semmle.label | a [tuple.2] |
+| test.rs:102:14:102:25 | a.as_bytes() | semmle.label | a.as_bytes() |
+| test.rs:103:14:103:14 | a | semmle.label | a |
+| test.rs:109:9:109:41 | ...: ...::Path::<...> | semmle.label | ...: ...::Path::<...> |
+| test.rs:111:13:111:18 | TuplePat [tuple.0] | semmle.label | TuplePat [tuple.0] |
+| test.rs:111:13:111:18 | TuplePat [tuple.1] | semmle.label | TuplePat [tuple.1] |
+| test.rs:111:14:111:14 | a | semmle.label | a |
+| test.rs:111:17:111:17 | b | semmle.label | b |
+| test.rs:111:22:111:38 | path.into_inner() [tuple.0] | semmle.label | path.into_inner() [tuple.0] |
+| test.rs:111:22:111:38 | path.into_inner() [tuple.1] | semmle.label | path.into_inner() [tuple.1] |
+| test.rs:113:14:113:14 | a | semmle.label | a |
+| test.rs:114:14:114:14 | b | semmle.label | b |
+| test.rs:127:5:127:20 | to | semmle.label | to |
+| test.rs:129:9:129:31 | ...: ...::Path::<...> | semmle.label | ...: ...::Path::<...> |
+| test.rs:131:13:131:13 | a | semmle.label | a |
+| test.rs:131:13:131:13 | a [tuple.0] | semmle.label | a [tuple.0] |
+| test.rs:131:13:131:13 | a [tuple.1] | semmle.label | a [tuple.1] |
+| test.rs:131:13:131:13 | a [tuple.2] | semmle.label | a [tuple.2] |
+| test.rs:131:17:131:33 | path.into_inner() | semmle.label | path.into_inner() |
+| test.rs:131:17:131:33 | path.into_inner() [tuple.0] | semmle.label | path.into_inner() [tuple.0] |
+| test.rs:131:17:131:33 | path.into_inner() [tuple.1] | semmle.label | path.into_inner() [tuple.1] |
+| test.rs:131:17:131:33 | path.into_inner() [tuple.2] | semmle.label | path.into_inner() [tuple.2] |
+| test.rs:132:14:132:14 | a | semmle.label | a |
+| test.rs:139:41:139:42 | to | semmle.label | to |
+| test.rs:140:45:140:46 | to | semmle.label | to |
+| test.rs:242:33:242:35 | map | semmle.label | map |
+| test.rs:242:38:242:46 | ...: String | semmle.label | ...: String |
+| test.rs:244:18:244:18 | a | semmle.label | a |
+| test.rs:250:46:250:49 | then | semmle.label | then |
+| test.rs:251:25:251:33 | ...: String | semmle.label | ...: String |
+| test.rs:252:22:252:22 | a | semmle.label | a |
+| test.rs:259:50:259:57 | and_then | semmle.label | and_then |
+| test.rs:260:26:260:32 | ...: u64 | semmle.label | ...: u64 |
+| test.rs:263:22:263:23 | id | semmle.label | id |
+| test.rs:272:75:272:77 | map | semmle.label | map |
+| test.rs:273:15:273:23 | ...: String | semmle.label | ...: String |
+| test.rs:275:22:275:22 | a | semmle.label | a |
+subpaths
+testFailures
+#select
+| test.rs:13:14:13:23 | a.as_str() | test.rs:11:31:11:31 | a | test.rs:13:14:13:23 | a.as_str() | $@ | test.rs:11:31:11:31 | a | a |
+| test.rs:14:14:14:25 | a.as_bytes() | test.rs:11:31:11:31 | a | test.rs:14:14:14:25 | a.as_bytes() | $@ | test.rs:11:31:11:31 | a | a |
+| test.rs:15:14:15:14 | a | test.rs:11:31:11:31 | a | test.rs:15:14:15:14 | a | $@ | test.rs:11:31:11:31 | a | a |
+| test.rs:70:14:70:14 | a | test.rs:68:15:68:15 | a | test.rs:70:14:70:14 | a | $@ | test.rs:68:15:68:15 | a | a |
+| test.rs:101:14:101:23 | a.as_str() | test.rs:139:41:139:42 | to | test.rs:101:14:101:23 | a.as_str() | $@ | test.rs:139:41:139:42 | to | to |
+| test.rs:102:14:102:25 | a.as_bytes() | test.rs:139:41:139:42 | to | test.rs:102:14:102:25 | a.as_bytes() | $@ | test.rs:139:41:139:42 | to | to |
+| test.rs:103:14:103:14 | a | test.rs:139:41:139:42 | to | test.rs:103:14:103:14 | a | $@ | test.rs:139:41:139:42 | to | to |
+| test.rs:113:14:113:14 | a | test.rs:140:45:140:46 | to | test.rs:113:14:113:14 | a | $@ | test.rs:140:45:140:46 | to | to |
+| test.rs:114:14:114:14 | b | test.rs:140:45:140:46 | to | test.rs:114:14:114:14 | b | $@ | test.rs:140:45:140:46 | to | to |
+| test.rs:132:14:132:14 | a | test.rs:127:5:127:20 | to | test.rs:132:14:132:14 | a | $@ | test.rs:127:5:127:20 | to | to |
+| test.rs:244:18:244:18 | a | test.rs:242:33:242:35 | map | test.rs:244:18:244:18 | a | $@ | test.rs:242:33:242:35 | map | map |
+| test.rs:252:22:252:22 | a | test.rs:250:46:250:49 | then | test.rs:252:22:252:22 | a | $@ | test.rs:250:46:250:49 | then | then |
+| test.rs:263:22:263:23 | id | test.rs:259:50:259:57 | and_then | test.rs:263:22:263:23 | id | $@ | test.rs:259:50:259:57 | and_then | and_then |
+| test.rs:275:22:275:22 | a | test.rs:272:75:272:77 | map | test.rs:275:22:275:22 | a | $@ | test.rs:272:75:272:77 | map | map |
diff --git a/rust/ql/test/library-tests/dataflow/sources/web_frameworks/InlineFlow.qlref b/rust/ql/test/library-tests/dataflow/sources/web_frameworks/InlineFlow.qlref
new file mode 100644
index 00000000000..e0f7493db39
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/sources/web_frameworks/InlineFlow.qlref
@@ -0,0 +1,2 @@
+query: ../env/InlineFlow.ql
+
diff --git a/rust/ql/test/library-tests/dataflow/sources/web_frameworks/TaintSources.expected b/rust/ql/test/library-tests/dataflow/sources/web_frameworks/TaintSources.expected
new file mode 100644
index 00000000000..20a20ce3f9b
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/sources/web_frameworks/TaintSources.expected
@@ -0,0 +1,69 @@
+| test.rs:11:31:11:31 | a | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:22:14:22:19 | TuplePat | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:48:14:48:30 | MyStruct {...} | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:58:14:58:15 | ms | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:68:15:68:15 | a | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:127:5:127:20 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:127:5:127:20 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:127:5:127:20 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:127:5:127:20 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:127:5:127:20 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:127:5:127:20 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:127:5:127:20 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:127:5:127:20 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:139:41:139:42 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:139:41:139:42 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:139:41:139:42 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:139:41:139:42 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:139:41:139:42 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:139:41:139:42 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:139:41:139:42 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:139:41:139:42 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:140:45:140:46 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:140:45:140:46 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:140:45:140:46 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:140:45:140:46 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:140:45:140:46 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:140:45:140:46 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:140:45:140:46 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:140:45:140:46 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:141:41:141:42 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:141:41:141:42 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:141:41:141:42 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:141:41:141:42 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:141:41:141:42 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:141:41:141:42 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:141:41:141:42 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:141:41:141:42 | to | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:242:33:242:35 | map | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:242:33:242:35 | map | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:242:33:242:35 | map | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:242:33:242:35 | map | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:242:33:242:35 | map | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:242:33:242:35 | map | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:242:33:242:35 | map | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:242:33:242:35 | map | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:250:46:250:49 | then | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:250:46:250:49 | then | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:250:46:250:49 | then | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:250:46:250:49 | then | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:250:46:250:49 | then | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:250:46:250:49 | then | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:250:46:250:49 | then | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:250:46:250:49 | then | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:259:50:259:57 | and_then | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:259:50:259:57 | and_then | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:259:50:259:57 | and_then | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:259:50:259:57 | and_then | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:259:50:259:57 | and_then | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:259:50:259:57 | and_then | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:259:50:259:57 | and_then | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:259:50:259:57 | and_then | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:272:75:272:77 | map | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:272:75:272:77 | map | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:272:75:272:77 | map | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:272:75:272:77 | map | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:272:75:272:77 | map | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:272:75:272:77 | map | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:272:75:272:77 | map | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:272:75:272:77 | map | Flow source 'RemoteSource' of type remote (DEFAULT). |
diff --git a/rust/ql/test/library-tests/dataflow/sources/web_frameworks/TaintSources.qlref b/rust/ql/test/library-tests/dataflow/sources/web_frameworks/TaintSources.qlref
new file mode 100644
index 00000000000..7aa95121af3
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/sources/web_frameworks/TaintSources.qlref
@@ -0,0 +1,2 @@
+query: queries/summary/TaintSources.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/rust/ql/test/library-tests/dataflow/sources/web_frameworks/options.yml b/rust/ql/test/library-tests/dataflow/sources/web_frameworks/options.yml
new file mode 100644
index 00000000000..f13960c5c30
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/sources/web_frameworks/options.yml
@@ -0,0 +1,9 @@
+qltest_cargo_check: true
+qltest_dependencies:
+    - actix-web = { version = "4.10.2" }
+    - axum = { version = "0.8.4" }
+    - poem = { version = "3.1.10" }
+    - serde = { version = "1.0.219" }
+    - serde_json = { version = "1.0.140" }
+    - tokio = { version = "1.43.0", features = ["full"] }
+    - warp = { version = "0.4.2", features = ["server"] }
diff --git a/rust/ql/test/library-tests/dataflow/sources/web_frameworks.rs b/rust/ql/test/library-tests/dataflow/sources/web_frameworks/test.rs
similarity index 69%
rename from rust/ql/test/library-tests/dataflow/sources/web_frameworks.rs
rename to rust/ql/test/library-tests/dataflow/sources/web_frameworks/test.rs
index 32cae626593..3bcea0dee4e 100644
--- a/rust/ql/test/library-tests/dataflow/sources/web_frameworks.rs
+++ b/rust/ql/test/library-tests/dataflow/sources/web_frameworks/test.rs
@@ -95,50 +95,50 @@ mod actix_test {
     use actix_web::{get, web, App};
 
     async fn my_actix_handler_1(
-        path: web::Path<String>, // $ MISSING: Alert[rust/summary/taint-sources]
+        path: web::Path<String>,
     ) -> String {
         let a = path.into_inner();
-        sink(a.as_str()); // $ MISSING: hasTaintFlow
-        sink(a.as_bytes()); // $ MISSING: hasTaintFlow
-        sink(a); // $ MISSING: hasTaintFlow
+        sink(a.as_str()); // $ hasTaintFlow=my_actix_handler_1
+        sink(a.as_bytes()); // $ hasTaintFlow=my_actix_handler_1
+        sink(a); // $ hasTaintFlow=my_actix_handler_1
 
         "".to_string()
     }
 
     async fn my_actix_handler_2(
-        path: web::Path<(String, String)>, // $ MISSING: Alert[rust/summary/taint-sources]
+        path: web::Path<(String, String)>,
     ) -> String {
         let (a, b) = path.into_inner();
 
-        sink(a); // $ MISSING: hasTaintFlow
-        sink(b); // $ MISSING: hasTaintFlow
+        sink(a); // $ hasTaintFlow=my_actix_handler_2
+        sink(b); // $ hasTaintFlow=my_actix_handler_2
 
         "".to_string()
     }
 
     async fn my_actix_handler_3(
-        web::Query(a): web::Query<String>, // $ MISSING: Alert[rust/summary/taint-sources]
+        web::Query(a): web::Query<String>,
     ) -> String {
         sink(a); // $ MISSING: hasTaintFlow
 
         "".to_string()
     }
 
-    #[get("/4/{a}")]
+    #[get("/4/{a}")] // $ Alert[rust/summary/taint-sources]
     async fn my_actix_handler_4(
-        path: web::Path<String>, // $ MISSING: Alert[rust/summary/taint-sources]
+        path: web::Path<String>,
     ) -> String {
         let a = path.into_inner();
-        sink(a); // $ MISSING: hasTaintFlow
+        sink(a); // $ hasTaintFlow=my_actix_handler_4
 
         "".to_string()
     }
 
     async fn test_actix() {
         let app = App::new()
-            .route("/1/{a}", web::get().to(my_actix_handler_1))
-            .route("/2/{a}/{b}", web::get().to(my_actix_handler_2))
-            .route("/3/{a}", web::get().to(my_actix_handler_3))
+            .route("/1/{a}", web::get().to(my_actix_handler_1)) // $ Alert[rust/summary/taint-sources]
+            .route("/2/{a}/{b}", web::get().to(my_actix_handler_2)) // $ Alert[rust/summary/taint-sources]
+            .route("/3/{a}", web::get().to(my_actix_handler_3)) // $ Alert[rust/summary/taint-sources]
             .service(my_actix_handler_4);
 
         // ...
@@ -229,3 +229,61 @@ mod axum_test {
         // ...
     }
 }
+
+mod warp_test {
+    use super::sink;
+    use warp::Filter;
+
+    #[tokio::main]
+    #[rustfmt::skip]
+    async fn test_warp() {
+        // A route with parameter and `map`
+        let map_route =
+            warp::path::param().map(|a: String| // $ Alert[rust/summary/taint-sources]
+            {
+            sink(a); // $ hasTaintFlow
+
+            "".to_string()
+        });
+
+        // A route with parameter and `then`
+        let then_route = warp::path::param().then( // $ Alert[rust/summary/taint-sources]
+            async move |a: String| {
+                sink(a); // $ hasTaintFlow
+
+                "".to_string()
+            },
+        );
+
+        // A route with parameter and `and_then`
+        let and_then_route = warp::path::param().and_then( // $ Alert[rust/summary/taint-sources] 
+            async move | id: u64 |
+            {
+            if id != 0 {
+                sink(id); // $ hasTaintFlow
+                Ok("".to_string())
+            } else {
+                Err(warp::reject::not_found())
+            }
+        },
+        );
+
+        // A route with path, parameter, and `and_then`
+        let path_and_map_route = warp::path("1").and(warp::path::param()).map( // $ Alert[rust/summary/taint-sources] 
+            | a: String |
+            {
+                sink(a); // $ hasTaintFlow
+
+                "".to_string()
+             },
+        );
+
+        let routes = warp::get().and(
+            map_route
+                .or(then_route)
+                .or(and_then_route)
+                .or(path_and_map_route),
+        );
+        warp::serve(routes).run(([127, 0, 0, 1], 3030)).await;
+    }
+}
diff --git a/rust/ql/test/library-tests/dataflow/strings/CONSISTENCY/PathResolutionConsistency.expected b/rust/ql/test/library-tests/dataflow/strings/CONSISTENCY/PathResolutionConsistency.expected
index b6acd6b81a7..ccda75006f9 100644
--- a/rust/ql/test/library-tests/dataflow/strings/CONSISTENCY/PathResolutionConsistency.expected
+++ b/rust/ql/test/library-tests/dataflow/strings/CONSISTENCY/PathResolutionConsistency.expected
@@ -1,3 +1,2 @@
 multipleCallTargets
 | main.rs:52:14:52:29 | ...::from(...) |
-| main.rs:64:16:64:25 | s.as_str() |
diff --git a/rust/ql/test/library-tests/dataflow/strings/inline-taint-flow.expected b/rust/ql/test/library-tests/dataflow/strings/inline-taint-flow.expected
index a58a013816d..6cb680fa6ca 100644
--- a/rust/ql/test/library-tests/dataflow/strings/inline-taint-flow.expected
+++ b/rust/ql/test/library-tests/dataflow/strings/inline-taint-flow.expected
@@ -1,10 +1,13 @@
 models
-| 1 | Summary: <alloc::string::String as core::convert::From>::from; Argument[0]; ReturnValue; value |
-| 2 | Summary: <alloc::string::String as core::ops::arith::Add>::add; Argument[self]; ReturnValue; value |
-| 3 | Summary: <alloc::string::String>::as_str; Argument[self]; ReturnValue; value |
-| 4 | Summary: <core::str>::as_str; Argument[self]; ReturnValue; value |
-| 5 | Summary: alloc::fmt::format; Argument[0]; ReturnValue; taint |
-| 6 | Summary: core::hint::must_use; Argument[0]; ReturnValue; value |
+| 1 | Summary: <_ as alloc::string::ToString>::to_string; Argument[self]; ReturnValue; taint |
+| 2 | Summary: <_ as core::convert::From>::from; Argument[0]; ReturnValue; taint |
+| 3 | Summary: <_ as core::ops::arith::Add>::add; Argument[0].Reference; ReturnValue; taint |
+| 4 | Summary: <_ as core::ops::arith::Add>::add; Argument[self]; ReturnValue; taint |
+| 5 | Summary: <alloc::string::String as core::convert::From>::from; Argument[0].Reference; ReturnValue; value |
+| 6 | Summary: <alloc::string::String as core::ops::arith::Add>::add; Argument[self]; ReturnValue; value |
+| 7 | Summary: <alloc::string::String>::as_str; Argument[self]; ReturnValue; value |
+| 8 | Summary: alloc::fmt::format; Argument[0]; ReturnValue; taint |
+| 9 | Summary: core::hint::must_use; Argument[0]; ReturnValue; value |
 edges
 | main.rs:26:9:26:9 | s | main.rs:27:19:27:25 | s[...] | provenance |  |
 | main.rs:26:13:26:22 | source(...) | main.rs:26:9:26:9 | s | provenance |  |
@@ -15,46 +18,52 @@ edges
 | main.rs:32:9:32:10 | s1 | main.rs:35:14:35:15 | s1 | provenance |  |
 | main.rs:32:14:32:23 | source(...) | main.rs:32:9:32:10 | s1 | provenance |  |
 | main.rs:35:9:35:10 | s4 | main.rs:38:10:38:11 | s4 | provenance |  |
-| main.rs:35:14:35:15 | s1 | main.rs:35:14:35:20 | ... + ... | provenance | MaD:2 |
+| main.rs:35:14:35:15 | s1 | main.rs:35:14:35:20 | ... + ... | provenance | MaD:4 |
+| main.rs:35:14:35:15 | s1 | main.rs:35:14:35:20 | ... + ... | provenance | MaD:6 |
 | main.rs:35:14:35:20 | ... + ... | main.rs:35:9:35:10 | s4 | provenance |  |
+| main.rs:43:9:43:10 | s1 | main.rs:46:34:46:35 | s1 | provenance |  |
+| main.rs:43:14:43:23 | source(...) | main.rs:43:9:43:10 | s1 | provenance |  |
+| main.rs:46:33:46:35 | &s1 [&ref] | main.rs:46:10:46:35 | ... + ... | provenance | MaD:3 |
+| main.rs:46:34:46:35 | s1 | main.rs:46:33:46:35 | &s1 [&ref] | provenance |  |
 | main.rs:51:9:51:10 | s1 | main.rs:52:27:52:28 | s1 | provenance |  |
 | main.rs:51:14:51:29 | source_slice(...) | main.rs:51:9:51:10 | s1 | provenance |  |
 | main.rs:52:9:52:10 | s2 | main.rs:53:10:53:11 | s2 | provenance |  |
 | main.rs:52:14:52:29 | ...::from(...) | main.rs:52:9:52:10 | s2 | provenance |  |
-| main.rs:52:27:52:28 | s1 | main.rs:52:14:52:29 | ...::from(...) | provenance | MaD:1 |
+| main.rs:52:27:52:28 | s1 | main.rs:52:14:52:29 | ...::from(...) | provenance | MaD:2 |
+| main.rs:52:27:52:28 | s1 | main.rs:52:14:52:29 | ...::from(...) | provenance | MaD:5 |
+| main.rs:57:9:57:10 | s1 | main.rs:58:14:58:27 | s1.to_string() | provenance | MaD:1 |
+| main.rs:57:14:57:29 | source_slice(...) | main.rs:57:9:57:10 | s1 | provenance |  |
+| main.rs:58:9:58:10 | s2 | main.rs:59:10:59:11 | s2 | provenance |  |
+| main.rs:58:14:58:27 | s1.to_string() | main.rs:58:9:58:10 | s2 | provenance |  |
 | main.rs:63:9:63:9 | s | main.rs:64:16:64:16 | s | provenance |  |
-| main.rs:63:9:63:9 | s | main.rs:64:16:64:25 | s.as_str() | provenance | MaD:3 |
-| main.rs:63:9:63:9 | s | main.rs:64:16:64:25 | s.as_str() | provenance | MaD:4 |
+| main.rs:63:9:63:9 | s | main.rs:64:16:64:25 | s.as_str() | provenance | MaD:7 |
 | main.rs:63:13:63:22 | source(...) | main.rs:63:9:63:9 | s | provenance |  |
-| main.rs:64:16:64:16 | s | main.rs:64:16:64:25 | s.as_str() | provenance | MaD:3 |
-| main.rs:64:16:64:16 | s | main.rs:64:16:64:25 | s.as_str() | provenance | MaD:4 |
+| main.rs:64:16:64:16 | s | main.rs:64:16:64:25 | s.as_str() | provenance | MaD:7 |
 | main.rs:68:9:68:9 | s | main.rs:70:34:70:61 | MacroExpr | provenance |  |
 | main.rs:68:9:68:9 | s | main.rs:73:34:73:59 | MacroExpr | provenance |  |
 | main.rs:68:13:68:22 | source(...) | main.rs:68:9:68:9 | s | provenance |  |
 | main.rs:70:9:70:18 | formatted1 | main.rs:71:10:71:19 | formatted1 | provenance |  |
 | main.rs:70:22:70:62 | ...::format(...) | main.rs:70:9:70:18 | formatted1 | provenance |  |
-| main.rs:70:34:70:61 | MacroExpr | main.rs:70:22:70:62 | ...::format(...) | provenance | MaD:5 |
+| main.rs:70:34:70:61 | MacroExpr | main.rs:70:22:70:62 | ...::format(...) | provenance | MaD:8 |
 | main.rs:73:9:73:18 | formatted2 | main.rs:74:10:74:19 | formatted2 | provenance |  |
 | main.rs:73:22:73:60 | ...::format(...) | main.rs:73:9:73:18 | formatted2 | provenance |  |
-| main.rs:73:34:73:59 | MacroExpr | main.rs:73:22:73:60 | ...::format(...) | provenance | MaD:5 |
+| main.rs:73:34:73:59 | MacroExpr | main.rs:73:22:73:60 | ...::format(...) | provenance | MaD:8 |
 | main.rs:76:9:76:13 | width | main.rs:77:34:77:74 | MacroExpr | provenance |  |
 | main.rs:76:17:76:32 | source_usize(...) | main.rs:76:9:76:13 | width | provenance |  |
 | main.rs:77:9:77:18 | formatted3 | main.rs:78:10:78:19 | formatted3 | provenance |  |
 | main.rs:77:22:77:75 | ...::format(...) | main.rs:77:9:77:18 | formatted3 | provenance |  |
-| main.rs:77:34:77:74 | MacroExpr | main.rs:77:22:77:75 | ...::format(...) | provenance | MaD:5 |
+| main.rs:77:34:77:74 | MacroExpr | main.rs:77:22:77:75 | ...::format(...) | provenance | MaD:8 |
 | main.rs:82:9:82:10 | s1 | main.rs:86:18:86:25 | MacroExpr | provenance |  |
 | main.rs:82:9:82:10 | s1 | main.rs:87:18:87:32 | MacroExpr | provenance |  |
 | main.rs:82:14:82:23 | source(...) | main.rs:82:9:82:10 | s1 | provenance |  |
-| main.rs:86:10:86:26 | res | main.rs:86:18:86:25 | { ... } | provenance |  |
-| main.rs:86:18:86:25 | ...::format(...) | main.rs:86:10:86:26 | res | provenance |  |
+| main.rs:86:18:86:25 | ...::format(...) | main.rs:86:18:86:25 | { ... } | provenance |  |
 | main.rs:86:18:86:25 | ...::must_use(...) | main.rs:86:10:86:26 | MacroExpr | provenance |  |
-| main.rs:86:18:86:25 | MacroExpr | main.rs:86:18:86:25 | ...::format(...) | provenance | MaD:5 |
-| main.rs:86:18:86:25 | { ... } | main.rs:86:18:86:25 | ...::must_use(...) | provenance | MaD:6 |
-| main.rs:87:10:87:33 | res | main.rs:87:18:87:32 | { ... } | provenance |  |
-| main.rs:87:18:87:32 | ...::format(...) | main.rs:87:10:87:33 | res | provenance |  |
+| main.rs:86:18:86:25 | MacroExpr | main.rs:86:18:86:25 | ...::format(...) | provenance | MaD:8 |
+| main.rs:86:18:86:25 | { ... } | main.rs:86:18:86:25 | ...::must_use(...) | provenance | MaD:9 |
+| main.rs:87:18:87:32 | ...::format(...) | main.rs:87:18:87:32 | { ... } | provenance |  |
 | main.rs:87:18:87:32 | ...::must_use(...) | main.rs:87:10:87:33 | MacroExpr | provenance |  |
-| main.rs:87:18:87:32 | MacroExpr | main.rs:87:18:87:32 | ...::format(...) | provenance | MaD:5 |
-| main.rs:87:18:87:32 | { ... } | main.rs:87:18:87:32 | ...::must_use(...) | provenance | MaD:6 |
+| main.rs:87:18:87:32 | MacroExpr | main.rs:87:18:87:32 | ...::format(...) | provenance | MaD:8 |
+| main.rs:87:18:87:32 | { ... } | main.rs:87:18:87:32 | ...::must_use(...) | provenance | MaD:9 |
 nodes
 | main.rs:26:9:26:9 | s | semmle.label | s |
 | main.rs:26:13:26:22 | source(...) | semmle.label | source(...) |
@@ -68,12 +77,22 @@ nodes
 | main.rs:35:14:35:15 | s1 | semmle.label | s1 |
 | main.rs:35:14:35:20 | ... + ... | semmle.label | ... + ... |
 | main.rs:38:10:38:11 | s4 | semmle.label | s4 |
+| main.rs:43:9:43:10 | s1 | semmle.label | s1 |
+| main.rs:43:14:43:23 | source(...) | semmle.label | source(...) |
+| main.rs:46:10:46:35 | ... + ... | semmle.label | ... + ... |
+| main.rs:46:33:46:35 | &s1 [&ref] | semmle.label | &s1 [&ref] |
+| main.rs:46:34:46:35 | s1 | semmle.label | s1 |
 | main.rs:51:9:51:10 | s1 | semmle.label | s1 |
 | main.rs:51:14:51:29 | source_slice(...) | semmle.label | source_slice(...) |
 | main.rs:52:9:52:10 | s2 | semmle.label | s2 |
 | main.rs:52:14:52:29 | ...::from(...) | semmle.label | ...::from(...) |
 | main.rs:52:27:52:28 | s1 | semmle.label | s1 |
 | main.rs:53:10:53:11 | s2 | semmle.label | s2 |
+| main.rs:57:9:57:10 | s1 | semmle.label | s1 |
+| main.rs:57:14:57:29 | source_slice(...) | semmle.label | source_slice(...) |
+| main.rs:58:9:58:10 | s2 | semmle.label | s2 |
+| main.rs:58:14:58:27 | s1.to_string() | semmle.label | s1.to_string() |
+| main.rs:59:10:59:11 | s2 | semmle.label | s2 |
 | main.rs:63:9:63:9 | s | semmle.label | s |
 | main.rs:63:13:63:22 | source(...) | semmle.label | source(...) |
 | main.rs:64:16:64:16 | s | semmle.label | s |
@@ -97,13 +116,11 @@ nodes
 | main.rs:82:9:82:10 | s1 | semmle.label | s1 |
 | main.rs:82:14:82:23 | source(...) | semmle.label | source(...) |
 | main.rs:86:10:86:26 | MacroExpr | semmle.label | MacroExpr |
-| main.rs:86:10:86:26 | res | semmle.label | res |
 | main.rs:86:18:86:25 | ...::format(...) | semmle.label | ...::format(...) |
 | main.rs:86:18:86:25 | ...::must_use(...) | semmle.label | ...::must_use(...) |
 | main.rs:86:18:86:25 | MacroExpr | semmle.label | MacroExpr |
 | main.rs:86:18:86:25 | { ... } | semmle.label | { ... } |
 | main.rs:87:10:87:33 | MacroExpr | semmle.label | MacroExpr |
-| main.rs:87:10:87:33 | res | semmle.label | res |
 | main.rs:87:18:87:32 | ...::format(...) | semmle.label | ...::format(...) |
 | main.rs:87:18:87:32 | ...::must_use(...) | semmle.label | ...::must_use(...) |
 | main.rs:87:18:87:32 | MacroExpr | semmle.label | MacroExpr |
@@ -113,7 +130,9 @@ testFailures
 #select
 | main.rs:28:16:28:21 | sliced | main.rs:26:13:26:22 | source(...) | main.rs:28:16:28:21 | sliced | $@ | main.rs:26:13:26:22 | source(...) | source(...) |
 | main.rs:38:10:38:11 | s4 | main.rs:32:14:32:23 | source(...) | main.rs:38:10:38:11 | s4 | $@ | main.rs:32:14:32:23 | source(...) | source(...) |
+| main.rs:46:10:46:35 | ... + ... | main.rs:43:14:43:23 | source(...) | main.rs:46:10:46:35 | ... + ... | $@ | main.rs:43:14:43:23 | source(...) | source(...) |
 | main.rs:53:10:53:11 | s2 | main.rs:51:14:51:29 | source_slice(...) | main.rs:53:10:53:11 | s2 | $@ | main.rs:51:14:51:29 | source_slice(...) | source_slice(...) |
+| main.rs:59:10:59:11 | s2 | main.rs:57:14:57:29 | source_slice(...) | main.rs:59:10:59:11 | s2 | $@ | main.rs:57:14:57:29 | source_slice(...) | source_slice(...) |
 | main.rs:64:16:64:25 | s.as_str() | main.rs:63:13:63:22 | source(...) | main.rs:64:16:64:25 | s.as_str() | $@ | main.rs:63:13:63:22 | source(...) | source(...) |
 | main.rs:71:10:71:19 | formatted1 | main.rs:68:13:68:22 | source(...) | main.rs:71:10:71:19 | formatted1 | $@ | main.rs:68:13:68:22 | source(...) | source(...) |
 | main.rs:74:10:74:19 | formatted2 | main.rs:68:13:68:22 | source(...) | main.rs:74:10:74:19 | formatted2 | $@ | main.rs:68:13:68:22 | source(...) | source(...) |
diff --git a/rust/ql/test/library-tests/dataflow/strings/main.rs b/rust/ql/test/library-tests/dataflow/strings/main.rs
index 772a45f1993..633d9f42f46 100644
--- a/rust/ql/test/library-tests/dataflow/strings/main.rs
+++ b/rust/ql/test/library-tests/dataflow/strings/main.rs
@@ -43,20 +43,20 @@ fn string_add_reference() {
     let s1 = source(37);
     let s2 = "1".to_string();
 
-    sink("Hello ".to_string() + &s1); // $ MISSING: hasTaintFlow=37
+    sink("Hello ".to_string() + &s1); // $ hasTaintFlow=37
     sink("Hello ".to_string() + &s2);
 }
 
 fn string_from() {
     let s1 = source_slice(36);
     let s2 = String::from(s1);
-    sink(s2); // $ hasValueFlow=36
+    sink(s2); // $ hasTaintFlow=36
 }
 
 fn string_to_string() {
     let s1 = source_slice(22);
     let s2 = s1.to_string();
-    sink(s2); // $ MISSING: hasTaintFlow=22 - we are not currently able to resolve the `to_string` call above, which comes from `impl<T: fmt::Display + ?Sized> ToString for T`
+    sink(s2); // $ hasTaintFlow=22
 }
 
 fn as_str() {
diff --git a/rust/ql/test/library-tests/definitions/Definitions.expected b/rust/ql/test/library-tests/definitions/Definitions.expected
index f3cde895068..23ad4e291de 100644
--- a/rust/ql/test/library-tests/definitions/Definitions.expected
+++ b/rust/ql/test/library-tests/definitions/Definitions.expected
@@ -2,28 +2,47 @@
 | main.rs:9:14:9:14 | S | main.rs:7:9:7:21 | struct S | path |
 | main.rs:10:36:10:39 | Self | main.rs:7:9:7:21 | struct S | path |
 | main.rs:11:17:11:17 | S | main.rs:7:9:7:21 | struct S | path |
-| main.rs:21:22:21:26 | value | main.rs:21:50:21:54 | value | format argument |
-| main.rs:21:29:21:33 | width | main.rs:18:9:18:13 | width | local variable |
-| main.rs:21:36:21:44 | precision | main.rs:19:9:19:17 | precision | local variable |
-| main.rs:22:22:22:22 | 0 | main.rs:22:34:22:38 | value | format argument |
-| main.rs:22:25:22:25 | 1 | main.rs:22:41:22:45 | width | format argument |
-| main.rs:22:28:22:28 | 2 | main.rs:22:48:22:56 | precision | format argument |
-| main.rs:22:34:22:38 | value | main.rs:20:9:20:13 | value | local variable |
-| main.rs:22:41:22:45 | width | main.rs:18:9:18:13 | width | local variable |
-| main.rs:22:48:22:56 | precision | main.rs:19:9:19:17 | precision | local variable |
-| main.rs:23:21:23:22 | {} | main.rs:23:29:23:33 | value | format argument |
-| main.rs:23:24:23:25 | {} | main.rs:23:36:23:40 | width | format argument |
-| main.rs:23:29:23:33 | value | main.rs:20:9:20:13 | value | local variable |
-| main.rs:23:36:23:40 | width | main.rs:18:9:18:13 | width | local variable |
-| main.rs:25:22:25:27 | people | main.rs:24:9:24:14 | people | local variable |
-| main.rs:26:16:26:16 | 1 | main.rs:26:34:26:34 | 2 | format argument |
-| main.rs:26:19:26:20 | {} | main.rs:26:31:26:31 | 1 | format argument |
-| main.rs:26:23:26:23 | 0 | main.rs:26:31:26:31 | 1 | format argument |
-| main.rs:26:26:26:27 | {} | main.rs:26:34:26:34 | 2 | format argument |
-| main.rs:27:31:27:35 | {:<5} | main.rs:27:40:27:42 | "x" | format argument |
-| main.rs:28:13:28:13 | S | main.rs:1:1:1:9 | struct S | path |
-| main.rs:29:13:29:14 | M1 | main.rs:5:1:15:1 | mod M1 | path |
-| main.rs:29:17:29:18 | M2 | main.rs:6:5:14:5 | mod M2 | path |
-| main.rs:29:21:29:21 | S | main.rs:7:9:7:21 | struct S | path |
-| main.rs:30:5:30:5 | s | main.rs:29:9:29:9 | s | local variable |
-| main.rs:30:7:30:12 | method | main.rs:10:13:12:13 | fn method | method |
+| main.rs:16:22:16:22 | T | main.rs:16:19:16:19 | T | path |
+| main.rs:18:13:18:14 | S2 | main.rs:16:5:16:24 | struct S2 | path |
+| main.rs:18:16:18:16 | T | main.rs:18:10:18:10 | T | path |
+| main.rs:19:23:19:23 | T | main.rs:18:10:18:10 | T | path |
+| main.rs:19:29:19:32 | Self | main.rs:16:5:16:24 | struct S2 | path |
+| main.rs:20:13:20:14 | S2 | main.rs:16:5:16:24 | struct S2 | path |
+| main.rs:20:16:20:16 | x | main.rs:19:20:19:20 | x | local variable |
+| main.rs:29:5:29:11 | println | {EXTERNAL LOCATION} | MacroRules | path |
+| main.rs:29:22:29:26 | value | main.rs:29:50:29:54 | value | format argument |
+| main.rs:29:29:29:33 | width | main.rs:26:9:26:13 | width | local variable |
+| main.rs:29:36:29:44 | precision | main.rs:27:9:27:17 | precision | local variable |
+| main.rs:30:5:30:11 | println | {EXTERNAL LOCATION} | MacroRules | path |
+| main.rs:30:22:30:22 | 0 | main.rs:30:34:30:38 | value | format argument |
+| main.rs:30:25:30:25 | 1 | main.rs:30:41:30:45 | width | format argument |
+| main.rs:30:28:30:28 | 2 | main.rs:30:48:30:56 | precision | format argument |
+| main.rs:30:34:30:38 | value | main.rs:28:9:28:13 | value | local variable |
+| main.rs:30:41:30:45 | width | main.rs:26:9:26:13 | width | local variable |
+| main.rs:30:48:30:56 | precision | main.rs:27:9:27:17 | precision | local variable |
+| main.rs:31:5:31:11 | println | {EXTERNAL LOCATION} | MacroRules | path |
+| main.rs:31:21:31:22 | {} | main.rs:31:29:31:33 | value | format argument |
+| main.rs:31:24:31:25 | {} | main.rs:31:36:31:40 | width | format argument |
+| main.rs:31:29:31:33 | value | main.rs:28:9:28:13 | value | local variable |
+| main.rs:31:36:31:40 | width | main.rs:26:9:26:13 | width | local variable |
+| main.rs:33:5:33:11 | println | {EXTERNAL LOCATION} | MacroRules | path |
+| main.rs:33:22:33:27 | people | main.rs:32:9:32:14 | people | local variable |
+| main.rs:34:5:34:11 | println | {EXTERNAL LOCATION} | MacroRules | path |
+| main.rs:34:16:34:16 | 1 | main.rs:34:34:34:34 | 2 | format argument |
+| main.rs:34:19:34:20 | {} | main.rs:34:31:34:31 | 1 | format argument |
+| main.rs:34:23:34:23 | 0 | main.rs:34:31:34:31 | 1 | format argument |
+| main.rs:34:26:34:27 | {} | main.rs:34:34:34:34 | 2 | format argument |
+| main.rs:35:5:35:13 | assert_eq | {EXTERNAL LOCATION} | MacroRules | path |
+| main.rs:35:16:35:21 | format | {EXTERNAL LOCATION} | MacroRules | path |
+| main.rs:35:31:35:35 | {:<5} | main.rs:35:40:35:42 | "x" | format argument |
+| main.rs:36:13:36:13 | S | main.rs:1:1:1:9 | struct S | path |
+| main.rs:37:13:37:14 | M1 | main.rs:5:1:23:1 | mod M1 | path |
+| main.rs:37:17:37:18 | M2 | main.rs:6:5:14:5 | mod M2 | path |
+| main.rs:37:21:37:21 | S | main.rs:7:9:7:21 | struct S | path |
+| main.rs:38:5:38:5 | s | main.rs:37:9:37:9 | s | local variable |
+| main.rs:38:7:38:12 | method | main.rs:10:13:12:13 | fn method | method |
+| main.rs:39:5:39:6 | M1 | main.rs:5:1:23:1 | mod M1 | path |
+| main.rs:39:9:39:10 | S2 | main.rs:16:5:16:24 | struct S2 | path |
+| main.rs:39:14:39:14 | S | main.rs:1:1:1:9 | struct S | path |
+| main.rs:39:18:39:20 | new | main.rs:19:9:21:9 | fn new | path |
+| main.rs:39:22:39:22 | S | main.rs:1:1:1:9 | struct S | path |
diff --git a/rust/ql/test/library-tests/definitions/Definitions.qlref b/rust/ql/test/library-tests/definitions/Definitions.qlref
new file mode 100644
index 00000000000..425b65e820a
--- /dev/null
+++ b/rust/ql/test/library-tests/definitions/Definitions.qlref
@@ -0,0 +1,2 @@
+query: Definitions.ql
+postprocess: utils/test/ExternalLocationPostProcessing.ql
\ No newline at end of file
diff --git a/rust/ql/test/library-tests/definitions/main.rs b/rust/ql/test/library-tests/definitions/main.rs
index 35acea6858e..89742adf8f9 100644
--- a/rust/ql/test/library-tests/definitions/main.rs
+++ b/rust/ql/test/library-tests/definitions/main.rs
@@ -12,6 +12,14 @@ mod M1 {
             }
         }
     }
+
+    pub struct S2<T>(T);
+
+    impl<T> S2<T> {
+        pub fn new(x: T) -> Self {
+            S2(x)
+        }
+    }
 }
 
 fn main() {
@@ -28,4 +36,5 @@ fn main() {
     let x = S;
     let s = M1::M2::S;
     s.method();
+    M1::S2::<S>::new(S);
 }
diff --git a/rust/ql/test/library-tests/elements/builtintypes/BuiltinTypes.expected b/rust/ql/test/library-tests/elements/builtintypes/BuiltinTypes.expected
new file mode 100644
index 00000000000..2b0aecda049
--- /dev/null
+++ b/rust/ql/test/library-tests/elements/builtintypes/BuiltinTypes.expected
@@ -0,0 +1,17 @@
+| struct bool |  |
+| struct char |  |
+| struct f32 | FloatingPointType, NumericType |
+| struct f64 | FloatingPointType, NumericType |
+| struct i8 | IntegralType, NumericType |
+| struct i16 | IntegralType, NumericType |
+| struct i32 | IntegralType, NumericType |
+| struct i64 | IntegralType, NumericType |
+| struct i128 | IntegralType, NumericType |
+| struct isize | IntegralType, NumericType |
+| struct str |  |
+| struct u8 | IntegralType, NumericType |
+| struct u16 | IntegralType, NumericType |
+| struct u32 | IntegralType, NumericType |
+| struct u64 | IntegralType, NumericType |
+| struct u128 | IntegralType, NumericType |
+| struct usize | IntegralType, NumericType |
diff --git a/rust/ql/test/library-tests/elements/builtintypes/BuiltinTypes.ql b/rust/ql/test/library-tests/elements/builtintypes/BuiltinTypes.ql
new file mode 100644
index 00000000000..4da1117a3fb
--- /dev/null
+++ b/rust/ql/test/library-tests/elements/builtintypes/BuiltinTypes.ql
@@ -0,0 +1,14 @@
+import rust
+import codeql.rust.frameworks.stdlib.Builtins
+import codeql.rust.internal.Type
+
+string describe(BuiltinType t) {
+  t instanceof NumericType and result = "NumericType"
+  or
+  t instanceof IntegralType and result = "IntegralType"
+  or
+  t instanceof FloatingPointType and result = "FloatingPointType"
+}
+
+from BuiltinType t
+select t.toString(), concat(describe(t), ", ")
diff --git a/rust/ql/test/library-tests/operations/Cargo.lock b/rust/ql/test/library-tests/elements/builtintypes/Cargo.lock
similarity index 100%
rename from rust/ql/test/library-tests/operations/Cargo.lock
rename to rust/ql/test/library-tests/elements/builtintypes/Cargo.lock
diff --git a/rust/ql/test/library-tests/elements/builtintypes/test.rs b/rust/ql/test/library-tests/elements/builtintypes/test.rs
new file mode 100644
index 00000000000..a00a4833c4c
--- /dev/null
+++ b/rust/ql/test/library-tests/elements/builtintypes/test.rs
@@ -0,0 +1,5 @@
+
+// --- tests ---
+
+fn test_types() {
+}
diff --git a/rust/ql/test/library-tests/elements/operations/Cargo.lock b/rust/ql/test/library-tests/elements/operations/Cargo.lock
new file mode 100644
index 00000000000..b9856cfaf77
--- /dev/null
+++ b/rust/ql/test/library-tests/elements/operations/Cargo.lock
@@ -0,0 +1,7 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "test"
+version = "0.0.1"
diff --git a/rust/ql/test/library-tests/elements/operations/Operations.expected b/rust/ql/test/library-tests/elements/operations/Operations.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rust/ql/test/library-tests/operations/Operations.ql b/rust/ql/test/library-tests/elements/operations/Operations.ql
similarity index 100%
rename from rust/ql/test/library-tests/operations/Operations.ql
rename to rust/ql/test/library-tests/elements/operations/Operations.ql
diff --git a/rust/ql/test/library-tests/operations/test.rs b/rust/ql/test/library-tests/elements/operations/test.rs
similarity index 100%
rename from rust/ql/test/library-tests/operations/test.rs
rename to rust/ql/test/library-tests/elements/operations/test.rs
diff --git a/rust/ql/test/library-tests/elements/stmtlist/Cargo.lock b/rust/ql/test/library-tests/elements/stmtlist/Cargo.lock
new file mode 100644
index 00000000000..b9856cfaf77
--- /dev/null
+++ b/rust/ql/test/library-tests/elements/stmtlist/Cargo.lock
@@ -0,0 +1,7 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "test"
+version = "0.0.1"
diff --git a/rust/ql/test/library-tests/elements/stmtlist/StmtList.expected b/rust/ql/test/library-tests/elements/stmtlist/StmtList.expected
new file mode 100644
index 00000000000..820b1a76dc9
--- /dev/null
+++ b/rust/ql/test/library-tests/elements/stmtlist/StmtList.expected
@@ -0,0 +1,9 @@
+| StmtList.rs:4:19:9:1 | StmtList | 2 | hasTailExpr | 0:let ... = 1, 1:let ... = 2, 2:... + ... |
+| StmtList.rs:11:18:15:1 | StmtList | 2 |  | 0:let ... = 1, 1:let ... = 2 |
+| StmtList.rs:17:19:20:1 | StmtList | 0 | hasTailExpr | 0:... + ... |
+| StmtList.rs:22:18:25:1 | StmtList | 1 |  | 0:ExprStmt |
+| StmtList.rs:27:18:29:1 | StmtList | 0 |  |  |
+| StmtList.rs:31:18:34:1 | StmtList | 0 |  |  |
+| StmtList.rs:36:29:43:1 | StmtList | 0 | hasTailExpr | 0:if cond {...} else {...} |
+| StmtList.rs:38:10:40:2 | StmtList | 0 | hasTailExpr | 0:1 |
+| StmtList.rs:40:9:42:2 | StmtList | 0 | hasTailExpr | 0:2 |
diff --git a/rust/ql/test/library-tests/elements/stmtlist/StmtList.ql b/rust/ql/test/library-tests/elements/stmtlist/StmtList.ql
new file mode 100644
index 00000000000..048dcd06d6e
--- /dev/null
+++ b/rust/ql/test/library-tests/elements/stmtlist/StmtList.ql
@@ -0,0 +1,13 @@
+import rust
+import TestUtils
+
+from StmtList sl, string tail
+where
+  toBeTested(sl) and
+  if sl.hasTailExpr() then tail = "hasTailExpr" else tail = ""
+select sl, sl.getNumberOfStatements(), tail,
+  concat(int i, AstNode n |
+    n = sl.getStmtOrExpr(i)
+  |
+    i.toString() + ":" + n.toString(), ", " order by i
+  )
diff --git a/rust/ql/test/library-tests/elements/stmtlist/StmtList.rs b/rust/ql/test/library-tests/elements/stmtlist/StmtList.rs
new file mode 100644
index 00000000000..1437f2afb26
--- /dev/null
+++ b/rust/ql/test/library-tests/elements/stmtlist/StmtList.rs
@@ -0,0 +1,43 @@
+
+// --- tests ---
+
+fn test1() -> i32 {
+	// two statements + tail expression
+	let a = 1;
+	let b = 2;
+	a + b
+}
+
+fn test2() -> () {
+	// two statements only
+	let a = 1;
+	let b = 2;
+}
+
+fn test3() -> i32 {
+	// tail expression only
+	1 + 2
+}
+
+fn test4() -> () {
+	// one statement only
+	1 + 2;
+}
+
+fn test5() -> () {
+	// neither
+}
+
+fn test6() -> () {
+	// neither
+	;
+}
+
+fn test7(cond: bool) -> i32 {
+	// nested blocks
+	if cond {
+		1
+	} else {
+		2
+	}
+}
diff --git a/rust/ql/test/library-tests/frameworks/postgres/CONSISTENCY/PathResolutionConsistency.expected b/rust/ql/test/library-tests/frameworks/postgres/CONSISTENCY/PathResolutionConsistency.expected
deleted file mode 100644
index 52ccf4c06dc..00000000000
--- a/rust/ql/test/library-tests/frameworks/postgres/CONSISTENCY/PathResolutionConsistency.expected
+++ /dev/null
@@ -1,9 +0,0 @@
-multipleCallTargets
-| main.rs:22:18:22:31 | query.as_str() |
-| main.rs:23:24:23:37 | query.as_str() |
-| main.rs:25:18:25:31 | query.as_str() |
-| main.rs:28:16:28:29 | query.as_str() |
-| main.rs:29:20:29:33 | query.as_str() |
-| main.rs:30:20:30:33 | query.as_str() |
-| main.rs:32:20:32:33 | query.as_str() |
-| main.rs:33:22:33:35 | query.as_str() |
diff --git a/rust/ql/test/library-tests/path-resolution/CONSISTENCY/PathResolutionConsistency.expected b/rust/ql/test/library-tests/path-resolution/CONSISTENCY/PathResolutionConsistency.expected
index 0e649697a60..6b5461f3719 100644
--- a/rust/ql/test/library-tests/path-resolution/CONSISTENCY/PathResolutionConsistency.expected
+++ b/rust/ql/test/library-tests/path-resolution/CONSISTENCY/PathResolutionConsistency.expected
@@ -1,7 +1,6 @@
 multipleCallTargets
-| main.rs:118:9:118:11 | f(...) |
-| proc_macro.rs:9:5:11:5 | ...::new(...) |
-multiplePathResolutions
-| main.rs:641:3:641:12 | proc_macro |
-| main.rs:647:7:647:16 | proc_macro |
-| main.rs:650:7:650:16 | proc_macro |
+| main.rs:126:9:126:11 | f(...) |
+| main.rs:366:9:368:16 | ...::f(...) |
+| main.rs:369:9:371:16 | ...::f(...) |
+| main.rs:448:9:452:16 | ...::f(...) |
+| main.rs:453:9:457:16 | ...::f(...) |
diff --git a/rust/ql/test/library-tests/path-resolution/main.rs b/rust/ql/test/library-tests/path-resolution/main.rs
index f58d82826d6..9e7ebf5fb17 100644
--- a/rust/ql/test/library-tests/path-resolution/main.rs
+++ b/rust/ql/test/library-tests/path-resolution/main.rs
@@ -1,6 +1,7 @@
 mod my; // I1
 
-use my::*; // $ item=I1
+#[rustfmt::skip]
+use {{{my::{{self as my_alias, *}}}}}; // $ item=I1
 
 use my::nested::nested1::nested2::*; // $ item=I3
 
@@ -8,20 +9,26 @@ mod my2; // I14
 
 use my2::*; // $ item=I14
 
-use my2::nested2::nested3::nested4::{f, g}; // $ item=I11 item=I12 item=I13
+#[rustfmt::skip]
+use my2::nested2::nested3::nested4::{ // $ item=I11
+    f, // $ item=I12
+    g, // $ item=I13
+};
+
+use my2::nested8_f; // $ item=I119
 
 mod m1 {
     fn f() {
-        println!("main.rs::m1::f");
+        println!("main.rs::m1::f"); // $ item=println
     } // I16
 
     pub mod m2 {
         fn f() {
-            println!("main.rs::m1::m2::f");
+            println!("main.rs::m1::m2::f"); // $ item=println
         } // I18
 
         pub fn g() {
-            println!("main.rs::m1::m2::g");
+            println!("main.rs::m1::m2::g"); // $ item=println
             f(); // $ item=I18
             super::f(); // $ item=I16
         } // I19
@@ -29,7 +36,7 @@ mod m1 {
         pub mod m3 {
             use super::f; // $ item=I18
             pub fn h() {
-                println!("main.rs::m1::m2::m3::h");
+                println!("main.rs::m1::m2::m3::h"); // $ item=println
                 f(); // $ item=I18
             } // I21
         } // I20
@@ -40,7 +47,7 @@ mod m4 {
     use super::m1::m2::g; // $ item=I19
 
     pub fn i() {
-        println!("main.rs::m4::i");
+        println!("main.rs::m4::i"); // $ item=println
         g(); // $ item=I19
     } // I23
 } // I22
@@ -48,7 +55,7 @@ mod m4 {
 struct Foo {} // I24
 
 fn h() {
-    println!("main.rs::h");
+    println!("main.rs::h"); // $ item=println
 
     struct Foo {} // I26
 
@@ -57,7 +64,7 @@ fn h() {
         g(); // $ item=I19
 
         struct Foo {} // I28
-        println!("main.rs::h::f");
+        println!("main.rs::h::f"); // $ item=println
         let _ = Foo {}; // $ item=I28
     } // I27
 
@@ -69,7 +76,7 @@ fn h() {
 } // I25
 
 fn i() {
-    println!("main.rs::i");
+    println!("main.rs::i"); // $ item=println
 
     let _ = Foo {}; // $ item=I24
 
@@ -95,24 +102,25 @@ macro_rules! fn_in_macro {
 }
 
 fn j() {
-    println!("main.rs::j");
-    fn_in_macro!(println!("main.rs::j::f"));
+    println!("main.rs::j"); // $ item=println
+    fn_in_macro!(println!("main.rs::j::f")); // $ item=fn_in_macro item=println
     f_defined_in_macro(); // $ item=f_defined_in_macro
 } // I31
 
 mod m5 {
     pub fn f() {
-        println!("main.rs::m5::f");
+        println!("main.rs::m5::f"); // $ item=println
     } // I33
 } // I32
 
 mod m6 {
     fn f() {
-        println!("main.rs::m6::f");
+        println!("main.rs::m6::f"); // $ item=println
     } // I35
 
     pub fn g() {
-        println!("main.rs::m6::g");
+        println!("main.rs::m6::g"); // $ item=println
+
         // this import shadows the definition `I35`, which we don't currently handle
         use super::m5::*; // $ item=I32
         f(); // $ item=I33 $ SPURIOUS: item=I35
@@ -133,7 +141,7 @@ mod m7 {
     #[rustfmt::skip]
     pub fn f() -> MyEnum // $ item=I41
     {
-        println!("main.rs::m7::f");
+        println!("main.rs::m7::f"); // $ item=println
         let _ = MyEnum::A(0); // $ item=I42
         let _ = MyEnum::B { x: 0 }; // $ item=I43
         MyEnum::C // $ item=I44
@@ -145,7 +153,7 @@ mod m8 {
         fn f(&self); // I48
 
         fn g(&self) {
-            println!("main.rs::m8::MyTrait::g");
+            println!("main.rs::m8::MyTrait::g"); // $ item=println
             f(); // $ item=I51
             Self::f(self); // $ item=I48
         } // I49
@@ -154,26 +162,26 @@ mod m8 {
     struct MyStruct {} // I50
 
     fn f() {
-        println!("main.rs::m8::f");
+        println!("main.rs::m8::f"); // $ item=println
     } // I51
 
     #[rustfmt::skip]
     impl MyTrait for MyStruct { // $ item=I47 item=I50
         fn f(&self) {
-            println!("main.rs::m8::<MyStruct as MyTrait>::f");
+            println!("main.rs::m8::<MyStruct as MyTrait>::f"); // $ item=println
             f(); // $ item=I51
             Self::g(self); // $ item=I54
         } // I53
 
         fn g(&self) {
-            println!("main.rs::m8::<MyStruct as MyTrait>::g");
+            println!("main.rs::m8::<MyStruct as MyTrait>::g"); // $ item=println
         } // I54
     } // I52
 
     #[rustfmt::skip]
     impl MyStruct { // $ item=I50
         fn h(&self) {
-            println!("main.rs::m8::MyStruct::h");
+            println!("main.rs::m8::MyStruct::h"); // $ item=println
             f(); // $ item=I51
         } // I74
     } // I73
@@ -201,7 +209,7 @@ mod m9 {
 
     #[rustfmt::skip]
     pub fn f() -> self::MyStruct { // $ item=I56
-        println!("main.rs::m9::f");
+        println!("main.rs::m9::f"); // $ item=println
         self::MyStruct {} // $ item=I56
     } // I57
 }
@@ -306,7 +314,7 @@ mod m15 {
     trait Trait2
       : Trait1 { // $ item=I79
         fn f(&self) {
-            println!("m15::Trait2::f");
+            println!("m15::Trait2::f"); // $ item=println
             Self::g(self); // $ item=I80
             self.g(); // $ item=I80
         }
@@ -333,13 +341,13 @@ mod m15 {
     impl Trait1 // $ item=I79
       for S { // $ item=I81
         fn f(&self) {
-            println!("m15::<S as Trait1>::f");
+            println!("m15::<S as Trait1>::f"); // $ item=println
             Self::g(self); // $ item=I77
             self.g(); // $ item=I77
         } // I76
 
         fn g(&self) {
-            println!("m15::<S as Trait1>::g");
+            println!("m15::<S as Trait1>::g"); // $ item=println
         } // I77
     }
 
@@ -347,13 +355,13 @@ mod m15 {
     impl Trait2 // $ item=I82
       for S { // $ item=I81
         fn f(&self) {
-            println!("m15::<S as Trait2>::f");
+            println!("m15::<S as Trait2>::f"); // $ item=println
         } // I78
     }
 
     #[rustfmt::skip]
     pub fn f() {
-        println!("m15::f");
+        println!("m15::f"); // $ item=println
         let x = S; // $ item=I81
         <S // $ item=I81
           as Trait1 // $ item=I79
@@ -393,7 +401,7 @@ mod m16 {
           T // $ item=I87
         > { // $ item=I86
         fn f(&self) -> T { // $ item=I87
-            println!("m16::Trait2::f");
+            println!("m16::Trait2::f"); // $ item=println
             Self::g(self); // $ item=I85
             self.g(); // $ item=I85
             Self::c // $ item=I94
@@ -408,13 +416,13 @@ mod m16 {
     > // $ item=I86
       for S { // $ item=I90
         fn f(&self) -> S { // $ item=I90
-            println!("m16::<S as Trait1<S>>::f");
+            println!("m16::<S as Trait1<S>>::f"); // $ item=println
             Self::g(self); // $ item=I92
             self.g() // $ item=I92
         } // I91
 
         fn g(&self) -> S { // $ item=I90
-            println!("m16::<S as Trait1<S>>::g");
+            println!("m16::<S as Trait1<S>>::g"); // $ item=println
             Self::c // $ item=I95
         } // I92
 
@@ -428,14 +436,14 @@ mod m16 {
     > // $ item=I89
       for S { // $ item=I90
         fn f(&self) -> S { // $ item=I90
-            println!("m16::<S as Trait2<S>>::f");
+            println!("m16::<S as Trait2<S>>::f"); // $ item=println
             Self::c // $ MISSING: item=I95
         } // I93
     }
 
     #[rustfmt::skip]
     pub fn f() {
-        println!("m16::f");
+        println!("m16::f"); // $ item=println
         let x = S; // $ item=I90
         <S // $ item=I90
           as Trait1<
@@ -460,6 +468,58 @@ mod m16 {
     } // I83
 }
 
+mod trait_visibility {
+    mod m {
+        pub trait Foo {
+            fn a_method(&self); // Foo::a_method
+        } // Foo
+
+        pub trait Bar {
+            fn a_method(&self); // Bar::a_method
+        } // Bar
+
+        pub struct X;
+        #[rustfmt::skip]
+        impl Foo for X { // $ item=Foo item=X
+            fn a_method(&self) {
+                println!("foo!"); // $ item=println
+            } // X_Foo::a_method
+        }
+        #[rustfmt::skip]
+        impl Bar for X { // $ item=Bar item=X
+            fn a_method(&self) {
+                println!("bar!"); // $ item=println
+            } // X_Bar::a_method
+        }
+    }
+
+    use m::X; // $ item=X
+
+    pub fn f() {
+        let x = X; // $ item=X
+        {
+            // Only the `Foo` trait is visible
+            use m::Foo; // $ item=Foo
+            X::a_method(&x); // $ item=X_Foo::a_method
+        }
+        {
+            // Only the `Bar` trait is visible
+            use m::Bar; // $ item=Bar
+            X::a_method(&x); // $ item=X_Bar::a_method
+        }
+        {
+            // Only the `Bar` trait is visible (but unnameable)
+            use m::Bar as _; // $ item=Bar
+            X::a_method(&x); // $ item=X_Bar::a_method
+        }
+        {
+            // The `Bar` trait is not visible, but we can refer to its method
+            // with a full path.
+            m::Bar::a_method(&x); // $ item=Bar::a_method
+        }
+    } // trait_visibility::f
+}
+
 mod m17 {
     trait MyTrait {
         fn f(&self); // I1
@@ -471,7 +531,7 @@ mod m17 {
     impl MyTrait // $ item=I2
     for S { // $ item=I3
         fn f(&self) {
-            println!("M17::MyTrait::f");
+            println!("M17::MyTrait::f"); // $ item=println
         } // I4
     }
 
@@ -494,17 +554,17 @@ mod m17 {
 
 mod m18 {
     fn f() {
-        println!("m18::f");
+        println!("m18::f"); // $ item=println
     } // I101
 
     pub mod m19 {
         fn f() {
-            println!("m18::m19::f");
+            println!("m18::m19::f"); // $ item=println
         } // I102
 
         pub mod m20 {
             pub fn g() {
-                println!("m18::m19::m20::g");
+                println!("m18::m19::m20::g"); // $ item=println
                 super::f(); // $ item=I102
                 super::super::f(); // $ item=I101
             } // I103
@@ -555,7 +615,7 @@ mod m23 {
     > // $ item=I2
       for S { // $ item=I4
         fn f(&self) {
-            println!("m23::<S as Trait1<S>>::f");
+            println!("m23::<S as Trait1<S>>::f"); // $ item=println
         } // I5
     }
 
@@ -609,14 +669,14 @@ mod m24 {
     #[rustfmt::skip]
     impl TraitA for Implementor { // $ item=I111 item=I118
         fn trait_a_method(&self) {
-            println!("TraitA method called");
+            println!("TraitA method called"); // $ item=println
         } // I119
     }
 
     #[rustfmt::skip]
     impl TraitB for Implementor { // $ item=I113 item=I118
         fn trait_b_method(&self) {
-            println!("TraitB method called");
+            println!("TraitB method called"); // $ item=println
         } // I120
     }
 
@@ -709,6 +769,27 @@ use std::{self as ztd}; // $ item=std
 
 fn use_ztd(x: ztd::string::String) {} // $ item=String
 
+#[rustfmt::skip]
+mod impl_with_attribute_macro {
+    struct Foo; // IFoo
+
+    trait ATrait {
+        type Foo;
+    } // IATrait
+
+    #[proc_macro::identity] // $ item=identity
+    impl ATrait for i64 { // $ item=IATrait item=i64
+        type Foo =
+          i64 // $ item=i64
+        ; // IATrait_i64_Foo
+    }
+
+    pub fn test() {
+        // This should resolve to the struct, not the associated type.
+        let _x: Foo; // $ item=IFoo
+    } // impl_with_attribute_macro::test
+}
+
 fn main() {
     my::nested::nested1::nested2::f(); // $ item=I4
     my::f(); // $ item=I38
@@ -730,17 +811,19 @@ fn main() {
     m11::f(); // $ item=I63
     m15::f(); // $ item=I75
     m16::f(); // $ item=I83
+    trait_visibility::f(); // $ item=trait_visibility::f
     m17::f(); // $ item=I99
     nested6::f(); // $ item=I116
     nested8::f(); // $ item=I119
     my3::f(); // $ item=I200
     nested_f(); // $ item=I201
+    my_alias::nested_f(); // $ item=I201
     m18::m19::m20::g(); // $ item=I103
     m23::f(); // $ item=I108
     m24::f(); // $ item=I121
     zelf::h(); // $ item=I25
-    z_changed(); // $ MISSING: item=I122
-    AStruct::z_on_type(); // $ MISSING: item=I124
-    AStruct {} // $ item=I123
-        .z_on_instance(); // MISSING: item=I125
+    z_changed(); // $ item=I122
+    AStruct::z_on_type(); // $ item=I124
+    AStruct {}.z_on_instance(); // $ item=I123 item=I125
+    impl_with_attribute_macro::test(); // $ item=impl_with_attribute_macro::test
 }
diff --git a/rust/ql/test/library-tests/path-resolution/my.rs b/rust/ql/test/library-tests/path-resolution/my.rs
index f2488df4959..612e40d493f 100644
--- a/rust/ql/test/library-tests/path-resolution/my.rs
+++ b/rust/ql/test/library-tests/path-resolution/my.rs
@@ -3,11 +3,11 @@ pub mod nested; // I37
 use nested::g; // $ item=I7
 
 pub fn f() {
-    println!("my.rs::f");
+    println!("my.rs::f"); // $ item=println
 } // I38
 
 pub fn h() {
-    println!("my.rs::h");
+    println!("my.rs::h"); // $ item=println
     g(); // $ item=I7
 } // I39
 
@@ -30,7 +30,7 @@ fn int_div(
 ) -> Result<i32> // $ item=my::Result $ item=i32
 {
     if y == 0 {
-        return Err("Div by zero".to_string()); // $ item=Err
+        return Err("Div by zero".to_string()); // $ item=Err item=to_string
     }
     Ok(x / y) // $ item=Ok
 }
diff --git a/rust/ql/test/library-tests/path-resolution/my/my4/my5/mod.rs b/rust/ql/test/library-tests/path-resolution/my/my4/my5/mod.rs
index 25a94fee7c1..dbaf9a43be8 100644
--- a/rust/ql/test/library-tests/path-resolution/my/my4/my5/mod.rs
+++ b/rust/ql/test/library-tests/path-resolution/my/my4/my5/mod.rs
@@ -1,3 +1,3 @@
 pub fn f() {
-    println!("my/my4/my5/mod.rs::f");
+    println!("my/my4/my5/mod.rs::f"); // $ item=println
 } // I201
diff --git a/rust/ql/test/library-tests/path-resolution/my/nested.rs b/rust/ql/test/library-tests/path-resolution/my/nested.rs
index 639ed241ae3..d3c425e6a24 100644
--- a/rust/ql/test/library-tests/path-resolution/my/nested.rs
+++ b/rust/ql/test/library-tests/path-resolution/my/nested.rs
@@ -1,22 +1,22 @@
 pub mod nested1 {
     pub mod nested2 {
         pub fn f() {
-            println!("nested.rs:nested1::nested2::f");
+            println!("nested.rs:nested1::nested2::f"); // $ item=println
         } // I4
 
         fn g() {
-            println!("nested.rs:nested1::nested2::g");
+            println!("nested.rs:nested1::nested2::g"); // $ item=println
             f(); // $ item=I4
         } // I5
     } // I3
 
     fn g() {
-        println!("nested.rs:nested1::g");
+        println!("nested.rs:nested1::g"); // $ item=println
         nested2::f(); // $ item=I4
     } // I6
 } // I1
 
 pub fn g() {
-    println!("nested.rs::g");
+    println!("nested.rs::g"); // $ item=println
     nested1::nested2::f(); // $ item=I4
 } // I7
diff --git a/rust/ql/test/library-tests/path-resolution/my2/mod.rs b/rust/ql/test/library-tests/path-resolution/my2/mod.rs
index 43c1a05e91f..c16d93216b0 100644
--- a/rust/ql/test/library-tests/path-resolution/my2/mod.rs
+++ b/rust/ql/test/library-tests/path-resolution/my2/mod.rs
@@ -1,17 +1,25 @@
 pub mod nested2; // I8
 
 fn g() {
-    println!("my2/mod.rs::g");
+    println!("my2/mod.rs::g"); // $ item=println
     nested2::nested3::nested4::f(); // $ item=I12
 } // I9
 
 pub use nested2::nested5::*; // $ item=I114
 
-pub use nested2::nested7::nested8::{self}; // $ item=I118
+#[rustfmt::skip]
+pub use nested2::nested7::nested8::{ // $ item=I118
+    self, // $ item=I118
+    f as nested8_f // $ item=I119
+};
+
+use nested2::nested5::nested6::f as nested6_f; // $ item=I116
+
+use std::ops::Deref; // $ item=Deref
 
 pub mod my3;
 
 #[path = "renamed.rs"]
 mod mymod;
 
-use mymod::f; // $ item=I1001
+pub use mymod::f; // $ item=I1001
diff --git a/rust/ql/test/library-tests/path-resolution/my2/my3/mod.rs b/rust/ql/test/library-tests/path-resolution/my2/my3/mod.rs
index 6b54377728b..d15877f8107 100644
--- a/rust/ql/test/library-tests/path-resolution/my2/my3/mod.rs
+++ b/rust/ql/test/library-tests/path-resolution/my2/my3/mod.rs
@@ -1,8 +1,14 @@
 pub fn f() {
-    println!("my2/my3/mod.rs::f");
+    println!("my2/my3/mod.rs::f"); // $ item=println
     g(); // $ item=I9
     h(); // $ item=I25
 } // I200
 
 use super::super::h; // $ item=I25
 use super::g; // $ item=I9
+
+use super::nested6_f; // $ item=I116
+
+use super::*; // $ item=mod.rs
+
+trait MyTrait: Deref {} // $ item=Deref
diff --git a/rust/ql/test/library-tests/path-resolution/my2/nested2.rs b/rust/ql/test/library-tests/path-resolution/my2/nested2.rs
index 47fed6d4299..318eb7e250a 100644
--- a/rust/ql/test/library-tests/path-resolution/my2/nested2.rs
+++ b/rust/ql/test/library-tests/path-resolution/my2/nested2.rs
@@ -1,11 +1,11 @@
 pub mod nested3 {
     pub mod nested4 {
         pub fn f() {
-            println!("nested2.rs::nested3::nested4::f");
+            println!("nested2.rs::nested3::nested4::f"); // $ item=println
         } // I12
 
         pub fn g() {
-            println!("nested2.rs::nested3::nested4::g");
+            println!("nested2.rs::nested3::nested4::g"); // $ item=println
         } // I13
     } // I11
 } // I10
@@ -13,7 +13,7 @@ pub mod nested3 {
 pub mod nested5 {
     pub mod nested6 {
         pub fn f() {
-            println!("nested2.rs::nested5::nested6::f");
+            println!("nested2.rs::nested5::nested6::f"); // $ item=println
         } // I116
     } // I115
 } // I114
@@ -21,7 +21,7 @@ pub mod nested5 {
 pub mod nested7 {
     pub mod nested8 {
         pub fn f() {
-            println!("nested2.rs::nested7::nested8::f");
+            println!("nested2.rs::nested7::nested8::f"); // $ item=println
         } // I119
     } // I118
 } // I117
diff --git a/rust/ql/test/library-tests/path-resolution/path-resolution.expected b/rust/ql/test/library-tests/path-resolution/path-resolution.expected
index 0eb100542b5..0ff48d11e8d 100644
--- a/rust/ql/test/library-tests/path-resolution/path-resolution.expected
+++ b/rust/ql/test/library-tests/path-resolution/path-resolution.expected
@@ -1,37 +1,40 @@
 mod
 | lib.rs:1:1:1:11 | mod my |
 | main.rs:1:1:1:7 | mod my |
-| main.rs:7:1:7:8 | mod my2 |
-| main.rs:13:1:37:1 | mod m1 |
-| main.rs:18:5:36:5 | mod m2 |
-| main.rs:29:9:35:9 | mod m3 |
-| main.rs:39:1:46:1 | mod m4 |
-| main.rs:103:1:107:1 | mod m5 |
-| main.rs:109:1:120:1 | mod m6 |
-| main.rs:122:1:141:1 | mod m7 |
-| main.rs:143:1:197:1 | mod m8 |
-| main.rs:199:1:207:1 | mod m9 |
-| main.rs:209:1:228:1 | mod m10 |
-| main.rs:230:1:267:1 | mod m11 |
-| main.rs:240:5:240:12 | mod f |
-| main.rs:269:1:281:1 | mod m12 |
-| main.rs:283:1:296:1 | mod m13 |
-| main.rs:287:5:295:5 | mod m14 |
-| main.rs:298:1:367:1 | mod m15 |
-| main.rs:369:1:461:1 | mod m16 |
-| main.rs:463:1:493:1 | mod m17 |
-| main.rs:495:1:513:1 | mod m18 |
-| main.rs:500:5:512:5 | mod m19 |
-| main.rs:505:9:511:9 | mod m20 |
-| main.rs:515:1:540:1 | mod m21 |
-| main.rs:516:5:522:5 | mod m22 |
-| main.rs:524:5:539:5 | mod m33 |
-| main.rs:542:1:567:1 | mod m23 |
-| main.rs:569:1:637:1 | mod m24 |
-| main.rs:654:1:706:1 | mod associated_types |
+| main.rs:8:1:8:8 | mod my2 |
+| main.rs:20:1:44:1 | mod m1 |
+| main.rs:25:5:43:5 | mod m2 |
+| main.rs:36:9:42:9 | mod m3 |
+| main.rs:46:1:53:1 | mod m4 |
+| main.rs:110:1:114:1 | mod m5 |
+| main.rs:116:1:128:1 | mod m6 |
+| main.rs:130:1:149:1 | mod m7 |
+| main.rs:151:1:205:1 | mod m8 |
+| main.rs:207:1:215:1 | mod m9 |
+| main.rs:217:1:236:1 | mod m10 |
+| main.rs:238:1:275:1 | mod m11 |
+| main.rs:248:5:248:12 | mod f |
+| main.rs:277:1:289:1 | mod m12 |
+| main.rs:291:1:304:1 | mod m13 |
+| main.rs:295:5:303:5 | mod m14 |
+| main.rs:306:1:375:1 | mod m15 |
+| main.rs:377:1:469:1 | mod m16 |
+| main.rs:471:1:521:1 | mod trait_visibility |
+| main.rs:472:5:494:5 | mod m |
+| main.rs:523:1:553:1 | mod m17 |
+| main.rs:555:1:573:1 | mod m18 |
+| main.rs:560:5:572:5 | mod m19 |
+| main.rs:565:9:571:9 | mod m20 |
+| main.rs:575:1:600:1 | mod m21 |
+| main.rs:576:5:582:5 | mod m22 |
+| main.rs:584:5:599:5 | mod m33 |
+| main.rs:602:1:627:1 | mod m23 |
+| main.rs:629:1:697:1 | mod m24 |
+| main.rs:714:1:766:1 | mod associated_types |
+| main.rs:772:1:791:1 | mod impl_with_attribute_macro |
 | my2/mod.rs:1:1:1:16 | mod nested2 |
-| my2/mod.rs:12:1:12:12 | mod my3 |
-| my2/mod.rs:14:1:15:10 | mod mymod |
+| my2/mod.rs:20:1:20:12 | mod my3 |
+| my2/mod.rs:22:1:23:10 | mod mymod |
 | my2/nested2.rs:1:1:11:1 | mod nested3 |
 | my2/nested2.rs:2:5:10:5 | mod nested4 |
 | my2/nested2.rs:13:1:19:1 | mod nested5 |
@@ -44,372 +47,468 @@ mod
 | my/nested.rs:1:1:17:1 | mod nested1 |
 | my/nested.rs:2:5:11:5 | mod nested2 |
 resolvePath
-| main.rs:3:5:3:6 | my | main.rs:1:1:1:7 | mod my |
-| main.rs:5:5:5:6 | my | main.rs:1:1:1:7 | mod my |
-| main.rs:5:5:5:14 | ...::nested | my.rs:1:1:1:15 | mod nested |
-| main.rs:5:5:5:23 | ...::nested1 | my/nested.rs:1:1:17:1 | mod nested1 |
-| main.rs:5:5:5:32 | ...::nested2 | my/nested.rs:2:5:11:5 | mod nested2 |
-| main.rs:9:5:9:7 | my2 | main.rs:7:1:7:8 | mod my2 |
-| main.rs:11:5:11:7 | my2 | main.rs:7:1:7:8 | mod my2 |
-| main.rs:11:5:11:16 | ...::nested2 | my2/mod.rs:1:1:1:16 | mod nested2 |
-| main.rs:11:5:11:25 | ...::nested3 | my2/nested2.rs:1:1:11:1 | mod nested3 |
-| main.rs:11:5:11:34 | ...::nested4 | my2/nested2.rs:2:5:10:5 | mod nested4 |
-| main.rs:11:38:11:38 | f | my2/nested2.rs:3:9:5:9 | fn f |
-| main.rs:11:41:11:41 | g | my2/nested2.rs:7:9:9:9 | fn g |
-| main.rs:25:13:25:13 | f | main.rs:19:9:21:9 | fn f |
-| main.rs:26:13:26:17 | super | main.rs:13:1:37:1 | mod m1 |
-| main.rs:26:13:26:20 | ...::f | main.rs:14:5:16:5 | fn f |
-| main.rs:30:17:30:21 | super | main.rs:18:5:36:5 | mod m2 |
-| main.rs:30:17:30:24 | ...::f | main.rs:19:9:21:9 | fn f |
-| main.rs:33:17:33:17 | f | main.rs:19:9:21:9 | fn f |
-| main.rs:40:9:40:13 | super | main.rs:1:1:746:2 | SourceFile |
-| main.rs:40:9:40:17 | ...::m1 | main.rs:13:1:37:1 | mod m1 |
-| main.rs:40:9:40:21 | ...::m2 | main.rs:18:5:36:5 | mod m2 |
-| main.rs:40:9:40:24 | ...::g | main.rs:23:9:27:9 | fn g |
-| main.rs:44:9:44:9 | g | main.rs:23:9:27:9 | fn g |
-| main.rs:56:13:56:14 | m1 | main.rs:13:1:37:1 | mod m1 |
-| main.rs:56:13:56:18 | ...::m2 | main.rs:18:5:36:5 | mod m2 |
-| main.rs:56:13:56:21 | ...::g | main.rs:23:9:27:9 | fn g |
-| main.rs:57:9:57:9 | g | main.rs:23:9:27:9 | fn g |
-| main.rs:61:17:61:19 | Foo | main.rs:59:9:59:21 | struct Foo |
-| main.rs:64:13:64:15 | Foo | main.rs:53:5:53:17 | struct Foo |
-| main.rs:66:5:66:5 | f | main.rs:55:5:62:5 | fn f |
-| main.rs:68:5:68:8 | self | main.rs:1:1:746:2 | SourceFile |
-| main.rs:68:5:68:11 | ...::i | main.rs:71:1:83:1 | fn i |
-| main.rs:74:13:74:15 | Foo | main.rs:48:1:48:13 | struct Foo |
-| main.rs:78:16:78:18 | i32 | {EXTERNAL LOCATION} | struct i32 |
-| main.rs:81:17:81:19 | Foo | main.rs:77:9:79:9 | struct Foo |
-| main.rs:85:5:85:7 | my2 | main.rs:7:1:7:8 | mod my2 |
-| main.rs:85:5:85:16 | ...::nested2 | my2/mod.rs:1:1:1:16 | mod nested2 |
-| main.rs:87:5:87:21 | my2_nested2_alias | my2/mod.rs:1:1:1:16 | mod nested2 |
-| main.rs:87:5:87:30 | ...::nested3 | my2/nested2.rs:1:1:11:1 | mod nested3 |
-| main.rs:87:34:87:40 | nested4 | my2/nested2.rs:2:5:10:5 | mod nested4 |
-| main.rs:87:34:87:43 | ...::f | my2/nested2.rs:3:9:5:9 | fn f |
-| main.rs:87:57:87:63 | nested4 | my2/nested2.rs:2:5:10:5 | mod nested4 |
-| main.rs:87:57:87:66 | ...::g | my2/nested2.rs:7:9:9:9 | fn g |
-| main.rs:87:80:87:86 | nested4 | my2/nested2.rs:2:5:10:5 | mod nested4 |
-| main.rs:100:5:100:22 | f_defined_in_macro | main.rs:99:18:99:42 | fn f_defined_in_macro |
-| main.rs:117:13:117:17 | super | main.rs:1:1:746:2 | SourceFile |
-| main.rs:117:13:117:21 | ...::m5 | main.rs:103:1:107:1 | mod m5 |
-| main.rs:118:9:118:9 | f | main.rs:104:5:106:5 | fn f |
-| main.rs:118:9:118:9 | f | main.rs:110:5:112:5 | fn f |
-| main.rs:125:13:125:15 | i32 | {EXTERNAL LOCATION} | struct i32 |
-| main.rs:128:16:128:18 | i32 | {EXTERNAL LOCATION} | struct i32 |
-| main.rs:134:19:134:24 | MyEnum | main.rs:123:5:131:5 | enum MyEnum |
-| main.rs:137:17:137:22 | MyEnum | main.rs:123:5:131:5 | enum MyEnum |
-| main.rs:137:17:137:25 | ...::A | main.rs:124:9:126:9 | A |
-| main.rs:138:17:138:22 | MyEnum | main.rs:123:5:131:5 | enum MyEnum |
-| main.rs:138:17:138:25 | ...::B | main.rs:126:12:129:9 | B |
-| main.rs:139:9:139:14 | MyEnum | main.rs:123:5:131:5 | enum MyEnum |
-| main.rs:139:9:139:17 | ...::C | main.rs:129:12:130:9 | C |
-| main.rs:149:13:149:13 | f | main.rs:156:5:158:5 | fn f |
-| main.rs:150:13:150:16 | Self | main.rs:144:5:152:5 | trait MyTrait |
-| main.rs:150:13:150:19 | ...::f | main.rs:145:9:145:20 | fn f |
-| main.rs:161:10:161:16 | MyTrait | main.rs:144:5:152:5 | trait MyTrait |
-| main.rs:161:22:161:29 | MyStruct | main.rs:154:5:154:22 | struct MyStruct |
-| main.rs:164:13:164:13 | f | main.rs:156:5:158:5 | fn f |
-| main.rs:165:13:165:16 | Self | main.rs:160:5:171:5 | impl MyTrait for MyStruct { ... } |
-| main.rs:165:13:165:19 | ...::g | main.rs:168:9:170:9 | fn g |
-| main.rs:174:10:174:17 | MyStruct | main.rs:154:5:154:22 | struct MyStruct |
-| main.rs:177:13:177:13 | f | main.rs:156:5:158:5 | fn f |
-| main.rs:183:17:183:24 | MyStruct | main.rs:154:5:154:22 | struct MyStruct |
-| main.rs:184:9:184:15 | MyTrait | main.rs:144:5:152:5 | trait MyTrait |
-| main.rs:184:9:184:18 | ...::f | main.rs:145:9:145:20 | fn f |
-| main.rs:185:9:185:16 | MyStruct | main.rs:154:5:154:22 | struct MyStruct |
-| main.rs:185:9:185:19 | ...::f | main.rs:161:33:166:9 | fn f |
-| main.rs:186:10:186:17 | MyStruct | main.rs:154:5:154:22 | struct MyStruct |
-| main.rs:187:10:187:16 | MyTrait | main.rs:144:5:152:5 | trait MyTrait |
-| main.rs:190:17:190:24 | MyStruct | main.rs:154:5:154:22 | struct MyStruct |
-| main.rs:192:17:192:24 | MyStruct | main.rs:154:5:154:22 | struct MyStruct |
-| main.rs:194:9:194:16 | MyStruct | main.rs:154:5:154:22 | struct MyStruct |
-| main.rs:194:9:194:19 | ...::h | main.rs:174:21:178:9 | fn h |
-| main.rs:203:19:203:22 | self | main.rs:199:1:207:1 | mod m9 |
-| main.rs:203:19:203:32 | ...::MyStruct | main.rs:200:5:200:26 | struct MyStruct |
-| main.rs:205:9:205:12 | self | main.rs:199:1:207:1 | mod m9 |
-| main.rs:205:9:205:22 | ...::MyStruct | main.rs:200:5:200:26 | struct MyStruct |
-| main.rs:215:12:215:12 | T | main.rs:212:7:212:7 | T |
-| main.rs:220:12:220:12 | T | main.rs:219:14:219:14 | T |
-| main.rs:222:7:224:7 | MyStruct::<...> | main.rs:210:5:216:5 | struct MyStruct |
-| main.rs:223:9:223:9 | T | main.rs:219:14:219:14 | T |
-| main.rs:226:9:226:16 | MyStruct | main.rs:210:5:216:5 | struct MyStruct |
-| main.rs:236:17:236:19 | Foo | main.rs:231:5:231:21 | struct Foo |
-| main.rs:237:9:237:11 | Foo | main.rs:233:5:233:15 | fn Foo |
-| main.rs:246:9:246:11 | Bar | main.rs:242:5:244:5 | enum Bar |
-| main.rs:246:9:246:19 | ...::FooBar | main.rs:243:9:243:17 | FooBar |
-| main.rs:251:13:251:15 | Foo | main.rs:231:5:231:21 | struct Foo |
-| main.rs:252:17:252:22 | FooBar | main.rs:243:9:243:17 | FooBar |
-| main.rs:253:17:253:22 | FooBar | main.rs:248:5:248:18 | fn FooBar |
-| main.rs:261:9:261:9 | E | main.rs:256:15:259:5 | enum E |
-| main.rs:261:9:261:12 | ...::C | main.rs:258:9:258:9 | C |
-| main.rs:264:17:264:17 | S | main.rs:256:5:256:13 | struct S |
-| main.rs:265:17:265:17 | C | main.rs:258:9:258:9 | C |
-| main.rs:278:16:278:16 | T | main.rs:272:7:272:7 | T |
-| main.rs:279:14:279:17 | Self | main.rs:270:5:280:5 | trait MyParamTrait |
-| main.rs:279:14:279:33 | ...::AssociatedType | main.rs:274:9:274:28 | type AssociatedType |
-| main.rs:288:13:288:16 | zelf | main.rs:0:0:0:0 | Crate(main@0.0.1) |
-| main.rs:288:13:288:21 | ...::m13 | main.rs:283:1:296:1 | mod m13 |
-| main.rs:288:13:288:24 | ...::f | main.rs:284:5:284:17 | fn f |
-| main.rs:288:13:288:24 | ...::f | main.rs:284:19:285:19 | struct f |
-| main.rs:291:17:291:17 | f | main.rs:284:19:285:19 | struct f |
-| main.rs:292:21:292:21 | f | main.rs:284:19:285:19 | struct f |
-| main.rs:293:13:293:13 | f | main.rs:284:5:284:17 | fn f |
-| main.rs:307:9:307:14 | Trait1 | main.rs:299:5:303:5 | trait Trait1 |
-| main.rs:310:13:310:16 | Self | main.rs:305:5:313:5 | trait Trait2 |
-| main.rs:310:13:310:19 | ...::g | main.rs:302:9:302:20 | fn g |
-| main.rs:320:9:320:12 | Self | main.rs:315:5:328:5 | trait Trait3 |
-| main.rs:320:15:320:20 | Trait1 | main.rs:299:5:303:5 | trait Trait1 |
-| main.rs:321:9:321:10 | TT | main.rs:317:9:317:10 | TT |
-| main.rs:321:13:321:18 | Trait1 | main.rs:299:5:303:5 | trait Trait1 |
-| main.rs:323:25:323:26 | TT | main.rs:317:9:317:10 | TT |
-| main.rs:324:13:324:16 | Self | main.rs:315:5:328:5 | trait Trait3 |
-| main.rs:324:13:324:19 | ...::g | main.rs:302:9:302:20 | fn g |
-| main.rs:325:13:325:14 | TT | main.rs:317:9:317:10 | TT |
-| main.rs:325:13:325:17 | ...::g | main.rs:302:9:302:20 | fn g |
-| main.rs:333:10:333:15 | Trait1 | main.rs:299:5:303:5 | trait Trait1 |
-| main.rs:334:11:334:11 | S | main.rs:330:5:330:13 | struct S |
-| main.rs:337:13:337:16 | Self | main.rs:332:5:344:5 | impl Trait1 for S { ... } |
-| main.rs:337:13:337:19 | ...::g | main.rs:341:9:343:9 | fn g |
-| main.rs:347:10:347:15 | Trait2 | main.rs:305:5:313:5 | trait Trait2 |
-| main.rs:348:11:348:11 | S | main.rs:330:5:330:13 | struct S |
-| main.rs:357:17:357:17 | S | main.rs:330:5:330:13 | struct S |
-| main.rs:358:10:358:10 | S | main.rs:330:5:330:13 | struct S |
-| main.rs:359:14:359:19 | Trait1 | main.rs:299:5:303:5 | trait Trait1 |
-| main.rs:361:10:361:10 | S | main.rs:330:5:330:13 | struct S |
-| main.rs:362:14:362:19 | Trait2 | main.rs:305:5:313:5 | trait Trait2 |
-| main.rs:364:9:364:9 | S | main.rs:330:5:330:13 | struct S |
-| main.rs:364:9:364:12 | ...::g | main.rs:341:9:343:9 | fn g |
-| main.rs:374:24:374:24 | T | main.rs:372:7:372:7 | T |
-| main.rs:376:24:376:24 | T | main.rs:372:7:372:7 | T |
-| main.rs:379:24:379:24 | T | main.rs:372:7:372:7 | T |
-| main.rs:380:13:380:16 | Self | main.rs:370:5:386:5 | trait Trait1 |
-| main.rs:380:13:380:19 | ...::g | main.rs:376:9:377:9 | fn g |
-| main.rs:384:18:384:18 | T | main.rs:372:7:372:7 | T |
-| main.rs:392:9:394:9 | Trait1::<...> | main.rs:370:5:386:5 | trait Trait1 |
-| main.rs:393:11:393:11 | T | main.rs:390:7:390:7 | T |
-| main.rs:395:24:395:24 | T | main.rs:390:7:390:7 | T |
-| main.rs:397:13:397:16 | Self | main.rs:388:5:401:5 | trait Trait2 |
-| main.rs:397:13:397:19 | ...::g | main.rs:376:9:377:9 | fn g |
-| main.rs:399:13:399:16 | Self | main.rs:388:5:401:5 | trait Trait2 |
-| main.rs:399:13:399:19 | ...::c | main.rs:384:9:385:9 | Const |
-| main.rs:406:10:408:5 | Trait1::<...> | main.rs:370:5:386:5 | trait Trait1 |
-| main.rs:407:7:407:7 | S | main.rs:403:5:403:13 | struct S |
-| main.rs:409:11:409:11 | S | main.rs:403:5:403:13 | struct S |
-| main.rs:410:24:410:24 | S | main.rs:403:5:403:13 | struct S |
-| main.rs:412:13:412:16 | Self | main.rs:405:5:423:5 | impl Trait1::<...> for S { ... } |
-| main.rs:412:13:412:19 | ...::g | main.rs:416:9:419:9 | fn g |
-| main.rs:416:24:416:24 | S | main.rs:403:5:403:13 | struct S |
-| main.rs:418:13:418:16 | Self | main.rs:405:5:423:5 | impl Trait1::<...> for S { ... } |
-| main.rs:418:13:418:19 | ...::c | main.rs:421:9:422:9 | Const |
-| main.rs:421:18:421:18 | S | main.rs:403:5:403:13 | struct S |
-| main.rs:421:22:421:22 | S | main.rs:403:5:403:13 | struct S |
-| main.rs:426:10:428:5 | Trait2::<...> | main.rs:388:5:401:5 | trait Trait2 |
-| main.rs:427:7:427:7 | S | main.rs:403:5:403:13 | struct S |
-| main.rs:429:11:429:11 | S | main.rs:403:5:403:13 | struct S |
-| main.rs:430:24:430:24 | S | main.rs:403:5:403:13 | struct S |
-| main.rs:432:13:432:16 | Self | main.rs:425:5:434:5 | impl Trait2::<...> for S { ... } |
-| main.rs:439:17:439:17 | S | main.rs:403:5:403:13 | struct S |
-| main.rs:440:10:440:10 | S | main.rs:403:5:403:13 | struct S |
-| main.rs:441:14:443:11 | Trait1::<...> | main.rs:370:5:386:5 | trait Trait1 |
-| main.rs:442:13:442:13 | S | main.rs:403:5:403:13 | struct S |
-| main.rs:445:10:445:10 | S | main.rs:403:5:403:13 | struct S |
-| main.rs:446:14:448:11 | Trait2::<...> | main.rs:388:5:401:5 | trait Trait2 |
-| main.rs:447:13:447:13 | S | main.rs:403:5:403:13 | struct S |
-| main.rs:450:9:450:9 | S | main.rs:403:5:403:13 | struct S |
-| main.rs:450:9:450:12 | ...::g | main.rs:416:9:419:9 | fn g |
-| main.rs:452:9:452:9 | S | main.rs:403:5:403:13 | struct S |
-| main.rs:452:9:452:12 | ...::h | main.rs:379:9:382:9 | fn h |
-| main.rs:454:9:454:9 | S | main.rs:403:5:403:13 | struct S |
-| main.rs:454:9:454:12 | ...::c | main.rs:421:9:422:9 | Const |
-| main.rs:455:10:455:10 | S | main.rs:403:5:403:13 | struct S |
-| main.rs:456:14:458:11 | Trait1::<...> | main.rs:370:5:386:5 | trait Trait1 |
-| main.rs:457:13:457:13 | S | main.rs:403:5:403:13 | struct S |
-| main.rs:471:10:471:16 | MyTrait | main.rs:464:5:466:5 | trait MyTrait |
-| main.rs:472:9:472:9 | S | main.rs:468:5:468:13 | struct S |
-| main.rs:480:7:480:13 | MyTrait | main.rs:464:5:466:5 | trait MyTrait |
-| main.rs:481:10:481:10 | T | main.rs:479:10:479:10 | T |
-| main.rs:483:9:483:9 | T | main.rs:479:10:479:10 | T |
-| main.rs:483:9:483:12 | ...::f | main.rs:465:9:465:20 | fn f |
-| main.rs:484:9:484:15 | MyTrait | main.rs:464:5:466:5 | trait MyTrait |
-| main.rs:484:9:484:18 | ...::f | main.rs:465:9:465:20 | fn f |
-| main.rs:489:9:489:9 | g | main.rs:478:5:485:5 | fn g |
-| main.rs:490:11:490:11 | S | main.rs:468:5:468:13 | struct S |
-| main.rs:508:17:508:21 | super | main.rs:500:5:512:5 | mod m19 |
-| main.rs:508:17:508:24 | ...::f | main.rs:501:9:503:9 | fn f |
-| main.rs:509:17:509:21 | super | main.rs:500:5:512:5 | mod m19 |
-| main.rs:509:17:509:28 | ...::super | main.rs:495:1:513:1 | mod m18 |
-| main.rs:509:17:509:31 | ...::f | main.rs:496:5:498:5 | fn f |
-| main.rs:526:13:526:17 | super | main.rs:515:1:540:1 | mod m21 |
-| main.rs:526:13:526:22 | ...::m22 | main.rs:516:5:522:5 | mod m22 |
-| main.rs:526:13:526:30 | ...::MyEnum | main.rs:517:9:519:9 | enum MyEnum |
-| main.rs:527:13:527:16 | self | main.rs:517:9:519:9 | enum MyEnum |
-| main.rs:531:13:531:17 | super | main.rs:515:1:540:1 | mod m21 |
-| main.rs:531:13:531:22 | ...::m22 | main.rs:516:5:522:5 | mod m22 |
-| main.rs:531:13:531:32 | ...::MyStruct | main.rs:521:9:521:28 | struct MyStruct |
-| main.rs:532:13:532:16 | self | main.rs:521:9:521:28 | struct MyStruct |
-| main.rs:536:21:536:26 | MyEnum | main.rs:517:9:519:9 | enum MyEnum |
-| main.rs:536:21:536:29 | ...::A | main.rs:518:13:518:13 | A |
-| main.rs:537:21:537:28 | MyStruct | main.rs:521:9:521:28 | struct MyStruct |
-| main.rs:553:10:555:5 | Trait1::<...> | main.rs:543:5:548:5 | trait Trait1 |
-| main.rs:554:7:554:10 | Self | main.rs:550:5:550:13 | struct S |
-| main.rs:556:11:556:11 | S | main.rs:550:5:550:13 | struct S |
-| main.rs:564:17:564:17 | S | main.rs:550:5:550:13 | struct S |
-| main.rs:580:15:580:15 | T | main.rs:579:26:579:26 | T |
-| main.rs:585:9:585:24 | GenericStruct::<...> | main.rs:578:5:581:5 | struct GenericStruct |
-| main.rs:585:23:585:23 | T | main.rs:584:10:584:10 | T |
-| main.rs:587:9:587:9 | T | main.rs:584:10:584:10 | T |
-| main.rs:587:12:587:17 | TraitA | main.rs:570:5:572:5 | trait TraitA |
-| main.rs:596:9:596:24 | GenericStruct::<...> | main.rs:578:5:581:5 | struct GenericStruct |
-| main.rs:596:23:596:23 | T | main.rs:595:10:595:10 | T |
-| main.rs:598:9:598:9 | T | main.rs:595:10:595:10 | T |
-| main.rs:598:12:598:17 | TraitB | main.rs:574:5:576:5 | trait TraitB |
-| main.rs:599:9:599:9 | T | main.rs:595:10:595:10 | T |
-| main.rs:599:12:599:17 | TraitA | main.rs:570:5:572:5 | trait TraitA |
-| main.rs:610:10:610:15 | TraitA | main.rs:570:5:572:5 | trait TraitA |
-| main.rs:610:21:610:31 | Implementor | main.rs:607:5:607:23 | struct Implementor |
-| main.rs:617:10:617:15 | TraitB | main.rs:574:5:576:5 | trait TraitB |
-| main.rs:617:21:617:31 | Implementor | main.rs:607:5:607:23 | struct Implementor |
-| main.rs:625:24:625:34 | Implementor | main.rs:607:5:607:23 | struct Implementor |
-| main.rs:626:23:626:35 | GenericStruct | main.rs:578:5:581:5 | struct GenericStruct |
-| main.rs:632:9:632:36 | GenericStruct::<...> | main.rs:578:5:581:5 | struct GenericStruct |
-| main.rs:632:9:632:50 | ...::call_trait_a | main.rs:589:9:591:9 | fn call_trait_a |
-| main.rs:632:25:632:35 | Implementor | main.rs:607:5:607:23 | struct Implementor |
-| main.rs:635:9:635:36 | GenericStruct::<...> | main.rs:578:5:581:5 | struct GenericStruct |
-| main.rs:635:9:635:47 | ...::call_both | main.rs:601:9:604:9 | fn call_both |
-| main.rs:635:25:635:35 | Implementor | main.rs:607:5:607:23 | struct Implementor |
-| main.rs:641:3:641:12 | proc_macro | {EXTERNAL LOCATION} | Crate(proc_macro@0.0.0) |
-| main.rs:641:3:641:12 | proc_macro | proc_macro.rs:0:0:0:0 | Crate(proc_macro@0.0.1) |
-| main.rs:641:3:641:24 | ...::add_suffix | proc_macro.rs:4:1:12:1 | fn add_suffix |
-| main.rs:645:6:645:12 | AStruct | main.rs:644:1:644:17 | struct AStruct |
-| main.rs:647:7:647:16 | proc_macro | {EXTERNAL LOCATION} | Crate(proc_macro@0.0.0) |
-| main.rs:647:7:647:16 | proc_macro | proc_macro.rs:0:0:0:0 | Crate(proc_macro@0.0.1) |
-| main.rs:647:7:647:28 | ...::add_suffix | proc_macro.rs:4:1:12:1 | fn add_suffix |
-| main.rs:650:7:650:16 | proc_macro | {EXTERNAL LOCATION} | Crate(proc_macro@0.0.0) |
-| main.rs:650:7:650:16 | proc_macro | proc_macro.rs:0:0:0:0 | Crate(proc_macro@0.0.1) |
-| main.rs:650:7:650:28 | ...::add_suffix | proc_macro.rs:4:1:12:1 | fn add_suffix |
-| main.rs:655:9:655:11 | std | {EXTERNAL LOCATION} | Crate(std@0.0.0) |
-| main.rs:655:9:655:19 | ...::marker | {EXTERNAL LOCATION} | mod marker |
-| main.rs:655:9:655:32 | ...::PhantomData | {EXTERNAL LOCATION} | struct PhantomData |
-| main.rs:656:9:656:11 | std | {EXTERNAL LOCATION} | Crate(std@0.0.0) |
-| main.rs:656:9:656:19 | ...::result | {EXTERNAL LOCATION} | mod result |
-| main.rs:656:9:656:27 | ...::Result | {EXTERNAL LOCATION} | enum Result |
-| main.rs:664:19:664:22 | Self | main.rs:658:5:666:5 | trait Reduce |
-| main.rs:664:19:664:29 | ...::Input | main.rs:659:9:659:19 | type Input |
-| main.rs:665:14:665:46 | Result::<...> | {EXTERNAL LOCATION} | enum Result |
-| main.rs:665:21:665:24 | Self | main.rs:658:5:666:5 | trait Reduce |
-| main.rs:665:21:665:32 | ...::Output | main.rs:660:21:661:20 | type Output |
-| main.rs:665:35:665:38 | Self | main.rs:658:5:666:5 | trait Reduce |
-| main.rs:665:35:665:45 | ...::Error | main.rs:659:21:660:19 | type Error |
-| main.rs:669:17:669:34 | PhantomData::<...> | {EXTERNAL LOCATION} | struct PhantomData |
-| main.rs:669:29:669:33 | Input | main.rs:668:19:668:23 | Input |
-| main.rs:670:17:670:34 | PhantomData::<...> | {EXTERNAL LOCATION} | struct PhantomData |
-| main.rs:670:29:670:33 | Error | main.rs:668:26:668:30 | Error |
-| main.rs:677:11:677:16 | Reduce | main.rs:658:5:666:5 | trait Reduce |
-| main.rs:678:13:681:9 | MyImpl::<...> | main.rs:668:5:671:5 | struct MyImpl |
-| main.rs:679:13:679:17 | Input | main.rs:675:13:675:17 | Input |
-| main.rs:680:13:680:17 | Error | main.rs:676:13:676:17 | Error |
-| main.rs:683:22:686:9 | Result::<...> | {EXTERNAL LOCATION} | enum Result |
-| main.rs:684:13:684:17 | Input | main.rs:675:13:675:17 | Input |
-| main.rs:685:13:685:16 | Self | main.rs:673:5:705:5 | impl Reduce for MyImpl::<...> { ... } |
-| main.rs:685:13:685:23 | ...::Error | main.rs:687:11:691:9 | type Error |
-| main.rs:688:22:690:9 | Option::<...> | {EXTERNAL LOCATION} | enum Option |
-| main.rs:689:11:689:15 | Error | main.rs:676:13:676:17 | Error |
-| main.rs:693:13:693:17 | Input | main.rs:675:13:675:17 | Input |
-| main.rs:698:19:698:22 | Self | main.rs:673:5:705:5 | impl Reduce for MyImpl::<...> { ... } |
-| main.rs:698:19:698:29 | ...::Input | main.rs:683:9:687:9 | type Input |
-| main.rs:699:14:702:9 | Result::<...> | {EXTERNAL LOCATION} | enum Result |
-| main.rs:700:13:700:16 | Self | main.rs:673:5:705:5 | impl Reduce for MyImpl::<...> { ... } |
-| main.rs:700:13:700:24 | ...::Output | main.rs:691:11:694:9 | type Output |
-| main.rs:701:13:701:16 | Self | main.rs:673:5:705:5 | impl Reduce for MyImpl::<...> { ... } |
-| main.rs:701:13:701:23 | ...::Error | main.rs:687:11:691:9 | type Error |
-| main.rs:708:5:708:7 | std | {EXTERNAL LOCATION} | Crate(std@0.0.0) |
-| main.rs:708:11:708:14 | self | {EXTERNAL LOCATION} | Crate(std@0.0.0) |
-| main.rs:710:15:710:17 | ztd | {EXTERNAL LOCATION} | Crate(std@0.0.0) |
-| main.rs:710:15:710:25 | ...::string | {EXTERNAL LOCATION} | mod string |
-| main.rs:710:15:710:33 | ...::String | {EXTERNAL LOCATION} | struct String |
-| main.rs:713:5:713:6 | my | main.rs:1:1:1:7 | mod my |
-| main.rs:713:5:713:14 | ...::nested | my.rs:1:1:1:15 | mod nested |
-| main.rs:713:5:713:23 | ...::nested1 | my/nested.rs:1:1:17:1 | mod nested1 |
-| main.rs:713:5:713:32 | ...::nested2 | my/nested.rs:2:5:11:5 | mod nested2 |
-| main.rs:713:5:713:35 | ...::f | my/nested.rs:3:9:5:9 | fn f |
-| main.rs:714:5:714:6 | my | main.rs:1:1:1:7 | mod my |
-| main.rs:714:5:714:9 | ...::f | my.rs:5:1:7:1 | fn f |
-| main.rs:715:5:715:11 | nested2 | my2/mod.rs:1:1:1:16 | mod nested2 |
-| main.rs:715:5:715:20 | ...::nested3 | my2/nested2.rs:1:1:11:1 | mod nested3 |
-| main.rs:715:5:715:29 | ...::nested4 | my2/nested2.rs:2:5:10:5 | mod nested4 |
-| main.rs:715:5:715:32 | ...::f | my2/nested2.rs:3:9:5:9 | fn f |
-| main.rs:716:5:716:5 | f | my2/nested2.rs:3:9:5:9 | fn f |
-| main.rs:717:5:717:5 | g | my2/nested2.rs:7:9:9:9 | fn g |
-| main.rs:718:5:718:9 | crate | main.rs:0:0:0:0 | Crate(main@0.0.1) |
-| main.rs:718:5:718:12 | ...::h | main.rs:50:1:69:1 | fn h |
-| main.rs:719:5:719:6 | m1 | main.rs:13:1:37:1 | mod m1 |
-| main.rs:719:5:719:10 | ...::m2 | main.rs:18:5:36:5 | mod m2 |
-| main.rs:719:5:719:13 | ...::g | main.rs:23:9:27:9 | fn g |
-| main.rs:720:5:720:6 | m1 | main.rs:13:1:37:1 | mod m1 |
-| main.rs:720:5:720:10 | ...::m2 | main.rs:18:5:36:5 | mod m2 |
-| main.rs:720:5:720:14 | ...::m3 | main.rs:29:9:35:9 | mod m3 |
-| main.rs:720:5:720:17 | ...::h | main.rs:30:27:34:13 | fn h |
-| main.rs:721:5:721:6 | m4 | main.rs:39:1:46:1 | mod m4 |
-| main.rs:721:5:721:9 | ...::i | main.rs:42:5:45:5 | fn i |
-| main.rs:722:5:722:5 | h | main.rs:50:1:69:1 | fn h |
-| main.rs:723:5:723:11 | f_alias | my2/nested2.rs:3:9:5:9 | fn f |
-| main.rs:724:5:724:11 | g_alias | my2/nested2.rs:7:9:9:9 | fn g |
-| main.rs:725:5:725:5 | j | main.rs:97:1:101:1 | fn j |
-| main.rs:726:5:726:6 | m6 | main.rs:109:1:120:1 | mod m6 |
-| main.rs:726:5:726:9 | ...::g | main.rs:114:5:119:5 | fn g |
-| main.rs:727:5:727:6 | m7 | main.rs:122:1:141:1 | mod m7 |
-| main.rs:727:5:727:9 | ...::f | main.rs:133:5:140:5 | fn f |
-| main.rs:728:5:728:6 | m8 | main.rs:143:1:197:1 | mod m8 |
-| main.rs:728:5:728:9 | ...::g | main.rs:181:5:196:5 | fn g |
-| main.rs:729:5:729:6 | m9 | main.rs:199:1:207:1 | mod m9 |
-| main.rs:729:5:729:9 | ...::f | main.rs:202:5:206:5 | fn f |
-| main.rs:730:5:730:7 | m11 | main.rs:230:1:267:1 | mod m11 |
-| main.rs:730:5:730:10 | ...::f | main.rs:235:5:238:5 | fn f |
-| main.rs:731:5:731:7 | m15 | main.rs:298:1:367:1 | mod m15 |
-| main.rs:731:5:731:10 | ...::f | main.rs:354:5:366:5 | fn f |
-| main.rs:732:5:732:7 | m16 | main.rs:369:1:461:1 | mod m16 |
-| main.rs:732:5:732:10 | ...::f | main.rs:436:5:460:5 | fn f |
-| main.rs:733:5:733:7 | m17 | main.rs:463:1:493:1 | mod m17 |
-| main.rs:733:5:733:10 | ...::f | main.rs:487:5:492:5 | fn f |
-| main.rs:734:5:734:11 | nested6 | my2/nested2.rs:14:5:18:5 | mod nested6 |
-| main.rs:734:5:734:14 | ...::f | my2/nested2.rs:15:9:17:9 | fn f |
-| main.rs:735:5:735:11 | nested8 | my2/nested2.rs:22:5:26:5 | mod nested8 |
-| main.rs:735:5:735:14 | ...::f | my2/nested2.rs:23:9:25:9 | fn f |
-| main.rs:736:5:736:7 | my3 | my2/mod.rs:12:1:12:12 | mod my3 |
-| main.rs:736:5:736:10 | ...::f | my2/my3/mod.rs:1:1:5:1 | fn f |
-| main.rs:737:5:737:12 | nested_f | my/my4/my5/mod.rs:1:1:3:1 | fn f |
-| main.rs:738:5:738:7 | m18 | main.rs:495:1:513:1 | mod m18 |
-| main.rs:738:5:738:12 | ...::m19 | main.rs:500:5:512:5 | mod m19 |
-| main.rs:738:5:738:17 | ...::m20 | main.rs:505:9:511:9 | mod m20 |
-| main.rs:738:5:738:20 | ...::g | main.rs:506:13:510:13 | fn g |
-| main.rs:739:5:739:7 | m23 | main.rs:542:1:567:1 | mod m23 |
-| main.rs:739:5:739:10 | ...::f | main.rs:562:5:566:5 | fn f |
-| main.rs:740:5:740:7 | m24 | main.rs:569:1:637:1 | mod m24 |
-| main.rs:740:5:740:10 | ...::f | main.rs:623:5:636:5 | fn f |
-| main.rs:741:5:741:8 | zelf | main.rs:0:0:0:0 | Crate(main@0.0.1) |
-| main.rs:741:5:741:11 | ...::h | main.rs:50:1:69:1 | fn h |
-| main.rs:743:5:743:11 | AStruct | main.rs:644:1:644:17 | struct AStruct |
-| main.rs:744:5:744:11 | AStruct | main.rs:644:1:644:17 | struct AStruct |
+| main.rs:4:8:4:9 | my | main.rs:1:1:1:7 | mod my |
+| main.rs:4:14:4:17 | self | main.rs:1:1:1:7 | mod my |
+| main.rs:6:5:6:6 | my | main.rs:1:1:1:7 | mod my |
+| main.rs:6:5:6:14 | ...::nested | my.rs:1:1:1:15 | mod nested |
+| main.rs:6:5:6:23 | ...::nested1 | my/nested.rs:1:1:17:1 | mod nested1 |
+| main.rs:6:5:6:32 | ...::nested2 | my/nested.rs:2:5:11:5 | mod nested2 |
+| main.rs:10:5:10:7 | my2 | main.rs:8:1:8:8 | mod my2 |
+| main.rs:13:5:13:7 | my2 | main.rs:8:1:8:8 | mod my2 |
+| main.rs:13:5:13:16 | ...::nested2 | my2/mod.rs:1:1:1:16 | mod nested2 |
+| main.rs:13:5:13:25 | ...::nested3 | my2/nested2.rs:1:1:11:1 | mod nested3 |
+| main.rs:13:5:13:34 | ...::nested4 | my2/nested2.rs:2:5:10:5 | mod nested4 |
+| main.rs:14:5:14:5 | f | my2/nested2.rs:3:9:5:9 | fn f |
+| main.rs:15:5:15:5 | g | my2/nested2.rs:7:9:9:9 | fn g |
+| main.rs:18:5:18:7 | my2 | main.rs:8:1:8:8 | mod my2 |
+| main.rs:18:5:18:18 | ...::nested8_f | my2/nested2.rs:23:9:25:9 | fn f |
+| main.rs:22:9:22:15 | println | {EXTERNAL LOCATION} | MacroRules |
+| main.rs:27:13:27:19 | println | {EXTERNAL LOCATION} | MacroRules |
+| main.rs:31:13:31:19 | println | {EXTERNAL LOCATION} | MacroRules |
+| main.rs:32:13:32:13 | f | main.rs:26:9:28:9 | fn f |
+| main.rs:33:13:33:17 | super | main.rs:20:1:44:1 | mod m1 |
+| main.rs:33:13:33:20 | ...::f | main.rs:21:5:23:5 | fn f |
+| main.rs:37:17:37:21 | super | main.rs:25:5:43:5 | mod m2 |
+| main.rs:37:17:37:24 | ...::f | main.rs:26:9:28:9 | fn f |
+| main.rs:39:17:39:23 | println | {EXTERNAL LOCATION} | MacroRules |
+| main.rs:40:17:40:17 | f | main.rs:26:9:28:9 | fn f |
+| main.rs:47:9:47:13 | super | main.rs:1:1:829:2 | SourceFile |
+| main.rs:47:9:47:17 | ...::m1 | main.rs:20:1:44:1 | mod m1 |
+| main.rs:47:9:47:21 | ...::m2 | main.rs:25:5:43:5 | mod m2 |
+| main.rs:47:9:47:24 | ...::g | main.rs:30:9:34:9 | fn g |
+| main.rs:50:9:50:15 | println | {EXTERNAL LOCATION} | MacroRules |
+| main.rs:51:9:51:9 | g | main.rs:30:9:34:9 | fn g |
+| main.rs:58:5:58:11 | println | {EXTERNAL LOCATION} | MacroRules |
+| main.rs:63:13:63:14 | m1 | main.rs:20:1:44:1 | mod m1 |
+| main.rs:63:13:63:18 | ...::m2 | main.rs:25:5:43:5 | mod m2 |
+| main.rs:63:13:63:21 | ...::g | main.rs:30:9:34:9 | fn g |
+| main.rs:64:9:64:9 | g | main.rs:30:9:34:9 | fn g |
+| main.rs:67:9:67:15 | println | {EXTERNAL LOCATION} | MacroRules |
+| main.rs:68:17:68:19 | Foo | main.rs:66:9:66:21 | struct Foo |
+| main.rs:71:13:71:15 | Foo | main.rs:60:5:60:17 | struct Foo |
+| main.rs:73:5:73:5 | f | main.rs:62:5:69:5 | fn f |
+| main.rs:75:5:75:8 | self | main.rs:1:1:829:2 | SourceFile |
+| main.rs:75:5:75:11 | ...::i | main.rs:78:1:90:1 | fn i |
+| main.rs:79:5:79:11 | println | {EXTERNAL LOCATION} | MacroRules |
+| main.rs:81:13:81:15 | Foo | main.rs:55:1:55:13 | struct Foo |
+| main.rs:85:16:85:18 | i32 | {EXTERNAL LOCATION} | struct i32 |
+| main.rs:88:17:88:19 | Foo | main.rs:84:9:86:9 | struct Foo |
+| main.rs:92:5:92:7 | my2 | main.rs:8:1:8:8 | mod my2 |
+| main.rs:92:5:92:16 | ...::nested2 | my2/mod.rs:1:1:1:16 | mod nested2 |
+| main.rs:94:5:94:21 | my2_nested2_alias | my2/mod.rs:1:1:1:16 | mod nested2 |
+| main.rs:94:5:94:30 | ...::nested3 | my2/nested2.rs:1:1:11:1 | mod nested3 |
+| main.rs:94:34:94:40 | nested4 | my2/nested2.rs:2:5:10:5 | mod nested4 |
+| main.rs:94:34:94:43 | ...::f | my2/nested2.rs:3:9:5:9 | fn f |
+| main.rs:94:57:94:63 | nested4 | my2/nested2.rs:2:5:10:5 | mod nested4 |
+| main.rs:94:57:94:66 | ...::g | my2/nested2.rs:7:9:9:9 | fn g |
+| main.rs:94:80:94:86 | nested4 | my2/nested2.rs:2:5:10:5 | mod nested4 |
+| main.rs:105:5:105:11 | println | {EXTERNAL LOCATION} | MacroRules |
+| main.rs:106:5:106:15 | fn_in_macro | main.rs:96:1:102:1 | MacroRules |
+| main.rs:106:18:106:24 | println | {EXTERNAL LOCATION} | MacroRules |
+| main.rs:107:5:107:22 | f_defined_in_macro | main.rs:106:18:106:42 | fn f_defined_in_macro |
+| main.rs:112:9:112:15 | println | {EXTERNAL LOCATION} | MacroRules |
+| main.rs:118:9:118:15 | println | {EXTERNAL LOCATION} | MacroRules |
+| main.rs:122:9:122:15 | println | {EXTERNAL LOCATION} | MacroRules |
+| main.rs:125:13:125:17 | super | main.rs:1:1:829:2 | SourceFile |
+| main.rs:125:13:125:21 | ...::m5 | main.rs:110:1:114:1 | mod m5 |
+| main.rs:126:9:126:9 | f | main.rs:111:5:113:5 | fn f |
+| main.rs:126:9:126:9 | f | main.rs:117:5:119:5 | fn f |
+| main.rs:133:13:133:15 | i32 | {EXTERNAL LOCATION} | struct i32 |
+| main.rs:136:16:136:18 | i32 | {EXTERNAL LOCATION} | struct i32 |
+| main.rs:142:19:142:24 | MyEnum | main.rs:131:5:139:5 | enum MyEnum |
+| main.rs:144:9:144:15 | println | {EXTERNAL LOCATION} | MacroRules |
+| main.rs:145:17:145:22 | MyEnum | main.rs:131:5:139:5 | enum MyEnum |
+| main.rs:145:17:145:25 | ...::A | main.rs:132:9:134:9 | A |
+| main.rs:146:17:146:22 | MyEnum | main.rs:131:5:139:5 | enum MyEnum |
+| main.rs:146:17:146:25 | ...::B | main.rs:134:12:137:9 | B |
+| main.rs:147:9:147:14 | MyEnum | main.rs:131:5:139:5 | enum MyEnum |
+| main.rs:147:9:147:17 | ...::C | main.rs:137:12:138:9 | C |
+| main.rs:156:13:156:19 | println | {EXTERNAL LOCATION} | MacroRules |
+| main.rs:157:13:157:13 | f | main.rs:164:5:166:5 | fn f |
+| main.rs:158:13:158:16 | Self | main.rs:152:5:160:5 | trait MyTrait |
+| main.rs:158:13:158:19 | ...::f | main.rs:153:9:153:20 | fn f |
+| main.rs:165:9:165:15 | println | {EXTERNAL LOCATION} | MacroRules |
+| main.rs:169:10:169:16 | MyTrait | main.rs:152:5:160:5 | trait MyTrait |
+| main.rs:169:22:169:29 | MyStruct | main.rs:162:5:162:22 | struct MyStruct |
+| main.rs:171:13:171:19 | println | {EXTERNAL LOCATION} | MacroRules |
+| main.rs:172:13:172:13 | f | main.rs:164:5:166:5 | fn f |
+| main.rs:173:13:173:16 | Self | main.rs:168:5:179:5 | impl MyTrait for MyStruct { ... } |
+| main.rs:173:13:173:19 | ...::g | main.rs:176:9:178:9 | fn g |
+| main.rs:177:13:177:19 | println | {EXTERNAL LOCATION} | MacroRules |
+| main.rs:182:10:182:17 | MyStruct | main.rs:162:5:162:22 | struct MyStruct |
+| main.rs:184:13:184:19 | println | {EXTERNAL LOCATION} | MacroRules |
+| main.rs:185:13:185:13 | f | main.rs:164:5:166:5 | fn f |
+| main.rs:191:17:191:24 | MyStruct | main.rs:162:5:162:22 | struct MyStruct |
+| main.rs:192:9:192:15 | MyTrait | main.rs:152:5:160:5 | trait MyTrait |
+| main.rs:192:9:192:18 | ...::f | main.rs:153:9:153:20 | fn f |
+| main.rs:193:9:193:16 | MyStruct | main.rs:162:5:162:22 | struct MyStruct |
+| main.rs:193:9:193:19 | ...::f | main.rs:169:33:174:9 | fn f |
+| main.rs:194:10:194:17 | MyStruct | main.rs:162:5:162:22 | struct MyStruct |
+| main.rs:195:10:195:16 | MyTrait | main.rs:152:5:160:5 | trait MyTrait |
+| main.rs:198:17:198:24 | MyStruct | main.rs:162:5:162:22 | struct MyStruct |
+| main.rs:200:17:200:24 | MyStruct | main.rs:162:5:162:22 | struct MyStruct |
+| main.rs:202:9:202:16 | MyStruct | main.rs:162:5:162:22 | struct MyStruct |
+| main.rs:202:9:202:19 | ...::h | main.rs:182:21:186:9 | fn h |
+| main.rs:211:19:211:22 | self | main.rs:207:1:215:1 | mod m9 |
+| main.rs:211:19:211:32 | ...::MyStruct | main.rs:208:5:208:26 | struct MyStruct |
+| main.rs:212:9:212:15 | println | {EXTERNAL LOCATION} | MacroRules |
+| main.rs:213:9:213:12 | self | main.rs:207:1:215:1 | mod m9 |
+| main.rs:213:9:213:22 | ...::MyStruct | main.rs:208:5:208:26 | struct MyStruct |
+| main.rs:223:12:223:12 | T | main.rs:220:7:220:7 | T |
+| main.rs:228:12:228:12 | T | main.rs:227:14:227:14 | T |
+| main.rs:230:7:232:7 | MyStruct::<...> | main.rs:218:5:224:5 | struct MyStruct |
+| main.rs:231:9:231:9 | T | main.rs:227:14:227:14 | T |
+| main.rs:234:9:234:16 | MyStruct | main.rs:218:5:224:5 | struct MyStruct |
+| main.rs:244:17:244:19 | Foo | main.rs:239:5:239:21 | struct Foo |
+| main.rs:245:9:245:11 | Foo | main.rs:241:5:241:15 | fn Foo |
+| main.rs:254:9:254:11 | Bar | main.rs:250:5:252:5 | enum Bar |
+| main.rs:254:9:254:19 | ...::FooBar | main.rs:251:9:251:17 | FooBar |
+| main.rs:259:13:259:15 | Foo | main.rs:239:5:239:21 | struct Foo |
+| main.rs:260:17:260:22 | FooBar | main.rs:251:9:251:17 | FooBar |
+| main.rs:261:17:261:22 | FooBar | main.rs:256:5:256:18 | fn FooBar |
+| main.rs:269:9:269:9 | E | main.rs:264:15:267:5 | enum E |
+| main.rs:269:9:269:12 | ...::C | main.rs:266:9:266:9 | C |
+| main.rs:272:17:272:17 | S | main.rs:264:5:264:13 | struct S |
+| main.rs:273:17:273:17 | C | main.rs:266:9:266:9 | C |
+| main.rs:286:16:286:16 | T | main.rs:280:7:280:7 | T |
+| main.rs:287:14:287:17 | Self | main.rs:278:5:288:5 | trait MyParamTrait |
+| main.rs:287:14:287:33 | ...::AssociatedType | main.rs:282:9:282:28 | type AssociatedType |
+| main.rs:296:13:296:16 | zelf | main.rs:0:0:0:0 | Crate(main@0.0.1) |
+| main.rs:296:13:296:21 | ...::m13 | main.rs:291:1:304:1 | mod m13 |
+| main.rs:296:13:296:24 | ...::f | main.rs:292:5:292:17 | fn f |
+| main.rs:296:13:296:24 | ...::f | main.rs:292:19:293:19 | struct f |
+| main.rs:299:17:299:17 | f | main.rs:292:19:293:19 | struct f |
+| main.rs:300:21:300:21 | f | main.rs:292:19:293:19 | struct f |
+| main.rs:301:13:301:13 | f | main.rs:292:5:292:17 | fn f |
+| main.rs:315:9:315:14 | Trait1 | main.rs:307:5:311:5 | trait Trait1 |
+| main.rs:317:13:317:19 | println | {EXTERNAL LOCATION} | MacroRules |
+| main.rs:318:13:318:16 | Self | main.rs:313:5:321:5 | trait Trait2 |
+| main.rs:318:13:318:19 | ...::g | main.rs:310:9:310:20 | fn g |
+| main.rs:328:9:328:12 | Self | main.rs:323:5:336:5 | trait Trait3 |
+| main.rs:328:15:328:20 | Trait1 | main.rs:307:5:311:5 | trait Trait1 |
+| main.rs:329:9:329:10 | TT | main.rs:325:9:325:10 | TT |
+| main.rs:329:13:329:18 | Trait1 | main.rs:307:5:311:5 | trait Trait1 |
+| main.rs:331:25:331:26 | TT | main.rs:325:9:325:10 | TT |
+| main.rs:332:13:332:16 | Self | main.rs:323:5:336:5 | trait Trait3 |
+| main.rs:332:13:332:19 | ...::g | main.rs:310:9:310:20 | fn g |
+| main.rs:333:13:333:14 | TT | main.rs:325:9:325:10 | TT |
+| main.rs:333:13:333:17 | ...::g | main.rs:310:9:310:20 | fn g |
+| main.rs:341:10:341:15 | Trait1 | main.rs:307:5:311:5 | trait Trait1 |
+| main.rs:342:11:342:11 | S | main.rs:338:5:338:13 | struct S |
+| main.rs:344:13:344:19 | println | {EXTERNAL LOCATION} | MacroRules |
+| main.rs:345:13:345:16 | Self | main.rs:340:5:352:5 | impl Trait1 for S { ... } |
+| main.rs:345:13:345:19 | ...::g | main.rs:349:9:351:9 | fn g |
+| main.rs:350:13:350:19 | println | {EXTERNAL LOCATION} | MacroRules |
+| main.rs:355:10:355:15 | Trait2 | main.rs:313:5:321:5 | trait Trait2 |
+| main.rs:356:11:356:11 | S | main.rs:338:5:338:13 | struct S |
+| main.rs:358:13:358:19 | println | {EXTERNAL LOCATION} | MacroRules |
+| main.rs:364:9:364:15 | println | {EXTERNAL LOCATION} | MacroRules |
+| main.rs:365:17:365:17 | S | main.rs:338:5:338:13 | struct S |
+| main.rs:366:10:366:10 | S | main.rs:338:5:338:13 | struct S |
+| main.rs:367:14:367:19 | Trait1 | main.rs:307:5:311:5 | trait Trait1 |
+| main.rs:369:10:369:10 | S | main.rs:338:5:338:13 | struct S |
+| main.rs:370:14:370:19 | Trait2 | main.rs:313:5:321:5 | trait Trait2 |
+| main.rs:372:9:372:9 | S | main.rs:338:5:338:13 | struct S |
+| main.rs:372:9:372:12 | ...::g | main.rs:349:9:351:9 | fn g |
+| main.rs:382:24:382:24 | T | main.rs:380:7:380:7 | T |
+| main.rs:384:24:384:24 | T | main.rs:380:7:380:7 | T |
+| main.rs:387:24:387:24 | T | main.rs:380:7:380:7 | T |
+| main.rs:388:13:388:16 | Self | main.rs:378:5:394:5 | trait Trait1 |
+| main.rs:388:13:388:19 | ...::g | main.rs:384:9:385:9 | fn g |
+| main.rs:392:18:392:18 | T | main.rs:380:7:380:7 | T |
+| main.rs:400:9:402:9 | Trait1::<...> | main.rs:378:5:394:5 | trait Trait1 |
+| main.rs:401:11:401:11 | T | main.rs:398:7:398:7 | T |
+| main.rs:403:24:403:24 | T | main.rs:398:7:398:7 | T |
+| main.rs:404:13:404:19 | println | {EXTERNAL LOCATION} | MacroRules |
+| main.rs:405:13:405:16 | Self | main.rs:396:5:409:5 | trait Trait2 |
+| main.rs:405:13:405:19 | ...::g | main.rs:384:9:385:9 | fn g |
+| main.rs:407:13:407:16 | Self | main.rs:396:5:409:5 | trait Trait2 |
+| main.rs:407:13:407:19 | ...::c | main.rs:392:9:393:9 | Const |
+| main.rs:414:10:416:5 | Trait1::<...> | main.rs:378:5:394:5 | trait Trait1 |
+| main.rs:415:7:415:7 | S | main.rs:411:5:411:13 | struct S |
+| main.rs:417:11:417:11 | S | main.rs:411:5:411:13 | struct S |
+| main.rs:418:24:418:24 | S | main.rs:411:5:411:13 | struct S |
+| main.rs:419:13:419:19 | println | {EXTERNAL LOCATION} | MacroRules |
+| main.rs:420:13:420:16 | Self | main.rs:413:5:431:5 | impl Trait1::<...> for S { ... } |
+| main.rs:420:13:420:19 | ...::g | main.rs:424:9:427:9 | fn g |
+| main.rs:424:24:424:24 | S | main.rs:411:5:411:13 | struct S |
+| main.rs:425:13:425:19 | println | {EXTERNAL LOCATION} | MacroRules |
+| main.rs:426:13:426:16 | Self | main.rs:413:5:431:5 | impl Trait1::<...> for S { ... } |
+| main.rs:426:13:426:19 | ...::c | main.rs:429:9:430:9 | Const |
+| main.rs:429:18:429:18 | S | main.rs:411:5:411:13 | struct S |
+| main.rs:429:22:429:22 | S | main.rs:411:5:411:13 | struct S |
+| main.rs:434:10:436:5 | Trait2::<...> | main.rs:396:5:409:5 | trait Trait2 |
+| main.rs:435:7:435:7 | S | main.rs:411:5:411:13 | struct S |
+| main.rs:437:11:437:11 | S | main.rs:411:5:411:13 | struct S |
+| main.rs:438:24:438:24 | S | main.rs:411:5:411:13 | struct S |
+| main.rs:439:13:439:19 | println | {EXTERNAL LOCATION} | MacroRules |
+| main.rs:440:13:440:16 | Self | main.rs:433:5:442:5 | impl Trait2::<...> for S { ... } |
+| main.rs:446:9:446:15 | println | {EXTERNAL LOCATION} | MacroRules |
+| main.rs:447:17:447:17 | S | main.rs:411:5:411:13 | struct S |
+| main.rs:448:10:448:10 | S | main.rs:411:5:411:13 | struct S |
+| main.rs:449:14:451:11 | Trait1::<...> | main.rs:378:5:394:5 | trait Trait1 |
+| main.rs:450:13:450:13 | S | main.rs:411:5:411:13 | struct S |
+| main.rs:453:10:453:10 | S | main.rs:411:5:411:13 | struct S |
+| main.rs:454:14:456:11 | Trait2::<...> | main.rs:396:5:409:5 | trait Trait2 |
+| main.rs:455:13:455:13 | S | main.rs:411:5:411:13 | struct S |
+| main.rs:458:9:458:9 | S | main.rs:411:5:411:13 | struct S |
+| main.rs:458:9:458:12 | ...::g | main.rs:424:9:427:9 | fn g |
+| main.rs:460:9:460:9 | S | main.rs:411:5:411:13 | struct S |
+| main.rs:460:9:460:12 | ...::h | main.rs:387:9:390:9 | fn h |
+| main.rs:462:9:462:9 | S | main.rs:411:5:411:13 | struct S |
+| main.rs:462:9:462:12 | ...::c | main.rs:429:9:430:9 | Const |
+| main.rs:463:10:463:10 | S | main.rs:411:5:411:13 | struct S |
+| main.rs:464:14:466:11 | Trait1::<...> | main.rs:378:5:394:5 | trait Trait1 |
+| main.rs:465:13:465:13 | S | main.rs:411:5:411:13 | struct S |
+| main.rs:483:14:483:16 | Foo | main.rs:473:9:475:9 | trait Foo |
+| main.rs:483:22:483:22 | X | main.rs:481:9:481:21 | struct X |
+| main.rs:485:17:485:23 | println | {EXTERNAL LOCATION} | MacroRules |
+| main.rs:489:14:489:16 | Bar | main.rs:477:9:479:9 | trait Bar |
+| main.rs:489:22:489:22 | X | main.rs:481:9:481:21 | struct X |
+| main.rs:491:17:491:23 | println | {EXTERNAL LOCATION} | MacroRules |
+| main.rs:496:9:496:9 | m | main.rs:472:5:494:5 | mod m |
+| main.rs:496:9:496:12 | ...::X | main.rs:481:9:481:21 | struct X |
+| main.rs:499:17:499:17 | X | main.rs:481:9:481:21 | struct X |
+| main.rs:502:17:502:17 | m | main.rs:472:5:494:5 | mod m |
+| main.rs:502:17:502:22 | ...::Foo | main.rs:473:9:475:9 | trait Foo |
+| main.rs:503:13:503:13 | X | main.rs:481:9:481:21 | struct X |
+| main.rs:503:13:503:23 | ...::a_method | main.rs:483:26:486:13 | fn a_method |
+| main.rs:507:17:507:17 | m | main.rs:472:5:494:5 | mod m |
+| main.rs:507:17:507:22 | ...::Bar | main.rs:477:9:479:9 | trait Bar |
+| main.rs:508:13:508:13 | X | main.rs:481:9:481:21 | struct X |
+| main.rs:508:13:508:23 | ...::a_method | main.rs:489:26:492:13 | fn a_method |
+| main.rs:512:17:512:17 | m | main.rs:472:5:494:5 | mod m |
+| main.rs:512:17:512:22 | ...::Bar | main.rs:477:9:479:9 | trait Bar |
+| main.rs:513:13:513:13 | X | main.rs:481:9:481:21 | struct X |
+| main.rs:513:13:513:23 | ...::a_method | main.rs:489:26:492:13 | fn a_method |
+| main.rs:518:13:518:13 | m | main.rs:472:5:494:5 | mod m |
+| main.rs:518:13:518:18 | ...::Bar | main.rs:477:9:479:9 | trait Bar |
+| main.rs:518:13:518:28 | ...::a_method | main.rs:478:13:478:31 | fn a_method |
+| main.rs:531:10:531:16 | MyTrait | main.rs:524:5:526:5 | trait MyTrait |
+| main.rs:532:9:532:9 | S | main.rs:528:5:528:13 | struct S |
+| main.rs:534:13:534:19 | println | {EXTERNAL LOCATION} | MacroRules |
+| main.rs:540:7:540:13 | MyTrait | main.rs:524:5:526:5 | trait MyTrait |
+| main.rs:541:10:541:10 | T | main.rs:539:10:539:10 | T |
+| main.rs:543:9:543:9 | T | main.rs:539:10:539:10 | T |
+| main.rs:543:9:543:12 | ...::f | main.rs:525:9:525:20 | fn f |
+| main.rs:544:9:544:15 | MyTrait | main.rs:524:5:526:5 | trait MyTrait |
+| main.rs:544:9:544:18 | ...::f | main.rs:525:9:525:20 | fn f |
+| main.rs:549:9:549:9 | g | main.rs:538:5:545:5 | fn g |
+| main.rs:550:11:550:11 | S | main.rs:528:5:528:13 | struct S |
+| main.rs:557:9:557:15 | println | {EXTERNAL LOCATION} | MacroRules |
+| main.rs:562:13:562:19 | println | {EXTERNAL LOCATION} | MacroRules |
+| main.rs:567:17:567:23 | println | {EXTERNAL LOCATION} | MacroRules |
+| main.rs:568:17:568:21 | super | main.rs:560:5:572:5 | mod m19 |
+| main.rs:568:17:568:24 | ...::f | main.rs:561:9:563:9 | fn f |
+| main.rs:569:17:569:21 | super | main.rs:560:5:572:5 | mod m19 |
+| main.rs:569:17:569:28 | ...::super | main.rs:555:1:573:1 | mod m18 |
+| main.rs:569:17:569:31 | ...::f | main.rs:556:5:558:5 | fn f |
+| main.rs:586:13:586:17 | super | main.rs:575:1:600:1 | mod m21 |
+| main.rs:586:13:586:22 | ...::m22 | main.rs:576:5:582:5 | mod m22 |
+| main.rs:586:13:586:30 | ...::MyEnum | main.rs:577:9:579:9 | enum MyEnum |
+| main.rs:587:13:587:16 | self | main.rs:577:9:579:9 | enum MyEnum |
+| main.rs:591:13:591:17 | super | main.rs:575:1:600:1 | mod m21 |
+| main.rs:591:13:591:22 | ...::m22 | main.rs:576:5:582:5 | mod m22 |
+| main.rs:591:13:591:32 | ...::MyStruct | main.rs:581:9:581:28 | struct MyStruct |
+| main.rs:592:13:592:16 | self | main.rs:581:9:581:28 | struct MyStruct |
+| main.rs:596:21:596:26 | MyEnum | main.rs:577:9:579:9 | enum MyEnum |
+| main.rs:596:21:596:29 | ...::A | main.rs:578:13:578:13 | A |
+| main.rs:597:21:597:28 | MyStruct | main.rs:581:9:581:28 | struct MyStruct |
+| main.rs:613:10:615:5 | Trait1::<...> | main.rs:603:5:608:5 | trait Trait1 |
+| main.rs:614:7:614:10 | Self | main.rs:610:5:610:13 | struct S |
+| main.rs:616:11:616:11 | S | main.rs:610:5:610:13 | struct S |
+| main.rs:618:13:618:19 | println | {EXTERNAL LOCATION} | MacroRules |
+| main.rs:624:17:624:17 | S | main.rs:610:5:610:13 | struct S |
+| main.rs:640:15:640:15 | T | main.rs:639:26:639:26 | T |
+| main.rs:645:9:645:24 | GenericStruct::<...> | main.rs:638:5:641:5 | struct GenericStruct |
+| main.rs:645:23:645:23 | T | main.rs:644:10:644:10 | T |
+| main.rs:647:9:647:9 | T | main.rs:644:10:644:10 | T |
+| main.rs:647:12:647:17 | TraitA | main.rs:630:5:632:5 | trait TraitA |
+| main.rs:656:9:656:24 | GenericStruct::<...> | main.rs:638:5:641:5 | struct GenericStruct |
+| main.rs:656:23:656:23 | T | main.rs:655:10:655:10 | T |
+| main.rs:658:9:658:9 | T | main.rs:655:10:655:10 | T |
+| main.rs:658:12:658:17 | TraitB | main.rs:634:5:636:5 | trait TraitB |
+| main.rs:659:9:659:9 | T | main.rs:655:10:655:10 | T |
+| main.rs:659:12:659:17 | TraitA | main.rs:630:5:632:5 | trait TraitA |
+| main.rs:670:10:670:15 | TraitA | main.rs:630:5:632:5 | trait TraitA |
+| main.rs:670:21:670:31 | Implementor | main.rs:667:5:667:23 | struct Implementor |
+| main.rs:672:13:672:19 | println | {EXTERNAL LOCATION} | MacroRules |
+| main.rs:677:10:677:15 | TraitB | main.rs:634:5:636:5 | trait TraitB |
+| main.rs:677:21:677:31 | Implementor | main.rs:667:5:667:23 | struct Implementor |
+| main.rs:679:13:679:19 | println | {EXTERNAL LOCATION} | MacroRules |
+| main.rs:685:24:685:34 | Implementor | main.rs:667:5:667:23 | struct Implementor |
+| main.rs:686:23:686:35 | GenericStruct | main.rs:638:5:641:5 | struct GenericStruct |
+| main.rs:692:9:692:36 | GenericStruct::<...> | main.rs:638:5:641:5 | struct GenericStruct |
+| main.rs:692:9:692:50 | ...::call_trait_a | main.rs:649:9:651:9 | fn call_trait_a |
+| main.rs:692:25:692:35 | Implementor | main.rs:667:5:667:23 | struct Implementor |
+| main.rs:695:9:695:36 | GenericStruct::<...> | main.rs:638:5:641:5 | struct GenericStruct |
+| main.rs:695:9:695:47 | ...::call_both | main.rs:661:9:664:9 | fn call_both |
+| main.rs:695:25:695:35 | Implementor | main.rs:667:5:667:23 | struct Implementor |
+| main.rs:701:3:701:12 | proc_macro | proc_macro.rs:0:0:0:0 | Crate(proc_macro@0.0.1) |
+| main.rs:701:3:701:24 | ...::add_suffix | proc_macro.rs:4:1:13:1 | fn add_suffix |
+| main.rs:705:6:705:12 | AStruct | main.rs:704:1:704:17 | struct AStruct |
+| main.rs:707:7:707:16 | proc_macro | proc_macro.rs:0:0:0:0 | Crate(proc_macro@0.0.1) |
+| main.rs:707:7:707:28 | ...::add_suffix | proc_macro.rs:4:1:13:1 | fn add_suffix |
+| main.rs:710:7:710:16 | proc_macro | proc_macro.rs:0:0:0:0 | Crate(proc_macro@0.0.1) |
+| main.rs:710:7:710:28 | ...::add_suffix | proc_macro.rs:4:1:13:1 | fn add_suffix |
+| main.rs:715:9:715:11 | std | {EXTERNAL LOCATION} | Crate(std@0.0.0) |
+| main.rs:715:9:715:19 | ...::marker | {EXTERNAL LOCATION} | mod marker |
+| main.rs:715:9:715:32 | ...::PhantomData | {EXTERNAL LOCATION} | struct PhantomData |
+| main.rs:716:9:716:11 | std | {EXTERNAL LOCATION} | Crate(std@0.0.0) |
+| main.rs:716:9:716:19 | ...::result | {EXTERNAL LOCATION} | mod result |
+| main.rs:716:9:716:27 | ...::Result | {EXTERNAL LOCATION} | enum Result |
+| main.rs:724:19:724:22 | Self | main.rs:718:5:726:5 | trait Reduce |
+| main.rs:724:19:724:29 | ...::Input | main.rs:719:9:719:19 | type Input |
+| main.rs:725:14:725:46 | Result::<...> | {EXTERNAL LOCATION} | enum Result |
+| main.rs:725:21:725:24 | Self | main.rs:718:5:726:5 | trait Reduce |
+| main.rs:725:21:725:32 | ...::Output | main.rs:720:21:721:20 | type Output |
+| main.rs:725:35:725:38 | Self | main.rs:718:5:726:5 | trait Reduce |
+| main.rs:725:35:725:45 | ...::Error | main.rs:719:21:720:19 | type Error |
+| main.rs:729:17:729:34 | PhantomData::<...> | {EXTERNAL LOCATION} | struct PhantomData |
+| main.rs:729:29:729:33 | Input | main.rs:728:19:728:23 | Input |
+| main.rs:730:17:730:34 | PhantomData::<...> | {EXTERNAL LOCATION} | struct PhantomData |
+| main.rs:730:29:730:33 | Error | main.rs:728:26:728:30 | Error |
+| main.rs:737:11:737:16 | Reduce | main.rs:718:5:726:5 | trait Reduce |
+| main.rs:738:13:741:9 | MyImpl::<...> | main.rs:728:5:731:5 | struct MyImpl |
+| main.rs:739:13:739:17 | Input | main.rs:735:13:735:17 | Input |
+| main.rs:740:13:740:17 | Error | main.rs:736:13:736:17 | Error |
+| main.rs:743:22:746:9 | Result::<...> | {EXTERNAL LOCATION} | enum Result |
+| main.rs:744:13:744:17 | Input | main.rs:735:13:735:17 | Input |
+| main.rs:745:13:745:16 | Self | main.rs:733:5:765:5 | impl Reduce for MyImpl::<...> { ... } |
+| main.rs:745:13:745:23 | ...::Error | main.rs:747:11:751:9 | type Error |
+| main.rs:748:22:750:9 | Option::<...> | {EXTERNAL LOCATION} | enum Option |
+| main.rs:749:11:749:15 | Error | main.rs:736:13:736:17 | Error |
+| main.rs:753:13:753:17 | Input | main.rs:735:13:735:17 | Input |
+| main.rs:758:19:758:22 | Self | main.rs:733:5:765:5 | impl Reduce for MyImpl::<...> { ... } |
+| main.rs:758:19:758:29 | ...::Input | main.rs:743:9:747:9 | type Input |
+| main.rs:759:14:762:9 | Result::<...> | {EXTERNAL LOCATION} | enum Result |
+| main.rs:760:13:760:16 | Self | main.rs:733:5:765:5 | impl Reduce for MyImpl::<...> { ... } |
+| main.rs:760:13:760:24 | ...::Output | main.rs:751:11:754:9 | type Output |
+| main.rs:761:13:761:16 | Self | main.rs:733:5:765:5 | impl Reduce for MyImpl::<...> { ... } |
+| main.rs:761:13:761:23 | ...::Error | main.rs:747:11:751:9 | type Error |
+| main.rs:768:5:768:7 | std | {EXTERNAL LOCATION} | Crate(std@0.0.0) |
+| main.rs:768:11:768:14 | self | {EXTERNAL LOCATION} | Crate(std@0.0.0) |
+| main.rs:770:15:770:17 | ztd | {EXTERNAL LOCATION} | Crate(std@0.0.0) |
+| main.rs:770:15:770:25 | ...::string | {EXTERNAL LOCATION} | mod string |
+| main.rs:770:15:770:33 | ...::String | {EXTERNAL LOCATION} | struct String |
+| main.rs:780:7:780:16 | proc_macro | proc_macro.rs:0:0:0:0 | Crate(proc_macro@0.0.1) |
+| main.rs:780:7:780:26 | ...::identity | proc_macro.rs:15:1:18:1 | fn identity |
+| main.rs:781:10:781:15 | ATrait | main.rs:776:5:778:5 | trait ATrait |
+| main.rs:781:21:781:23 | i64 | {EXTERNAL LOCATION} | struct i64 |
+| main.rs:783:11:783:13 | i64 | {EXTERNAL LOCATION} | struct i64 |
+| main.rs:789:17:789:19 | Foo | main.rs:774:5:774:15 | struct Foo |
+| main.rs:794:5:794:6 | my | main.rs:1:1:1:7 | mod my |
+| main.rs:794:5:794:14 | ...::nested | my.rs:1:1:1:15 | mod nested |
+| main.rs:794:5:794:23 | ...::nested1 | my/nested.rs:1:1:17:1 | mod nested1 |
+| main.rs:794:5:794:32 | ...::nested2 | my/nested.rs:2:5:11:5 | mod nested2 |
+| main.rs:794:5:794:35 | ...::f | my/nested.rs:3:9:5:9 | fn f |
+| main.rs:795:5:795:6 | my | main.rs:1:1:1:7 | mod my |
+| main.rs:795:5:795:9 | ...::f | my.rs:5:1:7:1 | fn f |
+| main.rs:796:5:796:11 | nested2 | my2/mod.rs:1:1:1:16 | mod nested2 |
+| main.rs:796:5:796:20 | ...::nested3 | my2/nested2.rs:1:1:11:1 | mod nested3 |
+| main.rs:796:5:796:29 | ...::nested4 | my2/nested2.rs:2:5:10:5 | mod nested4 |
+| main.rs:796:5:796:32 | ...::f | my2/nested2.rs:3:9:5:9 | fn f |
+| main.rs:797:5:797:5 | f | my2/nested2.rs:3:9:5:9 | fn f |
+| main.rs:798:5:798:5 | g | my2/nested2.rs:7:9:9:9 | fn g |
+| main.rs:799:5:799:9 | crate | main.rs:0:0:0:0 | Crate(main@0.0.1) |
+| main.rs:799:5:799:12 | ...::h | main.rs:57:1:76:1 | fn h |
+| main.rs:800:5:800:6 | m1 | main.rs:20:1:44:1 | mod m1 |
+| main.rs:800:5:800:10 | ...::m2 | main.rs:25:5:43:5 | mod m2 |
+| main.rs:800:5:800:13 | ...::g | main.rs:30:9:34:9 | fn g |
+| main.rs:801:5:801:6 | m1 | main.rs:20:1:44:1 | mod m1 |
+| main.rs:801:5:801:10 | ...::m2 | main.rs:25:5:43:5 | mod m2 |
+| main.rs:801:5:801:14 | ...::m3 | main.rs:36:9:42:9 | mod m3 |
+| main.rs:801:5:801:17 | ...::h | main.rs:37:27:41:13 | fn h |
+| main.rs:802:5:802:6 | m4 | main.rs:46:1:53:1 | mod m4 |
+| main.rs:802:5:802:9 | ...::i | main.rs:49:5:52:5 | fn i |
+| main.rs:803:5:803:5 | h | main.rs:57:1:76:1 | fn h |
+| main.rs:804:5:804:11 | f_alias | my2/nested2.rs:3:9:5:9 | fn f |
+| main.rs:805:5:805:11 | g_alias | my2/nested2.rs:7:9:9:9 | fn g |
+| main.rs:806:5:806:5 | j | main.rs:104:1:108:1 | fn j |
+| main.rs:807:5:807:6 | m6 | main.rs:116:1:128:1 | mod m6 |
+| main.rs:807:5:807:9 | ...::g | main.rs:121:5:127:5 | fn g |
+| main.rs:808:5:808:6 | m7 | main.rs:130:1:149:1 | mod m7 |
+| main.rs:808:5:808:9 | ...::f | main.rs:141:5:148:5 | fn f |
+| main.rs:809:5:809:6 | m8 | main.rs:151:1:205:1 | mod m8 |
+| main.rs:809:5:809:9 | ...::g | main.rs:189:5:204:5 | fn g |
+| main.rs:810:5:810:6 | m9 | main.rs:207:1:215:1 | mod m9 |
+| main.rs:810:5:810:9 | ...::f | main.rs:210:5:214:5 | fn f |
+| main.rs:811:5:811:7 | m11 | main.rs:238:1:275:1 | mod m11 |
+| main.rs:811:5:811:10 | ...::f | main.rs:243:5:246:5 | fn f |
+| main.rs:812:5:812:7 | m15 | main.rs:306:1:375:1 | mod m15 |
+| main.rs:812:5:812:10 | ...::f | main.rs:362:5:374:5 | fn f |
+| main.rs:813:5:813:7 | m16 | main.rs:377:1:469:1 | mod m16 |
+| main.rs:813:5:813:10 | ...::f | main.rs:444:5:468:5 | fn f |
+| main.rs:814:5:814:20 | trait_visibility | main.rs:471:1:521:1 | mod trait_visibility |
+| main.rs:814:5:814:23 | ...::f | main.rs:498:5:520:5 | fn f |
+| main.rs:815:5:815:7 | m17 | main.rs:523:1:553:1 | mod m17 |
+| main.rs:815:5:815:10 | ...::f | main.rs:547:5:552:5 | fn f |
+| main.rs:816:5:816:11 | nested6 | my2/nested2.rs:14:5:18:5 | mod nested6 |
+| main.rs:816:5:816:14 | ...::f | my2/nested2.rs:15:9:17:9 | fn f |
+| main.rs:817:5:817:11 | nested8 | my2/nested2.rs:22:5:26:5 | mod nested8 |
+| main.rs:817:5:817:14 | ...::f | my2/nested2.rs:23:9:25:9 | fn f |
+| main.rs:818:5:818:7 | my3 | my2/mod.rs:20:1:20:12 | mod my3 |
+| main.rs:818:5:818:10 | ...::f | my2/my3/mod.rs:1:1:5:1 | fn f |
+| main.rs:819:5:819:12 | nested_f | my/my4/my5/mod.rs:1:1:3:1 | fn f |
+| main.rs:820:5:820:12 | my_alias | main.rs:1:1:1:7 | mod my |
+| main.rs:820:5:820:22 | ...::nested_f | my/my4/my5/mod.rs:1:1:3:1 | fn f |
+| main.rs:821:5:821:7 | m18 | main.rs:555:1:573:1 | mod m18 |
+| main.rs:821:5:821:12 | ...::m19 | main.rs:560:5:572:5 | mod m19 |
+| main.rs:821:5:821:17 | ...::m20 | main.rs:565:9:571:9 | mod m20 |
+| main.rs:821:5:821:20 | ...::g | main.rs:566:13:570:13 | fn g |
+| main.rs:822:5:822:7 | m23 | main.rs:602:1:627:1 | mod m23 |
+| main.rs:822:5:822:10 | ...::f | main.rs:622:5:626:5 | fn f |
+| main.rs:823:5:823:7 | m24 | main.rs:629:1:697:1 | mod m24 |
+| main.rs:823:5:823:10 | ...::f | main.rs:683:5:696:5 | fn f |
+| main.rs:824:5:824:8 | zelf | main.rs:0:0:0:0 | Crate(main@0.0.1) |
+| main.rs:824:5:824:11 | ...::h | main.rs:57:1:76:1 | fn h |
+| main.rs:825:5:825:13 | z_changed | main.rs:702:1:702:9 | fn z_changed |
+| main.rs:826:5:826:11 | AStruct | main.rs:704:1:704:17 | struct AStruct |
+| main.rs:826:5:826:22 | ...::z_on_type | main.rs:708:5:708:17 | fn z_on_type |
+| main.rs:827:5:827:11 | AStruct | main.rs:704:1:704:17 | struct AStruct |
+| main.rs:828:5:828:29 | impl_with_attribute_macro | main.rs:772:1:791:1 | mod impl_with_attribute_macro |
+| main.rs:828:5:828:35 | ...::test | main.rs:787:5:790:5 | fn test |
+| my2/mod.rs:4:5:4:11 | println | {EXTERNAL LOCATION} | MacroRules |
 | my2/mod.rs:5:5:5:11 | nested2 | my2/mod.rs:1:1:1:16 | mod nested2 |
 | my2/mod.rs:5:5:5:20 | ...::nested3 | my2/nested2.rs:1:1:11:1 | mod nested3 |
 | my2/mod.rs:5:5:5:29 | ...::nested4 | my2/nested2.rs:2:5:10:5 | mod nested4 |
 | my2/mod.rs:5:5:5:32 | ...::f | my2/nested2.rs:3:9:5:9 | fn f |
 | my2/mod.rs:8:9:8:15 | nested2 | my2/mod.rs:1:1:1:16 | mod nested2 |
 | my2/mod.rs:8:9:8:24 | ...::nested5 | my2/nested2.rs:13:1:19:1 | mod nested5 |
-| my2/mod.rs:10:9:10:15 | nested2 | my2/mod.rs:1:1:1:16 | mod nested2 |
-| my2/mod.rs:10:9:10:24 | ...::nested7 | my2/nested2.rs:21:1:27:1 | mod nested7 |
-| my2/mod.rs:10:9:10:33 | ...::nested8 | my2/nested2.rs:22:5:26:5 | mod nested8 |
-| my2/mod.rs:10:37:10:40 | self | my2/nested2.rs:22:5:26:5 | mod nested8 |
-| my2/mod.rs:17:5:17:9 | mymod | my2/mod.rs:14:1:15:10 | mod mymod |
-| my2/mod.rs:17:5:17:12 | ...::f | my2/renamed.rs:1:1:1:13 | fn f |
+| my2/mod.rs:11:9:11:15 | nested2 | my2/mod.rs:1:1:1:16 | mod nested2 |
+| my2/mod.rs:11:9:11:24 | ...::nested7 | my2/nested2.rs:21:1:27:1 | mod nested7 |
+| my2/mod.rs:11:9:11:33 | ...::nested8 | my2/nested2.rs:22:5:26:5 | mod nested8 |
+| my2/mod.rs:12:5:12:8 | self | my2/nested2.rs:22:5:26:5 | mod nested8 |
+| my2/mod.rs:13:5:13:5 | f | my2/nested2.rs:23:9:25:9 | fn f |
+| my2/mod.rs:16:5:16:11 | nested2 | my2/mod.rs:1:1:1:16 | mod nested2 |
+| my2/mod.rs:16:5:16:20 | ...::nested5 | my2/nested2.rs:13:1:19:1 | mod nested5 |
+| my2/mod.rs:16:5:16:29 | ...::nested6 | my2/nested2.rs:14:5:18:5 | mod nested6 |
+| my2/mod.rs:16:5:16:32 | ...::f | my2/nested2.rs:15:9:17:9 | fn f |
+| my2/mod.rs:18:5:18:7 | std | {EXTERNAL LOCATION} | Crate(std@0.0.0) |
+| my2/mod.rs:18:5:18:12 | ...::ops | {EXTERNAL LOCATION} | mod ops |
+| my2/mod.rs:18:5:18:19 | ...::Deref | {EXTERNAL LOCATION} | trait Deref |
+| my2/mod.rs:25:9:25:13 | mymod | my2/mod.rs:22:1:23:10 | mod mymod |
+| my2/mod.rs:25:9:25:16 | ...::f | my2/renamed.rs:1:1:1:13 | fn f |
+| my2/my3/mod.rs:2:5:2:11 | println | {EXTERNAL LOCATION} | MacroRules |
 | my2/my3/mod.rs:3:5:3:5 | g | my2/mod.rs:3:1:6:1 | fn g |
-| my2/my3/mod.rs:4:5:4:5 | h | main.rs:50:1:69:1 | fn h |
-| my2/my3/mod.rs:7:5:7:9 | super | my2/mod.rs:1:1:17:30 | SourceFile |
-| my2/my3/mod.rs:7:5:7:16 | ...::super | main.rs:1:1:746:2 | SourceFile |
-| my2/my3/mod.rs:7:5:7:19 | ...::h | main.rs:50:1:69:1 | fn h |
-| my2/my3/mod.rs:8:5:8:9 | super | my2/mod.rs:1:1:17:30 | SourceFile |
+| my2/my3/mod.rs:4:5:4:5 | h | main.rs:57:1:76:1 | fn h |
+| my2/my3/mod.rs:7:5:7:9 | super | my2/mod.rs:1:1:25:34 | SourceFile |
+| my2/my3/mod.rs:7:5:7:16 | ...::super | main.rs:1:1:829:2 | SourceFile |
+| my2/my3/mod.rs:7:5:7:19 | ...::h | main.rs:57:1:76:1 | fn h |
+| my2/my3/mod.rs:8:5:8:9 | super | my2/mod.rs:1:1:25:34 | SourceFile |
 | my2/my3/mod.rs:8:5:8:12 | ...::g | my2/mod.rs:3:1:6:1 | fn g |
+| my2/my3/mod.rs:10:5:10:9 | super | my2/mod.rs:1:1:25:34 | SourceFile |
+| my2/my3/mod.rs:10:5:10:20 | ...::nested6_f | my2/nested2.rs:15:9:17:9 | fn f |
+| my2/my3/mod.rs:12:5:12:9 | super | my2/mod.rs:1:1:25:34 | SourceFile |
+| my2/my3/mod.rs:14:16:14:20 | Deref | {EXTERNAL LOCATION} | trait Deref |
+| my2/nested2.rs:4:13:4:19 | println | {EXTERNAL LOCATION} | MacroRules |
+| my2/nested2.rs:8:13:8:19 | println | {EXTERNAL LOCATION} | MacroRules |
+| my2/nested2.rs:16:13:16:19 | println | {EXTERNAL LOCATION} | MacroRules |
+| my2/nested2.rs:24:13:24:19 | println | {EXTERNAL LOCATION} | MacroRules |
 | my.rs:3:5:3:10 | nested | my.rs:1:1:1:15 | mod nested |
 | my.rs:3:5:3:13 | ...::g | my/nested.rs:19:1:22:1 | fn g |
+| my.rs:6:5:6:11 | println | {EXTERNAL LOCATION} | MacroRules |
+| my.rs:10:5:10:11 | println | {EXTERNAL LOCATION} | MacroRules |
 | my.rs:11:5:11:5 | g | my/nested.rs:19:1:22:1 | fn g |
 | my.rs:18:9:18:11 | my4 | my.rs:14:1:16:1 | mod my4 |
 | my.rs:18:9:18:16 | ...::my5 | my.rs:15:5:15:16 | mod my5 |
@@ -425,27 +524,40 @@ resolvePath
 | my.rs:30:13:30:15 | i32 | {EXTERNAL LOCATION} | struct i32 |
 | my.rs:33:16:33:18 | Err | {EXTERNAL LOCATION} | Err |
 | my.rs:35:5:35:6 | Ok | {EXTERNAL LOCATION} | Ok |
+| my/my4/my5/mod.rs:2:5:2:11 | println | {EXTERNAL LOCATION} | MacroRules |
+| my/nested.rs:4:13:4:19 | println | {EXTERNAL LOCATION} | MacroRules |
+| my/nested.rs:8:13:8:19 | println | {EXTERNAL LOCATION} | MacroRules |
 | my/nested.rs:9:13:9:13 | f | my/nested.rs:3:9:5:9 | fn f |
+| my/nested.rs:14:9:14:15 | println | {EXTERNAL LOCATION} | MacroRules |
 | my/nested.rs:15:9:15:15 | nested2 | my/nested.rs:2:5:11:5 | mod nested2 |
 | my/nested.rs:15:9:15:18 | ...::f | my/nested.rs:3:9:5:9 | fn f |
+| my/nested.rs:20:5:20:11 | println | {EXTERNAL LOCATION} | MacroRules |
 | my/nested.rs:21:5:21:11 | nested1 | my/nested.rs:1:1:17:1 | mod nested1 |
 | my/nested.rs:21:5:21:20 | ...::nested2 | my/nested.rs:2:5:11:5 | mod nested2 |
 | my/nested.rs:21:5:21:23 | ...::f | my/nested.rs:3:9:5:9 | fn f |
 | proc_macro.rs:1:5:1:14 | proc_macro | {EXTERNAL LOCATION} | Crate(proc_macro@0.0.0) |
 | proc_macro.rs:1:5:1:27 | ...::TokenStream | {EXTERNAL LOCATION} | struct TokenStream |
 | proc_macro.rs:2:5:2:9 | quote | {EXTERNAL LOCATION} | Crate(quote@1.0.40) |
+| proc_macro.rs:2:5:2:16 | ...::quote | {EXTERNAL LOCATION} | MacroRules |
 | proc_macro.rs:5:25:5:35 | TokenStream | {EXTERNAL LOCATION} | struct TokenStream |
 | proc_macro.rs:5:44:5:54 | TokenStream | {EXTERNAL LOCATION} | struct TokenStream |
 | proc_macro.rs:5:60:5:70 | TokenStream | {EXTERNAL LOCATION} | struct TokenStream |
 | proc_macro.rs:6:16:6:18 | syn | {EXTERNAL LOCATION} | Crate(syn@2.0.103) |
+| proc_macro.rs:6:16:6:37 | ...::parse_macro_input | {EXTERNAL LOCATION} | MacroRules |
 | proc_macro.rs:6:48:6:50 | syn | {EXTERNAL LOCATION} | Crate(syn@2.0.103) |
 | proc_macro.rs:6:48:6:58 | ...::LitStr | {EXTERNAL LOCATION} | struct LitStr |
 | proc_macro.rs:6:48:6:58 | ...::parse::<...> | {EXTERNAL LOCATION} | fn parse |
 | proc_macro.rs:7:19:7:21 | syn | {EXTERNAL LOCATION} | Crate(syn@2.0.103) |
+| proc_macro.rs:7:19:7:40 | ...::parse_macro_input | {EXTERNAL LOCATION} | MacroRules |
 | proc_macro.rs:7:51:7:53 | syn | {EXTERNAL LOCATION} | Crate(syn@2.0.103) |
 | proc_macro.rs:7:51:7:61 | ...::ItemFn | {EXTERNAL LOCATION} | struct ItemFn |
 | proc_macro.rs:7:51:7:61 | ...::parse::<...> | {EXTERNAL LOCATION} | fn parse |
 | proc_macro.rs:8:21:8:23 | syn | {EXTERNAL LOCATION} | Crate(syn@2.0.103) |
 | proc_macro.rs:8:21:8:30 | ...::Ident | {EXTERNAL LOCATION} | struct Ident |
 | proc_macro.rs:8:21:8:35 | ...::new | {EXTERNAL LOCATION} | fn new |
+| proc_macro.rs:8:38:8:43 | format | {EXTERNAL LOCATION} | MacroRules |
+| proc_macro.rs:9:5:9:9 | quote | {EXTERNAL LOCATION} | MacroRules |
+| proc_macro.rs:16:24:16:34 | TokenStream | {EXTERNAL LOCATION} | struct TokenStream |
+| proc_macro.rs:16:43:16:53 | TokenStream | {EXTERNAL LOCATION} | struct TokenStream |
+| proc_macro.rs:16:59:16:69 | TokenStream | {EXTERNAL LOCATION} | struct TokenStream |
 testFailures
diff --git a/rust/ql/test/library-tests/path-resolution/proc_macro.rs b/rust/ql/test/library-tests/path-resolution/proc_macro.rs
index c95fc6fe640..11e3a7024ae 100644
--- a/rust/ql/test/library-tests/path-resolution/proc_macro.rs
+++ b/rust/ql/test/library-tests/path-resolution/proc_macro.rs
@@ -8,5 +8,11 @@ pub fn add_suffix(attr: TokenStream, item: TokenStream) -> TokenStream {
     ast.sig.ident = syn::Ident::new(&format!("{}_{}", ast.sig.ident, suff), ast.sig.ident.span());
     quote! {
         #ast
-    }.into()
+    }
+    .into()
+}
+
+#[proc_macro_attribute]
+pub fn identity(_attr: TokenStream, item: TokenStream) -> TokenStream {
+    item
 }
diff --git a/rust/ql/test/library-tests/sensitivedata/CONSISTENCY/PathResolutionConsistency.expected b/rust/ql/test/library-tests/sensitivedata/CONSISTENCY/PathResolutionConsistency.expected
index 23125236495..ce79c75327a 100644
--- a/rust/ql/test/library-tests/sensitivedata/CONSISTENCY/PathResolutionConsistency.expected
+++ b/rust/ql/test/library-tests/sensitivedata/CONSISTENCY/PathResolutionConsistency.expected
@@ -1,29 +1,2 @@
 multipleCallTargets
-| test.rs:56:7:56:26 | ... .as_str() |
-| test.rs:57:7:57:21 | ... .as_str() |
-| test.rs:73:7:73:26 | ... .as_str() |
-| test.rs:74:7:74:36 | ... .as_str() |
-| test.rs:75:7:75:34 | ... .as_str() |
-| test.rs:76:7:76:27 | ... .as_str() |
-| test.rs:262:7:262:36 | ... .as_str() |
-| test.rs:264:7:264:33 | ... .as_str() |
-| test.rs:265:7:265:36 | ... .as_str() |
-| test.rs:266:7:266:26 | ... .as_str() |
-| test.rs:270:7:270:28 | ... .as_str() |
-| test.rs:271:7:271:37 | ... .as_str() |
-| test.rs:272:7:272:36 | ... .as_str() |
-| test.rs:275:7:275:32 | ... .as_str() |
-| test.rs:285:7:285:34 | ... .as_str() |
 | test.rs:288:7:288:36 | ... .as_str() |
-| test.rs:292:7:292:39 | ... .as_str() |
-| test.rs:299:7:299:53 | ... .as_str() |
-| test.rs:300:7:300:45 | ... .as_str() |
-| test.rs:302:7:302:39 | ... .as_str() |
-| test.rs:303:7:303:34 | ... .as_str() |
-| test.rs:304:7:304:42 | ... .as_str() |
-| test.rs:306:7:306:48 | ... .as_str() |
-| test.rs:307:7:307:35 | ... .as_str() |
-| test.rs:308:7:308:35 | ... .as_str() |
-| test.rs:317:8:317:19 | num.as_str() |
-| test.rs:328:8:328:19 | num.as_str() |
-| test.rs:347:7:347:39 | ... .as_str() |
diff --git a/rust/ql/test/library-tests/type-inference/CONSISTENCY/ExtractionConsistency.expected b/rust/ql/test/library-tests/type-inference/CONSISTENCY/ExtractionConsistency.expected
deleted file mode 100644
index 0b4e0c12d0c..00000000000
--- a/rust/ql/test/library-tests/type-inference/CONSISTENCY/ExtractionConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-extractionWarning
-| loop/main.rs:1:1:1:1 | semantic analyzer unavailable (not included as a module) |
diff --git a/rust/ql/test/library-tests/type-inference/CONSISTENCY/PathResolutionConsistency.expected b/rust/ql/test/library-tests/type-inference/CONSISTENCY/PathResolutionConsistency.expected
index d2fded7a073..11ad8e8069d 100644
--- a/rust/ql/test/library-tests/type-inference/CONSISTENCY/PathResolutionConsistency.expected
+++ b/rust/ql/test/library-tests/type-inference/CONSISTENCY/PathResolutionConsistency.expected
@@ -1,8 +1,17 @@
 multipleCallTargets
-| dereference.rs:61:15:61:24 | e1.deref() |
-| main.rs:2308:13:2308:31 | ...::from(...) |
-| main.rs:2309:13:2309:31 | ...::from(...) |
-| main.rs:2310:13:2310:31 | ...::from(...) |
-| main.rs:2316:13:2316:31 | ...::from(...) |
-| main.rs:2317:13:2317:31 | ...::from(...) |
-| main.rs:2318:13:2318:31 | ...::from(...) |
+| dereference.rs:69:15:69:24 | e1.deref() |
+| dereference.rs:182:17:182:26 | ... .foo() |
+| dereference.rs:183:17:183:23 | S.foo() |
+| dereference.rs:184:17:184:30 | ... .foo() |
+| dereference.rs:186:17:186:25 | S.bar(...) |
+| dereference.rs:187:17:187:29 | S.bar(...) |
+| main.rs:589:9:589:14 | S4.m() |
+| main.rs:590:9:590:18 | ...::m(...) |
+| main.rs:591:9:591:20 | ... .m() |
+| main.rs:592:9:592:24 | ...::m(...) |
+| main.rs:2553:13:2553:31 | ...::from(...) |
+| main.rs:2554:13:2554:31 | ...::from(...) |
+| main.rs:2555:13:2555:31 | ...::from(...) |
+| main.rs:2561:13:2561:31 | ...::from(...) |
+| main.rs:2562:13:2562:31 | ...::from(...) |
+| main.rs:2563:13:2563:31 | ...::from(...) |
diff --git a/rust/ql/test/library-tests/type-inference/blanket_impl.rs b/rust/ql/test/library-tests/type-inference/blanket_impl.rs
new file mode 100644
index 00000000000..49fcd8af0a6
--- /dev/null
+++ b/rust/ql/test/library-tests/type-inference/blanket_impl.rs
@@ -0,0 +1,301 @@
+// Tests for method resolution targeting blanket trait implementations
+
+mod basic_blanket_impl {
+    use std::ops::Deref;
+
+    #[derive(Debug, Copy, Clone)]
+    struct S1;
+
+    #[derive(Debug, Copy, Clone)]
+    struct S2;
+
+    impl Deref for S2 {
+        type Target = S1;
+
+        fn deref(&self) -> &Self::Target {
+            &S1
+        }
+    }
+
+    trait Clone1 {
+        fn clone1(&self) -> Self;
+    }
+
+    trait Duplicatable {
+        fn duplicate(&self) -> Self
+        where
+            Self: Sized;
+    }
+
+    impl Clone1 for S1 {
+        // S1::clone1
+        fn clone1(&self) -> Self {
+            *self // $ target=deref
+        }
+    }
+
+    // Blanket implementation for all types that implement Clone1
+    impl<T: Clone1> Duplicatable for T {
+        // Clone1duplicate
+        fn duplicate(&self) -> Self {
+            self.clone1() // $ target=clone1
+        }
+    }
+
+    pub fn test_basic_blanket() {
+        let x1 = S1.clone1(); // $ target=S1::clone1
+        println!("{x1:?}");
+        let x2 = (&S1).clone1(); // $ target=S1::clone1
+        println!("{x2:?}");
+        let x3 = S1.duplicate(); // $ target=Clone1duplicate
+        println!("{x3:?}");
+        let x4 = (&S1).duplicate(); // $ target=Clone1duplicate
+        println!("{x4:?}");
+        let x5 = S1::duplicate(&S1); // $ target=Clone1duplicate
+        println!("{x5:?}");
+        let x6 = S2.duplicate(); // $ MISSING: target=Clone1duplicate
+        println!("{x6:?}");
+        let x7 = (&S2).duplicate(); // $ MISSING: target=Clone1duplicate
+        println!("{x7:?}");
+    }
+}
+
+mod assoc_blanket_impl {
+    #[derive(Debug, Copy, Clone)]
+    struct S1;
+
+    trait Trait1 {
+        fn assoc_func1(x: i64, y: Self) -> Self;
+    }
+
+    trait Trait2 {
+        fn assoc_func2(x: i64, y: Self) -> Self;
+    }
+
+    impl Trait1 for S1 {
+        // S1::assoc_func1
+        fn assoc_func1(x: i64, y: Self) -> Self {
+            y
+        }
+    }
+
+    impl<T: Trait1> Trait2 for T {
+        // Blanket_assoc_func2
+        fn assoc_func2(x: i64, y: Self) -> Self {
+            T::assoc_func1(x, y) // $ target=assoc_func1
+        }
+    }
+
+    pub fn test_assoc_blanket() {
+        let x1 = S1::assoc_func1(1, S1); // $ target=S1::assoc_func1
+        println!("{x1:?}");
+        let x2 = Trait1::assoc_func1(1, S1); // $ target=S1::assoc_func1
+        println!("{x2:?}");
+        let x3 = S1::assoc_func2(1, S1); // $ target=Blanket_assoc_func2
+        println!("{x3:?}");
+        let x4 = Trait2::assoc_func2(1, S1); // $ target=Blanket_assoc_func2
+        println!("{x4:?}");
+    }
+}
+
+mod extension_trait_blanket_impl {
+    // This tests:
+    // 1. A trait that is implemented for a type parameter
+    // 2. An extension trait
+    // 3. A blanket implementation of the extension trait for a type parameter
+
+    trait Flag {
+        fn read_flag(&self) -> bool;
+    }
+
+    trait TryFlag {
+        fn try_read_flag(&self) -> Option<bool>;
+    }
+
+    impl<Fl> TryFlag for Fl
+    where
+        Fl: Flag,
+    {
+        fn try_read_flag(&self) -> Option<bool> {
+            Some(self.read_flag()) // $ target=read_flag
+        }
+    }
+
+    trait TryFlagExt: TryFlag {
+        // TryFlagExt::try_read_flag_twice
+        fn try_read_flag_twice(&self) -> Option<bool> {
+            self.try_read_flag() // $ target=try_read_flag
+        }
+    }
+
+    impl<T: TryFlag> TryFlagExt for T {}
+
+    trait AnotherTryFlag {
+        // AnotherTryFlag::try_read_flag_twice
+        fn try_read_flag_twice(&self) -> Option<bool>;
+    }
+
+    struct MyTryFlag {
+        flag: bool,
+    }
+
+    impl TryFlag for MyTryFlag {
+        // MyTryFlag::try_read_flag
+        fn try_read_flag(&self) -> Option<bool> {
+            Some(self.flag) // $ fieldof=MyTryFlag
+        }
+    }
+
+    struct MyFlag {
+        flag: bool,
+    }
+
+    impl Flag for MyFlag {
+        // MyFlag::read_flag
+        fn read_flag(&self) -> bool {
+            self.flag // $ fieldof=MyFlag
+        }
+    }
+
+    struct MyOtherFlag {
+        flag: bool,
+    }
+
+    impl AnotherTryFlag for MyOtherFlag {
+        // MyOtherFlag::try_read_flag_twice
+        fn try_read_flag_twice(&self) -> Option<bool> {
+            Some(self.flag) // $ fieldof=MyOtherFlag
+        }
+    }
+
+    fn test() {
+        let my_try_flag = MyTryFlag { flag: true };
+        let result = my_try_flag.try_read_flag_twice(); // $ target=TryFlagExt::try_read_flag_twice
+
+        let my_flag = MyFlag { flag: true };
+        // Here `TryFlagExt::try_read_flag_twice` is a target since there is a
+        // blanket implementaton of `TryFlag` for `Flag`.
+        let result = my_flag.try_read_flag_twice(); // $ MISSING: target=TryFlagExt::try_read_flag_twice
+
+        let my_other_flag = MyOtherFlag { flag: true };
+        // Here `TryFlagExt::try_read_flag_twice` is _not_ a target since
+        // `MyOtherFlag` does not implement `TryFlag`.
+        let result = my_other_flag.try_read_flag_twice(); // $ target=MyOtherFlag::try_read_flag_twice
+    }
+}
+
+mod blanket_like_impl {
+    #[derive(Debug, Copy, Clone)]
+    struct S1;
+
+    #[derive(Debug, Copy, Clone)]
+    struct S2;
+
+    trait MyTrait1 {
+        // MyTrait1::m1
+        fn m1(self);
+    }
+
+    trait MyTrait2 {
+        // MyTrait2::m2
+        fn m2(self);
+    }
+
+    trait MyTrait3 {
+        // MyTrait3::m3
+        fn m3(self);
+    }
+
+    trait MyTrait4a {
+        // MyTrait4a::m4
+        fn m4(self);
+    }
+
+    trait MyTrait4b {
+        // MyTrait4b::m4
+        fn m4(self);
+    }
+
+    impl MyTrait1 for S1 {
+        // S1::m1
+        fn m1(self) {}
+    }
+
+    impl MyTrait3 for S1 {
+        // S1::m3
+        fn m3(self) {}
+    }
+
+    impl<T: MyTrait1 + Copy> MyTrait2 for &T {
+        // MyTrait2Ref::m2
+        fn m2(self) {
+            self.m1() // $ target=MyTrait1::m1
+        }
+    }
+
+    impl MyTrait2 for &&S1 {
+        // MyTrait2RefRefS1::m2
+        fn m2(self) {
+            self.m1() // $ MISSING: target=S1::m1
+        }
+    }
+
+    impl<T: MyTrait3> MyTrait4a for T {
+        // MyTrait4aBlanket::m4
+        fn m4(self) {
+            self.m3() // $ target=MyTrait3::m3
+        }
+    }
+
+    impl<T> MyTrait4b for &T {
+        // MyTrait4bRef::m4
+        fn m4(self) {}
+    }
+
+    pub fn test_basic_blanket() {
+        let x1 = S1.m1(); // $ target=S1::m1
+        let x2 = (&S1).m2(); // $ target=MyTrait2Ref::m2
+        let x3 = (&&S1).m2(); // $ target=MyTrait2RefRefS1::m2
+        let x4 = S1.m4(); // $ target=MyTrait4aBlanket::m4
+        let x5 = (&S1).m4(); // $ target=MyTrait4bRef::m4
+        let x6 = S2.m4(); // $ target=MyTrait4bRef::m4
+        let x7 = (&S2).m4(); // $ target=MyTrait4bRef::m4
+    }
+}
+
+pub mod sql_exec {
+    // a highly simplified model of `MySqlConnection.execute` in SQLx
+
+    trait Connection {}
+
+    trait Executor {
+        fn execute1(&self);
+        fn execute2<E>(&self, query: E);
+    }
+
+    impl<T: Connection> Executor for T {
+        fn execute1(&self) {
+            println!("Executor::execute1");
+        }
+
+        fn execute2<E>(&self, _query: E) {
+            println!("Executor::execute2");
+        }
+    }
+
+    struct MySqlConnection {}
+
+    impl Connection for MySqlConnection {}
+
+    pub fn f() {
+        let c = MySqlConnection {}; // $ certainType=c:MySqlConnection
+
+        c.execute1(); // $ target=execute1
+        MySqlConnection::execute1(&c); // $ target=execute1
+
+        c.execute2("SELECT * FROM users"); // $ target=execute2
+        c.execute2::<&str>("SELECT * FROM users"); // $ target=execute2
+        MySqlConnection::execute2(&c, "SELECT * FROM users"); // $ target=execute2
+        MySqlConnection::execute2::<&str>(&c, "SELECT * FROM users"); // $ target=execute2
+    }
+}
diff --git a/rust/ql/test/library-tests/type-inference/closure.rs b/rust/ql/test/library-tests/type-inference/closure.rs
index 1b11335947c..43b26819325 100644
--- a/rust/ql/test/library-tests/type-inference/closure.rs
+++ b/rust/ql/test/library-tests/type-inference/closure.rs
@@ -5,7 +5,7 @@ mod simple_closures {
         // A simple closure without type annotations or invocations.
         let my_closure = |a, b| a && b;
 
-        let x: i64 = 1i64; // $ type=x:i64
+        let x: i64 = 1i64; // $ certainType=x:i64
         let add_one = |n| n + 1i64; // $ target=add
         let _y = add_one(x); // $ type=_y:i64
 
@@ -27,7 +27,7 @@ mod simple_closures {
         // The return type of `id2` is inferred from the type of the call expression.
         let id2 = |b| b;
         let arg = Default::default(); // $ target=default type=arg:bool
-        let _b2: bool = id2(arg); // $ type=_b2:bool
+        let _b2: bool = id2(arg); // $ certainType=_b2:bool
     }
 }
 
@@ -60,7 +60,7 @@ mod fn_once_trait {
         let _r = apply(f, true); // $ target=apply type=_r:i64
 
         let f = |x| x + 1; // $ MISSING: type=x:i64 target=add
-        let _r2 = apply_two(f); // $ target=apply_two type=_r2:i64
+        let _r2 = apply_two(f); // $ target=apply_two certainType=_r2:i64
     }
 }
 
diff --git a/rust/ql/test/library-tests/type-inference/dereference.rs b/rust/ql/test/library-tests/type-inference/dereference.rs
index f4d9d68a099..bdc42180a63 100644
--- a/rust/ql/test/library-tests/type-inference/dereference.rs
+++ b/rust/ql/test/library-tests/type-inference/dereference.rs
@@ -27,6 +27,14 @@ impl<T> Deref for MySmartPointer<T> {
     }
 }
 
+struct S<T>(T);
+
+impl<T> S<T> {
+    fn foo(&self) -> &T {
+        &self.0 // $ fieldof=S
+    }
+}
+
 fn explicit_monomorphic_dereference() {
     // Dereference with method call
     let a1 = MyIntPointer { value: 34i64 };
@@ -58,7 +66,7 @@ fn explicit_polymorphic_dereference() {
 fn explicit_ref_dereference() {
     // Explicit dereference with type parameter
     let e1 = &'a';
-    let _f1 = e1.deref(); // $ target=deref MISSING: type=_f1:&T.char
+    let _f1 = e1.deref(); // $ target=deref type=_f1:&T.char
 
     // Explicit dereference with type parameter
     let e2 = &'a';
@@ -91,6 +99,9 @@ fn implicit_dereference() {
     // Call method on implicitly dereferenced value
     let x = MySmartPointer { value: 34i64 };
     let _y = x.is_positive(); // $ MISSING: target=is_positive type=_y:bool
+
+    let z = MySmartPointer { value: S(0i64) };
+    let z_ = z.foo(); // $ MISSING: target=foo type=z_:&T.i64
 }
 
 mod implicit_deref_coercion_cycle {
@@ -128,6 +139,83 @@ mod implicit_deref_coercion_cycle {
     }
 }
 
+mod ref_vs_mut_ref {
+    trait MyTrait1<T> {
+        fn foo(self) -> T;
+    }
+
+    struct S;
+
+    impl MyTrait1<S> for &S {
+        // MyTrait1::foo1
+        fn foo(self) -> S {
+            S
+        }
+    }
+
+    impl MyTrait1<i64> for &mut S {
+        // MyTrait1::foo2
+        fn foo(self) -> i64 {
+            42
+        }
+    }
+
+    trait MyTrait2<T1, T2> {
+        fn bar(self, arg: T1) -> T2;
+    }
+
+    impl MyTrait2<&S, S> for S {
+        // MyTrait2::bar1
+        fn bar(self, arg: &S) -> S {
+            S
+        }
+    }
+
+    impl MyTrait2<&mut S, i64> for S {
+        // MyTrait2::bar2
+        fn bar(self, arg: &mut S) -> i64 {
+            42
+        }
+    }
+
+    pub fn test() {
+        let x = (&S).foo(); // $ target=MyTrait1::foo1 type=x:S $ SPURIOUS: target=MyTrait1::foo2
+        let y = S.foo(); // $ target=MyTrait1::foo1 type=y:S $ SPURIOUS: target=MyTrait1::foo2
+        let z = (&mut S).foo(); // $ target=MyTrait1::foo2 type=z:i64 $ SPURIOUS: target=MyTrait1::foo1
+
+        let x = S.bar(&S); // $ target=MyTrait2::bar1 type=x:S $ SPURIOUS: target=MyTrait2::bar2
+        let y = S.bar(&mut S); // $ target=MyTrait2::bar2 type=y:i64 $ SPURIOUS: target=MyTrait2::bar1
+    }
+}
+
+// from https://doc.rust-lang.org/reference/expressions/method-call-expr.html#r-expr.method.candidate-search
+mod rust_reference_example {
+    struct Foo {}
+
+    trait Bar {
+        fn bar(&self);
+    }
+
+    impl Foo {
+        // bar1
+        fn bar(&mut self) {
+            println!("In struct impl!")
+        }
+    }
+
+    impl Bar for Foo {
+        // bar2
+        fn bar(&self) {
+            println!("In trait impl!")
+        }
+    }
+
+    pub fn main() {
+        let mut f = Foo {};
+        f.bar(); // $ SPURIOUS: target=bar1 $ MISSING: target=bar2
+    }
+}
+
 pub fn test() {
     explicit_monomorphic_dereference(); // $ target=explicit_monomorphic_dereference
     explicit_polymorphic_dereference(); // $ target=explicit_polymorphic_dereference
@@ -135,4 +223,6 @@ pub fn test() {
     explicit_box_dereference(); // $ target=explicit_box_dereference
     implicit_dereference(); // $ target=implicit_dereference
     implicit_deref_coercion_cycle::test(); // $ target=test
+    ref_vs_mut_ref::test(); // $ target=test
+    rust_reference_example::main(); // $ target=main
 }
diff --git a/rust/ql/test/library-tests/type-inference/dyn_type.rs b/rust/ql/test/library-tests/type-inference/dyn_type.rs
index 24f320ec3f4..c4514a2872a 100644
--- a/rust/ql/test/library-tests/type-inference/dyn_type.rs
+++ b/rust/ql/test/library-tests/type-inference/dyn_type.rs
@@ -101,7 +101,7 @@ fn test_assoc_type(obj: &dyn AssocTrait<i64, AP = bool>) {
 pub fn test() {
     test_basic_dyn_trait(&MyStruct { value: 42 }); // $ target=test_basic_dyn_trait
     test_generic_dyn_trait(&GenStruct {
-        value: "".to_string(),
+        value: "".to_string(), // $ target=to_string
     }); // $ target=test_generic_dyn_trait
     test_poly_dyn_trait(); // $ target=test_poly_dyn_trait
     test_assoc_type(&GenStruct { value: 100 }); // $ target=test_assoc_type
diff --git a/rust/ql/test/library-tests/type-inference/invalid/main.rs b/rust/ql/test/library-tests/type-inference/invalid/main.rs
new file mode 100644
index 00000000000..6af9b8747a9
--- /dev/null
+++ b/rust/ql/test/library-tests/type-inference/invalid/main.rs
@@ -0,0 +1,93 @@
+// The code in this file is not valid Rust code
+
+// test that our type inference implementation does not run into an infinite loop.
+mod type_loop {
+    struct S<T>(T);
+
+    trait T1<T>: T2<S<T>> {
+        fn foo(self) {}
+    }
+
+    trait T2<T>: T1<S<T>> {
+        fn bar(self) {
+            self.foo() // $ target=foo
+        }
+    }
+}
+
+mod op_blanket_impl {
+    use std::ops::Add;
+
+    #[derive(Debug, Copy, Clone)]
+    struct Num(i32);
+
+    trait AddAlias {
+        fn add_alias(self, other: Self) -> Self;
+    }
+
+    impl AddAlias for Num {
+        fn add_alias(self, other: Self) -> Self {
+            Num(self.0 + other.0) // $ fieldof=Num $ target=add
+        }
+    }
+
+    // this is not valid in Rust, because of coherence
+    impl<T: AddAlias> Add for T {
+        type Output = Self;
+
+        // BlanketAdd
+        fn add(self, other: Self) -> Self {
+            self.add_alias(other) // $ target=add_alias
+        }
+    }
+
+    pub fn test_op_blanket() {
+        let a = Num(5);
+        let b = Num(10);
+        let c = a + b; // $ target=BlanketAdd
+        println!("{c:?}");
+    }
+}
+
+mod impl_specialization {
+    #[derive(Debug, Copy, Clone)]
+    struct S1;
+
+    trait Clone1 {
+        fn clone1(&self) -> Self;
+    }
+
+    trait Duplicatable {
+        fn duplicate(&self) -> Self
+        where
+            Self: Sized;
+    }
+
+    impl Clone1 for S1 {
+        // S1::clone1
+        fn clone1(&self) -> Self {
+            *self // $ target=deref
+        }
+    }
+
+    impl Duplicatable for S1 {
+        // S1::duplicate
+        fn duplicate(&self) -> Self {
+            *self // $ target=deref
+        }
+    }
+
+    // Blanket implementation for all types that implement Clone1
+    impl<T: Clone1> Duplicatable for T {
+        // Clone1duplicate
+        fn duplicate(&self) -> Self {
+            self.clone1() // $ target=clone1
+        }
+    }
+
+    pub fn test_basic_blanket() {
+        // this call should target the specialized implementation of Duplicatable for S1,
+        // not the blanket implementation
+        let x = S1.duplicate(); // $ target=S1::duplicate
+    }
+}
diff --git a/rust/ql/test/library-tests/type-inference/loop/options.yml b/rust/ql/test/library-tests/type-inference/invalid/options.yml
similarity index 100%
rename from rust/ql/test/library-tests/type-inference/loop/options.yml
rename to rust/ql/test/library-tests/type-inference/invalid/options.yml
diff --git a/rust/ql/test/library-tests/type-inference/loop/main.rs b/rust/ql/test/library-tests/type-inference/loop/main.rs
deleted file mode 100644
index 103b1a5cab0..00000000000
--- a/rust/ql/test/library-tests/type-inference/loop/main.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// The code in this file is not valid Rust code, but it is used to test that
-// our type inference implementation does not run into an infinite loop.
-
-struct S<T>(T);
-
-trait T1<T>: T2<S<T>> {
-    fn foo(self) {}
-}
-
-trait T2<T>: T1<S<T>> {
-    fn bar(self) {
-        self.foo() // $ target=foo
-    }
-}
diff --git a/rust/ql/test/library-tests/type-inference/main.rs b/rust/ql/test/library-tests/type-inference/main.rs
index 63e860b7507..1cac4e2d3e2 100644
--- a/rust/ql/test/library-tests/type-inference/main.rs
+++ b/rust/ql/test/library-tests/type-inference/main.rs
@@ -34,7 +34,7 @@ mod field_access {
 
     fn generic_field_access() {
         // Explicit type argument
-        let x = GenericThing::<S> { a: S }; // $ type=x:A.S
+        let x = GenericThing::<S> { a: S }; // $ certainType=x:A.S
         println!("{:?}", x.a); // $ fieldof=GenericThing
 
         // Implicit type argument
@@ -73,7 +73,7 @@ mod method_impl {
 
     impl Foo {
         pub fn m1(self) -> Self {
-            self
+            self // $ certainType=self:Foo
         }
 
         pub fn m2(self) -> Foo {
@@ -108,7 +108,7 @@ mod trait_impl {
     impl MyTrait<bool> for MyThing {
         // MyThing::trait_method
         fn trait_method(self) -> bool {
-            self.field // $ fieldof=MyThing
+            self.field // $ certainType=self:MyThing fieldof=MyThing
         }
     }
 
@@ -121,6 +121,55 @@ mod trait_impl {
     }
 }
 
+mod trait_visibility {
+    // In this test the correct method target depends on which trait is visible.
+
+    mod m {
+        pub trait Foo {
+            // Foo::a_method
+            fn a_method(&self) {
+                println!("foo!");
+            }
+        }
+
+        pub trait Bar {
+            // Bar::a_method
+            fn a_method(&self) {
+                println!("bar!");
+            }
+        }
+
+        pub struct X;
+        impl Foo for X {}
+        impl Bar for X {}
+    }
+
+    use m::X;
+
+    fn main() {
+        let x = X;
+        {
+            use m::Foo;
+            x.a_method(); // $ target=Foo::a_method
+        }
+        {
+            use m::Bar;
+            x.a_method(); // $ target=Bar::a_method
+        }
+        {
+            use m::Bar as _;
+            x.a_method(); // $ target=Bar::a_method
+        }
+        {
+            use m::Bar;
+            use m::Foo;
+            // x.a_method();  // This would be ambiguous
+            Foo::a_method(&x); // $ target=Foo::a_method
+            Bar::a_method(&x); // $ target=Bar::a_method
+        }
+    }
+}
+
 mod method_non_parametric_impl {
     #[derive(Debug)]
     struct MyThing<A> {
@@ -316,7 +365,7 @@ mod method_non_parametric_trait_impl {
 
     fn type_bound_type_parameter_impl<TP: MyTrait<S1>>(thing: TP) -> S1 {
         // The trait bound on `TP` makes the implementation of `ConvertTo` valid
-        thing.convert_to() // $ MISSING: target=T::convert_to
+        thing.convert_to() // $ target=T::convert_to
     }
 
     pub fn f() {
@@ -388,7 +437,7 @@ mod method_non_parametric_trait_impl {
         let x = get_snd_fst(c); // $ type=x:S1 target=get_snd_fst
 
         let thing = MyThing { a: S1 };
-        let i = thing.convert_to(); // $ MISSING: type=i:S1 target=T::convert_to
+        let i = thing.convert_to(); // $ type=i:S1 target=T::convert_to
         let j = convert_to(thing); // $ type=j:S1 target=convert_to
     }
 }
@@ -486,19 +535,63 @@ mod impl_overlap {
         }
     }
 
+    trait MyTrait1 {
+        // MyTrait1::m
+        fn m(&self) {}
+    }
+
+    trait MyTrait2: MyTrait1 {}
+
+    #[derive(Debug)]
+    struct S4;
+
+    impl MyTrait1 for S4 {
+        // <S4_as_MyTrait1>::m
+        fn m(&self) {}
+    }
+
+    impl MyTrait2 for S4 {}
+
+    #[derive(Debug)]
+    struct S5<T5>(T5);
+
+    impl MyTrait1 for S5<i32> {
+        // <S5<i32>_as_MyTrait1>::m
+        fn m(&self) {}
+    }
+
+    impl MyTrait2 for S5<i32> {}
+
+    impl MyTrait1 for S5<bool> {}
+
+    impl MyTrait2 for S5<bool> {}
+
     pub fn f() {
         let x = S1;
         println!("{:?}", x.common_method()); // $ target=S1::common_method
+        println!("{:?}", S1::common_method(x)); // $ target=S1::common_method
         println!("{:?}", x.common_method_2()); // $ target=S1::common_method_2
+        println!("{:?}", S1::common_method_2(x)); // $ target=S1::common_method_2
 
         let y = S2(S1);
         println!("{:?}", y.common_method()); // $ target=<S2<S1>_as_OverlappingTrait>::common_method
+        println!("{:?}", S2::<S1>::common_method(S2(S1))); // $ target=<S2<S1>_as_OverlappingTrait>::common_method
 
         let z = S2(0);
         println!("{:?}", z.common_method()); // $ target=S2<i32>::common_method
+        println!("{:?}", S2::common_method(S2(0))); // $ target=S2<i32>::common_method
+        println!("{:?}", S2::<i32>::common_method(S2(0))); // $ target=S2<i32>::common_method
 
         let w = S3(S1);
         println!("{:?}", w.m(x)); // $ target=S3<T>::m
+        println!("{:?}", S3::m(&w, x)); // $ target=S3<T>::m
+
+        S4.m(); // $ target=<S4_as_MyTrait1>::m $ SPURIOUS: target=MyTrait1::m
+        S4::m(&S4); // $ target=<S4_as_MyTrait1>::m $ SPURIOUS: target=MyTrait1::m
+        S5(0i32).m(); // $ target=<S5<i32>_as_MyTrait1>::m $ SPURIOUS: target=MyTrait1::m
+        S5::m(&S5(0i32)); // $ target=<S5<i32>_as_MyTrait1>::m $ SPURIOUS: target=MyTrait1::m
+        S5(true).m(); // $ target=MyTrait1::m
+        S5::m(&S5(true)); // $ target=MyTrait1::m
     }
 }
 
@@ -597,15 +690,59 @@ mod type_parameter_bounds {
     }
 }
 
+mod trait_default_self_type_parameter {
+    // A trait with a type parameter that defaults to `Self`.
+    trait TraitWithSelfTp<A = Option<Self>> {
+        // TraitWithSelfTp::get_a
+        fn get_a(&self) -> A;
+    }
+
+    fn get_a<A, T: TraitWithSelfTp<A>>(thing: &T) -> A {
+        thing.get_a() // $ target=TraitWithSelfTp::get_a
+    }
+
+    // The trait bound on `T` uses the default for `A` which contains `Self`
+    fn tp_uses_default<S: TraitWithSelfTp>(thing: S) -> i64 {
+        let _ms = thing.get_a(); // $ target=TraitWithSelfTp::get_a type=_ms:T.S
+        0
+    }
+
+    // The supertrait uses the default for `A` which contains `Self`
+    trait SubTraitOfTraitWithSelfTp: TraitWithSelfTp + Sized {}
+
+    fn get_a_through_tp<S: SubTraitOfTraitWithSelfTp>(thing: &S) {
+        // `thing` is a `TraitWithSelfTp` through the trait hierarchy
+        let _ms = get_a(thing); // $ target=get_a type=_ms:T.S
+    }
+
+    struct MyStruct {
+        value: i32,
+    }
+
+    // The implementing trait uses the default for `A` which contains `Self`
+    impl TraitWithSelfTp for MyStruct {
+        fn get_a(&self) -> Option<Self> {
+            Some(MyStruct { value: self.value }) // $ fieldof=MyStruct
+        }
+    }
+
+    impl SubTraitOfTraitWithSelfTp for MyStruct {}
+
+    pub fn test() {
+        let s = MyStruct { value: 0 };
+        let _ms = get_a(&s); // $ target=get_a type=_ms:T.MyStruct
+    }
+}
+
 mod function_trait_bounds {
-    #[derive(Debug)]
+    #[derive(Debug, Clone, Copy)]
     struct MyThing<T> {
         a: T,
     }
 
-    #[derive(Debug)]
+    #[derive(Debug, Clone, Copy)]
     struct S1;
-    #[derive(Debug)]
+    #[derive(Debug, Clone, Copy)]
     struct S2;
 
     trait MyTrait<A> {
@@ -617,12 +754,55 @@ mod function_trait_bounds {
         {
             self.m1() // $ target=m1
         }
+
+        fn assoc(x: Self) -> A;
+    }
+
+    impl<T: Default> MyTrait<T> for S2 {
+        fn m1(self) -> T {
+            Default::default() // $ target=default
+        }
+
+        fn assoc(x: Self) -> T {
+            Default::default() // $ target=default
+        }
+    }
+
+    impl MyTrait<i32> for S1 {
+        fn m1(self) -> i32 {
+            0
+        }
+
+        fn assoc(x: Self) -> i32 {
+            0
+        }
     }
 
     // Type parameter with bound occurs in the root of a parameter type.
 
-    fn call_trait_m1<T1, T2: MyTrait<T1>>(x: T2) -> T1 {
-        x.m1() // $ target=m1 type=x.m1():T1
+    fn call_trait_m1<T1, T2: MyTrait<T1> + Copy>(x: T2) -> T1 {
+        x.m1(); // $ target=m1 type=x.m1():T1
+        x.m1() // $ target=m1
+    }
+    fn call_trait_m1_2<T1, T2: MyTrait<T1> + Copy>(x: T2) -> T1 {
+        let y = T2::m1(x); // $ target=m1
+        y; // $ type=y:T1
+        T2::m1(x) // $ target=m1
+    }
+    fn call_trait_m1_3<T1, T2: MyTrait<T1> + Copy>(x: T2) -> T1 {
+        let y = MyTrait::m1(x); // $ target=m1
+        y; // $ type=y:T1
+        MyTrait::m1(x) // $ target=m1
+    }
+    fn call_trait_assoc_1<T1, T2: MyTrait<T1> + Copy>(x: T2) -> T1 {
+        let y = T2::assoc(x); // $ target=assoc
+        y; // $ type=y:T1
+        T2::assoc(x) // $ target=assoc
+    }
+    fn call_trait_assoc_2<T1, T2: MyTrait<T1> + Copy>(x: T2) -> T1 {
+        let y = MyTrait::assoc(x); // $ target=assoc
+        y; // $ type=y:T1
+        MyTrait::assoc(x) // $ target=assoc
     }
 
     // Type parameter with bound occurs nested within another type.
@@ -630,11 +810,21 @@ mod function_trait_bounds {
     fn call_trait_thing_m1<T1, T2: MyTrait<T1>>(x: MyThing<T2>) -> T1 {
         x.a.m1() // $ fieldof=MyThing target=m1
     }
+    fn call_trait_thing_m1_2<T1, T2: MyTrait<T1>>(x: MyThing<T2>) -> T1 {
+        T2::m1(x.a) // $ fieldof=MyThing target=m1
+    }
+    fn call_trait_thing_m1_3<T1, T2: MyTrait<T1>>(x: MyThing<T2>) -> T1 {
+        MyTrait::m1(x.a) // $ fieldof=MyThing target=m1
+    }
 
     impl<T> MyTrait<T> for MyThing<T> {
         fn m1(self) -> T {
             self.a // $ fieldof=MyThing
         }
+
+        fn assoc(x: Self) -> T {
+            x.a // $ fieldof=MyThing
+        }
     }
 
     pub fn f() {
@@ -653,8 +843,26 @@ mod function_trait_bounds {
         let x2 = MyThing { a: S1 };
         let y2 = MyThing { a: S2 };
 
-        println!("{:?}", call_trait_m1(x2)); // $ target=call_trait_m1
-        println!("{:?}", call_trait_m1(y2)); // $ target=call_trait_m1
+        let a = call_trait_m1(x2); // $ type=a:S1 target=call_trait_m1
+        println!("{:?}", a);
+        let a = call_trait_m1_2(x2); // $ type=a:S1 target=call_trait_m1_2
+        println!("{:?}", a);
+        let a = call_trait_m1_3(x2); // $ type=a:S1 target=call_trait_m1_3
+        println!("{:?}", a);
+        let a = call_trait_m1(y2); // $ type=a:S2 target=call_trait_m1
+        println!("{:?}", a);
+        let a = call_trait_m1_2(y2); // $ type=a:S2 target=call_trait_m1_2
+        println!("{:?}", a);
+        let a = call_trait_m1_3(y2); // $ type=a:S2 target=call_trait_m1_3
+        println!("{:?}", a);
+        let a = call_trait_assoc_1(x2); // $ type=a:S1 target=call_trait_assoc_1
+        println!("{:?}", a);
+        let a = call_trait_assoc_2(x2); // $ type=a:S1 target=call_trait_assoc_2
+        println!("{:?}", a);
+        let a = call_trait_assoc_1(y2); // $ type=a:S2 target=call_trait_assoc_1
+        println!("{:?}", a);
+        let a = call_trait_assoc_2(y2); // $ type=a:S2 target=call_trait_assoc_2
+        println!("{:?}", a);
 
         let x3 = MyThing {
             a: MyThing { a: S1 },
@@ -665,8 +873,18 @@ mod function_trait_bounds {
 
         let a = call_trait_thing_m1(x3); // $ type=a:S1 target=call_trait_thing_m1
         println!("{:?}", a);
+        let a = call_trait_thing_m1_2(x3); // $ type=a:S1 target=call_trait_thing_m1_2
+        println!("{:?}", a);
+        let a = call_trait_thing_m1_3(x3); // $ type=a:S1 target=call_trait_thing_m1_3
+        println!("{:?}", a);
         let b = call_trait_thing_m1(y3); // $ type=b:S2 target=call_trait_thing_m1
         println!("{:?}", b);
+        let b = call_trait_thing_m1_2(y3); // $ type=b:S2 target=call_trait_thing_m1_2
+        println!("{:?}", b);
+        let b = call_trait_thing_m1_3(y3); // $ type=b:S2 target=call_trait_thing_m1_3
+        println!("{:?}", b);
+        let x = S1::m2(S1); // $ target=m2 $ type=x:i32
+        let y: i32 = S2::m2(S2); // $ target=m2
     }
 }
 
@@ -909,19 +1127,19 @@ mod generic_enum {
 }
 
 mod method_supertraits {
-    #[derive(Debug)]
+    #[derive(Debug, Clone, Copy)]
     struct MyThing<A> {
         a: A,
     }
 
-    #[derive(Debug)]
+    #[derive(Debug, Clone, Copy)]
     struct MyThing2<A> {
         a: A,
     }
 
-    #[derive(Debug)]
+    #[derive(Debug, Clone, Copy)]
     struct S1;
-    #[derive(Debug)]
+    #[derive(Debug, Clone, Copy)]
     struct S2;
 
     trait MyTrait1<Tr1> {
@@ -929,16 +1147,16 @@ mod method_supertraits {
         fn m1(self) -> Tr1;
     }
 
-    trait MyTrait2<Tr2>: MyTrait1<Tr2> {
+    trait MyTrait2<Tr2>: MyTrait1<Tr2> + Copy {
         #[rustfmt::skip]
-        fn m2(self) -> Tr2
+        fn m2(&self) -> Tr2
         where
             Self: Sized,
         {
             if 3 > 2 { // $ target=gt
                 self.m1() // $ target=MyTrait1::m1
             } else {
-                Self::m1(self) // $ target=MyTrait1::m1
+                Self::m1(*self) // $ target=deref target=MyTrait1::m1
             }
         }
     }
@@ -952,7 +1170,7 @@ mod method_supertraits {
             if 3 > 2 { // $ target=gt
                 self.m2().a // $ target=m2 $ fieldof=MyThing
             } else {
-                Self::m2(self).a // $ target=m2 fieldof=MyThing
+                Self::m2(&self).a // $ target=m2 fieldof=MyThing
             }
         }
     }
@@ -964,7 +1182,7 @@ mod method_supertraits {
         }
     }
 
-    impl<T> MyTrait2<T> for MyThing<T> {}
+    impl<T: Copy> MyTrait2<T> for MyThing<T> {}
 
     impl<T> MyTrait1<MyThing<T>> for MyThing2<T> {
         // MyThing2::m1
@@ -973,9 +1191,9 @@ mod method_supertraits {
         }
     }
 
-    impl<T> MyTrait2<MyThing<T>> for MyThing2<T> {}
+    impl<T: Copy> MyTrait2<MyThing<T>> for MyThing2<T> {}
 
-    impl<T> MyTrait3<T> for MyThing2<T> {}
+    impl<T: Copy> MyTrait3<T> for MyThing2<T> {}
 
     fn call_trait_m1<T1, T2: MyTrait1<T1>>(x: T2) -> T1 {
         x.m1() // $ target=MyTrait1::m1
@@ -1140,20 +1358,20 @@ mod type_aliases {
         println!("{:?}", p1);
 
         // Type can be only inferred from the type alias
-        let p2: MyPair = PairOption::PairNone(); // $ type=p2:Fst.S1 type=p2:Snd.S2
+        let p2: MyPair = PairOption::PairNone(); // $ certainType=p2:Fst.S1 certainType=p2:Snd.S2
         println!("{:?}", p2);
 
         // First type from alias, second from constructor
-        let p3: AnotherPair<_> = PairOption::PairSnd(S3); // $ type=p3:Fst.S2
+        let p3: AnotherPair<_> = PairOption::PairSnd(S3); // $ certainType=p3:Fst.S2
         println!("{:?}", p3);
 
         // First type from alias definition, second from argument to alias
-        let p3: AnotherPair<S3> = PairOption::PairNone(); // $ type=p3:Fst.S2 type=p3:Snd.S3
+        let p3: AnotherPair<S3> = PairOption::PairNone(); // $ certainType=p3:Fst.S2 certainType=p3:Snd.S3
         println!("{:?}", p3);
 
         g(PairOption::PairSnd(PairOption::PairSnd(S3))); // $ target=g
 
-        let x: S7<S2>; // $ type=x:Result $ type=x:E.S1 $ type=x:T.S4 $ type=x:T.T41.S2 $ type=x:T.T42.S5 $ type=x:T.T42.T5.S2
+        let x: S7<S2>; // $ certainType=x:Result $ certainType=x:E.S1 $ certainType=x:T.S4 $ certainType=x:T.T41.S2 $ certainType=x:T.T42.S5 $ certainType=x:T.T42.T5.S2
 
         let y = GenS(true).get_input(); // $ type=y:Result type=y:T.bool type=y:E.bool target=get_input
     }
@@ -1199,7 +1417,7 @@ mod option_methods {
     struct S;
 
     pub fn f() {
-        let x1 = MyOption::<S>::new(); // $ type=x1:T.S target=new
+        let x1 = MyOption::<S>::new(); // $ certainType=x1:T.S target=new
         println!("{:?}", x1);
 
         let mut x2 = MyOption::new(); // $ target=new
@@ -1327,7 +1545,7 @@ mod method_call_type_conversion {
         let t = x7.m1(); // $ target=m1 type=t:& type=t:&T.S2
         println!("{:?}", x7);
 
-        let x9: String = "Hello".to_string(); // $ type=x9:String
+        let x9: String = "Hello".to_string(); // $ certainType=x9:String target=to_string
 
         // Implicit `String` -> `str` conversion happens via the `Deref` trait:
         // https://doc.rust-lang.org/std/string/struct.String.html#deref.
@@ -1335,12 +1553,12 @@ mod method_call_type_conversion {
 
         let my_thing = &MyInt { a: 37 };
         // implicit borrow of a `&`
-        let a = my_thing.method_on_borrow(); // $ MISSING: target=MyInt::method_on_borrow
+        let a = my_thing.method_on_borrow(); // $ target=MyInt::method_on_borrow
         println!("{:?}", a);
 
         // no implicit borrow
         let my_thing = &MyInt { a: 38 };
-        let a = my_thing.method_not_on_borrow(); // $ MISSING: target=MyInt::method_not_on_borrow
+        let a = my_thing.method_not_on_borrow(); // $ target=MyInt::method_not_on_borrow
         println!("{:?}", a);
     }
 }
@@ -1380,11 +1598,18 @@ mod implicit_self_borrow {
         fn foo(&self) -> &Self {
             self
         }
+
+        fn bar(&self, x: &Self) -> &Self {
+            self
+        }
     }
 
     pub fn f() {
         let x = MyStruct(S);
         x.foo(); // $ target=foo
+        let x = MyStruct(S);
+        // `&&x` below is Deref coerced to `&x` (see https://doc.rust-lang.org/std/ops/trait.Deref.html#deref-coercion)
+        x.bar(&&x); // $ target=bar
     }
 }
 
@@ -1502,23 +1727,23 @@ mod try_expressions {
 
 mod builtins {
     pub fn f() {
-        let x: i32 = 1; // $ type=x:i32
+        let x: i32 = 1; // $ certainType=x:i32
         let y = 2; // $ type=y:i32
         let z = x + y; // $ type=z:i32 target=add
         let z = x.abs(); // $ target=abs $ type=z:i32
-        let c = 'c'; // $ type=c:char
-        let hello = "Hello"; // $ type=hello:&T.str
-        let f = 123.0f64; // $ type=f:f64
-        let t = true; // $ type=t:bool
-        let f = false; // $ type=f:bool
+        let c = 'c'; // $ certainType=c:char
+        let hello = "Hello"; // $ certainType=hello:&T.str
+        let f = 123.0f64; // $ certainType=f:f64
+        let t = true; // $ certainType=t:bool
+        let f = false; // $ certainType=f:bool
     }
 }
 
 // Tests for non-overloaded operators.
 mod operators {
     pub fn f() {
-        let x = true && false; // $ type=x:bool
-        let y = true || false; // $ type=y:bool
+        let x = true && false; // $ certainType=x:bool
+        let y = true || false; // $ certainType=y:bool
 
         let mut a;
         let cond = 34 == 33; // $ target=eq
@@ -1770,6 +1995,11 @@ mod overloadable_operators {
             self.x >= other.x && self.y >= other.y // $ fieldof=Vec2 target=ge
         }
     }
+
+    fn param_add<T: Add>(a: T, b: T) -> T::Output {
+        a + b // $ target=add
+    }
+
     pub fn f() {
         // Test for all overloadable operators on `i64`
 
@@ -1787,6 +2017,7 @@ mod overloadable_operators {
         let i64_mul = 17i64 * 18i64; // $ type=i64_mul:i64 target=mul
         let i64_div = 19i64 / 20i64; // $ type=i64_div:i64 target=div
         let i64_rem = 21i64 % 22i64; // $ type=i64_rem:i64 target=rem
+        let i64_param_add = param_add(1i64, 2i64); // $ target=param_add $ MISSING: type=i64_param_add:i64
 
         // Arithmetic assignment operators
         let mut i64_add_assign = 23i64;
@@ -1920,6 +2151,10 @@ mod async_ {
         async { S1 }
     }
 
+    fn f3() -> impl Future<Output = ()> {
+        async {}
+    }
+
     struct S2;
 
     impl Future for S2 {
@@ -1933,14 +2168,15 @@ mod async_ {
         }
     }
 
-    fn f3() -> impl Future<Output = S1> {
+    fn f4() -> impl Future<Output = S1> {
         S2
     }
 
     pub async fn f() {
         f1().await.f(); // $ target=S1f target=f1
         f2().await.f(); // $ target=S1f target=f2
-        f3().await.f(); // $ target=S1f target=f3
+        f3().await; // $ target=f3
+        f4().await.f(); // $ target=S1f target=f4
         S2.await.f(); // $ target=S1f
         let b = async { S1 };
         b.await.f(); // $ target=S1f
@@ -2034,7 +2270,7 @@ mod impl_trait {
 mod indexers {
     use std::ops::Index;
 
-    #[derive(Debug)]
+    #[derive(Debug, Copy, Clone)]
     struct S;
 
     impl S {
@@ -2071,6 +2307,13 @@ mod indexers {
         let x = slice[0].foo(); // $ target=foo type=x:S target=index
     }
 
+    fn param_index<T: Index<usize>>(a: T, b: usize) -> T::Output
+    where
+        <T as Index<usize>>::Output: Sized + Copy,
+    {
+        a[b] // $ target=index
+    }
+
     pub fn f() {
         let mut vec = MyVec::new(); // $ type=vec:T.S target=new
         vec.push(S); // $ target=push
@@ -2079,6 +2322,8 @@ mod indexers {
         let xs: [S; 1] = [S];
         let x = xs[0].foo(); // $ target=foo type=x:S target=index
 
+        let y = param_index(vec, 0); // $ target=param_index $ MISSING: type=y:S
+
         analyze_slice(&xs); // $ target=analyze_slice
     }
 }
@@ -2292,10 +2537,10 @@ mod loops {
         let vals2 = [1u16; 3]; // $ type=vals2:[T;...].u16
         for u in vals2 {} // $ type=u:u16
 
-        let vals3: [u32; 3] = [1, 2, 3]; // $ type=vals3:[T;...].u32
+        let vals3: [u32; 3] = [1, 2, 3]; // $ certainType=vals3:[T;...].u32
         for u in vals3 {} // $ type=u:u32
 
-        let vals4: [u64; 3] = [1; 3]; // $ type=vals4:[T;...].u64
+        let vals4: [u64; 3] = [1; 3]; // $ certainType=vals4:[T;...].u64
         for u in vals4 {} // $ type=u:u64
 
         let mut strings1 = ["foo", "bar", "baz"]; // $ type=strings1:[T;...].&T.str
@@ -2317,9 +2562,9 @@ mod loops {
             String::from("bar"), // $ target=from
             String::from("baz"), // $ target=from
         ];
-        for s in strings3 {} // $ MISSING: type=s:String
+        for s in strings3 {} // $ type=s:&T.String
 
-        let callables = [MyCallable::new(), MyCallable::new(), MyCallable::new()]; // $ target=new $ MISSING: type=callables:[T;...].MyCallable; 3
+        let callables = [MyCallable::new(), MyCallable::new(), MyCallable::new()]; // $ target=new $ type=callables:[T;...].MyCallable
         for c // $ type=c:MyCallable
         in callables
         {
@@ -2330,10 +2575,12 @@ mod loops {
 
         for i in 0..10 {} // $ type=i:i32
         for u in [0u8..10] {} // $ type=u:Range type=u:Idx.u8
-        let range = 0..10; // $ type=range:Range type=range:Idx.i32
+        let range = 0..10; // $ certainType=range:Range type=range:Idx.i32
         for i in range {} // $ type=i:i32
+        let range_full = ..; // $ certainType=range_full:RangeFull
+        for i in &[1i64, 2i64, 3i64][range_full] {} // $ target=index MISSING: type=i:&T.i64
 
-        let range1 = // $ type=range1:Range type=range1:Idx.u16
+        let range1 = // $ certainType=range1:Range type=range1:Idx.u16
         std::ops::Range {
             start: 0u16,
             end: 10u16,
@@ -2345,19 +2592,19 @@ mod loops {
         let vals3 = vec![1, 2, 3]; // $ MISSING: type=vals3:Vec type=vals3:T.i32
         for i in vals3 {} // $ MISSING: type=i:i32
 
-        let vals4a: Vec<u16> = [1u16, 2, 3].to_vec(); // $ type=vals4a:Vec type=vals4a:T.u16
+        let vals4a: Vec<u16> = [1u16, 2, 3].to_vec(); // $ certainType=vals4a:Vec certainType=vals4a:T.u16
         for u in vals4a {} // $ type=u:u16
 
         let vals4b = [1u16, 2, 3].to_vec(); // $ MISSING: type=vals4b:Vec type=vals4b:T.u16
         for u in vals4b {} // $ MISSING: type=u:u16
 
-        let vals5 = Vec::from([1u32, 2, 3]); // $ type=vals5:Vec target=from type=vals5:T.u32
+        let vals5 = Vec::from([1u32, 2, 3]); // $ certainType=vals5:Vec target=from type=vals5:T.u32
         for u in vals5 {} // $ type=u:u32
 
-        let vals6: Vec<&u64> = [1u64, 2, 3].iter().collect(); // $ type=vals6:Vec type=vals6:T.&T.u64
+        let vals6: Vec<&u64> = [1u64, 2, 3].iter().collect(); // $ certainType=vals6:Vec certainType=vals6:T.&T.u64
         for u in vals6 {} // $ type=u:&T.u64
 
-        let mut vals7 = Vec::new(); // $ target=new type=vals7:Vec type=vals7:T.u8
+        let mut vals7 = Vec::new(); // $ target=new certainType=vals7:Vec type=vals7:T.u8
         vals7.push(1u8); // $ target=push
         for u in vals7 {} // $ type=u:u8
 
@@ -2371,18 +2618,18 @@ mod loops {
         let mut map1 = std::collections::HashMap::new(); // $ target=new type=map1:K.i32 type=map1:V.Box $ MISSING: type=map1:Hashmap type1=map1:V.T.&T.str
         map1.insert(1, Box::new("one")); // $ target=insert target=new
         map1.insert(2, Box::new("two")); // $ target=insert target=new
-        for key in map1.keys() {} // $ target=keys MISSING: type=key:i32
-        for value in map1.values() {} // $ target=values MISSING: type=value:Box type=value:T.&T.str
-        for (key, value) in map1.iter() {} // $ target=iter MISSING: type=key:i32 type=value:Box type=value:T.&T.str
-        for (key, value) in &map1 {} // $ MISSING: type=key:i32 type=value:Box type=value:T.&T.str
+        for key in map1.keys() {} // $ target=keys type=key:&T.i32
+        for value in map1.values() {} // $ target=values type=value:&T.Box type=value:&T.T.&T.str
+        for (key, value) in map1.iter() {} // $ target=iter type=key:&T.i32 type=value:&T.Box type=value:&T.T.&T.str
+        for (key, value) in &map1 {} // $ type=key:&T.i32 type=value:&T.Box type=value:&T.T.&T.str
 
         // while loops
 
-        let mut a: i64 = 0; // $ type=a:i64
+        let mut a: i64 = 0; // $ certainType=a:i64
         #[rustfmt::skip]
-        let _ = while a < 10 // $ target=lt type=a:i64
+        let _ = while a < 10 // $ target=lt certainType=a:i64
         {
-            a += 1; // $ type=a:i64 MISSING: target=add_assign
+            a += 1; // $ certainType=a:i64 MISSING: target=add_assign
         };
     }
 }
@@ -2420,16 +2667,16 @@ mod explicit_type_args {
     }
 
     pub fn f() {
-        let x1: Option<S1<S2>> = S1::assoc_fun(); // $ type=x1:T.T.S2 target=assoc_fun
-        let x2 = S1::<S2>::assoc_fun(); // $ type=x2:T.T.S2 target=assoc_fun
-        let x3 = S3::assoc_fun(); // $ type=x3:T.T.S2 target=assoc_fun
-        let x4 = S1::<S2>::method(S1::default()); // $ target=method target=default type=x4:T.S2
-        let x5 = S3::method(S1::default()); // $ target=method target=default type=x5:T.S2
+        let x1: Option<S1<S2>> = S1::assoc_fun(); // $ certainType=x1:T.T.S2 target=assoc_fun
+        let x2 = S1::<S2>::assoc_fun(); // $ certainType=x2:T.T.S2 target=assoc_fun
+        let x3 = S3::assoc_fun(); // $ certainType=x3:T.T.S2 target=assoc_fun
+        let x4 = S1::<S2>::method(S1::default()); // $ target=method target=default certainType=x4:T.S2
+        let x5 = S3::method(S1::default()); // $ target=method target=default certainType=x5:T.S2
         let x6 = S4::<S2>(Default::default()); // $ type=x6:T4.S2 target=default
         let x7 = S4(S2); // $ type=x7:T4.S2
         let x8 = S4(0); // $ type=x8:T4.i32
         let x9 = S4(S2::default()); // $ type=x9:T4.S2 target=default
-        let x10 = S5::<S2>  // $ type=x10:T5.S2
+        let x10 = S5::<S2>  // $ certainType=x10:T5.S2
         {
             field: Default::default(), // $ target=default
         };
@@ -2439,7 +2686,8 @@ mod explicit_type_args {
         {
             field: S2::default(), // $ target=default
         };
-        let x14 = foo::<i32>(Default::default()); // $ type=x14:i32 target=default target=foo
+        let x14 = foo::<i32>(Default::default()); // $ certainType=x14:i32 target=default target=foo
+        let x15 = S1::<S2>::default(); // $ certainType=x15:T.S2 target=default
     }
 }
 
@@ -2455,8 +2703,8 @@ mod tuples {
     }
 
     pub fn f() {
-        let a = S1::get_pair(); // $ target=get_pair type=a:(T_2)
-        let mut b = S1::get_pair(); // $ target=get_pair type=b:(T_2)
+        let a = S1::get_pair(); // $ target=get_pair certainType=a:(T_2)
+        let mut b = S1::get_pair(); // $ target=get_pair certainType=b:(T_2)
         let (c, d) = S1::get_pair(); // $ target=get_pair type=c:S1 type=d:S1
         let (mut e, f) = S1::get_pair(); // $ target=get_pair type=e:S1 type=f:S1
         let (mut g, mut h) = S1::get_pair(); // $ target=get_pair type=g:S1 type=h:S1
@@ -2518,43 +2766,196 @@ pub mod pattern_matching_experimental {
     }
 }
 
-pub mod exec {
-    // a *greatly* simplified model of `MySqlConnection.execute` in SQLX
+pub mod path_buf {
+    // a highly simplified model of `PathBuf::canonicalize`
 
-    trait Connection {}
+    pub struct Path {}
 
-    trait Executor {
-        fn execute1(&self);
-        fn execute2<E>(&self, query: E);
-    }
-
-    impl<T: Connection> Executor for T {
-        fn execute1(&self) {
-            println!("Executor::execute1");
+    impl Path {
+        pub const fn new() -> Path {
+            Path {}
         }
 
-        fn execute2<E>(&self, _query: E) {
-            println!("Executor::execute2");
+        pub fn canonicalize(&self) -> Result<PathBuf, ()> {
+            Ok(PathBuf::new()) // $ target=new
         }
     }
 
-    struct MySqlConnection {}
+    pub struct PathBuf {}
 
-    impl Connection for MySqlConnection {}
+    impl PathBuf {
+        pub const fn new() -> PathBuf {
+            PathBuf {}
+        }
+    }
+
+    // `PathBuf` provides `canonicalize` via `Deref`:
+    impl std::ops::Deref for PathBuf {
+        type Target = Path;
+
+        #[inline]
+        fn deref(&self) -> &Path {
+            // (very much not a real implementation)
+            static path: Path = Path::new(); // $ target=new
+            &path
+        }
+    }
 
     pub fn f() {
-        let c = MySqlConnection {}; // $ type=c:MySqlConnection
+        let path1 = Path::new(); // $ target=new certainType=path1:Path
+        let path2 = path1.canonicalize(); // $ target=canonicalize
+        let path3 = path2.unwrap(); // $ target=unwrap type=path3:PathBuf
 
-        c.execute1(); // $ MISSING: target=execute1
-        MySqlConnection::execute1(&c); // $ MISSING: target=execute1
-
-        c.execute2("SELECT * FROM users"); // $ MISSING: target=execute2
-        c.execute2::<&str>("SELECT * FROM users"); // $ MISSING: target=execute2
-        MySqlConnection::execute2(&c, "SELECT * FROM users"); // $ MISSING: target=execute2
-        MySqlConnection::execute2::<&str>(&c, "SELECT * FROM users"); // $ MISSING: target=execute2
+        let pathbuf1 = PathBuf::new(); // $ target=new certainType=pathbuf1:PathBuf
+        let pathbuf2 = pathbuf1.canonicalize(); // $ MISSING: target=canonicalize
+        let pathbuf3 = pathbuf2.unwrap(); // $ MISSING: target=unwrap type=pathbuf3:PathBuf
     }
 }
 
+mod if_expr {
+    pub trait MyTrait<T: Sized> {
+        fn m(&self) -> T;
+    }
+
+    #[derive(Default)]
+    struct S<T>(T);
+
+    impl MyTrait<i32> for S<i32> {
+        fn m(&self) -> i32 {
+            self.0 // $ fieldof=S
+        }
+    }
+
+    impl MyTrait<i32> for S<S<i32>> {
+        fn m(&self) -> i32 {
+            self.0 .0 // $ fieldof=S
+        }
+    }
+
+    impl<T: Copy> S<T> {
+        fn m2(&self) -> S<S<T>> {
+            S(S(self.0)) // $ fieldof=S
+        }
+    }
+
+    pub fn f(b: bool) -> Box<dyn MyTrait<i32>> {
+        let x = if b {
+            let y = Default::default(); // $ target=default
+            y // $ type=y:T.i32
+        } else {
+            S(2)
+        };
+
+        // This code would result in an explosion in type inference, if type information was
+        // propagated between branches.
+        let x = S(1);
+        if b {
+            let x = x.m2(); // $ target=m2
+            Box::new(x) // $ target=new
+        } else {
+            Box::new(x) // $ target=new
+        }
+    }
+}
+
+mod local_function {
+    pub fn f() -> () {
+        fn local(x: i32) -> i32 {
+            x + 1 // $ target=add
+        }
+    }
+}
+
+mod block_types {
+    #[rustfmt::skip]
+    fn f1(cond: bool) -> i32 {
+        // Block that evaluates to unit
+        let a = { // $ type=a:()
+            if cond {
+                return 12;
+            }
+        };
+        0
+    }
+
+    #[rustfmt::skip]
+    fn f2() -> i32 {
+        // Block that does not evaluate to unit
+        let b = 'label: { // $ MISSING: b:i32
+            break 'label 12;
+        };
+        println!("b: {:?}", b);
+        0
+    }
+
+    fn f3() -> i32 {
+        return 0;
+    } // should only have type `i32`, not `()`
+
+    #[rustfmt::skip]
+    fn f4(cond: bool) -> i32 {
+        let a = { // $ certainType=a:()
+            if cond {
+                return 12;
+            };
+        };
+        println!("a: {:?}", a);
+        0
+    }
+}
+
+mod context_typed {
+    pub fn f() {
+        let x = None; // $ type=x:T.i32
+        let x: Option<i32> = x;
+        let x = Option::<i32>::None; // $ type=x:T.i32
+        let x = Option::None::<i32>; // $ type=x:T.i32
+
+        fn pin_option<T>(opt: Option<T>, x: T) {}
+
+        let x = None; // $ type=x:T.i32
+        pin_option(x, 0); // $ target=pin_option
+
+        enum MyEither<T1, T2> {
+            A { left: T1 },
+            B { right: T2 },
+        }
+
+        let x = MyEither::A { left: 0 }; // $ type=x:T1.i32 type=x:T2.String
+        let x: MyEither<i32, String> = x;
+        let x = MyEither::<_, String>::A { left: 0 }; // $ type=x:T1.i32 certainType=x:T2.String
+        #[rustfmt::skip]
+        let x = MyEither::B::<i32, _> { // $ certainType=x:T1.i32 type=x:T2.String
+            right: String::new(), // $ target=new
+        };
+
+        fn pin_my_either<T>(e: MyEither<T, String>, x: T) {}
+
+        #[rustfmt::skip]
+        let x = MyEither::B {  // $ type=x:T1.i32 type=x:T2.String
+            right: String::new(), // $ target=new
+        };
+        pin_my_either(x, 0); // $ target=pin_my_either
+
+        let x = Result::Ok(0); // $ type=x:E.String
+        let x: Result<i32, String> = x;
+        let x = Result::<i32, String>::Ok(0); // $ type=x:E.String
+        let x = Result::Ok::<i32, String>(0); // $ type=x:E.String
+
+        fn pin_result<T, E>(res: Result<T, E>, x: E) {}
+
+        let x = Result::Ok(0); // $ type=x:T.i32 type=x:E.bool
+        pin_result(x, false); // $ target=pin_result
+
+        let mut x = Vec::new(); // $ type=x:T.i32 target=new
+        x.push(0); // $ target=push
+
+        let y = Default::default(); // $ type=y:i32 target=default
+        x.push(y); // $ target=push
+    }
+}
+
+mod blanket_impl;
 mod closure;
 mod dereference;
 mod dyn_type;
@@ -2565,6 +2966,7 @@ fn main() {
     method_impl::g(method_impl::Foo {}, method_impl::Foo {}); // $ target=g
     method_non_parametric_impl::f(); // $ target=f
     method_non_parametric_trait_impl::f(); // $ target=f
+    trait_default_self_type_parameter::test(); // $ target=test
     function_trait_bounds::f(); // $ target=f
     associated_type_in_trait::f(); // $ target=f
     generic_enum::f(); // $ target=f
@@ -2586,9 +2988,11 @@ fn main() {
     macros::f(); // $ target=f
     method_determined_by_argument_type::f(); // $ target=f
     tuples::f(); // $ target=f
-    exec::f(); // $ target=f
+    path_buf::f(); // $ target=f
     dereference::test(); // $ target=test
     pattern_matching::test_all_patterns(); // $ target=test_all_patterns
     pattern_matching_experimental::box_patterns(); // $ target=box_patterns
     dyn_type::test(); // $ target=test
+    if_expr::f(true); // $ target=f
+    local_function::f(); // $ target=f
 }
diff --git a/rust/ql/test/library-tests/type-inference/pattern_matching.rs b/rust/ql/test/library-tests/type-inference/pattern_matching.rs
index 28da3e1ab58..569b06ab9a7 100755
--- a/rust/ql/test/library-tests/type-inference/pattern_matching.rs
+++ b/rust/ql/test/library-tests/type-inference/pattern_matching.rs
@@ -171,15 +171,15 @@ pub fn literal_patterns() {
     match value {
         // LiteralPat - Literal patterns (including negative literals)
         42 => {
-            let literal_match = value; // $ type=literal_match:i32
+            let literal_match = value; // $ certainType=literal_match:i32
             println!("Literal pattern: {}", literal_match);
         }
         -1 => {
-            let negative_literal = value; // $ type=negative_literal:i32
+            let negative_literal = value; // $ certainType=negative_literal:i32
             println!("Negative literal: {}", negative_literal);
         }
         0 => {
-            let zero_literal = value; // $ type=zero_literal:i32
+            let zero_literal = value; // $ certainType=zero_literal:i32
             println!("Zero literal: {}", zero_literal);
         }
         _ => {}
@@ -188,7 +188,7 @@ pub fn literal_patterns() {
     let float_val = 3.14f64;
     match float_val {
         3.14 => {
-            let pi_match = float_val; // $ type=pi_match:f64
+            let pi_match = float_val; // $ certainType=pi_match:f64
             println!("Pi matched: {}", pi_match);
         }
         _ => {}
@@ -197,7 +197,7 @@ pub fn literal_patterns() {
     let string_val = "hello";
     match string_val {
         "hello" => {
-            let hello_match = string_val; // $ type=hello_match:&T.str
+            let hello_match = string_val; // $ certainType=hello_match:&T.str
             println!("String literal: {}", hello_match);
         }
         _ => {}
@@ -206,11 +206,11 @@ pub fn literal_patterns() {
     let bool_val = true;
     match bool_val {
         true => {
-            let true_match = bool_val; // $ type=true_match:bool
+            let true_match = bool_val; // $ certainType=true_match:bool
             println!("True literal: {}", true_match);
         }
         false => {
-            let false_match = bool_val; // $ type=false_match:bool
+            let false_match = bool_val; // $ certainType=false_match:bool
             println!("False literal: {}", false_match);
         }
     }
@@ -283,7 +283,7 @@ pub fn wildcard_patterns() {
         42 => println!("Specific match"),
         // WildcardPat - Wildcard pattern
         _ => {
-            let wildcard_context = value; // $ type=wildcard_context:i32
+            let wildcard_context = value; // $ certainType=wildcard_context:i32
             println!("Wildcard pattern for: {}", wildcard_context);
         }
     }
@@ -295,15 +295,15 @@ pub fn range_patterns() {
     match value {
         // RangePat - Range patterns
         1..=10 => {
-            let range_inclusive = value; // $ type=range_inclusive:i32
+            let range_inclusive = value; // $ certainType=range_inclusive:i32
             println!("Range inclusive: {}", range_inclusive);
         }
         11.. => {
-            let range_from = value; // $ type=range_from:i32
+            let range_from = value; // $ certainType=range_from:i32
             println!("Range from 11: {}", range_from);
         }
         ..=0 => {
-            let range_to_inclusive = value; // $ type=range_to_inclusive:i32
+            let range_to_inclusive = value; // $ certainType=range_to_inclusive:i32
             println!("Range to 0 inclusive: {}", range_to_inclusive);
         }
         _ => {}
@@ -312,11 +312,11 @@ pub fn range_patterns() {
     let char_val = 'c';
     match char_val {
         'a'..='z' => {
-            let lowercase_char = char_val; // $ type=lowercase_char:char
+            let lowercase_char = char_val; // $ certainType=lowercase_char:char
             println!("Lowercase char: {}", lowercase_char);
         }
         'A'..='Z' => {
-            let uppercase_char = char_val; // $ type=uppercase_char:char
+            let uppercase_char = char_val; // $ certainType=uppercase_char:char
             println!("Uppercase char: {}", uppercase_char);
         }
         _ => {}
@@ -330,7 +330,7 @@ pub fn reference_patterns() {
     // RefPat - Reference patterns
     match &value {
         &42 => {
-            let deref_match = value; // $ type=deref_match:i32
+            let deref_match = value; // $ certainType=deref_match:i32
             println!("Dereferenced match: {}", deref_match);
         }
         &x => {
@@ -360,16 +360,16 @@ pub fn record_patterns() {
     // RecordPat - Record (struct) patterns
     match point {
         Point { x: 0, y: 0 } => {
-            let origin = point; // $ type=origin:Point
+            let origin = point; // $ certainType=origin:Point
             println!("Origin point: {:?}", origin);
         }
         Point { x, y: 0 } => {
             let x_axis_x = x; // $ type=x_axis_x:i32
-            let x_axis_point = point; // $ type=x_axis_point:Point
+            let x_axis_point = point; // $ certainType=x_axis_point:Point
             println!("Point on x-axis: x={}, point={:?}", x_axis_x, x_axis_point);
         }
         Point { x: 10, .. } => {
-            let ten_x_point = point; // $ type=ten_x_point:Point
+            let ten_x_point = point; // $ certainType=ten_x_point:Point
             println!("Point with x=10: {:?}", ten_x_point);
         }
         Point { x, y } => {
@@ -446,7 +446,7 @@ pub fn tuple_patterns() {
     // TuplePat - Tuple patterns
     match tuple {
         (1, 2, 3.0) => {
-            let exact_tuple = tuple; // $ type=exact_tuple:(T_3)
+            let exact_tuple = tuple; // $ certainType=exact_tuple:(T_3)
             println!("Exact tuple: {:?}", exact_tuple);
         }
         (a, b, c) => {
@@ -469,7 +469,7 @@ pub fn tuple_patterns() {
     let unit = ();
     match unit {
         () => {
-            let unit_value = unit; // $ type=unit_value:()
+            let unit_value = unit; // $ certainType=unit_value:()
             println!("Unit value: {:?}", unit_value);
         }
     }
@@ -482,6 +482,19 @@ pub fn tuple_patterns() {
             println!("Single element tuple: {}", single_elem);
         }
     }
+
+    // Tuple pattern on reference to tuple in `let` expression
+    let ref_tuple1: &(i32, i32) = &(1, 2);
+    if let (n, m) = ref_tuple1 {
+        println!("n: {}", n);
+        println!("m: {}", m);
+    }
+
+    // Tuple pattern on reference to tuple in `let` statement
+    let ref_tuple2: &(i32, i32) = &(1, 2);
+    let (n, m) = ref_tuple2;
+    println!("n: {}", n);
+    println!("m: {}", m);
 }
 
 pub fn parenthesized_patterns() {
@@ -512,7 +525,7 @@ pub fn slice_patterns() {
     // SlicePat - Slice patterns
     match slice {
         [] => {
-            let empty_slice = slice; // $ type=empty_slice:&T.[T].i32
+            let empty_slice = slice; // $ certainType=empty_slice:&T.[T].i32
             println!("Empty slice: {:?}", empty_slice);
         }
         [x] => {
@@ -556,7 +569,7 @@ pub fn path_patterns() {
 
     match value {
         CONSTANT => {
-            let const_match = value; // $ type=const_match:i32
+            let const_match = value; // $ certainType=const_match:i32
             println!("Matches constant: {}", const_match);
         }
         _ => {}
@@ -593,11 +606,11 @@ pub fn or_patterns() {
     // OrPat - Or patterns
     match value {
         1 | 2 | 3 => {
-            let small_num = value; // $ type=small_num:i32
+            let small_num = value; // $ certainType=small_num:i32
             println!("Small number: {}", small_num);
         }
         10 | 20 => {
-            let round_num = value; // $ type=round_num:i32
+            let round_num = value; // $ certainType=round_num:i32
             println!("Round number: {}", round_num);
         }
         _ => {}
@@ -617,7 +630,7 @@ pub fn or_patterns() {
     // Or pattern with ranges
     match value {
         1..=10 | 90..=100 => {
-            let range_or_value = value; // $ type=range_or_value:i32
+            let range_or_value = value; // $ certainType=range_or_value:i32
             println!("In range: {}", range_or_value);
         }
         _ => {}
@@ -737,11 +750,11 @@ pub fn patterns_in_let_statements() {
     // Let with reference pattern
     let value = 42i32;
     let ref ref_val = value;
-    let let_ref = ref_val; // $ type=let_ref:&T.i32
+    let let_ref = ref_val; // $ certainType=let_ref:&T.i32
 
     // Let with mutable pattern
     let mut mut_val = 10i32;
-    let let_mut = mut_val; // $ type=let_mut:i32
+    let let_mut = mut_val; // $ certainType=let_mut:i32
 }
 
 pub fn patterns_in_function_parameters() {
@@ -766,13 +779,13 @@ pub fn patterns_in_function_parameters() {
 
     // Call the functions to use them
     let point = Point { x: 5, y: 10 };
-    let extracted = extract_point(point); // $ target=extract_point type=extracted:0(2).i32 type=extracted:1(2).i32
+    let extracted = extract_point(point); // $ target=extract_point certainType=extracted:0(2).i32 certainType=extracted:1(2).i32
 
     let color = Color(200, 100, 50);
-    let red = extract_color(color); // $ target=extract_color type=red:u8
+    let red = extract_color(color); // $ target=extract_color certainType=red:u8
 
     let tuple = (42i32, 3.14f64, true);
-    let tuple_extracted = extract_tuple(tuple); // $ target=extract_tuple type=tuple_extracted:0(2).i32 type=tuple_extracted:1(2).bool
+    let tuple_extracted = extract_tuple(tuple); // $ target=extract_tuple certainType=tuple_extracted:0(2).i32 certainType=tuple_extracted:1(2).bool
 }
 
 #[rustfmt::skip]
diff --git a/rust/ql/test/library-tests/type-inference/type-inference.expected b/rust/ql/test/library-tests/type-inference/type-inference.expected
index 8955edb614f..99ab4b1e770 100644
--- a/rust/ql/test/library-tests/type-inference/type-inference.expected
+++ b/rust/ql/test/library-tests/type-inference/type-inference.expected
@@ -1,4 +1,333 @@
 inferType
+| blanket_impl.rs:15:18:15:22 | SelfParam |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:15:18:15:22 | SelfParam | &T | blanket_impl.rs:9:5:10:14 | S2 |
+| blanket_impl.rs:15:42:17:9 | { ... } |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:15:42:17:9 | { ... } | &T | blanket_impl.rs:6:5:7:14 | S1 |
+| blanket_impl.rs:16:13:16:15 | &S1 |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:16:13:16:15 | &S1 | &T | blanket_impl.rs:6:5:7:14 | S1 |
+| blanket_impl.rs:16:14:16:15 | S1 |  | blanket_impl.rs:6:5:7:14 | S1 |
+| blanket_impl.rs:21:19:21:23 | SelfParam |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:21:19:21:23 | SelfParam | &T | blanket_impl.rs:20:5:22:5 | Self [trait Clone1] |
+| blanket_impl.rs:25:22:25:26 | SelfParam |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:25:22:25:26 | SelfParam | &T | blanket_impl.rs:24:5:28:5 | Self [trait Duplicatable] |
+| blanket_impl.rs:32:19:32:23 | SelfParam |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:32:19:32:23 | SelfParam | &T | blanket_impl.rs:6:5:7:14 | S1 |
+| blanket_impl.rs:32:34:34:9 | { ... } |  | blanket_impl.rs:6:5:7:14 | S1 |
+| blanket_impl.rs:33:13:33:17 | * ... |  | blanket_impl.rs:6:5:7:14 | S1 |
+| blanket_impl.rs:33:14:33:17 | self |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:33:14:33:17 | self | &T | blanket_impl.rs:6:5:7:14 | S1 |
+| blanket_impl.rs:40:22:40:26 | SelfParam |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:40:22:40:26 | SelfParam | &T | blanket_impl.rs:38:10:38:18 | T |
+| blanket_impl.rs:40:37:42:9 | { ... } |  | blanket_impl.rs:38:10:38:18 | T |
+| blanket_impl.rs:41:13:41:16 | self |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:41:13:41:16 | self | &T | blanket_impl.rs:38:10:38:18 | T |
+| blanket_impl.rs:41:13:41:25 | self.clone1() |  | blanket_impl.rs:38:10:38:18 | T |
+| blanket_impl.rs:45:33:60:5 | { ... } |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:46:13:46:14 | x1 |  | blanket_impl.rs:6:5:7:14 | S1 |
+| blanket_impl.rs:46:18:46:19 | S1 |  | blanket_impl.rs:6:5:7:14 | S1 |
+| blanket_impl.rs:46:18:46:28 | S1.clone1() |  | blanket_impl.rs:6:5:7:14 | S1 |
+| blanket_impl.rs:47:18:47:25 | "{x1:?}\\n" |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:47:18:47:25 | "{x1:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| blanket_impl.rs:47:18:47:25 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:47:18:47:25 | { ... } |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:47:20:47:21 | x1 |  | blanket_impl.rs:6:5:7:14 | S1 |
+| blanket_impl.rs:48:13:48:14 | x2 |  | blanket_impl.rs:6:5:7:14 | S1 |
+| blanket_impl.rs:48:18:48:22 | (...) |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:48:18:48:22 | (...) | &T | blanket_impl.rs:6:5:7:14 | S1 |
+| blanket_impl.rs:48:18:48:31 | ... .clone1() |  | blanket_impl.rs:6:5:7:14 | S1 |
+| blanket_impl.rs:48:19:48:21 | &S1 |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:48:19:48:21 | &S1 | &T | blanket_impl.rs:6:5:7:14 | S1 |
+| blanket_impl.rs:48:20:48:21 | S1 |  | blanket_impl.rs:6:5:7:14 | S1 |
+| blanket_impl.rs:49:18:49:25 | "{x2:?}\\n" |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:49:18:49:25 | "{x2:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| blanket_impl.rs:49:18:49:25 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:49:18:49:25 | { ... } |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:49:20:49:21 | x2 |  | blanket_impl.rs:6:5:7:14 | S1 |
+| blanket_impl.rs:50:13:50:14 | x3 |  | blanket_impl.rs:6:5:7:14 | S1 |
+| blanket_impl.rs:50:18:50:19 | S1 |  | blanket_impl.rs:6:5:7:14 | S1 |
+| blanket_impl.rs:50:18:50:31 | S1.duplicate() |  | blanket_impl.rs:6:5:7:14 | S1 |
+| blanket_impl.rs:51:18:51:25 | "{x3:?}\\n" |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:51:18:51:25 | "{x3:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| blanket_impl.rs:51:18:51:25 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:51:18:51:25 | { ... } |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:51:20:51:21 | x3 |  | blanket_impl.rs:6:5:7:14 | S1 |
+| blanket_impl.rs:52:13:52:14 | x4 |  | blanket_impl.rs:6:5:7:14 | S1 |
+| blanket_impl.rs:52:18:52:22 | (...) |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:52:18:52:22 | (...) | &T | blanket_impl.rs:6:5:7:14 | S1 |
+| blanket_impl.rs:52:18:52:34 | ... .duplicate() |  | blanket_impl.rs:6:5:7:14 | S1 |
+| blanket_impl.rs:52:19:52:21 | &S1 |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:52:19:52:21 | &S1 | &T | blanket_impl.rs:6:5:7:14 | S1 |
+| blanket_impl.rs:52:20:52:21 | S1 |  | blanket_impl.rs:6:5:7:14 | S1 |
+| blanket_impl.rs:53:18:53:25 | "{x4:?}\\n" |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:53:18:53:25 | "{x4:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| blanket_impl.rs:53:18:53:25 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:53:18:53:25 | { ... } |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:53:20:53:21 | x4 |  | blanket_impl.rs:6:5:7:14 | S1 |
+| blanket_impl.rs:54:13:54:14 | x5 |  | blanket_impl.rs:6:5:7:14 | S1 |
+| blanket_impl.rs:54:18:54:35 | ...::duplicate(...) |  | blanket_impl.rs:6:5:7:14 | S1 |
+| blanket_impl.rs:54:32:54:34 | &S1 |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:54:32:54:34 | &S1 | &T | blanket_impl.rs:6:5:7:14 | S1 |
+| blanket_impl.rs:54:33:54:34 | S1 |  | blanket_impl.rs:6:5:7:14 | S1 |
+| blanket_impl.rs:55:18:55:25 | "{x5:?}\\n" |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:55:18:55:25 | "{x5:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| blanket_impl.rs:55:18:55:25 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:55:18:55:25 | { ... } |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:55:20:55:21 | x5 |  | blanket_impl.rs:6:5:7:14 | S1 |
+| blanket_impl.rs:56:18:56:19 | S2 |  | blanket_impl.rs:9:5:10:14 | S2 |
+| blanket_impl.rs:57:18:57:25 | "{x6:?}\\n" |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:57:18:57:25 | "{x6:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| blanket_impl.rs:57:18:57:25 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:57:18:57:25 | { ... } |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:58:18:58:22 | (...) |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:58:18:58:22 | (...) | &T | blanket_impl.rs:9:5:10:14 | S2 |
+| blanket_impl.rs:58:19:58:21 | &S2 |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:58:19:58:21 | &S2 | &T | blanket_impl.rs:9:5:10:14 | S2 |
+| blanket_impl.rs:58:20:58:21 | S2 |  | blanket_impl.rs:9:5:10:14 | S2 |
+| blanket_impl.rs:59:18:59:25 | "{x7:?}\\n" |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:59:18:59:25 | "{x7:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| blanket_impl.rs:59:18:59:25 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:59:18:59:25 | { ... } |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:68:24:68:24 | x |  | {EXTERNAL LOCATION} | i64 |
+| blanket_impl.rs:68:32:68:32 | y |  | blanket_impl.rs:67:5:69:5 | Self [trait Trait1] |
+| blanket_impl.rs:72:24:72:24 | x |  | {EXTERNAL LOCATION} | i64 |
+| blanket_impl.rs:72:32:72:32 | y |  | blanket_impl.rs:71:5:73:5 | Self [trait Trait2] |
+| blanket_impl.rs:77:24:77:24 | x |  | {EXTERNAL LOCATION} | i64 |
+| blanket_impl.rs:77:32:77:32 | y |  | blanket_impl.rs:64:5:65:14 | S1 |
+| blanket_impl.rs:77:49:79:9 | { ... } |  | blanket_impl.rs:64:5:65:14 | S1 |
+| blanket_impl.rs:78:13:78:13 | y |  | blanket_impl.rs:64:5:65:14 | S1 |
+| blanket_impl.rs:84:24:84:24 | x |  | {EXTERNAL LOCATION} | i64 |
+| blanket_impl.rs:84:32:84:32 | y |  | blanket_impl.rs:82:10:82:18 | T |
+| blanket_impl.rs:84:49:86:9 | { ... } |  | blanket_impl.rs:82:10:82:18 | T |
+| blanket_impl.rs:85:13:85:32 | ...::assoc_func1(...) |  | blanket_impl.rs:82:10:82:18 | T |
+| blanket_impl.rs:85:28:85:28 | x |  | {EXTERNAL LOCATION} | i64 |
+| blanket_impl.rs:85:31:85:31 | y |  | blanket_impl.rs:82:10:82:18 | T |
+| blanket_impl.rs:89:33:98:5 | { ... } |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:90:13:90:14 | x1 |  | blanket_impl.rs:64:5:65:14 | S1 |
+| blanket_impl.rs:90:18:90:39 | ...::assoc_func1(...) |  | blanket_impl.rs:64:5:65:14 | S1 |
+| blanket_impl.rs:90:34:90:34 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| blanket_impl.rs:90:37:90:38 | S1 |  | blanket_impl.rs:64:5:65:14 | S1 |
+| blanket_impl.rs:91:18:91:25 | "{x1:?}\\n" |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:91:18:91:25 | "{x1:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| blanket_impl.rs:91:18:91:25 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:91:18:91:25 | { ... } |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:91:20:91:21 | x1 |  | blanket_impl.rs:64:5:65:14 | S1 |
+| blanket_impl.rs:92:13:92:14 | x2 |  | blanket_impl.rs:64:5:65:14 | S1 |
+| blanket_impl.rs:92:18:92:43 | ...::assoc_func1(...) |  | blanket_impl.rs:64:5:65:14 | S1 |
+| blanket_impl.rs:92:38:92:38 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| blanket_impl.rs:92:41:92:42 | S1 |  | blanket_impl.rs:64:5:65:14 | S1 |
+| blanket_impl.rs:93:18:93:25 | "{x2:?}\\n" |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:93:18:93:25 | "{x2:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| blanket_impl.rs:93:18:93:25 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:93:18:93:25 | { ... } |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:93:20:93:21 | x2 |  | blanket_impl.rs:64:5:65:14 | S1 |
+| blanket_impl.rs:94:13:94:14 | x3 |  | blanket_impl.rs:64:5:65:14 | S1 |
+| blanket_impl.rs:94:18:94:39 | ...::assoc_func2(...) |  | blanket_impl.rs:64:5:65:14 | S1 |
+| blanket_impl.rs:94:34:94:34 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| blanket_impl.rs:94:37:94:38 | S1 |  | blanket_impl.rs:64:5:65:14 | S1 |
+| blanket_impl.rs:95:18:95:25 | "{x3:?}\\n" |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:95:18:95:25 | "{x3:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| blanket_impl.rs:95:18:95:25 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:95:18:95:25 | { ... } |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:95:20:95:21 | x3 |  | blanket_impl.rs:64:5:65:14 | S1 |
+| blanket_impl.rs:96:13:96:14 | x4 |  | blanket_impl.rs:64:5:65:14 | S1 |
+| blanket_impl.rs:96:18:96:43 | ...::assoc_func2(...) |  | blanket_impl.rs:64:5:65:14 | S1 |
+| blanket_impl.rs:96:38:96:38 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| blanket_impl.rs:96:41:96:42 | S1 |  | blanket_impl.rs:64:5:65:14 | S1 |
+| blanket_impl.rs:97:18:97:25 | "{x4:?}\\n" |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:97:18:97:25 | "{x4:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| blanket_impl.rs:97:18:97:25 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:97:18:97:25 | { ... } |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:97:20:97:21 | x4 |  | blanket_impl.rs:64:5:65:14 | S1 |
+| blanket_impl.rs:108:22:108:26 | SelfParam |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:108:22:108:26 | SelfParam | &T | blanket_impl.rs:107:5:109:5 | Self [trait Flag] |
+| blanket_impl.rs:112:26:112:30 | SelfParam |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:112:26:112:30 | SelfParam | &T | blanket_impl.rs:111:5:113:5 | Self [trait TryFlag] |
+| blanket_impl.rs:119:26:119:30 | SelfParam |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:119:26:119:30 | SelfParam | &T | blanket_impl.rs:115:10:115:11 | Fl |
+| blanket_impl.rs:119:49:121:9 | { ... } |  | {EXTERNAL LOCATION} | Option |
+| blanket_impl.rs:119:49:121:9 | { ... } | T | {EXTERNAL LOCATION} | bool |
+| blanket_impl.rs:120:13:120:34 | Some(...) |  | {EXTERNAL LOCATION} | Option |
+| blanket_impl.rs:120:13:120:34 | Some(...) | T | {EXTERNAL LOCATION} | bool |
+| blanket_impl.rs:120:18:120:21 | self |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:120:18:120:21 | self | &T | blanket_impl.rs:115:10:115:11 | Fl |
+| blanket_impl.rs:120:18:120:33 | self.read_flag() |  | {EXTERNAL LOCATION} | bool |
+| blanket_impl.rs:126:32:126:36 | SelfParam |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:126:32:126:36 | SelfParam | &T | blanket_impl.rs:124:5:129:5 | Self [trait TryFlagExt] |
+| blanket_impl.rs:126:55:128:9 | { ... } |  | {EXTERNAL LOCATION} | Option |
+| blanket_impl.rs:126:55:128:9 | { ... } | T | {EXTERNAL LOCATION} | bool |
+| blanket_impl.rs:127:13:127:16 | self |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:127:13:127:16 | self | &T | blanket_impl.rs:124:5:129:5 | Self [trait TryFlagExt] |
+| blanket_impl.rs:127:13:127:32 | self.try_read_flag() |  | {EXTERNAL LOCATION} | Option |
+| blanket_impl.rs:127:13:127:32 | self.try_read_flag() | T | {EXTERNAL LOCATION} | bool |
+| blanket_impl.rs:135:32:135:36 | SelfParam |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:135:32:135:36 | SelfParam | &T | blanket_impl.rs:133:5:136:5 | Self [trait AnotherTryFlag] |
+| blanket_impl.rs:144:26:144:30 | SelfParam |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:144:26:144:30 | SelfParam | &T | blanket_impl.rs:138:5:140:5 | MyTryFlag |
+| blanket_impl.rs:144:49:146:9 | { ... } |  | {EXTERNAL LOCATION} | Option |
+| blanket_impl.rs:144:49:146:9 | { ... } | T | {EXTERNAL LOCATION} | bool |
+| blanket_impl.rs:145:13:145:27 | Some(...) |  | {EXTERNAL LOCATION} | Option |
+| blanket_impl.rs:145:13:145:27 | Some(...) | T | {EXTERNAL LOCATION} | bool |
+| blanket_impl.rs:145:18:145:21 | self |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:145:18:145:21 | self | &T | blanket_impl.rs:138:5:140:5 | MyTryFlag |
+| blanket_impl.rs:145:18:145:26 | self.flag |  | {EXTERNAL LOCATION} | bool |
+| blanket_impl.rs:155:22:155:26 | SelfParam |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:155:22:155:26 | SelfParam | &T | blanket_impl.rs:149:5:151:5 | MyFlag |
+| blanket_impl.rs:155:37:157:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
+| blanket_impl.rs:156:13:156:16 | self |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:156:13:156:16 | self | &T | blanket_impl.rs:149:5:151:5 | MyFlag |
+| blanket_impl.rs:156:13:156:21 | self.flag |  | {EXTERNAL LOCATION} | bool |
+| blanket_impl.rs:166:32:166:36 | SelfParam |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:166:32:166:36 | SelfParam | &T | blanket_impl.rs:160:5:162:5 | MyOtherFlag |
+| blanket_impl.rs:166:55:168:9 | { ... } |  | {EXTERNAL LOCATION} | Option |
+| blanket_impl.rs:166:55:168:9 | { ... } | T | {EXTERNAL LOCATION} | bool |
+| blanket_impl.rs:167:13:167:27 | Some(...) |  | {EXTERNAL LOCATION} | Option |
+| blanket_impl.rs:167:13:167:27 | Some(...) | T | {EXTERNAL LOCATION} | bool |
+| blanket_impl.rs:167:18:167:21 | self |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:167:18:167:21 | self | &T | blanket_impl.rs:160:5:162:5 | MyOtherFlag |
+| blanket_impl.rs:167:18:167:26 | self.flag |  | {EXTERNAL LOCATION} | bool |
+| blanket_impl.rs:171:15:184:5 | { ... } |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:172:13:172:23 | my_try_flag |  | blanket_impl.rs:138:5:140:5 | MyTryFlag |
+| blanket_impl.rs:172:27:172:50 | MyTryFlag {...} |  | blanket_impl.rs:138:5:140:5 | MyTryFlag |
+| blanket_impl.rs:172:45:172:48 | true |  | {EXTERNAL LOCATION} | bool |
+| blanket_impl.rs:173:13:173:18 | result |  | {EXTERNAL LOCATION} | Option |
+| blanket_impl.rs:173:13:173:18 | result | T | {EXTERNAL LOCATION} | bool |
+| blanket_impl.rs:173:22:173:32 | my_try_flag |  | blanket_impl.rs:138:5:140:5 | MyTryFlag |
+| blanket_impl.rs:173:22:173:54 | my_try_flag.try_read_flag_twice() |  | {EXTERNAL LOCATION} | Option |
+| blanket_impl.rs:173:22:173:54 | my_try_flag.try_read_flag_twice() | T | {EXTERNAL LOCATION} | bool |
+| blanket_impl.rs:175:13:175:19 | my_flag |  | blanket_impl.rs:149:5:151:5 | MyFlag |
+| blanket_impl.rs:175:23:175:43 | MyFlag {...} |  | blanket_impl.rs:149:5:151:5 | MyFlag |
+| blanket_impl.rs:175:38:175:41 | true |  | {EXTERNAL LOCATION} | bool |
+| blanket_impl.rs:178:22:178:28 | my_flag |  | blanket_impl.rs:149:5:151:5 | MyFlag |
+| blanket_impl.rs:180:13:180:25 | my_other_flag |  | blanket_impl.rs:160:5:162:5 | MyOtherFlag |
+| blanket_impl.rs:180:29:180:54 | MyOtherFlag {...} |  | blanket_impl.rs:160:5:162:5 | MyOtherFlag |
+| blanket_impl.rs:180:49:180:52 | true |  | {EXTERNAL LOCATION} | bool |
+| blanket_impl.rs:183:13:183:18 | result |  | {EXTERNAL LOCATION} | Option |
+| blanket_impl.rs:183:13:183:18 | result | T | {EXTERNAL LOCATION} | bool |
+| blanket_impl.rs:183:22:183:34 | my_other_flag |  | blanket_impl.rs:160:5:162:5 | MyOtherFlag |
+| blanket_impl.rs:183:22:183:56 | my_other_flag.try_read_flag_twice() |  | {EXTERNAL LOCATION} | Option |
+| blanket_impl.rs:183:22:183:56 | my_other_flag.try_read_flag_twice() | T | {EXTERNAL LOCATION} | bool |
+| blanket_impl.rs:196:15:196:18 | SelfParam |  | blanket_impl.rs:194:5:197:5 | Self [trait MyTrait1] |
+| blanket_impl.rs:201:15:201:18 | SelfParam |  | blanket_impl.rs:199:5:202:5 | Self [trait MyTrait2] |
+| blanket_impl.rs:206:15:206:18 | SelfParam |  | blanket_impl.rs:204:5:207:5 | Self [trait MyTrait3] |
+| blanket_impl.rs:211:15:211:18 | SelfParam |  | blanket_impl.rs:209:5:212:5 | Self [trait MyTrait4a] |
+| blanket_impl.rs:216:15:216:18 | SelfParam |  | blanket_impl.rs:214:5:217:5 | Self [trait MyTrait4b] |
+| blanket_impl.rs:221:15:221:18 | SelfParam |  | blanket_impl.rs:188:5:189:14 | S1 |
+| blanket_impl.rs:221:21:221:22 | { ... } |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:226:15:226:18 | SelfParam |  | blanket_impl.rs:188:5:189:14 | S1 |
+| blanket_impl.rs:226:21:226:22 | { ... } |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:231:15:231:18 | SelfParam |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:231:15:231:18 | SelfParam | &T | blanket_impl.rs:229:10:229:27 | T |
+| blanket_impl.rs:231:21:233:9 | { ... } |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:232:13:232:16 | self |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:232:13:232:16 | self | &T | blanket_impl.rs:229:10:229:27 | T |
+| blanket_impl.rs:232:13:232:21 | self.m1() |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:238:15:238:18 | SelfParam |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:238:15:238:18 | SelfParam | &T | file://:0:0:0:0 | & |
+| blanket_impl.rs:238:15:238:18 | SelfParam | &T.&T | blanket_impl.rs:188:5:189:14 | S1 |
+| blanket_impl.rs:238:21:240:9 | { ... } |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:239:13:239:16 | self |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:239:13:239:16 | self | &T | file://:0:0:0:0 | & |
+| blanket_impl.rs:239:13:239:16 | self | &T.&T | blanket_impl.rs:188:5:189:14 | S1 |
+| blanket_impl.rs:239:13:239:21 | self.m1() |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:245:15:245:18 | SelfParam |  | blanket_impl.rs:243:10:243:20 | T |
+| blanket_impl.rs:245:21:247:9 | { ... } |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:246:13:246:16 | self |  | blanket_impl.rs:243:10:243:20 | T |
+| blanket_impl.rs:246:13:246:21 | self.m3() |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:252:15:252:18 | SelfParam |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:252:15:252:18 | SelfParam | &T | blanket_impl.rs:250:10:250:10 | T |
+| blanket_impl.rs:252:21:252:22 | { ... } |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:255:33:263:5 | { ... } |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:256:13:256:14 | x1 |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:256:18:256:19 | S1 |  | blanket_impl.rs:188:5:189:14 | S1 |
+| blanket_impl.rs:256:18:256:24 | S1.m1() |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:257:13:257:14 | x2 |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:257:18:257:22 | (...) |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:257:18:257:22 | (...) | &T | blanket_impl.rs:188:5:189:14 | S1 |
+| blanket_impl.rs:257:18:257:27 | ... .m2() |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:257:19:257:21 | &S1 |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:257:19:257:21 | &S1 | &T | blanket_impl.rs:188:5:189:14 | S1 |
+| blanket_impl.rs:257:20:257:21 | S1 |  | blanket_impl.rs:188:5:189:14 | S1 |
+| blanket_impl.rs:258:13:258:14 | x3 |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:258:18:258:23 | (...) |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:258:18:258:23 | (...) | &T | file://:0:0:0:0 | & |
+| blanket_impl.rs:258:18:258:23 | (...) | &T.&T | blanket_impl.rs:188:5:189:14 | S1 |
+| blanket_impl.rs:258:18:258:28 | ... .m2() |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:258:19:258:22 | &... |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:258:19:258:22 | &... | &T | file://:0:0:0:0 | & |
+| blanket_impl.rs:258:19:258:22 | &... | &T.&T | blanket_impl.rs:188:5:189:14 | S1 |
+| blanket_impl.rs:258:20:258:22 | &S1 |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:258:20:258:22 | &S1 | &T | blanket_impl.rs:188:5:189:14 | S1 |
+| blanket_impl.rs:258:21:258:22 | S1 |  | blanket_impl.rs:188:5:189:14 | S1 |
+| blanket_impl.rs:259:13:259:14 | x4 |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:259:18:259:19 | S1 |  | blanket_impl.rs:188:5:189:14 | S1 |
+| blanket_impl.rs:259:18:259:24 | S1.m4() |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:260:13:260:14 | x5 |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:260:18:260:22 | (...) |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:260:18:260:22 | (...) | &T | blanket_impl.rs:188:5:189:14 | S1 |
+| blanket_impl.rs:260:18:260:27 | ... .m4() |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:260:19:260:21 | &S1 |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:260:19:260:21 | &S1 | &T | blanket_impl.rs:188:5:189:14 | S1 |
+| blanket_impl.rs:260:20:260:21 | S1 |  | blanket_impl.rs:188:5:189:14 | S1 |
+| blanket_impl.rs:261:13:261:14 | x6 |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:261:18:261:19 | S2 |  | blanket_impl.rs:191:5:192:14 | S2 |
+| blanket_impl.rs:261:18:261:24 | S2.m4() |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:262:13:262:14 | x7 |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:262:18:262:22 | (...) |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:262:18:262:22 | (...) | &T | blanket_impl.rs:191:5:192:14 | S2 |
+| blanket_impl.rs:262:18:262:27 | ... .m4() |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:262:19:262:21 | &S2 |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:262:19:262:21 | &S2 | &T | blanket_impl.rs:191:5:192:14 | S2 |
+| blanket_impl.rs:262:20:262:21 | S2 |  | blanket_impl.rs:191:5:192:14 | S2 |
+| blanket_impl.rs:272:21:272:25 | SelfParam |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:272:21:272:25 | SelfParam | &T | blanket_impl.rs:271:5:274:5 | Self [trait Executor] |
+| blanket_impl.rs:273:24:273:28 | SelfParam |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:273:24:273:28 | SelfParam | &T | blanket_impl.rs:271:5:274:5 | Self [trait Executor] |
+| blanket_impl.rs:273:31:273:35 | query |  | blanket_impl.rs:273:21:273:21 | E |
+| blanket_impl.rs:277:21:277:25 | SelfParam |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:277:21:277:25 | SelfParam | &T | blanket_impl.rs:276:10:276:22 | T |
+| blanket_impl.rs:277:28:279:9 | { ... } |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:278:22:278:41 | "Executor::execute1\\n" |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:278:22:278:41 | "Executor::execute1\\n" | &T | {EXTERNAL LOCATION} | str |
+| blanket_impl.rs:278:22:278:41 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:278:22:278:41 | { ... } |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:281:24:281:28 | SelfParam |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:281:24:281:28 | SelfParam | &T | blanket_impl.rs:276:10:276:22 | T |
+| blanket_impl.rs:281:31:281:36 | _query |  | blanket_impl.rs:281:21:281:21 | E |
+| blanket_impl.rs:281:42:283:9 | { ... } |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:282:22:282:41 | "Executor::execute2\\n" |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:282:22:282:41 | "Executor::execute2\\n" | &T | {EXTERNAL LOCATION} | str |
+| blanket_impl.rs:282:22:282:41 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:282:22:282:41 | { ... } |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:290:16:300:5 | { ... } |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:291:13:291:13 | c |  | blanket_impl.rs:286:5:286:29 | MySqlConnection |
+| blanket_impl.rs:291:17:291:34 | MySqlConnection {...} |  | blanket_impl.rs:286:5:286:29 | MySqlConnection |
+| blanket_impl.rs:293:9:293:9 | c |  | blanket_impl.rs:286:5:286:29 | MySqlConnection |
+| blanket_impl.rs:293:9:293:20 | c.execute1() |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:294:9:294:37 | ...::execute1(...) |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:294:35:294:36 | &c |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:294:35:294:36 | &c | &T | blanket_impl.rs:286:5:286:29 | MySqlConnection |
+| blanket_impl.rs:294:36:294:36 | c |  | blanket_impl.rs:286:5:286:29 | MySqlConnection |
+| blanket_impl.rs:296:9:296:9 | c |  | blanket_impl.rs:286:5:286:29 | MySqlConnection |
+| blanket_impl.rs:296:9:296:41 | c.execute2(...) |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:296:20:296:40 | "SELECT * FROM users" |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:296:20:296:40 | "SELECT * FROM users" | &T | {EXTERNAL LOCATION} | str |
+| blanket_impl.rs:297:9:297:9 | c |  | blanket_impl.rs:286:5:286:29 | MySqlConnection |
+| blanket_impl.rs:297:9:297:49 | c.execute2(...) |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:297:28:297:48 | "SELECT * FROM users" |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:297:28:297:48 | "SELECT * FROM users" | &T | {EXTERNAL LOCATION} | str |
+| blanket_impl.rs:298:9:298:60 | ...::execute2(...) |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:298:35:298:36 | &c |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:298:35:298:36 | &c | &T | blanket_impl.rs:286:5:286:29 | MySqlConnection |
+| blanket_impl.rs:298:36:298:36 | c |  | blanket_impl.rs:286:5:286:29 | MySqlConnection |
+| blanket_impl.rs:298:39:298:59 | "SELECT * FROM users" |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:298:39:298:59 | "SELECT * FROM users" | &T | {EXTERNAL LOCATION} | str |
+| blanket_impl.rs:299:9:299:68 | ...::execute2::<...>(...) |  | file://:0:0:0:0 | () |
+| blanket_impl.rs:299:43:299:44 | &c |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:299:43:299:44 | &c | &T | blanket_impl.rs:286:5:286:29 | MySqlConnection |
+| blanket_impl.rs:299:44:299:44 | c |  | blanket_impl.rs:286:5:286:29 | MySqlConnection |
+| blanket_impl.rs:299:47:299:67 | "SELECT * FROM users" |  | file://:0:0:0:0 | & |
+| blanket_impl.rs:299:47:299:67 | "SELECT * FROM users" | &T | {EXTERNAL LOCATION} | str |
+| closure.rs:4:19:31:5 | { ... } |  | file://:0:0:0:0 | () |
 | closure.rs:6:13:6:22 | my_closure |  | {EXTERNAL LOCATION} | dyn FnOnce |
 | closure.rs:6:13:6:22 | my_closure | dyn(Args) | file://:0:0:0:0 | (T_2) |
 | closure.rs:6:13:6:22 | my_closure | dyn(Args).0(2) | {EXTERNAL LOCATION} | bool |
@@ -101,11 +430,13 @@ inferType
 | closure.rs:30:25:30:32 | id2(...) |  | {EXTERNAL LOCATION} | bool |
 | closure.rs:30:29:30:31 | arg |  | {EXTERNAL LOCATION} | bool |
 | closure.rs:35:44:35:44 | f |  | closure.rs:35:20:35:41 | F |
+| closure.rs:35:50:37:5 | { ... } |  | file://:0:0:0:0 | () |
 | closure.rs:36:13:36:19 | _return |  | {EXTERNAL LOCATION} | i64 |
 | closure.rs:36:23:36:23 | f |  | closure.rs:35:20:35:41 | F |
 | closure.rs:36:23:36:29 | f(...) |  | {EXTERNAL LOCATION} | i64 |
 | closure.rs:36:25:36:28 | true |  | {EXTERNAL LOCATION} | bool |
 | closure.rs:39:46:39:46 | f |  | closure.rs:39:22:39:43 | F |
+| closure.rs:39:52:42:5 | { ... } |  | file://:0:0:0:0 | () |
 | closure.rs:40:13:40:15 | arg |  | {EXTERNAL LOCATION} | bool |
 | closure.rs:40:19:40:36 | ...::default(...) |  | {EXTERNAL LOCATION} | bool |
 | closure.rs:41:9:41:9 | f |  | closure.rs:39:22:39:43 | F |
@@ -117,12 +448,13 @@ inferType
 | closure.rs:45:9:45:9 | f |  | closure.rs:44:20:44:36 | F |
 | closure.rs:45:9:45:12 | f(...) |  | closure.rs:44:17:44:17 | B |
 | closure.rs:45:11:45:11 | a |  | closure.rs:44:14:44:14 | A |
-| closure.rs:48:18:48:18 | f |  | closure.rs:48:21:48:43 | ImplTraitTypeRepr |
+| closure.rs:48:18:48:18 | f |  | closure.rs:48:21:48:43 | impl ... |
 | closure.rs:48:53:50:5 | { ... } |  | {EXTERNAL LOCATION} | i64 |
-| closure.rs:49:9:49:9 | f |  | closure.rs:48:21:48:43 | ImplTraitTypeRepr |
+| closure.rs:49:9:49:9 | f |  | closure.rs:48:21:48:43 | impl ... |
 | closure.rs:49:9:49:12 | f(...) |  | {EXTERNAL LOCATION} | i64 |
 | closure.rs:49:11:49:11 | 2 |  | {EXTERNAL LOCATION} | i32 |
 | closure.rs:49:11:49:11 | 2 |  | {EXTERNAL LOCATION} | i64 |
+| closure.rs:52:15:64:5 | { ... } |  | file://:0:0:0:0 | () |
 | closure.rs:53:13:53:13 | f |  | {EXTERNAL LOCATION} | dyn FnOnce |
 | closure.rs:53:13:53:13 | f | dyn(Args) | file://:0:0:0:0 | (T_1) |
 | closure.rs:53:13:53:13 | f | dyn(Args).0(1) | {EXTERNAL LOCATION} | bool |
@@ -183,6 +515,7 @@ inferType
 | closure.rs:72:30:72:30 | f | T.dyn(Args).0(1) | closure.rs:72:24:72:24 | A |
 | closure.rs:72:30:72:30 | f | T.dyn(Output) | closure.rs:72:27:72:27 | B |
 | closure.rs:72:58:72:60 | arg |  | closure.rs:72:24:72:24 | A |
+| closure.rs:72:66:75:5 | { ... } |  | file://:0:0:0:0 | () |
 | closure.rs:73:13:73:15 | _r1 |  | closure.rs:72:27:72:27 | B |
 | closure.rs:73:19:73:37 | apply_boxed(...) |  | closure.rs:72:27:72:27 | B |
 | closure.rs:73:31:73:31 | f |  | {EXTERNAL LOCATION} | Box |
@@ -207,7 +540,6 @@ inferType
 | closure.rs:74:41:74:41 | _ |  | {EXTERNAL LOCATION} | i64 |
 | closure.rs:74:49:74:52 | true |  | {EXTERNAL LOCATION} | bool |
 | closure.rs:74:56:74:56 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| closure.rs:74:56:74:56 | 3 |  | {EXTERNAL LOCATION} | i64 |
 | dereference.rs:12:14:12:18 | SelfParam |  | file://:0:0:0:0 | & |
 | dereference.rs:12:14:12:18 | SelfParam | &T | dereference.rs:4:1:6:1 | MyIntPointer |
 | dereference.rs:12:29:14:5 | { ... } |  | file://:0:0:0:0 | & |
@@ -228,217 +560,342 @@ inferType
 | dereference.rs:26:10:26:13 | self | &T | dereference.rs:17:1:19:1 | MySmartPointer |
 | dereference.rs:26:10:26:13 | self | &T.T | dereference.rs:21:6:21:6 | T |
 | dereference.rs:26:10:26:19 | self.value |  | dereference.rs:21:6:21:6 | T |
-| dereference.rs:32:9:32:10 | a1 |  | dereference.rs:4:1:6:1 | MyIntPointer |
-| dereference.rs:32:14:32:42 | MyIntPointer {...} |  | dereference.rs:4:1:6:1 | MyIntPointer |
-| dereference.rs:32:36:32:40 | 34i64 |  | {EXTERNAL LOCATION} | i64 |
-| dereference.rs:33:9:33:11 | _b1 |  | file://:0:0:0:0 | & |
-| dereference.rs:33:9:33:11 | _b1 | &T | {EXTERNAL LOCATION} | i64 |
-| dereference.rs:33:15:33:16 | a1 |  | dereference.rs:4:1:6:1 | MyIntPointer |
-| dereference.rs:33:15:33:24 | a1.deref() |  | file://:0:0:0:0 | & |
-| dereference.rs:33:15:33:24 | a1.deref() | &T | {EXTERNAL LOCATION} | i64 |
-| dereference.rs:36:9:36:10 | a2 |  | dereference.rs:4:1:6:1 | MyIntPointer |
-| dereference.rs:36:14:36:42 | MyIntPointer {...} |  | dereference.rs:4:1:6:1 | MyIntPointer |
-| dereference.rs:36:36:36:40 | 34i64 |  | {EXTERNAL LOCATION} | i64 |
-| dereference.rs:37:9:37:11 | _b2 |  | {EXTERNAL LOCATION} | i64 |
-| dereference.rs:37:15:37:17 | * ... |  | {EXTERNAL LOCATION} | i64 |
-| dereference.rs:37:16:37:17 | a2 |  | dereference.rs:4:1:6:1 | MyIntPointer |
-| dereference.rs:40:9:40:10 | a3 |  | dereference.rs:4:1:6:1 | MyIntPointer |
+| dereference.rs:33:12:33:16 | SelfParam |  | file://:0:0:0:0 | & |
+| dereference.rs:33:12:33:16 | SelfParam | &T | dereference.rs:30:1:30:15 | S |
+| dereference.rs:33:12:33:16 | SelfParam | &T.T | dereference.rs:32:6:32:6 | T |
+| dereference.rs:33:25:35:5 | { ... } |  | file://:0:0:0:0 | & |
+| dereference.rs:33:25:35:5 | { ... } | &T | dereference.rs:32:6:32:6 | T |
+| dereference.rs:34:9:34:15 | &... |  | file://:0:0:0:0 | & |
+| dereference.rs:34:9:34:15 | &... | &T | dereference.rs:32:6:32:6 | T |
+| dereference.rs:34:10:34:13 | self |  | file://:0:0:0:0 | & |
+| dereference.rs:34:10:34:13 | self | &T | dereference.rs:30:1:30:15 | S |
+| dereference.rs:34:10:34:13 | self | &T.T | dereference.rs:32:6:32:6 | T |
+| dereference.rs:34:10:34:15 | self.0 |  | dereference.rs:32:6:32:6 | T |
+| dereference.rs:38:39:50:1 | { ... } |  | file://:0:0:0:0 | () |
+| dereference.rs:40:9:40:10 | a1 |  | dereference.rs:4:1:6:1 | MyIntPointer |
 | dereference.rs:40:14:40:42 | MyIntPointer {...} |  | dereference.rs:4:1:6:1 | MyIntPointer |
 | dereference.rs:40:36:40:40 | 34i64 |  | {EXTERNAL LOCATION} | i64 |
-| dereference.rs:41:9:41:11 | _b3 |  | {EXTERNAL LOCATION} | bool |
-| dereference.rs:41:15:41:19 | (...) |  | {EXTERNAL LOCATION} | i64 |
-| dereference.rs:41:15:41:33 | ... .is_positive() |  | {EXTERNAL LOCATION} | bool |
-| dereference.rs:41:16:41:18 | * ... |  | {EXTERNAL LOCATION} | i64 |
-| dereference.rs:41:17:41:18 | a3 |  | dereference.rs:4:1:6:1 | MyIntPointer |
-| dereference.rs:46:9:46:10 | c1 |  | dereference.rs:17:1:19:1 | MySmartPointer |
-| dereference.rs:46:9:46:10 | c1 | T | {EXTERNAL LOCATION} | char |
-| dereference.rs:46:14:46:42 | MySmartPointer {...} |  | dereference.rs:17:1:19:1 | MySmartPointer |
-| dereference.rs:46:14:46:42 | MySmartPointer {...} | T | {EXTERNAL LOCATION} | char |
-| dereference.rs:46:38:46:40 | 'a' |  | {EXTERNAL LOCATION} | char |
-| dereference.rs:47:9:47:11 | _d1 |  | file://:0:0:0:0 | & |
-| dereference.rs:47:9:47:11 | _d1 | &T | {EXTERNAL LOCATION} | char |
-| dereference.rs:47:15:47:16 | c1 |  | dereference.rs:17:1:19:1 | MySmartPointer |
-| dereference.rs:47:15:47:16 | c1 | T | {EXTERNAL LOCATION} | char |
-| dereference.rs:47:15:47:24 | c1.deref() |  | file://:0:0:0:0 | & |
-| dereference.rs:47:15:47:24 | c1.deref() | &T | {EXTERNAL LOCATION} | char |
-| dereference.rs:50:9:50:10 | c2 |  | dereference.rs:17:1:19:1 | MySmartPointer |
-| dereference.rs:50:9:50:10 | c2 | T | {EXTERNAL LOCATION} | char |
-| dereference.rs:50:14:50:42 | MySmartPointer {...} |  | dereference.rs:17:1:19:1 | MySmartPointer |
-| dereference.rs:50:14:50:42 | MySmartPointer {...} | T | {EXTERNAL LOCATION} | char |
-| dereference.rs:50:38:50:40 | 'a' |  | {EXTERNAL LOCATION} | char |
-| dereference.rs:51:9:51:11 | _d2 |  | {EXTERNAL LOCATION} | char |
-| dereference.rs:51:15:51:17 | * ... |  | {EXTERNAL LOCATION} | char |
-| dereference.rs:51:16:51:17 | c2 |  | dereference.rs:17:1:19:1 | MySmartPointer |
-| dereference.rs:51:16:51:17 | c2 | T | {EXTERNAL LOCATION} | char |
-| dereference.rs:54:9:54:10 | c3 |  | dereference.rs:17:1:19:1 | MySmartPointer |
-| dereference.rs:54:9:54:10 | c3 | T | {EXTERNAL LOCATION} | i64 |
-| dereference.rs:54:14:54:44 | MySmartPointer {...} |  | dereference.rs:17:1:19:1 | MySmartPointer |
-| dereference.rs:54:14:54:44 | MySmartPointer {...} | T | {EXTERNAL LOCATION} | i64 |
-| dereference.rs:54:38:54:42 | 34i64 |  | {EXTERNAL LOCATION} | i64 |
-| dereference.rs:55:9:55:11 | _d3 |  | {EXTERNAL LOCATION} | bool |
-| dereference.rs:55:15:55:19 | (...) |  | {EXTERNAL LOCATION} | i64 |
-| dereference.rs:55:15:55:33 | ... .is_positive() |  | {EXTERNAL LOCATION} | bool |
-| dereference.rs:55:16:55:18 | * ... |  | {EXTERNAL LOCATION} | i64 |
-| dereference.rs:55:17:55:18 | c3 |  | dereference.rs:17:1:19:1 | MySmartPointer |
-| dereference.rs:55:17:55:18 | c3 | T | {EXTERNAL LOCATION} | i64 |
-| dereference.rs:60:9:60:10 | e1 |  | file://:0:0:0:0 | & |
-| dereference.rs:60:9:60:10 | e1 | &T | {EXTERNAL LOCATION} | char |
-| dereference.rs:60:9:60:10 | e1 | &T | file://:0:0:0:0 | & |
-| dereference.rs:60:14:60:17 | &'a' |  | file://:0:0:0:0 | & |
-| dereference.rs:60:14:60:17 | &'a' | &T | {EXTERNAL LOCATION} | char |
-| dereference.rs:60:14:60:17 | &'a' | &T | file://:0:0:0:0 | & |
-| dereference.rs:60:15:60:17 | 'a' |  | {EXTERNAL LOCATION} | char |
-| dereference.rs:61:9:61:11 | _f1 |  | file://:0:0:0:0 | & |
-| dereference.rs:61:15:61:16 | e1 |  | file://:0:0:0:0 | & |
-| dereference.rs:61:15:61:16 | e1 | &T | {EXTERNAL LOCATION} | char |
-| dereference.rs:61:15:61:16 | e1 | &T | file://:0:0:0:0 | & |
-| dereference.rs:61:15:61:24 | e1.deref() |  | file://:0:0:0:0 | & |
-| dereference.rs:64:9:64:10 | e2 |  | file://:0:0:0:0 | & |
-| dereference.rs:64:9:64:10 | e2 | &T | {EXTERNAL LOCATION} | char |
-| dereference.rs:64:14:64:17 | &'a' |  | file://:0:0:0:0 | & |
-| dereference.rs:64:14:64:17 | &'a' | &T | {EXTERNAL LOCATION} | char |
-| dereference.rs:64:15:64:17 | 'a' |  | {EXTERNAL LOCATION} | char |
-| dereference.rs:65:9:65:11 | _f2 |  | {EXTERNAL LOCATION} | char |
-| dereference.rs:65:15:65:17 | * ... |  | {EXTERNAL LOCATION} | char |
-| dereference.rs:65:16:65:17 | e2 |  | file://:0:0:0:0 | & |
-| dereference.rs:65:16:65:17 | e2 | &T | {EXTERNAL LOCATION} | char |
-| dereference.rs:68:9:68:10 | e3 |  | file://:0:0:0:0 | & |
-| dereference.rs:68:9:68:10 | e3 | &T | {EXTERNAL LOCATION} | i64 |
-| dereference.rs:68:14:68:19 | &34i64 |  | file://:0:0:0:0 | & |
-| dereference.rs:68:14:68:19 | &34i64 | &T | {EXTERNAL LOCATION} | i64 |
-| dereference.rs:68:15:68:19 | 34i64 |  | {EXTERNAL LOCATION} | i64 |
-| dereference.rs:69:9:69:11 | _f3 |  | {EXTERNAL LOCATION} | bool |
-| dereference.rs:69:15:69:19 | (...) |  | {EXTERNAL LOCATION} | i64 |
-| dereference.rs:69:15:69:33 | ... .is_positive() |  | {EXTERNAL LOCATION} | bool |
-| dereference.rs:69:16:69:18 | * ... |  | {EXTERNAL LOCATION} | i64 |
-| dereference.rs:69:17:69:18 | e3 |  | file://:0:0:0:0 | & |
-| dereference.rs:69:17:69:18 | e3 | &T | {EXTERNAL LOCATION} | i64 |
-| dereference.rs:74:9:74:10 | g1 |  | {EXTERNAL LOCATION} | Box |
-| dereference.rs:74:9:74:10 | g1 | A | {EXTERNAL LOCATION} | Global |
-| dereference.rs:74:9:74:10 | g1 | T | {EXTERNAL LOCATION} | char |
-| dereference.rs:74:25:74:37 | ...::new(...) |  | {EXTERNAL LOCATION} | Box |
-| dereference.rs:74:25:74:37 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
-| dereference.rs:74:25:74:37 | ...::new(...) | T | {EXTERNAL LOCATION} | char |
-| dereference.rs:74:34:74:36 | 'a' |  | {EXTERNAL LOCATION} | char |
-| dereference.rs:75:9:75:11 | _h1 |  | file://:0:0:0:0 | & |
-| dereference.rs:75:9:75:11 | _h1 | &T | {EXTERNAL LOCATION} | char |
-| dereference.rs:75:15:75:16 | g1 |  | {EXTERNAL LOCATION} | Box |
-| dereference.rs:75:15:75:16 | g1 | A | {EXTERNAL LOCATION} | Global |
-| dereference.rs:75:15:75:16 | g1 | T | {EXTERNAL LOCATION} | char |
-| dereference.rs:75:15:75:24 | g1.deref() |  | file://:0:0:0:0 | & |
-| dereference.rs:75:15:75:24 | g1.deref() | &T | {EXTERNAL LOCATION} | char |
-| dereference.rs:78:9:78:10 | g2 |  | {EXTERNAL LOCATION} | Box |
-| dereference.rs:78:9:78:10 | g2 | A | {EXTERNAL LOCATION} | Global |
-| dereference.rs:78:9:78:10 | g2 | T | {EXTERNAL LOCATION} | char |
-| dereference.rs:78:25:78:37 | ...::new(...) |  | {EXTERNAL LOCATION} | Box |
-| dereference.rs:78:25:78:37 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
-| dereference.rs:78:25:78:37 | ...::new(...) | T | {EXTERNAL LOCATION} | char |
-| dereference.rs:78:34:78:36 | 'a' |  | {EXTERNAL LOCATION} | char |
-| dereference.rs:79:9:79:11 | _h2 |  | {EXTERNAL LOCATION} | char |
-| dereference.rs:79:15:79:17 | * ... |  | {EXTERNAL LOCATION} | char |
-| dereference.rs:79:16:79:17 | g2 |  | {EXTERNAL LOCATION} | Box |
-| dereference.rs:79:16:79:17 | g2 | A | {EXTERNAL LOCATION} | Global |
-| dereference.rs:79:16:79:17 | g2 | T | {EXTERNAL LOCATION} | char |
-| dereference.rs:82:9:82:10 | g3 |  | {EXTERNAL LOCATION} | Box |
-| dereference.rs:82:9:82:10 | g3 | A | {EXTERNAL LOCATION} | Global |
-| dereference.rs:82:9:82:10 | g3 | T | {EXTERNAL LOCATION} | i64 |
-| dereference.rs:82:24:82:38 | ...::new(...) |  | {EXTERNAL LOCATION} | Box |
-| dereference.rs:82:24:82:38 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
-| dereference.rs:82:24:82:38 | ...::new(...) | T | {EXTERNAL LOCATION} | i64 |
-| dereference.rs:82:33:82:37 | 34i64 |  | {EXTERNAL LOCATION} | i64 |
-| dereference.rs:83:9:83:11 | _h3 |  | {EXTERNAL LOCATION} | bool |
-| dereference.rs:83:15:83:19 | (...) |  | {EXTERNAL LOCATION} | i64 |
-| dereference.rs:83:15:83:33 | ... .is_positive() |  | {EXTERNAL LOCATION} | bool |
-| dereference.rs:83:16:83:18 | * ... |  | {EXTERNAL LOCATION} | i64 |
-| dereference.rs:83:17:83:18 | g3 |  | {EXTERNAL LOCATION} | Box |
-| dereference.rs:83:17:83:18 | g3 | A | {EXTERNAL LOCATION} | Global |
-| dereference.rs:83:17:83:18 | g3 | T | {EXTERNAL LOCATION} | i64 |
-| dereference.rs:88:9:88:9 | x |  | dereference.rs:4:1:6:1 | MyIntPointer |
-| dereference.rs:88:13:88:41 | MyIntPointer {...} |  | dereference.rs:4:1:6:1 | MyIntPointer |
-| dereference.rs:88:35:88:39 | 34i64 |  | {EXTERNAL LOCATION} | i64 |
-| dereference.rs:89:14:89:14 | x |  | dereference.rs:4:1:6:1 | MyIntPointer |
-| dereference.rs:92:9:92:9 | x |  | dereference.rs:17:1:19:1 | MySmartPointer |
-| dereference.rs:92:9:92:9 | x | T | {EXTERNAL LOCATION} | i64 |
-| dereference.rs:92:13:92:43 | MySmartPointer {...} |  | dereference.rs:17:1:19:1 | MySmartPointer |
-| dereference.rs:92:13:92:43 | MySmartPointer {...} | T | {EXTERNAL LOCATION} | i64 |
-| dereference.rs:92:37:92:41 | 34i64 |  | {EXTERNAL LOCATION} | i64 |
-| dereference.rs:93:14:93:14 | x |  | dereference.rs:17:1:19:1 | MySmartPointer |
-| dereference.rs:93:14:93:14 | x | T | {EXTERNAL LOCATION} | i64 |
-| dereference.rs:121:17:121:26 | key_to_key |  | {EXTERNAL LOCATION} | HashMap |
-| dereference.rs:121:17:121:26 | key_to_key | K | file://:0:0:0:0 | & |
-| dereference.rs:121:17:121:26 | key_to_key | K.&T | dereference.rs:99:5:100:21 | Key |
-| dereference.rs:121:17:121:26 | key_to_key | S | {EXTERNAL LOCATION} | RandomState |
-| dereference.rs:121:17:121:26 | key_to_key | V | file://:0:0:0:0 | & |
-| dereference.rs:121:17:121:26 | key_to_key | V.&T | dereference.rs:99:5:100:21 | Key |
-| dereference.rs:121:30:121:57 | ...::new(...) |  | {EXTERNAL LOCATION} | HashMap |
-| dereference.rs:121:30:121:57 | ...::new(...) | K | file://:0:0:0:0 | & |
-| dereference.rs:121:30:121:57 | ...::new(...) | K.&T | dereference.rs:99:5:100:21 | Key |
-| dereference.rs:121:30:121:57 | ...::new(...) | S | {EXTERNAL LOCATION} | RandomState |
-| dereference.rs:121:30:121:57 | ...::new(...) | V | file://:0:0:0:0 | & |
-| dereference.rs:121:30:121:57 | ...::new(...) | V.&T | dereference.rs:99:5:100:21 | Key |
-| dereference.rs:122:17:122:19 | key |  | file://:0:0:0:0 | & |
-| dereference.rs:122:17:122:19 | key | &T | dereference.rs:99:5:100:21 | Key |
-| dereference.rs:122:17:122:19 | key | &T | file://:0:0:0:0 | & |
-| dereference.rs:122:17:122:19 | key | &T.&T | dereference.rs:99:5:100:21 | Key |
-| dereference.rs:122:23:122:29 | &... |  | file://:0:0:0:0 | & |
-| dereference.rs:122:23:122:29 | &... | &T | dereference.rs:99:5:100:21 | Key |
-| dereference.rs:122:23:122:29 | &... | &T | file://:0:0:0:0 | & |
-| dereference.rs:122:23:122:29 | &... | &T.&T | dereference.rs:99:5:100:21 | Key |
-| dereference.rs:122:24:122:29 | Key {...} |  | dereference.rs:99:5:100:21 | Key |
-| dereference.rs:122:24:122:29 | Key {...} |  | file://:0:0:0:0 | & |
-| dereference.rs:122:24:122:29 | Key {...} | &T | dereference.rs:99:5:100:21 | Key |
-| dereference.rs:123:16:123:28 | Some(...) |  | {EXTERNAL LOCATION} | Option |
-| dereference.rs:123:16:123:28 | Some(...) | T | file://:0:0:0:0 | & |
-| dereference.rs:123:16:123:28 | Some(...) | T.&T | dereference.rs:99:5:100:21 | Key |
-| dereference.rs:123:16:123:28 | Some(...) | T.&T | file://:0:0:0:0 | & |
-| dereference.rs:123:16:123:28 | Some(...) | T.&T.&T | dereference.rs:99:5:100:21 | Key |
-| dereference.rs:123:21:123:27 | ref_key |  | file://:0:0:0:0 | & |
-| dereference.rs:123:21:123:27 | ref_key | &T | dereference.rs:99:5:100:21 | Key |
-| dereference.rs:123:21:123:27 | ref_key | &T | file://:0:0:0:0 | & |
-| dereference.rs:123:21:123:27 | ref_key | &T.&T | dereference.rs:99:5:100:21 | Key |
-| dereference.rs:123:32:123:41 | key_to_key |  | {EXTERNAL LOCATION} | HashMap |
-| dereference.rs:123:32:123:41 | key_to_key | K | file://:0:0:0:0 | & |
-| dereference.rs:123:32:123:41 | key_to_key | K.&T | dereference.rs:99:5:100:21 | Key |
-| dereference.rs:123:32:123:41 | key_to_key | S | {EXTERNAL LOCATION} | RandomState |
-| dereference.rs:123:32:123:41 | key_to_key | V | file://:0:0:0:0 | & |
-| dereference.rs:123:32:123:41 | key_to_key | V.&T | dereference.rs:99:5:100:21 | Key |
-| dereference.rs:123:32:123:50 | key_to_key.get(...) |  | {EXTERNAL LOCATION} | Option |
-| dereference.rs:123:32:123:50 | key_to_key.get(...) | T | file://:0:0:0:0 | & |
-| dereference.rs:123:32:123:50 | key_to_key.get(...) | T.&T | dereference.rs:99:5:100:21 | Key |
-| dereference.rs:123:32:123:50 | key_to_key.get(...) | T.&T | file://:0:0:0:0 | & |
-| dereference.rs:123:32:123:50 | key_to_key.get(...) | T.&T.&T | dereference.rs:99:5:100:21 | Key |
-| dereference.rs:123:47:123:49 | key |  | file://:0:0:0:0 | & |
-| dereference.rs:123:47:123:49 | key | &T | dereference.rs:99:5:100:21 | Key |
-| dereference.rs:123:47:123:49 | key | &T | file://:0:0:0:0 | & |
-| dereference.rs:123:47:123:49 | key | &T.&T | dereference.rs:99:5:100:21 | Key |
-| dereference.rs:125:13:125:15 | key |  | file://:0:0:0:0 | & |
-| dereference.rs:125:13:125:15 | key | &T | dereference.rs:99:5:100:21 | Key |
-| dereference.rs:125:13:125:15 | key | &T | file://:0:0:0:0 | & |
-| dereference.rs:125:13:125:15 | key | &T.&T | dereference.rs:99:5:100:21 | Key |
-| dereference.rs:125:13:125:25 | ... = ... |  | file://:0:0:0:0 | () |
-| dereference.rs:125:19:125:25 | ref_key |  | file://:0:0:0:0 | & |
-| dereference.rs:125:19:125:25 | ref_key | &T | dereference.rs:99:5:100:21 | Key |
-| dereference.rs:125:19:125:25 | ref_key | &T | file://:0:0:0:0 | & |
-| dereference.rs:125:19:125:25 | ref_key | &T.&T | dereference.rs:99:5:100:21 | Key |
-| dereference.rs:127:9:127:18 | key_to_key |  | {EXTERNAL LOCATION} | HashMap |
-| dereference.rs:127:9:127:18 | key_to_key | K | file://:0:0:0:0 | & |
-| dereference.rs:127:9:127:18 | key_to_key | K.&T | dereference.rs:99:5:100:21 | Key |
-| dereference.rs:127:9:127:18 | key_to_key | S | {EXTERNAL LOCATION} | RandomState |
-| dereference.rs:127:9:127:18 | key_to_key | V | file://:0:0:0:0 | & |
-| dereference.rs:127:9:127:18 | key_to_key | V.&T | dereference.rs:99:5:100:21 | Key |
-| dereference.rs:127:9:127:35 | key_to_key.insert(...) |  | {EXTERNAL LOCATION} | Option |
-| dereference.rs:127:9:127:35 | key_to_key.insert(...) | T | file://:0:0:0:0 | & |
-| dereference.rs:127:9:127:35 | key_to_key.insert(...) | T.&T | dereference.rs:99:5:100:21 | Key |
-| dereference.rs:127:9:127:35 | key_to_key.insert(...) | T.&T | file://:0:0:0:0 | & |
-| dereference.rs:127:9:127:35 | key_to_key.insert(...) | T.&T.&T | dereference.rs:99:5:100:21 | Key |
-| dereference.rs:127:27:127:29 | key |  | file://:0:0:0:0 | & |
-| dereference.rs:127:27:127:29 | key | &T | dereference.rs:99:5:100:21 | Key |
-| dereference.rs:127:27:127:29 | key | &T | file://:0:0:0:0 | & |
-| dereference.rs:127:27:127:29 | key | &T.&T | dereference.rs:99:5:100:21 | Key |
-| dereference.rs:127:32:127:34 | key |  | file://:0:0:0:0 | & |
-| dereference.rs:127:32:127:34 | key | &T | dereference.rs:99:5:100:21 | Key |
-| dereference.rs:127:32:127:34 | key | &T | file://:0:0:0:0 | & |
-| dereference.rs:127:32:127:34 | key | &T.&T | dereference.rs:99:5:100:21 | Key |
+| dereference.rs:41:9:41:11 | _b1 |  | file://:0:0:0:0 | & |
+| dereference.rs:41:9:41:11 | _b1 | &T | {EXTERNAL LOCATION} | i64 |
+| dereference.rs:41:15:41:16 | a1 |  | dereference.rs:4:1:6:1 | MyIntPointer |
+| dereference.rs:41:15:41:24 | a1.deref() |  | file://:0:0:0:0 | & |
+| dereference.rs:41:15:41:24 | a1.deref() | &T | {EXTERNAL LOCATION} | i64 |
+| dereference.rs:44:9:44:10 | a2 |  | dereference.rs:4:1:6:1 | MyIntPointer |
+| dereference.rs:44:14:44:42 | MyIntPointer {...} |  | dereference.rs:4:1:6:1 | MyIntPointer |
+| dereference.rs:44:36:44:40 | 34i64 |  | {EXTERNAL LOCATION} | i64 |
+| dereference.rs:45:9:45:11 | _b2 |  | {EXTERNAL LOCATION} | i64 |
+| dereference.rs:45:15:45:17 | * ... |  | {EXTERNAL LOCATION} | i64 |
+| dereference.rs:45:16:45:17 | a2 |  | dereference.rs:4:1:6:1 | MyIntPointer |
+| dereference.rs:48:9:48:10 | a3 |  | dereference.rs:4:1:6:1 | MyIntPointer |
+| dereference.rs:48:14:48:42 | MyIntPointer {...} |  | dereference.rs:4:1:6:1 | MyIntPointer |
+| dereference.rs:48:36:48:40 | 34i64 |  | {EXTERNAL LOCATION} | i64 |
+| dereference.rs:49:9:49:11 | _b3 |  | {EXTERNAL LOCATION} | bool |
+| dereference.rs:49:15:49:19 | (...) |  | {EXTERNAL LOCATION} | i64 |
+| dereference.rs:49:15:49:33 | ... .is_positive() |  | {EXTERNAL LOCATION} | bool |
+| dereference.rs:49:16:49:18 | * ... |  | {EXTERNAL LOCATION} | i64 |
+| dereference.rs:49:17:49:18 | a3 |  | dereference.rs:4:1:6:1 | MyIntPointer |
+| dereference.rs:52:39:64:1 | { ... } |  | file://:0:0:0:0 | () |
+| dereference.rs:54:9:54:10 | c1 |  | dereference.rs:17:1:19:1 | MySmartPointer |
+| dereference.rs:54:9:54:10 | c1 | T | {EXTERNAL LOCATION} | char |
+| dereference.rs:54:14:54:42 | MySmartPointer {...} |  | dereference.rs:17:1:19:1 | MySmartPointer |
+| dereference.rs:54:14:54:42 | MySmartPointer {...} | T | {EXTERNAL LOCATION} | char |
+| dereference.rs:54:38:54:40 | 'a' |  | {EXTERNAL LOCATION} | char |
+| dereference.rs:55:9:55:11 | _d1 |  | file://:0:0:0:0 | & |
+| dereference.rs:55:9:55:11 | _d1 | &T | {EXTERNAL LOCATION} | char |
+| dereference.rs:55:15:55:16 | c1 |  | dereference.rs:17:1:19:1 | MySmartPointer |
+| dereference.rs:55:15:55:16 | c1 | T | {EXTERNAL LOCATION} | char |
+| dereference.rs:55:15:55:24 | c1.deref() |  | file://:0:0:0:0 | & |
+| dereference.rs:55:15:55:24 | c1.deref() | &T | {EXTERNAL LOCATION} | char |
+| dereference.rs:58:9:58:10 | c2 |  | dereference.rs:17:1:19:1 | MySmartPointer |
+| dereference.rs:58:9:58:10 | c2 | T | {EXTERNAL LOCATION} | char |
+| dereference.rs:58:14:58:42 | MySmartPointer {...} |  | dereference.rs:17:1:19:1 | MySmartPointer |
+| dereference.rs:58:14:58:42 | MySmartPointer {...} | T | {EXTERNAL LOCATION} | char |
+| dereference.rs:58:38:58:40 | 'a' |  | {EXTERNAL LOCATION} | char |
+| dereference.rs:59:9:59:11 | _d2 |  | {EXTERNAL LOCATION} | char |
+| dereference.rs:59:15:59:17 | * ... |  | {EXTERNAL LOCATION} | char |
+| dereference.rs:59:16:59:17 | c2 |  | dereference.rs:17:1:19:1 | MySmartPointer |
+| dereference.rs:59:16:59:17 | c2 | T | {EXTERNAL LOCATION} | char |
+| dereference.rs:62:9:62:10 | c3 |  | dereference.rs:17:1:19:1 | MySmartPointer |
+| dereference.rs:62:9:62:10 | c3 | T | {EXTERNAL LOCATION} | i64 |
+| dereference.rs:62:14:62:44 | MySmartPointer {...} |  | dereference.rs:17:1:19:1 | MySmartPointer |
+| dereference.rs:62:14:62:44 | MySmartPointer {...} | T | {EXTERNAL LOCATION} | i64 |
+| dereference.rs:62:38:62:42 | 34i64 |  | {EXTERNAL LOCATION} | i64 |
+| dereference.rs:63:9:63:11 | _d3 |  | {EXTERNAL LOCATION} | bool |
+| dereference.rs:63:15:63:19 | (...) |  | {EXTERNAL LOCATION} | i64 |
+| dereference.rs:63:15:63:33 | ... .is_positive() |  | {EXTERNAL LOCATION} | bool |
+| dereference.rs:63:16:63:18 | * ... |  | {EXTERNAL LOCATION} | i64 |
+| dereference.rs:63:17:63:18 | c3 |  | dereference.rs:17:1:19:1 | MySmartPointer |
+| dereference.rs:63:17:63:18 | c3 | T | {EXTERNAL LOCATION} | i64 |
+| dereference.rs:66:31:78:1 | { ... } |  | file://:0:0:0:0 | () |
+| dereference.rs:68:9:68:10 | e1 |  | file://:0:0:0:0 | & |
+| dereference.rs:68:9:68:10 | e1 | &T | {EXTERNAL LOCATION} | char |
+| dereference.rs:68:14:68:17 | &'a' |  | file://:0:0:0:0 | & |
+| dereference.rs:68:14:68:17 | &'a' | &T | {EXTERNAL LOCATION} | char |
+| dereference.rs:68:15:68:17 | 'a' |  | {EXTERNAL LOCATION} | char |
+| dereference.rs:69:9:69:11 | _f1 |  | file://:0:0:0:0 | & |
+| dereference.rs:69:9:69:11 | _f1 | &T | {EXTERNAL LOCATION} | char |
+| dereference.rs:69:15:69:16 | e1 |  | file://:0:0:0:0 | & |
+| dereference.rs:69:15:69:16 | e1 | &T | {EXTERNAL LOCATION} | char |
+| dereference.rs:69:15:69:24 | e1.deref() |  | file://:0:0:0:0 | & |
+| dereference.rs:69:15:69:24 | e1.deref() | &T | {EXTERNAL LOCATION} | char |
+| dereference.rs:72:9:72:10 | e2 |  | file://:0:0:0:0 | & |
+| dereference.rs:72:9:72:10 | e2 | &T | {EXTERNAL LOCATION} | char |
+| dereference.rs:72:14:72:17 | &'a' |  | file://:0:0:0:0 | & |
+| dereference.rs:72:14:72:17 | &'a' | &T | {EXTERNAL LOCATION} | char |
+| dereference.rs:72:15:72:17 | 'a' |  | {EXTERNAL LOCATION} | char |
+| dereference.rs:73:9:73:11 | _f2 |  | {EXTERNAL LOCATION} | char |
+| dereference.rs:73:15:73:17 | * ... |  | {EXTERNAL LOCATION} | char |
+| dereference.rs:73:16:73:17 | e2 |  | file://:0:0:0:0 | & |
+| dereference.rs:73:16:73:17 | e2 | &T | {EXTERNAL LOCATION} | char |
+| dereference.rs:76:9:76:10 | e3 |  | file://:0:0:0:0 | & |
+| dereference.rs:76:9:76:10 | e3 | &T | {EXTERNAL LOCATION} | i64 |
+| dereference.rs:76:14:76:19 | &34i64 |  | file://:0:0:0:0 | & |
+| dereference.rs:76:14:76:19 | &34i64 | &T | {EXTERNAL LOCATION} | i64 |
+| dereference.rs:76:15:76:19 | 34i64 |  | {EXTERNAL LOCATION} | i64 |
+| dereference.rs:77:9:77:11 | _f3 |  | {EXTERNAL LOCATION} | bool |
+| dereference.rs:77:15:77:19 | (...) |  | {EXTERNAL LOCATION} | i64 |
+| dereference.rs:77:15:77:33 | ... .is_positive() |  | {EXTERNAL LOCATION} | bool |
+| dereference.rs:77:16:77:18 | * ... |  | {EXTERNAL LOCATION} | i64 |
+| dereference.rs:77:17:77:18 | e3 |  | file://:0:0:0:0 | & |
+| dereference.rs:77:17:77:18 | e3 | &T | {EXTERNAL LOCATION} | i64 |
+| dereference.rs:80:31:92:1 | { ... } |  | file://:0:0:0:0 | () |
+| dereference.rs:82:9:82:10 | g1 |  | {EXTERNAL LOCATION} | Box |
+| dereference.rs:82:9:82:10 | g1 | A | {EXTERNAL LOCATION} | Global |
+| dereference.rs:82:9:82:10 | g1 | T | {EXTERNAL LOCATION} | char |
+| dereference.rs:82:25:82:37 | ...::new(...) |  | {EXTERNAL LOCATION} | Box |
+| dereference.rs:82:25:82:37 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
+| dereference.rs:82:25:82:37 | ...::new(...) | T | {EXTERNAL LOCATION} | char |
+| dereference.rs:82:34:82:36 | 'a' |  | {EXTERNAL LOCATION} | char |
+| dereference.rs:83:9:83:11 | _h1 |  | file://:0:0:0:0 | & |
+| dereference.rs:83:9:83:11 | _h1 | &T | {EXTERNAL LOCATION} | char |
+| dereference.rs:83:15:83:16 | g1 |  | {EXTERNAL LOCATION} | Box |
+| dereference.rs:83:15:83:16 | g1 | A | {EXTERNAL LOCATION} | Global |
+| dereference.rs:83:15:83:16 | g1 | T | {EXTERNAL LOCATION} | char |
+| dereference.rs:83:15:83:24 | g1.deref() |  | file://:0:0:0:0 | & |
+| dereference.rs:83:15:83:24 | g1.deref() | &T | {EXTERNAL LOCATION} | char |
+| dereference.rs:86:9:86:10 | g2 |  | {EXTERNAL LOCATION} | Box |
+| dereference.rs:86:9:86:10 | g2 | A | {EXTERNAL LOCATION} | Global |
+| dereference.rs:86:9:86:10 | g2 | T | {EXTERNAL LOCATION} | char |
+| dereference.rs:86:25:86:37 | ...::new(...) |  | {EXTERNAL LOCATION} | Box |
+| dereference.rs:86:25:86:37 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
+| dereference.rs:86:25:86:37 | ...::new(...) | T | {EXTERNAL LOCATION} | char |
+| dereference.rs:86:34:86:36 | 'a' |  | {EXTERNAL LOCATION} | char |
+| dereference.rs:87:9:87:11 | _h2 |  | {EXTERNAL LOCATION} | char |
+| dereference.rs:87:15:87:17 | * ... |  | {EXTERNAL LOCATION} | char |
+| dereference.rs:87:16:87:17 | g2 |  | {EXTERNAL LOCATION} | Box |
+| dereference.rs:87:16:87:17 | g2 | A | {EXTERNAL LOCATION} | Global |
+| dereference.rs:87:16:87:17 | g2 | T | {EXTERNAL LOCATION} | char |
+| dereference.rs:90:9:90:10 | g3 |  | {EXTERNAL LOCATION} | Box |
+| dereference.rs:90:9:90:10 | g3 | A | {EXTERNAL LOCATION} | Global |
+| dereference.rs:90:9:90:10 | g3 | T | {EXTERNAL LOCATION} | i64 |
+| dereference.rs:90:24:90:38 | ...::new(...) |  | {EXTERNAL LOCATION} | Box |
+| dereference.rs:90:24:90:38 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
+| dereference.rs:90:24:90:38 | ...::new(...) | T | {EXTERNAL LOCATION} | i64 |
+| dereference.rs:90:33:90:37 | 34i64 |  | {EXTERNAL LOCATION} | i64 |
+| dereference.rs:91:9:91:11 | _h3 |  | {EXTERNAL LOCATION} | bool |
+| dereference.rs:91:15:91:19 | (...) |  | {EXTERNAL LOCATION} | i64 |
+| dereference.rs:91:15:91:33 | ... .is_positive() |  | {EXTERNAL LOCATION} | bool |
+| dereference.rs:91:16:91:18 | * ... |  | {EXTERNAL LOCATION} | i64 |
+| dereference.rs:91:17:91:18 | g3 |  | {EXTERNAL LOCATION} | Box |
+| dereference.rs:91:17:91:18 | g3 | A | {EXTERNAL LOCATION} | Global |
+| dereference.rs:91:17:91:18 | g3 | T | {EXTERNAL LOCATION} | i64 |
+| dereference.rs:94:27:105:1 | { ... } |  | file://:0:0:0:0 | () |
+| dereference.rs:96:9:96:9 | x |  | dereference.rs:4:1:6:1 | MyIntPointer |
+| dereference.rs:96:13:96:41 | MyIntPointer {...} |  | dereference.rs:4:1:6:1 | MyIntPointer |
+| dereference.rs:96:35:96:39 | 34i64 |  | {EXTERNAL LOCATION} | i64 |
+| dereference.rs:97:14:97:14 | x |  | dereference.rs:4:1:6:1 | MyIntPointer |
+| dereference.rs:100:9:100:9 | x |  | dereference.rs:17:1:19:1 | MySmartPointer |
+| dereference.rs:100:9:100:9 | x | T | {EXTERNAL LOCATION} | i64 |
+| dereference.rs:100:13:100:43 | MySmartPointer {...} |  | dereference.rs:17:1:19:1 | MySmartPointer |
+| dereference.rs:100:13:100:43 | MySmartPointer {...} | T | {EXTERNAL LOCATION} | i64 |
+| dereference.rs:100:37:100:41 | 34i64 |  | {EXTERNAL LOCATION} | i64 |
+| dereference.rs:101:14:101:14 | x |  | dereference.rs:17:1:19:1 | MySmartPointer |
+| dereference.rs:101:14:101:14 | x | T | {EXTERNAL LOCATION} | i64 |
+| dereference.rs:103:9:103:9 | z |  | dereference.rs:17:1:19:1 | MySmartPointer |
+| dereference.rs:103:9:103:9 | z | T | dereference.rs:30:1:30:15 | S |
+| dereference.rs:103:9:103:9 | z | T.T | {EXTERNAL LOCATION} | i64 |
+| dereference.rs:103:13:103:45 | MySmartPointer {...} |  | dereference.rs:17:1:19:1 | MySmartPointer |
+| dereference.rs:103:13:103:45 | MySmartPointer {...} | T | dereference.rs:30:1:30:15 | S |
+| dereference.rs:103:13:103:45 | MySmartPointer {...} | T.T | {EXTERNAL LOCATION} | i64 |
+| dereference.rs:103:37:103:43 | S(...) |  | dereference.rs:30:1:30:15 | S |
+| dereference.rs:103:37:103:43 | S(...) | T | {EXTERNAL LOCATION} | i64 |
+| dereference.rs:103:39:103:42 | 0i64 |  | {EXTERNAL LOCATION} | i64 |
+| dereference.rs:104:14:104:14 | z |  | dereference.rs:17:1:19:1 | MySmartPointer |
+| dereference.rs:104:14:104:14 | z | T | dereference.rs:30:1:30:15 | S |
+| dereference.rs:104:14:104:14 | z | T.T | {EXTERNAL LOCATION} | i64 |
+| dereference.rs:131:19:139:5 | { ... } |  | file://:0:0:0:0 | () |
+| dereference.rs:132:17:132:26 | key_to_key |  | {EXTERNAL LOCATION} | HashMap |
+| dereference.rs:132:17:132:26 | key_to_key | K | file://:0:0:0:0 | & |
+| dereference.rs:132:17:132:26 | key_to_key | K.&T | dereference.rs:110:5:111:21 | Key |
+| dereference.rs:132:17:132:26 | key_to_key | S | {EXTERNAL LOCATION} | RandomState |
+| dereference.rs:132:17:132:26 | key_to_key | V | file://:0:0:0:0 | & |
+| dereference.rs:132:17:132:26 | key_to_key | V.&T | dereference.rs:110:5:111:21 | Key |
+| dereference.rs:132:30:132:57 | ...::new(...) |  | {EXTERNAL LOCATION} | HashMap |
+| dereference.rs:132:30:132:57 | ...::new(...) | K | file://:0:0:0:0 | & |
+| dereference.rs:132:30:132:57 | ...::new(...) | K.&T | dereference.rs:110:5:111:21 | Key |
+| dereference.rs:132:30:132:57 | ...::new(...) | S | {EXTERNAL LOCATION} | RandomState |
+| dereference.rs:132:30:132:57 | ...::new(...) | V | file://:0:0:0:0 | & |
+| dereference.rs:132:30:132:57 | ...::new(...) | V.&T | dereference.rs:110:5:111:21 | Key |
+| dereference.rs:133:17:133:19 | key |  | file://:0:0:0:0 | & |
+| dereference.rs:133:17:133:19 | key | &T | dereference.rs:110:5:111:21 | Key |
+| dereference.rs:133:17:133:19 | key | &T | file://:0:0:0:0 | & |
+| dereference.rs:133:17:133:19 | key | &T.&T | dereference.rs:110:5:111:21 | Key |
+| dereference.rs:133:23:133:29 | &... |  | file://:0:0:0:0 | & |
+| dereference.rs:133:23:133:29 | &... | &T | dereference.rs:110:5:111:21 | Key |
+| dereference.rs:133:23:133:29 | &... | &T | file://:0:0:0:0 | & |
+| dereference.rs:133:23:133:29 | &... | &T.&T | dereference.rs:110:5:111:21 | Key |
+| dereference.rs:133:24:133:29 | Key {...} |  | dereference.rs:110:5:111:21 | Key |
+| dereference.rs:134:9:137:9 | if ... {...} |  | file://:0:0:0:0 | () |
+| dereference.rs:134:16:134:28 | Some(...) |  | {EXTERNAL LOCATION} | Option |
+| dereference.rs:134:16:134:28 | Some(...) | T | file://:0:0:0:0 | & |
+| dereference.rs:134:16:134:28 | Some(...) | T.&T | dereference.rs:110:5:111:21 | Key |
+| dereference.rs:134:16:134:28 | Some(...) | T.&T | file://:0:0:0:0 | & |
+| dereference.rs:134:16:134:28 | Some(...) | T.&T.&T | dereference.rs:110:5:111:21 | Key |
+| dereference.rs:134:21:134:27 | ref_key |  | file://:0:0:0:0 | & |
+| dereference.rs:134:21:134:27 | ref_key | &T | dereference.rs:110:5:111:21 | Key |
+| dereference.rs:134:21:134:27 | ref_key | &T | file://:0:0:0:0 | & |
+| dereference.rs:134:21:134:27 | ref_key | &T.&T | dereference.rs:110:5:111:21 | Key |
+| dereference.rs:134:32:134:41 | key_to_key |  | {EXTERNAL LOCATION} | HashMap |
+| dereference.rs:134:32:134:41 | key_to_key | K | file://:0:0:0:0 | & |
+| dereference.rs:134:32:134:41 | key_to_key | K.&T | dereference.rs:110:5:111:21 | Key |
+| dereference.rs:134:32:134:41 | key_to_key | S | {EXTERNAL LOCATION} | RandomState |
+| dereference.rs:134:32:134:41 | key_to_key | V | file://:0:0:0:0 | & |
+| dereference.rs:134:32:134:41 | key_to_key | V.&T | dereference.rs:110:5:111:21 | Key |
+| dereference.rs:134:32:134:50 | key_to_key.get(...) |  | {EXTERNAL LOCATION} | Option |
+| dereference.rs:134:32:134:50 | key_to_key.get(...) | T | file://:0:0:0:0 | & |
+| dereference.rs:134:32:134:50 | key_to_key.get(...) | T.&T | dereference.rs:110:5:111:21 | Key |
+| dereference.rs:134:32:134:50 | key_to_key.get(...) | T.&T | file://:0:0:0:0 | & |
+| dereference.rs:134:32:134:50 | key_to_key.get(...) | T.&T.&T | dereference.rs:110:5:111:21 | Key |
+| dereference.rs:134:47:134:49 | key |  | file://:0:0:0:0 | & |
+| dereference.rs:134:47:134:49 | key | &T | dereference.rs:110:5:111:21 | Key |
+| dereference.rs:134:47:134:49 | key | &T | file://:0:0:0:0 | & |
+| dereference.rs:134:47:134:49 | key | &T.&T | dereference.rs:110:5:111:21 | Key |
+| dereference.rs:134:52:137:9 | { ... } |  | file://:0:0:0:0 | () |
+| dereference.rs:136:13:136:15 | key |  | file://:0:0:0:0 | & |
+| dereference.rs:136:13:136:15 | key | &T | dereference.rs:110:5:111:21 | Key |
+| dereference.rs:136:13:136:15 | key | &T | file://:0:0:0:0 | & |
+| dereference.rs:136:13:136:15 | key | &T.&T | dereference.rs:110:5:111:21 | Key |
+| dereference.rs:136:13:136:25 | ... = ... |  | file://:0:0:0:0 | () |
+| dereference.rs:136:19:136:25 | ref_key |  | file://:0:0:0:0 | & |
+| dereference.rs:136:19:136:25 | ref_key | &T | dereference.rs:110:5:111:21 | Key |
+| dereference.rs:136:19:136:25 | ref_key | &T | file://:0:0:0:0 | & |
+| dereference.rs:136:19:136:25 | ref_key | &T.&T | dereference.rs:110:5:111:21 | Key |
+| dereference.rs:138:9:138:18 | key_to_key |  | {EXTERNAL LOCATION} | HashMap |
+| dereference.rs:138:9:138:18 | key_to_key | K | file://:0:0:0:0 | & |
+| dereference.rs:138:9:138:18 | key_to_key | K.&T | dereference.rs:110:5:111:21 | Key |
+| dereference.rs:138:9:138:18 | key_to_key | S | {EXTERNAL LOCATION} | RandomState |
+| dereference.rs:138:9:138:18 | key_to_key | V | file://:0:0:0:0 | & |
+| dereference.rs:138:9:138:18 | key_to_key | V.&T | dereference.rs:110:5:111:21 | Key |
+| dereference.rs:138:9:138:35 | key_to_key.insert(...) |  | {EXTERNAL LOCATION} | Option |
+| dereference.rs:138:9:138:35 | key_to_key.insert(...) | T | file://:0:0:0:0 | & |
+| dereference.rs:138:9:138:35 | key_to_key.insert(...) | T.&T | dereference.rs:110:5:111:21 | Key |
+| dereference.rs:138:9:138:35 | key_to_key.insert(...) | T.&T | file://:0:0:0:0 | & |
+| dereference.rs:138:9:138:35 | key_to_key.insert(...) | T.&T.&T | dereference.rs:110:5:111:21 | Key |
+| dereference.rs:138:27:138:29 | key |  | file://:0:0:0:0 | & |
+| dereference.rs:138:27:138:29 | key | &T | dereference.rs:110:5:111:21 | Key |
+| dereference.rs:138:27:138:29 | key | &T | file://:0:0:0:0 | & |
+| dereference.rs:138:27:138:29 | key | &T.&T | dereference.rs:110:5:111:21 | Key |
+| dereference.rs:138:32:138:34 | key |  | file://:0:0:0:0 | & |
+| dereference.rs:138:32:138:34 | key | &T | dereference.rs:110:5:111:21 | Key |
+| dereference.rs:138:32:138:34 | key | &T | file://:0:0:0:0 | & |
+| dereference.rs:138:32:138:34 | key | &T.&T | dereference.rs:110:5:111:21 | Key |
+| dereference.rs:144:16:144:19 | SelfParam |  | dereference.rs:143:5:145:5 | Self [trait MyTrait1] |
+| dereference.rs:151:16:151:19 | SelfParam |  | file://:0:0:0:0 | & |
+| dereference.rs:151:16:151:19 | SelfParam | &T | dereference.rs:147:5:147:13 | S |
+| dereference.rs:151:27:153:9 | { ... } |  | dereference.rs:147:5:147:13 | S |
+| dereference.rs:152:13:152:13 | S |  | dereference.rs:147:5:147:13 | S |
+| dereference.rs:158:16:158:19 | SelfParam |  | file://:0:0:0:0 | & |
+| dereference.rs:158:16:158:19 | SelfParam | &T | dereference.rs:147:5:147:13 | S |
+| dereference.rs:158:29:160:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| dereference.rs:159:13:159:14 | 42 |  | {EXTERNAL LOCATION} | i32 |
+| dereference.rs:159:13:159:14 | 42 |  | {EXTERNAL LOCATION} | i64 |
+| dereference.rs:164:16:164:19 | SelfParam |  | dereference.rs:163:5:165:5 | Self [trait MyTrait2] |
+| dereference.rs:164:22:164:24 | arg |  | dereference.rs:163:20:163:21 | T1 |
+| dereference.rs:169:16:169:19 | SelfParam |  | dereference.rs:147:5:147:13 | S |
+| dereference.rs:169:22:169:24 | arg |  | file://:0:0:0:0 | & |
+| dereference.rs:169:22:169:24 | arg | &T | dereference.rs:147:5:147:13 | S |
+| dereference.rs:169:36:171:9 | { ... } |  | dereference.rs:147:5:147:13 | S |
+| dereference.rs:170:13:170:13 | S |  | dereference.rs:147:5:147:13 | S |
+| dereference.rs:176:16:176:19 | SelfParam |  | dereference.rs:147:5:147:13 | S |
+| dereference.rs:176:22:176:24 | arg |  | file://:0:0:0:0 | & |
+| dereference.rs:176:22:176:24 | arg | &T | dereference.rs:147:5:147:13 | S |
+| dereference.rs:176:42:178:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| dereference.rs:177:13:177:14 | 42 |  | {EXTERNAL LOCATION} | i32 |
+| dereference.rs:177:13:177:14 | 42 |  | {EXTERNAL LOCATION} | i64 |
+| dereference.rs:181:19:188:5 | { ... } |  | file://:0:0:0:0 | () |
+| dereference.rs:182:13:182:13 | x |  | dereference.rs:147:5:147:13 | S |
+| dereference.rs:182:13:182:13 | x |  | {EXTERNAL LOCATION} | i64 |
+| dereference.rs:182:17:182:20 | (...) |  | file://:0:0:0:0 | & |
+| dereference.rs:182:17:182:20 | (...) | &T | dereference.rs:147:5:147:13 | S |
+| dereference.rs:182:17:182:26 | ... .foo() |  | dereference.rs:147:5:147:13 | S |
+| dereference.rs:182:17:182:26 | ... .foo() |  | {EXTERNAL LOCATION} | i64 |
+| dereference.rs:182:18:182:19 | &S |  | file://:0:0:0:0 | & |
+| dereference.rs:182:18:182:19 | &S | &T | dereference.rs:147:5:147:13 | S |
+| dereference.rs:182:19:182:19 | S |  | dereference.rs:147:5:147:13 | S |
+| dereference.rs:183:13:183:13 | y |  | dereference.rs:147:5:147:13 | S |
+| dereference.rs:183:13:183:13 | y |  | {EXTERNAL LOCATION} | i64 |
+| dereference.rs:183:17:183:17 | S |  | dereference.rs:147:5:147:13 | S |
+| dereference.rs:183:17:183:23 | S.foo() |  | dereference.rs:147:5:147:13 | S |
+| dereference.rs:183:17:183:23 | S.foo() |  | {EXTERNAL LOCATION} | i64 |
+| dereference.rs:184:13:184:13 | z |  | dereference.rs:147:5:147:13 | S |
+| dereference.rs:184:13:184:13 | z |  | {EXTERNAL LOCATION} | i64 |
+| dereference.rs:184:17:184:24 | (...) |  | file://:0:0:0:0 | & |
+| dereference.rs:184:17:184:24 | (...) | &T | dereference.rs:147:5:147:13 | S |
+| dereference.rs:184:17:184:30 | ... .foo() |  | dereference.rs:147:5:147:13 | S |
+| dereference.rs:184:17:184:30 | ... .foo() |  | {EXTERNAL LOCATION} | i64 |
+| dereference.rs:184:18:184:23 | &mut S |  | file://:0:0:0:0 | & |
+| dereference.rs:184:18:184:23 | &mut S | &T | dereference.rs:147:5:147:13 | S |
+| dereference.rs:184:23:184:23 | S |  | dereference.rs:147:5:147:13 | S |
+| dereference.rs:186:13:186:13 | x |  | dereference.rs:147:5:147:13 | S |
+| dereference.rs:186:13:186:13 | x |  | {EXTERNAL LOCATION} | i64 |
+| dereference.rs:186:17:186:17 | S |  | dereference.rs:147:5:147:13 | S |
+| dereference.rs:186:17:186:25 | S.bar(...) |  | dereference.rs:147:5:147:13 | S |
+| dereference.rs:186:17:186:25 | S.bar(...) |  | {EXTERNAL LOCATION} | i64 |
+| dereference.rs:186:23:186:24 | &S |  | file://:0:0:0:0 | & |
+| dereference.rs:186:23:186:24 | &S | &T | dereference.rs:147:5:147:13 | S |
+| dereference.rs:186:24:186:24 | S |  | dereference.rs:147:5:147:13 | S |
+| dereference.rs:187:13:187:13 | y |  | dereference.rs:147:5:147:13 | S |
+| dereference.rs:187:13:187:13 | y |  | {EXTERNAL LOCATION} | i64 |
+| dereference.rs:187:17:187:17 | S |  | dereference.rs:147:5:147:13 | S |
+| dereference.rs:187:17:187:29 | S.bar(...) |  | dereference.rs:147:5:147:13 | S |
+| dereference.rs:187:17:187:29 | S.bar(...) |  | {EXTERNAL LOCATION} | i64 |
+| dereference.rs:187:23:187:28 | &mut S |  | file://:0:0:0:0 | & |
+| dereference.rs:187:23:187:28 | &mut S | &T | dereference.rs:147:5:147:13 | S |
+| dereference.rs:187:28:187:28 | S |  | dereference.rs:147:5:147:13 | S |
+| dereference.rs:196:16:196:20 | SelfParam |  | file://:0:0:0:0 | & |
+| dereference.rs:196:16:196:20 | SelfParam | &T | dereference.rs:195:5:197:5 | Self [trait Bar] |
+| dereference.rs:201:16:201:24 | SelfParam |  | file://:0:0:0:0 | & |
+| dereference.rs:201:16:201:24 | SelfParam | &T | dereference.rs:193:5:193:17 | Foo |
+| dereference.rs:201:27:203:9 | { ... } |  | file://:0:0:0:0 | () |
+| dereference.rs:202:13:202:39 | MacroExpr |  | file://:0:0:0:0 | () |
+| dereference.rs:202:22:202:38 | "In struct impl!\\n" |  | file://:0:0:0:0 | & |
+| dereference.rs:202:22:202:38 | "In struct impl!\\n" | &T | {EXTERNAL LOCATION} | str |
+| dereference.rs:202:22:202:38 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| dereference.rs:202:22:202:38 | MacroBlockExpr |  | file://:0:0:0:0 | () |
+| dereference.rs:202:22:202:38 | { ... } |  | file://:0:0:0:0 | () |
+| dereference.rs:208:16:208:20 | SelfParam |  | file://:0:0:0:0 | & |
+| dereference.rs:208:16:208:20 | SelfParam | &T | dereference.rs:193:5:193:17 | Foo |
+| dereference.rs:208:23:210:9 | { ... } |  | file://:0:0:0:0 | () |
+| dereference.rs:209:13:209:38 | MacroExpr |  | file://:0:0:0:0 | () |
+| dereference.rs:209:22:209:37 | "In trait impl!\\n" |  | file://:0:0:0:0 | & |
+| dereference.rs:209:22:209:37 | "In trait impl!\\n" | &T | {EXTERNAL LOCATION} | str |
+| dereference.rs:209:22:209:37 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| dereference.rs:209:22:209:37 | MacroBlockExpr |  | file://:0:0:0:0 | () |
+| dereference.rs:209:22:209:37 | { ... } |  | file://:0:0:0:0 | () |
+| dereference.rs:213:19:216:5 | { ... } |  | file://:0:0:0:0 | () |
+| dereference.rs:214:17:214:17 | f |  | dereference.rs:193:5:193:17 | Foo |
+| dereference.rs:214:21:214:26 | Foo {...} |  | dereference.rs:193:5:193:17 | Foo |
+| dereference.rs:215:9:215:9 | f |  | dereference.rs:193:5:193:17 | Foo |
+| dereference.rs:215:9:215:15 | f.bar() |  | file://:0:0:0:0 | () |
+| dereference.rs:219:15:228:1 | { ... } |  | file://:0:0:0:0 | () |
+| dereference.rs:220:5:220:38 | explicit_monomorphic_dereference(...) |  | file://:0:0:0:0 | () |
+| dereference.rs:221:5:221:38 | explicit_polymorphic_dereference(...) |  | file://:0:0:0:0 | () |
+| dereference.rs:222:5:222:30 | explicit_ref_dereference(...) |  | file://:0:0:0:0 | () |
+| dereference.rs:223:5:223:30 | explicit_box_dereference(...) |  | file://:0:0:0:0 | () |
+| dereference.rs:224:5:224:26 | implicit_dereference(...) |  | file://:0:0:0:0 | () |
+| dereference.rs:225:5:225:41 | ...::test(...) |  | file://:0:0:0:0 | () |
+| dereference.rs:226:5:226:26 | ...::test(...) |  | file://:0:0:0:0 | () |
+| dereference.rs:227:5:227:34 | ...::main(...) |  | file://:0:0:0:0 | () |
 | dyn_type.rs:7:10:7:14 | SelfParam |  | file://:0:0:0:0 | & |
 | dyn_type.rs:7:10:7:14 | SelfParam | &T | dyn_type.rs:5:1:8:1 | Self [trait MyTrait1] |
 | dyn_type.rs:12:12:12:16 | SelfParam |  | file://:0:0:0:0 | & |
@@ -453,9 +910,7 @@ inferType
 | dyn_type.rs:29:17:29:30 | "MyTrait1: {}" | &T | {EXTERNAL LOCATION} | str |
 | dyn_type.rs:29:17:29:42 | ...::format(...) |  | {EXTERNAL LOCATION} | String |
 | dyn_type.rs:29:17:29:42 | ...::must_use(...) |  | {EXTERNAL LOCATION} | String |
-| dyn_type.rs:29:17:29:42 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
 | dyn_type.rs:29:17:29:42 | MacroBlockExpr |  | {EXTERNAL LOCATION} | String |
-| dyn_type.rs:29:17:29:42 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | dyn_type.rs:29:17:29:42 | { ... } |  | {EXTERNAL LOCATION} | String |
 | dyn_type.rs:29:33:29:36 | self |  | file://:0:0:0:0 | & |
 | dyn_type.rs:29:33:29:36 | self | &T | dyn_type.rs:21:1:24:1 | MyStruct |
@@ -501,13 +956,12 @@ inferType
 | dyn_type.rs:61:5:61:36 | ...::new(...) | T | dyn_type.rs:33:1:36:1 | GenStruct |
 | dyn_type.rs:61:5:61:36 | ...::new(...) | T.A | dyn_type.rs:60:18:60:43 | A |
 | dyn_type.rs:61:5:61:36 | ...::new(...) | T.dyn(A) | dyn_type.rs:60:18:60:43 | A |
-| dyn_type.rs:61:14:61:35 | GenStruct {...} |  | dyn_type.rs:10:1:13:1 | dyn GenericGet |
 | dyn_type.rs:61:14:61:35 | GenStruct {...} |  | dyn_type.rs:33:1:36:1 | GenStruct |
 | dyn_type.rs:61:14:61:35 | GenStruct {...} | A | dyn_type.rs:60:18:60:43 | A |
-| dyn_type.rs:61:14:61:35 | GenStruct {...} | dyn(A) | dyn_type.rs:60:18:60:43 | A |
 | dyn_type.rs:61:33:61:33 | a |  | dyn_type.rs:60:18:60:43 | A |
 | dyn_type.rs:64:25:64:27 | obj |  | file://:0:0:0:0 | & |
 | dyn_type.rs:64:25:64:27 | obj | &T | dyn_type.rs:5:1:8:1 | dyn MyTrait1 |
+| dyn_type.rs:64:45:66:1 | { ... } |  | file://:0:0:0:0 | () |
 | dyn_type.rs:65:9:65:15 | _result |  | {EXTERNAL LOCATION} | String |
 | dyn_type.rs:65:19:65:24 | (...) |  | dyn_type.rs:5:1:8:1 | dyn MyTrait1 |
 | dyn_type.rs:65:19:65:28 | ... .m() |  | {EXTERNAL LOCATION} | String |
@@ -517,6 +971,7 @@ inferType
 | dyn_type.rs:68:27:68:29 | obj |  | file://:0:0:0:0 | & |
 | dyn_type.rs:68:27:68:29 | obj | &T | dyn_type.rs:10:1:13:1 | dyn GenericGet |
 | dyn_type.rs:68:27:68:29 | obj | &T.dyn(A) | {EXTERNAL LOCATION} | String |
+| dyn_type.rs:68:57:71:1 | { ... } |  | file://:0:0:0:0 | () |
 | dyn_type.rs:69:9:69:16 | _result1 |  | {EXTERNAL LOCATION} | String |
 | dyn_type.rs:69:20:69:25 | (...) |  | dyn_type.rs:10:1:13:1 | dyn GenericGet |
 | dyn_type.rs:69:20:69:25 | (...) | dyn(A) | {EXTERNAL LOCATION} | String |
@@ -531,6 +986,7 @@ inferType
 | dyn_type.rs:70:26:70:28 | obj |  | file://:0:0:0:0 | & |
 | dyn_type.rs:70:26:70:28 | obj | &T | dyn_type.rs:10:1:13:1 | dyn GenericGet |
 | dyn_type.rs:70:26:70:28 | obj | &T.dyn(A) | {EXTERNAL LOCATION} | String |
+| dyn_type.rs:73:26:76:1 | { ... } |  | file://:0:0:0:0 | () |
 | dyn_type.rs:74:9:74:11 | obj |  | {EXTERNAL LOCATION} | Box |
 | dyn_type.rs:74:9:74:11 | obj | A | {EXTERNAL LOCATION} | Global |
 | dyn_type.rs:74:9:74:11 | obj | T | dyn_type.rs:10:1:13:1 | dyn GenericGet |
@@ -578,6 +1034,7 @@ inferType
 | dyn_type.rs:86:20:86:22 | obj | &T | dyn_type.rs:15:1:19:1 | dyn AssocTrait |
 | dyn_type.rs:86:20:86:22 | obj | &T.dyn(AP) | {EXTERNAL LOCATION} | bool |
 | dyn_type.rs:86:20:86:22 | obj | &T.dyn(GP) | {EXTERNAL LOCATION} | i64 |
+| dyn_type.rs:86:58:99:1 | { ... } |  | file://:0:0:0:0 | () |
 | dyn_type.rs:87:9:90:5 | TuplePat |  | file://:0:0:0:0 | (T_2) |
 | dyn_type.rs:87:9:90:5 | TuplePat | 0(2) | {EXTERNAL LOCATION} | i64 |
 | dyn_type.rs:87:9:90:5 | TuplePat | 1(2) | {EXTERNAL LOCATION} | bool |
@@ -620,56 +1077,112 @@ inferType
 | dyn_type.rs:98:19:98:21 | obj | &T | dyn_type.rs:15:1:19:1 | dyn AssocTrait |
 | dyn_type.rs:98:19:98:21 | obj | &T.dyn(AP) | {EXTERNAL LOCATION} | bool |
 | dyn_type.rs:98:19:98:21 | obj | &T.dyn(GP) | {EXTERNAL LOCATION} | i64 |
+| dyn_type.rs:101:15:108:1 | { ... } |  | file://:0:0:0:0 | () |
+| dyn_type.rs:102:5:102:49 | test_basic_dyn_trait(...) |  | file://:0:0:0:0 | () |
 | dyn_type.rs:102:26:102:48 | &... |  | file://:0:0:0:0 | & |
-| dyn_type.rs:102:26:102:48 | &... | &T | dyn_type.rs:5:1:8:1 | dyn MyTrait1 |
 | dyn_type.rs:102:26:102:48 | &... | &T | dyn_type.rs:21:1:24:1 | MyStruct |
-| dyn_type.rs:102:27:102:48 | MyStruct {...} |  | dyn_type.rs:5:1:8:1 | dyn MyTrait1 |
 | dyn_type.rs:102:27:102:48 | MyStruct {...} |  | dyn_type.rs:21:1:24:1 | MyStruct |
 | dyn_type.rs:102:45:102:46 | 42 |  | {EXTERNAL LOCATION} | i32 |
+| dyn_type.rs:103:5:105:6 | test_generic_dyn_trait(...) |  | file://:0:0:0:0 | () |
 | dyn_type.rs:103:28:105:5 | &... |  | file://:0:0:0:0 | & |
-| dyn_type.rs:103:28:105:5 | &... | &T | dyn_type.rs:10:1:13:1 | dyn GenericGet |
 | dyn_type.rs:103:28:105:5 | &... | &T | dyn_type.rs:33:1:36:1 | GenStruct |
-| dyn_type.rs:103:28:105:5 | &... | &T.dyn(A) | {EXTERNAL LOCATION} | String |
-| dyn_type.rs:103:29:105:5 | GenStruct {...} |  | dyn_type.rs:10:1:13:1 | dyn GenericGet |
+| dyn_type.rs:103:28:105:5 | &... | &T.A | {EXTERNAL LOCATION} | String |
 | dyn_type.rs:103:29:105:5 | GenStruct {...} |  | dyn_type.rs:33:1:36:1 | GenStruct |
-| dyn_type.rs:103:29:105:5 | GenStruct {...} | dyn(A) | {EXTERNAL LOCATION} | String |
+| dyn_type.rs:103:29:105:5 | GenStruct {...} | A | {EXTERNAL LOCATION} | String |
 | dyn_type.rs:104:16:104:17 | "" |  | file://:0:0:0:0 | & |
 | dyn_type.rs:104:16:104:17 | "" | &T | {EXTERNAL LOCATION} | str |
+| dyn_type.rs:104:16:104:29 | "".to_string() |  | {EXTERNAL LOCATION} | String |
+| dyn_type.rs:106:5:106:25 | test_poly_dyn_trait(...) |  | file://:0:0:0:0 | () |
+| dyn_type.rs:107:5:107:46 | test_assoc_type(...) |  | file://:0:0:0:0 | () |
 | dyn_type.rs:107:21:107:45 | &... |  | file://:0:0:0:0 | & |
-| dyn_type.rs:107:21:107:45 | &... | &T | dyn_type.rs:15:1:19:1 | dyn AssocTrait |
 | dyn_type.rs:107:21:107:45 | &... | &T | dyn_type.rs:33:1:36:1 | GenStruct |
 | dyn_type.rs:107:21:107:45 | &... | &T.A | {EXTERNAL LOCATION} | i32 |
-| dyn_type.rs:107:21:107:45 | &... | &T.dyn(AP) | {EXTERNAL LOCATION} | bool |
-| dyn_type.rs:107:21:107:45 | &... | &T.dyn(GP) | {EXTERNAL LOCATION} | i64 |
-| dyn_type.rs:107:22:107:45 | GenStruct {...} |  | dyn_type.rs:15:1:19:1 | dyn AssocTrait |
 | dyn_type.rs:107:22:107:45 | GenStruct {...} |  | dyn_type.rs:33:1:36:1 | GenStruct |
 | dyn_type.rs:107:22:107:45 | GenStruct {...} | A | {EXTERNAL LOCATION} | i32 |
-| dyn_type.rs:107:22:107:45 | GenStruct {...} | dyn(AP) | {EXTERNAL LOCATION} | bool |
-| dyn_type.rs:107:22:107:45 | GenStruct {...} | dyn(GP) | {EXTERNAL LOCATION} | i64 |
 | dyn_type.rs:107:41:107:43 | 100 |  | {EXTERNAL LOCATION} | i32 |
-| loop/main.rs:7:12:7:15 | SelfParam |  | loop/main.rs:6:1:8:1 | Self [trait T1] |
-| loop/main.rs:11:12:11:15 | SelfParam |  | loop/main.rs:10:1:14:1 | Self [trait T2] |
-| loop/main.rs:12:9:12:12 | self |  | loop/main.rs:10:1:14:1 | Self [trait T2] |
+| invalid/main.rs:8:16:8:19 | SelfParam |  | invalid/main.rs:7:5:9:5 | Self [trait T1] |
+| invalid/main.rs:8:22:8:23 | { ... } |  | file://:0:0:0:0 | () |
+| invalid/main.rs:12:16:12:19 | SelfParam |  | invalid/main.rs:11:5:15:5 | Self [trait T2] |
+| invalid/main.rs:12:22:14:9 | { ... } |  | file://:0:0:0:0 | () |
+| invalid/main.rs:13:13:13:16 | self |  | invalid/main.rs:11:5:15:5 | Self [trait T2] |
+| invalid/main.rs:13:13:13:22 | self.foo() |  | file://:0:0:0:0 | () |
+| invalid/main.rs:25:22:25:25 | SelfParam |  | invalid/main.rs:24:5:26:5 | Self [trait AddAlias] |
+| invalid/main.rs:25:28:25:32 | other |  | invalid/main.rs:24:5:26:5 | Self [trait AddAlias] |
+| invalid/main.rs:29:22:29:25 | SelfParam |  | invalid/main.rs:21:5:22:20 | Num |
+| invalid/main.rs:29:28:29:32 | other |  | invalid/main.rs:21:5:22:20 | Num |
+| invalid/main.rs:29:49:31:9 | { ... } |  | invalid/main.rs:21:5:22:20 | Num |
+| invalid/main.rs:30:13:30:33 | Num(...) |  | invalid/main.rs:21:5:22:20 | Num |
+| invalid/main.rs:30:17:30:20 | self |  | invalid/main.rs:21:5:22:20 | Num |
+| invalid/main.rs:30:17:30:22 | self.0 |  | {EXTERNAL LOCATION} | i32 |
+| invalid/main.rs:30:17:30:32 | ... + ... |  | {EXTERNAL LOCATION} | i32 |
+| invalid/main.rs:30:26:30:30 | other |  | invalid/main.rs:21:5:22:20 | Num |
+| invalid/main.rs:30:26:30:32 | other.0 |  | {EXTERNAL LOCATION} | i32 |
+| invalid/main.rs:39:16:39:19 | SelfParam |  | invalid/main.rs:35:10:35:20 | T |
+| invalid/main.rs:39:22:39:26 | other |  | invalid/main.rs:35:10:35:20 | T |
+| invalid/main.rs:39:43:41:9 | { ... } |  | invalid/main.rs:35:10:35:20 | T |
+| invalid/main.rs:40:13:40:16 | self |  | invalid/main.rs:35:10:35:20 | T |
+| invalid/main.rs:40:13:40:33 | self.add_alias(...) |  | invalid/main.rs:35:10:35:20 | T |
+| invalid/main.rs:40:28:40:32 | other |  | invalid/main.rs:35:10:35:20 | T |
+| invalid/main.rs:44:30:49:5 | { ... } |  | file://:0:0:0:0 | () |
+| invalid/main.rs:45:13:45:13 | a |  | invalid/main.rs:21:5:22:20 | Num |
+| invalid/main.rs:45:17:45:22 | Num(...) |  | invalid/main.rs:21:5:22:20 | Num |
+| invalid/main.rs:45:21:45:21 | 5 |  | {EXTERNAL LOCATION} | i32 |
+| invalid/main.rs:46:13:46:13 | b |  | invalid/main.rs:21:5:22:20 | Num |
+| invalid/main.rs:46:17:46:23 | Num(...) |  | invalid/main.rs:21:5:22:20 | Num |
+| invalid/main.rs:46:21:46:22 | 10 |  | {EXTERNAL LOCATION} | i32 |
+| invalid/main.rs:47:13:47:13 | c |  | invalid/main.rs:21:5:22:20 | Num |
+| invalid/main.rs:47:17:47:17 | a |  | invalid/main.rs:21:5:22:20 | Num |
+| invalid/main.rs:47:17:47:21 | ... + ... |  | invalid/main.rs:21:5:22:20 | Num |
+| invalid/main.rs:47:21:47:21 | b |  | invalid/main.rs:21:5:22:20 | Num |
+| invalid/main.rs:57:19:57:23 | SelfParam |  | file://:0:0:0:0 | & |
+| invalid/main.rs:57:19:57:23 | SelfParam | &T | invalid/main.rs:56:5:58:5 | Self [trait Clone1] |
+| invalid/main.rs:61:22:61:26 | SelfParam |  | file://:0:0:0:0 | & |
+| invalid/main.rs:61:22:61:26 | SelfParam | &T | invalid/main.rs:60:5:64:5 | Self [trait Duplicatable] |
+| invalid/main.rs:68:19:68:23 | SelfParam |  | file://:0:0:0:0 | & |
+| invalid/main.rs:68:19:68:23 | SelfParam | &T | invalid/main.rs:53:5:54:14 | S1 |
+| invalid/main.rs:68:34:70:9 | { ... } |  | invalid/main.rs:53:5:54:14 | S1 |
+| invalid/main.rs:69:13:69:17 | * ... |  | invalid/main.rs:53:5:54:14 | S1 |
+| invalid/main.rs:69:14:69:17 | self |  | file://:0:0:0:0 | & |
+| invalid/main.rs:69:14:69:17 | self | &T | invalid/main.rs:53:5:54:14 | S1 |
+| invalid/main.rs:75:22:75:26 | SelfParam |  | file://:0:0:0:0 | & |
+| invalid/main.rs:75:22:75:26 | SelfParam | &T | invalid/main.rs:53:5:54:14 | S1 |
+| invalid/main.rs:75:37:77:9 | { ... } |  | invalid/main.rs:53:5:54:14 | S1 |
+| invalid/main.rs:76:13:76:17 | * ... |  | invalid/main.rs:53:5:54:14 | S1 |
+| invalid/main.rs:76:14:76:17 | self |  | file://:0:0:0:0 | & |
+| invalid/main.rs:76:14:76:17 | self | &T | invalid/main.rs:53:5:54:14 | S1 |
+| invalid/main.rs:83:22:83:26 | SelfParam |  | file://:0:0:0:0 | & |
+| invalid/main.rs:83:22:83:26 | SelfParam | &T | invalid/main.rs:81:10:81:18 | T |
+| invalid/main.rs:83:37:85:9 | { ... } |  | invalid/main.rs:81:10:81:18 | T |
+| invalid/main.rs:84:13:84:16 | self |  | file://:0:0:0:0 | & |
+| invalid/main.rs:84:13:84:16 | self | &T | invalid/main.rs:81:10:81:18 | T |
+| invalid/main.rs:84:13:84:25 | self.clone1() |  | invalid/main.rs:81:10:81:18 | T |
+| invalid/main.rs:88:33:92:5 | { ... } |  | file://:0:0:0:0 | () |
+| invalid/main.rs:91:13:91:13 | x |  | invalid/main.rs:53:5:54:14 | S1 |
+| invalid/main.rs:91:17:91:18 | S1 |  | invalid/main.rs:53:5:54:14 | S1 |
+| invalid/main.rs:91:17:91:30 | S1.duplicate() |  | invalid/main.rs:53:5:54:14 | S1 |
+| main.rs:25:30:28:5 | { ... } |  | file://:0:0:0:0 | () |
 | main.rs:26:13:26:13 | x |  | main.rs:5:5:8:5 | MyThing |
 | main.rs:26:17:26:32 | MyThing {...} |  | main.rs:5:5:8:5 | MyThing |
 | main.rs:26:30:26:30 | S |  | main.rs:3:5:4:13 | S |
 | main.rs:27:18:27:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
 | main.rs:27:18:27:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:27:18:27:28 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:27:18:27:28 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:27:18:27:28 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:27:18:27:28 | { ... } |  | file://:0:0:0:0 | () |
 | main.rs:27:26:27:26 | x |  | main.rs:5:5:8:5 | MyThing |
 | main.rs:27:26:27:28 | x.a |  | main.rs:3:5:4:13 | S |
 | main.rs:30:29:30:29 | x |  | main.rs:16:5:19:5 | GenericThing |
 | main.rs:30:29:30:29 | x | A | {EXTERNAL LOCATION} | bool |
+| main.rs:30:46:33:5 | { ... } |  | file://:0:0:0:0 | () |
 | main.rs:31:13:31:13 | a |  | {EXTERNAL LOCATION} | bool |
 | main.rs:31:17:31:17 | x |  | main.rs:16:5:19:5 | GenericThing |
 | main.rs:31:17:31:17 | x | A | {EXTERNAL LOCATION} | bool |
 | main.rs:31:17:31:19 | x.a |  | {EXTERNAL LOCATION} | bool |
 | main.rs:32:18:32:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
 | main.rs:32:18:32:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:32:18:32:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:32:18:32:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:32:18:32:26 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:32:18:32:26 | { ... } |  | file://:0:0:0:0 | () |
 | main.rs:32:26:32:26 | a |  | {EXTERNAL LOCATION} | bool |
+| main.rs:35:31:63:5 | { ... } |  | file://:0:0:0:0 | () |
 | main.rs:37:13:37:13 | x |  | main.rs:16:5:19:5 | GenericThing |
 | main.rs:37:13:37:13 | x | A | main.rs:3:5:4:13 | S |
 | main.rs:37:17:37:42 | GenericThing::<...> {...} |  | main.rs:16:5:19:5 | GenericThing |
@@ -677,8 +1190,8 @@ inferType
 | main.rs:37:40:37:40 | S |  | main.rs:3:5:4:13 | S |
 | main.rs:38:18:38:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
 | main.rs:38:18:38:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:38:18:38:28 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:38:18:38:28 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:38:18:38:28 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:38:18:38:28 | { ... } |  | file://:0:0:0:0 | () |
 | main.rs:38:26:38:26 | x |  | main.rs:16:5:19:5 | GenericThing |
 | main.rs:38:26:38:26 | x | A | main.rs:3:5:4:13 | S |
 | main.rs:38:26:38:28 | x.a |  | main.rs:3:5:4:13 | S |
@@ -689,8 +1202,8 @@ inferType
 | main.rs:41:35:41:35 | S |  | main.rs:3:5:4:13 | S |
 | main.rs:42:18:42:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
 | main.rs:42:18:42:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:42:18:42:28 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:42:18:42:28 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:42:18:42:28 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:42:18:42:28 | { ... } |  | file://:0:0:0:0 | () |
 | main.rs:42:26:42:26 | x |  | main.rs:16:5:19:5 | GenericThing |
 | main.rs:42:26:42:26 | x | A | main.rs:3:5:4:13 | S |
 | main.rs:42:26:42:28 | x.a |  | main.rs:3:5:4:13 | S |
@@ -700,8 +1213,8 @@ inferType
 | main.rs:47:16:47:33 | ...::MyNone(...) | T | main.rs:3:5:4:13 | S |
 | main.rs:49:18:49:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
 | main.rs:49:18:49:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:49:18:49:28 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:49:18:49:28 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:49:18:49:28 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:49:18:49:28 | { ... } |  | file://:0:0:0:0 | () |
 | main.rs:49:26:49:26 | x |  | main.rs:21:5:23:5 | OptionS |
 | main.rs:49:26:49:28 | x.a |  | main.rs:10:5:14:5 | MyOption |
 | main.rs:49:26:49:28 | x.a | T | main.rs:3:5:4:13 | S |
@@ -715,8 +1228,8 @@ inferType
 | main.rs:53:16:53:33 | ...::MyNone(...) | T | main.rs:3:5:4:13 | S |
 | main.rs:55:18:55:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
 | main.rs:55:18:55:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:55:18:55:28 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:55:18:55:28 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:55:18:55:28 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:55:18:55:28 | { ... } |  | file://:0:0:0:0 | () |
 | main.rs:55:26:55:26 | x |  | main.rs:16:5:19:5 | GenericThing |
 | main.rs:55:26:55:26 | x | A | main.rs:10:5:14:5 | MyOption |
 | main.rs:55:26:55:26 | x | A.T | main.rs:3:5:4:13 | S |
@@ -739,10 +1252,13 @@ inferType
 | main.rs:61:30:61:32 | x.a | T | main.rs:3:5:4:13 | S |
 | main.rs:62:18:62:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
 | main.rs:62:18:62:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:62:18:62:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:62:18:62:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:62:18:62:26 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:62:18:62:26 | { ... } |  | file://:0:0:0:0 | () |
 | main.rs:62:26:62:26 | a |  | main.rs:10:5:14:5 | MyOption |
 | main.rs:62:26:62:26 | a | T | main.rs:3:5:4:13 | S |
+| main.rs:65:16:68:5 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:66:9:66:29 | simple_field_access(...) |  | file://:0:0:0:0 | () |
+| main.rs:67:9:67:30 | generic_field_access(...) |  | file://:0:0:0:0 | () |
 | main.rs:75:19:75:22 | SelfParam |  | main.rs:72:5:72:21 | Foo |
 | main.rs:75:33:77:9 | { ... } |  | main.rs:72:5:72:21 | Foo |
 | main.rs:76:13:76:16 | self |  | main.rs:72:5:72:21 | Foo |
@@ -752,8 +1268,8 @@ inferType
 | main.rs:84:23:89:5 | { ... } |  | main.rs:72:5:72:21 | Foo |
 | main.rs:85:18:85:33 | "main.rs::m1::f\\n" |  | file://:0:0:0:0 | & |
 | main.rs:85:18:85:33 | "main.rs::m1::f\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:85:18:85:33 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:85:18:85:33 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:85:18:85:33 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:85:18:85:33 | { ... } |  | file://:0:0:0:0 | () |
 | main.rs:86:13:86:13 | x |  | main.rs:72:5:72:21 | Foo |
 | main.rs:86:17:86:22 | Foo {...} |  | main.rs:72:5:72:21 | Foo |
 | main.rs:87:13:87:13 | y |  | main.rs:72:5:72:21 | Foo |
@@ -764,8 +1280,8 @@ inferType
 | main.rs:91:37:95:5 | { ... } |  | main.rs:72:5:72:21 | Foo |
 | main.rs:92:18:92:33 | "main.rs::m1::g\\n" |  | file://:0:0:0:0 | & |
 | main.rs:92:18:92:33 | "main.rs::m1::g\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:92:18:92:33 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:92:18:92:33 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:92:18:92:33 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:92:18:92:33 | { ... } |  | file://:0:0:0:0 | () |
 | main.rs:93:9:93:9 | x |  | main.rs:72:5:72:21 | Foo |
 | main.rs:93:9:93:14 | x.m1() |  | main.rs:72:5:72:21 | Foo |
 | main.rs:94:9:94:9 | y |  | main.rs:72:5:72:21 | Foo |
@@ -775,6 +1291,7 @@ inferType
 | main.rs:110:39:112:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
 | main.rs:111:13:111:16 | self |  | main.rs:99:5:102:5 | MyThing |
 | main.rs:111:13:111:22 | self.field |  | {EXTERNAL LOCATION} | bool |
+| main.rs:115:16:121:5 | { ... } |  | file://:0:0:0:0 | () |
 | main.rs:116:13:116:13 | x |  | main.rs:99:5:102:5 | MyThing |
 | main.rs:116:17:116:39 | MyThing {...} |  | main.rs:99:5:102:5 | MyThing |
 | main.rs:116:34:116:37 | true |  | {EXTERNAL LOCATION} | bool |
@@ -787,4174 +1304,5064 @@ inferType
 | main.rs:120:13:120:13 | b |  | {EXTERNAL LOCATION} | bool |
 | main.rs:120:17:120:40 | ...::trait_method(...) |  | {EXTERNAL LOCATION} | bool |
 | main.rs:120:39:120:39 | y |  | main.rs:99:5:102:5 | MyThing |
-| main.rs:137:15:137:18 | SelfParam |  | main.rs:125:5:128:5 | MyThing |
-| main.rs:137:15:137:18 | SelfParam | A | main.rs:130:5:131:14 | S1 |
-| main.rs:137:27:139:9 | { ... } |  | main.rs:130:5:131:14 | S1 |
-| main.rs:138:13:138:16 | self |  | main.rs:125:5:128:5 | MyThing |
-| main.rs:138:13:138:16 | self | A | main.rs:130:5:131:14 | S1 |
-| main.rs:138:13:138:18 | self.a |  | main.rs:130:5:131:14 | S1 |
-| main.rs:144:15:144:18 | SelfParam |  | main.rs:125:5:128:5 | MyThing |
-| main.rs:144:15:144:18 | SelfParam | A | main.rs:132:5:133:14 | S2 |
-| main.rs:144:29:146:9 | { ... } |  | main.rs:125:5:128:5 | MyThing |
-| main.rs:144:29:146:9 | { ... } | A | main.rs:132:5:133:14 | S2 |
-| main.rs:145:13:145:30 | Self {...} |  | main.rs:125:5:128:5 | MyThing |
-| main.rs:145:13:145:30 | Self {...} | A | main.rs:132:5:133:14 | S2 |
-| main.rs:145:23:145:26 | self |  | main.rs:125:5:128:5 | MyThing |
-| main.rs:145:23:145:26 | self | A | main.rs:132:5:133:14 | S2 |
-| main.rs:145:23:145:28 | self.a |  | main.rs:132:5:133:14 | S2 |
-| main.rs:150:15:150:18 | SelfParam |  | main.rs:125:5:128:5 | MyThing |
-| main.rs:150:15:150:18 | SelfParam | A | main.rs:149:10:149:10 | T |
-| main.rs:150:26:152:9 | { ... } |  | main.rs:149:10:149:10 | T |
-| main.rs:151:13:151:16 | self |  | main.rs:125:5:128:5 | MyThing |
-| main.rs:151:13:151:16 | self | A | main.rs:149:10:149:10 | T |
-| main.rs:151:13:151:18 | self.a |  | main.rs:149:10:149:10 | T |
-| main.rs:156:13:156:13 | x |  | main.rs:125:5:128:5 | MyThing |
-| main.rs:156:13:156:13 | x | A | main.rs:130:5:131:14 | S1 |
-| main.rs:156:17:156:33 | MyThing {...} |  | main.rs:125:5:128:5 | MyThing |
-| main.rs:156:17:156:33 | MyThing {...} | A | main.rs:130:5:131:14 | S1 |
-| main.rs:156:30:156:31 | S1 |  | main.rs:130:5:131:14 | S1 |
-| main.rs:157:13:157:13 | y |  | main.rs:125:5:128:5 | MyThing |
-| main.rs:157:13:157:13 | y | A | main.rs:132:5:133:14 | S2 |
-| main.rs:157:17:157:33 | MyThing {...} |  | main.rs:125:5:128:5 | MyThing |
-| main.rs:157:17:157:33 | MyThing {...} | A | main.rs:132:5:133:14 | S2 |
-| main.rs:157:30:157:31 | S2 |  | main.rs:132:5:133:14 | S2 |
-| main.rs:160:18:160:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:160:18:160:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:160:18:160:28 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:160:18:160:28 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:160:26:160:26 | x |  | main.rs:125:5:128:5 | MyThing |
-| main.rs:160:26:160:26 | x | A | main.rs:130:5:131:14 | S1 |
-| main.rs:160:26:160:28 | x.a |  | main.rs:130:5:131:14 | S1 |
-| main.rs:161:18:161:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:161:18:161:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:161:18:161:28 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:161:18:161:28 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:161:26:161:26 | y |  | main.rs:125:5:128:5 | MyThing |
-| main.rs:161:26:161:26 | y | A | main.rs:132:5:133:14 | S2 |
-| main.rs:161:26:161:28 | y.a |  | main.rs:132:5:133:14 | S2 |
-| main.rs:163:18:163:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:163:18:163:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:163:18:163:31 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:163:18:163:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:163:26:163:26 | x |  | main.rs:125:5:128:5 | MyThing |
-| main.rs:163:26:163:26 | x | A | main.rs:130:5:131:14 | S1 |
-| main.rs:163:26:163:31 | x.m1() |  | main.rs:130:5:131:14 | S1 |
-| main.rs:164:18:164:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:164:18:164:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:164:18:164:33 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:164:18:164:33 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:164:26:164:26 | y |  | main.rs:125:5:128:5 | MyThing |
-| main.rs:164:26:164:26 | y | A | main.rs:132:5:133:14 | S2 |
-| main.rs:164:26:164:31 | y.m1() |  | main.rs:125:5:128:5 | MyThing |
-| main.rs:164:26:164:31 | y.m1() | A | main.rs:132:5:133:14 | S2 |
-| main.rs:164:26:164:33 | ... .a |  | main.rs:132:5:133:14 | S2 |
-| main.rs:166:13:166:13 | x |  | main.rs:125:5:128:5 | MyThing |
-| main.rs:166:13:166:13 | x | A | main.rs:130:5:131:14 | S1 |
-| main.rs:166:17:166:33 | MyThing {...} |  | main.rs:125:5:128:5 | MyThing |
-| main.rs:166:17:166:33 | MyThing {...} | A | main.rs:130:5:131:14 | S1 |
-| main.rs:166:30:166:31 | S1 |  | main.rs:130:5:131:14 | S1 |
-| main.rs:167:13:167:13 | y |  | main.rs:125:5:128:5 | MyThing |
-| main.rs:167:13:167:13 | y | A | main.rs:132:5:133:14 | S2 |
-| main.rs:167:17:167:33 | MyThing {...} |  | main.rs:125:5:128:5 | MyThing |
-| main.rs:167:17:167:33 | MyThing {...} | A | main.rs:132:5:133:14 | S2 |
-| main.rs:167:30:167:31 | S2 |  | main.rs:132:5:133:14 | S2 |
-| main.rs:169:18:169:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:169:18:169:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:169:18:169:31 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:169:18:169:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:169:26:169:26 | x |  | main.rs:125:5:128:5 | MyThing |
-| main.rs:169:26:169:26 | x | A | main.rs:130:5:131:14 | S1 |
-| main.rs:169:26:169:31 | x.m2() |  | main.rs:130:5:131:14 | S1 |
-| main.rs:170:18:170:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:170:18:170:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:170:18:170:31 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:170:18:170:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:170:26:170:26 | y |  | main.rs:125:5:128:5 | MyThing |
-| main.rs:170:26:170:26 | y | A | main.rs:132:5:133:14 | S2 |
-| main.rs:170:26:170:31 | y.m2() |  | main.rs:132:5:133:14 | S2 |
-| main.rs:194:15:194:18 | SelfParam |  | main.rs:193:5:202:5 | Self [trait MyTrait] |
-| main.rs:196:15:196:18 | SelfParam |  | main.rs:193:5:202:5 | Self [trait MyTrait] |
-| main.rs:199:9:201:9 | { ... } |  | main.rs:193:5:202:5 | Self [trait MyTrait] |
-| main.rs:200:13:200:16 | self |  | main.rs:193:5:202:5 | Self [trait MyTrait] |
-| main.rs:206:16:206:19 | SelfParam |  | main.rs:204:5:209:5 | Self [trait MyProduct] |
-| main.rs:208:16:208:19 | SelfParam |  | main.rs:204:5:209:5 | Self [trait MyProduct] |
-| main.rs:211:43:211:43 | x |  | main.rs:211:26:211:40 | T2 |
-| main.rs:211:56:213:5 | { ... } |  | main.rs:211:22:211:23 | T1 |
-| main.rs:212:9:212:9 | x |  | main.rs:211:26:211:40 | T2 |
-| main.rs:212:9:212:14 | x.m1() |  | main.rs:211:22:211:23 | T1 |
-| main.rs:217:15:217:18 | SelfParam |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:217:15:217:18 | SelfParam | A | main.rs:186:5:187:14 | S1 |
-| main.rs:217:27:219:9 | { ... } |  | main.rs:186:5:187:14 | S1 |
-| main.rs:218:13:218:16 | self |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:218:13:218:16 | self | A | main.rs:186:5:187:14 | S1 |
-| main.rs:218:13:218:18 | self.a |  | main.rs:186:5:187:14 | S1 |
-| main.rs:224:15:224:18 | SelfParam |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:224:15:224:18 | SelfParam | A | main.rs:188:5:189:14 | S2 |
-| main.rs:224:29:226:9 | { ... } |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:224:29:226:9 | { ... } | A | main.rs:188:5:189:14 | S2 |
-| main.rs:225:13:225:30 | Self {...} |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:225:13:225:30 | Self {...} | A | main.rs:188:5:189:14 | S2 |
-| main.rs:225:23:225:26 | self |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:225:23:225:26 | self | A | main.rs:188:5:189:14 | S2 |
-| main.rs:225:23:225:28 | self.a |  | main.rs:188:5:189:14 | S2 |
-| main.rs:236:15:236:18 | SelfParam |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:236:15:236:18 | SelfParam | A | main.rs:190:5:191:14 | S3 |
-| main.rs:236:27:238:9 | { ... } |  | main.rs:231:10:231:11 | TD |
-| main.rs:237:13:237:25 | ...::default(...) |  | main.rs:231:10:231:11 | TD |
-| main.rs:243:15:243:18 | SelfParam |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:243:15:243:18 | SelfParam | P1 | main.rs:241:10:241:10 | I |
-| main.rs:243:15:243:18 | SelfParam | P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:243:26:245:9 | { ... } |  | main.rs:241:10:241:10 | I |
-| main.rs:244:13:244:16 | self |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:244:13:244:16 | self | P1 | main.rs:241:10:241:10 | I |
-| main.rs:244:13:244:16 | self | P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:244:13:244:19 | self.p1 |  | main.rs:241:10:241:10 | I |
-| main.rs:250:15:250:18 | SelfParam |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:250:15:250:18 | SelfParam | P1 | main.rs:186:5:187:14 | S1 |
-| main.rs:250:15:250:18 | SelfParam | P2 | main.rs:188:5:189:14 | S2 |
-| main.rs:250:27:252:9 | { ... } |  | main.rs:190:5:191:14 | S3 |
-| main.rs:251:13:251:14 | S3 |  | main.rs:190:5:191:14 | S3 |
-| main.rs:257:15:257:18 | SelfParam |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:257:15:257:18 | SelfParam | P1 | main.rs:175:5:178:5 | MyThing |
-| main.rs:257:15:257:18 | SelfParam | P1.A | main.rs:255:10:255:11 | TT |
-| main.rs:257:15:257:18 | SelfParam | P2 | main.rs:190:5:191:14 | S3 |
-| main.rs:257:27:260:9 | { ... } |  | main.rs:255:10:255:11 | TT |
-| main.rs:258:17:258:21 | alpha |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:258:17:258:21 | alpha | A | main.rs:255:10:255:11 | TT |
-| main.rs:258:25:258:28 | self |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:258:25:258:28 | self | P1 | main.rs:175:5:178:5 | MyThing |
-| main.rs:258:25:258:28 | self | P1.A | main.rs:255:10:255:11 | TT |
-| main.rs:258:25:258:28 | self | P2 | main.rs:190:5:191:14 | S3 |
-| main.rs:258:25:258:31 | self.p1 |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:258:25:258:31 | self.p1 | A | main.rs:255:10:255:11 | TT |
-| main.rs:259:13:259:17 | alpha |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:259:13:259:17 | alpha | A | main.rs:255:10:255:11 | TT |
-| main.rs:259:13:259:19 | alpha.a |  | main.rs:255:10:255:11 | TT |
-| main.rs:266:16:266:19 | SelfParam |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:266:16:266:19 | SelfParam | P1 | main.rs:264:10:264:10 | A |
-| main.rs:266:16:266:19 | SelfParam | P2 | main.rs:264:10:264:10 | A |
-| main.rs:266:27:268:9 | { ... } |  | main.rs:264:10:264:10 | A |
-| main.rs:267:13:267:16 | self |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:267:13:267:16 | self | P1 | main.rs:264:10:264:10 | A |
-| main.rs:267:13:267:16 | self | P2 | main.rs:264:10:264:10 | A |
-| main.rs:267:13:267:19 | self.p1 |  | main.rs:264:10:264:10 | A |
-| main.rs:271:16:271:19 | SelfParam |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:271:16:271:19 | SelfParam | P1 | main.rs:264:10:264:10 | A |
-| main.rs:271:16:271:19 | SelfParam | P2 | main.rs:264:10:264:10 | A |
-| main.rs:271:27:273:9 | { ... } |  | main.rs:264:10:264:10 | A |
-| main.rs:272:13:272:16 | self |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:272:13:272:16 | self | P1 | main.rs:264:10:264:10 | A |
-| main.rs:272:13:272:16 | self | P2 | main.rs:264:10:264:10 | A |
-| main.rs:272:13:272:19 | self.p2 |  | main.rs:264:10:264:10 | A |
-| main.rs:279:16:279:19 | SelfParam |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:279:16:279:19 | SelfParam | P1 | main.rs:188:5:189:14 | S2 |
-| main.rs:279:16:279:19 | SelfParam | P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:279:28:281:9 | { ... } |  | main.rs:186:5:187:14 | S1 |
-| main.rs:280:13:280:16 | self |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:280:13:280:16 | self | P1 | main.rs:188:5:189:14 | S2 |
-| main.rs:280:13:280:16 | self | P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:280:13:280:19 | self.p2 |  | main.rs:186:5:187:14 | S1 |
-| main.rs:284:16:284:19 | SelfParam |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:284:16:284:19 | SelfParam | P1 | main.rs:188:5:189:14 | S2 |
-| main.rs:284:16:284:19 | SelfParam | P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:284:28:286:9 | { ... } |  | main.rs:188:5:189:14 | S2 |
-| main.rs:285:13:285:16 | self |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:285:13:285:16 | self | P1 | main.rs:188:5:189:14 | S2 |
-| main.rs:285:13:285:16 | self | P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:285:13:285:19 | self.p1 |  | main.rs:188:5:189:14 | S2 |
-| main.rs:289:46:289:46 | p |  | main.rs:289:24:289:43 | P |
-| main.rs:289:58:291:5 | { ... } |  | main.rs:289:16:289:17 | V1 |
-| main.rs:290:9:290:9 | p |  | main.rs:289:24:289:43 | P |
-| main.rs:290:9:290:15 | p.fst() |  | main.rs:289:16:289:17 | V1 |
-| main.rs:293:46:293:46 | p |  | main.rs:293:24:293:43 | P |
-| main.rs:293:58:295:5 | { ... } |  | main.rs:293:20:293:21 | V2 |
-| main.rs:294:9:294:9 | p |  | main.rs:293:24:293:43 | P |
-| main.rs:294:9:294:15 | p.snd() |  | main.rs:293:20:293:21 | V2 |
-| main.rs:297:54:297:54 | p |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:297:54:297:54 | p | P1 | main.rs:297:20:297:21 | V0 |
-| main.rs:297:54:297:54 | p | P2 | main.rs:297:32:297:51 | P |
-| main.rs:297:78:299:5 | { ... } |  | main.rs:297:24:297:25 | V1 |
-| main.rs:298:9:298:9 | p |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:298:9:298:9 | p | P1 | main.rs:297:20:297:21 | V0 |
-| main.rs:298:9:298:9 | p | P2 | main.rs:297:32:297:51 | P |
-| main.rs:298:9:298:12 | p.p2 |  | main.rs:297:32:297:51 | P |
-| main.rs:298:9:298:18 | ... .fst() |  | main.rs:297:24:297:25 | V1 |
-| main.rs:303:23:303:26 | SelfParam |  | main.rs:301:5:304:5 | Self [trait ConvertTo] |
-| main.rs:308:23:308:26 | SelfParam |  | main.rs:306:10:306:23 | T |
-| main.rs:308:35:310:9 | { ... } |  | main.rs:186:5:187:14 | S1 |
-| main.rs:309:13:309:16 | self |  | main.rs:306:10:306:23 | T |
-| main.rs:309:13:309:21 | self.m1() |  | main.rs:186:5:187:14 | S1 |
-| main.rs:313:41:313:45 | thing |  | main.rs:313:23:313:38 | T |
-| main.rs:313:57:315:5 | { ... } |  | main.rs:313:19:313:20 | TS |
-| main.rs:314:9:314:13 | thing |  | main.rs:313:23:313:38 | T |
-| main.rs:314:9:314:26 | thing.convert_to() |  | main.rs:313:19:313:20 | TS |
-| main.rs:317:56:317:60 | thing |  | main.rs:317:39:317:53 | TP |
-| main.rs:317:73:320:5 | { ... } |  | main.rs:186:5:187:14 | S1 |
-| main.rs:319:9:319:13 | thing |  | main.rs:317:39:317:53 | TP |
-| main.rs:319:9:319:26 | thing.convert_to() |  | main.rs:186:5:187:14 | S1 |
-| main.rs:323:13:323:20 | thing_s1 |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:323:13:323:20 | thing_s1 | A | main.rs:186:5:187:14 | S1 |
-| main.rs:323:24:323:40 | MyThing {...} |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:323:24:323:40 | MyThing {...} | A | main.rs:186:5:187:14 | S1 |
-| main.rs:323:37:323:38 | S1 |  | main.rs:186:5:187:14 | S1 |
-| main.rs:324:13:324:20 | thing_s2 |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:324:13:324:20 | thing_s2 | A | main.rs:188:5:189:14 | S2 |
-| main.rs:324:24:324:40 | MyThing {...} |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:324:24:324:40 | MyThing {...} | A | main.rs:188:5:189:14 | S2 |
-| main.rs:324:37:324:38 | S2 |  | main.rs:188:5:189:14 | S2 |
-| main.rs:325:13:325:20 | thing_s3 |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:325:13:325:20 | thing_s3 | A | main.rs:190:5:191:14 | S3 |
-| main.rs:325:24:325:40 | MyThing {...} |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:325:24:325:40 | MyThing {...} | A | main.rs:190:5:191:14 | S3 |
-| main.rs:325:37:325:38 | S3 |  | main.rs:190:5:191:14 | S3 |
-| main.rs:329:18:329:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:329:18:329:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:329:18:329:38 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:329:18:329:38 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:329:26:329:33 | thing_s1 |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:329:26:329:33 | thing_s1 | A | main.rs:186:5:187:14 | S1 |
-| main.rs:329:26:329:38 | thing_s1.m1() |  | main.rs:186:5:187:14 | S1 |
-| main.rs:330:18:330:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:330:18:330:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:330:18:330:40 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:330:18:330:40 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:330:26:330:33 | thing_s2 |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:330:26:330:33 | thing_s2 | A | main.rs:188:5:189:14 | S2 |
-| main.rs:330:26:330:38 | thing_s2.m1() |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:330:26:330:38 | thing_s2.m1() | A | main.rs:188:5:189:14 | S2 |
-| main.rs:330:26:330:40 | ... .a |  | main.rs:188:5:189:14 | S2 |
-| main.rs:331:13:331:14 | s3 |  | main.rs:190:5:191:14 | S3 |
-| main.rs:331:22:331:29 | thing_s3 |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:331:22:331:29 | thing_s3 | A | main.rs:190:5:191:14 | S3 |
-| main.rs:331:22:331:34 | thing_s3.m1() |  | main.rs:190:5:191:14 | S3 |
-| main.rs:332:18:332:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:332:18:332:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:332:18:332:27 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:332:18:332:27 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:332:26:332:27 | s3 |  | main.rs:190:5:191:14 | S3 |
-| main.rs:334:13:334:14 | p1 |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:334:13:334:14 | p1 | P1 | main.rs:186:5:187:14 | S1 |
-| main.rs:334:13:334:14 | p1 | P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:334:18:334:42 | MyPair {...} |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:334:18:334:42 | MyPair {...} | P1 | main.rs:186:5:187:14 | S1 |
-| main.rs:334:18:334:42 | MyPair {...} | P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:334:31:334:32 | S1 |  | main.rs:186:5:187:14 | S1 |
-| main.rs:334:39:334:40 | S1 |  | main.rs:186:5:187:14 | S1 |
-| main.rs:335:18:335:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:335:18:335:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:335:18:335:32 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:335:18:335:32 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:335:26:335:27 | p1 |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:335:26:335:27 | p1 | P1 | main.rs:186:5:187:14 | S1 |
-| main.rs:335:26:335:27 | p1 | P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:335:26:335:32 | p1.m1() |  | main.rs:186:5:187:14 | S1 |
-| main.rs:337:13:337:14 | p2 |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:337:13:337:14 | p2 | P1 | main.rs:186:5:187:14 | S1 |
-| main.rs:337:13:337:14 | p2 | P2 | main.rs:188:5:189:14 | S2 |
-| main.rs:337:18:337:42 | MyPair {...} |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:337:18:337:42 | MyPair {...} | P1 | main.rs:186:5:187:14 | S1 |
-| main.rs:337:18:337:42 | MyPair {...} | P2 | main.rs:188:5:189:14 | S2 |
-| main.rs:337:31:337:32 | S1 |  | main.rs:186:5:187:14 | S1 |
-| main.rs:337:39:337:40 | S2 |  | main.rs:188:5:189:14 | S2 |
-| main.rs:338:18:338:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:338:18:338:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:338:18:338:32 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:338:18:338:32 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:338:26:338:27 | p2 |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:338:26:338:27 | p2 | P1 | main.rs:186:5:187:14 | S1 |
-| main.rs:338:26:338:27 | p2 | P2 | main.rs:188:5:189:14 | S2 |
-| main.rs:338:26:338:32 | p2.m1() |  | main.rs:190:5:191:14 | S3 |
-| main.rs:340:13:340:14 | p3 |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:340:13:340:14 | p3 | P1 | main.rs:175:5:178:5 | MyThing |
-| main.rs:340:13:340:14 | p3 | P1.A | main.rs:186:5:187:14 | S1 |
-| main.rs:340:13:340:14 | p3 | P2 | main.rs:190:5:191:14 | S3 |
-| main.rs:340:18:343:9 | MyPair {...} |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:340:18:343:9 | MyPair {...} | P1 | main.rs:175:5:178:5 | MyThing |
-| main.rs:340:18:343:9 | MyPair {...} | P1.A | main.rs:186:5:187:14 | S1 |
-| main.rs:340:18:343:9 | MyPair {...} | P2 | main.rs:190:5:191:14 | S3 |
-| main.rs:341:17:341:33 | MyThing {...} |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:341:17:341:33 | MyThing {...} | A | main.rs:186:5:187:14 | S1 |
-| main.rs:341:30:341:31 | S1 |  | main.rs:186:5:187:14 | S1 |
-| main.rs:342:17:342:18 | S3 |  | main.rs:190:5:191:14 | S3 |
-| main.rs:344:18:344:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:344:18:344:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:344:18:344:32 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:344:18:344:32 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:344:26:344:27 | p3 |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:344:26:344:27 | p3 | P1 | main.rs:175:5:178:5 | MyThing |
-| main.rs:344:26:344:27 | p3 | P1.A | main.rs:186:5:187:14 | S1 |
-| main.rs:344:26:344:27 | p3 | P2 | main.rs:190:5:191:14 | S3 |
-| main.rs:344:26:344:32 | p3.m1() |  | main.rs:186:5:187:14 | S1 |
-| main.rs:347:13:347:13 | a |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:347:13:347:13 | a | P1 | main.rs:186:5:187:14 | S1 |
-| main.rs:347:13:347:13 | a | P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:347:17:347:41 | MyPair {...} |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:347:17:347:41 | MyPair {...} | P1 | main.rs:186:5:187:14 | S1 |
-| main.rs:347:17:347:41 | MyPair {...} | P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:347:30:347:31 | S1 |  | main.rs:186:5:187:14 | S1 |
-| main.rs:347:38:347:39 | S1 |  | main.rs:186:5:187:14 | S1 |
-| main.rs:348:13:348:13 | x |  | main.rs:186:5:187:14 | S1 |
-| main.rs:348:17:348:17 | a |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:348:17:348:17 | a | P1 | main.rs:186:5:187:14 | S1 |
-| main.rs:348:17:348:17 | a | P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:348:17:348:23 | a.fst() |  | main.rs:186:5:187:14 | S1 |
-| main.rs:349:18:349:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:349:18:349:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:349:18:349:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:349:18:349:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:349:26:349:26 | x |  | main.rs:186:5:187:14 | S1 |
-| main.rs:350:13:350:13 | y |  | main.rs:186:5:187:14 | S1 |
-| main.rs:350:17:350:17 | a |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:350:17:350:17 | a | P1 | main.rs:186:5:187:14 | S1 |
-| main.rs:350:17:350:17 | a | P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:350:17:350:23 | a.snd() |  | main.rs:186:5:187:14 | S1 |
-| main.rs:351:18:351:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:351:18:351:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:351:18:351:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:351:18:351:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:351:26:351:26 | y |  | main.rs:186:5:187:14 | S1 |
-| main.rs:357:13:357:13 | b |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:357:13:357:13 | b | P1 | main.rs:188:5:189:14 | S2 |
-| main.rs:357:13:357:13 | b | P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:357:17:357:41 | MyPair {...} |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:357:17:357:41 | MyPair {...} | P1 | main.rs:188:5:189:14 | S2 |
-| main.rs:357:17:357:41 | MyPair {...} | P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:357:30:357:31 | S2 |  | main.rs:188:5:189:14 | S2 |
-| main.rs:357:38:357:39 | S1 |  | main.rs:186:5:187:14 | S1 |
-| main.rs:358:13:358:13 | x |  | main.rs:186:5:187:14 | S1 |
-| main.rs:358:17:358:17 | b |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:358:17:358:17 | b | P1 | main.rs:188:5:189:14 | S2 |
-| main.rs:358:17:358:17 | b | P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:358:17:358:23 | b.fst() |  | main.rs:186:5:187:14 | S1 |
-| main.rs:359:18:359:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:359:18:359:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:359:18:359:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:359:18:359:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:359:26:359:26 | x |  | main.rs:186:5:187:14 | S1 |
-| main.rs:360:13:360:13 | y |  | main.rs:188:5:189:14 | S2 |
-| main.rs:360:17:360:17 | b |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:360:17:360:17 | b | P1 | main.rs:188:5:189:14 | S2 |
-| main.rs:360:17:360:17 | b | P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:360:17:360:23 | b.snd() |  | main.rs:188:5:189:14 | S2 |
-| main.rs:361:18:361:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:361:18:361:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:361:18:361:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:361:18:361:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:361:26:361:26 | y |  | main.rs:188:5:189:14 | S2 |
-| main.rs:365:13:365:13 | x |  | main.rs:186:5:187:14 | S1 |
-| main.rs:365:17:365:39 | call_trait_m1(...) |  | main.rs:186:5:187:14 | S1 |
-| main.rs:365:31:365:38 | thing_s1 |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:365:31:365:38 | thing_s1 | A | main.rs:186:5:187:14 | S1 |
-| main.rs:366:18:366:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:366:18:366:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:366:18:366:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:366:18:366:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:366:26:366:26 | x |  | main.rs:186:5:187:14 | S1 |
-| main.rs:367:13:367:13 | y |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:367:13:367:13 | y | A | main.rs:188:5:189:14 | S2 |
-| main.rs:367:17:367:39 | call_trait_m1(...) |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:367:17:367:39 | call_trait_m1(...) | A | main.rs:188:5:189:14 | S2 |
-| main.rs:367:31:367:38 | thing_s2 |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:367:31:367:38 | thing_s2 | A | main.rs:188:5:189:14 | S2 |
-| main.rs:368:18:368:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:368:18:368:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:368:18:368:28 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:368:18:368:28 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:368:26:368:26 | y |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:368:26:368:26 | y | A | main.rs:188:5:189:14 | S2 |
-| main.rs:368:26:368:28 | y.a |  | main.rs:188:5:189:14 | S2 |
-| main.rs:371:13:371:13 | a |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:371:13:371:13 | a | P1 | main.rs:186:5:187:14 | S1 |
-| main.rs:371:13:371:13 | a | P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:371:17:371:41 | MyPair {...} |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:371:17:371:41 | MyPair {...} | P1 | main.rs:186:5:187:14 | S1 |
-| main.rs:371:17:371:41 | MyPair {...} | P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:371:30:371:31 | S1 |  | main.rs:186:5:187:14 | S1 |
-| main.rs:371:38:371:39 | S1 |  | main.rs:186:5:187:14 | S1 |
-| main.rs:372:13:372:13 | x |  | main.rs:186:5:187:14 | S1 |
-| main.rs:372:17:372:26 | get_fst(...) |  | main.rs:186:5:187:14 | S1 |
-| main.rs:372:25:372:25 | a |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:372:25:372:25 | a | P1 | main.rs:186:5:187:14 | S1 |
-| main.rs:372:25:372:25 | a | P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:373:18:373:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:373:18:373:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:373:18:373:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:373:18:373:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:373:26:373:26 | x |  | main.rs:186:5:187:14 | S1 |
-| main.rs:374:13:374:13 | y |  | main.rs:186:5:187:14 | S1 |
-| main.rs:374:17:374:26 | get_snd(...) |  | main.rs:186:5:187:14 | S1 |
-| main.rs:374:25:374:25 | a |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:374:25:374:25 | a | P1 | main.rs:186:5:187:14 | S1 |
-| main.rs:374:25:374:25 | a | P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:375:18:375:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:375:18:375:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:375:18:375:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:375:18:375:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:375:26:375:26 | y |  | main.rs:186:5:187:14 | S1 |
-| main.rs:378:13:378:13 | b |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:378:13:378:13 | b | P1 | main.rs:188:5:189:14 | S2 |
-| main.rs:378:13:378:13 | b | P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:378:17:378:41 | MyPair {...} |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:378:17:378:41 | MyPair {...} | P1 | main.rs:188:5:189:14 | S2 |
-| main.rs:378:17:378:41 | MyPair {...} | P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:378:30:378:31 | S2 |  | main.rs:188:5:189:14 | S2 |
-| main.rs:378:38:378:39 | S1 |  | main.rs:186:5:187:14 | S1 |
-| main.rs:379:13:379:13 | x |  | main.rs:186:5:187:14 | S1 |
-| main.rs:379:17:379:26 | get_fst(...) |  | main.rs:186:5:187:14 | S1 |
-| main.rs:379:25:379:25 | b |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:379:25:379:25 | b | P1 | main.rs:188:5:189:14 | S2 |
-| main.rs:379:25:379:25 | b | P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:380:18:380:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:380:18:380:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:380:18:380:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:380:18:380:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:380:26:380:26 | x |  | main.rs:186:5:187:14 | S1 |
-| main.rs:381:13:381:13 | y |  | main.rs:188:5:189:14 | S2 |
-| main.rs:381:17:381:26 | get_snd(...) |  | main.rs:188:5:189:14 | S2 |
-| main.rs:381:25:381:25 | b |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:381:25:381:25 | b | P1 | main.rs:188:5:189:14 | S2 |
-| main.rs:381:25:381:25 | b | P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:382:18:382:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:382:18:382:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:382:18:382:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:382:18:382:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:382:26:382:26 | y |  | main.rs:188:5:189:14 | S2 |
-| main.rs:384:13:384:13 | c |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:384:13:384:13 | c | P1 | main.rs:190:5:191:14 | S3 |
-| main.rs:384:13:384:13 | c | P2 | main.rs:180:5:184:5 | MyPair |
-| main.rs:384:13:384:13 | c | P2.P1 | main.rs:188:5:189:14 | S2 |
-| main.rs:384:13:384:13 | c | P2.P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:384:17:387:9 | MyPair {...} |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:384:17:387:9 | MyPair {...} | P1 | main.rs:190:5:191:14 | S3 |
-| main.rs:384:17:387:9 | MyPair {...} | P2 | main.rs:180:5:184:5 | MyPair |
-| main.rs:384:17:387:9 | MyPair {...} | P2.P1 | main.rs:188:5:189:14 | S2 |
-| main.rs:384:17:387:9 | MyPair {...} | P2.P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:385:17:385:18 | S3 |  | main.rs:190:5:191:14 | S3 |
-| main.rs:386:17:386:41 | MyPair {...} |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:386:17:386:41 | MyPair {...} | P1 | main.rs:188:5:189:14 | S2 |
-| main.rs:386:17:386:41 | MyPair {...} | P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:386:30:386:31 | S2 |  | main.rs:188:5:189:14 | S2 |
-| main.rs:386:38:386:39 | S1 |  | main.rs:186:5:187:14 | S1 |
-| main.rs:388:13:388:13 | x |  | main.rs:186:5:187:14 | S1 |
-| main.rs:388:17:388:30 | get_snd_fst(...) |  | main.rs:186:5:187:14 | S1 |
-| main.rs:388:29:388:29 | c |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:388:29:388:29 | c | P1 | main.rs:190:5:191:14 | S3 |
-| main.rs:388:29:388:29 | c | P2 | main.rs:180:5:184:5 | MyPair |
-| main.rs:388:29:388:29 | c | P2.P1 | main.rs:188:5:189:14 | S2 |
-| main.rs:388:29:388:29 | c | P2.P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:390:13:390:17 | thing |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:390:13:390:17 | thing | A | main.rs:186:5:187:14 | S1 |
-| main.rs:390:21:390:37 | MyThing {...} |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:390:21:390:37 | MyThing {...} | A | main.rs:186:5:187:14 | S1 |
-| main.rs:390:34:390:35 | S1 |  | main.rs:186:5:187:14 | S1 |
-| main.rs:391:17:391:21 | thing |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:391:17:391:21 | thing | A | main.rs:186:5:187:14 | S1 |
-| main.rs:392:13:392:13 | j |  | main.rs:186:5:187:14 | S1 |
-| main.rs:392:17:392:33 | convert_to(...) |  | main.rs:186:5:187:14 | S1 |
-| main.rs:392:28:392:32 | thing |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:392:28:392:32 | thing | A | main.rs:186:5:187:14 | S1 |
-| main.rs:401:26:401:29 | SelfParam |  | main.rs:400:5:404:5 | Self [trait OverlappingTrait] |
-| main.rs:403:28:403:31 | SelfParam |  | main.rs:400:5:404:5 | Self [trait OverlappingTrait] |
-| main.rs:403:34:403:35 | s1 |  | main.rs:397:5:398:14 | S1 |
-| main.rs:408:26:408:29 | SelfParam |  | main.rs:397:5:398:14 | S1 |
-| main.rs:408:38:410:9 | { ... } |  | main.rs:397:5:398:14 | S1 |
-| main.rs:409:13:409:14 | S1 |  | main.rs:397:5:398:14 | S1 |
-| main.rs:413:28:413:31 | SelfParam |  | main.rs:397:5:398:14 | S1 |
-| main.rs:413:34:413:35 | s1 |  | main.rs:397:5:398:14 | S1 |
-| main.rs:413:48:415:9 | { ... } |  | main.rs:397:5:398:14 | S1 |
-| main.rs:414:13:414:14 | S1 |  | main.rs:397:5:398:14 | S1 |
-| main.rs:420:26:420:29 | SelfParam |  | main.rs:397:5:398:14 | S1 |
-| main.rs:420:38:422:9 | { ... } |  | main.rs:397:5:398:14 | S1 |
-| main.rs:421:13:421:16 | self |  | main.rs:397:5:398:14 | S1 |
-| main.rs:425:28:425:31 | SelfParam |  | main.rs:397:5:398:14 | S1 |
-| main.rs:425:40:427:9 | { ... } |  | main.rs:397:5:398:14 | S1 |
-| main.rs:426:13:426:16 | self |  | main.rs:397:5:398:14 | S1 |
-| main.rs:434:26:434:29 | SelfParam |  | main.rs:430:5:430:22 | S2 |
-| main.rs:434:26:434:29 | SelfParam | T2 | {EXTERNAL LOCATION} | i32 |
-| main.rs:434:38:436:9 | { ... } |  | main.rs:397:5:398:14 | S1 |
-| main.rs:435:13:435:14 | S1 |  | main.rs:397:5:398:14 | S1 |
-| main.rs:439:28:439:31 | SelfParam |  | main.rs:430:5:430:22 | S2 |
-| main.rs:439:28:439:31 | SelfParam | T2 | {EXTERNAL LOCATION} | i32 |
-| main.rs:439:40:441:9 | { ... } |  | main.rs:397:5:398:14 | S1 |
-| main.rs:440:13:440:14 | S1 |  | main.rs:397:5:398:14 | S1 |
-| main.rs:446:26:446:29 | SelfParam |  | main.rs:430:5:430:22 | S2 |
-| main.rs:446:26:446:29 | SelfParam | T2 | {EXTERNAL LOCATION} | i32 |
-| main.rs:446:38:448:9 | { ... } |  | main.rs:397:5:398:14 | S1 |
-| main.rs:447:13:447:14 | S1 |  | main.rs:397:5:398:14 | S1 |
-| main.rs:451:28:451:31 | SelfParam |  | main.rs:430:5:430:22 | S2 |
-| main.rs:451:28:451:31 | SelfParam | T2 | {EXTERNAL LOCATION} | i32 |
-| main.rs:451:34:451:35 | s1 |  | main.rs:397:5:398:14 | S1 |
-| main.rs:451:48:453:9 | { ... } |  | main.rs:397:5:398:14 | S1 |
-| main.rs:452:13:452:14 | S1 |  | main.rs:397:5:398:14 | S1 |
-| main.rs:458:26:458:29 | SelfParam |  | main.rs:430:5:430:22 | S2 |
-| main.rs:458:26:458:29 | SelfParam | T2 | main.rs:397:5:398:14 | S1 |
-| main.rs:458:38:460:9 | { ... } |  | main.rs:397:5:398:14 | S1 |
-| main.rs:459:13:459:14 | S1 |  | main.rs:397:5:398:14 | S1 |
-| main.rs:463:28:463:31 | SelfParam |  | main.rs:430:5:430:22 | S2 |
-| main.rs:463:28:463:31 | SelfParam | T2 | main.rs:397:5:398:14 | S1 |
-| main.rs:463:34:463:35 | s1 |  | main.rs:397:5:398:14 | S1 |
-| main.rs:463:48:465:9 | { ... } |  | main.rs:397:5:398:14 | S1 |
-| main.rs:464:13:464:14 | S1 |  | main.rs:397:5:398:14 | S1 |
-| main.rs:472:14:472:18 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:472:14:472:18 | SelfParam | &T | main.rs:471:5:473:5 | Self [trait OverlappingTrait2] |
-| main.rs:472:21:472:21 | x |  | file://:0:0:0:0 | & |
-| main.rs:472:21:472:21 | x | &T | main.rs:471:29:471:29 | T |
-| main.rs:477:14:477:18 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:477:14:477:18 | SelfParam | &T | main.rs:468:5:469:22 | S3 |
-| main.rs:477:14:477:18 | SelfParam | &T.T3 | main.rs:475:10:475:10 | T |
-| main.rs:477:21:477:21 | x |  | file://:0:0:0:0 | & |
-| main.rs:477:21:477:21 | x | &T | main.rs:475:10:475:10 | T |
-| main.rs:477:37:479:9 | { ... } |  | file://:0:0:0:0 | & |
-| main.rs:477:37:479:9 | { ... } | &T | main.rs:468:5:469:22 | S3 |
-| main.rs:477:37:479:9 | { ... } | &T.T3 | main.rs:475:10:475:10 | T |
-| main.rs:478:13:478:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:478:13:478:16 | self | &T | main.rs:468:5:469:22 | S3 |
-| main.rs:478:13:478:16 | self | &T.T3 | main.rs:475:10:475:10 | T |
-| main.rs:484:14:484:18 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:484:14:484:18 | SelfParam | &T | main.rs:468:5:469:22 | S3 |
-| main.rs:484:14:484:18 | SelfParam | &T.T3 | main.rs:482:10:482:10 | T |
-| main.rs:484:21:484:21 | x |  | main.rs:482:10:482:10 | T |
-| main.rs:484:36:486:9 | { ... } |  | file://:0:0:0:0 | & |
-| main.rs:484:36:486:9 | { ... } | &T | main.rs:468:5:469:22 | S3 |
-| main.rs:484:36:486:9 | { ... } | &T.T3 | main.rs:482:10:482:10 | T |
-| main.rs:485:13:485:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:485:13:485:16 | self | &T | main.rs:468:5:469:22 | S3 |
-| main.rs:485:13:485:16 | self | &T.T3 | main.rs:482:10:482:10 | T |
-| main.rs:490:13:490:13 | x |  | main.rs:397:5:398:14 | S1 |
-| main.rs:490:17:490:18 | S1 |  | main.rs:397:5:398:14 | S1 |
-| main.rs:491:18:491:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:491:18:491:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:491:18:491:42 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:491:18:491:42 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:491:26:491:26 | x |  | main.rs:397:5:398:14 | S1 |
-| main.rs:491:26:491:42 | x.common_method() |  | main.rs:397:5:398:14 | S1 |
-| main.rs:492:18:492:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:492:18:492:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:492:18:492:44 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:492:18:492:44 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:492:26:492:26 | x |  | main.rs:397:5:398:14 | S1 |
-| main.rs:492:26:492:44 | x.common_method_2() |  | main.rs:397:5:398:14 | S1 |
-| main.rs:494:13:494:13 | y |  | main.rs:430:5:430:22 | S2 |
-| main.rs:494:13:494:13 | y | T2 | main.rs:397:5:398:14 | S1 |
-| main.rs:494:17:494:22 | S2(...) |  | main.rs:430:5:430:22 | S2 |
-| main.rs:494:17:494:22 | S2(...) | T2 | main.rs:397:5:398:14 | S1 |
-| main.rs:494:20:494:21 | S1 |  | main.rs:397:5:398:14 | S1 |
-| main.rs:495:18:495:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:495:18:495:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:495:18:495:42 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:495:18:495:42 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:495:26:495:26 | y |  | main.rs:430:5:430:22 | S2 |
-| main.rs:495:26:495:26 | y | T2 | main.rs:397:5:398:14 | S1 |
-| main.rs:495:26:495:42 | y.common_method() |  | main.rs:397:5:398:14 | S1 |
-| main.rs:497:13:497:13 | z |  | main.rs:430:5:430:22 | S2 |
-| main.rs:497:13:497:13 | z | T2 | {EXTERNAL LOCATION} | i32 |
-| main.rs:497:17:497:21 | S2(...) |  | main.rs:430:5:430:22 | S2 |
-| main.rs:497:17:497:21 | S2(...) | T2 | {EXTERNAL LOCATION} | i32 |
-| main.rs:497:20:497:20 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:498:18:498:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:498:18:498:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:498:18:498:42 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:498:18:498:42 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:498:26:498:26 | z |  | main.rs:430:5:430:22 | S2 |
-| main.rs:498:26:498:26 | z | T2 | {EXTERNAL LOCATION} | i32 |
-| main.rs:498:26:498:42 | z.common_method() |  | main.rs:397:5:398:14 | S1 |
-| main.rs:500:13:500:13 | w |  | main.rs:468:5:469:22 | S3 |
-| main.rs:500:13:500:13 | w | T3 | main.rs:397:5:398:14 | S1 |
-| main.rs:500:17:500:22 | S3(...) |  | main.rs:468:5:469:22 | S3 |
-| main.rs:500:17:500:22 | S3(...) | T3 | main.rs:397:5:398:14 | S1 |
-| main.rs:500:20:500:21 | S1 |  | main.rs:397:5:398:14 | S1 |
-| main.rs:501:18:501:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:501:18:501:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:501:18:501:31 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:501:18:501:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:501:26:501:26 | w |  | main.rs:468:5:469:22 | S3 |
-| main.rs:501:26:501:26 | w | T3 | main.rs:397:5:398:14 | S1 |
-| main.rs:501:26:501:31 | w.m(...) |  | file://:0:0:0:0 | & |
-| main.rs:501:26:501:31 | w.m(...) | &T | main.rs:468:5:469:22 | S3 |
-| main.rs:501:26:501:31 | w.m(...) | &T.T3 | main.rs:397:5:398:14 | S1 |
-| main.rs:501:30:501:30 | x |  | main.rs:397:5:398:14 | S1 |
-| main.rs:518:19:518:22 | SelfParam |  | main.rs:516:5:519:5 | Self [trait FirstTrait] |
-| main.rs:523:19:523:22 | SelfParam |  | main.rs:521:5:524:5 | Self [trait SecondTrait] |
-| main.rs:526:64:526:64 | x |  | main.rs:526:45:526:61 | T |
-| main.rs:528:13:528:14 | s1 |  | main.rs:526:35:526:42 | I |
-| main.rs:528:18:528:18 | x |  | main.rs:526:45:526:61 | T |
-| main.rs:528:18:528:27 | x.method() |  | main.rs:526:35:526:42 | I |
-| main.rs:529:18:529:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:529:18:529:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:529:18:529:27 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:529:18:529:27 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:529:26:529:27 | s1 |  | main.rs:526:35:526:42 | I |
-| main.rs:532:65:532:65 | x |  | main.rs:532:46:532:62 | T |
-| main.rs:534:13:534:14 | s2 |  | main.rs:532:36:532:43 | I |
-| main.rs:534:18:534:18 | x |  | main.rs:532:46:532:62 | T |
-| main.rs:534:18:534:27 | x.method() |  | main.rs:532:36:532:43 | I |
-| main.rs:535:18:535:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:535:18:535:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:535:18:535:27 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:535:18:535:27 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:535:26:535:27 | s2 |  | main.rs:532:36:532:43 | I |
-| main.rs:538:49:538:49 | x |  | main.rs:538:30:538:46 | T |
-| main.rs:539:13:539:13 | s |  | main.rs:508:5:509:14 | S1 |
-| main.rs:539:17:539:17 | x |  | main.rs:538:30:538:46 | T |
-| main.rs:539:17:539:26 | x.method() |  | main.rs:508:5:509:14 | S1 |
-| main.rs:540:18:540:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:540:18:540:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:540:18:540:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:540:18:540:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:540:26:540:26 | s |  | main.rs:508:5:509:14 | S1 |
-| main.rs:543:53:543:53 | x |  | main.rs:543:34:543:50 | T |
-| main.rs:544:13:544:13 | s |  | main.rs:508:5:509:14 | S1 |
-| main.rs:544:17:544:17 | x |  | main.rs:543:34:543:50 | T |
-| main.rs:544:17:544:26 | x.method() |  | main.rs:508:5:509:14 | S1 |
-| main.rs:545:18:545:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:545:18:545:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:545:18:545:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:545:18:545:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:545:26:545:26 | s |  | main.rs:508:5:509:14 | S1 |
-| main.rs:548:43:548:43 | x |  | main.rs:548:40:548:40 | T |
-| main.rs:552:13:552:13 | s |  | main.rs:508:5:509:14 | S1 |
-| main.rs:552:17:552:17 | x |  | main.rs:548:40:548:40 | T |
-| main.rs:552:17:552:26 | x.method() |  | main.rs:508:5:509:14 | S1 |
-| main.rs:553:18:553:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:553:18:553:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:553:18:553:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:553:18:553:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:553:26:553:26 | s |  | main.rs:508:5:509:14 | S1 |
-| main.rs:557:16:557:19 | SelfParam |  | main.rs:556:5:560:5 | Self [trait Pair] |
-| main.rs:559:16:559:19 | SelfParam |  | main.rs:556:5:560:5 | Self [trait Pair] |
-| main.rs:562:53:562:53 | x |  | main.rs:562:50:562:50 | T |
-| main.rs:562:59:562:59 | y |  | main.rs:562:50:562:50 | T |
-| main.rs:567:13:567:13 | _ |  | main.rs:508:5:509:14 | S1 |
-| main.rs:567:17:567:17 | x |  | main.rs:562:50:562:50 | T |
-| main.rs:567:17:567:23 | x.fst() |  | main.rs:508:5:509:14 | S1 |
-| main.rs:568:13:568:13 | _ |  | main.rs:508:5:509:14 | S1 |
-| main.rs:568:17:568:17 | y |  | main.rs:562:50:562:50 | T |
-| main.rs:568:17:568:26 | y.method() |  | main.rs:508:5:509:14 | S1 |
-| main.rs:571:58:571:58 | x |  | main.rs:571:41:571:55 | T |
-| main.rs:571:64:571:64 | y |  | main.rs:571:41:571:55 | T |
-| main.rs:573:13:573:14 | s1 |  | main.rs:508:5:509:14 | S1 |
-| main.rs:573:18:573:18 | x |  | main.rs:571:41:571:55 | T |
-| main.rs:573:18:573:24 | x.fst() |  | main.rs:508:5:509:14 | S1 |
-| main.rs:574:13:574:14 | s2 |  | main.rs:511:5:512:14 | S2 |
-| main.rs:574:18:574:18 | y |  | main.rs:571:41:571:55 | T |
-| main.rs:574:18:574:24 | y.snd() |  | main.rs:511:5:512:14 | S2 |
-| main.rs:575:18:575:29 | "{:?}, {:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:575:18:575:29 | "{:?}, {:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:575:18:575:37 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:575:18:575:37 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:575:32:575:33 | s1 |  | main.rs:508:5:509:14 | S1 |
-| main.rs:575:36:575:37 | s2 |  | main.rs:511:5:512:14 | S2 |
-| main.rs:578:69:578:69 | x |  | main.rs:578:52:578:66 | T |
-| main.rs:578:75:578:75 | y |  | main.rs:578:52:578:66 | T |
-| main.rs:580:13:580:14 | s1 |  | main.rs:508:5:509:14 | S1 |
-| main.rs:580:18:580:18 | x |  | main.rs:578:52:578:66 | T |
-| main.rs:580:18:580:24 | x.fst() |  | main.rs:508:5:509:14 | S1 |
-| main.rs:581:13:581:14 | s2 |  | main.rs:578:41:578:49 | T2 |
-| main.rs:581:18:581:18 | y |  | main.rs:578:52:578:66 | T |
-| main.rs:581:18:581:24 | y.snd() |  | main.rs:578:41:578:49 | T2 |
-| main.rs:582:18:582:29 | "{:?}, {:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:582:18:582:29 | "{:?}, {:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:582:18:582:37 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:582:18:582:37 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:582:32:582:33 | s1 |  | main.rs:508:5:509:14 | S1 |
-| main.rs:582:36:582:37 | s2 |  | main.rs:578:41:578:49 | T2 |
-| main.rs:585:50:585:50 | x |  | main.rs:585:41:585:47 | T |
-| main.rs:585:56:585:56 | y |  | main.rs:585:41:585:47 | T |
-| main.rs:587:13:587:14 | s1 |  | {EXTERNAL LOCATION} | bool |
-| main.rs:587:18:587:18 | x |  | main.rs:585:41:585:47 | T |
-| main.rs:587:18:587:24 | x.fst() |  | {EXTERNAL LOCATION} | bool |
-| main.rs:588:13:588:14 | s2 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:588:18:588:18 | y |  | main.rs:585:41:585:47 | T |
-| main.rs:588:18:588:24 | y.snd() |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:589:18:589:29 | "{:?}, {:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:589:18:589:29 | "{:?}, {:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:589:18:589:37 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:589:18:589:37 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:589:32:589:33 | s1 |  | {EXTERNAL LOCATION} | bool |
-| main.rs:589:36:589:37 | s2 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:592:54:592:54 | x |  | main.rs:592:41:592:51 | T |
-| main.rs:592:60:592:60 | y |  | main.rs:592:41:592:51 | T |
-| main.rs:594:13:594:14 | s1 |  | {EXTERNAL LOCATION} | u8 |
-| main.rs:594:18:594:18 | x |  | main.rs:592:41:592:51 | T |
-| main.rs:594:18:594:24 | x.fst() |  | {EXTERNAL LOCATION} | u8 |
-| main.rs:595:13:595:14 | s2 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:595:18:595:18 | y |  | main.rs:592:41:592:51 | T |
-| main.rs:595:18:595:24 | y.snd() |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:596:18:596:29 | "{:?}, {:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:596:18:596:29 | "{:?}, {:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:596:18:596:37 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:596:18:596:37 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:596:32:596:33 | s1 |  | {EXTERNAL LOCATION} | u8 |
-| main.rs:596:36:596:37 | s2 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:612:15:612:18 | SelfParam |  | main.rs:611:5:620:5 | Self [trait MyTrait] |
-| main.rs:614:15:614:18 | SelfParam |  | main.rs:611:5:620:5 | Self [trait MyTrait] |
-| main.rs:617:9:619:9 | { ... } |  | main.rs:611:19:611:19 | A |
-| main.rs:618:13:618:16 | self |  | main.rs:611:5:620:5 | Self [trait MyTrait] |
-| main.rs:618:13:618:21 | self.m1() |  | main.rs:611:19:611:19 | A |
-| main.rs:624:43:624:43 | x |  | main.rs:624:26:624:40 | T2 |
-| main.rs:624:56:626:5 | { ... } |  | main.rs:624:22:624:23 | T1 |
-| main.rs:625:9:625:9 | x |  | main.rs:624:26:624:40 | T2 |
-| main.rs:625:9:625:14 | x.m1() |  | main.rs:624:22:624:23 | T1 |
-| main.rs:630:49:630:49 | x |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:630:49:630:49 | x | T | main.rs:630:32:630:46 | T2 |
-| main.rs:630:71:632:5 | { ... } |  | main.rs:630:28:630:29 | T1 |
-| main.rs:631:9:631:9 | x |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:631:9:631:9 | x | T | main.rs:630:32:630:46 | T2 |
-| main.rs:631:9:631:11 | x.a |  | main.rs:630:32:630:46 | T2 |
-| main.rs:631:9:631:16 | ... .m1() |  | main.rs:630:28:630:29 | T1 |
-| main.rs:635:15:635:18 | SelfParam |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:635:15:635:18 | SelfParam | T | main.rs:634:10:634:10 | T |
-| main.rs:635:26:637:9 | { ... } |  | main.rs:634:10:634:10 | T |
-| main.rs:636:13:636:16 | self |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:636:13:636:16 | self | T | main.rs:634:10:634:10 | T |
-| main.rs:636:13:636:18 | self.a |  | main.rs:634:10:634:10 | T |
-| main.rs:641:13:641:13 | x |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:641:13:641:13 | x | T | main.rs:606:5:607:14 | S1 |
-| main.rs:641:17:641:33 | MyThing {...} |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:641:17:641:33 | MyThing {...} | T | main.rs:606:5:607:14 | S1 |
-| main.rs:641:30:641:31 | S1 |  | main.rs:606:5:607:14 | S1 |
-| main.rs:642:13:642:13 | y |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:642:13:642:13 | y | T | main.rs:608:5:609:14 | S2 |
-| main.rs:642:17:642:33 | MyThing {...} |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:642:17:642:33 | MyThing {...} | T | main.rs:608:5:609:14 | S2 |
-| main.rs:642:30:642:31 | S2 |  | main.rs:608:5:609:14 | S2 |
-| main.rs:644:18:644:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:644:18:644:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:644:18:644:31 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:644:18:644:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:644:26:644:26 | x |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:644:26:644:26 | x | T | main.rs:606:5:607:14 | S1 |
-| main.rs:644:26:644:31 | x.m1() |  | main.rs:606:5:607:14 | S1 |
-| main.rs:645:18:645:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:645:18:645:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:645:18:645:31 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:645:18:645:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:645:26:645:26 | y |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:645:26:645:26 | y | T | main.rs:608:5:609:14 | S2 |
-| main.rs:645:26:645:31 | y.m1() |  | main.rs:608:5:609:14 | S2 |
-| main.rs:647:13:647:13 | x |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:647:13:647:13 | x | T | main.rs:606:5:607:14 | S1 |
-| main.rs:647:17:647:33 | MyThing {...} |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:647:17:647:33 | MyThing {...} | T | main.rs:606:5:607:14 | S1 |
-| main.rs:647:30:647:31 | S1 |  | main.rs:606:5:607:14 | S1 |
-| main.rs:648:13:648:13 | y |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:648:13:648:13 | y | T | main.rs:608:5:609:14 | S2 |
-| main.rs:648:17:648:33 | MyThing {...} |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:648:17:648:33 | MyThing {...} | T | main.rs:608:5:609:14 | S2 |
-| main.rs:648:30:648:31 | S2 |  | main.rs:608:5:609:14 | S2 |
-| main.rs:650:18:650:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:650:18:650:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:650:18:650:31 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:650:18:650:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:650:26:650:26 | x |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:650:26:650:26 | x | T | main.rs:606:5:607:14 | S1 |
-| main.rs:650:26:650:31 | x.m2() |  | main.rs:606:5:607:14 | S1 |
-| main.rs:651:18:651:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:651:18:651:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:651:18:651:31 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:651:18:651:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:651:26:651:26 | y |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:651:26:651:26 | y | T | main.rs:608:5:609:14 | S2 |
-| main.rs:651:26:651:31 | y.m2() |  | main.rs:608:5:609:14 | S2 |
-| main.rs:653:13:653:14 | x2 |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:653:13:653:14 | x2 | T | main.rs:606:5:607:14 | S1 |
-| main.rs:653:18:653:34 | MyThing {...} |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:653:18:653:34 | MyThing {...} | T | main.rs:606:5:607:14 | S1 |
-| main.rs:653:31:653:32 | S1 |  | main.rs:606:5:607:14 | S1 |
-| main.rs:654:13:654:14 | y2 |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:654:13:654:14 | y2 | T | main.rs:608:5:609:14 | S2 |
-| main.rs:654:18:654:34 | MyThing {...} |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:654:18:654:34 | MyThing {...} | T | main.rs:608:5:609:14 | S2 |
-| main.rs:654:31:654:32 | S2 |  | main.rs:608:5:609:14 | S2 |
-| main.rs:656:18:656:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:656:18:656:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:656:18:656:42 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:656:18:656:42 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:656:26:656:42 | call_trait_m1(...) |  | main.rs:606:5:607:14 | S1 |
-| main.rs:656:40:656:41 | x2 |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:656:40:656:41 | x2 | T | main.rs:606:5:607:14 | S1 |
-| main.rs:657:18:657:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:657:18:657:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:657:18:657:42 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:657:18:657:42 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:657:26:657:42 | call_trait_m1(...) |  | main.rs:608:5:609:14 | S2 |
-| main.rs:657:40:657:41 | y2 |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:657:40:657:41 | y2 | T | main.rs:608:5:609:14 | S2 |
-| main.rs:659:13:659:14 | x3 |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:659:13:659:14 | x3 | T | main.rs:601:5:604:5 | MyThing |
-| main.rs:659:13:659:14 | x3 | T.T | main.rs:606:5:607:14 | S1 |
-| main.rs:659:18:661:9 | MyThing {...} |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:659:18:661:9 | MyThing {...} | T | main.rs:601:5:604:5 | MyThing |
-| main.rs:659:18:661:9 | MyThing {...} | T.T | main.rs:606:5:607:14 | S1 |
-| main.rs:660:16:660:32 | MyThing {...} |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:660:16:660:32 | MyThing {...} | T | main.rs:606:5:607:14 | S1 |
-| main.rs:660:29:660:30 | S1 |  | main.rs:606:5:607:14 | S1 |
-| main.rs:662:13:662:14 | y3 |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:662:13:662:14 | y3 | T | main.rs:601:5:604:5 | MyThing |
-| main.rs:662:13:662:14 | y3 | T.T | main.rs:608:5:609:14 | S2 |
-| main.rs:662:18:664:9 | MyThing {...} |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:662:18:664:9 | MyThing {...} | T | main.rs:601:5:604:5 | MyThing |
-| main.rs:662:18:664:9 | MyThing {...} | T.T | main.rs:608:5:609:14 | S2 |
-| main.rs:663:16:663:32 | MyThing {...} |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:663:16:663:32 | MyThing {...} | T | main.rs:608:5:609:14 | S2 |
-| main.rs:663:29:663:30 | S2 |  | main.rs:608:5:609:14 | S2 |
-| main.rs:666:13:666:13 | a |  | main.rs:606:5:607:14 | S1 |
-| main.rs:666:17:666:39 | call_trait_thing_m1(...) |  | main.rs:606:5:607:14 | S1 |
-| main.rs:666:37:666:38 | x3 |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:666:37:666:38 | x3 | T | main.rs:601:5:604:5 | MyThing |
-| main.rs:666:37:666:38 | x3 | T.T | main.rs:606:5:607:14 | S1 |
-| main.rs:667:18:667:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:667:18:667:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:667:18:667:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:667:18:667:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:667:26:667:26 | a |  | main.rs:606:5:607:14 | S1 |
-| main.rs:668:13:668:13 | b |  | main.rs:608:5:609:14 | S2 |
-| main.rs:668:17:668:39 | call_trait_thing_m1(...) |  | main.rs:608:5:609:14 | S2 |
-| main.rs:668:37:668:38 | y3 |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:668:37:668:38 | y3 | T | main.rs:601:5:604:5 | MyThing |
-| main.rs:668:37:668:38 | y3 | T.T | main.rs:608:5:609:14 | S2 |
-| main.rs:669:18:669:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:669:18:669:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:669:18:669:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:669:18:669:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:669:26:669:26 | b |  | main.rs:608:5:609:14 | S2 |
-| main.rs:680:19:680:22 | SelfParam |  | main.rs:674:5:677:5 | Wrapper |
-| main.rs:680:19:680:22 | SelfParam | A | main.rs:679:10:679:10 | A |
-| main.rs:680:30:682:9 | { ... } |  | main.rs:679:10:679:10 | A |
-| main.rs:681:13:681:16 | self |  | main.rs:674:5:677:5 | Wrapper |
-| main.rs:681:13:681:16 | self | A | main.rs:679:10:679:10 | A |
-| main.rs:681:13:681:22 | self.field |  | main.rs:679:10:679:10 | A |
-| main.rs:689:15:689:18 | SelfParam |  | main.rs:685:5:699:5 | Self [trait MyTrait] |
-| main.rs:691:15:691:18 | SelfParam |  | main.rs:685:5:699:5 | Self [trait MyTrait] |
-| main.rs:695:9:698:9 | { ... } |  | main.rs:686:9:686:28 | AssociatedType |
-| main.rs:696:13:696:16 | self |  | main.rs:685:5:699:5 | Self [trait MyTrait] |
-| main.rs:696:13:696:21 | self.m1() |  | main.rs:686:9:686:28 | AssociatedType |
-| main.rs:697:13:697:43 | ...::default(...) |  | main.rs:686:9:686:28 | AssociatedType |
-| main.rs:705:19:705:23 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:705:19:705:23 | SelfParam | &T | main.rs:701:5:711:5 | Self [trait MyTraitAssoc2] |
-| main.rs:705:26:705:26 | a |  | main.rs:705:16:705:16 | A |
-| main.rs:707:22:707:26 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:707:22:707:26 | SelfParam | &T | main.rs:701:5:711:5 | Self [trait MyTraitAssoc2] |
-| main.rs:707:29:707:29 | a |  | main.rs:707:19:707:19 | A |
-| main.rs:707:35:707:35 | b |  | main.rs:707:19:707:19 | A |
-| main.rs:707:75:710:9 | { ... } |  | main.rs:702:9:702:52 | GenericAssociatedType |
-| main.rs:708:13:708:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:708:13:708:16 | self | &T | main.rs:701:5:711:5 | Self [trait MyTraitAssoc2] |
-| main.rs:708:13:708:23 | self.put(...) |  | main.rs:702:9:702:52 | GenericAssociatedType |
-| main.rs:708:22:708:22 | a |  | main.rs:707:19:707:19 | A |
-| main.rs:709:13:709:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:709:13:709:16 | self | &T | main.rs:701:5:711:5 | Self [trait MyTraitAssoc2] |
-| main.rs:709:13:709:23 | self.put(...) |  | main.rs:702:9:702:52 | GenericAssociatedType |
-| main.rs:709:22:709:22 | b |  | main.rs:707:19:707:19 | A |
-| main.rs:718:21:718:25 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:718:21:718:25 | SelfParam | &T | main.rs:713:5:723:5 | Self [trait TraitMultipleAssoc] |
-| main.rs:720:20:720:24 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:720:20:720:24 | SelfParam | &T | main.rs:713:5:723:5 | Self [trait TraitMultipleAssoc] |
-| main.rs:722:20:722:24 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:722:20:722:24 | SelfParam | &T | main.rs:713:5:723:5 | Self [trait TraitMultipleAssoc] |
-| main.rs:738:15:738:18 | SelfParam |  | main.rs:725:5:726:13 | S |
-| main.rs:738:45:740:9 | { ... } |  | main.rs:731:5:732:14 | AT |
-| main.rs:739:13:739:14 | AT |  | main.rs:731:5:732:14 | AT |
-| main.rs:748:19:748:23 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:748:19:748:23 | SelfParam | &T | main.rs:725:5:726:13 | S |
-| main.rs:748:26:748:26 | a |  | main.rs:748:16:748:16 | A |
-| main.rs:748:46:750:9 | { ... } |  | main.rs:674:5:677:5 | Wrapper |
-| main.rs:748:46:750:9 | { ... } | A | main.rs:748:16:748:16 | A |
-| main.rs:749:13:749:32 | Wrapper {...} |  | main.rs:674:5:677:5 | Wrapper |
-| main.rs:749:13:749:32 | Wrapper {...} | A | main.rs:748:16:748:16 | A |
-| main.rs:749:30:749:30 | a |  | main.rs:748:16:748:16 | A |
-| main.rs:757:15:757:18 | SelfParam |  | main.rs:728:5:729:14 | S2 |
-| main.rs:757:45:759:9 | { ... } |  | main.rs:674:5:677:5 | Wrapper |
-| main.rs:757:45:759:9 | { ... } | A | main.rs:728:5:729:14 | S2 |
-| main.rs:758:13:758:35 | Wrapper {...} |  | main.rs:674:5:677:5 | Wrapper |
-| main.rs:758:13:758:35 | Wrapper {...} | A | main.rs:728:5:729:14 | S2 |
-| main.rs:758:30:758:33 | self |  | main.rs:728:5:729:14 | S2 |
-| main.rs:764:30:766:9 | { ... } |  | main.rs:674:5:677:5 | Wrapper |
-| main.rs:764:30:766:9 | { ... } | A | main.rs:728:5:729:14 | S2 |
-| main.rs:765:13:765:33 | Wrapper {...} |  | main.rs:674:5:677:5 | Wrapper |
-| main.rs:765:13:765:33 | Wrapper {...} | A | main.rs:728:5:729:14 | S2 |
-| main.rs:765:30:765:31 | S2 |  | main.rs:728:5:729:14 | S2 |
-| main.rs:771:22:771:26 | thing |  | main.rs:771:10:771:19 | T |
-| main.rs:772:9:772:13 | thing |  | main.rs:771:10:771:19 | T |
-| main.rs:779:21:779:25 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:779:21:779:25 | SelfParam | &T | main.rs:731:5:732:14 | AT |
-| main.rs:779:34:781:9 | { ... } |  | main.rs:731:5:732:14 | AT |
-| main.rs:780:13:780:14 | AT |  | main.rs:731:5:732:14 | AT |
-| main.rs:783:20:783:24 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:783:20:783:24 | SelfParam | &T | main.rs:731:5:732:14 | AT |
-| main.rs:783:43:785:9 | { ... } |  | main.rs:725:5:726:13 | S |
-| main.rs:784:13:784:13 | S |  | main.rs:725:5:726:13 | S |
-| main.rs:787:20:787:24 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:787:20:787:24 | SelfParam | &T | main.rs:731:5:732:14 | AT |
-| main.rs:787:43:789:9 | { ... } |  | main.rs:728:5:729:14 | S2 |
-| main.rs:788:13:788:14 | S2 |  | main.rs:728:5:729:14 | S2 |
-| main.rs:793:13:793:14 | x1 |  | main.rs:725:5:726:13 | S |
-| main.rs:793:18:793:18 | S |  | main.rs:725:5:726:13 | S |
-| main.rs:795:18:795:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:795:18:795:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:795:18:795:32 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:795:18:795:32 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:795:26:795:27 | x1 |  | main.rs:725:5:726:13 | S |
-| main.rs:795:26:795:32 | x1.m1() |  | main.rs:731:5:732:14 | AT |
-| main.rs:797:13:797:14 | x2 |  | main.rs:725:5:726:13 | S |
-| main.rs:797:18:797:18 | S |  | main.rs:725:5:726:13 | S |
-| main.rs:799:13:799:13 | y |  | main.rs:731:5:732:14 | AT |
-| main.rs:799:17:799:18 | x2 |  | main.rs:725:5:726:13 | S |
-| main.rs:799:17:799:23 | x2.m2() |  | main.rs:731:5:732:14 | AT |
-| main.rs:800:18:800:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:800:18:800:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:800:18:800:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:800:18:800:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:800:26:800:26 | y |  | main.rs:731:5:732:14 | AT |
-| main.rs:802:13:802:14 | x3 |  | main.rs:725:5:726:13 | S |
-| main.rs:802:18:802:18 | S |  | main.rs:725:5:726:13 | S |
-| main.rs:804:18:804:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:804:18:804:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:804:18:804:43 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:804:18:804:43 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:804:26:804:27 | x3 |  | main.rs:725:5:726:13 | S |
-| main.rs:804:26:804:34 | x3.put(...) |  | main.rs:674:5:677:5 | Wrapper |
-| main.rs:804:26:804:34 | x3.put(...) | A | {EXTERNAL LOCATION} | i32 |
-| main.rs:804:26:804:43 | ... .unwrap() |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:804:33:804:33 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:807:18:807:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:807:18:807:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:807:18:807:49 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:807:18:807:49 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:807:26:807:27 | x3 |  | main.rs:725:5:726:13 | S |
-| main.rs:807:26:807:40 | x3.putTwo(...) |  | main.rs:674:5:677:5 | Wrapper |
-| main.rs:807:26:807:40 | x3.putTwo(...) | A | main.rs:745:36:745:50 | AssociatedParam |
-| main.rs:807:26:807:49 | ... .unwrap() |  | main.rs:745:36:745:50 | AssociatedParam |
-| main.rs:807:36:807:36 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:807:39:807:39 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:809:20:809:20 | S |  | main.rs:725:5:726:13 | S |
-| main.rs:810:18:810:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:810:18:810:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:810:18:810:27 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:810:18:810:27 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:812:13:812:14 | x5 |  | main.rs:728:5:729:14 | S2 |
-| main.rs:812:18:812:19 | S2 |  | main.rs:728:5:729:14 | S2 |
-| main.rs:813:18:813:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:813:18:813:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:813:18:813:32 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:813:18:813:32 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:813:26:813:27 | x5 |  | main.rs:728:5:729:14 | S2 |
-| main.rs:813:26:813:32 | x5.m1() |  | main.rs:674:5:677:5 | Wrapper |
-| main.rs:813:26:813:32 | x5.m1() | A | main.rs:728:5:729:14 | S2 |
-| main.rs:814:13:814:14 | x6 |  | main.rs:728:5:729:14 | S2 |
-| main.rs:814:18:814:19 | S2 |  | main.rs:728:5:729:14 | S2 |
-| main.rs:815:18:815:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:815:18:815:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:815:18:815:32 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:815:18:815:32 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:815:26:815:27 | x6 |  | main.rs:728:5:729:14 | S2 |
-| main.rs:815:26:815:32 | x6.m2() |  | main.rs:674:5:677:5 | Wrapper |
-| main.rs:815:26:815:32 | x6.m2() | A | main.rs:728:5:729:14 | S2 |
-| main.rs:817:13:817:22 | assoc_zero |  | main.rs:731:5:732:14 | AT |
-| main.rs:817:26:817:27 | AT |  | main.rs:731:5:732:14 | AT |
-| main.rs:817:26:817:38 | AT.get_zero() |  | main.rs:731:5:732:14 | AT |
-| main.rs:818:13:818:21 | assoc_one |  | main.rs:725:5:726:13 | S |
-| main.rs:818:25:818:26 | AT |  | main.rs:731:5:732:14 | AT |
-| main.rs:818:25:818:36 | AT.get_one() |  | main.rs:725:5:726:13 | S |
-| main.rs:819:13:819:21 | assoc_two |  | main.rs:728:5:729:14 | S2 |
-| main.rs:819:25:819:26 | AT |  | main.rs:731:5:732:14 | AT |
-| main.rs:819:25:819:36 | AT.get_two() |  | main.rs:728:5:729:14 | S2 |
-| main.rs:827:19:827:23 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:827:19:827:23 | SelfParam | &T | main.rs:824:5:828:5 | Self [trait Supertrait] |
-| main.rs:827:26:827:32 | content |  | main.rs:825:9:825:21 | Content |
-| main.rs:832:24:832:28 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:832:24:832:28 | SelfParam | &T | main.rs:830:5:833:5 | Self [trait Subtrait] |
-| main.rs:841:23:841:27 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:841:23:841:27 | SelfParam | &T | main.rs:835:5:845:5 | Self [trait Subtrait2] |
-| main.rs:841:30:841:31 | c1 |  | main.rs:825:9:825:21 | Content |
-| main.rs:841:49:841:50 | c2 |  | main.rs:825:9:825:21 | Content |
-| main.rs:842:13:842:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:842:13:842:16 | self | &T | main.rs:835:5:845:5 | Self [trait Subtrait2] |
-| main.rs:842:25:842:26 | c1 |  | main.rs:825:9:825:21 | Content |
-| main.rs:843:13:843:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:843:13:843:16 | self | &T | main.rs:835:5:845:5 | Self [trait Subtrait2] |
-| main.rs:843:25:843:26 | c2 |  | main.rs:825:9:825:21 | Content |
-| main.rs:851:19:851:23 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:851:19:851:23 | SelfParam | &T | main.rs:847:5:847:24 | MyType |
-| main.rs:851:19:851:23 | SelfParam | &T.T | main.rs:849:10:849:10 | T |
-| main.rs:851:26:851:33 | _content |  | main.rs:849:10:849:10 | T |
-| main.rs:852:22:852:42 | "Inserting content: \\n" |  | file://:0:0:0:0 | & |
-| main.rs:852:22:852:42 | "Inserting content: \\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:852:22:852:42 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:852:22:852:42 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:858:24:858:28 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:858:24:858:28 | SelfParam | &T | main.rs:847:5:847:24 | MyType |
-| main.rs:858:24:858:28 | SelfParam | &T.T | main.rs:856:10:856:17 | T |
-| main.rs:858:48:860:9 | { ... } |  | main.rs:856:10:856:17 | T |
-| main.rs:859:13:859:19 | (...) |  | main.rs:847:5:847:24 | MyType |
-| main.rs:859:13:859:19 | (...) | T | main.rs:856:10:856:17 | T |
-| main.rs:859:13:859:21 | ... .0 |  | main.rs:856:10:856:17 | T |
-| main.rs:859:13:859:29 | ... .clone() |  | main.rs:856:10:856:17 | T |
-| main.rs:859:14:859:18 | * ... |  | main.rs:847:5:847:24 | MyType |
-| main.rs:859:14:859:18 | * ... | T | main.rs:856:10:856:17 | T |
-| main.rs:859:15:859:18 | self |  | file://:0:0:0:0 | & |
-| main.rs:859:15:859:18 | self | &T | main.rs:847:5:847:24 | MyType |
-| main.rs:859:15:859:18 | self | &T.T | main.rs:856:10:856:17 | T |
-| main.rs:863:33:863:36 | item |  | file://:0:0:0:0 | & |
-| main.rs:863:33:863:36 | item | &T | main.rs:863:20:863:30 | T |
-| main.rs:863:57:865:5 | { ... } |  | main.rs:825:9:825:21 | Content |
-| main.rs:864:9:864:12 | item |  | file://:0:0:0:0 | & |
-| main.rs:864:9:864:12 | item | &T | main.rs:863:20:863:30 | T |
-| main.rs:864:9:864:26 | item.get_content() |  | main.rs:825:9:825:21 | Content |
-| main.rs:867:35:867:38 | item |  | file://:0:0:0:0 | & |
-| main.rs:867:35:867:38 | item | &T | main.rs:867:21:867:32 | T |
-| main.rs:867:45:867:46 | c1 |  | main.rs:825:9:825:21 | Content |
-| main.rs:867:61:867:62 | c2 |  | main.rs:825:9:825:21 | Content |
-| main.rs:867:77:867:78 | c3 |  | main.rs:825:9:825:21 | Content |
-| main.rs:868:9:868:12 | item |  | file://:0:0:0:0 | & |
-| main.rs:868:9:868:12 | item | &T | main.rs:867:21:867:32 | T |
-| main.rs:868:21:868:22 | c1 |  | main.rs:825:9:825:21 | Content |
-| main.rs:869:9:869:12 | item |  | file://:0:0:0:0 | & |
-| main.rs:869:9:869:12 | item | &T | main.rs:867:21:867:32 | T |
-| main.rs:869:25:869:26 | c2 |  | main.rs:825:9:825:21 | Content |
-| main.rs:869:29:869:30 | c3 |  | main.rs:825:9:825:21 | Content |
-| main.rs:873:13:873:17 | item1 |  | main.rs:847:5:847:24 | MyType |
-| main.rs:873:13:873:17 | item1 | T | {EXTERNAL LOCATION} | i64 |
-| main.rs:873:21:873:33 | MyType(...) |  | main.rs:847:5:847:24 | MyType |
-| main.rs:873:21:873:33 | MyType(...) | T | {EXTERNAL LOCATION} | i64 |
-| main.rs:873:28:873:32 | 42i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:874:25:874:29 | item1 |  | main.rs:847:5:847:24 | MyType |
-| main.rs:874:25:874:29 | item1 | T | {EXTERNAL LOCATION} | i64 |
-| main.rs:876:13:876:17 | item2 |  | main.rs:847:5:847:24 | MyType |
-| main.rs:876:13:876:17 | item2 | T | {EXTERNAL LOCATION} | bool |
-| main.rs:876:21:876:32 | MyType(...) |  | main.rs:847:5:847:24 | MyType |
-| main.rs:876:21:876:32 | MyType(...) | T | {EXTERNAL LOCATION} | bool |
-| main.rs:876:28:876:31 | true |  | {EXTERNAL LOCATION} | bool |
-| main.rs:877:37:877:42 | &item2 |  | file://:0:0:0:0 | & |
-| main.rs:877:37:877:42 | &item2 | &T | main.rs:847:5:847:24 | MyType |
-| main.rs:877:37:877:42 | &item2 | &T.T | {EXTERNAL LOCATION} | bool |
-| main.rs:877:38:877:42 | item2 |  | main.rs:847:5:847:24 | MyType |
-| main.rs:877:38:877:42 | item2 | T | {EXTERNAL LOCATION} | bool |
-| main.rs:894:15:894:18 | SelfParam |  | main.rs:882:5:886:5 | MyEnum |
-| main.rs:894:15:894:18 | SelfParam | A | main.rs:893:10:893:10 | T |
-| main.rs:894:26:899:9 | { ... } |  | main.rs:893:10:893:10 | T |
-| main.rs:895:13:898:13 | match self { ... } |  | main.rs:893:10:893:10 | T |
-| main.rs:895:19:895:22 | self |  | main.rs:882:5:886:5 | MyEnum |
-| main.rs:895:19:895:22 | self | A | main.rs:893:10:893:10 | T |
-| main.rs:896:17:896:29 | ...::C1(...) |  | main.rs:882:5:886:5 | MyEnum |
-| main.rs:896:17:896:29 | ...::C1(...) | A | main.rs:893:10:893:10 | T |
-| main.rs:896:28:896:28 | a |  | main.rs:893:10:893:10 | T |
-| main.rs:896:34:896:34 | a |  | main.rs:893:10:893:10 | T |
-| main.rs:897:17:897:32 | ...::C2 {...} |  | main.rs:882:5:886:5 | MyEnum |
-| main.rs:897:17:897:32 | ...::C2 {...} | A | main.rs:893:10:893:10 | T |
-| main.rs:897:30:897:30 | a |  | main.rs:893:10:893:10 | T |
-| main.rs:897:37:897:37 | a |  | main.rs:893:10:893:10 | T |
-| main.rs:903:13:903:13 | x |  | main.rs:882:5:886:5 | MyEnum |
-| main.rs:903:13:903:13 | x | A | main.rs:888:5:889:14 | S1 |
-| main.rs:903:17:903:30 | ...::C1(...) |  | main.rs:882:5:886:5 | MyEnum |
-| main.rs:903:17:903:30 | ...::C1(...) | A | main.rs:888:5:889:14 | S1 |
-| main.rs:903:28:903:29 | S1 |  | main.rs:888:5:889:14 | S1 |
-| main.rs:904:13:904:13 | y |  | main.rs:882:5:886:5 | MyEnum |
-| main.rs:904:13:904:13 | y | A | main.rs:890:5:891:14 | S2 |
-| main.rs:904:17:904:36 | ...::C2 {...} |  | main.rs:882:5:886:5 | MyEnum |
-| main.rs:904:17:904:36 | ...::C2 {...} | A | main.rs:890:5:891:14 | S2 |
-| main.rs:904:33:904:34 | S2 |  | main.rs:890:5:891:14 | S2 |
-| main.rs:906:18:906:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:906:18:906:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:906:18:906:31 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:906:18:906:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:906:26:906:26 | x |  | main.rs:882:5:886:5 | MyEnum |
-| main.rs:906:26:906:26 | x | A | main.rs:888:5:889:14 | S1 |
-| main.rs:906:26:906:31 | x.m1() |  | main.rs:888:5:889:14 | S1 |
-| main.rs:907:18:907:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:907:18:907:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:907:18:907:31 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:907:18:907:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:907:26:907:26 | y |  | main.rs:882:5:886:5 | MyEnum |
-| main.rs:907:26:907:26 | y | A | main.rs:890:5:891:14 | S2 |
-| main.rs:907:26:907:31 | y.m1() |  | main.rs:890:5:891:14 | S2 |
-| main.rs:929:15:929:18 | SelfParam |  | main.rs:927:5:930:5 | Self [trait MyTrait1] |
-| main.rs:934:15:934:18 | SelfParam |  | main.rs:932:5:944:5 | Self [trait MyTrait2] |
-| main.rs:937:9:943:9 | { ... } |  | main.rs:932:20:932:22 | Tr2 |
-| main.rs:938:13:942:13 | if ... {...} else {...} |  | main.rs:932:20:932:22 | Tr2 |
-| main.rs:938:16:938:16 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:938:16:938:20 | ... > ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:938:20:938:20 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:938:22:940:13 | { ... } |  | main.rs:932:20:932:22 | Tr2 |
-| main.rs:939:17:939:20 | self |  | main.rs:932:5:944:5 | Self [trait MyTrait2] |
-| main.rs:939:17:939:25 | self.m1() |  | main.rs:932:20:932:22 | Tr2 |
-| main.rs:940:20:942:13 | { ... } |  | main.rs:932:20:932:22 | Tr2 |
-| main.rs:941:17:941:30 | ...::m1(...) |  | main.rs:932:20:932:22 | Tr2 |
-| main.rs:941:26:941:29 | self |  | main.rs:932:5:944:5 | Self [trait MyTrait2] |
-| main.rs:948:15:948:18 | SelfParam |  | main.rs:946:5:958:5 | Self [trait MyTrait3] |
-| main.rs:951:9:957:9 | { ... } |  | main.rs:946:20:946:22 | Tr3 |
-| main.rs:952:13:956:13 | if ... {...} else {...} |  | main.rs:946:20:946:22 | Tr3 |
-| main.rs:952:16:952:16 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:952:16:952:20 | ... > ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:952:20:952:20 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:952:22:954:13 | { ... } |  | main.rs:946:20:946:22 | Tr3 |
-| main.rs:953:17:953:20 | self |  | main.rs:946:5:958:5 | Self [trait MyTrait3] |
-| main.rs:953:17:953:25 | self.m2() |  | main.rs:912:5:915:5 | MyThing |
-| main.rs:953:17:953:25 | self.m2() | A | main.rs:946:20:946:22 | Tr3 |
-| main.rs:953:17:953:27 | ... .a |  | main.rs:946:20:946:22 | Tr3 |
-| main.rs:954:20:956:13 | { ... } |  | main.rs:946:20:946:22 | Tr3 |
-| main.rs:955:17:955:30 | ...::m2(...) |  | main.rs:912:5:915:5 | MyThing |
-| main.rs:955:17:955:30 | ...::m2(...) | A | main.rs:946:20:946:22 | Tr3 |
-| main.rs:955:17:955:32 | ... .a |  | main.rs:946:20:946:22 | Tr3 |
-| main.rs:955:26:955:29 | self |  | main.rs:946:5:958:5 | Self [trait MyTrait3] |
-| main.rs:962:15:962:18 | SelfParam |  | main.rs:912:5:915:5 | MyThing |
-| main.rs:962:15:962:18 | SelfParam | A | main.rs:960:10:960:10 | T |
-| main.rs:962:26:964:9 | { ... } |  | main.rs:960:10:960:10 | T |
-| main.rs:963:13:963:16 | self |  | main.rs:912:5:915:5 | MyThing |
-| main.rs:963:13:963:16 | self | A | main.rs:960:10:960:10 | T |
-| main.rs:963:13:963:18 | self.a |  | main.rs:960:10:960:10 | T |
-| main.rs:971:15:971:18 | SelfParam |  | main.rs:917:5:920:5 | MyThing2 |
-| main.rs:971:15:971:18 | SelfParam | A | main.rs:969:10:969:10 | T |
-| main.rs:971:35:973:9 | { ... } |  | main.rs:912:5:915:5 | MyThing |
-| main.rs:971:35:973:9 | { ... } | A | main.rs:969:10:969:10 | T |
-| main.rs:972:13:972:33 | MyThing {...} |  | main.rs:912:5:915:5 | MyThing |
-| main.rs:972:13:972:33 | MyThing {...} | A | main.rs:969:10:969:10 | T |
-| main.rs:972:26:972:29 | self |  | main.rs:917:5:920:5 | MyThing2 |
-| main.rs:972:26:972:29 | self | A | main.rs:969:10:969:10 | T |
-| main.rs:972:26:972:31 | self.a |  | main.rs:969:10:969:10 | T |
-| main.rs:980:44:980:44 | x |  | main.rs:980:26:980:41 | T2 |
-| main.rs:980:57:982:5 | { ... } |  | main.rs:980:22:980:23 | T1 |
-| main.rs:981:9:981:9 | x |  | main.rs:980:26:980:41 | T2 |
-| main.rs:981:9:981:14 | x.m1() |  | main.rs:980:22:980:23 | T1 |
-| main.rs:984:56:984:56 | x |  | main.rs:984:39:984:53 | T |
-| main.rs:986:13:986:13 | a |  | main.rs:912:5:915:5 | MyThing |
-| main.rs:986:13:986:13 | a | A | main.rs:922:5:923:14 | S1 |
-| main.rs:986:17:986:17 | x |  | main.rs:984:39:984:53 | T |
-| main.rs:986:17:986:22 | x.m1() |  | main.rs:912:5:915:5 | MyThing |
-| main.rs:986:17:986:22 | x.m1() | A | main.rs:922:5:923:14 | S1 |
-| main.rs:987:18:987:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:987:18:987:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:987:18:987:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:987:18:987:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:987:26:987:26 | a |  | main.rs:912:5:915:5 | MyThing |
-| main.rs:987:26:987:26 | a | A | main.rs:922:5:923:14 | S1 |
-| main.rs:991:13:991:13 | x |  | main.rs:912:5:915:5 | MyThing |
-| main.rs:991:13:991:13 | x | A | main.rs:922:5:923:14 | S1 |
-| main.rs:991:17:991:33 | MyThing {...} |  | main.rs:912:5:915:5 | MyThing |
-| main.rs:991:17:991:33 | MyThing {...} | A | main.rs:922:5:923:14 | S1 |
-| main.rs:991:30:991:31 | S1 |  | main.rs:922:5:923:14 | S1 |
-| main.rs:992:13:992:13 | y |  | main.rs:912:5:915:5 | MyThing |
-| main.rs:992:13:992:13 | y | A | main.rs:924:5:925:14 | S2 |
-| main.rs:992:17:992:33 | MyThing {...} |  | main.rs:912:5:915:5 | MyThing |
-| main.rs:992:17:992:33 | MyThing {...} | A | main.rs:924:5:925:14 | S2 |
-| main.rs:992:30:992:31 | S2 |  | main.rs:924:5:925:14 | S2 |
-| main.rs:994:18:994:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:994:18:994:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:994:18:994:31 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:994:18:994:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:994:26:994:26 | x |  | main.rs:912:5:915:5 | MyThing |
-| main.rs:994:26:994:26 | x | A | main.rs:922:5:923:14 | S1 |
-| main.rs:994:26:994:31 | x.m1() |  | main.rs:922:5:923:14 | S1 |
-| main.rs:995:18:995:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:995:18:995:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:995:18:995:31 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:995:18:995:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:995:26:995:26 | y |  | main.rs:912:5:915:5 | MyThing |
-| main.rs:995:26:995:26 | y | A | main.rs:924:5:925:14 | S2 |
-| main.rs:995:26:995:31 | y.m1() |  | main.rs:924:5:925:14 | S2 |
-| main.rs:997:13:997:13 | x |  | main.rs:912:5:915:5 | MyThing |
-| main.rs:997:13:997:13 | x | A | main.rs:922:5:923:14 | S1 |
-| main.rs:997:17:997:33 | MyThing {...} |  | main.rs:912:5:915:5 | MyThing |
-| main.rs:997:17:997:33 | MyThing {...} | A | main.rs:922:5:923:14 | S1 |
-| main.rs:997:30:997:31 | S1 |  | main.rs:922:5:923:14 | S1 |
-| main.rs:998:13:998:13 | y |  | main.rs:912:5:915:5 | MyThing |
-| main.rs:998:13:998:13 | y | A | main.rs:924:5:925:14 | S2 |
-| main.rs:998:17:998:33 | MyThing {...} |  | main.rs:912:5:915:5 | MyThing |
-| main.rs:998:17:998:33 | MyThing {...} | A | main.rs:924:5:925:14 | S2 |
-| main.rs:998:30:998:31 | S2 |  | main.rs:924:5:925:14 | S2 |
-| main.rs:1000:18:1000:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1000:18:1000:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1000:18:1000:31 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1000:18:1000:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1000:26:1000:26 | x |  | main.rs:912:5:915:5 | MyThing |
-| main.rs:1000:26:1000:26 | x | A | main.rs:922:5:923:14 | S1 |
-| main.rs:1000:26:1000:31 | x.m2() |  | main.rs:922:5:923:14 | S1 |
-| main.rs:1001:18:1001:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1001:18:1001:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1001:18:1001:31 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1001:18:1001:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1001:26:1001:26 | y |  | main.rs:912:5:915:5 | MyThing |
-| main.rs:1001:26:1001:26 | y | A | main.rs:924:5:925:14 | S2 |
-| main.rs:1001:26:1001:31 | y.m2() |  | main.rs:924:5:925:14 | S2 |
-| main.rs:1003:13:1003:13 | x |  | main.rs:917:5:920:5 | MyThing2 |
-| main.rs:1003:13:1003:13 | x | A | main.rs:922:5:923:14 | S1 |
-| main.rs:1003:17:1003:34 | MyThing2 {...} |  | main.rs:917:5:920:5 | MyThing2 |
-| main.rs:1003:17:1003:34 | MyThing2 {...} | A | main.rs:922:5:923:14 | S1 |
-| main.rs:1003:31:1003:32 | S1 |  | main.rs:922:5:923:14 | S1 |
-| main.rs:1004:13:1004:13 | y |  | main.rs:917:5:920:5 | MyThing2 |
-| main.rs:1004:13:1004:13 | y | A | main.rs:924:5:925:14 | S2 |
-| main.rs:1004:17:1004:34 | MyThing2 {...} |  | main.rs:917:5:920:5 | MyThing2 |
-| main.rs:1004:17:1004:34 | MyThing2 {...} | A | main.rs:924:5:925:14 | S2 |
-| main.rs:1004:31:1004:32 | S2 |  | main.rs:924:5:925:14 | S2 |
-| main.rs:1006:18:1006:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1006:18:1006:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1006:18:1006:31 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1006:18:1006:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1006:26:1006:26 | x |  | main.rs:917:5:920:5 | MyThing2 |
-| main.rs:1006:26:1006:26 | x | A | main.rs:922:5:923:14 | S1 |
-| main.rs:1006:26:1006:31 | x.m3() |  | main.rs:922:5:923:14 | S1 |
-| main.rs:1007:18:1007:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1007:18:1007:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1007:18:1007:31 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1007:18:1007:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1007:26:1007:26 | y |  | main.rs:917:5:920:5 | MyThing2 |
-| main.rs:1007:26:1007:26 | y | A | main.rs:924:5:925:14 | S2 |
-| main.rs:1007:26:1007:31 | y.m3() |  | main.rs:924:5:925:14 | S2 |
-| main.rs:1009:13:1009:13 | x |  | main.rs:912:5:915:5 | MyThing |
-| main.rs:1009:13:1009:13 | x | A | main.rs:922:5:923:14 | S1 |
-| main.rs:1009:17:1009:33 | MyThing {...} |  | main.rs:912:5:915:5 | MyThing |
-| main.rs:1009:17:1009:33 | MyThing {...} | A | main.rs:922:5:923:14 | S1 |
-| main.rs:1009:30:1009:31 | S1 |  | main.rs:922:5:923:14 | S1 |
-| main.rs:1010:13:1010:13 | s |  | main.rs:922:5:923:14 | S1 |
-| main.rs:1010:17:1010:32 | call_trait_m1(...) |  | main.rs:922:5:923:14 | S1 |
-| main.rs:1010:31:1010:31 | x |  | main.rs:912:5:915:5 | MyThing |
-| main.rs:1010:31:1010:31 | x | A | main.rs:922:5:923:14 | S1 |
-| main.rs:1012:13:1012:13 | x |  | main.rs:917:5:920:5 | MyThing2 |
-| main.rs:1012:13:1012:13 | x | A | main.rs:924:5:925:14 | S2 |
-| main.rs:1012:17:1012:34 | MyThing2 {...} |  | main.rs:917:5:920:5 | MyThing2 |
-| main.rs:1012:17:1012:34 | MyThing2 {...} | A | main.rs:924:5:925:14 | S2 |
-| main.rs:1012:31:1012:32 | S2 |  | main.rs:924:5:925:14 | S2 |
-| main.rs:1013:13:1013:13 | s |  | main.rs:912:5:915:5 | MyThing |
-| main.rs:1013:13:1013:13 | s | A | main.rs:924:5:925:14 | S2 |
-| main.rs:1013:17:1013:32 | call_trait_m1(...) |  | main.rs:912:5:915:5 | MyThing |
-| main.rs:1013:17:1013:32 | call_trait_m1(...) | A | main.rs:924:5:925:14 | S2 |
-| main.rs:1013:31:1013:31 | x |  | main.rs:917:5:920:5 | MyThing2 |
-| main.rs:1013:31:1013:31 | x | A | main.rs:924:5:925:14 | S2 |
-| main.rs:1030:22:1030:22 | x |  | file://:0:0:0:0 | & |
-| main.rs:1030:22:1030:22 | x | &T | main.rs:1030:11:1030:19 | T |
-| main.rs:1030:35:1032:5 | { ... } |  | file://:0:0:0:0 | & |
-| main.rs:1030:35:1032:5 | { ... } | &T | main.rs:1030:11:1030:19 | T |
-| main.rs:1031:9:1031:9 | x |  | file://:0:0:0:0 | & |
-| main.rs:1031:9:1031:9 | x | &T | main.rs:1030:11:1030:19 | T |
-| main.rs:1035:17:1035:20 | SelfParam |  | main.rs:1020:5:1021:14 | S1 |
-| main.rs:1035:29:1037:9 | { ... } |  | main.rs:1023:5:1024:14 | S2 |
-| main.rs:1036:13:1036:14 | S2 |  | main.rs:1023:5:1024:14 | S2 |
-| main.rs:1040:21:1040:21 | x |  | main.rs:1040:13:1040:14 | T1 |
-| main.rs:1043:5:1045:5 | { ... } |  | main.rs:1040:17:1040:18 | T2 |
-| main.rs:1044:9:1044:9 | x |  | main.rs:1040:13:1040:14 | T1 |
-| main.rs:1044:9:1044:16 | x.into() |  | main.rs:1040:17:1040:18 | T2 |
-| main.rs:1048:13:1048:13 | x |  | main.rs:1020:5:1021:14 | S1 |
-| main.rs:1048:17:1048:18 | S1 |  | main.rs:1020:5:1021:14 | S1 |
-| main.rs:1049:18:1049:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1049:18:1049:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1049:18:1049:31 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1049:18:1049:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1049:26:1049:31 | id(...) |  | file://:0:0:0:0 | & |
-| main.rs:1049:26:1049:31 | id(...) | &T | main.rs:1020:5:1021:14 | S1 |
-| main.rs:1049:29:1049:30 | &x |  | file://:0:0:0:0 | & |
-| main.rs:1049:29:1049:30 | &x | &T | main.rs:1020:5:1021:14 | S1 |
-| main.rs:1049:30:1049:30 | x |  | main.rs:1020:5:1021:14 | S1 |
-| main.rs:1051:13:1051:13 | x |  | main.rs:1020:5:1021:14 | S1 |
-| main.rs:1051:17:1051:18 | S1 |  | main.rs:1020:5:1021:14 | S1 |
-| main.rs:1052:18:1052:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1052:18:1052:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1052:18:1052:37 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1052:18:1052:37 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1052:26:1052:37 | id::<...>(...) |  | file://:0:0:0:0 | & |
-| main.rs:1052:26:1052:37 | id::<...>(...) | &T | main.rs:1020:5:1021:14 | S1 |
-| main.rs:1052:35:1052:36 | &x |  | file://:0:0:0:0 | & |
-| main.rs:1052:35:1052:36 | &x | &T | main.rs:1020:5:1021:14 | S1 |
-| main.rs:1052:36:1052:36 | x |  | main.rs:1020:5:1021:14 | S1 |
-| main.rs:1054:13:1054:13 | x |  | main.rs:1020:5:1021:14 | S1 |
-| main.rs:1054:13:1054:13 | x |  | main.rs:1026:5:1026:25 | dyn Trait |
-| main.rs:1054:17:1054:18 | S1 |  | main.rs:1020:5:1021:14 | S1 |
-| main.rs:1054:17:1054:18 | S1 |  | main.rs:1026:5:1026:25 | dyn Trait |
-| main.rs:1056:18:1056:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1056:18:1056:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1056:18:1056:44 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1056:18:1056:44 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1056:26:1056:44 | id::<...>(...) |  | file://:0:0:0:0 | & |
-| main.rs:1056:26:1056:44 | id::<...>(...) | &T | main.rs:1026:5:1026:25 | dyn Trait |
-| main.rs:1056:42:1056:43 | &x |  | file://:0:0:0:0 | & |
-| main.rs:1056:42:1056:43 | &x | &T | main.rs:1020:5:1021:14 | S1 |
-| main.rs:1056:42:1056:43 | &x | &T | main.rs:1026:5:1026:25 | dyn Trait |
-| main.rs:1056:43:1056:43 | x |  | main.rs:1020:5:1021:14 | S1 |
-| main.rs:1056:43:1056:43 | x |  | main.rs:1026:5:1026:25 | dyn Trait |
-| main.rs:1058:13:1058:13 | x |  | main.rs:1020:5:1021:14 | S1 |
-| main.rs:1058:17:1058:18 | S1 |  | main.rs:1020:5:1021:14 | S1 |
-| main.rs:1059:9:1059:25 | into::<...>(...) |  | main.rs:1023:5:1024:14 | S2 |
-| main.rs:1059:24:1059:24 | x |  | main.rs:1020:5:1021:14 | S1 |
-| main.rs:1061:13:1061:13 | x |  | main.rs:1020:5:1021:14 | S1 |
-| main.rs:1061:17:1061:18 | S1 |  | main.rs:1020:5:1021:14 | S1 |
-| main.rs:1062:13:1062:13 | y |  | main.rs:1023:5:1024:14 | S2 |
-| main.rs:1062:21:1062:27 | into(...) |  | main.rs:1023:5:1024:14 | S2 |
-| main.rs:1062:26:1062:26 | x |  | main.rs:1020:5:1021:14 | S1 |
-| main.rs:1076:22:1076:25 | SelfParam |  | main.rs:1067:5:1073:5 | PairOption |
-| main.rs:1076:22:1076:25 | SelfParam | Fst | main.rs:1075:10:1075:12 | Fst |
-| main.rs:1076:22:1076:25 | SelfParam | Snd | main.rs:1075:15:1075:17 | Snd |
-| main.rs:1076:35:1083:9 | { ... } |  | main.rs:1075:15:1075:17 | Snd |
-| main.rs:1077:13:1082:13 | match self { ... } |  | main.rs:1075:15:1075:17 | Snd |
-| main.rs:1077:19:1077:22 | self |  | main.rs:1067:5:1073:5 | PairOption |
-| main.rs:1077:19:1077:22 | self | Fst | main.rs:1075:10:1075:12 | Fst |
-| main.rs:1077:19:1077:22 | self | Snd | main.rs:1075:15:1075:17 | Snd |
-| main.rs:1078:17:1078:38 | ...::PairNone(...) |  | main.rs:1067:5:1073:5 | PairOption |
-| main.rs:1078:17:1078:38 | ...::PairNone(...) | Fst | main.rs:1075:10:1075:12 | Fst |
-| main.rs:1078:17:1078:38 | ...::PairNone(...) | Snd | main.rs:1075:15:1075:17 | Snd |
-| main.rs:1078:43:1078:82 | MacroExpr |  | main.rs:1075:15:1075:17 | Snd |
-| main.rs:1078:50:1078:81 | "PairNone has no second elemen... |  | file://:0:0:0:0 | & |
-| main.rs:1078:50:1078:81 | "PairNone has no second elemen... | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1078:50:1078:81 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1078:50:1078:81 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1078:50:1078:81 | MacroExpr |  | main.rs:1075:15:1075:17 | Snd |
-| main.rs:1078:50:1078:81 | { ... } |  | main.rs:1075:15:1075:17 | Snd |
-| main.rs:1079:17:1079:38 | ...::PairFst(...) |  | main.rs:1067:5:1073:5 | PairOption |
-| main.rs:1079:17:1079:38 | ...::PairFst(...) | Fst | main.rs:1075:10:1075:12 | Fst |
-| main.rs:1079:17:1079:38 | ...::PairFst(...) | Snd | main.rs:1075:15:1075:17 | Snd |
-| main.rs:1079:37:1079:37 | _ |  | main.rs:1075:10:1075:12 | Fst |
-| main.rs:1079:43:1079:81 | MacroExpr |  | main.rs:1075:15:1075:17 | Snd |
-| main.rs:1079:50:1079:80 | "PairFst has no second element... |  | file://:0:0:0:0 | & |
-| main.rs:1079:50:1079:80 | "PairFst has no second element... | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1079:50:1079:80 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1079:50:1079:80 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1079:50:1079:80 | MacroExpr |  | main.rs:1075:15:1075:17 | Snd |
-| main.rs:1079:50:1079:80 | { ... } |  | main.rs:1075:15:1075:17 | Snd |
-| main.rs:1080:17:1080:40 | ...::PairSnd(...) |  | main.rs:1067:5:1073:5 | PairOption |
-| main.rs:1080:17:1080:40 | ...::PairSnd(...) | Fst | main.rs:1075:10:1075:12 | Fst |
-| main.rs:1080:17:1080:40 | ...::PairSnd(...) | Snd | main.rs:1075:15:1075:17 | Snd |
-| main.rs:1080:37:1080:39 | snd |  | main.rs:1075:15:1075:17 | Snd |
-| main.rs:1080:45:1080:47 | snd |  | main.rs:1075:15:1075:17 | Snd |
-| main.rs:1081:17:1081:44 | ...::PairBoth(...) |  | main.rs:1067:5:1073:5 | PairOption |
-| main.rs:1081:17:1081:44 | ...::PairBoth(...) | Fst | main.rs:1075:10:1075:12 | Fst |
-| main.rs:1081:17:1081:44 | ...::PairBoth(...) | Snd | main.rs:1075:15:1075:17 | Snd |
-| main.rs:1081:38:1081:38 | _ |  | main.rs:1075:10:1075:12 | Fst |
-| main.rs:1081:41:1081:43 | snd |  | main.rs:1075:15:1075:17 | Snd |
-| main.rs:1081:49:1081:51 | snd |  | main.rs:1075:15:1075:17 | Snd |
-| main.rs:1107:10:1107:10 | t |  | main.rs:1067:5:1073:5 | PairOption |
-| main.rs:1107:10:1107:10 | t | Fst | main.rs:1089:5:1090:14 | S2 |
-| main.rs:1107:10:1107:10 | t | Snd | main.rs:1067:5:1073:5 | PairOption |
-| main.rs:1107:10:1107:10 | t | Snd.Fst | main.rs:1089:5:1090:14 | S2 |
-| main.rs:1107:10:1107:10 | t | Snd.Snd | main.rs:1092:5:1093:14 | S3 |
-| main.rs:1108:13:1108:13 | x |  | main.rs:1092:5:1093:14 | S3 |
-| main.rs:1108:17:1108:17 | t |  | main.rs:1067:5:1073:5 | PairOption |
-| main.rs:1108:17:1108:17 | t | Fst | main.rs:1089:5:1090:14 | S2 |
-| main.rs:1108:17:1108:17 | t | Snd | main.rs:1067:5:1073:5 | PairOption |
-| main.rs:1108:17:1108:17 | t | Snd.Fst | main.rs:1089:5:1090:14 | S2 |
-| main.rs:1108:17:1108:17 | t | Snd.Snd | main.rs:1092:5:1093:14 | S3 |
-| main.rs:1108:17:1108:29 | t.unwrapSnd() |  | main.rs:1067:5:1073:5 | PairOption |
-| main.rs:1108:17:1108:29 | t.unwrapSnd() | Fst | main.rs:1089:5:1090:14 | S2 |
-| main.rs:1108:17:1108:29 | t.unwrapSnd() | Snd | main.rs:1092:5:1093:14 | S3 |
-| main.rs:1108:17:1108:41 | ... .unwrapSnd() |  | main.rs:1092:5:1093:14 | S3 |
-| main.rs:1109:18:1109:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1109:18:1109:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1109:18:1109:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1109:18:1109:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1109:26:1109:26 | x |  | main.rs:1092:5:1093:14 | S3 |
-| main.rs:1124:22:1124:25 | SelfParam |  | main.rs:1122:5:1125:5 | Self [trait TraitWithAssocType] |
-| main.rs:1132:22:1132:25 | SelfParam |  | main.rs:1120:5:1120:28 | GenS |
-| main.rs:1132:22:1132:25 | SelfParam | GenT | main.rs:1127:10:1127:15 | Output |
-| main.rs:1132:44:1134:9 | { ... } |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1132:44:1134:9 | { ... } | E | main.rs:1127:10:1127:15 | Output |
-| main.rs:1132:44:1134:9 | { ... } | T | main.rs:1127:10:1127:15 | Output |
-| main.rs:1133:13:1133:22 | Ok(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1133:13:1133:22 | Ok(...) | E | main.rs:1127:10:1127:15 | Output |
-| main.rs:1133:13:1133:22 | Ok(...) | T | main.rs:1127:10:1127:15 | Output |
-| main.rs:1133:16:1133:19 | self |  | main.rs:1120:5:1120:28 | GenS |
-| main.rs:1133:16:1133:19 | self | GenT | main.rs:1127:10:1127:15 | Output |
-| main.rs:1133:16:1133:21 | self.0 |  | main.rs:1127:10:1127:15 | Output |
-| main.rs:1139:13:1139:14 | p1 |  | main.rs:1067:5:1073:5 | PairOption |
-| main.rs:1139:13:1139:14 | p1 | Fst | main.rs:1086:5:1087:14 | S1 |
-| main.rs:1139:13:1139:14 | p1 | Snd | main.rs:1089:5:1090:14 | S2 |
-| main.rs:1139:26:1139:53 | ...::PairBoth(...) |  | main.rs:1067:5:1073:5 | PairOption |
-| main.rs:1139:26:1139:53 | ...::PairBoth(...) | Fst | main.rs:1086:5:1087:14 | S1 |
-| main.rs:1139:26:1139:53 | ...::PairBoth(...) | Snd | main.rs:1089:5:1090:14 | S2 |
-| main.rs:1139:47:1139:48 | S1 |  | main.rs:1086:5:1087:14 | S1 |
-| main.rs:1139:51:1139:52 | S2 |  | main.rs:1089:5:1090:14 | S2 |
-| main.rs:1140:18:1140:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1140:18:1140:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1140:18:1140:27 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1140:18:1140:27 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1140:26:1140:27 | p1 |  | main.rs:1067:5:1073:5 | PairOption |
-| main.rs:1140:26:1140:27 | p1 | Fst | main.rs:1086:5:1087:14 | S1 |
-| main.rs:1140:26:1140:27 | p1 | Snd | main.rs:1089:5:1090:14 | S2 |
-| main.rs:1143:13:1143:14 | p2 |  | main.rs:1067:5:1073:5 | PairOption |
-| main.rs:1143:13:1143:14 | p2 | Fst | main.rs:1086:5:1087:14 | S1 |
-| main.rs:1143:13:1143:14 | p2 | Snd | main.rs:1089:5:1090:14 | S2 |
-| main.rs:1143:26:1143:47 | ...::PairNone(...) |  | main.rs:1067:5:1073:5 | PairOption |
-| main.rs:1143:26:1143:47 | ...::PairNone(...) | Fst | main.rs:1086:5:1087:14 | S1 |
-| main.rs:1143:26:1143:47 | ...::PairNone(...) | Snd | main.rs:1089:5:1090:14 | S2 |
-| main.rs:1144:18:1144:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1144:18:1144:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1144:18:1144:27 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1144:18:1144:27 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1144:26:1144:27 | p2 |  | main.rs:1067:5:1073:5 | PairOption |
-| main.rs:1144:26:1144:27 | p2 | Fst | main.rs:1086:5:1087:14 | S1 |
-| main.rs:1144:26:1144:27 | p2 | Snd | main.rs:1089:5:1090:14 | S2 |
-| main.rs:1147:13:1147:14 | p3 |  | main.rs:1067:5:1073:5 | PairOption |
-| main.rs:1147:13:1147:14 | p3 | Fst | main.rs:1089:5:1090:14 | S2 |
-| main.rs:1147:13:1147:14 | p3 | Snd | main.rs:1092:5:1093:14 | S3 |
-| main.rs:1147:34:1147:56 | ...::PairSnd(...) |  | main.rs:1067:5:1073:5 | PairOption |
-| main.rs:1147:34:1147:56 | ...::PairSnd(...) | Fst | main.rs:1089:5:1090:14 | S2 |
-| main.rs:1147:34:1147:56 | ...::PairSnd(...) | Snd | main.rs:1092:5:1093:14 | S3 |
-| main.rs:1147:54:1147:55 | S3 |  | main.rs:1092:5:1093:14 | S3 |
-| main.rs:1148:18:1148:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1148:18:1148:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1148:18:1148:27 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1148:18:1148:27 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1148:26:1148:27 | p3 |  | main.rs:1067:5:1073:5 | PairOption |
-| main.rs:1148:26:1148:27 | p3 | Fst | main.rs:1089:5:1090:14 | S2 |
-| main.rs:1148:26:1148:27 | p3 | Snd | main.rs:1092:5:1093:14 | S3 |
-| main.rs:1151:13:1151:14 | p3 |  | main.rs:1067:5:1073:5 | PairOption |
-| main.rs:1151:13:1151:14 | p3 | Fst | main.rs:1089:5:1090:14 | S2 |
-| main.rs:1151:13:1151:14 | p3 | Snd | main.rs:1092:5:1093:14 | S3 |
-| main.rs:1151:35:1151:56 | ...::PairNone(...) |  | main.rs:1067:5:1073:5 | PairOption |
-| main.rs:1151:35:1151:56 | ...::PairNone(...) | Fst | main.rs:1089:5:1090:14 | S2 |
-| main.rs:1151:35:1151:56 | ...::PairNone(...) | Snd | main.rs:1092:5:1093:14 | S3 |
-| main.rs:1152:18:1152:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1152:18:1152:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1152:18:1152:27 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1152:18:1152:27 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1152:26:1152:27 | p3 |  | main.rs:1067:5:1073:5 | PairOption |
-| main.rs:1152:26:1152:27 | p3 | Fst | main.rs:1089:5:1090:14 | S2 |
-| main.rs:1152:26:1152:27 | p3 | Snd | main.rs:1092:5:1093:14 | S3 |
-| main.rs:1154:11:1154:54 | ...::PairSnd(...) |  | main.rs:1067:5:1073:5 | PairOption |
-| main.rs:1154:11:1154:54 | ...::PairSnd(...) | Fst | main.rs:1089:5:1090:14 | S2 |
-| main.rs:1154:11:1154:54 | ...::PairSnd(...) | Snd | main.rs:1067:5:1073:5 | PairOption |
-| main.rs:1154:11:1154:54 | ...::PairSnd(...) | Snd.Fst | main.rs:1089:5:1090:14 | S2 |
-| main.rs:1154:11:1154:54 | ...::PairSnd(...) | Snd.Snd | main.rs:1092:5:1093:14 | S3 |
-| main.rs:1154:31:1154:53 | ...::PairSnd(...) |  | main.rs:1067:5:1073:5 | PairOption |
-| main.rs:1154:31:1154:53 | ...::PairSnd(...) | Fst | main.rs:1089:5:1090:14 | S2 |
-| main.rs:1154:31:1154:53 | ...::PairSnd(...) | Snd | main.rs:1092:5:1093:14 | S3 |
-| main.rs:1154:51:1154:52 | S3 |  | main.rs:1092:5:1093:14 | S3 |
-| main.rs:1156:13:1156:13 | x |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1156:13:1156:13 | x | E | main.rs:1086:5:1087:14 | S1 |
-| main.rs:1156:13:1156:13 | x | T | main.rs:1112:5:1112:34 | S4 |
-| main.rs:1156:13:1156:13 | x | T.T41 | main.rs:1089:5:1090:14 | S2 |
-| main.rs:1156:13:1156:13 | x | T.T42 | main.rs:1114:5:1114:22 | S5 |
-| main.rs:1156:13:1156:13 | x | T.T42.T5 | main.rs:1089:5:1090:14 | S2 |
-| main.rs:1158:13:1158:13 | y |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1158:13:1158:13 | y | E | {EXTERNAL LOCATION} | bool |
-| main.rs:1158:13:1158:13 | y | T | {EXTERNAL LOCATION} | bool |
-| main.rs:1158:17:1158:26 | GenS(...) |  | main.rs:1120:5:1120:28 | GenS |
-| main.rs:1158:17:1158:26 | GenS(...) | GenT | {EXTERNAL LOCATION} | bool |
-| main.rs:1158:17:1158:38 | ... .get_input() |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1158:17:1158:38 | ... .get_input() | E | {EXTERNAL LOCATION} | bool |
-| main.rs:1158:17:1158:38 | ... .get_input() | T | {EXTERNAL LOCATION} | bool |
-| main.rs:1158:22:1158:25 | true |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1171:16:1171:24 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1171:16:1171:24 | SelfParam | &T | main.rs:1169:5:1176:5 | Self [trait MyTrait] |
-| main.rs:1171:27:1171:31 | value |  | main.rs:1169:19:1169:19 | S |
-| main.rs:1173:21:1173:29 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1173:21:1173:29 | SelfParam | &T | main.rs:1169:5:1176:5 | Self [trait MyTrait] |
-| main.rs:1173:32:1173:36 | value |  | main.rs:1169:19:1169:19 | S |
-| main.rs:1174:13:1174:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1174:13:1174:16 | self | &T | main.rs:1169:5:1176:5 | Self [trait MyTrait] |
-| main.rs:1174:22:1174:26 | value |  | main.rs:1169:19:1169:19 | S |
-| main.rs:1180:16:1180:24 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1180:16:1180:24 | SelfParam | &T | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1180:16:1180:24 | SelfParam | &T.T | main.rs:1178:10:1178:10 | T |
-| main.rs:1180:27:1180:31 | value |  | main.rs:1178:10:1178:10 | T |
-| main.rs:1184:26:1186:9 | { ... } |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1184:26:1186:9 | { ... } | T | main.rs:1183:10:1183:10 | T |
-| main.rs:1185:13:1185:30 | ...::MyNone(...) |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1185:13:1185:30 | ...::MyNone(...) | T | main.rs:1183:10:1183:10 | T |
-| main.rs:1190:20:1190:23 | SelfParam |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1190:20:1190:23 | SelfParam | T | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1190:20:1190:23 | SelfParam | T.T | main.rs:1189:10:1189:10 | T |
-| main.rs:1190:41:1195:9 | { ... } |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1190:41:1195:9 | { ... } | T | main.rs:1189:10:1189:10 | T |
-| main.rs:1191:13:1194:13 | match self { ... } |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1191:13:1194:13 | match self { ... } | T | main.rs:1189:10:1189:10 | T |
-| main.rs:1191:19:1191:22 | self |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1191:19:1191:22 | self | T | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1191:19:1191:22 | self | T.T | main.rs:1189:10:1189:10 | T |
-| main.rs:1192:17:1192:34 | ...::MyNone(...) |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1192:17:1192:34 | ...::MyNone(...) | T | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1192:17:1192:34 | ...::MyNone(...) | T.T | main.rs:1189:10:1189:10 | T |
-| main.rs:1192:39:1192:56 | ...::MyNone(...) |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1192:39:1192:56 | ...::MyNone(...) | T | main.rs:1189:10:1189:10 | T |
-| main.rs:1193:17:1193:35 | ...::MySome(...) |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1193:17:1193:35 | ...::MySome(...) | T | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1193:17:1193:35 | ...::MySome(...) | T.T | main.rs:1189:10:1189:10 | T |
-| main.rs:1193:34:1193:34 | x |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1193:34:1193:34 | x | T | main.rs:1189:10:1189:10 | T |
-| main.rs:1193:40:1193:40 | x |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1193:40:1193:40 | x | T | main.rs:1189:10:1189:10 | T |
-| main.rs:1202:13:1202:14 | x1 |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1202:13:1202:14 | x1 | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1202:18:1202:37 | ...::new(...) |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1202:18:1202:37 | ...::new(...) | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1203:18:1203:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1203:18:1203:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1203:18:1203:27 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1203:18:1203:27 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1203:26:1203:27 | x1 |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1203:26:1203:27 | x1 | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1205:17:1205:18 | x2 |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1205:17:1205:18 | x2 | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1205:22:1205:36 | ...::new(...) |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1205:22:1205:36 | ...::new(...) | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1206:9:1206:10 | x2 |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1206:9:1206:10 | x2 | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1206:16:1206:16 | S |  | main.rs:1198:5:1199:13 | S |
-| main.rs:1207:18:1207:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1207:18:1207:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1207:18:1207:27 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1207:18:1207:27 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1207:26:1207:27 | x2 |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1207:26:1207:27 | x2 | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1210:17:1210:18 | x3 |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1210:22:1210:36 | ...::new(...) |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1211:9:1211:10 | x3 |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1211:21:1211:21 | S |  | main.rs:1198:5:1199:13 | S |
+| main.rs:130:25:130:29 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:130:25:130:29 | SelfParam | &T | main.rs:128:9:133:9 | Self [trait Foo] |
+| main.rs:130:32:132:13 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:131:26:131:31 | "foo!\\n" |  | file://:0:0:0:0 | & |
+| main.rs:131:26:131:31 | "foo!\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:131:26:131:31 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:131:26:131:31 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:137:25:137:29 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:137:25:137:29 | SelfParam | &T | main.rs:135:9:140:9 | Self [trait Bar] |
+| main.rs:137:32:139:13 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:138:26:138:31 | "bar!\\n" |  | file://:0:0:0:0 | & |
+| main.rs:138:26:138:31 | "bar!\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:138:26:138:31 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:138:26:138:31 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:149:15:170:5 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:150:13:150:13 | x |  | main.rs:142:9:142:21 | X |
+| main.rs:150:17:150:17 | X |  | main.rs:142:9:142:21 | X |
+| main.rs:151:9:154:9 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:153:13:153:13 | x |  | main.rs:142:9:142:21 | X |
+| main.rs:153:13:153:24 | x.a_method() |  | file://:0:0:0:0 | () |
+| main.rs:155:9:158:9 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:157:13:157:13 | x |  | main.rs:142:9:142:21 | X |
+| main.rs:157:13:157:24 | x.a_method() |  | file://:0:0:0:0 | () |
+| main.rs:159:9:162:9 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:161:13:161:13 | x |  | main.rs:142:9:142:21 | X |
+| main.rs:161:13:161:24 | x.a_method() |  | file://:0:0:0:0 | () |
+| main.rs:163:9:169:9 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:167:13:167:29 | ...::a_method(...) |  | file://:0:0:0:0 | () |
+| main.rs:167:27:167:28 | &x |  | file://:0:0:0:0 | & |
+| main.rs:167:27:167:28 | &x | &T | main.rs:142:9:142:21 | X |
+| main.rs:167:28:167:28 | x |  | main.rs:142:9:142:21 | X |
+| main.rs:168:13:168:29 | ...::a_method(...) |  | file://:0:0:0:0 | () |
+| main.rs:168:27:168:28 | &x |  | file://:0:0:0:0 | & |
+| main.rs:168:27:168:28 | &x | &T | main.rs:142:9:142:21 | X |
+| main.rs:168:28:168:28 | x |  | main.rs:142:9:142:21 | X |
+| main.rs:186:15:186:18 | SelfParam |  | main.rs:174:5:177:5 | MyThing |
+| main.rs:186:15:186:18 | SelfParam | A | main.rs:179:5:180:14 | S1 |
+| main.rs:186:27:188:9 | { ... } |  | main.rs:179:5:180:14 | S1 |
+| main.rs:187:13:187:16 | self |  | main.rs:174:5:177:5 | MyThing |
+| main.rs:187:13:187:16 | self | A | main.rs:179:5:180:14 | S1 |
+| main.rs:187:13:187:18 | self.a |  | main.rs:179:5:180:14 | S1 |
+| main.rs:193:15:193:18 | SelfParam |  | main.rs:174:5:177:5 | MyThing |
+| main.rs:193:15:193:18 | SelfParam | A | main.rs:181:5:182:14 | S2 |
+| main.rs:193:29:195:9 | { ... } |  | main.rs:174:5:177:5 | MyThing |
+| main.rs:193:29:195:9 | { ... } | A | main.rs:181:5:182:14 | S2 |
+| main.rs:194:13:194:30 | Self {...} |  | main.rs:174:5:177:5 | MyThing |
+| main.rs:194:13:194:30 | Self {...} | A | main.rs:181:5:182:14 | S2 |
+| main.rs:194:23:194:26 | self |  | main.rs:174:5:177:5 | MyThing |
+| main.rs:194:23:194:26 | self | A | main.rs:181:5:182:14 | S2 |
+| main.rs:194:23:194:28 | self.a |  | main.rs:181:5:182:14 | S2 |
+| main.rs:199:15:199:18 | SelfParam |  | main.rs:174:5:177:5 | MyThing |
+| main.rs:199:15:199:18 | SelfParam | A | main.rs:198:10:198:10 | T |
+| main.rs:199:26:201:9 | { ... } |  | main.rs:198:10:198:10 | T |
+| main.rs:200:13:200:16 | self |  | main.rs:174:5:177:5 | MyThing |
+| main.rs:200:13:200:16 | self | A | main.rs:198:10:198:10 | T |
+| main.rs:200:13:200:18 | self.a |  | main.rs:198:10:198:10 | T |
+| main.rs:204:16:220:5 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:205:13:205:13 | x |  | main.rs:174:5:177:5 | MyThing |
+| main.rs:205:13:205:13 | x | A | main.rs:179:5:180:14 | S1 |
+| main.rs:205:17:205:33 | MyThing {...} |  | main.rs:174:5:177:5 | MyThing |
+| main.rs:205:17:205:33 | MyThing {...} | A | main.rs:179:5:180:14 | S1 |
+| main.rs:205:30:205:31 | S1 |  | main.rs:179:5:180:14 | S1 |
+| main.rs:206:13:206:13 | y |  | main.rs:174:5:177:5 | MyThing |
+| main.rs:206:13:206:13 | y | A | main.rs:181:5:182:14 | S2 |
+| main.rs:206:17:206:33 | MyThing {...} |  | main.rs:174:5:177:5 | MyThing |
+| main.rs:206:17:206:33 | MyThing {...} | A | main.rs:181:5:182:14 | S2 |
+| main.rs:206:30:206:31 | S2 |  | main.rs:181:5:182:14 | S2 |
+| main.rs:209:18:209:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:209:18:209:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:209:18:209:28 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:209:18:209:28 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:209:26:209:26 | x |  | main.rs:174:5:177:5 | MyThing |
+| main.rs:209:26:209:26 | x | A | main.rs:179:5:180:14 | S1 |
+| main.rs:209:26:209:28 | x.a |  | main.rs:179:5:180:14 | S1 |
+| main.rs:210:18:210:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:210:18:210:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:210:18:210:28 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:210:18:210:28 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:210:26:210:26 | y |  | main.rs:174:5:177:5 | MyThing |
+| main.rs:210:26:210:26 | y | A | main.rs:181:5:182:14 | S2 |
+| main.rs:210:26:210:28 | y.a |  | main.rs:181:5:182:14 | S2 |
+| main.rs:212:18:212:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:212:18:212:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:212:18:212:31 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:212:18:212:31 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:212:26:212:26 | x |  | main.rs:174:5:177:5 | MyThing |
+| main.rs:212:26:212:26 | x | A | main.rs:179:5:180:14 | S1 |
+| main.rs:212:26:212:31 | x.m1() |  | main.rs:179:5:180:14 | S1 |
+| main.rs:213:18:213:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:213:18:213:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:213:18:213:33 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:213:18:213:33 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:213:26:213:26 | y |  | main.rs:174:5:177:5 | MyThing |
+| main.rs:213:26:213:26 | y | A | main.rs:181:5:182:14 | S2 |
+| main.rs:213:26:213:31 | y.m1() |  | main.rs:174:5:177:5 | MyThing |
+| main.rs:213:26:213:31 | y.m1() | A | main.rs:181:5:182:14 | S2 |
+| main.rs:213:26:213:33 | ... .a |  | main.rs:181:5:182:14 | S2 |
+| main.rs:215:13:215:13 | x |  | main.rs:174:5:177:5 | MyThing |
+| main.rs:215:13:215:13 | x | A | main.rs:179:5:180:14 | S1 |
+| main.rs:215:17:215:33 | MyThing {...} |  | main.rs:174:5:177:5 | MyThing |
+| main.rs:215:17:215:33 | MyThing {...} | A | main.rs:179:5:180:14 | S1 |
+| main.rs:215:30:215:31 | S1 |  | main.rs:179:5:180:14 | S1 |
+| main.rs:216:13:216:13 | y |  | main.rs:174:5:177:5 | MyThing |
+| main.rs:216:13:216:13 | y | A | main.rs:181:5:182:14 | S2 |
+| main.rs:216:17:216:33 | MyThing {...} |  | main.rs:174:5:177:5 | MyThing |
+| main.rs:216:17:216:33 | MyThing {...} | A | main.rs:181:5:182:14 | S2 |
+| main.rs:216:30:216:31 | S2 |  | main.rs:181:5:182:14 | S2 |
+| main.rs:218:18:218:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:218:18:218:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:218:18:218:31 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:218:18:218:31 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:218:26:218:26 | x |  | main.rs:174:5:177:5 | MyThing |
+| main.rs:218:26:218:26 | x | A | main.rs:179:5:180:14 | S1 |
+| main.rs:218:26:218:31 | x.m2() |  | main.rs:179:5:180:14 | S1 |
+| main.rs:219:18:219:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:219:18:219:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:219:18:219:31 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:219:18:219:31 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:219:26:219:26 | y |  | main.rs:174:5:177:5 | MyThing |
+| main.rs:219:26:219:26 | y | A | main.rs:181:5:182:14 | S2 |
+| main.rs:219:26:219:31 | y.m2() |  | main.rs:181:5:182:14 | S2 |
+| main.rs:243:15:243:18 | SelfParam |  | main.rs:242:5:251:5 | Self [trait MyTrait] |
+| main.rs:245:15:245:18 | SelfParam |  | main.rs:242:5:251:5 | Self [trait MyTrait] |
+| main.rs:248:9:250:9 | { ... } |  | main.rs:242:5:251:5 | Self [trait MyTrait] |
+| main.rs:249:13:249:16 | self |  | main.rs:242:5:251:5 | Self [trait MyTrait] |
+| main.rs:255:16:255:19 | SelfParam |  | main.rs:253:5:258:5 | Self [trait MyProduct] |
+| main.rs:257:16:257:19 | SelfParam |  | main.rs:253:5:258:5 | Self [trait MyProduct] |
+| main.rs:260:43:260:43 | x |  | main.rs:260:26:260:40 | T2 |
+| main.rs:260:56:262:5 | { ... } |  | main.rs:260:22:260:23 | T1 |
+| main.rs:261:9:261:9 | x |  | main.rs:260:26:260:40 | T2 |
+| main.rs:261:9:261:14 | x.m1() |  | main.rs:260:22:260:23 | T1 |
+| main.rs:266:15:266:18 | SelfParam |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:266:15:266:18 | SelfParam | A | main.rs:235:5:236:14 | S1 |
+| main.rs:266:27:268:9 | { ... } |  | main.rs:235:5:236:14 | S1 |
+| main.rs:267:13:267:16 | self |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:267:13:267:16 | self | A | main.rs:235:5:236:14 | S1 |
+| main.rs:267:13:267:18 | self.a |  | main.rs:235:5:236:14 | S1 |
+| main.rs:273:15:273:18 | SelfParam |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:273:15:273:18 | SelfParam | A | main.rs:237:5:238:14 | S2 |
+| main.rs:273:29:275:9 | { ... } |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:273:29:275:9 | { ... } | A | main.rs:237:5:238:14 | S2 |
+| main.rs:274:13:274:30 | Self {...} |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:274:13:274:30 | Self {...} | A | main.rs:237:5:238:14 | S2 |
+| main.rs:274:23:274:26 | self |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:274:23:274:26 | self | A | main.rs:237:5:238:14 | S2 |
+| main.rs:274:23:274:28 | self.a |  | main.rs:237:5:238:14 | S2 |
+| main.rs:285:15:285:18 | SelfParam |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:285:15:285:18 | SelfParam | A | main.rs:239:5:240:14 | S3 |
+| main.rs:285:27:287:9 | { ... } |  | main.rs:280:10:280:11 | TD |
+| main.rs:286:13:286:25 | ...::default(...) |  | main.rs:280:10:280:11 | TD |
+| main.rs:292:15:292:18 | SelfParam |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:292:15:292:18 | SelfParam | P1 | main.rs:290:10:290:10 | I |
+| main.rs:292:15:292:18 | SelfParam | P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:292:26:294:9 | { ... } |  | main.rs:290:10:290:10 | I |
+| main.rs:293:13:293:16 | self |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:293:13:293:16 | self | P1 | main.rs:290:10:290:10 | I |
+| main.rs:293:13:293:16 | self | P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:293:13:293:19 | self.p1 |  | main.rs:290:10:290:10 | I |
+| main.rs:299:15:299:18 | SelfParam |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:299:15:299:18 | SelfParam | P1 | main.rs:235:5:236:14 | S1 |
+| main.rs:299:15:299:18 | SelfParam | P2 | main.rs:237:5:238:14 | S2 |
+| main.rs:299:27:301:9 | { ... } |  | main.rs:239:5:240:14 | S3 |
+| main.rs:300:13:300:14 | S3 |  | main.rs:239:5:240:14 | S3 |
+| main.rs:306:15:306:18 | SelfParam |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:306:15:306:18 | SelfParam | P1 | main.rs:224:5:227:5 | MyThing |
+| main.rs:306:15:306:18 | SelfParam | P1.A | main.rs:304:10:304:11 | TT |
+| main.rs:306:15:306:18 | SelfParam | P2 | main.rs:239:5:240:14 | S3 |
+| main.rs:306:27:309:9 | { ... } |  | main.rs:304:10:304:11 | TT |
+| main.rs:307:17:307:21 | alpha |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:307:17:307:21 | alpha | A | main.rs:304:10:304:11 | TT |
+| main.rs:307:25:307:28 | self |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:307:25:307:28 | self | P1 | main.rs:224:5:227:5 | MyThing |
+| main.rs:307:25:307:28 | self | P1.A | main.rs:304:10:304:11 | TT |
+| main.rs:307:25:307:28 | self | P2 | main.rs:239:5:240:14 | S3 |
+| main.rs:307:25:307:31 | self.p1 |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:307:25:307:31 | self.p1 | A | main.rs:304:10:304:11 | TT |
+| main.rs:308:13:308:17 | alpha |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:308:13:308:17 | alpha | A | main.rs:304:10:304:11 | TT |
+| main.rs:308:13:308:19 | alpha.a |  | main.rs:304:10:304:11 | TT |
+| main.rs:315:16:315:19 | SelfParam |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:315:16:315:19 | SelfParam | P1 | main.rs:313:10:313:10 | A |
+| main.rs:315:16:315:19 | SelfParam | P2 | main.rs:313:10:313:10 | A |
+| main.rs:315:27:317:9 | { ... } |  | main.rs:313:10:313:10 | A |
+| main.rs:316:13:316:16 | self |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:316:13:316:16 | self | P1 | main.rs:313:10:313:10 | A |
+| main.rs:316:13:316:16 | self | P2 | main.rs:313:10:313:10 | A |
+| main.rs:316:13:316:19 | self.p1 |  | main.rs:313:10:313:10 | A |
+| main.rs:320:16:320:19 | SelfParam |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:320:16:320:19 | SelfParam | P1 | main.rs:313:10:313:10 | A |
+| main.rs:320:16:320:19 | SelfParam | P2 | main.rs:313:10:313:10 | A |
+| main.rs:320:27:322:9 | { ... } |  | main.rs:313:10:313:10 | A |
+| main.rs:321:13:321:16 | self |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:321:13:321:16 | self | P1 | main.rs:313:10:313:10 | A |
+| main.rs:321:13:321:16 | self | P2 | main.rs:313:10:313:10 | A |
+| main.rs:321:13:321:19 | self.p2 |  | main.rs:313:10:313:10 | A |
+| main.rs:328:16:328:19 | SelfParam |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:328:16:328:19 | SelfParam | P1 | main.rs:237:5:238:14 | S2 |
+| main.rs:328:16:328:19 | SelfParam | P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:328:28:330:9 | { ... } |  | main.rs:235:5:236:14 | S1 |
+| main.rs:329:13:329:16 | self |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:329:13:329:16 | self | P1 | main.rs:237:5:238:14 | S2 |
+| main.rs:329:13:329:16 | self | P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:329:13:329:19 | self.p2 |  | main.rs:235:5:236:14 | S1 |
+| main.rs:333:16:333:19 | SelfParam |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:333:16:333:19 | SelfParam | P1 | main.rs:237:5:238:14 | S2 |
+| main.rs:333:16:333:19 | SelfParam | P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:333:28:335:9 | { ... } |  | main.rs:237:5:238:14 | S2 |
+| main.rs:334:13:334:16 | self |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:334:13:334:16 | self | P1 | main.rs:237:5:238:14 | S2 |
+| main.rs:334:13:334:16 | self | P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:334:13:334:19 | self.p1 |  | main.rs:237:5:238:14 | S2 |
+| main.rs:338:46:338:46 | p |  | main.rs:338:24:338:43 | P |
+| main.rs:338:58:340:5 | { ... } |  | main.rs:338:16:338:17 | V1 |
+| main.rs:339:9:339:9 | p |  | main.rs:338:24:338:43 | P |
+| main.rs:339:9:339:15 | p.fst() |  | main.rs:338:16:338:17 | V1 |
+| main.rs:342:46:342:46 | p |  | main.rs:342:24:342:43 | P |
+| main.rs:342:58:344:5 | { ... } |  | main.rs:342:20:342:21 | V2 |
+| main.rs:343:9:343:9 | p |  | main.rs:342:24:342:43 | P |
+| main.rs:343:9:343:15 | p.snd() |  | main.rs:342:20:342:21 | V2 |
+| main.rs:346:54:346:54 | p |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:346:54:346:54 | p | P1 | main.rs:346:20:346:21 | V0 |
+| main.rs:346:54:346:54 | p | P2 | main.rs:346:32:346:51 | P |
+| main.rs:346:78:348:5 | { ... } |  | main.rs:346:24:346:25 | V1 |
+| main.rs:347:9:347:9 | p |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:347:9:347:9 | p | P1 | main.rs:346:20:346:21 | V0 |
+| main.rs:347:9:347:9 | p | P2 | main.rs:346:32:346:51 | P |
+| main.rs:347:9:347:12 | p.p2 |  | main.rs:346:32:346:51 | P |
+| main.rs:347:9:347:18 | ... .fst() |  | main.rs:346:24:346:25 | V1 |
+| main.rs:352:23:352:26 | SelfParam |  | main.rs:350:5:353:5 | Self [trait ConvertTo] |
+| main.rs:357:23:357:26 | SelfParam |  | main.rs:355:10:355:23 | T |
+| main.rs:357:35:359:9 | { ... } |  | main.rs:235:5:236:14 | S1 |
+| main.rs:358:13:358:16 | self |  | main.rs:355:10:355:23 | T |
+| main.rs:358:13:358:21 | self.m1() |  | main.rs:235:5:236:14 | S1 |
+| main.rs:362:41:362:45 | thing |  | main.rs:362:23:362:38 | T |
+| main.rs:362:57:364:5 | { ... } |  | main.rs:362:19:362:20 | TS |
+| main.rs:363:9:363:13 | thing |  | main.rs:362:23:362:38 | T |
+| main.rs:363:9:363:26 | thing.convert_to() |  | main.rs:362:19:362:20 | TS |
+| main.rs:366:56:366:60 | thing |  | main.rs:366:39:366:53 | TP |
+| main.rs:366:73:369:5 | { ... } |  | main.rs:235:5:236:14 | S1 |
+| main.rs:368:9:368:13 | thing |  | main.rs:366:39:366:53 | TP |
+| main.rs:368:9:368:26 | thing.convert_to() |  | main.rs:235:5:236:14 | S1 |
+| main.rs:371:16:442:5 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:372:13:372:20 | thing_s1 |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:372:13:372:20 | thing_s1 | A | main.rs:235:5:236:14 | S1 |
+| main.rs:372:24:372:40 | MyThing {...} |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:372:24:372:40 | MyThing {...} | A | main.rs:235:5:236:14 | S1 |
+| main.rs:372:37:372:38 | S1 |  | main.rs:235:5:236:14 | S1 |
+| main.rs:373:13:373:20 | thing_s2 |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:373:13:373:20 | thing_s2 | A | main.rs:237:5:238:14 | S2 |
+| main.rs:373:24:373:40 | MyThing {...} |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:373:24:373:40 | MyThing {...} | A | main.rs:237:5:238:14 | S2 |
+| main.rs:373:37:373:38 | S2 |  | main.rs:237:5:238:14 | S2 |
+| main.rs:374:13:374:20 | thing_s3 |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:374:13:374:20 | thing_s3 | A | main.rs:239:5:240:14 | S3 |
+| main.rs:374:24:374:40 | MyThing {...} |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:374:24:374:40 | MyThing {...} | A | main.rs:239:5:240:14 | S3 |
+| main.rs:374:37:374:38 | S3 |  | main.rs:239:5:240:14 | S3 |
+| main.rs:378:18:378:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:378:18:378:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:378:18:378:38 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:378:18:378:38 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:378:26:378:33 | thing_s1 |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:378:26:378:33 | thing_s1 | A | main.rs:235:5:236:14 | S1 |
+| main.rs:378:26:378:38 | thing_s1.m1() |  | main.rs:235:5:236:14 | S1 |
+| main.rs:379:18:379:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:379:18:379:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:379:18:379:40 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:379:18:379:40 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:379:26:379:33 | thing_s2 |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:379:26:379:33 | thing_s2 | A | main.rs:237:5:238:14 | S2 |
+| main.rs:379:26:379:38 | thing_s2.m1() |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:379:26:379:38 | thing_s2.m1() | A | main.rs:237:5:238:14 | S2 |
+| main.rs:379:26:379:40 | ... .a |  | main.rs:237:5:238:14 | S2 |
+| main.rs:380:13:380:14 | s3 |  | main.rs:239:5:240:14 | S3 |
+| main.rs:380:22:380:29 | thing_s3 |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:380:22:380:29 | thing_s3 | A | main.rs:239:5:240:14 | S3 |
+| main.rs:380:22:380:34 | thing_s3.m1() |  | main.rs:239:5:240:14 | S3 |
+| main.rs:381:18:381:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:381:18:381:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:381:18:381:27 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:381:18:381:27 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:381:26:381:27 | s3 |  | main.rs:239:5:240:14 | S3 |
+| main.rs:383:13:383:14 | p1 |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:383:13:383:14 | p1 | P1 | main.rs:235:5:236:14 | S1 |
+| main.rs:383:13:383:14 | p1 | P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:383:18:383:42 | MyPair {...} |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:383:18:383:42 | MyPair {...} | P1 | main.rs:235:5:236:14 | S1 |
+| main.rs:383:18:383:42 | MyPair {...} | P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:383:31:383:32 | S1 |  | main.rs:235:5:236:14 | S1 |
+| main.rs:383:39:383:40 | S1 |  | main.rs:235:5:236:14 | S1 |
+| main.rs:384:18:384:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:384:18:384:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:384:18:384:32 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:384:18:384:32 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:384:26:384:27 | p1 |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:384:26:384:27 | p1 | P1 | main.rs:235:5:236:14 | S1 |
+| main.rs:384:26:384:27 | p1 | P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:384:26:384:32 | p1.m1() |  | main.rs:235:5:236:14 | S1 |
+| main.rs:386:13:386:14 | p2 |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:386:13:386:14 | p2 | P1 | main.rs:235:5:236:14 | S1 |
+| main.rs:386:13:386:14 | p2 | P2 | main.rs:237:5:238:14 | S2 |
+| main.rs:386:18:386:42 | MyPair {...} |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:386:18:386:42 | MyPair {...} | P1 | main.rs:235:5:236:14 | S1 |
+| main.rs:386:18:386:42 | MyPair {...} | P2 | main.rs:237:5:238:14 | S2 |
+| main.rs:386:31:386:32 | S1 |  | main.rs:235:5:236:14 | S1 |
+| main.rs:386:39:386:40 | S2 |  | main.rs:237:5:238:14 | S2 |
+| main.rs:387:18:387:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:387:18:387:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:387:18:387:32 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:387:18:387:32 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:387:26:387:27 | p2 |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:387:26:387:27 | p2 | P1 | main.rs:235:5:236:14 | S1 |
+| main.rs:387:26:387:27 | p2 | P2 | main.rs:237:5:238:14 | S2 |
+| main.rs:387:26:387:32 | p2.m1() |  | main.rs:239:5:240:14 | S3 |
+| main.rs:389:13:389:14 | p3 |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:389:13:389:14 | p3 | P1 | main.rs:224:5:227:5 | MyThing |
+| main.rs:389:13:389:14 | p3 | P1.A | main.rs:235:5:236:14 | S1 |
+| main.rs:389:13:389:14 | p3 | P2 | main.rs:239:5:240:14 | S3 |
+| main.rs:389:18:392:9 | MyPair {...} |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:389:18:392:9 | MyPair {...} | P1 | main.rs:224:5:227:5 | MyThing |
+| main.rs:389:18:392:9 | MyPair {...} | P1.A | main.rs:235:5:236:14 | S1 |
+| main.rs:389:18:392:9 | MyPair {...} | P2 | main.rs:239:5:240:14 | S3 |
+| main.rs:390:17:390:33 | MyThing {...} |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:390:17:390:33 | MyThing {...} | A | main.rs:235:5:236:14 | S1 |
+| main.rs:390:30:390:31 | S1 |  | main.rs:235:5:236:14 | S1 |
+| main.rs:391:17:391:18 | S3 |  | main.rs:239:5:240:14 | S3 |
+| main.rs:393:18:393:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:393:18:393:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:393:18:393:32 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:393:18:393:32 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:393:26:393:27 | p3 |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:393:26:393:27 | p3 | P1 | main.rs:224:5:227:5 | MyThing |
+| main.rs:393:26:393:27 | p3 | P1.A | main.rs:235:5:236:14 | S1 |
+| main.rs:393:26:393:27 | p3 | P2 | main.rs:239:5:240:14 | S3 |
+| main.rs:393:26:393:32 | p3.m1() |  | main.rs:235:5:236:14 | S1 |
+| main.rs:396:13:396:13 | a |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:396:13:396:13 | a | P1 | main.rs:235:5:236:14 | S1 |
+| main.rs:396:13:396:13 | a | P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:396:17:396:41 | MyPair {...} |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:396:17:396:41 | MyPair {...} | P1 | main.rs:235:5:236:14 | S1 |
+| main.rs:396:17:396:41 | MyPair {...} | P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:396:30:396:31 | S1 |  | main.rs:235:5:236:14 | S1 |
+| main.rs:396:38:396:39 | S1 |  | main.rs:235:5:236:14 | S1 |
+| main.rs:397:13:397:13 | x |  | main.rs:235:5:236:14 | S1 |
+| main.rs:397:17:397:17 | a |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:397:17:397:17 | a | P1 | main.rs:235:5:236:14 | S1 |
+| main.rs:397:17:397:17 | a | P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:397:17:397:23 | a.fst() |  | main.rs:235:5:236:14 | S1 |
+| main.rs:398:18:398:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:398:18:398:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:398:18:398:26 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:398:18:398:26 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:398:26:398:26 | x |  | main.rs:235:5:236:14 | S1 |
+| main.rs:399:13:399:13 | y |  | main.rs:235:5:236:14 | S1 |
+| main.rs:399:17:399:17 | a |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:399:17:399:17 | a | P1 | main.rs:235:5:236:14 | S1 |
+| main.rs:399:17:399:17 | a | P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:399:17:399:23 | a.snd() |  | main.rs:235:5:236:14 | S1 |
+| main.rs:400:18:400:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:400:18:400:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:400:18:400:26 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:400:18:400:26 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:400:26:400:26 | y |  | main.rs:235:5:236:14 | S1 |
+| main.rs:406:13:406:13 | b |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:406:13:406:13 | b | P1 | main.rs:237:5:238:14 | S2 |
+| main.rs:406:13:406:13 | b | P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:406:17:406:41 | MyPair {...} |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:406:17:406:41 | MyPair {...} | P1 | main.rs:237:5:238:14 | S2 |
+| main.rs:406:17:406:41 | MyPair {...} | P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:406:30:406:31 | S2 |  | main.rs:237:5:238:14 | S2 |
+| main.rs:406:38:406:39 | S1 |  | main.rs:235:5:236:14 | S1 |
+| main.rs:407:13:407:13 | x |  | main.rs:235:5:236:14 | S1 |
+| main.rs:407:17:407:17 | b |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:407:17:407:17 | b | P1 | main.rs:237:5:238:14 | S2 |
+| main.rs:407:17:407:17 | b | P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:407:17:407:23 | b.fst() |  | main.rs:235:5:236:14 | S1 |
+| main.rs:408:18:408:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:408:18:408:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:408:18:408:26 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:408:18:408:26 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:408:26:408:26 | x |  | main.rs:235:5:236:14 | S1 |
+| main.rs:409:13:409:13 | y |  | main.rs:237:5:238:14 | S2 |
+| main.rs:409:17:409:17 | b |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:409:17:409:17 | b | P1 | main.rs:237:5:238:14 | S2 |
+| main.rs:409:17:409:17 | b | P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:409:17:409:23 | b.snd() |  | main.rs:237:5:238:14 | S2 |
+| main.rs:410:18:410:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:410:18:410:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:410:18:410:26 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:410:18:410:26 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:410:26:410:26 | y |  | main.rs:237:5:238:14 | S2 |
+| main.rs:414:13:414:13 | x |  | main.rs:235:5:236:14 | S1 |
+| main.rs:414:17:414:39 | call_trait_m1(...) |  | main.rs:235:5:236:14 | S1 |
+| main.rs:414:31:414:38 | thing_s1 |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:414:31:414:38 | thing_s1 | A | main.rs:235:5:236:14 | S1 |
+| main.rs:415:18:415:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:415:18:415:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:415:18:415:26 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:415:18:415:26 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:415:26:415:26 | x |  | main.rs:235:5:236:14 | S1 |
+| main.rs:416:13:416:13 | y |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:416:13:416:13 | y | A | main.rs:237:5:238:14 | S2 |
+| main.rs:416:17:416:39 | call_trait_m1(...) |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:416:17:416:39 | call_trait_m1(...) | A | main.rs:237:5:238:14 | S2 |
+| main.rs:416:31:416:38 | thing_s2 |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:416:31:416:38 | thing_s2 | A | main.rs:237:5:238:14 | S2 |
+| main.rs:417:18:417:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:417:18:417:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:417:18:417:28 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:417:18:417:28 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:417:26:417:26 | y |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:417:26:417:26 | y | A | main.rs:237:5:238:14 | S2 |
+| main.rs:417:26:417:28 | y.a |  | main.rs:237:5:238:14 | S2 |
+| main.rs:420:13:420:13 | a |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:420:13:420:13 | a | P1 | main.rs:235:5:236:14 | S1 |
+| main.rs:420:13:420:13 | a | P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:420:17:420:41 | MyPair {...} |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:420:17:420:41 | MyPair {...} | P1 | main.rs:235:5:236:14 | S1 |
+| main.rs:420:17:420:41 | MyPair {...} | P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:420:30:420:31 | S1 |  | main.rs:235:5:236:14 | S1 |
+| main.rs:420:38:420:39 | S1 |  | main.rs:235:5:236:14 | S1 |
+| main.rs:421:13:421:13 | x |  | main.rs:235:5:236:14 | S1 |
+| main.rs:421:17:421:26 | get_fst(...) |  | main.rs:235:5:236:14 | S1 |
+| main.rs:421:25:421:25 | a |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:421:25:421:25 | a | P1 | main.rs:235:5:236:14 | S1 |
+| main.rs:421:25:421:25 | a | P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:422:18:422:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:422:18:422:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:422:18:422:26 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:422:18:422:26 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:422:26:422:26 | x |  | main.rs:235:5:236:14 | S1 |
+| main.rs:423:13:423:13 | y |  | main.rs:235:5:236:14 | S1 |
+| main.rs:423:17:423:26 | get_snd(...) |  | main.rs:235:5:236:14 | S1 |
+| main.rs:423:25:423:25 | a |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:423:25:423:25 | a | P1 | main.rs:235:5:236:14 | S1 |
+| main.rs:423:25:423:25 | a | P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:424:18:424:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:424:18:424:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:424:18:424:26 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:424:18:424:26 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:424:26:424:26 | y |  | main.rs:235:5:236:14 | S1 |
+| main.rs:427:13:427:13 | b |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:427:13:427:13 | b | P1 | main.rs:237:5:238:14 | S2 |
+| main.rs:427:13:427:13 | b | P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:427:17:427:41 | MyPair {...} |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:427:17:427:41 | MyPair {...} | P1 | main.rs:237:5:238:14 | S2 |
+| main.rs:427:17:427:41 | MyPair {...} | P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:427:30:427:31 | S2 |  | main.rs:237:5:238:14 | S2 |
+| main.rs:427:38:427:39 | S1 |  | main.rs:235:5:236:14 | S1 |
+| main.rs:428:13:428:13 | x |  | main.rs:235:5:236:14 | S1 |
+| main.rs:428:17:428:26 | get_fst(...) |  | main.rs:235:5:236:14 | S1 |
+| main.rs:428:25:428:25 | b |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:428:25:428:25 | b | P1 | main.rs:237:5:238:14 | S2 |
+| main.rs:428:25:428:25 | b | P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:429:18:429:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:429:18:429:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:429:18:429:26 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:429:18:429:26 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:429:26:429:26 | x |  | main.rs:235:5:236:14 | S1 |
+| main.rs:430:13:430:13 | y |  | main.rs:237:5:238:14 | S2 |
+| main.rs:430:17:430:26 | get_snd(...) |  | main.rs:237:5:238:14 | S2 |
+| main.rs:430:25:430:25 | b |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:430:25:430:25 | b | P1 | main.rs:237:5:238:14 | S2 |
+| main.rs:430:25:430:25 | b | P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:431:18:431:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:431:18:431:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:431:18:431:26 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:431:18:431:26 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:431:26:431:26 | y |  | main.rs:237:5:238:14 | S2 |
+| main.rs:433:13:433:13 | c |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:433:13:433:13 | c | P1 | main.rs:239:5:240:14 | S3 |
+| main.rs:433:13:433:13 | c | P2 | main.rs:229:5:233:5 | MyPair |
+| main.rs:433:13:433:13 | c | P2.P1 | main.rs:237:5:238:14 | S2 |
+| main.rs:433:13:433:13 | c | P2.P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:433:17:436:9 | MyPair {...} |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:433:17:436:9 | MyPair {...} | P1 | main.rs:239:5:240:14 | S3 |
+| main.rs:433:17:436:9 | MyPair {...} | P2 | main.rs:229:5:233:5 | MyPair |
+| main.rs:433:17:436:9 | MyPair {...} | P2.P1 | main.rs:237:5:238:14 | S2 |
+| main.rs:433:17:436:9 | MyPair {...} | P2.P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:434:17:434:18 | S3 |  | main.rs:239:5:240:14 | S3 |
+| main.rs:435:17:435:41 | MyPair {...} |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:435:17:435:41 | MyPair {...} | P1 | main.rs:237:5:238:14 | S2 |
+| main.rs:435:17:435:41 | MyPair {...} | P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:435:30:435:31 | S2 |  | main.rs:237:5:238:14 | S2 |
+| main.rs:435:38:435:39 | S1 |  | main.rs:235:5:236:14 | S1 |
+| main.rs:437:13:437:13 | x |  | main.rs:235:5:236:14 | S1 |
+| main.rs:437:17:437:30 | get_snd_fst(...) |  | main.rs:235:5:236:14 | S1 |
+| main.rs:437:29:437:29 | c |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:437:29:437:29 | c | P1 | main.rs:239:5:240:14 | S3 |
+| main.rs:437:29:437:29 | c | P2 | main.rs:229:5:233:5 | MyPair |
+| main.rs:437:29:437:29 | c | P2.P1 | main.rs:237:5:238:14 | S2 |
+| main.rs:437:29:437:29 | c | P2.P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:439:13:439:17 | thing |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:439:13:439:17 | thing | A | main.rs:235:5:236:14 | S1 |
+| main.rs:439:21:439:37 | MyThing {...} |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:439:21:439:37 | MyThing {...} | A | main.rs:235:5:236:14 | S1 |
+| main.rs:439:34:439:35 | S1 |  | main.rs:235:5:236:14 | S1 |
+| main.rs:440:13:440:13 | i |  | main.rs:235:5:236:14 | S1 |
+| main.rs:440:17:440:21 | thing |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:440:17:440:21 | thing | A | main.rs:235:5:236:14 | S1 |
+| main.rs:440:17:440:34 | thing.convert_to() |  | main.rs:235:5:236:14 | S1 |
+| main.rs:441:13:441:13 | j |  | main.rs:235:5:236:14 | S1 |
+| main.rs:441:17:441:33 | convert_to(...) |  | main.rs:235:5:236:14 | S1 |
+| main.rs:441:28:441:32 | thing |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:441:28:441:32 | thing | A | main.rs:235:5:236:14 | S1 |
+| main.rs:450:26:450:29 | SelfParam |  | main.rs:449:5:453:5 | Self [trait OverlappingTrait] |
+| main.rs:452:28:452:31 | SelfParam |  | main.rs:449:5:453:5 | Self [trait OverlappingTrait] |
+| main.rs:452:34:452:35 | s1 |  | main.rs:446:5:447:14 | S1 |
+| main.rs:457:26:457:29 | SelfParam |  | main.rs:446:5:447:14 | S1 |
+| main.rs:457:38:459:9 | { ... } |  | main.rs:446:5:447:14 | S1 |
+| main.rs:458:13:458:14 | S1 |  | main.rs:446:5:447:14 | S1 |
+| main.rs:462:28:462:31 | SelfParam |  | main.rs:446:5:447:14 | S1 |
+| main.rs:462:34:462:35 | s1 |  | main.rs:446:5:447:14 | S1 |
+| main.rs:462:48:464:9 | { ... } |  | main.rs:446:5:447:14 | S1 |
+| main.rs:463:13:463:14 | S1 |  | main.rs:446:5:447:14 | S1 |
+| main.rs:469:26:469:29 | SelfParam |  | main.rs:446:5:447:14 | S1 |
+| main.rs:469:38:471:9 | { ... } |  | main.rs:446:5:447:14 | S1 |
+| main.rs:470:13:470:16 | self |  | main.rs:446:5:447:14 | S1 |
+| main.rs:474:28:474:31 | SelfParam |  | main.rs:446:5:447:14 | S1 |
+| main.rs:474:40:476:9 | { ... } |  | main.rs:446:5:447:14 | S1 |
+| main.rs:475:13:475:16 | self |  | main.rs:446:5:447:14 | S1 |
+| main.rs:483:26:483:29 | SelfParam |  | main.rs:479:5:479:22 | S2 |
+| main.rs:483:26:483:29 | SelfParam | T2 | {EXTERNAL LOCATION} | i32 |
+| main.rs:483:38:485:9 | { ... } |  | main.rs:446:5:447:14 | S1 |
+| main.rs:484:13:484:14 | S1 |  | main.rs:446:5:447:14 | S1 |
+| main.rs:488:28:488:31 | SelfParam |  | main.rs:479:5:479:22 | S2 |
+| main.rs:488:28:488:31 | SelfParam | T2 | {EXTERNAL LOCATION} | i32 |
+| main.rs:488:40:490:9 | { ... } |  | main.rs:446:5:447:14 | S1 |
+| main.rs:489:13:489:14 | S1 |  | main.rs:446:5:447:14 | S1 |
+| main.rs:495:26:495:29 | SelfParam |  | main.rs:479:5:479:22 | S2 |
+| main.rs:495:26:495:29 | SelfParam | T2 | {EXTERNAL LOCATION} | i32 |
+| main.rs:495:38:497:9 | { ... } |  | main.rs:446:5:447:14 | S1 |
+| main.rs:496:13:496:14 | S1 |  | main.rs:446:5:447:14 | S1 |
+| main.rs:500:28:500:31 | SelfParam |  | main.rs:479:5:479:22 | S2 |
+| main.rs:500:28:500:31 | SelfParam | T2 | {EXTERNAL LOCATION} | i32 |
+| main.rs:500:34:500:35 | s1 |  | main.rs:446:5:447:14 | S1 |
+| main.rs:500:48:502:9 | { ... } |  | main.rs:446:5:447:14 | S1 |
+| main.rs:501:13:501:14 | S1 |  | main.rs:446:5:447:14 | S1 |
+| main.rs:507:26:507:29 | SelfParam |  | main.rs:479:5:479:22 | S2 |
+| main.rs:507:26:507:29 | SelfParam | T2 | main.rs:446:5:447:14 | S1 |
+| main.rs:507:38:509:9 | { ... } |  | main.rs:446:5:447:14 | S1 |
+| main.rs:508:13:508:14 | S1 |  | main.rs:446:5:447:14 | S1 |
+| main.rs:512:28:512:31 | SelfParam |  | main.rs:479:5:479:22 | S2 |
+| main.rs:512:28:512:31 | SelfParam | T2 | main.rs:446:5:447:14 | S1 |
+| main.rs:512:34:512:35 | s1 |  | main.rs:446:5:447:14 | S1 |
+| main.rs:512:48:514:9 | { ... } |  | main.rs:446:5:447:14 | S1 |
+| main.rs:513:13:513:14 | S1 |  | main.rs:446:5:447:14 | S1 |
+| main.rs:521:14:521:18 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:521:14:521:18 | SelfParam | &T | main.rs:520:5:522:5 | Self [trait OverlappingTrait2] |
+| main.rs:521:21:521:21 | x |  | file://:0:0:0:0 | & |
+| main.rs:521:21:521:21 | x | &T | main.rs:520:29:520:29 | T |
+| main.rs:526:14:526:18 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:526:14:526:18 | SelfParam | &T | main.rs:517:5:518:22 | S3 |
+| main.rs:526:14:526:18 | SelfParam | &T.T3 | main.rs:524:10:524:10 | T |
+| main.rs:526:21:526:21 | x |  | file://:0:0:0:0 | & |
+| main.rs:526:21:526:21 | x | &T | main.rs:524:10:524:10 | T |
+| main.rs:526:37:528:9 | { ... } |  | file://:0:0:0:0 | & |
+| main.rs:526:37:528:9 | { ... } | &T | main.rs:517:5:518:22 | S3 |
+| main.rs:526:37:528:9 | { ... } | &T.T3 | main.rs:524:10:524:10 | T |
+| main.rs:527:13:527:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:527:13:527:16 | self | &T | main.rs:517:5:518:22 | S3 |
+| main.rs:527:13:527:16 | self | &T.T3 | main.rs:524:10:524:10 | T |
+| main.rs:533:14:533:18 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:533:14:533:18 | SelfParam | &T | main.rs:517:5:518:22 | S3 |
+| main.rs:533:14:533:18 | SelfParam | &T.T3 | main.rs:531:10:531:10 | T |
+| main.rs:533:21:533:21 | x |  | main.rs:531:10:531:10 | T |
+| main.rs:533:36:535:9 | { ... } |  | file://:0:0:0:0 | & |
+| main.rs:533:36:535:9 | { ... } | &T | main.rs:517:5:518:22 | S3 |
+| main.rs:533:36:535:9 | { ... } | &T.T3 | main.rs:531:10:531:10 | T |
+| main.rs:534:13:534:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:534:13:534:16 | self | &T | main.rs:517:5:518:22 | S3 |
+| main.rs:534:13:534:16 | self | &T.T3 | main.rs:531:10:531:10 | T |
+| main.rs:540:14:540:18 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:540:14:540:18 | SelfParam | &T | main.rs:538:5:541:5 | Self [trait MyTrait1] |
+| main.rs:540:21:540:22 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:550:14:550:18 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:550:14:550:18 | SelfParam | &T | main.rs:545:5:546:14 | S4 |
+| main.rs:550:21:550:22 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:560:14:560:18 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:560:14:560:18 | SelfParam | &T | main.rs:555:5:556:22 | S5 |
+| main.rs:560:14:560:18 | SelfParam | &T.T5 | {EXTERNAL LOCATION} | i32 |
+| main.rs:560:21:560:22 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:569:16:595:5 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:570:13:570:13 | x |  | main.rs:446:5:447:14 | S1 |
+| main.rs:570:17:570:18 | S1 |  | main.rs:446:5:447:14 | S1 |
+| main.rs:571:18:571:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:571:18:571:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:571:18:571:42 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:571:18:571:42 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:571:26:571:26 | x |  | main.rs:446:5:447:14 | S1 |
+| main.rs:571:26:571:42 | x.common_method() |  | main.rs:446:5:447:14 | S1 |
+| main.rs:572:18:572:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:572:18:572:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:572:18:572:45 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:572:18:572:45 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:572:26:572:45 | ...::common_method(...) |  | main.rs:446:5:447:14 | S1 |
+| main.rs:572:44:572:44 | x |  | main.rs:446:5:447:14 | S1 |
+| main.rs:573:18:573:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:573:18:573:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:573:18:573:44 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:573:18:573:44 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:573:26:573:26 | x |  | main.rs:446:5:447:14 | S1 |
+| main.rs:573:26:573:44 | x.common_method_2() |  | main.rs:446:5:447:14 | S1 |
+| main.rs:574:18:574:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:574:18:574:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:574:18:574:47 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:574:18:574:47 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:574:26:574:47 | ...::common_method_2(...) |  | main.rs:446:5:447:14 | S1 |
+| main.rs:574:46:574:46 | x |  | main.rs:446:5:447:14 | S1 |
+| main.rs:576:13:576:13 | y |  | main.rs:479:5:479:22 | S2 |
+| main.rs:576:13:576:13 | y | T2 | main.rs:446:5:447:14 | S1 |
+| main.rs:576:17:576:22 | S2(...) |  | main.rs:479:5:479:22 | S2 |
+| main.rs:576:17:576:22 | S2(...) | T2 | main.rs:446:5:447:14 | S1 |
+| main.rs:576:20:576:21 | S1 |  | main.rs:446:5:447:14 | S1 |
+| main.rs:577:18:577:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:577:18:577:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:577:18:577:42 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:577:18:577:42 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:577:26:577:26 | y |  | main.rs:479:5:479:22 | S2 |
+| main.rs:577:26:577:26 | y | T2 | main.rs:446:5:447:14 | S1 |
+| main.rs:577:26:577:42 | y.common_method() |  | main.rs:446:5:447:14 | S1 |
+| main.rs:578:18:578:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:578:18:578:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:578:18:578:56 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:578:18:578:56 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:578:26:578:56 | ...::common_method(...) |  | main.rs:446:5:447:14 | S1 |
+| main.rs:578:50:578:55 | S2(...) |  | main.rs:479:5:479:22 | S2 |
+| main.rs:578:50:578:55 | S2(...) | T2 | main.rs:446:5:447:14 | S1 |
+| main.rs:578:53:578:54 | S1 |  | main.rs:446:5:447:14 | S1 |
+| main.rs:580:13:580:13 | z |  | main.rs:479:5:479:22 | S2 |
+| main.rs:580:13:580:13 | z | T2 | {EXTERNAL LOCATION} | i32 |
+| main.rs:580:17:580:21 | S2(...) |  | main.rs:479:5:479:22 | S2 |
+| main.rs:580:17:580:21 | S2(...) | T2 | {EXTERNAL LOCATION} | i32 |
+| main.rs:580:20:580:20 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:581:18:581:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:581:18:581:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:581:18:581:42 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:581:18:581:42 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:581:26:581:26 | z |  | main.rs:479:5:479:22 | S2 |
+| main.rs:581:26:581:26 | z | T2 | {EXTERNAL LOCATION} | i32 |
+| main.rs:581:26:581:42 | z.common_method() |  | main.rs:446:5:447:14 | S1 |
+| main.rs:582:18:582:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:582:18:582:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:582:18:582:49 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:582:18:582:49 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:582:26:582:49 | ...::common_method(...) |  | main.rs:446:5:447:14 | S1 |
+| main.rs:582:44:582:48 | S2(...) |  | main.rs:479:5:479:22 | S2 |
+| main.rs:582:44:582:48 | S2(...) | T2 | {EXTERNAL LOCATION} | i32 |
+| main.rs:582:47:582:47 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:583:18:583:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:583:18:583:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:583:18:583:56 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:583:18:583:56 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:583:26:583:56 | ...::common_method(...) |  | main.rs:446:5:447:14 | S1 |
+| main.rs:583:51:583:55 | S2(...) |  | main.rs:479:5:479:22 | S2 |
+| main.rs:583:51:583:55 | S2(...) | T2 | {EXTERNAL LOCATION} | i32 |
+| main.rs:583:54:583:54 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:585:13:585:13 | w |  | main.rs:517:5:518:22 | S3 |
+| main.rs:585:13:585:13 | w | T3 | main.rs:446:5:447:14 | S1 |
+| main.rs:585:17:585:22 | S3(...) |  | main.rs:517:5:518:22 | S3 |
+| main.rs:585:17:585:22 | S3(...) | T3 | main.rs:446:5:447:14 | S1 |
+| main.rs:585:20:585:21 | S1 |  | main.rs:446:5:447:14 | S1 |
+| main.rs:586:18:586:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:586:18:586:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:586:18:586:31 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:586:18:586:31 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:586:26:586:26 | w |  | main.rs:517:5:518:22 | S3 |
+| main.rs:586:26:586:26 | w | T3 | main.rs:446:5:447:14 | S1 |
+| main.rs:586:26:586:31 | w.m(...) |  | file://:0:0:0:0 | & |
+| main.rs:586:26:586:31 | w.m(...) | &T | main.rs:517:5:518:22 | S3 |
+| main.rs:586:26:586:31 | w.m(...) | &T.T3 | main.rs:446:5:447:14 | S1 |
+| main.rs:586:30:586:30 | x |  | main.rs:446:5:447:14 | S1 |
+| main.rs:587:18:587:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:587:18:587:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:587:18:587:37 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:587:18:587:37 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:587:26:587:37 | ...::m(...) |  | file://:0:0:0:0 | & |
+| main.rs:587:26:587:37 | ...::m(...) | &T | main.rs:517:5:518:22 | S3 |
+| main.rs:587:26:587:37 | ...::m(...) | &T.T3 | main.rs:446:5:447:14 | S1 |
+| main.rs:587:32:587:33 | &w |  | file://:0:0:0:0 | & |
+| main.rs:587:32:587:33 | &w | &T | main.rs:517:5:518:22 | S3 |
+| main.rs:587:32:587:33 | &w | &T.T3 | main.rs:446:5:447:14 | S1 |
+| main.rs:587:33:587:33 | w |  | main.rs:517:5:518:22 | S3 |
+| main.rs:587:33:587:33 | w | T3 | main.rs:446:5:447:14 | S1 |
+| main.rs:587:36:587:36 | x |  | main.rs:446:5:447:14 | S1 |
+| main.rs:589:9:589:10 | S4 |  | main.rs:545:5:546:14 | S4 |
+| main.rs:589:9:589:14 | S4.m() |  | file://:0:0:0:0 | () |
+| main.rs:590:9:590:18 | ...::m(...) |  | file://:0:0:0:0 | () |
+| main.rs:590:15:590:17 | &S4 |  | file://:0:0:0:0 | & |
+| main.rs:590:15:590:17 | &S4 | &T | main.rs:545:5:546:14 | S4 |
+| main.rs:590:16:590:17 | S4 |  | main.rs:545:5:546:14 | S4 |
+| main.rs:591:9:591:16 | S5(...) |  | main.rs:555:5:556:22 | S5 |
+| main.rs:591:9:591:16 | S5(...) | T5 | {EXTERNAL LOCATION} | i32 |
+| main.rs:591:9:591:20 | ... .m() |  | file://:0:0:0:0 | () |
+| main.rs:591:12:591:15 | 0i32 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:592:9:592:24 | ...::m(...) |  | file://:0:0:0:0 | () |
+| main.rs:592:15:592:23 | &... |  | file://:0:0:0:0 | & |
+| main.rs:592:15:592:23 | &... | &T | main.rs:555:5:556:22 | S5 |
+| main.rs:592:15:592:23 | &... | &T.T5 | {EXTERNAL LOCATION} | i32 |
+| main.rs:592:16:592:23 | S5(...) |  | main.rs:555:5:556:22 | S5 |
+| main.rs:592:16:592:23 | S5(...) | T5 | {EXTERNAL LOCATION} | i32 |
+| main.rs:592:19:592:22 | 0i32 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:593:9:593:16 | S5(...) |  | main.rs:555:5:556:22 | S5 |
+| main.rs:593:9:593:16 | S5(...) | T5 | {EXTERNAL LOCATION} | bool |
+| main.rs:593:9:593:20 | ... .m() |  | file://:0:0:0:0 | () |
+| main.rs:593:12:593:15 | true |  | {EXTERNAL LOCATION} | bool |
+| main.rs:594:9:594:24 | ...::m(...) |  | file://:0:0:0:0 | () |
+| main.rs:594:15:594:23 | &... |  | file://:0:0:0:0 | & |
+| main.rs:594:15:594:23 | &... | &T | main.rs:555:5:556:22 | S5 |
+| main.rs:594:15:594:23 | &... | &T.T5 | {EXTERNAL LOCATION} | bool |
+| main.rs:594:16:594:23 | S5(...) |  | main.rs:555:5:556:22 | S5 |
+| main.rs:594:16:594:23 | S5(...) | T5 | {EXTERNAL LOCATION} | bool |
+| main.rs:594:19:594:22 | true |  | {EXTERNAL LOCATION} | bool |
+| main.rs:611:19:611:22 | SelfParam |  | main.rs:609:5:612:5 | Self [trait FirstTrait] |
+| main.rs:616:19:616:22 | SelfParam |  | main.rs:614:5:617:5 | Self [trait SecondTrait] |
+| main.rs:619:64:619:64 | x |  | main.rs:619:45:619:61 | T |
+| main.rs:619:70:623:5 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:621:13:621:14 | s1 |  | main.rs:619:35:619:42 | I |
+| main.rs:621:18:621:18 | x |  | main.rs:619:45:619:61 | T |
+| main.rs:621:18:621:27 | x.method() |  | main.rs:619:35:619:42 | I |
+| main.rs:622:18:622:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:622:18:622:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:622:18:622:27 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:622:18:622:27 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:622:26:622:27 | s1 |  | main.rs:619:35:619:42 | I |
+| main.rs:625:65:625:65 | x |  | main.rs:625:46:625:62 | T |
+| main.rs:625:71:629:5 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:627:13:627:14 | s2 |  | main.rs:625:36:625:43 | I |
+| main.rs:627:18:627:18 | x |  | main.rs:625:46:625:62 | T |
+| main.rs:627:18:627:27 | x.method() |  | main.rs:625:36:625:43 | I |
+| main.rs:628:18:628:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:628:18:628:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:628:18:628:27 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:628:18:628:27 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:628:26:628:27 | s2 |  | main.rs:625:36:625:43 | I |
+| main.rs:631:49:631:49 | x |  | main.rs:631:30:631:46 | T |
+| main.rs:631:55:634:5 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:632:13:632:13 | s |  | main.rs:601:5:602:14 | S1 |
+| main.rs:632:17:632:17 | x |  | main.rs:631:30:631:46 | T |
+| main.rs:632:17:632:26 | x.method() |  | main.rs:601:5:602:14 | S1 |
+| main.rs:633:18:633:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:633:18:633:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:633:18:633:26 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:633:18:633:26 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:633:26:633:26 | s |  | main.rs:601:5:602:14 | S1 |
+| main.rs:636:53:636:53 | x |  | main.rs:636:34:636:50 | T |
+| main.rs:636:59:639:5 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:637:13:637:13 | s |  | main.rs:601:5:602:14 | S1 |
+| main.rs:637:17:637:17 | x |  | main.rs:636:34:636:50 | T |
+| main.rs:637:17:637:26 | x.method() |  | main.rs:601:5:602:14 | S1 |
+| main.rs:638:18:638:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:638:18:638:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:638:18:638:26 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:638:18:638:26 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:638:26:638:26 | s |  | main.rs:601:5:602:14 | S1 |
+| main.rs:641:43:641:43 | x |  | main.rs:641:40:641:40 | T |
+| main.rs:644:5:647:5 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:645:13:645:13 | s |  | main.rs:601:5:602:14 | S1 |
+| main.rs:645:17:645:17 | x |  | main.rs:641:40:641:40 | T |
+| main.rs:645:17:645:26 | x.method() |  | main.rs:601:5:602:14 | S1 |
+| main.rs:646:18:646:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:646:18:646:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:646:18:646:26 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:646:18:646:26 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:646:26:646:26 | s |  | main.rs:601:5:602:14 | S1 |
+| main.rs:650:16:650:19 | SelfParam |  | main.rs:649:5:653:5 | Self [trait Pair] |
+| main.rs:652:16:652:19 | SelfParam |  | main.rs:649:5:653:5 | Self [trait Pair] |
+| main.rs:655:53:655:53 | x |  | main.rs:655:50:655:50 | T |
+| main.rs:655:59:655:59 | y |  | main.rs:655:50:655:50 | T |
+| main.rs:659:5:662:5 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:660:13:660:13 | _ |  | main.rs:601:5:602:14 | S1 |
+| main.rs:660:17:660:17 | x |  | main.rs:655:50:655:50 | T |
+| main.rs:660:17:660:23 | x.fst() |  | main.rs:601:5:602:14 | S1 |
+| main.rs:661:13:661:13 | _ |  | main.rs:601:5:602:14 | S1 |
+| main.rs:661:17:661:17 | y |  | main.rs:655:50:655:50 | T |
+| main.rs:661:17:661:26 | y.method() |  | main.rs:601:5:602:14 | S1 |
+| main.rs:664:58:664:58 | x |  | main.rs:664:41:664:55 | T |
+| main.rs:664:64:664:64 | y |  | main.rs:664:41:664:55 | T |
+| main.rs:664:70:669:5 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:666:13:666:14 | s1 |  | main.rs:601:5:602:14 | S1 |
+| main.rs:666:18:666:18 | x |  | main.rs:664:41:664:55 | T |
+| main.rs:666:18:666:24 | x.fst() |  | main.rs:601:5:602:14 | S1 |
+| main.rs:667:13:667:14 | s2 |  | main.rs:604:5:605:14 | S2 |
+| main.rs:667:18:667:18 | y |  | main.rs:664:41:664:55 | T |
+| main.rs:667:18:667:24 | y.snd() |  | main.rs:604:5:605:14 | S2 |
+| main.rs:668:18:668:29 | "{:?}, {:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:668:18:668:29 | "{:?}, {:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:668:18:668:37 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:668:18:668:37 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:668:32:668:33 | s1 |  | main.rs:601:5:602:14 | S1 |
+| main.rs:668:36:668:37 | s2 |  | main.rs:604:5:605:14 | S2 |
+| main.rs:671:69:671:69 | x |  | main.rs:671:52:671:66 | T |
+| main.rs:671:75:671:75 | y |  | main.rs:671:52:671:66 | T |
+| main.rs:671:81:676:5 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:673:13:673:14 | s1 |  | main.rs:601:5:602:14 | S1 |
+| main.rs:673:18:673:18 | x |  | main.rs:671:52:671:66 | T |
+| main.rs:673:18:673:24 | x.fst() |  | main.rs:601:5:602:14 | S1 |
+| main.rs:674:13:674:14 | s2 |  | main.rs:671:41:671:49 | T2 |
+| main.rs:674:18:674:18 | y |  | main.rs:671:52:671:66 | T |
+| main.rs:674:18:674:24 | y.snd() |  | main.rs:671:41:671:49 | T2 |
+| main.rs:675:18:675:29 | "{:?}, {:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:675:18:675:29 | "{:?}, {:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:675:18:675:37 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:675:18:675:37 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:675:32:675:33 | s1 |  | main.rs:601:5:602:14 | S1 |
+| main.rs:675:36:675:37 | s2 |  | main.rs:671:41:671:49 | T2 |
+| main.rs:678:50:678:50 | x |  | main.rs:678:41:678:47 | T |
+| main.rs:678:56:678:56 | y |  | main.rs:678:41:678:47 | T |
+| main.rs:678:62:683:5 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:680:13:680:14 | s1 |  | {EXTERNAL LOCATION} | bool |
+| main.rs:680:18:680:18 | x |  | main.rs:678:41:678:47 | T |
+| main.rs:680:18:680:24 | x.fst() |  | {EXTERNAL LOCATION} | bool |
+| main.rs:681:13:681:14 | s2 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:681:18:681:18 | y |  | main.rs:678:41:678:47 | T |
+| main.rs:681:18:681:24 | y.snd() |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:682:18:682:29 | "{:?}, {:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:682:18:682:29 | "{:?}, {:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:682:18:682:37 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:682:18:682:37 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:682:32:682:33 | s1 |  | {EXTERNAL LOCATION} | bool |
+| main.rs:682:36:682:37 | s2 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:685:54:685:54 | x |  | main.rs:685:41:685:51 | T |
+| main.rs:685:60:685:60 | y |  | main.rs:685:41:685:51 | T |
+| main.rs:685:66:690:5 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:687:13:687:14 | s1 |  | {EXTERNAL LOCATION} | u8 |
+| main.rs:687:18:687:18 | x |  | main.rs:685:41:685:51 | T |
+| main.rs:687:18:687:24 | x.fst() |  | {EXTERNAL LOCATION} | u8 |
+| main.rs:688:13:688:14 | s2 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:688:18:688:18 | y |  | main.rs:685:41:685:51 | T |
+| main.rs:688:18:688:24 | y.snd() |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:689:18:689:29 | "{:?}, {:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:689:18:689:29 | "{:?}, {:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:689:18:689:37 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:689:18:689:37 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:689:32:689:33 | s1 |  | {EXTERNAL LOCATION} | u8 |
+| main.rs:689:36:689:37 | s2 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:697:18:697:22 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:697:18:697:22 | SelfParam | &T | main.rs:694:5:698:5 | Self [trait TraitWithSelfTp] |
+| main.rs:700:40:700:44 | thing |  | file://:0:0:0:0 | & |
+| main.rs:700:40:700:44 | thing | &T | main.rs:700:17:700:37 | T |
+| main.rs:700:56:702:5 | { ... } |  | main.rs:700:14:700:14 | A |
+| main.rs:701:9:701:13 | thing |  | file://:0:0:0:0 | & |
+| main.rs:701:9:701:13 | thing | &T | main.rs:700:17:700:37 | T |
+| main.rs:701:9:701:21 | thing.get_a() |  | main.rs:700:14:700:14 | A |
+| main.rs:705:44:705:48 | thing |  | main.rs:705:24:705:41 | S |
+| main.rs:705:61:708:5 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:706:13:706:15 | _ms |  | {EXTERNAL LOCATION} | Option |
+| main.rs:706:13:706:15 | _ms | T | main.rs:705:24:705:41 | S |
+| main.rs:706:19:706:23 | thing |  | main.rs:705:24:705:41 | S |
+| main.rs:706:19:706:31 | thing.get_a() |  | {EXTERNAL LOCATION} | Option |
+| main.rs:706:19:706:31 | thing.get_a() | T | main.rs:705:24:705:41 | S |
+| main.rs:707:9:707:9 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:707:9:707:9 | 0 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:713:55:713:59 | thing |  | file://:0:0:0:0 | & |
+| main.rs:713:55:713:59 | thing | &T | main.rs:713:25:713:52 | S |
+| main.rs:713:66:716:5 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:715:13:715:15 | _ms |  | {EXTERNAL LOCATION} | Option |
+| main.rs:715:13:715:15 | _ms | T | main.rs:713:25:713:52 | S |
+| main.rs:715:19:715:30 | get_a(...) |  | {EXTERNAL LOCATION} | Option |
+| main.rs:715:19:715:30 | get_a(...) | T | main.rs:713:25:713:52 | S |
+| main.rs:715:25:715:29 | thing |  | file://:0:0:0:0 | & |
+| main.rs:715:25:715:29 | thing | &T | main.rs:713:25:713:52 | S |
+| main.rs:724:18:724:22 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:724:18:724:22 | SelfParam | &T | main.rs:718:5:720:5 | MyStruct |
+| main.rs:724:41:726:9 | { ... } |  | {EXTERNAL LOCATION} | Option |
+| main.rs:724:41:726:9 | { ... } | T | main.rs:718:5:720:5 | MyStruct |
+| main.rs:725:13:725:48 | Some(...) |  | {EXTERNAL LOCATION} | Option |
+| main.rs:725:13:725:48 | Some(...) | T | main.rs:718:5:720:5 | MyStruct |
+| main.rs:725:18:725:47 | MyStruct {...} |  | main.rs:718:5:720:5 | MyStruct |
+| main.rs:725:36:725:39 | self |  | file://:0:0:0:0 | & |
+| main.rs:725:36:725:39 | self | &T | main.rs:718:5:720:5 | MyStruct |
+| main.rs:725:36:725:45 | self.value |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:731:19:734:5 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:732:13:732:13 | s |  | main.rs:718:5:720:5 | MyStruct |
+| main.rs:732:17:732:37 | MyStruct {...} |  | main.rs:718:5:720:5 | MyStruct |
+| main.rs:732:35:732:35 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:733:13:733:15 | _ms |  | {EXTERNAL LOCATION} | Option |
+| main.rs:733:13:733:15 | _ms | T | main.rs:718:5:720:5 | MyStruct |
+| main.rs:733:19:733:27 | get_a(...) |  | {EXTERNAL LOCATION} | Option |
+| main.rs:733:19:733:27 | get_a(...) | T | main.rs:718:5:720:5 | MyStruct |
+| main.rs:733:25:733:26 | &s |  | file://:0:0:0:0 | & |
+| main.rs:733:25:733:26 | &s | &T | main.rs:718:5:720:5 | MyStruct |
+| main.rs:733:26:733:26 | s |  | main.rs:718:5:720:5 | MyStruct |
+| main.rs:749:15:749:18 | SelfParam |  | main.rs:748:5:759:5 | Self [trait MyTrait] |
+| main.rs:751:15:751:18 | SelfParam |  | main.rs:748:5:759:5 | Self [trait MyTrait] |
+| main.rs:754:9:756:9 | { ... } |  | main.rs:748:19:748:19 | A |
+| main.rs:755:13:755:16 | self |  | main.rs:748:5:759:5 | Self [trait MyTrait] |
+| main.rs:755:13:755:21 | self.m1() |  | main.rs:748:19:748:19 | A |
+| main.rs:758:18:758:18 | x |  | main.rs:748:5:759:5 | Self [trait MyTrait] |
+| main.rs:762:15:762:18 | SelfParam |  | main.rs:745:5:746:14 | S2 |
+| main.rs:762:26:764:9 | { ... } |  | main.rs:761:10:761:19 | T |
+| main.rs:763:13:763:30 | ...::default(...) |  | main.rs:761:10:761:19 | T |
+| main.rs:766:18:766:18 | x |  | main.rs:745:5:746:14 | S2 |
+| main.rs:766:32:768:9 | { ... } |  | main.rs:761:10:761:19 | T |
+| main.rs:767:13:767:30 | ...::default(...) |  | main.rs:761:10:761:19 | T |
+| main.rs:772:15:772:18 | SelfParam |  | main.rs:743:5:744:14 | S1 |
+| main.rs:772:28:774:9 | { ... } |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:773:13:773:13 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:776:18:776:18 | x |  | main.rs:743:5:744:14 | S1 |
+| main.rs:776:34:778:9 | { ... } |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:777:13:777:13 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:783:50:783:50 | x |  | main.rs:783:26:783:47 | T2 |
+| main.rs:783:63:786:5 | { ... } |  | main.rs:783:22:783:23 | T1 |
+| main.rs:784:9:784:9 | x |  | main.rs:783:26:783:47 | T2 |
+| main.rs:784:9:784:14 | x.m1() |  | main.rs:783:22:783:23 | T1 |
+| main.rs:785:9:785:9 | x |  | main.rs:783:26:783:47 | T2 |
+| main.rs:785:9:785:14 | x.m1() |  | main.rs:783:22:783:23 | T1 |
+| main.rs:787:52:787:52 | x |  | main.rs:787:28:787:49 | T2 |
+| main.rs:787:65:791:5 | { ... } |  | main.rs:787:24:787:25 | T1 |
+| main.rs:788:13:788:13 | y |  | main.rs:787:24:787:25 | T1 |
+| main.rs:788:17:788:25 | ...::m1(...) |  | main.rs:787:24:787:25 | T1 |
+| main.rs:788:24:788:24 | x |  | main.rs:787:28:787:49 | T2 |
+| main.rs:789:9:789:9 | y |  | main.rs:787:24:787:25 | T1 |
+| main.rs:790:9:790:17 | ...::m1(...) |  | main.rs:787:24:787:25 | T1 |
+| main.rs:790:16:790:16 | x |  | main.rs:787:28:787:49 | T2 |
+| main.rs:792:52:792:52 | x |  | main.rs:792:28:792:49 | T2 |
+| main.rs:792:65:796:5 | { ... } |  | main.rs:792:24:792:25 | T1 |
+| main.rs:793:13:793:13 | y |  | main.rs:792:24:792:25 | T1 |
+| main.rs:793:17:793:30 | ...::m1(...) |  | main.rs:792:24:792:25 | T1 |
+| main.rs:793:29:793:29 | x |  | main.rs:792:28:792:49 | T2 |
+| main.rs:794:9:794:9 | y |  | main.rs:792:24:792:25 | T1 |
+| main.rs:795:9:795:22 | ...::m1(...) |  | main.rs:792:24:792:25 | T1 |
+| main.rs:795:21:795:21 | x |  | main.rs:792:28:792:49 | T2 |
+| main.rs:797:55:797:55 | x |  | main.rs:797:31:797:52 | T2 |
+| main.rs:797:68:801:5 | { ... } |  | main.rs:797:27:797:28 | T1 |
+| main.rs:798:13:798:13 | y |  | main.rs:797:27:797:28 | T1 |
+| main.rs:798:17:798:28 | ...::assoc(...) |  | main.rs:797:27:797:28 | T1 |
+| main.rs:798:27:798:27 | x |  | main.rs:797:31:797:52 | T2 |
+| main.rs:799:9:799:9 | y |  | main.rs:797:27:797:28 | T1 |
+| main.rs:800:9:800:20 | ...::assoc(...) |  | main.rs:797:27:797:28 | T1 |
+| main.rs:800:19:800:19 | x |  | main.rs:797:31:797:52 | T2 |
+| main.rs:802:55:802:55 | x |  | main.rs:802:31:802:52 | T2 |
+| main.rs:802:68:806:5 | { ... } |  | main.rs:802:27:802:28 | T1 |
+| main.rs:803:13:803:13 | y |  | main.rs:802:27:802:28 | T1 |
+| main.rs:803:17:803:33 | ...::assoc(...) |  | main.rs:802:27:802:28 | T1 |
+| main.rs:803:32:803:32 | x |  | main.rs:802:31:802:52 | T2 |
+| main.rs:804:9:804:9 | y |  | main.rs:802:27:802:28 | T1 |
+| main.rs:805:9:805:25 | ...::assoc(...) |  | main.rs:802:27:802:28 | T1 |
+| main.rs:805:24:805:24 | x |  | main.rs:802:31:802:52 | T2 |
+| main.rs:810:49:810:49 | x |  | main.rs:738:5:741:5 | MyThing |
+| main.rs:810:49:810:49 | x | T | main.rs:810:32:810:46 | T2 |
+| main.rs:810:71:812:5 | { ... } |  | main.rs:810:28:810:29 | T1 |
+| main.rs:811:9:811:9 | x |  | main.rs:738:5:741:5 | MyThing |
+| main.rs:811:9:811:9 | x | T | main.rs:810:32:810:46 | T2 |
+| main.rs:811:9:811:11 | x.a |  | main.rs:810:32:810:46 | T2 |
+| main.rs:811:9:811:16 | ... .m1() |  | main.rs:810:28:810:29 | T1 |
+| main.rs:813:51:813:51 | x |  | main.rs:738:5:741:5 | MyThing |
+| main.rs:813:51:813:51 | x | T | main.rs:813:34:813:48 | T2 |
+| main.rs:813:73:815:5 | { ... } |  | main.rs:813:30:813:31 | T1 |
+| main.rs:814:9:814:19 | ...::m1(...) |  | main.rs:813:30:813:31 | T1 |
+| main.rs:814:16:814:16 | x |  | main.rs:738:5:741:5 | MyThing |
+| main.rs:814:16:814:16 | x | T | main.rs:813:34:813:48 | T2 |
+| main.rs:814:16:814:18 | x.a |  | main.rs:813:34:813:48 | T2 |
+| main.rs:816:51:816:51 | x |  | main.rs:738:5:741:5 | MyThing |
+| main.rs:816:51:816:51 | x | T | main.rs:816:34:816:48 | T2 |
+| main.rs:816:73:818:5 | { ... } |  | main.rs:816:30:816:31 | T1 |
+| main.rs:817:9:817:24 | ...::m1(...) |  | main.rs:816:30:816:31 | T1 |
+| main.rs:817:21:817:21 | x |  | main.rs:738:5:741:5 | MyThing |
+| main.rs:817:21:817:21 | x | T | main.rs:816:34:816:48 | T2 |
+| main.rs:817:21:817:23 | x.a |  | main.rs:816:34:816:48 | T2 |
+| main.rs:821:15:821:18 | SelfParam |  | main.rs:738:5:741:5 | MyThing |
+| main.rs:821:15:821:18 | SelfParam | T | main.rs:820:10:820:10 | T |
+| main.rs:821:26:823:9 | { ... } |  | main.rs:820:10:820:10 | T |
+| main.rs:822:13:822:16 | self |  | main.rs:738:5:741:5 | MyThing |
+| main.rs:822:13:822:16 | self | T | main.rs:820:10:820:10 | T |
+| main.rs:822:13:822:18 | self.a |  | main.rs:820:10:820:10 | T |
+| main.rs:825:18:825:18 | x |  | main.rs:738:5:741:5 | MyThing |
+| main.rs:825:18:825:18 | x | T | main.rs:820:10:820:10 | T |
+| main.rs:825:32:827:9 | { ... } |  | main.rs:820:10:820:10 | T |
+| main.rs:826:13:826:13 | x |  | main.rs:738:5:741:5 | MyThing |
+| main.rs:826:13:826:13 | x | T | main.rs:820:10:820:10 | T |
+| main.rs:826:13:826:15 | x.a |  | main.rs:820:10:820:10 | T |
+| main.rs:830:16:888:5 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:831:13:831:13 | x |  | main.rs:738:5:741:5 | MyThing |
+| main.rs:831:13:831:13 | x | T | main.rs:743:5:744:14 | S1 |
+| main.rs:831:17:831:33 | MyThing {...} |  | main.rs:738:5:741:5 | MyThing |
+| main.rs:831:17:831:33 | MyThing {...} | T | main.rs:743:5:744:14 | S1 |
+| main.rs:831:30:831:31 | S1 |  | main.rs:743:5:744:14 | S1 |
+| main.rs:832:13:832:13 | y |  | main.rs:738:5:741:5 | MyThing |
+| main.rs:832:13:832:13 | y | T | main.rs:745:5:746:14 | S2 |
+| main.rs:832:17:832:33 | MyThing {...} |  | main.rs:738:5:741:5 | MyThing |
+| main.rs:832:17:832:33 | MyThing {...} | T | main.rs:745:5:746:14 | S2 |
+| main.rs:832:30:832:31 | S2 |  | main.rs:745:5:746:14 | S2 |
+| main.rs:834:18:834:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:834:18:834:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:834:18:834:31 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:834:18:834:31 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:834:26:834:26 | x |  | main.rs:738:5:741:5 | MyThing |
+| main.rs:834:26:834:26 | x | T | main.rs:743:5:744:14 | S1 |
+| main.rs:834:26:834:31 | x.m1() |  | main.rs:743:5:744:14 | S1 |
+| main.rs:835:18:835:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:835:18:835:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:835:18:835:31 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:835:18:835:31 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:835:26:835:26 | y |  | main.rs:738:5:741:5 | MyThing |
+| main.rs:835:26:835:26 | y | T | main.rs:745:5:746:14 | S2 |
+| main.rs:835:26:835:31 | y.m1() |  | main.rs:745:5:746:14 | S2 |
+| main.rs:837:13:837:13 | x |  | main.rs:738:5:741:5 | MyThing |
+| main.rs:837:13:837:13 | x | T | main.rs:743:5:744:14 | S1 |
+| main.rs:837:17:837:33 | MyThing {...} |  | main.rs:738:5:741:5 | MyThing |
+| main.rs:837:17:837:33 | MyThing {...} | T | main.rs:743:5:744:14 | S1 |
+| main.rs:837:30:837:31 | S1 |  | main.rs:743:5:744:14 | S1 |
+| main.rs:838:13:838:13 | y |  | main.rs:738:5:741:5 | MyThing |
+| main.rs:838:13:838:13 | y | T | main.rs:745:5:746:14 | S2 |
+| main.rs:838:17:838:33 | MyThing {...} |  | main.rs:738:5:741:5 | MyThing |
+| main.rs:838:17:838:33 | MyThing {...} | T | main.rs:745:5:746:14 | S2 |
+| main.rs:838:30:838:31 | S2 |  | main.rs:745:5:746:14 | S2 |
+| main.rs:840:18:840:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:840:18:840:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:840:18:840:31 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:840:18:840:31 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:840:26:840:26 | x |  | main.rs:738:5:741:5 | MyThing |
+| main.rs:840:26:840:26 | x | T | main.rs:743:5:744:14 | S1 |
+| main.rs:840:26:840:31 | x.m2() |  | main.rs:743:5:744:14 | S1 |
+| main.rs:841:18:841:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:841:18:841:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:841:18:841:31 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:841:18:841:31 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:841:26:841:26 | y |  | main.rs:738:5:741:5 | MyThing |
+| main.rs:841:26:841:26 | y | T | main.rs:745:5:746:14 | S2 |
+| main.rs:841:26:841:31 | y.m2() |  | main.rs:745:5:746:14 | S2 |
+| main.rs:843:13:843:14 | x2 |  | main.rs:738:5:741:5 | MyThing |
+| main.rs:843:13:843:14 | x2 | T | main.rs:743:5:744:14 | S1 |
+| main.rs:843:18:843:34 | MyThing {...} |  | main.rs:738:5:741:5 | MyThing |
+| main.rs:843:18:843:34 | MyThing {...} | T | main.rs:743:5:744:14 | S1 |
+| main.rs:843:31:843:32 | S1 |  | main.rs:743:5:744:14 | S1 |
+| main.rs:844:13:844:14 | y2 |  | main.rs:738:5:741:5 | MyThing |
+| main.rs:844:13:844:14 | y2 | T | main.rs:745:5:746:14 | S2 |
+| main.rs:844:18:844:34 | MyThing {...} |  | main.rs:738:5:741:5 | MyThing |
+| main.rs:844:18:844:34 | MyThing {...} | T | main.rs:745:5:746:14 | S2 |
+| main.rs:844:31:844:32 | S2 |  | main.rs:745:5:746:14 | S2 |
+| main.rs:846:13:846:13 | a |  | main.rs:743:5:744:14 | S1 |
+| main.rs:846:17:846:33 | call_trait_m1(...) |  | main.rs:743:5:744:14 | S1 |
+| main.rs:846:31:846:32 | x2 |  | main.rs:738:5:741:5 | MyThing |
+| main.rs:846:31:846:32 | x2 | T | main.rs:743:5:744:14 | S1 |
+| main.rs:847:18:847:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:847:18:847:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:847:18:847:26 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:847:18:847:26 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:847:26:847:26 | a |  | main.rs:743:5:744:14 | S1 |
+| main.rs:848:13:848:13 | a |  | main.rs:743:5:744:14 | S1 |
+| main.rs:848:17:848:35 | call_trait_m1_2(...) |  | main.rs:743:5:744:14 | S1 |
+| main.rs:848:33:848:34 | x2 |  | main.rs:738:5:741:5 | MyThing |
+| main.rs:848:33:848:34 | x2 | T | main.rs:743:5:744:14 | S1 |
+| main.rs:849:18:849:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:849:18:849:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:849:18:849:26 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:849:18:849:26 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:849:26:849:26 | a |  | main.rs:743:5:744:14 | S1 |
+| main.rs:850:13:850:13 | a |  | main.rs:743:5:744:14 | S1 |
+| main.rs:850:17:850:35 | call_trait_m1_3(...) |  | main.rs:743:5:744:14 | S1 |
+| main.rs:850:33:850:34 | x2 |  | main.rs:738:5:741:5 | MyThing |
+| main.rs:850:33:850:34 | x2 | T | main.rs:743:5:744:14 | S1 |
+| main.rs:851:18:851:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:851:18:851:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:851:18:851:26 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:851:18:851:26 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:851:26:851:26 | a |  | main.rs:743:5:744:14 | S1 |
+| main.rs:852:13:852:13 | a |  | main.rs:745:5:746:14 | S2 |
+| main.rs:852:17:852:33 | call_trait_m1(...) |  | main.rs:745:5:746:14 | S2 |
+| main.rs:852:31:852:32 | y2 |  | main.rs:738:5:741:5 | MyThing |
+| main.rs:852:31:852:32 | y2 | T | main.rs:745:5:746:14 | S2 |
+| main.rs:853:18:853:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:853:18:853:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:853:18:853:26 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:853:18:853:26 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:853:26:853:26 | a |  | main.rs:745:5:746:14 | S2 |
+| main.rs:854:13:854:13 | a |  | main.rs:745:5:746:14 | S2 |
+| main.rs:854:17:854:35 | call_trait_m1_2(...) |  | main.rs:745:5:746:14 | S2 |
+| main.rs:854:33:854:34 | y2 |  | main.rs:738:5:741:5 | MyThing |
+| main.rs:854:33:854:34 | y2 | T | main.rs:745:5:746:14 | S2 |
+| main.rs:855:18:855:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:855:18:855:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:855:18:855:26 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:855:18:855:26 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:855:26:855:26 | a |  | main.rs:745:5:746:14 | S2 |
+| main.rs:856:13:856:13 | a |  | main.rs:745:5:746:14 | S2 |
+| main.rs:856:17:856:35 | call_trait_m1_3(...) |  | main.rs:745:5:746:14 | S2 |
+| main.rs:856:33:856:34 | y2 |  | main.rs:738:5:741:5 | MyThing |
+| main.rs:856:33:856:34 | y2 | T | main.rs:745:5:746:14 | S2 |
+| main.rs:857:18:857:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:857:18:857:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:857:18:857:26 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:857:18:857:26 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:857:26:857:26 | a |  | main.rs:745:5:746:14 | S2 |
+| main.rs:858:13:858:13 | a |  | main.rs:743:5:744:14 | S1 |
+| main.rs:858:17:858:38 | call_trait_assoc_1(...) |  | main.rs:743:5:744:14 | S1 |
+| main.rs:858:36:858:37 | x2 |  | main.rs:738:5:741:5 | MyThing |
+| main.rs:858:36:858:37 | x2 | T | main.rs:743:5:744:14 | S1 |
+| main.rs:859:18:859:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:859:18:859:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:859:18:859:26 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:859:18:859:26 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:859:26:859:26 | a |  | main.rs:743:5:744:14 | S1 |
+| main.rs:860:13:860:13 | a |  | main.rs:743:5:744:14 | S1 |
+| main.rs:860:17:860:38 | call_trait_assoc_2(...) |  | main.rs:743:5:744:14 | S1 |
+| main.rs:860:36:860:37 | x2 |  | main.rs:738:5:741:5 | MyThing |
+| main.rs:860:36:860:37 | x2 | T | main.rs:743:5:744:14 | S1 |
+| main.rs:861:18:861:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:861:18:861:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:861:18:861:26 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:861:18:861:26 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:861:26:861:26 | a |  | main.rs:743:5:744:14 | S1 |
+| main.rs:862:13:862:13 | a |  | main.rs:745:5:746:14 | S2 |
+| main.rs:862:17:862:38 | call_trait_assoc_1(...) |  | main.rs:745:5:746:14 | S2 |
+| main.rs:862:36:862:37 | y2 |  | main.rs:738:5:741:5 | MyThing |
+| main.rs:862:36:862:37 | y2 | T | main.rs:745:5:746:14 | S2 |
+| main.rs:863:18:863:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:863:18:863:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:863:18:863:26 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:863:18:863:26 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:863:26:863:26 | a |  | main.rs:745:5:746:14 | S2 |
+| main.rs:864:13:864:13 | a |  | main.rs:745:5:746:14 | S2 |
+| main.rs:864:17:864:38 | call_trait_assoc_2(...) |  | main.rs:745:5:746:14 | S2 |
+| main.rs:864:36:864:37 | y2 |  | main.rs:738:5:741:5 | MyThing |
+| main.rs:864:36:864:37 | y2 | T | main.rs:745:5:746:14 | S2 |
+| main.rs:865:18:865:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:865:18:865:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:865:18:865:26 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:865:18:865:26 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:865:26:865:26 | a |  | main.rs:745:5:746:14 | S2 |
+| main.rs:867:13:867:14 | x3 |  | main.rs:738:5:741:5 | MyThing |
+| main.rs:867:13:867:14 | x3 | T | main.rs:738:5:741:5 | MyThing |
+| main.rs:867:13:867:14 | x3 | T.T | main.rs:743:5:744:14 | S1 |
+| main.rs:867:18:869:9 | MyThing {...} |  | main.rs:738:5:741:5 | MyThing |
+| main.rs:867:18:869:9 | MyThing {...} | T | main.rs:738:5:741:5 | MyThing |
+| main.rs:867:18:869:9 | MyThing {...} | T.T | main.rs:743:5:744:14 | S1 |
+| main.rs:868:16:868:32 | MyThing {...} |  | main.rs:738:5:741:5 | MyThing |
+| main.rs:868:16:868:32 | MyThing {...} | T | main.rs:743:5:744:14 | S1 |
+| main.rs:868:29:868:30 | S1 |  | main.rs:743:5:744:14 | S1 |
+| main.rs:870:13:870:14 | y3 |  | main.rs:738:5:741:5 | MyThing |
+| main.rs:870:13:870:14 | y3 | T | main.rs:738:5:741:5 | MyThing |
+| main.rs:870:13:870:14 | y3 | T.T | main.rs:745:5:746:14 | S2 |
+| main.rs:870:18:872:9 | MyThing {...} |  | main.rs:738:5:741:5 | MyThing |
+| main.rs:870:18:872:9 | MyThing {...} | T | main.rs:738:5:741:5 | MyThing |
+| main.rs:870:18:872:9 | MyThing {...} | T.T | main.rs:745:5:746:14 | S2 |
+| main.rs:871:16:871:32 | MyThing {...} |  | main.rs:738:5:741:5 | MyThing |
+| main.rs:871:16:871:32 | MyThing {...} | T | main.rs:745:5:746:14 | S2 |
+| main.rs:871:29:871:30 | S2 |  | main.rs:745:5:746:14 | S2 |
+| main.rs:874:13:874:13 | a |  | main.rs:743:5:744:14 | S1 |
+| main.rs:874:17:874:39 | call_trait_thing_m1(...) |  | main.rs:743:5:744:14 | S1 |
+| main.rs:874:37:874:38 | x3 |  | main.rs:738:5:741:5 | MyThing |
+| main.rs:874:37:874:38 | x3 | T | main.rs:738:5:741:5 | MyThing |
+| main.rs:874:37:874:38 | x3 | T.T | main.rs:743:5:744:14 | S1 |
+| main.rs:875:18:875:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:875:18:875:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:875:18:875:26 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:875:18:875:26 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:875:26:875:26 | a |  | main.rs:743:5:744:14 | S1 |
+| main.rs:876:13:876:13 | a |  | main.rs:743:5:744:14 | S1 |
+| main.rs:876:17:876:41 | call_trait_thing_m1_2(...) |  | main.rs:743:5:744:14 | S1 |
+| main.rs:876:39:876:40 | x3 |  | main.rs:738:5:741:5 | MyThing |
+| main.rs:876:39:876:40 | x3 | T | main.rs:738:5:741:5 | MyThing |
+| main.rs:876:39:876:40 | x3 | T.T | main.rs:743:5:744:14 | S1 |
+| main.rs:877:18:877:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:877:18:877:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:877:18:877:26 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:877:18:877:26 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:877:26:877:26 | a |  | main.rs:743:5:744:14 | S1 |
+| main.rs:878:13:878:13 | a |  | main.rs:743:5:744:14 | S1 |
+| main.rs:878:17:878:41 | call_trait_thing_m1_3(...) |  | main.rs:743:5:744:14 | S1 |
+| main.rs:878:39:878:40 | x3 |  | main.rs:738:5:741:5 | MyThing |
+| main.rs:878:39:878:40 | x3 | T | main.rs:738:5:741:5 | MyThing |
+| main.rs:878:39:878:40 | x3 | T.T | main.rs:743:5:744:14 | S1 |
+| main.rs:879:18:879:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:879:18:879:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:879:18:879:26 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:879:18:879:26 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:879:26:879:26 | a |  | main.rs:743:5:744:14 | S1 |
+| main.rs:880:13:880:13 | b |  | main.rs:745:5:746:14 | S2 |
+| main.rs:880:17:880:39 | call_trait_thing_m1(...) |  | main.rs:745:5:746:14 | S2 |
+| main.rs:880:37:880:38 | y3 |  | main.rs:738:5:741:5 | MyThing |
+| main.rs:880:37:880:38 | y3 | T | main.rs:738:5:741:5 | MyThing |
+| main.rs:880:37:880:38 | y3 | T.T | main.rs:745:5:746:14 | S2 |
+| main.rs:881:18:881:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:881:18:881:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:881:18:881:26 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:881:18:881:26 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:881:26:881:26 | b |  | main.rs:745:5:746:14 | S2 |
+| main.rs:882:13:882:13 | b |  | main.rs:745:5:746:14 | S2 |
+| main.rs:882:17:882:41 | call_trait_thing_m1_2(...) |  | main.rs:745:5:746:14 | S2 |
+| main.rs:882:39:882:40 | y3 |  | main.rs:738:5:741:5 | MyThing |
+| main.rs:882:39:882:40 | y3 | T | main.rs:738:5:741:5 | MyThing |
+| main.rs:882:39:882:40 | y3 | T.T | main.rs:745:5:746:14 | S2 |
+| main.rs:883:18:883:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:883:18:883:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:883:18:883:26 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:883:18:883:26 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:883:26:883:26 | b |  | main.rs:745:5:746:14 | S2 |
+| main.rs:884:13:884:13 | b |  | main.rs:745:5:746:14 | S2 |
+| main.rs:884:17:884:41 | call_trait_thing_m1_3(...) |  | main.rs:745:5:746:14 | S2 |
+| main.rs:884:39:884:40 | y3 |  | main.rs:738:5:741:5 | MyThing |
+| main.rs:884:39:884:40 | y3 | T | main.rs:738:5:741:5 | MyThing |
+| main.rs:884:39:884:40 | y3 | T.T | main.rs:745:5:746:14 | S2 |
+| main.rs:885:18:885:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:885:18:885:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:885:18:885:26 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:885:18:885:26 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:885:26:885:26 | b |  | main.rs:745:5:746:14 | S2 |
+| main.rs:886:13:886:13 | x |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:886:17:886:26 | ...::m2(...) |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:886:24:886:25 | S1 |  | main.rs:743:5:744:14 | S1 |
+| main.rs:887:13:887:13 | y |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:887:22:887:31 | ...::m2(...) |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:887:29:887:30 | S2 |  | main.rs:745:5:746:14 | S2 |
+| main.rs:898:19:898:22 | SelfParam |  | main.rs:892:5:895:5 | Wrapper |
+| main.rs:898:19:898:22 | SelfParam | A | main.rs:897:10:897:10 | A |
+| main.rs:898:30:900:9 | { ... } |  | main.rs:897:10:897:10 | A |
+| main.rs:899:13:899:16 | self |  | main.rs:892:5:895:5 | Wrapper |
+| main.rs:899:13:899:16 | self | A | main.rs:897:10:897:10 | A |
+| main.rs:899:13:899:22 | self.field |  | main.rs:897:10:897:10 | A |
+| main.rs:907:15:907:18 | SelfParam |  | main.rs:903:5:917:5 | Self [trait MyTrait] |
+| main.rs:909:15:909:18 | SelfParam |  | main.rs:903:5:917:5 | Self [trait MyTrait] |
+| main.rs:913:9:916:9 | { ... } |  | main.rs:904:9:904:28 | AssociatedType |
+| main.rs:914:13:914:16 | self |  | main.rs:903:5:917:5 | Self [trait MyTrait] |
+| main.rs:914:13:914:21 | self.m1() |  | main.rs:904:9:904:28 | AssociatedType |
+| main.rs:915:13:915:43 | ...::default(...) |  | main.rs:904:9:904:28 | AssociatedType |
+| main.rs:923:19:923:23 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:923:19:923:23 | SelfParam | &T | main.rs:919:5:929:5 | Self [trait MyTraitAssoc2] |
+| main.rs:923:26:923:26 | a |  | main.rs:923:16:923:16 | A |
+| main.rs:925:22:925:26 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:925:22:925:26 | SelfParam | &T | main.rs:919:5:929:5 | Self [trait MyTraitAssoc2] |
+| main.rs:925:29:925:29 | a |  | main.rs:925:19:925:19 | A |
+| main.rs:925:35:925:35 | b |  | main.rs:925:19:925:19 | A |
+| main.rs:925:75:928:9 | { ... } |  | main.rs:920:9:920:52 | GenericAssociatedType |
+| main.rs:926:13:926:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:926:13:926:16 | self | &T | main.rs:919:5:929:5 | Self [trait MyTraitAssoc2] |
+| main.rs:926:13:926:23 | self.put(...) |  | main.rs:920:9:920:52 | GenericAssociatedType |
+| main.rs:926:22:926:22 | a |  | main.rs:925:19:925:19 | A |
+| main.rs:927:13:927:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:927:13:927:16 | self | &T | main.rs:919:5:929:5 | Self [trait MyTraitAssoc2] |
+| main.rs:927:13:927:23 | self.put(...) |  | main.rs:920:9:920:52 | GenericAssociatedType |
+| main.rs:927:22:927:22 | b |  | main.rs:925:19:925:19 | A |
+| main.rs:936:21:936:25 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:936:21:936:25 | SelfParam | &T | main.rs:931:5:941:5 | Self [trait TraitMultipleAssoc] |
+| main.rs:938:20:938:24 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:938:20:938:24 | SelfParam | &T | main.rs:931:5:941:5 | Self [trait TraitMultipleAssoc] |
+| main.rs:940:20:940:24 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:940:20:940:24 | SelfParam | &T | main.rs:931:5:941:5 | Self [trait TraitMultipleAssoc] |
+| main.rs:956:15:956:18 | SelfParam |  | main.rs:943:5:944:13 | S |
+| main.rs:956:45:958:9 | { ... } |  | main.rs:949:5:950:14 | AT |
+| main.rs:957:13:957:14 | AT |  | main.rs:949:5:950:14 | AT |
+| main.rs:966:19:966:23 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:966:19:966:23 | SelfParam | &T | main.rs:943:5:944:13 | S |
+| main.rs:966:26:966:26 | a |  | main.rs:966:16:966:16 | A |
+| main.rs:966:46:968:9 | { ... } |  | main.rs:892:5:895:5 | Wrapper |
+| main.rs:966:46:968:9 | { ... } | A | main.rs:966:16:966:16 | A |
+| main.rs:967:13:967:32 | Wrapper {...} |  | main.rs:892:5:895:5 | Wrapper |
+| main.rs:967:13:967:32 | Wrapper {...} | A | main.rs:966:16:966:16 | A |
+| main.rs:967:30:967:30 | a |  | main.rs:966:16:966:16 | A |
+| main.rs:975:15:975:18 | SelfParam |  | main.rs:946:5:947:14 | S2 |
+| main.rs:975:45:977:9 | { ... } |  | main.rs:892:5:895:5 | Wrapper |
+| main.rs:975:45:977:9 | { ... } | A | main.rs:946:5:947:14 | S2 |
+| main.rs:976:13:976:35 | Wrapper {...} |  | main.rs:892:5:895:5 | Wrapper |
+| main.rs:976:13:976:35 | Wrapper {...} | A | main.rs:946:5:947:14 | S2 |
+| main.rs:976:30:976:33 | self |  | main.rs:946:5:947:14 | S2 |
+| main.rs:982:30:984:9 | { ... } |  | main.rs:892:5:895:5 | Wrapper |
+| main.rs:982:30:984:9 | { ... } | A | main.rs:946:5:947:14 | S2 |
+| main.rs:983:13:983:33 | Wrapper {...} |  | main.rs:892:5:895:5 | Wrapper |
+| main.rs:983:13:983:33 | Wrapper {...} | A | main.rs:946:5:947:14 | S2 |
+| main.rs:983:30:983:31 | S2 |  | main.rs:946:5:947:14 | S2 |
+| main.rs:989:22:989:26 | thing |  | main.rs:989:10:989:19 | T |
+| main.rs:990:9:990:13 | thing |  | main.rs:989:10:989:19 | T |
+| main.rs:997:21:997:25 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:997:21:997:25 | SelfParam | &T | main.rs:949:5:950:14 | AT |
+| main.rs:997:34:999:9 | { ... } |  | main.rs:949:5:950:14 | AT |
+| main.rs:998:13:998:14 | AT |  | main.rs:949:5:950:14 | AT |
+| main.rs:1001:20:1001:24 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1001:20:1001:24 | SelfParam | &T | main.rs:949:5:950:14 | AT |
+| main.rs:1001:43:1003:9 | { ... } |  | main.rs:943:5:944:13 | S |
+| main.rs:1002:13:1002:13 | S |  | main.rs:943:5:944:13 | S |
+| main.rs:1005:20:1005:24 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1005:20:1005:24 | SelfParam | &T | main.rs:949:5:950:14 | AT |
+| main.rs:1005:43:1007:9 | { ... } |  | main.rs:946:5:947:14 | S2 |
+| main.rs:1006:13:1006:14 | S2 |  | main.rs:946:5:947:14 | S2 |
+| main.rs:1010:16:1038:5 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1011:13:1011:14 | x1 |  | main.rs:943:5:944:13 | S |
+| main.rs:1011:18:1011:18 | S |  | main.rs:943:5:944:13 | S |
+| main.rs:1013:18:1013:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1013:18:1013:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1013:18:1013:32 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:1013:18:1013:32 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1013:26:1013:27 | x1 |  | main.rs:943:5:944:13 | S |
+| main.rs:1013:26:1013:32 | x1.m1() |  | main.rs:949:5:950:14 | AT |
+| main.rs:1015:13:1015:14 | x2 |  | main.rs:943:5:944:13 | S |
+| main.rs:1015:18:1015:18 | S |  | main.rs:943:5:944:13 | S |
+| main.rs:1017:13:1017:13 | y |  | main.rs:949:5:950:14 | AT |
+| main.rs:1017:17:1017:18 | x2 |  | main.rs:943:5:944:13 | S |
+| main.rs:1017:17:1017:23 | x2.m2() |  | main.rs:949:5:950:14 | AT |
+| main.rs:1018:18:1018:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1018:18:1018:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1018:18:1018:26 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:1018:18:1018:26 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1018:26:1018:26 | y |  | main.rs:949:5:950:14 | AT |
+| main.rs:1020:13:1020:14 | x3 |  | main.rs:943:5:944:13 | S |
+| main.rs:1020:18:1020:18 | S |  | main.rs:943:5:944:13 | S |
+| main.rs:1022:18:1022:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1022:18:1022:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1022:18:1022:43 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:1022:18:1022:43 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1022:26:1022:27 | x3 |  | main.rs:943:5:944:13 | S |
+| main.rs:1022:26:1022:34 | x3.put(...) |  | main.rs:892:5:895:5 | Wrapper |
+| main.rs:1022:26:1022:34 | x3.put(...) | A | {EXTERNAL LOCATION} | i32 |
+| main.rs:1022:26:1022:43 | ... .unwrap() |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1022:33:1022:33 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1025:18:1025:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1025:18:1025:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1025:18:1025:49 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:1025:18:1025:49 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1025:26:1025:27 | x3 |  | main.rs:943:5:944:13 | S |
+| main.rs:1025:26:1025:40 | x3.putTwo(...) |  | main.rs:892:5:895:5 | Wrapper |
+| main.rs:1025:26:1025:40 | x3.putTwo(...) | A | main.rs:963:36:963:50 | AssociatedParam |
+| main.rs:1025:26:1025:49 | ... .unwrap() |  | main.rs:963:36:963:50 | AssociatedParam |
+| main.rs:1025:36:1025:36 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1025:39:1025:39 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1027:20:1027:20 | S |  | main.rs:943:5:944:13 | S |
+| main.rs:1028:18:1028:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1028:18:1028:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1028:18:1028:27 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:1028:18:1028:27 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1030:13:1030:14 | x5 |  | main.rs:946:5:947:14 | S2 |
+| main.rs:1030:18:1030:19 | S2 |  | main.rs:946:5:947:14 | S2 |
+| main.rs:1031:18:1031:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1031:18:1031:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1031:18:1031:32 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:1031:18:1031:32 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1031:26:1031:27 | x5 |  | main.rs:946:5:947:14 | S2 |
+| main.rs:1031:26:1031:32 | x5.m1() |  | main.rs:892:5:895:5 | Wrapper |
+| main.rs:1031:26:1031:32 | x5.m1() | A | main.rs:946:5:947:14 | S2 |
+| main.rs:1032:13:1032:14 | x6 |  | main.rs:946:5:947:14 | S2 |
+| main.rs:1032:18:1032:19 | S2 |  | main.rs:946:5:947:14 | S2 |
+| main.rs:1033:18:1033:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1033:18:1033:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1033:18:1033:32 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:1033:18:1033:32 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1033:26:1033:27 | x6 |  | main.rs:946:5:947:14 | S2 |
+| main.rs:1033:26:1033:32 | x6.m2() |  | main.rs:892:5:895:5 | Wrapper |
+| main.rs:1033:26:1033:32 | x6.m2() | A | main.rs:946:5:947:14 | S2 |
+| main.rs:1035:13:1035:22 | assoc_zero |  | main.rs:949:5:950:14 | AT |
+| main.rs:1035:26:1035:27 | AT |  | main.rs:949:5:950:14 | AT |
+| main.rs:1035:26:1035:38 | AT.get_zero() |  | main.rs:949:5:950:14 | AT |
+| main.rs:1036:13:1036:21 | assoc_one |  | main.rs:943:5:944:13 | S |
+| main.rs:1036:25:1036:26 | AT |  | main.rs:949:5:950:14 | AT |
+| main.rs:1036:25:1036:36 | AT.get_one() |  | main.rs:943:5:944:13 | S |
+| main.rs:1037:13:1037:21 | assoc_two |  | main.rs:946:5:947:14 | S2 |
+| main.rs:1037:25:1037:26 | AT |  | main.rs:949:5:950:14 | AT |
+| main.rs:1037:25:1037:36 | AT.get_two() |  | main.rs:946:5:947:14 | S2 |
+| main.rs:1045:19:1045:23 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1045:19:1045:23 | SelfParam | &T | main.rs:1042:5:1046:5 | Self [trait Supertrait] |
+| main.rs:1045:26:1045:32 | content |  | main.rs:1043:9:1043:21 | Content |
+| main.rs:1050:24:1050:28 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1050:24:1050:28 | SelfParam | &T | main.rs:1048:5:1051:5 | Self [trait Subtrait] |
+| main.rs:1059:23:1059:27 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1059:23:1059:27 | SelfParam | &T | main.rs:1053:5:1063:5 | Self [trait Subtrait2] |
+| main.rs:1059:30:1059:31 | c1 |  | main.rs:1043:9:1043:21 | Content |
+| main.rs:1059:49:1059:50 | c2 |  | main.rs:1043:9:1043:21 | Content |
+| main.rs:1059:68:1062:9 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1060:13:1060:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1060:13:1060:16 | self | &T | main.rs:1053:5:1063:5 | Self [trait Subtrait2] |
+| main.rs:1060:13:1060:27 | self.insert(...) |  | file://:0:0:0:0 | () |
+| main.rs:1060:25:1060:26 | c1 |  | main.rs:1043:9:1043:21 | Content |
+| main.rs:1061:13:1061:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1061:13:1061:16 | self | &T | main.rs:1053:5:1063:5 | Self [trait Subtrait2] |
+| main.rs:1061:13:1061:27 | self.insert(...) |  | file://:0:0:0:0 | () |
+| main.rs:1061:25:1061:26 | c2 |  | main.rs:1043:9:1043:21 | Content |
+| main.rs:1069:19:1069:23 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1069:19:1069:23 | SelfParam | &T | main.rs:1065:5:1065:24 | MyType |
+| main.rs:1069:19:1069:23 | SelfParam | &T.T | main.rs:1067:10:1067:10 | T |
+| main.rs:1069:26:1069:33 | _content |  | main.rs:1067:10:1067:10 | T |
+| main.rs:1069:51:1071:9 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1070:22:1070:42 | "Inserting content: \\n" |  | file://:0:0:0:0 | & |
+| main.rs:1070:22:1070:42 | "Inserting content: \\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1070:22:1070:42 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:1070:22:1070:42 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1076:24:1076:28 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1076:24:1076:28 | SelfParam | &T | main.rs:1065:5:1065:24 | MyType |
+| main.rs:1076:24:1076:28 | SelfParam | &T.T | main.rs:1074:10:1074:17 | T |
+| main.rs:1076:48:1078:9 | { ... } |  | main.rs:1074:10:1074:17 | T |
+| main.rs:1077:13:1077:19 | (...) |  | main.rs:1065:5:1065:24 | MyType |
+| main.rs:1077:13:1077:19 | (...) | T | main.rs:1074:10:1074:17 | T |
+| main.rs:1077:13:1077:21 | ... .0 |  | main.rs:1074:10:1074:17 | T |
+| main.rs:1077:13:1077:29 | ... .clone() |  | main.rs:1074:10:1074:17 | T |
+| main.rs:1077:14:1077:18 | * ... |  | main.rs:1065:5:1065:24 | MyType |
+| main.rs:1077:14:1077:18 | * ... | T | main.rs:1074:10:1074:17 | T |
+| main.rs:1077:15:1077:18 | self |  | file://:0:0:0:0 | & |
+| main.rs:1077:15:1077:18 | self | &T | main.rs:1065:5:1065:24 | MyType |
+| main.rs:1077:15:1077:18 | self | &T.T | main.rs:1074:10:1074:17 | T |
+| main.rs:1081:33:1081:36 | item |  | file://:0:0:0:0 | & |
+| main.rs:1081:33:1081:36 | item | &T | main.rs:1081:20:1081:30 | T |
+| main.rs:1081:57:1083:5 | { ... } |  | main.rs:1043:9:1043:21 | Content |
+| main.rs:1082:9:1082:12 | item |  | file://:0:0:0:0 | & |
+| main.rs:1082:9:1082:12 | item | &T | main.rs:1081:20:1081:30 | T |
+| main.rs:1082:9:1082:26 | item.get_content() |  | main.rs:1043:9:1043:21 | Content |
+| main.rs:1085:35:1085:38 | item |  | file://:0:0:0:0 | & |
+| main.rs:1085:35:1085:38 | item | &T | main.rs:1085:21:1085:32 | T |
+| main.rs:1085:45:1085:46 | c1 |  | main.rs:1043:9:1043:21 | Content |
+| main.rs:1085:61:1085:62 | c2 |  | main.rs:1043:9:1043:21 | Content |
+| main.rs:1085:77:1085:78 | c3 |  | main.rs:1043:9:1043:21 | Content |
+| main.rs:1085:93:1088:5 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1086:9:1086:12 | item |  | file://:0:0:0:0 | & |
+| main.rs:1086:9:1086:12 | item | &T | main.rs:1085:21:1085:32 | T |
+| main.rs:1086:9:1086:23 | item.insert(...) |  | file://:0:0:0:0 | () |
+| main.rs:1086:21:1086:22 | c1 |  | main.rs:1043:9:1043:21 | Content |
+| main.rs:1087:9:1087:12 | item |  | file://:0:0:0:0 | & |
+| main.rs:1087:9:1087:12 | item | &T | main.rs:1085:21:1085:32 | T |
+| main.rs:1087:9:1087:31 | item.insert_two(...) |  | file://:0:0:0:0 | () |
+| main.rs:1087:25:1087:26 | c2 |  | main.rs:1043:9:1043:21 | Content |
+| main.rs:1087:29:1087:30 | c3 |  | main.rs:1043:9:1043:21 | Content |
+| main.rs:1090:15:1096:5 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1091:13:1091:17 | item1 |  | main.rs:1065:5:1065:24 | MyType |
+| main.rs:1091:13:1091:17 | item1 | T | {EXTERNAL LOCATION} | i64 |
+| main.rs:1091:21:1091:33 | MyType(...) |  | main.rs:1065:5:1065:24 | MyType |
+| main.rs:1091:21:1091:33 | MyType(...) | T | {EXTERNAL LOCATION} | i64 |
+| main.rs:1091:28:1091:32 | 42i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1092:25:1092:29 | item1 |  | main.rs:1065:5:1065:24 | MyType |
+| main.rs:1092:25:1092:29 | item1 | T | {EXTERNAL LOCATION} | i64 |
+| main.rs:1094:13:1094:17 | item2 |  | main.rs:1065:5:1065:24 | MyType |
+| main.rs:1094:13:1094:17 | item2 | T | {EXTERNAL LOCATION} | bool |
+| main.rs:1094:21:1094:32 | MyType(...) |  | main.rs:1065:5:1065:24 | MyType |
+| main.rs:1094:21:1094:32 | MyType(...) | T | {EXTERNAL LOCATION} | bool |
+| main.rs:1094:28:1094:31 | true |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1095:37:1095:42 | &item2 |  | file://:0:0:0:0 | & |
+| main.rs:1095:37:1095:42 | &item2 | &T | main.rs:1065:5:1065:24 | MyType |
+| main.rs:1095:37:1095:42 | &item2 | &T.T | {EXTERNAL LOCATION} | bool |
+| main.rs:1095:38:1095:42 | item2 |  | main.rs:1065:5:1065:24 | MyType |
+| main.rs:1095:38:1095:42 | item2 | T | {EXTERNAL LOCATION} | bool |
+| main.rs:1112:15:1112:18 | SelfParam |  | main.rs:1100:5:1104:5 | MyEnum |
+| main.rs:1112:15:1112:18 | SelfParam | A | main.rs:1111:10:1111:10 | T |
+| main.rs:1112:26:1117:9 | { ... } |  | main.rs:1111:10:1111:10 | T |
+| main.rs:1113:13:1116:13 | match self { ... } |  | main.rs:1111:10:1111:10 | T |
+| main.rs:1113:19:1113:22 | self |  | main.rs:1100:5:1104:5 | MyEnum |
+| main.rs:1113:19:1113:22 | self | A | main.rs:1111:10:1111:10 | T |
+| main.rs:1114:17:1114:29 | ...::C1(...) |  | main.rs:1100:5:1104:5 | MyEnum |
+| main.rs:1114:17:1114:29 | ...::C1(...) | A | main.rs:1111:10:1111:10 | T |
+| main.rs:1114:28:1114:28 | a |  | main.rs:1111:10:1111:10 | T |
+| main.rs:1114:34:1114:34 | a |  | main.rs:1111:10:1111:10 | T |
+| main.rs:1115:17:1115:32 | ...::C2 {...} |  | main.rs:1100:5:1104:5 | MyEnum |
+| main.rs:1115:17:1115:32 | ...::C2 {...} | A | main.rs:1111:10:1111:10 | T |
+| main.rs:1115:30:1115:30 | a |  | main.rs:1111:10:1111:10 | T |
+| main.rs:1115:37:1115:37 | a |  | main.rs:1111:10:1111:10 | T |
+| main.rs:1120:16:1126:5 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1121:13:1121:13 | x |  | main.rs:1100:5:1104:5 | MyEnum |
+| main.rs:1121:13:1121:13 | x | A | main.rs:1106:5:1107:14 | S1 |
+| main.rs:1121:17:1121:30 | ...::C1(...) |  | main.rs:1100:5:1104:5 | MyEnum |
+| main.rs:1121:17:1121:30 | ...::C1(...) | A | main.rs:1106:5:1107:14 | S1 |
+| main.rs:1121:28:1121:29 | S1 |  | main.rs:1106:5:1107:14 | S1 |
+| main.rs:1122:13:1122:13 | y |  | main.rs:1100:5:1104:5 | MyEnum |
+| main.rs:1122:13:1122:13 | y | A | main.rs:1108:5:1109:14 | S2 |
+| main.rs:1122:17:1122:36 | ...::C2 {...} |  | main.rs:1100:5:1104:5 | MyEnum |
+| main.rs:1122:17:1122:36 | ...::C2 {...} | A | main.rs:1108:5:1109:14 | S2 |
+| main.rs:1122:33:1122:34 | S2 |  | main.rs:1108:5:1109:14 | S2 |
+| main.rs:1124:18:1124:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1124:18:1124:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1124:18:1124:31 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:1124:18:1124:31 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1124:26:1124:26 | x |  | main.rs:1100:5:1104:5 | MyEnum |
+| main.rs:1124:26:1124:26 | x | A | main.rs:1106:5:1107:14 | S1 |
+| main.rs:1124:26:1124:31 | x.m1() |  | main.rs:1106:5:1107:14 | S1 |
+| main.rs:1125:18:1125:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1125:18:1125:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1125:18:1125:31 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:1125:18:1125:31 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1125:26:1125:26 | y |  | main.rs:1100:5:1104:5 | MyEnum |
+| main.rs:1125:26:1125:26 | y | A | main.rs:1108:5:1109:14 | S2 |
+| main.rs:1125:26:1125:31 | y.m1() |  | main.rs:1108:5:1109:14 | S2 |
+| main.rs:1147:15:1147:18 | SelfParam |  | main.rs:1145:5:1148:5 | Self [trait MyTrait1] |
+| main.rs:1152:15:1152:19 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1152:15:1152:19 | SelfParam | &T | main.rs:1150:5:1162:5 | Self [trait MyTrait2] |
+| main.rs:1155:9:1161:9 | { ... } |  | main.rs:1150:20:1150:22 | Tr2 |
+| main.rs:1156:13:1160:13 | if ... {...} else {...} |  | main.rs:1150:20:1150:22 | Tr2 |
+| main.rs:1156:16:1156:16 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1156:16:1156:20 | ... > ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1156:20:1156:20 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1156:22:1158:13 | { ... } |  | main.rs:1150:20:1150:22 | Tr2 |
+| main.rs:1157:17:1157:20 | self |  | file://:0:0:0:0 | & |
+| main.rs:1157:17:1157:20 | self | &T | main.rs:1150:5:1162:5 | Self [trait MyTrait2] |
+| main.rs:1157:17:1157:25 | self.m1() |  | main.rs:1150:20:1150:22 | Tr2 |
+| main.rs:1158:20:1160:13 | { ... } |  | main.rs:1150:20:1150:22 | Tr2 |
+| main.rs:1159:17:1159:31 | ...::m1(...) |  | main.rs:1150:20:1150:22 | Tr2 |
+| main.rs:1159:26:1159:30 | * ... |  | main.rs:1150:5:1162:5 | Self [trait MyTrait2] |
+| main.rs:1159:27:1159:30 | self |  | file://:0:0:0:0 | & |
+| main.rs:1159:27:1159:30 | self | &T | main.rs:1150:5:1162:5 | Self [trait MyTrait2] |
+| main.rs:1166:15:1166:18 | SelfParam |  | main.rs:1164:5:1176:5 | Self [trait MyTrait3] |
+| main.rs:1169:9:1175:9 | { ... } |  | main.rs:1164:20:1164:22 | Tr3 |
+| main.rs:1170:13:1174:13 | if ... {...} else {...} |  | main.rs:1164:20:1164:22 | Tr3 |
+| main.rs:1170:16:1170:16 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1170:16:1170:20 | ... > ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1170:20:1170:20 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1170:22:1172:13 | { ... } |  | main.rs:1164:20:1164:22 | Tr3 |
+| main.rs:1171:17:1171:20 | self |  | main.rs:1164:5:1176:5 | Self [trait MyTrait3] |
+| main.rs:1171:17:1171:25 | self.m2() |  | main.rs:1130:5:1133:5 | MyThing |
+| main.rs:1171:17:1171:25 | self.m2() | A | main.rs:1164:20:1164:22 | Tr3 |
+| main.rs:1171:17:1171:27 | ... .a |  | main.rs:1164:20:1164:22 | Tr3 |
+| main.rs:1172:20:1174:13 | { ... } |  | main.rs:1164:20:1164:22 | Tr3 |
+| main.rs:1173:17:1173:31 | ...::m2(...) |  | main.rs:1130:5:1133:5 | MyThing |
+| main.rs:1173:17:1173:31 | ...::m2(...) | A | main.rs:1164:20:1164:22 | Tr3 |
+| main.rs:1173:17:1173:33 | ... .a |  | main.rs:1164:20:1164:22 | Tr3 |
+| main.rs:1173:26:1173:30 | &self |  | file://:0:0:0:0 | & |
+| main.rs:1173:26:1173:30 | &self | &T | main.rs:1164:5:1176:5 | Self [trait MyTrait3] |
+| main.rs:1173:27:1173:30 | self |  | main.rs:1164:5:1176:5 | Self [trait MyTrait3] |
+| main.rs:1180:15:1180:18 | SelfParam |  | main.rs:1130:5:1133:5 | MyThing |
+| main.rs:1180:15:1180:18 | SelfParam | A | main.rs:1178:10:1178:10 | T |
+| main.rs:1180:26:1182:9 | { ... } |  | main.rs:1178:10:1178:10 | T |
+| main.rs:1181:13:1181:16 | self |  | main.rs:1130:5:1133:5 | MyThing |
+| main.rs:1181:13:1181:16 | self | A | main.rs:1178:10:1178:10 | T |
+| main.rs:1181:13:1181:18 | self.a |  | main.rs:1178:10:1178:10 | T |
+| main.rs:1189:15:1189:18 | SelfParam |  | main.rs:1135:5:1138:5 | MyThing2 |
+| main.rs:1189:15:1189:18 | SelfParam | A | main.rs:1187:10:1187:10 | T |
+| main.rs:1189:35:1191:9 | { ... } |  | main.rs:1130:5:1133:5 | MyThing |
+| main.rs:1189:35:1191:9 | { ... } | A | main.rs:1187:10:1187:10 | T |
+| main.rs:1190:13:1190:33 | MyThing {...} |  | main.rs:1130:5:1133:5 | MyThing |
+| main.rs:1190:13:1190:33 | MyThing {...} | A | main.rs:1187:10:1187:10 | T |
+| main.rs:1190:26:1190:29 | self |  | main.rs:1135:5:1138:5 | MyThing2 |
+| main.rs:1190:26:1190:29 | self | A | main.rs:1187:10:1187:10 | T |
+| main.rs:1190:26:1190:31 | self.a |  | main.rs:1187:10:1187:10 | T |
+| main.rs:1198:44:1198:44 | x |  | main.rs:1198:26:1198:41 | T2 |
+| main.rs:1198:57:1200:5 | { ... } |  | main.rs:1198:22:1198:23 | T1 |
+| main.rs:1199:9:1199:9 | x |  | main.rs:1198:26:1198:41 | T2 |
+| main.rs:1199:9:1199:14 | x.m1() |  | main.rs:1198:22:1198:23 | T1 |
+| main.rs:1202:56:1202:56 | x |  | main.rs:1202:39:1202:53 | T |
+| main.rs:1202:62:1206:5 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1204:13:1204:13 | a |  | main.rs:1130:5:1133:5 | MyThing |
+| main.rs:1204:13:1204:13 | a | A | main.rs:1140:5:1141:14 | S1 |
+| main.rs:1204:17:1204:17 | x |  | main.rs:1202:39:1202:53 | T |
+| main.rs:1204:17:1204:22 | x.m1() |  | main.rs:1130:5:1133:5 | MyThing |
+| main.rs:1204:17:1204:22 | x.m1() | A | main.rs:1140:5:1141:14 | S1 |
+| main.rs:1205:18:1205:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1205:18:1205:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1205:18:1205:26 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:1205:18:1205:26 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1205:26:1205:26 | a |  | main.rs:1130:5:1133:5 | MyThing |
+| main.rs:1205:26:1205:26 | a | A | main.rs:1140:5:1141:14 | S1 |
+| main.rs:1208:16:1232:5 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1209:13:1209:13 | x |  | main.rs:1130:5:1133:5 | MyThing |
+| main.rs:1209:13:1209:13 | x | A | main.rs:1140:5:1141:14 | S1 |
+| main.rs:1209:17:1209:33 | MyThing {...} |  | main.rs:1130:5:1133:5 | MyThing |
+| main.rs:1209:17:1209:33 | MyThing {...} | A | main.rs:1140:5:1141:14 | S1 |
+| main.rs:1209:30:1209:31 | S1 |  | main.rs:1140:5:1141:14 | S1 |
+| main.rs:1210:13:1210:13 | y |  | main.rs:1130:5:1133:5 | MyThing |
+| main.rs:1210:13:1210:13 | y | A | main.rs:1142:5:1143:14 | S2 |
+| main.rs:1210:17:1210:33 | MyThing {...} |  | main.rs:1130:5:1133:5 | MyThing |
+| main.rs:1210:17:1210:33 | MyThing {...} | A | main.rs:1142:5:1143:14 | S2 |
+| main.rs:1210:30:1210:31 | S2 |  | main.rs:1142:5:1143:14 | S2 |
 | main.rs:1212:18:1212:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
 | main.rs:1212:18:1212:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1212:18:1212:27 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1212:18:1212:27 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1212:26:1212:27 | x3 |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1214:17:1214:18 | x4 |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1214:17:1214:18 | x4 | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1214:22:1214:36 | ...::new(...) |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1214:22:1214:36 | ...::new(...) | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1215:23:1215:29 | &mut x4 |  | file://:0:0:0:0 | & |
-| main.rs:1215:23:1215:29 | &mut x4 | &T | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1215:23:1215:29 | &mut x4 | &T.T | main.rs:1198:5:1199:13 | S |
-| main.rs:1215:28:1215:29 | x4 |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1215:28:1215:29 | x4 | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1215:32:1215:32 | S |  | main.rs:1198:5:1199:13 | S |
-| main.rs:1216:18:1216:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1216:18:1216:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1216:18:1216:27 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1216:18:1216:27 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1216:26:1216:27 | x4 |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1216:26:1216:27 | x4 | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1218:13:1218:14 | x5 |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1218:13:1218:14 | x5 | T | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1218:13:1218:14 | x5 | T.T | main.rs:1198:5:1199:13 | S |
-| main.rs:1218:18:1218:58 | ...::MySome(...) |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1218:18:1218:58 | ...::MySome(...) | T | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1218:18:1218:58 | ...::MySome(...) | T.T | main.rs:1198:5:1199:13 | S |
-| main.rs:1218:35:1218:57 | ...::MyNone(...) |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1218:35:1218:57 | ...::MyNone(...) | T | main.rs:1198:5:1199:13 | S |
+| main.rs:1212:18:1212:31 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:1212:18:1212:31 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1212:26:1212:26 | x |  | main.rs:1130:5:1133:5 | MyThing |
+| main.rs:1212:26:1212:26 | x | A | main.rs:1140:5:1141:14 | S1 |
+| main.rs:1212:26:1212:31 | x.m1() |  | main.rs:1140:5:1141:14 | S1 |
+| main.rs:1213:18:1213:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1213:18:1213:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1213:18:1213:31 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:1213:18:1213:31 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1213:26:1213:26 | y |  | main.rs:1130:5:1133:5 | MyThing |
+| main.rs:1213:26:1213:26 | y | A | main.rs:1142:5:1143:14 | S2 |
+| main.rs:1213:26:1213:31 | y.m1() |  | main.rs:1142:5:1143:14 | S2 |
+| main.rs:1215:13:1215:13 | x |  | main.rs:1130:5:1133:5 | MyThing |
+| main.rs:1215:13:1215:13 | x | A | main.rs:1140:5:1141:14 | S1 |
+| main.rs:1215:17:1215:33 | MyThing {...} |  | main.rs:1130:5:1133:5 | MyThing |
+| main.rs:1215:17:1215:33 | MyThing {...} | A | main.rs:1140:5:1141:14 | S1 |
+| main.rs:1215:30:1215:31 | S1 |  | main.rs:1140:5:1141:14 | S1 |
+| main.rs:1216:13:1216:13 | y |  | main.rs:1130:5:1133:5 | MyThing |
+| main.rs:1216:13:1216:13 | y | A | main.rs:1142:5:1143:14 | S2 |
+| main.rs:1216:17:1216:33 | MyThing {...} |  | main.rs:1130:5:1133:5 | MyThing |
+| main.rs:1216:17:1216:33 | MyThing {...} | A | main.rs:1142:5:1143:14 | S2 |
+| main.rs:1216:30:1216:31 | S2 |  | main.rs:1142:5:1143:14 | S2 |
+| main.rs:1218:18:1218:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1218:18:1218:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1218:18:1218:31 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:1218:18:1218:31 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1218:26:1218:26 | x |  | main.rs:1130:5:1133:5 | MyThing |
+| main.rs:1218:26:1218:26 | x | A | main.rs:1140:5:1141:14 | S1 |
+| main.rs:1218:26:1218:31 | x.m2() |  | main.rs:1140:5:1141:14 | S1 |
 | main.rs:1219:18:1219:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
 | main.rs:1219:18:1219:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1219:18:1219:37 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1219:18:1219:37 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1219:26:1219:27 | x5 |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1219:26:1219:27 | x5 | T | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1219:26:1219:27 | x5 | T.T | main.rs:1198:5:1199:13 | S |
-| main.rs:1219:26:1219:37 | x5.flatten() |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1219:26:1219:37 | x5.flatten() | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1221:13:1221:14 | x6 |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1221:13:1221:14 | x6 | T | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1221:13:1221:14 | x6 | T.T | main.rs:1198:5:1199:13 | S |
-| main.rs:1221:18:1221:58 | ...::MySome(...) |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1221:18:1221:58 | ...::MySome(...) | T | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1221:18:1221:58 | ...::MySome(...) | T.T | main.rs:1198:5:1199:13 | S |
-| main.rs:1221:35:1221:57 | ...::MyNone(...) |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1221:35:1221:57 | ...::MyNone(...) | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1222:18:1222:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1222:18:1222:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1222:18:1222:61 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1222:18:1222:61 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1222:26:1222:61 | ...::flatten(...) |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1222:26:1222:61 | ...::flatten(...) | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1222:59:1222:60 | x6 |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1222:59:1222:60 | x6 | T | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1222:59:1222:60 | x6 | T.T | main.rs:1198:5:1199:13 | S |
-| main.rs:1225:13:1225:19 | from_if |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1225:13:1225:19 | from_if | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1225:23:1229:9 | if ... {...} else {...} |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1225:23:1229:9 | if ... {...} else {...} | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1225:26:1225:26 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1225:26:1225:30 | ... > ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1225:30:1225:30 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1225:32:1227:9 | { ... } |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1225:32:1227:9 | { ... } | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1226:13:1226:30 | ...::MyNone(...) |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1226:13:1226:30 | ...::MyNone(...) | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1227:16:1229:9 | { ... } |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1227:16:1229:9 | { ... } | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1228:13:1228:31 | ...::MySome(...) |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1228:13:1228:31 | ...::MySome(...) | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1228:30:1228:30 | S |  | main.rs:1198:5:1199:13 | S |
-| main.rs:1230:18:1230:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1230:18:1230:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1230:18:1230:32 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1230:18:1230:32 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1230:26:1230:32 | from_if |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1230:26:1230:32 | from_if | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1233:13:1233:22 | from_match |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1233:13:1233:22 | from_match | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1233:26:1236:9 | match ... { ... } |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1233:26:1236:9 | match ... { ... } | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1233:32:1233:32 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1233:32:1233:36 | ... > ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1233:36:1233:36 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1234:13:1234:16 | true |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1234:21:1234:38 | ...::MyNone(...) |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1234:21:1234:38 | ...::MyNone(...) | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1235:13:1235:17 | false |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1235:22:1235:40 | ...::MySome(...) |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1235:22:1235:40 | ...::MySome(...) | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1235:39:1235:39 | S |  | main.rs:1198:5:1199:13 | S |
-| main.rs:1237:18:1237:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1237:18:1237:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1237:18:1237:35 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1237:18:1237:35 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1237:26:1237:35 | from_match |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1237:26:1237:35 | from_match | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1240:13:1240:21 | from_loop |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1240:13:1240:21 | from_loop | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1240:25:1245:9 | loop { ... } |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1240:25:1245:9 | loop { ... } | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1241:16:1241:16 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1241:16:1241:20 | ... > ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1241:20:1241:20 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1242:23:1242:40 | ...::MyNone(...) |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1242:23:1242:40 | ...::MyNone(...) | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1244:19:1244:37 | ...::MySome(...) |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1244:19:1244:37 | ...::MySome(...) | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1244:36:1244:36 | S |  | main.rs:1198:5:1199:13 | S |
-| main.rs:1246:18:1246:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1246:18:1246:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1246:18:1246:34 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1246:18:1246:34 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1246:26:1246:34 | from_loop |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1246:26:1246:34 | from_loop | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1264:15:1264:18 | SelfParam |  | main.rs:1252:5:1253:19 | S |
-| main.rs:1264:15:1264:18 | SelfParam | T | main.rs:1263:10:1263:10 | T |
-| main.rs:1264:26:1266:9 | { ... } |  | main.rs:1263:10:1263:10 | T |
-| main.rs:1265:13:1265:16 | self |  | main.rs:1252:5:1253:19 | S |
-| main.rs:1265:13:1265:16 | self | T | main.rs:1263:10:1263:10 | T |
-| main.rs:1265:13:1265:18 | self.0 |  | main.rs:1263:10:1263:10 | T |
-| main.rs:1268:15:1268:19 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1268:15:1268:19 | SelfParam | &T | main.rs:1252:5:1253:19 | S |
-| main.rs:1268:15:1268:19 | SelfParam | &T.T | main.rs:1263:10:1263:10 | T |
-| main.rs:1268:28:1270:9 | { ... } |  | file://:0:0:0:0 | & |
-| main.rs:1268:28:1270:9 | { ... } | &T | main.rs:1263:10:1263:10 | T |
-| main.rs:1269:13:1269:19 | &... |  | file://:0:0:0:0 | & |
-| main.rs:1269:13:1269:19 | &... | &T | main.rs:1263:10:1263:10 | T |
-| main.rs:1269:14:1269:17 | self |  | file://:0:0:0:0 | & |
-| main.rs:1269:14:1269:17 | self | &T | main.rs:1252:5:1253:19 | S |
-| main.rs:1269:14:1269:17 | self | &T.T | main.rs:1263:10:1263:10 | T |
-| main.rs:1269:14:1269:19 | self.0 |  | main.rs:1263:10:1263:10 | T |
-| main.rs:1272:15:1272:25 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1272:15:1272:25 | SelfParam | &T | main.rs:1252:5:1253:19 | S |
-| main.rs:1272:15:1272:25 | SelfParam | &T.T | main.rs:1263:10:1263:10 | T |
-| main.rs:1272:34:1274:9 | { ... } |  | file://:0:0:0:0 | & |
-| main.rs:1272:34:1274:9 | { ... } | &T | main.rs:1263:10:1263:10 | T |
-| main.rs:1273:13:1273:19 | &... |  | file://:0:0:0:0 | & |
-| main.rs:1273:13:1273:19 | &... | &T | main.rs:1263:10:1263:10 | T |
-| main.rs:1273:14:1273:17 | self |  | file://:0:0:0:0 | & |
-| main.rs:1273:14:1273:17 | self | &T | main.rs:1252:5:1253:19 | S |
-| main.rs:1273:14:1273:17 | self | &T.T | main.rs:1263:10:1263:10 | T |
-| main.rs:1273:14:1273:19 | self.0 |  | main.rs:1263:10:1263:10 | T |
-| main.rs:1278:29:1278:33 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1278:29:1278:33 | SelfParam | &T | main.rs:1277:5:1280:5 | Self [trait ATrait] |
-| main.rs:1279:33:1279:36 | SelfParam |  | main.rs:1277:5:1280:5 | Self [trait ATrait] |
-| main.rs:1285:29:1285:33 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1285:29:1285:33 | SelfParam | &T | file://:0:0:0:0 | & |
-| main.rs:1285:29:1285:33 | SelfParam | &T | main.rs:1258:5:1261:5 | MyInt |
-| main.rs:1285:29:1285:33 | SelfParam | &T.&T | main.rs:1258:5:1261:5 | MyInt |
-| main.rs:1285:43:1287:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1286:13:1286:22 | (...) |  | main.rs:1258:5:1261:5 | MyInt |
-| main.rs:1286:13:1286:24 | ... .a |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1286:14:1286:21 | * ... |  | main.rs:1258:5:1261:5 | MyInt |
-| main.rs:1286:15:1286:21 | (...) |  | file://:0:0:0:0 | & |
-| main.rs:1286:15:1286:21 | (...) |  | main.rs:1258:5:1261:5 | MyInt |
-| main.rs:1286:15:1286:21 | (...) | &T | main.rs:1258:5:1261:5 | MyInt |
-| main.rs:1286:16:1286:20 | * ... |  | file://:0:0:0:0 | & |
-| main.rs:1286:16:1286:20 | * ... |  | main.rs:1258:5:1261:5 | MyInt |
-| main.rs:1286:16:1286:20 | * ... | &T | main.rs:1258:5:1261:5 | MyInt |
-| main.rs:1286:17:1286:20 | self |  | file://:0:0:0:0 | & |
-| main.rs:1286:17:1286:20 | self | &T | file://:0:0:0:0 | & |
-| main.rs:1286:17:1286:20 | self | &T | main.rs:1258:5:1261:5 | MyInt |
-| main.rs:1286:17:1286:20 | self | &T.&T | main.rs:1258:5:1261:5 | MyInt |
-| main.rs:1290:33:1290:36 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1290:33:1290:36 | SelfParam | &T | main.rs:1258:5:1261:5 | MyInt |
-| main.rs:1290:46:1292:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1291:13:1291:19 | (...) |  | main.rs:1258:5:1261:5 | MyInt |
-| main.rs:1291:13:1291:21 | ... .a |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1291:14:1291:18 | * ... |  | main.rs:1258:5:1261:5 | MyInt |
-| main.rs:1291:15:1291:18 | self |  | file://:0:0:0:0 | & |
-| main.rs:1291:15:1291:18 | self | &T | main.rs:1258:5:1261:5 | MyInt |
-| main.rs:1296:13:1296:14 | x1 |  | main.rs:1252:5:1253:19 | S |
-| main.rs:1296:13:1296:14 | x1 | T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1296:18:1296:22 | S(...) |  | main.rs:1252:5:1253:19 | S |
-| main.rs:1296:18:1296:22 | S(...) | T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1296:20:1296:21 | S2 |  | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1297:18:1297:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1297:18:1297:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1297:18:1297:32 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1297:18:1297:32 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1297:26:1297:27 | x1 |  | main.rs:1252:5:1253:19 | S |
-| main.rs:1297:26:1297:27 | x1 | T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1297:26:1297:32 | x1.m1() |  | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1299:13:1299:14 | x2 |  | main.rs:1252:5:1253:19 | S |
-| main.rs:1299:13:1299:14 | x2 | T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1299:18:1299:22 | S(...) |  | main.rs:1252:5:1253:19 | S |
-| main.rs:1299:18:1299:22 | S(...) | T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1299:20:1299:21 | S2 |  | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1301:18:1301:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1301:18:1301:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1301:18:1301:32 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1301:18:1301:32 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1301:26:1301:27 | x2 |  | main.rs:1252:5:1253:19 | S |
-| main.rs:1301:26:1301:27 | x2 | T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1301:26:1301:32 | x2.m2() |  | file://:0:0:0:0 | & |
-| main.rs:1301:26:1301:32 | x2.m2() | &T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1302:18:1302:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1302:18:1302:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1302:18:1302:32 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1302:18:1302:32 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1302:26:1302:27 | x2 |  | main.rs:1252:5:1253:19 | S |
-| main.rs:1302:26:1302:27 | x2 | T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1302:26:1302:32 | x2.m3() |  | file://:0:0:0:0 | & |
-| main.rs:1302:26:1302:32 | x2.m3() | &T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1304:13:1304:14 | x3 |  | main.rs:1252:5:1253:19 | S |
-| main.rs:1304:13:1304:14 | x3 | T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1304:18:1304:22 | S(...) |  | main.rs:1252:5:1253:19 | S |
-| main.rs:1304:18:1304:22 | S(...) | T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1304:20:1304:21 | S2 |  | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1306:18:1306:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1306:18:1306:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1306:18:1306:41 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1306:18:1306:41 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1306:26:1306:41 | ...::m2(...) |  | file://:0:0:0:0 | & |
-| main.rs:1306:26:1306:41 | ...::m2(...) | &T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1306:38:1306:40 | &x3 |  | file://:0:0:0:0 | & |
-| main.rs:1306:38:1306:40 | &x3 | &T | main.rs:1252:5:1253:19 | S |
-| main.rs:1306:38:1306:40 | &x3 | &T.T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1306:39:1306:40 | x3 |  | main.rs:1252:5:1253:19 | S |
-| main.rs:1306:39:1306:40 | x3 | T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1307:18:1307:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1307:18:1307:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1307:18:1307:41 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1307:18:1307:41 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1307:26:1307:41 | ...::m3(...) |  | file://:0:0:0:0 | & |
-| main.rs:1307:26:1307:41 | ...::m3(...) | &T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1307:38:1307:40 | &x3 |  | file://:0:0:0:0 | & |
-| main.rs:1307:38:1307:40 | &x3 | &T | main.rs:1252:5:1253:19 | S |
-| main.rs:1307:38:1307:40 | &x3 | &T.T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1307:39:1307:40 | x3 |  | main.rs:1252:5:1253:19 | S |
-| main.rs:1307:39:1307:40 | x3 | T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1309:13:1309:14 | x4 |  | file://:0:0:0:0 | & |
-| main.rs:1309:13:1309:14 | x4 | &T | main.rs:1252:5:1253:19 | S |
-| main.rs:1309:13:1309:14 | x4 | &T.T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1309:18:1309:23 | &... |  | file://:0:0:0:0 | & |
-| main.rs:1309:18:1309:23 | &... | &T | main.rs:1252:5:1253:19 | S |
-| main.rs:1309:18:1309:23 | &... | &T.T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1309:19:1309:23 | S(...) |  | main.rs:1252:5:1253:19 | S |
-| main.rs:1309:19:1309:23 | S(...) | T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1309:21:1309:22 | S2 |  | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1311:18:1311:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1311:18:1311:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1311:18:1311:32 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1311:18:1311:32 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1311:26:1311:27 | x4 |  | file://:0:0:0:0 | & |
-| main.rs:1311:26:1311:27 | x4 | &T | main.rs:1252:5:1253:19 | S |
-| main.rs:1311:26:1311:27 | x4 | &T.T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1311:26:1311:32 | x4.m2() |  | file://:0:0:0:0 | & |
-| main.rs:1311:26:1311:32 | x4.m2() | &T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1312:18:1312:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1312:18:1312:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1312:18:1312:32 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1312:18:1312:32 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1312:26:1312:27 | x4 |  | file://:0:0:0:0 | & |
-| main.rs:1312:26:1312:27 | x4 | &T | main.rs:1252:5:1253:19 | S |
-| main.rs:1312:26:1312:27 | x4 | &T.T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1312:26:1312:32 | x4.m3() |  | file://:0:0:0:0 | & |
-| main.rs:1312:26:1312:32 | x4.m3() | &T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1314:13:1314:14 | x5 |  | file://:0:0:0:0 | & |
-| main.rs:1314:13:1314:14 | x5 | &T | main.rs:1252:5:1253:19 | S |
-| main.rs:1314:13:1314:14 | x5 | &T.T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1314:18:1314:23 | &... |  | file://:0:0:0:0 | & |
-| main.rs:1314:18:1314:23 | &... | &T | main.rs:1252:5:1253:19 | S |
-| main.rs:1314:18:1314:23 | &... | &T.T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1314:19:1314:23 | S(...) |  | main.rs:1252:5:1253:19 | S |
-| main.rs:1314:19:1314:23 | S(...) | T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1314:21:1314:22 | S2 |  | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1316:18:1316:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1316:18:1316:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1316:18:1316:32 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1316:18:1316:32 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1316:26:1316:27 | x5 |  | file://:0:0:0:0 | & |
-| main.rs:1316:26:1316:27 | x5 | &T | main.rs:1252:5:1253:19 | S |
-| main.rs:1316:26:1316:27 | x5 | &T.T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1316:26:1316:32 | x5.m1() |  | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1317:18:1317:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1317:18:1317:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1317:18:1317:29 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1317:18:1317:29 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1317:26:1317:27 | x5 |  | file://:0:0:0:0 | & |
-| main.rs:1317:26:1317:27 | x5 | &T | main.rs:1252:5:1253:19 | S |
-| main.rs:1317:26:1317:27 | x5 | &T.T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1317:26:1317:29 | x5.0 |  | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1319:13:1319:14 | x6 |  | file://:0:0:0:0 | & |
-| main.rs:1319:13:1319:14 | x6 | &T | main.rs:1252:5:1253:19 | S |
-| main.rs:1319:13:1319:14 | x6 | &T.T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1319:18:1319:23 | &... |  | file://:0:0:0:0 | & |
-| main.rs:1319:18:1319:23 | &... | &T | main.rs:1252:5:1253:19 | S |
-| main.rs:1319:18:1319:23 | &... | &T.T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1319:19:1319:23 | S(...) |  | main.rs:1252:5:1253:19 | S |
-| main.rs:1319:19:1319:23 | S(...) | T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1319:21:1319:22 | S2 |  | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1322:18:1322:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1322:18:1322:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1322:18:1322:35 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1322:18:1322:35 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1322:26:1322:30 | (...) |  | main.rs:1252:5:1253:19 | S |
-| main.rs:1322:26:1322:30 | (...) | T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1322:26:1322:35 | ... .m1() |  | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1322:27:1322:29 | * ... |  | main.rs:1252:5:1253:19 | S |
-| main.rs:1322:27:1322:29 | * ... | T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1322:28:1322:29 | x6 |  | file://:0:0:0:0 | & |
-| main.rs:1322:28:1322:29 | x6 | &T | main.rs:1252:5:1253:19 | S |
-| main.rs:1322:28:1322:29 | x6 | &T.T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1324:13:1324:14 | x7 |  | main.rs:1252:5:1253:19 | S |
-| main.rs:1324:13:1324:14 | x7 | T | file://:0:0:0:0 | & |
-| main.rs:1324:13:1324:14 | x7 | T.&T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1324:18:1324:23 | S(...) |  | main.rs:1252:5:1253:19 | S |
-| main.rs:1324:18:1324:23 | S(...) | T | file://:0:0:0:0 | & |
-| main.rs:1324:18:1324:23 | S(...) | T.&T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1324:20:1324:22 | &S2 |  | file://:0:0:0:0 | & |
-| main.rs:1324:20:1324:22 | &S2 | &T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1324:21:1324:22 | S2 |  | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1327:13:1327:13 | t |  | file://:0:0:0:0 | & |
-| main.rs:1327:13:1327:13 | t | &T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1327:17:1327:18 | x7 |  | main.rs:1252:5:1253:19 | S |
-| main.rs:1327:17:1327:18 | x7 | T | file://:0:0:0:0 | & |
-| main.rs:1327:17:1327:18 | x7 | T.&T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1327:17:1327:23 | x7.m1() |  | file://:0:0:0:0 | & |
-| main.rs:1327:17:1327:23 | x7.m1() | &T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1328:18:1328:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1328:18:1328:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1328:18:1328:27 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1328:18:1328:27 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1328:26:1328:27 | x7 |  | main.rs:1252:5:1253:19 | S |
-| main.rs:1328:26:1328:27 | x7 | T | file://:0:0:0:0 | & |
-| main.rs:1328:26:1328:27 | x7 | T.&T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1330:13:1330:14 | x9 |  | {EXTERNAL LOCATION} | String |
-| main.rs:1330:26:1330:32 | "Hello" |  | file://:0:0:0:0 | & |
-| main.rs:1330:26:1330:32 | "Hello" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1330:26:1330:44 | "Hello".to_string() |  | {EXTERNAL LOCATION} | String |
-| main.rs:1334:13:1334:13 | u |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1334:13:1334:13 | u | T | {EXTERNAL LOCATION} | u32 |
-| main.rs:1334:17:1334:18 | x9 |  | {EXTERNAL LOCATION} | String |
-| main.rs:1334:17:1334:33 | x9.parse() |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1334:17:1334:33 | x9.parse() | T | {EXTERNAL LOCATION} | u32 |
-| main.rs:1336:13:1336:20 | my_thing |  | file://:0:0:0:0 | & |
-| main.rs:1336:13:1336:20 | my_thing | &T | main.rs:1258:5:1261:5 | MyInt |
-| main.rs:1336:24:1336:39 | &... |  | file://:0:0:0:0 | & |
-| main.rs:1336:24:1336:39 | &... | &T | main.rs:1258:5:1261:5 | MyInt |
-| main.rs:1336:25:1336:39 | MyInt {...} |  | main.rs:1258:5:1261:5 | MyInt |
-| main.rs:1336:36:1336:37 | 37 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1336:36:1336:37 | 37 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1338:17:1338:24 | my_thing |  | file://:0:0:0:0 | & |
-| main.rs:1338:17:1338:24 | my_thing | &T | main.rs:1258:5:1261:5 | MyInt |
-| main.rs:1339:18:1339:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1339:18:1339:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1339:18:1339:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1339:18:1339:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1342:13:1342:20 | my_thing |  | file://:0:0:0:0 | & |
-| main.rs:1342:13:1342:20 | my_thing | &T | main.rs:1258:5:1261:5 | MyInt |
-| main.rs:1342:24:1342:39 | &... |  | file://:0:0:0:0 | & |
-| main.rs:1342:24:1342:39 | &... | &T | main.rs:1258:5:1261:5 | MyInt |
-| main.rs:1342:25:1342:39 | MyInt {...} |  | main.rs:1258:5:1261:5 | MyInt |
-| main.rs:1342:36:1342:37 | 38 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1342:36:1342:37 | 38 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1343:17:1343:24 | my_thing |  | file://:0:0:0:0 | & |
-| main.rs:1343:17:1343:24 | my_thing | &T | main.rs:1258:5:1261:5 | MyInt |
-| main.rs:1344:18:1344:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1344:18:1344:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1344:18:1344:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1344:18:1344:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1351:16:1351:20 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1351:16:1351:20 | SelfParam | &T | main.rs:1349:5:1357:5 | Self [trait MyTrait] |
-| main.rs:1354:16:1354:20 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1354:16:1354:20 | SelfParam | &T | main.rs:1349:5:1357:5 | Self [trait MyTrait] |
-| main.rs:1354:32:1356:9 | { ... } |  | file://:0:0:0:0 | & |
-| main.rs:1354:32:1356:9 | { ... } | &T | main.rs:1349:5:1357:5 | Self [trait MyTrait] |
-| main.rs:1355:13:1355:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1355:13:1355:16 | self | &T | main.rs:1349:5:1357:5 | Self [trait MyTrait] |
-| main.rs:1355:13:1355:22 | self.foo() |  | file://:0:0:0:0 | & |
-| main.rs:1355:13:1355:22 | self.foo() | &T | main.rs:1349:5:1357:5 | Self [trait MyTrait] |
-| main.rs:1363:16:1363:20 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1363:16:1363:20 | SelfParam | &T | main.rs:1359:5:1359:20 | MyStruct |
-| main.rs:1363:36:1365:9 | { ... } |  | file://:0:0:0:0 | & |
-| main.rs:1363:36:1365:9 | { ... } | &T | main.rs:1359:5:1359:20 | MyStruct |
-| main.rs:1364:13:1364:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1364:13:1364:16 | self | &T | main.rs:1359:5:1359:20 | MyStruct |
-| main.rs:1369:13:1369:13 | x |  | main.rs:1359:5:1359:20 | MyStruct |
-| main.rs:1369:17:1369:24 | MyStruct |  | main.rs:1359:5:1359:20 | MyStruct |
-| main.rs:1370:9:1370:9 | x |  | main.rs:1359:5:1359:20 | MyStruct |
-| main.rs:1370:9:1370:15 | x.bar() |  | file://:0:0:0:0 | & |
-| main.rs:1370:9:1370:15 | x.bar() | &T | main.rs:1359:5:1359:20 | MyStruct |
-| main.rs:1380:16:1380:20 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1380:16:1380:20 | SelfParam | &T | main.rs:1377:5:1377:26 | MyStruct |
-| main.rs:1380:16:1380:20 | SelfParam | &T.T | main.rs:1379:10:1379:10 | T |
-| main.rs:1380:32:1382:9 | { ... } |  | file://:0:0:0:0 | & |
-| main.rs:1380:32:1382:9 | { ... } | &T | main.rs:1377:5:1377:26 | MyStruct |
-| main.rs:1380:32:1382:9 | { ... } | &T.T | main.rs:1379:10:1379:10 | T |
-| main.rs:1381:13:1381:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1381:13:1381:16 | self | &T | main.rs:1377:5:1377:26 | MyStruct |
-| main.rs:1381:13:1381:16 | self | &T.T | main.rs:1379:10:1379:10 | T |
-| main.rs:1386:13:1386:13 | x |  | main.rs:1377:5:1377:26 | MyStruct |
-| main.rs:1386:13:1386:13 | x | T | main.rs:1375:5:1375:13 | S |
-| main.rs:1386:17:1386:27 | MyStruct(...) |  | main.rs:1377:5:1377:26 | MyStruct |
-| main.rs:1386:17:1386:27 | MyStruct(...) | T | main.rs:1375:5:1375:13 | S |
-| main.rs:1386:26:1386:26 | S |  | main.rs:1375:5:1375:13 | S |
-| main.rs:1387:9:1387:9 | x |  | main.rs:1377:5:1377:26 | MyStruct |
-| main.rs:1387:9:1387:9 | x | T | main.rs:1375:5:1375:13 | S |
-| main.rs:1387:9:1387:15 | x.foo() |  | file://:0:0:0:0 | & |
-| main.rs:1387:9:1387:15 | x.foo() | &T | main.rs:1377:5:1377:26 | MyStruct |
-| main.rs:1387:9:1387:15 | x.foo() | &T.T | main.rs:1375:5:1375:13 | S |
-| main.rs:1398:17:1398:25 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1398:17:1398:25 | SelfParam | &T | main.rs:1392:5:1395:5 | MyFlag |
-| main.rs:1399:13:1399:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1399:13:1399:16 | self | &T | main.rs:1392:5:1395:5 | MyFlag |
-| main.rs:1399:13:1399:21 | self.bool |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1399:13:1399:34 | ... = ... |  | file://:0:0:0:0 | () |
-| main.rs:1399:25:1399:34 | ! ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1399:26:1399:29 | self |  | file://:0:0:0:0 | & |
-| main.rs:1399:26:1399:29 | self | &T | main.rs:1392:5:1395:5 | MyFlag |
-| main.rs:1399:26:1399:34 | self.bool |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1406:15:1406:19 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1406:15:1406:19 | SelfParam | &T | main.rs:1403:5:1403:13 | S |
-| main.rs:1406:31:1408:9 | { ... } |  | file://:0:0:0:0 | & |
-| main.rs:1406:31:1408:9 | { ... } | &T | main.rs:1403:5:1403:13 | S |
-| main.rs:1407:13:1407:19 | &... |  | file://:0:0:0:0 | & |
-| main.rs:1407:13:1407:19 | &... | &T | file://:0:0:0:0 | & |
-| main.rs:1407:13:1407:19 | &... | &T | main.rs:1403:5:1403:13 | S |
-| main.rs:1407:13:1407:19 | &... | &T.&T | file://:0:0:0:0 | & |
-| main.rs:1407:13:1407:19 | &... | &T.&T.&T | file://:0:0:0:0 | & |
-| main.rs:1407:13:1407:19 | &... | &T.&T.&T.&T | main.rs:1403:5:1403:13 | S |
-| main.rs:1407:14:1407:19 | &... |  | file://:0:0:0:0 | & |
-| main.rs:1407:14:1407:19 | &... |  | main.rs:1403:5:1403:13 | S |
-| main.rs:1407:14:1407:19 | &... | &T | file://:0:0:0:0 | & |
-| main.rs:1407:14:1407:19 | &... | &T.&T | file://:0:0:0:0 | & |
-| main.rs:1407:14:1407:19 | &... | &T.&T.&T | main.rs:1403:5:1403:13 | S |
-| main.rs:1407:15:1407:19 | &self |  | file://:0:0:0:0 | & |
-| main.rs:1407:15:1407:19 | &self | &T | file://:0:0:0:0 | & |
-| main.rs:1407:15:1407:19 | &self | &T.&T | main.rs:1403:5:1403:13 | S |
-| main.rs:1407:16:1407:19 | self |  | file://:0:0:0:0 | & |
-| main.rs:1407:16:1407:19 | self | &T | main.rs:1403:5:1403:13 | S |
-| main.rs:1410:15:1410:25 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1410:15:1410:25 | SelfParam | &T | main.rs:1403:5:1403:13 | S |
-| main.rs:1410:37:1412:9 | { ... } |  | file://:0:0:0:0 | & |
-| main.rs:1410:37:1412:9 | { ... } | &T | main.rs:1403:5:1403:13 | S |
-| main.rs:1411:13:1411:19 | &... |  | file://:0:0:0:0 | & |
-| main.rs:1411:13:1411:19 | &... | &T | file://:0:0:0:0 | & |
-| main.rs:1411:13:1411:19 | &... | &T | main.rs:1403:5:1403:13 | S |
-| main.rs:1411:13:1411:19 | &... | &T.&T | file://:0:0:0:0 | & |
-| main.rs:1411:13:1411:19 | &... | &T.&T.&T | file://:0:0:0:0 | & |
-| main.rs:1411:13:1411:19 | &... | &T.&T.&T.&T | main.rs:1403:5:1403:13 | S |
-| main.rs:1411:14:1411:19 | &... |  | file://:0:0:0:0 | & |
-| main.rs:1411:14:1411:19 | &... |  | main.rs:1403:5:1403:13 | S |
-| main.rs:1411:14:1411:19 | &... | &T | file://:0:0:0:0 | & |
-| main.rs:1411:14:1411:19 | &... | &T.&T | file://:0:0:0:0 | & |
-| main.rs:1411:14:1411:19 | &... | &T.&T.&T | main.rs:1403:5:1403:13 | S |
-| main.rs:1411:15:1411:19 | &self |  | file://:0:0:0:0 | & |
-| main.rs:1411:15:1411:19 | &self | &T | file://:0:0:0:0 | & |
-| main.rs:1411:15:1411:19 | &self | &T.&T | main.rs:1403:5:1403:13 | S |
-| main.rs:1411:16:1411:19 | self |  | file://:0:0:0:0 | & |
-| main.rs:1411:16:1411:19 | self | &T | main.rs:1403:5:1403:13 | S |
-| main.rs:1414:15:1414:15 | x |  | file://:0:0:0:0 | & |
-| main.rs:1414:15:1414:15 | x | &T | main.rs:1403:5:1403:13 | S |
-| main.rs:1414:34:1416:9 | { ... } |  | file://:0:0:0:0 | & |
-| main.rs:1414:34:1416:9 | { ... } | &T | main.rs:1403:5:1403:13 | S |
-| main.rs:1415:13:1415:13 | x |  | file://:0:0:0:0 | & |
-| main.rs:1415:13:1415:13 | x | &T | main.rs:1403:5:1403:13 | S |
-| main.rs:1418:15:1418:15 | x |  | file://:0:0:0:0 | & |
-| main.rs:1418:15:1418:15 | x | &T | main.rs:1403:5:1403:13 | S |
-| main.rs:1418:34:1420:9 | { ... } |  | file://:0:0:0:0 | & |
-| main.rs:1418:34:1420:9 | { ... } | &T | main.rs:1403:5:1403:13 | S |
-| main.rs:1419:13:1419:16 | &... |  | file://:0:0:0:0 | & |
-| main.rs:1419:13:1419:16 | &... | &T | file://:0:0:0:0 | & |
-| main.rs:1419:13:1419:16 | &... | &T | main.rs:1403:5:1403:13 | S |
-| main.rs:1419:13:1419:16 | &... | &T.&T | file://:0:0:0:0 | & |
-| main.rs:1419:13:1419:16 | &... | &T.&T.&T | file://:0:0:0:0 | & |
-| main.rs:1419:13:1419:16 | &... | &T.&T.&T.&T | main.rs:1403:5:1403:13 | S |
-| main.rs:1419:14:1419:16 | &... |  | file://:0:0:0:0 | & |
-| main.rs:1419:14:1419:16 | &... |  | main.rs:1403:5:1403:13 | S |
-| main.rs:1419:14:1419:16 | &... | &T | file://:0:0:0:0 | & |
-| main.rs:1419:14:1419:16 | &... | &T.&T | file://:0:0:0:0 | & |
-| main.rs:1419:14:1419:16 | &... | &T.&T.&T | main.rs:1403:5:1403:13 | S |
-| main.rs:1419:15:1419:16 | &x |  | file://:0:0:0:0 | & |
-| main.rs:1419:15:1419:16 | &x | &T | file://:0:0:0:0 | & |
-| main.rs:1419:15:1419:16 | &x | &T.&T | main.rs:1403:5:1403:13 | S |
-| main.rs:1419:16:1419:16 | x |  | file://:0:0:0:0 | & |
-| main.rs:1419:16:1419:16 | x | &T | main.rs:1403:5:1403:13 | S |
-| main.rs:1424:13:1424:13 | x |  | main.rs:1403:5:1403:13 | S |
-| main.rs:1424:17:1424:20 | S {...} |  | main.rs:1403:5:1403:13 | S |
-| main.rs:1425:9:1425:9 | x |  | main.rs:1403:5:1403:13 | S |
-| main.rs:1425:9:1425:14 | x.f1() |  | file://:0:0:0:0 | & |
-| main.rs:1425:9:1425:14 | x.f1() | &T | main.rs:1403:5:1403:13 | S |
-| main.rs:1426:9:1426:9 | x |  | main.rs:1403:5:1403:13 | S |
-| main.rs:1426:9:1426:14 | x.f2() |  | file://:0:0:0:0 | & |
-| main.rs:1426:9:1426:14 | x.f2() | &T | main.rs:1403:5:1403:13 | S |
-| main.rs:1427:9:1427:17 | ...::f3(...) |  | file://:0:0:0:0 | & |
-| main.rs:1427:9:1427:17 | ...::f3(...) | &T | main.rs:1403:5:1403:13 | S |
-| main.rs:1427:15:1427:16 | &x |  | file://:0:0:0:0 | & |
-| main.rs:1427:15:1427:16 | &x | &T | main.rs:1403:5:1403:13 | S |
-| main.rs:1427:16:1427:16 | x |  | main.rs:1403:5:1403:13 | S |
-| main.rs:1429:13:1429:13 | n |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1429:17:1429:24 | * ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1429:18:1429:24 | * ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1429:18:1429:24 | * ... |  | file://:0:0:0:0 | & |
-| main.rs:1429:18:1429:24 | * ... | &T | {EXTERNAL LOCATION} | bool |
-| main.rs:1429:19:1429:24 | &... |  | file://:0:0:0:0 | & |
-| main.rs:1429:19:1429:24 | &... | &T | {EXTERNAL LOCATION} | bool |
-| main.rs:1429:19:1429:24 | &... | &T | file://:0:0:0:0 | & |
-| main.rs:1429:19:1429:24 | &... | &T.&T | {EXTERNAL LOCATION} | bool |
-| main.rs:1429:20:1429:24 | &true |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1429:20:1429:24 | &true |  | file://:0:0:0:0 | & |
-| main.rs:1429:20:1429:24 | &true | &T | {EXTERNAL LOCATION} | bool |
-| main.rs:1429:21:1429:24 | true |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1433:17:1433:20 | flag |  | main.rs:1392:5:1395:5 | MyFlag |
-| main.rs:1433:24:1433:41 | ...::default(...) |  | main.rs:1392:5:1395:5 | MyFlag |
-| main.rs:1434:22:1434:30 | &mut flag |  | file://:0:0:0:0 | & |
-| main.rs:1434:22:1434:30 | &mut flag | &T | main.rs:1392:5:1395:5 | MyFlag |
-| main.rs:1434:27:1434:30 | flag |  | main.rs:1392:5:1395:5 | MyFlag |
-| main.rs:1435:18:1435:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1435:18:1435:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1435:18:1435:29 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1435:18:1435:29 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1435:26:1435:29 | flag |  | main.rs:1392:5:1395:5 | MyFlag |
-| main.rs:1450:43:1453:5 | { ... } |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1450:43:1453:5 | { ... } | E | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1450:43:1453:5 | { ... } | T | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1451:13:1451:13 | x |  | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1451:17:1451:30 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1451:17:1451:30 | ...::Ok(...) | T | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1451:17:1451:31 | TryExpr |  | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1451:28:1451:29 | S1 |  | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1452:9:1452:22 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1452:9:1452:22 | ...::Ok(...) | E | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1452:9:1452:22 | ...::Ok(...) | T | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1452:20:1452:21 | S1 |  | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1457:46:1461:5 | { ... } |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1457:46:1461:5 | { ... } | E | main.rs:1445:5:1446:14 | S2 |
-| main.rs:1457:46:1461:5 | { ... } | T | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1458:13:1458:13 | x |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1458:13:1458:13 | x | T | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1458:17:1458:30 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1458:17:1458:30 | ...::Ok(...) | T | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1458:28:1458:29 | S1 |  | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1459:13:1459:13 | y |  | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1459:17:1459:17 | x |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1459:17:1459:17 | x | T | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1459:17:1459:18 | TryExpr |  | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1460:9:1460:22 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1460:9:1460:22 | ...::Ok(...) | E | main.rs:1445:5:1446:14 | S2 |
-| main.rs:1460:9:1460:22 | ...::Ok(...) | T | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1460:20:1460:21 | S1 |  | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1465:40:1470:5 | { ... } |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1465:40:1470:5 | { ... } | E | main.rs:1445:5:1446:14 | S2 |
-| main.rs:1465:40:1470:5 | { ... } | T | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1466:13:1466:13 | x |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1466:13:1466:13 | x | T | {EXTERNAL LOCATION} | Result |
-| main.rs:1466:13:1466:13 | x | T.T | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1466:17:1466:42 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1466:17:1466:42 | ...::Ok(...) | T | {EXTERNAL LOCATION} | Result |
-| main.rs:1466:17:1466:42 | ...::Ok(...) | T.T | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1466:28:1466:41 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1466:28:1466:41 | ...::Ok(...) | T | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1466:39:1466:40 | S1 |  | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1468:17:1468:17 | x |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1468:17:1468:17 | x | T | {EXTERNAL LOCATION} | Result |
-| main.rs:1468:17:1468:17 | x | T.T | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1468:17:1468:18 | TryExpr |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1468:17:1468:18 | TryExpr | T | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1468:17:1468:29 | ... .map(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1468:24:1468:28 | \|...\| s |  | {EXTERNAL LOCATION} | dyn FnOnce |
-| main.rs:1468:24:1468:28 | \|...\| s | dyn(Args) | file://:0:0:0:0 | (T_1) |
-| main.rs:1469:9:1469:22 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1469:9:1469:22 | ...::Ok(...) | E | main.rs:1445:5:1446:14 | S2 |
-| main.rs:1469:9:1469:22 | ...::Ok(...) | T | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1469:20:1469:21 | S1 |  | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1474:30:1474:34 | input |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1474:30:1474:34 | input | E | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1474:30:1474:34 | input | T | main.rs:1474:20:1474:27 | T |
-| main.rs:1474:69:1481:5 | { ... } |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1474:69:1481:5 | { ... } | E | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1474:69:1481:5 | { ... } | T | main.rs:1474:20:1474:27 | T |
-| main.rs:1475:13:1475:17 | value |  | main.rs:1474:20:1474:27 | T |
-| main.rs:1475:21:1475:25 | input |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1475:21:1475:25 | input | E | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1475:21:1475:25 | input | T | main.rs:1474:20:1474:27 | T |
-| main.rs:1475:21:1475:26 | TryExpr |  | main.rs:1474:20:1474:27 | T |
-| main.rs:1476:22:1476:38 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1476:22:1476:38 | ...::Ok(...) | E | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1476:22:1476:38 | ...::Ok(...) | T | main.rs:1474:20:1474:27 | T |
-| main.rs:1476:22:1479:10 | ... .and_then(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1476:22:1479:10 | ... .and_then(...) | E | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1476:33:1476:37 | value |  | main.rs:1474:20:1474:27 | T |
-| main.rs:1476:49:1479:9 | \|...\| ... |  | {EXTERNAL LOCATION} | dyn FnOnce |
-| main.rs:1476:49:1479:9 | \|...\| ... | dyn(Args) | file://:0:0:0:0 | (T_1) |
-| main.rs:1476:49:1479:9 | \|...\| ... | dyn(Output) | {EXTERNAL LOCATION} | Result |
-| main.rs:1476:49:1479:9 | \|...\| ... | dyn(Output).E | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1476:53:1479:9 | { ... } |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1476:53:1479:9 | { ... } | E | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1477:22:1477:27 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1477:22:1477:27 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1477:22:1477:30 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1477:22:1477:30 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1478:13:1478:34 | ...::Ok::<...>(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1478:13:1478:34 | ...::Ok::<...>(...) | E | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1480:9:1480:23 | ...::Err(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1480:9:1480:23 | ...::Err(...) | E | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1480:9:1480:23 | ...::Err(...) | T | main.rs:1474:20:1474:27 | T |
-| main.rs:1480:21:1480:22 | S1 |  | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1485:16:1485:33 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1485:16:1485:33 | ...::Ok(...) | E | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1485:16:1485:33 | ...::Ok(...) | T | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1485:27:1485:32 | result |  | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1485:37:1485:52 | try_same_error(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1485:37:1485:52 | try_same_error(...) | E | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1485:37:1485:52 | try_same_error(...) | T | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1486:22:1486:27 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1486:22:1486:27 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1486:22:1486:35 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1486:22:1486:35 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1486:30:1486:35 | result |  | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1489:16:1489:33 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1489:16:1489:33 | ...::Ok(...) | E | main.rs:1445:5:1446:14 | S2 |
-| main.rs:1489:16:1489:33 | ...::Ok(...) | T | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1489:27:1489:32 | result |  | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1489:37:1489:55 | try_convert_error(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1489:37:1489:55 | try_convert_error(...) | E | main.rs:1445:5:1446:14 | S2 |
-| main.rs:1489:37:1489:55 | try_convert_error(...) | T | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1490:22:1490:27 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1490:22:1490:27 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1490:22:1490:35 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1490:22:1490:35 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1490:30:1490:35 | result |  | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1493:16:1493:33 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1493:16:1493:33 | ...::Ok(...) | E | main.rs:1445:5:1446:14 | S2 |
-| main.rs:1493:16:1493:33 | ...::Ok(...) | T | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1493:27:1493:32 | result |  | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1493:37:1493:49 | try_chained(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1493:37:1493:49 | try_chained(...) | E | main.rs:1445:5:1446:14 | S2 |
-| main.rs:1493:37:1493:49 | try_chained(...) | T | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1494:22:1494:27 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1494:22:1494:27 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1494:22:1494:35 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1494:22:1494:35 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1494:30:1494:35 | result |  | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1497:16:1497:33 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1497:16:1497:33 | ...::Ok(...) | E | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1497:16:1497:33 | ...::Ok(...) | T | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1497:27:1497:32 | result |  | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1497:37:1497:63 | try_complex(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1497:37:1497:63 | try_complex(...) | E | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1497:37:1497:63 | try_complex(...) | T | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1497:49:1497:62 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1497:49:1497:62 | ...::Ok(...) | E | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1497:49:1497:62 | ...::Ok(...) | T | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1497:60:1497:61 | S1 |  | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1498:22:1498:27 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1498:22:1498:27 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1498:22:1498:35 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1498:22:1498:35 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1498:30:1498:35 | result |  | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1505:13:1505:13 | x |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1505:22:1505:22 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1506:13:1506:13 | y |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1506:17:1506:17 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1507:13:1507:13 | z |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1507:17:1507:17 | x |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1507:17:1507:21 | ... + ... |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1507:21:1507:21 | y |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1508:13:1508:13 | z |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1508:17:1508:17 | x |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1508:17:1508:23 | x.abs() |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1509:13:1509:13 | c |  | {EXTERNAL LOCATION} | char |
-| main.rs:1509:17:1509:19 | 'c' |  | {EXTERNAL LOCATION} | char |
-| main.rs:1510:13:1510:17 | hello |  | file://:0:0:0:0 | & |
-| main.rs:1510:13:1510:17 | hello | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1510:21:1510:27 | "Hello" |  | file://:0:0:0:0 | & |
-| main.rs:1510:21:1510:27 | "Hello" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1511:13:1511:13 | f |  | {EXTERNAL LOCATION} | f64 |
-| main.rs:1511:17:1511:24 | 123.0f64 |  | {EXTERNAL LOCATION} | f64 |
-| main.rs:1512:13:1512:13 | t |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1512:17:1512:20 | true |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1513:13:1513:13 | f |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1513:17:1513:21 | false |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1520:13:1520:13 | x |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1520:17:1520:20 | true |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1520:17:1520:29 | ... && ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1520:25:1520:29 | false |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1521:13:1521:13 | y |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1521:17:1521:20 | true |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1521:17:1521:29 | ... \|\| ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1521:25:1521:29 | false |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1523:17:1523:17 | a |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1524:13:1524:16 | cond |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1524:20:1524:21 | 34 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1524:20:1524:27 | ... == ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1524:26:1524:27 | 33 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1525:12:1525:15 | cond |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1526:17:1526:17 | z |  | file://:0:0:0:0 | () |
-| main.rs:1526:21:1526:27 | (...) |  | file://:0:0:0:0 | () |
-| main.rs:1526:22:1526:22 | a |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1526:22:1526:26 | ... = ... |  | file://:0:0:0:0 | () |
-| main.rs:1526:26:1526:26 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1528:13:1528:13 | a |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1528:13:1528:17 | ... = ... |  | file://:0:0:0:0 | () |
-| main.rs:1528:17:1528:17 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1530:9:1530:9 | a |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1544:30:1546:9 | { ... } |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1545:13:1545:31 | Vec2 {...} |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1545:23:1545:23 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1545:23:1545:23 | 0 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1545:29:1545:29 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1545:29:1545:29 | 0 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1552:16:1552:19 | SelfParam |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1552:22:1552:24 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1552:41:1557:9 | { ... } |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1553:13:1556:13 | Vec2 {...} |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1554:20:1554:23 | self |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1554:20:1554:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1554:20:1554:33 | ... + ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1554:29:1554:31 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1554:29:1554:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1555:20:1555:23 | self |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1555:20:1555:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1555:20:1555:33 | ... + ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1555:29:1555:31 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1555:29:1555:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1562:23:1562:31 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1562:23:1562:31 | SelfParam | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1562:34:1562:36 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1563:13:1563:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1563:13:1563:16 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1563:13:1563:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1563:13:1563:27 | ... += ... |  | file://:0:0:0:0 | () |
-| main.rs:1563:23:1563:25 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1563:23:1563:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1564:13:1564:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1564:13:1564:16 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1564:13:1564:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1564:13:1564:27 | ... += ... |  | file://:0:0:0:0 | () |
-| main.rs:1564:23:1564:25 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1564:23:1564:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1570:16:1570:19 | SelfParam |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1570:22:1570:24 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1570:41:1575:9 | { ... } |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1571:13:1574:13 | Vec2 {...} |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1572:20:1572:23 | self |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1572:20:1572:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1572:20:1572:33 | ... - ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1572:29:1572:31 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1572:29:1572:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1573:20:1573:23 | self |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1573:20:1573:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1573:20:1573:33 | ... - ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1573:29:1573:31 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1573:29:1573:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1580:23:1580:31 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1580:23:1580:31 | SelfParam | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1580:34:1580:36 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1581:13:1581:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1581:13:1581:16 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1581:13:1581:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1581:13:1581:27 | ... -= ... |  | file://:0:0:0:0 | () |
-| main.rs:1581:23:1581:25 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1581:23:1581:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1219:18:1219:31 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:1219:18:1219:31 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1219:26:1219:26 | y |  | main.rs:1130:5:1133:5 | MyThing |
+| main.rs:1219:26:1219:26 | y | A | main.rs:1142:5:1143:14 | S2 |
+| main.rs:1219:26:1219:31 | y.m2() |  | main.rs:1142:5:1143:14 | S2 |
+| main.rs:1221:13:1221:13 | x |  | main.rs:1135:5:1138:5 | MyThing2 |
+| main.rs:1221:13:1221:13 | x | A | main.rs:1140:5:1141:14 | S1 |
+| main.rs:1221:17:1221:34 | MyThing2 {...} |  | main.rs:1135:5:1138:5 | MyThing2 |
+| main.rs:1221:17:1221:34 | MyThing2 {...} | A | main.rs:1140:5:1141:14 | S1 |
+| main.rs:1221:31:1221:32 | S1 |  | main.rs:1140:5:1141:14 | S1 |
+| main.rs:1222:13:1222:13 | y |  | main.rs:1135:5:1138:5 | MyThing2 |
+| main.rs:1222:13:1222:13 | y | A | main.rs:1142:5:1143:14 | S2 |
+| main.rs:1222:17:1222:34 | MyThing2 {...} |  | main.rs:1135:5:1138:5 | MyThing2 |
+| main.rs:1222:17:1222:34 | MyThing2 {...} | A | main.rs:1142:5:1143:14 | S2 |
+| main.rs:1222:31:1222:32 | S2 |  | main.rs:1142:5:1143:14 | S2 |
+| main.rs:1224:18:1224:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1224:18:1224:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1224:18:1224:31 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:1224:18:1224:31 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1224:26:1224:26 | x |  | main.rs:1135:5:1138:5 | MyThing2 |
+| main.rs:1224:26:1224:26 | x | A | main.rs:1140:5:1141:14 | S1 |
+| main.rs:1224:26:1224:31 | x.m3() |  | main.rs:1140:5:1141:14 | S1 |
+| main.rs:1225:18:1225:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1225:18:1225:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1225:18:1225:31 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:1225:18:1225:31 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1225:26:1225:26 | y |  | main.rs:1135:5:1138:5 | MyThing2 |
+| main.rs:1225:26:1225:26 | y | A | main.rs:1142:5:1143:14 | S2 |
+| main.rs:1225:26:1225:31 | y.m3() |  | main.rs:1142:5:1143:14 | S2 |
+| main.rs:1227:13:1227:13 | x |  | main.rs:1130:5:1133:5 | MyThing |
+| main.rs:1227:13:1227:13 | x | A | main.rs:1140:5:1141:14 | S1 |
+| main.rs:1227:17:1227:33 | MyThing {...} |  | main.rs:1130:5:1133:5 | MyThing |
+| main.rs:1227:17:1227:33 | MyThing {...} | A | main.rs:1140:5:1141:14 | S1 |
+| main.rs:1227:30:1227:31 | S1 |  | main.rs:1140:5:1141:14 | S1 |
+| main.rs:1228:13:1228:13 | s |  | main.rs:1140:5:1141:14 | S1 |
+| main.rs:1228:17:1228:32 | call_trait_m1(...) |  | main.rs:1140:5:1141:14 | S1 |
+| main.rs:1228:31:1228:31 | x |  | main.rs:1130:5:1133:5 | MyThing |
+| main.rs:1228:31:1228:31 | x | A | main.rs:1140:5:1141:14 | S1 |
+| main.rs:1230:13:1230:13 | x |  | main.rs:1135:5:1138:5 | MyThing2 |
+| main.rs:1230:13:1230:13 | x | A | main.rs:1142:5:1143:14 | S2 |
+| main.rs:1230:17:1230:34 | MyThing2 {...} |  | main.rs:1135:5:1138:5 | MyThing2 |
+| main.rs:1230:17:1230:34 | MyThing2 {...} | A | main.rs:1142:5:1143:14 | S2 |
+| main.rs:1230:31:1230:32 | S2 |  | main.rs:1142:5:1143:14 | S2 |
+| main.rs:1231:13:1231:13 | s |  | main.rs:1130:5:1133:5 | MyThing |
+| main.rs:1231:13:1231:13 | s | A | main.rs:1142:5:1143:14 | S2 |
+| main.rs:1231:17:1231:32 | call_trait_m1(...) |  | main.rs:1130:5:1133:5 | MyThing |
+| main.rs:1231:17:1231:32 | call_trait_m1(...) | A | main.rs:1142:5:1143:14 | S2 |
+| main.rs:1231:31:1231:31 | x |  | main.rs:1135:5:1138:5 | MyThing2 |
+| main.rs:1231:31:1231:31 | x | A | main.rs:1142:5:1143:14 | S2 |
+| main.rs:1248:22:1248:22 | x |  | file://:0:0:0:0 | & |
+| main.rs:1248:22:1248:22 | x | &T | main.rs:1248:11:1248:19 | T |
+| main.rs:1248:35:1250:5 | { ... } |  | file://:0:0:0:0 | & |
+| main.rs:1248:35:1250:5 | { ... } | &T | main.rs:1248:11:1248:19 | T |
+| main.rs:1249:9:1249:9 | x |  | file://:0:0:0:0 | & |
+| main.rs:1249:9:1249:9 | x | &T | main.rs:1248:11:1248:19 | T |
+| main.rs:1253:17:1253:20 | SelfParam |  | main.rs:1238:5:1239:14 | S1 |
+| main.rs:1253:29:1255:9 | { ... } |  | main.rs:1241:5:1242:14 | S2 |
+| main.rs:1254:13:1254:14 | S2 |  | main.rs:1241:5:1242:14 | S2 |
+| main.rs:1258:21:1258:21 | x |  | main.rs:1258:13:1258:14 | T1 |
+| main.rs:1261:5:1263:5 | { ... } |  | main.rs:1258:17:1258:18 | T2 |
+| main.rs:1262:9:1262:9 | x |  | main.rs:1258:13:1258:14 | T1 |
+| main.rs:1262:9:1262:16 | x.into() |  | main.rs:1258:17:1258:18 | T2 |
+| main.rs:1265:16:1281:5 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1266:13:1266:13 | x |  | main.rs:1238:5:1239:14 | S1 |
+| main.rs:1266:17:1266:18 | S1 |  | main.rs:1238:5:1239:14 | S1 |
+| main.rs:1267:18:1267:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1267:18:1267:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1267:18:1267:31 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:1267:18:1267:31 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1267:26:1267:31 | id(...) |  | file://:0:0:0:0 | & |
+| main.rs:1267:26:1267:31 | id(...) | &T | main.rs:1238:5:1239:14 | S1 |
+| main.rs:1267:29:1267:30 | &x |  | file://:0:0:0:0 | & |
+| main.rs:1267:29:1267:30 | &x | &T | main.rs:1238:5:1239:14 | S1 |
+| main.rs:1267:30:1267:30 | x |  | main.rs:1238:5:1239:14 | S1 |
+| main.rs:1269:13:1269:13 | x |  | main.rs:1238:5:1239:14 | S1 |
+| main.rs:1269:17:1269:18 | S1 |  | main.rs:1238:5:1239:14 | S1 |
+| main.rs:1270:18:1270:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1270:18:1270:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1270:18:1270:37 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:1270:18:1270:37 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1270:26:1270:37 | id::<...>(...) |  | file://:0:0:0:0 | & |
+| main.rs:1270:26:1270:37 | id::<...>(...) | &T | main.rs:1238:5:1239:14 | S1 |
+| main.rs:1270:35:1270:36 | &x |  | file://:0:0:0:0 | & |
+| main.rs:1270:35:1270:36 | &x | &T | main.rs:1238:5:1239:14 | S1 |
+| main.rs:1270:36:1270:36 | x |  | main.rs:1238:5:1239:14 | S1 |
+| main.rs:1272:13:1272:13 | x |  | main.rs:1238:5:1239:14 | S1 |
+| main.rs:1272:17:1272:18 | S1 |  | main.rs:1238:5:1239:14 | S1 |
+| main.rs:1274:18:1274:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1274:18:1274:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1274:18:1274:44 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:1274:18:1274:44 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1274:26:1274:44 | id::<...>(...) |  | file://:0:0:0:0 | & |
+| main.rs:1274:26:1274:44 | id::<...>(...) | &T | main.rs:1244:5:1244:25 | dyn Trait |
+| main.rs:1274:42:1274:43 | &x |  | file://:0:0:0:0 | & |
+| main.rs:1274:42:1274:43 | &x | &T | main.rs:1238:5:1239:14 | S1 |
+| main.rs:1274:43:1274:43 | x |  | main.rs:1238:5:1239:14 | S1 |
+| main.rs:1276:13:1276:13 | x |  | main.rs:1238:5:1239:14 | S1 |
+| main.rs:1276:17:1276:18 | S1 |  | main.rs:1238:5:1239:14 | S1 |
+| main.rs:1277:9:1277:25 | into::<...>(...) |  | main.rs:1241:5:1242:14 | S2 |
+| main.rs:1277:24:1277:24 | x |  | main.rs:1238:5:1239:14 | S1 |
+| main.rs:1279:13:1279:13 | x |  | main.rs:1238:5:1239:14 | S1 |
+| main.rs:1279:17:1279:18 | S1 |  | main.rs:1238:5:1239:14 | S1 |
+| main.rs:1280:13:1280:13 | y |  | main.rs:1241:5:1242:14 | S2 |
+| main.rs:1280:21:1280:27 | into(...) |  | main.rs:1241:5:1242:14 | S2 |
+| main.rs:1280:26:1280:26 | x |  | main.rs:1238:5:1239:14 | S1 |
+| main.rs:1294:22:1294:25 | SelfParam |  | main.rs:1285:5:1291:5 | PairOption |
+| main.rs:1294:22:1294:25 | SelfParam | Fst | main.rs:1293:10:1293:12 | Fst |
+| main.rs:1294:22:1294:25 | SelfParam | Snd | main.rs:1293:15:1293:17 | Snd |
+| main.rs:1294:35:1301:9 | { ... } |  | main.rs:1293:15:1293:17 | Snd |
+| main.rs:1295:13:1300:13 | match self { ... } |  | file://:0:0:0:0 | ! |
+| main.rs:1295:13:1300:13 | match self { ... } |  | main.rs:1293:15:1293:17 | Snd |
+| main.rs:1295:19:1295:22 | self |  | main.rs:1285:5:1291:5 | PairOption |
+| main.rs:1295:19:1295:22 | self | Fst | main.rs:1293:10:1293:12 | Fst |
+| main.rs:1295:19:1295:22 | self | Snd | main.rs:1293:15:1293:17 | Snd |
+| main.rs:1296:17:1296:38 | ...::PairNone(...) |  | main.rs:1285:5:1291:5 | PairOption |
+| main.rs:1296:17:1296:38 | ...::PairNone(...) | Fst | main.rs:1293:10:1293:12 | Fst |
+| main.rs:1296:17:1296:38 | ...::PairNone(...) | Snd | main.rs:1293:15:1293:17 | Snd |
+| main.rs:1296:43:1296:82 | MacroExpr |  | file://:0:0:0:0 | ! |
+| main.rs:1296:50:1296:81 | "PairNone has no second elemen... |  | file://:0:0:0:0 | & |
+| main.rs:1296:50:1296:81 | "PairNone has no second elemen... | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1296:50:1296:81 | ...::panic_fmt(...) |  | file://:0:0:0:0 | ! |
+| main.rs:1296:50:1296:81 | MacroExpr |  | file://:0:0:0:0 | () |
+| main.rs:1296:50:1296:81 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1297:17:1297:38 | ...::PairFst(...) |  | main.rs:1285:5:1291:5 | PairOption |
+| main.rs:1297:17:1297:38 | ...::PairFst(...) | Fst | main.rs:1293:10:1293:12 | Fst |
+| main.rs:1297:17:1297:38 | ...::PairFst(...) | Snd | main.rs:1293:15:1293:17 | Snd |
+| main.rs:1297:37:1297:37 | _ |  | main.rs:1293:10:1293:12 | Fst |
+| main.rs:1297:43:1297:81 | MacroExpr |  | file://:0:0:0:0 | ! |
+| main.rs:1297:50:1297:80 | "PairFst has no second element... |  | file://:0:0:0:0 | & |
+| main.rs:1297:50:1297:80 | "PairFst has no second element... | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1297:50:1297:80 | ...::panic_fmt(...) |  | file://:0:0:0:0 | ! |
+| main.rs:1297:50:1297:80 | MacroExpr |  | file://:0:0:0:0 | () |
+| main.rs:1297:50:1297:80 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1298:17:1298:40 | ...::PairSnd(...) |  | main.rs:1285:5:1291:5 | PairOption |
+| main.rs:1298:17:1298:40 | ...::PairSnd(...) | Fst | main.rs:1293:10:1293:12 | Fst |
+| main.rs:1298:17:1298:40 | ...::PairSnd(...) | Snd | main.rs:1293:15:1293:17 | Snd |
+| main.rs:1298:37:1298:39 | snd |  | main.rs:1293:15:1293:17 | Snd |
+| main.rs:1298:45:1298:47 | snd |  | main.rs:1293:15:1293:17 | Snd |
+| main.rs:1299:17:1299:44 | ...::PairBoth(...) |  | main.rs:1285:5:1291:5 | PairOption |
+| main.rs:1299:17:1299:44 | ...::PairBoth(...) | Fst | main.rs:1293:10:1293:12 | Fst |
+| main.rs:1299:17:1299:44 | ...::PairBoth(...) | Snd | main.rs:1293:15:1293:17 | Snd |
+| main.rs:1299:38:1299:38 | _ |  | main.rs:1293:10:1293:12 | Fst |
+| main.rs:1299:41:1299:43 | snd |  | main.rs:1293:15:1293:17 | Snd |
+| main.rs:1299:49:1299:51 | snd |  | main.rs:1293:15:1293:17 | Snd |
+| main.rs:1325:10:1325:10 | t |  | main.rs:1285:5:1291:5 | PairOption |
+| main.rs:1325:10:1325:10 | t | Fst | main.rs:1307:5:1308:14 | S2 |
+| main.rs:1325:10:1325:10 | t | Snd | main.rs:1285:5:1291:5 | PairOption |
+| main.rs:1325:10:1325:10 | t | Snd.Fst | main.rs:1307:5:1308:14 | S2 |
+| main.rs:1325:10:1325:10 | t | Snd.Snd | main.rs:1310:5:1311:14 | S3 |
+| main.rs:1325:30:1328:5 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1326:13:1326:13 | x |  | main.rs:1310:5:1311:14 | S3 |
+| main.rs:1326:17:1326:17 | t |  | main.rs:1285:5:1291:5 | PairOption |
+| main.rs:1326:17:1326:17 | t | Fst | main.rs:1307:5:1308:14 | S2 |
+| main.rs:1326:17:1326:17 | t | Snd | main.rs:1285:5:1291:5 | PairOption |
+| main.rs:1326:17:1326:17 | t | Snd.Fst | main.rs:1307:5:1308:14 | S2 |
+| main.rs:1326:17:1326:17 | t | Snd.Snd | main.rs:1310:5:1311:14 | S3 |
+| main.rs:1326:17:1326:29 | t.unwrapSnd() |  | main.rs:1285:5:1291:5 | PairOption |
+| main.rs:1326:17:1326:29 | t.unwrapSnd() | Fst | main.rs:1307:5:1308:14 | S2 |
+| main.rs:1326:17:1326:29 | t.unwrapSnd() | Snd | main.rs:1310:5:1311:14 | S3 |
+| main.rs:1326:17:1326:41 | ... .unwrapSnd() |  | main.rs:1310:5:1311:14 | S3 |
+| main.rs:1327:18:1327:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1327:18:1327:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1327:18:1327:26 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:1327:18:1327:26 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1327:26:1327:26 | x |  | main.rs:1310:5:1311:14 | S3 |
+| main.rs:1342:22:1342:25 | SelfParam |  | main.rs:1340:5:1343:5 | Self [trait TraitWithAssocType] |
+| main.rs:1350:22:1350:25 | SelfParam |  | main.rs:1338:5:1338:28 | GenS |
+| main.rs:1350:22:1350:25 | SelfParam | GenT | main.rs:1345:10:1345:15 | Output |
+| main.rs:1350:44:1352:9 | { ... } |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1350:44:1352:9 | { ... } | E | main.rs:1345:10:1345:15 | Output |
+| main.rs:1350:44:1352:9 | { ... } | T | main.rs:1345:10:1345:15 | Output |
+| main.rs:1351:13:1351:22 | Ok(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1351:13:1351:22 | Ok(...) | E | main.rs:1345:10:1345:15 | Output |
+| main.rs:1351:13:1351:22 | Ok(...) | T | main.rs:1345:10:1345:15 | Output |
+| main.rs:1351:16:1351:19 | self |  | main.rs:1338:5:1338:28 | GenS |
+| main.rs:1351:16:1351:19 | self | GenT | main.rs:1345:10:1345:15 | Output |
+| main.rs:1351:16:1351:21 | self.0 |  | main.rs:1345:10:1345:15 | Output |
+| main.rs:1355:16:1377:5 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1357:13:1357:14 | p1 |  | main.rs:1285:5:1291:5 | PairOption |
+| main.rs:1357:13:1357:14 | p1 | Fst | main.rs:1304:5:1305:14 | S1 |
+| main.rs:1357:13:1357:14 | p1 | Snd | main.rs:1307:5:1308:14 | S2 |
+| main.rs:1357:26:1357:53 | ...::PairBoth(...) |  | main.rs:1285:5:1291:5 | PairOption |
+| main.rs:1357:26:1357:53 | ...::PairBoth(...) | Fst | main.rs:1304:5:1305:14 | S1 |
+| main.rs:1357:26:1357:53 | ...::PairBoth(...) | Snd | main.rs:1307:5:1308:14 | S2 |
+| main.rs:1357:47:1357:48 | S1 |  | main.rs:1304:5:1305:14 | S1 |
+| main.rs:1357:51:1357:52 | S2 |  | main.rs:1307:5:1308:14 | S2 |
+| main.rs:1358:18:1358:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1358:18:1358:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1358:18:1358:27 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:1358:18:1358:27 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1358:26:1358:27 | p1 |  | main.rs:1285:5:1291:5 | PairOption |
+| main.rs:1358:26:1358:27 | p1 | Fst | main.rs:1304:5:1305:14 | S1 |
+| main.rs:1358:26:1358:27 | p1 | Snd | main.rs:1307:5:1308:14 | S2 |
+| main.rs:1361:13:1361:14 | p2 |  | main.rs:1285:5:1291:5 | PairOption |
+| main.rs:1361:13:1361:14 | p2 | Fst | main.rs:1304:5:1305:14 | S1 |
+| main.rs:1361:13:1361:14 | p2 | Snd | main.rs:1307:5:1308:14 | S2 |
+| main.rs:1361:26:1361:47 | ...::PairNone(...) |  | main.rs:1285:5:1291:5 | PairOption |
+| main.rs:1361:26:1361:47 | ...::PairNone(...) | Fst | main.rs:1304:5:1305:14 | S1 |
+| main.rs:1361:26:1361:47 | ...::PairNone(...) | Snd | main.rs:1307:5:1308:14 | S2 |
+| main.rs:1362:18:1362:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1362:18:1362:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1362:18:1362:27 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:1362:18:1362:27 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1362:26:1362:27 | p2 |  | main.rs:1285:5:1291:5 | PairOption |
+| main.rs:1362:26:1362:27 | p2 | Fst | main.rs:1304:5:1305:14 | S1 |
+| main.rs:1362:26:1362:27 | p2 | Snd | main.rs:1307:5:1308:14 | S2 |
+| main.rs:1365:13:1365:14 | p3 |  | main.rs:1285:5:1291:5 | PairOption |
+| main.rs:1365:13:1365:14 | p3 | Fst | main.rs:1307:5:1308:14 | S2 |
+| main.rs:1365:13:1365:14 | p3 | Snd | main.rs:1310:5:1311:14 | S3 |
+| main.rs:1365:34:1365:56 | ...::PairSnd(...) |  | main.rs:1285:5:1291:5 | PairOption |
+| main.rs:1365:34:1365:56 | ...::PairSnd(...) | Fst | main.rs:1307:5:1308:14 | S2 |
+| main.rs:1365:34:1365:56 | ...::PairSnd(...) | Snd | main.rs:1310:5:1311:14 | S3 |
+| main.rs:1365:54:1365:55 | S3 |  | main.rs:1310:5:1311:14 | S3 |
+| main.rs:1366:18:1366:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1366:18:1366:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1366:18:1366:27 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:1366:18:1366:27 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1366:26:1366:27 | p3 |  | main.rs:1285:5:1291:5 | PairOption |
+| main.rs:1366:26:1366:27 | p3 | Fst | main.rs:1307:5:1308:14 | S2 |
+| main.rs:1366:26:1366:27 | p3 | Snd | main.rs:1310:5:1311:14 | S3 |
+| main.rs:1369:13:1369:14 | p3 |  | main.rs:1285:5:1291:5 | PairOption |
+| main.rs:1369:13:1369:14 | p3 | Fst | main.rs:1307:5:1308:14 | S2 |
+| main.rs:1369:13:1369:14 | p3 | Snd | main.rs:1310:5:1311:14 | S3 |
+| main.rs:1369:35:1369:56 | ...::PairNone(...) |  | main.rs:1285:5:1291:5 | PairOption |
+| main.rs:1369:35:1369:56 | ...::PairNone(...) | Fst | main.rs:1307:5:1308:14 | S2 |
+| main.rs:1369:35:1369:56 | ...::PairNone(...) | Snd | main.rs:1310:5:1311:14 | S3 |
+| main.rs:1370:18:1370:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1370:18:1370:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1370:18:1370:27 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:1370:18:1370:27 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1370:26:1370:27 | p3 |  | main.rs:1285:5:1291:5 | PairOption |
+| main.rs:1370:26:1370:27 | p3 | Fst | main.rs:1307:5:1308:14 | S2 |
+| main.rs:1370:26:1370:27 | p3 | Snd | main.rs:1310:5:1311:14 | S3 |
+| main.rs:1372:9:1372:55 | g(...) |  | file://:0:0:0:0 | () |
+| main.rs:1372:11:1372:54 | ...::PairSnd(...) |  | main.rs:1285:5:1291:5 | PairOption |
+| main.rs:1372:11:1372:54 | ...::PairSnd(...) | Fst | main.rs:1307:5:1308:14 | S2 |
+| main.rs:1372:11:1372:54 | ...::PairSnd(...) | Snd | main.rs:1285:5:1291:5 | PairOption |
+| main.rs:1372:11:1372:54 | ...::PairSnd(...) | Snd.Fst | main.rs:1307:5:1308:14 | S2 |
+| main.rs:1372:11:1372:54 | ...::PairSnd(...) | Snd.Snd | main.rs:1310:5:1311:14 | S3 |
+| main.rs:1372:31:1372:53 | ...::PairSnd(...) |  | main.rs:1285:5:1291:5 | PairOption |
+| main.rs:1372:31:1372:53 | ...::PairSnd(...) | Fst | main.rs:1307:5:1308:14 | S2 |
+| main.rs:1372:31:1372:53 | ...::PairSnd(...) | Snd | main.rs:1310:5:1311:14 | S3 |
+| main.rs:1372:51:1372:52 | S3 |  | main.rs:1310:5:1311:14 | S3 |
+| main.rs:1374:13:1374:13 | x |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1374:13:1374:13 | x | E | main.rs:1304:5:1305:14 | S1 |
+| main.rs:1374:13:1374:13 | x | T | main.rs:1330:5:1330:34 | S4 |
+| main.rs:1374:13:1374:13 | x | T.T41 | main.rs:1307:5:1308:14 | S2 |
+| main.rs:1374:13:1374:13 | x | T.T42 | main.rs:1332:5:1332:22 | S5 |
+| main.rs:1374:13:1374:13 | x | T.T42.T5 | main.rs:1307:5:1308:14 | S2 |
+| main.rs:1376:13:1376:13 | y |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1376:13:1376:13 | y | E | {EXTERNAL LOCATION} | bool |
+| main.rs:1376:13:1376:13 | y | T | {EXTERNAL LOCATION} | bool |
+| main.rs:1376:17:1376:26 | GenS(...) |  | main.rs:1338:5:1338:28 | GenS |
+| main.rs:1376:17:1376:26 | GenS(...) | GenT | {EXTERNAL LOCATION} | bool |
+| main.rs:1376:17:1376:38 | ... .get_input() |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1376:17:1376:38 | ... .get_input() | E | {EXTERNAL LOCATION} | bool |
+| main.rs:1376:17:1376:38 | ... .get_input() | T | {EXTERNAL LOCATION} | bool |
+| main.rs:1376:22:1376:25 | true |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1389:16:1389:24 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1389:16:1389:24 | SelfParam | &T | main.rs:1387:5:1394:5 | Self [trait MyTrait] |
+| main.rs:1389:27:1389:31 | value |  | main.rs:1387:19:1387:19 | S |
+| main.rs:1391:21:1391:29 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1391:21:1391:29 | SelfParam | &T | main.rs:1387:5:1394:5 | Self [trait MyTrait] |
+| main.rs:1391:32:1391:36 | value |  | main.rs:1387:19:1387:19 | S |
+| main.rs:1391:42:1393:9 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1392:13:1392:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1392:13:1392:16 | self | &T | main.rs:1387:5:1394:5 | Self [trait MyTrait] |
+| main.rs:1392:13:1392:27 | self.set(...) |  | file://:0:0:0:0 | () |
+| main.rs:1392:22:1392:26 | value |  | main.rs:1387:19:1387:19 | S |
+| main.rs:1398:16:1398:24 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1398:16:1398:24 | SelfParam | &T | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1398:16:1398:24 | SelfParam | &T.T | main.rs:1396:10:1396:10 | T |
+| main.rs:1398:27:1398:31 | value |  | main.rs:1396:10:1396:10 | T |
+| main.rs:1398:37:1398:38 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1402:26:1404:9 | { ... } |  | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1402:26:1404:9 | { ... } | T | main.rs:1401:10:1401:10 | T |
+| main.rs:1403:13:1403:30 | ...::MyNone(...) |  | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1403:13:1403:30 | ...::MyNone(...) | T | main.rs:1401:10:1401:10 | T |
+| main.rs:1408:20:1408:23 | SelfParam |  | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1408:20:1408:23 | SelfParam | T | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1408:20:1408:23 | SelfParam | T.T | main.rs:1407:10:1407:10 | T |
+| main.rs:1408:41:1413:9 | { ... } |  | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1408:41:1413:9 | { ... } | T | main.rs:1407:10:1407:10 | T |
+| main.rs:1409:13:1412:13 | match self { ... } |  | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1409:13:1412:13 | match self { ... } | T | main.rs:1407:10:1407:10 | T |
+| main.rs:1409:19:1409:22 | self |  | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1409:19:1409:22 | self | T | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1409:19:1409:22 | self | T.T | main.rs:1407:10:1407:10 | T |
+| main.rs:1410:17:1410:34 | ...::MyNone(...) |  | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1410:17:1410:34 | ...::MyNone(...) | T | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1410:17:1410:34 | ...::MyNone(...) | T.T | main.rs:1407:10:1407:10 | T |
+| main.rs:1410:39:1410:56 | ...::MyNone(...) |  | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1410:39:1410:56 | ...::MyNone(...) | T | main.rs:1407:10:1407:10 | T |
+| main.rs:1411:17:1411:35 | ...::MySome(...) |  | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1411:17:1411:35 | ...::MySome(...) | T | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1411:17:1411:35 | ...::MySome(...) | T.T | main.rs:1407:10:1407:10 | T |
+| main.rs:1411:34:1411:34 | x |  | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1411:34:1411:34 | x | T | main.rs:1407:10:1407:10 | T |
+| main.rs:1411:40:1411:40 | x |  | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1411:40:1411:40 | x | T | main.rs:1407:10:1407:10 | T |
+| main.rs:1419:16:1465:5 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1420:13:1420:14 | x1 |  | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1420:13:1420:14 | x1 | T | main.rs:1416:5:1417:13 | S |
+| main.rs:1420:18:1420:37 | ...::new(...) |  | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1420:18:1420:37 | ...::new(...) | T | main.rs:1416:5:1417:13 | S |
+| main.rs:1421:18:1421:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1421:18:1421:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1421:18:1421:27 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:1421:18:1421:27 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1421:26:1421:27 | x1 |  | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1421:26:1421:27 | x1 | T | main.rs:1416:5:1417:13 | S |
+| main.rs:1423:17:1423:18 | x2 |  | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1423:17:1423:18 | x2 | T | main.rs:1416:5:1417:13 | S |
+| main.rs:1423:22:1423:36 | ...::new(...) |  | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1423:22:1423:36 | ...::new(...) | T | main.rs:1416:5:1417:13 | S |
+| main.rs:1424:9:1424:10 | x2 |  | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1424:9:1424:10 | x2 | T | main.rs:1416:5:1417:13 | S |
+| main.rs:1424:9:1424:17 | x2.set(...) |  | file://:0:0:0:0 | () |
+| main.rs:1424:16:1424:16 | S |  | main.rs:1416:5:1417:13 | S |
+| main.rs:1425:18:1425:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1425:18:1425:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1425:18:1425:27 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:1425:18:1425:27 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1425:26:1425:27 | x2 |  | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1425:26:1425:27 | x2 | T | main.rs:1416:5:1417:13 | S |
+| main.rs:1428:17:1428:18 | x3 |  | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1428:22:1428:36 | ...::new(...) |  | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1429:9:1429:10 | x3 |  | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1429:9:1429:22 | x3.call_set(...) |  | file://:0:0:0:0 | () |
+| main.rs:1429:21:1429:21 | S |  | main.rs:1416:5:1417:13 | S |
+| main.rs:1430:18:1430:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1430:18:1430:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1430:18:1430:27 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:1430:18:1430:27 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1430:26:1430:27 | x3 |  | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1432:17:1432:18 | x4 |  | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1432:17:1432:18 | x4 | T | main.rs:1416:5:1417:13 | S |
+| main.rs:1432:22:1432:36 | ...::new(...) |  | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1432:22:1432:36 | ...::new(...) | T | main.rs:1416:5:1417:13 | S |
+| main.rs:1433:9:1433:33 | ...::set(...) |  | file://:0:0:0:0 | () |
+| main.rs:1433:23:1433:29 | &mut x4 |  | file://:0:0:0:0 | & |
+| main.rs:1433:23:1433:29 | &mut x4 | &T | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1433:23:1433:29 | &mut x4 | &T.T | main.rs:1416:5:1417:13 | S |
+| main.rs:1433:28:1433:29 | x4 |  | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1433:28:1433:29 | x4 | T | main.rs:1416:5:1417:13 | S |
+| main.rs:1433:32:1433:32 | S |  | main.rs:1416:5:1417:13 | S |
+| main.rs:1434:18:1434:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1434:18:1434:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1434:18:1434:27 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:1434:18:1434:27 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1434:26:1434:27 | x4 |  | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1434:26:1434:27 | x4 | T | main.rs:1416:5:1417:13 | S |
+| main.rs:1436:13:1436:14 | x5 |  | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1436:13:1436:14 | x5 | T | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1436:13:1436:14 | x5 | T.T | main.rs:1416:5:1417:13 | S |
+| main.rs:1436:18:1436:58 | ...::MySome(...) |  | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1436:18:1436:58 | ...::MySome(...) | T | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1436:18:1436:58 | ...::MySome(...) | T.T | main.rs:1416:5:1417:13 | S |
+| main.rs:1436:35:1436:57 | ...::MyNone(...) |  | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1436:35:1436:57 | ...::MyNone(...) | T | main.rs:1416:5:1417:13 | S |
+| main.rs:1437:18:1437:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1437:18:1437:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1437:18:1437:37 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:1437:18:1437:37 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1437:26:1437:27 | x5 |  | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1437:26:1437:27 | x5 | T | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1437:26:1437:27 | x5 | T.T | main.rs:1416:5:1417:13 | S |
+| main.rs:1437:26:1437:37 | x5.flatten() |  | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1437:26:1437:37 | x5.flatten() | T | main.rs:1416:5:1417:13 | S |
+| main.rs:1439:13:1439:14 | x6 |  | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1439:13:1439:14 | x6 | T | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1439:13:1439:14 | x6 | T.T | main.rs:1416:5:1417:13 | S |
+| main.rs:1439:18:1439:58 | ...::MySome(...) |  | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1439:18:1439:58 | ...::MySome(...) | T | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1439:18:1439:58 | ...::MySome(...) | T.T | main.rs:1416:5:1417:13 | S |
+| main.rs:1439:35:1439:57 | ...::MyNone(...) |  | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1439:35:1439:57 | ...::MyNone(...) | T | main.rs:1416:5:1417:13 | S |
+| main.rs:1440:18:1440:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1440:18:1440:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1440:18:1440:61 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:1440:18:1440:61 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1440:26:1440:61 | ...::flatten(...) |  | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1440:26:1440:61 | ...::flatten(...) | T | main.rs:1416:5:1417:13 | S |
+| main.rs:1440:59:1440:60 | x6 |  | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1440:59:1440:60 | x6 | T | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1440:59:1440:60 | x6 | T.T | main.rs:1416:5:1417:13 | S |
+| main.rs:1443:13:1443:19 | from_if |  | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1443:13:1443:19 | from_if | T | main.rs:1416:5:1417:13 | S |
+| main.rs:1443:23:1447:9 | if ... {...} else {...} |  | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1443:23:1447:9 | if ... {...} else {...} | T | main.rs:1416:5:1417:13 | S |
+| main.rs:1443:26:1443:26 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1443:26:1443:30 | ... > ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1443:30:1443:30 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1443:32:1445:9 | { ... } |  | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1443:32:1445:9 | { ... } | T | main.rs:1416:5:1417:13 | S |
+| main.rs:1444:13:1444:30 | ...::MyNone(...) |  | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1444:13:1444:30 | ...::MyNone(...) | T | main.rs:1416:5:1417:13 | S |
+| main.rs:1445:16:1447:9 | { ... } |  | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1445:16:1447:9 | { ... } | T | main.rs:1416:5:1417:13 | S |
+| main.rs:1446:13:1446:31 | ...::MySome(...) |  | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1446:13:1446:31 | ...::MySome(...) | T | main.rs:1416:5:1417:13 | S |
+| main.rs:1446:30:1446:30 | S |  | main.rs:1416:5:1417:13 | S |
+| main.rs:1448:18:1448:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1448:18:1448:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1448:18:1448:32 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:1448:18:1448:32 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1448:26:1448:32 | from_if |  | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1448:26:1448:32 | from_if | T | main.rs:1416:5:1417:13 | S |
+| main.rs:1451:13:1451:22 | from_match |  | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1451:13:1451:22 | from_match | T | main.rs:1416:5:1417:13 | S |
+| main.rs:1451:26:1454:9 | match ... { ... } |  | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1451:26:1454:9 | match ... { ... } | T | main.rs:1416:5:1417:13 | S |
+| main.rs:1451:32:1451:32 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1451:32:1451:36 | ... > ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1451:36:1451:36 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1452:13:1452:16 | true |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1452:21:1452:38 | ...::MyNone(...) |  | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1452:21:1452:38 | ...::MyNone(...) | T | main.rs:1416:5:1417:13 | S |
+| main.rs:1453:13:1453:17 | false |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1453:22:1453:40 | ...::MySome(...) |  | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1453:22:1453:40 | ...::MySome(...) | T | main.rs:1416:5:1417:13 | S |
+| main.rs:1453:39:1453:39 | S |  | main.rs:1416:5:1417:13 | S |
+| main.rs:1455:18:1455:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1455:18:1455:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1455:18:1455:35 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:1455:18:1455:35 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1455:26:1455:35 | from_match |  | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1455:26:1455:35 | from_match | T | main.rs:1416:5:1417:13 | S |
+| main.rs:1458:13:1458:21 | from_loop |  | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1458:13:1458:21 | from_loop | T | main.rs:1416:5:1417:13 | S |
+| main.rs:1458:25:1463:9 | loop { ... } |  | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1458:25:1463:9 | loop { ... } | T | main.rs:1416:5:1417:13 | S |
+| main.rs:1458:30:1463:9 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1459:13:1461:13 | if ... {...} |  | file://:0:0:0:0 | () |
+| main.rs:1459:16:1459:16 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1459:16:1459:20 | ... > ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1459:20:1459:20 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1459:22:1461:13 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1460:23:1460:40 | ...::MyNone(...) |  | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1460:23:1460:40 | ...::MyNone(...) | T | main.rs:1416:5:1417:13 | S |
+| main.rs:1462:19:1462:37 | ...::MySome(...) |  | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1462:19:1462:37 | ...::MySome(...) | T | main.rs:1416:5:1417:13 | S |
+| main.rs:1462:36:1462:36 | S |  | main.rs:1416:5:1417:13 | S |
+| main.rs:1464:18:1464:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1464:18:1464:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1464:18:1464:34 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:1464:18:1464:34 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1464:26:1464:34 | from_loop |  | main.rs:1381:5:1385:5 | MyOption |
+| main.rs:1464:26:1464:34 | from_loop | T | main.rs:1416:5:1417:13 | S |
+| main.rs:1482:15:1482:18 | SelfParam |  | main.rs:1470:5:1471:19 | S |
+| main.rs:1482:15:1482:18 | SelfParam | T | main.rs:1481:10:1481:10 | T |
+| main.rs:1482:26:1484:9 | { ... } |  | main.rs:1481:10:1481:10 | T |
+| main.rs:1483:13:1483:16 | self |  | main.rs:1470:5:1471:19 | S |
+| main.rs:1483:13:1483:16 | self | T | main.rs:1481:10:1481:10 | T |
+| main.rs:1483:13:1483:18 | self.0 |  | main.rs:1481:10:1481:10 | T |
+| main.rs:1486:15:1486:19 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1486:15:1486:19 | SelfParam | &T | main.rs:1470:5:1471:19 | S |
+| main.rs:1486:15:1486:19 | SelfParam | &T.T | main.rs:1481:10:1481:10 | T |
+| main.rs:1486:28:1488:9 | { ... } |  | file://:0:0:0:0 | & |
+| main.rs:1486:28:1488:9 | { ... } | &T | main.rs:1481:10:1481:10 | T |
+| main.rs:1487:13:1487:19 | &... |  | file://:0:0:0:0 | & |
+| main.rs:1487:13:1487:19 | &... | &T | main.rs:1481:10:1481:10 | T |
+| main.rs:1487:14:1487:17 | self |  | file://:0:0:0:0 | & |
+| main.rs:1487:14:1487:17 | self | &T | main.rs:1470:5:1471:19 | S |
+| main.rs:1487:14:1487:17 | self | &T.T | main.rs:1481:10:1481:10 | T |
+| main.rs:1487:14:1487:19 | self.0 |  | main.rs:1481:10:1481:10 | T |
+| main.rs:1490:15:1490:25 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1490:15:1490:25 | SelfParam | &T | main.rs:1470:5:1471:19 | S |
+| main.rs:1490:15:1490:25 | SelfParam | &T.T | main.rs:1481:10:1481:10 | T |
+| main.rs:1490:34:1492:9 | { ... } |  | file://:0:0:0:0 | & |
+| main.rs:1490:34:1492:9 | { ... } | &T | main.rs:1481:10:1481:10 | T |
+| main.rs:1491:13:1491:19 | &... |  | file://:0:0:0:0 | & |
+| main.rs:1491:13:1491:19 | &... | &T | main.rs:1481:10:1481:10 | T |
+| main.rs:1491:14:1491:17 | self |  | file://:0:0:0:0 | & |
+| main.rs:1491:14:1491:17 | self | &T | main.rs:1470:5:1471:19 | S |
+| main.rs:1491:14:1491:17 | self | &T.T | main.rs:1481:10:1481:10 | T |
+| main.rs:1491:14:1491:19 | self.0 |  | main.rs:1481:10:1481:10 | T |
+| main.rs:1496:29:1496:33 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1496:29:1496:33 | SelfParam | &T | main.rs:1495:5:1498:5 | Self [trait ATrait] |
+| main.rs:1497:33:1497:36 | SelfParam |  | main.rs:1495:5:1498:5 | Self [trait ATrait] |
+| main.rs:1503:29:1503:33 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1503:29:1503:33 | SelfParam | &T | file://:0:0:0:0 | & |
+| main.rs:1503:29:1503:33 | SelfParam | &T.&T | main.rs:1476:5:1479:5 | MyInt |
+| main.rs:1503:43:1505:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1504:13:1504:22 | (...) |  | main.rs:1476:5:1479:5 | MyInt |
+| main.rs:1504:13:1504:24 | ... .a |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1504:14:1504:21 | * ... |  | main.rs:1476:5:1479:5 | MyInt |
+| main.rs:1504:15:1504:21 | (...) |  | file://:0:0:0:0 | & |
+| main.rs:1504:15:1504:21 | (...) | &T | main.rs:1476:5:1479:5 | MyInt |
+| main.rs:1504:16:1504:20 | * ... |  | file://:0:0:0:0 | & |
+| main.rs:1504:16:1504:20 | * ... | &T | main.rs:1476:5:1479:5 | MyInt |
+| main.rs:1504:17:1504:20 | self |  | file://:0:0:0:0 | & |
+| main.rs:1504:17:1504:20 | self | &T | file://:0:0:0:0 | & |
+| main.rs:1504:17:1504:20 | self | &T.&T | main.rs:1476:5:1479:5 | MyInt |
+| main.rs:1508:33:1508:36 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1508:33:1508:36 | SelfParam | &T | main.rs:1476:5:1479:5 | MyInt |
+| main.rs:1508:46:1510:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1509:13:1509:19 | (...) |  | main.rs:1476:5:1479:5 | MyInt |
+| main.rs:1509:13:1509:21 | ... .a |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1509:14:1509:18 | * ... |  | main.rs:1476:5:1479:5 | MyInt |
+| main.rs:1509:15:1509:18 | self |  | file://:0:0:0:0 | & |
+| main.rs:1509:15:1509:18 | self | &T | main.rs:1476:5:1479:5 | MyInt |
+| main.rs:1513:16:1563:5 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1514:13:1514:14 | x1 |  | main.rs:1470:5:1471:19 | S |
+| main.rs:1514:13:1514:14 | x1 | T | main.rs:1473:5:1474:14 | S2 |
+| main.rs:1514:18:1514:22 | S(...) |  | main.rs:1470:5:1471:19 | S |
+| main.rs:1514:18:1514:22 | S(...) | T | main.rs:1473:5:1474:14 | S2 |
+| main.rs:1514:20:1514:21 | S2 |  | main.rs:1473:5:1474:14 | S2 |
+| main.rs:1515:18:1515:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1515:18:1515:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1515:18:1515:32 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:1515:18:1515:32 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1515:26:1515:27 | x1 |  | main.rs:1470:5:1471:19 | S |
+| main.rs:1515:26:1515:27 | x1 | T | main.rs:1473:5:1474:14 | S2 |
+| main.rs:1515:26:1515:32 | x1.m1() |  | main.rs:1473:5:1474:14 | S2 |
+| main.rs:1517:13:1517:14 | x2 |  | main.rs:1470:5:1471:19 | S |
+| main.rs:1517:13:1517:14 | x2 | T | main.rs:1473:5:1474:14 | S2 |
+| main.rs:1517:18:1517:22 | S(...) |  | main.rs:1470:5:1471:19 | S |
+| main.rs:1517:18:1517:22 | S(...) | T | main.rs:1473:5:1474:14 | S2 |
+| main.rs:1517:20:1517:21 | S2 |  | main.rs:1473:5:1474:14 | S2 |
+| main.rs:1519:18:1519:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1519:18:1519:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1519:18:1519:32 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:1519:18:1519:32 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1519:26:1519:27 | x2 |  | main.rs:1470:5:1471:19 | S |
+| main.rs:1519:26:1519:27 | x2 | T | main.rs:1473:5:1474:14 | S2 |
+| main.rs:1519:26:1519:32 | x2.m2() |  | file://:0:0:0:0 | & |
+| main.rs:1519:26:1519:32 | x2.m2() | &T | main.rs:1473:5:1474:14 | S2 |
+| main.rs:1520:18:1520:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1520:18:1520:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1520:18:1520:32 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:1520:18:1520:32 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1520:26:1520:27 | x2 |  | main.rs:1470:5:1471:19 | S |
+| main.rs:1520:26:1520:27 | x2 | T | main.rs:1473:5:1474:14 | S2 |
+| main.rs:1520:26:1520:32 | x2.m3() |  | file://:0:0:0:0 | & |
+| main.rs:1520:26:1520:32 | x2.m3() | &T | main.rs:1473:5:1474:14 | S2 |
+| main.rs:1522:13:1522:14 | x3 |  | main.rs:1470:5:1471:19 | S |
+| main.rs:1522:13:1522:14 | x3 | T | main.rs:1473:5:1474:14 | S2 |
+| main.rs:1522:18:1522:22 | S(...) |  | main.rs:1470:5:1471:19 | S |
+| main.rs:1522:18:1522:22 | S(...) | T | main.rs:1473:5:1474:14 | S2 |
+| main.rs:1522:20:1522:21 | S2 |  | main.rs:1473:5:1474:14 | S2 |
+| main.rs:1524:18:1524:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1524:18:1524:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1524:18:1524:41 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:1524:18:1524:41 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1524:26:1524:41 | ...::m2(...) |  | file://:0:0:0:0 | & |
+| main.rs:1524:26:1524:41 | ...::m2(...) | &T | main.rs:1473:5:1474:14 | S2 |
+| main.rs:1524:38:1524:40 | &x3 |  | file://:0:0:0:0 | & |
+| main.rs:1524:38:1524:40 | &x3 | &T | main.rs:1470:5:1471:19 | S |
+| main.rs:1524:38:1524:40 | &x3 | &T.T | main.rs:1473:5:1474:14 | S2 |
+| main.rs:1524:39:1524:40 | x3 |  | main.rs:1470:5:1471:19 | S |
+| main.rs:1524:39:1524:40 | x3 | T | main.rs:1473:5:1474:14 | S2 |
+| main.rs:1525:18:1525:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1525:18:1525:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1525:18:1525:41 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:1525:18:1525:41 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1525:26:1525:41 | ...::m3(...) |  | file://:0:0:0:0 | & |
+| main.rs:1525:26:1525:41 | ...::m3(...) | &T | main.rs:1473:5:1474:14 | S2 |
+| main.rs:1525:38:1525:40 | &x3 |  | file://:0:0:0:0 | & |
+| main.rs:1525:38:1525:40 | &x3 | &T | main.rs:1470:5:1471:19 | S |
+| main.rs:1525:38:1525:40 | &x3 | &T.T | main.rs:1473:5:1474:14 | S2 |
+| main.rs:1525:39:1525:40 | x3 |  | main.rs:1470:5:1471:19 | S |
+| main.rs:1525:39:1525:40 | x3 | T | main.rs:1473:5:1474:14 | S2 |
+| main.rs:1527:13:1527:14 | x4 |  | file://:0:0:0:0 | & |
+| main.rs:1527:13:1527:14 | x4 | &T | main.rs:1470:5:1471:19 | S |
+| main.rs:1527:13:1527:14 | x4 | &T.T | main.rs:1473:5:1474:14 | S2 |
+| main.rs:1527:18:1527:23 | &... |  | file://:0:0:0:0 | & |
+| main.rs:1527:18:1527:23 | &... | &T | main.rs:1470:5:1471:19 | S |
+| main.rs:1527:18:1527:23 | &... | &T.T | main.rs:1473:5:1474:14 | S2 |
+| main.rs:1527:19:1527:23 | S(...) |  | main.rs:1470:5:1471:19 | S |
+| main.rs:1527:19:1527:23 | S(...) | T | main.rs:1473:5:1474:14 | S2 |
+| main.rs:1527:21:1527:22 | S2 |  | main.rs:1473:5:1474:14 | S2 |
+| main.rs:1529:18:1529:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1529:18:1529:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1529:18:1529:32 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:1529:18:1529:32 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1529:26:1529:27 | x4 |  | file://:0:0:0:0 | & |
+| main.rs:1529:26:1529:27 | x4 | &T | main.rs:1470:5:1471:19 | S |
+| main.rs:1529:26:1529:27 | x4 | &T.T | main.rs:1473:5:1474:14 | S2 |
+| main.rs:1529:26:1529:32 | x4.m2() |  | file://:0:0:0:0 | & |
+| main.rs:1529:26:1529:32 | x4.m2() | &T | main.rs:1473:5:1474:14 | S2 |
+| main.rs:1530:18:1530:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1530:18:1530:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1530:18:1530:32 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:1530:18:1530:32 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1530:26:1530:27 | x4 |  | file://:0:0:0:0 | & |
+| main.rs:1530:26:1530:27 | x4 | &T | main.rs:1470:5:1471:19 | S |
+| main.rs:1530:26:1530:27 | x4 | &T.T | main.rs:1473:5:1474:14 | S2 |
+| main.rs:1530:26:1530:32 | x4.m3() |  | file://:0:0:0:0 | & |
+| main.rs:1530:26:1530:32 | x4.m3() | &T | main.rs:1473:5:1474:14 | S2 |
+| main.rs:1532:13:1532:14 | x5 |  | file://:0:0:0:0 | & |
+| main.rs:1532:13:1532:14 | x5 | &T | main.rs:1470:5:1471:19 | S |
+| main.rs:1532:13:1532:14 | x5 | &T.T | main.rs:1473:5:1474:14 | S2 |
+| main.rs:1532:18:1532:23 | &... |  | file://:0:0:0:0 | & |
+| main.rs:1532:18:1532:23 | &... | &T | main.rs:1470:5:1471:19 | S |
+| main.rs:1532:18:1532:23 | &... | &T.T | main.rs:1473:5:1474:14 | S2 |
+| main.rs:1532:19:1532:23 | S(...) |  | main.rs:1470:5:1471:19 | S |
+| main.rs:1532:19:1532:23 | S(...) | T | main.rs:1473:5:1474:14 | S2 |
+| main.rs:1532:21:1532:22 | S2 |  | main.rs:1473:5:1474:14 | S2 |
+| main.rs:1534:18:1534:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1534:18:1534:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1534:18:1534:32 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:1534:18:1534:32 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1534:26:1534:27 | x5 |  | file://:0:0:0:0 | & |
+| main.rs:1534:26:1534:27 | x5 | &T | main.rs:1470:5:1471:19 | S |
+| main.rs:1534:26:1534:27 | x5 | &T.T | main.rs:1473:5:1474:14 | S2 |
+| main.rs:1534:26:1534:32 | x5.m1() |  | main.rs:1473:5:1474:14 | S2 |
+| main.rs:1535:18:1535:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1535:18:1535:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1535:18:1535:29 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:1535:18:1535:29 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1535:26:1535:27 | x5 |  | file://:0:0:0:0 | & |
+| main.rs:1535:26:1535:27 | x5 | &T | main.rs:1470:5:1471:19 | S |
+| main.rs:1535:26:1535:27 | x5 | &T.T | main.rs:1473:5:1474:14 | S2 |
+| main.rs:1535:26:1535:29 | x5.0 |  | main.rs:1473:5:1474:14 | S2 |
+| main.rs:1537:13:1537:14 | x6 |  | file://:0:0:0:0 | & |
+| main.rs:1537:13:1537:14 | x6 | &T | main.rs:1470:5:1471:19 | S |
+| main.rs:1537:13:1537:14 | x6 | &T.T | main.rs:1473:5:1474:14 | S2 |
+| main.rs:1537:18:1537:23 | &... |  | file://:0:0:0:0 | & |
+| main.rs:1537:18:1537:23 | &... | &T | main.rs:1470:5:1471:19 | S |
+| main.rs:1537:18:1537:23 | &... | &T.T | main.rs:1473:5:1474:14 | S2 |
+| main.rs:1537:19:1537:23 | S(...) |  | main.rs:1470:5:1471:19 | S |
+| main.rs:1537:19:1537:23 | S(...) | T | main.rs:1473:5:1474:14 | S2 |
+| main.rs:1537:21:1537:22 | S2 |  | main.rs:1473:5:1474:14 | S2 |
+| main.rs:1540:18:1540:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1540:18:1540:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1540:18:1540:35 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:1540:18:1540:35 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1540:26:1540:30 | (...) |  | main.rs:1470:5:1471:19 | S |
+| main.rs:1540:26:1540:30 | (...) | T | main.rs:1473:5:1474:14 | S2 |
+| main.rs:1540:26:1540:35 | ... .m1() |  | main.rs:1473:5:1474:14 | S2 |
+| main.rs:1540:27:1540:29 | * ... |  | main.rs:1470:5:1471:19 | S |
+| main.rs:1540:27:1540:29 | * ... | T | main.rs:1473:5:1474:14 | S2 |
+| main.rs:1540:28:1540:29 | x6 |  | file://:0:0:0:0 | & |
+| main.rs:1540:28:1540:29 | x6 | &T | main.rs:1470:5:1471:19 | S |
+| main.rs:1540:28:1540:29 | x6 | &T.T | main.rs:1473:5:1474:14 | S2 |
+| main.rs:1542:13:1542:14 | x7 |  | main.rs:1470:5:1471:19 | S |
+| main.rs:1542:13:1542:14 | x7 | T | file://:0:0:0:0 | & |
+| main.rs:1542:13:1542:14 | x7 | T.&T | main.rs:1473:5:1474:14 | S2 |
+| main.rs:1542:18:1542:23 | S(...) |  | main.rs:1470:5:1471:19 | S |
+| main.rs:1542:18:1542:23 | S(...) | T | file://:0:0:0:0 | & |
+| main.rs:1542:18:1542:23 | S(...) | T.&T | main.rs:1473:5:1474:14 | S2 |
+| main.rs:1542:20:1542:22 | &S2 |  | file://:0:0:0:0 | & |
+| main.rs:1542:20:1542:22 | &S2 | &T | main.rs:1473:5:1474:14 | S2 |
+| main.rs:1542:21:1542:22 | S2 |  | main.rs:1473:5:1474:14 | S2 |
+| main.rs:1545:13:1545:13 | t |  | file://:0:0:0:0 | & |
+| main.rs:1545:13:1545:13 | t | &T | main.rs:1473:5:1474:14 | S2 |
+| main.rs:1545:17:1545:18 | x7 |  | main.rs:1470:5:1471:19 | S |
+| main.rs:1545:17:1545:18 | x7 | T | file://:0:0:0:0 | & |
+| main.rs:1545:17:1545:18 | x7 | T.&T | main.rs:1473:5:1474:14 | S2 |
+| main.rs:1545:17:1545:23 | x7.m1() |  | file://:0:0:0:0 | & |
+| main.rs:1545:17:1545:23 | x7.m1() | &T | main.rs:1473:5:1474:14 | S2 |
+| main.rs:1546:18:1546:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1546:18:1546:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1546:18:1546:27 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:1546:18:1546:27 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1546:26:1546:27 | x7 |  | main.rs:1470:5:1471:19 | S |
+| main.rs:1546:26:1546:27 | x7 | T | file://:0:0:0:0 | & |
+| main.rs:1546:26:1546:27 | x7 | T.&T | main.rs:1473:5:1474:14 | S2 |
+| main.rs:1548:13:1548:14 | x9 |  | {EXTERNAL LOCATION} | String |
+| main.rs:1548:26:1548:32 | "Hello" |  | file://:0:0:0:0 | & |
+| main.rs:1548:26:1548:32 | "Hello" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1548:26:1548:44 | "Hello".to_string() |  | {EXTERNAL LOCATION} | String |
+| main.rs:1552:13:1552:13 | u |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1552:13:1552:13 | u | T | {EXTERNAL LOCATION} | u32 |
+| main.rs:1552:17:1552:18 | x9 |  | {EXTERNAL LOCATION} | String |
+| main.rs:1552:17:1552:33 | x9.parse() |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1552:17:1552:33 | x9.parse() | T | {EXTERNAL LOCATION} | u32 |
+| main.rs:1554:13:1554:20 | my_thing |  | file://:0:0:0:0 | & |
+| main.rs:1554:13:1554:20 | my_thing | &T | main.rs:1476:5:1479:5 | MyInt |
+| main.rs:1554:24:1554:39 | &... |  | file://:0:0:0:0 | & |
+| main.rs:1554:24:1554:39 | &... | &T | main.rs:1476:5:1479:5 | MyInt |
+| main.rs:1554:25:1554:39 | MyInt {...} |  | main.rs:1476:5:1479:5 | MyInt |
+| main.rs:1554:36:1554:37 | 37 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1556:13:1556:13 | a |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1556:17:1556:24 | my_thing |  | file://:0:0:0:0 | & |
+| main.rs:1556:17:1556:24 | my_thing | &T | main.rs:1476:5:1479:5 | MyInt |
+| main.rs:1556:17:1556:43 | my_thing.method_on_borrow() |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1557:18:1557:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1557:18:1557:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1557:18:1557:26 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:1557:18:1557:26 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1557:26:1557:26 | a |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1560:13:1560:20 | my_thing |  | file://:0:0:0:0 | & |
+| main.rs:1560:13:1560:20 | my_thing | &T | main.rs:1476:5:1479:5 | MyInt |
+| main.rs:1560:24:1560:39 | &... |  | file://:0:0:0:0 | & |
+| main.rs:1560:24:1560:39 | &... | &T | main.rs:1476:5:1479:5 | MyInt |
+| main.rs:1560:25:1560:39 | MyInt {...} |  | main.rs:1476:5:1479:5 | MyInt |
+| main.rs:1560:36:1560:37 | 38 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1561:13:1561:13 | a |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1561:17:1561:24 | my_thing |  | file://:0:0:0:0 | & |
+| main.rs:1561:17:1561:24 | my_thing | &T | main.rs:1476:5:1479:5 | MyInt |
+| main.rs:1561:17:1561:47 | my_thing.method_not_on_borrow() |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1562:18:1562:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1562:18:1562:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1562:18:1562:26 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:1562:18:1562:26 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1562:26:1562:26 | a |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1569:16:1569:20 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1569:16:1569:20 | SelfParam | &T | main.rs:1567:5:1575:5 | Self [trait MyTrait] |
+| main.rs:1572:16:1572:20 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1572:16:1572:20 | SelfParam | &T | main.rs:1567:5:1575:5 | Self [trait MyTrait] |
+| main.rs:1572:32:1574:9 | { ... } |  | file://:0:0:0:0 | & |
+| main.rs:1572:32:1574:9 | { ... } | &T | main.rs:1567:5:1575:5 | Self [trait MyTrait] |
+| main.rs:1573:13:1573:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1573:13:1573:16 | self | &T | main.rs:1567:5:1575:5 | Self [trait MyTrait] |
+| main.rs:1573:13:1573:22 | self.foo() |  | file://:0:0:0:0 | & |
+| main.rs:1573:13:1573:22 | self.foo() | &T | main.rs:1567:5:1575:5 | Self [trait MyTrait] |
+| main.rs:1581:16:1581:20 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1581:16:1581:20 | SelfParam | &T | main.rs:1577:5:1577:20 | MyStruct |
+| main.rs:1581:36:1583:9 | { ... } |  | file://:0:0:0:0 | & |
+| main.rs:1581:36:1583:9 | { ... } | &T | main.rs:1577:5:1577:20 | MyStruct |
 | main.rs:1582:13:1582:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1582:13:1582:16 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1582:13:1582:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1582:13:1582:27 | ... -= ... |  | file://:0:0:0:0 | () |
-| main.rs:1582:23:1582:25 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1582:23:1582:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1588:16:1588:19 | SelfParam |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1588:22:1588:24 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1588:41:1593:9 | { ... } |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1589:13:1592:13 | Vec2 {...} |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1590:20:1590:23 | self |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1590:20:1590:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1590:20:1590:33 | ... * ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1590:29:1590:31 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1590:29:1590:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1591:20:1591:23 | self |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1591:20:1591:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1591:20:1591:33 | ... * ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1591:29:1591:31 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1591:29:1591:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1597:23:1597:31 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1597:23:1597:31 | SelfParam | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1597:34:1597:36 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1598:13:1598:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1598:13:1598:16 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1598:13:1598:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1598:13:1598:27 | ... *= ... |  | file://:0:0:0:0 | () |
-| main.rs:1598:23:1598:25 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1598:23:1598:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1582:13:1582:16 | self | &T | main.rs:1577:5:1577:20 | MyStruct |
+| main.rs:1586:16:1589:5 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1587:13:1587:13 | x |  | main.rs:1577:5:1577:20 | MyStruct |
+| main.rs:1587:17:1587:24 | MyStruct |  | main.rs:1577:5:1577:20 | MyStruct |
+| main.rs:1588:9:1588:9 | x |  | main.rs:1577:5:1577:20 | MyStruct |
+| main.rs:1588:9:1588:15 | x.bar() |  | file://:0:0:0:0 | & |
+| main.rs:1588:9:1588:15 | x.bar() | &T | main.rs:1577:5:1577:20 | MyStruct |
+| main.rs:1598:16:1598:20 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1598:16:1598:20 | SelfParam | &T | main.rs:1595:5:1595:26 | MyStruct |
+| main.rs:1598:16:1598:20 | SelfParam | &T.T | main.rs:1597:10:1597:10 | T |
+| main.rs:1598:32:1600:9 | { ... } |  | file://:0:0:0:0 | & |
+| main.rs:1598:32:1600:9 | { ... } | &T | main.rs:1595:5:1595:26 | MyStruct |
+| main.rs:1598:32:1600:9 | { ... } | &T.T | main.rs:1597:10:1597:10 | T |
 | main.rs:1599:13:1599:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1599:13:1599:16 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1599:13:1599:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1599:13:1599:27 | ... *= ... |  | file://:0:0:0:0 | () |
-| main.rs:1599:23:1599:25 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1599:23:1599:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1605:16:1605:19 | SelfParam |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1605:22:1605:24 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1605:41:1610:9 | { ... } |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1606:13:1609:13 | Vec2 {...} |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1607:20:1607:23 | self |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1607:20:1607:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1607:20:1607:33 | ... / ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1607:29:1607:31 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1607:29:1607:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1608:20:1608:23 | self |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1608:20:1608:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1608:20:1608:33 | ... / ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1608:29:1608:31 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1608:29:1608:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1614:23:1614:31 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1614:23:1614:31 | SelfParam | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1614:34:1614:36 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1615:13:1615:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1615:13:1615:16 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1615:13:1615:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1615:13:1615:27 | ... /= ... |  | file://:0:0:0:0 | () |
-| main.rs:1615:23:1615:25 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1615:23:1615:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1616:13:1616:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1616:13:1616:16 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1616:13:1616:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1616:13:1616:27 | ... /= ... |  | file://:0:0:0:0 | () |
-| main.rs:1616:23:1616:25 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1616:23:1616:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1622:16:1622:19 | SelfParam |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1622:22:1622:24 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1622:41:1627:9 | { ... } |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1623:13:1626:13 | Vec2 {...} |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1624:20:1624:23 | self |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1624:20:1624:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1624:20:1624:33 | ... % ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1624:29:1624:31 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1624:29:1624:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1625:20:1625:23 | self |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1625:20:1625:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1625:20:1625:33 | ... % ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1625:29:1625:31 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1625:29:1625:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1631:23:1631:31 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1631:23:1631:31 | SelfParam | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1631:34:1631:36 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1632:13:1632:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1632:13:1632:16 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1632:13:1632:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1632:13:1632:27 | ... %= ... |  | file://:0:0:0:0 | () |
-| main.rs:1632:23:1632:25 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1632:23:1632:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1633:13:1633:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1633:13:1633:16 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1633:13:1633:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1633:13:1633:27 | ... %= ... |  | file://:0:0:0:0 | () |
-| main.rs:1633:23:1633:25 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1633:23:1633:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1639:19:1639:22 | SelfParam |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1639:25:1639:27 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1639:44:1644:9 | { ... } |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1640:13:1643:13 | Vec2 {...} |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1641:20:1641:23 | self |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1641:20:1641:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1641:20:1641:33 | ... & ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1641:29:1641:31 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1641:29:1641:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1642:20:1642:23 | self |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1642:20:1642:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1642:20:1642:33 | ... & ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1642:29:1642:31 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1642:29:1642:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1648:26:1648:34 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1648:26:1648:34 | SelfParam | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1648:37:1648:39 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1649:13:1649:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1649:13:1649:16 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1649:13:1649:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1649:13:1649:27 | ... &= ... |  | file://:0:0:0:0 | () |
-| main.rs:1649:23:1649:25 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1649:23:1649:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1650:13:1650:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1650:13:1650:16 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1650:13:1650:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1650:13:1650:27 | ... &= ... |  | file://:0:0:0:0 | () |
-| main.rs:1650:23:1650:25 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1650:23:1650:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1656:18:1656:21 | SelfParam |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1656:24:1656:26 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1656:43:1661:9 | { ... } |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1657:13:1660:13 | Vec2 {...} |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1658:20:1658:23 | self |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1658:20:1658:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1658:20:1658:33 | ... \| ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1658:29:1658:31 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1658:29:1658:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1659:20:1659:23 | self |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1659:20:1659:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1659:20:1659:33 | ... \| ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1659:29:1659:31 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1659:29:1659:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1665:25:1665:33 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1665:25:1665:33 | SelfParam | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1665:36:1665:38 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1666:13:1666:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1666:13:1666:16 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1666:13:1666:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1666:13:1666:27 | ... \|= ... |  | file://:0:0:0:0 | () |
-| main.rs:1666:23:1666:25 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1666:23:1666:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1667:13:1667:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1667:13:1667:16 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1667:13:1667:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1667:13:1667:27 | ... \|= ... |  | file://:0:0:0:0 | () |
-| main.rs:1667:23:1667:25 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1667:23:1667:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1673:19:1673:22 | SelfParam |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1673:25:1673:27 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1673:44:1678:9 | { ... } |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1674:13:1677:13 | Vec2 {...} |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1675:20:1675:23 | self |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1675:20:1675:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1675:20:1675:33 | ... ^ ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1675:29:1675:31 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1675:29:1675:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1676:20:1676:23 | self |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1676:20:1676:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1676:20:1676:33 | ... ^ ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1676:29:1676:31 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1676:29:1676:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1682:26:1682:34 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1682:26:1682:34 | SelfParam | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1682:37:1682:39 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1683:13:1683:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1683:13:1683:16 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1683:13:1683:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1683:13:1683:27 | ... ^= ... |  | file://:0:0:0:0 | () |
-| main.rs:1683:23:1683:25 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1683:23:1683:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1684:13:1684:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1684:13:1684:16 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1684:13:1684:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1684:13:1684:27 | ... ^= ... |  | file://:0:0:0:0 | () |
-| main.rs:1684:23:1684:25 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1684:23:1684:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1690:16:1690:19 | SelfParam |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1690:22:1690:24 | rhs |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:1690:40:1695:9 | { ... } |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1691:13:1694:13 | Vec2 {...} |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1692:20:1692:23 | self |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1692:20:1692:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1692:20:1692:32 | ... << ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1692:30:1692:32 | rhs |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:1693:20:1693:23 | self |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1693:20:1693:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1693:20:1693:32 | ... << ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1693:30:1693:32 | rhs |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:1699:23:1699:31 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1699:23:1699:31 | SelfParam | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1699:34:1699:36 | rhs |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:1700:13:1700:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1700:13:1700:16 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1700:13:1700:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1700:13:1700:26 | ... <<= ... |  | file://:0:0:0:0 | () |
-| main.rs:1700:24:1700:26 | rhs |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:1701:13:1701:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1701:13:1701:16 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1701:13:1701:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1701:13:1701:26 | ... <<= ... |  | file://:0:0:0:0 | () |
-| main.rs:1701:24:1701:26 | rhs |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:1707:16:1707:19 | SelfParam |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1707:22:1707:24 | rhs |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:1707:40:1712:9 | { ... } |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1708:13:1711:13 | Vec2 {...} |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1709:20:1709:23 | self |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1709:20:1709:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1709:20:1709:32 | ... >> ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1709:30:1709:32 | rhs |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:1710:20:1710:23 | self |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1710:20:1710:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1710:20:1710:32 | ... >> ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1710:30:1710:32 | rhs |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:1716:23:1716:31 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1716:23:1716:31 | SelfParam | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1716:34:1716:36 | rhs |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:1717:13:1717:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1717:13:1717:16 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1717:13:1717:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1717:13:1717:26 | ... >>= ... |  | file://:0:0:0:0 | () |
-| main.rs:1717:24:1717:26 | rhs |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:1718:13:1718:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1718:13:1718:16 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1718:13:1718:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1718:13:1718:26 | ... >>= ... |  | file://:0:0:0:0 | () |
-| main.rs:1718:24:1718:26 | rhs |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:1724:16:1724:19 | SelfParam |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1724:30:1729:9 | { ... } |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1725:13:1728:13 | Vec2 {...} |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1726:20:1726:26 | - ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1726:21:1726:24 | self |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1726:21:1726:26 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1727:20:1727:26 | - ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1727:21:1727:24 | self |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1727:21:1727:26 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1734:16:1734:19 | SelfParam |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1734:30:1739:9 | { ... } |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1735:13:1738:13 | Vec2 {...} |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1736:20:1736:26 | ! ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1736:21:1736:24 | self |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1736:21:1736:26 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1737:20:1737:26 | ! ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1737:21:1737:24 | self |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1737:21:1737:26 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1743:15:1743:19 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1743:15:1743:19 | SelfParam | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1743:22:1743:26 | other |  | file://:0:0:0:0 | & |
-| main.rs:1743:22:1743:26 | other | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1743:44:1745:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1744:13:1744:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1744:13:1744:16 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1744:13:1744:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1744:13:1744:29 | ... == ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1744:13:1744:50 | ... && ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1744:23:1744:27 | other |  | file://:0:0:0:0 | & |
-| main.rs:1744:23:1744:27 | other | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1744:23:1744:29 | other.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1744:34:1744:37 | self |  | file://:0:0:0:0 | & |
-| main.rs:1744:34:1744:37 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1744:34:1744:39 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1744:34:1744:50 | ... == ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1744:44:1744:48 | other |  | file://:0:0:0:0 | & |
-| main.rs:1744:44:1744:48 | other | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1744:44:1744:50 | other.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1747:15:1747:19 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1747:15:1747:19 | SelfParam | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1747:22:1747:26 | other |  | file://:0:0:0:0 | & |
-| main.rs:1747:22:1747:26 | other | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1747:44:1749:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1748:13:1748:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1748:13:1748:16 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1748:13:1748:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1748:13:1748:29 | ... != ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1748:13:1748:50 | ... \|\| ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1748:23:1748:27 | other |  | file://:0:0:0:0 | & |
-| main.rs:1748:23:1748:27 | other | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1748:23:1748:29 | other.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1748:34:1748:37 | self |  | file://:0:0:0:0 | & |
-| main.rs:1748:34:1748:37 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1748:34:1748:39 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1748:34:1748:50 | ... != ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1748:44:1748:48 | other |  | file://:0:0:0:0 | & |
-| main.rs:1748:44:1748:48 | other | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1748:44:1748:50 | other.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1753:24:1753:28 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1753:24:1753:28 | SelfParam | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1753:31:1753:35 | other |  | file://:0:0:0:0 | & |
-| main.rs:1753:31:1753:35 | other | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1753:75:1755:9 | { ... } |  | {EXTERNAL LOCATION} | Option |
-| main.rs:1753:75:1755:9 | { ... } | T | {EXTERNAL LOCATION} | Ordering |
-| main.rs:1754:13:1754:29 | (...) |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1754:13:1754:63 | ... .partial_cmp(...) |  | {EXTERNAL LOCATION} | Option |
-| main.rs:1754:13:1754:63 | ... .partial_cmp(...) | T | {EXTERNAL LOCATION} | Ordering |
-| main.rs:1754:14:1754:17 | self |  | file://:0:0:0:0 | & |
-| main.rs:1754:14:1754:17 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1754:14:1754:19 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1754:14:1754:28 | ... + ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1754:23:1754:26 | self |  | file://:0:0:0:0 | & |
-| main.rs:1754:23:1754:26 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1754:23:1754:28 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1754:43:1754:62 | &... |  | file://:0:0:0:0 | & |
-| main.rs:1754:43:1754:62 | &... | &T | {EXTERNAL LOCATION} | i64 |
-| main.rs:1754:44:1754:62 | (...) |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1754:45:1754:49 | other |  | file://:0:0:0:0 | & |
-| main.rs:1754:45:1754:49 | other | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1754:45:1754:51 | other.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1754:45:1754:61 | ... + ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1754:55:1754:59 | other |  | file://:0:0:0:0 | & |
-| main.rs:1754:55:1754:59 | other | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1754:55:1754:61 | other.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1757:15:1757:19 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1757:15:1757:19 | SelfParam | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1757:22:1757:26 | other |  | file://:0:0:0:0 | & |
-| main.rs:1757:22:1757:26 | other | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1757:44:1759:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1758:13:1758:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1758:13:1758:16 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1758:13:1758:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1758:13:1758:28 | ... < ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1758:13:1758:48 | ... && ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1758:22:1758:26 | other |  | file://:0:0:0:0 | & |
-| main.rs:1758:22:1758:26 | other | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1758:22:1758:28 | other.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1758:33:1758:36 | self |  | file://:0:0:0:0 | & |
-| main.rs:1758:33:1758:36 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1758:33:1758:38 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1758:33:1758:48 | ... < ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1758:42:1758:46 | other |  | file://:0:0:0:0 | & |
-| main.rs:1758:42:1758:46 | other | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1758:42:1758:48 | other.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1761:15:1761:19 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1761:15:1761:19 | SelfParam | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1761:22:1761:26 | other |  | file://:0:0:0:0 | & |
-| main.rs:1761:22:1761:26 | other | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1761:44:1763:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1762:13:1762:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1762:13:1762:16 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1762:13:1762:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1762:13:1762:29 | ... <= ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1762:13:1762:50 | ... && ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1762:23:1762:27 | other |  | file://:0:0:0:0 | & |
-| main.rs:1762:23:1762:27 | other | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1762:23:1762:29 | other.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1762:34:1762:37 | self |  | file://:0:0:0:0 | & |
-| main.rs:1762:34:1762:37 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1762:34:1762:39 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1762:34:1762:50 | ... <= ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1762:44:1762:48 | other |  | file://:0:0:0:0 | & |
-| main.rs:1762:44:1762:48 | other | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1762:44:1762:50 | other.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1765:15:1765:19 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1765:15:1765:19 | SelfParam | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1765:22:1765:26 | other |  | file://:0:0:0:0 | & |
-| main.rs:1765:22:1765:26 | other | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1765:44:1767:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1766:13:1766:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1766:13:1766:16 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1766:13:1766:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1766:13:1766:28 | ... > ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1766:13:1766:48 | ... && ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1766:22:1766:26 | other |  | file://:0:0:0:0 | & |
-| main.rs:1766:22:1766:26 | other | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1766:22:1766:28 | other.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1766:33:1766:36 | self |  | file://:0:0:0:0 | & |
-| main.rs:1766:33:1766:36 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1766:33:1766:38 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1766:33:1766:48 | ... > ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1766:42:1766:46 | other |  | file://:0:0:0:0 | & |
-| main.rs:1766:42:1766:46 | other | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1766:42:1766:48 | other.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1769:15:1769:19 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1769:15:1769:19 | SelfParam | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1769:22:1769:26 | other |  | file://:0:0:0:0 | & |
-| main.rs:1769:22:1769:26 | other | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1769:44:1771:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1770:13:1770:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1770:13:1770:16 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1770:13:1770:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1770:13:1770:29 | ... >= ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1770:13:1770:50 | ... && ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1770:23:1770:27 | other |  | file://:0:0:0:0 | & |
-| main.rs:1770:23:1770:27 | other | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1770:23:1770:29 | other.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1770:34:1770:37 | self |  | file://:0:0:0:0 | & |
-| main.rs:1770:34:1770:37 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1770:34:1770:39 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1770:34:1770:50 | ... >= ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1770:44:1770:48 | other |  | file://:0:0:0:0 | & |
-| main.rs:1770:44:1770:48 | other | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1770:44:1770:50 | other.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1777:13:1777:18 | i64_eq |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1777:22:1777:35 | (...) |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1777:23:1777:26 | 1i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1777:23:1777:34 | ... == ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1777:31:1777:34 | 2i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1778:13:1778:18 | i64_ne |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1778:22:1778:35 | (...) |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1778:23:1778:26 | 3i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1778:23:1778:34 | ... != ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1778:31:1778:34 | 4i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1779:13:1779:18 | i64_lt |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1779:22:1779:34 | (...) |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1779:23:1779:26 | 5i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1779:23:1779:33 | ... < ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1779:30:1779:33 | 6i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1780:13:1780:18 | i64_le |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1780:22:1780:35 | (...) |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1780:23:1780:26 | 7i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1780:23:1780:34 | ... <= ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1780:31:1780:34 | 8i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1781:13:1781:18 | i64_gt |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1781:22:1781:35 | (...) |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1781:23:1781:26 | 9i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1781:23:1781:34 | ... > ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1781:30:1781:34 | 10i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1782:13:1782:18 | i64_ge |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1782:22:1782:37 | (...) |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1782:23:1782:27 | 11i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1782:23:1782:36 | ... >= ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1782:32:1782:36 | 12i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1785:13:1785:19 | i64_add |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1785:23:1785:27 | 13i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1785:23:1785:35 | ... + ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1785:31:1785:35 | 14i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1786:13:1786:19 | i64_sub |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1786:23:1786:27 | 15i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1786:23:1786:35 | ... - ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1786:31:1786:35 | 16i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1787:13:1787:19 | i64_mul |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1787:23:1787:27 | 17i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1787:23:1787:35 | ... * ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1787:31:1787:35 | 18i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1788:13:1788:19 | i64_div |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1788:23:1788:27 | 19i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1788:23:1788:35 | ... / ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1788:31:1788:35 | 20i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1789:13:1789:19 | i64_rem |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1789:23:1789:27 | 21i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1789:23:1789:35 | ... % ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1789:31:1789:35 | 22i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1792:17:1792:30 | i64_add_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1792:34:1792:38 | 23i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1793:9:1793:22 | i64_add_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1793:9:1793:31 | ... += ... |  | file://:0:0:0:0 | () |
-| main.rs:1793:27:1793:31 | 24i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1795:17:1795:30 | i64_sub_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1795:34:1795:38 | 25i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1796:9:1796:22 | i64_sub_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1796:9:1796:31 | ... -= ... |  | file://:0:0:0:0 | () |
-| main.rs:1796:27:1796:31 | 26i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1798:17:1798:30 | i64_mul_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1798:34:1798:38 | 27i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1799:9:1799:22 | i64_mul_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1799:9:1799:31 | ... *= ... |  | file://:0:0:0:0 | () |
-| main.rs:1799:27:1799:31 | 28i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1801:17:1801:30 | i64_div_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1801:34:1801:38 | 29i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1802:9:1802:22 | i64_div_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1802:9:1802:31 | ... /= ... |  | file://:0:0:0:0 | () |
-| main.rs:1802:27:1802:31 | 30i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1804:17:1804:30 | i64_rem_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1804:34:1804:38 | 31i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1805:9:1805:22 | i64_rem_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1805:9:1805:31 | ... %= ... |  | file://:0:0:0:0 | () |
-| main.rs:1805:27:1805:31 | 32i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1808:13:1808:22 | i64_bitand |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1808:26:1808:30 | 33i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1808:26:1808:38 | ... & ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1808:34:1808:38 | 34i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1809:13:1809:21 | i64_bitor |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1809:25:1809:29 | 35i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1809:25:1809:37 | ... \| ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1809:33:1809:37 | 36i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1810:13:1810:22 | i64_bitxor |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1810:26:1810:30 | 37i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1810:26:1810:38 | ... ^ ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1810:34:1810:38 | 38i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1811:13:1811:19 | i64_shl |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1811:23:1811:27 | 39i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1811:23:1811:36 | ... << ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1811:32:1811:36 | 40i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1812:13:1812:19 | i64_shr |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1812:23:1812:27 | 41i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1812:23:1812:36 | ... >> ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1812:32:1812:36 | 42i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1815:17:1815:33 | i64_bitand_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1815:37:1815:41 | 43i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1816:9:1816:25 | i64_bitand_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1816:9:1816:34 | ... &= ... |  | file://:0:0:0:0 | () |
-| main.rs:1816:30:1816:34 | 44i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1818:17:1818:32 | i64_bitor_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1818:36:1818:40 | 45i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1819:9:1819:24 | i64_bitor_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1819:9:1819:33 | ... \|= ... |  | file://:0:0:0:0 | () |
-| main.rs:1819:29:1819:33 | 46i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1821:17:1821:33 | i64_bitxor_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1821:37:1821:41 | 47i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1822:9:1822:25 | i64_bitxor_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1822:9:1822:34 | ... ^= ... |  | file://:0:0:0:0 | () |
-| main.rs:1822:30:1822:34 | 48i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1824:17:1824:30 | i64_shl_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1824:34:1824:38 | 49i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1825:9:1825:22 | i64_shl_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1825:9:1825:32 | ... <<= ... |  | file://:0:0:0:0 | () |
-| main.rs:1825:28:1825:32 | 50i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1827:17:1827:30 | i64_shr_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1827:34:1827:38 | 51i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1828:9:1828:22 | i64_shr_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1828:9:1828:32 | ... >>= ... |  | file://:0:0:0:0 | () |
-| main.rs:1828:28:1828:32 | 52i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1830:13:1830:19 | i64_neg |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1830:23:1830:28 | - ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1830:24:1830:28 | 53i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1831:13:1831:19 | i64_not |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1831:23:1831:28 | ! ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1831:24:1831:28 | 54i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1834:13:1834:14 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1834:18:1834:36 | Vec2 {...} |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1834:28:1834:28 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1834:28:1834:28 | 1 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1834:34:1834:34 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1834:34:1834:34 | 2 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1835:13:1835:14 | v2 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1835:18:1835:36 | Vec2 {...} |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1835:28:1835:28 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1835:28:1835:28 | 3 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1835:34:1835:34 | 4 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1835:34:1835:34 | 4 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1838:13:1838:19 | vec2_eq |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1838:23:1838:24 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1838:23:1838:30 | ... == ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1838:29:1838:30 | v2 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1839:13:1839:19 | vec2_ne |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1839:23:1839:24 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1839:23:1839:30 | ... != ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1839:29:1839:30 | v2 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1840:13:1840:19 | vec2_lt |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1840:23:1840:24 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1840:23:1840:29 | ... < ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1840:28:1840:29 | v2 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1841:13:1841:19 | vec2_le |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1841:23:1841:24 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1841:23:1841:30 | ... <= ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1841:29:1841:30 | v2 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1842:13:1842:19 | vec2_gt |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1842:23:1842:24 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1842:23:1842:29 | ... > ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1842:28:1842:29 | v2 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1843:13:1843:19 | vec2_ge |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1843:23:1843:24 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1843:23:1843:30 | ... >= ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1843:29:1843:30 | v2 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1846:13:1846:20 | vec2_add |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1846:24:1846:25 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1846:24:1846:30 | ... + ... |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1846:29:1846:30 | v2 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1847:13:1847:20 | vec2_sub |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1847:24:1847:25 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1847:24:1847:30 | ... - ... |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1847:29:1847:30 | v2 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1848:13:1848:20 | vec2_mul |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1848:24:1848:25 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1848:24:1848:30 | ... * ... |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1848:29:1848:30 | v2 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1849:13:1849:20 | vec2_div |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1849:24:1849:25 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1849:24:1849:30 | ... / ... |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1849:29:1849:30 | v2 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1850:13:1850:20 | vec2_rem |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1850:24:1850:25 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1850:24:1850:30 | ... % ... |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1850:29:1850:30 | v2 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1853:17:1853:31 | vec2_add_assign |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1853:35:1853:36 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1854:9:1854:23 | vec2_add_assign |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1854:9:1854:29 | ... += ... |  | file://:0:0:0:0 | () |
-| main.rs:1854:28:1854:29 | v2 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1856:17:1856:31 | vec2_sub_assign |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1856:35:1856:36 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1857:9:1857:23 | vec2_sub_assign |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1857:9:1857:29 | ... -= ... |  | file://:0:0:0:0 | () |
-| main.rs:1857:28:1857:29 | v2 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1859:17:1859:31 | vec2_mul_assign |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1859:35:1859:36 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1860:9:1860:23 | vec2_mul_assign |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1860:9:1860:29 | ... *= ... |  | file://:0:0:0:0 | () |
-| main.rs:1860:28:1860:29 | v2 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1862:17:1862:31 | vec2_div_assign |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1862:35:1862:36 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1863:9:1863:23 | vec2_div_assign |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1863:9:1863:29 | ... /= ... |  | file://:0:0:0:0 | () |
-| main.rs:1863:28:1863:29 | v2 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1865:17:1865:31 | vec2_rem_assign |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1865:35:1865:36 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1866:9:1866:23 | vec2_rem_assign |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1866:9:1866:29 | ... %= ... |  | file://:0:0:0:0 | () |
-| main.rs:1866:28:1866:29 | v2 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1869:13:1869:23 | vec2_bitand |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1869:27:1869:28 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1869:27:1869:33 | ... & ... |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1869:32:1869:33 | v2 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1870:13:1870:22 | vec2_bitor |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1870:26:1870:27 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1870:26:1870:32 | ... \| ... |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1870:31:1870:32 | v2 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1871:13:1871:23 | vec2_bitxor |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1871:27:1871:28 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1871:27:1871:33 | ... ^ ... |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1871:32:1871:33 | v2 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1872:13:1872:20 | vec2_shl |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1872:24:1872:25 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1872:24:1872:33 | ... << ... |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1872:30:1872:33 | 1u32 |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:1873:13:1873:20 | vec2_shr |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1873:24:1873:25 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1873:24:1873:33 | ... >> ... |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1873:30:1873:33 | 1u32 |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:1876:17:1876:34 | vec2_bitand_assign |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1876:38:1876:39 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1877:9:1877:26 | vec2_bitand_assign |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1877:9:1877:32 | ... &= ... |  | file://:0:0:0:0 | () |
-| main.rs:1877:31:1877:32 | v2 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1879:17:1879:33 | vec2_bitor_assign |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1879:37:1879:38 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1880:9:1880:25 | vec2_bitor_assign |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1880:9:1880:31 | ... \|= ... |  | file://:0:0:0:0 | () |
-| main.rs:1880:30:1880:31 | v2 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1882:17:1882:34 | vec2_bitxor_assign |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1882:38:1882:39 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1883:9:1883:26 | vec2_bitxor_assign |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1883:9:1883:32 | ... ^= ... |  | file://:0:0:0:0 | () |
-| main.rs:1883:31:1883:32 | v2 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1885:17:1885:31 | vec2_shl_assign |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1885:35:1885:36 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1886:9:1886:23 | vec2_shl_assign |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1886:9:1886:32 | ... <<= ... |  | file://:0:0:0:0 | () |
-| main.rs:1886:29:1886:32 | 1u32 |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:1888:17:1888:31 | vec2_shr_assign |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1888:35:1888:36 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1889:9:1889:23 | vec2_shr_assign |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1889:9:1889:32 | ... >>= ... |  | file://:0:0:0:0 | () |
-| main.rs:1889:29:1889:32 | 1u32 |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:1892:13:1892:20 | vec2_neg |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1892:24:1892:26 | - ... |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1892:25:1892:26 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1893:13:1893:20 | vec2_not |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1893:24:1893:26 | ! ... |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1893:25:1893:26 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1896:13:1896:24 | default_vec2 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1896:28:1896:45 | ...::default(...) |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1897:13:1897:26 | vec2_zero_plus |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1897:30:1897:48 | Vec2 {...} |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1897:30:1897:63 | ... + ... |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1897:40:1897:40 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1897:40:1897:40 | 0 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1897:46:1897:46 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1897:46:1897:46 | 0 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1897:52:1897:63 | default_vec2 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1901:13:1901:24 | default_vec2 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1901:28:1901:45 | ...::default(...) |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1902:13:1902:26 | vec2_zero_plus |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1902:30:1902:48 | Vec2 {...} |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1902:30:1902:64 | ... == ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1902:40:1902:40 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1902:40:1902:40 | 0 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1902:46:1902:46 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1902:46:1902:46 | 0 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1902:53:1902:64 | default_vec2 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1912:18:1912:21 | SelfParam |  | main.rs:1909:5:1909:14 | S1 |
-| main.rs:1915:25:1917:5 | { ... } |  | main.rs:1909:5:1909:14 | S1 |
-| main.rs:1916:9:1916:10 | S1 |  | main.rs:1909:5:1909:14 | S1 |
-| main.rs:1919:41:1921:5 | { ... } |  | main.rs:1919:16:1919:39 | ImplTraitTypeRepr |
-| main.rs:1920:9:1920:20 | { ... } |  | {EXTERNAL LOCATION} | trait Future |
-| main.rs:1920:9:1920:20 | { ... } |  | main.rs:1919:16:1919:39 | ImplTraitTypeRepr |
-| main.rs:1920:9:1920:20 | { ... } | Output | main.rs:1909:5:1909:14 | S1 |
-| main.rs:1920:17:1920:18 | S1 |  | main.rs:1909:5:1909:14 | S1 |
-| main.rs:1929:13:1929:42 | SelfParam |  | {EXTERNAL LOCATION} | Pin |
-| main.rs:1929:13:1929:42 | SelfParam | Ptr | file://:0:0:0:0 | & |
-| main.rs:1929:13:1929:42 | SelfParam | Ptr.&T | main.rs:1923:5:1923:14 | S2 |
-| main.rs:1930:13:1930:15 | _cx |  | file://:0:0:0:0 | & |
-| main.rs:1930:13:1930:15 | _cx | &T | {EXTERNAL LOCATION} | Context |
-| main.rs:1931:44:1933:9 | { ... } |  | {EXTERNAL LOCATION} | Poll |
-| main.rs:1931:44:1933:9 | { ... } | T | main.rs:1909:5:1909:14 | S1 |
-| main.rs:1932:13:1932:38 | ...::Ready(...) |  | {EXTERNAL LOCATION} | Poll |
-| main.rs:1932:13:1932:38 | ...::Ready(...) | T | main.rs:1909:5:1909:14 | S1 |
-| main.rs:1932:36:1932:37 | S1 |  | main.rs:1909:5:1909:14 | S1 |
-| main.rs:1936:41:1938:5 | { ... } |  | main.rs:1936:16:1936:39 | ImplTraitTypeRepr |
-| main.rs:1937:9:1937:10 | S2 |  | main.rs:1923:5:1923:14 | S2 |
-| main.rs:1937:9:1937:10 | S2 |  | main.rs:1936:16:1936:39 | ImplTraitTypeRepr |
-| main.rs:1941:9:1941:12 | f1(...) |  | {EXTERNAL LOCATION} | trait Future |
-| main.rs:1941:9:1941:12 | f1(...) | Output | main.rs:1909:5:1909:14 | S1 |
-| main.rs:1941:9:1941:18 | await ... |  | main.rs:1909:5:1909:14 | S1 |
-| main.rs:1942:9:1942:12 | f2(...) |  | main.rs:1919:16:1919:39 | ImplTraitTypeRepr |
-| main.rs:1942:9:1942:18 | await ... |  | main.rs:1909:5:1909:14 | S1 |
-| main.rs:1943:9:1943:12 | f3(...) |  | main.rs:1936:16:1936:39 | ImplTraitTypeRepr |
-| main.rs:1943:9:1943:18 | await ... |  | main.rs:1909:5:1909:14 | S1 |
-| main.rs:1944:9:1944:10 | S2 |  | main.rs:1923:5:1923:14 | S2 |
-| main.rs:1944:9:1944:16 | await S2 |  | main.rs:1909:5:1909:14 | S1 |
-| main.rs:1945:13:1945:13 | b |  | {EXTERNAL LOCATION} | trait Future |
-| main.rs:1945:13:1945:13 | b | Output | main.rs:1909:5:1909:14 | S1 |
-| main.rs:1945:17:1945:28 | { ... } |  | {EXTERNAL LOCATION} | trait Future |
-| main.rs:1945:17:1945:28 | { ... } | Output | main.rs:1909:5:1909:14 | S1 |
-| main.rs:1945:25:1945:26 | S1 |  | main.rs:1909:5:1909:14 | S1 |
-| main.rs:1946:9:1946:9 | b |  | {EXTERNAL LOCATION} | trait Future |
-| main.rs:1946:9:1946:9 | b | Output | main.rs:1909:5:1909:14 | S1 |
-| main.rs:1946:9:1946:15 | await b |  | main.rs:1909:5:1909:14 | S1 |
-| main.rs:1957:15:1957:19 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1957:15:1957:19 | SelfParam | &T | main.rs:1956:5:1958:5 | Self [trait Trait1] |
-| main.rs:1961:15:1961:19 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1961:15:1961:19 | SelfParam | &T | main.rs:1960:5:1962:5 | Self [trait Trait2] |
-| main.rs:1965:15:1965:19 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1965:15:1965:19 | SelfParam | &T | main.rs:1951:5:1952:14 | S1 |
-| main.rs:1969:15:1969:19 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1969:15:1969:19 | SelfParam | &T | main.rs:1951:5:1952:14 | S1 |
-| main.rs:1972:37:1974:5 | { ... } |  | main.rs:1972:16:1972:35 | ImplTraitTypeRepr |
-| main.rs:1973:9:1973:10 | S1 |  | main.rs:1951:5:1952:14 | S1 |
-| main.rs:1973:9:1973:10 | S1 |  | main.rs:1972:16:1972:35 | ImplTraitTypeRepr |
-| main.rs:1977:18:1977:22 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1977:18:1977:22 | SelfParam | &T | main.rs:1976:5:1978:5 | Self [trait MyTrait] |
-| main.rs:1981:18:1981:22 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1981:18:1981:22 | SelfParam | &T | main.rs:1951:5:1952:14 | S1 |
-| main.rs:1981:31:1983:9 | { ... } |  | main.rs:1953:5:1953:14 | S2 |
-| main.rs:1982:13:1982:14 | S2 |  | main.rs:1953:5:1953:14 | S2 |
-| main.rs:1987:18:1987:22 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1987:18:1987:22 | SelfParam |  | main.rs:1954:5:1954:22 | S3 |
-| main.rs:1987:18:1987:22 | SelfParam | &T | main.rs:1954:5:1954:22 | S3 |
-| main.rs:1987:18:1987:22 | SelfParam | &T.T3 | main.rs:1986:10:1986:17 | T |
-| main.rs:1987:30:1990:9 | { ... } |  | main.rs:1986:10:1986:17 | T |
-| main.rs:1988:17:1988:21 | S3(...) |  | file://:0:0:0:0 | & |
-| main.rs:1988:17:1988:21 | S3(...) |  | main.rs:1954:5:1954:22 | S3 |
-| main.rs:1988:17:1988:21 | S3(...) | &T | main.rs:1954:5:1954:22 | S3 |
-| main.rs:1988:17:1988:21 | S3(...) | &T.T3 | main.rs:1986:10:1986:17 | T |
-| main.rs:1988:25:1988:28 | self |  | file://:0:0:0:0 | & |
-| main.rs:1988:25:1988:28 | self |  | main.rs:1954:5:1954:22 | S3 |
-| main.rs:1988:25:1988:28 | self | &T | main.rs:1954:5:1954:22 | S3 |
-| main.rs:1988:25:1988:28 | self | &T.T3 | main.rs:1986:10:1986:17 | T |
-| main.rs:1989:13:1989:21 | t.clone() |  | main.rs:1986:10:1986:17 | T |
-| main.rs:1993:45:1995:5 | { ... } |  | main.rs:1993:28:1993:43 | ImplTraitTypeRepr |
-| main.rs:1994:9:1994:10 | S1 |  | main.rs:1951:5:1952:14 | S1 |
-| main.rs:1994:9:1994:10 | S1 |  | main.rs:1993:28:1993:43 | ImplTraitTypeRepr |
-| main.rs:1997:41:1997:41 | t |  | main.rs:1997:26:1997:38 | B |
-| main.rs:1997:52:1999:5 | { ... } |  | main.rs:1997:23:1997:23 | A |
-| main.rs:1998:9:1998:9 | t |  | main.rs:1997:26:1997:38 | B |
-| main.rs:1998:9:1998:17 | t.get_a() |  | main.rs:1997:23:1997:23 | A |
-| main.rs:2001:34:2001:34 | x |  | main.rs:2001:24:2001:31 | T |
-| main.rs:2001:59:2003:5 | { ... } |  | main.rs:2001:43:2001:57 | ImplTraitTypeRepr |
-| main.rs:2001:59:2003:5 | { ... } | impl(T) | main.rs:2001:24:2001:31 | T |
-| main.rs:2002:9:2002:13 | S3(...) |  | main.rs:1954:5:1954:22 | S3 |
-| main.rs:2002:9:2002:13 | S3(...) |  | main.rs:2001:43:2001:57 | ImplTraitTypeRepr |
-| main.rs:2002:9:2002:13 | S3(...) | T3 | main.rs:2001:24:2001:31 | T |
-| main.rs:2002:9:2002:13 | S3(...) | impl(T) | main.rs:2001:24:2001:31 | T |
-| main.rs:2002:12:2002:12 | x |  | main.rs:2001:24:2001:31 | T |
-| main.rs:2005:34:2005:34 | x |  | main.rs:2005:24:2005:31 | T |
-| main.rs:2005:67:2007:5 | { ... } |  | {EXTERNAL LOCATION} | Option |
-| main.rs:2005:67:2007:5 | { ... } | T | main.rs:2005:50:2005:64 | ImplTraitTypeRepr |
-| main.rs:2005:67:2007:5 | { ... } | T.impl(T) | main.rs:2005:24:2005:31 | T |
-| main.rs:2006:9:2006:19 | Some(...) |  | {EXTERNAL LOCATION} | Option |
-| main.rs:2006:9:2006:19 | Some(...) | T | main.rs:1954:5:1954:22 | S3 |
-| main.rs:2006:9:2006:19 | Some(...) | T | main.rs:2005:50:2005:64 | ImplTraitTypeRepr |
-| main.rs:2006:9:2006:19 | Some(...) | T.T3 | main.rs:2005:24:2005:31 | T |
-| main.rs:2006:9:2006:19 | Some(...) | T.impl(T) | main.rs:2005:24:2005:31 | T |
-| main.rs:2006:14:2006:18 | S3(...) |  | main.rs:1954:5:1954:22 | S3 |
-| main.rs:2006:14:2006:18 | S3(...) |  | main.rs:2005:50:2005:64 | ImplTraitTypeRepr |
-| main.rs:2006:14:2006:18 | S3(...) | T3 | main.rs:2005:24:2005:31 | T |
-| main.rs:2006:14:2006:18 | S3(...) | impl(T) | main.rs:2005:24:2005:31 | T |
-| main.rs:2006:17:2006:17 | x |  | main.rs:2005:24:2005:31 | T |
-| main.rs:2009:34:2009:34 | x |  | main.rs:2009:24:2009:31 | T |
-| main.rs:2009:78:2011:5 | { ... } |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2009:78:2011:5 | { ... } | 0(2) | main.rs:2009:44:2009:58 | ImplTraitTypeRepr |
-| main.rs:2009:78:2011:5 | { ... } | 0(2).impl(T) | main.rs:2009:24:2009:31 | T |
-| main.rs:2009:78:2011:5 | { ... } | 1(2) | main.rs:2009:61:2009:75 | ImplTraitTypeRepr |
-| main.rs:2009:78:2011:5 | { ... } | 1(2).impl(T) | main.rs:2009:24:2009:31 | T |
-| main.rs:2010:9:2010:30 | TupleExpr |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2010:9:2010:30 | TupleExpr | 0(2) | main.rs:1954:5:1954:22 | S3 |
-| main.rs:2010:9:2010:30 | TupleExpr | 0(2) | main.rs:2009:44:2009:58 | ImplTraitTypeRepr |
-| main.rs:2010:9:2010:30 | TupleExpr | 0(2).T3 | main.rs:2009:24:2009:31 | T |
-| main.rs:2010:9:2010:30 | TupleExpr | 0(2).impl(T) | main.rs:2009:24:2009:31 | T |
-| main.rs:2010:9:2010:30 | TupleExpr | 1(2) | main.rs:1954:5:1954:22 | S3 |
-| main.rs:2010:9:2010:30 | TupleExpr | 1(2) | main.rs:2009:61:2009:75 | ImplTraitTypeRepr |
-| main.rs:2010:9:2010:30 | TupleExpr | 1(2).T3 | main.rs:2009:24:2009:31 | T |
-| main.rs:2010:9:2010:30 | TupleExpr | 1(2).impl(T) | main.rs:2009:24:2009:31 | T |
-| main.rs:2010:10:2010:22 | S3(...) |  | main.rs:1954:5:1954:22 | S3 |
-| main.rs:2010:10:2010:22 | S3(...) |  | main.rs:2009:44:2009:58 | ImplTraitTypeRepr |
-| main.rs:2010:10:2010:22 | S3(...) | T3 | main.rs:2009:24:2009:31 | T |
-| main.rs:2010:10:2010:22 | S3(...) | impl(T) | main.rs:2009:24:2009:31 | T |
-| main.rs:2010:13:2010:13 | x |  | main.rs:2009:24:2009:31 | T |
-| main.rs:2010:13:2010:21 | x.clone() |  | main.rs:2009:24:2009:31 | T |
-| main.rs:2010:25:2010:29 | S3(...) |  | main.rs:1954:5:1954:22 | S3 |
-| main.rs:2010:25:2010:29 | S3(...) |  | main.rs:2009:61:2009:75 | ImplTraitTypeRepr |
-| main.rs:2010:25:2010:29 | S3(...) | T3 | main.rs:2009:24:2009:31 | T |
-| main.rs:2010:25:2010:29 | S3(...) | impl(T) | main.rs:2009:24:2009:31 | T |
-| main.rs:2010:28:2010:28 | x |  | main.rs:2009:24:2009:31 | T |
-| main.rs:2013:26:2013:26 | t |  | main.rs:2013:29:2013:43 | ImplTraitTypeRepr |
-| main.rs:2013:51:2015:5 | { ... } |  | main.rs:2013:23:2013:23 | A |
-| main.rs:2014:9:2014:9 | t |  | main.rs:2013:29:2013:43 | ImplTraitTypeRepr |
-| main.rs:2014:9:2014:17 | t.get_a() |  | main.rs:2013:23:2013:23 | A |
-| main.rs:2018:13:2018:13 | x |  | main.rs:1972:16:1972:35 | ImplTraitTypeRepr |
-| main.rs:2018:17:2018:20 | f1(...) |  | main.rs:1972:16:1972:35 | ImplTraitTypeRepr |
-| main.rs:2019:9:2019:9 | x |  | main.rs:1972:16:1972:35 | ImplTraitTypeRepr |
-| main.rs:2020:9:2020:9 | x |  | main.rs:1972:16:1972:35 | ImplTraitTypeRepr |
-| main.rs:2021:13:2021:13 | a |  | main.rs:1993:28:1993:43 | ImplTraitTypeRepr |
-| main.rs:2021:17:2021:32 | get_a_my_trait(...) |  | main.rs:1993:28:1993:43 | ImplTraitTypeRepr |
-| main.rs:2022:13:2022:13 | b |  | main.rs:1953:5:1953:14 | S2 |
-| main.rs:2022:17:2022:33 | uses_my_trait1(...) |  | main.rs:1953:5:1953:14 | S2 |
-| main.rs:2022:32:2022:32 | a |  | main.rs:1993:28:1993:43 | ImplTraitTypeRepr |
-| main.rs:2023:13:2023:13 | a |  | main.rs:1993:28:1993:43 | ImplTraitTypeRepr |
-| main.rs:2023:17:2023:32 | get_a_my_trait(...) |  | main.rs:1993:28:1993:43 | ImplTraitTypeRepr |
-| main.rs:2024:13:2024:13 | c |  | main.rs:1953:5:1953:14 | S2 |
-| main.rs:2024:17:2024:33 | uses_my_trait2(...) |  | main.rs:1953:5:1953:14 | S2 |
-| main.rs:2024:32:2024:32 | a |  | main.rs:1993:28:1993:43 | ImplTraitTypeRepr |
-| main.rs:2025:13:2025:13 | d |  | main.rs:1953:5:1953:14 | S2 |
-| main.rs:2025:17:2025:34 | uses_my_trait2(...) |  | main.rs:1953:5:1953:14 | S2 |
-| main.rs:2025:32:2025:33 | S1 |  | main.rs:1951:5:1952:14 | S1 |
-| main.rs:2026:13:2026:13 | e |  | main.rs:1951:5:1952:14 | S1 |
-| main.rs:2026:17:2026:35 | get_a_my_trait2(...) |  | main.rs:2001:43:2001:57 | ImplTraitTypeRepr |
-| main.rs:2026:17:2026:35 | get_a_my_trait2(...) | impl(T) | main.rs:1951:5:1952:14 | S1 |
-| main.rs:2026:17:2026:43 | ... .get_a() |  | main.rs:1951:5:1952:14 | S1 |
-| main.rs:2026:33:2026:34 | S1 |  | main.rs:1951:5:1952:14 | S1 |
-| main.rs:2029:13:2029:13 | f |  | main.rs:1951:5:1952:14 | S1 |
-| main.rs:2029:17:2029:35 | get_a_my_trait3(...) |  | {EXTERNAL LOCATION} | Option |
-| main.rs:2029:17:2029:35 | get_a_my_trait3(...) | T | main.rs:2005:50:2005:64 | ImplTraitTypeRepr |
-| main.rs:2029:17:2029:35 | get_a_my_trait3(...) | T.impl(T) | main.rs:1951:5:1952:14 | S1 |
-| main.rs:2029:17:2029:44 | ... .unwrap() |  | main.rs:2005:50:2005:64 | ImplTraitTypeRepr |
-| main.rs:2029:17:2029:44 | ... .unwrap() | impl(T) | main.rs:1951:5:1952:14 | S1 |
-| main.rs:2029:17:2029:52 | ... .get_a() |  | main.rs:1951:5:1952:14 | S1 |
-| main.rs:2029:33:2029:34 | S1 |  | main.rs:1951:5:1952:14 | S1 |
-| main.rs:2030:13:2030:13 | g |  | main.rs:1951:5:1952:14 | S1 |
-| main.rs:2030:17:2030:35 | get_a_my_trait4(...) |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2030:17:2030:35 | get_a_my_trait4(...) | 0(2) | main.rs:2009:44:2009:58 | ImplTraitTypeRepr |
-| main.rs:2030:17:2030:35 | get_a_my_trait4(...) | 0(2).impl(T) | main.rs:1951:5:1952:14 | S1 |
-| main.rs:2030:17:2030:35 | get_a_my_trait4(...) | 1(2) | main.rs:2009:61:2009:75 | ImplTraitTypeRepr |
-| main.rs:2030:17:2030:35 | get_a_my_trait4(...) | 1(2).impl(T) | main.rs:1951:5:1952:14 | S1 |
-| main.rs:2030:17:2030:37 | ... .0 |  | main.rs:2009:44:2009:58 | ImplTraitTypeRepr |
-| main.rs:2030:17:2030:37 | ... .0 | impl(T) | main.rs:1951:5:1952:14 | S1 |
-| main.rs:2030:17:2030:45 | ... .get_a() |  | main.rs:1951:5:1952:14 | S1 |
-| main.rs:2030:33:2030:34 | S1 |  | main.rs:1951:5:1952:14 | S1 |
-| main.rs:2041:16:2041:20 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:2041:16:2041:20 | SelfParam | &T | main.rs:2037:5:2038:13 | S |
-| main.rs:2041:31:2043:9 | { ... } |  | main.rs:2037:5:2038:13 | S |
-| main.rs:2042:13:2042:13 | S |  | main.rs:2037:5:2038:13 | S |
-| main.rs:2052:26:2054:9 | { ... } |  | main.rs:2046:5:2049:5 | MyVec |
-| main.rs:2052:26:2054:9 | { ... } | T | main.rs:2051:10:2051:10 | T |
-| main.rs:2053:13:2053:38 | MyVec {...} |  | main.rs:2046:5:2049:5 | MyVec |
-| main.rs:2053:13:2053:38 | MyVec {...} | T | main.rs:2051:10:2051:10 | T |
-| main.rs:2053:27:2053:36 | ...::new(...) |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2053:27:2053:36 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2053:27:2053:36 | ...::new(...) | T | main.rs:2051:10:2051:10 | T |
-| main.rs:2056:17:2056:25 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:2056:17:2056:25 | SelfParam | &T | main.rs:2046:5:2049:5 | MyVec |
-| main.rs:2056:17:2056:25 | SelfParam | &T.T | main.rs:2051:10:2051:10 | T |
-| main.rs:2056:28:2056:32 | value |  | main.rs:2051:10:2051:10 | T |
-| main.rs:2057:13:2057:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:2057:13:2057:16 | self | &T | main.rs:2046:5:2049:5 | MyVec |
-| main.rs:2057:13:2057:16 | self | &T.T | main.rs:2051:10:2051:10 | T |
-| main.rs:2057:13:2057:21 | self.data |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2057:13:2057:21 | self.data | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2057:13:2057:21 | self.data | T | main.rs:2051:10:2051:10 | T |
-| main.rs:2057:28:2057:32 | value |  | main.rs:2051:10:2051:10 | T |
-| main.rs:2065:18:2065:22 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:2065:18:2065:22 | SelfParam | &T | main.rs:2046:5:2049:5 | MyVec |
-| main.rs:2065:18:2065:22 | SelfParam | &T.T | main.rs:2061:10:2061:10 | T |
-| main.rs:2065:25:2065:29 | index |  | {EXTERNAL LOCATION} | usize |
-| main.rs:2065:56:2067:9 | { ... } |  | file://:0:0:0:0 | & |
-| main.rs:2065:56:2067:9 | { ... } | &T | main.rs:2061:10:2061:10 | T |
-| main.rs:2066:13:2066:29 | &... |  | file://:0:0:0:0 | & |
-| main.rs:2066:13:2066:29 | &... | &T | main.rs:2061:10:2061:10 | T |
-| main.rs:2066:14:2066:17 | self |  | file://:0:0:0:0 | & |
-| main.rs:2066:14:2066:17 | self | &T | main.rs:2046:5:2049:5 | MyVec |
-| main.rs:2066:14:2066:17 | self | &T.T | main.rs:2061:10:2061:10 | T |
-| main.rs:2066:14:2066:22 | self.data |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2066:14:2066:22 | self.data | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2066:14:2066:22 | self.data | T | main.rs:2061:10:2061:10 | T |
-| main.rs:2066:14:2066:29 | ...[index] |  | main.rs:2061:10:2061:10 | T |
-| main.rs:2066:24:2066:28 | index |  | {EXTERNAL LOCATION} | usize |
-| main.rs:2070:22:2070:26 | slice |  | file://:0:0:0:0 | & |
-| main.rs:2070:22:2070:26 | slice | &T | file://:0:0:0:0 | [] |
-| main.rs:2070:22:2070:26 | slice | &T.[T] | main.rs:2037:5:2038:13 | S |
-| main.rs:2071:13:2071:13 | x |  | main.rs:2037:5:2038:13 | S |
-| main.rs:2071:17:2071:21 | slice |  | file://:0:0:0:0 | & |
-| main.rs:2071:17:2071:21 | slice | &T | file://:0:0:0:0 | [] |
-| main.rs:2071:17:2071:21 | slice | &T.[T] | main.rs:2037:5:2038:13 | S |
-| main.rs:2071:17:2071:24 | slice[0] |  | main.rs:2037:5:2038:13 | S |
-| main.rs:2071:17:2071:30 | ... .foo() |  | main.rs:2037:5:2038:13 | S |
-| main.rs:2071:23:2071:23 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2075:17:2075:19 | vec |  | main.rs:2046:5:2049:5 | MyVec |
-| main.rs:2075:17:2075:19 | vec | T | main.rs:2037:5:2038:13 | S |
-| main.rs:2075:23:2075:34 | ...::new(...) |  | main.rs:2046:5:2049:5 | MyVec |
-| main.rs:2075:23:2075:34 | ...::new(...) | T | main.rs:2037:5:2038:13 | S |
-| main.rs:2076:9:2076:11 | vec |  | main.rs:2046:5:2049:5 | MyVec |
-| main.rs:2076:9:2076:11 | vec | T | main.rs:2037:5:2038:13 | S |
-| main.rs:2076:18:2076:18 | S |  | main.rs:2037:5:2038:13 | S |
-| main.rs:2077:9:2077:11 | vec |  | main.rs:2046:5:2049:5 | MyVec |
-| main.rs:2077:9:2077:11 | vec | T | main.rs:2037:5:2038:13 | S |
-| main.rs:2077:9:2077:14 | vec[0] |  | main.rs:2037:5:2038:13 | S |
-| main.rs:2077:9:2077:20 | ... .foo() |  | main.rs:2037:5:2038:13 | S |
-| main.rs:2077:13:2077:13 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2077:13:2077:13 | 0 |  | {EXTERNAL LOCATION} | usize |
-| main.rs:2079:13:2079:14 | xs |  | file://:0:0:0:0 | [] |
-| main.rs:2079:13:2079:14 | xs | [T;...] | main.rs:2037:5:2038:13 | S |
-| main.rs:2079:21:2079:21 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2079:26:2079:28 | [...] |  | file://:0:0:0:0 | [] |
-| main.rs:2079:26:2079:28 | [...] | [T;...] | main.rs:2037:5:2038:13 | S |
-| main.rs:2079:27:2079:27 | S |  | main.rs:2037:5:2038:13 | S |
-| main.rs:2080:13:2080:13 | x |  | main.rs:2037:5:2038:13 | S |
-| main.rs:2080:17:2080:18 | xs |  | file://:0:0:0:0 | [] |
-| main.rs:2080:17:2080:18 | xs | [T;...] | main.rs:2037:5:2038:13 | S |
-| main.rs:2080:17:2080:21 | xs[0] |  | main.rs:2037:5:2038:13 | S |
-| main.rs:2080:17:2080:27 | ... .foo() |  | main.rs:2037:5:2038:13 | S |
-| main.rs:2080:20:2080:20 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2082:23:2082:25 | &xs |  | file://:0:0:0:0 | & |
-| main.rs:2082:23:2082:25 | &xs | &T | file://:0:0:0:0 | [] |
-| main.rs:2082:23:2082:25 | &xs | &T | file://:0:0:0:0 | [] |
-| main.rs:2082:23:2082:25 | &xs | &T.[T;...] | main.rs:2037:5:2038:13 | S |
-| main.rs:2082:23:2082:25 | &xs | &T.[T] | main.rs:2037:5:2038:13 | S |
-| main.rs:2082:24:2082:25 | xs |  | file://:0:0:0:0 | [] |
-| main.rs:2082:24:2082:25 | xs | [T;...] | main.rs:2037:5:2038:13 | S |
-| main.rs:2088:13:2088:13 | x |  | {EXTERNAL LOCATION} | String |
-| main.rs:2088:17:2088:46 | MacroExpr |  | {EXTERNAL LOCATION} | String |
-| main.rs:2088:25:2088:35 | "Hello, {}" |  | file://:0:0:0:0 | & |
-| main.rs:2088:25:2088:35 | "Hello, {}" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:2088:25:2088:45 | ...::format(...) |  | {EXTERNAL LOCATION} | String |
-| main.rs:2088:25:2088:45 | ...::must_use(...) |  | {EXTERNAL LOCATION} | String |
-| main.rs:2088:25:2088:45 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:2088:25:2088:45 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:2088:25:2088:45 | { ... } |  | {EXTERNAL LOCATION} | String |
-| main.rs:2088:38:2088:45 | "World!" |  | file://:0:0:0:0 | & |
-| main.rs:2088:38:2088:45 | "World!" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:2097:19:2097:22 | SelfParam |  | main.rs:2093:5:2098:5 | Self [trait MyAdd] |
-| main.rs:2097:25:2097:27 | rhs |  | main.rs:2093:17:2093:26 | Rhs |
-| main.rs:2104:19:2104:22 | SelfParam |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2104:25:2104:29 | value |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2104:45:2106:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2105:13:2105:17 | value |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2113:19:2113:22 | SelfParam |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2113:25:2113:29 | value |  | file://:0:0:0:0 | & |
-| main.rs:2113:25:2113:29 | value | &T | {EXTERNAL LOCATION} | i64 |
-| main.rs:2113:46:2115:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2114:13:2114:18 | * ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2114:14:2114:18 | value |  | file://:0:0:0:0 | & |
-| main.rs:2114:14:2114:18 | value | &T | {EXTERNAL LOCATION} | i64 |
-| main.rs:2122:19:2122:22 | SelfParam |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2122:25:2122:29 | value |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2122:46:2128:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2123:13:2127:13 | if value {...} else {...} |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2123:13:2127:13 | if value {...} else {...} |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2123:16:2123:20 | value |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2123:22:2125:13 | { ... } |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2123:22:2125:13 | { ... } |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2124:17:2124:17 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2124:17:2124:17 | 1 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2125:20:2127:13 | { ... } |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2125:20:2127:13 | { ... } |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2126:17:2126:17 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2126:17:2126:17 | 0 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2137:19:2137:22 | SelfParam |  | main.rs:2131:5:2131:19 | S |
-| main.rs:2137:19:2137:22 | SelfParam | T | main.rs:2133:10:2133:17 | T |
-| main.rs:2137:25:2137:29 | other |  | main.rs:2131:5:2131:19 | S |
-| main.rs:2137:25:2137:29 | other | T | main.rs:2133:10:2133:17 | T |
-| main.rs:2137:54:2139:9 | { ... } |  | main.rs:2131:5:2131:19 | S |
-| main.rs:2137:54:2139:9 | { ... } | T | main.rs:2094:9:2094:20 | Output |
-| main.rs:2138:13:2138:39 | S(...) |  | main.rs:2131:5:2131:19 | S |
-| main.rs:2138:13:2138:39 | S(...) | T | main.rs:2094:9:2094:20 | Output |
-| main.rs:2138:15:2138:22 | (...) |  | main.rs:2133:10:2133:17 | T |
-| main.rs:2138:15:2138:38 | ... .my_add(...) |  | main.rs:2094:9:2094:20 | Output |
-| main.rs:2138:16:2138:19 | self |  | main.rs:2131:5:2131:19 | S |
-| main.rs:2138:16:2138:19 | self | T | main.rs:2133:10:2133:17 | T |
-| main.rs:2138:16:2138:21 | self.0 |  | main.rs:2133:10:2133:17 | T |
-| main.rs:2138:31:2138:35 | other |  | main.rs:2131:5:2131:19 | S |
-| main.rs:2138:31:2138:35 | other | T | main.rs:2133:10:2133:17 | T |
-| main.rs:2138:31:2138:37 | other.0 |  | main.rs:2093:5:2098:5 | Self [trait MyAdd] |
-| main.rs:2138:31:2138:37 | other.0 |  | main.rs:2133:10:2133:17 | T |
-| main.rs:2146:19:2146:22 | SelfParam |  | main.rs:2131:5:2131:19 | S |
-| main.rs:2146:19:2146:22 | SelfParam | T | main.rs:2142:10:2142:17 | T |
-| main.rs:2146:25:2146:29 | other |  | main.rs:2142:10:2142:17 | T |
-| main.rs:2146:51:2148:9 | { ... } |  | main.rs:2131:5:2131:19 | S |
-| main.rs:2146:51:2148:9 | { ... } | T | main.rs:2094:9:2094:20 | Output |
-| main.rs:2147:13:2147:37 | S(...) |  | main.rs:2131:5:2131:19 | S |
-| main.rs:2147:13:2147:37 | S(...) | T | main.rs:2094:9:2094:20 | Output |
-| main.rs:2147:15:2147:22 | (...) |  | main.rs:2142:10:2142:17 | T |
-| main.rs:2147:15:2147:36 | ... .my_add(...) |  | main.rs:2094:9:2094:20 | Output |
-| main.rs:2147:16:2147:19 | self |  | main.rs:2131:5:2131:19 | S |
-| main.rs:2147:16:2147:19 | self | T | main.rs:2142:10:2142:17 | T |
-| main.rs:2147:16:2147:21 | self.0 |  | main.rs:2142:10:2142:17 | T |
-| main.rs:2147:31:2147:35 | other |  | main.rs:2142:10:2142:17 | T |
-| main.rs:2158:19:2158:22 | SelfParam |  | main.rs:2131:5:2131:19 | S |
-| main.rs:2158:19:2158:22 | SelfParam | T | main.rs:2151:14:2151:14 | T |
-| main.rs:2158:25:2158:29 | other |  | file://:0:0:0:0 | & |
-| main.rs:2158:25:2158:29 | other | &T | main.rs:2151:14:2151:14 | T |
-| main.rs:2158:55:2160:9 | { ... } |  | main.rs:2131:5:2131:19 | S |
-| main.rs:2159:13:2159:37 | S(...) |  | main.rs:2131:5:2131:19 | S |
-| main.rs:2159:15:2159:22 | (...) |  | main.rs:2151:14:2151:14 | T |
-| main.rs:2159:16:2159:19 | self |  | main.rs:2131:5:2131:19 | S |
-| main.rs:2159:16:2159:19 | self | T | main.rs:2151:14:2151:14 | T |
-| main.rs:2159:16:2159:21 | self.0 |  | main.rs:2151:14:2151:14 | T |
-| main.rs:2159:31:2159:35 | other |  | file://:0:0:0:0 | & |
-| main.rs:2159:31:2159:35 | other | &T | main.rs:2151:14:2151:14 | T |
-| main.rs:2165:20:2165:24 | value |  | main.rs:2163:18:2163:18 | T |
-| main.rs:2170:20:2170:24 | value |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2170:40:2172:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2171:13:2171:17 | value |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2177:20:2177:24 | value |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2177:41:2183:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2178:13:2182:13 | if value {...} else {...} |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2178:13:2182:13 | if value {...} else {...} |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2178:16:2178:20 | value |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2178:22:2180:13 | { ... } |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2178:22:2180:13 | { ... } |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2179:17:2179:17 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2179:17:2179:17 | 1 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2180:20:2182:13 | { ... } |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2180:20:2182:13 | { ... } |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2181:17:2181:17 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2181:17:2181:17 | 0 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2188:21:2188:25 | value |  | main.rs:2186:19:2186:19 | T |
-| main.rs:2188:31:2188:31 | x |  | main.rs:2186:5:2189:5 | Self [trait MyFrom2] |
-| main.rs:2193:21:2193:25 | value |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2193:33:2193:33 | _ |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2193:48:2195:9 | { ... } |  | file://:0:0:0:0 | () |
-| main.rs:2194:13:2194:17 | value |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2200:21:2200:25 | value |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2200:34:2200:34 | _ |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2200:49:2206:9 | { ... } |  | file://:0:0:0:0 | () |
-| main.rs:2201:13:2205:13 | if value {...} else {...} |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2201:16:2201:20 | value |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2201:22:2203:13 | { ... } |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2202:17:2202:17 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2203:20:2205:13 | { ... } |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2204:17:2204:17 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2211:15:2211:15 | x |  | main.rs:2209:5:2215:5 | Self [trait MySelfTrait] |
-| main.rs:2214:15:2214:15 | x |  | main.rs:2209:5:2215:5 | Self [trait MySelfTrait] |
-| main.rs:2219:15:2219:15 | x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2219:31:2221:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2220:13:2220:13 | x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2220:13:2220:17 | ... + ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2220:17:2220:17 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2224:15:2224:15 | x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2224:32:2226:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2225:13:2225:13 | x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2225:13:2225:17 | ... + ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2225:17:2225:17 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2231:15:2231:15 | x |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2231:31:2233:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2232:13:2232:13 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2232:13:2232:13 | 0 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2236:15:2236:15 | x |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2236:32:2238:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2237:13:2237:13 | x |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2242:13:2242:13 | x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2242:22:2242:23 | 73 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2242:22:2242:23 | 73 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2243:9:2243:9 | x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2243:9:2243:22 | x.my_add(...) |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2243:18:2243:21 | 5i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2244:9:2244:9 | x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2244:9:2244:23 | x.my_add(...) |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2244:18:2244:22 | &5i64 |  | file://:0:0:0:0 | & |
-| main.rs:2244:18:2244:22 | &5i64 | &T | {EXTERNAL LOCATION} | i64 |
-| main.rs:2244:19:2244:22 | 5i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2245:9:2245:9 | x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2245:9:2245:22 | x.my_add(...) |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2245:18:2245:21 | true |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2247:9:2247:15 | S(...) |  | main.rs:2131:5:2131:19 | S |
-| main.rs:2247:9:2247:15 | S(...) | T | {EXTERNAL LOCATION} | i64 |
-| main.rs:2247:9:2247:31 | ... .my_add(...) |  | main.rs:2131:5:2131:19 | S |
-| main.rs:2247:11:2247:14 | 1i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2247:24:2247:30 | S(...) |  | main.rs:2131:5:2131:19 | S |
-| main.rs:2247:24:2247:30 | S(...) | T | {EXTERNAL LOCATION} | i64 |
-| main.rs:2247:26:2247:29 | 2i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2248:9:2248:15 | S(...) |  | main.rs:2131:5:2131:19 | S |
-| main.rs:2248:9:2248:15 | S(...) | T | {EXTERNAL LOCATION} | i64 |
-| main.rs:2248:11:2248:14 | 1i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2248:24:2248:27 | 3i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2249:9:2249:15 | S(...) |  | main.rs:2131:5:2131:19 | S |
-| main.rs:2249:9:2249:15 | S(...) | T | {EXTERNAL LOCATION} | i64 |
-| main.rs:2249:9:2249:29 | ... .my_add(...) |  | main.rs:2131:5:2131:19 | S |
-| main.rs:2249:11:2249:14 | 1i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2249:24:2249:28 | &3i64 |  | file://:0:0:0:0 | & |
-| main.rs:2249:24:2249:28 | &3i64 | &T | {EXTERNAL LOCATION} | i64 |
-| main.rs:2249:25:2249:28 | 3i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2251:13:2251:13 | x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2251:17:2251:35 | ...::my_from(...) |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2251:30:2251:34 | 73i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2252:13:2252:13 | y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2252:17:2252:34 | ...::my_from(...) |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2252:30:2252:33 | true |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2253:13:2253:13 | z |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2253:22:2253:43 | ...::my_from(...) |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2253:38:2253:42 | 73i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2254:9:2254:34 | ...::my_from2(...) |  | file://:0:0:0:0 | () |
-| main.rs:2254:23:2254:27 | 73i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2254:30:2254:33 | 0i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2255:9:2255:33 | ...::my_from2(...) |  | file://:0:0:0:0 | () |
-| main.rs:2255:23:2255:26 | true |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2255:29:2255:32 | 0i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2256:9:2256:38 | ...::my_from2(...) |  | file://:0:0:0:0 | () |
-| main.rs:2256:27:2256:31 | 73i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2256:34:2256:37 | 0i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2258:9:2258:22 | ...::f1(...) |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2258:17:2258:21 | 73i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2259:9:2259:22 | ...::f2(...) |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2259:17:2259:21 | 73i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2260:9:2260:22 | ...::f1(...) |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2260:18:2260:21 | true |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2261:9:2261:22 | ...::f2(...) |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2261:18:2261:21 | true |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2262:9:2262:30 | ...::f1(...) |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2262:25:2262:29 | 73i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2263:9:2263:30 | ...::f2(...) |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2263:25:2263:29 | 73i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2264:9:2264:29 | ...::f1(...) |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2264:25:2264:28 | true |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2265:9:2265:29 | ...::f2(...) |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2265:25:2265:28 | true |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2273:26:2275:9 | { ... } |  | main.rs:2270:5:2270:24 | MyCallable |
-| main.rs:2274:13:2274:25 | MyCallable {...} |  | main.rs:2270:5:2270:24 | MyCallable |
-| main.rs:2277:17:2277:21 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:2277:17:2277:21 | SelfParam | &T | main.rs:2270:5:2270:24 | MyCallable |
-| main.rs:2277:31:2279:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2278:13:2278:13 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2278:13:2278:13 | 1 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2285:13:2285:13 | i |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2285:18:2285:26 | [...] |  | file://:0:0:0:0 | [] |
-| main.rs:2285:18:2285:26 | [...] | [T;...] | {EXTERNAL LOCATION} | i32 |
-| main.rs:2285:19:2285:19 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2285:22:2285:22 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2285:25:2285:25 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2286:18:2286:26 | [...] |  | file://:0:0:0:0 | [] |
-| main.rs:2286:18:2286:26 | [...] | [T;...] | {EXTERNAL LOCATION} | i32 |
-| main.rs:2286:18:2286:41 | ... .map(...) |  | file://:0:0:0:0 | [] |
-| main.rs:2286:19:2286:19 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2286:22:2286:22 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2286:25:2286:25 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2286:32:2286:40 | \|...\| ... |  | {EXTERNAL LOCATION} | dyn FnOnce |
-| main.rs:2286:32:2286:40 | \|...\| ... | dyn(Args) | file://:0:0:0:0 | (T_1) |
-| main.rs:2286:40:2286:40 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2287:13:2287:13 | i |  | {EXTERNAL LOCATION} | Item |
-| main.rs:2287:13:2287:13 | i |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2287:18:2287:26 | [...] |  | file://:0:0:0:0 | [] |
-| main.rs:2287:18:2287:26 | [...] | [T;...] | {EXTERNAL LOCATION} | i32 |
-| main.rs:2287:18:2287:38 | ... .into_iter() |  | {EXTERNAL LOCATION} | IntoIter |
-| main.rs:2287:18:2287:38 | ... .into_iter() | T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2287:19:2287:19 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2287:22:2287:22 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2287:25:2287:25 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2289:13:2289:17 | vals1 |  | file://:0:0:0:0 | [] |
-| main.rs:2289:13:2289:17 | vals1 | [T;...] | {EXTERNAL LOCATION} | i32 |
-| main.rs:2289:13:2289:17 | vals1 | [T;...] | {EXTERNAL LOCATION} | u8 |
-| main.rs:2289:21:2289:31 | [...] |  | file://:0:0:0:0 | [] |
-| main.rs:2289:21:2289:31 | [...] | [T;...] | {EXTERNAL LOCATION} | i32 |
-| main.rs:2289:21:2289:31 | [...] | [T;...] | {EXTERNAL LOCATION} | u8 |
-| main.rs:2289:22:2289:24 | 1u8 |  | {EXTERNAL LOCATION} | u8 |
-| main.rs:2289:27:2289:27 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2289:27:2289:27 | 2 |  | {EXTERNAL LOCATION} | u8 |
-| main.rs:2289:30:2289:30 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2289:30:2289:30 | 3 |  | {EXTERNAL LOCATION} | u8 |
-| main.rs:2290:13:2290:13 | u |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2290:13:2290:13 | u |  | {EXTERNAL LOCATION} | u8 |
-| main.rs:2290:18:2290:22 | vals1 |  | file://:0:0:0:0 | [] |
-| main.rs:2290:18:2290:22 | vals1 | [T;...] | {EXTERNAL LOCATION} | i32 |
-| main.rs:2290:18:2290:22 | vals1 | [T;...] | {EXTERNAL LOCATION} | u8 |
-| main.rs:2292:13:2292:17 | vals2 |  | file://:0:0:0:0 | [] |
-| main.rs:2292:13:2292:17 | vals2 | [T;...] | {EXTERNAL LOCATION} | u16 |
-| main.rs:2292:21:2292:29 | [1u16; 3] |  | file://:0:0:0:0 | [] |
-| main.rs:2292:21:2292:29 | [1u16; 3] | [T;...] | {EXTERNAL LOCATION} | u16 |
-| main.rs:2292:22:2292:25 | 1u16 |  | {EXTERNAL LOCATION} | u16 |
-| main.rs:2292:28:2292:28 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2293:13:2293:13 | u |  | {EXTERNAL LOCATION} | u16 |
-| main.rs:2293:18:2293:22 | vals2 |  | file://:0:0:0:0 | [] |
-| main.rs:2293:18:2293:22 | vals2 | [T;...] | {EXTERNAL LOCATION} | u16 |
-| main.rs:2295:13:2295:17 | vals3 |  | file://:0:0:0:0 | [] |
-| main.rs:2295:13:2295:17 | vals3 | [T;...] | {EXTERNAL LOCATION} | u32 |
-| main.rs:2295:26:2295:26 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2295:31:2295:39 | [...] |  | file://:0:0:0:0 | [] |
-| main.rs:2295:31:2295:39 | [...] | [T;...] | {EXTERNAL LOCATION} | i32 |
-| main.rs:2295:31:2295:39 | [...] | [T;...] | {EXTERNAL LOCATION} | u32 |
-| main.rs:2295:32:2295:32 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2295:32:2295:32 | 1 |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:2295:35:2295:35 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2295:35:2295:35 | 2 |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:2295:38:2295:38 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2295:38:2295:38 | 3 |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:2296:13:2296:13 | u |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:2296:18:2296:22 | vals3 |  | file://:0:0:0:0 | [] |
-| main.rs:2296:18:2296:22 | vals3 | [T;...] | {EXTERNAL LOCATION} | u32 |
-| main.rs:2298:13:2298:17 | vals4 |  | file://:0:0:0:0 | [] |
-| main.rs:2298:13:2298:17 | vals4 | [T;...] | {EXTERNAL LOCATION} | u64 |
-| main.rs:2298:26:2298:26 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2298:31:2298:36 | [1; 3] |  | file://:0:0:0:0 | [] |
-| main.rs:2298:31:2298:36 | [1; 3] | [T;...] | {EXTERNAL LOCATION} | i32 |
-| main.rs:2298:31:2298:36 | [1; 3] | [T;...] | {EXTERNAL LOCATION} | u64 |
-| main.rs:2298:32:2298:32 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2298:32:2298:32 | 1 |  | {EXTERNAL LOCATION} | u64 |
-| main.rs:2298:35:2298:35 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2299:13:2299:13 | u |  | {EXTERNAL LOCATION} | u64 |
-| main.rs:2299:18:2299:22 | vals4 |  | file://:0:0:0:0 | [] |
-| main.rs:2299:18:2299:22 | vals4 | [T;...] | {EXTERNAL LOCATION} | u64 |
-| main.rs:2301:17:2301:24 | strings1 |  | file://:0:0:0:0 | [] |
-| main.rs:2301:17:2301:24 | strings1 | [T;...] | file://:0:0:0:0 | & |
-| main.rs:2301:17:2301:24 | strings1 | [T;...].&T | {EXTERNAL LOCATION} | str |
-| main.rs:2301:28:2301:48 | [...] |  | file://:0:0:0:0 | [] |
-| main.rs:2301:28:2301:48 | [...] | [T;...] | file://:0:0:0:0 | & |
-| main.rs:2301:28:2301:48 | [...] | [T;...].&T | {EXTERNAL LOCATION} | str |
-| main.rs:2301:29:2301:33 | "foo" |  | file://:0:0:0:0 | & |
-| main.rs:2301:29:2301:33 | "foo" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:2301:36:2301:40 | "bar" |  | file://:0:0:0:0 | & |
-| main.rs:2301:36:2301:40 | "bar" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:2301:43:2301:47 | "baz" |  | file://:0:0:0:0 | & |
-| main.rs:2301:43:2301:47 | "baz" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:2302:13:2302:13 | s |  | {EXTERNAL LOCATION} | Item |
-| main.rs:2302:13:2302:13 | s |  | file://:0:0:0:0 | & |
-| main.rs:2302:13:2302:13 | s | &T | file://:0:0:0:0 | & |
-| main.rs:2302:13:2302:13 | s | &T.&T | {EXTERNAL LOCATION} | str |
-| main.rs:2302:18:2302:26 | &strings1 |  | file://:0:0:0:0 | & |
-| main.rs:2302:18:2302:26 | &strings1 | &T | file://:0:0:0:0 | [] |
-| main.rs:2302:18:2302:26 | &strings1 | &T.[T;...] | file://:0:0:0:0 | & |
-| main.rs:2302:18:2302:26 | &strings1 | &T.[T;...].&T | {EXTERNAL LOCATION} | str |
-| main.rs:2302:19:2302:26 | strings1 |  | file://:0:0:0:0 | [] |
-| main.rs:2302:19:2302:26 | strings1 | [T;...] | file://:0:0:0:0 | & |
-| main.rs:2302:19:2302:26 | strings1 | [T;...].&T | {EXTERNAL LOCATION} | str |
-| main.rs:2303:13:2303:13 | s |  | {EXTERNAL LOCATION} | Item |
-| main.rs:2303:13:2303:13 | s |  | file://:0:0:0:0 | & |
-| main.rs:2303:13:2303:13 | s | &T | file://:0:0:0:0 | & |
-| main.rs:2303:13:2303:13 | s | &T.&T | {EXTERNAL LOCATION} | str |
-| main.rs:2303:18:2303:30 | &mut strings1 |  | file://:0:0:0:0 | & |
-| main.rs:2303:18:2303:30 | &mut strings1 | &T | file://:0:0:0:0 | [] |
-| main.rs:2303:18:2303:30 | &mut strings1 | &T.[T;...] | file://:0:0:0:0 | & |
-| main.rs:2303:18:2303:30 | &mut strings1 | &T.[T;...].&T | {EXTERNAL LOCATION} | str |
-| main.rs:2303:23:2303:30 | strings1 |  | file://:0:0:0:0 | [] |
-| main.rs:2303:23:2303:30 | strings1 | [T;...] | file://:0:0:0:0 | & |
-| main.rs:2303:23:2303:30 | strings1 | [T;...].&T | {EXTERNAL LOCATION} | str |
-| main.rs:2304:13:2304:13 | s |  | file://:0:0:0:0 | & |
-| main.rs:2304:13:2304:13 | s | &T | {EXTERNAL LOCATION} | str |
-| main.rs:2304:18:2304:25 | strings1 |  | file://:0:0:0:0 | [] |
-| main.rs:2304:18:2304:25 | strings1 | [T;...] | file://:0:0:0:0 | & |
-| main.rs:2304:18:2304:25 | strings1 | [T;...].&T | {EXTERNAL LOCATION} | str |
-| main.rs:2306:13:2306:20 | strings2 |  | file://:0:0:0:0 | [] |
-| main.rs:2306:13:2306:20 | strings2 | [T;...] | {EXTERNAL LOCATION} | String |
-| main.rs:2307:9:2311:9 | [...] |  | file://:0:0:0:0 | [] |
-| main.rs:2307:9:2311:9 | [...] | [T;...] | {EXTERNAL LOCATION} | String |
-| main.rs:2308:13:2308:31 | ...::from(...) |  | {EXTERNAL LOCATION} | String |
-| main.rs:2308:26:2308:30 | "foo" |  | file://:0:0:0:0 | & |
-| main.rs:2308:26:2308:30 | "foo" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:2309:13:2309:31 | ...::from(...) |  | {EXTERNAL LOCATION} | String |
-| main.rs:2309:26:2309:30 | "bar" |  | file://:0:0:0:0 | & |
-| main.rs:2309:26:2309:30 | "bar" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:2310:13:2310:31 | ...::from(...) |  | {EXTERNAL LOCATION} | String |
-| main.rs:2310:26:2310:30 | "baz" |  | file://:0:0:0:0 | & |
-| main.rs:2310:26:2310:30 | "baz" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:2312:13:2312:13 | s |  | {EXTERNAL LOCATION} | String |
-| main.rs:2312:18:2312:25 | strings2 |  | file://:0:0:0:0 | [] |
-| main.rs:2312:18:2312:25 | strings2 | [T;...] | {EXTERNAL LOCATION} | String |
-| main.rs:2314:13:2314:20 | strings3 |  | file://:0:0:0:0 | & |
-| main.rs:2314:13:2314:20 | strings3 | &T | file://:0:0:0:0 | [] |
-| main.rs:2314:13:2314:20 | strings3 | &T.[T;...] | {EXTERNAL LOCATION} | String |
-| main.rs:2315:9:2319:9 | &... |  | file://:0:0:0:0 | & |
-| main.rs:2315:9:2319:9 | &... | &T | file://:0:0:0:0 | [] |
-| main.rs:2315:9:2319:9 | &... | &T.[T;...] | {EXTERNAL LOCATION} | String |
-| main.rs:2315:10:2319:9 | [...] |  | file://:0:0:0:0 | [] |
-| main.rs:2315:10:2319:9 | [...] | [T;...] | {EXTERNAL LOCATION} | String |
-| main.rs:2316:13:2316:31 | ...::from(...) |  | {EXTERNAL LOCATION} | String |
-| main.rs:2316:26:2316:30 | "foo" |  | file://:0:0:0:0 | & |
-| main.rs:2316:26:2316:30 | "foo" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:2317:13:2317:31 | ...::from(...) |  | {EXTERNAL LOCATION} | String |
-| main.rs:2317:26:2317:30 | "bar" |  | file://:0:0:0:0 | & |
-| main.rs:2317:26:2317:30 | "bar" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:2318:13:2318:31 | ...::from(...) |  | {EXTERNAL LOCATION} | String |
-| main.rs:2318:26:2318:30 | "baz" |  | file://:0:0:0:0 | & |
-| main.rs:2318:26:2318:30 | "baz" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:2320:13:2320:13 | s |  | {EXTERNAL LOCATION} | Item |
-| main.rs:2320:13:2320:13 | s |  | file://:0:0:0:0 | & |
-| main.rs:2320:13:2320:13 | s | &T | {EXTERNAL LOCATION} | String |
-| main.rs:2320:18:2320:25 | strings3 |  | file://:0:0:0:0 | & |
-| main.rs:2320:18:2320:25 | strings3 | &T | file://:0:0:0:0 | [] |
-| main.rs:2320:18:2320:25 | strings3 | &T.[T;...] | {EXTERNAL LOCATION} | String |
-| main.rs:2322:13:2322:21 | callables |  | file://:0:0:0:0 | [] |
-| main.rs:2322:13:2322:21 | callables | [T;...] | main.rs:2270:5:2270:24 | MyCallable |
-| main.rs:2322:25:2322:81 | [...] |  | file://:0:0:0:0 | [] |
-| main.rs:2322:25:2322:81 | [...] | [T;...] | main.rs:2270:5:2270:24 | MyCallable |
-| main.rs:2322:26:2322:42 | ...::new(...) |  | main.rs:2270:5:2270:24 | MyCallable |
-| main.rs:2322:45:2322:61 | ...::new(...) |  | main.rs:2270:5:2270:24 | MyCallable |
-| main.rs:2322:64:2322:80 | ...::new(...) |  | main.rs:2270:5:2270:24 | MyCallable |
-| main.rs:2323:13:2323:13 | c |  | main.rs:2270:5:2270:24 | MyCallable |
-| main.rs:2324:12:2324:20 | callables |  | file://:0:0:0:0 | [] |
-| main.rs:2324:12:2324:20 | callables | [T;...] | main.rs:2270:5:2270:24 | MyCallable |
-| main.rs:2326:17:2326:22 | result |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2326:26:2326:26 | c |  | main.rs:2270:5:2270:24 | MyCallable |
-| main.rs:2326:26:2326:33 | c.call() |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2331:13:2331:13 | i |  | {EXTERNAL LOCATION} | Item |
-| main.rs:2331:13:2331:13 | i |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2331:18:2331:18 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2331:18:2331:22 | 0..10 |  | {EXTERNAL LOCATION} | Range |
-| main.rs:2331:18:2331:22 | 0..10 | Idx | {EXTERNAL LOCATION} | i32 |
-| main.rs:2331:21:2331:22 | 10 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2332:13:2332:13 | u |  | {EXTERNAL LOCATION} | Range |
-| main.rs:2332:13:2332:13 | u | Idx | {EXTERNAL LOCATION} | i32 |
-| main.rs:2332:13:2332:13 | u | Idx | {EXTERNAL LOCATION} | u8 |
-| main.rs:2332:18:2332:26 | [...] |  | file://:0:0:0:0 | [] |
-| main.rs:2332:18:2332:26 | [...] | [T;...] | {EXTERNAL LOCATION} | Range |
-| main.rs:2332:18:2332:26 | [...] | [T;...].Idx | {EXTERNAL LOCATION} | i32 |
-| main.rs:2332:18:2332:26 | [...] | [T;...].Idx | {EXTERNAL LOCATION} | u8 |
-| main.rs:2332:19:2332:21 | 0u8 |  | {EXTERNAL LOCATION} | u8 |
-| main.rs:2332:19:2332:25 | 0u8..10 |  | {EXTERNAL LOCATION} | Range |
-| main.rs:2332:19:2332:25 | 0u8..10 | Idx | {EXTERNAL LOCATION} | i32 |
-| main.rs:2332:19:2332:25 | 0u8..10 | Idx | {EXTERNAL LOCATION} | u8 |
-| main.rs:2332:24:2332:25 | 10 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2332:24:2332:25 | 10 |  | {EXTERNAL LOCATION} | u8 |
-| main.rs:2333:13:2333:17 | range |  | {EXTERNAL LOCATION} | Range |
-| main.rs:2333:13:2333:17 | range | Idx | {EXTERNAL LOCATION} | i32 |
-| main.rs:2333:21:2333:21 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2333:21:2333:25 | 0..10 |  | {EXTERNAL LOCATION} | Range |
-| main.rs:2333:21:2333:25 | 0..10 | Idx | {EXTERNAL LOCATION} | i32 |
-| main.rs:2333:24:2333:25 | 10 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2334:13:2334:13 | i |  | {EXTERNAL LOCATION} | Item |
-| main.rs:2334:13:2334:13 | i |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2334:18:2334:22 | range |  | {EXTERNAL LOCATION} | Range |
-| main.rs:2334:18:2334:22 | range | Idx | {EXTERNAL LOCATION} | i32 |
-| main.rs:2336:13:2336:18 | range1 |  | {EXTERNAL LOCATION} | Range |
-| main.rs:2336:13:2336:18 | range1 | Idx | {EXTERNAL LOCATION} | u16 |
-| main.rs:2337:9:2340:9 | ...::Range {...} |  | {EXTERNAL LOCATION} | Range |
-| main.rs:2337:9:2340:9 | ...::Range {...} | Idx | {EXTERNAL LOCATION} | u16 |
-| main.rs:2338:20:2338:23 | 0u16 |  | {EXTERNAL LOCATION} | u16 |
-| main.rs:2339:18:2339:22 | 10u16 |  | {EXTERNAL LOCATION} | u16 |
-| main.rs:2341:13:2341:13 | u |  | {EXTERNAL LOCATION} | Item |
-| main.rs:2341:13:2341:13 | u |  | {EXTERNAL LOCATION} | u16 |
-| main.rs:2341:18:2341:23 | range1 |  | {EXTERNAL LOCATION} | Range |
-| main.rs:2341:18:2341:23 | range1 | Idx | {EXTERNAL LOCATION} | u16 |
-| main.rs:2345:26:2345:26 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2345:29:2345:29 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2345:32:2345:32 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2348:13:2348:18 | vals4a |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2348:13:2348:18 | vals4a | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2348:13:2348:18 | vals4a | T | {EXTERNAL LOCATION} | u16 |
-| main.rs:2348:32:2348:43 | [...] |  | file://:0:0:0:0 | [] |
-| main.rs:2348:32:2348:43 | [...] | [T;...] | {EXTERNAL LOCATION} | i32 |
-| main.rs:2348:32:2348:43 | [...] | [T;...] | {EXTERNAL LOCATION} | u16 |
-| main.rs:2348:32:2348:52 | ... .to_vec() |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2348:32:2348:52 | ... .to_vec() | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2348:32:2348:52 | ... .to_vec() | T | {EXTERNAL LOCATION} | u16 |
-| main.rs:2348:33:2348:36 | 1u16 |  | {EXTERNAL LOCATION} | u16 |
-| main.rs:2348:39:2348:39 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2348:39:2348:39 | 2 |  | {EXTERNAL LOCATION} | u16 |
-| main.rs:2348:42:2348:42 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2348:42:2348:42 | 3 |  | {EXTERNAL LOCATION} | u16 |
-| main.rs:2349:13:2349:13 | u |  | {EXTERNAL LOCATION} | u16 |
-| main.rs:2349:13:2349:13 | u |  | file://:0:0:0:0 | & |
-| main.rs:2349:18:2349:23 | vals4a |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2349:18:2349:23 | vals4a | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2349:18:2349:23 | vals4a | T | {EXTERNAL LOCATION} | u16 |
-| main.rs:2351:22:2351:33 | [...] |  | file://:0:0:0:0 | [] |
-| main.rs:2351:22:2351:33 | [...] | [T;...] | {EXTERNAL LOCATION} | i32 |
-| main.rs:2351:22:2351:33 | [...] | [T;...] | {EXTERNAL LOCATION} | u16 |
-| main.rs:2351:23:2351:26 | 1u16 |  | {EXTERNAL LOCATION} | u16 |
-| main.rs:2351:29:2351:29 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2351:29:2351:29 | 2 |  | {EXTERNAL LOCATION} | u16 |
-| main.rs:2351:32:2351:32 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2351:32:2351:32 | 3 |  | {EXTERNAL LOCATION} | u16 |
-| main.rs:2354:13:2354:17 | vals5 |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2354:13:2354:17 | vals5 | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2354:13:2354:17 | vals5 | T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2354:13:2354:17 | vals5 | T | {EXTERNAL LOCATION} | u32 |
-| main.rs:2354:21:2354:43 | ...::from(...) |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2354:21:2354:43 | ...::from(...) | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2354:21:2354:43 | ...::from(...) | T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2354:21:2354:43 | ...::from(...) | T | {EXTERNAL LOCATION} | u32 |
-| main.rs:2354:31:2354:42 | [...] |  | file://:0:0:0:0 | [] |
-| main.rs:2354:31:2354:42 | [...] | [T;...] | {EXTERNAL LOCATION} | i32 |
-| main.rs:2354:31:2354:42 | [...] | [T;...] | {EXTERNAL LOCATION} | u32 |
-| main.rs:2354:32:2354:35 | 1u32 |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:2354:38:2354:38 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2354:38:2354:38 | 2 |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:2354:41:2354:41 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2354:41:2354:41 | 3 |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:2355:13:2355:13 | u |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2355:13:2355:13 | u |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:2355:13:2355:13 | u |  | file://:0:0:0:0 | & |
-| main.rs:2355:18:2355:22 | vals5 |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2355:18:2355:22 | vals5 | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2355:18:2355:22 | vals5 | T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2355:18:2355:22 | vals5 | T | {EXTERNAL LOCATION} | u32 |
-| main.rs:2357:13:2357:17 | vals6 |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2357:13:2357:17 | vals6 | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2357:13:2357:17 | vals6 | T | file://:0:0:0:0 | & |
-| main.rs:2357:13:2357:17 | vals6 | T.&T | {EXTERNAL LOCATION} | u64 |
-| main.rs:2357:32:2357:43 | [...] |  | file://:0:0:0:0 | [] |
-| main.rs:2357:32:2357:43 | [...] | [T;...] | {EXTERNAL LOCATION} | i32 |
-| main.rs:2357:32:2357:43 | [...] | [T;...] | {EXTERNAL LOCATION} | u64 |
-| main.rs:2357:32:2357:60 | ... .collect() |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2357:32:2357:60 | ... .collect() | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2357:32:2357:60 | ... .collect() | T | file://:0:0:0:0 | & |
-| main.rs:2357:32:2357:60 | ... .collect() | T.&T | {EXTERNAL LOCATION} | u64 |
-| main.rs:2357:33:2357:36 | 1u64 |  | {EXTERNAL LOCATION} | u64 |
-| main.rs:2357:39:2357:39 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2357:39:2357:39 | 2 |  | {EXTERNAL LOCATION} | u64 |
-| main.rs:2357:42:2357:42 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2357:42:2357:42 | 3 |  | {EXTERNAL LOCATION} | u64 |
-| main.rs:2358:13:2358:13 | u |  | file://:0:0:0:0 | & |
-| main.rs:2358:13:2358:13 | u | &T | {EXTERNAL LOCATION} | u64 |
-| main.rs:2358:18:2358:22 | vals6 |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2358:18:2358:22 | vals6 | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2358:18:2358:22 | vals6 | T | file://:0:0:0:0 | & |
-| main.rs:2358:18:2358:22 | vals6 | T.&T | {EXTERNAL LOCATION} | u64 |
-| main.rs:2360:17:2360:21 | vals7 |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2360:17:2360:21 | vals7 | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2360:17:2360:21 | vals7 | T | {EXTERNAL LOCATION} | u8 |
-| main.rs:2360:25:2360:34 | ...::new(...) |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2360:25:2360:34 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2360:25:2360:34 | ...::new(...) | T | {EXTERNAL LOCATION} | u8 |
-| main.rs:2361:9:2361:13 | vals7 |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2361:9:2361:13 | vals7 | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2361:9:2361:13 | vals7 | T | {EXTERNAL LOCATION} | u8 |
-| main.rs:2361:20:2361:22 | 1u8 |  | {EXTERNAL LOCATION} | u8 |
-| main.rs:2362:13:2362:13 | u |  | {EXTERNAL LOCATION} | u8 |
-| main.rs:2362:13:2362:13 | u |  | file://:0:0:0:0 | & |
-| main.rs:2362:18:2362:22 | vals7 |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2362:18:2362:22 | vals7 | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2362:18:2362:22 | vals7 | T | {EXTERNAL LOCATION} | u8 |
-| main.rs:2364:33:2364:33 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2364:36:2364:36 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2364:45:2364:45 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2364:48:2364:48 | 4 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2371:17:2371:20 | map1 |  | {EXTERNAL LOCATION} | HashMap |
-| main.rs:2371:17:2371:20 | map1 | K | {EXTERNAL LOCATION} | i32 |
-| main.rs:2371:17:2371:20 | map1 | S | {EXTERNAL LOCATION} | RandomState |
-| main.rs:2371:17:2371:20 | map1 | V | {EXTERNAL LOCATION} | Box |
-| main.rs:2371:17:2371:20 | map1 | V.A | {EXTERNAL LOCATION} | Global |
-| main.rs:2371:17:2371:20 | map1 | V.T | file://:0:0:0:0 | & |
-| main.rs:2371:17:2371:20 | map1 | V.T.&T | {EXTERNAL LOCATION} | str |
-| main.rs:2371:24:2371:55 | ...::new(...) |  | {EXTERNAL LOCATION} | HashMap |
-| main.rs:2371:24:2371:55 | ...::new(...) | K | {EXTERNAL LOCATION} | i32 |
-| main.rs:2371:24:2371:55 | ...::new(...) | S | {EXTERNAL LOCATION} | RandomState |
-| main.rs:2371:24:2371:55 | ...::new(...) | V | {EXTERNAL LOCATION} | Box |
-| main.rs:2371:24:2371:55 | ...::new(...) | V.A | {EXTERNAL LOCATION} | Global |
-| main.rs:2371:24:2371:55 | ...::new(...) | V.T | file://:0:0:0:0 | & |
-| main.rs:2371:24:2371:55 | ...::new(...) | V.T.&T | {EXTERNAL LOCATION} | str |
-| main.rs:2372:9:2372:12 | map1 |  | {EXTERNAL LOCATION} | HashMap |
-| main.rs:2372:9:2372:12 | map1 | K | {EXTERNAL LOCATION} | i32 |
-| main.rs:2372:9:2372:12 | map1 | S | {EXTERNAL LOCATION} | RandomState |
-| main.rs:2372:9:2372:12 | map1 | V | {EXTERNAL LOCATION} | Box |
-| main.rs:2372:9:2372:12 | map1 | V.A | {EXTERNAL LOCATION} | Global |
-| main.rs:2372:9:2372:12 | map1 | V.T | file://:0:0:0:0 | & |
-| main.rs:2372:9:2372:12 | map1 | V.T.&T | {EXTERNAL LOCATION} | str |
-| main.rs:2372:9:2372:39 | map1.insert(...) |  | {EXTERNAL LOCATION} | Option |
-| main.rs:2372:9:2372:39 | map1.insert(...) | T | {EXTERNAL LOCATION} | Box |
-| main.rs:2372:9:2372:39 | map1.insert(...) | T.A | {EXTERNAL LOCATION} | Global |
-| main.rs:2372:9:2372:39 | map1.insert(...) | T.T | file://:0:0:0:0 | & |
-| main.rs:2372:9:2372:39 | map1.insert(...) | T.T.&T | {EXTERNAL LOCATION} | str |
-| main.rs:2372:21:2372:21 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2372:24:2372:38 | ...::new(...) |  | {EXTERNAL LOCATION} | Box |
-| main.rs:2372:24:2372:38 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2372:24:2372:38 | ...::new(...) | T | file://:0:0:0:0 | & |
-| main.rs:2372:24:2372:38 | ...::new(...) | T.&T | {EXTERNAL LOCATION} | str |
-| main.rs:2372:33:2372:37 | "one" |  | file://:0:0:0:0 | & |
-| main.rs:2372:33:2372:37 | "one" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:2373:9:2373:12 | map1 |  | {EXTERNAL LOCATION} | HashMap |
-| main.rs:2373:9:2373:12 | map1 | K | {EXTERNAL LOCATION} | i32 |
-| main.rs:2373:9:2373:12 | map1 | S | {EXTERNAL LOCATION} | RandomState |
-| main.rs:2373:9:2373:12 | map1 | V | {EXTERNAL LOCATION} | Box |
-| main.rs:2373:9:2373:12 | map1 | V.A | {EXTERNAL LOCATION} | Global |
-| main.rs:2373:9:2373:12 | map1 | V.T | file://:0:0:0:0 | & |
-| main.rs:2373:9:2373:12 | map1 | V.T.&T | {EXTERNAL LOCATION} | str |
-| main.rs:2373:9:2373:39 | map1.insert(...) |  | {EXTERNAL LOCATION} | Option |
-| main.rs:2373:9:2373:39 | map1.insert(...) | T | {EXTERNAL LOCATION} | Box |
-| main.rs:2373:9:2373:39 | map1.insert(...) | T.A | {EXTERNAL LOCATION} | Global |
-| main.rs:2373:9:2373:39 | map1.insert(...) | T.T | file://:0:0:0:0 | & |
-| main.rs:2373:9:2373:39 | map1.insert(...) | T.T.&T | {EXTERNAL LOCATION} | str |
-| main.rs:2373:21:2373:21 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2373:24:2373:38 | ...::new(...) |  | {EXTERNAL LOCATION} | Box |
-| main.rs:2373:24:2373:38 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2373:24:2373:38 | ...::new(...) | T | file://:0:0:0:0 | & |
-| main.rs:2373:24:2373:38 | ...::new(...) | T.&T | {EXTERNAL LOCATION} | str |
-| main.rs:2373:33:2373:37 | "two" |  | file://:0:0:0:0 | & |
-| main.rs:2373:33:2373:37 | "two" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:2374:13:2374:15 | key |  | {EXTERNAL LOCATION} | Item |
-| main.rs:2374:13:2374:15 | key |  | file://:0:0:0:0 | & |
-| main.rs:2374:13:2374:15 | key | &T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2374:20:2374:23 | map1 |  | {EXTERNAL LOCATION} | HashMap |
-| main.rs:2374:20:2374:23 | map1 | K | {EXTERNAL LOCATION} | i32 |
-| main.rs:2374:20:2374:23 | map1 | S | {EXTERNAL LOCATION} | RandomState |
-| main.rs:2374:20:2374:23 | map1 | V | {EXTERNAL LOCATION} | Box |
-| main.rs:2374:20:2374:23 | map1 | V.A | {EXTERNAL LOCATION} | Global |
-| main.rs:2374:20:2374:23 | map1 | V.T | file://:0:0:0:0 | & |
-| main.rs:2374:20:2374:23 | map1 | V.T.&T | {EXTERNAL LOCATION} | str |
-| main.rs:2374:20:2374:30 | map1.keys() |  | {EXTERNAL LOCATION} | Keys |
-| main.rs:2374:20:2374:30 | map1.keys() | K | {EXTERNAL LOCATION} | i32 |
-| main.rs:2374:20:2374:30 | map1.keys() | V | {EXTERNAL LOCATION} | Box |
-| main.rs:2374:20:2374:30 | map1.keys() | V.A | {EXTERNAL LOCATION} | Global |
-| main.rs:2374:20:2374:30 | map1.keys() | V.T | file://:0:0:0:0 | & |
-| main.rs:2374:20:2374:30 | map1.keys() | V.T.&T | {EXTERNAL LOCATION} | str |
-| main.rs:2375:13:2375:17 | value |  | {EXTERNAL LOCATION} | Item |
-| main.rs:2375:13:2375:17 | value |  | file://:0:0:0:0 | & |
-| main.rs:2375:13:2375:17 | value | &T | {EXTERNAL LOCATION} | Box |
-| main.rs:2375:13:2375:17 | value | &T.A | {EXTERNAL LOCATION} | Global |
-| main.rs:2375:13:2375:17 | value | &T.T | file://:0:0:0:0 | & |
-| main.rs:2375:13:2375:17 | value | &T.T.&T | {EXTERNAL LOCATION} | str |
-| main.rs:2375:22:2375:25 | map1 |  | {EXTERNAL LOCATION} | HashMap |
-| main.rs:2375:22:2375:25 | map1 | K | {EXTERNAL LOCATION} | i32 |
-| main.rs:2375:22:2375:25 | map1 | S | {EXTERNAL LOCATION} | RandomState |
-| main.rs:2375:22:2375:25 | map1 | V | {EXTERNAL LOCATION} | Box |
-| main.rs:2375:22:2375:25 | map1 | V.A | {EXTERNAL LOCATION} | Global |
-| main.rs:2375:22:2375:25 | map1 | V.T | file://:0:0:0:0 | & |
-| main.rs:2375:22:2375:25 | map1 | V.T.&T | {EXTERNAL LOCATION} | str |
-| main.rs:2375:22:2375:34 | map1.values() |  | {EXTERNAL LOCATION} | Values |
-| main.rs:2375:22:2375:34 | map1.values() | K | {EXTERNAL LOCATION} | i32 |
-| main.rs:2375:22:2375:34 | map1.values() | V | {EXTERNAL LOCATION} | Box |
-| main.rs:2375:22:2375:34 | map1.values() | V.A | {EXTERNAL LOCATION} | Global |
-| main.rs:2375:22:2375:34 | map1.values() | V.T | file://:0:0:0:0 | & |
-| main.rs:2375:22:2375:34 | map1.values() | V.T.&T | {EXTERNAL LOCATION} | str |
-| main.rs:2376:13:2376:24 | TuplePat |  | {EXTERNAL LOCATION} | Item |
-| main.rs:2376:13:2376:24 | TuplePat |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2376:13:2376:24 | TuplePat | 0(2) | file://:0:0:0:0 | & |
-| main.rs:2376:13:2376:24 | TuplePat | 0(2).&T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2376:13:2376:24 | TuplePat | 1(2) | file://:0:0:0:0 | & |
-| main.rs:2376:13:2376:24 | TuplePat | 1(2).&T | {EXTERNAL LOCATION} | Box |
-| main.rs:2376:13:2376:24 | TuplePat | 1(2).&T.A | {EXTERNAL LOCATION} | Global |
-| main.rs:2376:13:2376:24 | TuplePat | 1(2).&T.T | file://:0:0:0:0 | & |
-| main.rs:2376:13:2376:24 | TuplePat | 1(2).&T.T.&T | {EXTERNAL LOCATION} | str |
-| main.rs:2376:14:2376:16 | key |  | file://:0:0:0:0 | & |
-| main.rs:2376:14:2376:16 | key | &T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2376:19:2376:23 | value |  | file://:0:0:0:0 | & |
-| main.rs:2376:19:2376:23 | value | &T | {EXTERNAL LOCATION} | Box |
-| main.rs:2376:19:2376:23 | value | &T.A | {EXTERNAL LOCATION} | Global |
-| main.rs:2376:19:2376:23 | value | &T.T | file://:0:0:0:0 | & |
-| main.rs:2376:19:2376:23 | value | &T.T.&T | {EXTERNAL LOCATION} | str |
-| main.rs:2376:29:2376:32 | map1 |  | {EXTERNAL LOCATION} | HashMap |
-| main.rs:2376:29:2376:32 | map1 | K | {EXTERNAL LOCATION} | i32 |
-| main.rs:2376:29:2376:32 | map1 | S | {EXTERNAL LOCATION} | RandomState |
-| main.rs:2376:29:2376:32 | map1 | V | {EXTERNAL LOCATION} | Box |
-| main.rs:2376:29:2376:32 | map1 | V.A | {EXTERNAL LOCATION} | Global |
-| main.rs:2376:29:2376:32 | map1 | V.T | file://:0:0:0:0 | & |
-| main.rs:2376:29:2376:32 | map1 | V.T.&T | {EXTERNAL LOCATION} | str |
-| main.rs:2376:29:2376:39 | map1.iter() |  | {EXTERNAL LOCATION} | Iter |
-| main.rs:2376:29:2376:39 | map1.iter() | K | {EXTERNAL LOCATION} | i32 |
-| main.rs:2376:29:2376:39 | map1.iter() | V | {EXTERNAL LOCATION} | Box |
-| main.rs:2376:29:2376:39 | map1.iter() | V.A | {EXTERNAL LOCATION} | Global |
-| main.rs:2376:29:2376:39 | map1.iter() | V.T | file://:0:0:0:0 | & |
-| main.rs:2376:29:2376:39 | map1.iter() | V.T.&T | {EXTERNAL LOCATION} | str |
-| main.rs:2377:13:2377:24 | TuplePat |  | {EXTERNAL LOCATION} | Item |
-| main.rs:2377:13:2377:24 | TuplePat |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2377:13:2377:24 | TuplePat | 0(2) | file://:0:0:0:0 | & |
-| main.rs:2377:13:2377:24 | TuplePat | 0(2).&T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2377:13:2377:24 | TuplePat | 1(2) | file://:0:0:0:0 | & |
-| main.rs:2377:13:2377:24 | TuplePat | 1(2).&T | {EXTERNAL LOCATION} | Box |
-| main.rs:2377:13:2377:24 | TuplePat | 1(2).&T.A | {EXTERNAL LOCATION} | Global |
-| main.rs:2377:13:2377:24 | TuplePat | 1(2).&T.T | file://:0:0:0:0 | & |
-| main.rs:2377:13:2377:24 | TuplePat | 1(2).&T.T.&T | {EXTERNAL LOCATION} | str |
-| main.rs:2377:14:2377:16 | key |  | file://:0:0:0:0 | & |
-| main.rs:2377:14:2377:16 | key | &T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2377:19:2377:23 | value |  | file://:0:0:0:0 | & |
-| main.rs:2377:19:2377:23 | value | &T | {EXTERNAL LOCATION} | Box |
-| main.rs:2377:19:2377:23 | value | &T.A | {EXTERNAL LOCATION} | Global |
-| main.rs:2377:19:2377:23 | value | &T.T | file://:0:0:0:0 | & |
-| main.rs:2377:19:2377:23 | value | &T.T.&T | {EXTERNAL LOCATION} | str |
-| main.rs:2377:29:2377:33 | &map1 |  | file://:0:0:0:0 | & |
-| main.rs:2377:29:2377:33 | &map1 | &T | {EXTERNAL LOCATION} | HashMap |
-| main.rs:2377:29:2377:33 | &map1 | &T.K | {EXTERNAL LOCATION} | i32 |
-| main.rs:2377:29:2377:33 | &map1 | &T.S | {EXTERNAL LOCATION} | RandomState |
-| main.rs:2377:29:2377:33 | &map1 | &T.V | {EXTERNAL LOCATION} | Box |
-| main.rs:2377:29:2377:33 | &map1 | &T.V.A | {EXTERNAL LOCATION} | Global |
-| main.rs:2377:29:2377:33 | &map1 | &T.V.T | file://:0:0:0:0 | & |
-| main.rs:2377:29:2377:33 | &map1 | &T.V.T.&T | {EXTERNAL LOCATION} | str |
-| main.rs:2377:30:2377:33 | map1 |  | {EXTERNAL LOCATION} | HashMap |
-| main.rs:2377:30:2377:33 | map1 | K | {EXTERNAL LOCATION} | i32 |
-| main.rs:2377:30:2377:33 | map1 | S | {EXTERNAL LOCATION} | RandomState |
-| main.rs:2377:30:2377:33 | map1 | V | {EXTERNAL LOCATION} | Box |
-| main.rs:2377:30:2377:33 | map1 | V.A | {EXTERNAL LOCATION} | Global |
-| main.rs:2377:30:2377:33 | map1 | V.T | file://:0:0:0:0 | & |
-| main.rs:2377:30:2377:33 | map1 | V.T.&T | {EXTERNAL LOCATION} | str |
-| main.rs:2381:17:2381:17 | a |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2381:26:2381:26 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2381:26:2381:26 | 0 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2383:23:2383:23 | a |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2383:23:2383:28 | ... < ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2383:27:2383:28 | 10 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2383:27:2383:28 | 10 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2385:13:2385:13 | a |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2385:13:2385:18 | ... += ... |  | file://:0:0:0:0 | () |
-| main.rs:2385:18:2385:18 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2397:40:2399:9 | { ... } |  | {EXTERNAL LOCATION} | Option |
-| main.rs:2397:40:2399:9 | { ... } | T | main.rs:2391:5:2391:20 | S1 |
-| main.rs:2397:40:2399:9 | { ... } | T.T | main.rs:2396:10:2396:19 | T |
-| main.rs:2398:13:2398:16 | None |  | {EXTERNAL LOCATION} | Option |
-| main.rs:2398:13:2398:16 | None | T | main.rs:2391:5:2391:20 | S1 |
-| main.rs:2398:13:2398:16 | None | T.T | main.rs:2396:10:2396:19 | T |
-| main.rs:2401:30:2403:9 | { ... } |  | main.rs:2391:5:2391:20 | S1 |
-| main.rs:2401:30:2403:9 | { ... } | T | main.rs:2396:10:2396:19 | T |
-| main.rs:2402:13:2402:28 | S1(...) |  | main.rs:2391:5:2391:20 | S1 |
-| main.rs:2402:13:2402:28 | S1(...) | T | main.rs:2396:10:2396:19 | T |
-| main.rs:2402:16:2402:27 | ...::default(...) |  | main.rs:2396:10:2396:19 | T |
-| main.rs:2405:19:2405:22 | SelfParam |  | main.rs:2391:5:2391:20 | S1 |
-| main.rs:2405:19:2405:22 | SelfParam | T | main.rs:2396:10:2396:19 | T |
-| main.rs:2405:33:2407:9 | { ... } |  | main.rs:2391:5:2391:20 | S1 |
-| main.rs:2405:33:2407:9 | { ... } | T | main.rs:2396:10:2396:19 | T |
-| main.rs:2406:13:2406:16 | self |  | main.rs:2391:5:2391:20 | S1 |
-| main.rs:2406:13:2406:16 | self | T | main.rs:2396:10:2396:19 | T |
-| main.rs:2418:15:2418:15 | x |  | main.rs:2418:12:2418:12 | T |
-| main.rs:2418:26:2420:5 | { ... } |  | main.rs:2418:12:2418:12 | T |
-| main.rs:2419:9:2419:9 | x |  | main.rs:2418:12:2418:12 | T |
-| main.rs:2423:13:2423:14 | x1 |  | {EXTERNAL LOCATION} | Option |
-| main.rs:2423:13:2423:14 | x1 | T | main.rs:2391:5:2391:20 | S1 |
-| main.rs:2423:13:2423:14 | x1 | T.T | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2423:34:2423:48 | ...::assoc_fun(...) |  | {EXTERNAL LOCATION} | Option |
-| main.rs:2423:34:2423:48 | ...::assoc_fun(...) | T | main.rs:2391:5:2391:20 | S1 |
-| main.rs:2423:34:2423:48 | ...::assoc_fun(...) | T.T | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2424:13:2424:14 | x2 |  | {EXTERNAL LOCATION} | Option |
-| main.rs:2424:13:2424:14 | x2 | T | main.rs:2391:5:2391:20 | S1 |
-| main.rs:2424:13:2424:14 | x2 | T.T | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2424:18:2424:38 | ...::assoc_fun(...) |  | {EXTERNAL LOCATION} | Option |
-| main.rs:2424:18:2424:38 | ...::assoc_fun(...) | T | main.rs:2391:5:2391:20 | S1 |
-| main.rs:2424:18:2424:38 | ...::assoc_fun(...) | T.T | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2425:13:2425:14 | x3 |  | {EXTERNAL LOCATION} | Option |
-| main.rs:2425:13:2425:14 | x3 | T | main.rs:2391:5:2391:20 | S1 |
-| main.rs:2425:13:2425:14 | x3 | T.T | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2425:18:2425:32 | ...::assoc_fun(...) |  | {EXTERNAL LOCATION} | Option |
-| main.rs:2425:18:2425:32 | ...::assoc_fun(...) | T | main.rs:2391:5:2391:20 | S1 |
-| main.rs:2425:18:2425:32 | ...::assoc_fun(...) | T.T | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2426:13:2426:14 | x4 |  | main.rs:2391:5:2391:20 | S1 |
-| main.rs:2426:13:2426:14 | x4 | T | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2426:18:2426:48 | ...::method(...) |  | main.rs:2391:5:2391:20 | S1 |
-| main.rs:2426:18:2426:48 | ...::method(...) | T | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2426:35:2426:47 | ...::default(...) |  | main.rs:2391:5:2391:20 | S1 |
-| main.rs:2426:35:2426:47 | ...::default(...) | T | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2427:13:2427:14 | x5 |  | main.rs:2391:5:2391:20 | S1 |
-| main.rs:2427:13:2427:14 | x5 | T | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2427:18:2427:42 | ...::method(...) |  | main.rs:2391:5:2391:20 | S1 |
-| main.rs:2427:18:2427:42 | ...::method(...) | T | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2427:29:2427:41 | ...::default(...) |  | main.rs:2391:5:2391:20 | S1 |
-| main.rs:2427:29:2427:41 | ...::default(...) | T | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2428:13:2428:14 | x6 |  | main.rs:2412:5:2412:27 | S4 |
-| main.rs:2428:13:2428:14 | x6 | T4 | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2428:18:2428:45 | S4::<...>(...) |  | main.rs:2412:5:2412:27 | S4 |
-| main.rs:2428:18:2428:45 | S4::<...>(...) | T4 | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2428:27:2428:44 | ...::default(...) |  | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2429:13:2429:14 | x7 |  | main.rs:2412:5:2412:27 | S4 |
-| main.rs:2429:13:2429:14 | x7 | T4 | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2429:18:2429:23 | S4(...) |  | main.rs:2412:5:2412:27 | S4 |
-| main.rs:2429:18:2429:23 | S4(...) | T4 | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2429:21:2429:22 | S2 |  | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2430:13:2430:14 | x8 |  | main.rs:2412:5:2412:27 | S4 |
-| main.rs:2430:13:2430:14 | x8 | T4 | {EXTERNAL LOCATION} | i32 |
-| main.rs:2430:18:2430:22 | S4(...) |  | main.rs:2412:5:2412:27 | S4 |
-| main.rs:2430:18:2430:22 | S4(...) | T4 | {EXTERNAL LOCATION} | i32 |
-| main.rs:2430:21:2430:21 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2431:13:2431:14 | x9 |  | main.rs:2412:5:2412:27 | S4 |
-| main.rs:2431:13:2431:14 | x9 | T4 | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2431:18:2431:34 | S4(...) |  | main.rs:2412:5:2412:27 | S4 |
-| main.rs:2431:18:2431:34 | S4(...) | T4 | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2431:21:2431:33 | ...::default(...) |  | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2432:13:2432:15 | x10 |  | main.rs:2414:5:2416:5 | S5 |
-| main.rs:2432:13:2432:15 | x10 | T5 | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2432:19:2435:9 | S5::<...> {...} |  | main.rs:2414:5:2416:5 | S5 |
-| main.rs:2432:19:2435:9 | S5::<...> {...} | T5 | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2434:20:2434:37 | ...::default(...) |  | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2436:13:2436:15 | x11 |  | main.rs:2414:5:2416:5 | S5 |
-| main.rs:2436:13:2436:15 | x11 | T5 | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2436:19:2436:34 | S5 {...} |  | main.rs:2414:5:2416:5 | S5 |
-| main.rs:2436:19:2436:34 | S5 {...} | T5 | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2436:31:2436:32 | S2 |  | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2437:13:2437:15 | x12 |  | main.rs:2414:5:2416:5 | S5 |
-| main.rs:2437:13:2437:15 | x12 | T5 | {EXTERNAL LOCATION} | i32 |
-| main.rs:2437:19:2437:33 | S5 {...} |  | main.rs:2414:5:2416:5 | S5 |
-| main.rs:2437:19:2437:33 | S5 {...} | T5 | {EXTERNAL LOCATION} | i32 |
-| main.rs:2437:31:2437:31 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2438:13:2438:15 | x13 |  | main.rs:2414:5:2416:5 | S5 |
-| main.rs:2438:13:2438:15 | x13 | T5 | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2438:19:2441:9 | S5 {...} |  | main.rs:2414:5:2416:5 | S5 |
-| main.rs:2438:19:2441:9 | S5 {...} | T5 | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2440:20:2440:32 | ...::default(...) |  | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2442:13:2442:15 | x14 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2442:19:2442:48 | foo::<...>(...) |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2442:30:2442:47 | ...::default(...) |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2451:35:2453:9 | { ... } |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2451:35:2453:9 | { ... } | 0(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2451:35:2453:9 | { ... } | 1(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2452:13:2452:26 | TupleExpr |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2452:13:2452:26 | TupleExpr | 0(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2452:13:2452:26 | TupleExpr | 1(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2452:14:2452:18 | S1 {...} |  | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2452:21:2452:25 | S1 {...} |  | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2454:16:2454:19 | SelfParam |  | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2458:13:2458:13 | a |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2458:13:2458:13 | a | 0(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2458:13:2458:13 | a | 1(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2458:17:2458:30 | ...::get_pair(...) |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2458:17:2458:30 | ...::get_pair(...) | 0(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2458:17:2458:30 | ...::get_pair(...) | 1(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2459:17:2459:17 | b |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2459:17:2459:17 | b | 0(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2459:17:2459:17 | b | 1(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2459:21:2459:34 | ...::get_pair(...) |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2459:21:2459:34 | ...::get_pair(...) | 0(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2459:21:2459:34 | ...::get_pair(...) | 1(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2460:13:2460:18 | TuplePat |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2460:13:2460:18 | TuplePat | 0(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2460:13:2460:18 | TuplePat | 1(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2460:14:2460:14 | c |  | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2460:17:2460:17 | d |  | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2460:22:2460:35 | ...::get_pair(...) |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2460:22:2460:35 | ...::get_pair(...) | 0(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2460:22:2460:35 | ...::get_pair(...) | 1(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2461:13:2461:22 | TuplePat |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2461:13:2461:22 | TuplePat | 0(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2461:13:2461:22 | TuplePat | 1(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2461:18:2461:18 | e |  | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2461:21:2461:21 | f |  | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2461:26:2461:39 | ...::get_pair(...) |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2461:26:2461:39 | ...::get_pair(...) | 0(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2461:26:2461:39 | ...::get_pair(...) | 1(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2462:13:2462:26 | TuplePat |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2462:13:2462:26 | TuplePat | 0(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2462:13:2462:26 | TuplePat | 1(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2462:18:2462:18 | g |  | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2462:25:2462:25 | h |  | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2462:30:2462:43 | ...::get_pair(...) |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2462:30:2462:43 | ...::get_pair(...) | 0(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2462:30:2462:43 | ...::get_pair(...) | 1(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2464:9:2464:9 | a |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2464:9:2464:9 | a | 0(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2464:9:2464:9 | a | 1(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2464:9:2464:11 | a.0 |  | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2465:9:2465:9 | b |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2465:9:2465:9 | b | 0(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2465:9:2465:9 | b | 1(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2465:9:2465:11 | b.1 |  | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2466:9:2466:9 | c |  | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2467:9:2467:9 | d |  | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2468:9:2468:9 | e |  | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2469:9:2469:9 | f |  | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2470:9:2470:9 | g |  | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2471:9:2471:9 | h |  | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2476:13:2476:13 | a |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2476:17:2476:34 | ...::default(...) |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2477:13:2477:13 | b |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2477:17:2477:34 | ...::default(...) |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2478:13:2478:16 | pair |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2478:13:2478:16 | pair | 0(2) | {EXTERNAL LOCATION} | i64 |
-| main.rs:2478:13:2478:16 | pair | 1(2) | {EXTERNAL LOCATION} | bool |
-| main.rs:2478:20:2478:25 | TupleExpr |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2478:20:2478:25 | TupleExpr | 0(2) | {EXTERNAL LOCATION} | i64 |
-| main.rs:2478:20:2478:25 | TupleExpr | 1(2) | {EXTERNAL LOCATION} | bool |
-| main.rs:2478:21:2478:21 | a |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2478:24:2478:24 | b |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2479:13:2479:13 | i |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2479:22:2479:25 | pair |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2479:22:2479:25 | pair | 0(2) | {EXTERNAL LOCATION} | i64 |
-| main.rs:2479:22:2479:25 | pair | 1(2) | {EXTERNAL LOCATION} | bool |
-| main.rs:2479:22:2479:27 | pair.0 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2480:13:2480:13 | j |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2480:23:2480:26 | pair |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2480:23:2480:26 | pair | 0(2) | {EXTERNAL LOCATION} | i64 |
-| main.rs:2480:23:2480:26 | pair | 1(2) | {EXTERNAL LOCATION} | bool |
-| main.rs:2480:23:2480:28 | pair.1 |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2482:13:2482:16 | pair |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2482:13:2482:16 | pair | 0(2) | {EXTERNAL LOCATION} | i32 |
-| main.rs:2482:13:2482:16 | pair | 1(2) | {EXTERNAL LOCATION} | i32 |
-| main.rs:2482:20:2482:25 | [...] |  | file://:0:0:0:0 | [] |
-| main.rs:2482:20:2482:25 | [...] | [T;...] | {EXTERNAL LOCATION} | i32 |
-| main.rs:2482:20:2482:32 | ... .into() |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2482:20:2482:32 | ... .into() | 0(2) | {EXTERNAL LOCATION} | i32 |
-| main.rs:2482:20:2482:32 | ... .into() | 1(2) | {EXTERNAL LOCATION} | i32 |
-| main.rs:2482:21:2482:21 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2482:24:2482:24 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2483:15:2483:18 | pair |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2483:15:2483:18 | pair | 0(2) | {EXTERNAL LOCATION} | i32 |
-| main.rs:2483:15:2483:18 | pair | 1(2) | {EXTERNAL LOCATION} | i32 |
-| main.rs:2484:13:2484:18 | TuplePat |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2484:13:2484:18 | TuplePat | 0(2) | {EXTERNAL LOCATION} | i32 |
-| main.rs:2484:13:2484:18 | TuplePat | 1(2) | {EXTERNAL LOCATION} | i32 |
-| main.rs:2484:14:2484:14 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2484:17:2484:17 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2484:30:2484:41 | "unexpected" |  | file://:0:0:0:0 | & |
-| main.rs:2484:30:2484:41 | "unexpected" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:2484:30:2484:41 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:2484:30:2484:41 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:2485:13:2485:13 | _ |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2485:13:2485:13 | _ | 0(2) | {EXTERNAL LOCATION} | i32 |
-| main.rs:2485:13:2485:13 | _ | 1(2) | {EXTERNAL LOCATION} | i32 |
-| main.rs:2485:25:2485:34 | "expected" |  | file://:0:0:0:0 | & |
-| main.rs:2485:25:2485:34 | "expected" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:2485:25:2485:34 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:2485:25:2485:34 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:2487:13:2487:13 | x |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2487:17:2487:20 | pair |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2487:17:2487:20 | pair | 0(2) | {EXTERNAL LOCATION} | i32 |
-| main.rs:2487:17:2487:20 | pair | 1(2) | {EXTERNAL LOCATION} | i32 |
-| main.rs:2487:17:2487:22 | pair.0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2489:13:2489:13 | y |  | file://:0:0:0:0 | & |
-| main.rs:2489:13:2489:13 | y | &T | file://:0:0:0:0 | (T_2) |
-| main.rs:2489:13:2489:13 | y | &T.0(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2489:13:2489:13 | y | &T.1(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2489:17:2489:31 | &... |  | file://:0:0:0:0 | & |
-| main.rs:2489:17:2489:31 | &... | &T | file://:0:0:0:0 | (T_2) |
-| main.rs:2489:17:2489:31 | &... | &T.0(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2489:17:2489:31 | &... | &T.1(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2489:18:2489:31 | ...::get_pair(...) |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2489:18:2489:31 | ...::get_pair(...) | 0(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2489:18:2489:31 | ...::get_pair(...) | 1(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2490:9:2490:9 | y |  | file://:0:0:0:0 | & |
-| main.rs:2490:9:2490:9 | y | &T | file://:0:0:0:0 | (T_2) |
-| main.rs:2490:9:2490:9 | y | &T.0(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2490:9:2490:9 | y | &T.1(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2490:9:2490:11 | y.0 |  | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2497:13:2497:23 | boxed_value |  | {EXTERNAL LOCATION} | Box |
-| main.rs:2497:13:2497:23 | boxed_value | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2497:13:2497:23 | boxed_value | T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2497:27:2497:42 | ...::new(...) |  | {EXTERNAL LOCATION} | Box |
-| main.rs:2497:27:2497:42 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2497:27:2497:42 | ...::new(...) | T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2497:36:2497:41 | 100i32 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2500:15:2500:25 | boxed_value |  | {EXTERNAL LOCATION} | Box |
-| main.rs:2500:15:2500:25 | boxed_value | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2500:15:2500:25 | boxed_value | T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2501:13:2501:19 | box 100 |  | {EXTERNAL LOCATION} | Box |
-| main.rs:2501:13:2501:19 | box 100 | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2501:13:2501:19 | box 100 | T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2501:17:2501:19 | 100 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2502:26:2502:36 | "Boxed 100\\n" |  | file://:0:0:0:0 | & |
-| main.rs:2502:26:2502:36 | "Boxed 100\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:2502:26:2502:36 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:2502:26:2502:36 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:2504:13:2504:17 | box ... |  | {EXTERNAL LOCATION} | Box |
-| main.rs:2504:13:2504:17 | box ... | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2504:13:2504:17 | box ... | T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2506:26:2506:42 | "Boxed value: {}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:2506:26:2506:42 | "Boxed value: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:2506:26:2506:51 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:2506:26:2506:51 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:2511:13:2511:22 | nested_box |  | {EXTERNAL LOCATION} | Box |
-| main.rs:2511:13:2511:22 | nested_box | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2511:13:2511:22 | nested_box | T | {EXTERNAL LOCATION} | Box |
-| main.rs:2511:13:2511:22 | nested_box | T.A | {EXTERNAL LOCATION} | Global |
-| main.rs:2511:13:2511:22 | nested_box | T.T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2511:26:2511:50 | ...::new(...) |  | {EXTERNAL LOCATION} | Box |
-| main.rs:2511:26:2511:50 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2511:26:2511:50 | ...::new(...) | T | {EXTERNAL LOCATION} | Box |
-| main.rs:2511:26:2511:50 | ...::new(...) | T.A | {EXTERNAL LOCATION} | Global |
-| main.rs:2511:26:2511:50 | ...::new(...) | T.T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2511:35:2511:49 | ...::new(...) |  | {EXTERNAL LOCATION} | Box |
-| main.rs:2511:35:2511:49 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2511:35:2511:49 | ...::new(...) | T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2511:44:2511:48 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2512:15:2512:24 | nested_box |  | {EXTERNAL LOCATION} | Box |
-| main.rs:2512:15:2512:24 | nested_box | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2512:15:2512:24 | nested_box | T | {EXTERNAL LOCATION} | Box |
-| main.rs:2512:15:2512:24 | nested_box | T.A | {EXTERNAL LOCATION} | Global |
-| main.rs:2512:15:2512:24 | nested_box | T.T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2513:13:2513:21 | box ... |  | {EXTERNAL LOCATION} | Box |
-| main.rs:2513:13:2513:21 | box ... | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2513:13:2513:21 | box ... | T | {EXTERNAL LOCATION} | Box |
-| main.rs:2513:13:2513:21 | box ... | T.A | {EXTERNAL LOCATION} | Global |
-| main.rs:2513:13:2513:21 | box ... | T.T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2515:26:2515:43 | "Nested boxed: {}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:2515:26:2515:43 | "Nested boxed: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:2515:26:2515:59 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:2515:26:2515:59 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:2527:21:2527:25 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:2527:21:2527:25 | SelfParam | &T | main.rs:2526:5:2529:5 | Self [trait Executor] |
-| main.rs:2528:24:2528:28 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:2528:24:2528:28 | SelfParam | &T | main.rs:2526:5:2529:5 | Self [trait Executor] |
-| main.rs:2528:31:2528:35 | query |  | main.rs:2528:21:2528:21 | E |
-| main.rs:2532:21:2532:25 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:2532:21:2532:25 | SelfParam | &T | main.rs:2531:10:2531:22 | T |
-| main.rs:2533:22:2533:41 | "Executor::execute1\\n" |  | file://:0:0:0:0 | & |
-| main.rs:2533:22:2533:41 | "Executor::execute1\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:2533:22:2533:41 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:2533:22:2533:41 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:2536:24:2536:28 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:2536:24:2536:28 | SelfParam | &T | main.rs:2531:10:2531:22 | T |
-| main.rs:2536:31:2536:36 | _query |  | main.rs:2536:21:2536:21 | E |
-| main.rs:2537:22:2537:41 | "Executor::execute2\\n" |  | file://:0:0:0:0 | & |
-| main.rs:2537:22:2537:41 | "Executor::execute2\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:2537:22:2537:41 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:2537:22:2537:41 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:2546:13:2546:13 | c |  | main.rs:2541:5:2541:29 | MySqlConnection |
-| main.rs:2546:17:2546:34 | MySqlConnection {...} |  | main.rs:2541:5:2541:29 | MySqlConnection |
-| main.rs:2548:9:2548:9 | c |  | main.rs:2541:5:2541:29 | MySqlConnection |
-| main.rs:2549:35:2549:36 | &c |  | file://:0:0:0:0 | & |
-| main.rs:2549:35:2549:36 | &c | &T | main.rs:2541:5:2541:29 | MySqlConnection |
-| main.rs:2549:36:2549:36 | c |  | main.rs:2541:5:2541:29 | MySqlConnection |
-| main.rs:2551:9:2551:9 | c |  | main.rs:2541:5:2541:29 | MySqlConnection |
-| main.rs:2551:20:2551:40 | "SELECT * FROM users" |  | file://:0:0:0:0 | & |
-| main.rs:2551:20:2551:40 | "SELECT * FROM users" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:2552:9:2552:9 | c |  | main.rs:2541:5:2541:29 | MySqlConnection |
-| main.rs:2552:28:2552:48 | "SELECT * FROM users" |  | file://:0:0:0:0 | & |
-| main.rs:2552:28:2552:48 | "SELECT * FROM users" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:2553:35:2553:36 | &c |  | file://:0:0:0:0 | & |
-| main.rs:2553:35:2553:36 | &c | &T | main.rs:2541:5:2541:29 | MySqlConnection |
-| main.rs:2553:36:2553:36 | c |  | main.rs:2541:5:2541:29 | MySqlConnection |
-| main.rs:2553:39:2553:59 | "SELECT * FROM users" |  | file://:0:0:0:0 | & |
-| main.rs:2553:39:2553:59 | "SELECT * FROM users" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:2554:43:2554:44 | &c |  | file://:0:0:0:0 | & |
-| main.rs:2554:43:2554:44 | &c | &T | main.rs:2541:5:2541:29 | MySqlConnection |
-| main.rs:2554:44:2554:44 | c |  | main.rs:2541:5:2541:29 | MySqlConnection |
-| main.rs:2554:47:2554:67 | "SELECT * FROM users" |  | file://:0:0:0:0 | & |
-| main.rs:2554:47:2554:67 | "SELECT * FROM users" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:2564:5:2564:20 | ...::f(...) |  | main.rs:72:5:72:21 | Foo |
-| main.rs:2565:5:2565:60 | ...::g(...) |  | main.rs:72:5:72:21 | Foo |
-| main.rs:2565:20:2565:38 | ...::Foo {...} |  | main.rs:72:5:72:21 | Foo |
-| main.rs:2565:41:2565:59 | ...::Foo {...} |  | main.rs:72:5:72:21 | Foo |
-| main.rs:2581:5:2581:15 | ...::f(...) |  | {EXTERNAL LOCATION} | trait Future |
+| main.rs:1599:13:1599:16 | self | &T | main.rs:1595:5:1595:26 | MyStruct |
+| main.rs:1599:13:1599:16 | self | &T.T | main.rs:1597:10:1597:10 | T |
+| main.rs:1602:16:1602:20 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1602:16:1602:20 | SelfParam | &T | main.rs:1595:5:1595:26 | MyStruct |
+| main.rs:1602:16:1602:20 | SelfParam | &T.T | main.rs:1597:10:1597:10 | T |
+| main.rs:1602:23:1602:23 | x |  | file://:0:0:0:0 | & |
+| main.rs:1602:23:1602:23 | x | &T | main.rs:1595:5:1595:26 | MyStruct |
+| main.rs:1602:23:1602:23 | x | &T.T | main.rs:1597:10:1597:10 | T |
+| main.rs:1602:42:1604:9 | { ... } |  | file://:0:0:0:0 | & |
+| main.rs:1602:42:1604:9 | { ... } | &T | main.rs:1595:5:1595:26 | MyStruct |
+| main.rs:1602:42:1604:9 | { ... } | &T.T | main.rs:1597:10:1597:10 | T |
+| main.rs:1603:13:1603:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1603:13:1603:16 | self | &T | main.rs:1595:5:1595:26 | MyStruct |
+| main.rs:1603:13:1603:16 | self | &T.T | main.rs:1597:10:1597:10 | T |
+| main.rs:1607:16:1613:5 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1608:13:1608:13 | x |  | main.rs:1595:5:1595:26 | MyStruct |
+| main.rs:1608:13:1608:13 | x | T | main.rs:1593:5:1593:13 | S |
+| main.rs:1608:17:1608:27 | MyStruct(...) |  | main.rs:1595:5:1595:26 | MyStruct |
+| main.rs:1608:17:1608:27 | MyStruct(...) | T | main.rs:1593:5:1593:13 | S |
+| main.rs:1608:26:1608:26 | S |  | main.rs:1593:5:1593:13 | S |
+| main.rs:1609:9:1609:9 | x |  | main.rs:1595:5:1595:26 | MyStruct |
+| main.rs:1609:9:1609:9 | x | T | main.rs:1593:5:1593:13 | S |
+| main.rs:1609:9:1609:15 | x.foo() |  | file://:0:0:0:0 | & |
+| main.rs:1609:9:1609:15 | x.foo() | &T | main.rs:1595:5:1595:26 | MyStruct |
+| main.rs:1609:9:1609:15 | x.foo() | &T.T | main.rs:1593:5:1593:13 | S |
+| main.rs:1610:13:1610:13 | x |  | main.rs:1595:5:1595:26 | MyStruct |
+| main.rs:1610:13:1610:13 | x | T | main.rs:1593:5:1593:13 | S |
+| main.rs:1610:17:1610:27 | MyStruct(...) |  | main.rs:1595:5:1595:26 | MyStruct |
+| main.rs:1610:17:1610:27 | MyStruct(...) | T | main.rs:1593:5:1593:13 | S |
+| main.rs:1610:26:1610:26 | S |  | main.rs:1593:5:1593:13 | S |
+| main.rs:1612:9:1612:9 | x |  | main.rs:1595:5:1595:26 | MyStruct |
+| main.rs:1612:9:1612:9 | x | T | main.rs:1593:5:1593:13 | S |
+| main.rs:1612:9:1612:18 | x.bar(...) |  | file://:0:0:0:0 | & |
+| main.rs:1612:9:1612:18 | x.bar(...) | &T | main.rs:1595:5:1595:26 | MyStruct |
+| main.rs:1612:9:1612:18 | x.bar(...) | &T.T | main.rs:1593:5:1593:13 | S |
+| main.rs:1612:15:1612:17 | &... |  | file://:0:0:0:0 | & |
+| main.rs:1612:15:1612:17 | &... | &T | file://:0:0:0:0 | & |
+| main.rs:1612:15:1612:17 | &... | &T.&T | main.rs:1595:5:1595:26 | MyStruct |
+| main.rs:1612:15:1612:17 | &... | &T.&T.T | main.rs:1593:5:1593:13 | S |
+| main.rs:1612:16:1612:17 | &x |  | file://:0:0:0:0 | & |
+| main.rs:1612:16:1612:17 | &x | &T | main.rs:1595:5:1595:26 | MyStruct |
+| main.rs:1612:16:1612:17 | &x | &T.T | main.rs:1593:5:1593:13 | S |
+| main.rs:1612:17:1612:17 | x |  | main.rs:1595:5:1595:26 | MyStruct |
+| main.rs:1612:17:1612:17 | x | T | main.rs:1593:5:1593:13 | S |
+| main.rs:1623:17:1623:25 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1623:17:1623:25 | SelfParam | &T | main.rs:1617:5:1620:5 | MyFlag |
+| main.rs:1623:28:1625:9 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1624:13:1624:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1624:13:1624:16 | self | &T | main.rs:1617:5:1620:5 | MyFlag |
+| main.rs:1624:13:1624:21 | self.bool |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1624:13:1624:34 | ... = ... |  | file://:0:0:0:0 | () |
+| main.rs:1624:25:1624:34 | ! ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1624:26:1624:29 | self |  | file://:0:0:0:0 | & |
+| main.rs:1624:26:1624:29 | self | &T | main.rs:1617:5:1620:5 | MyFlag |
+| main.rs:1624:26:1624:34 | self.bool |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1631:15:1631:19 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1631:15:1631:19 | SelfParam | &T | main.rs:1628:5:1628:13 | S |
+| main.rs:1631:31:1633:9 | { ... } |  | file://:0:0:0:0 | & |
+| main.rs:1631:31:1633:9 | { ... } | &T | main.rs:1628:5:1628:13 | S |
+| main.rs:1632:13:1632:19 | &... |  | file://:0:0:0:0 | & |
+| main.rs:1632:13:1632:19 | &... | &T | file://:0:0:0:0 | & |
+| main.rs:1632:13:1632:19 | &... | &T | main.rs:1628:5:1628:13 | S |
+| main.rs:1632:13:1632:19 | &... | &T.&T | file://:0:0:0:0 | & |
+| main.rs:1632:13:1632:19 | &... | &T.&T.&T | file://:0:0:0:0 | & |
+| main.rs:1632:13:1632:19 | &... | &T.&T.&T.&T | main.rs:1628:5:1628:13 | S |
+| main.rs:1632:14:1632:19 | &... |  | file://:0:0:0:0 | & |
+| main.rs:1632:14:1632:19 | &... | &T | file://:0:0:0:0 | & |
+| main.rs:1632:14:1632:19 | &... | &T.&T | file://:0:0:0:0 | & |
+| main.rs:1632:14:1632:19 | &... | &T.&T.&T | main.rs:1628:5:1628:13 | S |
+| main.rs:1632:15:1632:19 | &self |  | file://:0:0:0:0 | & |
+| main.rs:1632:15:1632:19 | &self | &T | file://:0:0:0:0 | & |
+| main.rs:1632:15:1632:19 | &self | &T.&T | main.rs:1628:5:1628:13 | S |
+| main.rs:1632:16:1632:19 | self |  | file://:0:0:0:0 | & |
+| main.rs:1632:16:1632:19 | self | &T | main.rs:1628:5:1628:13 | S |
+| main.rs:1635:15:1635:25 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1635:15:1635:25 | SelfParam | &T | main.rs:1628:5:1628:13 | S |
+| main.rs:1635:37:1637:9 | { ... } |  | file://:0:0:0:0 | & |
+| main.rs:1635:37:1637:9 | { ... } | &T | main.rs:1628:5:1628:13 | S |
+| main.rs:1636:13:1636:19 | &... |  | file://:0:0:0:0 | & |
+| main.rs:1636:13:1636:19 | &... | &T | file://:0:0:0:0 | & |
+| main.rs:1636:13:1636:19 | &... | &T | main.rs:1628:5:1628:13 | S |
+| main.rs:1636:13:1636:19 | &... | &T.&T | file://:0:0:0:0 | & |
+| main.rs:1636:13:1636:19 | &... | &T.&T.&T | file://:0:0:0:0 | & |
+| main.rs:1636:13:1636:19 | &... | &T.&T.&T.&T | main.rs:1628:5:1628:13 | S |
+| main.rs:1636:14:1636:19 | &... |  | file://:0:0:0:0 | & |
+| main.rs:1636:14:1636:19 | &... | &T | file://:0:0:0:0 | & |
+| main.rs:1636:14:1636:19 | &... | &T.&T | file://:0:0:0:0 | & |
+| main.rs:1636:14:1636:19 | &... | &T.&T.&T | main.rs:1628:5:1628:13 | S |
+| main.rs:1636:15:1636:19 | &self |  | file://:0:0:0:0 | & |
+| main.rs:1636:15:1636:19 | &self | &T | file://:0:0:0:0 | & |
+| main.rs:1636:15:1636:19 | &self | &T.&T | main.rs:1628:5:1628:13 | S |
+| main.rs:1636:16:1636:19 | self |  | file://:0:0:0:0 | & |
+| main.rs:1636:16:1636:19 | self | &T | main.rs:1628:5:1628:13 | S |
+| main.rs:1639:15:1639:15 | x |  | file://:0:0:0:0 | & |
+| main.rs:1639:15:1639:15 | x | &T | main.rs:1628:5:1628:13 | S |
+| main.rs:1639:34:1641:9 | { ... } |  | file://:0:0:0:0 | & |
+| main.rs:1639:34:1641:9 | { ... } | &T | main.rs:1628:5:1628:13 | S |
+| main.rs:1640:13:1640:13 | x |  | file://:0:0:0:0 | & |
+| main.rs:1640:13:1640:13 | x | &T | main.rs:1628:5:1628:13 | S |
+| main.rs:1643:15:1643:15 | x |  | file://:0:0:0:0 | & |
+| main.rs:1643:15:1643:15 | x | &T | main.rs:1628:5:1628:13 | S |
+| main.rs:1643:34:1645:9 | { ... } |  | file://:0:0:0:0 | & |
+| main.rs:1643:34:1645:9 | { ... } | &T | main.rs:1628:5:1628:13 | S |
+| main.rs:1644:13:1644:16 | &... |  | file://:0:0:0:0 | & |
+| main.rs:1644:13:1644:16 | &... | &T | file://:0:0:0:0 | & |
+| main.rs:1644:13:1644:16 | &... | &T | main.rs:1628:5:1628:13 | S |
+| main.rs:1644:13:1644:16 | &... | &T.&T | file://:0:0:0:0 | & |
+| main.rs:1644:13:1644:16 | &... | &T.&T.&T | file://:0:0:0:0 | & |
+| main.rs:1644:13:1644:16 | &... | &T.&T.&T.&T | main.rs:1628:5:1628:13 | S |
+| main.rs:1644:14:1644:16 | &... |  | file://:0:0:0:0 | & |
+| main.rs:1644:14:1644:16 | &... | &T | file://:0:0:0:0 | & |
+| main.rs:1644:14:1644:16 | &... | &T.&T | file://:0:0:0:0 | & |
+| main.rs:1644:14:1644:16 | &... | &T.&T.&T | main.rs:1628:5:1628:13 | S |
+| main.rs:1644:15:1644:16 | &x |  | file://:0:0:0:0 | & |
+| main.rs:1644:15:1644:16 | &x | &T | file://:0:0:0:0 | & |
+| main.rs:1644:15:1644:16 | &x | &T.&T | main.rs:1628:5:1628:13 | S |
+| main.rs:1644:16:1644:16 | x |  | file://:0:0:0:0 | & |
+| main.rs:1644:16:1644:16 | x | &T | main.rs:1628:5:1628:13 | S |
+| main.rs:1648:16:1661:5 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1649:13:1649:13 | x |  | main.rs:1628:5:1628:13 | S |
+| main.rs:1649:17:1649:20 | S {...} |  | main.rs:1628:5:1628:13 | S |
+| main.rs:1650:9:1650:9 | x |  | main.rs:1628:5:1628:13 | S |
+| main.rs:1650:9:1650:14 | x.f1() |  | file://:0:0:0:0 | & |
+| main.rs:1650:9:1650:14 | x.f1() | &T | main.rs:1628:5:1628:13 | S |
+| main.rs:1651:9:1651:9 | x |  | main.rs:1628:5:1628:13 | S |
+| main.rs:1651:9:1651:14 | x.f2() |  | file://:0:0:0:0 | & |
+| main.rs:1651:9:1651:14 | x.f2() | &T | main.rs:1628:5:1628:13 | S |
+| main.rs:1652:9:1652:17 | ...::f3(...) |  | file://:0:0:0:0 | & |
+| main.rs:1652:9:1652:17 | ...::f3(...) | &T | main.rs:1628:5:1628:13 | S |
+| main.rs:1652:15:1652:16 | &x |  | file://:0:0:0:0 | & |
+| main.rs:1652:15:1652:16 | &x | &T | main.rs:1628:5:1628:13 | S |
+| main.rs:1652:16:1652:16 | x |  | main.rs:1628:5:1628:13 | S |
+| main.rs:1654:13:1654:13 | n |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1654:17:1654:24 | * ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1654:18:1654:24 | * ... |  | file://:0:0:0:0 | & |
+| main.rs:1654:18:1654:24 | * ... | &T | {EXTERNAL LOCATION} | bool |
+| main.rs:1654:19:1654:24 | &... |  | file://:0:0:0:0 | & |
+| main.rs:1654:19:1654:24 | &... | &T | file://:0:0:0:0 | & |
+| main.rs:1654:19:1654:24 | &... | &T.&T | {EXTERNAL LOCATION} | bool |
+| main.rs:1654:20:1654:24 | &true |  | file://:0:0:0:0 | & |
+| main.rs:1654:20:1654:24 | &true | &T | {EXTERNAL LOCATION} | bool |
+| main.rs:1654:21:1654:24 | true |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1658:17:1658:20 | flag |  | main.rs:1617:5:1620:5 | MyFlag |
+| main.rs:1658:24:1658:41 | ...::default(...) |  | main.rs:1617:5:1620:5 | MyFlag |
+| main.rs:1659:9:1659:31 | ...::flip(...) |  | file://:0:0:0:0 | () |
+| main.rs:1659:22:1659:30 | &mut flag |  | file://:0:0:0:0 | & |
+| main.rs:1659:22:1659:30 | &mut flag | &T | main.rs:1617:5:1620:5 | MyFlag |
+| main.rs:1659:27:1659:30 | flag |  | main.rs:1617:5:1620:5 | MyFlag |
+| main.rs:1660:18:1660:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1660:18:1660:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1660:18:1660:29 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:1660:18:1660:29 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1660:26:1660:29 | flag |  | main.rs:1617:5:1620:5 | MyFlag |
+| main.rs:1675:43:1678:5 | { ... } |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1675:43:1678:5 | { ... } | E | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1675:43:1678:5 | { ... } | T | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1676:13:1676:13 | x |  | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1676:17:1676:30 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1676:17:1676:30 | ...::Ok(...) | T | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1676:17:1676:31 | TryExpr |  | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1676:28:1676:29 | S1 |  | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1677:9:1677:22 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1677:9:1677:22 | ...::Ok(...) | E | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1677:9:1677:22 | ...::Ok(...) | T | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1677:20:1677:21 | S1 |  | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1682:46:1686:5 | { ... } |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1682:46:1686:5 | { ... } | E | main.rs:1670:5:1671:14 | S2 |
+| main.rs:1682:46:1686:5 | { ... } | T | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1683:13:1683:13 | x |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1683:13:1683:13 | x | T | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1683:17:1683:30 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1683:17:1683:30 | ...::Ok(...) | T | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1683:28:1683:29 | S1 |  | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1684:13:1684:13 | y |  | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1684:17:1684:17 | x |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1684:17:1684:17 | x | T | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1684:17:1684:18 | TryExpr |  | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1685:9:1685:22 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1685:9:1685:22 | ...::Ok(...) | E | main.rs:1670:5:1671:14 | S2 |
+| main.rs:1685:9:1685:22 | ...::Ok(...) | T | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1685:20:1685:21 | S1 |  | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1690:40:1695:5 | { ... } |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1690:40:1695:5 | { ... } | E | main.rs:1670:5:1671:14 | S2 |
+| main.rs:1690:40:1695:5 | { ... } | T | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1691:13:1691:13 | x |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1691:13:1691:13 | x | T | {EXTERNAL LOCATION} | Result |
+| main.rs:1691:13:1691:13 | x | T.T | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1691:17:1691:42 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1691:17:1691:42 | ...::Ok(...) | T | {EXTERNAL LOCATION} | Result |
+| main.rs:1691:17:1691:42 | ...::Ok(...) | T.T | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1691:28:1691:41 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1691:28:1691:41 | ...::Ok(...) | T | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1691:39:1691:40 | S1 |  | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1693:17:1693:17 | x |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1693:17:1693:17 | x | T | {EXTERNAL LOCATION} | Result |
+| main.rs:1693:17:1693:17 | x | T.T | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1693:17:1693:18 | TryExpr |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1693:17:1693:18 | TryExpr | T | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1693:17:1693:29 | ... .map(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1693:24:1693:28 | \|...\| s |  | {EXTERNAL LOCATION} | dyn FnOnce |
+| main.rs:1693:24:1693:28 | \|...\| s | dyn(Args) | file://:0:0:0:0 | (T_1) |
+| main.rs:1694:9:1694:22 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1694:9:1694:22 | ...::Ok(...) | E | main.rs:1670:5:1671:14 | S2 |
+| main.rs:1694:9:1694:22 | ...::Ok(...) | T | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1694:20:1694:21 | S1 |  | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1699:30:1699:34 | input |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1699:30:1699:34 | input | E | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1699:30:1699:34 | input | T | main.rs:1699:20:1699:27 | T |
+| main.rs:1699:69:1706:5 | { ... } |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1699:69:1706:5 | { ... } | E | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1699:69:1706:5 | { ... } | T | main.rs:1699:20:1699:27 | T |
+| main.rs:1700:13:1700:17 | value |  | main.rs:1699:20:1699:27 | T |
+| main.rs:1700:21:1700:25 | input |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1700:21:1700:25 | input | E | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1700:21:1700:25 | input | T | main.rs:1699:20:1699:27 | T |
+| main.rs:1700:21:1700:26 | TryExpr |  | main.rs:1699:20:1699:27 | T |
+| main.rs:1701:22:1701:38 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1701:22:1701:38 | ...::Ok(...) | E | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1701:22:1701:38 | ...::Ok(...) | T | main.rs:1699:20:1699:27 | T |
+| main.rs:1701:22:1704:10 | ... .and_then(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1701:22:1704:10 | ... .and_then(...) | E | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1701:33:1701:37 | value |  | main.rs:1699:20:1699:27 | T |
+| main.rs:1701:49:1704:9 | \|...\| ... |  | {EXTERNAL LOCATION} | dyn FnOnce |
+| main.rs:1701:49:1704:9 | \|...\| ... | dyn(Args) | file://:0:0:0:0 | (T_1) |
+| main.rs:1701:49:1704:9 | \|...\| ... | dyn(Output) | {EXTERNAL LOCATION} | Result |
+| main.rs:1701:49:1704:9 | \|...\| ... | dyn(Output).E | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1701:53:1704:9 | { ... } |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1701:53:1704:9 | { ... } | E | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1702:22:1702:27 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1702:22:1702:27 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1702:22:1702:30 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:1702:22:1702:30 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1703:13:1703:34 | ...::Ok::<...>(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1703:13:1703:34 | ...::Ok::<...>(...) | E | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1705:9:1705:23 | ...::Err(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1705:9:1705:23 | ...::Err(...) | E | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1705:9:1705:23 | ...::Err(...) | T | main.rs:1699:20:1699:27 | T |
+| main.rs:1705:21:1705:22 | S1 |  | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1709:16:1725:5 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1710:9:1712:9 | if ... {...} |  | file://:0:0:0:0 | () |
+| main.rs:1710:16:1710:33 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1710:16:1710:33 | ...::Ok(...) | E | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1710:16:1710:33 | ...::Ok(...) | T | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1710:27:1710:32 | result |  | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1710:37:1710:52 | try_same_error(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1710:37:1710:52 | try_same_error(...) | E | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1710:37:1710:52 | try_same_error(...) | T | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1710:54:1712:9 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1711:22:1711:27 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1711:22:1711:27 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1711:22:1711:35 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:1711:22:1711:35 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1711:30:1711:35 | result |  | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1714:9:1716:9 | if ... {...} |  | file://:0:0:0:0 | () |
+| main.rs:1714:16:1714:33 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1714:16:1714:33 | ...::Ok(...) | E | main.rs:1670:5:1671:14 | S2 |
+| main.rs:1714:16:1714:33 | ...::Ok(...) | T | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1714:27:1714:32 | result |  | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1714:37:1714:55 | try_convert_error(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1714:37:1714:55 | try_convert_error(...) | E | main.rs:1670:5:1671:14 | S2 |
+| main.rs:1714:37:1714:55 | try_convert_error(...) | T | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1714:57:1716:9 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1715:22:1715:27 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1715:22:1715:27 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1715:22:1715:35 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:1715:22:1715:35 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1715:30:1715:35 | result |  | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1718:9:1720:9 | if ... {...} |  | file://:0:0:0:0 | () |
+| main.rs:1718:16:1718:33 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1718:16:1718:33 | ...::Ok(...) | E | main.rs:1670:5:1671:14 | S2 |
+| main.rs:1718:16:1718:33 | ...::Ok(...) | T | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1718:27:1718:32 | result |  | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1718:37:1718:49 | try_chained(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1718:37:1718:49 | try_chained(...) | E | main.rs:1670:5:1671:14 | S2 |
+| main.rs:1718:37:1718:49 | try_chained(...) | T | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1718:51:1720:9 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1719:22:1719:27 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1719:22:1719:27 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1719:22:1719:35 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:1719:22:1719:35 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1719:30:1719:35 | result |  | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1722:9:1724:9 | if ... {...} |  | file://:0:0:0:0 | () |
+| main.rs:1722:16:1722:33 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1722:16:1722:33 | ...::Ok(...) | E | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1722:16:1722:33 | ...::Ok(...) | T | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1722:27:1722:32 | result |  | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1722:37:1722:63 | try_complex(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1722:37:1722:63 | try_complex(...) | E | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1722:37:1722:63 | try_complex(...) | T | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1722:49:1722:62 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1722:49:1722:62 | ...::Ok(...) | E | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1722:49:1722:62 | ...::Ok(...) | T | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1722:60:1722:61 | S1 |  | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1722:65:1724:9 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1723:22:1723:27 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1723:22:1723:27 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1723:22:1723:35 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:1723:22:1723:35 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1723:30:1723:35 | result |  | main.rs:1667:5:1668:14 | S1 |
+| main.rs:1729:16:1739:5 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1730:13:1730:13 | x |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1730:22:1730:22 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1731:13:1731:13 | y |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1731:17:1731:17 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1732:13:1732:13 | z |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1732:17:1732:17 | x |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1732:17:1732:21 | ... + ... |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1732:21:1732:21 | y |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1733:13:1733:13 | z |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1733:17:1733:17 | x |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1733:17:1733:23 | x.abs() |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1734:13:1734:13 | c |  | {EXTERNAL LOCATION} | char |
+| main.rs:1734:17:1734:19 | 'c' |  | {EXTERNAL LOCATION} | char |
+| main.rs:1735:13:1735:17 | hello |  | file://:0:0:0:0 | & |
+| main.rs:1735:13:1735:17 | hello | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1735:21:1735:27 | "Hello" |  | file://:0:0:0:0 | & |
+| main.rs:1735:21:1735:27 | "Hello" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1736:13:1736:13 | f |  | {EXTERNAL LOCATION} | f64 |
+| main.rs:1736:17:1736:24 | 123.0f64 |  | {EXTERNAL LOCATION} | f64 |
+| main.rs:1737:13:1737:13 | t |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1737:17:1737:20 | true |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1738:13:1738:13 | f |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1738:17:1738:21 | false |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1744:16:1756:5 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1745:13:1745:13 | x |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1745:17:1745:20 | true |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1745:17:1745:29 | ... && ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1745:25:1745:29 | false |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1746:13:1746:13 | y |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1746:17:1746:20 | true |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1746:17:1746:29 | ... \|\| ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1746:25:1746:29 | false |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1748:17:1748:17 | a |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1749:13:1749:16 | cond |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1749:20:1749:21 | 34 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1749:20:1749:27 | ... == ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1749:26:1749:27 | 33 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1750:9:1754:9 | if cond {...} else {...} |  | file://:0:0:0:0 | () |
+| main.rs:1750:12:1750:15 | cond |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1750:17:1752:9 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1751:17:1751:17 | z |  | file://:0:0:0:0 | () |
+| main.rs:1751:21:1751:27 | (...) |  | file://:0:0:0:0 | () |
+| main.rs:1751:22:1751:22 | a |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1751:22:1751:26 | ... = ... |  | file://:0:0:0:0 | () |
+| main.rs:1751:26:1751:26 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1752:16:1754:9 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1753:13:1753:13 | a |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1753:13:1753:17 | ... = ... |  | file://:0:0:0:0 | () |
+| main.rs:1753:17:1753:17 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1755:9:1755:9 | a |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1769:30:1771:9 | { ... } |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1770:13:1770:31 | Vec2 {...} |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1770:23:1770:23 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1770:29:1770:29 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1777:16:1777:19 | SelfParam |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1777:22:1777:24 | rhs |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1777:41:1782:9 | { ... } |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1778:13:1781:13 | Vec2 {...} |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1779:20:1779:23 | self |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1779:20:1779:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1779:20:1779:33 | ... + ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1779:29:1779:31 | rhs |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1779:29:1779:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1780:20:1780:23 | self |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1780:20:1780:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1780:20:1780:33 | ... + ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1780:29:1780:31 | rhs |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1780:29:1780:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1787:23:1787:31 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1787:23:1787:31 | SelfParam | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1787:34:1787:36 | rhs |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1787:45:1790:9 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1788:13:1788:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1788:13:1788:16 | self | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1788:13:1788:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1788:13:1788:27 | ... += ... |  | file://:0:0:0:0 | () |
+| main.rs:1788:23:1788:25 | rhs |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1788:23:1788:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1789:13:1789:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1789:13:1789:16 | self | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1789:13:1789:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1789:13:1789:27 | ... += ... |  | file://:0:0:0:0 | () |
+| main.rs:1789:23:1789:25 | rhs |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1789:23:1789:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1795:16:1795:19 | SelfParam |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1795:22:1795:24 | rhs |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1795:41:1800:9 | { ... } |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1796:13:1799:13 | Vec2 {...} |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1797:20:1797:23 | self |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1797:20:1797:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1797:20:1797:33 | ... - ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1797:29:1797:31 | rhs |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1797:29:1797:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1798:20:1798:23 | self |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1798:20:1798:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1798:20:1798:33 | ... - ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1798:29:1798:31 | rhs |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1798:29:1798:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1805:23:1805:31 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1805:23:1805:31 | SelfParam | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1805:34:1805:36 | rhs |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1805:45:1808:9 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1806:13:1806:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1806:13:1806:16 | self | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1806:13:1806:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1806:13:1806:27 | ... -= ... |  | file://:0:0:0:0 | () |
+| main.rs:1806:23:1806:25 | rhs |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1806:23:1806:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1807:13:1807:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1807:13:1807:16 | self | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1807:13:1807:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1807:13:1807:27 | ... -= ... |  | file://:0:0:0:0 | () |
+| main.rs:1807:23:1807:25 | rhs |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1807:23:1807:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1813:16:1813:19 | SelfParam |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1813:22:1813:24 | rhs |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1813:41:1818:9 | { ... } |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1814:13:1817:13 | Vec2 {...} |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1815:20:1815:23 | self |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1815:20:1815:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1815:20:1815:33 | ... * ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1815:29:1815:31 | rhs |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1815:29:1815:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1816:20:1816:23 | self |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1816:20:1816:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1816:20:1816:33 | ... * ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1816:29:1816:31 | rhs |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1816:29:1816:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1822:23:1822:31 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1822:23:1822:31 | SelfParam | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1822:34:1822:36 | rhs |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1822:45:1825:9 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1823:13:1823:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1823:13:1823:16 | self | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1823:13:1823:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1823:13:1823:27 | ... *= ... |  | file://:0:0:0:0 | () |
+| main.rs:1823:23:1823:25 | rhs |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1823:23:1823:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1824:13:1824:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1824:13:1824:16 | self | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1824:13:1824:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1824:13:1824:27 | ... *= ... |  | file://:0:0:0:0 | () |
+| main.rs:1824:23:1824:25 | rhs |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1824:23:1824:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1830:16:1830:19 | SelfParam |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1830:22:1830:24 | rhs |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1830:41:1835:9 | { ... } |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1831:13:1834:13 | Vec2 {...} |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1832:20:1832:23 | self |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1832:20:1832:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1832:20:1832:33 | ... / ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1832:29:1832:31 | rhs |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1832:29:1832:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1833:20:1833:23 | self |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1833:20:1833:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1833:20:1833:33 | ... / ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1833:29:1833:31 | rhs |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1833:29:1833:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1839:23:1839:31 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1839:23:1839:31 | SelfParam | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1839:34:1839:36 | rhs |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1839:45:1842:9 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1840:13:1840:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1840:13:1840:16 | self | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1840:13:1840:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1840:13:1840:27 | ... /= ... |  | file://:0:0:0:0 | () |
+| main.rs:1840:23:1840:25 | rhs |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1840:23:1840:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1841:13:1841:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1841:13:1841:16 | self | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1841:13:1841:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1841:13:1841:27 | ... /= ... |  | file://:0:0:0:0 | () |
+| main.rs:1841:23:1841:25 | rhs |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1841:23:1841:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1847:16:1847:19 | SelfParam |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1847:22:1847:24 | rhs |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1847:41:1852:9 | { ... } |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1848:13:1851:13 | Vec2 {...} |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1849:20:1849:23 | self |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1849:20:1849:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1849:20:1849:33 | ... % ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1849:29:1849:31 | rhs |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1849:29:1849:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1850:20:1850:23 | self |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1850:20:1850:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1850:20:1850:33 | ... % ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1850:29:1850:31 | rhs |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1850:29:1850:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1856:23:1856:31 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1856:23:1856:31 | SelfParam | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1856:34:1856:36 | rhs |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1856:45:1859:9 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1857:13:1857:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1857:13:1857:16 | self | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1857:13:1857:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1857:13:1857:27 | ... %= ... |  | file://:0:0:0:0 | () |
+| main.rs:1857:23:1857:25 | rhs |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1857:23:1857:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1858:13:1858:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1858:13:1858:16 | self | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1858:13:1858:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1858:13:1858:27 | ... %= ... |  | file://:0:0:0:0 | () |
+| main.rs:1858:23:1858:25 | rhs |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1858:23:1858:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1864:19:1864:22 | SelfParam |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1864:25:1864:27 | rhs |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1864:44:1869:9 | { ... } |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1865:13:1868:13 | Vec2 {...} |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1866:20:1866:23 | self |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1866:20:1866:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1866:20:1866:33 | ... & ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1866:29:1866:31 | rhs |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1866:29:1866:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1867:20:1867:23 | self |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1867:20:1867:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1867:20:1867:33 | ... & ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1867:29:1867:31 | rhs |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1867:29:1867:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1873:26:1873:34 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1873:26:1873:34 | SelfParam | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1873:37:1873:39 | rhs |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1873:48:1876:9 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1874:13:1874:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1874:13:1874:16 | self | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1874:13:1874:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1874:13:1874:27 | ... &= ... |  | file://:0:0:0:0 | () |
+| main.rs:1874:23:1874:25 | rhs |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1874:23:1874:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1875:13:1875:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1875:13:1875:16 | self | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1875:13:1875:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1875:13:1875:27 | ... &= ... |  | file://:0:0:0:0 | () |
+| main.rs:1875:23:1875:25 | rhs |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1875:23:1875:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1881:18:1881:21 | SelfParam |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1881:24:1881:26 | rhs |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1881:43:1886:9 | { ... } |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1882:13:1885:13 | Vec2 {...} |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1883:20:1883:23 | self |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1883:20:1883:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1883:20:1883:33 | ... \| ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1883:29:1883:31 | rhs |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1883:29:1883:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1884:20:1884:23 | self |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1884:20:1884:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1884:20:1884:33 | ... \| ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1884:29:1884:31 | rhs |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1884:29:1884:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1890:25:1890:33 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1890:25:1890:33 | SelfParam | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1890:36:1890:38 | rhs |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1890:47:1893:9 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1891:13:1891:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1891:13:1891:16 | self | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1891:13:1891:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1891:13:1891:27 | ... \|= ... |  | file://:0:0:0:0 | () |
+| main.rs:1891:23:1891:25 | rhs |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1891:23:1891:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1892:13:1892:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1892:13:1892:16 | self | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1892:13:1892:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1892:13:1892:27 | ... \|= ... |  | file://:0:0:0:0 | () |
+| main.rs:1892:23:1892:25 | rhs |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1892:23:1892:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1898:19:1898:22 | SelfParam |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1898:25:1898:27 | rhs |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1898:44:1903:9 | { ... } |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1899:13:1902:13 | Vec2 {...} |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1900:20:1900:23 | self |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1900:20:1900:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1900:20:1900:33 | ... ^ ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1900:29:1900:31 | rhs |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1900:29:1900:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1901:20:1901:23 | self |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1901:20:1901:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1901:20:1901:33 | ... ^ ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1901:29:1901:31 | rhs |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1901:29:1901:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1907:26:1907:34 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1907:26:1907:34 | SelfParam | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1907:37:1907:39 | rhs |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1907:48:1910:9 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1908:13:1908:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1908:13:1908:16 | self | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1908:13:1908:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1908:13:1908:27 | ... ^= ... |  | file://:0:0:0:0 | () |
+| main.rs:1908:23:1908:25 | rhs |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1908:23:1908:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1909:13:1909:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1909:13:1909:16 | self | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1909:13:1909:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1909:13:1909:27 | ... ^= ... |  | file://:0:0:0:0 | () |
+| main.rs:1909:23:1909:25 | rhs |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1909:23:1909:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1915:16:1915:19 | SelfParam |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1915:22:1915:24 | rhs |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1915:40:1920:9 | { ... } |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1916:13:1919:13 | Vec2 {...} |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1917:20:1917:23 | self |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1917:20:1917:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1917:20:1917:32 | ... << ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1917:30:1917:32 | rhs |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1918:20:1918:23 | self |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1918:20:1918:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1918:20:1918:32 | ... << ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1918:30:1918:32 | rhs |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1924:23:1924:31 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1924:23:1924:31 | SelfParam | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1924:34:1924:36 | rhs |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1924:44:1927:9 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1925:13:1925:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1925:13:1925:16 | self | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1925:13:1925:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1925:13:1925:26 | ... <<= ... |  | file://:0:0:0:0 | () |
+| main.rs:1925:24:1925:26 | rhs |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1926:13:1926:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1926:13:1926:16 | self | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1926:13:1926:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1926:13:1926:26 | ... <<= ... |  | file://:0:0:0:0 | () |
+| main.rs:1926:24:1926:26 | rhs |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1932:16:1932:19 | SelfParam |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1932:22:1932:24 | rhs |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1932:40:1937:9 | { ... } |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1933:13:1936:13 | Vec2 {...} |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1934:20:1934:23 | self |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1934:20:1934:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1934:20:1934:32 | ... >> ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1934:30:1934:32 | rhs |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1935:20:1935:23 | self |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1935:20:1935:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1935:20:1935:32 | ... >> ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1935:30:1935:32 | rhs |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1941:23:1941:31 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1941:23:1941:31 | SelfParam | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1941:34:1941:36 | rhs |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1941:44:1944:9 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:1942:13:1942:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1942:13:1942:16 | self | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1942:13:1942:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1942:13:1942:26 | ... >>= ... |  | file://:0:0:0:0 | () |
+| main.rs:1942:24:1942:26 | rhs |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1943:13:1943:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1943:13:1943:16 | self | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1943:13:1943:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1943:13:1943:26 | ... >>= ... |  | file://:0:0:0:0 | () |
+| main.rs:1943:24:1943:26 | rhs |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1949:16:1949:19 | SelfParam |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1949:30:1954:9 | { ... } |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1950:13:1953:13 | Vec2 {...} |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1951:20:1951:26 | - ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1951:21:1951:24 | self |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1951:21:1951:26 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1952:20:1952:26 | - ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1952:21:1952:24 | self |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1952:21:1952:26 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1959:16:1959:19 | SelfParam |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1959:30:1964:9 | { ... } |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1960:13:1963:13 | Vec2 {...} |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1961:20:1961:26 | ! ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1961:21:1961:24 | self |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1961:21:1961:26 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1962:20:1962:26 | ! ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1962:21:1962:24 | self |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1962:21:1962:26 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1968:15:1968:19 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1968:15:1968:19 | SelfParam | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1968:22:1968:26 | other |  | file://:0:0:0:0 | & |
+| main.rs:1968:22:1968:26 | other | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1968:44:1970:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1969:13:1969:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1969:13:1969:16 | self | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1969:13:1969:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1969:13:1969:29 | ... == ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1969:13:1969:50 | ... && ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1969:23:1969:27 | other |  | file://:0:0:0:0 | & |
+| main.rs:1969:23:1969:27 | other | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1969:23:1969:29 | other.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1969:34:1969:37 | self |  | file://:0:0:0:0 | & |
+| main.rs:1969:34:1969:37 | self | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1969:34:1969:39 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1969:34:1969:50 | ... == ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1969:44:1969:48 | other |  | file://:0:0:0:0 | & |
+| main.rs:1969:44:1969:48 | other | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1969:44:1969:50 | other.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1972:15:1972:19 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1972:15:1972:19 | SelfParam | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1972:22:1972:26 | other |  | file://:0:0:0:0 | & |
+| main.rs:1972:22:1972:26 | other | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1972:44:1974:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1973:13:1973:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1973:13:1973:16 | self | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1973:13:1973:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1973:13:1973:29 | ... != ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1973:13:1973:50 | ... \|\| ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1973:23:1973:27 | other |  | file://:0:0:0:0 | & |
+| main.rs:1973:23:1973:27 | other | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1973:23:1973:29 | other.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1973:34:1973:37 | self |  | file://:0:0:0:0 | & |
+| main.rs:1973:34:1973:37 | self | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1973:34:1973:39 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1973:34:1973:50 | ... != ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1973:44:1973:48 | other |  | file://:0:0:0:0 | & |
+| main.rs:1973:44:1973:48 | other | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1973:44:1973:50 | other.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1978:24:1978:28 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1978:24:1978:28 | SelfParam | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1978:31:1978:35 | other |  | file://:0:0:0:0 | & |
+| main.rs:1978:31:1978:35 | other | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1978:75:1980:9 | { ... } |  | {EXTERNAL LOCATION} | Option |
+| main.rs:1978:75:1980:9 | { ... } | T | {EXTERNAL LOCATION} | Ordering |
+| main.rs:1979:13:1979:29 | (...) |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1979:13:1979:63 | ... .partial_cmp(...) |  | {EXTERNAL LOCATION} | Option |
+| main.rs:1979:13:1979:63 | ... .partial_cmp(...) | T | {EXTERNAL LOCATION} | Ordering |
+| main.rs:1979:14:1979:17 | self |  | file://:0:0:0:0 | & |
+| main.rs:1979:14:1979:17 | self | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1979:14:1979:19 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1979:14:1979:28 | ... + ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1979:23:1979:26 | self |  | file://:0:0:0:0 | & |
+| main.rs:1979:23:1979:26 | self | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1979:23:1979:28 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1979:43:1979:62 | &... |  | file://:0:0:0:0 | & |
+| main.rs:1979:43:1979:62 | &... | &T | {EXTERNAL LOCATION} | i64 |
+| main.rs:1979:44:1979:62 | (...) |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1979:45:1979:49 | other |  | file://:0:0:0:0 | & |
+| main.rs:1979:45:1979:49 | other | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1979:45:1979:51 | other.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1979:45:1979:61 | ... + ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1979:55:1979:59 | other |  | file://:0:0:0:0 | & |
+| main.rs:1979:55:1979:59 | other | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1979:55:1979:61 | other.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1982:15:1982:19 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1982:15:1982:19 | SelfParam | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1982:22:1982:26 | other |  | file://:0:0:0:0 | & |
+| main.rs:1982:22:1982:26 | other | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1982:44:1984:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1983:13:1983:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1983:13:1983:16 | self | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1983:13:1983:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1983:13:1983:28 | ... < ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1983:13:1983:48 | ... && ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1983:22:1983:26 | other |  | file://:0:0:0:0 | & |
+| main.rs:1983:22:1983:26 | other | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1983:22:1983:28 | other.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1983:33:1983:36 | self |  | file://:0:0:0:0 | & |
+| main.rs:1983:33:1983:36 | self | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1983:33:1983:38 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1983:33:1983:48 | ... < ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1983:42:1983:46 | other |  | file://:0:0:0:0 | & |
+| main.rs:1983:42:1983:46 | other | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1983:42:1983:48 | other.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1986:15:1986:19 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1986:15:1986:19 | SelfParam | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1986:22:1986:26 | other |  | file://:0:0:0:0 | & |
+| main.rs:1986:22:1986:26 | other | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1986:44:1988:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1987:13:1987:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1987:13:1987:16 | self | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1987:13:1987:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1987:13:1987:29 | ... <= ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1987:13:1987:50 | ... && ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1987:23:1987:27 | other |  | file://:0:0:0:0 | & |
+| main.rs:1987:23:1987:27 | other | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1987:23:1987:29 | other.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1987:34:1987:37 | self |  | file://:0:0:0:0 | & |
+| main.rs:1987:34:1987:37 | self | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1987:34:1987:39 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1987:34:1987:50 | ... <= ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1987:44:1987:48 | other |  | file://:0:0:0:0 | & |
+| main.rs:1987:44:1987:48 | other | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1987:44:1987:50 | other.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1990:15:1990:19 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1990:15:1990:19 | SelfParam | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1990:22:1990:26 | other |  | file://:0:0:0:0 | & |
+| main.rs:1990:22:1990:26 | other | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1990:44:1992:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1991:13:1991:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1991:13:1991:16 | self | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1991:13:1991:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1991:13:1991:28 | ... > ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1991:13:1991:48 | ... && ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1991:22:1991:26 | other |  | file://:0:0:0:0 | & |
+| main.rs:1991:22:1991:26 | other | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1991:22:1991:28 | other.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1991:33:1991:36 | self |  | file://:0:0:0:0 | & |
+| main.rs:1991:33:1991:36 | self | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1991:33:1991:38 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1991:33:1991:48 | ... > ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1991:42:1991:46 | other |  | file://:0:0:0:0 | & |
+| main.rs:1991:42:1991:46 | other | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1991:42:1991:48 | other.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1994:15:1994:19 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1994:15:1994:19 | SelfParam | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1994:22:1994:26 | other |  | file://:0:0:0:0 | & |
+| main.rs:1994:22:1994:26 | other | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1994:44:1996:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1995:13:1995:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1995:13:1995:16 | self | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1995:13:1995:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1995:13:1995:29 | ... >= ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1995:13:1995:50 | ... && ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1995:23:1995:27 | other |  | file://:0:0:0:0 | & |
+| main.rs:1995:23:1995:27 | other | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1995:23:1995:29 | other.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1995:34:1995:37 | self |  | file://:0:0:0:0 | & |
+| main.rs:1995:34:1995:37 | self | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1995:34:1995:39 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1995:34:1995:50 | ... >= ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1995:44:1995:48 | other |  | file://:0:0:0:0 | & |
+| main.rs:1995:44:1995:48 | other | &T | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:1995:44:1995:50 | other.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1999:26:1999:26 | a |  | main.rs:1999:18:1999:23 | T |
+| main.rs:1999:32:1999:32 | b |  | main.rs:1999:18:1999:23 | T |
+| main.rs:1999:51:2001:5 | { ... } |  | {EXTERNAL LOCATION} | Output |
+| main.rs:2000:9:2000:9 | a |  | main.rs:1999:18:1999:23 | T |
+| main.rs:2000:9:2000:13 | ... + ... |  | {EXTERNAL LOCATION} | Output |
+| main.rs:2000:13:2000:13 | b |  | main.rs:1999:18:1999:23 | T |
+| main.rs:2003:16:2134:5 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2007:13:2007:18 | i64_eq |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2007:22:2007:35 | (...) |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2007:23:2007:26 | 1i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2007:23:2007:34 | ... == ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2007:31:2007:34 | 2i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2008:13:2008:18 | i64_ne |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2008:22:2008:35 | (...) |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2008:23:2008:26 | 3i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2008:23:2008:34 | ... != ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2008:31:2008:34 | 4i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2009:13:2009:18 | i64_lt |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2009:22:2009:34 | (...) |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2009:23:2009:26 | 5i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2009:23:2009:33 | ... < ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2009:30:2009:33 | 6i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2010:13:2010:18 | i64_le |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2010:22:2010:35 | (...) |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2010:23:2010:26 | 7i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2010:23:2010:34 | ... <= ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2010:31:2010:34 | 8i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2011:13:2011:18 | i64_gt |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2011:22:2011:35 | (...) |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2011:23:2011:26 | 9i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2011:23:2011:34 | ... > ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2011:30:2011:34 | 10i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2012:13:2012:18 | i64_ge |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2012:22:2012:37 | (...) |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2012:23:2012:27 | 11i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2012:23:2012:36 | ... >= ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2012:32:2012:36 | 12i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2015:13:2015:19 | i64_add |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2015:23:2015:27 | 13i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2015:23:2015:35 | ... + ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2015:31:2015:35 | 14i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2016:13:2016:19 | i64_sub |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2016:23:2016:27 | 15i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2016:23:2016:35 | ... - ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2016:31:2016:35 | 16i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2017:13:2017:19 | i64_mul |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2017:23:2017:27 | 17i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2017:23:2017:35 | ... * ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2017:31:2017:35 | 18i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2018:13:2018:19 | i64_div |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2018:23:2018:27 | 19i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2018:23:2018:35 | ... / ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2018:31:2018:35 | 20i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2019:13:2019:19 | i64_rem |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2019:23:2019:27 | 21i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2019:23:2019:35 | ... % ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2019:31:2019:35 | 22i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2020:39:2020:42 | 1i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2020:45:2020:48 | 2i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2023:17:2023:30 | i64_add_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2023:34:2023:38 | 23i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2024:9:2024:22 | i64_add_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2024:9:2024:31 | ... += ... |  | file://:0:0:0:0 | () |
+| main.rs:2024:27:2024:31 | 24i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2026:17:2026:30 | i64_sub_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2026:34:2026:38 | 25i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2027:9:2027:22 | i64_sub_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2027:9:2027:31 | ... -= ... |  | file://:0:0:0:0 | () |
+| main.rs:2027:27:2027:31 | 26i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2029:17:2029:30 | i64_mul_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2029:34:2029:38 | 27i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2030:9:2030:22 | i64_mul_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2030:9:2030:31 | ... *= ... |  | file://:0:0:0:0 | () |
+| main.rs:2030:27:2030:31 | 28i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2032:17:2032:30 | i64_div_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2032:34:2032:38 | 29i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2033:9:2033:22 | i64_div_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2033:9:2033:31 | ... /= ... |  | file://:0:0:0:0 | () |
+| main.rs:2033:27:2033:31 | 30i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2035:17:2035:30 | i64_rem_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2035:34:2035:38 | 31i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2036:9:2036:22 | i64_rem_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2036:9:2036:31 | ... %= ... |  | file://:0:0:0:0 | () |
+| main.rs:2036:27:2036:31 | 32i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2039:13:2039:22 | i64_bitand |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2039:26:2039:30 | 33i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2039:26:2039:38 | ... & ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2039:34:2039:38 | 34i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2040:13:2040:21 | i64_bitor |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2040:25:2040:29 | 35i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2040:25:2040:37 | ... \| ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2040:33:2040:37 | 36i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2041:13:2041:22 | i64_bitxor |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2041:26:2041:30 | 37i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2041:26:2041:38 | ... ^ ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2041:34:2041:38 | 38i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2042:13:2042:19 | i64_shl |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2042:23:2042:27 | 39i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2042:23:2042:36 | ... << ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2042:32:2042:36 | 40i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2043:13:2043:19 | i64_shr |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2043:23:2043:27 | 41i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2043:23:2043:36 | ... >> ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2043:32:2043:36 | 42i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2046:17:2046:33 | i64_bitand_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2046:37:2046:41 | 43i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2047:9:2047:25 | i64_bitand_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2047:9:2047:34 | ... &= ... |  | file://:0:0:0:0 | () |
+| main.rs:2047:30:2047:34 | 44i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2049:17:2049:32 | i64_bitor_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2049:36:2049:40 | 45i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2050:9:2050:24 | i64_bitor_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2050:9:2050:33 | ... \|= ... |  | file://:0:0:0:0 | () |
+| main.rs:2050:29:2050:33 | 46i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2052:17:2052:33 | i64_bitxor_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2052:37:2052:41 | 47i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2053:9:2053:25 | i64_bitxor_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2053:9:2053:34 | ... ^= ... |  | file://:0:0:0:0 | () |
+| main.rs:2053:30:2053:34 | 48i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2055:17:2055:30 | i64_shl_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2055:34:2055:38 | 49i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2056:9:2056:22 | i64_shl_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2056:9:2056:32 | ... <<= ... |  | file://:0:0:0:0 | () |
+| main.rs:2056:28:2056:32 | 50i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2058:17:2058:30 | i64_shr_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2058:34:2058:38 | 51i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2059:9:2059:22 | i64_shr_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2059:9:2059:32 | ... >>= ... |  | file://:0:0:0:0 | () |
+| main.rs:2059:28:2059:32 | 52i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2061:13:2061:19 | i64_neg |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2061:23:2061:28 | - ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2061:24:2061:28 | 53i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2062:13:2062:19 | i64_not |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2062:23:2062:28 | ! ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2062:24:2062:28 | 54i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2065:13:2065:14 | v1 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2065:18:2065:36 | Vec2 {...} |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2065:28:2065:28 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2065:34:2065:34 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2066:13:2066:14 | v2 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2066:18:2066:36 | Vec2 {...} |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2066:28:2066:28 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2066:34:2066:34 | 4 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2069:13:2069:19 | vec2_eq |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2069:23:2069:24 | v1 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2069:23:2069:30 | ... == ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2069:29:2069:30 | v2 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2070:13:2070:19 | vec2_ne |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2070:23:2070:24 | v1 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2070:23:2070:30 | ... != ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2070:29:2070:30 | v2 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2071:13:2071:19 | vec2_lt |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2071:23:2071:24 | v1 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2071:23:2071:29 | ... < ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2071:28:2071:29 | v2 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2072:13:2072:19 | vec2_le |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2072:23:2072:24 | v1 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2072:23:2072:30 | ... <= ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2072:29:2072:30 | v2 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2073:13:2073:19 | vec2_gt |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2073:23:2073:24 | v1 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2073:23:2073:29 | ... > ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2073:28:2073:29 | v2 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2074:13:2074:19 | vec2_ge |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2074:23:2074:24 | v1 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2074:23:2074:30 | ... >= ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2074:29:2074:30 | v2 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2077:13:2077:20 | vec2_add |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2077:24:2077:25 | v1 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2077:24:2077:30 | ... + ... |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2077:29:2077:30 | v2 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2078:13:2078:20 | vec2_sub |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2078:24:2078:25 | v1 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2078:24:2078:30 | ... - ... |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2078:29:2078:30 | v2 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2079:13:2079:20 | vec2_mul |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2079:24:2079:25 | v1 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2079:24:2079:30 | ... * ... |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2079:29:2079:30 | v2 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2080:13:2080:20 | vec2_div |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2080:24:2080:25 | v1 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2080:24:2080:30 | ... / ... |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2080:29:2080:30 | v2 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2081:13:2081:20 | vec2_rem |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2081:24:2081:25 | v1 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2081:24:2081:30 | ... % ... |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2081:29:2081:30 | v2 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2084:17:2084:31 | vec2_add_assign |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2084:35:2084:36 | v1 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2085:9:2085:23 | vec2_add_assign |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2085:9:2085:29 | ... += ... |  | file://:0:0:0:0 | () |
+| main.rs:2085:28:2085:29 | v2 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2087:17:2087:31 | vec2_sub_assign |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2087:35:2087:36 | v1 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2088:9:2088:23 | vec2_sub_assign |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2088:9:2088:29 | ... -= ... |  | file://:0:0:0:0 | () |
+| main.rs:2088:28:2088:29 | v2 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2090:17:2090:31 | vec2_mul_assign |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2090:35:2090:36 | v1 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2091:9:2091:23 | vec2_mul_assign |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2091:9:2091:29 | ... *= ... |  | file://:0:0:0:0 | () |
+| main.rs:2091:28:2091:29 | v2 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2093:17:2093:31 | vec2_div_assign |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2093:35:2093:36 | v1 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2094:9:2094:23 | vec2_div_assign |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2094:9:2094:29 | ... /= ... |  | file://:0:0:0:0 | () |
+| main.rs:2094:28:2094:29 | v2 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2096:17:2096:31 | vec2_rem_assign |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2096:35:2096:36 | v1 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2097:9:2097:23 | vec2_rem_assign |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2097:9:2097:29 | ... %= ... |  | file://:0:0:0:0 | () |
+| main.rs:2097:28:2097:29 | v2 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2100:13:2100:23 | vec2_bitand |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2100:27:2100:28 | v1 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2100:27:2100:33 | ... & ... |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2100:32:2100:33 | v2 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2101:13:2101:22 | vec2_bitor |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2101:26:2101:27 | v1 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2101:26:2101:32 | ... \| ... |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2101:31:2101:32 | v2 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2102:13:2102:23 | vec2_bitxor |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2102:27:2102:28 | v1 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2102:27:2102:33 | ... ^ ... |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2102:32:2102:33 | v2 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2103:13:2103:20 | vec2_shl |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2103:24:2103:25 | v1 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2103:24:2103:33 | ... << ... |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2103:30:2103:33 | 1u32 |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:2104:13:2104:20 | vec2_shr |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2104:24:2104:25 | v1 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2104:24:2104:33 | ... >> ... |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2104:30:2104:33 | 1u32 |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:2107:17:2107:34 | vec2_bitand_assign |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2107:38:2107:39 | v1 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2108:9:2108:26 | vec2_bitand_assign |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2108:9:2108:32 | ... &= ... |  | file://:0:0:0:0 | () |
+| main.rs:2108:31:2108:32 | v2 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2110:17:2110:33 | vec2_bitor_assign |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2110:37:2110:38 | v1 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2111:9:2111:25 | vec2_bitor_assign |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2111:9:2111:31 | ... \|= ... |  | file://:0:0:0:0 | () |
+| main.rs:2111:30:2111:31 | v2 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2113:17:2113:34 | vec2_bitxor_assign |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2113:38:2113:39 | v1 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2114:9:2114:26 | vec2_bitxor_assign |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2114:9:2114:32 | ... ^= ... |  | file://:0:0:0:0 | () |
+| main.rs:2114:31:2114:32 | v2 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2116:17:2116:31 | vec2_shl_assign |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2116:35:2116:36 | v1 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2117:9:2117:23 | vec2_shl_assign |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2117:9:2117:32 | ... <<= ... |  | file://:0:0:0:0 | () |
+| main.rs:2117:29:2117:32 | 1u32 |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:2119:17:2119:31 | vec2_shr_assign |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2119:35:2119:36 | v1 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2120:9:2120:23 | vec2_shr_assign |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2120:9:2120:32 | ... >>= ... |  | file://:0:0:0:0 | () |
+| main.rs:2120:29:2120:32 | 1u32 |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:2123:13:2123:20 | vec2_neg |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2123:24:2123:26 | - ... |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2123:25:2123:26 | v1 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2124:13:2124:20 | vec2_not |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2124:24:2124:26 | ! ... |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2124:25:2124:26 | v1 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2127:13:2127:24 | default_vec2 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2127:28:2127:45 | ...::default(...) |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2128:13:2128:26 | vec2_zero_plus |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2128:30:2128:48 | Vec2 {...} |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2128:30:2128:63 | ... + ... |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2128:40:2128:40 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2128:46:2128:46 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2128:52:2128:63 | default_vec2 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2132:13:2132:24 | default_vec2 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2132:28:2132:45 | ...::default(...) |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2133:13:2133:26 | vec2_zero_plus |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2133:30:2133:48 | Vec2 {...} |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2133:30:2133:64 | ... == ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2133:40:2133:40 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2133:46:2133:46 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2133:53:2133:64 | default_vec2 |  | main.rs:1762:5:1767:5 | Vec2 |
+| main.rs:2143:18:2143:21 | SelfParam |  | main.rs:2140:5:2140:14 | S1 |
+| main.rs:2143:24:2143:25 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2146:25:2148:5 | { ... } |  | main.rs:2140:5:2140:14 | S1 |
+| main.rs:2147:9:2147:10 | S1 |  | main.rs:2140:5:2140:14 | S1 |
+| main.rs:2150:41:2152:5 | { ... } |  | main.rs:2150:16:2150:39 | impl ... |
+| main.rs:2151:9:2151:20 | { ... } |  | {EXTERNAL LOCATION} | trait Future |
+| main.rs:2151:9:2151:20 | { ... } | Output | main.rs:2140:5:2140:14 | S1 |
+| main.rs:2151:17:2151:18 | S1 |  | main.rs:2140:5:2140:14 | S1 |
+| main.rs:2154:41:2156:5 | { ... } |  | main.rs:2154:16:2154:39 | impl ... |
+| main.rs:2155:9:2155:16 | { ... } |  | {EXTERNAL LOCATION} | trait Future |
+| main.rs:2155:9:2155:16 | { ... } | Output | file://:0:0:0:0 | () |
+| main.rs:2164:13:2164:42 | SelfParam |  | {EXTERNAL LOCATION} | Pin |
+| main.rs:2164:13:2164:42 | SelfParam | Ptr | file://:0:0:0:0 | & |
+| main.rs:2164:13:2164:42 | SelfParam | Ptr.&T | main.rs:2158:5:2158:14 | S2 |
+| main.rs:2165:13:2165:15 | _cx |  | file://:0:0:0:0 | & |
+| main.rs:2165:13:2165:15 | _cx | &T | {EXTERNAL LOCATION} | Context |
+| main.rs:2166:44:2168:9 | { ... } |  | {EXTERNAL LOCATION} | Poll |
+| main.rs:2166:44:2168:9 | { ... } | T | main.rs:2140:5:2140:14 | S1 |
+| main.rs:2167:13:2167:38 | ...::Ready(...) |  | {EXTERNAL LOCATION} | Poll |
+| main.rs:2167:13:2167:38 | ...::Ready(...) | T | main.rs:2140:5:2140:14 | S1 |
+| main.rs:2167:36:2167:37 | S1 |  | main.rs:2140:5:2140:14 | S1 |
+| main.rs:2171:41:2173:5 | { ... } |  | main.rs:2171:16:2171:39 | impl ... |
+| main.rs:2172:9:2172:10 | S2 |  | main.rs:2158:5:2158:14 | S2 |
+| main.rs:2172:9:2172:10 | S2 |  | main.rs:2171:16:2171:39 | impl ... |
+| main.rs:2175:22:2183:5 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2176:9:2176:12 | f1(...) |  | {EXTERNAL LOCATION} | trait Future |
+| main.rs:2176:9:2176:12 | f1(...) | Output | main.rs:2140:5:2140:14 | S1 |
+| main.rs:2176:9:2176:18 | await ... |  | main.rs:2140:5:2140:14 | S1 |
+| main.rs:2176:9:2176:22 | ... .f() |  | file://:0:0:0:0 | () |
+| main.rs:2177:9:2177:12 | f2(...) |  | main.rs:2150:16:2150:39 | impl ... |
+| main.rs:2177:9:2177:18 | await ... |  | main.rs:2140:5:2140:14 | S1 |
+| main.rs:2177:9:2177:22 | ... .f() |  | file://:0:0:0:0 | () |
+| main.rs:2178:9:2178:12 | f3(...) |  | main.rs:2154:16:2154:39 | impl ... |
+| main.rs:2178:9:2178:18 | await ... |  | file://:0:0:0:0 | () |
+| main.rs:2179:9:2179:12 | f4(...) |  | main.rs:2171:16:2171:39 | impl ... |
+| main.rs:2179:9:2179:18 | await ... |  | main.rs:2140:5:2140:14 | S1 |
+| main.rs:2179:9:2179:22 | ... .f() |  | file://:0:0:0:0 | () |
+| main.rs:2180:9:2180:10 | S2 |  | main.rs:2158:5:2158:14 | S2 |
+| main.rs:2180:9:2180:16 | await S2 |  | main.rs:2140:5:2140:14 | S1 |
+| main.rs:2180:9:2180:20 | ... .f() |  | file://:0:0:0:0 | () |
+| main.rs:2181:13:2181:13 | b |  | {EXTERNAL LOCATION} | trait Future |
+| main.rs:2181:13:2181:13 | b | Output | main.rs:2140:5:2140:14 | S1 |
+| main.rs:2181:17:2181:28 | { ... } |  | {EXTERNAL LOCATION} | trait Future |
+| main.rs:2181:17:2181:28 | { ... } | Output | main.rs:2140:5:2140:14 | S1 |
+| main.rs:2181:25:2181:26 | S1 |  | main.rs:2140:5:2140:14 | S1 |
+| main.rs:2182:9:2182:9 | b |  | {EXTERNAL LOCATION} | trait Future |
+| main.rs:2182:9:2182:9 | b | Output | main.rs:2140:5:2140:14 | S1 |
+| main.rs:2182:9:2182:15 | await b |  | main.rs:2140:5:2140:14 | S1 |
+| main.rs:2182:9:2182:19 | ... .f() |  | file://:0:0:0:0 | () |
+| main.rs:2193:15:2193:19 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:2193:15:2193:19 | SelfParam | &T | main.rs:2192:5:2194:5 | Self [trait Trait1] |
+| main.rs:2193:22:2193:23 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2197:15:2197:19 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:2197:15:2197:19 | SelfParam | &T | main.rs:2196:5:2198:5 | Self [trait Trait2] |
+| main.rs:2197:22:2197:23 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2201:15:2201:19 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:2201:15:2201:19 | SelfParam | &T | main.rs:2187:5:2188:14 | S1 |
+| main.rs:2201:22:2201:23 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2205:15:2205:19 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:2205:15:2205:19 | SelfParam | &T | main.rs:2187:5:2188:14 | S1 |
+| main.rs:2205:22:2205:23 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2208:37:2210:5 | { ... } |  | main.rs:2208:16:2208:35 | impl ... + ... |
+| main.rs:2209:9:2209:10 | S1 |  | main.rs:2187:5:2188:14 | S1 |
+| main.rs:2209:9:2209:10 | S1 |  | main.rs:2208:16:2208:35 | impl ... + ... |
+| main.rs:2213:18:2213:22 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:2213:18:2213:22 | SelfParam | &T | main.rs:2212:5:2214:5 | Self [trait MyTrait] |
+| main.rs:2217:18:2217:22 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:2217:18:2217:22 | SelfParam | &T | main.rs:2187:5:2188:14 | S1 |
+| main.rs:2217:31:2219:9 | { ... } |  | main.rs:2189:5:2189:14 | S2 |
+| main.rs:2218:13:2218:14 | S2 |  | main.rs:2189:5:2189:14 | S2 |
+| main.rs:2223:18:2223:22 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:2223:18:2223:22 | SelfParam | &T | main.rs:2190:5:2190:22 | S3 |
+| main.rs:2223:18:2223:22 | SelfParam | &T.T3 | main.rs:2222:10:2222:17 | T |
+| main.rs:2223:30:2226:9 | { ... } |  | main.rs:2222:10:2222:17 | T |
+| main.rs:2224:17:2224:21 | S3(...) |  | file://:0:0:0:0 | & |
+| main.rs:2224:17:2224:21 | S3(...) |  | main.rs:2190:5:2190:22 | S3 |
+| main.rs:2224:17:2224:21 | S3(...) | &T | main.rs:2190:5:2190:22 | S3 |
+| main.rs:2224:17:2224:21 | S3(...) | &T.T3 | main.rs:2222:10:2222:17 | T |
+| main.rs:2224:25:2224:28 | self |  | file://:0:0:0:0 | & |
+| main.rs:2224:25:2224:28 | self | &T | main.rs:2190:5:2190:22 | S3 |
+| main.rs:2224:25:2224:28 | self | &T.T3 | main.rs:2222:10:2222:17 | T |
+| main.rs:2225:13:2225:21 | t.clone() |  | main.rs:2222:10:2222:17 | T |
+| main.rs:2229:45:2231:5 | { ... } |  | main.rs:2229:28:2229:43 | impl ... |
+| main.rs:2230:9:2230:10 | S1 |  | main.rs:2187:5:2188:14 | S1 |
+| main.rs:2230:9:2230:10 | S1 |  | main.rs:2229:28:2229:43 | impl ... |
+| main.rs:2233:41:2233:41 | t |  | main.rs:2233:26:2233:38 | B |
+| main.rs:2233:52:2235:5 | { ... } |  | main.rs:2233:23:2233:23 | A |
+| main.rs:2234:9:2234:9 | t |  | main.rs:2233:26:2233:38 | B |
+| main.rs:2234:9:2234:17 | t.get_a() |  | main.rs:2233:23:2233:23 | A |
+| main.rs:2237:34:2237:34 | x |  | main.rs:2237:24:2237:31 | T |
+| main.rs:2237:59:2239:5 | { ... } |  | main.rs:2237:43:2237:57 | impl ... |
+| main.rs:2237:59:2239:5 | { ... } | impl(T) | main.rs:2237:24:2237:31 | T |
+| main.rs:2238:9:2238:13 | S3(...) |  | main.rs:2190:5:2190:22 | S3 |
+| main.rs:2238:9:2238:13 | S3(...) |  | main.rs:2237:43:2237:57 | impl ... |
+| main.rs:2238:9:2238:13 | S3(...) | T3 | main.rs:2237:24:2237:31 | T |
+| main.rs:2238:9:2238:13 | S3(...) | impl(T) | main.rs:2237:24:2237:31 | T |
+| main.rs:2238:12:2238:12 | x |  | main.rs:2237:24:2237:31 | T |
+| main.rs:2241:34:2241:34 | x |  | main.rs:2241:24:2241:31 | T |
+| main.rs:2241:67:2243:5 | { ... } |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2241:67:2243:5 | { ... } | T | main.rs:2241:50:2241:64 | impl ... |
+| main.rs:2241:67:2243:5 | { ... } | T.impl(T) | main.rs:2241:24:2241:31 | T |
+| main.rs:2242:9:2242:19 | Some(...) |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2242:9:2242:19 | Some(...) | T | main.rs:2190:5:2190:22 | S3 |
+| main.rs:2242:9:2242:19 | Some(...) | T | main.rs:2241:50:2241:64 | impl ... |
+| main.rs:2242:9:2242:19 | Some(...) | T.T3 | main.rs:2241:24:2241:31 | T |
+| main.rs:2242:9:2242:19 | Some(...) | T.impl(T) | main.rs:2241:24:2241:31 | T |
+| main.rs:2242:14:2242:18 | S3(...) |  | main.rs:2190:5:2190:22 | S3 |
+| main.rs:2242:14:2242:18 | S3(...) | T3 | main.rs:2241:24:2241:31 | T |
+| main.rs:2242:17:2242:17 | x |  | main.rs:2241:24:2241:31 | T |
+| main.rs:2245:34:2245:34 | x |  | main.rs:2245:24:2245:31 | T |
+| main.rs:2245:78:2247:5 | { ... } |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2245:78:2247:5 | { ... } | 0(2) | main.rs:2245:44:2245:58 | impl ... |
+| main.rs:2245:78:2247:5 | { ... } | 0(2).impl(T) | main.rs:2245:24:2245:31 | T |
+| main.rs:2245:78:2247:5 | { ... } | 1(2) | main.rs:2245:61:2245:75 | impl ... |
+| main.rs:2245:78:2247:5 | { ... } | 1(2).impl(T) | main.rs:2245:24:2245:31 | T |
+| main.rs:2246:9:2246:30 | TupleExpr |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2246:9:2246:30 | TupleExpr | 0(2) | main.rs:2190:5:2190:22 | S3 |
+| main.rs:2246:9:2246:30 | TupleExpr | 0(2) | main.rs:2245:44:2245:58 | impl ... |
+| main.rs:2246:9:2246:30 | TupleExpr | 0(2).T3 | main.rs:2245:24:2245:31 | T |
+| main.rs:2246:9:2246:30 | TupleExpr | 0(2).impl(T) | main.rs:2245:24:2245:31 | T |
+| main.rs:2246:9:2246:30 | TupleExpr | 1(2) | main.rs:2190:5:2190:22 | S3 |
+| main.rs:2246:9:2246:30 | TupleExpr | 1(2) | main.rs:2245:61:2245:75 | impl ... |
+| main.rs:2246:9:2246:30 | TupleExpr | 1(2).T3 | main.rs:2245:24:2245:31 | T |
+| main.rs:2246:9:2246:30 | TupleExpr | 1(2).impl(T) | main.rs:2245:24:2245:31 | T |
+| main.rs:2246:10:2246:22 | S3(...) |  | main.rs:2190:5:2190:22 | S3 |
+| main.rs:2246:10:2246:22 | S3(...) |  | main.rs:2245:44:2245:58 | impl ... |
+| main.rs:2246:10:2246:22 | S3(...) | T3 | main.rs:2245:24:2245:31 | T |
+| main.rs:2246:10:2246:22 | S3(...) | impl(T) | main.rs:2245:24:2245:31 | T |
+| main.rs:2246:13:2246:13 | x |  | main.rs:2245:24:2245:31 | T |
+| main.rs:2246:13:2246:21 | x.clone() |  | main.rs:2245:24:2245:31 | T |
+| main.rs:2246:25:2246:29 | S3(...) |  | main.rs:2190:5:2190:22 | S3 |
+| main.rs:2246:25:2246:29 | S3(...) |  | main.rs:2245:61:2245:75 | impl ... |
+| main.rs:2246:25:2246:29 | S3(...) | T3 | main.rs:2245:24:2245:31 | T |
+| main.rs:2246:25:2246:29 | S3(...) | impl(T) | main.rs:2245:24:2245:31 | T |
+| main.rs:2246:28:2246:28 | x |  | main.rs:2245:24:2245:31 | T |
+| main.rs:2249:26:2249:26 | t |  | main.rs:2249:29:2249:43 | impl ... |
+| main.rs:2249:51:2251:5 | { ... } |  | main.rs:2249:23:2249:23 | A |
+| main.rs:2250:9:2250:9 | t |  | main.rs:2249:29:2249:43 | impl ... |
+| main.rs:2250:9:2250:17 | t.get_a() |  | main.rs:2249:23:2249:23 | A |
+| main.rs:2253:16:2267:5 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2254:13:2254:13 | x |  | main.rs:2208:16:2208:35 | impl ... + ... |
+| main.rs:2254:17:2254:20 | f1(...) |  | main.rs:2208:16:2208:35 | impl ... + ... |
+| main.rs:2255:9:2255:9 | x |  | main.rs:2208:16:2208:35 | impl ... + ... |
+| main.rs:2255:9:2255:14 | x.f1() |  | file://:0:0:0:0 | () |
+| main.rs:2256:9:2256:9 | x |  | main.rs:2208:16:2208:35 | impl ... + ... |
+| main.rs:2256:9:2256:14 | x.f2() |  | file://:0:0:0:0 | () |
+| main.rs:2257:13:2257:13 | a |  | main.rs:2229:28:2229:43 | impl ... |
+| main.rs:2257:17:2257:32 | get_a_my_trait(...) |  | main.rs:2229:28:2229:43 | impl ... |
+| main.rs:2258:13:2258:13 | b |  | main.rs:2189:5:2189:14 | S2 |
+| main.rs:2258:17:2258:33 | uses_my_trait1(...) |  | main.rs:2189:5:2189:14 | S2 |
+| main.rs:2258:32:2258:32 | a |  | main.rs:2229:28:2229:43 | impl ... |
+| main.rs:2259:13:2259:13 | a |  | main.rs:2229:28:2229:43 | impl ... |
+| main.rs:2259:17:2259:32 | get_a_my_trait(...) |  | main.rs:2229:28:2229:43 | impl ... |
+| main.rs:2260:13:2260:13 | c |  | main.rs:2189:5:2189:14 | S2 |
+| main.rs:2260:17:2260:33 | uses_my_trait2(...) |  | main.rs:2189:5:2189:14 | S2 |
+| main.rs:2260:32:2260:32 | a |  | main.rs:2229:28:2229:43 | impl ... |
+| main.rs:2261:13:2261:13 | d |  | main.rs:2189:5:2189:14 | S2 |
+| main.rs:2261:17:2261:34 | uses_my_trait2(...) |  | main.rs:2189:5:2189:14 | S2 |
+| main.rs:2261:32:2261:33 | S1 |  | main.rs:2187:5:2188:14 | S1 |
+| main.rs:2262:13:2262:13 | e |  | main.rs:2187:5:2188:14 | S1 |
+| main.rs:2262:17:2262:35 | get_a_my_trait2(...) |  | main.rs:2237:43:2237:57 | impl ... |
+| main.rs:2262:17:2262:35 | get_a_my_trait2(...) | impl(T) | main.rs:2187:5:2188:14 | S1 |
+| main.rs:2262:17:2262:43 | ... .get_a() |  | main.rs:2187:5:2188:14 | S1 |
+| main.rs:2262:33:2262:34 | S1 |  | main.rs:2187:5:2188:14 | S1 |
+| main.rs:2265:13:2265:13 | f |  | main.rs:2187:5:2188:14 | S1 |
+| main.rs:2265:17:2265:35 | get_a_my_trait3(...) |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2265:17:2265:35 | get_a_my_trait3(...) | T | main.rs:2241:50:2241:64 | impl ... |
+| main.rs:2265:17:2265:35 | get_a_my_trait3(...) | T.impl(T) | main.rs:2187:5:2188:14 | S1 |
+| main.rs:2265:17:2265:44 | ... .unwrap() |  | main.rs:2241:50:2241:64 | impl ... |
+| main.rs:2265:17:2265:44 | ... .unwrap() | impl(T) | main.rs:2187:5:2188:14 | S1 |
+| main.rs:2265:17:2265:52 | ... .get_a() |  | main.rs:2187:5:2188:14 | S1 |
+| main.rs:2265:33:2265:34 | S1 |  | main.rs:2187:5:2188:14 | S1 |
+| main.rs:2266:13:2266:13 | g |  | main.rs:2187:5:2188:14 | S1 |
+| main.rs:2266:17:2266:35 | get_a_my_trait4(...) |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2266:17:2266:35 | get_a_my_trait4(...) | 0(2) | main.rs:2245:44:2245:58 | impl ... |
+| main.rs:2266:17:2266:35 | get_a_my_trait4(...) | 0(2).impl(T) | main.rs:2187:5:2188:14 | S1 |
+| main.rs:2266:17:2266:35 | get_a_my_trait4(...) | 1(2) | main.rs:2245:61:2245:75 | impl ... |
+| main.rs:2266:17:2266:35 | get_a_my_trait4(...) | 1(2).impl(T) | main.rs:2187:5:2188:14 | S1 |
+| main.rs:2266:17:2266:37 | ... .0 |  | main.rs:2245:44:2245:58 | impl ... |
+| main.rs:2266:17:2266:37 | ... .0 | impl(T) | main.rs:2187:5:2188:14 | S1 |
+| main.rs:2266:17:2266:45 | ... .get_a() |  | main.rs:2187:5:2188:14 | S1 |
+| main.rs:2266:33:2266:34 | S1 |  | main.rs:2187:5:2188:14 | S1 |
+| main.rs:2277:16:2277:20 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:2277:16:2277:20 | SelfParam | &T | main.rs:2273:5:2274:13 | S |
+| main.rs:2277:31:2279:9 | { ... } |  | main.rs:2273:5:2274:13 | S |
+| main.rs:2278:13:2278:13 | S |  | main.rs:2273:5:2274:13 | S |
+| main.rs:2288:26:2290:9 | { ... } |  | main.rs:2282:5:2285:5 | MyVec |
+| main.rs:2288:26:2290:9 | { ... } | T | main.rs:2287:10:2287:10 | T |
+| main.rs:2289:13:2289:38 | MyVec {...} |  | main.rs:2282:5:2285:5 | MyVec |
+| main.rs:2289:13:2289:38 | MyVec {...} | T | main.rs:2287:10:2287:10 | T |
+| main.rs:2289:27:2289:36 | ...::new(...) |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2289:27:2289:36 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2289:27:2289:36 | ...::new(...) | T | main.rs:2287:10:2287:10 | T |
+| main.rs:2292:17:2292:25 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:2292:17:2292:25 | SelfParam | &T | main.rs:2282:5:2285:5 | MyVec |
+| main.rs:2292:17:2292:25 | SelfParam | &T.T | main.rs:2287:10:2287:10 | T |
+| main.rs:2292:28:2292:32 | value |  | main.rs:2287:10:2287:10 | T |
+| main.rs:2292:38:2294:9 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2293:13:2293:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:2293:13:2293:16 | self | &T | main.rs:2282:5:2285:5 | MyVec |
+| main.rs:2293:13:2293:16 | self | &T.T | main.rs:2287:10:2287:10 | T |
+| main.rs:2293:13:2293:21 | self.data |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2293:13:2293:21 | self.data | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2293:13:2293:21 | self.data | T | main.rs:2287:10:2287:10 | T |
+| main.rs:2293:13:2293:33 | ... .push(...) |  | file://:0:0:0:0 | () |
+| main.rs:2293:28:2293:32 | value |  | main.rs:2287:10:2287:10 | T |
+| main.rs:2301:18:2301:22 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:2301:18:2301:22 | SelfParam | &T | main.rs:2282:5:2285:5 | MyVec |
+| main.rs:2301:18:2301:22 | SelfParam | &T.T | main.rs:2297:10:2297:10 | T |
+| main.rs:2301:25:2301:29 | index |  | {EXTERNAL LOCATION} | usize |
+| main.rs:2301:56:2303:9 | { ... } |  | file://:0:0:0:0 | & |
+| main.rs:2301:56:2303:9 | { ... } | &T | main.rs:2297:10:2297:10 | T |
+| main.rs:2302:13:2302:29 | &... |  | file://:0:0:0:0 | & |
+| main.rs:2302:13:2302:29 | &... | &T | main.rs:2297:10:2297:10 | T |
+| main.rs:2302:14:2302:17 | self |  | file://:0:0:0:0 | & |
+| main.rs:2302:14:2302:17 | self | &T | main.rs:2282:5:2285:5 | MyVec |
+| main.rs:2302:14:2302:17 | self | &T.T | main.rs:2297:10:2297:10 | T |
+| main.rs:2302:14:2302:22 | self.data |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2302:14:2302:22 | self.data | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2302:14:2302:22 | self.data | T | main.rs:2297:10:2297:10 | T |
+| main.rs:2302:14:2302:29 | ...[index] |  | main.rs:2297:10:2297:10 | T |
+| main.rs:2302:24:2302:28 | index |  | {EXTERNAL LOCATION} | usize |
+| main.rs:2306:22:2306:26 | slice |  | file://:0:0:0:0 | & |
+| main.rs:2306:22:2306:26 | slice | &T | file://:0:0:0:0 | [] |
+| main.rs:2306:22:2306:26 | slice | &T.[T] | main.rs:2273:5:2274:13 | S |
+| main.rs:2306:35:2308:5 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2307:13:2307:13 | x |  | main.rs:2273:5:2274:13 | S |
+| main.rs:2307:17:2307:21 | slice |  | file://:0:0:0:0 | & |
+| main.rs:2307:17:2307:21 | slice | &T | file://:0:0:0:0 | [] |
+| main.rs:2307:17:2307:21 | slice | &T.[T] | main.rs:2273:5:2274:13 | S |
+| main.rs:2307:17:2307:24 | slice[0] |  | main.rs:2273:5:2274:13 | S |
+| main.rs:2307:17:2307:30 | ... .foo() |  | main.rs:2273:5:2274:13 | S |
+| main.rs:2307:23:2307:23 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2310:37:2310:37 | a |  | main.rs:2310:20:2310:34 | T |
+| main.rs:2310:43:2310:43 | b |  | {EXTERNAL LOCATION} | usize |
+| main.rs:2313:5:2315:5 | { ... } |  | {EXTERNAL LOCATION} | Output |
+| main.rs:2314:9:2314:9 | a |  | main.rs:2310:20:2310:34 | T |
+| main.rs:2314:9:2314:12 | a[b] |  | {EXTERNAL LOCATION} | Output |
+| main.rs:2314:11:2314:11 | b |  | {EXTERNAL LOCATION} | usize |
+| main.rs:2317:16:2328:5 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2318:17:2318:19 | vec |  | main.rs:2282:5:2285:5 | MyVec |
+| main.rs:2318:17:2318:19 | vec | T | main.rs:2273:5:2274:13 | S |
+| main.rs:2318:23:2318:34 | ...::new(...) |  | main.rs:2282:5:2285:5 | MyVec |
+| main.rs:2318:23:2318:34 | ...::new(...) | T | main.rs:2273:5:2274:13 | S |
+| main.rs:2319:9:2319:11 | vec |  | main.rs:2282:5:2285:5 | MyVec |
+| main.rs:2319:9:2319:11 | vec | T | main.rs:2273:5:2274:13 | S |
+| main.rs:2319:9:2319:19 | vec.push(...) |  | file://:0:0:0:0 | () |
+| main.rs:2319:18:2319:18 | S |  | main.rs:2273:5:2274:13 | S |
+| main.rs:2320:9:2320:11 | vec |  | main.rs:2282:5:2285:5 | MyVec |
+| main.rs:2320:9:2320:11 | vec | T | main.rs:2273:5:2274:13 | S |
+| main.rs:2320:9:2320:14 | vec[0] |  | main.rs:2273:5:2274:13 | S |
+| main.rs:2320:9:2320:20 | ... .foo() |  | main.rs:2273:5:2274:13 | S |
+| main.rs:2320:13:2320:13 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2322:13:2322:14 | xs |  | file://:0:0:0:0 | [] |
+| main.rs:2322:13:2322:14 | xs | [T;...] | main.rs:2273:5:2274:13 | S |
+| main.rs:2322:21:2322:21 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2322:26:2322:28 | [...] |  | file://:0:0:0:0 | [] |
+| main.rs:2322:26:2322:28 | [...] | [T;...] | main.rs:2273:5:2274:13 | S |
+| main.rs:2322:27:2322:27 | S |  | main.rs:2273:5:2274:13 | S |
+| main.rs:2323:13:2323:13 | x |  | main.rs:2273:5:2274:13 | S |
+| main.rs:2323:17:2323:18 | xs |  | file://:0:0:0:0 | [] |
+| main.rs:2323:17:2323:18 | xs | [T;...] | main.rs:2273:5:2274:13 | S |
+| main.rs:2323:17:2323:21 | xs[0] |  | main.rs:2273:5:2274:13 | S |
+| main.rs:2323:17:2323:27 | ... .foo() |  | main.rs:2273:5:2274:13 | S |
+| main.rs:2323:20:2323:20 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2325:29:2325:31 | vec |  | main.rs:2282:5:2285:5 | MyVec |
+| main.rs:2325:29:2325:31 | vec | T | main.rs:2273:5:2274:13 | S |
+| main.rs:2325:34:2325:34 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2327:9:2327:26 | analyze_slice(...) |  | file://:0:0:0:0 | () |
+| main.rs:2327:23:2327:25 | &xs |  | file://:0:0:0:0 | & |
+| main.rs:2327:23:2327:25 | &xs | &T | file://:0:0:0:0 | [] |
+| main.rs:2327:23:2327:25 | &xs | &T.[T;...] | main.rs:2273:5:2274:13 | S |
+| main.rs:2327:24:2327:25 | xs |  | file://:0:0:0:0 | [] |
+| main.rs:2327:24:2327:25 | xs | [T;...] | main.rs:2273:5:2274:13 | S |
+| main.rs:2332:16:2334:5 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2333:13:2333:13 | x |  | {EXTERNAL LOCATION} | String |
+| main.rs:2333:17:2333:46 | MacroExpr |  | {EXTERNAL LOCATION} | String |
+| main.rs:2333:25:2333:35 | "Hello, {}" |  | file://:0:0:0:0 | & |
+| main.rs:2333:25:2333:35 | "Hello, {}" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:2333:25:2333:45 | ...::format(...) |  | {EXTERNAL LOCATION} | String |
+| main.rs:2333:25:2333:45 | ...::must_use(...) |  | {EXTERNAL LOCATION} | String |
+| main.rs:2333:25:2333:45 | { ... } |  | {EXTERNAL LOCATION} | String |
+| main.rs:2333:38:2333:45 | "World!" |  | file://:0:0:0:0 | & |
+| main.rs:2333:38:2333:45 | "World!" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:2342:19:2342:22 | SelfParam |  | main.rs:2338:5:2343:5 | Self [trait MyAdd] |
+| main.rs:2342:25:2342:27 | rhs |  | main.rs:2338:17:2338:26 | Rhs |
+| main.rs:2349:19:2349:22 | SelfParam |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2349:25:2349:29 | value |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2349:45:2351:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2350:13:2350:17 | value |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2358:19:2358:22 | SelfParam |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2358:25:2358:29 | value |  | file://:0:0:0:0 | & |
+| main.rs:2358:25:2358:29 | value | &T | {EXTERNAL LOCATION} | i64 |
+| main.rs:2358:46:2360:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2359:13:2359:18 | * ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2359:14:2359:18 | value |  | file://:0:0:0:0 | & |
+| main.rs:2359:14:2359:18 | value | &T | {EXTERNAL LOCATION} | i64 |
+| main.rs:2367:19:2367:22 | SelfParam |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2367:25:2367:29 | value |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2367:46:2373:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2368:13:2372:13 | if value {...} else {...} |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2368:13:2372:13 | if value {...} else {...} |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2368:16:2368:20 | value |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2368:22:2370:13 | { ... } |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2368:22:2370:13 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2369:17:2369:17 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2369:17:2369:17 | 1 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2370:20:2372:13 | { ... } |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2370:20:2372:13 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2371:17:2371:17 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2371:17:2371:17 | 0 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2382:19:2382:22 | SelfParam |  | main.rs:2376:5:2376:19 | S |
+| main.rs:2382:19:2382:22 | SelfParam | T | main.rs:2378:10:2378:17 | T |
+| main.rs:2382:25:2382:29 | other |  | main.rs:2376:5:2376:19 | S |
+| main.rs:2382:25:2382:29 | other | T | main.rs:2378:10:2378:17 | T |
+| main.rs:2382:54:2384:9 | { ... } |  | main.rs:2376:5:2376:19 | S |
+| main.rs:2382:54:2384:9 | { ... } | T | main.rs:2339:9:2339:20 | Output |
+| main.rs:2383:13:2383:39 | S(...) |  | main.rs:2376:5:2376:19 | S |
+| main.rs:2383:13:2383:39 | S(...) | T | main.rs:2339:9:2339:20 | Output |
+| main.rs:2383:15:2383:22 | (...) |  | main.rs:2378:10:2378:17 | T |
+| main.rs:2383:16:2383:19 | self |  | main.rs:2376:5:2376:19 | S |
+| main.rs:2383:16:2383:19 | self | T | main.rs:2378:10:2378:17 | T |
+| main.rs:2383:16:2383:21 | self.0 |  | main.rs:2378:10:2378:17 | T |
+| main.rs:2383:31:2383:35 | other |  | main.rs:2376:5:2376:19 | S |
+| main.rs:2383:31:2383:35 | other | T | main.rs:2378:10:2378:17 | T |
+| main.rs:2383:31:2383:37 | other.0 |  | main.rs:2378:10:2378:17 | T |
+| main.rs:2391:19:2391:22 | SelfParam |  | main.rs:2376:5:2376:19 | S |
+| main.rs:2391:19:2391:22 | SelfParam | T | main.rs:2387:10:2387:17 | T |
+| main.rs:2391:25:2391:29 | other |  | main.rs:2387:10:2387:17 | T |
+| main.rs:2391:51:2393:9 | { ... } |  | main.rs:2376:5:2376:19 | S |
+| main.rs:2391:51:2393:9 | { ... } | T | main.rs:2339:9:2339:20 | Output |
+| main.rs:2392:13:2392:37 | S(...) |  | main.rs:2376:5:2376:19 | S |
+| main.rs:2392:13:2392:37 | S(...) | T | main.rs:2339:9:2339:20 | Output |
+| main.rs:2392:15:2392:22 | (...) |  | main.rs:2387:10:2387:17 | T |
+| main.rs:2392:16:2392:19 | self |  | main.rs:2376:5:2376:19 | S |
+| main.rs:2392:16:2392:19 | self | T | main.rs:2387:10:2387:17 | T |
+| main.rs:2392:16:2392:21 | self.0 |  | main.rs:2387:10:2387:17 | T |
+| main.rs:2392:31:2392:35 | other |  | main.rs:2387:10:2387:17 | T |
+| main.rs:2403:19:2403:22 | SelfParam |  | main.rs:2376:5:2376:19 | S |
+| main.rs:2403:19:2403:22 | SelfParam | T | main.rs:2396:14:2396:14 | T |
+| main.rs:2403:25:2403:29 | other |  | file://:0:0:0:0 | & |
+| main.rs:2403:25:2403:29 | other | &T | main.rs:2396:14:2396:14 | T |
+| main.rs:2403:55:2405:9 | { ... } |  | main.rs:2376:5:2376:19 | S |
+| main.rs:2404:13:2404:37 | S(...) |  | main.rs:2376:5:2376:19 | S |
+| main.rs:2404:15:2404:22 | (...) |  | main.rs:2396:14:2396:14 | T |
+| main.rs:2404:16:2404:19 | self |  | main.rs:2376:5:2376:19 | S |
+| main.rs:2404:16:2404:19 | self | T | main.rs:2396:14:2396:14 | T |
+| main.rs:2404:16:2404:21 | self.0 |  | main.rs:2396:14:2396:14 | T |
+| main.rs:2404:31:2404:35 | other |  | file://:0:0:0:0 | & |
+| main.rs:2404:31:2404:35 | other | &T | main.rs:2396:14:2396:14 | T |
+| main.rs:2410:20:2410:24 | value |  | main.rs:2408:18:2408:18 | T |
+| main.rs:2415:20:2415:24 | value |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2415:40:2417:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2416:13:2416:17 | value |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2422:20:2422:24 | value |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2422:41:2428:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2423:13:2427:13 | if value {...} else {...} |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2423:13:2427:13 | if value {...} else {...} |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2423:16:2423:20 | value |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2423:22:2425:13 | { ... } |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2423:22:2425:13 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2424:17:2424:17 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2424:17:2424:17 | 1 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2425:20:2427:13 | { ... } |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2425:20:2427:13 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2426:17:2426:17 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2426:17:2426:17 | 0 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2433:21:2433:25 | value |  | main.rs:2431:19:2431:19 | T |
+| main.rs:2433:31:2433:31 | x |  | main.rs:2431:5:2434:5 | Self [trait MyFrom2] |
+| main.rs:2438:21:2438:25 | value |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2438:33:2438:33 | _ |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2438:48:2440:9 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2439:13:2439:17 | value |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2445:21:2445:25 | value |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2445:34:2445:34 | _ |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2445:49:2451:9 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2446:13:2450:13 | if value {...} else {...} |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2446:16:2446:20 | value |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2446:22:2448:13 | { ... } |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2447:17:2447:17 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2448:20:2450:13 | { ... } |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2449:17:2449:17 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2456:15:2456:15 | x |  | main.rs:2454:5:2460:5 | Self [trait MySelfTrait] |
+| main.rs:2459:15:2459:15 | x |  | main.rs:2454:5:2460:5 | Self [trait MySelfTrait] |
+| main.rs:2464:15:2464:15 | x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2464:31:2466:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2465:13:2465:13 | x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2465:13:2465:17 | ... + ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2465:17:2465:17 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2469:15:2469:15 | x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2469:32:2471:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2470:13:2470:13 | x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2470:13:2470:17 | ... + ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2470:17:2470:17 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2476:15:2476:15 | x |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2476:31:2478:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2477:13:2477:13 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2477:13:2477:13 | 0 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2481:15:2481:15 | x |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2481:32:2483:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2482:13:2482:13 | x |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2486:16:2511:5 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2487:13:2487:13 | x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2487:22:2487:23 | 73 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2487:22:2487:23 | 73 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2488:9:2488:9 | x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2488:9:2488:22 | x.my_add(...) |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2488:18:2488:21 | 5i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2489:9:2489:9 | x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2489:9:2489:23 | x.my_add(...) |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2489:18:2489:22 | &5i64 |  | file://:0:0:0:0 | & |
+| main.rs:2489:18:2489:22 | &5i64 | &T | {EXTERNAL LOCATION} | i64 |
+| main.rs:2489:19:2489:22 | 5i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2490:9:2490:9 | x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2490:9:2490:22 | x.my_add(...) |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2490:18:2490:21 | true |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2492:9:2492:15 | S(...) |  | main.rs:2376:5:2376:19 | S |
+| main.rs:2492:9:2492:15 | S(...) | T | {EXTERNAL LOCATION} | i64 |
+| main.rs:2492:9:2492:31 | ... .my_add(...) |  | main.rs:2376:5:2376:19 | S |
+| main.rs:2492:11:2492:14 | 1i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2492:24:2492:30 | S(...) |  | main.rs:2376:5:2376:19 | S |
+| main.rs:2492:24:2492:30 | S(...) | T | {EXTERNAL LOCATION} | i64 |
+| main.rs:2492:26:2492:29 | 2i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2493:9:2493:15 | S(...) |  | main.rs:2376:5:2376:19 | S |
+| main.rs:2493:9:2493:15 | S(...) | T | {EXTERNAL LOCATION} | i64 |
+| main.rs:2493:11:2493:14 | 1i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2493:24:2493:27 | 3i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2494:9:2494:15 | S(...) |  | main.rs:2376:5:2376:19 | S |
+| main.rs:2494:9:2494:15 | S(...) | T | {EXTERNAL LOCATION} | i64 |
+| main.rs:2494:9:2494:29 | ... .my_add(...) |  | main.rs:2376:5:2376:19 | S |
+| main.rs:2494:11:2494:14 | 1i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2494:24:2494:28 | &3i64 |  | file://:0:0:0:0 | & |
+| main.rs:2494:24:2494:28 | &3i64 | &T | {EXTERNAL LOCATION} | i64 |
+| main.rs:2494:25:2494:28 | 3i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2496:13:2496:13 | x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2496:17:2496:35 | ...::my_from(...) |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2496:30:2496:34 | 73i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2497:13:2497:13 | y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2497:17:2497:34 | ...::my_from(...) |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2497:30:2497:33 | true |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2498:13:2498:13 | z |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2498:22:2498:43 | ...::my_from(...) |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2498:38:2498:42 | 73i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2499:9:2499:34 | ...::my_from2(...) |  | file://:0:0:0:0 | () |
+| main.rs:2499:23:2499:27 | 73i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2499:30:2499:33 | 0i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2500:9:2500:33 | ...::my_from2(...) |  | file://:0:0:0:0 | () |
+| main.rs:2500:23:2500:26 | true |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2500:29:2500:32 | 0i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2501:9:2501:38 | ...::my_from2(...) |  | file://:0:0:0:0 | () |
+| main.rs:2501:27:2501:31 | 73i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2501:34:2501:37 | 0i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2503:9:2503:22 | ...::f1(...) |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2503:17:2503:21 | 73i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2504:9:2504:22 | ...::f2(...) |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2504:17:2504:21 | 73i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2505:9:2505:22 | ...::f1(...) |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2505:18:2505:21 | true |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2506:9:2506:22 | ...::f2(...) |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2506:18:2506:21 | true |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2507:9:2507:30 | ...::f1(...) |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2507:25:2507:29 | 73i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2508:9:2508:30 | ...::f2(...) |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2508:25:2508:29 | 73i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2509:9:2509:29 | ...::f1(...) |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2509:25:2509:28 | true |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2510:9:2510:29 | ...::f2(...) |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2510:25:2510:28 | true |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2518:26:2520:9 | { ... } |  | main.rs:2515:5:2515:24 | MyCallable |
+| main.rs:2519:13:2519:25 | MyCallable {...} |  | main.rs:2515:5:2515:24 | MyCallable |
+| main.rs:2522:17:2522:21 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:2522:17:2522:21 | SelfParam | &T | main.rs:2515:5:2515:24 | MyCallable |
+| main.rs:2522:31:2524:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2523:13:2523:13 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2523:13:2523:13 | 1 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2527:16:2634:5 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2530:9:2530:29 | for ... in ... { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2530:13:2530:13 | i |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2530:18:2530:26 | [...] |  | file://:0:0:0:0 | [] |
+| main.rs:2530:18:2530:26 | [...] | [T;...] | {EXTERNAL LOCATION} | i32 |
+| main.rs:2530:19:2530:19 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2530:22:2530:22 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2530:25:2530:25 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2530:28:2530:29 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2531:9:2531:44 | for ... in ... { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2531:18:2531:26 | [...] |  | file://:0:0:0:0 | [] |
+| main.rs:2531:18:2531:26 | [...] | [T;...] | {EXTERNAL LOCATION} | i32 |
+| main.rs:2531:18:2531:41 | ... .map(...) |  | file://:0:0:0:0 | [] |
+| main.rs:2531:19:2531:19 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2531:22:2531:22 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2531:25:2531:25 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2531:32:2531:40 | \|...\| ... |  | {EXTERNAL LOCATION} | dyn FnOnce |
+| main.rs:2531:32:2531:40 | \|...\| ... | dyn(Args) | file://:0:0:0:0 | (T_1) |
+| main.rs:2531:40:2531:40 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2531:43:2531:44 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2532:9:2532:41 | for ... in ... { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2532:13:2532:13 | i |  | {EXTERNAL LOCATION} | Item |
+| main.rs:2532:13:2532:13 | i |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2532:18:2532:26 | [...] |  | file://:0:0:0:0 | [] |
+| main.rs:2532:18:2532:26 | [...] | [T;...] | {EXTERNAL LOCATION} | i32 |
+| main.rs:2532:18:2532:38 | ... .into_iter() |  | {EXTERNAL LOCATION} | IntoIter |
+| main.rs:2532:18:2532:38 | ... .into_iter() | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2532:19:2532:19 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2532:22:2532:22 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2532:25:2532:25 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2532:40:2532:41 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2534:13:2534:17 | vals1 |  | file://:0:0:0:0 | [] |
+| main.rs:2534:13:2534:17 | vals1 | [T;...] | {EXTERNAL LOCATION} | i32 |
+| main.rs:2534:13:2534:17 | vals1 | [T;...] | {EXTERNAL LOCATION} | u8 |
+| main.rs:2534:21:2534:31 | [...] |  | file://:0:0:0:0 | [] |
+| main.rs:2534:21:2534:31 | [...] | [T;...] | {EXTERNAL LOCATION} | i32 |
+| main.rs:2534:21:2534:31 | [...] | [T;...] | {EXTERNAL LOCATION} | u8 |
+| main.rs:2534:22:2534:24 | 1u8 |  | {EXTERNAL LOCATION} | u8 |
+| main.rs:2534:27:2534:27 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2534:27:2534:27 | 2 |  | {EXTERNAL LOCATION} | u8 |
+| main.rs:2534:30:2534:30 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2534:30:2534:30 | 3 |  | {EXTERNAL LOCATION} | u8 |
+| main.rs:2535:9:2535:25 | for ... in ... { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2535:13:2535:13 | u |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2535:13:2535:13 | u |  | {EXTERNAL LOCATION} | u8 |
+| main.rs:2535:18:2535:22 | vals1 |  | file://:0:0:0:0 | [] |
+| main.rs:2535:18:2535:22 | vals1 | [T;...] | {EXTERNAL LOCATION} | i32 |
+| main.rs:2535:18:2535:22 | vals1 | [T;...] | {EXTERNAL LOCATION} | u8 |
+| main.rs:2535:24:2535:25 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2537:13:2537:17 | vals2 |  | file://:0:0:0:0 | [] |
+| main.rs:2537:13:2537:17 | vals2 | [T;...] | {EXTERNAL LOCATION} | u16 |
+| main.rs:2537:21:2537:29 | [1u16; 3] |  | file://:0:0:0:0 | [] |
+| main.rs:2537:21:2537:29 | [1u16; 3] | [T;...] | {EXTERNAL LOCATION} | u16 |
+| main.rs:2537:22:2537:25 | 1u16 |  | {EXTERNAL LOCATION} | u16 |
+| main.rs:2537:28:2537:28 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2538:9:2538:25 | for ... in ... { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2538:13:2538:13 | u |  | {EXTERNAL LOCATION} | u16 |
+| main.rs:2538:18:2538:22 | vals2 |  | file://:0:0:0:0 | [] |
+| main.rs:2538:18:2538:22 | vals2 | [T;...] | {EXTERNAL LOCATION} | u16 |
+| main.rs:2538:24:2538:25 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2540:13:2540:17 | vals3 |  | file://:0:0:0:0 | [] |
+| main.rs:2540:13:2540:17 | vals3 | [T;...] | {EXTERNAL LOCATION} | u32 |
+| main.rs:2540:26:2540:26 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2540:31:2540:39 | [...] |  | file://:0:0:0:0 | [] |
+| main.rs:2540:31:2540:39 | [...] | [T;...] | {EXTERNAL LOCATION} | i32 |
+| main.rs:2540:31:2540:39 | [...] | [T;...] | {EXTERNAL LOCATION} | u32 |
+| main.rs:2540:32:2540:32 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2540:32:2540:32 | 1 |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:2540:35:2540:35 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2540:35:2540:35 | 2 |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:2540:38:2540:38 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2540:38:2540:38 | 3 |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:2541:9:2541:25 | for ... in ... { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2541:13:2541:13 | u |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:2541:18:2541:22 | vals3 |  | file://:0:0:0:0 | [] |
+| main.rs:2541:18:2541:22 | vals3 | [T;...] | {EXTERNAL LOCATION} | u32 |
+| main.rs:2541:24:2541:25 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2543:13:2543:17 | vals4 |  | file://:0:0:0:0 | [] |
+| main.rs:2543:13:2543:17 | vals4 | [T;...] | {EXTERNAL LOCATION} | u64 |
+| main.rs:2543:26:2543:26 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2543:31:2543:36 | [1; 3] |  | file://:0:0:0:0 | [] |
+| main.rs:2543:31:2543:36 | [1; 3] | [T;...] | {EXTERNAL LOCATION} | i32 |
+| main.rs:2543:31:2543:36 | [1; 3] | [T;...] | {EXTERNAL LOCATION} | u64 |
+| main.rs:2543:32:2543:32 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2543:32:2543:32 | 1 |  | {EXTERNAL LOCATION} | u64 |
+| main.rs:2543:35:2543:35 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2544:9:2544:25 | for ... in ... { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2544:13:2544:13 | u |  | {EXTERNAL LOCATION} | u64 |
+| main.rs:2544:18:2544:22 | vals4 |  | file://:0:0:0:0 | [] |
+| main.rs:2544:18:2544:22 | vals4 | [T;...] | {EXTERNAL LOCATION} | u64 |
+| main.rs:2544:24:2544:25 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2546:17:2546:24 | strings1 |  | file://:0:0:0:0 | [] |
+| main.rs:2546:17:2546:24 | strings1 | [T;...] | file://:0:0:0:0 | & |
+| main.rs:2546:17:2546:24 | strings1 | [T;...].&T | {EXTERNAL LOCATION} | str |
+| main.rs:2546:28:2546:48 | [...] |  | file://:0:0:0:0 | [] |
+| main.rs:2546:28:2546:48 | [...] | [T;...] | file://:0:0:0:0 | & |
+| main.rs:2546:28:2546:48 | [...] | [T;...].&T | {EXTERNAL LOCATION} | str |
+| main.rs:2546:29:2546:33 | "foo" |  | file://:0:0:0:0 | & |
+| main.rs:2546:29:2546:33 | "foo" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:2546:36:2546:40 | "bar" |  | file://:0:0:0:0 | & |
+| main.rs:2546:36:2546:40 | "bar" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:2546:43:2546:47 | "baz" |  | file://:0:0:0:0 | & |
+| main.rs:2546:43:2546:47 | "baz" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:2547:9:2547:29 | for ... in ... { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2547:13:2547:13 | s |  | {EXTERNAL LOCATION} | Item |
+| main.rs:2547:13:2547:13 | s |  | file://:0:0:0:0 | & |
+| main.rs:2547:13:2547:13 | s | &T | file://:0:0:0:0 | & |
+| main.rs:2547:13:2547:13 | s | &T.&T | {EXTERNAL LOCATION} | str |
+| main.rs:2547:18:2547:26 | &strings1 |  | file://:0:0:0:0 | & |
+| main.rs:2547:18:2547:26 | &strings1 | &T | file://:0:0:0:0 | [] |
+| main.rs:2547:18:2547:26 | &strings1 | &T.[T;...] | file://:0:0:0:0 | & |
+| main.rs:2547:18:2547:26 | &strings1 | &T.[T;...].&T | {EXTERNAL LOCATION} | str |
+| main.rs:2547:19:2547:26 | strings1 |  | file://:0:0:0:0 | [] |
+| main.rs:2547:19:2547:26 | strings1 | [T;...] | file://:0:0:0:0 | & |
+| main.rs:2547:19:2547:26 | strings1 | [T;...].&T | {EXTERNAL LOCATION} | str |
+| main.rs:2547:28:2547:29 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2548:9:2548:33 | for ... in ... { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2548:13:2548:13 | s |  | {EXTERNAL LOCATION} | Item |
+| main.rs:2548:13:2548:13 | s |  | file://:0:0:0:0 | & |
+| main.rs:2548:13:2548:13 | s | &T | file://:0:0:0:0 | & |
+| main.rs:2548:13:2548:13 | s | &T.&T | {EXTERNAL LOCATION} | str |
+| main.rs:2548:18:2548:30 | &mut strings1 |  | file://:0:0:0:0 | & |
+| main.rs:2548:18:2548:30 | &mut strings1 | &T | file://:0:0:0:0 | [] |
+| main.rs:2548:18:2548:30 | &mut strings1 | &T.[T;...] | file://:0:0:0:0 | & |
+| main.rs:2548:18:2548:30 | &mut strings1 | &T.[T;...].&T | {EXTERNAL LOCATION} | str |
+| main.rs:2548:23:2548:30 | strings1 |  | file://:0:0:0:0 | [] |
+| main.rs:2548:23:2548:30 | strings1 | [T;...] | file://:0:0:0:0 | & |
+| main.rs:2548:23:2548:30 | strings1 | [T;...].&T | {EXTERNAL LOCATION} | str |
+| main.rs:2548:32:2548:33 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2549:9:2549:28 | for ... in ... { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2549:13:2549:13 | s |  | file://:0:0:0:0 | & |
+| main.rs:2549:13:2549:13 | s | &T | {EXTERNAL LOCATION} | str |
+| main.rs:2549:18:2549:25 | strings1 |  | file://:0:0:0:0 | [] |
+| main.rs:2549:18:2549:25 | strings1 | [T;...] | file://:0:0:0:0 | & |
+| main.rs:2549:18:2549:25 | strings1 | [T;...].&T | {EXTERNAL LOCATION} | str |
+| main.rs:2549:27:2549:28 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2551:13:2551:20 | strings2 |  | file://:0:0:0:0 | [] |
+| main.rs:2551:13:2551:20 | strings2 | [T;...] | {EXTERNAL LOCATION} | String |
+| main.rs:2552:9:2556:9 | [...] |  | file://:0:0:0:0 | [] |
+| main.rs:2552:9:2556:9 | [...] | [T;...] | {EXTERNAL LOCATION} | String |
+| main.rs:2553:13:2553:31 | ...::from(...) |  | {EXTERNAL LOCATION} | String |
+| main.rs:2553:26:2553:30 | "foo" |  | file://:0:0:0:0 | & |
+| main.rs:2553:26:2553:30 | "foo" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:2554:13:2554:31 | ...::from(...) |  | {EXTERNAL LOCATION} | String |
+| main.rs:2554:26:2554:30 | "bar" |  | file://:0:0:0:0 | & |
+| main.rs:2554:26:2554:30 | "bar" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:2555:13:2555:31 | ...::from(...) |  | {EXTERNAL LOCATION} | String |
+| main.rs:2555:26:2555:30 | "baz" |  | file://:0:0:0:0 | & |
+| main.rs:2555:26:2555:30 | "baz" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:2557:9:2557:28 | for ... in ... { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2557:13:2557:13 | s |  | {EXTERNAL LOCATION} | String |
+| main.rs:2557:18:2557:25 | strings2 |  | file://:0:0:0:0 | [] |
+| main.rs:2557:18:2557:25 | strings2 | [T;...] | {EXTERNAL LOCATION} | String |
+| main.rs:2557:27:2557:28 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2559:13:2559:20 | strings3 |  | file://:0:0:0:0 | & |
+| main.rs:2559:13:2559:20 | strings3 | &T | file://:0:0:0:0 | [] |
+| main.rs:2559:13:2559:20 | strings3 | &T.[T;...] | {EXTERNAL LOCATION} | String |
+| main.rs:2560:9:2564:9 | &... |  | file://:0:0:0:0 | & |
+| main.rs:2560:9:2564:9 | &... | &T | file://:0:0:0:0 | [] |
+| main.rs:2560:9:2564:9 | &... | &T.[T;...] | {EXTERNAL LOCATION} | String |
+| main.rs:2560:10:2564:9 | [...] |  | file://:0:0:0:0 | [] |
+| main.rs:2560:10:2564:9 | [...] | [T;...] | {EXTERNAL LOCATION} | String |
+| main.rs:2561:13:2561:31 | ...::from(...) |  | {EXTERNAL LOCATION} | String |
+| main.rs:2561:26:2561:30 | "foo" |  | file://:0:0:0:0 | & |
+| main.rs:2561:26:2561:30 | "foo" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:2562:13:2562:31 | ...::from(...) |  | {EXTERNAL LOCATION} | String |
+| main.rs:2562:26:2562:30 | "bar" |  | file://:0:0:0:0 | & |
+| main.rs:2562:26:2562:30 | "bar" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:2563:13:2563:31 | ...::from(...) |  | {EXTERNAL LOCATION} | String |
+| main.rs:2563:26:2563:30 | "baz" |  | file://:0:0:0:0 | & |
+| main.rs:2563:26:2563:30 | "baz" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:2565:9:2565:28 | for ... in ... { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2565:13:2565:13 | s |  | {EXTERNAL LOCATION} | Item |
+| main.rs:2565:13:2565:13 | s |  | file://:0:0:0:0 | & |
+| main.rs:2565:13:2565:13 | s | &T | {EXTERNAL LOCATION} | String |
+| main.rs:2565:18:2565:25 | strings3 |  | file://:0:0:0:0 | & |
+| main.rs:2565:18:2565:25 | strings3 | &T | file://:0:0:0:0 | [] |
+| main.rs:2565:18:2565:25 | strings3 | &T.[T;...] | {EXTERNAL LOCATION} | String |
+| main.rs:2565:27:2565:28 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2567:13:2567:21 | callables |  | file://:0:0:0:0 | [] |
+| main.rs:2567:13:2567:21 | callables | [T;...] | main.rs:2515:5:2515:24 | MyCallable |
+| main.rs:2567:25:2567:81 | [...] |  | file://:0:0:0:0 | [] |
+| main.rs:2567:25:2567:81 | [...] | [T;...] | main.rs:2515:5:2515:24 | MyCallable |
+| main.rs:2567:26:2567:42 | ...::new(...) |  | main.rs:2515:5:2515:24 | MyCallable |
+| main.rs:2567:45:2567:61 | ...::new(...) |  | main.rs:2515:5:2515:24 | MyCallable |
+| main.rs:2567:64:2567:80 | ...::new(...) |  | main.rs:2515:5:2515:24 | MyCallable |
+| main.rs:2568:9:2572:9 | for ... in ... { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2568:13:2568:13 | c |  | main.rs:2515:5:2515:24 | MyCallable |
+| main.rs:2569:12:2569:20 | callables |  | file://:0:0:0:0 | [] |
+| main.rs:2569:12:2569:20 | callables | [T;...] | main.rs:2515:5:2515:24 | MyCallable |
+| main.rs:2570:9:2572:9 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2571:17:2571:22 | result |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2571:26:2571:26 | c |  | main.rs:2515:5:2515:24 | MyCallable |
+| main.rs:2571:26:2571:33 | c.call() |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2576:9:2576:25 | for ... in ... { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2576:13:2576:13 | i |  | {EXTERNAL LOCATION} | Item |
+| main.rs:2576:13:2576:13 | i |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2576:18:2576:18 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2576:18:2576:22 | 0..10 |  | {EXTERNAL LOCATION} | Range |
+| main.rs:2576:18:2576:22 | 0..10 | Idx | {EXTERNAL LOCATION} | i32 |
+| main.rs:2576:21:2576:22 | 10 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2576:24:2576:25 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2577:9:2577:29 | for ... in ... { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2577:13:2577:13 | u |  | {EXTERNAL LOCATION} | Range |
+| main.rs:2577:13:2577:13 | u | Idx | {EXTERNAL LOCATION} | i32 |
+| main.rs:2577:13:2577:13 | u | Idx | {EXTERNAL LOCATION} | u8 |
+| main.rs:2577:18:2577:26 | [...] |  | file://:0:0:0:0 | [] |
+| main.rs:2577:18:2577:26 | [...] | [T;...] | {EXTERNAL LOCATION} | Range |
+| main.rs:2577:18:2577:26 | [...] | [T;...].Idx | {EXTERNAL LOCATION} | i32 |
+| main.rs:2577:18:2577:26 | [...] | [T;...].Idx | {EXTERNAL LOCATION} | u8 |
+| main.rs:2577:19:2577:21 | 0u8 |  | {EXTERNAL LOCATION} | u8 |
+| main.rs:2577:19:2577:25 | 0u8..10 |  | {EXTERNAL LOCATION} | Range |
+| main.rs:2577:19:2577:25 | 0u8..10 | Idx | {EXTERNAL LOCATION} | i32 |
+| main.rs:2577:19:2577:25 | 0u8..10 | Idx | {EXTERNAL LOCATION} | u8 |
+| main.rs:2577:24:2577:25 | 10 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2577:24:2577:25 | 10 |  | {EXTERNAL LOCATION} | u8 |
+| main.rs:2577:28:2577:29 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2578:13:2578:17 | range |  | {EXTERNAL LOCATION} | Range |
+| main.rs:2578:13:2578:17 | range | Idx | {EXTERNAL LOCATION} | i32 |
+| main.rs:2578:21:2578:21 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2578:21:2578:25 | 0..10 |  | {EXTERNAL LOCATION} | Range |
+| main.rs:2578:21:2578:25 | 0..10 | Idx | {EXTERNAL LOCATION} | i32 |
+| main.rs:2578:24:2578:25 | 10 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2579:9:2579:25 | for ... in ... { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2579:13:2579:13 | i |  | {EXTERNAL LOCATION} | Item |
+| main.rs:2579:13:2579:13 | i |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2579:18:2579:22 | range |  | {EXTERNAL LOCATION} | Range |
+| main.rs:2579:18:2579:22 | range | Idx | {EXTERNAL LOCATION} | i32 |
+| main.rs:2579:24:2579:25 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2580:13:2580:22 | range_full |  | {EXTERNAL LOCATION} | RangeFull |
+| main.rs:2580:26:2580:27 | .. |  | {EXTERNAL LOCATION} | RangeFull |
+| main.rs:2581:9:2581:51 | for ... in ... { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2581:13:2581:13 | i |  | {EXTERNAL LOCATION} | Item |
+| main.rs:2581:18:2581:48 | &... |  | file://:0:0:0:0 | & |
+| main.rs:2581:19:2581:36 | [...] |  | file://:0:0:0:0 | [] |
+| main.rs:2581:19:2581:36 | [...] | [T;...] | {EXTERNAL LOCATION} | i64 |
+| main.rs:2581:20:2581:23 | 1i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2581:26:2581:29 | 2i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2581:32:2581:35 | 3i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2581:38:2581:47 | range_full |  | {EXTERNAL LOCATION} | RangeFull |
+| main.rs:2581:50:2581:51 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2583:13:2583:18 | range1 |  | {EXTERNAL LOCATION} | Range |
+| main.rs:2583:13:2583:18 | range1 | Idx | {EXTERNAL LOCATION} | u16 |
+| main.rs:2584:9:2587:9 | ...::Range {...} |  | {EXTERNAL LOCATION} | Range |
+| main.rs:2584:9:2587:9 | ...::Range {...} | Idx | {EXTERNAL LOCATION} | u16 |
+| main.rs:2585:20:2585:23 | 0u16 |  | {EXTERNAL LOCATION} | u16 |
+| main.rs:2586:18:2586:22 | 10u16 |  | {EXTERNAL LOCATION} | u16 |
+| main.rs:2588:9:2588:26 | for ... in ... { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2588:13:2588:13 | u |  | {EXTERNAL LOCATION} | Item |
+| main.rs:2588:13:2588:13 | u |  | {EXTERNAL LOCATION} | u16 |
+| main.rs:2588:18:2588:23 | range1 |  | {EXTERNAL LOCATION} | Range |
+| main.rs:2588:18:2588:23 | range1 | Idx | {EXTERNAL LOCATION} | u16 |
+| main.rs:2588:25:2588:26 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2592:26:2592:26 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2592:29:2592:29 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2592:32:2592:32 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2593:9:2593:25 | for ... in ... { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2593:24:2593:25 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2595:13:2595:18 | vals4a |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2595:13:2595:18 | vals4a | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2595:13:2595:18 | vals4a | T | {EXTERNAL LOCATION} | u16 |
+| main.rs:2595:32:2595:43 | [...] |  | file://:0:0:0:0 | [] |
+| main.rs:2595:32:2595:43 | [...] | [T;...] | {EXTERNAL LOCATION} | i32 |
+| main.rs:2595:32:2595:43 | [...] | [T;...] | {EXTERNAL LOCATION} | u16 |
+| main.rs:2595:32:2595:52 | ... .to_vec() |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2595:32:2595:52 | ... .to_vec() | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2595:32:2595:52 | ... .to_vec() | T | {EXTERNAL LOCATION} | u16 |
+| main.rs:2595:33:2595:36 | 1u16 |  | {EXTERNAL LOCATION} | u16 |
+| main.rs:2595:39:2595:39 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2595:42:2595:42 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2596:9:2596:26 | for ... in ... { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2596:13:2596:13 | u |  | {EXTERNAL LOCATION} | u16 |
+| main.rs:2596:13:2596:13 | u |  | file://:0:0:0:0 | & |
+| main.rs:2596:18:2596:23 | vals4a |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2596:18:2596:23 | vals4a | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2596:18:2596:23 | vals4a | T | {EXTERNAL LOCATION} | u16 |
+| main.rs:2596:25:2596:26 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2598:22:2598:33 | [...] |  | file://:0:0:0:0 | [] |
+| main.rs:2598:22:2598:33 | [...] | [T;...] | {EXTERNAL LOCATION} | i32 |
+| main.rs:2598:22:2598:33 | [...] | [T;...] | {EXTERNAL LOCATION} | u16 |
+| main.rs:2598:23:2598:26 | 1u16 |  | {EXTERNAL LOCATION} | u16 |
+| main.rs:2598:29:2598:29 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2598:32:2598:32 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2599:9:2599:26 | for ... in ... { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2599:25:2599:26 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2601:13:2601:17 | vals5 |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2601:13:2601:17 | vals5 | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2601:13:2601:17 | vals5 | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2601:13:2601:17 | vals5 | T | {EXTERNAL LOCATION} | u32 |
+| main.rs:2601:21:2601:43 | ...::from(...) |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2601:21:2601:43 | ...::from(...) | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2601:21:2601:43 | ...::from(...) | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2601:21:2601:43 | ...::from(...) | T | {EXTERNAL LOCATION} | u32 |
+| main.rs:2601:31:2601:42 | [...] |  | file://:0:0:0:0 | [] |
+| main.rs:2601:31:2601:42 | [...] | [T;...] | {EXTERNAL LOCATION} | i32 |
+| main.rs:2601:31:2601:42 | [...] | [T;...] | {EXTERNAL LOCATION} | u32 |
+| main.rs:2601:32:2601:35 | 1u32 |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:2601:38:2601:38 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2601:41:2601:41 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2602:9:2602:25 | for ... in ... { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2602:13:2602:13 | u |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2602:13:2602:13 | u |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:2602:13:2602:13 | u |  | file://:0:0:0:0 | & |
+| main.rs:2602:18:2602:22 | vals5 |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2602:18:2602:22 | vals5 | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2602:18:2602:22 | vals5 | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2602:18:2602:22 | vals5 | T | {EXTERNAL LOCATION} | u32 |
+| main.rs:2602:24:2602:25 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2604:13:2604:17 | vals6 |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2604:13:2604:17 | vals6 | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2604:13:2604:17 | vals6 | T | file://:0:0:0:0 | & |
+| main.rs:2604:13:2604:17 | vals6 | T.&T | {EXTERNAL LOCATION} | u64 |
+| main.rs:2604:32:2604:43 | [...] |  | file://:0:0:0:0 | [] |
+| main.rs:2604:32:2604:43 | [...] | [T;...] | {EXTERNAL LOCATION} | i32 |
+| main.rs:2604:32:2604:43 | [...] | [T;...] | {EXTERNAL LOCATION} | u64 |
+| main.rs:2604:32:2604:60 | ... .collect() |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2604:32:2604:60 | ... .collect() | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2604:32:2604:60 | ... .collect() | T | file://:0:0:0:0 | & |
+| main.rs:2604:32:2604:60 | ... .collect() | T.&T | {EXTERNAL LOCATION} | u64 |
+| main.rs:2604:33:2604:36 | 1u64 |  | {EXTERNAL LOCATION} | u64 |
+| main.rs:2604:39:2604:39 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2604:42:2604:42 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2605:9:2605:25 | for ... in ... { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2605:13:2605:13 | u |  | file://:0:0:0:0 | & |
+| main.rs:2605:13:2605:13 | u | &T | {EXTERNAL LOCATION} | u64 |
+| main.rs:2605:18:2605:22 | vals6 |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2605:18:2605:22 | vals6 | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2605:18:2605:22 | vals6 | T | file://:0:0:0:0 | & |
+| main.rs:2605:18:2605:22 | vals6 | T.&T | {EXTERNAL LOCATION} | u64 |
+| main.rs:2605:24:2605:25 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2607:17:2607:21 | vals7 |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2607:17:2607:21 | vals7 | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2607:17:2607:21 | vals7 | T | {EXTERNAL LOCATION} | u8 |
+| main.rs:2607:25:2607:34 | ...::new(...) |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2607:25:2607:34 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2607:25:2607:34 | ...::new(...) | T | {EXTERNAL LOCATION} | u8 |
+| main.rs:2608:9:2608:13 | vals7 |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2608:9:2608:13 | vals7 | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2608:9:2608:13 | vals7 | T | {EXTERNAL LOCATION} | u8 |
+| main.rs:2608:9:2608:23 | vals7.push(...) |  | file://:0:0:0:0 | () |
+| main.rs:2608:20:2608:22 | 1u8 |  | {EXTERNAL LOCATION} | u8 |
+| main.rs:2609:9:2609:25 | for ... in ... { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2609:13:2609:13 | u |  | {EXTERNAL LOCATION} | u8 |
+| main.rs:2609:13:2609:13 | u |  | file://:0:0:0:0 | & |
+| main.rs:2609:18:2609:22 | vals7 |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2609:18:2609:22 | vals7 | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2609:18:2609:22 | vals7 | T | {EXTERNAL LOCATION} | u8 |
+| main.rs:2609:24:2609:25 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2611:33:2611:33 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2611:36:2611:36 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2611:45:2611:45 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2611:48:2611:48 | 4 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2613:13:2613:13 | _ |  | file://:0:0:0:0 | () |
+| main.rs:2613:17:2616:9 | for ... in ... { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2613:36:2616:9 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2614:13:2615:13 | for ... in ... { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2614:29:2615:13 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2618:17:2618:20 | map1 |  | {EXTERNAL LOCATION} | HashMap |
+| main.rs:2618:17:2618:20 | map1 | K | {EXTERNAL LOCATION} | i32 |
+| main.rs:2618:17:2618:20 | map1 | S | {EXTERNAL LOCATION} | RandomState |
+| main.rs:2618:17:2618:20 | map1 | V | {EXTERNAL LOCATION} | Box |
+| main.rs:2618:17:2618:20 | map1 | V.A | {EXTERNAL LOCATION} | Global |
+| main.rs:2618:17:2618:20 | map1 | V.T | file://:0:0:0:0 | & |
+| main.rs:2618:17:2618:20 | map1 | V.T.&T | {EXTERNAL LOCATION} | str |
+| main.rs:2618:24:2618:55 | ...::new(...) |  | {EXTERNAL LOCATION} | HashMap |
+| main.rs:2618:24:2618:55 | ...::new(...) | K | {EXTERNAL LOCATION} | i32 |
+| main.rs:2618:24:2618:55 | ...::new(...) | S | {EXTERNAL LOCATION} | RandomState |
+| main.rs:2618:24:2618:55 | ...::new(...) | V | {EXTERNAL LOCATION} | Box |
+| main.rs:2618:24:2618:55 | ...::new(...) | V.A | {EXTERNAL LOCATION} | Global |
+| main.rs:2618:24:2618:55 | ...::new(...) | V.T | file://:0:0:0:0 | & |
+| main.rs:2618:24:2618:55 | ...::new(...) | V.T.&T | {EXTERNAL LOCATION} | str |
+| main.rs:2619:9:2619:12 | map1 |  | {EXTERNAL LOCATION} | HashMap |
+| main.rs:2619:9:2619:12 | map1 | K | {EXTERNAL LOCATION} | i32 |
+| main.rs:2619:9:2619:12 | map1 | S | {EXTERNAL LOCATION} | RandomState |
+| main.rs:2619:9:2619:12 | map1 | V | {EXTERNAL LOCATION} | Box |
+| main.rs:2619:9:2619:12 | map1 | V.A | {EXTERNAL LOCATION} | Global |
+| main.rs:2619:9:2619:12 | map1 | V.T | file://:0:0:0:0 | & |
+| main.rs:2619:9:2619:12 | map1 | V.T.&T | {EXTERNAL LOCATION} | str |
+| main.rs:2619:9:2619:39 | map1.insert(...) |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2619:9:2619:39 | map1.insert(...) | T | {EXTERNAL LOCATION} | Box |
+| main.rs:2619:9:2619:39 | map1.insert(...) | T.A | {EXTERNAL LOCATION} | Global |
+| main.rs:2619:9:2619:39 | map1.insert(...) | T.T | file://:0:0:0:0 | & |
+| main.rs:2619:9:2619:39 | map1.insert(...) | T.T.&T | {EXTERNAL LOCATION} | str |
+| main.rs:2619:21:2619:21 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2619:24:2619:38 | ...::new(...) |  | {EXTERNAL LOCATION} | Box |
+| main.rs:2619:24:2619:38 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2619:24:2619:38 | ...::new(...) | T | file://:0:0:0:0 | & |
+| main.rs:2619:24:2619:38 | ...::new(...) | T.&T | {EXTERNAL LOCATION} | str |
+| main.rs:2619:33:2619:37 | "one" |  | file://:0:0:0:0 | & |
+| main.rs:2619:33:2619:37 | "one" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:2620:9:2620:12 | map1 |  | {EXTERNAL LOCATION} | HashMap |
+| main.rs:2620:9:2620:12 | map1 | K | {EXTERNAL LOCATION} | i32 |
+| main.rs:2620:9:2620:12 | map1 | S | {EXTERNAL LOCATION} | RandomState |
+| main.rs:2620:9:2620:12 | map1 | V | {EXTERNAL LOCATION} | Box |
+| main.rs:2620:9:2620:12 | map1 | V.A | {EXTERNAL LOCATION} | Global |
+| main.rs:2620:9:2620:12 | map1 | V.T | file://:0:0:0:0 | & |
+| main.rs:2620:9:2620:12 | map1 | V.T.&T | {EXTERNAL LOCATION} | str |
+| main.rs:2620:9:2620:39 | map1.insert(...) |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2620:9:2620:39 | map1.insert(...) | T | {EXTERNAL LOCATION} | Box |
+| main.rs:2620:9:2620:39 | map1.insert(...) | T.A | {EXTERNAL LOCATION} | Global |
+| main.rs:2620:9:2620:39 | map1.insert(...) | T.T | file://:0:0:0:0 | & |
+| main.rs:2620:9:2620:39 | map1.insert(...) | T.T.&T | {EXTERNAL LOCATION} | str |
+| main.rs:2620:21:2620:21 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2620:24:2620:38 | ...::new(...) |  | {EXTERNAL LOCATION} | Box |
+| main.rs:2620:24:2620:38 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2620:24:2620:38 | ...::new(...) | T | file://:0:0:0:0 | & |
+| main.rs:2620:24:2620:38 | ...::new(...) | T.&T | {EXTERNAL LOCATION} | str |
+| main.rs:2620:33:2620:37 | "two" |  | file://:0:0:0:0 | & |
+| main.rs:2620:33:2620:37 | "two" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:2621:9:2621:33 | for ... in ... { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2621:13:2621:15 | key |  | {EXTERNAL LOCATION} | Item |
+| main.rs:2621:13:2621:15 | key |  | file://:0:0:0:0 | & |
+| main.rs:2621:13:2621:15 | key | &T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2621:20:2621:23 | map1 |  | {EXTERNAL LOCATION} | HashMap |
+| main.rs:2621:20:2621:23 | map1 | K | {EXTERNAL LOCATION} | i32 |
+| main.rs:2621:20:2621:23 | map1 | S | {EXTERNAL LOCATION} | RandomState |
+| main.rs:2621:20:2621:23 | map1 | V | {EXTERNAL LOCATION} | Box |
+| main.rs:2621:20:2621:23 | map1 | V.A | {EXTERNAL LOCATION} | Global |
+| main.rs:2621:20:2621:23 | map1 | V.T | file://:0:0:0:0 | & |
+| main.rs:2621:20:2621:23 | map1 | V.T.&T | {EXTERNAL LOCATION} | str |
+| main.rs:2621:20:2621:30 | map1.keys() |  | {EXTERNAL LOCATION} | Keys |
+| main.rs:2621:20:2621:30 | map1.keys() | K | {EXTERNAL LOCATION} | i32 |
+| main.rs:2621:20:2621:30 | map1.keys() | V | {EXTERNAL LOCATION} | Box |
+| main.rs:2621:20:2621:30 | map1.keys() | V.A | {EXTERNAL LOCATION} | Global |
+| main.rs:2621:20:2621:30 | map1.keys() | V.T | file://:0:0:0:0 | & |
+| main.rs:2621:20:2621:30 | map1.keys() | V.T.&T | {EXTERNAL LOCATION} | str |
+| main.rs:2621:32:2621:33 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2622:9:2622:37 | for ... in ... { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2622:13:2622:17 | value |  | {EXTERNAL LOCATION} | Item |
+| main.rs:2622:13:2622:17 | value |  | file://:0:0:0:0 | & |
+| main.rs:2622:13:2622:17 | value | &T | {EXTERNAL LOCATION} | Box |
+| main.rs:2622:13:2622:17 | value | &T.A | {EXTERNAL LOCATION} | Global |
+| main.rs:2622:13:2622:17 | value | &T.T | file://:0:0:0:0 | & |
+| main.rs:2622:13:2622:17 | value | &T.T.&T | {EXTERNAL LOCATION} | str |
+| main.rs:2622:22:2622:25 | map1 |  | {EXTERNAL LOCATION} | HashMap |
+| main.rs:2622:22:2622:25 | map1 | K | {EXTERNAL LOCATION} | i32 |
+| main.rs:2622:22:2622:25 | map1 | S | {EXTERNAL LOCATION} | RandomState |
+| main.rs:2622:22:2622:25 | map1 | V | {EXTERNAL LOCATION} | Box |
+| main.rs:2622:22:2622:25 | map1 | V.A | {EXTERNAL LOCATION} | Global |
+| main.rs:2622:22:2622:25 | map1 | V.T | file://:0:0:0:0 | & |
+| main.rs:2622:22:2622:25 | map1 | V.T.&T | {EXTERNAL LOCATION} | str |
+| main.rs:2622:22:2622:34 | map1.values() |  | {EXTERNAL LOCATION} | Values |
+| main.rs:2622:22:2622:34 | map1.values() | K | {EXTERNAL LOCATION} | i32 |
+| main.rs:2622:22:2622:34 | map1.values() | V | {EXTERNAL LOCATION} | Box |
+| main.rs:2622:22:2622:34 | map1.values() | V.A | {EXTERNAL LOCATION} | Global |
+| main.rs:2622:22:2622:34 | map1.values() | V.T | file://:0:0:0:0 | & |
+| main.rs:2622:22:2622:34 | map1.values() | V.T.&T | {EXTERNAL LOCATION} | str |
+| main.rs:2622:36:2622:37 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2623:9:2623:42 | for ... in ... { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2623:13:2623:24 | TuplePat |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2623:13:2623:24 | TuplePat | 0(2) | file://:0:0:0:0 | & |
+| main.rs:2623:13:2623:24 | TuplePat | 0(2).&T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2623:13:2623:24 | TuplePat | 1(2) | file://:0:0:0:0 | & |
+| main.rs:2623:13:2623:24 | TuplePat | 1(2).&T | {EXTERNAL LOCATION} | Box |
+| main.rs:2623:13:2623:24 | TuplePat | 1(2).&T.A | {EXTERNAL LOCATION} | Global |
+| main.rs:2623:13:2623:24 | TuplePat | 1(2).&T.T | file://:0:0:0:0 | & |
+| main.rs:2623:13:2623:24 | TuplePat | 1(2).&T.T.&T | {EXTERNAL LOCATION} | str |
+| main.rs:2623:14:2623:16 | key |  | file://:0:0:0:0 | & |
+| main.rs:2623:14:2623:16 | key | &T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2623:19:2623:23 | value |  | file://:0:0:0:0 | & |
+| main.rs:2623:19:2623:23 | value | &T | {EXTERNAL LOCATION} | Box |
+| main.rs:2623:19:2623:23 | value | &T.A | {EXTERNAL LOCATION} | Global |
+| main.rs:2623:19:2623:23 | value | &T.T | file://:0:0:0:0 | & |
+| main.rs:2623:19:2623:23 | value | &T.T.&T | {EXTERNAL LOCATION} | str |
+| main.rs:2623:29:2623:32 | map1 |  | {EXTERNAL LOCATION} | HashMap |
+| main.rs:2623:29:2623:32 | map1 | K | {EXTERNAL LOCATION} | i32 |
+| main.rs:2623:29:2623:32 | map1 | S | {EXTERNAL LOCATION} | RandomState |
+| main.rs:2623:29:2623:32 | map1 | V | {EXTERNAL LOCATION} | Box |
+| main.rs:2623:29:2623:32 | map1 | V.A | {EXTERNAL LOCATION} | Global |
+| main.rs:2623:29:2623:32 | map1 | V.T | file://:0:0:0:0 | & |
+| main.rs:2623:29:2623:32 | map1 | V.T.&T | {EXTERNAL LOCATION} | str |
+| main.rs:2623:29:2623:39 | map1.iter() |  | {EXTERNAL LOCATION} | Iter |
+| main.rs:2623:29:2623:39 | map1.iter() | K | {EXTERNAL LOCATION} | i32 |
+| main.rs:2623:29:2623:39 | map1.iter() | V | {EXTERNAL LOCATION} | Box |
+| main.rs:2623:29:2623:39 | map1.iter() | V.A | {EXTERNAL LOCATION} | Global |
+| main.rs:2623:29:2623:39 | map1.iter() | V.T | file://:0:0:0:0 | & |
+| main.rs:2623:29:2623:39 | map1.iter() | V.T.&T | {EXTERNAL LOCATION} | str |
+| main.rs:2623:41:2623:42 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2624:9:2624:36 | for ... in ... { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2624:13:2624:24 | TuplePat |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2624:13:2624:24 | TuplePat | 0(2) | file://:0:0:0:0 | & |
+| main.rs:2624:13:2624:24 | TuplePat | 0(2).&T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2624:13:2624:24 | TuplePat | 1(2) | file://:0:0:0:0 | & |
+| main.rs:2624:13:2624:24 | TuplePat | 1(2).&T | {EXTERNAL LOCATION} | Box |
+| main.rs:2624:13:2624:24 | TuplePat | 1(2).&T.A | {EXTERNAL LOCATION} | Global |
+| main.rs:2624:13:2624:24 | TuplePat | 1(2).&T.T | file://:0:0:0:0 | & |
+| main.rs:2624:13:2624:24 | TuplePat | 1(2).&T.T.&T | {EXTERNAL LOCATION} | str |
+| main.rs:2624:14:2624:16 | key |  | file://:0:0:0:0 | & |
+| main.rs:2624:14:2624:16 | key | &T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2624:19:2624:23 | value |  | file://:0:0:0:0 | & |
+| main.rs:2624:19:2624:23 | value | &T | {EXTERNAL LOCATION} | Box |
+| main.rs:2624:19:2624:23 | value | &T.A | {EXTERNAL LOCATION} | Global |
+| main.rs:2624:19:2624:23 | value | &T.T | file://:0:0:0:0 | & |
+| main.rs:2624:19:2624:23 | value | &T.T.&T | {EXTERNAL LOCATION} | str |
+| main.rs:2624:29:2624:33 | &map1 |  | file://:0:0:0:0 | & |
+| main.rs:2624:29:2624:33 | &map1 | &T | {EXTERNAL LOCATION} | HashMap |
+| main.rs:2624:29:2624:33 | &map1 | &T.K | {EXTERNAL LOCATION} | i32 |
+| main.rs:2624:29:2624:33 | &map1 | &T.S | {EXTERNAL LOCATION} | RandomState |
+| main.rs:2624:29:2624:33 | &map1 | &T.V | {EXTERNAL LOCATION} | Box |
+| main.rs:2624:29:2624:33 | &map1 | &T.V.A | {EXTERNAL LOCATION} | Global |
+| main.rs:2624:29:2624:33 | &map1 | &T.V.T | file://:0:0:0:0 | & |
+| main.rs:2624:29:2624:33 | &map1 | &T.V.T.&T | {EXTERNAL LOCATION} | str |
+| main.rs:2624:30:2624:33 | map1 |  | {EXTERNAL LOCATION} | HashMap |
+| main.rs:2624:30:2624:33 | map1 | K | {EXTERNAL LOCATION} | i32 |
+| main.rs:2624:30:2624:33 | map1 | S | {EXTERNAL LOCATION} | RandomState |
+| main.rs:2624:30:2624:33 | map1 | V | {EXTERNAL LOCATION} | Box |
+| main.rs:2624:30:2624:33 | map1 | V.A | {EXTERNAL LOCATION} | Global |
+| main.rs:2624:30:2624:33 | map1 | V.T | file://:0:0:0:0 | & |
+| main.rs:2624:30:2624:33 | map1 | V.T.&T | {EXTERNAL LOCATION} | str |
+| main.rs:2624:35:2624:36 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2628:17:2628:17 | a |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2628:26:2628:26 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2628:26:2628:26 | 0 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2630:13:2630:13 | _ |  | file://:0:0:0:0 | () |
+| main.rs:2630:17:2633:9 | while ... { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2630:23:2630:23 | a |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2630:23:2630:28 | ... < ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2630:27:2630:28 | 10 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2631:9:2633:9 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2632:13:2632:13 | a |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2632:13:2632:18 | ... += ... |  | file://:0:0:0:0 | () |
+| main.rs:2632:18:2632:18 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2644:40:2646:9 | { ... } |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2644:40:2646:9 | { ... } | T | main.rs:2638:5:2638:20 | S1 |
+| main.rs:2644:40:2646:9 | { ... } | T.T | main.rs:2643:10:2643:19 | T |
+| main.rs:2645:13:2645:16 | None |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2645:13:2645:16 | None | T | main.rs:2638:5:2638:20 | S1 |
+| main.rs:2645:13:2645:16 | None | T.T | main.rs:2643:10:2643:19 | T |
+| main.rs:2648:30:2650:9 | { ... } |  | main.rs:2638:5:2638:20 | S1 |
+| main.rs:2648:30:2650:9 | { ... } | T | main.rs:2643:10:2643:19 | T |
+| main.rs:2649:13:2649:28 | S1(...) |  | main.rs:2638:5:2638:20 | S1 |
+| main.rs:2649:13:2649:28 | S1(...) | T | main.rs:2643:10:2643:19 | T |
+| main.rs:2649:16:2649:27 | ...::default(...) |  | main.rs:2643:10:2643:19 | T |
+| main.rs:2652:19:2652:22 | SelfParam |  | main.rs:2638:5:2638:20 | S1 |
+| main.rs:2652:19:2652:22 | SelfParam | T | main.rs:2643:10:2643:19 | T |
+| main.rs:2652:33:2654:9 | { ... } |  | main.rs:2638:5:2638:20 | S1 |
+| main.rs:2652:33:2654:9 | { ... } | T | main.rs:2643:10:2643:19 | T |
+| main.rs:2653:13:2653:16 | self |  | main.rs:2638:5:2638:20 | S1 |
+| main.rs:2653:13:2653:16 | self | T | main.rs:2643:10:2643:19 | T |
+| main.rs:2665:15:2665:15 | x |  | main.rs:2665:12:2665:12 | T |
+| main.rs:2665:26:2667:5 | { ... } |  | main.rs:2665:12:2665:12 | T |
+| main.rs:2666:9:2666:9 | x |  | main.rs:2665:12:2665:12 | T |
+| main.rs:2669:16:2691:5 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2670:13:2670:14 | x1 |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2670:13:2670:14 | x1 | T | main.rs:2638:5:2638:20 | S1 |
+| main.rs:2670:13:2670:14 | x1 | T.T | main.rs:2640:5:2641:14 | S2 |
+| main.rs:2670:34:2670:48 | ...::assoc_fun(...) |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2670:34:2670:48 | ...::assoc_fun(...) | T | main.rs:2638:5:2638:20 | S1 |
+| main.rs:2670:34:2670:48 | ...::assoc_fun(...) | T.T | main.rs:2640:5:2641:14 | S2 |
+| main.rs:2671:13:2671:14 | x2 |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2671:13:2671:14 | x2 | T | main.rs:2638:5:2638:20 | S1 |
+| main.rs:2671:13:2671:14 | x2 | T.T | main.rs:2640:5:2641:14 | S2 |
+| main.rs:2671:18:2671:38 | ...::assoc_fun(...) |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2671:18:2671:38 | ...::assoc_fun(...) | T | main.rs:2638:5:2638:20 | S1 |
+| main.rs:2671:18:2671:38 | ...::assoc_fun(...) | T.T | main.rs:2640:5:2641:14 | S2 |
+| main.rs:2672:13:2672:14 | x3 |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2672:13:2672:14 | x3 | T | main.rs:2638:5:2638:20 | S1 |
+| main.rs:2672:13:2672:14 | x3 | T.T | main.rs:2640:5:2641:14 | S2 |
+| main.rs:2672:18:2672:32 | ...::assoc_fun(...) |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2672:18:2672:32 | ...::assoc_fun(...) | T | main.rs:2638:5:2638:20 | S1 |
+| main.rs:2672:18:2672:32 | ...::assoc_fun(...) | T.T | main.rs:2640:5:2641:14 | S2 |
+| main.rs:2673:13:2673:14 | x4 |  | main.rs:2638:5:2638:20 | S1 |
+| main.rs:2673:13:2673:14 | x4 | T | main.rs:2640:5:2641:14 | S2 |
+| main.rs:2673:18:2673:48 | ...::method(...) |  | main.rs:2638:5:2638:20 | S1 |
+| main.rs:2673:18:2673:48 | ...::method(...) | T | main.rs:2640:5:2641:14 | S2 |
+| main.rs:2673:35:2673:47 | ...::default(...) |  | main.rs:2638:5:2638:20 | S1 |
+| main.rs:2673:35:2673:47 | ...::default(...) | T | main.rs:2640:5:2641:14 | S2 |
+| main.rs:2674:13:2674:14 | x5 |  | main.rs:2638:5:2638:20 | S1 |
+| main.rs:2674:13:2674:14 | x5 | T | main.rs:2640:5:2641:14 | S2 |
+| main.rs:2674:18:2674:42 | ...::method(...) |  | main.rs:2638:5:2638:20 | S1 |
+| main.rs:2674:18:2674:42 | ...::method(...) | T | main.rs:2640:5:2641:14 | S2 |
+| main.rs:2674:29:2674:41 | ...::default(...) |  | main.rs:2638:5:2638:20 | S1 |
+| main.rs:2674:29:2674:41 | ...::default(...) | T | main.rs:2640:5:2641:14 | S2 |
+| main.rs:2675:13:2675:14 | x6 |  | main.rs:2659:5:2659:27 | S4 |
+| main.rs:2675:13:2675:14 | x6 | T4 | main.rs:2640:5:2641:14 | S2 |
+| main.rs:2675:18:2675:45 | S4::<...>(...) |  | main.rs:2659:5:2659:27 | S4 |
+| main.rs:2675:18:2675:45 | S4::<...>(...) | T4 | main.rs:2640:5:2641:14 | S2 |
+| main.rs:2675:27:2675:44 | ...::default(...) |  | main.rs:2640:5:2641:14 | S2 |
+| main.rs:2676:13:2676:14 | x7 |  | main.rs:2659:5:2659:27 | S4 |
+| main.rs:2676:13:2676:14 | x7 | T4 | main.rs:2640:5:2641:14 | S2 |
+| main.rs:2676:18:2676:23 | S4(...) |  | main.rs:2659:5:2659:27 | S4 |
+| main.rs:2676:18:2676:23 | S4(...) | T4 | main.rs:2640:5:2641:14 | S2 |
+| main.rs:2676:21:2676:22 | S2 |  | main.rs:2640:5:2641:14 | S2 |
+| main.rs:2677:13:2677:14 | x8 |  | main.rs:2659:5:2659:27 | S4 |
+| main.rs:2677:13:2677:14 | x8 | T4 | {EXTERNAL LOCATION} | i32 |
+| main.rs:2677:18:2677:22 | S4(...) |  | main.rs:2659:5:2659:27 | S4 |
+| main.rs:2677:18:2677:22 | S4(...) | T4 | {EXTERNAL LOCATION} | i32 |
+| main.rs:2677:21:2677:21 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2678:13:2678:14 | x9 |  | main.rs:2659:5:2659:27 | S4 |
+| main.rs:2678:13:2678:14 | x9 | T4 | main.rs:2640:5:2641:14 | S2 |
+| main.rs:2678:18:2678:34 | S4(...) |  | main.rs:2659:5:2659:27 | S4 |
+| main.rs:2678:18:2678:34 | S4(...) | T4 | main.rs:2640:5:2641:14 | S2 |
+| main.rs:2678:21:2678:33 | ...::default(...) |  | main.rs:2640:5:2641:14 | S2 |
+| main.rs:2679:13:2679:15 | x10 |  | main.rs:2661:5:2663:5 | S5 |
+| main.rs:2679:13:2679:15 | x10 | T5 | main.rs:2640:5:2641:14 | S2 |
+| main.rs:2679:19:2682:9 | S5::<...> {...} |  | main.rs:2661:5:2663:5 | S5 |
+| main.rs:2679:19:2682:9 | S5::<...> {...} | T5 | main.rs:2640:5:2641:14 | S2 |
+| main.rs:2681:20:2681:37 | ...::default(...) |  | main.rs:2640:5:2641:14 | S2 |
+| main.rs:2683:13:2683:15 | x11 |  | main.rs:2661:5:2663:5 | S5 |
+| main.rs:2683:13:2683:15 | x11 | T5 | main.rs:2640:5:2641:14 | S2 |
+| main.rs:2683:19:2683:34 | S5 {...} |  | main.rs:2661:5:2663:5 | S5 |
+| main.rs:2683:19:2683:34 | S5 {...} | T5 | main.rs:2640:5:2641:14 | S2 |
+| main.rs:2683:31:2683:32 | S2 |  | main.rs:2640:5:2641:14 | S2 |
+| main.rs:2684:13:2684:15 | x12 |  | main.rs:2661:5:2663:5 | S5 |
+| main.rs:2684:13:2684:15 | x12 | T5 | {EXTERNAL LOCATION} | i32 |
+| main.rs:2684:19:2684:33 | S5 {...} |  | main.rs:2661:5:2663:5 | S5 |
+| main.rs:2684:19:2684:33 | S5 {...} | T5 | {EXTERNAL LOCATION} | i32 |
+| main.rs:2684:31:2684:31 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2685:13:2685:15 | x13 |  | main.rs:2661:5:2663:5 | S5 |
+| main.rs:2685:13:2685:15 | x13 | T5 | main.rs:2640:5:2641:14 | S2 |
+| main.rs:2685:19:2688:9 | S5 {...} |  | main.rs:2661:5:2663:5 | S5 |
+| main.rs:2685:19:2688:9 | S5 {...} | T5 | main.rs:2640:5:2641:14 | S2 |
+| main.rs:2687:20:2687:32 | ...::default(...) |  | main.rs:2640:5:2641:14 | S2 |
+| main.rs:2689:13:2689:15 | x14 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2689:19:2689:48 | foo::<...>(...) |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2689:30:2689:47 | ...::default(...) |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2690:13:2690:15 | x15 |  | main.rs:2638:5:2638:20 | S1 |
+| main.rs:2690:13:2690:15 | x15 | T | main.rs:2640:5:2641:14 | S2 |
+| main.rs:2690:19:2690:37 | ...::default(...) |  | main.rs:2638:5:2638:20 | S1 |
+| main.rs:2690:19:2690:37 | ...::default(...) | T | main.rs:2640:5:2641:14 | S2 |
+| main.rs:2699:35:2701:9 | { ... } |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2699:35:2701:9 | { ... } | 0(2) | main.rs:2695:5:2696:16 | S1 |
+| main.rs:2699:35:2701:9 | { ... } | 1(2) | main.rs:2695:5:2696:16 | S1 |
+| main.rs:2700:13:2700:26 | TupleExpr |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2700:13:2700:26 | TupleExpr | 0(2) | main.rs:2695:5:2696:16 | S1 |
+| main.rs:2700:13:2700:26 | TupleExpr | 1(2) | main.rs:2695:5:2696:16 | S1 |
+| main.rs:2700:14:2700:18 | S1 {...} |  | main.rs:2695:5:2696:16 | S1 |
+| main.rs:2700:21:2700:25 | S1 {...} |  | main.rs:2695:5:2696:16 | S1 |
+| main.rs:2702:16:2702:19 | SelfParam |  | main.rs:2695:5:2696:16 | S1 |
+| main.rs:2702:22:2702:23 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2705:16:2739:5 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2706:13:2706:13 | a |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2706:13:2706:13 | a | 0(2) | main.rs:2695:5:2696:16 | S1 |
+| main.rs:2706:13:2706:13 | a | 1(2) | main.rs:2695:5:2696:16 | S1 |
+| main.rs:2706:17:2706:30 | ...::get_pair(...) |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2706:17:2706:30 | ...::get_pair(...) | 0(2) | main.rs:2695:5:2696:16 | S1 |
+| main.rs:2706:17:2706:30 | ...::get_pair(...) | 1(2) | main.rs:2695:5:2696:16 | S1 |
+| main.rs:2707:17:2707:17 | b |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2707:17:2707:17 | b | 0(2) | main.rs:2695:5:2696:16 | S1 |
+| main.rs:2707:17:2707:17 | b | 1(2) | main.rs:2695:5:2696:16 | S1 |
+| main.rs:2707:21:2707:34 | ...::get_pair(...) |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2707:21:2707:34 | ...::get_pair(...) | 0(2) | main.rs:2695:5:2696:16 | S1 |
+| main.rs:2707:21:2707:34 | ...::get_pair(...) | 1(2) | main.rs:2695:5:2696:16 | S1 |
+| main.rs:2708:13:2708:18 | TuplePat |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2708:13:2708:18 | TuplePat | 0(2) | main.rs:2695:5:2696:16 | S1 |
+| main.rs:2708:13:2708:18 | TuplePat | 1(2) | main.rs:2695:5:2696:16 | S1 |
+| main.rs:2708:14:2708:14 | c |  | main.rs:2695:5:2696:16 | S1 |
+| main.rs:2708:17:2708:17 | d |  | main.rs:2695:5:2696:16 | S1 |
+| main.rs:2708:22:2708:35 | ...::get_pair(...) |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2708:22:2708:35 | ...::get_pair(...) | 0(2) | main.rs:2695:5:2696:16 | S1 |
+| main.rs:2708:22:2708:35 | ...::get_pair(...) | 1(2) | main.rs:2695:5:2696:16 | S1 |
+| main.rs:2709:13:2709:22 | TuplePat |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2709:13:2709:22 | TuplePat | 0(2) | main.rs:2695:5:2696:16 | S1 |
+| main.rs:2709:13:2709:22 | TuplePat | 1(2) | main.rs:2695:5:2696:16 | S1 |
+| main.rs:2709:18:2709:18 | e |  | main.rs:2695:5:2696:16 | S1 |
+| main.rs:2709:21:2709:21 | f |  | main.rs:2695:5:2696:16 | S1 |
+| main.rs:2709:26:2709:39 | ...::get_pair(...) |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2709:26:2709:39 | ...::get_pair(...) | 0(2) | main.rs:2695:5:2696:16 | S1 |
+| main.rs:2709:26:2709:39 | ...::get_pair(...) | 1(2) | main.rs:2695:5:2696:16 | S1 |
+| main.rs:2710:13:2710:26 | TuplePat |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2710:13:2710:26 | TuplePat | 0(2) | main.rs:2695:5:2696:16 | S1 |
+| main.rs:2710:13:2710:26 | TuplePat | 1(2) | main.rs:2695:5:2696:16 | S1 |
+| main.rs:2710:18:2710:18 | g |  | main.rs:2695:5:2696:16 | S1 |
+| main.rs:2710:25:2710:25 | h |  | main.rs:2695:5:2696:16 | S1 |
+| main.rs:2710:30:2710:43 | ...::get_pair(...) |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2710:30:2710:43 | ...::get_pair(...) | 0(2) | main.rs:2695:5:2696:16 | S1 |
+| main.rs:2710:30:2710:43 | ...::get_pair(...) | 1(2) | main.rs:2695:5:2696:16 | S1 |
+| main.rs:2712:9:2712:9 | a |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2712:9:2712:9 | a | 0(2) | main.rs:2695:5:2696:16 | S1 |
+| main.rs:2712:9:2712:9 | a | 1(2) | main.rs:2695:5:2696:16 | S1 |
+| main.rs:2712:9:2712:11 | a.0 |  | main.rs:2695:5:2696:16 | S1 |
+| main.rs:2712:9:2712:17 | ... .foo() |  | file://:0:0:0:0 | () |
+| main.rs:2713:9:2713:9 | b |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2713:9:2713:9 | b | 0(2) | main.rs:2695:5:2696:16 | S1 |
+| main.rs:2713:9:2713:9 | b | 1(2) | main.rs:2695:5:2696:16 | S1 |
+| main.rs:2713:9:2713:11 | b.1 |  | main.rs:2695:5:2696:16 | S1 |
+| main.rs:2713:9:2713:17 | ... .foo() |  | file://:0:0:0:0 | () |
+| main.rs:2714:9:2714:9 | c |  | main.rs:2695:5:2696:16 | S1 |
+| main.rs:2714:9:2714:15 | c.foo() |  | file://:0:0:0:0 | () |
+| main.rs:2715:9:2715:9 | d |  | main.rs:2695:5:2696:16 | S1 |
+| main.rs:2715:9:2715:15 | d.foo() |  | file://:0:0:0:0 | () |
+| main.rs:2716:9:2716:9 | e |  | main.rs:2695:5:2696:16 | S1 |
+| main.rs:2716:9:2716:15 | e.foo() |  | file://:0:0:0:0 | () |
+| main.rs:2717:9:2717:9 | f |  | main.rs:2695:5:2696:16 | S1 |
+| main.rs:2717:9:2717:15 | f.foo() |  | file://:0:0:0:0 | () |
+| main.rs:2718:9:2718:9 | g |  | main.rs:2695:5:2696:16 | S1 |
+| main.rs:2718:9:2718:15 | g.foo() |  | file://:0:0:0:0 | () |
+| main.rs:2719:9:2719:9 | h |  | main.rs:2695:5:2696:16 | S1 |
+| main.rs:2719:9:2719:15 | h.foo() |  | file://:0:0:0:0 | () |
+| main.rs:2724:13:2724:13 | a |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2724:17:2724:34 | ...::default(...) |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2725:13:2725:13 | b |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2725:17:2725:34 | ...::default(...) |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2726:13:2726:16 | pair |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2726:13:2726:16 | pair | 0(2) | {EXTERNAL LOCATION} | i64 |
+| main.rs:2726:13:2726:16 | pair | 1(2) | {EXTERNAL LOCATION} | bool |
+| main.rs:2726:20:2726:25 | TupleExpr |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2726:20:2726:25 | TupleExpr | 0(2) | {EXTERNAL LOCATION} | i64 |
+| main.rs:2726:20:2726:25 | TupleExpr | 1(2) | {EXTERNAL LOCATION} | bool |
+| main.rs:2726:21:2726:21 | a |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2726:24:2726:24 | b |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2727:13:2727:13 | i |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2727:22:2727:25 | pair |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2727:22:2727:25 | pair | 0(2) | {EXTERNAL LOCATION} | i64 |
+| main.rs:2727:22:2727:25 | pair | 1(2) | {EXTERNAL LOCATION} | bool |
+| main.rs:2727:22:2727:27 | pair.0 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2728:13:2728:13 | j |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2728:23:2728:26 | pair |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2728:23:2728:26 | pair | 0(2) | {EXTERNAL LOCATION} | i64 |
+| main.rs:2728:23:2728:26 | pair | 1(2) | {EXTERNAL LOCATION} | bool |
+| main.rs:2728:23:2728:28 | pair.1 |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2730:13:2730:16 | pair |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2730:13:2730:16 | pair | 0(2) | {EXTERNAL LOCATION} | i32 |
+| main.rs:2730:13:2730:16 | pair | 1(2) | {EXTERNAL LOCATION} | i32 |
+| main.rs:2730:20:2730:25 | [...] |  | file://:0:0:0:0 | [] |
+| main.rs:2730:20:2730:25 | [...] | [T;...] | {EXTERNAL LOCATION} | i32 |
+| main.rs:2730:20:2730:32 | ... .into() |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2730:20:2730:32 | ... .into() | 0(2) | {EXTERNAL LOCATION} | i32 |
+| main.rs:2730:20:2730:32 | ... .into() | 1(2) | {EXTERNAL LOCATION} | i32 |
+| main.rs:2730:21:2730:21 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2730:24:2730:24 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2731:9:2734:9 | match pair { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2731:15:2731:18 | pair |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2731:15:2731:18 | pair | 0(2) | {EXTERNAL LOCATION} | i32 |
+| main.rs:2731:15:2731:18 | pair | 1(2) | {EXTERNAL LOCATION} | i32 |
+| main.rs:2732:13:2732:18 | TuplePat |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2732:13:2732:18 | TuplePat | 0(2) | {EXTERNAL LOCATION} | i32 |
+| main.rs:2732:13:2732:18 | TuplePat | 1(2) | {EXTERNAL LOCATION} | i32 |
+| main.rs:2732:14:2732:14 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2732:17:2732:17 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2732:23:2732:42 | MacroExpr |  | file://:0:0:0:0 | () |
+| main.rs:2732:30:2732:41 | "unexpected" |  | file://:0:0:0:0 | & |
+| main.rs:2732:30:2732:41 | "unexpected" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:2732:30:2732:41 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:2732:30:2732:41 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2733:13:2733:13 | _ |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2733:13:2733:13 | _ | 0(2) | {EXTERNAL LOCATION} | i32 |
+| main.rs:2733:13:2733:13 | _ | 1(2) | {EXTERNAL LOCATION} | i32 |
+| main.rs:2733:18:2733:35 | MacroExpr |  | file://:0:0:0:0 | () |
+| main.rs:2733:25:2733:34 | "expected" |  | file://:0:0:0:0 | & |
+| main.rs:2733:25:2733:34 | "expected" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:2733:25:2733:34 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:2733:25:2733:34 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2735:13:2735:13 | x |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2735:17:2735:20 | pair |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2735:17:2735:20 | pair | 0(2) | {EXTERNAL LOCATION} | i32 |
+| main.rs:2735:17:2735:20 | pair | 1(2) | {EXTERNAL LOCATION} | i32 |
+| main.rs:2735:17:2735:22 | pair.0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2737:13:2737:13 | y |  | file://:0:0:0:0 | & |
+| main.rs:2737:13:2737:13 | y | &T | file://:0:0:0:0 | (T_2) |
+| main.rs:2737:13:2737:13 | y | &T.0(2) | main.rs:2695:5:2696:16 | S1 |
+| main.rs:2737:13:2737:13 | y | &T.1(2) | main.rs:2695:5:2696:16 | S1 |
+| main.rs:2737:17:2737:31 | &... |  | file://:0:0:0:0 | & |
+| main.rs:2737:17:2737:31 | &... | &T | file://:0:0:0:0 | (T_2) |
+| main.rs:2737:17:2737:31 | &... | &T.0(2) | main.rs:2695:5:2696:16 | S1 |
+| main.rs:2737:17:2737:31 | &... | &T.1(2) | main.rs:2695:5:2696:16 | S1 |
+| main.rs:2737:18:2737:31 | ...::get_pair(...) |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2737:18:2737:31 | ...::get_pair(...) | 0(2) | main.rs:2695:5:2696:16 | S1 |
+| main.rs:2737:18:2737:31 | ...::get_pair(...) | 1(2) | main.rs:2695:5:2696:16 | S1 |
+| main.rs:2738:9:2738:9 | y |  | file://:0:0:0:0 | & |
+| main.rs:2738:9:2738:9 | y | &T | file://:0:0:0:0 | (T_2) |
+| main.rs:2738:9:2738:9 | y | &T.0(2) | main.rs:2695:5:2696:16 | S1 |
+| main.rs:2738:9:2738:9 | y | &T.1(2) | main.rs:2695:5:2696:16 | S1 |
+| main.rs:2738:9:2738:11 | y.0 |  | main.rs:2695:5:2696:16 | S1 |
+| main.rs:2738:9:2738:17 | ... .foo() |  | file://:0:0:0:0 | () |
+| main.rs:2744:27:2766:5 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2745:13:2745:23 | boxed_value |  | {EXTERNAL LOCATION} | Box |
+| main.rs:2745:13:2745:23 | boxed_value | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2745:13:2745:23 | boxed_value | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2745:27:2745:42 | ...::new(...) |  | {EXTERNAL LOCATION} | Box |
+| main.rs:2745:27:2745:42 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2745:27:2745:42 | ...::new(...) | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2745:36:2745:41 | 100i32 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2748:9:2756:9 | match boxed_value { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2748:15:2748:25 | boxed_value |  | {EXTERNAL LOCATION} | Box |
+| main.rs:2748:15:2748:25 | boxed_value | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2748:15:2748:25 | boxed_value | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2749:13:2749:19 | box 100 |  | {EXTERNAL LOCATION} | Box |
+| main.rs:2749:13:2749:19 | box 100 | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2749:13:2749:19 | box 100 | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2749:17:2749:19 | 100 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2749:24:2751:13 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2750:26:2750:36 | "Boxed 100\\n" |  | file://:0:0:0:0 | & |
+| main.rs:2750:26:2750:36 | "Boxed 100\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:2750:26:2750:36 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:2750:26:2750:36 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2752:13:2752:17 | box ... |  | {EXTERNAL LOCATION} | Box |
+| main.rs:2752:13:2752:17 | box ... | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2752:13:2752:17 | box ... | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2752:22:2755:13 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2754:26:2754:42 | "Boxed value: {}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:2754:26:2754:42 | "Boxed value: {}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:2754:26:2754:51 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:2754:26:2754:51 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2759:13:2759:22 | nested_box |  | {EXTERNAL LOCATION} | Box |
+| main.rs:2759:13:2759:22 | nested_box | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2759:13:2759:22 | nested_box | T | {EXTERNAL LOCATION} | Box |
+| main.rs:2759:13:2759:22 | nested_box | T.A | {EXTERNAL LOCATION} | Global |
+| main.rs:2759:13:2759:22 | nested_box | T.T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2759:26:2759:50 | ...::new(...) |  | {EXTERNAL LOCATION} | Box |
+| main.rs:2759:26:2759:50 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2759:26:2759:50 | ...::new(...) | T | {EXTERNAL LOCATION} | Box |
+| main.rs:2759:26:2759:50 | ...::new(...) | T.A | {EXTERNAL LOCATION} | Global |
+| main.rs:2759:26:2759:50 | ...::new(...) | T.T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2759:35:2759:49 | ...::new(...) |  | {EXTERNAL LOCATION} | Box |
+| main.rs:2759:35:2759:49 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2759:35:2759:49 | ...::new(...) | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2759:44:2759:48 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2760:9:2765:9 | match nested_box { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2760:15:2760:24 | nested_box |  | {EXTERNAL LOCATION} | Box |
+| main.rs:2760:15:2760:24 | nested_box | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2760:15:2760:24 | nested_box | T | {EXTERNAL LOCATION} | Box |
+| main.rs:2760:15:2760:24 | nested_box | T.A | {EXTERNAL LOCATION} | Global |
+| main.rs:2760:15:2760:24 | nested_box | T.T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2761:13:2761:21 | box ... |  | {EXTERNAL LOCATION} | Box |
+| main.rs:2761:13:2761:21 | box ... | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2761:13:2761:21 | box ... | T | {EXTERNAL LOCATION} | Box |
+| main.rs:2761:13:2761:21 | box ... | T.A | {EXTERNAL LOCATION} | Global |
+| main.rs:2761:13:2761:21 | box ... | T.T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2761:26:2764:13 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2763:26:2763:43 | "Nested boxed: {}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:2763:26:2763:43 | "Nested boxed: {}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:2763:26:2763:59 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:2763:26:2763:59 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2775:36:2777:9 | { ... } |  | main.rs:2772:5:2772:22 | Path |
+| main.rs:2776:13:2776:19 | Path {...} |  | main.rs:2772:5:2772:22 | Path |
+| main.rs:2779:29:2779:33 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:2779:29:2779:33 | SelfParam | &T | main.rs:2772:5:2772:22 | Path |
+| main.rs:2779:59:2781:9 | { ... } |  | {EXTERNAL LOCATION} | Result |
+| main.rs:2779:59:2781:9 | { ... } | E | file://:0:0:0:0 | () |
+| main.rs:2779:59:2781:9 | { ... } | T | main.rs:2784:5:2784:25 | PathBuf |
+| main.rs:2780:13:2780:30 | Ok(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:2780:13:2780:30 | Ok(...) | E | file://:0:0:0:0 | () |
+| main.rs:2780:13:2780:30 | Ok(...) | T | main.rs:2784:5:2784:25 | PathBuf |
+| main.rs:2780:16:2780:29 | ...::new(...) |  | main.rs:2784:5:2784:25 | PathBuf |
+| main.rs:2787:39:2789:9 | { ... } |  | main.rs:2784:5:2784:25 | PathBuf |
+| main.rs:2788:13:2788:22 | PathBuf {...} |  | main.rs:2784:5:2784:25 | PathBuf |
+| main.rs:2797:18:2797:22 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:2797:18:2797:22 | SelfParam | &T | main.rs:2784:5:2784:25 | PathBuf |
+| main.rs:2797:34:2801:9 | { ... } |  | file://:0:0:0:0 | & |
+| main.rs:2797:34:2801:9 | { ... } | &T | main.rs:2772:5:2772:22 | Path |
+| main.rs:2799:33:2799:43 | ...::new(...) |  | main.rs:2772:5:2772:22 | Path |
+| main.rs:2800:13:2800:17 | &path |  | file://:0:0:0:0 | & |
+| main.rs:2800:13:2800:17 | &path | &T | main.rs:2772:5:2772:22 | Path |
+| main.rs:2800:14:2800:17 | path |  | main.rs:2772:5:2772:22 | Path |
+| main.rs:2804:16:2812:5 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2805:13:2805:17 | path1 |  | main.rs:2772:5:2772:22 | Path |
+| main.rs:2805:21:2805:31 | ...::new(...) |  | main.rs:2772:5:2772:22 | Path |
+| main.rs:2806:13:2806:17 | path2 |  | {EXTERNAL LOCATION} | Result |
+| main.rs:2806:13:2806:17 | path2 | E | file://:0:0:0:0 | () |
+| main.rs:2806:13:2806:17 | path2 | T | main.rs:2784:5:2784:25 | PathBuf |
+| main.rs:2806:21:2806:25 | path1 |  | main.rs:2772:5:2772:22 | Path |
+| main.rs:2806:21:2806:40 | path1.canonicalize() |  | {EXTERNAL LOCATION} | Result |
+| main.rs:2806:21:2806:40 | path1.canonicalize() | E | file://:0:0:0:0 | () |
+| main.rs:2806:21:2806:40 | path1.canonicalize() | T | main.rs:2784:5:2784:25 | PathBuf |
+| main.rs:2807:13:2807:17 | path3 |  | main.rs:2784:5:2784:25 | PathBuf |
+| main.rs:2807:21:2807:25 | path2 |  | {EXTERNAL LOCATION} | Result |
+| main.rs:2807:21:2807:25 | path2 | E | file://:0:0:0:0 | () |
+| main.rs:2807:21:2807:25 | path2 | T | main.rs:2784:5:2784:25 | PathBuf |
+| main.rs:2807:21:2807:34 | path2.unwrap() |  | main.rs:2784:5:2784:25 | PathBuf |
+| main.rs:2809:13:2809:20 | pathbuf1 |  | main.rs:2784:5:2784:25 | PathBuf |
+| main.rs:2809:24:2809:37 | ...::new(...) |  | main.rs:2784:5:2784:25 | PathBuf |
+| main.rs:2810:24:2810:31 | pathbuf1 |  | main.rs:2784:5:2784:25 | PathBuf |
+| main.rs:2817:14:2817:18 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:2817:14:2817:18 | SelfParam | &T | main.rs:2816:5:2818:5 | Self [trait MyTrait] |
+| main.rs:2824:14:2824:18 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:2824:14:2824:18 | SelfParam | &T | main.rs:2820:5:2821:19 | S |
+| main.rs:2824:14:2824:18 | SelfParam | &T.T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2824:28:2826:9 | { ... } |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2825:13:2825:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:2825:13:2825:16 | self | &T | main.rs:2820:5:2821:19 | S |
+| main.rs:2825:13:2825:16 | self | &T.T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2825:13:2825:18 | self.0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2830:14:2830:18 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:2830:14:2830:18 | SelfParam | &T | main.rs:2820:5:2821:19 | S |
+| main.rs:2830:14:2830:18 | SelfParam | &T.T | main.rs:2820:5:2821:19 | S |
+| main.rs:2830:14:2830:18 | SelfParam | &T.T.T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2830:28:2832:9 | { ... } |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2831:13:2831:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:2831:13:2831:16 | self | &T | main.rs:2820:5:2821:19 | S |
+| main.rs:2831:13:2831:16 | self | &T.T | main.rs:2820:5:2821:19 | S |
+| main.rs:2831:13:2831:16 | self | &T.T.T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2831:13:2831:18 | self.0 |  | main.rs:2820:5:2821:19 | S |
+| main.rs:2831:13:2831:18 | self.0 | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2831:13:2831:21 | ... .0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2836:15:2836:19 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:2836:15:2836:19 | SelfParam | &T | main.rs:2820:5:2821:19 | S |
+| main.rs:2836:15:2836:19 | SelfParam | &T.T | main.rs:2835:10:2835:16 | T |
+| main.rs:2836:33:2838:9 | { ... } |  | main.rs:2820:5:2821:19 | S |
+| main.rs:2836:33:2838:9 | { ... } | T | main.rs:2820:5:2821:19 | S |
+| main.rs:2836:33:2838:9 | { ... } | T.T | main.rs:2835:10:2835:16 | T |
+| main.rs:2837:13:2837:24 | S(...) |  | main.rs:2820:5:2821:19 | S |
+| main.rs:2837:13:2837:24 | S(...) | T | main.rs:2820:5:2821:19 | S |
+| main.rs:2837:13:2837:24 | S(...) | T.T | main.rs:2835:10:2835:16 | T |
+| main.rs:2837:15:2837:23 | S(...) |  | main.rs:2820:5:2821:19 | S |
+| main.rs:2837:15:2837:23 | S(...) | T | main.rs:2835:10:2835:16 | T |
+| main.rs:2837:17:2837:20 | self |  | file://:0:0:0:0 | & |
+| main.rs:2837:17:2837:20 | self | &T | main.rs:2820:5:2821:19 | S |
+| main.rs:2837:17:2837:20 | self | &T.T | main.rs:2835:10:2835:16 | T |
+| main.rs:2837:17:2837:22 | self.0 |  | main.rs:2835:10:2835:16 | T |
+| main.rs:2841:14:2841:14 | b |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2841:48:2858:5 | { ... } |  | {EXTERNAL LOCATION} | Box |
+| main.rs:2841:48:2858:5 | { ... } | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2841:48:2858:5 | { ... } | T | main.rs:2816:5:2818:5 | dyn MyTrait |
+| main.rs:2841:48:2858:5 | { ... } | T.dyn(T) | {EXTERNAL LOCATION} | i32 |
+| main.rs:2842:13:2842:13 | x |  | main.rs:2820:5:2821:19 | S |
+| main.rs:2842:13:2842:13 | x | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2842:17:2847:9 | if b {...} else {...} |  | main.rs:2820:5:2821:19 | S |
+| main.rs:2842:17:2847:9 | if b {...} else {...} | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2842:20:2842:20 | b |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2842:22:2845:9 | { ... } |  | main.rs:2820:5:2821:19 | S |
+| main.rs:2842:22:2845:9 | { ... } | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2843:17:2843:17 | y |  | main.rs:2820:5:2821:19 | S |
+| main.rs:2843:17:2843:17 | y | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2843:21:2843:38 | ...::default(...) |  | main.rs:2820:5:2821:19 | S |
+| main.rs:2843:21:2843:38 | ...::default(...) | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2844:13:2844:13 | y |  | main.rs:2820:5:2821:19 | S |
+| main.rs:2844:13:2844:13 | y | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2845:16:2847:9 | { ... } |  | main.rs:2820:5:2821:19 | S |
+| main.rs:2845:16:2847:9 | { ... } | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2846:13:2846:16 | S(...) |  | main.rs:2820:5:2821:19 | S |
+| main.rs:2846:13:2846:16 | S(...) | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2846:15:2846:15 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2851:13:2851:13 | x |  | main.rs:2820:5:2821:19 | S |
+| main.rs:2851:13:2851:13 | x | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2851:17:2851:20 | S(...) |  | main.rs:2820:5:2821:19 | S |
+| main.rs:2851:17:2851:20 | S(...) | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2851:19:2851:19 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2852:9:2857:9 | if b {...} else {...} |  | {EXTERNAL LOCATION} | Box |
+| main.rs:2852:9:2857:9 | if b {...} else {...} | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2852:9:2857:9 | if b {...} else {...} | T | main.rs:2816:5:2818:5 | dyn MyTrait |
+| main.rs:2852:9:2857:9 | if b {...} else {...} | T | main.rs:2820:5:2821:19 | S |
+| main.rs:2852:9:2857:9 | if b {...} else {...} | T.T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2852:9:2857:9 | if b {...} else {...} | T.T | main.rs:2820:5:2821:19 | S |
+| main.rs:2852:9:2857:9 | if b {...} else {...} | T.T.T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2852:9:2857:9 | if b {...} else {...} | T.dyn(T) | {EXTERNAL LOCATION} | i32 |
+| main.rs:2852:12:2852:12 | b |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2852:14:2855:9 | { ... } |  | {EXTERNAL LOCATION} | Box |
+| main.rs:2852:14:2855:9 | { ... } | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2852:14:2855:9 | { ... } | T | main.rs:2816:5:2818:5 | dyn MyTrait |
+| main.rs:2852:14:2855:9 | { ... } | T | main.rs:2820:5:2821:19 | S |
+| main.rs:2852:14:2855:9 | { ... } | T.T | main.rs:2820:5:2821:19 | S |
+| main.rs:2852:14:2855:9 | { ... } | T.T.T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2852:14:2855:9 | { ... } | T.dyn(T) | {EXTERNAL LOCATION} | i32 |
+| main.rs:2853:17:2853:17 | x |  | main.rs:2820:5:2821:19 | S |
+| main.rs:2853:17:2853:17 | x | T | main.rs:2820:5:2821:19 | S |
+| main.rs:2853:17:2853:17 | x | T.T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2853:21:2853:21 | x |  | main.rs:2820:5:2821:19 | S |
+| main.rs:2853:21:2853:21 | x | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2853:21:2853:26 | x.m2() |  | main.rs:2820:5:2821:19 | S |
+| main.rs:2853:21:2853:26 | x.m2() | T | main.rs:2820:5:2821:19 | S |
+| main.rs:2853:21:2853:26 | x.m2() | T.T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2854:13:2854:23 | ...::new(...) |  | {EXTERNAL LOCATION} | Box |
+| main.rs:2854:13:2854:23 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2854:13:2854:23 | ...::new(...) | T | main.rs:2816:5:2818:5 | dyn MyTrait |
+| main.rs:2854:13:2854:23 | ...::new(...) | T | main.rs:2820:5:2821:19 | S |
+| main.rs:2854:13:2854:23 | ...::new(...) | T.T | main.rs:2820:5:2821:19 | S |
+| main.rs:2854:13:2854:23 | ...::new(...) | T.T.T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2854:13:2854:23 | ...::new(...) | T.dyn(T) | {EXTERNAL LOCATION} | i32 |
+| main.rs:2854:22:2854:22 | x |  | main.rs:2820:5:2821:19 | S |
+| main.rs:2854:22:2854:22 | x | T | main.rs:2820:5:2821:19 | S |
+| main.rs:2854:22:2854:22 | x | T.T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2855:16:2857:9 | { ... } |  | {EXTERNAL LOCATION} | Box |
+| main.rs:2855:16:2857:9 | { ... } | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2855:16:2857:9 | { ... } | T | main.rs:2816:5:2818:5 | dyn MyTrait |
+| main.rs:2855:16:2857:9 | { ... } | T | main.rs:2820:5:2821:19 | S |
+| main.rs:2855:16:2857:9 | { ... } | T.T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2855:16:2857:9 | { ... } | T.dyn(T) | {EXTERNAL LOCATION} | i32 |
+| main.rs:2856:13:2856:23 | ...::new(...) |  | {EXTERNAL LOCATION} | Box |
+| main.rs:2856:13:2856:23 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2856:13:2856:23 | ...::new(...) | T | main.rs:2816:5:2818:5 | dyn MyTrait |
+| main.rs:2856:13:2856:23 | ...::new(...) | T | main.rs:2820:5:2821:19 | S |
+| main.rs:2856:13:2856:23 | ...::new(...) | T.T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2856:13:2856:23 | ...::new(...) | T.dyn(T) | {EXTERNAL LOCATION} | i32 |
+| main.rs:2856:22:2856:22 | x |  | main.rs:2820:5:2821:19 | S |
+| main.rs:2856:22:2856:22 | x | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2862:22:2866:5 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2863:18:2863:18 | x |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2863:33:2865:9 | { ... } |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2864:13:2864:13 | x |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2864:13:2864:17 | ... + ... |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2864:17:2864:17 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2871:11:2871:14 | cond |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2871:30:2879:5 | { ... } |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2873:13:2873:13 | a |  | file://:0:0:0:0 | () |
+| main.rs:2873:17:2877:9 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2874:13:2876:13 | if cond {...} |  | file://:0:0:0:0 | () |
+| main.rs:2874:16:2874:19 | cond |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2874:21:2876:13 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2875:24:2875:25 | 12 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2878:9:2878:9 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2882:20:2889:5 | { ... } |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2885:26:2885:27 | 12 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2887:18:2887:26 | "b: {:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:2887:18:2887:26 | "b: {:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:2887:18:2887:29 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:2887:18:2887:29 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2888:9:2888:9 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2891:20:2893:5 | { ... } |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2892:16:2892:16 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2896:11:2896:14 | cond |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2896:30:2904:5 | { ... } |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2897:13:2897:13 | a |  | file://:0:0:0:0 | () |
+| main.rs:2897:17:2901:9 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2898:13:2900:13 | if cond {...} |  | file://:0:0:0:0 | () |
+| main.rs:2898:16:2898:19 | cond |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2898:21:2900:13 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2899:24:2899:25 | 12 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2902:18:2902:26 | "a: {:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:2902:18:2902:26 | "a: {:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:2902:18:2902:29 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| main.rs:2902:18:2902:29 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2902:29:2902:29 | a |  | file://:0:0:0:0 | () |
+| main.rs:2903:9:2903:9 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2908:16:2955:5 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2909:13:2909:13 | x |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2909:13:2909:13 | x | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2909:17:2909:20 | None |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2909:17:2909:20 | None | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2910:13:2910:13 | x |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2910:13:2910:13 | x | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2910:30:2910:30 | x |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2910:30:2910:30 | x | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2911:13:2911:13 | x |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2911:13:2911:13 | x | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2911:17:2911:35 | ...::None |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2911:17:2911:35 | ...::None | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2912:13:2912:13 | x |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2912:13:2912:13 | x | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2912:17:2912:35 | ...::None::<...> |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2912:17:2912:35 | ...::None::<...> | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2914:26:2914:28 | opt |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2914:26:2914:28 | opt | T | main.rs:2914:23:2914:23 | T |
+| main.rs:2914:42:2914:42 | x |  | main.rs:2914:23:2914:23 | T |
+| main.rs:2914:48:2914:49 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2916:13:2916:13 | x |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2916:13:2916:13 | x | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2916:17:2916:20 | None |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2916:17:2916:20 | None | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2917:9:2917:24 | pin_option(...) |  | file://:0:0:0:0 | () |
+| main.rs:2917:20:2917:20 | x |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2917:20:2917:20 | x | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2917:23:2917:23 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2924:13:2924:13 | x |  | main.rs:2919:9:2922:9 | MyEither |
+| main.rs:2924:13:2924:13 | x | T1 | {EXTERNAL LOCATION} | i32 |
+| main.rs:2924:13:2924:13 | x | T2 | {EXTERNAL LOCATION} | String |
+| main.rs:2924:17:2924:39 | ...::A {...} |  | main.rs:2919:9:2922:9 | MyEither |
+| main.rs:2924:17:2924:39 | ...::A {...} | T1 | {EXTERNAL LOCATION} | i32 |
+| main.rs:2924:17:2924:39 | ...::A {...} | T2 | {EXTERNAL LOCATION} | String |
+| main.rs:2924:37:2924:37 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2925:13:2925:13 | x |  | main.rs:2919:9:2922:9 | MyEither |
+| main.rs:2925:13:2925:13 | x | T1 | {EXTERNAL LOCATION} | i32 |
+| main.rs:2925:13:2925:13 | x | T2 | {EXTERNAL LOCATION} | String |
+| main.rs:2925:40:2925:40 | x |  | main.rs:2919:9:2922:9 | MyEither |
+| main.rs:2925:40:2925:40 | x | T1 | {EXTERNAL LOCATION} | i32 |
+| main.rs:2925:40:2925:40 | x | T2 | {EXTERNAL LOCATION} | String |
+| main.rs:2926:13:2926:13 | x |  | main.rs:2919:9:2922:9 | MyEither |
+| main.rs:2926:13:2926:13 | x | T1 | {EXTERNAL LOCATION} | i32 |
+| main.rs:2926:13:2926:13 | x | T2 | {EXTERNAL LOCATION} | String |
+| main.rs:2926:17:2926:52 | ...::A {...} |  | main.rs:2919:9:2922:9 | MyEither |
+| main.rs:2926:17:2926:52 | ...::A {...} | T1 | {EXTERNAL LOCATION} | i32 |
+| main.rs:2926:17:2926:52 | ...::A {...} | T2 | {EXTERNAL LOCATION} | String |
+| main.rs:2926:50:2926:50 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2928:13:2928:13 | x |  | main.rs:2919:9:2922:9 | MyEither |
+| main.rs:2928:13:2928:13 | x | T1 | {EXTERNAL LOCATION} | i32 |
+| main.rs:2928:13:2928:13 | x | T2 | {EXTERNAL LOCATION} | String |
+| main.rs:2928:17:2930:9 | ...::B::<...> {...} |  | main.rs:2919:9:2922:9 | MyEither |
+| main.rs:2928:17:2930:9 | ...::B::<...> {...} | T1 | {EXTERNAL LOCATION} | i32 |
+| main.rs:2928:17:2930:9 | ...::B::<...> {...} | T2 | {EXTERNAL LOCATION} | String |
+| main.rs:2929:20:2929:32 | ...::new(...) |  | {EXTERNAL LOCATION} | String |
+| main.rs:2932:29:2932:29 | e |  | main.rs:2919:9:2922:9 | MyEither |
+| main.rs:2932:29:2932:29 | e | T1 | main.rs:2932:26:2932:26 | T |
+| main.rs:2932:29:2932:29 | e | T2 | {EXTERNAL LOCATION} | String |
+| main.rs:2932:53:2932:53 | x |  | main.rs:2932:26:2932:26 | T |
+| main.rs:2932:59:2932:60 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2935:13:2935:13 | x |  | main.rs:2919:9:2922:9 | MyEither |
+| main.rs:2935:13:2935:13 | x | T1 | {EXTERNAL LOCATION} | i32 |
+| main.rs:2935:13:2935:13 | x | T2 | {EXTERNAL LOCATION} | String |
+| main.rs:2935:17:2937:9 | ...::B {...} |  | main.rs:2919:9:2922:9 | MyEither |
+| main.rs:2935:17:2937:9 | ...::B {...} | T1 | {EXTERNAL LOCATION} | i32 |
+| main.rs:2935:17:2937:9 | ...::B {...} | T2 | {EXTERNAL LOCATION} | String |
+| main.rs:2936:20:2936:32 | ...::new(...) |  | {EXTERNAL LOCATION} | String |
+| main.rs:2938:9:2938:27 | pin_my_either(...) |  | file://:0:0:0:0 | () |
+| main.rs:2938:23:2938:23 | x |  | main.rs:2919:9:2922:9 | MyEither |
+| main.rs:2938:23:2938:23 | x | T1 | {EXTERNAL LOCATION} | i32 |
+| main.rs:2938:23:2938:23 | x | T2 | {EXTERNAL LOCATION} | String |
+| main.rs:2938:26:2938:26 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2940:13:2940:13 | x |  | {EXTERNAL LOCATION} | Result |
+| main.rs:2940:13:2940:13 | x | E | {EXTERNAL LOCATION} | String |
+| main.rs:2940:13:2940:13 | x | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2940:17:2940:29 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:2940:17:2940:29 | ...::Ok(...) | E | {EXTERNAL LOCATION} | String |
+| main.rs:2940:17:2940:29 | ...::Ok(...) | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2940:28:2940:28 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2941:13:2941:13 | x |  | {EXTERNAL LOCATION} | Result |
+| main.rs:2941:13:2941:13 | x | E | {EXTERNAL LOCATION} | String |
+| main.rs:2941:13:2941:13 | x | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2941:38:2941:38 | x |  | {EXTERNAL LOCATION} | Result |
+| main.rs:2941:38:2941:38 | x | E | {EXTERNAL LOCATION} | String |
+| main.rs:2941:38:2941:38 | x | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2942:13:2942:13 | x |  | {EXTERNAL LOCATION} | Result |
+| main.rs:2942:13:2942:13 | x | E | {EXTERNAL LOCATION} | String |
+| main.rs:2942:13:2942:13 | x | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2942:17:2942:44 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:2942:17:2942:44 | ...::Ok(...) | E | {EXTERNAL LOCATION} | String |
+| main.rs:2942:17:2942:44 | ...::Ok(...) | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2942:43:2942:43 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2943:13:2943:13 | x |  | {EXTERNAL LOCATION} | Result |
+| main.rs:2943:13:2943:13 | x | E | {EXTERNAL LOCATION} | String |
+| main.rs:2943:13:2943:13 | x | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2943:17:2943:44 | ...::Ok::<...>(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:2943:17:2943:44 | ...::Ok::<...>(...) | E | {EXTERNAL LOCATION} | String |
+| main.rs:2943:17:2943:44 | ...::Ok::<...>(...) | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2943:43:2943:43 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2945:29:2945:31 | res |  | {EXTERNAL LOCATION} | Result |
+| main.rs:2945:29:2945:31 | res | E | main.rs:2945:26:2945:26 | E |
+| main.rs:2945:29:2945:31 | res | T | main.rs:2945:23:2945:23 | T |
+| main.rs:2945:48:2945:48 | x |  | main.rs:2945:26:2945:26 | E |
+| main.rs:2945:54:2945:55 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2947:13:2947:13 | x |  | {EXTERNAL LOCATION} | Result |
+| main.rs:2947:13:2947:13 | x | E | {EXTERNAL LOCATION} | bool |
+| main.rs:2947:13:2947:13 | x | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2947:17:2947:29 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:2947:17:2947:29 | ...::Ok(...) | E | {EXTERNAL LOCATION} | bool |
+| main.rs:2947:17:2947:29 | ...::Ok(...) | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2947:28:2947:28 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2948:9:2948:28 | pin_result(...) |  | file://:0:0:0:0 | () |
+| main.rs:2948:20:2948:20 | x |  | {EXTERNAL LOCATION} | Result |
+| main.rs:2948:20:2948:20 | x | E | {EXTERNAL LOCATION} | bool |
+| main.rs:2948:20:2948:20 | x | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2948:23:2948:27 | false |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2950:17:2950:17 | x |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2950:17:2950:17 | x | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2950:17:2950:17 | x | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2950:21:2950:30 | ...::new(...) |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2950:21:2950:30 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2950:21:2950:30 | ...::new(...) | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2951:9:2951:9 | x |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2951:9:2951:9 | x | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2951:9:2951:9 | x | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2951:9:2951:17 | x.push(...) |  | file://:0:0:0:0 | () |
+| main.rs:2951:16:2951:16 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2953:13:2953:13 | y |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2953:17:2953:34 | ...::default(...) |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2954:9:2954:9 | x |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2954:9:2954:9 | x | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2954:9:2954:9 | x | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2954:9:2954:17 | x.push(...) |  | file://:0:0:0:0 | () |
+| main.rs:2954:16:2954:16 | y |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2963:11:2998:1 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2964:5:2964:21 | ...::f(...) |  | file://:0:0:0:0 | () |
+| main.rs:2965:5:2965:20 | ...::f(...) |  | main.rs:72:5:72:21 | Foo |
+| main.rs:2966:5:2966:60 | ...::g(...) |  | main.rs:72:5:72:21 | Foo |
+| main.rs:2966:20:2966:38 | ...::Foo {...} |  | main.rs:72:5:72:21 | Foo |
+| main.rs:2966:41:2966:59 | ...::Foo {...} |  | main.rs:72:5:72:21 | Foo |
+| main.rs:2967:5:2967:35 | ...::f(...) |  | file://:0:0:0:0 | () |
+| main.rs:2968:5:2968:41 | ...::f(...) |  | file://:0:0:0:0 | () |
+| main.rs:2969:5:2969:45 | ...::test(...) |  | file://:0:0:0:0 | () |
+| main.rs:2970:5:2970:30 | ...::f(...) |  | file://:0:0:0:0 | () |
+| main.rs:2971:5:2971:33 | ...::f(...) |  | file://:0:0:0:0 | () |
+| main.rs:2972:5:2972:21 | ...::f(...) |  | file://:0:0:0:0 | () |
+| main.rs:2973:5:2973:27 | ...::f(...) |  | file://:0:0:0:0 | () |
+| main.rs:2974:5:2974:32 | ...::f(...) |  | file://:0:0:0:0 | () |
+| main.rs:2975:5:2975:23 | ...::f(...) |  | file://:0:0:0:0 | () |
+| main.rs:2976:5:2976:36 | ...::f(...) |  | file://:0:0:0:0 | () |
+| main.rs:2977:5:2977:35 | ...::f(...) |  | file://:0:0:0:0 | () |
+| main.rs:2978:5:2978:29 | ...::f(...) |  | file://:0:0:0:0 | () |
+| main.rs:2979:5:2979:23 | ...::f(...) |  | file://:0:0:0:0 | () |
+| main.rs:2980:5:2980:24 | ...::f(...) |  | file://:0:0:0:0 | () |
+| main.rs:2981:5:2981:17 | ...::f(...) |  | file://:0:0:0:0 | () |
+| main.rs:2982:5:2982:18 | ...::f(...) |  | file://:0:0:0:0 | () |
+| main.rs:2983:5:2983:15 | ...::f(...) |  | {EXTERNAL LOCATION} | trait Future |
+| main.rs:2983:5:2983:15 | ...::f(...) | Output | file://:0:0:0:0 | () |
+| main.rs:2984:5:2984:19 | ...::f(...) |  | file://:0:0:0:0 | () |
+| main.rs:2985:5:2985:17 | ...::f(...) |  | file://:0:0:0:0 | () |
+| main.rs:2986:5:2986:14 | ...::f(...) |  | file://:0:0:0:0 | () |
+| main.rs:2987:5:2987:27 | ...::f(...) |  | file://:0:0:0:0 | () |
+| main.rs:2988:5:2988:15 | ...::f(...) |  | file://:0:0:0:0 | () |
+| main.rs:2989:5:2989:43 | ...::f(...) |  | file://:0:0:0:0 | () |
+| main.rs:2990:5:2990:15 | ...::f(...) |  | file://:0:0:0:0 | () |
+| main.rs:2991:5:2991:17 | ...::f(...) |  | file://:0:0:0:0 | () |
+| main.rs:2992:5:2992:23 | ...::test(...) |  | file://:0:0:0:0 | () |
+| main.rs:2993:5:2993:41 | ...::test_all_patterns(...) |  | file://:0:0:0:0 | () |
+| main.rs:2994:5:2994:49 | ...::box_patterns(...) |  | file://:0:0:0:0 | () |
+| main.rs:2995:5:2995:20 | ...::test(...) |  | file://:0:0:0:0 | () |
+| main.rs:2996:5:2996:20 | ...::f(...) |  | {EXTERNAL LOCATION} | Box |
+| main.rs:2996:5:2996:20 | ...::f(...) | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2996:5:2996:20 | ...::f(...) | T | main.rs:2816:5:2818:5 | dyn MyTrait |
+| main.rs:2996:5:2996:20 | ...::f(...) | T.dyn(T) | {EXTERNAL LOCATION} | i32 |
+| main.rs:2996:16:2996:19 | true |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2997:5:2997:23 | ...::f(...) |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:13:26:133:1 | { ... } |  | {EXTERNAL LOCATION} | Option |
 | pattern_matching.rs:13:26:133:1 | { ... } | T | file://:0:0:0:0 | () |
 | pattern_matching.rs:14:9:14:13 | value |  | {EXTERNAL LOCATION} | Option |
@@ -4962,17 +6369,19 @@ inferType
 | pattern_matching.rs:14:17:14:24 | Some(...) |  | {EXTERNAL LOCATION} | Option |
 | pattern_matching.rs:14:17:14:24 | Some(...) | T | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:14:22:14:23 | 42 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:15:5:18:5 | if ... {...} |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:15:12:15:21 | Some(...) |  | {EXTERNAL LOCATION} | Option |
 | pattern_matching.rs:15:12:15:21 | Some(...) | T | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:15:17:15:20 | mesg |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:15:25:15:29 | value |  | {EXTERNAL LOCATION} | Option |
 | pattern_matching.rs:15:25:15:29 | value | T | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:15:31:18:5 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:16:13:16:16 | mesg |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:16:20:16:23 | mesg |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:17:18:17:25 | "{mesg}\\n" |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:17:18:17:25 | "{mesg}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:17:18:17:25 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:17:18:17:25 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:17:18:17:25 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:17:18:17:25 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:17:20:17:23 | mesg |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:19:5:25:5 | match value { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:19:11:19:15 | value |  | {EXTERNAL LOCATION} | Option |
@@ -4985,8 +6394,8 @@ inferType
 | pattern_matching.rs:21:24:21:27 | mesg |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:22:22:22:29 | "{mesg}\\n" |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:22:22:22:29 | "{mesg}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:22:22:22:29 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:22:22:22:29 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:22:22:22:29 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:22:22:22:29 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:22:24:22:27 | mesg |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:24:9:24:12 | None |  | {EXTERNAL LOCATION} | Option |
 | pattern_matching.rs:24:9:24:12 | None | T | {EXTERNAL LOCATION} | i32 |
@@ -4999,8 +6408,8 @@ inferType
 | pattern_matching.rs:27:16:27:19 | mesg |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:28:14:28:21 | "{mesg}\\n" |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:28:14:28:21 | "{mesg}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:28:14:28:21 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:28:14:28:21 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:28:14:28:21 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:28:14:28:21 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:28:16:28:19 | mesg |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:29:9:29:12 | mesg |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:29:16:29:20 | value |  | {EXTERNAL LOCATION} | Option |
@@ -5008,8 +6417,8 @@ inferType
 | pattern_matching.rs:29:16:29:21 | TryExpr |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:30:14:30:21 | "{mesg}\\n" |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:30:14:30:21 | "{mesg}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:30:14:30:21 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:30:14:30:21 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:30:14:30:21 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:30:14:30:21 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:30:16:30:19 | mesg |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:32:9:32:14 | value2 |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:32:9:32:14 | value2 | &T | {EXTERNAL LOCATION} | Option |
@@ -5020,6 +6429,7 @@ inferType
 | pattern_matching.rs:32:19:32:26 | Some(...) |  | {EXTERNAL LOCATION} | Option |
 | pattern_matching.rs:32:19:32:26 | Some(...) | T | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:32:24:32:25 | 42 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:33:5:36:5 | if ... {...} |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:33:12:33:22 | &... |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:33:12:33:22 | &... | &T | {EXTERNAL LOCATION} | Option |
 | pattern_matching.rs:33:12:33:22 | &... | &T.T | {EXTERNAL LOCATION} | i32 |
@@ -5029,26 +6439,29 @@ inferType
 | pattern_matching.rs:33:26:33:31 | value2 |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:33:26:33:31 | value2 | &T | {EXTERNAL LOCATION} | Option |
 | pattern_matching.rs:33:26:33:31 | value2 | &T.T | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:33:33:36:5 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:34:13:34:16 | mesg |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:34:20:34:23 | mesg |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:35:18:35:25 | "{mesg}\\n" |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:35:18:35:25 | "{mesg}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:35:18:35:25 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:35:18:35:25 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:35:18:35:25 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:35:18:35:25 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:35:20:35:23 | mesg |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:38:9:38:14 | value3 |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:38:18:38:19 | 42 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:39:5:42:5 | if ... {...} |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:39:16:39:19 | mesg |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:39:16:39:19 | mesg | &T | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:39:23:39:28 | value3 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:39:30:42:5 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:40:13:40:16 | mesg |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:40:13:40:16 | mesg | &T | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:40:20:40:23 | mesg |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:40:20:40:23 | mesg | &T | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:41:18:41:25 | "{mesg}\\n" |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:41:18:41:25 | "{mesg}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:41:18:41:25 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:41:18:41:25 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:41:18:41:25 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:41:18:41:25 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:41:20:41:23 | mesg |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:41:20:41:23 | mesg | &T | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:44:9:44:14 | value4 |  | {EXTERNAL LOCATION} | Option |
@@ -5056,20 +6469,22 @@ inferType
 | pattern_matching.rs:44:18:44:25 | Some(...) |  | {EXTERNAL LOCATION} | Option |
 | pattern_matching.rs:44:18:44:25 | Some(...) | T | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:44:23:44:24 | 42 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:45:5:48:5 | if ... {...} |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:45:12:45:25 | Some(...) |  | {EXTERNAL LOCATION} | Option |
 | pattern_matching.rs:45:12:45:25 | Some(...) | T | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:45:21:45:24 | mesg |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:45:21:45:24 | mesg | &T | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:45:29:45:34 | value4 |  | {EXTERNAL LOCATION} | Option |
 | pattern_matching.rs:45:29:45:34 | value4 | T | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:45:36:48:5 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:46:13:46:16 | mesg |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:46:13:46:16 | mesg | &T | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:46:20:46:23 | mesg |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:46:20:46:23 | mesg | &T | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:47:18:47:25 | "{mesg}\\n" |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:47:18:47:25 | "{mesg}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:47:18:47:25 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:47:18:47:25 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:47:18:47:25 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:47:18:47:25 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:47:20:47:23 | mesg |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:47:20:47:23 | mesg | &T | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:50:13:50:18 | value5 |  | file://:0:0:0:0 | & |
@@ -5087,6 +6502,7 @@ inferType
 | pattern_matching.rs:53:28:56:5 | MyRecordStruct {...} | T2 | {EXTERNAL LOCATION} | bool |
 | pattern_matching.rs:54:17:54:18 | 42 |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:55:17:55:21 | false |  | {EXTERNAL LOCATION} | bool |
+| pattern_matching.rs:57:5:61:5 | if ... {...} |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:57:12:57:44 | MyRecordStruct {...} |  | pattern_matching.rs:1:1:4:1 | MyRecordStruct |
 | pattern_matching.rs:57:12:57:44 | MyRecordStruct {...} | T1 | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:57:12:57:44 | MyRecordStruct {...} | T2 | {EXTERNAL LOCATION} | bool |
@@ -5095,6 +6511,7 @@ inferType
 | pattern_matching.rs:57:48:57:63 | my_record_struct |  | pattern_matching.rs:1:1:4:1 | MyRecordStruct |
 | pattern_matching.rs:57:48:57:63 | my_record_struct | T1 | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:57:48:57:63 | my_record_struct | T2 | {EXTERNAL LOCATION} | bool |
+| pattern_matching.rs:57:65:61:5 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:58:13:58:13 | x |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:58:17:58:22 | value1 |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:59:13:59:13 | y |  | {EXTERNAL LOCATION} | bool |
@@ -5108,6 +6525,7 @@ inferType
 | pattern_matching.rs:63:27:63:50 | MyTupleStruct(...) | T2 | {EXTERNAL LOCATION} | bool |
 | pattern_matching.rs:63:41:63:42 | 42 |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:63:45:63:49 | false |  | {EXTERNAL LOCATION} | bool |
+| pattern_matching.rs:64:5:68:5 | if ... {...} |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:64:12:64:40 | MyTupleStruct(...) |  | pattern_matching.rs:6:1:6:37 | MyTupleStruct |
 | pattern_matching.rs:64:12:64:40 | MyTupleStruct(...) | T1 | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:64:12:64:40 | MyTupleStruct(...) | T2 | {EXTERNAL LOCATION} | bool |
@@ -5116,6 +6534,7 @@ inferType
 | pattern_matching.rs:64:44:64:58 | my_tuple_struct |  | pattern_matching.rs:6:1:6:37 | MyTupleStruct |
 | pattern_matching.rs:64:44:64:58 | my_tuple_struct | T1 | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:64:44:64:58 | my_tuple_struct | T2 | {EXTERNAL LOCATION} | bool |
+| pattern_matching.rs:64:60:68:5 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:65:13:65:13 | x |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:65:17:65:22 | value1 |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:66:13:66:13 | y |  | {EXTERNAL LOCATION} | bool |
@@ -5129,6 +6548,7 @@ inferType
 | pattern_matching.rs:70:20:73:5 | ...::Variant1 {...} | T2 | {EXTERNAL LOCATION} | bool |
 | pattern_matching.rs:71:17:71:18 | 42 |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:72:17:72:21 | false |  | {EXTERNAL LOCATION} | bool |
+| pattern_matching.rs:74:5:85:5 | match my_enum1 { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:74:11:74:18 | my_enum1 |  | pattern_matching.rs:8:1:11:1 | MyEnum |
 | pattern_matching.rs:74:11:74:18 | my_enum1 | T1 | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:74:11:74:18 | my_enum1 | T2 | {EXTERNAL LOCATION} | bool |
@@ -5137,6 +6557,7 @@ inferType
 | pattern_matching.rs:75:9:75:43 | ...::Variant1 {...} | T2 | {EXTERNAL LOCATION} | bool |
 | pattern_matching.rs:75:28:75:33 | value1 |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:75:36:75:41 | value2 |  | {EXTERNAL LOCATION} | bool |
+| pattern_matching.rs:75:48:79:9 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:76:17:76:17 | x |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:76:21:76:26 | value1 |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:77:17:77:17 | y |  | {EXTERNAL LOCATION} | bool |
@@ -5147,6 +6568,7 @@ inferType
 | pattern_matching.rs:80:9:80:40 | ...::Variant2(...) | T2 | {EXTERNAL LOCATION} | bool |
 | pattern_matching.rs:80:26:80:31 | value1 |  | {EXTERNAL LOCATION} | bool |
 | pattern_matching.rs:80:34:80:39 | value2 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:80:45:84:9 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:81:17:81:17 | x |  | {EXTERNAL LOCATION} | bool |
 | pattern_matching.rs:81:21:81:26 | value1 |  | {EXTERNAL LOCATION} | bool |
 | pattern_matching.rs:82:17:82:17 | y |  | {EXTERNAL LOCATION} | i32 |
@@ -5215,132 +6637,161 @@ inferType
 | pattern_matching.rs:111:16:111:39 | Some(...) |  | {EXTERNAL LOCATION} | Option |
 | pattern_matching.rs:111:16:111:39 | Some(...) | T | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:111:21:111:38 | ...::default(...) |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:113:9:113:9 | _ |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:113:13:116:5 | if ... {...} |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:113:20:113:33 | Some::<...>(...) |  | {EXTERNAL LOCATION} | Option |
 | pattern_matching.rs:113:20:113:33 | Some::<...>(...) | T | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:113:32:113:32 | x |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:113:37:113:40 | opt1 |  | {EXTERNAL LOCATION} | Option |
 | pattern_matching.rs:113:37:113:40 | opt1 | T | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:114:5:116:5 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:115:9:115:9 | x |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:118:9:118:12 | opt2 |  | {EXTERNAL LOCATION} | Option |
 | pattern_matching.rs:118:9:118:12 | opt2 | T | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:118:16:118:39 | Some(...) |  | {EXTERNAL LOCATION} | Option |
 | pattern_matching.rs:118:16:118:39 | Some(...) | T | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:118:21:118:38 | ...::default(...) |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:120:9:120:9 | _ |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:120:13:123:5 | if ... {...} |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:120:20:120:41 | ...::Some::<...>(...) |  | {EXTERNAL LOCATION} | Option |
 | pattern_matching.rs:120:20:120:41 | ...::Some::<...>(...) | T | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:120:40:120:40 | x |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:120:45:120:48 | opt2 |  | {EXTERNAL LOCATION} | Option |
 | pattern_matching.rs:120:45:120:48 | opt2 | T | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:121:5:123:5 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:122:9:122:9 | x |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:125:9:125:12 | opt3 |  | {EXTERNAL LOCATION} | Option |
 | pattern_matching.rs:125:9:125:12 | opt3 | T | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:125:16:125:39 | Some(...) |  | {EXTERNAL LOCATION} | Option |
 | pattern_matching.rs:125:16:125:39 | Some(...) | T | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:125:21:125:38 | ...::default(...) |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:127:9:127:9 | _ |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:127:13:130:5 | if ... {...} |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:127:20:127:41 | ...::Some(...) |  | {EXTERNAL LOCATION} | Option |
 | pattern_matching.rs:127:20:127:41 | ...::Some(...) | T | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:127:40:127:40 | x |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:127:45:127:48 | opt3 |  | {EXTERNAL LOCATION} | Option |
 | pattern_matching.rs:127:45:127:48 | opt3 | T | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:128:5:130:5 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:129:9:129:9 | x |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:132:5:132:8 | None |  | {EXTERNAL LOCATION} | Option |
 | pattern_matching.rs:132:5:132:8 | None | T | file://:0:0:0:0 | () |
+| pattern_matching.rs:168:27:217:1 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:169:9:169:13 | value |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:169:17:169:21 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:171:5:186:5 | match value { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:171:11:171:15 | value |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:173:9:173:10 | 42 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:173:15:176:9 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:174:17:174:29 | literal_match |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:174:33:174:37 | value |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:175:22:175:42 | "Literal pattern: {}\\n" |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:175:22:175:42 | "Literal pattern: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:175:22:175:57 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:175:22:175:57 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:175:22:175:57 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:175:22:175:57 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:175:45:175:57 | literal_match |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:177:10:177:10 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:177:15:180:9 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:178:17:178:32 | negative_literal |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:178:36:178:40 | value |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:179:22:179:43 | "Negative literal: {}\\n" |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:179:22:179:43 | "Negative literal: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:179:22:179:61 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:179:22:179:61 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:179:22:179:61 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:179:22:179:61 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:179:46:179:61 | negative_literal |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:181:9:181:9 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:181:14:184:9 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:182:17:182:28 | zero_literal |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:182:32:182:36 | value |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:183:22:183:39 | "Zero literal: {}\\n" |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:183:22:183:39 | "Zero literal: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:183:22:183:53 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:183:22:183:53 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:183:22:183:53 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:183:22:183:53 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:183:42:183:53 | zero_literal |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:185:9:185:9 | _ |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:185:14:185:15 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:188:9:188:17 | float_val |  | {EXTERNAL LOCATION} | f64 |
 | pattern_matching.rs:188:21:188:27 | 3.14f64 |  | {EXTERNAL LOCATION} | f64 |
+| pattern_matching.rs:189:5:195:5 | match float_val { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:189:11:189:19 | float_val |  | {EXTERNAL LOCATION} | f64 |
 | pattern_matching.rs:190:9:190:12 | 3.14 |  | {EXTERNAL LOCATION} | f64 |
+| pattern_matching.rs:190:17:193:9 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:191:17:191:24 | pi_match |  | {EXTERNAL LOCATION} | f64 |
 | pattern_matching.rs:191:28:191:36 | float_val |  | {EXTERNAL LOCATION} | f64 |
 | pattern_matching.rs:192:22:192:37 | "Pi matched: {}\\n" |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:192:22:192:37 | "Pi matched: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:192:22:192:47 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:192:22:192:47 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:192:22:192:47 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:192:22:192:47 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:192:40:192:47 | pi_match |  | {EXTERNAL LOCATION} | f64 |
 | pattern_matching.rs:194:9:194:9 | _ |  | {EXTERNAL LOCATION} | f64 |
+| pattern_matching.rs:194:14:194:15 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:197:9:197:18 | string_val |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:197:9:197:18 | string_val | &T | {EXTERNAL LOCATION} | str |
 | pattern_matching.rs:197:22:197:28 | "hello" |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:197:22:197:28 | "hello" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:198:5:204:5 | match string_val { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:198:11:198:20 | string_val |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:198:11:198:20 | string_val | &T | {EXTERNAL LOCATION} | str |
 | pattern_matching.rs:199:9:199:15 | "hello" |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:199:9:199:15 | "hello" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:199:20:202:9 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:200:17:200:27 | hello_match |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:200:17:200:27 | hello_match | &T | {EXTERNAL LOCATION} | str |
 | pattern_matching.rs:200:31:200:40 | string_val |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:200:31:200:40 | string_val | &T | {EXTERNAL LOCATION} | str |
 | pattern_matching.rs:201:22:201:41 | "String literal: {}\\n" |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:201:22:201:41 | "String literal: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:201:22:201:54 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:201:22:201:54 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:201:22:201:54 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:201:22:201:54 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:201:44:201:54 | hello_match |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:201:44:201:54 | hello_match | &T | {EXTERNAL LOCATION} | str |
 | pattern_matching.rs:203:9:203:9 | _ |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:203:9:203:9 | _ | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:203:14:203:15 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:206:9:206:16 | bool_val |  | {EXTERNAL LOCATION} | bool |
 | pattern_matching.rs:206:20:206:23 | true |  | {EXTERNAL LOCATION} | bool |
+| pattern_matching.rs:207:5:216:5 | match bool_val { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:207:11:207:18 | bool_val |  | {EXTERNAL LOCATION} | bool |
 | pattern_matching.rs:208:9:208:12 | true |  | {EXTERNAL LOCATION} | bool |
+| pattern_matching.rs:208:17:211:9 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:209:17:209:26 | true_match |  | {EXTERNAL LOCATION} | bool |
 | pattern_matching.rs:209:30:209:37 | bool_val |  | {EXTERNAL LOCATION} | bool |
 | pattern_matching.rs:210:22:210:39 | "True literal: {}\\n" |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:210:22:210:39 | "True literal: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:210:22:210:51 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:210:22:210:51 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:210:22:210:51 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:210:22:210:51 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:210:42:210:51 | true_match |  | {EXTERNAL LOCATION} | bool |
 | pattern_matching.rs:212:9:212:13 | false |  | {EXTERNAL LOCATION} | bool |
+| pattern_matching.rs:212:18:215:9 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:213:17:213:27 | false_match |  | {EXTERNAL LOCATION} | bool |
 | pattern_matching.rs:213:31:213:38 | bool_val |  | {EXTERNAL LOCATION} | bool |
 | pattern_matching.rs:214:22:214:40 | "False literal: {}\\n" |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:214:22:214:40 | "False literal: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:214:22:214:53 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:214:22:214:53 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:214:22:214:53 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:214:22:214:53 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:214:43:214:53 | false_match |  | {EXTERNAL LOCATION} | bool |
+| pattern_matching.rs:219:30:277:1 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:220:9:220:13 | value |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:220:17:220:21 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:223:5:228:5 | match value { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:223:11:223:15 | value |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:224:9:224:9 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:224:14:227:9 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:225:17:225:27 | bound_value |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:225:31:225:31 | x |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:226:22:226:45 | "Identifier pattern: {}\\n" |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:226:22:226:45 | "Identifier pattern: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:226:22:226:58 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:226:22:226:58 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:226:22:226:58 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:226:22:226:58 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:226:48:226:58 | bound_value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:231:5:236:5 | match ... { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:231:11:231:16 | &value |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:231:11:231:16 | &value | &T | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:231:12:231:16 | value |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:232:13:232:13 | x |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:232:13:232:13 | x | &T | file://:0:0:0:0 | & |
 | pattern_matching.rs:232:13:232:13 | x | &T.&T | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:232:18:235:9 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:233:17:233:25 | ref_bound |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:233:17:233:25 | ref_bound | &T | file://:0:0:0:0 | & |
 | pattern_matching.rs:233:17:233:25 | ref_bound | &T.&T | {EXTERNAL LOCATION} | i32 |
@@ -5349,15 +6800,17 @@ inferType
 | pattern_matching.rs:233:29:233:29 | x | &T.&T | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:234:22:234:49 | "Reference identifier: {:?}\\n" |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:234:22:234:49 | "Reference identifier: {:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:234:22:234:60 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:234:22:234:60 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:234:22:234:60 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:234:22:234:60 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:234:52:234:60 | ref_bound |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:234:52:234:60 | ref_bound | &T | file://:0:0:0:0 | & |
 | pattern_matching.rs:234:52:234:60 | ref_bound | &T.&T | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:239:13:239:25 | mutable_value |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:239:29:239:33 | 10i32 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:240:5:246:5 | match mutable_value { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:240:11:240:23 | mutable_value |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:241:13:241:13 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:241:18:245:9 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:242:17:242:25 | mut_bound |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:242:29:242:29 | x |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:243:13:243:13 | x |  | {EXTERNAL LOCATION} | i32 |
@@ -5365,186 +6818,206 @@ inferType
 | pattern_matching.rs:243:18:243:18 | 1 |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:244:22:244:45 | "Mutable identifier: {}\\n" |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:244:22:244:45 | "Mutable identifier: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:244:22:244:56 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:244:22:244:56 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:244:22:244:56 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:244:22:244:56 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:244:48:244:56 | mut_bound |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:249:9:249:20 | option_value |  | pattern_matching.rs:152:1:156:1 | MyOption |
 | pattern_matching.rs:249:9:249:20 | option_value | T | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:249:24:249:44 | ...::Some(...) |  | pattern_matching.rs:152:1:156:1 | MyOption |
 | pattern_matching.rs:249:24:249:44 | ...::Some(...) | T | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:249:39:249:43 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:250:5:266:5 | match option_value { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:250:11:250:22 | option_value |  | pattern_matching.rs:152:1:156:1 | MyOption |
 | pattern_matching.rs:250:11:250:22 | option_value | T | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:251:9:251:30 | ...::Some(...) |  | pattern_matching.rs:152:1:156:1 | MyOption |
 | pattern_matching.rs:251:9:251:30 | ...::Some(...) | T | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:251:24:251:24 | x |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:251:28:251:29 | 42 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:251:35:254:9 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:252:17:252:24 | at_bound |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:252:28:252:28 | x |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:253:22:253:49 | "@ pattern with literal: {}\\n" |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:253:22:253:49 | "@ pattern with literal: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:253:22:253:59 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:253:22:253:59 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:253:22:253:59 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:253:22:253:59 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:253:52:253:59 | at_bound |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:255:9:255:35 | ...::Some(...) |  | pattern_matching.rs:152:1:156:1 | MyOption |
 | pattern_matching.rs:255:9:255:35 | ...::Some(...) | T | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:255:24:255:24 | x |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:255:28:255:28 | 1 |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:255:32:255:34 | 100 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:255:40:258:9 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:256:17:256:30 | range_at_bound |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:256:34:256:34 | x |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:257:22:257:47 | "@ pattern with range: {}\\n" |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:257:22:257:47 | "@ pattern with range: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:257:22:257:63 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:257:22:257:63 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:257:22:257:63 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:257:22:257:63 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:257:50:257:63 | range_at_bound |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:259:9:259:25 | ...::Some(...) |  | pattern_matching.rs:152:1:156:1 | MyOption |
 | pattern_matching.rs:259:9:259:25 | ...::Some(...) | T | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:259:24:259:24 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:259:30:262:9 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:260:17:260:26 | some_bound |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:260:30:260:30 | x |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:261:22:261:37 | "Some value: {}\\n" |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:261:22:261:37 | "Some value: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:261:22:261:49 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:261:22:261:49 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:261:22:261:49 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:261:22:261:49 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:261:40:261:49 | some_bound |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:263:9:263:22 | ...::None |  | pattern_matching.rs:152:1:156:1 | MyOption |
 | pattern_matching.rs:263:9:263:22 | ...::None | T | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:263:27:265:9 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:264:22:264:33 | "None value\\n" |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:264:22:264:33 | "None value\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:264:22:264:33 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:264:22:264:33 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:264:22:264:33 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:264:22:264:33 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:269:13:269:23 | ref_mut_val |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:269:27:269:30 | 5i32 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:270:11:270:26 | &mut ref_mut_val |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:270:5:276:5 | match ... { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:270:11:270:26 | &mut ref_mut_val |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:270:11:270:26 | &mut ref_mut_val | &T | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:270:16:270:26 | ref_mut_val |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:271:17:271:17 | x |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:271:17:271:17 | x | &T | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:271:17:271:17 | x | &T | file://:0:0:0:0 | & |
 | pattern_matching.rs:271:17:271:17 | x | &T.&T | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:271:22:275:9 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:272:17:272:29 | ref_mut_bound |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:272:17:272:29 | ref_mut_bound | &T | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:272:17:272:29 | ref_mut_bound | &T | file://:0:0:0:0 | & |
 | pattern_matching.rs:272:17:272:29 | ref_mut_bound | &T.&T | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:272:33:272:33 | x |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:272:33:272:33 | x | &T | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:272:33:272:33 | x | &T | file://:0:0:0:0 | & |
 | pattern_matching.rs:272:33:272:33 | x | &T.&T | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:273:13:273:27 | * ... |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:273:13:273:32 | ... += ... |  | file://:0:0:0:0 | () |
-| pattern_matching.rs:273:14:273:27 | * ... |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:273:14:273:27 | * ... |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:273:14:273:27 | * ... | &T | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:273:15:273:27 | ref_mut_bound |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:273:15:273:27 | ref_mut_bound | &T | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:273:15:273:27 | ref_mut_bound | &T | file://:0:0:0:0 | & |
 | pattern_matching.rs:273:15:273:27 | ref_mut_bound | &T.&T | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:273:32:273:32 | 1 |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:274:22:274:38 | "Ref mut pattern\\n" |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:274:22:274:38 | "Ref mut pattern\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:274:22:274:38 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:274:22:274:38 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:274:22:274:38 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:274:22:274:38 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:279:28:290:1 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:280:9:280:13 | value |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:280:17:280:21 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:282:5:289:5 | match value { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:282:11:282:15 | value |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:283:9:283:10 | 42 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:283:15:283:40 | MacroExpr |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:283:24:283:39 | "Specific match\\n" |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:283:24:283:39 | "Specific match\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:283:24:283:39 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:283:24:283:39 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:283:24:283:39 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:283:24:283:39 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:285:9:285:9 | _ |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:285:14:288:9 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:286:17:286:32 | wildcard_context |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:286:36:286:40 | value |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:287:22:287:47 | "Wildcard pattern for: {}\\n" |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:287:22:287:47 | "Wildcard pattern for: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:287:22:287:65 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:287:22:287:65 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:287:22:287:65 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:287:22:287:65 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:287:50:287:65 | wildcard_context |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:292:25:324:1 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:293:9:293:13 | value |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:293:17:293:21 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:295:5:310:5 | match value { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:295:11:295:15 | value |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:297:9:297:9 | 1 |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:297:9:297:14 | RangePat |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:297:13:297:14 | 10 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:297:19:300:9 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:298:17:298:31 | range_inclusive |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:298:35:298:39 | value |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:299:22:299:42 | "Range inclusive: {}\\n" |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:299:22:299:42 | "Range inclusive: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:299:22:299:59 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:299:22:299:59 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:299:22:299:59 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:299:22:299:59 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:299:45:299:59 | range_inclusive |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:301:9:301:10 | 11 |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:301:9:301:12 | RangePat |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:301:17:304:9 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:302:17:302:26 | range_from |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:302:30:302:34 | value |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:303:22:303:40 | "Range from 11: {}\\n" |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:303:22:303:40 | "Range from 11: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:303:22:303:52 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:303:22:303:52 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:303:22:303:52 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:303:22:303:52 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:303:43:303:52 | range_from |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:305:9:305:12 | RangePat |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:305:12:305:12 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:305:17:308:9 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:306:17:306:34 | range_to_inclusive |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:306:38:306:42 | value |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:307:22:307:47 | "Range to 0 inclusive: {}\\n" |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:307:22:307:47 | "Range to 0 inclusive: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:307:22:307:67 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:307:22:307:67 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:307:22:307:67 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:307:22:307:67 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:307:50:307:67 | range_to_inclusive |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:309:9:309:9 | _ |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:309:14:309:15 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:312:9:312:16 | char_val |  | {EXTERNAL LOCATION} | char |
 | pattern_matching.rs:312:20:312:22 | 'c' |  | {EXTERNAL LOCATION} | char |
+| pattern_matching.rs:313:5:323:5 | match char_val { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:313:11:313:18 | char_val |  | {EXTERNAL LOCATION} | char |
 | pattern_matching.rs:314:9:314:11 | 'a' |  | {EXTERNAL LOCATION} | char |
 | pattern_matching.rs:314:9:314:17 | RangePat |  | {EXTERNAL LOCATION} | char |
 | pattern_matching.rs:314:15:314:17 | 'z' |  | {EXTERNAL LOCATION} | char |
+| pattern_matching.rs:314:22:317:9 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:315:17:315:30 | lowercase_char |  | {EXTERNAL LOCATION} | char |
 | pattern_matching.rs:315:34:315:41 | char_val |  | {EXTERNAL LOCATION} | char |
 | pattern_matching.rs:316:22:316:41 | "Lowercase char: {}\\n" |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:316:22:316:41 | "Lowercase char: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:316:22:316:57 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:316:22:316:57 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:316:22:316:57 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:316:22:316:57 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:316:44:316:57 | lowercase_char |  | {EXTERNAL LOCATION} | char |
 | pattern_matching.rs:318:9:318:11 | 'A' |  | {EXTERNAL LOCATION} | char |
 | pattern_matching.rs:318:9:318:17 | RangePat |  | {EXTERNAL LOCATION} | char |
 | pattern_matching.rs:318:15:318:17 | 'Z' |  | {EXTERNAL LOCATION} | char |
+| pattern_matching.rs:318:22:321:9 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:319:17:319:30 | uppercase_char |  | {EXTERNAL LOCATION} | char |
 | pattern_matching.rs:319:34:319:41 | char_val |  | {EXTERNAL LOCATION} | char |
 | pattern_matching.rs:320:22:320:41 | "Uppercase char: {}\\n" |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:320:22:320:41 | "Uppercase char: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:320:22:320:57 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:320:22:320:57 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:320:22:320:57 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:320:22:320:57 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:320:44:320:57 | uppercase_char |  | {EXTERNAL LOCATION} | char |
 | pattern_matching.rs:322:9:322:9 | _ |  | {EXTERNAL LOCATION} | char |
+| pattern_matching.rs:322:14:322:15 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:326:29:355:1 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:327:9:327:13 | value |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:327:17:327:21 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:328:13:328:25 | mutable_value |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:328:29:328:33 | 10i32 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:331:5:340:5 | match ... { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:331:11:331:16 | &value |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:331:11:331:16 | &value | &T | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:331:12:331:16 | value |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:332:9:332:11 | &42 |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:332:9:332:11 | &42 | &T | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:332:10:332:11 | 42 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:332:16:335:9 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:333:17:333:27 | deref_match |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:333:31:333:35 | value |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:334:22:334:45 | "Dereferenced match: {}\\n" |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:334:22:334:45 | "Dereferenced match: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:334:22:334:58 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:334:22:334:58 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:334:22:334:58 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:334:22:334:58 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:334:48:334:58 | deref_match |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:336:9:336:10 | &... |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:336:9:336:10 | &... | &T | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:336:10:336:10 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:336:15:339:9 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:337:17:337:27 | deref_bound |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:337:31:337:31 | x |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:338:22:338:47 | "Dereferenced binding: {}\\n" |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:338:22:338:47 | "Dereferenced binding: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:338:22:338:60 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:338:22:338:60 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:338:22:338:60 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:338:22:338:60 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:338:50:338:60 | deref_bound |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:342:5:347:5 | match ... { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:342:11:342:28 | &mut mutable_value |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:342:11:342:28 | &mut mutable_value | &T | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:342:16:342:28 | mutable_value |  | {EXTERNAL LOCATION} | i32 |
@@ -5552,22 +7025,25 @@ inferType
 | pattern_matching.rs:343:9:343:18 | &mut ... | &T | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:343:18:343:18 | x |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:343:18:343:18 | x | &T | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:343:23:346:9 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:344:17:344:29 | mut_ref_bound |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:344:17:344:29 | mut_ref_bound | &T | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:344:33:344:33 | x |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:344:33:344:33 | x | &T | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:345:22:345:46 | "Mutable ref pattern: {}\\n" |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:345:22:345:46 | "Mutable ref pattern: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:345:22:345:61 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:345:22:345:61 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:345:22:345:61 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:345:22:345:61 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:345:49:345:61 | mut_ref_bound |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:345:49:345:61 | mut_ref_bound | &T | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:349:5:354:5 | match ... { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:349:11:349:16 | &value |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:349:11:349:16 | &value | &T | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:349:12:349:16 | value |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:350:13:350:13 | x |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:350:13:350:13 | x | &T | file://:0:0:0:0 | & |
 | pattern_matching.rs:350:13:350:13 | x | &T.&T | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:350:18:353:9 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:351:17:351:27 | ref_pattern |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:351:17:351:27 | ref_pattern | &T | file://:0:0:0:0 | & |
 | pattern_matching.rs:351:17:351:27 | ref_pattern | &T.&T | {EXTERNAL LOCATION} | i32 |
@@ -5576,88 +7052,96 @@ inferType
 | pattern_matching.rs:351:31:351:31 | x | &T.&T | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:352:22:352:44 | "Reference pattern: {}\\n" |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:352:22:352:44 | "Reference pattern: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:352:22:352:57 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:352:22:352:57 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:352:22:352:57 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:352:22:352:57 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:352:47:352:57 | ref_pattern |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:352:47:352:57 | ref_pattern | &T | file://:0:0:0:0 | & |
 | pattern_matching.rs:352:47:352:57 | ref_pattern | &T.&T | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:357:26:398:1 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:358:9:358:13 | point |  | pattern_matching.rs:135:1:140:1 | Point |
 | pattern_matching.rs:358:17:358:38 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
 | pattern_matching.rs:358:28:358:29 | 10 |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:358:35:358:36 | 20 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:361:5:380:5 | match point { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:361:11:361:15 | point |  | pattern_matching.rs:135:1:140:1 | Point |
 | pattern_matching.rs:362:9:362:28 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
 | pattern_matching.rs:362:20:362:20 | 0 |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:362:26:362:26 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:362:33:365:9 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:363:17:363:22 | origin |  | pattern_matching.rs:135:1:140:1 | Point |
 | pattern_matching.rs:363:26:363:30 | point |  | pattern_matching.rs:135:1:140:1 | Point |
 | pattern_matching.rs:364:22:364:41 | "Origin point: {:?}\\n" |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:364:22:364:41 | "Origin point: {:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:364:22:364:49 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:364:22:364:49 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:364:22:364:49 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:364:22:364:49 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:364:44:364:49 | origin |  | pattern_matching.rs:135:1:140:1 | Point |
 | pattern_matching.rs:366:9:366:25 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
 | pattern_matching.rs:366:17:366:17 | x |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:366:23:366:23 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:366:30:370:9 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:367:17:367:24 | x_axis_x |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:367:28:367:28 | x |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:368:17:368:28 | x_axis_point |  | pattern_matching.rs:135:1:140:1 | Point |
 | pattern_matching.rs:368:32:368:36 | point |  | pattern_matching.rs:135:1:140:1 | Point |
 | pattern_matching.rs:369:22:369:56 | "Point on x-axis: x={}, point=... |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:369:22:369:56 | "Point on x-axis: x={}, point=... | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:369:22:369:80 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:369:22:369:80 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:369:22:369:80 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:369:22:369:80 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:369:59:369:66 | x_axis_x |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:369:69:369:80 | x_axis_point |  | pattern_matching.rs:135:1:140:1 | Point |
 | pattern_matching.rs:371:9:371:27 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
 | pattern_matching.rs:371:20:371:21 | 10 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:371:32:374:9 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:372:17:372:27 | ten_x_point |  | pattern_matching.rs:135:1:140:1 | Point |
 | pattern_matching.rs:372:31:372:35 | point |  | pattern_matching.rs:135:1:140:1 | Point |
 | pattern_matching.rs:373:22:373:44 | "Point with x=10: {:?}\\n" |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:373:22:373:44 | "Point with x=10: {:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:373:22:373:57 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:373:22:373:57 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:373:22:373:57 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:373:22:373:57 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:373:47:373:57 | ten_x_point |  | pattern_matching.rs:135:1:140:1 | Point |
 | pattern_matching.rs:375:9:375:22 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
 | pattern_matching.rs:375:17:375:17 | x |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:375:20:375:20 | y |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:375:27:379:9 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:376:17:376:25 | general_x |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:376:29:376:29 | x |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:377:17:377:25 | general_y |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:377:29:377:29 | y |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:378:22:378:46 | "General point: ({}, {})\\n" |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:378:22:378:46 | "General point: ({}, {})\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:378:22:378:68 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:378:22:378:68 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:378:22:378:68 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:378:22:378:68 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:378:49:378:57 | general_x |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:378:60:378:68 | general_y |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:383:9:383:13 | shape |  | pattern_matching.rs:145:1:150:1 | Shape |
 | pattern_matching.rs:383:17:386:5 | ...::Rectangle {...} |  | pattern_matching.rs:145:1:150:1 | Shape |
 | pattern_matching.rs:384:16:384:19 | 10.0 |  | {EXTERNAL LOCATION} | f64 |
 | pattern_matching.rs:385:17:385:20 | 20.0 |  | {EXTERNAL LOCATION} | f64 |
+| pattern_matching.rs:387:5:397:5 | match shape { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:387:11:387:15 | shape |  | pattern_matching.rs:145:1:150:1 | Shape |
 | pattern_matching.rs:388:9:391:9 | ...::Rectangle {...} |  | pattern_matching.rs:145:1:150:1 | Shape |
 | pattern_matching.rs:389:20:389:20 | w |  | {EXTERNAL LOCATION} | f64 |
 | pattern_matching.rs:390:21:390:21 | h |  | {EXTERNAL LOCATION} | f64 |
+| pattern_matching.rs:391:14:395:9 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:392:17:392:26 | rect_width |  | {EXTERNAL LOCATION} | f64 |
 | pattern_matching.rs:392:30:392:30 | w |  | {EXTERNAL LOCATION} | f64 |
 | pattern_matching.rs:393:17:393:27 | rect_height |  | {EXTERNAL LOCATION} | f64 |
 | pattern_matching.rs:393:31:393:31 | h |  | {EXTERNAL LOCATION} | f64 |
 | pattern_matching.rs:394:22:394:39 | "Rectangle: {}x{}\\n" |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:394:22:394:39 | "Rectangle: {}x{}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:394:22:394:64 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:394:22:394:64 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:394:22:394:64 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:394:22:394:64 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:394:42:394:51 | rect_width |  | {EXTERNAL LOCATION} | f64 |
 | pattern_matching.rs:394:54:394:64 | rect_height |  | {EXTERNAL LOCATION} | f64 |
 | pattern_matching.rs:396:9:396:9 | _ |  | pattern_matching.rs:145:1:150:1 | Shape |
+| pattern_matching.rs:396:14:396:15 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:400:32:441:1 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:401:9:401:13 | color |  | pattern_matching.rs:142:1:143:25 | Color |
 | pattern_matching.rs:401:17:401:34 | Color(...) |  | pattern_matching.rs:142:1:143:25 | Color |
 | pattern_matching.rs:401:23:401:25 | 255 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:401:23:401:25 | 255 |  | {EXTERNAL LOCATION} | u8 |
 | pattern_matching.rs:401:28:401:30 | 128 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:401:28:401:30 | 128 |  | {EXTERNAL LOCATION} | u8 |
 | pattern_matching.rs:401:33:401:33 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:401:33:401:33 | 0 |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:404:5:418:5 | match color { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:404:11:404:15 | color |  | pattern_matching.rs:142:1:143:25 | Color |
 | pattern_matching.rs:405:9:405:24 | Color(...) |  | pattern_matching.rs:142:1:143:25 | Color |
 | pattern_matching.rs:405:15:405:17 | 255 |  | {EXTERNAL LOCATION} | i32 |
@@ -5666,17 +7150,19 @@ inferType
 | pattern_matching.rs:405:20:405:20 | 0 |  | {EXTERNAL LOCATION} | u8 |
 | pattern_matching.rs:405:23:405:23 | 0 |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:405:23:405:23 | 0 |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:405:29:408:9 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:406:17:406:25 | red_color |  | pattern_matching.rs:142:1:143:25 | Color |
 | pattern_matching.rs:406:29:406:33 | color |  | pattern_matching.rs:142:1:143:25 | Color |
 | pattern_matching.rs:407:22:407:37 | "Pure red: {:?}\\n" |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:407:22:407:37 | "Pure red: {:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:407:22:407:48 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:407:22:407:48 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:407:22:407:48 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:407:22:407:48 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:407:40:407:48 | red_color |  | pattern_matching.rs:142:1:143:25 | Color |
 | pattern_matching.rs:409:9:409:22 | Color(...) |  | pattern_matching.rs:142:1:143:25 | Color |
 | pattern_matching.rs:409:15:409:15 | r |  | {EXTERNAL LOCATION} | u8 |
 | pattern_matching.rs:409:18:409:18 | g |  | {EXTERNAL LOCATION} | u8 |
 | pattern_matching.rs:409:21:409:21 | b |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:409:27:417:9 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:410:17:410:29 | red_component |  | {EXTERNAL LOCATION} | u8 |
 | pattern_matching.rs:410:33:410:33 | r |  | {EXTERNAL LOCATION} | u8 |
 | pattern_matching.rs:411:17:411:31 | green_component |  | {EXTERNAL LOCATION} | u8 |
@@ -5685,46 +7171,52 @@ inferType
 | pattern_matching.rs:412:34:412:34 | b |  | {EXTERNAL LOCATION} | u8 |
 | pattern_matching.rs:414:17:414:37 | "Color: ({}, {}, {})\\n" |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:414:17:414:37 | "Color: ({}, {}, {})\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:414:17:415:62 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:414:17:415:62 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:414:17:415:62 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:414:17:415:62 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:415:17:415:29 | red_component |  | {EXTERNAL LOCATION} | u8 |
 | pattern_matching.rs:415:32:415:46 | green_component |  | {EXTERNAL LOCATION} | u8 |
 | pattern_matching.rs:415:49:415:62 | blue_component |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:421:5:430:5 | match color { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:421:11:421:15 | color |  | pattern_matching.rs:142:1:143:25 | Color |
 | pattern_matching.rs:422:9:422:22 | Color(...) |  | pattern_matching.rs:142:1:143:25 | Color |
 | pattern_matching.rs:422:15:422:17 | 255 |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:422:15:422:17 | 255 |  | {EXTERNAL LOCATION} | u8 |
 | pattern_matching.rs:422:20:422:21 | .. |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:422:27:425:9 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:423:17:423:29 | reddish_color |  | pattern_matching.rs:142:1:143:25 | Color |
 | pattern_matching.rs:423:33:423:37 | color |  | pattern_matching.rs:142:1:143:25 | Color |
 | pattern_matching.rs:424:22:424:42 | "Reddish color: {:?}\\n" |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:424:22:424:42 | "Reddish color: {:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:424:22:424:57 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:424:22:424:57 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:424:22:424:57 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:424:22:424:57 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:424:45:424:57 | reddish_color |  | pattern_matching.rs:142:1:143:25 | Color |
 | pattern_matching.rs:426:9:426:20 | Color(...) |  | pattern_matching.rs:142:1:143:25 | Color |
 | pattern_matching.rs:426:15:426:15 | r |  | {EXTERNAL LOCATION} | u8 |
 | pattern_matching.rs:426:18:426:19 | .. |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:426:25:429:9 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:427:17:427:23 | any_red |  | {EXTERNAL LOCATION} | u8 |
 | pattern_matching.rs:427:27:427:27 | r |  | {EXTERNAL LOCATION} | u8 |
 | pattern_matching.rs:428:22:428:45 | "Any color with red: {}\\n" |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:428:22:428:45 | "Any color with red: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:428:22:428:54 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:428:22:428:54 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:428:22:428:54 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:428:22:428:54 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:428:48:428:54 | any_red |  | {EXTERNAL LOCATION} | u8 |
 | pattern_matching.rs:434:9:434:15 | wrapper |  | pattern_matching.rs:432:5:433:24 | Wrapper |
 | pattern_matching.rs:434:19:434:29 | Wrapper(...) |  | pattern_matching.rs:432:5:433:24 | Wrapper |
 | pattern_matching.rs:434:27:434:28 | 42 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:435:5:440:5 | match wrapper { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:435:11:435:17 | wrapper |  | pattern_matching.rs:432:5:433:24 | Wrapper |
 | pattern_matching.rs:436:9:436:18 | Wrapper(...) |  | pattern_matching.rs:432:5:433:24 | Wrapper |
 | pattern_matching.rs:436:17:436:17 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:436:23:439:9 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:437:17:437:29 | wrapped_value |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:437:33:437:33 | x |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:438:22:438:34 | "Wrapped: {}\\n" |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:438:22:438:34 | "Wrapped: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:438:22:438:49 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:438:22:438:49 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:438:22:438:49 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:438:22:438:49 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:438:37:438:49 | wrapped_value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:443:25:498:1 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:444:9:444:13 | tuple |  | file://:0:0:0:0 | (T_3) |
 | pattern_matching.rs:444:9:444:13 | tuple | 0(3) | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:444:9:444:13 | tuple | 1(3) | {EXTERNAL LOCATION} | i32 |
@@ -5740,6 +7232,7 @@ inferType
 | pattern_matching.rs:444:18:444:21 | 1i32 |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:444:24:444:27 | 2i64 |  | {EXTERNAL LOCATION} | i64 |
 | pattern_matching.rs:444:30:444:35 | 3.0f32 |  | {EXTERNAL LOCATION} | f32 |
+| pattern_matching.rs:447:5:458:5 | match tuple { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:447:11:447:15 | tuple |  | file://:0:0:0:0 | (T_3) |
 | pattern_matching.rs:447:11:447:15 | tuple | 0(3) | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:447:11:447:15 | tuple | 1(3) | {EXTERNAL LOCATION} | i32 |
@@ -5757,6 +7250,7 @@ inferType
 | pattern_matching.rs:448:13:448:13 | 2 |  | {EXTERNAL LOCATION} | i64 |
 | pattern_matching.rs:448:16:448:18 | 3.0 |  | {EXTERNAL LOCATION} | f32 |
 | pattern_matching.rs:448:16:448:18 | 3.0 |  | {EXTERNAL LOCATION} | f64 |
+| pattern_matching.rs:448:24:451:9 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:449:17:449:27 | exact_tuple |  | file://:0:0:0:0 | (T_3) |
 | pattern_matching.rs:449:17:449:27 | exact_tuple | 0(3) | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:449:17:449:27 | exact_tuple | 1(3) | {EXTERNAL LOCATION} | i32 |
@@ -5771,8 +7265,8 @@ inferType
 | pattern_matching.rs:449:31:449:35 | tuple | 2(3) | {EXTERNAL LOCATION} | f64 |
 | pattern_matching.rs:450:22:450:40 | "Exact tuple: {:?}\\n" |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:450:22:450:40 | "Exact tuple: {:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:450:22:450:53 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:450:22:450:53 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:450:22:450:53 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:450:22:450:53 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:450:43:450:53 | exact_tuple |  | file://:0:0:0:0 | (T_3) |
 | pattern_matching.rs:450:43:450:53 | exact_tuple | 0(3) | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:450:43:450:53 | exact_tuple | 1(3) | {EXTERNAL LOCATION} | i32 |
@@ -5790,6 +7284,7 @@ inferType
 | pattern_matching.rs:452:13:452:13 | b |  | {EXTERNAL LOCATION} | i64 |
 | pattern_matching.rs:452:16:452:16 | c |  | {EXTERNAL LOCATION} | f32 |
 | pattern_matching.rs:452:16:452:16 | c |  | {EXTERNAL LOCATION} | f64 |
+| pattern_matching.rs:452:22:457:9 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:453:17:453:26 | first_elem |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:453:30:453:30 | a |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:454:17:454:27 | second_elem |  | {EXTERNAL LOCATION} | i32 |
@@ -5802,13 +7297,14 @@ inferType
 | pattern_matching.rs:455:30:455:30 | c |  | {EXTERNAL LOCATION} | f64 |
 | pattern_matching.rs:456:22:456:42 | "Tuple: ({}, {}, {})\\n" |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:456:22:456:42 | "Tuple: ({}, {}, {})\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:456:22:456:79 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:456:22:456:79 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:456:22:456:79 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:456:22:456:79 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:456:45:456:54 | first_elem |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:456:57:456:67 | second_elem |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:456:57:456:67 | second_elem |  | {EXTERNAL LOCATION} | i64 |
 | pattern_matching.rs:456:70:456:79 | third_elem |  | {EXTERNAL LOCATION} | f32 |
 | pattern_matching.rs:456:70:456:79 | third_elem |  | {EXTERNAL LOCATION} | f64 |
+| pattern_matching.rs:461:5:466:5 | match tuple { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:461:11:461:15 | tuple |  | file://:0:0:0:0 | (T_3) |
 | pattern_matching.rs:461:11:461:15 | tuple | 0(3) | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:461:11:461:15 | tuple | 1(3) | {EXTERNAL LOCATION} | i32 |
@@ -5821,702 +7317,836 @@ inferType
 | pattern_matching.rs:462:9:462:19 | TuplePat | 1(3) | {EXTERNAL LOCATION} | i64 |
 | pattern_matching.rs:462:9:462:19 | TuplePat | 2(3) | {EXTERNAL LOCATION} | f32 |
 | pattern_matching.rs:462:9:462:19 | TuplePat | 2(3) | {EXTERNAL LOCATION} | f64 |
+| pattern_matching.rs:462:24:465:9 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:464:22:464:40 | "First element: {}\\n" |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:464:22:464:40 | "First element: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:464:22:464:53 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:464:22:464:53 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:464:22:464:53 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:464:22:464:53 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:469:9:469:12 | unit |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:469:16:469:17 | TupleExpr |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:470:5:475:5 | match unit { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:470:11:470:14 | unit |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:471:9:471:10 | TuplePat |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:471:15:474:9 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:472:17:472:26 | unit_value |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:472:30:472:33 | unit |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:473:22:473:39 | "Unit value: {:?}\\n" |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:473:22:473:39 | "Unit value: {:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:473:22:473:51 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:473:22:473:51 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:473:22:473:51 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:473:22:473:51 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:473:42:473:51 | unit_value |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:478:9:478:14 | single |  | file://:0:0:0:0 | (T_1) |
 | pattern_matching.rs:478:9:478:14 | single | 0(1) | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:478:18:478:25 | TupleExpr |  | file://:0:0:0:0 | (T_1) |
 | pattern_matching.rs:478:18:478:25 | TupleExpr | 0(1) | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:478:19:478:23 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:479:5:484:5 | match single { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:479:11:479:16 | single |  | file://:0:0:0:0 | (T_1) |
 | pattern_matching.rs:479:11:479:16 | single | 0(1) | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:480:9:480:12 | TuplePat |  | file://:0:0:0:0 | (T_1) |
 | pattern_matching.rs:480:9:480:12 | TuplePat | 0(1) | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:480:10:480:10 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:480:17:483:9 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:481:17:481:27 | single_elem |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:481:31:481:31 | x |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:482:22:482:47 | "Single element tuple: {}\\n" |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:482:22:482:47 | "Single element tuple: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:482:22:482:60 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:482:22:482:60 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:482:22:482:60 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:482:22:482:60 | { ... } |  | file://:0:0:0:0 | () |
 | pattern_matching.rs:482:50:482:60 | single_elem |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:488:9:488:13 | value |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:488:17:488:21 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:491:11:491:15 | value |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:492:9:492:11 | (...) |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:492:10:492:10 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:493:17:493:27 | paren_bound |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:493:31:493:31 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:494:22:494:48 | "Parenthesized pattern: {}\\n" |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:494:22:494:48 | "Parenthesized pattern: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:494:22:494:61 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:494:22:494:61 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:494:51:494:61 | paren_bound |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:499:9:499:13 | tuple |  | file://:0:0:0:0 | (T_2) |
-| pattern_matching.rs:499:9:499:13 | tuple | 0(2) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:499:9:499:13 | tuple | 1(2) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:499:17:499:28 | TupleExpr |  | file://:0:0:0:0 | (T_2) |
-| pattern_matching.rs:499:17:499:28 | TupleExpr | 0(2) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:499:17:499:28 | TupleExpr | 1(2) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:499:18:499:21 | 1i32 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:499:24:499:27 | 2i32 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:500:11:500:15 | tuple |  | file://:0:0:0:0 | (T_2) |
-| pattern_matching.rs:500:11:500:15 | tuple | 0(2) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:500:11:500:15 | tuple | 1(2) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:501:9:501:16 | TuplePat |  | file://:0:0:0:0 | (T_2) |
-| pattern_matching.rs:501:9:501:16 | TuplePat | 0(2) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:501:9:501:16 | TuplePat | 1(2) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:501:10:501:10 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:501:13:501:15 | (...) |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:501:14:501:14 | y |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:502:17:502:23 | paren_x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:502:27:502:27 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:503:17:503:23 | paren_y |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:503:27:503:27 | y |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:504:22:504:53 | "Parenthesized in tuple: {}, {... |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:504:22:504:53 | "Parenthesized in tuple: {}, {... | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:504:22:504:71 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:504:22:504:71 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:504:56:504:62 | paren_x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:504:65:504:71 | paren_y |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:510:9:510:13 | slice |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:510:9:510:13 | slice | &T | file://:0:0:0:0 | [] |
-| pattern_matching.rs:510:9:510:13 | slice | &T.[T] | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:510:25:510:40 | &... |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:510:25:510:40 | &... | &T | file://:0:0:0:0 | [] |
-| pattern_matching.rs:510:25:510:40 | &... | &T | file://:0:0:0:0 | [] |
-| pattern_matching.rs:510:25:510:40 | &... | &T.[T;...] | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:510:25:510:40 | &... | &T.[T] | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:510:26:510:40 | [...] |  | file://:0:0:0:0 | [] |
-| pattern_matching.rs:510:26:510:40 | [...] |  | file://:0:0:0:0 | [] |
-| pattern_matching.rs:510:26:510:40 | [...] | [T;...] | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:510:26:510:40 | [...] | [T] | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:510:27:510:27 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:510:30:510:30 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:510:33:510:33 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:510:36:510:36 | 4 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:510:39:510:39 | 5 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:513:11:513:15 | slice |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:513:11:513:15 | slice | &T | file://:0:0:0:0 | [] |
-| pattern_matching.rs:513:11:513:15 | slice | &T.[T] | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:514:9:514:10 | SlicePat |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:514:9:514:10 | SlicePat | &T | file://:0:0:0:0 | [] |
-| pattern_matching.rs:514:9:514:10 | SlicePat | &T.[T] | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:515:17:515:27 | empty_slice |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:515:17:515:27 | empty_slice | &T | file://:0:0:0:0 | [] |
-| pattern_matching.rs:515:17:515:27 | empty_slice | &T.[T] | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:515:31:515:35 | slice |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:515:31:515:35 | slice | &T | file://:0:0:0:0 | [] |
-| pattern_matching.rs:515:31:515:35 | slice | &T.[T] | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:516:22:516:40 | "Empty slice: {:?}\\n" |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:516:22:516:40 | "Empty slice: {:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:516:22:516:53 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:516:22:516:53 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:516:43:516:53 | empty_slice |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:516:43:516:53 | empty_slice | &T | file://:0:0:0:0 | [] |
-| pattern_matching.rs:516:43:516:53 | empty_slice | &T.[T] | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:518:9:518:11 | SlicePat |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:518:9:518:11 | SlicePat | &T | file://:0:0:0:0 | [] |
-| pattern_matching.rs:518:9:518:11 | SlicePat | &T.[T] | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:520:22:520:41 | "Single element: {}\\n" |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:520:22:520:41 | "Single element: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:520:22:520:54 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:520:22:520:54 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:522:9:522:23 | SlicePat |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:522:9:522:23 | SlicePat | &T | file://:0:0:0:0 | [] |
-| pattern_matching.rs:522:9:522:23 | SlicePat | &T.[T] | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:525:22:525:43 | "Two elements: {}, {}\\n" |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:525:22:525:43 | "Two elements: {}, {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:525:22:525:70 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:525:22:525:70 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:527:9:527:34 | SlicePat |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:527:9:527:34 | SlicePat | &T | file://:0:0:0:0 | [] |
-| pattern_matching.rs:527:9:527:34 | SlicePat | &T.[T] | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:532:17:532:53 | "First: {}, last: {}, middle l... |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:532:17:532:53 | "First: {}, last: {}, middle l... | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:532:17:535:34 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:532:17:535:34 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:541:9:541:13 | array |  | file://:0:0:0:0 | [] |
-| pattern_matching.rs:541:9:541:13 | array | [T;...] | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:541:17:541:28 | [...] |  | file://:0:0:0:0 | [] |
-| pattern_matching.rs:541:17:541:28 | [...] | [T;...] | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:541:18:541:21 | 1i32 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:541:24:541:24 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:541:27:541:27 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:542:11:542:15 | array |  | file://:0:0:0:0 | [] |
-| pattern_matching.rs:542:11:542:15 | array | [T;...] | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:543:9:543:17 | SlicePat |  | file://:0:0:0:0 | [] |
-| pattern_matching.rs:543:9:543:17 | SlicePat | [T;...] | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:547:22:547:49 | "Array elements: {}, {}, {}\\n" |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:547:22:547:49 | "Array elements: {}, {}, {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:547:22:547:70 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:547:22:547:70 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:554:27:554:28 | 42 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:555:9:555:13 | value |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:555:17:555:21 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:557:11:557:15 | value |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:558:9:558:16 | CONSTANT |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:559:17:559:27 | const_match |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:559:31:559:35 | value |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:560:22:560:43 | "Matches constant: {}\\n" |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:560:22:560:43 | "Matches constant: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:560:22:560:56 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:560:22:560:56 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:560:46:560:56 | const_match |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:562:9:562:9 | _ |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:566:9:566:14 | option |  | pattern_matching.rs:152:1:156:1 | MyOption |
-| pattern_matching.rs:566:9:566:14 | option | T | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:566:18:566:38 | ...::Some(...) |  | pattern_matching.rs:152:1:156:1 | MyOption |
-| pattern_matching.rs:566:18:566:38 | ...::Some(...) | T | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:566:33:566:37 | 10i32 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:567:11:567:16 | option |  | pattern_matching.rs:152:1:156:1 | MyOption |
-| pattern_matching.rs:567:11:567:16 | option | T | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:568:9:568:22 | ...::None |  | pattern_matching.rs:152:1:156:1 | MyOption |
-| pattern_matching.rs:568:9:568:22 | ...::None | T | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:569:22:569:35 | "None variant\\n" |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:569:22:569:35 | "None variant\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:569:22:569:35 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:569:22:569:35 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:571:9:571:25 | ...::Some(...) |  | pattern_matching.rs:152:1:156:1 | MyOption |
-| pattern_matching.rs:571:9:571:25 | ...::Some(...) | T | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:571:24:571:24 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:572:17:572:26 | some_value |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:572:30:572:30 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:573:22:573:37 | "Some value: {}\\n" |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:573:22:573:37 | "Some value: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:573:22:573:49 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:573:22:573:49 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:573:40:573:49 | some_value |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:578:11:578:51 | ...::Ok::<...>(...) |  | {EXTERNAL LOCATION} | Result |
-| pattern_matching.rs:578:11:578:51 | ...::Ok::<...>(...) | E | {EXTERNAL LOCATION} | usize |
-| pattern_matching.rs:578:11:578:51 | ...::Ok::<...>(...) | T | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:578:49:578:50 | 42 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:579:9:579:34 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
-| pattern_matching.rs:579:9:579:34 | ...::Ok(...) | E | {EXTERNAL LOCATION} | usize |
-| pattern_matching.rs:579:9:579:34 | ...::Ok(...) | T | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:579:33:579:33 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:580:17:580:24 | ok_value |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:580:28:580:28 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:581:22:581:35 | "Ok value: {}\\n" |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:581:22:581:35 | "Ok value: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:581:22:581:45 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:581:22:581:45 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:581:38:581:45 | ok_value |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:583:9:583:35 | ...::Err(...) |  | {EXTERNAL LOCATION} | Result |
-| pattern_matching.rs:583:9:583:35 | ...::Err(...) | E | {EXTERNAL LOCATION} | usize |
-| pattern_matching.rs:583:9:583:35 | ...::Err(...) | T | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:583:34:583:34 | e |  | {EXTERNAL LOCATION} | usize |
-| pattern_matching.rs:584:17:584:25 | err_value |  | {EXTERNAL LOCATION} | usize |
-| pattern_matching.rs:584:29:584:29 | e |  | {EXTERNAL LOCATION} | usize |
-| pattern_matching.rs:585:22:585:32 | "Error: {}\\n" |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:585:22:585:32 | "Error: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:585:22:585:43 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:585:22:585:43 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:585:35:585:43 | err_value |  | {EXTERNAL LOCATION} | usize |
-| pattern_matching.rs:591:9:591:13 | value |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:591:17:591:21 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:594:11:594:15 | value |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:595:9:595:9 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:595:9:595:17 | 1 \| 2 \| 3 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:595:13:595:13 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:595:17:595:17 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:596:17:596:25 | small_num |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:596:29:596:33 | value |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:597:22:597:39 | "Small number: {}\\n" |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:597:22:597:39 | "Small number: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:597:22:597:50 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:597:22:597:50 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:597:42:597:50 | small_num |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:599:9:599:10 | 10 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:599:9:599:15 | 10 \| 20 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:599:14:599:15 | 20 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:600:17:600:25 | round_num |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:600:29:600:33 | value |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:601:22:601:39 | "Round number: {}\\n" |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:601:22:601:39 | "Round number: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:601:22:601:50 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:601:22:601:50 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:601:42:601:50 | round_num |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:603:9:603:9 | _ |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:607:9:607:13 | point |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:607:17:607:36 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:607:28:607:28 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:607:34:607:34 | 5 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:608:11:608:15 | point |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:609:9:609:29 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:609:9:609:53 | ... \| ... |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:609:20:609:20 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:609:24:609:24 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:609:27:609:27 | y |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:609:33:609:53 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:609:41:609:41 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:609:47:609:47 | y |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:609:51:609:51 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:610:17:610:22 | axis_x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:610:26:610:26 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:611:17:611:22 | axis_y |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:611:26:611:26 | y |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:612:22:612:46 | "Point on axis: ({}, {})\\n" |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:612:22:612:46 | "Point on axis: ({}, {})\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:612:22:612:62 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:612:22:612:62 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:612:49:612:54 | axis_x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:612:57:612:62 | axis_y |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:614:9:614:9 | _ |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:618:11:618:15 | value |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:619:9:619:9 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:619:9:619:14 | RangePat |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:619:9:619:25 | ... \| ... |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:619:13:619:14 | 10 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:619:18:619:19 | 90 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:619:18:619:25 | RangePat |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:619:23:619:25 | 100 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:620:17:620:30 | range_or_value |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:620:34:620:38 | value |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:621:22:621:35 | "In range: {}\\n" |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:621:22:621:35 | "In range: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:621:22:621:51 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:621:22:621:51 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:621:38:621:51 | range_or_value |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:623:9:623:9 | _ |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:628:9:628:13 | tuple |  | file://:0:0:0:0 | (T_4) |
-| pattern_matching.rs:628:9:628:13 | tuple | 0(4) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:628:9:628:13 | tuple | 1(4) | {EXTERNAL LOCATION} | i64 |
-| pattern_matching.rs:628:9:628:13 | tuple | 2(4) | {EXTERNAL LOCATION} | f32 |
-| pattern_matching.rs:628:9:628:13 | tuple | 3(4) | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:628:17:628:41 | TupleExpr |  | file://:0:0:0:0 | (T_4) |
-| pattern_matching.rs:628:17:628:41 | TupleExpr | 0(4) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:628:17:628:41 | TupleExpr | 1(4) | {EXTERNAL LOCATION} | i64 |
-| pattern_matching.rs:628:17:628:41 | TupleExpr | 2(4) | {EXTERNAL LOCATION} | f32 |
-| pattern_matching.rs:628:17:628:41 | TupleExpr | 3(4) | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:628:18:628:21 | 1i32 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:628:24:628:27 | 2i64 |  | {EXTERNAL LOCATION} | i64 |
-| pattern_matching.rs:628:30:628:35 | 3.0f32 |  | {EXTERNAL LOCATION} | f32 |
-| pattern_matching.rs:628:38:628:40 | 4u8 |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:631:11:631:15 | tuple |  | file://:0:0:0:0 | (T_4) |
-| pattern_matching.rs:631:11:631:15 | tuple | 0(4) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:631:11:631:15 | tuple | 1(4) | {EXTERNAL LOCATION} | i64 |
-| pattern_matching.rs:631:11:631:15 | tuple | 2(4) | {EXTERNAL LOCATION} | f32 |
-| pattern_matching.rs:631:11:631:15 | tuple | 3(4) | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:632:9:632:19 | TuplePat |  | file://:0:0:0:0 | (T_4) |
-| pattern_matching.rs:632:9:632:19 | TuplePat | 0(4) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:632:9:632:19 | TuplePat | 1(4) | {EXTERNAL LOCATION} | i64 |
-| pattern_matching.rs:632:9:632:19 | TuplePat | 2(4) | {EXTERNAL LOCATION} | f32 |
-| pattern_matching.rs:632:9:632:19 | TuplePat | 3(4) | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:634:22:634:42 | "First with rest: {}\\n" |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:634:22:634:42 | "First with rest: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:634:22:634:54 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:634:22:634:54 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:638:11:638:15 | tuple |  | file://:0:0:0:0 | (T_4) |
-| pattern_matching.rs:638:11:638:15 | tuple | 0(4) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:638:11:638:15 | tuple | 1(4) | {EXTERNAL LOCATION} | i64 |
-| pattern_matching.rs:638:11:638:15 | tuple | 2(4) | {EXTERNAL LOCATION} | f32 |
-| pattern_matching.rs:638:11:638:15 | tuple | 3(4) | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:639:9:639:18 | TuplePat |  | file://:0:0:0:0 | (T_4) |
-| pattern_matching.rs:639:9:639:18 | TuplePat | 0(4) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:639:9:639:18 | TuplePat | 1(4) | {EXTERNAL LOCATION} | i64 |
-| pattern_matching.rs:639:9:639:18 | TuplePat | 2(4) | {EXTERNAL LOCATION} | f32 |
-| pattern_matching.rs:639:9:639:18 | TuplePat | 3(4) | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:641:22:641:41 | "Last with rest: {}\\n" |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:641:22:641:41 | "Last with rest: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:641:22:641:52 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:641:22:641:52 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:645:11:645:15 | tuple |  | file://:0:0:0:0 | (T_4) |
-| pattern_matching.rs:645:11:645:15 | tuple | 0(4) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:645:11:645:15 | tuple | 1(4) | {EXTERNAL LOCATION} | i64 |
-| pattern_matching.rs:645:11:645:15 | tuple | 2(4) | {EXTERNAL LOCATION} | f32 |
-| pattern_matching.rs:645:11:645:15 | tuple | 3(4) | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:646:9:646:25 | TuplePat |  | file://:0:0:0:0 | (T_4) |
-| pattern_matching.rs:646:9:646:25 | TuplePat | 0(4) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:646:9:646:25 | TuplePat | 1(4) | {EXTERNAL LOCATION} | i64 |
-| pattern_matching.rs:646:9:646:25 | TuplePat | 2(4) | {EXTERNAL LOCATION} | f32 |
-| pattern_matching.rs:646:9:646:25 | TuplePat | 3(4) | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:649:22:649:45 | "First and last: {}, {}\\n" |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:649:22:649:45 | "First and last: {}, {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:649:22:649:67 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:649:22:649:67 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:654:9:654:13 | point |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:654:17:654:38 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:654:28:654:29 | 10 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:654:35:654:36 | 20 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:655:11:655:15 | point |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:656:9:656:23 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:656:17:656:17 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:657:17:657:22 | rest_x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:657:26:657:26 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:658:22:658:39 | "X coordinate: {}\\n" |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:658:22:658:39 | "X coordinate: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:658:22:658:47 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:658:22:658:47 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:658:42:658:47 | rest_x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:665:17:665:18 | 42 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:666:17:666:17 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:681:21:681:25 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:681:21:681:25 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:681:28:681:29 | 42 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:682:21:682:25 | 10i32 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:682:21:682:25 | 10i32 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:682:28:682:28 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:687:9:687:20 | complex_data |  | file://:0:0:0:0 | (T_2) |
-| pattern_matching.rs:687:9:687:20 | complex_data | 0(2) | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:687:9:687:20 | complex_data | 1(2) | pattern_matching.rs:152:1:156:1 | MyOption |
-| pattern_matching.rs:687:9:687:20 | complex_data | 1(2).T | pattern_matching.rs:142:1:143:25 | Color |
-| pattern_matching.rs:687:24:687:79 | TupleExpr |  | file://:0:0:0:0 | (T_2) |
-| pattern_matching.rs:687:24:687:79 | TupleExpr | 0(2) | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:687:24:687:79 | TupleExpr | 1(2) | pattern_matching.rs:152:1:156:1 | MyOption |
-| pattern_matching.rs:687:24:687:79 | TupleExpr | 1(2).T | pattern_matching.rs:142:1:143:25 | Color |
-| pattern_matching.rs:687:25:687:44 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:687:36:687:36 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:687:42:687:42 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:687:47:687:78 | ...::Some(...) |  | pattern_matching.rs:152:1:156:1 | MyOption |
-| pattern_matching.rs:687:47:687:78 | ...::Some(...) | T | pattern_matching.rs:142:1:143:25 | Color |
-| pattern_matching.rs:687:62:687:77 | Color(...) |  | pattern_matching.rs:142:1:143:25 | Color |
-| pattern_matching.rs:687:68:687:70 | 255 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:687:68:687:70 | 255 |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:687:73:687:73 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:687:73:687:73 | 0 |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:687:76:687:76 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:687:76:687:76 | 0 |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:689:11:689:22 | complex_data |  | file://:0:0:0:0 | (T_2) |
-| pattern_matching.rs:689:11:689:22 | complex_data | 0(2) | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:689:11:689:22 | complex_data | 1(2) | pattern_matching.rs:152:1:156:1 | MyOption |
-| pattern_matching.rs:689:11:689:22 | complex_data | 1(2).T | pattern_matching.rs:142:1:143:25 | Color |
-| pattern_matching.rs:691:9:691:61 | TuplePat |  | file://:0:0:0:0 | (T_2) |
-| pattern_matching.rs:691:9:691:61 | TuplePat | 0(2) | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:691:9:691:61 | TuplePat | 1(2) | pattern_matching.rs:152:1:156:1 | MyOption |
-| pattern_matching.rs:691:9:691:61 | TuplePat | 1(2).T | pattern_matching.rs:142:1:143:25 | Color |
-| pattern_matching.rs:691:10:691:26 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:691:21:691:21 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:691:24:691:24 | y |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:691:29:691:60 | ...::Some(...) |  | pattern_matching.rs:152:1:156:1 | MyOption |
-| pattern_matching.rs:691:29:691:60 | ...::Some(...) | T | pattern_matching.rs:142:1:143:25 | Color |
-| pattern_matching.rs:691:44:691:59 | Color(...) |  | pattern_matching.rs:142:1:143:25 | Color |
-| pattern_matching.rs:691:50:691:52 | 255 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:691:50:691:52 | 255 |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:691:55:691:55 | g |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:691:58:691:58 | b |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:692:17:692:24 | nested_y |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:692:28:692:28 | y |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:693:17:693:24 | nested_g |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:693:28:693:28 | g |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:694:17:694:24 | nested_b |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:694:28:694:28 | b |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:696:17:696:57 | "Complex nested: y={}, green={... |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:696:17:696:57 | "Complex nested: y={}, green={... | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:696:17:697:44 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:696:17:697:44 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:697:17:697:24 | nested_y |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:697:27:697:34 | nested_g |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:697:37:697:44 | nested_b |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:701:9:701:41 | TuplePat |  | file://:0:0:0:0 | (T_2) |
-| pattern_matching.rs:701:9:701:41 | TuplePat | 0(2) | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:701:9:701:41 | TuplePat | 1(2) | pattern_matching.rs:152:1:156:1 | MyOption |
-| pattern_matching.rs:701:9:701:41 | TuplePat | 1(2).T | pattern_matching.rs:142:1:143:25 | Color |
-| pattern_matching.rs:701:9:701:71 | ... \| ... |  | file://:0:0:0:0 | (T_2) |
-| pattern_matching.rs:701:9:701:71 | ... \| ... | 0(2) | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:701:9:701:71 | ... \| ... | 1(2) | pattern_matching.rs:152:1:156:1 | MyOption |
-| pattern_matching.rs:701:9:701:71 | ... \| ... | 1(2).T | pattern_matching.rs:142:1:143:25 | Color |
-| pattern_matching.rs:701:10:701:24 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:701:18:701:18 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:701:27:701:40 | ...::None |  | pattern_matching.rs:152:1:156:1 | MyOption |
-| pattern_matching.rs:701:27:701:40 | ...::None | T | pattern_matching.rs:142:1:143:25 | Color |
-| pattern_matching.rs:701:45:701:71 | TuplePat |  | file://:0:0:0:0 | (T_2) |
-| pattern_matching.rs:701:45:701:71 | TuplePat | 0(2) | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:701:45:701:71 | TuplePat | 1(2) | pattern_matching.rs:152:1:156:1 | MyOption |
-| pattern_matching.rs:701:45:701:71 | TuplePat | 1(2).T | pattern_matching.rs:142:1:143:25 | Color |
-| pattern_matching.rs:701:46:701:67 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:701:57:701:57 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:701:61:701:61 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:701:70:701:70 | _ |  | pattern_matching.rs:152:1:156:1 | MyOption |
-| pattern_matching.rs:701:70:701:70 | _ | T | pattern_matching.rs:142:1:143:25 | Color |
-| pattern_matching.rs:702:17:702:29 | alt_complex_x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:702:33:702:33 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:703:22:703:50 | "Alternative complex: x={:?}\\n... |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:703:22:703:50 | "Alternative complex: x={:?}\\n... | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:703:22:703:65 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:703:22:703:65 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:703:53:703:65 | alt_complex_x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:706:9:706:13 | other |  | file://:0:0:0:0 | (T_2) |
-| pattern_matching.rs:706:9:706:13 | other | 0(2) | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:706:9:706:13 | other | 1(2) | pattern_matching.rs:152:1:156:1 | MyOption |
-| pattern_matching.rs:706:9:706:13 | other | 1(2).T | pattern_matching.rs:142:1:143:25 | Color |
-| pattern_matching.rs:707:17:707:29 | other_complex |  | file://:0:0:0:0 | (T_2) |
-| pattern_matching.rs:707:17:707:29 | other_complex | 0(2) | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:707:17:707:29 | other_complex | 1(2) | pattern_matching.rs:152:1:156:1 | MyOption |
-| pattern_matching.rs:707:17:707:29 | other_complex | 1(2).T | pattern_matching.rs:142:1:143:25 | Color |
-| pattern_matching.rs:707:33:707:37 | other |  | file://:0:0:0:0 | (T_2) |
-| pattern_matching.rs:707:33:707:37 | other | 0(2) | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:707:33:707:37 | other | 1(2) | pattern_matching.rs:152:1:156:1 | MyOption |
-| pattern_matching.rs:707:33:707:37 | other | 1(2).T | pattern_matching.rs:142:1:143:25 | Color |
-| pattern_matching.rs:708:22:708:47 | "Other complex data: {:?}\\n" |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:708:22:708:47 | "Other complex data: {:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:708:22:708:62 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:708:22:708:62 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:708:50:708:62 | other_complex |  | file://:0:0:0:0 | (T_2) |
-| pattern_matching.rs:708:50:708:62 | other_complex | 0(2) | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:708:50:708:62 | other_complex | 1(2) | pattern_matching.rs:152:1:156:1 | MyOption |
-| pattern_matching.rs:708:50:708:62 | other_complex | 1(2).T | pattern_matching.rs:142:1:143:25 | Color |
-| pattern_matching.rs:715:9:715:13 | point |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:715:17:715:38 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:715:28:715:29 | 10 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:715:35:715:36 | 20 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:716:9:716:22 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:716:17:716:17 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:716:20:716:20 | y |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:716:26:716:30 | point |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:717:9:717:13 | let_x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:717:17:717:17 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:718:9:718:13 | let_y |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:718:17:718:17 | y |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:720:9:720:13 | tuple |  | file://:0:0:0:0 | (T_3) |
-| pattern_matching.rs:720:9:720:13 | tuple | 0(3) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:720:9:720:13 | tuple | 1(3) | {EXTERNAL LOCATION} | i64 |
-| pattern_matching.rs:720:9:720:13 | tuple | 2(3) | {EXTERNAL LOCATION} | f32 |
-| pattern_matching.rs:720:17:720:36 | TupleExpr |  | file://:0:0:0:0 | (T_3) |
-| pattern_matching.rs:720:17:720:36 | TupleExpr | 0(3) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:720:17:720:36 | TupleExpr | 1(3) | {EXTERNAL LOCATION} | i64 |
-| pattern_matching.rs:720:17:720:36 | TupleExpr | 2(3) | {EXTERNAL LOCATION} | f32 |
-| pattern_matching.rs:720:18:720:21 | 1i32 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:720:24:720:27 | 2i64 |  | {EXTERNAL LOCATION} | i64 |
-| pattern_matching.rs:720:30:720:35 | 3.0f32 |  | {EXTERNAL LOCATION} | f32 |
-| pattern_matching.rs:721:9:721:17 | TuplePat |  | file://:0:0:0:0 | (T_3) |
-| pattern_matching.rs:721:9:721:17 | TuplePat | 0(3) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:721:9:721:17 | TuplePat | 1(3) | {EXTERNAL LOCATION} | i64 |
-| pattern_matching.rs:721:9:721:17 | TuplePat | 2(3) | {EXTERNAL LOCATION} | f32 |
-| pattern_matching.rs:721:10:721:10 | a |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:721:13:721:13 | b |  | {EXTERNAL LOCATION} | i64 |
-| pattern_matching.rs:721:16:721:16 | c |  | {EXTERNAL LOCATION} | f32 |
-| pattern_matching.rs:721:21:721:25 | tuple |  | file://:0:0:0:0 | (T_3) |
-| pattern_matching.rs:721:21:721:25 | tuple | 0(3) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:721:21:721:25 | tuple | 1(3) | {EXTERNAL LOCATION} | i64 |
-| pattern_matching.rs:721:21:721:25 | tuple | 2(3) | {EXTERNAL LOCATION} | f32 |
-| pattern_matching.rs:722:9:722:13 | let_a |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:722:17:722:17 | a |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:723:9:723:13 | let_b |  | {EXTERNAL LOCATION} | i64 |
-| pattern_matching.rs:723:17:723:17 | b |  | {EXTERNAL LOCATION} | i64 |
-| pattern_matching.rs:724:9:724:13 | let_c |  | {EXTERNAL LOCATION} | f32 |
-| pattern_matching.rs:724:17:724:17 | c |  | {EXTERNAL LOCATION} | f32 |
-| pattern_matching.rs:726:9:726:13 | array |  | file://:0:0:0:0 | [] |
-| pattern_matching.rs:726:9:726:13 | array | [T;...] | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:726:17:726:34 | [...] |  | file://:0:0:0:0 | [] |
-| pattern_matching.rs:726:17:726:34 | [...] | [T;...] | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:726:18:726:21 | 1i32 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:726:24:726:24 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:726:27:726:27 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:726:30:726:30 | 4 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:726:33:726:33 | 5 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:727:9:727:25 | SlicePat |  | file://:0:0:0:0 | [] |
-| pattern_matching.rs:727:9:727:25 | SlicePat | [T;...] | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:727:29:727:33 | array |  | file://:0:0:0:0 | [] |
-| pattern_matching.rs:727:29:727:33 | array | [T;...] | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:731:9:731:13 | color |  | pattern_matching.rs:142:1:143:25 | Color |
-| pattern_matching.rs:731:17:731:34 | Color(...) |  | pattern_matching.rs:142:1:143:25 | Color |
-| pattern_matching.rs:731:23:731:25 | 255 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:731:23:731:25 | 255 |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:731:28:731:30 | 128 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:731:28:731:30 | 128 |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:731:33:731:33 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:731:33:731:33 | 0 |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:732:9:732:22 | Color(...) |  | pattern_matching.rs:142:1:143:25 | Color |
-| pattern_matching.rs:732:15:732:15 | r |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:732:18:732:18 | g |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:732:21:732:21 | b |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:732:26:732:30 | color |  | pattern_matching.rs:142:1:143:25 | Color |
-| pattern_matching.rs:733:9:733:13 | let_r |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:733:17:733:17 | r |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:734:9:734:13 | let_g |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:734:17:734:17 | g |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:735:9:735:13 | let_b |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:735:17:735:17 | b |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:738:9:738:13 | value |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:738:17:738:21 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:739:13:739:19 | ref_val |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:739:13:739:19 | ref_val | &T | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:739:23:739:27 | value |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:740:9:740:15 | let_ref |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:740:9:740:15 | let_ref | &T | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:740:19:740:25 | ref_val |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:740:19:740:25 | ref_val | &T | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:743:13:743:19 | mut_val |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:743:23:743:27 | 10i32 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:744:9:744:15 | let_mut |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:744:19:744:25 | mut_val |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:750:22:750:35 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:750:30:750:30 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:750:33:750:33 | y |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:750:59:754:5 | { ... } |  | file://:0:0:0:0 | (T_2) |
-| pattern_matching.rs:750:59:754:5 | { ... } | 0(2) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:750:59:754:5 | { ... } | 1(2) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:751:13:751:19 | param_x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:751:23:751:23 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:752:13:752:19 | param_y |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:752:23:752:23 | y |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:753:9:753:26 | TupleExpr |  | file://:0:0:0:0 | (T_2) |
-| pattern_matching.rs:753:9:753:26 | TupleExpr | 0(2) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:753:9:753:26 | TupleExpr | 1(2) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:753:10:753:16 | param_x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:753:19:753:25 | param_y |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:756:22:756:35 | Color(...) |  | pattern_matching.rs:142:1:143:25 | Color |
-| pattern_matching.rs:756:28:756:28 | r |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:756:31:756:31 | _ |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:756:34:756:34 | _ |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:756:51:759:5 | { ... } |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:757:13:757:19 | param_r |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:757:23:757:23 | r |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:758:9:758:15 | param_r |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:761:22:761:38 | TuplePat |  | file://:0:0:0:0 | (T_3) |
-| pattern_matching.rs:761:22:761:38 | TuplePat | 0(3) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:761:22:761:38 | TuplePat | 1(3) | {EXTERNAL LOCATION} | f64 |
-| pattern_matching.rs:761:22:761:38 | TuplePat | 2(3) | {EXTERNAL LOCATION} | bool |
-| pattern_matching.rs:761:23:761:27 | first |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:761:30:761:30 | _ |  | {EXTERNAL LOCATION} | f64 |
-| pattern_matching.rs:761:33:761:37 | third |  | {EXTERNAL LOCATION} | bool |
-| pattern_matching.rs:761:74:765:5 | { ... } |  | file://:0:0:0:0 | (T_2) |
-| pattern_matching.rs:761:74:765:5 | { ... } | 0(2) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:761:74:765:5 | { ... } | 1(2) | {EXTERNAL LOCATION} | bool |
-| pattern_matching.rs:762:13:762:23 | param_first |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:762:27:762:31 | first |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:763:13:763:23 | param_third |  | {EXTERNAL LOCATION} | bool |
-| pattern_matching.rs:763:27:763:31 | third |  | {EXTERNAL LOCATION} | bool |
-| pattern_matching.rs:764:9:764:34 | TupleExpr |  | file://:0:0:0:0 | (T_2) |
-| pattern_matching.rs:764:9:764:34 | TupleExpr | 0(2) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:764:9:764:34 | TupleExpr | 1(2) | {EXTERNAL LOCATION} | bool |
-| pattern_matching.rs:764:10:764:20 | param_first |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:764:23:764:33 | param_third |  | {EXTERNAL LOCATION} | bool |
-| pattern_matching.rs:768:9:768:13 | point |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:768:17:768:37 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:768:28:768:28 | 5 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:768:34:768:35 | 10 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:769:9:769:17 | extracted |  | file://:0:0:0:0 | (T_2) |
-| pattern_matching.rs:769:9:769:17 | extracted | 0(2) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:769:9:769:17 | extracted | 1(2) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:769:21:769:40 | extract_point(...) |  | file://:0:0:0:0 | (T_2) |
-| pattern_matching.rs:769:21:769:40 | extract_point(...) | 0(2) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:769:21:769:40 | extract_point(...) | 1(2) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:769:35:769:39 | point |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:771:9:771:13 | color |  | pattern_matching.rs:142:1:143:25 | Color |
-| pattern_matching.rs:771:17:771:35 | Color(...) |  | pattern_matching.rs:142:1:143:25 | Color |
-| pattern_matching.rs:771:23:771:25 | 200 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:771:23:771:25 | 200 |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:771:28:771:30 | 100 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:771:28:771:30 | 100 |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:771:33:771:34 | 50 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:771:33:771:34 | 50 |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:772:9:772:11 | red |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:772:15:772:34 | extract_color(...) |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:772:29:772:33 | color |  | pattern_matching.rs:142:1:143:25 | Color |
-| pattern_matching.rs:774:9:774:13 | tuple |  | file://:0:0:0:0 | (T_3) |
-| pattern_matching.rs:774:9:774:13 | tuple | 0(3) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:774:9:774:13 | tuple | 1(3) | {EXTERNAL LOCATION} | f64 |
-| pattern_matching.rs:774:9:774:13 | tuple | 2(3) | {EXTERNAL LOCATION} | bool |
-| pattern_matching.rs:774:17:774:38 | TupleExpr |  | file://:0:0:0:0 | (T_3) |
-| pattern_matching.rs:774:17:774:38 | TupleExpr | 0(3) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:774:17:774:38 | TupleExpr | 1(3) | {EXTERNAL LOCATION} | f64 |
-| pattern_matching.rs:774:17:774:38 | TupleExpr | 2(3) | {EXTERNAL LOCATION} | bool |
-| pattern_matching.rs:774:18:774:22 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:774:25:774:31 | 3.14f64 |  | {EXTERNAL LOCATION} | f64 |
-| pattern_matching.rs:774:34:774:37 | true |  | {EXTERNAL LOCATION} | bool |
-| pattern_matching.rs:775:9:775:23 | tuple_extracted |  | file://:0:0:0:0 | (T_2) |
-| pattern_matching.rs:775:9:775:23 | tuple_extracted | 0(2) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:775:9:775:23 | tuple_extracted | 1(2) | {EXTERNAL LOCATION} | bool |
-| pattern_matching.rs:775:27:775:46 | extract_tuple(...) |  | file://:0:0:0:0 | (T_2) |
-| pattern_matching.rs:775:27:775:46 | extract_tuple(...) | 0(2) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:775:27:775:46 | extract_tuple(...) | 1(2) | {EXTERNAL LOCATION} | bool |
-| pattern_matching.rs:775:41:775:45 | tuple |  | file://:0:0:0:0 | (T_3) |
-| pattern_matching.rs:775:41:775:45 | tuple | 0(3) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:775:41:775:45 | tuple | 1(3) | {EXTERNAL LOCATION} | f64 |
-| pattern_matching.rs:775:41:775:45 | tuple | 2(3) | {EXTERNAL LOCATION} | bool |
-| pattern_matching.rs:781:23:781:42 | (...) |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:781:23:781:42 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:781:34:781:34 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:781:40:781:40 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:781:45:781:64 | (...) |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:781:45:781:64 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:781:56:781:56 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:781:62:781:62 | 4 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:782:9:782:22 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:782:17:782:17 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:782:20:782:20 | y |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:783:13:783:18 | loop_x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:783:22:783:22 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:784:13:784:18 | loop_y |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:784:22:784:22 | y |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:785:18:785:42 | "Point in loop: ({}, {})\\n" |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:785:18:785:42 | "Point in loop: ({}, {})\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:785:18:785:58 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:785:18:785:58 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:785:45:785:50 | loop_x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:785:53:785:58 | loop_y |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:789:9:789:20 | option_value |  | pattern_matching.rs:152:1:156:1 | MyOption |
-| pattern_matching.rs:789:9:789:20 | option_value | T | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:789:24:789:44 | ...::Some(...) |  | pattern_matching.rs:152:1:156:1 | MyOption |
-| pattern_matching.rs:789:24:789:44 | ...::Some(...) | T | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:789:39:789:43 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:790:12:790:33 | ...::Some(...) |  | pattern_matching.rs:152:1:156:1 | MyOption |
-| pattern_matching.rs:790:12:790:33 | ...::Some(...) | T | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:790:27:790:27 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:790:31:790:32 | 42 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:790:37:790:48 | option_value |  | pattern_matching.rs:152:1:156:1 | MyOption |
-| pattern_matching.rs:790:37:790:48 | option_value | T | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:791:13:791:20 | if_let_x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:791:24:791:24 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:792:18:792:44 | "If let with @ pattern: {}\\n" |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:792:18:792:44 | "If let with @ pattern: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:792:18:792:54 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:792:18:792:54 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:792:47:792:54 | if_let_x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:796:13:796:17 | stack |  | {EXTERNAL LOCATION} | Vec |
-| pattern_matching.rs:796:13:796:17 | stack | A | {EXTERNAL LOCATION} | Global |
-| pattern_matching.rs:796:13:796:17 | stack | T | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:796:31:796:46 | MacroExpr |  | {EXTERNAL LOCATION} | Vec |
-| pattern_matching.rs:796:31:796:46 | MacroExpr | A | {EXTERNAL LOCATION} | Global |
-| pattern_matching.rs:796:31:796:46 | MacroExpr | T | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:796:36:796:39 | 1i32 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:796:42:796:42 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:796:45:796:45 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:797:15:797:21 | Some(...) |  | {EXTERNAL LOCATION} | Option |
-| pattern_matching.rs:797:15:797:21 | Some(...) | T | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:797:20:797:20 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:797:25:797:29 | stack |  | {EXTERNAL LOCATION} | Vec |
-| pattern_matching.rs:797:25:797:29 | stack | A | {EXTERNAL LOCATION} | Global |
-| pattern_matching.rs:797:25:797:29 | stack | T | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:797:25:797:35 | stack.pop() |  | {EXTERNAL LOCATION} | Option |
-| pattern_matching.rs:797:25:797:35 | stack.pop() | T | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:798:13:798:23 | while_let_x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:798:27:798:27 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:799:18:799:29 | "Popped: {}\\n" |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:799:18:799:29 | "Popped: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:799:18:799:42 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:799:18:799:42 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:799:32:799:42 | while_let_x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:803:9:803:13 | value |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:803:17:803:21 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:804:11:804:15 | value |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:805:9:805:9 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:805:14:805:14 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:805:14:805:18 | ... > ... |  | {EXTERNAL LOCATION} | bool |
-| pattern_matching.rs:805:18:805:18 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:806:17:806:23 | guard_x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:806:27:806:27 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:807:22:807:35 | "Positive: {}\\n" |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:807:22:807:35 | "Positive: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:807:22:807:44 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:807:22:807:44 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:807:38:807:44 | guard_x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:809:9:809:9 | _ |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:814:5:814:7 | f(...) |  | {EXTERNAL LOCATION} | Option |
-| pattern_matching.rs:814:5:814:7 | f(...) | T | file://:0:0:0:0 | () |
+| pattern_matching.rs:487:9:487:18 | ref_tuple1 |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:487:9:487:18 | ref_tuple1 | &T | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:487:9:487:18 | ref_tuple1 | &T.0(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:487:9:487:18 | ref_tuple1 | &T.1(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:487:35:487:41 | &... |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:487:35:487:41 | &... | &T | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:487:35:487:41 | &... | &T.0(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:487:35:487:41 | &... | &T.1(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:487:36:487:41 | TupleExpr |  | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:487:36:487:41 | TupleExpr | 0(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:487:36:487:41 | TupleExpr | 1(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:487:37:487:37 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:487:40:487:40 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:488:5:491:5 | if ... {...} |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:488:12:488:17 | TuplePat |  | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:488:21:488:30 | ref_tuple1 |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:488:21:488:30 | ref_tuple1 | &T | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:488:21:488:30 | ref_tuple1 | &T.0(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:488:21:488:30 | ref_tuple1 | &T.1(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:488:32:491:5 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:489:18:489:24 | "n: {}\\n" |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:489:18:489:24 | "n: {}\\n" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:489:18:489:27 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:489:18:489:27 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:490:18:490:24 | "m: {}\\n" |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:490:18:490:24 | "m: {}\\n" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:490:18:490:27 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:490:18:490:27 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:494:9:494:18 | ref_tuple2 |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:494:9:494:18 | ref_tuple2 | &T | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:494:9:494:18 | ref_tuple2 | &T.0(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:494:9:494:18 | ref_tuple2 | &T.1(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:494:35:494:41 | &... |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:494:35:494:41 | &... | &T | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:494:35:494:41 | &... | &T.0(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:494:35:494:41 | &... | &T.1(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:494:36:494:41 | TupleExpr |  | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:494:36:494:41 | TupleExpr | 0(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:494:36:494:41 | TupleExpr | 1(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:494:37:494:37 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:494:40:494:40 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:495:9:495:14 | TuplePat |  | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:495:18:495:27 | ref_tuple2 |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:495:18:495:27 | ref_tuple2 | &T | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:495:18:495:27 | ref_tuple2 | &T.0(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:495:18:495:27 | ref_tuple2 | &T.1(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:496:14:496:20 | "n: {}\\n" |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:496:14:496:20 | "n: {}\\n" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:496:14:496:23 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:496:14:496:23 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:497:14:497:20 | "m: {}\\n" |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:497:14:497:20 | "m: {}\\n" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:497:14:497:23 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:497:14:497:23 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:500:33:520:1 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:501:9:501:13 | value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:501:17:501:21 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:504:5:509:5 | match value { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:504:11:504:15 | value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:505:9:505:11 | (...) |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:505:10:505:10 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:505:16:508:9 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:506:17:506:27 | paren_bound |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:506:31:506:31 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:507:22:507:48 | "Parenthesized pattern: {}\\n" |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:507:22:507:48 | "Parenthesized pattern: {}\\n" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:507:22:507:61 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:507:22:507:61 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:507:51:507:61 | paren_bound |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:512:9:512:13 | tuple |  | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:512:9:512:13 | tuple | 0(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:512:9:512:13 | tuple | 1(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:512:17:512:28 | TupleExpr |  | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:512:17:512:28 | TupleExpr | 0(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:512:17:512:28 | TupleExpr | 1(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:512:18:512:21 | 1i32 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:512:24:512:27 | 2i32 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:513:5:519:5 | match tuple { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:513:11:513:15 | tuple |  | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:513:11:513:15 | tuple | 0(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:513:11:513:15 | tuple | 1(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:514:9:514:16 | TuplePat |  | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:514:9:514:16 | TuplePat | 0(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:514:9:514:16 | TuplePat | 1(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:514:10:514:10 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:514:13:514:15 | (...) |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:514:14:514:14 | y |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:514:21:518:9 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:515:17:515:23 | paren_x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:515:27:515:27 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:516:17:516:23 | paren_y |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:516:27:516:27 | y |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:517:22:517:53 | "Parenthesized in tuple: {}, {... |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:517:22:517:53 | "Parenthesized in tuple: {}, {... | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:517:22:517:71 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:517:22:517:71 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:517:56:517:62 | paren_x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:517:65:517:71 | paren_y |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:522:25:563:1 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:523:9:523:13 | slice |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:523:9:523:13 | slice | &T | file://:0:0:0:0 | [] |
+| pattern_matching.rs:523:9:523:13 | slice | &T.[T] | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:523:25:523:40 | &... |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:523:25:523:40 | &... | &T | file://:0:0:0:0 | [] |
+| pattern_matching.rs:523:25:523:40 | &... | &T | file://:0:0:0:0 | [] |
+| pattern_matching.rs:523:25:523:40 | &... | &T.[T;...] | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:523:25:523:40 | &... | &T.[T] | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:523:26:523:40 | [...] |  | file://:0:0:0:0 | [] |
+| pattern_matching.rs:523:26:523:40 | [...] | [T;...] | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:523:27:523:27 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:523:30:523:30 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:523:33:523:33 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:523:36:523:36 | 4 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:523:39:523:39 | 5 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:526:5:551:5 | match slice { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:526:11:526:15 | slice |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:526:11:526:15 | slice | &T | file://:0:0:0:0 | [] |
+| pattern_matching.rs:526:11:526:15 | slice | &T.[T] | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:527:9:527:10 | SlicePat |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:527:9:527:10 | SlicePat | &T | file://:0:0:0:0 | [] |
+| pattern_matching.rs:527:9:527:10 | SlicePat | &T.[T] | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:527:15:530:9 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:528:17:528:27 | empty_slice |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:528:17:528:27 | empty_slice | &T | file://:0:0:0:0 | [] |
+| pattern_matching.rs:528:17:528:27 | empty_slice | &T.[T] | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:528:31:528:35 | slice |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:528:31:528:35 | slice | &T | file://:0:0:0:0 | [] |
+| pattern_matching.rs:528:31:528:35 | slice | &T.[T] | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:529:22:529:40 | "Empty slice: {:?}\\n" |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:529:22:529:40 | "Empty slice: {:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:529:22:529:53 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:529:22:529:53 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:529:43:529:53 | empty_slice |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:529:43:529:53 | empty_slice | &T | file://:0:0:0:0 | [] |
+| pattern_matching.rs:529:43:529:53 | empty_slice | &T.[T] | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:531:9:531:11 | SlicePat |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:531:9:531:11 | SlicePat | &T | file://:0:0:0:0 | [] |
+| pattern_matching.rs:531:9:531:11 | SlicePat | &T.[T] | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:531:16:534:9 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:533:22:533:41 | "Single element: {}\\n" |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:533:22:533:41 | "Single element: {}\\n" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:533:22:533:54 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:533:22:533:54 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:535:9:535:23 | SlicePat |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:535:9:535:23 | SlicePat | &T | file://:0:0:0:0 | [] |
+| pattern_matching.rs:535:9:535:23 | SlicePat | &T.[T] | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:535:28:539:9 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:538:22:538:43 | "Two elements: {}, {}\\n" |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:538:22:538:43 | "Two elements: {}, {}\\n" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:538:22:538:70 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:538:22:538:70 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:540:9:540:34 | SlicePat |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:540:9:540:34 | SlicePat | &T | file://:0:0:0:0 | [] |
+| pattern_matching.rs:540:9:540:34 | SlicePat | &T.[T] | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:540:39:550:9 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:545:17:545:53 | "First: {}, last: {}, middle l... |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:545:17:545:53 | "First: {}, last: {}, middle l... | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:545:17:548:34 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:545:17:548:34 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:554:9:554:13 | array |  | file://:0:0:0:0 | [] |
+| pattern_matching.rs:554:9:554:13 | array | [T;...] | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:554:17:554:28 | [...] |  | file://:0:0:0:0 | [] |
+| pattern_matching.rs:554:17:554:28 | [...] | [T;...] | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:554:18:554:21 | 1i32 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:554:24:554:24 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:554:27:554:27 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:555:5:562:5 | match array { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:555:11:555:15 | array |  | file://:0:0:0:0 | [] |
+| pattern_matching.rs:555:11:555:15 | array | [T;...] | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:556:9:556:17 | SlicePat |  | file://:0:0:0:0 | [] |
+| pattern_matching.rs:556:9:556:17 | SlicePat | [T;...] | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:556:22:561:9 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:560:22:560:49 | "Array elements: {}, {}, {}\\n" |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:560:22:560:49 | "Array elements: {}, {}, {}\\n" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:560:22:560:70 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:560:22:560:70 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:565:24:601:1 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:567:27:567:28 | 42 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:568:9:568:13 | value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:568:17:568:21 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:570:5:576:5 | match value { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:570:11:570:15 | value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:571:9:571:16 | CONSTANT |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:571:21:574:9 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:572:17:572:27 | const_match |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:572:31:572:35 | value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:573:22:573:43 | "Matches constant: {}\\n" |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:573:22:573:43 | "Matches constant: {}\\n" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:573:22:573:56 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:573:22:573:56 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:573:46:573:56 | const_match |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:575:9:575:9 | _ |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:575:14:575:15 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:579:9:579:14 | option |  | pattern_matching.rs:152:1:156:1 | MyOption |
+| pattern_matching.rs:579:9:579:14 | option | T | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:579:18:579:38 | ...::Some(...) |  | pattern_matching.rs:152:1:156:1 | MyOption |
+| pattern_matching.rs:579:18:579:38 | ...::Some(...) | T | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:579:33:579:37 | 10i32 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:580:5:588:5 | match option { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:580:11:580:16 | option |  | pattern_matching.rs:152:1:156:1 | MyOption |
+| pattern_matching.rs:580:11:580:16 | option | T | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:581:9:581:22 | ...::None |  | pattern_matching.rs:152:1:156:1 | MyOption |
+| pattern_matching.rs:581:9:581:22 | ...::None | T | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:581:27:583:9 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:582:22:582:35 | "None variant\\n" |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:582:22:582:35 | "None variant\\n" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:582:22:582:35 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:582:22:582:35 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:584:9:584:25 | ...::Some(...) |  | pattern_matching.rs:152:1:156:1 | MyOption |
+| pattern_matching.rs:584:9:584:25 | ...::Some(...) | T | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:584:24:584:24 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:584:30:587:9 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:585:17:585:26 | some_value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:585:30:585:30 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:586:22:586:37 | "Some value: {}\\n" |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:586:22:586:37 | "Some value: {}\\n" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:586:22:586:49 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:586:22:586:49 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:586:40:586:49 | some_value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:591:5:600:5 | match ... { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:591:11:591:51 | ...::Ok::<...>(...) |  | {EXTERNAL LOCATION} | Result |
+| pattern_matching.rs:591:11:591:51 | ...::Ok::<...>(...) | E | {EXTERNAL LOCATION} | usize |
+| pattern_matching.rs:591:11:591:51 | ...::Ok::<...>(...) | T | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:591:49:591:50 | 42 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:592:9:592:34 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
+| pattern_matching.rs:592:9:592:34 | ...::Ok(...) | E | {EXTERNAL LOCATION} | usize |
+| pattern_matching.rs:592:9:592:34 | ...::Ok(...) | T | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:592:33:592:33 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:592:39:595:9 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:593:17:593:24 | ok_value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:593:28:593:28 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:594:22:594:35 | "Ok value: {}\\n" |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:594:22:594:35 | "Ok value: {}\\n" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:594:22:594:45 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:594:22:594:45 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:594:38:594:45 | ok_value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:596:9:596:35 | ...::Err(...) |  | {EXTERNAL LOCATION} | Result |
+| pattern_matching.rs:596:9:596:35 | ...::Err(...) | E | {EXTERNAL LOCATION} | usize |
+| pattern_matching.rs:596:9:596:35 | ...::Err(...) | T | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:596:34:596:34 | e |  | {EXTERNAL LOCATION} | usize |
+| pattern_matching.rs:596:40:599:9 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:597:17:597:25 | err_value |  | {EXTERNAL LOCATION} | usize |
+| pattern_matching.rs:597:29:597:29 | e |  | {EXTERNAL LOCATION} | usize |
+| pattern_matching.rs:598:22:598:32 | "Error: {}\\n" |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:598:22:598:32 | "Error: {}\\n" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:598:22:598:43 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:598:22:598:43 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:598:35:598:43 | err_value |  | {EXTERNAL LOCATION} | usize |
+| pattern_matching.rs:603:22:638:1 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:604:9:604:13 | value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:604:17:604:21 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:607:5:617:5 | match value { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:607:11:607:15 | value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:608:9:608:9 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:608:9:608:17 | 1 \| 2 \| 3 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:608:13:608:13 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:608:17:608:17 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:608:22:611:9 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:609:17:609:25 | small_num |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:609:29:609:33 | value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:610:22:610:39 | "Small number: {}\\n" |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:610:22:610:39 | "Small number: {}\\n" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:610:22:610:50 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:610:22:610:50 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:610:42:610:50 | small_num |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:612:9:612:10 | 10 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:612:9:612:15 | 10 \| 20 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:612:14:612:15 | 20 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:612:20:615:9 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:613:17:613:25 | round_num |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:613:29:613:33 | value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:614:22:614:39 | "Round number: {}\\n" |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:614:22:614:39 | "Round number: {}\\n" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:614:22:614:50 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:614:22:614:50 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:614:42:614:50 | round_num |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:616:9:616:9 | _ |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:616:14:616:15 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:620:9:620:13 | point |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:620:17:620:36 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:620:28:620:28 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:620:34:620:34 | 5 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:621:5:628:5 | match point { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:621:11:621:15 | point |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:622:9:622:29 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:622:9:622:53 | ... \| ... |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:622:20:622:20 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:622:24:622:24 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:622:27:622:27 | y |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:622:33:622:53 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:622:41:622:41 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:622:47:622:47 | y |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:622:51:622:51 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:622:58:626:9 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:623:17:623:22 | axis_x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:623:26:623:26 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:624:17:624:22 | axis_y |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:624:26:624:26 | y |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:625:22:625:46 | "Point on axis: ({}, {})\\n" |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:625:22:625:46 | "Point on axis: ({}, {})\\n" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:625:22:625:62 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:625:22:625:62 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:625:49:625:54 | axis_x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:625:57:625:62 | axis_y |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:627:9:627:9 | _ |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:627:14:627:15 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:631:5:637:5 | match value { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:631:11:631:15 | value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:632:9:632:9 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:632:9:632:14 | RangePat |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:632:9:632:25 | ... \| ... |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:632:13:632:14 | 10 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:632:18:632:19 | 90 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:632:18:632:25 | RangePat |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:632:23:632:25 | 100 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:632:30:635:9 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:633:17:633:30 | range_or_value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:633:34:633:38 | value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:634:22:634:35 | "In range: {}\\n" |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:634:22:634:35 | "In range: {}\\n" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:634:22:634:51 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:634:22:634:51 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:634:38:634:51 | range_or_value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:636:9:636:9 | _ |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:636:14:636:15 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:640:24:674:1 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:641:9:641:13 | tuple |  | file://:0:0:0:0 | (T_4) |
+| pattern_matching.rs:641:9:641:13 | tuple | 0(4) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:641:9:641:13 | tuple | 1(4) | {EXTERNAL LOCATION} | i64 |
+| pattern_matching.rs:641:9:641:13 | tuple | 2(4) | {EXTERNAL LOCATION} | f32 |
+| pattern_matching.rs:641:9:641:13 | tuple | 3(4) | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:641:17:641:41 | TupleExpr |  | file://:0:0:0:0 | (T_4) |
+| pattern_matching.rs:641:17:641:41 | TupleExpr | 0(4) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:641:17:641:41 | TupleExpr | 1(4) | {EXTERNAL LOCATION} | i64 |
+| pattern_matching.rs:641:17:641:41 | TupleExpr | 2(4) | {EXTERNAL LOCATION} | f32 |
+| pattern_matching.rs:641:17:641:41 | TupleExpr | 3(4) | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:641:18:641:21 | 1i32 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:641:24:641:27 | 2i64 |  | {EXTERNAL LOCATION} | i64 |
+| pattern_matching.rs:641:30:641:35 | 3.0f32 |  | {EXTERNAL LOCATION} | f32 |
+| pattern_matching.rs:641:38:641:40 | 4u8 |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:644:5:649:5 | match tuple { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:644:11:644:15 | tuple |  | file://:0:0:0:0 | (T_4) |
+| pattern_matching.rs:644:11:644:15 | tuple | 0(4) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:644:11:644:15 | tuple | 1(4) | {EXTERNAL LOCATION} | i64 |
+| pattern_matching.rs:644:11:644:15 | tuple | 2(4) | {EXTERNAL LOCATION} | f32 |
+| pattern_matching.rs:644:11:644:15 | tuple | 3(4) | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:645:9:645:19 | TuplePat |  | file://:0:0:0:0 | (T_4) |
+| pattern_matching.rs:645:9:645:19 | TuplePat | 0(4) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:645:9:645:19 | TuplePat | 1(4) | {EXTERNAL LOCATION} | i64 |
+| pattern_matching.rs:645:9:645:19 | TuplePat | 2(4) | {EXTERNAL LOCATION} | f32 |
+| pattern_matching.rs:645:9:645:19 | TuplePat | 3(4) | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:645:24:648:9 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:647:22:647:42 | "First with rest: {}\\n" |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:647:22:647:42 | "First with rest: {}\\n" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:647:22:647:54 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:647:22:647:54 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:651:5:656:5 | match tuple { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:651:11:651:15 | tuple |  | file://:0:0:0:0 | (T_4) |
+| pattern_matching.rs:651:11:651:15 | tuple | 0(4) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:651:11:651:15 | tuple | 1(4) | {EXTERNAL LOCATION} | i64 |
+| pattern_matching.rs:651:11:651:15 | tuple | 2(4) | {EXTERNAL LOCATION} | f32 |
+| pattern_matching.rs:651:11:651:15 | tuple | 3(4) | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:652:9:652:18 | TuplePat |  | file://:0:0:0:0 | (T_4) |
+| pattern_matching.rs:652:9:652:18 | TuplePat | 0(4) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:652:9:652:18 | TuplePat | 1(4) | {EXTERNAL LOCATION} | i64 |
+| pattern_matching.rs:652:9:652:18 | TuplePat | 2(4) | {EXTERNAL LOCATION} | f32 |
+| pattern_matching.rs:652:9:652:18 | TuplePat | 3(4) | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:652:23:655:9 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:654:22:654:41 | "Last with rest: {}\\n" |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:654:22:654:41 | "Last with rest: {}\\n" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:654:22:654:52 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:654:22:654:52 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:658:5:664:5 | match tuple { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:658:11:658:15 | tuple |  | file://:0:0:0:0 | (T_4) |
+| pattern_matching.rs:658:11:658:15 | tuple | 0(4) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:658:11:658:15 | tuple | 1(4) | {EXTERNAL LOCATION} | i64 |
+| pattern_matching.rs:658:11:658:15 | tuple | 2(4) | {EXTERNAL LOCATION} | f32 |
+| pattern_matching.rs:658:11:658:15 | tuple | 3(4) | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:659:9:659:25 | TuplePat |  | file://:0:0:0:0 | (T_4) |
+| pattern_matching.rs:659:9:659:25 | TuplePat | 0(4) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:659:9:659:25 | TuplePat | 1(4) | {EXTERNAL LOCATION} | i64 |
+| pattern_matching.rs:659:9:659:25 | TuplePat | 2(4) | {EXTERNAL LOCATION} | f32 |
+| pattern_matching.rs:659:9:659:25 | TuplePat | 3(4) | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:659:30:663:9 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:662:22:662:45 | "First and last: {}, {}\\n" |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:662:22:662:45 | "First and last: {}, {}\\n" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:662:22:662:67 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:662:22:662:67 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:667:9:667:13 | point |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:667:17:667:38 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:667:28:667:29 | 10 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:667:35:667:36 | 20 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:668:5:673:5 | match point { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:668:11:668:15 | point |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:669:9:669:23 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:669:17:669:17 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:669:28:672:9 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:670:17:670:22 | rest_x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:670:26:670:26 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:671:22:671:39 | "X coordinate: {}\\n" |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:671:22:671:39 | "X coordinate: {}\\n" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:671:22:671:47 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:671:22:671:47 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:671:42:671:47 | rest_x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:676:25:696:1 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:678:17:678:18 | 42 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:678:17:678:18 | match 42i32 { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:679:17:679:17 | match 42i32 { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:679:17:679:17 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:694:21:694:25 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:694:21:694:25 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:694:21:694:25 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:694:21:694:29 | match 42i32 { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:694:28:694:29 | 42 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:695:21:695:25 | 10i32 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:695:21:695:25 | 10i32 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:695:21:695:25 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:695:21:695:28 | match 10i32 { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:695:28:695:28 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:698:34:724:1 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:700:9:700:20 | complex_data |  | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:700:9:700:20 | complex_data | 0(2) | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:700:9:700:20 | complex_data | 1(2) | pattern_matching.rs:152:1:156:1 | MyOption |
+| pattern_matching.rs:700:9:700:20 | complex_data | 1(2).T | pattern_matching.rs:142:1:143:25 | Color |
+| pattern_matching.rs:700:24:700:79 | TupleExpr |  | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:700:24:700:79 | TupleExpr | 0(2) | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:700:24:700:79 | TupleExpr | 1(2) | pattern_matching.rs:152:1:156:1 | MyOption |
+| pattern_matching.rs:700:24:700:79 | TupleExpr | 1(2).T | pattern_matching.rs:142:1:143:25 | Color |
+| pattern_matching.rs:700:25:700:44 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:700:36:700:36 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:700:42:700:42 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:700:47:700:78 | ...::Some(...) |  | pattern_matching.rs:152:1:156:1 | MyOption |
+| pattern_matching.rs:700:47:700:78 | ...::Some(...) | T | pattern_matching.rs:142:1:143:25 | Color |
+| pattern_matching.rs:700:62:700:77 | Color(...) |  | pattern_matching.rs:142:1:143:25 | Color |
+| pattern_matching.rs:700:68:700:70 | 255 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:700:73:700:73 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:700:76:700:76 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:702:5:723:5 | match complex_data { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:702:11:702:22 | complex_data |  | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:702:11:702:22 | complex_data | 0(2) | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:702:11:702:22 | complex_data | 1(2) | pattern_matching.rs:152:1:156:1 | MyOption |
+| pattern_matching.rs:702:11:702:22 | complex_data | 1(2).T | pattern_matching.rs:142:1:143:25 | Color |
+| pattern_matching.rs:704:9:704:61 | TuplePat |  | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:704:9:704:61 | TuplePat | 0(2) | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:704:9:704:61 | TuplePat | 1(2) | pattern_matching.rs:152:1:156:1 | MyOption |
+| pattern_matching.rs:704:9:704:61 | TuplePat | 1(2).T | pattern_matching.rs:142:1:143:25 | Color |
+| pattern_matching.rs:704:10:704:26 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:704:21:704:21 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:704:24:704:24 | y |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:704:29:704:60 | ...::Some(...) |  | pattern_matching.rs:152:1:156:1 | MyOption |
+| pattern_matching.rs:704:29:704:60 | ...::Some(...) | T | pattern_matching.rs:142:1:143:25 | Color |
+| pattern_matching.rs:704:44:704:59 | Color(...) |  | pattern_matching.rs:142:1:143:25 | Color |
+| pattern_matching.rs:704:50:704:52 | 255 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:704:50:704:52 | 255 |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:704:55:704:55 | g |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:704:58:704:58 | b |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:704:66:712:9 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:705:17:705:24 | nested_y |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:705:28:705:28 | y |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:706:17:706:24 | nested_g |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:706:28:706:28 | g |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:707:17:707:24 | nested_b |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:707:28:707:28 | b |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:709:17:709:57 | "Complex nested: y={}, green={... |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:709:17:709:57 | "Complex nested: y={}, green={... | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:709:17:710:44 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:709:17:710:44 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:710:17:710:24 | nested_y |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:710:27:710:34 | nested_g |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:710:37:710:44 | nested_b |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:714:9:714:41 | TuplePat |  | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:714:9:714:41 | TuplePat | 0(2) | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:714:9:714:41 | TuplePat | 1(2) | pattern_matching.rs:152:1:156:1 | MyOption |
+| pattern_matching.rs:714:9:714:41 | TuplePat | 1(2).T | pattern_matching.rs:142:1:143:25 | Color |
+| pattern_matching.rs:714:9:714:71 | ... \| ... |  | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:714:9:714:71 | ... \| ... | 0(2) | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:714:9:714:71 | ... \| ... | 1(2) | pattern_matching.rs:152:1:156:1 | MyOption |
+| pattern_matching.rs:714:9:714:71 | ... \| ... | 1(2).T | pattern_matching.rs:142:1:143:25 | Color |
+| pattern_matching.rs:714:10:714:24 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:714:18:714:18 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:714:27:714:40 | ...::None |  | pattern_matching.rs:152:1:156:1 | MyOption |
+| pattern_matching.rs:714:27:714:40 | ...::None | T | pattern_matching.rs:142:1:143:25 | Color |
+| pattern_matching.rs:714:45:714:71 | TuplePat |  | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:714:45:714:71 | TuplePat | 0(2) | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:714:45:714:71 | TuplePat | 1(2) | pattern_matching.rs:152:1:156:1 | MyOption |
+| pattern_matching.rs:714:45:714:71 | TuplePat | 1(2).T | pattern_matching.rs:142:1:143:25 | Color |
+| pattern_matching.rs:714:46:714:67 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:714:57:714:57 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:714:61:714:61 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:714:70:714:70 | _ |  | pattern_matching.rs:152:1:156:1 | MyOption |
+| pattern_matching.rs:714:70:714:70 | _ | T | pattern_matching.rs:142:1:143:25 | Color |
+| pattern_matching.rs:714:76:717:9 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:715:17:715:29 | alt_complex_x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:715:33:715:33 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:716:22:716:50 | "Alternative complex: x={:?}\\n... |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:716:22:716:50 | "Alternative complex: x={:?}\\n... | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:716:22:716:65 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:716:22:716:65 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:716:53:716:65 | alt_complex_x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:719:9:719:13 | other |  | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:719:9:719:13 | other | 0(2) | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:719:9:719:13 | other | 1(2) | pattern_matching.rs:152:1:156:1 | MyOption |
+| pattern_matching.rs:719:9:719:13 | other | 1(2).T | pattern_matching.rs:142:1:143:25 | Color |
+| pattern_matching.rs:719:18:722:9 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:720:17:720:29 | other_complex |  | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:720:17:720:29 | other_complex | 0(2) | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:720:17:720:29 | other_complex | 1(2) | pattern_matching.rs:152:1:156:1 | MyOption |
+| pattern_matching.rs:720:17:720:29 | other_complex | 1(2).T | pattern_matching.rs:142:1:143:25 | Color |
+| pattern_matching.rs:720:33:720:37 | other |  | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:720:33:720:37 | other | 0(2) | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:720:33:720:37 | other | 1(2) | pattern_matching.rs:152:1:156:1 | MyOption |
+| pattern_matching.rs:720:33:720:37 | other | 1(2).T | pattern_matching.rs:142:1:143:25 | Color |
+| pattern_matching.rs:721:22:721:47 | "Other complex data: {:?}\\n" |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:721:22:721:47 | "Other complex data: {:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:721:22:721:62 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:721:22:721:62 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:721:50:721:62 | other_complex |  | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:721:50:721:62 | other_complex | 0(2) | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:721:50:721:62 | other_complex | 1(2) | pattern_matching.rs:152:1:156:1 | MyOption |
+| pattern_matching.rs:721:50:721:62 | other_complex | 1(2).T | pattern_matching.rs:142:1:143:25 | Color |
+| pattern_matching.rs:726:37:758:1 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:728:9:728:13 | point |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:728:17:728:38 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:728:28:728:29 | 10 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:728:35:728:36 | 20 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:729:9:729:22 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:729:17:729:17 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:729:20:729:20 | y |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:729:26:729:30 | point |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:730:9:730:13 | let_x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:730:17:730:17 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:731:9:731:13 | let_y |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:731:17:731:17 | y |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:733:9:733:13 | tuple |  | file://:0:0:0:0 | (T_3) |
+| pattern_matching.rs:733:9:733:13 | tuple | 0(3) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:733:9:733:13 | tuple | 1(3) | {EXTERNAL LOCATION} | i64 |
+| pattern_matching.rs:733:9:733:13 | tuple | 2(3) | {EXTERNAL LOCATION} | f32 |
+| pattern_matching.rs:733:17:733:36 | TupleExpr |  | file://:0:0:0:0 | (T_3) |
+| pattern_matching.rs:733:17:733:36 | TupleExpr | 0(3) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:733:17:733:36 | TupleExpr | 1(3) | {EXTERNAL LOCATION} | i64 |
+| pattern_matching.rs:733:17:733:36 | TupleExpr | 2(3) | {EXTERNAL LOCATION} | f32 |
+| pattern_matching.rs:733:18:733:21 | 1i32 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:733:24:733:27 | 2i64 |  | {EXTERNAL LOCATION} | i64 |
+| pattern_matching.rs:733:30:733:35 | 3.0f32 |  | {EXTERNAL LOCATION} | f32 |
+| pattern_matching.rs:734:9:734:17 | TuplePat |  | file://:0:0:0:0 | (T_3) |
+| pattern_matching.rs:734:9:734:17 | TuplePat | 0(3) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:734:9:734:17 | TuplePat | 1(3) | {EXTERNAL LOCATION} | i64 |
+| pattern_matching.rs:734:9:734:17 | TuplePat | 2(3) | {EXTERNAL LOCATION} | f32 |
+| pattern_matching.rs:734:10:734:10 | a |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:734:13:734:13 | b |  | {EXTERNAL LOCATION} | i64 |
+| pattern_matching.rs:734:16:734:16 | c |  | {EXTERNAL LOCATION} | f32 |
+| pattern_matching.rs:734:21:734:25 | tuple |  | file://:0:0:0:0 | (T_3) |
+| pattern_matching.rs:734:21:734:25 | tuple | 0(3) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:734:21:734:25 | tuple | 1(3) | {EXTERNAL LOCATION} | i64 |
+| pattern_matching.rs:734:21:734:25 | tuple | 2(3) | {EXTERNAL LOCATION} | f32 |
+| pattern_matching.rs:735:9:735:13 | let_a |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:735:17:735:17 | a |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:736:9:736:13 | let_b |  | {EXTERNAL LOCATION} | i64 |
+| pattern_matching.rs:736:17:736:17 | b |  | {EXTERNAL LOCATION} | i64 |
+| pattern_matching.rs:737:9:737:13 | let_c |  | {EXTERNAL LOCATION} | f32 |
+| pattern_matching.rs:737:17:737:17 | c |  | {EXTERNAL LOCATION} | f32 |
+| pattern_matching.rs:739:9:739:13 | array |  | file://:0:0:0:0 | [] |
+| pattern_matching.rs:739:9:739:13 | array | [T;...] | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:739:17:739:34 | [...] |  | file://:0:0:0:0 | [] |
+| pattern_matching.rs:739:17:739:34 | [...] | [T;...] | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:739:18:739:21 | 1i32 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:739:24:739:24 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:739:27:739:27 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:739:30:739:30 | 4 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:739:33:739:33 | 5 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:740:9:740:25 | SlicePat |  | file://:0:0:0:0 | [] |
+| pattern_matching.rs:740:9:740:25 | SlicePat | [T;...] | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:740:29:740:33 | array |  | file://:0:0:0:0 | [] |
+| pattern_matching.rs:740:29:740:33 | array | [T;...] | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:744:9:744:13 | color |  | pattern_matching.rs:142:1:143:25 | Color |
+| pattern_matching.rs:744:17:744:34 | Color(...) |  | pattern_matching.rs:142:1:143:25 | Color |
+| pattern_matching.rs:744:23:744:25 | 255 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:744:28:744:30 | 128 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:744:33:744:33 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:745:9:745:22 | Color(...) |  | pattern_matching.rs:142:1:143:25 | Color |
+| pattern_matching.rs:745:15:745:15 | r |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:745:18:745:18 | g |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:745:21:745:21 | b |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:745:26:745:30 | color |  | pattern_matching.rs:142:1:143:25 | Color |
+| pattern_matching.rs:746:9:746:13 | let_r |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:746:17:746:17 | r |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:747:9:747:13 | let_g |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:747:17:747:17 | g |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:748:9:748:13 | let_b |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:748:17:748:17 | b |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:751:9:751:13 | value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:751:17:751:21 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:752:13:752:19 | ref_val |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:752:13:752:19 | ref_val | &T | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:752:23:752:27 | value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:753:9:753:15 | let_ref |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:753:9:753:15 | let_ref | &T | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:753:19:753:25 | ref_val |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:753:19:753:25 | ref_val | &T | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:756:13:756:19 | mut_val |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:756:23:756:27 | 10i32 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:757:9:757:15 | let_mut |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:757:19:757:25 | mut_val |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:760:42:789:1 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:763:22:763:35 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:763:30:763:30 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:763:33:763:33 | y |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:763:59:767:5 | { ... } |  | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:763:59:767:5 | { ... } | 0(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:763:59:767:5 | { ... } | 1(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:764:13:764:19 | param_x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:764:23:764:23 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:765:13:765:19 | param_y |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:765:23:765:23 | y |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:766:9:766:26 | TupleExpr |  | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:766:9:766:26 | TupleExpr | 0(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:766:9:766:26 | TupleExpr | 1(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:766:10:766:16 | param_x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:766:19:766:25 | param_y |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:769:22:769:35 | Color(...) |  | pattern_matching.rs:142:1:143:25 | Color |
+| pattern_matching.rs:769:28:769:28 | r |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:769:31:769:31 | _ |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:769:34:769:34 | _ |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:769:51:772:5 | { ... } |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:770:13:770:19 | param_r |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:770:23:770:23 | r |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:771:9:771:15 | param_r |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:774:22:774:38 | TuplePat |  | file://:0:0:0:0 | (T_3) |
+| pattern_matching.rs:774:22:774:38 | TuplePat | 0(3) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:774:22:774:38 | TuplePat | 1(3) | {EXTERNAL LOCATION} | f64 |
+| pattern_matching.rs:774:22:774:38 | TuplePat | 2(3) | {EXTERNAL LOCATION} | bool |
+| pattern_matching.rs:774:23:774:27 | first |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:774:30:774:30 | _ |  | {EXTERNAL LOCATION} | f64 |
+| pattern_matching.rs:774:33:774:37 | third |  | {EXTERNAL LOCATION} | bool |
+| pattern_matching.rs:774:74:778:5 | { ... } |  | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:774:74:778:5 | { ... } | 0(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:774:74:778:5 | { ... } | 1(2) | {EXTERNAL LOCATION} | bool |
+| pattern_matching.rs:775:13:775:23 | param_first |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:775:27:775:31 | first |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:776:13:776:23 | param_third |  | {EXTERNAL LOCATION} | bool |
+| pattern_matching.rs:776:27:776:31 | third |  | {EXTERNAL LOCATION} | bool |
+| pattern_matching.rs:777:9:777:34 | TupleExpr |  | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:777:9:777:34 | TupleExpr | 0(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:777:9:777:34 | TupleExpr | 1(2) | {EXTERNAL LOCATION} | bool |
+| pattern_matching.rs:777:10:777:20 | param_first |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:777:23:777:33 | param_third |  | {EXTERNAL LOCATION} | bool |
+| pattern_matching.rs:781:9:781:13 | point |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:781:17:781:37 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:781:28:781:28 | 5 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:781:34:781:35 | 10 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:782:9:782:17 | extracted |  | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:782:9:782:17 | extracted | 0(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:782:9:782:17 | extracted | 1(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:782:21:782:40 | extract_point(...) |  | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:782:21:782:40 | extract_point(...) | 0(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:782:21:782:40 | extract_point(...) | 1(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:782:35:782:39 | point |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:784:9:784:13 | color |  | pattern_matching.rs:142:1:143:25 | Color |
+| pattern_matching.rs:784:17:784:35 | Color(...) |  | pattern_matching.rs:142:1:143:25 | Color |
+| pattern_matching.rs:784:23:784:25 | 200 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:784:28:784:30 | 100 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:784:33:784:34 | 50 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:785:9:785:11 | red |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:785:15:785:34 | extract_color(...) |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:785:29:785:33 | color |  | pattern_matching.rs:142:1:143:25 | Color |
+| pattern_matching.rs:787:9:787:13 | tuple |  | file://:0:0:0:0 | (T_3) |
+| pattern_matching.rs:787:9:787:13 | tuple | 0(3) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:787:9:787:13 | tuple | 1(3) | {EXTERNAL LOCATION} | f64 |
+| pattern_matching.rs:787:9:787:13 | tuple | 2(3) | {EXTERNAL LOCATION} | bool |
+| pattern_matching.rs:787:17:787:38 | TupleExpr |  | file://:0:0:0:0 | (T_3) |
+| pattern_matching.rs:787:17:787:38 | TupleExpr | 0(3) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:787:17:787:38 | TupleExpr | 1(3) | {EXTERNAL LOCATION} | f64 |
+| pattern_matching.rs:787:17:787:38 | TupleExpr | 2(3) | {EXTERNAL LOCATION} | bool |
+| pattern_matching.rs:787:18:787:22 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:787:25:787:31 | 3.14f64 |  | {EXTERNAL LOCATION} | f64 |
+| pattern_matching.rs:787:34:787:37 | true |  | {EXTERNAL LOCATION} | bool |
+| pattern_matching.rs:788:9:788:23 | tuple_extracted |  | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:788:9:788:23 | tuple_extracted | 0(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:788:9:788:23 | tuple_extracted | 1(2) | {EXTERNAL LOCATION} | bool |
+| pattern_matching.rs:788:27:788:46 | extract_tuple(...) |  | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:788:27:788:46 | extract_tuple(...) | 0(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:788:27:788:46 | extract_tuple(...) | 1(2) | {EXTERNAL LOCATION} | bool |
+| pattern_matching.rs:788:41:788:45 | tuple |  | file://:0:0:0:0 | (T_3) |
+| pattern_matching.rs:788:41:788:45 | tuple | 0(3) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:788:41:788:45 | tuple | 1(3) | {EXTERNAL LOCATION} | f64 |
+| pattern_matching.rs:788:41:788:45 | tuple | 2(3) | {EXTERNAL LOCATION} | bool |
+| pattern_matching.rs:792:35:824:1 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:794:23:794:42 | (...) |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:794:23:794:42 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:794:34:794:34 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:794:40:794:40 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:794:45:794:64 | (...) |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:794:45:794:64 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:794:56:794:56 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:794:62:794:62 | 4 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:795:5:799:5 | for ... in ... { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:795:9:795:22 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:795:17:795:17 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:795:20:795:20 | y |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:795:34:799:5 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:796:13:796:18 | loop_x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:796:22:796:22 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:797:13:797:18 | loop_y |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:797:22:797:22 | y |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:798:18:798:42 | "Point in loop: ({}, {})\\n" |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:798:18:798:42 | "Point in loop: ({}, {})\\n" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:798:18:798:58 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:798:18:798:58 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:798:45:798:50 | loop_x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:798:53:798:58 | loop_y |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:802:9:802:20 | option_value |  | pattern_matching.rs:152:1:156:1 | MyOption |
+| pattern_matching.rs:802:9:802:20 | option_value | T | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:802:24:802:44 | ...::Some(...) |  | pattern_matching.rs:152:1:156:1 | MyOption |
+| pattern_matching.rs:802:24:802:44 | ...::Some(...) | T | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:802:39:802:43 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:803:5:806:5 | if ... {...} |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:803:12:803:33 | ...::Some(...) |  | pattern_matching.rs:152:1:156:1 | MyOption |
+| pattern_matching.rs:803:12:803:33 | ...::Some(...) | T | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:803:27:803:27 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:803:31:803:32 | 42 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:803:37:803:48 | option_value |  | pattern_matching.rs:152:1:156:1 | MyOption |
+| pattern_matching.rs:803:37:803:48 | option_value | T | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:803:50:806:5 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:804:13:804:20 | if_let_x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:804:24:804:24 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:805:18:805:44 | "If let with @ pattern: {}\\n" |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:805:18:805:44 | "If let with @ pattern: {}\\n" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:805:18:805:54 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:805:18:805:54 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:805:47:805:54 | if_let_x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:809:13:809:17 | stack |  | {EXTERNAL LOCATION} | Vec |
+| pattern_matching.rs:809:13:809:17 | stack | A | {EXTERNAL LOCATION} | Global |
+| pattern_matching.rs:809:13:809:17 | stack | T | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:809:31:809:46 | MacroExpr |  | {EXTERNAL LOCATION} | Vec |
+| pattern_matching.rs:809:31:809:46 | MacroExpr | A | {EXTERNAL LOCATION} | Global |
+| pattern_matching.rs:809:31:809:46 | MacroExpr | T | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:809:36:809:39 | 1i32 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:809:42:809:42 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:809:45:809:45 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:810:5:813:5 | while ... { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:810:15:810:21 | Some(...) |  | {EXTERNAL LOCATION} | Option |
+| pattern_matching.rs:810:15:810:21 | Some(...) | T | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:810:20:810:20 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:810:25:810:29 | stack |  | {EXTERNAL LOCATION} | Vec |
+| pattern_matching.rs:810:25:810:29 | stack | A | {EXTERNAL LOCATION} | Global |
+| pattern_matching.rs:810:25:810:29 | stack | T | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:810:25:810:35 | stack.pop() |  | {EXTERNAL LOCATION} | Option |
+| pattern_matching.rs:810:25:810:35 | stack.pop() | T | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:810:37:813:5 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:811:13:811:23 | while_let_x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:811:27:811:27 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:812:18:812:29 | "Popped: {}\\n" |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:812:18:812:29 | "Popped: {}\\n" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:812:18:812:42 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:812:18:812:42 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:812:32:812:42 | while_let_x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:816:9:816:13 | value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:816:17:816:21 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:817:5:823:5 | match value { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:817:11:817:15 | value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:818:9:818:9 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:818:14:818:14 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:818:14:818:18 | ... > ... |  | {EXTERNAL LOCATION} | bool |
+| pattern_matching.rs:818:18:818:18 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:818:23:821:9 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:819:17:819:23 | guard_x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:819:27:819:27 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:820:22:820:35 | "Positive: {}\\n" |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:820:22:820:35 | "Positive: {}\\n" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:820:22:820:44 | ...::_print(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:820:22:820:44 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:820:38:820:44 | guard_x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:822:9:822:9 | _ |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:822:14:822:15 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:826:28:846:1 | { ... } |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:827:5:827:7 | f(...) |  | {EXTERNAL LOCATION} | Option |
+| pattern_matching.rs:827:5:827:7 | f(...) | T | file://:0:0:0:0 | () |
+| pattern_matching.rs:828:5:828:22 | literal_patterns(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:829:5:829:25 | identifier_patterns(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:830:5:830:23 | wildcard_patterns(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:831:5:831:20 | range_patterns(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:832:5:832:24 | reference_patterns(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:833:5:833:21 | record_patterns(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:834:5:834:27 | tuple_struct_patterns(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:835:5:835:20 | tuple_patterns(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:836:5:836:28 | parenthesized_patterns(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:837:5:837:20 | slice_patterns(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:838:5:838:19 | path_patterns(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:839:5:839:17 | or_patterns(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:840:5:840:19 | rest_patterns(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:841:5:841:20 | macro_patterns(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:842:5:842:29 | complex_nested_patterns(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:843:5:843:32 | patterns_in_let_statements(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:844:5:844:37 | patterns_in_function_parameters(...) |  | file://:0:0:0:0 | () |
+| pattern_matching.rs:845:5:845:30 | patterns_in_control_flow(...) |  | file://:0:0:0:0 | () |
 testFailures
diff --git a/rust/ql/test/library-tests/type-inference/type-inference.ql b/rust/ql/test/library-tests/type-inference/type-inference.ql
index 2122c7898a7..0843b2fa6ab 100644
--- a/rust/ql/test/library-tests/type-inference/type-inference.ql
+++ b/rust/ql/test/library-tests/type-inference/type-inference.ql
@@ -1,10 +1,12 @@
 import rust
 import utils.test.InlineExpectationsTest
+import codeql.rust.internal.Type
 import codeql.rust.internal.TypeInference as TypeInference
 import TypeInference
 
 query predicate inferType(AstNode n, TypePath path, Type t) {
   t = TypeInference::inferType(n, path) and
+  t != TUnknownType() and
   n.fromSource() and
   not n.isFromMacroExpansion() and
   not n instanceof IdentPat and // avoid overlap in the output with the underlying `Name` node
@@ -48,24 +50,27 @@ module ResolveTest implements TestSig {
 }
 
 module TypeTest implements TestSig {
-  string getARelevantTag() { result = "type" }
+  string getARelevantTag() { result = ["type", "certainType"] }
 
   predicate tagIsOptional(string expectedTag) { expectedTag = "type" }
 
   predicate hasActualResult(Location location, string element, string tag, string value) { none() }
 
   predicate hasOptionalResult(Location location, string element, string tag, string value) {
-    tag = "type" and
     exists(AstNode n, TypePath path, Type t |
       t = TypeInference::inferType(n, path) and
+      (
+        if t = TypeInference::CertainTypeInference::inferCertainType(n, path)
+        then tag = "certainType"
+        else tag = "type"
+      ) and
       location = n.getLocation() and
-      if path.isEmpty()
-      then value = element + ":" + t
-      else value = element + ":" + path.toString() + "." + t.toString()
-    |
-      element = n.toString()
-      or
-      element = n.(IdentPat).getName().getText()
+      (
+        if path.isEmpty()
+        then value = element + ":" + t
+        else value = element + ":" + path.toString() + "." + t.toString()
+      ) and
+      element = [n.toString(), n.(IdentPat).getName().getText()]
     )
   }
 }
diff --git a/rust/ql/test/library-tests/variables/CONSISTENCY/PathResolutionConsistency.expected b/rust/ql/test/library-tests/variables/CONSISTENCY/PathResolutionConsistency.expected
index 7103b402f7f..6b4022b86e5 100644
--- a/rust/ql/test/library-tests/variables/CONSISTENCY/PathResolutionConsistency.expected
+++ b/rust/ql/test/library-tests/variables/CONSISTENCY/PathResolutionConsistency.expected
@@ -1,3 +1,3 @@
 multipleCallTargets
-| main.rs:87:19:87:40 | ...::from(...) |
-| main.rs:106:19:106:40 | ...::from(...) |
+| main.rs:91:19:91:40 | ...::from(...) |
+| main.rs:113:19:113:40 | ...::from(...) |
diff --git a/rust/ql/test/library-tests/variables/Cfg.expected b/rust/ql/test/library-tests/variables/Cfg.expected
index 157b3bd4e49..7d8da915bfb 100644
--- a/rust/ql/test/library-tests/variables/Cfg.expected
+++ b/rust/ql/test/library-tests/variables/Cfg.expected
@@ -1,1640 +1,1942 @@
 edges
-| main.rs:3:1:6:1 | enter fn print_str | main.rs:3:14:3:14 | s |  |
-| main.rs:3:1:6:1 | exit fn print_str (normal) | main.rs:3:1:6:1 | exit fn print_str |  |
-| main.rs:3:14:3:14 | s | main.rs:3:14:3:14 | s |  |
-| main.rs:3:14:3:14 | s | main.rs:3:14:3:20 | ...: ... | match |
-| main.rs:3:14:3:20 | ...: ... | main.rs:5:5:5:22 | ExprStmt |  |
-| main.rs:4:1:6:1 | { ... } | main.rs:3:1:6:1 | exit fn print_str (normal) |  |
-| main.rs:5:5:5:21 | ...::_print | main.rs:5:14:5:17 | "{}\\n" |  |
-| main.rs:5:5:5:21 | MacroExpr | main.rs:4:1:6:1 | { ... } |  |
-| main.rs:5:5:5:21 | println!... | main.rs:5:5:5:21 | MacroExpr |  |
-| main.rs:5:5:5:22 | ExprStmt | main.rs:5:14:5:20 | ExprStmt |  |
-| main.rs:5:14:5:17 | "{}\\n" | main.rs:5:20:5:20 | s |  |
-| main.rs:5:14:5:20 | ...::_print(...) | main.rs:5:14:5:20 | { ... } |  |
-| main.rs:5:14:5:20 | ...::format_args_nl!... | main.rs:5:14:5:20 | MacroExpr |  |
-| main.rs:5:14:5:20 | ExprStmt | main.rs:5:5:5:21 | ...::_print |  |
-| main.rs:5:14:5:20 | FormatArgsExpr | main.rs:5:14:5:20 | ...::format_args_nl!... |  |
-| main.rs:5:14:5:20 | MacroBlockExpr | main.rs:5:5:5:21 | println!... |  |
-| main.rs:5:14:5:20 | MacroExpr | main.rs:5:14:5:20 | ...::_print(...) |  |
-| main.rs:5:14:5:20 | { ... } | main.rs:5:14:5:20 | MacroBlockExpr |  |
-| main.rs:5:20:5:20 | s | main.rs:5:14:5:20 | FormatArgsExpr |  |
-| main.rs:8:1:11:1 | enter fn print_i64 | main.rs:8:14:8:14 | i |  |
-| main.rs:8:1:11:1 | exit fn print_i64 (normal) | main.rs:8:1:11:1 | exit fn print_i64 |  |
-| main.rs:8:14:8:14 | i | main.rs:8:14:8:14 | i |  |
-| main.rs:8:14:8:14 | i | main.rs:8:14:8:19 | ...: i64 | match |
-| main.rs:8:14:8:19 | ...: i64 | main.rs:10:5:10:22 | ExprStmt |  |
-| main.rs:9:1:11:1 | { ... } | main.rs:8:1:11:1 | exit fn print_i64 (normal) |  |
-| main.rs:10:5:10:21 | ...::_print | main.rs:10:14:10:17 | "{}\\n" |  |
-| main.rs:10:5:10:21 | MacroExpr | main.rs:9:1:11:1 | { ... } |  |
-| main.rs:10:5:10:21 | println!... | main.rs:10:5:10:21 | MacroExpr |  |
-| main.rs:10:5:10:22 | ExprStmt | main.rs:10:14:10:20 | ExprStmt |  |
-| main.rs:10:14:10:17 | "{}\\n" | main.rs:10:20:10:20 | i |  |
-| main.rs:10:14:10:20 | ...::_print(...) | main.rs:10:14:10:20 | { ... } |  |
-| main.rs:10:14:10:20 | ...::format_args_nl!... | main.rs:10:14:10:20 | MacroExpr |  |
-| main.rs:10:14:10:20 | ExprStmt | main.rs:10:5:10:21 | ...::_print |  |
-| main.rs:10:14:10:20 | FormatArgsExpr | main.rs:10:14:10:20 | ...::format_args_nl!... |  |
-| main.rs:10:14:10:20 | MacroBlockExpr | main.rs:10:5:10:21 | println!... |  |
-| main.rs:10:14:10:20 | MacroExpr | main.rs:10:14:10:20 | ...::_print(...) |  |
-| main.rs:10:14:10:20 | { ... } | main.rs:10:14:10:20 | MacroBlockExpr |  |
-| main.rs:10:20:10:20 | i | main.rs:10:14:10:20 | FormatArgsExpr |  |
-| main.rs:13:1:15:1 | enter fn print_i64_ref | main.rs:13:18:13:18 | i |  |
-| main.rs:13:1:15:1 | exit fn print_i64_ref (normal) | main.rs:13:1:15:1 | exit fn print_i64_ref |  |
-| main.rs:13:18:13:18 | i | main.rs:13:18:13:18 | i |  |
-| main.rs:13:18:13:18 | i | main.rs:13:18:13:24 | ...: ... | match |
-| main.rs:13:18:13:24 | ...: ... | main.rs:14:5:14:13 | print_i64 |  |
-| main.rs:13:27:15:1 | { ... } | main.rs:13:1:15:1 | exit fn print_i64_ref (normal) |  |
-| main.rs:14:5:14:13 | print_i64 | main.rs:14:16:14:16 | i |  |
-| main.rs:14:5:14:17 | print_i64(...) | main.rs:13:27:15:1 | { ... } |  |
-| main.rs:14:15:14:16 | * ... | main.rs:14:5:14:17 | print_i64(...) |  |
-| main.rs:14:16:14:16 | i | main.rs:14:15:14:16 | * ... |  |
-| main.rs:17:1:20:1 | enter fn immutable_variable | main.rs:18:5:18:17 | let ... = "a" |  |
-| main.rs:17:1:20:1 | exit fn immutable_variable (normal) | main.rs:17:1:20:1 | exit fn immutable_variable |  |
-| main.rs:17:25:20:1 | { ... } | main.rs:17:1:20:1 | exit fn immutable_variable (normal) |  |
-| main.rs:18:5:18:17 | let ... = "a" | main.rs:18:14:18:16 | "a" |  |
-| main.rs:18:9:18:10 | x1 | main.rs:18:9:18:10 | x1 |  |
-| main.rs:18:9:18:10 | x1 | main.rs:19:5:19:18 | ExprStmt | match |
-| main.rs:18:14:18:16 | "a" | main.rs:18:9:18:10 | x1 |  |
-| main.rs:19:5:19:13 | print_str | main.rs:19:15:19:16 | x1 |  |
-| main.rs:19:5:19:17 | print_str(...) | main.rs:17:25:20:1 | { ... } |  |
-| main.rs:19:5:19:18 | ExprStmt | main.rs:19:5:19:13 | print_str |  |
-| main.rs:19:15:19:16 | x1 | main.rs:19:5:19:17 | print_str(...) |  |
-| main.rs:22:1:27:1 | enter fn mutable_variable | main.rs:23:5:23:19 | let ... = 4 |  |
-| main.rs:22:1:27:1 | exit fn mutable_variable (normal) | main.rs:22:1:27:1 | exit fn mutable_variable |  |
-| main.rs:22:23:27:1 | { ... } | main.rs:22:1:27:1 | exit fn mutable_variable (normal) |  |
-| main.rs:23:5:23:19 | let ... = 4 | main.rs:23:18:23:18 | 4 |  |
-| main.rs:23:9:23:14 | mut x2 | main.rs:24:5:24:18 | ExprStmt | match |
-| main.rs:23:13:23:14 | x2 | main.rs:23:9:23:14 | mut x2 |  |
-| main.rs:23:18:23:18 | 4 | main.rs:23:13:23:14 | x2 |  |
-| main.rs:24:5:24:13 | print_i64 | main.rs:24:15:24:16 | x2 |  |
-| main.rs:24:5:24:17 | print_i64(...) | main.rs:25:5:25:11 | ExprStmt |  |
-| main.rs:24:5:24:18 | ExprStmt | main.rs:24:5:24:13 | print_i64 |  |
-| main.rs:24:15:24:16 | x2 | main.rs:24:5:24:17 | print_i64(...) |  |
-| main.rs:25:5:25:6 | x2 | main.rs:25:10:25:10 | 5 |  |
-| main.rs:25:5:25:10 | ... = ... | main.rs:26:5:26:18 | ExprStmt |  |
-| main.rs:25:5:25:11 | ExprStmt | main.rs:25:5:25:6 | x2 |  |
-| main.rs:25:10:25:10 | 5 | main.rs:25:5:25:10 | ... = ... |  |
+| main.rs:5:1:8:1 | enter fn print_str | main.rs:5:14:5:14 | s |  |
+| main.rs:5:1:8:1 | exit fn print_str (normal) | main.rs:5:1:8:1 | exit fn print_str |  |
+| main.rs:5:14:5:14 | s | main.rs:5:14:5:14 | s |  |
+| main.rs:5:14:5:14 | s | main.rs:5:14:5:20 | ...: ... | match |
+| main.rs:5:14:5:20 | ...: ... | main.rs:7:5:7:22 | ExprStmt |  |
+| main.rs:6:1:8:1 | { ... } | main.rs:5:1:8:1 | exit fn print_str (normal) |  |
+| main.rs:7:5:7:12 | ...::_print | main.rs:7:14:7:17 | "{}\\n" |  |
+| main.rs:7:5:7:21 | MacroExpr | main.rs:6:1:8:1 | { ... } |  |
+| main.rs:7:5:7:21 | println!... | main.rs:7:5:7:21 | MacroExpr |  |
+| main.rs:7:5:7:22 | ExprStmt | main.rs:7:14:7:20 | ExprStmt |  |
+| main.rs:7:14:7:17 | "{}\\n" | main.rs:7:20:7:20 | s |  |
+| main.rs:7:14:7:20 | ...::_print(...) | main.rs:7:14:7:20 | { ... } |  |
+| main.rs:7:14:7:20 | ...::format_args_nl!... | main.rs:7:14:7:20 | MacroExpr |  |
+| main.rs:7:14:7:20 | ExprStmt | main.rs:7:5:7:12 | ...::_print |  |
+| main.rs:7:14:7:20 | FormatArgsExpr | main.rs:7:14:7:20 | ...::format_args_nl!... |  |
+| main.rs:7:14:7:20 | MacroBlockExpr | main.rs:7:5:7:21 | println!... |  |
+| main.rs:7:14:7:20 | MacroExpr | main.rs:7:14:7:20 | ...::_print(...) |  |
+| main.rs:7:14:7:20 | { ... } | main.rs:7:14:7:20 | MacroBlockExpr |  |
+| main.rs:7:20:7:20 | s | main.rs:7:14:7:20 | FormatArgsExpr |  |
+| main.rs:10:1:13:1 | enter fn print_i64 | main.rs:10:14:10:14 | i |  |
+| main.rs:10:1:13:1 | exit fn print_i64 (normal) | main.rs:10:1:13:1 | exit fn print_i64 |  |
+| main.rs:10:14:10:14 | i | main.rs:10:14:10:14 | i |  |
+| main.rs:10:14:10:14 | i | main.rs:10:14:10:19 | ...: i64 | match |
+| main.rs:10:14:10:19 | ...: i64 | main.rs:12:5:12:22 | ExprStmt |  |
+| main.rs:11:1:13:1 | { ... } | main.rs:10:1:13:1 | exit fn print_i64 (normal) |  |
+| main.rs:12:5:12:12 | ...::_print | main.rs:12:14:12:17 | "{}\\n" |  |
+| main.rs:12:5:12:21 | MacroExpr | main.rs:11:1:13:1 | { ... } |  |
+| main.rs:12:5:12:21 | println!... | main.rs:12:5:12:21 | MacroExpr |  |
+| main.rs:12:5:12:22 | ExprStmt | main.rs:12:14:12:20 | ExprStmt |  |
+| main.rs:12:14:12:17 | "{}\\n" | main.rs:12:20:12:20 | i |  |
+| main.rs:12:14:12:20 | ...::_print(...) | main.rs:12:14:12:20 | { ... } |  |
+| main.rs:12:14:12:20 | ...::format_args_nl!... | main.rs:12:14:12:20 | MacroExpr |  |
+| main.rs:12:14:12:20 | ExprStmt | main.rs:12:5:12:12 | ...::_print |  |
+| main.rs:12:14:12:20 | FormatArgsExpr | main.rs:12:14:12:20 | ...::format_args_nl!... |  |
+| main.rs:12:14:12:20 | MacroBlockExpr | main.rs:12:5:12:21 | println!... |  |
+| main.rs:12:14:12:20 | MacroExpr | main.rs:12:14:12:20 | ...::_print(...) |  |
+| main.rs:12:14:12:20 | { ... } | main.rs:12:14:12:20 | MacroBlockExpr |  |
+| main.rs:12:20:12:20 | i | main.rs:12:14:12:20 | FormatArgsExpr |  |
+| main.rs:15:1:17:1 | enter fn print_i64_ref | main.rs:15:18:15:18 | i |  |
+| main.rs:15:1:17:1 | exit fn print_i64_ref (normal) | main.rs:15:1:17:1 | exit fn print_i64_ref |  |
+| main.rs:15:18:15:18 | i | main.rs:15:18:15:18 | i |  |
+| main.rs:15:18:15:18 | i | main.rs:15:18:15:24 | ...: ... | match |
+| main.rs:15:18:15:24 | ...: ... | main.rs:16:5:16:13 | print_i64 |  |
+| main.rs:15:27:17:1 | { ... } | main.rs:15:1:17:1 | exit fn print_i64_ref (normal) |  |
+| main.rs:16:5:16:13 | print_i64 | main.rs:16:16:16:16 | i |  |
+| main.rs:16:5:16:17 | print_i64(...) | main.rs:15:27:17:1 | { ... } |  |
+| main.rs:16:15:16:16 | * ... | main.rs:16:5:16:17 | print_i64(...) |  |
+| main.rs:16:16:16:16 | i | main.rs:16:15:16:16 | * ... |  |
+| main.rs:19:1:22:1 | enter fn immutable_variable | main.rs:20:5:20:17 | let ... = "a" |  |
+| main.rs:19:1:22:1 | exit fn immutable_variable (normal) | main.rs:19:1:22:1 | exit fn immutable_variable |  |
+| main.rs:19:25:22:1 | { ... } | main.rs:19:1:22:1 | exit fn immutable_variable (normal) |  |
+| main.rs:20:5:20:17 | let ... = "a" | main.rs:20:14:20:16 | "a" |  |
+| main.rs:20:9:20:10 | x1 | main.rs:20:9:20:10 | x1 |  |
+| main.rs:20:9:20:10 | x1 | main.rs:21:5:21:18 | ExprStmt | match |
+| main.rs:20:14:20:16 | "a" | main.rs:20:9:20:10 | x1 |  |
+| main.rs:21:5:21:13 | print_str | main.rs:21:15:21:16 | x1 |  |
+| main.rs:21:5:21:17 | print_str(...) | main.rs:19:25:22:1 | { ... } |  |
+| main.rs:21:5:21:18 | ExprStmt | main.rs:21:5:21:13 | print_str |  |
+| main.rs:21:15:21:16 | x1 | main.rs:21:5:21:17 | print_str(...) |  |
+| main.rs:24:1:31:1 | enter fn mutable_variable | main.rs:25:5:25:19 | let ... = 4 |  |
+| main.rs:24:1:31:1 | exit fn mutable_variable (normal) | main.rs:24:1:31:1 | exit fn mutable_variable |  |
+| main.rs:24:23:31:1 | { ... } | main.rs:24:1:31:1 | exit fn mutable_variable (normal) |  |
+| main.rs:25:5:25:19 | let ... = 4 | main.rs:25:18:25:18 | 4 |  |
+| main.rs:25:9:25:14 | mut x2 | main.rs:26:5:26:18 | ExprStmt | match |
+| main.rs:25:13:25:14 | x2 | main.rs:25:9:25:14 | mut x2 |  |
+| main.rs:25:18:25:18 | 4 | main.rs:25:13:25:14 | x2 |  |
 | main.rs:26:5:26:13 | print_i64 | main.rs:26:15:26:16 | x2 |  |
-| main.rs:26:5:26:17 | print_i64(...) | main.rs:22:23:27:1 | { ... } |  |
+| main.rs:26:5:26:17 | print_i64(...) | main.rs:27:5:27:11 | ExprStmt |  |
 | main.rs:26:5:26:18 | ExprStmt | main.rs:26:5:26:13 | print_i64 |  |
 | main.rs:26:15:26:16 | x2 | main.rs:26:5:26:17 | print_i64(...) |  |
-| main.rs:29:1:34:1 | enter fn mutable_variable_immutable_borrow | main.rs:30:5:30:18 | let ... = 1 |  |
-| main.rs:29:1:34:1 | exit fn mutable_variable_immutable_borrow (normal) | main.rs:29:1:34:1 | exit fn mutable_variable_immutable_borrow |  |
-| main.rs:29:40:34:1 | { ... } | main.rs:29:1:34:1 | exit fn mutable_variable_immutable_borrow (normal) |  |
-| main.rs:30:5:30:18 | let ... = 1 | main.rs:30:17:30:17 | 1 |  |
-| main.rs:30:9:30:13 | mut x | main.rs:31:5:31:22 | ExprStmt | match |
-| main.rs:30:13:30:13 | x | main.rs:30:9:30:13 | mut x |  |
-| main.rs:30:17:30:17 | 1 | main.rs:30:13:30:13 | x |  |
-| main.rs:31:5:31:17 | print_i64_ref | main.rs:31:20:31:20 | x |  |
-| main.rs:31:5:31:21 | print_i64_ref(...) | main.rs:32:5:32:10 | ExprStmt |  |
-| main.rs:31:5:31:22 | ExprStmt | main.rs:31:5:31:17 | print_i64_ref |  |
-| main.rs:31:19:31:20 | &x | main.rs:31:5:31:21 | print_i64_ref(...) |  |
-| main.rs:31:20:31:20 | x | main.rs:31:19:31:20 | &x |  |
-| main.rs:32:5:32:5 | x | main.rs:32:9:32:9 | 2 |  |
-| main.rs:32:5:32:9 | ... = ... | main.rs:33:5:33:22 | ExprStmt |  |
-| main.rs:32:5:32:10 | ExprStmt | main.rs:32:5:32:5 | x |  |
-| main.rs:32:9:32:9 | 2 | main.rs:32:5:32:9 | ... = ... |  |
-| main.rs:33:5:33:17 | print_i64_ref | main.rs:33:20:33:20 | x |  |
-| main.rs:33:5:33:21 | print_i64_ref(...) | main.rs:29:40:34:1 | { ... } |  |
-| main.rs:33:5:33:22 | ExprStmt | main.rs:33:5:33:17 | print_i64_ref |  |
-| main.rs:33:19:33:20 | &x | main.rs:33:5:33:21 | print_i64_ref(...) |  |
-| main.rs:33:20:33:20 | x | main.rs:33:19:33:20 | &x |  |
-| main.rs:36:1:42:1 | enter fn variable_shadow1 | main.rs:37:5:37:15 | let ... = 1 |  |
-| main.rs:36:1:42:1 | exit fn variable_shadow1 (normal) | main.rs:36:1:42:1 | exit fn variable_shadow1 |  |
-| main.rs:36:23:42:1 | { ... } | main.rs:36:1:42:1 | exit fn variable_shadow1 (normal) |  |
-| main.rs:37:5:37:15 | let ... = 1 | main.rs:37:14:37:14 | 1 |  |
-| main.rs:37:9:37:10 | x3 | main.rs:37:9:37:10 | x3 |  |
-| main.rs:37:9:37:10 | x3 | main.rs:38:5:38:18 | ExprStmt | match |
-| main.rs:37:14:37:14 | 1 | main.rs:37:9:37:10 | x3 |  |
-| main.rs:38:5:38:13 | print_i64 | main.rs:38:15:38:16 | x3 |  |
-| main.rs:38:5:38:17 | print_i64(...) | main.rs:39:5:40:15 | let ... = ... |  |
-| main.rs:38:5:38:18 | ExprStmt | main.rs:38:5:38:13 | print_i64 |  |
-| main.rs:38:15:38:16 | x3 | main.rs:38:5:38:17 | print_i64(...) |  |
-| main.rs:39:5:40:15 | let ... = ... | main.rs:40:9:40:10 | x3 |  |
-| main.rs:39:9:39:10 | x3 | main.rs:39:9:39:10 | x3 |  |
-| main.rs:39:9:39:10 | x3 | main.rs:41:5:41:18 | ExprStmt | match |
-| main.rs:40:9:40:10 | x3 | main.rs:40:14:40:14 | 1 |  |
-| main.rs:40:9:40:14 | ... + ... | main.rs:39:9:39:10 | x3 |  |
-| main.rs:40:14:40:14 | 1 | main.rs:40:9:40:14 | ... + ... |  |
-| main.rs:41:5:41:13 | print_i64 | main.rs:41:15:41:16 | x3 |  |
-| main.rs:41:5:41:17 | print_i64(...) | main.rs:36:23:42:1 | { ... } |  |
-| main.rs:41:5:41:18 | ExprStmt | main.rs:41:5:41:13 | print_i64 |  |
-| main.rs:41:15:41:16 | x3 | main.rs:41:5:41:17 | print_i64(...) |  |
-| main.rs:44:1:52:1 | enter fn variable_shadow2 | main.rs:45:5:45:17 | let ... = "a" |  |
-| main.rs:44:1:52:1 | exit fn variable_shadow2 (normal) | main.rs:44:1:52:1 | exit fn variable_shadow2 |  |
-| main.rs:44:23:52:1 | { ... } | main.rs:44:1:52:1 | exit fn variable_shadow2 (normal) |  |
-| main.rs:45:5:45:17 | let ... = "a" | main.rs:45:14:45:16 | "a" |  |
-| main.rs:45:9:45:10 | x4 | main.rs:45:9:45:10 | x4 |  |
-| main.rs:45:9:45:10 | x4 | main.rs:46:5:46:18 | ExprStmt | match |
-| main.rs:45:14:45:16 | "a" | main.rs:45:9:45:10 | x4 |  |
-| main.rs:46:5:46:13 | print_str | main.rs:46:15:46:16 | x4 |  |
-| main.rs:46:5:46:17 | print_str(...) | main.rs:47:5:50:5 | ExprStmt |  |
-| main.rs:46:5:46:18 | ExprStmt | main.rs:46:5:46:13 | print_str |  |
-| main.rs:46:15:46:16 | x4 | main.rs:46:5:46:17 | print_str(...) |  |
-| main.rs:47:5:50:5 | ExprStmt | main.rs:48:9:48:21 | let ... = "b" |  |
-| main.rs:47:5:50:5 | { ... } | main.rs:51:5:51:18 | ExprStmt |  |
-| main.rs:48:9:48:21 | let ... = "b" | main.rs:48:18:48:20 | "b" |  |
-| main.rs:48:13:48:14 | x4 | main.rs:48:13:48:14 | x4 |  |
-| main.rs:48:13:48:14 | x4 | main.rs:49:9:49:22 | ExprStmt | match |
-| main.rs:48:18:48:20 | "b" | main.rs:48:13:48:14 | x4 |  |
-| main.rs:49:9:49:17 | print_str | main.rs:49:19:49:20 | x4 |  |
-| main.rs:49:9:49:21 | print_str(...) | main.rs:47:5:50:5 | { ... } |  |
-| main.rs:49:9:49:22 | ExprStmt | main.rs:49:9:49:17 | print_str |  |
-| main.rs:49:19:49:20 | x4 | main.rs:49:9:49:21 | print_str(...) |  |
-| main.rs:51:5:51:13 | print_str | main.rs:51:15:51:16 | x4 |  |
-| main.rs:51:5:51:17 | print_str(...) | main.rs:44:23:52:1 | { ... } |  |
-| main.rs:51:5:51:18 | ExprStmt | main.rs:51:5:51:13 | print_str |  |
-| main.rs:51:15:51:16 | x4 | main.rs:51:5:51:17 | print_str(...) |  |
-| main.rs:59:1:74:1 | enter fn let_pattern1 | main.rs:60:5:69:47 | let ... = ... |  |
-| main.rs:59:1:74:1 | exit fn let_pattern1 (normal) | main.rs:59:1:74:1 | exit fn let_pattern1 |  |
-| main.rs:59:19:74:1 | { ... } | main.rs:59:1:74:1 | exit fn let_pattern1 (normal) |  |
-| main.rs:60:5:69:47 | let ... = ... | main.rs:69:11:69:13 | "a" |  |
-| main.rs:60:9:69:5 | TuplePat | main.rs:61:9:64:9 | TuplePat | match |
-| main.rs:61:9:64:9 | TuplePat | main.rs:62:13:62:14 | a1 | match |
-| main.rs:62:13:62:14 | a1 | main.rs:62:13:62:14 | a1 |  |
-| main.rs:62:13:62:14 | a1 | main.rs:63:13:63:14 | b1 | match |
-| main.rs:63:13:63:14 | b1 | main.rs:63:13:63:14 | b1 |  |
-| main.rs:63:13:63:14 | b1 | main.rs:65:9:68:9 | Point {...} | match |
-| main.rs:65:9:68:9 | Point {...} | main.rs:66:13:66:13 | x | match |
-| main.rs:66:13:66:13 | x | main.rs:66:13:66:13 | x |  |
-| main.rs:66:13:66:13 | x | main.rs:67:13:67:13 | y | match |
-| main.rs:67:13:67:13 | y | main.rs:67:13:67:13 | y |  |
-| main.rs:67:13:67:13 | y | main.rs:70:5:70:18 | ExprStmt | match |
-| main.rs:69:9:69:46 | TupleExpr | main.rs:60:9:69:5 | TuplePat |  |
-| main.rs:69:10:69:19 | TupleExpr | main.rs:69:33:69:35 | "x" |  |
-| main.rs:69:11:69:13 | "a" | main.rs:69:16:69:18 | "b" |  |
-| main.rs:69:16:69:18 | "b" | main.rs:69:10:69:19 | TupleExpr |  |
-| main.rs:69:22:69:45 | Point {...} | main.rs:69:9:69:46 | TupleExpr |  |
-| main.rs:69:33:69:35 | "x" | main.rs:69:41:69:43 | "y" |  |
-| main.rs:69:41:69:43 | "y" | main.rs:69:22:69:45 | Point {...} |  |
-| main.rs:70:5:70:13 | print_str | main.rs:70:15:70:16 | a1 |  |
-| main.rs:70:5:70:17 | print_str(...) | main.rs:71:5:71:18 | ExprStmt |  |
-| main.rs:70:5:70:18 | ExprStmt | main.rs:70:5:70:13 | print_str |  |
-| main.rs:70:15:70:16 | a1 | main.rs:70:5:70:17 | print_str(...) |  |
-| main.rs:71:5:71:13 | print_str | main.rs:71:15:71:16 | b1 |  |
-| main.rs:71:5:71:17 | print_str(...) | main.rs:72:5:72:17 | ExprStmt |  |
-| main.rs:71:5:71:18 | ExprStmt | main.rs:71:5:71:13 | print_str |  |
-| main.rs:71:15:71:16 | b1 | main.rs:71:5:71:17 | print_str(...) |  |
-| main.rs:72:5:72:13 | print_str | main.rs:72:15:72:15 | x |  |
-| main.rs:72:5:72:16 | print_str(...) | main.rs:73:5:73:17 | ExprStmt |  |
-| main.rs:72:5:72:17 | ExprStmt | main.rs:72:5:72:13 | print_str |  |
-| main.rs:72:15:72:15 | x | main.rs:72:5:72:16 | print_str(...) |  |
-| main.rs:73:5:73:13 | print_str | main.rs:73:15:73:15 | y |  |
-| main.rs:73:5:73:16 | print_str(...) | main.rs:59:19:74:1 | { ... } |  |
-| main.rs:73:5:73:17 | ExprStmt | main.rs:73:5:73:13 | print_str |  |
-| main.rs:73:15:73:15 | y | main.rs:73:5:73:16 | print_str(...) |  |
-| main.rs:76:1:84:1 | enter fn let_pattern2 | main.rs:77:5:77:38 | let ... = ... |  |
-| main.rs:76:1:84:1 | exit fn let_pattern2 (normal) | main.rs:76:1:84:1 | exit fn let_pattern2 |  |
-| main.rs:76:19:84:1 | { ... } | main.rs:76:1:84:1 | exit fn let_pattern2 (normal) |  |
-| main.rs:77:5:77:38 | let ... = ... | main.rs:77:25:77:27 | "a" |  |
-| main.rs:77:9:77:10 | p1 | main.rs:77:9:77:10 | p1 |  |
-| main.rs:77:9:77:10 | p1 | main.rs:78:5:81:11 | let ... = p1 | match |
-| main.rs:77:14:77:37 | Point {...} | main.rs:77:9:77:10 | p1 |  |
-| main.rs:77:25:77:27 | "a" | main.rs:77:33:77:35 | "b" |  |
-| main.rs:77:33:77:35 | "b" | main.rs:77:14:77:37 | Point {...} |  |
-| main.rs:78:5:81:11 | let ... = p1 | main.rs:81:9:81:10 | p1 |  |
-| main.rs:78:9:81:5 | Point {...} | main.rs:79:12:79:13 | a2 | match |
-| main.rs:79:12:79:13 | a2 | main.rs:79:12:79:13 | a2 |  |
-| main.rs:79:12:79:13 | a2 | main.rs:80:12:80:13 | b2 | match |
-| main.rs:80:12:80:13 | b2 | main.rs:80:12:80:13 | b2 |  |
-| main.rs:80:12:80:13 | b2 | main.rs:82:5:82:18 | ExprStmt | match |
-| main.rs:81:9:81:10 | p1 | main.rs:78:9:81:5 | Point {...} |  |
-| main.rs:82:5:82:13 | print_str | main.rs:82:15:82:16 | a2 |  |
-| main.rs:82:5:82:17 | print_str(...) | main.rs:83:5:83:18 | ExprStmt |  |
-| main.rs:82:5:82:18 | ExprStmt | main.rs:82:5:82:13 | print_str |  |
-| main.rs:82:15:82:16 | a2 | main.rs:82:5:82:17 | print_str(...) |  |
-| main.rs:83:5:83:13 | print_str | main.rs:83:15:83:16 | b2 |  |
-| main.rs:83:5:83:17 | print_str(...) | main.rs:76:19:84:1 | { ... } |  |
-| main.rs:83:5:83:18 | ExprStmt | main.rs:83:5:83:13 | print_str |  |
-| main.rs:83:15:83:16 | b2 | main.rs:83:5:83:17 | print_str(...) |  |
-| main.rs:86:1:93:1 | enter fn let_pattern3 | main.rs:87:5:87:42 | let ... = ... |  |
-| main.rs:86:1:93:1 | exit fn let_pattern3 (normal) | main.rs:86:1:93:1 | exit fn let_pattern3 |  |
-| main.rs:86:19:93:1 | { ... } | main.rs:86:1:93:1 | exit fn let_pattern3 (normal) |  |
-| main.rs:87:5:87:42 | let ... = ... | main.rs:87:14:87:17 | Some |  |
-| main.rs:87:9:87:10 | s1 | main.rs:87:9:87:10 | s1 |  |
-| main.rs:87:9:87:10 | s1 | main.rs:89:8:90:12 | let ... = s1 | match |
-| main.rs:87:14:87:17 | Some | main.rs:87:19:87:30 | ...::from |  |
-| main.rs:87:14:87:41 | Some(...) | main.rs:87:9:87:10 | s1 |  |
-| main.rs:87:19:87:30 | ...::from | main.rs:87:32:87:39 | "Hello!" |  |
-| main.rs:87:19:87:40 | ...::from(...) | main.rs:87:14:87:41 | Some(...) |  |
-| main.rs:87:32:87:39 | "Hello!" | main.rs:87:19:87:40 | ...::from(...) |  |
-| main.rs:89:5:92:5 | if ... {...} | main.rs:86:19:93:1 | { ... } |  |
-| main.rs:89:8:90:12 | let ... = s1 | main.rs:90:11:90:12 | s1 |  |
-| main.rs:89:12:89:23 | Some(...) | main.rs:89:5:92:5 | if ... {...} | no-match |
-| main.rs:89:12:89:23 | Some(...) | main.rs:89:21:89:22 | s2 | match |
-| main.rs:89:17:89:22 | ref s2 | main.rs:91:9:91:22 | ExprStmt | match |
-| main.rs:89:21:89:22 | s2 | main.rs:89:17:89:22 | ref s2 |  |
-| main.rs:90:11:90:12 | s1 | main.rs:89:12:89:23 | Some(...) |  |
-| main.rs:90:14:92:5 | { ... } | main.rs:89:5:92:5 | if ... {...} |  |
-| main.rs:91:9:91:17 | print_str | main.rs:91:19:91:20 | s2 |  |
-| main.rs:91:9:91:21 | print_str(...) | main.rs:90:14:92:5 | { ... } |  |
-| main.rs:91:9:91:22 | ExprStmt | main.rs:91:9:91:17 | print_str |  |
-| main.rs:91:19:91:20 | s2 | main.rs:91:9:91:21 | print_str(...) |  |
-| main.rs:95:1:103:1 | enter fn let_pattern4 | main.rs:96:5:101:6 | let ... = ... else {...} |  |
-| main.rs:95:1:103:1 | exit fn let_pattern4 (normal) | main.rs:95:1:103:1 | exit fn let_pattern4 |  |
-| main.rs:95:19:103:1 | { ... } | main.rs:95:1:103:1 | exit fn let_pattern4 (normal) |  |
-| main.rs:96:5:101:6 | let ... = ... else {...} | main.rs:97:7:97:10 | Some |  |
-| main.rs:96:9:96:16 | Some(...) | main.rs:96:14:96:15 | x5 | match |
-| main.rs:96:9:96:16 | Some(...) | main.rs:100:9:100:15 | ...::panic | no-match |
-| main.rs:96:14:96:15 | x5 | main.rs:96:14:96:15 | x5 |  |
-| main.rs:96:14:96:15 | x5 | main.rs:102:5:102:18 | ExprStmt | match |
-| main.rs:97:7:97:10 | Some | main.rs:97:12:97:15 | "x5" |  |
-| main.rs:97:7:97:16 | Some(...) | main.rs:96:9:96:16 | Some(...) |  |
-| main.rs:97:12:97:15 | "x5" | main.rs:97:7:97:16 | Some(...) |  |
-| main.rs:100:9:100:15 | "not yet implemented" | main.rs:100:9:100:15 | ...::panic(...) |  |
-| main.rs:100:9:100:15 | ...::panic | main.rs:100:9:100:15 | "not yet implemented" |  |
-| main.rs:100:9:100:15 | ...::panic(...) | main.rs:100:9:100:15 | MacroBlockExpr |  |
-| main.rs:100:9:100:15 | MacroBlockExpr | main.rs:100:9:100:15 | todo!... |  |
-| main.rs:100:9:100:15 | MacroExpr | main.rs:99:10:101:5 | { ... } |  |
-| main.rs:100:9:100:15 | todo!... | main.rs:100:9:100:15 | MacroExpr |  |
-| main.rs:102:5:102:13 | print_str | main.rs:102:15:102:16 | x5 |  |
-| main.rs:102:5:102:17 | print_str(...) | main.rs:95:19:103:1 | { ... } |  |
-| main.rs:102:5:102:18 | ExprStmt | main.rs:102:5:102:13 | print_str |  |
-| main.rs:102:15:102:16 | x5 | main.rs:102:5:102:17 | print_str(...) |  |
-| main.rs:105:1:112:1 | enter fn let_pattern5 | main.rs:106:5:106:42 | let ... = ... |  |
-| main.rs:105:1:112:1 | exit fn let_pattern5 (normal) | main.rs:105:1:112:1 | exit fn let_pattern5 |  |
-| main.rs:105:19:112:1 | { ... } | main.rs:105:1:112:1 | exit fn let_pattern5 (normal) |  |
-| main.rs:106:5:106:42 | let ... = ... | main.rs:106:14:106:17 | Some |  |
-| main.rs:106:9:106:10 | s1 | main.rs:106:9:106:10 | s1 |  |
-| main.rs:106:9:106:10 | s1 | main.rs:108:11:109:12 | let ... = s1 | match |
-| main.rs:106:14:106:17 | Some | main.rs:106:19:106:30 | ...::from |  |
-| main.rs:106:14:106:41 | Some(...) | main.rs:106:9:106:10 | s1 |  |
-| main.rs:106:19:106:30 | ...::from | main.rs:106:32:106:39 | "Hello!" |  |
-| main.rs:106:19:106:40 | ...::from(...) | main.rs:106:14:106:41 | Some(...) |  |
-| main.rs:106:32:106:39 | "Hello!" | main.rs:106:19:106:40 | ...::from(...) |  |
-| main.rs:108:5:111:5 | while ... { ... } | main.rs:105:19:112:1 | { ... } |  |
-| main.rs:108:11:109:12 | let ... = s1 | main.rs:109:11:109:12 | s1 |  |
-| main.rs:108:15:108:26 | Some(...) | main.rs:108:5:111:5 | while ... { ... } | no-match |
-| main.rs:108:15:108:26 | Some(...) | main.rs:108:24:108:25 | s2 | match |
-| main.rs:108:20:108:25 | ref s2 | main.rs:110:9:110:22 | ExprStmt | match |
-| main.rs:108:24:108:25 | s2 | main.rs:108:20:108:25 | ref s2 |  |
-| main.rs:109:11:109:12 | s1 | main.rs:108:15:108:26 | Some(...) |  |
-| main.rs:109:14:111:5 | { ... } | main.rs:108:11:109:12 | let ... = s1 |  |
-| main.rs:110:9:110:17 | print_str | main.rs:110:19:110:20 | s2 |  |
-| main.rs:110:9:110:21 | print_str(...) | main.rs:109:14:111:5 | { ... } |  |
-| main.rs:110:9:110:22 | ExprStmt | main.rs:110:9:110:17 | print_str |  |
-| main.rs:110:19:110:20 | s2 | main.rs:110:9:110:21 | print_str(...) |  |
-| main.rs:114:1:129:1 | enter fn match_pattern1 | main.rs:115:5:115:21 | let ... = ... |  |
-| main.rs:114:1:129:1 | exit fn match_pattern1 (normal) | main.rs:114:1:129:1 | exit fn match_pattern1 |  |
-| main.rs:114:21:129:1 | { ... } | main.rs:114:1:129:1 | exit fn match_pattern1 (normal) |  |
-| main.rs:115:5:115:21 | let ... = ... | main.rs:115:14:115:17 | Some |  |
-| main.rs:115:9:115:10 | x6 | main.rs:115:9:115:10 | x6 |  |
-| main.rs:115:9:115:10 | x6 | main.rs:116:5:116:16 | let ... = 10 | match |
-| main.rs:115:14:115:17 | Some | main.rs:115:19:115:19 | 5 |  |
-| main.rs:115:14:115:20 | Some(...) | main.rs:115:9:115:10 | x6 |  |
-| main.rs:115:19:115:19 | 5 | main.rs:115:14:115:20 | Some(...) |  |
-| main.rs:116:5:116:16 | let ... = 10 | main.rs:116:14:116:15 | 10 |  |
-| main.rs:116:9:116:10 | y1 | main.rs:116:9:116:10 | y1 |  |
-| main.rs:116:9:116:10 | y1 | main.rs:118:5:126:5 | ExprStmt | match |
-| main.rs:116:14:116:15 | 10 | main.rs:116:9:116:10 | y1 |  |
-| main.rs:118:5:126:5 | ExprStmt | main.rs:118:11:118:12 | x6 |  |
-| main.rs:118:5:126:5 | match x6 { ... } | main.rs:128:5:128:18 | ExprStmt |  |
-| main.rs:118:11:118:12 | x6 | main.rs:119:9:119:16 | Some(...) |  |
-| main.rs:119:9:119:16 | Some(...) | main.rs:119:14:119:15 | 50 | match |
-| main.rs:119:9:119:16 | Some(...) | main.rs:120:9:120:16 | Some(...) | no-match |
-| main.rs:119:14:119:15 | 50 | main.rs:119:14:119:15 | 50 |  |
-| main.rs:119:14:119:15 | 50 | main.rs:119:21:119:29 | print_str | match |
-| main.rs:119:14:119:15 | 50 | main.rs:120:9:120:16 | Some(...) | no-match |
-| main.rs:119:21:119:29 | print_str | main.rs:119:31:119:38 | "Got 50" |  |
-| main.rs:119:21:119:39 | print_str(...) | main.rs:118:5:126:5 | match x6 { ... } |  |
-| main.rs:119:31:119:38 | "Got 50" | main.rs:119:21:119:39 | print_str(...) |  |
-| main.rs:120:9:120:16 | Some(...) | main.rs:120:14:120:15 | y1 | match |
-| main.rs:120:9:120:16 | Some(...) | main.rs:125:9:125:12 | None | no-match |
-| main.rs:120:14:120:15 | y1 | main.rs:120:14:120:15 | y1 |  |
-| main.rs:120:14:120:15 | y1 | main.rs:123:13:123:21 | print_i64 | match |
-| main.rs:122:9:124:9 | { ... } | main.rs:118:5:126:5 | match x6 { ... } |  |
-| main.rs:123:13:123:21 | print_i64 | main.rs:123:23:123:24 | y1 |  |
-| main.rs:123:13:123:25 | print_i64(...) | main.rs:122:9:124:9 | { ... } |  |
-| main.rs:123:23:123:24 | y1 | main.rs:123:13:123:25 | print_i64(...) |  |
-| main.rs:125:9:125:12 | None | main.rs:125:9:125:12 | None |  |
-| main.rs:125:9:125:12 | None | main.rs:125:17:125:25 | print_str | match |
-| main.rs:125:17:125:25 | print_str | main.rs:125:27:125:32 | "NONE" |  |
-| main.rs:125:17:125:33 | print_str(...) | main.rs:118:5:126:5 | match x6 { ... } |  |
-| main.rs:125:27:125:32 | "NONE" | main.rs:125:17:125:33 | print_str(...) |  |
-| main.rs:128:5:128:13 | print_i64 | main.rs:128:15:128:16 | y1 |  |
-| main.rs:128:5:128:17 | print_i64(...) | main.rs:114:21:129:1 | { ... } |  |
-| main.rs:128:5:128:18 | ExprStmt | main.rs:128:5:128:13 | print_i64 |  |
-| main.rs:128:15:128:16 | y1 | main.rs:128:5:128:17 | print_i64(...) |  |
-| main.rs:131:1:160:1 | enter fn match_pattern2 | main.rs:132:5:132:36 | let ... = ... |  |
-| main.rs:131:1:160:1 | exit fn match_pattern2 (normal) | main.rs:131:1:160:1 | exit fn match_pattern2 |  |
-| main.rs:131:21:160:1 | { ... } | main.rs:131:1:160:1 | exit fn match_pattern2 (normal) |  |
-| main.rs:132:5:132:36 | let ... = ... | main.rs:132:20:132:20 | 2 |  |
-| main.rs:132:9:132:15 | numbers | main.rs:132:9:132:15 | numbers |  |
-| main.rs:132:9:132:15 | numbers | main.rs:134:5:147:5 | ExprStmt | match |
-| main.rs:132:19:132:35 | TupleExpr | main.rs:132:9:132:15 | numbers |  |
-| main.rs:132:20:132:20 | 2 | main.rs:132:23:132:23 | 4 |  |
-| main.rs:132:23:132:23 | 4 | main.rs:132:26:132:26 | 8 |  |
-| main.rs:132:26:132:26 | 8 | main.rs:132:29:132:30 | 16 |  |
-| main.rs:132:29:132:30 | 16 | main.rs:132:33:132:34 | 32 |  |
-| main.rs:132:33:132:34 | 32 | main.rs:132:19:132:35 | TupleExpr |  |
-| main.rs:134:5:147:5 | ExprStmt | main.rs:134:11:134:17 | numbers |  |
-| main.rs:134:5:147:5 | match numbers { ... } | main.rs:149:11:149:17 | numbers |  |
-| main.rs:134:11:134:17 | numbers | main.rs:136:9:142:9 | TuplePat |  |
-| main.rs:136:9:142:9 | TuplePat | main.rs:137:13:137:17 | first | match |
-| main.rs:137:13:137:17 | first | main.rs:137:13:137:17 | first |  |
-| main.rs:137:13:137:17 | first | main.rs:138:13:138:13 | _ | match |
-| main.rs:138:13:138:13 | _ | main.rs:139:13:139:17 | third | match |
-| main.rs:139:13:139:17 | third | main.rs:139:13:139:17 | third |  |
-| main.rs:139:13:139:17 | third | main.rs:140:13:140:13 | _ | match |
-| main.rs:140:13:140:13 | _ | main.rs:141:13:141:17 | fifth | match |
-| main.rs:141:13:141:17 | fifth | main.rs:141:13:141:17 | fifth |  |
-| main.rs:141:13:141:17 | fifth | main.rs:143:13:143:29 | ExprStmt | match |
-| main.rs:142:14:146:9 | { ... } | main.rs:134:5:147:5 | match numbers { ... } |  |
-| main.rs:143:13:143:21 | print_i64 | main.rs:143:23:143:27 | first |  |
-| main.rs:143:13:143:28 | print_i64(...) | main.rs:144:13:144:29 | ExprStmt |  |
-| main.rs:143:13:143:29 | ExprStmt | main.rs:143:13:143:21 | print_i64 |  |
-| main.rs:143:23:143:27 | first | main.rs:143:13:143:28 | print_i64(...) |  |
-| main.rs:144:13:144:21 | print_i64 | main.rs:144:23:144:27 | third |  |
-| main.rs:144:13:144:28 | print_i64(...) | main.rs:145:13:145:29 | ExprStmt |  |
-| main.rs:144:13:144:29 | ExprStmt | main.rs:144:13:144:21 | print_i64 |  |
-| main.rs:144:23:144:27 | third | main.rs:144:13:144:28 | print_i64(...) |  |
-| main.rs:145:13:145:21 | print_i64 | main.rs:145:23:145:27 | fifth |  |
-| main.rs:145:13:145:28 | print_i64(...) | main.rs:142:14:146:9 | { ... } |  |
-| main.rs:145:13:145:29 | ExprStmt | main.rs:145:13:145:21 | print_i64 |  |
-| main.rs:145:23:145:27 | fifth | main.rs:145:13:145:28 | print_i64(...) |  |
-| main.rs:149:5:159:5 | match numbers { ... } | main.rs:131:21:160:1 | { ... } |  |
-| main.rs:149:11:149:17 | numbers | main.rs:151:9:155:9 | TuplePat |  |
-| main.rs:151:9:155:9 | TuplePat | main.rs:152:13:152:17 | first | match |
-| main.rs:152:13:152:17 | first | main.rs:152:13:152:17 | first |  |
-| main.rs:152:13:152:17 | first | main.rs:153:13:153:14 | .. | match |
-| main.rs:153:13:153:14 | .. | main.rs:154:13:154:16 | last | match |
-| main.rs:154:13:154:16 | last | main.rs:154:13:154:16 | last |  |
-| main.rs:154:13:154:16 | last | main.rs:156:13:156:29 | ExprStmt | match |
-| main.rs:155:14:158:9 | { ... } | main.rs:149:5:159:5 | match numbers { ... } |  |
-| main.rs:156:13:156:21 | print_i64 | main.rs:156:23:156:27 | first |  |
-| main.rs:156:13:156:28 | print_i64(...) | main.rs:157:13:157:28 | ExprStmt |  |
-| main.rs:156:13:156:29 | ExprStmt | main.rs:156:13:156:21 | print_i64 |  |
-| main.rs:156:23:156:27 | first | main.rs:156:13:156:28 | print_i64(...) |  |
-| main.rs:157:13:157:21 | print_i64 | main.rs:157:23:157:26 | last |  |
-| main.rs:157:13:157:27 | print_i64(...) | main.rs:155:14:158:9 | { ... } |  |
-| main.rs:157:13:157:28 | ExprStmt | main.rs:157:13:157:21 | print_i64 |  |
-| main.rs:157:23:157:26 | last | main.rs:157:13:157:27 | print_i64(...) |  |
-| main.rs:162:1:170:1 | enter fn match_pattern3 | main.rs:163:5:163:38 | let ... = ... |  |
-| main.rs:162:1:170:1 | exit fn match_pattern3 (normal) | main.rs:162:1:170:1 | exit fn match_pattern3 |  |
-| main.rs:162:21:170:1 | { ... } | main.rs:162:1:170:1 | exit fn match_pattern3 (normal) |  |
-| main.rs:163:5:163:38 | let ... = ... | main.rs:163:25:163:27 | "x" |  |
-| main.rs:163:9:163:10 | p2 | main.rs:163:9:163:10 | p2 |  |
-| main.rs:163:9:163:10 | p2 | main.rs:165:11:165:12 | p2 | match |
-| main.rs:163:14:163:37 | Point {...} | main.rs:163:9:163:10 | p2 |  |
-| main.rs:163:25:163:27 | "x" | main.rs:163:33:163:35 | "y" |  |
-| main.rs:163:33:163:35 | "y" | main.rs:163:14:163:37 | Point {...} |  |
-| main.rs:165:5:169:5 | match p2 { ... } | main.rs:162:21:170:1 | { ... } |  |
-| main.rs:165:11:165:12 | p2 | main.rs:166:9:168:9 | Point {...} |  |
-| main.rs:166:9:168:9 | Point {...} | main.rs:167:16:167:17 | x7 | match |
-| main.rs:167:16:167:17 | x7 | main.rs:167:16:167:17 | x7 |  |
-| main.rs:167:16:167:17 | x7 | main.rs:167:20:167:21 | .. | match |
-| main.rs:167:20:167:21 | .. | main.rs:168:14:168:22 | print_str | match |
-| main.rs:168:14:168:22 | print_str | main.rs:168:24:168:25 | x7 |  |
-| main.rs:168:14:168:26 | print_str(...) | main.rs:165:5:169:5 | match p2 { ... } |  |
-| main.rs:168:24:168:25 | x7 | main.rs:168:14:168:26 | print_str(...) |  |
-| main.rs:176:1:193:1 | enter fn match_pattern4 | main.rs:177:5:177:39 | let ... = ... |  |
-| main.rs:176:1:193:1 | exit fn match_pattern4 (normal) | main.rs:176:1:193:1 | exit fn match_pattern4 |  |
-| main.rs:176:21:193:1 | { ... } | main.rs:176:1:193:1 | exit fn match_pattern4 (normal) |  |
-| main.rs:177:5:177:39 | let ... = ... | main.rs:177:36:177:36 | 0 |  |
-| main.rs:177:9:177:11 | msg | main.rs:177:9:177:11 | msg |  |
-| main.rs:177:9:177:11 | msg | main.rs:179:11:179:13 | msg | match |
-| main.rs:177:15:177:38 | ...::Hello {...} | main.rs:177:9:177:11 | msg |  |
-| main.rs:177:36:177:36 | 0 | main.rs:177:15:177:38 | ...::Hello {...} |  |
-| main.rs:179:5:192:5 | match msg { ... } | main.rs:176:21:193:1 | { ... } |  |
-| main.rs:179:11:179:13 | msg | main.rs:181:9:183:9 | ...::Hello {...} |  |
-| main.rs:181:9:183:9 | ...::Hello {...} | main.rs:182:31:182:35 | RangePat | match |
-| main.rs:181:9:183:9 | ...::Hello {...} | main.rs:184:9:184:38 | ...::Hello {...} | no-match |
-| main.rs:182:17:182:27 | id_variable | main.rs:182:17:182:35 | id_variable @ ... |  |
-| main.rs:182:17:182:35 | id_variable @ ... | main.rs:183:14:183:22 | print_i64 | match |
-| main.rs:182:31:182:31 | 3 | main.rs:182:31:182:31 | 3 |  |
-| main.rs:182:31:182:31 | 3 | main.rs:182:35:182:35 | 7 | match |
-| main.rs:182:31:182:31 | 3 | main.rs:184:9:184:38 | ...::Hello {...} | no-match |
-| main.rs:182:31:182:35 | RangePat | main.rs:182:31:182:31 | 3 | match |
-| main.rs:182:35:182:35 | 7 | main.rs:182:17:182:27 | id_variable | match |
-| main.rs:182:35:182:35 | 7 | main.rs:182:35:182:35 | 7 |  |
-| main.rs:182:35:182:35 | 7 | main.rs:184:9:184:38 | ...::Hello {...} | no-match |
-| main.rs:183:14:183:22 | print_i64 | main.rs:183:24:183:34 | id_variable |  |
-| main.rs:183:14:183:35 | print_i64(...) | main.rs:179:5:192:5 | match msg { ... } |  |
-| main.rs:183:24:183:34 | id_variable | main.rs:183:14:183:35 | print_i64(...) |  |
-| main.rs:184:9:184:38 | ...::Hello {...} | main.rs:184:30:184:36 | RangePat | match |
-| main.rs:184:9:184:38 | ...::Hello {...} | main.rs:187:9:187:29 | ...::Hello {...} | no-match |
-| main.rs:184:30:184:31 | 10 | main.rs:184:30:184:31 | 10 |  |
-| main.rs:184:30:184:31 | 10 | main.rs:184:35:184:36 | 12 | match |
-| main.rs:184:30:184:31 | 10 | main.rs:187:9:187:29 | ...::Hello {...} | no-match |
-| main.rs:184:30:184:36 | RangePat | main.rs:184:30:184:31 | 10 | match |
-| main.rs:184:35:184:36 | 12 | main.rs:184:35:184:36 | 12 |  |
-| main.rs:184:35:184:36 | 12 | main.rs:185:22:185:51 | ExprStmt | match |
-| main.rs:184:35:184:36 | 12 | main.rs:187:9:187:29 | ...::Hello {...} | no-match |
-| main.rs:184:43:186:9 | { ... } | main.rs:179:5:192:5 | match msg { ... } |  |
-| main.rs:185:13:185:52 | ...::_print | main.rs:185:22:185:51 | "Found an id in another range\\... |  |
-| main.rs:185:13:185:52 | MacroExpr | main.rs:184:43:186:9 | { ... } |  |
-| main.rs:185:13:185:52 | println!... | main.rs:185:13:185:52 | MacroExpr |  |
-| main.rs:185:22:185:51 | "Found an id in another range\\... | main.rs:185:22:185:51 | FormatArgsExpr |  |
-| main.rs:185:22:185:51 | ...::_print(...) | main.rs:185:22:185:51 | { ... } |  |
-| main.rs:185:22:185:51 | ...::format_args_nl!... | main.rs:185:22:185:51 | MacroExpr |  |
-| main.rs:185:22:185:51 | ExprStmt | main.rs:185:13:185:52 | ...::_print |  |
-| main.rs:185:22:185:51 | FormatArgsExpr | main.rs:185:22:185:51 | ...::format_args_nl!... |  |
-| main.rs:185:22:185:51 | MacroBlockExpr | main.rs:185:13:185:52 | println!... |  |
-| main.rs:185:22:185:51 | MacroExpr | main.rs:185:22:185:51 | ...::_print(...) |  |
-| main.rs:185:22:185:51 | { ... } | main.rs:185:22:185:51 | MacroBlockExpr |  |
-| main.rs:187:9:187:29 | ...::Hello {...} | main.rs:187:26:187:27 | id | match |
-| main.rs:187:26:187:27 | id | main.rs:187:26:187:27 | id |  |
-| main.rs:187:26:187:27 | id | main.rs:190:13:190:21 | print_i64 | match |
-| main.rs:189:9:191:9 | { ... } | main.rs:179:5:192:5 | match msg { ... } |  |
-| main.rs:190:13:190:21 | print_i64 | main.rs:190:23:190:24 | id |  |
-| main.rs:190:13:190:25 | print_i64(...) | main.rs:189:9:191:9 | { ... } |  |
-| main.rs:190:23:190:24 | id | main.rs:190:13:190:25 | print_i64(...) |  |
-| main.rs:200:1:206:1 | enter fn match_pattern5 | main.rs:201:5:201:34 | let ... = ... |  |
-| main.rs:200:1:206:1 | exit fn match_pattern5 (normal) | main.rs:200:1:206:1 | exit fn match_pattern5 |  |
-| main.rs:200:21:206:1 | { ... } | main.rs:200:1:206:1 | exit fn match_pattern5 (normal) |  |
-| main.rs:201:5:201:34 | let ... = ... | main.rs:201:18:201:29 | ...::Left |  |
-| main.rs:201:9:201:14 | either | main.rs:201:9:201:14 | either |  |
-| main.rs:201:9:201:14 | either | main.rs:202:11:202:16 | either | match |
-| main.rs:201:18:201:29 | ...::Left | main.rs:201:31:201:32 | 32 |  |
-| main.rs:201:18:201:33 | ...::Left(...) | main.rs:201:9:201:14 | either |  |
-| main.rs:201:31:201:32 | 32 | main.rs:201:18:201:33 | ...::Left(...) |  |
-| main.rs:202:5:205:5 | match either { ... } | main.rs:200:21:206:1 | { ... } |  |
-| main.rs:202:11:202:16 | either | main.rs:203:9:203:24 | ...::Left(...) |  |
-| main.rs:203:9:203:24 | ...::Left(...) | main.rs:203:22:203:23 | a3 | match |
-| main.rs:203:9:203:24 | ...::Left(...) | main.rs:203:28:203:44 | ...::Right(...) | no-match |
-| main.rs:203:9:203:44 | ... \| ... | main.rs:204:16:204:24 | print_i64 | match |
-| main.rs:203:22:203:23 | a3 | main.rs:203:9:203:44 | ... \| ... | match |
-| main.rs:203:22:203:23 | a3 | main.rs:203:22:203:23 | a3 |  |
-| main.rs:203:28:203:44 | ...::Right(...) | main.rs:203:42:203:43 | a3 | match |
-| main.rs:203:42:203:43 | a3 | main.rs:203:9:203:44 | ... \| ... | match |
-| main.rs:203:42:203:43 | a3 | main.rs:203:42:203:43 | a3 |  |
-| main.rs:204:16:204:24 | print_i64 | main.rs:204:26:204:27 | a3 |  |
-| main.rs:204:16:204:28 | print_i64(...) | main.rs:202:5:205:5 | match either { ... } |  |
-| main.rs:204:26:204:27 | a3 | main.rs:204:16:204:28 | print_i64(...) |  |
-| main.rs:214:1:228:1 | enter fn match_pattern6 | main.rs:215:5:215:37 | let ... = ... |  |
-| main.rs:214:1:228:1 | exit fn match_pattern6 (normal) | main.rs:214:1:228:1 | exit fn match_pattern6 |  |
-| main.rs:214:21:228:1 | { ... } | main.rs:214:1:228:1 | exit fn match_pattern6 (normal) |  |
-| main.rs:215:5:215:37 | let ... = ... | main.rs:215:14:215:32 | ...::Second |  |
-| main.rs:215:9:215:10 | tv | main.rs:215:9:215:10 | tv |  |
-| main.rs:215:9:215:10 | tv | main.rs:216:5:219:5 | ExprStmt | match |
-| main.rs:215:14:215:32 | ...::Second | main.rs:215:34:215:35 | 62 |  |
-| main.rs:215:14:215:36 | ...::Second(...) | main.rs:215:9:215:10 | tv |  |
-| main.rs:215:34:215:35 | 62 | main.rs:215:14:215:36 | ...::Second(...) |  |
-| main.rs:216:5:219:5 | ExprStmt | main.rs:216:11:216:12 | tv |  |
-| main.rs:216:5:219:5 | match tv { ... } | main.rs:220:5:223:5 | ExprStmt |  |
-| main.rs:216:11:216:12 | tv | main.rs:217:9:217:30 | ...::First(...) |  |
-| main.rs:217:9:217:30 | ...::First(...) | main.rs:217:28:217:29 | a4 | match |
-| main.rs:217:9:217:30 | ...::First(...) | main.rs:217:34:217:56 | ...::Second(...) | no-match |
-| main.rs:217:9:217:81 | ... \| ... \| ... | main.rs:218:16:218:24 | print_i64 | match |
-| main.rs:217:28:217:29 | a4 | main.rs:217:9:217:81 | ... \| ... \| ... | match |
-| main.rs:217:28:217:29 | a4 | main.rs:217:28:217:29 | a4 |  |
-| main.rs:217:34:217:56 | ...::Second(...) | main.rs:217:54:217:55 | a4 | match |
-| main.rs:217:34:217:56 | ...::Second(...) | main.rs:217:60:217:81 | ...::Third(...) | no-match |
-| main.rs:217:54:217:55 | a4 | main.rs:217:9:217:81 | ... \| ... \| ... | match |
-| main.rs:217:54:217:55 | a4 | main.rs:217:54:217:55 | a4 |  |
-| main.rs:217:60:217:81 | ...::Third(...) | main.rs:217:79:217:80 | a4 | match |
-| main.rs:217:79:217:80 | a4 | main.rs:217:9:217:81 | ... \| ... \| ... | match |
-| main.rs:217:79:217:80 | a4 | main.rs:217:79:217:80 | a4 |  |
-| main.rs:218:16:218:24 | print_i64 | main.rs:218:26:218:27 | a4 |  |
-| main.rs:218:16:218:28 | print_i64(...) | main.rs:216:5:219:5 | match tv { ... } |  |
-| main.rs:218:26:218:27 | a4 | main.rs:218:16:218:28 | print_i64(...) |  |
-| main.rs:220:5:223:5 | ExprStmt | main.rs:220:11:220:12 | tv |  |
-| main.rs:220:5:223:5 | match tv { ... } | main.rs:224:11:224:12 | tv |  |
-| main.rs:220:11:220:12 | tv | main.rs:221:10:221:31 | ...::First(...) |  |
-| main.rs:221:9:221:83 | ... \| ... | main.rs:222:16:222:24 | print_i64 | match |
-| main.rs:221:10:221:31 | ...::First(...) | main.rs:221:29:221:30 | a5 | match |
-| main.rs:221:10:221:31 | ...::First(...) | main.rs:221:35:221:57 | ...::Second(...) | no-match |
-| main.rs:221:10:221:57 | [match(false)] ... \| ... | main.rs:221:62:221:83 | ...::Third(...) | no-match |
-| main.rs:221:10:221:57 | [match(true)] ... \| ... | main.rs:221:9:221:83 | ... \| ... | match |
-| main.rs:221:29:221:30 | a5 | main.rs:221:10:221:57 | [match(true)] ... \| ... | match |
-| main.rs:221:29:221:30 | a5 | main.rs:221:29:221:30 | a5 |  |
-| main.rs:221:35:221:57 | ...::Second(...) | main.rs:221:10:221:57 | [match(false)] ... \| ... | no-match |
-| main.rs:221:35:221:57 | ...::Second(...) | main.rs:221:55:221:56 | a5 | match |
-| main.rs:221:55:221:56 | a5 | main.rs:221:10:221:57 | [match(true)] ... \| ... | match |
-| main.rs:221:55:221:56 | a5 | main.rs:221:55:221:56 | a5 |  |
-| main.rs:221:62:221:83 | ...::Third(...) | main.rs:221:81:221:82 | a5 | match |
-| main.rs:221:81:221:82 | a5 | main.rs:221:9:221:83 | ... \| ... | match |
-| main.rs:221:81:221:82 | a5 | main.rs:221:81:221:82 | a5 |  |
-| main.rs:222:16:222:24 | print_i64 | main.rs:222:26:222:27 | a5 |  |
-| main.rs:222:16:222:28 | print_i64(...) | main.rs:220:5:223:5 | match tv { ... } |  |
-| main.rs:222:26:222:27 | a5 | main.rs:222:16:222:28 | print_i64(...) |  |
-| main.rs:224:5:227:5 | match tv { ... } | main.rs:214:21:228:1 | { ... } |  |
-| main.rs:224:11:224:12 | tv | main.rs:225:9:225:30 | ...::First(...) |  |
-| main.rs:225:9:225:30 | ...::First(...) | main.rs:225:28:225:29 | a6 | match |
-| main.rs:225:9:225:30 | ...::First(...) | main.rs:225:35:225:57 | ...::Second(...) | no-match |
-| main.rs:225:9:225:83 | ... \| ... | main.rs:226:16:226:24 | print_i64 | match |
-| main.rs:225:28:225:29 | a6 | main.rs:225:9:225:83 | ... \| ... | match |
-| main.rs:225:28:225:29 | a6 | main.rs:225:28:225:29 | a6 |  |
-| main.rs:225:35:225:57 | ...::Second(...) | main.rs:225:55:225:56 | a6 | match |
-| main.rs:225:35:225:57 | ...::Second(...) | main.rs:225:61:225:82 | ...::Third(...) | no-match |
-| main.rs:225:35:225:82 | ... \| ... | main.rs:225:9:225:83 | ... \| ... | match |
-| main.rs:225:55:225:56 | a6 | main.rs:225:35:225:82 | ... \| ... | match |
-| main.rs:225:55:225:56 | a6 | main.rs:225:55:225:56 | a6 |  |
-| main.rs:225:61:225:82 | ...::Third(...) | main.rs:225:80:225:81 | a6 | match |
-| main.rs:225:80:225:81 | a6 | main.rs:225:35:225:82 | ... \| ... | match |
-| main.rs:225:80:225:81 | a6 | main.rs:225:80:225:81 | a6 |  |
-| main.rs:226:16:226:24 | print_i64 | main.rs:226:26:226:27 | a6 |  |
-| main.rs:226:16:226:28 | print_i64(...) | main.rs:224:5:227:5 | match tv { ... } |  |
-| main.rs:226:26:226:27 | a6 | main.rs:226:16:226:28 | print_i64(...) |  |
-| main.rs:230:1:238:1 | enter fn match_pattern7 | main.rs:231:5:231:34 | let ... = ... |  |
-| main.rs:230:1:238:1 | exit fn match_pattern7 (normal) | main.rs:230:1:238:1 | exit fn match_pattern7 |  |
-| main.rs:230:21:238:1 | { ... } | main.rs:230:1:238:1 | exit fn match_pattern7 (normal) |  |
-| main.rs:231:5:231:34 | let ... = ... | main.rs:231:18:231:29 | ...::Left |  |
-| main.rs:231:9:231:14 | either | main.rs:231:9:231:14 | either |  |
-| main.rs:231:9:231:14 | either | main.rs:232:11:232:16 | either | match |
-| main.rs:231:18:231:29 | ...::Left | main.rs:231:31:231:32 | 32 |  |
-| main.rs:231:18:231:33 | ...::Left(...) | main.rs:231:9:231:14 | either |  |
-| main.rs:231:31:231:32 | 32 | main.rs:231:18:231:33 | ...::Left(...) |  |
-| main.rs:232:5:237:5 | match either { ... } | main.rs:230:21:238:1 | { ... } |  |
-| main.rs:232:11:232:16 | either | main.rs:233:9:233:24 | ...::Left(...) |  |
-| main.rs:233:9:233:24 | ...::Left(...) | main.rs:233:22:233:23 | a7 | match |
-| main.rs:233:9:233:24 | ...::Left(...) | main.rs:233:28:233:44 | ...::Right(...) | no-match |
-| main.rs:233:9:233:44 | [match(false)] ... \| ... | main.rs:236:9:236:9 | _ | no-match |
-| main.rs:233:9:233:44 | [match(true)] ... \| ... | main.rs:234:16:234:17 | a7 | match |
-| main.rs:233:22:233:23 | a7 | main.rs:233:9:233:44 | [match(true)] ... \| ... | match |
-| main.rs:233:22:233:23 | a7 | main.rs:233:22:233:23 | a7 |  |
-| main.rs:233:28:233:44 | ...::Right(...) | main.rs:233:9:233:44 | [match(false)] ... \| ... | no-match |
-| main.rs:233:28:233:44 | ...::Right(...) | main.rs:233:42:233:43 | a7 | match |
-| main.rs:233:42:233:43 | a7 | main.rs:233:9:233:44 | [match(true)] ... \| ... | match |
-| main.rs:233:42:233:43 | a7 | main.rs:233:42:233:43 | a7 |  |
-| main.rs:234:16:234:17 | a7 | main.rs:234:21:234:21 | 0 |  |
-| main.rs:234:16:234:21 | ... > ... | main.rs:235:16:235:24 | print_i64 | true |
-| main.rs:234:16:234:21 | ... > ... | main.rs:236:9:236:9 | _ | false |
-| main.rs:234:21:234:21 | 0 | main.rs:234:16:234:21 | ... > ... |  |
-| main.rs:235:16:235:24 | print_i64 | main.rs:235:26:235:27 | a7 |  |
-| main.rs:235:16:235:28 | print_i64(...) | main.rs:232:5:237:5 | match either { ... } |  |
-| main.rs:235:26:235:27 | a7 | main.rs:235:16:235:28 | print_i64(...) |  |
-| main.rs:236:9:236:9 | _ | main.rs:236:14:236:15 | TupleExpr | match |
-| main.rs:236:14:236:15 | TupleExpr | main.rs:232:5:237:5 | match either { ... } |  |
-| main.rs:240:1:255:1 | enter fn match_pattern8 | main.rs:241:5:241:34 | let ... = ... |  |
-| main.rs:240:1:255:1 | exit fn match_pattern8 (normal) | main.rs:240:1:255:1 | exit fn match_pattern8 |  |
-| main.rs:240:21:255:1 | { ... } | main.rs:240:1:255:1 | exit fn match_pattern8 (normal) |  |
-| main.rs:241:5:241:34 | let ... = ... | main.rs:241:18:241:29 | ...::Left |  |
-| main.rs:241:9:241:14 | either | main.rs:241:9:241:14 | either |  |
-| main.rs:241:9:241:14 | either | main.rs:243:11:243:16 | either | match |
-| main.rs:241:18:241:29 | ...::Left | main.rs:241:31:241:32 | 32 |  |
-| main.rs:241:18:241:33 | ...::Left(...) | main.rs:241:9:241:14 | either |  |
-| main.rs:241:31:241:32 | 32 | main.rs:241:18:241:33 | ...::Left(...) |  |
-| main.rs:243:5:254:5 | match either { ... } | main.rs:240:21:255:1 | { ... } |  |
-| main.rs:243:11:243:16 | either | main.rs:245:14:245:30 | ...::Left(...) |  |
-| main.rs:244:9:245:52 | ref e @ ... | main.rs:247:13:247:27 | ExprStmt | match |
-| main.rs:244:13:244:13 | e | main.rs:244:9:245:52 | ref e @ ... |  |
-| main.rs:245:14:245:30 | ...::Left(...) | main.rs:245:27:245:29 | a11 | match |
-| main.rs:245:14:245:30 | ...::Left(...) | main.rs:245:34:245:51 | ...::Right(...) | no-match |
-| main.rs:245:14:245:51 | [match(false)] ... \| ... | main.rs:253:9:253:9 | _ | no-match |
-| main.rs:245:14:245:51 | [match(true)] ... \| ... | main.rs:244:13:244:13 | e | match |
-| main.rs:245:27:245:29 | a11 | main.rs:245:14:245:51 | [match(true)] ... \| ... | match |
-| main.rs:245:27:245:29 | a11 | main.rs:245:27:245:29 | a11 |  |
-| main.rs:245:34:245:51 | ...::Right(...) | main.rs:245:14:245:51 | [match(false)] ... \| ... | no-match |
-| main.rs:245:34:245:51 | ...::Right(...) | main.rs:245:48:245:50 | a11 | match |
-| main.rs:245:48:245:50 | a11 | main.rs:245:14:245:51 | [match(true)] ... \| ... | match |
-| main.rs:245:48:245:50 | a11 | main.rs:245:48:245:50 | a11 |  |
-| main.rs:246:12:252:9 | { ... } | main.rs:243:5:254:5 | match either { ... } |  |
-| main.rs:247:13:247:21 | print_i64 | main.rs:247:23:247:25 | a11 |  |
-| main.rs:247:13:247:26 | print_i64(...) | main.rs:248:16:249:15 | let ... = e |  |
-| main.rs:247:13:247:27 | ExprStmt | main.rs:247:13:247:21 | print_i64 |  |
-| main.rs:247:23:247:25 | a11 | main.rs:247:13:247:26 | print_i64(...) |  |
-| main.rs:248:13:251:13 | if ... {...} | main.rs:246:12:252:9 | { ... } |  |
-| main.rs:248:16:249:15 | let ... = e | main.rs:249:15:249:15 | e |  |
-| main.rs:248:20:248:36 | ...::Left(...) | main.rs:248:13:251:13 | if ... {...} | no-match |
-| main.rs:248:20:248:36 | ...::Left(...) | main.rs:248:33:248:35 | a12 | match |
-| main.rs:248:33:248:35 | a12 | main.rs:248:33:248:35 | a12 |  |
-| main.rs:248:33:248:35 | a12 | main.rs:250:17:250:32 | ExprStmt | match |
-| main.rs:249:15:249:15 | e | main.rs:248:20:248:36 | ...::Left(...) |  |
-| main.rs:249:17:251:13 | { ... } | main.rs:248:13:251:13 | if ... {...} |  |
-| main.rs:250:17:250:25 | print_i64 | main.rs:250:28:250:30 | a12 |  |
-| main.rs:250:17:250:31 | print_i64(...) | main.rs:249:17:251:13 | { ... } |  |
-| main.rs:250:17:250:32 | ExprStmt | main.rs:250:17:250:25 | print_i64 |  |
-| main.rs:250:27:250:30 | * ... | main.rs:250:17:250:31 | print_i64(...) |  |
-| main.rs:250:28:250:30 | a12 | main.rs:250:27:250:30 | * ... |  |
-| main.rs:253:9:253:9 | _ | main.rs:253:14:253:15 | TupleExpr | match |
-| main.rs:253:14:253:15 | TupleExpr | main.rs:243:5:254:5 | match either { ... } |  |
-| main.rs:264:1:270:1 | enter fn match_pattern9 | main.rs:265:5:265:36 | let ... = ... |  |
-| main.rs:264:1:270:1 | exit fn match_pattern9 (normal) | main.rs:264:1:270:1 | exit fn match_pattern9 |  |
-| main.rs:264:21:270:1 | { ... } | main.rs:264:1:270:1 | exit fn match_pattern9 (normal) |  |
-| main.rs:265:5:265:36 | let ... = ... | main.rs:265:14:265:31 | ...::Second |  |
-| main.rs:265:9:265:10 | fv | main.rs:265:9:265:10 | fv |  |
-| main.rs:265:9:265:10 | fv | main.rs:266:11:266:12 | fv | match |
-| main.rs:265:14:265:31 | ...::Second | main.rs:265:33:265:34 | 62 |  |
-| main.rs:265:14:265:35 | ...::Second(...) | main.rs:265:9:265:10 | fv |  |
-| main.rs:265:33:265:34 | 62 | main.rs:265:14:265:35 | ...::Second(...) |  |
-| main.rs:266:5:269:5 | match fv { ... } | main.rs:264:21:270:1 | { ... } |  |
-| main.rs:266:11:266:12 | fv | main.rs:267:9:267:30 | ...::First(...) |  |
-| main.rs:267:9:267:30 | ...::First(...) | main.rs:267:27:267:29 | a13 | match |
-| main.rs:267:9:267:30 | ...::First(...) | main.rs:267:35:267:57 | ...::Second(...) | no-match |
-| main.rs:267:9:267:109 | ... \| ... \| ... | main.rs:268:16:268:24 | print_i64 | match |
-| main.rs:267:27:267:29 | a13 | main.rs:267:9:267:109 | ... \| ... \| ... | match |
-| main.rs:267:27:267:29 | a13 | main.rs:267:27:267:29 | a13 |  |
-| main.rs:267:35:267:57 | ...::Second(...) | main.rs:267:54:267:56 | a13 | match |
-| main.rs:267:35:267:57 | ...::Second(...) | main.rs:267:61:267:82 | ...::Third(...) | no-match |
-| main.rs:267:35:267:82 | [match(false)] ... \| ... | main.rs:267:87:267:109 | ...::Fourth(...) | no-match |
-| main.rs:267:35:267:82 | [match(true)] ... \| ... | main.rs:267:9:267:109 | ... \| ... \| ... | match |
-| main.rs:267:54:267:56 | a13 | main.rs:267:35:267:82 | [match(true)] ... \| ... | match |
-| main.rs:267:54:267:56 | a13 | main.rs:267:54:267:56 | a13 |  |
-| main.rs:267:61:267:82 | ...::Third(...) | main.rs:267:35:267:82 | [match(false)] ... \| ... | no-match |
-| main.rs:267:61:267:82 | ...::Third(...) | main.rs:267:79:267:81 | a13 | match |
-| main.rs:267:79:267:81 | a13 | main.rs:267:35:267:82 | [match(true)] ... \| ... | match |
-| main.rs:267:79:267:81 | a13 | main.rs:267:79:267:81 | a13 |  |
-| main.rs:267:87:267:109 | ...::Fourth(...) | main.rs:267:106:267:108 | a13 | match |
-| main.rs:267:106:267:108 | a13 | main.rs:267:9:267:109 | ... \| ... \| ... | match |
-| main.rs:267:106:267:108 | a13 | main.rs:267:106:267:108 | a13 |  |
-| main.rs:268:16:268:24 | print_i64 | main.rs:268:26:268:28 | a13 |  |
-| main.rs:268:16:268:29 | print_i64(...) | main.rs:266:5:269:5 | match fv { ... } |  |
-| main.rs:268:26:268:28 | a13 | main.rs:268:16:268:29 | print_i64(...) |  |
-| main.rs:272:1:282:1 | enter fn param_pattern1 | main.rs:273:5:273:6 | a8 |  |
-| main.rs:272:1:282:1 | exit fn param_pattern1 (normal) | main.rs:272:1:282:1 | exit fn param_pattern1 |  |
-| main.rs:273:5:273:6 | a8 | main.rs:273:5:273:6 | a8 |  |
-| main.rs:273:5:273:6 | a8 | main.rs:273:5:273:12 | ...: ... | match |
-| main.rs:273:5:273:12 | ...: ... | main.rs:274:5:277:5 | TuplePat |  |
-| main.rs:274:5:277:5 | TuplePat | main.rs:275:9:275:10 | b3 | match |
-| main.rs:274:5:277:19 | ...: ... | main.rs:279:5:279:18 | ExprStmt |  |
-| main.rs:275:9:275:10 | b3 | main.rs:275:9:275:10 | b3 |  |
-| main.rs:275:9:275:10 | b3 | main.rs:276:9:276:10 | c1 | match |
-| main.rs:276:9:276:10 | c1 | main.rs:274:5:277:19 | ...: ... | match |
-| main.rs:276:9:276:10 | c1 | main.rs:276:9:276:10 | c1 |  |
-| main.rs:278:9:282:1 | { ... } | main.rs:272:1:282:1 | exit fn param_pattern1 (normal) |  |
-| main.rs:279:5:279:13 | print_str | main.rs:279:15:279:16 | a8 |  |
-| main.rs:279:5:279:17 | print_str(...) | main.rs:280:5:280:18 | ExprStmt |  |
-| main.rs:279:5:279:18 | ExprStmt | main.rs:279:5:279:13 | print_str |  |
-| main.rs:279:15:279:16 | a8 | main.rs:279:5:279:17 | print_str(...) |  |
-| main.rs:280:5:280:13 | print_str | main.rs:280:15:280:16 | b3 |  |
-| main.rs:280:5:280:17 | print_str(...) | main.rs:281:5:281:18 | ExprStmt |  |
-| main.rs:280:5:280:18 | ExprStmt | main.rs:280:5:280:13 | print_str |  |
-| main.rs:280:15:280:16 | b3 | main.rs:280:5:280:17 | print_str(...) |  |
-| main.rs:281:5:281:13 | print_str | main.rs:281:15:281:16 | c1 |  |
-| main.rs:281:5:281:17 | print_str(...) | main.rs:278:9:282:1 | { ... } |  |
-| main.rs:281:5:281:18 | ExprStmt | main.rs:281:5:281:13 | print_str |  |
-| main.rs:281:15:281:16 | c1 | main.rs:281:5:281:17 | print_str(...) |  |
-| main.rs:284:1:287:1 | enter fn param_pattern2 | main.rs:284:20:284:35 | ...::Left(...) |  |
-| main.rs:284:1:287:1 | exit fn param_pattern2 (normal) | main.rs:284:1:287:1 | exit fn param_pattern2 |  |
-| main.rs:284:19:284:64 | ...: Either | main.rs:286:5:286:18 | ExprStmt |  |
-| main.rs:284:20:284:35 | ...::Left(...) | main.rs:284:33:284:34 | a9 | match |
-| main.rs:284:20:284:35 | ...::Left(...) | main.rs:284:39:284:55 | ...::Right(...) | no-match |
-| main.rs:284:20:284:55 | ... \| ... | main.rs:284:19:284:64 | ...: Either | match |
-| main.rs:284:33:284:34 | a9 | main.rs:284:20:284:55 | ... \| ... | match |
-| main.rs:284:33:284:34 | a9 | main.rs:284:33:284:34 | a9 |  |
-| main.rs:284:39:284:55 | ...::Right(...) | main.rs:284:53:284:54 | a9 | match |
-| main.rs:284:53:284:54 | a9 | main.rs:284:20:284:55 | ... \| ... | match |
-| main.rs:284:53:284:54 | a9 | main.rs:284:53:284:54 | a9 |  |
-| main.rs:285:9:287:1 | { ... } | main.rs:284:1:287:1 | exit fn param_pattern2 (normal) |  |
-| main.rs:286:5:286:13 | print_i64 | main.rs:286:15:286:16 | a9 |  |
-| main.rs:286:5:286:17 | print_i64(...) | main.rs:285:9:287:1 | { ... } |  |
-| main.rs:286:5:286:18 | ExprStmt | main.rs:286:5:286:13 | print_i64 |  |
-| main.rs:286:15:286:16 | a9 | main.rs:286:5:286:17 | print_i64(...) |  |
-| main.rs:289:1:324:1 | enter fn destruct_assignment | main.rs:290:5:294:18 | let ... = ... |  |
-| main.rs:289:1:324:1 | exit fn destruct_assignment (normal) | main.rs:289:1:324:1 | exit fn destruct_assignment |  |
-| main.rs:289:26:324:1 | { ... } | main.rs:289:1:324:1 | exit fn destruct_assignment (normal) |  |
-| main.rs:290:5:294:18 | let ... = ... | main.rs:294:10:294:10 | 1 |  |
-| main.rs:290:9:294:5 | TuplePat | main.rs:291:13:291:15 | a10 | match |
-| main.rs:291:9:291:15 | mut a10 | main.rs:292:13:292:14 | b4 | match |
-| main.rs:291:13:291:15 | a10 | main.rs:291:9:291:15 | mut a10 |  |
-| main.rs:292:9:292:14 | mut b4 | main.rs:293:13:293:14 | c2 | match |
-| main.rs:292:13:292:14 | b4 | main.rs:292:9:292:14 | mut b4 |  |
-| main.rs:293:9:293:14 | mut c2 | main.rs:295:5:295:19 | ExprStmt | match |
-| main.rs:293:13:293:14 | c2 | main.rs:293:9:293:14 | mut c2 |  |
-| main.rs:294:9:294:17 | TupleExpr | main.rs:290:9:294:5 | TuplePat |  |
-| main.rs:294:10:294:10 | 1 | main.rs:294:13:294:13 | 2 |  |
-| main.rs:294:13:294:13 | 2 | main.rs:294:16:294:16 | 3 |  |
-| main.rs:294:16:294:16 | 3 | main.rs:294:9:294:17 | TupleExpr |  |
-| main.rs:295:5:295:13 | print_i64 | main.rs:295:15:295:17 | a10 |  |
-| main.rs:295:5:295:18 | print_i64(...) | main.rs:296:5:296:18 | ExprStmt |  |
-| main.rs:295:5:295:19 | ExprStmt | main.rs:295:5:295:13 | print_i64 |  |
-| main.rs:295:15:295:17 | a10 | main.rs:295:5:295:18 | print_i64(...) |  |
-| main.rs:296:5:296:13 | print_i64 | main.rs:296:15:296:16 | b4 |  |
-| main.rs:296:5:296:17 | print_i64(...) | main.rs:297:5:297:18 | ExprStmt |  |
-| main.rs:296:5:296:18 | ExprStmt | main.rs:296:5:296:13 | print_i64 |  |
-| main.rs:296:15:296:16 | b4 | main.rs:296:5:296:17 | print_i64(...) |  |
-| main.rs:297:5:297:13 | print_i64 | main.rs:297:15:297:16 | c2 |  |
-| main.rs:297:5:297:17 | print_i64(...) | main.rs:299:5:307:6 | ExprStmt |  |
-| main.rs:297:5:297:18 | ExprStmt | main.rs:297:5:297:13 | print_i64 |  |
-| main.rs:297:15:297:16 | c2 | main.rs:297:5:297:17 | print_i64(...) |  |
-| main.rs:299:5:303:5 | TupleExpr | main.rs:304:9:304:11 | a10 |  |
-| main.rs:299:5:307:5 | ... = ... | main.rs:308:5:308:19 | ExprStmt |  |
-| main.rs:299:5:307:6 | ExprStmt | main.rs:300:9:300:10 | c2 |  |
-| main.rs:300:9:300:10 | c2 | main.rs:301:9:301:10 | b4 |  |
-| main.rs:301:9:301:10 | b4 | main.rs:302:9:302:11 | a10 |  |
-| main.rs:302:9:302:11 | a10 | main.rs:299:5:303:5 | TupleExpr |  |
-| main.rs:303:9:307:5 | TupleExpr | main.rs:299:5:307:5 | ... = ... |  |
-| main.rs:304:9:304:11 | a10 | main.rs:305:9:305:10 | b4 |  |
-| main.rs:305:9:305:10 | b4 | main.rs:306:9:306:10 | c2 |  |
-| main.rs:306:9:306:10 | c2 | main.rs:303:9:307:5 | TupleExpr |  |
-| main.rs:308:5:308:13 | print_i64 | main.rs:308:15:308:17 | a10 |  |
-| main.rs:308:5:308:18 | print_i64(...) | main.rs:309:5:309:18 | ExprStmt |  |
-| main.rs:308:5:308:19 | ExprStmt | main.rs:308:5:308:13 | print_i64 |  |
-| main.rs:308:15:308:17 | a10 | main.rs:308:5:308:18 | print_i64(...) |  |
-| main.rs:309:5:309:13 | print_i64 | main.rs:309:15:309:16 | b4 |  |
-| main.rs:309:5:309:17 | print_i64(...) | main.rs:310:5:310:18 | ExprStmt |  |
-| main.rs:309:5:309:18 | ExprStmt | main.rs:309:5:309:13 | print_i64 |  |
-| main.rs:309:15:309:16 | b4 | main.rs:309:5:309:17 | print_i64(...) |  |
-| main.rs:310:5:310:13 | print_i64 | main.rs:310:15:310:16 | c2 |  |
-| main.rs:310:5:310:17 | print_i64(...) | main.rs:312:5:320:5 | ExprStmt |  |
-| main.rs:310:5:310:18 | ExprStmt | main.rs:310:5:310:13 | print_i64 |  |
-| main.rs:310:15:310:16 | c2 | main.rs:310:5:310:17 | print_i64(...) |  |
-| main.rs:312:5:320:5 | ExprStmt | main.rs:312:12:312:12 | 4 |  |
-| main.rs:312:5:320:5 | match ... { ... } | main.rs:322:5:322:19 | ExprStmt |  |
-| main.rs:312:11:312:16 | TupleExpr | main.rs:313:9:316:9 | TuplePat |  |
-| main.rs:312:12:312:12 | 4 | main.rs:312:15:312:15 | 5 |  |
-| main.rs:312:15:312:15 | 5 | main.rs:312:11:312:16 | TupleExpr |  |
-| main.rs:313:9:316:9 | TuplePat | main.rs:314:13:314:15 | a10 | match |
-| main.rs:314:13:314:15 | a10 | main.rs:314:13:314:15 | a10 |  |
-| main.rs:314:13:314:15 | a10 | main.rs:315:13:315:14 | b4 | match |
-| main.rs:315:13:315:14 | b4 | main.rs:315:13:315:14 | b4 |  |
-| main.rs:315:13:315:14 | b4 | main.rs:317:13:317:27 | ExprStmt | match |
-| main.rs:316:14:319:9 | { ... } | main.rs:312:5:320:5 | match ... { ... } |  |
-| main.rs:317:13:317:21 | print_i64 | main.rs:317:23:317:25 | a10 |  |
-| main.rs:317:13:317:26 | print_i64(...) | main.rs:318:13:318:26 | ExprStmt |  |
-| main.rs:317:13:317:27 | ExprStmt | main.rs:317:13:317:21 | print_i64 |  |
-| main.rs:317:23:317:25 | a10 | main.rs:317:13:317:26 | print_i64(...) |  |
-| main.rs:318:13:318:21 | print_i64 | main.rs:318:23:318:24 | b4 |  |
-| main.rs:318:13:318:25 | print_i64(...) | main.rs:316:14:319:9 | { ... } |  |
-| main.rs:318:13:318:26 | ExprStmt | main.rs:318:13:318:21 | print_i64 |  |
-| main.rs:318:23:318:24 | b4 | main.rs:318:13:318:25 | print_i64(...) |  |
-| main.rs:322:5:322:13 | print_i64 | main.rs:322:15:322:17 | a10 |  |
-| main.rs:322:5:322:18 | print_i64(...) | main.rs:323:5:323:18 | ExprStmt |  |
-| main.rs:322:5:322:19 | ExprStmt | main.rs:322:5:322:13 | print_i64 |  |
-| main.rs:322:15:322:17 | a10 | main.rs:322:5:322:18 | print_i64(...) |  |
-| main.rs:323:5:323:13 | print_i64 | main.rs:323:15:323:16 | b4 |  |
-| main.rs:323:5:323:17 | print_i64(...) | main.rs:289:26:324:1 | { ... } |  |
-| main.rs:323:5:323:18 | ExprStmt | main.rs:323:5:323:13 | print_i64 |  |
-| main.rs:323:15:323:16 | b4 | main.rs:323:5:323:17 | print_i64(...) |  |
-| main.rs:326:1:341:1 | enter fn closure_variable | main.rs:327:5:329:10 | let ... = ... |  |
-| main.rs:326:1:341:1 | exit fn closure_variable (normal) | main.rs:326:1:341:1 | exit fn closure_variable |  |
-| main.rs:326:23:341:1 | { ... } | main.rs:326:1:341:1 | exit fn closure_variable (normal) |  |
-| main.rs:327:5:329:10 | let ... = ... | main.rs:328:9:329:9 | \|...\| x |  |
-| main.rs:327:9:327:23 | example_closure | main.rs:327:9:327:23 | example_closure |  |
-| main.rs:327:9:327:23 | example_closure | main.rs:330:5:331:27 | let ... = ... | match |
-| main.rs:328:9:329:9 | \|...\| x | main.rs:327:9:327:23 | example_closure |  |
-| main.rs:328:9:329:9 | enter \|...\| x | main.rs:328:10:328:10 | x |  |
-| main.rs:328:9:329:9 | exit \|...\| x (normal) | main.rs:328:9:329:9 | exit \|...\| x |  |
-| main.rs:328:10:328:10 | x | main.rs:328:10:328:10 | x |  |
-| main.rs:328:10:328:10 | x | main.rs:328:10:328:15 | ...: i64 | match |
-| main.rs:328:10:328:15 | ...: i64 | main.rs:329:9:329:9 | x |  |
-| main.rs:329:9:329:9 | x | main.rs:328:9:329:9 | exit \|...\| x (normal) |  |
-| main.rs:330:5:331:27 | let ... = ... | main.rs:331:9:331:23 | example_closure |  |
-| main.rs:330:9:330:10 | n1 | main.rs:330:9:330:10 | n1 |  |
-| main.rs:330:9:330:10 | n1 | main.rs:332:5:332:18 | ExprStmt | match |
-| main.rs:331:9:331:23 | example_closure | main.rs:331:25:331:25 | 5 |  |
-| main.rs:331:9:331:26 | example_closure(...) | main.rs:330:9:330:10 | n1 |  |
-| main.rs:331:25:331:25 | 5 | main.rs:331:9:331:26 | example_closure(...) |  |
-| main.rs:332:5:332:13 | print_i64 | main.rs:332:15:332:16 | n1 |  |
-| main.rs:332:5:332:17 | print_i64(...) | main.rs:334:5:334:25 | ExprStmt |  |
-| main.rs:332:5:332:18 | ExprStmt | main.rs:332:5:332:13 | print_i64 |  |
-| main.rs:332:15:332:16 | n1 | main.rs:332:5:332:17 | print_i64(...) |  |
-| main.rs:334:5:334:22 | immutable_variable | main.rs:334:5:334:24 | immutable_variable(...) |  |
-| main.rs:334:5:334:24 | immutable_variable(...) | main.rs:335:5:337:10 | let ... = ... |  |
-| main.rs:334:5:334:25 | ExprStmt | main.rs:334:5:334:22 | immutable_variable |  |
-| main.rs:335:5:337:10 | let ... = ... | main.rs:336:5:337:9 | \|...\| x |  |
-| main.rs:335:9:335:26 | immutable_variable | main.rs:335:9:335:26 | immutable_variable |  |
-| main.rs:335:9:335:26 | immutable_variable | main.rs:338:5:339:30 | let ... = ... | match |
-| main.rs:336:5:337:9 | \|...\| x | main.rs:335:9:335:26 | immutable_variable |  |
-| main.rs:336:5:337:9 | enter \|...\| x | main.rs:336:6:336:6 | x |  |
-| main.rs:336:5:337:9 | exit \|...\| x (normal) | main.rs:336:5:337:9 | exit \|...\| x |  |
-| main.rs:336:6:336:6 | x | main.rs:336:6:336:6 | x |  |
-| main.rs:336:6:336:6 | x | main.rs:336:6:336:11 | ...: i64 | match |
-| main.rs:336:6:336:11 | ...: i64 | main.rs:337:9:337:9 | x |  |
-| main.rs:337:9:337:9 | x | main.rs:336:5:337:9 | exit \|...\| x (normal) |  |
-| main.rs:338:5:339:30 | let ... = ... | main.rs:339:9:339:26 | immutable_variable |  |
-| main.rs:338:9:338:10 | n2 | main.rs:338:9:338:10 | n2 |  |
-| main.rs:338:9:338:10 | n2 | main.rs:340:5:340:18 | ExprStmt | match |
-| main.rs:339:9:339:26 | immutable_variable | main.rs:339:28:339:28 | 6 |  |
-| main.rs:339:9:339:29 | immutable_variable(...) | main.rs:338:9:338:10 | n2 |  |
-| main.rs:339:28:339:28 | 6 | main.rs:339:9:339:29 | immutable_variable(...) |  |
-| main.rs:340:5:340:13 | print_i64 | main.rs:340:15:340:16 | n2 |  |
-| main.rs:340:5:340:17 | print_i64(...) | main.rs:326:23:341:1 | { ... } |  |
-| main.rs:340:5:340:18 | ExprStmt | main.rs:340:5:340:13 | print_i64 |  |
-| main.rs:340:15:340:16 | n2 | main.rs:340:5:340:17 | print_i64(...) |  |
-| main.rs:343:1:373:1 | enter fn nested_function | main.rs:345:5:347:10 | let ... = ... |  |
-| main.rs:343:1:373:1 | exit fn nested_function (normal) | main.rs:343:1:373:1 | exit fn nested_function |  |
-| main.rs:343:22:373:1 | { ... } | main.rs:343:1:373:1 | exit fn nested_function (normal) |  |
-| main.rs:345:5:347:10 | let ... = ... | main.rs:346:9:347:9 | \|...\| x |  |
-| main.rs:345:9:345:9 | f | main.rs:345:9:345:9 | f |  |
-| main.rs:345:9:345:9 | f | main.rs:348:5:348:20 | ExprStmt | match |
-| main.rs:346:9:347:9 | \|...\| x | main.rs:345:9:345:9 | f |  |
-| main.rs:346:9:347:9 | enter \|...\| x | main.rs:346:10:346:10 | x |  |
-| main.rs:346:9:347:9 | exit \|...\| x (normal) | main.rs:346:9:347:9 | exit \|...\| x |  |
-| main.rs:346:10:346:10 | x | main.rs:346:10:346:10 | x |  |
-| main.rs:346:10:346:10 | x | main.rs:346:10:346:15 | ...: i64 | match |
-| main.rs:346:10:346:15 | ...: i64 | main.rs:347:9:347:9 | x |  |
-| main.rs:347:9:347:9 | x | main.rs:346:9:347:9 | exit \|...\| x (normal) |  |
-| main.rs:348:5:348:13 | print_i64 | main.rs:348:15:348:15 | f |  |
-| main.rs:348:5:348:19 | print_i64(...) | main.rs:350:5:353:5 | fn f |  |
-| main.rs:348:5:348:20 | ExprStmt | main.rs:348:5:348:13 | print_i64 |  |
-| main.rs:348:15:348:15 | f | main.rs:348:17:348:17 | 1 |  |
-| main.rs:348:15:348:18 | f(...) | main.rs:348:5:348:19 | print_i64(...) |  |
-| main.rs:348:17:348:17 | 1 | main.rs:348:15:348:18 | f(...) |  |
-| main.rs:350:5:353:5 | enter fn f | main.rs:350:10:350:10 | x |  |
-| main.rs:350:5:353:5 | exit fn f (normal) | main.rs:350:5:353:5 | exit fn f |  |
-| main.rs:350:5:353:5 | fn f | main.rs:355:5:355:20 | ExprStmt |  |
-| main.rs:350:10:350:10 | x | main.rs:350:10:350:10 | x |  |
-| main.rs:350:10:350:10 | x | main.rs:350:10:350:15 | ...: i64 | match |
-| main.rs:350:10:350:15 | ...: i64 | main.rs:352:9:352:9 | x |  |
-| main.rs:351:5:353:5 | { ... } | main.rs:350:5:353:5 | exit fn f (normal) |  |
-| main.rs:352:9:352:9 | x | main.rs:352:13:352:13 | 1 |  |
-| main.rs:352:9:352:13 | ... + ... | main.rs:351:5:353:5 | { ... } |  |
-| main.rs:352:13:352:13 | 1 | main.rs:352:9:352:13 | ... + ... |  |
-| main.rs:355:5:355:13 | print_i64 | main.rs:355:15:355:15 | f |  |
-| main.rs:355:5:355:19 | print_i64(...) | main.rs:358:9:358:24 | ExprStmt |  |
-| main.rs:355:5:355:20 | ExprStmt | main.rs:355:5:355:13 | print_i64 |  |
-| main.rs:355:15:355:15 | f | main.rs:355:17:355:17 | 2 |  |
-| main.rs:355:15:355:18 | f(...) | main.rs:355:5:355:19 | print_i64(...) |  |
-| main.rs:355:17:355:17 | 2 | main.rs:355:15:355:18 | f(...) |  |
-| main.rs:357:5:372:5 | { ... } | main.rs:343:22:373:1 | { ... } |  |
-| main.rs:358:9:358:17 | print_i64 | main.rs:358:19:358:19 | f |  |
-| main.rs:358:9:358:23 | print_i64(...) | main.rs:359:9:362:9 | fn f |  |
-| main.rs:358:9:358:24 | ExprStmt | main.rs:358:9:358:17 | print_i64 |  |
-| main.rs:358:19:358:19 | f | main.rs:358:21:358:21 | 3 |  |
-| main.rs:358:19:358:22 | f(...) | main.rs:358:9:358:23 | print_i64(...) |  |
-| main.rs:358:21:358:21 | 3 | main.rs:358:19:358:22 | f(...) |  |
-| main.rs:359:9:362:9 | enter fn f | main.rs:359:14:359:14 | x |  |
-| main.rs:359:9:362:9 | exit fn f (normal) | main.rs:359:9:362:9 | exit fn f |  |
-| main.rs:359:9:362:9 | fn f | main.rs:364:9:366:9 | ExprStmt |  |
-| main.rs:359:14:359:14 | x | main.rs:359:14:359:14 | x |  |
-| main.rs:359:14:359:14 | x | main.rs:359:14:359:19 | ...: i64 | match |
-| main.rs:359:14:359:19 | ...: i64 | main.rs:361:13:361:13 | 2 |  |
-| main.rs:360:9:362:9 | { ... } | main.rs:359:9:362:9 | exit fn f (normal) |  |
-| main.rs:361:13:361:13 | 2 | main.rs:361:17:361:17 | x |  |
-| main.rs:361:13:361:17 | ... * ... | main.rs:360:9:362:9 | { ... } |  |
-| main.rs:361:17:361:17 | x | main.rs:361:13:361:17 | ... * ... |  |
-| main.rs:364:9:366:9 | ExprStmt | main.rs:365:13:365:28 | ExprStmt |  |
-| main.rs:364:9:366:9 | { ... } | main.rs:368:9:370:14 | let ... = ... |  |
-| main.rs:365:13:365:21 | print_i64 | main.rs:365:23:365:23 | f |  |
-| main.rs:365:13:365:27 | print_i64(...) | main.rs:364:9:366:9 | { ... } |  |
-| main.rs:365:13:365:28 | ExprStmt | main.rs:365:13:365:21 | print_i64 |  |
-| main.rs:365:23:365:23 | f | main.rs:365:25:365:25 | 4 |  |
-| main.rs:365:23:365:26 | f(...) | main.rs:365:13:365:27 | print_i64(...) |  |
-| main.rs:365:25:365:25 | 4 | main.rs:365:23:365:26 | f(...) |  |
-| main.rs:368:9:370:14 | let ... = ... | main.rs:369:13:370:13 | \|...\| x |  |
-| main.rs:368:13:368:13 | f | main.rs:368:13:368:13 | f |  |
-| main.rs:368:13:368:13 | f | main.rs:371:9:371:24 | ExprStmt | match |
-| main.rs:369:13:370:13 | \|...\| x | main.rs:368:13:368:13 | f |  |
-| main.rs:369:13:370:13 | enter \|...\| x | main.rs:369:14:369:14 | x |  |
-| main.rs:369:13:370:13 | exit \|...\| x (normal) | main.rs:369:13:370:13 | exit \|...\| x |  |
-| main.rs:369:14:369:14 | x | main.rs:369:14:369:14 | x |  |
-| main.rs:369:14:369:14 | x | main.rs:369:14:369:19 | ...: i64 | match |
-| main.rs:369:14:369:19 | ...: i64 | main.rs:370:13:370:13 | x |  |
-| main.rs:370:13:370:13 | x | main.rs:369:13:370:13 | exit \|...\| x (normal) |  |
-| main.rs:371:9:371:17 | print_i64 | main.rs:371:19:371:19 | f |  |
-| main.rs:371:9:371:23 | print_i64(...) | main.rs:357:5:372:5 | { ... } |  |
-| main.rs:371:9:371:24 | ExprStmt | main.rs:371:9:371:17 | print_i64 |  |
-| main.rs:371:19:371:19 | f | main.rs:371:21:371:21 | 5 |  |
-| main.rs:371:19:371:22 | f(...) | main.rs:371:9:371:23 | print_i64(...) |  |
-| main.rs:371:21:371:21 | 5 | main.rs:371:19:371:22 | f(...) |  |
-| main.rs:375:1:382:1 | enter fn for_variable | main.rs:376:5:376:42 | let ... = ... |  |
-| main.rs:375:1:382:1 | exit fn for_variable (normal) | main.rs:375:1:382:1 | exit fn for_variable |  |
-| main.rs:375:19:382:1 | { ... } | main.rs:375:1:382:1 | exit fn for_variable (normal) |  |
-| main.rs:376:5:376:42 | let ... = ... | main.rs:376:15:376:22 | "apples" |  |
-| main.rs:376:9:376:9 | v | main.rs:376:9:376:9 | v |  |
-| main.rs:376:9:376:9 | v | main.rs:379:12:379:12 | v | match |
-| main.rs:376:13:376:41 | &... | main.rs:376:9:376:9 | v |  |
-| main.rs:376:14:376:41 | [...] | main.rs:376:13:376:41 | &... |  |
-| main.rs:376:15:376:22 | "apples" | main.rs:376:25:376:30 | "cake" |  |
-| main.rs:376:25:376:30 | "cake" | main.rs:376:33:376:40 | "coffee" |  |
-| main.rs:376:33:376:40 | "coffee" | main.rs:376:14:376:41 | [...] |  |
-| main.rs:378:5:381:5 | for ... in ... { ... } | main.rs:375:19:382:1 | { ... } |  |
-| main.rs:378:9:378:12 | text | main.rs:378:5:381:5 | for ... in ... { ... } | no-match |
-| main.rs:378:9:378:12 | text | main.rs:378:9:378:12 | text |  |
-| main.rs:378:9:378:12 | text | main.rs:380:9:380:24 | ExprStmt | match |
-| main.rs:379:12:379:12 | v | main.rs:378:9:378:12 | text |  |
-| main.rs:379:14:381:5 | { ... } | main.rs:378:9:378:12 | text |  |
-| main.rs:380:9:380:17 | print_str | main.rs:380:19:380:22 | text |  |
-| main.rs:380:9:380:23 | print_str(...) | main.rs:379:14:381:5 | { ... } |  |
-| main.rs:380:9:380:24 | ExprStmt | main.rs:380:9:380:17 | print_str |  |
-| main.rs:380:19:380:22 | text | main.rs:380:9:380:23 | print_str(...) |  |
-| main.rs:384:1:390:1 | enter fn add_assign | main.rs:385:5:385:18 | let ... = 0 |  |
-| main.rs:384:1:390:1 | exit fn add_assign (normal) | main.rs:384:1:390:1 | exit fn add_assign |  |
-| main.rs:384:17:390:1 | { ... } | main.rs:384:1:390:1 | exit fn add_assign (normal) |  |
-| main.rs:385:5:385:18 | let ... = 0 | main.rs:385:17:385:17 | 0 |  |
-| main.rs:385:9:385:13 | mut a | main.rs:386:5:386:11 | ExprStmt | match |
-| main.rs:385:13:385:13 | a | main.rs:385:9:385:13 | mut a |  |
-| main.rs:385:17:385:17 | 0 | main.rs:385:13:385:13 | a |  |
-| main.rs:386:5:386:5 | a | main.rs:386:10:386:10 | 1 |  |
-| main.rs:386:5:386:10 | ... += ... | main.rs:387:5:387:17 | ExprStmt |  |
-| main.rs:386:5:386:11 | ExprStmt | main.rs:386:5:386:5 | a |  |
-| main.rs:386:10:386:10 | 1 | main.rs:386:5:386:10 | ... += ... |  |
-| main.rs:387:5:387:13 | print_i64 | main.rs:387:15:387:15 | a |  |
-| main.rs:387:5:387:16 | print_i64(...) | main.rs:388:5:388:28 | ExprStmt |  |
-| main.rs:387:5:387:17 | ExprStmt | main.rs:387:5:387:13 | print_i64 |  |
-| main.rs:387:15:387:15 | a | main.rs:387:5:387:16 | print_i64(...) |  |
-| main.rs:388:5:388:27 | ... .add_assign(...) | main.rs:389:5:389:17 | ExprStmt |  |
-| main.rs:388:5:388:28 | ExprStmt | main.rs:388:11:388:11 | a |  |
-| main.rs:388:6:388:11 | &mut a | main.rs:388:25:388:26 | 10 |  |
-| main.rs:388:11:388:11 | a | main.rs:388:6:388:11 | &mut a |  |
-| main.rs:388:25:388:26 | 10 | main.rs:388:5:388:27 | ... .add_assign(...) |  |
-| main.rs:389:5:389:13 | print_i64 | main.rs:389:15:389:15 | a |  |
-| main.rs:389:5:389:16 | print_i64(...) | main.rs:384:17:390:1 | { ... } |  |
-| main.rs:389:5:389:17 | ExprStmt | main.rs:389:5:389:13 | print_i64 |  |
-| main.rs:389:15:389:15 | a | main.rs:389:5:389:16 | print_i64(...) |  |
-| main.rs:392:1:398:1 | enter fn mutate | main.rs:393:5:393:18 | let ... = 1 |  |
-| main.rs:392:1:398:1 | exit fn mutate (normal) | main.rs:392:1:398:1 | exit fn mutate |  |
-| main.rs:392:13:398:1 | { ... } | main.rs:392:1:398:1 | exit fn mutate (normal) |  |
-| main.rs:393:5:393:18 | let ... = 1 | main.rs:393:17:393:17 | 1 |  |
-| main.rs:393:9:393:13 | mut i | main.rs:394:5:395:15 | let ... = ... | match |
-| main.rs:393:13:393:13 | i | main.rs:393:9:393:13 | mut i |  |
-| main.rs:393:17:393:17 | 1 | main.rs:393:13:393:13 | i |  |
-| main.rs:394:5:395:15 | let ... = ... | main.rs:395:14:395:14 | i |  |
-| main.rs:394:9:394:13 | ref_i | main.rs:394:9:394:13 | ref_i |  |
-| main.rs:394:9:394:13 | ref_i | main.rs:396:5:396:15 | ExprStmt | match |
-| main.rs:395:9:395:14 | &mut i | main.rs:394:9:394:13 | ref_i |  |
-| main.rs:395:14:395:14 | i | main.rs:395:9:395:14 | &mut i |  |
-| main.rs:396:5:396:10 | * ... | main.rs:396:14:396:14 | 2 |  |
-| main.rs:396:5:396:14 | ... = ... | main.rs:397:5:397:17 | ExprStmt |  |
-| main.rs:396:5:396:15 | ExprStmt | main.rs:396:6:396:10 | ref_i |  |
-| main.rs:396:6:396:10 | ref_i | main.rs:396:5:396:10 | * ... |  |
-| main.rs:396:14:396:14 | 2 | main.rs:396:5:396:14 | ... = ... |  |
-| main.rs:397:5:397:13 | print_i64 | main.rs:397:15:397:15 | i |  |
-| main.rs:397:5:397:16 | print_i64(...) | main.rs:392:13:398:1 | { ... } |  |
-| main.rs:397:5:397:17 | ExprStmt | main.rs:397:5:397:13 | print_i64 |  |
-| main.rs:397:15:397:15 | i | main.rs:397:5:397:16 | print_i64(...) |  |
-| main.rs:400:1:405:1 | enter fn mutate_param | main.rs:400:17:400:17 | x |  |
-| main.rs:400:1:405:1 | exit fn mutate_param (normal) | main.rs:400:1:405:1 | exit fn mutate_param |  |
-| main.rs:400:17:400:17 | x | main.rs:400:17:400:17 | x |  |
-| main.rs:400:17:400:17 | x | main.rs:400:17:400:27 | ...: ... | match |
-| main.rs:400:17:400:27 | ...: ... | main.rs:401:5:403:11 | ExprStmt |  |
-| main.rs:401:5:401:6 | * ... | main.rs:402:10:402:10 | x |  |
-| main.rs:401:5:403:10 | ... = ... | main.rs:404:5:404:13 | ExprStmt |  |
-| main.rs:401:5:403:11 | ExprStmt | main.rs:401:6:401:6 | x |  |
-| main.rs:401:6:401:6 | x | main.rs:401:5:401:6 | * ... |  |
-| main.rs:402:9:402:10 | * ... | main.rs:403:10:403:10 | x |  |
-| main.rs:402:9:403:10 | ... + ... | main.rs:401:5:403:10 | ... = ... |  |
-| main.rs:402:10:402:10 | x | main.rs:402:9:402:10 | * ... |  |
-| main.rs:403:9:403:10 | * ... | main.rs:402:9:403:10 | ... + ... |  |
-| main.rs:403:10:403:10 | x | main.rs:403:9:403:10 | * ... |  |
-| main.rs:404:5:404:12 | return x | main.rs:400:1:405:1 | exit fn mutate_param (normal) | return |
-| main.rs:404:5:404:13 | ExprStmt | main.rs:404:12:404:12 | x |  |
-| main.rs:404:12:404:12 | x | main.rs:404:5:404:12 | return x |  |
-| main.rs:407:1:413:1 | enter fn mutate_param2 | main.rs:407:22:407:22 | x |  |
-| main.rs:407:1:413:1 | exit fn mutate_param2 (normal) | main.rs:407:1:413:1 | exit fn mutate_param2 |  |
-| main.rs:407:22:407:22 | x | main.rs:407:22:407:22 | x |  |
-| main.rs:407:22:407:22 | x | main.rs:407:22:407:35 | ...: ... | match |
-| main.rs:407:22:407:35 | ...: ... | main.rs:407:38:407:38 | y |  |
-| main.rs:407:38:407:38 | y | main.rs:407:38:407:38 | y |  |
-| main.rs:407:38:407:38 | y | main.rs:407:38:407:56 | ...: ... | match |
-| main.rs:407:38:407:56 | ...: ... | main.rs:408:5:410:11 | ExprStmt |  |
-| main.rs:407:59:413:1 | { ... } | main.rs:407:1:413:1 | exit fn mutate_param2 (normal) |  |
-| main.rs:408:5:408:6 | * ... | main.rs:409:10:409:10 | x |  |
-| main.rs:408:5:410:10 | ... = ... | main.rs:411:5:412:10 | ExprStmt |  |
-| main.rs:408:5:410:11 | ExprStmt | main.rs:408:6:408:6 | x |  |
-| main.rs:408:6:408:6 | x | main.rs:408:5:408:6 | * ... |  |
-| main.rs:409:9:409:10 | * ... | main.rs:410:10:410:10 | x |  |
-| main.rs:409:9:410:10 | ... + ... | main.rs:408:5:410:10 | ... = ... |  |
-| main.rs:409:10:409:10 | x | main.rs:409:9:409:10 | * ... |  |
-| main.rs:410:9:410:10 | * ... | main.rs:409:9:410:10 | ... + ... |  |
-| main.rs:410:10:410:10 | x | main.rs:410:9:410:10 | * ... |  |
-| main.rs:411:5:411:6 | * ... | main.rs:412:9:412:9 | x |  |
-| main.rs:411:5:412:9 | ... = ... | main.rs:407:59:413:1 | { ... } |  |
-| main.rs:411:5:412:10 | ExprStmt | main.rs:411:6:411:6 | y |  |
-| main.rs:411:6:411:6 | y | main.rs:411:5:411:6 | * ... |  |
-| main.rs:412:9:412:9 | x | main.rs:411:5:412:9 | ... = ... |  |
-| main.rs:415:1:433:1 | enter fn mutate_arg | main.rs:416:5:416:18 | let ... = 2 |  |
-| main.rs:415:1:433:1 | exit fn mutate_arg (normal) | main.rs:415:1:433:1 | exit fn mutate_arg |  |
-| main.rs:415:17:433:1 | { ... } | main.rs:415:1:433:1 | exit fn mutate_arg (normal) |  |
-| main.rs:416:5:416:18 | let ... = 2 | main.rs:416:17:416:17 | 2 |  |
-| main.rs:416:9:416:13 | mut x | main.rs:417:5:418:29 | let ... = ... | match |
-| main.rs:416:13:416:13 | x | main.rs:416:9:416:13 | mut x |  |
-| main.rs:416:17:416:17 | 2 | main.rs:416:13:416:13 | x |  |
-| main.rs:417:5:418:29 | let ... = ... | main.rs:418:9:418:20 | mutate_param |  |
-| main.rs:417:9:417:9 | y | main.rs:417:9:417:9 | y |  |
-| main.rs:417:9:417:9 | y | main.rs:419:5:419:12 | ExprStmt | match |
-| main.rs:418:9:418:20 | mutate_param | main.rs:418:27:418:27 | x |  |
-| main.rs:418:9:418:28 | mutate_param(...) | main.rs:417:9:417:9 | y |  |
-| main.rs:418:22:418:27 | &mut x | main.rs:418:9:418:28 | mutate_param(...) |  |
-| main.rs:418:27:418:27 | x | main.rs:418:22:418:27 | &mut x |  |
-| main.rs:419:5:419:6 | * ... | main.rs:419:10:419:11 | 10 |  |
-| main.rs:419:5:419:11 | ... = ... | main.rs:421:5:421:17 | ExprStmt |  |
-| main.rs:419:5:419:12 | ExprStmt | main.rs:419:6:419:6 | y |  |
-| main.rs:419:6:419:6 | y | main.rs:419:5:419:6 | * ... |  |
-| main.rs:419:10:419:11 | 10 | main.rs:419:5:419:11 | ... = ... |  |
-| main.rs:421:5:421:13 | print_i64 | main.rs:421:15:421:15 | x |  |
-| main.rs:421:5:421:16 | print_i64(...) | main.rs:423:5:423:18 | let ... = 4 |  |
-| main.rs:421:5:421:17 | ExprStmt | main.rs:421:5:421:13 | print_i64 |  |
-| main.rs:421:15:421:15 | x | main.rs:421:5:421:16 | print_i64(...) |  |
-| main.rs:423:5:423:18 | let ... = 4 | main.rs:423:17:423:17 | 4 |  |
-| main.rs:423:9:423:13 | mut z | main.rs:424:5:425:20 | let ... = ... | match |
-| main.rs:423:13:423:13 | z | main.rs:423:9:423:13 | mut z |  |
-| main.rs:423:17:423:17 | 4 | main.rs:423:13:423:13 | z |  |
-| main.rs:424:5:425:20 | let ... = ... | main.rs:425:19:425:19 | x |  |
-| main.rs:424:9:424:9 | w | main.rs:424:9:424:9 | w |  |
-| main.rs:424:9:424:9 | w | main.rs:426:5:429:6 | ExprStmt | match |
-| main.rs:425:9:425:19 | &mut ... | main.rs:424:9:424:9 | w |  |
-| main.rs:425:14:425:19 | &mut x | main.rs:425:9:425:19 | &mut ... |  |
-| main.rs:425:19:425:19 | x | main.rs:425:14:425:19 | &mut x |  |
-| main.rs:426:5:426:17 | mutate_param2 | main.rs:427:14:427:14 | z |  |
-| main.rs:426:5:429:5 | mutate_param2(...) | main.rs:430:5:430:13 | ExprStmt |  |
-| main.rs:426:5:429:6 | ExprStmt | main.rs:426:5:426:17 | mutate_param2 |  |
-| main.rs:427:9:427:14 | &mut z | main.rs:428:9:428:9 | w |  |
-| main.rs:427:14:427:14 | z | main.rs:427:9:427:14 | &mut z |  |
-| main.rs:428:9:428:9 | w | main.rs:426:5:429:5 | mutate_param2(...) |  |
-| main.rs:430:5:430:7 | * ... | main.rs:430:11:430:12 | 11 |  |
-| main.rs:430:5:430:12 | ... = ... | main.rs:432:5:432:17 | ExprStmt |  |
-| main.rs:430:5:430:13 | ExprStmt | main.rs:430:7:430:7 | w |  |
-| main.rs:430:6:430:7 | * ... | main.rs:430:5:430:7 | * ... |  |
-| main.rs:430:7:430:7 | w | main.rs:430:6:430:7 | * ... |  |
-| main.rs:430:11:430:12 | 11 | main.rs:430:5:430:12 | ... = ... |  |
-| main.rs:432:5:432:13 | print_i64 | main.rs:432:15:432:15 | z |  |
-| main.rs:432:5:432:16 | print_i64(...) | main.rs:415:17:433:1 | { ... } |  |
-| main.rs:432:5:432:17 | ExprStmt | main.rs:432:5:432:13 | print_i64 |  |
-| main.rs:432:15:432:15 | z | main.rs:432:5:432:16 | print_i64(...) |  |
-| main.rs:435:1:441:1 | enter fn alias | main.rs:436:5:436:18 | let ... = 1 |  |
-| main.rs:435:1:441:1 | exit fn alias (normal) | main.rs:435:1:441:1 | exit fn alias |  |
-| main.rs:435:12:441:1 | { ... } | main.rs:435:1:441:1 | exit fn alias (normal) |  |
-| main.rs:436:5:436:18 | let ... = 1 | main.rs:436:17:436:17 | 1 |  |
-| main.rs:436:9:436:13 | mut x | main.rs:437:5:438:15 | let ... = ... | match |
-| main.rs:436:13:436:13 | x | main.rs:436:9:436:13 | mut x |  |
-| main.rs:436:17:436:17 | 1 | main.rs:436:13:436:13 | x |  |
-| main.rs:437:5:438:15 | let ... = ... | main.rs:438:14:438:14 | x |  |
-| main.rs:437:9:437:9 | y | main.rs:437:9:437:9 | y |  |
-| main.rs:437:9:437:9 | y | main.rs:439:5:439:11 | ExprStmt | match |
-| main.rs:438:9:438:14 | &mut x | main.rs:437:9:437:9 | y |  |
-| main.rs:438:14:438:14 | x | main.rs:438:9:438:14 | &mut x |  |
-| main.rs:439:5:439:6 | * ... | main.rs:439:10:439:10 | 2 |  |
-| main.rs:439:5:439:10 | ... = ... | main.rs:440:5:440:17 | ExprStmt |  |
-| main.rs:439:5:439:11 | ExprStmt | main.rs:439:6:439:6 | y |  |
-| main.rs:439:6:439:6 | y | main.rs:439:5:439:6 | * ... |  |
-| main.rs:439:10:439:10 | 2 | main.rs:439:5:439:10 | ... = ... |  |
-| main.rs:440:5:440:13 | print_i64 | main.rs:440:15:440:15 | x |  |
-| main.rs:440:5:440:16 | print_i64(...) | main.rs:435:12:441:1 | { ... } |  |
-| main.rs:440:5:440:17 | ExprStmt | main.rs:440:5:440:13 | print_i64 |  |
-| main.rs:440:15:440:15 | x | main.rs:440:5:440:16 | print_i64(...) |  |
-| main.rs:443:1:451:1 | enter fn capture_immut | main.rs:444:5:444:16 | let ... = 100 |  |
-| main.rs:443:1:451:1 | exit fn capture_immut (normal) | main.rs:443:1:451:1 | exit fn capture_immut |  |
-| main.rs:443:20:451:1 | { ... } | main.rs:443:1:451:1 | exit fn capture_immut (normal) |  |
-| main.rs:444:5:444:16 | let ... = 100 | main.rs:444:13:444:15 | 100 |  |
-| main.rs:444:9:444:9 | x | main.rs:444:9:444:9 | x |  |
-| main.rs:444:9:444:9 | x | main.rs:446:5:448:6 | let ... = ... | match |
-| main.rs:444:13:444:15 | 100 | main.rs:444:9:444:9 | x |  |
-| main.rs:446:5:448:6 | let ... = ... | main.rs:446:15:448:5 | \|...\| ... |  |
-| main.rs:446:9:446:11 | cap | main.rs:446:9:446:11 | cap |  |
-| main.rs:446:9:446:11 | cap | main.rs:449:5:449:10 | ExprStmt | match |
-| main.rs:446:15:448:5 | \|...\| ... | main.rs:446:9:446:11 | cap |  |
-| main.rs:446:15:448:5 | enter \|...\| ... | main.rs:447:9:447:21 | ExprStmt |  |
-| main.rs:446:15:448:5 | exit \|...\| ... (normal) | main.rs:446:15:448:5 | exit \|...\| ... |  |
-| main.rs:446:18:448:5 | { ... } | main.rs:446:15:448:5 | exit \|...\| ... (normal) |  |
-| main.rs:447:9:447:17 | print_i64 | main.rs:447:19:447:19 | x |  |
-| main.rs:447:9:447:20 | print_i64(...) | main.rs:446:18:448:5 | { ... } |  |
-| main.rs:447:9:447:21 | ExprStmt | main.rs:447:9:447:17 | print_i64 |  |
-| main.rs:447:19:447:19 | x | main.rs:447:9:447:20 | print_i64(...) |  |
-| main.rs:449:5:449:7 | cap | main.rs:449:5:449:9 | cap(...) |  |
-| main.rs:449:5:449:9 | cap(...) | main.rs:450:5:450:17 | ExprStmt |  |
-| main.rs:449:5:449:10 | ExprStmt | main.rs:449:5:449:7 | cap |  |
-| main.rs:450:5:450:13 | print_i64 | main.rs:450:15:450:15 | x |  |
-| main.rs:450:5:450:16 | print_i64(...) | main.rs:443:20:451:1 | { ... } |  |
-| main.rs:450:5:450:17 | ExprStmt | main.rs:450:5:450:13 | print_i64 |  |
-| main.rs:450:15:450:15 | x | main.rs:450:5:450:16 | print_i64(...) |  |
-| main.rs:453:1:477:1 | enter fn capture_mut | main.rs:454:5:454:18 | let ... = 1 |  |
-| main.rs:453:1:477:1 | exit fn capture_mut (normal) | main.rs:453:1:477:1 | exit fn capture_mut |  |
-| main.rs:453:18:477:1 | { ... } | main.rs:453:1:477:1 | exit fn capture_mut (normal) |  |
-| main.rs:454:5:454:18 | let ... = 1 | main.rs:454:17:454:17 | 1 |  |
-| main.rs:454:9:454:13 | mut x | main.rs:456:5:458:6 | let ... = ... | match |
-| main.rs:454:13:454:13 | x | main.rs:454:9:454:13 | mut x |  |
-| main.rs:454:17:454:17 | 1 | main.rs:454:13:454:13 | x |  |
-| main.rs:456:5:458:6 | let ... = ... | main.rs:456:20:458:5 | \|...\| ... |  |
-| main.rs:456:9:456:16 | closure1 | main.rs:456:9:456:16 | closure1 |  |
-| main.rs:456:9:456:16 | closure1 | main.rs:459:5:459:15 | ExprStmt | match |
-| main.rs:456:20:458:5 | \|...\| ... | main.rs:456:9:456:16 | closure1 |  |
-| main.rs:456:20:458:5 | enter \|...\| ... | main.rs:457:9:457:21 | ExprStmt |  |
-| main.rs:456:20:458:5 | exit \|...\| ... (normal) | main.rs:456:20:458:5 | exit \|...\| ... |  |
-| main.rs:456:23:458:5 | { ... } | main.rs:456:20:458:5 | exit \|...\| ... (normal) |  |
-| main.rs:457:9:457:17 | print_i64 | main.rs:457:19:457:19 | x |  |
-| main.rs:457:9:457:20 | print_i64(...) | main.rs:456:23:458:5 | { ... } |  |
-| main.rs:457:9:457:21 | ExprStmt | main.rs:457:9:457:17 | print_i64 |  |
-| main.rs:457:19:457:19 | x | main.rs:457:9:457:20 | print_i64(...) |  |
-| main.rs:459:5:459:12 | closure1 | main.rs:459:5:459:14 | closure1(...) |  |
-| main.rs:459:5:459:14 | closure1(...) | main.rs:460:5:460:17 | ExprStmt |  |
-| main.rs:459:5:459:15 | ExprStmt | main.rs:459:5:459:12 | closure1 |  |
-| main.rs:460:5:460:13 | print_i64 | main.rs:460:15:460:15 | x |  |
-| main.rs:460:5:460:16 | print_i64(...) | main.rs:462:5:462:18 | let ... = 2 |  |
-| main.rs:460:5:460:17 | ExprStmt | main.rs:460:5:460:13 | print_i64 |  |
-| main.rs:460:15:460:15 | x | main.rs:460:5:460:16 | print_i64(...) |  |
-| main.rs:462:5:462:18 | let ... = 2 | main.rs:462:17:462:17 | 2 |  |
-| main.rs:462:9:462:13 | mut y | main.rs:464:5:466:6 | let ... = ... | match |
-| main.rs:462:13:462:13 | y | main.rs:462:9:462:13 | mut y |  |
-| main.rs:462:17:462:17 | 2 | main.rs:462:13:462:13 | y |  |
-| main.rs:464:5:466:6 | let ... = ... | main.rs:464:24:466:5 | \|...\| ... |  |
-| main.rs:464:9:464:20 | mut closure2 | main.rs:467:5:467:15 | ExprStmt | match |
-| main.rs:464:13:464:20 | closure2 | main.rs:464:9:464:20 | mut closure2 |  |
-| main.rs:464:24:466:5 | \|...\| ... | main.rs:464:13:464:20 | closure2 |  |
-| main.rs:464:24:466:5 | enter \|...\| ... | main.rs:465:9:465:14 | ExprStmt |  |
-| main.rs:464:24:466:5 | exit \|...\| ... (normal) | main.rs:464:24:466:5 | exit \|...\| ... |  |
-| main.rs:464:27:466:5 | { ... } | main.rs:464:24:466:5 | exit \|...\| ... (normal) |  |
-| main.rs:465:9:465:9 | y | main.rs:465:13:465:13 | 3 |  |
-| main.rs:465:9:465:13 | ... = ... | main.rs:464:27:466:5 | { ... } |  |
-| main.rs:465:9:465:14 | ExprStmt | main.rs:465:9:465:9 | y |  |
-| main.rs:465:13:465:13 | 3 | main.rs:465:9:465:13 | ... = ... |  |
-| main.rs:467:5:467:12 | closure2 | main.rs:467:5:467:14 | closure2(...) |  |
-| main.rs:467:5:467:14 | closure2(...) | main.rs:468:5:468:17 | ExprStmt |  |
-| main.rs:467:5:467:15 | ExprStmt | main.rs:467:5:467:12 | closure2 |  |
-| main.rs:468:5:468:13 | print_i64 | main.rs:468:15:468:15 | y |  |
-| main.rs:468:5:468:16 | print_i64(...) | main.rs:470:5:470:18 | let ... = 2 |  |
-| main.rs:468:5:468:17 | ExprStmt | main.rs:468:5:468:13 | print_i64 |  |
-| main.rs:468:15:468:15 | y | main.rs:468:5:468:16 | print_i64(...) |  |
-| main.rs:470:5:470:18 | let ... = 2 | main.rs:470:17:470:17 | 2 |  |
-| main.rs:470:9:470:13 | mut z | main.rs:472:5:474:6 | let ... = ... | match |
-| main.rs:470:13:470:13 | z | main.rs:470:9:470:13 | mut z |  |
-| main.rs:470:17:470:17 | 2 | main.rs:470:13:470:13 | z |  |
-| main.rs:472:5:474:6 | let ... = ... | main.rs:472:24:474:5 | \|...\| ... |  |
-| main.rs:472:9:472:20 | mut closure3 | main.rs:475:5:475:15 | ExprStmt | match |
-| main.rs:472:13:472:20 | closure3 | main.rs:472:9:472:20 | mut closure3 |  |
-| main.rs:472:24:474:5 | \|...\| ... | main.rs:472:13:472:20 | closure3 |  |
-| main.rs:472:24:474:5 | enter \|...\| ... | main.rs:473:9:473:24 | ExprStmt |  |
-| main.rs:472:24:474:5 | exit \|...\| ... (normal) | main.rs:472:24:474:5 | exit \|...\| ... |  |
-| main.rs:472:27:474:5 | { ... } | main.rs:472:24:474:5 | exit \|...\| ... (normal) |  |
-| main.rs:473:9:473:9 | z | main.rs:473:22:473:22 | 1 |  |
-| main.rs:473:9:473:23 | z.add_assign(...) | main.rs:472:27:474:5 | { ... } |  |
-| main.rs:473:9:473:24 | ExprStmt | main.rs:473:9:473:9 | z |  |
-| main.rs:473:22:473:22 | 1 | main.rs:473:9:473:23 | z.add_assign(...) |  |
-| main.rs:475:5:475:12 | closure3 | main.rs:475:5:475:14 | closure3(...) |  |
-| main.rs:475:5:475:14 | closure3(...) | main.rs:476:5:476:17 | ExprStmt |  |
-| main.rs:475:5:475:15 | ExprStmt | main.rs:475:5:475:12 | closure3 |  |
-| main.rs:476:5:476:13 | print_i64 | main.rs:476:15:476:15 | z |  |
-| main.rs:476:5:476:16 | print_i64(...) | main.rs:453:18:477:1 | { ... } |  |
-| main.rs:476:5:476:17 | ExprStmt | main.rs:476:5:476:13 | print_i64 |  |
-| main.rs:476:15:476:15 | z | main.rs:476:5:476:16 | print_i64(...) |  |
-| main.rs:479:1:487:1 | enter fn async_block_capture | main.rs:480:5:480:23 | let ... = 0 |  |
-| main.rs:479:1:487:1 | exit fn async_block_capture (normal) | main.rs:479:1:487:1 | exit fn async_block_capture |  |
-| main.rs:479:32:487:1 | { ... } | main.rs:479:1:487:1 | exit fn async_block_capture (normal) |  |
-| main.rs:480:5:480:23 | let ... = 0 | main.rs:480:22:480:22 | 0 |  |
-| main.rs:480:9:480:13 | mut i | main.rs:481:5:483:6 | let ... = ... | match |
-| main.rs:480:13:480:13 | i | main.rs:480:9:480:13 | mut i |  |
-| main.rs:480:22:480:22 | 0 | main.rs:480:13:480:13 | i |  |
-| main.rs:481:5:483:6 | let ... = ... | main.rs:481:17:483:5 | { ... } |  |
-| main.rs:481:9:481:13 | block | main.rs:481:9:481:13 | block |  |
-| main.rs:481:9:481:13 | block | main.rs:485:5:485:16 | ExprStmt | match |
-| main.rs:481:17:483:5 | enter { ... } | main.rs:482:9:482:14 | ExprStmt |  |
-| main.rs:481:17:483:5 | exit { ... } (normal) | main.rs:481:17:483:5 | exit { ... } |  |
-| main.rs:481:17:483:5 | { ... } | main.rs:481:9:481:13 | block |  |
-| main.rs:482:9:482:9 | i | main.rs:482:13:482:13 | 1 |  |
-| main.rs:482:9:482:13 | ... = ... | main.rs:481:17:483:5 | exit { ... } (normal) |  |
-| main.rs:482:9:482:14 | ExprStmt | main.rs:482:9:482:9 | i |  |
-| main.rs:482:13:482:13 | 1 | main.rs:482:9:482:13 | ... = ... |  |
-| main.rs:485:5:485:9 | block | main.rs:485:5:485:15 | await block |  |
-| main.rs:485:5:485:15 | await block | main.rs:486:5:486:17 | ExprStmt |  |
-| main.rs:485:5:485:16 | ExprStmt | main.rs:485:5:485:9 | block |  |
-| main.rs:486:5:486:13 | print_i64 | main.rs:486:15:486:15 | i |  |
-| main.rs:486:5:486:16 | print_i64(...) | main.rs:479:32:487:1 | { ... } |  |
-| main.rs:486:5:486:17 | ExprStmt | main.rs:486:5:486:13 | print_i64 |  |
-| main.rs:486:15:486:15 | i | main.rs:486:5:486:16 | print_i64(...) |  |
-| main.rs:489:1:505:1 | enter fn phi | main.rs:489:8:489:8 | b |  |
-| main.rs:489:1:505:1 | exit fn phi (normal) | main.rs:489:1:505:1 | exit fn phi |  |
-| main.rs:489:8:489:8 | b | main.rs:489:8:489:8 | b |  |
-| main.rs:489:8:489:8 | b | main.rs:489:8:489:14 | ...: bool | match |
-| main.rs:489:8:489:14 | ...: bool | main.rs:490:5:490:18 | let ... = 1 |  |
-| main.rs:489:17:505:1 | { ... } | main.rs:489:1:505:1 | exit fn phi (normal) |  |
-| main.rs:490:5:490:18 | let ... = 1 | main.rs:490:17:490:17 | 1 |  |
-| main.rs:490:9:490:13 | mut x | main.rs:491:5:491:17 | ExprStmt | match |
-| main.rs:490:13:490:13 | x | main.rs:490:9:490:13 | mut x |  |
-| main.rs:490:17:490:17 | 1 | main.rs:490:13:490:13 | x |  |
-| main.rs:491:5:491:13 | print_i64 | main.rs:491:15:491:15 | x |  |
-| main.rs:491:5:491:16 | print_i64(...) | main.rs:492:5:492:21 | ExprStmt |  |
-| main.rs:491:5:491:17 | ExprStmt | main.rs:491:5:491:13 | print_i64 |  |
-| main.rs:491:15:491:15 | x | main.rs:491:5:491:16 | print_i64(...) |  |
-| main.rs:492:5:492:13 | print_i64 | main.rs:492:15:492:15 | x |  |
-| main.rs:492:5:492:20 | print_i64(...) | main.rs:493:5:503:6 | let _ = ... |  |
-| main.rs:492:5:492:21 | ExprStmt | main.rs:492:5:492:13 | print_i64 |  |
-| main.rs:492:15:492:15 | x | main.rs:492:19:492:19 | 1 |  |
-| main.rs:492:15:492:19 | ... + ... | main.rs:492:5:492:20 | print_i64(...) |  |
-| main.rs:492:19:492:19 | 1 | main.rs:492:15:492:19 | ... + ... |  |
-| main.rs:493:5:503:6 | let _ = ... | main.rs:494:16:494:16 | b |  |
-| main.rs:494:9:494:9 | _ | main.rs:504:5:504:17 | ExprStmt | match |
-| main.rs:494:13:503:5 | if b {...} else {...} | main.rs:494:9:494:9 | _ |  |
-| main.rs:494:16:494:16 | b | main.rs:496:9:496:14 | ExprStmt | true |
-| main.rs:494:16:494:16 | b | main.rs:500:9:500:14 | ExprStmt | false |
-| main.rs:495:5:499:5 | { ... } | main.rs:494:13:503:5 | if b {...} else {...} |  |
-| main.rs:496:9:496:9 | x | main.rs:496:13:496:13 | 2 |  |
-| main.rs:496:9:496:13 | ... = ... | main.rs:497:9:497:21 | ExprStmt |  |
-| main.rs:496:9:496:14 | ExprStmt | main.rs:496:9:496:9 | x |  |
-| main.rs:496:13:496:13 | 2 | main.rs:496:9:496:13 | ... = ... |  |
-| main.rs:497:9:497:17 | print_i64 | main.rs:497:19:497:19 | x |  |
-| main.rs:497:9:497:20 | print_i64(...) | main.rs:498:9:498:25 | ExprStmt |  |
-| main.rs:497:9:497:21 | ExprStmt | main.rs:497:9:497:17 | print_i64 |  |
-| main.rs:497:19:497:19 | x | main.rs:497:9:497:20 | print_i64(...) |  |
-| main.rs:498:9:498:17 | print_i64 | main.rs:498:19:498:19 | x |  |
-| main.rs:498:9:498:24 | print_i64(...) | main.rs:495:5:499:5 | { ... } |  |
-| main.rs:498:9:498:25 | ExprStmt | main.rs:498:9:498:17 | print_i64 |  |
-| main.rs:498:19:498:19 | x | main.rs:498:23:498:23 | 1 |  |
-| main.rs:498:19:498:23 | ... + ... | main.rs:498:9:498:24 | print_i64(...) |  |
-| main.rs:498:23:498:23 | 1 | main.rs:498:19:498:23 | ... + ... |  |
-| main.rs:499:12:503:5 | { ... } | main.rs:494:13:503:5 | if b {...} else {...} |  |
-| main.rs:500:9:500:9 | x | main.rs:500:13:500:13 | 3 |  |
-| main.rs:500:9:500:13 | ... = ... | main.rs:501:9:501:21 | ExprStmt |  |
-| main.rs:500:9:500:14 | ExprStmt | main.rs:500:9:500:9 | x |  |
-| main.rs:500:13:500:13 | 3 | main.rs:500:9:500:13 | ... = ... |  |
-| main.rs:501:9:501:17 | print_i64 | main.rs:501:19:501:19 | x |  |
-| main.rs:501:9:501:20 | print_i64(...) | main.rs:502:9:502:25 | ExprStmt |  |
-| main.rs:501:9:501:21 | ExprStmt | main.rs:501:9:501:17 | print_i64 |  |
-| main.rs:501:19:501:19 | x | main.rs:501:9:501:20 | print_i64(...) |  |
-| main.rs:502:9:502:17 | print_i64 | main.rs:502:19:502:19 | x |  |
-| main.rs:502:9:502:24 | print_i64(...) | main.rs:499:12:503:5 | { ... } |  |
-| main.rs:502:9:502:25 | ExprStmt | main.rs:502:9:502:17 | print_i64 |  |
-| main.rs:502:19:502:19 | x | main.rs:502:23:502:23 | 1 |  |
-| main.rs:502:19:502:23 | ... + ... | main.rs:502:9:502:24 | print_i64(...) |  |
-| main.rs:502:23:502:23 | 1 | main.rs:502:19:502:23 | ... + ... |  |
-| main.rs:504:5:504:13 | print_i64 | main.rs:504:15:504:15 | x |  |
-| main.rs:504:5:504:16 | print_i64(...) | main.rs:489:17:505:1 | { ... } |  |
-| main.rs:504:5:504:17 | ExprStmt | main.rs:504:5:504:13 | print_i64 |  |
-| main.rs:504:15:504:15 | x | main.rs:504:5:504:16 | print_i64(...) |  |
-| main.rs:507:1:524:1 | enter fn phi_read | main.rs:507:13:507:14 | b1 |  |
-| main.rs:507:1:524:1 | exit fn phi_read (normal) | main.rs:507:1:524:1 | exit fn phi_read |  |
-| main.rs:507:13:507:14 | b1 | main.rs:507:13:507:14 | b1 |  |
-| main.rs:507:13:507:14 | b1 | main.rs:507:13:507:20 | ...: bool | match |
-| main.rs:507:13:507:20 | ...: bool | main.rs:507:23:507:24 | b2 |  |
-| main.rs:507:23:507:24 | b2 | main.rs:507:23:507:24 | b2 |  |
-| main.rs:507:23:507:24 | b2 | main.rs:507:23:507:30 | ...: bool | match |
-| main.rs:507:23:507:30 | ...: bool | main.rs:508:5:508:14 | let ... = 1 |  |
-| main.rs:507:33:524:1 | { ... } | main.rs:507:1:524:1 | exit fn phi_read (normal) |  |
-| main.rs:508:5:508:14 | let ... = 1 | main.rs:508:13:508:13 | 1 |  |
-| main.rs:508:9:508:9 | x | main.rs:508:9:508:9 | x |  |
-| main.rs:508:9:508:9 | x | main.rs:509:5:515:6 | let _ = ... | match |
-| main.rs:508:13:508:13 | 1 | main.rs:508:9:508:9 | x |  |
-| main.rs:509:5:515:6 | let _ = ... | main.rs:510:16:510:17 | b1 |  |
-| main.rs:510:9:510:9 | _ | main.rs:517:5:523:6 | let _ = ... | match |
-| main.rs:510:13:515:5 | if b1 {...} else {...} | main.rs:510:9:510:9 | _ |  |
-| main.rs:510:16:510:17 | b1 | main.rs:512:9:512:21 | ExprStmt | true |
-| main.rs:510:16:510:17 | b1 | main.rs:514:9:514:21 | ExprStmt | false |
-| main.rs:511:5:513:5 | { ... } | main.rs:510:13:515:5 | if b1 {...} else {...} |  |
-| main.rs:512:9:512:17 | print_i64 | main.rs:512:19:512:19 | x |  |
-| main.rs:512:9:512:20 | print_i64(...) | main.rs:511:5:513:5 | { ... } |  |
-| main.rs:512:9:512:21 | ExprStmt | main.rs:512:9:512:17 | print_i64 |  |
-| main.rs:512:19:512:19 | x | main.rs:512:9:512:20 | print_i64(...) |  |
-| main.rs:513:12:515:5 | { ... } | main.rs:510:13:515:5 | if b1 {...} else {...} |  |
-| main.rs:514:9:514:17 | print_i64 | main.rs:514:19:514:19 | x |  |
-| main.rs:514:9:514:20 | print_i64(...) | main.rs:513:12:515:5 | { ... } |  |
-| main.rs:514:9:514:21 | ExprStmt | main.rs:514:9:514:17 | print_i64 |  |
-| main.rs:514:19:514:19 | x | main.rs:514:9:514:20 | print_i64(...) |  |
-| main.rs:517:5:523:6 | let _ = ... | main.rs:518:16:518:17 | b2 |  |
-| main.rs:518:9:518:9 | _ | main.rs:507:33:524:1 | { ... } | match |
-| main.rs:518:13:523:5 | if b2 {...} else {...} | main.rs:518:9:518:9 | _ |  |
-| main.rs:518:16:518:17 | b2 | main.rs:520:9:520:21 | ExprStmt | true |
-| main.rs:518:16:518:17 | b2 | main.rs:522:9:522:21 | ExprStmt | false |
-| main.rs:519:5:521:5 | { ... } | main.rs:518:13:523:5 | if b2 {...} else {...} |  |
-| main.rs:520:9:520:17 | print_i64 | main.rs:520:19:520:19 | x |  |
-| main.rs:520:9:520:20 | print_i64(...) | main.rs:519:5:521:5 | { ... } |  |
-| main.rs:520:9:520:21 | ExprStmt | main.rs:520:9:520:17 | print_i64 |  |
-| main.rs:520:19:520:19 | x | main.rs:520:9:520:20 | print_i64(...) |  |
-| main.rs:521:12:523:5 | { ... } | main.rs:518:13:523:5 | if b2 {...} else {...} |  |
-| main.rs:522:9:522:17 | print_i64 | main.rs:522:19:522:19 | x |  |
-| main.rs:522:9:522:20 | print_i64(...) | main.rs:521:12:523:5 | { ... } |  |
-| main.rs:522:9:522:21 | ExprStmt | main.rs:522:9:522:17 | print_i64 |  |
-| main.rs:522:19:522:19 | x | main.rs:522:9:522:20 | print_i64(...) |  |
-| main.rs:531:5:533:5 | enter fn my_get | main.rs:531:20:531:23 | self |  |
-| main.rs:531:5:533:5 | exit fn my_get (normal) | main.rs:531:5:533:5 | exit fn my_get |  |
-| main.rs:531:15:531:23 | SelfParam | main.rs:532:9:532:24 | ExprStmt |  |
-| main.rs:531:20:531:23 | self | main.rs:531:15:531:23 | SelfParam |  |
-| main.rs:532:9:532:23 | return ... | main.rs:531:5:533:5 | exit fn my_get (normal) | return |
-| main.rs:532:9:532:24 | ExprStmt | main.rs:532:16:532:19 | self |  |
-| main.rs:532:16:532:19 | self | main.rs:532:16:532:23 | self.val |  |
-| main.rs:532:16:532:23 | self.val | main.rs:532:9:532:23 | return ... |  |
-| main.rs:535:5:537:5 | enter fn id | main.rs:535:11:535:14 | self |  |
-| main.rs:535:5:537:5 | exit fn id (normal) | main.rs:535:5:537:5 | exit fn id |  |
-| main.rs:535:11:535:14 | SelfParam | main.rs:536:9:536:12 | self |  |
-| main.rs:535:11:535:14 | self | main.rs:535:11:535:14 | SelfParam |  |
-| main.rs:535:25:537:5 | { ... } | main.rs:535:5:537:5 | exit fn id (normal) |  |
-| main.rs:536:9:536:12 | self | main.rs:535:25:537:5 | { ... } |  |
-| main.rs:539:5:546:5 | enter fn my_method | main.rs:539:23:539:26 | self |  |
-| main.rs:539:5:546:5 | exit fn my_method (normal) | main.rs:539:5:546:5 | exit fn my_method |  |
-| main.rs:539:18:539:26 | SelfParam | main.rs:540:9:543:10 | let ... = ... |  |
-| main.rs:539:23:539:26 | self | main.rs:539:18:539:26 | SelfParam |  |
-| main.rs:539:29:546:5 | { ... } | main.rs:539:5:546:5 | exit fn my_method (normal) |  |
-| main.rs:540:9:543:10 | let ... = ... | main.rs:540:21:543:9 | \|...\| ... |  |
-| main.rs:540:13:540:17 | mut f | main.rs:544:9:544:13 | ExprStmt | match |
-| main.rs:540:17:540:17 | f | main.rs:540:13:540:17 | mut f |  |
-| main.rs:540:21:543:9 | \|...\| ... | main.rs:540:17:540:17 | f |  |
-| main.rs:540:21:543:9 | enter \|...\| ... | main.rs:540:22:540:22 | n |  |
-| main.rs:540:21:543:9 | exit \|...\| ... (normal) | main.rs:540:21:543:9 | exit \|...\| ... |  |
-| main.rs:540:22:540:22 | ... | main.rs:542:13:542:26 | ExprStmt |  |
-| main.rs:540:22:540:22 | n | main.rs:540:22:540:22 | ... | match |
-| main.rs:540:22:540:22 | n | main.rs:540:22:540:22 | n |  |
-| main.rs:540:25:543:9 | { ... } | main.rs:540:21:543:9 | exit \|...\| ... (normal) |  |
-| main.rs:542:13:542:16 | self | main.rs:542:13:542:20 | self.val |  |
-| main.rs:542:13:542:20 | self.val | main.rs:542:25:542:25 | n |  |
-| main.rs:542:13:542:25 | ... += ... | main.rs:540:25:543:9 | { ... } |  |
-| main.rs:542:13:542:26 | ExprStmt | main.rs:542:13:542:16 | self |  |
-| main.rs:542:25:542:25 | n | main.rs:542:13:542:25 | ... += ... |  |
-| main.rs:544:9:544:9 | f | main.rs:544:11:544:11 | 3 |  |
-| main.rs:544:9:544:12 | f(...) | main.rs:545:9:545:13 | ExprStmt |  |
-| main.rs:544:9:544:13 | ExprStmt | main.rs:544:9:544:9 | f |  |
-| main.rs:544:11:544:11 | 3 | main.rs:544:9:544:12 | f(...) |  |
-| main.rs:545:9:545:9 | f | main.rs:545:11:545:11 | 4 |  |
-| main.rs:545:9:545:12 | f(...) | main.rs:539:29:546:5 | { ... } |  |
-| main.rs:545:9:545:13 | ExprStmt | main.rs:545:9:545:9 | f |  |
-| main.rs:545:11:545:11 | 4 | main.rs:545:9:545:12 | f(...) |  |
-| main.rs:549:1:556:1 | enter fn structs | main.rs:550:5:550:36 | let ... = ... |  |
-| main.rs:549:1:556:1 | exit fn structs (normal) | main.rs:549:1:556:1 | exit fn structs |  |
-| main.rs:549:14:556:1 | { ... } | main.rs:549:1:556:1 | exit fn structs (normal) |  |
-| main.rs:550:5:550:36 | let ... = ... | main.rs:550:33:550:33 | 1 |  |
-| main.rs:550:9:550:13 | mut a | main.rs:551:5:551:26 | ExprStmt | match |
-| main.rs:550:13:550:13 | a | main.rs:550:9:550:13 | mut a |  |
-| main.rs:550:17:550:35 | MyStruct {...} | main.rs:550:13:550:13 | a |  |
-| main.rs:550:33:550:33 | 1 | main.rs:550:17:550:35 | MyStruct {...} |  |
-| main.rs:551:5:551:13 | print_i64 | main.rs:551:15:551:15 | a |  |
-| main.rs:551:5:551:25 | print_i64(...) | main.rs:552:5:552:14 | ExprStmt |  |
-| main.rs:551:5:551:26 | ExprStmt | main.rs:551:5:551:13 | print_i64 |  |
-| main.rs:551:15:551:15 | a | main.rs:551:15:551:24 | a.my_get() |  |
-| main.rs:551:15:551:24 | a.my_get() | main.rs:551:5:551:25 | print_i64(...) |  |
-| main.rs:552:5:552:5 | a | main.rs:552:5:552:9 | a.val |  |
-| main.rs:552:5:552:9 | a.val | main.rs:552:13:552:13 | 5 |  |
-| main.rs:552:5:552:13 | ... = ... | main.rs:553:5:553:26 | ExprStmt |  |
-| main.rs:552:5:552:14 | ExprStmt | main.rs:552:5:552:5 | a |  |
-| main.rs:552:13:552:13 | 5 | main.rs:552:5:552:13 | ... = ... |  |
-| main.rs:553:5:553:13 | print_i64 | main.rs:553:15:553:15 | a |  |
-| main.rs:553:5:553:25 | print_i64(...) | main.rs:554:5:554:28 | ExprStmt |  |
-| main.rs:553:5:553:26 | ExprStmt | main.rs:553:5:553:13 | print_i64 |  |
-| main.rs:553:15:553:15 | a | main.rs:553:15:553:24 | a.my_get() |  |
-| main.rs:553:15:553:24 | a.my_get() | main.rs:553:5:553:25 | print_i64(...) |  |
-| main.rs:554:5:554:5 | a | main.rs:554:25:554:25 | 2 |  |
-| main.rs:554:5:554:27 | ... = ... | main.rs:555:5:555:26 | ExprStmt |  |
-| main.rs:554:5:554:28 | ExprStmt | main.rs:554:5:554:5 | a |  |
-| main.rs:554:9:554:27 | MyStruct {...} | main.rs:554:5:554:27 | ... = ... |  |
-| main.rs:554:25:554:25 | 2 | main.rs:554:9:554:27 | MyStruct {...} |  |
-| main.rs:555:5:555:13 | print_i64 | main.rs:555:15:555:15 | a |  |
-| main.rs:555:5:555:25 | print_i64(...) | main.rs:549:14:556:1 | { ... } |  |
-| main.rs:555:5:555:26 | ExprStmt | main.rs:555:5:555:13 | print_i64 |  |
-| main.rs:555:15:555:15 | a | main.rs:555:15:555:24 | a.my_get() |  |
-| main.rs:555:15:555:24 | a.my_get() | main.rs:555:5:555:25 | print_i64(...) |  |
-| main.rs:558:1:565:1 | enter fn arrays | main.rs:559:5:559:26 | let ... = ... |  |
-| main.rs:558:1:565:1 | exit fn arrays (normal) | main.rs:558:1:565:1 | exit fn arrays |  |
-| main.rs:558:13:565:1 | { ... } | main.rs:558:1:565:1 | exit fn arrays (normal) |  |
-| main.rs:559:5:559:26 | let ... = ... | main.rs:559:18:559:18 | 1 |  |
-| main.rs:559:9:559:13 | mut a | main.rs:560:5:560:20 | ExprStmt | match |
-| main.rs:559:13:559:13 | a | main.rs:559:9:559:13 | mut a |  |
-| main.rs:559:17:559:25 | [...] | main.rs:559:13:559:13 | a |  |
-| main.rs:559:18:559:18 | 1 | main.rs:559:21:559:21 | 2 |  |
-| main.rs:559:21:559:21 | 2 | main.rs:559:24:559:24 | 3 |  |
-| main.rs:559:24:559:24 | 3 | main.rs:559:17:559:25 | [...] |  |
-| main.rs:560:5:560:13 | print_i64 | main.rs:560:15:560:15 | a |  |
-| main.rs:560:5:560:19 | print_i64(...) | main.rs:561:5:561:13 | ExprStmt |  |
-| main.rs:560:5:560:20 | ExprStmt | main.rs:560:5:560:13 | print_i64 |  |
-| main.rs:560:15:560:15 | a | main.rs:560:17:560:17 | 0 |  |
-| main.rs:560:15:560:18 | a[0] | main.rs:560:5:560:19 | print_i64(...) |  |
-| main.rs:560:17:560:17 | 0 | main.rs:560:15:560:18 | a[0] |  |
-| main.rs:561:5:561:5 | a | main.rs:561:7:561:7 | 1 |  |
-| main.rs:561:5:561:8 | a[1] | main.rs:561:12:561:12 | 5 |  |
-| main.rs:561:5:561:12 | ... = ... | main.rs:562:5:562:20 | ExprStmt |  |
-| main.rs:561:5:561:13 | ExprStmt | main.rs:561:5:561:5 | a |  |
-| main.rs:561:7:561:7 | 1 | main.rs:561:5:561:8 | a[1] |  |
-| main.rs:561:12:561:12 | 5 | main.rs:561:5:561:12 | ... = ... |  |
-| main.rs:562:5:562:13 | print_i64 | main.rs:562:15:562:15 | a |  |
-| main.rs:562:5:562:19 | print_i64(...) | main.rs:563:5:563:18 | ExprStmt |  |
-| main.rs:562:5:562:20 | ExprStmt | main.rs:562:5:562:13 | print_i64 |  |
-| main.rs:562:15:562:15 | a | main.rs:562:17:562:17 | 1 |  |
-| main.rs:562:15:562:18 | a[1] | main.rs:562:5:562:19 | print_i64(...) |  |
-| main.rs:562:17:562:17 | 1 | main.rs:562:15:562:18 | a[1] |  |
-| main.rs:563:5:563:5 | a | main.rs:563:10:563:10 | 4 |  |
-| main.rs:563:5:563:17 | ... = ... | main.rs:564:5:564:20 | ExprStmt |  |
-| main.rs:563:5:563:18 | ExprStmt | main.rs:563:5:563:5 | a |  |
-| main.rs:563:9:563:17 | [...] | main.rs:563:5:563:17 | ... = ... |  |
-| main.rs:563:10:563:10 | 4 | main.rs:563:13:563:13 | 5 |  |
-| main.rs:563:13:563:13 | 5 | main.rs:563:16:563:16 | 6 |  |
-| main.rs:563:16:563:16 | 6 | main.rs:563:9:563:17 | [...] |  |
-| main.rs:564:5:564:13 | print_i64 | main.rs:564:15:564:15 | a |  |
-| main.rs:564:5:564:19 | print_i64(...) | main.rs:558:13:565:1 | { ... } |  |
-| main.rs:564:5:564:20 | ExprStmt | main.rs:564:5:564:13 | print_i64 |  |
-| main.rs:564:15:564:15 | a | main.rs:564:17:564:17 | 2 |  |
-| main.rs:564:15:564:18 | a[2] | main.rs:564:5:564:19 | print_i64(...) |  |
-| main.rs:564:17:564:17 | 2 | main.rs:564:15:564:18 | a[2] |  |
-| main.rs:567:1:574:1 | enter fn ref_arg | main.rs:568:5:568:15 | let ... = 16 |  |
-| main.rs:567:1:574:1 | exit fn ref_arg (normal) | main.rs:567:1:574:1 | exit fn ref_arg |  |
-| main.rs:567:14:574:1 | { ... } | main.rs:567:1:574:1 | exit fn ref_arg (normal) |  |
-| main.rs:568:5:568:15 | let ... = 16 | main.rs:568:13:568:14 | 16 |  |
-| main.rs:568:9:568:9 | x | main.rs:568:9:568:9 | x |  |
-| main.rs:568:9:568:9 | x | main.rs:569:5:569:22 | ExprStmt | match |
-| main.rs:568:13:568:14 | 16 | main.rs:568:9:568:9 | x |  |
-| main.rs:569:5:569:17 | print_i64_ref | main.rs:569:20:569:20 | x |  |
-| main.rs:569:5:569:21 | print_i64_ref(...) | main.rs:570:5:570:17 | ExprStmt |  |
-| main.rs:569:5:569:22 | ExprStmt | main.rs:569:5:569:17 | print_i64_ref |  |
-| main.rs:569:19:569:20 | &x | main.rs:569:5:569:21 | print_i64_ref(...) |  |
-| main.rs:569:20:569:20 | x | main.rs:569:19:569:20 | &x |  |
-| main.rs:570:5:570:13 | print_i64 | main.rs:570:15:570:15 | x |  |
-| main.rs:570:5:570:16 | print_i64(...) | main.rs:572:5:572:15 | let ... = 17 |  |
-| main.rs:570:5:570:17 | ExprStmt | main.rs:570:5:570:13 | print_i64 |  |
-| main.rs:570:15:570:15 | x | main.rs:570:5:570:16 | print_i64(...) |  |
-| main.rs:572:5:572:15 | let ... = 17 | main.rs:572:13:572:14 | 17 |  |
-| main.rs:572:9:572:9 | z | main.rs:572:9:572:9 | z |  |
-| main.rs:572:9:572:9 | z | main.rs:573:5:573:22 | ExprStmt | match |
-| main.rs:572:13:572:14 | 17 | main.rs:572:9:572:9 | z |  |
-| main.rs:573:5:573:17 | print_i64_ref | main.rs:573:20:573:20 | z |  |
-| main.rs:573:5:573:21 | print_i64_ref(...) | main.rs:567:14:574:1 | { ... } |  |
-| main.rs:573:5:573:22 | ExprStmt | main.rs:573:5:573:17 | print_i64_ref |  |
-| main.rs:573:19:573:20 | &z | main.rs:573:5:573:21 | print_i64_ref(...) |  |
-| main.rs:573:20:573:20 | z | main.rs:573:19:573:20 | &z |  |
-| main.rs:581:5:583:5 | enter fn bar | main.rs:581:17:581:20 | self |  |
-| main.rs:581:5:583:5 | exit fn bar (normal) | main.rs:581:5:583:5 | exit fn bar |  |
-| main.rs:581:12:581:20 | SelfParam | main.rs:582:9:582:36 | ExprStmt |  |
-| main.rs:581:17:581:20 | self | main.rs:581:12:581:20 | SelfParam |  |
-| main.rs:581:23:583:5 | { ... } | main.rs:581:5:583:5 | exit fn bar (normal) |  |
-| main.rs:582:9:582:13 | * ... | main.rs:582:33:582:33 | 3 |  |
-| main.rs:582:9:582:35 | ... = ... | main.rs:581:23:583:5 | { ... } |  |
-| main.rs:582:9:582:36 | ExprStmt | main.rs:582:10:582:13 | self |  |
-| main.rs:582:10:582:13 | self | main.rs:582:9:582:13 | * ... |  |
-| main.rs:582:17:582:35 | MyStruct {...} | main.rs:582:9:582:35 | ... = ... |  |
-| main.rs:582:33:582:33 | 3 | main.rs:582:17:582:35 | MyStruct {...} |  |
-| main.rs:586:1:591:1 | enter fn ref_methodcall_receiver | main.rs:587:5:587:36 | let ... = ... |  |
-| main.rs:586:1:591:1 | exit fn ref_methodcall_receiver (normal) | main.rs:586:1:591:1 | exit fn ref_methodcall_receiver |  |
-| main.rs:586:30:591:1 | { ... } | main.rs:586:1:591:1 | exit fn ref_methodcall_receiver (normal) |  |
-| main.rs:587:5:587:36 | let ... = ... | main.rs:587:33:587:33 | 1 |  |
-| main.rs:587:9:587:13 | mut a | main.rs:588:5:588:12 | ExprStmt | match |
-| main.rs:587:13:587:13 | a | main.rs:587:9:587:13 | mut a |  |
-| main.rs:587:17:587:35 | MyStruct {...} | main.rs:587:13:587:13 | a |  |
-| main.rs:587:33:587:33 | 1 | main.rs:587:17:587:35 | MyStruct {...} |  |
-| main.rs:588:5:588:5 | a | main.rs:588:5:588:11 | a.bar() |  |
-| main.rs:588:5:588:11 | a.bar() | main.rs:590:5:590:21 | ExprStmt |  |
-| main.rs:588:5:588:12 | ExprStmt | main.rs:588:5:588:5 | a |  |
-| main.rs:590:5:590:13 | print_i64 | main.rs:590:15:590:15 | a |  |
-| main.rs:590:5:590:20 | print_i64(...) | main.rs:586:30:591:1 | { ... } |  |
-| main.rs:590:5:590:21 | ExprStmt | main.rs:590:5:590:13 | print_i64 |  |
-| main.rs:590:15:590:15 | a | main.rs:590:15:590:19 | a.val |  |
-| main.rs:590:15:590:19 | a.val | main.rs:590:5:590:20 | print_i64(...) |  |
-| main.rs:607:1:617:1 | enter fn macro_invocation | main.rs:608:5:609:26 | let ... = ... |  |
-| main.rs:607:1:617:1 | exit fn macro_invocation (normal) | main.rs:607:1:617:1 | exit fn macro_invocation |  |
-| main.rs:607:23:617:1 | { ... } | main.rs:607:1:617:1 | exit fn macro_invocation (normal) |  |
-| main.rs:608:5:609:26 | let ... = ... | main.rs:609:23:609:24 | let ... = 37 |  |
-| main.rs:608:9:608:22 | var_from_macro | main.rs:608:9:608:22 | var_from_macro |  |
-| main.rs:608:9:608:22 | var_from_macro | main.rs:610:5:610:30 | ExprStmt | match |
-| main.rs:609:9:609:25 | MacroExpr | main.rs:608:9:608:22 | var_from_macro |  |
-| main.rs:609:9:609:25 | let_in_macro!... | main.rs:609:9:609:25 | MacroExpr |  |
-| main.rs:609:9:609:25 | var_in_macro | main.rs:609:9:609:25 | var_in_macro |  |
-| main.rs:609:9:609:25 | var_in_macro | main.rs:609:9:609:25 | var_in_macro | match |
-| main.rs:609:9:609:25 | var_in_macro | main.rs:609:23:609:24 | { ... } |  |
-| main.rs:609:23:609:24 | 37 | main.rs:609:9:609:25 | var_in_macro |  |
-| main.rs:609:23:609:24 | let ... = 37 | main.rs:609:23:609:24 | 37 |  |
-| main.rs:609:23:609:24 | { ... } | main.rs:609:9:609:25 | let_in_macro!... |  |
-| main.rs:610:5:610:13 | print_i64 | main.rs:610:15:610:28 | var_from_macro |  |
-| main.rs:610:5:610:29 | print_i64(...) | main.rs:611:5:611:26 | let ... = 33 |  |
-| main.rs:610:5:610:30 | ExprStmt | main.rs:610:5:610:13 | print_i64 |  |
-| main.rs:610:15:610:28 | var_from_macro | main.rs:610:5:610:29 | print_i64(...) |  |
-| main.rs:611:5:611:26 | let ... = 33 | main.rs:611:24:611:25 | 33 |  |
-| main.rs:611:9:611:20 | var_in_macro | main.rs:611:9:611:20 | var_in_macro |  |
-| main.rs:611:9:611:20 | var_in_macro | main.rs:615:5:615:44 | ExprStmt | match |
-| main.rs:611:24:611:25 | 33 | main.rs:611:9:611:20 | var_in_macro |  |
-| main.rs:615:5:615:13 | print_i64 | main.rs:615:15:615:42 | let ... = 0 |  |
-| main.rs:615:5:615:43 | print_i64(...) | main.rs:616:5:616:28 | ExprStmt |  |
-| main.rs:615:5:615:44 | ExprStmt | main.rs:615:5:615:13 | print_i64 |  |
-| main.rs:615:15:615:42 | 0 | main.rs:615:15:615:42 | var_in_macro |  |
-| main.rs:615:15:615:42 | MacroExpr | main.rs:615:5:615:43 | print_i64(...) |  |
-| main.rs:615:15:615:42 | let ... = 0 | main.rs:615:15:615:42 | 0 |  |
-| main.rs:615:15:615:42 | let_in_macro2!... | main.rs:615:15:615:42 | MacroExpr |  |
-| main.rs:615:15:615:42 | var_in_macro | main.rs:615:15:615:42 | var_in_macro |  |
-| main.rs:615:15:615:42 | var_in_macro | main.rs:615:30:615:41 | var_in_macro | match |
-| main.rs:615:30:615:41 | var_in_macro | main.rs:615:30:615:41 | { ... } |  |
-| main.rs:615:30:615:41 | { ... } | main.rs:615:15:615:42 | let_in_macro2!... |  |
-| main.rs:616:5:616:13 | print_i64 | main.rs:616:15:616:26 | var_in_macro |  |
-| main.rs:616:5:616:27 | print_i64(...) | main.rs:607:23:617:1 | { ... } |  |
-| main.rs:616:5:616:28 | ExprStmt | main.rs:616:5:616:13 | print_i64 |  |
-| main.rs:616:15:616:26 | var_in_macro | main.rs:616:5:616:27 | print_i64(...) |  |
-| main.rs:619:1:623:1 | enter fn let_without_initializer | main.rs:620:5:620:10 | let ... |  |
-| main.rs:619:1:623:1 | exit fn let_without_initializer (normal) | main.rs:619:1:623:1 | exit fn let_without_initializer |  |
-| main.rs:619:30:623:1 | { ... } | main.rs:619:1:623:1 | exit fn let_without_initializer (normal) |  |
-| main.rs:620:5:620:10 | let ... | main.rs:620:9:620:9 | x |  |
-| main.rs:620:9:620:9 | x | main.rs:620:9:620:9 | x |  |
-| main.rs:620:9:620:9 | x | main.rs:621:5:621:10 | ExprStmt | match |
-| main.rs:621:5:621:5 | x | main.rs:621:9:621:9 | 1 |  |
-| main.rs:621:5:621:9 | ... = ... | main.rs:622:5:622:17 | ExprStmt |  |
-| main.rs:621:5:621:10 | ExprStmt | main.rs:621:5:621:5 | x |  |
-| main.rs:621:9:621:9 | 1 | main.rs:621:5:621:9 | ... = ... |  |
-| main.rs:622:5:622:13 | print_i64 | main.rs:622:15:622:15 | x |  |
-| main.rs:622:5:622:16 | print_i64(...) | main.rs:619:30:623:1 | { ... } |  |
-| main.rs:622:5:622:17 | ExprStmt | main.rs:622:5:622:13 | print_i64 |  |
-| main.rs:622:15:622:15 | x | main.rs:622:5:622:16 | print_i64(...) |  |
-| main.rs:625:1:635:1 | enter fn capture_phi | main.rs:626:5:626:20 | let ... = 100 |  |
-| main.rs:625:1:635:1 | exit fn capture_phi (normal) | main.rs:625:1:635:1 | exit fn capture_phi |  |
-| main.rs:625:18:635:1 | { ... } | main.rs:625:1:635:1 | exit fn capture_phi (normal) |  |
-| main.rs:626:5:626:20 | let ... = 100 | main.rs:626:17:626:19 | 100 |  |
-| main.rs:626:9:626:13 | mut x | main.rs:627:5:632:6 | let ... = ... | match |
-| main.rs:626:13:626:13 | x | main.rs:626:9:626:13 | mut x |  |
-| main.rs:626:17:626:19 | 100 | main.rs:626:13:626:13 | x |  |
-| main.rs:627:5:632:6 | let ... = ... | main.rs:627:19:632:5 | \|...\| ... |  |
-| main.rs:627:9:627:15 | mut cap | main.rs:633:5:633:14 | ExprStmt | match |
-| main.rs:627:13:627:15 | cap | main.rs:627:9:627:15 | mut cap |  |
-| main.rs:627:19:632:5 | \|...\| ... | main.rs:627:13:627:15 | cap |  |
-| main.rs:627:19:632:5 | enter \|...\| ... | main.rs:627:20:627:20 | b |  |
-| main.rs:627:19:632:5 | exit \|...\| ... (normal) | main.rs:627:19:632:5 | exit \|...\| ... |  |
-| main.rs:627:20:627:20 | b | main.rs:627:20:627:20 | b |  |
-| main.rs:627:20:627:20 | b | main.rs:627:20:627:26 | ...: bool | match |
-| main.rs:627:20:627:26 | ...: bool | main.rs:628:9:631:10 | let _ = ... |  |
-| main.rs:627:29:632:5 | { ... } | main.rs:627:19:632:5 | exit \|...\| ... (normal) |  |
-| main.rs:628:9:631:10 | let _ = ... | main.rs:629:20:629:20 | b |  |
-| main.rs:629:13:629:13 | _ | main.rs:627:29:632:5 | { ... } | match |
-| main.rs:629:17:631:9 | if b {...} | main.rs:629:13:629:13 | _ |  |
-| main.rs:629:20:629:20 | b | main.rs:629:17:631:9 | if b {...} | false |
-| main.rs:629:20:629:20 | b | main.rs:630:13:630:20 | ExprStmt | true |
-| main.rs:629:22:631:9 | { ... } | main.rs:629:17:631:9 | if b {...} |  |
-| main.rs:630:13:630:13 | x | main.rs:630:17:630:19 | 200 |  |
-| main.rs:630:13:630:19 | ... = ... | main.rs:629:22:631:9 | { ... } |  |
-| main.rs:630:13:630:20 | ExprStmt | main.rs:630:13:630:13 | x |  |
-| main.rs:630:17:630:19 | 200 | main.rs:630:13:630:19 | ... = ... |  |
-| main.rs:633:5:633:7 | cap | main.rs:633:9:633:12 | true |  |
-| main.rs:633:5:633:13 | cap(...) | main.rs:634:5:634:17 | ExprStmt |  |
-| main.rs:633:5:633:14 | ExprStmt | main.rs:633:5:633:7 | cap |  |
-| main.rs:633:9:633:12 | true | main.rs:633:5:633:13 | cap(...) |  |
-| main.rs:634:5:634:13 | print_i64 | main.rs:634:15:634:15 | x |  |
-| main.rs:634:5:634:16 | print_i64(...) | main.rs:625:18:635:1 | { ... } |  |
-| main.rs:634:5:634:17 | ExprStmt | main.rs:634:5:634:13 | print_i64 |  |
-| main.rs:634:15:634:15 | x | main.rs:634:5:634:16 | print_i64(...) |  |
-| main.rs:637:1:674:1 | enter fn main | main.rs:638:5:638:25 | ExprStmt |  |
-| main.rs:637:1:674:1 | exit fn main (normal) | main.rs:637:1:674:1 | exit fn main |  |
-| main.rs:637:11:674:1 | { ... } | main.rs:637:1:674:1 | exit fn main (normal) |  |
-| main.rs:638:5:638:22 | immutable_variable | main.rs:638:5:638:24 | immutable_variable(...) |  |
-| main.rs:638:5:638:24 | immutable_variable(...) | main.rs:639:5:639:23 | ExprStmt |  |
-| main.rs:638:5:638:25 | ExprStmt | main.rs:638:5:638:22 | immutable_variable |  |
-| main.rs:639:5:639:20 | mutable_variable | main.rs:639:5:639:22 | mutable_variable(...) |  |
-| main.rs:639:5:639:22 | mutable_variable(...) | main.rs:640:5:640:40 | ExprStmt |  |
-| main.rs:639:5:639:23 | ExprStmt | main.rs:639:5:639:20 | mutable_variable |  |
-| main.rs:640:5:640:37 | mutable_variable_immutable_borrow | main.rs:640:5:640:39 | mutable_variable_immutable_borrow(...) |  |
-| main.rs:640:5:640:39 | mutable_variable_immutable_borrow(...) | main.rs:641:5:641:23 | ExprStmt |  |
-| main.rs:640:5:640:40 | ExprStmt | main.rs:640:5:640:37 | mutable_variable_immutable_borrow |  |
-| main.rs:641:5:641:20 | variable_shadow1 | main.rs:641:5:641:22 | variable_shadow1(...) |  |
-| main.rs:641:5:641:22 | variable_shadow1(...) | main.rs:642:5:642:23 | ExprStmt |  |
-| main.rs:641:5:641:23 | ExprStmt | main.rs:641:5:641:20 | variable_shadow1 |  |
-| main.rs:642:5:642:20 | variable_shadow2 | main.rs:642:5:642:22 | variable_shadow2(...) |  |
-| main.rs:642:5:642:22 | variable_shadow2(...) | main.rs:643:5:643:19 | ExprStmt |  |
-| main.rs:642:5:642:23 | ExprStmt | main.rs:642:5:642:20 | variable_shadow2 |  |
-| main.rs:643:5:643:16 | let_pattern1 | main.rs:643:5:643:18 | let_pattern1(...) |  |
-| main.rs:643:5:643:18 | let_pattern1(...) | main.rs:644:5:644:19 | ExprStmt |  |
-| main.rs:643:5:643:19 | ExprStmt | main.rs:643:5:643:16 | let_pattern1 |  |
-| main.rs:644:5:644:16 | let_pattern2 | main.rs:644:5:644:18 | let_pattern2(...) |  |
-| main.rs:644:5:644:18 | let_pattern2(...) | main.rs:645:5:645:19 | ExprStmt |  |
-| main.rs:644:5:644:19 | ExprStmt | main.rs:644:5:644:16 | let_pattern2 |  |
-| main.rs:645:5:645:16 | let_pattern3 | main.rs:645:5:645:18 | let_pattern3(...) |  |
-| main.rs:645:5:645:18 | let_pattern3(...) | main.rs:646:5:646:19 | ExprStmt |  |
-| main.rs:645:5:645:19 | ExprStmt | main.rs:645:5:645:16 | let_pattern3 |  |
-| main.rs:646:5:646:16 | let_pattern4 | main.rs:646:5:646:18 | let_pattern4(...) |  |
-| main.rs:646:5:646:18 | let_pattern4(...) | main.rs:647:5:647:21 | ExprStmt |  |
-| main.rs:646:5:646:19 | ExprStmt | main.rs:646:5:646:16 | let_pattern4 |  |
-| main.rs:647:5:647:18 | match_pattern1 | main.rs:647:5:647:20 | match_pattern1(...) |  |
-| main.rs:647:5:647:20 | match_pattern1(...) | main.rs:648:5:648:21 | ExprStmt |  |
-| main.rs:647:5:647:21 | ExprStmt | main.rs:647:5:647:18 | match_pattern1 |  |
-| main.rs:648:5:648:18 | match_pattern2 | main.rs:648:5:648:20 | match_pattern2(...) |  |
-| main.rs:648:5:648:20 | match_pattern2(...) | main.rs:649:5:649:21 | ExprStmt |  |
-| main.rs:648:5:648:21 | ExprStmt | main.rs:648:5:648:18 | match_pattern2 |  |
-| main.rs:649:5:649:18 | match_pattern3 | main.rs:649:5:649:20 | match_pattern3(...) |  |
-| main.rs:649:5:649:20 | match_pattern3(...) | main.rs:650:5:650:21 | ExprStmt |  |
-| main.rs:649:5:649:21 | ExprStmt | main.rs:649:5:649:18 | match_pattern3 |  |
-| main.rs:650:5:650:18 | match_pattern4 | main.rs:650:5:650:20 | match_pattern4(...) |  |
-| main.rs:650:5:650:20 | match_pattern4(...) | main.rs:651:5:651:21 | ExprStmt |  |
-| main.rs:650:5:650:21 | ExprStmt | main.rs:650:5:650:18 | match_pattern4 |  |
-| main.rs:651:5:651:18 | match_pattern5 | main.rs:651:5:651:20 | match_pattern5(...) |  |
-| main.rs:651:5:651:20 | match_pattern5(...) | main.rs:652:5:652:21 | ExprStmt |  |
-| main.rs:651:5:651:21 | ExprStmt | main.rs:651:5:651:18 | match_pattern5 |  |
-| main.rs:652:5:652:18 | match_pattern6 | main.rs:652:5:652:20 | match_pattern6(...) |  |
-| main.rs:652:5:652:20 | match_pattern6(...) | main.rs:653:5:653:21 | ExprStmt |  |
-| main.rs:652:5:652:21 | ExprStmt | main.rs:652:5:652:18 | match_pattern6 |  |
-| main.rs:653:5:653:18 | match_pattern7 | main.rs:653:5:653:20 | match_pattern7(...) |  |
-| main.rs:653:5:653:20 | match_pattern7(...) | main.rs:654:5:654:21 | ExprStmt |  |
-| main.rs:653:5:653:21 | ExprStmt | main.rs:653:5:653:18 | match_pattern7 |  |
-| main.rs:654:5:654:18 | match_pattern8 | main.rs:654:5:654:20 | match_pattern8(...) |  |
-| main.rs:654:5:654:20 | match_pattern8(...) | main.rs:655:5:655:21 | ExprStmt |  |
-| main.rs:654:5:654:21 | ExprStmt | main.rs:654:5:654:18 | match_pattern8 |  |
-| main.rs:655:5:655:18 | match_pattern9 | main.rs:655:5:655:20 | match_pattern9(...) |  |
-| main.rs:655:5:655:20 | match_pattern9(...) | main.rs:656:5:656:36 | ExprStmt |  |
-| main.rs:655:5:655:21 | ExprStmt | main.rs:655:5:655:18 | match_pattern9 |  |
-| main.rs:656:5:656:18 | param_pattern1 | main.rs:656:20:656:22 | "a" |  |
-| main.rs:656:5:656:35 | param_pattern1(...) | main.rs:657:5:657:37 | ExprStmt |  |
-| main.rs:656:5:656:36 | ExprStmt | main.rs:656:5:656:18 | param_pattern1 |  |
-| main.rs:656:20:656:22 | "a" | main.rs:656:26:656:28 | "b" |  |
-| main.rs:656:25:656:34 | TupleExpr | main.rs:656:5:656:35 | param_pattern1(...) |  |
-| main.rs:656:26:656:28 | "b" | main.rs:656:31:656:33 | "c" |  |
-| main.rs:656:31:656:33 | "c" | main.rs:656:25:656:34 | TupleExpr |  |
-| main.rs:657:5:657:18 | param_pattern2 | main.rs:657:20:657:31 | ...::Left |  |
-| main.rs:657:5:657:36 | param_pattern2(...) | main.rs:658:5:658:26 | ExprStmt |  |
-| main.rs:657:5:657:37 | ExprStmt | main.rs:657:5:657:18 | param_pattern2 |  |
-| main.rs:657:20:657:31 | ...::Left | main.rs:657:33:657:34 | 45 |  |
-| main.rs:657:20:657:35 | ...::Left(...) | main.rs:657:5:657:36 | param_pattern2(...) |  |
-| main.rs:657:33:657:34 | 45 | main.rs:657:20:657:35 | ...::Left(...) |  |
-| main.rs:658:5:658:23 | destruct_assignment | main.rs:658:5:658:25 | destruct_assignment(...) |  |
-| main.rs:658:5:658:25 | destruct_assignment(...) | main.rs:659:5:659:23 | ExprStmt |  |
-| main.rs:658:5:658:26 | ExprStmt | main.rs:658:5:658:23 | destruct_assignment |  |
-| main.rs:659:5:659:20 | closure_variable | main.rs:659:5:659:22 | closure_variable(...) |  |
-| main.rs:659:5:659:22 | closure_variable(...) | main.rs:660:5:660:22 | ExprStmt |  |
-| main.rs:659:5:659:23 | ExprStmt | main.rs:659:5:659:20 | closure_variable |  |
-| main.rs:660:5:660:19 | nested_function | main.rs:660:5:660:21 | nested_function(...) |  |
-| main.rs:660:5:660:21 | nested_function(...) | main.rs:661:5:661:19 | ExprStmt |  |
-| main.rs:660:5:660:22 | ExprStmt | main.rs:660:5:660:19 | nested_function |  |
-| main.rs:661:5:661:16 | for_variable | main.rs:661:5:661:18 | for_variable(...) |  |
-| main.rs:661:5:661:18 | for_variable(...) | main.rs:662:5:662:17 | ExprStmt |  |
-| main.rs:661:5:661:19 | ExprStmt | main.rs:661:5:661:16 | for_variable |  |
-| main.rs:662:5:662:14 | add_assign | main.rs:662:5:662:16 | add_assign(...) |  |
-| main.rs:662:5:662:16 | add_assign(...) | main.rs:663:5:663:13 | ExprStmt |  |
-| main.rs:662:5:662:17 | ExprStmt | main.rs:662:5:662:14 | add_assign |  |
-| main.rs:663:5:663:10 | mutate | main.rs:663:5:663:12 | mutate(...) |  |
-| main.rs:663:5:663:12 | mutate(...) | main.rs:664:5:664:17 | ExprStmt |  |
-| main.rs:663:5:663:13 | ExprStmt | main.rs:663:5:663:10 | mutate |  |
-| main.rs:664:5:664:14 | mutate_arg | main.rs:664:5:664:16 | mutate_arg(...) |  |
-| main.rs:664:5:664:16 | mutate_arg(...) | main.rs:665:5:665:12 | ExprStmt |  |
-| main.rs:664:5:664:17 | ExprStmt | main.rs:664:5:664:14 | mutate_arg |  |
-| main.rs:665:5:665:9 | alias | main.rs:665:5:665:11 | alias(...) |  |
-| main.rs:665:5:665:11 | alias(...) | main.rs:666:5:666:18 | ExprStmt |  |
-| main.rs:665:5:665:12 | ExprStmt | main.rs:665:5:665:9 | alias |  |
-| main.rs:666:5:666:15 | capture_mut | main.rs:666:5:666:17 | capture_mut(...) |  |
-| main.rs:666:5:666:17 | capture_mut(...) | main.rs:667:5:667:20 | ExprStmt |  |
-| main.rs:666:5:666:18 | ExprStmt | main.rs:666:5:666:15 | capture_mut |  |
-| main.rs:667:5:667:17 | capture_immut | main.rs:667:5:667:19 | capture_immut(...) |  |
-| main.rs:667:5:667:19 | capture_immut(...) | main.rs:668:5:668:26 | ExprStmt |  |
-| main.rs:667:5:667:20 | ExprStmt | main.rs:667:5:667:17 | capture_immut |  |
-| main.rs:668:5:668:23 | async_block_capture | main.rs:668:5:668:25 | async_block_capture(...) |  |
-| main.rs:668:5:668:25 | async_block_capture(...) | main.rs:669:5:669:14 | ExprStmt |  |
-| main.rs:668:5:668:26 | ExprStmt | main.rs:668:5:668:23 | async_block_capture |  |
-| main.rs:669:5:669:11 | structs | main.rs:669:5:669:13 | structs(...) |  |
-| main.rs:669:5:669:13 | structs(...) | main.rs:670:5:670:14 | ExprStmt |  |
-| main.rs:669:5:669:14 | ExprStmt | main.rs:669:5:669:11 | structs |  |
-| main.rs:670:5:670:11 | ref_arg | main.rs:670:5:670:13 | ref_arg(...) |  |
-| main.rs:670:5:670:13 | ref_arg(...) | main.rs:671:5:671:30 | ExprStmt |  |
-| main.rs:670:5:670:14 | ExprStmt | main.rs:670:5:670:11 | ref_arg |  |
-| main.rs:671:5:671:27 | ref_methodcall_receiver | main.rs:671:5:671:29 | ref_methodcall_receiver(...) |  |
-| main.rs:671:5:671:29 | ref_methodcall_receiver(...) | main.rs:672:5:672:23 | ExprStmt |  |
-| main.rs:671:5:671:30 | ExprStmt | main.rs:671:5:671:27 | ref_methodcall_receiver |  |
-| main.rs:672:5:672:20 | macro_invocation | main.rs:672:5:672:22 | macro_invocation(...) |  |
-| main.rs:672:5:672:22 | macro_invocation(...) | main.rs:673:5:673:18 | ExprStmt |  |
-| main.rs:672:5:672:23 | ExprStmt | main.rs:672:5:672:20 | macro_invocation |  |
-| main.rs:673:5:673:15 | capture_phi | main.rs:673:5:673:17 | capture_phi(...) |  |
-| main.rs:673:5:673:17 | capture_phi(...) | main.rs:637:11:674:1 | { ... } |  |
-| main.rs:673:5:673:18 | ExprStmt | main.rs:673:5:673:15 | capture_phi |  |
+| main.rs:27:5:27:6 | x2 | main.rs:27:10:27:10 | 5 |  |
+| main.rs:27:5:27:10 | ... = ... | main.rs:28:5:28:18 | ExprStmt |  |
+| main.rs:27:5:27:11 | ExprStmt | main.rs:27:5:27:6 | x2 |  |
+| main.rs:27:10:27:10 | 5 | main.rs:27:5:27:10 | ... = ... |  |
+| main.rs:28:5:28:13 | print_i64 | main.rs:28:15:28:16 | x2 |  |
+| main.rs:28:5:28:17 | print_i64(...) | main.rs:29:5:29:12 | ExprStmt |  |
+| main.rs:28:5:28:18 | ExprStmt | main.rs:28:5:28:13 | print_i64 |  |
+| main.rs:28:15:28:16 | x2 | main.rs:28:5:28:17 | print_i64(...) |  |
+| main.rs:29:5:29:6 | x2 | main.rs:29:10:29:11 | x2 |  |
+| main.rs:29:5:29:11 | ... = ... | main.rs:30:5:30:18 | ExprStmt |  |
+| main.rs:29:5:29:12 | ExprStmt | main.rs:29:5:29:6 | x2 |  |
+| main.rs:29:10:29:11 | x2 | main.rs:29:5:29:11 | ... = ... |  |
+| main.rs:30:5:30:13 | print_i64 | main.rs:30:15:30:16 | x2 |  |
+| main.rs:30:5:30:17 | print_i64(...) | main.rs:24:23:31:1 | { ... } |  |
+| main.rs:30:5:30:18 | ExprStmt | main.rs:30:5:30:13 | print_i64 |  |
+| main.rs:30:15:30:16 | x2 | main.rs:30:5:30:17 | print_i64(...) |  |
+| main.rs:33:1:38:1 | enter fn mutable_variable_immutable_borrow | main.rs:34:5:34:18 | let ... = 1 |  |
+| main.rs:33:1:38:1 | exit fn mutable_variable_immutable_borrow (normal) | main.rs:33:1:38:1 | exit fn mutable_variable_immutable_borrow |  |
+| main.rs:33:40:38:1 | { ... } | main.rs:33:1:38:1 | exit fn mutable_variable_immutable_borrow (normal) |  |
+| main.rs:34:5:34:18 | let ... = 1 | main.rs:34:17:34:17 | 1 |  |
+| main.rs:34:9:34:13 | mut x | main.rs:35:5:35:22 | ExprStmt | match |
+| main.rs:34:13:34:13 | x | main.rs:34:9:34:13 | mut x |  |
+| main.rs:34:17:34:17 | 1 | main.rs:34:13:34:13 | x |  |
+| main.rs:35:5:35:17 | print_i64_ref | main.rs:35:20:35:20 | x |  |
+| main.rs:35:5:35:21 | print_i64_ref(...) | main.rs:36:5:36:10 | ExprStmt |  |
+| main.rs:35:5:35:22 | ExprStmt | main.rs:35:5:35:17 | print_i64_ref |  |
+| main.rs:35:19:35:20 | &x | main.rs:35:5:35:21 | print_i64_ref(...) |  |
+| main.rs:35:20:35:20 | x | main.rs:35:19:35:20 | &x |  |
+| main.rs:36:5:36:5 | x | main.rs:36:9:36:9 | 2 |  |
+| main.rs:36:5:36:9 | ... = ... | main.rs:37:5:37:22 | ExprStmt |  |
+| main.rs:36:5:36:10 | ExprStmt | main.rs:36:5:36:5 | x |  |
+| main.rs:36:9:36:9 | 2 | main.rs:36:5:36:9 | ... = ... |  |
+| main.rs:37:5:37:17 | print_i64_ref | main.rs:37:20:37:20 | x |  |
+| main.rs:37:5:37:21 | print_i64_ref(...) | main.rs:33:40:38:1 | { ... } |  |
+| main.rs:37:5:37:22 | ExprStmt | main.rs:37:5:37:17 | print_i64_ref |  |
+| main.rs:37:19:37:20 | &x | main.rs:37:5:37:21 | print_i64_ref(...) |  |
+| main.rs:37:20:37:20 | x | main.rs:37:19:37:20 | &x |  |
+| main.rs:40:1:46:1 | enter fn variable_shadow1 | main.rs:41:5:41:15 | let ... = 1 |  |
+| main.rs:40:1:46:1 | exit fn variable_shadow1 (normal) | main.rs:40:1:46:1 | exit fn variable_shadow1 |  |
+| main.rs:40:23:46:1 | { ... } | main.rs:40:1:46:1 | exit fn variable_shadow1 (normal) |  |
+| main.rs:41:5:41:15 | let ... = 1 | main.rs:41:14:41:14 | 1 |  |
+| main.rs:41:9:41:10 | x3 | main.rs:41:9:41:10 | x3 |  |
+| main.rs:41:9:41:10 | x3 | main.rs:42:5:42:18 | ExprStmt | match |
+| main.rs:41:14:41:14 | 1 | main.rs:41:9:41:10 | x3 |  |
+| main.rs:42:5:42:13 | print_i64 | main.rs:42:15:42:16 | x3 |  |
+| main.rs:42:5:42:17 | print_i64(...) | main.rs:43:5:44:15 | let ... = ... |  |
+| main.rs:42:5:42:18 | ExprStmt | main.rs:42:5:42:13 | print_i64 |  |
+| main.rs:42:15:42:16 | x3 | main.rs:42:5:42:17 | print_i64(...) |  |
+| main.rs:43:5:44:15 | let ... = ... | main.rs:44:9:44:10 | x3 |  |
+| main.rs:43:9:43:10 | x3 | main.rs:43:9:43:10 | x3 |  |
+| main.rs:43:9:43:10 | x3 | main.rs:45:5:45:18 | ExprStmt | match |
+| main.rs:44:9:44:10 | x3 | main.rs:44:14:44:14 | 1 |  |
+| main.rs:44:9:44:14 | ... + ... | main.rs:43:9:43:10 | x3 |  |
+| main.rs:44:14:44:14 | 1 | main.rs:44:9:44:14 | ... + ... |  |
+| main.rs:45:5:45:13 | print_i64 | main.rs:45:15:45:16 | x3 |  |
+| main.rs:45:5:45:17 | print_i64(...) | main.rs:40:23:46:1 | { ... } |  |
+| main.rs:45:5:45:18 | ExprStmt | main.rs:45:5:45:13 | print_i64 |  |
+| main.rs:45:15:45:16 | x3 | main.rs:45:5:45:17 | print_i64(...) |  |
+| main.rs:48:1:56:1 | enter fn variable_shadow2 | main.rs:49:5:49:17 | let ... = "a" |  |
+| main.rs:48:1:56:1 | exit fn variable_shadow2 (normal) | main.rs:48:1:56:1 | exit fn variable_shadow2 |  |
+| main.rs:48:23:56:1 | { ... } | main.rs:48:1:56:1 | exit fn variable_shadow2 (normal) |  |
+| main.rs:49:5:49:17 | let ... = "a" | main.rs:49:14:49:16 | "a" |  |
+| main.rs:49:9:49:10 | x4 | main.rs:49:9:49:10 | x4 |  |
+| main.rs:49:9:49:10 | x4 | main.rs:50:5:50:18 | ExprStmt | match |
+| main.rs:49:14:49:16 | "a" | main.rs:49:9:49:10 | x4 |  |
+| main.rs:50:5:50:13 | print_str | main.rs:50:15:50:16 | x4 |  |
+| main.rs:50:5:50:17 | print_str(...) | main.rs:51:5:54:5 | ExprStmt |  |
+| main.rs:50:5:50:18 | ExprStmt | main.rs:50:5:50:13 | print_str |  |
+| main.rs:50:15:50:16 | x4 | main.rs:50:5:50:17 | print_str(...) |  |
+| main.rs:51:5:54:5 | ExprStmt | main.rs:52:9:52:21 | let ... = "b" |  |
+| main.rs:51:5:54:5 | { ... } | main.rs:55:5:55:18 | ExprStmt |  |
+| main.rs:52:9:52:21 | let ... = "b" | main.rs:52:18:52:20 | "b" |  |
+| main.rs:52:13:52:14 | x4 | main.rs:52:13:52:14 | x4 |  |
+| main.rs:52:13:52:14 | x4 | main.rs:53:9:53:22 | ExprStmt | match |
+| main.rs:52:18:52:20 | "b" | main.rs:52:13:52:14 | x4 |  |
+| main.rs:53:9:53:17 | print_str | main.rs:53:19:53:20 | x4 |  |
+| main.rs:53:9:53:21 | print_str(...) | main.rs:51:5:54:5 | { ... } |  |
+| main.rs:53:9:53:22 | ExprStmt | main.rs:53:9:53:17 | print_str |  |
+| main.rs:53:19:53:20 | x4 | main.rs:53:9:53:21 | print_str(...) |  |
+| main.rs:55:5:55:13 | print_str | main.rs:55:15:55:16 | x4 |  |
+| main.rs:55:5:55:17 | print_str(...) | main.rs:48:23:56:1 | { ... } |  |
+| main.rs:55:5:55:18 | ExprStmt | main.rs:55:5:55:13 | print_str |  |
+| main.rs:55:15:55:16 | x4 | main.rs:55:5:55:17 | print_str(...) |  |
+| main.rs:63:1:78:1 | enter fn let_pattern1 | main.rs:64:5:73:47 | let ... = ... |  |
+| main.rs:63:1:78:1 | exit fn let_pattern1 (normal) | main.rs:63:1:78:1 | exit fn let_pattern1 |  |
+| main.rs:63:19:78:1 | { ... } | main.rs:63:1:78:1 | exit fn let_pattern1 (normal) |  |
+| main.rs:64:5:73:47 | let ... = ... | main.rs:73:11:73:13 | "a" |  |
+| main.rs:64:9:73:5 | TuplePat | main.rs:65:9:68:9 | TuplePat | match |
+| main.rs:65:9:68:9 | TuplePat | main.rs:66:13:66:14 | a1 | match |
+| main.rs:66:13:66:14 | a1 | main.rs:66:13:66:14 | a1 |  |
+| main.rs:66:13:66:14 | a1 | main.rs:67:13:67:14 | b1 | match |
+| main.rs:67:13:67:14 | b1 | main.rs:67:13:67:14 | b1 |  |
+| main.rs:67:13:67:14 | b1 | main.rs:69:9:72:9 | Point {...} | match |
+| main.rs:69:9:72:9 | Point {...} | main.rs:70:13:70:13 | x | match |
+| main.rs:70:13:70:13 | x | main.rs:70:13:70:13 | x |  |
+| main.rs:70:13:70:13 | x | main.rs:71:13:71:13 | y | match |
+| main.rs:71:13:71:13 | y | main.rs:71:13:71:13 | y |  |
+| main.rs:71:13:71:13 | y | main.rs:74:5:74:18 | ExprStmt | match |
+| main.rs:73:9:73:46 | TupleExpr | main.rs:64:9:73:5 | TuplePat |  |
+| main.rs:73:10:73:19 | TupleExpr | main.rs:73:33:73:35 | "x" |  |
+| main.rs:73:11:73:13 | "a" | main.rs:73:16:73:18 | "b" |  |
+| main.rs:73:16:73:18 | "b" | main.rs:73:10:73:19 | TupleExpr |  |
+| main.rs:73:22:73:45 | Point {...} | main.rs:73:9:73:46 | TupleExpr |  |
+| main.rs:73:33:73:35 | "x" | main.rs:73:41:73:43 | "y" |  |
+| main.rs:73:41:73:43 | "y" | main.rs:73:22:73:45 | Point {...} |  |
+| main.rs:74:5:74:13 | print_str | main.rs:74:15:74:16 | a1 |  |
+| main.rs:74:5:74:17 | print_str(...) | main.rs:75:5:75:18 | ExprStmt |  |
+| main.rs:74:5:74:18 | ExprStmt | main.rs:74:5:74:13 | print_str |  |
+| main.rs:74:15:74:16 | a1 | main.rs:74:5:74:17 | print_str(...) |  |
+| main.rs:75:5:75:13 | print_str | main.rs:75:15:75:16 | b1 |  |
+| main.rs:75:5:75:17 | print_str(...) | main.rs:76:5:76:17 | ExprStmt |  |
+| main.rs:75:5:75:18 | ExprStmt | main.rs:75:5:75:13 | print_str |  |
+| main.rs:75:15:75:16 | b1 | main.rs:75:5:75:17 | print_str(...) |  |
+| main.rs:76:5:76:13 | print_str | main.rs:76:15:76:15 | x |  |
+| main.rs:76:5:76:16 | print_str(...) | main.rs:77:5:77:17 | ExprStmt |  |
+| main.rs:76:5:76:17 | ExprStmt | main.rs:76:5:76:13 | print_str |  |
+| main.rs:76:15:76:15 | x | main.rs:76:5:76:16 | print_str(...) |  |
+| main.rs:77:5:77:13 | print_str | main.rs:77:15:77:15 | y |  |
+| main.rs:77:5:77:16 | print_str(...) | main.rs:63:19:78:1 | { ... } |  |
+| main.rs:77:5:77:17 | ExprStmt | main.rs:77:5:77:13 | print_str |  |
+| main.rs:77:15:77:15 | y | main.rs:77:5:77:16 | print_str(...) |  |
+| main.rs:80:1:88:1 | enter fn let_pattern2 | main.rs:81:5:81:38 | let ... = ... |  |
+| main.rs:80:1:88:1 | exit fn let_pattern2 (normal) | main.rs:80:1:88:1 | exit fn let_pattern2 |  |
+| main.rs:80:19:88:1 | { ... } | main.rs:80:1:88:1 | exit fn let_pattern2 (normal) |  |
+| main.rs:81:5:81:38 | let ... = ... | main.rs:81:25:81:27 | "a" |  |
+| main.rs:81:9:81:10 | p1 | main.rs:81:9:81:10 | p1 |  |
+| main.rs:81:9:81:10 | p1 | main.rs:82:5:85:11 | let ... = p1 | match |
+| main.rs:81:14:81:37 | Point {...} | main.rs:81:9:81:10 | p1 |  |
+| main.rs:81:25:81:27 | "a" | main.rs:81:33:81:35 | "b" |  |
+| main.rs:81:33:81:35 | "b" | main.rs:81:14:81:37 | Point {...} |  |
+| main.rs:82:5:85:11 | let ... = p1 | main.rs:85:9:85:10 | p1 |  |
+| main.rs:82:9:85:5 | Point {...} | main.rs:83:12:83:13 | a2 | match |
+| main.rs:83:12:83:13 | a2 | main.rs:83:12:83:13 | a2 |  |
+| main.rs:83:12:83:13 | a2 | main.rs:84:12:84:13 | b2 | match |
+| main.rs:84:12:84:13 | b2 | main.rs:84:12:84:13 | b2 |  |
+| main.rs:84:12:84:13 | b2 | main.rs:86:5:86:18 | ExprStmt | match |
+| main.rs:85:9:85:10 | p1 | main.rs:82:9:85:5 | Point {...} |  |
+| main.rs:86:5:86:13 | print_str | main.rs:86:15:86:16 | a2 |  |
+| main.rs:86:5:86:17 | print_str(...) | main.rs:87:5:87:18 | ExprStmt |  |
+| main.rs:86:5:86:18 | ExprStmt | main.rs:86:5:86:13 | print_str |  |
+| main.rs:86:15:86:16 | a2 | main.rs:86:5:86:17 | print_str(...) |  |
+| main.rs:87:5:87:13 | print_str | main.rs:87:15:87:16 | b2 |  |
+| main.rs:87:5:87:17 | print_str(...) | main.rs:80:19:88:1 | { ... } |  |
+| main.rs:87:5:87:18 | ExprStmt | main.rs:87:5:87:13 | print_str |  |
+| main.rs:87:15:87:16 | b2 | main.rs:87:5:87:17 | print_str(...) |  |
+| main.rs:90:1:97:1 | enter fn let_pattern3 | main.rs:91:5:91:42 | let ... = ... |  |
+| main.rs:90:1:97:1 | exit fn let_pattern3 (normal) | main.rs:90:1:97:1 | exit fn let_pattern3 |  |
+| main.rs:90:19:97:1 | { ... } | main.rs:90:1:97:1 | exit fn let_pattern3 (normal) |  |
+| main.rs:91:5:91:42 | let ... = ... | main.rs:91:14:91:17 | Some |  |
+| main.rs:91:9:91:10 | s1 | main.rs:91:9:91:10 | s1 |  |
+| main.rs:91:9:91:10 | s1 | main.rs:94:11:94:12 | s1 | match |
+| main.rs:91:14:91:17 | Some | main.rs:91:19:91:30 | ...::from |  |
+| main.rs:91:14:91:41 | Some(...) | main.rs:91:9:91:10 | s1 |  |
+| main.rs:91:19:91:30 | ...::from | main.rs:91:32:91:39 | "Hello!" |  |
+| main.rs:91:19:91:40 | ...::from(...) | main.rs:91:14:91:41 | Some(...) |  |
+| main.rs:91:32:91:39 | "Hello!" | main.rs:91:19:91:40 | ...::from(...) |  |
+| main.rs:93:5:96:5 | if ... {...} | main.rs:90:19:97:1 | { ... } |  |
+| main.rs:93:8:94:12 | [boolean(false)] let ... = s1 | main.rs:93:5:96:5 | if ... {...} | false |
+| main.rs:93:8:94:12 | [boolean(true)] let ... = s1 | main.rs:95:9:95:22 | ExprStmt | true |
+| main.rs:93:12:93:23 | Some(...) | main.rs:93:8:94:12 | [boolean(false)] let ... = s1 | no-match |
+| main.rs:93:12:93:23 | Some(...) | main.rs:93:21:93:22 | s2 | match |
+| main.rs:93:17:93:22 | ref s2 | main.rs:93:8:94:12 | [boolean(true)] let ... = s1 | match |
+| main.rs:93:21:93:22 | s2 | main.rs:93:17:93:22 | ref s2 |  |
+| main.rs:94:11:94:12 | s1 | main.rs:93:12:93:23 | Some(...) |  |
+| main.rs:94:14:96:5 | { ... } | main.rs:93:5:96:5 | if ... {...} |  |
+| main.rs:95:9:95:17 | print_str | main.rs:95:19:95:20 | s2 |  |
+| main.rs:95:9:95:21 | print_str(...) | main.rs:94:14:96:5 | { ... } |  |
+| main.rs:95:9:95:22 | ExprStmt | main.rs:95:9:95:17 | print_str |  |
+| main.rs:95:19:95:20 | s2 | main.rs:95:9:95:21 | print_str(...) |  |
+| main.rs:99:1:110:1 | enter fn let_pattern4 | main.rs:100:5:100:23 | let ... = ... |  |
+| main.rs:99:1:110:1 | exit fn let_pattern4 (normal) | main.rs:99:1:110:1 | exit fn let_pattern4 |  |
+| main.rs:99:19:110:1 | { ... } | main.rs:99:1:110:1 | exit fn let_pattern4 (normal) |  |
+| main.rs:100:5:100:23 | let ... = ... | main.rs:100:13:100:16 | Some |  |
+| main.rs:100:9:100:9 | x | main.rs:100:9:100:9 | x |  |
+| main.rs:100:9:100:9 | x | main.rs:101:5:108:6 | let ... = x else {...} | match |
+| main.rs:100:13:100:16 | Some | main.rs:100:18:100:21 | "x5" |  |
+| main.rs:100:13:100:22 | Some(...) | main.rs:100:9:100:9 | x |  |
+| main.rs:100:18:100:21 | "x5" | main.rs:100:13:100:22 | Some(...) |  |
+| main.rs:101:5:108:6 | let ... = x else {...} | main.rs:102:7:102:7 | x |  |
+| main.rs:101:9:101:15 | Some(...) | main.rs:101:14:101:14 | x | match |
+| main.rs:101:9:101:15 | Some(...) | main.rs:104:9:105:14 | let ... = x | no-match |
+| main.rs:101:14:101:14 | x | main.rs:101:14:101:14 | x |  |
+| main.rs:101:14:101:14 | x | main.rs:109:5:109:17 | ExprStmt | match |
+| main.rs:102:7:102:7 | x | main.rs:101:9:101:15 | Some(...) |  |
+| main.rs:104:9:105:14 | let ... = x | main.rs:105:13:105:13 | x |  |
+| main.rs:104:13:104:13 | x | main.rs:104:13:104:13 | x |  |
+| main.rs:104:13:104:13 | x | main.rs:106:9:106:30 | ExprStmt | match |
+| main.rs:105:13:105:13 | x | main.rs:104:13:104:13 | x |  |
+| main.rs:106:9:106:17 | print_str | main.rs:106:19:106:19 | x |  |
+| main.rs:106:9:106:29 | print_str(...) | main.rs:107:9:107:13 | ...::panic |  |
+| main.rs:106:9:106:30 | ExprStmt | main.rs:106:9:106:17 | print_str |  |
+| main.rs:106:19:106:19 | x | main.rs:106:19:106:28 | x.unwrap() |  |
+| main.rs:106:19:106:28 | x.unwrap() | main.rs:106:9:106:29 | print_str(...) |  |
+| main.rs:107:9:107:13 | "not yet implemented" | main.rs:107:9:107:13 | ...::panic(...) |  |
+| main.rs:107:9:107:13 | ...::panic | main.rs:107:9:107:13 | "not yet implemented" |  |
+| main.rs:107:9:107:13 | ...::panic(...) | main.rs:107:9:107:13 | MacroBlockExpr |  |
+| main.rs:107:9:107:13 | MacroBlockExpr | main.rs:107:9:107:15 | todo!... |  |
+| main.rs:107:9:107:15 | MacroExpr | main.rs:103:10:108:5 | { ... } |  |
+| main.rs:107:9:107:15 | todo!... | main.rs:107:9:107:15 | MacroExpr |  |
+| main.rs:109:5:109:13 | print_str | main.rs:109:15:109:15 | x |  |
+| main.rs:109:5:109:16 | print_str(...) | main.rs:99:19:110:1 | { ... } |  |
+| main.rs:109:5:109:17 | ExprStmt | main.rs:109:5:109:13 | print_str |  |
+| main.rs:109:15:109:15 | x | main.rs:109:5:109:16 | print_str(...) |  |
+| main.rs:112:1:119:1 | enter fn let_pattern5 | main.rs:113:5:113:42 | let ... = ... |  |
+| main.rs:112:1:119:1 | exit fn let_pattern5 (normal) | main.rs:112:1:119:1 | exit fn let_pattern5 |  |
+| main.rs:112:19:119:1 | { ... } | main.rs:112:1:119:1 | exit fn let_pattern5 (normal) |  |
+| main.rs:113:5:113:42 | let ... = ... | main.rs:113:14:113:17 | Some |  |
+| main.rs:113:9:113:10 | s1 | main.rs:113:9:113:10 | s1 |  |
+| main.rs:113:9:113:10 | s1 | main.rs:116:11:116:12 | s1 | match |
+| main.rs:113:14:113:17 | Some | main.rs:113:19:113:30 | ...::from |  |
+| main.rs:113:14:113:41 | Some(...) | main.rs:113:9:113:10 | s1 |  |
+| main.rs:113:19:113:30 | ...::from | main.rs:113:32:113:39 | "Hello!" |  |
+| main.rs:113:19:113:40 | ...::from(...) | main.rs:113:14:113:41 | Some(...) |  |
+| main.rs:113:32:113:39 | "Hello!" | main.rs:113:19:113:40 | ...::from(...) |  |
+| main.rs:115:5:118:5 | while ... { ... } | main.rs:112:19:119:1 | { ... } |  |
+| main.rs:115:11:116:12 | [boolean(false)] let ... = s1 | main.rs:115:5:118:5 | while ... { ... } | false |
+| main.rs:115:11:116:12 | [boolean(true)] let ... = s1 | main.rs:117:9:117:22 | ExprStmt | true |
+| main.rs:115:15:115:26 | Some(...) | main.rs:115:11:116:12 | [boolean(false)] let ... = s1 | no-match |
+| main.rs:115:15:115:26 | Some(...) | main.rs:115:24:115:25 | s2 | match |
+| main.rs:115:20:115:25 | ref s2 | main.rs:115:11:116:12 | [boolean(true)] let ... = s1 | match |
+| main.rs:115:24:115:25 | s2 | main.rs:115:20:115:25 | ref s2 |  |
+| main.rs:116:11:116:12 | s1 | main.rs:115:15:115:26 | Some(...) |  |
+| main.rs:116:14:118:5 | { ... } | main.rs:116:11:116:12 | s1 |  |
+| main.rs:117:9:117:17 | print_str | main.rs:117:19:117:20 | s2 |  |
+| main.rs:117:9:117:21 | print_str(...) | main.rs:116:14:118:5 | { ... } |  |
+| main.rs:117:9:117:22 | ExprStmt | main.rs:117:9:117:17 | print_str |  |
+| main.rs:117:19:117:20 | s2 | main.rs:117:9:117:21 | print_str(...) |  |
+| main.rs:121:1:136:1 | enter fn match_pattern1 | main.rs:122:5:122:21 | let ... = ... |  |
+| main.rs:121:1:136:1 | exit fn match_pattern1 (normal) | main.rs:121:1:136:1 | exit fn match_pattern1 |  |
+| main.rs:121:21:136:1 | { ... } | main.rs:121:1:136:1 | exit fn match_pattern1 (normal) |  |
+| main.rs:122:5:122:21 | let ... = ... | main.rs:122:14:122:17 | Some |  |
+| main.rs:122:9:122:10 | x6 | main.rs:122:9:122:10 | x6 |  |
+| main.rs:122:9:122:10 | x6 | main.rs:123:5:123:16 | let ... = 10 | match |
+| main.rs:122:14:122:17 | Some | main.rs:122:19:122:19 | 5 |  |
+| main.rs:122:14:122:20 | Some(...) | main.rs:122:9:122:10 | x6 |  |
+| main.rs:122:19:122:19 | 5 | main.rs:122:14:122:20 | Some(...) |  |
+| main.rs:123:5:123:16 | let ... = 10 | main.rs:123:14:123:15 | 10 |  |
+| main.rs:123:9:123:10 | y1 | main.rs:123:9:123:10 | y1 |  |
+| main.rs:123:9:123:10 | y1 | main.rs:125:5:133:5 | ExprStmt | match |
+| main.rs:123:14:123:15 | 10 | main.rs:123:9:123:10 | y1 |  |
+| main.rs:125:5:133:5 | ExprStmt | main.rs:125:11:125:12 | x6 |  |
+| main.rs:125:5:133:5 | match x6 { ... } | main.rs:135:5:135:18 | ExprStmt |  |
+| main.rs:125:11:125:12 | x6 | main.rs:126:9:126:16 | Some(...) |  |
+| main.rs:126:9:126:16 | Some(...) | main.rs:126:14:126:15 | 50 | match |
+| main.rs:126:9:126:16 | Some(...) | main.rs:127:9:127:16 | Some(...) | no-match |
+| main.rs:126:14:126:15 | 50 | main.rs:126:14:126:15 | 50 |  |
+| main.rs:126:14:126:15 | 50 | main.rs:126:21:126:29 | print_str | match |
+| main.rs:126:14:126:15 | 50 | main.rs:127:9:127:16 | Some(...) | no-match |
+| main.rs:126:21:126:29 | print_str | main.rs:126:31:126:38 | "Got 50" |  |
+| main.rs:126:21:126:39 | print_str(...) | main.rs:125:5:133:5 | match x6 { ... } |  |
+| main.rs:126:31:126:38 | "Got 50" | main.rs:126:21:126:39 | print_str(...) |  |
+| main.rs:127:9:127:16 | Some(...) | main.rs:127:14:127:15 | y1 | match |
+| main.rs:127:9:127:16 | Some(...) | main.rs:132:9:132:12 | None | no-match |
+| main.rs:127:14:127:15 | y1 | main.rs:127:14:127:15 | y1 |  |
+| main.rs:127:14:127:15 | y1 | main.rs:130:13:130:21 | print_i64 | match |
+| main.rs:129:9:131:9 | { ... } | main.rs:125:5:133:5 | match x6 { ... } |  |
+| main.rs:130:13:130:21 | print_i64 | main.rs:130:23:130:24 | y1 |  |
+| main.rs:130:13:130:25 | print_i64(...) | main.rs:129:9:131:9 | { ... } |  |
+| main.rs:130:23:130:24 | y1 | main.rs:130:13:130:25 | print_i64(...) |  |
+| main.rs:132:9:132:12 | None | main.rs:132:9:132:12 | None |  |
+| main.rs:132:9:132:12 | None | main.rs:132:17:132:25 | print_str | match |
+| main.rs:132:17:132:25 | print_str | main.rs:132:27:132:32 | "NONE" |  |
+| main.rs:132:17:132:33 | print_str(...) | main.rs:125:5:133:5 | match x6 { ... } |  |
+| main.rs:132:27:132:32 | "NONE" | main.rs:132:17:132:33 | print_str(...) |  |
+| main.rs:135:5:135:13 | print_i64 | main.rs:135:15:135:16 | y1 |  |
+| main.rs:135:5:135:17 | print_i64(...) | main.rs:121:21:136:1 | { ... } |  |
+| main.rs:135:5:135:18 | ExprStmt | main.rs:135:5:135:13 | print_i64 |  |
+| main.rs:135:15:135:16 | y1 | main.rs:135:5:135:17 | print_i64(...) |  |
+| main.rs:138:1:167:1 | enter fn match_pattern2 | main.rs:139:5:139:36 | let ... = ... |  |
+| main.rs:138:1:167:1 | exit fn match_pattern2 (normal) | main.rs:138:1:167:1 | exit fn match_pattern2 |  |
+| main.rs:138:21:167:1 | { ... } | main.rs:138:1:167:1 | exit fn match_pattern2 (normal) |  |
+| main.rs:139:5:139:36 | let ... = ... | main.rs:139:20:139:20 | 2 |  |
+| main.rs:139:9:139:15 | numbers | main.rs:139:9:139:15 | numbers |  |
+| main.rs:139:9:139:15 | numbers | main.rs:141:5:154:5 | ExprStmt | match |
+| main.rs:139:19:139:35 | TupleExpr | main.rs:139:9:139:15 | numbers |  |
+| main.rs:139:20:139:20 | 2 | main.rs:139:23:139:23 | 4 |  |
+| main.rs:139:23:139:23 | 4 | main.rs:139:26:139:26 | 8 |  |
+| main.rs:139:26:139:26 | 8 | main.rs:139:29:139:30 | 16 |  |
+| main.rs:139:29:139:30 | 16 | main.rs:139:33:139:34 | 32 |  |
+| main.rs:139:33:139:34 | 32 | main.rs:139:19:139:35 | TupleExpr |  |
+| main.rs:141:5:154:5 | ExprStmt | main.rs:141:11:141:17 | numbers |  |
+| main.rs:141:5:154:5 | match numbers { ... } | main.rs:156:11:156:17 | numbers |  |
+| main.rs:141:11:141:17 | numbers | main.rs:143:9:149:9 | TuplePat |  |
+| main.rs:143:9:149:9 | TuplePat | main.rs:144:13:144:17 | first | match |
+| main.rs:144:13:144:17 | first | main.rs:144:13:144:17 | first |  |
+| main.rs:144:13:144:17 | first | main.rs:145:13:145:13 | _ | match |
+| main.rs:145:13:145:13 | _ | main.rs:146:13:146:17 | third | match |
+| main.rs:146:13:146:17 | third | main.rs:146:13:146:17 | third |  |
+| main.rs:146:13:146:17 | third | main.rs:147:13:147:13 | _ | match |
+| main.rs:147:13:147:13 | _ | main.rs:148:13:148:17 | fifth | match |
+| main.rs:148:13:148:17 | fifth | main.rs:148:13:148:17 | fifth |  |
+| main.rs:148:13:148:17 | fifth | main.rs:150:13:150:29 | ExprStmt | match |
+| main.rs:149:14:153:9 | { ... } | main.rs:141:5:154:5 | match numbers { ... } |  |
+| main.rs:150:13:150:21 | print_i64 | main.rs:150:23:150:27 | first |  |
+| main.rs:150:13:150:28 | print_i64(...) | main.rs:151:13:151:29 | ExprStmt |  |
+| main.rs:150:13:150:29 | ExprStmt | main.rs:150:13:150:21 | print_i64 |  |
+| main.rs:150:23:150:27 | first | main.rs:150:13:150:28 | print_i64(...) |  |
+| main.rs:151:13:151:21 | print_i64 | main.rs:151:23:151:27 | third |  |
+| main.rs:151:13:151:28 | print_i64(...) | main.rs:152:13:152:29 | ExprStmt |  |
+| main.rs:151:13:151:29 | ExprStmt | main.rs:151:13:151:21 | print_i64 |  |
+| main.rs:151:23:151:27 | third | main.rs:151:13:151:28 | print_i64(...) |  |
+| main.rs:152:13:152:21 | print_i64 | main.rs:152:23:152:27 | fifth |  |
+| main.rs:152:13:152:28 | print_i64(...) | main.rs:149:14:153:9 | { ... } |  |
+| main.rs:152:13:152:29 | ExprStmt | main.rs:152:13:152:21 | print_i64 |  |
+| main.rs:152:23:152:27 | fifth | main.rs:152:13:152:28 | print_i64(...) |  |
+| main.rs:156:5:166:5 | match numbers { ... } | main.rs:138:21:167:1 | { ... } |  |
+| main.rs:156:11:156:17 | numbers | main.rs:158:9:162:9 | TuplePat |  |
+| main.rs:158:9:162:9 | TuplePat | main.rs:159:13:159:17 | first | match |
+| main.rs:159:13:159:17 | first | main.rs:159:13:159:17 | first |  |
+| main.rs:159:13:159:17 | first | main.rs:160:13:160:14 | .. | match |
+| main.rs:160:13:160:14 | .. | main.rs:161:13:161:16 | last | match |
+| main.rs:161:13:161:16 | last | main.rs:161:13:161:16 | last |  |
+| main.rs:161:13:161:16 | last | main.rs:163:13:163:29 | ExprStmt | match |
+| main.rs:162:14:165:9 | { ... } | main.rs:156:5:166:5 | match numbers { ... } |  |
+| main.rs:163:13:163:21 | print_i64 | main.rs:163:23:163:27 | first |  |
+| main.rs:163:13:163:28 | print_i64(...) | main.rs:164:13:164:28 | ExprStmt |  |
+| main.rs:163:13:163:29 | ExprStmt | main.rs:163:13:163:21 | print_i64 |  |
+| main.rs:163:23:163:27 | first | main.rs:163:13:163:28 | print_i64(...) |  |
+| main.rs:164:13:164:21 | print_i64 | main.rs:164:23:164:26 | last |  |
+| main.rs:164:13:164:27 | print_i64(...) | main.rs:162:14:165:9 | { ... } |  |
+| main.rs:164:13:164:28 | ExprStmt | main.rs:164:13:164:21 | print_i64 |  |
+| main.rs:164:23:164:26 | last | main.rs:164:13:164:27 | print_i64(...) |  |
+| main.rs:169:1:177:1 | enter fn match_pattern3 | main.rs:170:5:170:38 | let ... = ... |  |
+| main.rs:169:1:177:1 | exit fn match_pattern3 (normal) | main.rs:169:1:177:1 | exit fn match_pattern3 |  |
+| main.rs:169:21:177:1 | { ... } | main.rs:169:1:177:1 | exit fn match_pattern3 (normal) |  |
+| main.rs:170:5:170:38 | let ... = ... | main.rs:170:25:170:27 | "x" |  |
+| main.rs:170:9:170:10 | p2 | main.rs:170:9:170:10 | p2 |  |
+| main.rs:170:9:170:10 | p2 | main.rs:172:11:172:12 | p2 | match |
+| main.rs:170:14:170:37 | Point {...} | main.rs:170:9:170:10 | p2 |  |
+| main.rs:170:25:170:27 | "x" | main.rs:170:33:170:35 | "y" |  |
+| main.rs:170:33:170:35 | "y" | main.rs:170:14:170:37 | Point {...} |  |
+| main.rs:172:5:176:5 | match p2 { ... } | main.rs:169:21:177:1 | { ... } |  |
+| main.rs:172:11:172:12 | p2 | main.rs:173:9:175:9 | Point {...} |  |
+| main.rs:173:9:175:9 | Point {...} | main.rs:174:16:174:17 | x7 | match |
+| main.rs:174:16:174:17 | x7 | main.rs:174:16:174:17 | x7 |  |
+| main.rs:174:16:174:17 | x7 | main.rs:174:20:174:21 | .. | match |
+| main.rs:174:20:174:21 | .. | main.rs:175:14:175:22 | print_str | match |
+| main.rs:175:14:175:22 | print_str | main.rs:175:24:175:25 | x7 |  |
+| main.rs:175:14:175:26 | print_str(...) | main.rs:172:5:176:5 | match p2 { ... } |  |
+| main.rs:175:24:175:25 | x7 | main.rs:175:14:175:26 | print_str(...) |  |
+| main.rs:183:1:200:1 | enter fn match_pattern4 | main.rs:184:5:184:39 | let ... = ... |  |
+| main.rs:183:1:200:1 | exit fn match_pattern4 (normal) | main.rs:183:1:200:1 | exit fn match_pattern4 |  |
+| main.rs:183:21:200:1 | { ... } | main.rs:183:1:200:1 | exit fn match_pattern4 (normal) |  |
+| main.rs:184:5:184:39 | let ... = ... | main.rs:184:36:184:36 | 0 |  |
+| main.rs:184:9:184:11 | msg | main.rs:184:9:184:11 | msg |  |
+| main.rs:184:9:184:11 | msg | main.rs:186:11:186:13 | msg | match |
+| main.rs:184:15:184:38 | ...::Hello {...} | main.rs:184:9:184:11 | msg |  |
+| main.rs:184:36:184:36 | 0 | main.rs:184:15:184:38 | ...::Hello {...} |  |
+| main.rs:186:5:199:5 | match msg { ... } | main.rs:183:21:200:1 | { ... } |  |
+| main.rs:186:11:186:13 | msg | main.rs:188:9:190:9 | ...::Hello {...} |  |
+| main.rs:188:9:190:9 | ...::Hello {...} | main.rs:189:31:189:35 | RangePat | match |
+| main.rs:188:9:190:9 | ...::Hello {...} | main.rs:191:9:191:38 | ...::Hello {...} | no-match |
+| main.rs:189:17:189:27 | id_variable | main.rs:189:17:189:35 | id_variable @ ... |  |
+| main.rs:189:17:189:35 | id_variable @ ... | main.rs:190:14:190:22 | print_i64 | match |
+| main.rs:189:31:189:31 | 3 | main.rs:189:31:189:31 | 3 |  |
+| main.rs:189:31:189:31 | 3 | main.rs:189:35:189:35 | 7 | match |
+| main.rs:189:31:189:31 | 3 | main.rs:191:9:191:38 | ...::Hello {...} | no-match |
+| main.rs:189:31:189:35 | RangePat | main.rs:189:31:189:31 | 3 | match |
+| main.rs:189:35:189:35 | 7 | main.rs:189:17:189:27 | id_variable | match |
+| main.rs:189:35:189:35 | 7 | main.rs:189:35:189:35 | 7 |  |
+| main.rs:189:35:189:35 | 7 | main.rs:191:9:191:38 | ...::Hello {...} | no-match |
+| main.rs:190:14:190:22 | print_i64 | main.rs:190:24:190:34 | id_variable |  |
+| main.rs:190:14:190:35 | print_i64(...) | main.rs:186:5:199:5 | match msg { ... } |  |
+| main.rs:190:24:190:34 | id_variable | main.rs:190:14:190:35 | print_i64(...) |  |
+| main.rs:191:9:191:38 | ...::Hello {...} | main.rs:191:30:191:36 | RangePat | match |
+| main.rs:191:9:191:38 | ...::Hello {...} | main.rs:194:9:194:29 | ...::Hello {...} | no-match |
+| main.rs:191:30:191:31 | 10 | main.rs:191:30:191:31 | 10 |  |
+| main.rs:191:30:191:31 | 10 | main.rs:191:35:191:36 | 12 | match |
+| main.rs:191:30:191:31 | 10 | main.rs:194:9:194:29 | ...::Hello {...} | no-match |
+| main.rs:191:30:191:36 | RangePat | main.rs:191:30:191:31 | 10 | match |
+| main.rs:191:35:191:36 | 12 | main.rs:191:35:191:36 | 12 |  |
+| main.rs:191:35:191:36 | 12 | main.rs:192:22:192:51 | ExprStmt | match |
+| main.rs:191:35:191:36 | 12 | main.rs:194:9:194:29 | ...::Hello {...} | no-match |
+| main.rs:191:43:193:9 | { ... } | main.rs:186:5:199:5 | match msg { ... } |  |
+| main.rs:192:13:192:20 | ...::_print | main.rs:192:22:192:51 | "Found an id in another range\\... |  |
+| main.rs:192:13:192:52 | MacroExpr | main.rs:191:43:193:9 | { ... } |  |
+| main.rs:192:13:192:52 | println!... | main.rs:192:13:192:52 | MacroExpr |  |
+| main.rs:192:22:192:51 | "Found an id in another range\\... | main.rs:192:22:192:51 | FormatArgsExpr |  |
+| main.rs:192:22:192:51 | ...::_print(...) | main.rs:192:22:192:51 | { ... } |  |
+| main.rs:192:22:192:51 | ...::format_args_nl!... | main.rs:192:22:192:51 | MacroExpr |  |
+| main.rs:192:22:192:51 | ExprStmt | main.rs:192:13:192:20 | ...::_print |  |
+| main.rs:192:22:192:51 | FormatArgsExpr | main.rs:192:22:192:51 | ...::format_args_nl!... |  |
+| main.rs:192:22:192:51 | MacroBlockExpr | main.rs:192:13:192:52 | println!... |  |
+| main.rs:192:22:192:51 | MacroExpr | main.rs:192:22:192:51 | ...::_print(...) |  |
+| main.rs:192:22:192:51 | { ... } | main.rs:192:22:192:51 | MacroBlockExpr |  |
+| main.rs:194:9:194:29 | ...::Hello {...} | main.rs:194:26:194:27 | id | match |
+| main.rs:194:26:194:27 | id | main.rs:194:26:194:27 | id |  |
+| main.rs:194:26:194:27 | id | main.rs:197:13:197:21 | print_i64 | match |
+| main.rs:196:9:198:9 | { ... } | main.rs:186:5:199:5 | match msg { ... } |  |
+| main.rs:197:13:197:21 | print_i64 | main.rs:197:23:197:24 | id |  |
+| main.rs:197:13:197:25 | print_i64(...) | main.rs:196:9:198:9 | { ... } |  |
+| main.rs:197:23:197:24 | id | main.rs:197:13:197:25 | print_i64(...) |  |
+| main.rs:207:1:213:1 | enter fn match_pattern5 | main.rs:208:5:208:34 | let ... = ... |  |
+| main.rs:207:1:213:1 | exit fn match_pattern5 (normal) | main.rs:207:1:213:1 | exit fn match_pattern5 |  |
+| main.rs:207:21:213:1 | { ... } | main.rs:207:1:213:1 | exit fn match_pattern5 (normal) |  |
+| main.rs:208:5:208:34 | let ... = ... | main.rs:208:18:208:29 | ...::Left |  |
+| main.rs:208:9:208:14 | either | main.rs:208:9:208:14 | either |  |
+| main.rs:208:9:208:14 | either | main.rs:209:11:209:16 | either | match |
+| main.rs:208:18:208:29 | ...::Left | main.rs:208:31:208:32 | 32 |  |
+| main.rs:208:18:208:33 | ...::Left(...) | main.rs:208:9:208:14 | either |  |
+| main.rs:208:31:208:32 | 32 | main.rs:208:18:208:33 | ...::Left(...) |  |
+| main.rs:209:5:212:5 | match either { ... } | main.rs:207:21:213:1 | { ... } |  |
+| main.rs:209:11:209:16 | either | main.rs:210:9:210:24 | ...::Left(...) |  |
+| main.rs:210:9:210:24 | ...::Left(...) | main.rs:210:22:210:23 | a3 | match |
+| main.rs:210:9:210:24 | ...::Left(...) | main.rs:210:28:210:44 | ...::Right(...) | no-match |
+| main.rs:210:9:210:44 | ... \| ... | main.rs:211:16:211:24 | print_i64 | match |
+| main.rs:210:22:210:23 | a3 | main.rs:210:9:210:44 | ... \| ... | match |
+| main.rs:210:22:210:23 | a3 | main.rs:210:22:210:23 | a3 |  |
+| main.rs:210:28:210:44 | ...::Right(...) | main.rs:210:42:210:43 | a3 | match |
+| main.rs:210:42:210:43 | a3 | main.rs:210:9:210:44 | ... \| ... | match |
+| main.rs:210:42:210:43 | a3 | main.rs:210:42:210:43 | a3 |  |
+| main.rs:211:16:211:24 | print_i64 | main.rs:211:26:211:27 | a3 |  |
+| main.rs:211:16:211:28 | print_i64(...) | main.rs:209:5:212:5 | match either { ... } |  |
+| main.rs:211:26:211:27 | a3 | main.rs:211:16:211:28 | print_i64(...) |  |
+| main.rs:221:1:235:1 | enter fn match_pattern6 | main.rs:222:5:222:37 | let ... = ... |  |
+| main.rs:221:1:235:1 | exit fn match_pattern6 (normal) | main.rs:221:1:235:1 | exit fn match_pattern6 |  |
+| main.rs:221:21:235:1 | { ... } | main.rs:221:1:235:1 | exit fn match_pattern6 (normal) |  |
+| main.rs:222:5:222:37 | let ... = ... | main.rs:222:14:222:32 | ...::Second |  |
+| main.rs:222:9:222:10 | tv | main.rs:222:9:222:10 | tv |  |
+| main.rs:222:9:222:10 | tv | main.rs:223:5:226:5 | ExprStmt | match |
+| main.rs:222:14:222:32 | ...::Second | main.rs:222:34:222:35 | 62 |  |
+| main.rs:222:14:222:36 | ...::Second(...) | main.rs:222:9:222:10 | tv |  |
+| main.rs:222:34:222:35 | 62 | main.rs:222:14:222:36 | ...::Second(...) |  |
+| main.rs:223:5:226:5 | ExprStmt | main.rs:223:11:223:12 | tv |  |
+| main.rs:223:5:226:5 | match tv { ... } | main.rs:227:5:230:5 | ExprStmt |  |
+| main.rs:223:11:223:12 | tv | main.rs:224:9:224:30 | ...::First(...) |  |
+| main.rs:224:9:224:30 | ...::First(...) | main.rs:224:28:224:29 | a4 | match |
+| main.rs:224:9:224:30 | ...::First(...) | main.rs:224:34:224:56 | ...::Second(...) | no-match |
+| main.rs:224:9:224:81 | ... \| ... \| ... | main.rs:225:16:225:24 | print_i64 | match |
+| main.rs:224:28:224:29 | a4 | main.rs:224:9:224:81 | ... \| ... \| ... | match |
+| main.rs:224:28:224:29 | a4 | main.rs:224:28:224:29 | a4 |  |
+| main.rs:224:34:224:56 | ...::Second(...) | main.rs:224:54:224:55 | a4 | match |
+| main.rs:224:34:224:56 | ...::Second(...) | main.rs:224:60:224:81 | ...::Third(...) | no-match |
+| main.rs:224:54:224:55 | a4 | main.rs:224:9:224:81 | ... \| ... \| ... | match |
+| main.rs:224:54:224:55 | a4 | main.rs:224:54:224:55 | a4 |  |
+| main.rs:224:60:224:81 | ...::Third(...) | main.rs:224:79:224:80 | a4 | match |
+| main.rs:224:79:224:80 | a4 | main.rs:224:9:224:81 | ... \| ... \| ... | match |
+| main.rs:224:79:224:80 | a4 | main.rs:224:79:224:80 | a4 |  |
+| main.rs:225:16:225:24 | print_i64 | main.rs:225:26:225:27 | a4 |  |
+| main.rs:225:16:225:28 | print_i64(...) | main.rs:223:5:226:5 | match tv { ... } |  |
+| main.rs:225:26:225:27 | a4 | main.rs:225:16:225:28 | print_i64(...) |  |
+| main.rs:227:5:230:5 | ExprStmt | main.rs:227:11:227:12 | tv |  |
+| main.rs:227:5:230:5 | match tv { ... } | main.rs:231:11:231:12 | tv |  |
+| main.rs:227:11:227:12 | tv | main.rs:228:10:228:31 | ...::First(...) |  |
+| main.rs:228:9:228:83 | ... \| ... | main.rs:229:16:229:24 | print_i64 | match |
+| main.rs:228:10:228:31 | ...::First(...) | main.rs:228:29:228:30 | a5 | match |
+| main.rs:228:10:228:31 | ...::First(...) | main.rs:228:35:228:57 | ...::Second(...) | no-match |
+| main.rs:228:10:228:57 | [match(false)] ... \| ... | main.rs:228:62:228:83 | ...::Third(...) | no-match |
+| main.rs:228:10:228:57 | [match(true)] ... \| ... | main.rs:228:9:228:83 | ... \| ... | match |
+| main.rs:228:29:228:30 | a5 | main.rs:228:10:228:57 | [match(true)] ... \| ... | match |
+| main.rs:228:29:228:30 | a5 | main.rs:228:29:228:30 | a5 |  |
+| main.rs:228:35:228:57 | ...::Second(...) | main.rs:228:10:228:57 | [match(false)] ... \| ... | no-match |
+| main.rs:228:35:228:57 | ...::Second(...) | main.rs:228:55:228:56 | a5 | match |
+| main.rs:228:55:228:56 | a5 | main.rs:228:10:228:57 | [match(true)] ... \| ... | match |
+| main.rs:228:55:228:56 | a5 | main.rs:228:55:228:56 | a5 |  |
+| main.rs:228:62:228:83 | ...::Third(...) | main.rs:228:81:228:82 | a5 | match |
+| main.rs:228:81:228:82 | a5 | main.rs:228:9:228:83 | ... \| ... | match |
+| main.rs:228:81:228:82 | a5 | main.rs:228:81:228:82 | a5 |  |
+| main.rs:229:16:229:24 | print_i64 | main.rs:229:26:229:27 | a5 |  |
+| main.rs:229:16:229:28 | print_i64(...) | main.rs:227:5:230:5 | match tv { ... } |  |
+| main.rs:229:26:229:27 | a5 | main.rs:229:16:229:28 | print_i64(...) |  |
+| main.rs:231:5:234:5 | match tv { ... } | main.rs:221:21:235:1 | { ... } |  |
+| main.rs:231:11:231:12 | tv | main.rs:232:9:232:30 | ...::First(...) |  |
+| main.rs:232:9:232:30 | ...::First(...) | main.rs:232:28:232:29 | a6 | match |
+| main.rs:232:9:232:30 | ...::First(...) | main.rs:232:35:232:57 | ...::Second(...) | no-match |
+| main.rs:232:9:232:83 | ... \| ... | main.rs:233:16:233:24 | print_i64 | match |
+| main.rs:232:28:232:29 | a6 | main.rs:232:9:232:83 | ... \| ... | match |
+| main.rs:232:28:232:29 | a6 | main.rs:232:28:232:29 | a6 |  |
+| main.rs:232:35:232:57 | ...::Second(...) | main.rs:232:55:232:56 | a6 | match |
+| main.rs:232:35:232:57 | ...::Second(...) | main.rs:232:61:232:82 | ...::Third(...) | no-match |
+| main.rs:232:35:232:82 | ... \| ... | main.rs:232:9:232:83 | ... \| ... | match |
+| main.rs:232:55:232:56 | a6 | main.rs:232:35:232:82 | ... \| ... | match |
+| main.rs:232:55:232:56 | a6 | main.rs:232:55:232:56 | a6 |  |
+| main.rs:232:61:232:82 | ...::Third(...) | main.rs:232:80:232:81 | a6 | match |
+| main.rs:232:80:232:81 | a6 | main.rs:232:35:232:82 | ... \| ... | match |
+| main.rs:232:80:232:81 | a6 | main.rs:232:80:232:81 | a6 |  |
+| main.rs:233:16:233:24 | print_i64 | main.rs:233:26:233:27 | a6 |  |
+| main.rs:233:16:233:28 | print_i64(...) | main.rs:231:5:234:5 | match tv { ... } |  |
+| main.rs:233:26:233:27 | a6 | main.rs:233:16:233:28 | print_i64(...) |  |
+| main.rs:237:1:245:1 | enter fn match_pattern7 | main.rs:238:5:238:34 | let ... = ... |  |
+| main.rs:237:1:245:1 | exit fn match_pattern7 (normal) | main.rs:237:1:245:1 | exit fn match_pattern7 |  |
+| main.rs:237:21:245:1 | { ... } | main.rs:237:1:245:1 | exit fn match_pattern7 (normal) |  |
+| main.rs:238:5:238:34 | let ... = ... | main.rs:238:18:238:29 | ...::Left |  |
+| main.rs:238:9:238:14 | either | main.rs:238:9:238:14 | either |  |
+| main.rs:238:9:238:14 | either | main.rs:239:11:239:16 | either | match |
+| main.rs:238:18:238:29 | ...::Left | main.rs:238:31:238:32 | 32 |  |
+| main.rs:238:18:238:33 | ...::Left(...) | main.rs:238:9:238:14 | either |  |
+| main.rs:238:31:238:32 | 32 | main.rs:238:18:238:33 | ...::Left(...) |  |
+| main.rs:239:5:244:5 | match either { ... } | main.rs:237:21:245:1 | { ... } |  |
+| main.rs:239:11:239:16 | either | main.rs:240:9:240:24 | ...::Left(...) |  |
+| main.rs:240:9:240:24 | ...::Left(...) | main.rs:240:22:240:23 | a7 | match |
+| main.rs:240:9:240:24 | ...::Left(...) | main.rs:240:28:240:44 | ...::Right(...) | no-match |
+| main.rs:240:9:240:44 | [match(false)] ... \| ... | main.rs:243:9:243:9 | _ | no-match |
+| main.rs:240:9:240:44 | [match(true)] ... \| ... | main.rs:241:16:241:17 | a7 | match |
+| main.rs:240:22:240:23 | a7 | main.rs:240:9:240:44 | [match(true)] ... \| ... | match |
+| main.rs:240:22:240:23 | a7 | main.rs:240:22:240:23 | a7 |  |
+| main.rs:240:28:240:44 | ...::Right(...) | main.rs:240:9:240:44 | [match(false)] ... \| ... | no-match |
+| main.rs:240:28:240:44 | ...::Right(...) | main.rs:240:42:240:43 | a7 | match |
+| main.rs:240:42:240:43 | a7 | main.rs:240:9:240:44 | [match(true)] ... \| ... | match |
+| main.rs:240:42:240:43 | a7 | main.rs:240:42:240:43 | a7 |  |
+| main.rs:241:16:241:17 | a7 | main.rs:241:21:241:21 | 0 |  |
+| main.rs:241:16:241:21 | ... > ... | main.rs:242:16:242:24 | print_i64 | true |
+| main.rs:241:16:241:21 | ... > ... | main.rs:243:9:243:9 | _ | false |
+| main.rs:241:21:241:21 | 0 | main.rs:241:16:241:21 | ... > ... |  |
+| main.rs:242:16:242:24 | print_i64 | main.rs:242:26:242:27 | a7 |  |
+| main.rs:242:16:242:28 | print_i64(...) | main.rs:239:5:244:5 | match either { ... } |  |
+| main.rs:242:26:242:27 | a7 | main.rs:242:16:242:28 | print_i64(...) |  |
+| main.rs:243:9:243:9 | _ | main.rs:243:14:243:15 | TupleExpr | match |
+| main.rs:243:14:243:15 | TupleExpr | main.rs:239:5:244:5 | match either { ... } |  |
+| main.rs:247:1:262:1 | enter fn match_pattern8 | main.rs:248:5:248:34 | let ... = ... |  |
+| main.rs:247:1:262:1 | exit fn match_pattern8 (normal) | main.rs:247:1:262:1 | exit fn match_pattern8 |  |
+| main.rs:247:21:262:1 | { ... } | main.rs:247:1:262:1 | exit fn match_pattern8 (normal) |  |
+| main.rs:248:5:248:34 | let ... = ... | main.rs:248:18:248:29 | ...::Left |  |
+| main.rs:248:9:248:14 | either | main.rs:248:9:248:14 | either |  |
+| main.rs:248:9:248:14 | either | main.rs:250:11:250:16 | either | match |
+| main.rs:248:18:248:29 | ...::Left | main.rs:248:31:248:32 | 32 |  |
+| main.rs:248:18:248:33 | ...::Left(...) | main.rs:248:9:248:14 | either |  |
+| main.rs:248:31:248:32 | 32 | main.rs:248:18:248:33 | ...::Left(...) |  |
+| main.rs:250:5:261:5 | match either { ... } | main.rs:247:21:262:1 | { ... } |  |
+| main.rs:250:11:250:16 | either | main.rs:252:14:252:30 | ...::Left(...) |  |
+| main.rs:251:9:252:52 | ref e @ ... | main.rs:254:13:254:27 | ExprStmt | match |
+| main.rs:251:13:251:13 | e | main.rs:251:9:252:52 | ref e @ ... |  |
+| main.rs:252:14:252:30 | ...::Left(...) | main.rs:252:27:252:29 | a11 | match |
+| main.rs:252:14:252:30 | ...::Left(...) | main.rs:252:34:252:51 | ...::Right(...) | no-match |
+| main.rs:252:14:252:51 | [match(false)] ... \| ... | main.rs:260:9:260:9 | _ | no-match |
+| main.rs:252:14:252:51 | [match(true)] ... \| ... | main.rs:251:13:251:13 | e | match |
+| main.rs:252:27:252:29 | a11 | main.rs:252:14:252:51 | [match(true)] ... \| ... | match |
+| main.rs:252:27:252:29 | a11 | main.rs:252:27:252:29 | a11 |  |
+| main.rs:252:34:252:51 | ...::Right(...) | main.rs:252:14:252:51 | [match(false)] ... \| ... | no-match |
+| main.rs:252:34:252:51 | ...::Right(...) | main.rs:252:48:252:50 | a11 | match |
+| main.rs:252:48:252:50 | a11 | main.rs:252:14:252:51 | [match(true)] ... \| ... | match |
+| main.rs:252:48:252:50 | a11 | main.rs:252:48:252:50 | a11 |  |
+| main.rs:253:12:259:9 | { ... } | main.rs:250:5:261:5 | match either { ... } |  |
+| main.rs:254:13:254:21 | print_i64 | main.rs:254:23:254:25 | a11 |  |
+| main.rs:254:13:254:26 | print_i64(...) | main.rs:256:15:256:15 | e |  |
+| main.rs:254:13:254:27 | ExprStmt | main.rs:254:13:254:21 | print_i64 |  |
+| main.rs:254:23:254:25 | a11 | main.rs:254:13:254:26 | print_i64(...) |  |
+| main.rs:255:13:258:13 | if ... {...} | main.rs:253:12:259:9 | { ... } |  |
+| main.rs:255:16:256:15 | [boolean(false)] let ... = e | main.rs:255:13:258:13 | if ... {...} | false |
+| main.rs:255:16:256:15 | [boolean(true)] let ... = e | main.rs:257:17:257:32 | ExprStmt | true |
+| main.rs:255:20:255:36 | ...::Left(...) | main.rs:255:16:256:15 | [boolean(false)] let ... = e | no-match |
+| main.rs:255:20:255:36 | ...::Left(...) | main.rs:255:33:255:35 | a12 | match |
+| main.rs:255:33:255:35 | a12 | main.rs:255:16:256:15 | [boolean(true)] let ... = e | match |
+| main.rs:255:33:255:35 | a12 | main.rs:255:33:255:35 | a12 |  |
+| main.rs:256:15:256:15 | e | main.rs:255:20:255:36 | ...::Left(...) |  |
+| main.rs:256:17:258:13 | { ... } | main.rs:255:13:258:13 | if ... {...} |  |
+| main.rs:257:17:257:25 | print_i64 | main.rs:257:28:257:30 | a12 |  |
+| main.rs:257:17:257:31 | print_i64(...) | main.rs:256:17:258:13 | { ... } |  |
+| main.rs:257:17:257:32 | ExprStmt | main.rs:257:17:257:25 | print_i64 |  |
+| main.rs:257:27:257:30 | * ... | main.rs:257:17:257:31 | print_i64(...) |  |
+| main.rs:257:28:257:30 | a12 | main.rs:257:27:257:30 | * ... |  |
+| main.rs:260:9:260:9 | _ | main.rs:260:14:260:15 | TupleExpr | match |
+| main.rs:260:14:260:15 | TupleExpr | main.rs:250:5:261:5 | match either { ... } |  |
+| main.rs:271:1:277:1 | enter fn match_pattern9 | main.rs:272:5:272:36 | let ... = ... |  |
+| main.rs:271:1:277:1 | exit fn match_pattern9 (normal) | main.rs:271:1:277:1 | exit fn match_pattern9 |  |
+| main.rs:271:21:277:1 | { ... } | main.rs:271:1:277:1 | exit fn match_pattern9 (normal) |  |
+| main.rs:272:5:272:36 | let ... = ... | main.rs:272:14:272:31 | ...::Second |  |
+| main.rs:272:9:272:10 | fv | main.rs:272:9:272:10 | fv |  |
+| main.rs:272:9:272:10 | fv | main.rs:273:11:273:12 | fv | match |
+| main.rs:272:14:272:31 | ...::Second | main.rs:272:33:272:34 | 62 |  |
+| main.rs:272:14:272:35 | ...::Second(...) | main.rs:272:9:272:10 | fv |  |
+| main.rs:272:33:272:34 | 62 | main.rs:272:14:272:35 | ...::Second(...) |  |
+| main.rs:273:5:276:5 | match fv { ... } | main.rs:271:21:277:1 | { ... } |  |
+| main.rs:273:11:273:12 | fv | main.rs:274:9:274:30 | ...::First(...) |  |
+| main.rs:274:9:274:30 | ...::First(...) | main.rs:274:27:274:29 | a13 | match |
+| main.rs:274:9:274:30 | ...::First(...) | main.rs:274:35:274:57 | ...::Second(...) | no-match |
+| main.rs:274:9:274:109 | ... \| ... \| ... | main.rs:275:16:275:24 | print_i64 | match |
+| main.rs:274:27:274:29 | a13 | main.rs:274:9:274:109 | ... \| ... \| ... | match |
+| main.rs:274:27:274:29 | a13 | main.rs:274:27:274:29 | a13 |  |
+| main.rs:274:35:274:57 | ...::Second(...) | main.rs:274:54:274:56 | a13 | match |
+| main.rs:274:35:274:57 | ...::Second(...) | main.rs:274:61:274:82 | ...::Third(...) | no-match |
+| main.rs:274:35:274:82 | [match(false)] ... \| ... | main.rs:274:87:274:109 | ...::Fourth(...) | no-match |
+| main.rs:274:35:274:82 | [match(true)] ... \| ... | main.rs:274:9:274:109 | ... \| ... \| ... | match |
+| main.rs:274:54:274:56 | a13 | main.rs:274:35:274:82 | [match(true)] ... \| ... | match |
+| main.rs:274:54:274:56 | a13 | main.rs:274:54:274:56 | a13 |  |
+| main.rs:274:61:274:82 | ...::Third(...) | main.rs:274:35:274:82 | [match(false)] ... \| ... | no-match |
+| main.rs:274:61:274:82 | ...::Third(...) | main.rs:274:79:274:81 | a13 | match |
+| main.rs:274:79:274:81 | a13 | main.rs:274:35:274:82 | [match(true)] ... \| ... | match |
+| main.rs:274:79:274:81 | a13 | main.rs:274:79:274:81 | a13 |  |
+| main.rs:274:87:274:109 | ...::Fourth(...) | main.rs:274:106:274:108 | a13 | match |
+| main.rs:274:106:274:108 | a13 | main.rs:274:9:274:109 | ... \| ... \| ... | match |
+| main.rs:274:106:274:108 | a13 | main.rs:274:106:274:108 | a13 |  |
+| main.rs:275:16:275:24 | print_i64 | main.rs:275:26:275:28 | a13 |  |
+| main.rs:275:16:275:29 | print_i64(...) | main.rs:273:5:276:5 | match fv { ... } |  |
+| main.rs:275:26:275:28 | a13 | main.rs:275:16:275:29 | print_i64(...) |  |
+| main.rs:279:1:293:1 | enter fn match_pattern10 | main.rs:281:5:281:20 | let ... = ... |  |
+| main.rs:279:1:293:1 | exit fn match_pattern10 (normal) | main.rs:279:1:293:1 | exit fn match_pattern10 |  |
+| main.rs:280:22:293:1 | { ... } | main.rs:279:1:293:1 | exit fn match_pattern10 (normal) |  |
+| main.rs:281:5:281:20 | let ... = ... | main.rs:281:12:281:15 | Some |  |
+| main.rs:281:9:281:9 | x | main.rs:281:9:281:9 | x |  |
+| main.rs:281:9:281:9 | x | main.rs:283:7:283:7 | x | match |
+| main.rs:281:12:281:15 | Some | main.rs:281:17:281:18 | 42 |  |
+| main.rs:281:12:281:19 | Some(...) | main.rs:281:9:281:9 | x |  |
+| main.rs:281:17:281:18 | 42 | main.rs:281:12:281:19 | Some(...) |  |
+| main.rs:282:5:292:5 | if ... {...} else {...} | main.rs:280:22:293:1 | { ... } |  |
+| main.rs:282:8:283:7 | [boolean(false)] let ... = x | main.rs:282:8:285:9 | [boolean(false)] ... && ... | false |
+| main.rs:282:8:283:7 | [boolean(true)] let ... = x | main.rs:285:5:285:5 | x | true |
+| main.rs:282:8:285:9 | [boolean(false)] ... && ... | main.rs:289:9:290:14 | let ... = x | false |
+| main.rs:282:8:285:9 | [boolean(true)] ... && ... | main.rs:287:9:287:21 | ExprStmt | true |
+| main.rs:282:12:282:18 | Some(...) | main.rs:282:8:283:7 | [boolean(false)] let ... = x | no-match |
+| main.rs:282:12:282:18 | Some(...) | main.rs:282:17:282:17 | x | match |
+| main.rs:282:17:282:17 | x | main.rs:282:8:283:7 | [boolean(true)] let ... = x | match |
+| main.rs:282:17:282:17 | x | main.rs:282:17:282:17 | x |  |
+| main.rs:283:7:283:7 | x | main.rs:282:12:282:18 | Some(...) |  |
+| main.rs:285:5:285:5 | x | main.rs:285:9:285:9 | 0 |  |
+| main.rs:285:5:285:9 | ... > ... | main.rs:282:8:285:9 | [boolean(false)] ... && ... | false |
+| main.rs:285:5:285:9 | ... > ... | main.rs:282:8:285:9 | [boolean(true)] ... && ... | true |
+| main.rs:285:9:285:9 | 0 | main.rs:285:5:285:9 | ... > ... |  |
+| main.rs:286:5:288:5 | { ... } | main.rs:282:5:292:5 | if ... {...} else {...} |  |
+| main.rs:287:9:287:17 | print_i64 | main.rs:287:19:287:19 | x |  |
+| main.rs:287:9:287:20 | print_i64(...) | main.rs:286:5:288:5 | { ... } |  |
+| main.rs:287:9:287:21 | ExprStmt | main.rs:287:9:287:17 | print_i64 |  |
+| main.rs:287:19:287:19 | x | main.rs:287:9:287:20 | print_i64(...) |  |
+| main.rs:288:12:292:5 | { ... } | main.rs:282:5:292:5 | if ... {...} else {...} |  |
+| main.rs:289:9:290:14 | let ... = x | main.rs:290:13:290:13 | x |  |
+| main.rs:289:13:289:13 | x | main.rs:289:13:289:13 | x |  |
+| main.rs:289:13:289:13 | x | main.rs:291:9:291:30 | ExprStmt | match |
+| main.rs:290:13:290:13 | x | main.rs:289:13:289:13 | x |  |
+| main.rs:291:9:291:17 | print_i64 | main.rs:291:19:291:19 | x |  |
+| main.rs:291:9:291:29 | print_i64(...) | main.rs:288:12:292:5 | { ... } |  |
+| main.rs:291:9:291:30 | ExprStmt | main.rs:291:9:291:17 | print_i64 |  |
+| main.rs:291:19:291:19 | x | main.rs:291:19:291:28 | x.unwrap() |  |
+| main.rs:291:19:291:28 | x.unwrap() | main.rs:291:9:291:29 | print_i64(...) |  |
+| main.rs:295:1:312:1 | enter fn match_pattern11 | main.rs:297:5:297:21 | let ... = ... |  |
+| main.rs:295:1:312:1 | exit fn match_pattern11 (normal) | main.rs:295:1:312:1 | exit fn match_pattern11 |  |
+| main.rs:296:22:312:1 | { ... } | main.rs:295:1:312:1 | exit fn match_pattern11 (normal) |  |
+| main.rs:297:5:297:21 | let ... = ... | main.rs:297:13:297:16 | Some |  |
+| main.rs:297:9:297:9 | x | main.rs:297:9:297:9 | x |  |
+| main.rs:297:9:297:9 | x | main.rs:299:7:299:7 | x | match |
+| main.rs:297:13:297:16 | Some | main.rs:297:18:297:19 | 42 |  |
+| main.rs:297:13:297:20 | Some(...) | main.rs:297:9:297:9 | x |  |
+| main.rs:297:18:297:19 | 42 | main.rs:297:13:297:20 | Some(...) |  |
+| main.rs:298:5:311:5 | if ... {...} else {...} | main.rs:296:22:312:1 | { ... } |  |
+| main.rs:298:8:299:7 | [boolean(false)] let ... = x | main.rs:298:8:302:13 | [boolean(false)] ... && ... | false |
+| main.rs:298:8:299:7 | [boolean(true)] let ... = x | main.rs:302:7:302:10 | Some | true |
+| main.rs:298:8:302:13 | [boolean(false)] ... && ... | main.rs:298:8:304:9 | [boolean(false)] ... && ... | false |
+| main.rs:298:8:302:13 | [boolean(true)] ... && ... | main.rs:304:5:304:5 | x | true |
+| main.rs:298:8:304:9 | [boolean(false)] ... && ... | main.rs:308:9:309:14 | let ... = x | false |
+| main.rs:298:8:304:9 | [boolean(true)] ... && ... | main.rs:306:9:306:21 | ExprStmt | true |
+| main.rs:298:12:298:18 | Some(...) | main.rs:298:8:299:7 | [boolean(false)] let ... = x | no-match |
+| main.rs:298:12:298:18 | Some(...) | main.rs:298:17:298:17 | x | match |
+| main.rs:298:17:298:17 | x | main.rs:298:8:299:7 | [boolean(true)] let ... = x | match |
+| main.rs:298:17:298:17 | x | main.rs:298:17:298:17 | x |  |
+| main.rs:299:7:299:7 | x | main.rs:298:12:298:18 | Some(...) |  |
+| main.rs:301:5:302:13 | [boolean(false)] let ... = ... | main.rs:298:8:302:13 | [boolean(false)] ... && ... | false |
+| main.rs:301:5:302:13 | [boolean(true)] let ... = ... | main.rs:298:8:302:13 | [boolean(true)] ... && ... | true |
+| main.rs:301:9:301:15 | Some(...) | main.rs:301:5:302:13 | [boolean(false)] let ... = ... | no-match |
+| main.rs:301:9:301:15 | Some(...) | main.rs:301:14:301:14 | x | match |
+| main.rs:301:14:301:14 | x | main.rs:301:5:302:13 | [boolean(true)] let ... = ... | match |
+| main.rs:301:14:301:14 | x | main.rs:301:14:301:14 | x |  |
+| main.rs:302:7:302:10 | Some | main.rs:302:12:302:12 | x |  |
+| main.rs:302:7:302:13 | Some(...) | main.rs:301:9:301:15 | Some(...) |  |
+| main.rs:302:12:302:12 | x | main.rs:302:7:302:13 | Some(...) |  |
+| main.rs:304:5:304:5 | x | main.rs:304:9:304:9 | 0 |  |
+| main.rs:304:5:304:9 | ... > ... | main.rs:298:8:304:9 | [boolean(false)] ... && ... | false |
+| main.rs:304:5:304:9 | ... > ... | main.rs:298:8:304:9 | [boolean(true)] ... && ... | true |
+| main.rs:304:9:304:9 | 0 | main.rs:304:5:304:9 | ... > ... |  |
+| main.rs:305:5:307:5 | { ... } | main.rs:298:5:311:5 | if ... {...} else {...} |  |
+| main.rs:306:9:306:17 | print_i64 | main.rs:306:19:306:19 | x |  |
+| main.rs:306:9:306:20 | print_i64(...) | main.rs:305:5:307:5 | { ... } |  |
+| main.rs:306:9:306:21 | ExprStmt | main.rs:306:9:306:17 | print_i64 |  |
+| main.rs:306:19:306:19 | x | main.rs:306:9:306:20 | print_i64(...) |  |
+| main.rs:307:12:311:5 | { ... } | main.rs:298:5:311:5 | if ... {...} else {...} |  |
+| main.rs:308:9:309:14 | let ... = x | main.rs:309:13:309:13 | x |  |
+| main.rs:308:13:308:13 | x | main.rs:308:13:308:13 | x |  |
+| main.rs:308:13:308:13 | x | main.rs:310:9:310:30 | ExprStmt | match |
+| main.rs:309:13:309:13 | x | main.rs:308:13:308:13 | x |  |
+| main.rs:310:9:310:17 | print_i64 | main.rs:310:19:310:19 | x |  |
+| main.rs:310:9:310:29 | print_i64(...) | main.rs:307:12:311:5 | { ... } |  |
+| main.rs:310:9:310:30 | ExprStmt | main.rs:310:9:310:17 | print_i64 |  |
+| main.rs:310:19:310:19 | x | main.rs:310:19:310:28 | x.unwrap() |  |
+| main.rs:310:19:310:28 | x.unwrap() | main.rs:310:9:310:29 | print_i64(...) |  |
+| main.rs:314:1:330:1 | enter fn match_pattern12 | main.rs:316:5:316:21 | let ... = ... |  |
+| main.rs:314:1:330:1 | exit fn match_pattern12 (normal) | main.rs:314:1:330:1 | exit fn match_pattern12 |  |
+| main.rs:315:22:330:1 | { ... } | main.rs:314:1:330:1 | exit fn match_pattern12 (normal) |  |
+| main.rs:316:5:316:21 | let ... = ... | main.rs:316:13:316:16 | Some |  |
+| main.rs:316:9:316:9 | x | main.rs:316:9:316:9 | x |  |
+| main.rs:316:9:316:9 | x | main.rs:317:5:327:5 | ExprStmt | match |
+| main.rs:316:13:316:16 | Some | main.rs:316:18:316:19 | 42 |  |
+| main.rs:316:13:316:20 | Some(...) | main.rs:316:9:316:9 | x |  |
+| main.rs:316:18:316:19 | 42 | main.rs:316:13:316:20 | Some(...) |  |
+| main.rs:317:5:327:5 | ExprStmt | main.rs:318:7:318:7 | x |  |
+| main.rs:317:5:327:5 | while ... { ... } | main.rs:329:5:329:26 | ExprStmt |  |
+| main.rs:317:11:318:7 | [boolean(false)] let ... = x | main.rs:317:11:321:13 | [boolean(false)] ... && ... | false |
+| main.rs:317:11:318:7 | [boolean(true)] let ... = x | main.rs:321:7:321:10 | Some | true |
+| main.rs:317:11:321:13 | [boolean(false)] ... && ... | main.rs:317:11:323:9 | [boolean(false)] ... && ... | false |
+| main.rs:317:11:321:13 | [boolean(true)] ... && ... | main.rs:323:5:323:5 | x | true |
+| main.rs:317:11:323:9 | [boolean(false)] ... && ... | main.rs:317:5:327:5 | while ... { ... } | false |
+| main.rs:317:11:323:9 | [boolean(true)] ... && ... | main.rs:325:9:325:21 | ExprStmt | true |
+| main.rs:317:15:317:21 | Some(...) | main.rs:317:11:318:7 | [boolean(false)] let ... = x | no-match |
+| main.rs:317:15:317:21 | Some(...) | main.rs:317:20:317:20 | x | match |
+| main.rs:317:20:317:20 | x | main.rs:317:11:318:7 | [boolean(true)] let ... = x | match |
+| main.rs:317:20:317:20 | x | main.rs:317:20:317:20 | x |  |
+| main.rs:318:7:318:7 | x | main.rs:317:15:317:21 | Some(...) |  |
+| main.rs:320:5:321:13 | [boolean(false)] let ... = ... | main.rs:317:11:321:13 | [boolean(false)] ... && ... | false |
+| main.rs:320:5:321:13 | [boolean(true)] let ... = ... | main.rs:317:11:321:13 | [boolean(true)] ... && ... | true |
+| main.rs:320:9:320:15 | Some(...) | main.rs:320:5:321:13 | [boolean(false)] let ... = ... | no-match |
+| main.rs:320:9:320:15 | Some(...) | main.rs:320:14:320:14 | x | match |
+| main.rs:320:14:320:14 | x | main.rs:320:5:321:13 | [boolean(true)] let ... = ... | match |
+| main.rs:320:14:320:14 | x | main.rs:320:14:320:14 | x |  |
+| main.rs:321:7:321:10 | Some | main.rs:321:12:321:12 | x |  |
+| main.rs:321:7:321:13 | Some(...) | main.rs:320:9:320:15 | Some(...) |  |
+| main.rs:321:12:321:12 | x | main.rs:321:7:321:13 | Some(...) |  |
+| main.rs:323:5:323:5 | x | main.rs:323:9:323:9 | 0 |  |
+| main.rs:323:5:323:9 | ... > ... | main.rs:317:11:323:9 | [boolean(false)] ... && ... | false |
+| main.rs:323:5:323:9 | ... > ... | main.rs:317:11:323:9 | [boolean(true)] ... && ... | true |
+| main.rs:323:9:323:9 | 0 | main.rs:323:5:323:9 | ... > ... |  |
+| main.rs:325:9:325:17 | print_i64 | main.rs:325:19:325:19 | x |  |
+| main.rs:325:9:325:20 | print_i64(...) | main.rs:326:9:326:14 | ExprStmt |  |
+| main.rs:325:9:325:21 | ExprStmt | main.rs:325:9:325:17 | print_i64 |  |
+| main.rs:325:19:325:19 | x | main.rs:325:9:325:20 | print_i64(...) |  |
+| main.rs:326:9:326:13 | break | main.rs:317:5:327:5 | while ... { ... } | break |
+| main.rs:326:9:326:14 | ExprStmt | main.rs:326:9:326:13 | break |  |
+| main.rs:329:5:329:13 | print_i64 | main.rs:329:15:329:15 | x |  |
+| main.rs:329:5:329:25 | print_i64(...) | main.rs:315:22:330:1 | { ... } |  |
+| main.rs:329:5:329:26 | ExprStmt | main.rs:329:5:329:13 | print_i64 |  |
+| main.rs:329:15:329:15 | x | main.rs:329:15:329:24 | x.unwrap() |  |
+| main.rs:329:15:329:24 | x.unwrap() | main.rs:329:5:329:25 | print_i64(...) |  |
+| main.rs:332:1:344:1 | enter fn match_pattern13 | main.rs:334:5:334:21 | let ... = ... |  |
+| main.rs:332:1:344:1 | exit fn match_pattern13 (normal) | main.rs:332:1:344:1 | exit fn match_pattern13 |  |
+| main.rs:333:22:344:1 | { ... } | main.rs:332:1:344:1 | exit fn match_pattern13 (normal) |  |
+| main.rs:334:5:334:21 | let ... = ... | main.rs:334:13:334:16 | Some |  |
+| main.rs:334:9:334:9 | x | main.rs:334:9:334:9 | x |  |
+| main.rs:334:9:334:9 | x | main.rs:335:5:341:5 | ExprStmt | match |
+| main.rs:334:13:334:16 | Some | main.rs:334:18:334:19 | 42 |  |
+| main.rs:334:13:334:20 | Some(...) | main.rs:334:9:334:9 | x |  |
+| main.rs:334:18:334:19 | 42 | main.rs:334:13:334:20 | Some(...) |  |
+| main.rs:335:5:341:5 | ExprStmt | main.rs:335:11:335:11 | x |  |
+| main.rs:335:5:341:5 | match x { ... } | main.rs:343:5:343:26 | ExprStmt |  |
+| main.rs:335:11:335:11 | x | main.rs:336:9:336:15 | Some(...) |  |
+| main.rs:336:9:336:15 | Some(...) | main.rs:336:14:336:14 | x | match |
+| main.rs:336:9:336:15 | Some(...) | main.rs:340:9:340:9 | _ | no-match |
+| main.rs:336:14:336:14 | x | main.rs:336:14:336:14 | x |  |
+| main.rs:336:14:336:14 | x | main.rs:338:18:338:18 | x | match |
+| main.rs:337:16:338:18 | [boolean(true)] let ... = x | main.rs:339:19:339:19 | x | true |
+| main.rs:337:16:339:23 | [boolean(false)] ... && ... | main.rs:340:9:340:9 | _ | false |
+| main.rs:337:16:339:23 | [boolean(true)] ... && ... | main.rs:339:28:339:29 | TupleExpr | true |
+| main.rs:337:20:337:20 | x | main.rs:337:16:338:18 | [boolean(true)] let ... = x | match |
+| main.rs:337:20:337:20 | x | main.rs:337:20:337:20 | x |  |
+| main.rs:338:18:338:18 | x | main.rs:337:20:337:20 | x |  |
+| main.rs:339:19:339:19 | x | main.rs:339:23:339:23 | 0 |  |
+| main.rs:339:19:339:23 | ... > ... | main.rs:337:16:339:23 | [boolean(false)] ... && ... | false |
+| main.rs:339:19:339:23 | ... > ... | main.rs:337:16:339:23 | [boolean(true)] ... && ... | true |
+| main.rs:339:23:339:23 | 0 | main.rs:339:19:339:23 | ... > ... |  |
+| main.rs:339:28:339:29 | TupleExpr | main.rs:335:5:341:5 | match x { ... } |  |
+| main.rs:340:9:340:9 | _ | main.rs:340:14:340:15 | TupleExpr | match |
+| main.rs:340:14:340:15 | TupleExpr | main.rs:335:5:341:5 | match x { ... } |  |
+| main.rs:343:5:343:13 | print_i64 | main.rs:343:15:343:15 | x |  |
+| main.rs:343:5:343:25 | print_i64(...) | main.rs:333:22:344:1 | { ... } |  |
+| main.rs:343:5:343:26 | ExprStmt | main.rs:343:5:343:13 | print_i64 |  |
+| main.rs:343:15:343:15 | x | main.rs:343:15:343:24 | x.unwrap() |  |
+| main.rs:343:15:343:24 | x.unwrap() | main.rs:343:5:343:25 | print_i64(...) |  |
+| main.rs:346:1:361:1 | enter fn match_pattern14 | main.rs:348:5:348:19 | let ... = ... |  |
+| main.rs:346:1:361:1 | exit fn match_pattern14 (normal) | main.rs:346:1:361:1 | exit fn match_pattern14 |  |
+| main.rs:347:22:361:1 | { ... } | main.rs:346:1:361:1 | exit fn match_pattern14 (normal) |  |
+| main.rs:348:5:348:19 | let ... = ... | main.rs:348:13:348:14 | Ok |  |
+| main.rs:348:9:348:9 | x | main.rs:348:9:348:9 | x |  |
+| main.rs:348:9:348:9 | x | main.rs:350:7:350:7 | x | match |
+| main.rs:348:13:348:14 | Ok | main.rs:348:16:348:17 | 42 |  |
+| main.rs:348:13:348:18 | Ok(...) | main.rs:348:9:348:9 | x |  |
+| main.rs:348:16:348:17 | 42 | main.rs:348:13:348:18 | Ok(...) |  |
+| main.rs:349:5:360:5 | if ... {...} else {...} | main.rs:347:22:361:1 | { ... } |  |
+| main.rs:349:8:350:7 | [boolean(false)] let ... = x | main.rs:355:7:355:7 | x | false |
+| main.rs:349:8:350:7 | [boolean(true)] let ... = x | main.rs:352:9:352:21 | ExprStmt | true |
+| main.rs:349:12:349:17 | Err(...) | main.rs:349:8:350:7 | [boolean(false)] let ... = x | no-match |
+| main.rs:349:12:349:17 | Err(...) | main.rs:349:16:349:16 | x | match |
+| main.rs:349:16:349:16 | x | main.rs:349:8:350:7 | [boolean(true)] let ... = x | match |
+| main.rs:349:16:349:16 | x | main.rs:349:16:349:16 | x |  |
+| main.rs:350:7:350:7 | x | main.rs:349:12:349:17 | Err(...) |  |
+| main.rs:351:5:353:5 | { ... } | main.rs:349:5:360:5 | if ... {...} else {...} |  |
+| main.rs:352:9:352:17 | print_i64 | main.rs:352:19:352:19 | x |  |
+| main.rs:352:9:352:20 | print_i64(...) | main.rs:351:5:353:5 | { ... } |  |
+| main.rs:352:9:352:21 | ExprStmt | main.rs:352:9:352:17 | print_i64 |  |
+| main.rs:352:19:352:19 | x | main.rs:352:9:352:20 | print_i64(...) |  |
+| main.rs:354:10:360:5 | if ... {...} else {...} | main.rs:349:5:360:5 | if ... {...} else {...} |  |
+| main.rs:354:13:355:7 | [boolean(false)] let ... = x | main.rs:359:9:359:30 | ExprStmt | false |
+| main.rs:354:13:355:7 | [boolean(true)] let ... = x | main.rs:357:9:357:21 | ExprStmt | true |
+| main.rs:354:17:354:21 | Ok(...) | main.rs:354:13:355:7 | [boolean(false)] let ... = x | no-match |
+| main.rs:354:17:354:21 | Ok(...) | main.rs:354:20:354:20 | x | match |
+| main.rs:354:20:354:20 | x | main.rs:354:13:355:7 | [boolean(true)] let ... = x | match |
+| main.rs:354:20:354:20 | x | main.rs:354:20:354:20 | x |  |
+| main.rs:355:7:355:7 | x | main.rs:354:17:354:21 | Ok(...) |  |
+| main.rs:356:5:358:5 | { ... } | main.rs:354:10:360:5 | if ... {...} else {...} |  |
+| main.rs:357:9:357:17 | print_i64 | main.rs:357:19:357:19 | x |  |
+| main.rs:357:9:357:20 | print_i64(...) | main.rs:356:5:358:5 | { ... } |  |
+| main.rs:357:9:357:21 | ExprStmt | main.rs:357:9:357:17 | print_i64 |  |
+| main.rs:357:19:357:19 | x | main.rs:357:9:357:20 | print_i64(...) |  |
+| main.rs:358:12:360:5 | { ... } | main.rs:354:10:360:5 | if ... {...} else {...} |  |
+| main.rs:359:9:359:17 | print_i64 | main.rs:359:19:359:19 | x |  |
+| main.rs:359:9:359:29 | print_i64(...) | main.rs:358:12:360:5 | { ... } |  |
+| main.rs:359:9:359:30 | ExprStmt | main.rs:359:9:359:17 | print_i64 |  |
+| main.rs:359:19:359:19 | x | main.rs:359:19:359:28 | x.unwrap() |  |
+| main.rs:359:19:359:28 | x.unwrap() | main.rs:359:9:359:29 | print_i64(...) |  |
+| main.rs:363:1:370:1 | enter fn match_pattern15 | main.rs:364:5:364:20 | let ... = ... |  |
+| main.rs:363:1:370:1 | exit fn match_pattern15 (normal) | main.rs:363:1:370:1 | exit fn match_pattern15 |  |
+| main.rs:363:22:370:1 | { ... } | main.rs:363:1:370:1 | exit fn match_pattern15 (normal) |  |
+| main.rs:364:5:364:20 | let ... = ... | main.rs:364:13:364:16 | Some |  |
+| main.rs:364:9:364:9 | x | main.rs:364:9:364:9 | x |  |
+| main.rs:364:9:364:9 | x | main.rs:365:5:369:10 | ExprStmt | match |
+| main.rs:364:13:364:16 | Some | main.rs:364:18:364:18 | 0 |  |
+| main.rs:364:13:364:19 | Some(...) | main.rs:364:9:364:9 | x |  |
+| main.rs:364:18:364:18 | 0 | main.rs:364:13:364:19 | Some(...) |  |
+| main.rs:365:5:369:9 | match x { ... } | main.rs:363:22:370:1 | { ... } |  |
+| main.rs:365:5:369:10 | ExprStmt | main.rs:365:11:365:11 | x |  |
+| main.rs:365:11:365:11 | x | main.rs:366:13:366:19 | Some(...) |  |
+| main.rs:366:13:366:19 | Some(...) | main.rs:366:18:366:18 | x | match |
+| main.rs:366:13:366:19 | Some(...) | main.rs:368:13:368:13 | _ | no-match |
+| main.rs:366:18:366:18 | x | main.rs:366:18:366:18 | x |  |
+| main.rs:366:18:366:18 | x | main.rs:367:20:367:20 | x | match |
+| main.rs:367:20:367:20 | x | main.rs:365:5:369:9 | match x { ... } |  |
+| main.rs:368:13:368:13 | _ | main.rs:368:18:368:18 | 0 | match |
+| main.rs:368:18:368:18 | 0 | main.rs:365:5:369:9 | match x { ... } |  |
+| main.rs:372:1:381:1 | enter fn match_pattern16 | main.rs:373:5:373:21 | let ... = ... |  |
+| main.rs:372:1:381:1 | exit fn match_pattern16 (normal) | main.rs:372:1:381:1 | exit fn match_pattern16 |  |
+| main.rs:372:22:381:1 | { ... } | main.rs:372:1:381:1 | exit fn match_pattern16 (normal) |  |
+| main.rs:373:5:373:21 | let ... = ... | main.rs:373:13:373:16 | Some |  |
+| main.rs:373:9:373:9 | x | main.rs:373:9:373:9 | x |  |
+| main.rs:373:9:373:9 | x | main.rs:374:11:374:11 | x | match |
+| main.rs:373:13:373:16 | Some | main.rs:373:18:373:19 | 32 |  |
+| main.rs:373:13:373:20 | Some(...) | main.rs:373:9:373:9 | x |  |
+| main.rs:373:18:373:19 | 32 | main.rs:373:13:373:20 | Some(...) |  |
+| main.rs:374:5:380:5 | match x { ... } | main.rs:372:22:381:1 | { ... } |  |
+| main.rs:374:11:374:11 | x | main.rs:375:9:375:15 | Some(...) |  |
+| main.rs:375:9:375:15 | Some(...) | main.rs:375:14:375:14 | y | match |
+| main.rs:375:9:375:15 | Some(...) | main.rs:379:9:379:9 | _ | no-match |
+| main.rs:375:14:375:14 | y | main.rs:375:14:375:14 | y |  |
+| main.rs:375:14:375:14 | y | main.rs:377:17:377:20 | Some | match |
+| main.rs:376:16:377:23 | [boolean(false)] let ... = ... | main.rs:379:9:379:9 | _ | false |
+| main.rs:376:16:377:23 | [boolean(true)] let ... = ... | main.rs:378:16:378:24 | print_i64 | true |
+| main.rs:376:20:376:26 | Some(...) | main.rs:376:16:377:23 | [boolean(false)] let ... = ... | no-match |
+| main.rs:376:20:376:26 | Some(...) | main.rs:376:25:376:25 | y | match |
+| main.rs:376:25:376:25 | y | main.rs:376:16:377:23 | [boolean(true)] let ... = ... | match |
+| main.rs:376:25:376:25 | y | main.rs:376:25:376:25 | y |  |
+| main.rs:377:17:377:20 | Some | main.rs:377:22:377:22 | y |  |
+| main.rs:377:17:377:23 | Some(...) | main.rs:376:20:376:26 | Some(...) |  |
+| main.rs:377:22:377:22 | y | main.rs:377:17:377:23 | Some(...) |  |
+| main.rs:378:16:378:24 | print_i64 | main.rs:378:26:378:26 | y |  |
+| main.rs:378:16:378:27 | print_i64(...) | main.rs:374:5:380:5 | match x { ... } |  |
+| main.rs:378:26:378:26 | y | main.rs:378:16:378:27 | print_i64(...) |  |
+| main.rs:379:9:379:9 | _ | main.rs:379:14:379:15 | { ... } | match |
+| main.rs:379:14:379:15 | { ... } | main.rs:374:5:380:5 | match x { ... } |  |
+| main.rs:383:1:393:1 | enter fn param_pattern1 | main.rs:384:5:384:6 | a8 |  |
+| main.rs:383:1:393:1 | exit fn param_pattern1 (normal) | main.rs:383:1:393:1 | exit fn param_pattern1 |  |
+| main.rs:384:5:384:6 | a8 | main.rs:384:5:384:6 | a8 |  |
+| main.rs:384:5:384:6 | a8 | main.rs:384:5:384:12 | ...: ... | match |
+| main.rs:384:5:384:12 | ...: ... | main.rs:385:5:388:5 | TuplePat |  |
+| main.rs:385:5:388:5 | TuplePat | main.rs:386:9:386:10 | b3 | match |
+| main.rs:385:5:388:19 | ...: ... | main.rs:390:5:390:18 | ExprStmt |  |
+| main.rs:386:9:386:10 | b3 | main.rs:386:9:386:10 | b3 |  |
+| main.rs:386:9:386:10 | b3 | main.rs:387:9:387:10 | c1 | match |
+| main.rs:387:9:387:10 | c1 | main.rs:385:5:388:19 | ...: ... | match |
+| main.rs:387:9:387:10 | c1 | main.rs:387:9:387:10 | c1 |  |
+| main.rs:389:9:393:1 | { ... } | main.rs:383:1:393:1 | exit fn param_pattern1 (normal) |  |
+| main.rs:390:5:390:13 | print_str | main.rs:390:15:390:16 | a8 |  |
+| main.rs:390:5:390:17 | print_str(...) | main.rs:391:5:391:18 | ExprStmt |  |
+| main.rs:390:5:390:18 | ExprStmt | main.rs:390:5:390:13 | print_str |  |
+| main.rs:390:15:390:16 | a8 | main.rs:390:5:390:17 | print_str(...) |  |
+| main.rs:391:5:391:13 | print_str | main.rs:391:15:391:16 | b3 |  |
+| main.rs:391:5:391:17 | print_str(...) | main.rs:392:5:392:18 | ExprStmt |  |
+| main.rs:391:5:391:18 | ExprStmt | main.rs:391:5:391:13 | print_str |  |
+| main.rs:391:15:391:16 | b3 | main.rs:391:5:391:17 | print_str(...) |  |
+| main.rs:392:5:392:13 | print_str | main.rs:392:15:392:16 | c1 |  |
+| main.rs:392:5:392:17 | print_str(...) | main.rs:389:9:393:1 | { ... } |  |
+| main.rs:392:5:392:18 | ExprStmt | main.rs:392:5:392:13 | print_str |  |
+| main.rs:392:15:392:16 | c1 | main.rs:392:5:392:17 | print_str(...) |  |
+| main.rs:395:1:398:1 | enter fn param_pattern2 | main.rs:395:20:395:35 | ...::Left(...) |  |
+| main.rs:395:1:398:1 | exit fn param_pattern2 (normal) | main.rs:395:1:398:1 | exit fn param_pattern2 |  |
+| main.rs:395:19:395:64 | ...: Either | main.rs:397:5:397:18 | ExprStmt |  |
+| main.rs:395:20:395:35 | ...::Left(...) | main.rs:395:33:395:34 | a9 | match |
+| main.rs:395:20:395:35 | ...::Left(...) | main.rs:395:39:395:55 | ...::Right(...) | no-match |
+| main.rs:395:20:395:55 | ... \| ... | main.rs:395:19:395:64 | ...: Either | match |
+| main.rs:395:33:395:34 | a9 | main.rs:395:20:395:55 | ... \| ... | match |
+| main.rs:395:33:395:34 | a9 | main.rs:395:33:395:34 | a9 |  |
+| main.rs:395:39:395:55 | ...::Right(...) | main.rs:395:53:395:54 | a9 | match |
+| main.rs:395:53:395:54 | a9 | main.rs:395:20:395:55 | ... \| ... | match |
+| main.rs:395:53:395:54 | a9 | main.rs:395:53:395:54 | a9 |  |
+| main.rs:396:9:398:1 | { ... } | main.rs:395:1:398:1 | exit fn param_pattern2 (normal) |  |
+| main.rs:397:5:397:13 | print_i64 | main.rs:397:15:397:16 | a9 |  |
+| main.rs:397:5:397:17 | print_i64(...) | main.rs:396:9:398:1 | { ... } |  |
+| main.rs:397:5:397:18 | ExprStmt | main.rs:397:5:397:13 | print_i64 |  |
+| main.rs:397:15:397:16 | a9 | main.rs:397:5:397:17 | print_i64(...) |  |
+| main.rs:400:1:435:1 | enter fn destruct_assignment | main.rs:401:5:405:18 | let ... = ... |  |
+| main.rs:400:1:435:1 | exit fn destruct_assignment (normal) | main.rs:400:1:435:1 | exit fn destruct_assignment |  |
+| main.rs:400:26:435:1 | { ... } | main.rs:400:1:435:1 | exit fn destruct_assignment (normal) |  |
+| main.rs:401:5:405:18 | let ... = ... | main.rs:405:10:405:10 | 1 |  |
+| main.rs:401:9:405:5 | TuplePat | main.rs:402:13:402:15 | a10 | match |
+| main.rs:402:9:402:15 | mut a10 | main.rs:403:13:403:14 | b4 | match |
+| main.rs:402:13:402:15 | a10 | main.rs:402:9:402:15 | mut a10 |  |
+| main.rs:403:9:403:14 | mut b4 | main.rs:404:13:404:14 | c2 | match |
+| main.rs:403:13:403:14 | b4 | main.rs:403:9:403:14 | mut b4 |  |
+| main.rs:404:9:404:14 | mut c2 | main.rs:406:5:406:19 | ExprStmt | match |
+| main.rs:404:13:404:14 | c2 | main.rs:404:9:404:14 | mut c2 |  |
+| main.rs:405:9:405:17 | TupleExpr | main.rs:401:9:405:5 | TuplePat |  |
+| main.rs:405:10:405:10 | 1 | main.rs:405:13:405:13 | 2 |  |
+| main.rs:405:13:405:13 | 2 | main.rs:405:16:405:16 | 3 |  |
+| main.rs:405:16:405:16 | 3 | main.rs:405:9:405:17 | TupleExpr |  |
+| main.rs:406:5:406:13 | print_i64 | main.rs:406:15:406:17 | a10 |  |
+| main.rs:406:5:406:18 | print_i64(...) | main.rs:407:5:407:18 | ExprStmt |  |
+| main.rs:406:5:406:19 | ExprStmt | main.rs:406:5:406:13 | print_i64 |  |
+| main.rs:406:15:406:17 | a10 | main.rs:406:5:406:18 | print_i64(...) |  |
+| main.rs:407:5:407:13 | print_i64 | main.rs:407:15:407:16 | b4 |  |
+| main.rs:407:5:407:17 | print_i64(...) | main.rs:408:5:408:18 | ExprStmt |  |
+| main.rs:407:5:407:18 | ExprStmt | main.rs:407:5:407:13 | print_i64 |  |
+| main.rs:407:15:407:16 | b4 | main.rs:407:5:407:17 | print_i64(...) |  |
+| main.rs:408:5:408:13 | print_i64 | main.rs:408:15:408:16 | c2 |  |
+| main.rs:408:5:408:17 | print_i64(...) | main.rs:410:5:418:6 | ExprStmt |  |
+| main.rs:408:5:408:18 | ExprStmt | main.rs:408:5:408:13 | print_i64 |  |
+| main.rs:408:15:408:16 | c2 | main.rs:408:5:408:17 | print_i64(...) |  |
+| main.rs:410:5:414:5 | TupleExpr | main.rs:415:9:415:11 | a10 |  |
+| main.rs:410:5:418:5 | ... = ... | main.rs:419:5:419:19 | ExprStmt |  |
+| main.rs:410:5:418:6 | ExprStmt | main.rs:411:9:411:10 | c2 |  |
+| main.rs:411:9:411:10 | c2 | main.rs:412:9:412:10 | b4 |  |
+| main.rs:412:9:412:10 | b4 | main.rs:413:9:413:11 | a10 |  |
+| main.rs:413:9:413:11 | a10 | main.rs:410:5:414:5 | TupleExpr |  |
+| main.rs:414:9:418:5 | TupleExpr | main.rs:410:5:418:5 | ... = ... |  |
+| main.rs:415:9:415:11 | a10 | main.rs:416:9:416:10 | b4 |  |
+| main.rs:416:9:416:10 | b4 | main.rs:417:9:417:10 | c2 |  |
+| main.rs:417:9:417:10 | c2 | main.rs:414:9:418:5 | TupleExpr |  |
+| main.rs:419:5:419:13 | print_i64 | main.rs:419:15:419:17 | a10 |  |
+| main.rs:419:5:419:18 | print_i64(...) | main.rs:420:5:420:18 | ExprStmt |  |
+| main.rs:419:5:419:19 | ExprStmt | main.rs:419:5:419:13 | print_i64 |  |
+| main.rs:419:15:419:17 | a10 | main.rs:419:5:419:18 | print_i64(...) |  |
+| main.rs:420:5:420:13 | print_i64 | main.rs:420:15:420:16 | b4 |  |
+| main.rs:420:5:420:17 | print_i64(...) | main.rs:421:5:421:18 | ExprStmt |  |
+| main.rs:420:5:420:18 | ExprStmt | main.rs:420:5:420:13 | print_i64 |  |
+| main.rs:420:15:420:16 | b4 | main.rs:420:5:420:17 | print_i64(...) |  |
+| main.rs:421:5:421:13 | print_i64 | main.rs:421:15:421:16 | c2 |  |
+| main.rs:421:5:421:17 | print_i64(...) | main.rs:423:5:431:5 | ExprStmt |  |
+| main.rs:421:5:421:18 | ExprStmt | main.rs:421:5:421:13 | print_i64 |  |
+| main.rs:421:15:421:16 | c2 | main.rs:421:5:421:17 | print_i64(...) |  |
+| main.rs:423:5:431:5 | ExprStmt | main.rs:423:12:423:12 | 4 |  |
+| main.rs:423:5:431:5 | match ... { ... } | main.rs:433:5:433:19 | ExprStmt |  |
+| main.rs:423:11:423:16 | TupleExpr | main.rs:424:9:427:9 | TuplePat |  |
+| main.rs:423:12:423:12 | 4 | main.rs:423:15:423:15 | 5 |  |
+| main.rs:423:15:423:15 | 5 | main.rs:423:11:423:16 | TupleExpr |  |
+| main.rs:424:9:427:9 | TuplePat | main.rs:425:13:425:15 | a10 | match |
+| main.rs:425:13:425:15 | a10 | main.rs:425:13:425:15 | a10 |  |
+| main.rs:425:13:425:15 | a10 | main.rs:426:13:426:14 | b4 | match |
+| main.rs:426:13:426:14 | b4 | main.rs:426:13:426:14 | b4 |  |
+| main.rs:426:13:426:14 | b4 | main.rs:428:13:428:27 | ExprStmt | match |
+| main.rs:427:14:430:9 | { ... } | main.rs:423:5:431:5 | match ... { ... } |  |
+| main.rs:428:13:428:21 | print_i64 | main.rs:428:23:428:25 | a10 |  |
+| main.rs:428:13:428:26 | print_i64(...) | main.rs:429:13:429:26 | ExprStmt |  |
+| main.rs:428:13:428:27 | ExprStmt | main.rs:428:13:428:21 | print_i64 |  |
+| main.rs:428:23:428:25 | a10 | main.rs:428:13:428:26 | print_i64(...) |  |
+| main.rs:429:13:429:21 | print_i64 | main.rs:429:23:429:24 | b4 |  |
+| main.rs:429:13:429:25 | print_i64(...) | main.rs:427:14:430:9 | { ... } |  |
+| main.rs:429:13:429:26 | ExprStmt | main.rs:429:13:429:21 | print_i64 |  |
+| main.rs:429:23:429:24 | b4 | main.rs:429:13:429:25 | print_i64(...) |  |
+| main.rs:433:5:433:13 | print_i64 | main.rs:433:15:433:17 | a10 |  |
+| main.rs:433:5:433:18 | print_i64(...) | main.rs:434:5:434:18 | ExprStmt |  |
+| main.rs:433:5:433:19 | ExprStmt | main.rs:433:5:433:13 | print_i64 |  |
+| main.rs:433:15:433:17 | a10 | main.rs:433:5:433:18 | print_i64(...) |  |
+| main.rs:434:5:434:13 | print_i64 | main.rs:434:15:434:16 | b4 |  |
+| main.rs:434:5:434:17 | print_i64(...) | main.rs:400:26:435:1 | { ... } |  |
+| main.rs:434:5:434:18 | ExprStmt | main.rs:434:5:434:13 | print_i64 |  |
+| main.rs:434:15:434:16 | b4 | main.rs:434:5:434:17 | print_i64(...) |  |
+| main.rs:437:1:452:1 | enter fn closure_variable | main.rs:438:5:440:10 | let ... = ... |  |
+| main.rs:437:1:452:1 | exit fn closure_variable (normal) | main.rs:437:1:452:1 | exit fn closure_variable |  |
+| main.rs:437:23:452:1 | { ... } | main.rs:437:1:452:1 | exit fn closure_variable (normal) |  |
+| main.rs:438:5:440:10 | let ... = ... | main.rs:439:9:440:9 | \|...\| x |  |
+| main.rs:438:9:438:23 | example_closure | main.rs:438:9:438:23 | example_closure |  |
+| main.rs:438:9:438:23 | example_closure | main.rs:441:5:442:27 | let ... = ... | match |
+| main.rs:439:9:440:9 | \|...\| x | main.rs:438:9:438:23 | example_closure |  |
+| main.rs:439:9:440:9 | enter \|...\| x | main.rs:439:10:439:10 | x |  |
+| main.rs:439:9:440:9 | exit \|...\| x (normal) | main.rs:439:9:440:9 | exit \|...\| x |  |
+| main.rs:439:10:439:10 | x | main.rs:439:10:439:10 | x |  |
+| main.rs:439:10:439:10 | x | main.rs:439:10:439:15 | ...: i64 | match |
+| main.rs:439:10:439:15 | ...: i64 | main.rs:440:9:440:9 | x |  |
+| main.rs:440:9:440:9 | x | main.rs:439:9:440:9 | exit \|...\| x (normal) |  |
+| main.rs:441:5:442:27 | let ... = ... | main.rs:442:9:442:23 | example_closure |  |
+| main.rs:441:9:441:10 | n1 | main.rs:441:9:441:10 | n1 |  |
+| main.rs:441:9:441:10 | n1 | main.rs:443:5:443:18 | ExprStmt | match |
+| main.rs:442:9:442:23 | example_closure | main.rs:442:25:442:25 | 5 |  |
+| main.rs:442:9:442:26 | example_closure(...) | main.rs:441:9:441:10 | n1 |  |
+| main.rs:442:25:442:25 | 5 | main.rs:442:9:442:26 | example_closure(...) |  |
+| main.rs:443:5:443:13 | print_i64 | main.rs:443:15:443:16 | n1 |  |
+| main.rs:443:5:443:17 | print_i64(...) | main.rs:445:5:445:25 | ExprStmt |  |
+| main.rs:443:5:443:18 | ExprStmt | main.rs:443:5:443:13 | print_i64 |  |
+| main.rs:443:15:443:16 | n1 | main.rs:443:5:443:17 | print_i64(...) |  |
+| main.rs:445:5:445:22 | immutable_variable | main.rs:445:5:445:24 | immutable_variable(...) |  |
+| main.rs:445:5:445:24 | immutable_variable(...) | main.rs:446:5:448:10 | let ... = ... |  |
+| main.rs:445:5:445:25 | ExprStmt | main.rs:445:5:445:22 | immutable_variable |  |
+| main.rs:446:5:448:10 | let ... = ... | main.rs:447:5:448:9 | \|...\| x |  |
+| main.rs:446:9:446:26 | immutable_variable | main.rs:446:9:446:26 | immutable_variable |  |
+| main.rs:446:9:446:26 | immutable_variable | main.rs:449:5:450:30 | let ... = ... | match |
+| main.rs:447:5:448:9 | \|...\| x | main.rs:446:9:446:26 | immutable_variable |  |
+| main.rs:447:5:448:9 | enter \|...\| x | main.rs:447:6:447:6 | x |  |
+| main.rs:447:5:448:9 | exit \|...\| x (normal) | main.rs:447:5:448:9 | exit \|...\| x |  |
+| main.rs:447:6:447:6 | x | main.rs:447:6:447:6 | x |  |
+| main.rs:447:6:447:6 | x | main.rs:447:6:447:11 | ...: i64 | match |
+| main.rs:447:6:447:11 | ...: i64 | main.rs:448:9:448:9 | x |  |
+| main.rs:448:9:448:9 | x | main.rs:447:5:448:9 | exit \|...\| x (normal) |  |
+| main.rs:449:5:450:30 | let ... = ... | main.rs:450:9:450:26 | immutable_variable |  |
+| main.rs:449:9:449:10 | n2 | main.rs:449:9:449:10 | n2 |  |
+| main.rs:449:9:449:10 | n2 | main.rs:451:5:451:18 | ExprStmt | match |
+| main.rs:450:9:450:26 | immutable_variable | main.rs:450:28:450:28 | 6 |  |
+| main.rs:450:9:450:29 | immutable_variable(...) | main.rs:449:9:449:10 | n2 |  |
+| main.rs:450:28:450:28 | 6 | main.rs:450:9:450:29 | immutable_variable(...) |  |
+| main.rs:451:5:451:13 | print_i64 | main.rs:451:15:451:16 | n2 |  |
+| main.rs:451:5:451:17 | print_i64(...) | main.rs:437:23:452:1 | { ... } |  |
+| main.rs:451:5:451:18 | ExprStmt | main.rs:451:5:451:13 | print_i64 |  |
+| main.rs:451:15:451:16 | n2 | main.rs:451:5:451:17 | print_i64(...) |  |
+| main.rs:454:1:484:1 | enter fn nested_function | main.rs:456:5:458:10 | let ... = ... |  |
+| main.rs:454:1:484:1 | exit fn nested_function (normal) | main.rs:454:1:484:1 | exit fn nested_function |  |
+| main.rs:454:22:484:1 | { ... } | main.rs:454:1:484:1 | exit fn nested_function (normal) |  |
+| main.rs:456:5:458:10 | let ... = ... | main.rs:457:9:458:9 | \|...\| x |  |
+| main.rs:456:9:456:9 | f | main.rs:456:9:456:9 | f |  |
+| main.rs:456:9:456:9 | f | main.rs:459:5:459:20 | ExprStmt | match |
+| main.rs:457:9:458:9 | \|...\| x | main.rs:456:9:456:9 | f |  |
+| main.rs:457:9:458:9 | enter \|...\| x | main.rs:457:10:457:10 | x |  |
+| main.rs:457:9:458:9 | exit \|...\| x (normal) | main.rs:457:9:458:9 | exit \|...\| x |  |
+| main.rs:457:10:457:10 | x | main.rs:457:10:457:10 | x |  |
+| main.rs:457:10:457:10 | x | main.rs:457:10:457:15 | ...: i64 | match |
+| main.rs:457:10:457:15 | ...: i64 | main.rs:458:9:458:9 | x |  |
+| main.rs:458:9:458:9 | x | main.rs:457:9:458:9 | exit \|...\| x (normal) |  |
+| main.rs:459:5:459:13 | print_i64 | main.rs:459:15:459:15 | f |  |
+| main.rs:459:5:459:19 | print_i64(...) | main.rs:461:5:464:5 | fn f |  |
+| main.rs:459:5:459:20 | ExprStmt | main.rs:459:5:459:13 | print_i64 |  |
+| main.rs:459:15:459:15 | f | main.rs:459:17:459:17 | 1 |  |
+| main.rs:459:15:459:18 | f(...) | main.rs:459:5:459:19 | print_i64(...) |  |
+| main.rs:459:17:459:17 | 1 | main.rs:459:15:459:18 | f(...) |  |
+| main.rs:461:5:464:5 | enter fn f | main.rs:461:10:461:10 | x |  |
+| main.rs:461:5:464:5 | exit fn f (normal) | main.rs:461:5:464:5 | exit fn f |  |
+| main.rs:461:5:464:5 | fn f | main.rs:466:5:466:20 | ExprStmt |  |
+| main.rs:461:10:461:10 | x | main.rs:461:10:461:10 | x |  |
+| main.rs:461:10:461:10 | x | main.rs:461:10:461:15 | ...: i64 | match |
+| main.rs:461:10:461:15 | ...: i64 | main.rs:463:9:463:9 | x |  |
+| main.rs:462:5:464:5 | { ... } | main.rs:461:5:464:5 | exit fn f (normal) |  |
+| main.rs:463:9:463:9 | x | main.rs:463:13:463:13 | 1 |  |
+| main.rs:463:9:463:13 | ... + ... | main.rs:462:5:464:5 | { ... } |  |
+| main.rs:463:13:463:13 | 1 | main.rs:463:9:463:13 | ... + ... |  |
+| main.rs:466:5:466:13 | print_i64 | main.rs:466:15:466:15 | f |  |
+| main.rs:466:5:466:19 | print_i64(...) | main.rs:469:9:469:24 | ExprStmt |  |
+| main.rs:466:5:466:20 | ExprStmt | main.rs:466:5:466:13 | print_i64 |  |
+| main.rs:466:15:466:15 | f | main.rs:466:17:466:17 | 2 |  |
+| main.rs:466:15:466:18 | f(...) | main.rs:466:5:466:19 | print_i64(...) |  |
+| main.rs:466:17:466:17 | 2 | main.rs:466:15:466:18 | f(...) |  |
+| main.rs:468:5:483:5 | { ... } | main.rs:454:22:484:1 | { ... } |  |
+| main.rs:469:9:469:17 | print_i64 | main.rs:469:19:469:19 | f |  |
+| main.rs:469:9:469:23 | print_i64(...) | main.rs:470:9:473:9 | fn f |  |
+| main.rs:469:9:469:24 | ExprStmt | main.rs:469:9:469:17 | print_i64 |  |
+| main.rs:469:19:469:19 | f | main.rs:469:21:469:21 | 3 |  |
+| main.rs:469:19:469:22 | f(...) | main.rs:469:9:469:23 | print_i64(...) |  |
+| main.rs:469:21:469:21 | 3 | main.rs:469:19:469:22 | f(...) |  |
+| main.rs:470:9:473:9 | enter fn f | main.rs:470:14:470:14 | x |  |
+| main.rs:470:9:473:9 | exit fn f (normal) | main.rs:470:9:473:9 | exit fn f |  |
+| main.rs:470:9:473:9 | fn f | main.rs:475:9:477:9 | ExprStmt |  |
+| main.rs:470:14:470:14 | x | main.rs:470:14:470:14 | x |  |
+| main.rs:470:14:470:14 | x | main.rs:470:14:470:19 | ...: i64 | match |
+| main.rs:470:14:470:19 | ...: i64 | main.rs:472:13:472:13 | 2 |  |
+| main.rs:471:9:473:9 | { ... } | main.rs:470:9:473:9 | exit fn f (normal) |  |
+| main.rs:472:13:472:13 | 2 | main.rs:472:17:472:17 | x |  |
+| main.rs:472:13:472:17 | ... * ... | main.rs:471:9:473:9 | { ... } |  |
+| main.rs:472:17:472:17 | x | main.rs:472:13:472:17 | ... * ... |  |
+| main.rs:475:9:477:9 | ExprStmt | main.rs:476:13:476:28 | ExprStmt |  |
+| main.rs:475:9:477:9 | { ... } | main.rs:479:9:481:14 | let ... = ... |  |
+| main.rs:476:13:476:21 | print_i64 | main.rs:476:23:476:23 | f |  |
+| main.rs:476:13:476:27 | print_i64(...) | main.rs:475:9:477:9 | { ... } |  |
+| main.rs:476:13:476:28 | ExprStmt | main.rs:476:13:476:21 | print_i64 |  |
+| main.rs:476:23:476:23 | f | main.rs:476:25:476:25 | 4 |  |
+| main.rs:476:23:476:26 | f(...) | main.rs:476:13:476:27 | print_i64(...) |  |
+| main.rs:476:25:476:25 | 4 | main.rs:476:23:476:26 | f(...) |  |
+| main.rs:479:9:481:14 | let ... = ... | main.rs:480:13:481:13 | \|...\| x |  |
+| main.rs:479:13:479:13 | f | main.rs:479:13:479:13 | f |  |
+| main.rs:479:13:479:13 | f | main.rs:482:9:482:24 | ExprStmt | match |
+| main.rs:480:13:481:13 | \|...\| x | main.rs:479:13:479:13 | f |  |
+| main.rs:480:13:481:13 | enter \|...\| x | main.rs:480:14:480:14 | x |  |
+| main.rs:480:13:481:13 | exit \|...\| x (normal) | main.rs:480:13:481:13 | exit \|...\| x |  |
+| main.rs:480:14:480:14 | x | main.rs:480:14:480:14 | x |  |
+| main.rs:480:14:480:14 | x | main.rs:480:14:480:19 | ...: i64 | match |
+| main.rs:480:14:480:19 | ...: i64 | main.rs:481:13:481:13 | x |  |
+| main.rs:481:13:481:13 | x | main.rs:480:13:481:13 | exit \|...\| x (normal) |  |
+| main.rs:482:9:482:17 | print_i64 | main.rs:482:19:482:19 | f |  |
+| main.rs:482:9:482:23 | print_i64(...) | main.rs:468:5:483:5 | { ... } |  |
+| main.rs:482:9:482:24 | ExprStmt | main.rs:482:9:482:17 | print_i64 |  |
+| main.rs:482:19:482:19 | f | main.rs:482:21:482:21 | 5 |  |
+| main.rs:482:19:482:22 | f(...) | main.rs:482:9:482:23 | print_i64(...) |  |
+| main.rs:482:21:482:21 | 5 | main.rs:482:19:482:22 | f(...) |  |
+| main.rs:486:1:493:1 | enter fn for_variable | main.rs:487:5:487:42 | let ... = ... |  |
+| main.rs:486:1:493:1 | exit fn for_variable (normal) | main.rs:486:1:493:1 | exit fn for_variable |  |
+| main.rs:486:19:493:1 | { ... } | main.rs:486:1:493:1 | exit fn for_variable (normal) |  |
+| main.rs:487:5:487:42 | let ... = ... | main.rs:487:15:487:22 | "apples" |  |
+| main.rs:487:9:487:9 | v | main.rs:487:9:487:9 | v |  |
+| main.rs:487:9:487:9 | v | main.rs:490:12:490:12 | v | match |
+| main.rs:487:13:487:41 | &... | main.rs:487:9:487:9 | v |  |
+| main.rs:487:14:487:41 | [...] | main.rs:487:13:487:41 | &... |  |
+| main.rs:487:15:487:22 | "apples" | main.rs:487:25:487:30 | "cake" |  |
+| main.rs:487:25:487:30 | "cake" | main.rs:487:33:487:40 | "coffee" |  |
+| main.rs:487:33:487:40 | "coffee" | main.rs:487:14:487:41 | [...] |  |
+| main.rs:489:5:492:5 | for ... in ... { ... } | main.rs:486:19:493:1 | { ... } |  |
+| main.rs:489:9:489:12 | text | main.rs:489:5:492:5 | for ... in ... { ... } | no-match |
+| main.rs:489:9:489:12 | text | main.rs:489:9:489:12 | text |  |
+| main.rs:489:9:489:12 | text | main.rs:491:9:491:24 | ExprStmt | match |
+| main.rs:490:12:490:12 | v | main.rs:489:9:489:12 | text |  |
+| main.rs:490:14:492:5 | { ... } | main.rs:489:9:489:12 | text |  |
+| main.rs:491:9:491:17 | print_str | main.rs:491:19:491:22 | text |  |
+| main.rs:491:9:491:23 | print_str(...) | main.rs:490:14:492:5 | { ... } |  |
+| main.rs:491:9:491:24 | ExprStmt | main.rs:491:9:491:17 | print_str |  |
+| main.rs:491:19:491:22 | text | main.rs:491:9:491:23 | print_str(...) |  |
+| main.rs:495:1:501:1 | enter fn add_assign | main.rs:496:5:496:18 | let ... = 0 |  |
+| main.rs:495:1:501:1 | exit fn add_assign (normal) | main.rs:495:1:501:1 | exit fn add_assign |  |
+| main.rs:495:17:501:1 | { ... } | main.rs:495:1:501:1 | exit fn add_assign (normal) |  |
+| main.rs:496:5:496:18 | let ... = 0 | main.rs:496:17:496:17 | 0 |  |
+| main.rs:496:9:496:13 | mut a | main.rs:497:5:497:11 | ExprStmt | match |
+| main.rs:496:13:496:13 | a | main.rs:496:9:496:13 | mut a |  |
+| main.rs:496:17:496:17 | 0 | main.rs:496:13:496:13 | a |  |
+| main.rs:497:5:497:5 | a | main.rs:497:10:497:10 | 1 |  |
+| main.rs:497:5:497:10 | ... += ... | main.rs:498:5:498:17 | ExprStmt |  |
+| main.rs:497:5:497:11 | ExprStmt | main.rs:497:5:497:5 | a |  |
+| main.rs:497:10:497:10 | 1 | main.rs:497:5:497:10 | ... += ... |  |
+| main.rs:498:5:498:13 | print_i64 | main.rs:498:15:498:15 | a |  |
+| main.rs:498:5:498:16 | print_i64(...) | main.rs:499:5:499:28 | ExprStmt |  |
+| main.rs:498:5:498:17 | ExprStmt | main.rs:498:5:498:13 | print_i64 |  |
+| main.rs:498:15:498:15 | a | main.rs:498:5:498:16 | print_i64(...) |  |
+| main.rs:499:5:499:27 | ... .add_assign(...) | main.rs:500:5:500:17 | ExprStmt |  |
+| main.rs:499:5:499:28 | ExprStmt | main.rs:499:11:499:11 | a |  |
+| main.rs:499:6:499:11 | &mut a | main.rs:499:25:499:26 | 10 |  |
+| main.rs:499:11:499:11 | a | main.rs:499:6:499:11 | &mut a |  |
+| main.rs:499:25:499:26 | 10 | main.rs:499:5:499:27 | ... .add_assign(...) |  |
+| main.rs:500:5:500:13 | print_i64 | main.rs:500:15:500:15 | a |  |
+| main.rs:500:5:500:16 | print_i64(...) | main.rs:495:17:501:1 | { ... } |  |
+| main.rs:500:5:500:17 | ExprStmt | main.rs:500:5:500:13 | print_i64 |  |
+| main.rs:500:15:500:15 | a | main.rs:500:5:500:16 | print_i64(...) |  |
+| main.rs:503:1:509:1 | enter fn mutate | main.rs:504:5:504:18 | let ... = 1 |  |
+| main.rs:503:1:509:1 | exit fn mutate (normal) | main.rs:503:1:509:1 | exit fn mutate |  |
+| main.rs:503:13:509:1 | { ... } | main.rs:503:1:509:1 | exit fn mutate (normal) |  |
+| main.rs:504:5:504:18 | let ... = 1 | main.rs:504:17:504:17 | 1 |  |
+| main.rs:504:9:504:13 | mut i | main.rs:505:5:506:15 | let ... = ... | match |
+| main.rs:504:13:504:13 | i | main.rs:504:9:504:13 | mut i |  |
+| main.rs:504:17:504:17 | 1 | main.rs:504:13:504:13 | i |  |
+| main.rs:505:5:506:15 | let ... = ... | main.rs:506:14:506:14 | i |  |
+| main.rs:505:9:505:13 | ref_i | main.rs:505:9:505:13 | ref_i |  |
+| main.rs:505:9:505:13 | ref_i | main.rs:507:5:507:15 | ExprStmt | match |
+| main.rs:506:9:506:14 | &mut i | main.rs:505:9:505:13 | ref_i |  |
+| main.rs:506:14:506:14 | i | main.rs:506:9:506:14 | &mut i |  |
+| main.rs:507:5:507:10 | * ... | main.rs:507:14:507:14 | 2 |  |
+| main.rs:507:5:507:14 | ... = ... | main.rs:508:5:508:17 | ExprStmt |  |
+| main.rs:507:5:507:15 | ExprStmt | main.rs:507:6:507:10 | ref_i |  |
+| main.rs:507:6:507:10 | ref_i | main.rs:507:5:507:10 | * ... |  |
+| main.rs:507:14:507:14 | 2 | main.rs:507:5:507:14 | ... = ... |  |
+| main.rs:508:5:508:13 | print_i64 | main.rs:508:15:508:15 | i |  |
+| main.rs:508:5:508:16 | print_i64(...) | main.rs:503:13:509:1 | { ... } |  |
+| main.rs:508:5:508:17 | ExprStmt | main.rs:508:5:508:13 | print_i64 |  |
+| main.rs:508:15:508:15 | i | main.rs:508:5:508:16 | print_i64(...) |  |
+| main.rs:511:1:516:1 | enter fn mutate_param | main.rs:511:17:511:17 | x |  |
+| main.rs:511:1:516:1 | exit fn mutate_param (normal) | main.rs:511:1:516:1 | exit fn mutate_param |  |
+| main.rs:511:17:511:17 | x | main.rs:511:17:511:17 | x |  |
+| main.rs:511:17:511:17 | x | main.rs:511:17:511:27 | ...: ... | match |
+| main.rs:511:17:511:27 | ...: ... | main.rs:512:5:514:11 | ExprStmt |  |
+| main.rs:512:5:512:6 | * ... | main.rs:513:10:513:10 | x |  |
+| main.rs:512:5:514:10 | ... = ... | main.rs:515:5:515:13 | ExprStmt |  |
+| main.rs:512:5:514:11 | ExprStmt | main.rs:512:6:512:6 | x |  |
+| main.rs:512:6:512:6 | x | main.rs:512:5:512:6 | * ... |  |
+| main.rs:513:9:513:10 | * ... | main.rs:514:10:514:10 | x |  |
+| main.rs:513:9:514:10 | ... + ... | main.rs:512:5:514:10 | ... = ... |  |
+| main.rs:513:10:513:10 | x | main.rs:513:9:513:10 | * ... |  |
+| main.rs:514:9:514:10 | * ... | main.rs:513:9:514:10 | ... + ... |  |
+| main.rs:514:10:514:10 | x | main.rs:514:9:514:10 | * ... |  |
+| main.rs:515:5:515:12 | return x | main.rs:511:1:516:1 | exit fn mutate_param (normal) | return |
+| main.rs:515:5:515:13 | ExprStmt | main.rs:515:12:515:12 | x |  |
+| main.rs:515:12:515:12 | x | main.rs:515:5:515:12 | return x |  |
+| main.rs:518:1:524:1 | enter fn mutate_param2 | main.rs:518:22:518:22 | x |  |
+| main.rs:518:1:524:1 | exit fn mutate_param2 (normal) | main.rs:518:1:524:1 | exit fn mutate_param2 |  |
+| main.rs:518:22:518:22 | x | main.rs:518:22:518:22 | x |  |
+| main.rs:518:22:518:22 | x | main.rs:518:22:518:35 | ...: ... | match |
+| main.rs:518:22:518:35 | ...: ... | main.rs:518:38:518:38 | y |  |
+| main.rs:518:38:518:38 | y | main.rs:518:38:518:38 | y |  |
+| main.rs:518:38:518:38 | y | main.rs:518:38:518:56 | ...: ... | match |
+| main.rs:518:38:518:56 | ...: ... | main.rs:519:5:521:11 | ExprStmt |  |
+| main.rs:518:59:524:1 | { ... } | main.rs:518:1:524:1 | exit fn mutate_param2 (normal) |  |
+| main.rs:519:5:519:6 | * ... | main.rs:520:10:520:10 | x |  |
+| main.rs:519:5:521:10 | ... = ... | main.rs:522:5:523:10 | ExprStmt |  |
+| main.rs:519:5:521:11 | ExprStmt | main.rs:519:6:519:6 | x |  |
+| main.rs:519:6:519:6 | x | main.rs:519:5:519:6 | * ... |  |
+| main.rs:520:9:520:10 | * ... | main.rs:521:10:521:10 | x |  |
+| main.rs:520:9:521:10 | ... + ... | main.rs:519:5:521:10 | ... = ... |  |
+| main.rs:520:10:520:10 | x | main.rs:520:9:520:10 | * ... |  |
+| main.rs:521:9:521:10 | * ... | main.rs:520:9:521:10 | ... + ... |  |
+| main.rs:521:10:521:10 | x | main.rs:521:9:521:10 | * ... |  |
+| main.rs:522:5:522:6 | * ... | main.rs:523:9:523:9 | x |  |
+| main.rs:522:5:523:9 | ... = ... | main.rs:518:59:524:1 | { ... } |  |
+| main.rs:522:5:523:10 | ExprStmt | main.rs:522:6:522:6 | y |  |
+| main.rs:522:6:522:6 | y | main.rs:522:5:522:6 | * ... |  |
+| main.rs:523:9:523:9 | x | main.rs:522:5:523:9 | ... = ... |  |
+| main.rs:526:1:546:1 | enter fn mutate_arg | main.rs:527:5:527:18 | let ... = 2 |  |
+| main.rs:526:1:546:1 | exit fn mutate_arg (normal) | main.rs:526:1:546:1 | exit fn mutate_arg |  |
+| main.rs:526:17:546:1 | { ... } | main.rs:526:1:546:1 | exit fn mutate_arg (normal) |  |
+| main.rs:527:5:527:18 | let ... = 2 | main.rs:527:17:527:17 | 2 |  |
+| main.rs:527:9:527:13 | mut x | main.rs:528:5:529:29 | let ... = ... | match |
+| main.rs:527:13:527:13 | x | main.rs:527:9:527:13 | mut x |  |
+| main.rs:527:17:527:17 | 2 | main.rs:527:13:527:13 | x |  |
+| main.rs:528:5:529:29 | let ... = ... | main.rs:529:9:529:20 | mutate_param |  |
+| main.rs:528:9:528:9 | y | main.rs:528:9:528:9 | y |  |
+| main.rs:528:9:528:9 | y | main.rs:530:5:530:12 | ExprStmt | match |
+| main.rs:529:9:529:20 | mutate_param | main.rs:529:27:529:27 | x |  |
+| main.rs:529:9:529:28 | mutate_param(...) | main.rs:528:9:528:9 | y |  |
+| main.rs:529:22:529:27 | &mut x | main.rs:529:9:529:28 | mutate_param(...) |  |
+| main.rs:529:27:529:27 | x | main.rs:529:22:529:27 | &mut x |  |
+| main.rs:530:5:530:6 | * ... | main.rs:530:10:530:11 | 10 |  |
+| main.rs:530:5:530:11 | ... = ... | main.rs:533:5:533:17 | ExprStmt |  |
+| main.rs:530:5:530:12 | ExprStmt | main.rs:530:6:530:6 | y |  |
+| main.rs:530:6:530:6 | y | main.rs:530:5:530:6 | * ... |  |
+| main.rs:530:10:530:11 | 10 | main.rs:530:5:530:11 | ... = ... |  |
+| main.rs:533:5:533:13 | print_i64 | main.rs:533:15:533:15 | x |  |
+| main.rs:533:5:533:16 | print_i64(...) | main.rs:535:5:535:18 | let ... = 4 |  |
+| main.rs:533:5:533:17 | ExprStmt | main.rs:533:5:533:13 | print_i64 |  |
+| main.rs:533:15:533:15 | x | main.rs:533:5:533:16 | print_i64(...) |  |
+| main.rs:535:5:535:18 | let ... = 4 | main.rs:535:17:535:17 | 4 |  |
+| main.rs:535:9:535:13 | mut z | main.rs:536:5:537:20 | let ... = ... | match |
+| main.rs:535:13:535:13 | z | main.rs:535:9:535:13 | mut z |  |
+| main.rs:535:17:535:17 | 4 | main.rs:535:13:535:13 | z |  |
+| main.rs:536:5:537:20 | let ... = ... | main.rs:537:19:537:19 | x |  |
+| main.rs:536:9:536:9 | w | main.rs:536:9:536:9 | w |  |
+| main.rs:536:9:536:9 | w | main.rs:538:5:541:6 | ExprStmt | match |
+| main.rs:537:9:537:19 | &mut ... | main.rs:536:9:536:9 | w |  |
+| main.rs:537:14:537:19 | &mut x | main.rs:537:9:537:19 | &mut ... |  |
+| main.rs:537:19:537:19 | x | main.rs:537:14:537:19 | &mut x |  |
+| main.rs:538:5:538:17 | mutate_param2 | main.rs:539:14:539:14 | z |  |
+| main.rs:538:5:541:5 | mutate_param2(...) | main.rs:542:5:542:13 | ExprStmt |  |
+| main.rs:538:5:541:6 | ExprStmt | main.rs:538:5:538:17 | mutate_param2 |  |
+| main.rs:539:9:539:14 | &mut z | main.rs:540:9:540:9 | w |  |
+| main.rs:539:14:539:14 | z | main.rs:539:9:539:14 | &mut z |  |
+| main.rs:540:9:540:9 | w | main.rs:538:5:541:5 | mutate_param2(...) |  |
+| main.rs:542:5:542:7 | * ... | main.rs:542:11:542:12 | 11 |  |
+| main.rs:542:5:542:12 | ... = ... | main.rs:545:5:545:17 | ExprStmt |  |
+| main.rs:542:5:542:13 | ExprStmt | main.rs:542:7:542:7 | w |  |
+| main.rs:542:6:542:7 | * ... | main.rs:542:5:542:7 | * ... |  |
+| main.rs:542:7:542:7 | w | main.rs:542:6:542:7 | * ... |  |
+| main.rs:542:11:542:12 | 11 | main.rs:542:5:542:12 | ... = ... |  |
+| main.rs:545:5:545:13 | print_i64 | main.rs:545:15:545:15 | z |  |
+| main.rs:545:5:545:16 | print_i64(...) | main.rs:526:17:546:1 | { ... } |  |
+| main.rs:545:5:545:17 | ExprStmt | main.rs:545:5:545:13 | print_i64 |  |
+| main.rs:545:15:545:15 | z | main.rs:545:5:545:16 | print_i64(...) |  |
+| main.rs:548:1:554:1 | enter fn alias | main.rs:549:5:549:18 | let ... = 1 |  |
+| main.rs:548:1:554:1 | exit fn alias (normal) | main.rs:548:1:554:1 | exit fn alias |  |
+| main.rs:548:12:554:1 | { ... } | main.rs:548:1:554:1 | exit fn alias (normal) |  |
+| main.rs:549:5:549:18 | let ... = 1 | main.rs:549:17:549:17 | 1 |  |
+| main.rs:549:9:549:13 | mut x | main.rs:550:5:551:15 | let ... = ... | match |
+| main.rs:549:13:549:13 | x | main.rs:549:9:549:13 | mut x |  |
+| main.rs:549:17:549:17 | 1 | main.rs:549:13:549:13 | x |  |
+| main.rs:550:5:551:15 | let ... = ... | main.rs:551:14:551:14 | x |  |
+| main.rs:550:9:550:9 | y | main.rs:550:9:550:9 | y |  |
+| main.rs:550:9:550:9 | y | main.rs:552:5:552:11 | ExprStmt | match |
+| main.rs:551:9:551:14 | &mut x | main.rs:550:9:550:9 | y |  |
+| main.rs:551:14:551:14 | x | main.rs:551:9:551:14 | &mut x |  |
+| main.rs:552:5:552:6 | * ... | main.rs:552:10:552:10 | 2 |  |
+| main.rs:552:5:552:10 | ... = ... | main.rs:553:5:553:17 | ExprStmt |  |
+| main.rs:552:5:552:11 | ExprStmt | main.rs:552:6:552:6 | y |  |
+| main.rs:552:6:552:6 | y | main.rs:552:5:552:6 | * ... |  |
+| main.rs:552:10:552:10 | 2 | main.rs:552:5:552:10 | ... = ... |  |
+| main.rs:553:5:553:13 | print_i64 | main.rs:553:15:553:15 | x |  |
+| main.rs:553:5:553:16 | print_i64(...) | main.rs:548:12:554:1 | { ... } |  |
+| main.rs:553:5:553:17 | ExprStmt | main.rs:553:5:553:13 | print_i64 |  |
+| main.rs:553:15:553:15 | x | main.rs:553:5:553:16 | print_i64(...) |  |
+| main.rs:556:1:565:1 | enter fn capture_immut | main.rs:557:5:557:16 | let ... = 100 |  |
+| main.rs:556:1:565:1 | exit fn capture_immut (normal) | main.rs:556:1:565:1 | exit fn capture_immut |  |
+| main.rs:556:20:565:1 | { ... } | main.rs:556:1:565:1 | exit fn capture_immut (normal) |  |
+| main.rs:557:5:557:16 | let ... = 100 | main.rs:557:13:557:15 | 100 |  |
+| main.rs:557:9:557:9 | x | main.rs:557:9:557:9 | x |  |
+| main.rs:557:9:557:9 | x | main.rs:560:5:562:6 | let ... = ... | match |
+| main.rs:557:13:557:15 | 100 | main.rs:557:9:557:9 | x |  |
+| main.rs:560:5:562:6 | let ... = ... | main.rs:560:15:562:5 | \|...\| ... |  |
+| main.rs:560:9:560:11 | cap | main.rs:560:9:560:11 | cap |  |
+| main.rs:560:9:560:11 | cap | main.rs:563:5:563:10 | ExprStmt | match |
+| main.rs:560:15:562:5 | \|...\| ... | main.rs:560:9:560:11 | cap |  |
+| main.rs:560:15:562:5 | enter \|...\| ... | main.rs:561:9:561:21 | ExprStmt |  |
+| main.rs:560:15:562:5 | exit \|...\| ... (normal) | main.rs:560:15:562:5 | exit \|...\| ... |  |
+| main.rs:560:18:562:5 | { ... } | main.rs:560:15:562:5 | exit \|...\| ... (normal) |  |
+| main.rs:561:9:561:17 | print_i64 | main.rs:561:19:561:19 | x |  |
+| main.rs:561:9:561:20 | print_i64(...) | main.rs:560:18:562:5 | { ... } |  |
+| main.rs:561:9:561:21 | ExprStmt | main.rs:561:9:561:17 | print_i64 |  |
+| main.rs:561:19:561:19 | x | main.rs:561:9:561:20 | print_i64(...) |  |
+| main.rs:563:5:563:7 | cap | main.rs:563:5:563:9 | cap(...) |  |
+| main.rs:563:5:563:9 | cap(...) | main.rs:564:5:564:17 | ExprStmt |  |
+| main.rs:563:5:563:10 | ExprStmt | main.rs:563:5:563:7 | cap |  |
+| main.rs:564:5:564:13 | print_i64 | main.rs:564:15:564:15 | x |  |
+| main.rs:564:5:564:16 | print_i64(...) | main.rs:556:20:565:1 | { ... } |  |
+| main.rs:564:5:564:17 | ExprStmt | main.rs:564:5:564:13 | print_i64 |  |
+| main.rs:564:15:564:15 | x | main.rs:564:5:564:16 | print_i64(...) |  |
+| main.rs:567:1:594:1 | enter fn capture_mut | main.rs:568:5:568:18 | let ... = 1 |  |
+| main.rs:567:1:594:1 | exit fn capture_mut (normal) | main.rs:567:1:594:1 | exit fn capture_mut |  |
+| main.rs:567:18:594:1 | { ... } | main.rs:567:1:594:1 | exit fn capture_mut (normal) |  |
+| main.rs:568:5:568:18 | let ... = 1 | main.rs:568:17:568:17 | 1 |  |
+| main.rs:568:9:568:13 | mut x | main.rs:571:5:573:6 | let ... = ... | match |
+| main.rs:568:13:568:13 | x | main.rs:568:9:568:13 | mut x |  |
+| main.rs:568:17:568:17 | 1 | main.rs:568:13:568:13 | x |  |
+| main.rs:571:5:573:6 | let ... = ... | main.rs:571:20:573:5 | \|...\| ... |  |
+| main.rs:571:9:571:16 | closure1 | main.rs:571:9:571:16 | closure1 |  |
+| main.rs:571:9:571:16 | closure1 | main.rs:574:5:574:15 | ExprStmt | match |
+| main.rs:571:20:573:5 | \|...\| ... | main.rs:571:9:571:16 | closure1 |  |
+| main.rs:571:20:573:5 | enter \|...\| ... | main.rs:572:9:572:21 | ExprStmt |  |
+| main.rs:571:20:573:5 | exit \|...\| ... (normal) | main.rs:571:20:573:5 | exit \|...\| ... |  |
+| main.rs:571:23:573:5 | { ... } | main.rs:571:20:573:5 | exit \|...\| ... (normal) |  |
+| main.rs:572:9:572:17 | print_i64 | main.rs:572:19:572:19 | x |  |
+| main.rs:572:9:572:20 | print_i64(...) | main.rs:571:23:573:5 | { ... } |  |
+| main.rs:572:9:572:21 | ExprStmt | main.rs:572:9:572:17 | print_i64 |  |
+| main.rs:572:19:572:19 | x | main.rs:572:9:572:20 | print_i64(...) |  |
+| main.rs:574:5:574:12 | closure1 | main.rs:574:5:574:14 | closure1(...) |  |
+| main.rs:574:5:574:14 | closure1(...) | main.rs:575:5:575:17 | ExprStmt |  |
+| main.rs:574:5:574:15 | ExprStmt | main.rs:574:5:574:12 | closure1 |  |
+| main.rs:575:5:575:13 | print_i64 | main.rs:575:15:575:15 | x |  |
+| main.rs:575:5:575:16 | print_i64(...) | main.rs:577:5:577:18 | let ... = 2 |  |
+| main.rs:575:5:575:17 | ExprStmt | main.rs:575:5:575:13 | print_i64 |  |
+| main.rs:575:15:575:15 | x | main.rs:575:5:575:16 | print_i64(...) |  |
+| main.rs:577:5:577:18 | let ... = 2 | main.rs:577:17:577:17 | 2 |  |
+| main.rs:577:9:577:13 | mut y | main.rs:580:5:582:6 | let ... = ... | match |
+| main.rs:577:13:577:13 | y | main.rs:577:9:577:13 | mut y |  |
+| main.rs:577:17:577:17 | 2 | main.rs:577:13:577:13 | y |  |
+| main.rs:580:5:582:6 | let ... = ... | main.rs:580:24:582:5 | \|...\| ... |  |
+| main.rs:580:9:580:20 | mut closure2 | main.rs:583:5:583:15 | ExprStmt | match |
+| main.rs:580:13:580:20 | closure2 | main.rs:580:9:580:20 | mut closure2 |  |
+| main.rs:580:24:582:5 | \|...\| ... | main.rs:580:13:580:20 | closure2 |  |
+| main.rs:580:24:582:5 | enter \|...\| ... | main.rs:581:9:581:14 | ExprStmt |  |
+| main.rs:580:24:582:5 | exit \|...\| ... (normal) | main.rs:580:24:582:5 | exit \|...\| ... |  |
+| main.rs:580:27:582:5 | { ... } | main.rs:580:24:582:5 | exit \|...\| ... (normal) |  |
+| main.rs:581:9:581:9 | y | main.rs:581:13:581:13 | 3 |  |
+| main.rs:581:9:581:13 | ... = ... | main.rs:580:27:582:5 | { ... } |  |
+| main.rs:581:9:581:14 | ExprStmt | main.rs:581:9:581:9 | y |  |
+| main.rs:581:13:581:13 | 3 | main.rs:581:9:581:13 | ... = ... |  |
+| main.rs:583:5:583:12 | closure2 | main.rs:583:5:583:14 | closure2(...) |  |
+| main.rs:583:5:583:14 | closure2(...) | main.rs:584:5:584:17 | ExprStmt |  |
+| main.rs:583:5:583:15 | ExprStmt | main.rs:583:5:583:12 | closure2 |  |
+| main.rs:584:5:584:13 | print_i64 | main.rs:584:15:584:15 | y |  |
+| main.rs:584:5:584:16 | print_i64(...) | main.rs:586:5:586:18 | let ... = 2 |  |
+| main.rs:584:5:584:17 | ExprStmt | main.rs:584:5:584:13 | print_i64 |  |
+| main.rs:584:15:584:15 | y | main.rs:584:5:584:16 | print_i64(...) |  |
+| main.rs:586:5:586:18 | let ... = 2 | main.rs:586:17:586:17 | 2 |  |
+| main.rs:586:9:586:13 | mut z | main.rs:589:5:591:6 | let ... = ... | match |
+| main.rs:586:13:586:13 | z | main.rs:586:9:586:13 | mut z |  |
+| main.rs:586:17:586:17 | 2 | main.rs:586:13:586:13 | z |  |
+| main.rs:589:5:591:6 | let ... = ... | main.rs:589:24:591:5 | \|...\| ... |  |
+| main.rs:589:9:589:20 | mut closure3 | main.rs:592:5:592:15 | ExprStmt | match |
+| main.rs:589:13:589:20 | closure3 | main.rs:589:9:589:20 | mut closure3 |  |
+| main.rs:589:24:591:5 | \|...\| ... | main.rs:589:13:589:20 | closure3 |  |
+| main.rs:589:24:591:5 | enter \|...\| ... | main.rs:590:9:590:24 | ExprStmt |  |
+| main.rs:589:24:591:5 | exit \|...\| ... (normal) | main.rs:589:24:591:5 | exit \|...\| ... |  |
+| main.rs:589:27:591:5 | { ... } | main.rs:589:24:591:5 | exit \|...\| ... (normal) |  |
+| main.rs:590:9:590:9 | z | main.rs:590:22:590:22 | 1 |  |
+| main.rs:590:9:590:23 | z.add_assign(...) | main.rs:589:27:591:5 | { ... } |  |
+| main.rs:590:9:590:24 | ExprStmt | main.rs:590:9:590:9 | z |  |
+| main.rs:590:22:590:22 | 1 | main.rs:590:9:590:23 | z.add_assign(...) |  |
+| main.rs:592:5:592:12 | closure3 | main.rs:592:5:592:14 | closure3(...) |  |
+| main.rs:592:5:592:14 | closure3(...) | main.rs:593:5:593:17 | ExprStmt |  |
+| main.rs:592:5:592:15 | ExprStmt | main.rs:592:5:592:12 | closure3 |  |
+| main.rs:593:5:593:13 | print_i64 | main.rs:593:15:593:15 | z |  |
+| main.rs:593:5:593:16 | print_i64(...) | main.rs:567:18:594:1 | { ... } |  |
+| main.rs:593:5:593:17 | ExprStmt | main.rs:593:5:593:13 | print_i64 |  |
+| main.rs:593:15:593:15 | z | main.rs:593:5:593:16 | print_i64(...) |  |
+| main.rs:596:1:604:1 | enter fn async_block_capture | main.rs:597:5:597:23 | let ... = 0 |  |
+| main.rs:596:1:604:1 | exit fn async_block_capture (normal) | main.rs:596:1:604:1 | exit fn async_block_capture |  |
+| main.rs:596:32:604:1 | { ... } | main.rs:596:1:604:1 | exit fn async_block_capture (normal) |  |
+| main.rs:597:5:597:23 | let ... = 0 | main.rs:597:22:597:22 | 0 |  |
+| main.rs:597:9:597:13 | mut i | main.rs:598:5:600:6 | let ... = ... | match |
+| main.rs:597:13:597:13 | i | main.rs:597:9:597:13 | mut i |  |
+| main.rs:597:22:597:22 | 0 | main.rs:597:13:597:13 | i |  |
+| main.rs:598:5:600:6 | let ... = ... | main.rs:598:17:600:5 | { ... } |  |
+| main.rs:598:9:598:13 | block | main.rs:598:9:598:13 | block |  |
+| main.rs:598:9:598:13 | block | main.rs:602:5:602:16 | ExprStmt | match |
+| main.rs:598:17:600:5 | enter { ... } | main.rs:599:9:599:14 | ExprStmt |  |
+| main.rs:598:17:600:5 | exit { ... } (normal) | main.rs:598:17:600:5 | exit { ... } |  |
+| main.rs:598:17:600:5 | { ... } | main.rs:598:9:598:13 | block |  |
+| main.rs:599:9:599:9 | i | main.rs:599:13:599:13 | 1 |  |
+| main.rs:599:9:599:13 | ... = ... | main.rs:598:17:600:5 | exit { ... } (normal) |  |
+| main.rs:599:9:599:14 | ExprStmt | main.rs:599:9:599:9 | i |  |
+| main.rs:599:13:599:13 | 1 | main.rs:599:9:599:13 | ... = ... |  |
+| main.rs:602:5:602:9 | block | main.rs:602:5:602:15 | await block |  |
+| main.rs:602:5:602:15 | await block | main.rs:603:5:603:17 | ExprStmt |  |
+| main.rs:602:5:602:16 | ExprStmt | main.rs:602:5:602:9 | block |  |
+| main.rs:603:5:603:13 | print_i64 | main.rs:603:15:603:15 | i |  |
+| main.rs:603:5:603:16 | print_i64(...) | main.rs:596:32:604:1 | { ... } |  |
+| main.rs:603:5:603:17 | ExprStmt | main.rs:603:5:603:13 | print_i64 |  |
+| main.rs:603:15:603:15 | i | main.rs:603:5:603:16 | print_i64(...) |  |
+| main.rs:606:1:622:1 | enter fn phi | main.rs:606:8:606:8 | b |  |
+| main.rs:606:1:622:1 | exit fn phi (normal) | main.rs:606:1:622:1 | exit fn phi |  |
+| main.rs:606:8:606:8 | b | main.rs:606:8:606:8 | b |  |
+| main.rs:606:8:606:8 | b | main.rs:606:8:606:14 | ...: bool | match |
+| main.rs:606:8:606:14 | ...: bool | main.rs:607:5:607:18 | let ... = 1 |  |
+| main.rs:606:17:622:1 | { ... } | main.rs:606:1:622:1 | exit fn phi (normal) |  |
+| main.rs:607:5:607:18 | let ... = 1 | main.rs:607:17:607:17 | 1 |  |
+| main.rs:607:9:607:13 | mut x | main.rs:608:5:608:17 | ExprStmt | match |
+| main.rs:607:13:607:13 | x | main.rs:607:9:607:13 | mut x |  |
+| main.rs:607:17:607:17 | 1 | main.rs:607:13:607:13 | x |  |
+| main.rs:608:5:608:13 | print_i64 | main.rs:608:15:608:15 | x |  |
+| main.rs:608:5:608:16 | print_i64(...) | main.rs:609:5:609:21 | ExprStmt |  |
+| main.rs:608:5:608:17 | ExprStmt | main.rs:608:5:608:13 | print_i64 |  |
+| main.rs:608:15:608:15 | x | main.rs:608:5:608:16 | print_i64(...) |  |
+| main.rs:609:5:609:13 | print_i64 | main.rs:609:15:609:15 | x |  |
+| main.rs:609:5:609:20 | print_i64(...) | main.rs:610:5:620:6 | let _ = ... |  |
+| main.rs:609:5:609:21 | ExprStmt | main.rs:609:5:609:13 | print_i64 |  |
+| main.rs:609:15:609:15 | x | main.rs:609:19:609:19 | 1 |  |
+| main.rs:609:15:609:19 | ... + ... | main.rs:609:5:609:20 | print_i64(...) |  |
+| main.rs:609:19:609:19 | 1 | main.rs:609:15:609:19 | ... + ... |  |
+| main.rs:610:5:620:6 | let _ = ... | main.rs:611:16:611:16 | b |  |
+| main.rs:611:9:611:9 | _ | main.rs:621:5:621:17 | ExprStmt | match |
+| main.rs:611:13:620:5 | if b {...} else {...} | main.rs:611:9:611:9 | _ |  |
+| main.rs:611:16:611:16 | b | main.rs:613:9:613:14 | ExprStmt | true |
+| main.rs:611:16:611:16 | b | main.rs:617:9:617:14 | ExprStmt | false |
+| main.rs:612:5:616:5 | { ... } | main.rs:611:13:620:5 | if b {...} else {...} |  |
+| main.rs:613:9:613:9 | x | main.rs:613:13:613:13 | 2 |  |
+| main.rs:613:9:613:13 | ... = ... | main.rs:614:9:614:21 | ExprStmt |  |
+| main.rs:613:9:613:14 | ExprStmt | main.rs:613:9:613:9 | x |  |
+| main.rs:613:13:613:13 | 2 | main.rs:613:9:613:13 | ... = ... |  |
+| main.rs:614:9:614:17 | print_i64 | main.rs:614:19:614:19 | x |  |
+| main.rs:614:9:614:20 | print_i64(...) | main.rs:615:9:615:25 | ExprStmt |  |
+| main.rs:614:9:614:21 | ExprStmt | main.rs:614:9:614:17 | print_i64 |  |
+| main.rs:614:19:614:19 | x | main.rs:614:9:614:20 | print_i64(...) |  |
+| main.rs:615:9:615:17 | print_i64 | main.rs:615:19:615:19 | x |  |
+| main.rs:615:9:615:24 | print_i64(...) | main.rs:612:5:616:5 | { ... } |  |
+| main.rs:615:9:615:25 | ExprStmt | main.rs:615:9:615:17 | print_i64 |  |
+| main.rs:615:19:615:19 | x | main.rs:615:23:615:23 | 1 |  |
+| main.rs:615:19:615:23 | ... + ... | main.rs:615:9:615:24 | print_i64(...) |  |
+| main.rs:615:23:615:23 | 1 | main.rs:615:19:615:23 | ... + ... |  |
+| main.rs:616:12:620:5 | { ... } | main.rs:611:13:620:5 | if b {...} else {...} |  |
+| main.rs:617:9:617:9 | x | main.rs:617:13:617:13 | 3 |  |
+| main.rs:617:9:617:13 | ... = ... | main.rs:618:9:618:21 | ExprStmt |  |
+| main.rs:617:9:617:14 | ExprStmt | main.rs:617:9:617:9 | x |  |
+| main.rs:617:13:617:13 | 3 | main.rs:617:9:617:13 | ... = ... |  |
+| main.rs:618:9:618:17 | print_i64 | main.rs:618:19:618:19 | x |  |
+| main.rs:618:9:618:20 | print_i64(...) | main.rs:619:9:619:25 | ExprStmt |  |
+| main.rs:618:9:618:21 | ExprStmt | main.rs:618:9:618:17 | print_i64 |  |
+| main.rs:618:19:618:19 | x | main.rs:618:9:618:20 | print_i64(...) |  |
+| main.rs:619:9:619:17 | print_i64 | main.rs:619:19:619:19 | x |  |
+| main.rs:619:9:619:24 | print_i64(...) | main.rs:616:12:620:5 | { ... } |  |
+| main.rs:619:9:619:25 | ExprStmt | main.rs:619:9:619:17 | print_i64 |  |
+| main.rs:619:19:619:19 | x | main.rs:619:23:619:23 | 1 |  |
+| main.rs:619:19:619:23 | ... + ... | main.rs:619:9:619:24 | print_i64(...) |  |
+| main.rs:619:23:619:23 | 1 | main.rs:619:19:619:23 | ... + ... |  |
+| main.rs:621:5:621:13 | print_i64 | main.rs:621:15:621:15 | x |  |
+| main.rs:621:5:621:16 | print_i64(...) | main.rs:606:17:622:1 | { ... } |  |
+| main.rs:621:5:621:17 | ExprStmt | main.rs:621:5:621:13 | print_i64 |  |
+| main.rs:621:15:621:15 | x | main.rs:621:5:621:16 | print_i64(...) |  |
+| main.rs:624:1:641:1 | enter fn phi_read | main.rs:624:13:624:14 | b1 |  |
+| main.rs:624:1:641:1 | exit fn phi_read (normal) | main.rs:624:1:641:1 | exit fn phi_read |  |
+| main.rs:624:13:624:14 | b1 | main.rs:624:13:624:14 | b1 |  |
+| main.rs:624:13:624:14 | b1 | main.rs:624:13:624:20 | ...: bool | match |
+| main.rs:624:13:624:20 | ...: bool | main.rs:624:23:624:24 | b2 |  |
+| main.rs:624:23:624:24 | b2 | main.rs:624:23:624:24 | b2 |  |
+| main.rs:624:23:624:24 | b2 | main.rs:624:23:624:30 | ...: bool | match |
+| main.rs:624:23:624:30 | ...: bool | main.rs:625:5:625:14 | let ... = 1 |  |
+| main.rs:624:33:641:1 | { ... } | main.rs:624:1:641:1 | exit fn phi_read (normal) |  |
+| main.rs:625:5:625:14 | let ... = 1 | main.rs:625:13:625:13 | 1 |  |
+| main.rs:625:9:625:9 | x | main.rs:625:9:625:9 | x |  |
+| main.rs:625:9:625:9 | x | main.rs:626:5:632:6 | let _ = ... | match |
+| main.rs:625:13:625:13 | 1 | main.rs:625:9:625:9 | x |  |
+| main.rs:626:5:632:6 | let _ = ... | main.rs:627:16:627:17 | b1 |  |
+| main.rs:627:9:627:9 | _ | main.rs:634:5:640:6 | let _ = ... | match |
+| main.rs:627:13:632:5 | if b1 {...} else {...} | main.rs:627:9:627:9 | _ |  |
+| main.rs:627:16:627:17 | b1 | main.rs:629:9:629:21 | ExprStmt | true |
+| main.rs:627:16:627:17 | b1 | main.rs:631:9:631:21 | ExprStmt | false |
+| main.rs:628:5:630:5 | { ... } | main.rs:627:13:632:5 | if b1 {...} else {...} |  |
+| main.rs:629:9:629:17 | print_i64 | main.rs:629:19:629:19 | x |  |
+| main.rs:629:9:629:20 | print_i64(...) | main.rs:628:5:630:5 | { ... } |  |
+| main.rs:629:9:629:21 | ExprStmt | main.rs:629:9:629:17 | print_i64 |  |
+| main.rs:629:19:629:19 | x | main.rs:629:9:629:20 | print_i64(...) |  |
+| main.rs:630:12:632:5 | { ... } | main.rs:627:13:632:5 | if b1 {...} else {...} |  |
+| main.rs:631:9:631:17 | print_i64 | main.rs:631:19:631:19 | x |  |
+| main.rs:631:9:631:20 | print_i64(...) | main.rs:630:12:632:5 | { ... } |  |
+| main.rs:631:9:631:21 | ExprStmt | main.rs:631:9:631:17 | print_i64 |  |
+| main.rs:631:19:631:19 | x | main.rs:631:9:631:20 | print_i64(...) |  |
+| main.rs:634:5:640:6 | let _ = ... | main.rs:635:16:635:17 | b2 |  |
+| main.rs:635:9:635:9 | _ | main.rs:624:33:641:1 | { ... } | match |
+| main.rs:635:13:640:5 | if b2 {...} else {...} | main.rs:635:9:635:9 | _ |  |
+| main.rs:635:16:635:17 | b2 | main.rs:637:9:637:21 | ExprStmt | true |
+| main.rs:635:16:635:17 | b2 | main.rs:639:9:639:21 | ExprStmt | false |
+| main.rs:636:5:638:5 | { ... } | main.rs:635:13:640:5 | if b2 {...} else {...} |  |
+| main.rs:637:9:637:17 | print_i64 | main.rs:637:19:637:19 | x |  |
+| main.rs:637:9:637:20 | print_i64(...) | main.rs:636:5:638:5 | { ... } |  |
+| main.rs:637:9:637:21 | ExprStmt | main.rs:637:9:637:17 | print_i64 |  |
+| main.rs:637:19:637:19 | x | main.rs:637:9:637:20 | print_i64(...) |  |
+| main.rs:638:12:640:5 | { ... } | main.rs:635:13:640:5 | if b2 {...} else {...} |  |
+| main.rs:639:9:639:17 | print_i64 | main.rs:639:19:639:19 | x |  |
+| main.rs:639:9:639:20 | print_i64(...) | main.rs:638:12:640:5 | { ... } |  |
+| main.rs:639:9:639:21 | ExprStmt | main.rs:639:9:639:17 | print_i64 |  |
+| main.rs:639:19:639:19 | x | main.rs:639:9:639:20 | print_i64(...) |  |
+| main.rs:648:5:650:5 | enter fn my_get | main.rs:648:20:648:23 | self |  |
+| main.rs:648:5:650:5 | exit fn my_get (normal) | main.rs:648:5:650:5 | exit fn my_get |  |
+| main.rs:648:15:648:23 | SelfParam | main.rs:649:9:649:24 | ExprStmt |  |
+| main.rs:648:20:648:23 | self | main.rs:648:15:648:23 | SelfParam |  |
+| main.rs:649:9:649:23 | return ... | main.rs:648:5:650:5 | exit fn my_get (normal) | return |
+| main.rs:649:9:649:24 | ExprStmt | main.rs:649:16:649:19 | self |  |
+| main.rs:649:16:649:19 | self | main.rs:649:16:649:23 | self.val |  |
+| main.rs:649:16:649:23 | self.val | main.rs:649:9:649:23 | return ... |  |
+| main.rs:652:5:654:5 | enter fn id | main.rs:652:11:652:14 | self |  |
+| main.rs:652:5:654:5 | exit fn id (normal) | main.rs:652:5:654:5 | exit fn id |  |
+| main.rs:652:11:652:14 | SelfParam | main.rs:653:9:653:12 | self |  |
+| main.rs:652:11:652:14 | self | main.rs:652:11:652:14 | SelfParam |  |
+| main.rs:652:25:654:5 | { ... } | main.rs:652:5:654:5 | exit fn id (normal) |  |
+| main.rs:653:9:653:12 | self | main.rs:652:25:654:5 | { ... } |  |
+| main.rs:656:5:663:5 | enter fn my_method | main.rs:656:23:656:26 | self |  |
+| main.rs:656:5:663:5 | exit fn my_method (normal) | main.rs:656:5:663:5 | exit fn my_method |  |
+| main.rs:656:18:656:26 | SelfParam | main.rs:657:9:660:10 | let ... = ... |  |
+| main.rs:656:23:656:26 | self | main.rs:656:18:656:26 | SelfParam |  |
+| main.rs:656:29:663:5 | { ... } | main.rs:656:5:663:5 | exit fn my_method (normal) |  |
+| main.rs:657:9:660:10 | let ... = ... | main.rs:657:21:660:9 | \|...\| ... |  |
+| main.rs:657:13:657:17 | mut f | main.rs:661:9:661:13 | ExprStmt | match |
+| main.rs:657:17:657:17 | f | main.rs:657:13:657:17 | mut f |  |
+| main.rs:657:21:660:9 | \|...\| ... | main.rs:657:17:657:17 | f |  |
+| main.rs:657:21:660:9 | enter \|...\| ... | main.rs:657:22:657:22 | n |  |
+| main.rs:657:21:660:9 | exit \|...\| ... (normal) | main.rs:657:21:660:9 | exit \|...\| ... |  |
+| main.rs:657:22:657:22 | ... | main.rs:659:13:659:26 | ExprStmt |  |
+| main.rs:657:22:657:22 | n | main.rs:657:22:657:22 | ... | match |
+| main.rs:657:22:657:22 | n | main.rs:657:22:657:22 | n |  |
+| main.rs:657:25:660:9 | { ... } | main.rs:657:21:660:9 | exit \|...\| ... (normal) |  |
+| main.rs:659:13:659:16 | self | main.rs:659:13:659:20 | self.val |  |
+| main.rs:659:13:659:20 | self.val | main.rs:659:25:659:25 | n |  |
+| main.rs:659:13:659:25 | ... += ... | main.rs:657:25:660:9 | { ... } |  |
+| main.rs:659:13:659:26 | ExprStmt | main.rs:659:13:659:16 | self |  |
+| main.rs:659:25:659:25 | n | main.rs:659:13:659:25 | ... += ... |  |
+| main.rs:661:9:661:9 | f | main.rs:661:11:661:11 | 3 |  |
+| main.rs:661:9:661:12 | f(...) | main.rs:662:9:662:13 | ExprStmt |  |
+| main.rs:661:9:661:13 | ExprStmt | main.rs:661:9:661:9 | f |  |
+| main.rs:661:11:661:11 | 3 | main.rs:661:9:661:12 | f(...) |  |
+| main.rs:662:9:662:9 | f | main.rs:662:11:662:11 | 4 |  |
+| main.rs:662:9:662:12 | f(...) | main.rs:656:29:663:5 | { ... } |  |
+| main.rs:662:9:662:13 | ExprStmt | main.rs:662:9:662:9 | f |  |
+| main.rs:662:11:662:11 | 4 | main.rs:662:9:662:12 | f(...) |  |
+| main.rs:666:1:673:1 | enter fn structs | main.rs:667:5:667:36 | let ... = ... |  |
+| main.rs:666:1:673:1 | exit fn structs (normal) | main.rs:666:1:673:1 | exit fn structs |  |
+| main.rs:666:14:673:1 | { ... } | main.rs:666:1:673:1 | exit fn structs (normal) |  |
+| main.rs:667:5:667:36 | let ... = ... | main.rs:667:33:667:33 | 1 |  |
+| main.rs:667:9:667:13 | mut a | main.rs:668:5:668:26 | ExprStmt | match |
+| main.rs:667:13:667:13 | a | main.rs:667:9:667:13 | mut a |  |
+| main.rs:667:17:667:35 | MyStruct {...} | main.rs:667:13:667:13 | a |  |
+| main.rs:667:33:667:33 | 1 | main.rs:667:17:667:35 | MyStruct {...} |  |
+| main.rs:668:5:668:13 | print_i64 | main.rs:668:15:668:15 | a |  |
+| main.rs:668:5:668:25 | print_i64(...) | main.rs:669:5:669:14 | ExprStmt |  |
+| main.rs:668:5:668:26 | ExprStmt | main.rs:668:5:668:13 | print_i64 |  |
+| main.rs:668:15:668:15 | a | main.rs:668:15:668:24 | a.my_get() |  |
+| main.rs:668:15:668:24 | a.my_get() | main.rs:668:5:668:25 | print_i64(...) |  |
+| main.rs:669:5:669:5 | a | main.rs:669:5:669:9 | a.val |  |
+| main.rs:669:5:669:9 | a.val | main.rs:669:13:669:13 | 5 |  |
+| main.rs:669:5:669:13 | ... = ... | main.rs:670:5:670:26 | ExprStmt |  |
+| main.rs:669:5:669:14 | ExprStmt | main.rs:669:5:669:5 | a |  |
+| main.rs:669:13:669:13 | 5 | main.rs:669:5:669:13 | ... = ... |  |
+| main.rs:670:5:670:13 | print_i64 | main.rs:670:15:670:15 | a |  |
+| main.rs:670:5:670:25 | print_i64(...) | main.rs:671:5:671:28 | ExprStmt |  |
+| main.rs:670:5:670:26 | ExprStmt | main.rs:670:5:670:13 | print_i64 |  |
+| main.rs:670:15:670:15 | a | main.rs:670:15:670:24 | a.my_get() |  |
+| main.rs:670:15:670:24 | a.my_get() | main.rs:670:5:670:25 | print_i64(...) |  |
+| main.rs:671:5:671:5 | a | main.rs:671:25:671:25 | 2 |  |
+| main.rs:671:5:671:27 | ... = ... | main.rs:672:5:672:26 | ExprStmt |  |
+| main.rs:671:5:671:28 | ExprStmt | main.rs:671:5:671:5 | a |  |
+| main.rs:671:9:671:27 | MyStruct {...} | main.rs:671:5:671:27 | ... = ... |  |
+| main.rs:671:25:671:25 | 2 | main.rs:671:9:671:27 | MyStruct {...} |  |
+| main.rs:672:5:672:13 | print_i64 | main.rs:672:15:672:15 | a |  |
+| main.rs:672:5:672:25 | print_i64(...) | main.rs:666:14:673:1 | { ... } |  |
+| main.rs:672:5:672:26 | ExprStmt | main.rs:672:5:672:13 | print_i64 |  |
+| main.rs:672:15:672:15 | a | main.rs:672:15:672:24 | a.my_get() |  |
+| main.rs:672:15:672:24 | a.my_get() | main.rs:672:5:672:25 | print_i64(...) |  |
+| main.rs:675:1:682:1 | enter fn arrays | main.rs:676:5:676:26 | let ... = ... |  |
+| main.rs:675:1:682:1 | exit fn arrays (normal) | main.rs:675:1:682:1 | exit fn arrays |  |
+| main.rs:675:13:682:1 | { ... } | main.rs:675:1:682:1 | exit fn arrays (normal) |  |
+| main.rs:676:5:676:26 | let ... = ... | main.rs:676:18:676:18 | 1 |  |
+| main.rs:676:9:676:13 | mut a | main.rs:677:5:677:20 | ExprStmt | match |
+| main.rs:676:13:676:13 | a | main.rs:676:9:676:13 | mut a |  |
+| main.rs:676:17:676:25 | [...] | main.rs:676:13:676:13 | a |  |
+| main.rs:676:18:676:18 | 1 | main.rs:676:21:676:21 | 2 |  |
+| main.rs:676:21:676:21 | 2 | main.rs:676:24:676:24 | 3 |  |
+| main.rs:676:24:676:24 | 3 | main.rs:676:17:676:25 | [...] |  |
+| main.rs:677:5:677:13 | print_i64 | main.rs:677:15:677:15 | a |  |
+| main.rs:677:5:677:19 | print_i64(...) | main.rs:678:5:678:13 | ExprStmt |  |
+| main.rs:677:5:677:20 | ExprStmt | main.rs:677:5:677:13 | print_i64 |  |
+| main.rs:677:15:677:15 | a | main.rs:677:17:677:17 | 0 |  |
+| main.rs:677:15:677:18 | a[0] | main.rs:677:5:677:19 | print_i64(...) |  |
+| main.rs:677:17:677:17 | 0 | main.rs:677:15:677:18 | a[0] |  |
+| main.rs:678:5:678:5 | a | main.rs:678:7:678:7 | 1 |  |
+| main.rs:678:5:678:8 | a[1] | main.rs:678:12:678:12 | 5 |  |
+| main.rs:678:5:678:12 | ... = ... | main.rs:679:5:679:20 | ExprStmt |  |
+| main.rs:678:5:678:13 | ExprStmt | main.rs:678:5:678:5 | a |  |
+| main.rs:678:7:678:7 | 1 | main.rs:678:5:678:8 | a[1] |  |
+| main.rs:678:12:678:12 | 5 | main.rs:678:5:678:12 | ... = ... |  |
+| main.rs:679:5:679:13 | print_i64 | main.rs:679:15:679:15 | a |  |
+| main.rs:679:5:679:19 | print_i64(...) | main.rs:680:5:680:18 | ExprStmt |  |
+| main.rs:679:5:679:20 | ExprStmt | main.rs:679:5:679:13 | print_i64 |  |
+| main.rs:679:15:679:15 | a | main.rs:679:17:679:17 | 1 |  |
+| main.rs:679:15:679:18 | a[1] | main.rs:679:5:679:19 | print_i64(...) |  |
+| main.rs:679:17:679:17 | 1 | main.rs:679:15:679:18 | a[1] |  |
+| main.rs:680:5:680:5 | a | main.rs:680:10:680:10 | 4 |  |
+| main.rs:680:5:680:17 | ... = ... | main.rs:681:5:681:20 | ExprStmt |  |
+| main.rs:680:5:680:18 | ExprStmt | main.rs:680:5:680:5 | a |  |
+| main.rs:680:9:680:17 | [...] | main.rs:680:5:680:17 | ... = ... |  |
+| main.rs:680:10:680:10 | 4 | main.rs:680:13:680:13 | 5 |  |
+| main.rs:680:13:680:13 | 5 | main.rs:680:16:680:16 | 6 |  |
+| main.rs:680:16:680:16 | 6 | main.rs:680:9:680:17 | [...] |  |
+| main.rs:681:5:681:13 | print_i64 | main.rs:681:15:681:15 | a |  |
+| main.rs:681:5:681:19 | print_i64(...) | main.rs:675:13:682:1 | { ... } |  |
+| main.rs:681:5:681:20 | ExprStmt | main.rs:681:5:681:13 | print_i64 |  |
+| main.rs:681:15:681:15 | a | main.rs:681:17:681:17 | 2 |  |
+| main.rs:681:15:681:18 | a[2] | main.rs:681:5:681:19 | print_i64(...) |  |
+| main.rs:681:17:681:17 | 2 | main.rs:681:15:681:18 | a[2] |  |
+| main.rs:684:1:691:1 | enter fn ref_arg | main.rs:685:5:685:15 | let ... = 16 |  |
+| main.rs:684:1:691:1 | exit fn ref_arg (normal) | main.rs:684:1:691:1 | exit fn ref_arg |  |
+| main.rs:684:14:691:1 | { ... } | main.rs:684:1:691:1 | exit fn ref_arg (normal) |  |
+| main.rs:685:5:685:15 | let ... = 16 | main.rs:685:13:685:14 | 16 |  |
+| main.rs:685:9:685:9 | x | main.rs:685:9:685:9 | x |  |
+| main.rs:685:9:685:9 | x | main.rs:686:5:686:22 | ExprStmt | match |
+| main.rs:685:13:685:14 | 16 | main.rs:685:9:685:9 | x |  |
+| main.rs:686:5:686:17 | print_i64_ref | main.rs:686:20:686:20 | x |  |
+| main.rs:686:5:686:21 | print_i64_ref(...) | main.rs:687:5:687:17 | ExprStmt |  |
+| main.rs:686:5:686:22 | ExprStmt | main.rs:686:5:686:17 | print_i64_ref |  |
+| main.rs:686:19:686:20 | &x | main.rs:686:5:686:21 | print_i64_ref(...) |  |
+| main.rs:686:20:686:20 | x | main.rs:686:19:686:20 | &x |  |
+| main.rs:687:5:687:13 | print_i64 | main.rs:687:15:687:15 | x |  |
+| main.rs:687:5:687:16 | print_i64(...) | main.rs:689:5:689:15 | let ... = 17 |  |
+| main.rs:687:5:687:17 | ExprStmt | main.rs:687:5:687:13 | print_i64 |  |
+| main.rs:687:15:687:15 | x | main.rs:687:5:687:16 | print_i64(...) |  |
+| main.rs:689:5:689:15 | let ... = 17 | main.rs:689:13:689:14 | 17 |  |
+| main.rs:689:9:689:9 | z | main.rs:689:9:689:9 | z |  |
+| main.rs:689:9:689:9 | z | main.rs:690:5:690:22 | ExprStmt | match |
+| main.rs:689:13:689:14 | 17 | main.rs:689:9:689:9 | z |  |
+| main.rs:690:5:690:17 | print_i64_ref | main.rs:690:20:690:20 | z |  |
+| main.rs:690:5:690:21 | print_i64_ref(...) | main.rs:684:14:691:1 | { ... } |  |
+| main.rs:690:5:690:22 | ExprStmt | main.rs:690:5:690:17 | print_i64_ref |  |
+| main.rs:690:19:690:20 | &z | main.rs:690:5:690:21 | print_i64_ref(...) |  |
+| main.rs:690:20:690:20 | z | main.rs:690:19:690:20 | &z |  |
+| main.rs:698:5:700:5 | enter fn bar | main.rs:698:17:698:20 | self |  |
+| main.rs:698:5:700:5 | exit fn bar (normal) | main.rs:698:5:700:5 | exit fn bar |  |
+| main.rs:698:12:698:20 | SelfParam | main.rs:699:9:699:36 | ExprStmt |  |
+| main.rs:698:17:698:20 | self | main.rs:698:12:698:20 | SelfParam |  |
+| main.rs:698:23:700:5 | { ... } | main.rs:698:5:700:5 | exit fn bar (normal) |  |
+| main.rs:699:9:699:13 | * ... | main.rs:699:33:699:33 | 3 |  |
+| main.rs:699:9:699:35 | ... = ... | main.rs:698:23:700:5 | { ... } |  |
+| main.rs:699:9:699:36 | ExprStmt | main.rs:699:10:699:13 | self |  |
+| main.rs:699:10:699:13 | self | main.rs:699:9:699:13 | * ... |  |
+| main.rs:699:17:699:35 | MyStruct {...} | main.rs:699:9:699:35 | ... = ... |  |
+| main.rs:699:33:699:33 | 3 | main.rs:699:17:699:35 | MyStruct {...} |  |
+| main.rs:703:1:709:1 | enter fn ref_methodcall_receiver | main.rs:704:5:704:36 | let ... = ... |  |
+| main.rs:703:1:709:1 | exit fn ref_methodcall_receiver (normal) | main.rs:703:1:709:1 | exit fn ref_methodcall_receiver |  |
+| main.rs:703:30:709:1 | { ... } | main.rs:703:1:709:1 | exit fn ref_methodcall_receiver (normal) |  |
+| main.rs:704:5:704:36 | let ... = ... | main.rs:704:33:704:33 | 1 |  |
+| main.rs:704:9:704:13 | mut a | main.rs:705:5:705:12 | ExprStmt | match |
+| main.rs:704:13:704:13 | a | main.rs:704:9:704:13 | mut a |  |
+| main.rs:704:17:704:35 | MyStruct {...} | main.rs:704:13:704:13 | a |  |
+| main.rs:704:33:704:33 | 1 | main.rs:704:17:704:35 | MyStruct {...} |  |
+| main.rs:705:5:705:5 | a | main.rs:705:5:705:11 | a.bar() |  |
+| main.rs:705:5:705:11 | a.bar() | main.rs:708:5:708:21 | ExprStmt |  |
+| main.rs:705:5:705:12 | ExprStmt | main.rs:705:5:705:5 | a |  |
+| main.rs:708:5:708:13 | print_i64 | main.rs:708:15:708:15 | a |  |
+| main.rs:708:5:708:20 | print_i64(...) | main.rs:703:30:709:1 | { ... } |  |
+| main.rs:708:5:708:21 | ExprStmt | main.rs:708:5:708:13 | print_i64 |  |
+| main.rs:708:15:708:15 | a | main.rs:708:15:708:19 | a.val |  |
+| main.rs:708:15:708:19 | a.val | main.rs:708:5:708:20 | print_i64(...) |  |
+| main.rs:725:1:736:1 | enter fn macro_invocation | main.rs:726:5:727:26 | let ... = ... |  |
+| main.rs:725:1:736:1 | exit fn macro_invocation (normal) | main.rs:725:1:736:1 | exit fn macro_invocation |  |
+| main.rs:725:23:736:1 | { ... } | main.rs:725:1:736:1 | exit fn macro_invocation (normal) |  |
+| main.rs:726:5:727:26 | let ... = ... | main.rs:727:23:727:24 | let ... = 37 |  |
+| main.rs:726:9:726:22 | var_from_macro | main.rs:726:9:726:22 | var_from_macro |  |
+| main.rs:726:9:726:22 | var_from_macro | main.rs:728:5:728:30 | ExprStmt | match |
+| main.rs:727:9:727:21 | var_in_macro | main.rs:727:9:727:21 | var_in_macro |  |
+| main.rs:727:9:727:21 | var_in_macro | main.rs:727:9:727:21 | var_in_macro | match |
+| main.rs:727:9:727:21 | var_in_macro | main.rs:727:23:727:24 | { ... } |  |
+| main.rs:727:9:727:25 | MacroExpr | main.rs:726:9:726:22 | var_from_macro |  |
+| main.rs:727:9:727:25 | let_in_macro!... | main.rs:727:9:727:25 | MacroExpr |  |
+| main.rs:727:23:727:24 | 37 | main.rs:727:9:727:21 | var_in_macro |  |
+| main.rs:727:23:727:24 | let ... = 37 | main.rs:727:23:727:24 | 37 |  |
+| main.rs:727:23:727:24 | { ... } | main.rs:727:9:727:25 | let_in_macro!... |  |
+| main.rs:728:5:728:13 | print_i64 | main.rs:728:15:728:28 | var_from_macro |  |
+| main.rs:728:5:728:29 | print_i64(...) | main.rs:729:5:729:26 | let ... = 33 |  |
+| main.rs:728:5:728:30 | ExprStmt | main.rs:728:5:728:13 | print_i64 |  |
+| main.rs:728:15:728:28 | var_from_macro | main.rs:728:5:728:29 | print_i64(...) |  |
+| main.rs:729:5:729:26 | let ... = 33 | main.rs:729:24:729:25 | 33 |  |
+| main.rs:729:9:729:20 | var_in_macro | main.rs:729:9:729:20 | var_in_macro |  |
+| main.rs:729:9:729:20 | var_in_macro | main.rs:734:5:734:44 | ExprStmt | match |
+| main.rs:729:24:729:25 | 33 | main.rs:729:9:729:20 | var_in_macro |  |
+| main.rs:734:5:734:13 | print_i64 | main.rs:734:15:734:28 | let ... = 0 |  |
+| main.rs:734:5:734:43 | print_i64(...) | main.rs:735:5:735:28 | ExprStmt |  |
+| main.rs:734:5:734:44 | ExprStmt | main.rs:734:5:734:13 | print_i64 |  |
+| main.rs:734:15:734:28 | 0 | main.rs:734:15:734:28 | var_in_macro |  |
+| main.rs:734:15:734:28 | let ... = 0 | main.rs:734:15:734:28 | 0 |  |
+| main.rs:734:15:734:28 | var_in_macro | main.rs:734:15:734:28 | var_in_macro |  |
+| main.rs:734:15:734:28 | var_in_macro | main.rs:734:30:734:41 | var_in_macro | match |
+| main.rs:734:15:734:42 | MacroExpr | main.rs:734:5:734:43 | print_i64(...) |  |
+| main.rs:734:15:734:42 | let_in_macro2!... | main.rs:734:15:734:42 | MacroExpr |  |
+| main.rs:734:30:734:41 | var_in_macro | main.rs:734:30:734:41 | { ... } |  |
+| main.rs:734:30:734:41 | { ... } | main.rs:734:15:734:42 | let_in_macro2!... |  |
+| main.rs:735:5:735:13 | print_i64 | main.rs:735:15:735:26 | var_in_macro |  |
+| main.rs:735:5:735:27 | print_i64(...) | main.rs:725:23:736:1 | { ... } |  |
+| main.rs:735:5:735:28 | ExprStmt | main.rs:735:5:735:13 | print_i64 |  |
+| main.rs:735:15:735:26 | var_in_macro | main.rs:735:5:735:27 | print_i64(...) |  |
+| main.rs:738:1:742:1 | enter fn let_without_initializer | main.rs:739:5:739:10 | let ... |  |
+| main.rs:738:1:742:1 | exit fn let_without_initializer (normal) | main.rs:738:1:742:1 | exit fn let_without_initializer |  |
+| main.rs:738:30:742:1 | { ... } | main.rs:738:1:742:1 | exit fn let_without_initializer (normal) |  |
+| main.rs:739:5:739:10 | let ... | main.rs:739:9:739:9 | x |  |
+| main.rs:739:9:739:9 | x | main.rs:739:9:739:9 | x |  |
+| main.rs:739:9:739:9 | x | main.rs:740:5:740:10 | ExprStmt | match |
+| main.rs:740:5:740:5 | x | main.rs:740:9:740:9 | 1 |  |
+| main.rs:740:5:740:9 | ... = ... | main.rs:741:5:741:17 | ExprStmt |  |
+| main.rs:740:5:740:10 | ExprStmt | main.rs:740:5:740:5 | x |  |
+| main.rs:740:9:740:9 | 1 | main.rs:740:5:740:9 | ... = ... |  |
+| main.rs:741:5:741:13 | print_i64 | main.rs:741:15:741:15 | x |  |
+| main.rs:741:5:741:16 | print_i64(...) | main.rs:738:30:742:1 | { ... } |  |
+| main.rs:741:5:741:17 | ExprStmt | main.rs:741:5:741:13 | print_i64 |  |
+| main.rs:741:15:741:15 | x | main.rs:741:5:741:16 | print_i64(...) |  |
+| main.rs:744:1:754:1 | enter fn capture_phi | main.rs:745:5:745:20 | let ... = 100 |  |
+| main.rs:744:1:754:1 | exit fn capture_phi (normal) | main.rs:744:1:754:1 | exit fn capture_phi |  |
+| main.rs:744:18:754:1 | { ... } | main.rs:744:1:754:1 | exit fn capture_phi (normal) |  |
+| main.rs:745:5:745:20 | let ... = 100 | main.rs:745:17:745:19 | 100 |  |
+| main.rs:745:9:745:13 | mut x | main.rs:746:5:751:6 | let ... = ... | match |
+| main.rs:745:13:745:13 | x | main.rs:745:9:745:13 | mut x |  |
+| main.rs:745:17:745:19 | 100 | main.rs:745:13:745:13 | x |  |
+| main.rs:746:5:751:6 | let ... = ... | main.rs:746:19:751:5 | \|...\| ... |  |
+| main.rs:746:9:746:15 | mut cap | main.rs:752:5:752:14 | ExprStmt | match |
+| main.rs:746:13:746:15 | cap | main.rs:746:9:746:15 | mut cap |  |
+| main.rs:746:19:751:5 | \|...\| ... | main.rs:746:13:746:15 | cap |  |
+| main.rs:746:19:751:5 | enter \|...\| ... | main.rs:746:20:746:20 | b |  |
+| main.rs:746:19:751:5 | exit \|...\| ... (normal) | main.rs:746:19:751:5 | exit \|...\| ... |  |
+| main.rs:746:20:746:20 | b | main.rs:746:20:746:20 | b |  |
+| main.rs:746:20:746:20 | b | main.rs:746:20:746:26 | ...: bool | match |
+| main.rs:746:20:746:26 | ...: bool | main.rs:747:9:750:10 | let _ = ... |  |
+| main.rs:746:29:751:5 | { ... } | main.rs:746:19:751:5 | exit \|...\| ... (normal) |  |
+| main.rs:747:9:750:10 | let _ = ... | main.rs:748:20:748:20 | b |  |
+| main.rs:748:13:748:13 | _ | main.rs:746:29:751:5 | { ... } | match |
+| main.rs:748:17:750:9 | if b {...} | main.rs:748:13:748:13 | _ |  |
+| main.rs:748:20:748:20 | b | main.rs:748:17:750:9 | if b {...} | false |
+| main.rs:748:20:748:20 | b | main.rs:749:13:749:20 | ExprStmt | true |
+| main.rs:748:22:750:9 | { ... } | main.rs:748:17:750:9 | if b {...} |  |
+| main.rs:749:13:749:13 | x | main.rs:749:17:749:19 | 200 |  |
+| main.rs:749:13:749:19 | ... = ... | main.rs:748:22:750:9 | { ... } |  |
+| main.rs:749:13:749:20 | ExprStmt | main.rs:749:13:749:13 | x |  |
+| main.rs:749:17:749:19 | 200 | main.rs:749:13:749:19 | ... = ... |  |
+| main.rs:752:5:752:7 | cap | main.rs:752:9:752:12 | true |  |
+| main.rs:752:5:752:13 | cap(...) | main.rs:753:5:753:17 | ExprStmt |  |
+| main.rs:752:5:752:14 | ExprStmt | main.rs:752:5:752:7 | cap |  |
+| main.rs:752:9:752:12 | true | main.rs:752:5:752:13 | cap(...) |  |
+| main.rs:753:5:753:13 | print_i64 | main.rs:753:15:753:15 | x |  |
+| main.rs:753:5:753:16 | print_i64(...) | main.rs:744:18:754:1 | { ... } |  |
+| main.rs:753:5:753:17 | ExprStmt | main.rs:753:5:753:13 | print_i64 |  |
+| main.rs:753:15:753:15 | x | main.rs:753:5:753:16 | print_i64(...) |  |
+| main.rs:756:1:800:1 | enter fn main | main.rs:757:5:757:25 | ExprStmt |  |
+| main.rs:756:1:800:1 | exit fn main (normal) | main.rs:756:1:800:1 | exit fn main |  |
+| main.rs:756:11:800:1 | { ... } | main.rs:756:1:800:1 | exit fn main (normal) |  |
+| main.rs:757:5:757:22 | immutable_variable | main.rs:757:5:757:24 | immutable_variable(...) |  |
+| main.rs:757:5:757:24 | immutable_variable(...) | main.rs:758:5:758:23 | ExprStmt |  |
+| main.rs:757:5:757:25 | ExprStmt | main.rs:757:5:757:22 | immutable_variable |  |
+| main.rs:758:5:758:20 | mutable_variable | main.rs:758:5:758:22 | mutable_variable(...) |  |
+| main.rs:758:5:758:22 | mutable_variable(...) | main.rs:759:5:759:40 | ExprStmt |  |
+| main.rs:758:5:758:23 | ExprStmt | main.rs:758:5:758:20 | mutable_variable |  |
+| main.rs:759:5:759:37 | mutable_variable_immutable_borrow | main.rs:759:5:759:39 | mutable_variable_immutable_borrow(...) |  |
+| main.rs:759:5:759:39 | mutable_variable_immutable_borrow(...) | main.rs:760:5:760:23 | ExprStmt |  |
+| main.rs:759:5:759:40 | ExprStmt | main.rs:759:5:759:37 | mutable_variable_immutable_borrow |  |
+| main.rs:760:5:760:20 | variable_shadow1 | main.rs:760:5:760:22 | variable_shadow1(...) |  |
+| main.rs:760:5:760:22 | variable_shadow1(...) | main.rs:761:5:761:23 | ExprStmt |  |
+| main.rs:760:5:760:23 | ExprStmt | main.rs:760:5:760:20 | variable_shadow1 |  |
+| main.rs:761:5:761:20 | variable_shadow2 | main.rs:761:5:761:22 | variable_shadow2(...) |  |
+| main.rs:761:5:761:22 | variable_shadow2(...) | main.rs:762:5:762:19 | ExprStmt |  |
+| main.rs:761:5:761:23 | ExprStmt | main.rs:761:5:761:20 | variable_shadow2 |  |
+| main.rs:762:5:762:16 | let_pattern1 | main.rs:762:5:762:18 | let_pattern1(...) |  |
+| main.rs:762:5:762:18 | let_pattern1(...) | main.rs:763:5:763:19 | ExprStmt |  |
+| main.rs:762:5:762:19 | ExprStmt | main.rs:762:5:762:16 | let_pattern1 |  |
+| main.rs:763:5:763:16 | let_pattern2 | main.rs:763:5:763:18 | let_pattern2(...) |  |
+| main.rs:763:5:763:18 | let_pattern2(...) | main.rs:764:5:764:19 | ExprStmt |  |
+| main.rs:763:5:763:19 | ExprStmt | main.rs:763:5:763:16 | let_pattern2 |  |
+| main.rs:764:5:764:16 | let_pattern3 | main.rs:764:5:764:18 | let_pattern3(...) |  |
+| main.rs:764:5:764:18 | let_pattern3(...) | main.rs:765:5:765:19 | ExprStmt |  |
+| main.rs:764:5:764:19 | ExprStmt | main.rs:764:5:764:16 | let_pattern3 |  |
+| main.rs:765:5:765:16 | let_pattern4 | main.rs:765:5:765:18 | let_pattern4(...) |  |
+| main.rs:765:5:765:18 | let_pattern4(...) | main.rs:766:5:766:21 | ExprStmt |  |
+| main.rs:765:5:765:19 | ExprStmt | main.rs:765:5:765:16 | let_pattern4 |  |
+| main.rs:766:5:766:18 | match_pattern1 | main.rs:766:5:766:20 | match_pattern1(...) |  |
+| main.rs:766:5:766:20 | match_pattern1(...) | main.rs:767:5:767:21 | ExprStmt |  |
+| main.rs:766:5:766:21 | ExprStmt | main.rs:766:5:766:18 | match_pattern1 |  |
+| main.rs:767:5:767:18 | match_pattern2 | main.rs:767:5:767:20 | match_pattern2(...) |  |
+| main.rs:767:5:767:20 | match_pattern2(...) | main.rs:768:5:768:21 | ExprStmt |  |
+| main.rs:767:5:767:21 | ExprStmt | main.rs:767:5:767:18 | match_pattern2 |  |
+| main.rs:768:5:768:18 | match_pattern3 | main.rs:768:5:768:20 | match_pattern3(...) |  |
+| main.rs:768:5:768:20 | match_pattern3(...) | main.rs:769:5:769:21 | ExprStmt |  |
+| main.rs:768:5:768:21 | ExprStmt | main.rs:768:5:768:18 | match_pattern3 |  |
+| main.rs:769:5:769:18 | match_pattern4 | main.rs:769:5:769:20 | match_pattern4(...) |  |
+| main.rs:769:5:769:20 | match_pattern4(...) | main.rs:770:5:770:21 | ExprStmt |  |
+| main.rs:769:5:769:21 | ExprStmt | main.rs:769:5:769:18 | match_pattern4 |  |
+| main.rs:770:5:770:18 | match_pattern5 | main.rs:770:5:770:20 | match_pattern5(...) |  |
+| main.rs:770:5:770:20 | match_pattern5(...) | main.rs:771:5:771:21 | ExprStmt |  |
+| main.rs:770:5:770:21 | ExprStmt | main.rs:770:5:770:18 | match_pattern5 |  |
+| main.rs:771:5:771:18 | match_pattern6 | main.rs:771:5:771:20 | match_pattern6(...) |  |
+| main.rs:771:5:771:20 | match_pattern6(...) | main.rs:772:5:772:21 | ExprStmt |  |
+| main.rs:771:5:771:21 | ExprStmt | main.rs:771:5:771:18 | match_pattern6 |  |
+| main.rs:772:5:772:18 | match_pattern7 | main.rs:772:5:772:20 | match_pattern7(...) |  |
+| main.rs:772:5:772:20 | match_pattern7(...) | main.rs:773:5:773:21 | ExprStmt |  |
+| main.rs:772:5:772:21 | ExprStmt | main.rs:772:5:772:18 | match_pattern7 |  |
+| main.rs:773:5:773:18 | match_pattern8 | main.rs:773:5:773:20 | match_pattern8(...) |  |
+| main.rs:773:5:773:20 | match_pattern8(...) | main.rs:774:5:774:21 | ExprStmt |  |
+| main.rs:773:5:773:21 | ExprStmt | main.rs:773:5:773:18 | match_pattern8 |  |
+| main.rs:774:5:774:18 | match_pattern9 | main.rs:774:5:774:20 | match_pattern9(...) |  |
+| main.rs:774:5:774:20 | match_pattern9(...) | main.rs:775:5:775:22 | ExprStmt |  |
+| main.rs:774:5:774:21 | ExprStmt | main.rs:774:5:774:18 | match_pattern9 |  |
+| main.rs:775:5:775:19 | match_pattern10 | main.rs:775:5:775:21 | match_pattern10(...) |  |
+| main.rs:775:5:775:21 | match_pattern10(...) | main.rs:776:5:776:22 | ExprStmt |  |
+| main.rs:775:5:775:22 | ExprStmt | main.rs:775:5:775:19 | match_pattern10 |  |
+| main.rs:776:5:776:19 | match_pattern11 | main.rs:776:5:776:21 | match_pattern11(...) |  |
+| main.rs:776:5:776:21 | match_pattern11(...) | main.rs:777:5:777:22 | ExprStmt |  |
+| main.rs:776:5:776:22 | ExprStmt | main.rs:776:5:776:19 | match_pattern11 |  |
+| main.rs:777:5:777:19 | match_pattern12 | main.rs:777:5:777:21 | match_pattern12(...) |  |
+| main.rs:777:5:777:21 | match_pattern12(...) | main.rs:778:5:778:22 | ExprStmt |  |
+| main.rs:777:5:777:22 | ExprStmt | main.rs:777:5:777:19 | match_pattern12 |  |
+| main.rs:778:5:778:19 | match_pattern13 | main.rs:778:5:778:21 | match_pattern13(...) |  |
+| main.rs:778:5:778:21 | match_pattern13(...) | main.rs:779:5:779:22 | ExprStmt |  |
+| main.rs:778:5:778:22 | ExprStmt | main.rs:778:5:778:19 | match_pattern13 |  |
+| main.rs:779:5:779:19 | match_pattern14 | main.rs:779:5:779:21 | match_pattern14(...) |  |
+| main.rs:779:5:779:21 | match_pattern14(...) | main.rs:780:5:780:22 | ExprStmt |  |
+| main.rs:779:5:779:22 | ExprStmt | main.rs:779:5:779:19 | match_pattern14 |  |
+| main.rs:780:5:780:19 | match_pattern15 | main.rs:780:5:780:21 | match_pattern15(...) |  |
+| main.rs:780:5:780:21 | match_pattern15(...) | main.rs:781:5:781:22 | ExprStmt |  |
+| main.rs:780:5:780:22 | ExprStmt | main.rs:780:5:780:19 | match_pattern15 |  |
+| main.rs:781:5:781:19 | match_pattern16 | main.rs:781:5:781:21 | match_pattern16(...) |  |
+| main.rs:781:5:781:21 | match_pattern16(...) | main.rs:782:5:782:36 | ExprStmt |  |
+| main.rs:781:5:781:22 | ExprStmt | main.rs:781:5:781:19 | match_pattern16 |  |
+| main.rs:782:5:782:18 | param_pattern1 | main.rs:782:20:782:22 | "a" |  |
+| main.rs:782:5:782:35 | param_pattern1(...) | main.rs:783:5:783:37 | ExprStmt |  |
+| main.rs:782:5:782:36 | ExprStmt | main.rs:782:5:782:18 | param_pattern1 |  |
+| main.rs:782:20:782:22 | "a" | main.rs:782:26:782:28 | "b" |  |
+| main.rs:782:25:782:34 | TupleExpr | main.rs:782:5:782:35 | param_pattern1(...) |  |
+| main.rs:782:26:782:28 | "b" | main.rs:782:31:782:33 | "c" |  |
+| main.rs:782:31:782:33 | "c" | main.rs:782:25:782:34 | TupleExpr |  |
+| main.rs:783:5:783:18 | param_pattern2 | main.rs:783:20:783:31 | ...::Left |  |
+| main.rs:783:5:783:36 | param_pattern2(...) | main.rs:784:5:784:26 | ExprStmt |  |
+| main.rs:783:5:783:37 | ExprStmt | main.rs:783:5:783:18 | param_pattern2 |  |
+| main.rs:783:20:783:31 | ...::Left | main.rs:783:33:783:34 | 45 |  |
+| main.rs:783:20:783:35 | ...::Left(...) | main.rs:783:5:783:36 | param_pattern2(...) |  |
+| main.rs:783:33:783:34 | 45 | main.rs:783:20:783:35 | ...::Left(...) |  |
+| main.rs:784:5:784:23 | destruct_assignment | main.rs:784:5:784:25 | destruct_assignment(...) |  |
+| main.rs:784:5:784:25 | destruct_assignment(...) | main.rs:785:5:785:23 | ExprStmt |  |
+| main.rs:784:5:784:26 | ExprStmt | main.rs:784:5:784:23 | destruct_assignment |  |
+| main.rs:785:5:785:20 | closure_variable | main.rs:785:5:785:22 | closure_variable(...) |  |
+| main.rs:785:5:785:22 | closure_variable(...) | main.rs:786:5:786:22 | ExprStmt |  |
+| main.rs:785:5:785:23 | ExprStmt | main.rs:785:5:785:20 | closure_variable |  |
+| main.rs:786:5:786:19 | nested_function | main.rs:786:5:786:21 | nested_function(...) |  |
+| main.rs:786:5:786:21 | nested_function(...) | main.rs:787:5:787:19 | ExprStmt |  |
+| main.rs:786:5:786:22 | ExprStmt | main.rs:786:5:786:19 | nested_function |  |
+| main.rs:787:5:787:16 | for_variable | main.rs:787:5:787:18 | for_variable(...) |  |
+| main.rs:787:5:787:18 | for_variable(...) | main.rs:788:5:788:17 | ExprStmt |  |
+| main.rs:787:5:787:19 | ExprStmt | main.rs:787:5:787:16 | for_variable |  |
+| main.rs:788:5:788:14 | add_assign | main.rs:788:5:788:16 | add_assign(...) |  |
+| main.rs:788:5:788:16 | add_assign(...) | main.rs:789:5:789:13 | ExprStmt |  |
+| main.rs:788:5:788:17 | ExprStmt | main.rs:788:5:788:14 | add_assign |  |
+| main.rs:789:5:789:10 | mutate | main.rs:789:5:789:12 | mutate(...) |  |
+| main.rs:789:5:789:12 | mutate(...) | main.rs:790:5:790:17 | ExprStmt |  |
+| main.rs:789:5:789:13 | ExprStmt | main.rs:789:5:789:10 | mutate |  |
+| main.rs:790:5:790:14 | mutate_arg | main.rs:790:5:790:16 | mutate_arg(...) |  |
+| main.rs:790:5:790:16 | mutate_arg(...) | main.rs:791:5:791:12 | ExprStmt |  |
+| main.rs:790:5:790:17 | ExprStmt | main.rs:790:5:790:14 | mutate_arg |  |
+| main.rs:791:5:791:9 | alias | main.rs:791:5:791:11 | alias(...) |  |
+| main.rs:791:5:791:11 | alias(...) | main.rs:792:5:792:18 | ExprStmt |  |
+| main.rs:791:5:791:12 | ExprStmt | main.rs:791:5:791:9 | alias |  |
+| main.rs:792:5:792:15 | capture_mut | main.rs:792:5:792:17 | capture_mut(...) |  |
+| main.rs:792:5:792:17 | capture_mut(...) | main.rs:793:5:793:20 | ExprStmt |  |
+| main.rs:792:5:792:18 | ExprStmt | main.rs:792:5:792:15 | capture_mut |  |
+| main.rs:793:5:793:17 | capture_immut | main.rs:793:5:793:19 | capture_immut(...) |  |
+| main.rs:793:5:793:19 | capture_immut(...) | main.rs:794:5:794:26 | ExprStmt |  |
+| main.rs:793:5:793:20 | ExprStmt | main.rs:793:5:793:17 | capture_immut |  |
+| main.rs:794:5:794:23 | async_block_capture | main.rs:794:5:794:25 | async_block_capture(...) |  |
+| main.rs:794:5:794:25 | async_block_capture(...) | main.rs:795:5:795:14 | ExprStmt |  |
+| main.rs:794:5:794:26 | ExprStmt | main.rs:794:5:794:23 | async_block_capture |  |
+| main.rs:795:5:795:11 | structs | main.rs:795:5:795:13 | structs(...) |  |
+| main.rs:795:5:795:13 | structs(...) | main.rs:796:5:796:14 | ExprStmt |  |
+| main.rs:795:5:795:14 | ExprStmt | main.rs:795:5:795:11 | structs |  |
+| main.rs:796:5:796:11 | ref_arg | main.rs:796:5:796:13 | ref_arg(...) |  |
+| main.rs:796:5:796:13 | ref_arg(...) | main.rs:797:5:797:30 | ExprStmt |  |
+| main.rs:796:5:796:14 | ExprStmt | main.rs:796:5:796:11 | ref_arg |  |
+| main.rs:797:5:797:27 | ref_methodcall_receiver | main.rs:797:5:797:29 | ref_methodcall_receiver(...) |  |
+| main.rs:797:5:797:29 | ref_methodcall_receiver(...) | main.rs:798:5:798:23 | ExprStmt |  |
+| main.rs:797:5:797:30 | ExprStmt | main.rs:797:5:797:27 | ref_methodcall_receiver |  |
+| main.rs:798:5:798:20 | macro_invocation | main.rs:798:5:798:22 | macro_invocation(...) |  |
+| main.rs:798:5:798:22 | macro_invocation(...) | main.rs:799:5:799:18 | ExprStmt |  |
+| main.rs:798:5:798:23 | ExprStmt | main.rs:798:5:798:20 | macro_invocation |  |
+| main.rs:799:5:799:15 | capture_phi | main.rs:799:5:799:17 | capture_phi(...) |  |
+| main.rs:799:5:799:17 | capture_phi(...) | main.rs:756:11:800:1 | { ... } |  |
+| main.rs:799:5:799:18 | ExprStmt | main.rs:799:5:799:15 | capture_phi |  |
 breakTarget
+| main.rs:326:9:326:13 | break | main.rs:317:5:327:5 | while ... { ... } |
 continueTarget
diff --git a/rust/ql/test/library-tests/variables/Ssa.expected b/rust/ql/test/library-tests/variables/Ssa.expected
index cce5db8ffda..35adac47802 100644
--- a/rust/ql/test/library-tests/variables/Ssa.expected
+++ b/rust/ql/test/library-tests/variables/Ssa.expected
@@ -1,668 +1,775 @@
 definition
-| main.rs:3:14:3:14 | s | main.rs:3:14:3:14 | s |
-| main.rs:8:14:8:14 | i | main.rs:8:14:8:14 | i |
-| main.rs:13:18:13:18 | i | main.rs:13:18:13:18 | i |
-| main.rs:18:9:18:10 | x1 | main.rs:18:9:18:10 | x1 |
-| main.rs:23:13:23:14 | x2 | main.rs:23:13:23:14 | x2 |
-| main.rs:25:5:25:6 | x2 | main.rs:23:13:23:14 | x2 |
-| main.rs:30:13:30:13 | x | main.rs:30:13:30:13 | x |
-| main.rs:32:5:32:5 | x | main.rs:30:13:30:13 | x |
-| main.rs:37:9:37:10 | x3 | main.rs:37:9:37:10 | x3 |
-| main.rs:39:9:39:10 | x3 | main.rs:39:9:39:10 | x3 |
-| main.rs:45:9:45:10 | x4 | main.rs:45:9:45:10 | x4 |
-| main.rs:48:13:48:14 | x4 | main.rs:48:13:48:14 | x4 |
-| main.rs:62:13:62:14 | a1 | main.rs:62:13:62:14 | a1 |
-| main.rs:63:13:63:14 | b1 | main.rs:63:13:63:14 | b1 |
-| main.rs:66:13:66:13 | x | main.rs:66:13:66:13 | x |
-| main.rs:67:13:67:13 | y | main.rs:67:13:67:13 | y |
-| main.rs:77:9:77:10 | p1 | main.rs:77:9:77:10 | p1 |
-| main.rs:79:12:79:13 | a2 | main.rs:79:12:79:13 | a2 |
-| main.rs:80:12:80:13 | b2 | main.rs:80:12:80:13 | b2 |
-| main.rs:87:9:87:10 | s1 | main.rs:87:9:87:10 | s1 |
-| main.rs:89:21:89:22 | s2 | main.rs:89:21:89:22 | s2 |
-| main.rs:96:14:96:15 | x5 | main.rs:96:14:96:15 | x5 |
-| main.rs:106:9:106:10 | s1 | main.rs:106:9:106:10 | s1 |
-| main.rs:108:24:108:25 | s2 | main.rs:108:24:108:25 | s2 |
-| main.rs:115:9:115:10 | x6 | main.rs:115:9:115:10 | x6 |
-| main.rs:116:9:116:10 | y1 | main.rs:116:9:116:10 | y1 |
-| main.rs:120:14:120:15 | y1 | main.rs:120:14:120:15 | y1 |
-| main.rs:132:9:132:15 | numbers | main.rs:132:9:132:15 | numbers |
-| main.rs:137:13:137:17 | first | main.rs:137:13:137:17 | first |
-| main.rs:139:13:139:17 | third | main.rs:139:13:139:17 | third |
-| main.rs:141:13:141:17 | fifth | main.rs:141:13:141:17 | fifth |
-| main.rs:152:13:152:17 | first | main.rs:152:13:152:17 | first |
-| main.rs:154:13:154:16 | last | main.rs:154:13:154:16 | last |
-| main.rs:163:9:163:10 | p2 | main.rs:163:9:163:10 | p2 |
-| main.rs:167:16:167:17 | x7 | main.rs:167:16:167:17 | x7 |
-| main.rs:177:9:177:11 | msg | main.rs:177:9:177:11 | msg |
-| main.rs:182:17:182:27 | id_variable | main.rs:182:17:182:27 | id_variable |
-| main.rs:187:26:187:27 | id | main.rs:187:26:187:27 | id |
-| main.rs:201:9:201:14 | either | main.rs:201:9:201:14 | either |
-| main.rs:203:9:203:44 | SSA phi(a3) | main.rs:203:9:203:44 | a3 |
-| main.rs:203:22:203:23 | a3 | main.rs:203:9:203:44 | a3 |
-| main.rs:203:42:203:43 | a3 | main.rs:203:9:203:44 | a3 |
-| main.rs:215:9:215:10 | tv | main.rs:215:9:215:10 | tv |
-| main.rs:217:9:217:81 | SSA phi(a4) | main.rs:217:9:217:81 | a4 |
-| main.rs:217:28:217:29 | a4 | main.rs:217:9:217:81 | a4 |
-| main.rs:217:54:217:55 | a4 | main.rs:217:9:217:81 | a4 |
-| main.rs:217:79:217:80 | a4 | main.rs:217:9:217:81 | a4 |
-| main.rs:221:9:221:83 | SSA phi(a5) | main.rs:221:9:221:83 | a5 |
-| main.rs:221:10:221:57 | [match(true)] SSA phi(a5) | main.rs:221:9:221:83 | a5 |
-| main.rs:221:29:221:30 | a5 | main.rs:221:9:221:83 | a5 |
-| main.rs:221:55:221:56 | a5 | main.rs:221:9:221:83 | a5 |
-| main.rs:221:81:221:82 | a5 | main.rs:221:9:221:83 | a5 |
-| main.rs:225:9:225:83 | SSA phi(a6) | main.rs:225:9:225:83 | a6 |
-| main.rs:225:28:225:29 | a6 | main.rs:225:9:225:83 | a6 |
-| main.rs:225:35:225:82 | SSA phi(a6) | main.rs:225:9:225:83 | a6 |
-| main.rs:225:55:225:56 | a6 | main.rs:225:9:225:83 | a6 |
-| main.rs:225:80:225:81 | a6 | main.rs:225:9:225:83 | a6 |
-| main.rs:231:9:231:14 | either | main.rs:231:9:231:14 | either |
-| main.rs:233:9:233:44 | [match(true)] SSA phi(a7) | main.rs:233:9:233:44 | a7 |
-| main.rs:233:22:233:23 | a7 | main.rs:233:9:233:44 | a7 |
-| main.rs:233:42:233:43 | a7 | main.rs:233:9:233:44 | a7 |
-| main.rs:241:9:241:14 | either | main.rs:241:9:241:14 | either |
-| main.rs:244:13:244:13 | e | main.rs:244:13:244:13 | e |
-| main.rs:245:14:245:51 | [match(true)] SSA phi(a11) | main.rs:245:14:245:51 | a11 |
-| main.rs:245:27:245:29 | a11 | main.rs:245:14:245:51 | a11 |
-| main.rs:245:48:245:50 | a11 | main.rs:245:14:245:51 | a11 |
-| main.rs:248:33:248:35 | a12 | main.rs:248:33:248:35 | a12 |
-| main.rs:265:9:265:10 | fv | main.rs:265:9:265:10 | fv |
-| main.rs:267:9:267:109 | SSA phi(a13) | main.rs:267:9:267:109 | a13 |
-| main.rs:267:27:267:29 | a13 | main.rs:267:9:267:109 | a13 |
-| main.rs:267:35:267:82 | [match(true)] SSA phi(a13) | main.rs:267:9:267:109 | a13 |
-| main.rs:267:54:267:56 | a13 | main.rs:267:9:267:109 | a13 |
-| main.rs:267:79:267:81 | a13 | main.rs:267:9:267:109 | a13 |
-| main.rs:267:106:267:108 | a13 | main.rs:267:9:267:109 | a13 |
-| main.rs:273:5:273:6 | a8 | main.rs:273:5:273:6 | a8 |
-| main.rs:275:9:275:10 | b3 | main.rs:275:9:275:10 | b3 |
-| main.rs:276:9:276:10 | c1 | main.rs:276:9:276:10 | c1 |
-| main.rs:284:20:284:55 | SSA phi(a9) | main.rs:284:20:284:55 | a9 |
-| main.rs:284:33:284:34 | a9 | main.rs:284:20:284:55 | a9 |
-| main.rs:284:53:284:54 | a9 | main.rs:284:20:284:55 | a9 |
-| main.rs:291:13:291:15 | a10 | main.rs:291:13:291:15 | a10 |
-| main.rs:292:13:292:14 | b4 | main.rs:292:13:292:14 | b4 |
-| main.rs:293:13:293:14 | c2 | main.rs:293:13:293:14 | c2 |
-| main.rs:300:9:300:10 | c2 | main.rs:293:13:293:14 | c2 |
-| main.rs:301:9:301:10 | b4 | main.rs:292:13:292:14 | b4 |
-| main.rs:302:9:302:11 | a10 | main.rs:291:13:291:15 | a10 |
-| main.rs:314:13:314:15 | a10 | main.rs:314:13:314:15 | a10 |
-| main.rs:315:13:315:14 | b4 | main.rs:315:13:315:14 | b4 |
-| main.rs:327:9:327:23 | example_closure | main.rs:327:9:327:23 | example_closure |
-| main.rs:328:10:328:10 | x | main.rs:328:10:328:10 | x |
-| main.rs:330:9:330:10 | n1 | main.rs:330:9:330:10 | n1 |
-| main.rs:335:9:335:26 | immutable_variable | main.rs:335:9:335:26 | immutable_variable |
-| main.rs:336:6:336:6 | x | main.rs:336:6:336:6 | x |
-| main.rs:338:9:338:10 | n2 | main.rs:338:9:338:10 | n2 |
-| main.rs:345:9:345:9 | f | main.rs:345:9:345:9 | f |
-| main.rs:346:10:346:10 | x | main.rs:346:10:346:10 | x |
-| main.rs:350:10:350:10 | x | main.rs:350:10:350:10 | x |
-| main.rs:359:14:359:14 | x | main.rs:359:14:359:14 | x |
-| main.rs:368:13:368:13 | f | main.rs:368:13:368:13 | f |
-| main.rs:369:14:369:14 | x | main.rs:369:14:369:14 | x |
-| main.rs:376:9:376:9 | v | main.rs:376:9:376:9 | v |
-| main.rs:378:9:378:12 | text | main.rs:378:9:378:12 | text |
-| main.rs:385:13:385:13 | a | main.rs:385:13:385:13 | a |
-| main.rs:386:5:386:5 | a | main.rs:385:13:385:13 | a |
-| main.rs:388:6:388:11 | &mut a | main.rs:385:13:385:13 | a |
-| main.rs:393:13:393:13 | i | main.rs:393:13:393:13 | i |
-| main.rs:394:9:394:13 | ref_i | main.rs:394:9:394:13 | ref_i |
-| main.rs:395:9:395:14 | &mut i | main.rs:393:13:393:13 | i |
-| main.rs:400:17:400:17 | x | main.rs:400:17:400:17 | x |
-| main.rs:407:22:407:22 | x | main.rs:407:22:407:22 | x |
-| main.rs:407:38:407:38 | y | main.rs:407:38:407:38 | y |
-| main.rs:416:13:416:13 | x | main.rs:416:13:416:13 | x |
-| main.rs:417:9:417:9 | y | main.rs:417:9:417:9 | y |
-| main.rs:418:22:418:27 | &mut x | main.rs:416:13:416:13 | x |
-| main.rs:423:13:423:13 | z | main.rs:423:13:423:13 | z |
-| main.rs:424:9:424:9 | w | main.rs:424:9:424:9 | w |
-| main.rs:427:9:427:14 | &mut z | main.rs:423:13:423:13 | z |
-| main.rs:436:13:436:13 | x | main.rs:436:13:436:13 | x |
-| main.rs:437:9:437:9 | y | main.rs:437:9:437:9 | y |
-| main.rs:438:9:438:14 | &mut x | main.rs:436:13:436:13 | x |
-| main.rs:444:9:444:9 | x | main.rs:444:9:444:9 | x |
-| main.rs:446:9:446:11 | cap | main.rs:446:9:446:11 | cap |
-| main.rs:446:15:448:5 | <captured entry> x | main.rs:444:9:444:9 | x |
-| main.rs:454:13:454:13 | x | main.rs:454:13:454:13 | x |
-| main.rs:456:9:456:16 | closure1 | main.rs:456:9:456:16 | closure1 |
-| main.rs:456:20:458:5 | <captured entry> x | main.rs:454:13:454:13 | x |
-| main.rs:462:13:462:13 | y | main.rs:462:13:462:13 | y |
-| main.rs:464:13:464:20 | closure2 | main.rs:464:13:464:20 | closure2 |
-| main.rs:465:9:465:9 | y | main.rs:462:13:462:13 | y |
-| main.rs:467:5:467:14 | <captured exit> y | main.rs:462:13:462:13 | y |
-| main.rs:470:13:470:13 | z | main.rs:470:13:470:13 | z |
-| main.rs:472:13:472:20 | closure3 | main.rs:472:13:472:20 | closure3 |
-| main.rs:472:24:474:5 | <captured entry> z | main.rs:470:13:470:13 | z |
-| main.rs:480:13:480:13 | i | main.rs:480:13:480:13 | i |
-| main.rs:481:9:481:13 | block | main.rs:481:9:481:13 | block |
-| main.rs:482:9:482:9 | i | main.rs:480:13:480:13 | i |
-| main.rs:485:5:485:15 | <captured exit> i | main.rs:480:13:480:13 | i |
-| main.rs:489:8:489:8 | b | main.rs:489:8:489:8 | b |
-| main.rs:490:13:490:13 | x | main.rs:490:13:490:13 | x |
-| main.rs:494:13:503:5 | SSA phi(x) | main.rs:490:13:490:13 | x |
-| main.rs:496:9:496:9 | x | main.rs:490:13:490:13 | x |
-| main.rs:500:9:500:9 | x | main.rs:490:13:490:13 | x |
-| main.rs:507:13:507:14 | b1 | main.rs:507:13:507:14 | b1 |
-| main.rs:507:23:507:24 | b2 | main.rs:507:23:507:24 | b2 |
-| main.rs:508:9:508:9 | x | main.rs:508:9:508:9 | x |
-| main.rs:531:20:531:23 | self | main.rs:531:20:531:23 | self |
-| main.rs:535:11:535:14 | self | main.rs:535:11:535:14 | self |
-| main.rs:539:23:539:26 | self | main.rs:539:23:539:26 | self |
-| main.rs:540:17:540:17 | f | main.rs:540:17:540:17 | f |
-| main.rs:540:21:543:9 | <captured entry> self | main.rs:539:23:539:26 | self |
-| main.rs:540:22:540:22 | n | main.rs:540:22:540:22 | n |
-| main.rs:550:13:550:13 | a | main.rs:550:13:550:13 | a |
-| main.rs:551:15:551:15 | a | main.rs:550:13:550:13 | a |
-| main.rs:554:5:554:5 | a | main.rs:550:13:550:13 | a |
-| main.rs:559:13:559:13 | a | main.rs:559:13:559:13 | a |
-| main.rs:563:5:563:5 | a | main.rs:559:13:559:13 | a |
-| main.rs:568:9:568:9 | x | main.rs:568:9:568:9 | x |
-| main.rs:572:9:572:9 | z | main.rs:572:9:572:9 | z |
-| main.rs:581:17:581:20 | self | main.rs:581:17:581:20 | self |
-| main.rs:587:13:587:13 | a | main.rs:587:13:587:13 | a |
-| main.rs:588:5:588:5 | a | main.rs:587:13:587:13 | a |
-| main.rs:608:9:608:22 | var_from_macro | main.rs:608:9:608:22 | var_from_macro |
-| main.rs:609:9:609:25 | var_in_macro | main.rs:609:9:609:25 | var_in_macro |
-| main.rs:611:9:611:20 | var_in_macro | main.rs:611:9:611:20 | var_in_macro |
-| main.rs:615:15:615:42 | var_in_macro | main.rs:615:15:615:42 | var_in_macro |
-| main.rs:621:5:621:5 | x | main.rs:620:9:620:9 | x |
-| main.rs:626:13:626:13 | x | main.rs:626:13:626:13 | x |
-| main.rs:627:13:627:15 | cap | main.rs:627:13:627:15 | cap |
-| main.rs:627:19:632:5 | <captured entry> x | main.rs:626:13:626:13 | x |
-| main.rs:627:20:627:20 | b | main.rs:627:20:627:20 | b |
-| main.rs:629:17:631:9 | SSA phi(x) | main.rs:626:13:626:13 | x |
-| main.rs:630:13:630:13 | x | main.rs:626:13:626:13 | x |
-| main.rs:633:5:633:13 | <captured exit> x | main.rs:626:13:626:13 | x |
+| main.rs:5:14:5:14 | s | main.rs:5:14:5:14 | s |
+| main.rs:10:14:10:14 | i | main.rs:10:14:10:14 | i |
+| main.rs:15:18:15:18 | i | main.rs:15:18:15:18 | i |
+| main.rs:20:9:20:10 | x1 | main.rs:20:9:20:10 | x1 |
+| main.rs:25:13:25:14 | x2 | main.rs:25:13:25:14 | x2 |
+| main.rs:27:5:27:6 | x2 | main.rs:25:13:25:14 | x2 |
+| main.rs:29:5:29:6 | x2 | main.rs:25:13:25:14 | x2 |
+| main.rs:34:13:34:13 | x | main.rs:34:13:34:13 | x |
+| main.rs:36:5:36:5 | x | main.rs:34:13:34:13 | x |
+| main.rs:41:9:41:10 | x3 | main.rs:41:9:41:10 | x3 |
+| main.rs:43:9:43:10 | x3 | main.rs:43:9:43:10 | x3 |
+| main.rs:49:9:49:10 | x4 | main.rs:49:9:49:10 | x4 |
+| main.rs:52:13:52:14 | x4 | main.rs:52:13:52:14 | x4 |
+| main.rs:66:13:66:14 | a1 | main.rs:66:13:66:14 | a1 |
+| main.rs:67:13:67:14 | b1 | main.rs:67:13:67:14 | b1 |
+| main.rs:70:13:70:13 | x | main.rs:70:13:70:13 | x |
+| main.rs:71:13:71:13 | y | main.rs:71:13:71:13 | y |
+| main.rs:81:9:81:10 | p1 | main.rs:81:9:81:10 | p1 |
+| main.rs:83:12:83:13 | a2 | main.rs:83:12:83:13 | a2 |
+| main.rs:84:12:84:13 | b2 | main.rs:84:12:84:13 | b2 |
+| main.rs:91:9:91:10 | s1 | main.rs:91:9:91:10 | s1 |
+| main.rs:93:21:93:22 | s2 | main.rs:93:21:93:22 | s2 |
+| main.rs:100:9:100:9 | x | main.rs:100:9:100:9 | x |
+| main.rs:101:14:101:14 | x | main.rs:101:14:101:14 | x |
+| main.rs:104:13:104:13 | x | main.rs:104:13:104:13 | x |
+| main.rs:113:9:113:10 | s1 | main.rs:113:9:113:10 | s1 |
+| main.rs:115:24:115:25 | s2 | main.rs:115:24:115:25 | s2 |
+| main.rs:122:9:122:10 | x6 | main.rs:122:9:122:10 | x6 |
+| main.rs:123:9:123:10 | y1 | main.rs:123:9:123:10 | y1 |
+| main.rs:127:14:127:15 | y1 | main.rs:127:14:127:15 | y1 |
+| main.rs:139:9:139:15 | numbers | main.rs:139:9:139:15 | numbers |
+| main.rs:144:13:144:17 | first | main.rs:144:13:144:17 | first |
+| main.rs:146:13:146:17 | third | main.rs:146:13:146:17 | third |
+| main.rs:148:13:148:17 | fifth | main.rs:148:13:148:17 | fifth |
+| main.rs:159:13:159:17 | first | main.rs:159:13:159:17 | first |
+| main.rs:161:13:161:16 | last | main.rs:161:13:161:16 | last |
+| main.rs:170:9:170:10 | p2 | main.rs:170:9:170:10 | p2 |
+| main.rs:174:16:174:17 | x7 | main.rs:174:16:174:17 | x7 |
+| main.rs:184:9:184:11 | msg | main.rs:184:9:184:11 | msg |
+| main.rs:189:17:189:27 | id_variable | main.rs:189:17:189:27 | id_variable |
+| main.rs:194:26:194:27 | id | main.rs:194:26:194:27 | id |
+| main.rs:208:9:208:14 | either | main.rs:208:9:208:14 | either |
+| main.rs:210:9:210:44 | SSA phi(a3) | main.rs:210:9:210:44 | a3 |
+| main.rs:210:22:210:23 | a3 | main.rs:210:9:210:44 | a3 |
+| main.rs:210:42:210:43 | a3 | main.rs:210:9:210:44 | a3 |
+| main.rs:222:9:222:10 | tv | main.rs:222:9:222:10 | tv |
+| main.rs:224:9:224:81 | SSA phi(a4) | main.rs:224:9:224:81 | a4 |
+| main.rs:224:28:224:29 | a4 | main.rs:224:9:224:81 | a4 |
+| main.rs:224:54:224:55 | a4 | main.rs:224:9:224:81 | a4 |
+| main.rs:224:79:224:80 | a4 | main.rs:224:9:224:81 | a4 |
+| main.rs:228:9:228:83 | SSA phi(a5) | main.rs:228:9:228:83 | a5 |
+| main.rs:228:10:228:57 | [match(true)] SSA phi(a5) | main.rs:228:9:228:83 | a5 |
+| main.rs:228:29:228:30 | a5 | main.rs:228:9:228:83 | a5 |
+| main.rs:228:55:228:56 | a5 | main.rs:228:9:228:83 | a5 |
+| main.rs:228:81:228:82 | a5 | main.rs:228:9:228:83 | a5 |
+| main.rs:232:9:232:83 | SSA phi(a6) | main.rs:232:9:232:83 | a6 |
+| main.rs:232:28:232:29 | a6 | main.rs:232:9:232:83 | a6 |
+| main.rs:232:35:232:82 | SSA phi(a6) | main.rs:232:9:232:83 | a6 |
+| main.rs:232:55:232:56 | a6 | main.rs:232:9:232:83 | a6 |
+| main.rs:232:80:232:81 | a6 | main.rs:232:9:232:83 | a6 |
+| main.rs:238:9:238:14 | either | main.rs:238:9:238:14 | either |
+| main.rs:240:9:240:44 | [match(true)] SSA phi(a7) | main.rs:240:9:240:44 | a7 |
+| main.rs:240:22:240:23 | a7 | main.rs:240:9:240:44 | a7 |
+| main.rs:240:42:240:43 | a7 | main.rs:240:9:240:44 | a7 |
+| main.rs:248:9:248:14 | either | main.rs:248:9:248:14 | either |
+| main.rs:251:13:251:13 | e | main.rs:251:13:251:13 | e |
+| main.rs:252:14:252:51 | [match(true)] SSA phi(a11) | main.rs:252:14:252:51 | a11 |
+| main.rs:252:27:252:29 | a11 | main.rs:252:14:252:51 | a11 |
+| main.rs:252:48:252:50 | a11 | main.rs:252:14:252:51 | a11 |
+| main.rs:255:33:255:35 | a12 | main.rs:255:33:255:35 | a12 |
+| main.rs:272:9:272:10 | fv | main.rs:272:9:272:10 | fv |
+| main.rs:274:9:274:109 | SSA phi(a13) | main.rs:274:9:274:109 | a13 |
+| main.rs:274:27:274:29 | a13 | main.rs:274:9:274:109 | a13 |
+| main.rs:274:35:274:82 | [match(true)] SSA phi(a13) | main.rs:274:9:274:109 | a13 |
+| main.rs:274:54:274:56 | a13 | main.rs:274:9:274:109 | a13 |
+| main.rs:274:79:274:81 | a13 | main.rs:274:9:274:109 | a13 |
+| main.rs:274:106:274:108 | a13 | main.rs:274:9:274:109 | a13 |
+| main.rs:281:9:281:9 | x | main.rs:281:9:281:9 | x |
+| main.rs:282:17:282:17 | x | main.rs:282:17:282:17 | x |
+| main.rs:289:13:289:13 | x | main.rs:289:13:289:13 | x |
+| main.rs:297:9:297:9 | x | main.rs:297:9:297:9 | x |
+| main.rs:298:17:298:17 | x | main.rs:298:17:298:17 | x |
+| main.rs:301:14:301:14 | x | main.rs:301:14:301:14 | x |
+| main.rs:308:13:308:13 | x | main.rs:308:13:308:13 | x |
+| main.rs:316:9:316:9 | x | main.rs:316:9:316:9 | x |
+| main.rs:317:20:317:20 | x | main.rs:317:20:317:20 | x |
+| main.rs:320:14:320:14 | x | main.rs:320:14:320:14 | x |
+| main.rs:334:9:334:9 | x | main.rs:334:9:334:9 | x |
+| main.rs:336:14:336:14 | x | main.rs:336:14:336:14 | x |
+| main.rs:337:20:337:20 | x | main.rs:337:20:337:20 | x |
+| main.rs:348:9:348:9 | x | main.rs:348:9:348:9 | x |
+| main.rs:349:16:349:16 | x | main.rs:349:16:349:16 | x |
+| main.rs:354:20:354:20 | x | main.rs:354:20:354:20 | x |
+| main.rs:364:9:364:9 | x | main.rs:364:9:364:9 | x |
+| main.rs:366:18:366:18 | x | main.rs:366:18:366:18 | x |
+| main.rs:373:9:373:9 | x | main.rs:373:9:373:9 | x |
+| main.rs:375:14:375:14 | y | main.rs:375:14:375:14 | y |
+| main.rs:376:25:376:25 | y | main.rs:376:25:376:25 | y |
+| main.rs:384:5:384:6 | a8 | main.rs:384:5:384:6 | a8 |
+| main.rs:386:9:386:10 | b3 | main.rs:386:9:386:10 | b3 |
+| main.rs:387:9:387:10 | c1 | main.rs:387:9:387:10 | c1 |
+| main.rs:395:20:395:55 | SSA phi(a9) | main.rs:395:20:395:55 | a9 |
+| main.rs:395:33:395:34 | a9 | main.rs:395:20:395:55 | a9 |
+| main.rs:395:53:395:54 | a9 | main.rs:395:20:395:55 | a9 |
+| main.rs:402:13:402:15 | a10 | main.rs:402:13:402:15 | a10 |
+| main.rs:403:13:403:14 | b4 | main.rs:403:13:403:14 | b4 |
+| main.rs:404:13:404:14 | c2 | main.rs:404:13:404:14 | c2 |
+| main.rs:411:9:411:10 | c2 | main.rs:404:13:404:14 | c2 |
+| main.rs:412:9:412:10 | b4 | main.rs:403:13:403:14 | b4 |
+| main.rs:413:9:413:11 | a10 | main.rs:402:13:402:15 | a10 |
+| main.rs:425:13:425:15 | a10 | main.rs:425:13:425:15 | a10 |
+| main.rs:426:13:426:14 | b4 | main.rs:426:13:426:14 | b4 |
+| main.rs:438:9:438:23 | example_closure | main.rs:438:9:438:23 | example_closure |
+| main.rs:439:10:439:10 | x | main.rs:439:10:439:10 | x |
+| main.rs:441:9:441:10 | n1 | main.rs:441:9:441:10 | n1 |
+| main.rs:446:9:446:26 | immutable_variable | main.rs:446:9:446:26 | immutable_variable |
+| main.rs:447:6:447:6 | x | main.rs:447:6:447:6 | x |
+| main.rs:449:9:449:10 | n2 | main.rs:449:9:449:10 | n2 |
+| main.rs:456:9:456:9 | f | main.rs:456:9:456:9 | f |
+| main.rs:457:10:457:10 | x | main.rs:457:10:457:10 | x |
+| main.rs:461:10:461:10 | x | main.rs:461:10:461:10 | x |
+| main.rs:470:14:470:14 | x | main.rs:470:14:470:14 | x |
+| main.rs:479:13:479:13 | f | main.rs:479:13:479:13 | f |
+| main.rs:480:14:480:14 | x | main.rs:480:14:480:14 | x |
+| main.rs:487:9:487:9 | v | main.rs:487:9:487:9 | v |
+| main.rs:489:9:489:12 | text | main.rs:489:9:489:12 | text |
+| main.rs:496:13:496:13 | a | main.rs:496:13:496:13 | a |
+| main.rs:497:5:497:5 | a | main.rs:496:13:496:13 | a |
+| main.rs:499:6:499:11 | &mut a | main.rs:496:13:496:13 | a |
+| main.rs:504:13:504:13 | i | main.rs:504:13:504:13 | i |
+| main.rs:505:9:505:13 | ref_i | main.rs:505:9:505:13 | ref_i |
+| main.rs:506:9:506:14 | &mut i | main.rs:504:13:504:13 | i |
+| main.rs:511:17:511:17 | x | main.rs:511:17:511:17 | x |
+| main.rs:518:22:518:22 | x | main.rs:518:22:518:22 | x |
+| main.rs:518:38:518:38 | y | main.rs:518:38:518:38 | y |
+| main.rs:527:13:527:13 | x | main.rs:527:13:527:13 | x |
+| main.rs:528:9:528:9 | y | main.rs:528:9:528:9 | y |
+| main.rs:529:22:529:27 | &mut x | main.rs:527:13:527:13 | x |
+| main.rs:535:13:535:13 | z | main.rs:535:13:535:13 | z |
+| main.rs:536:9:536:9 | w | main.rs:536:9:536:9 | w |
+| main.rs:539:9:539:14 | &mut z | main.rs:535:13:535:13 | z |
+| main.rs:549:13:549:13 | x | main.rs:549:13:549:13 | x |
+| main.rs:550:9:550:9 | y | main.rs:550:9:550:9 | y |
+| main.rs:551:9:551:14 | &mut x | main.rs:549:13:549:13 | x |
+| main.rs:557:9:557:9 | x | main.rs:557:9:557:9 | x |
+| main.rs:560:9:560:11 | cap | main.rs:560:9:560:11 | cap |
+| main.rs:560:15:562:5 | <captured entry> x | main.rs:557:9:557:9 | x |
+| main.rs:568:13:568:13 | x | main.rs:568:13:568:13 | x |
+| main.rs:571:9:571:16 | closure1 | main.rs:571:9:571:16 | closure1 |
+| main.rs:571:20:573:5 | <captured entry> x | main.rs:568:13:568:13 | x |
+| main.rs:577:13:577:13 | y | main.rs:577:13:577:13 | y |
+| main.rs:580:13:580:20 | closure2 | main.rs:580:13:580:20 | closure2 |
+| main.rs:581:9:581:9 | y | main.rs:577:13:577:13 | y |
+| main.rs:583:5:583:14 | <captured exit> y | main.rs:577:13:577:13 | y |
+| main.rs:586:13:586:13 | z | main.rs:586:13:586:13 | z |
+| main.rs:589:13:589:20 | closure3 | main.rs:589:13:589:20 | closure3 |
+| main.rs:589:24:591:5 | <captured entry> z | main.rs:586:13:586:13 | z |
+| main.rs:597:13:597:13 | i | main.rs:597:13:597:13 | i |
+| main.rs:598:9:598:13 | block | main.rs:598:9:598:13 | block |
+| main.rs:599:9:599:9 | i | main.rs:597:13:597:13 | i |
+| main.rs:602:5:602:15 | <captured exit> i | main.rs:597:13:597:13 | i |
+| main.rs:606:8:606:8 | b | main.rs:606:8:606:8 | b |
+| main.rs:607:13:607:13 | x | main.rs:607:13:607:13 | x |
+| main.rs:611:13:620:5 | SSA phi(x) | main.rs:607:13:607:13 | x |
+| main.rs:613:9:613:9 | x | main.rs:607:13:607:13 | x |
+| main.rs:617:9:617:9 | x | main.rs:607:13:607:13 | x |
+| main.rs:624:13:624:14 | b1 | main.rs:624:13:624:14 | b1 |
+| main.rs:624:23:624:24 | b2 | main.rs:624:23:624:24 | b2 |
+| main.rs:625:9:625:9 | x | main.rs:625:9:625:9 | x |
+| main.rs:648:20:648:23 | self | main.rs:648:20:648:23 | self |
+| main.rs:652:11:652:14 | self | main.rs:652:11:652:14 | self |
+| main.rs:656:23:656:26 | self | main.rs:656:23:656:26 | self |
+| main.rs:657:17:657:17 | f | main.rs:657:17:657:17 | f |
+| main.rs:657:21:660:9 | <captured entry> self | main.rs:656:23:656:26 | self |
+| main.rs:657:22:657:22 | n | main.rs:657:22:657:22 | n |
+| main.rs:667:13:667:13 | a | main.rs:667:13:667:13 | a |
+| main.rs:668:15:668:15 | a | main.rs:667:13:667:13 | a |
+| main.rs:671:5:671:5 | a | main.rs:667:13:667:13 | a |
+| main.rs:676:13:676:13 | a | main.rs:676:13:676:13 | a |
+| main.rs:680:5:680:5 | a | main.rs:676:13:676:13 | a |
+| main.rs:685:9:685:9 | x | main.rs:685:9:685:9 | x |
+| main.rs:689:9:689:9 | z | main.rs:689:9:689:9 | z |
+| main.rs:698:17:698:20 | self | main.rs:698:17:698:20 | self |
+| main.rs:704:13:704:13 | a | main.rs:704:13:704:13 | a |
+| main.rs:705:5:705:5 | a | main.rs:704:13:704:13 | a |
+| main.rs:726:9:726:22 | var_from_macro | main.rs:726:9:726:22 | var_from_macro |
+| main.rs:727:9:727:21 | var_in_macro | main.rs:727:9:727:21 | var_in_macro |
+| main.rs:729:9:729:20 | var_in_macro | main.rs:729:9:729:20 | var_in_macro |
+| main.rs:734:15:734:28 | var_in_macro | main.rs:734:15:734:28 | var_in_macro |
+| main.rs:740:5:740:5 | x | main.rs:739:9:739:9 | x |
+| main.rs:745:13:745:13 | x | main.rs:745:13:745:13 | x |
+| main.rs:746:13:746:15 | cap | main.rs:746:13:746:15 | cap |
+| main.rs:746:19:751:5 | <captured entry> x | main.rs:745:13:745:13 | x |
+| main.rs:746:20:746:20 | b | main.rs:746:20:746:20 | b |
+| main.rs:748:17:750:9 | SSA phi(x) | main.rs:745:13:745:13 | x |
+| main.rs:749:13:749:13 | x | main.rs:745:13:745:13 | x |
+| main.rs:752:5:752:13 | <captured exit> x | main.rs:745:13:745:13 | x |
 read
-| main.rs:3:14:3:14 | s | main.rs:3:14:3:14 | s | main.rs:5:20:5:20 | s |
-| main.rs:8:14:8:14 | i | main.rs:8:14:8:14 | i | main.rs:10:20:10:20 | i |
-| main.rs:13:18:13:18 | i | main.rs:13:18:13:18 | i | main.rs:14:16:14:16 | i |
-| main.rs:18:9:18:10 | x1 | main.rs:18:9:18:10 | x1 | main.rs:19:15:19:16 | x1 |
-| main.rs:23:13:23:14 | x2 | main.rs:23:13:23:14 | x2 | main.rs:24:15:24:16 | x2 |
-| main.rs:25:5:25:6 | x2 | main.rs:23:13:23:14 | x2 | main.rs:26:15:26:16 | x2 |
-| main.rs:30:13:30:13 | x | main.rs:30:13:30:13 | x | main.rs:31:20:31:20 | x |
-| main.rs:32:5:32:5 | x | main.rs:30:13:30:13 | x | main.rs:33:20:33:20 | x |
-| main.rs:37:9:37:10 | x3 | main.rs:37:9:37:10 | x3 | main.rs:38:15:38:16 | x3 |
-| main.rs:37:9:37:10 | x3 | main.rs:37:9:37:10 | x3 | main.rs:40:9:40:10 | x3 |
-| main.rs:39:9:39:10 | x3 | main.rs:39:9:39:10 | x3 | main.rs:41:15:41:16 | x3 |
-| main.rs:45:9:45:10 | x4 | main.rs:45:9:45:10 | x4 | main.rs:46:15:46:16 | x4 |
-| main.rs:45:9:45:10 | x4 | main.rs:45:9:45:10 | x4 | main.rs:51:15:51:16 | x4 |
-| main.rs:48:13:48:14 | x4 | main.rs:48:13:48:14 | x4 | main.rs:49:19:49:20 | x4 |
-| main.rs:62:13:62:14 | a1 | main.rs:62:13:62:14 | a1 | main.rs:70:15:70:16 | a1 |
-| main.rs:63:13:63:14 | b1 | main.rs:63:13:63:14 | b1 | main.rs:71:15:71:16 | b1 |
-| main.rs:66:13:66:13 | x | main.rs:66:13:66:13 | x | main.rs:72:15:72:15 | x |
-| main.rs:67:13:67:13 | y | main.rs:67:13:67:13 | y | main.rs:73:15:73:15 | y |
-| main.rs:77:9:77:10 | p1 | main.rs:77:9:77:10 | p1 | main.rs:81:9:81:10 | p1 |
-| main.rs:79:12:79:13 | a2 | main.rs:79:12:79:13 | a2 | main.rs:82:15:82:16 | a2 |
-| main.rs:80:12:80:13 | b2 | main.rs:80:12:80:13 | b2 | main.rs:83:15:83:16 | b2 |
-| main.rs:87:9:87:10 | s1 | main.rs:87:9:87:10 | s1 | main.rs:90:11:90:12 | s1 |
-| main.rs:89:21:89:22 | s2 | main.rs:89:21:89:22 | s2 | main.rs:91:19:91:20 | s2 |
-| main.rs:96:14:96:15 | x5 | main.rs:96:14:96:15 | x5 | main.rs:102:15:102:16 | x5 |
-| main.rs:106:9:106:10 | s1 | main.rs:106:9:106:10 | s1 | main.rs:109:11:109:12 | s1 |
-| main.rs:108:24:108:25 | s2 | main.rs:108:24:108:25 | s2 | main.rs:110:19:110:20 | s2 |
-| main.rs:115:9:115:10 | x6 | main.rs:115:9:115:10 | x6 | main.rs:118:11:118:12 | x6 |
-| main.rs:116:9:116:10 | y1 | main.rs:116:9:116:10 | y1 | main.rs:128:15:128:16 | y1 |
-| main.rs:120:14:120:15 | y1 | main.rs:120:14:120:15 | y1 | main.rs:123:23:123:24 | y1 |
-| main.rs:132:9:132:15 | numbers | main.rs:132:9:132:15 | numbers | main.rs:134:11:134:17 | numbers |
-| main.rs:132:9:132:15 | numbers | main.rs:132:9:132:15 | numbers | main.rs:149:11:149:17 | numbers |
-| main.rs:137:13:137:17 | first | main.rs:137:13:137:17 | first | main.rs:143:23:143:27 | first |
-| main.rs:139:13:139:17 | third | main.rs:139:13:139:17 | third | main.rs:144:23:144:27 | third |
-| main.rs:141:13:141:17 | fifth | main.rs:141:13:141:17 | fifth | main.rs:145:23:145:27 | fifth |
-| main.rs:152:13:152:17 | first | main.rs:152:13:152:17 | first | main.rs:156:23:156:27 | first |
-| main.rs:154:13:154:16 | last | main.rs:154:13:154:16 | last | main.rs:157:23:157:26 | last |
-| main.rs:163:9:163:10 | p2 | main.rs:163:9:163:10 | p2 | main.rs:165:11:165:12 | p2 |
-| main.rs:167:16:167:17 | x7 | main.rs:167:16:167:17 | x7 | main.rs:168:24:168:25 | x7 |
-| main.rs:177:9:177:11 | msg | main.rs:177:9:177:11 | msg | main.rs:179:11:179:13 | msg |
-| main.rs:182:17:182:27 | id_variable | main.rs:182:17:182:27 | id_variable | main.rs:183:24:183:34 | id_variable |
-| main.rs:187:26:187:27 | id | main.rs:187:26:187:27 | id | main.rs:190:23:190:24 | id |
-| main.rs:201:9:201:14 | either | main.rs:201:9:201:14 | either | main.rs:202:11:202:16 | either |
-| main.rs:203:9:203:44 | SSA phi(a3) | main.rs:203:9:203:44 | a3 | main.rs:204:26:204:27 | a3 |
-| main.rs:215:9:215:10 | tv | main.rs:215:9:215:10 | tv | main.rs:216:11:216:12 | tv |
-| main.rs:215:9:215:10 | tv | main.rs:215:9:215:10 | tv | main.rs:220:11:220:12 | tv |
-| main.rs:215:9:215:10 | tv | main.rs:215:9:215:10 | tv | main.rs:224:11:224:12 | tv |
-| main.rs:217:9:217:81 | SSA phi(a4) | main.rs:217:9:217:81 | a4 | main.rs:218:26:218:27 | a4 |
-| main.rs:221:9:221:83 | SSA phi(a5) | main.rs:221:9:221:83 | a5 | main.rs:222:26:222:27 | a5 |
-| main.rs:225:9:225:83 | SSA phi(a6) | main.rs:225:9:225:83 | a6 | main.rs:226:26:226:27 | a6 |
-| main.rs:231:9:231:14 | either | main.rs:231:9:231:14 | either | main.rs:232:11:232:16 | either |
-| main.rs:233:9:233:44 | [match(true)] SSA phi(a7) | main.rs:233:9:233:44 | a7 | main.rs:234:16:234:17 | a7 |
-| main.rs:233:9:233:44 | [match(true)] SSA phi(a7) | main.rs:233:9:233:44 | a7 | main.rs:235:26:235:27 | a7 |
-| main.rs:241:9:241:14 | either | main.rs:241:9:241:14 | either | main.rs:243:11:243:16 | either |
-| main.rs:244:13:244:13 | e | main.rs:244:13:244:13 | e | main.rs:249:15:249:15 | e |
-| main.rs:245:14:245:51 | [match(true)] SSA phi(a11) | main.rs:245:14:245:51 | a11 | main.rs:247:23:247:25 | a11 |
-| main.rs:248:33:248:35 | a12 | main.rs:248:33:248:35 | a12 | main.rs:250:28:250:30 | a12 |
-| main.rs:265:9:265:10 | fv | main.rs:265:9:265:10 | fv | main.rs:266:11:266:12 | fv |
-| main.rs:267:9:267:109 | SSA phi(a13) | main.rs:267:9:267:109 | a13 | main.rs:268:26:268:28 | a13 |
-| main.rs:273:5:273:6 | a8 | main.rs:273:5:273:6 | a8 | main.rs:279:15:279:16 | a8 |
-| main.rs:275:9:275:10 | b3 | main.rs:275:9:275:10 | b3 | main.rs:280:15:280:16 | b3 |
-| main.rs:276:9:276:10 | c1 | main.rs:276:9:276:10 | c1 | main.rs:281:15:281:16 | c1 |
-| main.rs:284:20:284:55 | SSA phi(a9) | main.rs:284:20:284:55 | a9 | main.rs:286:15:286:16 | a9 |
-| main.rs:291:13:291:15 | a10 | main.rs:291:13:291:15 | a10 | main.rs:295:15:295:17 | a10 |
-| main.rs:292:13:292:14 | b4 | main.rs:292:13:292:14 | b4 | main.rs:296:15:296:16 | b4 |
-| main.rs:293:13:293:14 | c2 | main.rs:293:13:293:14 | c2 | main.rs:297:15:297:16 | c2 |
-| main.rs:300:9:300:10 | c2 | main.rs:293:13:293:14 | c2 | main.rs:306:9:306:10 | c2 |
-| main.rs:300:9:300:10 | c2 | main.rs:293:13:293:14 | c2 | main.rs:310:15:310:16 | c2 |
-| main.rs:301:9:301:10 | b4 | main.rs:292:13:292:14 | b4 | main.rs:305:9:305:10 | b4 |
-| main.rs:301:9:301:10 | b4 | main.rs:292:13:292:14 | b4 | main.rs:309:15:309:16 | b4 |
-| main.rs:301:9:301:10 | b4 | main.rs:292:13:292:14 | b4 | main.rs:323:15:323:16 | b4 |
-| main.rs:302:9:302:11 | a10 | main.rs:291:13:291:15 | a10 | main.rs:304:9:304:11 | a10 |
-| main.rs:302:9:302:11 | a10 | main.rs:291:13:291:15 | a10 | main.rs:308:15:308:17 | a10 |
-| main.rs:302:9:302:11 | a10 | main.rs:291:13:291:15 | a10 | main.rs:322:15:322:17 | a10 |
-| main.rs:314:13:314:15 | a10 | main.rs:314:13:314:15 | a10 | main.rs:317:23:317:25 | a10 |
-| main.rs:315:13:315:14 | b4 | main.rs:315:13:315:14 | b4 | main.rs:318:23:318:24 | b4 |
-| main.rs:327:9:327:23 | example_closure | main.rs:327:9:327:23 | example_closure | main.rs:331:9:331:23 | example_closure |
-| main.rs:328:10:328:10 | x | main.rs:328:10:328:10 | x | main.rs:329:9:329:9 | x |
-| main.rs:330:9:330:10 | n1 | main.rs:330:9:330:10 | n1 | main.rs:332:15:332:16 | n1 |
-| main.rs:335:9:335:26 | immutable_variable | main.rs:335:9:335:26 | immutable_variable | main.rs:339:9:339:26 | immutable_variable |
-| main.rs:336:6:336:6 | x | main.rs:336:6:336:6 | x | main.rs:337:9:337:9 | x |
-| main.rs:338:9:338:10 | n2 | main.rs:338:9:338:10 | n2 | main.rs:340:15:340:16 | n2 |
-| main.rs:345:9:345:9 | f | main.rs:345:9:345:9 | f | main.rs:348:15:348:15 | f |
-| main.rs:345:9:345:9 | f | main.rs:345:9:345:9 | f | main.rs:355:15:355:15 | f |
-| main.rs:346:10:346:10 | x | main.rs:346:10:346:10 | x | main.rs:347:9:347:9 | x |
-| main.rs:350:10:350:10 | x | main.rs:350:10:350:10 | x | main.rs:352:9:352:9 | x |
-| main.rs:359:14:359:14 | x | main.rs:359:14:359:14 | x | main.rs:361:17:361:17 | x |
-| main.rs:368:13:368:13 | f | main.rs:368:13:368:13 | f | main.rs:371:19:371:19 | f |
-| main.rs:369:14:369:14 | x | main.rs:369:14:369:14 | x | main.rs:370:13:370:13 | x |
-| main.rs:376:9:376:9 | v | main.rs:376:9:376:9 | v | main.rs:379:12:379:12 | v |
-| main.rs:378:9:378:12 | text | main.rs:378:9:378:12 | text | main.rs:380:19:380:22 | text |
-| main.rs:385:13:385:13 | a | main.rs:385:13:385:13 | a | main.rs:386:5:386:5 | a |
-| main.rs:386:5:386:5 | a | main.rs:385:13:385:13 | a | main.rs:387:15:387:15 | a |
-| main.rs:386:5:386:5 | a | main.rs:385:13:385:13 | a | main.rs:388:11:388:11 | a |
-| main.rs:388:6:388:11 | &mut a | main.rs:385:13:385:13 | a | main.rs:389:15:389:15 | a |
-| main.rs:393:13:393:13 | i | main.rs:393:13:393:13 | i | main.rs:395:14:395:14 | i |
-| main.rs:394:9:394:13 | ref_i | main.rs:394:9:394:13 | ref_i | main.rs:396:6:396:10 | ref_i |
-| main.rs:395:9:395:14 | &mut i | main.rs:393:13:393:13 | i | main.rs:397:15:397:15 | i |
-| main.rs:400:17:400:17 | x | main.rs:400:17:400:17 | x | main.rs:401:6:401:6 | x |
-| main.rs:400:17:400:17 | x | main.rs:400:17:400:17 | x | main.rs:402:10:402:10 | x |
-| main.rs:400:17:400:17 | x | main.rs:400:17:400:17 | x | main.rs:403:10:403:10 | x |
-| main.rs:400:17:400:17 | x | main.rs:400:17:400:17 | x | main.rs:404:12:404:12 | x |
-| main.rs:407:22:407:22 | x | main.rs:407:22:407:22 | x | main.rs:408:6:408:6 | x |
-| main.rs:407:22:407:22 | x | main.rs:407:22:407:22 | x | main.rs:409:10:409:10 | x |
-| main.rs:407:22:407:22 | x | main.rs:407:22:407:22 | x | main.rs:410:10:410:10 | x |
-| main.rs:407:22:407:22 | x | main.rs:407:22:407:22 | x | main.rs:412:9:412:9 | x |
-| main.rs:407:38:407:38 | y | main.rs:407:38:407:38 | y | main.rs:411:6:411:6 | y |
-| main.rs:416:13:416:13 | x | main.rs:416:13:416:13 | x | main.rs:418:27:418:27 | x |
-| main.rs:417:9:417:9 | y | main.rs:417:9:417:9 | y | main.rs:419:6:419:6 | y |
-| main.rs:418:22:418:27 | &mut x | main.rs:416:13:416:13 | x | main.rs:421:15:421:15 | x |
-| main.rs:418:22:418:27 | &mut x | main.rs:416:13:416:13 | x | main.rs:425:19:425:19 | x |
-| main.rs:423:13:423:13 | z | main.rs:423:13:423:13 | z | main.rs:427:14:427:14 | z |
-| main.rs:424:9:424:9 | w | main.rs:424:9:424:9 | w | main.rs:428:9:428:9 | w |
-| main.rs:424:9:424:9 | w | main.rs:424:9:424:9 | w | main.rs:430:7:430:7 | w |
-| main.rs:427:9:427:14 | &mut z | main.rs:423:13:423:13 | z | main.rs:432:15:432:15 | z |
-| main.rs:436:13:436:13 | x | main.rs:436:13:436:13 | x | main.rs:438:14:438:14 | x |
-| main.rs:437:9:437:9 | y | main.rs:437:9:437:9 | y | main.rs:439:6:439:6 | y |
-| main.rs:438:9:438:14 | &mut x | main.rs:436:13:436:13 | x | main.rs:440:15:440:15 | x |
-| main.rs:444:9:444:9 | x | main.rs:444:9:444:9 | x | main.rs:450:15:450:15 | x |
-| main.rs:446:9:446:11 | cap | main.rs:446:9:446:11 | cap | main.rs:449:5:449:7 | cap |
-| main.rs:446:15:448:5 | <captured entry> x | main.rs:444:9:444:9 | x | main.rs:447:19:447:19 | x |
-| main.rs:454:13:454:13 | x | main.rs:454:13:454:13 | x | main.rs:460:15:460:15 | x |
-| main.rs:456:9:456:16 | closure1 | main.rs:456:9:456:16 | closure1 | main.rs:459:5:459:12 | closure1 |
-| main.rs:456:20:458:5 | <captured entry> x | main.rs:454:13:454:13 | x | main.rs:457:19:457:19 | x |
-| main.rs:464:13:464:20 | closure2 | main.rs:464:13:464:20 | closure2 | main.rs:467:5:467:12 | closure2 |
-| main.rs:467:5:467:14 | <captured exit> y | main.rs:462:13:462:13 | y | main.rs:468:15:468:15 | y |
-| main.rs:470:13:470:13 | z | main.rs:470:13:470:13 | z | main.rs:476:15:476:15 | z |
-| main.rs:472:13:472:20 | closure3 | main.rs:472:13:472:20 | closure3 | main.rs:475:5:475:12 | closure3 |
-| main.rs:472:24:474:5 | <captured entry> z | main.rs:470:13:470:13 | z | main.rs:473:9:473:9 | z |
-| main.rs:481:9:481:13 | block | main.rs:481:9:481:13 | block | main.rs:485:5:485:9 | block |
-| main.rs:485:5:485:15 | <captured exit> i | main.rs:480:13:480:13 | i | main.rs:486:15:486:15 | i |
-| main.rs:489:8:489:8 | b | main.rs:489:8:489:8 | b | main.rs:494:16:494:16 | b |
-| main.rs:490:13:490:13 | x | main.rs:490:13:490:13 | x | main.rs:491:15:491:15 | x |
-| main.rs:490:13:490:13 | x | main.rs:490:13:490:13 | x | main.rs:492:15:492:15 | x |
-| main.rs:494:13:503:5 | SSA phi(x) | main.rs:490:13:490:13 | x | main.rs:504:15:504:15 | x |
-| main.rs:496:9:496:9 | x | main.rs:490:13:490:13 | x | main.rs:497:19:497:19 | x |
-| main.rs:496:9:496:9 | x | main.rs:490:13:490:13 | x | main.rs:498:19:498:19 | x |
-| main.rs:500:9:500:9 | x | main.rs:490:13:490:13 | x | main.rs:501:19:501:19 | x |
-| main.rs:500:9:500:9 | x | main.rs:490:13:490:13 | x | main.rs:502:19:502:19 | x |
-| main.rs:507:13:507:14 | b1 | main.rs:507:13:507:14 | b1 | main.rs:510:16:510:17 | b1 |
-| main.rs:507:23:507:24 | b2 | main.rs:507:23:507:24 | b2 | main.rs:518:16:518:17 | b2 |
-| main.rs:508:9:508:9 | x | main.rs:508:9:508:9 | x | main.rs:512:19:512:19 | x |
-| main.rs:508:9:508:9 | x | main.rs:508:9:508:9 | x | main.rs:514:19:514:19 | x |
-| main.rs:508:9:508:9 | x | main.rs:508:9:508:9 | x | main.rs:520:19:520:19 | x |
-| main.rs:508:9:508:9 | x | main.rs:508:9:508:9 | x | main.rs:522:19:522:19 | x |
-| main.rs:531:20:531:23 | self | main.rs:531:20:531:23 | self | main.rs:532:16:532:19 | self |
-| main.rs:535:11:535:14 | self | main.rs:535:11:535:14 | self | main.rs:536:9:536:12 | self |
-| main.rs:540:17:540:17 | f | main.rs:540:17:540:17 | f | main.rs:544:9:544:9 | f |
-| main.rs:540:17:540:17 | f | main.rs:540:17:540:17 | f | main.rs:545:9:545:9 | f |
-| main.rs:540:21:543:9 | <captured entry> self | main.rs:539:23:539:26 | self | main.rs:542:13:542:16 | self |
-| main.rs:540:22:540:22 | n | main.rs:540:22:540:22 | n | main.rs:542:25:542:25 | n |
-| main.rs:550:13:550:13 | a | main.rs:550:13:550:13 | a | main.rs:551:15:551:15 | a |
-| main.rs:551:15:551:15 | a | main.rs:550:13:550:13 | a | main.rs:552:5:552:5 | a |
-| main.rs:551:15:551:15 | a | main.rs:550:13:550:13 | a | main.rs:553:15:553:15 | a |
-| main.rs:554:5:554:5 | a | main.rs:550:13:550:13 | a | main.rs:555:15:555:15 | a |
-| main.rs:559:13:559:13 | a | main.rs:559:13:559:13 | a | main.rs:560:15:560:15 | a |
-| main.rs:559:13:559:13 | a | main.rs:559:13:559:13 | a | main.rs:561:5:561:5 | a |
-| main.rs:559:13:559:13 | a | main.rs:559:13:559:13 | a | main.rs:562:15:562:15 | a |
-| main.rs:563:5:563:5 | a | main.rs:559:13:559:13 | a | main.rs:564:15:564:15 | a |
-| main.rs:568:9:568:9 | x | main.rs:568:9:568:9 | x | main.rs:569:20:569:20 | x |
-| main.rs:568:9:568:9 | x | main.rs:568:9:568:9 | x | main.rs:570:15:570:15 | x |
-| main.rs:572:9:572:9 | z | main.rs:572:9:572:9 | z | main.rs:573:20:573:20 | z |
-| main.rs:581:17:581:20 | self | main.rs:581:17:581:20 | self | main.rs:582:10:582:13 | self |
-| main.rs:587:13:587:13 | a | main.rs:587:13:587:13 | a | main.rs:588:5:588:5 | a |
-| main.rs:588:5:588:5 | a | main.rs:587:13:587:13 | a | main.rs:590:15:590:15 | a |
-| main.rs:608:9:608:22 | var_from_macro | main.rs:608:9:608:22 | var_from_macro | main.rs:610:15:610:28 | var_from_macro |
-| main.rs:609:9:609:25 | var_in_macro | main.rs:609:9:609:25 | var_in_macro | main.rs:609:9:609:25 | var_in_macro |
-| main.rs:611:9:611:20 | var_in_macro | main.rs:611:9:611:20 | var_in_macro | main.rs:616:15:616:26 | var_in_macro |
-| main.rs:615:15:615:42 | var_in_macro | main.rs:615:15:615:42 | var_in_macro | main.rs:615:30:615:41 | var_in_macro |
-| main.rs:621:5:621:5 | x | main.rs:620:9:620:9 | x | main.rs:622:15:622:15 | x |
-| main.rs:627:13:627:15 | cap | main.rs:627:13:627:15 | cap | main.rs:633:5:633:7 | cap |
-| main.rs:627:20:627:20 | b | main.rs:627:20:627:20 | b | main.rs:629:20:629:20 | b |
-| main.rs:633:5:633:13 | <captured exit> x | main.rs:626:13:626:13 | x | main.rs:634:15:634:15 | x |
+| main.rs:5:14:5:14 | s | main.rs:5:14:5:14 | s | main.rs:7:20:7:20 | s |
+| main.rs:10:14:10:14 | i | main.rs:10:14:10:14 | i | main.rs:12:20:12:20 | i |
+| main.rs:15:18:15:18 | i | main.rs:15:18:15:18 | i | main.rs:16:16:16:16 | i |
+| main.rs:20:9:20:10 | x1 | main.rs:20:9:20:10 | x1 | main.rs:21:15:21:16 | x1 |
+| main.rs:25:13:25:14 | x2 | main.rs:25:13:25:14 | x2 | main.rs:26:15:26:16 | x2 |
+| main.rs:27:5:27:6 | x2 | main.rs:25:13:25:14 | x2 | main.rs:28:15:28:16 | x2 |
+| main.rs:27:5:27:6 | x2 | main.rs:25:13:25:14 | x2 | main.rs:29:10:29:11 | x2 |
+| main.rs:29:5:29:6 | x2 | main.rs:25:13:25:14 | x2 | main.rs:30:15:30:16 | x2 |
+| main.rs:34:13:34:13 | x | main.rs:34:13:34:13 | x | main.rs:35:20:35:20 | x |
+| main.rs:36:5:36:5 | x | main.rs:34:13:34:13 | x | main.rs:37:20:37:20 | x |
+| main.rs:41:9:41:10 | x3 | main.rs:41:9:41:10 | x3 | main.rs:42:15:42:16 | x3 |
+| main.rs:41:9:41:10 | x3 | main.rs:41:9:41:10 | x3 | main.rs:44:9:44:10 | x3 |
+| main.rs:43:9:43:10 | x3 | main.rs:43:9:43:10 | x3 | main.rs:45:15:45:16 | x3 |
+| main.rs:49:9:49:10 | x4 | main.rs:49:9:49:10 | x4 | main.rs:50:15:50:16 | x4 |
+| main.rs:49:9:49:10 | x4 | main.rs:49:9:49:10 | x4 | main.rs:55:15:55:16 | x4 |
+| main.rs:52:13:52:14 | x4 | main.rs:52:13:52:14 | x4 | main.rs:53:19:53:20 | x4 |
+| main.rs:66:13:66:14 | a1 | main.rs:66:13:66:14 | a1 | main.rs:74:15:74:16 | a1 |
+| main.rs:67:13:67:14 | b1 | main.rs:67:13:67:14 | b1 | main.rs:75:15:75:16 | b1 |
+| main.rs:70:13:70:13 | x | main.rs:70:13:70:13 | x | main.rs:76:15:76:15 | x |
+| main.rs:71:13:71:13 | y | main.rs:71:13:71:13 | y | main.rs:77:15:77:15 | y |
+| main.rs:81:9:81:10 | p1 | main.rs:81:9:81:10 | p1 | main.rs:85:9:85:10 | p1 |
+| main.rs:83:12:83:13 | a2 | main.rs:83:12:83:13 | a2 | main.rs:86:15:86:16 | a2 |
+| main.rs:84:12:84:13 | b2 | main.rs:84:12:84:13 | b2 | main.rs:87:15:87:16 | b2 |
+| main.rs:91:9:91:10 | s1 | main.rs:91:9:91:10 | s1 | main.rs:94:11:94:12 | s1 |
+| main.rs:93:21:93:22 | s2 | main.rs:93:21:93:22 | s2 | main.rs:95:19:95:20 | s2 |
+| main.rs:100:9:100:9 | x | main.rs:100:9:100:9 | x | main.rs:102:7:102:7 | x |
+| main.rs:100:9:100:9 | x | main.rs:100:9:100:9 | x | main.rs:105:13:105:13 | x |
+| main.rs:101:14:101:14 | x | main.rs:101:14:101:14 | x | main.rs:109:15:109:15 | x |
+| main.rs:104:13:104:13 | x | main.rs:104:13:104:13 | x | main.rs:106:19:106:19 | x |
+| main.rs:113:9:113:10 | s1 | main.rs:113:9:113:10 | s1 | main.rs:116:11:116:12 | s1 |
+| main.rs:115:24:115:25 | s2 | main.rs:115:24:115:25 | s2 | main.rs:117:19:117:20 | s2 |
+| main.rs:122:9:122:10 | x6 | main.rs:122:9:122:10 | x6 | main.rs:125:11:125:12 | x6 |
+| main.rs:123:9:123:10 | y1 | main.rs:123:9:123:10 | y1 | main.rs:135:15:135:16 | y1 |
+| main.rs:127:14:127:15 | y1 | main.rs:127:14:127:15 | y1 | main.rs:130:23:130:24 | y1 |
+| main.rs:139:9:139:15 | numbers | main.rs:139:9:139:15 | numbers | main.rs:141:11:141:17 | numbers |
+| main.rs:139:9:139:15 | numbers | main.rs:139:9:139:15 | numbers | main.rs:156:11:156:17 | numbers |
+| main.rs:144:13:144:17 | first | main.rs:144:13:144:17 | first | main.rs:150:23:150:27 | first |
+| main.rs:146:13:146:17 | third | main.rs:146:13:146:17 | third | main.rs:151:23:151:27 | third |
+| main.rs:148:13:148:17 | fifth | main.rs:148:13:148:17 | fifth | main.rs:152:23:152:27 | fifth |
+| main.rs:159:13:159:17 | first | main.rs:159:13:159:17 | first | main.rs:163:23:163:27 | first |
+| main.rs:161:13:161:16 | last | main.rs:161:13:161:16 | last | main.rs:164:23:164:26 | last |
+| main.rs:170:9:170:10 | p2 | main.rs:170:9:170:10 | p2 | main.rs:172:11:172:12 | p2 |
+| main.rs:174:16:174:17 | x7 | main.rs:174:16:174:17 | x7 | main.rs:175:24:175:25 | x7 |
+| main.rs:184:9:184:11 | msg | main.rs:184:9:184:11 | msg | main.rs:186:11:186:13 | msg |
+| main.rs:189:17:189:27 | id_variable | main.rs:189:17:189:27 | id_variable | main.rs:190:24:190:34 | id_variable |
+| main.rs:194:26:194:27 | id | main.rs:194:26:194:27 | id | main.rs:197:23:197:24 | id |
+| main.rs:208:9:208:14 | either | main.rs:208:9:208:14 | either | main.rs:209:11:209:16 | either |
+| main.rs:210:9:210:44 | SSA phi(a3) | main.rs:210:9:210:44 | a3 | main.rs:211:26:211:27 | a3 |
+| main.rs:222:9:222:10 | tv | main.rs:222:9:222:10 | tv | main.rs:223:11:223:12 | tv |
+| main.rs:222:9:222:10 | tv | main.rs:222:9:222:10 | tv | main.rs:227:11:227:12 | tv |
+| main.rs:222:9:222:10 | tv | main.rs:222:9:222:10 | tv | main.rs:231:11:231:12 | tv |
+| main.rs:224:9:224:81 | SSA phi(a4) | main.rs:224:9:224:81 | a4 | main.rs:225:26:225:27 | a4 |
+| main.rs:228:9:228:83 | SSA phi(a5) | main.rs:228:9:228:83 | a5 | main.rs:229:26:229:27 | a5 |
+| main.rs:232:9:232:83 | SSA phi(a6) | main.rs:232:9:232:83 | a6 | main.rs:233:26:233:27 | a6 |
+| main.rs:238:9:238:14 | either | main.rs:238:9:238:14 | either | main.rs:239:11:239:16 | either |
+| main.rs:240:9:240:44 | [match(true)] SSA phi(a7) | main.rs:240:9:240:44 | a7 | main.rs:241:16:241:17 | a7 |
+| main.rs:240:9:240:44 | [match(true)] SSA phi(a7) | main.rs:240:9:240:44 | a7 | main.rs:242:26:242:27 | a7 |
+| main.rs:248:9:248:14 | either | main.rs:248:9:248:14 | either | main.rs:250:11:250:16 | either |
+| main.rs:251:13:251:13 | e | main.rs:251:13:251:13 | e | main.rs:256:15:256:15 | e |
+| main.rs:252:14:252:51 | [match(true)] SSA phi(a11) | main.rs:252:14:252:51 | a11 | main.rs:254:23:254:25 | a11 |
+| main.rs:255:33:255:35 | a12 | main.rs:255:33:255:35 | a12 | main.rs:257:28:257:30 | a12 |
+| main.rs:272:9:272:10 | fv | main.rs:272:9:272:10 | fv | main.rs:273:11:273:12 | fv |
+| main.rs:274:9:274:109 | SSA phi(a13) | main.rs:274:9:274:109 | a13 | main.rs:275:26:275:28 | a13 |
+| main.rs:281:9:281:9 | x | main.rs:281:9:281:9 | x | main.rs:283:7:283:7 | x |
+| main.rs:281:9:281:9 | x | main.rs:281:9:281:9 | x | main.rs:290:13:290:13 | x |
+| main.rs:282:17:282:17 | x | main.rs:282:17:282:17 | x | main.rs:285:5:285:5 | x |
+| main.rs:282:17:282:17 | x | main.rs:282:17:282:17 | x | main.rs:287:19:287:19 | x |
+| main.rs:289:13:289:13 | x | main.rs:289:13:289:13 | x | main.rs:291:19:291:19 | x |
+| main.rs:297:9:297:9 | x | main.rs:297:9:297:9 | x | main.rs:299:7:299:7 | x |
+| main.rs:297:9:297:9 | x | main.rs:297:9:297:9 | x | main.rs:309:13:309:13 | x |
+| main.rs:298:17:298:17 | x | main.rs:298:17:298:17 | x | main.rs:302:12:302:12 | x |
+| main.rs:301:14:301:14 | x | main.rs:301:14:301:14 | x | main.rs:304:5:304:5 | x |
+| main.rs:301:14:301:14 | x | main.rs:301:14:301:14 | x | main.rs:306:19:306:19 | x |
+| main.rs:308:13:308:13 | x | main.rs:308:13:308:13 | x | main.rs:310:19:310:19 | x |
+| main.rs:316:9:316:9 | x | main.rs:316:9:316:9 | x | main.rs:318:7:318:7 | x |
+| main.rs:316:9:316:9 | x | main.rs:316:9:316:9 | x | main.rs:329:15:329:15 | x |
+| main.rs:317:20:317:20 | x | main.rs:317:20:317:20 | x | main.rs:321:12:321:12 | x |
+| main.rs:320:14:320:14 | x | main.rs:320:14:320:14 | x | main.rs:323:5:323:5 | x |
+| main.rs:320:14:320:14 | x | main.rs:320:14:320:14 | x | main.rs:325:19:325:19 | x |
+| main.rs:334:9:334:9 | x | main.rs:334:9:334:9 | x | main.rs:335:11:335:11 | x |
+| main.rs:334:9:334:9 | x | main.rs:334:9:334:9 | x | main.rs:343:15:343:15 | x |
+| main.rs:336:14:336:14 | x | main.rs:336:14:336:14 | x | main.rs:338:18:338:18 | x |
+| main.rs:337:20:337:20 | x | main.rs:337:20:337:20 | x | main.rs:339:19:339:19 | x |
+| main.rs:348:9:348:9 | x | main.rs:348:9:348:9 | x | main.rs:350:7:350:7 | x |
+| main.rs:348:9:348:9 | x | main.rs:348:9:348:9 | x | main.rs:355:7:355:7 | x |
+| main.rs:348:9:348:9 | x | main.rs:348:9:348:9 | x | main.rs:359:19:359:19 | x |
+| main.rs:349:16:349:16 | x | main.rs:349:16:349:16 | x | main.rs:352:19:352:19 | x |
+| main.rs:354:20:354:20 | x | main.rs:354:20:354:20 | x | main.rs:357:19:357:19 | x |
+| main.rs:364:9:364:9 | x | main.rs:364:9:364:9 | x | main.rs:365:11:365:11 | x |
+| main.rs:366:18:366:18 | x | main.rs:366:18:366:18 | x | main.rs:367:20:367:20 | x |
+| main.rs:373:9:373:9 | x | main.rs:373:9:373:9 | x | main.rs:374:11:374:11 | x |
+| main.rs:375:14:375:14 | y | main.rs:375:14:375:14 | y | main.rs:377:22:377:22 | y |
+| main.rs:376:25:376:25 | y | main.rs:376:25:376:25 | y | main.rs:378:26:378:26 | y |
+| main.rs:384:5:384:6 | a8 | main.rs:384:5:384:6 | a8 | main.rs:390:15:390:16 | a8 |
+| main.rs:386:9:386:10 | b3 | main.rs:386:9:386:10 | b3 | main.rs:391:15:391:16 | b3 |
+| main.rs:387:9:387:10 | c1 | main.rs:387:9:387:10 | c1 | main.rs:392:15:392:16 | c1 |
+| main.rs:395:20:395:55 | SSA phi(a9) | main.rs:395:20:395:55 | a9 | main.rs:397:15:397:16 | a9 |
+| main.rs:402:13:402:15 | a10 | main.rs:402:13:402:15 | a10 | main.rs:406:15:406:17 | a10 |
+| main.rs:402:13:402:15 | a10 | main.rs:402:13:402:15 | a10 | main.rs:415:9:415:11 | a10 |
+| main.rs:403:13:403:14 | b4 | main.rs:403:13:403:14 | b4 | main.rs:407:15:407:16 | b4 |
+| main.rs:403:13:403:14 | b4 | main.rs:403:13:403:14 | b4 | main.rs:416:9:416:10 | b4 |
+| main.rs:404:13:404:14 | c2 | main.rs:404:13:404:14 | c2 | main.rs:408:15:408:16 | c2 |
+| main.rs:404:13:404:14 | c2 | main.rs:404:13:404:14 | c2 | main.rs:417:9:417:10 | c2 |
+| main.rs:411:9:411:10 | c2 | main.rs:404:13:404:14 | c2 | main.rs:421:15:421:16 | c2 |
+| main.rs:412:9:412:10 | b4 | main.rs:403:13:403:14 | b4 | main.rs:420:15:420:16 | b4 |
+| main.rs:412:9:412:10 | b4 | main.rs:403:13:403:14 | b4 | main.rs:434:15:434:16 | b4 |
+| main.rs:413:9:413:11 | a10 | main.rs:402:13:402:15 | a10 | main.rs:419:15:419:17 | a10 |
+| main.rs:413:9:413:11 | a10 | main.rs:402:13:402:15 | a10 | main.rs:433:15:433:17 | a10 |
+| main.rs:425:13:425:15 | a10 | main.rs:425:13:425:15 | a10 | main.rs:428:23:428:25 | a10 |
+| main.rs:426:13:426:14 | b4 | main.rs:426:13:426:14 | b4 | main.rs:429:23:429:24 | b4 |
+| main.rs:438:9:438:23 | example_closure | main.rs:438:9:438:23 | example_closure | main.rs:442:9:442:23 | example_closure |
+| main.rs:439:10:439:10 | x | main.rs:439:10:439:10 | x | main.rs:440:9:440:9 | x |
+| main.rs:441:9:441:10 | n1 | main.rs:441:9:441:10 | n1 | main.rs:443:15:443:16 | n1 |
+| main.rs:446:9:446:26 | immutable_variable | main.rs:446:9:446:26 | immutable_variable | main.rs:450:9:450:26 | immutable_variable |
+| main.rs:447:6:447:6 | x | main.rs:447:6:447:6 | x | main.rs:448:9:448:9 | x |
+| main.rs:449:9:449:10 | n2 | main.rs:449:9:449:10 | n2 | main.rs:451:15:451:16 | n2 |
+| main.rs:456:9:456:9 | f | main.rs:456:9:456:9 | f | main.rs:459:15:459:15 | f |
+| main.rs:456:9:456:9 | f | main.rs:456:9:456:9 | f | main.rs:466:15:466:15 | f |
+| main.rs:457:10:457:10 | x | main.rs:457:10:457:10 | x | main.rs:458:9:458:9 | x |
+| main.rs:461:10:461:10 | x | main.rs:461:10:461:10 | x | main.rs:463:9:463:9 | x |
+| main.rs:470:14:470:14 | x | main.rs:470:14:470:14 | x | main.rs:472:17:472:17 | x |
+| main.rs:479:13:479:13 | f | main.rs:479:13:479:13 | f | main.rs:482:19:482:19 | f |
+| main.rs:480:14:480:14 | x | main.rs:480:14:480:14 | x | main.rs:481:13:481:13 | x |
+| main.rs:487:9:487:9 | v | main.rs:487:9:487:9 | v | main.rs:490:12:490:12 | v |
+| main.rs:489:9:489:12 | text | main.rs:489:9:489:12 | text | main.rs:491:19:491:22 | text |
+| main.rs:496:13:496:13 | a | main.rs:496:13:496:13 | a | main.rs:497:5:497:5 | a |
+| main.rs:497:5:497:5 | a | main.rs:496:13:496:13 | a | main.rs:498:15:498:15 | a |
+| main.rs:497:5:497:5 | a | main.rs:496:13:496:13 | a | main.rs:499:11:499:11 | a |
+| main.rs:499:6:499:11 | &mut a | main.rs:496:13:496:13 | a | main.rs:500:15:500:15 | a |
+| main.rs:504:13:504:13 | i | main.rs:504:13:504:13 | i | main.rs:506:14:506:14 | i |
+| main.rs:505:9:505:13 | ref_i | main.rs:505:9:505:13 | ref_i | main.rs:507:6:507:10 | ref_i |
+| main.rs:506:9:506:14 | &mut i | main.rs:504:13:504:13 | i | main.rs:508:15:508:15 | i |
+| main.rs:511:17:511:17 | x | main.rs:511:17:511:17 | x | main.rs:512:6:512:6 | x |
+| main.rs:511:17:511:17 | x | main.rs:511:17:511:17 | x | main.rs:513:10:513:10 | x |
+| main.rs:511:17:511:17 | x | main.rs:511:17:511:17 | x | main.rs:514:10:514:10 | x |
+| main.rs:511:17:511:17 | x | main.rs:511:17:511:17 | x | main.rs:515:12:515:12 | x |
+| main.rs:518:22:518:22 | x | main.rs:518:22:518:22 | x | main.rs:519:6:519:6 | x |
+| main.rs:518:22:518:22 | x | main.rs:518:22:518:22 | x | main.rs:520:10:520:10 | x |
+| main.rs:518:22:518:22 | x | main.rs:518:22:518:22 | x | main.rs:521:10:521:10 | x |
+| main.rs:518:22:518:22 | x | main.rs:518:22:518:22 | x | main.rs:523:9:523:9 | x |
+| main.rs:518:38:518:38 | y | main.rs:518:38:518:38 | y | main.rs:522:6:522:6 | y |
+| main.rs:527:13:527:13 | x | main.rs:527:13:527:13 | x | main.rs:529:27:529:27 | x |
+| main.rs:528:9:528:9 | y | main.rs:528:9:528:9 | y | main.rs:530:6:530:6 | y |
+| main.rs:529:22:529:27 | &mut x | main.rs:527:13:527:13 | x | main.rs:533:15:533:15 | x |
+| main.rs:529:22:529:27 | &mut x | main.rs:527:13:527:13 | x | main.rs:537:19:537:19 | x |
+| main.rs:535:13:535:13 | z | main.rs:535:13:535:13 | z | main.rs:539:14:539:14 | z |
+| main.rs:536:9:536:9 | w | main.rs:536:9:536:9 | w | main.rs:540:9:540:9 | w |
+| main.rs:536:9:536:9 | w | main.rs:536:9:536:9 | w | main.rs:542:7:542:7 | w |
+| main.rs:539:9:539:14 | &mut z | main.rs:535:13:535:13 | z | main.rs:545:15:545:15 | z |
+| main.rs:549:13:549:13 | x | main.rs:549:13:549:13 | x | main.rs:551:14:551:14 | x |
+| main.rs:550:9:550:9 | y | main.rs:550:9:550:9 | y | main.rs:552:6:552:6 | y |
+| main.rs:551:9:551:14 | &mut x | main.rs:549:13:549:13 | x | main.rs:553:15:553:15 | x |
+| main.rs:557:9:557:9 | x | main.rs:557:9:557:9 | x | main.rs:564:15:564:15 | x |
+| main.rs:560:9:560:11 | cap | main.rs:560:9:560:11 | cap | main.rs:563:5:563:7 | cap |
+| main.rs:560:15:562:5 | <captured entry> x | main.rs:557:9:557:9 | x | main.rs:561:19:561:19 | x |
+| main.rs:568:13:568:13 | x | main.rs:568:13:568:13 | x | main.rs:575:15:575:15 | x |
+| main.rs:571:9:571:16 | closure1 | main.rs:571:9:571:16 | closure1 | main.rs:574:5:574:12 | closure1 |
+| main.rs:571:20:573:5 | <captured entry> x | main.rs:568:13:568:13 | x | main.rs:572:19:572:19 | x |
+| main.rs:580:13:580:20 | closure2 | main.rs:580:13:580:20 | closure2 | main.rs:583:5:583:12 | closure2 |
+| main.rs:583:5:583:14 | <captured exit> y | main.rs:577:13:577:13 | y | main.rs:584:15:584:15 | y |
+| main.rs:586:13:586:13 | z | main.rs:586:13:586:13 | z | main.rs:593:15:593:15 | z |
+| main.rs:589:13:589:20 | closure3 | main.rs:589:13:589:20 | closure3 | main.rs:592:5:592:12 | closure3 |
+| main.rs:589:24:591:5 | <captured entry> z | main.rs:586:13:586:13 | z | main.rs:590:9:590:9 | z |
+| main.rs:598:9:598:13 | block | main.rs:598:9:598:13 | block | main.rs:602:5:602:9 | block |
+| main.rs:602:5:602:15 | <captured exit> i | main.rs:597:13:597:13 | i | main.rs:603:15:603:15 | i |
+| main.rs:606:8:606:8 | b | main.rs:606:8:606:8 | b | main.rs:611:16:611:16 | b |
+| main.rs:607:13:607:13 | x | main.rs:607:13:607:13 | x | main.rs:608:15:608:15 | x |
+| main.rs:607:13:607:13 | x | main.rs:607:13:607:13 | x | main.rs:609:15:609:15 | x |
+| main.rs:611:13:620:5 | SSA phi(x) | main.rs:607:13:607:13 | x | main.rs:621:15:621:15 | x |
+| main.rs:613:9:613:9 | x | main.rs:607:13:607:13 | x | main.rs:614:19:614:19 | x |
+| main.rs:613:9:613:9 | x | main.rs:607:13:607:13 | x | main.rs:615:19:615:19 | x |
+| main.rs:617:9:617:9 | x | main.rs:607:13:607:13 | x | main.rs:618:19:618:19 | x |
+| main.rs:617:9:617:9 | x | main.rs:607:13:607:13 | x | main.rs:619:19:619:19 | x |
+| main.rs:624:13:624:14 | b1 | main.rs:624:13:624:14 | b1 | main.rs:627:16:627:17 | b1 |
+| main.rs:624:23:624:24 | b2 | main.rs:624:23:624:24 | b2 | main.rs:635:16:635:17 | b2 |
+| main.rs:625:9:625:9 | x | main.rs:625:9:625:9 | x | main.rs:629:19:629:19 | x |
+| main.rs:625:9:625:9 | x | main.rs:625:9:625:9 | x | main.rs:631:19:631:19 | x |
+| main.rs:625:9:625:9 | x | main.rs:625:9:625:9 | x | main.rs:637:19:637:19 | x |
+| main.rs:625:9:625:9 | x | main.rs:625:9:625:9 | x | main.rs:639:19:639:19 | x |
+| main.rs:648:20:648:23 | self | main.rs:648:20:648:23 | self | main.rs:649:16:649:19 | self |
+| main.rs:652:11:652:14 | self | main.rs:652:11:652:14 | self | main.rs:653:9:653:12 | self |
+| main.rs:657:17:657:17 | f | main.rs:657:17:657:17 | f | main.rs:661:9:661:9 | f |
+| main.rs:657:17:657:17 | f | main.rs:657:17:657:17 | f | main.rs:662:9:662:9 | f |
+| main.rs:657:21:660:9 | <captured entry> self | main.rs:656:23:656:26 | self | main.rs:659:13:659:16 | self |
+| main.rs:657:22:657:22 | n | main.rs:657:22:657:22 | n | main.rs:659:25:659:25 | n |
+| main.rs:667:13:667:13 | a | main.rs:667:13:667:13 | a | main.rs:668:15:668:15 | a |
+| main.rs:668:15:668:15 | a | main.rs:667:13:667:13 | a | main.rs:669:5:669:5 | a |
+| main.rs:668:15:668:15 | a | main.rs:667:13:667:13 | a | main.rs:670:15:670:15 | a |
+| main.rs:671:5:671:5 | a | main.rs:667:13:667:13 | a | main.rs:672:15:672:15 | a |
+| main.rs:676:13:676:13 | a | main.rs:676:13:676:13 | a | main.rs:677:15:677:15 | a |
+| main.rs:676:13:676:13 | a | main.rs:676:13:676:13 | a | main.rs:678:5:678:5 | a |
+| main.rs:676:13:676:13 | a | main.rs:676:13:676:13 | a | main.rs:679:15:679:15 | a |
+| main.rs:680:5:680:5 | a | main.rs:676:13:676:13 | a | main.rs:681:15:681:15 | a |
+| main.rs:685:9:685:9 | x | main.rs:685:9:685:9 | x | main.rs:686:20:686:20 | x |
+| main.rs:685:9:685:9 | x | main.rs:685:9:685:9 | x | main.rs:687:15:687:15 | x |
+| main.rs:689:9:689:9 | z | main.rs:689:9:689:9 | z | main.rs:690:20:690:20 | z |
+| main.rs:698:17:698:20 | self | main.rs:698:17:698:20 | self | main.rs:699:10:699:13 | self |
+| main.rs:704:13:704:13 | a | main.rs:704:13:704:13 | a | main.rs:705:5:705:5 | a |
+| main.rs:705:5:705:5 | a | main.rs:704:13:704:13 | a | main.rs:708:15:708:15 | a |
+| main.rs:726:9:726:22 | var_from_macro | main.rs:726:9:726:22 | var_from_macro | main.rs:728:15:728:28 | var_from_macro |
+| main.rs:727:9:727:21 | var_in_macro | main.rs:727:9:727:21 | var_in_macro | main.rs:727:9:727:21 | var_in_macro |
+| main.rs:729:9:729:20 | var_in_macro | main.rs:729:9:729:20 | var_in_macro | main.rs:735:15:735:26 | var_in_macro |
+| main.rs:734:15:734:28 | var_in_macro | main.rs:734:15:734:28 | var_in_macro | main.rs:734:30:734:41 | var_in_macro |
+| main.rs:740:5:740:5 | x | main.rs:739:9:739:9 | x | main.rs:741:15:741:15 | x |
+| main.rs:746:13:746:15 | cap | main.rs:746:13:746:15 | cap | main.rs:752:5:752:7 | cap |
+| main.rs:746:20:746:20 | b | main.rs:746:20:746:20 | b | main.rs:748:20:748:20 | b |
+| main.rs:752:5:752:13 | <captured exit> x | main.rs:745:13:745:13 | x | main.rs:753:15:753:15 | x |
 firstRead
-| main.rs:3:14:3:14 | s | main.rs:3:14:3:14 | s | main.rs:5:20:5:20 | s |
-| main.rs:8:14:8:14 | i | main.rs:8:14:8:14 | i | main.rs:10:20:10:20 | i |
-| main.rs:13:18:13:18 | i | main.rs:13:18:13:18 | i | main.rs:14:16:14:16 | i |
-| main.rs:18:9:18:10 | x1 | main.rs:18:9:18:10 | x1 | main.rs:19:15:19:16 | x1 |
-| main.rs:23:13:23:14 | x2 | main.rs:23:13:23:14 | x2 | main.rs:24:15:24:16 | x2 |
-| main.rs:25:5:25:6 | x2 | main.rs:23:13:23:14 | x2 | main.rs:26:15:26:16 | x2 |
-| main.rs:30:13:30:13 | x | main.rs:30:13:30:13 | x | main.rs:31:20:31:20 | x |
-| main.rs:32:5:32:5 | x | main.rs:30:13:30:13 | x | main.rs:33:20:33:20 | x |
-| main.rs:37:9:37:10 | x3 | main.rs:37:9:37:10 | x3 | main.rs:38:15:38:16 | x3 |
-| main.rs:39:9:39:10 | x3 | main.rs:39:9:39:10 | x3 | main.rs:41:15:41:16 | x3 |
-| main.rs:45:9:45:10 | x4 | main.rs:45:9:45:10 | x4 | main.rs:46:15:46:16 | x4 |
-| main.rs:48:13:48:14 | x4 | main.rs:48:13:48:14 | x4 | main.rs:49:19:49:20 | x4 |
-| main.rs:62:13:62:14 | a1 | main.rs:62:13:62:14 | a1 | main.rs:70:15:70:16 | a1 |
-| main.rs:63:13:63:14 | b1 | main.rs:63:13:63:14 | b1 | main.rs:71:15:71:16 | b1 |
-| main.rs:66:13:66:13 | x | main.rs:66:13:66:13 | x | main.rs:72:15:72:15 | x |
-| main.rs:67:13:67:13 | y | main.rs:67:13:67:13 | y | main.rs:73:15:73:15 | y |
-| main.rs:77:9:77:10 | p1 | main.rs:77:9:77:10 | p1 | main.rs:81:9:81:10 | p1 |
-| main.rs:79:12:79:13 | a2 | main.rs:79:12:79:13 | a2 | main.rs:82:15:82:16 | a2 |
-| main.rs:80:12:80:13 | b2 | main.rs:80:12:80:13 | b2 | main.rs:83:15:83:16 | b2 |
-| main.rs:87:9:87:10 | s1 | main.rs:87:9:87:10 | s1 | main.rs:90:11:90:12 | s1 |
-| main.rs:89:21:89:22 | s2 | main.rs:89:21:89:22 | s2 | main.rs:91:19:91:20 | s2 |
-| main.rs:96:14:96:15 | x5 | main.rs:96:14:96:15 | x5 | main.rs:102:15:102:16 | x5 |
-| main.rs:106:9:106:10 | s1 | main.rs:106:9:106:10 | s1 | main.rs:109:11:109:12 | s1 |
-| main.rs:108:24:108:25 | s2 | main.rs:108:24:108:25 | s2 | main.rs:110:19:110:20 | s2 |
-| main.rs:115:9:115:10 | x6 | main.rs:115:9:115:10 | x6 | main.rs:118:11:118:12 | x6 |
-| main.rs:116:9:116:10 | y1 | main.rs:116:9:116:10 | y1 | main.rs:128:15:128:16 | y1 |
-| main.rs:120:14:120:15 | y1 | main.rs:120:14:120:15 | y1 | main.rs:123:23:123:24 | y1 |
-| main.rs:132:9:132:15 | numbers | main.rs:132:9:132:15 | numbers | main.rs:134:11:134:17 | numbers |
-| main.rs:137:13:137:17 | first | main.rs:137:13:137:17 | first | main.rs:143:23:143:27 | first |
-| main.rs:139:13:139:17 | third | main.rs:139:13:139:17 | third | main.rs:144:23:144:27 | third |
-| main.rs:141:13:141:17 | fifth | main.rs:141:13:141:17 | fifth | main.rs:145:23:145:27 | fifth |
-| main.rs:152:13:152:17 | first | main.rs:152:13:152:17 | first | main.rs:156:23:156:27 | first |
-| main.rs:154:13:154:16 | last | main.rs:154:13:154:16 | last | main.rs:157:23:157:26 | last |
-| main.rs:163:9:163:10 | p2 | main.rs:163:9:163:10 | p2 | main.rs:165:11:165:12 | p2 |
-| main.rs:167:16:167:17 | x7 | main.rs:167:16:167:17 | x7 | main.rs:168:24:168:25 | x7 |
-| main.rs:177:9:177:11 | msg | main.rs:177:9:177:11 | msg | main.rs:179:11:179:13 | msg |
-| main.rs:182:17:182:27 | id_variable | main.rs:182:17:182:27 | id_variable | main.rs:183:24:183:34 | id_variable |
-| main.rs:187:26:187:27 | id | main.rs:187:26:187:27 | id | main.rs:190:23:190:24 | id |
-| main.rs:201:9:201:14 | either | main.rs:201:9:201:14 | either | main.rs:202:11:202:16 | either |
-| main.rs:203:9:203:44 | SSA phi(a3) | main.rs:203:9:203:44 | a3 | main.rs:204:26:204:27 | a3 |
-| main.rs:215:9:215:10 | tv | main.rs:215:9:215:10 | tv | main.rs:216:11:216:12 | tv |
-| main.rs:217:9:217:81 | SSA phi(a4) | main.rs:217:9:217:81 | a4 | main.rs:218:26:218:27 | a4 |
-| main.rs:221:9:221:83 | SSA phi(a5) | main.rs:221:9:221:83 | a5 | main.rs:222:26:222:27 | a5 |
-| main.rs:225:9:225:83 | SSA phi(a6) | main.rs:225:9:225:83 | a6 | main.rs:226:26:226:27 | a6 |
-| main.rs:231:9:231:14 | either | main.rs:231:9:231:14 | either | main.rs:232:11:232:16 | either |
-| main.rs:233:9:233:44 | [match(true)] SSA phi(a7) | main.rs:233:9:233:44 | a7 | main.rs:234:16:234:17 | a7 |
-| main.rs:241:9:241:14 | either | main.rs:241:9:241:14 | either | main.rs:243:11:243:16 | either |
-| main.rs:244:13:244:13 | e | main.rs:244:13:244:13 | e | main.rs:249:15:249:15 | e |
-| main.rs:245:14:245:51 | [match(true)] SSA phi(a11) | main.rs:245:14:245:51 | a11 | main.rs:247:23:247:25 | a11 |
-| main.rs:248:33:248:35 | a12 | main.rs:248:33:248:35 | a12 | main.rs:250:28:250:30 | a12 |
-| main.rs:265:9:265:10 | fv | main.rs:265:9:265:10 | fv | main.rs:266:11:266:12 | fv |
-| main.rs:267:9:267:109 | SSA phi(a13) | main.rs:267:9:267:109 | a13 | main.rs:268:26:268:28 | a13 |
-| main.rs:273:5:273:6 | a8 | main.rs:273:5:273:6 | a8 | main.rs:279:15:279:16 | a8 |
-| main.rs:275:9:275:10 | b3 | main.rs:275:9:275:10 | b3 | main.rs:280:15:280:16 | b3 |
-| main.rs:276:9:276:10 | c1 | main.rs:276:9:276:10 | c1 | main.rs:281:15:281:16 | c1 |
-| main.rs:284:20:284:55 | SSA phi(a9) | main.rs:284:20:284:55 | a9 | main.rs:286:15:286:16 | a9 |
-| main.rs:291:13:291:15 | a10 | main.rs:291:13:291:15 | a10 | main.rs:295:15:295:17 | a10 |
-| main.rs:292:13:292:14 | b4 | main.rs:292:13:292:14 | b4 | main.rs:296:15:296:16 | b4 |
-| main.rs:293:13:293:14 | c2 | main.rs:293:13:293:14 | c2 | main.rs:297:15:297:16 | c2 |
-| main.rs:300:9:300:10 | c2 | main.rs:293:13:293:14 | c2 | main.rs:306:9:306:10 | c2 |
-| main.rs:301:9:301:10 | b4 | main.rs:292:13:292:14 | b4 | main.rs:305:9:305:10 | b4 |
-| main.rs:302:9:302:11 | a10 | main.rs:291:13:291:15 | a10 | main.rs:304:9:304:11 | a10 |
-| main.rs:314:13:314:15 | a10 | main.rs:314:13:314:15 | a10 | main.rs:317:23:317:25 | a10 |
-| main.rs:315:13:315:14 | b4 | main.rs:315:13:315:14 | b4 | main.rs:318:23:318:24 | b4 |
-| main.rs:327:9:327:23 | example_closure | main.rs:327:9:327:23 | example_closure | main.rs:331:9:331:23 | example_closure |
-| main.rs:328:10:328:10 | x | main.rs:328:10:328:10 | x | main.rs:329:9:329:9 | x |
-| main.rs:330:9:330:10 | n1 | main.rs:330:9:330:10 | n1 | main.rs:332:15:332:16 | n1 |
-| main.rs:335:9:335:26 | immutable_variable | main.rs:335:9:335:26 | immutable_variable | main.rs:339:9:339:26 | immutable_variable |
-| main.rs:336:6:336:6 | x | main.rs:336:6:336:6 | x | main.rs:337:9:337:9 | x |
-| main.rs:338:9:338:10 | n2 | main.rs:338:9:338:10 | n2 | main.rs:340:15:340:16 | n2 |
-| main.rs:345:9:345:9 | f | main.rs:345:9:345:9 | f | main.rs:348:15:348:15 | f |
-| main.rs:346:10:346:10 | x | main.rs:346:10:346:10 | x | main.rs:347:9:347:9 | x |
-| main.rs:350:10:350:10 | x | main.rs:350:10:350:10 | x | main.rs:352:9:352:9 | x |
-| main.rs:359:14:359:14 | x | main.rs:359:14:359:14 | x | main.rs:361:17:361:17 | x |
-| main.rs:368:13:368:13 | f | main.rs:368:13:368:13 | f | main.rs:371:19:371:19 | f |
-| main.rs:369:14:369:14 | x | main.rs:369:14:369:14 | x | main.rs:370:13:370:13 | x |
-| main.rs:376:9:376:9 | v | main.rs:376:9:376:9 | v | main.rs:379:12:379:12 | v |
-| main.rs:378:9:378:12 | text | main.rs:378:9:378:12 | text | main.rs:380:19:380:22 | text |
-| main.rs:385:13:385:13 | a | main.rs:385:13:385:13 | a | main.rs:386:5:386:5 | a |
-| main.rs:386:5:386:5 | a | main.rs:385:13:385:13 | a | main.rs:387:15:387:15 | a |
-| main.rs:388:6:388:11 | &mut a | main.rs:385:13:385:13 | a | main.rs:389:15:389:15 | a |
-| main.rs:393:13:393:13 | i | main.rs:393:13:393:13 | i | main.rs:395:14:395:14 | i |
-| main.rs:394:9:394:13 | ref_i | main.rs:394:9:394:13 | ref_i | main.rs:396:6:396:10 | ref_i |
-| main.rs:395:9:395:14 | &mut i | main.rs:393:13:393:13 | i | main.rs:397:15:397:15 | i |
-| main.rs:400:17:400:17 | x | main.rs:400:17:400:17 | x | main.rs:401:6:401:6 | x |
-| main.rs:407:22:407:22 | x | main.rs:407:22:407:22 | x | main.rs:408:6:408:6 | x |
-| main.rs:407:38:407:38 | y | main.rs:407:38:407:38 | y | main.rs:411:6:411:6 | y |
-| main.rs:416:13:416:13 | x | main.rs:416:13:416:13 | x | main.rs:418:27:418:27 | x |
-| main.rs:417:9:417:9 | y | main.rs:417:9:417:9 | y | main.rs:419:6:419:6 | y |
-| main.rs:418:22:418:27 | &mut x | main.rs:416:13:416:13 | x | main.rs:421:15:421:15 | x |
-| main.rs:423:13:423:13 | z | main.rs:423:13:423:13 | z | main.rs:427:14:427:14 | z |
-| main.rs:424:9:424:9 | w | main.rs:424:9:424:9 | w | main.rs:428:9:428:9 | w |
-| main.rs:427:9:427:14 | &mut z | main.rs:423:13:423:13 | z | main.rs:432:15:432:15 | z |
-| main.rs:436:13:436:13 | x | main.rs:436:13:436:13 | x | main.rs:438:14:438:14 | x |
-| main.rs:437:9:437:9 | y | main.rs:437:9:437:9 | y | main.rs:439:6:439:6 | y |
-| main.rs:438:9:438:14 | &mut x | main.rs:436:13:436:13 | x | main.rs:440:15:440:15 | x |
-| main.rs:444:9:444:9 | x | main.rs:444:9:444:9 | x | main.rs:450:15:450:15 | x |
-| main.rs:446:9:446:11 | cap | main.rs:446:9:446:11 | cap | main.rs:449:5:449:7 | cap |
-| main.rs:446:15:448:5 | <captured entry> x | main.rs:444:9:444:9 | x | main.rs:447:19:447:19 | x |
-| main.rs:454:13:454:13 | x | main.rs:454:13:454:13 | x | main.rs:460:15:460:15 | x |
-| main.rs:456:9:456:16 | closure1 | main.rs:456:9:456:16 | closure1 | main.rs:459:5:459:12 | closure1 |
-| main.rs:456:20:458:5 | <captured entry> x | main.rs:454:13:454:13 | x | main.rs:457:19:457:19 | x |
-| main.rs:464:13:464:20 | closure2 | main.rs:464:13:464:20 | closure2 | main.rs:467:5:467:12 | closure2 |
-| main.rs:467:5:467:14 | <captured exit> y | main.rs:462:13:462:13 | y | main.rs:468:15:468:15 | y |
-| main.rs:470:13:470:13 | z | main.rs:470:13:470:13 | z | main.rs:476:15:476:15 | z |
-| main.rs:472:13:472:20 | closure3 | main.rs:472:13:472:20 | closure3 | main.rs:475:5:475:12 | closure3 |
-| main.rs:472:24:474:5 | <captured entry> z | main.rs:470:13:470:13 | z | main.rs:473:9:473:9 | z |
-| main.rs:481:9:481:13 | block | main.rs:481:9:481:13 | block | main.rs:485:5:485:9 | block |
-| main.rs:485:5:485:15 | <captured exit> i | main.rs:480:13:480:13 | i | main.rs:486:15:486:15 | i |
-| main.rs:489:8:489:8 | b | main.rs:489:8:489:8 | b | main.rs:494:16:494:16 | b |
-| main.rs:490:13:490:13 | x | main.rs:490:13:490:13 | x | main.rs:491:15:491:15 | x |
-| main.rs:494:13:503:5 | SSA phi(x) | main.rs:490:13:490:13 | x | main.rs:504:15:504:15 | x |
-| main.rs:496:9:496:9 | x | main.rs:490:13:490:13 | x | main.rs:497:19:497:19 | x |
-| main.rs:500:9:500:9 | x | main.rs:490:13:490:13 | x | main.rs:501:19:501:19 | x |
-| main.rs:507:13:507:14 | b1 | main.rs:507:13:507:14 | b1 | main.rs:510:16:510:17 | b1 |
-| main.rs:507:23:507:24 | b2 | main.rs:507:23:507:24 | b2 | main.rs:518:16:518:17 | b2 |
-| main.rs:508:9:508:9 | x | main.rs:508:9:508:9 | x | main.rs:512:19:512:19 | x |
-| main.rs:508:9:508:9 | x | main.rs:508:9:508:9 | x | main.rs:514:19:514:19 | x |
-| main.rs:531:20:531:23 | self | main.rs:531:20:531:23 | self | main.rs:532:16:532:19 | self |
-| main.rs:535:11:535:14 | self | main.rs:535:11:535:14 | self | main.rs:536:9:536:12 | self |
-| main.rs:540:17:540:17 | f | main.rs:540:17:540:17 | f | main.rs:544:9:544:9 | f |
-| main.rs:540:21:543:9 | <captured entry> self | main.rs:539:23:539:26 | self | main.rs:542:13:542:16 | self |
-| main.rs:540:22:540:22 | n | main.rs:540:22:540:22 | n | main.rs:542:25:542:25 | n |
-| main.rs:550:13:550:13 | a | main.rs:550:13:550:13 | a | main.rs:551:15:551:15 | a |
-| main.rs:551:15:551:15 | a | main.rs:550:13:550:13 | a | main.rs:552:5:552:5 | a |
-| main.rs:554:5:554:5 | a | main.rs:550:13:550:13 | a | main.rs:555:15:555:15 | a |
-| main.rs:559:13:559:13 | a | main.rs:559:13:559:13 | a | main.rs:560:15:560:15 | a |
-| main.rs:563:5:563:5 | a | main.rs:559:13:559:13 | a | main.rs:564:15:564:15 | a |
-| main.rs:568:9:568:9 | x | main.rs:568:9:568:9 | x | main.rs:569:20:569:20 | x |
-| main.rs:572:9:572:9 | z | main.rs:572:9:572:9 | z | main.rs:573:20:573:20 | z |
-| main.rs:581:17:581:20 | self | main.rs:581:17:581:20 | self | main.rs:582:10:582:13 | self |
-| main.rs:587:13:587:13 | a | main.rs:587:13:587:13 | a | main.rs:588:5:588:5 | a |
-| main.rs:588:5:588:5 | a | main.rs:587:13:587:13 | a | main.rs:590:15:590:15 | a |
-| main.rs:608:9:608:22 | var_from_macro | main.rs:608:9:608:22 | var_from_macro | main.rs:610:15:610:28 | var_from_macro |
-| main.rs:609:9:609:25 | var_in_macro | main.rs:609:9:609:25 | var_in_macro | main.rs:609:9:609:25 | var_in_macro |
-| main.rs:611:9:611:20 | var_in_macro | main.rs:611:9:611:20 | var_in_macro | main.rs:616:15:616:26 | var_in_macro |
-| main.rs:615:15:615:42 | var_in_macro | main.rs:615:15:615:42 | var_in_macro | main.rs:615:30:615:41 | var_in_macro |
-| main.rs:621:5:621:5 | x | main.rs:620:9:620:9 | x | main.rs:622:15:622:15 | x |
-| main.rs:627:13:627:15 | cap | main.rs:627:13:627:15 | cap | main.rs:633:5:633:7 | cap |
-| main.rs:627:20:627:20 | b | main.rs:627:20:627:20 | b | main.rs:629:20:629:20 | b |
-| main.rs:633:5:633:13 | <captured exit> x | main.rs:626:13:626:13 | x | main.rs:634:15:634:15 | x |
+| main.rs:5:14:5:14 | s | main.rs:5:14:5:14 | s | main.rs:7:20:7:20 | s |
+| main.rs:10:14:10:14 | i | main.rs:10:14:10:14 | i | main.rs:12:20:12:20 | i |
+| main.rs:15:18:15:18 | i | main.rs:15:18:15:18 | i | main.rs:16:16:16:16 | i |
+| main.rs:20:9:20:10 | x1 | main.rs:20:9:20:10 | x1 | main.rs:21:15:21:16 | x1 |
+| main.rs:25:13:25:14 | x2 | main.rs:25:13:25:14 | x2 | main.rs:26:15:26:16 | x2 |
+| main.rs:27:5:27:6 | x2 | main.rs:25:13:25:14 | x2 | main.rs:28:15:28:16 | x2 |
+| main.rs:29:5:29:6 | x2 | main.rs:25:13:25:14 | x2 | main.rs:30:15:30:16 | x2 |
+| main.rs:34:13:34:13 | x | main.rs:34:13:34:13 | x | main.rs:35:20:35:20 | x |
+| main.rs:36:5:36:5 | x | main.rs:34:13:34:13 | x | main.rs:37:20:37:20 | x |
+| main.rs:41:9:41:10 | x3 | main.rs:41:9:41:10 | x3 | main.rs:42:15:42:16 | x3 |
+| main.rs:43:9:43:10 | x3 | main.rs:43:9:43:10 | x3 | main.rs:45:15:45:16 | x3 |
+| main.rs:49:9:49:10 | x4 | main.rs:49:9:49:10 | x4 | main.rs:50:15:50:16 | x4 |
+| main.rs:52:13:52:14 | x4 | main.rs:52:13:52:14 | x4 | main.rs:53:19:53:20 | x4 |
+| main.rs:66:13:66:14 | a1 | main.rs:66:13:66:14 | a1 | main.rs:74:15:74:16 | a1 |
+| main.rs:67:13:67:14 | b1 | main.rs:67:13:67:14 | b1 | main.rs:75:15:75:16 | b1 |
+| main.rs:70:13:70:13 | x | main.rs:70:13:70:13 | x | main.rs:76:15:76:15 | x |
+| main.rs:71:13:71:13 | y | main.rs:71:13:71:13 | y | main.rs:77:15:77:15 | y |
+| main.rs:81:9:81:10 | p1 | main.rs:81:9:81:10 | p1 | main.rs:85:9:85:10 | p1 |
+| main.rs:83:12:83:13 | a2 | main.rs:83:12:83:13 | a2 | main.rs:86:15:86:16 | a2 |
+| main.rs:84:12:84:13 | b2 | main.rs:84:12:84:13 | b2 | main.rs:87:15:87:16 | b2 |
+| main.rs:91:9:91:10 | s1 | main.rs:91:9:91:10 | s1 | main.rs:94:11:94:12 | s1 |
+| main.rs:93:21:93:22 | s2 | main.rs:93:21:93:22 | s2 | main.rs:95:19:95:20 | s2 |
+| main.rs:100:9:100:9 | x | main.rs:100:9:100:9 | x | main.rs:102:7:102:7 | x |
+| main.rs:101:14:101:14 | x | main.rs:101:14:101:14 | x | main.rs:109:15:109:15 | x |
+| main.rs:104:13:104:13 | x | main.rs:104:13:104:13 | x | main.rs:106:19:106:19 | x |
+| main.rs:113:9:113:10 | s1 | main.rs:113:9:113:10 | s1 | main.rs:116:11:116:12 | s1 |
+| main.rs:115:24:115:25 | s2 | main.rs:115:24:115:25 | s2 | main.rs:117:19:117:20 | s2 |
+| main.rs:122:9:122:10 | x6 | main.rs:122:9:122:10 | x6 | main.rs:125:11:125:12 | x6 |
+| main.rs:123:9:123:10 | y1 | main.rs:123:9:123:10 | y1 | main.rs:135:15:135:16 | y1 |
+| main.rs:127:14:127:15 | y1 | main.rs:127:14:127:15 | y1 | main.rs:130:23:130:24 | y1 |
+| main.rs:139:9:139:15 | numbers | main.rs:139:9:139:15 | numbers | main.rs:141:11:141:17 | numbers |
+| main.rs:144:13:144:17 | first | main.rs:144:13:144:17 | first | main.rs:150:23:150:27 | first |
+| main.rs:146:13:146:17 | third | main.rs:146:13:146:17 | third | main.rs:151:23:151:27 | third |
+| main.rs:148:13:148:17 | fifth | main.rs:148:13:148:17 | fifth | main.rs:152:23:152:27 | fifth |
+| main.rs:159:13:159:17 | first | main.rs:159:13:159:17 | first | main.rs:163:23:163:27 | first |
+| main.rs:161:13:161:16 | last | main.rs:161:13:161:16 | last | main.rs:164:23:164:26 | last |
+| main.rs:170:9:170:10 | p2 | main.rs:170:9:170:10 | p2 | main.rs:172:11:172:12 | p2 |
+| main.rs:174:16:174:17 | x7 | main.rs:174:16:174:17 | x7 | main.rs:175:24:175:25 | x7 |
+| main.rs:184:9:184:11 | msg | main.rs:184:9:184:11 | msg | main.rs:186:11:186:13 | msg |
+| main.rs:189:17:189:27 | id_variable | main.rs:189:17:189:27 | id_variable | main.rs:190:24:190:34 | id_variable |
+| main.rs:194:26:194:27 | id | main.rs:194:26:194:27 | id | main.rs:197:23:197:24 | id |
+| main.rs:208:9:208:14 | either | main.rs:208:9:208:14 | either | main.rs:209:11:209:16 | either |
+| main.rs:210:9:210:44 | SSA phi(a3) | main.rs:210:9:210:44 | a3 | main.rs:211:26:211:27 | a3 |
+| main.rs:222:9:222:10 | tv | main.rs:222:9:222:10 | tv | main.rs:223:11:223:12 | tv |
+| main.rs:224:9:224:81 | SSA phi(a4) | main.rs:224:9:224:81 | a4 | main.rs:225:26:225:27 | a4 |
+| main.rs:228:9:228:83 | SSA phi(a5) | main.rs:228:9:228:83 | a5 | main.rs:229:26:229:27 | a5 |
+| main.rs:232:9:232:83 | SSA phi(a6) | main.rs:232:9:232:83 | a6 | main.rs:233:26:233:27 | a6 |
+| main.rs:238:9:238:14 | either | main.rs:238:9:238:14 | either | main.rs:239:11:239:16 | either |
+| main.rs:240:9:240:44 | [match(true)] SSA phi(a7) | main.rs:240:9:240:44 | a7 | main.rs:241:16:241:17 | a7 |
+| main.rs:248:9:248:14 | either | main.rs:248:9:248:14 | either | main.rs:250:11:250:16 | either |
+| main.rs:251:13:251:13 | e | main.rs:251:13:251:13 | e | main.rs:256:15:256:15 | e |
+| main.rs:252:14:252:51 | [match(true)] SSA phi(a11) | main.rs:252:14:252:51 | a11 | main.rs:254:23:254:25 | a11 |
+| main.rs:255:33:255:35 | a12 | main.rs:255:33:255:35 | a12 | main.rs:257:28:257:30 | a12 |
+| main.rs:272:9:272:10 | fv | main.rs:272:9:272:10 | fv | main.rs:273:11:273:12 | fv |
+| main.rs:274:9:274:109 | SSA phi(a13) | main.rs:274:9:274:109 | a13 | main.rs:275:26:275:28 | a13 |
+| main.rs:281:9:281:9 | x | main.rs:281:9:281:9 | x | main.rs:283:7:283:7 | x |
+| main.rs:282:17:282:17 | x | main.rs:282:17:282:17 | x | main.rs:285:5:285:5 | x |
+| main.rs:289:13:289:13 | x | main.rs:289:13:289:13 | x | main.rs:291:19:291:19 | x |
+| main.rs:297:9:297:9 | x | main.rs:297:9:297:9 | x | main.rs:299:7:299:7 | x |
+| main.rs:298:17:298:17 | x | main.rs:298:17:298:17 | x | main.rs:302:12:302:12 | x |
+| main.rs:301:14:301:14 | x | main.rs:301:14:301:14 | x | main.rs:304:5:304:5 | x |
+| main.rs:308:13:308:13 | x | main.rs:308:13:308:13 | x | main.rs:310:19:310:19 | x |
+| main.rs:316:9:316:9 | x | main.rs:316:9:316:9 | x | main.rs:318:7:318:7 | x |
+| main.rs:317:20:317:20 | x | main.rs:317:20:317:20 | x | main.rs:321:12:321:12 | x |
+| main.rs:320:14:320:14 | x | main.rs:320:14:320:14 | x | main.rs:323:5:323:5 | x |
+| main.rs:334:9:334:9 | x | main.rs:334:9:334:9 | x | main.rs:335:11:335:11 | x |
+| main.rs:336:14:336:14 | x | main.rs:336:14:336:14 | x | main.rs:338:18:338:18 | x |
+| main.rs:337:20:337:20 | x | main.rs:337:20:337:20 | x | main.rs:339:19:339:19 | x |
+| main.rs:348:9:348:9 | x | main.rs:348:9:348:9 | x | main.rs:350:7:350:7 | x |
+| main.rs:349:16:349:16 | x | main.rs:349:16:349:16 | x | main.rs:352:19:352:19 | x |
+| main.rs:354:20:354:20 | x | main.rs:354:20:354:20 | x | main.rs:357:19:357:19 | x |
+| main.rs:364:9:364:9 | x | main.rs:364:9:364:9 | x | main.rs:365:11:365:11 | x |
+| main.rs:366:18:366:18 | x | main.rs:366:18:366:18 | x | main.rs:367:20:367:20 | x |
+| main.rs:373:9:373:9 | x | main.rs:373:9:373:9 | x | main.rs:374:11:374:11 | x |
+| main.rs:375:14:375:14 | y | main.rs:375:14:375:14 | y | main.rs:377:22:377:22 | y |
+| main.rs:376:25:376:25 | y | main.rs:376:25:376:25 | y | main.rs:378:26:378:26 | y |
+| main.rs:384:5:384:6 | a8 | main.rs:384:5:384:6 | a8 | main.rs:390:15:390:16 | a8 |
+| main.rs:386:9:386:10 | b3 | main.rs:386:9:386:10 | b3 | main.rs:391:15:391:16 | b3 |
+| main.rs:387:9:387:10 | c1 | main.rs:387:9:387:10 | c1 | main.rs:392:15:392:16 | c1 |
+| main.rs:395:20:395:55 | SSA phi(a9) | main.rs:395:20:395:55 | a9 | main.rs:397:15:397:16 | a9 |
+| main.rs:402:13:402:15 | a10 | main.rs:402:13:402:15 | a10 | main.rs:406:15:406:17 | a10 |
+| main.rs:403:13:403:14 | b4 | main.rs:403:13:403:14 | b4 | main.rs:407:15:407:16 | b4 |
+| main.rs:404:13:404:14 | c2 | main.rs:404:13:404:14 | c2 | main.rs:408:15:408:16 | c2 |
+| main.rs:411:9:411:10 | c2 | main.rs:404:13:404:14 | c2 | main.rs:421:15:421:16 | c2 |
+| main.rs:412:9:412:10 | b4 | main.rs:403:13:403:14 | b4 | main.rs:420:15:420:16 | b4 |
+| main.rs:413:9:413:11 | a10 | main.rs:402:13:402:15 | a10 | main.rs:419:15:419:17 | a10 |
+| main.rs:425:13:425:15 | a10 | main.rs:425:13:425:15 | a10 | main.rs:428:23:428:25 | a10 |
+| main.rs:426:13:426:14 | b4 | main.rs:426:13:426:14 | b4 | main.rs:429:23:429:24 | b4 |
+| main.rs:438:9:438:23 | example_closure | main.rs:438:9:438:23 | example_closure | main.rs:442:9:442:23 | example_closure |
+| main.rs:439:10:439:10 | x | main.rs:439:10:439:10 | x | main.rs:440:9:440:9 | x |
+| main.rs:441:9:441:10 | n1 | main.rs:441:9:441:10 | n1 | main.rs:443:15:443:16 | n1 |
+| main.rs:446:9:446:26 | immutable_variable | main.rs:446:9:446:26 | immutable_variable | main.rs:450:9:450:26 | immutable_variable |
+| main.rs:447:6:447:6 | x | main.rs:447:6:447:6 | x | main.rs:448:9:448:9 | x |
+| main.rs:449:9:449:10 | n2 | main.rs:449:9:449:10 | n2 | main.rs:451:15:451:16 | n2 |
+| main.rs:456:9:456:9 | f | main.rs:456:9:456:9 | f | main.rs:459:15:459:15 | f |
+| main.rs:457:10:457:10 | x | main.rs:457:10:457:10 | x | main.rs:458:9:458:9 | x |
+| main.rs:461:10:461:10 | x | main.rs:461:10:461:10 | x | main.rs:463:9:463:9 | x |
+| main.rs:470:14:470:14 | x | main.rs:470:14:470:14 | x | main.rs:472:17:472:17 | x |
+| main.rs:479:13:479:13 | f | main.rs:479:13:479:13 | f | main.rs:482:19:482:19 | f |
+| main.rs:480:14:480:14 | x | main.rs:480:14:480:14 | x | main.rs:481:13:481:13 | x |
+| main.rs:487:9:487:9 | v | main.rs:487:9:487:9 | v | main.rs:490:12:490:12 | v |
+| main.rs:489:9:489:12 | text | main.rs:489:9:489:12 | text | main.rs:491:19:491:22 | text |
+| main.rs:496:13:496:13 | a | main.rs:496:13:496:13 | a | main.rs:497:5:497:5 | a |
+| main.rs:497:5:497:5 | a | main.rs:496:13:496:13 | a | main.rs:498:15:498:15 | a |
+| main.rs:499:6:499:11 | &mut a | main.rs:496:13:496:13 | a | main.rs:500:15:500:15 | a |
+| main.rs:504:13:504:13 | i | main.rs:504:13:504:13 | i | main.rs:506:14:506:14 | i |
+| main.rs:505:9:505:13 | ref_i | main.rs:505:9:505:13 | ref_i | main.rs:507:6:507:10 | ref_i |
+| main.rs:506:9:506:14 | &mut i | main.rs:504:13:504:13 | i | main.rs:508:15:508:15 | i |
+| main.rs:511:17:511:17 | x | main.rs:511:17:511:17 | x | main.rs:512:6:512:6 | x |
+| main.rs:518:22:518:22 | x | main.rs:518:22:518:22 | x | main.rs:519:6:519:6 | x |
+| main.rs:518:38:518:38 | y | main.rs:518:38:518:38 | y | main.rs:522:6:522:6 | y |
+| main.rs:527:13:527:13 | x | main.rs:527:13:527:13 | x | main.rs:529:27:529:27 | x |
+| main.rs:528:9:528:9 | y | main.rs:528:9:528:9 | y | main.rs:530:6:530:6 | y |
+| main.rs:529:22:529:27 | &mut x | main.rs:527:13:527:13 | x | main.rs:533:15:533:15 | x |
+| main.rs:535:13:535:13 | z | main.rs:535:13:535:13 | z | main.rs:539:14:539:14 | z |
+| main.rs:536:9:536:9 | w | main.rs:536:9:536:9 | w | main.rs:540:9:540:9 | w |
+| main.rs:539:9:539:14 | &mut z | main.rs:535:13:535:13 | z | main.rs:545:15:545:15 | z |
+| main.rs:549:13:549:13 | x | main.rs:549:13:549:13 | x | main.rs:551:14:551:14 | x |
+| main.rs:550:9:550:9 | y | main.rs:550:9:550:9 | y | main.rs:552:6:552:6 | y |
+| main.rs:551:9:551:14 | &mut x | main.rs:549:13:549:13 | x | main.rs:553:15:553:15 | x |
+| main.rs:557:9:557:9 | x | main.rs:557:9:557:9 | x | main.rs:564:15:564:15 | x |
+| main.rs:560:9:560:11 | cap | main.rs:560:9:560:11 | cap | main.rs:563:5:563:7 | cap |
+| main.rs:560:15:562:5 | <captured entry> x | main.rs:557:9:557:9 | x | main.rs:561:19:561:19 | x |
+| main.rs:568:13:568:13 | x | main.rs:568:13:568:13 | x | main.rs:575:15:575:15 | x |
+| main.rs:571:9:571:16 | closure1 | main.rs:571:9:571:16 | closure1 | main.rs:574:5:574:12 | closure1 |
+| main.rs:571:20:573:5 | <captured entry> x | main.rs:568:13:568:13 | x | main.rs:572:19:572:19 | x |
+| main.rs:580:13:580:20 | closure2 | main.rs:580:13:580:20 | closure2 | main.rs:583:5:583:12 | closure2 |
+| main.rs:583:5:583:14 | <captured exit> y | main.rs:577:13:577:13 | y | main.rs:584:15:584:15 | y |
+| main.rs:586:13:586:13 | z | main.rs:586:13:586:13 | z | main.rs:593:15:593:15 | z |
+| main.rs:589:13:589:20 | closure3 | main.rs:589:13:589:20 | closure3 | main.rs:592:5:592:12 | closure3 |
+| main.rs:589:24:591:5 | <captured entry> z | main.rs:586:13:586:13 | z | main.rs:590:9:590:9 | z |
+| main.rs:598:9:598:13 | block | main.rs:598:9:598:13 | block | main.rs:602:5:602:9 | block |
+| main.rs:602:5:602:15 | <captured exit> i | main.rs:597:13:597:13 | i | main.rs:603:15:603:15 | i |
+| main.rs:606:8:606:8 | b | main.rs:606:8:606:8 | b | main.rs:611:16:611:16 | b |
+| main.rs:607:13:607:13 | x | main.rs:607:13:607:13 | x | main.rs:608:15:608:15 | x |
+| main.rs:611:13:620:5 | SSA phi(x) | main.rs:607:13:607:13 | x | main.rs:621:15:621:15 | x |
+| main.rs:613:9:613:9 | x | main.rs:607:13:607:13 | x | main.rs:614:19:614:19 | x |
+| main.rs:617:9:617:9 | x | main.rs:607:13:607:13 | x | main.rs:618:19:618:19 | x |
+| main.rs:624:13:624:14 | b1 | main.rs:624:13:624:14 | b1 | main.rs:627:16:627:17 | b1 |
+| main.rs:624:23:624:24 | b2 | main.rs:624:23:624:24 | b2 | main.rs:635:16:635:17 | b2 |
+| main.rs:625:9:625:9 | x | main.rs:625:9:625:9 | x | main.rs:629:19:629:19 | x |
+| main.rs:625:9:625:9 | x | main.rs:625:9:625:9 | x | main.rs:631:19:631:19 | x |
+| main.rs:648:20:648:23 | self | main.rs:648:20:648:23 | self | main.rs:649:16:649:19 | self |
+| main.rs:652:11:652:14 | self | main.rs:652:11:652:14 | self | main.rs:653:9:653:12 | self |
+| main.rs:657:17:657:17 | f | main.rs:657:17:657:17 | f | main.rs:661:9:661:9 | f |
+| main.rs:657:21:660:9 | <captured entry> self | main.rs:656:23:656:26 | self | main.rs:659:13:659:16 | self |
+| main.rs:657:22:657:22 | n | main.rs:657:22:657:22 | n | main.rs:659:25:659:25 | n |
+| main.rs:667:13:667:13 | a | main.rs:667:13:667:13 | a | main.rs:668:15:668:15 | a |
+| main.rs:668:15:668:15 | a | main.rs:667:13:667:13 | a | main.rs:669:5:669:5 | a |
+| main.rs:671:5:671:5 | a | main.rs:667:13:667:13 | a | main.rs:672:15:672:15 | a |
+| main.rs:676:13:676:13 | a | main.rs:676:13:676:13 | a | main.rs:677:15:677:15 | a |
+| main.rs:680:5:680:5 | a | main.rs:676:13:676:13 | a | main.rs:681:15:681:15 | a |
+| main.rs:685:9:685:9 | x | main.rs:685:9:685:9 | x | main.rs:686:20:686:20 | x |
+| main.rs:689:9:689:9 | z | main.rs:689:9:689:9 | z | main.rs:690:20:690:20 | z |
+| main.rs:698:17:698:20 | self | main.rs:698:17:698:20 | self | main.rs:699:10:699:13 | self |
+| main.rs:704:13:704:13 | a | main.rs:704:13:704:13 | a | main.rs:705:5:705:5 | a |
+| main.rs:705:5:705:5 | a | main.rs:704:13:704:13 | a | main.rs:708:15:708:15 | a |
+| main.rs:726:9:726:22 | var_from_macro | main.rs:726:9:726:22 | var_from_macro | main.rs:728:15:728:28 | var_from_macro |
+| main.rs:727:9:727:21 | var_in_macro | main.rs:727:9:727:21 | var_in_macro | main.rs:727:9:727:21 | var_in_macro |
+| main.rs:729:9:729:20 | var_in_macro | main.rs:729:9:729:20 | var_in_macro | main.rs:735:15:735:26 | var_in_macro |
+| main.rs:734:15:734:28 | var_in_macro | main.rs:734:15:734:28 | var_in_macro | main.rs:734:30:734:41 | var_in_macro |
+| main.rs:740:5:740:5 | x | main.rs:739:9:739:9 | x | main.rs:741:15:741:15 | x |
+| main.rs:746:13:746:15 | cap | main.rs:746:13:746:15 | cap | main.rs:752:5:752:7 | cap |
+| main.rs:746:20:746:20 | b | main.rs:746:20:746:20 | b | main.rs:748:20:748:20 | b |
+| main.rs:752:5:752:13 | <captured exit> x | main.rs:745:13:745:13 | x | main.rs:753:15:753:15 | x |
 adjacentReads
-| main.rs:37:9:37:10 | x3 | main.rs:37:9:37:10 | x3 | main.rs:38:15:38:16 | x3 | main.rs:40:9:40:10 | x3 |
-| main.rs:45:9:45:10 | x4 | main.rs:45:9:45:10 | x4 | main.rs:46:15:46:16 | x4 | main.rs:51:15:51:16 | x4 |
-| main.rs:106:9:106:10 | s1 | main.rs:106:9:106:10 | s1 | main.rs:109:11:109:12 | s1 | main.rs:109:11:109:12 | s1 |
-| main.rs:132:9:132:15 | numbers | main.rs:132:9:132:15 | numbers | main.rs:134:11:134:17 | numbers | main.rs:149:11:149:17 | numbers |
-| main.rs:215:9:215:10 | tv | main.rs:215:9:215:10 | tv | main.rs:216:11:216:12 | tv | main.rs:220:11:220:12 | tv |
-| main.rs:215:9:215:10 | tv | main.rs:215:9:215:10 | tv | main.rs:220:11:220:12 | tv | main.rs:224:11:224:12 | tv |
-| main.rs:233:9:233:44 | [match(true)] SSA phi(a7) | main.rs:233:9:233:44 | a7 | main.rs:234:16:234:17 | a7 | main.rs:235:26:235:27 | a7 |
-| main.rs:300:9:300:10 | c2 | main.rs:293:13:293:14 | c2 | main.rs:306:9:306:10 | c2 | main.rs:310:15:310:16 | c2 |
-| main.rs:301:9:301:10 | b4 | main.rs:292:13:292:14 | b4 | main.rs:305:9:305:10 | b4 | main.rs:309:15:309:16 | b4 |
-| main.rs:301:9:301:10 | b4 | main.rs:292:13:292:14 | b4 | main.rs:309:15:309:16 | b4 | main.rs:323:15:323:16 | b4 |
-| main.rs:302:9:302:11 | a10 | main.rs:291:13:291:15 | a10 | main.rs:304:9:304:11 | a10 | main.rs:308:15:308:17 | a10 |
-| main.rs:302:9:302:11 | a10 | main.rs:291:13:291:15 | a10 | main.rs:308:15:308:17 | a10 | main.rs:322:15:322:17 | a10 |
-| main.rs:345:9:345:9 | f | main.rs:345:9:345:9 | f | main.rs:348:15:348:15 | f | main.rs:355:15:355:15 | f |
-| main.rs:386:5:386:5 | a | main.rs:385:13:385:13 | a | main.rs:387:15:387:15 | a | main.rs:388:11:388:11 | a |
-| main.rs:400:17:400:17 | x | main.rs:400:17:400:17 | x | main.rs:401:6:401:6 | x | main.rs:402:10:402:10 | x |
-| main.rs:400:17:400:17 | x | main.rs:400:17:400:17 | x | main.rs:402:10:402:10 | x | main.rs:403:10:403:10 | x |
-| main.rs:400:17:400:17 | x | main.rs:400:17:400:17 | x | main.rs:403:10:403:10 | x | main.rs:404:12:404:12 | x |
-| main.rs:407:22:407:22 | x | main.rs:407:22:407:22 | x | main.rs:408:6:408:6 | x | main.rs:409:10:409:10 | x |
-| main.rs:407:22:407:22 | x | main.rs:407:22:407:22 | x | main.rs:409:10:409:10 | x | main.rs:410:10:410:10 | x |
-| main.rs:407:22:407:22 | x | main.rs:407:22:407:22 | x | main.rs:410:10:410:10 | x | main.rs:412:9:412:9 | x |
-| main.rs:418:22:418:27 | &mut x | main.rs:416:13:416:13 | x | main.rs:421:15:421:15 | x | main.rs:425:19:425:19 | x |
-| main.rs:424:9:424:9 | w | main.rs:424:9:424:9 | w | main.rs:428:9:428:9 | w | main.rs:430:7:430:7 | w |
-| main.rs:490:13:490:13 | x | main.rs:490:13:490:13 | x | main.rs:491:15:491:15 | x | main.rs:492:15:492:15 | x |
-| main.rs:496:9:496:9 | x | main.rs:490:13:490:13 | x | main.rs:497:19:497:19 | x | main.rs:498:19:498:19 | x |
-| main.rs:500:9:500:9 | x | main.rs:490:13:490:13 | x | main.rs:501:19:501:19 | x | main.rs:502:19:502:19 | x |
-| main.rs:508:9:508:9 | x | main.rs:508:9:508:9 | x | main.rs:512:19:512:19 | x | main.rs:520:19:520:19 | x |
-| main.rs:508:9:508:9 | x | main.rs:508:9:508:9 | x | main.rs:512:19:512:19 | x | main.rs:522:19:522:19 | x |
-| main.rs:508:9:508:9 | x | main.rs:508:9:508:9 | x | main.rs:514:19:514:19 | x | main.rs:520:19:520:19 | x |
-| main.rs:508:9:508:9 | x | main.rs:508:9:508:9 | x | main.rs:514:19:514:19 | x | main.rs:522:19:522:19 | x |
-| main.rs:540:17:540:17 | f | main.rs:540:17:540:17 | f | main.rs:544:9:544:9 | f | main.rs:545:9:545:9 | f |
-| main.rs:551:15:551:15 | a | main.rs:550:13:550:13 | a | main.rs:552:5:552:5 | a | main.rs:553:15:553:15 | a |
-| main.rs:559:13:559:13 | a | main.rs:559:13:559:13 | a | main.rs:560:15:560:15 | a | main.rs:561:5:561:5 | a |
-| main.rs:559:13:559:13 | a | main.rs:559:13:559:13 | a | main.rs:561:5:561:5 | a | main.rs:562:15:562:15 | a |
-| main.rs:568:9:568:9 | x | main.rs:568:9:568:9 | x | main.rs:569:20:569:20 | x | main.rs:570:15:570:15 | x |
+| main.rs:27:5:27:6 | x2 | main.rs:25:13:25:14 | x2 | main.rs:28:15:28:16 | x2 | main.rs:29:10:29:11 | x2 |
+| main.rs:41:9:41:10 | x3 | main.rs:41:9:41:10 | x3 | main.rs:42:15:42:16 | x3 | main.rs:44:9:44:10 | x3 |
+| main.rs:49:9:49:10 | x4 | main.rs:49:9:49:10 | x4 | main.rs:50:15:50:16 | x4 | main.rs:55:15:55:16 | x4 |
+| main.rs:100:9:100:9 | x | main.rs:100:9:100:9 | x | main.rs:102:7:102:7 | x | main.rs:105:13:105:13 | x |
+| main.rs:113:9:113:10 | s1 | main.rs:113:9:113:10 | s1 | main.rs:116:11:116:12 | s1 | main.rs:116:11:116:12 | s1 |
+| main.rs:139:9:139:15 | numbers | main.rs:139:9:139:15 | numbers | main.rs:141:11:141:17 | numbers | main.rs:156:11:156:17 | numbers |
+| main.rs:222:9:222:10 | tv | main.rs:222:9:222:10 | tv | main.rs:223:11:223:12 | tv | main.rs:227:11:227:12 | tv |
+| main.rs:222:9:222:10 | tv | main.rs:222:9:222:10 | tv | main.rs:227:11:227:12 | tv | main.rs:231:11:231:12 | tv |
+| main.rs:240:9:240:44 | [match(true)] SSA phi(a7) | main.rs:240:9:240:44 | a7 | main.rs:241:16:241:17 | a7 | main.rs:242:26:242:27 | a7 |
+| main.rs:281:9:281:9 | x | main.rs:281:9:281:9 | x | main.rs:283:7:283:7 | x | main.rs:290:13:290:13 | x |
+| main.rs:282:17:282:17 | x | main.rs:282:17:282:17 | x | main.rs:285:5:285:5 | x | main.rs:287:19:287:19 | x |
+| main.rs:297:9:297:9 | x | main.rs:297:9:297:9 | x | main.rs:299:7:299:7 | x | main.rs:309:13:309:13 | x |
+| main.rs:301:14:301:14 | x | main.rs:301:14:301:14 | x | main.rs:304:5:304:5 | x | main.rs:306:19:306:19 | x |
+| main.rs:316:9:316:9 | x | main.rs:316:9:316:9 | x | main.rs:318:7:318:7 | x | main.rs:329:15:329:15 | x |
+| main.rs:320:14:320:14 | x | main.rs:320:14:320:14 | x | main.rs:323:5:323:5 | x | main.rs:325:19:325:19 | x |
+| main.rs:334:9:334:9 | x | main.rs:334:9:334:9 | x | main.rs:335:11:335:11 | x | main.rs:343:15:343:15 | x |
+| main.rs:348:9:348:9 | x | main.rs:348:9:348:9 | x | main.rs:350:7:350:7 | x | main.rs:355:7:355:7 | x |
+| main.rs:348:9:348:9 | x | main.rs:348:9:348:9 | x | main.rs:355:7:355:7 | x | main.rs:359:19:359:19 | x |
+| main.rs:402:13:402:15 | a10 | main.rs:402:13:402:15 | a10 | main.rs:406:15:406:17 | a10 | main.rs:415:9:415:11 | a10 |
+| main.rs:403:13:403:14 | b4 | main.rs:403:13:403:14 | b4 | main.rs:407:15:407:16 | b4 | main.rs:416:9:416:10 | b4 |
+| main.rs:404:13:404:14 | c2 | main.rs:404:13:404:14 | c2 | main.rs:408:15:408:16 | c2 | main.rs:417:9:417:10 | c2 |
+| main.rs:412:9:412:10 | b4 | main.rs:403:13:403:14 | b4 | main.rs:420:15:420:16 | b4 | main.rs:434:15:434:16 | b4 |
+| main.rs:413:9:413:11 | a10 | main.rs:402:13:402:15 | a10 | main.rs:419:15:419:17 | a10 | main.rs:433:15:433:17 | a10 |
+| main.rs:456:9:456:9 | f | main.rs:456:9:456:9 | f | main.rs:459:15:459:15 | f | main.rs:466:15:466:15 | f |
+| main.rs:497:5:497:5 | a | main.rs:496:13:496:13 | a | main.rs:498:15:498:15 | a | main.rs:499:11:499:11 | a |
+| main.rs:511:17:511:17 | x | main.rs:511:17:511:17 | x | main.rs:512:6:512:6 | x | main.rs:513:10:513:10 | x |
+| main.rs:511:17:511:17 | x | main.rs:511:17:511:17 | x | main.rs:513:10:513:10 | x | main.rs:514:10:514:10 | x |
+| main.rs:511:17:511:17 | x | main.rs:511:17:511:17 | x | main.rs:514:10:514:10 | x | main.rs:515:12:515:12 | x |
+| main.rs:518:22:518:22 | x | main.rs:518:22:518:22 | x | main.rs:519:6:519:6 | x | main.rs:520:10:520:10 | x |
+| main.rs:518:22:518:22 | x | main.rs:518:22:518:22 | x | main.rs:520:10:520:10 | x | main.rs:521:10:521:10 | x |
+| main.rs:518:22:518:22 | x | main.rs:518:22:518:22 | x | main.rs:521:10:521:10 | x | main.rs:523:9:523:9 | x |
+| main.rs:529:22:529:27 | &mut x | main.rs:527:13:527:13 | x | main.rs:533:15:533:15 | x | main.rs:537:19:537:19 | x |
+| main.rs:536:9:536:9 | w | main.rs:536:9:536:9 | w | main.rs:540:9:540:9 | w | main.rs:542:7:542:7 | w |
+| main.rs:607:13:607:13 | x | main.rs:607:13:607:13 | x | main.rs:608:15:608:15 | x | main.rs:609:15:609:15 | x |
+| main.rs:613:9:613:9 | x | main.rs:607:13:607:13 | x | main.rs:614:19:614:19 | x | main.rs:615:19:615:19 | x |
+| main.rs:617:9:617:9 | x | main.rs:607:13:607:13 | x | main.rs:618:19:618:19 | x | main.rs:619:19:619:19 | x |
+| main.rs:625:9:625:9 | x | main.rs:625:9:625:9 | x | main.rs:629:19:629:19 | x | main.rs:637:19:637:19 | x |
+| main.rs:625:9:625:9 | x | main.rs:625:9:625:9 | x | main.rs:629:19:629:19 | x | main.rs:639:19:639:19 | x |
+| main.rs:625:9:625:9 | x | main.rs:625:9:625:9 | x | main.rs:631:19:631:19 | x | main.rs:637:19:637:19 | x |
+| main.rs:625:9:625:9 | x | main.rs:625:9:625:9 | x | main.rs:631:19:631:19 | x | main.rs:639:19:639:19 | x |
+| main.rs:657:17:657:17 | f | main.rs:657:17:657:17 | f | main.rs:661:9:661:9 | f | main.rs:662:9:662:9 | f |
+| main.rs:668:15:668:15 | a | main.rs:667:13:667:13 | a | main.rs:669:5:669:5 | a | main.rs:670:15:670:15 | a |
+| main.rs:676:13:676:13 | a | main.rs:676:13:676:13 | a | main.rs:677:15:677:15 | a | main.rs:678:5:678:5 | a |
+| main.rs:676:13:676:13 | a | main.rs:676:13:676:13 | a | main.rs:678:5:678:5 | a | main.rs:679:15:679:15 | a |
+| main.rs:685:9:685:9 | x | main.rs:685:9:685:9 | x | main.rs:686:20:686:20 | x | main.rs:687:15:687:15 | x |
 phi
-| main.rs:203:9:203:44 | SSA phi(a3) | main.rs:203:9:203:44 | a3 | main.rs:203:22:203:23 | a3 |
-| main.rs:203:9:203:44 | SSA phi(a3) | main.rs:203:9:203:44 | a3 | main.rs:203:42:203:43 | a3 |
-| main.rs:217:9:217:81 | SSA phi(a4) | main.rs:217:9:217:81 | a4 | main.rs:217:28:217:29 | a4 |
-| main.rs:217:9:217:81 | SSA phi(a4) | main.rs:217:9:217:81 | a4 | main.rs:217:54:217:55 | a4 |
-| main.rs:217:9:217:81 | SSA phi(a4) | main.rs:217:9:217:81 | a4 | main.rs:217:79:217:80 | a4 |
-| main.rs:221:9:221:83 | SSA phi(a5) | main.rs:221:9:221:83 | a5 | main.rs:221:10:221:57 | [match(true)] SSA phi(a5) |
-| main.rs:221:9:221:83 | SSA phi(a5) | main.rs:221:9:221:83 | a5 | main.rs:221:81:221:82 | a5 |
-| main.rs:221:10:221:57 | [match(true)] SSA phi(a5) | main.rs:221:9:221:83 | a5 | main.rs:221:29:221:30 | a5 |
-| main.rs:221:10:221:57 | [match(true)] SSA phi(a5) | main.rs:221:9:221:83 | a5 | main.rs:221:55:221:56 | a5 |
-| main.rs:225:9:225:83 | SSA phi(a6) | main.rs:225:9:225:83 | a6 | main.rs:225:28:225:29 | a6 |
-| main.rs:225:9:225:83 | SSA phi(a6) | main.rs:225:9:225:83 | a6 | main.rs:225:35:225:82 | SSA phi(a6) |
-| main.rs:225:35:225:82 | SSA phi(a6) | main.rs:225:9:225:83 | a6 | main.rs:225:55:225:56 | a6 |
-| main.rs:225:35:225:82 | SSA phi(a6) | main.rs:225:9:225:83 | a6 | main.rs:225:80:225:81 | a6 |
-| main.rs:233:9:233:44 | [match(true)] SSA phi(a7) | main.rs:233:9:233:44 | a7 | main.rs:233:22:233:23 | a7 |
-| main.rs:233:9:233:44 | [match(true)] SSA phi(a7) | main.rs:233:9:233:44 | a7 | main.rs:233:42:233:43 | a7 |
-| main.rs:245:14:245:51 | [match(true)] SSA phi(a11) | main.rs:245:14:245:51 | a11 | main.rs:245:27:245:29 | a11 |
-| main.rs:245:14:245:51 | [match(true)] SSA phi(a11) | main.rs:245:14:245:51 | a11 | main.rs:245:48:245:50 | a11 |
-| main.rs:267:9:267:109 | SSA phi(a13) | main.rs:267:9:267:109 | a13 | main.rs:267:27:267:29 | a13 |
-| main.rs:267:9:267:109 | SSA phi(a13) | main.rs:267:9:267:109 | a13 | main.rs:267:35:267:82 | [match(true)] SSA phi(a13) |
-| main.rs:267:9:267:109 | SSA phi(a13) | main.rs:267:9:267:109 | a13 | main.rs:267:106:267:108 | a13 |
-| main.rs:267:35:267:82 | [match(true)] SSA phi(a13) | main.rs:267:9:267:109 | a13 | main.rs:267:54:267:56 | a13 |
-| main.rs:267:35:267:82 | [match(true)] SSA phi(a13) | main.rs:267:9:267:109 | a13 | main.rs:267:79:267:81 | a13 |
-| main.rs:284:20:284:55 | SSA phi(a9) | main.rs:284:20:284:55 | a9 | main.rs:284:33:284:34 | a9 |
-| main.rs:284:20:284:55 | SSA phi(a9) | main.rs:284:20:284:55 | a9 | main.rs:284:53:284:54 | a9 |
-| main.rs:494:13:503:5 | SSA phi(x) | main.rs:490:13:490:13 | x | main.rs:496:9:496:9 | x |
-| main.rs:494:13:503:5 | SSA phi(x) | main.rs:490:13:490:13 | x | main.rs:500:9:500:9 | x |
-| main.rs:629:17:631:9 | SSA phi(x) | main.rs:626:13:626:13 | x | main.rs:627:19:632:5 | <captured entry> x |
-| main.rs:629:17:631:9 | SSA phi(x) | main.rs:626:13:626:13 | x | main.rs:630:13:630:13 | x |
+| main.rs:210:9:210:44 | SSA phi(a3) | main.rs:210:9:210:44 | a3 | main.rs:210:22:210:23 | a3 |
+| main.rs:210:9:210:44 | SSA phi(a3) | main.rs:210:9:210:44 | a3 | main.rs:210:42:210:43 | a3 |
+| main.rs:224:9:224:81 | SSA phi(a4) | main.rs:224:9:224:81 | a4 | main.rs:224:28:224:29 | a4 |
+| main.rs:224:9:224:81 | SSA phi(a4) | main.rs:224:9:224:81 | a4 | main.rs:224:54:224:55 | a4 |
+| main.rs:224:9:224:81 | SSA phi(a4) | main.rs:224:9:224:81 | a4 | main.rs:224:79:224:80 | a4 |
+| main.rs:228:9:228:83 | SSA phi(a5) | main.rs:228:9:228:83 | a5 | main.rs:228:10:228:57 | [match(true)] SSA phi(a5) |
+| main.rs:228:9:228:83 | SSA phi(a5) | main.rs:228:9:228:83 | a5 | main.rs:228:81:228:82 | a5 |
+| main.rs:228:10:228:57 | [match(true)] SSA phi(a5) | main.rs:228:9:228:83 | a5 | main.rs:228:29:228:30 | a5 |
+| main.rs:228:10:228:57 | [match(true)] SSA phi(a5) | main.rs:228:9:228:83 | a5 | main.rs:228:55:228:56 | a5 |
+| main.rs:232:9:232:83 | SSA phi(a6) | main.rs:232:9:232:83 | a6 | main.rs:232:28:232:29 | a6 |
+| main.rs:232:9:232:83 | SSA phi(a6) | main.rs:232:9:232:83 | a6 | main.rs:232:35:232:82 | SSA phi(a6) |
+| main.rs:232:35:232:82 | SSA phi(a6) | main.rs:232:9:232:83 | a6 | main.rs:232:55:232:56 | a6 |
+| main.rs:232:35:232:82 | SSA phi(a6) | main.rs:232:9:232:83 | a6 | main.rs:232:80:232:81 | a6 |
+| main.rs:240:9:240:44 | [match(true)] SSA phi(a7) | main.rs:240:9:240:44 | a7 | main.rs:240:22:240:23 | a7 |
+| main.rs:240:9:240:44 | [match(true)] SSA phi(a7) | main.rs:240:9:240:44 | a7 | main.rs:240:42:240:43 | a7 |
+| main.rs:252:14:252:51 | [match(true)] SSA phi(a11) | main.rs:252:14:252:51 | a11 | main.rs:252:27:252:29 | a11 |
+| main.rs:252:14:252:51 | [match(true)] SSA phi(a11) | main.rs:252:14:252:51 | a11 | main.rs:252:48:252:50 | a11 |
+| main.rs:274:9:274:109 | SSA phi(a13) | main.rs:274:9:274:109 | a13 | main.rs:274:27:274:29 | a13 |
+| main.rs:274:9:274:109 | SSA phi(a13) | main.rs:274:9:274:109 | a13 | main.rs:274:35:274:82 | [match(true)] SSA phi(a13) |
+| main.rs:274:9:274:109 | SSA phi(a13) | main.rs:274:9:274:109 | a13 | main.rs:274:106:274:108 | a13 |
+| main.rs:274:35:274:82 | [match(true)] SSA phi(a13) | main.rs:274:9:274:109 | a13 | main.rs:274:54:274:56 | a13 |
+| main.rs:274:35:274:82 | [match(true)] SSA phi(a13) | main.rs:274:9:274:109 | a13 | main.rs:274:79:274:81 | a13 |
+| main.rs:395:20:395:55 | SSA phi(a9) | main.rs:395:20:395:55 | a9 | main.rs:395:33:395:34 | a9 |
+| main.rs:395:20:395:55 | SSA phi(a9) | main.rs:395:20:395:55 | a9 | main.rs:395:53:395:54 | a9 |
+| main.rs:611:13:620:5 | SSA phi(x) | main.rs:607:13:607:13 | x | main.rs:613:9:613:9 | x |
+| main.rs:611:13:620:5 | SSA phi(x) | main.rs:607:13:607:13 | x | main.rs:617:9:617:9 | x |
+| main.rs:748:17:750:9 | SSA phi(x) | main.rs:745:13:745:13 | x | main.rs:746:19:751:5 | <captured entry> x |
+| main.rs:748:17:750:9 | SSA phi(x) | main.rs:745:13:745:13 | x | main.rs:749:13:749:13 | x |
 phiReadNode
-| main.rs:108:11:109:12 | SSA phi read(s1) | main.rs:106:9:106:10 | s1 |
-| main.rs:510:13:515:5 | SSA phi read(x) | main.rs:508:9:508:9 | x |
+| main.rs:116:11:116:12 | SSA phi read(s1) | main.rs:113:9:113:10 | s1 |
+| main.rs:627:13:632:5 | SSA phi read(x) | main.rs:625:9:625:9 | x |
 phiReadNodeFirstRead
-| main.rs:108:11:109:12 | SSA phi read(s1) | main.rs:106:9:106:10 | s1 | main.rs:109:11:109:12 | s1 |
-| main.rs:510:13:515:5 | SSA phi read(x) | main.rs:508:9:508:9 | x | main.rs:520:19:520:19 | x |
-| main.rs:510:13:515:5 | SSA phi read(x) | main.rs:508:9:508:9 | x | main.rs:522:19:522:19 | x |
+| main.rs:116:11:116:12 | SSA phi read(s1) | main.rs:113:9:113:10 | s1 | main.rs:116:11:116:12 | s1 |
+| main.rs:627:13:632:5 | SSA phi read(x) | main.rs:625:9:625:9 | x | main.rs:637:19:637:19 | x |
+| main.rs:627:13:632:5 | SSA phi read(x) | main.rs:625:9:625:9 | x | main.rs:639:19:639:19 | x |
 phiReadInput
-| main.rs:108:11:109:12 | SSA phi read(s1) | main.rs:106:9:106:10 | s1 |
-| main.rs:108:11:109:12 | SSA phi read(s1) | main.rs:109:11:109:12 | SSA read(s1) |
-| main.rs:510:13:515:5 | SSA phi read(x) | main.rs:512:19:512:19 | SSA read(x) |
-| main.rs:510:13:515:5 | SSA phi read(x) | main.rs:514:19:514:19 | SSA read(x) |
+| main.rs:116:11:116:12 | SSA phi read(s1) | main.rs:113:9:113:10 | s1 |
+| main.rs:116:11:116:12 | SSA phi read(s1) | main.rs:116:11:116:12 | SSA read(s1) |
+| main.rs:627:13:632:5 | SSA phi read(x) | main.rs:629:19:629:19 | SSA read(x) |
+| main.rs:627:13:632:5 | SSA phi read(x) | main.rs:631:19:631:19 | SSA read(x) |
 ultimateDef
-| main.rs:203:9:203:44 | SSA phi(a3) | main.rs:203:22:203:23 | a3 |
-| main.rs:203:9:203:44 | SSA phi(a3) | main.rs:203:42:203:43 | a3 |
-| main.rs:217:9:217:81 | SSA phi(a4) | main.rs:217:28:217:29 | a4 |
-| main.rs:217:9:217:81 | SSA phi(a4) | main.rs:217:54:217:55 | a4 |
-| main.rs:217:9:217:81 | SSA phi(a4) | main.rs:217:79:217:80 | a4 |
-| main.rs:221:9:221:83 | SSA phi(a5) | main.rs:221:29:221:30 | a5 |
-| main.rs:221:9:221:83 | SSA phi(a5) | main.rs:221:55:221:56 | a5 |
-| main.rs:221:9:221:83 | SSA phi(a5) | main.rs:221:81:221:82 | a5 |
-| main.rs:221:10:221:57 | [match(true)] SSA phi(a5) | main.rs:221:29:221:30 | a5 |
-| main.rs:221:10:221:57 | [match(true)] SSA phi(a5) | main.rs:221:55:221:56 | a5 |
-| main.rs:225:9:225:83 | SSA phi(a6) | main.rs:225:28:225:29 | a6 |
-| main.rs:225:9:225:83 | SSA phi(a6) | main.rs:225:55:225:56 | a6 |
-| main.rs:225:9:225:83 | SSA phi(a6) | main.rs:225:80:225:81 | a6 |
-| main.rs:225:35:225:82 | SSA phi(a6) | main.rs:225:55:225:56 | a6 |
-| main.rs:225:35:225:82 | SSA phi(a6) | main.rs:225:80:225:81 | a6 |
-| main.rs:233:9:233:44 | [match(true)] SSA phi(a7) | main.rs:233:22:233:23 | a7 |
-| main.rs:233:9:233:44 | [match(true)] SSA phi(a7) | main.rs:233:42:233:43 | a7 |
-| main.rs:245:14:245:51 | [match(true)] SSA phi(a11) | main.rs:245:27:245:29 | a11 |
-| main.rs:245:14:245:51 | [match(true)] SSA phi(a11) | main.rs:245:48:245:50 | a11 |
-| main.rs:267:9:267:109 | SSA phi(a13) | main.rs:267:27:267:29 | a13 |
-| main.rs:267:9:267:109 | SSA phi(a13) | main.rs:267:54:267:56 | a13 |
-| main.rs:267:9:267:109 | SSA phi(a13) | main.rs:267:79:267:81 | a13 |
-| main.rs:267:9:267:109 | SSA phi(a13) | main.rs:267:106:267:108 | a13 |
-| main.rs:267:35:267:82 | [match(true)] SSA phi(a13) | main.rs:267:54:267:56 | a13 |
-| main.rs:267:35:267:82 | [match(true)] SSA phi(a13) | main.rs:267:79:267:81 | a13 |
-| main.rs:284:20:284:55 | SSA phi(a9) | main.rs:284:33:284:34 | a9 |
-| main.rs:284:20:284:55 | SSA phi(a9) | main.rs:284:53:284:54 | a9 |
-| main.rs:494:13:503:5 | SSA phi(x) | main.rs:496:9:496:9 | x |
-| main.rs:494:13:503:5 | SSA phi(x) | main.rs:500:9:500:9 | x |
-| main.rs:629:17:631:9 | SSA phi(x) | main.rs:627:19:632:5 | <captured entry> x |
-| main.rs:629:17:631:9 | SSA phi(x) | main.rs:630:13:630:13 | x |
+| main.rs:210:9:210:44 | SSA phi(a3) | main.rs:210:22:210:23 | a3 |
+| main.rs:210:9:210:44 | SSA phi(a3) | main.rs:210:42:210:43 | a3 |
+| main.rs:224:9:224:81 | SSA phi(a4) | main.rs:224:28:224:29 | a4 |
+| main.rs:224:9:224:81 | SSA phi(a4) | main.rs:224:54:224:55 | a4 |
+| main.rs:224:9:224:81 | SSA phi(a4) | main.rs:224:79:224:80 | a4 |
+| main.rs:228:9:228:83 | SSA phi(a5) | main.rs:228:29:228:30 | a5 |
+| main.rs:228:9:228:83 | SSA phi(a5) | main.rs:228:55:228:56 | a5 |
+| main.rs:228:9:228:83 | SSA phi(a5) | main.rs:228:81:228:82 | a5 |
+| main.rs:228:10:228:57 | [match(true)] SSA phi(a5) | main.rs:228:29:228:30 | a5 |
+| main.rs:228:10:228:57 | [match(true)] SSA phi(a5) | main.rs:228:55:228:56 | a5 |
+| main.rs:232:9:232:83 | SSA phi(a6) | main.rs:232:28:232:29 | a6 |
+| main.rs:232:9:232:83 | SSA phi(a6) | main.rs:232:55:232:56 | a6 |
+| main.rs:232:9:232:83 | SSA phi(a6) | main.rs:232:80:232:81 | a6 |
+| main.rs:232:35:232:82 | SSA phi(a6) | main.rs:232:55:232:56 | a6 |
+| main.rs:232:35:232:82 | SSA phi(a6) | main.rs:232:80:232:81 | a6 |
+| main.rs:240:9:240:44 | [match(true)] SSA phi(a7) | main.rs:240:22:240:23 | a7 |
+| main.rs:240:9:240:44 | [match(true)] SSA phi(a7) | main.rs:240:42:240:43 | a7 |
+| main.rs:252:14:252:51 | [match(true)] SSA phi(a11) | main.rs:252:27:252:29 | a11 |
+| main.rs:252:14:252:51 | [match(true)] SSA phi(a11) | main.rs:252:48:252:50 | a11 |
+| main.rs:274:9:274:109 | SSA phi(a13) | main.rs:274:27:274:29 | a13 |
+| main.rs:274:9:274:109 | SSA phi(a13) | main.rs:274:54:274:56 | a13 |
+| main.rs:274:9:274:109 | SSA phi(a13) | main.rs:274:79:274:81 | a13 |
+| main.rs:274:9:274:109 | SSA phi(a13) | main.rs:274:106:274:108 | a13 |
+| main.rs:274:35:274:82 | [match(true)] SSA phi(a13) | main.rs:274:54:274:56 | a13 |
+| main.rs:274:35:274:82 | [match(true)] SSA phi(a13) | main.rs:274:79:274:81 | a13 |
+| main.rs:395:20:395:55 | SSA phi(a9) | main.rs:395:33:395:34 | a9 |
+| main.rs:395:20:395:55 | SSA phi(a9) | main.rs:395:53:395:54 | a9 |
+| main.rs:611:13:620:5 | SSA phi(x) | main.rs:613:9:613:9 | x |
+| main.rs:611:13:620:5 | SSA phi(x) | main.rs:617:9:617:9 | x |
+| main.rs:748:17:750:9 | SSA phi(x) | main.rs:746:19:751:5 | <captured entry> x |
+| main.rs:748:17:750:9 | SSA phi(x) | main.rs:749:13:749:13 | x |
 assigns
-| main.rs:18:9:18:10 | x1 | main.rs:18:14:18:16 | "a" |
-| main.rs:23:13:23:14 | x2 | main.rs:23:18:23:18 | 4 |
-| main.rs:25:5:25:6 | x2 | main.rs:25:10:25:10 | 5 |
-| main.rs:30:13:30:13 | x | main.rs:30:17:30:17 | 1 |
-| main.rs:32:5:32:5 | x | main.rs:32:9:32:9 | 2 |
-| main.rs:37:9:37:10 | x3 | main.rs:37:14:37:14 | 1 |
-| main.rs:39:9:39:10 | x3 | main.rs:40:9:40:14 | ... + ... |
-| main.rs:45:9:45:10 | x4 | main.rs:45:14:45:16 | "a" |
-| main.rs:48:13:48:14 | x4 | main.rs:48:18:48:20 | "b" |
-| main.rs:77:9:77:10 | p1 | main.rs:77:14:77:37 | Point {...} |
-| main.rs:87:9:87:10 | s1 | main.rs:87:14:87:41 | Some(...) |
-| main.rs:106:9:106:10 | s1 | main.rs:106:14:106:41 | Some(...) |
-| main.rs:115:9:115:10 | x6 | main.rs:115:14:115:20 | Some(...) |
-| main.rs:116:9:116:10 | y1 | main.rs:116:14:116:15 | 10 |
-| main.rs:132:9:132:15 | numbers | main.rs:132:19:132:35 | TupleExpr |
-| main.rs:163:9:163:10 | p2 | main.rs:163:14:163:37 | Point {...} |
-| main.rs:177:9:177:11 | msg | main.rs:177:15:177:38 | ...::Hello {...} |
-| main.rs:201:9:201:14 | either | main.rs:201:18:201:33 | ...::Left(...) |
-| main.rs:215:9:215:10 | tv | main.rs:215:14:215:36 | ...::Second(...) |
-| main.rs:231:9:231:14 | either | main.rs:231:18:231:33 | ...::Left(...) |
-| main.rs:241:9:241:14 | either | main.rs:241:18:241:33 | ...::Left(...) |
-| main.rs:265:9:265:10 | fv | main.rs:265:14:265:35 | ...::Second(...) |
-| main.rs:327:9:327:23 | example_closure | main.rs:328:9:329:9 | \|...\| x |
-| main.rs:330:9:330:10 | n1 | main.rs:331:9:331:26 | example_closure(...) |
-| main.rs:335:9:335:26 | immutable_variable | main.rs:336:5:337:9 | \|...\| x |
-| main.rs:338:9:338:10 | n2 | main.rs:339:9:339:29 | immutable_variable(...) |
-| main.rs:345:9:345:9 | f | main.rs:346:9:347:9 | \|...\| x |
-| main.rs:368:13:368:13 | f | main.rs:369:13:370:13 | \|...\| x |
-| main.rs:376:9:376:9 | v | main.rs:376:13:376:41 | &... |
-| main.rs:385:13:385:13 | a | main.rs:385:17:385:17 | 0 |
-| main.rs:393:13:393:13 | i | main.rs:393:17:393:17 | 1 |
-| main.rs:394:9:394:13 | ref_i | main.rs:395:9:395:14 | &mut i |
-| main.rs:416:13:416:13 | x | main.rs:416:17:416:17 | 2 |
-| main.rs:417:9:417:9 | y | main.rs:418:9:418:28 | mutate_param(...) |
-| main.rs:423:13:423:13 | z | main.rs:423:17:423:17 | 4 |
-| main.rs:424:9:424:9 | w | main.rs:425:9:425:19 | &mut ... |
-| main.rs:436:13:436:13 | x | main.rs:436:17:436:17 | 1 |
-| main.rs:437:9:437:9 | y | main.rs:438:9:438:14 | &mut x |
-| main.rs:444:9:444:9 | x | main.rs:444:13:444:15 | 100 |
-| main.rs:446:9:446:11 | cap | main.rs:446:15:448:5 | \|...\| ... |
-| main.rs:454:13:454:13 | x | main.rs:454:17:454:17 | 1 |
-| main.rs:456:9:456:16 | closure1 | main.rs:456:20:458:5 | \|...\| ... |
-| main.rs:462:13:462:13 | y | main.rs:462:17:462:17 | 2 |
-| main.rs:464:13:464:20 | closure2 | main.rs:464:24:466:5 | \|...\| ... |
-| main.rs:465:9:465:9 | y | main.rs:465:13:465:13 | 3 |
-| main.rs:470:13:470:13 | z | main.rs:470:17:470:17 | 2 |
-| main.rs:472:13:472:20 | closure3 | main.rs:472:24:474:5 | \|...\| ... |
-| main.rs:480:13:480:13 | i | main.rs:480:22:480:22 | 0 |
-| main.rs:481:9:481:13 | block | main.rs:481:17:483:5 | { ... } |
-| main.rs:482:9:482:9 | i | main.rs:482:13:482:13 | 1 |
-| main.rs:490:13:490:13 | x | main.rs:490:17:490:17 | 1 |
-| main.rs:496:9:496:9 | x | main.rs:496:13:496:13 | 2 |
-| main.rs:500:9:500:9 | x | main.rs:500:13:500:13 | 3 |
-| main.rs:508:9:508:9 | x | main.rs:508:13:508:13 | 1 |
-| main.rs:540:17:540:17 | f | main.rs:540:21:543:9 | \|...\| ... |
-| main.rs:550:13:550:13 | a | main.rs:550:17:550:35 | MyStruct {...} |
-| main.rs:554:5:554:5 | a | main.rs:554:9:554:27 | MyStruct {...} |
-| main.rs:559:13:559:13 | a | main.rs:559:17:559:25 | [...] |
-| main.rs:563:5:563:5 | a | main.rs:563:9:563:17 | [...] |
-| main.rs:568:9:568:9 | x | main.rs:568:13:568:14 | 16 |
-| main.rs:572:9:572:9 | z | main.rs:572:13:572:14 | 17 |
-| main.rs:587:13:587:13 | a | main.rs:587:17:587:35 | MyStruct {...} |
-| main.rs:608:9:608:22 | var_from_macro | main.rs:609:9:609:25 | MacroExpr |
-| main.rs:609:9:609:25 | var_in_macro | main.rs:609:23:609:24 | 37 |
-| main.rs:611:9:611:20 | var_in_macro | main.rs:611:24:611:25 | 33 |
-| main.rs:615:15:615:42 | var_in_macro | main.rs:615:15:615:42 | 0 |
-| main.rs:621:5:621:5 | x | main.rs:621:9:621:9 | 1 |
-| main.rs:626:13:626:13 | x | main.rs:626:17:626:19 | 100 |
-| main.rs:627:13:627:15 | cap | main.rs:627:19:632:5 | \|...\| ... |
-| main.rs:630:13:630:13 | x | main.rs:630:17:630:19 | 200 |
+| main.rs:20:9:20:10 | x1 | main.rs:20:14:20:16 | "a" |
+| main.rs:25:13:25:14 | x2 | main.rs:25:18:25:18 | 4 |
+| main.rs:27:5:27:6 | x2 | main.rs:27:10:27:10 | 5 |
+| main.rs:29:5:29:6 | x2 | main.rs:29:10:29:11 | x2 |
+| main.rs:34:13:34:13 | x | main.rs:34:17:34:17 | 1 |
+| main.rs:36:5:36:5 | x | main.rs:36:9:36:9 | 2 |
+| main.rs:41:9:41:10 | x3 | main.rs:41:14:41:14 | 1 |
+| main.rs:43:9:43:10 | x3 | main.rs:44:9:44:14 | ... + ... |
+| main.rs:49:9:49:10 | x4 | main.rs:49:14:49:16 | "a" |
+| main.rs:52:13:52:14 | x4 | main.rs:52:18:52:20 | "b" |
+| main.rs:81:9:81:10 | p1 | main.rs:81:14:81:37 | Point {...} |
+| main.rs:91:9:91:10 | s1 | main.rs:91:14:91:41 | Some(...) |
+| main.rs:100:9:100:9 | x | main.rs:100:13:100:22 | Some(...) |
+| main.rs:104:13:104:13 | x | main.rs:105:13:105:13 | x |
+| main.rs:113:9:113:10 | s1 | main.rs:113:14:113:41 | Some(...) |
+| main.rs:122:9:122:10 | x6 | main.rs:122:14:122:20 | Some(...) |
+| main.rs:123:9:123:10 | y1 | main.rs:123:14:123:15 | 10 |
+| main.rs:139:9:139:15 | numbers | main.rs:139:19:139:35 | TupleExpr |
+| main.rs:170:9:170:10 | p2 | main.rs:170:14:170:37 | Point {...} |
+| main.rs:184:9:184:11 | msg | main.rs:184:15:184:38 | ...::Hello {...} |
+| main.rs:208:9:208:14 | either | main.rs:208:18:208:33 | ...::Left(...) |
+| main.rs:222:9:222:10 | tv | main.rs:222:14:222:36 | ...::Second(...) |
+| main.rs:238:9:238:14 | either | main.rs:238:18:238:33 | ...::Left(...) |
+| main.rs:248:9:248:14 | either | main.rs:248:18:248:33 | ...::Left(...) |
+| main.rs:272:9:272:10 | fv | main.rs:272:14:272:35 | ...::Second(...) |
+| main.rs:281:9:281:9 | x | main.rs:281:12:281:19 | Some(...) |
+| main.rs:289:13:289:13 | x | main.rs:290:13:290:13 | x |
+| main.rs:297:9:297:9 | x | main.rs:297:13:297:20 | Some(...) |
+| main.rs:308:13:308:13 | x | main.rs:309:13:309:13 | x |
+| main.rs:316:9:316:9 | x | main.rs:316:13:316:20 | Some(...) |
+| main.rs:334:9:334:9 | x | main.rs:334:13:334:20 | Some(...) |
+| main.rs:337:20:337:20 | x | main.rs:338:18:338:18 | x |
+| main.rs:348:9:348:9 | x | main.rs:348:13:348:18 | Ok(...) |
+| main.rs:364:9:364:9 | x | main.rs:364:13:364:19 | Some(...) |
+| main.rs:373:9:373:9 | x | main.rs:373:13:373:20 | Some(...) |
+| main.rs:438:9:438:23 | example_closure | main.rs:439:9:440:9 | \|...\| x |
+| main.rs:441:9:441:10 | n1 | main.rs:442:9:442:26 | example_closure(...) |
+| main.rs:446:9:446:26 | immutable_variable | main.rs:447:5:448:9 | \|...\| x |
+| main.rs:449:9:449:10 | n2 | main.rs:450:9:450:29 | immutable_variable(...) |
+| main.rs:456:9:456:9 | f | main.rs:457:9:458:9 | \|...\| x |
+| main.rs:479:13:479:13 | f | main.rs:480:13:481:13 | \|...\| x |
+| main.rs:487:9:487:9 | v | main.rs:487:13:487:41 | &... |
+| main.rs:496:13:496:13 | a | main.rs:496:17:496:17 | 0 |
+| main.rs:504:13:504:13 | i | main.rs:504:17:504:17 | 1 |
+| main.rs:505:9:505:13 | ref_i | main.rs:506:9:506:14 | &mut i |
+| main.rs:527:13:527:13 | x | main.rs:527:17:527:17 | 2 |
+| main.rs:528:9:528:9 | y | main.rs:529:9:529:28 | mutate_param(...) |
+| main.rs:535:13:535:13 | z | main.rs:535:17:535:17 | 4 |
+| main.rs:536:9:536:9 | w | main.rs:537:9:537:19 | &mut ... |
+| main.rs:549:13:549:13 | x | main.rs:549:17:549:17 | 1 |
+| main.rs:550:9:550:9 | y | main.rs:551:9:551:14 | &mut x |
+| main.rs:557:9:557:9 | x | main.rs:557:13:557:15 | 100 |
+| main.rs:560:9:560:11 | cap | main.rs:560:15:562:5 | \|...\| ... |
+| main.rs:568:13:568:13 | x | main.rs:568:17:568:17 | 1 |
+| main.rs:571:9:571:16 | closure1 | main.rs:571:20:573:5 | \|...\| ... |
+| main.rs:577:13:577:13 | y | main.rs:577:17:577:17 | 2 |
+| main.rs:580:13:580:20 | closure2 | main.rs:580:24:582:5 | \|...\| ... |
+| main.rs:581:9:581:9 | y | main.rs:581:13:581:13 | 3 |
+| main.rs:586:13:586:13 | z | main.rs:586:17:586:17 | 2 |
+| main.rs:589:13:589:20 | closure3 | main.rs:589:24:591:5 | \|...\| ... |
+| main.rs:597:13:597:13 | i | main.rs:597:22:597:22 | 0 |
+| main.rs:598:9:598:13 | block | main.rs:598:17:600:5 | { ... } |
+| main.rs:599:9:599:9 | i | main.rs:599:13:599:13 | 1 |
+| main.rs:607:13:607:13 | x | main.rs:607:17:607:17 | 1 |
+| main.rs:613:9:613:9 | x | main.rs:613:13:613:13 | 2 |
+| main.rs:617:9:617:9 | x | main.rs:617:13:617:13 | 3 |
+| main.rs:625:9:625:9 | x | main.rs:625:13:625:13 | 1 |
+| main.rs:657:17:657:17 | f | main.rs:657:21:660:9 | \|...\| ... |
+| main.rs:667:13:667:13 | a | main.rs:667:17:667:35 | MyStruct {...} |
+| main.rs:671:5:671:5 | a | main.rs:671:9:671:27 | MyStruct {...} |
+| main.rs:676:13:676:13 | a | main.rs:676:17:676:25 | [...] |
+| main.rs:680:5:680:5 | a | main.rs:680:9:680:17 | [...] |
+| main.rs:685:9:685:9 | x | main.rs:685:13:685:14 | 16 |
+| main.rs:689:9:689:9 | z | main.rs:689:13:689:14 | 17 |
+| main.rs:704:13:704:13 | a | main.rs:704:17:704:35 | MyStruct {...} |
+| main.rs:726:9:726:22 | var_from_macro | main.rs:727:9:727:25 | MacroExpr |
+| main.rs:727:9:727:21 | var_in_macro | main.rs:727:23:727:24 | 37 |
+| main.rs:729:9:729:20 | var_in_macro | main.rs:729:24:729:25 | 33 |
+| main.rs:734:15:734:28 | var_in_macro | main.rs:734:15:734:28 | 0 |
+| main.rs:740:5:740:5 | x | main.rs:740:9:740:9 | 1 |
+| main.rs:745:13:745:13 | x | main.rs:745:17:745:19 | 100 |
+| main.rs:746:13:746:15 | cap | main.rs:746:19:751:5 | \|...\| ... |
+| main.rs:749:13:749:13 | x | main.rs:749:17:749:19 | 200 |
diff --git a/rust/ql/test/library-tests/variables/main.rs b/rust/ql/test/library-tests/variables/main.rs
index 0701bdef323..cdfe1091ee3 100644
--- a/rust/ql/test/library-tests/variables/main.rs
+++ b/rust/ql/test/library-tests/variables/main.rs
@@ -1,3 +1,5 @@
+#![feature(let_chains)]
+#![feature(if_let_guard)]
 use std::ops::AddAssign;
 
 fn print_str(s: &str) // s
@@ -24,6 +26,8 @@ fn mutable_variable() {
     print_i64(x2); // $ read_access=x2
     x2 = 5; // $ write_access=x2
     print_i64(x2); // $ read_access=x2
+    x2 = x2; // $ read_access=x2 $ write_access=x2
+    print_i64(x2); // $ read_access=x2
 }
 
 fn mutable_variable_immutable_borrow() {
@@ -93,13 +97,16 @@ fn let_pattern3() {
 }
 
 fn let_pattern4() {
-    let Some(x5): Option<&str> // x5
-    = Some("x5")
-
+    let x = Some("x5"); // x1
+    let Some(x): Option<&str> // x2
+    = x // $ read_access=x1
     else {
+        let x = // x3
+            x; // $ read_access=x1
+        print_str(x.unwrap()); // $ read_access=x3
         todo!()
     };
-    print_str(x5); // $ read_access=x5
+    print_str(x); // $ read_access=x2
 }
 
 fn let_pattern5() {
@@ -269,6 +276,110 @@ fn match_pattern9() {
     }
 }
 
+#[rustfmt::skip]
+fn match_pattern10() {
+    let x= Some(42); // x1
+    if let Some(x) // x2
+    = x // $ read_access=x1
+    &&
+    x > 0 // $ read_access=x2
+    {    
+        print_i64(x); // $ read_access=x2
+    } else {
+        let x = // x3
+            x; // $ read_access=x1
+        print_i64(x.unwrap()); // $ read_access=x3
+    }
+}
+
+#[rustfmt::skip]
+fn match_pattern11() {
+    let x = Some(42); // x1
+    if let Some(x) // x2
+    = x // $ read_access=x1
+    &&
+    let Some(x) // x3
+    = Some(x) // $ read_access=x2
+    &&
+    x > 0 // $ read_access=x3
+    {    
+        print_i64(x); // $ read_access=x3
+    } else {
+        let x = // x4
+            x; // $ read_access=x1
+        print_i64(x.unwrap()); // $ read_access=x4
+    }
+}
+
+#[rustfmt::skip]
+fn match_pattern12() {
+    let x = Some(42); // x1
+    while let Some(x) // x2
+    = x // $ read_access=x1
+    &&
+    let Some(x) // x3
+    = Some(x) // $ read_access=x2
+    &&
+    x > 0 // $ read_access=x3
+    {    
+        print_i64(x); // $ read_access=x3
+        break;
+    }
+
+    print_i64(x.unwrap()); // $ read_access=x1
+}
+
+#[rustfmt::skip]
+fn match_pattern13() {
+    let x = Some(42); // x1
+    match x { // $ read_access=x1
+        Some(x) // x2
+            if let x // x3
+               = x // $ read_access=x2
+               && x > 0 => (), // $ read_access=x3
+        _ => ()
+    }
+
+    print_i64(x.unwrap()); // $ read_access=x1
+}
+
+#[rustfmt::skip]
+fn match_pattern14() {
+    let x = Ok(42); // x1
+    if let Err(x) // x2
+    = x // $ read_access=x1
+    {
+        print_i64(x); // $ read_access=x2
+    }
+    else if let Ok(x) // x3
+    = x // $ read_access=x1
+    {    
+        print_i64(x); // $ read_access=x3
+    } else {
+        print_i64(x.unwrap()); // $ read_access=x1
+    }
+}
+
+fn match_pattern15() {
+    let x = Some(0); // x1
+    match x { // $ read_access=x1
+            Some(x) // x2
+                => x, // $ read_access=x2
+            _ => 0
+        };
+}
+
+fn match_pattern16() {
+    let x = Some(32);
+    match x { // $ read_access=x
+        Some(y) // y1
+            if let Some(y) = // y2
+                Some(y) // $ read_access=y1
+            => print_i64(y), // $ read_access=y2
+        _ => {},
+    }
+}
+
 fn param_pattern1(
     a8: &str, // a8
     (
@@ -417,6 +528,7 @@ fn mutate_arg() {
     let y = // y
         mutate_param(&mut x); // $ access=x
     *y = 10; // $ read_access=y
+
     // prints 10, not 4
     print_i64(x); // $ read_access=x
 
@@ -428,6 +540,7 @@ fn mutate_arg() {
         w,      // $ read_access=w
     );
     **w = 11; // $ read_access=w
+
     // prints 11, not 8
     print_i64(z); // $ read_access=z
 }
@@ -442,6 +555,7 @@ fn alias() {
 
 fn capture_immut() {
     let x = 100; // x
+
     // Captures immutable value by immutable reference
     let cap = || {
         print_i64(x); // $ read_access=x
@@ -452,6 +566,7 @@ fn capture_immut() {
 
 fn capture_mut() {
     let mut x = 1; // x
+
     // Captures mutable value by immutable reference
     let closure1 = || {
         print_i64(x); // $ read_access=x
@@ -460,6 +575,7 @@ fn capture_mut() {
     print_i64(x); // $ read_access=x
 
     let mut y = 2; // y
+
     // Captures mutable value by mutable reference
     let mut closure2 = || {
         y = 3; // $ write_access=y
@@ -468,6 +584,7 @@ fn capture_mut() {
     print_i64(y); // $ read_access=y
 
     let mut z = 2; // z
+
     // Captures mutable value by mutable reference and calls mutating method
     let mut closure3 = || {
         z.add_assign(1); // $ read_access=z
@@ -586,6 +703,7 @@ impl MyStruct {
 fn ref_methodcall_receiver() {
     let mut a = MyStruct { val: 1 }; // a
     a.bar(); // $ read_access=a
+
     // prints 3, not 1
     print_i64(a.val); // $ read_access=a
 }
@@ -609,6 +727,7 @@ fn macro_invocation() {
         let_in_macro!(37); // $ read_access=var_in_macro
     print_i64(var_from_macro); // $ read_access=var_from_macro1
     let var_in_macro = 33; // var_in_macro1
+
     // Our analysis does not currently respect the hygiene rules of Rust macros
     // (https://veykril.github.io/tlborm/decl-macros/minutiae/hygiene.html), because
     // all we have access to is the expanded AST
@@ -653,6 +772,13 @@ fn main() {
     match_pattern7();
     match_pattern8();
     match_pattern9();
+    match_pattern10();
+    match_pattern11();
+    match_pattern12();
+    match_pattern13();
+    match_pattern14();
+    match_pattern15();
+    match_pattern16();
     param_pattern1("a", ("b", "c"));
     param_pattern2(Either::Left(45));
     destruct_assignment();
diff --git a/rust/ql/test/library-tests/variables/options.yml b/rust/ql/test/library-tests/variables/options.yml
new file mode 100644
index 00000000000..a394083e521
--- /dev/null
+++ b/rust/ql/test/library-tests/variables/options.yml
@@ -0,0 +1 @@
+qltest_use_nightly: true
diff --git a/rust/ql/test/library-tests/variables/variables.expected b/rust/ql/test/library-tests/variables/variables.expected
index b77fbe505b6..64431803e6d 100644
--- a/rust/ql/test/library-tests/variables/variables.expected
+++ b/rust/ql/test/library-tests/variables/variables.expected
@@ -1,563 +1,670 @@
 testFailures
 variable
-| main.rs:3:14:3:14 | s |
-| main.rs:8:14:8:14 | i |
-| main.rs:13:18:13:18 | i |
-| main.rs:18:9:18:10 | x1 |
-| main.rs:23:13:23:14 | x2 |
-| main.rs:30:13:30:13 | x |
-| main.rs:37:9:37:10 | x3 |
-| main.rs:39:9:39:10 | x3 |
-| main.rs:45:9:45:10 | x4 |
-| main.rs:48:13:48:14 | x4 |
-| main.rs:62:13:62:14 | a1 |
-| main.rs:63:13:63:14 | b1 |
-| main.rs:66:13:66:13 | x |
-| main.rs:67:13:67:13 | y |
-| main.rs:77:9:77:10 | p1 |
-| main.rs:79:12:79:13 | a2 |
-| main.rs:80:12:80:13 | b2 |
-| main.rs:87:9:87:10 | s1 |
-| main.rs:89:21:89:22 | s2 |
-| main.rs:96:14:96:15 | x5 |
-| main.rs:106:9:106:10 | s1 |
-| main.rs:108:24:108:25 | s2 |
-| main.rs:115:9:115:10 | x6 |
-| main.rs:116:9:116:10 | y1 |
-| main.rs:120:14:120:15 | y1 |
-| main.rs:132:9:132:15 | numbers |
-| main.rs:137:13:137:17 | first |
-| main.rs:139:13:139:17 | third |
-| main.rs:141:13:141:17 | fifth |
-| main.rs:152:13:152:17 | first |
-| main.rs:154:13:154:16 | last |
-| main.rs:163:9:163:10 | p2 |
-| main.rs:167:16:167:17 | x7 |
-| main.rs:177:9:177:11 | msg |
-| main.rs:182:17:182:27 | id_variable |
-| main.rs:187:26:187:27 | id |
-| main.rs:201:9:201:14 | either |
-| main.rs:203:9:203:44 | a3 |
-| main.rs:215:9:215:10 | tv |
-| main.rs:217:9:217:81 | a4 |
-| main.rs:221:9:221:83 | a5 |
-| main.rs:225:9:225:83 | a6 |
-| main.rs:231:9:231:14 | either |
-| main.rs:233:9:233:44 | a7 |
-| main.rs:241:9:241:14 | either |
-| main.rs:244:13:244:13 | e |
-| main.rs:245:14:245:51 | a11 |
-| main.rs:248:33:248:35 | a12 |
-| main.rs:265:9:265:10 | fv |
-| main.rs:267:9:267:109 | a13 |
-| main.rs:273:5:273:6 | a8 |
-| main.rs:275:9:275:10 | b3 |
-| main.rs:276:9:276:10 | c1 |
-| main.rs:284:20:284:55 | a9 |
-| main.rs:291:13:291:15 | a10 |
-| main.rs:292:13:292:14 | b4 |
-| main.rs:293:13:293:14 | c2 |
-| main.rs:314:13:314:15 | a10 |
-| main.rs:315:13:315:14 | b4 |
-| main.rs:327:9:327:23 | example_closure |
-| main.rs:328:10:328:10 | x |
-| main.rs:330:9:330:10 | n1 |
-| main.rs:335:9:335:26 | immutable_variable |
-| main.rs:336:6:336:6 | x |
-| main.rs:338:9:338:10 | n2 |
-| main.rs:345:9:345:9 | f |
-| main.rs:346:10:346:10 | x |
-| main.rs:350:10:350:10 | x |
-| main.rs:359:14:359:14 | x |
-| main.rs:368:13:368:13 | f |
-| main.rs:369:14:369:14 | x |
-| main.rs:376:9:376:9 | v |
-| main.rs:378:9:378:12 | text |
-| main.rs:385:13:385:13 | a |
-| main.rs:393:13:393:13 | i |
-| main.rs:394:9:394:13 | ref_i |
-| main.rs:400:17:400:17 | x |
-| main.rs:407:22:407:22 | x |
-| main.rs:407:38:407:38 | y |
-| main.rs:416:13:416:13 | x |
-| main.rs:417:9:417:9 | y |
-| main.rs:423:13:423:13 | z |
-| main.rs:424:9:424:9 | w |
-| main.rs:436:13:436:13 | x |
-| main.rs:437:9:437:9 | y |
-| main.rs:444:9:444:9 | x |
-| main.rs:446:9:446:11 | cap |
-| main.rs:454:13:454:13 | x |
-| main.rs:456:9:456:16 | closure1 |
-| main.rs:462:13:462:13 | y |
-| main.rs:464:13:464:20 | closure2 |
-| main.rs:470:13:470:13 | z |
-| main.rs:472:13:472:20 | closure3 |
-| main.rs:480:13:480:13 | i |
-| main.rs:481:9:481:13 | block |
-| main.rs:489:8:489:8 | b |
-| main.rs:490:13:490:13 | x |
-| main.rs:507:13:507:14 | b1 |
-| main.rs:507:23:507:24 | b2 |
-| main.rs:508:9:508:9 | x |
-| main.rs:531:20:531:23 | self |
-| main.rs:535:11:535:14 | self |
-| main.rs:539:23:539:26 | self |
-| main.rs:540:17:540:17 | f |
-| main.rs:540:22:540:22 | n |
-| main.rs:550:13:550:13 | a |
-| main.rs:559:13:559:13 | a |
-| main.rs:568:9:568:9 | x |
-| main.rs:572:9:572:9 | z |
-| main.rs:581:17:581:20 | self |
-| main.rs:587:13:587:13 | a |
-| main.rs:608:9:608:22 | var_from_macro |
-| main.rs:609:9:609:25 | var_in_macro |
-| main.rs:611:9:611:20 | var_in_macro |
-| main.rs:615:15:615:42 | var_in_macro |
-| main.rs:620:9:620:9 | x |
-| main.rs:626:13:626:13 | x |
-| main.rs:627:13:627:15 | cap |
-| main.rs:627:20:627:20 | b |
+| main.rs:5:14:5:14 | s |
+| main.rs:10:14:10:14 | i |
+| main.rs:15:18:15:18 | i |
+| main.rs:20:9:20:10 | x1 |
+| main.rs:25:13:25:14 | x2 |
+| main.rs:34:13:34:13 | x |
+| main.rs:41:9:41:10 | x3 |
+| main.rs:43:9:43:10 | x3 |
+| main.rs:49:9:49:10 | x4 |
+| main.rs:52:13:52:14 | x4 |
+| main.rs:66:13:66:14 | a1 |
+| main.rs:67:13:67:14 | b1 |
+| main.rs:70:13:70:13 | x |
+| main.rs:71:13:71:13 | y |
+| main.rs:81:9:81:10 | p1 |
+| main.rs:83:12:83:13 | a2 |
+| main.rs:84:12:84:13 | b2 |
+| main.rs:91:9:91:10 | s1 |
+| main.rs:93:21:93:22 | s2 |
+| main.rs:100:9:100:9 | x |
+| main.rs:101:14:101:14 | x |
+| main.rs:104:13:104:13 | x |
+| main.rs:113:9:113:10 | s1 |
+| main.rs:115:24:115:25 | s2 |
+| main.rs:122:9:122:10 | x6 |
+| main.rs:123:9:123:10 | y1 |
+| main.rs:127:14:127:15 | y1 |
+| main.rs:139:9:139:15 | numbers |
+| main.rs:144:13:144:17 | first |
+| main.rs:146:13:146:17 | third |
+| main.rs:148:13:148:17 | fifth |
+| main.rs:159:13:159:17 | first |
+| main.rs:161:13:161:16 | last |
+| main.rs:170:9:170:10 | p2 |
+| main.rs:174:16:174:17 | x7 |
+| main.rs:184:9:184:11 | msg |
+| main.rs:189:17:189:27 | id_variable |
+| main.rs:194:26:194:27 | id |
+| main.rs:208:9:208:14 | either |
+| main.rs:210:9:210:44 | a3 |
+| main.rs:222:9:222:10 | tv |
+| main.rs:224:9:224:81 | a4 |
+| main.rs:228:9:228:83 | a5 |
+| main.rs:232:9:232:83 | a6 |
+| main.rs:238:9:238:14 | either |
+| main.rs:240:9:240:44 | a7 |
+| main.rs:248:9:248:14 | either |
+| main.rs:251:13:251:13 | e |
+| main.rs:252:14:252:51 | a11 |
+| main.rs:255:33:255:35 | a12 |
+| main.rs:272:9:272:10 | fv |
+| main.rs:274:9:274:109 | a13 |
+| main.rs:281:9:281:9 | x |
+| main.rs:282:17:282:17 | x |
+| main.rs:289:13:289:13 | x |
+| main.rs:297:9:297:9 | x |
+| main.rs:298:17:298:17 | x |
+| main.rs:301:14:301:14 | x |
+| main.rs:308:13:308:13 | x |
+| main.rs:316:9:316:9 | x |
+| main.rs:317:20:317:20 | x |
+| main.rs:320:14:320:14 | x |
+| main.rs:334:9:334:9 | x |
+| main.rs:336:14:336:14 | x |
+| main.rs:337:20:337:20 | x |
+| main.rs:348:9:348:9 | x |
+| main.rs:349:16:349:16 | x |
+| main.rs:354:20:354:20 | x |
+| main.rs:364:9:364:9 | x |
+| main.rs:366:18:366:18 | x |
+| main.rs:373:9:373:9 | x |
+| main.rs:375:14:375:14 | y |
+| main.rs:376:25:376:25 | y |
+| main.rs:384:5:384:6 | a8 |
+| main.rs:386:9:386:10 | b3 |
+| main.rs:387:9:387:10 | c1 |
+| main.rs:395:20:395:55 | a9 |
+| main.rs:402:13:402:15 | a10 |
+| main.rs:403:13:403:14 | b4 |
+| main.rs:404:13:404:14 | c2 |
+| main.rs:425:13:425:15 | a10 |
+| main.rs:426:13:426:14 | b4 |
+| main.rs:438:9:438:23 | example_closure |
+| main.rs:439:10:439:10 | x |
+| main.rs:441:9:441:10 | n1 |
+| main.rs:446:9:446:26 | immutable_variable |
+| main.rs:447:6:447:6 | x |
+| main.rs:449:9:449:10 | n2 |
+| main.rs:456:9:456:9 | f |
+| main.rs:457:10:457:10 | x |
+| main.rs:461:10:461:10 | x |
+| main.rs:470:14:470:14 | x |
+| main.rs:479:13:479:13 | f |
+| main.rs:480:14:480:14 | x |
+| main.rs:487:9:487:9 | v |
+| main.rs:489:9:489:12 | text |
+| main.rs:496:13:496:13 | a |
+| main.rs:504:13:504:13 | i |
+| main.rs:505:9:505:13 | ref_i |
+| main.rs:511:17:511:17 | x |
+| main.rs:518:22:518:22 | x |
+| main.rs:518:38:518:38 | y |
+| main.rs:527:13:527:13 | x |
+| main.rs:528:9:528:9 | y |
+| main.rs:535:13:535:13 | z |
+| main.rs:536:9:536:9 | w |
+| main.rs:549:13:549:13 | x |
+| main.rs:550:9:550:9 | y |
+| main.rs:557:9:557:9 | x |
+| main.rs:560:9:560:11 | cap |
+| main.rs:568:13:568:13 | x |
+| main.rs:571:9:571:16 | closure1 |
+| main.rs:577:13:577:13 | y |
+| main.rs:580:13:580:20 | closure2 |
+| main.rs:586:13:586:13 | z |
+| main.rs:589:13:589:20 | closure3 |
+| main.rs:597:13:597:13 | i |
+| main.rs:598:9:598:13 | block |
+| main.rs:606:8:606:8 | b |
+| main.rs:607:13:607:13 | x |
+| main.rs:624:13:624:14 | b1 |
+| main.rs:624:23:624:24 | b2 |
+| main.rs:625:9:625:9 | x |
+| main.rs:648:20:648:23 | self |
+| main.rs:652:11:652:14 | self |
+| main.rs:656:23:656:26 | self |
+| main.rs:657:17:657:17 | f |
+| main.rs:657:22:657:22 | n |
+| main.rs:667:13:667:13 | a |
+| main.rs:676:13:676:13 | a |
+| main.rs:685:9:685:9 | x |
+| main.rs:689:9:689:9 | z |
+| main.rs:698:17:698:20 | self |
+| main.rs:704:13:704:13 | a |
+| main.rs:726:9:726:22 | var_from_macro |
+| main.rs:727:9:727:21 | var_in_macro |
+| main.rs:729:9:729:20 | var_in_macro |
+| main.rs:734:15:734:28 | var_in_macro |
+| main.rs:739:9:739:9 | x |
+| main.rs:745:13:745:13 | x |
+| main.rs:746:13:746:15 | cap |
+| main.rs:746:20:746:20 | b |
 variableAccess
-| main.rs:5:20:5:20 | s | main.rs:3:14:3:14 | s |
-| main.rs:10:20:10:20 | i | main.rs:8:14:8:14 | i |
-| main.rs:14:16:14:16 | i | main.rs:13:18:13:18 | i |
-| main.rs:19:15:19:16 | x1 | main.rs:18:9:18:10 | x1 |
-| main.rs:24:15:24:16 | x2 | main.rs:23:13:23:14 | x2 |
-| main.rs:25:5:25:6 | x2 | main.rs:23:13:23:14 | x2 |
-| main.rs:26:15:26:16 | x2 | main.rs:23:13:23:14 | x2 |
-| main.rs:31:20:31:20 | x | main.rs:30:13:30:13 | x |
-| main.rs:32:5:32:5 | x | main.rs:30:13:30:13 | x |
-| main.rs:33:20:33:20 | x | main.rs:30:13:30:13 | x |
-| main.rs:38:15:38:16 | x3 | main.rs:37:9:37:10 | x3 |
-| main.rs:40:9:40:10 | x3 | main.rs:37:9:37:10 | x3 |
-| main.rs:41:15:41:16 | x3 | main.rs:39:9:39:10 | x3 |
-| main.rs:46:15:46:16 | x4 | main.rs:45:9:45:10 | x4 |
-| main.rs:49:19:49:20 | x4 | main.rs:48:13:48:14 | x4 |
-| main.rs:51:15:51:16 | x4 | main.rs:45:9:45:10 | x4 |
-| main.rs:70:15:70:16 | a1 | main.rs:62:13:62:14 | a1 |
-| main.rs:71:15:71:16 | b1 | main.rs:63:13:63:14 | b1 |
-| main.rs:72:15:72:15 | x | main.rs:66:13:66:13 | x |
-| main.rs:73:15:73:15 | y | main.rs:67:13:67:13 | y |
-| main.rs:81:9:81:10 | p1 | main.rs:77:9:77:10 | p1 |
-| main.rs:82:15:82:16 | a2 | main.rs:79:12:79:13 | a2 |
-| main.rs:83:15:83:16 | b2 | main.rs:80:12:80:13 | b2 |
-| main.rs:90:11:90:12 | s1 | main.rs:87:9:87:10 | s1 |
-| main.rs:91:19:91:20 | s2 | main.rs:89:21:89:22 | s2 |
-| main.rs:102:15:102:16 | x5 | main.rs:96:14:96:15 | x5 |
-| main.rs:109:11:109:12 | s1 | main.rs:106:9:106:10 | s1 |
-| main.rs:110:19:110:20 | s2 | main.rs:108:24:108:25 | s2 |
-| main.rs:118:11:118:12 | x6 | main.rs:115:9:115:10 | x6 |
-| main.rs:123:23:123:24 | y1 | main.rs:120:14:120:15 | y1 |
-| main.rs:128:15:128:16 | y1 | main.rs:116:9:116:10 | y1 |
-| main.rs:134:11:134:17 | numbers | main.rs:132:9:132:15 | numbers |
-| main.rs:143:23:143:27 | first | main.rs:137:13:137:17 | first |
-| main.rs:144:23:144:27 | third | main.rs:139:13:139:17 | third |
-| main.rs:145:23:145:27 | fifth | main.rs:141:13:141:17 | fifth |
-| main.rs:149:11:149:17 | numbers | main.rs:132:9:132:15 | numbers |
-| main.rs:156:23:156:27 | first | main.rs:152:13:152:17 | first |
-| main.rs:157:23:157:26 | last | main.rs:154:13:154:16 | last |
-| main.rs:165:11:165:12 | p2 | main.rs:163:9:163:10 | p2 |
-| main.rs:168:24:168:25 | x7 | main.rs:167:16:167:17 | x7 |
-| main.rs:179:11:179:13 | msg | main.rs:177:9:177:11 | msg |
-| main.rs:183:24:183:34 | id_variable | main.rs:182:17:182:27 | id_variable |
-| main.rs:190:23:190:24 | id | main.rs:187:26:187:27 | id |
-| main.rs:202:11:202:16 | either | main.rs:201:9:201:14 | either |
-| main.rs:204:26:204:27 | a3 | main.rs:203:9:203:44 | a3 |
-| main.rs:216:11:216:12 | tv | main.rs:215:9:215:10 | tv |
-| main.rs:218:26:218:27 | a4 | main.rs:217:9:217:81 | a4 |
-| main.rs:220:11:220:12 | tv | main.rs:215:9:215:10 | tv |
-| main.rs:222:26:222:27 | a5 | main.rs:221:9:221:83 | a5 |
-| main.rs:224:11:224:12 | tv | main.rs:215:9:215:10 | tv |
-| main.rs:226:26:226:27 | a6 | main.rs:225:9:225:83 | a6 |
-| main.rs:232:11:232:16 | either | main.rs:231:9:231:14 | either |
-| main.rs:234:16:234:17 | a7 | main.rs:233:9:233:44 | a7 |
-| main.rs:235:26:235:27 | a7 | main.rs:233:9:233:44 | a7 |
-| main.rs:243:11:243:16 | either | main.rs:241:9:241:14 | either |
-| main.rs:247:23:247:25 | a11 | main.rs:245:14:245:51 | a11 |
-| main.rs:249:15:249:15 | e | main.rs:244:13:244:13 | e |
-| main.rs:250:28:250:30 | a12 | main.rs:248:33:248:35 | a12 |
-| main.rs:266:11:266:12 | fv | main.rs:265:9:265:10 | fv |
-| main.rs:268:26:268:28 | a13 | main.rs:267:9:267:109 | a13 |
-| main.rs:279:15:279:16 | a8 | main.rs:273:5:273:6 | a8 |
-| main.rs:280:15:280:16 | b3 | main.rs:275:9:275:10 | b3 |
-| main.rs:281:15:281:16 | c1 | main.rs:276:9:276:10 | c1 |
-| main.rs:286:15:286:16 | a9 | main.rs:284:20:284:55 | a9 |
-| main.rs:295:15:295:17 | a10 | main.rs:291:13:291:15 | a10 |
-| main.rs:296:15:296:16 | b4 | main.rs:292:13:292:14 | b4 |
-| main.rs:297:15:297:16 | c2 | main.rs:293:13:293:14 | c2 |
-| main.rs:300:9:300:10 | c2 | main.rs:293:13:293:14 | c2 |
-| main.rs:301:9:301:10 | b4 | main.rs:292:13:292:14 | b4 |
-| main.rs:302:9:302:11 | a10 | main.rs:291:13:291:15 | a10 |
-| main.rs:304:9:304:11 | a10 | main.rs:291:13:291:15 | a10 |
-| main.rs:305:9:305:10 | b4 | main.rs:292:13:292:14 | b4 |
-| main.rs:306:9:306:10 | c2 | main.rs:293:13:293:14 | c2 |
-| main.rs:308:15:308:17 | a10 | main.rs:291:13:291:15 | a10 |
-| main.rs:309:15:309:16 | b4 | main.rs:292:13:292:14 | b4 |
-| main.rs:310:15:310:16 | c2 | main.rs:293:13:293:14 | c2 |
-| main.rs:317:23:317:25 | a10 | main.rs:314:13:314:15 | a10 |
-| main.rs:318:23:318:24 | b4 | main.rs:315:13:315:14 | b4 |
-| main.rs:322:15:322:17 | a10 | main.rs:291:13:291:15 | a10 |
-| main.rs:323:15:323:16 | b4 | main.rs:292:13:292:14 | b4 |
-| main.rs:329:9:329:9 | x | main.rs:328:10:328:10 | x |
-| main.rs:331:9:331:23 | example_closure | main.rs:327:9:327:23 | example_closure |
-| main.rs:332:15:332:16 | n1 | main.rs:330:9:330:10 | n1 |
-| main.rs:337:9:337:9 | x | main.rs:336:6:336:6 | x |
-| main.rs:339:9:339:26 | immutable_variable | main.rs:335:9:335:26 | immutable_variable |
-| main.rs:340:15:340:16 | n2 | main.rs:338:9:338:10 | n2 |
-| main.rs:347:9:347:9 | x | main.rs:346:10:346:10 | x |
-| main.rs:348:15:348:15 | f | main.rs:345:9:345:9 | f |
-| main.rs:352:9:352:9 | x | main.rs:350:10:350:10 | x |
-| main.rs:355:15:355:15 | f | main.rs:345:9:345:9 | f |
-| main.rs:361:17:361:17 | x | main.rs:359:14:359:14 | x |
-| main.rs:370:13:370:13 | x | main.rs:369:14:369:14 | x |
-| main.rs:371:19:371:19 | f | main.rs:368:13:368:13 | f |
-| main.rs:379:12:379:12 | v | main.rs:376:9:376:9 | v |
-| main.rs:380:19:380:22 | text | main.rs:378:9:378:12 | text |
-| main.rs:386:5:386:5 | a | main.rs:385:13:385:13 | a |
-| main.rs:387:15:387:15 | a | main.rs:385:13:385:13 | a |
-| main.rs:388:11:388:11 | a | main.rs:385:13:385:13 | a |
-| main.rs:389:15:389:15 | a | main.rs:385:13:385:13 | a |
-| main.rs:395:14:395:14 | i | main.rs:393:13:393:13 | i |
-| main.rs:396:6:396:10 | ref_i | main.rs:394:9:394:13 | ref_i |
-| main.rs:397:15:397:15 | i | main.rs:393:13:393:13 | i |
-| main.rs:401:6:401:6 | x | main.rs:400:17:400:17 | x |
-| main.rs:402:10:402:10 | x | main.rs:400:17:400:17 | x |
-| main.rs:403:10:403:10 | x | main.rs:400:17:400:17 | x |
-| main.rs:404:12:404:12 | x | main.rs:400:17:400:17 | x |
-| main.rs:408:6:408:6 | x | main.rs:407:22:407:22 | x |
-| main.rs:409:10:409:10 | x | main.rs:407:22:407:22 | x |
-| main.rs:410:10:410:10 | x | main.rs:407:22:407:22 | x |
-| main.rs:411:6:411:6 | y | main.rs:407:38:407:38 | y |
-| main.rs:412:9:412:9 | x | main.rs:407:22:407:22 | x |
-| main.rs:418:27:418:27 | x | main.rs:416:13:416:13 | x |
-| main.rs:419:6:419:6 | y | main.rs:417:9:417:9 | y |
-| main.rs:421:15:421:15 | x | main.rs:416:13:416:13 | x |
-| main.rs:425:19:425:19 | x | main.rs:416:13:416:13 | x |
-| main.rs:427:14:427:14 | z | main.rs:423:13:423:13 | z |
-| main.rs:428:9:428:9 | w | main.rs:424:9:424:9 | w |
-| main.rs:430:7:430:7 | w | main.rs:424:9:424:9 | w |
-| main.rs:432:15:432:15 | z | main.rs:423:13:423:13 | z |
-| main.rs:438:14:438:14 | x | main.rs:436:13:436:13 | x |
-| main.rs:439:6:439:6 | y | main.rs:437:9:437:9 | y |
-| main.rs:440:15:440:15 | x | main.rs:436:13:436:13 | x |
-| main.rs:447:19:447:19 | x | main.rs:444:9:444:9 | x |
-| main.rs:449:5:449:7 | cap | main.rs:446:9:446:11 | cap |
-| main.rs:450:15:450:15 | x | main.rs:444:9:444:9 | x |
-| main.rs:457:19:457:19 | x | main.rs:454:13:454:13 | x |
-| main.rs:459:5:459:12 | closure1 | main.rs:456:9:456:16 | closure1 |
-| main.rs:460:15:460:15 | x | main.rs:454:13:454:13 | x |
-| main.rs:465:9:465:9 | y | main.rs:462:13:462:13 | y |
-| main.rs:467:5:467:12 | closure2 | main.rs:464:13:464:20 | closure2 |
-| main.rs:468:15:468:15 | y | main.rs:462:13:462:13 | y |
-| main.rs:473:9:473:9 | z | main.rs:470:13:470:13 | z |
-| main.rs:475:5:475:12 | closure3 | main.rs:472:13:472:20 | closure3 |
-| main.rs:476:15:476:15 | z | main.rs:470:13:470:13 | z |
-| main.rs:482:9:482:9 | i | main.rs:480:13:480:13 | i |
-| main.rs:485:5:485:9 | block | main.rs:481:9:481:13 | block |
-| main.rs:486:15:486:15 | i | main.rs:480:13:480:13 | i |
-| main.rs:491:15:491:15 | x | main.rs:490:13:490:13 | x |
-| main.rs:492:15:492:15 | x | main.rs:490:13:490:13 | x |
-| main.rs:494:16:494:16 | b | main.rs:489:8:489:8 | b |
-| main.rs:496:9:496:9 | x | main.rs:490:13:490:13 | x |
-| main.rs:497:19:497:19 | x | main.rs:490:13:490:13 | x |
-| main.rs:498:19:498:19 | x | main.rs:490:13:490:13 | x |
-| main.rs:500:9:500:9 | x | main.rs:490:13:490:13 | x |
-| main.rs:501:19:501:19 | x | main.rs:490:13:490:13 | x |
-| main.rs:502:19:502:19 | x | main.rs:490:13:490:13 | x |
-| main.rs:504:15:504:15 | x | main.rs:490:13:490:13 | x |
-| main.rs:510:16:510:17 | b1 | main.rs:507:13:507:14 | b1 |
-| main.rs:512:19:512:19 | x | main.rs:508:9:508:9 | x |
-| main.rs:514:19:514:19 | x | main.rs:508:9:508:9 | x |
-| main.rs:518:16:518:17 | b2 | main.rs:507:23:507:24 | b2 |
-| main.rs:520:19:520:19 | x | main.rs:508:9:508:9 | x |
-| main.rs:522:19:522:19 | x | main.rs:508:9:508:9 | x |
-| main.rs:532:16:532:19 | self | main.rs:531:20:531:23 | self |
-| main.rs:536:9:536:12 | self | main.rs:535:11:535:14 | self |
-| main.rs:542:13:542:16 | self | main.rs:539:23:539:26 | self |
-| main.rs:542:25:542:25 | n | main.rs:540:22:540:22 | n |
-| main.rs:544:9:544:9 | f | main.rs:540:17:540:17 | f |
-| main.rs:545:9:545:9 | f | main.rs:540:17:540:17 | f |
-| main.rs:551:15:551:15 | a | main.rs:550:13:550:13 | a |
-| main.rs:552:5:552:5 | a | main.rs:550:13:550:13 | a |
-| main.rs:553:15:553:15 | a | main.rs:550:13:550:13 | a |
-| main.rs:554:5:554:5 | a | main.rs:550:13:550:13 | a |
-| main.rs:555:15:555:15 | a | main.rs:550:13:550:13 | a |
-| main.rs:560:15:560:15 | a | main.rs:559:13:559:13 | a |
-| main.rs:561:5:561:5 | a | main.rs:559:13:559:13 | a |
-| main.rs:562:15:562:15 | a | main.rs:559:13:559:13 | a |
-| main.rs:563:5:563:5 | a | main.rs:559:13:559:13 | a |
-| main.rs:564:15:564:15 | a | main.rs:559:13:559:13 | a |
-| main.rs:569:20:569:20 | x | main.rs:568:9:568:9 | x |
-| main.rs:570:15:570:15 | x | main.rs:568:9:568:9 | x |
-| main.rs:573:20:573:20 | z | main.rs:572:9:572:9 | z |
-| main.rs:582:10:582:13 | self | main.rs:581:17:581:20 | self |
-| main.rs:588:5:588:5 | a | main.rs:587:13:587:13 | a |
-| main.rs:590:15:590:15 | a | main.rs:587:13:587:13 | a |
-| main.rs:609:9:609:25 | var_in_macro | main.rs:609:9:609:25 | var_in_macro |
-| main.rs:610:15:610:28 | var_from_macro | main.rs:608:9:608:22 | var_from_macro |
-| main.rs:615:30:615:41 | var_in_macro | main.rs:615:15:615:42 | var_in_macro |
-| main.rs:616:15:616:26 | var_in_macro | main.rs:611:9:611:20 | var_in_macro |
-| main.rs:621:5:621:5 | x | main.rs:620:9:620:9 | x |
-| main.rs:622:15:622:15 | x | main.rs:620:9:620:9 | x |
-| main.rs:629:20:629:20 | b | main.rs:627:20:627:20 | b |
-| main.rs:630:13:630:13 | x | main.rs:626:13:626:13 | x |
-| main.rs:633:5:633:7 | cap | main.rs:627:13:627:15 | cap |
-| main.rs:634:15:634:15 | x | main.rs:626:13:626:13 | x |
+| main.rs:7:20:7:20 | s | main.rs:5:14:5:14 | s |
+| main.rs:12:20:12:20 | i | main.rs:10:14:10:14 | i |
+| main.rs:16:16:16:16 | i | main.rs:15:18:15:18 | i |
+| main.rs:21:15:21:16 | x1 | main.rs:20:9:20:10 | x1 |
+| main.rs:26:15:26:16 | x2 | main.rs:25:13:25:14 | x2 |
+| main.rs:27:5:27:6 | x2 | main.rs:25:13:25:14 | x2 |
+| main.rs:28:15:28:16 | x2 | main.rs:25:13:25:14 | x2 |
+| main.rs:29:5:29:6 | x2 | main.rs:25:13:25:14 | x2 |
+| main.rs:29:10:29:11 | x2 | main.rs:25:13:25:14 | x2 |
+| main.rs:30:15:30:16 | x2 | main.rs:25:13:25:14 | x2 |
+| main.rs:35:20:35:20 | x | main.rs:34:13:34:13 | x |
+| main.rs:36:5:36:5 | x | main.rs:34:13:34:13 | x |
+| main.rs:37:20:37:20 | x | main.rs:34:13:34:13 | x |
+| main.rs:42:15:42:16 | x3 | main.rs:41:9:41:10 | x3 |
+| main.rs:44:9:44:10 | x3 | main.rs:41:9:41:10 | x3 |
+| main.rs:45:15:45:16 | x3 | main.rs:43:9:43:10 | x3 |
+| main.rs:50:15:50:16 | x4 | main.rs:49:9:49:10 | x4 |
+| main.rs:53:19:53:20 | x4 | main.rs:52:13:52:14 | x4 |
+| main.rs:55:15:55:16 | x4 | main.rs:49:9:49:10 | x4 |
+| main.rs:74:15:74:16 | a1 | main.rs:66:13:66:14 | a1 |
+| main.rs:75:15:75:16 | b1 | main.rs:67:13:67:14 | b1 |
+| main.rs:76:15:76:15 | x | main.rs:70:13:70:13 | x |
+| main.rs:77:15:77:15 | y | main.rs:71:13:71:13 | y |
+| main.rs:85:9:85:10 | p1 | main.rs:81:9:81:10 | p1 |
+| main.rs:86:15:86:16 | a2 | main.rs:83:12:83:13 | a2 |
+| main.rs:87:15:87:16 | b2 | main.rs:84:12:84:13 | b2 |
+| main.rs:94:11:94:12 | s1 | main.rs:91:9:91:10 | s1 |
+| main.rs:95:19:95:20 | s2 | main.rs:93:21:93:22 | s2 |
+| main.rs:102:7:102:7 | x | main.rs:100:9:100:9 | x |
+| main.rs:105:13:105:13 | x | main.rs:100:9:100:9 | x |
+| main.rs:106:19:106:19 | x | main.rs:104:13:104:13 | x |
+| main.rs:109:15:109:15 | x | main.rs:101:14:101:14 | x |
+| main.rs:116:11:116:12 | s1 | main.rs:113:9:113:10 | s1 |
+| main.rs:117:19:117:20 | s2 | main.rs:115:24:115:25 | s2 |
+| main.rs:125:11:125:12 | x6 | main.rs:122:9:122:10 | x6 |
+| main.rs:130:23:130:24 | y1 | main.rs:127:14:127:15 | y1 |
+| main.rs:135:15:135:16 | y1 | main.rs:123:9:123:10 | y1 |
+| main.rs:141:11:141:17 | numbers | main.rs:139:9:139:15 | numbers |
+| main.rs:150:23:150:27 | first | main.rs:144:13:144:17 | first |
+| main.rs:151:23:151:27 | third | main.rs:146:13:146:17 | third |
+| main.rs:152:23:152:27 | fifth | main.rs:148:13:148:17 | fifth |
+| main.rs:156:11:156:17 | numbers | main.rs:139:9:139:15 | numbers |
+| main.rs:163:23:163:27 | first | main.rs:159:13:159:17 | first |
+| main.rs:164:23:164:26 | last | main.rs:161:13:161:16 | last |
+| main.rs:172:11:172:12 | p2 | main.rs:170:9:170:10 | p2 |
+| main.rs:175:24:175:25 | x7 | main.rs:174:16:174:17 | x7 |
+| main.rs:186:11:186:13 | msg | main.rs:184:9:184:11 | msg |
+| main.rs:190:24:190:34 | id_variable | main.rs:189:17:189:27 | id_variable |
+| main.rs:197:23:197:24 | id | main.rs:194:26:194:27 | id |
+| main.rs:209:11:209:16 | either | main.rs:208:9:208:14 | either |
+| main.rs:211:26:211:27 | a3 | main.rs:210:9:210:44 | a3 |
+| main.rs:223:11:223:12 | tv | main.rs:222:9:222:10 | tv |
+| main.rs:225:26:225:27 | a4 | main.rs:224:9:224:81 | a4 |
+| main.rs:227:11:227:12 | tv | main.rs:222:9:222:10 | tv |
+| main.rs:229:26:229:27 | a5 | main.rs:228:9:228:83 | a5 |
+| main.rs:231:11:231:12 | tv | main.rs:222:9:222:10 | tv |
+| main.rs:233:26:233:27 | a6 | main.rs:232:9:232:83 | a6 |
+| main.rs:239:11:239:16 | either | main.rs:238:9:238:14 | either |
+| main.rs:241:16:241:17 | a7 | main.rs:240:9:240:44 | a7 |
+| main.rs:242:26:242:27 | a7 | main.rs:240:9:240:44 | a7 |
+| main.rs:250:11:250:16 | either | main.rs:248:9:248:14 | either |
+| main.rs:254:23:254:25 | a11 | main.rs:252:14:252:51 | a11 |
+| main.rs:256:15:256:15 | e | main.rs:251:13:251:13 | e |
+| main.rs:257:28:257:30 | a12 | main.rs:255:33:255:35 | a12 |
+| main.rs:273:11:273:12 | fv | main.rs:272:9:272:10 | fv |
+| main.rs:275:26:275:28 | a13 | main.rs:274:9:274:109 | a13 |
+| main.rs:283:7:283:7 | x | main.rs:281:9:281:9 | x |
+| main.rs:285:5:285:5 | x | main.rs:282:17:282:17 | x |
+| main.rs:287:19:287:19 | x | main.rs:282:17:282:17 | x |
+| main.rs:290:13:290:13 | x | main.rs:281:9:281:9 | x |
+| main.rs:291:19:291:19 | x | main.rs:289:13:289:13 | x |
+| main.rs:299:7:299:7 | x | main.rs:297:9:297:9 | x |
+| main.rs:302:12:302:12 | x | main.rs:298:17:298:17 | x |
+| main.rs:304:5:304:5 | x | main.rs:301:14:301:14 | x |
+| main.rs:306:19:306:19 | x | main.rs:301:14:301:14 | x |
+| main.rs:309:13:309:13 | x | main.rs:297:9:297:9 | x |
+| main.rs:310:19:310:19 | x | main.rs:308:13:308:13 | x |
+| main.rs:318:7:318:7 | x | main.rs:316:9:316:9 | x |
+| main.rs:321:12:321:12 | x | main.rs:317:20:317:20 | x |
+| main.rs:323:5:323:5 | x | main.rs:320:14:320:14 | x |
+| main.rs:325:19:325:19 | x | main.rs:320:14:320:14 | x |
+| main.rs:329:15:329:15 | x | main.rs:316:9:316:9 | x |
+| main.rs:335:11:335:11 | x | main.rs:334:9:334:9 | x |
+| main.rs:338:18:338:18 | x | main.rs:336:14:336:14 | x |
+| main.rs:339:19:339:19 | x | main.rs:337:20:337:20 | x |
+| main.rs:343:15:343:15 | x | main.rs:334:9:334:9 | x |
+| main.rs:350:7:350:7 | x | main.rs:348:9:348:9 | x |
+| main.rs:352:19:352:19 | x | main.rs:349:16:349:16 | x |
+| main.rs:355:7:355:7 | x | main.rs:348:9:348:9 | x |
+| main.rs:357:19:357:19 | x | main.rs:354:20:354:20 | x |
+| main.rs:359:19:359:19 | x | main.rs:348:9:348:9 | x |
+| main.rs:365:11:365:11 | x | main.rs:364:9:364:9 | x |
+| main.rs:367:20:367:20 | x | main.rs:366:18:366:18 | x |
+| main.rs:374:11:374:11 | x | main.rs:373:9:373:9 | x |
+| main.rs:377:22:377:22 | y | main.rs:375:14:375:14 | y |
+| main.rs:378:26:378:26 | y | main.rs:376:25:376:25 | y |
+| main.rs:390:15:390:16 | a8 | main.rs:384:5:384:6 | a8 |
+| main.rs:391:15:391:16 | b3 | main.rs:386:9:386:10 | b3 |
+| main.rs:392:15:392:16 | c1 | main.rs:387:9:387:10 | c1 |
+| main.rs:397:15:397:16 | a9 | main.rs:395:20:395:55 | a9 |
+| main.rs:406:15:406:17 | a10 | main.rs:402:13:402:15 | a10 |
+| main.rs:407:15:407:16 | b4 | main.rs:403:13:403:14 | b4 |
+| main.rs:408:15:408:16 | c2 | main.rs:404:13:404:14 | c2 |
+| main.rs:411:9:411:10 | c2 | main.rs:404:13:404:14 | c2 |
+| main.rs:412:9:412:10 | b4 | main.rs:403:13:403:14 | b4 |
+| main.rs:413:9:413:11 | a10 | main.rs:402:13:402:15 | a10 |
+| main.rs:415:9:415:11 | a10 | main.rs:402:13:402:15 | a10 |
+| main.rs:416:9:416:10 | b4 | main.rs:403:13:403:14 | b4 |
+| main.rs:417:9:417:10 | c2 | main.rs:404:13:404:14 | c2 |
+| main.rs:419:15:419:17 | a10 | main.rs:402:13:402:15 | a10 |
+| main.rs:420:15:420:16 | b4 | main.rs:403:13:403:14 | b4 |
+| main.rs:421:15:421:16 | c2 | main.rs:404:13:404:14 | c2 |
+| main.rs:428:23:428:25 | a10 | main.rs:425:13:425:15 | a10 |
+| main.rs:429:23:429:24 | b4 | main.rs:426:13:426:14 | b4 |
+| main.rs:433:15:433:17 | a10 | main.rs:402:13:402:15 | a10 |
+| main.rs:434:15:434:16 | b4 | main.rs:403:13:403:14 | b4 |
+| main.rs:440:9:440:9 | x | main.rs:439:10:439:10 | x |
+| main.rs:442:9:442:23 | example_closure | main.rs:438:9:438:23 | example_closure |
+| main.rs:443:15:443:16 | n1 | main.rs:441:9:441:10 | n1 |
+| main.rs:448:9:448:9 | x | main.rs:447:6:447:6 | x |
+| main.rs:450:9:450:26 | immutable_variable | main.rs:446:9:446:26 | immutable_variable |
+| main.rs:451:15:451:16 | n2 | main.rs:449:9:449:10 | n2 |
+| main.rs:458:9:458:9 | x | main.rs:457:10:457:10 | x |
+| main.rs:459:15:459:15 | f | main.rs:456:9:456:9 | f |
+| main.rs:463:9:463:9 | x | main.rs:461:10:461:10 | x |
+| main.rs:466:15:466:15 | f | main.rs:456:9:456:9 | f |
+| main.rs:472:17:472:17 | x | main.rs:470:14:470:14 | x |
+| main.rs:481:13:481:13 | x | main.rs:480:14:480:14 | x |
+| main.rs:482:19:482:19 | f | main.rs:479:13:479:13 | f |
+| main.rs:490:12:490:12 | v | main.rs:487:9:487:9 | v |
+| main.rs:491:19:491:22 | text | main.rs:489:9:489:12 | text |
+| main.rs:497:5:497:5 | a | main.rs:496:13:496:13 | a |
+| main.rs:498:15:498:15 | a | main.rs:496:13:496:13 | a |
+| main.rs:499:11:499:11 | a | main.rs:496:13:496:13 | a |
+| main.rs:500:15:500:15 | a | main.rs:496:13:496:13 | a |
+| main.rs:506:14:506:14 | i | main.rs:504:13:504:13 | i |
+| main.rs:507:6:507:10 | ref_i | main.rs:505:9:505:13 | ref_i |
+| main.rs:508:15:508:15 | i | main.rs:504:13:504:13 | i |
+| main.rs:512:6:512:6 | x | main.rs:511:17:511:17 | x |
+| main.rs:513:10:513:10 | x | main.rs:511:17:511:17 | x |
+| main.rs:514:10:514:10 | x | main.rs:511:17:511:17 | x |
+| main.rs:515:12:515:12 | x | main.rs:511:17:511:17 | x |
+| main.rs:519:6:519:6 | x | main.rs:518:22:518:22 | x |
+| main.rs:520:10:520:10 | x | main.rs:518:22:518:22 | x |
+| main.rs:521:10:521:10 | x | main.rs:518:22:518:22 | x |
+| main.rs:522:6:522:6 | y | main.rs:518:38:518:38 | y |
+| main.rs:523:9:523:9 | x | main.rs:518:22:518:22 | x |
+| main.rs:529:27:529:27 | x | main.rs:527:13:527:13 | x |
+| main.rs:530:6:530:6 | y | main.rs:528:9:528:9 | y |
+| main.rs:533:15:533:15 | x | main.rs:527:13:527:13 | x |
+| main.rs:537:19:537:19 | x | main.rs:527:13:527:13 | x |
+| main.rs:539:14:539:14 | z | main.rs:535:13:535:13 | z |
+| main.rs:540:9:540:9 | w | main.rs:536:9:536:9 | w |
+| main.rs:542:7:542:7 | w | main.rs:536:9:536:9 | w |
+| main.rs:545:15:545:15 | z | main.rs:535:13:535:13 | z |
+| main.rs:551:14:551:14 | x | main.rs:549:13:549:13 | x |
+| main.rs:552:6:552:6 | y | main.rs:550:9:550:9 | y |
+| main.rs:553:15:553:15 | x | main.rs:549:13:549:13 | x |
+| main.rs:561:19:561:19 | x | main.rs:557:9:557:9 | x |
+| main.rs:563:5:563:7 | cap | main.rs:560:9:560:11 | cap |
+| main.rs:564:15:564:15 | x | main.rs:557:9:557:9 | x |
+| main.rs:572:19:572:19 | x | main.rs:568:13:568:13 | x |
+| main.rs:574:5:574:12 | closure1 | main.rs:571:9:571:16 | closure1 |
+| main.rs:575:15:575:15 | x | main.rs:568:13:568:13 | x |
+| main.rs:581:9:581:9 | y | main.rs:577:13:577:13 | y |
+| main.rs:583:5:583:12 | closure2 | main.rs:580:13:580:20 | closure2 |
+| main.rs:584:15:584:15 | y | main.rs:577:13:577:13 | y |
+| main.rs:590:9:590:9 | z | main.rs:586:13:586:13 | z |
+| main.rs:592:5:592:12 | closure3 | main.rs:589:13:589:20 | closure3 |
+| main.rs:593:15:593:15 | z | main.rs:586:13:586:13 | z |
+| main.rs:599:9:599:9 | i | main.rs:597:13:597:13 | i |
+| main.rs:602:5:602:9 | block | main.rs:598:9:598:13 | block |
+| main.rs:603:15:603:15 | i | main.rs:597:13:597:13 | i |
+| main.rs:608:15:608:15 | x | main.rs:607:13:607:13 | x |
+| main.rs:609:15:609:15 | x | main.rs:607:13:607:13 | x |
+| main.rs:611:16:611:16 | b | main.rs:606:8:606:8 | b |
+| main.rs:613:9:613:9 | x | main.rs:607:13:607:13 | x |
+| main.rs:614:19:614:19 | x | main.rs:607:13:607:13 | x |
+| main.rs:615:19:615:19 | x | main.rs:607:13:607:13 | x |
+| main.rs:617:9:617:9 | x | main.rs:607:13:607:13 | x |
+| main.rs:618:19:618:19 | x | main.rs:607:13:607:13 | x |
+| main.rs:619:19:619:19 | x | main.rs:607:13:607:13 | x |
+| main.rs:621:15:621:15 | x | main.rs:607:13:607:13 | x |
+| main.rs:627:16:627:17 | b1 | main.rs:624:13:624:14 | b1 |
+| main.rs:629:19:629:19 | x | main.rs:625:9:625:9 | x |
+| main.rs:631:19:631:19 | x | main.rs:625:9:625:9 | x |
+| main.rs:635:16:635:17 | b2 | main.rs:624:23:624:24 | b2 |
+| main.rs:637:19:637:19 | x | main.rs:625:9:625:9 | x |
+| main.rs:639:19:639:19 | x | main.rs:625:9:625:9 | x |
+| main.rs:649:16:649:19 | self | main.rs:648:20:648:23 | self |
+| main.rs:653:9:653:12 | self | main.rs:652:11:652:14 | self |
+| main.rs:659:13:659:16 | self | main.rs:656:23:656:26 | self |
+| main.rs:659:25:659:25 | n | main.rs:657:22:657:22 | n |
+| main.rs:661:9:661:9 | f | main.rs:657:17:657:17 | f |
+| main.rs:662:9:662:9 | f | main.rs:657:17:657:17 | f |
+| main.rs:668:15:668:15 | a | main.rs:667:13:667:13 | a |
+| main.rs:669:5:669:5 | a | main.rs:667:13:667:13 | a |
+| main.rs:670:15:670:15 | a | main.rs:667:13:667:13 | a |
+| main.rs:671:5:671:5 | a | main.rs:667:13:667:13 | a |
+| main.rs:672:15:672:15 | a | main.rs:667:13:667:13 | a |
+| main.rs:677:15:677:15 | a | main.rs:676:13:676:13 | a |
+| main.rs:678:5:678:5 | a | main.rs:676:13:676:13 | a |
+| main.rs:679:15:679:15 | a | main.rs:676:13:676:13 | a |
+| main.rs:680:5:680:5 | a | main.rs:676:13:676:13 | a |
+| main.rs:681:15:681:15 | a | main.rs:676:13:676:13 | a |
+| main.rs:686:20:686:20 | x | main.rs:685:9:685:9 | x |
+| main.rs:687:15:687:15 | x | main.rs:685:9:685:9 | x |
+| main.rs:690:20:690:20 | z | main.rs:689:9:689:9 | z |
+| main.rs:699:10:699:13 | self | main.rs:698:17:698:20 | self |
+| main.rs:705:5:705:5 | a | main.rs:704:13:704:13 | a |
+| main.rs:708:15:708:15 | a | main.rs:704:13:704:13 | a |
+| main.rs:727:9:727:21 | var_in_macro | main.rs:727:9:727:21 | var_in_macro |
+| main.rs:728:15:728:28 | var_from_macro | main.rs:726:9:726:22 | var_from_macro |
+| main.rs:734:30:734:41 | var_in_macro | main.rs:734:15:734:28 | var_in_macro |
+| main.rs:735:15:735:26 | var_in_macro | main.rs:729:9:729:20 | var_in_macro |
+| main.rs:740:5:740:5 | x | main.rs:739:9:739:9 | x |
+| main.rs:741:15:741:15 | x | main.rs:739:9:739:9 | x |
+| main.rs:748:20:748:20 | b | main.rs:746:20:746:20 | b |
+| main.rs:749:13:749:13 | x | main.rs:745:13:745:13 | x |
+| main.rs:752:5:752:7 | cap | main.rs:746:13:746:15 | cap |
+| main.rs:753:15:753:15 | x | main.rs:745:13:745:13 | x |
 variableWriteAccess
-| main.rs:25:5:25:6 | x2 | main.rs:23:13:23:14 | x2 |
-| main.rs:32:5:32:5 | x | main.rs:30:13:30:13 | x |
-| main.rs:300:9:300:10 | c2 | main.rs:293:13:293:14 | c2 |
-| main.rs:301:9:301:10 | b4 | main.rs:292:13:292:14 | b4 |
-| main.rs:302:9:302:11 | a10 | main.rs:291:13:291:15 | a10 |
-| main.rs:465:9:465:9 | y | main.rs:462:13:462:13 | y |
-| main.rs:482:9:482:9 | i | main.rs:480:13:480:13 | i |
-| main.rs:496:9:496:9 | x | main.rs:490:13:490:13 | x |
-| main.rs:500:9:500:9 | x | main.rs:490:13:490:13 | x |
-| main.rs:554:5:554:5 | a | main.rs:550:13:550:13 | a |
-| main.rs:563:5:563:5 | a | main.rs:559:13:559:13 | a |
-| main.rs:621:5:621:5 | x | main.rs:620:9:620:9 | x |
-| main.rs:630:13:630:13 | x | main.rs:626:13:626:13 | x |
+| main.rs:27:5:27:6 | x2 | main.rs:25:13:25:14 | x2 |
+| main.rs:29:5:29:6 | x2 | main.rs:25:13:25:14 | x2 |
+| main.rs:36:5:36:5 | x | main.rs:34:13:34:13 | x |
+| main.rs:411:9:411:10 | c2 | main.rs:404:13:404:14 | c2 |
+| main.rs:412:9:412:10 | b4 | main.rs:403:13:403:14 | b4 |
+| main.rs:413:9:413:11 | a10 | main.rs:402:13:402:15 | a10 |
+| main.rs:581:9:581:9 | y | main.rs:577:13:577:13 | y |
+| main.rs:599:9:599:9 | i | main.rs:597:13:597:13 | i |
+| main.rs:613:9:613:9 | x | main.rs:607:13:607:13 | x |
+| main.rs:617:9:617:9 | x | main.rs:607:13:607:13 | x |
+| main.rs:671:5:671:5 | a | main.rs:667:13:667:13 | a |
+| main.rs:680:5:680:5 | a | main.rs:676:13:676:13 | a |
+| main.rs:740:5:740:5 | x | main.rs:739:9:739:9 | x |
+| main.rs:749:13:749:13 | x | main.rs:745:13:745:13 | x |
 variableReadAccess
-| main.rs:5:20:5:20 | s | main.rs:3:14:3:14 | s |
-| main.rs:10:20:10:20 | i | main.rs:8:14:8:14 | i |
-| main.rs:14:16:14:16 | i | main.rs:13:18:13:18 | i |
-| main.rs:19:15:19:16 | x1 | main.rs:18:9:18:10 | x1 |
-| main.rs:24:15:24:16 | x2 | main.rs:23:13:23:14 | x2 |
-| main.rs:26:15:26:16 | x2 | main.rs:23:13:23:14 | x2 |
-| main.rs:38:15:38:16 | x3 | main.rs:37:9:37:10 | x3 |
-| main.rs:40:9:40:10 | x3 | main.rs:37:9:37:10 | x3 |
-| main.rs:41:15:41:16 | x3 | main.rs:39:9:39:10 | x3 |
-| main.rs:46:15:46:16 | x4 | main.rs:45:9:45:10 | x4 |
-| main.rs:49:19:49:20 | x4 | main.rs:48:13:48:14 | x4 |
-| main.rs:51:15:51:16 | x4 | main.rs:45:9:45:10 | x4 |
-| main.rs:70:15:70:16 | a1 | main.rs:62:13:62:14 | a1 |
-| main.rs:71:15:71:16 | b1 | main.rs:63:13:63:14 | b1 |
-| main.rs:72:15:72:15 | x | main.rs:66:13:66:13 | x |
-| main.rs:73:15:73:15 | y | main.rs:67:13:67:13 | y |
-| main.rs:81:9:81:10 | p1 | main.rs:77:9:77:10 | p1 |
-| main.rs:82:15:82:16 | a2 | main.rs:79:12:79:13 | a2 |
-| main.rs:83:15:83:16 | b2 | main.rs:80:12:80:13 | b2 |
-| main.rs:90:11:90:12 | s1 | main.rs:87:9:87:10 | s1 |
-| main.rs:91:19:91:20 | s2 | main.rs:89:21:89:22 | s2 |
-| main.rs:102:15:102:16 | x5 | main.rs:96:14:96:15 | x5 |
-| main.rs:109:11:109:12 | s1 | main.rs:106:9:106:10 | s1 |
-| main.rs:110:19:110:20 | s2 | main.rs:108:24:108:25 | s2 |
-| main.rs:118:11:118:12 | x6 | main.rs:115:9:115:10 | x6 |
-| main.rs:123:23:123:24 | y1 | main.rs:120:14:120:15 | y1 |
-| main.rs:128:15:128:16 | y1 | main.rs:116:9:116:10 | y1 |
-| main.rs:134:11:134:17 | numbers | main.rs:132:9:132:15 | numbers |
-| main.rs:143:23:143:27 | first | main.rs:137:13:137:17 | first |
-| main.rs:144:23:144:27 | third | main.rs:139:13:139:17 | third |
-| main.rs:145:23:145:27 | fifth | main.rs:141:13:141:17 | fifth |
-| main.rs:149:11:149:17 | numbers | main.rs:132:9:132:15 | numbers |
-| main.rs:156:23:156:27 | first | main.rs:152:13:152:17 | first |
-| main.rs:157:23:157:26 | last | main.rs:154:13:154:16 | last |
-| main.rs:165:11:165:12 | p2 | main.rs:163:9:163:10 | p2 |
-| main.rs:168:24:168:25 | x7 | main.rs:167:16:167:17 | x7 |
-| main.rs:179:11:179:13 | msg | main.rs:177:9:177:11 | msg |
-| main.rs:183:24:183:34 | id_variable | main.rs:182:17:182:27 | id_variable |
-| main.rs:190:23:190:24 | id | main.rs:187:26:187:27 | id |
-| main.rs:202:11:202:16 | either | main.rs:201:9:201:14 | either |
-| main.rs:204:26:204:27 | a3 | main.rs:203:9:203:44 | a3 |
-| main.rs:216:11:216:12 | tv | main.rs:215:9:215:10 | tv |
-| main.rs:218:26:218:27 | a4 | main.rs:217:9:217:81 | a4 |
-| main.rs:220:11:220:12 | tv | main.rs:215:9:215:10 | tv |
-| main.rs:222:26:222:27 | a5 | main.rs:221:9:221:83 | a5 |
-| main.rs:224:11:224:12 | tv | main.rs:215:9:215:10 | tv |
-| main.rs:226:26:226:27 | a6 | main.rs:225:9:225:83 | a6 |
-| main.rs:232:11:232:16 | either | main.rs:231:9:231:14 | either |
-| main.rs:234:16:234:17 | a7 | main.rs:233:9:233:44 | a7 |
-| main.rs:235:26:235:27 | a7 | main.rs:233:9:233:44 | a7 |
-| main.rs:243:11:243:16 | either | main.rs:241:9:241:14 | either |
-| main.rs:247:23:247:25 | a11 | main.rs:245:14:245:51 | a11 |
-| main.rs:249:15:249:15 | e | main.rs:244:13:244:13 | e |
-| main.rs:250:28:250:30 | a12 | main.rs:248:33:248:35 | a12 |
-| main.rs:266:11:266:12 | fv | main.rs:265:9:265:10 | fv |
-| main.rs:268:26:268:28 | a13 | main.rs:267:9:267:109 | a13 |
-| main.rs:279:15:279:16 | a8 | main.rs:273:5:273:6 | a8 |
-| main.rs:280:15:280:16 | b3 | main.rs:275:9:275:10 | b3 |
-| main.rs:281:15:281:16 | c1 | main.rs:276:9:276:10 | c1 |
-| main.rs:286:15:286:16 | a9 | main.rs:284:20:284:55 | a9 |
-| main.rs:295:15:295:17 | a10 | main.rs:291:13:291:15 | a10 |
-| main.rs:296:15:296:16 | b4 | main.rs:292:13:292:14 | b4 |
-| main.rs:297:15:297:16 | c2 | main.rs:293:13:293:14 | c2 |
-| main.rs:304:9:304:11 | a10 | main.rs:291:13:291:15 | a10 |
-| main.rs:305:9:305:10 | b4 | main.rs:292:13:292:14 | b4 |
-| main.rs:306:9:306:10 | c2 | main.rs:293:13:293:14 | c2 |
-| main.rs:308:15:308:17 | a10 | main.rs:291:13:291:15 | a10 |
-| main.rs:309:15:309:16 | b4 | main.rs:292:13:292:14 | b4 |
-| main.rs:310:15:310:16 | c2 | main.rs:293:13:293:14 | c2 |
-| main.rs:317:23:317:25 | a10 | main.rs:314:13:314:15 | a10 |
-| main.rs:318:23:318:24 | b4 | main.rs:315:13:315:14 | b4 |
-| main.rs:322:15:322:17 | a10 | main.rs:291:13:291:15 | a10 |
-| main.rs:323:15:323:16 | b4 | main.rs:292:13:292:14 | b4 |
-| main.rs:329:9:329:9 | x | main.rs:328:10:328:10 | x |
-| main.rs:331:9:331:23 | example_closure | main.rs:327:9:327:23 | example_closure |
-| main.rs:332:15:332:16 | n1 | main.rs:330:9:330:10 | n1 |
-| main.rs:337:9:337:9 | x | main.rs:336:6:336:6 | x |
-| main.rs:339:9:339:26 | immutable_variable | main.rs:335:9:335:26 | immutable_variable |
-| main.rs:340:15:340:16 | n2 | main.rs:338:9:338:10 | n2 |
-| main.rs:347:9:347:9 | x | main.rs:346:10:346:10 | x |
-| main.rs:348:15:348:15 | f | main.rs:345:9:345:9 | f |
-| main.rs:352:9:352:9 | x | main.rs:350:10:350:10 | x |
-| main.rs:355:15:355:15 | f | main.rs:345:9:345:9 | f |
-| main.rs:361:17:361:17 | x | main.rs:359:14:359:14 | x |
-| main.rs:370:13:370:13 | x | main.rs:369:14:369:14 | x |
-| main.rs:371:19:371:19 | f | main.rs:368:13:368:13 | f |
-| main.rs:379:12:379:12 | v | main.rs:376:9:376:9 | v |
-| main.rs:380:19:380:22 | text | main.rs:378:9:378:12 | text |
-| main.rs:387:15:387:15 | a | main.rs:385:13:385:13 | a |
-| main.rs:389:15:389:15 | a | main.rs:385:13:385:13 | a |
-| main.rs:396:6:396:10 | ref_i | main.rs:394:9:394:13 | ref_i |
-| main.rs:397:15:397:15 | i | main.rs:393:13:393:13 | i |
-| main.rs:401:6:401:6 | x | main.rs:400:17:400:17 | x |
-| main.rs:402:10:402:10 | x | main.rs:400:17:400:17 | x |
-| main.rs:403:10:403:10 | x | main.rs:400:17:400:17 | x |
-| main.rs:404:12:404:12 | x | main.rs:400:17:400:17 | x |
-| main.rs:408:6:408:6 | x | main.rs:407:22:407:22 | x |
-| main.rs:409:10:409:10 | x | main.rs:407:22:407:22 | x |
-| main.rs:410:10:410:10 | x | main.rs:407:22:407:22 | x |
-| main.rs:411:6:411:6 | y | main.rs:407:38:407:38 | y |
-| main.rs:412:9:412:9 | x | main.rs:407:22:407:22 | x |
-| main.rs:419:6:419:6 | y | main.rs:417:9:417:9 | y |
-| main.rs:421:15:421:15 | x | main.rs:416:13:416:13 | x |
-| main.rs:428:9:428:9 | w | main.rs:424:9:424:9 | w |
-| main.rs:430:7:430:7 | w | main.rs:424:9:424:9 | w |
-| main.rs:432:15:432:15 | z | main.rs:423:13:423:13 | z |
-| main.rs:439:6:439:6 | y | main.rs:437:9:437:9 | y |
-| main.rs:440:15:440:15 | x | main.rs:436:13:436:13 | x |
-| main.rs:447:19:447:19 | x | main.rs:444:9:444:9 | x |
-| main.rs:449:5:449:7 | cap | main.rs:446:9:446:11 | cap |
-| main.rs:450:15:450:15 | x | main.rs:444:9:444:9 | x |
-| main.rs:457:19:457:19 | x | main.rs:454:13:454:13 | x |
-| main.rs:459:5:459:12 | closure1 | main.rs:456:9:456:16 | closure1 |
-| main.rs:460:15:460:15 | x | main.rs:454:13:454:13 | x |
-| main.rs:467:5:467:12 | closure2 | main.rs:464:13:464:20 | closure2 |
-| main.rs:468:15:468:15 | y | main.rs:462:13:462:13 | y |
-| main.rs:473:9:473:9 | z | main.rs:470:13:470:13 | z |
-| main.rs:475:5:475:12 | closure3 | main.rs:472:13:472:20 | closure3 |
-| main.rs:476:15:476:15 | z | main.rs:470:13:470:13 | z |
-| main.rs:485:5:485:9 | block | main.rs:481:9:481:13 | block |
-| main.rs:486:15:486:15 | i | main.rs:480:13:480:13 | i |
-| main.rs:491:15:491:15 | x | main.rs:490:13:490:13 | x |
-| main.rs:492:15:492:15 | x | main.rs:490:13:490:13 | x |
-| main.rs:494:16:494:16 | b | main.rs:489:8:489:8 | b |
-| main.rs:497:19:497:19 | x | main.rs:490:13:490:13 | x |
-| main.rs:498:19:498:19 | x | main.rs:490:13:490:13 | x |
-| main.rs:501:19:501:19 | x | main.rs:490:13:490:13 | x |
-| main.rs:502:19:502:19 | x | main.rs:490:13:490:13 | x |
-| main.rs:504:15:504:15 | x | main.rs:490:13:490:13 | x |
-| main.rs:510:16:510:17 | b1 | main.rs:507:13:507:14 | b1 |
-| main.rs:512:19:512:19 | x | main.rs:508:9:508:9 | x |
-| main.rs:514:19:514:19 | x | main.rs:508:9:508:9 | x |
-| main.rs:518:16:518:17 | b2 | main.rs:507:23:507:24 | b2 |
-| main.rs:520:19:520:19 | x | main.rs:508:9:508:9 | x |
-| main.rs:522:19:522:19 | x | main.rs:508:9:508:9 | x |
-| main.rs:532:16:532:19 | self | main.rs:531:20:531:23 | self |
-| main.rs:536:9:536:12 | self | main.rs:535:11:535:14 | self |
-| main.rs:542:13:542:16 | self | main.rs:539:23:539:26 | self |
-| main.rs:542:25:542:25 | n | main.rs:540:22:540:22 | n |
-| main.rs:544:9:544:9 | f | main.rs:540:17:540:17 | f |
-| main.rs:545:9:545:9 | f | main.rs:540:17:540:17 | f |
-| main.rs:551:15:551:15 | a | main.rs:550:13:550:13 | a |
-| main.rs:552:5:552:5 | a | main.rs:550:13:550:13 | a |
-| main.rs:553:15:553:15 | a | main.rs:550:13:550:13 | a |
-| main.rs:555:15:555:15 | a | main.rs:550:13:550:13 | a |
-| main.rs:560:15:560:15 | a | main.rs:559:13:559:13 | a |
-| main.rs:561:5:561:5 | a | main.rs:559:13:559:13 | a |
-| main.rs:562:15:562:15 | a | main.rs:559:13:559:13 | a |
-| main.rs:564:15:564:15 | a | main.rs:559:13:559:13 | a |
-| main.rs:570:15:570:15 | x | main.rs:568:9:568:9 | x |
-| main.rs:582:10:582:13 | self | main.rs:581:17:581:20 | self |
-| main.rs:588:5:588:5 | a | main.rs:587:13:587:13 | a |
-| main.rs:590:15:590:15 | a | main.rs:587:13:587:13 | a |
-| main.rs:609:9:609:25 | var_in_macro | main.rs:609:9:609:25 | var_in_macro |
-| main.rs:610:15:610:28 | var_from_macro | main.rs:608:9:608:22 | var_from_macro |
-| main.rs:615:30:615:41 | var_in_macro | main.rs:615:15:615:42 | var_in_macro |
-| main.rs:616:15:616:26 | var_in_macro | main.rs:611:9:611:20 | var_in_macro |
-| main.rs:622:15:622:15 | x | main.rs:620:9:620:9 | x |
-| main.rs:629:20:629:20 | b | main.rs:627:20:627:20 | b |
-| main.rs:633:5:633:7 | cap | main.rs:627:13:627:15 | cap |
-| main.rs:634:15:634:15 | x | main.rs:626:13:626:13 | x |
+| main.rs:7:20:7:20 | s | main.rs:5:14:5:14 | s |
+| main.rs:12:20:12:20 | i | main.rs:10:14:10:14 | i |
+| main.rs:16:16:16:16 | i | main.rs:15:18:15:18 | i |
+| main.rs:21:15:21:16 | x1 | main.rs:20:9:20:10 | x1 |
+| main.rs:26:15:26:16 | x2 | main.rs:25:13:25:14 | x2 |
+| main.rs:28:15:28:16 | x2 | main.rs:25:13:25:14 | x2 |
+| main.rs:29:10:29:11 | x2 | main.rs:25:13:25:14 | x2 |
+| main.rs:30:15:30:16 | x2 | main.rs:25:13:25:14 | x2 |
+| main.rs:42:15:42:16 | x3 | main.rs:41:9:41:10 | x3 |
+| main.rs:44:9:44:10 | x3 | main.rs:41:9:41:10 | x3 |
+| main.rs:45:15:45:16 | x3 | main.rs:43:9:43:10 | x3 |
+| main.rs:50:15:50:16 | x4 | main.rs:49:9:49:10 | x4 |
+| main.rs:53:19:53:20 | x4 | main.rs:52:13:52:14 | x4 |
+| main.rs:55:15:55:16 | x4 | main.rs:49:9:49:10 | x4 |
+| main.rs:74:15:74:16 | a1 | main.rs:66:13:66:14 | a1 |
+| main.rs:75:15:75:16 | b1 | main.rs:67:13:67:14 | b1 |
+| main.rs:76:15:76:15 | x | main.rs:70:13:70:13 | x |
+| main.rs:77:15:77:15 | y | main.rs:71:13:71:13 | y |
+| main.rs:85:9:85:10 | p1 | main.rs:81:9:81:10 | p1 |
+| main.rs:86:15:86:16 | a2 | main.rs:83:12:83:13 | a2 |
+| main.rs:87:15:87:16 | b2 | main.rs:84:12:84:13 | b2 |
+| main.rs:94:11:94:12 | s1 | main.rs:91:9:91:10 | s1 |
+| main.rs:95:19:95:20 | s2 | main.rs:93:21:93:22 | s2 |
+| main.rs:102:7:102:7 | x | main.rs:100:9:100:9 | x |
+| main.rs:105:13:105:13 | x | main.rs:100:9:100:9 | x |
+| main.rs:106:19:106:19 | x | main.rs:104:13:104:13 | x |
+| main.rs:109:15:109:15 | x | main.rs:101:14:101:14 | x |
+| main.rs:116:11:116:12 | s1 | main.rs:113:9:113:10 | s1 |
+| main.rs:117:19:117:20 | s2 | main.rs:115:24:115:25 | s2 |
+| main.rs:125:11:125:12 | x6 | main.rs:122:9:122:10 | x6 |
+| main.rs:130:23:130:24 | y1 | main.rs:127:14:127:15 | y1 |
+| main.rs:135:15:135:16 | y1 | main.rs:123:9:123:10 | y1 |
+| main.rs:141:11:141:17 | numbers | main.rs:139:9:139:15 | numbers |
+| main.rs:150:23:150:27 | first | main.rs:144:13:144:17 | first |
+| main.rs:151:23:151:27 | third | main.rs:146:13:146:17 | third |
+| main.rs:152:23:152:27 | fifth | main.rs:148:13:148:17 | fifth |
+| main.rs:156:11:156:17 | numbers | main.rs:139:9:139:15 | numbers |
+| main.rs:163:23:163:27 | first | main.rs:159:13:159:17 | first |
+| main.rs:164:23:164:26 | last | main.rs:161:13:161:16 | last |
+| main.rs:172:11:172:12 | p2 | main.rs:170:9:170:10 | p2 |
+| main.rs:175:24:175:25 | x7 | main.rs:174:16:174:17 | x7 |
+| main.rs:186:11:186:13 | msg | main.rs:184:9:184:11 | msg |
+| main.rs:190:24:190:34 | id_variable | main.rs:189:17:189:27 | id_variable |
+| main.rs:197:23:197:24 | id | main.rs:194:26:194:27 | id |
+| main.rs:209:11:209:16 | either | main.rs:208:9:208:14 | either |
+| main.rs:211:26:211:27 | a3 | main.rs:210:9:210:44 | a3 |
+| main.rs:223:11:223:12 | tv | main.rs:222:9:222:10 | tv |
+| main.rs:225:26:225:27 | a4 | main.rs:224:9:224:81 | a4 |
+| main.rs:227:11:227:12 | tv | main.rs:222:9:222:10 | tv |
+| main.rs:229:26:229:27 | a5 | main.rs:228:9:228:83 | a5 |
+| main.rs:231:11:231:12 | tv | main.rs:222:9:222:10 | tv |
+| main.rs:233:26:233:27 | a6 | main.rs:232:9:232:83 | a6 |
+| main.rs:239:11:239:16 | either | main.rs:238:9:238:14 | either |
+| main.rs:241:16:241:17 | a7 | main.rs:240:9:240:44 | a7 |
+| main.rs:242:26:242:27 | a7 | main.rs:240:9:240:44 | a7 |
+| main.rs:250:11:250:16 | either | main.rs:248:9:248:14 | either |
+| main.rs:254:23:254:25 | a11 | main.rs:252:14:252:51 | a11 |
+| main.rs:256:15:256:15 | e | main.rs:251:13:251:13 | e |
+| main.rs:257:28:257:30 | a12 | main.rs:255:33:255:35 | a12 |
+| main.rs:273:11:273:12 | fv | main.rs:272:9:272:10 | fv |
+| main.rs:275:26:275:28 | a13 | main.rs:274:9:274:109 | a13 |
+| main.rs:283:7:283:7 | x | main.rs:281:9:281:9 | x |
+| main.rs:285:5:285:5 | x | main.rs:282:17:282:17 | x |
+| main.rs:287:19:287:19 | x | main.rs:282:17:282:17 | x |
+| main.rs:290:13:290:13 | x | main.rs:281:9:281:9 | x |
+| main.rs:291:19:291:19 | x | main.rs:289:13:289:13 | x |
+| main.rs:299:7:299:7 | x | main.rs:297:9:297:9 | x |
+| main.rs:302:12:302:12 | x | main.rs:298:17:298:17 | x |
+| main.rs:304:5:304:5 | x | main.rs:301:14:301:14 | x |
+| main.rs:306:19:306:19 | x | main.rs:301:14:301:14 | x |
+| main.rs:309:13:309:13 | x | main.rs:297:9:297:9 | x |
+| main.rs:310:19:310:19 | x | main.rs:308:13:308:13 | x |
+| main.rs:318:7:318:7 | x | main.rs:316:9:316:9 | x |
+| main.rs:321:12:321:12 | x | main.rs:317:20:317:20 | x |
+| main.rs:323:5:323:5 | x | main.rs:320:14:320:14 | x |
+| main.rs:325:19:325:19 | x | main.rs:320:14:320:14 | x |
+| main.rs:329:15:329:15 | x | main.rs:316:9:316:9 | x |
+| main.rs:335:11:335:11 | x | main.rs:334:9:334:9 | x |
+| main.rs:338:18:338:18 | x | main.rs:336:14:336:14 | x |
+| main.rs:339:19:339:19 | x | main.rs:337:20:337:20 | x |
+| main.rs:343:15:343:15 | x | main.rs:334:9:334:9 | x |
+| main.rs:350:7:350:7 | x | main.rs:348:9:348:9 | x |
+| main.rs:352:19:352:19 | x | main.rs:349:16:349:16 | x |
+| main.rs:355:7:355:7 | x | main.rs:348:9:348:9 | x |
+| main.rs:357:19:357:19 | x | main.rs:354:20:354:20 | x |
+| main.rs:359:19:359:19 | x | main.rs:348:9:348:9 | x |
+| main.rs:365:11:365:11 | x | main.rs:364:9:364:9 | x |
+| main.rs:367:20:367:20 | x | main.rs:366:18:366:18 | x |
+| main.rs:374:11:374:11 | x | main.rs:373:9:373:9 | x |
+| main.rs:377:22:377:22 | y | main.rs:375:14:375:14 | y |
+| main.rs:378:26:378:26 | y | main.rs:376:25:376:25 | y |
+| main.rs:390:15:390:16 | a8 | main.rs:384:5:384:6 | a8 |
+| main.rs:391:15:391:16 | b3 | main.rs:386:9:386:10 | b3 |
+| main.rs:392:15:392:16 | c1 | main.rs:387:9:387:10 | c1 |
+| main.rs:397:15:397:16 | a9 | main.rs:395:20:395:55 | a9 |
+| main.rs:406:15:406:17 | a10 | main.rs:402:13:402:15 | a10 |
+| main.rs:407:15:407:16 | b4 | main.rs:403:13:403:14 | b4 |
+| main.rs:408:15:408:16 | c2 | main.rs:404:13:404:14 | c2 |
+| main.rs:415:9:415:11 | a10 | main.rs:402:13:402:15 | a10 |
+| main.rs:416:9:416:10 | b4 | main.rs:403:13:403:14 | b4 |
+| main.rs:417:9:417:10 | c2 | main.rs:404:13:404:14 | c2 |
+| main.rs:419:15:419:17 | a10 | main.rs:402:13:402:15 | a10 |
+| main.rs:420:15:420:16 | b4 | main.rs:403:13:403:14 | b4 |
+| main.rs:421:15:421:16 | c2 | main.rs:404:13:404:14 | c2 |
+| main.rs:428:23:428:25 | a10 | main.rs:425:13:425:15 | a10 |
+| main.rs:429:23:429:24 | b4 | main.rs:426:13:426:14 | b4 |
+| main.rs:433:15:433:17 | a10 | main.rs:402:13:402:15 | a10 |
+| main.rs:434:15:434:16 | b4 | main.rs:403:13:403:14 | b4 |
+| main.rs:440:9:440:9 | x | main.rs:439:10:439:10 | x |
+| main.rs:442:9:442:23 | example_closure | main.rs:438:9:438:23 | example_closure |
+| main.rs:443:15:443:16 | n1 | main.rs:441:9:441:10 | n1 |
+| main.rs:448:9:448:9 | x | main.rs:447:6:447:6 | x |
+| main.rs:450:9:450:26 | immutable_variable | main.rs:446:9:446:26 | immutable_variable |
+| main.rs:451:15:451:16 | n2 | main.rs:449:9:449:10 | n2 |
+| main.rs:458:9:458:9 | x | main.rs:457:10:457:10 | x |
+| main.rs:459:15:459:15 | f | main.rs:456:9:456:9 | f |
+| main.rs:463:9:463:9 | x | main.rs:461:10:461:10 | x |
+| main.rs:466:15:466:15 | f | main.rs:456:9:456:9 | f |
+| main.rs:472:17:472:17 | x | main.rs:470:14:470:14 | x |
+| main.rs:481:13:481:13 | x | main.rs:480:14:480:14 | x |
+| main.rs:482:19:482:19 | f | main.rs:479:13:479:13 | f |
+| main.rs:490:12:490:12 | v | main.rs:487:9:487:9 | v |
+| main.rs:491:19:491:22 | text | main.rs:489:9:489:12 | text |
+| main.rs:498:15:498:15 | a | main.rs:496:13:496:13 | a |
+| main.rs:500:15:500:15 | a | main.rs:496:13:496:13 | a |
+| main.rs:507:6:507:10 | ref_i | main.rs:505:9:505:13 | ref_i |
+| main.rs:508:15:508:15 | i | main.rs:504:13:504:13 | i |
+| main.rs:512:6:512:6 | x | main.rs:511:17:511:17 | x |
+| main.rs:513:10:513:10 | x | main.rs:511:17:511:17 | x |
+| main.rs:514:10:514:10 | x | main.rs:511:17:511:17 | x |
+| main.rs:515:12:515:12 | x | main.rs:511:17:511:17 | x |
+| main.rs:519:6:519:6 | x | main.rs:518:22:518:22 | x |
+| main.rs:520:10:520:10 | x | main.rs:518:22:518:22 | x |
+| main.rs:521:10:521:10 | x | main.rs:518:22:518:22 | x |
+| main.rs:522:6:522:6 | y | main.rs:518:38:518:38 | y |
+| main.rs:523:9:523:9 | x | main.rs:518:22:518:22 | x |
+| main.rs:530:6:530:6 | y | main.rs:528:9:528:9 | y |
+| main.rs:533:15:533:15 | x | main.rs:527:13:527:13 | x |
+| main.rs:540:9:540:9 | w | main.rs:536:9:536:9 | w |
+| main.rs:542:7:542:7 | w | main.rs:536:9:536:9 | w |
+| main.rs:545:15:545:15 | z | main.rs:535:13:535:13 | z |
+| main.rs:552:6:552:6 | y | main.rs:550:9:550:9 | y |
+| main.rs:553:15:553:15 | x | main.rs:549:13:549:13 | x |
+| main.rs:561:19:561:19 | x | main.rs:557:9:557:9 | x |
+| main.rs:563:5:563:7 | cap | main.rs:560:9:560:11 | cap |
+| main.rs:564:15:564:15 | x | main.rs:557:9:557:9 | x |
+| main.rs:572:19:572:19 | x | main.rs:568:13:568:13 | x |
+| main.rs:574:5:574:12 | closure1 | main.rs:571:9:571:16 | closure1 |
+| main.rs:575:15:575:15 | x | main.rs:568:13:568:13 | x |
+| main.rs:583:5:583:12 | closure2 | main.rs:580:13:580:20 | closure2 |
+| main.rs:584:15:584:15 | y | main.rs:577:13:577:13 | y |
+| main.rs:590:9:590:9 | z | main.rs:586:13:586:13 | z |
+| main.rs:592:5:592:12 | closure3 | main.rs:589:13:589:20 | closure3 |
+| main.rs:593:15:593:15 | z | main.rs:586:13:586:13 | z |
+| main.rs:602:5:602:9 | block | main.rs:598:9:598:13 | block |
+| main.rs:603:15:603:15 | i | main.rs:597:13:597:13 | i |
+| main.rs:608:15:608:15 | x | main.rs:607:13:607:13 | x |
+| main.rs:609:15:609:15 | x | main.rs:607:13:607:13 | x |
+| main.rs:611:16:611:16 | b | main.rs:606:8:606:8 | b |
+| main.rs:614:19:614:19 | x | main.rs:607:13:607:13 | x |
+| main.rs:615:19:615:19 | x | main.rs:607:13:607:13 | x |
+| main.rs:618:19:618:19 | x | main.rs:607:13:607:13 | x |
+| main.rs:619:19:619:19 | x | main.rs:607:13:607:13 | x |
+| main.rs:621:15:621:15 | x | main.rs:607:13:607:13 | x |
+| main.rs:627:16:627:17 | b1 | main.rs:624:13:624:14 | b1 |
+| main.rs:629:19:629:19 | x | main.rs:625:9:625:9 | x |
+| main.rs:631:19:631:19 | x | main.rs:625:9:625:9 | x |
+| main.rs:635:16:635:17 | b2 | main.rs:624:23:624:24 | b2 |
+| main.rs:637:19:637:19 | x | main.rs:625:9:625:9 | x |
+| main.rs:639:19:639:19 | x | main.rs:625:9:625:9 | x |
+| main.rs:649:16:649:19 | self | main.rs:648:20:648:23 | self |
+| main.rs:653:9:653:12 | self | main.rs:652:11:652:14 | self |
+| main.rs:659:13:659:16 | self | main.rs:656:23:656:26 | self |
+| main.rs:659:25:659:25 | n | main.rs:657:22:657:22 | n |
+| main.rs:661:9:661:9 | f | main.rs:657:17:657:17 | f |
+| main.rs:662:9:662:9 | f | main.rs:657:17:657:17 | f |
+| main.rs:668:15:668:15 | a | main.rs:667:13:667:13 | a |
+| main.rs:669:5:669:5 | a | main.rs:667:13:667:13 | a |
+| main.rs:670:15:670:15 | a | main.rs:667:13:667:13 | a |
+| main.rs:672:15:672:15 | a | main.rs:667:13:667:13 | a |
+| main.rs:677:15:677:15 | a | main.rs:676:13:676:13 | a |
+| main.rs:678:5:678:5 | a | main.rs:676:13:676:13 | a |
+| main.rs:679:15:679:15 | a | main.rs:676:13:676:13 | a |
+| main.rs:681:15:681:15 | a | main.rs:676:13:676:13 | a |
+| main.rs:687:15:687:15 | x | main.rs:685:9:685:9 | x |
+| main.rs:699:10:699:13 | self | main.rs:698:17:698:20 | self |
+| main.rs:705:5:705:5 | a | main.rs:704:13:704:13 | a |
+| main.rs:708:15:708:15 | a | main.rs:704:13:704:13 | a |
+| main.rs:727:9:727:21 | var_in_macro | main.rs:727:9:727:21 | var_in_macro |
+| main.rs:728:15:728:28 | var_from_macro | main.rs:726:9:726:22 | var_from_macro |
+| main.rs:734:30:734:41 | var_in_macro | main.rs:734:15:734:28 | var_in_macro |
+| main.rs:735:15:735:26 | var_in_macro | main.rs:729:9:729:20 | var_in_macro |
+| main.rs:741:15:741:15 | x | main.rs:739:9:739:9 | x |
+| main.rs:748:20:748:20 | b | main.rs:746:20:746:20 | b |
+| main.rs:752:5:752:7 | cap | main.rs:746:13:746:15 | cap |
+| main.rs:753:15:753:15 | x | main.rs:745:13:745:13 | x |
 variableInitializer
-| main.rs:18:9:18:10 | x1 | main.rs:18:14:18:16 | "a" |
-| main.rs:23:13:23:14 | x2 | main.rs:23:18:23:18 | 4 |
-| main.rs:30:13:30:13 | x | main.rs:30:17:30:17 | 1 |
-| main.rs:37:9:37:10 | x3 | main.rs:37:14:37:14 | 1 |
-| main.rs:39:9:39:10 | x3 | main.rs:40:9:40:14 | ... + ... |
-| main.rs:45:9:45:10 | x4 | main.rs:45:14:45:16 | "a" |
-| main.rs:48:13:48:14 | x4 | main.rs:48:18:48:20 | "b" |
-| main.rs:77:9:77:10 | p1 | main.rs:77:14:77:37 | Point {...} |
-| main.rs:87:9:87:10 | s1 | main.rs:87:14:87:41 | Some(...) |
-| main.rs:106:9:106:10 | s1 | main.rs:106:14:106:41 | Some(...) |
-| main.rs:115:9:115:10 | x6 | main.rs:115:14:115:20 | Some(...) |
-| main.rs:116:9:116:10 | y1 | main.rs:116:14:116:15 | 10 |
-| main.rs:132:9:132:15 | numbers | main.rs:132:19:132:35 | TupleExpr |
-| main.rs:163:9:163:10 | p2 | main.rs:163:14:163:37 | Point {...} |
-| main.rs:177:9:177:11 | msg | main.rs:177:15:177:38 | ...::Hello {...} |
-| main.rs:201:9:201:14 | either | main.rs:201:18:201:33 | ...::Left(...) |
-| main.rs:215:9:215:10 | tv | main.rs:215:14:215:36 | ...::Second(...) |
-| main.rs:231:9:231:14 | either | main.rs:231:18:231:33 | ...::Left(...) |
-| main.rs:241:9:241:14 | either | main.rs:241:18:241:33 | ...::Left(...) |
-| main.rs:265:9:265:10 | fv | main.rs:265:14:265:35 | ...::Second(...) |
-| main.rs:327:9:327:23 | example_closure | main.rs:328:9:329:9 | \|...\| x |
-| main.rs:330:9:330:10 | n1 | main.rs:331:9:331:26 | example_closure(...) |
-| main.rs:335:9:335:26 | immutable_variable | main.rs:336:5:337:9 | \|...\| x |
-| main.rs:338:9:338:10 | n2 | main.rs:339:9:339:29 | immutable_variable(...) |
-| main.rs:345:9:345:9 | f | main.rs:346:9:347:9 | \|...\| x |
-| main.rs:368:13:368:13 | f | main.rs:369:13:370:13 | \|...\| x |
-| main.rs:376:9:376:9 | v | main.rs:376:13:376:41 | &... |
-| main.rs:385:13:385:13 | a | main.rs:385:17:385:17 | 0 |
-| main.rs:393:13:393:13 | i | main.rs:393:17:393:17 | 1 |
-| main.rs:394:9:394:13 | ref_i | main.rs:395:9:395:14 | &mut i |
-| main.rs:416:13:416:13 | x | main.rs:416:17:416:17 | 2 |
-| main.rs:417:9:417:9 | y | main.rs:418:9:418:28 | mutate_param(...) |
-| main.rs:423:13:423:13 | z | main.rs:423:17:423:17 | 4 |
-| main.rs:424:9:424:9 | w | main.rs:425:9:425:19 | &mut ... |
-| main.rs:436:13:436:13 | x | main.rs:436:17:436:17 | 1 |
-| main.rs:437:9:437:9 | y | main.rs:438:9:438:14 | &mut x |
-| main.rs:444:9:444:9 | x | main.rs:444:13:444:15 | 100 |
-| main.rs:446:9:446:11 | cap | main.rs:446:15:448:5 | \|...\| ... |
-| main.rs:454:13:454:13 | x | main.rs:454:17:454:17 | 1 |
-| main.rs:456:9:456:16 | closure1 | main.rs:456:20:458:5 | \|...\| ... |
-| main.rs:462:13:462:13 | y | main.rs:462:17:462:17 | 2 |
-| main.rs:464:13:464:20 | closure2 | main.rs:464:24:466:5 | \|...\| ... |
-| main.rs:470:13:470:13 | z | main.rs:470:17:470:17 | 2 |
-| main.rs:472:13:472:20 | closure3 | main.rs:472:24:474:5 | \|...\| ... |
-| main.rs:480:13:480:13 | i | main.rs:480:22:480:22 | 0 |
-| main.rs:481:9:481:13 | block | main.rs:481:17:483:5 | { ... } |
-| main.rs:490:13:490:13 | x | main.rs:490:17:490:17 | 1 |
-| main.rs:508:9:508:9 | x | main.rs:508:13:508:13 | 1 |
-| main.rs:540:17:540:17 | f | main.rs:540:21:543:9 | \|...\| ... |
-| main.rs:550:13:550:13 | a | main.rs:550:17:550:35 | MyStruct {...} |
-| main.rs:559:13:559:13 | a | main.rs:559:17:559:25 | [...] |
-| main.rs:568:9:568:9 | x | main.rs:568:13:568:14 | 16 |
-| main.rs:572:9:572:9 | z | main.rs:572:13:572:14 | 17 |
-| main.rs:587:13:587:13 | a | main.rs:587:17:587:35 | MyStruct {...} |
-| main.rs:608:9:608:22 | var_from_macro | main.rs:609:9:609:25 | MacroExpr |
-| main.rs:609:9:609:25 | var_in_macro | main.rs:609:23:609:24 | 37 |
-| main.rs:611:9:611:20 | var_in_macro | main.rs:611:24:611:25 | 33 |
-| main.rs:615:15:615:42 | var_in_macro | main.rs:615:15:615:42 | 0 |
-| main.rs:626:13:626:13 | x | main.rs:626:17:626:19 | 100 |
-| main.rs:627:13:627:15 | cap | main.rs:627:19:632:5 | \|...\| ... |
+| main.rs:20:9:20:10 | x1 | main.rs:20:14:20:16 | "a" |
+| main.rs:25:13:25:14 | x2 | main.rs:25:18:25:18 | 4 |
+| main.rs:34:13:34:13 | x | main.rs:34:17:34:17 | 1 |
+| main.rs:41:9:41:10 | x3 | main.rs:41:14:41:14 | 1 |
+| main.rs:43:9:43:10 | x3 | main.rs:44:9:44:14 | ... + ... |
+| main.rs:49:9:49:10 | x4 | main.rs:49:14:49:16 | "a" |
+| main.rs:52:13:52:14 | x4 | main.rs:52:18:52:20 | "b" |
+| main.rs:81:9:81:10 | p1 | main.rs:81:14:81:37 | Point {...} |
+| main.rs:91:9:91:10 | s1 | main.rs:91:14:91:41 | Some(...) |
+| main.rs:100:9:100:9 | x | main.rs:100:13:100:22 | Some(...) |
+| main.rs:104:13:104:13 | x | main.rs:105:13:105:13 | x |
+| main.rs:113:9:113:10 | s1 | main.rs:113:14:113:41 | Some(...) |
+| main.rs:122:9:122:10 | x6 | main.rs:122:14:122:20 | Some(...) |
+| main.rs:123:9:123:10 | y1 | main.rs:123:14:123:15 | 10 |
+| main.rs:139:9:139:15 | numbers | main.rs:139:19:139:35 | TupleExpr |
+| main.rs:170:9:170:10 | p2 | main.rs:170:14:170:37 | Point {...} |
+| main.rs:184:9:184:11 | msg | main.rs:184:15:184:38 | ...::Hello {...} |
+| main.rs:208:9:208:14 | either | main.rs:208:18:208:33 | ...::Left(...) |
+| main.rs:222:9:222:10 | tv | main.rs:222:14:222:36 | ...::Second(...) |
+| main.rs:238:9:238:14 | either | main.rs:238:18:238:33 | ...::Left(...) |
+| main.rs:248:9:248:14 | either | main.rs:248:18:248:33 | ...::Left(...) |
+| main.rs:272:9:272:10 | fv | main.rs:272:14:272:35 | ...::Second(...) |
+| main.rs:281:9:281:9 | x | main.rs:281:12:281:19 | Some(...) |
+| main.rs:289:13:289:13 | x | main.rs:290:13:290:13 | x |
+| main.rs:297:9:297:9 | x | main.rs:297:13:297:20 | Some(...) |
+| main.rs:308:13:308:13 | x | main.rs:309:13:309:13 | x |
+| main.rs:316:9:316:9 | x | main.rs:316:13:316:20 | Some(...) |
+| main.rs:334:9:334:9 | x | main.rs:334:13:334:20 | Some(...) |
+| main.rs:337:20:337:20 | x | main.rs:338:18:338:18 | x |
+| main.rs:348:9:348:9 | x | main.rs:348:13:348:18 | Ok(...) |
+| main.rs:364:9:364:9 | x | main.rs:364:13:364:19 | Some(...) |
+| main.rs:373:9:373:9 | x | main.rs:373:13:373:20 | Some(...) |
+| main.rs:438:9:438:23 | example_closure | main.rs:439:9:440:9 | \|...\| x |
+| main.rs:441:9:441:10 | n1 | main.rs:442:9:442:26 | example_closure(...) |
+| main.rs:446:9:446:26 | immutable_variable | main.rs:447:5:448:9 | \|...\| x |
+| main.rs:449:9:449:10 | n2 | main.rs:450:9:450:29 | immutable_variable(...) |
+| main.rs:456:9:456:9 | f | main.rs:457:9:458:9 | \|...\| x |
+| main.rs:479:13:479:13 | f | main.rs:480:13:481:13 | \|...\| x |
+| main.rs:487:9:487:9 | v | main.rs:487:13:487:41 | &... |
+| main.rs:496:13:496:13 | a | main.rs:496:17:496:17 | 0 |
+| main.rs:504:13:504:13 | i | main.rs:504:17:504:17 | 1 |
+| main.rs:505:9:505:13 | ref_i | main.rs:506:9:506:14 | &mut i |
+| main.rs:527:13:527:13 | x | main.rs:527:17:527:17 | 2 |
+| main.rs:528:9:528:9 | y | main.rs:529:9:529:28 | mutate_param(...) |
+| main.rs:535:13:535:13 | z | main.rs:535:17:535:17 | 4 |
+| main.rs:536:9:536:9 | w | main.rs:537:9:537:19 | &mut ... |
+| main.rs:549:13:549:13 | x | main.rs:549:17:549:17 | 1 |
+| main.rs:550:9:550:9 | y | main.rs:551:9:551:14 | &mut x |
+| main.rs:557:9:557:9 | x | main.rs:557:13:557:15 | 100 |
+| main.rs:560:9:560:11 | cap | main.rs:560:15:562:5 | \|...\| ... |
+| main.rs:568:13:568:13 | x | main.rs:568:17:568:17 | 1 |
+| main.rs:571:9:571:16 | closure1 | main.rs:571:20:573:5 | \|...\| ... |
+| main.rs:577:13:577:13 | y | main.rs:577:17:577:17 | 2 |
+| main.rs:580:13:580:20 | closure2 | main.rs:580:24:582:5 | \|...\| ... |
+| main.rs:586:13:586:13 | z | main.rs:586:17:586:17 | 2 |
+| main.rs:589:13:589:20 | closure3 | main.rs:589:24:591:5 | \|...\| ... |
+| main.rs:597:13:597:13 | i | main.rs:597:22:597:22 | 0 |
+| main.rs:598:9:598:13 | block | main.rs:598:17:600:5 | { ... } |
+| main.rs:607:13:607:13 | x | main.rs:607:17:607:17 | 1 |
+| main.rs:625:9:625:9 | x | main.rs:625:13:625:13 | 1 |
+| main.rs:657:17:657:17 | f | main.rs:657:21:660:9 | \|...\| ... |
+| main.rs:667:13:667:13 | a | main.rs:667:17:667:35 | MyStruct {...} |
+| main.rs:676:13:676:13 | a | main.rs:676:17:676:25 | [...] |
+| main.rs:685:9:685:9 | x | main.rs:685:13:685:14 | 16 |
+| main.rs:689:9:689:9 | z | main.rs:689:13:689:14 | 17 |
+| main.rs:704:13:704:13 | a | main.rs:704:17:704:35 | MyStruct {...} |
+| main.rs:726:9:726:22 | var_from_macro | main.rs:727:9:727:25 | MacroExpr |
+| main.rs:727:9:727:21 | var_in_macro | main.rs:727:23:727:24 | 37 |
+| main.rs:729:9:729:20 | var_in_macro | main.rs:729:24:729:25 | 33 |
+| main.rs:734:15:734:28 | var_in_macro | main.rs:734:15:734:28 | 0 |
+| main.rs:745:13:745:13 | x | main.rs:745:17:745:19 | 100 |
+| main.rs:746:13:746:15 | cap | main.rs:746:19:751:5 | \|...\| ... |
 capturedVariable
-| main.rs:444:9:444:9 | x |
-| main.rs:454:13:454:13 | x |
-| main.rs:462:13:462:13 | y |
-| main.rs:470:13:470:13 | z |
-| main.rs:480:13:480:13 | i |
-| main.rs:539:23:539:26 | self |
-| main.rs:626:13:626:13 | x |
+| main.rs:557:9:557:9 | x |
+| main.rs:568:13:568:13 | x |
+| main.rs:577:13:577:13 | y |
+| main.rs:586:13:586:13 | z |
+| main.rs:597:13:597:13 | i |
+| main.rs:656:23:656:26 | self |
+| main.rs:745:13:745:13 | x |
 capturedAccess
-| main.rs:447:19:447:19 | x |
-| main.rs:457:19:457:19 | x |
-| main.rs:465:9:465:9 | y |
-| main.rs:473:9:473:9 | z |
-| main.rs:482:9:482:9 | i |
-| main.rs:542:13:542:16 | self |
-| main.rs:630:13:630:13 | x |
+| main.rs:561:19:561:19 | x |
+| main.rs:572:19:572:19 | x |
+| main.rs:581:9:581:9 | y |
+| main.rs:590:9:590:9 | z |
+| main.rs:599:9:599:9 | i |
+| main.rs:659:13:659:16 | self |
+| main.rs:749:13:749:13 | x |
 nestedFunctionAccess
-| main.rs:358:19:358:19 | f | main.rs:359:9:362:9 | fn f |
-| main.rs:365:23:365:23 | f | main.rs:359:9:362:9 | fn f |
+| main.rs:469:19:469:19 | f | main.rs:470:9:473:9 | fn f |
+| main.rs:476:23:476:23 | f | main.rs:470:9:473:9 | fn f |
diff --git a/rust/ql/test/library-tests/variables/variables.ql b/rust/ql/test/library-tests/variables/variables.ql
index dbde4f56e85..9997b29c7d0 100644
--- a/rust/ql/test/library-tests/variables/variables.ql
+++ b/rust/ql/test/library-tests/variables/variables.ql
@@ -35,7 +35,7 @@ module VariableAccessTest implements TestSig {
   private predicate declAt(Variable v, string filepath, int line, boolean inMacro) {
     variable(v) and
     v.getLocation().hasLocationInfo(filepath, _, _, line, _) and
-    if v.getPat().isInMacroExpansion() then inMacro = true else inMacro = false
+    if v.getPat().isFromMacroExpansion() then inMacro = true else inMacro = false
   }
 
   private predicate commmentAt(string text, string filepath, int line) {
diff --git a/rust/ql/test/query-tests/diagnostics/AstConsistencyCounts.expected b/rust/ql/test/query-tests/diagnostics/AstConsistencyCounts.expected
index 7f8d388fdc5..0028cd74b6e 100644
--- a/rust/ql/test/query-tests/diagnostics/AstConsistencyCounts.expected
+++ b/rust/ql/test/query-tests/diagnostics/AstConsistencyCounts.expected
@@ -4,4 +4,5 @@
 | Multiple positions | 0 |
 | Multiple primary QL classes | 0 |
 | Multiple toStrings | 0 |
+| Multiple variable targets | 0 |
 | No location | 0 |
diff --git a/rust/ql/test/query-tests/diagnostics/CONSISTENCY/ExtractionConsistency.expected b/rust/ql/test/query-tests/diagnostics/CONSISTENCY/ExtractionConsistency.expected
index f1c469a407d..82c29ac7f2b 100644
--- a/rust/ql/test/query-tests/diagnostics/CONSISTENCY/ExtractionConsistency.expected
+++ b/rust/ql/test/query-tests/diagnostics/CONSISTENCY/ExtractionConsistency.expected
@@ -5,4 +5,4 @@ extractionWarning
 | does_not_compile.rs:2:21:2:20 | expected SEMICOLON |
 | does_not_compile.rs:2:26:2:25 | expected SEMICOLON |
 | error.rs:2:5:2:17 | An error! |
-| my_macro.rs:17:9:17:27 | macro expansion failed: could not resolve macro 'myUndefinedMacro' |
+| my_macro.rs:17:9:17:27 | macro expansion failed for 'myUndefinedMacro' |
diff --git a/rust/ql/test/query-tests/diagnostics/Cargo.lock b/rust/ql/test/query-tests/diagnostics/Cargo.lock
new file mode 100644
index 00000000000..b9856cfaf77
--- /dev/null
+++ b/rust/ql/test/query-tests/diagnostics/Cargo.lock
@@ -0,0 +1,7 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "test"
+version = "0.0.1"
diff --git a/rust/ql/test/query-tests/diagnostics/ExtractionWarnings.expected b/rust/ql/test/query-tests/diagnostics/ExtractionWarnings.expected
index 7f14093f20e..22a2f381a9d 100644
--- a/rust/ql/test/query-tests/diagnostics/ExtractionWarnings.expected
+++ b/rust/ql/test/query-tests/diagnostics/ExtractionWarnings.expected
@@ -4,4 +4,4 @@
 | does_not_compile.rs:2:21:2:20 | expected SEMICOLON | Extraction warning in does_not_compile.rs with message expected SEMICOLON | 1 |
 | does_not_compile.rs:2:26:2:25 | expected SEMICOLON | Extraction warning in does_not_compile.rs with message expected SEMICOLON | 1 |
 | error.rs:2:5:2:17 | An error! | Extraction warning in error.rs with message An error! | 1 |
-| my_macro.rs:17:9:17:27 | macro expansion failed: could not resolve macro 'myUndefinedMacro' | Extraction warning in my_macro.rs with message macro expansion failed: could not resolve macro 'myUndefinedMacro' | 1 |
+| my_macro.rs:17:9:17:27 | macro expansion failed for 'myUndefinedMacro' | Extraction warning in my_macro.rs with message macro expansion failed for 'myUndefinedMacro' | 1 |
diff --git a/rust/ql/test/query-tests/security/CWE-020/RegexInjection.expected b/rust/ql/test/query-tests/security/CWE-020/RegexInjection.expected
index 08e88a3039a..2814af2b5ed 100644
--- a/rust/ql/test/query-tests/security/CWE-020/RegexInjection.expected
+++ b/rust/ql/test/query-tests/security/CWE-020/RegexInjection.expected
@@ -6,8 +6,7 @@ edges
 | main.rs:4:20:4:40 | ...::var(...) [Ok] | main.rs:4:20:4:66 | ... .unwrap_or(...) | provenance | MaD:2 |
 | main.rs:4:20:4:66 | ... .unwrap_or(...) | main.rs:4:9:4:16 | username | provenance |  |
 | main.rs:5:9:5:13 | regex | main.rs:6:26:6:30 | regex | provenance |  |
-| main.rs:5:17:5:45 | res | main.rs:5:25:5:44 | { ... } | provenance |  |
-| main.rs:5:25:5:44 | ...::format(...) | main.rs:5:17:5:45 | res | provenance |  |
+| main.rs:5:25:5:44 | ...::format(...) | main.rs:5:25:5:44 | { ... } | provenance |  |
 | main.rs:5:25:5:44 | ...::must_use(...) | main.rs:5:9:5:13 | regex | provenance |  |
 | main.rs:5:25:5:44 | MacroExpr | main.rs:5:25:5:44 | ...::format(...) | provenance | MaD:3 |
 | main.rs:5:25:5:44 | { ... } | main.rs:5:25:5:44 | ...::must_use(...) | provenance | MaD:4 |
@@ -23,7 +22,6 @@ nodes
 | main.rs:4:20:4:40 | ...::var(...) [Ok] | semmle.label | ...::var(...) [Ok] |
 | main.rs:4:20:4:66 | ... .unwrap_or(...) | semmle.label | ... .unwrap_or(...) |
 | main.rs:5:9:5:13 | regex | semmle.label | regex |
-| main.rs:5:17:5:45 | res | semmle.label | res |
 | main.rs:5:25:5:44 | ...::format(...) | semmle.label | ...::format(...) |
 | main.rs:5:25:5:44 | ...::must_use(...) | semmle.label | ...::must_use(...) |
 | main.rs:5:25:5:44 | MacroExpr | semmle.label | MacroExpr |
diff --git a/rust/ql/test/query-tests/security/CWE-020/RegexInjectionSink.expected b/rust/ql/test/query-tests/security/CWE-020/RegexInjectionSink.expected
index 4ea46a38587..9bbf1a6904f 100644
--- a/rust/ql/test/query-tests/security/CWE-020/RegexInjectionSink.expected
+++ b/rust/ql/test/query-tests/security/CWE-020/RegexInjectionSink.expected
@@ -1,2 +1,3 @@
 | main.rs:6:25:6:30 | &regex |
 | main.rs:14:25:14:30 | &regex |
+| main.rs:21:25:21:30 | &regex |
diff --git a/rust/ql/test/query-tests/security/CWE-020/main.rs b/rust/ql/test/query-tests/security/CWE-020/main.rs
index a03e5d4b494..3a8e3d01461 100644
--- a/rust/ql/test/query-tests/security/CWE-020/main.rs
+++ b/rust/ql/test/query-tests/security/CWE-020/main.rs
@@ -7,7 +7,7 @@ fn simple_bad(hay: &str) -> Option<bool> {
     Some(re.is_match(hay))
 }
 
-fn simple_good(hay: &str) -> Option<bool> {
+fn simple_good_escaped(hay: &str) -> Option<bool> {
     let username = std::env::var("USER").unwrap_or("".to_string());
     let escaped = regex::escape(&username);
     let regex = format!("foo{}bar", escaped);
@@ -15,6 +15,13 @@ fn simple_good(hay: &str) -> Option<bool> {
     Some(re.is_match(hay))
 }
 
+fn simple_good_numeric(hay: &str) -> Option<bool> {
+    let user_number = std::env::var("USER").unwrap_or("0".to_string()).parse::<u64>().unwrap_or(0);
+    let regex = format!("foo{}bar", user_number);
+    let re = Regex::new(&regex).unwrap();
+    Some(re.is_match(hay))
+}
+
 fn not_a_sink_literal() -> Option<bool> {
     let username = std::env::var("USER").unwrap_or("".to_string());
     let re = Regex::new("literal string").unwrap();
@@ -30,7 +37,8 @@ fn not_a_sink_raw_literal() -> Option<bool> {
 fn main() {
     let hay = "a string";
     simple_bad(hay);
-    simple_good(hay);
+    simple_good_escaped(hay);
+    simple_good_numeric(hay);
     not_a_sink_literal();
     not_a_sink_raw_literal();
 }
diff --git a/rust/ql/test/query-tests/security/CWE-022/Cargo.lock b/rust/ql/test/query-tests/security/CWE-022/Cargo.lock
index 29fb6823657..f6b8cfc2c4b 100644
--- a/rust/ql/test/query-tests/security/CWE-022/Cargo.lock
+++ b/rust/ql/test/query-tests/security/CWE-022/Cargo.lock
@@ -26,6 +26,119 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "async-channel"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"
+dependencies = [
+ "concurrent-queue",
+ "event-listener 2.5.3",
+ "futures-core",
+]
+
+[[package]]
+name = "async-channel"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "924ed96dd52d1b75e9c1a3e6275715fd320f5f9439fb5a4a11fa51f4221158d2"
+dependencies = [
+ "concurrent-queue",
+ "event-listener-strategy",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-executor"
+version = "1.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb812ffb58524bdd10860d7d974e2f01cc0950c2438a74ee5ec2e2280c6c4ffa"
+dependencies = [
+ "async-task",
+ "concurrent-queue",
+ "fastrand",
+ "futures-lite",
+ "pin-project-lite",
+ "slab",
+]
+
+[[package]]
+name = "async-global-executor"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c"
+dependencies = [
+ "async-channel 2.5.0",
+ "async-executor",
+ "async-io",
+ "async-lock",
+ "blocking",
+ "futures-lite",
+ "once_cell",
+]
+
+[[package]]
+name = "async-io"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19634d6336019ef220f09fd31168ce5c184b295cbf80345437cc36094ef223ca"
+dependencies = [
+ "async-lock",
+ "cfg-if",
+ "concurrent-queue",
+ "futures-io",
+ "futures-lite",
+ "parking",
+ "polling",
+ "rustix",
+ "slab",
+ "windows-sys 0.60.2",
+]
+
+[[package]]
+name = "async-lock"
+version = "3.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5fd03604047cee9b6ce9de9f70c6cd540a0520c813cbd49bae61f33ab80ed1dc"
+dependencies = [
+ "event-listener 5.4.1",
+ "event-listener-strategy",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-std"
+version = "1.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c8e079a4ab67ae52b7403632e4618815d6db36d2a010cfe41b02c1b1578f93b"
+dependencies = [
+ "async-channel 1.9.0",
+ "async-global-executor",
+ "async-io",
+ "async-lock",
+ "crossbeam-utils",
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-lite",
+ "gloo-timers",
+ "kv-log-macro",
+ "log",
+ "memchr",
+ "once_cell",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+ "wasm-bindgen-futures",
+]
+
+[[package]]
+name = "async-task"
+version = "4.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
+
 [[package]]
 name = "atomic-waker"
 version = "1.1.2"
@@ -50,7 +163,7 @@ dependencies = [
  "miniz_oxide",
  "object",
  "rustc-demangle",
- "windows-targets",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -74,6 +187,25 @@ dependencies = [
  "generic-array",
 ]
 
+[[package]]
+name = "blocking"
+version = "1.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e83f8d02be6967315521be875afa792a316e28d57b5a2d401897e2a7921b7f21"
+dependencies = [
+ "async-channel 2.5.0",
+ "async-task",
+ "futures-io",
+ "futures-lite",
+ "piper",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
+
 [[package]]
 name = "bytes"
 version = "1.10.1"
@@ -92,6 +224,15 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
+[[package]]
+name = "concurrent-queue"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
+dependencies = [
+ "crossbeam-utils",
+]
+
 [[package]]
 name = "cpufeatures"
 version = "0.2.17"
@@ -101,6 +242,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
+
 [[package]]
 name = "crypto-common"
 version = "0.1.6"
@@ -127,6 +274,49 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
+[[package]]
+name = "errno"
+version = "0.3.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
+dependencies = [
+ "libc",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "event-listener"
+version = "2.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
+
+[[package]]
+name = "event-listener"
+version = "5.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab"
+dependencies = [
+ "concurrent-queue",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "event-listener-strategy"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93"
+dependencies = [
+ "event-listener 5.4.1",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "fastrand"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
+
 [[package]]
 name = "fnv"
 version = "1.0.7"
@@ -157,6 +347,25 @@ version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
+[[package]]
+name = "futures-io"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
+
+[[package]]
+name = "futures-lite"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f78e10609fe0e0b3f4157ffab1876319b5b0db102a2c60dc4626306dc46b44ad"
+dependencies = [
+ "fastrand",
+ "futures-core",
+ "futures-io",
+ "parking",
+ "pin-project-lite",
+]
+
 [[package]]
 name = "futures-macro"
 version = "0.3.31"
@@ -211,6 +420,18 @@ version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
+[[package]]
+name = "gloo-timers"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "js-sys",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "h2"
 version = "0.4.10"
@@ -260,6 +481,12 @@ dependencies = [
  "http",
 ]
 
+[[package]]
+name = "hermit-abi"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c"
+
 [[package]]
 name = "http"
 version = "1.3.1"
@@ -357,12 +584,37 @@ version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
+[[package]]
+name = "js-sys"
+version = "0.3.77"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
+dependencies = [
+ "once_cell",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "kv-log-macro"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f"
+dependencies = [
+ "log",
+]
+
 [[package]]
 name = "libc"
 version = "0.2.173"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d8cfeafaffdbc32176b64fb251369d52ea9f0a8fbc6f8759edffef7b525d64bb"
 
+[[package]]
+name = "linux-raw-sys"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
+
 [[package]]
 name = "lock_api"
 version = "0.4.13"
@@ -373,6 +625,15 @@ dependencies = [
  "scopeguard",
 ]
 
+[[package]]
+name = "log"
+version = "0.4.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
+dependencies = [
+ "value-bag",
+]
+
 [[package]]
 name = "memchr"
 version = "2.7.5"
@@ -432,6 +693,12 @@ version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
+[[package]]
+name = "parking"
+version = "2.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
+
 [[package]]
 name = "parking_lot"
 version = "0.12.4"
@@ -452,7 +719,7 @@ dependencies = [
  "libc",
  "redox_syscall",
  "smallvec",
- "windows-targets",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -473,6 +740,17 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
+[[package]]
+name = "piper"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066"
+dependencies = [
+ "atomic-waker",
+ "fastrand",
+ "futures-io",
+]
+
 [[package]]
 name = "poem"
 version = "3.1.11"
@@ -518,6 +796,20 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "polling"
+version = "3.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5bd19146350fe804f7cb2669c851c03d69da628803dab0d98018142aaa5d829"
+dependencies = [
+ "cfg-if",
+ "concurrent-queue",
+ "hermit-abi",
+ "pin-project-lite",
+ "rustix",
+ "windows-sys 0.60.2",
+]
+
 [[package]]
 name = "proc-macro-crate"
 version = "3.3.0"
@@ -598,6 +890,25 @@ version = "0.1.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "989e6739f80c4ad5b13e0fd7fe89531180375b18520cc8c82080e4dc4035b84f"
 
+[[package]]
+name = "rustix"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8"
+dependencies = [
+ "bitflags",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
+
 [[package]]
 name = "ryu"
 version = "1.0.20"
@@ -665,6 +976,15 @@ dependencies = [
  "digest",
 ]
 
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2a4719bff48cee6b39d12c020eeb490953ad2443b7055bd0b21fca26bd8c28b"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "slab"
 version = "0.4.10"
@@ -711,7 +1031,9 @@ dependencies = [
 name = "test"
 version = "0.0.1"
 dependencies = [
+ "async-std",
  "poem",
+ "tokio",
 ]
 
 [[package]]
@@ -744,7 +1066,9 @@ dependencies = [
  "bytes",
  "libc",
  "mio",
+ "parking_lot",
  "pin-project-lite",
+ "signal-hook-registry",
  "socket2",
  "tokio-macros",
  "windows-sys 0.52.0",
@@ -843,6 +1167,12 @@ version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
 
+[[package]]
+name = "value-bag"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "943ce29a8a743eb10d6082545d861b24f9d1b160b7d741e0f2cdf726bec909c5"
+
 [[package]]
 name = "version_check"
 version = "0.9.5"
@@ -855,19 +1185,106 @@ version = "0.11.1+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "rustversion",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
+dependencies = [
+ "bumpalo",
+ "log",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-futures"
+version = "0.4.50"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "once_cell",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "web-sys"
+version = "0.3.77"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "wildmatch"
 version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68ce1ab1f8c62655ebe1350f589c61e505cf94d385bc6a12899442d9081e71fd"
 
+[[package]]
+name = "windows-link"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
+
 [[package]]
 name = "windows-sys"
 version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -876,7 +1293,16 @@ version = "0.59.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
 dependencies = [
- "windows-targets",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
+dependencies = [
+ "windows-targets 0.53.3",
 ]
 
 [[package]]
@@ -885,14 +1311,31 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_gnullvm",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
+ "windows_i686_gnullvm 0.52.6",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.53.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91"
+dependencies = [
+ "windows-link",
+ "windows_aarch64_gnullvm 0.53.0",
+ "windows_aarch64_msvc 0.53.0",
+ "windows_i686_gnu 0.53.0",
+ "windows_i686_gnullvm 0.53.0",
+ "windows_i686_msvc 0.53.0",
+ "windows_x86_64_gnu 0.53.0",
+ "windows_x86_64_gnullvm 0.53.0",
+ "windows_x86_64_msvc 0.53.0",
 ]
 
 [[package]]
@@ -901,48 +1344,96 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
+[[package]]
+name = "windows_i686_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
+
 [[package]]
 name = "windows_i686_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
+[[package]]
+name = "windows_i686_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
+
 [[package]]
 name = "winnow"
 version = "0.7.11"
diff --git a/rust/ql/test/query-tests/security/CWE-022/TaintedPath.expected b/rust/ql/test/query-tests/security/CWE-022/TaintedPath.expected
index 60847b71b79..a1f9b448ac7 100644
--- a/rust/ql/test/query-tests/security/CWE-022/TaintedPath.expected
+++ b/rust/ql/test/query-tests/security/CWE-022/TaintedPath.expected
@@ -1,20 +1,231 @@
 #select
-| src/main.rs:10:5:10:22 | ...::read_to_string | src/main.rs:6:11:6:19 | file_name | src/main.rs:10:5:10:22 | ...::read_to_string | This path depends on a $@. | src/main.rs:6:11:6:19 | file_name | user-provided value |
+| src/main.rs:11:5:11:22 | ...::read_to_string | src/main.rs:7:11:7:19 | file_name | src/main.rs:11:5:11:22 | ...::read_to_string | This path depends on a $@. | src/main.rs:7:11:7:19 | file_name | user-provided value |
+| src/main.rs:58:5:58:22 | ...::read_to_string | src/main.rs:50:51:50:59 | file_path | src/main.rs:58:5:58:22 | ...::read_to_string | This path depends on a $@. | src/main.rs:50:51:50:59 | file_path | user-provided value |
+| src/main.rs:71:5:71:22 | ...::read_to_string | src/main.rs:63:11:63:19 | file_path | src/main.rs:71:5:71:22 | ...::read_to_string | This path depends on a $@. | src/main.rs:63:11:63:19 | file_path | user-provided value |
+| src/main.rs:99:5:99:22 | ...::read_to_string | src/main.rs:90:11:90:19 | file_path | src/main.rs:99:5:99:22 | ...::read_to_string | This path depends on a $@. | src/main.rs:90:11:90:19 | file_path | user-provided value |
+| src/main.rs:104:13:104:31 | ...::open | src/main.rs:103:17:103:30 | ...::args | src/main.rs:104:13:104:31 | ...::open | This path depends on a $@. | src/main.rs:103:17:103:30 | ...::args | user-provided value |
+| src/main.rs:107:13:107:31 | ...::open | src/main.rs:103:17:103:30 | ...::args | src/main.rs:107:13:107:31 | ...::open | This path depends on a $@. | src/main.rs:103:17:103:30 | ...::args | user-provided value |
+| src/main.rs:110:13:110:33 | ...::open | src/main.rs:103:17:103:30 | ...::args | src/main.rs:110:13:110:33 | ...::open | This path depends on a $@. | src/main.rs:103:17:103:30 | ...::args | user-provided value |
+| src/main.rs:113:13:113:37 | ...::open | src/main.rs:103:17:103:30 | ...::args | src/main.rs:113:13:113:37 | ...::open | This path depends on a $@. | src/main.rs:103:17:103:30 | ...::args | user-provided value |
+| src/main.rs:116:13:116:31 | ...::open | src/main.rs:103:17:103:30 | ...::args | src/main.rs:116:13:116:31 | ...::open | This path depends on a $@. | src/main.rs:103:17:103:30 | ...::args | user-provided value |
+| src/main.rs:119:13:119:31 | ...::open | src/main.rs:103:17:103:30 | ...::args | src/main.rs:119:13:119:31 | ...::open | This path depends on a $@. | src/main.rs:103:17:103:30 | ...::args | user-provided value |
+| src/main.rs:122:13:122:25 | ...::copy | src/main.rs:103:17:103:30 | ...::args | src/main.rs:122:13:122:25 | ...::copy | This path depends on a $@. | src/main.rs:103:17:103:30 | ...::args | user-provided value |
+| src/main.rs:123:13:123:25 | ...::copy | src/main.rs:103:17:103:30 | ...::args | src/main.rs:123:13:123:25 | ...::copy | This path depends on a $@. | src/main.rs:103:17:103:30 | ...::args | user-provided value |
+| src/main.rs:173:13:173:18 | exists | src/main.rs:185:17:185:30 | ...::args | src/main.rs:173:13:173:18 | exists | This path depends on a $@. | src/main.rs:185:17:185:30 | ...::args | user-provided value |
+| src/main.rs:174:25:174:34 | ...::open | src/main.rs:185:17:185:30 | ...::args | src/main.rs:174:25:174:34 | ...::open | This path depends on a $@. | src/main.rs:185:17:185:30 | ...::args | user-provided value |
+| src/main.rs:177:25:177:34 | ...::open | src/main.rs:185:17:185:30 | ...::args | src/main.rs:177:25:177:34 | ...::open | This path depends on a $@. | src/main.rs:185:17:185:30 | ...::args | user-provided value |
 edges
-| src/main.rs:6:11:6:19 | file_name | src/main.rs:8:35:8:43 | file_name | provenance |  |
-| src/main.rs:8:9:8:17 | file_path | src/main.rs:10:24:10:32 | file_path | provenance |  |
-| src/main.rs:8:21:8:44 | ...::from(...) | src/main.rs:8:9:8:17 | file_path | provenance |  |
-| src/main.rs:8:35:8:43 | file_name | src/main.rs:8:21:8:44 | ...::from(...) | provenance | MaD:2 |
-| src/main.rs:8:35:8:43 | file_name | src/main.rs:8:21:8:44 | ...::from(...) | provenance | MaD:2 |
-| src/main.rs:10:24:10:32 | file_path | src/main.rs:10:5:10:22 | ...::read_to_string | provenance | MaD:1 Sink:MaD:1 |
+| src/main.rs:7:11:7:19 | file_name | src/main.rs:9:35:9:43 | file_name | provenance |  |
+| src/main.rs:9:9:9:17 | file_path | src/main.rs:11:24:11:32 | file_path | provenance |  |
+| src/main.rs:9:21:9:44 | ...::from(...) | src/main.rs:9:9:9:17 | file_path | provenance |  |
+| src/main.rs:9:35:9:43 | file_name | src/main.rs:9:21:9:44 | ...::from(...) | provenance | MaD:9 |
+| src/main.rs:9:35:9:43 | file_name | src/main.rs:9:21:9:44 | ...::from(...) | provenance | MaD:14 |
+| src/main.rs:11:24:11:32 | file_path | src/main.rs:11:5:11:22 | ...::read_to_string | provenance | MaD:6 Sink:MaD:6 |
+| src/main.rs:50:51:50:59 | file_path | src/main.rs:52:32:52:40 | file_path | provenance |  |
+| src/main.rs:52:9:52:17 | file_path [&ref] | src/main.rs:53:21:53:44 | file_path.canonicalize() [Ok] | provenance | Config |
+| src/main.rs:52:21:52:41 | ...::new(...) [&ref] | src/main.rs:52:9:52:17 | file_path [&ref] | provenance |  |
+| src/main.rs:52:31:52:40 | &file_path [&ref] | src/main.rs:52:21:52:41 | ...::new(...) [&ref] | provenance | MaD:13 |
+| src/main.rs:52:32:52:40 | file_path | src/main.rs:52:31:52:40 | &file_path [&ref] | provenance |  |
+| src/main.rs:53:9:53:17 | file_path | src/main.rs:58:24:58:32 | file_path | provenance |  |
+| src/main.rs:53:21:53:44 | file_path.canonicalize() [Ok] | src/main.rs:53:21:53:53 | ... .unwrap() | provenance | MaD:12 |
+| src/main.rs:53:21:53:53 | ... .unwrap() | src/main.rs:53:9:53:17 | file_path | provenance |  |
+| src/main.rs:58:24:58:32 | file_path | src/main.rs:58:5:58:22 | ...::read_to_string | provenance | MaD:6 Sink:MaD:6 |
+| src/main.rs:63:11:63:19 | file_path | src/main.rs:66:32:66:40 | file_path | provenance |  |
+| src/main.rs:66:9:66:17 | file_path [&ref] | src/main.rs:71:24:71:32 | file_path [&ref] | provenance |  |
+| src/main.rs:66:21:66:41 | ...::new(...) [&ref] | src/main.rs:66:9:66:17 | file_path [&ref] | provenance |  |
+| src/main.rs:66:31:66:40 | &file_path [&ref] | src/main.rs:66:21:66:41 | ...::new(...) [&ref] | provenance | MaD:13 |
+| src/main.rs:66:32:66:40 | file_path | src/main.rs:66:31:66:40 | &file_path [&ref] | provenance |  |
+| src/main.rs:71:24:71:32 | file_path [&ref] | src/main.rs:71:5:71:22 | ...::read_to_string | provenance | MaD:6 Sink:MaD:6 |
+| src/main.rs:90:11:90:19 | file_path | src/main.rs:93:32:93:40 | file_path | provenance |  |
+| src/main.rs:93:9:93:17 | file_path [&ref] | src/main.rs:98:21:98:44 | file_path.canonicalize() [Ok] | provenance | Config |
+| src/main.rs:93:21:93:41 | ...::new(...) [&ref] | src/main.rs:93:9:93:17 | file_path [&ref] | provenance |  |
+| src/main.rs:93:31:93:40 | &file_path [&ref] | src/main.rs:93:21:93:41 | ...::new(...) [&ref] | provenance | MaD:13 |
+| src/main.rs:93:32:93:40 | file_path | src/main.rs:93:31:93:40 | &file_path [&ref] | provenance |  |
+| src/main.rs:98:9:98:17 | file_path | src/main.rs:99:24:99:32 | file_path | provenance |  |
+| src/main.rs:98:21:98:44 | file_path.canonicalize() [Ok] | src/main.rs:98:21:98:53 | ... .unwrap() | provenance | MaD:12 |
+| src/main.rs:98:21:98:53 | ... .unwrap() | src/main.rs:98:9:98:17 | file_path | provenance |  |
+| src/main.rs:99:24:99:32 | file_path | src/main.rs:99:5:99:22 | ...::read_to_string | provenance | MaD:6 Sink:MaD:6 |
+| src/main.rs:103:9:103:13 | path1 | src/main.rs:104:33:104:37 | path1 | provenance |  |
+| src/main.rs:103:9:103:13 | path1 | src/main.rs:104:33:104:45 | path1.clone() | provenance | MaD:8 |
+| src/main.rs:103:9:103:13 | path1 | src/main.rs:106:39:106:43 | path1 | provenance |  |
+| src/main.rs:103:9:103:13 | path1 | src/main.rs:106:39:106:51 | path1.clone() | provenance | MaD:8 |
+| src/main.rs:103:9:103:13 | path1 | src/main.rs:109:41:109:45 | path1 | provenance |  |
+| src/main.rs:103:9:103:13 | path1 | src/main.rs:109:41:109:53 | path1.clone() | provenance | MaD:8 |
+| src/main.rs:103:9:103:13 | path1 | src/main.rs:112:45:112:49 | path1 | provenance |  |
+| src/main.rs:103:9:103:13 | path1 | src/main.rs:112:45:112:57 | path1.clone() | provenance | MaD:8 |
+| src/main.rs:103:9:103:13 | path1 | src/main.rs:115:39:115:43 | path1 | provenance |  |
+| src/main.rs:103:9:103:13 | path1 | src/main.rs:122:27:122:31 | path1 | provenance |  |
+| src/main.rs:103:9:103:13 | path1 | src/main.rs:122:27:122:39 | path1.clone() | provenance | MaD:8 |
+| src/main.rs:103:9:103:13 | path1 | src/main.rs:123:37:123:41 | path1 | provenance |  |
+| src/main.rs:103:9:103:13 | path1 | src/main.rs:123:37:123:49 | path1.clone() | provenance | MaD:8 |
+| src/main.rs:103:17:103:30 | ...::args | src/main.rs:103:17:103:32 | ...::args(...) [element] | provenance | Src:MaD:7  |
+| src/main.rs:103:17:103:32 | ...::args(...) [element] | src/main.rs:103:17:103:39 | ... .nth(...) [Some] | provenance | MaD:10 |
+| src/main.rs:103:17:103:39 | ... .nth(...) [Some] | src/main.rs:103:17:103:48 | ... .unwrap() | provenance | MaD:11 |
+| src/main.rs:103:17:103:48 | ... .unwrap() | src/main.rs:103:9:103:13 | path1 | provenance |  |
+| src/main.rs:104:33:104:37 | path1 | src/main.rs:104:33:104:45 | path1.clone() | provenance | MaD:8 |
+| src/main.rs:104:33:104:45 | path1.clone() | src/main.rs:104:13:104:31 | ...::open | provenance | MaD:2 Sink:MaD:2 |
+| src/main.rs:106:9:106:13 | path2 | src/main.rs:107:33:107:37 | path2 | provenance |  |
+| src/main.rs:106:17:106:52 | ...::canonicalize(...) [Ok] | src/main.rs:106:17:106:61 | ... .unwrap() | provenance | MaD:12 |
+| src/main.rs:106:17:106:61 | ... .unwrap() | src/main.rs:106:9:106:13 | path2 | provenance |  |
+| src/main.rs:106:39:106:43 | path1 | src/main.rs:106:39:106:51 | path1.clone() | provenance | MaD:8 |
+| src/main.rs:106:39:106:51 | path1.clone() | src/main.rs:106:17:106:52 | ...::canonicalize(...) [Ok] | provenance | Config |
+| src/main.rs:107:33:107:37 | path2 | src/main.rs:107:13:107:31 | ...::open | provenance | MaD:2 Sink:MaD:2 |
+| src/main.rs:109:9:109:13 | path3 | src/main.rs:110:35:110:39 | path3 | provenance |  |
+| src/main.rs:109:17:109:54 | ...::canonicalize(...) [future, Ok] | src/main.rs:109:17:109:60 | await ... [Ok] | provenance |  |
+| src/main.rs:109:17:109:60 | await ... [Ok] | src/main.rs:109:17:109:69 | ... .unwrap() | provenance | MaD:12 |
+| src/main.rs:109:17:109:69 | ... .unwrap() | src/main.rs:109:9:109:13 | path3 | provenance |  |
+| src/main.rs:109:41:109:45 | path1 | src/main.rs:109:41:109:53 | path1.clone() | provenance | MaD:8 |
+| src/main.rs:109:41:109:53 | path1.clone() | src/main.rs:109:17:109:54 | ...::canonicalize(...) [future, Ok] | provenance | Config |
+| src/main.rs:110:35:110:39 | path3 | src/main.rs:110:13:110:33 | ...::open | provenance | MaD:4 Sink:MaD:4 |
+| src/main.rs:112:9:112:13 | path4 | src/main.rs:113:39:113:43 | path4 | provenance |  |
+| src/main.rs:112:17:112:58 | ...::canonicalize(...) [future, Ok] | src/main.rs:112:17:112:64 | await ... [Ok] | provenance |  |
+| src/main.rs:112:17:112:64 | await ... [Ok] | src/main.rs:112:17:112:73 | ... .unwrap() | provenance | MaD:12 |
+| src/main.rs:112:17:112:73 | ... .unwrap() | src/main.rs:112:9:112:13 | path4 | provenance |  |
+| src/main.rs:112:45:112:49 | path1 | src/main.rs:112:45:112:57 | path1.clone() | provenance | MaD:8 |
+| src/main.rs:112:45:112:57 | path1.clone() | src/main.rs:112:17:112:58 | ...::canonicalize(...) [future, Ok] | provenance | Config |
+| src/main.rs:113:39:113:43 | path4 | src/main.rs:113:13:113:37 | ...::open | provenance | MaD:1 Sink:MaD:1 |
+| src/main.rs:115:9:115:13 | path5 [&ref] | src/main.rs:116:33:116:37 | path5 [&ref] | provenance |  |
+| src/main.rs:115:17:115:44 | ...::new(...) [&ref] | src/main.rs:115:9:115:13 | path5 [&ref] | provenance |  |
+| src/main.rs:115:38:115:43 | &path1 [&ref] | src/main.rs:115:17:115:44 | ...::new(...) [&ref] | provenance | MaD:13 |
+| src/main.rs:115:39:115:43 | path1 | src/main.rs:115:38:115:43 | &path1 [&ref] | provenance |  |
+| src/main.rs:116:33:116:37 | path5 [&ref] | src/main.rs:116:13:116:31 | ...::open | provenance | MaD:2 Sink:MaD:2 |
+| src/main.rs:116:33:116:37 | path5 [&ref] | src/main.rs:118:17:118:36 | path5.canonicalize() [Ok] | provenance | Config |
+| src/main.rs:118:9:118:13 | path6 | src/main.rs:119:33:119:37 | path6 | provenance |  |
+| src/main.rs:118:17:118:36 | path5.canonicalize() [Ok] | src/main.rs:118:17:118:45 | ... .unwrap() | provenance | MaD:12 |
+| src/main.rs:118:17:118:45 | ... .unwrap() | src/main.rs:118:9:118:13 | path6 | provenance |  |
+| src/main.rs:119:33:119:37 | path6 | src/main.rs:119:13:119:31 | ...::open | provenance | MaD:2 Sink:MaD:2 |
+| src/main.rs:122:27:122:31 | path1 | src/main.rs:122:27:122:39 | path1.clone() | provenance | MaD:8 |
+| src/main.rs:122:27:122:39 | path1.clone() | src/main.rs:122:13:122:25 | ...::copy | provenance | MaD:5 Sink:MaD:5 |
+| src/main.rs:123:37:123:41 | path1 | src/main.rs:123:37:123:49 | path1.clone() | provenance | MaD:8 |
+| src/main.rs:123:37:123:49 | path1.clone() | src/main.rs:123:13:123:25 | ...::copy | provenance | MaD:5 Sink:MaD:5 |
+| src/main.rs:170:16:170:29 | ...: ... [&ref] | src/main.rs:172:26:172:33 | path_str [&ref] | provenance |  |
+| src/main.rs:170:16:170:29 | ...: ... [&ref] | src/main.rs:174:36:174:43 | path_str [&ref] | provenance |  |
+| src/main.rs:172:9:172:12 | path [&ref] | src/main.rs:173:8:173:11 | path [&ref] | provenance |  |
+| src/main.rs:172:16:172:34 | ...::new(...) [&ref] | src/main.rs:172:9:172:12 | path [&ref] | provenance |  |
+| src/main.rs:172:26:172:33 | path_str [&ref] | src/main.rs:172:16:172:34 | ...::new(...) [&ref] | provenance | MaD:13 |
+| src/main.rs:173:8:173:11 | path [&ref] | src/main.rs:173:13:173:18 | exists | provenance | MaD:3 Sink:MaD:3 |
+| src/main.rs:173:8:173:11 | path [&ref] | src/main.rs:177:36:177:39 | path [&ref] | provenance |  |
+| src/main.rs:174:36:174:43 | path_str [&ref] | src/main.rs:174:25:174:34 | ...::open | provenance | MaD:2 Sink:MaD:2 |
+| src/main.rs:177:36:177:39 | path [&ref] | src/main.rs:177:25:177:34 | ...::open | provenance | MaD:2 Sink:MaD:2 |
+| src/main.rs:185:9:185:13 | path1 | src/main.rs:186:18:186:22 | path1 | provenance |  |
+| src/main.rs:185:17:185:30 | ...::args | src/main.rs:185:17:185:32 | ...::args(...) [element] | provenance | Src:MaD:7  |
+| src/main.rs:185:17:185:32 | ...::args(...) [element] | src/main.rs:185:17:185:39 | ... .nth(...) [Some] | provenance | MaD:10 |
+| src/main.rs:185:17:185:39 | ... .nth(...) [Some] | src/main.rs:185:17:185:48 | ... .unwrap() | provenance | MaD:11 |
+| src/main.rs:185:17:185:48 | ... .unwrap() | src/main.rs:185:9:185:13 | path1 | provenance |  |
+| src/main.rs:186:17:186:22 | &path1 [&ref] | src/main.rs:170:16:170:29 | ...: ... [&ref] | provenance |  |
+| src/main.rs:186:18:186:22 | path1 | src/main.rs:186:17:186:22 | &path1 [&ref] | provenance |  |
 models
-| 1 | Sink: std::fs::read_to_string; Argument[0]; path-injection |
-| 2 | Summary: <std::path::PathBuf as core::convert::From>::from; Argument[0]; ReturnValue; taint |
+| 1 | Sink: <async_std::fs::file::File>::open; Argument[0]; path-injection |
+| 2 | Sink: <std::fs::File>::open; Argument[0]; path-injection |
+| 3 | Sink: <std::path::Path>::exists; Argument[self]; path-injection |
+| 4 | Sink: <tokio::fs::file::File>::open; Argument[0]; path-injection |
+| 5 | Sink: std::fs::copy; Argument[0,1]; path-injection |
+| 6 | Sink: std::fs::read_to_string; Argument[0]; path-injection |
+| 7 | Source: std::env::args; ReturnValue.Element; commandargs |
+| 8 | Summary: <_ as core::clone::Clone>::clone; Argument[self].Reference; ReturnValue; value |
+| 9 | Summary: <_ as core::convert::From>::from; Argument[0]; ReturnValue; taint |
+| 10 | Summary: <_ as core::iter::traits::iterator::Iterator>::nth; Argument[self].Element; ReturnValue.Field[core::option::Option::Some(0)]; value |
+| 11 | Summary: <core::option::Option>::unwrap; Argument[self].Field[core::option::Option::Some(0)]; ReturnValue; value |
+| 12 | Summary: <core::result::Result>::unwrap; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
+| 13 | Summary: <std::path::Path>::new; Argument[0].Reference; ReturnValue.Reference; value |
+| 14 | Summary: <std::path::PathBuf as core::convert::From>::from; Argument[0]; ReturnValue; taint |
 nodes
-| src/main.rs:6:11:6:19 | file_name | semmle.label | file_name |
-| src/main.rs:8:9:8:17 | file_path | semmle.label | file_path |
-| src/main.rs:8:21:8:44 | ...::from(...) | semmle.label | ...::from(...) |
-| src/main.rs:8:35:8:43 | file_name | semmle.label | file_name |
-| src/main.rs:10:5:10:22 | ...::read_to_string | semmle.label | ...::read_to_string |
-| src/main.rs:10:24:10:32 | file_path | semmle.label | file_path |
+| src/main.rs:7:11:7:19 | file_name | semmle.label | file_name |
+| src/main.rs:9:9:9:17 | file_path | semmle.label | file_path |
+| src/main.rs:9:21:9:44 | ...::from(...) | semmle.label | ...::from(...) |
+| src/main.rs:9:35:9:43 | file_name | semmle.label | file_name |
+| src/main.rs:11:5:11:22 | ...::read_to_string | semmle.label | ...::read_to_string |
+| src/main.rs:11:24:11:32 | file_path | semmle.label | file_path |
+| src/main.rs:50:51:50:59 | file_path | semmle.label | file_path |
+| src/main.rs:52:9:52:17 | file_path [&ref] | semmle.label | file_path [&ref] |
+| src/main.rs:52:21:52:41 | ...::new(...) [&ref] | semmle.label | ...::new(...) [&ref] |
+| src/main.rs:52:31:52:40 | &file_path [&ref] | semmle.label | &file_path [&ref] |
+| src/main.rs:52:32:52:40 | file_path | semmle.label | file_path |
+| src/main.rs:53:9:53:17 | file_path | semmle.label | file_path |
+| src/main.rs:53:21:53:44 | file_path.canonicalize() [Ok] | semmle.label | file_path.canonicalize() [Ok] |
+| src/main.rs:53:21:53:53 | ... .unwrap() | semmle.label | ... .unwrap() |
+| src/main.rs:58:5:58:22 | ...::read_to_string | semmle.label | ...::read_to_string |
+| src/main.rs:58:24:58:32 | file_path | semmle.label | file_path |
+| src/main.rs:63:11:63:19 | file_path | semmle.label | file_path |
+| src/main.rs:66:9:66:17 | file_path [&ref] | semmle.label | file_path [&ref] |
+| src/main.rs:66:21:66:41 | ...::new(...) [&ref] | semmle.label | ...::new(...) [&ref] |
+| src/main.rs:66:31:66:40 | &file_path [&ref] | semmle.label | &file_path [&ref] |
+| src/main.rs:66:32:66:40 | file_path | semmle.label | file_path |
+| src/main.rs:71:5:71:22 | ...::read_to_string | semmle.label | ...::read_to_string |
+| src/main.rs:71:24:71:32 | file_path [&ref] | semmle.label | file_path [&ref] |
+| src/main.rs:90:11:90:19 | file_path | semmle.label | file_path |
+| src/main.rs:93:9:93:17 | file_path [&ref] | semmle.label | file_path [&ref] |
+| src/main.rs:93:21:93:41 | ...::new(...) [&ref] | semmle.label | ...::new(...) [&ref] |
+| src/main.rs:93:31:93:40 | &file_path [&ref] | semmle.label | &file_path [&ref] |
+| src/main.rs:93:32:93:40 | file_path | semmle.label | file_path |
+| src/main.rs:98:9:98:17 | file_path | semmle.label | file_path |
+| src/main.rs:98:21:98:44 | file_path.canonicalize() [Ok] | semmle.label | file_path.canonicalize() [Ok] |
+| src/main.rs:98:21:98:53 | ... .unwrap() | semmle.label | ... .unwrap() |
+| src/main.rs:99:5:99:22 | ...::read_to_string | semmle.label | ...::read_to_string |
+| src/main.rs:99:24:99:32 | file_path | semmle.label | file_path |
+| src/main.rs:103:9:103:13 | path1 | semmle.label | path1 |
+| src/main.rs:103:17:103:30 | ...::args | semmle.label | ...::args |
+| src/main.rs:103:17:103:32 | ...::args(...) [element] | semmle.label | ...::args(...) [element] |
+| src/main.rs:103:17:103:39 | ... .nth(...) [Some] | semmle.label | ... .nth(...) [Some] |
+| src/main.rs:103:17:103:48 | ... .unwrap() | semmle.label | ... .unwrap() |
+| src/main.rs:104:13:104:31 | ...::open | semmle.label | ...::open |
+| src/main.rs:104:33:104:37 | path1 | semmle.label | path1 |
+| src/main.rs:104:33:104:45 | path1.clone() | semmle.label | path1.clone() |
+| src/main.rs:106:9:106:13 | path2 | semmle.label | path2 |
+| src/main.rs:106:17:106:52 | ...::canonicalize(...) [Ok] | semmle.label | ...::canonicalize(...) [Ok] |
+| src/main.rs:106:17:106:61 | ... .unwrap() | semmle.label | ... .unwrap() |
+| src/main.rs:106:39:106:43 | path1 | semmle.label | path1 |
+| src/main.rs:106:39:106:51 | path1.clone() | semmle.label | path1.clone() |
+| src/main.rs:107:13:107:31 | ...::open | semmle.label | ...::open |
+| src/main.rs:107:33:107:37 | path2 | semmle.label | path2 |
+| src/main.rs:109:9:109:13 | path3 | semmle.label | path3 |
+| src/main.rs:109:17:109:54 | ...::canonicalize(...) [future, Ok] | semmle.label | ...::canonicalize(...) [future, Ok] |
+| src/main.rs:109:17:109:60 | await ... [Ok] | semmle.label | await ... [Ok] |
+| src/main.rs:109:17:109:69 | ... .unwrap() | semmle.label | ... .unwrap() |
+| src/main.rs:109:41:109:45 | path1 | semmle.label | path1 |
+| src/main.rs:109:41:109:53 | path1.clone() | semmle.label | path1.clone() |
+| src/main.rs:110:13:110:33 | ...::open | semmle.label | ...::open |
+| src/main.rs:110:35:110:39 | path3 | semmle.label | path3 |
+| src/main.rs:112:9:112:13 | path4 | semmle.label | path4 |
+| src/main.rs:112:17:112:58 | ...::canonicalize(...) [future, Ok] | semmle.label | ...::canonicalize(...) [future, Ok] |
+| src/main.rs:112:17:112:64 | await ... [Ok] | semmle.label | await ... [Ok] |
+| src/main.rs:112:17:112:73 | ... .unwrap() | semmle.label | ... .unwrap() |
+| src/main.rs:112:45:112:49 | path1 | semmle.label | path1 |
+| src/main.rs:112:45:112:57 | path1.clone() | semmle.label | path1.clone() |
+| src/main.rs:113:13:113:37 | ...::open | semmle.label | ...::open |
+| src/main.rs:113:39:113:43 | path4 | semmle.label | path4 |
+| src/main.rs:115:9:115:13 | path5 [&ref] | semmle.label | path5 [&ref] |
+| src/main.rs:115:17:115:44 | ...::new(...) [&ref] | semmle.label | ...::new(...) [&ref] |
+| src/main.rs:115:38:115:43 | &path1 [&ref] | semmle.label | &path1 [&ref] |
+| src/main.rs:115:39:115:43 | path1 | semmle.label | path1 |
+| src/main.rs:116:13:116:31 | ...::open | semmle.label | ...::open |
+| src/main.rs:116:33:116:37 | path5 [&ref] | semmle.label | path5 [&ref] |
+| src/main.rs:118:9:118:13 | path6 | semmle.label | path6 |
+| src/main.rs:118:17:118:36 | path5.canonicalize() [Ok] | semmle.label | path5.canonicalize() [Ok] |
+| src/main.rs:118:17:118:45 | ... .unwrap() | semmle.label | ... .unwrap() |
+| src/main.rs:119:13:119:31 | ...::open | semmle.label | ...::open |
+| src/main.rs:119:33:119:37 | path6 | semmle.label | path6 |
+| src/main.rs:122:13:122:25 | ...::copy | semmle.label | ...::copy |
+| src/main.rs:122:27:122:31 | path1 | semmle.label | path1 |
+| src/main.rs:122:27:122:39 | path1.clone() | semmle.label | path1.clone() |
+| src/main.rs:123:13:123:25 | ...::copy | semmle.label | ...::copy |
+| src/main.rs:123:37:123:41 | path1 | semmle.label | path1 |
+| src/main.rs:123:37:123:49 | path1.clone() | semmle.label | path1.clone() |
+| src/main.rs:170:16:170:29 | ...: ... [&ref] | semmle.label | ...: ... [&ref] |
+| src/main.rs:172:9:172:12 | path [&ref] | semmle.label | path [&ref] |
+| src/main.rs:172:16:172:34 | ...::new(...) [&ref] | semmle.label | ...::new(...) [&ref] |
+| src/main.rs:172:26:172:33 | path_str [&ref] | semmle.label | path_str [&ref] |
+| src/main.rs:173:8:173:11 | path [&ref] | semmle.label | path [&ref] |
+| src/main.rs:173:13:173:18 | exists | semmle.label | exists |
+| src/main.rs:174:25:174:34 | ...::open | semmle.label | ...::open |
+| src/main.rs:174:36:174:43 | path_str [&ref] | semmle.label | path_str [&ref] |
+| src/main.rs:177:25:177:34 | ...::open | semmle.label | ...::open |
+| src/main.rs:177:36:177:39 | path [&ref] | semmle.label | path [&ref] |
+| src/main.rs:185:9:185:13 | path1 | semmle.label | path1 |
+| src/main.rs:185:17:185:30 | ...::args | semmle.label | ...::args |
+| src/main.rs:185:17:185:32 | ...::args(...) [element] | semmle.label | ...::args(...) [element] |
+| src/main.rs:185:17:185:39 | ... .nth(...) [Some] | semmle.label | ... .nth(...) [Some] |
+| src/main.rs:185:17:185:48 | ... .unwrap() | semmle.label | ... .unwrap() |
+| src/main.rs:186:17:186:22 | &path1 [&ref] | semmle.label | &path1 [&ref] |
+| src/main.rs:186:18:186:22 | path1 | semmle.label | path1 |
 subpaths
diff --git a/rust/ql/test/query-tests/security/CWE-022/options.yml b/rust/ql/test/query-tests/security/CWE-022/options.yml
index e0b9bbfb5cf..18392052c7c 100644
--- a/rust/ql/test/query-tests/security/CWE-022/options.yml
+++ b/rust/ql/test/query-tests/security/CWE-022/options.yml
@@ -1,3 +1,5 @@
 qltest_use_nightly: true
 qltest_dependencies:
     - poem = { version = "3.1.7" }
+    - tokio = { version = "1.43.0", features = ["full"] }
+    - async-std = { version = "1.13.1" }
diff --git a/rust/ql/test/query-tests/security/CWE-022/src/main.rs b/rust/ql/test/query-tests/security/CWE-022/src/main.rs
index 6f8c73654c5..7acf036bb6b 100644
--- a/rust/ql/test/query-tests/security/CWE-022/src/main.rs
+++ b/rust/ql/test/query-tests/security/CWE-022/src/main.rs
@@ -1,6 +1,7 @@
 #![feature(file_buffered)]
 use poem::{error::InternalServerError, handler, http::StatusCode, web::Query, Error, Result};
 use std::{fs, path::Path, path::PathBuf};
+
 //#[handler]
 fn tainted_path_handler_bad(
     Query(file_name): Query<String>, // $ Source=remote1
@@ -46,7 +47,7 @@ fn tainted_path_handler_folder_almost_good1(
 }
 
 //#[handler]
-fn tainted_path_handler_folder_good_simpler(Query(file_path): Query<String>) -> Result<String> {
+fn tainted_path_handler_folder_good_simpler(Query(file_path): Query<String>) -> Result<String> { // $ Source=remote6
     let public_path = "/var/www/public_html";
     let file_path = Path::new(&file_path);
     let file_path = file_path.canonicalize().unwrap();
@@ -54,12 +55,12 @@ fn tainted_path_handler_folder_good_simpler(Query(file_path): Query<String>) ->
     if !file_path.starts_with(public_path) {
         return Err(Error::from_status(StatusCode::BAD_REQUEST));
     }
-    fs::read_to_string(file_path).map_err(InternalServerError) // $ path-injection-sink MISSING: path-injection-checked
+    fs::read_to_string(file_path).map_err(InternalServerError) // $ path-injection-sink MISSING: path-injection-checked SPURIOUS: Alert[rust/path-injection]=remote6
 }
 
 //#[handler]
 fn tainted_path_handler_folder_almost_good1_simpler(
-    Query(file_path): Query<String>, // $ MISSING: Source=remote3
+    Query(file_path): Query<String>, // $ Source=remote3
 ) -> Result<String> {
     let public_path = "/var/www/public_html";
     let file_path = Path::new(&file_path);
@@ -67,7 +68,7 @@ fn tainted_path_handler_folder_almost_good1_simpler(
     if !file_path.starts_with(public_path) {
         return Err(Error::from_status(StatusCode::BAD_REQUEST));
     }
-    fs::read_to_string(file_path).map_err(InternalServerError) // $ path-injection-checked path-injection-sink MISSING: Alert[rust/path-injection]=remote3
+    fs::read_to_string(file_path).map_err(InternalServerError) // $ path-injection-checked path-injection-sink Alert[rust/path-injection]=remote3
 }
 
 //#[handler]
@@ -86,7 +87,7 @@ fn tainted_path_handler_folder_almost_good2(
 
 //#[handler]
 fn tainted_path_handler_folder_almost_good3(
-    Query(file_path): Query<String>, // $ MISSING: Source=remote5
+    Query(file_path): Query<String>, // $ Source=remote5
 ) -> Result<String> {
     let public_path = "/var/www/public_html";
     let file_path = Path::new(&file_path);
@@ -95,7 +96,31 @@ fn tainted_path_handler_folder_almost_good3(
         return Err(Error::from_status(StatusCode::BAD_REQUEST));
     }
     let file_path = file_path.canonicalize().unwrap(); // $ path-injection-checked
-    fs::read_to_string(file_path).map_err(InternalServerError) // $ path-injection-sink MISSING: Alert[rust/path-injection]=remote5
+    fs::read_to_string(file_path).map_err(InternalServerError) // $ path-injection-sink Alert[rust/path-injection]=remote5
+}
+
+async fn more_simple_cases() {
+    let path1 = std::env::args().nth(1).unwrap(); // $ Source=arg1
+    let _ = std::fs::File::open(path1.clone()); // $ path-injection-sink Alert[rust/path-injection]=arg1
+
+    let path2 = std::fs::canonicalize(path1.clone()).unwrap();
+    let _ = std::fs::File::open(path2); // $ path-injection-sink Alert[rust/path-injection]=arg1
+
+    let path3 = tokio::fs::canonicalize(path1.clone()).await.unwrap();
+    let _ = tokio::fs::File::open(path3); // $ path-injection-sink Alert[rust/path-injection]=arg1
+
+    let path4 = async_std::fs::canonicalize(path1.clone()).await.unwrap();
+    let _ = async_std::fs::File::open(path4); // $ path-injection-sink Alert[rust/path-injection]=arg1
+
+    let path5 = std::path::Path::new(&path1);
+    let _ = std::fs::File::open(path5); // $ path-injection-sink Alert[rust/path-injection]=arg1
+
+    let path6 = path5.canonicalize().unwrap();
+    let _ = std::fs::File::open(path6); // $ path-injection-sink Alert[rust/path-injection]=arg1
+
+    let harmless = "";
+    let _ = std::fs::copy(path1.clone(), harmless); // $ path-injection-sink Alert[rust/path-injection]=arg1
+    let _ = std::fs::copy(harmless, path1.clone()); // $ path-injection-sink Alert[rust/path-injection]=arg1
 }
 
 fn sinks(path1: &Path, path2: &Path) {
@@ -116,12 +141,47 @@ fn sinks(path1: &Path, path2: &Path) {
     let _ = std::fs::soft_link(path1, path2); // $ path-injection-sink
     let _ = std::fs::symlink_metadata(path1); // $ path-injection-sink
     let _ = std::fs::write(path1, "contents"); // $ path-injection-sink
-    let _ = std::fs::DirBuilder::new().create(path1); // $ path-injection-sink
     let _ = std::fs::File::create(path1); // $ path-injection-sink
     let _ = std::fs::File::create_buffered(path1); // $ path-injection-sink
     let _ = std::fs::File::create_new(path1); // $ path-injection-sink
     let _ = std::fs::File::open(path1); // $ path-injection-sink
     let _ = std::fs::File::open_buffered(path1); // $ path-injection-sink
+    let _ = std::fs::DirBuilder::new().create(path1); // $ path-injection-sink
+    let _ = std::fs::DirBuilder::new().recursive(true).create(path1); // $ path-injection-sink
+    let _ = std::fs::OpenOptions::new().open(path1); // $ path-injection-sink
+
+    let _ = tokio::fs::read(path1); // $ path-injection-sink
+    let _ = tokio::fs::read_to_string(path1); // $ path-injection-sink
+    let _ = tokio::fs::remove_file(path1); // $ path-injection-sink
+    let _ = tokio::fs::DirBuilder::new().create(path1); // $ path-injection-sink
+    let _ = tokio::fs::DirBuilder::new().recursive(true).create(path1); // $ path-injection-sink
+    let _ = tokio::fs::OpenOptions::new().open(path1); // $ path-injection-sink
+
+    let _ = async_std::fs::read(path1); // $ path-injection-sink
+    let _ = async_std::fs::read_to_string(path1); // $ path-injection-sink
+    let _ = async_std::fs::remove_file(path1); // $ path-injection-sink
+    let _ = async_std::fs::DirBuilder::new().create(path1); // $ path-injection-sink
+    let _ = async_std::fs::DirBuilder::new().recursive(true).create(path1); // $ path-injection-sink
+    let _ = async_std::fs::OpenOptions::new().open(path1); // $ path-injection-sink
 }
 
-fn main() {}
+use std::fs::File;
+
+fn my_function(path_str: &str) -> Result<(), std::io::Error> {
+    // somewhat realistic example
+    let path = Path::new(path_str);
+    if path.exists() { // $ path-injection-sink Alert[rust/path-injection]=arg2
+        let mut file1 = File::open(path_str)?; // $ path-injection-sink Alert[rust/path-injection]=arg2
+        // ...
+
+        let mut file2 = File::open(path)?; // $ path-injection-sink Alert[rust/path-injection]=arg2
+        // ...
+    }
+
+    Ok(())
+}
+
+fn main() {
+    let path1 = std::env::args().nth(1).unwrap(); // $ Source=arg2
+    my_function(&path1);
+}
diff --git a/rust/ql/test/query-tests/security/CWE-089/CONSISTENCY/PathResolutionConsistency.expected b/rust/ql/test/query-tests/security/CWE-089/CONSISTENCY/PathResolutionConsistency.expected
index b5d4fea346d..34a867e0917 100644
--- a/rust/ql/test/query-tests/security/CWE-089/CONSISTENCY/PathResolutionConsistency.expected
+++ b/rust/ql/test/query-tests/security/CWE-089/CONSISTENCY/PathResolutionConsistency.expected
@@ -1,4 +1,12 @@
 multipleCallTargets
+| mysql.rs:15:24:15:39 | ...::from(...) |
+| mysql.rs:16:26:16:85 | ...::from(...) |
+| mysql.rs:18:13:18:66 | ...::from(...) |
+| mysql.rs:19:30:19:83 | ...::from(...) |
+| mysql.rs:100:24:100:39 | ...::from(...) |
+| mysql.rs:101:26:101:85 | ...::from(...) |
+| mysql.rs:103:13:103:66 | ...::from(...) |
+| mysql.rs:104:30:104:83 | ...::from(...) |
 | sqlx.rs:46:24:46:44 | ...::from(...) |
 | sqlx.rs:47:56:47:76 | ...::from(...) |
 | sqlx.rs:48:97:48:117 | ...::from(...) |
@@ -6,75 +14,25 @@ multipleCallTargets
 | sqlx.rs:51:24:51:77 | ...::from(...) |
 | sqlx.rs:55:26:55:79 | ...::from(...) |
 | sqlx.rs:61:28:61:81 | ...::from(...) |
-| sqlx.rs:64:57:64:77 | safe_query_1.as_str() |
-| sqlx.rs:65:26:65:46 | safe_query_2.as_str() |
-| sqlx.rs:66:26:66:46 | safe_query_3.as_str() |
-| sqlx.rs:67:26:67:48 | unsafe_query_1.as_str() |
-| sqlx.rs:69:30:69:52 | unsafe_query_2.as_str() |
-| sqlx.rs:70:30:70:52 | unsafe_query_3.as_str() |
-| sqlx.rs:75:25:75:45 | safe_query_1.as_str() |
-| sqlx.rs:76:25:76:45 | safe_query_2.as_str() |
-| sqlx.rs:77:25:77:45 | safe_query_3.as_str() |
-| sqlx.rs:78:25:78:47 | unsafe_query_1.as_str() |
-| sqlx.rs:80:29:80:51 | unsafe_query_2.as_str() |
-| sqlx.rs:81:29:81:51 | unsafe_query_3.as_str() |
-| sqlx.rs:84:25:84:49 | prepared_query_1.as_str() |
-| sqlx.rs:85:25:85:49 | prepared_query_1.as_str() |
-| sqlx.rs:87:29:87:53 | prepared_query_1.as_str() |
-| sqlx.rs:88:29:88:53 | prepared_query_1.as_str() |
 | sqlx.rs:99:24:99:44 | ...::from(...) |
 | sqlx.rs:100:97:100:117 | ...::from(...) |
 | sqlx.rs:101:24:101:77 | ...::from(...) |
 | sqlx.rs:102:26:102:79 | ...::from(...) |
 | sqlx.rs:103:28:103:81 | ...::from(...) |
-| sqlx.rs:106:26:106:46 | safe_query_1.as_str() |
-| sqlx.rs:108:30:108:52 | unsafe_query_1.as_str() |
-| sqlx.rs:111:27:111:47 | safe_query_1.as_str() |
-| sqlx.rs:113:31:113:53 | unsafe_query_1.as_str() |
-| sqlx.rs:117:25:117:45 | safe_query_1.as_str() |
-| sqlx.rs:118:25:118:49 | prepared_query_1.as_str() |
-| sqlx.rs:120:29:120:51 | unsafe_query_1.as_str() |
-| sqlx.rs:121:29:121:53 | prepared_query_1.as_str() |
-| sqlx.rs:124:25:124:45 | safe_query_1.as_str() |
-| sqlx.rs:125:25:125:49 | prepared_query_1.as_str() |
-| sqlx.rs:127:29:127:51 | unsafe_query_1.as_str() |
-| sqlx.rs:128:29:128:53 | prepared_query_1.as_str() |
-| sqlx.rs:131:54:131:74 | safe_query_1.as_str() |
-| sqlx.rs:132:14:132:34 | ...::_print(...) |
-| sqlx.rs:133:54:133:78 | prepared_query_1.as_str() |
-| sqlx.rs:134:14:134:34 | ...::_print(...) |
-| sqlx.rs:136:55:136:77 | unsafe_query_1.as_str() |
-| sqlx.rs:137:55:137:79 | prepared_query_1.as_str() |
-| sqlx.rs:140:54:140:74 | safe_query_1.as_str() |
-| sqlx.rs:141:14:141:34 | ...::_print(...) |
-| sqlx.rs:142:54:142:78 | prepared_query_1.as_str() |
-| sqlx.rs:143:14:143:34 | ...::_print(...) |
-| sqlx.rs:145:55:145:77 | unsafe_query_1.as_str() |
-| sqlx.rs:146:55:146:79 | prepared_query_1.as_str() |
-| sqlx.rs:149:25:149:45 | safe_query_1.as_str() |
-| sqlx.rs:150:25:150:49 | prepared_query_1.as_str() |
-| sqlx.rs:153:29:153:51 | unsafe_query_1.as_str() |
-| sqlx.rs:154:29:154:53 | prepared_query_1.as_str() |
 | sqlx.rs:172:24:172:44 | ...::from(...) |
 | sqlx.rs:173:97:173:117 | ...::from(...) |
 | sqlx.rs:174:24:174:77 | ...::from(...) |
 | sqlx.rs:175:26:175:79 | ...::from(...) |
 | sqlx.rs:176:28:176:82 | ...::from(...) |
-| sqlx.rs:179:26:179:46 | safe_query_1.as_str() |
-| sqlx.rs:181:30:181:52 | unsafe_query_1.as_str() |
-| sqlx.rs:185:25:185:45 | safe_query_1.as_str() |
-| sqlx.rs:186:25:186:49 | prepared_query_1.as_str() |
-| sqlx.rs:188:29:188:51 | unsafe_query_1.as_str() |
-| sqlx.rs:189:29:189:53 | prepared_query_1.as_str() |
-| sqlx.rs:196:14:196:43 | ...::_print(...) |
 | sqlx.rs:202:57:202:85 | ...::from(...) |
-| sqlx.rs:203:14:203:46 | ...::_print(...) |
-| sqlx.rs:205:14:205:33 | ...::_print(...) |
-| sqlx.rs:207:27:207:41 | ...::_print(...) |
-| sqlx.rs:208:28:208:43 | ...::_print(...) |
-| sqlx.rs:211:14:211:34 | ...::_print(...) |
-| sqlx.rs:213:27:213:41 | ...::_print(...) |
-| sqlx.rs:214:28:214:43 | ...::_print(...) |
-| sqlx.rs:217:14:217:36 | ...::_print(...) |
-| sqlx.rs:219:27:219:41 | ...::_print(...) |
-| sqlx.rs:220:28:220:43 | ...::_print(...) |
+multiplePathResolutions
+| mysql.rs:5:37:5:74 | Result::<...> |
+| mysql.rs:26:20:26:44 | Result::<...> |
+| mysql.rs:29:16:29:40 | Result::<...> |
+| mysql.rs:34:25:34:49 | Result::<...> |
+| mysql.rs:40:17:40:41 | Result::<...> |
+| mysql.rs:47:20:47:44 | Result::<...> |
+| mysql.rs:51:16:51:40 | Result::<...> |
+| mysql.rs:64:25:64:49 | Result::<...> |
+| mysql.rs:71:17:71:41 | Result::<...> |
+| mysql.rs:91:49:91:58 | Result::<...> |
diff --git a/rust/ql/test/query-tests/security/CWE-089/CONSISTENCY/TypeInferenceConsistency.expected b/rust/ql/test/query-tests/security/CWE-089/CONSISTENCY/TypeInferenceConsistency.expected
deleted file mode 100644
index 6a60922b6f0..00000000000
--- a/rust/ql/test/query-tests/security/CWE-089/CONSISTENCY/TypeInferenceConsistency.expected
+++ /dev/null
@@ -1,3 +0,0 @@
-nonUniqueCertainType
-| sqlx.rs:158:13:158:81 | { ... } | E |
-| sqlx.rs:160:17:160:86 | { ... } | E |
diff --git a/rust/ql/test/query-tests/security/CWE-089/Cargo.lock b/rust/ql/test/query-tests/security/CWE-089/Cargo.lock
index 2df49df403f..cd8ef4b1381 100644
--- a/rust/ql/test/query-tests/security/CWE-089/Cargo.lock
+++ b/rust/ql/test/query-tests/security/CWE-089/Cargo.lock
@@ -17,6 +17,15 @@ version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
 
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "allocator-api2"
 version = "0.2.21"
@@ -251,6 +260,21 @@ dependencies = [
  "piper",
 ]
 
+[[package]]
+name = "btoi"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9dd6407f73a9b8b6162d8a2ef999fe6afd7cc15902ebf42c5cd296addf17e0ad"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "bufstream"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40e38929add23cdf8a366df9b0e088953150724bcbe5fc330b0d8eb3b328eec8"
+
 [[package]]
 name = "bumpalo"
 version = "3.18.1"
@@ -339,6 +363,15 @@ version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
 
+[[package]]
+name = "crc32fast"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511"
+dependencies = [
+ "cfg-if",
+]
+
 [[package]]
 name = "crossbeam-queue"
 version = "0.3.12"
@@ -364,6 +397,41 @@ dependencies = [
  "typenum",
 ]
 
+[[package]]
+name = "darling"
+version = "0.20.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee"
+dependencies = [
+ "darling_core",
+ "darling_macro",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.20.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim",
+ "syn",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.20.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
+dependencies = [
+ "darling_core",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "der"
 version = "0.7.10"
@@ -375,6 +443,17 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "derive_utils"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccfae181bab5ab6c5478b2ccb69e4c68a02f8c3ec72f6616bfec9dbc599d2ee0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "digest"
 version = "0.10.7"
@@ -491,6 +570,17 @@ version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
 
+[[package]]
+name = "flate2"
+version = "1.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc5a4e564e38c699f2880d3fda590bedc2e69f3f84cd48b457bd892ce61d0aa9"
+dependencies = [
+ "crc32fast",
+ "libz-sys",
+ "miniz_oxide",
+]
+
 [[package]]
 name = "flume"
 version = "0.11.1"
@@ -1011,6 +1101,12 @@ dependencies = [
  "zerovec",
 ]
 
+[[package]]
+name = "ident_case"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+
 [[package]]
 name = "idna"
 version = "1.0.3"
@@ -1034,9 +1130,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.9.0"
+version = "2.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
+checksum = "4b0f83760fb341a774ed326568e19f5a863af4a952def8c39f9ab92fd95b88e5"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -1051,6 +1147,15 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "io-enum"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d197db2f7ebf90507296df3aebaf65d69f5dce8559d8dbd82776a6cadab61bbf"
+dependencies = [
+ "derive_utils",
+]
+
 [[package]]
 name = "io-lifetimes"
 version = "1.0.11"
@@ -1094,6 +1199,15 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "keyed_priority_queue"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ee7893dab2e44ae5f9d0173f26ff4aa327c10b01b06a72b52dd9405b628640d"
+dependencies = [
+ "indexmap",
+]
+
 [[package]]
 name = "kv-log-macro"
 version = "1.0.7"
@@ -1135,6 +1249,17 @@ dependencies = [
  "vcpkg",
 ]
 
+[[package]]
+name = "libz-sys"
+version = "1.1.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b70e7a7df205e92a1a4cd9aaae7898dac0aa555503cc0a649494d0d60e7651d"
+dependencies = [
+ "cc",
+ "pkg-config",
+ "vcpkg",
+]
+
 [[package]]
 name = "linux-raw-sys"
 version = "0.3.8"
@@ -1172,6 +1297,21 @@ dependencies = [
  "value-bag",
 ]
 
+[[package]]
+name = "lru"
+version = "0.12.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38"
+
+[[package]]
+name = "lru"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f8cc7106155f10bdf99a6f379688f543ad6596a415375b36a59a054ceda1198"
+dependencies = [
+ "hashbrown",
+]
+
 [[package]]
 name = "md-5"
 version = "0.10.6"
@@ -1201,6 +1341,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
 dependencies = [
  "adler2",
+ "simd-adler32",
 ]
 
 [[package]]
@@ -1214,6 +1355,111 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
+[[package]]
+name = "mysql"
+version = "26.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce2510a735f601bab18202b07ea0a197bd1d130d3a5ce2edf4577d225f0c3ee4"
+dependencies = [
+ "bufstream",
+ "bytes",
+ "crossbeam-queue",
+ "crossbeam-utils",
+ "flate2",
+ "io-enum",
+ "libc",
+ "lru 0.12.5",
+ "mysql_common",
+ "named_pipe",
+ "pem",
+ "percent-encoding",
+ "socket2 0.5.10",
+ "twox-hash",
+ "url",
+]
+
+[[package]]
+name = "mysql-common-derive"
+version = "0.32.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "66f62cad7623a9cb6f8f64037f0c4f69c8db8e82914334a83c9788201c2c1bfa"
+dependencies = [
+ "darling",
+ "heck",
+ "num-bigint",
+ "proc-macro-crate",
+ "proc-macro-error2",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "termcolor",
+ "thiserror",
+]
+
+[[package]]
+name = "mysql_async"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "277ce2f2459b2af4cc6d0a0b7892381f80800832f57c533f03e2845f4ea331ea"
+dependencies = [
+ "bytes",
+ "crossbeam-queue",
+ "flate2",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "keyed_priority_queue",
+ "lru 0.14.0",
+ "mysql_common",
+ "pem",
+ "percent-encoding",
+ "rand 0.9.2",
+ "serde",
+ "serde_json",
+ "socket2 0.5.10",
+ "thiserror",
+ "tokio",
+ "tokio-util",
+ "twox-hash",
+ "url",
+]
+
+[[package]]
+name = "mysql_common"
+version = "0.35.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbb9f371618ce723f095c61fbcdc36e8936956d2b62832f9c7648689b338e052"
+dependencies = [
+ "base64",
+ "bitflags 2.9.1",
+ "btoi",
+ "byteorder",
+ "bytes",
+ "crc32fast",
+ "flate2",
+ "getrandom 0.3.3",
+ "mysql-common-derive",
+ "num-bigint",
+ "num-traits",
+ "regex",
+ "saturating",
+ "serde",
+ "serde_json",
+ "sha1",
+ "sha2",
+ "thiserror",
+ "uuid",
+]
+
+[[package]]
+name = "named_pipe"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad9c443cce91fc3e12f017290db75dde490d685cdaaf508d7159d7cf41f0eb2b"
+dependencies = [
+ "winapi",
+]
+
 [[package]]
 name = "native-tls"
 version = "0.2.14"
@@ -1231,6 +1477,16 @@ dependencies = [
  "tempfile",
 ]
 
+[[package]]
+name = "num-bigint"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
+dependencies = [
+ "num-integer",
+ "num-traits",
+]
+
 [[package]]
 name = "num-bigint-dig"
 version = "0.8.4"
@@ -1243,7 +1499,7 @@ dependencies = [
  "num-integer",
  "num-iter",
  "num-traits",
- "rand",
+ "rand 0.8.5",
  "smallvec",
  "zeroize",
 ]
@@ -1366,6 +1622,16 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "pem"
+version = "3.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38af38e8470ac9dee3ce1bae1af9c1671fffc44ddfd8bd1d0a3445bf349a8ef3"
+dependencies = [
+ "base64",
+ "serde",
+]
+
 [[package]]
 name = "pem-rfc7468"
 version = "0.7.0"
@@ -1480,6 +1746,37 @@ dependencies = [
  "zerocopy",
 ]
 
+[[package]]
+name = "proc-macro-crate"
+version = "3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983"
+dependencies = [
+ "toml_edit",
+]
+
+[[package]]
+name = "proc-macro-error-attr2"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+]
+
+[[package]]
+name = "proc-macro-error2"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802"
+dependencies = [
+ "proc-macro-error-attr2",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.95"
@@ -1511,8 +1808,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
  "libc",
- "rand_chacha",
- "rand_core",
+ "rand_chacha 0.3.1",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
+dependencies = [
+ "rand_chacha 0.9.0",
+ "rand_core 0.9.3",
 ]
 
 [[package]]
@@ -1522,7 +1829,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
 dependencies = [
  "ppv-lite86",
- "rand_core",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.9.3",
 ]
 
 [[package]]
@@ -1534,6 +1851,15 @@ dependencies = [
  "getrandom 0.2.16",
 ]
 
+[[package]]
+name = "rand_core"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
+dependencies = [
+ "getrandom 0.3.3",
+]
+
 [[package]]
 name = "redox_syscall"
 version = "0.5.13"
@@ -1543,6 +1869,35 @@ dependencies = [
  "bitflags 2.9.1",
 ]
 
+[[package]]
+name = "regex"
+version = "1.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b5288124840bee7b386bc413c487869b360b2b4ec421ea56425128692f2a82c"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "833eb9ce86d40ef33cb1306d8accf7bc8ec2bfea4355cbdebb3df68b40925cad"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001"
+
 [[package]]
 name = "reqwest"
 version = "0.12.20"
@@ -1612,7 +1967,7 @@ dependencies = [
  "num-traits",
  "pkcs1",
  "pkcs8",
- "rand_core",
+ "rand_core 0.6.4",
  "signature",
  "spki",
  "subtle",
@@ -1697,6 +2052,12 @@ version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
 
+[[package]]
+name = "saturating"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ece8e78b2f38ec51c51f5d475df0a7187ba5111b2a28bdc761ee05b075d40a71"
+
 [[package]]
 name = "schannel"
 version = "0.1.27"
@@ -1737,18 +2098,28 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.219"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+dependencies = [
+ "serde_core",
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.219"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1814,9 +2185,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
 dependencies = [
  "digest",
- "rand_core",
+ "rand_core 0.6.4",
 ]
 
+[[package]]
+name = "simd-adler32"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+
 [[package]]
 name = "slab"
 version = "0.4.10"
@@ -1986,7 +2363,7 @@ dependencies = [
  "memchr",
  "once_cell",
  "percent-encoding",
- "rand",
+ "rand 0.8.5",
  "rsa",
  "serde",
  "sha1",
@@ -2024,7 +2401,7 @@ dependencies = [
  "md-5",
  "memchr",
  "once_cell",
- "rand",
+ "rand 0.8.5",
  "serde",
  "serde_json",
  "sha2",
@@ -2077,6 +2454,12 @@ dependencies = [
  "unicode-properties",
 ]
 
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
 [[package]]
 name = "subtle"
 version = "2.6.1"
@@ -2148,11 +2531,22 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
+[[package]]
+name = "termcolor"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
+dependencies = [
+ "winapi-util",
+]
+
 [[package]]
 name = "test"
 version = "0.0.1"
 dependencies = [
  "futures",
+ "mysql",
+ "mysql_async",
  "reqwest",
  "sqlx",
 ]
@@ -2250,6 +2644,36 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "toml_datetime"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2cdb639ebbc97961c51720f858597f7f24c4fc295327923af55b74c3c724533"
+dependencies = [
+ "serde_core",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.23.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6485ef6d0d9b5d0ec17244ff7eb05310113c3f316f2d14200d4de56b3cb98f8d"
+dependencies = [
+ "indexmap",
+ "toml_datetime",
+ "toml_parser",
+ "winnow",
+]
+
+[[package]]
+name = "toml_parser"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0cbe268d35bdb4bb5a56a2de88d0ad0eb70af5384a99d648cd4b3d04039800e"
+dependencies = [
+ "winnow",
+]
+
 [[package]]
 name = "tower"
 version = "0.5.2"
@@ -2333,6 +2757,12 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
+[[package]]
+name = "twox-hash"
+version = "2.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ea3136b675547379c4bd395ca6b938e5ad3c3d20fad76e7fe85f9e0d011419c"
+
 [[package]]
 name = "typenum"
 version = "1.18.0"
@@ -2389,6 +2819,16 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
 
+[[package]]
+name = "uuid"
+version = "1.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "value-bag"
 version = "1.11.1"
@@ -2550,6 +2990,15 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
+[[package]]
+name = "winapi-util"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
@@ -2739,6 +3188,15 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
+[[package]]
+name = "winnow"
+version = "0.7.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "wit-bindgen-rt"
 version = "0.39.0"
diff --git a/rust/ql/test/query-tests/security/CWE-089/SqlInjection.expected b/rust/ql/test/query-tests/security/CWE-089/SqlInjection.expected
index cc00a44d9fc..d699ca4a389 100644
--- a/rust/ql/test/query-tests/security/CWE-089/SqlInjection.expected
+++ b/rust/ql/test/query-tests/security/CWE-089/SqlInjection.expected
@@ -1,65 +1,419 @@
 #select
-| sqlx.rs:77:13:77:23 | ...::query | sqlx.rs:48:25:48:46 | ...::get | sqlx.rs:77:13:77:23 | ...::query | This query depends on a $@. | sqlx.rs:48:25:48:46 | ...::get | user-provided value |
+| mysql.rs:25:32:25:36 | query | mysql.rs:12:33:12:54 | ...::get | mysql.rs:25:32:25:36 | query | This query depends on a $@. | mysql.rs:12:33:12:54 | ...::get | user-provided value |
+| mysql.rs:26:54:26:62 | query_opt | mysql.rs:12:33:12:54 | ...::get | mysql.rs:26:54:26:62 | query_opt | This query depends on a $@. | mysql.rs:12:33:12:54 | ...::get | user-provided value |
+| mysql.rs:27:14:27:23 | query_drop | mysql.rs:12:33:12:54 | ...::get | mysql.rs:27:14:27:23 | query_drop | This query depends on a $@. | mysql.rs:12:33:12:54 | ...::get | user-provided value |
+| mysql.rs:28:27:28:37 | query_first | mysql.rs:12:33:12:54 | ...::get | mysql.rs:28:27:28:37 | query_first | This query depends on a $@. | mysql.rs:12:33:12:54 | ...::get | user-provided value |
+| mysql.rs:29:49:29:63 | query_first_opt | mysql.rs:12:33:12:54 | ...::get | mysql.rs:29:49:29:63 | query_first_opt | This query depends on a $@. | mysql.rs:12:33:12:54 | ...::get | user-provided value |
+| mysql.rs:30:22:30:31 | query_fold | mysql.rs:12:33:12:54 | ...::get | mysql.rs:30:22:30:31 | query_fold | This query depends on a $@. | mysql.rs:12:33:12:54 | ...::get | user-provided value |
+| mysql.rs:31:22:31:35 | query_fold_opt | mysql.rs:12:33:12:54 | ...::get | mysql.rs:31:22:31:35 | query_fold_opt | This query depends on a $@. | mysql.rs:12:33:12:54 | ...::get | user-provided value |
+| mysql.rs:36:22:36:31 | query_iter | mysql.rs:12:33:12:54 | ...::get | mysql.rs:36:22:36:31 | query_iter | This query depends on a $@. | mysql.rs:12:33:12:54 | ...::get | user-provided value |
+| mysql.rs:37:22:37:30 | query_map | mysql.rs:12:33:12:54 | ...::get | mysql.rs:37:22:37:30 | query_map | This query depends on a $@. | mysql.rs:12:33:12:54 | ...::get | user-provided value |
+| mysql.rs:38:22:38:34 | query_map_opt | mysql.rs:12:33:12:54 | ...::get | mysql.rs:38:22:38:34 | query_map_opt | This query depends on a $@. | mysql.rs:12:33:12:54 | ...::get | user-provided value |
+| mysql.rs:42:33:42:37 | query | mysql.rs:12:33:12:54 | ...::get | mysql.rs:42:33:42:37 | query | This query depends on a $@. | mysql.rs:12:33:12:54 | ...::get | user-provided value |
+| mysql.rs:75:26:75:29 | prep | mysql.rs:12:33:12:54 | ...::get | mysql.rs:75:26:75:29 | prep | This query depends on a $@. | mysql.rs:12:33:12:54 | ...::get | user-provided value |
+| mysql.rs:80:15:80:24 | query_drop | mysql.rs:12:33:12:54 | ...::get | mysql.rs:80:15:80:24 | query_drop | This query depends on a $@. | mysql.rs:12:33:12:54 | ...::get | user-provided value |
+| mysql.rs:110:32:110:36 | query | mysql.rs:97:33:97:54 | ...::get | mysql.rs:110:32:110:36 | query | This query depends on a $@. | mysql.rs:97:33:97:54 | ...::get | user-provided value |
+| mysql.rs:111:14:111:23 | query_drop | mysql.rs:97:33:97:54 | ...::get | mysql.rs:111:14:111:23 | query_drop | This query depends on a $@. | mysql.rs:97:33:97:54 | ...::get | user-provided value |
+| mysql.rs:112:35:112:45 | query_first | mysql.rs:97:33:97:54 | ...::get | mysql.rs:112:35:112:45 | query_first | This query depends on a $@. | mysql.rs:97:33:97:54 | ...::get | user-provided value |
+| mysql.rs:114:14:114:23 | query_fold | mysql.rs:97:33:97:54 | ...::get | mysql.rs:114:14:114:23 | query_fold | This query depends on a $@. | mysql.rs:97:33:97:54 | ...::get | user-provided value |
+| mysql.rs:116:22:116:31 | query_iter | mysql.rs:97:33:97:54 | ...::get | mysql.rs:116:22:116:31 | query_iter | This query depends on a $@. | mysql.rs:97:33:97:54 | ...::get | user-provided value |
+| mysql.rs:118:14:118:25 | query_stream | mysql.rs:97:33:97:54 | ...::get | mysql.rs:118:14:118:25 | query_stream | This query depends on a $@. | mysql.rs:97:33:97:54 | ...::get | user-provided value |
+| mysql.rs:121:14:121:22 | query_map | mysql.rs:97:33:97:54 | ...::get | mysql.rs:121:14:121:22 | query_map | This query depends on a $@. | mysql.rs:97:33:97:54 | ...::get | user-provided value |
+| mysql.rs:149:26:149:29 | prep | mysql.rs:97:33:97:54 | ...::get | mysql.rs:149:26:149:29 | prep | This query depends on a $@. | mysql.rs:97:33:97:54 | ...::get | user-provided value |
+| mysql.rs:154:15:154:24 | query_drop | mysql.rs:97:33:97:54 | ...::get | mysql.rs:154:15:154:24 | query_drop | This query depends on a $@. | mysql.rs:97:33:97:54 | ...::get | user-provided value |
 | sqlx.rs:78:13:78:23 | ...::query | sqlx.rs:47:22:47:35 | ...::args | sqlx.rs:78:13:78:23 | ...::query | This query depends on a $@. | sqlx.rs:47:22:47:35 | ...::args | user-provided value |
 | sqlx.rs:80:17:80:27 | ...::query | sqlx.rs:48:25:48:46 | ...::get | sqlx.rs:80:17:80:27 | ...::query | This query depends on a $@. | sqlx.rs:48:25:48:46 | ...::get | user-provided value |
+| sqlx.rs:81:17:81:27 | ...::query | sqlx.rs:48:25:48:46 | ...::get | sqlx.rs:81:17:81:27 | ...::query | This query depends on a $@. | sqlx.rs:48:25:48:46 | ...::get | user-provided value |
+| sqlx.rs:82:17:82:27 | ...::query | sqlx.rs:48:25:48:46 | ...::get | sqlx.rs:82:17:82:27 | ...::query | This query depends on a $@. | sqlx.rs:48:25:48:46 | ...::get | user-provided value |
+| sqlx.rs:113:17:113:29 | ...::raw_sql | sqlx.rs:100:25:100:46 | ...::get | sqlx.rs:113:17:113:29 | ...::raw_sql | This query depends on a $@. | sqlx.rs:100:25:100:46 | ...::get | user-provided value |
+| sqlx.rs:120:17:120:27 | ...::query | sqlx.rs:100:25:100:46 | ...::get | sqlx.rs:120:17:120:27 | ...::query | This query depends on a $@. | sqlx.rs:100:25:100:46 | ...::get | user-provided value |
+| sqlx.rs:127:17:127:27 | ...::query | sqlx.rs:100:25:100:46 | ...::get | sqlx.rs:127:17:127:27 | ...::query | This query depends on a $@. | sqlx.rs:100:25:100:46 | ...::get | user-provided value |
+| sqlx.rs:136:40:136:53 | ...::query_as | sqlx.rs:100:25:100:46 | ...::get | sqlx.rs:136:40:136:53 | ...::query_as | This query depends on a $@. | sqlx.rs:100:25:100:46 | ...::get | user-provided value |
+| sqlx.rs:145:40:145:53 | ...::query_as | sqlx.rs:100:25:100:46 | ...::get | sqlx.rs:145:40:145:53 | ...::query_as | This query depends on a $@. | sqlx.rs:100:25:100:46 | ...::get | user-provided value |
+| sqlx.rs:153:17:153:27 | ...::query | sqlx.rs:100:25:100:46 | ...::get | sqlx.rs:153:17:153:27 | ...::query | This query depends on a $@. | sqlx.rs:100:25:100:46 | ...::get | user-provided value |
+| sqlx.rs:188:17:188:27 | ...::query | sqlx.rs:173:25:173:46 | ...::get | sqlx.rs:188:17:188:27 | ...::query | This query depends on a $@. | sqlx.rs:173:25:173:46 | ...::get | user-provided value |
 edges
+| mysql.rs:12:13:12:29 | mut remote_string | mysql.rs:18:71:18:83 | remote_string | provenance |  |
+| mysql.rs:12:33:12:54 | ...::get | mysql.rs:12:33:12:77 | ...::get(...) [Ok] | provenance | Src:MaD:23  |
+| mysql.rs:12:33:12:77 | ...::get(...) [Ok] | mysql.rs:12:33:13:21 | ... .unwrap() | provenance | MaD:31 |
+| mysql.rs:12:33:13:21 | ... .unwrap() | mysql.rs:12:33:14:19 | ... .text() [Ok] | provenance | MaD:33 |
+| mysql.rs:12:33:14:19 | ... .text() [Ok] | mysql.rs:12:33:15:40 | ... .unwrap_or(...) | provenance | MaD:32 |
+| mysql.rs:12:33:15:40 | ... .unwrap_or(...) | mysql.rs:12:13:12:29 | mut remote_string | provenance |  |
+| mysql.rs:17:13:17:24 | unsafe_query | mysql.rs:25:38:25:49 | unsafe_query | provenance |  |
+| mysql.rs:17:13:17:24 | unsafe_query | mysql.rs:25:38:25:58 | unsafe_query.as_str() | provenance | MaD:29 |
+| mysql.rs:17:13:17:24 | unsafe_query | mysql.rs:26:64:26:75 | unsafe_query | provenance |  |
+| mysql.rs:17:13:17:24 | unsafe_query | mysql.rs:26:64:26:84 | unsafe_query.as_str() | provenance | MaD:29 |
+| mysql.rs:17:13:17:24 | unsafe_query | mysql.rs:27:25:27:36 | unsafe_query | provenance |  |
+| mysql.rs:17:13:17:24 | unsafe_query | mysql.rs:27:25:27:45 | unsafe_query.as_str() | provenance | MaD:29 |
+| mysql.rs:17:13:17:24 | unsafe_query | mysql.rs:28:39:28:50 | unsafe_query | provenance |  |
+| mysql.rs:17:13:17:24 | unsafe_query | mysql.rs:28:39:28:59 | unsafe_query.as_str() | provenance | MaD:29 |
+| mysql.rs:17:13:17:24 | unsafe_query | mysql.rs:29:65:29:76 | unsafe_query | provenance |  |
+| mysql.rs:17:13:17:24 | unsafe_query | mysql.rs:29:65:29:85 | unsafe_query.as_str() | provenance | MaD:29 |
+| mysql.rs:17:13:17:24 | unsafe_query | mysql.rs:30:33:30:44 | unsafe_query | provenance |  |
+| mysql.rs:17:13:17:24 | unsafe_query | mysql.rs:30:33:30:53 | unsafe_query.as_str() | provenance | MaD:29 |
+| mysql.rs:17:13:17:24 | unsafe_query | mysql.rs:32:13:32:24 | unsafe_query | provenance |  |
+| mysql.rs:17:13:17:24 | unsafe_query | mysql.rs:32:13:32:33 | unsafe_query.as_str() | provenance | MaD:29 |
+| mysql.rs:17:13:17:24 | unsafe_query | mysql.rs:36:33:36:44 | unsafe_query | provenance |  |
+| mysql.rs:17:13:17:24 | unsafe_query | mysql.rs:36:33:36:53 | unsafe_query.as_str() | provenance | MaD:29 |
+| mysql.rs:17:13:17:24 | unsafe_query | mysql.rs:37:32:37:43 | unsafe_query | provenance |  |
+| mysql.rs:17:13:17:24 | unsafe_query | mysql.rs:37:32:37:52 | unsafe_query.as_str() | provenance | MaD:29 |
+| mysql.rs:17:13:17:24 | unsafe_query | mysql.rs:39:13:39:24 | unsafe_query | provenance |  |
+| mysql.rs:17:13:17:24 | unsafe_query | mysql.rs:39:13:39:33 | unsafe_query.as_str() | provenance | MaD:29 |
+| mysql.rs:17:13:17:24 | unsafe_query | mysql.rs:42:39:42:50 | unsafe_query | provenance |  |
+| mysql.rs:17:13:17:24 | unsafe_query | mysql.rs:42:39:42:59 | unsafe_query.as_str() | provenance | MaD:29 |
+| mysql.rs:17:13:17:24 | unsafe_query | mysql.rs:75:31:75:42 | unsafe_query | provenance |  |
+| mysql.rs:17:13:17:24 | unsafe_query | mysql.rs:75:31:75:51 | unsafe_query.as_str() | provenance | MaD:29 |
+| mysql.rs:17:13:17:24 | unsafe_query | mysql.rs:80:26:80:37 | unsafe_query | provenance |  |
+| mysql.rs:17:13:17:24 | unsafe_query | mysql.rs:80:26:80:46 | unsafe_query.as_str() | provenance | MaD:29 |
+| mysql.rs:18:13:18:83 | ... + ... | mysql.rs:17:13:17:24 | unsafe_query | provenance |  |
+| mysql.rs:18:13:18:83 | ... + ... | mysql.rs:18:13:18:89 | ... + ... | provenance | MaD:27 |
+| mysql.rs:18:13:18:83 | ... + ... | mysql.rs:18:13:18:89 | ... + ... | provenance | MaD:28 |
+| mysql.rs:18:13:18:89 | ... + ... | mysql.rs:17:13:17:24 | unsafe_query | provenance |  |
+| mysql.rs:18:70:18:83 | &remote_string [&ref] | mysql.rs:18:13:18:83 | ... + ... | provenance | MaD:26 |
+| mysql.rs:18:71:18:83 | remote_string | mysql.rs:18:70:18:83 | &remote_string [&ref] | provenance |  |
+| mysql.rs:25:38:25:49 | unsafe_query | mysql.rs:25:38:25:58 | unsafe_query.as_str() [&ref] | provenance | MaD:29 |
+| mysql.rs:25:38:25:58 | unsafe_query.as_str() | mysql.rs:25:32:25:36 | query | provenance | MaD:1 Sink:MaD:1 |
+| mysql.rs:25:38:25:58 | unsafe_query.as_str() [&ref] | mysql.rs:25:32:25:36 | query | provenance | MaD:1 Sink:MaD:1 |
+| mysql.rs:26:64:26:75 | unsafe_query | mysql.rs:26:64:26:84 | unsafe_query.as_str() [&ref] | provenance | MaD:29 |
+| mysql.rs:26:64:26:84 | unsafe_query.as_str() | mysql.rs:26:54:26:62 | query_opt | provenance | MaD:9 Sink:MaD:9 |
+| mysql.rs:26:64:26:84 | unsafe_query.as_str() [&ref] | mysql.rs:26:54:26:62 | query_opt | provenance | MaD:9 Sink:MaD:9 |
+| mysql.rs:27:25:27:36 | unsafe_query | mysql.rs:27:25:27:45 | unsafe_query.as_str() [&ref] | provenance | MaD:29 |
+| mysql.rs:27:25:27:45 | unsafe_query.as_str() | mysql.rs:27:14:27:23 | query_drop | provenance | MaD:2 Sink:MaD:2 |
+| mysql.rs:27:25:27:45 | unsafe_query.as_str() [&ref] | mysql.rs:27:14:27:23 | query_drop | provenance | MaD:2 Sink:MaD:2 |
+| mysql.rs:28:39:28:50 | unsafe_query | mysql.rs:28:39:28:59 | unsafe_query.as_str() [&ref] | provenance | MaD:29 |
+| mysql.rs:28:39:28:59 | unsafe_query.as_str() | mysql.rs:28:27:28:37 | query_first | provenance | MaD:3 Sink:MaD:3 |
+| mysql.rs:28:39:28:59 | unsafe_query.as_str() [&ref] | mysql.rs:28:27:28:37 | query_first | provenance | MaD:3 Sink:MaD:3 |
+| mysql.rs:29:65:29:76 | unsafe_query | mysql.rs:29:65:29:85 | unsafe_query.as_str() [&ref] | provenance | MaD:29 |
+| mysql.rs:29:65:29:85 | unsafe_query.as_str() | mysql.rs:29:49:29:63 | query_first_opt | provenance | MaD:4 Sink:MaD:4 |
+| mysql.rs:29:65:29:85 | unsafe_query.as_str() [&ref] | mysql.rs:29:49:29:63 | query_first_opt | provenance | MaD:4 Sink:MaD:4 |
+| mysql.rs:30:33:30:44 | unsafe_query | mysql.rs:30:33:30:53 | unsafe_query.as_str() [&ref] | provenance | MaD:29 |
+| mysql.rs:30:33:30:53 | unsafe_query.as_str() | mysql.rs:30:22:30:31 | query_fold | provenance | MaD:5 Sink:MaD:5 |
+| mysql.rs:30:33:30:53 | unsafe_query.as_str() [&ref] | mysql.rs:30:22:30:31 | query_fold | provenance | MaD:5 Sink:MaD:5 |
+| mysql.rs:32:13:32:24 | unsafe_query | mysql.rs:32:13:32:33 | unsafe_query.as_str() [&ref] | provenance | MaD:29 |
+| mysql.rs:32:13:32:33 | unsafe_query.as_str() | mysql.rs:31:22:31:35 | query_fold_opt | provenance | MaD:6 Sink:MaD:6 |
+| mysql.rs:32:13:32:33 | unsafe_query.as_str() [&ref] | mysql.rs:31:22:31:35 | query_fold_opt | provenance | MaD:6 Sink:MaD:6 |
+| mysql.rs:36:33:36:44 | unsafe_query | mysql.rs:36:33:36:53 | unsafe_query.as_str() [&ref] | provenance | MaD:29 |
+| mysql.rs:36:33:36:53 | unsafe_query.as_str() | mysql.rs:36:22:36:31 | query_iter | provenance | MaD:17 Sink:MaD:17 |
+| mysql.rs:36:33:36:53 | unsafe_query.as_str() [&ref] | mysql.rs:36:22:36:31 | query_iter | provenance | MaD:17 Sink:MaD:17 |
+| mysql.rs:37:32:37:43 | unsafe_query | mysql.rs:37:32:37:52 | unsafe_query.as_str() [&ref] | provenance | MaD:29 |
+| mysql.rs:37:32:37:52 | unsafe_query.as_str() | mysql.rs:37:22:37:30 | query_map | provenance | MaD:7 Sink:MaD:7 |
+| mysql.rs:37:32:37:52 | unsafe_query.as_str() [&ref] | mysql.rs:37:22:37:30 | query_map | provenance | MaD:7 Sink:MaD:7 |
+| mysql.rs:39:13:39:24 | unsafe_query | mysql.rs:39:13:39:33 | unsafe_query.as_str() [&ref] | provenance | MaD:29 |
+| mysql.rs:39:13:39:33 | unsafe_query.as_str() | mysql.rs:38:22:38:34 | query_map_opt | provenance | MaD:8 Sink:MaD:8 |
+| mysql.rs:39:13:39:33 | unsafe_query.as_str() [&ref] | mysql.rs:38:22:38:34 | query_map_opt | provenance | MaD:8 Sink:MaD:8 |
+| mysql.rs:42:39:42:50 | unsafe_query | mysql.rs:42:39:42:59 | unsafe_query.as_str() [&ref] | provenance | MaD:29 |
+| mysql.rs:42:39:42:59 | unsafe_query.as_str() | mysql.rs:42:33:42:37 | query | provenance | MaD:1 Sink:MaD:1 |
+| mysql.rs:42:39:42:59 | unsafe_query.as_str() [&ref] | mysql.rs:42:33:42:37 | query | provenance | MaD:1 Sink:MaD:1 |
+| mysql.rs:75:31:75:42 | unsafe_query | mysql.rs:75:31:75:51 | unsafe_query.as_str() [&ref] | provenance | MaD:29 |
+| mysql.rs:75:31:75:51 | unsafe_query.as_str() | mysql.rs:75:26:75:29 | prep | provenance | MaD:16 Sink:MaD:16 |
+| mysql.rs:75:31:75:51 | unsafe_query.as_str() [&ref] | mysql.rs:75:26:75:29 | prep | provenance | MaD:16 Sink:MaD:16 |
+| mysql.rs:80:26:80:37 | unsafe_query | mysql.rs:80:26:80:46 | unsafe_query.as_str() [&ref] | provenance | MaD:29 |
+| mysql.rs:80:26:80:46 | unsafe_query.as_str() | mysql.rs:80:15:80:24 | query_drop | provenance | MaD:2 Sink:MaD:2 |
+| mysql.rs:80:26:80:46 | unsafe_query.as_str() [&ref] | mysql.rs:80:15:80:24 | query_drop | provenance | MaD:2 Sink:MaD:2 |
+| mysql.rs:97:13:97:29 | mut remote_string | mysql.rs:103:71:103:83 | remote_string | provenance |  |
+| mysql.rs:97:33:97:54 | ...::get | mysql.rs:97:33:97:77 | ...::get(...) [Ok] | provenance | Src:MaD:23  |
+| mysql.rs:97:33:97:77 | ...::get(...) [Ok] | mysql.rs:97:33:98:21 | ... .unwrap() | provenance | MaD:31 |
+| mysql.rs:97:33:98:21 | ... .unwrap() | mysql.rs:97:33:99:19 | ... .text() [Ok] | provenance | MaD:33 |
+| mysql.rs:97:33:99:19 | ... .text() [Ok] | mysql.rs:97:33:100:40 | ... .unwrap_or(...) | provenance | MaD:32 |
+| mysql.rs:97:33:100:40 | ... .unwrap_or(...) | mysql.rs:97:13:97:29 | mut remote_string | provenance |  |
+| mysql.rs:102:13:102:24 | unsafe_query | mysql.rs:110:38:110:49 | unsafe_query | provenance |  |
+| mysql.rs:102:13:102:24 | unsafe_query | mysql.rs:110:38:110:58 | unsafe_query.as_str() | provenance | MaD:29 |
+| mysql.rs:102:13:102:24 | unsafe_query | mysql.rs:111:25:111:36 | unsafe_query | provenance |  |
+| mysql.rs:102:13:102:24 | unsafe_query | mysql.rs:111:25:111:45 | unsafe_query.as_str() | provenance | MaD:29 |
+| mysql.rs:102:13:102:24 | unsafe_query | mysql.rs:112:47:112:58 | unsafe_query | provenance |  |
+| mysql.rs:102:13:102:24 | unsafe_query | mysql.rs:112:47:112:67 | unsafe_query.as_str() | provenance | MaD:29 |
+| mysql.rs:102:13:102:24 | unsafe_query | mysql.rs:114:25:114:36 | unsafe_query | provenance |  |
+| mysql.rs:102:13:102:24 | unsafe_query | mysql.rs:114:25:114:45 | unsafe_query.as_str() | provenance | MaD:29 |
+| mysql.rs:102:13:102:24 | unsafe_query | mysql.rs:116:33:116:44 | unsafe_query | provenance |  |
+| mysql.rs:102:13:102:24 | unsafe_query | mysql.rs:116:33:116:53 | unsafe_query.as_str() | provenance | MaD:29 |
+| mysql.rs:102:13:102:24 | unsafe_query | mysql.rs:118:40:118:51 | unsafe_query | provenance |  |
+| mysql.rs:102:13:102:24 | unsafe_query | mysql.rs:118:40:118:60 | unsafe_query.as_str() | provenance | MaD:29 |
+| mysql.rs:102:13:102:24 | unsafe_query | mysql.rs:121:24:121:35 | unsafe_query | provenance |  |
+| mysql.rs:102:13:102:24 | unsafe_query | mysql.rs:121:24:121:44 | unsafe_query.as_str() | provenance | MaD:29 |
+| mysql.rs:102:13:102:24 | unsafe_query | mysql.rs:149:31:149:42 | unsafe_query | provenance |  |
+| mysql.rs:102:13:102:24 | unsafe_query | mysql.rs:149:31:149:51 | unsafe_query.as_str() | provenance | MaD:29 |
+| mysql.rs:102:13:102:24 | unsafe_query | mysql.rs:154:26:154:37 | unsafe_query | provenance |  |
+| mysql.rs:102:13:102:24 | unsafe_query | mysql.rs:154:26:154:46 | unsafe_query.as_str() | provenance | MaD:29 |
+| mysql.rs:103:13:103:83 | ... + ... | mysql.rs:102:13:102:24 | unsafe_query | provenance |  |
+| mysql.rs:103:13:103:83 | ... + ... | mysql.rs:103:13:103:89 | ... + ... | provenance | MaD:27 |
+| mysql.rs:103:13:103:83 | ... + ... | mysql.rs:103:13:103:89 | ... + ... | provenance | MaD:28 |
+| mysql.rs:103:13:103:89 | ... + ... | mysql.rs:102:13:102:24 | unsafe_query | provenance |  |
+| mysql.rs:103:70:103:83 | &remote_string [&ref] | mysql.rs:103:13:103:83 | ... + ... | provenance | MaD:26 |
+| mysql.rs:103:71:103:83 | remote_string | mysql.rs:103:70:103:83 | &remote_string [&ref] | provenance |  |
+| mysql.rs:110:38:110:49 | unsafe_query | mysql.rs:110:38:110:58 | unsafe_query.as_str() [&ref] | provenance | MaD:29 |
+| mysql.rs:110:38:110:58 | unsafe_query.as_str() | mysql.rs:110:32:110:36 | query | provenance | MaD:10 Sink:MaD:10 |
+| mysql.rs:110:38:110:58 | unsafe_query.as_str() [&ref] | mysql.rs:110:32:110:36 | query | provenance | MaD:10 Sink:MaD:10 |
+| mysql.rs:111:25:111:36 | unsafe_query | mysql.rs:111:25:111:45 | unsafe_query.as_str() [&ref] | provenance | MaD:29 |
+| mysql.rs:111:25:111:45 | unsafe_query.as_str() | mysql.rs:111:14:111:23 | query_drop | provenance | MaD:11 Sink:MaD:11 |
+| mysql.rs:111:25:111:45 | unsafe_query.as_str() [&ref] | mysql.rs:111:14:111:23 | query_drop | provenance | MaD:11 Sink:MaD:11 |
+| mysql.rs:112:47:112:58 | unsafe_query | mysql.rs:112:47:112:67 | unsafe_query.as_str() [&ref] | provenance | MaD:29 |
+| mysql.rs:112:47:112:67 | unsafe_query.as_str() | mysql.rs:112:35:112:45 | query_first | provenance | MaD:12 Sink:MaD:12 |
+| mysql.rs:112:47:112:67 | unsafe_query.as_str() [&ref] | mysql.rs:112:35:112:45 | query_first | provenance | MaD:12 Sink:MaD:12 |
+| mysql.rs:114:25:114:36 | unsafe_query | mysql.rs:114:25:114:45 | unsafe_query.as_str() [&ref] | provenance | MaD:29 |
+| mysql.rs:114:25:114:45 | unsafe_query.as_str() | mysql.rs:114:14:114:23 | query_fold | provenance | MaD:13 Sink:MaD:13 |
+| mysql.rs:114:25:114:45 | unsafe_query.as_str() [&ref] | mysql.rs:114:14:114:23 | query_fold | provenance | MaD:13 Sink:MaD:13 |
+| mysql.rs:116:33:116:44 | unsafe_query | mysql.rs:116:33:116:53 | unsafe_query.as_str() [&ref] | provenance | MaD:29 |
+| mysql.rs:116:33:116:53 | unsafe_query.as_str() | mysql.rs:116:22:116:31 | query_iter | provenance | MaD:19 Sink:MaD:19 |
+| mysql.rs:116:33:116:53 | unsafe_query.as_str() [&ref] | mysql.rs:116:22:116:31 | query_iter | provenance | MaD:19 Sink:MaD:19 |
+| mysql.rs:118:40:118:51 | unsafe_query | mysql.rs:118:40:118:60 | unsafe_query.as_str() [&ref] | provenance | MaD:29 |
+| mysql.rs:118:40:118:60 | unsafe_query.as_str() | mysql.rs:118:14:118:25 | query_stream | provenance | MaD:15 Sink:MaD:15 |
+| mysql.rs:118:40:118:60 | unsafe_query.as_str() [&ref] | mysql.rs:118:14:118:25 | query_stream | provenance | MaD:15 Sink:MaD:15 |
+| mysql.rs:121:24:121:35 | unsafe_query | mysql.rs:121:24:121:44 | unsafe_query.as_str() [&ref] | provenance | MaD:29 |
+| mysql.rs:121:24:121:44 | unsafe_query.as_str() | mysql.rs:121:14:121:22 | query_map | provenance | MaD:14 Sink:MaD:14 |
+| mysql.rs:121:24:121:44 | unsafe_query.as_str() [&ref] | mysql.rs:121:14:121:22 | query_map | provenance | MaD:14 Sink:MaD:14 |
+| mysql.rs:149:31:149:42 | unsafe_query | mysql.rs:149:31:149:51 | unsafe_query.as_str() [&ref] | provenance | MaD:29 |
+| mysql.rs:149:31:149:51 | unsafe_query.as_str() | mysql.rs:149:26:149:29 | prep | provenance | MaD:18 Sink:MaD:18 |
+| mysql.rs:149:31:149:51 | unsafe_query.as_str() [&ref] | mysql.rs:149:26:149:29 | prep | provenance | MaD:18 Sink:MaD:18 |
+| mysql.rs:154:26:154:37 | unsafe_query | mysql.rs:154:26:154:46 | unsafe_query.as_str() [&ref] | provenance | MaD:29 |
+| mysql.rs:154:26:154:46 | unsafe_query.as_str() | mysql.rs:154:15:154:24 | query_drop | provenance | MaD:11 Sink:MaD:11 |
+| mysql.rs:154:26:154:46 | unsafe_query.as_str() [&ref] | mysql.rs:154:15:154:24 | query_drop | provenance | MaD:11 Sink:MaD:11 |
 | sqlx.rs:47:9:47:18 | arg_string | sqlx.rs:53:27:53:36 | arg_string | provenance |  |
-| sqlx.rs:47:22:47:35 | ...::args | sqlx.rs:47:22:47:37 | ...::args(...) [element] | provenance | Src:MaD:3  |
-| sqlx.rs:47:22:47:37 | ...::args(...) [element] | sqlx.rs:47:22:47:44 | ... .nth(...) [Some] | provenance | MaD:4 |
-| sqlx.rs:47:22:47:44 | ... .nth(...) [Some] | sqlx.rs:47:22:47:77 | ... .unwrap_or(...) | provenance | MaD:6 |
+| sqlx.rs:47:22:47:35 | ...::args | sqlx.rs:47:22:47:37 | ...::args(...) [element] | provenance | Src:MaD:24  |
+| sqlx.rs:47:22:47:37 | ...::args(...) [element] | sqlx.rs:47:22:47:44 | ... .nth(...) [Some] | provenance | MaD:25 |
+| sqlx.rs:47:22:47:44 | ... .nth(...) [Some] | sqlx.rs:47:22:47:77 | ... .unwrap_or(...) | provenance | MaD:30 |
 | sqlx.rs:47:22:47:77 | ... .unwrap_or(...) | sqlx.rs:47:9:47:18 | arg_string | provenance |  |
-| sqlx.rs:48:9:48:21 | remote_string | sqlx.rs:49:25:49:52 | remote_string.parse() [Ok] | provenance | MaD:10 |
-| sqlx.rs:48:9:48:21 | remote_string | sqlx.rs:49:25:49:52 | remote_string.parse() [Ok] | provenance | MaD:10 |
 | sqlx.rs:48:9:48:21 | remote_string | sqlx.rs:54:27:54:39 | remote_string | provenance |  |
-| sqlx.rs:48:25:48:46 | ...::get | sqlx.rs:48:25:48:69 | ...::get(...) [Ok] | provenance | Src:MaD:2  |
-| sqlx.rs:48:25:48:69 | ...::get(...) [Ok] | sqlx.rs:48:25:48:78 | ... .unwrap() | provenance | MaD:7 |
-| sqlx.rs:48:25:48:78 | ... .unwrap() | sqlx.rs:48:25:48:85 | ... .text() [Ok] | provenance | MaD:11 |
-| sqlx.rs:48:25:48:85 | ... .text() [Ok] | sqlx.rs:48:25:48:118 | ... .unwrap_or(...) | provenance | MaD:8 |
+| sqlx.rs:48:9:48:21 | remote_string | sqlx.rs:55:84:55:96 | remote_string | provenance |  |
+| sqlx.rs:48:9:48:21 | remote_string | sqlx.rs:59:17:59:72 | MacroExpr | provenance |  |
+| sqlx.rs:48:25:48:46 | ...::get | sqlx.rs:48:25:48:69 | ...::get(...) [Ok] | provenance | Src:MaD:23  |
+| sqlx.rs:48:25:48:69 | ...::get(...) [Ok] | sqlx.rs:48:25:48:78 | ... .unwrap() | provenance | MaD:31 |
+| sqlx.rs:48:25:48:78 | ... .unwrap() | sqlx.rs:48:25:48:85 | ... .text() [Ok] | provenance | MaD:33 |
+| sqlx.rs:48:25:48:85 | ... .text() [Ok] | sqlx.rs:48:25:48:118 | ... .unwrap_or(...) | provenance | MaD:32 |
 | sqlx.rs:48:25:48:118 | ... .unwrap_or(...) | sqlx.rs:48:9:48:21 | remote_string | provenance |  |
-| sqlx.rs:49:9:49:21 | remote_number | sqlx.rs:52:32:52:87 | MacroExpr | provenance |  |
-| sqlx.rs:49:25:49:52 | remote_string.parse() [Ok] | sqlx.rs:49:25:49:65 | ... .unwrap_or(...) | provenance | MaD:8 |
-| sqlx.rs:49:25:49:65 | ... .unwrap_or(...) | sqlx.rs:49:9:49:21 | remote_number | provenance |  |
-| sqlx.rs:52:9:52:20 | safe_query_3 | sqlx.rs:77:25:77:36 | safe_query_3 | provenance |  |
-| sqlx.rs:52:9:52:20 | safe_query_3 | sqlx.rs:77:25:77:45 | safe_query_3.as_str() | provenance | MaD:9 |
-| sqlx.rs:52:9:52:20 | safe_query_3 | sqlx.rs:77:25:77:45 | safe_query_3.as_str() | provenance | MaD:5 |
-| sqlx.rs:52:9:52:20 | safe_query_3 | sqlx.rs:77:25:77:45 | safe_query_3.as_str() | provenance | MaD:9 |
-| sqlx.rs:52:24:52:88 | res | sqlx.rs:52:32:52:87 | { ... } | provenance |  |
-| sqlx.rs:52:32:52:87 | ...::format(...) | sqlx.rs:52:24:52:88 | res | provenance |  |
-| sqlx.rs:52:32:52:87 | ...::must_use(...) | sqlx.rs:52:9:52:20 | safe_query_3 | provenance |  |
-| sqlx.rs:52:32:52:87 | MacroExpr | sqlx.rs:52:32:52:87 | ...::format(...) | provenance | MaD:12 |
-| sqlx.rs:52:32:52:87 | { ... } | sqlx.rs:52:32:52:87 | ...::must_use(...) | provenance | MaD:13 |
-| sqlx.rs:53:9:53:22 | unsafe_query_1 [&ref] | sqlx.rs:78:25:78:47 | unsafe_query_1.as_str() [&ref] | provenance | MaD:9 |
-| sqlx.rs:53:9:53:22 | unsafe_query_1 [&ref] | sqlx.rs:78:25:78:47 | unsafe_query_1.as_str() [&ref] | provenance | MaD:5 |
-| sqlx.rs:53:9:53:22 | unsafe_query_1 [&ref] | sqlx.rs:78:25:78:47 | unsafe_query_1.as_str() [&ref] | provenance | MaD:9 |
+| sqlx.rs:53:9:53:22 | unsafe_query_1 [&ref] | sqlx.rs:78:25:78:47 | unsafe_query_1.as_str() [&ref] | provenance | MaD:29 |
 | sqlx.rs:53:26:53:36 | &arg_string [&ref] | sqlx.rs:53:9:53:22 | unsafe_query_1 [&ref] | provenance |  |
 | sqlx.rs:53:27:53:36 | arg_string | sqlx.rs:53:26:53:36 | &arg_string [&ref] | provenance |  |
-| sqlx.rs:54:9:54:22 | unsafe_query_2 [&ref] | sqlx.rs:80:29:80:51 | unsafe_query_2.as_str() [&ref] | provenance | MaD:9 |
-| sqlx.rs:54:9:54:22 | unsafe_query_2 [&ref] | sqlx.rs:80:29:80:51 | unsafe_query_2.as_str() [&ref] | provenance | MaD:5 |
-| sqlx.rs:54:9:54:22 | unsafe_query_2 [&ref] | sqlx.rs:80:29:80:51 | unsafe_query_2.as_str() [&ref] | provenance | MaD:9 |
+| sqlx.rs:54:9:54:22 | unsafe_query_2 [&ref] | sqlx.rs:80:29:80:51 | unsafe_query_2.as_str() [&ref] | provenance | MaD:29 |
 | sqlx.rs:54:26:54:39 | &remote_string [&ref] | sqlx.rs:54:9:54:22 | unsafe_query_2 [&ref] | provenance |  |
 | sqlx.rs:54:27:54:39 | remote_string | sqlx.rs:54:26:54:39 | &remote_string [&ref] | provenance |  |
-| sqlx.rs:77:25:77:36 | safe_query_3 | sqlx.rs:77:25:77:45 | safe_query_3.as_str() [&ref] | provenance | MaD:9 |
-| sqlx.rs:77:25:77:36 | safe_query_3 | sqlx.rs:77:25:77:45 | safe_query_3.as_str() [&ref] | provenance | MaD:5 |
-| sqlx.rs:77:25:77:36 | safe_query_3 | sqlx.rs:77:25:77:45 | safe_query_3.as_str() [&ref] | provenance | MaD:9 |
-| sqlx.rs:77:25:77:45 | safe_query_3.as_str() | sqlx.rs:77:13:77:23 | ...::query | provenance | MaD:1 Sink:MaD:1 |
-| sqlx.rs:77:25:77:45 | safe_query_3.as_str() [&ref] | sqlx.rs:77:13:77:23 | ...::query | provenance | MaD:1 Sink:MaD:1 |
-| sqlx.rs:78:25:78:47 | unsafe_query_1.as_str() [&ref] | sqlx.rs:78:13:78:23 | ...::query | provenance | MaD:1 Sink:MaD:1 |
-| sqlx.rs:80:29:80:51 | unsafe_query_2.as_str() [&ref] | sqlx.rs:80:17:80:27 | ...::query | provenance | MaD:1 Sink:MaD:1 |
+| sqlx.rs:55:9:55:22 | unsafe_query_3 | sqlx.rs:81:29:81:42 | unsafe_query_3 | provenance |  |
+| sqlx.rs:55:9:55:22 | unsafe_query_3 | sqlx.rs:81:29:81:51 | unsafe_query_3.as_str() | provenance | MaD:29 |
+| sqlx.rs:55:26:55:96 | ... + ... | sqlx.rs:55:9:55:22 | unsafe_query_3 | provenance |  |
+| sqlx.rs:55:26:55:96 | ... + ... | sqlx.rs:55:26:55:102 | ... + ... | provenance | MaD:27 |
+| sqlx.rs:55:26:55:96 | ... + ... | sqlx.rs:55:26:55:102 | ... + ... | provenance | MaD:28 |
+| sqlx.rs:55:26:55:102 | ... + ... | sqlx.rs:55:9:55:22 | unsafe_query_3 | provenance |  |
+| sqlx.rs:55:83:55:96 | &remote_string [&ref] | sqlx.rs:55:26:55:96 | ... + ... | provenance | MaD:26 |
+| sqlx.rs:55:84:55:96 | remote_string | sqlx.rs:55:83:55:96 | &remote_string [&ref] | provenance |  |
+| sqlx.rs:56:9:56:22 | unsafe_query_4 | sqlx.rs:82:29:82:42 | unsafe_query_4 | provenance |  |
+| sqlx.rs:56:9:56:22 | unsafe_query_4 | sqlx.rs:82:29:82:51 | unsafe_query_4.as_str() | provenance | MaD:29 |
+| sqlx.rs:59:17:59:72 | ...::format(...) | sqlx.rs:59:17:59:72 | { ... } | provenance |  |
+| sqlx.rs:59:17:59:72 | ...::must_use(...) | sqlx.rs:56:9:56:22 | unsafe_query_4 | provenance |  |
+| sqlx.rs:59:17:59:72 | MacroExpr | sqlx.rs:59:17:59:72 | ...::format(...) | provenance | MaD:34 |
+| sqlx.rs:59:17:59:72 | { ... } | sqlx.rs:59:17:59:72 | ...::must_use(...) | provenance | MaD:35 |
+| sqlx.rs:78:25:78:47 | unsafe_query_1.as_str() [&ref] | sqlx.rs:78:13:78:23 | ...::query | provenance | MaD:20 Sink:MaD:20 |
+| sqlx.rs:80:29:80:51 | unsafe_query_2.as_str() [&ref] | sqlx.rs:80:17:80:27 | ...::query | provenance | MaD:20 Sink:MaD:20 |
+| sqlx.rs:81:29:81:42 | unsafe_query_3 | sqlx.rs:81:29:81:51 | unsafe_query_3.as_str() [&ref] | provenance | MaD:29 |
+| sqlx.rs:81:29:81:51 | unsafe_query_3.as_str() | sqlx.rs:81:17:81:27 | ...::query | provenance | MaD:20 Sink:MaD:20 |
+| sqlx.rs:81:29:81:51 | unsafe_query_3.as_str() [&ref] | sqlx.rs:81:17:81:27 | ...::query | provenance | MaD:20 Sink:MaD:20 |
+| sqlx.rs:82:29:82:42 | unsafe_query_4 | sqlx.rs:82:29:82:51 | unsafe_query_4.as_str() [&ref] | provenance | MaD:29 |
+| sqlx.rs:82:29:82:51 | unsafe_query_4.as_str() | sqlx.rs:82:17:82:27 | ...::query | provenance | MaD:20 Sink:MaD:20 |
+| sqlx.rs:82:29:82:51 | unsafe_query_4.as_str() [&ref] | sqlx.rs:82:17:82:27 | ...::query | provenance | MaD:20 Sink:MaD:20 |
+| sqlx.rs:100:9:100:21 | remote_string | sqlx.rs:102:84:102:96 | remote_string | provenance |  |
+| sqlx.rs:100:25:100:46 | ...::get | sqlx.rs:100:25:100:69 | ...::get(...) [Ok] | provenance | Src:MaD:23  |
+| sqlx.rs:100:25:100:69 | ...::get(...) [Ok] | sqlx.rs:100:25:100:78 | ... .unwrap() | provenance | MaD:31 |
+| sqlx.rs:100:25:100:78 | ... .unwrap() | sqlx.rs:100:25:100:85 | ... .text() [Ok] | provenance | MaD:33 |
+| sqlx.rs:100:25:100:85 | ... .text() [Ok] | sqlx.rs:100:25:100:118 | ... .unwrap_or(...) | provenance | MaD:32 |
+| sqlx.rs:100:25:100:118 | ... .unwrap_or(...) | sqlx.rs:100:9:100:21 | remote_string | provenance |  |
+| sqlx.rs:102:9:102:22 | unsafe_query_1 | sqlx.rs:113:31:113:44 | unsafe_query_1 | provenance |  |
+| sqlx.rs:102:9:102:22 | unsafe_query_1 | sqlx.rs:113:31:113:53 | unsafe_query_1.as_str() | provenance | MaD:29 |
+| sqlx.rs:102:9:102:22 | unsafe_query_1 | sqlx.rs:120:29:120:42 | unsafe_query_1 | provenance |  |
+| sqlx.rs:102:9:102:22 | unsafe_query_1 | sqlx.rs:120:29:120:51 | unsafe_query_1.as_str() | provenance | MaD:29 |
+| sqlx.rs:102:9:102:22 | unsafe_query_1 | sqlx.rs:127:29:127:42 | unsafe_query_1 | provenance |  |
+| sqlx.rs:102:9:102:22 | unsafe_query_1 | sqlx.rs:127:29:127:51 | unsafe_query_1.as_str() | provenance | MaD:29 |
+| sqlx.rs:102:9:102:22 | unsafe_query_1 | sqlx.rs:136:55:136:68 | unsafe_query_1 | provenance |  |
+| sqlx.rs:102:9:102:22 | unsafe_query_1 | sqlx.rs:136:55:136:77 | unsafe_query_1.as_str() | provenance | MaD:29 |
+| sqlx.rs:102:9:102:22 | unsafe_query_1 | sqlx.rs:145:55:145:68 | unsafe_query_1 | provenance |  |
+| sqlx.rs:102:9:102:22 | unsafe_query_1 | sqlx.rs:145:55:145:77 | unsafe_query_1.as_str() | provenance | MaD:29 |
+| sqlx.rs:102:9:102:22 | unsafe_query_1 | sqlx.rs:153:29:153:42 | unsafe_query_1 | provenance |  |
+| sqlx.rs:102:9:102:22 | unsafe_query_1 | sqlx.rs:153:29:153:51 | unsafe_query_1.as_str() | provenance | MaD:29 |
+| sqlx.rs:102:26:102:96 | ... + ... | sqlx.rs:102:9:102:22 | unsafe_query_1 | provenance |  |
+| sqlx.rs:102:26:102:96 | ... + ... | sqlx.rs:102:26:102:102 | ... + ... | provenance | MaD:27 |
+| sqlx.rs:102:26:102:96 | ... + ... | sqlx.rs:102:26:102:102 | ... + ... | provenance | MaD:28 |
+| sqlx.rs:102:26:102:102 | ... + ... | sqlx.rs:102:9:102:22 | unsafe_query_1 | provenance |  |
+| sqlx.rs:102:83:102:96 | &remote_string [&ref] | sqlx.rs:102:26:102:96 | ... + ... | provenance | MaD:26 |
+| sqlx.rs:102:84:102:96 | remote_string | sqlx.rs:102:83:102:96 | &remote_string [&ref] | provenance |  |
+| sqlx.rs:113:31:113:44 | unsafe_query_1 | sqlx.rs:113:31:113:53 | unsafe_query_1.as_str() [&ref] | provenance | MaD:29 |
+| sqlx.rs:113:31:113:53 | unsafe_query_1.as_str() | sqlx.rs:113:17:113:29 | ...::raw_sql | provenance | MaD:22 Sink:MaD:22 |
+| sqlx.rs:113:31:113:53 | unsafe_query_1.as_str() [&ref] | sqlx.rs:113:17:113:29 | ...::raw_sql | provenance | MaD:22 Sink:MaD:22 |
+| sqlx.rs:120:29:120:42 | unsafe_query_1 | sqlx.rs:120:29:120:51 | unsafe_query_1.as_str() [&ref] | provenance | MaD:29 |
+| sqlx.rs:120:29:120:51 | unsafe_query_1.as_str() | sqlx.rs:120:17:120:27 | ...::query | provenance | MaD:20 Sink:MaD:20 |
+| sqlx.rs:120:29:120:51 | unsafe_query_1.as_str() [&ref] | sqlx.rs:120:17:120:27 | ...::query | provenance | MaD:20 Sink:MaD:20 |
+| sqlx.rs:127:29:127:42 | unsafe_query_1 | sqlx.rs:127:29:127:51 | unsafe_query_1.as_str() [&ref] | provenance | MaD:29 |
+| sqlx.rs:127:29:127:51 | unsafe_query_1.as_str() | sqlx.rs:127:17:127:27 | ...::query | provenance | MaD:20 Sink:MaD:20 |
+| sqlx.rs:127:29:127:51 | unsafe_query_1.as_str() [&ref] | sqlx.rs:127:17:127:27 | ...::query | provenance | MaD:20 Sink:MaD:20 |
+| sqlx.rs:136:55:136:68 | unsafe_query_1 | sqlx.rs:136:55:136:77 | unsafe_query_1.as_str() [&ref] | provenance | MaD:29 |
+| sqlx.rs:136:55:136:77 | unsafe_query_1.as_str() | sqlx.rs:136:40:136:53 | ...::query_as | provenance | MaD:21 Sink:MaD:21 |
+| sqlx.rs:136:55:136:77 | unsafe_query_1.as_str() [&ref] | sqlx.rs:136:40:136:53 | ...::query_as | provenance | MaD:21 Sink:MaD:21 |
+| sqlx.rs:145:55:145:68 | unsafe_query_1 | sqlx.rs:145:55:145:77 | unsafe_query_1.as_str() [&ref] | provenance | MaD:29 |
+| sqlx.rs:145:55:145:77 | unsafe_query_1.as_str() | sqlx.rs:145:40:145:53 | ...::query_as | provenance | MaD:21 Sink:MaD:21 |
+| sqlx.rs:145:55:145:77 | unsafe_query_1.as_str() [&ref] | sqlx.rs:145:40:145:53 | ...::query_as | provenance | MaD:21 Sink:MaD:21 |
+| sqlx.rs:153:29:153:42 | unsafe_query_1 | sqlx.rs:153:29:153:51 | unsafe_query_1.as_str() [&ref] | provenance | MaD:29 |
+| sqlx.rs:153:29:153:51 | unsafe_query_1.as_str() | sqlx.rs:153:17:153:27 | ...::query | provenance | MaD:20 Sink:MaD:20 |
+| sqlx.rs:153:29:153:51 | unsafe_query_1.as_str() [&ref] | sqlx.rs:153:17:153:27 | ...::query | provenance | MaD:20 Sink:MaD:20 |
+| sqlx.rs:173:9:173:21 | remote_string | sqlx.rs:175:84:175:96 | remote_string | provenance |  |
+| sqlx.rs:173:25:173:46 | ...::get | sqlx.rs:173:25:173:69 | ...::get(...) [Ok] | provenance | Src:MaD:23  |
+| sqlx.rs:173:25:173:69 | ...::get(...) [Ok] | sqlx.rs:173:25:173:78 | ... .unwrap() | provenance | MaD:31 |
+| sqlx.rs:173:25:173:78 | ... .unwrap() | sqlx.rs:173:25:173:85 | ... .text() [Ok] | provenance | MaD:33 |
+| sqlx.rs:173:25:173:85 | ... .text() [Ok] | sqlx.rs:173:25:173:118 | ... .unwrap_or(...) | provenance | MaD:32 |
+| sqlx.rs:173:25:173:118 | ... .unwrap_or(...) | sqlx.rs:173:9:173:21 | remote_string | provenance |  |
+| sqlx.rs:175:9:175:22 | unsafe_query_1 | sqlx.rs:188:29:188:42 | unsafe_query_1 | provenance |  |
+| sqlx.rs:175:9:175:22 | unsafe_query_1 | sqlx.rs:188:29:188:51 | unsafe_query_1.as_str() | provenance | MaD:29 |
+| sqlx.rs:175:26:175:96 | ... + ... | sqlx.rs:175:9:175:22 | unsafe_query_1 | provenance |  |
+| sqlx.rs:175:26:175:96 | ... + ... | sqlx.rs:175:26:175:102 | ... + ... | provenance | MaD:27 |
+| sqlx.rs:175:26:175:96 | ... + ... | sqlx.rs:175:26:175:102 | ... + ... | provenance | MaD:28 |
+| sqlx.rs:175:26:175:102 | ... + ... | sqlx.rs:175:9:175:22 | unsafe_query_1 | provenance |  |
+| sqlx.rs:175:83:175:96 | &remote_string [&ref] | sqlx.rs:175:26:175:96 | ... + ... | provenance | MaD:26 |
+| sqlx.rs:175:84:175:96 | remote_string | sqlx.rs:175:83:175:96 | &remote_string [&ref] | provenance |  |
+| sqlx.rs:188:29:188:42 | unsafe_query_1 | sqlx.rs:188:29:188:51 | unsafe_query_1.as_str() [&ref] | provenance | MaD:29 |
+| sqlx.rs:188:29:188:51 | unsafe_query_1.as_str() | sqlx.rs:188:17:188:27 | ...::query | provenance | MaD:20 Sink:MaD:20 |
+| sqlx.rs:188:29:188:51 | unsafe_query_1.as_str() [&ref] | sqlx.rs:188:17:188:27 | ...::query | provenance | MaD:20 Sink:MaD:20 |
 models
-| 1 | Sink: sqlx_core::query::query; Argument[0]; sql-injection |
-| 2 | Source: reqwest::blocking::get; ReturnValue.Field[core::result::Result::Ok(0)]; remote |
-| 3 | Source: std::env::args; ReturnValue.Element; commandargs |
-| 4 | Summary: <_ as core::iter::traits::iterator::Iterator>::nth; Argument[self].Element; ReturnValue.Field[core::option::Option::Some(0)]; value |
-| 5 | Summary: <alloc::string::String>::as_str; Argument[self]; ReturnValue; value |
-| 6 | Summary: <core::option::Option>::unwrap_or; Argument[self].Field[core::option::Option::Some(0)]; ReturnValue; value |
-| 7 | Summary: <core::result::Result>::unwrap; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
-| 8 | Summary: <core::result::Result>::unwrap_or; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
-| 9 | Summary: <core::str>::as_str; Argument[self]; ReturnValue; value |
-| 10 | Summary: <core::str>::parse; Argument[self]; ReturnValue.Field[core::result::Result::Ok(0)]; taint |
-| 11 | Summary: <reqwest::blocking::response::Response>::text; Argument[self]; ReturnValue.Field[core::result::Result::Ok(0)]; taint |
-| 12 | Summary: alloc::fmt::format; Argument[0]; ReturnValue; taint |
-| 13 | Summary: core::hint::must_use; Argument[0]; ReturnValue; value |
+| 1 | Sink: <_ as mysql::conn::queryable::Queryable>::query; Argument[0]; sql-injection |
+| 2 | Sink: <_ as mysql::conn::queryable::Queryable>::query_drop; Argument[0]; sql-injection |
+| 3 | Sink: <_ as mysql::conn::queryable::Queryable>::query_first; Argument[0]; sql-injection |
+| 4 | Sink: <_ as mysql::conn::queryable::Queryable>::query_first_opt; Argument[0]; sql-injection |
+| 5 | Sink: <_ as mysql::conn::queryable::Queryable>::query_fold; Argument[0]; sql-injection |
+| 6 | Sink: <_ as mysql::conn::queryable::Queryable>::query_fold_opt; Argument[0]; sql-injection |
+| 7 | Sink: <_ as mysql::conn::queryable::Queryable>::query_map; Argument[0]; sql-injection |
+| 8 | Sink: <_ as mysql::conn::queryable::Queryable>::query_map_opt; Argument[0]; sql-injection |
+| 9 | Sink: <_ as mysql::conn::queryable::Queryable>::query_opt; Argument[0]; sql-injection |
+| 10 | Sink: <_ as mysql_async::queryable::Queryable>::query; Argument[0]; sql-injection |
+| 11 | Sink: <_ as mysql_async::queryable::Queryable>::query_drop; Argument[0]; sql-injection |
+| 12 | Sink: <_ as mysql_async::queryable::Queryable>::query_first; Argument[0]; sql-injection |
+| 13 | Sink: <_ as mysql_async::queryable::Queryable>::query_fold; Argument[0]; sql-injection |
+| 14 | Sink: <_ as mysql_async::queryable::Queryable>::query_map; Argument[0]; sql-injection |
+| 15 | Sink: <_ as mysql_async::queryable::Queryable>::query_stream; Argument[0]; sql-injection |
+| 16 | Sink: <mysql::conn::pool::PooledConn as mysql::conn::queryable::Queryable>::prep; Argument[0]; sql-injection |
+| 17 | Sink: <mysql::conn::pool::PooledConn as mysql::conn::queryable::Queryable>::query_iter; Argument[0]; sql-injection |
+| 18 | Sink: <mysql_async::conn::Conn as mysql_async::queryable::Queryable>::prep; Argument[0]; sql-injection |
+| 19 | Sink: <mysql_async::conn::Conn as mysql_async::queryable::Queryable>::query_iter; Argument[0]; sql-injection |
+| 20 | Sink: sqlx_core::query::query; Argument[0]; sql-injection |
+| 21 | Sink: sqlx_core::query_as::query_as; Argument[0]; sql-injection |
+| 22 | Sink: sqlx_core::raw_sql::raw_sql; Argument[0]; sql-injection |
+| 23 | Source: reqwest::blocking::get; ReturnValue.Field[core::result::Result::Ok(0)]; remote |
+| 24 | Source: std::env::args; ReturnValue.Element; commandargs |
+| 25 | Summary: <_ as core::iter::traits::iterator::Iterator>::nth; Argument[self].Element; ReturnValue.Field[core::option::Option::Some(0)]; value |
+| 26 | Summary: <_ as core::ops::arith::Add>::add; Argument[0].Reference; ReturnValue; taint |
+| 27 | Summary: <_ as core::ops::arith::Add>::add; Argument[self]; ReturnValue; taint |
+| 28 | Summary: <alloc::string::String as core::ops::arith::Add>::add; Argument[self]; ReturnValue; value |
+| 29 | Summary: <alloc::string::String>::as_str; Argument[self]; ReturnValue; value |
+| 30 | Summary: <core::option::Option>::unwrap_or; Argument[self].Field[core::option::Option::Some(0)]; ReturnValue; value |
+| 31 | Summary: <core::result::Result>::unwrap; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
+| 32 | Summary: <core::result::Result>::unwrap_or; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
+| 33 | Summary: <reqwest::blocking::response::Response>::text; Argument[self]; ReturnValue.Field[core::result::Result::Ok(0)]; taint |
+| 34 | Summary: alloc::fmt::format; Argument[0]; ReturnValue; taint |
+| 35 | Summary: core::hint::must_use; Argument[0]; ReturnValue; value |
 nodes
+| mysql.rs:12:13:12:29 | mut remote_string | semmle.label | mut remote_string |
+| mysql.rs:12:33:12:54 | ...::get | semmle.label | ...::get |
+| mysql.rs:12:33:12:77 | ...::get(...) [Ok] | semmle.label | ...::get(...) [Ok] |
+| mysql.rs:12:33:13:21 | ... .unwrap() | semmle.label | ... .unwrap() |
+| mysql.rs:12:33:14:19 | ... .text() [Ok] | semmle.label | ... .text() [Ok] |
+| mysql.rs:12:33:15:40 | ... .unwrap_or(...) | semmle.label | ... .unwrap_or(...) |
+| mysql.rs:17:13:17:24 | unsafe_query | semmle.label | unsafe_query |
+| mysql.rs:18:13:18:83 | ... + ... | semmle.label | ... + ... |
+| mysql.rs:18:13:18:89 | ... + ... | semmle.label | ... + ... |
+| mysql.rs:18:70:18:83 | &remote_string [&ref] | semmle.label | &remote_string [&ref] |
+| mysql.rs:18:71:18:83 | remote_string | semmle.label | remote_string |
+| mysql.rs:25:32:25:36 | query | semmle.label | query |
+| mysql.rs:25:38:25:49 | unsafe_query | semmle.label | unsafe_query |
+| mysql.rs:25:38:25:58 | unsafe_query.as_str() | semmle.label | unsafe_query.as_str() |
+| mysql.rs:25:38:25:58 | unsafe_query.as_str() [&ref] | semmle.label | unsafe_query.as_str() [&ref] |
+| mysql.rs:26:54:26:62 | query_opt | semmle.label | query_opt |
+| mysql.rs:26:64:26:75 | unsafe_query | semmle.label | unsafe_query |
+| mysql.rs:26:64:26:84 | unsafe_query.as_str() | semmle.label | unsafe_query.as_str() |
+| mysql.rs:26:64:26:84 | unsafe_query.as_str() [&ref] | semmle.label | unsafe_query.as_str() [&ref] |
+| mysql.rs:27:14:27:23 | query_drop | semmle.label | query_drop |
+| mysql.rs:27:25:27:36 | unsafe_query | semmle.label | unsafe_query |
+| mysql.rs:27:25:27:45 | unsafe_query.as_str() | semmle.label | unsafe_query.as_str() |
+| mysql.rs:27:25:27:45 | unsafe_query.as_str() [&ref] | semmle.label | unsafe_query.as_str() [&ref] |
+| mysql.rs:28:27:28:37 | query_first | semmle.label | query_first |
+| mysql.rs:28:39:28:50 | unsafe_query | semmle.label | unsafe_query |
+| mysql.rs:28:39:28:59 | unsafe_query.as_str() | semmle.label | unsafe_query.as_str() |
+| mysql.rs:28:39:28:59 | unsafe_query.as_str() [&ref] | semmle.label | unsafe_query.as_str() [&ref] |
+| mysql.rs:29:49:29:63 | query_first_opt | semmle.label | query_first_opt |
+| mysql.rs:29:65:29:76 | unsafe_query | semmle.label | unsafe_query |
+| mysql.rs:29:65:29:85 | unsafe_query.as_str() | semmle.label | unsafe_query.as_str() |
+| mysql.rs:29:65:29:85 | unsafe_query.as_str() [&ref] | semmle.label | unsafe_query.as_str() [&ref] |
+| mysql.rs:30:22:30:31 | query_fold | semmle.label | query_fold |
+| mysql.rs:30:33:30:44 | unsafe_query | semmle.label | unsafe_query |
+| mysql.rs:30:33:30:53 | unsafe_query.as_str() | semmle.label | unsafe_query.as_str() |
+| mysql.rs:30:33:30:53 | unsafe_query.as_str() [&ref] | semmle.label | unsafe_query.as_str() [&ref] |
+| mysql.rs:31:22:31:35 | query_fold_opt | semmle.label | query_fold_opt |
+| mysql.rs:32:13:32:24 | unsafe_query | semmle.label | unsafe_query |
+| mysql.rs:32:13:32:33 | unsafe_query.as_str() | semmle.label | unsafe_query.as_str() |
+| mysql.rs:32:13:32:33 | unsafe_query.as_str() [&ref] | semmle.label | unsafe_query.as_str() [&ref] |
+| mysql.rs:36:22:36:31 | query_iter | semmle.label | query_iter |
+| mysql.rs:36:33:36:44 | unsafe_query | semmle.label | unsafe_query |
+| mysql.rs:36:33:36:53 | unsafe_query.as_str() | semmle.label | unsafe_query.as_str() |
+| mysql.rs:36:33:36:53 | unsafe_query.as_str() [&ref] | semmle.label | unsafe_query.as_str() [&ref] |
+| mysql.rs:37:22:37:30 | query_map | semmle.label | query_map |
+| mysql.rs:37:32:37:43 | unsafe_query | semmle.label | unsafe_query |
+| mysql.rs:37:32:37:52 | unsafe_query.as_str() | semmle.label | unsafe_query.as_str() |
+| mysql.rs:37:32:37:52 | unsafe_query.as_str() [&ref] | semmle.label | unsafe_query.as_str() [&ref] |
+| mysql.rs:38:22:38:34 | query_map_opt | semmle.label | query_map_opt |
+| mysql.rs:39:13:39:24 | unsafe_query | semmle.label | unsafe_query |
+| mysql.rs:39:13:39:33 | unsafe_query.as_str() | semmle.label | unsafe_query.as_str() |
+| mysql.rs:39:13:39:33 | unsafe_query.as_str() [&ref] | semmle.label | unsafe_query.as_str() [&ref] |
+| mysql.rs:42:33:42:37 | query | semmle.label | query |
+| mysql.rs:42:39:42:50 | unsafe_query | semmle.label | unsafe_query |
+| mysql.rs:42:39:42:59 | unsafe_query.as_str() | semmle.label | unsafe_query.as_str() |
+| mysql.rs:42:39:42:59 | unsafe_query.as_str() [&ref] | semmle.label | unsafe_query.as_str() [&ref] |
+| mysql.rs:75:26:75:29 | prep | semmle.label | prep |
+| mysql.rs:75:31:75:42 | unsafe_query | semmle.label | unsafe_query |
+| mysql.rs:75:31:75:51 | unsafe_query.as_str() | semmle.label | unsafe_query.as_str() |
+| mysql.rs:75:31:75:51 | unsafe_query.as_str() [&ref] | semmle.label | unsafe_query.as_str() [&ref] |
+| mysql.rs:80:15:80:24 | query_drop | semmle.label | query_drop |
+| mysql.rs:80:26:80:37 | unsafe_query | semmle.label | unsafe_query |
+| mysql.rs:80:26:80:46 | unsafe_query.as_str() | semmle.label | unsafe_query.as_str() |
+| mysql.rs:80:26:80:46 | unsafe_query.as_str() [&ref] | semmle.label | unsafe_query.as_str() [&ref] |
+| mysql.rs:97:13:97:29 | mut remote_string | semmle.label | mut remote_string |
+| mysql.rs:97:33:97:54 | ...::get | semmle.label | ...::get |
+| mysql.rs:97:33:97:77 | ...::get(...) [Ok] | semmle.label | ...::get(...) [Ok] |
+| mysql.rs:97:33:98:21 | ... .unwrap() | semmle.label | ... .unwrap() |
+| mysql.rs:97:33:99:19 | ... .text() [Ok] | semmle.label | ... .text() [Ok] |
+| mysql.rs:97:33:100:40 | ... .unwrap_or(...) | semmle.label | ... .unwrap_or(...) |
+| mysql.rs:102:13:102:24 | unsafe_query | semmle.label | unsafe_query |
+| mysql.rs:103:13:103:83 | ... + ... | semmle.label | ... + ... |
+| mysql.rs:103:13:103:89 | ... + ... | semmle.label | ... + ... |
+| mysql.rs:103:70:103:83 | &remote_string [&ref] | semmle.label | &remote_string [&ref] |
+| mysql.rs:103:71:103:83 | remote_string | semmle.label | remote_string |
+| mysql.rs:110:32:110:36 | query | semmle.label | query |
+| mysql.rs:110:38:110:49 | unsafe_query | semmle.label | unsafe_query |
+| mysql.rs:110:38:110:58 | unsafe_query.as_str() | semmle.label | unsafe_query.as_str() |
+| mysql.rs:110:38:110:58 | unsafe_query.as_str() [&ref] | semmle.label | unsafe_query.as_str() [&ref] |
+| mysql.rs:111:14:111:23 | query_drop | semmle.label | query_drop |
+| mysql.rs:111:25:111:36 | unsafe_query | semmle.label | unsafe_query |
+| mysql.rs:111:25:111:45 | unsafe_query.as_str() | semmle.label | unsafe_query.as_str() |
+| mysql.rs:111:25:111:45 | unsafe_query.as_str() [&ref] | semmle.label | unsafe_query.as_str() [&ref] |
+| mysql.rs:112:35:112:45 | query_first | semmle.label | query_first |
+| mysql.rs:112:47:112:58 | unsafe_query | semmle.label | unsafe_query |
+| mysql.rs:112:47:112:67 | unsafe_query.as_str() | semmle.label | unsafe_query.as_str() |
+| mysql.rs:112:47:112:67 | unsafe_query.as_str() [&ref] | semmle.label | unsafe_query.as_str() [&ref] |
+| mysql.rs:114:14:114:23 | query_fold | semmle.label | query_fold |
+| mysql.rs:114:25:114:36 | unsafe_query | semmle.label | unsafe_query |
+| mysql.rs:114:25:114:45 | unsafe_query.as_str() | semmle.label | unsafe_query.as_str() |
+| mysql.rs:114:25:114:45 | unsafe_query.as_str() [&ref] | semmle.label | unsafe_query.as_str() [&ref] |
+| mysql.rs:116:22:116:31 | query_iter | semmle.label | query_iter |
+| mysql.rs:116:33:116:44 | unsafe_query | semmle.label | unsafe_query |
+| mysql.rs:116:33:116:53 | unsafe_query.as_str() | semmle.label | unsafe_query.as_str() |
+| mysql.rs:116:33:116:53 | unsafe_query.as_str() [&ref] | semmle.label | unsafe_query.as_str() [&ref] |
+| mysql.rs:118:14:118:25 | query_stream | semmle.label | query_stream |
+| mysql.rs:118:40:118:51 | unsafe_query | semmle.label | unsafe_query |
+| mysql.rs:118:40:118:60 | unsafe_query.as_str() | semmle.label | unsafe_query.as_str() |
+| mysql.rs:118:40:118:60 | unsafe_query.as_str() [&ref] | semmle.label | unsafe_query.as_str() [&ref] |
+| mysql.rs:121:14:121:22 | query_map | semmle.label | query_map |
+| mysql.rs:121:24:121:35 | unsafe_query | semmle.label | unsafe_query |
+| mysql.rs:121:24:121:44 | unsafe_query.as_str() | semmle.label | unsafe_query.as_str() |
+| mysql.rs:121:24:121:44 | unsafe_query.as_str() [&ref] | semmle.label | unsafe_query.as_str() [&ref] |
+| mysql.rs:149:26:149:29 | prep | semmle.label | prep |
+| mysql.rs:149:31:149:42 | unsafe_query | semmle.label | unsafe_query |
+| mysql.rs:149:31:149:51 | unsafe_query.as_str() | semmle.label | unsafe_query.as_str() |
+| mysql.rs:149:31:149:51 | unsafe_query.as_str() [&ref] | semmle.label | unsafe_query.as_str() [&ref] |
+| mysql.rs:154:15:154:24 | query_drop | semmle.label | query_drop |
+| mysql.rs:154:26:154:37 | unsafe_query | semmle.label | unsafe_query |
+| mysql.rs:154:26:154:46 | unsafe_query.as_str() | semmle.label | unsafe_query.as_str() |
+| mysql.rs:154:26:154:46 | unsafe_query.as_str() [&ref] | semmle.label | unsafe_query.as_str() [&ref] |
 | sqlx.rs:47:9:47:18 | arg_string | semmle.label | arg_string |
 | sqlx.rs:47:22:47:35 | ...::args | semmle.label | ...::args |
 | sqlx.rs:47:22:47:37 | ...::args(...) [element] | semmle.label | ...::args(...) [element] |
@@ -71,27 +425,82 @@ nodes
 | sqlx.rs:48:25:48:78 | ... .unwrap() | semmle.label | ... .unwrap() |
 | sqlx.rs:48:25:48:85 | ... .text() [Ok] | semmle.label | ... .text() [Ok] |
 | sqlx.rs:48:25:48:118 | ... .unwrap_or(...) | semmle.label | ... .unwrap_or(...) |
-| sqlx.rs:49:9:49:21 | remote_number | semmle.label | remote_number |
-| sqlx.rs:49:25:49:52 | remote_string.parse() [Ok] | semmle.label | remote_string.parse() [Ok] |
-| sqlx.rs:49:25:49:65 | ... .unwrap_or(...) | semmle.label | ... .unwrap_or(...) |
-| sqlx.rs:52:9:52:20 | safe_query_3 | semmle.label | safe_query_3 |
-| sqlx.rs:52:24:52:88 | res | semmle.label | res |
-| sqlx.rs:52:32:52:87 | ...::format(...) | semmle.label | ...::format(...) |
-| sqlx.rs:52:32:52:87 | ...::must_use(...) | semmle.label | ...::must_use(...) |
-| sqlx.rs:52:32:52:87 | MacroExpr | semmle.label | MacroExpr |
-| sqlx.rs:52:32:52:87 | { ... } | semmle.label | { ... } |
 | sqlx.rs:53:9:53:22 | unsafe_query_1 [&ref] | semmle.label | unsafe_query_1 [&ref] |
 | sqlx.rs:53:26:53:36 | &arg_string [&ref] | semmle.label | &arg_string [&ref] |
 | sqlx.rs:53:27:53:36 | arg_string | semmle.label | arg_string |
 | sqlx.rs:54:9:54:22 | unsafe_query_2 [&ref] | semmle.label | unsafe_query_2 [&ref] |
 | sqlx.rs:54:26:54:39 | &remote_string [&ref] | semmle.label | &remote_string [&ref] |
 | sqlx.rs:54:27:54:39 | remote_string | semmle.label | remote_string |
-| sqlx.rs:77:13:77:23 | ...::query | semmle.label | ...::query |
-| sqlx.rs:77:25:77:36 | safe_query_3 | semmle.label | safe_query_3 |
-| sqlx.rs:77:25:77:45 | safe_query_3.as_str() | semmle.label | safe_query_3.as_str() |
-| sqlx.rs:77:25:77:45 | safe_query_3.as_str() [&ref] | semmle.label | safe_query_3.as_str() [&ref] |
+| sqlx.rs:55:9:55:22 | unsafe_query_3 | semmle.label | unsafe_query_3 |
+| sqlx.rs:55:26:55:96 | ... + ... | semmle.label | ... + ... |
+| sqlx.rs:55:26:55:102 | ... + ... | semmle.label | ... + ... |
+| sqlx.rs:55:83:55:96 | &remote_string [&ref] | semmle.label | &remote_string [&ref] |
+| sqlx.rs:55:84:55:96 | remote_string | semmle.label | remote_string |
+| sqlx.rs:56:9:56:22 | unsafe_query_4 | semmle.label | unsafe_query_4 |
+| sqlx.rs:59:17:59:72 | ...::format(...) | semmle.label | ...::format(...) |
+| sqlx.rs:59:17:59:72 | ...::must_use(...) | semmle.label | ...::must_use(...) |
+| sqlx.rs:59:17:59:72 | MacroExpr | semmle.label | MacroExpr |
+| sqlx.rs:59:17:59:72 | { ... } | semmle.label | { ... } |
 | sqlx.rs:78:13:78:23 | ...::query | semmle.label | ...::query |
 | sqlx.rs:78:25:78:47 | unsafe_query_1.as_str() [&ref] | semmle.label | unsafe_query_1.as_str() [&ref] |
 | sqlx.rs:80:17:80:27 | ...::query | semmle.label | ...::query |
 | sqlx.rs:80:29:80:51 | unsafe_query_2.as_str() [&ref] | semmle.label | unsafe_query_2.as_str() [&ref] |
+| sqlx.rs:81:17:81:27 | ...::query | semmle.label | ...::query |
+| sqlx.rs:81:29:81:42 | unsafe_query_3 | semmle.label | unsafe_query_3 |
+| sqlx.rs:81:29:81:51 | unsafe_query_3.as_str() | semmle.label | unsafe_query_3.as_str() |
+| sqlx.rs:81:29:81:51 | unsafe_query_3.as_str() [&ref] | semmle.label | unsafe_query_3.as_str() [&ref] |
+| sqlx.rs:82:17:82:27 | ...::query | semmle.label | ...::query |
+| sqlx.rs:82:29:82:42 | unsafe_query_4 | semmle.label | unsafe_query_4 |
+| sqlx.rs:82:29:82:51 | unsafe_query_4.as_str() | semmle.label | unsafe_query_4.as_str() |
+| sqlx.rs:82:29:82:51 | unsafe_query_4.as_str() [&ref] | semmle.label | unsafe_query_4.as_str() [&ref] |
+| sqlx.rs:100:9:100:21 | remote_string | semmle.label | remote_string |
+| sqlx.rs:100:25:100:46 | ...::get | semmle.label | ...::get |
+| sqlx.rs:100:25:100:69 | ...::get(...) [Ok] | semmle.label | ...::get(...) [Ok] |
+| sqlx.rs:100:25:100:78 | ... .unwrap() | semmle.label | ... .unwrap() |
+| sqlx.rs:100:25:100:85 | ... .text() [Ok] | semmle.label | ... .text() [Ok] |
+| sqlx.rs:100:25:100:118 | ... .unwrap_or(...) | semmle.label | ... .unwrap_or(...) |
+| sqlx.rs:102:9:102:22 | unsafe_query_1 | semmle.label | unsafe_query_1 |
+| sqlx.rs:102:26:102:96 | ... + ... | semmle.label | ... + ... |
+| sqlx.rs:102:26:102:102 | ... + ... | semmle.label | ... + ... |
+| sqlx.rs:102:83:102:96 | &remote_string [&ref] | semmle.label | &remote_string [&ref] |
+| sqlx.rs:102:84:102:96 | remote_string | semmle.label | remote_string |
+| sqlx.rs:113:17:113:29 | ...::raw_sql | semmle.label | ...::raw_sql |
+| sqlx.rs:113:31:113:44 | unsafe_query_1 | semmle.label | unsafe_query_1 |
+| sqlx.rs:113:31:113:53 | unsafe_query_1.as_str() | semmle.label | unsafe_query_1.as_str() |
+| sqlx.rs:113:31:113:53 | unsafe_query_1.as_str() [&ref] | semmle.label | unsafe_query_1.as_str() [&ref] |
+| sqlx.rs:120:17:120:27 | ...::query | semmle.label | ...::query |
+| sqlx.rs:120:29:120:42 | unsafe_query_1 | semmle.label | unsafe_query_1 |
+| sqlx.rs:120:29:120:51 | unsafe_query_1.as_str() | semmle.label | unsafe_query_1.as_str() |
+| sqlx.rs:120:29:120:51 | unsafe_query_1.as_str() [&ref] | semmle.label | unsafe_query_1.as_str() [&ref] |
+| sqlx.rs:127:17:127:27 | ...::query | semmle.label | ...::query |
+| sqlx.rs:127:29:127:42 | unsafe_query_1 | semmle.label | unsafe_query_1 |
+| sqlx.rs:127:29:127:51 | unsafe_query_1.as_str() | semmle.label | unsafe_query_1.as_str() |
+| sqlx.rs:127:29:127:51 | unsafe_query_1.as_str() [&ref] | semmle.label | unsafe_query_1.as_str() [&ref] |
+| sqlx.rs:136:40:136:53 | ...::query_as | semmle.label | ...::query_as |
+| sqlx.rs:136:55:136:68 | unsafe_query_1 | semmle.label | unsafe_query_1 |
+| sqlx.rs:136:55:136:77 | unsafe_query_1.as_str() | semmle.label | unsafe_query_1.as_str() |
+| sqlx.rs:136:55:136:77 | unsafe_query_1.as_str() [&ref] | semmle.label | unsafe_query_1.as_str() [&ref] |
+| sqlx.rs:145:40:145:53 | ...::query_as | semmle.label | ...::query_as |
+| sqlx.rs:145:55:145:68 | unsafe_query_1 | semmle.label | unsafe_query_1 |
+| sqlx.rs:145:55:145:77 | unsafe_query_1.as_str() | semmle.label | unsafe_query_1.as_str() |
+| sqlx.rs:145:55:145:77 | unsafe_query_1.as_str() [&ref] | semmle.label | unsafe_query_1.as_str() [&ref] |
+| sqlx.rs:153:17:153:27 | ...::query | semmle.label | ...::query |
+| sqlx.rs:153:29:153:42 | unsafe_query_1 | semmle.label | unsafe_query_1 |
+| sqlx.rs:153:29:153:51 | unsafe_query_1.as_str() | semmle.label | unsafe_query_1.as_str() |
+| sqlx.rs:153:29:153:51 | unsafe_query_1.as_str() [&ref] | semmle.label | unsafe_query_1.as_str() [&ref] |
+| sqlx.rs:173:9:173:21 | remote_string | semmle.label | remote_string |
+| sqlx.rs:173:25:173:46 | ...::get | semmle.label | ...::get |
+| sqlx.rs:173:25:173:69 | ...::get(...) [Ok] | semmle.label | ...::get(...) [Ok] |
+| sqlx.rs:173:25:173:78 | ... .unwrap() | semmle.label | ... .unwrap() |
+| sqlx.rs:173:25:173:85 | ... .text() [Ok] | semmle.label | ... .text() [Ok] |
+| sqlx.rs:173:25:173:118 | ... .unwrap_or(...) | semmle.label | ... .unwrap_or(...) |
+| sqlx.rs:175:9:175:22 | unsafe_query_1 | semmle.label | unsafe_query_1 |
+| sqlx.rs:175:26:175:96 | ... + ... | semmle.label | ... + ... |
+| sqlx.rs:175:26:175:102 | ... + ... | semmle.label | ... + ... |
+| sqlx.rs:175:83:175:96 | &remote_string [&ref] | semmle.label | &remote_string [&ref] |
+| sqlx.rs:175:84:175:96 | remote_string | semmle.label | remote_string |
+| sqlx.rs:188:17:188:27 | ...::query | semmle.label | ...::query |
+| sqlx.rs:188:29:188:42 | unsafe_query_1 | semmle.label | unsafe_query_1 |
+| sqlx.rs:188:29:188:51 | unsafe_query_1.as_str() | semmle.label | unsafe_query_1.as_str() |
+| sqlx.rs:188:29:188:51 | unsafe_query_1.as_str() [&ref] | semmle.label | unsafe_query_1.as_str() [&ref] |
 subpaths
diff --git a/rust/ql/test/query-tests/security/CWE-089/mysql.rs b/rust/ql/test/query-tests/security/CWE-089/mysql.rs
new file mode 100644
index 00000000000..71ee265e8ba
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-089/mysql.rs
@@ -0,0 +1,173 @@
+mod sync_test {
+    use mysql::prelude::*;
+    use mysql::*;
+
+    pub fn test_mysql(url: &str) -> Result<(), Box<dyn std::error::Error>> {
+        // connect through a MySQL connection pool
+        let mut pool = Pool::new("")?; // (this test is not runnable)
+        let mut conn: PooledConn = pool.get_conn()?;
+        let mut conn2: Conn = pool.get_conn()?.unwrap();
+
+        // construct queries
+        let mut remote_string = reqwest::blocking::get("http://example.com/") // $ Source=remote10
+            .unwrap()
+            .text()
+            .unwrap_or(String::from(""));
+        let safe_query = String::from("SELECT * FROM people WHERE firstname='Alice'");
+        let unsafe_query =
+            String::from("SELECT * FROM people WHERE firstname='") + &remote_string + "'";
+        let prepared_query = String::from("SELECT * FROM people WHERE firstname=?"); // (prepared arguments are safe)
+
+        // direct execution (safe)
+        let _: Vec<i64> = conn.query(safe_query.as_str())?; // $ sql-sink
+
+        // direct execution (unsafe)
+        let _: Vec<i64> = conn.query(unsafe_query.as_str())?; // $ sql-sink Alert[rust/sql-injection]=remote10
+        let _: Vec<Result<i64, FromRowError>> = conn.query_opt(unsafe_query.as_str())?; // $ sql-sink Alert[rust/sql-injection]=remote10
+        conn.query_drop(unsafe_query.as_str()); // $ sql-sink Alert[rust/sql-injection]=remote10
+        let _: i64 = conn.query_first(unsafe_query.as_str())?.unwrap(); // $ sql-sink Alert[rust/sql-injection]=remote10
+        let _: Result<i64, FromRowError> = conn.query_first_opt(unsafe_query.as_str())?.unwrap(); // $ sql-sink Alert[rust/sql-injection]=remote10
+        let _ = conn.query_fold(unsafe_query.as_str(), 0, |_: i64, _: i64| -> i64 { 0 })?; // $ sql-sink Alert[rust/sql-injection]=remote10
+        let _ = conn.query_fold_opt( // $ sql-sink Alert[rust/sql-injection]=remote10
+            unsafe_query.as_str(),
+            0,
+            |_: i64, _: Result<i64, FromRowError>| -> i64 { 0 },
+        )?;
+        let _ = conn.query_iter(unsafe_query.as_str())?; // $ sql-sink Alert[rust/sql-injection]=remote10
+        let _ = conn.query_map(unsafe_query.as_str(), |_: i64| -> () {})?; // $ sql-sink Alert[rust/sql-injection]=remote10
+        let _ = conn.query_map_opt( // $ sql-sink Alert[rust/sql-injection]=remote10
+            unsafe_query.as_str(),
+            |_: Result<i64, FromRowError>| -> () {},
+        )?;
+        let _: Vec<i64> = conn2.query(unsafe_query.as_str())?; // $ sql-sink Alert[rust/sql-injection]=remote10
+
+        // prepared queries (safe)
+        let stmt = conn.prep(prepared_query.as_str())?; // $ sql-sink
+        let _: Vec<i64> = conn.exec(&stmt, (remote_string.as_str(),))?;
+        let _: Vec<Result<i64, FromRowError>> = conn.exec_opt(&stmt, (remote_string.as_str(),))?;
+        let _ = conn.exec_batch(&stmt, vec![(remote_string.as_str(),)])?;
+        conn.exec_drop(&stmt, (&remote_string.as_str(),));
+        let _: i64 = conn.exec_first(&stmt, (remote_string.as_str(),))?.unwrap();
+        let _: Result<i64, FromRowError> = conn
+            .exec_first_opt(&stmt, (remote_string.as_str(),))?
+            .unwrap();
+        let _ = conn.exec_fold(
+            &stmt,
+            (remote_string.as_str(),),
+            0,
+            |_: i64, _: i64| -> i64 { 0 },
+        )?;
+        let _ = conn.exec_fold_opt(
+            &stmt,
+            (remote_string.as_str(),),
+            0,
+            |_: i64, _: Result<i64, FromRowError>| -> i64 { 0 },
+        )?;
+        let _ = conn.exec_iter(&stmt, (remote_string.as_str(),))?;
+        let _ = conn.exec_map(&stmt, (remote_string.as_str(),), |_: i64| -> () {})?;
+        let _ = conn.exec_map_opt(
+            &stmt,
+            (remote_string.as_str(),),
+            |_: Result<i64, FromRowError>| -> () {},
+        )?;
+
+        // prepared queries (unsafe use)
+        let stmt2 = conn.prep(unsafe_query.as_str())?; // $ sql-sink Alert[rust/sql-injection]=remote10
+        // ...
+
+        // transactions
+        let mut trans = conn.start_transaction(TxOpts::default())?;
+        trans.query_drop(unsafe_query.as_str()); // $ sql-sink Alert[rust/sql-injection]=remote10
+        trans.commit()?;
+
+        Ok(())
+    }
+}
+
+mod async_test {
+    use mysql_async::prelude::*;
+    use mysql_async::*;
+
+    pub async fn test_mysql_async(url: &str) -> Result<()> {
+        // connect through a MySQL connection pool
+        let mut pool = Pool::new(""); // (this test is not runnable)
+        let mut conn = pool.get_conn().await?;
+
+        // construct queries
+        let mut remote_string = reqwest::blocking::get("http://example.com/") // $ Source=remote11
+            .unwrap()
+            .text()
+            .unwrap_or(String::from(""));
+        let safe_query = String::from("SELECT * FROM people WHERE firstname='Alice'");
+        let unsafe_query =
+            String::from("SELECT * FROM people WHERE firstname='") + &remote_string + "'";
+        let prepared_query = String::from("SELECT * FROM people WHERE firstname=?"); // (prepared arguments are safe)
+
+        // direct execution (safe)
+        let _: Vec<i64> = conn.query(safe_query.as_str()).await?; // $ sql-sink
+
+        // direct execution (unsafe)
+        let _: Vec<i64> = conn.query(unsafe_query.as_str()).await?; // $ sql-sink Alert[rust/sql-injection]=remote11
+        conn.query_drop(unsafe_query.as_str()); // $ sql-sink Alert[rust/sql-injection]=remote11
+        let _: Option<i64> = conn.query_first(unsafe_query.as_str()).await?; // $ sql-sink Alert[rust/sql-injection]=remote11
+        let _ = conn
+            .query_fold(unsafe_query.as_str(), 0, |_: i64, _: i64| -> i64 { 0 }) // $ sql-sink Alert[rust/sql-injection]=remote11
+            .await?;
+        let _ = conn.query_iter(unsafe_query.as_str()).await?; // $ sql-sink Alert[rust/sql-injection]=remote11
+        let _ = conn
+            .query_stream::<i64, &str>(unsafe_query.as_str()) // $ sql-sink Alert[rust/sql-injection]=remote11
+            .await?;
+        let _ = conn
+            .query_map(unsafe_query.as_str(), |_: i64| -> () {}) // $ sql-sink Alert[rust/sql-injection]=remote11
+            .await?;
+
+        // prepared queries (safe)
+        let stmt = conn.prep(prepared_query.as_str()).await?; // $ sql-sink
+        let _: Vec<i64> = conn.exec(&stmt, (remote_string.as_str(),)).await?;
+        let _ = conn
+            .exec_batch(&stmt, vec![(remote_string.as_str(),)])
+            .await?;
+        conn.exec_drop(&stmt, (&remote_string.as_str(),));
+        let _: Option<i64> = conn.exec_first(&stmt, (remote_string.as_str(),)).await?;
+        let _ = conn
+            .exec_fold(
+                &stmt,
+                (remote_string.as_str(),),
+                0,
+                |_: i64, _: i64| -> i64 { 0 },
+            )
+            .await?;
+        let _ = conn.exec_iter(&stmt, (remote_string.as_str(),)).await?;
+        let _ = conn
+            .exec_stream::<i64, &Statement, (&str,)>(&stmt, (remote_string.as_str(),))
+            .await?;
+        let _ = conn
+            .exec_map(&stmt, (remote_string.as_str(),), |_: i64| -> () {})
+            .await?;
+
+        // prepared queries (unsafe use)
+        let stmt2 = conn.prep(unsafe_query.as_str()).await?; // $ sql-sink Alert[rust/sql-injection]=remote11
+        // ...
+
+        // transactions
+        let mut trans = conn.start_transaction(TxOpts::default()).await?;
+        trans.query_drop(unsafe_query.as_str()); // $ sql-sink Alert[rust/sql-injection]=remote11
+        trans.commit().await?;
+
+        Ok(())
+    }
+}
+
+fn main() {
+    println!("test_mysql...");
+    match sync_test::test_mysql("") {
+        Ok(_) => println!("  successful!"),
+        Err(e) => println!("  error: {}", e),
+    }
+
+    println!("test_mysql_async...");
+    match futures::executor::block_on(async_test::test_mysql_async("")) {
+        Ok(_) => println!("  successful!"),
+        Err(e) => println!("  error: {}", e),
+    }
+}
diff --git a/rust/ql/test/query-tests/security/CWE-089/options.yml b/rust/ql/test/query-tests/security/CWE-089/options.yml
index 24744b7dfb4..1febc233696 100644
--- a/rust/ql/test/query-tests/security/CWE-089/options.yml
+++ b/rust/ql/test/query-tests/security/CWE-089/options.yml
@@ -3,3 +3,5 @@ qltest_dependencies:
     - reqwest = { version = "0.12.9", features = ["blocking"] }
     - sqlx = { version = "0.8", features = ["mysql", "sqlite", "postgres", "runtime-async-std", "tls-native-tls"] }
     - futures = { version = "0.3" }
+    - mysql = { version = "26.0.1" }
+    - mysql_async = { version = "0.36.1" }
diff --git a/rust/ql/test/query-tests/security/CWE-089/sqlx.rs b/rust/ql/test/query-tests/security/CWE-089/sqlx.rs
index 8e1afa9f0e8..915625f7634 100644
--- a/rust/ql/test/query-tests/security/CWE-089/sqlx.rs
+++ b/rust/ql/test/query-tests/security/CWE-089/sqlx.rs
@@ -74,12 +74,12 @@ async fn test_sqlx_mysql(url: &str, enable_remote: bool) -> Result<(), sqlx::Err
     // prepared queries
     let _ = sqlx::query(safe_query_1.as_str()).execute(&pool).await?; // $ sql-sink
     let _ = sqlx::query(safe_query_2.as_str()).execute(&pool).await?; // $ sql-sink
-    let _ = sqlx::query(safe_query_3.as_str()).execute(&pool).await?; // $ sql-sink $ SPURIOUS: Alert[rust/sql-injection]=remote1
+    let _ = sqlx::query(safe_query_3.as_str()).execute(&pool).await?; // $ sql-sink
     let _ = sqlx::query(unsafe_query_1.as_str()).execute(&pool).await?; // $ sql-sink Alert[rust/sql-injection]=args1
     if enable_remote {
         let _ = sqlx::query(unsafe_query_2.as_str()).execute(&pool).await?; // $ sql-sink Alert[rust/sql-injection]=remote1
-        let _ = sqlx::query(unsafe_query_3.as_str()).execute(&pool).await?; // $ sql-sink MISSING: Alert[rust/sql-injection]=remote1
-        let _ = sqlx::query(unsafe_query_4.as_str()).execute(&pool).await?; // $ sql-sink MISSING: Alert[rust/sql-injection]=remote1
+        let _ = sqlx::query(unsafe_query_3.as_str()).execute(&pool).await?; // $ sql-sink Alert[rust/sql-injection]=remote1
+        let _ = sqlx::query(unsafe_query_4.as_str()).execute(&pool).await?; // $ sql-sink Alert[rust/sql-injection]=remote1
     }
     let _ = sqlx::query(prepared_query_1.as_str()).bind(const_string).execute(&pool).await?; // $ sql-sink
     let _ = sqlx::query(prepared_query_1.as_str()).bind(arg_string).execute(&pool).await?; // $ sql-sink
@@ -97,7 +97,7 @@ async fn test_sqlx_sqlite(url: &str, enable_remote: bool) -> Result<(), sqlx::Er
 
     // construct queries
     let const_string = String::from("Alice");
-    let remote_string = reqwest::blocking::get("http://example.com/").unwrap().text().unwrap_or(String::from("Alice")); // $ MISSING: Source=remote2
+    let remote_string = reqwest::blocking::get("http://example.com/").unwrap().text().unwrap_or(String::from("Alice")); // $ Source=remote2
     let safe_query_1 = String::from("SELECT * FROM people WHERE firstname='") + &const_string + "'";
     let unsafe_query_1 = String::from("SELECT * FROM people WHERE firstname='") + &remote_string + "'";
     let prepared_query_1 = String::from("SELECT * FROM people WHERE firstname=?"); // (prepared arguments are safe)
@@ -110,21 +110,21 @@ async fn test_sqlx_sqlite(url: &str, enable_remote: bool) -> Result<(), sqlx::Er
     // ...
     let _ = sqlx::raw_sql(safe_query_1.as_str()).execute(&mut conn).await?; // $ sql-sink
     if enable_remote {
-        let _ = sqlx::raw_sql(unsafe_query_1.as_str()).execute(&mut conn).await?; // $ sql-sink MISSING: Alert[rust/sql-injection]=remote2
+        let _ = sqlx::raw_sql(unsafe_query_1.as_str()).execute(&mut conn).await?; // $ sql-sink Alert[rust/sql-injection]=remote2
     }
 
     // prepared queries (with extra variants)
     let _ = sqlx::query(safe_query_1.as_str()).execute(&mut conn).await?; // $ sql-sink
     let _ = sqlx::query(prepared_query_1.as_str()).bind(&const_string).execute(&mut conn).await?; // $ sql-sink
     if enable_remote {
-        let _ = sqlx::query(unsafe_query_1.as_str()).execute(&mut conn).await?; // $ sql-sink MISSING: Alert[rust/sql-injection]=remote2
+        let _ = sqlx::query(unsafe_query_1.as_str()).execute(&mut conn).await?; // $ sql-sink Alert[rust/sql-injection]=remote2
         let _ = sqlx::query(prepared_query_1.as_str()).bind(&remote_string).execute(&mut conn).await?; // $ sql-sink
     }
     // ...
     let _ = sqlx::query(safe_query_1.as_str()).fetch(&mut conn); // $ sql-sink
     let _ = sqlx::query(prepared_query_1.as_str()).bind(&const_string).fetch(&mut conn); // $ sql-sink
     if enable_remote {
-        let _ = sqlx::query(unsafe_query_1.as_str()).fetch(&mut conn); // $ sql-sink MISSING: Alert[rust/sql-injection]=remote2
+        let _ = sqlx::query(unsafe_query_1.as_str()).fetch(&mut conn); // $ sql-sink Alert[rust/sql-injection]=remote2
         let _ = sqlx::query(prepared_query_1.as_str()).bind(&remote_string).fetch(&mut conn); // $ sql-sink
     }
     // ...
@@ -133,7 +133,7 @@ async fn test_sqlx_sqlite(url: &str, enable_remote: bool) -> Result<(), sqlx::Er
     let row2: (i64, String, String) = sqlx::query_as(prepared_query_1.as_str()).bind(&const_string).fetch_one(&mut conn).await?; // $ sql-sink
     println!("  row2 = {:?}", row2);
     if enable_remote {
-        let _: (i64, String, String) = sqlx::query_as(unsafe_query_1.as_str()).fetch_one(&mut conn).await?; // $ sql-sink MISSING: Alert[rust/sql-injection]=remote2
+        let _: (i64, String, String) = sqlx::query_as(unsafe_query_1.as_str()).fetch_one(&mut conn).await?; // $ sql-sink Alert[rust/sql-injection]=remote2
         let _: (i64, String, String) = sqlx::query_as(prepared_query_1.as_str()).bind(&remote_string).fetch_one(&mut conn).await?; // $ sql-sink
     }
     // ...
@@ -142,7 +142,7 @@ async fn test_sqlx_sqlite(url: &str, enable_remote: bool) -> Result<(), sqlx::Er
     let row4: (i64, String, String) = sqlx::query_as(prepared_query_1.as_str()).bind(&const_string).fetch_optional(&mut conn).await?.expect("no data"); // $ sql-sink
     println!("  row4 = {:?}", row4);
     if enable_remote {
-        let _: (i64, String, String) = sqlx::query_as(unsafe_query_1.as_str()).fetch_optional(&mut conn).await?.expect("no data"); // $ sql-sink $ MISSING: Alert[rust/sql-injection]=remote2
+        let _: (i64, String, String) = sqlx::query_as(unsafe_query_1.as_str()).fetch_optional(&mut conn).await?.expect("no data"); // $ sql-sink $ Alert[rust/sql-injection]=remote2
         let _: (i64, String, String) = sqlx::query_as(prepared_query_1.as_str()).bind(&remote_string).fetch_optional(&mut conn).await?.expect("no data"); // $ sql-sink
     }
     // ...
@@ -150,7 +150,7 @@ async fn test_sqlx_sqlite(url: &str, enable_remote: bool) -> Result<(), sqlx::Er
     let _ = sqlx::query(prepared_query_1.as_str()).bind(&const_string).fetch_all(&mut conn).await?; // $ sql-sink
     let _ = sqlx::query("SELECT * FROM people WHERE firstname=?").bind(&const_string).fetch_all(&mut conn).await?; // $ sql-sink
     if enable_remote {
-        let _ = sqlx::query(unsafe_query_1.as_str()).fetch_all(&mut conn).await?; // $ sql-sink MISSING: Alert[rust/sql-injection]=remote2
+        let _ = sqlx::query(unsafe_query_1.as_str()).fetch_all(&mut conn).await?; // $ sql-sink Alert[rust/sql-injection]=remote2
         let _ = sqlx::query(prepared_query_1.as_str()).bind(&remote_string).fetch_all(&mut conn).await?; // $ sql-sink
         let _ = sqlx::query("SELECT * FROM people WHERE firstname=?").bind(&remote_string).fetch_all(&mut conn).await?; // $ sql-sink
     }
@@ -170,7 +170,7 @@ async fn test_sqlx_postgres(url: &str, enable_remote: bool) -> Result<(), sqlx::
 
     // construct queries
     let const_string = String::from("Alice");
-    let remote_string = reqwest::blocking::get("http://example.com/").unwrap().text().unwrap_or(String::from("Alice")); // $ MISSING: Source=remote3
+    let remote_string = reqwest::blocking::get("http://example.com/").unwrap().text().unwrap_or(String::from("Alice")); // $ Source=remote3
     let safe_query_1 = String::from("SELECT * FROM people WHERE firstname='") + &const_string + "'";
     let unsafe_query_1 = String::from("SELECT * FROM people WHERE firstname='") + &remote_string + "'";
     let prepared_query_1 = String::from("SELECT * FROM people WHERE firstname=$1"); // (prepared arguments are safe)
@@ -185,7 +185,7 @@ async fn test_sqlx_postgres(url: &str, enable_remote: bool) -> Result<(), sqlx::
     let _ = sqlx::query(safe_query_1.as_str()).execute(&pool).await?; // $ sql-sink
     let _ = sqlx::query(prepared_query_1.as_str()).bind(&const_string).execute(&pool).await?; // $ sql-sink
     if enable_remote {
-        let _ = sqlx::query(unsafe_query_1.as_str()).execute(&pool).await?; // $ sql-sink MISSING: Alert[rust/sql-injection]=remote3
+        let _ = sqlx::query(unsafe_query_1.as_str()).execute(&pool).await?; // $ sql-sink Alert[rust/sql-injection]=remote3
         let _ = sqlx::query(prepared_query_1.as_str()).bind(&remote_string).execute(&pool).await?; // $ sql-sink
     }
 
diff --git a/rust/ql/test/query-tests/security/CWE-117/CONSISTENCY/PathResolutionConsistency.expected b/rust/ql/test/query-tests/security/CWE-117/CONSISTENCY/PathResolutionConsistency.expected
new file mode 100644
index 00000000000..c25043e0ef6
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-117/CONSISTENCY/PathResolutionConsistency.expected
@@ -0,0 +1,2 @@
+multipleCallTargets
+| main.rs:9:43:9:63 | ...::from(...) |
diff --git a/rust/ql/test/query-tests/security/CWE-117/Cargo.lock b/rust/ql/test/query-tests/security/CWE-117/Cargo.lock
new file mode 100644
index 00000000000..a4c67f043d0
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-117/Cargo.lock
@@ -0,0 +1,1646 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+# This file contains locks that were generated by the Rust test runner
+# It should be committed to the repository
+version = 4
+
+[[package]]
+name = "addr2line"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler2"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "atomic-waker"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+
+[[package]]
+name = "backtrace"
+version = "0.3.75"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002"
+dependencies = [
+ "addr2line",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "base64"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+
+[[package]]
+name = "bitflags"
+version = "2.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
+
+[[package]]
+name = "bumpalo"
+version = "3.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
+
+[[package]]
+name = "bytes"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
+
+[[package]]
+name = "cc"
+version = "1.2.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2352e5597e9c544d5e6d9c95190d5d27738ade584fa8db0a16e130e5c2b5296e"
+dependencies = [
+ "shlex",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
+
+[[package]]
+name = "core-foundation"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+
+[[package]]
+name = "displaydoc"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "encoding_rs"
+version = "0.8.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "env_logger"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580"
+dependencies = [
+ "humantime",
+ "is-terminal",
+ "log",
+ "regex",
+ "termcolor",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
+
+[[package]]
+name = "errno"
+version = "0.3.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
+dependencies = [
+ "libc",
+ "windows-sys 0.60.2",
+]
+
+[[package]]
+name = "fastrand"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "foreign-types"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
+dependencies = [
+ "foreign-types-shared",
+]
+
+[[package]]
+name = "foreign-types-shared"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
+
+[[package]]
+name = "form_urlencoded"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
+dependencies = [
+ "percent-encoding",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
+
+[[package]]
+name = "futures-io"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
+
+[[package]]
+name = "futures-sink"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
+
+[[package]]
+name = "futures-task"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
+
+[[package]]
+name = "futures-util"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
+dependencies = [
+ "futures-core",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.11.1+wasi-snapshot-preview1",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "r-efi",
+ "wasi 0.14.2+wasi-0.2.4",
+]
+
+[[package]]
+name = "gimli"
+version = "0.31.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
+
+[[package]]
+name = "h2"
+version = "0.4.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9421a676d1b147b16b82c9225157dc629087ef8ec4d5e2960f9437a90dac0a5"
+dependencies = [
+ "atomic-waker",
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "http",
+ "indexmap",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.15.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
+
+[[package]]
+name = "hermit-abi"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c"
+
+[[package]]
+name = "http"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
+[[package]]
+name = "http-body"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
+dependencies = [
+ "bytes",
+ "http",
+]
+
+[[package]]
+name = "http-body-util"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "http",
+ "http-body",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "httparse"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
+
+[[package]]
+name = "humantime"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b112acc8b3adf4b107a8ec20977da0273a8c386765a3ec0229bd500a1443f9f"
+
+[[package]]
+name = "hyper"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "httparse",
+ "itoa",
+ "pin-project-lite",
+ "smallvec",
+ "tokio",
+ "want",
+]
+
+[[package]]
+name = "hyper-rustls"
+version = "0.27.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58"
+dependencies = [
+ "http",
+ "hyper",
+ "hyper-util",
+ "rustls",
+ "rustls-pki-types",
+ "tokio",
+ "tokio-rustls",
+ "tower-service",
+]
+
+[[package]]
+name = "hyper-tls"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
+dependencies = [
+ "bytes",
+ "http-body-util",
+ "hyper",
+ "hyper-util",
+ "native-tls",
+ "tokio",
+ "tokio-native-tls",
+ "tower-service",
+]
+
+[[package]]
+name = "hyper-util"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc2fdfdbff08affe55bb779f33b053aa1fe5dd5b54c257343c17edfa55711bdb"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "http",
+ "http-body",
+ "hyper",
+ "libc",
+ "pin-project-lite",
+ "socket2",
+ "tokio",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "icu_collections"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47"
+dependencies = [
+ "displaydoc",
+ "potential_utf",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locale_core"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3"
+
+[[package]]
+name = "icu_properties"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locale_core",
+ "icu_properties_data",
+ "icu_provider",
+ "potential_utf",
+ "zerotrie",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632"
+
+[[package]]
+name = "icu_provider"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af"
+dependencies = [
+ "displaydoc",
+ "icu_locale_core",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerotrie",
+ "zerovec",
+]
+
+[[package]]
+name = "idna"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661"
+dependencies = [
+ "equivalent",
+ "hashbrown",
+]
+
+[[package]]
+name = "ipnet"
+version = "2.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
+
+[[package]]
+name = "is-terminal"
+version = "0.4.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9"
+dependencies = [
+ "hermit-abi",
+ "libc",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
+
+[[package]]
+name = "js-sys"
+version = "0.3.77"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
+dependencies = [
+ "once_cell",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.175"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
+
+[[package]]
+name = "litemap"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
+
+[[package]]
+name = "log"
+version = "0.4.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+
+[[package]]
+name = "memchr"
+version = "2.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
+
+[[package]]
+name = "mime"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
+dependencies = [
+ "adler2",
+]
+
+[[package]]
+name = "mio"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c"
+dependencies = [
+ "libc",
+ "wasi 0.11.1+wasi-snapshot-preview1",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "native-tls"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e"
+dependencies = [
+ "libc",
+ "log",
+ "openssl",
+ "openssl-probe",
+ "openssl-sys",
+ "schannel",
+ "security-framework",
+ "security-framework-sys",
+ "tempfile",
+]
+
+[[package]]
+name = "object"
+version = "0.36.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+
+[[package]]
+name = "openssl"
+version = "0.10.73"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8"
+dependencies = [
+ "bitflags",
+ "cfg-if",
+ "foreign-types",
+ "libc",
+ "once_cell",
+ "openssl-macros",
+ "openssl-sys",
+]
+
+[[package]]
+name = "openssl-macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "openssl-probe"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
+
+[[package]]
+name = "openssl-sys"
+version = "0.9.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90096e2e47630d78b7d1c20952dc621f957103f8bc2c8359ec81290d75238571"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+ "vcpkg",
+]
+
+[[package]]
+name = "percent-encoding"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "pkg-config"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
+
+[[package]]
+name = "potential_utf"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585"
+dependencies = [
+ "zerovec",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.97"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d61789d7719defeb74ea5fe81f2fdfdbd28a803847077cecce2ff14e1472f6f1"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "r-efi"
+version = "5.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
+
+[[package]]
+name = "regex"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+
+[[package]]
+name = "reqwest"
+version = "0.12.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f"
+dependencies = [
+ "base64",
+ "bytes",
+ "encoding_rs",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "http-body-util",
+ "hyper",
+ "hyper-rustls",
+ "hyper-tls",
+ "hyper-util",
+ "ipnet",
+ "js-sys",
+ "log",
+ "mime",
+ "native-tls",
+ "once_cell",
+ "percent-encoding",
+ "pin-project-lite",
+ "rustls-pemfile",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "sync_wrapper",
+ "system-configuration",
+ "tokio",
+ "tokio-native-tls",
+ "tower-service",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "windows-registry",
+]
+
+[[package]]
+name = "ring"
+version = "0.17.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
+dependencies = [
+ "cc",
+ "cfg-if",
+ "getrandom 0.2.16",
+ "libc",
+ "untrusted",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "989e6739f80c4ad5b13e0fd7fe89531180375b18520cc8c82080e4dc4035b84f"
+
+[[package]]
+name = "rustix"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8"
+dependencies = [
+ "bitflags",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.60.2",
+]
+
+[[package]]
+name = "rustls"
+version = "0.23.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7160e3e10bf4535308537f3c4e1641468cd0e485175d6163087c0393c7d46643"
+dependencies = [
+ "once_cell",
+ "rustls-pki-types",
+ "rustls-webpki",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "rustls-pemfile"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
+dependencies = [
+ "rustls-pki-types",
+]
+
+[[package]]
+name = "rustls-pki-types"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79"
+dependencies = [
+ "zeroize",
+]
+
+[[package]]
+name = "rustls-webpki"
+version = "0.103.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4a72fe2bcf7a6ac6fd7d0b9e5cb68aeb7d4c0a0271730218b3e92d43b4eb435"
+dependencies = [
+ "ring",
+ "rustls-pki-types",
+ "untrusted",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
+
+[[package]]
+name = "ryu"
+version = "1.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
+
+[[package]]
+name = "schannel"
+version = "0.1.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "security-framework"
+version = "2.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
+dependencies = [
+ "bitflags",
+ "core-foundation",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "2.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "serde"
+version = "1.0.219"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.219"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.142"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "030fedb782600dcbd6f02d479bf0d817ac3bb40d644745b769d6a96bc3afc5a7"
+dependencies = [
+ "itoa",
+ "memchr",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "serde_urlencoded"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
+dependencies = [
+ "form_urlencoded",
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "slab"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
+
+[[package]]
+name = "smallvec"
+version = "1.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
+
+[[package]]
+name = "socket2"
+version = "0.5.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
+[[package]]
+name = "subtle"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
+
+[[package]]
+name = "syn"
+version = "2.0.105"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7bc3fcb250e53458e712715cf74285c1f889686520d79294a9ef3bd7aa1fc619"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "sync_wrapper"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
+dependencies = [
+ "futures-core",
+]
+
+[[package]]
+name = "synstructure"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "system-configuration"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
+dependencies = [
+ "bitflags",
+ "core-foundation",
+ "system-configuration-sys",
+]
+
+[[package]]
+name = "system-configuration-sys"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "tempfile"
+version = "3.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1"
+dependencies = [
+ "fastrand",
+ "getrandom 0.3.3",
+ "once_cell",
+ "rustix",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "termcolor"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "test"
+version = "0.0.1"
+dependencies = [
+ "env_logger",
+ "log",
+ "reqwest",
+]
+
+[[package]]
+name = "tinystr"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
+[[package]]
+name = "tokio"
+version = "1.45.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75ef51a33ef1da925cea3e4eb122833cb377c61439ca401b770f54902b806779"
+dependencies = [
+ "backtrace",
+ "bytes",
+ "libc",
+ "mio",
+ "pin-project-lite",
+ "socket2",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "tokio-native-tls"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
+dependencies = [
+ "native-tls",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-rustls"
+version = "0.26.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b"
+dependencies = [
+ "rustls",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-util"
+version = "0.7.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "66a539a9ad6d5d281510d5bd368c973d636c02dbf8a67300bfb6b950696ad7df"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "futures-sink",
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
+name = "tower-service"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
+
+[[package]]
+name = "tracing"
+version = "0.1.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
+dependencies = [
+ "pin-project-lite",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678"
+dependencies = [
+ "once_cell",
+]
+
+[[package]]
+name = "try-lock"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
+
+[[package]]
+name = "untrusted"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+
+[[package]]
+name = "url"
+version = "2.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
+dependencies = [
+ "form_urlencoded",
+ "idna",
+ "percent-encoding",
+]
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
+[[package]]
+name = "vcpkg"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+
+[[package]]
+name = "want"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
+dependencies = [
+ "try-lock",
+]
+
+[[package]]
+name = "wasi"
+version = "0.11.1+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
+
+[[package]]
+name = "wasi"
+version = "0.14.2+wasi-0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
+dependencies = [
+ "wit-bindgen-rt",
+]
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "rustversion",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
+dependencies = [
+ "bumpalo",
+ "log",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-futures"
+version = "0.4.50"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "once_cell",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "web-sys"
+version = "0.3.77"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "winapi-util"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "windows-link"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
+
+[[package]]
+name = "windows-registry"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0"
+dependencies = [
+ "windows-result",
+ "windows-strings",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
+dependencies = [
+ "windows-result",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
+dependencies = [
+ "windows-targets 0.53.3",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
+ "windows_i686_gnullvm 0.52.6",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.53.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91"
+dependencies = [
+ "windows-link",
+ "windows_aarch64_gnullvm 0.53.0",
+ "windows_aarch64_msvc 0.53.0",
+ "windows_i686_gnu 0.53.0",
+ "windows_i686_gnullvm 0.53.0",
+ "windows_i686_msvc 0.53.0",
+ "windows_x86_64_gnu 0.53.0",
+ "windows_x86_64_gnullvm 0.53.0",
+ "windows_x86_64_msvc 0.53.0",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
+
+[[package]]
+name = "wit-bindgen-rt"
+version = "0.39.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
+dependencies = [
+ "bitflags",
+]
+
+[[package]]
+name = "writeable"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb"
+
+[[package]]
+name = "yoke"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
+[[package]]
+name = "zeroize"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+
+[[package]]
+name = "zerotrie"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7aa2bd55086f1ab526693ecbe444205da57e25f4489879da80635a46d90e73b"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
diff --git a/rust/ql/test/query-tests/security/CWE-117/LogInjection.expected b/rust/ql/test/query-tests/security/CWE-117/LogInjection.expected
new file mode 100644
index 00000000000..2e00f941c24
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-117/LogInjection.expected
@@ -0,0 +1,111 @@
+#select
+| main.rs:16:5:16:9 | ...::log | main.rs:10:22:10:34 | ...::var | main.rs:16:5:16:9 | ...::log | Log entry depends on a $@. | main.rs:10:22:10:34 | ...::var | user-provided value |
+| main.rs:17:5:17:10 | ...::log | main.rs:11:23:11:44 | ...::get | main.rs:17:5:17:10 | ...::log | Log entry depends on a $@. | main.rs:11:23:11:44 | ...::get | user-provided value |
+| main.rs:19:5:19:10 | ...::log | main.rs:10:22:10:34 | ...::var | main.rs:19:5:19:10 | ...::log | Log entry depends on a $@. | main.rs:10:22:10:34 | ...::var | user-provided value |
+| main.rs:30:5:30:9 | ...::log | main.rs:11:23:11:44 | ...::get | main.rs:30:5:30:9 | ...::log | Log entry depends on a $@. | main.rs:11:23:11:44 | ...::get | user-provided value |
+| main.rs:112:9:112:13 | ...::log | main.rs:109:25:109:38 | ...::args | main.rs:112:9:112:13 | ...::log | Log entry depends on a $@. | main.rs:109:25:109:38 | ...::args | user-provided value |
+| main.rs:113:9:113:13 | ...::log | main.rs:109:25:109:38 | ...::args | main.rs:113:9:113:13 | ...::log | Log entry depends on a $@. | main.rs:109:25:109:38 | ...::args | user-provided value |
+| main.rs:114:9:114:14 | ...::log | main.rs:109:25:109:38 | ...::args | main.rs:114:9:114:14 | ...::log | Log entry depends on a $@. | main.rs:109:25:109:38 | ...::args | user-provided value |
+| main.rs:115:9:115:14 | ...::log | main.rs:109:25:109:38 | ...::args | main.rs:115:9:115:14 | ...::log | Log entry depends on a $@. | main.rs:109:25:109:38 | ...::args | user-provided value |
+| main.rs:116:9:116:14 | ...::log | main.rs:109:25:109:38 | ...::args | main.rs:116:9:116:14 | ...::log | Log entry depends on a $@. | main.rs:109:25:109:38 | ...::args | user-provided value |
+| main.rs:119:9:119:13 | ...::log | main.rs:109:25:109:38 | ...::args | main.rs:119:9:119:13 | ...::log | Log entry depends on a $@. | main.rs:109:25:109:38 | ...::args | user-provided value |
+| main.rs:126:9:126:16 | ...::_print | main.rs:123:25:123:37 | ...::var | main.rs:126:9:126:16 | ...::_print | Log entry depends on a $@. | main.rs:123:25:123:37 | ...::var | user-provided value |
+| main.rs:127:9:127:17 | ...::_eprint | main.rs:123:25:123:37 | ...::var | main.rs:127:9:127:17 | ...::_eprint | Log entry depends on a $@. | main.rs:123:25:123:37 | ...::var | user-provided value |
+edges
+| main.rs:10:9:10:18 | user_input | main.rs:16:11:16:44 | MacroExpr | provenance |  |
+| main.rs:10:9:10:18 | user_input | main.rs:19:12:19:39 | MacroExpr | provenance |  |
+| main.rs:10:22:10:34 | ...::var | main.rs:10:22:10:48 | ...::var(...) [Ok] | provenance | Src:MaD:6  |
+| main.rs:10:22:10:48 | ...::var(...) [Ok] | main.rs:10:22:10:81 | ... .unwrap_or(...) | provenance | MaD:10 |
+| main.rs:10:22:10:81 | ... .unwrap_or(...) | main.rs:10:9:10:18 | user_input | provenance |  |
+| main.rs:11:9:11:19 | remote_data | main.rs:17:12:17:46 | MacroExpr | provenance |  |
+| main.rs:11:9:11:19 | remote_data | main.rs:30:11:30:66 | MacroExpr | provenance |  |
+| main.rs:11:23:11:44 | ...::get | main.rs:11:23:11:71 | ...::get(...) [Ok] | provenance | Src:MaD:4  |
+| main.rs:11:23:11:71 | ...::get(...) [Ok] | main.rs:11:23:12:17 | ... .unwrap() | provenance | MaD:9 |
+| main.rs:11:23:12:17 | ... .unwrap() | main.rs:11:23:12:24 | ... .text() [Ok] | provenance | MaD:12 |
+| main.rs:11:23:12:24 | ... .text() [Ok] | main.rs:11:23:12:61 | ... .unwrap_or(...) | provenance | MaD:10 |
+| main.rs:11:23:12:61 | ... .unwrap_or(...) | main.rs:11:9:11:19 | remote_data | provenance |  |
+| main.rs:16:11:16:44 | MacroExpr | main.rs:16:5:16:9 | ...::log | provenance | MaD:1 Sink:MaD:1 |
+| main.rs:17:12:17:46 | MacroExpr | main.rs:17:5:17:10 | ...::log | provenance | MaD:1 Sink:MaD:1 |
+| main.rs:19:12:19:39 | MacroExpr | main.rs:19:5:19:10 | ...::log | provenance | MaD:1 Sink:MaD:1 |
+| main.rs:30:11:30:66 | MacroExpr | main.rs:30:5:30:9 | ...::log | provenance | MaD:1 Sink:MaD:1 |
+| main.rs:109:13:109:21 | user_data | main.rs:112:15:112:35 | MacroExpr | provenance |  |
+| main.rs:109:13:109:21 | user_data | main.rs:113:15:113:38 | MacroExpr | provenance |  |
+| main.rs:109:13:109:21 | user_data | main.rs:114:16:114:37 | MacroExpr | provenance |  |
+| main.rs:109:13:109:21 | user_data | main.rs:115:16:115:37 | MacroExpr | provenance |  |
+| main.rs:109:13:109:21 | user_data | main.rs:116:16:116:37 | MacroExpr | provenance |  |
+| main.rs:109:13:109:21 | user_data | main.rs:119:15:119:75 | MacroExpr | provenance |  |
+| main.rs:109:25:109:38 | ...::args | main.rs:109:25:109:40 | ...::args(...) [element] | provenance | Src:MaD:5  |
+| main.rs:109:25:109:40 | ...::args(...) [element] | main.rs:109:25:109:47 | ... .nth(...) [Some] | provenance | MaD:7 |
+| main.rs:109:25:109:47 | ... .nth(...) [Some] | main.rs:109:25:109:67 | ... .unwrap_or_default() | provenance | MaD:8 |
+| main.rs:109:25:109:67 | ... .unwrap_or_default() | main.rs:109:13:109:21 | user_data | provenance |  |
+| main.rs:112:15:112:35 | MacroExpr | main.rs:112:9:112:13 | ...::log | provenance | MaD:1 Sink:MaD:1 |
+| main.rs:113:15:113:38 | MacroExpr | main.rs:113:9:113:13 | ...::log | provenance | MaD:1 Sink:MaD:1 |
+| main.rs:114:16:114:37 | MacroExpr | main.rs:114:9:114:14 | ...::log | provenance | MaD:1 Sink:MaD:1 |
+| main.rs:115:16:115:37 | MacroExpr | main.rs:115:9:115:14 | ...::log | provenance | MaD:1 Sink:MaD:1 |
+| main.rs:116:16:116:37 | MacroExpr | main.rs:116:9:116:14 | ...::log | provenance | MaD:1 Sink:MaD:1 |
+| main.rs:119:15:119:75 | MacroExpr | main.rs:119:9:119:13 | ...::log | provenance | MaD:1 Sink:MaD:1 |
+| main.rs:123:13:123:21 | user_data | main.rs:126:18:126:38 | MacroExpr | provenance |  |
+| main.rs:123:13:123:21 | user_data | main.rs:127:19:127:49 | MacroExpr | provenance |  |
+| main.rs:123:25:123:37 | ...::var | main.rs:123:25:123:45 | ...::var(...) [Ok] | provenance | Src:MaD:6  |
+| main.rs:123:25:123:45 | ...::var(...) [Ok] | main.rs:123:25:123:65 | ... .unwrap_or_default() | provenance | MaD:11 |
+| main.rs:123:25:123:65 | ... .unwrap_or_default() | main.rs:123:13:123:21 | user_data | provenance |  |
+| main.rs:126:18:126:38 | MacroExpr | main.rs:126:9:126:16 | ...::_print | provenance | MaD:3 Sink:MaD:3 |
+| main.rs:127:19:127:49 | MacroExpr | main.rs:127:9:127:17 | ...::_eprint | provenance | MaD:2 Sink:MaD:2 |
+models
+| 1 | Sink: log::__private_api::log; Argument[0]; log-injection |
+| 2 | Sink: std::io::stdio::_eprint; Argument[0]; log-injection |
+| 3 | Sink: std::io::stdio::_print; Argument[0]; log-injection |
+| 4 | Source: reqwest::blocking::get; ReturnValue.Field[core::result::Result::Ok(0)]; remote |
+| 5 | Source: std::env::args; ReturnValue.Element; commandargs |
+| 6 | Source: std::env::var; ReturnValue.Field[core::result::Result::Ok(0)]; environment |
+| 7 | Summary: <_ as core::iter::traits::iterator::Iterator>::nth; Argument[self].Element; ReturnValue.Field[core::option::Option::Some(0)]; value |
+| 8 | Summary: <core::option::Option>::unwrap_or_default; Argument[self].Field[core::option::Option::Some(0)]; ReturnValue; value |
+| 9 | Summary: <core::result::Result>::unwrap; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
+| 10 | Summary: <core::result::Result>::unwrap_or; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
+| 11 | Summary: <core::result::Result>::unwrap_or_default; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
+| 12 | Summary: <reqwest::blocking::response::Response>::text; Argument[self]; ReturnValue.Field[core::result::Result::Ok(0)]; taint |
+nodes
+| main.rs:10:9:10:18 | user_input | semmle.label | user_input |
+| main.rs:10:22:10:34 | ...::var | semmle.label | ...::var |
+| main.rs:10:22:10:48 | ...::var(...) [Ok] | semmle.label | ...::var(...) [Ok] |
+| main.rs:10:22:10:81 | ... .unwrap_or(...) | semmle.label | ... .unwrap_or(...) |
+| main.rs:11:9:11:19 | remote_data | semmle.label | remote_data |
+| main.rs:11:23:11:44 | ...::get | semmle.label | ...::get |
+| main.rs:11:23:11:71 | ...::get(...) [Ok] | semmle.label | ...::get(...) [Ok] |
+| main.rs:11:23:12:17 | ... .unwrap() | semmle.label | ... .unwrap() |
+| main.rs:11:23:12:24 | ... .text() [Ok] | semmle.label | ... .text() [Ok] |
+| main.rs:11:23:12:61 | ... .unwrap_or(...) | semmle.label | ... .unwrap_or(...) |
+| main.rs:16:5:16:9 | ...::log | semmle.label | ...::log |
+| main.rs:16:11:16:44 | MacroExpr | semmle.label | MacroExpr |
+| main.rs:17:5:17:10 | ...::log | semmle.label | ...::log |
+| main.rs:17:12:17:46 | MacroExpr | semmle.label | MacroExpr |
+| main.rs:19:5:19:10 | ...::log | semmle.label | ...::log |
+| main.rs:19:12:19:39 | MacroExpr | semmle.label | MacroExpr |
+| main.rs:30:5:30:9 | ...::log | semmle.label | ...::log |
+| main.rs:30:11:30:66 | MacroExpr | semmle.label | MacroExpr |
+| main.rs:109:13:109:21 | user_data | semmle.label | user_data |
+| main.rs:109:25:109:38 | ...::args | semmle.label | ...::args |
+| main.rs:109:25:109:40 | ...::args(...) [element] | semmle.label | ...::args(...) [element] |
+| main.rs:109:25:109:47 | ... .nth(...) [Some] | semmle.label | ... .nth(...) [Some] |
+| main.rs:109:25:109:67 | ... .unwrap_or_default() | semmle.label | ... .unwrap_or_default() |
+| main.rs:112:9:112:13 | ...::log | semmle.label | ...::log |
+| main.rs:112:15:112:35 | MacroExpr | semmle.label | MacroExpr |
+| main.rs:113:9:113:13 | ...::log | semmle.label | ...::log |
+| main.rs:113:15:113:38 | MacroExpr | semmle.label | MacroExpr |
+| main.rs:114:9:114:14 | ...::log | semmle.label | ...::log |
+| main.rs:114:16:114:37 | MacroExpr | semmle.label | MacroExpr |
+| main.rs:115:9:115:14 | ...::log | semmle.label | ...::log |
+| main.rs:115:16:115:37 | MacroExpr | semmle.label | MacroExpr |
+| main.rs:116:9:116:14 | ...::log | semmle.label | ...::log |
+| main.rs:116:16:116:37 | MacroExpr | semmle.label | MacroExpr |
+| main.rs:119:9:119:13 | ...::log | semmle.label | ...::log |
+| main.rs:119:15:119:75 | MacroExpr | semmle.label | MacroExpr |
+| main.rs:123:13:123:21 | user_data | semmle.label | user_data |
+| main.rs:123:25:123:37 | ...::var | semmle.label | ...::var |
+| main.rs:123:25:123:45 | ...::var(...) [Ok] | semmle.label | ...::var(...) [Ok] |
+| main.rs:123:25:123:65 | ... .unwrap_or_default() | semmle.label | ... .unwrap_or_default() |
+| main.rs:126:9:126:16 | ...::_print | semmle.label | ...::_print |
+| main.rs:126:18:126:38 | MacroExpr | semmle.label | MacroExpr |
+| main.rs:127:9:127:17 | ...::_eprint | semmle.label | ...::_eprint |
+| main.rs:127:19:127:49 | MacroExpr | semmle.label | MacroExpr |
+subpaths
diff --git a/rust/ql/test/query-tests/security/CWE-117/LogInjection.qlref b/rust/ql/test/query-tests/security/CWE-117/LogInjection.qlref
new file mode 100644
index 00000000000..e71d62b14e6
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-117/LogInjection.qlref
@@ -0,0 +1,4 @@
+query: queries/security/CWE-117/LogInjection.ql
+postprocess:
+ - utils/test/PrettyPrintModels.ql
+ - utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/rust/ql/test/query-tests/security/CWE-117/main.rs b/rust/ql/test/query-tests/security/CWE-117/main.rs
new file mode 100644
index 00000000000..f5001846d1b
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-117/main.rs
@@ -0,0 +1,129 @@
+use std::env;
+use log::{info, warn, error, debug, trace};
+
+fn main() {
+    env_logger::init();
+
+    // Sources of user input
+    let args: Vec<String> = env::args().collect();
+    let username = args.get(1).unwrap_or(&String::from("Guest")).clone(); // $ MISSING: Source=commandargs
+    let user_input = std::env::var("USER_INPUT").unwrap_or("default".to_string()); // $ Source=environment
+    let remote_data = reqwest::blocking::get("http://example.com/user") // $ Source=remote
+        .unwrap().text().unwrap_or("remote_user".to_string());
+
+    // BAD: Direct logging of user input
+    info!("User login: {}", username); // $ MISSING: Alert[rust/log-injection]
+    warn!("Warning for user: {}", user_input); // $ Alert[rust/log-injection]=environment
+    error!("Error processing: {}", remote_data); // $ Alert[rust/log-injection]=remote
+    debug!("Debug info: {}", username); // $ MISSING: Alert[rust/log-injection]
+    trace!("Trace data: {}", user_input); // $ Alert[rust/log-injection]=environment
+
+    // BAD: Formatted strings with user input
+    let formatted_msg = format!("Processing user: {}", username);
+    info!("{}", formatted_msg); // $ MISSING: Alert[rust/log-injection]
+
+    // BAD: String concatenation with user input
+    let concat_msg = "User activity: ".to_string() + &username;
+    info!("{}", concat_msg); // $ MISSING: Alert[rust/log-injection]
+
+    // BAD: Complex formatting
+    info!("User {} accessed resource at {}", username, remote_data); // $ Alert[rust/log-injection]=remote
+
+    // GOOD: Sanitized input
+    let sanitized_username = username.replace('\n', "").replace('\r', "");
+    info!("Sanitized user login: {}", sanitized_username);
+
+    // GOOD: Constant strings
+    info!("System startup complete");
+
+    // GOOD: Non-user-controlled data
+    let system_time = std::time::SystemTime::now();
+    info!("Current time: {:?}", system_time);
+
+    // GOOD: Numeric data derived from user input (indirectly)
+    let user_id = username.len();
+    info!("User ID length: {}", user_id);
+
+    // GOOD: Numeric data derived from user input (directly)
+    let number = remote_data.parse::<u64>().unwrap_or(0);
+    info!("Number: {}", number);
+
+    // More complex test cases
+    test_complex_scenarios(&username, &user_input);
+    test_indirect_flows(&remote_data);
+}
+
+fn test_complex_scenarios(username: &str, user_input: &str) {
+    // BAD: Indirect logging through variables
+    let log_message = format!("Activity for {}", username);
+    info!("{}", log_message); // $ MISSING: Alert[rust/log-injection]
+
+    // BAD: Through function parameters
+    log_user_activity(username); // Function call - should be tracked
+
+    // BAD: Through struct fields
+    let user_info = UserInfo { name: username.to_string() };
+    info!("User info: {}", user_info.name); // $ MISSING: Alert[rust/log-injection]
+
+    // GOOD: After sanitization
+    let clean_input = sanitize_input(user_input);
+    info!("Clean input: {}", clean_input);
+}
+
+fn log_user_activity(user: &str) {
+    info!("User activity: {}", user); // $ MISSING: Alert[rust/log-injection]
+}
+
+fn sanitize_input(input: &str) -> String {
+    input.replace('\n', "").replace('\r', "").replace('\t', " ")
+}
+
+struct UserInfo {
+    name: String,
+}
+
+fn test_indirect_flows(data: &str) {
+    // BAD: Flow through intermediate variables
+    let temp_var = data;
+    let another_var = temp_var;
+    info!("Indirect flow: {}", another_var); // $ MISSING: Alert[rust/log-injection]
+
+    // BAD: Flow through collections
+    let data_vec = vec![data];
+    if let Some(item) = data_vec.first() {
+        info!("Vector item: {}", item); // $ MISSING: Alert[rust/log-injection]
+    }
+
+    // BAD: Flow through Option/Result
+    let optional_data = Some(data);
+    if let Some(unwrapped) = optional_data {
+        info!("Unwrapped data: {}", unwrapped); // $ MISSING: Alert[rust/log-injection]
+    }
+}
+
+// Additional test patterns for different logging scenarios
+mod additional_tests {
+    use log::*;
+
+    pub fn test_macro_variations() {
+        let user_data = std::env::args().nth(1).unwrap_or_default(); // $ Source=commandargs
+
+        // BAD: Different log macro variations
+        info!("Info: {}", user_data); // $ Alert[rust/log-injection]=commandargs
+        warn!("Warning: {}", user_data); // $ Alert[rust/log-injection]=commandargs
+        error!("Error: {}", user_data); // $ Alert[rust/log-injection]=commandargs
+        debug!("Debug: {}", user_data); // $ Alert[rust/log-injection]=commandargs
+        trace!("Trace: {}", user_data); // $ Alert[rust/log-injection]=commandargs
+
+        // BAD: Complex format strings
+        info!("User {} did action {} at time {}", user_data, "login", "now"); // $ Alert[rust/log-injection]=commandargs
+    }
+
+    pub fn test_println_patterns() {
+        let user_data = std::env::var("USER").unwrap_or_default(); // $ Source=environment
+
+        // These might not be caught depending on model coverage, but are potential logging sinks
+        println!("User: {}", user_data); // $ Alert[rust/log-injection]=environment
+        eprintln!("Error for user: {}", user_data); // $ Alert[rust/log-injection]=environment
+    }
+}
diff --git a/rust/ql/test/query-tests/security/CWE-117/options.yml b/rust/ql/test/query-tests/security/CWE-117/options.yml
new file mode 100644
index 00000000000..fae9beded52
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-117/options.yml
@@ -0,0 +1,5 @@
+qltest_cargo_check: true
+qltest_dependencies:
+    - log = "0.4"
+    - env_logger = "0.10"
+    - reqwest = { version = "0.12.9", features = ["blocking"] }
\ No newline at end of file
diff --git a/rust/ql/test/query-tests/security/CWE-311/CleartextTransmission.expected b/rust/ql/test/query-tests/security/CWE-311/CleartextTransmission.expected
index 0a229c72d75..5807220eef0 100644
--- a/rust/ql/test/query-tests/security/CWE-311/CleartextTransmission.expected
+++ b/rust/ql/test/query-tests/security/CWE-311/CleartextTransmission.expected
@@ -6,16 +6,14 @@
 | main.rs:35:12:35:18 | request | main.rs:33:50:33:57 | password | main.rs:35:12:35:18 | request | This 'request' operation transmits data which may contain unencrypted sensitive data from $@. | main.rs:33:50:33:57 | password | password |
 edges
 | main.rs:6:9:6:11 | url | main.rs:7:28:7:30 | url | provenance |  |
-| main.rs:6:15:6:58 | res | main.rs:6:23:6:57 | { ... } | provenance |  |
-| main.rs:6:23:6:57 | ...::format(...) | main.rs:6:15:6:58 | res | provenance |  |
+| main.rs:6:23:6:57 | ...::format(...) | main.rs:6:23:6:57 | { ... } | provenance |  |
 | main.rs:6:23:6:57 | ...::must_use(...) | main.rs:6:9:6:11 | url | provenance |  |
 | main.rs:6:23:6:57 | MacroExpr | main.rs:6:23:6:57 | ...::format(...) | provenance | MaD:7 |
 | main.rs:6:23:6:57 | { ... } | main.rs:6:23:6:57 | ...::must_use(...) | provenance | MaD:8 |
 | main.rs:6:50:6:57 | password | main.rs:6:23:6:57 | MacroExpr | provenance |  |
 | main.rs:7:28:7:30 | url | main.rs:7:5:7:26 | ...::get | provenance | MaD:4 Sink:MaD:4 |
 | main.rs:12:9:12:15 | address | main.rs:13:27:13:33 | address | provenance |  |
-| main.rs:12:19:12:60 | res | main.rs:12:27:12:59 | { ... } | provenance |  |
-| main.rs:12:27:12:59 | ...::format(...) | main.rs:12:19:12:60 | res | provenance |  |
+| main.rs:12:27:12:59 | ...::format(...) | main.rs:12:27:12:59 | { ... } | provenance |  |
 | main.rs:12:27:12:59 | ...::must_use(...) | main.rs:12:9:12:15 | address | provenance |  |
 | main.rs:12:27:12:59 | MacroExpr | main.rs:12:27:12:59 | ...::format(...) | provenance | MaD:7 |
 | main.rs:12:27:12:59 | { ... } | main.rs:12:27:12:59 | ...::must_use(...) | provenance | MaD:8 |
@@ -27,41 +25,37 @@ edges
 | main.rs:13:27:13:33 | address | main.rs:13:26:13:33 | &address [&ref] | provenance |  |
 | main.rs:14:28:14:30 | url | main.rs:14:5:14:26 | ...::get | provenance | MaD:4 Sink:MaD:4 |
 | main.rs:19:9:19:11 | url | main.rs:21:17:21:19 | url | provenance |  |
-| main.rs:19:15:19:58 | res | main.rs:19:23:19:57 | { ... } | provenance |  |
-| main.rs:19:23:19:57 | ...::format(...) | main.rs:19:15:19:58 | res | provenance |  |
+| main.rs:19:23:19:57 | ...::format(...) | main.rs:19:23:19:57 | { ... } | provenance |  |
 | main.rs:19:23:19:57 | ...::must_use(...) | main.rs:19:9:19:11 | url | provenance |  |
 | main.rs:19:23:19:57 | MacroExpr | main.rs:19:23:19:57 | ...::format(...) | provenance | MaD:7 |
 | main.rs:19:23:19:57 | { ... } | main.rs:19:23:19:57 | ...::must_use(...) | provenance | MaD:8 |
 | main.rs:19:50:19:57 | password | main.rs:19:23:19:57 | MacroExpr | provenance |  |
 | main.rs:21:17:21:19 | url | main.rs:21:12:21:15 | post | provenance | MaD:1 Sink:MaD:1 |
 | main.rs:26:9:26:11 | url | main.rs:28:33:28:35 | url | provenance |  |
-| main.rs:26:15:26:58 | res | main.rs:26:23:26:57 | { ... } | provenance |  |
-| main.rs:26:23:26:57 | ...::format(...) | main.rs:26:15:26:58 | res | provenance |  |
+| main.rs:26:23:26:57 | ...::format(...) | main.rs:26:23:26:57 | { ... } | provenance |  |
 | main.rs:26:23:26:57 | ...::must_use(...) | main.rs:26:9:26:11 | url | provenance |  |
 | main.rs:26:23:26:57 | MacroExpr | main.rs:26:23:26:57 | ...::format(...) | provenance | MaD:7 |
 | main.rs:26:23:26:57 | { ... } | main.rs:26:23:26:57 | ...::must_use(...) | provenance | MaD:8 |
 | main.rs:26:50:26:57 | password | main.rs:26:23:26:57 | MacroExpr | provenance |  |
 | main.rs:28:33:28:35 | url | main.rs:28:12:28:18 | request | provenance | MaD:3 Sink:MaD:3 |
 | main.rs:33:9:33:11 | url | main.rs:35:33:35:35 | url | provenance |  |
-| main.rs:33:15:33:58 | res | main.rs:33:23:33:57 | { ... } | provenance |  |
-| main.rs:33:23:33:57 | ...::format(...) | main.rs:33:15:33:58 | res | provenance |  |
+| main.rs:33:23:33:57 | ...::format(...) | main.rs:33:23:33:57 | { ... } | provenance |  |
 | main.rs:33:23:33:57 | ...::must_use(...) | main.rs:33:9:33:11 | url | provenance |  |
 | main.rs:33:23:33:57 | MacroExpr | main.rs:33:23:33:57 | ...::format(...) | provenance | MaD:7 |
 | main.rs:33:23:33:57 | { ... } | main.rs:33:23:33:57 | ...::must_use(...) | provenance | MaD:8 |
 | main.rs:33:50:33:57 | password | main.rs:33:23:33:57 | MacroExpr | provenance |  |
 | main.rs:35:33:35:35 | url | main.rs:35:12:35:18 | request | provenance | MaD:2 Sink:MaD:2 |
 models
-| 1 | Sink: <reqwest::async_impl::client::Client>::post; Argument[0]; transmission |
-| 2 | Sink: <reqwest::async_impl::client::Client>::request; Argument[1]; transmission |
-| 3 | Sink: <reqwest::blocking::client::Client>::request; Argument[1]; transmission |
-| 4 | Sink: reqwest::blocking::get; Argument[0]; transmission |
+| 1 | Sink: <reqwest::async_impl::client::Client>::post; Argument[0]; request-url |
+| 2 | Sink: <reqwest::async_impl::client::Client>::request; Argument[1]; request-url |
+| 3 | Sink: <reqwest::blocking::client::Client>::request; Argument[1]; request-url |
+| 4 | Sink: reqwest::blocking::get; Argument[0]; request-url |
 | 5 | Summary: <core::result::Result>::unwrap; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
 | 6 | Summary: <url::Url>::parse; Argument[0].Reference; ReturnValue.Field[core::result::Result::Ok(0)]; taint |
 | 7 | Summary: alloc::fmt::format; Argument[0]; ReturnValue; taint |
 | 8 | Summary: core::hint::must_use; Argument[0]; ReturnValue; value |
 nodes
 | main.rs:6:9:6:11 | url | semmle.label | url |
-| main.rs:6:15:6:58 | res | semmle.label | res |
 | main.rs:6:23:6:57 | ...::format(...) | semmle.label | ...::format(...) |
 | main.rs:6:23:6:57 | ...::must_use(...) | semmle.label | ...::must_use(...) |
 | main.rs:6:23:6:57 | MacroExpr | semmle.label | MacroExpr |
@@ -70,7 +64,6 @@ nodes
 | main.rs:7:5:7:26 | ...::get | semmle.label | ...::get |
 | main.rs:7:28:7:30 | url | semmle.label | url |
 | main.rs:12:9:12:15 | address | semmle.label | address |
-| main.rs:12:19:12:60 | res | semmle.label | res |
 | main.rs:12:27:12:59 | ...::format(...) | semmle.label | ...::format(...) |
 | main.rs:12:27:12:59 | ...::must_use(...) | semmle.label | ...::must_use(...) |
 | main.rs:12:27:12:59 | MacroExpr | semmle.label | MacroExpr |
@@ -84,7 +77,6 @@ nodes
 | main.rs:14:5:14:26 | ...::get | semmle.label | ...::get |
 | main.rs:14:28:14:30 | url | semmle.label | url |
 | main.rs:19:9:19:11 | url | semmle.label | url |
-| main.rs:19:15:19:58 | res | semmle.label | res |
 | main.rs:19:23:19:57 | ...::format(...) | semmle.label | ...::format(...) |
 | main.rs:19:23:19:57 | ...::must_use(...) | semmle.label | ...::must_use(...) |
 | main.rs:19:23:19:57 | MacroExpr | semmle.label | MacroExpr |
@@ -93,7 +85,6 @@ nodes
 | main.rs:21:12:21:15 | post | semmle.label | post |
 | main.rs:21:17:21:19 | url | semmle.label | url |
 | main.rs:26:9:26:11 | url | semmle.label | url |
-| main.rs:26:15:26:58 | res | semmle.label | res |
 | main.rs:26:23:26:57 | ...::format(...) | semmle.label | ...::format(...) |
 | main.rs:26:23:26:57 | ...::must_use(...) | semmle.label | ...::must_use(...) |
 | main.rs:26:23:26:57 | MacroExpr | semmle.label | MacroExpr |
@@ -102,7 +93,6 @@ nodes
 | main.rs:28:12:28:18 | request | semmle.label | request |
 | main.rs:28:33:28:35 | url | semmle.label | url |
 | main.rs:33:9:33:11 | url | semmle.label | url |
-| main.rs:33:15:33:58 | res | semmle.label | res |
 | main.rs:33:23:33:57 | ...::format(...) | semmle.label | ...::format(...) |
 | main.rs:33:23:33:57 | ...::must_use(...) | semmle.label | ...::must_use(...) |
 | main.rs:33:23:33:57 | MacroExpr | semmle.label | MacroExpr |
diff --git a/rust/ql/test/query-tests/security/CWE-312/CONSISTENCY/PathResolutionConsistency.expected b/rust/ql/test/query-tests/security/CWE-312/CONSISTENCY/PathResolutionConsistency.expected
index e569aca9804..078bce75133 100644
--- a/rust/ql/test/query-tests/security/CWE-312/CONSISTENCY/PathResolutionConsistency.expected
+++ b/rust/ql/test/query-tests/security/CWE-312/CONSISTENCY/PathResolutionConsistency.expected
@@ -1,81 +1,4 @@
 multipleCallTargets
-| test_logging.rs:42:5:42:36 | ...::max_level(...) |
-| test_logging.rs:43:5:43:36 | ...::max_level(...) |
-| test_logging.rs:44:5:44:35 | ...::max_level(...) |
-| test_logging.rs:45:5:45:36 | ...::max_level(...) |
-| test_logging.rs:46:5:46:35 | ...::max_level(...) |
-| test_logging.rs:47:5:47:48 | ...::max_level(...) |
-| test_logging.rs:50:5:50:21 | ...::max_level(...) |
-| test_logging.rs:51:5:51:36 | ...::max_level(...) |
-| test_logging.rs:52:5:52:36 | ...::max_level(...) |
-| test_logging.rs:53:5:53:46 | ...::max_level(...) |
-| test_logging.rs:54:5:54:49 | ...::max_level(...) |
-| test_logging.rs:55:5:55:34 | ...::max_level(...) |
-| test_logging.rs:56:5:56:47 | ...::max_level(...) |
-| test_logging.rs:57:5:57:34 | ...::max_level(...) |
-| test_logging.rs:58:5:58:36 | ...::max_level(...) |
-| test_logging.rs:59:5:59:54 | ...::max_level(...) |
-| test_logging.rs:60:5:60:54 | ...::max_level(...) |
-| test_logging.rs:61:5:61:55 | ...::max_level(...) |
-| test_logging.rs:64:5:64:48 | ...::max_level(...) |
-| test_logging.rs:65:5:65:48 | ...::max_level(...) |
-| test_logging.rs:66:5:66:66 | ...::max_level(...) |
-| test_logging.rs:67:5:67:66 | ...::max_level(...) |
-| test_logging.rs:68:5:68:67 | ...::max_level(...) |
-| test_logging.rs:71:5:71:47 | ...::max_level(...) |
-| test_logging.rs:72:5:72:47 | ...::max_level(...) |
-| test_logging.rs:73:5:73:50 | ...::max_level(...) |
-| test_logging.rs:74:5:74:65 | ...::max_level(...) |
-| test_logging.rs:75:5:75:51 | ...::max_level(...) |
-| test_logging.rs:76:5:76:47 | ...::max_level(...) |
-| test_logging.rs:77:5:77:48 | ...::max_level(...) |
-| test_logging.rs:77:20:77:36 | password.as_str() |
-| test_logging.rs:78:5:78:50 | ...::max_level(...) |
-| test_logging.rs:78:22:78:38 | password.as_str() |
-| test_logging.rs:81:5:81:44 | ...::max_level(...) |
-| test_logging.rs:82:5:82:44 | ...::max_level(...) |
-| test_logging.rs:83:5:83:47 | ...::max_level(...) |
-| test_logging.rs:84:5:84:62 | ...::max_level(...) |
-| test_logging.rs:85:5:85:48 | ...::max_level(...) |
-| test_logging.rs:86:5:86:44 | ...::max_level(...) |
-| test_logging.rs:88:18:88:34 | password.as_str() |
-| test_logging.rs:89:5:89:29 | ...::max_level(...) |
-| test_logging.rs:90:5:90:31 | ...::max_level(...) |
-| test_logging.rs:94:5:94:29 | ...::max_level(...) |
-| test_logging.rs:97:5:97:19 | ...::max_level(...) |
-| test_logging.rs:100:5:100:19 | ...::max_level(...) |
-| test_logging.rs:104:5:104:19 | ...::max_level(...) |
-| test_logging.rs:108:5:108:19 | ...::max_level(...) |
-| test_logging.rs:112:5:112:50 | ...::max_level(...) |
-| test_logging.rs:114:9:114:55 | ...::max_level(...) |
-| test_logging.rs:118:5:118:42 | ...::max_level(...) |
-| test_logging.rs:121:5:121:33 | ...::max_level(...) |
-| test_logging.rs:123:5:123:33 | ...::max_level(...) |
-| test_logging.rs:126:5:126:33 | ...::max_level(...) |
-| test_logging.rs:130:5:130:32 | ...::max_level(...) |
-| test_logging.rs:131:5:131:32 | ...::max_level(...) |
-| test_logging.rs:132:5:132:32 | ...::max_level(...) |
-| test_logging.rs:133:5:133:33 | ...::max_level(...) |
-| test_logging.rs:140:5:140:38 | ...::max_level(...) |
-| test_logging.rs:141:5:141:38 | ...::max_level(...) |
-| test_logging.rs:142:5:142:29 | ...::max_level(...) |
-| test_logging.rs:143:5:143:31 | ...::max_level(...) |
-| test_logging.rs:144:5:144:32 | ...::max_level(...) |
-| test_logging.rs:150:5:150:38 | ...::max_level(...) |
-| test_logging.rs:151:5:151:38 | ...::max_level(...) |
-| test_logging.rs:152:5:152:29 | ...::max_level(...) |
-| test_logging.rs:153:5:153:31 | ...::max_level(...) |
-| test_logging.rs:154:5:154:32 | ...::max_level(...) |
-| test_logging.rs:192:12:192:37 | ...::_print(...) |
-| test_logging.rs:193:14:193:37 | ...::_print(...) |
-| test_logging.rs:194:13:194:38 | ...::_eprint(...) |
-| test_logging.rs:195:15:195:38 | ...::_eprint(...) |
-| test_logging.rs:229:30:229:71 | ... .as_str() |
-| test_logging.rs:242:16:242:61 | ... .as_bytes() |
-| test_logging.rs:243:5:245:66 | ... .write_all(...) |
-| test_logging.rs:245:20:245:65 | ... .as_bytes() |
-| test_logging.rs:248:15:248:60 | ... .as_bytes() |
-| test_logging.rs:251:15:251:60 | ... .as_bytes() |
 | test_storage.rs:13:10:13:33 | ...::from(...) |
 | test_storage.rs:17:10:17:35 | ...::from(...) |
 | test_storage.rs:21:10:21:35 | ...::from(...) |
@@ -90,54 +13,11 @@ multipleCallTargets
 | test_storage.rs:73:25:73:67 | ...::from(...) |
 | test_storage.rs:75:25:75:65 | ...::from(...) |
 | test_storage.rs:76:25:76:65 | ...::from(...) |
-| test_storage.rs:77:14:77:24 | s1.as_str() |
 | test_storage.rs:78:25:78:65 | ...::from(...) |
 | test_storage.rs:79:25:79:65 | ...::from(...) |
 | test_storage.rs:80:25:80:70 | ...::from(...) |
 | test_storage.rs:81:25:81:72 | ...::from(...) |
 | test_storage.rs:82:26:82:77 | ...::from(...) |
-| test_storage.rs:85:27:85:48 | select_query1.as_str() |
-| test_storage.rs:86:27:86:48 | select_query2.as_str() |
-| test_storage.rs:87:27:87:48 | insert_query1.as_str() |
-| test_storage.rs:88:27:88:48 | insert_query2.as_str() |
-| test_storage.rs:89:27:89:48 | update_query1.as_str() |
-| test_storage.rs:90:27:90:48 | update_query2.as_str() |
-| test_storage.rs:91:27:91:48 | update_query3.as_str() |
-| test_storage.rs:92:27:92:48 | update_query4.as_str() |
-| test_storage.rs:93:27:93:48 | update_query5.as_str() |
-| test_storage.rs:94:27:94:48 | update_query6.as_str() |
-| test_storage.rs:95:27:95:48 | delete_query1.as_str() |
-| test_storage.rs:96:27:96:48 | delete_query2.as_str() |
-| test_storage.rs:99:25:99:46 | insert_query1.as_str() |
-| test_storage.rs:100:25:100:46 | insert_query2.as_str() |
-| test_storage.rs:101:25:101:47 | prepared_query.as_str() |
-| test_storage.rs:102:25:102:47 | prepared_query.as_str() |
-| test_storage.rs:103:25:103:47 | prepared_query.as_str() |
-| test_storage.rs:104:25:104:47 | prepared_query.as_str() |
-| test_storage.rs:110:27:110:48 | insert_query1.as_str() |
-| test_storage.rs:111:27:111:48 | insert_query2.as_str() |
-| test_storage.rs:114:27:114:48 | insert_query1.as_str() |
-| test_storage.rs:115:27:115:48 | insert_query2.as_str() |
-| test_storage.rs:118:25:118:46 | insert_query1.as_str() |
-| test_storage.rs:119:25:119:46 | insert_query2.as_str() |
-| test_storage.rs:120:25:120:47 | prepared_query.as_str() |
-| test_storage.rs:121:25:121:47 | prepared_query.as_str() |
-| test_storage.rs:124:25:124:46 | insert_query1.as_str() |
-| test_storage.rs:125:25:125:46 | insert_query2.as_str() |
-| test_storage.rs:126:25:126:47 | prepared_query.as_str() |
-| test_storage.rs:127:25:127:47 | prepared_query.as_str() |
-| test_storage.rs:134:27:134:48 | insert_query1.as_str() |
-| test_storage.rs:135:27:135:48 | insert_query2.as_str() |
-| test_storage.rs:138:25:138:46 | insert_query1.as_str() |
-| test_storage.rs:139:25:139:46 | insert_query2.as_str() |
-| test_storage.rs:140:25:140:47 | prepared_query.as_str() |
-| test_storage.rs:141:25:141:47 | prepared_query.as_str() |
 | test_storage.rs:188:29:188:86 | ...::from(...) |
 | test_storage.rs:189:28:189:82 | ...::from(...) |
 | test_storage.rs:190:28:190:81 | ...::from(...) |
-| test_storage.rs:217:14:217:47 | ...::_print(...) |
-| test_storage.rs:219:27:219:41 | ...::_print(...) |
-| test_storage.rs:220:28:220:43 | ...::_print(...) |
-| test_storage.rs:223:14:223:51 | ...::_print(...) |
-| test_storage.rs:225:27:225:41 | ...::_print(...) |
-| test_storage.rs:226:28:226:43 | ...::_print(...) |
diff --git a/rust/ql/test/query-tests/security/CWE-312/CONSISTENCY/TypeInferenceConsistency.expected b/rust/ql/test/query-tests/security/CWE-312/CONSISTENCY/TypeInferenceConsistency.expected
deleted file mode 100644
index 952a4afe86b..00000000000
--- a/rust/ql/test/query-tests/security/CWE-312/CONSISTENCY/TypeInferenceConsistency.expected
+++ /dev/null
@@ -1,4 +0,0 @@
-nonUniqueCertainType
-| test_logging.rs:17:8:19:12 | { ... } | E |
-| test_logging.rs:29:8:31:12 | { ... } | E |
-| test_storage.rs:177:8:179:9 | { ... } | E |
diff --git a/rust/ql/test/query-tests/security/CWE-312/CleartextLogging.expected b/rust/ql/test/query-tests/security/CWE-312/CleartextLogging.expected
index 0cf81cf9d77..5b1e89fb7aa 100644
--- a/rust/ql/test/query-tests/security/CWE-312/CleartextLogging.expected
+++ b/rust/ql/test/query-tests/security/CWE-312/CleartextLogging.expected
@@ -1,53 +1,53 @@
 #select
-| test_logging.rs:42:5:42:36 | ...::log | test_logging.rs:42:28:42:35 | password | test_logging.rs:42:5:42:36 | ...::log | This operation writes $@ to a log file. | test_logging.rs:42:28:42:35 | password | password |
-| test_logging.rs:43:5:43:36 | ...::log | test_logging.rs:43:28:43:35 | password | test_logging.rs:43:5:43:36 | ...::log | This operation writes $@ to a log file. | test_logging.rs:43:28:43:35 | password | password |
-| test_logging.rs:44:5:44:35 | ...::log | test_logging.rs:44:27:44:34 | password | test_logging.rs:44:5:44:35 | ...::log | This operation writes $@ to a log file. | test_logging.rs:44:27:44:34 | password | password |
-| test_logging.rs:45:5:45:36 | ...::log | test_logging.rs:45:28:45:35 | password | test_logging.rs:45:5:45:36 | ...::log | This operation writes $@ to a log file. | test_logging.rs:45:28:45:35 | password | password |
-| test_logging.rs:46:5:46:35 | ...::log | test_logging.rs:46:27:46:34 | password | test_logging.rs:46:5:46:35 | ...::log | This operation writes $@ to a log file. | test_logging.rs:46:27:46:34 | password | password |
-| test_logging.rs:47:5:47:48 | ...::log | test_logging.rs:47:40:47:47 | password | test_logging.rs:47:5:47:48 | ...::log | This operation writes $@ to a log file. | test_logging.rs:47:40:47:47 | password | password |
-| test_logging.rs:52:5:52:36 | ...::log | test_logging.rs:52:28:52:35 | password | test_logging.rs:52:5:52:36 | ...::log | This operation writes $@ to a log file. | test_logging.rs:52:28:52:35 | password | password |
-| test_logging.rs:54:5:54:49 | ...::log | test_logging.rs:54:41:54:48 | password | test_logging.rs:54:5:54:49 | ...::log | This operation writes $@ to a log file. | test_logging.rs:54:41:54:48 | password | password |
-| test_logging.rs:56:5:56:47 | ...::log | test_logging.rs:56:39:56:46 | password | test_logging.rs:56:5:56:47 | ...::log | This operation writes $@ to a log file. | test_logging.rs:56:39:56:46 | password | password |
-| test_logging.rs:57:5:57:34 | ...::log | test_logging.rs:57:24:57:31 | password | test_logging.rs:57:5:57:34 | ...::log | This operation writes $@ to a log file. | test_logging.rs:57:24:57:31 | password | password |
-| test_logging.rs:58:5:58:36 | ...::log | test_logging.rs:58:24:58:31 | password | test_logging.rs:58:5:58:36 | ...::log | This operation writes $@ to a log file. | test_logging.rs:58:24:58:31 | password | password |
-| test_logging.rs:60:5:60:54 | ...::log | test_logging.rs:60:46:60:53 | password | test_logging.rs:60:5:60:54 | ...::log | This operation writes $@ to a log file. | test_logging.rs:60:46:60:53 | password | password |
-| test_logging.rs:61:5:61:55 | ...::log | test_logging.rs:61:21:61:28 | password | test_logging.rs:61:5:61:55 | ...::log | This operation writes $@ to a log file. | test_logging.rs:61:21:61:28 | password | password |
-| test_logging.rs:65:5:65:48 | ...::log | test_logging.rs:65:40:65:47 | password | test_logging.rs:65:5:65:48 | ...::log | This operation writes $@ to a log file. | test_logging.rs:65:40:65:47 | password | password |
-| test_logging.rs:67:5:67:66 | ...::log | test_logging.rs:67:58:67:65 | password | test_logging.rs:67:5:67:66 | ...::log | This operation writes $@ to a log file. | test_logging.rs:67:58:67:65 | password | password |
-| test_logging.rs:68:5:68:67 | ...::log | test_logging.rs:68:19:68:26 | password | test_logging.rs:68:5:68:67 | ...::log | This operation writes $@ to a log file. | test_logging.rs:68:19:68:26 | password | password |
-| test_logging.rs:72:5:72:47 | ...::log | test_logging.rs:72:39:72:46 | password | test_logging.rs:72:5:72:47 | ...::log | This operation writes $@ to a log file. | test_logging.rs:72:39:72:46 | password | password |
-| test_logging.rs:74:5:74:65 | ...::log | test_logging.rs:74:57:74:64 | password | test_logging.rs:74:5:74:65 | ...::log | This operation writes $@ to a log file. | test_logging.rs:74:57:74:64 | password | password |
-| test_logging.rs:75:5:75:51 | ...::log | test_logging.rs:75:21:75:28 | password | test_logging.rs:75:5:75:51 | ...::log | This operation writes $@ to a log file. | test_logging.rs:75:21:75:28 | password | password |
-| test_logging.rs:76:5:76:47 | ...::log | test_logging.rs:76:39:76:46 | password | test_logging.rs:76:5:76:47 | ...::log | This operation writes $@ to a log file. | test_logging.rs:76:39:76:46 | password | password |
-| test_logging.rs:82:5:82:44 | ...::log | test_logging.rs:82:36:82:43 | password | test_logging.rs:82:5:82:44 | ...::log | This operation writes $@ to a log file. | test_logging.rs:82:36:82:43 | password | password |
-| test_logging.rs:84:5:84:62 | ...::log | test_logging.rs:84:54:84:61 | password | test_logging.rs:84:5:84:62 | ...::log | This operation writes $@ to a log file. | test_logging.rs:84:54:84:61 | password | password |
-| test_logging.rs:85:5:85:48 | ...::log | test_logging.rs:85:21:85:28 | password | test_logging.rs:85:5:85:48 | ...::log | This operation writes $@ to a log file. | test_logging.rs:85:21:85:28 | password | password |
-| test_logging.rs:86:5:86:44 | ...::log | test_logging.rs:86:36:86:43 | password | test_logging.rs:86:5:86:44 | ...::log | This operation writes $@ to a log file. | test_logging.rs:86:36:86:43 | password | password |
-| test_logging.rs:94:5:94:29 | ...::log | test_logging.rs:93:15:93:22 | password | test_logging.rs:94:5:94:29 | ...::log | This operation writes $@ to a log file. | test_logging.rs:93:15:93:22 | password | password |
-| test_logging.rs:97:5:97:19 | ...::log | test_logging.rs:96:42:96:49 | password | test_logging.rs:97:5:97:19 | ...::log | This operation writes $@ to a log file. | test_logging.rs:96:42:96:49 | password | password |
-| test_logging.rs:100:5:100:19 | ...::log | test_logging.rs:99:38:99:45 | password | test_logging.rs:100:5:100:19 | ...::log | This operation writes $@ to a log file. | test_logging.rs:99:38:99:45 | password | password |
-| test_logging.rs:118:5:118:42 | ...::log | test_logging.rs:118:28:118:41 | get_password(...) | test_logging.rs:118:5:118:42 | ...::log | This operation writes $@ to a log file. | test_logging.rs:118:28:118:41 | get_password(...) | get_password(...) |
-| test_logging.rs:131:5:131:32 | ...::log | test_logging.rs:129:25:129:32 | password | test_logging.rs:131:5:131:32 | ...::log | This operation writes $@ to a log file. | test_logging.rs:129:25:129:32 | password | password |
-| test_logging.rs:141:5:141:38 | ...::log | test_logging.rs:141:27:141:37 | s1.password | test_logging.rs:141:5:141:38 | ...::log | This operation writes $@ to a log file. | test_logging.rs:141:27:141:37 | s1.password | s1.password |
-| test_logging.rs:151:5:151:38 | ...::log | test_logging.rs:151:27:151:37 | s2.password | test_logging.rs:151:5:151:38 | ...::log | This operation writes $@ to a log file. | test_logging.rs:151:27:151:37 | s2.password | s2.password |
+| test_logging.rs:42:5:42:10 | ...::log | test_logging.rs:42:28:42:35 | password | test_logging.rs:42:5:42:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:42:28:42:35 | password | password |
+| test_logging.rs:43:5:43:10 | ...::log | test_logging.rs:43:28:43:35 | password | test_logging.rs:43:5:43:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:43:28:43:35 | password | password |
+| test_logging.rs:44:5:44:9 | ...::log | test_logging.rs:44:27:44:34 | password | test_logging.rs:44:5:44:9 | ...::log | This operation writes $@ to a log file. | test_logging.rs:44:27:44:34 | password | password |
+| test_logging.rs:45:5:45:10 | ...::log | test_logging.rs:45:28:45:35 | password | test_logging.rs:45:5:45:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:45:28:45:35 | password | password |
+| test_logging.rs:46:5:46:9 | ...::log | test_logging.rs:46:27:46:34 | password | test_logging.rs:46:5:46:9 | ...::log | This operation writes $@ to a log file. | test_logging.rs:46:27:46:34 | password | password |
+| test_logging.rs:47:5:47:8 | ...::log | test_logging.rs:47:40:47:47 | password | test_logging.rs:47:5:47:8 | ...::log | This operation writes $@ to a log file. | test_logging.rs:47:40:47:47 | password | password |
+| test_logging.rs:52:5:52:10 | ...::log | test_logging.rs:52:28:52:35 | password | test_logging.rs:52:5:52:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:52:28:52:35 | password | password |
+| test_logging.rs:54:5:54:10 | ...::log | test_logging.rs:54:41:54:48 | password | test_logging.rs:54:5:54:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:54:41:54:48 | password | password |
+| test_logging.rs:56:5:56:10 | ...::log | test_logging.rs:56:39:56:46 | password | test_logging.rs:56:5:56:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:56:39:56:46 | password | password |
+| test_logging.rs:57:5:57:10 | ...::log | test_logging.rs:57:24:57:31 | password | test_logging.rs:57:5:57:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:57:24:57:31 | password | password |
+| test_logging.rs:58:5:58:10 | ...::log | test_logging.rs:58:24:58:31 | password | test_logging.rs:58:5:58:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:58:24:58:31 | password | password |
+| test_logging.rs:60:5:60:10 | ...::log | test_logging.rs:60:46:60:53 | password | test_logging.rs:60:5:60:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:60:46:60:53 | password | password |
+| test_logging.rs:61:5:61:10 | ...::log | test_logging.rs:61:21:61:28 | password | test_logging.rs:61:5:61:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:61:21:61:28 | password | password |
+| test_logging.rs:65:5:65:8 | ...::log | test_logging.rs:65:40:65:47 | password | test_logging.rs:65:5:65:8 | ...::log | This operation writes $@ to a log file. | test_logging.rs:65:40:65:47 | password | password |
+| test_logging.rs:67:5:67:8 | ...::log | test_logging.rs:67:58:67:65 | password | test_logging.rs:67:5:67:8 | ...::log | This operation writes $@ to a log file. | test_logging.rs:67:58:67:65 | password | password |
+| test_logging.rs:68:5:68:8 | ...::log | test_logging.rs:68:19:68:26 | password | test_logging.rs:68:5:68:8 | ...::log | This operation writes $@ to a log file. | test_logging.rs:68:19:68:26 | password | password |
+| test_logging.rs:72:5:72:10 | ...::log | test_logging.rs:72:39:72:46 | password | test_logging.rs:72:5:72:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:72:39:72:46 | password | password |
+| test_logging.rs:74:5:74:10 | ...::log | test_logging.rs:74:57:74:64 | password | test_logging.rs:74:5:74:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:74:57:74:64 | password | password |
+| test_logging.rs:75:5:75:10 | ...::log | test_logging.rs:75:21:75:28 | password | test_logging.rs:75:5:75:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:75:21:75:28 | password | password |
+| test_logging.rs:76:5:76:10 | ...::log | test_logging.rs:76:39:76:46 | password | test_logging.rs:76:5:76:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:76:39:76:46 | password | password |
+| test_logging.rs:82:5:82:10 | ...::log | test_logging.rs:82:36:82:43 | password | test_logging.rs:82:5:82:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:82:36:82:43 | password | password |
+| test_logging.rs:84:5:84:10 | ...::log | test_logging.rs:84:54:84:61 | password | test_logging.rs:84:5:84:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:84:54:84:61 | password | password |
+| test_logging.rs:85:5:85:10 | ...::log | test_logging.rs:85:21:85:28 | password | test_logging.rs:85:5:85:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:85:21:85:28 | password | password |
+| test_logging.rs:86:5:86:10 | ...::log | test_logging.rs:86:36:86:43 | password | test_logging.rs:86:5:86:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:86:36:86:43 | password | password |
+| test_logging.rs:94:5:94:9 | ...::log | test_logging.rs:93:15:93:22 | password | test_logging.rs:94:5:94:9 | ...::log | This operation writes $@ to a log file. | test_logging.rs:93:15:93:22 | password | password |
+| test_logging.rs:97:5:97:9 | ...::log | test_logging.rs:96:42:96:49 | password | test_logging.rs:97:5:97:9 | ...::log | This operation writes $@ to a log file. | test_logging.rs:96:42:96:49 | password | password |
+| test_logging.rs:100:5:100:9 | ...::log | test_logging.rs:99:38:99:45 | password | test_logging.rs:100:5:100:9 | ...::log | This operation writes $@ to a log file. | test_logging.rs:99:38:99:45 | password | password |
+| test_logging.rs:118:5:118:10 | ...::log | test_logging.rs:118:28:118:41 | get_password(...) | test_logging.rs:118:5:118:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:118:28:118:41 | get_password(...) | get_password(...) |
+| test_logging.rs:131:5:131:10 | ...::log | test_logging.rs:129:25:129:32 | password | test_logging.rs:131:5:131:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:129:25:129:32 | password | password |
+| test_logging.rs:141:5:141:9 | ...::log | test_logging.rs:141:27:141:37 | s1.password | test_logging.rs:141:5:141:9 | ...::log | This operation writes $@ to a log file. | test_logging.rs:141:27:141:37 | s1.password | s1.password |
+| test_logging.rs:151:5:151:9 | ...::log | test_logging.rs:151:27:151:37 | s2.password | test_logging.rs:151:5:151:9 | ...::log | This operation writes $@ to a log file. | test_logging.rs:151:27:151:37 | s2.password | s2.password |
 | test_logging.rs:176:22:176:31 | log_expect | test_logging.rs:176:70:176:78 | password2 | test_logging.rs:176:22:176:31 | log_expect | This operation writes $@ to a log file. | test_logging.rs:176:70:176:78 | password2 | password2 |
 | test_logging.rs:180:24:180:33 | log_expect | test_logging.rs:180:72:180:80 | password2 | test_logging.rs:180:24:180:33 | log_expect | This operation writes $@ to a log file. | test_logging.rs:180:72:180:80 | password2 | password2 |
 | test_logging.rs:184:25:184:34 | log_expect | test_logging.rs:183:51:183:59 | password2 | test_logging.rs:184:25:184:34 | log_expect | This operation writes $@ to a log file. | test_logging.rs:183:51:183:59 | password2 | password2 |
 | test_logging.rs:188:25:188:34 | log_unwrap | test_logging.rs:187:51:187:59 | password2 | test_logging.rs:188:25:188:34 | log_unwrap | This operation writes $@ to a log file. | test_logging.rs:187:51:187:59 | password2 | password2 |
-| test_logging.rs:192:5:192:38 | ...::_print | test_logging.rs:192:30:192:37 | password | test_logging.rs:192:5:192:38 | ...::_print | This operation writes $@ to a log file. | test_logging.rs:192:30:192:37 | password | password |
-| test_logging.rs:193:5:193:38 | ...::_print | test_logging.rs:193:30:193:37 | password | test_logging.rs:193:5:193:38 | ...::_print | This operation writes $@ to a log file. | test_logging.rs:193:30:193:37 | password | password |
-| test_logging.rs:194:5:194:39 | ...::_eprint | test_logging.rs:194:31:194:38 | password | test_logging.rs:194:5:194:39 | ...::_eprint | This operation writes $@ to a log file. | test_logging.rs:194:31:194:38 | password | password |
-| test_logging.rs:195:5:195:39 | ...::_eprint | test_logging.rs:195:31:195:38 | password | test_logging.rs:195:5:195:39 | ...::_eprint | This operation writes $@ to a log file. | test_logging.rs:195:31:195:38 | password | password |
-| test_logging.rs:199:13:199:44 | ...::panic_fmt | test_logging.rs:199:36:199:43 | password | test_logging.rs:199:13:199:44 | ...::panic_fmt | This operation writes $@ to a log file. | test_logging.rs:199:36:199:43 | password | password |
-| test_logging.rs:202:13:202:43 | ...::panic_fmt | test_logging.rs:202:35:202:42 | password | test_logging.rs:202:13:202:43 | ...::panic_fmt | This operation writes $@ to a log file. | test_logging.rs:202:35:202:42 | password | password |
-| test_logging.rs:205:13:205:52 | ...::panic_fmt | test_logging.rs:205:44:205:51 | password | test_logging.rs:205:13:205:52 | ...::panic_fmt | This operation writes $@ to a log file. | test_logging.rs:205:44:205:51 | password | password |
-| test_logging.rs:208:13:208:50 | ...::panic_fmt | test_logging.rs:208:42:208:49 | password | test_logging.rs:208:13:208:50 | ...::panic_fmt | This operation writes $@ to a log file. | test_logging.rs:208:42:208:49 | password | password |
-| test_logging.rs:211:13:211:52 | ...::panic_fmt | test_logging.rs:211:44:211:51 | password | test_logging.rs:211:13:211:52 | ...::panic_fmt | This operation writes $@ to a log file. | test_logging.rs:211:44:211:51 | password | password |
-| test_logging.rs:214:13:214:54 | ...::assert_failed | test_logging.rs:214:46:214:53 | password | test_logging.rs:214:13:214:54 | ...::assert_failed | This operation writes $@ to a log file. | test_logging.rs:214:46:214:53 | password | password |
-| test_logging.rs:217:13:217:54 | ...::assert_failed | test_logging.rs:217:46:217:53 | password | test_logging.rs:217:13:217:54 | ...::assert_failed | This operation writes $@ to a log file. | test_logging.rs:217:46:217:53 | password | password |
-| test_logging.rs:220:13:220:58 | ...::panic_fmt | test_logging.rs:220:50:220:57 | password | test_logging.rs:220:13:220:58 | ...::panic_fmt | This operation writes $@ to a log file. | test_logging.rs:220:50:220:57 | password | password |
-| test_logging.rs:223:13:223:60 | ...::assert_failed | test_logging.rs:223:52:223:59 | password | test_logging.rs:223:13:223:60 | ...::assert_failed | This operation writes $@ to a log file. | test_logging.rs:223:52:223:59 | password | password |
-| test_logging.rs:226:13:226:60 | ...::assert_failed | test_logging.rs:226:52:226:59 | password | test_logging.rs:226:13:226:60 | ...::assert_failed | This operation writes $@ to a log file. | test_logging.rs:226:52:226:59 | password | password |
+| test_logging.rs:192:5:192:10 | ...::_print | test_logging.rs:192:30:192:37 | password | test_logging.rs:192:5:192:10 | ...::_print | This operation writes $@ to a log file. | test_logging.rs:192:30:192:37 | password | password |
+| test_logging.rs:193:5:193:12 | ...::_print | test_logging.rs:193:30:193:37 | password | test_logging.rs:193:5:193:12 | ...::_print | This operation writes $@ to a log file. | test_logging.rs:193:30:193:37 | password | password |
+| test_logging.rs:194:5:194:11 | ...::_eprint | test_logging.rs:194:31:194:38 | password | test_logging.rs:194:5:194:11 | ...::_eprint | This operation writes $@ to a log file. | test_logging.rs:194:31:194:38 | password | password |
+| test_logging.rs:195:5:195:13 | ...::_eprint | test_logging.rs:195:31:195:38 | password | test_logging.rs:195:5:195:13 | ...::_eprint | This operation writes $@ to a log file. | test_logging.rs:195:31:195:38 | password | password |
+| test_logging.rs:199:13:199:18 | ...::panic_fmt | test_logging.rs:199:36:199:43 | password | test_logging.rs:199:13:199:18 | ...::panic_fmt | This operation writes $@ to a log file. | test_logging.rs:199:36:199:43 | password | password |
+| test_logging.rs:202:13:202:17 | ...::panic_fmt | test_logging.rs:202:35:202:42 | password | test_logging.rs:202:13:202:17 | ...::panic_fmt | This operation writes $@ to a log file. | test_logging.rs:202:35:202:42 | password | password |
+| test_logging.rs:205:13:205:26 | ...::panic_fmt | test_logging.rs:205:44:205:51 | password | test_logging.rs:205:13:205:26 | ...::panic_fmt | This operation writes $@ to a log file. | test_logging.rs:205:44:205:51 | password | password |
+| test_logging.rs:208:13:208:24 | ...::panic_fmt | test_logging.rs:208:42:208:49 | password | test_logging.rs:208:13:208:24 | ...::panic_fmt | This operation writes $@ to a log file. | test_logging.rs:208:42:208:49 | password | password |
+| test_logging.rs:211:13:211:19 | ...::panic_fmt | test_logging.rs:211:44:211:51 | password | test_logging.rs:211:13:211:19 | ...::panic_fmt | This operation writes $@ to a log file. | test_logging.rs:211:44:211:51 | password | password |
+| test_logging.rs:214:13:214:22 | ...::assert_failed | test_logging.rs:214:46:214:53 | password | test_logging.rs:214:13:214:22 | ...::assert_failed | This operation writes $@ to a log file. | test_logging.rs:214:46:214:53 | password | password |
+| test_logging.rs:217:13:217:22 | ...::assert_failed | test_logging.rs:217:46:217:53 | password | test_logging.rs:217:13:217:22 | ...::assert_failed | This operation writes $@ to a log file. | test_logging.rs:217:46:217:53 | password | password |
+| test_logging.rs:220:13:220:25 | ...::panic_fmt | test_logging.rs:220:50:220:57 | password | test_logging.rs:220:13:220:25 | ...::panic_fmt | This operation writes $@ to a log file. | test_logging.rs:220:50:220:57 | password | password |
+| test_logging.rs:223:13:223:28 | ...::assert_failed | test_logging.rs:223:52:223:59 | password | test_logging.rs:223:13:223:28 | ...::assert_failed | This operation writes $@ to a log file. | test_logging.rs:223:52:223:59 | password | password |
+| test_logging.rs:226:13:226:28 | ...::assert_failed | test_logging.rs:226:52:226:59 | password | test_logging.rs:226:13:226:28 | ...::assert_failed | This operation writes $@ to a log file. | test_logging.rs:226:52:226:59 | password | password |
 | test_logging.rs:229:23:229:28 | expect | test_logging.rs:229:54:229:61 | password | test_logging.rs:229:23:229:28 | expect | This operation writes $@ to a log file. | test_logging.rs:229:54:229:61 | password | password |
 | test_logging.rs:229:23:229:28 | expect | test_logging.rs:229:54:229:61 | password | test_logging.rs:229:23:229:28 | expect | This operation writes $@ to a log file. | test_logging.rs:229:54:229:61 | password | password |
 | test_logging.rs:242:10:242:14 | write | test_logging.rs:242:42:242:49 | password | test_logging.rs:242:10:242:14 | write | This operation writes $@ to a log file. | test_logging.rs:242:42:242:49 | password | password |
@@ -55,116 +55,119 @@
 | test_logging.rs:248:9:248:13 | write | test_logging.rs:248:41:248:48 | password | test_logging.rs:248:9:248:13 | write | This operation writes $@ to a log file. | test_logging.rs:248:41:248:48 | password | password |
 | test_logging.rs:251:9:251:13 | write | test_logging.rs:251:41:251:48 | password | test_logging.rs:251:9:251:13 | write | This operation writes $@ to a log file. | test_logging.rs:251:41:251:48 | password | password |
 edges
-| test_logging.rs:42:12:42:35 | MacroExpr | test_logging.rs:42:5:42:36 | ...::log | provenance | MaD:12 Sink:MaD:12 |
+| test_logging.rs:42:12:42:35 | MacroExpr | test_logging.rs:42:5:42:10 | ...::log | provenance | MaD:12 Sink:MaD:12 |
 | test_logging.rs:42:28:42:35 | password | test_logging.rs:42:12:42:35 | MacroExpr | provenance |  |
-| test_logging.rs:43:12:43:35 | MacroExpr | test_logging.rs:43:5:43:36 | ...::log | provenance | MaD:12 Sink:MaD:12 |
+| test_logging.rs:43:12:43:35 | MacroExpr | test_logging.rs:43:5:43:10 | ...::log | provenance | MaD:12 Sink:MaD:12 |
 | test_logging.rs:43:28:43:35 | password | test_logging.rs:43:12:43:35 | MacroExpr | provenance |  |
-| test_logging.rs:44:11:44:34 | MacroExpr | test_logging.rs:44:5:44:35 | ...::log | provenance | MaD:12 Sink:MaD:12 |
+| test_logging.rs:44:11:44:34 | MacroExpr | test_logging.rs:44:5:44:9 | ...::log | provenance | MaD:12 Sink:MaD:12 |
 | test_logging.rs:44:27:44:34 | password | test_logging.rs:44:11:44:34 | MacroExpr | provenance |  |
-| test_logging.rs:45:12:45:35 | MacroExpr | test_logging.rs:45:5:45:36 | ...::log | provenance | MaD:12 Sink:MaD:12 |
+| test_logging.rs:45:12:45:35 | MacroExpr | test_logging.rs:45:5:45:10 | ...::log | provenance | MaD:12 Sink:MaD:12 |
 | test_logging.rs:45:28:45:35 | password | test_logging.rs:45:12:45:35 | MacroExpr | provenance |  |
-| test_logging.rs:46:11:46:34 | MacroExpr | test_logging.rs:46:5:46:35 | ...::log | provenance | MaD:12 Sink:MaD:12 |
+| test_logging.rs:46:11:46:34 | MacroExpr | test_logging.rs:46:5:46:9 | ...::log | provenance | MaD:12 Sink:MaD:12 |
 | test_logging.rs:46:27:46:34 | password | test_logging.rs:46:11:46:34 | MacroExpr | provenance |  |
-| test_logging.rs:47:24:47:47 | MacroExpr | test_logging.rs:47:5:47:48 | ...::log | provenance | MaD:12 Sink:MaD:12 |
+| test_logging.rs:47:24:47:47 | MacroExpr | test_logging.rs:47:5:47:8 | ...::log | provenance | MaD:12 Sink:MaD:12 |
 | test_logging.rs:47:40:47:47 | password | test_logging.rs:47:24:47:47 | MacroExpr | provenance |  |
-| test_logging.rs:52:12:52:35 | MacroExpr | test_logging.rs:52:5:52:36 | ...::log | provenance | MaD:12 Sink:MaD:12 |
+| test_logging.rs:52:12:52:35 | MacroExpr | test_logging.rs:52:5:52:10 | ...::log | provenance | MaD:12 Sink:MaD:12 |
 | test_logging.rs:52:28:52:35 | password | test_logging.rs:52:12:52:35 | MacroExpr | provenance |  |
-| test_logging.rs:54:12:54:48 | MacroExpr | test_logging.rs:54:5:54:49 | ...::log | provenance | MaD:12 Sink:MaD:12 |
+| test_logging.rs:54:12:54:48 | MacroExpr | test_logging.rs:54:5:54:10 | ...::log | provenance | MaD:12 Sink:MaD:12 |
 | test_logging.rs:54:41:54:48 | password | test_logging.rs:54:12:54:48 | MacroExpr | provenance |  |
-| test_logging.rs:56:12:56:46 | MacroExpr | test_logging.rs:56:5:56:47 | ...::log | provenance | MaD:12 Sink:MaD:12 |
+| test_logging.rs:56:12:56:46 | MacroExpr | test_logging.rs:56:5:56:10 | ...::log | provenance | MaD:12 Sink:MaD:12 |
 | test_logging.rs:56:39:56:46 | password | test_logging.rs:56:12:56:46 | MacroExpr | provenance |  |
-| test_logging.rs:57:12:57:33 | MacroExpr | test_logging.rs:57:5:57:34 | ...::log | provenance | MaD:12 Sink:MaD:12 |
+| test_logging.rs:57:12:57:33 | MacroExpr | test_logging.rs:57:5:57:10 | ...::log | provenance | MaD:12 Sink:MaD:12 |
 | test_logging.rs:57:24:57:31 | password | test_logging.rs:57:12:57:33 | MacroExpr | provenance |  |
-| test_logging.rs:58:12:58:35 | MacroExpr | test_logging.rs:58:5:58:36 | ...::log | provenance | MaD:12 Sink:MaD:12 |
+| test_logging.rs:58:12:58:35 | MacroExpr | test_logging.rs:58:5:58:10 | ...::log | provenance | MaD:12 Sink:MaD:12 |
 | test_logging.rs:58:24:58:31 | password | test_logging.rs:58:12:58:35 | MacroExpr | provenance |  |
-| test_logging.rs:60:30:60:53 | MacroExpr | test_logging.rs:60:5:60:54 | ...::log | provenance | MaD:12 Sink:MaD:12 |
+| test_logging.rs:60:30:60:53 | MacroExpr | test_logging.rs:60:5:60:10 | ...::log | provenance | MaD:12 Sink:MaD:12 |
 | test_logging.rs:60:46:60:53 | password | test_logging.rs:60:30:60:53 | MacroExpr | provenance |  |
-| test_logging.rs:61:20:61:28 | &... [&ref, tuple.0, &ref] | test_logging.rs:61:5:61:55 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 |
-| test_logging.rs:61:20:61:28 | &... [&ref, tuple.0, &ref] | test_logging.rs:61:5:61:55 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 Sink:MaD:13 |
-| test_logging.rs:61:20:61:28 | &... [&ref, tuple.0] | test_logging.rs:61:5:61:55 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 |
+| test_logging.rs:61:20:61:28 | &... [&ref, tuple.0, &ref] | test_logging.rs:61:5:61:10 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 |
+| test_logging.rs:61:20:61:28 | &... [&ref, tuple.0, &ref] | test_logging.rs:61:5:61:10 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 Sink:MaD:13 |
+| test_logging.rs:61:20:61:28 | &... [&ref, tuple.0] | test_logging.rs:61:5:61:10 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 |
 | test_logging.rs:61:20:61:28 | &password | test_logging.rs:61:20:61:28 | TupleExpr [tuple.0] | provenance |  |
 | test_logging.rs:61:20:61:28 | &password [&ref] | test_logging.rs:61:20:61:28 | TupleExpr [tuple.0, &ref] | provenance |  |
 | test_logging.rs:61:20:61:28 | TupleExpr [tuple.0, &ref] | test_logging.rs:61:20:61:28 | &... [&ref, tuple.0, &ref] | provenance |  |
 | test_logging.rs:61:20:61:28 | TupleExpr [tuple.0] | test_logging.rs:61:20:61:28 | &... [&ref, tuple.0] | provenance |  |
 | test_logging.rs:61:21:61:28 | password | test_logging.rs:61:20:61:28 | &password | provenance | Config |
 | test_logging.rs:61:21:61:28 | password | test_logging.rs:61:20:61:28 | &password [&ref] | provenance |  |
-| test_logging.rs:65:24:65:47 | MacroExpr | test_logging.rs:65:5:65:48 | ...::log | provenance | MaD:12 Sink:MaD:12 |
+| test_logging.rs:65:24:65:47 | MacroExpr | test_logging.rs:65:5:65:8 | ...::log | provenance | MaD:12 Sink:MaD:12 |
 | test_logging.rs:65:40:65:47 | password | test_logging.rs:65:24:65:47 | MacroExpr | provenance |  |
-| test_logging.rs:67:42:67:65 | MacroExpr | test_logging.rs:67:5:67:66 | ...::log | provenance | MaD:12 Sink:MaD:12 |
+| test_logging.rs:67:42:67:65 | MacroExpr | test_logging.rs:67:5:67:8 | ...::log | provenance | MaD:12 Sink:MaD:12 |
 | test_logging.rs:67:58:67:65 | password | test_logging.rs:67:42:67:65 | MacroExpr | provenance |  |
-| test_logging.rs:68:18:68:26 | &... [&ref, tuple.0, &ref] | test_logging.rs:68:5:68:67 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 |
-| test_logging.rs:68:18:68:26 | &... [&ref, tuple.0, &ref] | test_logging.rs:68:5:68:67 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 Sink:MaD:13 |
-| test_logging.rs:68:18:68:26 | &... [&ref, tuple.0] | test_logging.rs:68:5:68:67 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 |
+| test_logging.rs:68:18:68:26 | &... [&ref, tuple.0, &ref] | test_logging.rs:68:5:68:8 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 |
+| test_logging.rs:68:18:68:26 | &... [&ref, tuple.0, &ref] | test_logging.rs:68:5:68:8 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 Sink:MaD:13 |
+| test_logging.rs:68:18:68:26 | &... [&ref, tuple.0] | test_logging.rs:68:5:68:8 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 |
 | test_logging.rs:68:18:68:26 | &password | test_logging.rs:68:18:68:26 | TupleExpr [tuple.0] | provenance |  |
 | test_logging.rs:68:18:68:26 | &password [&ref] | test_logging.rs:68:18:68:26 | TupleExpr [tuple.0, &ref] | provenance |  |
 | test_logging.rs:68:18:68:26 | TupleExpr [tuple.0, &ref] | test_logging.rs:68:18:68:26 | &... [&ref, tuple.0, &ref] | provenance |  |
 | test_logging.rs:68:18:68:26 | TupleExpr [tuple.0] | test_logging.rs:68:18:68:26 | &... [&ref, tuple.0] | provenance |  |
 | test_logging.rs:68:19:68:26 | password | test_logging.rs:68:18:68:26 | &password | provenance | Config |
 | test_logging.rs:68:19:68:26 | password | test_logging.rs:68:18:68:26 | &password [&ref] | provenance |  |
-| test_logging.rs:72:23:72:46 | MacroExpr | test_logging.rs:72:5:72:47 | ...::log | provenance | MaD:12 Sink:MaD:12 |
+| test_logging.rs:72:23:72:46 | MacroExpr | test_logging.rs:72:5:72:10 | ...::log | provenance | MaD:12 Sink:MaD:12 |
 | test_logging.rs:72:39:72:46 | password | test_logging.rs:72:23:72:46 | MacroExpr | provenance |  |
-| test_logging.rs:74:41:74:64 | MacroExpr | test_logging.rs:74:5:74:65 | ...::log | provenance | MaD:12 Sink:MaD:12 |
+| test_logging.rs:74:41:74:64 | MacroExpr | test_logging.rs:74:5:74:10 | ...::log | provenance | MaD:12 Sink:MaD:12 |
 | test_logging.rs:74:57:74:64 | password | test_logging.rs:74:41:74:64 | MacroExpr | provenance |  |
-| test_logging.rs:75:20:75:28 | &... [&ref, tuple.0, &ref] | test_logging.rs:75:5:75:51 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 |
-| test_logging.rs:75:20:75:28 | &... [&ref, tuple.0, &ref] | test_logging.rs:75:5:75:51 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 Sink:MaD:13 |
-| test_logging.rs:75:20:75:28 | &... [&ref, tuple.0] | test_logging.rs:75:5:75:51 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 |
+| test_logging.rs:75:20:75:28 | &... [&ref, tuple.0, &ref] | test_logging.rs:75:5:75:10 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 |
+| test_logging.rs:75:20:75:28 | &... [&ref, tuple.0, &ref] | test_logging.rs:75:5:75:10 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 Sink:MaD:13 |
+| test_logging.rs:75:20:75:28 | &... [&ref, tuple.0] | test_logging.rs:75:5:75:10 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 |
 | test_logging.rs:75:20:75:28 | &password | test_logging.rs:75:20:75:28 | TupleExpr [tuple.0] | provenance |  |
 | test_logging.rs:75:20:75:28 | &password [&ref] | test_logging.rs:75:20:75:28 | TupleExpr [tuple.0, &ref] | provenance |  |
 | test_logging.rs:75:20:75:28 | TupleExpr [tuple.0, &ref] | test_logging.rs:75:20:75:28 | &... [&ref, tuple.0, &ref] | provenance |  |
 | test_logging.rs:75:20:75:28 | TupleExpr [tuple.0] | test_logging.rs:75:20:75:28 | &... [&ref, tuple.0] | provenance |  |
 | test_logging.rs:75:21:75:28 | password | test_logging.rs:75:20:75:28 | &password | provenance | Config |
 | test_logging.rs:75:21:75:28 | password | test_logging.rs:75:20:75:28 | &password [&ref] | provenance |  |
-| test_logging.rs:76:23:76:46 | MacroExpr | test_logging.rs:76:5:76:47 | ...::log | provenance | MaD:12 Sink:MaD:12 |
+| test_logging.rs:76:23:76:46 | MacroExpr | test_logging.rs:76:5:76:10 | ...::log | provenance | MaD:12 Sink:MaD:12 |
 | test_logging.rs:76:39:76:46 | password | test_logging.rs:76:23:76:46 | MacroExpr | provenance |  |
-| test_logging.rs:82:20:82:43 | MacroExpr | test_logging.rs:82:5:82:44 | ...::log | provenance | MaD:12 Sink:MaD:12 |
+| test_logging.rs:82:20:82:43 | MacroExpr | test_logging.rs:82:5:82:10 | ...::log | provenance | MaD:12 Sink:MaD:12 |
 | test_logging.rs:82:36:82:43 | password | test_logging.rs:82:20:82:43 | MacroExpr | provenance |  |
-| test_logging.rs:84:38:84:61 | MacroExpr | test_logging.rs:84:5:84:62 | ...::log | provenance | MaD:12 Sink:MaD:12 |
+| test_logging.rs:84:38:84:61 | MacroExpr | test_logging.rs:84:5:84:10 | ...::log | provenance | MaD:12 Sink:MaD:12 |
 | test_logging.rs:84:54:84:61 | password | test_logging.rs:84:38:84:61 | MacroExpr | provenance |  |
-| test_logging.rs:85:20:85:28 | &... [&ref, tuple.0, &ref] | test_logging.rs:85:5:85:48 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 |
-| test_logging.rs:85:20:85:28 | &... [&ref, tuple.0, &ref] | test_logging.rs:85:5:85:48 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 Sink:MaD:13 |
-| test_logging.rs:85:20:85:28 | &... [&ref, tuple.0] | test_logging.rs:85:5:85:48 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 |
+| test_logging.rs:85:20:85:28 | &... [&ref, tuple.0, &ref] | test_logging.rs:85:5:85:10 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 |
+| test_logging.rs:85:20:85:28 | &... [&ref, tuple.0, &ref] | test_logging.rs:85:5:85:10 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 Sink:MaD:13 |
+| test_logging.rs:85:20:85:28 | &... [&ref, tuple.0] | test_logging.rs:85:5:85:10 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 |
 | test_logging.rs:85:20:85:28 | &password | test_logging.rs:85:20:85:28 | TupleExpr [tuple.0] | provenance |  |
 | test_logging.rs:85:20:85:28 | &password [&ref] | test_logging.rs:85:20:85:28 | TupleExpr [tuple.0, &ref] | provenance |  |
 | test_logging.rs:85:20:85:28 | TupleExpr [tuple.0, &ref] | test_logging.rs:85:20:85:28 | &... [&ref, tuple.0, &ref] | provenance |  |
 | test_logging.rs:85:20:85:28 | TupleExpr [tuple.0] | test_logging.rs:85:20:85:28 | &... [&ref, tuple.0] | provenance |  |
 | test_logging.rs:85:21:85:28 | password | test_logging.rs:85:20:85:28 | &password | provenance | Config |
 | test_logging.rs:85:21:85:28 | password | test_logging.rs:85:20:85:28 | &password [&ref] | provenance |  |
-| test_logging.rs:86:20:86:43 | MacroExpr | test_logging.rs:86:5:86:44 | ...::log | provenance | MaD:12 Sink:MaD:12 |
+| test_logging.rs:86:20:86:43 | MacroExpr | test_logging.rs:86:5:86:10 | ...::log | provenance | MaD:12 Sink:MaD:12 |
 | test_logging.rs:86:36:86:43 | password | test_logging.rs:86:20:86:43 | MacroExpr | provenance |  |
 | test_logging.rs:93:9:93:10 | m1 | test_logging.rs:94:11:94:28 | MacroExpr | provenance |  |
 | test_logging.rs:93:14:93:22 | &password | test_logging.rs:93:9:93:10 | m1 | provenance |  |
 | test_logging.rs:93:15:93:22 | password | test_logging.rs:93:14:93:22 | &password | provenance | Config |
-| test_logging.rs:94:11:94:28 | MacroExpr | test_logging.rs:94:5:94:29 | ...::log | provenance | MaD:12 Sink:MaD:12 |
+| test_logging.rs:94:11:94:28 | MacroExpr | test_logging.rs:94:5:94:9 | ...::log | provenance | MaD:12 Sink:MaD:12 |
 | test_logging.rs:96:9:96:10 | m2 | test_logging.rs:97:11:97:18 | MacroExpr | provenance |  |
+| test_logging.rs:96:14:96:49 | ... + ... | test_logging.rs:96:9:96:10 | m2 | provenance |  |
 | test_logging.rs:96:41:96:49 | &password | test_logging.rs:96:9:96:10 | m2 | provenance |  |
+| test_logging.rs:96:41:96:49 | &password | test_logging.rs:96:14:96:49 | ... + ... | provenance | MaD:18 |
+| test_logging.rs:96:41:96:49 | &password | test_logging.rs:96:14:96:49 | ... + ... | provenance | MaD:17 |
+| test_logging.rs:96:41:96:49 | &password [&ref] | test_logging.rs:96:14:96:49 | ... + ... | provenance | MaD:17 |
 | test_logging.rs:96:42:96:49 | password | test_logging.rs:96:41:96:49 | &password | provenance | Config |
-| test_logging.rs:97:11:97:18 | MacroExpr | test_logging.rs:97:5:97:19 | ...::log | provenance | MaD:12 Sink:MaD:12 |
+| test_logging.rs:96:42:96:49 | password | test_logging.rs:96:41:96:49 | &password [&ref] | provenance |  |
+| test_logging.rs:97:11:97:18 | MacroExpr | test_logging.rs:97:5:97:9 | ...::log | provenance | MaD:12 Sink:MaD:12 |
 | test_logging.rs:99:9:99:10 | m3 | test_logging.rs:100:11:100:18 | MacroExpr | provenance |  |
-| test_logging.rs:99:14:99:46 | res | test_logging.rs:99:22:99:45 | { ... } | provenance |  |
-| test_logging.rs:99:22:99:45 | ...::format(...) | test_logging.rs:99:14:99:46 | res | provenance |  |
+| test_logging.rs:99:22:99:45 | ...::format(...) | test_logging.rs:99:22:99:45 | { ... } | provenance |  |
 | test_logging.rs:99:22:99:45 | ...::must_use(...) | test_logging.rs:99:9:99:10 | m3 | provenance |  |
 | test_logging.rs:99:22:99:45 | MacroExpr | test_logging.rs:99:22:99:45 | ...::format(...) | provenance | MaD:21 |
 | test_logging.rs:99:22:99:45 | { ... } | test_logging.rs:99:22:99:45 | ...::must_use(...) | provenance | MaD:22 |
 | test_logging.rs:99:38:99:45 | password | test_logging.rs:99:22:99:45 | MacroExpr | provenance |  |
-| test_logging.rs:100:11:100:18 | MacroExpr | test_logging.rs:100:5:100:19 | ...::log | provenance | MaD:12 Sink:MaD:12 |
-| test_logging.rs:118:12:118:41 | MacroExpr | test_logging.rs:118:5:118:42 | ...::log | provenance | MaD:12 Sink:MaD:12 |
+| test_logging.rs:100:11:100:18 | MacroExpr | test_logging.rs:100:5:100:9 | ...::log | provenance | MaD:12 Sink:MaD:12 |
+| test_logging.rs:118:12:118:41 | MacroExpr | test_logging.rs:118:5:118:10 | ...::log | provenance | MaD:12 Sink:MaD:12 |
 | test_logging.rs:118:28:118:41 | get_password(...) | test_logging.rs:118:12:118:41 | MacroExpr | provenance |  |
 | test_logging.rs:129:9:129:10 | t1 [tuple.1] | test_logging.rs:131:28:131:29 | t1 [tuple.1] | provenance |  |
 | test_logging.rs:129:14:129:33 | TupleExpr [tuple.1] | test_logging.rs:129:9:129:10 | t1 [tuple.1] | provenance |  |
 | test_logging.rs:129:25:129:32 | password | test_logging.rs:129:14:129:33 | TupleExpr [tuple.1] | provenance |  |
-| test_logging.rs:131:12:131:31 | MacroExpr | test_logging.rs:131:5:131:32 | ...::log | provenance | MaD:12 Sink:MaD:12 |
+| test_logging.rs:131:12:131:31 | MacroExpr | test_logging.rs:131:5:131:10 | ...::log | provenance | MaD:12 Sink:MaD:12 |
 | test_logging.rs:131:28:131:29 | t1 [tuple.1] | test_logging.rs:131:28:131:31 | t1.1 | provenance |  |
 | test_logging.rs:131:28:131:31 | t1.1 | test_logging.rs:131:12:131:31 | MacroExpr | provenance |  |
-| test_logging.rs:141:11:141:37 | MacroExpr | test_logging.rs:141:5:141:38 | ...::log | provenance | MaD:12 Sink:MaD:12 |
+| test_logging.rs:141:11:141:37 | MacroExpr | test_logging.rs:141:5:141:9 | ...::log | provenance | MaD:12 Sink:MaD:12 |
 | test_logging.rs:141:27:141:37 | s1.password | test_logging.rs:141:11:141:37 | MacroExpr | provenance |  |
-| test_logging.rs:151:11:151:37 | MacroExpr | test_logging.rs:151:5:151:38 | ...::log | provenance | MaD:12 Sink:MaD:12 |
+| test_logging.rs:151:11:151:37 | MacroExpr | test_logging.rs:151:5:151:9 | ...::log | provenance | MaD:12 Sink:MaD:12 |
 | test_logging.rs:151:27:151:37 | s2.password | test_logging.rs:151:11:151:37 | MacroExpr | provenance |  |
 | test_logging.rs:176:33:176:79 | &... | test_logging.rs:176:22:176:31 | log_expect | provenance | MaD:1 Sink:MaD:1 |
 | test_logging.rs:176:33:176:79 | &... [&ref] | test_logging.rs:176:22:176:31 | log_expect | provenance | MaD:1 Sink:MaD:1 |
 | test_logging.rs:176:34:176:79 | MacroExpr | test_logging.rs:176:33:176:79 | &... | provenance | Config |
 | test_logging.rs:176:34:176:79 | MacroExpr | test_logging.rs:176:33:176:79 | &... [&ref] | provenance |  |
-| test_logging.rs:176:34:176:79 | res | test_logging.rs:176:42:176:78 | { ... } | provenance |  |
-| test_logging.rs:176:42:176:78 | ...::format(...) | test_logging.rs:176:34:176:79 | res | provenance |  |
+| test_logging.rs:176:42:176:78 | ...::format(...) | test_logging.rs:176:42:176:78 | { ... } | provenance |  |
 | test_logging.rs:176:42:176:78 | ...::must_use(...) | test_logging.rs:176:34:176:79 | MacroExpr | provenance |  |
 | test_logging.rs:176:42:176:78 | MacroExpr | test_logging.rs:176:42:176:78 | ...::format(...) | provenance | MaD:21 |
 | test_logging.rs:176:42:176:78 | { ... } | test_logging.rs:176:42:176:78 | ...::must_use(...) | provenance | MaD:22 |
@@ -173,8 +176,7 @@ edges
 | test_logging.rs:180:35:180:81 | &... [&ref] | test_logging.rs:180:24:180:33 | log_expect | provenance | MaD:3 Sink:MaD:3 |
 | test_logging.rs:180:36:180:81 | MacroExpr | test_logging.rs:180:35:180:81 | &... | provenance | Config |
 | test_logging.rs:180:36:180:81 | MacroExpr | test_logging.rs:180:35:180:81 | &... [&ref] | provenance |  |
-| test_logging.rs:180:36:180:81 | res | test_logging.rs:180:44:180:80 | { ... } | provenance |  |
-| test_logging.rs:180:44:180:80 | ...::format(...) | test_logging.rs:180:36:180:81 | res | provenance |  |
+| test_logging.rs:180:44:180:80 | ...::format(...) | test_logging.rs:180:44:180:80 | { ... } | provenance |  |
 | test_logging.rs:180:44:180:80 | ...::must_use(...) | test_logging.rs:180:36:180:81 | MacroExpr | provenance |  |
 | test_logging.rs:180:44:180:80 | MacroExpr | test_logging.rs:180:44:180:80 | ...::format(...) | provenance | MaD:21 |
 | test_logging.rs:180:44:180:80 | { ... } | test_logging.rs:180:44:180:80 | ...::must_use(...) | provenance | MaD:22 |
@@ -188,107 +190,90 @@ edges
 | test_logging.rs:187:47:187:60 | Err(...) [Err] | test_logging.rs:187:9:187:19 | err_result3 [Err] | provenance |  |
 | test_logging.rs:187:51:187:59 | password2 | test_logging.rs:187:47:187:60 | Err(...) [Err] | provenance |  |
 | test_logging.rs:188:13:188:23 | err_result3 [Err] | test_logging.rs:188:25:188:34 | log_unwrap | provenance | MaD:5 Sink:MaD:5 |
-| test_logging.rs:192:12:192:37 | MacroExpr | test_logging.rs:192:5:192:38 | ...::_print | provenance | MaD:15 Sink:MaD:15 |
+| test_logging.rs:192:12:192:37 | MacroExpr | test_logging.rs:192:5:192:10 | ...::_print | provenance | MaD:15 Sink:MaD:15 |
 | test_logging.rs:192:30:192:37 | password | test_logging.rs:192:12:192:37 | MacroExpr | provenance |  |
-| test_logging.rs:193:14:193:37 | MacroExpr | test_logging.rs:193:5:193:38 | ...::_print | provenance | MaD:15 Sink:MaD:15 |
+| test_logging.rs:193:14:193:37 | MacroExpr | test_logging.rs:193:5:193:12 | ...::_print | provenance | MaD:15 Sink:MaD:15 |
 | test_logging.rs:193:30:193:37 | password | test_logging.rs:193:14:193:37 | MacroExpr | provenance |  |
-| test_logging.rs:194:13:194:38 | MacroExpr | test_logging.rs:194:5:194:39 | ...::_eprint | provenance | MaD:14 Sink:MaD:14 |
+| test_logging.rs:194:13:194:38 | MacroExpr | test_logging.rs:194:5:194:11 | ...::_eprint | provenance | MaD:14 Sink:MaD:14 |
 | test_logging.rs:194:31:194:38 | password | test_logging.rs:194:13:194:38 | MacroExpr | provenance |  |
-| test_logging.rs:195:15:195:38 | MacroExpr | test_logging.rs:195:5:195:39 | ...::_eprint | provenance | MaD:14 Sink:MaD:14 |
+| test_logging.rs:195:15:195:38 | MacroExpr | test_logging.rs:195:5:195:13 | ...::_eprint | provenance | MaD:14 Sink:MaD:14 |
 | test_logging.rs:195:31:195:38 | password | test_logging.rs:195:15:195:38 | MacroExpr | provenance |  |
-| test_logging.rs:199:20:199:43 | MacroExpr | test_logging.rs:199:13:199:44 | ...::panic_fmt | provenance | MaD:11 Sink:MaD:11 |
+| test_logging.rs:199:20:199:43 | MacroExpr | test_logging.rs:199:13:199:18 | ...::panic_fmt | provenance | MaD:11 Sink:MaD:11 |
 | test_logging.rs:199:36:199:43 | password | test_logging.rs:199:20:199:43 | MacroExpr | provenance |  |
-| test_logging.rs:202:19:202:42 | MacroExpr | test_logging.rs:202:13:202:43 | ...::panic_fmt | provenance | MaD:11 Sink:MaD:11 |
+| test_logging.rs:202:19:202:42 | MacroExpr | test_logging.rs:202:13:202:17 | ...::panic_fmt | provenance | MaD:11 Sink:MaD:11 |
 | test_logging.rs:202:35:202:42 | password | test_logging.rs:202:19:202:42 | MacroExpr | provenance |  |
-| test_logging.rs:205:28:205:51 | MacroExpr | test_logging.rs:205:13:205:52 | ...::panic_fmt | provenance | MaD:11 Sink:MaD:11 |
+| test_logging.rs:205:28:205:51 | MacroExpr | test_logging.rs:205:13:205:26 | ...::panic_fmt | provenance | MaD:11 Sink:MaD:11 |
 | test_logging.rs:205:44:205:51 | password | test_logging.rs:205:28:205:51 | MacroExpr | provenance |  |
-| test_logging.rs:208:26:208:49 | MacroExpr | test_logging.rs:208:13:208:50 | ...::panic_fmt | provenance | MaD:11 Sink:MaD:11 |
+| test_logging.rs:208:26:208:49 | MacroExpr | test_logging.rs:208:13:208:24 | ...::panic_fmt | provenance | MaD:11 Sink:MaD:11 |
 | test_logging.rs:208:42:208:49 | password | test_logging.rs:208:26:208:49 | MacroExpr | provenance |  |
-| test_logging.rs:211:28:211:51 | MacroExpr | test_logging.rs:211:13:211:52 | ...::panic_fmt | provenance | MaD:11 Sink:MaD:11 |
+| test_logging.rs:211:28:211:51 | MacroExpr | test_logging.rs:211:13:211:19 | ...::panic_fmt | provenance | MaD:11 Sink:MaD:11 |
 | test_logging.rs:211:44:211:51 | password | test_logging.rs:211:28:211:51 | MacroExpr | provenance |  |
-| test_logging.rs:214:13:214:54 | ...::assert_failed [Some] | test_logging.rs:214:13:214:54 | ...::assert_failed | provenance | Sink:MaD:9 |
-| test_logging.rs:214:30:214:53 | ...::Some(...) [Some] | test_logging.rs:214:13:214:54 | ...::assert_failed | provenance | MaD:9 Sink:MaD:9 |
-| test_logging.rs:214:30:214:53 | ...::Some(...) [Some] | test_logging.rs:214:13:214:54 | ...::assert_failed [Some] | provenance | MaD:10 |
+| test_logging.rs:214:13:214:22 | ...::assert_failed [Some] | test_logging.rs:214:13:214:22 | ...::assert_failed | provenance | Sink:MaD:9 |
+| test_logging.rs:214:30:214:53 | ...::Some(...) [Some] | test_logging.rs:214:13:214:22 | ...::assert_failed | provenance | MaD:9 Sink:MaD:9 |
+| test_logging.rs:214:30:214:53 | ...::Some(...) [Some] | test_logging.rs:214:13:214:22 | ...::assert_failed [Some] | provenance | MaD:10 |
 | test_logging.rs:214:30:214:53 | MacroExpr | test_logging.rs:214:30:214:53 | ...::Some(...) [Some] | provenance |  |
 | test_logging.rs:214:46:214:53 | password | test_logging.rs:214:30:214:53 | MacroExpr | provenance |  |
-| test_logging.rs:217:13:217:54 | ...::assert_failed [Some] | test_logging.rs:217:13:217:54 | ...::assert_failed | provenance | Sink:MaD:9 |
-| test_logging.rs:217:30:217:53 | ...::Some(...) [Some] | test_logging.rs:217:13:217:54 | ...::assert_failed | provenance | MaD:9 Sink:MaD:9 |
-| test_logging.rs:217:30:217:53 | ...::Some(...) [Some] | test_logging.rs:217:13:217:54 | ...::assert_failed [Some] | provenance | MaD:10 |
+| test_logging.rs:217:13:217:22 | ...::assert_failed [Some] | test_logging.rs:217:13:217:22 | ...::assert_failed | provenance | Sink:MaD:9 |
+| test_logging.rs:217:30:217:53 | ...::Some(...) [Some] | test_logging.rs:217:13:217:22 | ...::assert_failed | provenance | MaD:9 Sink:MaD:9 |
+| test_logging.rs:217:30:217:53 | ...::Some(...) [Some] | test_logging.rs:217:13:217:22 | ...::assert_failed [Some] | provenance | MaD:10 |
 | test_logging.rs:217:30:217:53 | MacroExpr | test_logging.rs:217:30:217:53 | ...::Some(...) [Some] | provenance |  |
 | test_logging.rs:217:46:217:53 | password | test_logging.rs:217:30:217:53 | MacroExpr | provenance |  |
-| test_logging.rs:220:34:220:57 | MacroExpr | test_logging.rs:220:13:220:58 | ...::panic_fmt | provenance | MaD:11 Sink:MaD:11 |
+| test_logging.rs:220:34:220:57 | MacroExpr | test_logging.rs:220:13:220:25 | ...::panic_fmt | provenance | MaD:11 Sink:MaD:11 |
 | test_logging.rs:220:50:220:57 | password | test_logging.rs:220:34:220:57 | MacroExpr | provenance |  |
-| test_logging.rs:223:13:223:60 | ...::assert_failed [Some] | test_logging.rs:223:13:223:60 | ...::assert_failed | provenance | Sink:MaD:9 |
-| test_logging.rs:223:36:223:59 | ...::Some(...) [Some] | test_logging.rs:223:13:223:60 | ...::assert_failed | provenance | MaD:9 Sink:MaD:9 |
-| test_logging.rs:223:36:223:59 | ...::Some(...) [Some] | test_logging.rs:223:13:223:60 | ...::assert_failed [Some] | provenance | MaD:10 |
+| test_logging.rs:223:13:223:28 | ...::assert_failed [Some] | test_logging.rs:223:13:223:28 | ...::assert_failed | provenance | Sink:MaD:9 |
+| test_logging.rs:223:36:223:59 | ...::Some(...) [Some] | test_logging.rs:223:13:223:28 | ...::assert_failed | provenance | MaD:9 Sink:MaD:9 |
+| test_logging.rs:223:36:223:59 | ...::Some(...) [Some] | test_logging.rs:223:13:223:28 | ...::assert_failed [Some] | provenance | MaD:10 |
 | test_logging.rs:223:36:223:59 | MacroExpr | test_logging.rs:223:36:223:59 | ...::Some(...) [Some] | provenance |  |
 | test_logging.rs:223:52:223:59 | password | test_logging.rs:223:36:223:59 | MacroExpr | provenance |  |
-| test_logging.rs:226:13:226:60 | ...::assert_failed [Some] | test_logging.rs:226:13:226:60 | ...::assert_failed | provenance | Sink:MaD:9 |
-| test_logging.rs:226:36:226:59 | ...::Some(...) [Some] | test_logging.rs:226:13:226:60 | ...::assert_failed | provenance | MaD:9 Sink:MaD:9 |
-| test_logging.rs:226:36:226:59 | ...::Some(...) [Some] | test_logging.rs:226:13:226:60 | ...::assert_failed [Some] | provenance | MaD:10 |
+| test_logging.rs:226:13:226:28 | ...::assert_failed [Some] | test_logging.rs:226:13:226:28 | ...::assert_failed | provenance | Sink:MaD:9 |
+| test_logging.rs:226:36:226:59 | ...::Some(...) [Some] | test_logging.rs:226:13:226:28 | ...::assert_failed | provenance | MaD:9 Sink:MaD:9 |
+| test_logging.rs:226:36:226:59 | ...::Some(...) [Some] | test_logging.rs:226:13:226:28 | ...::assert_failed [Some] | provenance | MaD:10 |
 | test_logging.rs:226:36:226:59 | MacroExpr | test_logging.rs:226:36:226:59 | ...::Some(...) [Some] | provenance |  |
 | test_logging.rs:226:52:226:59 | password | test_logging.rs:226:36:226:59 | MacroExpr | provenance |  |
 | test_logging.rs:229:30:229:62 | MacroExpr | test_logging.rs:229:30:229:71 | ... .as_str() [&ref] | provenance | MaD:20 |
-| test_logging.rs:229:30:229:62 | MacroExpr | test_logging.rs:229:30:229:71 | ... .as_str() [&ref] | provenance | MaD:18 |
-| test_logging.rs:229:30:229:62 | MacroExpr | test_logging.rs:229:30:229:71 | ... .as_str() [&ref] | provenance | MaD:20 |
-| test_logging.rs:229:30:229:62 | res | test_logging.rs:229:38:229:61 | { ... } | provenance |  |
 | test_logging.rs:229:30:229:71 | ... .as_str() | test_logging.rs:229:23:229:28 | expect | provenance | MaD:2 Sink:MaD:2 |
 | test_logging.rs:229:30:229:71 | ... .as_str() | test_logging.rs:229:23:229:28 | expect | provenance | MaD:2 Sink:MaD:2 |
 | test_logging.rs:229:30:229:71 | ... .as_str() [&ref] | test_logging.rs:229:23:229:28 | expect | provenance | MaD:2 Sink:MaD:2 |
 | test_logging.rs:229:30:229:71 | ... .as_str() [&ref] | test_logging.rs:229:23:229:28 | expect | provenance | MaD:2 Sink:MaD:2 |
-| test_logging.rs:229:38:229:61 | ...::format(...) | test_logging.rs:229:30:229:62 | res | provenance |  |
+| test_logging.rs:229:38:229:61 | ...::format(...) | test_logging.rs:229:38:229:61 | { ... } | provenance |  |
 | test_logging.rs:229:38:229:61 | ...::must_use(...) | test_logging.rs:229:30:229:62 | MacroExpr | provenance |  |
 | test_logging.rs:229:38:229:61 | ...::must_use(...) | test_logging.rs:229:30:229:71 | ... .as_str() | provenance | MaD:20 |
-| test_logging.rs:229:38:229:61 | ...::must_use(...) | test_logging.rs:229:30:229:71 | ... .as_str() | provenance | MaD:18 |
-| test_logging.rs:229:38:229:61 | ...::must_use(...) | test_logging.rs:229:30:229:71 | ... .as_str() | provenance | MaD:20 |
 | test_logging.rs:229:38:229:61 | MacroExpr | test_logging.rs:229:38:229:61 | ...::format(...) | provenance | MaD:21 |
 | test_logging.rs:229:38:229:61 | { ... } | test_logging.rs:229:38:229:61 | ...::must_use(...) | provenance | MaD:22 |
 | test_logging.rs:229:54:229:61 | password | test_logging.rs:229:38:229:61 | MacroExpr | provenance |  |
 | test_logging.rs:242:16:242:50 | MacroExpr | test_logging.rs:242:16:242:61 | ... .as_bytes() [&ref] | provenance | MaD:19 |
-| test_logging.rs:242:16:242:50 | MacroExpr | test_logging.rs:242:16:242:61 | ... .as_bytes() [&ref] | provenance | MaD:17 |
-| test_logging.rs:242:16:242:50 | res | test_logging.rs:242:24:242:49 | { ... } | provenance |  |
 | test_logging.rs:242:16:242:61 | ... .as_bytes() | test_logging.rs:242:10:242:14 | write | provenance | MaD:7 Sink:MaD:7 |
 | test_logging.rs:242:16:242:61 | ... .as_bytes() [&ref] | test_logging.rs:242:10:242:14 | write | provenance | MaD:7 Sink:MaD:7 |
-| test_logging.rs:242:24:242:49 | ...::format(...) | test_logging.rs:242:16:242:50 | res | provenance |  |
+| test_logging.rs:242:24:242:49 | ...::format(...) | test_logging.rs:242:24:242:49 | { ... } | provenance |  |
 | test_logging.rs:242:24:242:49 | ...::must_use(...) | test_logging.rs:242:16:242:50 | MacroExpr | provenance |  |
 | test_logging.rs:242:24:242:49 | ...::must_use(...) | test_logging.rs:242:16:242:61 | ... .as_bytes() | provenance | MaD:19 |
-| test_logging.rs:242:24:242:49 | ...::must_use(...) | test_logging.rs:242:16:242:61 | ... .as_bytes() | provenance | MaD:17 |
 | test_logging.rs:242:24:242:49 | MacroExpr | test_logging.rs:242:24:242:49 | ...::format(...) | provenance | MaD:21 |
 | test_logging.rs:242:24:242:49 | { ... } | test_logging.rs:242:24:242:49 | ...::must_use(...) | provenance | MaD:22 |
 | test_logging.rs:242:42:242:49 | password | test_logging.rs:242:24:242:49 | MacroExpr | provenance |  |
 | test_logging.rs:245:20:245:54 | MacroExpr | test_logging.rs:245:20:245:65 | ... .as_bytes() [&ref] | provenance | MaD:19 |
-| test_logging.rs:245:20:245:54 | MacroExpr | test_logging.rs:245:20:245:65 | ... .as_bytes() [&ref] | provenance | MaD:17 |
-| test_logging.rs:245:20:245:54 | res | test_logging.rs:245:28:245:53 | { ... } | provenance |  |
 | test_logging.rs:245:20:245:65 | ... .as_bytes() | test_logging.rs:245:10:245:18 | write_all | provenance | MaD:8 Sink:MaD:8 |
 | test_logging.rs:245:20:245:65 | ... .as_bytes() [&ref] | test_logging.rs:245:10:245:18 | write_all | provenance | MaD:8 Sink:MaD:8 |
-| test_logging.rs:245:28:245:53 | ...::format(...) | test_logging.rs:245:20:245:54 | res | provenance |  |
+| test_logging.rs:245:28:245:53 | ...::format(...) | test_logging.rs:245:28:245:53 | { ... } | provenance |  |
 | test_logging.rs:245:28:245:53 | ...::must_use(...) | test_logging.rs:245:20:245:54 | MacroExpr | provenance |  |
 | test_logging.rs:245:28:245:53 | ...::must_use(...) | test_logging.rs:245:20:245:65 | ... .as_bytes() | provenance | MaD:19 |
-| test_logging.rs:245:28:245:53 | ...::must_use(...) | test_logging.rs:245:20:245:65 | ... .as_bytes() | provenance | MaD:17 |
 | test_logging.rs:245:28:245:53 | MacroExpr | test_logging.rs:245:28:245:53 | ...::format(...) | provenance | MaD:21 |
 | test_logging.rs:245:28:245:53 | { ... } | test_logging.rs:245:28:245:53 | ...::must_use(...) | provenance | MaD:22 |
 | test_logging.rs:245:46:245:53 | password | test_logging.rs:245:28:245:53 | MacroExpr | provenance |  |
 | test_logging.rs:248:15:248:49 | MacroExpr | test_logging.rs:248:15:248:60 | ... .as_bytes() [&ref] | provenance | MaD:19 |
-| test_logging.rs:248:15:248:49 | MacroExpr | test_logging.rs:248:15:248:60 | ... .as_bytes() [&ref] | provenance | MaD:17 |
-| test_logging.rs:248:15:248:49 | res | test_logging.rs:248:23:248:48 | { ... } | provenance |  |
 | test_logging.rs:248:15:248:60 | ... .as_bytes() | test_logging.rs:248:9:248:13 | write | provenance | MaD:7 Sink:MaD:7 |
 | test_logging.rs:248:15:248:60 | ... .as_bytes() [&ref] | test_logging.rs:248:9:248:13 | write | provenance | MaD:7 Sink:MaD:7 |
-| test_logging.rs:248:23:248:48 | ...::format(...) | test_logging.rs:248:15:248:49 | res | provenance |  |
+| test_logging.rs:248:23:248:48 | ...::format(...) | test_logging.rs:248:23:248:48 | { ... } | provenance |  |
 | test_logging.rs:248:23:248:48 | ...::must_use(...) | test_logging.rs:248:15:248:49 | MacroExpr | provenance |  |
 | test_logging.rs:248:23:248:48 | ...::must_use(...) | test_logging.rs:248:15:248:60 | ... .as_bytes() | provenance | MaD:19 |
-| test_logging.rs:248:23:248:48 | ...::must_use(...) | test_logging.rs:248:15:248:60 | ... .as_bytes() | provenance | MaD:17 |
 | test_logging.rs:248:23:248:48 | MacroExpr | test_logging.rs:248:23:248:48 | ...::format(...) | provenance | MaD:21 |
 | test_logging.rs:248:23:248:48 | { ... } | test_logging.rs:248:23:248:48 | ...::must_use(...) | provenance | MaD:22 |
 | test_logging.rs:248:41:248:48 | password | test_logging.rs:248:23:248:48 | MacroExpr | provenance |  |
 | test_logging.rs:251:15:251:49 | MacroExpr | test_logging.rs:251:15:251:60 | ... .as_bytes() [&ref] | provenance | MaD:19 |
-| test_logging.rs:251:15:251:49 | MacroExpr | test_logging.rs:251:15:251:60 | ... .as_bytes() [&ref] | provenance | MaD:17 |
-| test_logging.rs:251:15:251:49 | res | test_logging.rs:251:23:251:48 | { ... } | provenance |  |
 | test_logging.rs:251:15:251:60 | ... .as_bytes() | test_logging.rs:251:9:251:13 | write | provenance | MaD:6 Sink:MaD:6 |
 | test_logging.rs:251:15:251:60 | ... .as_bytes() [&ref] | test_logging.rs:251:9:251:13 | write | provenance | MaD:6 Sink:MaD:6 |
-| test_logging.rs:251:23:251:48 | ...::format(...) | test_logging.rs:251:15:251:49 | res | provenance |  |
+| test_logging.rs:251:23:251:48 | ...::format(...) | test_logging.rs:251:23:251:48 | { ... } | provenance |  |
 | test_logging.rs:251:23:251:48 | ...::must_use(...) | test_logging.rs:251:15:251:49 | MacroExpr | provenance |  |
 | test_logging.rs:251:23:251:48 | ...::must_use(...) | test_logging.rs:251:15:251:60 | ... .as_bytes() | provenance | MaD:19 |
-| test_logging.rs:251:23:251:48 | ...::must_use(...) | test_logging.rs:251:15:251:60 | ... .as_bytes() | provenance | MaD:17 |
 | test_logging.rs:251:23:251:48 | MacroExpr | test_logging.rs:251:23:251:48 | ...::format(...) | provenance | MaD:21 |
 | test_logging.rs:251:23:251:48 | { ... } | test_logging.rs:251:23:251:48 | ...::must_use(...) | provenance | MaD:22 |
 | test_logging.rs:251:41:251:48 | password | test_logging.rs:251:23:251:48 | MacroExpr | provenance |  |
@@ -309,50 +294,50 @@ models
 | 14 | Sink: std::io::stdio::_eprint; Argument[0]; log-injection |
 | 15 | Sink: std::io::stdio::_print; Argument[0]; log-injection |
 | 16 | Summary: <_ as core::clone::Clone>::clone; Argument[self].Reference; ReturnValue; value |
-| 17 | Summary: <alloc::string::String>::as_bytes; Argument[self]; ReturnValue; value |
-| 18 | Summary: <alloc::string::String>::as_str; Argument[self]; ReturnValue; value |
-| 19 | Summary: <core::str>::as_bytes; Argument[self]; ReturnValue; value |
-| 20 | Summary: <core::str>::as_str; Argument[self]; ReturnValue; value |
+| 17 | Summary: <_ as core::ops::arith::Add>::add; Argument[0].Reference; ReturnValue; taint |
+| 18 | Summary: <_ as core::ops::arith::Add>::add; Argument[0]; ReturnValue; taint |
+| 19 | Summary: <alloc::string::String>::as_bytes; Argument[self]; ReturnValue; value |
+| 20 | Summary: <alloc::string::String>::as_str; Argument[self]; ReturnValue; value |
 | 21 | Summary: alloc::fmt::format; Argument[0]; ReturnValue; taint |
 | 22 | Summary: core::hint::must_use; Argument[0]; ReturnValue; value |
 nodes
-| test_logging.rs:42:5:42:36 | ...::log | semmle.label | ...::log |
+| test_logging.rs:42:5:42:10 | ...::log | semmle.label | ...::log |
 | test_logging.rs:42:12:42:35 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:42:28:42:35 | password | semmle.label | password |
-| test_logging.rs:43:5:43:36 | ...::log | semmle.label | ...::log |
+| test_logging.rs:43:5:43:10 | ...::log | semmle.label | ...::log |
 | test_logging.rs:43:12:43:35 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:43:28:43:35 | password | semmle.label | password |
-| test_logging.rs:44:5:44:35 | ...::log | semmle.label | ...::log |
+| test_logging.rs:44:5:44:9 | ...::log | semmle.label | ...::log |
 | test_logging.rs:44:11:44:34 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:44:27:44:34 | password | semmle.label | password |
-| test_logging.rs:45:5:45:36 | ...::log | semmle.label | ...::log |
+| test_logging.rs:45:5:45:10 | ...::log | semmle.label | ...::log |
 | test_logging.rs:45:12:45:35 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:45:28:45:35 | password | semmle.label | password |
-| test_logging.rs:46:5:46:35 | ...::log | semmle.label | ...::log |
+| test_logging.rs:46:5:46:9 | ...::log | semmle.label | ...::log |
 | test_logging.rs:46:11:46:34 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:46:27:46:34 | password | semmle.label | password |
-| test_logging.rs:47:5:47:48 | ...::log | semmle.label | ...::log |
+| test_logging.rs:47:5:47:8 | ...::log | semmle.label | ...::log |
 | test_logging.rs:47:24:47:47 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:47:40:47:47 | password | semmle.label | password |
-| test_logging.rs:52:5:52:36 | ...::log | semmle.label | ...::log |
+| test_logging.rs:52:5:52:10 | ...::log | semmle.label | ...::log |
 | test_logging.rs:52:12:52:35 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:52:28:52:35 | password | semmle.label | password |
-| test_logging.rs:54:5:54:49 | ...::log | semmle.label | ...::log |
+| test_logging.rs:54:5:54:10 | ...::log | semmle.label | ...::log |
 | test_logging.rs:54:12:54:48 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:54:41:54:48 | password | semmle.label | password |
-| test_logging.rs:56:5:56:47 | ...::log | semmle.label | ...::log |
+| test_logging.rs:56:5:56:10 | ...::log | semmle.label | ...::log |
 | test_logging.rs:56:12:56:46 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:56:39:56:46 | password | semmle.label | password |
-| test_logging.rs:57:5:57:34 | ...::log | semmle.label | ...::log |
+| test_logging.rs:57:5:57:10 | ...::log | semmle.label | ...::log |
 | test_logging.rs:57:12:57:33 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:57:24:57:31 | password | semmle.label | password |
-| test_logging.rs:58:5:58:36 | ...::log | semmle.label | ...::log |
+| test_logging.rs:58:5:58:10 | ...::log | semmle.label | ...::log |
 | test_logging.rs:58:12:58:35 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:58:24:58:31 | password | semmle.label | password |
-| test_logging.rs:60:5:60:54 | ...::log | semmle.label | ...::log |
+| test_logging.rs:60:5:60:10 | ...::log | semmle.label | ...::log |
 | test_logging.rs:60:30:60:53 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:60:46:60:53 | password | semmle.label | password |
-| test_logging.rs:61:5:61:55 | ...::log | semmle.label | ...::log |
+| test_logging.rs:61:5:61:10 | ...::log | semmle.label | ...::log |
 | test_logging.rs:61:20:61:28 | &... [&ref, tuple.0, &ref] | semmle.label | &... [&ref, tuple.0, &ref] |
 | test_logging.rs:61:20:61:28 | &... [&ref, tuple.0] | semmle.label | &... [&ref, tuple.0] |
 | test_logging.rs:61:20:61:28 | &password | semmle.label | &password |
@@ -360,13 +345,13 @@ nodes
 | test_logging.rs:61:20:61:28 | TupleExpr [tuple.0, &ref] | semmle.label | TupleExpr [tuple.0, &ref] |
 | test_logging.rs:61:20:61:28 | TupleExpr [tuple.0] | semmle.label | TupleExpr [tuple.0] |
 | test_logging.rs:61:21:61:28 | password | semmle.label | password |
-| test_logging.rs:65:5:65:48 | ...::log | semmle.label | ...::log |
+| test_logging.rs:65:5:65:8 | ...::log | semmle.label | ...::log |
 | test_logging.rs:65:24:65:47 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:65:40:65:47 | password | semmle.label | password |
-| test_logging.rs:67:5:67:66 | ...::log | semmle.label | ...::log |
+| test_logging.rs:67:5:67:8 | ...::log | semmle.label | ...::log |
 | test_logging.rs:67:42:67:65 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:67:58:67:65 | password | semmle.label | password |
-| test_logging.rs:68:5:68:67 | ...::log | semmle.label | ...::log |
+| test_logging.rs:68:5:68:8 | ...::log | semmle.label | ...::log |
 | test_logging.rs:68:18:68:26 | &... [&ref, tuple.0, &ref] | semmle.label | &... [&ref, tuple.0, &ref] |
 | test_logging.rs:68:18:68:26 | &... [&ref, tuple.0] | semmle.label | &... [&ref, tuple.0] |
 | test_logging.rs:68:18:68:26 | &password | semmle.label | &password |
@@ -374,13 +359,13 @@ nodes
 | test_logging.rs:68:18:68:26 | TupleExpr [tuple.0, &ref] | semmle.label | TupleExpr [tuple.0, &ref] |
 | test_logging.rs:68:18:68:26 | TupleExpr [tuple.0] | semmle.label | TupleExpr [tuple.0] |
 | test_logging.rs:68:19:68:26 | password | semmle.label | password |
-| test_logging.rs:72:5:72:47 | ...::log | semmle.label | ...::log |
+| test_logging.rs:72:5:72:10 | ...::log | semmle.label | ...::log |
 | test_logging.rs:72:23:72:46 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:72:39:72:46 | password | semmle.label | password |
-| test_logging.rs:74:5:74:65 | ...::log | semmle.label | ...::log |
+| test_logging.rs:74:5:74:10 | ...::log | semmle.label | ...::log |
 | test_logging.rs:74:41:74:64 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:74:57:74:64 | password | semmle.label | password |
-| test_logging.rs:75:5:75:51 | ...::log | semmle.label | ...::log |
+| test_logging.rs:75:5:75:10 | ...::log | semmle.label | ...::log |
 | test_logging.rs:75:20:75:28 | &... [&ref, tuple.0, &ref] | semmle.label | &... [&ref, tuple.0, &ref] |
 | test_logging.rs:75:20:75:28 | &... [&ref, tuple.0] | semmle.label | &... [&ref, tuple.0] |
 | test_logging.rs:75:20:75:28 | &password | semmle.label | &password |
@@ -388,16 +373,16 @@ nodes
 | test_logging.rs:75:20:75:28 | TupleExpr [tuple.0, &ref] | semmle.label | TupleExpr [tuple.0, &ref] |
 | test_logging.rs:75:20:75:28 | TupleExpr [tuple.0] | semmle.label | TupleExpr [tuple.0] |
 | test_logging.rs:75:21:75:28 | password | semmle.label | password |
-| test_logging.rs:76:5:76:47 | ...::log | semmle.label | ...::log |
+| test_logging.rs:76:5:76:10 | ...::log | semmle.label | ...::log |
 | test_logging.rs:76:23:76:46 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:76:39:76:46 | password | semmle.label | password |
-| test_logging.rs:82:5:82:44 | ...::log | semmle.label | ...::log |
+| test_logging.rs:82:5:82:10 | ...::log | semmle.label | ...::log |
 | test_logging.rs:82:20:82:43 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:82:36:82:43 | password | semmle.label | password |
-| test_logging.rs:84:5:84:62 | ...::log | semmle.label | ...::log |
+| test_logging.rs:84:5:84:10 | ...::log | semmle.label | ...::log |
 | test_logging.rs:84:38:84:61 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:84:54:84:61 | password | semmle.label | password |
-| test_logging.rs:85:5:85:48 | ...::log | semmle.label | ...::log |
+| test_logging.rs:85:5:85:10 | ...::log | semmle.label | ...::log |
 | test_logging.rs:85:20:85:28 | &... [&ref, tuple.0, &ref] | semmle.label | &... [&ref, tuple.0, &ref] |
 | test_logging.rs:85:20:85:28 | &... [&ref, tuple.0] | semmle.label | &... [&ref, tuple.0] |
 | test_logging.rs:85:20:85:28 | &password | semmle.label | &password |
@@ -405,49 +390,49 @@ nodes
 | test_logging.rs:85:20:85:28 | TupleExpr [tuple.0, &ref] | semmle.label | TupleExpr [tuple.0, &ref] |
 | test_logging.rs:85:20:85:28 | TupleExpr [tuple.0] | semmle.label | TupleExpr [tuple.0] |
 | test_logging.rs:85:21:85:28 | password | semmle.label | password |
-| test_logging.rs:86:5:86:44 | ...::log | semmle.label | ...::log |
+| test_logging.rs:86:5:86:10 | ...::log | semmle.label | ...::log |
 | test_logging.rs:86:20:86:43 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:86:36:86:43 | password | semmle.label | password |
 | test_logging.rs:93:9:93:10 | m1 | semmle.label | m1 |
 | test_logging.rs:93:14:93:22 | &password | semmle.label | &password |
 | test_logging.rs:93:15:93:22 | password | semmle.label | password |
-| test_logging.rs:94:5:94:29 | ...::log | semmle.label | ...::log |
+| test_logging.rs:94:5:94:9 | ...::log | semmle.label | ...::log |
 | test_logging.rs:94:11:94:28 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:96:9:96:10 | m2 | semmle.label | m2 |
+| test_logging.rs:96:14:96:49 | ... + ... | semmle.label | ... + ... |
 | test_logging.rs:96:41:96:49 | &password | semmle.label | &password |
+| test_logging.rs:96:41:96:49 | &password [&ref] | semmle.label | &password [&ref] |
 | test_logging.rs:96:42:96:49 | password | semmle.label | password |
-| test_logging.rs:97:5:97:19 | ...::log | semmle.label | ...::log |
+| test_logging.rs:97:5:97:9 | ...::log | semmle.label | ...::log |
 | test_logging.rs:97:11:97:18 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:99:9:99:10 | m3 | semmle.label | m3 |
-| test_logging.rs:99:14:99:46 | res | semmle.label | res |
 | test_logging.rs:99:22:99:45 | ...::format(...) | semmle.label | ...::format(...) |
 | test_logging.rs:99:22:99:45 | ...::must_use(...) | semmle.label | ...::must_use(...) |
 | test_logging.rs:99:22:99:45 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:99:22:99:45 | { ... } | semmle.label | { ... } |
 | test_logging.rs:99:38:99:45 | password | semmle.label | password |
-| test_logging.rs:100:5:100:19 | ...::log | semmle.label | ...::log |
+| test_logging.rs:100:5:100:9 | ...::log | semmle.label | ...::log |
 | test_logging.rs:100:11:100:18 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:118:5:118:42 | ...::log | semmle.label | ...::log |
+| test_logging.rs:118:5:118:10 | ...::log | semmle.label | ...::log |
 | test_logging.rs:118:12:118:41 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:118:28:118:41 | get_password(...) | semmle.label | get_password(...) |
 | test_logging.rs:129:9:129:10 | t1 [tuple.1] | semmle.label | t1 [tuple.1] |
 | test_logging.rs:129:14:129:33 | TupleExpr [tuple.1] | semmle.label | TupleExpr [tuple.1] |
 | test_logging.rs:129:25:129:32 | password | semmle.label | password |
-| test_logging.rs:131:5:131:32 | ...::log | semmle.label | ...::log |
+| test_logging.rs:131:5:131:10 | ...::log | semmle.label | ...::log |
 | test_logging.rs:131:12:131:31 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:131:28:131:29 | t1 [tuple.1] | semmle.label | t1 [tuple.1] |
 | test_logging.rs:131:28:131:31 | t1.1 | semmle.label | t1.1 |
-| test_logging.rs:141:5:141:38 | ...::log | semmle.label | ...::log |
+| test_logging.rs:141:5:141:9 | ...::log | semmle.label | ...::log |
 | test_logging.rs:141:11:141:37 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:141:27:141:37 | s1.password | semmle.label | s1.password |
-| test_logging.rs:151:5:151:38 | ...::log | semmle.label | ...::log |
+| test_logging.rs:151:5:151:9 | ...::log | semmle.label | ...::log |
 | test_logging.rs:151:11:151:37 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:151:27:151:37 | s2.password | semmle.label | s2.password |
 | test_logging.rs:176:22:176:31 | log_expect | semmle.label | log_expect |
 | test_logging.rs:176:33:176:79 | &... | semmle.label | &... |
 | test_logging.rs:176:33:176:79 | &... [&ref] | semmle.label | &... [&ref] |
 | test_logging.rs:176:34:176:79 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:176:34:176:79 | res | semmle.label | res |
 | test_logging.rs:176:42:176:78 | ...::format(...) | semmle.label | ...::format(...) |
 | test_logging.rs:176:42:176:78 | ...::must_use(...) | semmle.label | ...::must_use(...) |
 | test_logging.rs:176:42:176:78 | MacroExpr | semmle.label | MacroExpr |
@@ -457,7 +442,6 @@ nodes
 | test_logging.rs:180:35:180:81 | &... | semmle.label | &... |
 | test_logging.rs:180:35:180:81 | &... [&ref] | semmle.label | &... [&ref] |
 | test_logging.rs:180:36:180:81 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:180:36:180:81 | res | semmle.label | res |
 | test_logging.rs:180:44:180:80 | ...::format(...) | semmle.label | ...::format(...) |
 | test_logging.rs:180:44:180:80 | ...::must_use(...) | semmle.label | ...::must_use(...) |
 | test_logging.rs:180:44:180:80 | MacroExpr | semmle.label | MacroExpr |
@@ -474,60 +458,59 @@ nodes
 | test_logging.rs:187:51:187:59 | password2 | semmle.label | password2 |
 | test_logging.rs:188:13:188:23 | err_result3 [Err] | semmle.label | err_result3 [Err] |
 | test_logging.rs:188:25:188:34 | log_unwrap | semmle.label | log_unwrap |
-| test_logging.rs:192:5:192:38 | ...::_print | semmle.label | ...::_print |
+| test_logging.rs:192:5:192:10 | ...::_print | semmle.label | ...::_print |
 | test_logging.rs:192:12:192:37 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:192:30:192:37 | password | semmle.label | password |
-| test_logging.rs:193:5:193:38 | ...::_print | semmle.label | ...::_print |
+| test_logging.rs:193:5:193:12 | ...::_print | semmle.label | ...::_print |
 | test_logging.rs:193:14:193:37 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:193:30:193:37 | password | semmle.label | password |
-| test_logging.rs:194:5:194:39 | ...::_eprint | semmle.label | ...::_eprint |
+| test_logging.rs:194:5:194:11 | ...::_eprint | semmle.label | ...::_eprint |
 | test_logging.rs:194:13:194:38 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:194:31:194:38 | password | semmle.label | password |
-| test_logging.rs:195:5:195:39 | ...::_eprint | semmle.label | ...::_eprint |
+| test_logging.rs:195:5:195:13 | ...::_eprint | semmle.label | ...::_eprint |
 | test_logging.rs:195:15:195:38 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:195:31:195:38 | password | semmle.label | password |
-| test_logging.rs:199:13:199:44 | ...::panic_fmt | semmle.label | ...::panic_fmt |
+| test_logging.rs:199:13:199:18 | ...::panic_fmt | semmle.label | ...::panic_fmt |
 | test_logging.rs:199:20:199:43 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:199:36:199:43 | password | semmle.label | password |
-| test_logging.rs:202:13:202:43 | ...::panic_fmt | semmle.label | ...::panic_fmt |
+| test_logging.rs:202:13:202:17 | ...::panic_fmt | semmle.label | ...::panic_fmt |
 | test_logging.rs:202:19:202:42 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:202:35:202:42 | password | semmle.label | password |
-| test_logging.rs:205:13:205:52 | ...::panic_fmt | semmle.label | ...::panic_fmt |
+| test_logging.rs:205:13:205:26 | ...::panic_fmt | semmle.label | ...::panic_fmt |
 | test_logging.rs:205:28:205:51 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:205:44:205:51 | password | semmle.label | password |
-| test_logging.rs:208:13:208:50 | ...::panic_fmt | semmle.label | ...::panic_fmt |
+| test_logging.rs:208:13:208:24 | ...::panic_fmt | semmle.label | ...::panic_fmt |
 | test_logging.rs:208:26:208:49 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:208:42:208:49 | password | semmle.label | password |
-| test_logging.rs:211:13:211:52 | ...::panic_fmt | semmle.label | ...::panic_fmt |
+| test_logging.rs:211:13:211:19 | ...::panic_fmt | semmle.label | ...::panic_fmt |
 | test_logging.rs:211:28:211:51 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:211:44:211:51 | password | semmle.label | password |
-| test_logging.rs:214:13:214:54 | ...::assert_failed | semmle.label | ...::assert_failed |
-| test_logging.rs:214:13:214:54 | ...::assert_failed [Some] | semmle.label | ...::assert_failed [Some] |
+| test_logging.rs:214:13:214:22 | ...::assert_failed | semmle.label | ...::assert_failed |
+| test_logging.rs:214:13:214:22 | ...::assert_failed [Some] | semmle.label | ...::assert_failed [Some] |
 | test_logging.rs:214:30:214:53 | ...::Some(...) [Some] | semmle.label | ...::Some(...) [Some] |
 | test_logging.rs:214:30:214:53 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:214:46:214:53 | password | semmle.label | password |
-| test_logging.rs:217:13:217:54 | ...::assert_failed | semmle.label | ...::assert_failed |
-| test_logging.rs:217:13:217:54 | ...::assert_failed [Some] | semmle.label | ...::assert_failed [Some] |
+| test_logging.rs:217:13:217:22 | ...::assert_failed | semmle.label | ...::assert_failed |
+| test_logging.rs:217:13:217:22 | ...::assert_failed [Some] | semmle.label | ...::assert_failed [Some] |
 | test_logging.rs:217:30:217:53 | ...::Some(...) [Some] | semmle.label | ...::Some(...) [Some] |
 | test_logging.rs:217:30:217:53 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:217:46:217:53 | password | semmle.label | password |
-| test_logging.rs:220:13:220:58 | ...::panic_fmt | semmle.label | ...::panic_fmt |
+| test_logging.rs:220:13:220:25 | ...::panic_fmt | semmle.label | ...::panic_fmt |
 | test_logging.rs:220:34:220:57 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:220:50:220:57 | password | semmle.label | password |
-| test_logging.rs:223:13:223:60 | ...::assert_failed | semmle.label | ...::assert_failed |
-| test_logging.rs:223:13:223:60 | ...::assert_failed [Some] | semmle.label | ...::assert_failed [Some] |
+| test_logging.rs:223:13:223:28 | ...::assert_failed | semmle.label | ...::assert_failed |
+| test_logging.rs:223:13:223:28 | ...::assert_failed [Some] | semmle.label | ...::assert_failed [Some] |
 | test_logging.rs:223:36:223:59 | ...::Some(...) [Some] | semmle.label | ...::Some(...) [Some] |
 | test_logging.rs:223:36:223:59 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:223:52:223:59 | password | semmle.label | password |
-| test_logging.rs:226:13:226:60 | ...::assert_failed | semmle.label | ...::assert_failed |
-| test_logging.rs:226:13:226:60 | ...::assert_failed [Some] | semmle.label | ...::assert_failed [Some] |
+| test_logging.rs:226:13:226:28 | ...::assert_failed | semmle.label | ...::assert_failed |
+| test_logging.rs:226:13:226:28 | ...::assert_failed [Some] | semmle.label | ...::assert_failed [Some] |
 | test_logging.rs:226:36:226:59 | ...::Some(...) [Some] | semmle.label | ...::Some(...) [Some] |
 | test_logging.rs:226:36:226:59 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:226:52:226:59 | password | semmle.label | password |
 | test_logging.rs:229:23:229:28 | expect | semmle.label | expect |
 | test_logging.rs:229:23:229:28 | expect | semmle.label | expect |
 | test_logging.rs:229:30:229:62 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:229:30:229:62 | res | semmle.label | res |
 | test_logging.rs:229:30:229:71 | ... .as_str() | semmle.label | ... .as_str() |
 | test_logging.rs:229:30:229:71 | ... .as_str() [&ref] | semmle.label | ... .as_str() [&ref] |
 | test_logging.rs:229:38:229:61 | ...::format(...) | semmle.label | ...::format(...) |
@@ -537,7 +520,6 @@ nodes
 | test_logging.rs:229:54:229:61 | password | semmle.label | password |
 | test_logging.rs:242:10:242:14 | write | semmle.label | write |
 | test_logging.rs:242:16:242:50 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:242:16:242:50 | res | semmle.label | res |
 | test_logging.rs:242:16:242:61 | ... .as_bytes() | semmle.label | ... .as_bytes() |
 | test_logging.rs:242:16:242:61 | ... .as_bytes() [&ref] | semmle.label | ... .as_bytes() [&ref] |
 | test_logging.rs:242:24:242:49 | ...::format(...) | semmle.label | ...::format(...) |
@@ -547,7 +529,6 @@ nodes
 | test_logging.rs:242:42:242:49 | password | semmle.label | password |
 | test_logging.rs:245:10:245:18 | write_all | semmle.label | write_all |
 | test_logging.rs:245:20:245:54 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:245:20:245:54 | res | semmle.label | res |
 | test_logging.rs:245:20:245:65 | ... .as_bytes() | semmle.label | ... .as_bytes() |
 | test_logging.rs:245:20:245:65 | ... .as_bytes() [&ref] | semmle.label | ... .as_bytes() [&ref] |
 | test_logging.rs:245:28:245:53 | ...::format(...) | semmle.label | ...::format(...) |
@@ -557,7 +538,6 @@ nodes
 | test_logging.rs:245:46:245:53 | password | semmle.label | password |
 | test_logging.rs:248:9:248:13 | write | semmle.label | write |
 | test_logging.rs:248:15:248:49 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:248:15:248:49 | res | semmle.label | res |
 | test_logging.rs:248:15:248:60 | ... .as_bytes() | semmle.label | ... .as_bytes() |
 | test_logging.rs:248:15:248:60 | ... .as_bytes() [&ref] | semmle.label | ... .as_bytes() [&ref] |
 | test_logging.rs:248:23:248:48 | ...::format(...) | semmle.label | ...::format(...) |
@@ -567,7 +547,6 @@ nodes
 | test_logging.rs:248:41:248:48 | password | semmle.label | password |
 | test_logging.rs:251:9:251:13 | write | semmle.label | write |
 | test_logging.rs:251:15:251:49 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:251:15:251:49 | res | semmle.label | res |
 | test_logging.rs:251:15:251:60 | ... .as_bytes() | semmle.label | ... .as_bytes() |
 | test_logging.rs:251:15:251:60 | ... .as_bytes() [&ref] | semmle.label | ... .as_bytes() [&ref] |
 | test_logging.rs:251:23:251:48 | ...::format(...) | semmle.label | ...::format(...) |
diff --git a/rust/ql/test/query-tests/security/CWE-312/CleartextStorageDatabase.expected b/rust/ql/test/query-tests/security/CWE-312/CleartextStorageDatabase.expected
index 028b2d88ac3..d5f5cbca002 100644
--- a/rust/ql/test/query-tests/security/CWE-312/CleartextStorageDatabase.expected
+++ b/rust/ql/test/query-tests/security/CWE-312/CleartextStorageDatabase.expected
@@ -9,70 +9,65 @@
 | test_storage.rs:204:31:204:37 | prepare | test_storage.rs:190:86:190:103 | get_phone_number(...) | test_storage.rs:204:31:204:37 | prepare | This database operation may read or write unencrypted sensitive data from $@. | test_storage.rs:190:86:190:103 | get_phone_number(...) | get_phone_number(...) |
 edges
 | test_storage.rs:71:9:71:21 | insert_query2 | test_storage.rs:100:25:100:37 | insert_query2 | provenance |  |
-| test_storage.rs:71:9:71:21 | insert_query2 | test_storage.rs:100:25:100:46 | insert_query2.as_str() | provenance | MaD:8 |
-| test_storage.rs:71:9:71:21 | insert_query2 | test_storage.rs:100:25:100:46 | insert_query2.as_str() | provenance | MaD:7 |
-| test_storage.rs:71:9:71:21 | insert_query2 | test_storage.rs:100:25:100:46 | insert_query2.as_str() | provenance | MaD:8 |
+| test_storage.rs:71:9:71:21 | insert_query2 | test_storage.rs:100:25:100:46 | insert_query2.as_str() | provenance | MaD:10 |
 | test_storage.rs:71:9:71:21 | insert_query2 | test_storage.rs:115:27:115:39 | insert_query2 | provenance |  |
-| test_storage.rs:71:9:71:21 | insert_query2 | test_storage.rs:115:27:115:48 | insert_query2.as_str() | provenance | MaD:8 |
-| test_storage.rs:71:9:71:21 | insert_query2 | test_storage.rs:115:27:115:48 | insert_query2.as_str() | provenance | MaD:7 |
-| test_storage.rs:71:9:71:21 | insert_query2 | test_storage.rs:115:27:115:48 | insert_query2.as_str() | provenance | MaD:8 |
+| test_storage.rs:71:9:71:21 | insert_query2 | test_storage.rs:115:27:115:48 | insert_query2.as_str() | provenance | MaD:10 |
 | test_storage.rs:71:9:71:21 | insert_query2 | test_storage.rs:119:25:119:37 | insert_query2 | provenance |  |
-| test_storage.rs:71:9:71:21 | insert_query2 | test_storage.rs:119:25:119:46 | insert_query2.as_str() | provenance | MaD:8 |
-| test_storage.rs:71:9:71:21 | insert_query2 | test_storage.rs:119:25:119:46 | insert_query2.as_str() | provenance | MaD:7 |
-| test_storage.rs:71:9:71:21 | insert_query2 | test_storage.rs:119:25:119:46 | insert_query2.as_str() | provenance | MaD:8 |
+| test_storage.rs:71:9:71:21 | insert_query2 | test_storage.rs:119:25:119:46 | insert_query2.as_str() | provenance | MaD:10 |
 | test_storage.rs:71:9:71:21 | insert_query2 | test_storage.rs:125:25:125:37 | insert_query2 | provenance |  |
-| test_storage.rs:71:9:71:21 | insert_query2 | test_storage.rs:125:25:125:46 | insert_query2.as_str() | provenance | MaD:8 |
-| test_storage.rs:71:9:71:21 | insert_query2 | test_storage.rs:125:25:125:46 | insert_query2.as_str() | provenance | MaD:7 |
-| test_storage.rs:71:9:71:21 | insert_query2 | test_storage.rs:125:25:125:46 | insert_query2.as_str() | provenance | MaD:8 |
+| test_storage.rs:71:9:71:21 | insert_query2 | test_storage.rs:125:25:125:46 | insert_query2.as_str() | provenance | MaD:10 |
 | test_storage.rs:71:9:71:21 | insert_query2 | test_storage.rs:139:25:139:37 | insert_query2 | provenance |  |
-| test_storage.rs:71:9:71:21 | insert_query2 | test_storage.rs:139:25:139:46 | insert_query2.as_str() | provenance | MaD:8 |
-| test_storage.rs:71:9:71:21 | insert_query2 | test_storage.rs:139:25:139:46 | insert_query2.as_str() | provenance | MaD:7 |
-| test_storage.rs:71:9:71:21 | insert_query2 | test_storage.rs:139:25:139:46 | insert_query2.as_str() | provenance | MaD:8 |
+| test_storage.rs:71:9:71:21 | insert_query2 | test_storage.rs:139:25:139:46 | insert_query2.as_str() | provenance | MaD:10 |
 | test_storage.rs:71:25:71:114 | ... + ... | test_storage.rs:71:9:71:21 | insert_query2 | provenance |  |
-| test_storage.rs:71:25:71:114 | ... + ... | test_storage.rs:71:25:71:121 | ... + ... | provenance | MaD:6 |
+| test_storage.rs:71:25:71:114 | ... + ... | test_storage.rs:71:25:71:121 | ... + ... | provenance | MaD:8 |
+| test_storage.rs:71:25:71:114 | ... + ... | test_storage.rs:71:25:71:121 | ... + ... | provenance | MaD:9 |
 | test_storage.rs:71:25:71:121 | ... + ... | test_storage.rs:71:9:71:21 | insert_query2 | provenance |  |
 | test_storage.rs:71:96:71:114 | &... | test_storage.rs:71:9:71:21 | insert_query2 | provenance |  |
 | test_storage.rs:71:96:71:114 | &... | test_storage.rs:71:25:71:114 | ... + ... | provenance |  |
+| test_storage.rs:71:96:71:114 | &... | test_storage.rs:71:25:71:114 | ... + ... | provenance | MaD:7 |
+| test_storage.rs:71:96:71:114 | &... | test_storage.rs:71:25:71:114 | ... + ... | provenance | MaD:6 |
+| test_storage.rs:71:96:71:114 | &... [&ref] | test_storage.rs:71:25:71:114 | ... + ... | provenance | MaD:6 |
 | test_storage.rs:71:97:71:114 | get_phone_number(...) | test_storage.rs:71:96:71:114 | &... | provenance | Config |
-| test_storage.rs:100:25:100:37 | insert_query2 | test_storage.rs:100:25:100:46 | insert_query2.as_str() [&ref] | provenance | MaD:8 |
-| test_storage.rs:100:25:100:37 | insert_query2 | test_storage.rs:100:25:100:46 | insert_query2.as_str() [&ref] | provenance | MaD:7 |
-| test_storage.rs:100:25:100:37 | insert_query2 | test_storage.rs:100:25:100:46 | insert_query2.as_str() [&ref] | provenance | MaD:8 |
+| test_storage.rs:71:97:71:114 | get_phone_number(...) | test_storage.rs:71:96:71:114 | &... [&ref] | provenance |  |
+| test_storage.rs:100:25:100:37 | insert_query2 | test_storage.rs:100:25:100:46 | insert_query2.as_str() [&ref] | provenance | MaD:10 |
 | test_storage.rs:100:25:100:46 | insert_query2.as_str() | test_storage.rs:100:13:100:23 | ...::query | provenance | MaD:4 Sink:MaD:4 |
 | test_storage.rs:100:25:100:46 | insert_query2.as_str() [&ref] | test_storage.rs:100:13:100:23 | ...::query | provenance | MaD:4 Sink:MaD:4 |
-| test_storage.rs:115:27:115:39 | insert_query2 | test_storage.rs:115:27:115:48 | insert_query2.as_str() [&ref] | provenance | MaD:8 |
-| test_storage.rs:115:27:115:39 | insert_query2 | test_storage.rs:115:27:115:48 | insert_query2.as_str() [&ref] | provenance | MaD:7 |
-| test_storage.rs:115:27:115:39 | insert_query2 | test_storage.rs:115:27:115:48 | insert_query2.as_str() [&ref] | provenance | MaD:8 |
+| test_storage.rs:115:27:115:39 | insert_query2 | test_storage.rs:115:27:115:48 | insert_query2.as_str() [&ref] | provenance | MaD:10 |
 | test_storage.rs:115:27:115:48 | insert_query2.as_str() | test_storage.rs:115:13:115:25 | ...::raw_sql | provenance | MaD:5 Sink:MaD:5 |
 | test_storage.rs:115:27:115:48 | insert_query2.as_str() [&ref] | test_storage.rs:115:13:115:25 | ...::raw_sql | provenance | MaD:5 Sink:MaD:5 |
-| test_storage.rs:119:25:119:37 | insert_query2 | test_storage.rs:119:25:119:46 | insert_query2.as_str() [&ref] | provenance | MaD:8 |
-| test_storage.rs:119:25:119:37 | insert_query2 | test_storage.rs:119:25:119:46 | insert_query2.as_str() [&ref] | provenance | MaD:7 |
-| test_storage.rs:119:25:119:37 | insert_query2 | test_storage.rs:119:25:119:46 | insert_query2.as_str() [&ref] | provenance | MaD:8 |
+| test_storage.rs:119:25:119:37 | insert_query2 | test_storage.rs:119:25:119:46 | insert_query2.as_str() [&ref] | provenance | MaD:10 |
 | test_storage.rs:119:25:119:46 | insert_query2.as_str() | test_storage.rs:119:13:119:23 | ...::query | provenance | MaD:4 Sink:MaD:4 |
 | test_storage.rs:119:25:119:46 | insert_query2.as_str() [&ref] | test_storage.rs:119:13:119:23 | ...::query | provenance | MaD:4 Sink:MaD:4 |
-| test_storage.rs:125:25:125:37 | insert_query2 | test_storage.rs:125:25:125:46 | insert_query2.as_str() [&ref] | provenance | MaD:8 |
-| test_storage.rs:125:25:125:37 | insert_query2 | test_storage.rs:125:25:125:46 | insert_query2.as_str() [&ref] | provenance | MaD:7 |
-| test_storage.rs:125:25:125:37 | insert_query2 | test_storage.rs:125:25:125:46 | insert_query2.as_str() [&ref] | provenance | MaD:8 |
+| test_storage.rs:125:25:125:37 | insert_query2 | test_storage.rs:125:25:125:46 | insert_query2.as_str() [&ref] | provenance | MaD:10 |
 | test_storage.rs:125:25:125:46 | insert_query2.as_str() | test_storage.rs:125:13:125:23 | ...::query | provenance | MaD:4 Sink:MaD:4 |
 | test_storage.rs:125:25:125:46 | insert_query2.as_str() [&ref] | test_storage.rs:125:13:125:23 | ...::query | provenance | MaD:4 Sink:MaD:4 |
-| test_storage.rs:139:25:139:37 | insert_query2 | test_storage.rs:139:25:139:46 | insert_query2.as_str() [&ref] | provenance | MaD:8 |
-| test_storage.rs:139:25:139:37 | insert_query2 | test_storage.rs:139:25:139:46 | insert_query2.as_str() [&ref] | provenance | MaD:7 |
-| test_storage.rs:139:25:139:37 | insert_query2 | test_storage.rs:139:25:139:46 | insert_query2.as_str() [&ref] | provenance | MaD:8 |
+| test_storage.rs:139:25:139:37 | insert_query2 | test_storage.rs:139:25:139:46 | insert_query2.as_str() [&ref] | provenance | MaD:10 |
 | test_storage.rs:139:25:139:46 | insert_query2.as_str() | test_storage.rs:139:13:139:23 | ...::query | provenance | MaD:4 Sink:MaD:4 |
 | test_storage.rs:139:25:139:46 | insert_query2.as_str() [&ref] | test_storage.rs:139:13:139:23 | ...::query | provenance | MaD:4 Sink:MaD:4 |
 | test_storage.rs:189:9:189:24 | insert_query_bad | test_storage.rs:194:25:194:40 | insert_query_bad | provenance |  |
 | test_storage.rs:189:28:189:117 | ... + ... | test_storage.rs:189:9:189:24 | insert_query_bad | provenance |  |
-| test_storage.rs:189:28:189:117 | ... + ... | test_storage.rs:189:28:189:124 | ... + ... | provenance | MaD:6 |
+| test_storage.rs:189:28:189:117 | ... + ... | test_storage.rs:189:28:189:124 | ... + ... | provenance | MaD:8 |
+| test_storage.rs:189:28:189:117 | ... + ... | test_storage.rs:189:28:189:124 | ... + ... | provenance | MaD:9 |
 | test_storage.rs:189:28:189:124 | ... + ... | test_storage.rs:189:9:189:24 | insert_query_bad | provenance |  |
 | test_storage.rs:189:99:189:117 | &... | test_storage.rs:189:9:189:24 | insert_query_bad | provenance |  |
 | test_storage.rs:189:99:189:117 | &... | test_storage.rs:189:28:189:117 | ... + ... | provenance |  |
+| test_storage.rs:189:99:189:117 | &... | test_storage.rs:189:28:189:117 | ... + ... | provenance | MaD:7 |
+| test_storage.rs:189:99:189:117 | &... | test_storage.rs:189:28:189:117 | ... + ... | provenance | MaD:6 |
+| test_storage.rs:189:99:189:117 | &... [&ref] | test_storage.rs:189:28:189:117 | ... + ... | provenance | MaD:6 |
 | test_storage.rs:189:100:189:117 | get_phone_number(...) | test_storage.rs:189:99:189:117 | &... | provenance | Config |
+| test_storage.rs:189:100:189:117 | get_phone_number(...) | test_storage.rs:189:99:189:117 | &... [&ref] | provenance |  |
 | test_storage.rs:190:9:190:24 | select_query_bad | test_storage.rs:196:35:196:50 | select_query_bad | provenance |  |
 | test_storage.rs:190:28:190:103 | ... + ... | test_storage.rs:190:9:190:24 | select_query_bad | provenance |  |
-| test_storage.rs:190:28:190:103 | ... + ... | test_storage.rs:190:28:190:109 | ... + ... | provenance | MaD:6 |
+| test_storage.rs:190:28:190:103 | ... + ... | test_storage.rs:190:28:190:109 | ... + ... | provenance | MaD:8 |
+| test_storage.rs:190:28:190:103 | ... + ... | test_storage.rs:190:28:190:109 | ... + ... | provenance | MaD:9 |
 | test_storage.rs:190:28:190:109 | ... + ... | test_storage.rs:190:9:190:24 | select_query_bad | provenance |  |
 | test_storage.rs:190:85:190:103 | &... | test_storage.rs:190:9:190:24 | select_query_bad | provenance |  |
 | test_storage.rs:190:85:190:103 | &... | test_storage.rs:190:28:190:103 | ... + ... | provenance |  |
+| test_storage.rs:190:85:190:103 | &... | test_storage.rs:190:28:190:103 | ... + ... | provenance | MaD:7 |
+| test_storage.rs:190:85:190:103 | &... | test_storage.rs:190:28:190:103 | ... + ... | provenance | MaD:6 |
+| test_storage.rs:190:85:190:103 | &... [&ref] | test_storage.rs:190:28:190:103 | ... + ... | provenance | MaD:6 |
 | test_storage.rs:190:86:190:103 | get_phone_number(...) | test_storage.rs:190:85:190:103 | &... | provenance | Config |
+| test_storage.rs:190:86:190:103 | get_phone_number(...) | test_storage.rs:190:85:190:103 | &... [&ref] | provenance |  |
 | test_storage.rs:194:24:194:40 | &insert_query_bad | test_storage.rs:194:16:194:22 | execute | provenance | MaD:1 Sink:MaD:1 |
 | test_storage.rs:194:24:194:40 | &insert_query_bad [&ref] | test_storage.rs:194:16:194:22 | execute | provenance | MaD:1 Sink:MaD:1 |
 | test_storage.rs:194:25:194:40 | insert_query_bad | test_storage.rs:194:24:194:40 | &insert_query_bad | provenance | Config |
@@ -92,14 +87,17 @@ models
 | 3 | Sink: <rusqlite::Connection>::query_row; Argument[0]; sql-injection |
 | 4 | Sink: sqlx_core::query::query; Argument[0]; sql-injection |
 | 5 | Sink: sqlx_core::raw_sql::raw_sql; Argument[0]; sql-injection |
-| 6 | Summary: <alloc::string::String as core::ops::arith::Add>::add; Argument[self]; ReturnValue; value |
-| 7 | Summary: <alloc::string::String>::as_str; Argument[self]; ReturnValue; value |
-| 8 | Summary: <core::str>::as_str; Argument[self]; ReturnValue; value |
+| 6 | Summary: <_ as core::ops::arith::Add>::add; Argument[0].Reference; ReturnValue; taint |
+| 7 | Summary: <_ as core::ops::arith::Add>::add; Argument[0]; ReturnValue; taint |
+| 8 | Summary: <_ as core::ops::arith::Add>::add; Argument[self]; ReturnValue; taint |
+| 9 | Summary: <alloc::string::String as core::ops::arith::Add>::add; Argument[self]; ReturnValue; value |
+| 10 | Summary: <alloc::string::String>::as_str; Argument[self]; ReturnValue; value |
 nodes
 | test_storage.rs:71:9:71:21 | insert_query2 | semmle.label | insert_query2 |
 | test_storage.rs:71:25:71:114 | ... + ... | semmle.label | ... + ... |
 | test_storage.rs:71:25:71:121 | ... + ... | semmle.label | ... + ... |
 | test_storage.rs:71:96:71:114 | &... | semmle.label | &... |
+| test_storage.rs:71:96:71:114 | &... [&ref] | semmle.label | &... [&ref] |
 | test_storage.rs:71:97:71:114 | get_phone_number(...) | semmle.label | get_phone_number(...) |
 | test_storage.rs:100:13:100:23 | ...::query | semmle.label | ...::query |
 | test_storage.rs:100:25:100:37 | insert_query2 | semmle.label | insert_query2 |
@@ -125,11 +123,13 @@ nodes
 | test_storage.rs:189:28:189:117 | ... + ... | semmle.label | ... + ... |
 | test_storage.rs:189:28:189:124 | ... + ... | semmle.label | ... + ... |
 | test_storage.rs:189:99:189:117 | &... | semmle.label | &... |
+| test_storage.rs:189:99:189:117 | &... [&ref] | semmle.label | &... [&ref] |
 | test_storage.rs:189:100:189:117 | get_phone_number(...) | semmle.label | get_phone_number(...) |
 | test_storage.rs:190:9:190:24 | select_query_bad | semmle.label | select_query_bad |
 | test_storage.rs:190:28:190:103 | ... + ... | semmle.label | ... + ... |
 | test_storage.rs:190:28:190:109 | ... + ... | semmle.label | ... + ... |
 | test_storage.rs:190:85:190:103 | &... | semmle.label | &... |
+| test_storage.rs:190:85:190:103 | &... [&ref] | semmle.label | &... [&ref] |
 | test_storage.rs:190:86:190:103 | get_phone_number(...) | semmle.label | get_phone_number(...) |
 | test_storage.rs:194:16:194:22 | execute | semmle.label | execute |
 | test_storage.rs:194:24:194:40 | &insert_query_bad | semmle.label | &insert_query_bad |
diff --git a/rust/ql/test/query-tests/security/CWE-319/Cargo.lock b/rust/ql/test/query-tests/security/CWE-319/Cargo.lock
new file mode 100644
index 00000000000..ad4b5cebd22
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-319/Cargo.lock
@@ -0,0 +1,1574 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "addr2line"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler2"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
+
+[[package]]
+name = "atomic-waker"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+
+[[package]]
+name = "backtrace"
+version = "0.3.75"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002"
+dependencies = [
+ "addr2line",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+ "windows-targets",
+]
+
+[[package]]
+name = "base64"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+
+[[package]]
+name = "bitflags"
+version = "2.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2261d10cca569e4643e526d8dc2e62e433cc8aba21ab764233731f8d369bf394"
+
+[[package]]
+name = "bumpalo"
+version = "3.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
+
+[[package]]
+name = "bytes"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
+
+[[package]]
+name = "cc"
+version = "1.2.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65193589c6404eb80b450d618eaf9a2cafaaafd57ecce47370519ef674a7bd44"
+dependencies = [
+ "find-msvc-tools",
+ "shlex",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9"
+
+[[package]]
+name = "core-foundation"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+
+[[package]]
+name = "displaydoc"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "encoding_rs"
+version = "0.8.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
+
+[[package]]
+name = "errno"
+version = "0.3.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
+dependencies = [
+ "libc",
+ "windows-sys 0.61.0",
+]
+
+[[package]]
+name = "fastrand"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
+
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fd99930f64d146689264c637b5af2f0233a933bef0d8570e2526bf9e083192d"
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "foreign-types"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
+dependencies = [
+ "foreign-types-shared",
+]
+
+[[package]]
+name = "foreign-types-shared"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
+
+[[package]]
+name = "form_urlencoded"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf"
+dependencies = [
+ "percent-encoding",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
+
+[[package]]
+name = "futures-io"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
+
+[[package]]
+name = "futures-sink"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
+
+[[package]]
+name = "futures-task"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
+
+[[package]]
+name = "futures-util"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
+dependencies = [
+ "futures-core",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.11.1+wasi-snapshot-preview1",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "r-efi",
+ "wasi 0.14.5+wasi-0.2.4",
+]
+
+[[package]]
+name = "gimli"
+version = "0.31.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
+
+[[package]]
+name = "h2"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3c0b69cfcb4e1b9f1bf2f53f95f766e4661169728ec61cd3fe5a0166f2d1386"
+dependencies = [
+ "atomic-waker",
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "http",
+ "indexmap",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.15.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
+
+[[package]]
+name = "http"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
+[[package]]
+name = "http-body"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
+dependencies = [
+ "bytes",
+ "http",
+]
+
+[[package]]
+name = "http-body-util"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "http",
+ "http-body",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "httparse"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
+
+[[package]]
+name = "hyper"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb3aa54a13a0dfe7fbe3a59e0c76093041720fdc77b110cc0fc260fafb4dc51e"
+dependencies = [
+ "atomic-waker",
+ "bytes",
+ "futures-channel",
+ "futures-core",
+ "h2",
+ "http",
+ "http-body",
+ "httparse",
+ "itoa",
+ "pin-project-lite",
+ "pin-utils",
+ "smallvec",
+ "tokio",
+ "want",
+]
+
+[[package]]
+name = "hyper-rustls"
+version = "0.27.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58"
+dependencies = [
+ "http",
+ "hyper",
+ "hyper-util",
+ "rustls",
+ "rustls-pki-types",
+ "tokio",
+ "tokio-rustls",
+ "tower-service",
+]
+
+[[package]]
+name = "hyper-tls"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
+dependencies = [
+ "bytes",
+ "http-body-util",
+ "hyper",
+ "hyper-util",
+ "native-tls",
+ "tokio",
+ "tokio-native-tls",
+ "tower-service",
+]
+
+[[package]]
+name = "hyper-util"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d9b05277c7e8da2c93a568989bb6207bef0112e8d17df7a6eda4a3cf143bc5e"
+dependencies = [
+ "base64",
+ "bytes",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "http",
+ "http-body",
+ "hyper",
+ "ipnet",
+ "libc",
+ "percent-encoding",
+ "pin-project-lite",
+ "socket2",
+ "system-configuration",
+ "tokio",
+ "tower-service",
+ "tracing",
+ "windows-registry",
+]
+
+[[package]]
+name = "icu_collections"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47"
+dependencies = [
+ "displaydoc",
+ "potential_utf",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locale_core"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3"
+
+[[package]]
+name = "icu_properties"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locale_core",
+ "icu_properties_data",
+ "icu_provider",
+ "potential_utf",
+ "zerotrie",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632"
+
+[[package]]
+name = "icu_provider"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af"
+dependencies = [
+ "displaydoc",
+ "icu_locale_core",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerotrie",
+ "zerovec",
+]
+
+[[package]]
+name = "idna"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "206a8042aec68fa4a62e8d3f7aa4ceb508177d9324faf261e1959e495b7a1921"
+dependencies = [
+ "equivalent",
+ "hashbrown",
+]
+
+[[package]]
+name = "io-uring"
+version = "0.7.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "046fa2d4d00aea763528b4950358d0ead425372445dc8ff86312b3c69ff7727b"
+dependencies = [
+ "bitflags",
+ "cfg-if",
+ "libc",
+]
+
+[[package]]
+name = "ipnet"
+version = "2.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
+
+[[package]]
+name = "iri-string"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbc5ebe9c3a1a7a5127f920a418f7585e9e758e911d0466ed004f393b0e380b2"
+dependencies = [
+ "memchr",
+ "serde",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
+
+[[package]]
+name = "js-sys"
+version = "0.3.78"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c0b063578492ceec17683ef2f8c5e89121fbd0b172cbc280635ab7567db2738"
+dependencies = [
+ "once_cell",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.175"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039"
+
+[[package]]
+name = "litemap"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
+
+[[package]]
+name = "log"
+version = "0.4.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
+
+[[package]]
+name = "memchr"
+version = "2.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
+
+[[package]]
+name = "mime"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
+dependencies = [
+ "adler2",
+]
+
+[[package]]
+name = "mio"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c"
+dependencies = [
+ "libc",
+ "wasi 0.11.1+wasi-snapshot-preview1",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "native-tls"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e"
+dependencies = [
+ "libc",
+ "log",
+ "openssl",
+ "openssl-probe",
+ "openssl-sys",
+ "schannel",
+ "security-framework",
+ "security-framework-sys",
+ "tempfile",
+]
+
+[[package]]
+name = "object"
+version = "0.36.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+
+[[package]]
+name = "openssl"
+version = "0.10.73"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8"
+dependencies = [
+ "bitflags",
+ "cfg-if",
+ "foreign-types",
+ "libc",
+ "once_cell",
+ "openssl-macros",
+ "openssl-sys",
+]
+
+[[package]]
+name = "openssl-macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "openssl-probe"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
+
+[[package]]
+name = "openssl-sys"
+version = "0.9.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90096e2e47630d78b7d1c20952dc621f957103f8bc2c8359ec81290d75238571"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+ "vcpkg",
+]
+
+[[package]]
+name = "percent-encoding"
+version = "2.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "pkg-config"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
+
+[[package]]
+name = "potential_utf"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84df19adbe5b5a0782edcab45899906947ab039ccf4573713735ee7de1e6b08a"
+dependencies = [
+ "zerovec",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.101"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "r-efi"
+version = "5.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
+
+[[package]]
+name = "reqwest"
+version = "0.12.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d429f34c8092b2d42c7c93cec323bb4adeb7c67698f70839adec842ec10c7ceb"
+dependencies = [
+ "base64",
+ "bytes",
+ "encoding_rs",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "http-body-util",
+ "hyper",
+ "hyper-rustls",
+ "hyper-tls",
+ "hyper-util",
+ "js-sys",
+ "log",
+ "mime",
+ "native-tls",
+ "percent-encoding",
+ "pin-project-lite",
+ "rustls-pki-types",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "sync_wrapper",
+ "tokio",
+ "tokio-native-tls",
+ "tower",
+ "tower-http",
+ "tower-service",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
+[[package]]
+name = "ring"
+version = "0.17.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
+dependencies = [
+ "cc",
+ "cfg-if",
+ "getrandom 0.2.16",
+ "libc",
+ "untrusted",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace"
+
+[[package]]
+name = "rustix"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e"
+dependencies = [
+ "bitflags",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.61.0",
+]
+
+[[package]]
+name = "rustls"
+version = "0.23.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0ebcbd2f03de0fc1122ad9bb24b127a5a6cd51d72604a3f3c50ac459762b6cc"
+dependencies = [
+ "once_cell",
+ "rustls-pki-types",
+ "rustls-webpki",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "rustls-pki-types"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79"
+dependencies = [
+ "zeroize",
+]
+
+[[package]]
+name = "rustls-webpki"
+version = "0.103.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5a37813727b78798e53c2bec3f5e8fe12a6d6f8389bf9ca7802add4c9905ad8"
+dependencies = [
+ "ring",
+ "rustls-pki-types",
+ "untrusted",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
+
+[[package]]
+name = "ryu"
+version = "1.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
+
+[[package]]
+name = "schannel"
+version = "0.1.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "891d81b926048e76efe18581bf793546b4c0eaf8448d72be8de2bbee5fd166e1"
+dependencies = [
+ "windows-sys 0.61.0",
+]
+
+[[package]]
+name = "security-framework"
+version = "2.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
+dependencies = [
+ "bitflags",
+ "core-foundation",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "2.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc1f0cbffaac4852523ce30d8bd3c5cdc873501d96ff467ca09b6767bb8cd5c0"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "serde"
+version = "1.0.223"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a505d71960adde88e293da5cb5eda57093379f64e61cf77bf0e6a63af07a7bac"
+dependencies = [
+ "serde_core",
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.223"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20f57cbd357666aa7b3ac84a90b4ea328f1d4ddb6772b430caa5d9e1309bb9e9"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.223"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d428d07faf17e306e699ec1e91996e5a165ba5d6bce5b5155173e91a8a01a56"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.145"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
+dependencies = [
+ "itoa",
+ "memchr",
+ "ryu",
+ "serde",
+ "serde_core",
+]
+
+[[package]]
+name = "serde_urlencoded"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
+dependencies = [
+ "form_urlencoded",
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "slab"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
+
+[[package]]
+name = "smallvec"
+version = "1.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
+
+[[package]]
+name = "socket2"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "233504af464074f9d066d7b5416c5f9b894a5862a6506e306f7b816cdd6f1807"
+dependencies = [
+ "libc",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
+[[package]]
+name = "subtle"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
+
+[[package]]
+name = "syn"
+version = "2.0.106"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "sync_wrapper"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
+dependencies = [
+ "futures-core",
+]
+
+[[package]]
+name = "synstructure"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "system-configuration"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
+dependencies = [
+ "bitflags",
+ "core-foundation",
+ "system-configuration-sys",
+]
+
+[[package]]
+name = "system-configuration-sys"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "tempfile"
+version = "3.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84fa4d11fadde498443cca10fd3ac23c951f0dc59e080e9f4b93d4df4e4eea53"
+dependencies = [
+ "fastrand",
+ "getrandom 0.3.3",
+ "once_cell",
+ "rustix",
+ "windows-sys 0.61.0",
+]
+
+[[package]]
+name = "test"
+version = "0.0.1"
+dependencies = [
+ "reqwest",
+]
+
+[[package]]
+name = "tinystr"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
+[[package]]
+name = "tokio"
+version = "1.47.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89e49afdadebb872d3145a5638b59eb0691ea23e46ca484037cfab3b76b95038"
+dependencies = [
+ "backtrace",
+ "bytes",
+ "io-uring",
+ "libc",
+ "mio",
+ "pin-project-lite",
+ "slab",
+ "socket2",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "tokio-native-tls"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
+dependencies = [
+ "native-tls",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-rustls"
+version = "0.26.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b"
+dependencies = [
+ "rustls",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-util"
+version = "0.7.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14307c986784f72ef81c89db7d9e28d6ac26d16213b109ea501696195e6e3ce5"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "futures-sink",
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
+name = "tower"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
+dependencies = [
+ "futures-core",
+ "futures-util",
+ "pin-project-lite",
+ "sync_wrapper",
+ "tokio",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "tower-http"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2"
+dependencies = [
+ "bitflags",
+ "bytes",
+ "futures-util",
+ "http",
+ "http-body",
+ "iri-string",
+ "pin-project-lite",
+ "tower",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "tower-layer"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
+
+[[package]]
+name = "tower-service"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
+
+[[package]]
+name = "tracing"
+version = "0.1.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
+dependencies = [
+ "pin-project-lite",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678"
+dependencies = [
+ "once_cell",
+]
+
+[[package]]
+name = "try-lock"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d"
+
+[[package]]
+name = "untrusted"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+
+[[package]]
+name = "url"
+version = "2.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b"
+dependencies = [
+ "form_urlencoded",
+ "idna",
+ "percent-encoding",
+ "serde",
+]
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
+[[package]]
+name = "vcpkg"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+
+[[package]]
+name = "want"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
+dependencies = [
+ "try-lock",
+]
+
+[[package]]
+name = "wasi"
+version = "0.11.1+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
+
+[[package]]
+name = "wasi"
+version = "0.14.5+wasi-0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4494f6290a82f5fe584817a676a34b9d6763e8d9d18204009fb31dceca98fd4"
+dependencies = [
+ "wasip2",
+]
+
+[[package]]
+name = "wasip2"
+version = "1.0.0+wasi-0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03fa2761397e5bd52002cd7e73110c71af2109aca4e521a9f40473fe685b0a24"
+dependencies = [
+ "wit-bindgen",
+]
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.101"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e14915cadd45b529bb8d1f343c4ed0ac1de926144b746e2710f9cd05df6603b"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "rustversion",
+ "wasm-bindgen-macro",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.101"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e28d1ba982ca7923fd01448d5c30c6864d0a14109560296a162f80f305fb93bb"
+dependencies = [
+ "bumpalo",
+ "log",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-futures"
+version = "0.4.51"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ca85039a9b469b38336411d6d6ced91f3fc87109a2a27b0c197663f5144dffe"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "once_cell",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.101"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c3d463ae3eff775b0c45df9da45d68837702ac35af998361e2c84e7c5ec1b0d"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.101"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7bb4ce89b08211f923caf51d527662b75bdc9c9c7aab40f86dcb9fb85ac552aa"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.101"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f143854a3b13752c6950862c906306adb27c7e839f7414cec8fea35beab624c1"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "web-sys"
+version = "0.3.78"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77e4b637749ff0d92b8fad63aa1f7cff3cbe125fd49c175cd6345e7272638b12"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "windows-link"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
+
+[[package]]
+name = "windows-link"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65"
+
+[[package]]
+name = "windows-registry"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b8a9ed28765efc97bbc954883f4e6796c33a06546ebafacbabee9696967499e"
+dependencies = [
+ "windows-link 0.1.3",
+ "windows-result",
+ "windows-strings",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
+dependencies = [
+ "windows-link 0.1.3",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
+dependencies = [
+ "windows-link 0.1.3",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.61.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e201184e40b2ede64bc2ea34968b28e33622acdbbf37104f0e4a33f7abe657aa"
+dependencies = [
+ "windows-link 0.2.0",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
+name = "wit-bindgen"
+version = "0.45.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c573471f125075647d03df72e026074b7203790d41351cd6edc96f46bcccd36"
+
+[[package]]
+name = "writeable"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb"
+
+[[package]]
+name = "yoke"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
+[[package]]
+name = "zeroize"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+
+[[package]]
+name = "zerotrie"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7aa2bd55086f1ab526693ecbe444205da57e25f4489879da80635a46d90e73b"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
diff --git a/rust/ql/test/query-tests/security/CWE-319/UseOfHttp.expected b/rust/ql/test/query-tests/security/CWE-319/UseOfHttp.expected
new file mode 100644
index 00000000000..25890c76985
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-319/UseOfHttp.expected
@@ -0,0 +1,72 @@
+#select
+| main.rs:12:22:12:43 | ...::get | main.rs:12:45:12:68 | "http://example.com/api" | main.rs:12:22:12:43 | ...::get | This URL may be constructed with the HTTP protocol, from $@. | main.rs:12:45:12:68 | "http://example.com/api" | this HTTP URL |
+| main.rs:13:22:13:43 | ...::get | main.rs:13:45:13:68 | "HTTP://EXAMPLE.COM/API" | main.rs:13:22:13:43 | ...::get | This URL may be constructed with the HTTP protocol, from $@. | main.rs:13:45:13:68 | "HTTP://EXAMPLE.COM/API" | this HTTP URL |
+| main.rs:14:22:14:43 | ...::get | main.rs:14:45:14:73 | "http://api.example.com/data" | main.rs:14:22:14:43 | ...::get | This URL may be constructed with the HTTP protocol, from $@. | main.rs:14:45:14:73 | "http://api.example.com/data" | this HTTP URL |
+| main.rs:26:21:26:42 | ...::get | main.rs:23:20:23:39 | "http://example.com" | main.rs:26:21:26:42 | ...::get | This URL may be constructed with the HTTP protocol, from $@. | main.rs:23:20:23:39 | "http://example.com" | this HTTP URL |
+| main.rs:37:30:37:51 | ...::get | main.rs:34:20:34:28 | "http://" | main.rs:37:30:37:51 | ...::get | This URL may be constructed with the HTTP protocol, from $@. | main.rs:34:20:34:28 | "http://" | this HTTP URL |
+| main.rs:60:20:60:41 | ...::get | main.rs:60:43:60:65 | "http://172.32.0.0/baz" | main.rs:60:20:60:41 | ...::get | This URL may be constructed with the HTTP protocol, from $@. | main.rs:60:43:60:65 | "http://172.32.0.0/baz" | this HTTP URL |
+| main.rs:71:24:71:45 | ...::get | main.rs:68:19:68:53 | "http://example.com/sensitive-... | main.rs:71:24:71:45 | ...::get | This URL may be constructed with the HTTP protocol, from $@. | main.rs:68:19:68:53 | "http://example.com/sensitive-... | this HTTP URL |
+edges
+| main.rs:12:45:12:68 | "http://example.com/api" | main.rs:12:22:12:43 | ...::get | provenance | MaD:1 Sink:MaD:1 |
+| main.rs:13:45:13:68 | "HTTP://EXAMPLE.COM/API" | main.rs:13:22:13:43 | ...::get | provenance | MaD:1 Sink:MaD:1 |
+| main.rs:14:45:14:73 | "http://api.example.com/data" | main.rs:14:22:14:43 | ...::get | provenance | MaD:1 Sink:MaD:1 |
+| main.rs:23:9:23:16 | base_url | main.rs:25:28:25:53 | MacroExpr | provenance |  |
+| main.rs:23:20:23:39 | "http://example.com" | main.rs:23:9:23:16 | base_url | provenance |  |
+| main.rs:25:9:25:16 | full_url | main.rs:26:45:26:52 | full_url | provenance |  |
+| main.rs:25:28:25:53 | ...::format(...) | main.rs:25:28:25:53 | { ... } | provenance |  |
+| main.rs:25:28:25:53 | ...::must_use(...) | main.rs:25:9:25:16 | full_url | provenance |  |
+| main.rs:25:28:25:53 | MacroExpr | main.rs:25:28:25:53 | ...::format(...) | provenance | MaD:2 |
+| main.rs:25:28:25:53 | { ... } | main.rs:25:28:25:53 | ...::must_use(...) | provenance | MaD:3 |
+| main.rs:26:44:26:52 | &full_url [&ref] | main.rs:26:21:26:42 | ...::get | provenance | MaD:1 Sink:MaD:1 |
+| main.rs:26:45:26:52 | full_url | main.rs:26:44:26:52 | &full_url [&ref] | provenance |  |
+| main.rs:34:9:34:16 | protocol | main.rs:36:32:36:53 | MacroExpr | provenance |  |
+| main.rs:34:20:34:28 | "http://" | main.rs:34:9:34:16 | protocol | provenance |  |
+| main.rs:36:9:36:20 | insecure_url | main.rs:37:54:37:65 | insecure_url | provenance |  |
+| main.rs:36:32:36:53 | ...::format(...) | main.rs:36:32:36:53 | { ... } | provenance |  |
+| main.rs:36:32:36:53 | ...::must_use(...) | main.rs:36:9:36:20 | insecure_url | provenance |  |
+| main.rs:36:32:36:53 | MacroExpr | main.rs:36:32:36:53 | ...::format(...) | provenance | MaD:2 |
+| main.rs:36:32:36:53 | { ... } | main.rs:36:32:36:53 | ...::must_use(...) | provenance | MaD:3 |
+| main.rs:37:53:37:65 | &insecure_url [&ref] | main.rs:37:30:37:51 | ...::get | provenance | MaD:1 Sink:MaD:1 |
+| main.rs:37:54:37:65 | insecure_url | main.rs:37:53:37:65 | &insecure_url [&ref] | provenance |  |
+| main.rs:60:43:60:65 | "http://172.32.0.0/baz" | main.rs:60:20:60:41 | ...::get | provenance | MaD:1 Sink:MaD:1 |
+| main.rs:68:13:68:15 | url | main.rs:71:47:71:49 | url | provenance |  |
+| main.rs:68:19:68:53 | "http://example.com/sensitive-... | main.rs:68:13:68:15 | url | provenance |  |
+| main.rs:71:47:71:49 | url | main.rs:71:24:71:45 | ...::get | provenance | MaD:1 Sink:MaD:1 |
+models
+| 1 | Sink: reqwest::blocking::get; Argument[0]; request-url |
+| 2 | Summary: alloc::fmt::format; Argument[0]; ReturnValue; taint |
+| 3 | Summary: core::hint::must_use; Argument[0]; ReturnValue; value |
+nodes
+| main.rs:12:22:12:43 | ...::get | semmle.label | ...::get |
+| main.rs:12:45:12:68 | "http://example.com/api" | semmle.label | "http://example.com/api" |
+| main.rs:13:22:13:43 | ...::get | semmle.label | ...::get |
+| main.rs:13:45:13:68 | "HTTP://EXAMPLE.COM/API" | semmle.label | "HTTP://EXAMPLE.COM/API" |
+| main.rs:14:22:14:43 | ...::get | semmle.label | ...::get |
+| main.rs:14:45:14:73 | "http://api.example.com/data" | semmle.label | "http://api.example.com/data" |
+| main.rs:23:9:23:16 | base_url | semmle.label | base_url |
+| main.rs:23:20:23:39 | "http://example.com" | semmle.label | "http://example.com" |
+| main.rs:25:9:25:16 | full_url | semmle.label | full_url |
+| main.rs:25:28:25:53 | ...::format(...) | semmle.label | ...::format(...) |
+| main.rs:25:28:25:53 | ...::must_use(...) | semmle.label | ...::must_use(...) |
+| main.rs:25:28:25:53 | MacroExpr | semmle.label | MacroExpr |
+| main.rs:25:28:25:53 | { ... } | semmle.label | { ... } |
+| main.rs:26:21:26:42 | ...::get | semmle.label | ...::get |
+| main.rs:26:44:26:52 | &full_url [&ref] | semmle.label | &full_url [&ref] |
+| main.rs:26:45:26:52 | full_url | semmle.label | full_url |
+| main.rs:34:9:34:16 | protocol | semmle.label | protocol |
+| main.rs:34:20:34:28 | "http://" | semmle.label | "http://" |
+| main.rs:36:9:36:20 | insecure_url | semmle.label | insecure_url |
+| main.rs:36:32:36:53 | ...::format(...) | semmle.label | ...::format(...) |
+| main.rs:36:32:36:53 | ...::must_use(...) | semmle.label | ...::must_use(...) |
+| main.rs:36:32:36:53 | MacroExpr | semmle.label | MacroExpr |
+| main.rs:36:32:36:53 | { ... } | semmle.label | { ... } |
+| main.rs:37:30:37:51 | ...::get | semmle.label | ...::get |
+| main.rs:37:53:37:65 | &insecure_url [&ref] | semmle.label | &insecure_url [&ref] |
+| main.rs:37:54:37:65 | insecure_url | semmle.label | insecure_url |
+| main.rs:60:20:60:41 | ...::get | semmle.label | ...::get |
+| main.rs:60:43:60:65 | "http://172.32.0.0/baz" | semmle.label | "http://172.32.0.0/baz" |
+| main.rs:68:13:68:15 | url | semmle.label | url |
+| main.rs:68:19:68:53 | "http://example.com/sensitive-... | semmle.label | "http://example.com/sensitive-... |
+| main.rs:71:24:71:45 | ...::get | semmle.label | ...::get |
+| main.rs:71:47:71:49 | url | semmle.label | url |
+subpaths
diff --git a/rust/ql/test/query-tests/security/CWE-319/UseOfHttp.qlref b/rust/ql/test/query-tests/security/CWE-319/UseOfHttp.qlref
new file mode 100644
index 00000000000..90b53330019
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-319/UseOfHttp.qlref
@@ -0,0 +1,4 @@
+query: queries/security/CWE-319/UseOfHttp.ql
+postprocess:
+ - utils/test/PrettyPrintModels.ql
+ - utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/rust/ql/test/query-tests/security/CWE-319/main.rs b/rust/ql/test/query-tests/security/CWE-319/main.rs
new file mode 100644
index 00000000000..0a3539923da
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-319/main.rs
@@ -0,0 +1,83 @@
+use reqwest;
+use std::env;
+
+fn main() {
+    test_direct_literals();
+    test_dynamic_urls();
+    test_localhost_exemptions();
+}
+
+fn test_direct_literals() {
+    // BAD: Direct HTTP URLs that should be flagged
+    let _response1 = reqwest::blocking::get("http://example.com/api").unwrap(); // $ Alert[rust/non-https-url]
+    let _response2 = reqwest::blocking::get("HTTP://EXAMPLE.COM/API").unwrap(); // $ Alert[rust/non-https-url]
+    let _response3 = reqwest::blocking::get("http://api.example.com/data").unwrap(); // $ Alert[rust/non-https-url]
+
+    // GOOD: HTTPS URLs that should not be flagged
+    let _response3 = reqwest::blocking::get("https://example.com/api").unwrap();
+    let _response4 = reqwest::blocking::get("https://api.example.com/data").unwrap();
+}
+
+fn test_dynamic_urls() {
+    // BAD: HTTP URLs constructed dynamically
+    let base_url = "http://example.com"; // $ Source
+    let endpoint = "/api/users";
+    let full_url = format!("{}{}", base_url, endpoint);
+    let _response = reqwest::blocking::get(&full_url).unwrap(); // $ Alert[rust/non-https-url]
+
+    // GOOD: HTTPS URLs constructed dynamically
+    let secure_base = "https://example.com";
+    let secure_full = format!("{}{}", secure_base, endpoint);
+    let _secure_response = reqwest::blocking::get(&secure_full).unwrap();
+
+    // BAD: HTTP protocol string
+    let protocol = "http://"; // $ Source
+    let host = "api.example.com";
+    let insecure_url = format!("{}{}", protocol, host);
+    let _insecure_response = reqwest::blocking::get(&insecure_url).unwrap(); // $ Alert[rust/non-https-url]
+
+    // GOOD: HTTPS protocol string
+    let secure_protocol = "https://";
+    let secure_url = format!("{}{}", secure_protocol, host);
+    let _secure_response2 = reqwest::blocking::get(&secure_url).unwrap();
+}
+
+fn test_localhost_exemptions() {
+    // GOOD: localhost URLs should not be flagged (local development)
+    let _local1 = reqwest::blocking::get("http://localhost:8080/api").unwrap();
+    let _local2 = reqwest::blocking::get("HTTP://LOCALHOST:8080/api").unwrap();
+    let _local3 = reqwest::blocking::get("http://127.0.0.1:3000/test").unwrap();
+    let _local4 = reqwest::blocking::get("http://192.168.1.100/internal").unwrap();
+    let _local5 = reqwest::blocking::get("http://10.0.0.1/admin").unwrap();
+    let _local6 = reqwest::blocking::get("http://172.16.0.0/foo").unwrap();
+    let _local7 = reqwest::blocking::get("http://172.31.255.255/bar").unwrap();
+
+    // GOOD: test IPv6 localhost variants
+    let _local8 = reqwest::blocking::get("http://[::1]:8080/api").unwrap();
+    let _local9 = reqwest::blocking::get("http://[0:0:0:0:0:0:0:1]/test").unwrap();
+
+    // BAD: non-private IP address
+    let _local10 = reqwest::blocking::get("http://172.32.0.0/baz").unwrap(); // $ Alert[rust/non-https-url]
+
+}
+
+// Additional test cases that mirror the Bad/Good examples
+fn test_examples() {
+    // From UseOfHttpBad.rs - BAD case
+    {
+        let url = "http://example.com/sensitive-data"; // $ Source
+
+        // This makes an insecure HTTP request that can be intercepted
+        let response = reqwest::blocking::get(url).unwrap(); // $ Alert[rust/non-https-url]
+        println!("Response: {}", response.text().unwrap());
+    }
+
+    // From UseOfHttpGood.rs - GOOD case
+    {
+        let url = "https://example.com/sensitive-data";
+
+        // This makes a secure HTTPS request that is encrypted
+        let response = reqwest::blocking::get(url).unwrap();
+        println!("Response: {}", response.text().unwrap());
+    }
+}
diff --git a/rust/ql/test/query-tests/security/CWE-319/options.yml b/rust/ql/test/query-tests/security/CWE-319/options.yml
new file mode 100644
index 00000000000..aa57719603d
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-319/options.yml
@@ -0,0 +1,3 @@
+qltest_cargo_check: true
+qltest_dependencies:
+    - reqwest = { version = "0.12.9", features = ["blocking"] }
\ No newline at end of file
diff --git a/rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm.expected b/rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm.expected
deleted file mode 100644
index f1395ff39ec..00000000000
--- a/rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm.expected
+++ /dev/null
@@ -1,21 +0,0 @@
-| test_cipher.rs:20:27:20:48 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:20:27:20:48 | ...::new(...) | The cryptographic algorithm RC4 |
-| test_cipher.rs:23:27:23:60 | ...::new_from_slice(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:23:27:23:60 | ...::new_from_slice(...) | The cryptographic algorithm RC4 |
-| test_cipher.rs:26:27:26:48 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:26:27:26:48 | ...::new(...) | The cryptographic algorithm RC4 |
-| test_cipher.rs:29:27:29:48 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:29:27:29:48 | ...::new(...) | The cryptographic algorithm RC4 |
-| test_cipher.rs:59:23:59:42 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:59:23:59:42 | ...::new(...) | The cryptographic algorithm DES |
-| test_cipher.rs:63:23:63:47 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:63:23:63:47 | ...::new(...) | The cryptographic algorithm DES |
-| test_cipher.rs:67:23:67:46 | ...::new_from_slice(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:67:23:67:46 | ...::new_from_slice(...) | The cryptographic algorithm DES |
-| test_cipher.rs:71:23:71:42 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:71:23:71:42 | ...::new(...) | The cryptographic algorithm DES |
-| test_cipher.rs:75:27:75:46 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:75:27:75:46 | ...::new(...) | The cryptographic algorithm DES |
-| test_cipher.rs:80:24:80:48 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:80:24:80:48 | ...::new(...) | The cryptographic algorithm 3DES |
-| test_cipher.rs:84:24:84:48 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:84:24:84:48 | ...::new(...) | The cryptographic algorithm 3DES |
-| test_cipher.rs:88:24:88:48 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:88:24:88:48 | ...::new(...) | The cryptographic algorithm 3DES |
-| test_cipher.rs:92:24:92:52 | ...::new_from_slice(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:92:24:92:52 | ...::new_from_slice(...) | The cryptographic algorithm 3DES |
-| test_cipher.rs:97:23:97:42 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:97:23:97:42 | ...::new(...) | The cryptographic algorithm RC2 |
-| test_cipher.rs:101:23:101:46 | ...::new_from_slice(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:101:23:101:46 | ...::new_from_slice(...) | The cryptographic algorithm RC2 |
-| test_cipher.rs:105:23:105:56 | ...::new_with_eff_key_len(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:105:23:105:56 | ...::new_with_eff_key_len(...) | The cryptographic algorithm RC2 |
-| test_cipher.rs:110:23:110:50 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:110:23:110:50 | ...::new(...) | The cryptographic algorithm RC5 |
-| test_cipher.rs:114:23:114:55 | ...::new_from_slice(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:114:23:114:55 | ...::new_from_slice(...) | The cryptographic algorithm RC5 |
-| test_cipher.rs:132:23:132:76 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:132:23:132:76 | ...::new(...) | The cryptographic algorithm DES |
-| test_cipher.rs:138:23:138:76 | ...::new_from_slices(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:138:23:138:76 | ...::new_from_slices(...) | The cryptographic algorithm DES |
-| test_cipher.rs:141:23:141:76 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:141:23:141:76 | ...::new(...) | The cryptographic algorithm DES |
diff --git a/rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm/BrokenCryptoAlgorithm.expected b/rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm/BrokenCryptoAlgorithm.expected
new file mode 100644
index 00000000000..ef0a9e0d806
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm/BrokenCryptoAlgorithm.expected
@@ -0,0 +1,23 @@
+| test_cipher.rs:20:27:20:48 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:20:27:20:48 | ...::new(...) | The cryptographic algorithm RC4 |
+| test_cipher.rs:23:27:23:60 | ...::new_from_slice(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:23:27:23:60 | ...::new_from_slice(...) | The cryptographic algorithm RC4 |
+| test_cipher.rs:26:27:26:48 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:26:27:26:48 | ...::new(...) | The cryptographic algorithm RC4 |
+| test_cipher.rs:29:27:29:48 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:29:27:29:48 | ...::new(...) | The cryptographic algorithm RC4 |
+| test_cipher.rs:59:29:59:45 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:59:29:59:45 | ...::new(...) | The cryptographic algorithm DES |
+| test_cipher.rs:63:23:63:42 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:63:23:63:42 | ...::new(...) | The cryptographic algorithm DES |
+| test_cipher.rs:67:23:67:47 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:67:23:67:47 | ...::new(...) | The cryptographic algorithm DES |
+| test_cipher.rs:71:23:71:46 | ...::new_from_slice(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:71:23:71:46 | ...::new_from_slice(...) | The cryptographic algorithm DES |
+| test_cipher.rs:75:23:75:42 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:75:23:75:42 | ...::new(...) | The cryptographic algorithm DES |
+| test_cipher.rs:79:27:79:46 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:79:27:79:46 | ...::new(...) | The cryptographic algorithm DES |
+| test_cipher.rs:84:24:84:48 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:84:24:84:48 | ...::new(...) | The cryptographic algorithm 3DES |
+| test_cipher.rs:84:24:84:48 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:84:24:84:48 | ...::new(...) | The cryptographic algorithm DES |
+| test_cipher.rs:88:24:88:48 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:88:24:88:48 | ...::new(...) | The cryptographic algorithm 3DES |
+| test_cipher.rs:88:24:88:48 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:88:24:88:48 | ...::new(...) | The cryptographic algorithm DES |
+| test_cipher.rs:92:24:92:48 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:92:24:92:48 | ...::new(...) | The cryptographic algorithm 3DES |
+| test_cipher.rs:92:24:92:48 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:92:24:92:48 | ...::new(...) | The cryptographic algorithm DES |
+| test_cipher.rs:96:24:96:52 | ...::new_from_slice(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:96:24:96:52 | ...::new_from_slice(...) | The cryptographic algorithm 3DES |
+| test_cipher.rs:96:24:96:52 | ...::new_from_slice(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:96:24:96:52 | ...::new_from_slice(...) | The cryptographic algorithm DES |
+| test_cipher.rs:101:23:101:42 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:101:23:101:42 | ...::new(...) | The cryptographic algorithm RC2 |
+| test_cipher.rs:105:23:105:46 | ...::new_from_slice(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:105:23:105:46 | ...::new_from_slice(...) | The cryptographic algorithm RC2 |
+| test_cipher.rs:109:23:109:56 | ...::new_with_eff_key_len(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:109:23:109:56 | ...::new_with_eff_key_len(...) | The cryptographic algorithm RC2 |
+| test_cipher.rs:114:23:114:50 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:114:23:114:50 | ...::new(...) | The cryptographic algorithm RC5 |
+| test_cipher.rs:118:23:118:55 | ...::new_from_slice(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:118:23:118:55 | ...::new_from_slice(...) | The cryptographic algorithm RC5 |
diff --git a/rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm.qlref b/rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm/BrokenCryptoAlgorithm.qlref
similarity index 100%
rename from rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm.qlref
rename to rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm/BrokenCryptoAlgorithm.qlref
diff --git a/rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm/CONSISTENCY/PathResolutionConsistency.expected b/rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm/CONSISTENCY/PathResolutionConsistency.expected
new file mode 100644
index 00000000000..b9925a323cc
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm/CONSISTENCY/PathResolutionConsistency.expected
@@ -0,0 +1,2 @@
+multipleCallTargets
+| test_cipher.rs:114:23:114:50 | ...::new(...) |
diff --git a/rust/ql/test/query-tests/security/CWE-327/Cargo.lock b/rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm/Cargo.lock
similarity index 100%
rename from rust/ql/test/query-tests/security/CWE-327/Cargo.lock
rename to rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm/Cargo.lock
diff --git a/rust/ql/test/query-tests/security/CWE-327/options.yml b/rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm/options.yml
similarity index 100%
rename from rust/ql/test/query-tests/security/CWE-327/options.yml
rename to rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm/options.yml
diff --git a/rust/ql/test/query-tests/security/CWE-327/test_cipher.rs b/rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm/test_cipher.rs
similarity index 92%
rename from rust/ql/test/query-tests/security/CWE-327/test_cipher.rs
rename to rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm/test_cipher.rs
index 0cf20c4c278..61471ac99ec 100644
--- a/rust/ql/test/query-tests/security/CWE-327/test_cipher.rs
+++ b/rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm/test_cipher.rs
@@ -42,7 +42,7 @@ fn test_stream_cipher(
 
 fn test_block_cipher(
     key: &[u8], key128: &[u8;16], key192: &[u8;24], key256: &[u8;32],
-    data: &mut [u8], input: &[u8], block128: &mut [u8;16]
+    data: &mut [u8], input: &[u8], block128: &mut [u8;16], des_key : &cipher::Key<Des>
 ) {
     // aes
     let aes_cipher1 = Aes128::new(key128.into());
@@ -56,6 +56,10 @@ fn test_block_cipher(
     aes_cipher3.decrypt_block(block128.into());
 
     // des (broken)
+    let des_cipher0 : Des = Des::new(des_key); // $ Alert[rust/weak-cryptographic-algorithm]
+    des_cipher0.encrypt_block(data.into());
+    des_cipher0.decrypt_block(data.into());
+
     let des_cipher1 = Des::new(key.into()); // $ Alert[rust/weak-cryptographic-algorithm]
     des_cipher1.encrypt_block(data.into());
     des_cipher1.decrypt_block(data.into());
@@ -129,15 +133,15 @@ fn test_cbc(
     _ = aes_cipher1.encrypt_padded_mut::<aes::cipher::block_padding::Pkcs7>(data, data_len).unwrap();
 
     // des (broken)
-    let des_cipher1 = cbc::Encryptor::<des::Des>::new(key.into(), iv.into()); // $ Alert[rust/weak-cryptographic-algorithm]
+    let des_cipher1 = cbc::Encryptor::<des::Des>::new(key.into(), iv.into()); // $ MISSING: Alert[rust/weak-cryptographic-algorithm]
     _ = des_cipher1.encrypt_padded_mut::<des::cipher::block_padding::Pkcs7>(data, data_len).unwrap();
 
     let des_cipher2 = MyDesEncryptor::new(key.into(), iv.into()); // $ MISSING: Alert[rust/weak-cryptographic-algorithm]
     _ = des_cipher2.encrypt_padded_mut::<des::cipher::block_padding::Pkcs7>(data, data_len).unwrap();
 
-    let des_cipher3 = cbc::Encryptor::<des::Des>::new_from_slices(&key, &iv).unwrap(); // $ Alert[rust/weak-cryptographic-algorithm]
+    let des_cipher3 = cbc::Encryptor::<des::Des>::new_from_slices(&key, &iv).unwrap(); // $ MISSING: Alert[rust/weak-cryptographic-algorithm]
     _ = des_cipher3.encrypt_padded_mut::<des::cipher::block_padding::Pkcs7>(data, data_len).unwrap();
 
-    let des_cipher4 = cbc::Encryptor::<des::Des>::new(key.into(), iv.into()); // $ Alert[rust/weak-cryptographic-algorithm]
+    let des_cipher4 = cbc::Encryptor::<des::Des>::new(key.into(), iv.into()); // $ MISSING: Alert[rust/weak-cryptographic-algorithm]
     _ = des_cipher4.encrypt_padded_b2b_mut::<des::cipher::block_padding::Pkcs7>(input, data).unwrap();
 }
diff --git a/rust/ql/test/query-tests/security/CWE-327/CONSISTENCY/PathResolutionConsistency.expected b/rust/ql/test/query-tests/security/CWE-327/CONSISTENCY/PathResolutionConsistency.expected
deleted file mode 100644
index 3d73ede26c5..00000000000
--- a/rust/ql/test/query-tests/security/CWE-327/CONSISTENCY/PathResolutionConsistency.expected
+++ /dev/null
@@ -1,7 +0,0 @@
-multipleCallTargets
-| test_cipher.rs:20:27:20:48 | ...::new(...) |
-| test_cipher.rs:26:27:26:48 | ...::new(...) |
-| test_cipher.rs:29:27:29:48 | ...::new(...) |
-| test_cipher.rs:36:30:36:59 | ...::new(...) |
-| test_cipher.rs:39:30:39:63 | ...::new(...) |
-| test_cipher.rs:110:23:110:50 | ...::new(...) |
diff --git a/rust/ql/test/query-tests/security/CWE-328/Cargo.lock b/rust/ql/test/query-tests/security/CWE-327/WeakSensitiveDataHashing/Cargo.lock
similarity index 100%
rename from rust/ql/test/query-tests/security/CWE-328/Cargo.lock
rename to rust/ql/test/query-tests/security/CWE-327/WeakSensitiveDataHashing/Cargo.lock
diff --git a/rust/ql/test/query-tests/security/CWE-328/WeakSensitiveDataHashing.expected b/rust/ql/test/query-tests/security/CWE-327/WeakSensitiveDataHashing/WeakSensitiveDataHashing.expected
similarity index 100%
rename from rust/ql/test/query-tests/security/CWE-328/WeakSensitiveDataHashing.expected
rename to rust/ql/test/query-tests/security/CWE-327/WeakSensitiveDataHashing/WeakSensitiveDataHashing.expected
diff --git a/rust/ql/test/query-tests/security/CWE-328/WeakSensitiveDataHashing.qlref b/rust/ql/test/query-tests/security/CWE-327/WeakSensitiveDataHashing/WeakSensitiveDataHashing.qlref
similarity index 60%
rename from rust/ql/test/query-tests/security/CWE-328/WeakSensitiveDataHashing.qlref
rename to rust/ql/test/query-tests/security/CWE-327/WeakSensitiveDataHashing/WeakSensitiveDataHashing.qlref
index fad3080280b..bdfc62800df 100644
--- a/rust/ql/test/query-tests/security/CWE-328/WeakSensitiveDataHashing.qlref
+++ b/rust/ql/test/query-tests/security/CWE-327/WeakSensitiveDataHashing/WeakSensitiveDataHashing.qlref
@@ -1,4 +1,4 @@
-query: queries/security/CWE-328/WeakSensitiveDataHashing.ql
+query: queries/security/CWE-327/WeakSensitiveDataHashing.ql
 postprocess:
  - utils/test/PrettyPrintModels.ql
  - utils/test/InlineExpectationsTestQuery.ql
diff --git a/rust/ql/test/query-tests/security/CWE-328/options.yml b/rust/ql/test/query-tests/security/CWE-327/WeakSensitiveDataHashing/options.yml
similarity index 100%
rename from rust/ql/test/query-tests/security/CWE-328/options.yml
rename to rust/ql/test/query-tests/security/CWE-327/WeakSensitiveDataHashing/options.yml
diff --git a/rust/ql/test/query-tests/security/CWE-328/test.rs b/rust/ql/test/query-tests/security/CWE-327/WeakSensitiveDataHashing/test.rs
similarity index 100%
rename from rust/ql/test/query-tests/security/CWE-328/test.rs
rename to rust/ql/test/query-tests/security/CWE-327/WeakSensitiveDataHashing/test.rs
diff --git a/rust/ql/test/library-tests/dataflow/sources/Cargo.lock b/rust/ql/test/query-tests/security/CWE-614/Cargo.lock
similarity index 63%
rename from rust/ql/test/library-tests/dataflow/sources/Cargo.lock
rename to rust/ql/test/query-tests/security/CWE-614/Cargo.lock
index 5bdbe2c0ebb..50a5b405215 100644
--- a/rust/ql/test/library-tests/dataflow/sources/Cargo.lock
+++ b/rust/ql/test/query-tests/security/CWE-614/Cargo.lock
@@ -21,15 +21,15 @@ dependencies = [
 
 [[package]]
 name = "actix-http"
-version = "3.11.0"
+version = "3.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44dfe5c9e0004c623edc65391dfd51daa201e7e30ebd9c9bedf873048ec32bc2"
+checksum = "7926860314cbe2fb5d1f13731e387ab43bd32bca224e82e6e2db85de0a3dba49"
 dependencies = [
  "actix-codec",
  "actix-rt",
  "actix-service",
  "actix-utils",
- "base64",
+ "base64 0.22.1",
  "bitflags",
  "brotli",
  "bytes",
@@ -39,7 +39,7 @@ dependencies = [
  "flate2",
  "foldhash",
  "futures-core",
- "h2 0.3.26",
+ "h2 0.3.27",
  "http 0.2.12",
  "httparse",
  "httpdate",
@@ -49,8 +49,8 @@ dependencies = [
  "mime",
  "percent-encoding",
  "pin-project-lite",
- "rand",
- "sha1",
+ "rand 0.9.2",
+ "sha1 0.10.6",
  "smallvec",
  "tokio",
  "tokio-util",
@@ -65,7 +65,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb"
 dependencies = [
  "quote",
- "syn",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -85,9 +85,9 @@ dependencies = [
 
 [[package]]
 name = "actix-rt"
-version = "2.10.0"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24eda4e2a6e042aa4e55ac438a2ae052d3b5da0ecf83d7411e1a368946925208"
+checksum = "92589714878ca59a7626ea19734f0e07a6a875197eec751bb5d3f99e64998c63"
 dependencies = [
  "futures-core",
  "tokio",
@@ -105,7 +105,7 @@ dependencies = [
  "futures-core",
  "futures-util",
  "mio",
- "socket2",
+ "socket2 0.5.10",
  "tokio",
  "tracing",
 ]
@@ -148,7 +148,7 @@ dependencies = [
  "bytes",
  "bytestring",
  "cfg-if",
- "cookie",
+ "cookie 0.16.2",
  "derive_more",
  "encoding_rs",
  "foldhash",
@@ -167,8 +167,8 @@ dependencies = [
  "serde_json",
  "serde_urlencoded",
  "smallvec",
- "socket2",
- "time",
+ "socket2 0.5.10",
+ "time 0.3.44",
  "tracing",
  "url",
 ]
@@ -182,16 +182,7 @@ dependencies = [
  "actix-router",
  "proc-macro2",
  "quote",
- "syn",
-]
-
-[[package]]
-name = "addr2line"
-version = "0.24.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
-dependencies = [
- "gimli",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -201,10 +192,114 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
 
 [[package]]
-name = "aho-corasick"
-version = "1.1.3"
+name = "aead"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "aead"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0"
+dependencies = [
+ "crypto-common",
+ "generic-array",
+]
+
+[[package]]
+name = "aes"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "884391ef1066acaa41e766ba8f596341b96e93ce34f9a43e7d24bf0a0eaf0561"
+dependencies = [
+ "aes-soft",
+ "aesni",
+ "cipher 0.2.5",
+]
+
+[[package]]
+name = "aes"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
+dependencies = [
+ "cfg-if",
+ "cipher 0.4.4",
+ "cpufeatures",
+]
+
+[[package]]
+name = "aes-gcm"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5278b5fabbb9bd46e24aa69b2fdea62c99088e0a950a9be40e3e0101298f88da"
+dependencies = [
+ "aead 0.3.2",
+ "aes 0.6.0",
+ "cipher 0.2.5",
+ "ctr 0.6.0",
+ "ghash 0.3.1",
+ "subtle",
+]
+
+[[package]]
+name = "aes-gcm"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1"
+dependencies = [
+ "aead 0.5.2",
+ "aes 0.8.4",
+ "cipher 0.4.4",
+ "ctr 0.9.2",
+ "ghash 0.5.1",
+ "subtle",
+]
+
+[[package]]
+name = "aes-gcm-siv"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae0784134ba9375416d469ec31e7c5f9fa94405049cf08c5ce5b4698be673e0d"
+dependencies = [
+ "aead 0.5.2",
+ "aes 0.8.4",
+ "cipher 0.4.4",
+ "ctr 0.9.2",
+ "polyval 0.6.2",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "aes-soft"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be14c7498ea50828a38d0e24a765ed2effe92a705885b57d029cd67d45744072"
+dependencies = [
+ "cipher 0.2.5",
+ "opaque-debug",
+]
+
+[[package]]
+name = "aesni"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea2e11f5e94c2f7d386164cc2aa1f97823fed6f259e486940a71c174dd01b0ce"
+dependencies = [
+ "cipher 0.2.5",
+ "opaque-debug",
+]
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301"
 dependencies = [
  "memchr",
 ]
@@ -224,6 +319,21 @@ dependencies = [
  "alloc-no-stdlib",
 ]
 
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61"
+
 [[package]]
 name = "async-channel"
 version = "1.9.0"
@@ -237,9 +347,9 @@ dependencies = [
 
 [[package]]
 name = "async-channel"
-version = "2.3.1"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a"
+checksum = "924ed96dd52d1b75e9c1a3e6275715fd320f5f9439fb5a4a11fa51f4221158d2"
 dependencies = [
  "concurrent-queue",
  "event-listener-strategy",
@@ -249,14 +359,14 @@ dependencies = [
 
 [[package]]
 name = "async-executor"
-version = "1.13.2"
+version = "1.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb812ffb58524bdd10860d7d974e2f01cc0950c2438a74ee5ec2e2280c6c4ffa"
+checksum = "497c00e0fd83a72a79a39fcbd8e3e2f055d6f6c7e025f3b3d91f4f8e76527fb8"
 dependencies = [
  "async-task",
  "concurrent-queue",
- "fastrand",
- "futures-lite",
+ "fastrand 2.3.0",
+ "futures-lite 2.6.1",
  "pin-project-lite",
  "slab",
 ]
@@ -267,50 +377,49 @@ version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c"
 dependencies = [
- "async-channel 2.3.1",
+ "async-channel 2.5.0",
  "async-executor",
  "async-io",
  "async-lock",
  "blocking",
- "futures-lite",
+ "futures-lite 2.6.1",
  "once_cell",
 ]
 
 [[package]]
 name = "async-io"
-version = "2.4.1"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1237c0ae75a0f3765f58910ff9cdd0a12eeb39ab2f4c7de23262f337f0aacbb3"
+checksum = "456b8a8feb6f42d237746d4b3e9a178494627745c3c56c6ea55d92ba50d026fc"
 dependencies = [
- "async-lock",
+ "autocfg",
  "cfg-if",
  "concurrent-queue",
  "futures-io",
- "futures-lite",
+ "futures-lite 2.6.1",
  "parking",
  "polling",
- "rustix 1.0.7",
+ "rustix",
  "slab",
- "tracing",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "async-lock"
-version = "3.4.0"
+version = "3.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
+checksum = "5fd03604047cee9b6ce9de9f70c6cd540a0520c813cbd49bae61f33ab80ed1dc"
 dependencies = [
- "event-listener 5.4.0",
+ "event-listener 5.4.1",
  "event-listener-strategy",
  "pin-project-lite",
 ]
 
 [[package]]
 name = "async-std"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "730294c1c08c2e0f85759590518f6333f0d5a0a766a27d519c1b244c3dfd8a24"
+checksum = "2c8e079a4ab67ae52b7403632e4618815d6db36d2a010cfe41b02c1b1578f93b"
 dependencies = [
  "async-channel 1.9.0",
  "async-global-executor",
@@ -320,7 +429,7 @@ dependencies = [
  "futures-channel",
  "futures-core",
  "futures-io",
- "futures-lite",
+ "futures-lite 2.6.1",
  "gloo-timers",
  "kv-log-macro",
  "log",
@@ -346,101 +455,21 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "autocfg"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
 [[package]]
-name = "aws-lc-rs"
-version = "1.13.1"
+name = "base-x"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93fcc8f365936c834db5514fc45aee5b1202d677e6b40e48468aaaa8183ca8c7"
-dependencies = [
- "aws-lc-sys",
- "zeroize",
-]
+checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270"
 
 [[package]]
-name = "aws-lc-sys"
-version = "0.29.0"
+name = "base64"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61b1d86e7705efe1be1b569bab41d4fa1e14e220b60a160f78de2db687add079"
-dependencies = [
- "bindgen",
- "cc",
- "cmake",
- "dunce",
- "fs_extra",
-]
-
-[[package]]
-name = "axum"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "021e862c184ae977658b36c4500f7feac3221ca5da43e3f25bd04ab6c79a29b5"
-dependencies = [
- "axum-core",
- "bytes",
- "form_urlencoded",
- "futures-util",
- "http 1.3.1",
- "http-body",
- "http-body-util",
- "hyper",
- "hyper-util",
- "itoa",
- "matchit",
- "memchr",
- "mime",
- "percent-encoding",
- "pin-project-lite",
- "rustversion",
- "serde",
- "serde_json",
- "serde_path_to_error",
- "serde_urlencoded",
- "sync_wrapper",
- "tokio",
- "tower",
- "tower-layer",
- "tower-service",
- "tracing",
-]
-
-[[package]]
-name = "axum-core"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68464cd0412f486726fb3373129ef5d2993f90c34bc2bc1c1e9943b2f4fc7ca6"
-dependencies = [
- "bytes",
- "futures-core",
- "http 1.3.1",
- "http-body",
- "http-body-util",
- "mime",
- "pin-project-lite",
- "rustversion",
- "sync_wrapper",
- "tower-layer",
- "tower-service",
- "tracing",
-]
-
-[[package]]
-name = "backtrace"
-version = "0.3.75"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002"
-dependencies = [
- "addr2line",
- "cfg-if",
- "libc",
- "miniz_oxide",
- "object",
- "rustc-demangle",
- "windows-targets 0.52.6",
-]
+checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
 [[package]]
 name = "base64"
@@ -449,33 +478,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
-name = "bindgen"
-version = "0.69.5"
+name = "biscotti"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088"
+checksum = "ddb6f28a3d15d18cace7a8010282a4d9cee1452dcd33f5861c173b4a31095b79"
 dependencies = [
- "bitflags",
- "cexpr",
- "clang-sys",
- "itertools",
- "lazy_static",
- "lazycell",
- "log",
- "prettyplease",
- "proc-macro2",
- "quote",
- "regex",
- "rustc-hash",
- "shlex",
- "syn",
- "which",
+ "aes-gcm-siv",
+ "anyhow",
+ "base64 0.22.1",
+ "hkdf 0.12.4",
+ "hmac 0.12.1",
+ "jiff",
+ "percent-encoding",
+ "rand 0.9.2",
+ "serde",
+ "sha2 0.10.9",
+ "subtle",
 ]
 
 [[package]]
 name = "bitflags"
-version = "2.9.1"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
+checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
+
+[[package]]
+name = "block-buffer"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
+dependencies = [
+ "generic-array",
+]
 
 [[package]]
 name = "block-buffer"
@@ -488,22 +522,22 @@ dependencies = [
 
 [[package]]
 name = "blocking"
-version = "1.6.1"
+version = "1.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea"
+checksum = "e83f8d02be6967315521be875afa792a316e28d57b5a2d401897e2a7921b7f21"
 dependencies = [
- "async-channel 2.3.1",
+ "async-channel 2.5.0",
  "async-task",
  "futures-io",
- "futures-lite",
+ "futures-lite 2.6.1",
  "piper",
 ]
 
 [[package]]
 name = "brotli"
-version = "8.0.1"
+version = "8.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9991eea70ea4f293524138648e41ee89b0b2b12ddef3b255effa43c8056e0e0d"
+checksum = "4bd8b9603c7aa97359dbd97ecf258968c95f3adddd6db2f7e7a5bef101c84560"
 dependencies = [
  "alloc-no-stdlib",
  "alloc-stdlib",
@@ -522,9 +556,9 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.18.1"
+version = "3.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793db76d6187cd04dff33004d8e6c9cc4e05cd330500379d2394209271b4aeee"
+checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
 
 [[package]]
 name = "bytes"
@@ -534,38 +568,30 @@ checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
 
 [[package]]
 name = "bytestring"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e465647ae23b2823b0753f50decb2d5a86d2bb2cac04788fafd1f80e45378e5f"
+checksum = "113b4343b5f6617e7ad401ced8de3cc8b012e73a594347c307b90db3e9271289"
 dependencies = [
  "bytes",
 ]
 
 [[package]]
 name = "cc"
-version = "1.2.27"
+version = "1.2.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d487aa071b5f64da6f19a3e848e3578944b726ee5a4854b82172f02aa876bfdc"
+checksum = "37521ac7aabe3d13122dc382493e20c9416f299d2ccd5b3a5340a2570cdeb0f3"
 dependencies = [
+ "find-msvc-tools",
  "jobserver",
  "libc",
  "shlex",
 ]
 
-[[package]]
-name = "cexpr"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
-dependencies = [
- "nom",
-]
-
 [[package]]
 name = "cfg-if"
-version = "1.0.1"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 
 [[package]]
 name = "cfg_aliases"
@@ -574,23 +600,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
 [[package]]
-name = "clang-sys"
-version = "1.8.1"
+name = "chrono"
+version = "0.4.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
+checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2"
 dependencies = [
- "glob",
- "libc",
- "libloading",
+ "iana-time-zone",
+ "num-traits",
+ "windows-link",
 ]
 
 [[package]]
-name = "cmake"
-version = "0.1.54"
+name = "cipher"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7caa3f9de89ddbe2c607f4101924c5abec803763ae9534e4f4d7d8f84aa81f0"
+checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801"
 dependencies = [
- "cc",
+ "generic-array",
+]
+
+[[package]]
+name = "cipher"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
+dependencies = [
+ "crypto-common",
+ "inout",
 ]
 
 [[package]]
@@ -602,6 +638,29 @@ dependencies = [
  "crossbeam-utils",
 ]
 
+[[package]]
+name = "const_fn"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f8a2ca5ac02d09563609681103aada9e1777d54fc57a5acd7a41404f9c93b6e"
+
+[[package]]
+name = "cookie"
+version = "0.14.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03a5d7b21829bc7b4bf4754a978a241ae54ea55a40f92bb20216e54096f4b951"
+dependencies = [
+ "aes-gcm 0.8.0",
+ "base64 0.13.1",
+ "hkdf 0.10.0",
+ "hmac 0.10.1",
+ "percent-encoding",
+ "rand 0.8.5",
+ "sha2 0.9.9",
+ "time 0.2.27",
+ "version_check",
+]
+
 [[package]]
 name = "cookie"
 version = "0.16.2"
@@ -609,18 +668,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb"
 dependencies = [
  "percent-encoding",
- "time",
+ "time 0.3.44",
  "version_check",
 ]
 
 [[package]]
-name = "core-foundation"
-version = "0.9.4"
+name = "cookie"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
+checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747"
 dependencies = [
- "core-foundation-sys",
- "libc",
+ "aes-gcm 0.10.3",
+ "base64 0.22.1",
+ "hkdf 0.12.4",
+ "hmac 0.12.1",
+ "percent-encoding",
+ "rand 0.8.5",
+ "sha2 0.10.9",
+ "subtle",
+ "time 0.3.44",
+ "version_check",
 ]
 
 [[package]]
@@ -639,10 +706,16 @@ dependencies = [
 ]
 
 [[package]]
-name = "crc32fast"
-version = "1.4.2"
+name = "cpuid-bool"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
+checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba"
+
+[[package]]
+name = "crc32fast"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511"
 dependencies = [
  "cfg-if",
 ]
@@ -660,14 +733,43 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
 dependencies = [
  "generic-array",
+ "rand_core 0.6.4",
  "typenum",
 ]
 
 [[package]]
-name = "deranged"
-version = "0.4.0"
+name = "crypto-mac"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
+checksum = "4857fd85a0c34b3c3297875b747c1e02e06b6a0ea32dd892d8192b9ce0813ea6"
+dependencies = [
+ "generic-array",
+ "subtle",
+]
+
+[[package]]
+name = "ctr"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb4a30d54f7443bf3d6191dcd486aca19e67cb3c49fa7a06a319966346707e7f"
+dependencies = [
+ "cipher 0.2.5",
+]
+
+[[package]]
+name = "ctr"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835"
+dependencies = [
+ "cipher 0.4.4",
+]
+
+[[package]]
+name = "deranged"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587"
 dependencies = [
  "powerfmt",
 ]
@@ -689,20 +791,36 @@ checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.108",
  "unicode-xid",
 ]
 
+[[package]]
+name = "digest"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
+dependencies = [
+ "generic-array",
+]
+
 [[package]]
 name = "digest"
 version = "0.10.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
- "block-buffer",
+ "block-buffer 0.10.4",
  "crypto-common",
+ "subtle",
 ]
 
+[[package]]
+name = "discard"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0"
+
 [[package]]
 name = "displaydoc"
 version = "0.2.5"
@@ -711,21 +829,9 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.108",
 ]
 
-[[package]]
-name = "dunce"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
-
-[[package]]
-name = "either"
-version = "1.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
-
 [[package]]
 name = "encoding_rs"
 version = "0.8.35"
@@ -743,12 +849,12 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
 [[package]]
 name = "errno"
-version = "0.3.12"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18"
+checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -759,9 +865,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
 
 [[package]]
 name = "event-listener"
-version = "5.4.0"
+version = "5.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3492acde4c3fc54c845eaab3eed8bd00c7a7d881f78bfc801e43a93dec1331ae"
+checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab"
 dependencies = [
  "concurrent-queue",
  "parking",
@@ -774,10 +880,19 @@ version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93"
 dependencies = [
- "event-listener 5.4.0",
+ "event-listener 5.4.1",
  "pin-project-lite",
 ]
 
+[[package]]
+name = "fastrand"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
+dependencies = [
+ "instant",
+]
+
 [[package]]
 name = "fastrand"
 version = "2.3.0"
@@ -785,10 +900,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
 
 [[package]]
-name = "flate2"
-version = "1.1.2"
+name = "find-msvc-tools"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d"
+checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127"
+
+[[package]]
+name = "flate2"
+version = "1.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -806,51 +927,15 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
 
-[[package]]
-name = "foreign-types"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
-dependencies = [
- "foreign-types-shared",
-]
-
-[[package]]
-name = "foreign-types-shared"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-
 [[package]]
 name = "form_urlencoded"
-version = "1.2.1"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
+checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf"
 dependencies = [
  "percent-encoding",
 ]
 
-[[package]]
-name = "fs_extra"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
-
-[[package]]
-name = "futures"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
-]
-
 [[package]]
 name = "futures-channel"
 version = "0.3.31"
@@ -858,7 +943,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
 dependencies = [
  "futures-core",
- "futures-sink",
 ]
 
 [[package]]
@@ -867,17 +951,6 @@ version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
-[[package]]
-name = "futures-executor"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
-dependencies = [
- "futures-core",
- "futures-task",
- "futures-util",
-]
-
 [[package]]
 name = "futures-io"
 version = "0.3.31"
@@ -886,11 +959,26 @@ checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
 [[package]]
 name = "futures-lite"
-version = "2.6.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5edaec856126859abb19ed65f39e90fea3a9574b9707f13539acf4abf7eb532"
+checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce"
 dependencies = [
- "fastrand",
+ "fastrand 1.9.0",
+ "futures-core",
+ "futures-io",
+ "memchr",
+ "parking",
+ "pin-project-lite",
+ "waker-fn",
+]
+
+[[package]]
+name = "futures-lite"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f78e10609fe0e0b3f4157ffab1876319b5b0db102a2c60dc4626306dc46b44ad"
+dependencies = [
+ "fastrand 2.3.0",
  "futures-core",
  "futures-io",
  "parking",
@@ -905,18 +993,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
-]
-
-[[package]]
-name = "futures-rustls"
-version = "0.26.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f2f12607f92c69b12ed746fabf9ca4f5c482cba46679c1a75b874ed7c26adb"
-dependencies = [
- "futures-io",
- "rustls",
- "rustls-pki-types",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -937,13 +1014,10 @@ version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
- "futures-channel",
  "futures-core",
- "futures-io",
  "futures-macro",
  "futures-sink",
  "futures-task",
- "memchr",
  "pin-project-lite",
  "pin-utils",
  "slab",
@@ -951,14 +1025,25 @@ dependencies = [
 
 [[package]]
 name = "generic-array"
-version = "0.14.7"
+version = "0.14.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+checksum = "4bb6743198531e02858aeaea5398fcc883e71851fcbcb5a2f773e2fb6cb1edf2"
 dependencies = [
  "typenum",
  "version_check",
 ]
 
+[[package]]
+name = "getrandom"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.9.0+wasi-snapshot-preview1",
+]
+
 [[package]]
 name = "getrandom"
 version = "0.2.16"
@@ -972,27 +1057,35 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.3.3"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
+checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
 dependencies = [
  "cfg-if",
  "libc",
  "r-efi",
- "wasi 0.14.2+wasi-0.2.4",
+ "wasip2",
 ]
 
 [[package]]
-name = "gimli"
-version = "0.31.1"
+name = "ghash"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
+checksum = "97304e4cd182c3846f7575ced3890c53012ce534ad9114046b0a9e00bb30a375"
+dependencies = [
+ "opaque-debug",
+ "polyval 0.4.5",
+]
 
 [[package]]
-name = "glob"
-version = "0.3.2"
+name = "ghash"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
+checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1"
+dependencies = [
+ "opaque-debug",
+ "polyval 0.6.2",
+]
 
 [[package]]
 name = "gloo-timers"
@@ -1008,9 +1101,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.3.26"
+version = "0.3.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
+checksum = "0beca50380b1fc32983fc1cb4587bfa4bb9e78fc259aad4a0032d2080309222d"
 dependencies = [
  "bytes",
  "fnv",
@@ -1027,9 +1120,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.4.10"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9421a676d1b147b16b82c9225157dc629087ef8ec4d5e2960f9437a90dac0a5"
+checksum = "f3c0b69cfcb4e1b9f1bf2f53f95f766e4661169728ec61cd3fe5a0166f2d1386"
 dependencies = [
  "atomic-waker",
  "bytes",
@@ -1046,9 +1139,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.15.4"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5"
+checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d"
 
 [[package]]
 name = "headers"
@@ -1056,13 +1149,13 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b3314d5adb5d94bcdf56771f2e50dbbc80bb4bdf88967526706205ac9eff24eb"
 dependencies = [
- "base64",
+ "base64 0.22.1",
  "bytes",
  "headers-core",
  "http 1.3.1",
  "httpdate",
  "mime",
- "sha1",
+ "sha1 0.10.6",
 ]
 
 [[package]]
@@ -1081,12 +1174,41 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c"
 
 [[package]]
-name = "home"
-version = "0.5.11"
+name = "hkdf"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf"
+checksum = "51ab2f639c231793c5f6114bdb9bbe50a7dbbfcd7c7c6bd8475dec2d991e964f"
 dependencies = [
- "windows-sys 0.59.0",
+ "digest 0.9.0",
+ "hmac 0.10.1",
+]
+
+[[package]]
+name = "hkdf"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7"
+dependencies = [
+ "hmac 0.12.1",
+]
+
+[[package]]
+name = "hmac"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15"
+dependencies = [
+ "crypto-mac",
+ "digest 0.9.0",
+]
+
+[[package]]
+name = "hmac"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
+dependencies = [
+ "digest 0.10.7",
 ]
 
 [[package]]
@@ -1134,6 +1256,28 @@ dependencies = [
  "pin-project-lite",
 ]
 
+[[package]]
+name = "http-types"
+version = "2.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e9b187a72d63adbfba487f48095306ac823049cb504ee195541e91c7775f5ad"
+dependencies = [
+ "anyhow",
+ "async-channel 1.9.0",
+ "async-std",
+ "base64 0.13.1",
+ "cookie 0.14.4",
+ "futures-lite 1.13.0",
+ "infer",
+ "pin-project-lite",
+ "rand 0.7.3",
+ "serde",
+ "serde_json",
+ "serde_qs",
+ "serde_urlencoded",
+ "url",
+]
+
 [[package]]
 name = "httparse"
 version = "1.10.1"
@@ -1148,88 +1292,70 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
 [[package]]
 name = "hyper"
-version = "1.6.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80"
+checksum = "eb3aa54a13a0dfe7fbe3a59e0c76093041720fdc77b110cc0fc260fafb4dc51e"
 dependencies = [
+ "atomic-waker",
  "bytes",
  "futures-channel",
- "futures-util",
- "h2 0.4.10",
+ "futures-core",
+ "h2 0.4.12",
  "http 1.3.1",
  "http-body",
  "httparse",
  "httpdate",
  "itoa",
  "pin-project-lite",
+ "pin-utils",
  "smallvec",
  "tokio",
- "want",
-]
-
-[[package]]
-name = "hyper-rustls"
-version = "0.27.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58"
-dependencies = [
- "http 1.3.1",
- "hyper",
- "hyper-util",
- "rustls",
- "rustls-pki-types",
- "tokio",
- "tokio-rustls",
- "tower-service",
-]
-
-[[package]]
-name = "hyper-tls"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
-dependencies = [
- "bytes",
- "http-body-util",
- "hyper",
- "hyper-util",
- "native-tls",
- "tokio",
- "tokio-native-tls",
- "tower-service",
 ]
 
 [[package]]
 name = "hyper-util"
-version = "0.1.14"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc2fdfdbff08affe55bb779f33b053aa1fe5dd5b54c257343c17edfa55711bdb"
+checksum = "3c6995591a8f1380fcb4ba966a252a4b29188d51d2b89e3a252f5305be65aea8"
 dependencies = [
- "base64",
  "bytes",
- "futures-channel",
  "futures-core",
- "futures-util",
  "http 1.3.1",
  "http-body",
  "hyper",
- "ipnet",
- "libc",
- "percent-encoding",
  "pin-project-lite",
- "socket2",
- "system-configuration",
  "tokio",
- "tower-service",
- "tracing",
- "windows-registry",
+]
+
+[[package]]
+name = "iana-time-zone"
+version = "0.1.64"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "log",
+ "wasm-bindgen",
+ "windows-core",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
 ]
 
 [[package]]
 name = "icu_collections"
-version = "2.0.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47"
+checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43"
 dependencies = [
  "displaydoc",
  "potential_utf",
@@ -1240,9 +1366,9 @@ dependencies = [
 
 [[package]]
 name = "icu_locale_core"
-version = "2.0.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a"
+checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6"
 dependencies = [
  "displaydoc",
  "litemap",
@@ -1253,11 +1379,10 @@ dependencies = [
 
 [[package]]
 name = "icu_normalizer"
-version = "2.0.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979"
+checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599"
 dependencies = [
- "displaydoc",
  "icu_collections",
  "icu_normalizer_data",
  "icu_properties",
@@ -1268,42 +1393,38 @@ dependencies = [
 
 [[package]]
 name = "icu_normalizer_data"
-version = "2.0.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3"
+checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a"
 
 [[package]]
 name = "icu_properties"
-version = "2.0.1"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b"
+checksum = "e93fcd3157766c0c8da2f8cff6ce651a31f0810eaa1c51ec363ef790bbb5fb99"
 dependencies = [
- "displaydoc",
  "icu_collections",
  "icu_locale_core",
  "icu_properties_data",
  "icu_provider",
- "potential_utf",
  "zerotrie",
  "zerovec",
 ]
 
 [[package]]
 name = "icu_properties_data"
-version = "2.0.1"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632"
+checksum = "02845b3647bb045f1100ecd6480ff52f34c35f82d9880e029d329c21d1054899"
 
 [[package]]
 name = "icu_provider"
-version = "2.0.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af"
+checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614"
 dependencies = [
  "displaydoc",
  "icu_locale_core",
- "stable_deref_trait",
- "tinystr",
  "writeable",
  "yoke",
  "zerofrom",
@@ -1313,9 +1434,9 @@ dependencies = [
 
 [[package]]
 name = "idna"
-version = "1.0.3"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de"
 dependencies = [
  "idna_adapter",
  "smallvec",
@@ -1340,37 +1461,36 @@ checksum = "e8a5a9a0ff0086c7a148acb942baaabeadf9504d10400b5a05645853729b9cd2"
 
 [[package]]
 name = "indexmap"
-version = "2.9.0"
+version = "2.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
+checksum = "6717a8d2a5a929a1a2eb43a12812498ed141a0bcfb7e8f7844fbdbe4303bba9f"
 dependencies = [
  "equivalent",
  "hashbrown",
 ]
 
 [[package]]
-name = "ipnet"
-version = "2.11.0"
+name = "infer"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
+checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac"
 
 [[package]]
-name = "iri-string"
-version = "0.7.8"
+name = "inout"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbc5ebe9c3a1a7a5127f920a418f7585e9e758e911d0466ed004f393b0e380b2"
+checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01"
 dependencies = [
- "memchr",
- "serde",
+ "generic-array",
 ]
 
 [[package]]
-name = "itertools"
-version = "0.12.1"
+name = "instant"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
 dependencies = [
- "either",
+ "cfg-if",
 ]
 
 [[package]]
@@ -1380,20 +1500,61 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
-name = "jobserver"
-version = "0.1.33"
+name = "jiff"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a"
+checksum = "be1f93b8b1eb69c77f24bbb0afdf66f54b632ee39af40ca21c4365a1d7347e49"
 dependencies = [
- "getrandom 0.3.3",
+ "jiff-static",
+ "jiff-tzdb-platform",
+ "log",
+ "portable-atomic",
+ "portable-atomic-util",
+ "serde",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "jiff-static"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03343451ff899767262ec32146f6d559dd759fdadf42ff0e227c7c48f72594b4"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "jiff-tzdb"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1283705eb0a21404d2bfd6eef2a7593d240bc42a0bdb39db0ad6fa2ec026524"
+
+[[package]]
+name = "jiff-tzdb-platform"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "875a5a69ac2bab1a891711cf5eccbec1ce0341ea805560dcd90b7a2e925132e8"
+dependencies = [
+ "jiff-tzdb",
+]
+
+[[package]]
+name = "jobserver"
+version = "0.1.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"
+dependencies = [
+ "getrandom 0.3.4",
  "libc",
 ]
 
 [[package]]
 name = "js-sys"
-version = "0.3.77"
+version = "0.3.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
+checksum = "b011eec8cc36da2aab2d5cff675ec18454fad408585853910a202391cf9f8e65"
 dependencies = [
  "once_cell",
  "wasm-bindgen",
@@ -1414,51 +1575,23 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388"
 
-[[package]]
-name = "lazy_static"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
-
-[[package]]
-name = "lazycell"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
-
 [[package]]
 name = "libc"
-version = "0.2.173"
+version = "0.2.177"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8cfeafaffdbc32176b64fb251369d52ea9f0a8fbc6f8759edffef7b525d64bb"
-
-[[package]]
-name = "libloading"
-version = "0.8.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667"
-dependencies = [
- "cfg-if",
- "windows-targets 0.53.2",
-]
+checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.15"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
-
-[[package]]
-name = "linux-raw-sys"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
+checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039"
 
 [[package]]
 name = "litemap"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
+checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77"
 
 [[package]]
 name = "local-channel"
@@ -1479,34 +1612,27 @@ checksum = "4d873d7c67ce09b42110d801813efbc9364414e356be9935700d368351657487"
 
 [[package]]
 name = "lock_api"
-version = "0.4.13"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765"
+checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
 dependencies = [
- "autocfg",
  "scopeguard",
 ]
 
 [[package]]
 name = "log"
-version = "0.4.27"
+version = "0.4.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
+checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
 dependencies = [
  "value-bag",
 ]
 
-[[package]]
-name = "matchit"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3"
-
 [[package]]
 name = "memchr"
-version = "2.7.5"
+version = "2.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
+checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
 
 [[package]]
 name = "mime"
@@ -1514,12 +1640,6 @@ version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
-[[package]]
-name = "minimal-lexical"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
-
 [[package]]
 name = "miniz_oxide"
 version = "0.8.9"
@@ -1527,35 +1647,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
 dependencies = [
  "adler2",
+ "simd-adler32",
 ]
 
 [[package]]
 name = "mio"
-version = "1.0.4"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c"
+checksum = "69d83b0086dc8ecf3ce9ae2874b2d1290252e2a30720bea58a5c6639b0092873"
 dependencies = [
  "libc",
  "log",
  "wasi 0.11.1+wasi-snapshot-preview1",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "native-tls"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e"
-dependencies = [
- "libc",
- "log",
- "openssl",
- "openssl-probe",
- "openssl-sys",
- "schannel",
- "security-framework",
- "security-framework-sys",
- "tempfile",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -1570,16 +1674,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "nom"
-version = "7.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
-dependencies = [
- "memchr",
- "minimal-lexical",
-]
-
 [[package]]
 name = "num-conv"
 version = "0.1.0"
@@ -1587,12 +1681,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
 
 [[package]]
-name = "object"
-version = "0.36.7"
+name = "num-traits"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
- "memchr",
+ "autocfg",
 ]
 
 [[package]]
@@ -1602,48 +1696,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
 [[package]]
-name = "openssl"
-version = "0.10.73"
+name = "opaque-debug"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8"
-dependencies = [
- "bitflags",
- "cfg-if",
- "foreign-types",
- "libc",
- "once_cell",
- "openssl-macros",
- "openssl-sys",
-]
-
-[[package]]
-name = "openssl-macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "openssl-probe"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
-
-[[package]]
-name = "openssl-sys"
-version = "0.9.109"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90096e2e47630d78b7d1c20952dc621f957103f8bc2c8359ec81290d75238571"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
- "vcpkg",
-]
+checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
 
 [[package]]
 name = "parking"
@@ -1653,9 +1709,9 @@ checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
 
 [[package]]
 name = "parking_lot"
-version = "0.12.4"
+version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13"
+checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a"
 dependencies = [
  "lock_api",
  "parking_lot_core",
@@ -1663,22 +1719,22 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.11"
+version = "0.9.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5"
+checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
 dependencies = [
  "cfg-if",
  "libc",
  "redox_syscall",
  "smallvec",
- "windows-targets 0.52.6",
+ "windows-link",
 ]
 
 [[package]]
 name = "percent-encoding"
-version = "2.3.1"
+version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
+checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
 
 [[package]]
 name = "pin-project-lite"
@@ -1699,7 +1755,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066"
 dependencies = [
  "atomic-waker",
- "fastrand",
+ "fastrand 2.3.0",
  "futures-io",
 ]
 
@@ -1711,11 +1767,14 @@ checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
 
 [[package]]
 name = "poem"
-version = "3.1.11"
+version = "3.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ea63e9302279b1ca262d15342760f8d08f04fb974d4997e8baed7d034b94121"
+checksum = "9f977080932c87287147dca052951c3e2696f8759863f6b4e4c0c9ffe7a4cc8b"
 dependencies = [
+ "base64 0.22.1",
  "bytes",
+ "chrono",
+ "cookie 0.18.1",
  "futures-util",
  "headers",
  "http 1.3.1",
@@ -1728,6 +1787,8 @@ dependencies = [
  "percent-encoding",
  "pin-project-lite",
  "poem-derive",
+ "priority-queue",
+ "rand 0.9.2",
  "regex",
  "rfc7239",
  "serde",
@@ -1735,7 +1796,8 @@ dependencies = [
  "serde_urlencoded",
  "smallvec",
  "sync_wrapper",
- "thiserror",
+ "thiserror 2.0.17",
+ "time 0.3.44",
  "tokio",
  "tokio-util",
  "tracing",
@@ -1744,36 +1806,73 @@ dependencies = [
 
 [[package]]
 name = "poem-derive"
-version = "3.1.11"
+version = "3.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "824e7fe35343b7fe354e5d4ac444ddbe674676ebba4b4e48565835661033d338"
+checksum = "056e2fea6de1cb240ffe23cfc4fc370b629f8be83b5f27e16b7acd5231a72de4"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.108",
 ]
 
 [[package]]
 name = "polling"
-version = "3.8.0"
+version = "3.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b53a684391ad002dd6a596ceb6c74fd004fdce75f4be2e3f615068abbea5fd50"
+checksum = "5d0e4f59085d47d8241c88ead0f274e8a0cb551f3625263c05eb8dd897c34218"
 dependencies = [
  "cfg-if",
  "concurrent-queue",
  "hermit-abi",
  "pin-project-lite",
- "rustix 1.0.7",
- "tracing",
- "windows-sys 0.59.0",
+ "rustix",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "polyval"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eebcc4aa140b9abd2bc40d9c3f7ccec842679cd79045ac3a7ac698c1a064b7cd"
+dependencies = [
+ "cpuid-bool",
+ "opaque-debug",
+ "universal-hash 0.4.0",
+]
+
+[[package]]
+name = "polyval"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "opaque-debug",
+ "universal-hash 0.5.1",
+]
+
+[[package]]
+name = "portable-atomic"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
+
+[[package]]
+name = "portable-atomic-util"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507"
+dependencies = [
+ "portable-atomic",
 ]
 
 [[package]]
 name = "potential_utf"
-version = "0.1.2"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585"
+checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77"
 dependencies = [
  "zerovec",
 ]
@@ -1794,56 +1893,107 @@ dependencies = [
 ]
 
 [[package]]
-name = "prettyplease"
-version = "0.2.34"
+name = "priority-queue"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6837b9e10d61f45f987d50808f83d1ee3d206c66acf650c3e4ae2e1f6ddedf55"
+checksum = "5676d703dda103cbb035b653a9f11448c0a7216c7926bd35fcb5865475d0c970"
 dependencies = [
- "proc-macro2",
- "syn",
+ "autocfg",
+ "equivalent",
+ "indexmap",
 ]
 
 [[package]]
 name = "proc-macro-crate"
-version = "3.3.0"
+version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35"
+checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983"
 dependencies = [
  "toml_edit",
 ]
 
 [[package]]
-name = "proc-macro2"
-version = "1.0.95"
+name = "proc-macro-hack"
+version = "0.5.20+deprecated"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
+checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.103"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.40"
+version = "1.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
+checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "r-efi"
-version = "5.2.0"
+version = "5.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
+checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
 
 [[package]]
 name = "rand"
-version = "0.9.1"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97"
+checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
 dependencies = [
- "rand_chacha",
- "rand_core",
+ "getrandom 0.1.16",
+ "libc",
+ "rand_chacha 0.2.2",
+ "rand_core 0.5.1",
+ "rand_hc",
+]
+
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha 0.3.1",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
+dependencies = [
+ "rand_chacha 0.9.0",
+ "rand_core 0.9.3",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.5.1",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.6.4",
 ]
 
 [[package]]
@@ -1853,7 +2003,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
 dependencies = [
  "ppv-lite86",
- "rand_core",
+ "rand_core 0.9.3",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
+dependencies = [
+ "getrandom 0.1.16",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom 0.2.16",
 ]
 
 [[package]]
@@ -1862,23 +2030,32 @@ version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
 dependencies = [
- "getrandom 0.3.3",
+ "getrandom 0.3.4",
+]
+
+[[package]]
+name = "rand_hc"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
+dependencies = [
+ "rand_core 0.5.1",
 ]
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.13"
+version = "0.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d04b7d0ee6b4a0207a0a7adb104d23ecb0b47d6beae7152d0fa34b692b29fd6"
+checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
 dependencies = [
  "bitflags",
 ]
 
 [[package]]
 name = "regex"
-version = "1.11.1"
+version = "1.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -1888,9 +2065,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.9"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
+checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -1899,57 +2076,15 @@ dependencies = [
 
 [[package]]
 name = "regex-lite"
-version = "0.1.6"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a"
+checksum = "8d942b98df5e658f56f20d592c7f868833fe38115e65c33003d8cd224b0155da"
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.5"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
-
-[[package]]
-name = "reqwest"
-version = "0.12.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eabf4c97d9130e2bf606614eb937e86edac8292eaa6f422f995d7e8de1eb1813"
-dependencies = [
- "base64",
- "bytes",
- "encoding_rs",
- "futures-channel",
- "futures-core",
- "futures-util",
- "h2 0.4.10",
- "http 1.3.1",
- "http-body",
- "http-body-util",
- "hyper",
- "hyper-rustls",
- "hyper-tls",
- "hyper-util",
- "js-sys",
- "log",
- "mime",
- "native-tls",
- "percent-encoding",
- "pin-project-lite",
- "rustls-pki-types",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "sync_wrapper",
- "tokio",
- "tokio-native-tls",
- "tower",
- "tower-http",
- "tower-service",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
-]
+checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
 
 [[package]]
 name = "rfc7239"
@@ -1961,98 +2096,32 @@ dependencies = [
 ]
 
 [[package]]
-name = "ring"
-version = "0.17.14"
+name = "rustc_version"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
+checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
 dependencies = [
- "cc",
- "cfg-if",
- "getrandom 0.2.16",
- "libc",
- "untrusted",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "rustc-demangle"
-version = "0.1.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "989e6739f80c4ad5b13e0fd7fe89531180375b18520cc8c82080e4dc4035b84f"
-
-[[package]]
-name = "rustc-hash"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
-
-[[package]]
-name = "rustix"
-version = "0.38.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
-dependencies = [
- "bitflags",
- "errno",
- "libc",
- "linux-raw-sys 0.4.15",
- "windows-sys 0.59.0",
+ "semver",
 ]
 
 [[package]]
 name = "rustix"
-version = "1.0.7"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266"
+checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e"
 dependencies = [
  "bitflags",
  "errno",
  "libc",
- "linux-raw-sys 0.9.4",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "rustls"
-version = "0.23.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "730944ca083c1c233a75c09f199e973ca499344a2b7ba9e755c457e86fb4a321"
-dependencies = [
- "aws-lc-rs",
- "log",
- "once_cell",
- "rustls-pki-types",
- "rustls-webpki",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "rustls-pki-types"
-version = "1.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79"
-dependencies = [
- "zeroize",
-]
-
-[[package]]
-name = "rustls-webpki"
-version = "0.103.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4a72fe2bcf7a6ac6fd7d0b9e5cb68aeb7d4c0a0271730218b3e92d43b4eb435"
-dependencies = [
- "aws-lc-rs",
- "ring",
- "rustls-pki-types",
- "untrusted",
+ "linux-raw-sys",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "rustversion"
-version = "1.0.21"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
 
 [[package]]
 name = "ryu"
@@ -2060,15 +2129,6 @@ version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
 
-[[package]]
-name = "schannel"
-version = "0.1.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
-dependencies = [
- "windows-sys 0.59.0",
-]
-
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
@@ -2076,68 +2136,72 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
-name = "security-framework"
-version = "2.11.1"
+name = "semver"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
+checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
 dependencies = [
- "bitflags",
- "core-foundation",
- "core-foundation-sys",
- "libc",
- "security-framework-sys",
+ "semver-parser",
 ]
 
 [[package]]
-name = "security-framework-sys"
-version = "2.14.0"
+name = "semver-parser"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
+checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
 [[package]]
 name = "serde"
-version = "1.0.219"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+dependencies = [
+ "serde_core",
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.219"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.108",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.140"
+version = "1.0.145"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
+checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
 dependencies = [
  "itoa",
  "memchr",
  "ryu",
  "serde",
+ "serde_core",
 ]
 
 [[package]]
-name = "serde_path_to_error"
-version = "0.1.17"
+name = "serde_qs"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59fab13f937fa393d08645bf3a84bdfe86e296747b506ada67bb15f10f218b2a"
+checksum = "c7715380eec75f029a4ef7de39a9200e0a63823176b759d055b613f5a87df6a6"
 dependencies = [
- "itoa",
+ "percent-encoding",
  "serde",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -2152,6 +2216,15 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "sha1"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770"
+dependencies = [
+ "sha1_smol",
+]
+
 [[package]]
 name = "sha1"
 version = "0.10.6"
@@ -2160,7 +2233,37 @@ checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
 dependencies = [
  "cfg-if",
  "cpufeatures",
- "digest",
+ "digest 0.10.7",
+]
+
+[[package]]
+name = "sha1_smol"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d"
+
+[[package]]
+name = "sha2"
+version = "0.9.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
+dependencies = [
+ "block-buffer 0.9.0",
+ "cfg-if",
+ "cpufeatures",
+ "digest 0.9.0",
+ "opaque-debug",
+]
+
+[[package]]
+name = "sha2"
+version = "0.10.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest 0.10.7",
 ]
 
 [[package]]
@@ -2171,18 +2274,24 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
 name = "signal-hook-registry"
-version = "1.4.5"
+version = "1.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410"
+checksum = "b2a4719bff48cee6b39d12c020eeb490953ad2443b7055bd0b21fca26bd8c28b"
 dependencies = [
  "libc",
 ]
 
 [[package]]
-name = "slab"
-version = "0.4.10"
+name = "simd-adler32"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04dc19736151f35336d325007ac991178d504a119863a2fcb3758cdb5e52c50d"
+checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+
+[[package]]
+name = "slab"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
 
 [[package]]
 name = "smallvec"
@@ -2201,10 +2310,78 @@ dependencies = [
 ]
 
 [[package]]
-name = "stable_deref_trait"
-version = "1.2.0"
+name = "socket2"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881"
+dependencies = [
+ "libc",
+ "windows-sys 0.60.2",
+]
+
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
+
+[[package]]
+name = "standback"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff"
+dependencies = [
+ "version_check",
+]
+
+[[package]]
+name = "stdweb"
+version = "0.4.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5"
+dependencies = [
+ "discard",
+ "rustc_version",
+ "stdweb-derive",
+ "stdweb-internal-macros",
+ "stdweb-internal-runtime",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "stdweb-derive"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "serde",
+ "serde_derive",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "stdweb-internal-macros"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11"
+dependencies = [
+ "base-x",
+ "proc-macro2",
+ "quote",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "sha1 0.6.1",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "stdweb-internal-runtime"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0"
 
 [[package]]
 name = "subtle"
@@ -2214,9 +2391,20 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "syn"
-version = "2.0.103"
+version = "1.0.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4307e30089d6fd6aff212f2da3a1f9e32f3223b1f010fb09b7c95f90f3ca1e8"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.108"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da58917d35242480a05c2897064da0a80589a2a0476c9a3f2fdc83b53502e917"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2240,41 +2428,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
-]
-
-[[package]]
-name = "system-configuration"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
-dependencies = [
- "bitflags",
- "core-foundation",
- "system-configuration-sys",
-]
-
-[[package]]
-name = "system-configuration-sys"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "tempfile"
-version = "3.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1"
-dependencies = [
- "fastrand",
- "getrandom 0.3.3",
- "once_cell",
- "rustix 1.0.7",
- "windows-sys 0.59.0",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -2282,48 +2436,72 @@ name = "test"
 version = "0.0.1"
 dependencies = [
  "actix-web",
- "async-std",
- "axum",
- "bytes",
- "futures",
- "futures-rustls",
- "http 1.3.1",
- "http-body-util",
- "hyper",
- "hyper-util",
+ "biscotti",
+ "cookie 0.18.1",
+ "http-types",
  "poem",
- "reqwest",
- "rustls",
- "serde",
- "serde_json",
- "tokio",
 ]
 
 [[package]]
 name = "thiserror"
-version = "2.0.12"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
 dependencies = [
- "thiserror-impl",
+ "thiserror-impl 1.0.69",
+]
+
+[[package]]
+name = "thiserror"
+version = "2.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8"
+dependencies = [
+ "thiserror-impl 2.0.17",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.12"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "2.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
 ]
 
 [[package]]
 name = "time"
-version = "0.3.41"
+version = "0.2.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40"
+checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242"
+dependencies = [
+ "const_fn",
+ "libc",
+ "standback",
+ "stdweb",
+ "time-macros 0.1.1",
+ "version_check",
+ "winapi",
+]
+
+[[package]]
+name = "time"
+version = "0.3.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d"
 dependencies = [
  "deranged",
  "itoa",
@@ -2331,30 +2509,53 @@ dependencies = [
  "powerfmt",
  "serde",
  "time-core",
- "time-macros",
+ "time-macros 0.2.24",
 ]
 
 [[package]]
 name = "time-core"
-version = "0.1.4"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"
+checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b"
 
 [[package]]
 name = "time-macros"
-version = "0.2.22"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49"
+checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1"
+dependencies = [
+ "proc-macro-hack",
+ "time-macros-impl",
+]
+
+[[package]]
+name = "time-macros"
+version = "0.2.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3"
 dependencies = [
  "num-conv",
  "time-core",
 ]
 
 [[package]]
-name = "tinystr"
-version = "0.8.1"
+name = "time-macros-impl"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b"
+checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f"
+dependencies = [
+ "proc-macro-hack",
+ "proc-macro2",
+ "quote",
+ "standback",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "tinystr"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869"
 dependencies = [
  "displaydoc",
  "zerovec",
@@ -2362,58 +2563,37 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.45.1"
+version = "1.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75ef51a33ef1da925cea3e4eb122833cb377c61439ca401b770f54902b806779"
+checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408"
 dependencies = [
- "backtrace",
  "bytes",
  "libc",
  "mio",
  "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
- "socket2",
+ "socket2 0.6.1",
  "tokio-macros",
- "windows-sys 0.52.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
+checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
-]
-
-[[package]]
-name = "tokio-native-tls"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
-dependencies = [
- "native-tls",
- "tokio",
-]
-
-[[package]]
-name = "tokio-rustls"
-version = "0.26.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b"
-dependencies = [
- "rustls",
- "tokio",
+ "syn 2.0.108",
 ]
 
 [[package]]
 name = "tokio-util"
-version = "0.7.15"
+version = "0.7.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66a539a9ad6d5d281510d5bd368c973d636c02dbf8a67300bfb6b950696ad7df"
+checksum = "2efa149fe76073d6e8fd97ef4f4eca7b67f599660115591483572e406e165594"
 dependencies = [
  "bytes",
  "futures-core",
@@ -2424,67 +2604,34 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.11"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
+checksum = "f2cdb639ebbc97961c51720f858597f7f24c4fc295327923af55b74c3c724533"
+dependencies = [
+ "serde_core",
+]
 
 [[package]]
 name = "toml_edit"
-version = "0.22.27"
+version = "0.23.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
+checksum = "6485ef6d0d9b5d0ec17244ff7eb05310113c3f316f2d14200d4de56b3cb98f8d"
 dependencies = [
  "indexmap",
  "toml_datetime",
+ "toml_parser",
  "winnow",
 ]
 
 [[package]]
-name = "tower"
-version = "0.5.2"
+name = "toml_parser"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
+checksum = "c0cbe268d35bdb4bb5a56a2de88d0ad0eb70af5384a99d648cd4b3d04039800e"
 dependencies = [
- "futures-core",
- "futures-util",
- "pin-project-lite",
- "sync_wrapper",
- "tokio",
- "tower-layer",
- "tower-service",
- "tracing",
+ "winnow",
 ]
 
-[[package]]
-name = "tower-http"
-version = "0.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2"
-dependencies = [
- "bitflags",
- "bytes",
- "futures-util",
- "http 1.3.1",
- "http-body",
- "iri-string",
- "pin-project-lite",
- "tower",
- "tower-layer",
- "tower-service",
-]
-
-[[package]]
-name = "tower-layer"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
-
-[[package]]
-name = "tower-service"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
-
 [[package]]
 name = "tracing"
 version = "0.1.41"
@@ -2499,13 +2646,13 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.29"
+version = "0.1.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b1ffbcf9c6f6b99d386e7444eb608ba646ae452a36b39737deb9663b610f662"
+checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -2517,17 +2664,11 @@ dependencies = [
  "once_cell",
 ]
 
-[[package]]
-name = "try-lock"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
-
 [[package]]
 name = "typenum"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f"
+checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb"
 
 [[package]]
 name = "uncased"
@@ -2540,9 +2681,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.18"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
+checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5"
 
 [[package]]
 name = "unicode-xid"
@@ -2551,20 +2692,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 
 [[package]]
-name = "untrusted"
-version = "0.9.0"
+name = "universal-hash"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+checksum = "8326b2c654932e3e4f9196e69d08fdf7cfd718e1dc6f66b347e6024a0c961402"
+dependencies = [
+ "generic-array",
+ "subtle",
+]
+
+[[package]]
+name = "universal-hash"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea"
+dependencies = [
+ "crypto-common",
+ "subtle",
+]
 
 [[package]]
 name = "url"
-version = "2.5.4"
+version = "2.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
+checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b"
 dependencies = [
  "form_urlencoded",
  "idna",
  "percent-encoding",
+ "serde",
 ]
 
 [[package]]
@@ -2579,12 +2735,6 @@ version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "943ce29a8a743eb10d6082545d861b24f9d1b160b7d741e0f2cdf726bec909c5"
 
-[[package]]
-name = "vcpkg"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
-
 [[package]]
 name = "version_check"
 version = "0.9.5"
@@ -2592,13 +2742,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
 [[package]]
-name = "want"
-version = "0.3.1"
+name = "waker-fn"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
-dependencies = [
- "try-lock",
-]
+checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7"
+
+[[package]]
+name = "wasi"
+version = "0.9.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
 
 [[package]]
 name = "wasi"
@@ -2607,45 +2760,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
 [[package]]
-name = "wasi"
-version = "0.14.2+wasi-0.2.4"
+name = "wasip2"
+version = "1.0.1+wasi-0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
+checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
 dependencies = [
- "wit-bindgen-rt",
+ "wit-bindgen",
 ]
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.100"
+version = "0.2.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
+checksum = "da95793dfc411fbbd93f5be7715b0578ec61fe87cb1a42b12eb625caa5c5ea60"
 dependencies = [
  "cfg-if",
  "once_cell",
  "rustversion",
  "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
-dependencies = [
- "bumpalo",
- "log",
- "proc-macro2",
- "quote",
- "syn",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.50"
+version = "0.4.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61"
+checksum = "551f88106c6d5e7ccc7cd9a16f312dd3b5d36ea8b4954304657d5dfba115d4a0"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -2656,9 +2796,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.100"
+version = "0.2.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
+checksum = "04264334509e04a7bf8690f2384ef5265f05143a4bff3889ab7a3269adab59c2"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -2666,85 +2806,119 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.100"
+version = "0.2.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
+checksum = "420bc339d9f322e562942d52e115d57e950d12d88983a14c79b86859ee6c7ebc"
 dependencies = [
+ "bumpalo",
  "proc-macro2",
  "quote",
- "syn",
- "wasm-bindgen-backend",
+ "syn 2.0.108",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.100"
+version = "0.2.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+checksum = "76f218a38c84bcb33c25ec7059b07847d465ce0e0a76b995e134a45adcb6af76"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "web-sys"
-version = "0.3.77"
+version = "0.3.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
+checksum = "3a1f95c0d03a47f4ae1f7a64643a6bb97465d9b740f0fa8f90ea33915c99a9a1"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
 ]
 
 [[package]]
-name = "which"
-version = "4.4.2"
+name = "wildmatch"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
+checksum = "39b7d07a236abaef6607536ccfaf19b396dbe3f5110ddb73d39f4562902ed382"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
 dependencies = [
- "either",
- "home",
- "once_cell",
- "rustix 0.38.44",
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
 ]
 
 [[package]]
-name = "wildmatch"
-version = "2.4.0"
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68ce1ab1f8c62655ebe1350f589c61e505cf94d385bc6a12899442d9081e71fd"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
-name = "windows-link"
-version = "0.1.3"
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
-name = "windows-registry"
-version = "0.5.2"
+name = "windows-core"
+version = "0.62.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3bab093bdd303a1240bb99b8aba8ea8a69ee19d34c9e2ef9594e708a4878820"
+checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb"
 dependencies = [
+ "windows-implement",
+ "windows-interface",
  "windows-link",
  "windows-result",
  "windows-strings",
 ]
 
 [[package]]
-name = "windows-result"
-version = "0.3.4"
+name = "windows-implement"
+version = "0.60.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
+checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.59.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "windows-link"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
+
+[[package]]
+name = "windows-result"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5"
 dependencies = [
  "windows-link",
 ]
 
 [[package]]
 name = "windows-strings"
-version = "0.4.2"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
+checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091"
 dependencies = [
  "windows-link",
 ]
@@ -2767,6 +2941,24 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-sys"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
+dependencies = [
+ "windows-targets 0.53.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.61.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
+dependencies = [
+ "windows-link",
+]
+
 [[package]]
 name = "windows-targets"
 version = "0.52.6"
@@ -2785,18 +2977,19 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.53.2"
+version = "0.53.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef"
+checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
 dependencies = [
- "windows_aarch64_gnullvm 0.53.0",
- "windows_aarch64_msvc 0.53.0",
- "windows_i686_gnu 0.53.0",
- "windows_i686_gnullvm 0.53.0",
- "windows_i686_msvc 0.53.0",
- "windows_x86_64_gnu 0.53.0",
- "windows_x86_64_gnullvm 0.53.0",
- "windows_x86_64_msvc 0.53.0",
+ "windows-link",
+ "windows_aarch64_gnullvm 0.53.1",
+ "windows_aarch64_msvc 0.53.1",
+ "windows_i686_gnu 0.53.1",
+ "windows_i686_gnullvm 0.53.1",
+ "windows_i686_msvc 0.53.1",
+ "windows_x86_64_gnu 0.53.1",
+ "windows_x86_64_gnullvm 0.53.1",
+ "windows_x86_64_msvc 0.53.1",
 ]
 
 [[package]]
@@ -2807,9 +3000,9 @@ checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
+checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -2819,9 +3012,9 @@ checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
+checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -2831,9 +3024,9 @@ checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
+checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
 
 [[package]]
 name = "windows_i686_gnullvm"
@@ -2843,9 +3036,9 @@ checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
 [[package]]
 name = "windows_i686_gnullvm"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
+checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -2855,9 +3048,9 @@ checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
+checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -2867,9 +3060,9 @@ checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
+checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -2879,9 +3072,9 @@ checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
+checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -2891,41 +3084,37 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
+checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
 
 [[package]]
 name = "winnow"
-version = "0.7.11"
+version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74c7b26e3480b707944fc872477815d29a8e429d2f93a1ce000f5fa84a15cbcd"
+checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
-name = "wit-bindgen-rt"
-version = "0.39.0"
+name = "wit-bindgen"
+version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
-dependencies = [
- "bitflags",
-]
+checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
 
 [[package]]
 name = "writeable"
-version = "0.6.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb"
+checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9"
 
 [[package]]
 name = "yoke"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc"
+checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954"
 dependencies = [
- "serde",
  "stable_deref_trait",
  "yoke-derive",
  "zerofrom",
@@ -2933,34 +3122,34 @@ dependencies = [
 
 [[package]]
 name = "yoke-derive"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6"
+checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.108",
  "synstructure",
 ]
 
 [[package]]
 name = "zerocopy"
-version = "0.8.25"
+version = "0.8.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb"
+checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.25"
+version = "0.8.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28a6e20d751156648aa063f3800b706ee209a32c0b4d9f24be3d980b01be55ef"
+checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -2980,21 +3169,21 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.108",
  "synstructure",
 ]
 
 [[package]]
 name = "zeroize"
-version = "1.8.1"
+version = "1.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
 
 [[package]]
 name = "zerotrie"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595"
+checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851"
 dependencies = [
  "displaydoc",
  "yoke",
@@ -3003,9 +3192,9 @@ dependencies = [
 
 [[package]]
 name = "zerovec"
-version = "0.11.2"
+version = "0.11.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428"
+checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002"
 dependencies = [
  "yoke",
  "zerofrom",
@@ -3014,13 +3203,13 @@ dependencies = [
 
 [[package]]
 name = "zerovec-derive"
-version = "0.11.1"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f"
+checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -3043,9 +3232,9 @@ dependencies = [
 
 [[package]]
 name = "zstd-sys"
-version = "2.0.15+zstd.1.5.7"
+version = "2.0.16+zstd.1.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb81183ddd97d0c74cedf1d50d85c8d08c1b8b68ee863bdee9e706eedba1a237"
+checksum = "91e19ebc2adc8f83e43039e79776e3fda8ca919132d68a1fed6a5faca2683748"
 dependencies = [
  "cc",
  "pkg-config",
diff --git a/rust/ql/test/query-tests/security/CWE-614/CookieSet.expected b/rust/ql/test/query-tests/security/CWE-614/CookieSet.expected
new file mode 100644
index 00000000000..220ba8ee62c
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-614/CookieSet.expected
@@ -0,0 +1,79 @@
+| main.rs:8:19:8:50 | ...::build(...) | secure | false |
+| main.rs:12:19:12:50 | ...::build(...) | secure | true |
+| main.rs:20:5:20:36 | ...::build(...) | secure | false |
+| main.rs:21:5:21:36 | ...::build(...) | secure | false |
+| main.rs:24:5:24:36 | ...::build(...) | secure | true |
+| main.rs:25:5:25:36 | ...::build(...) | secure | false |
+| main.rs:26:5:26:36 | ...::build(...) | secure | false |
+| main.rs:27:5:27:36 | ...::build(...) | secure | false |
+| main.rs:28:5:28:36 | ...::build(...) | secure | false |
+| main.rs:29:5:29:36 | ...::build(...) | secure | false |
+| main.rs:33:9:33:40 | ...::build(...) | secure | false |
+| main.rs:35:9:35:40 | ...::build(...) | secure | false |
+| main.rs:39:5:39:39 | ...::new(...) | secure | false |
+| main.rs:40:5:40:50 | ... .expires(...) | secure | false |
+| main.rs:41:5:41:79 | ... .max_age(...) | secure | false |
+| main.rs:42:5:42:58 | ... .domain(...) | secure | false |
+| main.rs:43:5:43:46 | ... .path(...) | secure | false |
+| main.rs:44:5:44:52 | ... .http_only(...) | secure | false |
+| main.rs:45:5:45:72 | ... .same_site(...) | secure | false |
+| main.rs:46:5:46:48 | ... .permanent() | secure | false |
+| main.rs:47:5:47:46 | ... .removal() | secure | false |
+| main.rs:48:5:48:36 | ...::build(...) | secure | false |
+| main.rs:49:5:49:25 | ...::build(...) | secure | false |
+| main.rs:50:5:50:40 | ...::build(...) | secure | false |
+| main.rs:53:5:53:36 | ...::build(...) | secure | true |
+| main.rs:53:5:53:49 | ... .secure(...) | secure | false |
+| main.rs:54:5:54:36 | ...::build(...) | secure | false |
+| main.rs:54:5:54:50 | ... .secure(...) | secure | true |
+| main.rs:61:5:61:5 | [SSA] a | secure | true |
+| main.rs:61:5:61:5 | a | secure | true |
+| main.rs:63:5:63:5 | [SSA] a | secure | false |
+| main.rs:63:5:63:5 | a | secure | false |
+| main.rs:71:5:71:5 | [SSA] b | secure | false |
+| main.rs:71:5:71:5 | b | secure | false |
+| main.rs:73:5:73:5 | [SSA] b | secure | true |
+| main.rs:73:5:73:5 | b | secure | true |
+| main.rs:81:9:81:9 | [SSA] c | secure | true |
+| main.rs:81:9:81:9 | c | secure | true |
+| main.rs:84:5:84:5 | [SSA] c | secure | true |
+| main.rs:84:5:84:5 | c | secure | true |
+| main.rs:90:9:90:9 | c | secure | true |
+| main.rs:92:9:92:9 | c | partitioned | true |
+| main.rs:109:9:109:9 | [SSA] e | secure | true |
+| main.rs:109:9:109:9 | e | secure | true |
+| main.rs:114:5:114:36 | ...::build(...) | partitioned | true |
+| main.rs:126:13:126:13 | a | secure | true |
+| main.rs:130:13:130:13 | b | secure | false |
+| main.rs:134:13:134:13 | c | partitioned | true |
+| main.rs:138:13:138:13 | d | secure | true |
+| main.rs:142:13:142:13 | e | partitioned | false |
+| main.rs:146:13:146:13 | f | secure | false |
+| main.rs:180:29:180:66 | ...::build(...) | secure | true |
+| main.rs:186:9:186:22 | [SSA] secure_cookie2 | secure | true |
+| main.rs:186:9:186:22 | secure_cookie2 | secure | true |
+| main.rs:197:5:197:39 | ...::build(...) | secure | false |
+| main.rs:198:5:198:39 | ...::build(...) | secure | false |
+| main.rs:201:5:201:11 | [SSA] cookie1 | secure | false |
+| main.rs:201:5:201:11 | cookie1 | secure | false |
+| main.rs:205:5:205:39 | ...::build(...) | secure | true |
+| main.rs:208:5:208:11 | [SSA] cookie2 | secure | true |
+| main.rs:208:5:208:11 | cookie2 | secure | true |
+| main.rs:218:5:218:11 | [SSA] cookie2 | secure | false |
+| main.rs:218:5:218:11 | cookie2 | secure | false |
+| main.rs:228:5:228:11 | [SSA] cookie1 | secure | false |
+| main.rs:228:5:228:11 | cookie1 | secure | false |
+| main.rs:233:5:233:11 | [SSA] cookie2 | secure | true |
+| main.rs:233:5:233:11 | cookie2 | secure | true |
+| main.rs:241:29:241:62 | ...::new(...) | secure | false |
+| main.rs:244:30:244:63 | ...::new(...) | secure | false |
+| main.rs:247:30:247:63 | ...::new(...) | secure | true |
+| main.rs:259:5:259:43 | ...::build(...) | secure | false |
+| main.rs:260:5:260:43 | ...::build(...) | secure | false |
+| main.rs:263:5:263:11 | [SSA] cookie1 | secure | false |
+| main.rs:263:5:263:11 | cookie1 | secure | false |
+| main.rs:267:5:267:43 | ...::build(...) | secure | true |
+| main.rs:270:5:270:11 | [SSA] cookie2 | secure | true |
+| main.rs:270:5:270:11 | cookie2 | secure | true |
+| main.rs:280:5:280:11 | [SSA] cookie2 | secure | false |
+| main.rs:280:5:280:11 | cookie2 | secure | false |
diff --git a/rust/ql/test/query-tests/security/CWE-614/CookieSet.ql b/rust/ql/test/query-tests/security/CWE-614/CookieSet.ql
new file mode 100644
index 00000000000..c038e6de44b
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-614/CookieSet.ql
@@ -0,0 +1,7 @@
+import rust
+import codeql.rust.dataflow.DataFlow
+import codeql.rust.security.InsecureCookieExtensions
+
+from DataFlow::Node node, string state, boolean value
+where InsecureCookie::cookieSetNode(node, state, value)
+select node, state, value
diff --git a/rust/ql/test/query-tests/security/CWE-614/InsecureCookie.expected b/rust/ql/test/query-tests/security/CWE-614/InsecureCookie.expected
new file mode 100644
index 00000000000..e3a4998b532
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-614/InsecureCookie.expected
@@ -0,0 +1,667 @@
+#select
+| main.rs:8:66:8:70 | build | main.rs:8:19:8:50 | ...::build(...) | main.rs:8:66:8:70 | build | Cookie attribute 'Secure' is not set to true. |
+| main.rs:16:52:16:56 | build | main.rs:16:19:16:31 | ...::build | main.rs:16:52:16:56 | build | Cookie attribute 'Secure' is not set to true. |
+| main.rs:20:56:20:60 | build | main.rs:20:5:20:36 | ...::build(...) | main.rs:20:56:20:60 | build | Cookie attribute 'Secure' is not set to true. |
+| main.rs:21:57:21:61 | build | main.rs:21:5:21:36 | ...::build(...) | main.rs:21:57:21:61 | build | Cookie attribute 'Secure' is not set to true. |
+| main.rs:25:54:25:58 | build | main.rs:25:5:25:36 | ...::build(...) | main.rs:25:54:25:58 | build | Cookie attribute 'Secure' is not set to true. |
+| main.rs:26:52:26:56 | build | main.rs:26:5:26:36 | ...::build(...) | main.rs:26:52:26:56 | build | Cookie attribute 'Secure' is not set to true. |
+| main.rs:27:53:27:57 | build | main.rs:27:5:27:36 | ...::build(...) | main.rs:27:53:27:57 | build | Cookie attribute 'Secure' is not set to true. |
+| main.rs:28:62:28:66 | build | main.rs:28:5:28:36 | ...::build(...) | main.rs:28:62:28:66 | build | Cookie attribute 'Secure' is not set to true. |
+| main.rs:29:62:29:66 | build | main.rs:29:5:29:36 | ...::build(...) | main.rs:29:62:29:66 | build | Cookie attribute 'Secure' is not set to true. |
+| main.rs:33:60:33:64 | build | main.rs:33:9:33:40 | ...::build(...) | main.rs:33:60:33:64 | build | Cookie attribute 'Secure' is not set to true. |
+| main.rs:35:60:35:64 | build | main.rs:35:9:35:40 | ...::build(...) | main.rs:35:60:35:64 | build | Cookie attribute 'Secure' is not set to true. |
+| main.rs:39:55:39:59 | build | main.rs:39:5:39:39 | ...::new(...) | main.rs:39:55:39:59 | build | Cookie attribute 'Secure' is not set to true. |
+| main.rs:40:66:40:70 | build | main.rs:40:5:40:50 | ... .expires(...) | main.rs:40:66:40:70 | build | Cookie attribute 'Secure' is not set to true. |
+| main.rs:41:95:41:99 | build | main.rs:41:5:41:79 | ... .max_age(...) | main.rs:41:95:41:99 | build | Cookie attribute 'Secure' is not set to true. |
+| main.rs:42:74:42:78 | build | main.rs:42:5:42:58 | ... .domain(...) | main.rs:42:74:42:78 | build | Cookie attribute 'Secure' is not set to true. |
+| main.rs:43:62:43:66 | build | main.rs:43:5:43:46 | ... .path(...) | main.rs:43:62:43:66 | build | Cookie attribute 'Secure' is not set to true. |
+| main.rs:44:68:44:72 | build | main.rs:44:5:44:52 | ... .http_only(...) | main.rs:44:68:44:72 | build | Cookie attribute 'Secure' is not set to true. |
+| main.rs:45:88:45:92 | build | main.rs:45:5:45:72 | ... .same_site(...) | main.rs:45:88:45:92 | build | Cookie attribute 'Secure' is not set to true. |
+| main.rs:46:64:46:68 | build | main.rs:46:5:46:48 | ... .permanent() | main.rs:46:64:46:68 | build | Cookie attribute 'Secure' is not set to true. |
+| main.rs:47:62:47:66 | build | main.rs:47:5:47:46 | ... .removal() | main.rs:47:62:47:66 | build | Cookie attribute 'Secure' is not set to true. |
+| main.rs:48:52:48:57 | finish | main.rs:48:5:48:36 | ...::build(...) | main.rs:48:52:48:57 | finish | Cookie attribute 'Secure' is not set to true. |
+| main.rs:49:41:49:45 | build | main.rs:49:5:49:25 | ...::build(...) | main.rs:49:41:49:45 | build | Cookie attribute 'Secure' is not set to true. |
+| main.rs:50:56:50:60 | build | main.rs:50:5:50:40 | ...::build(...) | main.rs:50:56:50:60 | build | Cookie attribute 'Secure' is not set to true. |
+| main.rs:53:65:53:69 | build | main.rs:53:5:53:49 | ... .secure(...) | main.rs:53:65:53:69 | build | Cookie attribute 'Secure' is not set to true. |
+| main.rs:59:9:59:11 | add | main.rs:58:17:58:27 | ...::new | main.rs:59:9:59:11 | add | Cookie attribute 'Secure' is not set to true. |
+| main.rs:60:9:60:20 | add_original | main.rs:58:17:58:27 | ...::new | main.rs:60:9:60:20 | add_original | Cookie attribute 'Secure' is not set to true. |
+| main.rs:64:9:64:11 | add | main.rs:63:5:63:5 | [SSA] a | main.rs:64:9:64:11 | add | Cookie attribute 'Secure' is not set to true. |
+| main.rs:64:9:64:11 | add | main.rs:63:5:63:5 | a | main.rs:64:9:64:11 | add | Cookie attribute 'Secure' is not set to true. |
+| main.rs:69:16:69:18 | add | main.rs:68:17:68:29 | ...::named | main.rs:69:16:69:18 | add | Cookie attribute 'Secure' is not set to true. |
+| main.rs:70:16:70:27 | add_original | main.rs:63:5:63:5 | [SSA] a | main.rs:70:16:70:27 | add_original | Cookie attribute 'Secure' is not set to true. |
+| main.rs:70:16:70:27 | add_original | main.rs:63:5:63:5 | a | main.rs:70:16:70:27 | add_original | Cookie attribute 'Secure' is not set to true. |
+| main.rs:72:16:72:18 | add | main.rs:71:5:71:5 | [SSA] b | main.rs:72:16:72:18 | add | Cookie attribute 'Secure' is not set to true. |
+| main.rs:72:16:72:18 | add | main.rs:71:5:71:5 | b | main.rs:72:16:72:18 | add | Cookie attribute 'Secure' is not set to true. |
+| main.rs:78:17:78:19 | add | main.rs:77:17:77:28 | ...::from | main.rs:78:17:78:19 | add | Cookie attribute 'Secure' is not set to true. |
+| main.rs:79:17:79:28 | add_original | main.rs:63:5:63:5 | [SSA] a | main.rs:79:17:79:28 | add_original | Cookie attribute 'Secure' is not set to true. |
+| main.rs:79:17:79:28 | add_original | main.rs:63:5:63:5 | a | main.rs:79:17:79:28 | add_original | Cookie attribute 'Secure' is not set to true. |
+| main.rs:83:17:83:19 | add | main.rs:77:17:77:28 | ...::from | main.rs:83:17:83:19 | add | Cookie attribute 'Secure' is not set to true. |
+| main.rs:88:9:88:11 | add | main.rs:87:17:87:28 | ...::from | main.rs:88:9:88:11 | add | Cookie attribute 'Secure' is not set to true. |
+| main.rs:94:9:94:11 | add | main.rs:87:17:87:28 | ...::from | main.rs:94:9:94:11 | add | Cookie attribute 'Secure' is not set to true. |
+| main.rs:123:13:123:18 | insert | main.rs:122:13:122:41 | ...::new | main.rs:123:13:123:18 | insert | Cookie attribute 'Secure' is not set to true. |
+| main.rs:131:13:131:18 | insert | main.rs:130:13:130:13 | b | main.rs:131:13:131:18 | insert | Cookie attribute 'Secure' is not set to true. |
+| main.rs:147:13:147:18 | insert | main.rs:146:13:146:13 | f | main.rs:147:13:147:18 | insert | Cookie attribute 'Secure' is not set to true. |
+| main.rs:152:13:152:18 | insert | main.rs:151:13:151:42 | ...::from | main.rs:152:13:152:18 | insert | Cookie attribute 'Secure' is not set to true. |
+| main.rs:156:13:156:18 | insert | main.rs:155:13:155:41 | ...::new | main.rs:156:13:156:18 | insert | Cookie attribute 'Secure' is not set to true. |
+| main.rs:157:13:157:18 | insert | main.rs:155:13:155:41 | ...::new | main.rs:157:13:157:18 | insert | Cookie attribute 'Secure' is not set to true. |
+| main.rs:158:13:158:18 | insert | main.rs:155:13:155:41 | ...::new | main.rs:158:13:158:18 | insert | Cookie attribute 'Secure' is not set to true. |
+| main.rs:159:13:159:18 | insert | main.rs:155:13:155:41 | ...::new | main.rs:159:13:159:18 | insert | Cookie attribute 'Secure' is not set to true. |
+| main.rs:160:13:160:18 | insert | main.rs:155:13:155:41 | ...::new | main.rs:160:13:160:18 | insert | Cookie attribute 'Secure' is not set to true. |
+| main.rs:161:13:161:18 | insert | main.rs:155:13:155:41 | ...::new | main.rs:161:13:161:18 | insert | Cookie attribute 'Secure' is not set to true. |
+| main.rs:162:13:162:18 | insert | main.rs:155:13:155:41 | ...::new | main.rs:162:13:162:18 | insert | Cookie attribute 'Secure' is not set to true. |
+| main.rs:163:13:163:18 | insert | main.rs:155:13:155:41 | ...::new | main.rs:163:13:163:18 | insert | Cookie attribute 'Secure' is not set to true. |
+| main.rs:164:13:164:18 | insert | main.rs:155:13:155:41 | ...::new | main.rs:164:13:164:18 | insert | Cookie attribute 'Secure' is not set to true. |
+| main.rs:165:13:165:18 | insert | main.rs:155:13:155:41 | ...::new | main.rs:165:13:165:18 | insert | Cookie attribute 'Secure' is not set to true. |
+| main.rs:166:13:166:18 | insert | main.rs:155:13:155:41 | ...::new | main.rs:166:13:166:18 | insert | Cookie attribute 'Secure' is not set to true. |
+| main.rs:167:13:167:18 | insert | main.rs:155:13:155:41 | ...::new | main.rs:167:13:167:18 | insert | Cookie attribute 'Secure' is not set to true. |
+| main.rs:173:61:173:65 | build | main.rs:173:22:173:34 | ...::build | main.rs:173:61:173:65 | build | Cookie attribute 'Secure' is not set to true. |
+| main.rs:197:55:197:60 | finish | main.rs:197:5:197:39 | ...::build(...) | main.rs:197:55:197:60 | finish | Cookie attribute 'Secure' is not set to true. |
+| main.rs:198:65:198:70 | finish | main.rs:198:5:198:39 | ...::build(...) | main.rs:198:65:198:70 | finish | Cookie attribute 'Secure' is not set to true. |
+| main.rs:202:9:202:11 | add | main.rs:201:5:201:11 | [SSA] cookie1 | main.rs:202:9:202:11 | add | Cookie attribute 'Secure' is not set to true. |
+| main.rs:202:9:202:11 | add | main.rs:201:5:201:11 | cookie1 | main.rs:202:9:202:11 | add | Cookie attribute 'Secure' is not set to true. |
+| main.rs:212:41:212:46 | finish | main.rs:212:5:212:22 | ...::build | main.rs:212:41:212:46 | finish | Cookie attribute 'Secure' is not set to true. |
+| main.rs:215:9:215:11 | add | main.rs:214:19:214:34 | ...::new | main.rs:215:9:215:11 | add | Cookie attribute 'Secure' is not set to true. |
+| main.rs:219:9:219:11 | add | main.rs:218:5:218:11 | [SSA] cookie2 | main.rs:219:9:219:11 | add | Cookie attribute 'Secure' is not set to true. |
+| main.rs:219:9:219:11 | add | main.rs:218:5:218:11 | cookie2 | main.rs:219:9:219:11 | add | Cookie attribute 'Secure' is not set to true. |
+| main.rs:229:9:229:11 | add | main.rs:228:5:228:11 | [SSA] cookie1 | main.rs:229:9:229:11 | add | Cookie attribute 'Secure' is not set to true. |
+| main.rs:229:9:229:11 | add | main.rs:228:5:228:11 | cookie1 | main.rs:229:9:229:11 | add | Cookie attribute 'Secure' is not set to true. |
+| main.rs:242:9:242:41 | ...::new | main.rs:241:29:241:62 | ...::new(...) | main.rs:242:9:242:41 | ...::new | Cookie attribute 'Secure' is not set to true. |
+| main.rs:245:9:245:41 | ...::new | main.rs:244:30:244:63 | ...::new(...) | main.rs:245:9:245:41 | ...::new | Cookie attribute 'Secure' is not set to true. |
+| main.rs:259:59:259:64 | finish | main.rs:259:5:259:43 | ...::build(...) | main.rs:259:59:259:64 | finish | Cookie attribute 'Secure' is not set to true. |
+| main.rs:260:69:260:74 | finish | main.rs:260:5:260:43 | ...::build(...) | main.rs:260:69:260:74 | finish | Cookie attribute 'Secure' is not set to true. |
+| main.rs:264:9:264:11 | add | main.rs:263:5:263:11 | [SSA] cookie1 | main.rs:264:9:264:11 | add | Cookie attribute 'Secure' is not set to true. |
+| main.rs:264:9:264:11 | add | main.rs:263:5:263:11 | cookie1 | main.rs:264:9:264:11 | add | Cookie attribute 'Secure' is not set to true. |
+| main.rs:274:45:274:50 | finish | main.rs:274:5:274:26 | ...::build | main.rs:274:45:274:50 | finish | Cookie attribute 'Secure' is not set to true. |
+| main.rs:277:9:277:11 | add | main.rs:276:19:276:38 | ...::new | main.rs:277:9:277:11 | add | Cookie attribute 'Secure' is not set to true. |
+| main.rs:281:9:281:11 | add | main.rs:280:5:280:11 | [SSA] cookie2 | main.rs:281:9:281:11 | add | Cookie attribute 'Secure' is not set to true. |
+| main.rs:281:9:281:11 | add | main.rs:280:5:280:11 | cookie2 | main.rs:281:9:281:11 | add | Cookie attribute 'Secure' is not set to true. |
+edges
+| main.rs:8:19:8:50 | ...::build(...) | main.rs:8:19:8:64 | ... .secure(...) | provenance | MaD:35 |
+| main.rs:8:19:8:64 | ... .secure(...) | main.rs:8:66:8:70 | build | provenance | MaD:2 Sink:MaD:2 |
+| main.rs:16:19:16:31 | ...::build | main.rs:16:19:16:50 | ...::build(...) | provenance | Src:MaD:15 MaD:15 |
+| main.rs:16:19:16:50 | ...::build(...) | main.rs:16:52:16:56 | build | provenance | MaD:2 Sink:MaD:2 |
+| main.rs:20:5:20:36 | ...::build(...) | main.rs:20:5:20:54 | ... .secure(...) | provenance | MaD:35 |
+| main.rs:20:5:20:54 | ... .secure(...) | main.rs:20:56:20:60 | build | provenance | MaD:2 Sink:MaD:2 |
+| main.rs:21:5:21:36 | ...::build(...) | main.rs:21:5:21:55 | ... .secure(...) | provenance | MaD:35 |
+| main.rs:21:5:21:55 | ... .secure(...) | main.rs:21:57:21:61 | build | provenance | MaD:2 Sink:MaD:2 |
+| main.rs:25:5:25:36 | ...::build(...) | main.rs:25:5:25:52 | ... .secure(...) | provenance | MaD:35 |
+| main.rs:25:5:25:52 | ... .secure(...) | main.rs:25:54:25:58 | build | provenance | MaD:2 Sink:MaD:2 |
+| main.rs:26:5:26:36 | ...::build(...) | main.rs:26:5:26:50 | ... .secure(...) | provenance | MaD:35 |
+| main.rs:26:5:26:50 | ... .secure(...) | main.rs:26:52:26:56 | build | provenance | MaD:2 Sink:MaD:2 |
+| main.rs:27:5:27:36 | ...::build(...) | main.rs:27:5:27:51 | ... .secure(...) | provenance | MaD:35 |
+| main.rs:27:5:27:51 | ... .secure(...) | main.rs:27:53:27:57 | build | provenance | MaD:2 Sink:MaD:2 |
+| main.rs:28:5:28:36 | ...::build(...) | main.rs:28:5:28:60 | ... .secure(...) | provenance | MaD:35 |
+| main.rs:28:5:28:60 | ... .secure(...) | main.rs:28:62:28:66 | build | provenance | MaD:2 Sink:MaD:2 |
+| main.rs:29:5:29:36 | ...::build(...) | main.rs:29:5:29:60 | ... .secure(...) | provenance | MaD:35 |
+| main.rs:29:5:29:60 | ... .secure(...) | main.rs:29:62:29:66 | build | provenance | MaD:2 Sink:MaD:2 |
+| main.rs:33:9:33:40 | ...::build(...) | main.rs:33:9:33:58 | ... .secure(...) | provenance | MaD:35 |
+| main.rs:33:9:33:58 | ... .secure(...) | main.rs:33:60:33:64 | build | provenance | MaD:2 Sink:MaD:2 |
+| main.rs:35:9:35:40 | ...::build(...) | main.rs:35:9:35:58 | ... .secure(...) | provenance | MaD:35 |
+| main.rs:35:9:35:58 | ... .secure(...) | main.rs:35:60:35:64 | build | provenance | MaD:2 Sink:MaD:2 |
+| main.rs:39:5:39:39 | ...::new(...) | main.rs:39:5:39:53 | ... .secure(...) | provenance | MaD:35 |
+| main.rs:39:5:39:53 | ... .secure(...) | main.rs:39:55:39:59 | build | provenance | MaD:2 Sink:MaD:2 |
+| main.rs:40:5:40:50 | ... .expires(...) | main.rs:40:5:40:64 | ... .secure(...) | provenance | MaD:35 |
+| main.rs:40:5:40:64 | ... .secure(...) | main.rs:40:66:40:70 | build | provenance | MaD:2 Sink:MaD:2 |
+| main.rs:41:5:41:79 | ... .max_age(...) | main.rs:41:5:41:93 | ... .secure(...) | provenance | MaD:35 |
+| main.rs:41:5:41:93 | ... .secure(...) | main.rs:41:95:41:99 | build | provenance | MaD:2 Sink:MaD:2 |
+| main.rs:42:5:42:58 | ... .domain(...) | main.rs:42:5:42:72 | ... .secure(...) | provenance | MaD:35 |
+| main.rs:42:5:42:72 | ... .secure(...) | main.rs:42:74:42:78 | build | provenance | MaD:2 Sink:MaD:2 |
+| main.rs:43:5:43:46 | ... .path(...) | main.rs:43:5:43:60 | ... .secure(...) | provenance | MaD:35 |
+| main.rs:43:5:43:60 | ... .secure(...) | main.rs:43:62:43:66 | build | provenance | MaD:2 Sink:MaD:2 |
+| main.rs:44:5:44:52 | ... .http_only(...) | main.rs:44:5:44:66 | ... .secure(...) | provenance | MaD:35 |
+| main.rs:44:5:44:66 | ... .secure(...) | main.rs:44:68:44:72 | build | provenance | MaD:2 Sink:MaD:2 |
+| main.rs:45:5:45:72 | ... .same_site(...) | main.rs:45:5:45:86 | ... .secure(...) | provenance | MaD:35 |
+| main.rs:45:5:45:86 | ... .secure(...) | main.rs:45:88:45:92 | build | provenance | MaD:2 Sink:MaD:2 |
+| main.rs:46:5:46:48 | ... .permanent() | main.rs:46:5:46:62 | ... .secure(...) | provenance | MaD:35 |
+| main.rs:46:5:46:62 | ... .secure(...) | main.rs:46:64:46:68 | build | provenance | MaD:2 Sink:MaD:2 |
+| main.rs:47:5:47:46 | ... .removal() | main.rs:47:5:47:60 | ... .secure(...) | provenance | MaD:35 |
+| main.rs:47:5:47:60 | ... .secure(...) | main.rs:47:62:47:66 | build | provenance | MaD:2 Sink:MaD:2 |
+| main.rs:48:5:48:36 | ...::build(...) | main.rs:48:5:48:50 | ... .secure(...) | provenance | MaD:35 |
+| main.rs:48:5:48:50 | ... .secure(...) | main.rs:48:52:48:57 | finish | provenance | MaD:3 Sink:MaD:3 |
+| main.rs:49:5:49:25 | ...::build(...) | main.rs:49:5:49:39 | ... .secure(...) | provenance | MaD:35 |
+| main.rs:49:5:49:39 | ... .secure(...) | main.rs:49:41:49:45 | build | provenance | MaD:2 Sink:MaD:2 |
+| main.rs:50:5:50:40 | ...::build(...) | main.rs:50:5:50:54 | ... .secure(...) | provenance | MaD:35 |
+| main.rs:50:5:50:54 | ... .secure(...) | main.rs:50:56:50:60 | build | provenance | MaD:2 Sink:MaD:2 |
+| main.rs:53:5:53:49 | ... .secure(...) | main.rs:53:5:53:63 | ... .secure(...) | provenance | MaD:35 |
+| main.rs:53:5:53:63 | ... .secure(...) | main.rs:53:65:53:69 | build | provenance | MaD:2 Sink:MaD:2 |
+| main.rs:58:9:58:13 | mut a | main.rs:59:13:59:13 | a | provenance |  |
+| main.rs:58:9:58:13 | mut a | main.rs:59:13:59:21 | a.clone() | provenance | MaD:18 |
+| main.rs:58:9:58:13 | mut a | main.rs:60:22:60:22 | a | provenance |  |
+| main.rs:58:9:58:13 | mut a | main.rs:60:22:60:30 | a.clone() | provenance | MaD:18 |
+| main.rs:58:17:58:27 | ...::new | main.rs:58:17:58:44 | ...::new(...) | provenance | Src:MaD:17 MaD:17 |
+| main.rs:58:17:58:44 | ...::new(...) | main.rs:58:9:58:13 | mut a | provenance |  |
+| main.rs:59:13:59:13 | a | main.rs:59:13:59:21 | a.clone() | provenance | MaD:18 |
+| main.rs:59:13:59:21 | a.clone() | main.rs:59:9:59:11 | add | provenance | MaD:4 Sink:MaD:4 |
+| main.rs:60:22:60:22 | a | main.rs:60:22:60:30 | a.clone() | provenance | MaD:18 |
+| main.rs:60:22:60:30 | a.clone() | main.rs:60:9:60:20 | add_original | provenance | MaD:5 Sink:MaD:5 |
+| main.rs:63:5:63:5 | [SSA] a | main.rs:64:13:64:13 | a | provenance |  |
+| main.rs:63:5:63:5 | [SSA] a | main.rs:64:13:64:21 | a.clone() | provenance | MaD:18 |
+| main.rs:63:5:63:5 | [SSA] a | main.rs:70:29:70:29 | a | provenance |  |
+| main.rs:63:5:63:5 | [SSA] a | main.rs:70:29:70:37 | a.clone() | provenance | MaD:18 |
+| main.rs:63:5:63:5 | [SSA] a | main.rs:79:30:79:30 | a | provenance |  |
+| main.rs:63:5:63:5 | [SSA] a | main.rs:79:30:79:38 | a.clone() | provenance | MaD:18 |
+| main.rs:63:5:63:5 | a | main.rs:64:13:64:13 | a | provenance |  |
+| main.rs:63:5:63:5 | a | main.rs:64:13:64:21 | a.clone() | provenance | MaD:18 |
+| main.rs:63:5:63:5 | a | main.rs:70:29:70:29 | a | provenance |  |
+| main.rs:63:5:63:5 | a | main.rs:70:29:70:37 | a.clone() | provenance | MaD:18 |
+| main.rs:63:5:63:5 | a | main.rs:79:30:79:30 | a | provenance |  |
+| main.rs:63:5:63:5 | a | main.rs:79:30:79:38 | a.clone() | provenance | MaD:18 |
+| main.rs:64:13:64:13 | a | main.rs:64:13:64:21 | a.clone() | provenance | MaD:18 |
+| main.rs:64:13:64:21 | a.clone() | main.rs:64:9:64:11 | add | provenance | MaD:4 Sink:MaD:4 |
+| main.rs:68:9:68:13 | mut b | main.rs:69:20:69:20 | b | provenance |  |
+| main.rs:68:9:68:13 | mut b | main.rs:69:20:69:28 | b.clone() | provenance | MaD:18 |
+| main.rs:68:17:68:29 | ...::named | main.rs:68:17:68:37 | ...::named(...) | provenance | Src:MaD:16 MaD:16 |
+| main.rs:68:17:68:37 | ...::named(...) | main.rs:68:9:68:13 | mut b | provenance |  |
+| main.rs:69:20:69:20 | b | main.rs:69:20:69:28 | b.clone() | provenance | MaD:18 |
+| main.rs:69:20:69:28 | b.clone() | main.rs:69:16:69:18 | add | provenance | MaD:8 Sink:MaD:8 |
+| main.rs:70:29:70:29 | a | main.rs:70:29:70:37 | a.clone() | provenance | MaD:18 |
+| main.rs:70:29:70:37 | a.clone() | main.rs:70:16:70:27 | add_original | provenance | MaD:9 Sink:MaD:9 |
+| main.rs:71:5:71:5 | [SSA] b | main.rs:72:20:72:20 | b | provenance |  |
+| main.rs:71:5:71:5 | [SSA] b | main.rs:72:20:72:28 | b.clone() | provenance | MaD:18 |
+| main.rs:71:5:71:5 | b | main.rs:72:20:72:20 | b | provenance |  |
+| main.rs:71:5:71:5 | b | main.rs:72:20:72:28 | b.clone() | provenance | MaD:18 |
+| main.rs:72:20:72:20 | b | main.rs:72:20:72:28 | b.clone() | provenance | MaD:18 |
+| main.rs:72:20:72:28 | b.clone() | main.rs:72:16:72:18 | add | provenance | MaD:8 Sink:MaD:8 |
+| main.rs:77:9:77:13 | mut c | main.rs:78:21:78:21 | c | provenance |  |
+| main.rs:77:9:77:13 | mut c | main.rs:78:21:78:29 | c.clone() | provenance | MaD:18 |
+| main.rs:77:9:77:13 | mut c | main.rs:83:21:83:21 | c | provenance |  |
+| main.rs:77:9:77:13 | mut c | main.rs:83:21:83:29 | c.clone() | provenance | MaD:18 |
+| main.rs:77:17:77:28 | ...::from | main.rs:77:17:77:36 | ...::from(...) | provenance | Src:MaD:14 MaD:14 |
+| main.rs:77:17:77:36 | ...::from(...) | main.rs:77:9:77:13 | mut c | provenance |  |
+| main.rs:78:21:78:21 | c | main.rs:78:21:78:29 | c.clone() | provenance | MaD:18 |
+| main.rs:78:21:78:29 | c.clone() | main.rs:78:17:78:19 | add | provenance | MaD:6 Sink:MaD:6 |
+| main.rs:79:30:79:30 | a | main.rs:79:30:79:38 | a.clone() | provenance | MaD:18 |
+| main.rs:79:30:79:38 | a.clone() | main.rs:79:17:79:28 | add_original | provenance | MaD:7 Sink:MaD:7 |
+| main.rs:83:21:83:21 | c | main.rs:83:21:83:29 | c.clone() | provenance | MaD:18 |
+| main.rs:83:21:83:29 | c.clone() | main.rs:83:17:83:19 | add | provenance | MaD:6 Sink:MaD:6 |
+| main.rs:87:9:87:13 | mut d | main.rs:88:13:88:13 | d | provenance |  |
+| main.rs:87:9:87:13 | mut d | main.rs:88:13:88:21 | d.clone() | provenance | MaD:18 |
+| main.rs:87:9:87:13 | mut d | main.rs:94:13:94:13 | d | provenance |  |
+| main.rs:87:9:87:13 | mut d | main.rs:94:13:94:21 | d.clone() | provenance | MaD:18 |
+| main.rs:87:17:87:28 | ...::from | main.rs:87:17:87:36 | ...::from(...) | provenance | Src:MaD:14 MaD:14 |
+| main.rs:87:17:87:36 | ...::from(...) | main.rs:87:9:87:13 | mut d | provenance |  |
+| main.rs:88:13:88:13 | d | main.rs:88:13:88:21 | d.clone() | provenance | MaD:18 |
+| main.rs:88:13:88:21 | d.clone() | main.rs:88:9:88:11 | add | provenance | MaD:4 Sink:MaD:4 |
+| main.rs:94:13:94:13 | d | main.rs:94:13:94:21 | d.clone() | provenance | MaD:18 |
+| main.rs:94:13:94:21 | d.clone() | main.rs:94:9:94:11 | add | provenance | MaD:4 Sink:MaD:4 |
+| main.rs:114:5:114:17 | ...::build | main.rs:114:5:114:36 | ...::build(...) | provenance | Src:MaD:15 MaD:15 |
+| main.rs:114:5:114:36 | ...::build(...) | main.rs:114:5:114:54 | ... .partitioned(...) | provenance | MaD:33 |
+| main.rs:114:5:114:54 | ... .partitioned(...) | main.rs:114:56:114:60 | build | provenance | MaD:2 Sink:MaD:2 |
+| main.rs:122:9:122:9 | a | main.rs:123:20:123:20 | a | provenance |  |
+| main.rs:122:9:122:9 | a | main.rs:123:20:123:28 | a.clone() | provenance | MaD:18 |
+| main.rs:122:13:122:41 | ...::new | main.rs:122:13:122:58 | ...::new(...) | provenance | Src:MaD:13 MaD:13 |
+| main.rs:122:13:122:58 | ...::new(...) | main.rs:122:9:122:9 | a | provenance |  |
+| main.rs:123:20:123:20 | a | main.rs:123:20:123:28 | a.clone() | provenance | MaD:18 |
+| main.rs:123:20:123:28 | a.clone() | main.rs:123:13:123:18 | insert | provenance | MaD:1 Sink:MaD:1 |
+| main.rs:130:9:130:9 | c | main.rs:131:20:131:20 | c | provenance |  |
+| main.rs:130:9:130:9 | c | main.rs:131:20:131:28 | c.clone() | provenance | MaD:18 |
+| main.rs:130:9:130:9 | c | main.rs:134:13:134:35 | c.set_partitioned(...) | provenance | MaD:25 |
+| main.rs:130:13:130:13 | b | main.rs:130:13:130:31 | b.set_secure(...) | provenance | MaD:28 |
+| main.rs:130:13:130:31 | b.set_secure(...) | main.rs:130:9:130:9 | c | provenance |  |
+| main.rs:131:20:131:20 | c | main.rs:131:20:131:28 | c.clone() | provenance | MaD:18 |
+| main.rs:131:20:131:28 | c.clone() | main.rs:131:13:131:18 | insert | provenance | MaD:1 Sink:MaD:1 |
+| main.rs:134:9:134:9 | d | main.rs:135:20:135:20 | d | provenance |  |
+| main.rs:134:9:134:9 | d | main.rs:135:20:135:28 | d.clone() | provenance | MaD:18 |
+| main.rs:134:13:134:35 | c.set_partitioned(...) | main.rs:134:9:134:9 | d | provenance |  |
+| main.rs:135:20:135:20 | d | main.rs:135:20:135:28 | d.clone() | provenance | MaD:18 |
+| main.rs:135:20:135:28 | d.clone() | main.rs:135:13:135:18 | insert | provenance | MaD:1 Sink:MaD:1 |
+| main.rs:146:9:146:9 | g | main.rs:147:20:147:20 | g | provenance |  |
+| main.rs:146:9:146:9 | g | main.rs:147:20:147:28 | g.clone() | provenance | MaD:18 |
+| main.rs:146:13:146:13 | f | main.rs:146:13:146:31 | f.set_secure(...) | provenance | MaD:28 |
+| main.rs:146:13:146:31 | f.set_secure(...) | main.rs:146:9:146:9 | g | provenance |  |
+| main.rs:147:20:147:20 | g | main.rs:147:20:147:28 | g.clone() | provenance | MaD:18 |
+| main.rs:147:20:147:28 | g.clone() | main.rs:147:13:147:18 | insert | provenance | MaD:1 Sink:MaD:1 |
+| main.rs:151:9:151:9 | h | main.rs:152:20:152:20 | h | provenance |  |
+| main.rs:151:13:151:42 | ...::from | main.rs:151:13:151:61 | ...::from(...) | provenance | Src:MaD:12 MaD:12 |
+| main.rs:151:13:151:61 | ...::from(...) | main.rs:151:9:151:9 | h | provenance |  |
+| main.rs:152:20:152:20 | h | main.rs:152:13:152:18 | insert | provenance | MaD:1 Sink:MaD:1 |
+| main.rs:155:9:155:9 | i | main.rs:156:20:156:20 | i | provenance |  |
+| main.rs:155:9:155:9 | i | main.rs:156:20:156:28 | i.clone() | provenance | MaD:18 |
+| main.rs:155:9:155:9 | i | main.rs:157:20:157:20 | i | provenance |  |
+| main.rs:155:9:155:9 | i | main.rs:157:20:157:28 | i.clone() | provenance | MaD:18 |
+| main.rs:155:9:155:9 | i | main.rs:158:20:158:20 | i | provenance |  |
+| main.rs:155:9:155:9 | i | main.rs:158:20:158:28 | i.clone() | provenance | MaD:18 |
+| main.rs:155:9:155:9 | i | main.rs:159:20:159:20 | i | provenance |  |
+| main.rs:155:9:155:9 | i | main.rs:159:20:159:28 | i.clone() | provenance | MaD:18 |
+| main.rs:155:9:155:9 | i | main.rs:160:20:160:20 | i | provenance |  |
+| main.rs:155:9:155:9 | i | main.rs:160:20:160:28 | i.clone() | provenance | MaD:18 |
+| main.rs:155:9:155:9 | i | main.rs:161:20:161:20 | i | provenance |  |
+| main.rs:155:9:155:9 | i | main.rs:161:20:161:28 | i.clone() | provenance | MaD:18 |
+| main.rs:155:9:155:9 | i | main.rs:162:20:162:20 | i | provenance |  |
+| main.rs:155:9:155:9 | i | main.rs:162:20:162:28 | i.clone() | provenance | MaD:18 |
+| main.rs:155:9:155:9 | i | main.rs:163:20:163:20 | i | provenance |  |
+| main.rs:155:9:155:9 | i | main.rs:163:20:163:28 | i.clone() | provenance | MaD:18 |
+| main.rs:155:9:155:9 | i | main.rs:164:20:164:20 | i | provenance |  |
+| main.rs:155:9:155:9 | i | main.rs:164:20:164:28 | i.clone() | provenance | MaD:18 |
+| main.rs:155:9:155:9 | i | main.rs:165:20:165:20 | i | provenance |  |
+| main.rs:155:9:155:9 | i | main.rs:165:20:165:28 | i.clone() | provenance | MaD:18 |
+| main.rs:155:9:155:9 | i | main.rs:166:20:166:20 | i | provenance |  |
+| main.rs:155:9:155:9 | i | main.rs:166:20:166:28 | i.clone() | provenance | MaD:18 |
+| main.rs:155:9:155:9 | i | main.rs:167:20:167:20 | i | provenance |  |
+| main.rs:155:9:155:9 | i | main.rs:167:20:167:28 | i.clone() | provenance | MaD:18 |
+| main.rs:155:13:155:41 | ...::new | main.rs:155:13:155:58 | ...::new(...) | provenance | Src:MaD:13 MaD:13 |
+| main.rs:155:13:155:58 | ...::new(...) | main.rs:155:9:155:9 | i | provenance |  |
+| main.rs:156:20:156:20 | i | main.rs:156:20:156:28 | i.clone() | provenance | MaD:18 |
+| main.rs:156:20:156:28 | i.clone() | main.rs:156:20:156:46 | ... .set_name(...) | provenance | MaD:24 |
+| main.rs:156:20:156:46 | ... .set_name(...) | main.rs:156:13:156:18 | insert | provenance | MaD:1 Sink:MaD:1 |
+| main.rs:157:20:157:20 | i | main.rs:157:20:157:28 | i.clone() | provenance | MaD:18 |
+| main.rs:157:20:157:28 | i.clone() | main.rs:157:20:157:48 | ... .set_value(...) | provenance | MaD:29 |
+| main.rs:157:20:157:48 | ... .set_value(...) | main.rs:157:13:157:18 | insert | provenance | MaD:1 Sink:MaD:1 |
+| main.rs:158:20:158:20 | i | main.rs:158:20:158:28 | i.clone() | provenance | MaD:18 |
+| main.rs:158:20:158:28 | i.clone() | main.rs:158:20:158:48 | ... .set_http_only(...) | provenance | MaD:22 |
+| main.rs:158:20:158:48 | ... .set_http_only(...) | main.rs:158:13:158:18 | insert | provenance | MaD:1 Sink:MaD:1 |
+| main.rs:159:20:159:20 | i | main.rs:159:20:159:28 | i.clone() | provenance | MaD:18 |
+| main.rs:159:20:159:28 | i.clone() | main.rs:159:20:159:70 | ... .set_same_site(...) | provenance | MaD:27 |
+| main.rs:159:20:159:70 | ... .set_same_site(...) | main.rs:159:13:159:18 | insert | provenance | MaD:1 Sink:MaD:1 |
+| main.rs:160:20:160:20 | i | main.rs:160:20:160:28 | i.clone() | provenance | MaD:18 |
+| main.rs:160:20:160:28 | i.clone() | main.rs:160:20:160:46 | ... .set_max_age(...) | provenance | MaD:23 |
+| main.rs:160:20:160:46 | ... .set_max_age(...) | main.rs:160:13:160:18 | insert | provenance | MaD:1 Sink:MaD:1 |
+| main.rs:161:20:161:20 | i | main.rs:161:20:161:28 | i.clone() | provenance | MaD:18 |
+| main.rs:161:20:161:28 | i.clone() | main.rs:161:20:161:42 | ... .set_path(...) | provenance | MaD:26 |
+| main.rs:161:20:161:42 | ... .set_path(...) | main.rs:161:13:161:18 | insert | provenance | MaD:1 Sink:MaD:1 |
+| main.rs:162:20:162:20 | i | main.rs:162:20:162:28 | i.clone() | provenance | MaD:18 |
+| main.rs:162:20:162:28 | i.clone() | main.rs:162:20:162:41 | ... .unset_path() | provenance | MaD:32 |
+| main.rs:162:20:162:41 | ... .unset_path() | main.rs:162:13:162:18 | insert | provenance | MaD:1 Sink:MaD:1 |
+| main.rs:163:20:163:20 | i | main.rs:163:20:163:28 | i.clone() | provenance | MaD:18 |
+| main.rs:163:20:163:28 | i.clone() | main.rs:163:20:163:54 | ... .set_domain(...) | provenance | MaD:20 |
+| main.rs:163:20:163:54 | ... .set_domain(...) | main.rs:163:13:163:18 | insert | provenance | MaD:1 Sink:MaD:1 |
+| main.rs:164:20:164:20 | i | main.rs:164:20:164:28 | i.clone() | provenance | MaD:18 |
+| main.rs:164:20:164:28 | i.clone() | main.rs:164:20:164:43 | ... .unset_domain() | provenance | MaD:30 |
+| main.rs:164:20:164:43 | ... .unset_domain() | main.rs:164:13:164:18 | insert | provenance | MaD:1 Sink:MaD:1 |
+| main.rs:165:20:165:20 | i | main.rs:165:20:165:28 | i.clone() | provenance | MaD:18 |
+| main.rs:165:20:165:28 | i.clone() | main.rs:165:20:165:46 | ... .set_expires(...) | provenance | MaD:21 |
+| main.rs:165:20:165:46 | ... .set_expires(...) | main.rs:165:13:165:18 | insert | provenance | MaD:1 Sink:MaD:1 |
+| main.rs:166:20:166:20 | i | main.rs:166:20:166:28 | i.clone() | provenance | MaD:18 |
+| main.rs:166:20:166:28 | i.clone() | main.rs:166:20:166:44 | ... .unset_expires() | provenance | MaD:31 |
+| main.rs:166:20:166:44 | ... .unset_expires() | main.rs:166:13:166:18 | insert | provenance | MaD:1 Sink:MaD:1 |
+| main.rs:167:20:167:20 | i | main.rs:167:20:167:28 | i.clone() | provenance | MaD:18 |
+| main.rs:167:20:167:28 | i.clone() | main.rs:167:20:167:45 | ... .make_permanent() | provenance | MaD:19 |
+| main.rs:167:20:167:45 | ... .make_permanent() | main.rs:167:13:167:18 | insert | provenance | MaD:1 Sink:MaD:1 |
+| main.rs:173:22:173:34 | ...::build | main.rs:173:22:173:59 | ...::build(...) | provenance | Src:MaD:15 MaD:15 |
+| main.rs:173:22:173:59 | ...::build(...) | main.rs:173:61:173:65 | build | provenance | MaD:2 Sink:MaD:2 |
+| main.rs:197:5:197:39 | ...::build(...) | main.rs:197:5:197:53 | ... .secure(...) | provenance | MaD:35 |
+| main.rs:197:5:197:53 | ... .secure(...) | main.rs:197:55:197:60 | finish | provenance | MaD:3 Sink:MaD:3 |
+| main.rs:198:5:198:39 | ...::build(...) | main.rs:198:5:198:53 | ... .secure(...) | provenance | MaD:35 |
+| main.rs:198:5:198:53 | ... .secure(...) | main.rs:198:5:198:63 | ... .path(...) | provenance | MaD:34 |
+| main.rs:198:5:198:63 | ... .path(...) | main.rs:198:65:198:70 | finish | provenance | MaD:3 Sink:MaD:3 |
+| main.rs:201:5:201:11 | [SSA] cookie1 | main.rs:202:13:202:19 | cookie1 | provenance |  |
+| main.rs:201:5:201:11 | [SSA] cookie1 | main.rs:202:13:202:27 | cookie1.clone() | provenance | MaD:18 |
+| main.rs:201:5:201:11 | cookie1 | main.rs:202:13:202:19 | cookie1 | provenance |  |
+| main.rs:201:5:201:11 | cookie1 | main.rs:202:13:202:27 | cookie1.clone() | provenance | MaD:18 |
+| main.rs:202:13:202:19 | cookie1 | main.rs:202:13:202:27 | cookie1.clone() | provenance | MaD:18 |
+| main.rs:202:13:202:27 | cookie1.clone() | main.rs:202:9:202:11 | add | provenance | MaD:4 Sink:MaD:4 |
+| main.rs:212:5:212:22 | ...::build | main.rs:212:5:212:39 | ...::build(...) | provenance | Src:MaD:15 MaD:15 |
+| main.rs:212:5:212:39 | ...::build(...) | main.rs:212:41:212:46 | finish | provenance | MaD:3 Sink:MaD:3 |
+| main.rs:214:9:214:15 | cookie3 | main.rs:215:13:215:19 | cookie3 | provenance |  |
+| main.rs:214:9:214:15 | cookie3 | main.rs:215:13:215:27 | cookie3.clone() | provenance | MaD:18 |
+| main.rs:214:19:214:34 | ...::new | main.rs:214:19:214:51 | ...::new(...) | provenance | Src:MaD:17 MaD:17 |
+| main.rs:214:19:214:51 | ...::new(...) | main.rs:214:9:214:15 | cookie3 | provenance |  |
+| main.rs:215:13:215:19 | cookie3 | main.rs:215:13:215:27 | cookie3.clone() | provenance | MaD:18 |
+| main.rs:215:13:215:27 | cookie3.clone() | main.rs:215:9:215:11 | add | provenance | MaD:4 Sink:MaD:4 |
+| main.rs:218:5:218:11 | [SSA] cookie2 | main.rs:219:13:219:19 | cookie2 | provenance |  |
+| main.rs:218:5:218:11 | [SSA] cookie2 | main.rs:219:13:219:27 | cookie2.clone() | provenance | MaD:18 |
+| main.rs:218:5:218:11 | cookie2 | main.rs:219:13:219:19 | cookie2 | provenance |  |
+| main.rs:218:5:218:11 | cookie2 | main.rs:219:13:219:27 | cookie2.clone() | provenance | MaD:18 |
+| main.rs:219:13:219:19 | cookie2 | main.rs:219:13:219:27 | cookie2.clone() | provenance | MaD:18 |
+| main.rs:219:13:219:27 | cookie2.clone() | main.rs:219:9:219:11 | add | provenance | MaD:4 Sink:MaD:4 |
+| main.rs:228:5:228:11 | [SSA] cookie1 | main.rs:229:13:229:19 | cookie1 | provenance |  |
+| main.rs:228:5:228:11 | [SSA] cookie1 | main.rs:229:13:229:27 | cookie1.clone() | provenance | MaD:18 |
+| main.rs:228:5:228:11 | cookie1 | main.rs:229:13:229:19 | cookie1 | provenance |  |
+| main.rs:228:5:228:11 | cookie1 | main.rs:229:13:229:19 | cookie1 | provenance | MaD:39 |
+| main.rs:228:5:228:11 | cookie1 | main.rs:229:13:229:27 | cookie1.clone() | provenance | MaD:39 |
+| main.rs:228:5:228:11 | cookie1 | main.rs:229:13:229:27 | cookie1.clone() | provenance | MaD:18 |
+| main.rs:229:13:229:19 | cookie1 | main.rs:229:13:229:27 | cookie1.clone() | provenance | MaD:18 |
+| main.rs:229:13:229:27 | cookie1.clone() | main.rs:229:9:229:11 | add | provenance | MaD:11 Sink:MaD:11 |
+| main.rs:241:9:241:25 | cookie_config_bad | main.rs:242:43:242:59 | cookie_config_bad | provenance |  |
+| main.rs:241:29:241:62 | ...::new(...) | main.rs:241:29:241:76 | ... .secure(...) | provenance | MaD:38 |
+| main.rs:241:29:241:76 | ... .secure(...) | main.rs:241:9:241:25 | cookie_config_bad | provenance |  |
+| main.rs:242:43:242:59 | cookie_config_bad | main.rs:242:9:242:41 | ...::new | provenance | MaD:10 Sink:MaD:10 |
+| main.rs:244:9:244:26 | cookie_config_bad2 | main.rs:245:43:245:60 | cookie_config_bad2 | provenance |  |
+| main.rs:244:30:244:63 | ...::new(...) | main.rs:244:30:244:77 | ... .secure(...) | provenance | MaD:38 |
+| main.rs:244:30:244:77 | ... .secure(...) | main.rs:244:30:244:90 | ... .name(...) | provenance | MaD:36 |
+| main.rs:244:30:244:90 | ... .name(...) | main.rs:244:30:244:100 | ... .path(...) | provenance | MaD:37 |
+| main.rs:244:30:244:100 | ... .path(...) | main.rs:244:9:244:26 | cookie_config_bad2 | provenance |  |
+| main.rs:245:43:245:60 | cookie_config_bad2 | main.rs:245:9:245:41 | ...::new | provenance | MaD:10 Sink:MaD:10 |
+| main.rs:259:5:259:43 | ...::build(...) | main.rs:259:5:259:57 | ... .secure(...) | provenance | MaD:35 |
+| main.rs:259:5:259:57 | ... .secure(...) | main.rs:259:59:259:64 | finish | provenance | MaD:3 Sink:MaD:3 |
+| main.rs:260:5:260:43 | ...::build(...) | main.rs:260:5:260:57 | ... .secure(...) | provenance | MaD:35 |
+| main.rs:260:5:260:57 | ... .secure(...) | main.rs:260:5:260:67 | ... .path(...) | provenance | MaD:34 |
+| main.rs:260:5:260:67 | ... .path(...) | main.rs:260:69:260:74 | finish | provenance | MaD:3 Sink:MaD:3 |
+| main.rs:263:5:263:11 | [SSA] cookie1 | main.rs:264:13:264:19 | cookie1 | provenance |  |
+| main.rs:263:5:263:11 | [SSA] cookie1 | main.rs:264:13:264:27 | cookie1.clone() | provenance | MaD:18 |
+| main.rs:263:5:263:11 | cookie1 | main.rs:264:13:264:19 | cookie1 | provenance |  |
+| main.rs:263:5:263:11 | cookie1 | main.rs:264:13:264:27 | cookie1.clone() | provenance | MaD:18 |
+| main.rs:264:13:264:19 | cookie1 | main.rs:264:13:264:27 | cookie1.clone() | provenance | MaD:18 |
+| main.rs:264:13:264:27 | cookie1.clone() | main.rs:264:9:264:11 | add | provenance | MaD:4 Sink:MaD:4 |
+| main.rs:274:5:274:26 | ...::build | main.rs:274:5:274:43 | ...::build(...) | provenance | Src:MaD:15 MaD:15 |
+| main.rs:274:5:274:43 | ...::build(...) | main.rs:274:45:274:50 | finish | provenance | MaD:3 Sink:MaD:3 |
+| main.rs:276:9:276:15 | cookie3 | main.rs:277:13:277:19 | cookie3 | provenance |  |
+| main.rs:276:9:276:15 | cookie3 | main.rs:277:13:277:27 | cookie3.clone() | provenance | MaD:18 |
+| main.rs:276:19:276:38 | ...::new | main.rs:276:19:276:55 | ...::new(...) | provenance | Src:MaD:17 MaD:17 |
+| main.rs:276:19:276:55 | ...::new(...) | main.rs:276:9:276:15 | cookie3 | provenance |  |
+| main.rs:277:13:277:19 | cookie3 | main.rs:277:13:277:27 | cookie3.clone() | provenance | MaD:18 |
+| main.rs:277:13:277:27 | cookie3.clone() | main.rs:277:9:277:11 | add | provenance | MaD:4 Sink:MaD:4 |
+| main.rs:280:5:280:11 | [SSA] cookie2 | main.rs:281:13:281:19 | cookie2 | provenance |  |
+| main.rs:280:5:280:11 | [SSA] cookie2 | main.rs:281:13:281:27 | cookie2.clone() | provenance | MaD:18 |
+| main.rs:280:5:280:11 | cookie2 | main.rs:281:13:281:19 | cookie2 | provenance |  |
+| main.rs:280:5:280:11 | cookie2 | main.rs:281:13:281:27 | cookie2.clone() | provenance | MaD:18 |
+| main.rs:281:13:281:19 | cookie2 | main.rs:281:13:281:27 | cookie2.clone() | provenance | MaD:18 |
+| main.rs:281:13:281:27 | cookie2.clone() | main.rs:281:9:281:11 | add | provenance | MaD:4 Sink:MaD:4 |
+models
+| 1 | Sink: <biscotti::response_cookies::ResponseCookies>::insert; Argument[0]; cookie-use |
+| 2 | Sink: <cookie::builder::CookieBuilder>::build; Argument[self]; cookie-use |
+| 3 | Sink: <cookie::builder::CookieBuilder>::finish; Argument[self]; cookie-use |
+| 4 | Sink: <cookie::jar::CookieJar>::add; Argument[0]; cookie-use |
+| 5 | Sink: <cookie::jar::CookieJar>::add_original; Argument[0]; cookie-use |
+| 6 | Sink: <cookie::secure::private::PrivateJar>::add; Argument[0]; cookie-use |
+| 7 | Sink: <cookie::secure::private::PrivateJar>::add_original; Argument[0]; cookie-use |
+| 8 | Sink: <cookie::secure::signed::SignedJar>::add; Argument[0]; cookie-use |
+| 9 | Sink: <cookie::secure::signed::SignedJar>::add_original; Argument[0]; cookie-use |
+| 10 | Sink: <poem::session::server_session::ServerSession>::new; Argument[0]; cookie-use |
+| 11 | Sink: <poem::web::cookie::CookieJar>::add; Argument[0]; cookie-use |
+| 12 | Source: <biscotti::response_cookie::ResponseCookie as core::convert::From>::from; ReturnValue; cookie-create |
+| 13 | Source: <biscotti::response_cookie::ResponseCookie>::new; ReturnValue; cookie-create |
+| 14 | Source: <cookie::Cookie as core::convert::From>::from; ReturnValue; cookie-create |
+| 15 | Source: <cookie::Cookie>::build; ReturnValue; cookie-create |
+| 16 | Source: <cookie::Cookie>::named; ReturnValue; cookie-create |
+| 17 | Source: <cookie::Cookie>::new; ReturnValue; cookie-create |
+| 18 | Summary: <_ as core::clone::Clone>::clone; Argument[self].Reference; ReturnValue; value |
+| 19 | Summary: <biscotti::response_cookie::ResponseCookie>::make_permanent; Argument[self]; ReturnValue; taint |
+| 20 | Summary: <biscotti::response_cookie::ResponseCookie>::set_domain; Argument[self]; ReturnValue; taint |
+| 21 | Summary: <biscotti::response_cookie::ResponseCookie>::set_expires; Argument[self]; ReturnValue; taint |
+| 22 | Summary: <biscotti::response_cookie::ResponseCookie>::set_http_only; Argument[self]; ReturnValue; taint |
+| 23 | Summary: <biscotti::response_cookie::ResponseCookie>::set_max_age; Argument[self]; ReturnValue; taint |
+| 24 | Summary: <biscotti::response_cookie::ResponseCookie>::set_name; Argument[self]; ReturnValue; taint |
+| 25 | Summary: <biscotti::response_cookie::ResponseCookie>::set_partitioned; Argument[self].OptionalBarrier[cookie-partitioned-arg0]; ReturnValue; taint |
+| 26 | Summary: <biscotti::response_cookie::ResponseCookie>::set_path; Argument[self]; ReturnValue; taint |
+| 27 | Summary: <biscotti::response_cookie::ResponseCookie>::set_same_site; Argument[self]; ReturnValue; taint |
+| 28 | Summary: <biscotti::response_cookie::ResponseCookie>::set_secure; Argument[self].OptionalBarrier[cookie-secure-arg0]; ReturnValue; taint |
+| 29 | Summary: <biscotti::response_cookie::ResponseCookie>::set_value; Argument[self]; ReturnValue; taint |
+| 30 | Summary: <biscotti::response_cookie::ResponseCookie>::unset_domain; Argument[self]; ReturnValue; taint |
+| 31 | Summary: <biscotti::response_cookie::ResponseCookie>::unset_expires; Argument[self]; ReturnValue; taint |
+| 32 | Summary: <biscotti::response_cookie::ResponseCookie>::unset_path; Argument[self]; ReturnValue; taint |
+| 33 | Summary: <cookie::builder::CookieBuilder>::partitioned; Argument[self].OptionalBarrier[cookie-partitioned-arg0]; ReturnValue; taint |
+| 34 | Summary: <cookie::builder::CookieBuilder>::path; Argument[self]; ReturnValue; taint |
+| 35 | Summary: <cookie::builder::CookieBuilder>::secure; Argument[self].OptionalBarrier[cookie-secure-arg0]; ReturnValue; taint |
+| 36 | Summary: <poem::session::cookie_config::CookieConfig>::name; Argument[self]; ReturnValue; taint |
+| 37 | Summary: <poem::session::cookie_config::CookieConfig>::path; Argument[self]; ReturnValue; taint |
+| 38 | Summary: <poem::session::cookie_config::CookieConfig>::secure; Argument[self].OptionalBarrier[cookie-secure-arg0]; ReturnValue; taint |
+| 39 | Summary: <poem::web::cookie::Cookie>::set_secure; Argument[self].OptionalBarrier[cookie-secure-arg0]; Argument[self]; taint |
+nodes
+| main.rs:8:19:8:50 | ...::build(...) | semmle.label | ...::build(...) |
+| main.rs:8:19:8:64 | ... .secure(...) | semmle.label | ... .secure(...) |
+| main.rs:8:66:8:70 | build | semmle.label | build |
+| main.rs:16:19:16:31 | ...::build | semmle.label | ...::build |
+| main.rs:16:19:16:50 | ...::build(...) | semmle.label | ...::build(...) |
+| main.rs:16:52:16:56 | build | semmle.label | build |
+| main.rs:20:5:20:36 | ...::build(...) | semmle.label | ...::build(...) |
+| main.rs:20:5:20:54 | ... .secure(...) | semmle.label | ... .secure(...) |
+| main.rs:20:56:20:60 | build | semmle.label | build |
+| main.rs:21:5:21:36 | ...::build(...) | semmle.label | ...::build(...) |
+| main.rs:21:5:21:55 | ... .secure(...) | semmle.label | ... .secure(...) |
+| main.rs:21:57:21:61 | build | semmle.label | build |
+| main.rs:25:5:25:36 | ...::build(...) | semmle.label | ...::build(...) |
+| main.rs:25:5:25:52 | ... .secure(...) | semmle.label | ... .secure(...) |
+| main.rs:25:54:25:58 | build | semmle.label | build |
+| main.rs:26:5:26:36 | ...::build(...) | semmle.label | ...::build(...) |
+| main.rs:26:5:26:50 | ... .secure(...) | semmle.label | ... .secure(...) |
+| main.rs:26:52:26:56 | build | semmle.label | build |
+| main.rs:27:5:27:36 | ...::build(...) | semmle.label | ...::build(...) |
+| main.rs:27:5:27:51 | ... .secure(...) | semmle.label | ... .secure(...) |
+| main.rs:27:53:27:57 | build | semmle.label | build |
+| main.rs:28:5:28:36 | ...::build(...) | semmle.label | ...::build(...) |
+| main.rs:28:5:28:60 | ... .secure(...) | semmle.label | ... .secure(...) |
+| main.rs:28:62:28:66 | build | semmle.label | build |
+| main.rs:29:5:29:36 | ...::build(...) | semmle.label | ...::build(...) |
+| main.rs:29:5:29:60 | ... .secure(...) | semmle.label | ... .secure(...) |
+| main.rs:29:62:29:66 | build | semmle.label | build |
+| main.rs:33:9:33:40 | ...::build(...) | semmle.label | ...::build(...) |
+| main.rs:33:9:33:58 | ... .secure(...) | semmle.label | ... .secure(...) |
+| main.rs:33:60:33:64 | build | semmle.label | build |
+| main.rs:35:9:35:40 | ...::build(...) | semmle.label | ...::build(...) |
+| main.rs:35:9:35:58 | ... .secure(...) | semmle.label | ... .secure(...) |
+| main.rs:35:60:35:64 | build | semmle.label | build |
+| main.rs:39:5:39:39 | ...::new(...) | semmle.label | ...::new(...) |
+| main.rs:39:5:39:53 | ... .secure(...) | semmle.label | ... .secure(...) |
+| main.rs:39:55:39:59 | build | semmle.label | build |
+| main.rs:40:5:40:50 | ... .expires(...) | semmle.label | ... .expires(...) |
+| main.rs:40:5:40:64 | ... .secure(...) | semmle.label | ... .secure(...) |
+| main.rs:40:66:40:70 | build | semmle.label | build |
+| main.rs:41:5:41:79 | ... .max_age(...) | semmle.label | ... .max_age(...) |
+| main.rs:41:5:41:93 | ... .secure(...) | semmle.label | ... .secure(...) |
+| main.rs:41:95:41:99 | build | semmle.label | build |
+| main.rs:42:5:42:58 | ... .domain(...) | semmle.label | ... .domain(...) |
+| main.rs:42:5:42:72 | ... .secure(...) | semmle.label | ... .secure(...) |
+| main.rs:42:74:42:78 | build | semmle.label | build |
+| main.rs:43:5:43:46 | ... .path(...) | semmle.label | ... .path(...) |
+| main.rs:43:5:43:60 | ... .secure(...) | semmle.label | ... .secure(...) |
+| main.rs:43:62:43:66 | build | semmle.label | build |
+| main.rs:44:5:44:52 | ... .http_only(...) | semmle.label | ... .http_only(...) |
+| main.rs:44:5:44:66 | ... .secure(...) | semmle.label | ... .secure(...) |
+| main.rs:44:68:44:72 | build | semmle.label | build |
+| main.rs:45:5:45:72 | ... .same_site(...) | semmle.label | ... .same_site(...) |
+| main.rs:45:5:45:86 | ... .secure(...) | semmle.label | ... .secure(...) |
+| main.rs:45:88:45:92 | build | semmle.label | build |
+| main.rs:46:5:46:48 | ... .permanent() | semmle.label | ... .permanent() |
+| main.rs:46:5:46:62 | ... .secure(...) | semmle.label | ... .secure(...) |
+| main.rs:46:64:46:68 | build | semmle.label | build |
+| main.rs:47:5:47:46 | ... .removal() | semmle.label | ... .removal() |
+| main.rs:47:5:47:60 | ... .secure(...) | semmle.label | ... .secure(...) |
+| main.rs:47:62:47:66 | build | semmle.label | build |
+| main.rs:48:5:48:36 | ...::build(...) | semmle.label | ...::build(...) |
+| main.rs:48:5:48:50 | ... .secure(...) | semmle.label | ... .secure(...) |
+| main.rs:48:52:48:57 | finish | semmle.label | finish |
+| main.rs:49:5:49:25 | ...::build(...) | semmle.label | ...::build(...) |
+| main.rs:49:5:49:39 | ... .secure(...) | semmle.label | ... .secure(...) |
+| main.rs:49:41:49:45 | build | semmle.label | build |
+| main.rs:50:5:50:40 | ...::build(...) | semmle.label | ...::build(...) |
+| main.rs:50:5:50:54 | ... .secure(...) | semmle.label | ... .secure(...) |
+| main.rs:50:56:50:60 | build | semmle.label | build |
+| main.rs:53:5:53:49 | ... .secure(...) | semmle.label | ... .secure(...) |
+| main.rs:53:5:53:63 | ... .secure(...) | semmle.label | ... .secure(...) |
+| main.rs:53:65:53:69 | build | semmle.label | build |
+| main.rs:58:9:58:13 | mut a | semmle.label | mut a |
+| main.rs:58:17:58:27 | ...::new | semmle.label | ...::new |
+| main.rs:58:17:58:44 | ...::new(...) | semmle.label | ...::new(...) |
+| main.rs:59:9:59:11 | add | semmle.label | add |
+| main.rs:59:13:59:13 | a | semmle.label | a |
+| main.rs:59:13:59:21 | a.clone() | semmle.label | a.clone() |
+| main.rs:60:9:60:20 | add_original | semmle.label | add_original |
+| main.rs:60:22:60:22 | a | semmle.label | a |
+| main.rs:60:22:60:30 | a.clone() | semmle.label | a.clone() |
+| main.rs:63:5:63:5 | [SSA] a | semmle.label | [SSA] a |
+| main.rs:63:5:63:5 | a | semmle.label | a |
+| main.rs:64:9:64:11 | add | semmle.label | add |
+| main.rs:64:13:64:13 | a | semmle.label | a |
+| main.rs:64:13:64:21 | a.clone() | semmle.label | a.clone() |
+| main.rs:68:9:68:13 | mut b | semmle.label | mut b |
+| main.rs:68:17:68:29 | ...::named | semmle.label | ...::named |
+| main.rs:68:17:68:37 | ...::named(...) | semmle.label | ...::named(...) |
+| main.rs:69:16:69:18 | add | semmle.label | add |
+| main.rs:69:20:69:20 | b | semmle.label | b |
+| main.rs:69:20:69:28 | b.clone() | semmle.label | b.clone() |
+| main.rs:70:16:70:27 | add_original | semmle.label | add_original |
+| main.rs:70:29:70:29 | a | semmle.label | a |
+| main.rs:70:29:70:37 | a.clone() | semmle.label | a.clone() |
+| main.rs:71:5:71:5 | [SSA] b | semmle.label | [SSA] b |
+| main.rs:71:5:71:5 | b | semmle.label | b |
+| main.rs:72:16:72:18 | add | semmle.label | add |
+| main.rs:72:20:72:20 | b | semmle.label | b |
+| main.rs:72:20:72:28 | b.clone() | semmle.label | b.clone() |
+| main.rs:77:9:77:13 | mut c | semmle.label | mut c |
+| main.rs:77:17:77:28 | ...::from | semmle.label | ...::from |
+| main.rs:77:17:77:36 | ...::from(...) | semmle.label | ...::from(...) |
+| main.rs:78:17:78:19 | add | semmle.label | add |
+| main.rs:78:21:78:21 | c | semmle.label | c |
+| main.rs:78:21:78:29 | c.clone() | semmle.label | c.clone() |
+| main.rs:79:17:79:28 | add_original | semmle.label | add_original |
+| main.rs:79:30:79:30 | a | semmle.label | a |
+| main.rs:79:30:79:38 | a.clone() | semmle.label | a.clone() |
+| main.rs:83:17:83:19 | add | semmle.label | add |
+| main.rs:83:21:83:21 | c | semmle.label | c |
+| main.rs:83:21:83:29 | c.clone() | semmle.label | c.clone() |
+| main.rs:87:9:87:13 | mut d | semmle.label | mut d |
+| main.rs:87:17:87:28 | ...::from | semmle.label | ...::from |
+| main.rs:87:17:87:36 | ...::from(...) | semmle.label | ...::from(...) |
+| main.rs:88:9:88:11 | add | semmle.label | add |
+| main.rs:88:13:88:13 | d | semmle.label | d |
+| main.rs:88:13:88:21 | d.clone() | semmle.label | d.clone() |
+| main.rs:94:9:94:11 | add | semmle.label | add |
+| main.rs:94:13:94:13 | d | semmle.label | d |
+| main.rs:94:13:94:21 | d.clone() | semmle.label | d.clone() |
+| main.rs:114:5:114:17 | ...::build | semmle.label | ...::build |
+| main.rs:114:5:114:36 | ...::build(...) | semmle.label | ...::build(...) |
+| main.rs:114:5:114:54 | ... .partitioned(...) | semmle.label | ... .partitioned(...) |
+| main.rs:114:56:114:60 | build | semmle.label | build |
+| main.rs:122:9:122:9 | a | semmle.label | a |
+| main.rs:122:13:122:41 | ...::new | semmle.label | ...::new |
+| main.rs:122:13:122:58 | ...::new(...) | semmle.label | ...::new(...) |
+| main.rs:123:13:123:18 | insert | semmle.label | insert |
+| main.rs:123:20:123:20 | a | semmle.label | a |
+| main.rs:123:20:123:28 | a.clone() | semmle.label | a.clone() |
+| main.rs:130:9:130:9 | c | semmle.label | c |
+| main.rs:130:13:130:13 | b | semmle.label | b |
+| main.rs:130:13:130:31 | b.set_secure(...) | semmle.label | b.set_secure(...) |
+| main.rs:131:13:131:18 | insert | semmle.label | insert |
+| main.rs:131:20:131:20 | c | semmle.label | c |
+| main.rs:131:20:131:28 | c.clone() | semmle.label | c.clone() |
+| main.rs:134:9:134:9 | d | semmle.label | d |
+| main.rs:134:13:134:35 | c.set_partitioned(...) | semmle.label | c.set_partitioned(...) |
+| main.rs:135:13:135:18 | insert | semmle.label | insert |
+| main.rs:135:20:135:20 | d | semmle.label | d |
+| main.rs:135:20:135:28 | d.clone() | semmle.label | d.clone() |
+| main.rs:146:9:146:9 | g | semmle.label | g |
+| main.rs:146:13:146:13 | f | semmle.label | f |
+| main.rs:146:13:146:31 | f.set_secure(...) | semmle.label | f.set_secure(...) |
+| main.rs:147:13:147:18 | insert | semmle.label | insert |
+| main.rs:147:20:147:20 | g | semmle.label | g |
+| main.rs:147:20:147:28 | g.clone() | semmle.label | g.clone() |
+| main.rs:151:9:151:9 | h | semmle.label | h |
+| main.rs:151:13:151:42 | ...::from | semmle.label | ...::from |
+| main.rs:151:13:151:61 | ...::from(...) | semmle.label | ...::from(...) |
+| main.rs:152:13:152:18 | insert | semmle.label | insert |
+| main.rs:152:20:152:20 | h | semmle.label | h |
+| main.rs:155:9:155:9 | i | semmle.label | i |
+| main.rs:155:13:155:41 | ...::new | semmle.label | ...::new |
+| main.rs:155:13:155:58 | ...::new(...) | semmle.label | ...::new(...) |
+| main.rs:156:13:156:18 | insert | semmle.label | insert |
+| main.rs:156:20:156:20 | i | semmle.label | i |
+| main.rs:156:20:156:28 | i.clone() | semmle.label | i.clone() |
+| main.rs:156:20:156:46 | ... .set_name(...) | semmle.label | ... .set_name(...) |
+| main.rs:157:13:157:18 | insert | semmle.label | insert |
+| main.rs:157:20:157:20 | i | semmle.label | i |
+| main.rs:157:20:157:28 | i.clone() | semmle.label | i.clone() |
+| main.rs:157:20:157:48 | ... .set_value(...) | semmle.label | ... .set_value(...) |
+| main.rs:158:13:158:18 | insert | semmle.label | insert |
+| main.rs:158:20:158:20 | i | semmle.label | i |
+| main.rs:158:20:158:28 | i.clone() | semmle.label | i.clone() |
+| main.rs:158:20:158:48 | ... .set_http_only(...) | semmle.label | ... .set_http_only(...) |
+| main.rs:159:13:159:18 | insert | semmle.label | insert |
+| main.rs:159:20:159:20 | i | semmle.label | i |
+| main.rs:159:20:159:28 | i.clone() | semmle.label | i.clone() |
+| main.rs:159:20:159:70 | ... .set_same_site(...) | semmle.label | ... .set_same_site(...) |
+| main.rs:160:13:160:18 | insert | semmle.label | insert |
+| main.rs:160:20:160:20 | i | semmle.label | i |
+| main.rs:160:20:160:28 | i.clone() | semmle.label | i.clone() |
+| main.rs:160:20:160:46 | ... .set_max_age(...) | semmle.label | ... .set_max_age(...) |
+| main.rs:161:13:161:18 | insert | semmle.label | insert |
+| main.rs:161:20:161:20 | i | semmle.label | i |
+| main.rs:161:20:161:28 | i.clone() | semmle.label | i.clone() |
+| main.rs:161:20:161:42 | ... .set_path(...) | semmle.label | ... .set_path(...) |
+| main.rs:162:13:162:18 | insert | semmle.label | insert |
+| main.rs:162:20:162:20 | i | semmle.label | i |
+| main.rs:162:20:162:28 | i.clone() | semmle.label | i.clone() |
+| main.rs:162:20:162:41 | ... .unset_path() | semmle.label | ... .unset_path() |
+| main.rs:163:13:163:18 | insert | semmle.label | insert |
+| main.rs:163:20:163:20 | i | semmle.label | i |
+| main.rs:163:20:163:28 | i.clone() | semmle.label | i.clone() |
+| main.rs:163:20:163:54 | ... .set_domain(...) | semmle.label | ... .set_domain(...) |
+| main.rs:164:13:164:18 | insert | semmle.label | insert |
+| main.rs:164:20:164:20 | i | semmle.label | i |
+| main.rs:164:20:164:28 | i.clone() | semmle.label | i.clone() |
+| main.rs:164:20:164:43 | ... .unset_domain() | semmle.label | ... .unset_domain() |
+| main.rs:165:13:165:18 | insert | semmle.label | insert |
+| main.rs:165:20:165:20 | i | semmle.label | i |
+| main.rs:165:20:165:28 | i.clone() | semmle.label | i.clone() |
+| main.rs:165:20:165:46 | ... .set_expires(...) | semmle.label | ... .set_expires(...) |
+| main.rs:166:13:166:18 | insert | semmle.label | insert |
+| main.rs:166:20:166:20 | i | semmle.label | i |
+| main.rs:166:20:166:28 | i.clone() | semmle.label | i.clone() |
+| main.rs:166:20:166:44 | ... .unset_expires() | semmle.label | ... .unset_expires() |
+| main.rs:167:13:167:18 | insert | semmle.label | insert |
+| main.rs:167:20:167:20 | i | semmle.label | i |
+| main.rs:167:20:167:28 | i.clone() | semmle.label | i.clone() |
+| main.rs:167:20:167:45 | ... .make_permanent() | semmle.label | ... .make_permanent() |
+| main.rs:173:22:173:34 | ...::build | semmle.label | ...::build |
+| main.rs:173:22:173:59 | ...::build(...) | semmle.label | ...::build(...) |
+| main.rs:173:61:173:65 | build | semmle.label | build |
+| main.rs:197:5:197:39 | ...::build(...) | semmle.label | ...::build(...) |
+| main.rs:197:5:197:53 | ... .secure(...) | semmle.label | ... .secure(...) |
+| main.rs:197:55:197:60 | finish | semmle.label | finish |
+| main.rs:198:5:198:39 | ...::build(...) | semmle.label | ...::build(...) |
+| main.rs:198:5:198:53 | ... .secure(...) | semmle.label | ... .secure(...) |
+| main.rs:198:5:198:63 | ... .path(...) | semmle.label | ... .path(...) |
+| main.rs:198:65:198:70 | finish | semmle.label | finish |
+| main.rs:201:5:201:11 | [SSA] cookie1 | semmle.label | [SSA] cookie1 |
+| main.rs:201:5:201:11 | cookie1 | semmle.label | cookie1 |
+| main.rs:202:9:202:11 | add | semmle.label | add |
+| main.rs:202:13:202:19 | cookie1 | semmle.label | cookie1 |
+| main.rs:202:13:202:27 | cookie1.clone() | semmle.label | cookie1.clone() |
+| main.rs:212:5:212:22 | ...::build | semmle.label | ...::build |
+| main.rs:212:5:212:39 | ...::build(...) | semmle.label | ...::build(...) |
+| main.rs:212:41:212:46 | finish | semmle.label | finish |
+| main.rs:214:9:214:15 | cookie3 | semmle.label | cookie3 |
+| main.rs:214:19:214:34 | ...::new | semmle.label | ...::new |
+| main.rs:214:19:214:51 | ...::new(...) | semmle.label | ...::new(...) |
+| main.rs:215:9:215:11 | add | semmle.label | add |
+| main.rs:215:13:215:19 | cookie3 | semmle.label | cookie3 |
+| main.rs:215:13:215:27 | cookie3.clone() | semmle.label | cookie3.clone() |
+| main.rs:218:5:218:11 | [SSA] cookie2 | semmle.label | [SSA] cookie2 |
+| main.rs:218:5:218:11 | cookie2 | semmle.label | cookie2 |
+| main.rs:219:9:219:11 | add | semmle.label | add |
+| main.rs:219:13:219:19 | cookie2 | semmle.label | cookie2 |
+| main.rs:219:13:219:27 | cookie2.clone() | semmle.label | cookie2.clone() |
+| main.rs:228:5:228:11 | [SSA] cookie1 | semmle.label | [SSA] cookie1 |
+| main.rs:228:5:228:11 | cookie1 | semmle.label | cookie1 |
+| main.rs:229:9:229:11 | add | semmle.label | add |
+| main.rs:229:13:229:19 | cookie1 | semmle.label | cookie1 |
+| main.rs:229:13:229:27 | cookie1.clone() | semmle.label | cookie1.clone() |
+| main.rs:241:9:241:25 | cookie_config_bad | semmle.label | cookie_config_bad |
+| main.rs:241:29:241:62 | ...::new(...) | semmle.label | ...::new(...) |
+| main.rs:241:29:241:76 | ... .secure(...) | semmle.label | ... .secure(...) |
+| main.rs:242:9:242:41 | ...::new | semmle.label | ...::new |
+| main.rs:242:43:242:59 | cookie_config_bad | semmle.label | cookie_config_bad |
+| main.rs:244:9:244:26 | cookie_config_bad2 | semmle.label | cookie_config_bad2 |
+| main.rs:244:30:244:63 | ...::new(...) | semmle.label | ...::new(...) |
+| main.rs:244:30:244:77 | ... .secure(...) | semmle.label | ... .secure(...) |
+| main.rs:244:30:244:90 | ... .name(...) | semmle.label | ... .name(...) |
+| main.rs:244:30:244:100 | ... .path(...) | semmle.label | ... .path(...) |
+| main.rs:245:9:245:41 | ...::new | semmle.label | ...::new |
+| main.rs:245:43:245:60 | cookie_config_bad2 | semmle.label | cookie_config_bad2 |
+| main.rs:259:5:259:43 | ...::build(...) | semmle.label | ...::build(...) |
+| main.rs:259:5:259:57 | ... .secure(...) | semmle.label | ... .secure(...) |
+| main.rs:259:59:259:64 | finish | semmle.label | finish |
+| main.rs:260:5:260:43 | ...::build(...) | semmle.label | ...::build(...) |
+| main.rs:260:5:260:57 | ... .secure(...) | semmle.label | ... .secure(...) |
+| main.rs:260:5:260:67 | ... .path(...) | semmle.label | ... .path(...) |
+| main.rs:260:69:260:74 | finish | semmle.label | finish |
+| main.rs:263:5:263:11 | [SSA] cookie1 | semmle.label | [SSA] cookie1 |
+| main.rs:263:5:263:11 | cookie1 | semmle.label | cookie1 |
+| main.rs:264:9:264:11 | add | semmle.label | add |
+| main.rs:264:13:264:19 | cookie1 | semmle.label | cookie1 |
+| main.rs:264:13:264:27 | cookie1.clone() | semmle.label | cookie1.clone() |
+| main.rs:274:5:274:26 | ...::build | semmle.label | ...::build |
+| main.rs:274:5:274:43 | ...::build(...) | semmle.label | ...::build(...) |
+| main.rs:274:45:274:50 | finish | semmle.label | finish |
+| main.rs:276:9:276:15 | cookie3 | semmle.label | cookie3 |
+| main.rs:276:19:276:38 | ...::new | semmle.label | ...::new |
+| main.rs:276:19:276:55 | ...::new(...) | semmle.label | ...::new(...) |
+| main.rs:277:9:277:11 | add | semmle.label | add |
+| main.rs:277:13:277:19 | cookie3 | semmle.label | cookie3 |
+| main.rs:277:13:277:27 | cookie3.clone() | semmle.label | cookie3.clone() |
+| main.rs:280:5:280:11 | [SSA] cookie2 | semmle.label | [SSA] cookie2 |
+| main.rs:280:5:280:11 | cookie2 | semmle.label | cookie2 |
+| main.rs:281:9:281:11 | add | semmle.label | add |
+| main.rs:281:13:281:19 | cookie2 | semmle.label | cookie2 |
+| main.rs:281:13:281:27 | cookie2.clone() | semmle.label | cookie2.clone() |
+subpaths
diff --git a/rust/ql/test/query-tests/security/CWE-614/InsecureCookie.qlref b/rust/ql/test/query-tests/security/CWE-614/InsecureCookie.qlref
new file mode 100644
index 00000000000..36a9751434c
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-614/InsecureCookie.qlref
@@ -0,0 +1,4 @@
+query: queries/security/CWE-614/InsecureCookie.ql
+postprocess:
+ - utils/test/PrettyPrintModels.ql
+ - utils/test/InlineExpectationsTestQuery.ql
diff --git a/rust/ql/test/query-tests/security/CWE-614/main.rs b/rust/ql/test/query-tests/security/CWE-614/main.rs
new file mode 100644
index 00000000000..1f723877a3e
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-614/main.rs
@@ -0,0 +1,292 @@
+use cookie::{Cookie, CookieBuilder, CookieJar, Key};
+
+fn test_cookie(sometimes: bool) {
+    let always = true;
+    let never = false;
+
+    // secure set to false
+    let cookie1 = Cookie::build(("name", "value")).secure(false).build(); // $ Alert[rust/insecure-cookie]
+    println!("cookie1 = '{}'", cookie1.to_string());
+
+    // secure set to true
+    let cookie2 = Cookie::build(("name", "value")).secure(true).build(); // good
+    println!("cookie2 = '{}'", cookie2.to_string());
+
+    // secure left as default (which is `None`, equivalent here to `false`)
+    let cookie3 = Cookie::build(("name", "value")).build(); // $ Alert[rust/insecure-cookie]
+    println!("cookie3 = '{}'", cookie3.to_string());
+
+    // secure setting varies (may be false)
+    Cookie::build(("name", "value")).secure(sometimes).build(); // $ Alert[rust/insecure-cookie]
+    Cookie::build(("name", "value")).secure(!sometimes).build(); // $ Alert[rust/insecure-cookie]
+
+    // with data flow on the "secure" value
+    Cookie::build(("name", "value")).secure(always).build(); // good
+    Cookie::build(("name", "value")).secure(!always).build(); // $ Alert[rust/insecure-cookie]
+    Cookie::build(("name", "value")).secure(never).build(); // $ Alert[rust/insecure-cookie]
+    Cookie::build(("name", "value")).secure(!never).build(); // $ SPURIOUS: Alert[rust/insecure-cookie]
+    Cookie::build(("name", "value")).secure(always && never).build(); // $ Alert[rust/insecure-cookie]
+    Cookie::build(("name", "value")).secure(always || never).build(); // $ SPURIOUS: Alert[rust/insecure-cookie]
+
+    // with guards
+    if sometimes {
+        Cookie::build(("name", "value")).secure(sometimes).build(); // $ SPURIOUS: Alert[rust/insecure-cookie]
+    } else {
+        Cookie::build(("name", "value")).secure(sometimes).build(); // $ Alert[rust/insecure-cookie]
+    }
+
+    // variant uses (all insecure)
+    CookieBuilder::new("name", "value").secure(false).build(); // $ Alert[rust/insecure-cookie]
+    Cookie::build(("name", "value")).expires(None).secure(false).build(); // $ Alert[rust/insecure-cookie]
+    Cookie::build(("name", "value")).max_age(cookie::time::Duration::hours(12)).secure(false).build(); // $ Alert[rust/insecure-cookie]
+    Cookie::build(("name", "value")).domain("example.com").secure(false).build(); // $ Alert[rust/insecure-cookie]
+    Cookie::build(("name", "value")).path("/").secure(false).build(); // $ Alert[rust/insecure-cookie]
+    Cookie::build(("name", "value")).http_only(true).secure(false).build(); // $ Alert[rust/insecure-cookie]
+    Cookie::build(("name", "value")).same_site(cookie::SameSite::Strict).secure(false).build(); // $ Alert[rust/insecure-cookie]
+    Cookie::build(("name", "value")).permanent().secure(false).build(); // $ Alert[rust/insecure-cookie]
+    Cookie::build(("name", "value")).removal().secure(false).build(); // $ Alert[rust/insecure-cookie]
+    Cookie::build(("name", "value")).secure(false).finish(); // $ Alert[rust/insecure-cookie]
+    Cookie::build("name").secure(false).build(); // $ Alert[rust/insecure-cookie]
+    Cookie::build(Cookie::build("name")).secure(false).build(); // $ Alert[rust/insecure-cookie]
+
+    // edge cases
+    Cookie::build(("name", "value")).secure(true).secure(false).build(); // $ Alert[rust/insecure-cookie]
+    Cookie::build(("name", "value")).secure(false).secure(true).build(); // good
+
+    // mutable cookie
+    let mut jar = CookieJar::new();
+    let mut a = Cookie::new("name", "value"); // $ Source
+    jar.add(a.clone()); // $ Alert[rust/insecure-cookie]
+    jar.add_original(a.clone()); // $ Alert[rust/insecure-cookie]
+    a.set_secure(true);
+    jar.add(a.clone()); // good
+    a.set_secure(false); // $ Source
+    jar.add(a.clone()); // $ Alert[rust/insecure-cookie]
+
+    let key = Key::generate();
+    let mut signed_jar = jar.signed_mut(&key);
+    let mut b = Cookie::named("name"); // $ Source
+    signed_jar.add(b.clone()); // $ Alert[rust/insecure-cookie]
+    signed_jar.add_original(a.clone()); // $ Alert[rust/insecure-cookie]
+    b.set_secure(sometimes); // $ Source
+    signed_jar.add(b.clone()); // $ Alert[rust/insecure-cookie]
+    b.set_secure(true);
+    signed_jar.add(b.clone()); // good
+
+    let mut private_jar = jar.private_mut(&key);
+    let mut c = Cookie::from("name"); // $ Source
+    private_jar.add(c.clone()); // $ Alert[rust/insecure-cookie]
+    private_jar.add_original(a.clone()); // $ Alert[rust/insecure-cookie]
+    if sometimes {
+        c.set_secure(true);
+    }
+    private_jar.add(c.clone()); // $ Alert[rust/insecure-cookie]
+    c.set_secure(true);
+    private_jar.add(c.clone()); // $ good
+
+    let mut d = Cookie::from("name"); // $ Source
+    jar.add(d.clone()); // $ Alert[rust/insecure-cookie]
+    if sometimes {
+        c.set_secure(true);
+    } else {
+        c.set_partitioned(true);
+    }
+    jar.add(d.clone()); // $ SPURIOUS: Alert[rust/insecure-cookie]
+
+    // parse
+    jar.add(Cookie::parse("name=value; HttpOnly").unwrap()); // $ MISSING: Alert[rust/insecure-cookie]
+    jar.add(Cookie::parse("name=value; Secure; HttpOnly").unwrap()); // good
+    jar.add(Cookie::parse_encoded("name=value; HttpOnly").unwrap()); // $ MISSING: Alert[rust/insecure-cookie]
+    jar.add(Cookie::parse_encoded("name=value; Secure; HttpOnly").unwrap()); // good
+
+    for cookie in Cookie::split_parse("name1=value1; name2=value2") {
+        jar.add(cookie.unwrap()); // $ MISSING: Alert[rust/insecure-cookie]
+    }
+
+    for cookie in Cookie::split_parse_encoded("name1=value1; name2=value2") {
+        let mut e = cookie.unwrap();
+        jar.add(e.clone()); // $ MISSING: Alert[rust/insecure-cookie]
+        e.set_secure(true);
+        jar.add(e.clone()); // good
+    }
+
+    // partitioned (implies secure)
+    Cookie::build(("name", "value")).partitioned(true).build(); // good
+}
+
+fn test_biscotti() {
+    let mut cookies = biscotti::ResponseCookies::new();
+
+    // test set_secure, set_partitioned
+
+    let a = biscotti::ResponseCookie::new("name", "value"); // $ Source
+    cookies.insert(a.clone()); // $ Alert[rust/insecure-cookie]
+    println!("biscotti1 = {}", a.to_string());
+
+    let b = a.set_secure(true);
+    cookies.insert(b.clone()); // good
+    println!("biscotti2 = {}", b.to_string());
+
+    let c = b.set_secure(false); // $ Source
+    cookies.insert(c.clone()); // $ Alert[rust/insecure-cookie]
+    println!("biscotti3 = {}", c.to_string());
+
+    let d = c.set_partitioned(true); // (implies secure)
+    cookies.insert(d.clone()); // good
+    println!("biscotti4 = {}", d.to_string());
+
+    let e = d.set_secure(true);
+    cookies.insert(e.clone()); // good
+    println!("biscotti5 = {}", e.to_string());
+
+    let f = e.set_partitioned(false);
+    cookies.insert(f.clone()); // good
+    println!("biscotti6 = {}", f.to_string());
+
+    let g = f.set_secure(false); // $ Source
+    cookies.insert(g.clone()); // $ Alert[rust/insecure-cookie]
+    println!("biscotti7 = {}", g.to_string());
+
+    // variant creation (insecure)
+    let h = biscotti::ResponseCookie::from(("name", "value")); // $ Source
+    cookies.insert(h); // $ Alert[rust/insecure-cookie]
+
+    // variant uses (all insecure)
+    let i = biscotti::ResponseCookie::new("name", "value"); // $ Source
+    cookies.insert(i.clone().set_name("name2")); // $ Alert[rust/insecure-cookie]
+    cookies.insert(i.clone().set_value("value2")); // $ Alert[rust/insecure-cookie]
+    cookies.insert(i.clone().set_http_only(true)); // $ Alert[rust/insecure-cookie]
+    cookies.insert(i.clone().set_same_site(biscotti::SameSite::Strict)); // $ Alert[rust/insecure-cookie]
+    cookies.insert(i.clone().set_max_age(None)); // $ Alert[rust/insecure-cookie]
+    cookies.insert(i.clone().set_path("/")); // $ Alert[rust/insecure-cookie]
+    cookies.insert(i.clone().unset_path()); // $ Alert[rust/insecure-cookie]
+    cookies.insert(i.clone().set_domain("example.com")); // $ Alert[rust/insecure-cookie]
+    cookies.insert(i.clone().unset_domain()); // $ Alert[rust/insecure-cookie]
+    cookies.insert(i.clone().set_expires(None)); // $ Alert[rust/insecure-cookie]
+    cookies.insert(i.clone().unset_expires()); // $ Alert[rust/insecure-cookie]
+    cookies.insert(i.clone().make_permanent()); // $ Alert[rust/insecure-cookie]
+}
+
+fn test_qhelp_examples() {
+    {
+        // BAD: creating a cookie without specifying the `secure` attribute
+        let cookie = Cookie::build(("session", "abcd1234")).build(); // $ Alert[rust/insecure-cookie]
+        let mut jar = cookie::CookieJar::new();
+        jar.add(cookie.clone());
+    }
+
+    {
+        // GOOD: set the `CookieBuilder` 'Secure' attribute so that the cookie is only sent over HTTPS
+        let secure_cookie = Cookie::build(("session", "abcd1234")).secure(true).build();
+        let mut jar = cookie::CookieJar::new();
+        jar.add(secure_cookie.clone());
+
+        // GOOD: alternatively, set the 'Secure' attribute on an existing `Cookie`
+        let mut secure_cookie2 = Cookie::new("session", "abcd1234");
+        secure_cookie2.set_secure(true);
+        jar.add(secure_cookie2);
+    }
+}
+
+fn test_actix_web() {
+    // actix-web re-exports the cookie crate
+    use actix_web::cookie::Cookie as ActixCookie;
+    let mut jar = actix_web::cookie::CookieJar::new();
+
+    // secure set to false
+    ActixCookie::build("name", "value").secure(false).finish(); // $ Alert[rust/insecure-cookie]
+    ActixCookie::build("name", "value").secure(false).path("/").finish(); // $ Alert[rust/insecure-cookie]
+
+    let mut cookie1 = ActixCookie::new("name", "value");
+    cookie1.set_secure(false); // $ Source
+    jar.add(cookie1.clone()); // $ Alert[rust/insecure-cookie]
+
+    // secure set to true
+    ActixCookie::build("name", "value").secure(true).finish(); // good
+
+    let mut cookie2 = ActixCookie::new("name", "value");
+    cookie2.set_secure(true); // good
+    jar.add(cookie2.clone());
+
+    // secure left as default
+    ActixCookie::build("name", "value").finish(); // $ Alert[rust/insecure-cookie]
+
+    let cookie3 = ActixCookie::new("name", "value"); // $ Source
+    jar.add(cookie3.clone()); // $ Alert[rust/insecure-cookie]
+
+    // secure reset to None
+    cookie2.set_secure(None); // $ Source
+    jar.add(cookie2.clone()); // $ Alert[rust/insecure-cookie]
+}
+
+fn test_poem() {
+    use poem::web::cookie::Cookie as PoemCookie;
+    let mut jar = poem::web::cookie::CookieJar::default();
+
+    // secure set to false
+    let mut cookie1 = PoemCookie::new_with_str("name", "value");
+    cookie1.set_secure(false); // $ Source
+    jar.add(cookie1.clone()); // $ Alert[rust/insecure-cookie]
+
+    // secure set to true
+    let mut cookie2 = PoemCookie::new_with_str("name", "value");
+    cookie2.set_secure(true); // good
+    jar.add(cookie2.clone());
+
+    // secure left as default (which is `true` for Poem)
+    let cookie3 = PoemCookie::new_with_str("name", "value");
+    jar.add(cookie3.clone()); // good
+
+    // set secure via CookieConfig
+    let cookie_config_bad = poem::session::CookieConfig::new().secure(false); // $ Source
+    _ = poem::session::ServerSession::new(cookie_config_bad, ()); // $ Alert[rust/insecure-cookie]
+
+    let cookie_config_bad2 = poem::session::CookieConfig::new().secure(false).name("name").path("/"); // $ Source
+    _ = poem::session::ServerSession::new(cookie_config_bad2, ()); // $ Alert[rust/insecure-cookie]
+
+    let cookie_config_good = poem::session::CookieConfig::new().secure(true);
+    _ = poem::session::ServerSession::new(cookie_config_good, ()); // good
+
+    let cookie_config_default = poem::session::CookieConfig::new();
+    _ = poem::session::ServerSession::new(cookie_config_default, ()); // good
+}
+
+fn test_http_types() {
+    use http_types::Cookie as HttpTypesCookie;
+    let mut jar = http_types::cookies::CookieJar::default();
+
+    // secure set to false
+    HttpTypesCookie::build("name", "value").secure(false).finish(); // $ Alert[rust/insecure-cookie]
+    HttpTypesCookie::build("name", "value").secure(false).path("/").finish(); // $ Alert[rust/insecure-cookie]
+
+    let mut cookie1 = HttpTypesCookie::new("name", "value");
+    cookie1.set_secure(false); // $ Source
+    jar.add(cookie1.clone()); // $ Alert[rust/insecure-cookie]
+
+    // secure set to true
+    HttpTypesCookie::build("name", "value").secure(true).finish(); // good
+
+    let mut cookie2 = HttpTypesCookie::new("name", "value");
+    cookie2.set_secure(true); // good
+    jar.add(cookie2.clone());
+
+    // secure left as default
+    HttpTypesCookie::build("name", "value").finish(); // $ Alert[rust/insecure-cookie]
+
+    let cookie3 = HttpTypesCookie::new("name", "value"); // $ Source
+    jar.add(cookie3.clone()); // $ Alert[rust/insecure-cookie]
+
+    // secure reset to None
+    cookie2.set_secure(None); // $ Source
+    jar.add(cookie2.clone()); // $ Alert[rust/insecure-cookie]
+}
+
+fn main() {
+    test_cookie(true);
+    test_cookie(false);
+    test_biscotti();
+    test_qhelp_examples();
+    test_actix_web();
+    test_poem();
+    test_http_types();
+}
diff --git a/rust/ql/test/query-tests/security/CWE-614/options.yml b/rust/ql/test/query-tests/security/CWE-614/options.yml
new file mode 100644
index 00000000000..72093c119bb
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-614/options.yml
@@ -0,0 +1,7 @@
+qltest_cargo_check: true
+qltest_dependencies:
+  - cookie = { version = "0.18.1", features = ["percent-encode", "signed", "private"] }
+  - biscotti = { version = "0.4.3" }
+  - actix-web = { version = "4", features = ["cookies"] }
+  - poem = { version = "3", features = ["cookie", "session"] }
+  - http-types = { version = "2", features = ["cookies"] }
diff --git a/rust/ql/test/query-tests/security/CWE-696/BadCTorInitialization.expected b/rust/ql/test/query-tests/security/CWE-696/BadCTorInitialization.expected
index 3ac74a3cb13..cf0f287e4f7 100644
--- a/rust/ql/test/query-tests/security/CWE-696/BadCTorInitialization.expected
+++ b/rust/ql/test/query-tests/security/CWE-696/BadCTorInitialization.expected
@@ -1,21 +1,21 @@
 #select
-| test.rs:30:9:30:24 | ...::stdout(...) | test.rs:28:1:28:13 | Attr | test.rs:30:9:30:24 | ...::stdout(...) | Call to ...::stdout(...) from the standard library in a function with the ctor attribute. |
-| test.rs:30:9:30:48 | ... .write(...) | test.rs:28:1:28:13 | Attr | test.rs:30:9:30:48 | ... .write(...) | Call to ... .write(...) from the standard library in a function with the ctor attribute. |
-| test.rs:35:9:35:24 | ...::stdout(...) | test.rs:33:1:33:13 | Attr | test.rs:35:9:35:24 | ...::stdout(...) | Call to ...::stdout(...) from the standard library in a function with the dtor attribute. |
-| test.rs:35:9:35:48 | ... .write(...) | test.rs:33:1:33:13 | Attr | test.rs:35:9:35:48 | ... .write(...) | Call to ... .write(...) from the standard library in a function with the dtor attribute. |
-| test.rs:42:9:42:24 | ...::stdout(...) | test.rs:39:1:39:13 | Attr | test.rs:42:9:42:24 | ...::stdout(...) | Call to ...::stdout(...) from the standard library in a function with the dtor attribute. |
-| test.rs:42:9:42:48 | ... .write(...) | test.rs:39:1:39:13 | Attr | test.rs:42:9:42:48 | ... .write(...) | Call to ... .write(...) from the standard library in a function with the dtor attribute. |
-| test.rs:52:9:52:15 | stdout(...) | test.rs:50:1:50:7 | Attr | test.rs:52:9:52:15 | stdout(...) | Call to stdout(...) from the standard library in a function with the ctor attribute. |
-| test.rs:52:9:52:39 | ... .write(...) | test.rs:50:1:50:7 | Attr | test.rs:52:9:52:39 | ... .write(...) | Call to ... .write(...) from the standard library in a function with the ctor attribute. |
-| test.rs:57:9:57:15 | stderr(...) | test.rs:55:1:55:7 | Attr | test.rs:57:9:57:15 | stderr(...) | Call to stderr(...) from the standard library in a function with the ctor attribute. |
-| test.rs:57:9:57:43 | ... .write_all(...) | test.rs:55:1:55:7 | Attr | test.rs:57:9:57:43 | ... .write_all(...) | Call to ... .write_all(...) from the standard library in a function with the ctor attribute. |
+| test.rs:30:9:30:25 | ...::stdout(...) | test.rs:28:1:28:13 | Attr | test.rs:30:9:30:25 | ...::stdout(...) | Call to ...::stdout(...) from the standard library in a function with the ctor attribute. |
+| test.rs:30:9:30:49 | ... .write(...) | test.rs:28:1:28:13 | Attr | test.rs:30:9:30:49 | ... .write(...) | Call to ... .write(...) from the standard library in a function with the ctor attribute. |
+| test.rs:35:9:35:25 | ...::stdout(...) | test.rs:33:1:33:13 | Attr | test.rs:35:9:35:25 | ...::stdout(...) | Call to ...::stdout(...) from the standard library in a function with the dtor attribute. |
+| test.rs:35:9:35:49 | ... .write(...) | test.rs:33:1:33:13 | Attr | test.rs:35:9:35:49 | ... .write(...) | Call to ... .write(...) from the standard library in a function with the dtor attribute. |
+| test.rs:42:9:42:25 | ...::stdout(...) | test.rs:39:1:39:13 | Attr | test.rs:42:9:42:25 | ...::stdout(...) | Call to ...::stdout(...) from the standard library in a function with the dtor attribute. |
+| test.rs:42:9:42:49 | ... .write(...) | test.rs:39:1:39:13 | Attr | test.rs:42:9:42:49 | ... .write(...) | Call to ... .write(...) from the standard library in a function with the dtor attribute. |
+| test.rs:52:9:52:16 | stdout(...) | test.rs:50:1:50:7 | Attr | test.rs:52:9:52:16 | stdout(...) | Call to stdout(...) from the standard library in a function with the ctor attribute. |
+| test.rs:52:9:52:40 | ... .write(...) | test.rs:50:1:50:7 | Attr | test.rs:52:9:52:40 | ... .write(...) | Call to ... .write(...) from the standard library in a function with the ctor attribute. |
+| test.rs:57:9:57:16 | stderr(...) | test.rs:55:1:55:7 | Attr | test.rs:57:9:57:16 | stderr(...) | Call to stderr(...) from the standard library in a function with the ctor attribute. |
+| test.rs:57:9:57:44 | ... .write_all(...) | test.rs:55:1:55:7 | Attr | test.rs:57:9:57:44 | ... .write_all(...) | Call to ... .write_all(...) from the standard library in a function with the ctor attribute. |
 | test.rs:62:14:62:28 | ...::_print(...) | test.rs:60:1:60:7 | Attr | test.rs:62:14:62:28 | ...::_print(...) | Call to ...::_print(...) from the standard library in a function with the ctor attribute. |
-| test.rs:68:9:68:23 | ...::stdin(...) | test.rs:65:1:65:7 | Attr | test.rs:68:9:68:23 | ...::stdin(...) | Call to ...::stdin(...) from the standard library in a function with the ctor attribute. |
-| test.rs:68:9:68:44 | ... .read_line(...) | test.rs:65:1:65:7 | Attr | test.rs:68:9:68:44 | ... .read_line(...) | Call to ... .read_line(...) from the standard library in a function with the ctor attribute. |
-| test.rs:75:17:75:44 | ...::create(...) | test.rs:73:1:73:7 | Attr | test.rs:75:17:75:44 | ...::create(...) | Call to ...::create(...) from the standard library in a function with the ctor attribute. |
-| test.rs:80:14:80:37 | ...::now(...) | test.rs:78:1:78:7 | Attr | test.rs:80:14:80:37 | ...::now(...) | Call to ...::now(...) from the standard library in a function with the ctor attribute. |
-| test.rs:89:5:89:34 | ...::sleep(...) | test.rs:87:1:87:7 | Attr | test.rs:89:5:89:34 | ...::sleep(...) | Call to ...::sleep(...) from the standard library in a function with the ctor attribute. |
-| test.rs:96:5:96:22 | ...::exit(...) | test.rs:94:1:94:7 | Attr | test.rs:96:5:96:22 | ...::exit(...) | Call to ...::exit(...) from the standard library in a function with the ctor attribute. |
+| test.rs:68:9:68:24 | ...::stdin(...) | test.rs:65:1:65:7 | Attr | test.rs:68:9:68:24 | ...::stdin(...) | Call to ...::stdin(...) from the standard library in a function with the ctor attribute. |
+| test.rs:68:9:68:45 | ... .read_line(...) | test.rs:65:1:65:7 | Attr | test.rs:68:9:68:45 | ... .read_line(...) | Call to ... .read_line(...) from the standard library in a function with the ctor attribute. |
+| test.rs:75:17:75:45 | ...::create(...) | test.rs:73:1:73:7 | Attr | test.rs:75:17:75:45 | ...::create(...) | Call to ...::create(...) from the standard library in a function with the ctor attribute. |
+| test.rs:80:14:80:38 | ...::now(...) | test.rs:78:1:78:7 | Attr | test.rs:80:14:80:38 | ...::now(...) | Call to ...::now(...) from the standard library in a function with the ctor attribute. |
+| test.rs:89:5:89:35 | ...::sleep(...) | test.rs:87:1:87:7 | Attr | test.rs:89:5:89:35 | ...::sleep(...) | Call to ...::sleep(...) from the standard library in a function with the ctor attribute. |
+| test.rs:96:5:96:23 | ...::exit(...) | test.rs:94:1:94:7 | Attr | test.rs:96:5:96:23 | ...::exit(...) | Call to ...::exit(...) from the standard library in a function with the ctor attribute. |
 | test.rs:125:9:125:16 | stderr(...) | test.rs:128:1:128:7 | Attr | test.rs:125:9:125:16 | stderr(...) | Call to stderr(...) from the standard library in a function with the ctor attribute. |
 | test.rs:125:9:125:16 | stderr(...) | test.rs:144:1:144:7 | Attr | test.rs:125:9:125:16 | stderr(...) | Call to stderr(...) from the standard library in a function with the ctor attribute. |
 | test.rs:125:9:125:16 | stderr(...) | test.rs:150:1:150:7 | Attr | test.rs:125:9:125:16 | stderr(...) | Call to stderr(...) from the standard library in a function with the ctor attribute. |
@@ -25,47 +25,45 @@
 | test.rs:168:1:168:7 | ... .write(...) | test.rs:168:1:168:7 | Attr | test.rs:168:1:168:7 | ... .write(...) | Call to ... .write(...) from the standard library in a function with the ctor attribute. |
 | test.rs:168:1:168:7 | ...::stdout(...) | test.rs:168:1:168:7 | Attr | test.rs:168:1:168:7 | ...::stdout(...) | Call to ...::stdout(...) from the standard library in a function with the ctor attribute. |
 edges
-| test.rs:28:1:28:13 | Attr | test.rs:29:4:30:50 | fn bad1_1 |
-| test.rs:29:4:30:50 | fn bad1_1 | test.rs:30:9:30:24 | ...::stdout(...) |
-| test.rs:29:4:30:50 | fn bad1_1 | test.rs:30:9:30:48 | ... .write(...) |
-| test.rs:33:1:33:13 | Attr | test.rs:34:4:35:50 | fn bad1_2 |
-| test.rs:34:4:35:50 | fn bad1_2 | test.rs:35:9:35:24 | ...::stdout(...) |
-| test.rs:34:4:35:50 | fn bad1_2 | test.rs:35:9:35:48 | ... .write(...) |
-| test.rs:38:1:42:50 | fn bad1_3 | test.rs:42:9:42:24 | ...::stdout(...) |
-| test.rs:38:1:42:50 | fn bad1_3 | test.rs:42:9:42:48 | ... .write(...) |
-| test.rs:39:1:39:13 | Attr | test.rs:38:1:42:50 | fn bad1_3 |
-| test.rs:50:1:50:7 | Attr | test.rs:51:4:52:41 | fn bad2_1 |
-| test.rs:51:4:52:41 | fn bad2_1 | test.rs:52:9:52:15 | stdout(...) |
-| test.rs:51:4:52:41 | fn bad2_1 | test.rs:52:9:52:39 | ... .write(...) |
-| test.rs:55:1:55:7 | Attr | test.rs:56:4:57:45 | fn bad2_2 |
-| test.rs:56:4:57:45 | fn bad2_2 | test.rs:57:9:57:15 | stderr(...) |
-| test.rs:56:4:57:45 | fn bad2_2 | test.rs:57:9:57:43 | ... .write_all(...) |
-| test.rs:60:1:60:7 | Attr | test.rs:61:4:62:30 | fn bad2_3 |
-| test.rs:61:4:62:30 | fn bad2_3 | test.rs:62:14:62:28 | ...::_print(...) |
-| test.rs:65:1:65:7 | Attr | test.rs:66:4:68:46 | fn bad2_4 |
-| test.rs:66:4:68:46 | fn bad2_4 | test.rs:68:9:68:23 | ...::stdin(...) |
-| test.rs:66:4:68:46 | fn bad2_4 | test.rs:68:9:68:44 | ... .read_line(...) |
-| test.rs:73:1:73:7 | Attr | test.rs:74:4:75:55 | fn bad2_5 |
-| test.rs:74:4:75:55 | fn bad2_5 | test.rs:75:17:75:44 | ...::create(...) |
-| test.rs:78:1:78:7 | Attr | test.rs:79:4:80:39 | fn bad2_6 |
-| test.rs:79:4:80:39 | fn bad2_6 | test.rs:80:14:80:37 | ...::now(...) |
-| test.rs:87:1:87:7 | Attr | test.rs:88:4:89:36 | fn bad2_7 |
-| test.rs:88:4:89:36 | fn bad2_7 | test.rs:89:5:89:34 | ...::sleep(...) |
-| test.rs:94:1:94:7 | Attr | test.rs:95:4:96:24 | fn bad2_8 |
-| test.rs:95:4:96:24 | fn bad2_8 | test.rs:96:5:96:22 | ...::exit(...) |
+| test.rs:28:1:28:13 | Attr | test.rs:29:4:31:1 | fn bad1_1 |
+| test.rs:29:4:31:1 | fn bad1_1 | test.rs:30:9:30:25 | ...::stdout(...) |
+| test.rs:29:4:31:1 | fn bad1_1 | test.rs:30:9:30:49 | ... .write(...) |
+| test.rs:33:1:33:13 | Attr | test.rs:34:4:36:1 | fn bad1_2 |
+| test.rs:34:4:36:1 | fn bad1_2 | test.rs:35:9:35:25 | ...::stdout(...) |
+| test.rs:34:4:36:1 | fn bad1_2 | test.rs:35:9:35:49 | ... .write(...) |
+| test.rs:38:1:43:1 | fn bad1_3 | test.rs:42:9:42:25 | ...::stdout(...) |
+| test.rs:38:1:43:1 | fn bad1_3 | test.rs:42:9:42:49 | ... .write(...) |
+| test.rs:39:1:39:13 | Attr | test.rs:38:1:43:1 | fn bad1_3 |
+| test.rs:50:1:50:7 | Attr | test.rs:51:4:53:1 | fn bad2_1 |
+| test.rs:51:4:53:1 | fn bad2_1 | test.rs:52:9:52:16 | stdout(...) |
+| test.rs:51:4:53:1 | fn bad2_1 | test.rs:52:9:52:40 | ... .write(...) |
+| test.rs:55:1:55:7 | Attr | test.rs:56:4:58:1 | fn bad2_2 |
+| test.rs:56:4:58:1 | fn bad2_2 | test.rs:57:9:57:16 | stderr(...) |
+| test.rs:56:4:58:1 | fn bad2_2 | test.rs:57:9:57:44 | ... .write_all(...) |
+| test.rs:60:1:60:7 | Attr | test.rs:61:4:63:1 | fn bad2_3 |
+| test.rs:61:4:63:1 | fn bad2_3 | test.rs:62:14:62:28 | ...::_print(...) |
+| test.rs:65:1:65:7 | Attr | test.rs:66:4:69:1 | fn bad2_4 |
+| test.rs:66:4:69:1 | fn bad2_4 | test.rs:68:9:68:24 | ...::stdin(...) |
+| test.rs:66:4:69:1 | fn bad2_4 | test.rs:68:9:68:45 | ... .read_line(...) |
+| test.rs:73:1:73:7 | Attr | test.rs:74:4:76:1 | fn bad2_5 |
+| test.rs:74:4:76:1 | fn bad2_5 | test.rs:75:17:75:45 | ...::create(...) |
+| test.rs:78:1:78:7 | Attr | test.rs:79:4:81:1 | fn bad2_6 |
+| test.rs:79:4:81:1 | fn bad2_6 | test.rs:80:14:80:38 | ...::now(...) |
+| test.rs:87:1:87:7 | Attr | test.rs:88:4:90:1 | fn bad2_7 |
+| test.rs:88:4:90:1 | fn bad2_7 | test.rs:89:5:89:35 | ...::sleep(...) |
+| test.rs:94:1:94:7 | Attr | test.rs:95:4:97:1 | fn bad2_8 |
+| test.rs:95:4:97:1 | fn bad2_8 | test.rs:96:5:96:23 | ...::exit(...) |
 | test.rs:124:1:126:1 | fn call_target3_1 | test.rs:125:9:125:16 | stderr(...) |
 | test.rs:124:1:126:1 | fn call_target3_1 | test.rs:125:9:125:44 | ... .write_all(...) |
-| test.rs:128:1:128:7 | Attr | test.rs:129:4:130:21 | fn bad3_1 |
-| test.rs:129:4:130:21 | fn bad3_1 | test.rs:130:5:130:19 | call_target3_1(...) |
-| test.rs:130:5:130:19 | call_target3_1(...) | test.rs:124:1:126:1 | fn call_target3_1 |
-| test.rs:144:1:144:7 | Attr | test.rs:145:4:147:21 | fn bad3_3 |
-| test.rs:144:1:148:1 | fn bad3_3 | test.rs:146:5:146:20 | call_target3_1(...) |
-| test.rs:145:4:147:21 | fn bad3_3 | test.rs:146:5:146:19 | call_target3_1(...) |
-| test.rs:146:5:146:19 | call_target3_1(...) | test.rs:124:1:126:1 | fn call_target3_1 |
+| test.rs:128:1:128:7 | Attr | test.rs:129:4:131:1 | fn bad3_1 |
+| test.rs:129:4:131:1 | fn bad3_1 | test.rs:130:5:130:20 | call_target3_1(...) |
+| test.rs:130:5:130:20 | call_target3_1(...) | test.rs:124:1:126:1 | fn call_target3_1 |
+| test.rs:144:1:144:7 | Attr | test.rs:145:4:148:1 | fn bad3_3 |
+| test.rs:145:4:148:1 | fn bad3_3 | test.rs:146:5:146:20 | call_target3_1(...) |
 | test.rs:146:5:146:20 | call_target3_1(...) | test.rs:124:1:126:1 | fn call_target3_1 |
-| test.rs:150:1:150:7 | Attr | test.rs:151:4:152:13 | fn bad3_4 |
-| test.rs:151:4:152:13 | fn bad3_4 | test.rs:152:5:152:11 | bad3_3(...) |
-| test.rs:152:5:152:11 | bad3_3(...) | test.rs:144:1:148:1 | fn bad3_3 |
-| test.rs:168:1:168:7 | Attr | test.rs:169:4:170:16 | fn bad4_1 |
-| test.rs:169:4:170:16 | fn bad4_1 | test.rs:168:1:168:7 | ... .write(...) |
-| test.rs:169:4:170:16 | fn bad4_1 | test.rs:168:1:168:7 | ...::stdout(...) |
+| test.rs:150:1:150:7 | Attr | test.rs:151:4:153:1 | fn bad3_4 |
+| test.rs:151:4:153:1 | fn bad3_4 | test.rs:152:5:152:12 | bad3_3(...) |
+| test.rs:152:5:152:12 | bad3_3(...) | test.rs:145:4:148:1 | fn bad3_3 |
+| test.rs:168:1:168:7 | Attr | test.rs:169:4:171:1 | fn bad4_1 |
+| test.rs:169:4:171:1 | fn bad4_1 | test.rs:168:1:168:7 | ... .write(...) |
+| test.rs:169:4:171:1 | fn bad4_1 | test.rs:168:1:168:7 | ...::stdout(...) |
diff --git a/rust/ql/test/query-tests/security/CWE-696/CONSISTENCY/PathResolutionConsistency.expected b/rust/ql/test/query-tests/security/CWE-696/CONSISTENCY/PathResolutionConsistency.expected
index 7c37a008268..538ecf9c2e3 100644
--- a/rust/ql/test/query-tests/security/CWE-696/CONSISTENCY/PathResolutionConsistency.expected
+++ b/rust/ql/test/query-tests/security/CWE-696/CONSISTENCY/PathResolutionConsistency.expected
@@ -1,14 +1,2 @@
-multiplePathResolutions
-| test.rs:50:3:50:6 | ctor |
-| test.rs:55:3:55:6 | ctor |
-| test.rs:60:3:60:6 | ctor |
-| test.rs:65:3:65:6 | ctor |
-| test.rs:73:3:73:6 | ctor |
-| test.rs:78:3:78:6 | ctor |
-| test.rs:87:3:87:6 | ctor |
-| test.rs:94:3:94:6 | ctor |
-| test.rs:128:3:128:6 | ctor |
-| test.rs:139:3:139:6 | ctor |
-| test.rs:144:3:144:6 | ctor |
-| test.rs:150:3:150:6 | ctor |
-| test.rs:168:3:168:6 | ctor |
+multipleCallTargets
+| test.rs:117:9:117:21 | ptr.is_null() |
diff --git a/rust/ql/test/query-tests/security/CWE-770/CONSISTENCY/PathResolutionConsistency.expected b/rust/ql/test/query-tests/security/CWE-770/CONSISTENCY/PathResolutionConsistency.expected
index 6e88d5bdf86..1abeb1aeb87 100644
--- a/rust/ql/test/query-tests/security/CWE-770/CONSISTENCY/PathResolutionConsistency.expected
+++ b/rust/ql/test/query-tests/security/CWE-770/CONSISTENCY/PathResolutionConsistency.expected
@@ -1,18 +1,7 @@
 multipleCallTargets
-| main.rs:218:14:218:30 | ...::malloc(...) |
-| main.rs:219:13:219:27 | ...::malloc(...) |
-| main.rs:220:13:220:37 | ...::aligned_alloc(...) |
-| main.rs:221:13:221:37 | ...::aligned_alloc(...) |
-| main.rs:222:13:222:31 | ...::calloc(...) |
-| main.rs:223:13:223:55 | ...::calloc(...) |
-| main.rs:224:13:224:32 | ...::realloc(...) |
-| main.rs:229:13:229:40 | ...::with_capacity(...) |
-| main.rs:233:18:233:47 | ...::with_capacity(...) |
-multiplePathResolutions
-| main.rs:218:14:218:17 | libc |
-| main.rs:219:13:219:16 | libc |
-| main.rs:220:13:220:16 | libc |
-| main.rs:221:13:221:16 | libc |
-| main.rs:222:13:222:16 | libc |
-| main.rs:223:13:223:16 | libc |
-| main.rs:224:13:224:16 | libc |
+| main.rs:242:44:242:78 | ... .cast() |
+| main.rs:245:44:245:78 | ... .cast() |
+| main.rs:248:44:248:78 | ... .cast() |
+| main.rs:251:14:251:48 | ... .cast() |
+| main.rs:254:14:254:48 | ... .cast() |
+| main.rs:257:14:257:48 | ... .cast() |
diff --git a/rust/ql/test/query-tests/security/CWE-770/UncontrolledAllocationSize.expected b/rust/ql/test/query-tests/security/CWE-770/UncontrolledAllocationSize.expected
index 2a224f29a65..8fcbd27ac02 100644
--- a/rust/ql/test/query-tests/security/CWE-770/UncontrolledAllocationSize.expected
+++ b/rust/ql/test/query-tests/security/CWE-770/UncontrolledAllocationSize.expected
@@ -32,23 +32,15 @@
 | main.rs:169:17:169:33 | ...::alloc | main.rs:317:13:317:26 | ...::args | main.rs:169:17:169:33 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:317:13:317:26 | ...::args | user-provided value |
 | main.rs:177:13:177:29 | ...::alloc | main.rs:317:13:317:26 | ...::args | main.rs:177:13:177:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:317:13:317:26 | ...::args | user-provided value |
 | main.rs:193:32:193:36 | alloc | main.rs:317:13:317:26 | ...::args | main.rs:193:32:193:36 | alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:317:13:317:26 | ...::args | user-provided value |
-| main.rs:193:32:193:36 | alloc | main.rs:317:13:317:26 | ...::args | main.rs:193:32:193:36 | alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:317:13:317:26 | ...::args | user-provided value |
-| main.rs:194:32:194:43 | alloc_zeroed | main.rs:317:13:317:26 | ...::args | main.rs:194:32:194:43 | alloc_zeroed | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:317:13:317:26 | ...::args | user-provided value |
 | main.rs:194:32:194:43 | alloc_zeroed | main.rs:317:13:317:26 | ...::args | main.rs:194:32:194:43 | alloc_zeroed | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:317:13:317:26 | ...::args | user-provided value |
 | main.rs:194:32:194:43 | alloc_zeroed | main.rs:317:13:317:26 | ...::args | main.rs:194:32:194:43 | alloc_zeroed | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:317:13:317:26 | ...::args | user-provided value |
 | main.rs:195:32:195:39 | allocate | main.rs:317:13:317:26 | ...::args | main.rs:195:32:195:39 | allocate | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:317:13:317:26 | ...::args | user-provided value |
-| main.rs:195:32:195:39 | allocate | main.rs:317:13:317:26 | ...::args | main.rs:195:32:195:39 | allocate | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:317:13:317:26 | ...::args | user-provided value |
-| main.rs:196:32:196:46 | allocate_zeroed | main.rs:317:13:317:26 | ...::args | main.rs:196:32:196:46 | allocate_zeroed | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:317:13:317:26 | ...::args | user-provided value |
 | main.rs:196:32:196:46 | allocate_zeroed | main.rs:317:13:317:26 | ...::args | main.rs:196:32:196:46 | allocate_zeroed | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:317:13:317:26 | ...::args | user-provided value |
 | main.rs:197:32:197:39 | allocate | main.rs:317:13:317:26 | ...::args | main.rs:197:32:197:39 | allocate | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:317:13:317:26 | ...::args | user-provided value |
-| main.rs:197:32:197:39 | allocate | main.rs:317:13:317:26 | ...::args | main.rs:197:32:197:39 | allocate | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:317:13:317:26 | ...::args | user-provided value |
-| main.rs:198:32:198:46 | allocate_zeroed | main.rs:317:13:317:26 | ...::args | main.rs:198:32:198:46 | allocate_zeroed | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:317:13:317:26 | ...::args | user-provided value |
 | main.rs:198:32:198:46 | allocate_zeroed | main.rs:317:13:317:26 | ...::args | main.rs:198:32:198:46 | allocate_zeroed | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:317:13:317:26 | ...::args | user-provided value |
 | main.rs:202:32:202:38 | realloc | main.rs:317:13:317:26 | ...::args | main.rs:202:32:202:38 | realloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:317:13:317:26 | ...::args | user-provided value |
 | main.rs:202:32:202:38 | realloc | main.rs:317:13:317:26 | ...::args | main.rs:202:32:202:38 | realloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:317:13:317:26 | ...::args | user-provided value |
 | main.rs:208:40:208:43 | grow | main.rs:317:13:317:26 | ...::args | main.rs:208:40:208:43 | grow | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:317:13:317:26 | ...::args | user-provided value |
-| main.rs:208:40:208:43 | grow | main.rs:317:13:317:26 | ...::args | main.rs:208:40:208:43 | grow | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:317:13:317:26 | ...::args | user-provided value |
-| main.rs:210:40:210:50 | grow_zeroed | main.rs:317:13:317:26 | ...::args | main.rs:210:40:210:50 | grow_zeroed | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:317:13:317:26 | ...::args | user-provided value |
 | main.rs:210:40:210:50 | grow_zeroed | main.rs:317:13:317:26 | ...::args | main.rs:210:40:210:50 | grow_zeroed | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:317:13:317:26 | ...::args | user-provided value |
 | main.rs:213:36:213:41 | shrink | main.rs:317:13:317:26 | ...::args | main.rs:213:36:213:41 | shrink | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:317:13:317:26 | ...::args | user-provided value |
 | main.rs:219:13:219:24 | ...::malloc | main.rs:317:13:317:26 | ...::args | main.rs:219:13:219:24 | ...::malloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:317:13:317:26 | ...::args | user-provided value |
@@ -61,7 +53,7 @@
 | main.rs:284:22:284:38 | ...::alloc | main.rs:308:25:308:38 | ...::args | main.rs:284:22:284:38 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:308:25:308:38 | ...::args | user-provided value |
 edges
 | main.rs:12:36:12:43 | ...: usize | main.rs:18:41:18:41 | v | provenance |  |
-| main.rs:18:41:18:41 | v | main.rs:18:13:18:31 | ...::realloc | provenance | MaD:18 Sink:MaD:18 |
+| main.rs:18:41:18:41 | v | main.rs:18:13:18:31 | ...::realloc | provenance | MaD:17 Sink:MaD:17 |
 | main.rs:18:41:18:41 | v | main.rs:20:50:20:50 | v | provenance |  |
 | main.rs:18:41:18:41 | v | main.rs:29:60:29:60 | v | provenance |  |
 | main.rs:18:41:18:41 | v | main.rs:32:60:32:60 | v | provenance |  |
@@ -69,101 +61,101 @@ edges
 | main.rs:18:41:18:41 | v | main.rs:35:9:35:10 | s6 | provenance |  |
 | main.rs:18:41:18:41 | v | main.rs:35:49:35:49 | v | provenance |  |
 | main.rs:20:9:20:10 | l2 | main.rs:21:31:21:32 | l2 | provenance |  |
-| main.rs:20:14:20:54 | ...::from_size_align(...) [Ok] | main.rs:20:14:20:63 | ... .unwrap() | provenance | MaD:41 |
+| main.rs:20:14:20:54 | ...::from_size_align(...) [Ok] | main.rs:20:14:20:63 | ... .unwrap() | provenance | MaD:40 |
 | main.rs:20:14:20:63 | ... .unwrap() | main.rs:20:9:20:10 | l2 | provenance |  |
-| main.rs:20:50:20:50 | v | main.rs:20:14:20:54 | ...::from_size_align(...) [Ok] | provenance | MaD:31 |
-| main.rs:21:31:21:32 | l2 | main.rs:21:13:21:29 | ...::alloc | provenance | MaD:16 Sink:MaD:16 |
-| main.rs:21:31:21:32 | l2 | main.rs:22:31:22:44 | l2.align_to(...) [Ok] | provenance | MaD:25 |
-| main.rs:21:31:21:32 | l2 | main.rs:23:31:23:44 | l2.align_to(...) [Ok] | provenance | MaD:25 |
+| main.rs:20:50:20:50 | v | main.rs:20:14:20:54 | ...::from_size_align(...) [Ok] | provenance | MaD:30 |
+| main.rs:21:31:21:32 | l2 | main.rs:21:13:21:29 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
+| main.rs:21:31:21:32 | l2 | main.rs:22:31:22:44 | l2.align_to(...) [Ok] | provenance | MaD:24 |
+| main.rs:21:31:21:32 | l2 | main.rs:23:31:23:44 | l2.align_to(...) [Ok] | provenance | MaD:24 |
 | main.rs:21:31:21:32 | l2 | main.rs:24:38:24:39 | l2 | provenance |  |
-| main.rs:22:31:22:44 | l2.align_to(...) [Ok] | main.rs:22:31:22:53 | ... .unwrap() | provenance | MaD:41 |
-| main.rs:22:31:22:53 | ... .unwrap() | main.rs:22:13:22:29 | ...::alloc | provenance | MaD:16 Sink:MaD:16 |
-| main.rs:23:31:23:44 | l2.align_to(...) [Ok] | main.rs:23:31:23:53 | ... .unwrap() | provenance | MaD:41 |
-| main.rs:23:31:23:53 | ... .unwrap() | main.rs:23:31:23:68 | ... .pad_to_align() | provenance | MaD:34 |
-| main.rs:23:31:23:68 | ... .pad_to_align() | main.rs:23:13:23:29 | ...::alloc | provenance | MaD:16 Sink:MaD:16 |
-| main.rs:24:38:24:39 | l2 | main.rs:24:13:24:36 | ...::alloc_zeroed | provenance | MaD:17 Sink:MaD:17 |
+| main.rs:22:31:22:44 | l2.align_to(...) [Ok] | main.rs:22:31:22:53 | ... .unwrap() | provenance | MaD:40 |
+| main.rs:22:31:22:53 | ... .unwrap() | main.rs:22:13:22:29 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
+| main.rs:23:31:23:44 | l2.align_to(...) [Ok] | main.rs:23:31:23:53 | ... .unwrap() | provenance | MaD:40 |
+| main.rs:23:31:23:53 | ... .unwrap() | main.rs:23:31:23:68 | ... .pad_to_align() | provenance | MaD:33 |
+| main.rs:23:31:23:68 | ... .pad_to_align() | main.rs:23:13:23:29 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
+| main.rs:24:38:24:39 | l2 | main.rs:24:13:24:36 | ...::alloc_zeroed | provenance | MaD:16 Sink:MaD:16 |
 | main.rs:29:9:29:10 | l4 | main.rs:30:31:30:32 | l4 | provenance |  |
 | main.rs:29:14:29:64 | ...::from_size_align_unchecked(...) | main.rs:29:9:29:10 | l4 | provenance |  |
-| main.rs:29:60:29:60 | v | main.rs:29:14:29:64 | ...::from_size_align_unchecked(...) | provenance | MaD:33 |
-| main.rs:30:31:30:32 | l4 | main.rs:30:13:30:29 | ...::alloc | provenance | MaD:16 Sink:MaD:16 |
+| main.rs:29:60:29:60 | v | main.rs:29:14:29:64 | ...::from_size_align_unchecked(...) | provenance | MaD:32 |
+| main.rs:30:31:30:32 | l4 | main.rs:30:13:30:29 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
 | main.rs:32:9:32:10 | l5 | main.rs:33:31:33:32 | l5 | provenance |  |
 | main.rs:32:14:32:118 | ...::from_size_align_unchecked(...) | main.rs:32:9:32:10 | l5 | provenance |  |
-| main.rs:32:60:32:60 | v | main.rs:32:60:32:89 | ... * ... | provenance | MaD:44 |
-| main.rs:32:60:32:89 | ... * ... | main.rs:32:14:32:118 | ...::from_size_align_unchecked(...) | provenance | MaD:33 |
-| main.rs:33:31:33:32 | l5 | main.rs:33:13:33:29 | ...::alloc | provenance | MaD:16 Sink:MaD:16 |
+| main.rs:32:60:32:60 | v | main.rs:32:60:32:89 | ... * ... | provenance | MaD:43 |
+| main.rs:32:60:32:89 | ... * ... | main.rs:32:14:32:118 | ...::from_size_align_unchecked(...) | provenance | MaD:32 |
+| main.rs:33:31:33:32 | l5 | main.rs:33:13:33:29 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
 | main.rs:35:9:35:10 | s6 | main.rs:36:60:36:61 | s6 | provenance |  |
 | main.rs:35:15:35:49 | ... * ... | main.rs:35:9:35:10 | s6 | provenance |  |
-| main.rs:35:49:35:49 | v | main.rs:35:15:35:49 | ... * ... | provenance | MaD:43 |
+| main.rs:35:49:35:49 | v | main.rs:35:15:35:49 | ... * ... | provenance | MaD:42 |
 | main.rs:36:9:36:10 | l6 | main.rs:37:31:37:32 | l6 | provenance |  |
 | main.rs:36:9:36:10 | l6 [Layout.size] | main.rs:37:31:37:32 | l6 [Layout.size] | provenance |  |
 | main.rs:36:14:36:65 | ...::from_size_align_unchecked(...) | main.rs:36:9:36:10 | l6 | provenance |  |
 | main.rs:36:14:36:65 | ...::from_size_align_unchecked(...) [Layout.size] | main.rs:36:9:36:10 | l6 [Layout.size] | provenance |  |
-| main.rs:36:60:36:61 | s6 | main.rs:36:14:36:65 | ...::from_size_align_unchecked(...) | provenance | MaD:33 |
-| main.rs:36:60:36:61 | s6 | main.rs:36:14:36:65 | ...::from_size_align_unchecked(...) [Layout.size] | provenance | MaD:32 |
-| main.rs:37:31:37:32 | l6 | main.rs:37:13:37:29 | ...::alloc | provenance | MaD:16 Sink:MaD:16 |
-| main.rs:37:31:37:32 | l6 | main.rs:39:60:39:68 | l6.size() | provenance | MaD:38 |
-| main.rs:37:31:37:32 | l6 [Layout.size] | main.rs:39:60:39:68 | l6.size() | provenance | MaD:37 |
+| main.rs:36:60:36:61 | s6 | main.rs:36:14:36:65 | ...::from_size_align_unchecked(...) | provenance | MaD:32 |
+| main.rs:36:60:36:61 | s6 | main.rs:36:14:36:65 | ...::from_size_align_unchecked(...) [Layout.size] | provenance | MaD:31 |
+| main.rs:37:31:37:32 | l6 | main.rs:37:13:37:29 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
+| main.rs:37:31:37:32 | l6 | main.rs:39:60:39:68 | l6.size() | provenance | MaD:37 |
+| main.rs:37:31:37:32 | l6 [Layout.size] | main.rs:39:60:39:68 | l6.size() | provenance | MaD:36 |
 | main.rs:39:9:39:10 | l7 | main.rs:40:31:40:32 | l7 | provenance |  |
 | main.rs:39:14:39:72 | ...::from_size_align_unchecked(...) | main.rs:39:9:39:10 | l7 | provenance |  |
-| main.rs:39:60:39:68 | l6.size() | main.rs:39:14:39:72 | ...::from_size_align_unchecked(...) | provenance | MaD:33 |
-| main.rs:40:31:40:32 | l7 | main.rs:40:13:40:29 | ...::alloc | provenance | MaD:16 Sink:MaD:16 |
+| main.rs:39:60:39:68 | l6.size() | main.rs:39:14:39:72 | ...::from_size_align_unchecked(...) | provenance | MaD:32 |
+| main.rs:40:31:40:32 | l7 | main.rs:40:13:40:29 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
 | main.rs:43:44:43:51 | ...: usize | main.rs:50:41:50:41 | v | provenance |  |
 | main.rs:43:44:43:51 | ...: usize | main.rs:51:41:51:45 | ... + ... | provenance |  |
 | main.rs:43:44:43:51 | ...: usize | main.rs:53:48:53:48 | v | provenance |  |
 | main.rs:43:44:43:51 | ...: usize | main.rs:54:48:54:53 | ... * ... | provenance |  |
 | main.rs:43:44:43:51 | ...: usize | main.rs:58:34:58:34 | v | provenance |  |
 | main.rs:43:44:43:51 | ...: usize | main.rs:67:46:67:46 | v | provenance |  |
-| main.rs:50:31:50:42 | l2.repeat(...) [Ok, tuple.0] | main.rs:50:31:50:51 | ... .unwrap() [tuple.0] | provenance | MaD:41 |
+| main.rs:50:31:50:42 | l2.repeat(...) [Ok, tuple.0] | main.rs:50:31:50:51 | ... .unwrap() [tuple.0] | provenance | MaD:40 |
 | main.rs:50:31:50:51 | ... .unwrap() [tuple.0] | main.rs:50:31:50:53 | ... .0 | provenance |  |
-| main.rs:50:31:50:53 | ... .0 | main.rs:50:13:50:29 | ...::alloc | provenance | MaD:16 Sink:MaD:16 |
-| main.rs:50:41:50:41 | v | main.rs:50:31:50:42 | l2.repeat(...) [Ok, tuple.0] | provenance | MaD:35 |
-| main.rs:51:31:51:46 | l2.repeat(...) [Ok, tuple.0] | main.rs:51:31:51:55 | ... .unwrap() [tuple.0] | provenance | MaD:41 |
+| main.rs:50:31:50:53 | ... .0 | main.rs:50:13:50:29 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
+| main.rs:50:41:50:41 | v | main.rs:50:31:50:42 | l2.repeat(...) [Ok, tuple.0] | provenance | MaD:34 |
+| main.rs:51:31:51:46 | l2.repeat(...) [Ok, tuple.0] | main.rs:51:31:51:55 | ... .unwrap() [tuple.0] | provenance | MaD:40 |
 | main.rs:51:31:51:55 | ... .unwrap() [tuple.0] | main.rs:51:31:51:57 | ... .0 | provenance |  |
-| main.rs:51:31:51:57 | ... .0 | main.rs:51:13:51:29 | ...::alloc | provenance | MaD:16 Sink:MaD:16 |
-| main.rs:51:41:51:45 | ... + ... | main.rs:51:31:51:46 | l2.repeat(...) [Ok, tuple.0] | provenance | MaD:35 |
-| main.rs:53:31:53:49 | l2.repeat_packed(...) [Ok] | main.rs:53:31:53:58 | ... .unwrap() | provenance | MaD:41 |
-| main.rs:53:31:53:58 | ... .unwrap() | main.rs:53:13:53:29 | ...::alloc | provenance | MaD:16 Sink:MaD:16 |
-| main.rs:53:48:53:48 | v | main.rs:53:31:53:49 | l2.repeat_packed(...) [Ok] | provenance | MaD:36 |
-| main.rs:54:31:54:54 | l2.repeat_packed(...) [Ok] | main.rs:54:31:54:63 | ... .unwrap() | provenance | MaD:41 |
-| main.rs:54:31:54:63 | ... .unwrap() | main.rs:54:13:54:29 | ...::alloc | provenance | MaD:16 Sink:MaD:16 |
-| main.rs:54:48:54:53 | ... * ... | main.rs:54:31:54:54 | l2.repeat_packed(...) [Ok] | provenance | MaD:36 |
+| main.rs:51:31:51:57 | ... .0 | main.rs:51:13:51:29 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
+| main.rs:51:41:51:45 | ... + ... | main.rs:51:31:51:46 | l2.repeat(...) [Ok, tuple.0] | provenance | MaD:34 |
+| main.rs:53:31:53:49 | l2.repeat_packed(...) [Ok] | main.rs:53:31:53:58 | ... .unwrap() | provenance | MaD:40 |
+| main.rs:53:31:53:58 | ... .unwrap() | main.rs:53:13:53:29 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
+| main.rs:53:48:53:48 | v | main.rs:53:31:53:49 | l2.repeat_packed(...) [Ok] | provenance | MaD:35 |
+| main.rs:54:31:54:54 | l2.repeat_packed(...) [Ok] | main.rs:54:31:54:63 | ... .unwrap() | provenance | MaD:40 |
+| main.rs:54:31:54:63 | ... .unwrap() | main.rs:54:13:54:29 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
+| main.rs:54:48:54:53 | ... * ... | main.rs:54:31:54:54 | l2.repeat_packed(...) [Ok] | provenance | MaD:35 |
 | main.rs:58:9:58:20 | TuplePat [tuple.0] | main.rs:58:10:58:11 | k1 | provenance |  |
 | main.rs:58:10:58:11 | k1 | main.rs:59:31:59:32 | k1 | provenance |  |
-| main.rs:58:24:58:35 | l3.repeat(...) [Ok, tuple.0] | main.rs:58:24:58:66 | ... .expect(...) [tuple.0] | provenance | MaD:40 |
+| main.rs:58:24:58:35 | l3.repeat(...) [Ok, tuple.0] | main.rs:58:24:58:66 | ... .expect(...) [tuple.0] | provenance | MaD:39 |
 | main.rs:58:24:58:66 | ... .expect(...) [tuple.0] | main.rs:58:9:58:20 | TuplePat [tuple.0] | provenance |  |
-| main.rs:58:34:58:34 | v | main.rs:58:24:58:35 | l3.repeat(...) [Ok, tuple.0] | provenance | MaD:35 |
-| main.rs:59:31:59:32 | k1 | main.rs:59:13:59:29 | ...::alloc | provenance | MaD:16 Sink:MaD:16 |
+| main.rs:58:34:58:34 | v | main.rs:58:24:58:35 | l3.repeat(...) [Ok, tuple.0] | provenance | MaD:34 |
+| main.rs:59:31:59:32 | k1 | main.rs:59:13:59:29 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
 | main.rs:59:31:59:32 | k1 | main.rs:60:34:60:35 | k1 | provenance |  |
-| main.rs:59:31:59:32 | k1 | main.rs:62:24:62:36 | k1.extend(...) [Ok, tuple.0] | provenance | MaD:28 |
+| main.rs:59:31:59:32 | k1 | main.rs:62:24:62:36 | k1.extend(...) [Ok, tuple.0] | provenance | MaD:27 |
 | main.rs:59:31:59:32 | k1 | main.rs:64:48:64:49 | k1 | provenance |  |
-| main.rs:59:31:59:32 | k1 | main.rs:65:31:65:50 | k1.extend_packed(...) [Ok] | provenance | MaD:30 |
+| main.rs:59:31:59:32 | k1 | main.rs:65:31:65:50 | k1.extend_packed(...) [Ok] | provenance | MaD:29 |
 | main.rs:60:9:60:20 | TuplePat [tuple.0] | main.rs:60:10:60:11 | k2 | provenance |  |
 | main.rs:60:10:60:11 | k2 | main.rs:61:31:61:32 | k2 | provenance |  |
-| main.rs:60:24:60:36 | l3.extend(...) [Ok, tuple.0] | main.rs:60:24:60:45 | ... .unwrap() [tuple.0] | provenance | MaD:41 |
+| main.rs:60:24:60:36 | l3.extend(...) [Ok, tuple.0] | main.rs:60:24:60:45 | ... .unwrap() [tuple.0] | provenance | MaD:40 |
 | main.rs:60:24:60:45 | ... .unwrap() [tuple.0] | main.rs:60:9:60:20 | TuplePat [tuple.0] | provenance |  |
-| main.rs:60:34:60:35 | k1 | main.rs:60:24:60:36 | l3.extend(...) [Ok, tuple.0] | provenance | MaD:27 |
-| main.rs:61:31:61:32 | k2 | main.rs:61:13:61:29 | ...::alloc | provenance | MaD:16 Sink:MaD:16 |
+| main.rs:60:34:60:35 | k1 | main.rs:60:24:60:36 | l3.extend(...) [Ok, tuple.0] | provenance | MaD:26 |
+| main.rs:61:31:61:32 | k2 | main.rs:61:13:61:29 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
 | main.rs:62:9:62:20 | TuplePat [tuple.0] | main.rs:62:10:62:11 | k3 | provenance |  |
 | main.rs:62:10:62:11 | k3 | main.rs:63:31:63:32 | k3 | provenance |  |
-| main.rs:62:24:62:36 | k1.extend(...) [Ok, tuple.0] | main.rs:62:24:62:45 | ... .unwrap() [tuple.0] | provenance | MaD:41 |
+| main.rs:62:24:62:36 | k1.extend(...) [Ok, tuple.0] | main.rs:62:24:62:45 | ... .unwrap() [tuple.0] | provenance | MaD:40 |
 | main.rs:62:24:62:45 | ... .unwrap() [tuple.0] | main.rs:62:9:62:20 | TuplePat [tuple.0] | provenance |  |
-| main.rs:63:31:63:32 | k3 | main.rs:63:13:63:29 | ...::alloc | provenance | MaD:16 Sink:MaD:16 |
-| main.rs:64:31:64:50 | l3.extend_packed(...) [Ok] | main.rs:64:31:64:59 | ... .unwrap() | provenance | MaD:41 |
-| main.rs:64:31:64:59 | ... .unwrap() | main.rs:64:13:64:29 | ...::alloc | provenance | MaD:16 Sink:MaD:16 |
-| main.rs:64:48:64:49 | k1 | main.rs:64:31:64:50 | l3.extend_packed(...) [Ok] | provenance | MaD:29 |
-| main.rs:65:31:65:50 | k1.extend_packed(...) [Ok] | main.rs:65:31:65:59 | ... .unwrap() | provenance | MaD:41 |
-| main.rs:65:31:65:59 | ... .unwrap() | main.rs:65:13:65:29 | ...::alloc | provenance | MaD:16 Sink:MaD:16 |
+| main.rs:63:31:63:32 | k3 | main.rs:63:13:63:29 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
+| main.rs:64:31:64:50 | l3.extend_packed(...) [Ok] | main.rs:64:31:64:59 | ... .unwrap() | provenance | MaD:40 |
+| main.rs:64:31:64:59 | ... .unwrap() | main.rs:64:13:64:29 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
+| main.rs:64:48:64:49 | k1 | main.rs:64:31:64:50 | l3.extend_packed(...) [Ok] | provenance | MaD:28 |
+| main.rs:65:31:65:50 | k1.extend_packed(...) [Ok] | main.rs:65:31:65:59 | ... .unwrap() | provenance | MaD:40 |
+| main.rs:65:31:65:59 | ... .unwrap() | main.rs:65:13:65:29 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
 | main.rs:67:9:67:10 | l4 | main.rs:68:31:68:32 | l4 | provenance |  |
-| main.rs:67:14:67:47 | ...::array::<...>(...) [Ok] | main.rs:67:14:67:56 | ... .unwrap() | provenance | MaD:41 |
+| main.rs:67:14:67:47 | ...::array::<...>(...) [Ok] | main.rs:67:14:67:56 | ... .unwrap() | provenance | MaD:40 |
 | main.rs:67:14:67:56 | ... .unwrap() | main.rs:67:9:67:10 | l4 | provenance |  |
-| main.rs:67:46:67:46 | v | main.rs:67:14:67:47 | ...::array::<...>(...) [Ok] | provenance | MaD:26 |
-| main.rs:68:31:68:32 | l4 | main.rs:68:13:68:29 | ...::alloc | provenance | MaD:16 Sink:MaD:16 |
+| main.rs:67:46:67:46 | v | main.rs:67:14:67:47 | ...::array::<...>(...) [Ok] | provenance | MaD:25 |
+| main.rs:68:31:68:32 | l4 | main.rs:68:13:68:29 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
 | main.rs:86:35:86:42 | ...: usize | main.rs:87:54:87:54 | v | provenance |  |
 | main.rs:87:9:87:14 | layout | main.rs:88:31:88:36 | layout | provenance |  |
-| main.rs:87:18:87:58 | ...::from_size_align(...) [Ok] | main.rs:87:18:87:67 | ... .unwrap() | provenance | MaD:41 |
+| main.rs:87:18:87:58 | ...::from_size_align(...) [Ok] | main.rs:87:18:87:67 | ... .unwrap() | provenance | MaD:40 |
 | main.rs:87:18:87:67 | ... .unwrap() | main.rs:87:9:87:14 | layout | provenance |  |
-| main.rs:87:54:87:54 | v | main.rs:87:18:87:58 | ...::from_size_align(...) [Ok] | provenance | MaD:31 |
-| main.rs:88:31:88:36 | layout | main.rs:88:13:88:29 | ...::alloc | provenance | MaD:16 Sink:MaD:16 |
+| main.rs:87:54:87:54 | v | main.rs:87:18:87:58 | ...::from_size_align(...) [Ok] | provenance | MaD:30 |
+| main.rs:88:31:88:36 | layout | main.rs:88:13:88:29 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
 | main.rs:91:38:91:45 | ...: usize | main.rs:92:47:92:47 | v | provenance |  |
 | main.rs:91:38:91:45 | ...: usize | main.rs:101:51:101:51 | v | provenance |  |
 | main.rs:91:38:91:45 | ...: usize | main.rs:105:33:105:33 | v | provenance |  |
@@ -173,115 +165,106 @@ edges
 | main.rs:91:38:91:45 | ...: usize | main.rs:161:55:161:55 | v | provenance |  |
 | main.rs:92:9:92:10 | l1 | main.rs:96:35:96:36 | l1 | provenance |  |
 | main.rs:92:9:92:10 | l1 | main.rs:102:35:102:36 | l1 | provenance |  |
-| main.rs:92:14:92:48 | ...::array::<...>(...) [Ok] | main.rs:92:14:92:57 | ... .unwrap() | provenance | MaD:41 |
+| main.rs:92:14:92:48 | ...::array::<...>(...) [Ok] | main.rs:92:14:92:57 | ... .unwrap() | provenance | MaD:40 |
 | main.rs:92:14:92:57 | ... .unwrap() | main.rs:92:9:92:10 | l1 | provenance |  |
-| main.rs:92:47:92:47 | v | main.rs:92:14:92:48 | ...::array::<...>(...) [Ok] | provenance | MaD:26 |
-| main.rs:96:35:96:36 | l1 | main.rs:96:17:96:33 | ...::alloc | provenance | MaD:16 Sink:MaD:16 |
+| main.rs:92:47:92:47 | v | main.rs:92:14:92:48 | ...::array::<...>(...) [Ok] | provenance | MaD:25 |
+| main.rs:96:35:96:36 | l1 | main.rs:96:17:96:33 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
 | main.rs:96:35:96:36 | l1 | main.rs:109:35:109:36 | l1 | provenance |  |
 | main.rs:96:35:96:36 | l1 | main.rs:111:35:111:36 | l1 | provenance |  |
 | main.rs:101:13:101:14 | l3 | main.rs:103:35:103:36 | l3 | provenance |  |
-| main.rs:101:18:101:52 | ...::array::<...>(...) [Ok] | main.rs:101:18:101:61 | ... .unwrap() | provenance | MaD:41 |
+| main.rs:101:18:101:52 | ...::array::<...>(...) [Ok] | main.rs:101:18:101:61 | ... .unwrap() | provenance | MaD:40 |
 | main.rs:101:18:101:61 | ... .unwrap() | main.rs:101:13:101:14 | l3 | provenance |  |
-| main.rs:101:51:101:51 | v | main.rs:101:18:101:52 | ...::array::<...>(...) [Ok] | provenance | MaD:26 |
-| main.rs:102:35:102:36 | l1 | main.rs:102:17:102:33 | ...::alloc | provenance | MaD:16 Sink:MaD:16 |
+| main.rs:101:51:101:51 | v | main.rs:101:18:101:52 | ...::array::<...>(...) [Ok] | provenance | MaD:25 |
+| main.rs:102:35:102:36 | l1 | main.rs:102:17:102:33 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
 | main.rs:102:35:102:36 | l1 | main.rs:109:35:109:36 | l1 | provenance |  |
 | main.rs:102:35:102:36 | l1 | main.rs:111:35:111:36 | l1 | provenance |  |
-| main.rs:103:35:103:36 | l3 | main.rs:103:17:103:33 | ...::alloc | provenance | MaD:16 Sink:MaD:16 |
+| main.rs:103:35:103:36 | l3 | main.rs:103:17:103:33 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
 | main.rs:105:33:105:33 | v | main.rs:86:35:86:42 | ...: usize | provenance |  |
-| main.rs:109:35:109:36 | l1 | main.rs:109:17:109:33 | ...::alloc | provenance | MaD:16 Sink:MaD:16 |
+| main.rs:109:35:109:36 | l1 | main.rs:109:17:109:33 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
 | main.rs:109:35:109:36 | l1 | main.rs:146:35:146:36 | l1 | provenance |  |
-| main.rs:111:35:111:36 | l1 | main.rs:111:17:111:33 | ...::alloc | provenance | MaD:16 Sink:MaD:16 |
+| main.rs:111:35:111:36 | l1 | main.rs:111:17:111:33 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
 | main.rs:111:35:111:36 | l1 | main.rs:146:35:146:36 | l1 | provenance |  |
 | main.rs:145:13:145:14 | l9 | main.rs:148:35:148:36 | l9 | provenance |  |
-| main.rs:145:18:145:52 | ...::array::<...>(...) [Ok] | main.rs:145:18:145:61 | ... .unwrap() | provenance | MaD:41 |
+| main.rs:145:18:145:52 | ...::array::<...>(...) [Ok] | main.rs:145:18:145:61 | ... .unwrap() | provenance | MaD:40 |
 | main.rs:145:18:145:61 | ... .unwrap() | main.rs:145:13:145:14 | l9 | provenance |  |
-| main.rs:145:51:145:51 | v | main.rs:145:18:145:52 | ...::array::<...>(...) [Ok] | provenance | MaD:26 |
-| main.rs:146:35:146:36 | l1 | main.rs:146:17:146:33 | ...::alloc | provenance | MaD:16 Sink:MaD:16 |
+| main.rs:145:51:145:51 | v | main.rs:145:18:145:52 | ...::array::<...>(...) [Ok] | provenance | MaD:25 |
+| main.rs:146:35:146:36 | l1 | main.rs:146:17:146:33 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
 | main.rs:146:35:146:36 | l1 | main.rs:177:31:177:32 | l1 | provenance |  |
-| main.rs:148:35:148:36 | l9 | main.rs:148:17:148:33 | ...::alloc | provenance | MaD:16 Sink:MaD:16 |
+| main.rs:148:35:148:36 | l9 | main.rs:148:17:148:33 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
 | main.rs:151:9:151:11 | l10 | main.rs:152:31:152:33 | l10 | provenance |  |
-| main.rs:151:15:151:69 | ...::array::<...>(...) [Ok] | main.rs:151:15:151:78 | ... .unwrap() | provenance | MaD:41 |
+| main.rs:151:15:151:69 | ...::array::<...>(...) [Ok] | main.rs:151:15:151:78 | ... .unwrap() | provenance | MaD:40 |
 | main.rs:151:15:151:78 | ... .unwrap() | main.rs:151:9:151:11 | l10 | provenance |  |
-| main.rs:151:48:151:68 | ...::min(...) | main.rs:151:15:151:69 | ...::array::<...>(...) [Ok] | provenance | MaD:26 |
-| main.rs:151:62:151:62 | v | main.rs:151:48:151:68 | ...::min(...) | provenance | MaD:46 |
-| main.rs:152:31:152:33 | l10 | main.rs:152:13:152:29 | ...::alloc | provenance | MaD:16 Sink:MaD:16 |
+| main.rs:151:48:151:68 | ...::min(...) | main.rs:151:15:151:69 | ...::array::<...>(...) [Ok] | provenance | MaD:25 |
+| main.rs:151:62:151:62 | v | main.rs:151:48:151:68 | ...::min(...) | provenance | MaD:45 |
+| main.rs:152:31:152:33 | l10 | main.rs:152:13:152:29 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
 | main.rs:154:9:154:11 | l11 | main.rs:155:31:155:33 | l11 | provenance |  |
-| main.rs:154:15:154:69 | ...::array::<...>(...) [Ok] | main.rs:154:15:154:78 | ... .unwrap() | provenance | MaD:41 |
+| main.rs:154:15:154:69 | ...::array::<...>(...) [Ok] | main.rs:154:15:154:78 | ... .unwrap() | provenance | MaD:40 |
 | main.rs:154:15:154:78 | ... .unwrap() | main.rs:154:9:154:11 | l11 | provenance |  |
-| main.rs:154:48:154:68 | ...::max(...) | main.rs:154:15:154:69 | ...::array::<...>(...) [Ok] | provenance | MaD:26 |
-| main.rs:154:62:154:62 | v | main.rs:154:48:154:68 | ...::max(...) | provenance | MaD:45 |
-| main.rs:155:31:155:33 | l11 | main.rs:155:13:155:29 | ...::alloc | provenance | MaD:16 Sink:MaD:16 |
+| main.rs:154:48:154:68 | ...::max(...) | main.rs:154:15:154:69 | ...::array::<...>(...) [Ok] | provenance | MaD:25 |
+| main.rs:154:62:154:62 | v | main.rs:154:48:154:68 | ...::max(...) | provenance | MaD:44 |
+| main.rs:155:31:155:33 | l11 | main.rs:155:13:155:29 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
 | main.rs:161:13:161:15 | l13 | main.rs:162:35:162:37 | l13 | provenance |  |
-| main.rs:161:19:161:59 | ...::from_size_align(...) [Ok] | main.rs:161:19:161:68 | ... .unwrap() | provenance | MaD:41 |
+| main.rs:161:19:161:59 | ...::from_size_align(...) [Ok] | main.rs:161:19:161:68 | ... .unwrap() | provenance | MaD:40 |
 | main.rs:161:19:161:68 | ... .unwrap() | main.rs:161:13:161:15 | l13 | provenance |  |
-| main.rs:161:55:161:55 | v | main.rs:161:19:161:59 | ...::from_size_align(...) [Ok] | provenance | MaD:31 |
-| main.rs:162:35:162:37 | l13 | main.rs:162:17:162:33 | ...::alloc | provenance | MaD:16 Sink:MaD:16 |
+| main.rs:161:55:161:55 | v | main.rs:161:19:161:59 | ...::from_size_align(...) [Ok] | provenance | MaD:30 |
+| main.rs:162:35:162:37 | l13 | main.rs:162:17:162:33 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
 | main.rs:162:35:162:37 | l13 | main.rs:169:35:169:37 | l13 | provenance |  |
-| main.rs:169:35:169:37 | l13 | main.rs:169:17:169:33 | ...::alloc | provenance | MaD:16 Sink:MaD:16 |
-| main.rs:177:31:177:32 | l1 | main.rs:177:13:177:29 | ...::alloc | provenance | MaD:16 Sink:MaD:16 |
+| main.rs:169:35:169:37 | l13 | main.rs:169:17:169:33 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
+| main.rs:177:31:177:32 | l1 | main.rs:177:13:177:29 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
 | main.rs:183:29:183:36 | ...: usize | main.rs:192:46:192:46 | v | provenance |  |
 | main.rs:183:29:183:36 | ...: usize | main.rs:202:48:202:48 | v | provenance |  |
 | main.rs:192:9:192:10 | l2 | main.rs:193:38:193:39 | l2 | provenance |  |
-| main.rs:192:14:192:47 | ...::array::<...>(...) [Ok] | main.rs:192:14:192:56 | ... .unwrap() | provenance | MaD:41 |
+| main.rs:192:14:192:47 | ...::array::<...>(...) [Ok] | main.rs:192:14:192:56 | ... .unwrap() | provenance | MaD:40 |
 | main.rs:192:14:192:56 | ... .unwrap() | main.rs:192:9:192:10 | l2 | provenance |  |
-| main.rs:192:46:192:46 | v | main.rs:192:14:192:47 | ...::array::<...>(...) [Ok] | provenance | MaD:26 |
+| main.rs:192:46:192:46 | v | main.rs:192:14:192:47 | ...::array::<...>(...) [Ok] | provenance | MaD:25 |
 | main.rs:193:38:193:39 | l2 | main.rs:193:32:193:36 | alloc | provenance | MaD:10 Sink:MaD:10 |
-| main.rs:193:38:193:39 | l2 | main.rs:193:32:193:36 | alloc | provenance | MaD:11 Sink:MaD:11 |
 | main.rs:193:38:193:39 | l2 | main.rs:194:45:194:46 | l2 | provenance |  |
+| main.rs:194:45:194:46 | l2 | main.rs:194:32:194:43 | alloc_zeroed | provenance | MaD:11 Sink:MaD:11 |
 | main.rs:194:45:194:46 | l2 | main.rs:194:32:194:43 | alloc_zeroed | provenance | MaD:12 Sink:MaD:12 |
-| main.rs:194:45:194:46 | l2 | main.rs:194:32:194:43 | alloc_zeroed | provenance | MaD:12 Sink:MaD:12 |
-| main.rs:194:45:194:46 | l2 | main.rs:194:32:194:43 | alloc_zeroed | provenance | MaD:13 Sink:MaD:13 |
 | main.rs:194:45:194:46 | l2 | main.rs:195:41:195:42 | l2 | provenance |  |
 | main.rs:195:41:195:42 | l2 | main.rs:195:32:195:39 | allocate | provenance | MaD:5 Sink:MaD:5 |
-| main.rs:195:41:195:42 | l2 | main.rs:195:32:195:39 | allocate | provenance | MaD:5 Sink:MaD:5 |
 | main.rs:195:41:195:42 | l2 | main.rs:196:48:196:49 | l2 | provenance |  |
 | main.rs:196:48:196:49 | l2 | main.rs:196:32:196:46 | allocate_zeroed | provenance | MaD:6 Sink:MaD:6 |
-| main.rs:196:48:196:49 | l2 | main.rs:196:32:196:46 | allocate_zeroed | provenance | MaD:6 Sink:MaD:6 |
 | main.rs:196:48:196:49 | l2 | main.rs:197:41:197:42 | l2 | provenance |  |
 | main.rs:197:41:197:42 | l2 | main.rs:197:32:197:39 | allocate | provenance | MaD:1 Sink:MaD:1 |
-| main.rs:197:41:197:42 | l2 | main.rs:197:32:197:39 | allocate | provenance | MaD:1 Sink:MaD:1 |
 | main.rs:197:41:197:42 | l2 | main.rs:198:48:198:49 | l2 | provenance |  |
 | main.rs:198:48:198:49 | l2 | main.rs:198:32:198:46 | allocate_zeroed | provenance | MaD:2 Sink:MaD:2 |
-| main.rs:198:48:198:49 | l2 | main.rs:198:32:198:46 | allocate_zeroed | provenance | MaD:2 Sink:MaD:2 |
 | main.rs:198:48:198:49 | l2 | main.rs:208:53:208:54 | l2 | provenance |  |
 | main.rs:198:48:198:49 | l2 | main.rs:210:60:210:61 | l2 | provenance |  |
 | main.rs:198:48:198:49 | l2 | main.rs:213:51:213:52 | l2 | provenance |  |
+| main.rs:202:48:202:48 | v | main.rs:202:32:202:38 | realloc | provenance | MaD:13 Sink:MaD:13 |
 | main.rs:202:48:202:48 | v | main.rs:202:32:202:38 | realloc | provenance | MaD:14 Sink:MaD:14 |
-| main.rs:202:48:202:48 | v | main.rs:202:32:202:38 | realloc | provenance | MaD:15 Sink:MaD:15 |
 | main.rs:208:53:208:54 | l2 | main.rs:208:40:208:43 | grow | provenance | MaD:7 Sink:MaD:7 |
-| main.rs:208:53:208:54 | l2 | main.rs:208:40:208:43 | grow | provenance | MaD:7 Sink:MaD:7 |
-| main.rs:210:60:210:61 | l2 | main.rs:210:40:210:50 | grow_zeroed | provenance | MaD:8 Sink:MaD:8 |
 | main.rs:210:60:210:61 | l2 | main.rs:210:40:210:50 | grow_zeroed | provenance | MaD:8 Sink:MaD:8 |
 | main.rs:213:51:213:52 | l2 | main.rs:213:36:213:41 | shrink | provenance | MaD:9 Sink:MaD:9 |
 | main.rs:217:27:217:34 | ...: usize | main.rs:219:26:219:26 | v | provenance |  |
-| main.rs:219:26:219:26 | v | main.rs:219:13:219:24 | ...::malloc | provenance | MaD:21 Sink:MaD:21 |
+| main.rs:219:26:219:26 | v | main.rs:219:13:219:24 | ...::malloc | provenance | MaD:20 Sink:MaD:20 |
 | main.rs:219:26:219:26 | v | main.rs:220:36:220:36 | v | provenance |  |
-| main.rs:220:36:220:36 | v | main.rs:220:13:220:31 | ...::aligned_alloc | provenance | MaD:19 Sink:MaD:19 |
+| main.rs:220:36:220:36 | v | main.rs:220:13:220:31 | ...::aligned_alloc | provenance | MaD:18 Sink:MaD:18 |
 | main.rs:220:36:220:36 | v | main.rs:222:30:222:30 | v | provenance |  |
-| main.rs:222:30:222:30 | v | main.rs:222:13:222:24 | ...::calloc | provenance | MaD:20 Sink:MaD:20 |
+| main.rs:222:30:222:30 | v | main.rs:222:13:222:24 | ...::calloc | provenance | MaD:19 Sink:MaD:19 |
 | main.rs:222:30:222:30 | v | main.rs:223:26:223:26 | v | provenance |  |
-| main.rs:223:26:223:26 | v | main.rs:223:13:223:24 | ...::calloc | provenance | MaD:20 Sink:MaD:20 |
+| main.rs:223:26:223:26 | v | main.rs:223:13:223:24 | ...::calloc | provenance | MaD:19 Sink:MaD:19 |
 | main.rs:223:26:223:26 | v | main.rs:224:31:224:31 | v | provenance |  |
-| main.rs:224:31:224:31 | v | main.rs:224:13:224:25 | ...::realloc | provenance | MaD:22 Sink:MaD:22 |
+| main.rs:224:31:224:31 | v | main.rs:224:13:224:25 | ...::realloc | provenance | MaD:21 Sink:MaD:21 |
 | main.rs:227:24:227:31 | ...: usize | main.rs:230:46:230:46 | v | provenance |  |
 | main.rs:230:46:230:46 | v | main.rs:230:13:230:44 | ...::try_with_capacity_in | provenance | MaD:3 Sink:MaD:3 |
 | main.rs:230:46:230:46 | v | main.rs:231:42:231:42 | v | provenance |  |
 | main.rs:231:42:231:42 | v | main.rs:231:13:231:40 | ...::with_capacity_in | provenance | MaD:4 Sink:MaD:4 |
-| main.rs:279:24:279:41 | ...: String | main.rs:280:21:280:47 | user_input.parse() [Ok] | provenance | MaD:42 |
-| main.rs:279:24:279:41 | ...: String | main.rs:280:21:280:47 | user_input.parse() [Ok] | provenance | MaD:42 |
+| main.rs:279:24:279:41 | ...: String | main.rs:280:21:280:47 | user_input.parse() [Ok] | provenance | MaD:41 |
 | main.rs:280:9:280:17 | num_bytes | main.rs:282:54:282:62 | num_bytes | provenance |  |
 | main.rs:280:21:280:47 | user_input.parse() [Ok] | main.rs:280:21:280:48 | TryExpr | provenance |  |
 | main.rs:280:21:280:48 | TryExpr | main.rs:280:9:280:17 | num_bytes | provenance |  |
-| main.rs:280:21:280:48 | TryExpr | main.rs:280:21:280:77 | ... * ... | provenance | MaD:44 |
+| main.rs:280:21:280:48 | TryExpr | main.rs:280:21:280:77 | ... * ... | provenance | MaD:43 |
 | main.rs:280:21:280:77 | ... * ... | main.rs:280:9:280:17 | num_bytes | provenance |  |
 | main.rs:282:9:282:14 | layout | main.rs:284:40:284:45 | layout | provenance |  |
-| main.rs:282:18:282:66 | ...::from_size_align(...) [Ok] | main.rs:282:18:282:75 | ... .unwrap() | provenance | MaD:41 |
+| main.rs:282:18:282:66 | ...::from_size_align(...) [Ok] | main.rs:282:18:282:75 | ... .unwrap() | provenance | MaD:40 |
 | main.rs:282:18:282:75 | ... .unwrap() | main.rs:282:9:282:14 | layout | provenance |  |
-| main.rs:282:54:282:62 | num_bytes | main.rs:282:18:282:66 | ...::from_size_align(...) [Ok] | provenance | MaD:31 |
-| main.rs:284:40:284:45 | layout | main.rs:284:22:284:38 | ...::alloc | provenance | MaD:16 Sink:MaD:16 |
-| main.rs:308:25:308:38 | ...::args | main.rs:308:25:308:40 | ...::args(...) [element] | provenance | Src:MaD:23  |
-| main.rs:308:25:308:40 | ...::args(...) [element] | main.rs:308:25:308:47 | ... .nth(...) [Some] | provenance | MaD:24 |
-| main.rs:308:25:308:47 | ... .nth(...) [Some] | main.rs:308:25:308:74 | ... .unwrap_or(...) | provenance | MaD:39 |
+| main.rs:282:54:282:62 | num_bytes | main.rs:282:18:282:66 | ...::from_size_align(...) [Ok] | provenance | MaD:30 |
+| main.rs:284:40:284:45 | layout | main.rs:284:22:284:38 | ...::alloc | provenance | MaD:15 Sink:MaD:15 |
+| main.rs:308:25:308:38 | ...::args | main.rs:308:25:308:40 | ...::args(...) [element] | provenance | Src:MaD:22  |
+| main.rs:308:25:308:40 | ...::args(...) [element] | main.rs:308:25:308:47 | ... .nth(...) [Some] | provenance | MaD:23 |
+| main.rs:308:25:308:47 | ... .nth(...) [Some] | main.rs:308:25:308:74 | ... .unwrap_or(...) | provenance | MaD:38 |
 | main.rs:308:25:308:74 | ... .unwrap_or(...) | main.rs:279:24:279:41 | ...: String | provenance |  |
 | main.rs:317:9:317:9 | v | main.rs:320:34:320:34 | v | provenance |  |
 | main.rs:317:9:317:9 | v | main.rs:321:42:321:42 | v | provenance |  |
@@ -289,12 +272,11 @@ edges
 | main.rs:317:9:317:9 | v | main.rs:323:27:323:27 | v | provenance |  |
 | main.rs:317:9:317:9 | v | main.rs:324:25:324:25 | v | provenance |  |
 | main.rs:317:9:317:9 | v | main.rs:325:22:325:22 | v | provenance |  |
-| main.rs:317:13:317:26 | ...::args | main.rs:317:13:317:28 | ...::args(...) [element] | provenance | Src:MaD:23  |
-| main.rs:317:13:317:28 | ...::args(...) [element] | main.rs:317:13:317:35 | ... .nth(...) [Some] | provenance | MaD:24 |
-| main.rs:317:13:317:35 | ... .nth(...) [Some] | main.rs:317:13:317:65 | ... .unwrap_or(...) | provenance | MaD:39 |
-| main.rs:317:13:317:65 | ... .unwrap_or(...) | main.rs:317:13:317:82 | ... .parse() [Ok] | provenance | MaD:42 |
-| main.rs:317:13:317:65 | ... .unwrap_or(...) | main.rs:317:13:317:82 | ... .parse() [Ok] | provenance | MaD:42 |
-| main.rs:317:13:317:82 | ... .parse() [Ok] | main.rs:317:13:317:91 | ... .unwrap() | provenance | MaD:41 |
+| main.rs:317:13:317:26 | ...::args | main.rs:317:13:317:28 | ...::args(...) [element] | provenance | Src:MaD:22  |
+| main.rs:317:13:317:28 | ...::args(...) [element] | main.rs:317:13:317:35 | ... .nth(...) [Some] | provenance | MaD:23 |
+| main.rs:317:13:317:35 | ... .nth(...) [Some] | main.rs:317:13:317:65 | ... .unwrap_or(...) | provenance | MaD:38 |
+| main.rs:317:13:317:65 | ... .unwrap_or(...) | main.rs:317:13:317:82 | ... .parse() [Ok] | provenance | MaD:41 |
+| main.rs:317:13:317:82 | ... .parse() [Ok] | main.rs:317:13:317:91 | ... .unwrap() | provenance | MaD:40 |
 | main.rs:317:13:317:91 | ... .unwrap() | main.rs:317:9:317:9 | v | provenance |  |
 | main.rs:320:34:320:34 | v | main.rs:12:36:12:43 | ...: usize | provenance |  |
 | main.rs:321:42:321:42 | v | main.rs:43:44:43:51 | ...: usize | provenance |  |
@@ -312,43 +294,42 @@ models
 | 7 | Sink: <std::alloc::System as core::alloc::Allocator>::grow; Argument[2]; alloc-layout |
 | 8 | Sink: <std::alloc::System as core::alloc::Allocator>::grow_zeroed; Argument[2]; alloc-layout |
 | 9 | Sink: <std::alloc::System as core::alloc::Allocator>::shrink; Argument[2]; alloc-layout |
-| 10 | Sink: <std::alloc::System as core::alloc::global::GlobalAlloc>::alloc; Argument[0]; alloc-layout |
-| 11 | Sink: <std::alloc::System as core::alloc::global::GlobalAlloc>::alloc; Argument[0]; alloc-size |
-| 12 | Sink: <std::alloc::System as core::alloc::global::GlobalAlloc>::alloc_zeroed; Argument[0]; alloc-layout |
-| 13 | Sink: <std::alloc::System as core::alloc::global::GlobalAlloc>::alloc_zeroed; Argument[0]; alloc-size |
-| 14 | Sink: <std::alloc::System as core::alloc::global::GlobalAlloc>::realloc; Argument[2]; alloc-layout |
-| 15 | Sink: <std::alloc::System as core::alloc::global::GlobalAlloc>::realloc; Argument[2]; alloc-size |
-| 16 | Sink: alloc::alloc::alloc; Argument[0]; alloc-layout |
-| 17 | Sink: alloc::alloc::alloc_zeroed; Argument[0]; alloc-layout |
-| 18 | Sink: alloc::alloc::realloc; Argument[2]; alloc-size |
-| 19 | Sink: libc::unix::aligned_alloc; Argument[1]; alloc-size |
-| 20 | Sink: libc::unix::calloc; Argument[0,1]; alloc-size |
-| 21 | Sink: libc::unix::malloc; Argument[0]; alloc-size |
-| 22 | Sink: libc::unix::realloc; Argument[1]; alloc-size |
-| 23 | Source: std::env::args; ReturnValue.Element; commandargs |
-| 24 | Summary: <_ as core::iter::traits::iterator::Iterator>::nth; Argument[self].Element; ReturnValue.Field[core::option::Option::Some(0)]; value |
-| 25 | Summary: <core::alloc::layout::Layout>::align_to; Argument[self]; ReturnValue.Field[core::result::Result::Ok(0)]; taint |
-| 26 | Summary: <core::alloc::layout::Layout>::array; Argument[0]; ReturnValue.Field[core::result::Result::Ok(0)]; taint |
-| 27 | Summary: <core::alloc::layout::Layout>::extend; Argument[0]; ReturnValue.Field[core::result::Result::Ok(0)].Field[0]; taint |
-| 28 | Summary: <core::alloc::layout::Layout>::extend; Argument[self]; ReturnValue.Field[core::result::Result::Ok(0)].Field[0]; taint |
-| 29 | Summary: <core::alloc::layout::Layout>::extend_packed; Argument[0]; ReturnValue.Field[core::result::Result::Ok(0)]; taint |
-| 30 | Summary: <core::alloc::layout::Layout>::extend_packed; Argument[self]; ReturnValue.Field[core::result::Result::Ok(0)]; taint |
-| 31 | Summary: <core::alloc::layout::Layout>::from_size_align; Argument[0]; ReturnValue.Field[core::result::Result::Ok(0)]; taint |
-| 32 | Summary: <core::alloc::layout::Layout>::from_size_align_unchecked; Argument[0]; ReturnValue.Field[core::alloc::layout::Layout::size]; value |
-| 33 | Summary: <core::alloc::layout::Layout>::from_size_align_unchecked; Argument[0]; ReturnValue; taint |
-| 34 | Summary: <core::alloc::layout::Layout>::pad_to_align; Argument[self]; ReturnValue; taint |
-| 35 | Summary: <core::alloc::layout::Layout>::repeat; Argument[0]; ReturnValue.Field[core::result::Result::Ok(0)].Field[0]; taint |
-| 36 | Summary: <core::alloc::layout::Layout>::repeat_packed; Argument[0]; ReturnValue.Field[core::result::Result::Ok(0)]; taint |
-| 37 | Summary: <core::alloc::layout::Layout>::size; Argument[self].Field[core::alloc::layout::Layout::size]; ReturnValue; value |
-| 38 | Summary: <core::alloc::layout::Layout>::size; Argument[self]; ReturnValue; taint |
-| 39 | Summary: <core::option::Option>::unwrap_or; Argument[self].Field[core::option::Option::Some(0)]; ReturnValue; value |
-| 40 | Summary: <core::result::Result>::expect; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
-| 41 | Summary: <core::result::Result>::unwrap; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
-| 42 | Summary: <core::str>::parse; Argument[self]; ReturnValue.Field[core::result::Result::Ok(0)]; taint |
-| 43 | Summary: <core::usize as core::ops::arith::Mul>::mul; Argument[0]; ReturnValue; taint |
-| 44 | Summary: <core::usize as core::ops::arith::Mul>::mul; Argument[self]; ReturnValue; taint |
-| 45 | Summary: core::cmp::max; Argument[0]; ReturnValue; value |
-| 46 | Summary: core::cmp::min; Argument[0]; ReturnValue; value |
+| 10 | Sink: <std::alloc::System as core::alloc::global::GlobalAlloc>::alloc; Argument[0]; alloc-size |
+| 11 | Sink: <std::alloc::System as core::alloc::global::GlobalAlloc>::alloc_zeroed; Argument[0]; alloc-layout |
+| 12 | Sink: <std::alloc::System as core::alloc::global::GlobalAlloc>::alloc_zeroed; Argument[0]; alloc-size |
+| 13 | Sink: <std::alloc::System as core::alloc::global::GlobalAlloc>::realloc; Argument[2]; alloc-layout |
+| 14 | Sink: <std::alloc::System as core::alloc::global::GlobalAlloc>::realloc; Argument[2]; alloc-size |
+| 15 | Sink: alloc::alloc::alloc; Argument[0]; alloc-layout |
+| 16 | Sink: alloc::alloc::alloc_zeroed; Argument[0]; alloc-layout |
+| 17 | Sink: alloc::alloc::realloc; Argument[2]; alloc-size |
+| 18 | Sink: libc::unix::aligned_alloc; Argument[1]; alloc-size |
+| 19 | Sink: libc::unix::calloc; Argument[0,1]; alloc-size |
+| 20 | Sink: libc::unix::malloc; Argument[0]; alloc-size |
+| 21 | Sink: libc::unix::realloc; Argument[1]; alloc-size |
+| 22 | Source: std::env::args; ReturnValue.Element; commandargs |
+| 23 | Summary: <_ as core::iter::traits::iterator::Iterator>::nth; Argument[self].Element; ReturnValue.Field[core::option::Option::Some(0)]; value |
+| 24 | Summary: <core::alloc::layout::Layout>::align_to; Argument[self]; ReturnValue.Field[core::result::Result::Ok(0)]; taint |
+| 25 | Summary: <core::alloc::layout::Layout>::array; Argument[0]; ReturnValue.Field[core::result::Result::Ok(0)]; taint |
+| 26 | Summary: <core::alloc::layout::Layout>::extend; Argument[0]; ReturnValue.Field[core::result::Result::Ok(0)].Field[0]; taint |
+| 27 | Summary: <core::alloc::layout::Layout>::extend; Argument[self]; ReturnValue.Field[core::result::Result::Ok(0)].Field[0]; taint |
+| 28 | Summary: <core::alloc::layout::Layout>::extend_packed; Argument[0]; ReturnValue.Field[core::result::Result::Ok(0)]; taint |
+| 29 | Summary: <core::alloc::layout::Layout>::extend_packed; Argument[self]; ReturnValue.Field[core::result::Result::Ok(0)]; taint |
+| 30 | Summary: <core::alloc::layout::Layout>::from_size_align; Argument[0]; ReturnValue.Field[core::result::Result::Ok(0)]; taint |
+| 31 | Summary: <core::alloc::layout::Layout>::from_size_align_unchecked; Argument[0]; ReturnValue.Field[core::alloc::layout::Layout::size]; value |
+| 32 | Summary: <core::alloc::layout::Layout>::from_size_align_unchecked; Argument[0]; ReturnValue; taint |
+| 33 | Summary: <core::alloc::layout::Layout>::pad_to_align; Argument[self]; ReturnValue; taint |
+| 34 | Summary: <core::alloc::layout::Layout>::repeat; Argument[0]; ReturnValue.Field[core::result::Result::Ok(0)].Field[0]; taint |
+| 35 | Summary: <core::alloc::layout::Layout>::repeat_packed; Argument[0]; ReturnValue.Field[core::result::Result::Ok(0)]; taint |
+| 36 | Summary: <core::alloc::layout::Layout>::size; Argument[self].Field[core::alloc::layout::Layout::size]; ReturnValue; value |
+| 37 | Summary: <core::alloc::layout::Layout>::size; Argument[self]; ReturnValue; taint |
+| 38 | Summary: <core::option::Option>::unwrap_or; Argument[self].Field[core::option::Option::Some(0)]; ReturnValue; value |
+| 39 | Summary: <core::result::Result>::expect; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
+| 40 | Summary: <core::result::Result>::unwrap; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
+| 41 | Summary: <core::str>::parse; Argument[self]; ReturnValue.Field[core::result::Result::Ok(0)]; taint |
+| 42 | Summary: <core::usize as core::ops::arith::Mul>::mul; Argument[0]; ReturnValue; taint |
+| 43 | Summary: <core::usize as core::ops::arith::Mul>::mul; Argument[self]; ReturnValue; taint |
+| 44 | Summary: core::cmp::max; Argument[0]; ReturnValue; value |
+| 45 | Summary: core::cmp::min; Argument[0]; ReturnValue; value |
 nodes
 | main.rs:12:36:12:43 | ...: usize | semmle.label | ...: usize |
 | main.rs:18:13:18:31 | ...::realloc | semmle.label | ...::realloc |
@@ -512,32 +493,24 @@ nodes
 | main.rs:192:14:192:56 | ... .unwrap() | semmle.label | ... .unwrap() |
 | main.rs:192:46:192:46 | v | semmle.label | v |
 | main.rs:193:32:193:36 | alloc | semmle.label | alloc |
-| main.rs:193:32:193:36 | alloc | semmle.label | alloc |
 | main.rs:193:38:193:39 | l2 | semmle.label | l2 |
 | main.rs:194:32:194:43 | alloc_zeroed | semmle.label | alloc_zeroed |
 | main.rs:194:32:194:43 | alloc_zeroed | semmle.label | alloc_zeroed |
-| main.rs:194:32:194:43 | alloc_zeroed | semmle.label | alloc_zeroed |
 | main.rs:194:45:194:46 | l2 | semmle.label | l2 |
 | main.rs:195:32:195:39 | allocate | semmle.label | allocate |
-| main.rs:195:32:195:39 | allocate | semmle.label | allocate |
 | main.rs:195:41:195:42 | l2 | semmle.label | l2 |
 | main.rs:196:32:196:46 | allocate_zeroed | semmle.label | allocate_zeroed |
-| main.rs:196:32:196:46 | allocate_zeroed | semmle.label | allocate_zeroed |
 | main.rs:196:48:196:49 | l2 | semmle.label | l2 |
 | main.rs:197:32:197:39 | allocate | semmle.label | allocate |
-| main.rs:197:32:197:39 | allocate | semmle.label | allocate |
 | main.rs:197:41:197:42 | l2 | semmle.label | l2 |
 | main.rs:198:32:198:46 | allocate_zeroed | semmle.label | allocate_zeroed |
-| main.rs:198:32:198:46 | allocate_zeroed | semmle.label | allocate_zeroed |
 | main.rs:198:48:198:49 | l2 | semmle.label | l2 |
 | main.rs:202:32:202:38 | realloc | semmle.label | realloc |
 | main.rs:202:32:202:38 | realloc | semmle.label | realloc |
 | main.rs:202:48:202:48 | v | semmle.label | v |
 | main.rs:208:40:208:43 | grow | semmle.label | grow |
-| main.rs:208:40:208:43 | grow | semmle.label | grow |
 | main.rs:208:53:208:54 | l2 | semmle.label | l2 |
 | main.rs:210:40:210:50 | grow_zeroed | semmle.label | grow_zeroed |
-| main.rs:210:40:210:50 | grow_zeroed | semmle.label | grow_zeroed |
 | main.rs:210:60:210:61 | l2 | semmle.label | l2 |
 | main.rs:213:36:213:41 | shrink | semmle.label | shrink |
 | main.rs:213:51:213:52 | l2 | semmle.label | l2 |
diff --git a/rust/ql/test/query-tests/security/CWE-798/CONSISTENCY/PathResolutionConsistency.expected b/rust/ql/test/query-tests/security/CWE-798/CONSISTENCY/PathResolutionConsistency.expected
deleted file mode 100644
index b0ca6300065..00000000000
--- a/rust/ql/test/query-tests/security/CWE-798/CONSISTENCY/PathResolutionConsistency.expected
+++ /dev/null
@@ -1,10 +0,0 @@
-multipleCallTargets
-| test_cipher.rs:15:30:15:77 | ...::new(...) |
-| test_cipher.rs:19:30:19:80 | ...::new(...) |
-| test_cipher.rs:22:30:22:98 | ...::new(...) |
-| test_cipher.rs:26:30:26:101 | ...::new(...) |
-| test_cipher.rs:30:30:30:102 | ...::new(...) |
-| test_cipher.rs:38:30:38:81 | ...::new(...) |
-| test_cipher.rs:42:30:42:80 | ...::new(...) |
-| test_cipher.rs:47:30:47:85 | ...::new(...) |
-| test_cipher.rs:51:31:51:83 | ...::new(...) |
diff --git a/rust/ql/test/query-tests/security/CWE-798/Cargo.lock b/rust/ql/test/query-tests/security/CWE-798/Cargo.lock
new file mode 100644
index 00000000000..6d0fce1423e
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-798/Cargo.lock
@@ -0,0 +1,726 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "aead"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0"
+dependencies = [
+ "crypto-common",
+ "generic-array",
+]
+
+[[package]]
+name = "aes"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
+dependencies = [
+ "cfg-if",
+ "cipher",
+ "cpufeatures",
+]
+
+[[package]]
+name = "aes-gcm"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1"
+dependencies = [
+ "aead",
+ "aes",
+ "cipher",
+ "ctr",
+ "ghash",
+ "subtle",
+]
+
+[[package]]
+name = "aes-gcm-siv"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae0784134ba9375416d469ec31e7c5f9fa94405049cf08c5ce5b4698be673e0d"
+dependencies = [
+ "aead",
+ "aes",
+ "cipher",
+ "ctr",
+ "polyval",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61"
+
+[[package]]
+name = "base64"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+
+[[package]]
+name = "biscotti"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ddb6f28a3d15d18cace7a8010282a4d9cee1452dcd33f5861c173b4a31095b79"
+dependencies = [
+ "aes-gcm-siv",
+ "anyhow",
+ "base64",
+ "hkdf",
+ "hmac",
+ "jiff",
+ "percent-encoding",
+ "rand 0.9.2",
+ "serde",
+ "sha2",
+ "subtle",
+]
+
+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "cfb-mode"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "738b8d467867f80a71351933f70461f5b56f24d5c93e0cf216e59229c968d330"
+dependencies = [
+ "cipher",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9"
+
+[[package]]
+name = "cipher"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
+dependencies = [
+ "crypto-common",
+ "inout",
+]
+
+[[package]]
+name = "cookie"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747"
+dependencies = [
+ "aes-gcm",
+ "base64",
+ "hmac",
+ "rand 0.8.5",
+ "sha2",
+ "subtle",
+ "time",
+ "version_check",
+]
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crypto-common"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+dependencies = [
+ "generic-array",
+ "rand_core 0.6.4",
+ "typenum",
+]
+
+[[package]]
+name = "ctr"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835"
+dependencies = [
+ "cipher",
+]
+
+[[package]]
+name = "deranged"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a41953f86f8a05768a6cda24def994fd2f424b04ec5c719cf89989779f199071"
+dependencies = [
+ "powerfmt",
+]
+
+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer",
+ "crypto-common",
+ "subtle",
+]
+
+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.11.1+wasi-snapshot-preview1",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "r-efi",
+ "wasi 0.14.7+wasi-0.2.4",
+]
+
+[[package]]
+name = "ghash"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1"
+dependencies = [
+ "opaque-debug",
+ "polyval",
+]
+
+[[package]]
+name = "hkdf"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7"
+dependencies = [
+ "hmac",
+]
+
+[[package]]
+name = "hmac"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
+dependencies = [
+ "digest",
+]
+
+[[package]]
+name = "inout"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
+
+[[package]]
+name = "jiff"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be1f93b8b1eb69c77f24bbb0afdf66f54b632ee39af40ca21c4365a1d7347e49"
+dependencies = [
+ "jiff-static",
+ "jiff-tzdb-platform",
+ "log",
+ "portable-atomic",
+ "portable-atomic-util",
+ "serde",
+ "windows-sys",
+]
+
+[[package]]
+name = "jiff-static"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03343451ff899767262ec32146f6d559dd759fdadf42ff0e227c7c48f72594b4"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "jiff-tzdb"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1283705eb0a21404d2bfd6eef2a7593d240bc42a0bdb39db0ad6fa2ec026524"
+
+[[package]]
+name = "jiff-tzdb-platform"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "875a5a69ac2bab1a891711cf5eccbec1ce0341ea805560dcd90b7a2e925132e8"
+dependencies = [
+ "jiff-tzdb",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.176"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "58f929b4d672ea937a23a1ab494143d968337a5f47e56d0815df1e0890ddf174"
+
+[[package]]
+name = "log"
+version = "0.4.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
+
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
+[[package]]
+name = "opaque-debug"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
+
+[[package]]
+name = "percent-encoding"
+version = "2.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
+
+[[package]]
+name = "polyval"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "opaque-debug",
+ "universal-hash",
+]
+
+[[package]]
+name = "portable-atomic"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
+
+[[package]]
+name = "portable-atomic-util"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507"
+dependencies = [
+ "portable-atomic",
+]
+
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
+dependencies = [
+ "zerocopy",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.101"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "r-efi"
+version = "5.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
+
+[[package]]
+name = "rabbit"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "931a21d28d73d260f6743712e0f04292413fc6d004bb278bb9022302221a05d5"
+dependencies = [
+ "cipher",
+]
+
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha 0.3.1",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
+dependencies = [
+ "rand_chacha 0.9.0",
+ "rand_core 0.9.3",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.9.3",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom 0.2.16",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
+dependencies = [
+ "getrandom 0.3.3",
+]
+
+[[package]]
+name = "serde"
+version = "1.0.226"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0dca6411025b24b60bfa7ec1fe1f8e710ac09782dca409ee8237ba74b51295fd"
+dependencies = [
+ "serde_core",
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.226"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba2ba63999edb9dac981fb34b3e5c0d111a69b0924e253ed29d83f7c99e966a4"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.226"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8db53ae22f34573731bafa1db20f04027b2d25e02d8205921b569171699cdb33"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "sha2"
+version = "0.10.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "subtle"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
+
+[[package]]
+name = "syn"
+version = "2.0.106"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "test"
+version = "0.0.1"
+dependencies = [
+ "aes",
+ "aes-gcm",
+ "base64",
+ "biscotti",
+ "cfb-mode",
+ "cipher",
+ "cookie",
+ "getrandom 0.2.16",
+ "getrandom 0.3.3",
+ "rabbit",
+]
+
+[[package]]
+name = "time"
+version = "0.3.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d"
+dependencies = [
+ "deranged",
+ "itoa",
+ "num-conv",
+ "powerfmt",
+ "serde",
+ "time-core",
+ "time-macros",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b"
+
+[[package]]
+name = "time-macros"
+version = "0.2.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3"
+dependencies = [
+ "num-conv",
+ "time-core",
+]
+
+[[package]]
+name = "typenum"
+version = "1.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d"
+
+[[package]]
+name = "universal-hash"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea"
+dependencies = [
+ "crypto-common",
+ "subtle",
+]
+
+[[package]]
+name = "version_check"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+
+[[package]]
+name = "wasi"
+version = "0.11.1+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
+
+[[package]]
+name = "wasi"
+version = "0.14.7+wasi-0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "883478de20367e224c0090af9cf5f9fa85bed63a95c1abf3afc5c083ebc06e8c"
+dependencies = [
+ "wasip2",
+]
+
+[[package]]
+name = "wasip2"
+version = "1.0.1+wasi-0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
+dependencies = [
+ "wit-bindgen",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
+name = "wit-bindgen"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
+
+[[package]]
+name = "zerocopy"
+version = "0.8.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.8.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "zeroize"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
diff --git a/rust/ql/test/query-tests/security/CWE-798/HardcodedCryptographicValue.expected b/rust/ql/test/query-tests/security/CWE-798/HardcodedCryptographicValue.expected
index 2155fef0d40..e4657a426ea 100644
--- a/rust/ql/test/query-tests/security/CWE-798/HardcodedCryptographicValue.expected
+++ b/rust/ql/test/query-tests/security/CWE-798/HardcodedCryptographicValue.expected
@@ -1,100 +1,100 @@
 #select
-| test_cipher.rs:18:30:18:32 | 0u8 | test_cipher.rs:18:30:18:32 | 0u8 | test_cipher.rs:19:30:19:47 | ...::new | This hard-coded value is used as $@. | test_cipher.rs:19:30:19:47 | ...::new | a key |
-| test_cipher.rs:18:30:18:32 | 0u8 | test_cipher.rs:18:30:18:32 | 0u8 | test_cipher.rs:19:30:19:47 | ...::new | This hard-coded value is used as $@. | test_cipher.rs:19:30:19:47 | ...::new | a key |
-| test_cipher.rs:25:30:25:32 | 0u8 | test_cipher.rs:25:30:25:32 | 0u8 | test_cipher.rs:26:30:26:40 | ...::new | This hard-coded value is used as $@. | test_cipher.rs:26:30:26:40 | ...::new | a key |
-| test_cipher.rs:25:30:25:32 | 0u8 | test_cipher.rs:25:30:25:32 | 0u8 | test_cipher.rs:26:30:26:40 | ...::new | This hard-coded value is used as $@. | test_cipher.rs:26:30:26:40 | ...::new | a key |
-| test_cipher.rs:29:30:29:32 | 0u8 | test_cipher.rs:29:30:29:32 | 0u8 | test_cipher.rs:30:30:30:40 | ...::new | This hard-coded value is used as $@. | test_cipher.rs:30:30:30:40 | ...::new | an initialization vector |
-| test_cipher.rs:29:30:29:32 | 0u8 | test_cipher.rs:29:30:29:32 | 0u8 | test_cipher.rs:30:30:30:40 | ...::new | This hard-coded value is used as $@. | test_cipher.rs:30:30:30:40 | ...::new | an initialization vector |
-| test_cipher.rs:37:27:37:74 | [...] | test_cipher.rs:37:27:37:74 | [...] | test_cipher.rs:38:30:38:47 | ...::new | This hard-coded value is used as $@. | test_cipher.rs:38:30:38:47 | ...::new | a key |
+| test_cipher.rs:18:29:18:36 | [0u8; 16] | test_cipher.rs:18:29:18:36 | [0u8; 16] | test_cipher.rs:19:30:19:47 | ...::new | This hard-coded value is used as $@. | test_cipher.rs:19:30:19:47 | ...::new | a key |
+| test_cipher.rs:25:29:25:36 | [0u8; 16] | test_cipher.rs:25:29:25:36 | [0u8; 16] | test_cipher.rs:26:30:26:40 | ...::new | This hard-coded value is used as $@. | test_cipher.rs:26:30:26:40 | ...::new | a key |
+| test_cipher.rs:29:29:29:36 | [0u8; 16] | test_cipher.rs:29:29:29:36 | [0u8; 16] | test_cipher.rs:30:30:30:40 | ...::new | This hard-coded value is used as $@. | test_cipher.rs:30:30:30:40 | ...::new | an initialization vector |
 | test_cipher.rs:37:27:37:74 | [...] | test_cipher.rs:37:27:37:74 | [...] | test_cipher.rs:38:30:38:47 | ...::new | This hard-coded value is used as $@. | test_cipher.rs:38:30:38:47 | ...::new | a key |
 | test_cipher.rs:41:29:41:76 | [...] | test_cipher.rs:41:29:41:76 | [...] | test_cipher.rs:42:30:42:47 | ...::new | This hard-coded value is used as $@. | test_cipher.rs:42:30:42:47 | ...::new | a key |
-| test_cipher.rs:41:29:41:76 | [...] | test_cipher.rs:41:29:41:76 | [...] | test_cipher.rs:42:30:42:47 | ...::new | This hard-coded value is used as $@. | test_cipher.rs:42:30:42:47 | ...::new | a key |
 | test_cipher.rs:50:37:50:52 | ...::zeroed | test_cipher.rs:50:37:50:52 | ...::zeroed | test_cipher.rs:51:31:51:48 | ...::new | This hard-coded value is used as $@. | test_cipher.rs:51:31:51:48 | ...::new | a key |
-| test_cipher.rs:50:37:50:52 | ...::zeroed | test_cipher.rs:50:37:50:52 | ...::zeroed | test_cipher.rs:51:31:51:48 | ...::new | This hard-coded value is used as $@. | test_cipher.rs:51:31:51:48 | ...::new | a key |
-| test_cipher.rs:73:20:73:22 | 0u8 | test_cipher.rs:73:20:73:22 | 0u8 | test_cipher.rs:74:23:74:44 | ...::new_from_slice | This hard-coded value is used as $@. | test_cipher.rs:74:23:74:44 | ...::new_from_slice | a key |
+| test_cipher.rs:73:19:73:26 | [0u8; 32] | test_cipher.rs:73:19:73:26 | [0u8; 32] | test_cipher.rs:74:23:74:44 | ...::new_from_slice | This hard-coded value is used as $@. | test_cipher.rs:74:23:74:44 | ...::new_from_slice | a key |
+| test_cookie.rs:17:28:17:34 | [0; 64] | test_cookie.rs:17:28:17:34 | [0; 64] | test_cookie.rs:18:16:18:24 | ...::from | This hard-coded value is used as $@. | test_cookie.rs:18:16:18:24 | ...::from | a key |
+| test_cookie.rs:21:28:21:34 | [0; 64] | test_cookie.rs:21:28:21:34 | [0; 64] | test_cookie.rs:22:16:22:24 | ...::from | This hard-coded value is used as $@. | test_cookie.rs:22:16:22:24 | ...::from | a key |
+| test_cookie.rs:38:28:38:36 | [0u8; 64] | test_cookie.rs:38:28:38:36 | [0u8; 64] | test_cookie.rs:42:14:42:32 | ...::from | This hard-coded value is used as $@. | test_cookie.rs:42:14:42:32 | ...::from | a key |
+| test_cookie.rs:49:23:49:25 | 0u8 | test_cookie.rs:49:23:49:25 | 0u8 | test_cookie.rs:53:14:53:32 | ...::from | This hard-coded value is used as $@. | test_cookie.rs:53:14:53:32 | ...::from | a key |
 edges
-| test_cipher.rs:18:9:18:14 | const1 [&ref, element] | test_cipher.rs:19:73:19:78 | const1 [&ref, element] | provenance |  |
-| test_cipher.rs:18:28:18:36 | &... [&ref, element] | test_cipher.rs:18:9:18:14 | const1 [&ref, element] | provenance |  |
-| test_cipher.rs:18:29:18:36 | [0u8; 16] [element] | test_cipher.rs:18:28:18:36 | &... [&ref, element] | provenance |  |
-| test_cipher.rs:18:30:18:32 | 0u8 | test_cipher.rs:18:29:18:36 | [0u8; 16] [element] | provenance |  |
-| test_cipher.rs:19:49:19:79 | ...::from_slice(...) [&ref, element] | test_cipher.rs:19:30:19:47 | ...::new | provenance | MaD:2 Sink:MaD:2 Sink:MaD:2 |
-| test_cipher.rs:19:49:19:79 | ...::from_slice(...) [&ref, element] | test_cipher.rs:19:30:19:47 | ...::new | provenance | MaD:4 Sink:MaD:4 Sink:MaD:4 |
-| test_cipher.rs:19:73:19:78 | const1 [&ref, element] | test_cipher.rs:19:49:19:79 | ...::from_slice(...) [&ref, element] | provenance | MaD:7 |
-| test_cipher.rs:25:9:25:14 | const4 [&ref, element] | test_cipher.rs:26:66:26:71 | const4 [&ref, element] | provenance |  |
-| test_cipher.rs:25:28:25:36 | &... [&ref, element] | test_cipher.rs:25:9:25:14 | const4 [&ref, element] | provenance |  |
-| test_cipher.rs:25:29:25:36 | [0u8; 16] [element] | test_cipher.rs:25:28:25:36 | &... [&ref, element] | provenance |  |
-| test_cipher.rs:25:30:25:32 | 0u8 | test_cipher.rs:25:29:25:36 | [0u8; 16] [element] | provenance |  |
-| test_cipher.rs:26:42:26:72 | ...::from_slice(...) [&ref, element] | test_cipher.rs:26:30:26:40 | ...::new | provenance | MaD:2 Sink:MaD:2 Sink:MaD:2 |
-| test_cipher.rs:26:42:26:72 | ...::from_slice(...) [&ref, element] | test_cipher.rs:26:30:26:40 | ...::new | provenance | MaD:4 Sink:MaD:4 Sink:MaD:4 |
-| test_cipher.rs:26:66:26:71 | const4 [&ref, element] | test_cipher.rs:26:42:26:72 | ...::from_slice(...) [&ref, element] | provenance | MaD:7 |
-| test_cipher.rs:29:9:29:14 | const5 [&ref, element] | test_cipher.rs:30:95:30:100 | const5 [&ref, element] | provenance |  |
-| test_cipher.rs:29:28:29:36 | &... [&ref, element] | test_cipher.rs:29:9:29:14 | const5 [&ref, element] | provenance |  |
-| test_cipher.rs:29:29:29:36 | [0u8; 16] [element] | test_cipher.rs:29:28:29:36 | &... [&ref, element] | provenance |  |
-| test_cipher.rs:29:30:29:32 | 0u8 | test_cipher.rs:29:29:29:36 | [0u8; 16] [element] | provenance |  |
-| test_cipher.rs:30:72:30:101 | ...::from_slice(...) [&ref, element] | test_cipher.rs:30:30:30:40 | ...::new | provenance | MaD:3 Sink:MaD:3 Sink:MaD:3 |
-| test_cipher.rs:30:72:30:101 | ...::from_slice(...) [&ref, element] | test_cipher.rs:30:30:30:40 | ...::new | provenance | MaD:5 Sink:MaD:5 Sink:MaD:5 |
-| test_cipher.rs:30:95:30:100 | const5 [&ref, element] | test_cipher.rs:30:72:30:101 | ...::from_slice(...) [&ref, element] | provenance | MaD:7 |
+| test_cipher.rs:18:9:18:14 | const1 [&ref] | test_cipher.rs:19:73:19:78 | const1 [&ref] | provenance |  |
+| test_cipher.rs:18:28:18:36 | &... [&ref] | test_cipher.rs:18:9:18:14 | const1 [&ref] | provenance |  |
+| test_cipher.rs:18:29:18:36 | [0u8; 16] | test_cipher.rs:18:28:18:36 | &... [&ref] | provenance |  |
+| test_cipher.rs:19:49:19:79 | ...::from_slice(...) [&ref] | test_cipher.rs:19:30:19:47 | ...::new | provenance | MaD:3 Sink:MaD:3 |
+| test_cipher.rs:19:73:19:78 | const1 [&ref] | test_cipher.rs:19:49:19:79 | ...::from_slice(...) [&ref] | provenance | MaD:9 |
+| test_cipher.rs:25:9:25:14 | const4 [&ref] | test_cipher.rs:26:66:26:71 | const4 [&ref] | provenance |  |
+| test_cipher.rs:25:28:25:36 | &... [&ref] | test_cipher.rs:25:9:25:14 | const4 [&ref] | provenance |  |
+| test_cipher.rs:25:29:25:36 | [0u8; 16] | test_cipher.rs:25:28:25:36 | &... [&ref] | provenance |  |
+| test_cipher.rs:26:42:26:72 | ...::from_slice(...) [&ref] | test_cipher.rs:26:30:26:40 | ...::new | provenance | MaD:4 Sink:MaD:4 |
+| test_cipher.rs:26:66:26:71 | const4 [&ref] | test_cipher.rs:26:42:26:72 | ...::from_slice(...) [&ref] | provenance | MaD:9 |
+| test_cipher.rs:29:9:29:14 | const5 [&ref] | test_cipher.rs:30:95:30:100 | const5 [&ref] | provenance |  |
+| test_cipher.rs:29:28:29:36 | &... [&ref] | test_cipher.rs:29:9:29:14 | const5 [&ref] | provenance |  |
+| test_cipher.rs:29:29:29:36 | [0u8; 16] | test_cipher.rs:29:28:29:36 | &... [&ref] | provenance |  |
+| test_cipher.rs:30:72:30:101 | ...::from_slice(...) [&ref] | test_cipher.rs:30:30:30:40 | ...::new | provenance | MaD:5 Sink:MaD:5 |
+| test_cipher.rs:30:95:30:100 | const5 [&ref] | test_cipher.rs:30:72:30:101 | ...::from_slice(...) [&ref] | provenance | MaD:9 |
 | test_cipher.rs:37:9:37:14 | const7 | test_cipher.rs:38:74:38:79 | const7 | provenance |  |
 | test_cipher.rs:37:27:37:74 | [...] | test_cipher.rs:37:9:37:14 | const7 | provenance |  |
-| test_cipher.rs:38:49:38:80 | ...::from_slice(...) [&ref] | test_cipher.rs:38:30:38:47 | ...::new | provenance | MaD:2 Sink:MaD:2 |
-| test_cipher.rs:38:49:38:80 | ...::from_slice(...) [&ref] | test_cipher.rs:38:30:38:47 | ...::new | provenance | MaD:4 Sink:MaD:4 |
-| test_cipher.rs:38:73:38:79 | &const7 [&ref] | test_cipher.rs:38:49:38:80 | ...::from_slice(...) [&ref] | provenance | MaD:7 |
+| test_cipher.rs:38:49:38:80 | ...::from_slice(...) [&ref] | test_cipher.rs:38:30:38:47 | ...::new | provenance | MaD:3 Sink:MaD:3 |
+| test_cipher.rs:38:73:38:79 | &const7 [&ref] | test_cipher.rs:38:49:38:80 | ...::from_slice(...) [&ref] | provenance | MaD:9 |
 | test_cipher.rs:38:74:38:79 | const7 | test_cipher.rs:38:73:38:79 | &const7 [&ref] | provenance |  |
 | test_cipher.rs:41:9:41:14 | const8 [&ref] | test_cipher.rs:42:73:42:78 | const8 [&ref] | provenance |  |
 | test_cipher.rs:41:28:41:76 | &... [&ref] | test_cipher.rs:41:9:41:14 | const8 [&ref] | provenance |  |
 | test_cipher.rs:41:29:41:76 | [...] | test_cipher.rs:41:28:41:76 | &... [&ref] | provenance |  |
-| test_cipher.rs:42:49:42:79 | ...::from_slice(...) [&ref] | test_cipher.rs:42:30:42:47 | ...::new | provenance | MaD:2 Sink:MaD:2 |
-| test_cipher.rs:42:49:42:79 | ...::from_slice(...) [&ref] | test_cipher.rs:42:30:42:47 | ...::new | provenance | MaD:4 Sink:MaD:4 |
-| test_cipher.rs:42:73:42:78 | const8 [&ref] | test_cipher.rs:42:49:42:79 | ...::from_slice(...) [&ref] | provenance | MaD:7 |
+| test_cipher.rs:42:49:42:79 | ...::from_slice(...) [&ref] | test_cipher.rs:42:30:42:47 | ...::new | provenance | MaD:3 Sink:MaD:3 |
+| test_cipher.rs:42:73:42:78 | const8 [&ref] | test_cipher.rs:42:49:42:79 | ...::from_slice(...) [&ref] | provenance | MaD:9 |
 | test_cipher.rs:50:9:50:15 | const10 [element] | test_cipher.rs:51:75:51:81 | const10 [element] | provenance |  |
-| test_cipher.rs:50:37:50:52 | ...::zeroed | test_cipher.rs:50:37:50:54 | ...::zeroed(...) [element] | provenance | Src:MaD:6  |
+| test_cipher.rs:50:37:50:52 | ...::zeroed | test_cipher.rs:50:37:50:54 | ...::zeroed(...) [element] | provenance | Src:MaD:7  |
 | test_cipher.rs:50:37:50:54 | ...::zeroed(...) [element] | test_cipher.rs:50:9:50:15 | const10 [element] | provenance |  |
-| test_cipher.rs:51:50:51:82 | ...::from_slice(...) [&ref, element] | test_cipher.rs:51:31:51:48 | ...::new | provenance | MaD:2 Sink:MaD:2 Sink:MaD:2 |
-| test_cipher.rs:51:50:51:82 | ...::from_slice(...) [&ref, element] | test_cipher.rs:51:31:51:48 | ...::new | provenance | MaD:4 Sink:MaD:4 Sink:MaD:4 |
-| test_cipher.rs:51:74:51:81 | &const10 [&ref, element] | test_cipher.rs:51:50:51:82 | ...::from_slice(...) [&ref, element] | provenance | MaD:7 |
+| test_cipher.rs:51:50:51:82 | ...::from_slice(...) [&ref, element] | test_cipher.rs:51:31:51:48 | ...::new | provenance | MaD:3 Sink:MaD:3 Sink:MaD:3 |
+| test_cipher.rs:51:74:51:81 | &const10 [&ref, element] | test_cipher.rs:51:50:51:82 | ...::from_slice(...) [&ref, element] | provenance | MaD:9 |
 | test_cipher.rs:51:75:51:81 | const10 [element] | test_cipher.rs:51:74:51:81 | &const10 [&ref, element] | provenance |  |
-| test_cipher.rs:73:9:73:14 | const2 [&ref, element] | test_cipher.rs:74:46:74:51 | const2 [&ref, element] | provenance |  |
-| test_cipher.rs:73:18:73:26 | &... [&ref, element] | test_cipher.rs:73:9:73:14 | const2 [&ref, element] | provenance |  |
-| test_cipher.rs:73:19:73:26 | [0u8; 32] [element] | test_cipher.rs:73:18:73:26 | &... [&ref, element] | provenance |  |
-| test_cipher.rs:73:20:73:22 | 0u8 | test_cipher.rs:73:19:73:26 | [0u8; 32] [element] | provenance |  |
-| test_cipher.rs:74:46:74:51 | const2 [&ref, element] | test_cipher.rs:74:23:74:44 | ...::new_from_slice | provenance | MaD:1 Sink:MaD:1 Sink:MaD:1 |
+| test_cipher.rs:73:9:73:14 | const2 [&ref] | test_cipher.rs:74:46:74:51 | const2 [&ref] | provenance |  |
+| test_cipher.rs:73:18:73:26 | &... [&ref] | test_cipher.rs:73:9:73:14 | const2 [&ref] | provenance |  |
+| test_cipher.rs:73:19:73:26 | [0u8; 32] | test_cipher.rs:73:18:73:26 | &... [&ref] | provenance |  |
+| test_cipher.rs:74:46:74:51 | const2 [&ref] | test_cipher.rs:74:23:74:44 | ...::new_from_slice | provenance | MaD:1 Sink:MaD:1 |
+| test_cookie.rs:17:9:17:14 | array1 | test_cookie.rs:18:27:18:32 | array1 | provenance |  |
+| test_cookie.rs:17:28:17:34 | [0; 64] | test_cookie.rs:17:9:17:14 | array1 | provenance |  |
+| test_cookie.rs:18:26:18:32 | &array1 [&ref] | test_cookie.rs:18:16:18:24 | ...::from | provenance | MaD:6 Sink:MaD:6 |
+| test_cookie.rs:18:27:18:32 | array1 | test_cookie.rs:18:26:18:32 | &array1 [&ref] | provenance |  |
+| test_cookie.rs:21:9:21:14 | array2 | test_cookie.rs:22:27:22:32 | array2 | provenance |  |
+| test_cookie.rs:21:28:21:34 | [0; 64] | test_cookie.rs:21:9:21:14 | array2 | provenance |  |
+| test_cookie.rs:22:26:22:32 | &array2 [&ref] | test_cookie.rs:22:16:22:24 | ...::from | provenance | MaD:6 Sink:MaD:6 |
+| test_cookie.rs:22:27:22:32 | array2 | test_cookie.rs:22:26:22:32 | &array2 [&ref] | provenance |  |
+| test_cookie.rs:38:9:38:14 | array2 | test_cookie.rs:42:34:42:39 | array2 | provenance |  |
+| test_cookie.rs:38:18:38:37 | ...::from(...) | test_cookie.rs:38:9:38:14 | array2 | provenance |  |
+| test_cookie.rs:38:28:38:36 | [0u8; 64] | test_cookie.rs:38:18:38:37 | ...::from(...) | provenance | MaD:8 |
+| test_cookie.rs:42:34:42:39 | array2 | test_cookie.rs:42:14:42:32 | ...::from | provenance | MaD:2 Sink:MaD:2 |
+| test_cookie.rs:49:9:49:14 | array3 [element] | test_cookie.rs:53:34:53:39 | array3 [element] | provenance |  |
+| test_cookie.rs:49:23:49:25 | 0u8 | test_cookie.rs:49:23:49:29 | ...::from_elem(...) [element] | provenance | MaD:10 |
+| test_cookie.rs:49:23:49:29 | ...::from_elem(...) [element] | test_cookie.rs:49:9:49:14 | array3 [element] | provenance |  |
+| test_cookie.rs:53:34:53:39 | array3 [element] | test_cookie.rs:53:14:53:32 | ...::from | provenance | MaD:2 Sink:MaD:2 |
 models
 | 1 | Sink: <_ as crypto_common::KeyInit>::new_from_slice; Argument[0]; credentials-key |
-| 2 | Sink: <cipher::stream_wrapper::StreamCipherCoreWrapper as crypto_common::KeyInit>::new; Argument[0]; credentials-key |
-| 3 | Sink: <cipher::stream_wrapper::StreamCipherCoreWrapper as crypto_common::KeyInit>::new; Argument[1]; credentials-iv |
+| 2 | Sink: <biscotti::crypto::master::Key>::from; Argument[0]; credentials-key |
+| 3 | Sink: <cipher::stream_wrapper::StreamCipherCoreWrapper as crypto_common::KeyInit>::new; Argument[0]; credentials-key |
 | 4 | Sink: <cipher::stream_wrapper::StreamCipherCoreWrapper as crypto_common::KeyIvInit>::new; Argument[0]; credentials-key |
 | 5 | Sink: <cipher::stream_wrapper::StreamCipherCoreWrapper as crypto_common::KeyIvInit>::new; Argument[1]; credentials-iv |
-| 6 | Source: core::mem::zeroed; ReturnValue.Element; constant-source |
-| 7 | Summary: <generic_array::GenericArray>::from_slice; Argument[0].Reference; ReturnValue.Reference; value |
+| 6 | Sink: <cookie::secure::key::Key>::from; Argument[0].Reference; credentials-key |
+| 7 | Source: core::mem::zeroed; ReturnValue.Element; constant-source |
+| 8 | Summary: <_ as core::convert::From>::from; Argument[0]; ReturnValue; taint |
+| 9 | Summary: <generic_array::GenericArray>::from_slice; Argument[0].Reference; ReturnValue.Reference; value |
+| 10 | Summary: alloc::vec::from_elem; Argument[0]; ReturnValue.Element; value |
 nodes
-| test_cipher.rs:18:9:18:14 | const1 [&ref, element] | semmle.label | const1 [&ref, element] |
-| test_cipher.rs:18:28:18:36 | &... [&ref, element] | semmle.label | &... [&ref, element] |
-| test_cipher.rs:18:29:18:36 | [0u8; 16] [element] | semmle.label | [0u8; 16] [element] |
-| test_cipher.rs:18:30:18:32 | 0u8 | semmle.label | 0u8 |
+| test_cipher.rs:18:9:18:14 | const1 [&ref] | semmle.label | const1 [&ref] |
+| test_cipher.rs:18:28:18:36 | &... [&ref] | semmle.label | &... [&ref] |
+| test_cipher.rs:18:29:18:36 | [0u8; 16] | semmle.label | [0u8; 16] |
 | test_cipher.rs:19:30:19:47 | ...::new | semmle.label | ...::new |
-| test_cipher.rs:19:30:19:47 | ...::new | semmle.label | ...::new |
-| test_cipher.rs:19:49:19:79 | ...::from_slice(...) [&ref, element] | semmle.label | ...::from_slice(...) [&ref, element] |
-| test_cipher.rs:19:73:19:78 | const1 [&ref, element] | semmle.label | const1 [&ref, element] |
-| test_cipher.rs:25:9:25:14 | const4 [&ref, element] | semmle.label | const4 [&ref, element] |
-| test_cipher.rs:25:28:25:36 | &... [&ref, element] | semmle.label | &... [&ref, element] |
-| test_cipher.rs:25:29:25:36 | [0u8; 16] [element] | semmle.label | [0u8; 16] [element] |
-| test_cipher.rs:25:30:25:32 | 0u8 | semmle.label | 0u8 |
+| test_cipher.rs:19:49:19:79 | ...::from_slice(...) [&ref] | semmle.label | ...::from_slice(...) [&ref] |
+| test_cipher.rs:19:73:19:78 | const1 [&ref] | semmle.label | const1 [&ref] |
+| test_cipher.rs:25:9:25:14 | const4 [&ref] | semmle.label | const4 [&ref] |
+| test_cipher.rs:25:28:25:36 | &... [&ref] | semmle.label | &... [&ref] |
+| test_cipher.rs:25:29:25:36 | [0u8; 16] | semmle.label | [0u8; 16] |
 | test_cipher.rs:26:30:26:40 | ...::new | semmle.label | ...::new |
-| test_cipher.rs:26:30:26:40 | ...::new | semmle.label | ...::new |
-| test_cipher.rs:26:42:26:72 | ...::from_slice(...) [&ref, element] | semmle.label | ...::from_slice(...) [&ref, element] |
-| test_cipher.rs:26:66:26:71 | const4 [&ref, element] | semmle.label | const4 [&ref, element] |
-| test_cipher.rs:29:9:29:14 | const5 [&ref, element] | semmle.label | const5 [&ref, element] |
-| test_cipher.rs:29:28:29:36 | &... [&ref, element] | semmle.label | &... [&ref, element] |
-| test_cipher.rs:29:29:29:36 | [0u8; 16] [element] | semmle.label | [0u8; 16] [element] |
-| test_cipher.rs:29:30:29:32 | 0u8 | semmle.label | 0u8 |
+| test_cipher.rs:26:42:26:72 | ...::from_slice(...) [&ref] | semmle.label | ...::from_slice(...) [&ref] |
+| test_cipher.rs:26:66:26:71 | const4 [&ref] | semmle.label | const4 [&ref] |
+| test_cipher.rs:29:9:29:14 | const5 [&ref] | semmle.label | const5 [&ref] |
+| test_cipher.rs:29:28:29:36 | &... [&ref] | semmle.label | &... [&ref] |
+| test_cipher.rs:29:29:29:36 | [0u8; 16] | semmle.label | [0u8; 16] |
 | test_cipher.rs:30:30:30:40 | ...::new | semmle.label | ...::new |
-| test_cipher.rs:30:30:30:40 | ...::new | semmle.label | ...::new |
-| test_cipher.rs:30:72:30:101 | ...::from_slice(...) [&ref, element] | semmle.label | ...::from_slice(...) [&ref, element] |
-| test_cipher.rs:30:95:30:100 | const5 [&ref, element] | semmle.label | const5 [&ref, element] |
+| test_cipher.rs:30:72:30:101 | ...::from_slice(...) [&ref] | semmle.label | ...::from_slice(...) [&ref] |
+| test_cipher.rs:30:95:30:100 | const5 [&ref] | semmle.label | const5 [&ref] |
 | test_cipher.rs:37:9:37:14 | const7 | semmle.label | const7 |
 | test_cipher.rs:37:27:37:74 | [...] | semmle.label | [...] |
 | test_cipher.rs:38:30:38:47 | ...::new | semmle.label | ...::new |
-| test_cipher.rs:38:30:38:47 | ...::new | semmle.label | ...::new |
 | test_cipher.rs:38:49:38:80 | ...::from_slice(...) [&ref] | semmle.label | ...::from_slice(...) [&ref] |
 | test_cipher.rs:38:73:38:79 | &const7 [&ref] | semmle.label | &const7 [&ref] |
 | test_cipher.rs:38:74:38:79 | const7 | semmle.label | const7 |
@@ -102,21 +102,38 @@ nodes
 | test_cipher.rs:41:28:41:76 | &... [&ref] | semmle.label | &... [&ref] |
 | test_cipher.rs:41:29:41:76 | [...] | semmle.label | [...] |
 | test_cipher.rs:42:30:42:47 | ...::new | semmle.label | ...::new |
-| test_cipher.rs:42:30:42:47 | ...::new | semmle.label | ...::new |
 | test_cipher.rs:42:49:42:79 | ...::from_slice(...) [&ref] | semmle.label | ...::from_slice(...) [&ref] |
 | test_cipher.rs:42:73:42:78 | const8 [&ref] | semmle.label | const8 [&ref] |
 | test_cipher.rs:50:9:50:15 | const10 [element] | semmle.label | const10 [element] |
 | test_cipher.rs:50:37:50:52 | ...::zeroed | semmle.label | ...::zeroed |
 | test_cipher.rs:50:37:50:54 | ...::zeroed(...) [element] | semmle.label | ...::zeroed(...) [element] |
 | test_cipher.rs:51:31:51:48 | ...::new | semmle.label | ...::new |
-| test_cipher.rs:51:31:51:48 | ...::new | semmle.label | ...::new |
 | test_cipher.rs:51:50:51:82 | ...::from_slice(...) [&ref, element] | semmle.label | ...::from_slice(...) [&ref, element] |
 | test_cipher.rs:51:74:51:81 | &const10 [&ref, element] | semmle.label | &const10 [&ref, element] |
 | test_cipher.rs:51:75:51:81 | const10 [element] | semmle.label | const10 [element] |
-| test_cipher.rs:73:9:73:14 | const2 [&ref, element] | semmle.label | const2 [&ref, element] |
-| test_cipher.rs:73:18:73:26 | &... [&ref, element] | semmle.label | &... [&ref, element] |
-| test_cipher.rs:73:19:73:26 | [0u8; 32] [element] | semmle.label | [0u8; 32] [element] |
-| test_cipher.rs:73:20:73:22 | 0u8 | semmle.label | 0u8 |
+| test_cipher.rs:73:9:73:14 | const2 [&ref] | semmle.label | const2 [&ref] |
+| test_cipher.rs:73:18:73:26 | &... [&ref] | semmle.label | &... [&ref] |
+| test_cipher.rs:73:19:73:26 | [0u8; 32] | semmle.label | [0u8; 32] |
 | test_cipher.rs:74:23:74:44 | ...::new_from_slice | semmle.label | ...::new_from_slice |
-| test_cipher.rs:74:46:74:51 | const2 [&ref, element] | semmle.label | const2 [&ref, element] |
+| test_cipher.rs:74:46:74:51 | const2 [&ref] | semmle.label | const2 [&ref] |
+| test_cookie.rs:17:9:17:14 | array1 | semmle.label | array1 |
+| test_cookie.rs:17:28:17:34 | [0; 64] | semmle.label | [0; 64] |
+| test_cookie.rs:18:16:18:24 | ...::from | semmle.label | ...::from |
+| test_cookie.rs:18:26:18:32 | &array1 [&ref] | semmle.label | &array1 [&ref] |
+| test_cookie.rs:18:27:18:32 | array1 | semmle.label | array1 |
+| test_cookie.rs:21:9:21:14 | array2 | semmle.label | array2 |
+| test_cookie.rs:21:28:21:34 | [0; 64] | semmle.label | [0; 64] |
+| test_cookie.rs:22:16:22:24 | ...::from | semmle.label | ...::from |
+| test_cookie.rs:22:26:22:32 | &array2 [&ref] | semmle.label | &array2 [&ref] |
+| test_cookie.rs:22:27:22:32 | array2 | semmle.label | array2 |
+| test_cookie.rs:38:9:38:14 | array2 | semmle.label | array2 |
+| test_cookie.rs:38:18:38:37 | ...::from(...) | semmle.label | ...::from(...) |
+| test_cookie.rs:38:28:38:36 | [0u8; 64] | semmle.label | [0u8; 64] |
+| test_cookie.rs:42:14:42:32 | ...::from | semmle.label | ...::from |
+| test_cookie.rs:42:34:42:39 | array2 | semmle.label | array2 |
+| test_cookie.rs:49:9:49:14 | array3 [element] | semmle.label | array3 [element] |
+| test_cookie.rs:49:23:49:25 | 0u8 | semmle.label | 0u8 |
+| test_cookie.rs:49:23:49:29 | ...::from_elem(...) [element] | semmle.label | ...::from_elem(...) [element] |
+| test_cookie.rs:53:14:53:32 | ...::from | semmle.label | ...::from |
+| test_cookie.rs:53:34:53:39 | array3 [element] | semmle.label | array3 [element] |
 subpaths
diff --git a/rust/ql/test/query-tests/security/CWE-798/options.yml b/rust/ql/test/query-tests/security/CWE-798/options.yml
index 6713251d3eb..9910923c801 100644
--- a/rust/ql/test/query-tests/security/CWE-798/options.yml
+++ b/rust/ql/test/query-tests/security/CWE-798/options.yml
@@ -8,3 +8,5 @@ qltest_dependencies:
     - base64 = { version = "0.22.1" }
     - getrandom = { version = "0.3.1" }
     - getrandom2 = { package = "getrandom", version = "0.2.15" }
+    - cookie = { version = "0.18.1", features = ["signed", "private"] }
+    - biscotti = { version = "0.4.3" }
diff --git a/rust/ql/test/query-tests/security/CWE-798/test_cookie.rs b/rust/ql/test/query-tests/security/CWE-798/test_cookie.rs
new file mode 100644
index 00000000000..10852583c67
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-798/test_cookie.rs
@@ -0,0 +1,58 @@
+
+use cookie::{CookieJar, SignedJar, PrivateJar, Key};
+
+// --- tests ---
+
+fn test_cookie_jar(array_var: &[u8]) {
+    let mut jar = CookieJar::new();
+
+    let key_generate = Key::generate(); // good
+    _ = jar.signed_mut(&key_generate);
+    _ = jar.private_mut(&key_generate);
+
+    let key_var = Key::from(array_var); // good
+    _ = jar.signed_mut(&key_var);
+    _ = jar.private_mut(&key_var);
+
+    let array1: [u8; 64] = [0; 64]; // $ Alert[rust/hard-coded-cryptographic-value]
+    let key1 = Key::from(&array1); // $ Sink
+    _ = jar.signed_mut(&key1);
+
+    let array2: [u8; 64] = [0; 64]; // $ Alert[rust/hard-coded-cryptographic-value]
+    let key2 = Key::from(&array2); // $ Sink
+    _ = jar.private_mut(&key2);
+}
+
+fn test_biscotti_crypto(array_var: &[u8]) {
+    let mut config1 = biscotti::ProcessorConfig::default();
+    let crypto_rules1 = biscotti::config::CryptoRule {
+        cookie_names: vec!["name".to_string()],
+        algorithm: biscotti::config::CryptoAlgorithm::Signing,
+        key: biscotti::Key::generate(), // good
+        fallbacks: vec![],
+    };
+    config1.crypto_rules.push(crypto_rules1);
+    let processor1: biscotti::Processor = config1.into();
+
+    let mut config2 = biscotti::ProcessorConfig::default();
+    let array2 = Vec::from([0u8; 64]); // $ Alert[rust/hard-coded-cryptographic-value]
+    let crypto_rules2 = biscotti::config::CryptoRule {
+        cookie_names: vec!["name".to_string()],
+        algorithm: biscotti::config::CryptoAlgorithm::Signing,
+        key: biscotti::Key::from(array2), // $ Sink
+        fallbacks: vec![],
+    };
+    config2.crypto_rules.push(crypto_rules2);
+    let processor2: biscotti::Processor = config2.into();
+
+    let mut config3 = biscotti::ProcessorConfig::default();
+    let array3 = vec![0u8; 64]; // $ Alert[rust/hard-coded-cryptographic-value]
+    let crypto_rules3 = biscotti::config::CryptoRule {
+        cookie_names: vec!["name".to_string()],
+        algorithm: biscotti::config::CryptoAlgorithm::Signing,
+        key: biscotti::Key::from(array3), // $ Sink
+        fallbacks: vec![],
+    };
+    config3.crypto_rules.push(crypto_rules3);
+    let processor3: biscotti::Processor = config3.into();
+}
diff --git a/rust/ql/test/query-tests/security/CWE-825/AccessAfterLifetime.expected b/rust/ql/test/query-tests/security/CWE-825/AccessAfterLifetime.expected
index c7e132bce89..f58c58bc896 100644
--- a/rust/ql/test/query-tests/security/CWE-825/AccessAfterLifetime.expected
+++ b/rust/ql/test/query-tests/security/CWE-825/AccessAfterLifetime.expected
@@ -11,6 +11,7 @@
 | lifetime.rs:172:13:172:15 | ptr | lifetime.rs:187:12:187:21 | &my_local1 | lifetime.rs:172:13:172:15 | ptr | Access of a pointer to $@ after its lifetime has ended. | lifetime.rs:186:6:186:14 | my_local1 | my_local1 |
 | lifetime.rs:255:14:255:17 | prev | lifetime.rs:251:10:251:19 | &my_local2 | lifetime.rs:255:14:255:17 | prev | Access of a pointer to $@ after its lifetime has ended. | lifetime.rs:242:7:242:15 | my_local2 | my_local2 |
 | lifetime.rs:310:31:310:32 | e1 | lifetime.rs:272:30:272:32 | &e1 | lifetime.rs:310:31:310:32 | e1 | Access of a pointer to $@ after its lifetime has ended. | lifetime.rs:271:6:271:7 | e1 | e1 |
+| lifetime.rs:314:23:314:24 | p2 | lifetime.rs:279:28:279:30 | &v2 | lifetime.rs:314:23:314:24 | p2 | Access of a pointer to $@ after its lifetime has ended. | lifetime.rs:278:6:278:7 | v2 | v2 |
 | lifetime.rs:317:13:317:18 | result | lifetime.rs:289:25:289:26 | &x | lifetime.rs:317:13:317:18 | result | Access of a pointer to $@ after its lifetime has ended. | lifetime.rs:289:17:289:17 | x | x |
 | lifetime.rs:411:16:411:17 | p1 | lifetime.rs:383:31:383:37 | &raw mut my_pair | lifetime.rs:411:16:411:17 | p1 | Access of a pointer to $@ after its lifetime has ended. | lifetime.rs:382:11:382:17 | my_pair | my_pair |
 | lifetime.rs:416:16:416:17 | p1 | lifetime.rs:383:31:383:37 | &raw mut my_pair | lifetime.rs:416:16:416:17 | p1 | Access of a pointer to $@ after its lifetime has ended. | lifetime.rs:382:11:382:17 | my_pair | my_pair |
@@ -21,6 +22,7 @@
 | lifetime.rs:667:14:667:17 | ref1 | lifetime.rs:655:11:655:25 | &raw const str2 | lifetime.rs:667:14:667:17 | ref1 | Access of a pointer to $@ after its lifetime has ended. | lifetime.rs:651:7:651:10 | str2 | str2 |
 | lifetime.rs:789:12:789:13 | p1 | lifetime.rs:781:9:781:19 | &my_local10 | lifetime.rs:789:12:789:13 | p1 | Access of a pointer to $@ after its lifetime has ended. | lifetime.rs:779:6:779:15 | my_local10 | my_local10 |
 | lifetime.rs:808:23:808:25 | ptr | lifetime.rs:798:9:798:12 | &val | lifetime.rs:808:23:808:25 | ptr | Access of a pointer to $@ after its lifetime has ended. | lifetime.rs:796:6:796:8 | val | val |
+| main.rs:64:23:64:24 | p2 | main.rs:44:26:44:28 | &b2 | main.rs:64:23:64:24 | p2 | Access of a pointer to $@ after its lifetime has ended. | main.rs:43:13:43:14 | b2 | b2 |
 edges
 | deallocation.rs:148:6:148:7 | p1 | deallocation.rs:151:14:151:15 | p1 | provenance |  |
 | deallocation.rs:148:6:148:7 | p1 | deallocation.rs:158:14:158:15 | p1 | provenance |  |
@@ -123,14 +125,22 @@ edges
 | lifetime.rs:270:47:275:1 | { ... } | lifetime.rs:303:11:303:31 | get_pointer_to_enum(...) | provenance |  |
 | lifetime.rs:272:6:272:11 | result | lifetime.rs:270:47:275:1 | { ... } | provenance |  |
 | lifetime.rs:272:30:272:32 | &e1 | lifetime.rs:272:6:272:11 | result | provenance |  |
+| lifetime.rs:277:41:282:1 | { ... } [Pointer] | lifetime.rs:304:11:304:31 | get_pointer_in_enum(...) [Pointer] | provenance |  |
+| lifetime.rs:279:6:279:7 | e2 [Pointer] | lifetime.rs:277:41:282:1 | { ... } [Pointer] | provenance |  |
+| lifetime.rs:279:11:279:31 | ...::Pointer(...) [Pointer] | lifetime.rs:279:6:279:7 | e2 [Pointer] | provenance |  |
+| lifetime.rs:279:28:279:30 | &v2 | lifetime.rs:279:11:279:31 | ...::Pointer(...) [Pointer] | provenance |  |
 | lifetime.rs:284:46:300:1 | { ... } | lifetime.rs:305:15:305:37 | get_pointer_from_enum(...) | provenance |  |
 | lifetime.rs:288:2:288:7 | result | lifetime.rs:284:46:300:1 | { ... } | provenance |  |
 | lifetime.rs:288:2:288:7 | result | lifetime.rs:295:13:295:18 | result | provenance |  |
 | lifetime.rs:289:25:289:26 | &x | lifetime.rs:288:2:288:7 | result | provenance |  |
 | lifetime.rs:303:6:303:7 | e1 | lifetime.rs:310:31:310:32 | e1 | provenance |  |
 | lifetime.rs:303:11:303:31 | get_pointer_to_enum(...) | lifetime.rs:303:6:303:7 | e1 | provenance |  |
+| lifetime.rs:304:6:304:7 | e2 [Pointer] | lifetime.rs:313:10:313:29 | ...::Pointer(...) [Pointer] | provenance |  |
+| lifetime.rs:304:11:304:31 | get_pointer_in_enum(...) [Pointer] | lifetime.rs:304:6:304:7 | e2 [Pointer] | provenance |  |
 | lifetime.rs:305:6:305:11 | result | lifetime.rs:317:13:317:18 | result | provenance |  |
 | lifetime.rs:305:15:305:37 | get_pointer_from_enum(...) | lifetime.rs:305:6:305:11 | result | provenance |  |
+| lifetime.rs:313:10:313:29 | ...::Pointer(...) [Pointer] | lifetime.rs:313:27:313:28 | p2 | provenance |  |
+| lifetime.rs:313:27:313:28 | p2 | lifetime.rs:314:23:314:24 | p2 | provenance |  |
 | lifetime.rs:383:3:383:4 | p1 | lifetime.rs:388:15:388:16 | p1 | provenance |  |
 | lifetime.rs:383:3:383:4 | p1 | lifetime.rs:391:15:391:16 | p1 | provenance |  |
 | lifetime.rs:383:3:383:4 | p1 | lifetime.rs:399:6:399:7 | p1 | provenance |  |
@@ -154,7 +164,7 @@ edges
 | lifetime.rs:443:6:443:7 | p1 | lifetime.rs:446:13:446:14 | p1 | provenance |  |
 | lifetime.rs:443:6:443:7 | p1 | lifetime.rs:450:2:450:10 | return p1 | provenance |  |
 | lifetime.rs:443:23:443:44 | ...::from_ref(...) | lifetime.rs:443:6:443:7 | p1 | provenance |  |
-| lifetime.rs:443:42:443:43 | r1 | lifetime.rs:443:23:443:44 | ...::from_ref(...) | provenance | MaD:1 |
+| lifetime.rs:443:42:443:43 | r1 | lifetime.rs:443:23:443:44 | ...::from_ref(...) | provenance | MaD:5 |
 | lifetime.rs:450:2:450:10 | return p1 | lifetime.rs:454:11:454:29 | get_ptr_from_ref(...) | provenance |  |
 | lifetime.rs:450:2:450:10 | return p1 | lifetime.rs:460:13:460:31 | get_ptr_from_ref(...) | provenance |  |
 | lifetime.rs:454:6:454:7 | p1 | lifetime.rs:459:13:459:14 | p1 | provenance |  |
@@ -165,7 +175,10 @@ edges
 | lifetime.rs:630:3:630:6 | str2 | lifetime.rs:641:14:641:17 | str2 | provenance |  |
 | lifetime.rs:630:10:630:25 | &... | lifetime.rs:630:3:630:6 | str2 | provenance |  |
 | lifetime.rs:654:4:654:7 | str2 | lifetime.rs:655:22:655:25 | str2 | provenance |  |
+| lifetime.rs:654:11:654:35 | ... + ... | lifetime.rs:654:4:654:7 | str2 | provenance |  |
 | lifetime.rs:654:31:654:35 | &str1 | lifetime.rs:654:4:654:7 | str2 | provenance |  |
+| lifetime.rs:654:31:654:35 | &str1 | lifetime.rs:654:11:654:35 | ... + ... | provenance | MaD:2 |
+| lifetime.rs:654:31:654:35 | &str1 | lifetime.rs:654:11:654:35 | ... + ... | provenance | MaD:1 |
 | lifetime.rs:655:4:655:7 | ref1 | lifetime.rs:659:15:659:18 | ref1 | provenance |  |
 | lifetime.rs:655:4:655:7 | ref1 | lifetime.rs:667:14:667:17 | ref1 | provenance |  |
 | lifetime.rs:655:4:655:7 | ref1 [&ref] | lifetime.rs:659:15:659:18 | ref1 | provenance |  |
@@ -188,11 +201,13 @@ edges
 | lifetime.rs:719:26:719:34 | &... | lifetime.rs:718:7:718:8 | r1 | provenance |  |
 | lifetime.rs:730:6:730:7 | r1 | lifetime.rs:734:12:734:13 | r1 | provenance |  |
 | lifetime.rs:730:11:730:25 | e1.test_match() | lifetime.rs:730:6:730:7 | r1 | provenance |  |
-| lifetime.rs:766:2:766:13 | &val | lifetime.rs:766:2:766:13 | ptr | provenance |  |
-| lifetime.rs:766:2:766:13 | ptr | lifetime.rs:767:2:767:13 | ptr | provenance |  |
+| lifetime.rs:766:2:766:11 | &val | lifetime.rs:766:2:766:11 | ptr | provenance |  |
+| lifetime.rs:766:2:766:11 | ptr | lifetime.rs:766:2:766:11 | ptr | provenance |  |
+| lifetime.rs:767:2:767:11 | &val | lifetime.rs:767:2:767:11 | ptr | provenance |  |
+| lifetime.rs:767:2:767:11 | ptr | lifetime.rs:767:2:767:11 | ptr | provenance |  |
 | lifetime.rs:769:6:769:8 | ptr | lifetime.rs:771:12:771:14 | ptr | provenance |  |
-| lifetime.rs:769:12:769:23 | &val | lifetime.rs:769:12:769:23 | ptr | provenance |  |
-| lifetime.rs:769:12:769:23 | ptr | lifetime.rs:769:6:769:8 | ptr | provenance |  |
+| lifetime.rs:769:12:769:21 | &val | lifetime.rs:769:12:769:21 | ptr | provenance |  |
+| lifetime.rs:769:12:769:21 | ptr | lifetime.rs:769:6:769:8 | ptr | provenance |  |
 | lifetime.rs:781:2:781:19 | return ... | lifetime.rs:785:11:785:41 | get_local_for_unsafe_function(...) | provenance |  |
 | lifetime.rs:781:9:781:19 | &my_local10 | lifetime.rs:781:2:781:19 | return ... | provenance |  |
 | lifetime.rs:785:6:785:7 | p1 | lifetime.rs:789:12:789:13 | p1 | provenance |  |
@@ -201,8 +216,23 @@ edges
 | lifetime.rs:798:9:798:12 | &val | lifetime.rs:798:2:798:12 | return ... | provenance |  |
 | lifetime.rs:802:6:802:8 | ptr | lifetime.rs:808:23:808:25 | ptr | provenance |  |
 | lifetime.rs:802:12:802:24 | get_pointer(...) | lifetime.rs:802:6:802:8 | ptr | provenance |  |
+| main.rs:18:9:18:10 | p1 [&ref] | main.rs:21:19:21:20 | p1 | provenance |  |
+| main.rs:18:9:18:10 | p1 [&ref] | main.rs:29:19:29:20 | p1 | provenance |  |
+| main.rs:18:14:18:29 | ...::as_ptr(...) [&ref] | main.rs:18:9:18:10 | p1 [&ref] | provenance |  |
+| main.rs:18:26:18:28 | &b1 | main.rs:18:14:18:29 | ...::as_ptr(...) [&ref] | provenance | MaD:4 |
+| main.rs:44:9:44:10 | p2 [&ref] | main.rs:51:23:51:24 | p2 | provenance |  |
+| main.rs:44:9:44:10 | p2 [&ref] | main.rs:64:23:64:24 | p2 | provenance |  |
+| main.rs:44:14:44:29 | ...::as_ptr(...) [&ref] | main.rs:44:9:44:10 | p2 [&ref] | provenance |  |
+| main.rs:44:26:44:28 | &b2 | main.rs:44:14:44:29 | ...::as_ptr(...) [&ref] | provenance | MaD:4 |
+| main.rs:47:9:47:10 | p3 [&ref] | main.rs:52:23:52:24 | p3 | provenance |  |
+| main.rs:47:14:47:37 | ...::as_mut_ptr(...) [&ref] | main.rs:47:9:47:10 | p3 [&ref] | provenance |  |
+| main.rs:47:30:47:36 | &mut b3 | main.rs:47:14:47:37 | ...::as_mut_ptr(...) [&ref] | provenance | MaD:3 |
 models
-| 1 | Summary: core::ptr::from_ref; Argument[0]; ReturnValue; value |
+| 1 | Summary: <_ as core::ops::arith::Add>::add; Argument[0].Reference; ReturnValue; taint |
+| 2 | Summary: <_ as core::ops::arith::Add>::add; Argument[0]; ReturnValue; taint |
+| 3 | Summary: <alloc::boxed::Box>::as_mut_ptr; Argument[0].Reference.Reference; ReturnValue.Reference; value |
+| 4 | Summary: <alloc::boxed::Box>::as_ptr; Argument[0].Reference.Reference; ReturnValue.Reference; value |
+| 5 | Summary: core::ptr::from_ref; Argument[0]; ReturnValue; value |
 nodes
 | deallocation.rs:148:6:148:7 | p1 | semmle.label | p1 |
 | deallocation.rs:148:30:148:38 | &raw const my_buffer | semmle.label | &raw const my_buffer |
@@ -323,15 +353,24 @@ nodes
 | lifetime.rs:270:47:275:1 | { ... } | semmle.label | { ... } |
 | lifetime.rs:272:6:272:11 | result | semmle.label | result |
 | lifetime.rs:272:30:272:32 | &e1 | semmle.label | &e1 |
+| lifetime.rs:277:41:282:1 | { ... } [Pointer] | semmle.label | { ... } [Pointer] |
+| lifetime.rs:279:6:279:7 | e2 [Pointer] | semmle.label | e2 [Pointer] |
+| lifetime.rs:279:11:279:31 | ...::Pointer(...) [Pointer] | semmle.label | ...::Pointer(...) [Pointer] |
+| lifetime.rs:279:28:279:30 | &v2 | semmle.label | &v2 |
 | lifetime.rs:284:46:300:1 | { ... } | semmle.label | { ... } |
 | lifetime.rs:288:2:288:7 | result | semmle.label | result |
 | lifetime.rs:289:25:289:26 | &x | semmle.label | &x |
 | lifetime.rs:295:13:295:18 | result | semmle.label | result |
 | lifetime.rs:303:6:303:7 | e1 | semmle.label | e1 |
 | lifetime.rs:303:11:303:31 | get_pointer_to_enum(...) | semmle.label | get_pointer_to_enum(...) |
+| lifetime.rs:304:6:304:7 | e2 [Pointer] | semmle.label | e2 [Pointer] |
+| lifetime.rs:304:11:304:31 | get_pointer_in_enum(...) [Pointer] | semmle.label | get_pointer_in_enum(...) [Pointer] |
 | lifetime.rs:305:6:305:11 | result | semmle.label | result |
 | lifetime.rs:305:15:305:37 | get_pointer_from_enum(...) | semmle.label | get_pointer_from_enum(...) |
 | lifetime.rs:310:31:310:32 | e1 | semmle.label | e1 |
+| lifetime.rs:313:10:313:29 | ...::Pointer(...) [Pointer] | semmle.label | ...::Pointer(...) [Pointer] |
+| lifetime.rs:313:27:313:28 | p2 | semmle.label | p2 |
+| lifetime.rs:314:23:314:24 | p2 | semmle.label | p2 |
 | lifetime.rs:317:13:317:18 | result | semmle.label | result |
 | lifetime.rs:383:3:383:4 | p1 | semmle.label | p1 |
 | lifetime.rs:383:31:383:37 | &raw mut my_pair | semmle.label | &raw mut my_pair |
@@ -373,6 +412,7 @@ nodes
 | lifetime.rs:633:15:633:18 | str2 | semmle.label | str2 |
 | lifetime.rs:641:14:641:17 | str2 | semmle.label | str2 |
 | lifetime.rs:654:4:654:7 | str2 | semmle.label | str2 |
+| lifetime.rs:654:11:654:35 | ... + ... | semmle.label | ... + ... |
 | lifetime.rs:654:31:654:35 | &str1 | semmle.label | &str1 |
 | lifetime.rs:655:4:655:7 | ref1 | semmle.label | ref1 |
 | lifetime.rs:655:4:655:7 | ref1 [&ref] | semmle.label | ref1 [&ref] |
@@ -400,12 +440,15 @@ nodes
 | lifetime.rs:730:6:730:7 | r1 | semmle.label | r1 |
 | lifetime.rs:730:11:730:25 | e1.test_match() | semmle.label | e1.test_match() |
 | lifetime.rs:734:12:734:13 | r1 | semmle.label | r1 |
-| lifetime.rs:766:2:766:13 | &val | semmle.label | &val |
-| lifetime.rs:766:2:766:13 | ptr | semmle.label | ptr |
-| lifetime.rs:767:2:767:13 | ptr | semmle.label | ptr |
+| lifetime.rs:766:2:766:11 | &val | semmle.label | &val |
+| lifetime.rs:766:2:766:11 | ptr | semmle.label | ptr |
+| lifetime.rs:766:2:766:11 | ptr | semmle.label | ptr |
+| lifetime.rs:767:2:767:11 | &val | semmle.label | &val |
+| lifetime.rs:767:2:767:11 | ptr | semmle.label | ptr |
+| lifetime.rs:767:2:767:11 | ptr | semmle.label | ptr |
 | lifetime.rs:769:6:769:8 | ptr | semmle.label | ptr |
-| lifetime.rs:769:12:769:23 | &val | semmle.label | &val |
-| lifetime.rs:769:12:769:23 | ptr | semmle.label | ptr |
+| lifetime.rs:769:12:769:21 | &val | semmle.label | &val |
+| lifetime.rs:769:12:769:21 | ptr | semmle.label | ptr |
 | lifetime.rs:771:12:771:14 | ptr | semmle.label | ptr |
 | lifetime.rs:781:2:781:19 | return ... | semmle.label | return ... |
 | lifetime.rs:781:9:781:19 | &my_local10 | semmle.label | &my_local10 |
@@ -417,4 +460,18 @@ nodes
 | lifetime.rs:802:6:802:8 | ptr | semmle.label | ptr |
 | lifetime.rs:802:12:802:24 | get_pointer(...) | semmle.label | get_pointer(...) |
 | lifetime.rs:808:23:808:25 | ptr | semmle.label | ptr |
+| main.rs:18:9:18:10 | p1 [&ref] | semmle.label | p1 [&ref] |
+| main.rs:18:14:18:29 | ...::as_ptr(...) [&ref] | semmle.label | ...::as_ptr(...) [&ref] |
+| main.rs:18:26:18:28 | &b1 | semmle.label | &b1 |
+| main.rs:21:19:21:20 | p1 | semmle.label | p1 |
+| main.rs:29:19:29:20 | p1 | semmle.label | p1 |
+| main.rs:44:9:44:10 | p2 [&ref] | semmle.label | p2 [&ref] |
+| main.rs:44:14:44:29 | ...::as_ptr(...) [&ref] | semmle.label | ...::as_ptr(...) [&ref] |
+| main.rs:44:26:44:28 | &b2 | semmle.label | &b2 |
+| main.rs:47:9:47:10 | p3 [&ref] | semmle.label | p3 [&ref] |
+| main.rs:47:14:47:37 | ...::as_mut_ptr(...) [&ref] | semmle.label | ...::as_mut_ptr(...) [&ref] |
+| main.rs:47:30:47:36 | &mut b3 | semmle.label | &mut b3 |
+| main.rs:51:23:51:24 | p2 | semmle.label | p2 |
+| main.rs:52:23:52:24 | p3 | semmle.label | p3 |
+| main.rs:64:23:64:24 | p2 | semmle.label | p2 |
 subpaths
diff --git a/rust/ql/test/query-tests/security/CWE-825/CONSISTENCY/PathResolutionConsistency.expected b/rust/ql/test/query-tests/security/CWE-825/CONSISTENCY/PathResolutionConsistency.expected
index 22e607bfa48..81f06adcde3 100644
--- a/rust/ql/test/query-tests/security/CWE-825/CONSISTENCY/PathResolutionConsistency.expected
+++ b/rust/ql/test/query-tests/security/CWE-825/CONSISTENCY/PathResolutionConsistency.expected
@@ -1,15 +1,6 @@
 multipleCallTargets
-| deallocation.rs:106:16:106:32 | ...::malloc(...) |
-| deallocation.rs:112:3:112:41 | ...::free(...) |
 | deallocation.rs:260:11:260:29 | ...::from(...) |
 | deallocation.rs:261:11:261:29 | ...::from(...) |
 | lifetime.rs:610:13:610:31 | ...::from(...) |
 | lifetime.rs:611:13:611:31 | ...::from(...) |
-| lifetime.rs:612:27:612:38 | foo.as_str() |
-| lifetime.rs:612:41:612:52 | bar.as_str() |
 | lifetime.rs:628:13:628:31 | ...::from(...) |
-| lifetime.rs:629:32:629:43 | baz.as_str() |
-multiplePathResolutions
-| deallocation.rs:106:16:106:19 | libc |
-| deallocation.rs:112:3:112:6 | libc |
-| deallocation.rs:112:29:112:32 | libc |
diff --git a/rust/ql/test/query-tests/security/CWE-825/lifetime.rs b/rust/ql/test/query-tests/security/CWE-825/lifetime.rs
index ab03252b699..83317aa13d1 100644
--- a/rust/ql/test/query-tests/security/CWE-825/lifetime.rs
+++ b/rust/ql/test/query-tests/security/CWE-825/lifetime.rs
@@ -276,7 +276,7 @@ pub fn get_pointer_to_enum() -> *const MyEnum {
 
 pub fn get_pointer_in_enum() -> MyEnum2 {
 	let v2 = 2;
-	let e2 = MyEnum2::Pointer(&v2); // $ MISSING: Source[rust/access-after-lifetime-ended]=v2
+	let e2 = MyEnum2::Pointer(&v2); // $ Source[rust/access-after-lifetime-ended]=v2
 
 	e2
 } // (v2 goes out of scope, so the contained pointer is dangling)
@@ -311,7 +311,7 @@ pub fn test_enums() {
 			println!("	v1 = {v1} (!)"); // corrupt in practice
 		}
 		if let MyEnum2::Pointer(p2) = e2 {
-			let v2 = unsafe { *p2 }; // $ MISSING: Alert[rust/access-after-lifetime-ended]=v2
+			let v2 = unsafe { *p2 }; // $ Alert[rust/access-after-lifetime-ended]=v2
 			println!("	v2 = {v2} (!)"); // corrupt in practice
 		}
 		let v3 = *result; // $ Alert[rust/access-after-lifetime-ended]=match_x
diff --git a/rust/ql/test/query-tests/security/CWE-825/main.rs b/rust/ql/test/query-tests/security/CWE-825/main.rs
index 5f66313ae85..8d1f2a42146 100644
--- a/rust/ql/test/query-tests/security/CWE-825/main.rs
+++ b/rust/ql/test/query-tests/security/CWE-825/main.rs
@@ -7,197 +7,201 @@ mod lifetime;
 use lifetime::*;
 
 fn use_the_heap() {
-	let _a = Box::new(0x7FFFFFFF);
-	let _b = Box::new(0x7FFFFFFF);
+    let _a = Box::new(0x7FFFFFFF);
+    let _b = Box::new(0x7FFFFFFF);
 }
 
 // --- boxes ---
 
 pub fn test_boxes_into() {
-	let b1: Box<i64> = Box::new(7); // b1 owns the memory for '50'
-	let p1 = Box::as_ptr(&b1); // b1 still owns the memory
+    let b1: Box<i64> = Box::new(7); // b1 owns the memory for '50'
+    let p1 = Box::as_ptr(&b1); // b1 still owns the memory
 
-	unsafe {
-		let v1 = *p1; // GOOD
-		println!("	v1 = {v1}");
-	}
+    unsafe {
+        let v1 = *p1; // GOOD
+        println!("	v1 = {v1}");
+    }
 
-	let v2 = Box::into_inner(b1); // b1 is explicitly freed here, thus p1 is dangling
-	println!("	v2 = {v2}");
+    let v2 = Box::into_inner(b1); // b1 is explicitly freed here, thus p1 is dangling
+    println!("	v2 = {v2}");
 
-	unsafe {
-		let v3 = *p1; // $ MISSING: Alert
-		println!("	v3 = {v3} (!)"); // corrupt in practice
-	}
+    unsafe {
+        let v3 = *p1; // $ MISSING: Alert
+        println!("	v3 = {v3} (!)"); // corrupt in practice
+    }
 }
 
 pub fn test_boxes_1(mode: i32) {
-	let p1: *const i64;
-	let p2: *const i64;
-	let p3: *mut i64;
+    let p1: *const i64;
+    let p2: *const i64;
+    let p3: *mut i64;
 
-	{
-		let b1: Box<i64> = Box::new(1);
-		p1 = Box::into_raw(b1); // now owned by p1
+    {
+        let b1: Box<i64> = Box::new(1);
+        p1 = Box::into_raw(b1); // now owned by p1
 
-		let b2: Box<i64> = Box::new(2);
-		p2 = Box::as_ptr(&b2); // still owned by b2
+        let b2: Box<i64> = Box::new(2);
+        p2 = Box::as_ptr(&b2); // $ Source[rust/access-after-lifetime-ended]=b2 -- still owned by b2
 
-		let mut b3: Box<i64> = Box::new(3);
-		p3 = Box::as_mut_ptr(&mut b3); // still owned by b3
+        let mut b3: Box<i64> = Box::new(3);
+        p3 = Box::as_mut_ptr(&mut b3); // still owned by b3
 
-		unsafe {
-			let v1 = *p1; // GOOD
-			let v2 = *p2; // GOOD
-			let v3 = *p3; // GOOD
-			println!("	v1 = {v1}");
-			println!("	v2 = {v2}");
-			println!("	v3 = {v3}");
-			*p3 = 4;
-		}
-	} // (b2, b3 go out of scope, thus p2, p3 are dangling)
+        unsafe {
+            let v1 = *p1; // GOOD
+            let v2 = *p2; // GOOD
+            let v3 = *p3; // GOOD
+            println!("	v1 = {v1}");
+            println!("	v2 = {v2}");
+            println!("	v3 = {v3}");
+            *p3 = 4;
+        }
+    } // (b2, b3 go out of scope, thus p2, p3 are dangling)
 
-	unsafe {
-		if mode == 0 {
-			// reads
-			let v4 = *p1; // GOOD
-			let v5 = *p2; // $ MISSING: Alert
-			let v6 = *p3; // $ MISSING: Alert
-			println!("	v4 = {v4}");
-			println!("	v5 = {v5} (!)"); // corrupt in practice
-			println!("	v6 = {v6} (!)"); // corrupt in practice
-		}
-		if mode == 10 {
-			// write
-			*p3 = 5; // $ MISSING: Alert
-			use_the_heap(); // "malloc: Heap corruption detected"
-		}
-	}
+    unsafe {
+        if mode == 0 {
+            // reads
+            let v4 = *p1; // GOOD
+            let v5 = *p2; // $ Alert[rust/access-after-lifetime-ended]=b2
+            let v6 = *p3; // $ MISSING: Alert
+            println!("	v4 = {v4}");
+            println!("	v5 = {v5} (!)"); // corrupt in practice
+            println!("	v6 = {v6} (!)"); // corrupt in practice
+        }
+        if mode == 10 {
+            // write
+            *p3 = 5; // $ MISSING: Alert
+            use_the_heap(); // "malloc: Heap corruption detected"
+        }
+    }
 }
 
 pub fn test_boxes_2() {
-	let b1: Box<i64> = Box::new(6); // b1 owns the memory
-	let p1 = Box::into_raw(b1); // now p1 owns the memory
+    let b1: Box<i64> = Box::new(6); // b1 owns the memory
+    let p1 = Box::into_raw(b1); // now p1 owns the memory
 
-	unsafe {
-		let _b2 = Box::from_raw(p1); // now _b2 owns the memory
+    unsafe {
+        let _b2 = Box::from_raw(p1); // now _b2 owns the memory
 
-		let v1 = *p1; // GOOD
-		println!("	v1 = {v1}");
-	} // (_b2 goes out of scope, thus the memory is freed and p1 is dangling)
+        let v1 = *p1; // GOOD
+        println!("	v1 = {v1}");
+    } // (_b2 goes out of scope, thus the memory is freed and p1 is dangling)
 
-	unsafe {
-		let v2 = *p1; // $ MISSING: Alert
-		println!("	v2 = {v2} (!)"); // corrupt in practice
-	}
+    unsafe {
+        let v2 = *p1; // $ MISSING: Alert
+        println!("	v2 = {v2} (!)"); // corrupt in practice
+    }
 }
 
 // --- main ---
 
 fn main() {
-	let mode = std::env::args().nth(1).unwrap_or("0".to_string()).parse::<i32>().unwrap_or(0);
-		// mode = which test cases to explore (0 should be safe; some will crash / segfault).
-	println!("mode = {mode}");
+    let mode = std::env::args()
+        .nth(1)
+        .unwrap_or("0".to_string())
+        .parse::<i32>()
+        .unwrap_or(0);
+    // mode = which test cases to explore (0 should be safe; some will crash / segfault).
+    println!("mode = {mode}");
 
-	println!("test_boxes_into:");
-	test_boxes_into();
+    println!("test_boxes_into:");
+    test_boxes_into();
 
-	println!("test_boxes_1:");
-	test_boxes_1(mode);
+    println!("test_boxes_1:");
+    test_boxes_1(mode);
 
-	println!("test_boxes_2:");
-	test_boxes_2();
+    println!("test_boxes_2:");
+    test_boxes_2();
 
-	// ---
+    // ---
 
-	println!("test_alloc:");
-	test_alloc(mode);
+    println!("test_alloc:");
+    test_alloc(mode);
 
-	println!("test_alloc_array:");
-	test_alloc_array(mode);
+    println!("test_alloc_array:");
+    test_alloc_array(mode);
 
-	println!("test_libc:");
-	test_libc();
+    println!("test_libc:");
+    test_libc();
 
-	println!("test_ptr_invalid:");
-	test_ptr_invalid(mode);
+    println!("test_ptr_invalid:");
+    test_ptr_invalid(mode);
 
-	println!("test_drop:");
-	test_drop();
+    println!("test_drop:");
+    test_drop();
 
-	println!("test_ptr_drop:");
-	test_ptr_drop(mode);
+    println!("test_ptr_drop:");
+    test_ptr_drop(mode);
 
-	println!("test_qhelp_tests:");
-	test_qhelp_examples();
+    println!("test_qhelp_tests:");
+    test_qhelp_examples();
 
-	println!("test_vec_reserve:");
-	test_vec_reserve();
+    println!("test_vec_reserve:");
+    test_vec_reserve();
 
-	// ---
+    // ---
 
-	println!("test_local_dangling:");
-	test_local_dangling();
+    println!("test_local_dangling:");
+    test_local_dangling();
 
-	println!("test_local_in_scope:");
-	test_local_in_scope(mode);
+    println!("test_local_in_scope:");
+    test_local_in_scope(mode);
 
-	println!("test_static:");
-	test_static(mode);
+    println!("test_static:");
+    test_static(mode);
 
-	println!("test_call_contexts:");
-	test_call_contexts();
+    println!("test_call_contexts:");
+    test_call_contexts();
 
-	println!("test_call_contexts_rec:");
-	test_call_contexts_rec();
+    println!("test_call_contexts_rec:");
+    test_call_contexts_rec();
 
-	println!("test_loop:");
-	test_loop();
+    println!("test_loop:");
+    test_loop();
 
-	println!("test_enums:");
-	test_enums();
+    println!("test_enums:");
+    test_enums();
 
-	println!("test_recursive_enums:");
-	test_recursive_enums();
+    println!("test_recursive_enums:");
+    test_recursive_enums();
 
-	println!("test_ptr_to_struct:");
-	test_ptr_to_struct(mode);
+    println!("test_ptr_to_struct:");
+    test_ptr_to_struct(mode);
 
-	println!("test_ptr_from_ref:");
-	test_ptr_from_ref();
+    println!("test_ptr_from_ref:");
+    test_ptr_from_ref();
 
-	println!("test_rc:");
-	test_rc();
+    println!("test_rc:");
+    test_rc();
 
-	println!("test_closures:");
-	test_closures();
+    println!("test_closures:");
+    test_closures();
 
-	println!("test_async:");
-	test_async();
+    println!("test_async:");
+    test_async();
 
-	println!("test_lifetime_annotations:");
-	test_lifetime_annotations();
+    println!("test_lifetime_annotations:");
+    test_lifetime_annotations();
 
-	println!("test_implicit_derefs:");
-	test_implicit_derefs();
+    println!("test_implicit_derefs:");
+    test_implicit_derefs();
 
-	println!("test_members:");
-	test_members();
+    println!("test_members:");
+    test_members();
 
-	println!("test_enum_members:");
-	test_enum_members();
+    println!("test_enum_members:");
+    test_enum_members();
 
-	println!("test_macros:");
-	test_macros();
+    println!("test_macros:");
+    test_macros();
 
-	println!("test_unsafe_function:");
-	unsafe {
-		test_unsafe_function();
-	}
+    println!("test_unsafe_function:");
+    unsafe {
+        test_unsafe_function();
+    }
 
-	println!("test_lifetimes_example_bad:");
-	test_lifetimes_example_bad();
+    println!("test_lifetimes_example_bad:");
+    test_lifetimes_example_bad();
 
-	println!("test_lifetimes_example_good:");
-	test_lifetimes_example_good();
+    println!("test_lifetimes_example_good:");
+    test_lifetimes_example_good();
 }
diff --git a/rust/ql/test/query-tests/security/CWE-918/Cargo.lock b/rust/ql/test/query-tests/security/CWE-918/Cargo.lock
new file mode 100644
index 00000000000..d00e99a2909
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-918/Cargo.lock
@@ -0,0 +1,2070 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "addr2line"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler2"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "atomic-waker"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+
+[[package]]
+name = "autocfg"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
+
+[[package]]
+name = "backtrace"
+version = "0.3.75"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002"
+dependencies = [
+ "addr2line",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "base64"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+
+[[package]]
+name = "bitflags"
+version = "2.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2261d10cca569e4643e526d8dc2e62e433cc8aba21ab764233731f8d369bf394"
+
+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
+
+[[package]]
+name = "bytes"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
+
+[[package]]
+name = "cc"
+version = "1.2.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "590f9024a68a8c40351881787f1934dc11afd69090f5edb6831464694d836ea3"
+dependencies = [
+ "find-msvc-tools",
+ "shlex",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9"
+
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
+[[package]]
+name = "core-foundation"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crypto-common"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer",
+ "crypto-common",
+]
+
+[[package]]
+name = "displaydoc"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "encoding_rs"
+version = "0.8.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
+
+[[package]]
+name = "errno"
+version = "0.3.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
+dependencies = [
+ "libc",
+ "windows-sys 0.60.2",
+]
+
+[[package]]
+name = "fastrand"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
+
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e178e4fba8a2726903f6ba98a6d221e76f9c12c650d5dc0e6afdc50677b49650"
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "foreign-types"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
+dependencies = [
+ "foreign-types-shared",
+]
+
+[[package]]
+name = "foreign-types-shared"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
+
+[[package]]
+name = "form_urlencoded"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf"
+dependencies = [
+ "percent-encoding",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
+
+[[package]]
+name = "futures-io"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
+
+[[package]]
+name = "futures-macro"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
+
+[[package]]
+name = "futures-task"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
+
+[[package]]
+name = "futures-util"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
+dependencies = [
+ "futures-core",
+ "futures-io",
+ "futures-macro",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.11.1+wasi-snapshot-preview1",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "r-efi",
+ "wasi 0.14.3+wasi-0.2.4",
+]
+
+[[package]]
+name = "gimli"
+version = "0.31.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
+
+[[package]]
+name = "h2"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3c0b69cfcb4e1b9f1bf2f53f95f766e4661169728ec61cd3fe5a0166f2d1386"
+dependencies = [
+ "atomic-waker",
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "http",
+ "indexmap",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.15.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
+
+[[package]]
+name = "headers"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3314d5adb5d94bcdf56771f2e50dbbc80bb4bdf88967526706205ac9eff24eb"
+dependencies = [
+ "base64",
+ "bytes",
+ "headers-core",
+ "http",
+ "httpdate",
+ "mime",
+ "sha1",
+]
+
+[[package]]
+name = "headers-core"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54b4a22553d4242c49fddb9ba998a99962b5cc6f22cb5a3482bec22522403ce4"
+dependencies = [
+ "http",
+]
+
+[[package]]
+name = "http"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
+[[package]]
+name = "http-body"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
+dependencies = [
+ "bytes",
+ "http",
+]
+
+[[package]]
+name = "http-body-util"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "http",
+ "http-body",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "httparse"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
+
+[[package]]
+name = "httpdate"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
+
+[[package]]
+name = "hyper"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb3aa54a13a0dfe7fbe3a59e0c76093041720fdc77b110cc0fc260fafb4dc51e"
+dependencies = [
+ "atomic-waker",
+ "bytes",
+ "futures-channel",
+ "futures-core",
+ "h2",
+ "http",
+ "http-body",
+ "httparse",
+ "httpdate",
+ "itoa",
+ "pin-project-lite",
+ "pin-utils",
+ "smallvec",
+ "tokio",
+ "want",
+]
+
+[[package]]
+name = "hyper-rustls"
+version = "0.27.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58"
+dependencies = [
+ "http",
+ "hyper",
+ "hyper-util",
+ "rustls",
+ "rustls-pki-types",
+ "tokio",
+ "tokio-rustls",
+ "tower-service",
+]
+
+[[package]]
+name = "hyper-tls"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
+dependencies = [
+ "bytes",
+ "http-body-util",
+ "hyper",
+ "hyper-util",
+ "native-tls",
+ "tokio",
+ "tokio-native-tls",
+ "tower-service",
+]
+
+[[package]]
+name = "hyper-util"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d9b05277c7e8da2c93a568989bb6207bef0112e8d17df7a6eda4a3cf143bc5e"
+dependencies = [
+ "base64",
+ "bytes",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "http",
+ "http-body",
+ "hyper",
+ "ipnet",
+ "libc",
+ "percent-encoding",
+ "pin-project-lite",
+ "socket2",
+ "system-configuration",
+ "tokio",
+ "tower-service",
+ "tracing",
+ "windows-registry",
+]
+
+[[package]]
+name = "icu_collections"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47"
+dependencies = [
+ "displaydoc",
+ "potential_utf",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locale_core"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3"
+
+[[package]]
+name = "icu_properties"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locale_core",
+ "icu_properties_data",
+ "icu_provider",
+ "potential_utf",
+ "zerotrie",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632"
+
+[[package]]
+name = "icu_provider"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af"
+dependencies = [
+ "displaydoc",
+ "icu_locale_core",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerotrie",
+ "zerovec",
+]
+
+[[package]]
+name = "idna"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2481980430f9f78649238835720ddccc57e52df14ffce1c6f37391d61b563e9"
+dependencies = [
+ "equivalent",
+ "hashbrown",
+]
+
+[[package]]
+name = "io-uring"
+version = "0.7.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "046fa2d4d00aea763528b4950358d0ead425372445dc8ff86312b3c69ff7727b"
+dependencies = [
+ "bitflags",
+ "cfg-if",
+ "libc",
+]
+
+[[package]]
+name = "ipnet"
+version = "2.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
+
+[[package]]
+name = "iri-string"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbc5ebe9c3a1a7a5127f920a418f7585e9e758e911d0466ed004f393b0e380b2"
+dependencies = [
+ "memchr",
+ "serde",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
+
+[[package]]
+name = "js-sys"
+version = "0.3.77"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
+dependencies = [
+ "once_cell",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.175"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
+
+[[package]]
+name = "litemap"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
+
+[[package]]
+name = "lock_api"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
+
+[[package]]
+name = "memchr"
+version = "2.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
+
+[[package]]
+name = "mime"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
+
+[[package]]
+name = "mime_guess"
+version = "2.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e"
+dependencies = [
+ "mime",
+ "unicase",
+]
+
+[[package]]
+name = "miniz_oxide"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
+dependencies = [
+ "adler2",
+]
+
+[[package]]
+name = "mio"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c"
+dependencies = [
+ "libc",
+ "wasi 0.11.1+wasi-snapshot-preview1",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "native-tls"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e"
+dependencies = [
+ "libc",
+ "log",
+ "openssl",
+ "openssl-probe",
+ "openssl-sys",
+ "schannel",
+ "security-framework",
+ "security-framework-sys",
+ "tempfile",
+]
+
+[[package]]
+name = "nix"
+version = "0.30.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
+dependencies = [
+ "bitflags",
+ "cfg-if",
+ "cfg_aliases",
+ "libc",
+]
+
+[[package]]
+name = "object"
+version = "0.36.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+
+[[package]]
+name = "openssl"
+version = "0.10.73"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8"
+dependencies = [
+ "bitflags",
+ "cfg-if",
+ "foreign-types",
+ "libc",
+ "once_cell",
+ "openssl-macros",
+ "openssl-sys",
+]
+
+[[package]]
+name = "openssl-macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "openssl-probe"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
+
+[[package]]
+name = "openssl-sys"
+version = "0.9.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90096e2e47630d78b7d1c20952dc621f957103f8bc2c8359ec81290d75238571"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+ "vcpkg",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13"
+dependencies = [
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "percent-encoding"
+version = "2.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
+
+[[package]]
+name = "pin-project"
+version = "1.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677f1add503faace112b9f1373e43e9e054bfdd22ff1a63c1bc485eaec6a6a8a"
+dependencies = [
+ "pin-project-internal",
+]
+
+[[package]]
+name = "pin-project-internal"
+version = "1.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "pkg-config"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
+
+[[package]]
+name = "poem"
+version = "3.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f977080932c87287147dca052951c3e2696f8759863f6b4e4c0c9ffe7a4cc8b"
+dependencies = [
+ "bytes",
+ "futures-util",
+ "headers",
+ "http",
+ "http-body-util",
+ "hyper",
+ "hyper-util",
+ "mime",
+ "nix",
+ "parking_lot",
+ "percent-encoding",
+ "pin-project-lite",
+ "poem-derive",
+ "regex",
+ "rfc7239",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "smallvec",
+ "sync_wrapper",
+ "thiserror",
+ "tokio",
+ "tokio-util",
+ "tracing",
+ "wildmatch",
+]
+
+[[package]]
+name = "poem-derive"
+version = "3.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "056e2fea6de1cb240ffe23cfc4fc370b629f8be83b5f27e16b7acd5231a72de4"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "potential_utf"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84df19adbe5b5a0782edcab45899906947ab039ccf4573713735ee7de1e6b08a"
+dependencies = [
+ "zerovec",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "3.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35"
+dependencies = [
+ "toml_edit",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.101"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "r-efi"
+version = "5.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5407465600fb0548f1442edf71dd20683c6ed326200ace4b1ef0763521bb3b77"
+dependencies = [
+ "bitflags",
+]
+
+[[package]]
+name = "regex"
+version = "1.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23d7fd106d8c02486a8d64e778353d1cffe08ce79ac2e82f540c86d0facf6912"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b9458fa0bfeeac22b5ca447c63aaf45f28439a709ccd244698632f9aa6394d6"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001"
+
+[[package]]
+name = "reqwest"
+version = "0.12.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d429f34c8092b2d42c7c93cec323bb4adeb7c67698f70839adec842ec10c7ceb"
+dependencies = [
+ "base64",
+ "bytes",
+ "encoding_rs",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "http-body-util",
+ "hyper",
+ "hyper-rustls",
+ "hyper-tls",
+ "hyper-util",
+ "js-sys",
+ "log",
+ "mime",
+ "native-tls",
+ "percent-encoding",
+ "pin-project-lite",
+ "rustls-pki-types",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "sync_wrapper",
+ "tokio",
+ "tokio-native-tls",
+ "tower",
+ "tower-http",
+ "tower-service",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
+[[package]]
+name = "rfc7239"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a82f1d1e38e9a85bb58ffcfadf22ed6f2c94e8cd8581ec2b0f80a2a6858350f"
+dependencies = [
+ "uncased",
+]
+
+[[package]]
+name = "ring"
+version = "0.17.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
+dependencies = [
+ "cc",
+ "cfg-if",
+ "getrandom 0.2.16",
+ "libc",
+ "untrusted",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace"
+
+[[package]]
+name = "rustix"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8"
+dependencies = [
+ "bitflags",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.60.2",
+]
+
+[[package]]
+name = "rustls"
+version = "0.23.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0ebcbd2f03de0fc1122ad9bb24b127a5a6cd51d72604a3f3c50ac459762b6cc"
+dependencies = [
+ "once_cell",
+ "rustls-pki-types",
+ "rustls-webpki",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "rustls-pki-types"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79"
+dependencies = [
+ "zeroize",
+]
+
+[[package]]
+name = "rustls-webpki"
+version = "0.103.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a17884ae0c1b773f1ccd2bd4a8c72f16da897310a98b0e84bf349ad5ead92fc"
+dependencies = [
+ "ring",
+ "rustls-pki-types",
+ "untrusted",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
+
+[[package]]
+name = "ryu"
+version = "1.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
+
+[[package]]
+name = "schannel"
+version = "0.1.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "scoped-tls"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "security-framework"
+version = "2.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
+dependencies = [
+ "bitflags",
+ "core-foundation",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "2.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "serde"
+version = "1.0.219"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.219"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.143"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d401abef1d108fbd9cbaebc3e46611f4b1021f714a0597a71f41ee463f5f4a5a"
+dependencies = [
+ "itoa",
+ "memchr",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "serde_urlencoded"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
+dependencies = [
+ "form_urlencoded",
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "sha1"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2a4719bff48cee6b39d12c020eeb490953ad2443b7055bd0b21fca26bd8c28b"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "slab"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
+
+[[package]]
+name = "smallvec"
+version = "1.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
+
+[[package]]
+name = "socket2"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "233504af464074f9d066d7b5416c5f9b894a5862a6506e306f7b816cdd6f1807"
+dependencies = [
+ "libc",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
+[[package]]
+name = "subtle"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
+
+[[package]]
+name = "syn"
+version = "2.0.106"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "sync_wrapper"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
+dependencies = [
+ "futures-core",
+]
+
+[[package]]
+name = "synstructure"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "system-configuration"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
+dependencies = [
+ "bitflags",
+ "core-foundation",
+ "system-configuration-sys",
+]
+
+[[package]]
+name = "system-configuration-sys"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "tempfile"
+version = "3.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15b61f8f20e3a6f7e0649d825294eaf317edce30f82cf6026e7e4cb9222a7d1e"
+dependencies = [
+ "fastrand",
+ "getrandom 0.3.3",
+ "once_cell",
+ "rustix",
+ "windows-sys 0.60.2",
+]
+
+[[package]]
+name = "test"
+version = "0.0.1"
+dependencies = [
+ "poem",
+ "reqwest",
+ "tokio",
+ "warp",
+]
+
+[[package]]
+name = "thiserror"
+version = "2.0.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3467d614147380f2e4e374161426ff399c91084acd2363eaf549172b3d5e60c0"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "2.0.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c5e1be1c48b9172ee610da68fd9cd2770e7a4056cb3fc98710ee6906f0c7960"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "tinystr"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
+[[package]]
+name = "tokio"
+version = "1.47.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89e49afdadebb872d3145a5638b59eb0691ea23e46ca484037cfab3b76b95038"
+dependencies = [
+ "backtrace",
+ "bytes",
+ "io-uring",
+ "libc",
+ "mio",
+ "parking_lot",
+ "pin-project-lite",
+ "signal-hook-registry",
+ "slab",
+ "socket2",
+ "tokio-macros",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "tokio-native-tls"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
+dependencies = [
+ "native-tls",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-rustls"
+version = "0.26.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b"
+dependencies = [
+ "rustls",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-util"
+version = "0.7.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14307c986784f72ef81c89db7d9e28d6ac26d16213b109ea501696195e6e3ce5"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "futures-sink",
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
+
+[[package]]
+name = "toml_edit"
+version = "0.22.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
+dependencies = [
+ "indexmap",
+ "toml_datetime",
+ "winnow",
+]
+
+[[package]]
+name = "tower"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
+dependencies = [
+ "futures-core",
+ "futures-util",
+ "pin-project-lite",
+ "sync_wrapper",
+ "tokio",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "tower-http"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2"
+dependencies = [
+ "bitflags",
+ "bytes",
+ "futures-util",
+ "http",
+ "http-body",
+ "iri-string",
+ "pin-project-lite",
+ "tower",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "tower-layer"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
+
+[[package]]
+name = "tower-service"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
+
+[[package]]
+name = "tracing"
+version = "0.1.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
+dependencies = [
+ "log",
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678"
+dependencies = [
+ "once_cell",
+]
+
+[[package]]
+name = "try-lock"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
+
+[[package]]
+name = "typenum"
+version = "1.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f"
+
+[[package]]
+name = "uncased"
+version = "0.9.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1b88fcfe09e89d3866a5c11019378088af2d24c3fbd4f0543f96b479ec90697"
+dependencies = [
+ "version_check",
+]
+
+[[package]]
+name = "unicase"
+version = "2.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
+
+[[package]]
+name = "untrusted"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+
+[[package]]
+name = "url"
+version = "2.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b"
+dependencies = [
+ "form_urlencoded",
+ "idna",
+ "percent-encoding",
+ "serde",
+]
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
+[[package]]
+name = "vcpkg"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+
+[[package]]
+name = "version_check"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+
+[[package]]
+name = "want"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
+dependencies = [
+ "try-lock",
+]
+
+[[package]]
+name = "warp"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d06d9202adc1f15d709c4f4a2069be5428aa912cc025d6f268ac441ab066b0"
+dependencies = [
+ "bytes",
+ "futures-util",
+ "headers",
+ "http",
+ "http-body",
+ "http-body-util",
+ "hyper",
+ "hyper-util",
+ "log",
+ "mime",
+ "mime_guess",
+ "percent-encoding",
+ "pin-project",
+ "scoped-tls",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "tokio",
+ "tokio-util",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "wasi"
+version = "0.11.1+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
+
+[[package]]
+name = "wasi"
+version = "0.14.3+wasi-0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a51ae83037bdd272a9e28ce236db8c07016dd0d50c27038b3f407533c030c95"
+dependencies = [
+ "wit-bindgen",
+]
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "rustversion",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
+dependencies = [
+ "bumpalo",
+ "log",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-futures"
+version = "0.4.50"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "once_cell",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "web-sys"
+version = "0.3.77"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "wildmatch"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68ce1ab1f8c62655ebe1350f589c61e505cf94d385bc6a12899442d9081e71fd"
+
+[[package]]
+name = "windows-link"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
+
+[[package]]
+name = "windows-registry"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b8a9ed28765efc97bbc954883f4e6796c33a06546ebafacbabee9696967499e"
+dependencies = [
+ "windows-link",
+ "windows-result",
+ "windows-strings",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
+dependencies = [
+ "windows-link",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
+dependencies = [
+ "windows-link",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
+dependencies = [
+ "windows-targets 0.53.3",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
+ "windows_i686_gnullvm 0.52.6",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.53.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91"
+dependencies = [
+ "windows-link",
+ "windows_aarch64_gnullvm 0.53.0",
+ "windows_aarch64_msvc 0.53.0",
+ "windows_i686_gnu 0.53.0",
+ "windows_i686_gnullvm 0.53.0",
+ "windows_i686_msvc 0.53.0",
+ "windows_x86_64_gnu 0.53.0",
+ "windows_x86_64_gnullvm 0.53.0",
+ "windows_x86_64_msvc 0.53.0",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
+
+[[package]]
+name = "winnow"
+version = "0.7.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "wit-bindgen"
+version = "0.45.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "052283831dbae3d879dc7f51f3d92703a316ca49f91540417d38591826127814"
+
+[[package]]
+name = "writeable"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb"
+
+[[package]]
+name = "yoke"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
+[[package]]
+name = "zeroize"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+
+[[package]]
+name = "zerotrie"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7aa2bd55086f1ab526693ecbe444205da57e25f4489879da80635a46d90e73b"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
diff --git a/rust/ql/test/query-tests/security/CWE-918/RequestForgery.expected b/rust/ql/test/query-tests/security/CWE-918/RequestForgery.expected
new file mode 100644
index 00000000000..0f931ed3a0f
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-918/RequestForgery.expected
@@ -0,0 +1,92 @@
+#select
+| request_forgery_tests.rs:8:24:8:35 | ...::get | request_forgery_tests.rs:5:29:5:36 | user_url | request_forgery_tests.rs:8:24:8:35 | ...::get | The URL of this request depends on a $@. | request_forgery_tests.rs:5:29:5:36 | user_url | user-provided value |
+| request_forgery_tests.rs:17:25:17:36 | ...::get | request_forgery_tests.rs:5:29:5:36 | user_url | request_forgery_tests.rs:17:25:17:36 | ...::get | The URL of this request depends on a $@. | request_forgery_tests.rs:5:29:5:36 | user_url | user-provided value |
+| request_forgery_tests.rs:21:25:21:36 | ...::get | request_forgery_tests.rs:5:29:5:36 | user_url | request_forgery_tests.rs:21:25:21:36 | ...::get | The URL of this request depends on a $@. | request_forgery_tests.rs:5:29:5:36 | user_url | user-provided value |
+| request_forgery_tests.rs:25:25:25:36 | ...::get | request_forgery_tests.rs:5:29:5:36 | user_url | request_forgery_tests.rs:25:25:25:36 | ...::get | The URL of this request depends on a $@. | request_forgery_tests.rs:5:29:5:36 | user_url | user-provided value |
+| request_forgery_tests.rs:31:29:31:40 | ...::get | request_forgery_tests.rs:5:29:5:36 | user_url | request_forgery_tests.rs:31:29:31:40 | ...::get | The URL of this request depends on a $@. | request_forgery_tests.rs:5:29:5:36 | user_url | user-provided value |
+| request_forgery_tests.rs:37:37:37:48 | ...::get | request_forgery_tests.rs:5:29:5:36 | user_url | request_forgery_tests.rs:37:37:37:48 | ...::get | The URL of this request depends on a $@. | request_forgery_tests.rs:5:29:5:36 | user_url | user-provided value |
+| request_forgery_tests.rs:68:28:68:39 | ...::get | request_forgery_tests.rs:65:33:65:40 | and_then | request_forgery_tests.rs:68:28:68:39 | ...::get | The URL of this request depends on a $@. | request_forgery_tests.rs:65:33:65:40 | and_then | user-provided value |
+edges
+| request_forgery_tests.rs:5:29:5:36 | user_url | request_forgery_tests.rs:8:38:8:45 | user_url | provenance |  |
+| request_forgery_tests.rs:5:29:5:36 | user_url | request_forgery_tests.rs:16:27:16:49 | MacroExpr | provenance |  |
+| request_forgery_tests.rs:5:29:5:36 | user_url | request_forgery_tests.rs:20:27:20:57 | MacroExpr | provenance |  |
+| request_forgery_tests.rs:5:29:5:36 | user_url | request_forgery_tests.rs:24:27:24:70 | MacroExpr | provenance |  |
+| request_forgery_tests.rs:5:29:5:36 | user_url | request_forgery_tests.rs:31:43:31:50 | user_url | provenance |  |
+| request_forgery_tests.rs:5:29:5:36 | user_url | request_forgery_tests.rs:37:51:37:58 | user_url | provenance |  |
+| request_forgery_tests.rs:8:37:8:45 | &user_url [&ref] | request_forgery_tests.rs:8:24:8:35 | ...::get | provenance | MaD:1 Sink:MaD:1 |
+| request_forgery_tests.rs:8:38:8:45 | user_url | request_forgery_tests.rs:8:37:8:45 | &user_url [&ref] | provenance |  |
+| request_forgery_tests.rs:16:13:16:15 | url | request_forgery_tests.rs:17:39:17:41 | url | provenance |  |
+| request_forgery_tests.rs:16:27:16:49 | ...::format(...) | request_forgery_tests.rs:16:27:16:49 | { ... } | provenance |  |
+| request_forgery_tests.rs:16:27:16:49 | ...::must_use(...) | request_forgery_tests.rs:16:13:16:15 | url | provenance |  |
+| request_forgery_tests.rs:16:27:16:49 | MacroExpr | request_forgery_tests.rs:16:27:16:49 | ...::format(...) | provenance | MaD:3 |
+| request_forgery_tests.rs:16:27:16:49 | { ... } | request_forgery_tests.rs:16:27:16:49 | ...::must_use(...) | provenance | MaD:4 |
+| request_forgery_tests.rs:17:38:17:41 | &url [&ref] | request_forgery_tests.rs:17:25:17:36 | ...::get | provenance | MaD:1 Sink:MaD:1 |
+| request_forgery_tests.rs:17:39:17:41 | url | request_forgery_tests.rs:17:38:17:41 | &url [&ref] | provenance |  |
+| request_forgery_tests.rs:20:13:20:15 | url | request_forgery_tests.rs:21:39:21:41 | url | provenance |  |
+| request_forgery_tests.rs:20:27:20:57 | ...::format(...) | request_forgery_tests.rs:20:27:20:57 | { ... } | provenance |  |
+| request_forgery_tests.rs:20:27:20:57 | ...::must_use(...) | request_forgery_tests.rs:20:13:20:15 | url | provenance |  |
+| request_forgery_tests.rs:20:27:20:57 | MacroExpr | request_forgery_tests.rs:20:27:20:57 | ...::format(...) | provenance | MaD:3 |
+| request_forgery_tests.rs:20:27:20:57 | { ... } | request_forgery_tests.rs:20:27:20:57 | ...::must_use(...) | provenance | MaD:4 |
+| request_forgery_tests.rs:21:38:21:41 | &url [&ref] | request_forgery_tests.rs:21:25:21:36 | ...::get | provenance | MaD:1 Sink:MaD:1 |
+| request_forgery_tests.rs:21:39:21:41 | url | request_forgery_tests.rs:21:38:21:41 | &url [&ref] | provenance |  |
+| request_forgery_tests.rs:24:13:24:15 | url | request_forgery_tests.rs:25:39:25:41 | url | provenance |  |
+| request_forgery_tests.rs:24:27:24:70 | ...::format(...) | request_forgery_tests.rs:24:27:24:70 | { ... } | provenance |  |
+| request_forgery_tests.rs:24:27:24:70 | ...::must_use(...) | request_forgery_tests.rs:24:13:24:15 | url | provenance |  |
+| request_forgery_tests.rs:24:27:24:70 | MacroExpr | request_forgery_tests.rs:24:27:24:70 | ...::format(...) | provenance | MaD:3 |
+| request_forgery_tests.rs:24:27:24:70 | { ... } | request_forgery_tests.rs:24:27:24:70 | ...::must_use(...) | provenance | MaD:4 |
+| request_forgery_tests.rs:25:38:25:41 | &url [&ref] | request_forgery_tests.rs:25:25:25:36 | ...::get | provenance | MaD:1 Sink:MaD:1 |
+| request_forgery_tests.rs:25:39:25:41 | url | request_forgery_tests.rs:25:38:25:41 | &url [&ref] | provenance |  |
+| request_forgery_tests.rs:31:42:31:50 | &user_url [&ref] | request_forgery_tests.rs:31:29:31:40 | ...::get | provenance | MaD:1 Sink:MaD:1 |
+| request_forgery_tests.rs:31:43:31:50 | user_url | request_forgery_tests.rs:31:42:31:50 | &user_url [&ref] | provenance |  |
+| request_forgery_tests.rs:37:50:37:58 | &user_url [&ref] | request_forgery_tests.rs:37:37:37:48 | ...::get | provenance | MaD:1 Sink:MaD:1 |
+| request_forgery_tests.rs:37:51:37:58 | user_url | request_forgery_tests.rs:37:50:37:58 | &user_url [&ref] | provenance |  |
+| request_forgery_tests.rs:65:33:65:40 | and_then | request_forgery_tests.rs:65:49:65:57 | ...: String | provenance | Src:MaD:2  |
+| request_forgery_tests.rs:65:49:65:57 | ...: String | request_forgery_tests.rs:68:42:68:42 | a | provenance |  |
+| request_forgery_tests.rs:68:41:68:42 | &a [&ref] | request_forgery_tests.rs:68:28:68:39 | ...::get | provenance | MaD:1 Sink:MaD:1 |
+| request_forgery_tests.rs:68:42:68:42 | a | request_forgery_tests.rs:68:41:68:42 | &a [&ref] | provenance |  |
+models
+| 1 | Sink: reqwest::get; Argument[0]; request-url |
+| 2 | Source: <_ as warp::filter::Filter>::and_then; Argument[0].Parameter[0..7]; remote |
+| 3 | Summary: alloc::fmt::format; Argument[0]; ReturnValue; taint |
+| 4 | Summary: core::hint::must_use; Argument[0]; ReturnValue; value |
+nodes
+| request_forgery_tests.rs:5:29:5:36 | user_url | semmle.label | user_url |
+| request_forgery_tests.rs:8:24:8:35 | ...::get | semmle.label | ...::get |
+| request_forgery_tests.rs:8:37:8:45 | &user_url [&ref] | semmle.label | &user_url [&ref] |
+| request_forgery_tests.rs:8:38:8:45 | user_url | semmle.label | user_url |
+| request_forgery_tests.rs:16:13:16:15 | url | semmle.label | url |
+| request_forgery_tests.rs:16:27:16:49 | ...::format(...) | semmle.label | ...::format(...) |
+| request_forgery_tests.rs:16:27:16:49 | ...::must_use(...) | semmle.label | ...::must_use(...) |
+| request_forgery_tests.rs:16:27:16:49 | MacroExpr | semmle.label | MacroExpr |
+| request_forgery_tests.rs:16:27:16:49 | { ... } | semmle.label | { ... } |
+| request_forgery_tests.rs:17:25:17:36 | ...::get | semmle.label | ...::get |
+| request_forgery_tests.rs:17:38:17:41 | &url [&ref] | semmle.label | &url [&ref] |
+| request_forgery_tests.rs:17:39:17:41 | url | semmle.label | url |
+| request_forgery_tests.rs:20:13:20:15 | url | semmle.label | url |
+| request_forgery_tests.rs:20:27:20:57 | ...::format(...) | semmle.label | ...::format(...) |
+| request_forgery_tests.rs:20:27:20:57 | ...::must_use(...) | semmle.label | ...::must_use(...) |
+| request_forgery_tests.rs:20:27:20:57 | MacroExpr | semmle.label | MacroExpr |
+| request_forgery_tests.rs:20:27:20:57 | { ... } | semmle.label | { ... } |
+| request_forgery_tests.rs:21:25:21:36 | ...::get | semmle.label | ...::get |
+| request_forgery_tests.rs:21:38:21:41 | &url [&ref] | semmle.label | &url [&ref] |
+| request_forgery_tests.rs:21:39:21:41 | url | semmle.label | url |
+| request_forgery_tests.rs:24:13:24:15 | url | semmle.label | url |
+| request_forgery_tests.rs:24:27:24:70 | ...::format(...) | semmle.label | ...::format(...) |
+| request_forgery_tests.rs:24:27:24:70 | ...::must_use(...) | semmle.label | ...::must_use(...) |
+| request_forgery_tests.rs:24:27:24:70 | MacroExpr | semmle.label | MacroExpr |
+| request_forgery_tests.rs:24:27:24:70 | { ... } | semmle.label | { ... } |
+| request_forgery_tests.rs:25:25:25:36 | ...::get | semmle.label | ...::get |
+| request_forgery_tests.rs:25:38:25:41 | &url [&ref] | semmle.label | &url [&ref] |
+| request_forgery_tests.rs:25:39:25:41 | url | semmle.label | url |
+| request_forgery_tests.rs:31:29:31:40 | ...::get | semmle.label | ...::get |
+| request_forgery_tests.rs:31:42:31:50 | &user_url [&ref] | semmle.label | &user_url [&ref] |
+| request_forgery_tests.rs:31:43:31:50 | user_url | semmle.label | user_url |
+| request_forgery_tests.rs:37:37:37:48 | ...::get | semmle.label | ...::get |
+| request_forgery_tests.rs:37:50:37:58 | &user_url [&ref] | semmle.label | &user_url [&ref] |
+| request_forgery_tests.rs:37:51:37:58 | user_url | semmle.label | user_url |
+| request_forgery_tests.rs:65:33:65:40 | and_then | semmle.label | and_then |
+| request_forgery_tests.rs:65:49:65:57 | ...: String | semmle.label | ...: String |
+| request_forgery_tests.rs:68:28:68:39 | ...::get | semmle.label | ...::get |
+| request_forgery_tests.rs:68:41:68:42 | &a [&ref] | semmle.label | &a [&ref] |
+| request_forgery_tests.rs:68:42:68:42 | a | semmle.label | a |
+subpaths
diff --git a/rust/ql/test/query-tests/security/CWE-918/RequestForgery.qlref b/rust/ql/test/query-tests/security/CWE-918/RequestForgery.qlref
new file mode 100644
index 00000000000..6ed39ea71f5
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-918/RequestForgery.qlref
@@ -0,0 +1,4 @@
+query: queries/security/CWE-918/RequestForgery.ql
+postprocess:
+ - utils/test/PrettyPrintModels.ql
+ - utils/test/InlineExpectationsTestQuery.ql
diff --git a/rust/ql/test/query-tests/security/CWE-918/main.rs b/rust/ql/test/query-tests/security/CWE-918/main.rs
new file mode 100644
index 00000000000..6c5f536e97f
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-918/main.rs
@@ -0,0 +1,5 @@
+use test::request_forgery_tests;
+
+fn main() {
+    request_forgery_tests::start();
+}
diff --git a/rust/ql/test/query-tests/security/CWE-918/options.yml b/rust/ql/test/query-tests/security/CWE-918/options.yml
new file mode 100644
index 00000000000..6c6a1517497
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-918/options.yml
@@ -0,0 +1,6 @@
+qltest_cargo_check: true
+qltest_dependencies:
+    - reqwest = { version = "0.12.23", features = ["blocking", "json"] }
+    - tokio = { version = "1.0", features = ["full"] }
+    - poem = { version = "3.1.12", features = ["server"] }
+    - warp = { version = "0.4.2", features = ["server"] }
diff --git a/rust/ql/test/query-tests/security/CWE-918/request_forgery_tests.rs b/rust/ql/test/query-tests/security/CWE-918/request_forgery_tests.rs
new file mode 100644
index 00000000000..f9abf14de4f
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-918/request_forgery_tests.rs
@@ -0,0 +1,83 @@
+mod poem_server {
+    use poem::{handler, web::Query, Route, Server};
+
+    #[handler]
+    async fn endpoint(Query(user_url): Query<String>, // $ Source=user_url
+    ) -> String {
+        // BAD: The user can control the entire URL
+        let response = reqwest::get(&user_url).await; // $ Alert[rust/request-forgery]=user_url
+
+        // If this example is actually executed, forward the response text
+        if let Ok(resp) = response {
+            return resp.text().await.unwrap_or_default();
+        }
+
+        // BAD: The user can control a prefix of the URL
+        let url = format!("{}/resource", user_url);
+        let _response = reqwest::get(&url).await; // $ Alert[rust/request-forgery]=user_url
+
+        // BAD: The user can control a prefix of the URL - only the protocol is restricted
+        let url = format!("https://{}/resource", user_url);
+        let _response = reqwest::get(&url).await; // $ Alert[rust/request-forgery]=user_url
+
+        // GOOD: The user can only control a suffix after the hostname, this is likely ok
+        let url = format!("https://hostname.com/resource/{}", user_url);
+        let _response = reqwest::get(&url).await; // $ SPURIOUS: Alert[rust/request-forgery]=user_url
+
+        let allowed_hosts = ["api.example.com", "trusted-service.com"];
+
+        // GOOD: The URL is guaranteed to be in the allowlist
+        if allowed_hosts.contains(&user_url.as_str()) {
+            let _response = reqwest::get(&user_url).await; // $ SPURIOUS: Alert[rust/request-forgery]=user_url
+        }
+
+        if let Ok(url) = reqwest::Url::parse(&user_url) {
+            if let Some(host) = url.host_str() {
+                if allowed_hosts.contains(&host) {
+                    let _response = reqwest::get(&user_url).await; // $ SPURIOUS: Alert[rust/request-forgery]=user_url
+                }
+            }
+        }
+
+        "".to_string()
+    }
+
+    // Function to create the Poem application
+    pub async fn create_app() -> Result<(), Box<dyn std::error::Error>> {
+        let app = Route::new().at("/fetch", poem::get(endpoint));
+
+        Server::new(poem::listener::TcpListener::bind("127.0.0.1:8080"))
+            .run(app)
+            .await?;
+
+        Ok(())
+    }
+}
+
+mod warp_test {
+    use warp::Filter;
+
+    #[tokio::main]
+    #[rustfmt::skip]
+    async fn test_warp() {
+        // A route with parameter and `and_then`
+        let map_route =
+            warp::path::param().and_then(async |a: String| // $ Source=a
+            {
+
+            let response = reqwest::get(&a).await; // $ Alert[rust/request-forgery]=a
+            match response {
+                Ok(resp) => Ok(resp.text().await.unwrap_or_default()),
+                Err(_err) => Err(warp::reject::not_found()),
+            }
+        });
+    }
+}
+
+/// Start the Poem web application
+pub fn start() {
+    tokio::runtime::Runtime::new()
+        .unwrap()
+        .block_on(poem_server::create_app())
+        .unwrap();
+}
diff --git a/rust/ql/test/query-tests/unusedentities/CONSISTENCY/ExtractionConsistency.expected b/rust/ql/test/query-tests/unusedentities/CONSISTENCY/ExtractionConsistency.expected
deleted file mode 100644
index f3834c23889..00000000000
--- a/rust/ql/test/query-tests/unusedentities/CONSISTENCY/ExtractionConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-extractionWarning
-| undefined_macros/main.rs:1:1:1:1 | semantic analyzer unavailable (not included as a module) |
diff --git a/rust/ql/test/query-tests/unusedentities/CONSISTENCY/PathResolutionConsistency.expected b/rust/ql/test/query-tests/unusedentities/CONSISTENCY/PathResolutionConsistency.expected
index 6f977f067db..4d2cdee53ce 100644
--- a/rust/ql/test/query-tests/unusedentities/CONSISTENCY/PathResolutionConsistency.expected
+++ b/rust/ql/test/query-tests/unusedentities/CONSISTENCY/PathResolutionConsistency.expected
@@ -1,6 +1,6 @@
 multipleCallTargets
-| main.rs:13:13:13:29 | ...::from(...) |
 | main.rs:14:13:14:29 | ...::from(...) |
+| main.rs:15:13:15:29 | ...::from(...) |
 | unreachable.rs:165:20:165:42 | ...::from(...) |
-| unreachable.rs:171:9:171:17 | ...::from(...) |
+| unreachable.rs:171:9:171:15 | ...::from(...) |
 | unreachable.rs:177:17:177:25 | ...::from(...) |
diff --git a/rust/ql/test/query-tests/unusedentities/UnusedValue.expected b/rust/ql/test/query-tests/unusedentities/UnusedValue.expected
index 4ef8ae41625..c5286361662 100644
--- a/rust/ql/test/query-tests/unusedentities/UnusedValue.expected
+++ b/rust/ql/test/query-tests/unusedentities/UnusedValue.expected
@@ -1,21 +1,24 @@
-| main.rs:10:9:10:9 | a | Variable $@ is assigned a value that is never used. | main.rs:10:9:10:9 | a | a |
-| main.rs:13:9:13:9 | d | Variable $@ is assigned a value that is never used. | main.rs:13:9:13:9 | d | d |
-| main.rs:39:5:39:5 | b | Variable $@ is assigned a value that is never used. | main.rs:30:9:30:9 | b | b |
-| main.rs:41:5:41:5 | c | Variable $@ is assigned a value that is never used. | main.rs:31:13:31:13 | c | c |
-| main.rs:44:5:44:5 | c | Variable $@ is assigned a value that is never used. | main.rs:31:13:31:13 | c | c |
-| main.rs:48:9:48:9 | d | Variable $@ is assigned a value that is never used. | main.rs:32:13:32:13 | d | d |
-| main.rs:54:5:54:5 | e | Variable $@ is assigned a value that is never used. | main.rs:33:13:33:13 | e | e |
-| main.rs:65:5:65:5 | f | Variable $@ is assigned a value that is never used. | main.rs:34:13:34:13 | f | f |
-| main.rs:67:5:67:5 | f | Variable $@ is assigned a value that is never used. | main.rs:34:13:34:13 | f | f |
-| main.rs:69:5:69:5 | g | Variable $@ is assigned a value that is never used. | main.rs:35:9:35:9 | g | g |
-| main.rs:95:9:95:9 | a | Variable $@ is assigned a value that is never used. | main.rs:95:9:95:9 | a | a |
-| main.rs:116:9:116:10 | is | Variable $@ is assigned a value that is never used. | main.rs:116:9:116:10 | is | is |
-| main.rs:139:13:139:17 | total | Variable $@ is assigned a value that is never used. | main.rs:139:13:139:17 | total | total |
-| main.rs:284:13:284:17 | total | Variable $@ is assigned a value that is never used. | main.rs:252:13:252:17 | total | total |
-| main.rs:377:9:377:9 | x | Variable $@ is assigned a value that is never used. | main.rs:377:9:377:9 | x | x |
-| main.rs:385:17:385:17 | x | Variable $@ is assigned a value that is never used. | main.rs:385:17:385:17 | x | x |
-| main.rs:531:9:531:20 | var_in_macro | Variable $@ is assigned a value that is never used. | main.rs:531:9:531:20 | var_in_macro | var_in_macro |
-| main.rs:540:9:540:9 | c | Variable $@ is assigned a value that is never used. | main.rs:540:9:540:9 | c | c |
+| main.rs:11:9:11:9 | a | Variable $@ is assigned a value that is never used. | main.rs:11:9:11:9 | a | a |
+| main.rs:14:9:14:9 | d | Variable $@ is assigned a value that is never used. | main.rs:14:9:14:9 | d | d |
+| main.rs:40:5:40:5 | b | Variable $@ is assigned a value that is never used. | main.rs:31:9:31:9 | b | b |
+| main.rs:42:5:42:5 | c | Variable $@ is assigned a value that is never used. | main.rs:32:13:32:13 | c | c |
+| main.rs:45:5:45:5 | c | Variable $@ is assigned a value that is never used. | main.rs:32:13:32:13 | c | c |
+| main.rs:49:9:49:9 | d | Variable $@ is assigned a value that is never used. | main.rs:33:13:33:13 | d | d |
+| main.rs:55:5:55:5 | e | Variable $@ is assigned a value that is never used. | main.rs:34:13:34:13 | e | e |
+| main.rs:66:5:66:5 | f | Variable $@ is assigned a value that is never used. | main.rs:35:13:35:13 | f | f |
+| main.rs:68:5:68:5 | f | Variable $@ is assigned a value that is never used. | main.rs:35:13:35:13 | f | f |
+| main.rs:70:5:70:5 | g | Variable $@ is assigned a value that is never used. | main.rs:36:9:36:9 | g | g |
+| main.rs:96:9:96:9 | a | Variable $@ is assigned a value that is never used. | main.rs:96:9:96:9 | a | a |
+| main.rs:117:9:117:10 | is | Variable $@ is assigned a value that is never used. | main.rs:117:9:117:10 | is | is |
+| main.rs:140:13:140:17 | total | Variable $@ is assigned a value that is never used. | main.rs:140:13:140:17 | total | total |
+| main.rs:285:13:285:17 | total | Variable $@ is assigned a value that is never used. | main.rs:253:13:253:17 | total | total |
+| main.rs:322:12:322:12 | j | Variable $@ is assigned a value that is never used. | main.rs:322:12:322:12 | j | j |
+| main.rs:382:9:382:9 | x | Variable $@ is assigned a value that is never used. | main.rs:382:9:382:9 | x | x |
+| main.rs:390:17:390:17 | x | Variable $@ is assigned a value that is never used. | main.rs:390:17:390:17 | x | x |
+| main.rs:491:16:491:16 | a | Variable $@ is assigned a value that is never used. | main.rs:489:9:489:9 | a | a |
+| main.rs:516:41:516:41 | x | Variable $@ is assigned a value that is never used. | main.rs:515:9:515:9 | x | x |
+| main.rs:530:9:530:20 | var_in_macro | Variable $@ is assigned a value that is never used. | main.rs:530:9:530:20 | var_in_macro | var_in_macro |
+| main.rs:539:9:539:9 | c | Variable $@ is assigned a value that is never used. | main.rs:539:9:539:9 | c | c |
 | more.rs:44:9:44:14 | a_ptr4 | Variable $@ is assigned a value that is never used. | more.rs:44:9:44:14 | a_ptr4 | a_ptr4 |
 | more.rs:59:9:59:13 | d_ptr | Variable $@ is assigned a value that is never used. | more.rs:59:9:59:13 | d_ptr | d_ptr |
 | more.rs:65:13:65:17 | f_ptr | Variable $@ is assigned a value that is never used. | more.rs:65:13:65:17 | f_ptr | f_ptr |
diff --git a/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected b/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected
index 203824f4a4b..583587b8a13 100644
--- a/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected
+++ b/rust/ql/test/query-tests/unusedentities/UnusedVariable.expected
@@ -1,22 +1,21 @@
-| main.rs:29:9:29:9 | a | Variable 'a' is not used. |
-| main.rs:98:13:98:13 | d | Variable 'd' is not used. |
-| main.rs:147:5:147:5 | y | Variable 'y' is not used. |
-| main.rs:174:9:174:9 | x | Variable 'x' is not used. |
-| main.rs:254:17:254:17 | a | Variable 'a' is not used. |
-| main.rs:262:20:262:22 | val | Variable 'val' is not used. |
-| main.rs:276:14:276:16 | val | Variable 'val' is not used. |
-| main.rs:291:22:291:24 | val | Variable 'val' is not used. |
-| main.rs:298:24:298:26 | val | Variable 'val' is not used. |
-| main.rs:306:13:306:15 | num | Variable 'num' is not used. |
-| main.rs:321:12:321:12 | j | Variable 'j' is not used. |
-| main.rs:341:25:341:25 | y | Variable 'y' is not used. |
-| main.rs:344:28:344:28 | a | Variable 'a' is not used. |
-| main.rs:347:9:347:9 | p | Variable 'p' is not used. |
-| main.rs:365:9:365:13 | right | Variable 'right' is not used. |
-| main.rs:371:9:371:14 | right2 | Variable 'right2' is not used. |
-| main.rs:378:13:378:13 | y | Variable 'y' is not used. |
-| main.rs:386:21:386:21 | y | Variable 'y' is not used. |
-| main.rs:431:26:431:28 | val | Variable 'val' is not used. |
-| main.rs:434:21:434:23 | acc | Variable 'acc' is not used. |
-| main.rs:455:9:455:14 | unused | Variable 'unused' is not used. |
+| main.rs:30:9:30:9 | a | Variable 'a' is not used. |
+| main.rs:99:13:99:13 | d | Variable 'd' is not used. |
+| main.rs:148:5:148:5 | y | Variable 'y' is not used. |
+| main.rs:175:9:175:9 | x | Variable 'x' is not used. |
+| main.rs:255:17:255:17 | a | Variable 'a' is not used. |
+| main.rs:263:20:263:22 | val | Variable 'val' is not used. |
+| main.rs:277:14:277:16 | val | Variable 'val' is not used. |
+| main.rs:292:22:292:24 | val | Variable 'val' is not used. |
+| main.rs:299:24:299:26 | val | Variable 'val' is not used. |
+| main.rs:307:13:307:15 | num | Variable 'num' is not used. |
+| main.rs:342:25:342:25 | y | Variable 'y' is not used. |
+| main.rs:345:28:345:28 | a | Variable 'a' is not used. |
+| main.rs:348:9:348:9 | p | Variable 'p' is not used. |
+| main.rs:366:9:366:13 | right | Variable 'right' is not used. |
+| main.rs:372:9:372:14 | right2 | Variable 'right2' is not used. |
+| main.rs:383:13:383:13 | y | Variable 'y' is not used. |
+| main.rs:391:21:391:21 | y | Variable 'y' is not used. |
+| main.rs:436:26:436:28 | val | Variable 'val' is not used. |
+| main.rs:439:21:439:23 | acc | Variable 'acc' is not used. |
+| main.rs:460:9:460:14 | unused | Variable 'unused' is not used. |
 | more.rs:24:9:24:11 | val | Variable 'val' is not used. |
diff --git a/rust/ql/test/query-tests/unusedentities/main.rs b/rust/ql/test/query-tests/unusedentities/main.rs
index 6da7b55fe5c..a08a05a83bd 100644
--- a/rust/ql/test/query-tests/unusedentities/main.rs
+++ b/rust/ql/test/query-tests/unusedentities/main.rs
@@ -1,3 +1,4 @@
+#![feature(let_chains)]
 mod more;
 mod unreachable;
 
@@ -318,7 +319,7 @@ fn if_lets_matches() {
         No => {}
     }
 
-    if let j = Yes { // $ Alert[rust/unused-variable]
+    if let j = Yes { // $ Alert[rust/unused-value]
     }
 
     if let k = Yes {
@@ -371,6 +372,10 @@ fn if_lets_matches() {
         right2) = // $ MISSING: Alert[rust/unused-value] $ SPURIOUS: Alert[rust/unused-variable]
         pair;
     _ = left2;
+
+    if let Some(m) = Some(10)
+        && m > 0
+    {}
 }
 
 fn shadowing() -> i32 {
@@ -483,7 +488,7 @@ macro_rules! use_value {
 fn macros1() {
     let a: u16;
     let b: u16 = 2;
-    set_value!(a, 1);
+    set_value!(a, 1); // $ Alert[rust/unused-value]
     use_value!(b);
 
     match std::env::args().nth(1).unwrap().parse::<u16>() {
@@ -508,13 +513,7 @@ fn macros2() {
 
 fn macros3() {
     let x;
-    println!(
-        "The value of x is {}",
-        ({
-            x = 10; // $ MISSING: Alert[rust/unused-value]
-            10
-        })
-    );
+    println!("The value of x is {}", ({ x = 10; 10 })); // $ Alert[rust/unused-value]
 }
 
 macro_rules! let_in_macro {
diff --git a/rust/ql/test/query-tests/unusedentities/options.yml b/rust/ql/test/query-tests/unusedentities/options.yml
new file mode 100644
index 00000000000..a394083e521
--- /dev/null
+++ b/rust/ql/test/query-tests/unusedentities/options.yml
@@ -0,0 +1 @@
+qltest_use_nightly: true
diff --git a/rust/ql/test/rust-toolchain.toml b/rust/ql/test/rust-toolchain.toml
index 254f87e09e6..9343bef27c6 100644
--- a/rust/ql/test/rust-toolchain.toml
+++ b/rust/ql/test/rust-toolchain.toml
@@ -2,6 +2,6 @@
 # IMPORTANT: this can also have an impact on QL test results
 
 [toolchain]
-channel = "1.86"
+channel = "1.90"
 profile = "minimal"
 components = [ "rust-src" ]
diff --git a/rust/ql/test/utils-tests/modelgenerator/option.rs b/rust/ql/test/utils-tests/modelgenerator/option.rs
index 13e49806f93..9af02979135 100644
--- a/rust/ql/test/utils-tests/modelgenerator/option.rs
+++ b/rust/ql/test/utils-tests/modelgenerator/option.rs
@@ -160,7 +160,7 @@ impl<T> MyOption<T> {
     }
 
     // summary=<test::option::MyOption>::inspect;Argument[self];ReturnValue;value;dfc-generated
-    // MISSING: Due to `ref` pattern.
+    // summary=<test::option::MyOption>::inspect;Argument[self].Field[test::option::MyOption::MySome(0)];Argument[0].Parameter[0].Reference;value;dfc-generated
     pub fn inspect<F: FnOnce(&T)>(self, f: F) -> Self {
         if let MySome(ref x) = self {
             f(x);
@@ -253,7 +253,8 @@ impl<T> MyOption<T> {
         }
     }
 
-    // MISSING: Reference passed to predicate
+    // summary=<test::option::MyOption>::filter;Argument[self].Field[test::option::MyOption::MySome(0)];Argument[0].Parameter[0].Reference;value;dfc-generated
+    // summary=<test::option::MyOption>::filter;Argument[self].Field[test::option::MyOption::MySome(0)];ReturnValue.Field[test::option::MyOption::MySome(0)];value;dfc-generated
     pub fn filter<P>(self, predicate: P) -> Self
     where
         P: FnOnce(&T) -> bool,
diff --git a/rust/schema/annotations.py b/rust/schema/annotations.py
index 8295cd5860b..5861ede759b 100644
--- a/rust/schema/annotations.py
+++ b/rust/schema/annotations.py
@@ -252,7 +252,7 @@ class _:
     attrs: drop
 
 
-@annotate(MethodCallExpr, replace_bases={Expr: CallExprBase}, add_bases=(Resolvable,), cfg=True)
+@annotate(MethodCallExpr, replace_bases={Expr: CallExprBase}, cfg=True)
 class _:
     """
     A method call expression. For example:
@@ -266,7 +266,7 @@ class _:
 
 
 @annotate(MatchArm)
-@rust.doc_test_signature("(x: i32) -> i32")
+@rust.doc_test_signature("(x: i32)")
 class _:
     """
     A match arm. For example:
@@ -434,8 +434,8 @@ class _:
     ```rust
     let first = Foo { a: 1, b: 2 };
     let second = Foo { a: 2, ..first };
-    Foo { a: 1, b: 2 }[2] = 10;
-    Foo { .. } = second;
+    let n = Foo { a: 1, b: 2 }.b;
+    Foo { a: m, .. } = second;
     ```
     """
     path: drop
@@ -547,10 +547,13 @@ class _:
     |x| x + 1;
     move |x: i32| -> i32 { x + 1 };
     async |x: i32, y| x + y;
-     #[coroutine]
+    #[coroutine]
     |x| yield x;
-     #[coroutine]
-     static |x| yield x;
+    #[coroutine]
+    static |x| yield x;
+    for<T: std::fmt::Debug> |x: T| {
+        println!("{:?}", x);
+    };
     ```
     """
 
@@ -560,8 +563,9 @@ class _:
     """
     A tuple expression. For example:
     ```rust
-    (1, "one");
-    (2, "two")[0] = 3;
+    let tuple = (1, "one");
+    let n = (2, "two").0;
+    let (a, b) = tuple;
     ```
     """
 
@@ -967,10 +971,10 @@ class _:
     """
 
 
-@annotate(ClosureBinder)
+@annotate(ForBinder)
 class _:
     """
-    A closure binder, specifying lifetime or type parameters for a closure.
+    A for binder, specifying lifetime or type parameters for a closure or a type.
 
     For example:
     ```rust
@@ -1155,21 +1159,15 @@ class _:
 @annotate(ForTypeRepr)
 class _:
     """
-    A higher-ranked trait bound.
+    A function pointer type with a `for` modifier.
 
     For example:
     ```rust
-    fn foo<T>(value: T)
-    where
-        T: for<'a> Fn(&'a str) -> &'a str
-    //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-    {
-        // ...
-    }
+    type RefOp<X> = for<'a> fn(&'a X) -> &'a X;
+    //              ^^^^^^^^^^^^^^^^^^^^^^^^^^
     ```
     """
 
-
 @annotate(FormatArgsArg, cfg=True)
 @qltest.test_with(FormatArgsExpr)
 class _:
@@ -1407,17 +1405,25 @@ class _:
     """
 
 
-@annotate(MacroBlockExpr, replace_bases={AstNode: Expr}, cfg=True)
-@rust.doc_test_signature(None)
-class _:
+class MacroBlockExpr(Expr):
     """
     A sequence of statements generated by a `MacroCall`. For example:
     ```rust
-    fn main() {
-        println!("Hello, world!"); // This macro expands into a list of statements
+    macro_rules! my_macro {
+        () => {
+            let mut x = 40;
+            x += 2;
+            x
+        };
     }
+
+    my_macro!();  // this macro expands to a sequence of statements (and an expression)
     ```
     """
+    __cfg__ = True
+
+    statements: list[Stmt] | child
+    tail_expr: optional[Expr] | child
 
 
 @annotate(MacroTypeRepr)
@@ -1732,7 +1738,7 @@ class _:
 
     For example:
     ```rust
-    fn foo() -> i32 {}
+    fn foo() -> i32 { 0 }
     //       ^^^^^^
     ```
     """
@@ -1822,18 +1828,27 @@ class _:
 @annotate(StmtList)
 class _:
     """
-    A list of statements in a block.
+    A list of statements in a block, with an optional tail expression at the
+    end that determines the block's value.
 
     For example:
     ```rust
     {
         let x = 1;
         let y = 2;
+        x + y
     }
     //  ^^^^^^^^^
     ```
     """
-
+    statements: _ | doc("statements of this statement list") | desc("""
+      The statements of a `StmtList` do not include any tail expression, which
+      can be accessed with predicates such as `getTailExpr`.
+    """)
+    tail_expr: _ | doc("tail expression of this statement list") | desc("""
+      The tail expression is the expression at the end of a block, that
+      determines the block's value.
+    """)
 
 @annotate(Struct, replace_bases={Item: None})  # still an Item via Adt
 class _:
@@ -1984,6 +1999,8 @@ class _:
     ```rust
     fn foo<T: Debug>(t: T) {}
     //        ^^^^^
+    fn bar(value: impl for<'a> From<&'a str>) {}
+    //                 ^^^^^^^^^^^^^^^^^^^^^
     ```
     """
 
@@ -2123,6 +2140,8 @@ class _:
     ```rust
     fn foo<T, U>(t: T, u: U) where T: Debug, U: Clone {}
     //                             ^^^^^^^^  ^^^^^^^^
+    fn bar<T>(value: T) where for<'a> T: From<&'a str> {}
+    //                        ^^^^^^^^^^^^^^^^^^^^^^^^
     ```
     """
 
@@ -2447,7 +2466,7 @@ class _:
 
     For example:
     ```rust
-    pub fn hello<'a, T, const N: usize>() -> impl Sized + use<'a, T, N> {}
+    pub fn hello<'a, T, const N: usize>() -> impl Sized + use<'a, T, N> { 0 }
     //                                                        ^^^^^^^^
     ```
     """
diff --git a/rust/schema/ast.py b/rust/schema/ast.py
index 137e56f8bac..d338c7a1636 100644
--- a/rust/schema/ast.py
+++ b/rust/schema/ast.py
@@ -69,7 +69,7 @@ class AsmConst(AsmOperand, ):
 class AsmDirSpec(AstNode, ):
     pass
 
-class AsmExpr(Expr, ):
+class AsmExpr(Expr, Item, ):
     asm_pieces: list["AsmPiece"] | child
     attrs: list["Attr"] | child
     template: list["Expr"] | child
@@ -162,13 +162,10 @@ class CastExpr(Expr, ):
     expr: optional["Expr"] | child
     type_repr: optional["TypeRepr"] | child
 
-class ClosureBinder(AstNode, ):
-    generic_param_list: optional["GenericParamList"] | child
-
 class ClosureExpr(Expr, ):
     attrs: list["Attr"] | child
-    body: optional["Expr"] | child
-    closure_binder: optional["ClosureBinder"] | child
+    closure_body: optional["Expr"] | child
+    for_binder: optional["ForBinder"] | child
     is_async: predicate
     is_const: predicate
     is_gen: predicate
@@ -244,7 +241,7 @@ class FieldExpr(Expr, ):
 class Function(AssocItem, ExternItem, Item, ):
     abi: optional["Abi"] | child
     attrs: list["Attr"] | child
-    body: optional["BlockExpr"] | child
+    function_body: optional["BlockExpr"] | child
     generic_param_list: optional["GenericParamList"] | child
     is_async: predicate
     is_const: predicate
@@ -265,6 +262,9 @@ class FnPtrTypeRepr(TypeRepr, ):
     param_list: optional["ParamList"] | child
     ret_type: optional["RetTypeRepr"] | child
 
+class ForBinder(AstNode, ):
+    generic_param_list: optional["GenericParamList"] | child
+
 class ForExpr(Expr, ):
     attrs: list["Attr"] | child
     iterable: optional["Expr"] | child
@@ -273,7 +273,7 @@ class ForExpr(Expr, ):
     pat: optional["Pat"] | child
 
 class ForTypeRepr(TypeRepr, ):
-    generic_param_list: optional["GenericParamList"] | child
+    for_binder: optional["ForBinder"] | child
     type_repr: optional["TypeRepr"] | child
 
 class FormatArgsArg(AstNode, ):
@@ -399,10 +399,6 @@ class MacroRules(Item, ):
     token_tree: optional["TokenTree"] | child
     visibility: optional["Visibility"] | child
 
-class MacroBlockExpr(AstNode, ):
-    tail_expr: optional["Expr"] | child
-    statements: list["Stmt"] | child
-
 class MacroTypeRepr(TypeRepr, ):
     macro_call: optional["MacroCall"] | child
 
@@ -697,6 +693,7 @@ class TypeArg(GenericArg, ):
     type_repr: optional["TypeRepr"] | child
 
 class TypeBound(AstNode, ):
+    for_binder: optional["ForBinder"] | child
     is_async: predicate
     is_const: predicate
     lifetime: optional["Lifetime"] | child
@@ -757,7 +754,7 @@ class WhereClause(AstNode, ):
     predicates: list["WherePred"] | child
 
 class WherePred(AstNode, ):
-    generic_param_list: optional["GenericParamList"] | child
+    for_binder: optional["ForBinder"] | child
     lifetime: optional["Lifetime"] | child
     type_repr: optional["TypeRepr"] | child
     type_bound_list: optional["TypeBoundList"] | child
diff --git a/rust/schema/prelude.py b/rust/schema/prelude.py
index 62334b2d864..9ca62f33acc 100644
--- a/rust/schema/prelude.py
+++ b/rust/schema/prelude.py
@@ -74,6 +74,7 @@ class Callable(AstNode):
     param_list: optional["ParamList"] | child
     attrs: list["Attr"] | child
     params: list["Param"] | synth
+    body: optional["Expr"] | synth
 
 
 class Addressable(AstNode):
@@ -82,24 +83,9 @@ class Addressable(AstNode):
 
     TODO: This does not yet include all possible cases.
     """
-    extended_canonical_path: optional[string] | desc("""
-        Either a canonical path (see https://doc.rust-lang.org/reference/paths.html#canonical-paths),
-        or `{<block id>}::name` for addressable items defined in an anonymous block (and only
-        addressable there-in).
-    """) | rust.detach | ql.internal
-    crate_origin: optional[string] | desc(
-        "One of `rustc:<name>`, `repo:<repository>:<name>` or `lang:<name>`.") | rust.detach | ql.internal
 
 
-class Resolvable(AstNode):
-    """
-    One of `PathExpr`, `RecordExpr`, `PathPat`, `RecordPat`, `TupleStructPat` or `MethodCallExpr`.
-    """
-    resolved_path: optional[string] | rust.detach | ql.internal
-    resolved_crate_origin: optional[string] | rust.detach | ql.internal
-
-
-class PathAstNode(Resolvable):
+class PathAstNode(AstNode):
     """
     An AST element wrapping a path (`PathExpr`, `RecordExpr`, `PathPat`, `RecordPat`, `TupleStructPat`).
     """
diff --git a/shared/concepts/CHANGELOG.md b/shared/concepts/CHANGELOG.md
index bafab76efba..4d0898b90e4 100644
--- a/shared/concepts/CHANGELOG.md
+++ b/shared/concepts/CHANGELOG.md
@@ -1,3 +1,27 @@
+## 0.0.8
+
+No user-facing changes.
+
+## 0.0.7
+
+No user-facing changes.
+
+## 0.0.6
+
+No user-facing changes.
+
+## 0.0.5
+
+No user-facing changes.
+
+## 0.0.4
+
+No user-facing changes.
+
+## 0.0.3
+
+No user-facing changes.
+
 ## 0.0.2
 
 No user-facing changes.
diff --git a/shared/concepts/change-notes/released/0.0.3.md b/shared/concepts/change-notes/released/0.0.3.md
new file mode 100644
index 00000000000..af7864fc7d5
--- /dev/null
+++ b/shared/concepts/change-notes/released/0.0.3.md
@@ -0,0 +1,3 @@
+## 0.0.3
+
+No user-facing changes.
diff --git a/shared/concepts/change-notes/released/0.0.4.md b/shared/concepts/change-notes/released/0.0.4.md
new file mode 100644
index 00000000000..eefe286a4d8
--- /dev/null
+++ b/shared/concepts/change-notes/released/0.0.4.md
@@ -0,0 +1,3 @@
+## 0.0.4
+
+No user-facing changes.
diff --git a/shared/concepts/change-notes/released/0.0.5.md b/shared/concepts/change-notes/released/0.0.5.md
new file mode 100644
index 00000000000..766ec2723b5
--- /dev/null
+++ b/shared/concepts/change-notes/released/0.0.5.md
@@ -0,0 +1,3 @@
+## 0.0.5
+
+No user-facing changes.
diff --git a/shared/concepts/change-notes/released/0.0.6.md b/shared/concepts/change-notes/released/0.0.6.md
new file mode 100644
index 00000000000..ccbce856079
--- /dev/null
+++ b/shared/concepts/change-notes/released/0.0.6.md
@@ -0,0 +1,3 @@
+## 0.0.6
+
+No user-facing changes.
diff --git a/shared/concepts/change-notes/released/0.0.7.md b/shared/concepts/change-notes/released/0.0.7.md
new file mode 100644
index 00000000000..84da6f18c42
--- /dev/null
+++ b/shared/concepts/change-notes/released/0.0.7.md
@@ -0,0 +1,3 @@
+## 0.0.7
+
+No user-facing changes.
diff --git a/shared/concepts/change-notes/released/0.0.8.md b/shared/concepts/change-notes/released/0.0.8.md
new file mode 100644
index 00000000000..6af2d954c09
--- /dev/null
+++ b/shared/concepts/change-notes/released/0.0.8.md
@@ -0,0 +1,3 @@
+## 0.0.8
+
+No user-facing changes.
diff --git a/shared/concepts/codeql-pack.release.yml b/shared/concepts/codeql-pack.release.yml
index 55dc06fbd76..58fdc6b45de 100644
--- a/shared/concepts/codeql-pack.release.yml
+++ b/shared/concepts/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.0.2
+lastReleaseVersion: 0.0.8
diff --git a/shared/concepts/qlpack.yml b/shared/concepts/qlpack.yml
index a3945e32785..f76c1f2ae45 100644
--- a/shared/concepts/qlpack.yml
+++ b/shared/concepts/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/concepts
-version: 0.0.3-dev
+version: 0.0.9-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/controlflow/CHANGELOG.md b/shared/controlflow/CHANGELOG.md
index 17db1caf695..c5b9b9d696a 100644
--- a/shared/controlflow/CHANGELOG.md
+++ b/shared/controlflow/CHANGELOG.md
@@ -1,3 +1,27 @@
+## 2.0.18
+
+No user-facing changes.
+
+## 2.0.17
+
+No user-facing changes.
+
+## 2.0.16
+
+No user-facing changes.
+
+## 2.0.15
+
+No user-facing changes.
+
+## 2.0.14
+
+No user-facing changes.
+
+## 2.0.13
+
+No user-facing changes.
+
 ## 2.0.12
 
 No user-facing changes.
diff --git a/shared/controlflow/change-notes/released/2.0.13.md b/shared/controlflow/change-notes/released/2.0.13.md
new file mode 100644
index 00000000000..39a24682b50
--- /dev/null
+++ b/shared/controlflow/change-notes/released/2.0.13.md
@@ -0,0 +1,3 @@
+## 2.0.13
+
+No user-facing changes.
diff --git a/shared/controlflow/change-notes/released/2.0.14.md b/shared/controlflow/change-notes/released/2.0.14.md
new file mode 100644
index 00000000000..13190ad53e3
--- /dev/null
+++ b/shared/controlflow/change-notes/released/2.0.14.md
@@ -0,0 +1,3 @@
+## 2.0.14
+
+No user-facing changes.
diff --git a/shared/controlflow/change-notes/released/2.0.15.md b/shared/controlflow/change-notes/released/2.0.15.md
new file mode 100644
index 00000000000..3b59db4224a
--- /dev/null
+++ b/shared/controlflow/change-notes/released/2.0.15.md
@@ -0,0 +1,3 @@
+## 2.0.15
+
+No user-facing changes.
diff --git a/shared/controlflow/change-notes/released/2.0.16.md b/shared/controlflow/change-notes/released/2.0.16.md
new file mode 100644
index 00000000000..221400d393f
--- /dev/null
+++ b/shared/controlflow/change-notes/released/2.0.16.md
@@ -0,0 +1,3 @@
+## 2.0.16
+
+No user-facing changes.
diff --git a/shared/controlflow/change-notes/released/2.0.17.md b/shared/controlflow/change-notes/released/2.0.17.md
new file mode 100644
index 00000000000..0ed1592726c
--- /dev/null
+++ b/shared/controlflow/change-notes/released/2.0.17.md
@@ -0,0 +1,3 @@
+## 2.0.17
+
+No user-facing changes.
diff --git a/shared/controlflow/change-notes/released/2.0.18.md b/shared/controlflow/change-notes/released/2.0.18.md
new file mode 100644
index 00000000000..11e398dac31
--- /dev/null
+++ b/shared/controlflow/change-notes/released/2.0.18.md
@@ -0,0 +1,3 @@
+## 2.0.18
+
+No user-facing changes.
diff --git a/shared/controlflow/codeql-pack.release.yml b/shared/controlflow/codeql-pack.release.yml
index b856d9a13f2..16342205c73 100644
--- a/shared/controlflow/codeql-pack.release.yml
+++ b/shared/controlflow/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.0.12
+lastReleaseVersion: 2.0.18
diff --git a/shared/controlflow/codeql/controlflow/BasicBlock.qll b/shared/controlflow/codeql/controlflow/BasicBlock.qll
index 132920e329f..ed86ae5aa8b 100644
--- a/shared/controlflow/codeql/controlflow/BasicBlock.qll
+++ b/shared/controlflow/codeql/controlflow/BasicBlock.qll
@@ -9,13 +9,12 @@ overlay[local?]
 module;
 
 private import codeql.util.Location
+private import SuccessorType
 
 /** Provides the language-specific input specification. */
 signature module InputSig<LocationSig Location> {
-  class SuccessorType;
-
   /** Hold if `t` represents a conditional successor type. */
-  predicate successorTypeIsCondition(SuccessorType t);
+  default predicate successorTypeIsCondition(SuccessorType t) { t instanceof ConditionalSuccessor }
 
   /** A delineated part of the AST with its own CFG. */
   class CfgScope;
@@ -47,12 +46,129 @@ signature module InputSig<LocationSig Location> {
   predicate nodeIsPostDominanceExit(Node node);
 }
 
+signature module CfgSig<LocationSig Location> {
+  /** A control flow node. */
+  class ControlFlowNode {
+    /** Gets a textual representation of this control flow node. */
+    string toString();
+
+    /** Gets the location of this control flow node. */
+    Location getLocation();
+  }
+
+  /**
+   * A basic block, that is, a maximal straight-line sequence of control flow nodes
+   * without branches or joins.
+   */
+  class BasicBlock {
+    /** Gets a textual representation of this basic block. */
+    string toString();
+
+    /** Gets the location of this basic block. */
+    Location getLocation();
+
+    /** Gets the control flow node at a specific (zero-indexed) position in this basic block. */
+    ControlFlowNode getNode(int pos);
+
+    /** Gets the last control flow node in this basic block. */
+    ControlFlowNode getLastNode();
+
+    /** Gets the length of this basic block. */
+    int length();
+
+    /** Gets an immediate successor of this basic block, if any. */
+    BasicBlock getASuccessor();
+
+    /** Gets an immediate successor of this basic block of a given type, if any. */
+    BasicBlock getASuccessor(SuccessorType t);
+
+    /**
+     * Holds if this basic block strictly dominates basic block `bb`.
+     *
+     * That is, all paths reaching `bb` from the entry point basic block must
+     * go through this basic block and this basic block is different from `bb`.
+     */
+    predicate strictlyDominates(BasicBlock bb);
+
+    /**
+     * Holds if this basic block dominates basic block `bb`.
+     *
+     * That is, all paths reaching `bb` from the entry point basic block must
+     * go through this basic block.
+     */
+    predicate dominates(BasicBlock bb);
+
+    /**
+     * Holds if `df` is in the dominance frontier of this basic block. That is,
+     * this basic block dominates a predecessor of `df`, but does not dominate
+     * `df` itself. I.e., it is equivaluent to:
+     * ```
+     * this.dominates(df.getAPredecessor()) and not this.strictlyDominates(df)
+     * ```
+     */
+    predicate inDominanceFrontier(BasicBlock df);
+
+    /**
+     * Gets the basic block that immediately dominates this basic block, if any.
+     *
+     * That is, the result is the unique basic block satisfying:
+     * 1. The result strictly dominates this basic block.
+     * 2. There exists no other basic block that is strictly dominated by the
+     *    result and which strictly dominates this basic block.
+     *
+     * All basic blocks, except entry basic blocks, have a unique immediate
+     * dominator.
+     */
+    BasicBlock getImmediateDominator();
+
+    /**
+     * Holds if this basic block strictly post-dominates basic block `bb`.
+     *
+     * That is, all paths reaching a normal exit point basic block from basic
+     * block `bb` must go through this basic block and this basic block is
+     * different from `bb`.
+     */
+    predicate strictlyPostDominates(BasicBlock bb);
+
+    /**
+     * Holds if this basic block post-dominates basic block `bb`.
+     *
+     * That is, all paths reaching a normal exit point basic block from basic
+     * block `bb` must go through this basic block.
+     */
+    predicate postDominates(BasicBlock bb);
+  }
+
+  /**
+   * An entry basic block, that is, a basic block whose first node is
+   * an entry node.
+   */
+  class EntryBasicBlock extends BasicBlock;
+
+  /**
+   * Holds if `bb1` has `bb2` as a direct successor and the edge between `bb1`
+   * and `bb2` is a dominating edge.
+   *
+   * An edge `(bb1, bb2)` is dominating if there exists a basic block that can
+   * only be reached from the entry block by going through `(bb1, bb2)`. This
+   * implies that `(bb1, bb2)` dominates its endpoint `bb2`. I.e., `bb2` can
+   * only be reached from the entry block by going via `(bb1, bb2)`.
+   *
+   * This is a necessary and sufficient condition for an edge to dominate some
+   * block, and therefore `dominatingEdge(bb1, bb2) and bb2.dominates(bb3)`
+   * means that the edge `(bb1, bb2)` dominates `bb3`.
+   */
+  predicate dominatingEdge(BasicBlock bb1, BasicBlock bb2);
+}
+
 /**
  * Provides a basic block construction on top of a control flow graph.
  */
-module Make<LocationSig Location, InputSig<Location> Input> {
+module Make<LocationSig Location, InputSig<Location> Input> implements CfgSig<Location> {
   private import Input
 
+  class ControlFlowNode = Input::Node;
+
   /**
    * A basic block, that is, a maximal straight-line sequence of control flow nodes
    * without branches or joins.
@@ -239,6 +355,10 @@ module Make<LocationSig Location, InputSig<Location> Input> {
     string toString() { result = this.getFirstNode().toString() }
   }
 
+  class EntryBasicBlock extends BasicBlock {
+    EntryBasicBlock() { nodeIsDominanceEntry(this.getFirstNode()) }
+  }
+
   /**
    * Holds if `bb1` has `bb2` as a direct successor and the edge between `bb1`
    * and `bb2` is a dominating edge.
@@ -343,14 +463,14 @@ module Make<LocationSig Location, InputSig<Location> Input> {
     cached
     Node getNode(BasicBlock bb, int pos) { bbIndex(bb.getFirstNode(), result, pos) }
 
-    /** Holds if `bb` is an entry basic block. */
-    private predicate entryBB(BasicBlock bb) { nodeIsDominanceEntry(bb.getFirstNode()) }
-
     cached
     predicate bbSuccessor(BasicBlock bb1, BasicBlock bb2, SuccessorType t) {
       bb2.getFirstNode() = nodeGetASuccessor(bb1.getLastNode(), t)
     }
 
+    /** Holds if `bb` is an entry basic block. */
+    private predicate entryBlock(EntryBasicBlock bb) { any() }
+
     /**
      * Holds if the first node of basic block `succ` is a control flow
      * successor of the last node of basic block `pred`.
@@ -360,7 +480,7 @@ module Make<LocationSig Location, InputSig<Location> Input> {
     /** Holds if `dom` is an immediate dominator of `bb`. */
     cached
     predicate bbIDominates(BasicBlock dom, BasicBlock bb) =
-      idominance(entryBB/1, succBB/2)(_, dom, bb)
+      idominance(entryBlock/1, succBB/2)(_, dom, bb)
 
     /** Holds if `pred` is a basic block predecessor of `succ`. */
     private predicate predBB(BasicBlock succ, BasicBlock pred) { succBB(pred, succ) }
diff --git a/shared/controlflow/codeql/controlflow/Cfg.qll b/shared/controlflow/codeql/controlflow/Cfg.qll
index c9d7d414734..62eebe8e183 100644
--- a/shared/controlflow/codeql/controlflow/Cfg.qll
+++ b/shared/controlflow/codeql/controlflow/Cfg.qll
@@ -8,6 +8,7 @@ module;
 private import codeql.util.Location
 private import codeql.util.FileSystem
 private import codeql.util.Void
+private import SuccessorType
 
 /** Provides the language-specific input specification. */
 signature module InputSig<LocationSig Location> {
@@ -59,26 +60,11 @@ signature module InputSig<LocationSig Location> {
   /** Holds if `scope` is exited when `last` finishes with completion `c`. */
   predicate scopeLast(CfgScope scope, AstNode last, Completion c);
 
-  /** A type of a control flow successor. */
-  class SuccessorType {
-    /** Gets a textual representation of this successor type. */
-    string toString();
-  }
-
   /** Gets a successor type that matches completion `c`. */
   SuccessorType getAMatchingSuccessorType(Completion c);
 
-  /**
-   * Hold if `t` represents simple (normal) evaluation of a statement or an
-   * expression.
-   */
-  predicate successorTypeIsSimple(SuccessorType t);
-
   /** Hold if `t` represents a conditional successor type. */
-  predicate successorTypeIsCondition(SuccessorType t);
-
-  /** Holds if `t` is an abnormal exit type out of a CFG scope. */
-  predicate isAbnormalExitType(SuccessorType t);
+  default predicate successorTypeIsCondition(SuccessorType t) { t instanceof ConditionalSuccessor }
 
   /**
    * Gets an `id` of `node`. This is used to order the predecessors of a join
@@ -261,32 +247,44 @@ module MakeWithSplitting<
     /** Gets the `i`th child element, in order of evaluation. */
     abstract AstNode getChildNode(int i);
 
-    private AstNode getChildNodeRanked(int i) {
-      result = rank[i + 1](AstNode child, int j | child = this.getChildNode(j) | child order by j)
+    private ControlFlowTree getChildTreeRanked(int i) {
+      result =
+        rank[i + 1](ControlFlowTree child, int j | child = this.getChildNode(j) | child order by j)
     }
 
     /** Gets the first child node of this element. */
-    final AstNode getFirstChildNode() { result = this.getChildNodeRanked(0) }
+    deprecated final AstNode getFirstChildNode() { result = this.getChildTreeRanked(0) }
+
+    /** Gets the first child node of this element. */
+    final ControlFlowTree getFirstChildTree() { result = this.getChildTreeRanked(0) }
 
     /** Gets the last child node of this node. */
-    final AstNode getLastChildElement() {
+    deprecated final AstNode getLastChildElement() {
       exists(int last |
-        result = this.getChildNodeRanked(last) and
-        not exists(this.getChildNodeRanked(last + 1))
+        result = this.getChildTreeRanked(last) and
+        not exists(this.getChildTreeRanked(last + 1))
+      )
+    }
+
+    /** Gets the last child node of this node. */
+    final ControlFlowTree getLastChildTree() {
+      exists(int last |
+        result = this.getChildTreeRanked(last) and
+        not exists(this.getChildTreeRanked(last + 1))
       )
     }
 
     /** Holds if this element has no children. */
-    predicate isLeafElement() { not exists(this.getFirstChildNode()) }
+    predicate isLeafElement() { not exists(this.getFirstChildTree()) }
 
     override predicate propagatesAbnormal(AstNode child) { child = this.getChildNode(_) }
 
     pragma[nomagic]
     override predicate succ(AstNode pred, AstNode succ, Completion c) {
       exists(int i |
-        last(this.getChildNodeRanked(i), pred, c) and
+        last(this.getChildTreeRanked(i), pred, c) and
         completionIsNormal(c) and
-        first(this.getChildNodeRanked(i + 1), succ)
+        first(this.getChildTreeRanked(i + 1), succ)
       )
     }
   }
@@ -294,7 +292,7 @@ module MakeWithSplitting<
   /** A standard element that is executed in pre-order. */
   abstract class StandardPreOrderTree extends StandardTree, PreOrderTree {
     override predicate last(AstNode last, Completion c) {
-      last(this.getLastChildElement(), last, c)
+      last(this.getLastChildTree(), last, c)
       or
       this.isLeafElement() and
       completionIsValidFor(c, this) and
@@ -305,7 +303,7 @@ module MakeWithSplitting<
       StandardTree.super.succ(pred, succ, c)
       or
       pred = this and
-      first(this.getFirstChildNode(), succ) and
+      first(this.getFirstChildTree(), succ) and
       completionIsSimple(c)
     }
   }
@@ -313,16 +311,16 @@ module MakeWithSplitting<
   /** A standard element that is executed in post-order. */
   abstract class StandardPostOrderTree extends StandardTree, PostOrderTree {
     override predicate first(AstNode first) {
-      first(this.getFirstChildNode(), first)
+      first(this.getFirstChildTree(), first)
       or
-      not exists(this.getFirstChildNode()) and
+      not exists(this.getFirstChildTree()) and
       first = this
     }
 
     override predicate succ(AstNode pred, AstNode succ, Completion c) {
       StandardTree.super.succ(pred, succ, c)
       or
-      last(this.getLastChildElement(), pred, c) and
+      last(this.getLastChildTree(), pred, c) and
       succ = this and
       completionIsNormal(c)
     }
@@ -510,7 +508,7 @@ module MakeWithSplitting<
   private predicate succEntrySplits(CfgScope pred, AstNode succ, Splits succSplits, SuccessorType t) {
     exists(int rnk |
       scopeFirst(pred, succ) and
-      successorTypeIsSimple(t) and
+      t instanceof DirectSuccessor and
       succEntrySplitsFromRank(pred, succ, succSplits, rnk)
     |
       rnk = 0 and
@@ -947,6 +945,12 @@ module MakeWithSplitting<
         )
     }
 
+    /** Holds if `t` is an abnormal exit type out of a CFG scope. */
+    private predicate isAbnormalExitType(SuccessorType t) {
+      t instanceof ExceptionSuccessor or
+      t instanceof ExitSuccessor
+    }
+
     /**
      * Internal representation of control flow nodes in the control flow graph.
      * The control flow graph is pruned for unreachable nodes.
@@ -1004,7 +1008,7 @@ module MakeWithSplitting<
       exists(CfgScope scope |
         pred = TAnnotatedExitNode(scope, _) and
         result = TExitNode(scope) and
-        successorTypeIsSimple(t)
+        t instanceof DirectSuccessor
       )
     }
 
@@ -1016,6 +1020,12 @@ module MakeWithSplitting<
         not jbp instanceof BasicBlocks::EntryBasicBlock and
         id = idOfAstNode(jbp.getFirstNode().(AstCfgNode).getAstNode()) and
         kind = 1
+        or
+        exists(AnnotatedExitNode aen |
+          jbp.getFirstNode() = aen and
+          id = idOfCfgScope(aen.getScope()) and
+          if aen.isNormal() then kind = 2 else kind = 3
+        )
       }
 
       string getSplitString(BasicBlocks::JoinPredecessorBasicBlock jbp) {
@@ -1175,6 +1185,11 @@ module MakeWithSplitting<
 
   final class AnnotatedExitNode = AnnotatedExitNodeImpl;
 
+  /** A control flow node indicating normal termination of a callable. */
+  final class NormalExitNode extends AnnotatedExitNodeImpl {
+    NormalExitNode() { this = TAnnotatedExitNode(_, true) }
+  }
+
   /** An exit node for a given scope. */
   private class ExitNodeImpl extends NodeImpl, TExitNode {
     private CfgScope scope;
@@ -1308,7 +1323,7 @@ module MakeWithSplitting<
       label =
         strictconcat(SuccessorType t, string s |
           succ = getASuccessor(pred, t) and
-          if successorTypeIsSimple(t) then s = "" else s = t.toString()
+          if t instanceof DirectSuccessor then s = "" else s = t.toString()
         |
           s, ", " order by s
         )
@@ -1523,6 +1538,8 @@ module MakeWithSplitting<
     query predicate multipleSuccessors(Node node, SuccessorType t, Node successor) {
       strictcount(getASuccessor(node, t)) > 1 and
       successor = getASuccessor(node, t) and
+      // allow for multiple exception successors
+      not t instanceof ExceptionSuccessor and
       // allow for functions with multiple bodies
       not (t instanceof SimpleSuccessorType and node instanceof EntryNode)
     }
@@ -1578,8 +1595,6 @@ module MakeWithSplitting<
     private class NodeAlias = Node;
 
     private module BasicBlockInputSig implements BB::InputSig<Location> {
-      class SuccessorType = Input::SuccessorType;
-
       predicate successorTypeIsCondition = Input::successorTypeIsCondition/1;
 
       class CfgScope = CfgScopeAlias;
@@ -1597,7 +1612,7 @@ module MakeWithSplitting<
 
     private module BasicBlockImpl = BB::Make<Location, BasicBlockInputSig>;
 
-    final class BasicBlock = BasicBlockImpl::BasicBlock;
+    class BasicBlock = BasicBlockImpl::BasicBlock;
 
     predicate dominatingEdge = BasicBlockImpl::dominatingEdge/2;
 
diff --git a/shared/controlflow/codeql/controlflow/ControlFlowReachability.qll b/shared/controlflow/codeql/controlflow/ControlFlowReachability.qll
new file mode 100644
index 00000000000..81438033252
--- /dev/null
+++ b/shared/controlflow/codeql/controlflow/ControlFlowReachability.qll
@@ -0,0 +1,880 @@
+/**
+ * Provides an implementation of local (intraprocedural) control flow reachability.
+ */
+overlay[local?]
+module;
+
+private import codeql.controlflow.BasicBlock as BB
+private import codeql.controlflow.SuccessorType
+private import codeql.util.Boolean
+private import codeql.util.Location
+private import codeql.util.Option
+
+private signature class TypSig;
+
+signature module InputSig<LocationSig Location, TypSig ControlFlowNode, TypSig BasicBlock> {
+  AstNode getEnclosingAstNode(ControlFlowNode node);
+
+  class AstNode {
+    /** Gets a textual representation of this AST node. */
+    string toString();
+
+    /** Gets the location of this AST node. */
+    Location getLocation();
+  }
+
+  AstNode getParent(AstNode node);
+
+  class Expr extends AstNode;
+
+  class FinallyBlock extends AstNode;
+
+  /** A variable that can be SSA converted. */
+  class SourceVariable {
+    /** Gets a textual representation of this variable. */
+    string toString();
+
+    /** Gets the location of this variable. */
+    Location getLocation();
+  }
+
+  class SsaDefinition {
+    SourceVariable getSourceVariable();
+
+    predicate definesAt(SourceVariable v, BasicBlock bb, int i);
+
+    /** Gets the basic block to which this SSA definition belongs. */
+    BasicBlock getBasicBlock();
+
+    /** Gets a textual representation of this SSA definition. */
+    string toString();
+
+    /** Gets the location of this SSA definition. */
+    Location getLocation();
+
+    /** Holds if this SSA variable is live at the end of `b`. */
+    predicate isLiveAtEndOfBlock(BasicBlock b);
+  }
+
+  class SsaExplicitWrite extends SsaDefinition {
+    Expr getValue();
+  }
+
+  class SsaPhiDefinition extends SsaDefinition {
+    /** Holds if `inp` is an input to the phi node along the edge originating in `bb`. */
+    predicate hasInputFromBlock(SsaDefinition inp, BasicBlock bb);
+
+    SsaDefinition getAnInput();
+  }
+
+  class SsaUncertainWrite extends SsaDefinition {
+    /**
+     * Gets the immediately preceding definition. Since this update is uncertain,
+     * the value from the preceding definition might still be valid.
+     */
+    SsaDefinition getPriorDefinition();
+  }
+
+  /** An abstract value that a `Guard` may evaluate to. */
+  class GuardValue {
+    /** Gets a textual representation of this value. */
+    string toString();
+
+    /** Holds if this value represents a single concrete value. */
+    predicate isSingleton();
+
+    /**
+     * Gets the dual value. Examples of dual values include:
+     * - null vs. not null
+     * - true vs. false
+     * - evaluating to a specific value vs. evaluating to any other value
+     * - throwing an exception vs. not throwing an exception
+     */
+    GuardValue getDualValue();
+
+    /** Gets the integer that this value represents, if any. */
+    int asIntValue();
+
+    /**
+     * Holds if this value represents an integer range.
+     *
+     * If `upper = true` the range is `(-infinity, bound]`.
+     * If `upper = false` the range is `[bound, infinity)`.
+     */
+    predicate isIntRange(int bound, boolean upper);
+  }
+
+  /**
+   * Holds if `def` evaluating to `v` controls the control-flow branch
+   * edge from `bb1` to `bb2`. That is, following the edge from `bb1` to
+   * `bb2` implies that `def` evaluated to `v`.
+   */
+  predicate ssaControlsBranchEdge(SsaDefinition def, BasicBlock bb1, BasicBlock bb2, GuardValue v);
+
+  /**
+   * Holds if `def` evaluating to `v` controls the basic block `bb`.
+   * That is, execution of `bb` implies that `def` evaluated to `v`.
+   */
+  predicate ssaControls(SsaDefinition def, BasicBlock bb, GuardValue v);
+
+  predicate exprHasValue(Expr e, GuardValue gv);
+
+  bindingset[gv1, gv2]
+  predicate disjointValues(GuardValue gv1, GuardValue gv2);
+}
+
+module Make<
+  LocationSig Location, BB::CfgSig<Location> Cfg,
+  InputSig<Location, Cfg::ControlFlowNode, Cfg::BasicBlock> Input>
+{
+  private module Cfg_ = Cfg;
+
+  private import Cfg_
+  private import Input
+
+  final private class FinalAstNode = Input::AstNode;
+
+  class AstNode extends FinalAstNode {
+    AstNode getParent() { result = getParent(this) }
+  }
+
+  /**
+   * Holds if `node` is enclosed by `finally`. In case of nested finally
+   * blocks, this predicate only holds for the innermost block enclosing
+   * `node`.
+   */
+  private predicate hasEnclosingFinally(AstNode node, FinallyBlock finally) {
+    node = finally
+    or
+    not node instanceof FinallyBlock and
+    hasEnclosingFinally(node.getParent(), finally)
+  }
+
+  /**
+   * Holds if `inner` is nested within `outer`.
+   */
+  private predicate nestedFinally(FinallyBlock inner, FinallyBlock outer) {
+    hasEnclosingFinally(inner.(AstNode).getParent(), outer)
+  }
+
+  /** Gets the nesting depth of `finally` in terms of number of finally blocks. */
+  private int finallyNestLevel(FinallyBlock finally) {
+    not nestedFinally(finally, _) and result = 1
+    or
+    exists(FinallyBlock outer |
+      nestedFinally(finally, outer) and result = 1 + finallyNestLevel(outer)
+    )
+  }
+
+  private int maxFinallyNesting() { result = max(finallyNestLevel(_)) }
+
+  private newtype TFinallyStack =
+    TNil() or
+    TCons(Boolean abrupt, FinallyStack tail) { tail.length() < maxFinallyNesting() }
+
+  /**
+   * A stack of split values to track whether entered finally blocks have
+   * waiting completions.
+   */
+  private class FinallyStack extends TFinallyStack {
+    string toString() {
+      result = "" and this = TNil()
+      or
+      exists(boolean abrupt, FinallyStack tail |
+        result = abrupt + ";" + tail.toString() and this = TCons(abrupt, tail)
+      )
+    }
+
+    /** Gets the length of this stack. */
+    int length() {
+      result = 0 and this = TNil()
+      or
+      exists(FinallyStack tail | result = 1 + tail.length() and this = TCons(_, tail))
+    }
+
+    /**
+     * Gets the stack resulting from pushing information about entering a
+     * finally block through a specific edge onto this stack.
+     *
+     * The `abrupt` value indicates whether the edge has an `AbruptSuccessor`
+     * or not.
+     */
+    FinallyStack enter(boolean abrupt) { result = TCons(abrupt, this) }
+
+    /**
+     * Gets the stack resulting from popping a value, if any, consistent with
+     * leaving a finally block through a specific edge.
+     *
+     * The `abrupt` value indicates whether the edge has an `AbruptSuccessor`
+     * or not.
+     */
+    FinallyStack leave(Boolean abrupt) {
+      this = TNil() and result = TNil() and exists(abrupt)
+      or
+      abrupt = false and this = TCons(false, result)
+      or
+      abrupt = true and this = TCons(_, result)
+    }
+  }
+
+  private ControlFlowNode basicBlockEndPoint() {
+    result = any(BasicBlock bb).getNode(0) or
+    result = any(BasicBlock bb).getLastNode()
+  }
+
+  private predicate inFinally(AstNode node, FinallyBlock finally) {
+    node = getEnclosingAstNode(basicBlockEndPoint()) and
+    hasEnclosingFinally(node, finally)
+    or
+    exists(FinallyBlock inner | nestedFinally(inner, finally) and inFinally(node, inner))
+  }
+
+  private predicate irrelevantFinally(FinallyBlock finally) {
+    exists(BasicBlock bb, AstNode n1, AstNode n2 |
+      n1 = getEnclosingAstNode(bb.getNode(0)) and
+      n2 = getEnclosingAstNode(bb.getLastNode())
+    |
+      inFinally(n1, finally) and not inFinally(n2, finally)
+      or
+      not inFinally(n1, finally) and inFinally(n2, finally)
+    )
+  }
+
+  private predicate entersFinally(
+    BasicBlock bb1, BasicBlock bb2, boolean abrupt, FinallyBlock finally
+  ) {
+    exists(AstNode n1, AstNode n2, SuccessorType t |
+      not irrelevantFinally(finally) and
+      bb1.getASuccessor(t) = bb2 and
+      n1 = getEnclosingAstNode(bb1.getLastNode()) and
+      n2 = getEnclosingAstNode(bb2.getNode(0)) and
+      not inFinally(n1, finally) and
+      inFinally(n2, finally) and
+      if t instanceof AbruptSuccessor then abrupt = true else abrupt = false
+    )
+  }
+
+  private predicate leavesFinally(
+    BasicBlock bb1, BasicBlock bb2, boolean abrupt, FinallyBlock finally
+  ) {
+    exists(AstNode n1, AstNode n2, SuccessorType t |
+      not irrelevantFinally(finally) and
+      bb1.getASuccessor(t) = bb2 and
+      n1 = getEnclosingAstNode(bb1.getLastNode()) and
+      n2 = getEnclosingAstNode(bb2.getNode(0)) and
+      inFinally(n1, finally) and
+      not inFinally(n2, finally) and
+      if t instanceof AbruptSuccessor then abrupt = true else abrupt = false
+    )
+  }
+
+  /**
+   * Holds if the value of `def` is `gv`.
+   *
+   * If multiple values apply, including a singleton, then we only include the
+   * singleton.
+   */
+  private predicate ssaHasValue(SsaExplicitWrite def, GuardValue gv) {
+    exists(Expr e |
+      def.getValue() = e and
+      exprHasValue(e, gv) and
+      (any(GuardValue gv0 | exprHasValue(e, gv0)).isSingleton() implies gv.isSingleton())
+    )
+  }
+
+  pragma[nomagic]
+  private predicate ssaLiveAtEndOfBlock(SourceVariable var, SsaDefinition def, BasicBlock bb) {
+    def.getSourceVariable() = var and
+    def.isLiveAtEndOfBlock(bb)
+  }
+
+  pragma[nomagic]
+  private predicate initSsaValue0(
+    SourceVariable var, BasicBlock bb, SsaDefinition t, GuardValue val, boolean isSingleton
+  ) {
+    ssaLiveAtEndOfBlock(var, t, bb) and
+    (
+      ssaControls(t, bb, val)
+      or
+      ssaHasValue(t, val)
+    ) and
+    if val.isSingleton() then isSingleton = true else isSingleton = false
+  }
+
+  /**
+   * Holds if the value of `t` in `bb` is `val` and that `t` is live at the
+   * end of `bb`.
+   *
+   * If multiple values apply, including a singleton, then we only include the
+   * singleton.
+   *
+   * The underlying variable of `t` is `var`.
+   */
+  private predicate initSsaValue(SourceVariable var, BasicBlock bb, SsaDefinition t, GuardValue val) {
+    exists(boolean isSingleton |
+      initSsaValue0(var, bb, t, val, isSingleton) and
+      (initSsaValue0(var, bb, t, _, true) implies isSingleton = true)
+    )
+  }
+
+  private module GuardValueOption = Option<GuardValue>;
+
+  private class GuardValueOption = GuardValueOption::Option;
+
+  /**
+   * Gets the best constraint of `v1` and `v2`. If both are non-singletons,
+   * then we arbitrarily choose `v1`. This operation approximates intersection.
+   */
+  bindingset[v1, v2]
+  pragma[inline_late]
+  private GuardValueOption intersect(GuardValueOption v1, GuardValue v2) {
+    if v2.isSingleton()
+    then result.asSome() = v2
+    else
+      if v1.isNone()
+      then result.asSome() = v2
+      else result = v1
+  }
+
+  /** An input configuration for control flow reachability. */
+  signature module ConfigSig {
+    /**
+     * Holds if the value of `def` at `node` is a source for the reachability
+     * computation.
+     */
+    predicate source(ControlFlowNode node, SsaDefinition def);
+
+    /**
+     * Holds if the value of `def` at `node` is a sink for the reachability
+     * computation.
+     */
+    predicate sink(ControlFlowNode node, SsaDefinition def);
+
+    /**
+     * Holds if the value of `gv` is a barrier for the reachability computation.
+     * That is, paths where the tracked variable can be inferred to have the
+     * value of `gv` are excluded from the reachability analysis.
+     */
+    default predicate barrierValue(GuardValue gv) { none() }
+
+    /**
+     * Holds if the edge from `bb1` to `bb2` should be excluded from the
+     * reachability analysis.
+     */
+    default predicate barrierEdge(BasicBlock bb1, BasicBlock bb2) { none() }
+
+    /**
+     * Holds if flow through uncertain SSA updates should be included.
+     */
+    default predicate uncertainFlow() { any() }
+  }
+
+  /**
+   * Constructs a control flow reachability computation.
+   */
+  module Flow<ConfigSig Config> {
+    private predicate ssaRelevantAtEndOfBlock(SsaDefinition def, BasicBlock bb) {
+      def.isLiveAtEndOfBlock(bb)
+      or
+      def.getBasicBlock().strictlyPostDominates(bb)
+    }
+
+    pragma[nomagic]
+    private predicate isSource(
+      ControlFlowNode src, SsaDefinition srcDef, SourceVariable var, BasicBlock bb, int i
+    ) {
+      Config::source(src, srcDef) and
+      bb.getNode(i) = src and
+      srcDef.getSourceVariable() = var
+    }
+
+    pragma[nomagic]
+    private predicate isSink(
+      ControlFlowNode sink, SsaDefinition sinkDef, SourceVariable var, BasicBlock bb, int i
+    ) {
+      Config::sink(sink, sinkDef) and
+      bb.getNode(i) = sink and
+      sinkDef.getSourceVariable() = var
+    }
+
+    private predicate uncertainStep(SsaDefinition def1, SsaDefinition def2) {
+      def2.(SsaUncertainWrite).getPriorDefinition() = def1 and
+      Config::uncertainFlow()
+    }
+
+    private predicate intraBlockStep(SsaDefinition def1, SsaDefinition def2) {
+      exists(BasicBlock bb |
+        uncertainStep(def1, def2) and
+        bb = def2.getBasicBlock() and
+        isSource(_, _, _, bb, _) and
+        isSink(_, _, _, bb, _)
+      )
+    }
+
+    private predicate intraBlockFlowAll(
+      ControlFlowNode src, SsaDefinition srcDef, int i, ControlFlowNode sink, SsaDefinition sinkDef,
+      int j
+    ) {
+      exists(SourceVariable var, BasicBlock bb |
+        isSource(src, srcDef, var, bb, i) and
+        isSink(sink, sinkDef, var, bb, j) and
+        i <= j and
+        intraBlockStep*(srcDef, sinkDef)
+      )
+    }
+
+    private predicate intraBlockFlow(
+      ControlFlowNode src, SsaDefinition srcDef, ControlFlowNode sink, SsaDefinition sinkDef
+    ) {
+      exists(int i, int j |
+        intraBlockFlowAll(src, srcDef, i, sink, sinkDef, j) and
+        not exists(int k |
+          intraBlockFlowAll(src, srcDef, i, _, _, k) and
+          k < j
+        )
+      )
+    }
+
+    private predicate sourceBlock(SsaDefinition def, BasicBlock bb, ControlFlowNode src) {
+      isSource(src, def, _, bb, _) and
+      not intraBlockFlow(src, def, _, _)
+    }
+
+    private predicate sinkBlock(SsaDefinition def, BasicBlock bb, ControlFlowNode sink) {
+      sink =
+        min(ControlFlowNode n, int i | bb.getNode(i) = n and Config::sink(n, def) | n order by i)
+    }
+
+    /**
+     * Holds if the edge from `bb1` to `bb2` implies that `def` has a value
+     * that is considered a barrier.
+     */
+    pragma[nomagic]
+    private predicate ssaValueBarrierEdge(SsaDefinition def, BasicBlock bb1, BasicBlock bb2) {
+      exists(GuardValue v |
+        ssaControlsBranchEdge(def, bb1, bb2, v) and
+        Config::barrierValue(v)
+      )
+    }
+
+    pragma[nomagic]
+    private predicate phiBlock(BasicBlock bb, SourceVariable v) {
+      exists(SsaPhiDefinition phi | phi.getBasicBlock() = bb and phi.getSourceVariable() = v)
+    }
+
+    /** Holds if `def1` in `bb1` may step to `def2` in `bb2`. */
+    private predicate step(SsaDefinition def1, BasicBlock bb1, SsaDefinition def2, BasicBlock bb2) {
+      not sinkBlock(def1, bb1, _) and
+      not Config::barrierEdge(bb1, bb2) and
+      not ssaValueBarrierEdge(def1, bb1, bb2) and
+      (
+        def2.(SsaPhiDefinition).hasInputFromBlock(def1, bb1) and bb2 = def2.getBasicBlock()
+        or
+        exists(SourceVariable v |
+          ssaRelevantAtEndOfBlock(def1, bb1) and
+          bb1.getASuccessor() = bb2 and
+          v = def1.getSourceVariable() and
+          not phiBlock(bb2, v) and
+          def1 = def2
+        )
+        or
+        uncertainStep(def1, def2) and
+        bb2 = def2.getBasicBlock() and
+        bb1 = bb2
+      )
+    }
+
+    bindingset[bb1, bb2, fs1]
+    pragma[inline_late]
+    private predicate stepFinallyStack(
+      BasicBlock bb1, BasicBlock bb2, FinallyStack fs1, FinallyStack fs2
+    ) {
+      exists(boolean abrupt | entersFinally(bb1, bb2, abrupt, _) and fs2 = fs1.enter(abrupt)) and
+      not leavesFinally(bb1, bb2, _, _)
+      or
+      exists(boolean abrupt | leavesFinally(bb1, bb2, abrupt, _) and fs2 = fs1.leave(abrupt)) and
+      not entersFinally(bb1, bb2, _, _)
+      or
+      exists(boolean abrupt |
+        leavesFinally(bb1, bb2, abrupt, _) and
+        entersFinally(bb1, bb2, abrupt, _) and
+        fs2 = fs1.leave(abrupt).enter(abrupt)
+      )
+      or
+      not entersFinally(bb1, bb2, _, _) and not leavesFinally(bb1, bb2, _, _) and fs2 = fs1
+    }
+
+    /**
+     * Holds if the source `srcDef` in `srcBb` may reach `def` in `bb`. If the
+     * path has entered one or more finally blocks then `fs` tracks the
+     * `SuccessorType`s of the edges entering those blocks.
+     */
+    private predicate sourceReachesBlock(
+      SsaDefinition srcDef, BasicBlock srcBb, SsaDefinition def, BasicBlock bb, FinallyStack fs
+    ) {
+      sourceBlock(srcDef, srcBb, _) and
+      def = srcDef and
+      bb = srcBb and
+      fs = TNil()
+      or
+      exists(SsaDefinition middef, BasicBlock midbb, FinallyStack midfs |
+        sourceReachesBlock(srcDef, srcBb, middef, midbb, midfs) and
+        step(middef, midbb, def, bb) and
+        stepFinallyStack(midbb, bb, midfs, fs)
+      )
+    }
+
+    /**
+     * Holds if `def` in `bb` is reachable from a source and may reach a sink.
+     */
+    private predicate blockReachesSink(SsaDefinition def, BasicBlock bb) {
+      sourceReachesBlock(_, _, def, bb, _) and
+      (
+        sinkBlock(def, bb, _)
+        or
+        exists(SsaDefinition middef, BasicBlock midbb |
+          step(def, bb, middef, midbb) and
+          blockReachesSink(middef, midbb)
+        )
+      )
+    }
+
+    private predicate escapeCandidate(SsaDefinition def, BasicBlock bb) {
+      sourceBlock(def, bb, _)
+      or
+      exists(SsaDefinition middef, BasicBlock midbb |
+        blockReachesSink(middef, midbb) and
+        step(middef, midbb, def, bb)
+      )
+    }
+
+    /**
+     * Holds if the source `srcDef` in `srcBb` may reach `escDef` in `escBb` and from
+     * there cannot reach a sink.
+     */
+    private predicate sourceEscapesSink(
+      SsaDefinition srcDef, BasicBlock srcBb, SsaDefinition escDef, BasicBlock escBb
+    ) {
+      sourceReachesBlock(srcDef, srcBb, escDef, escBb, _) and
+      escapeCandidate(escDef, escBb) and
+      not blockReachesSink(escDef, escBb)
+    }
+
+    /** Holds if `bb` is a relevant block for computing reachability of `src`. */
+    private predicate pathBlock(SourceVariable src, BasicBlock bb) {
+      exists(SsaDefinition def | def.getSourceVariable() = src |
+        blockReachesSink(def, bb)
+        or
+        escapeCandidate(def, bb)
+      )
+    }
+
+    /**
+     * Holds if `bb1` to `bb2` is a relevant edge for computing reachability
+     * of `src`.
+     */
+    private predicate pathEdge(SourceVariable src, BasicBlock bb1, BasicBlock bb2) {
+      step(_, bb1, _, bb2) and
+      pathBlock(pragma[only_bind_into](src), bb1) and
+      pathBlock(pragma[only_bind_into](src), bb2) and
+      bb1 != bb2
+    }
+
+    /**
+     * Holds if the edge from `bb1` to `bb2` implies that `def` has the value
+     * `gv` and that the edge is relevant for computing reachability of `src`.
+     *
+     * If multiple values may be implied by this edge, including a singleton,
+     * then we only include the singleton.
+     *
+     * The underlying variable of `t` is `var`.
+     */
+    private predicate ssaControlsPathEdge(
+      SourceVariable src, SsaDefinition t, SourceVariable var, GuardValue gv, BasicBlock bb1,
+      BasicBlock bb2
+    ) {
+      ssaControlsBranchEdge(t, bb1, bb2, gv) and
+      (
+        any(GuardValue gv0 | ssaControlsBranchEdge(t, bb1, bb2, gv0)).isSingleton()
+        implies
+        gv.isSingleton()
+      ) and
+      pathEdge(src, bb1, bb2) and
+      t.getSourceVariable() = var
+    }
+
+    /**
+     * Holds if the reachability path for `src` may go through a loop with
+     * entry point `entry`.
+     */
+    pragma[nomagic]
+    private predicate loopEntryBlock(SourceVariable src, BasicBlock entry) {
+      exists(BasicBlock pred | pathEdge(src, pred, entry) and entry.strictlyDominates(pred))
+    }
+
+    /**
+     * Gets either `gv` or its dual value. This is intended as a mostly unique
+     * representation of the set of values `gv` and `gv.getDualValue()`.
+     */
+    private GuardValue getPrimary(GuardValue gv) {
+      exists(GuardValue dual | dual = gv.getDualValue() |
+        if dual.isSingleton() then result = dual else result = gv
+      )
+    }
+
+    /**
+     * Holds if precision may be improved by splitting control flow on the
+     * value of `var` during the reachability computation of `src`.
+     *
+     * The `condgv`/`condgv.getDualValue()` separation of the values of `var`
+     * determines whether a possibly relevant edge may be taken or not.
+     */
+    private predicate relevantSplit(SourceVariable src, SourceVariable var, GuardValue condgv) {
+      // `var` may be a relevant split if we encounter 2+ conditional edges
+      // that imply information about `var`.
+      exists(GuardValue gv |
+        ssaControlsPathEdge(src, _, var, gv, _, _) and
+        condgv = getPrimary(gv) and
+        2 <= strictcount(BasicBlock bb1 | ssaControlsPathEdge(src, _, var, _, bb1, _))
+      )
+      or
+      // Or if we encounter a conditional edge that imply a value that's
+      // incompatible with an initial or later assigned value.
+      exists(GuardValue gv1, GuardValue gv2, BasicBlock bb |
+        condgv = getPrimary(gv1) and
+        ssaControlsPathEdge(src, _, var, gv1, _, _) and
+        initSsaValue(var, bb, _, gv2) and
+        disjointValues(gv1, gv2) and
+        pathBlock(src, bb)
+      )
+      or
+      // Or if we encounter a conditional edge in a loop that imply a value for
+      // `var` that may be unchanged from one iteration to the next.
+      exists(
+        SsaDefinition def, BasicBlock bb1, BasicBlock bb2, BasicBlock loopEntry, GuardValue gv
+      |
+        ssaControlsPathEdge(src, def, var, gv, bb1, bb2) and
+        condgv = getPrimary(gv) and
+        loopEntryBlock(src, loopEntry) and
+        loopEntry.strictlyDominates(bb1) and
+        bb2.getASuccessor*() = loopEntry
+      |
+        def.getBasicBlock().dominates(loopEntry)
+        or
+        exists(SsaPhiDefinition phi |
+          phi.definesAt(var, loopEntry, _) and
+          phi.getAnInput+() = def and
+          def.(SsaPhiDefinition).getAnInput*() = phi
+        )
+      )
+    }
+
+    private module SsaDefOption = Option<SsaDefinition>;
+
+    private class SsaDefOption = SsaDefOption::Option;
+
+    private predicate lastDefInBlock(SourceVariable var, SsaDefinition def, BasicBlock bb) {
+      def = max(SsaDefinition d, int i | d.definesAt(var, bb, i) | d order by i)
+    }
+
+    /**
+     * Holds if `gv` is relatable to the `condgv`/`condgv.getDualValue()` pair
+     * in the sense that a conditional branch based on `condgv` may be
+     * determined by `gv`.
+     */
+    bindingset[gv, condgv]
+    pragma[inline_late]
+    private predicate relatable(GuardValue gv, GuardValue condgv) {
+      disjointValues(gv, condgv) or
+      disjointValues(gv, condgv.getDualValue())
+    }
+
+    /**
+     * Holds if `bb1` to `bb2` is a relevant edge for computing reachability of
+     * `src`, and `var` is a relevant splitting variable that gets (re-)defined
+     * in `bb2` by `t`, which is not a phi node.
+     *
+     * `val` is the best known value that is relatable to `condgv` for `t` in `bb2`.
+     */
+    private predicate stepSsaValueRedef(
+      SourceVariable src, BasicBlock bb1, BasicBlock bb2, SourceVariable var, GuardValue condgv,
+      SsaDefinition t, GuardValueOption val
+    ) {
+      pathEdge(src, bb1, bb2) and
+      relevantSplit(src, var, condgv) and
+      lastDefInBlock(var, t, bb2) and
+      not t instanceof SsaPhiDefinition and
+      (
+        exists(GuardValue gv |
+          ssaHasValue(t, gv) and
+          if relatable(gv, condgv) then val.asSome() = gv else val.isNone()
+        )
+        or
+        not ssaHasValue(t, _) and val.isNone()
+      )
+    }
+
+    /**
+     * Holds if `bb1` to `bb2` is a relevant edge for computing reachability of
+     * `src`, and `var` is a relevant splitting variable that has a phi node,
+     * `t2`, in `bb2` taking input from `t1` along this edge. Furthermore,
+     * there is no further redefinition of `var` in `bb2`.
+     *
+     * `val` is the best value that is relatable to `condgv` for `t1`/`t2`
+     * implied by taking this edge.
+     */
+    private predicate stepSsaValuePhi(
+      SourceVariable src, BasicBlock bb1, BasicBlock bb2, SourceVariable var, GuardValue condgv,
+      SsaDefinition t1, SsaDefinition t2, GuardValueOption val
+    ) {
+      pathEdge(src, bb1, bb2) and
+      relevantSplit(src, var, condgv) and
+      lastDefInBlock(var, t2, bb2) and
+      t2.(SsaPhiDefinition).hasInputFromBlock(t1, bb1) and
+      (
+        exists(GuardValue gv |
+          ssaControlsPathEdge(src, t1, _, gv, bb1, bb2) and
+          if relatable(gv, condgv) then val.asSome() = gv else val.isNone()
+        )
+        or
+        not ssaControlsPathEdge(src, t1, _, _, bb1, bb2) and
+        val.isNone()
+      )
+    }
+
+    /**
+     * Holds if `bb1` to `bb2` is a relevant edge for computing reachability of
+     * `src`, and `var` is a relevant splitting variable that has no
+     * redefinition along this edge nor in `bb2`.
+     *
+     * Additionally, this edge implies that the SSA definition `t` of `var` has
+     * value `val` and that `val` is relatable to `condgv`.
+     */
+    private predicate stepSsaValueNoRedef(
+      SourceVariable src, BasicBlock bb1, BasicBlock bb2, SourceVariable var, GuardValue condgv,
+      SsaDefinition t, GuardValue val
+    ) {
+      pathEdge(src, bb1, bb2) and
+      relevantSplit(src, var, condgv) and
+      not lastDefInBlock(var, _, bb2) and
+      ssaControlsPathEdge(src, t, var, val, bb1, bb2) and
+      relatable(val, condgv)
+    }
+
+    /**
+     * Holds if the source `srcDef` in `srcBb` may reach `def` in `bb`. The
+     * taken path takes splitting based on the value of `var` into account.
+     *
+     * When multiple `GuardValue`s can be chosen for `var`, we prioritize those
+     * that are relatable to `condgv`, as that will help determine whether a
+     * particular edge may be taken or not. Singleton values are prioritized
+     * highly as they are in principle relatable to every other `GuardValue`.
+     *
+     * The pair `(tracked, val)` is the current SSA definition and known value
+     * for `var` in `bb`.
+     */
+    private predicate sourceReachesBlockWithTrackedVar(
+      SsaDefinition srcDef, BasicBlock srcBb, SsaDefinition def, BasicBlock bb, FinallyStack fs,
+      SsaDefOption tracked, GuardValueOption val, SourceVariable var, GuardValue condgv
+    ) {
+      sourceBlock(srcDef, srcBb, _) and
+      def = srcDef and
+      bb = srcBb and
+      fs = TNil() and
+      relevantSplit(def.getSourceVariable(), var, condgv) and
+      (
+        // tracking variable is not yet live
+        not ssaLiveAtEndOfBlock(var, _, bb) and
+        tracked.isNone() and
+        val.isNone()
+        or
+        // tracking variable is live but without known value
+        ssaLiveAtEndOfBlock(var, tracked.asSome(), bb) and
+        not initSsaValue(var, bb, _, _) and
+        val.isNone()
+        or
+        // tracking variable has known value, track it if it is relatable to condgv
+        exists(GuardValue gv | initSsaValue(var, bb, tracked.asSome(), gv) |
+          if relatable(gv, condgv) then val.asSome() = gv else val.isNone()
+        )
+      )
+      or
+      exists(
+        SourceVariable src, SsaDefinition middef, BasicBlock midbb, FinallyStack midfs,
+        SsaDefOption tracked0, GuardValueOption val0
+      |
+        sourceReachesBlockWithTrackedVar(srcDef, srcBb, middef, midbb, midfs, tracked0, val0, var,
+          condgv) and
+        src = srcDef.getSourceVariable() and
+        step(middef, midbb, def, bb) and
+        stepFinallyStack(midbb, bb, midfs, fs) and
+        pathBlock(pragma[only_bind_into](src), bb) and
+        not exists(GuardValue gv |
+          ssaControlsPathEdge(src, tracked0.asSome(), _, gv, midbb, bb) and
+          disjointValues(val0.asSome(), gv)
+        )
+      |
+        // tracking variable is redefined
+        stepSsaValueRedef(src, midbb, bb, var, condgv, tracked.asSome(), val)
+        or
+        exists(GuardValueOption val1 |
+          // tracking variable has a phi node, and maybe value information from the edge
+          stepSsaValuePhi(src, midbb, bb, var, condgv, tracked0.asSome(), tracked.asSome(), val1)
+        |
+          val = val0 and val1.isNone()
+          or
+          val = intersect(val0, val1.asSome())
+        )
+        or
+        exists(GuardValue val1 |
+          // tracking variable is unchanged, and has value information from the edge
+          stepSsaValueNoRedef(src, midbb, bb, var, condgv, tracked0.asSome(), val1) and
+          tracked = tracked0 and
+          val = intersect(val0, val1)
+        )
+        or
+        // tracking variable is unchanged, and has no value information from the edge
+        not lastDefInBlock(var, _, bb) and
+        not stepSsaValueNoRedef(src, midbb, bb, var, condgv, tracked0.asSome(), _) and
+        tracked = tracked0 and
+        val = val0
+      )
+    }
+
+    /**
+     * Holds if the source `srcDef` at `src` may reach the sink `sinkDef` at `sink`.
+     */
+    predicate flow(
+      ControlFlowNode src, SsaDefinition srcDef, ControlFlowNode sink, SsaDefinition sinkDef
+    ) {
+      intraBlockFlow(src, srcDef, sink, sinkDef)
+      or
+      exists(BasicBlock srcBb, BasicBlock sinkBb, SourceVariable srcVar |
+        sourceBlock(srcDef, srcBb, src) and
+        sourceReachesBlock(srcDef, srcBb, sinkDef, sinkBb, _) and
+        sinkBlock(sinkDef, sinkBb, sink) and
+        srcVar = srcDef.getSourceVariable() and
+        forall(SourceVariable t, GuardValue condgv | relevantSplit(srcVar, t, condgv) |
+          sourceReachesBlockWithTrackedVar(srcDef, srcBb, sinkDef, sinkBb, _, _, _, t, condgv)
+        )
+      )
+    }
+
+    /**
+     * Holds if the source `srcDef` at `src` may escape, that is, there exists
+     * a path from `src` that circumvents all sinks to a point from which no
+     * sink is reachable.
+     */
+    predicate escapeFlow(ControlFlowNode src, SsaDefinition srcDef) {
+      not intraBlockFlow(src, srcDef, _, _) and
+      exists(BasicBlock srcBb, SsaDefinition escDef, BasicBlock escBb, SourceVariable srcVar |
+        sourceBlock(srcDef, srcBb, src) and
+        sourceEscapesSink(srcDef, srcBb, escDef, escBb) and
+        srcVar = srcDef.getSourceVariable() and
+        forall(SourceVariable t, GuardValue condgv | relevantSplit(srcVar, t, condgv) |
+          sourceReachesBlockWithTrackedVar(srcDef, srcBb, escDef, escBb, _, _, _, t, condgv)
+        )
+      )
+    }
+  }
+}
diff --git a/shared/controlflow/codeql/controlflow/Guards.qll b/shared/controlflow/codeql/controlflow/Guards.qll
index 34f42036292..8fd39279ff6 100644
--- a/shared/controlflow/codeql/controlflow/Guards.qll
+++ b/shared/controlflow/codeql/controlflow/Guards.qll
@@ -50,81 +50,18 @@
 overlay[local?]
 module;
 
+private import codeql.controlflow.BasicBlock as BB
+private import codeql.controlflow.SuccessorType
 private import codeql.util.Boolean
 private import codeql.util.Location
 private import codeql.util.Unit
 
-signature module InputSig<LocationSig Location> {
-  class SuccessorType {
-    /** Gets a textual representation of this successor type. */
-    string toString();
-  }
-
-  class ExceptionSuccessor extends SuccessorType;
-
-  class ConditionalSuccessor extends SuccessorType {
-    /** Gets the Boolean value of this successor. */
-    boolean getValue();
-  }
-
-  class BooleanSuccessor extends ConditionalSuccessor;
-
-  class NullnessSuccessor extends ConditionalSuccessor;
-
-  /** A control flow node. */
-  class ControlFlowNode {
-    /** Gets a textual representation of this control flow node. */
-    string toString();
-
-    /** Gets the location of this control flow node. */
-    Location getLocation();
-  }
+signature class TypSig;
 
+signature module InputSig<LocationSig Location, TypSig ControlFlowNode, TypSig BasicBlock> {
   /** A control flow node indicating normal termination of a callable. */
   class NormalExitNode extends ControlFlowNode;
 
-  /**
-   * A basic block, that is, a maximal straight-line sequence of control flow nodes
-   * without branches or joins.
-   */
-  class BasicBlock {
-    /** Gets a textual representation of this basic block. */
-    string toString();
-
-    /** Gets the `i`th node in this basic block. */
-    ControlFlowNode getNode(int i);
-
-    /** Gets the last control flow node in this basic block. */
-    ControlFlowNode getLastNode();
-
-    /** Gets the length of this basic block. */
-    int length();
-
-    /** Gets the location of this basic block. */
-    Location getLocation();
-
-    BasicBlock getASuccessor(SuccessorType t);
-
-    predicate dominates(BasicBlock bb);
-
-    predicate strictlyDominates(BasicBlock bb);
-  }
-
-  /**
-   * Holds if `bb1` has `bb2` as a direct successor and the edge between `bb1`
-   * and `bb2` is a dominating edge.
-   *
-   * An edge `(bb1, bb2)` is dominating if there exists a basic block that can
-   * only be reached from the entry block by going through `(bb1, bb2)`. This
-   * implies that `(bb1, bb2)` dominates its endpoint `bb2`. I.e., `bb2` can
-   * only be reached from the entry block by going via `(bb1, bb2)`.
-   *
-   * This is a necessary and sufficient condition for an edge to dominate some
-   * block, and therefore `dominatingEdge(bb1, bb2) and bb2.dominates(bb3)`
-   * means that the edge `(bb1, bb2)` dominates `bb3`.
-   */
-  predicate dominatingEdge(BasicBlock bb1, BasicBlock bb2);
-
   class AstNode {
     /** Gets a textual representation of this AST node. */
     string toString();
@@ -254,17 +191,31 @@ signature module InputSig<LocationSig Location> {
 }
 
 /** Provides guards-related predicates and classes. */
-module Make<LocationSig Location, InputSig<Location> Input> {
+module Make<
+  LocationSig Location, BB::CfgSig<Location> Cfg,
+  InputSig<Location, Cfg::ControlFlowNode, Cfg::BasicBlock> Input>
+{
+  private module Cfg_ = Cfg;
+
+  private import Cfg_
   private import Input
 
   private newtype TAbstractSingleValue =
     TValueNull() or
-    TValueTrue() or
+    TValueBool(Boolean b) or
     TValueInt(int i) { exists(ConstantExpr c | c.asIntegerValue() = i) or i = 0 } or
     TValueConstant(ConstantValue c) { exists(ConstantExpr ce | ce.asConstantValue() = c) }
 
   private newtype TGuardValue =
-    TValue(TAbstractSingleValue val, Boolean isVal) or
+    TValue(TAbstractSingleValue val, Boolean isVal) {
+      val instanceof TValueBool implies isVal = true
+    } or
+    TIntRange(int bound, Boolean upper) {
+      exists(ConstantExpr c | c.asIntegerValue() + [-1, 0, 1] = bound) and
+      // exclude edge cases to avoid overflow issues when computing duals
+      bound != 2147483647 and
+      bound != -2147483648
+    } or
     TException(Boolean throws)
 
   private class AbstractSingleValue extends TAbstractSingleValue {
@@ -272,7 +223,9 @@ module Make<LocationSig Location, InputSig<Location> Input> {
     string toString() {
       result = "null" and this instanceof TValueNull
       or
-      result = "true" and this instanceof TValueTrue
+      result = "true" and this = TValueBool(true)
+      or
+      result = "false" and this = TValueBool(false)
       or
       exists(int i | result = i.toString() and this = TValueInt(i))
       or
@@ -295,12 +248,29 @@ module Make<LocationSig Location, InputSig<Location> Input> {
         result = TValue(val, isVal.booleanNot())
       )
       or
+      exists(boolean b |
+        this = TValue(TValueBool(b), true) and
+        result = TValue(TValueBool(b.booleanNot()), true)
+      )
+      or
+      exists(int bound, int d, boolean upper |
+        upper = true and d = 1
+        or
+        upper = false and d = -1
+      |
+        this = TIntRange(bound, pragma[only_bind_into](upper)) and
+        result = TIntRange(bound + d, pragma[only_bind_into](upper.booleanNot()))
+      )
+      or
       exists(boolean throws |
         this = TException(throws) and
         result = TException(throws.booleanNot())
       )
     }
 
+    /** Holds if this value represents a single concrete value. */
+    predicate isSingleton() { this = TValue(_, true) }
+
     /** Holds if this value represents `null`. */
     predicate isNullValue() { this.isNullness(true) }
 
@@ -314,24 +284,36 @@ module Make<LocationSig Location, InputSig<Location> Input> {
     int asIntValue() { this = TValue(TValueInt(result), true) }
 
     /** Gets the boolean that this value represents, if any. */
-    boolean asBooleanValue() { this = TValue(TValueTrue(), result) }
+    boolean asBooleanValue() { this = TValue(TValueBool(result), true) }
 
     /** Gets the constant that this value represents, if any. */
     ConstantValue asConstantValue() { this = TValue(TValueConstant(result), true) }
 
-    /** Holds if this value represents throwing an exception. */
+    /**
+     * Holds if this value represents an integer range.
+     *
+     * If `upper = true` the range is `(-infinity, bound]`.
+     * If `upper = false` the range is `[bound, infinity)`.
+     */
+    predicate isIntRange(int bound, boolean upper) { this = TIntRange(bound, upper) }
+
+    /** Holds if this value represents throwing an exception (or exiting). */
     predicate isThrowsException() { this = TException(true) }
 
     /** Gets a textual representation of this value. */
     string toString() {
-      result = this.asBooleanValue().toString()
-      or
-      exists(AbstractSingleValue val | not val instanceof TValueTrue |
+      exists(AbstractSingleValue val |
         this = TValue(val, true) and result = val.toString()
         or
         this = TValue(val, false) and result = "not " + val.toString()
       )
       or
+      exists(int bound |
+        this = TIntRange(bound, true) and result = "Upper bound " + bound.toString()
+        or
+        this = TIntRange(bound, false) and result = "Lower bound " + bound.toString()
+      )
+      or
       exists(boolean throws | this = TException(throws) |
         throws = true and result = "exception"
         or
@@ -350,6 +332,24 @@ module Make<LocationSig Location, InputSig<Location> Input> {
       b = TValue(b1, true) and
       a1 != b1
     )
+    or
+    exists(int upperbound, int lowerbound |
+      a = TIntRange(upperbound, true) and b = TIntRange(lowerbound, false)
+      or
+      b = TIntRange(upperbound, true) and a = TIntRange(lowerbound, false)
+    |
+      upperbound < lowerbound
+    )
+    or
+    exists(int bound, boolean upper, int k |
+      a = TIntRange(bound, upper) and b.asIntValue() = k
+      or
+      b = TIntRange(bound, upper) and a.asIntValue() = k
+    |
+      upper = true and bound < k
+      or
+      upper = false and bound > k
+    )
   }
 
   private predicate constantHasValue(ConstantExpr c, GuardValue v) {
@@ -362,25 +362,33 @@ module Make<LocationSig Location, InputSig<Location> Input> {
     v.asConstantValue() = c.asConstantValue()
   }
 
+  private predicate trivialHasValue(Expr e, GuardValue v) {
+    constantHasValue(e, v)
+    or
+    e instanceof NonNullExpr and v.isNonNullValue()
+  }
+
+  /** Holds if `t` is an exception-like successor type. */
+  private predicate exceptionLike(SuccessorType t) {
+    t instanceof ExceptionSuccessor or
+    t instanceof ExitSuccessor
+  }
+
   private predicate exceptionBranchPoint(BasicBlock bb1, BasicBlock normalSucc, BasicBlock excSucc) {
-    exists(SuccessorType norm, ExceptionSuccessor exc |
+    exists(SuccessorType norm, SuccessorType exc |
       bb1.getASuccessor(norm) = normalSucc and
       bb1.getASuccessor(exc) = excSucc and
       normalSucc != excSucc and
-      not norm instanceof ExceptionSuccessor
+      exceptionLike(exc) and
+      not exceptionLike(norm)
     )
   }
 
   private predicate branchEdge(BasicBlock bb1, BasicBlock bb2, GuardValue v) {
-    exists(ConditionalSuccessor s |
-      bb1.getASuccessor(s) = bb2 and
-      exists(AbstractSingleValue val |
-        s instanceof NullnessSuccessor and val = TValueNull()
-        or
-        s instanceof BooleanSuccessor and val = TValueTrue()
-      |
-        v = TValue(val, s.getValue())
-      )
+    exists(ConditionalSuccessor s | bb1.getASuccessor(s) = bb2 |
+      s instanceof NullnessSuccessor and v = TValue(TValueNull(), s.getValue())
+      or
+      s instanceof BooleanSuccessor and v = TValue(TValueBool(s.getValue()), true)
     )
     or
     exceptionBranchPoint(bb1, bb2, _) and v = TException(false)
@@ -510,7 +518,8 @@ module Make<LocationSig Location, InputSig<Location> Input> {
     or
     exists(NonNullExpr nonnull |
       equalityTestSymmetric(g1, g2, nonnull, v1.asBooleanValue()) and
-      v2.isNonNullValue()
+      v2.isNonNullValue() and
+      not g2 instanceof NonNullExpr // disregard trivial guard
     )
     or
     exists(Case c1, Expr switchExpr |
@@ -540,16 +549,18 @@ module Make<LocationSig Location, InputSig<Location> Input> {
       Location getLocation();
     }
 
-    class SsaWriteDefinition extends SsaDefinition {
-      Expr getDefinition();
+    class SsaExplicitWrite extends SsaDefinition {
+      Expr getValue();
     }
 
-    class SsaPhiNode extends SsaDefinition {
+    class SsaPhiDefinition extends SsaDefinition {
       /** Holds if `inp` is an input to the phi node along the edge originating in `bb`. */
       predicate hasInputFromBlock(SsaDefinition inp, BasicBlock bb);
     }
 
-    predicate parameterDefinition(Parameter p, SsaDefinition def);
+    class SsaParameterInit extends SsaDefinition {
+      Parameter getParameter();
+    }
 
     /**
      * Holds if `guard` evaluating to `val` ensures that:
@@ -598,7 +609,7 @@ module Make<LocationSig Location, InputSig<Location> Input> {
      * logical inferences from `phi` to `guard` trivial and irrelevant.
      */
     private predicate guardControlsPhiBranch(
-      Guard guard, GuardValue v, SsaPhiNode phi, SsaDefinition inp
+      Guard guard, GuardValue v, SsaPhiDefinition phi, SsaDefinition inp
     ) {
       exists(BasicBlock bbPhi |
         phi.hasInputFromBlock(inp, _) and
@@ -619,10 +630,12 @@ module Make<LocationSig Location, InputSig<Location> Input> {
      *
      * This makes `phi` similar to the conditional `phi = guard==v ? input : ...`.
      */
-    private predicate guardDeterminesPhiInput(Guard guard, GuardValue v, SsaPhiNode phi, Expr input) {
-      exists(GuardValue dv, SsaWriteDefinition inp |
+    private predicate guardDeterminesPhiInput(
+      Guard guard, GuardValue v, SsaPhiDefinition phi, Expr input
+    ) {
+      exists(GuardValue dv, SsaExplicitWrite inp |
         guardControlsPhiBranch(guard, v, phi, inp) and
-        inp.getDefinition() = input and
+        inp.getValue() = input and
         dv = v.getDualValue() and
         forall(SsaDefinition other | phi.hasInputFromBlock(other, _) and other != inp |
           guardControlsPhiBranch(guard, dv, phi, other)
@@ -648,7 +661,7 @@ module Make<LocationSig Location, InputSig<Location> Input> {
       )
       or
       // An expression `x = ...` can be considered as a read of `x`.
-      guard.(IdExpr).getEqualChildExpr() = def.(SsaWriteDefinition).getDefinition()
+      guard.(IdExpr).getEqualChildExpr() = def.(SsaExplicitWrite).getValue()
     }
 
     private predicate valueStep(Expr e1, Expr e2) {
@@ -673,10 +686,10 @@ module Make<LocationSig Location, InputSig<Location> Input> {
      * through a back edge.
      */
     private SsaDefinition getAnUltimateDefinition(SsaDefinition v, boolean fromBackEdge) {
-      result = v and not v instanceof SsaPhiNode and fromBackEdge = false
+      result = v and not v instanceof SsaPhiDefinition and fromBackEdge = false
       or
       exists(SsaDefinition inp, BasicBlock bb, boolean fbe |
-        v.(SsaPhiNode).hasInputFromBlock(inp, bb) and
+        v.(SsaPhiDefinition).hasInputFromBlock(inp, bb) and
         result = getAnUltimateDefinition(inp, fbe) and
         (if v.getBasicBlock().dominates(bb) then fromBackEdge = true else fromBackEdge = fbe)
       )
@@ -687,9 +700,9 @@ module Make<LocationSig Location, InputSig<Location> Input> {
      */
     private predicate hasPossibleUnknownValue(SsaDefinition v) {
       exists(SsaDefinition def | def = getAnUltimateDefinition(v, _) |
-        not exists(def.(SsaWriteDefinition).getDefinition())
+        not exists(def.(SsaExplicitWrite).getValue())
         or
-        exists(Expr e | e = possibleValue(def.(SsaWriteDefinition).getDefinition()) |
+        exists(Expr e | e = possibleValue(def.(SsaExplicitWrite).getValue()) |
           not constantHasValue(e, _)
         )
       )
@@ -699,12 +712,15 @@ module Make<LocationSig Location, InputSig<Location> Input> {
      * Holds if `e` equals `k` and may be assigned to `v`. The boolean
      * `fromBackEdge` indicates whether the flow from `e` to `v` goes through a
      * back edge.
+     *
+     * This predicate is restricted to cases where all such possible values are
+     * constants, which means that the `GuardValue`s are singleton values.
      */
     private predicate possibleValue(SsaDefinition v, boolean fromBackEdge, Expr e, GuardValue k) {
       not hasPossibleUnknownValue(v) and
-      exists(SsaWriteDefinition def |
+      exists(SsaExplicitWrite def |
         def = getAnUltimateDefinition(v, fromBackEdge) and
-        e = possibleValue(def.getDefinition()) and
+        e = possibleValue(def.getValue()) and
         constantHasValue(e, k)
       )
     }
@@ -712,64 +728,49 @@ module Make<LocationSig Location, InputSig<Location> Input> {
     /**
      * Holds if `e` equals `k` and may be assigned to `v` without going through
      * back edges, and all other possible ultimate definitions of `v` are different
-     * from `k`. The trivial case where `v` is an `SsaWriteDefinition` with `e` as
+     * from `k`. The trivial case where `v` is an `SsaExplicitWrite` with `e` as
      * the only possible value is excluded.
      */
     private predicate uniqueValue(SsaDefinition v, Expr e, GuardValue k) {
       possibleValue(v, false, e, k) and
       not possibleValue(v, true, e, k) and
-      forex(Expr other, GuardValue otherval | possibleValue(v, _, other, otherval) and other != e |
-        disjointValues(otherval, k)
-      )
+      // there's only one expression with the value `k`
+      1 = strictcount(Expr e0 | possibleValue(v, _, e0, k)) and
+      // and `v` has at least two possible values
+      2 <= strictcount(GuardValue k0 | possibleValue(v, _, _, k0))
     }
 
     /**
      * Holds if `phi` has exactly two inputs, `def1` and `e2`, and that `def1`
      * does not come from a back-edge into `phi`.
      */
-    private predicate phiWithTwoInputs(SsaPhiNode phi, SsaDefinition def1, Expr e2) {
-      exists(SsaWriteDefinition def2, BasicBlock bb1 |
+    private predicate phiWithTwoInputs(SsaPhiDefinition phi, SsaDefinition def1, Expr e2) {
+      exists(SsaExplicitWrite def2, BasicBlock bb1 |
         2 = strictcount(SsaDefinition inp, BasicBlock bb | phi.hasInputFromBlock(inp, bb)) and
         phi.hasInputFromBlock(def1, bb1) and
         phi.hasInputFromBlock(def2, _) and
         def1 != def2 and
         not phi.getBasicBlock().dominates(bb1) and
-        def2.getDefinition() = e2
-      )
-    }
-
-    /** Holds if `e` may take the value `k` */
-    private predicate relevantInt(Expr e, int k) {
-      e.(ConstantExpr).asIntegerValue() = k
-      or
-      relevantInt(any(Expr e1 | valueStep(e1, e)), k)
-      or
-      exists(SsaDefinition def |
-        guardReadsSsaVar(e, def) and
-        relevantInt(getAnUltimateDefinition(def, _).(SsaWriteDefinition).getDefinition(), k)
+        def2.getValue() = e2
       )
     }
 
     private predicate impliesStep1(Guard g1, GuardValue v1, Guard g2, GuardValue v2) {
       baseImpliesStep(g1, v1, g2, v2)
       or
-      exists(SsaDefinition def, Expr e |
+      exists(SsaDefinition def, Expr e, BasicBlock bb1 |
         // If `def = g2 ? v1 : ...` and all other assignments to `def` are different from
         // `v1` then a guard proving `def == v1` ensures that `g2` evaluates to `v2`.
         uniqueValue(def, e, v1) and
         guardReadsSsaVar(g1, def) and
         g2.directlyValueControls(e.getBasicBlock(), v2) and
-        not g2.directlyValueControls(g1.getBasicBlock(), v2)
+        bb1 = g1.getBasicBlock() and
+        not g2.directlyValueControls(bb1, v2)
       )
       or
-      exists(int k1, int k2, boolean upper |
-        rangeGuard(g1, v1, g2, k1, upper) and
-        relevantInt(g2, k2) and
-        v2 = TValue(TValueInt(k2), false)
-      |
-        upper = true and k1 < k2 // g2 <= k1 < k2  ==>  g2 != k2
-        or
-        upper = false and k1 > k2 // g2 >= k1 > k2  ==>  g2 != k2
+      exists(int k, boolean upper |
+        rangeGuard(g1, v1, g2, k, upper) and
+        v2 = TIntRange(k, upper)
       )
       or
       exists(boolean isNull |
@@ -791,6 +792,8 @@ module Make<LocationSig Location, InputSig<Location> Input> {
         baseSsaValueCheck(def, ssaVal, g0, v0)
       |
         impliesStep1(g, v, g0, v0)
+        or
+        additionalImpliesStep(g, v, g0, v0)
       )
     }
 
@@ -801,26 +804,33 @@ module Make<LocationSig Location, InputSig<Location> Input> {
       or
       exprHasValue(e.(IdExpr).getEqualChildExpr(), v)
       or
+      exists(ConditionalExpr cond | cond = e |
+        exprHasValue(cond.getThen(), v) and exprHasValue(cond.getElse(), v)
+      )
+      or
       exists(SsaDefinition def, Guard g, GuardValue gv |
         e = def.getARead() and
         g.directlyValueControls(e.getBasicBlock(), gv) and
         baseSsaValueCheck(def, v, g, gv)
       )
       or
-      exists(SsaWriteDefinition def |
-        exprHasValue(def.getDefinition(), v) and
+      exists(SsaExplicitWrite def |
+        exprHasValue(def.getValue(), v) and
         e = def.getARead()
       )
     }
 
     private predicate impliesStep2(Guard g1, GuardValue v1, Guard g2, GuardValue v2) {
-      impliesStep1(g1, v1, g2, v2)
-      or
-      exists(Expr nonnull |
-        exprHasValue(nonnull, v2) and
-        equalityTestSymmetric(g1, g2, nonnull, v1.asBooleanValue()) and
-        v2.isNonNullValue()
-      )
+      (
+        impliesStep1(g1, v1, g2, v2)
+        or
+        exists(Expr nonnull |
+          exprHasValue(nonnull, v2) and
+          equalityTestSymmetric(g1, g2, nonnull, v1.asBooleanValue()) and
+          v2.isNonNullValue()
+        )
+      ) and
+      not trivialHasValue(g2, v2) // disregard trivial guard
     }
 
     bindingset[g1, v1]
@@ -843,16 +853,16 @@ module Make<LocationSig Location, InputSig<Location> Input> {
         // g1 === ... ? e : g2
         g2 = getBranchExpr(cond, branch.booleanNot()) and
         v2 = v1 and
-        not exprHasValue(g2, v2) // disregard trivial guard
+        not trivialHasValue(g2, v2) // disregard trivial guard
       )
     }
 
     bindingset[def1, v1]
     pragma[inline_late]
     private predicate impliesStepSsaGuard(SsaDefinition def1, GuardValue v1, Guard g2, GuardValue v2) {
-      def1.(SsaWriteDefinition).getDefinition() = g2 and
+      def1.(SsaExplicitWrite).getValue() = g2 and
       v1 = v2 and
-      not exprHasValue(g2, v2) // disregard trivial guard
+      not trivialHasValue(g2, v2) // disregard trivial guard
       or
       exists(Expr e, GuardValue ev |
         guardDeterminesPhiInput(g2, v2.getDualValue(), def1, e) and
@@ -873,89 +883,85 @@ module Make<LocationSig Location, InputSig<Location> Input> {
 
     private signature predicate baseGuardValueSig(Guard guard, GuardValue v);
 
-    /**
-     * Calculates the transitive closure of all the guard implication steps
-     * starting from a given set of base cases.
-     */
     cached
-    private module ImpliesTC<baseGuardValueSig/2 baseGuardValue> {
+    private module Cached {
       /**
-       * Holds if `tgtGuard` evaluating to `tgtVal` implies that `guard`
-       * evaluates to `v`.
+       * Calculates the transitive closure of all the guard implication steps
+       * starting from a given set of base cases.
        */
-      pragma[nomagic]
       cached
-      predicate guardControls(Guard guard, GuardValue v, Guard tgtGuard, GuardValue tgtVal) {
-        baseGuardValue(tgtGuard, tgtVal) and
-        guard = tgtGuard and
-        v = tgtVal
-        or
-        exists(Guard g0, GuardValue v0 |
-          guardControls(g0, v0, tgtGuard, tgtVal) and
-          impliesStep2(g0, v0, guard, v)
-        )
-        or
-        exists(Guard g0, GuardValue v0 |
-          guardControls(g0, v0, tgtGuard, tgtVal) and
-          unboundImpliesStep(g0, v0, guard, v)
-        )
-        or
-        exists(SsaDefinition def0, GuardValue v0 |
-          ssaControls(def0, v0, tgtGuard, tgtVal) and
-          impliesStepSsaGuard(def0, v0, guard, v)
-        )
-        or
-        exists(Guard g0, GuardValue v0 |
-          guardControls(g0, v0, tgtGuard, tgtVal) and
-          WrapperGuard::wrapperImpliesStep(g0, v0, guard, v)
-        )
-        or
-        exists(Guard g0, GuardValue v0 |
-          guardControls(g0, v0, tgtGuard, tgtVal) and
-          additionalImpliesStep(g0, v0, guard, v)
-        )
+      module ImpliesTC<baseGuardValueSig/2 baseGuardValue> {
+        /**
+         * Holds if `tgtGuard` evaluating to `tgtVal` implies that `guard`
+         * evaluates to `v`.
+         */
+        pragma[nomagic]
+        cached
+        predicate guardControls(Guard guard, GuardValue v, Guard tgtGuard, GuardValue tgtVal) {
+          baseGuardValue(tgtGuard, tgtVal) and
+          guard = tgtGuard and
+          v = tgtVal
+          or
+          exists(Guard g0, GuardValue v0 |
+            guardControls(g0, v0, tgtGuard, tgtVal) and
+            impliesStep2(g0, v0, guard, v)
+          )
+          or
+          exists(Guard g0, GuardValue v0 |
+            guardControls(g0, v0, tgtGuard, tgtVal) and
+            unboundImpliesStep(g0, v0, guard, v)
+          )
+          or
+          exists(SsaDefinition def0, GuardValue v0 |
+            ssaControls(def0, v0, tgtGuard, tgtVal) and
+            impliesStepSsaGuard(def0, v0, guard, v)
+          )
+          or
+          exists(Guard g0, GuardValue v0 |
+            guardControls(g0, v0, tgtGuard, tgtVal) and
+            WrapperGuard::wrapperImpliesStep(g0, v0, guard, v)
+          )
+          or
+          exists(Guard g0, GuardValue v0 |
+            guardControls(g0, v0, tgtGuard, tgtVal) and
+            additionalImpliesStep(g0, v0, guard, v)
+          )
+        }
+
+        /**
+         * Holds if `tgtGuard` evaluating to `tgtVal` implies that `def`
+         * evaluates to `v`.
+         */
+        pragma[nomagic]
+        cached
+        predicate ssaControls(SsaDefinition def, GuardValue v, Guard tgtGuard, GuardValue tgtVal) {
+          exists(Guard g0 |
+            guardControls(g0, v, tgtGuard, tgtVal) and
+            guardReadsSsaVar(g0, def)
+          )
+          or
+          exists(SsaDefinition def0 |
+            ssaControls(def0, v, tgtGuard, tgtVal) and
+            impliesStepSsa(def0, v, def)
+          )
+        }
       }
 
       /**
-       * Holds if `tgtGuard` evaluating to `tgtVal` implies that `def`
-       * evaluates to `v`.
+       * Holds if `guard` evaluating to `v` implies that `e` is guaranteed to be
+       * null if `isNull` is true, and non-null if `isNull` is false.
        */
-      pragma[nomagic]
       cached
-      predicate ssaControls(SsaDefinition def, GuardValue v, Guard tgtGuard, GuardValue tgtVal) {
-        exists(Guard g0 |
-          guardControls(g0, v, tgtGuard, tgtVal) and
-          guardReadsSsaVar(g0, def)
-        )
-        or
-        exists(SsaDefinition def0 |
-          ssaControls(def0, v, tgtGuard, tgtVal) and
-          impliesStepSsa(def0, v, def)
-        )
+      predicate nullGuard(Guard guard, GuardValue v, Expr e, boolean isNull) {
+        impliesStep2(guard, v, e, any(GuardValue gv | gv.isNullness(isNull))) or
+        WrapperGuard::wrapperImpliesStep(guard, v, e, any(GuardValue gv | gv.isNullness(isNull))) or
+        additionalImpliesStep(guard, v, e, any(GuardValue gv | gv.isNullness(isNull)))
       }
     }
 
-    private predicate booleanGuard(Guard guard, GuardValue val) {
-      exists(guard) and exists(val.asBooleanValue())
-    }
+    private import Cached
 
-    private module BooleanImplies = ImpliesTC<booleanGuard/2>;
-
-    /** INTERNAL: Don't use. */
-    predicate boolImplies(Guard g1, GuardValue v1, Guard g2, GuardValue v2) {
-      BooleanImplies::guardControls(g2, v2, g1, v1) and
-      g2 != g1
-    }
-
-    /**
-     * Holds if `guard` evaluating to `v` implies that `e` is guaranteed to be
-     * null if `isNull` is true, and non-null if `isNull` is false.
-     */
-    predicate nullGuard(Guard guard, GuardValue v, Expr e, boolean isNull) {
-      impliesStep2(guard, v, e, any(GuardValue gv | gv.isNullness(isNull))) or
-      WrapperGuard::wrapperImpliesStep(guard, v, e, any(GuardValue gv | gv.isNullness(isNull))) or
-      additionalImpliesStep(guard, v, e, any(GuardValue gv | gv.isNullness(isNull)))
-    }
+    predicate nullGuard = Cached::nullGuard/4;
 
     private predicate hasAValueBranchEdge(Guard guard, GuardValue v) {
       guard.hasValueBranchEdge(_, _, v)
@@ -988,6 +994,7 @@ module Make<LocationSig Location, InputSig<Location> Input> {
      * Holds if `def` evaluating to `v` controls the basic block `bb`.
      * That is, execution of `bb` implies that `def` evaluated to `v`.
      */
+    pragma[nomagic]
     predicate ssaControls(SsaDefinition def, BasicBlock bb, GuardValue v) {
       exists(BasicBlock guard, BasicBlock succ |
         ssaControlsBranchEdge(def, guard, succ, v) and
@@ -1001,6 +1008,8 @@ module Make<LocationSig Location, InputSig<Location> Input> {
      * wrappers.
      */
     private module WrapperGuard {
+      private import codeql.util.DenseRank
+
       final private class FinalExpr = Expr;
 
       class ReturnExpr extends FinalExpr {
@@ -1012,21 +1021,58 @@ module Make<LocationSig Location, InputSig<Location> Input> {
         BasicBlock getBasicBlock() { result = super.getBasicBlock() }
       }
 
+      private module DenseRankInput implements DenseRankInputSig1 {
+        class C = NonOverridableMethod;
+
+        class Ranked = ReturnExpr;
+
+        int getRank(NonOverridableMethod m, ReturnExpr ret) {
+          m.getAReturnExpr() = ret and
+          result = ret.getLocation().getStartLine()
+        }
+      }
+
+      private module ReturnExprRank = DenseRank1<DenseRankInput>;
+
+      private predicate rankedReturnExpr = ReturnExprRank::denseRank/2;
+
+      private int maxRank(NonOverridableMethod m) {
+        result = max(int rnk | exists(rankedReturnExpr(m, rnk)))
+      }
+
       private predicate relevantCallValue(NonOverridableMethodCall call, GuardValue val) {
         BranchImplies::guardControls(call, val, _, _) or
         ReturnImplies::guardControls(call, val, _, _)
       }
 
-      predicate relevantReturnValue(NonOverridableMethod m, GuardValue val) {
+      /**
+       * Holds if a call to `m` having a return value of `retval` is reachable
+       * by a chain of implications.
+       */
+      predicate relevantReturnValue(NonOverridableMethod m, GuardValue retval) {
         exists(NonOverridableMethodCall call |
-          relevantCallValue(call, val) and
+          relevantCallValue(call, retval) and
           call.getMethod() = m and
-          not val instanceof TException
+          not retval instanceof TException
+        )
+      }
+
+      /**
+       * Holds if a call to `m` having a return value of `retval` is reachable
+       * by a chain of implications, and `ret` is a return expression in `m`
+       * that could possibly have the value `retval`.
+       */
+      predicate relevantReturnExprValue(NonOverridableMethod m, ReturnExpr ret, GuardValue retval) {
+        relevantReturnValue(m, retval) and
+        ret = m.getAReturnExpr() and
+        not exists(GuardValue notRetval |
+          exprHasValue(ret, notRetval) and
+          disjointValues(notRetval, retval)
         )
       }
 
       private predicate returnGuard(Guard guard, GuardValue val) {
-        relevantReturnValue(guard.(ReturnExpr).getMethod(), val)
+        relevantReturnExprValue(_, guard, val)
       }
 
       module ReturnImplies = ImpliesTC<returnGuard/2>;
@@ -1036,28 +1082,58 @@ module Make<LocationSig Location, InputSig<Location> Input> {
         guard.directlyValueControls(ret.getBasicBlock(), val)
       }
 
+      private predicate parameterControlsReturnExpr(
+        SsaParameterInit param, GuardValue val, ReturnExpr ret
+      ) {
+        exists(Guard g0, GuardValue v0 |
+          directlyControlsReturn(g0, v0, ret) and
+          BranchImplies::ssaControls(param, val, g0, v0)
+        )
+      }
+
       /**
        * Holds if `ret` is a return expression in a non-overridable method that
        * on a return value of `retval` allows the conclusion that the `ppos`th
        * parameter has the value `val`.
        */
       private predicate validReturnInCustomGuard(
-        ReturnExpr ret, ParameterPosition ppos, GuardValue retval, GuardValue val
+        ReturnExpr ret, int rnk, NonOverridableMethod m, ParameterPosition ppos, GuardValue retval,
+        GuardValue val
       ) {
-        exists(NonOverridableMethod m, SsaDefinition param |
-          m.getAReturnExpr() = ret and
-          parameterDefinition(m.getParameter(ppos), param)
+        exists(SsaParameterInit param |
+          ret = rankedReturnExpr(m, rnk) and
+          param.getParameter() = m.getParameter(ppos)
         |
-          exists(Guard g0, GuardValue v0 |
-            directlyControlsReturn(g0, v0, ret) and
-            BranchImplies::ssaControls(param, val, g0, v0) and
-            relevantReturnValue(m, retval)
-          )
+          parameterControlsReturnExpr(param, val, ret) and
+          relevantReturnExprValue(m, ret, retval)
           or
           ReturnImplies::ssaControls(param, val, ret, retval)
         )
       }
 
+      private predicate validReturnInCustomGuardToRank(
+        int rnk, NonOverridableMethod m, ParameterPosition ppos, GuardValue retval, GuardValue val
+      ) {
+        // The forall-range has been pushed all the way into
+        // `relevantReturnExprValue` and `validReturnInCustomGuard`. This means
+        // that this base case ensures that at least one return expression
+        // non-vacuously satisfies that it's a valid implication from return
+        // value to parameter value.
+        validReturnInCustomGuard(_, _, m, ppos, retval, val) and rnk = 0
+        or
+        validReturnInCustomGuardToRank(rnk - 1, m, ppos, retval, val) and
+        rnk <= maxRank(m) and
+        forall(ReturnExpr ret |
+          ret = rankedReturnExpr(m, rnk) and
+          not exists(GuardValue notRetval |
+            exprHasValue(ret, notRetval) and
+            disjointValues(notRetval, retval)
+          )
+        |
+          validReturnInCustomGuard(ret, rnk, m, ppos, retval, val)
+        )
+      }
+
       private predicate guardDirectlyControlsExit(Guard guard, GuardValue val) {
         exists(BasicBlock bb |
           guard.directlyValueControls(bb, val) and
@@ -1073,18 +1149,10 @@ module Make<LocationSig Location, InputSig<Location> Input> {
       private NonOverridableMethod wrapperGuard(
         ParameterPosition ppos, GuardValue retval, GuardValue val
       ) {
-        forex(ReturnExpr ret |
-          result.getAReturnExpr() = ret and
-          not exists(GuardValue notRetval |
-            exprHasValue(ret, notRetval) and
-            disjointValues(notRetval, retval)
-          )
-        |
-          validReturnInCustomGuard(ret, ppos, retval, val)
-        )
+        validReturnInCustomGuardToRank(maxRank(result), result, ppos, retval, val)
         or
-        exists(SsaDefinition param, Guard g0, GuardValue v0 |
-          parameterDefinition(result.getParameter(ppos), param) and
+        exists(SsaParameterInit param, Guard g0, GuardValue v0 |
+          param.getParameter() = result.getParameter(ppos) and
           guardDirectlyControlsExit(g0, v0) and
           retval = TException(false) and
           BranchImplies::ssaControls(param, val, g0, v0)
@@ -1105,7 +1173,7 @@ module Make<LocationSig Location, InputSig<Location> Input> {
           call.getMethod() = wrapperGuard(ppos, v1, v2) and
           call.getArgument(apos) = g2 and
           parameterMatch(pragma[only_bind_out](ppos), pragma[only_bind_out](apos)) and
-          not exprHasValue(g2, v2) // disregard trivial guard
+          not trivialHasValue(g2, v2) // disregard trivial guard
         )
       }
     }
@@ -1130,10 +1198,10 @@ module Make<LocationSig Location, InputSig<Location> Input> {
       private module StatefulWrapper = ValidationWrapperWithState<Unit, guardChecksWithState/4>;
 
       /**
-       * Holds if the guard `g` validates the expression `e` upon evaluating to `val`.
+       * Holds if the guard `g` validates the SSA definition `def` upon evaluating to `val`.
        */
-      predicate guardChecks(Guard g, Expr e, GuardValue val) {
-        StatefulWrapper::guardChecks(g, e, val, _)
+      predicate guardChecksDef(Guard g, SsaDefinition def, GuardValue val) {
+        StatefulWrapper::guardChecksDef(g, def, val, _)
       }
     }
 
@@ -1153,13 +1221,13 @@ module Make<LocationSig Location, InputSig<Location> Input> {
       private predicate validReturnInValidationWrapper(
         ReturnExpr ret, ParameterPosition ppos, GuardValue retval, State state
       ) {
-        exists(NonOverridableMethod m, SsaDefinition param, Guard guard, GuardValue val |
+        exists(NonOverridableMethod m, SsaParameterInit param, Guard guard, GuardValue val |
           m.getAReturnExpr() = ret and
-          parameterDefinition(m.getParameter(ppos), param) and
-          guardChecks(guard, param.getARead(), val, state)
+          param.getParameter() = m.getParameter(ppos) and
+          guardChecksDef(guard, param, val, state)
         |
           guard.valueControls(ret.getBasicBlock(), val) and
-          relevantReturnValue(m, retval)
+          relevantReturnExprValue(m, ret, retval)
           or
           ReturnImplies::guardControls(guard, val, ret, retval)
         )
@@ -1183,9 +1251,9 @@ module Make<LocationSig Location, InputSig<Location> Input> {
           validReturnInValidationWrapper(ret, ppos, retval, state)
         )
         or
-        exists(SsaDefinition param, BasicBlock bb, Guard guard, GuardValue val |
-          parameterDefinition(result.getParameter(ppos), param) and
-          guardChecks(guard, param.getARead(), val, state) and
+        exists(SsaParameterInit param, BasicBlock bb, Guard guard, GuardValue val |
+          param.getParameter() = result.getParameter(ppos) and
+          guardChecksDef(guard, param, val, state) and
           guard.valueControls(bb, val) and
           normalExitBlock(bb) and
           retval = TException(false)
@@ -1195,7 +1263,7 @@ module Make<LocationSig Location, InputSig<Location> Input> {
       /**
        * Holds if the guard `g` validates the expression `e` upon evaluating to `val`.
        */
-      predicate guardChecks(Guard g, Expr e, GuardValue val, State state) {
+      private predicate guardChecks(Guard g, Expr e, GuardValue val, State state) {
         guardChecks0(g, e, val.asBooleanValue(), state)
         or
         exists(NonOverridableMethodCall call, ParameterPosition ppos, ArgumentPosition apos |
@@ -1205,6 +1273,16 @@ module Make<LocationSig Location, InputSig<Location> Input> {
           parameterMatch(pragma[only_bind_out](ppos), pragma[only_bind_out](apos))
         )
       }
+
+      /**
+       * Holds if the guard `g` validates the SSA definition `def` upon evaluating to `val`.
+       */
+      predicate guardChecksDef(Guard g, SsaDefinition def, GuardValue val, State state) {
+        exists(Expr e |
+          guardChecks(g, e, val, state) and
+          guardReadsSsaVar(e, def)
+        )
+      }
     }
 
     /**
@@ -1264,5 +1342,16 @@ module Make<LocationSig Location, InputSig<Location> Input> {
         this.valueControls(bb, any(GuardValue gv | gv.asBooleanValue() = branch))
       }
     }
+
+    private predicate exprHasValueAlias = exprHasValue/2;
+
+    private predicate disjointValuesAlias = disjointValues/2;
+
+    /** Provides utility predicates for working with `GuardValue`s. */
+    module InternalUtil {
+      predicate exprHasValue = exprHasValueAlias/2;
+
+      predicate disjointValues = disjointValuesAlias/2;
+    }
   }
 }
diff --git a/shared/controlflow/codeql/controlflow/SuccessorType.qll b/shared/controlflow/codeql/controlflow/SuccessorType.qll
new file mode 100644
index 00000000000..cc673c9e5ca
--- /dev/null
+++ b/shared/controlflow/codeql/controlflow/SuccessorType.qll
@@ -0,0 +1,343 @@
+/**
+ * Provides different types of control flow successor types. These are used as
+ * edge labels in the control flow graph.
+ *
+ * ```text
+ * SuccessorType
+ *  |- NormalSuccessor
+ *  |   |- DirectSuccessor
+ *  |   \- ConditionalSuccessor
+ *  |       |- BooleanSuccessor
+ *  |       |- NullnessSuccessor
+ *  |       |- MatchingSuccessor
+ *  |       \- EmptinessSuccessor
+ *  \- AbruptSuccessor
+ *      |- ExceptionSuccessor
+ *      |- ReturnSuccessor
+ *      |- ExitSuccessor (program termination)
+ *      \- JumpSuccessor
+ *          |- BreakSuccessor
+ *          |- ContinueSuccessor
+ *          |- GotoSuccessor
+ *          |- RedoSuccessor // rare, used in Ruby
+ *          \- RetrySuccessor // rare, used in Ruby
+ * ```
+ */
+overlay[local]
+module;
+
+private import codeql.util.Boolean
+
+private newtype TSuccessorType =
+  TDirectSuccessor() or
+  TBooleanSuccessor(Boolean branch) or
+  TNullnessSuccessor(Boolean isNull) or
+  TMatchingSuccessor(Boolean isMatch) or
+  TEmptinessSuccessor(Boolean isEmpty) or
+  TExceptionSuccessor() or
+  TReturnSuccessor() or
+  TExitSuccessor() or
+  TBreakSuccessor() or
+  TContinueSuccessor() or
+  TGotoSuccessor() or
+  TRedoSuccessor() or
+  TRetrySuccessor()
+
+/**
+ * The type of a control flow successor.
+ *
+ * A successor is either normal, which covers direct and conditional
+ * successors, or abrupt, which covers all other types of successors including
+ * for example exceptions, returns, and other jumps.
+ */
+private class SuccessorTypeImpl extends TSuccessorType {
+  /** Gets a textual representation of this successor type. */
+  abstract string toString();
+}
+
+final class SuccessorType = SuccessorTypeImpl;
+
+private class TNormalSuccessor = TDirectSuccessor or TConditionalSuccessor;
+
+/**
+ * A normal control flow successor. This is either a direct or a conditional
+ * successor.
+ */
+abstract private class NormalSuccessorImpl extends SuccessorTypeImpl, TNormalSuccessor { }
+
+final class NormalSuccessor = NormalSuccessorImpl;
+
+/** A direct control flow successor. */
+class DirectSuccessor extends NormalSuccessorImpl, TDirectSuccessor {
+  override string toString() { result = "successor" }
+}
+
+private class TConditionalSuccessor =
+  TBooleanSuccessor or TMatchingSuccessor or TNullnessSuccessor or TEmptinessSuccessor;
+
+/**
+ * A conditional control flow successor. Either a Boolean successor (`BooleanSuccessor`),
+ * a nullness successor (`NullnessSuccessor`), a matching successor (`MatchingSuccessor`),
+ * or an emptiness successor (`EmptinessSuccessor`).
+ */
+abstract private class ConditionalSuccessorImpl extends NormalSuccessorImpl, TConditionalSuccessor {
+  /** Gets the Boolean value of this successor. */
+  abstract boolean getValue();
+}
+
+final class ConditionalSuccessor = ConditionalSuccessorImpl;
+
+/**
+ * A Boolean control flow successor.
+ *
+ * For example, this program fragment:
+ *
+ * ```csharp
+ * if (x < 0)
+ *     return 0;
+ * else
+ *     return 1;
+ * ```
+ *
+ * has a control flow graph containing Boolean successors:
+ *
+ * ```text
+ *        if
+ *        |
+ *      x < 0
+ *       / \
+ *      /   \
+ *     /     \
+ *  true    false
+ *    |        \
+ * return 0   return 1
+ * ```
+ */
+class BooleanSuccessor extends ConditionalSuccessorImpl, TBooleanSuccessor {
+  override boolean getValue() { this = TBooleanSuccessor(result) }
+
+  override string toString() { result = this.getValue().toString() }
+}
+
+/**
+ * A nullness control flow successor.
+ *
+ * For example, this program fragment:
+ *
+ * ```csharp
+ * int? M(string s) => s?.Length;
+ * ```
+ *
+ * has a control flow graph containing nullness successors:
+ *
+ * ```text
+ *      enter M
+ *        |
+ *        s
+ *       / \
+ *      /   \
+ *     /     \
+ *  null   non-null
+ *     \      |
+ *      \   Length
+ *       \   /
+ *        \ /
+ *      exit M
+ * ```
+ */
+class NullnessSuccessor extends ConditionalSuccessorImpl, TNullnessSuccessor {
+  /** Holds if this is a `null` successor. */
+  predicate isNull() { this = TNullnessSuccessor(true) }
+
+  override boolean getValue() { this = TNullnessSuccessor(result) }
+
+  override string toString() { if this.isNull() then result = "null" else result = "non-null" }
+}
+
+/**
+ * A matching control flow successor.
+ *
+ * For example, this program fragment:
+ *
+ * ```csharp
+ * switch (x) {
+ *     case 0 :
+ *         return 0;
+ *     default :
+ *         return 1;
+ * }
+ * ```
+ *
+ * has a control flow graph containing matching successors:
+ *
+ * ```text
+ *      switch
+ *        |
+ *        x
+ *        |
+ *      case 0
+ *       / \
+ *      /   \
+ *     /     \
+ *  match   no-match
+ *    |        \
+ * return 0   default
+ *              |
+ *           return 1
+ * ```
+ */
+class MatchingSuccessor extends ConditionalSuccessorImpl, TMatchingSuccessor {
+  /** Holds if this is a match successor. */
+  predicate isMatch() { this = TMatchingSuccessor(true) }
+
+  override boolean getValue() { this = TMatchingSuccessor(result) }
+
+  override string toString() { if this.isMatch() then result = "match" else result = "no-match" }
+}
+
+/**
+ * An emptiness control flow successor.
+ *
+ * For example, this program fragment:
+ *
+ * ```csharp
+ * foreach (var arg in args)
+ * {
+ *     yield return arg;
+ * }
+ * yield return "";
+ * ```
+ *
+ * has a control flow graph containing emptiness successors:
+ *
+ * ```text
+ *           args
+ *            |
+ *        loop-header------<-----
+ *           / \                 \
+ *          /   \                |
+ *         /     \               |
+ *        /       \              |
+ *     empty    non-empty        |
+ *       |          \            |
+ * yield return ""   \           |
+ *                 var arg       |
+ *                    |          |
+ *             yield return arg  |
+ *                     \_________/
+ * ```
+ */
+class EmptinessSuccessor extends ConditionalSuccessorImpl, TEmptinessSuccessor {
+  /** Holds if this is an empty successor. */
+  predicate isEmpty() { this = TEmptinessSuccessor(true) }
+
+  override boolean getValue() { this = TEmptinessSuccessor(result) }
+
+  override string toString() { if this.isEmpty() then result = "empty" else result = "non-empty" }
+}
+
+private class TAbruptSuccessor =
+  TExceptionSuccessor or TReturnSuccessor or TExitSuccessor or TJumpSuccessor;
+
+/** An abrupt control flow successor. */
+abstract private class AbruptSuccessorImpl extends SuccessorTypeImpl, TAbruptSuccessor { }
+
+final class AbruptSuccessor = AbruptSuccessorImpl;
+
+/**
+ * An exceptional control flow successor.
+ *
+ * Example:
+ *
+ * ```csharp
+ * int M(string s)
+ * {
+ *     if (s == null)
+ *         throw new ArgumentNullException(nameof(s));
+ *     return s.Length;
+ * }
+ * ```
+ *
+ * The callable exit node of `M` is an exceptional successor of the node
+ * `throw new ArgumentNullException(nameof(s));`.
+ */
+class ExceptionSuccessor extends AbruptSuccessorImpl, TExceptionSuccessor {
+  override string toString() { result = "exception" }
+}
+
+/**
+ * A `return` control flow successor.
+ *
+ * Example:
+ *
+ * ```csharp
+ * void M()
+ * {
+ *     return;
+ * }
+ * ```
+ *
+ * The callable exit node of `M` is a `return` successor of the `return;`
+ * statement.
+ */
+class ReturnSuccessor extends AbruptSuccessorImpl, TReturnSuccessor {
+  override string toString() { result = "return" }
+}
+
+/**
+ * An exit control flow successor.
+ *
+ * Example:
+ *
+ * ```csharp
+ * int M(string s)
+ * {
+ *     if (s == null)
+ *         System.Environment.Exit(0);
+ *     return s.Length;
+ * }
+ * ```
+ *
+ * The callable exit node of `M` is an exit successor of the node on line 4.
+ */
+class ExitSuccessor extends AbruptSuccessorImpl, TExitSuccessor {
+  override string toString() { result = "exit" }
+}
+
+private class TJumpSuccessor =
+  TBreakSuccessor or TContinueSuccessor or TGotoSuccessor or TRedoSuccessor or TRetrySuccessor;
+
+/**
+ * A jump control flow successor.
+ *
+ * This covers non-exceptional, non-local control flow, such as `break`,
+ * `continue`, and `goto`.
+ */
+abstract private class JumpSuccessorImpl extends AbruptSuccessorImpl, TJumpSuccessor { }
+
+final class JumpSuccessor = JumpSuccessorImpl;
+
+/** A `break` control flow successor. */
+class BreakSuccessor extends JumpSuccessorImpl, TBreakSuccessor {
+  override string toString() { result = "break" }
+}
+
+/** A `continue` control flow successor. */
+class ContinueSuccessor extends JumpSuccessorImpl, TContinueSuccessor {
+  override string toString() { result = "continue" }
+}
+
+/** A `goto` control flow successor. */
+class GotoSuccessor extends JumpSuccessorImpl, TGotoSuccessor {
+  override string toString() { result = "goto" }
+}
+
+/** A `redo` control flow successor (rare, used in Ruby). */
+class RedoSuccessor extends JumpSuccessorImpl, TRedoSuccessor {
+  override string toString() { result = "redo" }
+}
+
+/** A `retry` control flow successor (rare, used in Ruby). */
+class RetrySuccessor extends JumpSuccessorImpl, TRetrySuccessor {
+  override string toString() { result = "retry" }
+}
diff --git a/shared/controlflow/codeql/controlflow/queries/ConstantCondition.qll b/shared/controlflow/codeql/controlflow/queries/ConstantCondition.qll
new file mode 100644
index 00000000000..d05f2df6eff
--- /dev/null
+++ b/shared/controlflow/codeql/controlflow/queries/ConstantCondition.qll
@@ -0,0 +1,111 @@
+/**
+ * Provides a query for detecting constant conditions.
+ */
+overlay[local?]
+module;
+
+private import codeql.controlflow.BasicBlock as BB
+private import codeql.util.Location
+
+private signature class TypSig;
+
+signature module InputSig<TypSig BasicBlock> {
+  class SsaDefinition;
+
+  /** An abstract value that a `Guard` may evaluate to. */
+  class GuardValue {
+    /** Gets a textual representation of this value. */
+    string toString();
+
+    /**
+     * Gets the dual value. Examples of dual values include:
+     * - null vs. not null
+     * - true vs. false
+     * - evaluating to a specific value vs. evaluating to any other value
+     * - throwing an exception vs. not throwing an exception
+     */
+    GuardValue getDualValue();
+
+    /** Holds if this value represents throwing an exception. */
+    predicate isThrowsException();
+  }
+
+  /**
+   * A guard. This may be any expression whose value determines subsequent
+   * control flow. It may also be a switch case, which as a guard is considered
+   * to evaluate to either true or false depending on whether the case matches.
+   */
+  class Guard {
+    /** Gets a textual representation of this guard. */
+    string toString();
+
+    /**
+     * Holds if this guard evaluating to `v` corresponds to taking the edge
+     * from `bb1` to `bb2`. For ordinary conditional branching this guard is
+     * the last node in `bb1`, but for switch case matching it is the switch
+     * expression, which may either be in `bb1` or an earlier basic block.
+     */
+    predicate hasValueBranchEdge(BasicBlock bb1, BasicBlock bb2, GuardValue v);
+  }
+
+  /**
+   * Holds if `def` evaluating to `v` controls the control-flow branch
+   * edge from `bb1` to `bb2`. That is, following the edge from `bb1` to
+   * `bb2` implies that `def` evaluated to `v`.
+   */
+  predicate ssaControlsBranchEdge(SsaDefinition def, BasicBlock bb1, BasicBlock bb2, GuardValue v);
+
+  /**
+   * Holds if `def` evaluating to `v` controls the basic block `bb`.
+   * That is, execution of `bb` implies that `def` evaluated to `v`.
+   */
+  predicate ssaControls(SsaDefinition def, BasicBlock bb, GuardValue v);
+
+  bindingset[gv1, gv2]
+  predicate disjointValues(GuardValue gv1, GuardValue gv2);
+}
+
+module Make<LocationSig Location, BB::CfgSig<Location> Cfg, InputSig<Cfg::BasicBlock> Input> {
+  private import Cfg
+  private import Input
+
+  private predicate ssaControlsGuardEdge(
+    SsaDefinition def, GuardValue v, Guard g, BasicBlock bb1, BasicBlock bb2, GuardValue gv
+  ) {
+    g.hasValueBranchEdge(bb1, bb2, gv) and
+    ssaControlsBranchEdge(def, bb1, bb2, v)
+  }
+
+  /** Holds if `g` cannot have value `gv` in `bb` due to `def` controlling `bb` with value `v2`. */
+  pragma[nomagic]
+  private predicate impossibleValue(
+    Guard g, GuardValue gv, SsaDefinition def, BasicBlock bb, GuardValue v2
+  ) {
+    exists(GuardValue dual, GuardValue v1 |
+      // If `g` in `bb` evaluates to `gv` then `def` has value `v1`,
+      ssaControlsGuardEdge(def, v1, g, bb, _, gv) and
+      dual = gv.getDualValue() and
+      not gv.isThrowsException() and
+      not dual.isThrowsException() and
+      // but `def` controls `bb` with value `v2` via some guard,
+      ssaControls(def, bb, v2) and
+      // and `v1` and `v2` are disjoint so `g` cannot be `gv`.
+      disjointValues(v1, v2)
+    )
+  }
+
+  query predicate problems(Guard g, string msg, Guard reason, string reasonMsg) {
+    exists(
+      BasicBlock bb, GuardValue gv, SsaDefinition def, GuardValue v2, BasicBlock bb1, BasicBlock bb2
+    |
+      // `g` cannot have value `gv` in `bb` due to `def` controlling `bb` with value `v2`,
+      impossibleValue(g, gv, def, bb, v2) and
+      // and this is because of `reason` taking the branch `bb1` to `bb2`,
+      ssaControlsGuardEdge(def, v2, reason, bb1, bb2, _) and
+      dominatingEdge(bb1, bb2) and
+      bb2.dominates(bb) and
+      msg = "Condition is always " + gv.getDualValue() + " because of $@." and
+      reasonMsg = reason.toString()
+    )
+  }
+}
diff --git a/shared/controlflow/qlpack.yml b/shared/controlflow/qlpack.yml
index 9daf1b8e60e..fdf7de8e6a7 100644
--- a/shared/controlflow/qlpack.yml
+++ b/shared/controlflow/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/controlflow
-version: 2.0.13-dev
+version: 2.0.19-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/dataflow/CHANGELOG.md b/shared/dataflow/CHANGELOG.md
index 2e77e1a942d..f963117ea88 100644
--- a/shared/dataflow/CHANGELOG.md
+++ b/shared/dataflow/CHANGELOG.md
@@ -1,3 +1,27 @@
+## 2.0.18
+
+No user-facing changes.
+
+## 2.0.17
+
+No user-facing changes.
+
+## 2.0.16
+
+No user-facing changes.
+
+## 2.0.15
+
+No user-facing changes.
+
+## 2.0.14
+
+No user-facing changes.
+
+## 2.0.13
+
+No user-facing changes.
+
 ## 2.0.12
 
 No user-facing changes.
diff --git a/shared/dataflow/change-notes/released/2.0.13.md b/shared/dataflow/change-notes/released/2.0.13.md
new file mode 100644
index 00000000000..39a24682b50
--- /dev/null
+++ b/shared/dataflow/change-notes/released/2.0.13.md
@@ -0,0 +1,3 @@
+## 2.0.13
+
+No user-facing changes.
diff --git a/shared/dataflow/change-notes/released/2.0.14.md b/shared/dataflow/change-notes/released/2.0.14.md
new file mode 100644
index 00000000000..13190ad53e3
--- /dev/null
+++ b/shared/dataflow/change-notes/released/2.0.14.md
@@ -0,0 +1,3 @@
+## 2.0.14
+
+No user-facing changes.
diff --git a/shared/dataflow/change-notes/released/2.0.15.md b/shared/dataflow/change-notes/released/2.0.15.md
new file mode 100644
index 00000000000..3b59db4224a
--- /dev/null
+++ b/shared/dataflow/change-notes/released/2.0.15.md
@@ -0,0 +1,3 @@
+## 2.0.15
+
+No user-facing changes.
diff --git a/shared/dataflow/change-notes/released/2.0.16.md b/shared/dataflow/change-notes/released/2.0.16.md
new file mode 100644
index 00000000000..221400d393f
--- /dev/null
+++ b/shared/dataflow/change-notes/released/2.0.16.md
@@ -0,0 +1,3 @@
+## 2.0.16
+
+No user-facing changes.
diff --git a/shared/dataflow/change-notes/released/2.0.17.md b/shared/dataflow/change-notes/released/2.0.17.md
new file mode 100644
index 00000000000..0ed1592726c
--- /dev/null
+++ b/shared/dataflow/change-notes/released/2.0.17.md
@@ -0,0 +1,3 @@
+## 2.0.17
+
+No user-facing changes.
diff --git a/shared/dataflow/change-notes/released/2.0.18.md b/shared/dataflow/change-notes/released/2.0.18.md
new file mode 100644
index 00000000000..11e398dac31
--- /dev/null
+++ b/shared/dataflow/change-notes/released/2.0.18.md
@@ -0,0 +1,3 @@
+## 2.0.18
+
+No user-facing changes.
diff --git a/shared/dataflow/codeql-pack.release.yml b/shared/dataflow/codeql-pack.release.yml
index b856d9a13f2..16342205c73 100644
--- a/shared/dataflow/codeql-pack.release.yml
+++ b/shared/dataflow/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.0.12
+lastReleaseVersion: 2.0.18
diff --git a/shared/dataflow/codeql/dataflow/DataFlow.qll b/shared/dataflow/codeql/dataflow/DataFlow.qll
index 3483287e3b3..7f9c0194374 100644
--- a/shared/dataflow/codeql/dataflow/DataFlow.qll
+++ b/shared/dataflow/codeql/dataflow/DataFlow.qll
@@ -349,6 +349,18 @@ signature module InputSig<LocationSig Location> {
 
   /** Holds if `fieldFlowBranchLimit` should be ignored for flow going into/out of `c`. */
   default predicate ignoreFieldFlowBranchLimit(DataFlowCallable c) { none() }
+
+  /**
+   * Holds if the evaluator is currently evaluating with an overlay. The
+   * implementation of this predicate needs to be `overlay[local]`. For a
+   * language with no overlay support, `none()` is a valid implementation.
+   *
+   * When called from a local predicate, this predicate holds if we are in the
+   * overlay-only local evaluation. When called from a global predicate, this
+   * predicate holds if we are evaluating globally with overlay and base both
+   * visible.
+   */
+  default predicate isEvaluatingInOverlay() { none() }
 }
 
 module Configs<LocationSig Location, InputSig<Location> Lang> {
@@ -454,8 +466,10 @@ module Configs<LocationSig Location, InputSig<Location> Lang> {
      * `observeDiffInformedIncrementalMode`). By default, this is the location
      * of the source itself, but this predicate should include any locations
      * that are reported as the primary-location of the query or as an
-     * additional location ("$@" interpolation). For a query that doesn't
-     * report the source at all, this predicate can be `none()`.
+     * additional location ("$@" interpolation). Queries with `@kind path-problem`
+     * that override this predicate should also return the location of the source
+     * itself. For a query that doesn't report the source at all, this predicate
+     * should be `none()`.
      */
     default Location getASelectedSourceLocation(Node source) { result = source.getLocation() }
 
@@ -465,8 +479,10 @@ module Configs<LocationSig Location, InputSig<Location> Lang> {
      * `observeDiffInformedIncrementalMode`). By default, this is the location
      * of the sink itself, but this predicate should include any locations
      * that are reported as the primary-location of the query or as an
-     * additional location ("$@" interpolation). For a query that doesn't
-     * report the sink at all, this predicate can be `none()`.
+     * additional location ("$@" interpolation). Queries with `@kind path-problem`
+     * that override this predicate should also return the location of the sink
+     * itself. For a query that doesn't report the sink at all, this predicate
+     * should be `none()`.
      */
     default Location getASelectedSinkLocation(Node sink) { result = sink.getLocation() }
   }
@@ -603,8 +619,10 @@ module Configs<LocationSig Location, InputSig<Location> Lang> {
      * `observeDiffInformedIncrementalMode`). By default, this is the location
      * of the source itself, but this predicate should include any locations
      * that are reported as the primary-location of the query or as an
-     * additional location ("$@" interpolation). For a query that doesn't
-     * report the source at all, this predicate can be `none()`.
+     * additional location ("$@" interpolation). Queries with `@kind path-problem`
+     * that override this predicate should also return the location of the source
+     * itself. For a query that doesn't report the source at all, this predicate
+     * should be `none()`.
      */
     default Location getASelectedSourceLocation(Node source) { result = source.getLocation() }
 
@@ -614,8 +632,10 @@ module Configs<LocationSig Location, InputSig<Location> Lang> {
      * `observeDiffInformedIncrementalMode`). By default, this is the location
      * of the sink itself, but this predicate should include any locations
      * that are reported as the primary-location of the query or as an
-     * additional location ("$@" interpolation). For a query that doesn't
-     * report the sink at all, this predicate can be `none()`.
+     * additional location ("$@" interpolation). Queries with `@kind path-problem`
+     * that override this predicate should also return the location of the sink
+     * itself. For a query that doesn't report the sink at all, this predicate
+     * should be `none()`.
      */
     default Location getASelectedSinkLocation(Node sink) { result = sink.getLocation() }
   }
@@ -645,10 +665,8 @@ private module PathGraphSigMod {
   }
 }
 
-module DataFlowMake<LocationSig Location, InputSig<Location> Lang> {
+private module DataFlowMakeCore<LocationSig Location, InputSig<Location> Lang> {
   private import Lang
-  private import internal.DataFlowImpl::MakeImpl<Location, Lang>
-  private import internal.DataFlowImplStage1::MakeImplStage1<Location, Lang>
   import Configs<Location, Lang>
 
   /**
@@ -691,59 +709,6 @@ module DataFlowMake<LocationSig Location, InputSig<Location> Lang> {
     predicate flowToExpr(DataFlowExpr sink);
   }
 
-  /**
-   * Constructs a global data flow computation.
-   */
-  module Global<ConfigSig Config> implements GlobalFlowSig {
-    private module C implements FullStateConfigSig {
-      import DefaultState<Config>
-      import Config
-
-      predicate accessPathLimit = Config::accessPathLimit/0;
-
-      predicate isAdditionalFlowStep(Node node1, Node node2, string model) {
-        Config::isAdditionalFlowStep(node1, node2) and model = "Config"
-      }
-    }
-
-    private module Stage1 = ImplStage1<C>;
-
-    import Stage1::PartialFlow
-
-    private module Flow = Impl<C, Stage1::Stage1NoState>;
-
-    import Flow
-  }
-
-  /**
-   * Constructs a global data flow computation using flow state.
-   */
-  module GlobalWithState<StateConfigSig Config> implements GlobalFlowSig {
-    private module C implements FullStateConfigSig {
-      import Config
-
-      predicate accessPathLimit = Config::accessPathLimit/0;
-
-      predicate isAdditionalFlowStep(Node node1, Node node2, string model) {
-        Config::isAdditionalFlowStep(node1, node2) and model = "Config"
-      }
-
-      predicate isAdditionalFlowStep(
-        Node node1, FlowState state1, Node node2, FlowState state2, string model
-      ) {
-        Config::isAdditionalFlowStep(node1, state1, node2, state2) and model = "Config"
-      }
-    }
-
-    private module Stage1 = ImplStage1<C>;
-
-    import Stage1::PartialFlow
-
-    private module Flow = Impl<C, Stage1::Stage1WithState>;
-
-    import Flow
-  }
-
   signature class PathNodeSig {
     /** Gets a textual representation of this element. */
     string toString();
@@ -1141,3 +1106,135 @@ module DataFlowMake<LocationSig Location, InputSig<Location> Lang> {
     import PathGraph
   }
 }
+
+module DataFlowMake<LocationSig Location, InputSig<Location> Lang> {
+  import DataFlowMakeCore<Location, Lang>
+  private import Lang
+  private import internal.DataFlowImpl::MakeImpl<Location, Lang>
+  private import internal.DataFlowImplStage1::MakeImplStage1<Location, Lang>
+
+  /**
+   * Constructs a global data flow computation.
+   */
+  module Global<ConfigSig Config> implements GlobalFlowSig {
+    private module C implements FullStateConfigSig {
+      import DefaultState<Config>
+      import Config
+
+      predicate accessPathLimit = Config::accessPathLimit/0;
+
+      predicate isAdditionalFlowStep(Node node1, Node node2, string model) {
+        Config::isAdditionalFlowStep(node1, node2) and model = "Config"
+      }
+
+      predicate observeOverlayInformedIncrementalMode() { none() }
+    }
+
+    private module Stage1 = ImplStage1<C>;
+
+    import Stage1::PartialFlow
+
+    private module Flow = Impl<C, Stage1::Stage1NoState>;
+
+    import Flow
+  }
+
+  /**
+   * Constructs a global data flow computation using flow state.
+   */
+  module GlobalWithState<StateConfigSig Config> implements GlobalFlowSig {
+    private module C implements FullStateConfigSig {
+      import Config
+
+      predicate accessPathLimit = Config::accessPathLimit/0;
+
+      predicate isAdditionalFlowStep(Node node1, Node node2, string model) {
+        Config::isAdditionalFlowStep(node1, node2) and model = "Config"
+      }
+
+      predicate isAdditionalFlowStep(
+        Node node1, FlowState state1, Node node2, FlowState state2, string model
+      ) {
+        Config::isAdditionalFlowStep(node1, state1, node2, state2) and model = "Config"
+      }
+
+      predicate observeOverlayInformedIncrementalMode() { none() }
+    }
+
+    private module Stage1 = ImplStage1<C>;
+
+    import Stage1::PartialFlow
+
+    private module Flow = Impl<C, Stage1::Stage1WithState>;
+
+    import Flow
+  }
+}
+
+module DataFlowMakeOverlay<LocationSig Location, InputSig<Location> Lang> {
+  import DataFlowMake<Location, Lang>
+  private import Lang
+  private import internal.DataFlowImpl::MakeImpl<Location, Lang>
+  private import internal.DataFlowImplStage1::MakeImplStage1<Location, Lang>
+
+  /**
+   * Constructs a global data flow computation.
+   */
+  module Global<ConfigSig Config> implements GlobalFlowSig {
+    private module C implements FullStateConfigSig {
+      import DefaultState<Config>
+      import Config
+
+      predicate accessPathLimit = Config::accessPathLimit/0;
+
+      predicate isAdditionalFlowStep(Node node1, Node node2, string model) {
+        Config::isAdditionalFlowStep(node1, node2) and model = "Config"
+      }
+
+      predicate observeOverlayInformedIncrementalMode() {
+        not Config::observeDiffInformedIncrementalMode()
+      }
+    }
+
+    private module Stage1 = ImplStage1<C>;
+
+    import Stage1::PartialFlow
+
+    private module Flow = OverlayImpl<C, Stage1::Stage1NoState>;
+
+    import Flow
+  }
+
+  /**
+   * Constructs a global data flow computation using flow state.
+   */
+  module GlobalWithState<StateConfigSig Config> implements GlobalFlowSig {
+    private module C implements FullStateConfigSig {
+      import Config
+
+      predicate accessPathLimit = Config::accessPathLimit/0;
+
+      predicate isAdditionalFlowStep(Node node1, Node node2, string model) {
+        Config::isAdditionalFlowStep(node1, node2) and model = "Config"
+      }
+
+      predicate isAdditionalFlowStep(
+        Node node1, FlowState state1, Node node2, FlowState state2, string model
+      ) {
+        Config::isAdditionalFlowStep(node1, state1, node2, state2) and model = "Config"
+      }
+
+      predicate observeOverlayInformedIncrementalMode() {
+        not Config::observeDiffInformedIncrementalMode()
+      }
+    }
+
+    private module Stage1 = ImplStage1<C>;
+
+    import Stage1::PartialFlow
+
+    private module Flow = OverlayImpl<C, Stage1::Stage1WithState>;
+
+    import Flow
+  }
+}
diff --git a/shared/dataflow/codeql/dataflow/TaintTracking.qll b/shared/dataflow/codeql/dataflow/TaintTracking.qll
index bd4b4ecd6ca..7bb9535d096 100644
--- a/shared/dataflow/codeql/dataflow/TaintTracking.qll
+++ b/shared/dataflow/codeql/dataflow/TaintTracking.qll
@@ -47,16 +47,16 @@ signature module InputSig<LocationSig Location, DF::InputSig<Location> Lang> {
 /**
  * Construct the modules for taint-tracking analyses.
  */
-module TaintFlowMake<
+private module TaintFlowMakeCore<
   LocationSig Location, DF::InputSig<Location> DataFlowLang,
   InputSig<Location, DataFlowLang> TaintTrackingLang>
 {
-  private import TaintTrackingLang
-  private import DF::DataFlowMake<Location, DataFlowLang> as DataFlow
-  private import MakeImpl<Location, DataFlowLang> as DataFlowInternal
-  private import MakeImplStage1<Location, DataFlowLang> as DataFlowInternalStage1
+  import TaintTrackingLang
+  import DF::DataFlowMake<Location, DataFlowLang> as DataFlow
+  import MakeImpl<Location, DataFlowLang> as DataFlowInternal
+  import MakeImplStage1<Location, DataFlowLang> as DataFlowInternalStage1
 
-  private module AddTaintDefaults<DataFlowInternal::FullStateConfigSig Config> implements
+  module AddTaintDefaults<DataFlowInternal::FullStateConfigSig Config> implements
     DataFlowInternal::FullStateConfigSig
   {
     import Config
@@ -83,71 +83,9 @@ module TaintFlowMake<
     }
   }
 
-  /**
-   * Constructs a global taint tracking computation.
-   */
-  module Global<DataFlow::ConfigSig Config> implements DataFlow::GlobalFlowSig {
-    private module Config0 implements DataFlowInternal::FullStateConfigSig {
-      import DataFlowInternal::DefaultState<Config>
-      import Config
-
-      predicate isAdditionalFlowStep(
-        DataFlowLang::Node node1, DataFlowLang::Node node2, string model
-      ) {
-        Config::isAdditionalFlowStep(node1, node2) and model = "Config"
-      }
-    }
-
-    private module C implements DataFlowInternal::FullStateConfigSig {
-      import AddTaintDefaults<Config0>
-    }
-
-    private module Stage1 = DataFlowInternalStage1::ImplStage1<C>;
-
-    import Stage1::PartialFlow
-
-    private module Flow = DataFlowInternal::Impl<C, Stage1::Stage1NoState>;
-
-    import Flow
-  }
-
-  /**
-   * Constructs a global taint tracking computation using flow state.
-   */
-  module GlobalWithState<DataFlow::StateConfigSig Config> implements DataFlow::GlobalFlowSig {
-    private module Config0 implements DataFlowInternal::FullStateConfigSig {
-      import Config
-
-      predicate isAdditionalFlowStep(
-        DataFlowLang::Node node1, DataFlowLang::Node node2, string model
-      ) {
-        Config::isAdditionalFlowStep(node1, node2) and model = "Config"
-      }
-
-      predicate isAdditionalFlowStep(
-        DataFlowLang::Node node1, FlowState state1, DataFlowLang::Node node2, FlowState state2,
-        string model
-      ) {
-        Config::isAdditionalFlowStep(node1, state1, node2, state2) and model = "Config"
-      }
-    }
-
-    private module C implements DataFlowInternal::FullStateConfigSig {
-      import AddTaintDefaults<Config0>
-    }
-
-    private module Stage1 = DataFlowInternalStage1::ImplStage1<C>;
-
-    import Stage1::PartialFlow
-
-    private module Flow = DataFlowInternal::Impl<C, Stage1::Stage1WithState>;
-
-    import Flow
-  }
-
   signature int speculationLimitSig();
 
-  private module AddSpeculativeTaintSteps<
+  module AddSpeculativeTaintSteps<
     DataFlowInternal::FullStateConfigSig Config, speculationLimitSig/0 speculationLimit> implements
     DataFlowInternal::FullStateConfigSig
   {
@@ -215,6 +153,79 @@ module TaintFlowMake<
       state1.getState() = state2.getState()
     }
   }
+}
+
+module TaintFlowMake<
+  LocationSig Location, DF::InputSig<Location> DataFlowLang,
+  InputSig<Location, DataFlowLang> TaintTrackingLang>
+{
+  private import TaintFlowMakeCore<Location, DataFlowLang, TaintTrackingLang>
+
+  /**
+   * Constructs a global taint tracking computation.
+   */
+  module Global<DataFlow::ConfigSig Config> implements DataFlow::GlobalFlowSig {
+    private module Config0 implements DataFlowInternal::FullStateConfigSig {
+      import DataFlowInternal::DefaultState<Config>
+      import Config
+
+      predicate isAdditionalFlowStep(
+        DataFlowLang::Node node1, DataFlowLang::Node node2, string model
+      ) {
+        Config::isAdditionalFlowStep(node1, node2) and model = "Config"
+      }
+
+      predicate observeOverlayInformedIncrementalMode() { none() }
+    }
+
+    private module C implements DataFlowInternal::FullStateConfigSig {
+      import AddTaintDefaults<Config0>
+    }
+
+    private module Stage1 = DataFlowInternalStage1::ImplStage1<C>;
+
+    import Stage1::PartialFlow
+
+    private module Flow = DataFlowInternal::Impl<C, Stage1::Stage1NoState>;
+
+    import Flow
+  }
+
+  /**
+   * Constructs a global taint tracking computation using flow state.
+   */
+  module GlobalWithState<DataFlow::StateConfigSig Config> implements DataFlow::GlobalFlowSig {
+    private module Config0 implements DataFlowInternal::FullStateConfigSig {
+      import Config
+
+      predicate isAdditionalFlowStep(
+        DataFlowLang::Node node1, DataFlowLang::Node node2, string model
+      ) {
+        Config::isAdditionalFlowStep(node1, node2) and model = "Config"
+      }
+
+      predicate isAdditionalFlowStep(
+        DataFlowLang::Node node1, FlowState state1, DataFlowLang::Node node2, FlowState state2,
+        string model
+      ) {
+        Config::isAdditionalFlowStep(node1, state1, node2, state2) and model = "Config"
+      }
+
+      predicate observeOverlayInformedIncrementalMode() { none() }
+    }
+
+    private module C implements DataFlowInternal::FullStateConfigSig {
+      import AddTaintDefaults<Config0>
+    }
+
+    private module Stage1 = DataFlowInternalStage1::ImplStage1<C>;
+
+    import Stage1::PartialFlow
+
+    private module Flow = DataFlowInternal::Impl<C, Stage1::Stage1WithState>;
+
+    import Flow
+  }
 
   /**
    * Constructs a global taint tracking computation that also allows a given
@@ -232,6 +243,8 @@ module TaintFlowMake<
       ) {
         Config::isAdditionalFlowStep(node1, node2) and model = "Config"
       }
+
+      predicate observeOverlayInformedIncrementalMode() { none() }
     }
 
     private module C implements DataFlowInternal::FullStateConfigSig {
@@ -270,6 +283,8 @@ module TaintFlowMake<
       ) {
         Config::isAdditionalFlowStep(node1, state1, node2, state2) and model = "Config"
       }
+
+      predicate observeOverlayInformedIncrementalMode() { none() }
     }
 
     private module C implements DataFlowInternal::FullStateConfigSig {
@@ -285,3 +300,157 @@ module TaintFlowMake<
     import Flow
   }
 }
+
+module TaintFlowMakeOverlay<
+  LocationSig Location, DF::InputSig<Location> DataFlowLang,
+  InputSig<Location, DataFlowLang> TaintTrackingLang>
+{
+  private import TaintFlowMakeCore<Location, DataFlowLang, TaintTrackingLang>
+
+  /**
+   * Constructs a global taint tracking computation.
+   */
+  module Global<DataFlow::ConfigSig Config> implements DataFlow::GlobalFlowSig {
+    private module Config0 implements DataFlowInternal::FullStateConfigSig {
+      import DataFlowInternal::DefaultState<Config>
+      import Config
+
+      predicate isAdditionalFlowStep(
+        DataFlowLang::Node node1, DataFlowLang::Node node2, string model
+      ) {
+        Config::isAdditionalFlowStep(node1, node2) and model = "Config"
+      }
+
+      predicate observeOverlayInformedIncrementalMode() {
+        not Config::observeDiffInformedIncrementalMode()
+      }
+    }
+
+    private module C implements DataFlowInternal::FullStateConfigSig {
+      import AddTaintDefaults<Config0>
+    }
+
+    private module Stage1 = DataFlowInternalStage1::ImplStage1<C>;
+
+    import Stage1::PartialFlow
+
+    private module Flow = DataFlowInternal::OverlayImpl<C, Stage1::Stage1NoState>;
+
+    import Flow
+  }
+
+  /**
+   * Constructs a global taint tracking computation using flow state.
+   */
+  module GlobalWithState<DataFlow::StateConfigSig Config> implements DataFlow::GlobalFlowSig {
+    private module Config0 implements DataFlowInternal::FullStateConfigSig {
+      import Config
+
+      predicate isAdditionalFlowStep(
+        DataFlowLang::Node node1, DataFlowLang::Node node2, string model
+      ) {
+        Config::isAdditionalFlowStep(node1, node2) and model = "Config"
+      }
+
+      predicate isAdditionalFlowStep(
+        DataFlowLang::Node node1, FlowState state1, DataFlowLang::Node node2, FlowState state2,
+        string model
+      ) {
+        Config::isAdditionalFlowStep(node1, state1, node2, state2) and model = "Config"
+      }
+
+      predicate observeOverlayInformedIncrementalMode() {
+        not Config::observeDiffInformedIncrementalMode()
+      }
+    }
+
+    private module C implements DataFlowInternal::FullStateConfigSig {
+      import AddTaintDefaults<Config0>
+    }
+
+    private module Stage1 = DataFlowInternalStage1::ImplStage1<C>;
+
+    import Stage1::PartialFlow
+
+    private module Flow = DataFlowInternal::OverlayImpl<C, Stage1::Stage1WithState>;
+
+    import Flow
+  }
+
+  /**
+   * Constructs a global taint tracking computation that also allows a given
+   * maximum number of speculative taint steps.
+   */
+  module SpeculativeGlobal<DataFlow::ConfigSig Config, speculationLimitSig/0 speculationLimit>
+    implements DataFlow::GlobalFlowSig
+  {
+    private module Config0 implements DataFlowInternal::FullStateConfigSig {
+      import DataFlowInternal::DefaultState<Config>
+      import Config
+
+      predicate isAdditionalFlowStep(
+        DataFlowLang::Node node1, DataFlowLang::Node node2, string model
+      ) {
+        Config::isAdditionalFlowStep(node1, node2) and model = "Config"
+      }
+
+      predicate observeOverlayInformedIncrementalMode() {
+        not Config::observeDiffInformedIncrementalMode()
+      }
+    }
+
+    private module C implements DataFlowInternal::FullStateConfigSig {
+      import AddTaintDefaults<AddSpeculativeTaintSteps<Config0, speculationLimit/0>>
+    }
+
+    private module Stage1 = DataFlowInternalStage1::ImplStage1<C>;
+
+    import Stage1::PartialFlow
+
+    private module Flow = DataFlowInternal::OverlayImpl<C, Stage1::Stage1WithState>;
+
+    import Flow
+  }
+
+  /**
+   * Constructs a global taint tracking computation using flow state that also
+   * allows a given maximum number of speculative taint steps.
+   */
+  module SpeculativeGlobalWithState<
+    DataFlow::StateConfigSig Config, speculationLimitSig/0 speculationLimit> implements
+    DataFlow::GlobalFlowSig
+  {
+    private module Config0 implements DataFlowInternal::FullStateConfigSig {
+      import Config
+
+      predicate isAdditionalFlowStep(
+        DataFlowLang::Node node1, DataFlowLang::Node node2, string model
+      ) {
+        Config::isAdditionalFlowStep(node1, node2) and model = "Config"
+      }
+
+      predicate isAdditionalFlowStep(
+        DataFlowLang::Node node1, FlowState state1, DataFlowLang::Node node2, FlowState state2,
+        string model
+      ) {
+        Config::isAdditionalFlowStep(node1, state1, node2, state2) and model = "Config"
+      }
+
+      predicate observeOverlayInformedIncrementalMode() {
+        not Config::observeDiffInformedIncrementalMode()
+      }
+    }
+
+    private module C implements DataFlowInternal::FullStateConfigSig {
+      import AddTaintDefaults<AddSpeculativeTaintSteps<Config0, speculationLimit/0>>
+    }
+
+    private module Stage1 = DataFlowInternalStage1::ImplStage1<C>;
+
+    import Stage1::PartialFlow
+
+    private module Flow = DataFlowInternal::OverlayImpl<C, Stage1::Stage1WithState>;
+
+    import Flow
+  }
+}
diff --git a/shared/dataflow/codeql/dataflow/VariableCapture.qll b/shared/dataflow/codeql/dataflow/VariableCapture.qll
index 922391221a4..0ba44be5ea1 100644
--- a/shared/dataflow/codeql/dataflow/VariableCapture.qll
+++ b/shared/dataflow/codeql/dataflow/VariableCapture.qll
@@ -8,66 +8,14 @@ module;
 private import codeql.util.Boolean
 private import codeql.util.Unit
 private import codeql.util.Location
+private import codeql.controlflow.BasicBlock as BB
 private import codeql.ssa.Ssa as Ssa
 
-signature module InputSig<LocationSig Location> {
-  /**
-   * A basic block, that is, a maximal straight-line sequence of control flow nodes
-   * without branches or joins.
-   */
-  class BasicBlock {
-    /** Gets a textual representation of this basic block. */
-    string toString();
+signature class BasicBlockSig;
 
-    /** Gets the `i`th node in this basic block. */
-    ControlFlowNode getNode(int i);
-
-    /** Gets the length of this basic block. */
-    int length();
-
-    /** Gets the enclosing callable. */
-    Callable getEnclosingCallable();
-
-    /** Gets the location of this basic block. */
-    Location getLocation();
-  }
-
-  /** A control flow node. */
-  class ControlFlowNode {
-    /** Gets a textual representation of this control flow node. */
-    string toString();
-
-    /** Gets the location of this control flow node. */
-    Location getLocation();
-  }
-
-  /**
-   * Gets the basic block that immediately dominates basic block `bb`, if any.
-   *
-   * That is, all paths reaching `bb` from some entry point basic block must go
-   * through the result.
-   *
-   * Example:
-   *
-   * ```csharp
-   * int M(string s) {
-   *   if (s == null)
-   *     throw new ArgumentNullException(nameof(s));
-   *   return s.Length;
-   * }
-   * ```
-   *
-   * The basic block starting on line 2 is an immediate dominator of
-   * the basic block on line 4 (all paths from the entry point of `M`
-   * to `return s.Length;` must go through the null check.
-   */
-  BasicBlock getImmediateBasicBlockDominator(BasicBlock bb);
-
-  /** Gets an immediate successor of basic block `bb`, if any. */
-  BasicBlock getABasicBlockSuccessor(BasicBlock bb);
-
-  /** Holds if `bb` is a control-flow entry point. */
-  default predicate entryBlock(BasicBlock bb) { not exists(getImmediateBasicBlockDominator(bb)) }
+signature module InputSig<LocationSig Location, BasicBlockSig BasicBlock> {
+  /** Gets the enclosing callable of the basic block. */
+  Callable basicBlockGetEnclosingCallable(BasicBlock bb);
 
   /** A variable that is captured in a closure. */
   class CapturedVariable {
@@ -153,7 +101,9 @@ signature module InputSig<LocationSig Location> {
   }
 }
 
-signature module OutputSig<LocationSig Location, InputSig<Location> I> {
+signature module OutputSig<
+  LocationSig Location, BasicBlockSig BasicBlock, InputSig<Location, BasicBlock> I>
+{
   /**
    * A data flow node that we need to reference in the step relations for
    * captured variables.
@@ -255,9 +205,18 @@ signature module OutputSig<LocationSig Location, InputSig<Location> I> {
  * Constructs the type `ClosureNode` and associated step relations, which are
  * intended to be included in the data-flow node and step relations.
  */
-module Flow<LocationSig Location, InputSig<Location> Input> implements OutputSig<Location, Input> {
+module Flow<
+  LocationSig Location, BB::CfgSig<Location> Cfg, InputSig<Location, Cfg::BasicBlock> Input>
+  implements OutputSig<Location, Cfg::BasicBlock, Input>
+{
   private import Input
 
+  final private class CfgBb = Cfg::BasicBlock;
+
+  private class BasicBlock extends CfgBb {
+    Callable getEnclosingCallable() { result = basicBlockGetEnclosingCallable(this) }
+  }
+
   additional module ConsistencyChecks {
     final private class FinalExpr = Expr;
 
@@ -332,17 +291,17 @@ module Flow<LocationSig Location, InputSig<Location> Input> implements OutputSig
 
     query predicate uniqueDominator(RelevantBasicBlock bb, string msg) {
       msg = "BasicBlock has multiple immediate dominators" and
-      2 <= strictcount(getImmediateBasicBlockDominator(bb))
+      2 <= strictcount(bb.getImmediateDominator())
     }
 
     query predicate localDominator(RelevantBasicBlock bb, string msg) {
       msg = "BasicBlock has non-local dominator" and
-      bb.getEnclosingCallable() != getImmediateBasicBlockDominator(bb).getEnclosingCallable()
+      bb.getEnclosingCallable() != bb.getImmediateDominator().(BasicBlock).getEnclosingCallable()
     }
 
     query predicate localSuccessor(RelevantBasicBlock bb, string msg) {
       msg = "BasicBlock has non-local successor" and
-      bb.getEnclosingCallable() != getABasicBlockSuccessor(bb).getEnclosingCallable()
+      bb.getEnclosingCallable() != bb.getASuccessor().(BasicBlock).getEnclosingCallable()
     }
 
     query predicate uniqueDefiningScope(CapturedVariable v, string msg) {
@@ -669,7 +628,7 @@ module Flow<LocationSig Location, InputSig<Location> Input> implements OutputSig
   /** Holds if `cc` needs a definition at the entry of its callable scope. */
   private predicate entryDef(CaptureContainer cc, BasicBlock bb, int i) {
     exists(Callable c |
-      entryBlock(bb) and
+      bb instanceof Cfg::EntryBasicBlock and
       pragma[only_bind_out](bb.getEnclosingCallable()) = c and
       i =
         min(int j |
@@ -685,22 +644,10 @@ module Flow<LocationSig Location, InputSig<Location> Input> implements OutputSig
     )
   }
 
-  private module CaptureSsaInput implements Ssa::InputSig<Location> {
-    final class BasicBlock = Input::BasicBlock;
-
-    final class ControlFlowNode = Input::ControlFlowNode;
-
-    BasicBlock getImmediateBasicBlockDominator(BasicBlock bb) {
-      result = Input::getImmediateBasicBlockDominator(bb)
-    }
-
-    BasicBlock getABasicBlockSuccessor(BasicBlock bb) {
-      result = Input::getABasicBlockSuccessor(bb)
-    }
-
+  private module CaptureSsaInput implements Ssa::InputSig<Location, Cfg::BasicBlock> {
     class SourceVariable = CaptureContainer;
 
-    predicate variableWrite(BasicBlock bb, int i, SourceVariable cc, boolean certain) {
+    predicate variableWrite(Cfg::BasicBlock bb, int i, SourceVariable cc, boolean certain) {
       Cached::ref() and
       (
         exists(CapturedVariable v | cc = TVariable(v) and captureWrite(v, bb, i, true, _))
@@ -710,9 +657,9 @@ module Flow<LocationSig Location, InputSig<Location> Input> implements OutputSig
       certain = true
     }
 
-    predicate variableRead(BasicBlock bb, int i, SourceVariable cc, boolean certain) {
+    predicate variableRead(Cfg::BasicBlock bb, int i, SourceVariable cc, boolean certain) {
       (
-        synthThisQualifier(bb, i) and cc = TThis(bb.getEnclosingCallable())
+        synthThisQualifier(bb, i) and cc = TThis(bb.(BasicBlock).getEnclosingCallable())
         or
         exists(CapturedVariable v | cc = TVariable(v) |
           captureRead(v, bb, i, true, _) or synthRead(v, bb, i, true, _)
@@ -722,26 +669,30 @@ module Flow<LocationSig Location, InputSig<Location> Input> implements OutputSig
     }
   }
 
-  private module CaptureSsa = Ssa::Make<Location, CaptureSsaInput>;
+  private module CaptureSsa = Ssa::Make<Location, Cfg, CaptureSsaInput>;
 
   private module DataFlowIntegrationInput implements CaptureSsa::DataFlowIntegrationInputSig {
     private import codeql.util.Void
 
-    class Expr instanceof Input::ControlFlowNode {
+    class Expr instanceof Cfg::ControlFlowNode {
       string toString() { result = super.toString() }
 
-      predicate hasCfgNode(BasicBlock bb, int i) { bb.getNode(i) = this }
+      predicate hasCfgNode(Cfg::BasicBlock bb, int i) { bb.getNode(i) = this }
     }
 
     class GuardValue = Void;
 
     class Guard extends Void {
-      predicate hasValueBranchEdge(BasicBlock bb1, BasicBlock bb2, GuardValue val) { none() }
+      predicate hasValueBranchEdge(Cfg::BasicBlock bb1, Cfg::BasicBlock bb2, GuardValue val) {
+        none()
+      }
 
-      predicate valueControlsBranchEdge(BasicBlock bb1, BasicBlock bb2, GuardValue val) { none() }
+      predicate valueControlsBranchEdge(Cfg::BasicBlock bb1, Cfg::BasicBlock bb2, GuardValue val) {
+        none()
+      }
     }
 
-    predicate guardDirectlyControlsBlock(Guard guard, BasicBlock bb, GuardValue val) { none() }
+    predicate guardDirectlyControlsBlock(Guard guard, Cfg::BasicBlock bb, GuardValue val) { none() }
 
     predicate includeWriteDefsInFlowStep() { none() }
 
diff --git a/shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll b/shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll
index a7e0736432a..ddcd052e8fd 100644
--- a/shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll
+++ b/shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll
@@ -143,6 +143,15 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
      */
     predicate observeDiffInformedIncrementalMode();
 
+    /**
+     * Holds if sources and sinks should be filtered to only include those that
+     * may lead to a flow path with either a source or a sink in the overlay database.
+     * This only has an effect when running
+     * in overlay-informed incremental mode. This should be used in conjunction
+     * with the `OverlayImpl` implementation to merge the base results back in.
+     */
+    predicate observeOverlayInformedIncrementalMode();
+
     Location getASelectedSourceLocation(Node source);
 
     Location getASelectedSinkLocation(Node sink);
@@ -171,6 +180,56 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
     }
   }
 
+  /**
+   * Constructs a data flow computation given a full input configuration, and
+   * an initial stage 1 pruning with merging of overlay and base results.
+   */
+  module OverlayImpl<FullStateConfigSig Config, Stage1Output<Config::FlowState> Stage1> {
+    private module Flow = Impl<Config, Stage1>;
+
+    import Flow
+
+    /**
+     * Holds if data can flow from `source` to `sink`.
+     *
+     * This is a local predicate that only has results local to the overlay/base database.
+     */
+    private predicate flowLocal(Node source, Node sink) = forceLocal(Flow::flow/2)(source, sink)
+
+    /**
+     * Holds if data can flow from `source` to `sink`.
+     */
+    predicate flow(Node source, Node sink) {
+      Flow::flow(source, sink)
+      or
+      // If we are overlay informed (i.e. we are not diff-informed), we
+      // merge in the local results which includes the base database results.
+      flowLocal(source, sink) and Config::observeOverlayInformedIncrementalMode()
+    }
+
+    /**
+     * Holds if data can flow from some source to `sink`.
+     * This is a local predicate that only has results local to the overlay/base database.
+     */
+    predicate flowToLocal(Node sink) = forceLocal(Flow::flowTo/1)(sink)
+
+    /**
+     * Holds if data can flow from some source to `sink`.
+     */
+    predicate flowTo(Node sink) {
+      Flow::flowTo(sink)
+      or
+      // If we are overlay informed (i.e. we are not diff-informed), we
+      // merge in the local results which includes the base database results.
+      flowToLocal(sink) and Config::observeOverlayInformedIncrementalMode()
+    }
+
+    /**
+     * Holds if data can flow from some source to `sink`.
+     */
+    predicate flowToExpr(Lang::DataFlowExpr sink) { flowTo(exprNode(sink)) }
+  }
+
   /**
    * Constructs a data flow computation given a full input configuration, and
    * an initial stage 1 pruning.
@@ -258,6 +317,13 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
 
       predicate returnMayFlowThrough(RetNd ret, ReturnKindExt kind);
 
+      /**
+       * Holds if this stage makes use of a store step of content `c` from
+       * `node1` to `node2`.
+       *
+       * `contentType` and `containerType` are the types of the content being
+       * stored, and the type of the resulting container, respectively.
+       */
       predicate storeStepCand(Nd node1, Content c, Nd node2, Type contentType, Type containerType);
 
       predicate readStepCand(Nd n1, Content c, Nd n2);
@@ -427,6 +493,14 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
           )
         }
 
+        /**
+         * Holds if a node with type `containerType` is compatible with an
+         * access path with head content `apc`. This is determined by checking
+         * type compatibility against the possible types of nodes that are
+         * targets of store steps with content `apc`.
+         *
+         * Excludes the case where `apc` is compatible with all types.
+         */
         bindingset[apc, containerType]
         pragma[inline_late]
         private predicate compatibleContainer(ApHeadContent apc, Type containerType) {
@@ -1656,7 +1730,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
          * Provides a graph representation of the data flow in this stage suitable for use in a `path-problem` query.
          */
         additional module Graph {
-          private newtype TPathNode =
+          newtype TPathNode =
             TPathNodeMid(Nd node, Cc cc, SummaryCtx summaryCtx, Typ t, Ap ap, TypOption stored) {
               fwdFlow(node, cc, summaryCtx, t, ap, stored) and
               revFlow(node, _, _, ap)
@@ -2414,41 +2488,84 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
           }
         }
 
-        additional predicate stats(
-          boolean fwd, int nodes, int fields, int conscand, int states, int tuples, int calledges,
-          int tfnodes, int tftuples
-        ) {
-          fwd = true and
-          nodes = count(NodeEx node | fwdFlow(any(Nd n | n.getNodeEx() = node), _, _, _, _, _)) and
-          fields = count(Content f0 | fwdConsCand(f0, _)) and
-          conscand = count(Content f0, Ap ap | fwdConsCand(f0, ap)) and
-          states = count(FlowState state | fwdFlow(any(Nd n | n.getState() = state), _, _, _, _, _)) and
-          tuples =
-            count(Nd n, Cc cc, SummaryCtx summaryCtx, Typ t, Ap ap, TypOption stored |
-              fwdFlow(n, cc, summaryCtx, t, ap, stored)
-            ) and
-          calledges =
-            count(Call call, Callable c |
-              FwdTypeFlowInput::dataFlowTakenCallEdgeIn(call, c, _) or
-              FwdTypeFlowInput::dataFlowTakenCallEdgeOut(call, c)
-            ) and
-          FwdTypeFlow::typeFlowStats(tfnodes, tftuples)
-          or
-          fwd = false and
-          nodes = count(NodeEx node | revFlow(any(Nd n | n.getNodeEx() = node), _, _, _)) and
-          fields = count(Content f0 | consCand(f0, _)) and
-          conscand = count(Content f0, Ap ap | consCand(f0, ap)) and
-          states = count(FlowState state | revFlow(any(Nd n | n.getState() = state), _, _, _)) and
-          tuples =
-            count(Nd n, ReturnCtx returnCtx, ApOption retAp, Ap ap |
-              revFlow(n, returnCtx, retAp, ap)
-            ) and
-          calledges =
-            count(Call call, Callable c |
-              RevTypeFlowInput::dataFlowTakenCallEdgeIn(call, c, _) or
-              RevTypeFlowInput::dataFlowTakenCallEdgeOut(call, c)
-            ) and
-          RevTypeFlow::typeFlowStats(tfnodes, tftuples)
+        /** Provides predicates for debugging. */
+        additional module Debug {
+          private import Graph
+
+          predicate stats(
+            boolean fwd, int nodes, int fields, int conscand, int states, int tuples, int calledges,
+            int tfnodes, int tftuples
+          ) {
+            fwd = true and
+            nodes = count(NodeEx node | fwdFlow(any(Nd n | n.getNodeEx() = node), _, _, _, _, _)) and
+            fields = count(Content f0 | fwdConsCand(f0, _)) and
+            conscand = count(Content f0, Ap ap | fwdConsCand(f0, ap)) and
+            states =
+              count(FlowState state | fwdFlow(any(Nd n | n.getState() = state), _, _, _, _, _)) and
+            tuples =
+              count(Nd n, Cc cc, SummaryCtx summaryCtx, Typ t, Ap ap, TypOption stored |
+                fwdFlow(n, cc, summaryCtx, t, ap, stored)
+              ) and
+            calledges =
+              count(Call call, Callable c |
+                FwdTypeFlowInput::dataFlowTakenCallEdgeIn(call, c, _) or
+                FwdTypeFlowInput::dataFlowTakenCallEdgeOut(call, c)
+              ) and
+            FwdTypeFlow::typeFlowStats(tfnodes, tftuples)
+            or
+            fwd = false and
+            nodes = count(NodeEx node | revFlow(any(Nd n | n.getNodeEx() = node), _, _, _)) and
+            fields = count(Content f0 | consCand(f0, _)) and
+            conscand = count(Content f0, Ap ap | consCand(f0, ap)) and
+            states = count(FlowState state | revFlow(any(Nd n | n.getState() = state), _, _, _)) and
+            tuples =
+              count(Nd n, ReturnCtx returnCtx, ApOption retAp, Ap ap |
+                revFlow(n, returnCtx, retAp, ap)
+              ) and
+            calledges =
+              count(Call call, Callable c |
+                RevTypeFlowInput::dataFlowTakenCallEdgeIn(call, c, _) or
+                RevTypeFlowInput::dataFlowTakenCallEdgeOut(call, c)
+              ) and
+            RevTypeFlow::typeFlowStats(tfnodes, tftuples)
+          }
+
+          private int fanOut(PathNodeImpl n) {
+            result = strictcount(n.getASuccessorImpl(_)) and
+            not n.isArbitrarySource()
+          }
+
+          private int fanIn(PathNodeImpl n) {
+            result = strictcount(PathNodeImpl pred | n = pred.getASuccessorImpl(_)) and
+            not n.isArbitrarySink()
+          }
+
+          predicate maxFanOut(PathNodeImpl pred, PathNodeImpl succ, int c) {
+            c = fanOut(pred) and
+            c = max(fanOut(_)) and
+            succ = pred.getASuccessorImpl(_)
+          }
+
+          predicate maxFanIn(PathNodeImpl pred, PathNodeImpl succ, int c) {
+            c = fanIn(succ) and
+            c = max(fanIn(_)) and
+            succ = pred.getASuccessorImpl(_)
+          }
+
+          private int pathNodes(Nd node) {
+            result =
+              strictcount(Cc cc, SummaryCtx summaryCtx, Typ t, Ap ap, TypOption stored |
+                exists(TPathNodeMid(node, cc, summaryCtx, t, ap, stored))
+              )
+          }
+
+          predicate maxPathNodes(
+            Nd node, Cc cc, SummaryCtx summaryCtx, Typ t, Ap ap, TypOption stored, int c
+          ) {
+            exists(TPathNodeMid(node, cc, summaryCtx, t, ap, stored)) and
+            c = pathNodes(node) and
+            c = max(pathNodes(_))
+          }
         }
         /* End: Stage logic. */
       }
@@ -3461,13 +3578,21 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
         or
         stage = "2 Fwd" and
         n = 20 and
-        Stage2::stats(true, nodes, fields, conscand, states, tuples, calledges, tfnodes, tftuples)
+        Stage2::Debug::stats(true, nodes, fields, conscand, states, tuples, calledges, tfnodes,
+          tftuples)
         or
         stage = "2 Rev" and
         n = 25 and
-        Stage2::stats(false, nodes, fields, conscand, states, tuples, calledges, tfnodes, tftuples)
+        Stage2::Debug::stats(false, nodes, fields, conscand, states, tuples, calledges, tfnodes,
+          tftuples)
       }
 
+      predicate stage2maxFanOut = Stage2::Debug::maxFanOut/3;
+
+      predicate stage2maxFanIn = Stage2::Debug::maxFanIn/3;
+
+      predicate stage2maxPathNodes = Stage2::Debug::maxPathNodes/7;
+
       predicate stageStats3(
         int n, string stage, int nodes, int fields, int conscand, int states, int tuples,
         int calledges, int tfnodes, int tftuples
@@ -3476,13 +3601,21 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
         or
         stage = "3 Fwd" and
         n = 30 and
-        Stage3::stats(true, nodes, fields, conscand, states, tuples, calledges, tfnodes, tftuples)
+        Stage3::Debug::stats(true, nodes, fields, conscand, states, tuples, calledges, tfnodes,
+          tftuples)
         or
         stage = "3 Rev" and
         n = 35 and
-        Stage3::stats(false, nodes, fields, conscand, states, tuples, calledges, tfnodes, tftuples)
+        Stage3::Debug::stats(false, nodes, fields, conscand, states, tuples, calledges, tfnodes,
+          tftuples)
       }
 
+      predicate stage3maxFanOut = Stage3::Debug::maxFanOut/3;
+
+      predicate stage3maxFanIn = Stage3::Debug::maxFanIn/3;
+
+      predicate stage3maxPathNodes = Stage3::Debug::maxPathNodes/7;
+
       predicate stageStats4(
         int n, string stage, int nodes, int fields, int conscand, int states, int tuples,
         int calledges, int tfnodes, int tftuples
@@ -3491,13 +3624,21 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
         or
         stage = "4 Fwd" and
         n = 40 and
-        Stage4::stats(true, nodes, fields, conscand, states, tuples, calledges, tfnodes, tftuples)
+        Stage4::Debug::stats(true, nodes, fields, conscand, states, tuples, calledges, tfnodes,
+          tftuples)
         or
         stage = "4 Rev" and
         n = 45 and
-        Stage4::stats(false, nodes, fields, conscand, states, tuples, calledges, tfnodes, tftuples)
+        Stage4::Debug::stats(false, nodes, fields, conscand, states, tuples, calledges, tfnodes,
+          tftuples)
       }
 
+      predicate stage4maxFanOut = Stage4::Debug::maxFanOut/3;
+
+      predicate stage4maxFanIn = Stage4::Debug::maxFanIn/3;
+
+      predicate stage4maxPathNodes = Stage4::Debug::maxPathNodes/7;
+
       predicate stageStats5(
         int n, string stage, int nodes, int fields, int conscand, int states, int tuples,
         int calledges, int tfnodes, int tftuples
@@ -3506,13 +3647,21 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
         or
         stage = "5 Fwd" and
         n = 50 and
-        Stage5::stats(true, nodes, fields, conscand, states, tuples, calledges, tfnodes, tftuples)
+        Stage5::Debug::stats(true, nodes, fields, conscand, states, tuples, calledges, tfnodes,
+          tftuples)
         or
         stage = "5 Rev" and
         n = 55 and
-        Stage5::stats(false, nodes, fields, conscand, states, tuples, calledges, tfnodes, tftuples)
+        Stage5::Debug::stats(false, nodes, fields, conscand, states, tuples, calledges, tfnodes,
+          tftuples)
       }
 
+      predicate stage5maxFanOut = Stage5::Debug::maxFanOut/3;
+
+      predicate stage5maxFanIn = Stage5::Debug::maxFanIn/3;
+
+      predicate stage5maxPathNodes = Stage5::Debug::maxPathNodes/7;
+
       predicate stageStats(
         int n, string stage, int nodes, int fields, int conscand, int states, int tuples,
         int calledges, int tfnodes, int tftuples
@@ -3521,12 +3670,20 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
         or
         stage = "6 Fwd" and
         n = 60 and
-        Stage6::stats(true, nodes, fields, conscand, states, tuples, calledges, tfnodes, tftuples)
+        Stage6::Debug::stats(true, nodes, fields, conscand, states, tuples, calledges, tfnodes,
+          tftuples)
         or
         stage = "6 Rev" and
         n = 65 and
-        Stage6::stats(false, nodes, fields, conscand, states, tuples, calledges, tfnodes, tftuples)
+        Stage6::Debug::stats(false, nodes, fields, conscand, states, tuples, calledges, tfnodes,
+          tftuples)
       }
+
+      predicate stage6maxFanOut = Stage6::Debug::maxFanOut/3;
+
+      predicate stage6maxFanIn = Stage6::Debug::maxFanIn/3;
+
+      predicate stage6maxPathNodes = Stage6::Debug::maxPathNodes/7;
     }
   }
 }
diff --git a/shared/dataflow/codeql/dataflow/internal/DataFlowImplConsistency.qll b/shared/dataflow/codeql/dataflow/internal/DataFlowImplConsistency.qll
index 83abd41f5e6..8f0d2cbdb77 100644
--- a/shared/dataflow/codeql/dataflow/internal/DataFlowImplConsistency.qll
+++ b/shared/dataflow/codeql/dataflow/internal/DataFlowImplConsistency.qll
@@ -254,7 +254,10 @@ module MakeConsistency<
 
   query predicate postWithInFlow(PostUpdateNode n, string msg) {
     not clearsContent(n, _) and
-    simpleLocalFlowStep(_, n, _) and
+    exists(Node pred |
+      simpleLocalFlowStep(pred, n, _) and
+      not pred instanceof PostUpdateNode
+    ) and
     not Input::postWithInFlowExclude(n) and
     msg = "PostUpdateNode should not be the target of local flow."
   }
diff --git a/shared/dataflow/codeql/dataflow/internal/DataFlowImplStage1.qll b/shared/dataflow/codeql/dataflow/internal/DataFlowImplStage1.qll
index c7883df0de1..bb79ff62f5b 100644
--- a/shared/dataflow/codeql/dataflow/internal/DataFlowImplStage1.qll
+++ b/shared/dataflow/codeql/dataflow/internal/DataFlowImplStage1.qll
@@ -4,7 +4,7 @@
  * Provides an implementation of a fast initial pruning of global
  * (interprocedural) data flow reachability (Stage 1).
  */
-overlay[local?]
+overlay[local?] // when this is removed, put `overlay[local?]` on `isOverlayNode`.
 module;
 
 private import codeql.util.Unit
@@ -129,23 +129,76 @@ module MakeImplStage1<LocationSig Location, InputSig<Location> Lang> {
 
       private module AlertFiltering = AlertFilteringImpl<Location>;
 
+      /**
+       * Holds if the given node is visible in overlay-only local evaluation.
+       *
+       * This predicate needs to be `overlay[local?]`, either directly or
+       * through annotations from an outer scope. If `Node` is global for the
+       * language under analysis, then every node is considered an overlay
+       * node, which means there will effectively be no overlay-based
+       * filtering of sources and sinks.
+       */
+      private predicate isOverlayNode(Node node) {
+        isEvaluatingInOverlay() and
+        // Any local node is an overlay node if we are evaluating in overlay mode
+        exists(node)
+      }
+
+      /**
+       * The filtering if we aren't meant to be diff-informed.
+       *
+       * Shared between sources and sinks.
+       */
+      overlay[global]
+      pragma[inline]
+      private predicate nonDiffInformedFilter(Node node) {
+        // If we are in base-only global evaluation, do not filter out any sources/sinks.
+        not isEvaluatingInOverlay()
+        or
+        // If the configuration doesn't merge overlays, do not filter out any sources/sinks.
+        not Config::observeOverlayInformedIncrementalMode()
+        or
+        // If we are in global evaluation with an overlay present, restrict
+        // sources/sinks to those visible in the overlay.
+        isOverlayNode(node)
+      }
+
+      overlay[global]
       pragma[nomagic]
       private predicate isFilteredSource(Node source) {
         Config::isSource(source, _) and
+        // Data flow is always incremental in one of two ways.
+        // 1. If the configuration is diff-informed, we filter to only include nodes in the diff,
+        //    which gives the smallest set of nodes.
+        //    If diff information is not available, we do not filter at all.
+        // 2. If not, in global evaluation with overlay, we filter to only
+        //    include nodes from files in the overlay; flow from
+        //    other nodes will be added back later.
+        // We start by seeing if we should be in case 1.
         if Config::observeDiffInformedIncrementalMode()
-        then AlertFiltering::filterByLocation(Config::getASelectedSourceLocation(source))
-        else any()
+        then
+          // Case 1: We are meant to be diff-informed.
+          // We still only filter if we have diff information.
+          AlertFiltering::diffInformationAvailable()
+          implies
+          AlertFiltering::locationIsInDiff(Config::getASelectedSourceLocation(source))
+        else nonDiffInformedFilter(source)
       }
 
+      overlay[global]
       pragma[nomagic]
       private predicate isFilteredSink(Node sink) {
         (
           Config::isSink(sink, _) or
           Config::isSink(sink)
         ) and
+        // See the comments in `isFilteredSource` for the reasoning behind the following.
         if Config::observeDiffInformedIncrementalMode()
-        then AlertFiltering::filterByLocation(Config::getASelectedSinkLocation(sink))
-        else any()
+        then
+          AlertFiltering::diffInformationAvailable()
+          implies
+          AlertFiltering::locationIsInDiff(Config::getASelectedSinkLocation(sink))
+        else nonDiffInformedFilter(sink)
       }
 
       private predicate hasFilteredSource() { isFilteredSource(_) }
diff --git a/shared/dataflow/codeql/dataflow/internal/FlowSummaryImpl.qll b/shared/dataflow/codeql/dataflow/internal/FlowSummaryImpl.qll
index 3eda6709517..6cc9d6f88a4 100644
--- a/shared/dataflow/codeql/dataflow/internal/FlowSummaryImpl.qll
+++ b/shared/dataflow/codeql/dataflow/internal/FlowSummaryImpl.qll
@@ -709,6 +709,9 @@ module Make<
         this = TConsSummaryComponentStack(result, _)
       }
 
+      /** Gets the head of this stack if it is a singleton. */
+      SummaryComponent headOfSingleton() { this = TSingletonSummaryComponentStack(result) }
+
       /** Gets the tail of this stack, if any. */
       SummaryComponentStack tail() { this = TConsSummaryComponentStack(_, result) }
 
@@ -1206,12 +1209,12 @@ module Make<
        * Holds if this node is an exit node, i.e. after all stores have been performed.
        *
        * A local flow step should be added from this node to a data flow node representing
-       * `sc` inside `source`.
+       * `s` inside `source`.
        */
-      predicate isExit(SourceElement source, SummaryComponent sc, string model) {
+      predicate isExit(SourceElement source, SummaryComponentStack s, string model) {
         source = source_ and
         model = model_ and
-        state_.isSourceOutputState(source, TSingletonSummaryComponentStack(sc), _, model)
+        state_.isSourceOutputState(source, s, _, model)
       }
 
       override predicate isHidden() { not this.isEntry(_, _) }
@@ -1460,7 +1463,7 @@ module Make<
 
       DataFlowType getSyntheticGlobalType(SyntheticGlobal sg);
 
-      DataFlowType getSourceType(SourceBase source, SummaryComponent sc);
+      DataFlowType getSourceType(SourceBase source, SummaryComponentStack sc);
 
       DataFlowType getSinkType(SinkBase sink, SummaryComponent sc);
     }
@@ -1543,9 +1546,9 @@ module Make<
         )
         or
         exists(SourceElement source |
-          exists(SummaryComponent sc |
-            n.(SourceOutputNode).isExit(source, sc, _) and
-            result = getSourceType(source, sc)
+          exists(SummaryComponentStack s |
+            n.(SourceOutputNode).isExit(source, s, _) and
+            result = getSourceType(source, s)
           )
           or
           exists(SummaryComponentStack s, ContentSet cont |
@@ -1574,13 +1577,16 @@ module Make<
       /** Gets a call that targets summarized callable `sc`. */
       DataFlowCall getACall(SummarizedCallable sc);
 
+      /** Gets the enclosing callable of `source`. */
+      DataFlowCallable getSourceNodeEnclosingCallable(SourceBase source);
+
       /**
-       * Gets a data flow node corresponding to the `sc` part of `source`.
+       * Gets a data flow node corresponding to the `s` part of `source`.
        *
-       * `sc` is typically `ReturnValue` and the result is the node that
+       * `s` is typically `ReturnValue` and the result is the node that
        * represents the return value of `source`.
        */
-      Node getSourceNode(SourceBase source, SummaryComponent sc);
+      Node getSourceNode(SourceBase source, SummaryComponentStack s);
 
       /**
        * Gets a data flow node corresponding to the `sc` part of `sink`.
@@ -1622,13 +1628,20 @@ module Make<
         )
       }
 
-      predicate sourceLocalStep(SourceOutputNode nodeFrom, Node nodeTo, string model) {
-        exists(SummaryComponent sc, SourceElement source |
+      predicate sourceStep(SourceOutputNode nodeFrom, Node nodeTo, string model, boolean local) {
+        exists(SummaryComponentStack sc, SourceElement source |
           nodeFrom.isExit(source, sc, model) and
-          nodeTo = StepsInput::getSourceNode(source, sc)
+          nodeTo = StepsInput::getSourceNode(source, sc) and
+          if StepsInput::getSourceNodeEnclosingCallable(source) = getNodeEnclosingCallable(nodeTo)
+          then local = true
+          else local = false
         )
       }
 
+      predicate sourceLocalStep(SourceOutputNode nodeFrom, Node nodeTo, string model) {
+        sourceStep(nodeFrom, nodeTo, model, true)
+      }
+
       predicate sinkLocalStep(Node nodeFrom, SinkInputNode nodeTo, string model) {
         exists(SummaryComponent sc, SinkElement sink |
           nodeFrom = StepsInput::getSinkNode(sink, sc) and
@@ -1689,6 +1702,10 @@ module Make<
         )
       }
 
+      predicate sourceJumpStep(SourceOutputNode nodeFrom, Node nodeTo) {
+        sourceStep(nodeFrom, nodeTo, _, false)
+      }
+
       /**
        * Holds if values stored inside content `c` are cleared at `n`. `n` is a
        * synthesized summary node, so in order for values to be cleared at calls
diff --git a/shared/dataflow/qlpack.yml b/shared/dataflow/qlpack.yml
index 759c844c110..7f969fdef42 100644
--- a/shared/dataflow/qlpack.yml
+++ b/shared/dataflow/qlpack.yml
@@ -1,8 +1,9 @@
 name: codeql/dataflow
-version: 2.0.13-dev
+version: 2.0.19-dev
 groups: shared
 library: true
 dependencies:
+  codeql/controlflow: ${workspace}
   codeql/ssa: ${workspace}
   codeql/typetracking: ${workspace}
   codeql/util: ${workspace}
diff --git a/shared/mad/CHANGELOG.md b/shared/mad/CHANGELOG.md
index db8e38ba03e..b0b444f8c41 100644
--- a/shared/mad/CHANGELOG.md
+++ b/shared/mad/CHANGELOG.md
@@ -1,3 +1,27 @@
+## 1.0.34
+
+No user-facing changes.
+
+## 1.0.33
+
+No user-facing changes.
+
+## 1.0.32
+
+No user-facing changes.
+
+## 1.0.31
+
+No user-facing changes.
+
+## 1.0.30
+
+No user-facing changes.
+
+## 1.0.29
+
+No user-facing changes.
+
 ## 1.0.28
 
 No user-facing changes.
diff --git a/shared/mad/change-notes/released/1.0.29.md b/shared/mad/change-notes/released/1.0.29.md
new file mode 100644
index 00000000000..e6b79b88ef3
--- /dev/null
+++ b/shared/mad/change-notes/released/1.0.29.md
@@ -0,0 +1,3 @@
+## 1.0.29
+
+No user-facing changes.
diff --git a/shared/mad/change-notes/released/1.0.30.md b/shared/mad/change-notes/released/1.0.30.md
new file mode 100644
index 00000000000..cb2cf6d0a27
--- /dev/null
+++ b/shared/mad/change-notes/released/1.0.30.md
@@ -0,0 +1,3 @@
+## 1.0.30
+
+No user-facing changes.
diff --git a/shared/mad/change-notes/released/1.0.31.md b/shared/mad/change-notes/released/1.0.31.md
new file mode 100644
index 00000000000..b2642bbb5f8
--- /dev/null
+++ b/shared/mad/change-notes/released/1.0.31.md
@@ -0,0 +1,3 @@
+## 1.0.31
+
+No user-facing changes.
diff --git a/shared/mad/change-notes/released/1.0.32.md b/shared/mad/change-notes/released/1.0.32.md
new file mode 100644
index 00000000000..05c4073731c
--- /dev/null
+++ b/shared/mad/change-notes/released/1.0.32.md
@@ -0,0 +1,3 @@
+## 1.0.32
+
+No user-facing changes.
diff --git a/shared/mad/change-notes/released/1.0.33.md b/shared/mad/change-notes/released/1.0.33.md
new file mode 100644
index 00000000000..3a65838479f
--- /dev/null
+++ b/shared/mad/change-notes/released/1.0.33.md
@@ -0,0 +1,3 @@
+## 1.0.33
+
+No user-facing changes.
diff --git a/shared/mad/change-notes/released/1.0.34.md b/shared/mad/change-notes/released/1.0.34.md
new file mode 100644
index 00000000000..7e097cfe937
--- /dev/null
+++ b/shared/mad/change-notes/released/1.0.34.md
@@ -0,0 +1,3 @@
+## 1.0.34
+
+No user-facing changes.
diff --git a/shared/mad/codeql-pack.release.yml b/shared/mad/codeql-pack.release.yml
index 328402fb34f..b736654032c 100644
--- a/shared/mad/codeql-pack.release.yml
+++ b/shared/mad/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.28
+lastReleaseVersion: 1.0.34
diff --git a/shared/mad/codeql/mad/ModelValidation.qll b/shared/mad/codeql/mad/ModelValidation.qll
index 018c1797ddc..5d4698bed1d 100644
--- a/shared/mad/codeql/mad/ModelValidation.qll
+++ b/shared/mad/codeql/mad/ModelValidation.qll
@@ -39,7 +39,7 @@ module KindValidation<KindValidationConfigSig Config> {
           "response-splitting", "trust-boundary-violation", "template-injection", "url-forward",
           "xslt-injection",
           // JavaScript-only currently, but may be shared in the future
-          "mongodb.sink",
+          "cors-origin", "mongodb.sink",
           // Swift-only currently, but may be shared in the future
           "database-store", "format-string", "hash-iteration-count", "predicate-injection",
           "preferences-store", "tls-protocol-version", "transmission", "webview-fetch", "xxe",
diff --git a/shared/mad/qlpack.yml b/shared/mad/qlpack.yml
index 9b5895697f0..13a5b8507b3 100644
--- a/shared/mad/qlpack.yml
+++ b/shared/mad/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/mad
-version: 1.0.29-dev
+version: 1.0.35-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/quantum/CHANGELOG.md b/shared/quantum/CHANGELOG.md
index ad2e63eb470..83a42fb0551 100644
--- a/shared/quantum/CHANGELOG.md
+++ b/shared/quantum/CHANGELOG.md
@@ -1,3 +1,27 @@
+## 0.0.12
+
+No user-facing changes.
+
+## 0.0.11
+
+No user-facing changes.
+
+## 0.0.10
+
+No user-facing changes.
+
+## 0.0.9
+
+No user-facing changes.
+
+## 0.0.8
+
+No user-facing changes.
+
+## 0.0.7
+
+No user-facing changes.
+
 ## 0.0.6
 
 No user-facing changes.
diff --git a/shared/quantum/change-notes/released/0.0.10.md b/shared/quantum/change-notes/released/0.0.10.md
new file mode 100644
index 00000000000..22391080fd4
--- /dev/null
+++ b/shared/quantum/change-notes/released/0.0.10.md
@@ -0,0 +1,3 @@
+## 0.0.10
+
+No user-facing changes.
diff --git a/shared/quantum/change-notes/released/0.0.11.md b/shared/quantum/change-notes/released/0.0.11.md
new file mode 100644
index 00000000000..19a2a55bd68
--- /dev/null
+++ b/shared/quantum/change-notes/released/0.0.11.md
@@ -0,0 +1,3 @@
+## 0.0.11
+
+No user-facing changes.
diff --git a/shared/quantum/change-notes/released/0.0.12.md b/shared/quantum/change-notes/released/0.0.12.md
new file mode 100644
index 00000000000..0e206033bc4
--- /dev/null
+++ b/shared/quantum/change-notes/released/0.0.12.md
@@ -0,0 +1,3 @@
+## 0.0.12
+
+No user-facing changes.
diff --git a/shared/quantum/change-notes/released/0.0.7.md b/shared/quantum/change-notes/released/0.0.7.md
new file mode 100644
index 00000000000..84da6f18c42
--- /dev/null
+++ b/shared/quantum/change-notes/released/0.0.7.md
@@ -0,0 +1,3 @@
+## 0.0.7
+
+No user-facing changes.
diff --git a/shared/quantum/change-notes/released/0.0.8.md b/shared/quantum/change-notes/released/0.0.8.md
new file mode 100644
index 00000000000..6af2d954c09
--- /dev/null
+++ b/shared/quantum/change-notes/released/0.0.8.md
@@ -0,0 +1,3 @@
+## 0.0.8
+
+No user-facing changes.
diff --git a/shared/quantum/change-notes/released/0.0.9.md b/shared/quantum/change-notes/released/0.0.9.md
new file mode 100644
index 00000000000..c9e17c6d6cf
--- /dev/null
+++ b/shared/quantum/change-notes/released/0.0.9.md
@@ -0,0 +1,3 @@
+## 0.0.9
+
+No user-facing changes.
diff --git a/shared/quantum/codeql-pack.release.yml b/shared/quantum/codeql-pack.release.yml
index cf398ce02aa..997fb8da83c 100644
--- a/shared/quantum/codeql-pack.release.yml
+++ b/shared/quantum/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.0.6
+lastReleaseVersion: 0.0.12
diff --git a/shared/quantum/codeql/quantum/experimental/Model.qll b/shared/quantum/codeql/quantum/experimental/Model.qll
index d8b1402b5e8..f5ab5190e1f 100644
--- a/shared/quantum/codeql/quantum/experimental/Model.qll
+++ b/shared/quantum/codeql/quantum/experimental/Model.qll
@@ -365,7 +365,7 @@ module CryptographyBase<LocationSig Location, InputSig<Location> Input> {
    */
   abstract class ArtifactConsumer extends ConsumerElement {
     /**
-     * Use `getAKnownArtifactSource() instead. The behaviour of these two predicates is equivalent.
+     * Use `getAKnownArtifactSource() instead. The behavior of these two predicates is equivalent.
      */
     final override KnownElement getAKnownSource() { result = this.getAKnownArtifactSource() }
 
@@ -409,8 +409,6 @@ module CryptographyBase<LocationSig Location, InputSig<Location> Input> {
         or
         exists(KeyDerivationOperationInstance op | inputNode = op.getInputConsumer())
         or
-        exists(MacOperationInstance op | inputNode = op.getMessageConsumer())
-        or
         exists(HashOperationInstance op | inputNode = op.getInputConsumer())
       ) and
       this = Input::dfn_to_element(inputNode)
@@ -545,8 +543,6 @@ module CryptographyBase<LocationSig Location, InputSig<Location> Input> {
         or
         exists(KeyGenerationOperationInstance op | inputNode = op.getKeyValueConsumer())
         or
-        exists(MacOperationInstance op | inputNode = op.getKeyConsumer())
-        or
         exists(KeyAgreementSecretGenerationOperationInstance op |
           inputNode = op.getServerKeyConsumer() or
           inputNode = op.getPeerKeyConsumer()
@@ -562,9 +558,10 @@ module CryptographyBase<LocationSig Location, InputSig<Location> Input> {
 
   /**
    * A key-based cryptographic operation instance, encompassing:
-   * 1. **Ciphers**: Encryption and decryption, both symmetric and asymmetric
-   * 1. **Signing**: Signing and verifying, **NOT** including MACs (see `MACOperationInstance`)
-   * 1. **Key encapsulation**: Key wrapping and unwrapping
+   * - **Ciphers**: Encryption and decryption, both symmetric and asymmetric
+   * - **Signing**: Signing and verifying
+   * - **MACs**: Mac generation
+   * - **Key encapsulation**: Key wrapping and unwrapping
    *
    * This class represents a generic key operation that transforms input data
    * using a cryptographic key, producing an output artifact such as ciphertext,
@@ -598,7 +595,8 @@ module CryptographyBase<LocationSig Location, InputSig<Location> Input> {
     /**
      * Gets the consumer of the primary message input for this key operation.
      * For example: plaintext (for encryption), ciphertext (for decryption),
-     * message to be signed, or wrapped key to be unwrapped.
+     * a message to be signed or verified, the message on which a mac is generated,
+     * or a wrapped key to be unwrapped.
      */
     abstract ConsumerInputDataFlowNode getInputConsumer();
 
@@ -614,25 +612,6 @@ module CryptographyBase<LocationSig Location, InputSig<Location> Input> {
     abstract ArtifactOutputDataFlowNode getOutputArtifact();
   }
 
-  /**
-   * A key operation instance representing a signature being generated or verified.
-   */
-  abstract class SignatureOperationInstance extends KeyOperationInstance {
-    /**
-     * Gets the consumer of the signature that is being verified in case of a
-     * verification operation.
-     */
-    abstract ConsumerInputDataFlowNode getSignatureConsumer();
-
-    /**
-     * Gets the consumer of a hash algorithm.
-     * This is intended for signature operations they are explicitly configured
-     * with a hash algorithm. If a signature is not configured with an explicit
-     * hash algorithm, users do not need to provide a consumer (set none()).
-     */
-    abstract AlgorithmValueConsumer getHashAlgorithmValueConsumer();
-  }
-
   /**
    * A key-based algorithm instance used in cryptographic operations such as encryption, decryption,
    * signing, verification, and key wrapping.
@@ -651,6 +630,7 @@ module CryptographyBase<LocationSig Location, InputSig<Location> Input> {
      * - `TSymmetricCipher(OtherSymmetricCipherType())`
      * - `TAsymmetricCipher(OtherAsymmetricCipherType())`
      * - `TSignature(OtherSignatureAlgorithmType())`
+     * - `TMacAlgorithm(OtherMacAlgorithmType())`
      * - `TKeyEncapsulation(OtherKEMAlgorithmType())`
      *
      * If the category of algorithm is not known, the following type should be used:
@@ -710,6 +690,41 @@ module CryptographyBase<LocationSig Location, InputSig<Location> Input> {
     predicate shouldHavePaddingScheme() { any() }
   }
 
+  abstract class HmacAlgorithmInstance extends KeyOperationAlgorithmInstance {
+    HmacAlgorithmInstance() { this.getAlgorithmType() = KeyOpAlg::TMac(KeyOpAlg::HMAC()) }
+
+    /**
+     * Gets the hash algorithm used by this HMAC algorithm.
+     */
+    abstract AlgorithmValueConsumer getHashAlgorithmValueConsumer();
+
+    /**
+     * CMACs will have algorithms that have modes of operation but that
+     * is associated with the cipher algorithm, that is itself
+     * associated to the MAC algorithm.
+     */
+    override predicate shouldHaveModeOfOperation() { none() }
+
+    override ModeOfOperationAlgorithmInstance getModeOfOperationAlgorithm() { none() }
+
+    /**
+     * CMACs may have padding but the padding is associated with the cipher algorithm,
+     * that is itself associated to the MAC algorithm.
+     */
+    override predicate shouldHavePaddingScheme() { none() }
+
+    override PaddingAlgorithmInstance getPaddingAlgorithm() { none() }
+  }
+
+  abstract class CmacAlgorithmInstance extends KeyOperationAlgorithmInstance {
+    CmacAlgorithmInstance() { this.getAlgorithmType() = KeyOpAlg::TMac(KeyOpAlg::CMAC()) }
+
+    /**
+     * Gets the cipher algorithm used by this CMAC algorithm.
+     */
+    abstract AlgorithmValueConsumer getCipherAlgorithmValueConsumer();
+  }
+
   abstract class ModeOfOperationAlgorithmInstance extends AlgorithmInstance {
     /**
      * Gets the type of this mode of operation, e.g., "ECB" or "CBC".
@@ -760,41 +775,48 @@ module CryptographyBase<LocationSig Location, InputSig<Location> Input> {
     abstract HashAlgorithmInstance getMgf1HashAlgorithm();
   }
 
-  abstract class MacAlgorithmInstance extends AlgorithmInstance {
+  /**
+   * A parent class for signature and MAC operations.
+   * Signatures and macs are the asymmetric and symmetric analogs of each other,
+   * and some APIs can reuse a single operation to do either signing on mac.
+   * Users should extend this class when an operation can be either a signature or a MAC,
+   * and where the instance is not obviously one or the other from use.
+   */
+  abstract class SignatureOrMacOperationInstance extends KeyOperationInstance {
     /**
-     * Gets the type of this MAC algorithm, e.g., "HMAC" or "CMAC".
-     */
-    abstract MacType getMacType();
-
-    /**
-     * Gets the isolated name as it appears in source, e.g., "HMAC-SHA256" in "HMAC-SHA256/UnrelatedInformation".
-     *
-     * This name should not be parsed or formatted beyond isolating the raw MAC name if necessary.
-     */
-    abstract string getRawMacAlgorithmName();
-  }
-
-  abstract class MacOperationInstance extends OperationInstance {
-    /**
-     * Gets the message input used in this operation.
-     */
-    abstract ConsumerInputDataFlowNode getMessageConsumer();
-
-    /**
-     * Gets the key used in this operation.
-     */
-    abstract ConsumerInputDataFlowNode getKeyConsumer();
-  }
-
-  abstract class HmacAlgorithmInstance extends MacAlgorithmInstance {
-    HmacAlgorithmInstance() { this.getMacType() = HMAC() }
-
-    /**
-     * Gets the hash algorithm used by this HMAC algorithm.
+     * Gets the consumer of a hash algorithm.
+     * This is intended for mac/signing operations they are explicitly configured
+     * with a hash algorithm. If the operation is not configured with an explicit
+     * hash algorithm, users do not need to provide a consumer (set none()).
      */
     abstract AlgorithmValueConsumer getHashAlgorithmValueConsumer();
+
+    /**
+     * Holds if this operation has a hash algorithm consumer.
+     * I.e., holds if the operation is configured to perform a hash
+     * on a message before signing and algorithm is passed in.
+     * The hash algorithm consumer must be specified through
+     * `getHashAlgorithmValueConsumer()`.
+     */
+    abstract predicate hasHashAlgorithmConsumer();
   }
 
+  /**
+   * A key operation instance representing a signature being generated or verified.
+   * Note: These instances are known to always be signature operations.
+   * If an API allows an operation to be used for both MAC and signature,
+   * it should be modeled as a `SignatureOrMacOperationInstance` instead,
+   * even if all configuration paths to the current operation only configure it as a signature operation.
+   */
+  abstract class SignatureOperationInstance extends SignatureOrMacOperationInstance {
+    /**
+     * Gets the consumer of the signature when this operation is a verification operation.
+     */
+    abstract ConsumerInputDataFlowNode getSignatureConsumer();
+  }
+
+  abstract class MacOperationInstance extends SignatureOrMacOperationInstance { }
+
   abstract class EllipticCurveInstance extends AlgorithmInstance {
     /**
      * Gets the isolated name as it appears in source
@@ -803,20 +825,20 @@ module CryptographyBase<LocationSig Location, InputSig<Location> Input> {
      */
     abstract string getRawEllipticCurveName();
 
-    abstract TEllipticCurveFamilyType getEllipticCurveFamilyType();
+    abstract TEllipticCurveType getEllipticCurveType();
 
     abstract int getKeySize();
 
     /**
      * The 'parsed' curve name, e.g., "P-256" or "secp256r1"
-     * The parsed name is full name of the curve, including the family, key size, and other
+     * The parsed name is full name of the curve, including the type, key size, and other
      * typical parameters found on the name.
      *
      * In many cases this will be equivalent to `getRawEllipticCurveAlgorithmName()`,
      * but not always (e.g., if the curve is specified through a raw NID).
      *
      * In cases like an NID, we want the standardized name so users can quickly
-     * understand what the curve is, while also parsing out the family and key size
+     * understand what the curve is, while also parsing out the type and key size
      * separately.
      */
     string getParsedEllipticCurveName() { result = this.getRawEllipticCurveName() }
@@ -832,7 +854,7 @@ module CryptographyBase<LocationSig Location, InputSig<Location> Input> {
     /**
      * Gets the type of this digest algorithm, e.g., "SHA1", "SHA2", "MD5" etc.
      */
-    abstract THashType getHashFamily();
+    abstract THashType getHashType();
 
     /**
      * Gets the isolated name as it appears in source, e.g., "SHA-256" in "SHA-256/PKCS7Padding".
@@ -1063,11 +1085,6 @@ module CryptographyBase<LocationSig Location, InputSig<Location> Input> {
     exists(KeyOperationInstance op | op.getAnAlgorithmValueConsumer() = avc)
   }
 
-  private predicate isMacAvc(AlgorithmValueConsumer avc) {
-    exists(MacOperationInstance op | op.getAnAlgorithmValueConsumer() = avc) or
-    exists(Pbkdf2AlgorithmInstance alg | avc = alg.getHmacAlgorithmValueConsumer())
-  }
-
   private predicate isKeyDerivationAvc(AlgorithmValueConsumer avc) {
     exists(KeyDerivationOperationInstance op | op.getAnAlgorithmValueConsumer() = avc)
   }
@@ -1091,9 +1108,6 @@ module CryptographyBase<LocationSig Location, InputSig<Location> Input> {
   final private class HashAlgorithmInstanceOrValueConsumer =
     AlgorithmInstanceOrValueConsumer<HashAlgorithmInstance, isHashAvc/1>::Union;
 
-  final private class MacAlgorithmInstanceOrValueConsumer =
-    AlgorithmInstanceOrValueConsumer<MacAlgorithmInstance, isMacAvc/1>::Union;
-
   final private class KeyDerivationAlgorithmInstanceOrValueConsumer =
     AlgorithmInstanceOrValueConsumer<KeyDerivationAlgorithmInstance, isKeyDerivationAvc/1>::Union;
 
@@ -1128,13 +1142,11 @@ module CryptographyBase<LocationSig Location, InputSig<Location> Input> {
     TPaddingAlgorithm(PaddingAlgorithmInstance e) or
     // All other operations
     THashOperation(HashOperationInstance e) or
-    TMacOperation(MacOperationInstance e) or
     TKeyAgreementOperation(KeyAgreementSecretGenerationOperationInstance e) or
     // All other algorithms
     TEllipticCurve(EllipticCurveInstanceOrValueConsumer e) or
     THashAlgorithm(HashAlgorithmInstanceOrValueConsumer e) or
     TKeyDerivationAlgorithm(KeyDerivationAlgorithmInstanceOrValueConsumer e) or
-    TMacAlgorithm(MacAlgorithmInstanceOrValueConsumer e) or
     TKeyAgreementAlgorithm(KeyAgreementAlgorithmInstanceOrValueConsumer e) or
     // Generic source nodes, i.e., sources of data that are not resolvable to a specific known asset.
     TGenericSourceNode(GenericSourceInstance e) {
@@ -1455,7 +1467,8 @@ module CryptographyBase<LocationSig Location, InputSig<Location> Input> {
   class AsymmetricAlgorithmNode extends TKeyCreationCandidateAlgorithm instanceof AlgorithmNode {
     AsymmetricAlgorithmNode() {
       this instanceof EllipticCurveNode or
-      this.(KeyOperationAlgorithmNode).isAsymmetric()
+      this.(KeyOperationAlgorithmNode).isAsymmetric() or
+      this instanceof KeyAgreementAlgorithmNode
     }
 
     string toString() { result = super.toString() }
@@ -1485,6 +1498,10 @@ module CryptographyBase<LocationSig Location, InputSig<Location> Input> {
             .getAGenericSourceNode()
     }
 
+    KeyCreationOperationNode getCreatingOperation() {
+      instance.(KeyArtifactOutputInstance).getCreator() = result.asElement()
+    }
+
     KeyCreationCandidateAlgorithmNode getAKnownAlgorithm() {
       result =
         instance
@@ -1563,6 +1580,8 @@ module CryptographyBase<LocationSig Location, InputSig<Location> Input> {
       result = instance.getKeySizeConsumer().getConsumer().getAKnownSourceNode()
     }
 
+    ConsumerInputDataFlowNode getKeySizeConsumer() { result = instance.getKeySizeConsumer() }
+
     /**
      * Gets the key artifact produced by this operation.
      */
@@ -1582,57 +1601,36 @@ module CryptographyBase<LocationSig Location, InputSig<Location> Input> {
   /**
    * A MAC operation that produces a MAC value.
    */
-  final class MacOperationNode extends OperationNode, TMacOperation {
-    MacOperationInstance instance;
-
-    MacOperationNode() { this = TMacOperation(instance) }
+  final class MacOperationNode extends SignatureOrMacOperationNode {
+    MacOperationNode() {
+      this.getKeyOperationSubtype() = TMacMode() and
+      // If the type could be a signature, then we will not consider it a mac operation exclusively.
+      not exists(KeyOperationSubtype t | t = this.getKeyOperationSubtype() and t = TSignMode())
+    }
 
     final override string getInternalType() { result = "MACOperation" }
 
     override LocatableElement asElement() { result = instance }
 
-    override predicate isCandidateAlgorithmNode(AlgorithmNode node) {
-      node instanceof MacAlgorithmNode
-    }
-
     MessageArtifactNode getAMessage() {
-      result.asElement() = instance.getMessageConsumer().getConsumer()
+      result.asElement() = instance.getInputConsumer().getConsumer()
     }
 
-    KeyArtifactNode getAKey() { result.asElement() = instance.getKeyConsumer().getConsumer() }
-
     override NodeBase getChild(string edgeName) {
       result = super.getChild(edgeName)
       or
       // [KNOWN_OR_UNKNOWN]
       edgeName = "Message" and
-      if exists(this.getAMessage()) then result = this.getAMessage() else result = this
-      or
-      // [KNOWN_OR_UNKNOWN]
-      edgeName = "Key" and
-      if exists(this.getAKey()) then result = this.getAKey() else result = this
+      (if exists(this.getAMessage()) then result = this.getAMessage() else result = this)
     }
   }
 
-  /**
-   * A MAC algorithm, such as HMAC or CMAC.
-   */
-  class MacAlgorithmNode extends AlgorithmNode, TMacAlgorithm {
-    MacAlgorithmInstanceOrValueConsumer instance;
-
-    MacAlgorithmNode() { this = TMacAlgorithm(instance) }
-
-    final override string getInternalType() { result = "MACAlgorithm" }
-
-    override LocatableElement asElement() { result = instance }
-
-    final override string getRawAlgorithmName() {
-      result = instance.asAlg().getRawMacAlgorithmName()
+  abstract class MacAlgorithmNode extends KeyOperationAlgorithmNode {
+    MacAlgorithmNode() {
+      instance.(KeyOperationAlgorithmInstance).getAlgorithmType() = KeyOpAlg::TMac(_)
     }
 
-    MacType getMacType() { result = instance.asAlg().getMacType() }
-
-    override string getAlgorithmName() { result = this.getMacType().toString() }
+    override string getInternalType() { result = "MACAlgorithm" }
   }
 
   final class HmacAlgorithmNode extends MacAlgorithmNode {
@@ -1640,7 +1638,9 @@ module CryptographyBase<LocationSig Location, InputSig<Location> Input> {
 
     HmacAlgorithmNode() { hmacInstance = instance.asAlg() }
 
-    NodeBase getHashAlgorithmOrUnknown() {
+    override string getInternalType() { result = "HMACAlgorithm" }
+
+    HashAlgorithmNode getHashAlgorithmOrUnknown() {
       result.asElement() = hmacInstance.getHashAlgorithmValueConsumer().getASource()
     }
 
@@ -1655,6 +1655,7 @@ module CryptographyBase<LocationSig Location, InputSig<Location> Input> {
     }
   }
 
+  // TODO: CMAC model
   class KeyAgreementOperationNode extends OperationNode, TKeyAgreementOperation {
     KeyAgreementSecretGenerationOperationInstance instance;
 
@@ -1711,6 +1712,8 @@ module CryptographyBase<LocationSig Location, InputSig<Location> Input> {
     }
 
     override string getAlgorithmName() { result = this.getRawAlgorithmName() } // TODO: standardize?
+
+    KeyAgreementType getKeyAgreementType() { result = instance.asAlg().getKeyAgreementType() }
   }
 
   class KeyGenerationOperationNode extends KeyCreationOperationNode {
@@ -1754,11 +1757,19 @@ module CryptographyBase<LocationSig Location, InputSig<Location> Input> {
     }
 
     GenericSourceNode getIterationCount() {
-      result.asElement() = kdfInstance.getIterationCountConsumer().getConsumer().getAGenericSource()
+      result.asElement() = this.getIterationCountConsumer().getConsumer().getAGenericSource()
     }
 
     GenericSourceNode getOutputKeySize() {
-      result.asElement() = kdfInstance.getOutputKeySizeConsumer().getConsumer().getAGenericSource()
+      result.asElement() = this.getOutputKeySizeConsumer().getConsumer().getAGenericSource()
+    }
+
+    ConsumerInputDataFlowNode getIterationCountConsumer() {
+      result = kdfInstance.getIterationCountConsumer()
+    }
+
+    ConsumerInputDataFlowNode getOutputKeySizeConsumer() {
+      result = kdfInstance.getOutputKeySizeConsumer()
     }
 
     override predicate isCandidateAlgorithmNode(AlgorithmNode node) {
@@ -1841,9 +1852,7 @@ module CryptographyBase<LocationSig Location, InputSig<Location> Input> {
    * An SCRYPT key derivation algorithm node.
    */
   class ScryptAlgorithmNode extends KeyDerivationAlgorithmNode {
-    ScryptAlgorithmInstance scryptInstance;
-
-    ScryptAlgorithmNode() { scryptInstance = instance.asAlg() }
+    ScryptAlgorithmNode() { instance.asAlg() instanceof ScryptAlgorithmInstance }
 
     /**
      * Gets the iteration count (`N`) argument
@@ -1871,6 +1880,7 @@ module CryptographyBase<LocationSig Location, InputSig<Location> Input> {
     TUnwrapMode() or
     TSignMode() or
     TVerifyMode() or
+    TMacMode() or
     TUnknownKeyOperationMode()
 
   /**
@@ -1890,6 +1900,8 @@ module CryptographyBase<LocationSig Location, InputSig<Location> Input> {
       or
       result = "Verify" and this = TVerifyMode()
       or
+      result = "Mac" and this = TMacMode()
+      or
       result = "Unknown" and this = TUnknownKeyOperationMode()
     }
   }
@@ -1981,9 +1993,20 @@ module CryptographyBase<LocationSig Location, InputSig<Location> Input> {
     string nodeName;
 
     CipherOperationNode() {
-      this.getKeyOperationSubtype() = TEncryptMode() and nodeName = "EncryptOperation"
-      or
-      this.getKeyOperationSubtype() = TDecryptMode() and nodeName = "DecryptOperation"
+      (
+        if
+          this.getKeyOperationSubtype() = TEncryptMode() and
+          this.getKeyOperationSubtype() = TDecryptMode()
+        then nodeName = "CipherOperation"
+        else (
+          if this.getKeyOperationSubtype() = TEncryptMode()
+          then nodeName = "EncryptOperation"
+          else (
+            this.getKeyOperationSubtype() = TDecryptMode() and
+            nodeName = "DecryptOperation"
+          )
+        )
+      )
     }
 
     override string getInternalType() { result = nodeName }
@@ -1993,22 +2016,63 @@ module CryptographyBase<LocationSig Location, InputSig<Location> Input> {
     string nodeName;
 
     KeyEncapsulationOperationNode() {
-      this.getKeyOperationSubtype() = TWrapMode() and nodeName = "WrapOperation"
-      or
-      this.getKeyOperationSubtype() = TUnwrapMode() and nodeName = "UnwrapOperation"
+      (
+        if
+          this.getKeyOperationSubtype() = TWrapMode() and
+          this.getKeyOperationSubtype() = TUnwrapMode()
+        then nodeName = "KeyEncapsulationOperation"
+        else (
+          if this.getKeyOperationSubtype() = TWrapMode()
+          then nodeName = "WrapOperation"
+          else (
+            this.getKeyOperationSubtype() = TUnwrapMode() and
+            nodeName = "UnwrapOperation"
+          )
+        )
+      )
     }
 
     override string getInternalType() { result = nodeName }
   }
 
-  class SignatureOperationNode extends KeyOperationNode {
+  class SignatureOrMacOperationNode extends KeyOperationNode {
+    override SignatureOrMacOperationInstance instance;
+
+    SignatureOrMacOperationNode() {
+      this.getKeyOperationSubtype() = TSignMode()
+      or
+      this.getKeyOperationSubtype() = TVerifyMode()
+      or
+      this.getKeyOperationSubtype() = TMacMode()
+    }
+
+    override string getInternalType() { result = "SignatureOrMACOperation" }
+
+    HashAlgorithmNode getHashAlgorithm() {
+      result = instance.getHashAlgorithmValueConsumer().getAKnownSourceNode()
+    }
+
+    override NodeBase getChild(string key) {
+      result = super.getChild(key)
+      or
+      // [KNOWN_OR_UNKNOWN]
+      key = "HashAlgorithm" and
+      (if exists(this.getHashAlgorithm()) then result = this.getHashAlgorithm() else result = this)
+    }
+  }
+
+  class SignatureOperationNode extends SignatureOrMacOperationNode {
     override SignatureOperationInstance instance;
     string nodeName;
 
     SignatureOperationNode() {
-      this.getKeyOperationSubtype() = TSignMode() and nodeName = "SignOperation"
-      or
-      this.getKeyOperationSubtype() = TVerifyMode() and nodeName = "VerifyOperation"
+      (
+        this.getKeyOperationSubtype() = TSignMode() and nodeName = "SignOperation"
+        or
+        this.getKeyOperationSubtype() = TVerifyMode() and nodeName = "VerifyOperation"
+      ) and
+      // If the type could be a mac, then we will not consider it a signature operation exclusively.
+      not exists(KeyOperationSubtype t | t = this.getKeyOperationSubtype() and t = TMacMode())
     }
 
     override string getInternalType() { result = nodeName }
@@ -2017,10 +2081,6 @@ module CryptographyBase<LocationSig Location, InputSig<Location> Input> {
       result.asElement() = instance.getSignatureConsumer().getConsumer()
     }
 
-    HashAlgorithmNode getHashAlgorithm() {
-      result = instance.getHashAlgorithmValueConsumer().getAKnownSourceNode()
-    }
-
     override NodeBase getChild(string key) {
       result = super.getChild(key)
       or
@@ -2272,13 +2332,13 @@ module CryptographyBase<LocationSig Location, InputSig<Location> Input> {
      *
      * When modeling a new hashing algorithm, use this predicate to specify the type of the algorithm.
      */
-    HashType getHashFamily() { result = instance.asAlg().getHashFamily() }
+    HashType getHashType() { result = instance.asAlg().getHashType() }
 
-    override string getAlgorithmName() { result = this.getHashFamily().toString() }
+    override string getAlgorithmName() { result = this.getHashType().toString() }
 
     int getDigestLength() {
       result = instance.asAlg().getFixedDigestLength() or
-      fixedImplicitDigestLength(instance.asAlg().getHashFamily(), result)
+      fixedImplicitDigestLength(instance.asAlg().getHashType(), result)
     }
 
     final override predicate properties(string key, string value, Location location) {
@@ -2319,9 +2379,7 @@ module CryptographyBase<LocationSig Location, InputSig<Location> Input> {
 
     override string getAlgorithmName() { result = this.getRawAlgorithmName() }
 
-    EllipticCurveFamilyType getEllipticCurveFamilyType() {
-      result = instance.asAlg().getEllipticCurveFamilyType()
-    }
+    EllipticCurveType getEllipticCurveType() { result = instance.asAlg().getEllipticCurveType() }
 
     override predicate properties(string key, string value, Location location) {
       super.properties(key, value, location)
@@ -2335,6 +2393,10 @@ module CryptographyBase<LocationSig Location, InputSig<Location> Input> {
       key = "ParsedName" and
       value = instance.asAlg().getParsedEllipticCurveName() and
       location = this.getLocation()
+      or
+      key = "CurveType" and
+      value = this.getEllipticCurveType().toString() and
+      location = this.getLocation()
     }
   }
 }
diff --git a/shared/quantum/codeql/quantum/experimental/Standardization.qll b/shared/quantum/codeql/quantum/experimental/Standardization.qll
index 29c5b58d343..cc43fcec6e2 100644
--- a/shared/quantum/codeql/quantum/experimental/Standardization.qll
+++ b/shared/quantum/codeql/quantum/experimental/Standardization.qll
@@ -14,8 +14,9 @@ module Types {
       TSymmetricCipher(TSymmetricCipherType t) or
       TAsymmetricCipher(TAsymmetricCipherType t) or
       TSignature(TSignatureAlgorithmType t) or
+      TMac(TMacAlgorithmType t) or
       TKeyEncapsulation(TKemAlgorithmType t) or
-      TUnknownKeyOperationAlgorithmType()
+      TOtherKeyOperationAlgorithmType()
 
     // Parameterized algorithm types
     newtype TSymmetricCipherType =
@@ -38,6 +39,7 @@ module Types {
       RC5() or
       SEED() or
       SM4() or
+      SKIPJACK() or
       OtherSymmetricCipherType()
 
     newtype TAsymmetricCipherType =
@@ -48,6 +50,7 @@ module Types {
       DSA() or
       ECDSA() or
       EDDSA() or // e.g., ED25519 or ED448
+      HSS_LMS() or // Leighton-Micali Signature
       OtherSignatureAlgorithmType()
 
     newtype TKemAlgorithmType =
@@ -55,10 +58,15 @@ module Types {
       FRODO_KEM() or
       OtherKemAlgorithmType()
 
+    newtype TMacAlgorithmType =
+      HMAC() or
+      CMAC() or
+      OtherMacAlgorithmType()
+
     newtype TCipherStructureType =
       Block() or
       Stream() or
-      UnknownCipherStructureType()
+      OtherCipherStructureType()
 
     class CipherStructureType extends TCipherStructureType {
       string toString() {
@@ -66,7 +74,7 @@ module Types {
         or
         result = "Stream" and this = Stream()
         or
-        result = "Unknown" and this = UnknownCipherStructureType()
+        result = "Unknown" and this = OtherCipherStructureType()
       }
     }
 
@@ -111,9 +119,11 @@ module Types {
       or
       type = SM4() and name = "SM4" and s = Block()
       or
+      type = SKIPJACK() and name = "Skipjack" and s = Block()
+      or
       type = OtherSymmetricCipherType() and
       name = "UnknownSymmetricCipher" and
-      s = UnknownCipherStructureType()
+      s = OtherCipherStructureType()
     }
 
     class AlgorithmType extends TAlgorithm {
@@ -143,8 +153,15 @@ module Types {
         or
         this = TKeyEncapsulation(OtherKemAlgorithmType()) and result = "UnknownKEM"
         or
+        // MAC algorithms
+        this = TMac(HMAC()) and result = "HMAC"
+        or
+        this = TMac(CMAC()) and result = "CMAC"
+        or
+        this = TMac(OtherMacAlgorithmType()) and result = "UnknownMac"
+        or
         // Unknown
-        this = TUnknownKeyOperationAlgorithmType() and result = "Unknown"
+        this = TOtherKeyOperationAlgorithmType() and result = "Unknown"
       }
 
       int getImplicitKeySize() {
@@ -200,7 +217,9 @@ module Types {
       CCM() or // Used in lightweight cryptography (IoT, WPA2)
       SIV() or // Misuse-resistant encryption, used in secure storage
       OCB() or // Efficient AEAD mode
+      KWP() or
       OFB() or
+      PCBC() or
       OtherMode()
 
     class ModeOfOperationType extends TModeOfOperationType {
@@ -305,21 +324,6 @@ module Types {
     }
   }
 
-  newtype TMacType =
-    HMAC() or
-    CMAC() or
-    OtherMacType()
-
-  class MacType extends TMacType {
-    string toString() {
-      this = HMAC() and result = "HMAC"
-      or
-      this = CMAC() and result = "CMAC"
-      or
-      this = OtherMacType() and result = "UnknownMacType"
-    }
-  }
-
   // Key agreement algorithms
   newtype TKeyAgreementType =
     DH() or // Diffie-Hellman
@@ -345,7 +349,7 @@ module Types {
   /**
    * Elliptic curve algorithms
    */
-  newtype TEllipticCurveFamilyType =
+  newtype TEllipticCurveType =
     NIST() or
     SEC() or
     NUMS() or
@@ -358,7 +362,7 @@ module Types {
     ES() or
     OtherEllipticCurveType()
 
-  class EllipticCurveFamilyType extends TEllipticCurveFamilyType {
+  class EllipticCurveType extends TEllipticCurveType {
     string toString() {
       this = NIST() and result = "NIST"
       or
@@ -446,7 +450,7 @@ module Types {
    */
   bindingset[rawName]
   predicate ellipticCurveNameToKnownKeySizeAndFamilyMapping(
-    string rawName, int keySize, TEllipticCurveFamilyType curveFamily
+    string rawName, int keySize, TEllipticCurveType curveFamily
   ) {
     exists(string curveName | curveName = rawName.toUpperCase() |
       isSecCurve(curveName, keySize) and curveFamily = SEC()
diff --git a/shared/quantum/qlpack.yml b/shared/quantum/qlpack.yml
index 9046eb79e24..0cc0fbad906 100644
--- a/shared/quantum/qlpack.yml
+++ b/shared/quantum/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/quantum
-version: 0.0.7-dev
+version: 0.0.13-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/rangeanalysis/CHANGELOG.md b/shared/rangeanalysis/CHANGELOG.md
index 41d2e7d037c..640d26270e1 100644
--- a/shared/rangeanalysis/CHANGELOG.md
+++ b/shared/rangeanalysis/CHANGELOG.md
@@ -1,3 +1,27 @@
+## 1.0.34
+
+No user-facing changes.
+
+## 1.0.33
+
+No user-facing changes.
+
+## 1.0.32
+
+No user-facing changes.
+
+## 1.0.31
+
+No user-facing changes.
+
+## 1.0.30
+
+No user-facing changes.
+
+## 1.0.29
+
+No user-facing changes.
+
 ## 1.0.28
 
 No user-facing changes.
diff --git a/shared/rangeanalysis/change-notes/released/1.0.29.md b/shared/rangeanalysis/change-notes/released/1.0.29.md
new file mode 100644
index 00000000000..e6b79b88ef3
--- /dev/null
+++ b/shared/rangeanalysis/change-notes/released/1.0.29.md
@@ -0,0 +1,3 @@
+## 1.0.29
+
+No user-facing changes.
diff --git a/shared/rangeanalysis/change-notes/released/1.0.30.md b/shared/rangeanalysis/change-notes/released/1.0.30.md
new file mode 100644
index 00000000000..cb2cf6d0a27
--- /dev/null
+++ b/shared/rangeanalysis/change-notes/released/1.0.30.md
@@ -0,0 +1,3 @@
+## 1.0.30
+
+No user-facing changes.
diff --git a/shared/rangeanalysis/change-notes/released/1.0.31.md b/shared/rangeanalysis/change-notes/released/1.0.31.md
new file mode 100644
index 00000000000..b2642bbb5f8
--- /dev/null
+++ b/shared/rangeanalysis/change-notes/released/1.0.31.md
@@ -0,0 +1,3 @@
+## 1.0.31
+
+No user-facing changes.
diff --git a/shared/rangeanalysis/change-notes/released/1.0.32.md b/shared/rangeanalysis/change-notes/released/1.0.32.md
new file mode 100644
index 00000000000..05c4073731c
--- /dev/null
+++ b/shared/rangeanalysis/change-notes/released/1.0.32.md
@@ -0,0 +1,3 @@
+## 1.0.32
+
+No user-facing changes.
diff --git a/shared/rangeanalysis/change-notes/released/1.0.33.md b/shared/rangeanalysis/change-notes/released/1.0.33.md
new file mode 100644
index 00000000000..3a65838479f
--- /dev/null
+++ b/shared/rangeanalysis/change-notes/released/1.0.33.md
@@ -0,0 +1,3 @@
+## 1.0.33
+
+No user-facing changes.
diff --git a/shared/rangeanalysis/change-notes/released/1.0.34.md b/shared/rangeanalysis/change-notes/released/1.0.34.md
new file mode 100644
index 00000000000..7e097cfe937
--- /dev/null
+++ b/shared/rangeanalysis/change-notes/released/1.0.34.md
@@ -0,0 +1,3 @@
+## 1.0.34
+
+No user-facing changes.
diff --git a/shared/rangeanalysis/codeql-pack.release.yml b/shared/rangeanalysis/codeql-pack.release.yml
index 328402fb34f..b736654032c 100644
--- a/shared/rangeanalysis/codeql-pack.release.yml
+++ b/shared/rangeanalysis/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.28
+lastReleaseVersion: 1.0.34
diff --git a/shared/rangeanalysis/codeql/rangeanalysis/RangeAnalysis.qll b/shared/rangeanalysis/codeql/rangeanalysis/RangeAnalysis.qll
index 1d17ad8346c..ff17f9b5405 100644
--- a/shared/rangeanalysis/codeql/rangeanalysis/RangeAnalysis.qll
+++ b/shared/rangeanalysis/codeql/rangeanalysis/RangeAnalysis.qll
@@ -923,17 +923,18 @@ module RangeStage<
   }
 
   /**
-   * Holds if `b + delta` is a valid bound for `inp` when used as an input to
-   * `phi` along `edge`.
+   * Holds if `b + delta` is a valid bound for the input `inp` to `phi` along
+   * the edge with rank `rix`.
    * - `upper = true`  : `inp <= b + delta`
    * - `upper = false` : `inp >= b + delta`
    */
   private predicate boundedPhiInp(
-    Sem::SsaPhiNode phi, Sem::SsaVariable inp, SsaReadPositionPhiInputEdge edge, SemBound b,
-    D::Delta delta, boolean upper, boolean fromBackEdge, D::Delta origdelta, SemReason reason
+    Sem::SsaPhiNode phi, int rix, SemBound b, D::Delta delta, boolean upper, boolean fromBackEdge,
+    D::Delta origdelta, SemReason reason
   ) {
-    edge.phiInput(phi, inp) and
-    exists(D::Delta d, boolean fromBackEdge0 |
+    exists(
+      D::Delta d, boolean fromBackEdge0, Sem::SsaVariable inp, SsaReadPositionPhiInputEdge edge
+    |
       boundedSsa(inp, b, d, edge, upper, fromBackEdge0, origdelta, reason)
       or
       boundedPhi(inp, b, d, upper, fromBackEdge0, origdelta, reason)
@@ -945,6 +946,7 @@ module RangeStage<
       origdelta = D::fromFloat(0) and
       reason = TSemNoReason()
     |
+      rankedPhiInput(phi, inp, edge, rix) and
       if backEdge(phi, inp, edge)
       then
         fromBackEdge = true and
@@ -963,33 +965,30 @@ module RangeStage<
   }
 
   /**
-   * Holds if `b + delta` is a valid bound for `inp` when used as an input to
-   * `phi` along `edge`.
+   * Holds if `b + delta` is a valid bound for the input `inp` to `phi` along
+   * the edge with rank `rix`.
    * - `upper = true`  : `inp <= b + delta`
    * - `upper = false` : `inp >= b + delta`
    *
-   * Equivalent to `boundedPhiInp(phi, inp, edge, b, delta, upper, _, _, _)`.
+   * Equivalent to `boundedPhiInp(phi, rix, b, delta, upper, _, _, _)`.
    */
   pragma[noinline]
   private predicate boundedPhiInp1(
-    Sem::SsaPhiNode phi, SemBound b, boolean upper, Sem::SsaVariable inp,
-    SsaReadPositionPhiInputEdge edge, D::Delta delta
+    Sem::SsaPhiNode phi, SemBound b, boolean upper, int rix, D::Delta delta
   ) {
-    boundedPhiInp(phi, inp, edge, b, delta, upper, _, _, _)
+    boundedPhiInp(phi, rix, b, delta, upper, _, _, _)
   }
 
   /**
-   * Holds if `phi` is a valid bound for `inp` when used as an input to `phi`
-   * along `edge`.
+   * Holds if `phi` is a valid bound for the input `inp` to `phi` along the
+   * edge with rank `rix`.
    * - `upper = true`  : `inp <= phi`
    * - `upper = false` : `inp >= phi`
    */
-  private predicate selfBoundedPhiInp(
-    Sem::SsaPhiNode phi, Sem::SsaVariable inp, SsaReadPositionPhiInputEdge edge, boolean upper
-  ) {
+  private predicate selfBoundedPhiInp(Sem::SsaPhiNode phi, int rix, boolean upper) {
     exists(D::Delta d, SemSsaBound phibound |
       phibound.getVariable() = phi and
-      boundedPhiInp(phi, inp, edge, phibound, d, upper, _, _, _) and
+      boundedPhiInp(phi, rix, phibound, d, upper, _, _, _) and
       (
         upper = true and D::toFloat(d) <= 0
         or
@@ -1009,33 +1008,34 @@ module RangeStage<
     Sem::SsaPhiNode phi, boolean upper, SemBound b, D::Delta delta, boolean fromBackEdge,
     D::Delta origdelta, SemReason reason
   ) {
-    boundedPhiInp(phi, _, _, b, delta, upper, fromBackEdge, origdelta, reason)
+    boundedPhiInp(phi, _, b, delta, upper, fromBackEdge, origdelta, reason)
   }
 
   /**
    * Holds if the candidate bound `b + delta` for `phi` is valid for the phi input
-   * `inp` along `edge`.
+   * along the edge with rank `rix`.
    */
   private predicate boundedPhiCandValidForEdge(
     Sem::SsaPhiNode phi, SemBound b, D::Delta delta, boolean upper, boolean fromBackEdge,
-    D::Delta origdelta, SemReason reason, Sem::SsaVariable inp, SsaReadPositionPhiInputEdge edge
+    D::Delta origdelta, SemReason reason, int rix
   ) {
     boundedPhiCand(phi, upper, b, delta, fromBackEdge, origdelta, reason) and
     (
-      exists(D::Delta d | boundedPhiInp1(phi, b, upper, inp, edge, d) |
+      exists(D::Delta d | boundedPhiInp1(phi, b, upper, rix, d) |
         upper = true and D::toFloat(d) <= D::toFloat(delta)
       )
       or
-      exists(D::Delta d | boundedPhiInp1(phi, b, upper, inp, edge, d) |
+      exists(D::Delta d | boundedPhiInp1(phi, b, upper, rix, d) |
         upper = false and D::toFloat(d) >= D::toFloat(delta)
       )
       or
-      selfBoundedPhiInp(phi, inp, edge, upper)
+      selfBoundedPhiInp(phi, rix, upper)
     )
   }
 
   /**
-   * Holds if `b + delta` is a valid bound for `phi`'s `rix`th input edge.
+   * Holds if `b + delta` is a valid bound for `phi` when accounting for the
+   * input edges ranked 1 through `rix`.
    * - `upper = true`  : `phi <= b + delta`
    * - `upper = false` : `phi >= b + delta`
    */
@@ -1044,10 +1044,8 @@ module RangeStage<
     Sem::SsaPhiNode phi, SemBound b, D::Delta delta, boolean upper, boolean fromBackEdge,
     D::Delta origdelta, SemReason reason, int rix
   ) {
-    exists(Sem::SsaVariable inp, SsaReadPositionPhiInputEdge edge |
-      rankedPhiInput(phi, inp, edge, rix) and
-      boundedPhiCandValidForEdge(phi, b, delta, upper, fromBackEdge, origdelta, reason, inp, edge)
-    |
+    boundedPhiCandValidForEdge(phi, b, delta, upper, fromBackEdge, origdelta, reason, rix) and
+    (
       rix = 1
       or
       boundedPhiRankStep(phi, b, delta, upper, fromBackEdge, origdelta, reason, rix - 1)
diff --git a/shared/rangeanalysis/qlpack.yml b/shared/rangeanalysis/qlpack.yml
index 3af1d03945d..24b697d1f49 100644
--- a/shared/rangeanalysis/qlpack.yml
+++ b/shared/rangeanalysis/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/rangeanalysis
-version: 1.0.29-dev
+version: 1.0.35-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/regex/CHANGELOG.md b/shared/regex/CHANGELOG.md
index b985a679eaa..1e3fb3c306c 100644
--- a/shared/regex/CHANGELOG.md
+++ b/shared/regex/CHANGELOG.md
@@ -1,3 +1,27 @@
+## 1.0.34
+
+No user-facing changes.
+
+## 1.0.33
+
+No user-facing changes.
+
+## 1.0.32
+
+No user-facing changes.
+
+## 1.0.31
+
+No user-facing changes.
+
+## 1.0.30
+
+No user-facing changes.
+
+## 1.0.29
+
+No user-facing changes.
+
 ## 1.0.28
 
 No user-facing changes.
diff --git a/shared/regex/change-notes/released/1.0.29.md b/shared/regex/change-notes/released/1.0.29.md
new file mode 100644
index 00000000000..e6b79b88ef3
--- /dev/null
+++ b/shared/regex/change-notes/released/1.0.29.md
@@ -0,0 +1,3 @@
+## 1.0.29
+
+No user-facing changes.
diff --git a/shared/regex/change-notes/released/1.0.30.md b/shared/regex/change-notes/released/1.0.30.md
new file mode 100644
index 00000000000..cb2cf6d0a27
--- /dev/null
+++ b/shared/regex/change-notes/released/1.0.30.md
@@ -0,0 +1,3 @@
+## 1.0.30
+
+No user-facing changes.
diff --git a/shared/regex/change-notes/released/1.0.31.md b/shared/regex/change-notes/released/1.0.31.md
new file mode 100644
index 00000000000..b2642bbb5f8
--- /dev/null
+++ b/shared/regex/change-notes/released/1.0.31.md
@@ -0,0 +1,3 @@
+## 1.0.31
+
+No user-facing changes.
diff --git a/shared/regex/change-notes/released/1.0.32.md b/shared/regex/change-notes/released/1.0.32.md
new file mode 100644
index 00000000000..05c4073731c
--- /dev/null
+++ b/shared/regex/change-notes/released/1.0.32.md
@@ -0,0 +1,3 @@
+## 1.0.32
+
+No user-facing changes.
diff --git a/shared/regex/change-notes/released/1.0.33.md b/shared/regex/change-notes/released/1.0.33.md
new file mode 100644
index 00000000000..3a65838479f
--- /dev/null
+++ b/shared/regex/change-notes/released/1.0.33.md
@@ -0,0 +1,3 @@
+## 1.0.33
+
+No user-facing changes.
diff --git a/shared/regex/change-notes/released/1.0.34.md b/shared/regex/change-notes/released/1.0.34.md
new file mode 100644
index 00000000000..7e097cfe937
--- /dev/null
+++ b/shared/regex/change-notes/released/1.0.34.md
@@ -0,0 +1,3 @@
+## 1.0.34
+
+No user-facing changes.
diff --git a/shared/regex/codeql-pack.release.yml b/shared/regex/codeql-pack.release.yml
index 328402fb34f..b736654032c 100644
--- a/shared/regex/codeql-pack.release.yml
+++ b/shared/regex/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.28
+lastReleaseVersion: 1.0.34
diff --git a/shared/regex/qlpack.yml b/shared/regex/qlpack.yml
index f29d547adc4..f66b9d743f6 100644
--- a/shared/regex/qlpack.yml
+++ b/shared/regex/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/regex
-version: 1.0.29-dev
+version: 1.0.35-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/ssa/CHANGELOG.md b/shared/ssa/CHANGELOG.md
index b628a618c2b..2d8087cd96c 100644
--- a/shared/ssa/CHANGELOG.md
+++ b/shared/ssa/CHANGELOG.md
@@ -1,3 +1,27 @@
+## 2.0.10
+
+No user-facing changes.
+
+## 2.0.9
+
+No user-facing changes.
+
+## 2.0.8
+
+No user-facing changes.
+
+## 2.0.7
+
+No user-facing changes.
+
+## 2.0.6
+
+No user-facing changes.
+
+## 2.0.5
+
+No user-facing changes.
+
 ## 2.0.4
 
 No user-facing changes.
diff --git a/shared/ssa/change-notes/released/2.0.10.md b/shared/ssa/change-notes/released/2.0.10.md
new file mode 100644
index 00000000000..37310f107aa
--- /dev/null
+++ b/shared/ssa/change-notes/released/2.0.10.md
@@ -0,0 +1,3 @@
+## 2.0.10
+
+No user-facing changes.
diff --git a/shared/ssa/change-notes/released/2.0.5.md b/shared/ssa/change-notes/released/2.0.5.md
new file mode 100644
index 00000000000..8bce5b7ca75
--- /dev/null
+++ b/shared/ssa/change-notes/released/2.0.5.md
@@ -0,0 +1,3 @@
+## 2.0.5
+
+No user-facing changes.
diff --git a/shared/ssa/change-notes/released/2.0.6.md b/shared/ssa/change-notes/released/2.0.6.md
new file mode 100644
index 00000000000..d8ae25aacd0
--- /dev/null
+++ b/shared/ssa/change-notes/released/2.0.6.md
@@ -0,0 +1,3 @@
+## 2.0.6
+
+No user-facing changes.
diff --git a/shared/ssa/change-notes/released/2.0.7.md b/shared/ssa/change-notes/released/2.0.7.md
new file mode 100644
index 00000000000..4eb1353458c
--- /dev/null
+++ b/shared/ssa/change-notes/released/2.0.7.md
@@ -0,0 +1,3 @@
+## 2.0.7
+
+No user-facing changes.
diff --git a/shared/ssa/change-notes/released/2.0.8.md b/shared/ssa/change-notes/released/2.0.8.md
new file mode 100644
index 00000000000..4d6867c721b
--- /dev/null
+++ b/shared/ssa/change-notes/released/2.0.8.md
@@ -0,0 +1,3 @@
+## 2.0.8
+
+No user-facing changes.
diff --git a/shared/ssa/change-notes/released/2.0.9.md b/shared/ssa/change-notes/released/2.0.9.md
new file mode 100644
index 00000000000..b89eb98bbd9
--- /dev/null
+++ b/shared/ssa/change-notes/released/2.0.9.md
@@ -0,0 +1,3 @@
+## 2.0.9
+
+No user-facing changes.
diff --git a/shared/ssa/codeql-pack.release.yml b/shared/ssa/codeql-pack.release.yml
index 0f306f8bd3b..96ea0220a69 100644
--- a/shared/ssa/codeql-pack.release.yml
+++ b/shared/ssa/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.0.4
+lastReleaseVersion: 2.0.10
diff --git a/shared/ssa/codeql/ssa/Ssa.qll b/shared/ssa/codeql/ssa/Ssa.qll
index 2aa136ff719..5edf51127b8 100644
--- a/shared/ssa/codeql/ssa/Ssa.qll
+++ b/shared/ssa/codeql/ssa/Ssa.qll
@@ -5,63 +5,14 @@
 overlay[local?]
 module;
 
+private import codeql.controlflow.BasicBlock as BB
 private import codeql.util.Location
 private import codeql.util.Unit
 
+private signature class TypSig;
+
 /** Provides the input specification of the SSA implementation. */
-signature module InputSig<LocationSig Location> {
-  /**
-   * A basic block, that is, a maximal straight-line sequence of control flow nodes
-   * without branches or joins.
-   */
-  class BasicBlock {
-    /** Gets a textual representation of this basic block. */
-    string toString();
-
-    /** Gets the `i`th node in this basic block. */
-    ControlFlowNode getNode(int i);
-
-    /** Gets the length of this basic block. */
-    int length();
-
-    /** Gets the location of this basic block. */
-    Location getLocation();
-  }
-
-  /** A control flow node. */
-  class ControlFlowNode {
-    /** Gets a textual representation of this control flow node. */
-    string toString();
-
-    /** Gets the location of this control flow node. */
-    Location getLocation();
-  }
-
-  /**
-   * Gets the basic block that immediately dominates basic block `bb`, if any.
-   *
-   * That is, all paths reaching `bb` from some entry point basic block must go
-   * through the result.
-   *
-   * Example:
-   *
-   * ```csharp
-   * int M(string s) {
-   *   if (s == null)
-   *     throw new ArgumentNullException(nameof(s));
-   *   return s.Length;
-   * }
-   * ```
-   *
-   * The basic block starting on line 2 is an immediate dominator of
-   * the basic block on line 4 (all paths from the entry point of `M`
-   * to `return s.Length;` must go through the null check.
-   */
-  BasicBlock getImmediateBasicBlockDominator(BasicBlock bb);
-
-  /** Gets an immediate successor of basic block `bb`, if any. */
-  BasicBlock getABasicBlockSuccessor(BasicBlock bb);
-
+signature module InputSig<LocationSig Location, TypSig BasicBlock> {
   /** A variable that can be SSA converted. */
   class SourceVariable {
     /** Gets a textual representation of this variable. */
@@ -91,6 +42,203 @@ signature module InputSig<LocationSig Location> {
   predicate variableRead(BasicBlock bb, int i, SourceVariable v, boolean certain);
 }
 
+/**
+ * Provides classes and predicates for the SSA representation of variables.
+ *
+ * Class hierarchy:
+ * ```text
+ * SsaDefinition
+ *  |- SsaWriteDefinition
+ *  |   |- SsaExplicitWrite
+ *  |   |   \- SsaParameterInit
+ *  |   |- SsaImplicitWrite
+ *  |   |   \- SsaImplicitEntryDefinition
+ *  |   \- SsaUncertainWrite (overlaps SsaImplicitWrite and potentially SsaExplicitWrite)
+ *  \- SsaPhiDefinition
+ * ```
+ */
+signature module SsaSig<
+  LocationSig Location, TypSig ControlFlowNode, TypSig BasicBlock, TypSig Expr, TypSig Parameter,
+  TypSig VariableWrite>
+{
+  /** A variable that can be SSA converted. */
+  class SourceVariable {
+    /** Gets a textual representation of this variable. */
+    string toString();
+
+    /** Gets the location of this variable. */
+    Location getLocation();
+  }
+
+  /** A static single assignment (SSA) definition. */
+  class SsaDefinition {
+    /** Gets the source variable underlying this SSA definition. */
+    SourceVariable getSourceVariable();
+
+    /**
+     * Holds if this SSA definition defines `v` at index `i` in basic block `bb`.
+     * Phi definitions are considered to be at index `-1`, while normal variable writes
+     * are at the index of the control flow node they wrap.
+     */
+    predicate definesAt(SourceVariable v, BasicBlock bb, int i);
+
+    /** Gets the basic block to which this SSA definition belongs. */
+    BasicBlock getBasicBlock();
+
+    /**
+     * Gets the control flow node of this SSA definition.
+     *
+     * For SSA definitions occurring at the beginning of a basic block, such as
+     * phi definitions, this will get the first control flow node of the basic block.
+     */
+    ControlFlowNode getControlFlowNode();
+
+    /** Gets a read of this SSA definition. */
+    Expr getARead();
+
+    /**
+     * Holds if this SSA definition is live at the end of basic block `bb`.
+     * That is, this definition reaches the end of basic block `bb`, at which
+     * point it is still live, without crossing another SSA definition of the
+     * same source variable.
+     */
+    predicate isLiveAtEndOfBlock(BasicBlock bb);
+
+    /**
+     * Gets a definition that ultimately defines this SSA definition and is
+     * not itself a phi definition.
+     *
+     * Example:
+     *
+     * ```rb
+     * def m b
+     *   i = 0        # defines i_0
+     *   if b
+     *     i = 1      # defines i_1
+     *   else
+     *     i = 2      # defines i_2
+     *   end
+     *                # defines i_3 = phi(i_1, i_2); ultimate definitions are i_1 and i_2
+     *   puts i
+     * end
+     * ```
+     */
+    SsaDefinition getAnUltimateDefinition();
+
+    /** Gets a textual representation of this SSA definition. */
+    string toString();
+
+    /** Gets the location of this SSA definition. */
+    Location getLocation();
+  }
+
+  /**
+   * A write definition. This includes every definition that is not a phi
+   * definition.
+   */
+  class SsaWriteDefinition extends SsaDefinition;
+
+  /**
+   * An SSA definition that corresponds to an explicit variable update or
+   * declaration.
+   */
+  class SsaExplicitWrite extends SsaWriteDefinition {
+    /** Gets the write underlying this SSA definition. */
+    VariableWrite getDefinition();
+
+    /**
+     * Gets the expression representing this write, if any. This is equivalent
+     * to `getDefinition().asExpr()`.
+     */
+    Expr getDefiningExpr();
+
+    /**
+     * Gets the expression with the value being written, if any. This is
+     * equivalent to `getDefinition().getValue()`.
+     */
+    Expr getValue();
+  }
+
+  /**
+   * An SSA definition representing the initialization of a parameter at the
+   * beginning of a callable.
+   */
+  class SsaParameterInit extends SsaExplicitWrite {
+    /**
+     * Gets the parameter that this definition represents. This is equivalent
+     * to `getDefinition().isParameterInit(result)`
+     */
+    Parameter getParameter();
+  }
+
+  /**
+   * An SSA definition that does not correspond to an explicit variable
+   * update or declaration.
+   *
+   * This includes implicit entry definitions for fields and captured
+   * variables, as well as field updates through side-effects and implicit
+   * definitions for fields whenever the qualifier is updated.
+   */
+  class SsaImplicitWrite extends SsaWriteDefinition;
+
+  /**
+   * An SSA definition representing the implicit initialization of a variable
+   * at the beginning of a callable. This includes fields and captured
+   * variables, but excludes parameters as they have explicit declarations.
+   */
+  class SsaImplicitEntryDefinition extends SsaImplicitWrite;
+
+  /** An SSA definition that represents an uncertain variable update. */
+  class SsaUncertainWrite extends SsaWriteDefinition {
+    /**
+     * Gets the immediately preceding definition. Since this update is uncertain,
+     * the value from the preceding definition might still be valid.
+     */
+    SsaDefinition getPriorDefinition();
+  }
+
+  /**
+   * An SSA phi definition, that is, a pseudo definition for a variable at a
+   * point in the flow graph where otherwise two or more definitions for the
+   * variable would be visible.
+   *
+   * For example, in
+   * ```rb
+   * if b
+   *   x = 0
+   * else
+   *   x = 1
+   * end
+   * puts x
+   * ```
+   * a phi definition for `x` is inserted just before the call `puts x`.
+   */
+  class SsaPhiDefinition extends SsaDefinition {
+    /** Holds if `inp` is an input to this phi definition along the edge originating in `bb`. */
+    predicate hasInputFromBlock(SsaDefinition inp, BasicBlock bb);
+
+    /**
+     * Gets an input of this phi definition.
+     *
+     * Example:
+     *
+     * ```rb
+     * def m b
+     *   i = 0        # defines i_0
+     *   if b
+     *     i = 1      # defines i_1
+     *   else
+     *     i = 2      # defines i_2
+     *   end
+     *                # defines i_3 = phi(i_1, i_2); inputs are i_1 and i_2
+     *   puts i
+     * end
+     * ```
+     */
+    SsaDefinition getAnInput();
+  }
+}
+
 /**
  * Provides an SSA implementation.
  *
@@ -108,12 +256,13 @@ signature module InputSig<LocationSig Location> {
  * NB: If this predicate is exposed, it should be cached.
  * ```
  */
-module Make<LocationSig Location, InputSig<Location> Input> {
+module Make<
+  LocationSig Location, BB::CfgSig<Location> Cfg, InputSig<Location, Cfg::BasicBlock> Input>
+{
+  private import Cfg
   private import Input
 
-  private BasicBlock getABasicBlockPredecessor(BasicBlock bb) {
-    getABasicBlockSuccessor(result) = bb
-  }
+  private BasicBlock getABasicBlockPredecessor(BasicBlock bb) { result.getASuccessor() = bb }
 
   /**
    * A classification of variable references into reads and
@@ -237,9 +386,7 @@ module Make<LocationSig Location, InputSig<Location> Input> {
     /**
      * Holds if source variable `v` is live at the end of basic block `bb`.
      */
-    predicate liveAtExit(BasicBlock bb, SourceVariable v) {
-      liveAtEntry(getABasicBlockSuccessor(bb), v)
-    }
+    predicate liveAtExit(BasicBlock bb, SourceVariable v) { liveAtEntry(bb.getASuccessor(), v) }
 
     /**
      * Holds if variable `v` is live in basic block `bb` at rank `rnk`.
@@ -270,25 +417,6 @@ module Make<LocationSig Location, InputSig<Location> Input> {
 
   private import Liveness
 
-  /**
-   * Holds if `df` is in the dominance frontier of `bb`.
-   *
-   * This is equivalent to:
-   *
-   * ```ql
-   * bb = getImmediateBasicBlockDominator*(getABasicBlockPredecessor(df)) and
-   * not bb = getImmediateBasicBlockDominator+(df)
-   * ```
-   */
-  private predicate inDominanceFrontier(BasicBlock bb, BasicBlock df) {
-    bb = getABasicBlockPredecessor(df) and not bb = getImmediateBasicBlockDominator(df)
-    or
-    exists(BasicBlock prev | inDominanceFrontier(prev, df) |
-      bb = getImmediateBasicBlockDominator(prev) and
-      not bb = getImmediateBasicBlockDominator(df)
-    )
-  }
-
   /**
    * Holds if `bb` is in the dominance frontier of a block containing a
    * definition of `v`.
@@ -297,7 +425,7 @@ module Make<LocationSig Location, InputSig<Location> Input> {
   private predicate inDefDominanceFrontier(BasicBlock bb, SourceVariable v) {
     exists(BasicBlock defbb, Definition def |
       def.definesAt(v, defbb, _) and
-      inDominanceFrontier(defbb, bb)
+      defbb.inDominanceFrontier(bb)
     )
   }
 
@@ -307,7 +435,7 @@ module Make<LocationSig Location, InputSig<Location> Input> {
    */
   pragma[nomagic]
   private predicate inReadDominanceFrontier(BasicBlock bb, SourceVariable v) {
-    exists(BasicBlock readbb | inDominanceFrontier(readbb, bb) |
+    exists(BasicBlock readbb | readbb.inDominanceFrontier(bb) |
       ssaDefReachesRead(v, _, readbb, _) and
       variableRead(readbb, _, v, true) and
       not variableWrite(readbb, _, v, _)
@@ -389,7 +517,7 @@ module Make<LocationSig Location, InputSig<Location> Input> {
      */
     pragma[nomagic]
     private predicate liveThrough(BasicBlock idom, BasicBlock bb, SourceVariable v) {
-      idom = getImmediateBasicBlockDominator(bb) and
+      idom = bb.getImmediateDominator() and
       liveAtExit(bb, v) and
       not any(Definition def).definesAt(v, bb, _)
     }
@@ -439,7 +567,7 @@ module Make<LocationSig Location, InputSig<Location> Input> {
       ssaDefReachesReadWithinBlock(v, def, bb, i)
       or
       ssaRef(bb, i, v, Read()) and
-      ssaDefReachesEndOfBlock(getImmediateBasicBlockDominator(bb), def, v) and
+      ssaDefReachesEndOfBlock(bb.getImmediateDominator(), def, v) and
       not ssaDefReachesReadWithinBlock(v, _, bb, i)
     }
 
@@ -483,7 +611,7 @@ module Make<LocationSig Location, InputSig<Location> Input> {
      */
     pragma[nomagic]
     private predicate liveThrough(BasicBlock idom, BasicBlock bb, SourceVariable v) {
-      idom = getImmediateBasicBlockDominator(bb) and
+      idom = bb.getImmediateDominator() and
       liveAtExit(bb, v) and
       not ssaRef(bb, _, v, _)
     }
@@ -517,7 +645,7 @@ module Make<LocationSig Location, InputSig<Location> Input> {
       bb1 = bb2 and
       refRank(bb1, i1, v, _) + 1 = refRank(bb2, i2, v, Read())
       or
-      refReachesEndOfBlock(bb1, i1, getImmediateBasicBlockDominator(bb2), v) and
+      refReachesEndOfBlock(bb1, i1, bb2.getImmediateDominator(), v) and
       1 = refRank(bb2, i2, v, Read())
     }
 
@@ -808,12 +936,12 @@ module Make<LocationSig Location, InputSig<Location> Input> {
       DefinitionExt def, SourceVariable v, BasicBlock bb1, BasicBlock bb2
     ) {
       defOccursInBlock(def, bb1, v, _) and
-      bb2 = getABasicBlockSuccessor(bb1)
+      bb2 = bb1.getASuccessor()
       or
       exists(BasicBlock mid |
         varBlockReachesExt(def, v, bb1, mid) and
         ssaDefReachesThroughBlock(def, mid) and
-        bb2 = getABasicBlockSuccessor(mid)
+        bb2 = mid.getASuccessor()
       )
     }
 
@@ -943,7 +1071,7 @@ module Make<LocationSig Location, InputSig<Location> Input> {
     // the node. If two definitions dominate a node then one must dominate the
     // other, so therefore the definition of _closest_ is given by the dominator
     // tree. Thus, reaching definitions can be calculated in terms of dominance.
-    ssaDefReachesEndOfBlockExt0(getImmediateBasicBlockDominator(bb), def, pragma[only_bind_into](v)) and
+    ssaDefReachesEndOfBlockExt0(bb.getImmediateDominator(), def, pragma[only_bind_into](v)) and
     liveThroughExt(bb, pragma[only_bind_into](v))
   }
 
@@ -1150,7 +1278,7 @@ module Make<LocationSig Location, InputSig<Location> Input> {
   predicate uncertainWriteDefinitionInput = SsaDefReachesNew::uncertainWriteDefinitionInput/2;
 
   /** Holds if `bb` is a control-flow exit point. */
-  private predicate exitBlock(BasicBlock bb) { not exists(getABasicBlockSuccessor(bb)) }
+  private predicate exitBlock(BasicBlock bb) { not exists(bb.getASuccessor()) }
 
   /**
    * NB: If this predicate is exposed, it should be cached.
@@ -1388,6 +1516,279 @@ module Make<LocationSig Location, InputSig<Location> Input> {
     override Location getLocation() { result = this.getBasicBlock().getLocation() }
   }
 
+  signature module SsaInputSig {
+    class Expr {
+      ControlFlowNode getControlFlowNode();
+
+      /** Gets a textual representation of this expression. */
+      string toString();
+
+      /** Gets the location of this expression. */
+      Location getLocation();
+    }
+
+    class Parameter;
+
+    class VariableWrite {
+      /** Gets the expression representing this write, if any. */
+      Expr asExpr();
+
+      /**
+       * Gets the expression with the value being written, if any.
+       *
+       * This can be the same expression as returned by `asExpr()`, which is the
+       * case for, for example, `++x` and `x += e`. For simple assignments like
+       * `x = e`, `asExpr()` gets the whole assignment expression while
+       * `getValue()` gets the right-hand side `e`. Post-crement operations like
+       * `x++` do not have an expression with the value being written.
+       */
+      Expr getValue();
+
+      /** Holds if this write is an initialization of parameter `p`. */
+      predicate isParameterInit(Parameter p);
+
+      /** Gets a textual representation of this write. */
+      string toString();
+
+      /** Gets the location of this write. */
+      Location getLocation();
+    }
+
+    predicate explicitWrite(VariableWrite w, BasicBlock bb, int i, SourceVariable v);
+  }
+
+  module MakeSsa<SsaInputSig SsaInput> implements
+    SsaSig<Location, ControlFlowNode, BasicBlock, SsaInput::Expr, SsaInput::Parameter, SsaInput::VariableWrite>
+  {
+    class SourceVariable = Input::SourceVariable;
+
+    private import SsaInput
+    private import Cached
+
+    cached
+    private module Cached {
+      cached
+      predicate ssaDefReachesCertainRead(Definition def, Expr e) {
+        exists(SourceVariable v, BasicBlock bb, int i |
+          ssaDefReachesRead(v, def, bb, i) and
+          variableRead(bb, i, v, true) and
+          e.getControlFlowNode() = bb.getNode(i)
+        )
+      }
+
+      cached
+      predicate ssaDefReachesUncertainRead(SourceVariable v, Definition def, BasicBlock bb, int i) {
+        ssaDefReachesRead(v, def, bb, i) and
+        variableRead(bb, i, v, false)
+      }
+
+      cached
+      predicate isLiveAtEndOfBlock(Definition def, BasicBlock bb) {
+        ssaDefReachesEndOfBlock(bb, def, _)
+      }
+
+      cached
+      predicate phiHasInputFromBlockCached(PhiNode phi, Definition inp, BasicBlock bb) {
+        phiHasInputFromBlock(phi, inp, bb)
+      }
+
+      cached
+      predicate uncertainWriteDefinitionInputCached(UncertainWriteDefinition def, Definition inp) {
+        uncertainWriteDefinitionInput(def, inp)
+      }
+
+      cached
+      predicate explicitWrite(WriteDefinition def, VariableWrite write) {
+        exists(BasicBlock bb, int i, SourceVariable v |
+          def.definesAt(v, bb, i) and
+          explicitWrite(write, bb, i, v)
+        )
+      }
+
+      cached
+      predicate parameterInit(WriteDefinition def, Parameter p) {
+        exists(VariableWrite write | explicitWrite(def, write) and write.isParameterInit(p))
+      }
+    }
+
+    additional predicate ssaDefReachesUncertainRead = Cached::ssaDefReachesUncertainRead/4;
+
+    final private class FinalDefinition = Definition;
+
+    /** A static single assignment (SSA) definition. */
+    class SsaDefinition extends FinalDefinition {
+      /**
+       * Gets the control flow node of this SSA definition.
+       *
+       * For SSA definitions occurring at the beginning of a basic block, such as
+       * phi nodes, this will get the first control flow node of the basic block.
+       */
+      ControlFlowNode getControlFlowNode() {
+        exists(BasicBlock bb, int i | this.definesAt(_, bb, i) | result = bb.getNode(0.maximum(i)))
+      }
+
+      /** Gets a read of this SSA definition. */
+      Expr getARead() { ssaDefReachesCertainRead(this, result) }
+
+      /**
+       * Holds if this SSA definition is live at the end of basic block `bb`.
+       * That is, this definition reaches the end of basic block `bb`, at which
+       * point it is still live, without crossing another SSA definition of the
+       * same source variable.
+       */
+      predicate isLiveAtEndOfBlock(BasicBlock bb) { isLiveAtEndOfBlock(this, bb) }
+
+      /**
+       * Gets an SSA definition whose value can flow to this one in one step. This
+       * includes inputs to phi definitions, the prior definition of uncertain writes,
+       * and the captured ssa definition for a closure definition.
+       */
+      private SsaDefinition getAPhiInputOrPriorDefinition() {
+        result = this.(SsaPhiDefinition).getAnInput() or
+        result = this.(SsaUncertainWrite).getPriorDefinition()
+      }
+
+      /**
+       * Gets a definition that ultimately defines this SSA definition and is
+       * not itself a phi definition.
+       *
+       * Example:
+       *
+       * ```rb
+       * def m b
+       *   i = 0        # defines i_0
+       *   if b
+       *     i = 1      # defines i_1
+       *   else
+       *     i = 2      # defines i_2
+       *   end
+       *                # defines i_3 = phi(i_1, i_2); ultimate definitions are i_1 and i_2
+       *   puts i
+       * end
+       * ```
+       */
+      SsaDefinition getAnUltimateDefinition() {
+        result = this.getAPhiInputOrPriorDefinition*() and not result instanceof SsaPhiDefinition
+      }
+    }
+
+    /**
+     * A write definition. This includes every definition that is not a phi
+     * definition.
+     */
+    class SsaWriteDefinition extends SsaDefinition instanceof WriteDefinition { }
+
+    /**
+     * An SSA definition that corresponds to an explicit variable update or
+     * declaration.
+     */
+    class SsaExplicitWrite extends SsaWriteDefinition {
+      SsaExplicitWrite() { explicitWrite(this, _) }
+
+      /** Gets the write underlying this SSA definition. */
+      VariableWrite getDefinition() { explicitWrite(this, result) }
+
+      /**
+       * Gets the expression representing this write, if any. This is equivalent
+       * to `getDefinition().asExpr()`.
+       */
+      Expr getDefiningExpr() { result = this.getDefinition().asExpr() }
+
+      /**
+       * Gets the expression with the value being written, if any. This is
+       * equivalent to `getDefinition().getValue()`.
+       */
+      Expr getValue() { result = this.getDefinition().getValue() }
+    }
+
+    /**
+     * An SSA definition representing the initialization of a parameter at the
+     * beginning of a callable.
+     */
+    class SsaParameterInit extends SsaExplicitWrite {
+      SsaParameterInit() { parameterInit(this, _) }
+
+      /**
+       * Gets the parameter that this definition represents. This is equivalent
+       * to `getDefinition().isParameterInit(result)`
+       */
+      Parameter getParameter() { parameterInit(this, result) }
+    }
+
+    /**
+     * An SSA definition that does not correspond to an explicit variable
+     * update or declaration.
+     *
+     * This includes implicit entry definitions for fields and captured
+     * variables, as well as field updates through side-effects and implicit
+     * definitions for fields whenever the qualifier is updated.
+     */
+    class SsaImplicitWrite extends SsaWriteDefinition {
+      SsaImplicitWrite() { not explicitWrite(this, _) }
+    }
+
+    /**
+     * An SSA definition representing the implicit initialization of a variable
+     * at the beginning of a callable. This includes fields and captured
+     * variables, but excludes parameters as they have explicit declarations.
+     */
+    class SsaImplicitEntryDefinition extends SsaImplicitWrite {
+      SsaImplicitEntryDefinition() { this.definesAt(_, any(EntryBasicBlock bb), -1) }
+    }
+
+    /** An SSA definition that represents an uncertain variable update. */
+    class SsaUncertainWrite extends SsaWriteDefinition instanceof UncertainWriteDefinition {
+      /**
+       * Gets the immediately preceding definition. Since this update is uncertain,
+       * the value from the preceding definition might still be valid.
+       */
+      SsaDefinition getPriorDefinition() { uncertainWriteDefinitionInputCached(this, result) }
+    }
+
+    /**
+     * An SSA phi definition, that is, a pseudo definition for a variable at a
+     * point in the flow graph where otherwise two or more definitions for the
+     * variable would be visible.
+     *
+     * For example, in
+     * ```rb
+     * if b
+     *   x = 0
+     * else
+     *   x = 1
+     * end
+     * puts x
+     * ```
+     * a phi definition for `x` is inserted just before the call `puts x`.
+     */
+    class SsaPhiDefinition extends SsaDefinition {
+      /** Holds if `inp` is an input to this phi definition along the edge originating in `bb`. */
+      predicate hasInputFromBlock(SsaDefinition inp, BasicBlock bb) {
+        phiHasInputFromBlockCached(this, inp, bb)
+      }
+
+      /**
+       * Gets an input of this phi definition.
+       *
+       * Example:
+       *
+       * ```rb
+       * def m b
+       *   i = 0        # defines i_0
+       *   if b
+       *     i = 1      # defines i_1
+       *   else
+       *     i = 2      # defines i_2
+       *   end
+       *                # defines i_3 = phi(i_1, i_2); inputs are i_1 and i_2
+       *   puts i
+       * end
+       * ```
+       */
+      SsaDefinition getAnInput() { this.hasInputFromBlock(result, _) }
+    }
+  }
+
   /** Provides a set of consistency queries. */
   module Consistency {
     /** Holds if a read can be reached from multiple definitions. */
@@ -1418,7 +1819,7 @@ module Make<LocationSig Location, InputSig<Location> Input> {
         or
         ssaDefReachesRead(v, def, bb, i) and
         not SsaDefReachesNew::ssaDefReachesReadWithinBlock(v, def, bb, i) and
-        not def.definesAt(v, getImmediateBasicBlockDominator*(bb), _)
+        not def.definesAt(v, bb.getImmediateDominator*(), _)
       )
     }
 
@@ -1667,7 +2068,7 @@ module Make<LocationSig Location, InputSig<Location> Input> {
         DfInput::keepAllPhiInputBackEdges() and
         exists(getAPhiInputDef(phi, input)) and
         phi.getBasicBlock() = bbPhi and
-        getImmediateBasicBlockDominator+(input) = bbPhi
+        input.getImmediateDominator+() = bbPhi
       )
     }
 
diff --git a/shared/ssa/qlpack.yml b/shared/ssa/qlpack.yml
index 6912467b508..0aada9508ee 100644
--- a/shared/ssa/qlpack.yml
+++ b/shared/ssa/qlpack.yml
@@ -1,7 +1,8 @@
 name: codeql/ssa
-version: 2.0.5-dev
+version: 2.0.11-dev
 groups: shared
 library: true
 dependencies:
+  codeql/controlflow: ${workspace}
   codeql/util: ${workspace}
 warnOnImplicitThis: true
diff --git a/shared/threat-models/CHANGELOG.md b/shared/threat-models/CHANGELOG.md
index 6e50e04a514..870695d684c 100644
--- a/shared/threat-models/CHANGELOG.md
+++ b/shared/threat-models/CHANGELOG.md
@@ -1,3 +1,27 @@
+## 1.0.34
+
+No user-facing changes.
+
+## 1.0.33
+
+No user-facing changes.
+
+## 1.0.32
+
+No user-facing changes.
+
+## 1.0.31
+
+No user-facing changes.
+
+## 1.0.30
+
+No user-facing changes.
+
+## 1.0.29
+
+No user-facing changes.
+
 ## 1.0.28
 
 No user-facing changes.
diff --git a/shared/threat-models/change-notes/released/1.0.29.md b/shared/threat-models/change-notes/released/1.0.29.md
new file mode 100644
index 00000000000..e6b79b88ef3
--- /dev/null
+++ b/shared/threat-models/change-notes/released/1.0.29.md
@@ -0,0 +1,3 @@
+## 1.0.29
+
+No user-facing changes.
diff --git a/shared/threat-models/change-notes/released/1.0.30.md b/shared/threat-models/change-notes/released/1.0.30.md
new file mode 100644
index 00000000000..cb2cf6d0a27
--- /dev/null
+++ b/shared/threat-models/change-notes/released/1.0.30.md
@@ -0,0 +1,3 @@
+## 1.0.30
+
+No user-facing changes.
diff --git a/shared/threat-models/change-notes/released/1.0.31.md b/shared/threat-models/change-notes/released/1.0.31.md
new file mode 100644
index 00000000000..b2642bbb5f8
--- /dev/null
+++ b/shared/threat-models/change-notes/released/1.0.31.md
@@ -0,0 +1,3 @@
+## 1.0.31
+
+No user-facing changes.
diff --git a/shared/threat-models/change-notes/released/1.0.32.md b/shared/threat-models/change-notes/released/1.0.32.md
new file mode 100644
index 00000000000..05c4073731c
--- /dev/null
+++ b/shared/threat-models/change-notes/released/1.0.32.md
@@ -0,0 +1,3 @@
+## 1.0.32
+
+No user-facing changes.
diff --git a/shared/threat-models/change-notes/released/1.0.33.md b/shared/threat-models/change-notes/released/1.0.33.md
new file mode 100644
index 00000000000..3a65838479f
--- /dev/null
+++ b/shared/threat-models/change-notes/released/1.0.33.md
@@ -0,0 +1,3 @@
+## 1.0.33
+
+No user-facing changes.
diff --git a/shared/threat-models/change-notes/released/1.0.34.md b/shared/threat-models/change-notes/released/1.0.34.md
new file mode 100644
index 00000000000..7e097cfe937
--- /dev/null
+++ b/shared/threat-models/change-notes/released/1.0.34.md
@@ -0,0 +1,3 @@
+## 1.0.34
+
+No user-facing changes.
diff --git a/shared/threat-models/codeql-pack.release.yml b/shared/threat-models/codeql-pack.release.yml
index 328402fb34f..b736654032c 100644
--- a/shared/threat-models/codeql-pack.release.yml
+++ b/shared/threat-models/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.28
+lastReleaseVersion: 1.0.34
diff --git a/shared/threat-models/qlpack.yml b/shared/threat-models/qlpack.yml
index 5e8c43c8bbf..4bb9cb4cb5f 100644
--- a/shared/threat-models/qlpack.yml
+++ b/shared/threat-models/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/threat-models
-version: 1.0.29-dev
+version: 1.0.35-dev
 library: true
 groups: shared
 dataExtensions:
diff --git a/shared/tree-sitter-extractor/Cargo.toml b/shared/tree-sitter-extractor/Cargo.toml
index 4cfeae2801b..d02f02fd588 100644
--- a/shared/tree-sitter-extractor/Cargo.toml
+++ b/shared/tree-sitter-extractor/Cargo.toml
@@ -10,18 +10,18 @@ flate2 = "1.1"
 globset = "0.4"
 tree-sitter = ">= 0.23.0"
 tracing = "0.1"
-tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
-rayon = "1.10.0"
-regex = "1.11.1"
+tracing-subscriber = { version = "0.3.20", features = ["env-filter"] }
+rayon = "1.11.0"
+regex = "1.11.3"
 encoding = "0.2"
 lazy_static = "1.5.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-chrono = { version = "0.4.41", features = ["serde"] }
+chrono = { version = "0.4.42", features = ["serde"] }
 num_cpus = "1.17.0"
 zstd = "0.13.3"
 
 [dev-dependencies]
 tree-sitter-ql = "0.23.1"
 tree-sitter-json = "0.24.8"
-rand = "0.9.1"
+rand = "0.9.2"
diff --git a/shared/tutorial/CHANGELOG.md b/shared/tutorial/CHANGELOG.md
index d1848f17c53..23fd78f42e5 100644
--- a/shared/tutorial/CHANGELOG.md
+++ b/shared/tutorial/CHANGELOG.md
@@ -1,3 +1,27 @@
+## 1.0.34
+
+No user-facing changes.
+
+## 1.0.33
+
+No user-facing changes.
+
+## 1.0.32
+
+No user-facing changes.
+
+## 1.0.31
+
+No user-facing changes.
+
+## 1.0.30
+
+No user-facing changes.
+
+## 1.0.29
+
+No user-facing changes.
+
 ## 1.0.28
 
 No user-facing changes.
diff --git a/shared/tutorial/change-notes/released/1.0.29.md b/shared/tutorial/change-notes/released/1.0.29.md
new file mode 100644
index 00000000000..e6b79b88ef3
--- /dev/null
+++ b/shared/tutorial/change-notes/released/1.0.29.md
@@ -0,0 +1,3 @@
+## 1.0.29
+
+No user-facing changes.
diff --git a/shared/tutorial/change-notes/released/1.0.30.md b/shared/tutorial/change-notes/released/1.0.30.md
new file mode 100644
index 00000000000..cb2cf6d0a27
--- /dev/null
+++ b/shared/tutorial/change-notes/released/1.0.30.md
@@ -0,0 +1,3 @@
+## 1.0.30
+
+No user-facing changes.
diff --git a/shared/tutorial/change-notes/released/1.0.31.md b/shared/tutorial/change-notes/released/1.0.31.md
new file mode 100644
index 00000000000..b2642bbb5f8
--- /dev/null
+++ b/shared/tutorial/change-notes/released/1.0.31.md
@@ -0,0 +1,3 @@
+## 1.0.31
+
+No user-facing changes.
diff --git a/shared/tutorial/change-notes/released/1.0.32.md b/shared/tutorial/change-notes/released/1.0.32.md
new file mode 100644
index 00000000000..05c4073731c
--- /dev/null
+++ b/shared/tutorial/change-notes/released/1.0.32.md
@@ -0,0 +1,3 @@
+## 1.0.32
+
+No user-facing changes.
diff --git a/shared/tutorial/change-notes/released/1.0.33.md b/shared/tutorial/change-notes/released/1.0.33.md
new file mode 100644
index 00000000000..3a65838479f
--- /dev/null
+++ b/shared/tutorial/change-notes/released/1.0.33.md
@@ -0,0 +1,3 @@
+## 1.0.33
+
+No user-facing changes.
diff --git a/shared/tutorial/change-notes/released/1.0.34.md b/shared/tutorial/change-notes/released/1.0.34.md
new file mode 100644
index 00000000000..7e097cfe937
--- /dev/null
+++ b/shared/tutorial/change-notes/released/1.0.34.md
@@ -0,0 +1,3 @@
+## 1.0.34
+
+No user-facing changes.
diff --git a/shared/tutorial/codeql-pack.release.yml b/shared/tutorial/codeql-pack.release.yml
index 328402fb34f..b736654032c 100644
--- a/shared/tutorial/codeql-pack.release.yml
+++ b/shared/tutorial/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.28
+lastReleaseVersion: 1.0.34
diff --git a/shared/tutorial/qlpack.yml b/shared/tutorial/qlpack.yml
index 998c513f7c6..fa53c0be99f 100644
--- a/shared/tutorial/qlpack.yml
+++ b/shared/tutorial/qlpack.yml
@@ -1,7 +1,7 @@
 name: codeql/tutorial
 description: Library for the CodeQL detective tutorials, helping new users learn to
   write CodeQL queries.
-version: 1.0.29-dev
+version: 1.0.35-dev
 groups: shared
 library: true
 warnOnImplicitThis: true
diff --git a/shared/typeflow/CHANGELOG.md b/shared/typeflow/CHANGELOG.md
index d63b01de987..d95faf69864 100644
--- a/shared/typeflow/CHANGELOG.md
+++ b/shared/typeflow/CHANGELOG.md
@@ -1,3 +1,27 @@
+## 1.0.34
+
+No user-facing changes.
+
+## 1.0.33
+
+No user-facing changes.
+
+## 1.0.32
+
+No user-facing changes.
+
+## 1.0.31
+
+No user-facing changes.
+
+## 1.0.30
+
+No user-facing changes.
+
+## 1.0.29
+
+No user-facing changes.
+
 ## 1.0.28
 
 No user-facing changes.
diff --git a/shared/typeflow/change-notes/released/1.0.29.md b/shared/typeflow/change-notes/released/1.0.29.md
new file mode 100644
index 00000000000..e6b79b88ef3
--- /dev/null
+++ b/shared/typeflow/change-notes/released/1.0.29.md
@@ -0,0 +1,3 @@
+## 1.0.29
+
+No user-facing changes.
diff --git a/shared/typeflow/change-notes/released/1.0.30.md b/shared/typeflow/change-notes/released/1.0.30.md
new file mode 100644
index 00000000000..cb2cf6d0a27
--- /dev/null
+++ b/shared/typeflow/change-notes/released/1.0.30.md
@@ -0,0 +1,3 @@
+## 1.0.30
+
+No user-facing changes.
diff --git a/shared/typeflow/change-notes/released/1.0.31.md b/shared/typeflow/change-notes/released/1.0.31.md
new file mode 100644
index 00000000000..b2642bbb5f8
--- /dev/null
+++ b/shared/typeflow/change-notes/released/1.0.31.md
@@ -0,0 +1,3 @@
+## 1.0.31
+
+No user-facing changes.
diff --git a/shared/typeflow/change-notes/released/1.0.32.md b/shared/typeflow/change-notes/released/1.0.32.md
new file mode 100644
index 00000000000..05c4073731c
--- /dev/null
+++ b/shared/typeflow/change-notes/released/1.0.32.md
@@ -0,0 +1,3 @@
+## 1.0.32
+
+No user-facing changes.
diff --git a/shared/typeflow/change-notes/released/1.0.33.md b/shared/typeflow/change-notes/released/1.0.33.md
new file mode 100644
index 00000000000..3a65838479f
--- /dev/null
+++ b/shared/typeflow/change-notes/released/1.0.33.md
@@ -0,0 +1,3 @@
+## 1.0.33
+
+No user-facing changes.
diff --git a/shared/typeflow/change-notes/released/1.0.34.md b/shared/typeflow/change-notes/released/1.0.34.md
new file mode 100644
index 00000000000..7e097cfe937
--- /dev/null
+++ b/shared/typeflow/change-notes/released/1.0.34.md
@@ -0,0 +1,3 @@
+## 1.0.34
+
+No user-facing changes.
diff --git a/shared/typeflow/codeql-pack.release.yml b/shared/typeflow/codeql-pack.release.yml
index 328402fb34f..b736654032c 100644
--- a/shared/typeflow/codeql-pack.release.yml
+++ b/shared/typeflow/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.28
+lastReleaseVersion: 1.0.34
diff --git a/shared/typeflow/qlpack.yml b/shared/typeflow/qlpack.yml
index f1969d52e2b..94cae6f26a6 100644
--- a/shared/typeflow/qlpack.yml
+++ b/shared/typeflow/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/typeflow
-version: 1.0.29-dev
+version: 1.0.35-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/typeinference/CHANGELOG.md b/shared/typeinference/CHANGELOG.md
index a59e560c415..4f4b3189bb4 100644
--- a/shared/typeinference/CHANGELOG.md
+++ b/shared/typeinference/CHANGELOG.md
@@ -1,3 +1,27 @@
+## 0.0.15
+
+No user-facing changes.
+
+## 0.0.14
+
+No user-facing changes.
+
+## 0.0.13
+
+No user-facing changes.
+
+## 0.0.12
+
+No user-facing changes.
+
+## 0.0.11
+
+No user-facing changes.
+
+## 0.0.10
+
+No user-facing changes.
+
 ## 0.0.9
 
 No user-facing changes.
diff --git a/shared/typeinference/change-notes/released/0.0.10.md b/shared/typeinference/change-notes/released/0.0.10.md
new file mode 100644
index 00000000000..22391080fd4
--- /dev/null
+++ b/shared/typeinference/change-notes/released/0.0.10.md
@@ -0,0 +1,3 @@
+## 0.0.10
+
+No user-facing changes.
diff --git a/shared/typeinference/change-notes/released/0.0.11.md b/shared/typeinference/change-notes/released/0.0.11.md
new file mode 100644
index 00000000000..19a2a55bd68
--- /dev/null
+++ b/shared/typeinference/change-notes/released/0.0.11.md
@@ -0,0 +1,3 @@
+## 0.0.11
+
+No user-facing changes.
diff --git a/shared/typeinference/change-notes/released/0.0.12.md b/shared/typeinference/change-notes/released/0.0.12.md
new file mode 100644
index 00000000000..0e206033bc4
--- /dev/null
+++ b/shared/typeinference/change-notes/released/0.0.12.md
@@ -0,0 +1,3 @@
+## 0.0.12
+
+No user-facing changes.
diff --git a/shared/typeinference/change-notes/released/0.0.13.md b/shared/typeinference/change-notes/released/0.0.13.md
new file mode 100644
index 00000000000..f679eaf0313
--- /dev/null
+++ b/shared/typeinference/change-notes/released/0.0.13.md
@@ -0,0 +1,3 @@
+## 0.0.13
+
+No user-facing changes.
diff --git a/shared/typeinference/change-notes/released/0.0.14.md b/shared/typeinference/change-notes/released/0.0.14.md
new file mode 100644
index 00000000000..63b4d50ca45
--- /dev/null
+++ b/shared/typeinference/change-notes/released/0.0.14.md
@@ -0,0 +1,3 @@
+## 0.0.14
+
+No user-facing changes.
diff --git a/shared/typeinference/change-notes/released/0.0.15.md b/shared/typeinference/change-notes/released/0.0.15.md
new file mode 100644
index 00000000000..7af9c05f23f
--- /dev/null
+++ b/shared/typeinference/change-notes/released/0.0.15.md
@@ -0,0 +1,3 @@
+## 0.0.15
+
+No user-facing changes.
diff --git a/shared/typeinference/codeql-pack.release.yml b/shared/typeinference/codeql-pack.release.yml
index ecdd64fbab8..dff35216fc6 100644
--- a/shared/typeinference/codeql-pack.release.yml
+++ b/shared/typeinference/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.0.9
+lastReleaseVersion: 0.0.15
diff --git a/shared/typeinference/codeql/typeinference/internal/TypeInference.qll b/shared/typeinference/codeql/typeinference/internal/TypeInference.qll
index c42a424f3e3..a827ef3cd79 100644
--- a/shared/typeinference/codeql/typeinference/internal/TypeInference.qll
+++ b/shared/typeinference/codeql/typeinference/internal/TypeInference.qll
@@ -494,6 +494,13 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
   module Make2<InputSig2 Input2> {
     private import Input2
 
+    final private class FinalTypeMention = TypeMention;
+
+    /** An adapter for type mentions to implement `HasTypeTreeSig`. */
+    final class TypeMentionTypeTree extends FinalTypeMention {
+      Type getTypeAt(TypePath path) { result = this.resolveTypeAt(path) }
+    }
+
     /** Gets the type at the empty path of `tm`. */
     bindingset[tm]
     pragma[inline_late]
@@ -502,80 +509,91 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
     }
 
     /** Provides the input to `IsInstantiationOf`. */
-    signature module IsInstantiationOfInputSig<HasTypeTreeSig App> {
+    signature module IsInstantiationOfInputSig<HasTypeTreeSig App, HasTypeTreeSig Constraint> {
       /**
-       * Holds if `abs` is a type abstraction, `tm` occurs in the scope of
+       * Holds if `abs` is a type abstraction, `constraint` occurs in the scope of
        * `abs`, and `app` is potentially an application/instantiation of `abs`.
        *
        * For example:
        * ```rust
        * impl<A> Foo<A, A> {
        * //  ^^^ `abs`
-       * //      ^^^^^^^^^ `tm`
+       * //      ^^^^^^^^^ `constraint`
        *   fn bar(self) { ... }
        * }
        * // ...
        *    foo.bar();
        * // ^^^ `app`
        * ```
-       * Here `abs` introduces the type parameter `A` and `tm` occurs in the
-       * scope of `abs` (i.e., `A` is bound in `tm` by `abs`). On the last line,
+       * Here `abs` introduces the type parameter `A` and `constraint` occurs in the
+       * scope of `abs` (i.e., `A` is bound in `constraint` by `abs`). On the last line,
        * accessing the `bar` method of `foo` potentially instantiates the `impl`
        * block with a type argument for `A`.
        */
-      predicate potentialInstantiationOf(App app, TypeAbstraction abs, TypeMention tm);
+      predicate potentialInstantiationOf(App app, TypeAbstraction abs, Constraint constraint);
 
       /**
        * Holds if `constraint` might occur as the third argument of
        * `potentialInstantiationOf`. Defaults to simply projecting the third
        * argument of `potentialInstantiationOf`.
        */
-      default predicate relevantTypeMention(TypeMention tm) { potentialInstantiationOf(_, _, tm) }
+      default predicate relevantConstraint(Constraint constraint) {
+        potentialInstantiationOf(_, _, constraint)
+      }
     }
 
     /**
      * Provides functionality for determining if a type is a possible
      * instantiation of a type mention containing type parameters.
      */
-    module IsInstantiationOf<HasTypeTreeSig App, IsInstantiationOfInputSig<App> Input> {
+    module IsInstantiationOf<
+      HasTypeTreeSig App, HasTypeTreeSig Constraint,
+      IsInstantiationOfInputSig<App, Constraint> Input>
+    {
       private import Input
 
-      /** Gets the `i`th path in `tm` per some arbitrary order. */
+      /** Gets the `i`th path in `constraint` per some arbitrary order. */
       pragma[nomagic]
-      private TypePath getNthPath(TypeMention tm, int i) {
+      private TypePath getNthPath(Constraint constraint, int i) {
         result =
           rank[i + 1](TypePath path |
-            exists(tm.resolveTypeAt(path)) and relevantTypeMention(tm)
+            exists(constraint.getTypeAt(path)) and relevantConstraint(constraint)
           |
             path
           )
       }
 
+      pragma[nomagic]
+      private Type resolveTypeAt(App app, TypeAbstraction abs, Constraint constraint, TypePath path) {
+        potentialInstantiationOf(app, abs, constraint) and
+        result = constraint.getTypeAt(path)
+      }
+
       pragma[nomagic]
       private Type resolveNthTypeAt(
-        App app, TypeAbstraction abs, TypeMention tm, int i, TypePath path
+        App app, TypeAbstraction abs, Constraint constraint, int i, TypePath path
       ) {
-        potentialInstantiationOf(app, abs, tm) and
-        path = getNthPath(tm, i) and
-        result = tm.resolveTypeAt(path)
+        path = getNthPath(constraint, i) and
+        result = resolveTypeAt(app, abs, constraint, path)
       }
 
       pragma[nomagic]
       private predicate satisfiesConcreteTypesFromIndex(
-        App app, TypeAbstraction abs, TypeMention tm, int i
+        App app, TypeAbstraction abs, Constraint constraint, int i
       ) {
         exists(Type t, TypePath path |
-          t = resolveNthTypeAt(app, abs, tm, i, path) and
+          t = resolveNthTypeAt(app, abs, constraint, i, path) and
           if t = abs.getATypeParameter() then any() else app.getTypeAt(path) = t
         ) and
         // Recurse unless we are at the first path
-        if i = 0 then any() else satisfiesConcreteTypesFromIndex(app, abs, tm, i - 1)
+        if i = 0 then any() else satisfiesConcreteTypesFromIndex(app, abs, constraint, i - 1)
       }
 
-      /** Holds if all the concrete types in `tm` also occur in `app`. */
+      /** Holds if all the concrete types in `constraint` also occur in `app`. */
       pragma[nomagic]
-      private predicate satisfiesConcreteTypes(App app, TypeAbstraction abs, TypeMention tm) {
-        satisfiesConcreteTypesFromIndex(app, abs, tm, max(int i | exists(getNthPath(tm, i))))
+      private predicate satisfiesConcreteTypes(App app, TypeAbstraction abs, Constraint constraint) {
+        satisfiesConcreteTypesFromIndex(app, abs, constraint,
+          max(int i | exists(getNthPath(constraint, i))))
       }
 
       private TypeParameter getNthTypeParameter(TypeAbstraction abs, int i) {
@@ -588,70 +606,74 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
       }
 
       /**
-       * Gets the path to the `i`th occurrence of `tp` within `tm` per some
+       * Gets the path to the `i`th occurrence of `tp` within `constraint` per some
        * arbitrary order, if any.
        */
       pragma[nomagic]
-      private TypePath getNthTypeParameterPath(TypeMention tm, TypeParameter tp, int i) {
+      private TypePath getNthTypeParameterPath(Constraint constraint, TypeParameter tp, int i) {
         result =
-          rank[i + 1](TypePath path | tp = tm.resolveTypeAt(path) and relevantTypeMention(tm) | path)
+          rank[i + 1](TypePath path |
+            tp = constraint.getTypeAt(path) and relevantConstraint(constraint)
+          |
+            path
+          )
       }
 
       pragma[nomagic]
       private predicate typeParametersEqualFromIndexBase(
-        App app, TypeAbstraction abs, TypeMention tm, TypeParameter tp, TypePath path
+        App app, TypeAbstraction abs, Constraint constraint, TypeParameter tp, TypePath path
       ) {
-        path = getNthTypeParameterPath(tm, tp, 0) and
-        satisfiesConcreteTypes(app, abs, tm) and
+        path = getNthTypeParameterPath(constraint, tp, 0) and
+        satisfiesConcreteTypes(app, abs, constraint) and
         // no need to compute this predicate if there is only one path
-        exists(getNthTypeParameterPath(tm, tp, 1))
+        exists(getNthTypeParameterPath(constraint, tp, 1))
       }
 
       pragma[nomagic]
       private predicate typeParametersEqualFromIndex(
-        App app, TypeAbstraction abs, TypeMention tm, TypeParameter tp, Type t, int i
+        App app, TypeAbstraction abs, Constraint constraint, TypeParameter tp, Type t, int i
       ) {
         exists(TypePath path |
           t = app.getTypeAt(path) and
           if i = 0
-          then typeParametersEqualFromIndexBase(app, abs, tm, tp, path)
+          then typeParametersEqualFromIndexBase(app, abs, constraint, tp, path)
           else (
-            typeParametersEqualFromIndex(app, abs, tm, tp, t, i - 1) and
-            path = getNthTypeParameterPath(tm, tp, i)
+            typeParametersEqualFromIndex(app, abs, constraint, tp, t, i - 1) and
+            path = getNthTypeParameterPath(constraint, tp, i)
           )
         )
       }
 
       private predicate typeParametersEqual(
-        App app, TypeAbstraction abs, TypeMention tm, TypeParameter tp
+        App app, TypeAbstraction abs, Constraint constraint, TypeParameter tp
       ) {
-        satisfiesConcreteTypes(app, abs, tm) and
+        satisfiesConcreteTypes(app, abs, constraint) and
         tp = getNthTypeParameter(abs, _) and
         (
-          not exists(getNthTypeParameterPath(tm, tp, _))
+          not exists(getNthTypeParameterPath(constraint, tp, _))
           or
-          exists(int n | n = max(int i | exists(getNthTypeParameterPath(tm, tp, i))) |
+          exists(int n | n = max(int i | exists(getNthTypeParameterPath(constraint, tp, i))) |
             // If the largest index is 0, then there are no equalities to check as
             // the type parameter only occurs once.
-            if n = 0 then any() else typeParametersEqualFromIndex(app, abs, tm, tp, _, n)
+            if n = 0 then any() else typeParametersEqualFromIndex(app, abs, constraint, tp, _, n)
           )
         )
       }
 
       private predicate typeParametersHaveEqualInstantiationFromIndex(
-        App app, TypeAbstraction abs, TypeMention tm, int i
+        App app, TypeAbstraction abs, Constraint constraint, int i
       ) {
         exists(TypeParameter tp | tp = getNthTypeParameter(abs, i) |
-          typeParametersEqual(app, abs, tm, tp) and
+          typeParametersEqual(app, abs, constraint, tp) and
           if i = 0
           then any()
-          else typeParametersHaveEqualInstantiationFromIndex(app, abs, tm, i - 1)
+          else typeParametersHaveEqualInstantiationFromIndex(app, abs, constraint, i - 1)
         )
       }
 
       /**
-       * Holds if `app` is a possible instantiation of `tm`. That is, by making
-       * appropriate substitutions for the free type parameters in `tm` given by
+       * Holds if `app` is a possible instantiation of `constraint`. That is, by making
+       * appropriate substitutions for the free type parameters in `constraint` given by
        * `abs`, it is possible to obtain `app`.
        *
        * For instance, if `A` and `B` are free type parameters we have:
@@ -662,10 +684,10 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
        * - `Pair<int, string>` is _not_ an instantiation of `Pair<string, string>`
        */
       pragma[nomagic]
-      predicate isInstantiationOf(App app, TypeAbstraction abs, TypeMention tm) {
+      predicate isInstantiationOf(App app, TypeAbstraction abs, Constraint constraint) {
         // We only need to check equality if the concrete types are satisfied.
-        satisfiesConcreteTypes(app, abs, tm) and
-        // Check if all the places where the same type parameter occurs in `tm`
+        satisfiesConcreteTypes(app, abs, constraint) and
+        // Check if all the places where the same type parameter occurs in `constraint`
         // are equal in `app`.
         //
         // TODO: As of now this only checks equality at the root of the types
@@ -675,35 +697,39 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
           not exists(getNthTypeParameter(abs, _))
           or
           exists(int n | n = max(int i | exists(getNthTypeParameter(abs, i))) |
-            typeParametersHaveEqualInstantiationFromIndex(app, abs, tm, n)
+            typeParametersHaveEqualInstantiationFromIndex(app, abs, constraint, n)
           )
         )
       }
 
       /**
-       * Holds if `app` is _not_ a possible instantiation of `tm`.
+       * Holds if `app` is _not_ a possible instantiation of `constraint`.
+       *
+       * This is an approximation of `not isInstantiationOf(app, abs, constraint)`, but
+       * defined without a negative occurrence of `isInstantiationOf`.
+       *
+       * Due to the approximation, both `isInstantiationOf` and `isNotInstantiationOf`
+       * can hold for the same values. For example, if `app` has two different types `t1`
+       * and `t2` at the same type path, and `t1` satisfies `constraint` while `t2` does
+       * not, then both `isInstantiationOf` and `isNotInstantiationOf` will hold.
+       *
+       * Dually, if `app` does not have a type at a required type path, then neither
+       * `isInstantiationOf` nor `isNotInstantiationOf` will hold.
        */
       pragma[nomagic]
-      predicate isNotInstantiationOf(App app, TypeAbstraction abs, TypeMention tm) {
-        // `app` and `tm` differ on a concrete type
-        exists(Type t, TypePath path |
-          t = resolveNthTypeAt(app, abs, tm, _, path) and
+      predicate isNotInstantiationOf(App app, TypeAbstraction abs, Constraint constraint) {
+        // `app` and `constraint` differ on a concrete type
+        exists(Type t, Type t2, TypePath path |
+          t = resolveTypeAt(app, abs, constraint, path) and
           not t = abs.getATypeParameter() and
-          not path.isEmpty() and
-          app.getTypeAt(path) != t
-        )
-        or
-        // `app` uses inconsistent type parameter instantiations
-        exists(TypeParameter tp |
-          potentialInstantiationOf(app, abs, tm) and
-          app.getTypeAt(getNthTypeParameterPath(tm, tp, _)) !=
-            app.getTypeAt(getNthTypeParameterPath(tm, tp, _))
+          app.getTypeAt(path) = t2 and
+          t2 != t
         )
       }
     }
 
     /** Provides logic related to base types. */
-    private module BaseTypes {
+    module BaseTypes {
       /**
        * Holds if, when `tm1` is considered an instantiation of `tm2`, then at
        * the type parameter `tp` it has the type `t` at `path`.
@@ -721,30 +747,28 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
         )
       }
 
-      final private class FinalTypeMention = TypeMention;
-
-      final private class TypeMentionTypeTree extends FinalTypeMention {
-        Type getTypeAt(TypePath path) { result = this.resolveTypeAt(path) }
-      }
-
       private module IsInstantiationOfInput implements
-        IsInstantiationOfInputSig<TypeMentionTypeTree>
+        IsInstantiationOfInputSig<TypeMentionTypeTree, TypeMentionTypeTree>
       {
         pragma[nomagic]
-        private predicate typeCondition(Type type, TypeAbstraction abs, TypeMentionTypeTree lhs) {
-          conditionSatisfiesConstraint(abs, lhs, _) and type = resolveTypeMentionRoot(lhs)
+        private predicate typeCondition(
+          Type type, TypeAbstraction abs, TypeMentionTypeTree condition
+        ) {
+          conditionSatisfiesConstraint(abs, condition, _) and
+          type = resolveTypeMentionRoot(condition)
         }
 
         pragma[nomagic]
-        private predicate typeConstraint(Type type, TypeMentionTypeTree rhs) {
-          conditionSatisfiesConstraint(_, _, rhs) and type = resolveTypeMentionRoot(rhs)
+        private predicate typeConstraint(Type type, TypeMentionTypeTree constraint) {
+          conditionSatisfiesConstraint(_, _, constraint) and
+          type = resolveTypeMentionRoot(constraint)
         }
 
         predicate potentialInstantiationOf(
-          TypeMentionTypeTree condition, TypeAbstraction abs, TypeMention constraint
+          TypeMentionTypeTree constraint, TypeAbstraction abs, TypeMentionTypeTree condition
         ) {
           exists(Type type |
-            typeConstraint(type, condition) and typeCondition(type, abs, constraint)
+            typeConstraint(type, constraint) and typeCondition(type, abs, condition)
           )
         }
       }
@@ -761,27 +785,27 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
         constraint.resolveTypeAt(path) = t
         or
         // recursive case
-        exists(TypeAbstraction midAbs, TypeMention midSup, TypeMention midSub |
-          conditionSatisfiesConstraint(abs, condition, midSup) and
-          // NOTE: `midAbs` describe the free type variables in `midSub`, hence
+        exists(TypeAbstraction midAbs, TypeMention midConstraint, TypeMention midCondition |
+          conditionSatisfiesConstraint(abs, condition, midConstraint) and
+          // NOTE: `midAbs` describe the free type variables in `midCondition`, hence
           // we use that for instantiation check.
-          IsInstantiationOf<TypeMentionTypeTree, IsInstantiationOfInput>::isInstantiationOf(midSup,
-            midAbs, midSub)
+          IsInstantiationOf<TypeMentionTypeTree, TypeMentionTypeTree, IsInstantiationOfInput>::isInstantiationOf(midConstraint,
+            midAbs, midCondition)
         |
-          conditionSatisfiesConstraintTypeAt(midAbs, midSub, constraint, path, t) and
+          conditionSatisfiesConstraintTypeAt(midAbs, midCondition, constraint, path, t) and
           not t = midAbs.getATypeParameter()
           or
           exists(TypePath prefix, TypePath suffix, TypeParameter tp |
             tp = midAbs.getATypeParameter() and
-            conditionSatisfiesConstraintTypeAt(midAbs, midSub, constraint, prefix, tp) and
-            instantiatesWith(midSup, midSub, tp, suffix, t) and
+            conditionSatisfiesConstraintTypeAt(midAbs, midCondition, constraint, prefix, tp) and
+            instantiatesWith(midConstraint, midCondition, tp, suffix, t) and
             path = prefix.append(suffix)
           )
         )
       }
 
       /**
-       * Holds if its possible for a type with `conditionRoot` at the root to
+       * Holds if it's possible for a type with `conditionRoot` at the root to
        * satisfy a constraint with `constraintRoot` at the root through `abs`,
        * `condition`, and `constraint`.
        */
@@ -915,6 +939,15 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
     signature module SatisfiesConstraintInputSig<HasTypeTreeSig HasTypeTree> {
       /** Holds if it is relevant to know if `term` satisfies `constraint`. */
       predicate relevantConstraint(HasTypeTree term, Type constraint);
+
+      /**
+       * Holds if constraints that are satisfied through conditions that are
+       * universally quantified type parameters should be used. Such type
+       * parameters might have type parameter constraints, and these are _not_
+       * checked. Hence using these represent a trade-off between too many
+       * constraints and too few constraints being satisfied.
+       */
+      default predicate useUniversalConditions() { any() }
     }
 
     module SatisfiesConstraint<
@@ -929,8 +962,12 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
         relevantConstraint(term, constraint)
       }
 
-      private module IsInstantiationOfInput implements IsInstantiationOfInputSig<HasTypeTree> {
-        predicate potentialInstantiationOf(HasTypeTree tt, TypeAbstraction abs, TypeMention cond) {
+      private module IsInstantiationOfInput implements
+        IsInstantiationOfInputSig<HasTypeTree, TypeMentionTypeTree>
+      {
+        predicate potentialInstantiationOf(
+          HasTypeTree tt, TypeAbstraction abs, TypeMentionTypeTree cond
+        ) {
           exists(Type constraint, Type type |
             hasTypeConstraint(tt, type, constraint) and
             rootTypesSatisfaction(type, constraint, abs, cond, _) and
@@ -939,7 +976,7 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
           )
         }
 
-        predicate relevantTypeMention(TypeMention constraint) {
+        predicate relevantConstraint(TypeMentionTypeTree constraint) {
           rootTypesSatisfaction(_, _, _, constraint, _)
         }
       }
@@ -949,27 +986,65 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
        */
       pragma[nomagic]
       private predicate hasConstraintMention(
-        HasTypeTree tt, TypeAbstraction abs, TypeMention sub, Type constraint,
+        HasTypeTree tt, TypeAbstraction abs, TypeMention condition, Type constraint,
         TypeMention constraintMention
       ) {
         exists(Type type | hasTypeConstraint(tt, type, constraint) |
+          useUniversalConditions() and
           not exists(countConstraintImplementations(type, constraint)) and
-          conditionSatisfiesConstraintTypeAt(abs, sub, constraintMention, _, _) and
-          resolveTypeMentionRoot(sub) = abs.getATypeParameter() and
+          conditionSatisfiesConstraintTypeAt(abs, condition, constraintMention, _, _) and
+          resolveTypeMentionRoot(condition) = abs.getATypeParameter() and
           constraint = resolveTypeMentionRoot(constraintMention)
           or
           countConstraintImplementations(type, constraint) > 0 and
-          rootTypesSatisfaction(type, constraint, abs, sub, constraintMention) and
+          rootTypesSatisfaction(type, constraint, abs, condition, constraintMention) and
           // When there are multiple ways the type could implement the
           // constraint we need to find the right implementation, which is the
           // one where the type instantiates the precondition.
           if multipleConstraintImplementations(type, constraint)
           then
-            IsInstantiationOf<HasTypeTree, IsInstantiationOfInput>::isInstantiationOf(tt, abs, sub)
+            IsInstantiationOf<HasTypeTree, TypeMentionTypeTree, IsInstantiationOfInput>::isInstantiationOf(tt,
+              abs, condition)
           else any()
         )
       }
 
+      /**
+       * Holds if `tt` does not satisfy `constraint`.
+       *
+       * This predicate is an approximation of `not hasConstraintMention(tt, constraint)`.
+       */
+      pragma[nomagic]
+      private predicate hasNotConstraintMention(HasTypeTree tt, Type constraint) {
+        exists(Type type | hasTypeConstraint(tt, type, constraint) |
+          (
+            not useUniversalConditions()
+            or
+            exists(countConstraintImplementations(type, constraint))
+            or
+            forall(TypeAbstraction abs, TypeMention condition, TypeMention constraintMention |
+              conditionSatisfiesConstraintTypeAt(abs, condition, constraintMention, _, _) and
+              resolveTypeMentionRoot(condition) = abs.getATypeParameter()
+            |
+              not constraint = resolveTypeMentionRoot(constraintMention)
+            )
+          ) and
+          (
+            countConstraintImplementations(type, constraint) = 0
+            or
+            not rootTypesSatisfaction(type, constraint, _, _, _)
+            or
+            multipleConstraintImplementations(type, constraint) and
+            forex(TypeAbstraction abs, TypeMention condition |
+              rootTypesSatisfaction(type, constraint, abs, condition, _)
+            |
+              IsInstantiationOf<HasTypeTree, TypeMentionTypeTree, IsInstantiationOfInput>::isNotInstantiationOf(tt,
+                abs, condition)
+            )
+          )
+        )
+      }
+
       pragma[nomagic]
       private predicate satisfiesConstraintTypeMention0(
         HasTypeTree tt, Type constraint, TypeAbstraction abs, TypeMention sub, TypePath path, Type t
@@ -1011,6 +1086,519 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
         hasTypeConstraint(tt, constraint, constraint) and
         t = tt.getTypeAt(path)
       }
+
+      /**
+       * Holds if the type tree at `tt` does _not_ satisfy the constraint `constraint`.
+       *
+       * This is an approximation of `not satisfiesConstraintType(tt, constraint, _, _)`,
+       * but defined without a negative occurrence of `satisfiesConstraintType`.
+       *
+       * Due to the approximation, both `satisfiesConstraintType` and `dissatisfiesConstraint`
+       * can hold for the same values. For example, if `tt` has two different types `t1`
+       * and `t2`, and `t1` satisfies `constraint` while `t2` does not, then both
+       * `satisfiesConstraintType` and `dissatisfiesConstraint` will hold.
+       *
+       * Dually, if `tt` does not have a type, then neither `satisfiesConstraintType` nor
+       * `dissatisfiesConstraint` will hold.
+       */
+      pragma[nomagic]
+      predicate dissatisfiesConstraint(HasTypeTree tt, Type constraint) {
+        hasNotConstraintMention(tt, constraint) and
+        exists(Type t |
+          hasTypeConstraint(tt, t, constraint) and
+          t != constraint
+        )
+      }
+    }
+
+    /** Provides the input to `MatchingWithEnvironment`. */
+    signature module MatchingWithEnvironmentInputSig {
+      /**
+       * A position inside a declaration. For example, the integer position of a
+       * parameter inside a method or the return type of a method.
+       */
+      bindingset[this]
+      class DeclarationPosition {
+        /** Gets a textual representation of this position. */
+        bindingset[this]
+        string toString();
+      }
+
+      /** A declaration, for example a method. */
+      class Declaration {
+        /** Gets a textual representation of this declaration. */
+        string toString();
+
+        /** Gets the location of this declaration. */
+        Location getLocation();
+
+        /** Gets the type parameter at position `tppos` of this declaration, if any. */
+        TypeParameter getTypeParameter(TypeParameterPosition tppos);
+
+        /**
+         * Gets the declared type of this declaration at `path` for position `dpos`.
+         *
+         * For example, if this declaration is the method `int M(bool b)`,
+         * then the declared type at parameter position `0` is `bool`, the
+         * declared type at the `this` position is the class type, and the
+         * declared return type is `int`.
+         */
+        Type getDeclaredType(DeclarationPosition dpos, TypePath path);
+      }
+
+      /**
+       * A position inside an access. For example, the integer position of an
+       * argument inside a method call.
+       */
+      bindingset[this]
+      class AccessPosition {
+        /** Gets a textual representation of this position. */
+        bindingset[this]
+        string toString();
+      }
+
+      /** An environment to track during type matching. */
+      bindingset[this]
+      class AccessEnvironment {
+        /** Gets a textual representation of this environment. */
+        bindingset[this]
+        string toString();
+      }
+
+      /** An access that targets a declaration, for example a method call. */
+      class Access {
+        /** Gets a textual representation of this access. */
+        string toString();
+
+        /** Gets the location of this access. */
+        Location getLocation();
+
+        /**
+         * Gets the type at `path` for the type argument at position `tapos` of
+         * this access, if any.
+         *
+         * For example, in a method call like `M<int>()`, `int` is an explicit
+         * type argument at position `0`.
+         */
+        Type getTypeArgument(TypeArgumentPosition tapos, TypePath path);
+
+        /**
+         * Gets the inferred type at `path` for the position `apos` and environment `e`
+         * of this access.
+         *
+         * For example, if this access is the method call `M(42)`, then the inferred
+         * type at argument position `0` is `int`.
+         */
+        bindingset[e]
+        Type getInferredType(AccessEnvironment e, AccessPosition apos, TypePath path);
+
+        /** Gets the declaration that this access targets in environment `e`. */
+        Declaration getTarget(AccessEnvironment e);
+      }
+
+      /** Holds if `apos` and `dpos` match. */
+      bindingset[apos]
+      bindingset[dpos]
+      predicate accessDeclarationPositionMatch(AccessPosition apos, DeclarationPosition dpos);
+    }
+
+    /**
+     * Provides logic for matching types at accesses against types at the
+     * declarations that the accesses target.
+     *
+     * Matching takes both base types and explicit type arguments into account.
+     */
+    module MatchingWithEnvironment<MatchingWithEnvironmentInputSig Input> {
+      private import Input
+
+      /**
+       * Gets the type of the type argument at `path` in `a` that corresponds to
+       * the type parameter `tp` in `target`, if any.
+       *
+       * Note that this predicate crucially does not depend on type inference,
+       * and hence can appear in negated position, e.g., as in
+       * `directTypeMatch`.
+       */
+      bindingset[a, target]
+      pragma[inline_late]
+      private Type getTypeArgument(Access a, Declaration target, TypeParameter tp, TypePath path) {
+        exists(TypeArgumentPosition tapos, TypeParameterPosition tppos |
+          result = a.getTypeArgument(tapos, path) and
+          tp = target.getTypeParameter(tppos) and
+          typeArgumentParameterPositionMatch(tapos, tppos)
+        )
+      }
+
+      pragma[nomagic]
+      private predicate directTypeMatch0(
+        Access a, DeclarationPosition dpos, AccessEnvironment e, Declaration target,
+        TypePath pathToTypeParam, TypeParameter tp
+      ) {
+        not exists(getTypeArgument(a, target, tp, _)) and
+        tp = target.getDeclaredType(dpos, pathToTypeParam) and
+        target = a.getTarget(e)
+      }
+
+      /**
+       * Holds if the type `t` at `path` of `a` in environment `e` matches the type
+       * parameter `tp` of `target`.
+       */
+      pragma[nomagic]
+      private predicate directTypeMatch(
+        Access a, AccessEnvironment e, Declaration target, TypePath path, Type t, TypeParameter tp
+      ) {
+        exists(AccessPosition apos, DeclarationPosition dpos, TypePath pathToTypeParam |
+          directTypeMatch0(a, dpos, e, target, pathToTypeParam, tp) and
+          accessDeclarationPositionMatch(apos, dpos) and
+          t = a.getInferredType(e, apos, pathToTypeParam.appendInverse(path))
+        )
+      }
+
+      private module AccessBaseType {
+        /**
+         * Holds if inferring types at `a` in environment `e` might depend on the type at
+         * `path` of `apos` having `base` as a transitive base type.
+         */
+        private predicate relevantAccess(
+          Access a, AccessEnvironment e, AccessPosition apos, Type base
+        ) {
+          exists(Declaration target, DeclarationPosition dpos |
+            target = a.getTarget(e) and
+            accessDeclarationPositionMatch(apos, dpos) and
+            declarationBaseType(target, dpos, base, _, _)
+          )
+        }
+
+        pragma[nomagic]
+        private Type inferTypeAt(
+          Access a, AccessEnvironment e, AccessPosition apos, TypeParameter tp, TypePath suffix
+        ) {
+          relevantAccess(a, e, apos, _) and
+          exists(TypePath path0 |
+            result = a.getInferredType(e, apos, path0) and
+            path0.isCons(tp, suffix)
+          )
+        }
+
+        /**
+         * Holds if `baseMention` is a (transitive) base type mention of the
+         * type of `a` at position `apos` at path `pathToSub` in environment
+         * `e`, and `t` is mentioned (implicitly) at `path` inside `base`.
+         *
+         * For example, in
+         *
+         * ```csharp
+         * class C<T1> { }
+         *
+         * class Base<T2> { }
+         *
+         * class Mid<T3> : Base<C<T3>> { }
+         *
+         * class Sub<T4> : Mid<C<T4>> { }
+         *
+         *     new Sub<int>().ToString();
+         * //  ^^^^^^^^^^^^^^ node at `apos`
+         * //  ^^^^^^^^^^^^^^^^^^^^^^^^^ `a`
+         * ```
+         *
+         * where the method call is an access, `new Sub<int>()` is at the access
+         * position which is the receiver of a method call, and `pathToSub` is
+         * `""` we have:
+         *
+         * `baseMention` | `path`       | `t`
+         * ------------- | ------------ | ---
+         * `Mid<C<T4>>`  | `"T3"`       | ``C`1``
+         * `Mid<C<T4>>`  | `"T3.T1"`    | `int`
+         * `Base<C<T3>>` | `"T2"`       | ``C`1``
+         * `Base<C<T3>>` | `"T2.T1"`    | ``C`1``
+         * `Base<C<T3>>` | `"T2.T1.T1"` | `int`
+         */
+        predicate hasBaseTypeMention(
+          Access a, AccessEnvironment e, AccessPosition apos, TypeMention baseMention,
+          TypePath path, Type t
+        ) {
+          relevantAccess(a, e, apos, resolveTypeMentionRoot(baseMention)) and
+          exists(Type sub | sub = a.getInferredType(e, apos, TypePath::nil()) |
+            baseTypeMentionHasNonTypeParameterAt(sub, baseMention, path, t)
+            or
+            exists(TypePath prefix, TypePath suffix, TypeParameter tp |
+              baseTypeMentionHasTypeParameterAt(sub, baseMention, prefix, tp) and
+              t = inferTypeAt(a, e, apos, tp, suffix) and
+              path = prefix.append(suffix)
+            )
+          )
+        }
+      }
+
+      private module AccessConstraint {
+        predicate relevantAccessConstraint(
+          Access a, AccessEnvironment e, Declaration target, AccessPosition apos, TypePath path,
+          Type constraint
+        ) {
+          target = a.getTarget(e) and
+          typeParameterConstraintHasTypeParameter(target, apos, path, constraint, _, _)
+        }
+
+        private newtype TRelevantAccess =
+          MkRelevantAccess(Access a, AccessPosition apos, AccessEnvironment e, TypePath path) {
+            relevantAccessConstraint(a, e, _, apos, path, _)
+          }
+
+        /**
+         * If the access `a` for `apos`, environment `e`, and `path` has an inferred type
+         * which type inference requires to satisfy some constraint.
+         */
+        private class RelevantAccess extends MkRelevantAccess {
+          Access a;
+          AccessPosition apos;
+          AccessEnvironment e;
+          TypePath path;
+
+          RelevantAccess() { this = MkRelevantAccess(a, apos, e, path) }
+
+          Type getTypeAt(TypePath suffix) {
+            result = a.getInferredType(e, apos, path.appendInverse(suffix))
+          }
+
+          /** Gets the constraint that this relevant access should satisfy. */
+          Type getConstraint(Declaration target) {
+            relevantAccessConstraint(a, e, target, apos, path, result)
+          }
+
+          string toString() {
+            result = a.toString() + ", " + apos.toString() + ", " + path.toString()
+          }
+
+          Location getLocation() { result = a.getLocation() }
+        }
+
+        private module SatisfiesConstraintInput implements
+          SatisfiesConstraintInputSig<RelevantAccess>
+        {
+          predicate relevantConstraint(RelevantAccess at, Type constraint) {
+            constraint = at.getConstraint(_)
+          }
+        }
+
+        predicate satisfiesConstraintType(
+          Access a, AccessEnvironment e, Declaration target, AccessPosition apos, TypePath prefix,
+          Type constraint, TypePath path, Type t
+        ) {
+          exists(RelevantAccess ra |
+            ra = MkRelevantAccess(a, apos, e, prefix) and
+            SatisfiesConstraint<RelevantAccess, SatisfiesConstraintInput>::satisfiesConstraintType(ra,
+              constraint, path, t) and
+            constraint = ra.getConstraint(target)
+          )
+        }
+      }
+
+      /**
+       * Holds if the type of `a` at `apos` in environment `e` has the base type `base`,
+       * and when viewed as an element of that type has the type `t` at `path`.
+       */
+      pragma[nomagic]
+      private predicate accessBaseType(
+        Access a, AccessEnvironment e, AccessPosition apos, Type base, TypePath path, Type t
+      ) {
+        exists(TypeMention tm |
+          AccessBaseType::hasBaseTypeMention(a, e, apos, tm, path, t) and
+          base = resolveTypeMentionRoot(tm)
+        )
+      }
+
+      /**
+       * Holds if the declared type at `decl` for `dpos` at the `path` is `tp`
+       * and `path` starts with a type parameter of `base`.
+       */
+      pragma[nomagic]
+      private predicate declarationBaseType(
+        Declaration decl, DeclarationPosition dpos, Type base, TypePath path, TypeParameter tp
+      ) {
+        tp = decl.getDeclaredType(dpos, path) and
+        base.getATypeParameter() = path.getHead()
+      }
+
+      /**
+       * Holds if the (transitive) base type `t` at `path` of `a` in environment `e`
+       * for some `AccessPosition` matches the type parameter `tp`, which is used in
+       * the declared types of `target`.
+       *
+       * For example, in
+       *
+       * ```csharp
+       * class C<T1> { }
+       *
+       * class Base<T2> {
+       * //         ^^ `tp`
+       *     public C<T2> Method() { ... }
+       * //               ^^^^^^ `target`
+       * }
+       *
+       * class Mid<T3> : Base<C<T3>> { }
+       *
+       * class Sub<T4> : Mid<C<T4>> { }
+       *
+       *    new Sub<int>().Method(); // Note: `Sub<int>` is a subtype of `Base<C<C<int>>>`
+       * // ^^^^^^^^^^^^^^^^^^^^^^^ `a`
+       * ```
+       *
+       * we have that type parameter `T2` of `Base` is matched as follows:
+       *
+       * `path`    | `t`
+       * --------- | -------
+       * `""`      | ``C`1``
+       * `"T1"`    | ``C`1``
+       * `"T1.T1"` | `int`
+       */
+      pragma[nomagic]
+      private predicate baseTypeMatch(
+        Access a, AccessEnvironment e, Declaration target, TypePath path, Type t, TypeParameter tp
+      ) {
+        not exists(getTypeArgument(a, target, tp, _)) and
+        target = a.getTarget(e) and
+        exists(AccessPosition apos, DeclarationPosition dpos, Type base, TypePath pathToTypeParam |
+          accessBaseType(a, e, apos, base, pathToTypeParam.appendInverse(path), t) and
+          declarationBaseType(target, dpos, base, pathToTypeParam, tp) and
+          accessDeclarationPositionMatch(apos, dpos)
+        )
+      }
+
+      /**
+       * Holds if for `a` and corresponding `target` in environment `e`, the type parameter
+       * `tp` is matched by a type argument at the access with type `t` and type path
+       * `path`.
+       */
+      pragma[nomagic]
+      private predicate explicitTypeMatch(
+        Access a, AccessEnvironment e, Declaration target, TypePath path, Type t, TypeParameter tp
+      ) {
+        target = a.getTarget(e) and
+        t = getTypeArgument(a, target, tp, path)
+      }
+
+      /**
+       * Holds if the declared type of `target` contains a type parameter at
+       * `apos` and `pathToConstrained` that must satisfy `constraint` and `tp`
+       * occurs at `pathToTp` in `constraint`.
+       *
+       * For example, in
+       * ```csharp
+       * interface IFoo<A> { }
+       * T1 M<T1, T2>(T2 item) where T2 : IFoo<T1> { }
+       * ```
+       * with the method declaration being the target and with `apos`
+       * corresponding to `item`, we have the following
+       * - `pathToConstrained = ""`,
+       * - `tp = T1`,
+       * - `constraint = IFoo`,
+       * - `pathToTp = "A"`.
+       */
+      pragma[nomagic]
+      private predicate typeParameterConstraintHasTypeParameter(
+        Declaration target, AccessPosition apos, TypePath pathToConstrained, Type constraint,
+        TypePath pathToTp, TypeParameter tp
+      ) {
+        exists(DeclarationPosition dpos, TypeParameter constrainedTp |
+          accessDeclarationPositionMatch(apos, dpos) and
+          constrainedTp = target.getTypeParameter(_) and
+          tp = target.getTypeParameter(_) and
+          constrainedTp != tp and
+          constrainedTp = target.getDeclaredType(dpos, pathToConstrained) and
+          exists(TypeMention tm |
+            tm = getATypeParameterConstraint(constrainedTp) and
+            tm.resolveTypeAt(pathToTp) = tp and
+            constraint = resolveTypeMentionRoot(tm)
+          )
+        )
+      }
+
+      pragma[nomagic]
+      private predicate typeConstraintBaseTypeMatch(
+        Access a, AccessEnvironment e, Declaration target, TypePath path, Type t, TypeParameter tp
+      ) {
+        not exists(getTypeArgument(a, target, tp, _)) and
+        exists(Type constraint, AccessPosition apos, TypePath pathToTp, TypePath pathToTp2 |
+          typeParameterConstraintHasTypeParameter(target, apos, pathToTp2, constraint, pathToTp, tp) and
+          AccessConstraint::satisfiesConstraintType(a, e, target, apos, pathToTp2, constraint,
+            pathToTp.appendInverse(path), t)
+        )
+      }
+
+      pragma[inline]
+      private predicate typeMatch(
+        Access a, AccessEnvironment e, Declaration target, TypePath path, Type t, TypeParameter tp
+      ) {
+        // A type given at the access corresponds directly to the type parameter
+        // at the target.
+        explicitTypeMatch(a, e, target, path, t, tp)
+        or
+        // We can infer the type of `tp` from one of the access positions
+        directTypeMatch(a, e, target, path, t, tp)
+        or
+        // We can infer the type of `tp` by going up the type hiearchy
+        baseTypeMatch(a, e, target, path, t, tp)
+        or
+        // We can infer the type of `tp` by a type constraint
+        typeConstraintBaseTypeMatch(a, e, target, path, t, tp)
+      }
+
+      /**
+       * Gets the inferred type of `a` at `path` for position `apos` and environment `e`.
+       *
+       * For example, in
+       *
+       * ```csharp
+       * class C<T1> { }
+       *
+       * class Base<T2> {
+       *     public C<T2> Method() { ... }
+       * }
+       *
+       * class Mid<T3> : Base<C<T3>> { }
+       *
+       * class Sub<T4> : Mid<C<T4>> { }
+       *
+       *    new Sub<int>().Method(); // Note: Sub<int> is a subtype of Base<C<C<int>>>
+       * // ^^^^^^^^^^^^^^^^^^^^^^^ `a`
+       * ```
+       *
+       * we infer the following types for the return position:
+       *
+       * `path`       | `t`
+       * ------------ | -------
+       * `""`         | ``C`1``
+       * `"T1"`       | ``C`1``
+       * `"T1.T1"`    | ``C`1``
+       * `"T1.T1.T1"` | `int`
+       *
+       * We also infer the following types for the receiver position:
+       *
+       * `path`       | `t`
+       * ------------ | -------
+       * `""`         | ``Base`1``
+       * `"T2"`       | ``C`1``
+       * `"T2.T1"`    | ``C`1``
+       * `"T2.T1.T1"` | `int`
+       */
+      pragma[nomagic]
+      Type inferAccessType(Access a, AccessEnvironment e, AccessPosition apos, TypePath path) {
+        exists(DeclarationPosition dpos | accessDeclarationPositionMatch(apos, dpos) |
+          // A suffix of `path` leads to a type parameter in the target
+          exists(Declaration target, TypePath prefix, TypeParameter tp, TypePath suffix |
+            tp = target.getDeclaredType(dpos, prefix) and
+            path = prefix.append(suffix) and
+            typeMatch(a, e, target, suffix, result, tp)
+          )
+          or
+          // `path` corresponds directly to a concrete type in the declaration
+          exists(Declaration target |
+            result = target.getDeclaredType(dpos, path) and
+            target = a.getTarget(e) and
+            not result instanceof TypeParameter
+          )
+        )
+      }
     }
 
     /** Provides the input to `Matching`. */
@@ -1092,29 +1680,6 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
       bindingset[apos]
       bindingset[dpos]
       predicate accessDeclarationPositionMatch(AccessPosition apos, DeclarationPosition dpos);
-
-      /**
-       * Holds if matching an inferred type `t` at `path` inside an access at `apos`
-       * against the declaration `target` means that the type should be adjusted to
-       * `tAdj` at `pathAdj`.
-       *
-       * For example, in
-       *
-       * ```csharp
-       * void M(int? i) {}
-       * M(42);
-       * ```
-       *
-       * the inferred type of `42` is `int`, but it should be adjusted to `int?`
-       * when matching against `M`.
-       */
-      bindingset[apos, target, path, t]
-      default predicate adjustAccessType(
-        AccessPosition apos, Declaration target, TypePath path, Type t, TypePath pathAdj, Type tAdj
-      ) {
-        pathAdj = path and
-        tAdj = t
-      }
     }
 
     /**
@@ -1124,387 +1689,33 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
      * Matching takes both base types and explicit type arguments into account.
      */
     module Matching<MatchingInputSig Input> {
-      private import Input
+      private module Inp implements MatchingWithEnvironmentInputSig {
+        private import codeql.util.Unit
+        import Input
 
-      /**
-       * Holds if `a` targets `target` and the type for `apos` at `path` in `a`
-       * is `t` after adjustment by `target`.
-       */
-      pragma[nomagic]
-      private predicate adjustedAccessType(
-        Access a, AccessPosition apos, Declaration target, TypePath path, Type t
-      ) {
-        target = a.getTarget() and
-        exists(TypePath path0, Type t0 |
-          t0 = a.getInferredType(apos, path0) and
-          adjustAccessType(apos, target, path0, t0, path, t)
-        )
-      }
+        class AccessEnvironment = Unit;
 
-      /**
-       * Gets the type of the type argument at `path` in `a` that corresponds to
-       * the type parameter `tp` in `target`, if any.
-       *
-       * Note that this predicate crucially does not depend on type inference,
-       * and hence can appear in negated position, e.g., as in
-       * `directTypeMatch`.
-       */
-      bindingset[a, target]
-      pragma[inline_late]
-      private Type getTypeArgument(Access a, Declaration target, TypeParameter tp, TypePath path) {
-        exists(TypeArgumentPosition tapos, TypeParameterPosition tppos |
-          result = a.getTypeArgument(tapos, path) and
-          tp = target.getTypeParameter(tppos) and
-          typeArgumentParameterPositionMatch(tapos, tppos)
-        )
-      }
+        final private class AccessFinal = Input::Access;
 
-      /**
-       * Holds if the type `t` at `path` of `a` matches the type parameter `tp`
-       * of `target`.
-       */
-      pragma[nomagic]
-      private predicate directTypeMatch(
-        Access a, Declaration target, TypePath path, Type t, TypeParameter tp
-      ) {
-        not exists(getTypeArgument(a, target, tp, _)) and
-        exists(AccessPosition apos, DeclarationPosition dpos, TypePath pathToTypeParam |
-          tp = target.getDeclaredType(dpos, pathToTypeParam) and
-          accessDeclarationPositionMatch(apos, dpos) and
-          adjustedAccessType(a, apos, target, pathToTypeParam.appendInverse(path), t)
-        )
-      }
-
-      private module AccessBaseType {
-        /**
-         * Holds if inferring types at `a` might depend on the type at `path` of
-         * `apos` having `base` as a transitive base type.
-         */
-        private predicate relevantAccess(Access a, AccessPosition apos, Type base) {
-          exists(Declaration target, DeclarationPosition dpos |
-            adjustedAccessType(a, apos, target, _, _) and
-            accessDeclarationPositionMatch(apos, dpos) and
-            declarationBaseType(target, dpos, base, _, _)
-          )
-        }
-
-        pragma[nomagic]
-        private Type inferTypeAt(Access a, AccessPosition apos, TypeParameter tp, TypePath suffix) {
-          relevantAccess(a, apos, _) and
-          exists(TypePath path0 |
-            result = a.getInferredType(apos, path0) and
-            path0.isCons(tp, suffix)
-          )
-        }
-
-        /**
-         * Holds if `baseMention` is a (transitive) base type mention of the
-         * type of `a` at position `apos` at path `pathToSub`, and `t` is
-         * mentioned (implicitly) at `path` inside `base`. For example, in
-         *
-         * ```csharp
-         * class C<T1> { }
-         *
-         * class Base<T2> { }
-         *
-         * class Mid<T3> : Base<C<T3>> { }
-         *
-         * class Sub<T4> : Mid<C<T4>> { }
-         *
-         *     new Sub<int>().ToString();
-         * //  ^^^^^^^^^^^^^^ node at `apos`
-         * //  ^^^^^^^^^^^^^^^^^^^^^^^^^ `a`
-         * ```
-         *
-         * where the method call is an access, `new Sub<int>()` is at the access
-         * position which is the receiver of a method call, and `pathToSub` is
-         * `""` we have:
-         *
-         * `baseMention` | `path`       | `t`
-         * ------------- | ------------ | ---
-         * `Mid<C<T4>>`  | `"T3"`       | ``C`1``
-         * `Mid<C<T4>>`  | `"T3.T1"`    | `int`
-         * `Base<C<T3>>` | `"T2"`       | ``C`1``
-         * `Base<C<T3>>` | `"T2.T1"`    | ``C`1``
-         * `Base<C<T3>>` | `"T2.T1.T1"` | `int`
-         */
-        predicate hasBaseTypeMention(
-          Access a, AccessPosition apos, TypeMention baseMention, TypePath path, Type t
-        ) {
-          relevantAccess(a, apos, resolveTypeMentionRoot(baseMention)) and
-          exists(Type sub | sub = a.getInferredType(apos, TypePath::nil()) |
-            baseTypeMentionHasNonTypeParameterAt(sub, baseMention, path, t)
-            or
-            exists(TypePath prefix, TypePath suffix, TypeParameter tp |
-              baseTypeMentionHasTypeParameterAt(sub, baseMention, prefix, tp) and
-              t = inferTypeAt(a, apos, tp, suffix) and
-              path = prefix.append(suffix)
-            )
-          )
-        }
-      }
-
-      private module AccessConstraint {
-        predicate relevantAccessConstraint(
-          Access a, Declaration target, AccessPosition apos, TypePath path, Type constraint
-        ) {
-          target = a.getTarget() and
-          typeParameterConstraintHasTypeParameter(target, apos, path, constraint, _, _)
-        }
-
-        private newtype TRelevantAccess =
-          MkRelevantAccess(Access a, Declaration target, AccessPosition apos, TypePath path) {
-            relevantAccessConstraint(a, target, apos, path, _)
+        class Access extends AccessFinal {
+          Type getInferredType(AccessEnvironment e, AccessPosition apos, TypePath path) {
+            exists(e) and
+            result = super.getInferredType(apos, path)
           }
 
-        /**
-         * If the access `a` for `apos` and `path` has an inferred type which
-         * type inference requires to satisfy some constraint.
-         */
-        private class RelevantAccess extends MkRelevantAccess {
-          Access a;
-          Declaration target;
-          AccessPosition apos;
-          TypePath path;
-
-          RelevantAccess() { this = MkRelevantAccess(a, target, apos, path) }
-
-          Type getTypeAt(TypePath suffix) {
-            adjustedAccessType(a, apos, target, path.appendInverse(suffix), result)
-          }
-
-          /** Holds if this relevant access should satisfy `constraint`. */
-          Type getConstraint() { relevantAccessConstraint(a, target, apos, path, result) }
-
-          string toString() {
-            result = a.toString() + ", " + apos.toString() + ", " + path.toString()
-          }
-
-          Location getLocation() { result = a.getLocation() }
-        }
-
-        private module SatisfiesConstraintInput implements
-          SatisfiesConstraintInputSig<RelevantAccess>
-        {
-          predicate relevantConstraint(RelevantAccess at, Type constraint) {
-            constraint = at.getConstraint()
+          Declaration getTarget(AccessEnvironment e) {
+            exists(e) and
+            result = super.getTarget()
           }
         }
-
-        predicate satisfiesConstraintType(
-          Access a, Declaration target, AccessPosition apos, TypePath prefix, Type constraint,
-          TypePath path, Type t
-        ) {
-          SatisfiesConstraint<RelevantAccess, SatisfiesConstraintInput>::satisfiesConstraintType(MkRelevantAccess(a,
-              target, apos, prefix), constraint, path, t)
-        }
       }
 
-      /**
-       * Holds if the type of `a` at `apos` has the base type `base`, and when
-       * viewed as an element of that type has the type `t` at `path`.
-       */
-      pragma[nomagic]
-      private predicate accessBaseType(
-        Access a, AccessPosition apos, Type base, TypePath path, Type t
-      ) {
-        exists(TypeMention tm |
-          AccessBaseType::hasBaseTypeMention(a, apos, tm, path, t) and
-          base = resolveTypeMentionRoot(tm)
-        )
-      }
+      private module M = MatchingWithEnvironment<Inp>;
 
-      /**
-       * Holds if the declared type at `decl` for `dpos` at the `path` is `tp`
-       * and `path` starts with a type parameter of `base`.
-       */
-      pragma[nomagic]
-      private predicate declarationBaseType(
-        Declaration decl, DeclarationPosition dpos, Type base, TypePath path, TypeParameter tp
-      ) {
-        tp = decl.getDeclaredType(dpos, path) and
-        base.getATypeParameter() = path.getHead()
-      }
+      import M
 
-      /**
-       * Holds if the (transitive) base type `t` at `path` of `a` for some
-       * `AccessPosition` matches the type parameter `tp`, which is used in the
-       * declared types of `target`.
-       *
-       * For example, in
-       *
-       * ```csharp
-       * class C<T1> { }
-       *
-       * class Base<T2> {
-       * //         ^^ `tp`
-       *     public C<T2> Method() { ... }
-       * //               ^^^^^^ `target`
-       * }
-       *
-       * class Mid<T3> : Base<C<T3>> { }
-       *
-       * class Sub<T4> : Mid<C<T4>> { }
-       *
-       *    new Sub<int>().Method(); // Note: `Sub<int>` is a subtype of `Base<C<C<int>>>`
-       * // ^^^^^^^^^^^^^^^^^^^^^^^ `a`
-       * ```
-       *
-       * we have that type parameter `T2` of `Base` is matched as follows:
-       *
-       * `path`    | `t`
-       * --------- | -------
-       * `""`      | ``C`1``
-       * `"T1"`    | ``C`1``
-       * `"T1.T1"` | `int`
-       */
-      pragma[nomagic]
-      private predicate baseTypeMatch(
-        Access a, Declaration target, TypePath path, Type t, TypeParameter tp
-      ) {
-        not exists(getTypeArgument(a, target, tp, _)) and
-        target = a.getTarget() and
-        exists(AccessPosition apos, DeclarationPosition dpos, Type base, TypePath pathToTypeParam |
-          accessBaseType(a, apos, base, pathToTypeParam.appendInverse(path), t) and
-          declarationBaseType(target, dpos, base, pathToTypeParam, tp) and
-          accessDeclarationPositionMatch(apos, dpos)
-        )
-      }
-
-      /**
-       * Holds if for `a` and corresponding `target`, the type parameter `tp` is
-       * matched by a type argument at the access with type `t` and type path
-       * `path`.
-       */
-      pragma[nomagic]
-      private predicate explicitTypeMatch(
-        Access a, Declaration target, TypePath path, Type t, TypeParameter tp
-      ) {
-        target = a.getTarget() and
-        t = getTypeArgument(a, target, tp, path)
-      }
-
-      /**
-       * Holds if the declared type of `target` contains a type parameter at
-       * `apos` and `pathToConstrained` that must satisfy `constraint` and `tp`
-       * occurs at `pathToTp` in `constraint`.
-       *
-       * For example, in
-       * ```csharp
-       * interface IFoo<A> { }
-       * T1 M<T1, T2>(T2 item) where T2 : IFoo<T1> { }
-       * ```
-       * with the method declaration being the target and with `apos`
-       * corresponding to `item`, we have the following
-       * - `pathToConstrained = ""`,
-       * - `tp = T1`,
-       * - `constraint = IFoo`,
-       * - `pathToTp = "A"`.
-       */
-      pragma[nomagic]
-      private predicate typeParameterConstraintHasTypeParameter(
-        Declaration target, AccessPosition apos, TypePath pathToConstrained, Type constraint,
-        TypePath pathToTp, TypeParameter tp
-      ) {
-        exists(DeclarationPosition dpos, TypeParameter constrainedTp |
-          accessDeclarationPositionMatch(apos, dpos) and
-          constrainedTp = target.getTypeParameter(_) and
-          tp = target.getTypeParameter(_) and
-          constrainedTp != tp and
-          constrainedTp = target.getDeclaredType(dpos, pathToConstrained) and
-          exists(TypeMention tm |
-            tm = getATypeParameterConstraint(constrainedTp) and
-            tm.resolveTypeAt(pathToTp) = tp and
-            constraint = resolveTypeMentionRoot(tm)
-          )
-        )
-      }
-
-      pragma[nomagic]
-      private predicate typeConstraintBaseTypeMatch(
-        Access a, Declaration target, TypePath path, Type t, TypeParameter tp
-      ) {
-        not exists(getTypeArgument(a, target, tp, _)) and
-        exists(Type constraint, AccessPosition apos, TypePath pathToTp, TypePath pathToTp2 |
-          typeParameterConstraintHasTypeParameter(target, apos, pathToTp2, constraint, pathToTp, tp) and
-          AccessConstraint::satisfiesConstraintType(a, target, apos, pathToTp2, constraint,
-            pathToTp.appendInverse(path), t)
-        )
-      }
-
-      pragma[inline]
-      private predicate typeMatch(
-        Access a, Declaration target, TypePath path, Type t, TypeParameter tp
-      ) {
-        // A type given at the access corresponds directly to the type parameter
-        // at the target.
-        explicitTypeMatch(a, target, path, t, tp)
-        or
-        // We can infer the type of `tp` from one of the access positions
-        directTypeMatch(a, target, path, t, tp)
-        or
-        // We can infer the type of `tp` by going up the type hiearchy
-        baseTypeMatch(a, target, path, t, tp)
-        or
-        // We can infer the type of `tp` by a type constraint
-        typeConstraintBaseTypeMatch(a, target, path, t, tp)
-      }
-
-      /**
-       * Gets the inferred type of `a` at `path` for position `apos`.
-       *
-       * For example, in
-       *
-       * ```csharp
-       * class C<T1> { }
-       *
-       * class Base<T2> {
-       *     public C<T2> Method() { ... }
-       * }
-       *
-       * class Mid<T3> : Base<C<T3>> { }
-       *
-       * class Sub<T4> : Mid<C<T4>> { }
-       *
-       *    new Sub<int>().Method(); // Note: Sub<int> is a subtype of Base<C<C<int>>>
-       * // ^^^^^^^^^^^^^^^^^^^^^^^ `a`
-       * ```
-       *
-       * we infer the following types for the return position:
-       *
-       * `path`       | `t`
-       * ------------ | -------
-       * `""`         | ``C`1``
-       * `"T1"`       | ``C`1``
-       * `"T1.T1"`    | ``C`1``
-       * `"T1.T1.T1"` | `int`
-       *
-       * We also infer the following types for the receiver position:
-       *
-       * `path`       | `t`
-       * ------------ | -------
-       * `""`         | ``Base`1``
-       * `"T2"`       | ``C`1``
-       * `"T2.T1"`    | ``C`1``
-       * `"T2.T1.T1"` | `int`
-       */
-      pragma[nomagic]
-      Type inferAccessType(Access a, AccessPosition apos, TypePath path) {
-        exists(DeclarationPosition dpos | accessDeclarationPositionMatch(apos, dpos) |
-          // A suffix of `path` leads to a type parameter in the target
-          exists(Declaration target, TypePath prefix, TypeParameter tp, TypePath suffix |
-            tp = target.getDeclaredType(dpos, prefix) and
-            path = prefix.append(suffix) and
-            typeMatch(a, target, suffix, result, tp)
-          )
-          or
-          // `path` corresponds directly to a concrete type in the declaration
-          exists(Declaration target |
-            result = target.getDeclaredType(dpos, path) and
-            target = a.getTarget() and
-            not result instanceof TypeParameter
-          )
-        )
+      Type inferAccessType(Input::Access a, Input::AccessPosition apos, TypePath path) {
+        result = M::inferAccessType(a, _, apos, path)
       }
     }
 
diff --git a/shared/typeinference/qlpack.yml b/shared/typeinference/qlpack.yml
index 311bc370c09..00008849702 100644
--- a/shared/typeinference/qlpack.yml
+++ b/shared/typeinference/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/typeinference
-version: 0.0.10-dev
+version: 0.0.16-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/typetracking/CHANGELOG.md b/shared/typetracking/CHANGELOG.md
index d13d7ed092a..4edafe87290 100644
--- a/shared/typetracking/CHANGELOG.md
+++ b/shared/typetracking/CHANGELOG.md
@@ -1,3 +1,27 @@
+## 2.0.18
+
+No user-facing changes.
+
+## 2.0.17
+
+No user-facing changes.
+
+## 2.0.16
+
+No user-facing changes.
+
+## 2.0.15
+
+No user-facing changes.
+
+## 2.0.14
+
+No user-facing changes.
+
+## 2.0.13
+
+No user-facing changes.
+
 ## 2.0.12
 
 No user-facing changes.
diff --git a/shared/typetracking/change-notes/released/2.0.13.md b/shared/typetracking/change-notes/released/2.0.13.md
new file mode 100644
index 00000000000..39a24682b50
--- /dev/null
+++ b/shared/typetracking/change-notes/released/2.0.13.md
@@ -0,0 +1,3 @@
+## 2.0.13
+
+No user-facing changes.
diff --git a/shared/typetracking/change-notes/released/2.0.14.md b/shared/typetracking/change-notes/released/2.0.14.md
new file mode 100644
index 00000000000..13190ad53e3
--- /dev/null
+++ b/shared/typetracking/change-notes/released/2.0.14.md
@@ -0,0 +1,3 @@
+## 2.0.14
+
+No user-facing changes.
diff --git a/shared/typetracking/change-notes/released/2.0.15.md b/shared/typetracking/change-notes/released/2.0.15.md
new file mode 100644
index 00000000000..3b59db4224a
--- /dev/null
+++ b/shared/typetracking/change-notes/released/2.0.15.md
@@ -0,0 +1,3 @@
+## 2.0.15
+
+No user-facing changes.
diff --git a/shared/typetracking/change-notes/released/2.0.16.md b/shared/typetracking/change-notes/released/2.0.16.md
new file mode 100644
index 00000000000..221400d393f
--- /dev/null
+++ b/shared/typetracking/change-notes/released/2.0.16.md
@@ -0,0 +1,3 @@
+## 2.0.16
+
+No user-facing changes.
diff --git a/shared/typetracking/change-notes/released/2.0.17.md b/shared/typetracking/change-notes/released/2.0.17.md
new file mode 100644
index 00000000000..0ed1592726c
--- /dev/null
+++ b/shared/typetracking/change-notes/released/2.0.17.md
@@ -0,0 +1,3 @@
+## 2.0.17
+
+No user-facing changes.
diff --git a/shared/typetracking/change-notes/released/2.0.18.md b/shared/typetracking/change-notes/released/2.0.18.md
new file mode 100644
index 00000000000..11e398dac31
--- /dev/null
+++ b/shared/typetracking/change-notes/released/2.0.18.md
@@ -0,0 +1,3 @@
+## 2.0.18
+
+No user-facing changes.
diff --git a/shared/typetracking/codeql-pack.release.yml b/shared/typetracking/codeql-pack.release.yml
index b856d9a13f2..16342205c73 100644
--- a/shared/typetracking/codeql-pack.release.yml
+++ b/shared/typetracking/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.0.12
+lastReleaseVersion: 2.0.18
diff --git a/shared/typetracking/codeql/typetracking/internal/TypeTrackingImpl.qll b/shared/typetracking/codeql/typetracking/internal/TypeTrackingImpl.qll
index fcfcfe9ecd1..a98e5ec8254 100644
--- a/shared/typetracking/codeql/typetracking/internal/TypeTrackingImpl.qll
+++ b/shared/typetracking/codeql/typetracking/internal/TypeTrackingImpl.qll
@@ -70,6 +70,10 @@ module TypeTracking<LocationSig Location, TypeTrackingInput<Location> I> {
 
   private class ContentOption = ContentOption::Option;
 
+  private predicate isLocalSourceNode(LocalSourceNode n) {
+    not nonStandardFlowsTo(_, _) and exists(n)
+  }
+
   cached
   private module Cached {
     cached
@@ -249,21 +253,9 @@ module TypeTracking<LocationSig Location, TypeTrackingInput<Location> I> {
       returnStep(nodeFrom, nodeTo) and summary = ReturnStep()
     }
 
-    pragma[inline]
-    private predicate isLocalSourceNode(LocalSourceNode n) { any() }
-
     cached
-    predicate standardFlowsTo(Node localSource, Node dst) {
-      not nonStandardFlowsTo(_, _) and
-      // explicit type check in base case to avoid repeated type tests in recursive case
-      isLocalSourceNode(localSource) and
-      dst = localSource
-      or
-      exists(Node mid |
-        standardFlowsTo(localSource, mid) and
-        simpleLocalSmallStep(mid, dst)
-      )
-    }
+    predicate simpleLocalSmallStepPlus(Node localSource, Node dst) =
+      sourceBoundedFastTC(simpleLocalSmallStep/2, isLocalSourceNode/1)(localSource, dst)
 
     cached
     predicate stepNoCall(LocalSourceNode nodeFrom, LocalSourceNode nodeTo, StepSummary summary) {
@@ -276,6 +268,14 @@ module TypeTracking<LocationSig Location, TypeTrackingInput<Location> I> {
     }
   }
 
+  pragma[inline]
+  private predicate standardFlowsTo(Node localSource, Node dst) {
+    isLocalSourceNode(localSource) and
+    dst = localSource
+    or
+    simpleLocalSmallStepPlus(localSource, dst)
+  }
+
   import Cached
 
   /**
diff --git a/shared/typetracking/qlpack.yml b/shared/typetracking/qlpack.yml
index 143381c6828..0c588182911 100644
--- a/shared/typetracking/qlpack.yml
+++ b/shared/typetracking/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/typetracking
-version: 2.0.13-dev
+version: 2.0.19-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/typos/CHANGELOG.md b/shared/typos/CHANGELOG.md
index 40cca012100..9fbdb39d493 100644
--- a/shared/typos/CHANGELOG.md
+++ b/shared/typos/CHANGELOG.md
@@ -1,3 +1,27 @@
+## 1.0.34
+
+No user-facing changes.
+
+## 1.0.33
+
+No user-facing changes.
+
+## 1.0.32
+
+No user-facing changes.
+
+## 1.0.31
+
+No user-facing changes.
+
+## 1.0.30
+
+No user-facing changes.
+
+## 1.0.29
+
+No user-facing changes.
+
 ## 1.0.28
 
 No user-facing changes.
diff --git a/shared/typos/change-notes/released/1.0.29.md b/shared/typos/change-notes/released/1.0.29.md
new file mode 100644
index 00000000000..e6b79b88ef3
--- /dev/null
+++ b/shared/typos/change-notes/released/1.0.29.md
@@ -0,0 +1,3 @@
+## 1.0.29
+
+No user-facing changes.
diff --git a/shared/typos/change-notes/released/1.0.30.md b/shared/typos/change-notes/released/1.0.30.md
new file mode 100644
index 00000000000..cb2cf6d0a27
--- /dev/null
+++ b/shared/typos/change-notes/released/1.0.30.md
@@ -0,0 +1,3 @@
+## 1.0.30
+
+No user-facing changes.
diff --git a/shared/typos/change-notes/released/1.0.31.md b/shared/typos/change-notes/released/1.0.31.md
new file mode 100644
index 00000000000..b2642bbb5f8
--- /dev/null
+++ b/shared/typos/change-notes/released/1.0.31.md
@@ -0,0 +1,3 @@
+## 1.0.31
+
+No user-facing changes.
diff --git a/shared/typos/change-notes/released/1.0.32.md b/shared/typos/change-notes/released/1.0.32.md
new file mode 100644
index 00000000000..05c4073731c
--- /dev/null
+++ b/shared/typos/change-notes/released/1.0.32.md
@@ -0,0 +1,3 @@
+## 1.0.32
+
+No user-facing changes.
diff --git a/shared/typos/change-notes/released/1.0.33.md b/shared/typos/change-notes/released/1.0.33.md
new file mode 100644
index 00000000000..3a65838479f
--- /dev/null
+++ b/shared/typos/change-notes/released/1.0.33.md
@@ -0,0 +1,3 @@
+## 1.0.33
+
+No user-facing changes.
diff --git a/shared/typos/change-notes/released/1.0.34.md b/shared/typos/change-notes/released/1.0.34.md
new file mode 100644
index 00000000000..7e097cfe937
--- /dev/null
+++ b/shared/typos/change-notes/released/1.0.34.md
@@ -0,0 +1,3 @@
+## 1.0.34
+
+No user-facing changes.
diff --git a/shared/typos/codeql-pack.release.yml b/shared/typos/codeql-pack.release.yml
index 328402fb34f..b736654032c 100644
--- a/shared/typos/codeql-pack.release.yml
+++ b/shared/typos/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.28
+lastReleaseVersion: 1.0.34
diff --git a/shared/typos/qlpack.yml b/shared/typos/qlpack.yml
index cfbe48595f7..b876c84bbe3 100644
--- a/shared/typos/qlpack.yml
+++ b/shared/typos/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/typos
-version: 1.0.29-dev
+version: 1.0.35-dev
 groups: shared
 library: true
 warnOnImplicitThis: true
diff --git a/shared/util/CHANGELOG.md b/shared/util/CHANGELOG.md
index 99afc785e5d..88679dd6846 100644
--- a/shared/util/CHANGELOG.md
+++ b/shared/util/CHANGELOG.md
@@ -1,3 +1,29 @@
+## 2.0.21
+
+No user-facing changes.
+
+## 2.0.20
+
+No user-facing changes.
+
+## 2.0.19
+
+No user-facing changes.
+
+## 2.0.18
+
+No user-facing changes.
+
+## 2.0.17
+
+### Minor Analysis Improvements
+
+* Added `LocatableOption` and `OptionWithLocationInfo` as modules providing option types with location information.
+
+## 2.0.16
+
+No user-facing changes.
+
 ## 2.0.15
 
 No user-facing changes.
diff --git a/shared/util/change-notes/released/2.0.16.md b/shared/util/change-notes/released/2.0.16.md
new file mode 100644
index 00000000000..221400d393f
--- /dev/null
+++ b/shared/util/change-notes/released/2.0.16.md
@@ -0,0 +1,3 @@
+## 2.0.16
+
+No user-facing changes.
diff --git a/shared/util/change-notes/released/2.0.17.md b/shared/util/change-notes/released/2.0.17.md
new file mode 100644
index 00000000000..e7a8146ddd0
--- /dev/null
+++ b/shared/util/change-notes/released/2.0.17.md
@@ -0,0 +1,5 @@
+## 2.0.17
+
+### Minor Analysis Improvements
+
+* Added `LocatableOption` and `OptionWithLocationInfo` as modules providing option types with location information.
diff --git a/shared/util/change-notes/released/2.0.18.md b/shared/util/change-notes/released/2.0.18.md
new file mode 100644
index 00000000000..11e398dac31
--- /dev/null
+++ b/shared/util/change-notes/released/2.0.18.md
@@ -0,0 +1,3 @@
+## 2.0.18
+
+No user-facing changes.
diff --git a/shared/util/change-notes/released/2.0.19.md b/shared/util/change-notes/released/2.0.19.md
new file mode 100644
index 00000000000..b37b6798b12
--- /dev/null
+++ b/shared/util/change-notes/released/2.0.19.md
@@ -0,0 +1,3 @@
+## 2.0.19
+
+No user-facing changes.
diff --git a/shared/util/change-notes/released/2.0.20.md b/shared/util/change-notes/released/2.0.20.md
new file mode 100644
index 00000000000..6756bd5f6c1
--- /dev/null
+++ b/shared/util/change-notes/released/2.0.20.md
@@ -0,0 +1,3 @@
+## 2.0.20
+
+No user-facing changes.
diff --git a/shared/util/change-notes/released/2.0.21.md b/shared/util/change-notes/released/2.0.21.md
new file mode 100644
index 00000000000..bdc5029b70b
--- /dev/null
+++ b/shared/util/change-notes/released/2.0.21.md
@@ -0,0 +1,3 @@
+## 2.0.21
+
+No user-facing changes.
diff --git a/shared/util/codeql-pack.release.yml b/shared/util/codeql-pack.release.yml
index 0377ae283a3..a572e88bffd 100644
--- a/shared/util/codeql-pack.release.yml
+++ b/shared/util/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.0.15
+lastReleaseVersion: 2.0.21
diff --git a/shared/util/codeql/util/AlertFiltering.qll b/shared/util/codeql/util/AlertFiltering.qll
index 1480421ae59..60597327c3b 100644
--- a/shared/util/codeql/util/AlertFiltering.qll
+++ b/shared/util/codeql/util/AlertFiltering.qll
@@ -82,6 +82,21 @@ module AlertFilteringImpl<LocationSig Location> {
     )
   }
 
+  /** Holds if diff information is available in this evaluation. */
+  predicate diffInformationAvailable() {
+    restrictAlertsTo(_, _, _) or restrictAlertsToExactLocation(_, _, _, _, _)
+  }
+
+  /**
+   * Holds if diff information is available, and `filePath` is in the diff
+   * range.
+   */
+  predicate fileIsInDiff(string filePath) {
+    restrictAlertsTo(filePath, _, _)
+    or
+    restrictAlertsToExactLocation(filePath, _, _, _, _)
+  }
+
   /**
    * Holds if the given location is a match for one of the active filtering
    * predicates in this module, or if all filtering predicates are inactive
@@ -92,8 +107,17 @@ module AlertFilteringImpl<LocationSig Location> {
    */
   bindingset[location]
   predicate filterByLocation(Location location) {
-    not restrictAlertsTo(_, _, _) and not restrictAlertsToExactLocation(_, _, _, _, _)
+    not diffInformationAvailable()
     or
+    locationIsInDiff(location)
+  }
+
+  /**
+   * Like `filterByLocation`, except that if there is no diff range, this
+   * predicate never holds.
+   */
+  bindingset[location]
+  predicate locationIsInDiff(Location location) {
     exists(string filePath |
       restrictAlertsToEntireFile(filePath) and
       location.hasLocationInfo(filePath, _, _, _, _)
diff --git a/shared/util/codeql/util/Option.qll b/shared/util/codeql/util/Option.qll
index 65a5e872452..77cc89504f5 100644
--- a/shared/util/codeql/util/Option.qll
+++ b/shared/util/codeql/util/Option.qll
@@ -2,12 +2,24 @@
 overlay[local?]
 module;
 
+private import Location
+
 /** A type with `toString`. */
 private signature class TypeWithToString {
   bindingset[this]
   string toString();
 }
 
+/** A type with `toString` and `hasLocationInfo` */
+private signature class TypeWithLocationInfo {
+  bindingset[this]
+  string toString();
+
+  predicate hasLocationInfo(
+    string filePath, int startLine, int startColumn, int endLine, int endColumn
+  );
+}
+
 /**
  * Constructs an `Option` type that is a disjoint union of the given type and an
  * additional singleton element.
@@ -45,3 +57,91 @@ module Option<TypeWithToString T> {
   /** Gets the given element wrapped as an `Option`. */
   Some some(T c) { result = TSome(c) }
 }
+
+/**
+ * Constructs an `Option` type that is a disjoint union of the given type and an
+ * additional singleton element, and has a `hasLocationInfo` predicate.
+ * `T` must have a `hasLocationInfo` predicate.
+ */
+module OptionWithLocationInfo<TypeWithLocationInfo T> {
+  private module O = Option<T>;
+
+  final private class BaseOption = O::Option;
+
+  /**
+   * An option type. This is either a singleton `None` or a `Some` wrapping the
+   * given type.
+   */
+  class Option extends BaseOption {
+    /**
+     * Holds if this element is at the specified location.
+     * The location spans column `startColumn` of line `startLine` to
+     * column `endColumn` of line `endLine` in file `filepath`.
+     * For more information, see
+     * [Providing locations in CodeQL queries](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+     */
+    predicate hasLocationInfo(
+      string filePath, int startLine, int startColumn, int endLine, int endColumn
+    ) {
+      this.isNone() and
+      filePath = "" and
+      startLine = 0 and
+      startColumn = 0 and
+      endLine = 0 and
+      endColumn = 0
+      or
+      this.asSome().hasLocationInfo(filePath, startLine, startColumn, endLine, endColumn)
+    }
+  }
+
+  /** The singleton `None` element. */
+  class None extends Option instanceof O::None { }
+
+  /** A wrapper for the given type. */
+  class Some extends Option instanceof O::Some { }
+
+  /** Gets the given element wrapped as an `Option`. */
+  Some some(T c) { result.asSome() = c }
+}
+
+private module WithLocation<LocationSig Location> {
+  signature class LocatableType {
+    bindingset[this]
+    string toString();
+
+    Location getLocation();
+  }
+}
+
+/**
+ * Constructs an `Option` type that is a disjoint union of the given type and an
+ * additional singleton element, and has a `getLocation` predicate.
+ * `T` must have a `getLocation` predicate with a result type of `Location`.
+ */
+module LocatableOption<LocationSig Location, WithLocation<Location>::LocatableType T> {
+  private module O = Option<T>;
+
+  final private class BaseOption = O::Option;
+
+  /**
+   * An option type. This is either a singleton `None` or a `Some` wrapping the
+   * given type.
+   */
+  class Option extends BaseOption {
+    Location getLocation() {
+      result = this.asSome().getLocation()
+      or
+      this.isNone() and
+      result.hasLocationInfo("", 0, 0, 0, 0)
+    }
+  }
+
+  /** The singleton `None` element. */
+  class None extends Option instanceof O::None { }
+
+  /** A wrapper for the given type. */
+  class Some extends Option instanceof O::Some { }
+
+  /** Gets the given element wrapped as an `Option`. */
+  Some some(T c) { result.asSome() = c }
+}
diff --git a/shared/util/codeql/util/test/InlineExpectationsTest.qll b/shared/util/codeql/util/test/InlineExpectationsTest.qll
index fbbad8f25b7..ccae8c1fc85 100644
--- a/shared/util/codeql/util/test/InlineExpectationsTest.qll
+++ b/shared/util/codeql/util/test/InlineExpectationsTest.qll
@@ -1,7 +1,8 @@
 /**
  * Provides a library for writing QL tests whose success or failure is based on expected results
  * embedded in the test source code as comments, rather than the contents of an `.expected` file
- * (in that the `.expected` file should always be empty).
+ * (in that the `.expected` file should always be empty, except when used via the post-processing
+ * query).
  *
  * To add this framework to a new language, add a new file
  * (usually called `InlineExpectationsTest.qll`) with:
diff --git a/shared/util/qlpack.yml b/shared/util/qlpack.yml
index 18f2e50e636..4d4b671071e 100644
--- a/shared/util/qlpack.yml
+++ b/shared/util/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/util
-version: 2.0.16-dev
+version: 2.0.22-dev
 groups: shared
 library: true
 dependencies: null
diff --git a/shared/xml/CHANGELOG.md b/shared/xml/CHANGELOG.md
index 8688583b1d4..ff67592d22b 100644
--- a/shared/xml/CHANGELOG.md
+++ b/shared/xml/CHANGELOG.md
@@ -1,3 +1,27 @@
+## 1.0.34
+
+No user-facing changes.
+
+## 1.0.33
+
+No user-facing changes.
+
+## 1.0.32
+
+No user-facing changes.
+
+## 1.0.31
+
+No user-facing changes.
+
+## 1.0.30
+
+No user-facing changes.
+
+## 1.0.29
+
+No user-facing changes.
+
 ## 1.0.28
 
 No user-facing changes.
diff --git a/shared/xml/change-notes/released/1.0.29.md b/shared/xml/change-notes/released/1.0.29.md
new file mode 100644
index 00000000000..e6b79b88ef3
--- /dev/null
+++ b/shared/xml/change-notes/released/1.0.29.md
@@ -0,0 +1,3 @@
+## 1.0.29
+
+No user-facing changes.
diff --git a/shared/xml/change-notes/released/1.0.30.md b/shared/xml/change-notes/released/1.0.30.md
new file mode 100644
index 00000000000..cb2cf6d0a27
--- /dev/null
+++ b/shared/xml/change-notes/released/1.0.30.md
@@ -0,0 +1,3 @@
+## 1.0.30
+
+No user-facing changes.
diff --git a/shared/xml/change-notes/released/1.0.31.md b/shared/xml/change-notes/released/1.0.31.md
new file mode 100644
index 00000000000..b2642bbb5f8
--- /dev/null
+++ b/shared/xml/change-notes/released/1.0.31.md
@@ -0,0 +1,3 @@
+## 1.0.31
+
+No user-facing changes.
diff --git a/shared/xml/change-notes/released/1.0.32.md b/shared/xml/change-notes/released/1.0.32.md
new file mode 100644
index 00000000000..05c4073731c
--- /dev/null
+++ b/shared/xml/change-notes/released/1.0.32.md
@@ -0,0 +1,3 @@
+## 1.0.32
+
+No user-facing changes.
diff --git a/shared/xml/change-notes/released/1.0.33.md b/shared/xml/change-notes/released/1.0.33.md
new file mode 100644
index 00000000000..3a65838479f
--- /dev/null
+++ b/shared/xml/change-notes/released/1.0.33.md
@@ -0,0 +1,3 @@
+## 1.0.33
+
+No user-facing changes.
diff --git a/shared/xml/change-notes/released/1.0.34.md b/shared/xml/change-notes/released/1.0.34.md
new file mode 100644
index 00000000000..7e097cfe937
--- /dev/null
+++ b/shared/xml/change-notes/released/1.0.34.md
@@ -0,0 +1,3 @@
+## 1.0.34
+
+No user-facing changes.
diff --git a/shared/xml/codeql-pack.release.yml b/shared/xml/codeql-pack.release.yml
index 328402fb34f..b736654032c 100644
--- a/shared/xml/codeql-pack.release.yml
+++ b/shared/xml/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.28
+lastReleaseVersion: 1.0.34
diff --git a/shared/xml/qlpack.yml b/shared/xml/qlpack.yml
index 81781de2996..40a7eadd828 100644
--- a/shared/xml/qlpack.yml
+++ b/shared/xml/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/xml
-version: 1.0.29-dev
+version: 1.0.35-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/yaml/CHANGELOG.md b/shared/yaml/CHANGELOG.md
index 4651f486f24..fb623a1f26c 100644
--- a/shared/yaml/CHANGELOG.md
+++ b/shared/yaml/CHANGELOG.md
@@ -1,3 +1,27 @@
+## 1.0.34
+
+No user-facing changes.
+
+## 1.0.33
+
+No user-facing changes.
+
+## 1.0.32
+
+No user-facing changes.
+
+## 1.0.31
+
+No user-facing changes.
+
+## 1.0.30
+
+No user-facing changes.
+
+## 1.0.29
+
+No user-facing changes.
+
 ## 1.0.28
 
 No user-facing changes.
diff --git a/shared/yaml/change-notes/released/1.0.29.md b/shared/yaml/change-notes/released/1.0.29.md
new file mode 100644
index 00000000000..e6b79b88ef3
--- /dev/null
+++ b/shared/yaml/change-notes/released/1.0.29.md
@@ -0,0 +1,3 @@
+## 1.0.29
+
+No user-facing changes.
diff --git a/shared/yaml/change-notes/released/1.0.30.md b/shared/yaml/change-notes/released/1.0.30.md
new file mode 100644
index 00000000000..cb2cf6d0a27
--- /dev/null
+++ b/shared/yaml/change-notes/released/1.0.30.md
@@ -0,0 +1,3 @@
+## 1.0.30
+
+No user-facing changes.
diff --git a/shared/yaml/change-notes/released/1.0.31.md b/shared/yaml/change-notes/released/1.0.31.md
new file mode 100644
index 00000000000..b2642bbb5f8
--- /dev/null
+++ b/shared/yaml/change-notes/released/1.0.31.md
@@ -0,0 +1,3 @@
+## 1.0.31
+
+No user-facing changes.
diff --git a/shared/yaml/change-notes/released/1.0.32.md b/shared/yaml/change-notes/released/1.0.32.md
new file mode 100644
index 00000000000..05c4073731c
--- /dev/null
+++ b/shared/yaml/change-notes/released/1.0.32.md
@@ -0,0 +1,3 @@
+## 1.0.32
+
+No user-facing changes.
diff --git a/shared/yaml/change-notes/released/1.0.33.md b/shared/yaml/change-notes/released/1.0.33.md
new file mode 100644
index 00000000000..3a65838479f
--- /dev/null
+++ b/shared/yaml/change-notes/released/1.0.33.md
@@ -0,0 +1,3 @@
+## 1.0.33
+
+No user-facing changes.
diff --git a/shared/yaml/change-notes/released/1.0.34.md b/shared/yaml/change-notes/released/1.0.34.md
new file mode 100644
index 00000000000..7e097cfe937
--- /dev/null
+++ b/shared/yaml/change-notes/released/1.0.34.md
@@ -0,0 +1,3 @@
+## 1.0.34
+
+No user-facing changes.
diff --git a/shared/yaml/codeql-pack.release.yml b/shared/yaml/codeql-pack.release.yml
index 328402fb34f..b736654032c 100644
--- a/shared/yaml/codeql-pack.release.yml
+++ b/shared/yaml/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.28
+lastReleaseVersion: 1.0.34
diff --git a/shared/yaml/qlpack.yml b/shared/yaml/qlpack.yml
index f7fd571722e..a1af32ac079 100644
--- a/shared/yaml/qlpack.yml
+++ b/shared/yaml/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/yaml
-version: 1.0.29-dev
+version: 1.0.35-dev
 groups: shared
 library: true
 warnOnImplicitThis: true
diff --git a/swift/codeql-extractor.yml b/swift/codeql-extractor.yml
index c7c0bdca75a..589679cdb0e 100644
--- a/swift/codeql-extractor.yml
+++ b/swift/codeql-extractor.yml
@@ -6,6 +6,8 @@ legacy_qltest_extraction: true
 build_modes:
   - autobuild
   - manual
+default_queries:
+  - codeql/swift-queries
 github_api_languages:
   - Swift
 scc_languages:
diff --git a/swift/downgrades/33e5e5e03bd3f98322f4c67aefa81015be832b88/downgrades.ql b/swift/downgrades/33e5e5e03bd3f98322f4c67aefa81015be832b88/downgrades.ql
new file mode 100644
index 00000000000..8cb81599373
--- /dev/null
+++ b/swift/downgrades/33e5e5e03bd3f98322f4c67aefa81015be832b88/downgrades.ql
@@ -0,0 +1,59 @@
+class Element extends @element {
+  string toString() { none() }
+}
+
+class Expr extends @expr {
+  string toString() { none() }
+}
+
+class Decl extends @decl {
+  string toString() { none() }
+}
+
+class DeclOrNone extends @decl_or_none {
+  string toString() { none() }
+}
+
+class ModuleOrNone extends @module_decl_or_none {
+  string toString() { none() }
+}
+
+class Type extends @type {
+  string toString() { none() }
+}
+
+class TypeOrNone extends @type_or_none {
+  string toString() { none() }
+}
+
+query predicate new_decls(Decl decl, ModuleOrNone moduleOrNone) {
+  decls(decl, moduleOrNone) and not using_decls(decl)
+}
+
+query predicate new_decl_members(Decl decl, int index, DeclOrNone declOrNone) {
+  decl_members(decl, index, declOrNone) and not using_decls(decl)
+}
+
+query predicate new_expr_types(Expr id, TypeOrNone typeOrNone) {
+  expr_types(id, typeOrNone) and not unsafe_exprs(id)
+}
+
+query predicate new_types(Type id, string name, TypeOrNone typeOrNone) {
+  types(id, name, typeOrNone) and not inline_array_types(id, _, _)
+}
+
+query predicate new_unspecified_elements(Element id, string property, string error) {
+  unspecified_elements(id, property, error)
+  or
+  using_decls(id) and
+  property = "" and
+  error = "UsingDecl removed during database downgrade. Please update your CodeQL."
+  or
+  unsafe_exprs(id) and
+  property = "" and
+  error = "UnsafeExpr removed during database downgrade. Please update your CodeQL."
+  or
+  inline_array_types(id, _, _) and
+  property = "" and
+  error = "InlineArrayType removed during database downgrade. Please update your CodeQL."
+}
diff --git a/swift/downgrades/33e5e5e03bd3f98322f4c67aefa81015be832b88/old.dbscheme b/swift/downgrades/33e5e5e03bd3f98322f4c67aefa81015be832b88/old.dbscheme
new file mode 100644
index 00000000000..33e5e5e03bd
--- /dev/null
+++ b/swift/downgrades/33e5e5e03bd3f98322f4c67aefa81015be832b88/old.dbscheme
@@ -0,0 +1,2885 @@
+// generated by codegen/codegen.py, do not edit
+
+// from prefix.dbscheme
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(
+  string prefix: string ref
+);
+
+
+// from schema.py
+
+@element =
+  @file
+| @generic_context
+| @locatable
+| @location
+| @type
+;
+
+#keyset[id]
+element_is_unknown(
+  int id: @element ref
+);
+
+@file =
+  @db_file
+;
+
+#keyset[id]
+files(
+  int id: @file ref,
+  string name: string ref
+);
+
+#keyset[id]
+file_is_successfully_extracted(
+  int id: @file ref
+);
+
+@locatable =
+  @argument
+| @ast_node
+| @comment
+| @diagnostics
+| @error_element
+;
+
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_or_none ref
+);
+
+@location =
+  @db_location
+;
+
+#keyset[id]
+locations(
+  int id: @location ref,
+  int file: @file_or_none ref,
+  int start_line: int ref,
+  int start_column: int ref,
+  int end_line: int ref,
+  int end_column: int ref
+);
+
+@ast_node =
+  @availability_info
+| @availability_spec
+| @callable
+| @case_label_item
+| @condition_element
+| @decl
+| @expr
+| @key_path_component
+| @macro_role
+| @pattern
+| @stmt
+| @stmt_condition
+| @type_repr
+;
+
+comments(
+  unique int id: @comment,
+  string text: string ref
+);
+
+db_files(
+  unique int id: @db_file
+);
+
+db_locations(
+  unique int id: @db_location
+);
+
+diagnostics(
+  unique int id: @diagnostics,
+  string text: string ref,
+  int kind: int ref
+);
+
+@error_element =
+  @error_expr
+| @error_type
+| @overloaded_decl_ref_expr
+| @unresolved_decl_ref_expr
+| @unresolved_dot_expr
+| @unresolved_member_chain_result_expr
+| @unresolved_member_expr
+| @unresolved_pattern_expr
+| @unresolved_specialize_expr
+| @unresolved_type
+| @unresolved_type_conversion_expr
+| @unspecified_element
+;
+
+availability_infos(
+  unique int id: @availability_info
+);
+
+#keyset[id]
+availability_info_is_unavailable(
+  int id: @availability_info ref
+);
+
+#keyset[id, index]
+availability_info_specs(
+  int id: @availability_info ref,
+  int index: int ref,
+  int spec: @availability_spec_or_none ref
+);
+
+availability_specs(
+  unique int id: @availability_spec
+);
+
+#keyset[id]
+availability_spec_platforms(
+  int id: @availability_spec ref,
+  string platform: string ref
+);
+
+#keyset[id]
+availability_spec_versions(
+  int id: @availability_spec ref,
+  string version: string ref
+);
+
+#keyset[id]
+availability_spec_is_wildcard(
+  int id: @availability_spec ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_names(
+  int id: @callable ref,
+  string name: string ref
+);
+
+#keyset[id]
+callable_self_params(
+  int id: @callable ref,
+  int self_param: @param_decl_or_none ref
+);
+
+#keyset[id, index]
+callable_params(
+  int id: @callable ref,
+  int index: int ref,
+  int param: @param_decl_or_none ref
+);
+
+#keyset[id]
+callable_bodies(
+  int id: @callable ref,
+  int body: @brace_stmt_or_none ref
+);
+
+#keyset[id, index]
+callable_captures(
+  int id: @callable ref,
+  int index: int ref,
+  int capture: @captured_decl_or_none ref
+);
+
+key_path_components(
+  unique int id: @key_path_component,
+  int kind: int ref,
+  int component_type: @type_or_none ref
+);
+
+#keyset[id, index]
+key_path_component_subscript_arguments(
+  int id: @key_path_component ref,
+  int index: int ref,
+  int subscript_argument: @argument_or_none ref
+);
+
+#keyset[id]
+key_path_component_tuple_indices(
+  int id: @key_path_component ref,
+  int tuple_index: int ref
+);
+
+#keyset[id]
+key_path_component_decl_refs(
+  int id: @key_path_component ref,
+  int decl_ref: @value_decl_or_none ref
+);
+
+macro_roles(
+  unique int id: @macro_role,
+  int kind: int ref,
+  int macro_syntax: int ref
+);
+
+#keyset[id, index]
+macro_role_conformances(
+  int id: @macro_role ref,
+  int index: int ref,
+  int conformance: @expr_or_none ref
+);
+
+#keyset[id, index]
+macro_role_names(
+  int id: @macro_role ref,
+  int index: int ref,
+  string name: string ref
+);
+
+unspecified_elements(
+  unique int id: @unspecified_element,
+  string property: string ref,
+  string error: string ref
+);
+
+#keyset[id]
+unspecified_element_parents(
+  int id: @unspecified_element ref,
+  int parent: @element ref
+);
+
+#keyset[id]
+unspecified_element_indices(
+  int id: @unspecified_element ref,
+  int index: int ref
+);
+
+#keyset[id, index]
+unspecified_element_children(
+  int id: @unspecified_element ref,
+  int index: int ref,
+  int child: @ast_node_or_none ref
+);
+
+@decl =
+  @captured_decl
+| @enum_case_decl
+| @extension_decl
+| @if_config_decl
+| @import_decl
+| @missing_member_decl
+| @operator_decl
+| @pattern_binding_decl
+| @pound_diagnostic_decl
+| @precedence_group_decl
+| @top_level_code_decl
+| @using_decl
+| @value_decl
+;
+
+#keyset[id]
+decls(  //dir=decl
+  int id: @decl ref,
+  int module: @module_decl_or_none ref
+);
+
+#keyset[id, index]
+decl_members(  //dir=decl
+  int id: @decl ref,
+  int index: int ref,
+  int member: @decl_or_none ref
+);
+
+@generic_context =
+  @extension_decl
+| @function
+| @generic_type_decl
+| @macro_decl
+| @subscript_decl
+;
+
+#keyset[id, index]
+generic_context_generic_type_params(  //dir=decl
+  int id: @generic_context ref,
+  int index: int ref,
+  int generic_type_param: @generic_type_param_decl_or_none ref
+);
+
+captured_decls(  //dir=decl
+  unique int id: @captured_decl,
+  int decl: @value_decl_or_none ref
+);
+
+#keyset[id]
+captured_decl_is_direct(  //dir=decl
+  int id: @captured_decl ref
+);
+
+#keyset[id]
+captured_decl_is_escaping(  //dir=decl
+  int id: @captured_decl ref
+);
+
+enum_case_decls(  //dir=decl
+  unique int id: @enum_case_decl
+);
+
+#keyset[id, index]
+enum_case_decl_elements(  //dir=decl
+  int id: @enum_case_decl ref,
+  int index: int ref,
+  int element: @enum_element_decl_or_none ref
+);
+
+extension_decls(  //dir=decl
+  unique int id: @extension_decl,
+  int extended_type_decl: @nominal_type_decl_or_none ref
+);
+
+#keyset[id, index]
+extension_decl_protocols(  //dir=decl
+  int id: @extension_decl ref,
+  int index: int ref,
+  int protocol: @protocol_decl_or_none ref
+);
+
+if_config_decls(  //dir=decl
+  unique int id: @if_config_decl
+);
+
+#keyset[id, index]
+if_config_decl_active_elements(  //dir=decl
+  int id: @if_config_decl ref,
+  int index: int ref,
+  int active_element: @ast_node_or_none ref
+);
+
+import_decls(  //dir=decl
+  unique int id: @import_decl
+);
+
+#keyset[id]
+import_decl_is_exported(  //dir=decl
+  int id: @import_decl ref
+);
+
+#keyset[id]
+import_decl_imported_modules(  //dir=decl
+  int id: @import_decl ref,
+  int imported_module: @module_decl_or_none ref
+);
+
+#keyset[id, index]
+import_decl_declarations(  //dir=decl
+  int id: @import_decl ref,
+  int index: int ref,
+  int declaration: @value_decl_or_none ref
+);
+
+missing_member_decls(  //dir=decl
+  unique int id: @missing_member_decl,
+  string name: string ref
+);
+
+@operator_decl =
+  @infix_operator_decl
+| @postfix_operator_decl
+| @prefix_operator_decl
+;
+
+#keyset[id]
+operator_decls(  //dir=decl
+  int id: @operator_decl ref,
+  string name: string ref
+);
+
+pattern_binding_decls(  //dir=decl
+  unique int id: @pattern_binding_decl
+);
+
+#keyset[id, index]
+pattern_binding_decl_inits(  //dir=decl
+  int id: @pattern_binding_decl ref,
+  int index: int ref,
+  int init: @expr_or_none ref
+);
+
+#keyset[id, index]
+pattern_binding_decl_patterns(  //dir=decl
+  int id: @pattern_binding_decl ref,
+  int index: int ref,
+  int pattern: @pattern_or_none ref
+);
+
+pound_diagnostic_decls(  //dir=decl
+  unique int id: @pound_diagnostic_decl,
+  int kind: int ref,
+  int message: @string_literal_expr_or_none ref
+);
+
+precedence_group_decls(  //dir=decl
+  unique int id: @precedence_group_decl
+);
+
+top_level_code_decls(  //dir=decl
+  unique int id: @top_level_code_decl,
+  int body: @brace_stmt_or_none ref
+);
+
+using_decls(  //dir=decl
+  unique int id: @using_decl
+);
+
+#keyset[id]
+using_decl_is_main_actor(  //dir=decl
+  int id: @using_decl ref
+);
+
+#keyset[id]
+using_decl_is_nonisolated(  //dir=decl
+  int id: @using_decl ref
+);
+
+@value_decl =
+  @abstract_storage_decl
+| @enum_element_decl
+| @function
+| @macro_decl
+| @type_decl
+;
+
+#keyset[id]
+value_decls(  //dir=decl
+  int id: @value_decl ref,
+  int interface_type: @type_or_none ref
+);
+
+@abstract_storage_decl =
+  @subscript_decl
+| @var_decl
+;
+
+#keyset[id, index]
+abstract_storage_decl_accessors(  //dir=decl
+  int id: @abstract_storage_decl ref,
+  int index: int ref,
+  int accessor: @accessor_or_none ref
+);
+
+enum_element_decls(  //dir=decl
+  unique int id: @enum_element_decl,
+  string name: string ref
+);
+
+#keyset[id, index]
+enum_element_decl_params(  //dir=decl
+  int id: @enum_element_decl ref,
+  int index: int ref,
+  int param: @param_decl_or_none ref
+);
+
+@function =
+  @accessor_or_named_function
+| @deinitializer
+| @initializer
+;
+
+infix_operator_decls(  //dir=decl
+  unique int id: @infix_operator_decl
+);
+
+#keyset[id]
+infix_operator_decl_precedence_groups(  //dir=decl
+  int id: @infix_operator_decl ref,
+  int precedence_group: @precedence_group_decl_or_none ref
+);
+
+macro_decls(  //dir=decl
+  unique int id: @macro_decl,
+  string name: string ref
+);
+
+#keyset[id, index]
+macro_decl_parameters(  //dir=decl
+  int id: @macro_decl ref,
+  int index: int ref,
+  int parameter: @param_decl_or_none ref
+);
+
+#keyset[id, index]
+macro_decl_roles(  //dir=decl
+  int id: @macro_decl ref,
+  int index: int ref,
+  int role: @macro_role_or_none ref
+);
+
+postfix_operator_decls(  //dir=decl
+  unique int id: @postfix_operator_decl
+);
+
+prefix_operator_decls(  //dir=decl
+  unique int id: @prefix_operator_decl
+);
+
+@type_decl =
+  @abstract_type_param_decl
+| @generic_type_decl
+| @module_decl
+;
+
+#keyset[id]
+type_decls(  //dir=decl
+  int id: @type_decl ref,
+  string name: string ref
+);
+
+#keyset[id, index]
+type_decl_inherited_types(  //dir=decl
+  int id: @type_decl ref,
+  int index: int ref,
+  int inherited_type: @type_or_none ref
+);
+
+@abstract_type_param_decl =
+  @associated_type_decl
+| @generic_type_param_decl
+;
+
+@accessor_or_named_function =
+  @accessor
+| @named_function
+;
+
+deinitializers(  //dir=decl
+  unique int id: @deinitializer
+);
+
+@generic_type_decl =
+  @nominal_type_decl
+| @opaque_type_decl
+| @type_alias_decl
+;
+
+initializers(  //dir=decl
+  unique int id: @initializer
+);
+
+module_decls(  //dir=decl
+  unique int id: @module_decl
+);
+
+#keyset[id]
+module_decl_is_builtin_module(  //dir=decl
+  int id: @module_decl ref
+);
+
+#keyset[id]
+module_decl_is_system_module(  //dir=decl
+  int id: @module_decl ref
+);
+
+module_decl_imported_modules(  //dir=decl
+  int id: @module_decl ref,
+  int imported_module: @module_decl_or_none ref
+);
+
+module_decl_exported_modules(  //dir=decl
+  int id: @module_decl ref,
+  int exported_module: @module_decl_or_none ref
+);
+
+subscript_decls(  //dir=decl
+  unique int id: @subscript_decl,
+  int element_type: @type_or_none ref
+);
+
+#keyset[id, index]
+subscript_decl_params(  //dir=decl
+  int id: @subscript_decl ref,
+  int index: int ref,
+  int param: @param_decl_or_none ref
+);
+
+@var_decl =
+  @concrete_var_decl
+| @param_decl
+;
+
+#keyset[id]
+var_decls(  //dir=decl
+  int id: @var_decl ref,
+  string name: string ref,
+  int type_: @type_or_none ref
+);
+
+#keyset[id]
+var_decl_attached_property_wrapper_types(  //dir=decl
+  int id: @var_decl ref,
+  int attached_property_wrapper_type: @type_or_none ref
+);
+
+#keyset[id]
+var_decl_parent_patterns(  //dir=decl
+  int id: @var_decl ref,
+  int parent_pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+var_decl_parent_initializers(  //dir=decl
+  int id: @var_decl ref,
+  int parent_initializer: @expr_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_backing_var_bindings(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_backing_var_binding: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_backing_vars(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_backing_var: @var_decl_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_projection_var_bindings(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_projection_var_binding: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_projection_vars(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_projection_var: @var_decl_or_none ref
+);
+
+accessors(  //dir=decl
+  unique int id: @accessor
+);
+
+#keyset[id]
+accessor_is_getter(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_setter(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_will_set(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_did_set(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_read(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_modify(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_unsafe_address(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_unsafe_mutable_address(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_distributed_get(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_read2(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_modify2(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_init(  //dir=decl
+  int id: @accessor ref
+);
+
+associated_type_decls(  //dir=decl
+  unique int id: @associated_type_decl
+);
+
+concrete_var_decls(  //dir=decl
+  unique int id: @concrete_var_decl,
+  int introducer_int: int ref
+);
+
+generic_type_param_decls(  //dir=decl
+  unique int id: @generic_type_param_decl
+);
+
+named_functions(  //dir=decl
+  unique int id: @named_function
+);
+
+@nominal_type_decl =
+  @class_decl
+| @enum_decl
+| @protocol_decl
+| @struct_decl
+;
+
+#keyset[id]
+nominal_type_decls(  //dir=decl
+  int id: @nominal_type_decl ref,
+  int type_: @type_or_none ref
+);
+
+opaque_type_decls(  //dir=decl
+  unique int id: @opaque_type_decl,
+  int naming_declaration: @value_decl_or_none ref
+);
+
+#keyset[id, index]
+opaque_type_decl_opaque_generic_params(  //dir=decl
+  int id: @opaque_type_decl ref,
+  int index: int ref,
+  int opaque_generic_param: @generic_type_param_type_or_none ref
+);
+
+param_decls(  //dir=decl
+  unique int id: @param_decl
+);
+
+#keyset[id]
+param_decl_is_inout(  //dir=decl
+  int id: @param_decl ref
+);
+
+#keyset[id]
+param_decl_property_wrapper_local_wrapped_var_bindings(  //dir=decl
+  int id: @param_decl ref,
+  int property_wrapper_local_wrapped_var_binding: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+param_decl_property_wrapper_local_wrapped_vars(  //dir=decl
+  int id: @param_decl ref,
+  int property_wrapper_local_wrapped_var: @var_decl_or_none ref
+);
+
+type_alias_decls(  //dir=decl
+  unique int id: @type_alias_decl,
+  int aliased_type: @type_or_none ref
+);
+
+class_decls(  //dir=decl
+  unique int id: @class_decl
+);
+
+enum_decls(  //dir=decl
+  unique int id: @enum_decl
+);
+
+protocol_decls(  //dir=decl
+  unique int id: @protocol_decl
+);
+
+struct_decls(  //dir=decl
+  unique int id: @struct_decl
+);
+
+arguments(  //dir=expr
+  unique int id: @argument,
+  string label: string ref,
+  int expr: @expr_or_none ref
+);
+
+@expr =
+  @any_try_expr
+| @applied_property_wrapper_expr
+| @apply_expr
+| @assign_expr
+| @bind_optional_expr
+| @capture_list_expr
+| @closure_expr
+| @collection_expr
+| @consume_expr
+| @copy_expr
+| @current_context_isolation_expr
+| @decl_ref_expr
+| @default_argument_expr
+| @discard_assignment_expr
+| @dot_syntax_base_ignored_expr
+| @dynamic_type_expr
+| @enum_is_case_expr
+| @error_expr
+| @explicit_cast_expr
+| @extract_function_isolation_expr
+| @force_value_expr
+| @identity_expr
+| @if_expr
+| @implicit_conversion_expr
+| @in_out_expr
+| @key_path_application_expr
+| @key_path_dot_expr
+| @key_path_expr
+| @lazy_initialization_expr
+| @literal_expr
+| @lookup_expr
+| @make_temporarily_escapable_expr
+| @materialize_pack_expr
+| @obj_c_selector_expr
+| @one_way_expr
+| @opaque_value_expr
+| @open_existential_expr
+| @optional_evaluation_expr
+| @other_initializer_ref_expr
+| @overloaded_decl_ref_expr
+| @pack_element_expr
+| @pack_expansion_expr
+| @property_wrapper_value_placeholder_expr
+| @rebind_self_in_initializer_expr
+| @sequence_expr
+| @single_value_stmt_expr
+| @super_ref_expr
+| @tap_expr
+| @tuple_element_expr
+| @tuple_expr
+| @type_expr
+| @type_value_expr
+| @unresolved_decl_ref_expr
+| @unresolved_dot_expr
+| @unresolved_member_expr
+| @unresolved_pattern_expr
+| @unresolved_specialize_expr
+| @vararg_expansion_expr
+;
+
+#keyset[id]
+expr_types(  //dir=expr
+  int id: @expr ref,
+  int type_: @type_or_none ref
+);
+
+@any_try_expr =
+  @force_try_expr
+| @optional_try_expr
+| @try_expr
+;
+
+#keyset[id]
+any_try_exprs(  //dir=expr
+  int id: @any_try_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+applied_property_wrapper_exprs(  //dir=expr
+  unique int id: @applied_property_wrapper_expr,
+  int kind: int ref,
+  int value: @expr_or_none ref,
+  int param: @param_decl_or_none ref
+);
+
+@apply_expr =
+  @binary_expr
+| @call_expr
+| @postfix_unary_expr
+| @prefix_unary_expr
+| @self_apply_expr
+;
+
+#keyset[id]
+apply_exprs(  //dir=expr
+  int id: @apply_expr ref,
+  int function: @expr_or_none ref
+);
+
+#keyset[id, index]
+apply_expr_arguments(  //dir=expr
+  int id: @apply_expr ref,
+  int index: int ref,
+  int argument: @argument_or_none ref
+);
+
+assign_exprs(  //dir=expr
+  unique int id: @assign_expr,
+  int dest: @expr_or_none ref,
+  int source: @expr_or_none ref
+);
+
+bind_optional_exprs(  //dir=expr
+  unique int id: @bind_optional_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+capture_list_exprs(  //dir=expr
+  unique int id: @capture_list_expr,
+  int closure_body: @closure_expr_or_none ref
+);
+
+#keyset[id, index]
+capture_list_expr_binding_decls(  //dir=expr
+  int id: @capture_list_expr ref,
+  int index: int ref,
+  int binding_decl: @pattern_binding_decl_or_none ref
+);
+
+@closure_expr =
+  @auto_closure_expr
+| @explicit_closure_expr
+;
+
+@collection_expr =
+  @array_expr
+| @dictionary_expr
+;
+
+consume_exprs(  //dir=expr
+  unique int id: @consume_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+copy_exprs(  //dir=expr
+  unique int id: @copy_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+current_context_isolation_exprs(  //dir=expr
+  unique int id: @current_context_isolation_expr,
+  int actor: @expr_or_none ref
+);
+
+decl_ref_exprs(  //dir=expr
+  unique int id: @decl_ref_expr,
+  int decl: @decl_or_none ref
+);
+
+#keyset[id, index]
+decl_ref_expr_replacement_types(  //dir=expr
+  int id: @decl_ref_expr ref,
+  int index: int ref,
+  int replacement_type: @type_or_none ref
+);
+
+#keyset[id]
+decl_ref_expr_has_direct_to_storage_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+#keyset[id]
+decl_ref_expr_has_direct_to_implementation_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+#keyset[id]
+decl_ref_expr_has_ordinary_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+#keyset[id]
+decl_ref_expr_has_distributed_thunk_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+default_argument_exprs(  //dir=expr
+  unique int id: @default_argument_expr,
+  int param_decl: @param_decl_or_none ref,
+  int param_index: int ref
+);
+
+#keyset[id]
+default_argument_expr_caller_side_defaults(  //dir=expr
+  int id: @default_argument_expr ref,
+  int caller_side_default: @expr_or_none ref
+);
+
+discard_assignment_exprs(  //dir=expr
+  unique int id: @discard_assignment_expr
+);
+
+dot_syntax_base_ignored_exprs(  //dir=expr
+  unique int id: @dot_syntax_base_ignored_expr,
+  int qualifier: @expr_or_none ref,
+  int sub_expr: @expr_or_none ref
+);
+
+dynamic_type_exprs(  //dir=expr
+  unique int id: @dynamic_type_expr,
+  int base: @expr_or_none ref
+);
+
+enum_is_case_exprs(  //dir=expr
+  unique int id: @enum_is_case_expr,
+  int sub_expr: @expr_or_none ref,
+  int element: @enum_element_decl_or_none ref
+);
+
+error_exprs(  //dir=expr
+  unique int id: @error_expr
+);
+
+@explicit_cast_expr =
+  @checked_cast_expr
+| @coerce_expr
+;
+
+#keyset[id]
+explicit_cast_exprs(  //dir=expr
+  int id: @explicit_cast_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+extract_function_isolation_exprs(  //dir=expr
+  unique int id: @extract_function_isolation_expr,
+  int function_expr: @expr_or_none ref
+);
+
+force_value_exprs(  //dir=expr
+  unique int id: @force_value_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+@identity_expr =
+  @await_expr
+| @borrow_expr
+| @dot_self_expr
+| @paren_expr
+| @unresolved_member_chain_result_expr
+| @unsafe_expr
+;
+
+#keyset[id]
+identity_exprs(  //dir=expr
+  int id: @identity_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+if_exprs(  //dir=expr
+  unique int id: @if_expr,
+  int condition: @expr_or_none ref,
+  int then_expr: @expr_or_none ref,
+  int else_expr: @expr_or_none ref
+);
+
+@implicit_conversion_expr =
+  @abi_safe_conversion_expr
+| @actor_isolation_erasure_expr
+| @any_hashable_erasure_expr
+| @archetype_to_super_expr
+| @array_to_pointer_expr
+| @bridge_from_obj_c_expr
+| @bridge_to_obj_c_expr
+| @class_metatype_to_object_expr
+| @collection_upcast_conversion_expr
+| @conditional_bridge_from_obj_c_expr
+| @covariant_function_conversion_expr
+| @covariant_return_conversion_expr
+| @derived_to_base_expr
+| @destructure_tuple_expr
+| @differentiable_function_expr
+| @differentiable_function_extract_original_expr
+| @erasure_expr
+| @existential_metatype_to_object_expr
+| @foreign_object_conversion_expr
+| @function_conversion_expr
+| @in_out_to_pointer_expr
+| @inject_into_optional_expr
+| @linear_function_expr
+| @linear_function_extract_original_expr
+| @linear_to_differentiable_function_expr
+| @load_expr
+| @metatype_conversion_expr
+| @pointer_to_pointer_expr
+| @protocol_metatype_to_object_expr
+| @string_to_pointer_expr
+| @underlying_to_opaque_expr
+| @unevaluated_instance_expr
+| @unreachable_expr
+| @unresolved_type_conversion_expr
+| @unsafe_cast_expr
+;
+
+#keyset[id]
+implicit_conversion_exprs(  //dir=expr
+  int id: @implicit_conversion_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+in_out_exprs(  //dir=expr
+  unique int id: @in_out_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+key_path_application_exprs(  //dir=expr
+  unique int id: @key_path_application_expr,
+  int base: @expr_or_none ref,
+  int key_path: @expr_or_none ref
+);
+
+key_path_dot_exprs(  //dir=expr
+  unique int id: @key_path_dot_expr
+);
+
+key_path_exprs(  //dir=expr
+  unique int id: @key_path_expr
+);
+
+#keyset[id]
+key_path_expr_roots(  //dir=expr
+  int id: @key_path_expr ref,
+  int root: @type_repr_or_none ref
+);
+
+#keyset[id, index]
+key_path_expr_components(  //dir=expr
+  int id: @key_path_expr ref,
+  int index: int ref,
+  int component: @key_path_component_or_none ref
+);
+
+lazy_initialization_exprs(  //dir=expr
+  unique int id: @lazy_initialization_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+@literal_expr =
+  @builtin_literal_expr
+| @interpolated_string_literal_expr
+| @nil_literal_expr
+| @object_literal_expr
+| @regex_literal_expr
+;
+
+@lookup_expr =
+  @dynamic_lookup_expr
+| @member_ref_expr
+| @subscript_expr
+;
+
+#keyset[id]
+lookup_exprs(  //dir=expr
+  int id: @lookup_expr ref,
+  int base: @expr_or_none ref
+);
+
+#keyset[id]
+lookup_expr_members(  //dir=expr
+  int id: @lookup_expr ref,
+  int member: @decl_or_none ref
+);
+
+make_temporarily_escapable_exprs(  //dir=expr
+  unique int id: @make_temporarily_escapable_expr,
+  int escaping_closure: @opaque_value_expr_or_none ref,
+  int nonescaping_closure: @expr_or_none ref,
+  int sub_expr: @expr_or_none ref
+);
+
+materialize_pack_exprs(  //dir=expr
+  unique int id: @materialize_pack_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+obj_c_selector_exprs(  //dir=expr
+  unique int id: @obj_c_selector_expr,
+  int sub_expr: @expr_or_none ref,
+  int method: @function_or_none ref
+);
+
+one_way_exprs(  //dir=expr
+  unique int id: @one_way_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+opaque_value_exprs(  //dir=expr
+  unique int id: @opaque_value_expr
+);
+
+open_existential_exprs(  //dir=expr
+  unique int id: @open_existential_expr,
+  int sub_expr: @expr_or_none ref,
+  int existential: @expr_or_none ref,
+  int opaque_expr: @opaque_value_expr_or_none ref
+);
+
+optional_evaluation_exprs(  //dir=expr
+  unique int id: @optional_evaluation_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+other_initializer_ref_exprs(  //dir=expr
+  unique int id: @other_initializer_ref_expr,
+  int initializer: @initializer_or_none ref
+);
+
+overloaded_decl_ref_exprs(  //dir=expr
+  unique int id: @overloaded_decl_ref_expr
+);
+
+#keyset[id, index]
+overloaded_decl_ref_expr_possible_declarations(  //dir=expr
+  int id: @overloaded_decl_ref_expr ref,
+  int index: int ref,
+  int possible_declaration: @value_decl_or_none ref
+);
+
+pack_element_exprs(  //dir=expr
+  unique int id: @pack_element_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+pack_expansion_exprs(  //dir=expr
+  unique int id: @pack_expansion_expr,
+  int pattern_expr: @expr_or_none ref
+);
+
+property_wrapper_value_placeholder_exprs(  //dir=expr
+  unique int id: @property_wrapper_value_placeholder_expr,
+  int placeholder: @opaque_value_expr_or_none ref
+);
+
+#keyset[id]
+property_wrapper_value_placeholder_expr_wrapped_values(  //dir=expr
+  int id: @property_wrapper_value_placeholder_expr ref,
+  int wrapped_value: @expr_or_none ref
+);
+
+rebind_self_in_initializer_exprs(  //dir=expr
+  unique int id: @rebind_self_in_initializer_expr,
+  int sub_expr: @expr_or_none ref,
+  int self: @var_decl_or_none ref
+);
+
+sequence_exprs(  //dir=expr
+  unique int id: @sequence_expr
+);
+
+#keyset[id, index]
+sequence_expr_elements(  //dir=expr
+  int id: @sequence_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+single_value_stmt_exprs(  //dir=expr
+  unique int id: @single_value_stmt_expr,
+  int stmt: @stmt_or_none ref
+);
+
+super_ref_exprs(  //dir=expr
+  unique int id: @super_ref_expr,
+  int self: @var_decl_or_none ref
+);
+
+tap_exprs(  //dir=expr
+  unique int id: @tap_expr,
+  int body: @brace_stmt_or_none ref,
+  int var: @var_decl_or_none ref
+);
+
+#keyset[id]
+tap_expr_sub_exprs(  //dir=expr
+  int id: @tap_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+tuple_element_exprs(  //dir=expr
+  unique int id: @tuple_element_expr,
+  int sub_expr: @expr_or_none ref,
+  int index: int ref
+);
+
+tuple_exprs(  //dir=expr
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_elements(  //dir=expr
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+type_exprs(  //dir=expr
+  unique int id: @type_expr
+);
+
+#keyset[id]
+type_expr_type_reprs(  //dir=expr
+  int id: @type_expr ref,
+  int type_repr: @type_repr_or_none ref
+);
+
+type_value_exprs(  //dir=expr
+  unique int id: @type_value_expr,
+  int type_repr: @type_repr_or_none ref
+);
+
+unresolved_decl_ref_exprs(  //dir=expr
+  unique int id: @unresolved_decl_ref_expr
+);
+
+#keyset[id]
+unresolved_decl_ref_expr_names(  //dir=expr
+  int id: @unresolved_decl_ref_expr ref,
+  string name: string ref
+);
+
+unresolved_dot_exprs(  //dir=expr
+  unique int id: @unresolved_dot_expr,
+  int base: @expr_or_none ref,
+  string name: string ref
+);
+
+unresolved_member_exprs(  //dir=expr
+  unique int id: @unresolved_member_expr,
+  string name: string ref
+);
+
+unresolved_pattern_exprs(  //dir=expr
+  unique int id: @unresolved_pattern_expr,
+  int sub_pattern: @pattern_or_none ref
+);
+
+unresolved_specialize_exprs(  //dir=expr
+  unique int id: @unresolved_specialize_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+vararg_expansion_exprs(  //dir=expr
+  unique int id: @vararg_expansion_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+abi_safe_conversion_exprs(  //dir=expr
+  unique int id: @abi_safe_conversion_expr
+);
+
+actor_isolation_erasure_exprs(  //dir=expr
+  unique int id: @actor_isolation_erasure_expr
+);
+
+any_hashable_erasure_exprs(  //dir=expr
+  unique int id: @any_hashable_erasure_expr
+);
+
+archetype_to_super_exprs(  //dir=expr
+  unique int id: @archetype_to_super_expr
+);
+
+array_exprs(  //dir=expr
+  unique int id: @array_expr
+);
+
+#keyset[id, index]
+array_expr_elements(  //dir=expr
+  int id: @array_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+array_to_pointer_exprs(  //dir=expr
+  unique int id: @array_to_pointer_expr
+);
+
+auto_closure_exprs(  //dir=expr
+  unique int id: @auto_closure_expr
+);
+
+await_exprs(  //dir=expr
+  unique int id: @await_expr
+);
+
+binary_exprs(  //dir=expr
+  unique int id: @binary_expr
+);
+
+borrow_exprs(  //dir=expr
+  unique int id: @borrow_expr
+);
+
+bridge_from_obj_c_exprs(  //dir=expr
+  unique int id: @bridge_from_obj_c_expr
+);
+
+bridge_to_obj_c_exprs(  //dir=expr
+  unique int id: @bridge_to_obj_c_expr
+);
+
+@builtin_literal_expr =
+  @boolean_literal_expr
+| @magic_identifier_literal_expr
+| @number_literal_expr
+| @string_literal_expr
+;
+
+call_exprs(  //dir=expr
+  unique int id: @call_expr
+);
+
+@checked_cast_expr =
+  @conditional_checked_cast_expr
+| @forced_checked_cast_expr
+| @is_expr
+;
+
+class_metatype_to_object_exprs(  //dir=expr
+  unique int id: @class_metatype_to_object_expr
+);
+
+coerce_exprs(  //dir=expr
+  unique int id: @coerce_expr
+);
+
+collection_upcast_conversion_exprs(  //dir=expr
+  unique int id: @collection_upcast_conversion_expr
+);
+
+conditional_bridge_from_obj_c_exprs(  //dir=expr
+  unique int id: @conditional_bridge_from_obj_c_expr
+);
+
+covariant_function_conversion_exprs(  //dir=expr
+  unique int id: @covariant_function_conversion_expr
+);
+
+covariant_return_conversion_exprs(  //dir=expr
+  unique int id: @covariant_return_conversion_expr
+);
+
+derived_to_base_exprs(  //dir=expr
+  unique int id: @derived_to_base_expr
+);
+
+destructure_tuple_exprs(  //dir=expr
+  unique int id: @destructure_tuple_expr
+);
+
+dictionary_exprs(  //dir=expr
+  unique int id: @dictionary_expr
+);
+
+#keyset[id, index]
+dictionary_expr_elements(  //dir=expr
+  int id: @dictionary_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+differentiable_function_exprs(  //dir=expr
+  unique int id: @differentiable_function_expr
+);
+
+differentiable_function_extract_original_exprs(  //dir=expr
+  unique int id: @differentiable_function_extract_original_expr
+);
+
+dot_self_exprs(  //dir=expr
+  unique int id: @dot_self_expr
+);
+
+@dynamic_lookup_expr =
+  @dynamic_member_ref_expr
+| @dynamic_subscript_expr
+;
+
+erasure_exprs(  //dir=expr
+  unique int id: @erasure_expr
+);
+
+existential_metatype_to_object_exprs(  //dir=expr
+  unique int id: @existential_metatype_to_object_expr
+);
+
+explicit_closure_exprs(  //dir=expr
+  unique int id: @explicit_closure_expr
+);
+
+force_try_exprs(  //dir=expr
+  unique int id: @force_try_expr
+);
+
+foreign_object_conversion_exprs(  //dir=expr
+  unique int id: @foreign_object_conversion_expr
+);
+
+function_conversion_exprs(  //dir=expr
+  unique int id: @function_conversion_expr
+);
+
+in_out_to_pointer_exprs(  //dir=expr
+  unique int id: @in_out_to_pointer_expr
+);
+
+inject_into_optional_exprs(  //dir=expr
+  unique int id: @inject_into_optional_expr
+);
+
+interpolated_string_literal_exprs(  //dir=expr
+  unique int id: @interpolated_string_literal_expr
+);
+
+#keyset[id]
+interpolated_string_literal_expr_interpolation_exprs(  //dir=expr
+  int id: @interpolated_string_literal_expr ref,
+  int interpolation_expr: @opaque_value_expr_or_none ref
+);
+
+#keyset[id]
+interpolated_string_literal_expr_appending_exprs(  //dir=expr
+  int id: @interpolated_string_literal_expr ref,
+  int appending_expr: @tap_expr_or_none ref
+);
+
+linear_function_exprs(  //dir=expr
+  unique int id: @linear_function_expr
+);
+
+linear_function_extract_original_exprs(  //dir=expr
+  unique int id: @linear_function_extract_original_expr
+);
+
+linear_to_differentiable_function_exprs(  //dir=expr
+  unique int id: @linear_to_differentiable_function_expr
+);
+
+load_exprs(  //dir=expr
+  unique int id: @load_expr
+);
+
+member_ref_exprs(  //dir=expr
+  unique int id: @member_ref_expr
+);
+
+#keyset[id]
+member_ref_expr_has_direct_to_storage_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+#keyset[id]
+member_ref_expr_has_direct_to_implementation_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+#keyset[id]
+member_ref_expr_has_ordinary_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+#keyset[id]
+member_ref_expr_has_distributed_thunk_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+metatype_conversion_exprs(  //dir=expr
+  unique int id: @metatype_conversion_expr
+);
+
+nil_literal_exprs(  //dir=expr
+  unique int id: @nil_literal_expr
+);
+
+object_literal_exprs(  //dir=expr
+  unique int id: @object_literal_expr,
+  int kind: int ref
+);
+
+#keyset[id, index]
+object_literal_expr_arguments(  //dir=expr
+  int id: @object_literal_expr ref,
+  int index: int ref,
+  int argument: @argument_or_none ref
+);
+
+optional_try_exprs(  //dir=expr
+  unique int id: @optional_try_expr
+);
+
+paren_exprs(  //dir=expr
+  unique int id: @paren_expr
+);
+
+pointer_to_pointer_exprs(  //dir=expr
+  unique int id: @pointer_to_pointer_expr
+);
+
+postfix_unary_exprs(  //dir=expr
+  unique int id: @postfix_unary_expr
+);
+
+prefix_unary_exprs(  //dir=expr
+  unique int id: @prefix_unary_expr
+);
+
+protocol_metatype_to_object_exprs(  //dir=expr
+  unique int id: @protocol_metatype_to_object_expr
+);
+
+regex_literal_exprs(  //dir=expr
+  unique int id: @regex_literal_expr,
+  string pattern: string ref,
+  int version: int ref
+);
+
+@self_apply_expr =
+  @dot_syntax_call_expr
+| @initializer_ref_call_expr
+;
+
+#keyset[id]
+self_apply_exprs(  //dir=expr
+  int id: @self_apply_expr ref,
+  int base: @expr_or_none ref
+);
+
+string_to_pointer_exprs(  //dir=expr
+  unique int id: @string_to_pointer_expr
+);
+
+subscript_exprs(  //dir=expr
+  unique int id: @subscript_expr
+);
+
+#keyset[id, index]
+subscript_expr_arguments(  //dir=expr
+  int id: @subscript_expr ref,
+  int index: int ref,
+  int argument: @argument_or_none ref
+);
+
+#keyset[id]
+subscript_expr_has_direct_to_storage_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+#keyset[id]
+subscript_expr_has_direct_to_implementation_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+#keyset[id]
+subscript_expr_has_ordinary_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+#keyset[id]
+subscript_expr_has_distributed_thunk_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+try_exprs(  //dir=expr
+  unique int id: @try_expr
+);
+
+underlying_to_opaque_exprs(  //dir=expr
+  unique int id: @underlying_to_opaque_expr
+);
+
+unevaluated_instance_exprs(  //dir=expr
+  unique int id: @unevaluated_instance_expr
+);
+
+unreachable_exprs(  //dir=expr
+  unique int id: @unreachable_expr
+);
+
+unresolved_member_chain_result_exprs(  //dir=expr
+  unique int id: @unresolved_member_chain_result_expr
+);
+
+unresolved_type_conversion_exprs(  //dir=expr
+  unique int id: @unresolved_type_conversion_expr
+);
+
+unsafe_cast_exprs(  //dir=expr
+  unique int id: @unsafe_cast_expr
+);
+
+unsafe_exprs(  //dir=expr
+  unique int id: @unsafe_expr
+);
+
+boolean_literal_exprs(  //dir=expr
+  unique int id: @boolean_literal_expr,
+  boolean value: boolean ref
+);
+
+conditional_checked_cast_exprs(  //dir=expr
+  unique int id: @conditional_checked_cast_expr
+);
+
+dot_syntax_call_exprs(  //dir=expr
+  unique int id: @dot_syntax_call_expr
+);
+
+dynamic_member_ref_exprs(  //dir=expr
+  unique int id: @dynamic_member_ref_expr
+);
+
+dynamic_subscript_exprs(  //dir=expr
+  unique int id: @dynamic_subscript_expr
+);
+
+forced_checked_cast_exprs(  //dir=expr
+  unique int id: @forced_checked_cast_expr
+);
+
+initializer_ref_call_exprs(  //dir=expr
+  unique int id: @initializer_ref_call_expr
+);
+
+is_exprs(  //dir=expr
+  unique int id: @is_expr
+);
+
+magic_identifier_literal_exprs(  //dir=expr
+  unique int id: @magic_identifier_literal_expr,
+  string kind: string ref
+);
+
+@number_literal_expr =
+  @float_literal_expr
+| @integer_literal_expr
+;
+
+string_literal_exprs(  //dir=expr
+  unique int id: @string_literal_expr,
+  string value: string ref
+);
+
+float_literal_exprs(  //dir=expr
+  unique int id: @float_literal_expr,
+  string string_value: string ref
+);
+
+integer_literal_exprs(  //dir=expr
+  unique int id: @integer_literal_expr,
+  string string_value: string ref
+);
+
+@pattern =
+  @any_pattern
+| @binding_pattern
+| @bool_pattern
+| @enum_element_pattern
+| @expr_pattern
+| @is_pattern
+| @named_pattern
+| @optional_some_pattern
+| @paren_pattern
+| @tuple_pattern
+| @typed_pattern
+;
+
+#keyset[id]
+pattern_types(  //dir=pattern
+  int id: @pattern ref,
+  int type_: @type_or_none ref
+);
+
+any_patterns(  //dir=pattern
+  unique int id: @any_pattern
+);
+
+binding_patterns(  //dir=pattern
+  unique int id: @binding_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+bool_patterns(  //dir=pattern
+  unique int id: @bool_pattern,
+  boolean value: boolean ref
+);
+
+enum_element_patterns(  //dir=pattern
+  unique int id: @enum_element_pattern,
+  int element: @enum_element_decl_or_none ref
+);
+
+#keyset[id]
+enum_element_pattern_sub_patterns(  //dir=pattern
+  int id: @enum_element_pattern ref,
+  int sub_pattern: @pattern_or_none ref
+);
+
+expr_patterns(  //dir=pattern
+  unique int id: @expr_pattern,
+  int sub_expr: @expr_or_none ref
+);
+
+is_patterns(  //dir=pattern
+  unique int id: @is_pattern
+);
+
+#keyset[id]
+is_pattern_cast_type_reprs(  //dir=pattern
+  int id: @is_pattern ref,
+  int cast_type_repr: @type_repr_or_none ref
+);
+
+#keyset[id]
+is_pattern_sub_patterns(  //dir=pattern
+  int id: @is_pattern ref,
+  int sub_pattern: @pattern_or_none ref
+);
+
+named_patterns(  //dir=pattern
+  unique int id: @named_pattern,
+  int var_decl: @var_decl_or_none ref
+);
+
+optional_some_patterns(  //dir=pattern
+  unique int id: @optional_some_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+paren_patterns(  //dir=pattern
+  unique int id: @paren_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+tuple_patterns(  //dir=pattern
+  unique int id: @tuple_pattern
+);
+
+#keyset[id, index]
+tuple_pattern_elements(  //dir=pattern
+  int id: @tuple_pattern ref,
+  int index: int ref,
+  int element: @pattern_or_none ref
+);
+
+typed_patterns(  //dir=pattern
+  unique int id: @typed_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+typed_pattern_type_reprs(  //dir=pattern
+  int id: @typed_pattern ref,
+  int type_repr: @type_repr_or_none ref
+);
+
+case_label_items(  //dir=stmt
+  unique int id: @case_label_item,
+  int pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+case_label_item_guards(  //dir=stmt
+  int id: @case_label_item ref,
+  int guard: @expr_or_none ref
+);
+
+condition_elements(  //dir=stmt
+  unique int id: @condition_element
+);
+
+#keyset[id]
+condition_element_booleans(  //dir=stmt
+  int id: @condition_element ref,
+  int boolean_: @expr_or_none ref
+);
+
+#keyset[id]
+condition_element_patterns(  //dir=stmt
+  int id: @condition_element ref,
+  int pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+condition_element_initializers(  //dir=stmt
+  int id: @condition_element ref,
+  int initializer: @expr_or_none ref
+);
+
+#keyset[id]
+condition_element_availabilities(  //dir=stmt
+  int id: @condition_element ref,
+  int availability: @availability_info_or_none ref
+);
+
+@stmt =
+  @brace_stmt
+| @break_stmt
+| @case_stmt
+| @continue_stmt
+| @defer_stmt
+| @discard_stmt
+| @fail_stmt
+| @fallthrough_stmt
+| @labeled_stmt
+| @pound_assert_stmt
+| @return_stmt
+| @then_stmt
+| @throw_stmt
+| @yield_stmt
+;
+
+stmt_conditions(  //dir=stmt
+  unique int id: @stmt_condition
+);
+
+#keyset[id, index]
+stmt_condition_elements(  //dir=stmt
+  int id: @stmt_condition ref,
+  int index: int ref,
+  int element: @condition_element_or_none ref
+);
+
+brace_stmts(  //dir=stmt
+  unique int id: @brace_stmt
+);
+
+#keyset[id, index]
+brace_stmt_elements(  //dir=stmt
+  int id: @brace_stmt ref,
+  int index: int ref,
+  int element: @ast_node_or_none ref
+);
+
+break_stmts(  //dir=stmt
+  unique int id: @break_stmt
+);
+
+#keyset[id]
+break_stmt_target_names(  //dir=stmt
+  int id: @break_stmt ref,
+  string target_name: string ref
+);
+
+#keyset[id]
+break_stmt_targets(  //dir=stmt
+  int id: @break_stmt ref,
+  int target: @stmt_or_none ref
+);
+
+case_stmts(  //dir=stmt
+  unique int id: @case_stmt,
+  int body: @stmt_or_none ref
+);
+
+#keyset[id, index]
+case_stmt_labels(  //dir=stmt
+  int id: @case_stmt ref,
+  int index: int ref,
+  int label: @case_label_item_or_none ref
+);
+
+#keyset[id, index]
+case_stmt_variables(  //dir=stmt
+  int id: @case_stmt ref,
+  int index: int ref,
+  int variable: @var_decl_or_none ref
+);
+
+continue_stmts(  //dir=stmt
+  unique int id: @continue_stmt
+);
+
+#keyset[id]
+continue_stmt_target_names(  //dir=stmt
+  int id: @continue_stmt ref,
+  string target_name: string ref
+);
+
+#keyset[id]
+continue_stmt_targets(  //dir=stmt
+  int id: @continue_stmt ref,
+  int target: @stmt_or_none ref
+);
+
+defer_stmts(  //dir=stmt
+  unique int id: @defer_stmt,
+  int body: @brace_stmt_or_none ref
+);
+
+discard_stmts(  //dir=stmt
+  unique int id: @discard_stmt,
+  int sub_expr: @expr_or_none ref
+);
+
+fail_stmts(  //dir=stmt
+  unique int id: @fail_stmt
+);
+
+fallthrough_stmts(  //dir=stmt
+  unique int id: @fallthrough_stmt,
+  int fallthrough_source: @case_stmt_or_none ref,
+  int fallthrough_dest: @case_stmt_or_none ref
+);
+
+@labeled_stmt =
+  @do_catch_stmt
+| @do_stmt
+| @for_each_stmt
+| @labeled_conditional_stmt
+| @repeat_while_stmt
+| @switch_stmt
+;
+
+#keyset[id]
+labeled_stmt_labels(  //dir=stmt
+  int id: @labeled_stmt ref,
+  string label: string ref
+);
+
+pound_assert_stmts(  //dir=stmt
+  unique int id: @pound_assert_stmt,
+  int condition: @expr_or_none ref,
+  string message: string ref
+);
+
+return_stmts(  //dir=stmt
+  unique int id: @return_stmt
+);
+
+#keyset[id]
+return_stmt_results(  //dir=stmt
+  int id: @return_stmt ref,
+  int result: @expr_or_none ref
+);
+
+then_stmts(  //dir=stmt
+  unique int id: @then_stmt,
+  int result: @expr_or_none ref
+);
+
+throw_stmts(  //dir=stmt
+  unique int id: @throw_stmt,
+  int sub_expr: @expr_or_none ref
+);
+
+yield_stmts(  //dir=stmt
+  unique int id: @yield_stmt
+);
+
+#keyset[id, index]
+yield_stmt_results(  //dir=stmt
+  int id: @yield_stmt ref,
+  int index: int ref,
+  int result: @expr_or_none ref
+);
+
+do_catch_stmts(  //dir=stmt
+  unique int id: @do_catch_stmt,
+  int body: @stmt_or_none ref
+);
+
+#keyset[id, index]
+do_catch_stmt_catches(  //dir=stmt
+  int id: @do_catch_stmt ref,
+  int index: int ref,
+  int catch: @case_stmt_or_none ref
+);
+
+do_stmts(  //dir=stmt
+  unique int id: @do_stmt,
+  int body: @brace_stmt_or_none ref
+);
+
+for_each_stmts(  //dir=stmt
+  unique int id: @for_each_stmt,
+  int pattern: @pattern_or_none ref,
+  int body: @brace_stmt_or_none ref
+);
+
+#keyset[id, index]
+for_each_stmt_variables(  //dir=stmt
+  int id: @for_each_stmt ref,
+  int index: int ref,
+  int variable: @var_decl_or_none ref
+);
+
+#keyset[id]
+for_each_stmt_wheres(  //dir=stmt
+  int id: @for_each_stmt ref,
+  int where: @expr_or_none ref
+);
+
+#keyset[id]
+for_each_stmt_iterator_vars(  //dir=stmt
+  int id: @for_each_stmt ref,
+  int iteratorVar: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+for_each_stmt_next_calls(  //dir=stmt
+  int id: @for_each_stmt ref,
+  int nextCall: @expr_or_none ref
+);
+
+@labeled_conditional_stmt =
+  @guard_stmt
+| @if_stmt
+| @while_stmt
+;
+
+#keyset[id]
+labeled_conditional_stmts(  //dir=stmt
+  int id: @labeled_conditional_stmt ref,
+  int condition: @stmt_condition_or_none ref
+);
+
+repeat_while_stmts(  //dir=stmt
+  unique int id: @repeat_while_stmt,
+  int condition: @expr_or_none ref,
+  int body: @stmt_or_none ref
+);
+
+switch_stmts(  //dir=stmt
+  unique int id: @switch_stmt,
+  int expr: @expr_or_none ref
+);
+
+#keyset[id, index]
+switch_stmt_cases(  //dir=stmt
+  int id: @switch_stmt ref,
+  int index: int ref,
+  int case_: @case_stmt_or_none ref
+);
+
+guard_stmts(  //dir=stmt
+  unique int id: @guard_stmt,
+  int body: @brace_stmt_or_none ref
+);
+
+if_stmts(  //dir=stmt
+  unique int id: @if_stmt,
+  int then: @stmt_or_none ref
+);
+
+#keyset[id]
+if_stmt_elses(  //dir=stmt
+  int id: @if_stmt ref,
+  int else: @stmt_or_none ref
+);
+
+while_stmts(  //dir=stmt
+  unique int id: @while_stmt,
+  int body: @stmt_or_none ref
+);
+
+@type =
+  @any_function_type
+| @any_generic_type
+| @any_metatype_type
+| @builtin_type
+| @dependent_member_type
+| @dynamic_self_type
+| @error_type
+| @existential_type
+| @in_out_type
+| @integer_type
+| @l_value_type
+| @module_type
+| @pack_element_type
+| @pack_expansion_type
+| @pack_type
+| @parameterized_protocol_type
+| @protocol_composition_type
+| @reference_storage_type
+| @substitutable_type
+| @sugar_type
+| @tuple_type
+| @unresolved_type
+;
+
+#keyset[id]
+types(  //dir=type
+  int id: @type ref,
+  string name: string ref,
+  int canonical_type: @type_or_none ref
+);
+
+type_reprs(  //dir=type
+  unique int id: @type_repr,
+  int type_: @type_or_none ref
+);
+
+@any_function_type =
+  @function_type
+| @generic_function_type
+;
+
+#keyset[id]
+any_function_types(  //dir=type
+  int id: @any_function_type ref,
+  int result: @type_or_none ref
+);
+
+#keyset[id, index]
+any_function_type_param_types(  //dir=type
+  int id: @any_function_type ref,
+  int index: int ref,
+  int param_type: @type_or_none ref
+);
+
+#keyset[id]
+any_function_type_is_throwing(  //dir=type
+  int id: @any_function_type ref
+);
+
+#keyset[id]
+any_function_type_is_async(  //dir=type
+  int id: @any_function_type ref
+);
+
+@any_generic_type =
+  @nominal_or_bound_generic_nominal_type
+| @unbound_generic_type
+;
+
+#keyset[id]
+any_generic_types(  //dir=type
+  int id: @any_generic_type ref,
+  int declaration: @generic_type_decl_or_none ref
+);
+
+#keyset[id]
+any_generic_type_parents(  //dir=type
+  int id: @any_generic_type ref,
+  int parent: @type_or_none ref
+);
+
+@any_metatype_type =
+  @existential_metatype_type
+| @metatype_type
+;
+
+@builtin_type =
+  @any_builtin_integer_type
+| @builtin_bridge_object_type
+| @builtin_default_actor_storage_type
+| @builtin_executor_type
+| @builtin_fixed_array_type
+| @builtin_float_type
+| @builtin_job_type
+| @builtin_native_object_type
+| @builtin_raw_pointer_type
+| @builtin_raw_unsafe_continuation_type
+| @builtin_unsafe_value_buffer_type
+| @builtin_vector_type
+;
+
+dependent_member_types(  //dir=type
+  unique int id: @dependent_member_type,
+  int base_type: @type_or_none ref,
+  int associated_type_decl: @associated_type_decl_or_none ref
+);
+
+dynamic_self_types(  //dir=type
+  unique int id: @dynamic_self_type,
+  int static_self_type: @type_or_none ref
+);
+
+error_types(  //dir=type
+  unique int id: @error_type
+);
+
+existential_types(  //dir=type
+  unique int id: @existential_type,
+  int constraint: @type_or_none ref
+);
+
+in_out_types(  //dir=type
+  unique int id: @in_out_type,
+  int object_type: @type_or_none ref
+);
+
+integer_types(  //dir=type
+  unique int id: @integer_type,
+  string value: string ref
+);
+
+l_value_types(  //dir=type
+  unique int id: @l_value_type,
+  int object_type: @type_or_none ref
+);
+
+module_types(  //dir=type
+  unique int id: @module_type,
+  int module: @module_decl_or_none ref
+);
+
+pack_element_types(  //dir=type
+  unique int id: @pack_element_type,
+  int pack_type: @type_or_none ref
+);
+
+pack_expansion_types(  //dir=type
+  unique int id: @pack_expansion_type,
+  int pattern_type: @type_or_none ref,
+  int count_type: @type_or_none ref
+);
+
+pack_types(  //dir=type
+  unique int id: @pack_type
+);
+
+#keyset[id, index]
+pack_type_elements(  //dir=type
+  int id: @pack_type ref,
+  int index: int ref,
+  int element: @type_or_none ref
+);
+
+parameterized_protocol_types(  //dir=type
+  unique int id: @parameterized_protocol_type,
+  int base: @protocol_type_or_none ref
+);
+
+#keyset[id, index]
+parameterized_protocol_type_args(  //dir=type
+  int id: @parameterized_protocol_type ref,
+  int index: int ref,
+  int arg: @type_or_none ref
+);
+
+protocol_composition_types(  //dir=type
+  unique int id: @protocol_composition_type
+);
+
+#keyset[id, index]
+protocol_composition_type_members(  //dir=type
+  int id: @protocol_composition_type ref,
+  int index: int ref,
+  int member: @type_or_none ref
+);
+
+@reference_storage_type =
+  @unmanaged_storage_type
+| @unowned_storage_type
+| @weak_storage_type
+;
+
+#keyset[id]
+reference_storage_types(  //dir=type
+  int id: @reference_storage_type ref,
+  int referent_type: @type_or_none ref
+);
+
+@substitutable_type =
+  @archetype_type
+| @generic_type_param_type
+;
+
+@sugar_type =
+  @paren_type
+| @syntax_sugar_type
+| @type_alias_type
+;
+
+tuple_types(  //dir=type
+  unique int id: @tuple_type
+);
+
+#keyset[id, index]
+tuple_type_types(  //dir=type
+  int id: @tuple_type ref,
+  int index: int ref,
+  int type_: @type_or_none ref
+);
+
+#keyset[id, index]
+tuple_type_names(  //dir=type
+  int id: @tuple_type ref,
+  int index: int ref,
+  string name: string ref
+);
+
+unresolved_types(  //dir=type
+  unique int id: @unresolved_type
+);
+
+@any_builtin_integer_type =
+  @builtin_integer_literal_type
+| @builtin_integer_type
+;
+
+@archetype_type =
+  @local_archetype_type
+| @opaque_type_archetype_type
+| @pack_archetype_type
+| @primary_archetype_type
+;
+
+#keyset[id]
+archetype_types(  //dir=type
+  int id: @archetype_type ref,
+  int interface_type: @type_or_none ref
+);
+
+#keyset[id]
+archetype_type_superclasses(  //dir=type
+  int id: @archetype_type ref,
+  int superclass: @type_or_none ref
+);
+
+#keyset[id, index]
+archetype_type_protocols(  //dir=type
+  int id: @archetype_type ref,
+  int index: int ref,
+  int protocol: @protocol_decl_or_none ref
+);
+
+builtin_bridge_object_types(  //dir=type
+  unique int id: @builtin_bridge_object_type
+);
+
+builtin_default_actor_storage_types(  //dir=type
+  unique int id: @builtin_default_actor_storage_type
+);
+
+builtin_executor_types(  //dir=type
+  unique int id: @builtin_executor_type
+);
+
+builtin_fixed_array_types(  //dir=type
+  unique int id: @builtin_fixed_array_type
+);
+
+builtin_float_types(  //dir=type
+  unique int id: @builtin_float_type
+);
+
+builtin_job_types(  //dir=type
+  unique int id: @builtin_job_type
+);
+
+builtin_native_object_types(  //dir=type
+  unique int id: @builtin_native_object_type
+);
+
+builtin_raw_pointer_types(  //dir=type
+  unique int id: @builtin_raw_pointer_type
+);
+
+builtin_raw_unsafe_continuation_types(  //dir=type
+  unique int id: @builtin_raw_unsafe_continuation_type
+);
+
+builtin_unsafe_value_buffer_types(  //dir=type
+  unique int id: @builtin_unsafe_value_buffer_type
+);
+
+builtin_vector_types(  //dir=type
+  unique int id: @builtin_vector_type
+);
+
+existential_metatype_types(  //dir=type
+  unique int id: @existential_metatype_type
+);
+
+function_types(  //dir=type
+  unique int id: @function_type
+);
+
+generic_function_types(  //dir=type
+  unique int id: @generic_function_type
+);
+
+#keyset[id, index]
+generic_function_type_generic_params(  //dir=type
+  int id: @generic_function_type ref,
+  int index: int ref,
+  int generic_param: @generic_type_param_type_or_none ref
+);
+
+generic_type_param_types(  //dir=type
+  unique int id: @generic_type_param_type
+);
+
+metatype_types(  //dir=type
+  unique int id: @metatype_type
+);
+
+@nominal_or_bound_generic_nominal_type =
+  @bound_generic_type
+| @nominal_type
+;
+
+paren_types(  //dir=type
+  unique int id: @paren_type,
+  int type_: @type_or_none ref
+);
+
+@syntax_sugar_type =
+  @dictionary_type
+| @inline_array_type
+| @unary_syntax_sugar_type
+;
+
+type_alias_types(  //dir=type
+  unique int id: @type_alias_type,
+  int decl: @type_alias_decl_or_none ref
+);
+
+unbound_generic_types(  //dir=type
+  unique int id: @unbound_generic_type
+);
+
+unmanaged_storage_types(  //dir=type
+  unique int id: @unmanaged_storage_type
+);
+
+unowned_storage_types(  //dir=type
+  unique int id: @unowned_storage_type
+);
+
+weak_storage_types(  //dir=type
+  unique int id: @weak_storage_type
+);
+
+@bound_generic_type =
+  @bound_generic_class_type
+| @bound_generic_enum_type
+| @bound_generic_struct_type
+;
+
+#keyset[id, index]
+bound_generic_type_arg_types(  //dir=type
+  int id: @bound_generic_type ref,
+  int index: int ref,
+  int arg_type: @type_or_none ref
+);
+
+builtin_integer_literal_types(  //dir=type
+  unique int id: @builtin_integer_literal_type
+);
+
+builtin_integer_types(  //dir=type
+  unique int id: @builtin_integer_type
+);
+
+#keyset[id]
+builtin_integer_type_widths(  //dir=type
+  int id: @builtin_integer_type ref,
+  int width: int ref
+);
+
+dictionary_types(  //dir=type
+  unique int id: @dictionary_type,
+  int key_type: @type_or_none ref,
+  int value_type: @type_or_none ref
+);
+
+inline_array_types(  //dir=type
+  unique int id: @inline_array_type,
+  int count_type: @type_or_none ref,
+  int element_type: @type_or_none ref
+);
+
+@local_archetype_type =
+  @element_archetype_type
+| @existential_archetype_type
+;
+
+@nominal_type =
+  @class_type
+| @enum_type
+| @protocol_type
+| @struct_type
+;
+
+opaque_type_archetype_types(  //dir=type
+  unique int id: @opaque_type_archetype_type,
+  int declaration: @opaque_type_decl_or_none ref
+);
+
+pack_archetype_types(  //dir=type
+  unique int id: @pack_archetype_type
+);
+
+primary_archetype_types(  //dir=type
+  unique int id: @primary_archetype_type
+);
+
+@unary_syntax_sugar_type =
+  @array_slice_type
+| @optional_type
+| @variadic_sequence_type
+;
+
+#keyset[id]
+unary_syntax_sugar_types(  //dir=type
+  int id: @unary_syntax_sugar_type ref,
+  int base_type: @type_or_none ref
+);
+
+array_slice_types(  //dir=type
+  unique int id: @array_slice_type
+);
+
+bound_generic_class_types(  //dir=type
+  unique int id: @bound_generic_class_type
+);
+
+bound_generic_enum_types(  //dir=type
+  unique int id: @bound_generic_enum_type
+);
+
+bound_generic_struct_types(  //dir=type
+  unique int id: @bound_generic_struct_type
+);
+
+class_types(  //dir=type
+  unique int id: @class_type
+);
+
+element_archetype_types(  //dir=type
+  unique int id: @element_archetype_type
+);
+
+enum_types(  //dir=type
+  unique int id: @enum_type
+);
+
+existential_archetype_types(  //dir=type
+  unique int id: @existential_archetype_type
+);
+
+optional_types(  //dir=type
+  unique int id: @optional_type
+);
+
+protocol_types(  //dir=type
+  unique int id: @protocol_type
+);
+
+struct_types(  //dir=type
+  unique int id: @struct_type
+);
+
+variadic_sequence_types(  //dir=type
+  unique int id: @variadic_sequence_type
+);
+
+@accessor_or_none =
+  @accessor
+| @unspecified_element
+;
+
+@argument_or_none =
+  @argument
+| @unspecified_element
+;
+
+@associated_type_decl_or_none =
+  @associated_type_decl
+| @unspecified_element
+;
+
+@ast_node_or_none =
+  @ast_node
+| @unspecified_element
+;
+
+@availability_info_or_none =
+  @availability_info
+| @unspecified_element
+;
+
+@availability_spec_or_none =
+  @availability_spec
+| @unspecified_element
+;
+
+@brace_stmt_or_none =
+  @brace_stmt
+| @unspecified_element
+;
+
+@captured_decl_or_none =
+  @captured_decl
+| @unspecified_element
+;
+
+@case_label_item_or_none =
+  @case_label_item
+| @unspecified_element
+;
+
+@case_stmt_or_none =
+  @case_stmt
+| @unspecified_element
+;
+
+@closure_expr_or_none =
+  @closure_expr
+| @unspecified_element
+;
+
+@condition_element_or_none =
+  @condition_element
+| @unspecified_element
+;
+
+@decl_or_none =
+  @decl
+| @unspecified_element
+;
+
+@enum_element_decl_or_none =
+  @enum_element_decl
+| @unspecified_element
+;
+
+@expr_or_none =
+  @expr
+| @unspecified_element
+;
+
+@file_or_none =
+  @file
+| @unspecified_element
+;
+
+@function_or_none =
+  @function
+| @unspecified_element
+;
+
+@generic_type_decl_or_none =
+  @generic_type_decl
+| @unspecified_element
+;
+
+@generic_type_param_decl_or_none =
+  @generic_type_param_decl
+| @unspecified_element
+;
+
+@generic_type_param_type_or_none =
+  @generic_type_param_type
+| @unspecified_element
+;
+
+@initializer_or_none =
+  @initializer
+| @unspecified_element
+;
+
+@key_path_component_or_none =
+  @key_path_component
+| @unspecified_element
+;
+
+@location_or_none =
+  @location
+| @unspecified_element
+;
+
+@macro_role_or_none =
+  @macro_role
+| @unspecified_element
+;
+
+@module_decl_or_none =
+  @module_decl
+| @unspecified_element
+;
+
+@nominal_type_decl_or_none =
+  @nominal_type_decl
+| @unspecified_element
+;
+
+@opaque_type_decl_or_none =
+  @opaque_type_decl
+| @unspecified_element
+;
+
+@opaque_value_expr_or_none =
+  @opaque_value_expr
+| @unspecified_element
+;
+
+@param_decl_or_none =
+  @param_decl
+| @unspecified_element
+;
+
+@pattern_or_none =
+  @pattern
+| @unspecified_element
+;
+
+@pattern_binding_decl_or_none =
+  @pattern_binding_decl
+| @unspecified_element
+;
+
+@precedence_group_decl_or_none =
+  @precedence_group_decl
+| @unspecified_element
+;
+
+@protocol_decl_or_none =
+  @protocol_decl
+| @unspecified_element
+;
+
+@protocol_type_or_none =
+  @protocol_type
+| @unspecified_element
+;
+
+@stmt_or_none =
+  @stmt
+| @unspecified_element
+;
+
+@stmt_condition_or_none =
+  @stmt_condition
+| @unspecified_element
+;
+
+@string_literal_expr_or_none =
+  @string_literal_expr
+| @unspecified_element
+;
+
+@tap_expr_or_none =
+  @tap_expr
+| @unspecified_element
+;
+
+@type_or_none =
+  @type
+| @unspecified_element
+;
+
+@type_alias_decl_or_none =
+  @type_alias_decl
+| @unspecified_element
+;
+
+@type_repr_or_none =
+  @type_repr
+| @unspecified_element
+;
+
+@value_decl_or_none =
+  @unspecified_element
+| @value_decl
+;
+
+@var_decl_or_none =
+  @unspecified_element
+| @var_decl
+;
diff --git a/swift/downgrades/33e5e5e03bd3f98322f4c67aefa81015be832b88/swift.dbscheme b/swift/downgrades/33e5e5e03bd3f98322f4c67aefa81015be832b88/swift.dbscheme
new file mode 100644
index 00000000000..b7006eaacb0
--- /dev/null
+++ b/swift/downgrades/33e5e5e03bd3f98322f4c67aefa81015be832b88/swift.dbscheme
@@ -0,0 +1,2838 @@
+// generated by codegen/codegen.py, do not edit
+
+// from prefix.dbscheme
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(
+  string prefix: string ref
+);
+
+
+// from schema.py
+
+@element =
+  @file
+| @generic_context
+| @locatable
+| @location
+| @type
+;
+
+#keyset[id]
+element_is_unknown(
+  int id: @element ref
+);
+
+@file =
+  @db_file
+;
+
+#keyset[id]
+files(
+  int id: @file ref,
+  string name: string ref
+);
+
+#keyset[id]
+file_is_successfully_extracted(
+  int id: @file ref
+);
+
+@locatable =
+  @argument
+| @ast_node
+| @comment
+| @diagnostics
+| @error_element
+;
+
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_or_none ref
+);
+
+@location =
+  @db_location
+;
+
+#keyset[id]
+locations(
+  int id: @location ref,
+  int file: @file_or_none ref,
+  int start_line: int ref,
+  int start_column: int ref,
+  int end_line: int ref,
+  int end_column: int ref
+);
+
+@ast_node =
+  @availability_info
+| @availability_spec
+| @callable
+| @case_label_item
+| @condition_element
+| @decl
+| @expr
+| @key_path_component
+| @macro_role
+| @pattern
+| @stmt
+| @stmt_condition
+| @type_repr
+;
+
+comments(
+  unique int id: @comment,
+  string text: string ref
+);
+
+db_files(
+  unique int id: @db_file
+);
+
+db_locations(
+  unique int id: @db_location
+);
+
+diagnostics(
+  unique int id: @diagnostics,
+  string text: string ref,
+  int kind: int ref
+);
+
+@error_element =
+  @error_expr
+| @error_type
+| @overloaded_decl_ref_expr
+| @unresolved_decl_ref_expr
+| @unresolved_dot_expr
+| @unresolved_member_chain_result_expr
+| @unresolved_member_expr
+| @unresolved_pattern_expr
+| @unresolved_specialize_expr
+| @unresolved_type
+| @unresolved_type_conversion_expr
+| @unspecified_element
+;
+
+availability_infos(
+  unique int id: @availability_info
+);
+
+#keyset[id]
+availability_info_is_unavailable(
+  int id: @availability_info ref
+);
+
+#keyset[id, index]
+availability_info_specs(
+  int id: @availability_info ref,
+  int index: int ref,
+  int spec: @availability_spec_or_none ref
+);
+
+availability_specs(
+  unique int id: @availability_spec
+);
+
+#keyset[id]
+availability_spec_platforms(
+  int id: @availability_spec ref,
+  string platform: string ref
+);
+
+#keyset[id]
+availability_spec_versions(
+  int id: @availability_spec ref,
+  string version: string ref
+);
+
+#keyset[id]
+availability_spec_is_wildcard(
+  int id: @availability_spec ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_names(
+  int id: @callable ref,
+  string name: string ref
+);
+
+#keyset[id]
+callable_self_params(
+  int id: @callable ref,
+  int self_param: @param_decl_or_none ref
+);
+
+#keyset[id, index]
+callable_params(
+  int id: @callable ref,
+  int index: int ref,
+  int param: @param_decl_or_none ref
+);
+
+#keyset[id]
+callable_bodies(
+  int id: @callable ref,
+  int body: @brace_stmt_or_none ref
+);
+
+#keyset[id, index]
+callable_captures(
+  int id: @callable ref,
+  int index: int ref,
+  int capture: @captured_decl_or_none ref
+);
+
+key_path_components(
+  unique int id: @key_path_component,
+  int kind: int ref,
+  int component_type: @type_or_none ref
+);
+
+#keyset[id, index]
+key_path_component_subscript_arguments(
+  int id: @key_path_component ref,
+  int index: int ref,
+  int subscript_argument: @argument_or_none ref
+);
+
+#keyset[id]
+key_path_component_tuple_indices(
+  int id: @key_path_component ref,
+  int tuple_index: int ref
+);
+
+#keyset[id]
+key_path_component_decl_refs(
+  int id: @key_path_component ref,
+  int decl_ref: @value_decl_or_none ref
+);
+
+macro_roles(
+  unique int id: @macro_role,
+  int kind: int ref,
+  int macro_syntax: int ref
+);
+
+#keyset[id, index]
+macro_role_conformances(
+  int id: @macro_role ref,
+  int index: int ref,
+  int conformance: @expr_or_none ref
+);
+
+#keyset[id, index]
+macro_role_names(
+  int id: @macro_role ref,
+  int index: int ref,
+  string name: string ref
+);
+
+unspecified_elements(
+  unique int id: @unspecified_element,
+  string property: string ref,
+  string error: string ref
+);
+
+#keyset[id]
+unspecified_element_parents(
+  int id: @unspecified_element ref,
+  int parent: @element ref
+);
+
+#keyset[id]
+unspecified_element_indices(
+  int id: @unspecified_element ref,
+  int index: int ref
+);
+
+#keyset[id, index]
+unspecified_element_children(
+  int id: @unspecified_element ref,
+  int index: int ref,
+  int child: @ast_node_or_none ref
+);
+
+@decl =
+  @captured_decl
+| @enum_case_decl
+| @extension_decl
+| @if_config_decl
+| @import_decl
+| @missing_member_decl
+| @operator_decl
+| @pattern_binding_decl
+| @pound_diagnostic_decl
+| @precedence_group_decl
+| @top_level_code_decl
+| @value_decl
+;
+
+#keyset[id]
+decls(  //dir=decl
+  int id: @decl ref,
+  int module: @module_decl_or_none ref
+);
+
+#keyset[id, index]
+decl_members(  //dir=decl
+  int id: @decl ref,
+  int index: int ref,
+  int member: @decl_or_none ref
+);
+
+@generic_context =
+  @extension_decl
+| @function
+| @generic_type_decl
+| @macro_decl
+| @subscript_decl
+;
+
+#keyset[id, index]
+generic_context_generic_type_params(  //dir=decl
+  int id: @generic_context ref,
+  int index: int ref,
+  int generic_type_param: @generic_type_param_decl_or_none ref
+);
+
+captured_decls(  //dir=decl
+  unique int id: @captured_decl,
+  int decl: @value_decl_or_none ref
+);
+
+#keyset[id]
+captured_decl_is_direct(  //dir=decl
+  int id: @captured_decl ref
+);
+
+#keyset[id]
+captured_decl_is_escaping(  //dir=decl
+  int id: @captured_decl ref
+);
+
+enum_case_decls(  //dir=decl
+  unique int id: @enum_case_decl
+);
+
+#keyset[id, index]
+enum_case_decl_elements(  //dir=decl
+  int id: @enum_case_decl ref,
+  int index: int ref,
+  int element: @enum_element_decl_or_none ref
+);
+
+extension_decls(  //dir=decl
+  unique int id: @extension_decl,
+  int extended_type_decl: @nominal_type_decl_or_none ref
+);
+
+#keyset[id, index]
+extension_decl_protocols(  //dir=decl
+  int id: @extension_decl ref,
+  int index: int ref,
+  int protocol: @protocol_decl_or_none ref
+);
+
+if_config_decls(  //dir=decl
+  unique int id: @if_config_decl
+);
+
+#keyset[id, index]
+if_config_decl_active_elements(  //dir=decl
+  int id: @if_config_decl ref,
+  int index: int ref,
+  int active_element: @ast_node_or_none ref
+);
+
+import_decls(  //dir=decl
+  unique int id: @import_decl
+);
+
+#keyset[id]
+import_decl_is_exported(  //dir=decl
+  int id: @import_decl ref
+);
+
+#keyset[id]
+import_decl_imported_modules(  //dir=decl
+  int id: @import_decl ref,
+  int imported_module: @module_decl_or_none ref
+);
+
+#keyset[id, index]
+import_decl_declarations(  //dir=decl
+  int id: @import_decl ref,
+  int index: int ref,
+  int declaration: @value_decl_or_none ref
+);
+
+missing_member_decls(  //dir=decl
+  unique int id: @missing_member_decl,
+  string name: string ref
+);
+
+@operator_decl =
+  @infix_operator_decl
+| @postfix_operator_decl
+| @prefix_operator_decl
+;
+
+#keyset[id]
+operator_decls(  //dir=decl
+  int id: @operator_decl ref,
+  string name: string ref
+);
+
+pattern_binding_decls(  //dir=decl
+  unique int id: @pattern_binding_decl
+);
+
+#keyset[id, index]
+pattern_binding_decl_inits(  //dir=decl
+  int id: @pattern_binding_decl ref,
+  int index: int ref,
+  int init: @expr_or_none ref
+);
+
+#keyset[id, index]
+pattern_binding_decl_patterns(  //dir=decl
+  int id: @pattern_binding_decl ref,
+  int index: int ref,
+  int pattern: @pattern_or_none ref
+);
+
+pound_diagnostic_decls(  //dir=decl
+  unique int id: @pound_diagnostic_decl,
+  int kind: int ref,
+  int message: @string_literal_expr_or_none ref
+);
+
+precedence_group_decls(  //dir=decl
+  unique int id: @precedence_group_decl
+);
+
+top_level_code_decls(  //dir=decl
+  unique int id: @top_level_code_decl,
+  int body: @brace_stmt_or_none ref
+);
+
+@value_decl =
+  @abstract_storage_decl
+| @enum_element_decl
+| @function
+| @macro_decl
+| @type_decl
+;
+
+#keyset[id]
+value_decls(  //dir=decl
+  int id: @value_decl ref,
+  int interface_type: @type_or_none ref
+);
+
+@abstract_storage_decl =
+  @subscript_decl
+| @var_decl
+;
+
+#keyset[id, index]
+abstract_storage_decl_accessors(  //dir=decl
+  int id: @abstract_storage_decl ref,
+  int index: int ref,
+  int accessor: @accessor_or_none ref
+);
+
+enum_element_decls(  //dir=decl
+  unique int id: @enum_element_decl,
+  string name: string ref
+);
+
+#keyset[id, index]
+enum_element_decl_params(  //dir=decl
+  int id: @enum_element_decl ref,
+  int index: int ref,
+  int param: @param_decl_or_none ref
+);
+
+@function =
+  @accessor_or_named_function
+| @deinitializer
+| @initializer
+;
+
+infix_operator_decls(  //dir=decl
+  unique int id: @infix_operator_decl
+);
+
+#keyset[id]
+infix_operator_decl_precedence_groups(  //dir=decl
+  int id: @infix_operator_decl ref,
+  int precedence_group: @precedence_group_decl_or_none ref
+);
+
+macro_decls(  //dir=decl
+  unique int id: @macro_decl,
+  string name: string ref
+);
+
+#keyset[id, index]
+macro_decl_parameters(  //dir=decl
+  int id: @macro_decl ref,
+  int index: int ref,
+  int parameter: @param_decl_or_none ref
+);
+
+#keyset[id, index]
+macro_decl_roles(  //dir=decl
+  int id: @macro_decl ref,
+  int index: int ref,
+  int role: @macro_role_or_none ref
+);
+
+postfix_operator_decls(  //dir=decl
+  unique int id: @postfix_operator_decl
+);
+
+prefix_operator_decls(  //dir=decl
+  unique int id: @prefix_operator_decl
+);
+
+@type_decl =
+  @abstract_type_param_decl
+| @generic_type_decl
+| @module_decl
+;
+
+#keyset[id]
+type_decls(  //dir=decl
+  int id: @type_decl ref,
+  string name: string ref
+);
+
+#keyset[id, index]
+type_decl_inherited_types(  //dir=decl
+  int id: @type_decl ref,
+  int index: int ref,
+  int inherited_type: @type_or_none ref
+);
+
+@abstract_type_param_decl =
+  @associated_type_decl
+| @generic_type_param_decl
+;
+
+@accessor_or_named_function =
+  @accessor
+| @named_function
+;
+
+deinitializers(  //dir=decl
+  unique int id: @deinitializer
+);
+
+@generic_type_decl =
+  @nominal_type_decl
+| @opaque_type_decl
+| @type_alias_decl
+;
+
+initializers(  //dir=decl
+  unique int id: @initializer
+);
+
+module_decls(  //dir=decl
+  unique int id: @module_decl
+);
+
+#keyset[id]
+module_decl_is_builtin_module(  //dir=decl
+  int id: @module_decl ref
+);
+
+#keyset[id]
+module_decl_is_system_module(  //dir=decl
+  int id: @module_decl ref
+);
+
+module_decl_imported_modules(  //dir=decl
+  int id: @module_decl ref,
+  int imported_module: @module_decl_or_none ref
+);
+
+module_decl_exported_modules(  //dir=decl
+  int id: @module_decl ref,
+  int exported_module: @module_decl_or_none ref
+);
+
+subscript_decls(  //dir=decl
+  unique int id: @subscript_decl,
+  int element_type: @type_or_none ref
+);
+
+#keyset[id, index]
+subscript_decl_params(  //dir=decl
+  int id: @subscript_decl ref,
+  int index: int ref,
+  int param: @param_decl_or_none ref
+);
+
+@var_decl =
+  @concrete_var_decl
+| @param_decl
+;
+
+#keyset[id]
+var_decls(  //dir=decl
+  int id: @var_decl ref,
+  string name: string ref,
+  int type_: @type_or_none ref
+);
+
+#keyset[id]
+var_decl_attached_property_wrapper_types(  //dir=decl
+  int id: @var_decl ref,
+  int attached_property_wrapper_type: @type_or_none ref
+);
+
+#keyset[id]
+var_decl_parent_patterns(  //dir=decl
+  int id: @var_decl ref,
+  int parent_pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+var_decl_parent_initializers(  //dir=decl
+  int id: @var_decl ref,
+  int parent_initializer: @expr_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_backing_var_bindings(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_backing_var_binding: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_backing_vars(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_backing_var: @var_decl_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_projection_var_bindings(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_projection_var_binding: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_projection_vars(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_projection_var: @var_decl_or_none ref
+);
+
+accessors(  //dir=decl
+  unique int id: @accessor
+);
+
+#keyset[id]
+accessor_is_getter(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_setter(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_will_set(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_did_set(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_read(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_modify(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_unsafe_address(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_unsafe_mutable_address(  //dir=decl
+  int id: @accessor ref
+);
+
+associated_type_decls(  //dir=decl
+  unique int id: @associated_type_decl
+);
+
+concrete_var_decls(  //dir=decl
+  unique int id: @concrete_var_decl,
+  int introducer_int: int ref
+);
+
+generic_type_param_decls(  //dir=decl
+  unique int id: @generic_type_param_decl
+);
+
+named_functions(  //dir=decl
+  unique int id: @named_function
+);
+
+@nominal_type_decl =
+  @class_decl
+| @enum_decl
+| @protocol_decl
+| @struct_decl
+;
+
+#keyset[id]
+nominal_type_decls(  //dir=decl
+  int id: @nominal_type_decl ref,
+  int type_: @type_or_none ref
+);
+
+opaque_type_decls(  //dir=decl
+  unique int id: @opaque_type_decl,
+  int naming_declaration: @value_decl_or_none ref
+);
+
+#keyset[id, index]
+opaque_type_decl_opaque_generic_params(  //dir=decl
+  int id: @opaque_type_decl ref,
+  int index: int ref,
+  int opaque_generic_param: @generic_type_param_type_or_none ref
+);
+
+param_decls(  //dir=decl
+  unique int id: @param_decl
+);
+
+#keyset[id]
+param_decl_is_inout(  //dir=decl
+  int id: @param_decl ref
+);
+
+#keyset[id]
+param_decl_property_wrapper_local_wrapped_var_bindings(  //dir=decl
+  int id: @param_decl ref,
+  int property_wrapper_local_wrapped_var_binding: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+param_decl_property_wrapper_local_wrapped_vars(  //dir=decl
+  int id: @param_decl ref,
+  int property_wrapper_local_wrapped_var: @var_decl_or_none ref
+);
+
+type_alias_decls(  //dir=decl
+  unique int id: @type_alias_decl,
+  int aliased_type: @type_or_none ref
+);
+
+class_decls(  //dir=decl
+  unique int id: @class_decl
+);
+
+enum_decls(  //dir=decl
+  unique int id: @enum_decl
+);
+
+protocol_decls(  //dir=decl
+  unique int id: @protocol_decl
+);
+
+struct_decls(  //dir=decl
+  unique int id: @struct_decl
+);
+
+arguments(  //dir=expr
+  unique int id: @argument,
+  string label: string ref,
+  int expr: @expr_or_none ref
+);
+
+@expr =
+  @any_try_expr
+| @applied_property_wrapper_expr
+| @apply_expr
+| @assign_expr
+| @bind_optional_expr
+| @capture_list_expr
+| @closure_expr
+| @collection_expr
+| @consume_expr
+| @copy_expr
+| @current_context_isolation_expr
+| @decl_ref_expr
+| @default_argument_expr
+| @discard_assignment_expr
+| @dot_syntax_base_ignored_expr
+| @dynamic_type_expr
+| @enum_is_case_expr
+| @error_expr
+| @explicit_cast_expr
+| @extract_function_isolation_expr
+| @force_value_expr
+| @identity_expr
+| @if_expr
+| @implicit_conversion_expr
+| @in_out_expr
+| @key_path_application_expr
+| @key_path_dot_expr
+| @key_path_expr
+| @lazy_initialization_expr
+| @literal_expr
+| @lookup_expr
+| @make_temporarily_escapable_expr
+| @materialize_pack_expr
+| @obj_c_selector_expr
+| @one_way_expr
+| @opaque_value_expr
+| @open_existential_expr
+| @optional_evaluation_expr
+| @other_initializer_ref_expr
+| @overloaded_decl_ref_expr
+| @pack_element_expr
+| @pack_expansion_expr
+| @property_wrapper_value_placeholder_expr
+| @rebind_self_in_initializer_expr
+| @sequence_expr
+| @single_value_stmt_expr
+| @super_ref_expr
+| @tap_expr
+| @tuple_element_expr
+| @tuple_expr
+| @type_expr
+| @type_value_expr
+| @unresolved_decl_ref_expr
+| @unresolved_dot_expr
+| @unresolved_member_expr
+| @unresolved_pattern_expr
+| @unresolved_specialize_expr
+| @vararg_expansion_expr
+;
+
+#keyset[id]
+expr_types(  //dir=expr
+  int id: @expr ref,
+  int type_: @type_or_none ref
+);
+
+@any_try_expr =
+  @force_try_expr
+| @optional_try_expr
+| @try_expr
+;
+
+#keyset[id]
+any_try_exprs(  //dir=expr
+  int id: @any_try_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+applied_property_wrapper_exprs(  //dir=expr
+  unique int id: @applied_property_wrapper_expr,
+  int kind: int ref,
+  int value: @expr_or_none ref,
+  int param: @param_decl_or_none ref
+);
+
+@apply_expr =
+  @binary_expr
+| @call_expr
+| @postfix_unary_expr
+| @prefix_unary_expr
+| @self_apply_expr
+;
+
+#keyset[id]
+apply_exprs(  //dir=expr
+  int id: @apply_expr ref,
+  int function: @expr_or_none ref
+);
+
+#keyset[id, index]
+apply_expr_arguments(  //dir=expr
+  int id: @apply_expr ref,
+  int index: int ref,
+  int argument: @argument_or_none ref
+);
+
+assign_exprs(  //dir=expr
+  unique int id: @assign_expr,
+  int dest: @expr_or_none ref,
+  int source: @expr_or_none ref
+);
+
+bind_optional_exprs(  //dir=expr
+  unique int id: @bind_optional_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+capture_list_exprs(  //dir=expr
+  unique int id: @capture_list_expr,
+  int closure_body: @closure_expr_or_none ref
+);
+
+#keyset[id, index]
+capture_list_expr_binding_decls(  //dir=expr
+  int id: @capture_list_expr ref,
+  int index: int ref,
+  int binding_decl: @pattern_binding_decl_or_none ref
+);
+
+@closure_expr =
+  @auto_closure_expr
+| @explicit_closure_expr
+;
+
+@collection_expr =
+  @array_expr
+| @dictionary_expr
+;
+
+consume_exprs(  //dir=expr
+  unique int id: @consume_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+copy_exprs(  //dir=expr
+  unique int id: @copy_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+current_context_isolation_exprs(  //dir=expr
+  unique int id: @current_context_isolation_expr,
+  int actor: @expr_or_none ref
+);
+
+decl_ref_exprs(  //dir=expr
+  unique int id: @decl_ref_expr,
+  int decl: @decl_or_none ref
+);
+
+#keyset[id, index]
+decl_ref_expr_replacement_types(  //dir=expr
+  int id: @decl_ref_expr ref,
+  int index: int ref,
+  int replacement_type: @type_or_none ref
+);
+
+#keyset[id]
+decl_ref_expr_has_direct_to_storage_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+#keyset[id]
+decl_ref_expr_has_direct_to_implementation_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+#keyset[id]
+decl_ref_expr_has_ordinary_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+#keyset[id]
+decl_ref_expr_has_distributed_thunk_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+default_argument_exprs(  //dir=expr
+  unique int id: @default_argument_expr,
+  int param_decl: @param_decl_or_none ref,
+  int param_index: int ref
+);
+
+#keyset[id]
+default_argument_expr_caller_side_defaults(  //dir=expr
+  int id: @default_argument_expr ref,
+  int caller_side_default: @expr_or_none ref
+);
+
+discard_assignment_exprs(  //dir=expr
+  unique int id: @discard_assignment_expr
+);
+
+dot_syntax_base_ignored_exprs(  //dir=expr
+  unique int id: @dot_syntax_base_ignored_expr,
+  int qualifier: @expr_or_none ref,
+  int sub_expr: @expr_or_none ref
+);
+
+dynamic_type_exprs(  //dir=expr
+  unique int id: @dynamic_type_expr,
+  int base: @expr_or_none ref
+);
+
+enum_is_case_exprs(  //dir=expr
+  unique int id: @enum_is_case_expr,
+  int sub_expr: @expr_or_none ref,
+  int element: @enum_element_decl_or_none ref
+);
+
+error_exprs(  //dir=expr
+  unique int id: @error_expr
+);
+
+@explicit_cast_expr =
+  @checked_cast_expr
+| @coerce_expr
+;
+
+#keyset[id]
+explicit_cast_exprs(  //dir=expr
+  int id: @explicit_cast_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+extract_function_isolation_exprs(  //dir=expr
+  unique int id: @extract_function_isolation_expr,
+  int function_expr: @expr_or_none ref
+);
+
+force_value_exprs(  //dir=expr
+  unique int id: @force_value_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+@identity_expr =
+  @await_expr
+| @borrow_expr
+| @dot_self_expr
+| @paren_expr
+| @unresolved_member_chain_result_expr
+;
+
+#keyset[id]
+identity_exprs(  //dir=expr
+  int id: @identity_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+if_exprs(  //dir=expr
+  unique int id: @if_expr,
+  int condition: @expr_or_none ref,
+  int then_expr: @expr_or_none ref,
+  int else_expr: @expr_or_none ref
+);
+
+@implicit_conversion_expr =
+  @abi_safe_conversion_expr
+| @actor_isolation_erasure_expr
+| @any_hashable_erasure_expr
+| @archetype_to_super_expr
+| @array_to_pointer_expr
+| @bridge_from_obj_c_expr
+| @bridge_to_obj_c_expr
+| @class_metatype_to_object_expr
+| @collection_upcast_conversion_expr
+| @conditional_bridge_from_obj_c_expr
+| @covariant_function_conversion_expr
+| @covariant_return_conversion_expr
+| @derived_to_base_expr
+| @destructure_tuple_expr
+| @differentiable_function_expr
+| @differentiable_function_extract_original_expr
+| @erasure_expr
+| @existential_metatype_to_object_expr
+| @foreign_object_conversion_expr
+| @function_conversion_expr
+| @in_out_to_pointer_expr
+| @inject_into_optional_expr
+| @linear_function_expr
+| @linear_function_extract_original_expr
+| @linear_to_differentiable_function_expr
+| @load_expr
+| @metatype_conversion_expr
+| @pointer_to_pointer_expr
+| @protocol_metatype_to_object_expr
+| @string_to_pointer_expr
+| @underlying_to_opaque_expr
+| @unevaluated_instance_expr
+| @unreachable_expr
+| @unresolved_type_conversion_expr
+| @unsafe_cast_expr
+;
+
+#keyset[id]
+implicit_conversion_exprs(  //dir=expr
+  int id: @implicit_conversion_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+in_out_exprs(  //dir=expr
+  unique int id: @in_out_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+key_path_application_exprs(  //dir=expr
+  unique int id: @key_path_application_expr,
+  int base: @expr_or_none ref,
+  int key_path: @expr_or_none ref
+);
+
+key_path_dot_exprs(  //dir=expr
+  unique int id: @key_path_dot_expr
+);
+
+key_path_exprs(  //dir=expr
+  unique int id: @key_path_expr
+);
+
+#keyset[id]
+key_path_expr_roots(  //dir=expr
+  int id: @key_path_expr ref,
+  int root: @type_repr_or_none ref
+);
+
+#keyset[id, index]
+key_path_expr_components(  //dir=expr
+  int id: @key_path_expr ref,
+  int index: int ref,
+  int component: @key_path_component_or_none ref
+);
+
+lazy_initialization_exprs(  //dir=expr
+  unique int id: @lazy_initialization_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+@literal_expr =
+  @builtin_literal_expr
+| @interpolated_string_literal_expr
+| @nil_literal_expr
+| @object_literal_expr
+| @regex_literal_expr
+;
+
+@lookup_expr =
+  @dynamic_lookup_expr
+| @member_ref_expr
+| @subscript_expr
+;
+
+#keyset[id]
+lookup_exprs(  //dir=expr
+  int id: @lookup_expr ref,
+  int base: @expr_or_none ref
+);
+
+#keyset[id]
+lookup_expr_members(  //dir=expr
+  int id: @lookup_expr ref,
+  int member: @decl_or_none ref
+);
+
+make_temporarily_escapable_exprs(  //dir=expr
+  unique int id: @make_temporarily_escapable_expr,
+  int escaping_closure: @opaque_value_expr_or_none ref,
+  int nonescaping_closure: @expr_or_none ref,
+  int sub_expr: @expr_or_none ref
+);
+
+materialize_pack_exprs(  //dir=expr
+  unique int id: @materialize_pack_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+obj_c_selector_exprs(  //dir=expr
+  unique int id: @obj_c_selector_expr,
+  int sub_expr: @expr_or_none ref,
+  int method: @function_or_none ref
+);
+
+one_way_exprs(  //dir=expr
+  unique int id: @one_way_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+opaque_value_exprs(  //dir=expr
+  unique int id: @opaque_value_expr
+);
+
+open_existential_exprs(  //dir=expr
+  unique int id: @open_existential_expr,
+  int sub_expr: @expr_or_none ref,
+  int existential: @expr_or_none ref,
+  int opaque_expr: @opaque_value_expr_or_none ref
+);
+
+optional_evaluation_exprs(  //dir=expr
+  unique int id: @optional_evaluation_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+other_initializer_ref_exprs(  //dir=expr
+  unique int id: @other_initializer_ref_expr,
+  int initializer: @initializer_or_none ref
+);
+
+overloaded_decl_ref_exprs(  //dir=expr
+  unique int id: @overloaded_decl_ref_expr
+);
+
+#keyset[id, index]
+overloaded_decl_ref_expr_possible_declarations(  //dir=expr
+  int id: @overloaded_decl_ref_expr ref,
+  int index: int ref,
+  int possible_declaration: @value_decl_or_none ref
+);
+
+pack_element_exprs(  //dir=expr
+  unique int id: @pack_element_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+pack_expansion_exprs(  //dir=expr
+  unique int id: @pack_expansion_expr,
+  int pattern_expr: @expr_or_none ref
+);
+
+property_wrapper_value_placeholder_exprs(  //dir=expr
+  unique int id: @property_wrapper_value_placeholder_expr,
+  int placeholder: @opaque_value_expr_or_none ref
+);
+
+#keyset[id]
+property_wrapper_value_placeholder_expr_wrapped_values(  //dir=expr
+  int id: @property_wrapper_value_placeholder_expr ref,
+  int wrapped_value: @expr_or_none ref
+);
+
+rebind_self_in_initializer_exprs(  //dir=expr
+  unique int id: @rebind_self_in_initializer_expr,
+  int sub_expr: @expr_or_none ref,
+  int self: @var_decl_or_none ref
+);
+
+sequence_exprs(  //dir=expr
+  unique int id: @sequence_expr
+);
+
+#keyset[id, index]
+sequence_expr_elements(  //dir=expr
+  int id: @sequence_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+single_value_stmt_exprs(  //dir=expr
+  unique int id: @single_value_stmt_expr,
+  int stmt: @stmt_or_none ref
+);
+
+super_ref_exprs(  //dir=expr
+  unique int id: @super_ref_expr,
+  int self: @var_decl_or_none ref
+);
+
+tap_exprs(  //dir=expr
+  unique int id: @tap_expr,
+  int body: @brace_stmt_or_none ref,
+  int var: @var_decl_or_none ref
+);
+
+#keyset[id]
+tap_expr_sub_exprs(  //dir=expr
+  int id: @tap_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+tuple_element_exprs(  //dir=expr
+  unique int id: @tuple_element_expr,
+  int sub_expr: @expr_or_none ref,
+  int index: int ref
+);
+
+tuple_exprs(  //dir=expr
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_elements(  //dir=expr
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+type_exprs(  //dir=expr
+  unique int id: @type_expr
+);
+
+#keyset[id]
+type_expr_type_reprs(  //dir=expr
+  int id: @type_expr ref,
+  int type_repr: @type_repr_or_none ref
+);
+
+type_value_exprs(  //dir=expr
+  unique int id: @type_value_expr,
+  int type_repr: @type_repr_or_none ref
+);
+
+unresolved_decl_ref_exprs(  //dir=expr
+  unique int id: @unresolved_decl_ref_expr
+);
+
+#keyset[id]
+unresolved_decl_ref_expr_names(  //dir=expr
+  int id: @unresolved_decl_ref_expr ref,
+  string name: string ref
+);
+
+unresolved_dot_exprs(  //dir=expr
+  unique int id: @unresolved_dot_expr,
+  int base: @expr_or_none ref,
+  string name: string ref
+);
+
+unresolved_member_exprs(  //dir=expr
+  unique int id: @unresolved_member_expr,
+  string name: string ref
+);
+
+unresolved_pattern_exprs(  //dir=expr
+  unique int id: @unresolved_pattern_expr,
+  int sub_pattern: @pattern_or_none ref
+);
+
+unresolved_specialize_exprs(  //dir=expr
+  unique int id: @unresolved_specialize_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+vararg_expansion_exprs(  //dir=expr
+  unique int id: @vararg_expansion_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+abi_safe_conversion_exprs(  //dir=expr
+  unique int id: @abi_safe_conversion_expr
+);
+
+actor_isolation_erasure_exprs(  //dir=expr
+  unique int id: @actor_isolation_erasure_expr
+);
+
+any_hashable_erasure_exprs(  //dir=expr
+  unique int id: @any_hashable_erasure_expr
+);
+
+archetype_to_super_exprs(  //dir=expr
+  unique int id: @archetype_to_super_expr
+);
+
+array_exprs(  //dir=expr
+  unique int id: @array_expr
+);
+
+#keyset[id, index]
+array_expr_elements(  //dir=expr
+  int id: @array_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+array_to_pointer_exprs(  //dir=expr
+  unique int id: @array_to_pointer_expr
+);
+
+auto_closure_exprs(  //dir=expr
+  unique int id: @auto_closure_expr
+);
+
+await_exprs(  //dir=expr
+  unique int id: @await_expr
+);
+
+binary_exprs(  //dir=expr
+  unique int id: @binary_expr
+);
+
+borrow_exprs(  //dir=expr
+  unique int id: @borrow_expr
+);
+
+bridge_from_obj_c_exprs(  //dir=expr
+  unique int id: @bridge_from_obj_c_expr
+);
+
+bridge_to_obj_c_exprs(  //dir=expr
+  unique int id: @bridge_to_obj_c_expr
+);
+
+@builtin_literal_expr =
+  @boolean_literal_expr
+| @magic_identifier_literal_expr
+| @number_literal_expr
+| @string_literal_expr
+;
+
+call_exprs(  //dir=expr
+  unique int id: @call_expr
+);
+
+@checked_cast_expr =
+  @conditional_checked_cast_expr
+| @forced_checked_cast_expr
+| @is_expr
+;
+
+class_metatype_to_object_exprs(  //dir=expr
+  unique int id: @class_metatype_to_object_expr
+);
+
+coerce_exprs(  //dir=expr
+  unique int id: @coerce_expr
+);
+
+collection_upcast_conversion_exprs(  //dir=expr
+  unique int id: @collection_upcast_conversion_expr
+);
+
+conditional_bridge_from_obj_c_exprs(  //dir=expr
+  unique int id: @conditional_bridge_from_obj_c_expr
+);
+
+covariant_function_conversion_exprs(  //dir=expr
+  unique int id: @covariant_function_conversion_expr
+);
+
+covariant_return_conversion_exprs(  //dir=expr
+  unique int id: @covariant_return_conversion_expr
+);
+
+derived_to_base_exprs(  //dir=expr
+  unique int id: @derived_to_base_expr
+);
+
+destructure_tuple_exprs(  //dir=expr
+  unique int id: @destructure_tuple_expr
+);
+
+dictionary_exprs(  //dir=expr
+  unique int id: @dictionary_expr
+);
+
+#keyset[id, index]
+dictionary_expr_elements(  //dir=expr
+  int id: @dictionary_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+differentiable_function_exprs(  //dir=expr
+  unique int id: @differentiable_function_expr
+);
+
+differentiable_function_extract_original_exprs(  //dir=expr
+  unique int id: @differentiable_function_extract_original_expr
+);
+
+dot_self_exprs(  //dir=expr
+  unique int id: @dot_self_expr
+);
+
+@dynamic_lookup_expr =
+  @dynamic_member_ref_expr
+| @dynamic_subscript_expr
+;
+
+erasure_exprs(  //dir=expr
+  unique int id: @erasure_expr
+);
+
+existential_metatype_to_object_exprs(  //dir=expr
+  unique int id: @existential_metatype_to_object_expr
+);
+
+explicit_closure_exprs(  //dir=expr
+  unique int id: @explicit_closure_expr
+);
+
+force_try_exprs(  //dir=expr
+  unique int id: @force_try_expr
+);
+
+foreign_object_conversion_exprs(  //dir=expr
+  unique int id: @foreign_object_conversion_expr
+);
+
+function_conversion_exprs(  //dir=expr
+  unique int id: @function_conversion_expr
+);
+
+in_out_to_pointer_exprs(  //dir=expr
+  unique int id: @in_out_to_pointer_expr
+);
+
+inject_into_optional_exprs(  //dir=expr
+  unique int id: @inject_into_optional_expr
+);
+
+interpolated_string_literal_exprs(  //dir=expr
+  unique int id: @interpolated_string_literal_expr
+);
+
+#keyset[id]
+interpolated_string_literal_expr_interpolation_exprs(  //dir=expr
+  int id: @interpolated_string_literal_expr ref,
+  int interpolation_expr: @opaque_value_expr_or_none ref
+);
+
+#keyset[id]
+interpolated_string_literal_expr_appending_exprs(  //dir=expr
+  int id: @interpolated_string_literal_expr ref,
+  int appending_expr: @tap_expr_or_none ref
+);
+
+linear_function_exprs(  //dir=expr
+  unique int id: @linear_function_expr
+);
+
+linear_function_extract_original_exprs(  //dir=expr
+  unique int id: @linear_function_extract_original_expr
+);
+
+linear_to_differentiable_function_exprs(  //dir=expr
+  unique int id: @linear_to_differentiable_function_expr
+);
+
+load_exprs(  //dir=expr
+  unique int id: @load_expr
+);
+
+member_ref_exprs(  //dir=expr
+  unique int id: @member_ref_expr
+);
+
+#keyset[id]
+member_ref_expr_has_direct_to_storage_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+#keyset[id]
+member_ref_expr_has_direct_to_implementation_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+#keyset[id]
+member_ref_expr_has_ordinary_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+#keyset[id]
+member_ref_expr_has_distributed_thunk_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+metatype_conversion_exprs(  //dir=expr
+  unique int id: @metatype_conversion_expr
+);
+
+nil_literal_exprs(  //dir=expr
+  unique int id: @nil_literal_expr
+);
+
+object_literal_exprs(  //dir=expr
+  unique int id: @object_literal_expr,
+  int kind: int ref
+);
+
+#keyset[id, index]
+object_literal_expr_arguments(  //dir=expr
+  int id: @object_literal_expr ref,
+  int index: int ref,
+  int argument: @argument_or_none ref
+);
+
+optional_try_exprs(  //dir=expr
+  unique int id: @optional_try_expr
+);
+
+paren_exprs(  //dir=expr
+  unique int id: @paren_expr
+);
+
+pointer_to_pointer_exprs(  //dir=expr
+  unique int id: @pointer_to_pointer_expr
+);
+
+postfix_unary_exprs(  //dir=expr
+  unique int id: @postfix_unary_expr
+);
+
+prefix_unary_exprs(  //dir=expr
+  unique int id: @prefix_unary_expr
+);
+
+protocol_metatype_to_object_exprs(  //dir=expr
+  unique int id: @protocol_metatype_to_object_expr
+);
+
+regex_literal_exprs(  //dir=expr
+  unique int id: @regex_literal_expr,
+  string pattern: string ref,
+  int version: int ref
+);
+
+@self_apply_expr =
+  @dot_syntax_call_expr
+| @initializer_ref_call_expr
+;
+
+#keyset[id]
+self_apply_exprs(  //dir=expr
+  int id: @self_apply_expr ref,
+  int base: @expr_or_none ref
+);
+
+string_to_pointer_exprs(  //dir=expr
+  unique int id: @string_to_pointer_expr
+);
+
+subscript_exprs(  //dir=expr
+  unique int id: @subscript_expr
+);
+
+#keyset[id, index]
+subscript_expr_arguments(  //dir=expr
+  int id: @subscript_expr ref,
+  int index: int ref,
+  int argument: @argument_or_none ref
+);
+
+#keyset[id]
+subscript_expr_has_direct_to_storage_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+#keyset[id]
+subscript_expr_has_direct_to_implementation_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+#keyset[id]
+subscript_expr_has_ordinary_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+#keyset[id]
+subscript_expr_has_distributed_thunk_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+try_exprs(  //dir=expr
+  unique int id: @try_expr
+);
+
+underlying_to_opaque_exprs(  //dir=expr
+  unique int id: @underlying_to_opaque_expr
+);
+
+unevaluated_instance_exprs(  //dir=expr
+  unique int id: @unevaluated_instance_expr
+);
+
+unreachable_exprs(  //dir=expr
+  unique int id: @unreachable_expr
+);
+
+unresolved_member_chain_result_exprs(  //dir=expr
+  unique int id: @unresolved_member_chain_result_expr
+);
+
+unresolved_type_conversion_exprs(  //dir=expr
+  unique int id: @unresolved_type_conversion_expr
+);
+
+unsafe_cast_exprs(  //dir=expr
+  unique int id: @unsafe_cast_expr
+);
+
+boolean_literal_exprs(  //dir=expr
+  unique int id: @boolean_literal_expr,
+  boolean value: boolean ref
+);
+
+conditional_checked_cast_exprs(  //dir=expr
+  unique int id: @conditional_checked_cast_expr
+);
+
+dot_syntax_call_exprs(  //dir=expr
+  unique int id: @dot_syntax_call_expr
+);
+
+dynamic_member_ref_exprs(  //dir=expr
+  unique int id: @dynamic_member_ref_expr
+);
+
+dynamic_subscript_exprs(  //dir=expr
+  unique int id: @dynamic_subscript_expr
+);
+
+forced_checked_cast_exprs(  //dir=expr
+  unique int id: @forced_checked_cast_expr
+);
+
+initializer_ref_call_exprs(  //dir=expr
+  unique int id: @initializer_ref_call_expr
+);
+
+is_exprs(  //dir=expr
+  unique int id: @is_expr
+);
+
+magic_identifier_literal_exprs(  //dir=expr
+  unique int id: @magic_identifier_literal_expr,
+  string kind: string ref
+);
+
+@number_literal_expr =
+  @float_literal_expr
+| @integer_literal_expr
+;
+
+string_literal_exprs(  //dir=expr
+  unique int id: @string_literal_expr,
+  string value: string ref
+);
+
+float_literal_exprs(  //dir=expr
+  unique int id: @float_literal_expr,
+  string string_value: string ref
+);
+
+integer_literal_exprs(  //dir=expr
+  unique int id: @integer_literal_expr,
+  string string_value: string ref
+);
+
+@pattern =
+  @any_pattern
+| @binding_pattern
+| @bool_pattern
+| @enum_element_pattern
+| @expr_pattern
+| @is_pattern
+| @named_pattern
+| @optional_some_pattern
+| @paren_pattern
+| @tuple_pattern
+| @typed_pattern
+;
+
+#keyset[id]
+pattern_types(  //dir=pattern
+  int id: @pattern ref,
+  int type_: @type_or_none ref
+);
+
+any_patterns(  //dir=pattern
+  unique int id: @any_pattern
+);
+
+binding_patterns(  //dir=pattern
+  unique int id: @binding_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+bool_patterns(  //dir=pattern
+  unique int id: @bool_pattern,
+  boolean value: boolean ref
+);
+
+enum_element_patterns(  //dir=pattern
+  unique int id: @enum_element_pattern,
+  int element: @enum_element_decl_or_none ref
+);
+
+#keyset[id]
+enum_element_pattern_sub_patterns(  //dir=pattern
+  int id: @enum_element_pattern ref,
+  int sub_pattern: @pattern_or_none ref
+);
+
+expr_patterns(  //dir=pattern
+  unique int id: @expr_pattern,
+  int sub_expr: @expr_or_none ref
+);
+
+is_patterns(  //dir=pattern
+  unique int id: @is_pattern
+);
+
+#keyset[id]
+is_pattern_cast_type_reprs(  //dir=pattern
+  int id: @is_pattern ref,
+  int cast_type_repr: @type_repr_or_none ref
+);
+
+#keyset[id]
+is_pattern_sub_patterns(  //dir=pattern
+  int id: @is_pattern ref,
+  int sub_pattern: @pattern_or_none ref
+);
+
+named_patterns(  //dir=pattern
+  unique int id: @named_pattern,
+  int var_decl: @var_decl_or_none ref
+);
+
+optional_some_patterns(  //dir=pattern
+  unique int id: @optional_some_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+paren_patterns(  //dir=pattern
+  unique int id: @paren_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+tuple_patterns(  //dir=pattern
+  unique int id: @tuple_pattern
+);
+
+#keyset[id, index]
+tuple_pattern_elements(  //dir=pattern
+  int id: @tuple_pattern ref,
+  int index: int ref,
+  int element: @pattern_or_none ref
+);
+
+typed_patterns(  //dir=pattern
+  unique int id: @typed_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+typed_pattern_type_reprs(  //dir=pattern
+  int id: @typed_pattern ref,
+  int type_repr: @type_repr_or_none ref
+);
+
+case_label_items(  //dir=stmt
+  unique int id: @case_label_item,
+  int pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+case_label_item_guards(  //dir=stmt
+  int id: @case_label_item ref,
+  int guard: @expr_or_none ref
+);
+
+condition_elements(  //dir=stmt
+  unique int id: @condition_element
+);
+
+#keyset[id]
+condition_element_booleans(  //dir=stmt
+  int id: @condition_element ref,
+  int boolean_: @expr_or_none ref
+);
+
+#keyset[id]
+condition_element_patterns(  //dir=stmt
+  int id: @condition_element ref,
+  int pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+condition_element_initializers(  //dir=stmt
+  int id: @condition_element ref,
+  int initializer: @expr_or_none ref
+);
+
+#keyset[id]
+condition_element_availabilities(  //dir=stmt
+  int id: @condition_element ref,
+  int availability: @availability_info_or_none ref
+);
+
+@stmt =
+  @brace_stmt
+| @break_stmt
+| @case_stmt
+| @continue_stmt
+| @defer_stmt
+| @discard_stmt
+| @fail_stmt
+| @fallthrough_stmt
+| @labeled_stmt
+| @pound_assert_stmt
+| @return_stmt
+| @then_stmt
+| @throw_stmt
+| @yield_stmt
+;
+
+stmt_conditions(  //dir=stmt
+  unique int id: @stmt_condition
+);
+
+#keyset[id, index]
+stmt_condition_elements(  //dir=stmt
+  int id: @stmt_condition ref,
+  int index: int ref,
+  int element: @condition_element_or_none ref
+);
+
+brace_stmts(  //dir=stmt
+  unique int id: @brace_stmt
+);
+
+#keyset[id, index]
+brace_stmt_elements(  //dir=stmt
+  int id: @brace_stmt ref,
+  int index: int ref,
+  int element: @ast_node_or_none ref
+);
+
+break_stmts(  //dir=stmt
+  unique int id: @break_stmt
+);
+
+#keyset[id]
+break_stmt_target_names(  //dir=stmt
+  int id: @break_stmt ref,
+  string target_name: string ref
+);
+
+#keyset[id]
+break_stmt_targets(  //dir=stmt
+  int id: @break_stmt ref,
+  int target: @stmt_or_none ref
+);
+
+case_stmts(  //dir=stmt
+  unique int id: @case_stmt,
+  int body: @stmt_or_none ref
+);
+
+#keyset[id, index]
+case_stmt_labels(  //dir=stmt
+  int id: @case_stmt ref,
+  int index: int ref,
+  int label: @case_label_item_or_none ref
+);
+
+#keyset[id, index]
+case_stmt_variables(  //dir=stmt
+  int id: @case_stmt ref,
+  int index: int ref,
+  int variable: @var_decl_or_none ref
+);
+
+continue_stmts(  //dir=stmt
+  unique int id: @continue_stmt
+);
+
+#keyset[id]
+continue_stmt_target_names(  //dir=stmt
+  int id: @continue_stmt ref,
+  string target_name: string ref
+);
+
+#keyset[id]
+continue_stmt_targets(  //dir=stmt
+  int id: @continue_stmt ref,
+  int target: @stmt_or_none ref
+);
+
+defer_stmts(  //dir=stmt
+  unique int id: @defer_stmt,
+  int body: @brace_stmt_or_none ref
+);
+
+discard_stmts(  //dir=stmt
+  unique int id: @discard_stmt,
+  int sub_expr: @expr_or_none ref
+);
+
+fail_stmts(  //dir=stmt
+  unique int id: @fail_stmt
+);
+
+fallthrough_stmts(  //dir=stmt
+  unique int id: @fallthrough_stmt,
+  int fallthrough_source: @case_stmt_or_none ref,
+  int fallthrough_dest: @case_stmt_or_none ref
+);
+
+@labeled_stmt =
+  @do_catch_stmt
+| @do_stmt
+| @for_each_stmt
+| @labeled_conditional_stmt
+| @repeat_while_stmt
+| @switch_stmt
+;
+
+#keyset[id]
+labeled_stmt_labels(  //dir=stmt
+  int id: @labeled_stmt ref,
+  string label: string ref
+);
+
+pound_assert_stmts(  //dir=stmt
+  unique int id: @pound_assert_stmt,
+  int condition: @expr_or_none ref,
+  string message: string ref
+);
+
+return_stmts(  //dir=stmt
+  unique int id: @return_stmt
+);
+
+#keyset[id]
+return_stmt_results(  //dir=stmt
+  int id: @return_stmt ref,
+  int result: @expr_or_none ref
+);
+
+then_stmts(  //dir=stmt
+  unique int id: @then_stmt,
+  int result: @expr_or_none ref
+);
+
+throw_stmts(  //dir=stmt
+  unique int id: @throw_stmt,
+  int sub_expr: @expr_or_none ref
+);
+
+yield_stmts(  //dir=stmt
+  unique int id: @yield_stmt
+);
+
+#keyset[id, index]
+yield_stmt_results(  //dir=stmt
+  int id: @yield_stmt ref,
+  int index: int ref,
+  int result: @expr_or_none ref
+);
+
+do_catch_stmts(  //dir=stmt
+  unique int id: @do_catch_stmt,
+  int body: @stmt_or_none ref
+);
+
+#keyset[id, index]
+do_catch_stmt_catches(  //dir=stmt
+  int id: @do_catch_stmt ref,
+  int index: int ref,
+  int catch: @case_stmt_or_none ref
+);
+
+do_stmts(  //dir=stmt
+  unique int id: @do_stmt,
+  int body: @brace_stmt_or_none ref
+);
+
+for_each_stmts(  //dir=stmt
+  unique int id: @for_each_stmt,
+  int pattern: @pattern_or_none ref,
+  int body: @brace_stmt_or_none ref
+);
+
+#keyset[id, index]
+for_each_stmt_variables(  //dir=stmt
+  int id: @for_each_stmt ref,
+  int index: int ref,
+  int variable: @var_decl_or_none ref
+);
+
+#keyset[id]
+for_each_stmt_wheres(  //dir=stmt
+  int id: @for_each_stmt ref,
+  int where: @expr_or_none ref
+);
+
+#keyset[id]
+for_each_stmt_iterator_vars(  //dir=stmt
+  int id: @for_each_stmt ref,
+  int iteratorVar: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+for_each_stmt_next_calls(  //dir=stmt
+  int id: @for_each_stmt ref,
+  int nextCall: @expr_or_none ref
+);
+
+@labeled_conditional_stmt =
+  @guard_stmt
+| @if_stmt
+| @while_stmt
+;
+
+#keyset[id]
+labeled_conditional_stmts(  //dir=stmt
+  int id: @labeled_conditional_stmt ref,
+  int condition: @stmt_condition_or_none ref
+);
+
+repeat_while_stmts(  //dir=stmt
+  unique int id: @repeat_while_stmt,
+  int condition: @expr_or_none ref,
+  int body: @stmt_or_none ref
+);
+
+switch_stmts(  //dir=stmt
+  unique int id: @switch_stmt,
+  int expr: @expr_or_none ref
+);
+
+#keyset[id, index]
+switch_stmt_cases(  //dir=stmt
+  int id: @switch_stmt ref,
+  int index: int ref,
+  int case_: @case_stmt_or_none ref
+);
+
+guard_stmts(  //dir=stmt
+  unique int id: @guard_stmt,
+  int body: @brace_stmt_or_none ref
+);
+
+if_stmts(  //dir=stmt
+  unique int id: @if_stmt,
+  int then: @stmt_or_none ref
+);
+
+#keyset[id]
+if_stmt_elses(  //dir=stmt
+  int id: @if_stmt ref,
+  int else: @stmt_or_none ref
+);
+
+while_stmts(  //dir=stmt
+  unique int id: @while_stmt,
+  int body: @stmt_or_none ref
+);
+
+@type =
+  @any_function_type
+| @any_generic_type
+| @any_metatype_type
+| @builtin_type
+| @dependent_member_type
+| @dynamic_self_type
+| @error_type
+| @existential_type
+| @in_out_type
+| @integer_type
+| @l_value_type
+| @module_type
+| @pack_element_type
+| @pack_expansion_type
+| @pack_type
+| @parameterized_protocol_type
+| @protocol_composition_type
+| @reference_storage_type
+| @substitutable_type
+| @sugar_type
+| @tuple_type
+| @unresolved_type
+;
+
+#keyset[id]
+types(  //dir=type
+  int id: @type ref,
+  string name: string ref,
+  int canonical_type: @type_or_none ref
+);
+
+type_reprs(  //dir=type
+  unique int id: @type_repr,
+  int type_: @type_or_none ref
+);
+
+@any_function_type =
+  @function_type
+| @generic_function_type
+;
+
+#keyset[id]
+any_function_types(  //dir=type
+  int id: @any_function_type ref,
+  int result: @type_or_none ref
+);
+
+#keyset[id, index]
+any_function_type_param_types(  //dir=type
+  int id: @any_function_type ref,
+  int index: int ref,
+  int param_type: @type_or_none ref
+);
+
+#keyset[id]
+any_function_type_is_throwing(  //dir=type
+  int id: @any_function_type ref
+);
+
+#keyset[id]
+any_function_type_is_async(  //dir=type
+  int id: @any_function_type ref
+);
+
+@any_generic_type =
+  @nominal_or_bound_generic_nominal_type
+| @unbound_generic_type
+;
+
+#keyset[id]
+any_generic_types(  //dir=type
+  int id: @any_generic_type ref,
+  int declaration: @generic_type_decl_or_none ref
+);
+
+#keyset[id]
+any_generic_type_parents(  //dir=type
+  int id: @any_generic_type ref,
+  int parent: @type_or_none ref
+);
+
+@any_metatype_type =
+  @existential_metatype_type
+| @metatype_type
+;
+
+@builtin_type =
+  @any_builtin_integer_type
+| @builtin_bridge_object_type
+| @builtin_default_actor_storage_type
+| @builtin_executor_type
+| @builtin_fixed_array_type
+| @builtin_float_type
+| @builtin_job_type
+| @builtin_native_object_type
+| @builtin_raw_pointer_type
+| @builtin_raw_unsafe_continuation_type
+| @builtin_unsafe_value_buffer_type
+| @builtin_vector_type
+;
+
+dependent_member_types(  //dir=type
+  unique int id: @dependent_member_type,
+  int base_type: @type_or_none ref,
+  int associated_type_decl: @associated_type_decl_or_none ref
+);
+
+dynamic_self_types(  //dir=type
+  unique int id: @dynamic_self_type,
+  int static_self_type: @type_or_none ref
+);
+
+error_types(  //dir=type
+  unique int id: @error_type
+);
+
+existential_types(  //dir=type
+  unique int id: @existential_type,
+  int constraint: @type_or_none ref
+);
+
+in_out_types(  //dir=type
+  unique int id: @in_out_type,
+  int object_type: @type_or_none ref
+);
+
+integer_types(  //dir=type
+  unique int id: @integer_type,
+  string value: string ref
+);
+
+l_value_types(  //dir=type
+  unique int id: @l_value_type,
+  int object_type: @type_or_none ref
+);
+
+module_types(  //dir=type
+  unique int id: @module_type,
+  int module: @module_decl_or_none ref
+);
+
+pack_element_types(  //dir=type
+  unique int id: @pack_element_type,
+  int pack_type: @type_or_none ref
+);
+
+pack_expansion_types(  //dir=type
+  unique int id: @pack_expansion_type,
+  int pattern_type: @type_or_none ref,
+  int count_type: @type_or_none ref
+);
+
+pack_types(  //dir=type
+  unique int id: @pack_type
+);
+
+#keyset[id, index]
+pack_type_elements(  //dir=type
+  int id: @pack_type ref,
+  int index: int ref,
+  int element: @type_or_none ref
+);
+
+parameterized_protocol_types(  //dir=type
+  unique int id: @parameterized_protocol_type,
+  int base: @protocol_type_or_none ref
+);
+
+#keyset[id, index]
+parameterized_protocol_type_args(  //dir=type
+  int id: @parameterized_protocol_type ref,
+  int index: int ref,
+  int arg: @type_or_none ref
+);
+
+protocol_composition_types(  //dir=type
+  unique int id: @protocol_composition_type
+);
+
+#keyset[id, index]
+protocol_composition_type_members(  //dir=type
+  int id: @protocol_composition_type ref,
+  int index: int ref,
+  int member: @type_or_none ref
+);
+
+@reference_storage_type =
+  @unmanaged_storage_type
+| @unowned_storage_type
+| @weak_storage_type
+;
+
+#keyset[id]
+reference_storage_types(  //dir=type
+  int id: @reference_storage_type ref,
+  int referent_type: @type_or_none ref
+);
+
+@substitutable_type =
+  @archetype_type
+| @generic_type_param_type
+;
+
+@sugar_type =
+  @paren_type
+| @syntax_sugar_type
+| @type_alias_type
+;
+
+tuple_types(  //dir=type
+  unique int id: @tuple_type
+);
+
+#keyset[id, index]
+tuple_type_types(  //dir=type
+  int id: @tuple_type ref,
+  int index: int ref,
+  int type_: @type_or_none ref
+);
+
+#keyset[id, index]
+tuple_type_names(  //dir=type
+  int id: @tuple_type ref,
+  int index: int ref,
+  string name: string ref
+);
+
+unresolved_types(  //dir=type
+  unique int id: @unresolved_type
+);
+
+@any_builtin_integer_type =
+  @builtin_integer_literal_type
+| @builtin_integer_type
+;
+
+@archetype_type =
+  @local_archetype_type
+| @opaque_type_archetype_type
+| @pack_archetype_type
+| @primary_archetype_type
+;
+
+#keyset[id]
+archetype_types(  //dir=type
+  int id: @archetype_type ref,
+  int interface_type: @type_or_none ref
+);
+
+#keyset[id]
+archetype_type_superclasses(  //dir=type
+  int id: @archetype_type ref,
+  int superclass: @type_or_none ref
+);
+
+#keyset[id, index]
+archetype_type_protocols(  //dir=type
+  int id: @archetype_type ref,
+  int index: int ref,
+  int protocol: @protocol_decl_or_none ref
+);
+
+builtin_bridge_object_types(  //dir=type
+  unique int id: @builtin_bridge_object_type
+);
+
+builtin_default_actor_storage_types(  //dir=type
+  unique int id: @builtin_default_actor_storage_type
+);
+
+builtin_executor_types(  //dir=type
+  unique int id: @builtin_executor_type
+);
+
+builtin_fixed_array_types(  //dir=type
+  unique int id: @builtin_fixed_array_type
+);
+
+builtin_float_types(  //dir=type
+  unique int id: @builtin_float_type
+);
+
+builtin_job_types(  //dir=type
+  unique int id: @builtin_job_type
+);
+
+builtin_native_object_types(  //dir=type
+  unique int id: @builtin_native_object_type
+);
+
+builtin_raw_pointer_types(  //dir=type
+  unique int id: @builtin_raw_pointer_type
+);
+
+builtin_raw_unsafe_continuation_types(  //dir=type
+  unique int id: @builtin_raw_unsafe_continuation_type
+);
+
+builtin_unsafe_value_buffer_types(  //dir=type
+  unique int id: @builtin_unsafe_value_buffer_type
+);
+
+builtin_vector_types(  //dir=type
+  unique int id: @builtin_vector_type
+);
+
+existential_metatype_types(  //dir=type
+  unique int id: @existential_metatype_type
+);
+
+function_types(  //dir=type
+  unique int id: @function_type
+);
+
+generic_function_types(  //dir=type
+  unique int id: @generic_function_type
+);
+
+#keyset[id, index]
+generic_function_type_generic_params(  //dir=type
+  int id: @generic_function_type ref,
+  int index: int ref,
+  int generic_param: @generic_type_param_type_or_none ref
+);
+
+generic_type_param_types(  //dir=type
+  unique int id: @generic_type_param_type
+);
+
+metatype_types(  //dir=type
+  unique int id: @metatype_type
+);
+
+@nominal_or_bound_generic_nominal_type =
+  @bound_generic_type
+| @nominal_type
+;
+
+paren_types(  //dir=type
+  unique int id: @paren_type,
+  int type_: @type_or_none ref
+);
+
+@syntax_sugar_type =
+  @dictionary_type
+| @unary_syntax_sugar_type
+;
+
+type_alias_types(  //dir=type
+  unique int id: @type_alias_type,
+  int decl: @type_alias_decl_or_none ref
+);
+
+unbound_generic_types(  //dir=type
+  unique int id: @unbound_generic_type
+);
+
+unmanaged_storage_types(  //dir=type
+  unique int id: @unmanaged_storage_type
+);
+
+unowned_storage_types(  //dir=type
+  unique int id: @unowned_storage_type
+);
+
+weak_storage_types(  //dir=type
+  unique int id: @weak_storage_type
+);
+
+@bound_generic_type =
+  @bound_generic_class_type
+| @bound_generic_enum_type
+| @bound_generic_struct_type
+;
+
+#keyset[id, index]
+bound_generic_type_arg_types(  //dir=type
+  int id: @bound_generic_type ref,
+  int index: int ref,
+  int arg_type: @type_or_none ref
+);
+
+builtin_integer_literal_types(  //dir=type
+  unique int id: @builtin_integer_literal_type
+);
+
+builtin_integer_types(  //dir=type
+  unique int id: @builtin_integer_type
+);
+
+#keyset[id]
+builtin_integer_type_widths(  //dir=type
+  int id: @builtin_integer_type ref,
+  int width: int ref
+);
+
+dictionary_types(  //dir=type
+  unique int id: @dictionary_type,
+  int key_type: @type_or_none ref,
+  int value_type: @type_or_none ref
+);
+
+@local_archetype_type =
+  @element_archetype_type
+| @existential_archetype_type
+;
+
+@nominal_type =
+  @class_type
+| @enum_type
+| @protocol_type
+| @struct_type
+;
+
+opaque_type_archetype_types(  //dir=type
+  unique int id: @opaque_type_archetype_type,
+  int declaration: @opaque_type_decl_or_none ref
+);
+
+pack_archetype_types(  //dir=type
+  unique int id: @pack_archetype_type
+);
+
+primary_archetype_types(  //dir=type
+  unique int id: @primary_archetype_type
+);
+
+@unary_syntax_sugar_type =
+  @array_slice_type
+| @optional_type
+| @variadic_sequence_type
+;
+
+#keyset[id]
+unary_syntax_sugar_types(  //dir=type
+  int id: @unary_syntax_sugar_type ref,
+  int base_type: @type_or_none ref
+);
+
+array_slice_types(  //dir=type
+  unique int id: @array_slice_type
+);
+
+bound_generic_class_types(  //dir=type
+  unique int id: @bound_generic_class_type
+);
+
+bound_generic_enum_types(  //dir=type
+  unique int id: @bound_generic_enum_type
+);
+
+bound_generic_struct_types(  //dir=type
+  unique int id: @bound_generic_struct_type
+);
+
+class_types(  //dir=type
+  unique int id: @class_type
+);
+
+element_archetype_types(  //dir=type
+  unique int id: @element_archetype_type
+);
+
+enum_types(  //dir=type
+  unique int id: @enum_type
+);
+
+existential_archetype_types(  //dir=type
+  unique int id: @existential_archetype_type
+);
+
+optional_types(  //dir=type
+  unique int id: @optional_type
+);
+
+protocol_types(  //dir=type
+  unique int id: @protocol_type
+);
+
+struct_types(  //dir=type
+  unique int id: @struct_type
+);
+
+variadic_sequence_types(  //dir=type
+  unique int id: @variadic_sequence_type
+);
+
+@accessor_or_none =
+  @accessor
+| @unspecified_element
+;
+
+@argument_or_none =
+  @argument
+| @unspecified_element
+;
+
+@associated_type_decl_or_none =
+  @associated_type_decl
+| @unspecified_element
+;
+
+@ast_node_or_none =
+  @ast_node
+| @unspecified_element
+;
+
+@availability_info_or_none =
+  @availability_info
+| @unspecified_element
+;
+
+@availability_spec_or_none =
+  @availability_spec
+| @unspecified_element
+;
+
+@brace_stmt_or_none =
+  @brace_stmt
+| @unspecified_element
+;
+
+@captured_decl_or_none =
+  @captured_decl
+| @unspecified_element
+;
+
+@case_label_item_or_none =
+  @case_label_item
+| @unspecified_element
+;
+
+@case_stmt_or_none =
+  @case_stmt
+| @unspecified_element
+;
+
+@closure_expr_or_none =
+  @closure_expr
+| @unspecified_element
+;
+
+@condition_element_or_none =
+  @condition_element
+| @unspecified_element
+;
+
+@decl_or_none =
+  @decl
+| @unspecified_element
+;
+
+@enum_element_decl_or_none =
+  @enum_element_decl
+| @unspecified_element
+;
+
+@expr_or_none =
+  @expr
+| @unspecified_element
+;
+
+@file_or_none =
+  @file
+| @unspecified_element
+;
+
+@function_or_none =
+  @function
+| @unspecified_element
+;
+
+@generic_type_decl_or_none =
+  @generic_type_decl
+| @unspecified_element
+;
+
+@generic_type_param_decl_or_none =
+  @generic_type_param_decl
+| @unspecified_element
+;
+
+@generic_type_param_type_or_none =
+  @generic_type_param_type
+| @unspecified_element
+;
+
+@initializer_or_none =
+  @initializer
+| @unspecified_element
+;
+
+@key_path_component_or_none =
+  @key_path_component
+| @unspecified_element
+;
+
+@location_or_none =
+  @location
+| @unspecified_element
+;
+
+@macro_role_or_none =
+  @macro_role
+| @unspecified_element
+;
+
+@module_decl_or_none =
+  @module_decl
+| @unspecified_element
+;
+
+@nominal_type_decl_or_none =
+  @nominal_type_decl
+| @unspecified_element
+;
+
+@opaque_type_decl_or_none =
+  @opaque_type_decl
+| @unspecified_element
+;
+
+@opaque_value_expr_or_none =
+  @opaque_value_expr
+| @unspecified_element
+;
+
+@param_decl_or_none =
+  @param_decl
+| @unspecified_element
+;
+
+@pattern_or_none =
+  @pattern
+| @unspecified_element
+;
+
+@pattern_binding_decl_or_none =
+  @pattern_binding_decl
+| @unspecified_element
+;
+
+@precedence_group_decl_or_none =
+  @precedence_group_decl
+| @unspecified_element
+;
+
+@protocol_decl_or_none =
+  @protocol_decl
+| @unspecified_element
+;
+
+@protocol_type_or_none =
+  @protocol_type
+| @unspecified_element
+;
+
+@stmt_or_none =
+  @stmt
+| @unspecified_element
+;
+
+@stmt_condition_or_none =
+  @stmt_condition
+| @unspecified_element
+;
+
+@string_literal_expr_or_none =
+  @string_literal_expr
+| @unspecified_element
+;
+
+@tap_expr_or_none =
+  @tap_expr
+| @unspecified_element
+;
+
+@type_or_none =
+  @type
+| @unspecified_element
+;
+
+@type_alias_decl_or_none =
+  @type_alias_decl
+| @unspecified_element
+;
+
+@type_repr_or_none =
+  @type_repr
+| @unspecified_element
+;
+
+@value_decl_or_none =
+  @unspecified_element
+| @value_decl
+;
+
+@var_decl_or_none =
+  @unspecified_element
+| @var_decl
+;
diff --git a/swift/downgrades/33e5e5e03bd3f98322f4c67aefa81015be832b88/upgrade.properties b/swift/downgrades/33e5e5e03bd3f98322f4c67aefa81015be832b88/upgrade.properties
new file mode 100644
index 00000000000..09285f1bf01
--- /dev/null
+++ b/swift/downgrades/33e5e5e03bd3f98322f4c67aefa81015be832b88/upgrade.properties
@@ -0,0 +1,16 @@
+description: Support AST elements new in Swift 6.2
+compatibility: backwards
+accessor_is_distributed_get.rel: delete
+accessor_is_read2.rel: delete
+accessor_is_modify2.rel: delete
+accessor_is_init.rel: delete
+decls.rel: run downgrades.qlo new_decls
+decl_members.rel: run downgrades.qlo new_decl_members
+expr_types.rel: run downgrades.qlo new_expr_types
+inline_array_types.rel: delete
+types.rel: run downgrades.qlo new_types
+unsafe_exprs.rel: delete
+unspecified_elements.rel: run downgrades.qlo new_unspecified_elements
+using_decls.rel: delete
+using_decl_is_main_actor.rel: delete
+using_decl_is_nonisolated.rel: delete
diff --git a/swift/downgrades/b7006eaacb007a06251596835506185619b86e98/availability_specs.ql b/swift/downgrades/b7006eaacb007a06251596835506185619b86e98/availability_specs.ql
new file mode 100644
index 00000000000..1d6c0296397
--- /dev/null
+++ b/swift/downgrades/b7006eaacb007a06251596835506185619b86e98/availability_specs.ql
@@ -0,0 +1,16 @@
+class AvailabilitySpec extends @availability_spec {
+  string toString() { none() }
+}
+
+query predicate new_other_availability_specs(AvailabilitySpec id) {
+  availability_specs(id) and
+  availability_spec_is_wildcard(id)
+}
+
+query predicate new_platform_version_availability_specs(
+  AvailabilitySpec id, string platform, string version
+) {
+  availability_specs(id) and
+  availability_spec_platforms(id, platform) and
+  availability_spec_versions(id, version)
+}
diff --git a/swift/downgrades/b7006eaacb007a06251596835506185619b86e98/key_path_components.ql b/swift/downgrades/b7006eaacb007a06251596835506185619b86e98/key_path_components.ql
new file mode 100644
index 00000000000..f09e155ee5d
--- /dev/null
+++ b/swift/downgrades/b7006eaacb007a06251596835506185619b86e98/key_path_components.ql
@@ -0,0 +1,62 @@
+class KeyPathComponent extends @key_path_component {
+  string toString() { none() }
+}
+
+class Element extends @element {
+  string toString() { none() }
+}
+
+class ArgumentOrNone extends @argument_or_none {
+  string toString() { none() }
+}
+
+class TypeOrNone extends @type_or_none {
+  string toString() { none() }
+}
+
+class ValueDeclOrNone extends @value_decl_or_none {
+  string toString() { none() }
+}
+
+predicate isKeyPathComponentWithNewKind(KeyPathComponent id) {
+  key_path_components(id, 1, _) or key_path_components(id, 4, _)
+}
+
+query predicate new_key_path_components(KeyPathComponent id, int kind, TypeOrNone component_type) {
+  exists(int old_kind |
+    key_path_components(id, old_kind, component_type) and
+    not isKeyPathComponentWithNewKind(id) and
+    if old_kind = 0
+    then kind = old_kind
+    else
+      if old_kind = 2 or old_kind = 3
+      then kind = old_kind - 1
+      else kind = old_kind - 2
+  )
+}
+
+query predicate new_key_path_component_subscript_arguments(
+  KeyPathComponent id, int index, ArgumentOrNone subscript_argument
+) {
+  key_path_component_subscript_arguments(id, index, subscript_argument) and
+  not isKeyPathComponentWithNewKind(id)
+}
+
+query predicate new_key_path_component_tuple_indices(KeyPathComponent id, int tuple_index) {
+  key_path_component_tuple_indices(id, tuple_index) and
+  not isKeyPathComponentWithNewKind(id)
+}
+
+query predicate new_key_path_component_decl_refs(KeyPathComponent id, ValueDeclOrNone decl_ref) {
+  key_path_component_decl_refs(id, decl_ref) and
+  not isKeyPathComponentWithNewKind(id)
+}
+
+query predicate new_unspecified_elements(Element id, string property, string error) {
+  unspecified_elements(id, property, error)
+  or
+  isKeyPathComponentWithNewKind(id) and
+  property = "" and
+  error =
+    "UnresolvedApply and Apply KeyPathComponents removed during database downgrade. Please update your CodeQL."
+}
diff --git a/swift/downgrades/b7006eaacb007a06251596835506185619b86e98/old.dbscheme b/swift/downgrades/b7006eaacb007a06251596835506185619b86e98/old.dbscheme
new file mode 100644
index 00000000000..b7006eaacb0
--- /dev/null
+++ b/swift/downgrades/b7006eaacb007a06251596835506185619b86e98/old.dbscheme
@@ -0,0 +1,2838 @@
+// generated by codegen/codegen.py, do not edit
+
+// from prefix.dbscheme
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(
+  string prefix: string ref
+);
+
+
+// from schema.py
+
+@element =
+  @file
+| @generic_context
+| @locatable
+| @location
+| @type
+;
+
+#keyset[id]
+element_is_unknown(
+  int id: @element ref
+);
+
+@file =
+  @db_file
+;
+
+#keyset[id]
+files(
+  int id: @file ref,
+  string name: string ref
+);
+
+#keyset[id]
+file_is_successfully_extracted(
+  int id: @file ref
+);
+
+@locatable =
+  @argument
+| @ast_node
+| @comment
+| @diagnostics
+| @error_element
+;
+
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_or_none ref
+);
+
+@location =
+  @db_location
+;
+
+#keyset[id]
+locations(
+  int id: @location ref,
+  int file: @file_or_none ref,
+  int start_line: int ref,
+  int start_column: int ref,
+  int end_line: int ref,
+  int end_column: int ref
+);
+
+@ast_node =
+  @availability_info
+| @availability_spec
+| @callable
+| @case_label_item
+| @condition_element
+| @decl
+| @expr
+| @key_path_component
+| @macro_role
+| @pattern
+| @stmt
+| @stmt_condition
+| @type_repr
+;
+
+comments(
+  unique int id: @comment,
+  string text: string ref
+);
+
+db_files(
+  unique int id: @db_file
+);
+
+db_locations(
+  unique int id: @db_location
+);
+
+diagnostics(
+  unique int id: @diagnostics,
+  string text: string ref,
+  int kind: int ref
+);
+
+@error_element =
+  @error_expr
+| @error_type
+| @overloaded_decl_ref_expr
+| @unresolved_decl_ref_expr
+| @unresolved_dot_expr
+| @unresolved_member_chain_result_expr
+| @unresolved_member_expr
+| @unresolved_pattern_expr
+| @unresolved_specialize_expr
+| @unresolved_type
+| @unresolved_type_conversion_expr
+| @unspecified_element
+;
+
+availability_infos(
+  unique int id: @availability_info
+);
+
+#keyset[id]
+availability_info_is_unavailable(
+  int id: @availability_info ref
+);
+
+#keyset[id, index]
+availability_info_specs(
+  int id: @availability_info ref,
+  int index: int ref,
+  int spec: @availability_spec_or_none ref
+);
+
+availability_specs(
+  unique int id: @availability_spec
+);
+
+#keyset[id]
+availability_spec_platforms(
+  int id: @availability_spec ref,
+  string platform: string ref
+);
+
+#keyset[id]
+availability_spec_versions(
+  int id: @availability_spec ref,
+  string version: string ref
+);
+
+#keyset[id]
+availability_spec_is_wildcard(
+  int id: @availability_spec ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_names(
+  int id: @callable ref,
+  string name: string ref
+);
+
+#keyset[id]
+callable_self_params(
+  int id: @callable ref,
+  int self_param: @param_decl_or_none ref
+);
+
+#keyset[id, index]
+callable_params(
+  int id: @callable ref,
+  int index: int ref,
+  int param: @param_decl_or_none ref
+);
+
+#keyset[id]
+callable_bodies(
+  int id: @callable ref,
+  int body: @brace_stmt_or_none ref
+);
+
+#keyset[id, index]
+callable_captures(
+  int id: @callable ref,
+  int index: int ref,
+  int capture: @captured_decl_or_none ref
+);
+
+key_path_components(
+  unique int id: @key_path_component,
+  int kind: int ref,
+  int component_type: @type_or_none ref
+);
+
+#keyset[id, index]
+key_path_component_subscript_arguments(
+  int id: @key_path_component ref,
+  int index: int ref,
+  int subscript_argument: @argument_or_none ref
+);
+
+#keyset[id]
+key_path_component_tuple_indices(
+  int id: @key_path_component ref,
+  int tuple_index: int ref
+);
+
+#keyset[id]
+key_path_component_decl_refs(
+  int id: @key_path_component ref,
+  int decl_ref: @value_decl_or_none ref
+);
+
+macro_roles(
+  unique int id: @macro_role,
+  int kind: int ref,
+  int macro_syntax: int ref
+);
+
+#keyset[id, index]
+macro_role_conformances(
+  int id: @macro_role ref,
+  int index: int ref,
+  int conformance: @expr_or_none ref
+);
+
+#keyset[id, index]
+macro_role_names(
+  int id: @macro_role ref,
+  int index: int ref,
+  string name: string ref
+);
+
+unspecified_elements(
+  unique int id: @unspecified_element,
+  string property: string ref,
+  string error: string ref
+);
+
+#keyset[id]
+unspecified_element_parents(
+  int id: @unspecified_element ref,
+  int parent: @element ref
+);
+
+#keyset[id]
+unspecified_element_indices(
+  int id: @unspecified_element ref,
+  int index: int ref
+);
+
+#keyset[id, index]
+unspecified_element_children(
+  int id: @unspecified_element ref,
+  int index: int ref,
+  int child: @ast_node_or_none ref
+);
+
+@decl =
+  @captured_decl
+| @enum_case_decl
+| @extension_decl
+| @if_config_decl
+| @import_decl
+| @missing_member_decl
+| @operator_decl
+| @pattern_binding_decl
+| @pound_diagnostic_decl
+| @precedence_group_decl
+| @top_level_code_decl
+| @value_decl
+;
+
+#keyset[id]
+decls(  //dir=decl
+  int id: @decl ref,
+  int module: @module_decl_or_none ref
+);
+
+#keyset[id, index]
+decl_members(  //dir=decl
+  int id: @decl ref,
+  int index: int ref,
+  int member: @decl_or_none ref
+);
+
+@generic_context =
+  @extension_decl
+| @function
+| @generic_type_decl
+| @macro_decl
+| @subscript_decl
+;
+
+#keyset[id, index]
+generic_context_generic_type_params(  //dir=decl
+  int id: @generic_context ref,
+  int index: int ref,
+  int generic_type_param: @generic_type_param_decl_or_none ref
+);
+
+captured_decls(  //dir=decl
+  unique int id: @captured_decl,
+  int decl: @value_decl_or_none ref
+);
+
+#keyset[id]
+captured_decl_is_direct(  //dir=decl
+  int id: @captured_decl ref
+);
+
+#keyset[id]
+captured_decl_is_escaping(  //dir=decl
+  int id: @captured_decl ref
+);
+
+enum_case_decls(  //dir=decl
+  unique int id: @enum_case_decl
+);
+
+#keyset[id, index]
+enum_case_decl_elements(  //dir=decl
+  int id: @enum_case_decl ref,
+  int index: int ref,
+  int element: @enum_element_decl_or_none ref
+);
+
+extension_decls(  //dir=decl
+  unique int id: @extension_decl,
+  int extended_type_decl: @nominal_type_decl_or_none ref
+);
+
+#keyset[id, index]
+extension_decl_protocols(  //dir=decl
+  int id: @extension_decl ref,
+  int index: int ref,
+  int protocol: @protocol_decl_or_none ref
+);
+
+if_config_decls(  //dir=decl
+  unique int id: @if_config_decl
+);
+
+#keyset[id, index]
+if_config_decl_active_elements(  //dir=decl
+  int id: @if_config_decl ref,
+  int index: int ref,
+  int active_element: @ast_node_or_none ref
+);
+
+import_decls(  //dir=decl
+  unique int id: @import_decl
+);
+
+#keyset[id]
+import_decl_is_exported(  //dir=decl
+  int id: @import_decl ref
+);
+
+#keyset[id]
+import_decl_imported_modules(  //dir=decl
+  int id: @import_decl ref,
+  int imported_module: @module_decl_or_none ref
+);
+
+#keyset[id, index]
+import_decl_declarations(  //dir=decl
+  int id: @import_decl ref,
+  int index: int ref,
+  int declaration: @value_decl_or_none ref
+);
+
+missing_member_decls(  //dir=decl
+  unique int id: @missing_member_decl,
+  string name: string ref
+);
+
+@operator_decl =
+  @infix_operator_decl
+| @postfix_operator_decl
+| @prefix_operator_decl
+;
+
+#keyset[id]
+operator_decls(  //dir=decl
+  int id: @operator_decl ref,
+  string name: string ref
+);
+
+pattern_binding_decls(  //dir=decl
+  unique int id: @pattern_binding_decl
+);
+
+#keyset[id, index]
+pattern_binding_decl_inits(  //dir=decl
+  int id: @pattern_binding_decl ref,
+  int index: int ref,
+  int init: @expr_or_none ref
+);
+
+#keyset[id, index]
+pattern_binding_decl_patterns(  //dir=decl
+  int id: @pattern_binding_decl ref,
+  int index: int ref,
+  int pattern: @pattern_or_none ref
+);
+
+pound_diagnostic_decls(  //dir=decl
+  unique int id: @pound_diagnostic_decl,
+  int kind: int ref,
+  int message: @string_literal_expr_or_none ref
+);
+
+precedence_group_decls(  //dir=decl
+  unique int id: @precedence_group_decl
+);
+
+top_level_code_decls(  //dir=decl
+  unique int id: @top_level_code_decl,
+  int body: @brace_stmt_or_none ref
+);
+
+@value_decl =
+  @abstract_storage_decl
+| @enum_element_decl
+| @function
+| @macro_decl
+| @type_decl
+;
+
+#keyset[id]
+value_decls(  //dir=decl
+  int id: @value_decl ref,
+  int interface_type: @type_or_none ref
+);
+
+@abstract_storage_decl =
+  @subscript_decl
+| @var_decl
+;
+
+#keyset[id, index]
+abstract_storage_decl_accessors(  //dir=decl
+  int id: @abstract_storage_decl ref,
+  int index: int ref,
+  int accessor: @accessor_or_none ref
+);
+
+enum_element_decls(  //dir=decl
+  unique int id: @enum_element_decl,
+  string name: string ref
+);
+
+#keyset[id, index]
+enum_element_decl_params(  //dir=decl
+  int id: @enum_element_decl ref,
+  int index: int ref,
+  int param: @param_decl_or_none ref
+);
+
+@function =
+  @accessor_or_named_function
+| @deinitializer
+| @initializer
+;
+
+infix_operator_decls(  //dir=decl
+  unique int id: @infix_operator_decl
+);
+
+#keyset[id]
+infix_operator_decl_precedence_groups(  //dir=decl
+  int id: @infix_operator_decl ref,
+  int precedence_group: @precedence_group_decl_or_none ref
+);
+
+macro_decls(  //dir=decl
+  unique int id: @macro_decl,
+  string name: string ref
+);
+
+#keyset[id, index]
+macro_decl_parameters(  //dir=decl
+  int id: @macro_decl ref,
+  int index: int ref,
+  int parameter: @param_decl_or_none ref
+);
+
+#keyset[id, index]
+macro_decl_roles(  //dir=decl
+  int id: @macro_decl ref,
+  int index: int ref,
+  int role: @macro_role_or_none ref
+);
+
+postfix_operator_decls(  //dir=decl
+  unique int id: @postfix_operator_decl
+);
+
+prefix_operator_decls(  //dir=decl
+  unique int id: @prefix_operator_decl
+);
+
+@type_decl =
+  @abstract_type_param_decl
+| @generic_type_decl
+| @module_decl
+;
+
+#keyset[id]
+type_decls(  //dir=decl
+  int id: @type_decl ref,
+  string name: string ref
+);
+
+#keyset[id, index]
+type_decl_inherited_types(  //dir=decl
+  int id: @type_decl ref,
+  int index: int ref,
+  int inherited_type: @type_or_none ref
+);
+
+@abstract_type_param_decl =
+  @associated_type_decl
+| @generic_type_param_decl
+;
+
+@accessor_or_named_function =
+  @accessor
+| @named_function
+;
+
+deinitializers(  //dir=decl
+  unique int id: @deinitializer
+);
+
+@generic_type_decl =
+  @nominal_type_decl
+| @opaque_type_decl
+| @type_alias_decl
+;
+
+initializers(  //dir=decl
+  unique int id: @initializer
+);
+
+module_decls(  //dir=decl
+  unique int id: @module_decl
+);
+
+#keyset[id]
+module_decl_is_builtin_module(  //dir=decl
+  int id: @module_decl ref
+);
+
+#keyset[id]
+module_decl_is_system_module(  //dir=decl
+  int id: @module_decl ref
+);
+
+module_decl_imported_modules(  //dir=decl
+  int id: @module_decl ref,
+  int imported_module: @module_decl_or_none ref
+);
+
+module_decl_exported_modules(  //dir=decl
+  int id: @module_decl ref,
+  int exported_module: @module_decl_or_none ref
+);
+
+subscript_decls(  //dir=decl
+  unique int id: @subscript_decl,
+  int element_type: @type_or_none ref
+);
+
+#keyset[id, index]
+subscript_decl_params(  //dir=decl
+  int id: @subscript_decl ref,
+  int index: int ref,
+  int param: @param_decl_or_none ref
+);
+
+@var_decl =
+  @concrete_var_decl
+| @param_decl
+;
+
+#keyset[id]
+var_decls(  //dir=decl
+  int id: @var_decl ref,
+  string name: string ref,
+  int type_: @type_or_none ref
+);
+
+#keyset[id]
+var_decl_attached_property_wrapper_types(  //dir=decl
+  int id: @var_decl ref,
+  int attached_property_wrapper_type: @type_or_none ref
+);
+
+#keyset[id]
+var_decl_parent_patterns(  //dir=decl
+  int id: @var_decl ref,
+  int parent_pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+var_decl_parent_initializers(  //dir=decl
+  int id: @var_decl ref,
+  int parent_initializer: @expr_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_backing_var_bindings(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_backing_var_binding: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_backing_vars(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_backing_var: @var_decl_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_projection_var_bindings(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_projection_var_binding: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_projection_vars(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_projection_var: @var_decl_or_none ref
+);
+
+accessors(  //dir=decl
+  unique int id: @accessor
+);
+
+#keyset[id]
+accessor_is_getter(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_setter(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_will_set(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_did_set(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_read(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_modify(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_unsafe_address(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_unsafe_mutable_address(  //dir=decl
+  int id: @accessor ref
+);
+
+associated_type_decls(  //dir=decl
+  unique int id: @associated_type_decl
+);
+
+concrete_var_decls(  //dir=decl
+  unique int id: @concrete_var_decl,
+  int introducer_int: int ref
+);
+
+generic_type_param_decls(  //dir=decl
+  unique int id: @generic_type_param_decl
+);
+
+named_functions(  //dir=decl
+  unique int id: @named_function
+);
+
+@nominal_type_decl =
+  @class_decl
+| @enum_decl
+| @protocol_decl
+| @struct_decl
+;
+
+#keyset[id]
+nominal_type_decls(  //dir=decl
+  int id: @nominal_type_decl ref,
+  int type_: @type_or_none ref
+);
+
+opaque_type_decls(  //dir=decl
+  unique int id: @opaque_type_decl,
+  int naming_declaration: @value_decl_or_none ref
+);
+
+#keyset[id, index]
+opaque_type_decl_opaque_generic_params(  //dir=decl
+  int id: @opaque_type_decl ref,
+  int index: int ref,
+  int opaque_generic_param: @generic_type_param_type_or_none ref
+);
+
+param_decls(  //dir=decl
+  unique int id: @param_decl
+);
+
+#keyset[id]
+param_decl_is_inout(  //dir=decl
+  int id: @param_decl ref
+);
+
+#keyset[id]
+param_decl_property_wrapper_local_wrapped_var_bindings(  //dir=decl
+  int id: @param_decl ref,
+  int property_wrapper_local_wrapped_var_binding: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+param_decl_property_wrapper_local_wrapped_vars(  //dir=decl
+  int id: @param_decl ref,
+  int property_wrapper_local_wrapped_var: @var_decl_or_none ref
+);
+
+type_alias_decls(  //dir=decl
+  unique int id: @type_alias_decl,
+  int aliased_type: @type_or_none ref
+);
+
+class_decls(  //dir=decl
+  unique int id: @class_decl
+);
+
+enum_decls(  //dir=decl
+  unique int id: @enum_decl
+);
+
+protocol_decls(  //dir=decl
+  unique int id: @protocol_decl
+);
+
+struct_decls(  //dir=decl
+  unique int id: @struct_decl
+);
+
+arguments(  //dir=expr
+  unique int id: @argument,
+  string label: string ref,
+  int expr: @expr_or_none ref
+);
+
+@expr =
+  @any_try_expr
+| @applied_property_wrapper_expr
+| @apply_expr
+| @assign_expr
+| @bind_optional_expr
+| @capture_list_expr
+| @closure_expr
+| @collection_expr
+| @consume_expr
+| @copy_expr
+| @current_context_isolation_expr
+| @decl_ref_expr
+| @default_argument_expr
+| @discard_assignment_expr
+| @dot_syntax_base_ignored_expr
+| @dynamic_type_expr
+| @enum_is_case_expr
+| @error_expr
+| @explicit_cast_expr
+| @extract_function_isolation_expr
+| @force_value_expr
+| @identity_expr
+| @if_expr
+| @implicit_conversion_expr
+| @in_out_expr
+| @key_path_application_expr
+| @key_path_dot_expr
+| @key_path_expr
+| @lazy_initialization_expr
+| @literal_expr
+| @lookup_expr
+| @make_temporarily_escapable_expr
+| @materialize_pack_expr
+| @obj_c_selector_expr
+| @one_way_expr
+| @opaque_value_expr
+| @open_existential_expr
+| @optional_evaluation_expr
+| @other_initializer_ref_expr
+| @overloaded_decl_ref_expr
+| @pack_element_expr
+| @pack_expansion_expr
+| @property_wrapper_value_placeholder_expr
+| @rebind_self_in_initializer_expr
+| @sequence_expr
+| @single_value_stmt_expr
+| @super_ref_expr
+| @tap_expr
+| @tuple_element_expr
+| @tuple_expr
+| @type_expr
+| @type_value_expr
+| @unresolved_decl_ref_expr
+| @unresolved_dot_expr
+| @unresolved_member_expr
+| @unresolved_pattern_expr
+| @unresolved_specialize_expr
+| @vararg_expansion_expr
+;
+
+#keyset[id]
+expr_types(  //dir=expr
+  int id: @expr ref,
+  int type_: @type_or_none ref
+);
+
+@any_try_expr =
+  @force_try_expr
+| @optional_try_expr
+| @try_expr
+;
+
+#keyset[id]
+any_try_exprs(  //dir=expr
+  int id: @any_try_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+applied_property_wrapper_exprs(  //dir=expr
+  unique int id: @applied_property_wrapper_expr,
+  int kind: int ref,
+  int value: @expr_or_none ref,
+  int param: @param_decl_or_none ref
+);
+
+@apply_expr =
+  @binary_expr
+| @call_expr
+| @postfix_unary_expr
+| @prefix_unary_expr
+| @self_apply_expr
+;
+
+#keyset[id]
+apply_exprs(  //dir=expr
+  int id: @apply_expr ref,
+  int function: @expr_or_none ref
+);
+
+#keyset[id, index]
+apply_expr_arguments(  //dir=expr
+  int id: @apply_expr ref,
+  int index: int ref,
+  int argument: @argument_or_none ref
+);
+
+assign_exprs(  //dir=expr
+  unique int id: @assign_expr,
+  int dest: @expr_or_none ref,
+  int source: @expr_or_none ref
+);
+
+bind_optional_exprs(  //dir=expr
+  unique int id: @bind_optional_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+capture_list_exprs(  //dir=expr
+  unique int id: @capture_list_expr,
+  int closure_body: @closure_expr_or_none ref
+);
+
+#keyset[id, index]
+capture_list_expr_binding_decls(  //dir=expr
+  int id: @capture_list_expr ref,
+  int index: int ref,
+  int binding_decl: @pattern_binding_decl_or_none ref
+);
+
+@closure_expr =
+  @auto_closure_expr
+| @explicit_closure_expr
+;
+
+@collection_expr =
+  @array_expr
+| @dictionary_expr
+;
+
+consume_exprs(  //dir=expr
+  unique int id: @consume_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+copy_exprs(  //dir=expr
+  unique int id: @copy_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+current_context_isolation_exprs(  //dir=expr
+  unique int id: @current_context_isolation_expr,
+  int actor: @expr_or_none ref
+);
+
+decl_ref_exprs(  //dir=expr
+  unique int id: @decl_ref_expr,
+  int decl: @decl_or_none ref
+);
+
+#keyset[id, index]
+decl_ref_expr_replacement_types(  //dir=expr
+  int id: @decl_ref_expr ref,
+  int index: int ref,
+  int replacement_type: @type_or_none ref
+);
+
+#keyset[id]
+decl_ref_expr_has_direct_to_storage_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+#keyset[id]
+decl_ref_expr_has_direct_to_implementation_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+#keyset[id]
+decl_ref_expr_has_ordinary_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+#keyset[id]
+decl_ref_expr_has_distributed_thunk_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+default_argument_exprs(  //dir=expr
+  unique int id: @default_argument_expr,
+  int param_decl: @param_decl_or_none ref,
+  int param_index: int ref
+);
+
+#keyset[id]
+default_argument_expr_caller_side_defaults(  //dir=expr
+  int id: @default_argument_expr ref,
+  int caller_side_default: @expr_or_none ref
+);
+
+discard_assignment_exprs(  //dir=expr
+  unique int id: @discard_assignment_expr
+);
+
+dot_syntax_base_ignored_exprs(  //dir=expr
+  unique int id: @dot_syntax_base_ignored_expr,
+  int qualifier: @expr_or_none ref,
+  int sub_expr: @expr_or_none ref
+);
+
+dynamic_type_exprs(  //dir=expr
+  unique int id: @dynamic_type_expr,
+  int base: @expr_or_none ref
+);
+
+enum_is_case_exprs(  //dir=expr
+  unique int id: @enum_is_case_expr,
+  int sub_expr: @expr_or_none ref,
+  int element: @enum_element_decl_or_none ref
+);
+
+error_exprs(  //dir=expr
+  unique int id: @error_expr
+);
+
+@explicit_cast_expr =
+  @checked_cast_expr
+| @coerce_expr
+;
+
+#keyset[id]
+explicit_cast_exprs(  //dir=expr
+  int id: @explicit_cast_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+extract_function_isolation_exprs(  //dir=expr
+  unique int id: @extract_function_isolation_expr,
+  int function_expr: @expr_or_none ref
+);
+
+force_value_exprs(  //dir=expr
+  unique int id: @force_value_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+@identity_expr =
+  @await_expr
+| @borrow_expr
+| @dot_self_expr
+| @paren_expr
+| @unresolved_member_chain_result_expr
+;
+
+#keyset[id]
+identity_exprs(  //dir=expr
+  int id: @identity_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+if_exprs(  //dir=expr
+  unique int id: @if_expr,
+  int condition: @expr_or_none ref,
+  int then_expr: @expr_or_none ref,
+  int else_expr: @expr_or_none ref
+);
+
+@implicit_conversion_expr =
+  @abi_safe_conversion_expr
+| @actor_isolation_erasure_expr
+| @any_hashable_erasure_expr
+| @archetype_to_super_expr
+| @array_to_pointer_expr
+| @bridge_from_obj_c_expr
+| @bridge_to_obj_c_expr
+| @class_metatype_to_object_expr
+| @collection_upcast_conversion_expr
+| @conditional_bridge_from_obj_c_expr
+| @covariant_function_conversion_expr
+| @covariant_return_conversion_expr
+| @derived_to_base_expr
+| @destructure_tuple_expr
+| @differentiable_function_expr
+| @differentiable_function_extract_original_expr
+| @erasure_expr
+| @existential_metatype_to_object_expr
+| @foreign_object_conversion_expr
+| @function_conversion_expr
+| @in_out_to_pointer_expr
+| @inject_into_optional_expr
+| @linear_function_expr
+| @linear_function_extract_original_expr
+| @linear_to_differentiable_function_expr
+| @load_expr
+| @metatype_conversion_expr
+| @pointer_to_pointer_expr
+| @protocol_metatype_to_object_expr
+| @string_to_pointer_expr
+| @underlying_to_opaque_expr
+| @unevaluated_instance_expr
+| @unreachable_expr
+| @unresolved_type_conversion_expr
+| @unsafe_cast_expr
+;
+
+#keyset[id]
+implicit_conversion_exprs(  //dir=expr
+  int id: @implicit_conversion_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+in_out_exprs(  //dir=expr
+  unique int id: @in_out_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+key_path_application_exprs(  //dir=expr
+  unique int id: @key_path_application_expr,
+  int base: @expr_or_none ref,
+  int key_path: @expr_or_none ref
+);
+
+key_path_dot_exprs(  //dir=expr
+  unique int id: @key_path_dot_expr
+);
+
+key_path_exprs(  //dir=expr
+  unique int id: @key_path_expr
+);
+
+#keyset[id]
+key_path_expr_roots(  //dir=expr
+  int id: @key_path_expr ref,
+  int root: @type_repr_or_none ref
+);
+
+#keyset[id, index]
+key_path_expr_components(  //dir=expr
+  int id: @key_path_expr ref,
+  int index: int ref,
+  int component: @key_path_component_or_none ref
+);
+
+lazy_initialization_exprs(  //dir=expr
+  unique int id: @lazy_initialization_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+@literal_expr =
+  @builtin_literal_expr
+| @interpolated_string_literal_expr
+| @nil_literal_expr
+| @object_literal_expr
+| @regex_literal_expr
+;
+
+@lookup_expr =
+  @dynamic_lookup_expr
+| @member_ref_expr
+| @subscript_expr
+;
+
+#keyset[id]
+lookup_exprs(  //dir=expr
+  int id: @lookup_expr ref,
+  int base: @expr_or_none ref
+);
+
+#keyset[id]
+lookup_expr_members(  //dir=expr
+  int id: @lookup_expr ref,
+  int member: @decl_or_none ref
+);
+
+make_temporarily_escapable_exprs(  //dir=expr
+  unique int id: @make_temporarily_escapable_expr,
+  int escaping_closure: @opaque_value_expr_or_none ref,
+  int nonescaping_closure: @expr_or_none ref,
+  int sub_expr: @expr_or_none ref
+);
+
+materialize_pack_exprs(  //dir=expr
+  unique int id: @materialize_pack_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+obj_c_selector_exprs(  //dir=expr
+  unique int id: @obj_c_selector_expr,
+  int sub_expr: @expr_or_none ref,
+  int method: @function_or_none ref
+);
+
+one_way_exprs(  //dir=expr
+  unique int id: @one_way_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+opaque_value_exprs(  //dir=expr
+  unique int id: @opaque_value_expr
+);
+
+open_existential_exprs(  //dir=expr
+  unique int id: @open_existential_expr,
+  int sub_expr: @expr_or_none ref,
+  int existential: @expr_or_none ref,
+  int opaque_expr: @opaque_value_expr_or_none ref
+);
+
+optional_evaluation_exprs(  //dir=expr
+  unique int id: @optional_evaluation_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+other_initializer_ref_exprs(  //dir=expr
+  unique int id: @other_initializer_ref_expr,
+  int initializer: @initializer_or_none ref
+);
+
+overloaded_decl_ref_exprs(  //dir=expr
+  unique int id: @overloaded_decl_ref_expr
+);
+
+#keyset[id, index]
+overloaded_decl_ref_expr_possible_declarations(  //dir=expr
+  int id: @overloaded_decl_ref_expr ref,
+  int index: int ref,
+  int possible_declaration: @value_decl_or_none ref
+);
+
+pack_element_exprs(  //dir=expr
+  unique int id: @pack_element_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+pack_expansion_exprs(  //dir=expr
+  unique int id: @pack_expansion_expr,
+  int pattern_expr: @expr_or_none ref
+);
+
+property_wrapper_value_placeholder_exprs(  //dir=expr
+  unique int id: @property_wrapper_value_placeholder_expr,
+  int placeholder: @opaque_value_expr_or_none ref
+);
+
+#keyset[id]
+property_wrapper_value_placeholder_expr_wrapped_values(  //dir=expr
+  int id: @property_wrapper_value_placeholder_expr ref,
+  int wrapped_value: @expr_or_none ref
+);
+
+rebind_self_in_initializer_exprs(  //dir=expr
+  unique int id: @rebind_self_in_initializer_expr,
+  int sub_expr: @expr_or_none ref,
+  int self: @var_decl_or_none ref
+);
+
+sequence_exprs(  //dir=expr
+  unique int id: @sequence_expr
+);
+
+#keyset[id, index]
+sequence_expr_elements(  //dir=expr
+  int id: @sequence_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+single_value_stmt_exprs(  //dir=expr
+  unique int id: @single_value_stmt_expr,
+  int stmt: @stmt_or_none ref
+);
+
+super_ref_exprs(  //dir=expr
+  unique int id: @super_ref_expr,
+  int self: @var_decl_or_none ref
+);
+
+tap_exprs(  //dir=expr
+  unique int id: @tap_expr,
+  int body: @brace_stmt_or_none ref,
+  int var: @var_decl_or_none ref
+);
+
+#keyset[id]
+tap_expr_sub_exprs(  //dir=expr
+  int id: @tap_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+tuple_element_exprs(  //dir=expr
+  unique int id: @tuple_element_expr,
+  int sub_expr: @expr_or_none ref,
+  int index: int ref
+);
+
+tuple_exprs(  //dir=expr
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_elements(  //dir=expr
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+type_exprs(  //dir=expr
+  unique int id: @type_expr
+);
+
+#keyset[id]
+type_expr_type_reprs(  //dir=expr
+  int id: @type_expr ref,
+  int type_repr: @type_repr_or_none ref
+);
+
+type_value_exprs(  //dir=expr
+  unique int id: @type_value_expr,
+  int type_repr: @type_repr_or_none ref
+);
+
+unresolved_decl_ref_exprs(  //dir=expr
+  unique int id: @unresolved_decl_ref_expr
+);
+
+#keyset[id]
+unresolved_decl_ref_expr_names(  //dir=expr
+  int id: @unresolved_decl_ref_expr ref,
+  string name: string ref
+);
+
+unresolved_dot_exprs(  //dir=expr
+  unique int id: @unresolved_dot_expr,
+  int base: @expr_or_none ref,
+  string name: string ref
+);
+
+unresolved_member_exprs(  //dir=expr
+  unique int id: @unresolved_member_expr,
+  string name: string ref
+);
+
+unresolved_pattern_exprs(  //dir=expr
+  unique int id: @unresolved_pattern_expr,
+  int sub_pattern: @pattern_or_none ref
+);
+
+unresolved_specialize_exprs(  //dir=expr
+  unique int id: @unresolved_specialize_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+vararg_expansion_exprs(  //dir=expr
+  unique int id: @vararg_expansion_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+abi_safe_conversion_exprs(  //dir=expr
+  unique int id: @abi_safe_conversion_expr
+);
+
+actor_isolation_erasure_exprs(  //dir=expr
+  unique int id: @actor_isolation_erasure_expr
+);
+
+any_hashable_erasure_exprs(  //dir=expr
+  unique int id: @any_hashable_erasure_expr
+);
+
+archetype_to_super_exprs(  //dir=expr
+  unique int id: @archetype_to_super_expr
+);
+
+array_exprs(  //dir=expr
+  unique int id: @array_expr
+);
+
+#keyset[id, index]
+array_expr_elements(  //dir=expr
+  int id: @array_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+array_to_pointer_exprs(  //dir=expr
+  unique int id: @array_to_pointer_expr
+);
+
+auto_closure_exprs(  //dir=expr
+  unique int id: @auto_closure_expr
+);
+
+await_exprs(  //dir=expr
+  unique int id: @await_expr
+);
+
+binary_exprs(  //dir=expr
+  unique int id: @binary_expr
+);
+
+borrow_exprs(  //dir=expr
+  unique int id: @borrow_expr
+);
+
+bridge_from_obj_c_exprs(  //dir=expr
+  unique int id: @bridge_from_obj_c_expr
+);
+
+bridge_to_obj_c_exprs(  //dir=expr
+  unique int id: @bridge_to_obj_c_expr
+);
+
+@builtin_literal_expr =
+  @boolean_literal_expr
+| @magic_identifier_literal_expr
+| @number_literal_expr
+| @string_literal_expr
+;
+
+call_exprs(  //dir=expr
+  unique int id: @call_expr
+);
+
+@checked_cast_expr =
+  @conditional_checked_cast_expr
+| @forced_checked_cast_expr
+| @is_expr
+;
+
+class_metatype_to_object_exprs(  //dir=expr
+  unique int id: @class_metatype_to_object_expr
+);
+
+coerce_exprs(  //dir=expr
+  unique int id: @coerce_expr
+);
+
+collection_upcast_conversion_exprs(  //dir=expr
+  unique int id: @collection_upcast_conversion_expr
+);
+
+conditional_bridge_from_obj_c_exprs(  //dir=expr
+  unique int id: @conditional_bridge_from_obj_c_expr
+);
+
+covariant_function_conversion_exprs(  //dir=expr
+  unique int id: @covariant_function_conversion_expr
+);
+
+covariant_return_conversion_exprs(  //dir=expr
+  unique int id: @covariant_return_conversion_expr
+);
+
+derived_to_base_exprs(  //dir=expr
+  unique int id: @derived_to_base_expr
+);
+
+destructure_tuple_exprs(  //dir=expr
+  unique int id: @destructure_tuple_expr
+);
+
+dictionary_exprs(  //dir=expr
+  unique int id: @dictionary_expr
+);
+
+#keyset[id, index]
+dictionary_expr_elements(  //dir=expr
+  int id: @dictionary_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+differentiable_function_exprs(  //dir=expr
+  unique int id: @differentiable_function_expr
+);
+
+differentiable_function_extract_original_exprs(  //dir=expr
+  unique int id: @differentiable_function_extract_original_expr
+);
+
+dot_self_exprs(  //dir=expr
+  unique int id: @dot_self_expr
+);
+
+@dynamic_lookup_expr =
+  @dynamic_member_ref_expr
+| @dynamic_subscript_expr
+;
+
+erasure_exprs(  //dir=expr
+  unique int id: @erasure_expr
+);
+
+existential_metatype_to_object_exprs(  //dir=expr
+  unique int id: @existential_metatype_to_object_expr
+);
+
+explicit_closure_exprs(  //dir=expr
+  unique int id: @explicit_closure_expr
+);
+
+force_try_exprs(  //dir=expr
+  unique int id: @force_try_expr
+);
+
+foreign_object_conversion_exprs(  //dir=expr
+  unique int id: @foreign_object_conversion_expr
+);
+
+function_conversion_exprs(  //dir=expr
+  unique int id: @function_conversion_expr
+);
+
+in_out_to_pointer_exprs(  //dir=expr
+  unique int id: @in_out_to_pointer_expr
+);
+
+inject_into_optional_exprs(  //dir=expr
+  unique int id: @inject_into_optional_expr
+);
+
+interpolated_string_literal_exprs(  //dir=expr
+  unique int id: @interpolated_string_literal_expr
+);
+
+#keyset[id]
+interpolated_string_literal_expr_interpolation_exprs(  //dir=expr
+  int id: @interpolated_string_literal_expr ref,
+  int interpolation_expr: @opaque_value_expr_or_none ref
+);
+
+#keyset[id]
+interpolated_string_literal_expr_appending_exprs(  //dir=expr
+  int id: @interpolated_string_literal_expr ref,
+  int appending_expr: @tap_expr_or_none ref
+);
+
+linear_function_exprs(  //dir=expr
+  unique int id: @linear_function_expr
+);
+
+linear_function_extract_original_exprs(  //dir=expr
+  unique int id: @linear_function_extract_original_expr
+);
+
+linear_to_differentiable_function_exprs(  //dir=expr
+  unique int id: @linear_to_differentiable_function_expr
+);
+
+load_exprs(  //dir=expr
+  unique int id: @load_expr
+);
+
+member_ref_exprs(  //dir=expr
+  unique int id: @member_ref_expr
+);
+
+#keyset[id]
+member_ref_expr_has_direct_to_storage_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+#keyset[id]
+member_ref_expr_has_direct_to_implementation_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+#keyset[id]
+member_ref_expr_has_ordinary_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+#keyset[id]
+member_ref_expr_has_distributed_thunk_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+metatype_conversion_exprs(  //dir=expr
+  unique int id: @metatype_conversion_expr
+);
+
+nil_literal_exprs(  //dir=expr
+  unique int id: @nil_literal_expr
+);
+
+object_literal_exprs(  //dir=expr
+  unique int id: @object_literal_expr,
+  int kind: int ref
+);
+
+#keyset[id, index]
+object_literal_expr_arguments(  //dir=expr
+  int id: @object_literal_expr ref,
+  int index: int ref,
+  int argument: @argument_or_none ref
+);
+
+optional_try_exprs(  //dir=expr
+  unique int id: @optional_try_expr
+);
+
+paren_exprs(  //dir=expr
+  unique int id: @paren_expr
+);
+
+pointer_to_pointer_exprs(  //dir=expr
+  unique int id: @pointer_to_pointer_expr
+);
+
+postfix_unary_exprs(  //dir=expr
+  unique int id: @postfix_unary_expr
+);
+
+prefix_unary_exprs(  //dir=expr
+  unique int id: @prefix_unary_expr
+);
+
+protocol_metatype_to_object_exprs(  //dir=expr
+  unique int id: @protocol_metatype_to_object_expr
+);
+
+regex_literal_exprs(  //dir=expr
+  unique int id: @regex_literal_expr,
+  string pattern: string ref,
+  int version: int ref
+);
+
+@self_apply_expr =
+  @dot_syntax_call_expr
+| @initializer_ref_call_expr
+;
+
+#keyset[id]
+self_apply_exprs(  //dir=expr
+  int id: @self_apply_expr ref,
+  int base: @expr_or_none ref
+);
+
+string_to_pointer_exprs(  //dir=expr
+  unique int id: @string_to_pointer_expr
+);
+
+subscript_exprs(  //dir=expr
+  unique int id: @subscript_expr
+);
+
+#keyset[id, index]
+subscript_expr_arguments(  //dir=expr
+  int id: @subscript_expr ref,
+  int index: int ref,
+  int argument: @argument_or_none ref
+);
+
+#keyset[id]
+subscript_expr_has_direct_to_storage_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+#keyset[id]
+subscript_expr_has_direct_to_implementation_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+#keyset[id]
+subscript_expr_has_ordinary_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+#keyset[id]
+subscript_expr_has_distributed_thunk_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+try_exprs(  //dir=expr
+  unique int id: @try_expr
+);
+
+underlying_to_opaque_exprs(  //dir=expr
+  unique int id: @underlying_to_opaque_expr
+);
+
+unevaluated_instance_exprs(  //dir=expr
+  unique int id: @unevaluated_instance_expr
+);
+
+unreachable_exprs(  //dir=expr
+  unique int id: @unreachable_expr
+);
+
+unresolved_member_chain_result_exprs(  //dir=expr
+  unique int id: @unresolved_member_chain_result_expr
+);
+
+unresolved_type_conversion_exprs(  //dir=expr
+  unique int id: @unresolved_type_conversion_expr
+);
+
+unsafe_cast_exprs(  //dir=expr
+  unique int id: @unsafe_cast_expr
+);
+
+boolean_literal_exprs(  //dir=expr
+  unique int id: @boolean_literal_expr,
+  boolean value: boolean ref
+);
+
+conditional_checked_cast_exprs(  //dir=expr
+  unique int id: @conditional_checked_cast_expr
+);
+
+dot_syntax_call_exprs(  //dir=expr
+  unique int id: @dot_syntax_call_expr
+);
+
+dynamic_member_ref_exprs(  //dir=expr
+  unique int id: @dynamic_member_ref_expr
+);
+
+dynamic_subscript_exprs(  //dir=expr
+  unique int id: @dynamic_subscript_expr
+);
+
+forced_checked_cast_exprs(  //dir=expr
+  unique int id: @forced_checked_cast_expr
+);
+
+initializer_ref_call_exprs(  //dir=expr
+  unique int id: @initializer_ref_call_expr
+);
+
+is_exprs(  //dir=expr
+  unique int id: @is_expr
+);
+
+magic_identifier_literal_exprs(  //dir=expr
+  unique int id: @magic_identifier_literal_expr,
+  string kind: string ref
+);
+
+@number_literal_expr =
+  @float_literal_expr
+| @integer_literal_expr
+;
+
+string_literal_exprs(  //dir=expr
+  unique int id: @string_literal_expr,
+  string value: string ref
+);
+
+float_literal_exprs(  //dir=expr
+  unique int id: @float_literal_expr,
+  string string_value: string ref
+);
+
+integer_literal_exprs(  //dir=expr
+  unique int id: @integer_literal_expr,
+  string string_value: string ref
+);
+
+@pattern =
+  @any_pattern
+| @binding_pattern
+| @bool_pattern
+| @enum_element_pattern
+| @expr_pattern
+| @is_pattern
+| @named_pattern
+| @optional_some_pattern
+| @paren_pattern
+| @tuple_pattern
+| @typed_pattern
+;
+
+#keyset[id]
+pattern_types(  //dir=pattern
+  int id: @pattern ref,
+  int type_: @type_or_none ref
+);
+
+any_patterns(  //dir=pattern
+  unique int id: @any_pattern
+);
+
+binding_patterns(  //dir=pattern
+  unique int id: @binding_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+bool_patterns(  //dir=pattern
+  unique int id: @bool_pattern,
+  boolean value: boolean ref
+);
+
+enum_element_patterns(  //dir=pattern
+  unique int id: @enum_element_pattern,
+  int element: @enum_element_decl_or_none ref
+);
+
+#keyset[id]
+enum_element_pattern_sub_patterns(  //dir=pattern
+  int id: @enum_element_pattern ref,
+  int sub_pattern: @pattern_or_none ref
+);
+
+expr_patterns(  //dir=pattern
+  unique int id: @expr_pattern,
+  int sub_expr: @expr_or_none ref
+);
+
+is_patterns(  //dir=pattern
+  unique int id: @is_pattern
+);
+
+#keyset[id]
+is_pattern_cast_type_reprs(  //dir=pattern
+  int id: @is_pattern ref,
+  int cast_type_repr: @type_repr_or_none ref
+);
+
+#keyset[id]
+is_pattern_sub_patterns(  //dir=pattern
+  int id: @is_pattern ref,
+  int sub_pattern: @pattern_or_none ref
+);
+
+named_patterns(  //dir=pattern
+  unique int id: @named_pattern,
+  int var_decl: @var_decl_or_none ref
+);
+
+optional_some_patterns(  //dir=pattern
+  unique int id: @optional_some_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+paren_patterns(  //dir=pattern
+  unique int id: @paren_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+tuple_patterns(  //dir=pattern
+  unique int id: @tuple_pattern
+);
+
+#keyset[id, index]
+tuple_pattern_elements(  //dir=pattern
+  int id: @tuple_pattern ref,
+  int index: int ref,
+  int element: @pattern_or_none ref
+);
+
+typed_patterns(  //dir=pattern
+  unique int id: @typed_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+typed_pattern_type_reprs(  //dir=pattern
+  int id: @typed_pattern ref,
+  int type_repr: @type_repr_or_none ref
+);
+
+case_label_items(  //dir=stmt
+  unique int id: @case_label_item,
+  int pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+case_label_item_guards(  //dir=stmt
+  int id: @case_label_item ref,
+  int guard: @expr_or_none ref
+);
+
+condition_elements(  //dir=stmt
+  unique int id: @condition_element
+);
+
+#keyset[id]
+condition_element_booleans(  //dir=stmt
+  int id: @condition_element ref,
+  int boolean_: @expr_or_none ref
+);
+
+#keyset[id]
+condition_element_patterns(  //dir=stmt
+  int id: @condition_element ref,
+  int pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+condition_element_initializers(  //dir=stmt
+  int id: @condition_element ref,
+  int initializer: @expr_or_none ref
+);
+
+#keyset[id]
+condition_element_availabilities(  //dir=stmt
+  int id: @condition_element ref,
+  int availability: @availability_info_or_none ref
+);
+
+@stmt =
+  @brace_stmt
+| @break_stmt
+| @case_stmt
+| @continue_stmt
+| @defer_stmt
+| @discard_stmt
+| @fail_stmt
+| @fallthrough_stmt
+| @labeled_stmt
+| @pound_assert_stmt
+| @return_stmt
+| @then_stmt
+| @throw_stmt
+| @yield_stmt
+;
+
+stmt_conditions(  //dir=stmt
+  unique int id: @stmt_condition
+);
+
+#keyset[id, index]
+stmt_condition_elements(  //dir=stmt
+  int id: @stmt_condition ref,
+  int index: int ref,
+  int element: @condition_element_or_none ref
+);
+
+brace_stmts(  //dir=stmt
+  unique int id: @brace_stmt
+);
+
+#keyset[id, index]
+brace_stmt_elements(  //dir=stmt
+  int id: @brace_stmt ref,
+  int index: int ref,
+  int element: @ast_node_or_none ref
+);
+
+break_stmts(  //dir=stmt
+  unique int id: @break_stmt
+);
+
+#keyset[id]
+break_stmt_target_names(  //dir=stmt
+  int id: @break_stmt ref,
+  string target_name: string ref
+);
+
+#keyset[id]
+break_stmt_targets(  //dir=stmt
+  int id: @break_stmt ref,
+  int target: @stmt_or_none ref
+);
+
+case_stmts(  //dir=stmt
+  unique int id: @case_stmt,
+  int body: @stmt_or_none ref
+);
+
+#keyset[id, index]
+case_stmt_labels(  //dir=stmt
+  int id: @case_stmt ref,
+  int index: int ref,
+  int label: @case_label_item_or_none ref
+);
+
+#keyset[id, index]
+case_stmt_variables(  //dir=stmt
+  int id: @case_stmt ref,
+  int index: int ref,
+  int variable: @var_decl_or_none ref
+);
+
+continue_stmts(  //dir=stmt
+  unique int id: @continue_stmt
+);
+
+#keyset[id]
+continue_stmt_target_names(  //dir=stmt
+  int id: @continue_stmt ref,
+  string target_name: string ref
+);
+
+#keyset[id]
+continue_stmt_targets(  //dir=stmt
+  int id: @continue_stmt ref,
+  int target: @stmt_or_none ref
+);
+
+defer_stmts(  //dir=stmt
+  unique int id: @defer_stmt,
+  int body: @brace_stmt_or_none ref
+);
+
+discard_stmts(  //dir=stmt
+  unique int id: @discard_stmt,
+  int sub_expr: @expr_or_none ref
+);
+
+fail_stmts(  //dir=stmt
+  unique int id: @fail_stmt
+);
+
+fallthrough_stmts(  //dir=stmt
+  unique int id: @fallthrough_stmt,
+  int fallthrough_source: @case_stmt_or_none ref,
+  int fallthrough_dest: @case_stmt_or_none ref
+);
+
+@labeled_stmt =
+  @do_catch_stmt
+| @do_stmt
+| @for_each_stmt
+| @labeled_conditional_stmt
+| @repeat_while_stmt
+| @switch_stmt
+;
+
+#keyset[id]
+labeled_stmt_labels(  //dir=stmt
+  int id: @labeled_stmt ref,
+  string label: string ref
+);
+
+pound_assert_stmts(  //dir=stmt
+  unique int id: @pound_assert_stmt,
+  int condition: @expr_or_none ref,
+  string message: string ref
+);
+
+return_stmts(  //dir=stmt
+  unique int id: @return_stmt
+);
+
+#keyset[id]
+return_stmt_results(  //dir=stmt
+  int id: @return_stmt ref,
+  int result: @expr_or_none ref
+);
+
+then_stmts(  //dir=stmt
+  unique int id: @then_stmt,
+  int result: @expr_or_none ref
+);
+
+throw_stmts(  //dir=stmt
+  unique int id: @throw_stmt,
+  int sub_expr: @expr_or_none ref
+);
+
+yield_stmts(  //dir=stmt
+  unique int id: @yield_stmt
+);
+
+#keyset[id, index]
+yield_stmt_results(  //dir=stmt
+  int id: @yield_stmt ref,
+  int index: int ref,
+  int result: @expr_or_none ref
+);
+
+do_catch_stmts(  //dir=stmt
+  unique int id: @do_catch_stmt,
+  int body: @stmt_or_none ref
+);
+
+#keyset[id, index]
+do_catch_stmt_catches(  //dir=stmt
+  int id: @do_catch_stmt ref,
+  int index: int ref,
+  int catch: @case_stmt_or_none ref
+);
+
+do_stmts(  //dir=stmt
+  unique int id: @do_stmt,
+  int body: @brace_stmt_or_none ref
+);
+
+for_each_stmts(  //dir=stmt
+  unique int id: @for_each_stmt,
+  int pattern: @pattern_or_none ref,
+  int body: @brace_stmt_or_none ref
+);
+
+#keyset[id, index]
+for_each_stmt_variables(  //dir=stmt
+  int id: @for_each_stmt ref,
+  int index: int ref,
+  int variable: @var_decl_or_none ref
+);
+
+#keyset[id]
+for_each_stmt_wheres(  //dir=stmt
+  int id: @for_each_stmt ref,
+  int where: @expr_or_none ref
+);
+
+#keyset[id]
+for_each_stmt_iterator_vars(  //dir=stmt
+  int id: @for_each_stmt ref,
+  int iteratorVar: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+for_each_stmt_next_calls(  //dir=stmt
+  int id: @for_each_stmt ref,
+  int nextCall: @expr_or_none ref
+);
+
+@labeled_conditional_stmt =
+  @guard_stmt
+| @if_stmt
+| @while_stmt
+;
+
+#keyset[id]
+labeled_conditional_stmts(  //dir=stmt
+  int id: @labeled_conditional_stmt ref,
+  int condition: @stmt_condition_or_none ref
+);
+
+repeat_while_stmts(  //dir=stmt
+  unique int id: @repeat_while_stmt,
+  int condition: @expr_or_none ref,
+  int body: @stmt_or_none ref
+);
+
+switch_stmts(  //dir=stmt
+  unique int id: @switch_stmt,
+  int expr: @expr_or_none ref
+);
+
+#keyset[id, index]
+switch_stmt_cases(  //dir=stmt
+  int id: @switch_stmt ref,
+  int index: int ref,
+  int case_: @case_stmt_or_none ref
+);
+
+guard_stmts(  //dir=stmt
+  unique int id: @guard_stmt,
+  int body: @brace_stmt_or_none ref
+);
+
+if_stmts(  //dir=stmt
+  unique int id: @if_stmt,
+  int then: @stmt_or_none ref
+);
+
+#keyset[id]
+if_stmt_elses(  //dir=stmt
+  int id: @if_stmt ref,
+  int else: @stmt_or_none ref
+);
+
+while_stmts(  //dir=stmt
+  unique int id: @while_stmt,
+  int body: @stmt_or_none ref
+);
+
+@type =
+  @any_function_type
+| @any_generic_type
+| @any_metatype_type
+| @builtin_type
+| @dependent_member_type
+| @dynamic_self_type
+| @error_type
+| @existential_type
+| @in_out_type
+| @integer_type
+| @l_value_type
+| @module_type
+| @pack_element_type
+| @pack_expansion_type
+| @pack_type
+| @parameterized_protocol_type
+| @protocol_composition_type
+| @reference_storage_type
+| @substitutable_type
+| @sugar_type
+| @tuple_type
+| @unresolved_type
+;
+
+#keyset[id]
+types(  //dir=type
+  int id: @type ref,
+  string name: string ref,
+  int canonical_type: @type_or_none ref
+);
+
+type_reprs(  //dir=type
+  unique int id: @type_repr,
+  int type_: @type_or_none ref
+);
+
+@any_function_type =
+  @function_type
+| @generic_function_type
+;
+
+#keyset[id]
+any_function_types(  //dir=type
+  int id: @any_function_type ref,
+  int result: @type_or_none ref
+);
+
+#keyset[id, index]
+any_function_type_param_types(  //dir=type
+  int id: @any_function_type ref,
+  int index: int ref,
+  int param_type: @type_or_none ref
+);
+
+#keyset[id]
+any_function_type_is_throwing(  //dir=type
+  int id: @any_function_type ref
+);
+
+#keyset[id]
+any_function_type_is_async(  //dir=type
+  int id: @any_function_type ref
+);
+
+@any_generic_type =
+  @nominal_or_bound_generic_nominal_type
+| @unbound_generic_type
+;
+
+#keyset[id]
+any_generic_types(  //dir=type
+  int id: @any_generic_type ref,
+  int declaration: @generic_type_decl_or_none ref
+);
+
+#keyset[id]
+any_generic_type_parents(  //dir=type
+  int id: @any_generic_type ref,
+  int parent: @type_or_none ref
+);
+
+@any_metatype_type =
+  @existential_metatype_type
+| @metatype_type
+;
+
+@builtin_type =
+  @any_builtin_integer_type
+| @builtin_bridge_object_type
+| @builtin_default_actor_storage_type
+| @builtin_executor_type
+| @builtin_fixed_array_type
+| @builtin_float_type
+| @builtin_job_type
+| @builtin_native_object_type
+| @builtin_raw_pointer_type
+| @builtin_raw_unsafe_continuation_type
+| @builtin_unsafe_value_buffer_type
+| @builtin_vector_type
+;
+
+dependent_member_types(  //dir=type
+  unique int id: @dependent_member_type,
+  int base_type: @type_or_none ref,
+  int associated_type_decl: @associated_type_decl_or_none ref
+);
+
+dynamic_self_types(  //dir=type
+  unique int id: @dynamic_self_type,
+  int static_self_type: @type_or_none ref
+);
+
+error_types(  //dir=type
+  unique int id: @error_type
+);
+
+existential_types(  //dir=type
+  unique int id: @existential_type,
+  int constraint: @type_or_none ref
+);
+
+in_out_types(  //dir=type
+  unique int id: @in_out_type,
+  int object_type: @type_or_none ref
+);
+
+integer_types(  //dir=type
+  unique int id: @integer_type,
+  string value: string ref
+);
+
+l_value_types(  //dir=type
+  unique int id: @l_value_type,
+  int object_type: @type_or_none ref
+);
+
+module_types(  //dir=type
+  unique int id: @module_type,
+  int module: @module_decl_or_none ref
+);
+
+pack_element_types(  //dir=type
+  unique int id: @pack_element_type,
+  int pack_type: @type_or_none ref
+);
+
+pack_expansion_types(  //dir=type
+  unique int id: @pack_expansion_type,
+  int pattern_type: @type_or_none ref,
+  int count_type: @type_or_none ref
+);
+
+pack_types(  //dir=type
+  unique int id: @pack_type
+);
+
+#keyset[id, index]
+pack_type_elements(  //dir=type
+  int id: @pack_type ref,
+  int index: int ref,
+  int element: @type_or_none ref
+);
+
+parameterized_protocol_types(  //dir=type
+  unique int id: @parameterized_protocol_type,
+  int base: @protocol_type_or_none ref
+);
+
+#keyset[id, index]
+parameterized_protocol_type_args(  //dir=type
+  int id: @parameterized_protocol_type ref,
+  int index: int ref,
+  int arg: @type_or_none ref
+);
+
+protocol_composition_types(  //dir=type
+  unique int id: @protocol_composition_type
+);
+
+#keyset[id, index]
+protocol_composition_type_members(  //dir=type
+  int id: @protocol_composition_type ref,
+  int index: int ref,
+  int member: @type_or_none ref
+);
+
+@reference_storage_type =
+  @unmanaged_storage_type
+| @unowned_storage_type
+| @weak_storage_type
+;
+
+#keyset[id]
+reference_storage_types(  //dir=type
+  int id: @reference_storage_type ref,
+  int referent_type: @type_or_none ref
+);
+
+@substitutable_type =
+  @archetype_type
+| @generic_type_param_type
+;
+
+@sugar_type =
+  @paren_type
+| @syntax_sugar_type
+| @type_alias_type
+;
+
+tuple_types(  //dir=type
+  unique int id: @tuple_type
+);
+
+#keyset[id, index]
+tuple_type_types(  //dir=type
+  int id: @tuple_type ref,
+  int index: int ref,
+  int type_: @type_or_none ref
+);
+
+#keyset[id, index]
+tuple_type_names(  //dir=type
+  int id: @tuple_type ref,
+  int index: int ref,
+  string name: string ref
+);
+
+unresolved_types(  //dir=type
+  unique int id: @unresolved_type
+);
+
+@any_builtin_integer_type =
+  @builtin_integer_literal_type
+| @builtin_integer_type
+;
+
+@archetype_type =
+  @local_archetype_type
+| @opaque_type_archetype_type
+| @pack_archetype_type
+| @primary_archetype_type
+;
+
+#keyset[id]
+archetype_types(  //dir=type
+  int id: @archetype_type ref,
+  int interface_type: @type_or_none ref
+);
+
+#keyset[id]
+archetype_type_superclasses(  //dir=type
+  int id: @archetype_type ref,
+  int superclass: @type_or_none ref
+);
+
+#keyset[id, index]
+archetype_type_protocols(  //dir=type
+  int id: @archetype_type ref,
+  int index: int ref,
+  int protocol: @protocol_decl_or_none ref
+);
+
+builtin_bridge_object_types(  //dir=type
+  unique int id: @builtin_bridge_object_type
+);
+
+builtin_default_actor_storage_types(  //dir=type
+  unique int id: @builtin_default_actor_storage_type
+);
+
+builtin_executor_types(  //dir=type
+  unique int id: @builtin_executor_type
+);
+
+builtin_fixed_array_types(  //dir=type
+  unique int id: @builtin_fixed_array_type
+);
+
+builtin_float_types(  //dir=type
+  unique int id: @builtin_float_type
+);
+
+builtin_job_types(  //dir=type
+  unique int id: @builtin_job_type
+);
+
+builtin_native_object_types(  //dir=type
+  unique int id: @builtin_native_object_type
+);
+
+builtin_raw_pointer_types(  //dir=type
+  unique int id: @builtin_raw_pointer_type
+);
+
+builtin_raw_unsafe_continuation_types(  //dir=type
+  unique int id: @builtin_raw_unsafe_continuation_type
+);
+
+builtin_unsafe_value_buffer_types(  //dir=type
+  unique int id: @builtin_unsafe_value_buffer_type
+);
+
+builtin_vector_types(  //dir=type
+  unique int id: @builtin_vector_type
+);
+
+existential_metatype_types(  //dir=type
+  unique int id: @existential_metatype_type
+);
+
+function_types(  //dir=type
+  unique int id: @function_type
+);
+
+generic_function_types(  //dir=type
+  unique int id: @generic_function_type
+);
+
+#keyset[id, index]
+generic_function_type_generic_params(  //dir=type
+  int id: @generic_function_type ref,
+  int index: int ref,
+  int generic_param: @generic_type_param_type_or_none ref
+);
+
+generic_type_param_types(  //dir=type
+  unique int id: @generic_type_param_type
+);
+
+metatype_types(  //dir=type
+  unique int id: @metatype_type
+);
+
+@nominal_or_bound_generic_nominal_type =
+  @bound_generic_type
+| @nominal_type
+;
+
+paren_types(  //dir=type
+  unique int id: @paren_type,
+  int type_: @type_or_none ref
+);
+
+@syntax_sugar_type =
+  @dictionary_type
+| @unary_syntax_sugar_type
+;
+
+type_alias_types(  //dir=type
+  unique int id: @type_alias_type,
+  int decl: @type_alias_decl_or_none ref
+);
+
+unbound_generic_types(  //dir=type
+  unique int id: @unbound_generic_type
+);
+
+unmanaged_storage_types(  //dir=type
+  unique int id: @unmanaged_storage_type
+);
+
+unowned_storage_types(  //dir=type
+  unique int id: @unowned_storage_type
+);
+
+weak_storage_types(  //dir=type
+  unique int id: @weak_storage_type
+);
+
+@bound_generic_type =
+  @bound_generic_class_type
+| @bound_generic_enum_type
+| @bound_generic_struct_type
+;
+
+#keyset[id, index]
+bound_generic_type_arg_types(  //dir=type
+  int id: @bound_generic_type ref,
+  int index: int ref,
+  int arg_type: @type_or_none ref
+);
+
+builtin_integer_literal_types(  //dir=type
+  unique int id: @builtin_integer_literal_type
+);
+
+builtin_integer_types(  //dir=type
+  unique int id: @builtin_integer_type
+);
+
+#keyset[id]
+builtin_integer_type_widths(  //dir=type
+  int id: @builtin_integer_type ref,
+  int width: int ref
+);
+
+dictionary_types(  //dir=type
+  unique int id: @dictionary_type,
+  int key_type: @type_or_none ref,
+  int value_type: @type_or_none ref
+);
+
+@local_archetype_type =
+  @element_archetype_type
+| @existential_archetype_type
+;
+
+@nominal_type =
+  @class_type
+| @enum_type
+| @protocol_type
+| @struct_type
+;
+
+opaque_type_archetype_types(  //dir=type
+  unique int id: @opaque_type_archetype_type,
+  int declaration: @opaque_type_decl_or_none ref
+);
+
+pack_archetype_types(  //dir=type
+  unique int id: @pack_archetype_type
+);
+
+primary_archetype_types(  //dir=type
+  unique int id: @primary_archetype_type
+);
+
+@unary_syntax_sugar_type =
+  @array_slice_type
+| @optional_type
+| @variadic_sequence_type
+;
+
+#keyset[id]
+unary_syntax_sugar_types(  //dir=type
+  int id: @unary_syntax_sugar_type ref,
+  int base_type: @type_or_none ref
+);
+
+array_slice_types(  //dir=type
+  unique int id: @array_slice_type
+);
+
+bound_generic_class_types(  //dir=type
+  unique int id: @bound_generic_class_type
+);
+
+bound_generic_enum_types(  //dir=type
+  unique int id: @bound_generic_enum_type
+);
+
+bound_generic_struct_types(  //dir=type
+  unique int id: @bound_generic_struct_type
+);
+
+class_types(  //dir=type
+  unique int id: @class_type
+);
+
+element_archetype_types(  //dir=type
+  unique int id: @element_archetype_type
+);
+
+enum_types(  //dir=type
+  unique int id: @enum_type
+);
+
+existential_archetype_types(  //dir=type
+  unique int id: @existential_archetype_type
+);
+
+optional_types(  //dir=type
+  unique int id: @optional_type
+);
+
+protocol_types(  //dir=type
+  unique int id: @protocol_type
+);
+
+struct_types(  //dir=type
+  unique int id: @struct_type
+);
+
+variadic_sequence_types(  //dir=type
+  unique int id: @variadic_sequence_type
+);
+
+@accessor_or_none =
+  @accessor
+| @unspecified_element
+;
+
+@argument_or_none =
+  @argument
+| @unspecified_element
+;
+
+@associated_type_decl_or_none =
+  @associated_type_decl
+| @unspecified_element
+;
+
+@ast_node_or_none =
+  @ast_node
+| @unspecified_element
+;
+
+@availability_info_or_none =
+  @availability_info
+| @unspecified_element
+;
+
+@availability_spec_or_none =
+  @availability_spec
+| @unspecified_element
+;
+
+@brace_stmt_or_none =
+  @brace_stmt
+| @unspecified_element
+;
+
+@captured_decl_or_none =
+  @captured_decl
+| @unspecified_element
+;
+
+@case_label_item_or_none =
+  @case_label_item
+| @unspecified_element
+;
+
+@case_stmt_or_none =
+  @case_stmt
+| @unspecified_element
+;
+
+@closure_expr_or_none =
+  @closure_expr
+| @unspecified_element
+;
+
+@condition_element_or_none =
+  @condition_element
+| @unspecified_element
+;
+
+@decl_or_none =
+  @decl
+| @unspecified_element
+;
+
+@enum_element_decl_or_none =
+  @enum_element_decl
+| @unspecified_element
+;
+
+@expr_or_none =
+  @expr
+| @unspecified_element
+;
+
+@file_or_none =
+  @file
+| @unspecified_element
+;
+
+@function_or_none =
+  @function
+| @unspecified_element
+;
+
+@generic_type_decl_or_none =
+  @generic_type_decl
+| @unspecified_element
+;
+
+@generic_type_param_decl_or_none =
+  @generic_type_param_decl
+| @unspecified_element
+;
+
+@generic_type_param_type_or_none =
+  @generic_type_param_type
+| @unspecified_element
+;
+
+@initializer_or_none =
+  @initializer
+| @unspecified_element
+;
+
+@key_path_component_or_none =
+  @key_path_component
+| @unspecified_element
+;
+
+@location_or_none =
+  @location
+| @unspecified_element
+;
+
+@macro_role_or_none =
+  @macro_role
+| @unspecified_element
+;
+
+@module_decl_or_none =
+  @module_decl
+| @unspecified_element
+;
+
+@nominal_type_decl_or_none =
+  @nominal_type_decl
+| @unspecified_element
+;
+
+@opaque_type_decl_or_none =
+  @opaque_type_decl
+| @unspecified_element
+;
+
+@opaque_value_expr_or_none =
+  @opaque_value_expr
+| @unspecified_element
+;
+
+@param_decl_or_none =
+  @param_decl
+| @unspecified_element
+;
+
+@pattern_or_none =
+  @pattern
+| @unspecified_element
+;
+
+@pattern_binding_decl_or_none =
+  @pattern_binding_decl
+| @unspecified_element
+;
+
+@precedence_group_decl_or_none =
+  @precedence_group_decl
+| @unspecified_element
+;
+
+@protocol_decl_or_none =
+  @protocol_decl
+| @unspecified_element
+;
+
+@protocol_type_or_none =
+  @protocol_type
+| @unspecified_element
+;
+
+@stmt_or_none =
+  @stmt
+| @unspecified_element
+;
+
+@stmt_condition_or_none =
+  @stmt_condition
+| @unspecified_element
+;
+
+@string_literal_expr_or_none =
+  @string_literal_expr
+| @unspecified_element
+;
+
+@tap_expr_or_none =
+  @tap_expr
+| @unspecified_element
+;
+
+@type_or_none =
+  @type
+| @unspecified_element
+;
+
+@type_alias_decl_or_none =
+  @type_alias_decl
+| @unspecified_element
+;
+
+@type_repr_or_none =
+  @type_repr
+| @unspecified_element
+;
+
+@value_decl_or_none =
+  @unspecified_element
+| @value_decl
+;
+
+@var_decl_or_none =
+  @unspecified_element
+| @var_decl
+;
diff --git a/swift/downgrades/b7006eaacb007a06251596835506185619b86e98/opened_archetype_types.ql b/swift/downgrades/b7006eaacb007a06251596835506185619b86e98/opened_archetype_types.ql
new file mode 100644
index 00000000000..dd235725393
--- /dev/null
+++ b/swift/downgrades/b7006eaacb007a06251596835506185619b86e98/opened_archetype_types.ql
@@ -0,0 +1,7 @@
+class ExistentialArchetypeType extends @existential_archetype_type {
+  string toString() { none() }
+}
+
+from ExistentialArchetypeType id
+where existential_archetype_types(id)
+select id
diff --git a/swift/downgrades/b7006eaacb007a06251596835506185619b86e98/swift.dbscheme b/swift/downgrades/b7006eaacb007a06251596835506185619b86e98/swift.dbscheme
new file mode 100644
index 00000000000..987ab0bc091
--- /dev/null
+++ b/swift/downgrades/b7006eaacb007a06251596835506185619b86e98/swift.dbscheme
@@ -0,0 +1,2832 @@
+// generated by codegen/codegen.py, do not edit
+
+// from prefix.dbscheme
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(
+  string prefix: string ref
+);
+
+
+// from schema.py
+
+@element =
+  @file
+| @generic_context
+| @locatable
+| @location
+| @type
+;
+
+#keyset[id]
+element_is_unknown(
+  int id: @element ref
+);
+
+@file =
+  @db_file
+;
+
+#keyset[id]
+files(
+  int id: @file ref,
+  string name: string ref
+);
+
+#keyset[id]
+file_is_successfully_extracted(
+  int id: @file ref
+);
+
+@locatable =
+  @argument
+| @ast_node
+| @comment
+| @diagnostics
+| @error_element
+;
+
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_or_none ref
+);
+
+@location =
+  @db_location
+;
+
+#keyset[id]
+locations(
+  int id: @location ref,
+  int file: @file_or_none ref,
+  int start_line: int ref,
+  int start_column: int ref,
+  int end_line: int ref,
+  int end_column: int ref
+);
+
+@ast_node =
+  @availability_info
+| @availability_spec
+| @callable
+| @case_label_item
+| @condition_element
+| @decl
+| @expr
+| @key_path_component
+| @macro_role
+| @pattern
+| @stmt
+| @stmt_condition
+| @type_repr
+;
+
+comments(
+  unique int id: @comment,
+  string text: string ref
+);
+
+db_files(
+  unique int id: @db_file
+);
+
+db_locations(
+  unique int id: @db_location
+);
+
+diagnostics(
+  unique int id: @diagnostics,
+  string text: string ref,
+  int kind: int ref
+);
+
+@error_element =
+  @error_expr
+| @error_type
+| @overloaded_decl_ref_expr
+| @unresolved_decl_ref_expr
+| @unresolved_dot_expr
+| @unresolved_member_chain_result_expr
+| @unresolved_member_expr
+| @unresolved_pattern_expr
+| @unresolved_specialize_expr
+| @unresolved_type
+| @unresolved_type_conversion_expr
+| @unspecified_element
+;
+
+availability_infos(
+  unique int id: @availability_info
+);
+
+#keyset[id]
+availability_info_is_unavailable(
+  int id: @availability_info ref
+);
+
+#keyset[id, index]
+availability_info_specs(
+  int id: @availability_info ref,
+  int index: int ref,
+  int spec: @availability_spec_or_none ref
+);
+
+@availability_spec =
+  @other_availability_spec
+| @platform_version_availability_spec
+;
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_names(
+  int id: @callable ref,
+  string name: string ref
+);
+
+#keyset[id]
+callable_self_params(
+  int id: @callable ref,
+  int self_param: @param_decl_or_none ref
+);
+
+#keyset[id, index]
+callable_params(
+  int id: @callable ref,
+  int index: int ref,
+  int param: @param_decl_or_none ref
+);
+
+#keyset[id]
+callable_bodies(
+  int id: @callable ref,
+  int body: @brace_stmt_or_none ref
+);
+
+#keyset[id, index]
+callable_captures(
+  int id: @callable ref,
+  int index: int ref,
+  int capture: @captured_decl_or_none ref
+);
+
+key_path_components(
+  unique int id: @key_path_component,
+  int kind: int ref,
+  int component_type: @type_or_none ref
+);
+
+#keyset[id, index]
+key_path_component_subscript_arguments(
+  int id: @key_path_component ref,
+  int index: int ref,
+  int subscript_argument: @argument_or_none ref
+);
+
+#keyset[id]
+key_path_component_tuple_indices(
+  int id: @key_path_component ref,
+  int tuple_index: int ref
+);
+
+#keyset[id]
+key_path_component_decl_refs(
+  int id: @key_path_component ref,
+  int decl_ref: @value_decl_or_none ref
+);
+
+macro_roles(
+  unique int id: @macro_role,
+  int kind: int ref,
+  int macro_syntax: int ref
+);
+
+#keyset[id, index]
+macro_role_conformances(
+  int id: @macro_role ref,
+  int index: int ref,
+  int conformance: @expr_or_none ref
+);
+
+#keyset[id, index]
+macro_role_names(
+  int id: @macro_role ref,
+  int index: int ref,
+  string name: string ref
+);
+
+unspecified_elements(
+  unique int id: @unspecified_element,
+  string property: string ref,
+  string error: string ref
+);
+
+#keyset[id]
+unspecified_element_parents(
+  int id: @unspecified_element ref,
+  int parent: @element ref
+);
+
+#keyset[id]
+unspecified_element_indices(
+  int id: @unspecified_element ref,
+  int index: int ref
+);
+
+#keyset[id, index]
+unspecified_element_children(
+  int id: @unspecified_element ref,
+  int index: int ref,
+  int child: @ast_node_or_none ref
+);
+
+other_availability_specs(
+  unique int id: @other_availability_spec
+);
+
+platform_version_availability_specs(
+  unique int id: @platform_version_availability_spec,
+  string platform: string ref,
+  string version: string ref
+);
+
+@decl =
+  @captured_decl
+| @enum_case_decl
+| @extension_decl
+| @if_config_decl
+| @import_decl
+| @missing_member_decl
+| @operator_decl
+| @pattern_binding_decl
+| @pound_diagnostic_decl
+| @precedence_group_decl
+| @top_level_code_decl
+| @value_decl
+;
+
+#keyset[id]
+decls(  //dir=decl
+  int id: @decl ref,
+  int module: @module_decl_or_none ref
+);
+
+#keyset[id, index]
+decl_members(  //dir=decl
+  int id: @decl ref,
+  int index: int ref,
+  int member: @decl_or_none ref
+);
+
+@generic_context =
+  @extension_decl
+| @function
+| @generic_type_decl
+| @macro_decl
+| @subscript_decl
+;
+
+#keyset[id, index]
+generic_context_generic_type_params(  //dir=decl
+  int id: @generic_context ref,
+  int index: int ref,
+  int generic_type_param: @generic_type_param_decl_or_none ref
+);
+
+captured_decls(  //dir=decl
+  unique int id: @captured_decl,
+  int decl: @value_decl_or_none ref
+);
+
+#keyset[id]
+captured_decl_is_direct(  //dir=decl
+  int id: @captured_decl ref
+);
+
+#keyset[id]
+captured_decl_is_escaping(  //dir=decl
+  int id: @captured_decl ref
+);
+
+enum_case_decls(  //dir=decl
+  unique int id: @enum_case_decl
+);
+
+#keyset[id, index]
+enum_case_decl_elements(  //dir=decl
+  int id: @enum_case_decl ref,
+  int index: int ref,
+  int element: @enum_element_decl_or_none ref
+);
+
+extension_decls(  //dir=decl
+  unique int id: @extension_decl,
+  int extended_type_decl: @nominal_type_decl_or_none ref
+);
+
+#keyset[id, index]
+extension_decl_protocols(  //dir=decl
+  int id: @extension_decl ref,
+  int index: int ref,
+  int protocol: @protocol_decl_or_none ref
+);
+
+if_config_decls(  //dir=decl
+  unique int id: @if_config_decl
+);
+
+#keyset[id, index]
+if_config_decl_active_elements(  //dir=decl
+  int id: @if_config_decl ref,
+  int index: int ref,
+  int active_element: @ast_node_or_none ref
+);
+
+import_decls(  //dir=decl
+  unique int id: @import_decl
+);
+
+#keyset[id]
+import_decl_is_exported(  //dir=decl
+  int id: @import_decl ref
+);
+
+#keyset[id]
+import_decl_imported_modules(  //dir=decl
+  int id: @import_decl ref,
+  int imported_module: @module_decl_or_none ref
+);
+
+#keyset[id, index]
+import_decl_declarations(  //dir=decl
+  int id: @import_decl ref,
+  int index: int ref,
+  int declaration: @value_decl_or_none ref
+);
+
+missing_member_decls(  //dir=decl
+  unique int id: @missing_member_decl,
+  string name: string ref
+);
+
+@operator_decl =
+  @infix_operator_decl
+| @postfix_operator_decl
+| @prefix_operator_decl
+;
+
+#keyset[id]
+operator_decls(  //dir=decl
+  int id: @operator_decl ref,
+  string name: string ref
+);
+
+pattern_binding_decls(  //dir=decl
+  unique int id: @pattern_binding_decl
+);
+
+#keyset[id, index]
+pattern_binding_decl_inits(  //dir=decl
+  int id: @pattern_binding_decl ref,
+  int index: int ref,
+  int init: @expr_or_none ref
+);
+
+#keyset[id, index]
+pattern_binding_decl_patterns(  //dir=decl
+  int id: @pattern_binding_decl ref,
+  int index: int ref,
+  int pattern: @pattern_or_none ref
+);
+
+pound_diagnostic_decls(  //dir=decl
+  unique int id: @pound_diagnostic_decl,
+  int kind: int ref,
+  int message: @string_literal_expr_or_none ref
+);
+
+precedence_group_decls(  //dir=decl
+  unique int id: @precedence_group_decl
+);
+
+top_level_code_decls(  //dir=decl
+  unique int id: @top_level_code_decl,
+  int body: @brace_stmt_or_none ref
+);
+
+@value_decl =
+  @abstract_storage_decl
+| @enum_element_decl
+| @function
+| @macro_decl
+| @type_decl
+;
+
+#keyset[id]
+value_decls(  //dir=decl
+  int id: @value_decl ref,
+  int interface_type: @type_or_none ref
+);
+
+@abstract_storage_decl =
+  @subscript_decl
+| @var_decl
+;
+
+#keyset[id, index]
+abstract_storage_decl_accessors(  //dir=decl
+  int id: @abstract_storage_decl ref,
+  int index: int ref,
+  int accessor: @accessor_or_none ref
+);
+
+enum_element_decls(  //dir=decl
+  unique int id: @enum_element_decl,
+  string name: string ref
+);
+
+#keyset[id, index]
+enum_element_decl_params(  //dir=decl
+  int id: @enum_element_decl ref,
+  int index: int ref,
+  int param: @param_decl_or_none ref
+);
+
+@function =
+  @accessor_or_named_function
+| @deinitializer
+| @initializer
+;
+
+infix_operator_decls(  //dir=decl
+  unique int id: @infix_operator_decl
+);
+
+#keyset[id]
+infix_operator_decl_precedence_groups(  //dir=decl
+  int id: @infix_operator_decl ref,
+  int precedence_group: @precedence_group_decl_or_none ref
+);
+
+macro_decls(  //dir=decl
+  unique int id: @macro_decl,
+  string name: string ref
+);
+
+#keyset[id, index]
+macro_decl_parameters(  //dir=decl
+  int id: @macro_decl ref,
+  int index: int ref,
+  int parameter: @param_decl_or_none ref
+);
+
+#keyset[id, index]
+macro_decl_roles(  //dir=decl
+  int id: @macro_decl ref,
+  int index: int ref,
+  int role: @macro_role_or_none ref
+);
+
+postfix_operator_decls(  //dir=decl
+  unique int id: @postfix_operator_decl
+);
+
+prefix_operator_decls(  //dir=decl
+  unique int id: @prefix_operator_decl
+);
+
+@type_decl =
+  @abstract_type_param_decl
+| @generic_type_decl
+| @module_decl
+;
+
+#keyset[id]
+type_decls(  //dir=decl
+  int id: @type_decl ref,
+  string name: string ref
+);
+
+#keyset[id, index]
+type_decl_inherited_types(  //dir=decl
+  int id: @type_decl ref,
+  int index: int ref,
+  int inherited_type: @type_or_none ref
+);
+
+@abstract_type_param_decl =
+  @associated_type_decl
+| @generic_type_param_decl
+;
+
+@accessor_or_named_function =
+  @accessor
+| @named_function
+;
+
+deinitializers(  //dir=decl
+  unique int id: @deinitializer
+);
+
+@generic_type_decl =
+  @nominal_type_decl
+| @opaque_type_decl
+| @type_alias_decl
+;
+
+initializers(  //dir=decl
+  unique int id: @initializer
+);
+
+module_decls(  //dir=decl
+  unique int id: @module_decl
+);
+
+#keyset[id]
+module_decl_is_builtin_module(  //dir=decl
+  int id: @module_decl ref
+);
+
+#keyset[id]
+module_decl_is_system_module(  //dir=decl
+  int id: @module_decl ref
+);
+
+module_decl_imported_modules(  //dir=decl
+  int id: @module_decl ref,
+  int imported_module: @module_decl_or_none ref
+);
+
+module_decl_exported_modules(  //dir=decl
+  int id: @module_decl ref,
+  int exported_module: @module_decl_or_none ref
+);
+
+subscript_decls(  //dir=decl
+  unique int id: @subscript_decl,
+  int element_type: @type_or_none ref
+);
+
+#keyset[id, index]
+subscript_decl_params(  //dir=decl
+  int id: @subscript_decl ref,
+  int index: int ref,
+  int param: @param_decl_or_none ref
+);
+
+@var_decl =
+  @concrete_var_decl
+| @param_decl
+;
+
+#keyset[id]
+var_decls(  //dir=decl
+  int id: @var_decl ref,
+  string name: string ref,
+  int type_: @type_or_none ref
+);
+
+#keyset[id]
+var_decl_attached_property_wrapper_types(  //dir=decl
+  int id: @var_decl ref,
+  int attached_property_wrapper_type: @type_or_none ref
+);
+
+#keyset[id]
+var_decl_parent_patterns(  //dir=decl
+  int id: @var_decl ref,
+  int parent_pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+var_decl_parent_initializers(  //dir=decl
+  int id: @var_decl ref,
+  int parent_initializer: @expr_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_backing_var_bindings(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_backing_var_binding: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_backing_vars(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_backing_var: @var_decl_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_projection_var_bindings(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_projection_var_binding: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_projection_vars(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_projection_var: @var_decl_or_none ref
+);
+
+accessors(  //dir=decl
+  unique int id: @accessor
+);
+
+#keyset[id]
+accessor_is_getter(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_setter(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_will_set(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_did_set(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_read(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_modify(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_unsafe_address(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_unsafe_mutable_address(  //dir=decl
+  int id: @accessor ref
+);
+
+associated_type_decls(  //dir=decl
+  unique int id: @associated_type_decl
+);
+
+concrete_var_decls(  //dir=decl
+  unique int id: @concrete_var_decl,
+  int introducer_int: int ref
+);
+
+generic_type_param_decls(  //dir=decl
+  unique int id: @generic_type_param_decl
+);
+
+named_functions(  //dir=decl
+  unique int id: @named_function
+);
+
+@nominal_type_decl =
+  @class_decl
+| @enum_decl
+| @protocol_decl
+| @struct_decl
+;
+
+#keyset[id]
+nominal_type_decls(  //dir=decl
+  int id: @nominal_type_decl ref,
+  int type_: @type_or_none ref
+);
+
+opaque_type_decls(  //dir=decl
+  unique int id: @opaque_type_decl,
+  int naming_declaration: @value_decl_or_none ref
+);
+
+#keyset[id, index]
+opaque_type_decl_opaque_generic_params(  //dir=decl
+  int id: @opaque_type_decl ref,
+  int index: int ref,
+  int opaque_generic_param: @generic_type_param_type_or_none ref
+);
+
+param_decls(  //dir=decl
+  unique int id: @param_decl
+);
+
+#keyset[id]
+param_decl_is_inout(  //dir=decl
+  int id: @param_decl ref
+);
+
+#keyset[id]
+param_decl_property_wrapper_local_wrapped_var_bindings(  //dir=decl
+  int id: @param_decl ref,
+  int property_wrapper_local_wrapped_var_binding: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+param_decl_property_wrapper_local_wrapped_vars(  //dir=decl
+  int id: @param_decl ref,
+  int property_wrapper_local_wrapped_var: @var_decl_or_none ref
+);
+
+type_alias_decls(  //dir=decl
+  unique int id: @type_alias_decl,
+  int aliased_type: @type_or_none ref
+);
+
+class_decls(  //dir=decl
+  unique int id: @class_decl
+);
+
+enum_decls(  //dir=decl
+  unique int id: @enum_decl
+);
+
+protocol_decls(  //dir=decl
+  unique int id: @protocol_decl
+);
+
+struct_decls(  //dir=decl
+  unique int id: @struct_decl
+);
+
+arguments(  //dir=expr
+  unique int id: @argument,
+  string label: string ref,
+  int expr: @expr_or_none ref
+);
+
+@expr =
+  @any_try_expr
+| @applied_property_wrapper_expr
+| @apply_expr
+| @assign_expr
+| @bind_optional_expr
+| @capture_list_expr
+| @closure_expr
+| @collection_expr
+| @consume_expr
+| @copy_expr
+| @current_context_isolation_expr
+| @decl_ref_expr
+| @default_argument_expr
+| @discard_assignment_expr
+| @dot_syntax_base_ignored_expr
+| @dynamic_type_expr
+| @enum_is_case_expr
+| @error_expr
+| @explicit_cast_expr
+| @extract_function_isolation_expr
+| @force_value_expr
+| @identity_expr
+| @if_expr
+| @implicit_conversion_expr
+| @in_out_expr
+| @key_path_application_expr
+| @key_path_dot_expr
+| @key_path_expr
+| @lazy_initialization_expr
+| @literal_expr
+| @lookup_expr
+| @make_temporarily_escapable_expr
+| @materialize_pack_expr
+| @obj_c_selector_expr
+| @one_way_expr
+| @opaque_value_expr
+| @open_existential_expr
+| @optional_evaluation_expr
+| @other_initializer_ref_expr
+| @overloaded_decl_ref_expr
+| @pack_element_expr
+| @pack_expansion_expr
+| @property_wrapper_value_placeholder_expr
+| @rebind_self_in_initializer_expr
+| @sequence_expr
+| @single_value_stmt_expr
+| @super_ref_expr
+| @tap_expr
+| @tuple_element_expr
+| @tuple_expr
+| @type_expr
+| @type_value_expr
+| @unresolved_decl_ref_expr
+| @unresolved_dot_expr
+| @unresolved_member_expr
+| @unresolved_pattern_expr
+| @unresolved_specialize_expr
+| @vararg_expansion_expr
+;
+
+#keyset[id]
+expr_types(  //dir=expr
+  int id: @expr ref,
+  int type_: @type_or_none ref
+);
+
+@any_try_expr =
+  @force_try_expr
+| @optional_try_expr
+| @try_expr
+;
+
+#keyset[id]
+any_try_exprs(  //dir=expr
+  int id: @any_try_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+applied_property_wrapper_exprs(  //dir=expr
+  unique int id: @applied_property_wrapper_expr,
+  int kind: int ref,
+  int value: @expr_or_none ref,
+  int param: @param_decl_or_none ref
+);
+
+@apply_expr =
+  @binary_expr
+| @call_expr
+| @postfix_unary_expr
+| @prefix_unary_expr
+| @self_apply_expr
+;
+
+#keyset[id]
+apply_exprs(  //dir=expr
+  int id: @apply_expr ref,
+  int function: @expr_or_none ref
+);
+
+#keyset[id, index]
+apply_expr_arguments(  //dir=expr
+  int id: @apply_expr ref,
+  int index: int ref,
+  int argument: @argument_or_none ref
+);
+
+assign_exprs(  //dir=expr
+  unique int id: @assign_expr,
+  int dest: @expr_or_none ref,
+  int source: @expr_or_none ref
+);
+
+bind_optional_exprs(  //dir=expr
+  unique int id: @bind_optional_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+capture_list_exprs(  //dir=expr
+  unique int id: @capture_list_expr,
+  int closure_body: @closure_expr_or_none ref
+);
+
+#keyset[id, index]
+capture_list_expr_binding_decls(  //dir=expr
+  int id: @capture_list_expr ref,
+  int index: int ref,
+  int binding_decl: @pattern_binding_decl_or_none ref
+);
+
+@closure_expr =
+  @auto_closure_expr
+| @explicit_closure_expr
+;
+
+@collection_expr =
+  @array_expr
+| @dictionary_expr
+;
+
+consume_exprs(  //dir=expr
+  unique int id: @consume_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+copy_exprs(  //dir=expr
+  unique int id: @copy_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+current_context_isolation_exprs(  //dir=expr
+  unique int id: @current_context_isolation_expr,
+  int actor: @expr_or_none ref
+);
+
+decl_ref_exprs(  //dir=expr
+  unique int id: @decl_ref_expr,
+  int decl: @decl_or_none ref
+);
+
+#keyset[id, index]
+decl_ref_expr_replacement_types(  //dir=expr
+  int id: @decl_ref_expr ref,
+  int index: int ref,
+  int replacement_type: @type_or_none ref
+);
+
+#keyset[id]
+decl_ref_expr_has_direct_to_storage_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+#keyset[id]
+decl_ref_expr_has_direct_to_implementation_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+#keyset[id]
+decl_ref_expr_has_ordinary_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+#keyset[id]
+decl_ref_expr_has_distributed_thunk_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+default_argument_exprs(  //dir=expr
+  unique int id: @default_argument_expr,
+  int param_decl: @param_decl_or_none ref,
+  int param_index: int ref
+);
+
+#keyset[id]
+default_argument_expr_caller_side_defaults(  //dir=expr
+  int id: @default_argument_expr ref,
+  int caller_side_default: @expr_or_none ref
+);
+
+discard_assignment_exprs(  //dir=expr
+  unique int id: @discard_assignment_expr
+);
+
+dot_syntax_base_ignored_exprs(  //dir=expr
+  unique int id: @dot_syntax_base_ignored_expr,
+  int qualifier: @expr_or_none ref,
+  int sub_expr: @expr_or_none ref
+);
+
+dynamic_type_exprs(  //dir=expr
+  unique int id: @dynamic_type_expr,
+  int base: @expr_or_none ref
+);
+
+enum_is_case_exprs(  //dir=expr
+  unique int id: @enum_is_case_expr,
+  int sub_expr: @expr_or_none ref,
+  int element: @enum_element_decl_or_none ref
+);
+
+error_exprs(  //dir=expr
+  unique int id: @error_expr
+);
+
+@explicit_cast_expr =
+  @checked_cast_expr
+| @coerce_expr
+;
+
+#keyset[id]
+explicit_cast_exprs(  //dir=expr
+  int id: @explicit_cast_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+extract_function_isolation_exprs(  //dir=expr
+  unique int id: @extract_function_isolation_expr,
+  int function_expr: @expr_or_none ref
+);
+
+force_value_exprs(  //dir=expr
+  unique int id: @force_value_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+@identity_expr =
+  @await_expr
+| @borrow_expr
+| @dot_self_expr
+| @paren_expr
+| @unresolved_member_chain_result_expr
+;
+
+#keyset[id]
+identity_exprs(  //dir=expr
+  int id: @identity_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+if_exprs(  //dir=expr
+  unique int id: @if_expr,
+  int condition: @expr_or_none ref,
+  int then_expr: @expr_or_none ref,
+  int else_expr: @expr_or_none ref
+);
+
+@implicit_conversion_expr =
+  @abi_safe_conversion_expr
+| @actor_isolation_erasure_expr
+| @any_hashable_erasure_expr
+| @archetype_to_super_expr
+| @array_to_pointer_expr
+| @bridge_from_obj_c_expr
+| @bridge_to_obj_c_expr
+| @class_metatype_to_object_expr
+| @collection_upcast_conversion_expr
+| @conditional_bridge_from_obj_c_expr
+| @covariant_function_conversion_expr
+| @covariant_return_conversion_expr
+| @derived_to_base_expr
+| @destructure_tuple_expr
+| @differentiable_function_expr
+| @differentiable_function_extract_original_expr
+| @erasure_expr
+| @existential_metatype_to_object_expr
+| @foreign_object_conversion_expr
+| @function_conversion_expr
+| @in_out_to_pointer_expr
+| @inject_into_optional_expr
+| @linear_function_expr
+| @linear_function_extract_original_expr
+| @linear_to_differentiable_function_expr
+| @load_expr
+| @metatype_conversion_expr
+| @pointer_to_pointer_expr
+| @protocol_metatype_to_object_expr
+| @string_to_pointer_expr
+| @underlying_to_opaque_expr
+| @unevaluated_instance_expr
+| @unreachable_expr
+| @unresolved_type_conversion_expr
+| @unsafe_cast_expr
+;
+
+#keyset[id]
+implicit_conversion_exprs(  //dir=expr
+  int id: @implicit_conversion_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+in_out_exprs(  //dir=expr
+  unique int id: @in_out_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+key_path_application_exprs(  //dir=expr
+  unique int id: @key_path_application_expr,
+  int base: @expr_or_none ref,
+  int key_path: @expr_or_none ref
+);
+
+key_path_dot_exprs(  //dir=expr
+  unique int id: @key_path_dot_expr
+);
+
+key_path_exprs(  //dir=expr
+  unique int id: @key_path_expr
+);
+
+#keyset[id]
+key_path_expr_roots(  //dir=expr
+  int id: @key_path_expr ref,
+  int root: @type_repr_or_none ref
+);
+
+#keyset[id, index]
+key_path_expr_components(  //dir=expr
+  int id: @key_path_expr ref,
+  int index: int ref,
+  int component: @key_path_component_or_none ref
+);
+
+lazy_initialization_exprs(  //dir=expr
+  unique int id: @lazy_initialization_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+@literal_expr =
+  @builtin_literal_expr
+| @interpolated_string_literal_expr
+| @nil_literal_expr
+| @object_literal_expr
+| @regex_literal_expr
+;
+
+@lookup_expr =
+  @dynamic_lookup_expr
+| @member_ref_expr
+| @subscript_expr
+;
+
+#keyset[id]
+lookup_exprs(  //dir=expr
+  int id: @lookup_expr ref,
+  int base: @expr_or_none ref
+);
+
+#keyset[id]
+lookup_expr_members(  //dir=expr
+  int id: @lookup_expr ref,
+  int member: @decl_or_none ref
+);
+
+make_temporarily_escapable_exprs(  //dir=expr
+  unique int id: @make_temporarily_escapable_expr,
+  int escaping_closure: @opaque_value_expr_or_none ref,
+  int nonescaping_closure: @expr_or_none ref,
+  int sub_expr: @expr_or_none ref
+);
+
+materialize_pack_exprs(  //dir=expr
+  unique int id: @materialize_pack_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+obj_c_selector_exprs(  //dir=expr
+  unique int id: @obj_c_selector_expr,
+  int sub_expr: @expr_or_none ref,
+  int method: @function_or_none ref
+);
+
+one_way_exprs(  //dir=expr
+  unique int id: @one_way_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+opaque_value_exprs(  //dir=expr
+  unique int id: @opaque_value_expr
+);
+
+open_existential_exprs(  //dir=expr
+  unique int id: @open_existential_expr,
+  int sub_expr: @expr_or_none ref,
+  int existential: @expr_or_none ref,
+  int opaque_expr: @opaque_value_expr_or_none ref
+);
+
+optional_evaluation_exprs(  //dir=expr
+  unique int id: @optional_evaluation_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+other_initializer_ref_exprs(  //dir=expr
+  unique int id: @other_initializer_ref_expr,
+  int initializer: @initializer_or_none ref
+);
+
+overloaded_decl_ref_exprs(  //dir=expr
+  unique int id: @overloaded_decl_ref_expr
+);
+
+#keyset[id, index]
+overloaded_decl_ref_expr_possible_declarations(  //dir=expr
+  int id: @overloaded_decl_ref_expr ref,
+  int index: int ref,
+  int possible_declaration: @value_decl_or_none ref
+);
+
+pack_element_exprs(  //dir=expr
+  unique int id: @pack_element_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+pack_expansion_exprs(  //dir=expr
+  unique int id: @pack_expansion_expr,
+  int pattern_expr: @expr_or_none ref
+);
+
+property_wrapper_value_placeholder_exprs(  //dir=expr
+  unique int id: @property_wrapper_value_placeholder_expr,
+  int placeholder: @opaque_value_expr_or_none ref
+);
+
+#keyset[id]
+property_wrapper_value_placeholder_expr_wrapped_values(  //dir=expr
+  int id: @property_wrapper_value_placeholder_expr ref,
+  int wrapped_value: @expr_or_none ref
+);
+
+rebind_self_in_initializer_exprs(  //dir=expr
+  unique int id: @rebind_self_in_initializer_expr,
+  int sub_expr: @expr_or_none ref,
+  int self: @var_decl_or_none ref
+);
+
+sequence_exprs(  //dir=expr
+  unique int id: @sequence_expr
+);
+
+#keyset[id, index]
+sequence_expr_elements(  //dir=expr
+  int id: @sequence_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+single_value_stmt_exprs(  //dir=expr
+  unique int id: @single_value_stmt_expr,
+  int stmt: @stmt_or_none ref
+);
+
+super_ref_exprs(  //dir=expr
+  unique int id: @super_ref_expr,
+  int self: @var_decl_or_none ref
+);
+
+tap_exprs(  //dir=expr
+  unique int id: @tap_expr,
+  int body: @brace_stmt_or_none ref,
+  int var: @var_decl_or_none ref
+);
+
+#keyset[id]
+tap_expr_sub_exprs(  //dir=expr
+  int id: @tap_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+tuple_element_exprs(  //dir=expr
+  unique int id: @tuple_element_expr,
+  int sub_expr: @expr_or_none ref,
+  int index: int ref
+);
+
+tuple_exprs(  //dir=expr
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_elements(  //dir=expr
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+type_exprs(  //dir=expr
+  unique int id: @type_expr
+);
+
+#keyset[id]
+type_expr_type_reprs(  //dir=expr
+  int id: @type_expr ref,
+  int type_repr: @type_repr_or_none ref
+);
+
+type_value_exprs(  //dir=expr
+  unique int id: @type_value_expr,
+  int type_repr: @type_repr_or_none ref
+);
+
+unresolved_decl_ref_exprs(  //dir=expr
+  unique int id: @unresolved_decl_ref_expr
+);
+
+#keyset[id]
+unresolved_decl_ref_expr_names(  //dir=expr
+  int id: @unresolved_decl_ref_expr ref,
+  string name: string ref
+);
+
+unresolved_dot_exprs(  //dir=expr
+  unique int id: @unresolved_dot_expr,
+  int base: @expr_or_none ref,
+  string name: string ref
+);
+
+unresolved_member_exprs(  //dir=expr
+  unique int id: @unresolved_member_expr,
+  string name: string ref
+);
+
+unresolved_pattern_exprs(  //dir=expr
+  unique int id: @unresolved_pattern_expr,
+  int sub_pattern: @pattern_or_none ref
+);
+
+unresolved_specialize_exprs(  //dir=expr
+  unique int id: @unresolved_specialize_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+vararg_expansion_exprs(  //dir=expr
+  unique int id: @vararg_expansion_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+abi_safe_conversion_exprs(  //dir=expr
+  unique int id: @abi_safe_conversion_expr
+);
+
+actor_isolation_erasure_exprs(  //dir=expr
+  unique int id: @actor_isolation_erasure_expr
+);
+
+any_hashable_erasure_exprs(  //dir=expr
+  unique int id: @any_hashable_erasure_expr
+);
+
+archetype_to_super_exprs(  //dir=expr
+  unique int id: @archetype_to_super_expr
+);
+
+array_exprs(  //dir=expr
+  unique int id: @array_expr
+);
+
+#keyset[id, index]
+array_expr_elements(  //dir=expr
+  int id: @array_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+array_to_pointer_exprs(  //dir=expr
+  unique int id: @array_to_pointer_expr
+);
+
+auto_closure_exprs(  //dir=expr
+  unique int id: @auto_closure_expr
+);
+
+await_exprs(  //dir=expr
+  unique int id: @await_expr
+);
+
+binary_exprs(  //dir=expr
+  unique int id: @binary_expr
+);
+
+borrow_exprs(  //dir=expr
+  unique int id: @borrow_expr
+);
+
+bridge_from_obj_c_exprs(  //dir=expr
+  unique int id: @bridge_from_obj_c_expr
+);
+
+bridge_to_obj_c_exprs(  //dir=expr
+  unique int id: @bridge_to_obj_c_expr
+);
+
+@builtin_literal_expr =
+  @boolean_literal_expr
+| @magic_identifier_literal_expr
+| @number_literal_expr
+| @string_literal_expr
+;
+
+call_exprs(  //dir=expr
+  unique int id: @call_expr
+);
+
+@checked_cast_expr =
+  @conditional_checked_cast_expr
+| @forced_checked_cast_expr
+| @is_expr
+;
+
+class_metatype_to_object_exprs(  //dir=expr
+  unique int id: @class_metatype_to_object_expr
+);
+
+coerce_exprs(  //dir=expr
+  unique int id: @coerce_expr
+);
+
+collection_upcast_conversion_exprs(  //dir=expr
+  unique int id: @collection_upcast_conversion_expr
+);
+
+conditional_bridge_from_obj_c_exprs(  //dir=expr
+  unique int id: @conditional_bridge_from_obj_c_expr
+);
+
+covariant_function_conversion_exprs(  //dir=expr
+  unique int id: @covariant_function_conversion_expr
+);
+
+covariant_return_conversion_exprs(  //dir=expr
+  unique int id: @covariant_return_conversion_expr
+);
+
+derived_to_base_exprs(  //dir=expr
+  unique int id: @derived_to_base_expr
+);
+
+destructure_tuple_exprs(  //dir=expr
+  unique int id: @destructure_tuple_expr
+);
+
+dictionary_exprs(  //dir=expr
+  unique int id: @dictionary_expr
+);
+
+#keyset[id, index]
+dictionary_expr_elements(  //dir=expr
+  int id: @dictionary_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+differentiable_function_exprs(  //dir=expr
+  unique int id: @differentiable_function_expr
+);
+
+differentiable_function_extract_original_exprs(  //dir=expr
+  unique int id: @differentiable_function_extract_original_expr
+);
+
+dot_self_exprs(  //dir=expr
+  unique int id: @dot_self_expr
+);
+
+@dynamic_lookup_expr =
+  @dynamic_member_ref_expr
+| @dynamic_subscript_expr
+;
+
+erasure_exprs(  //dir=expr
+  unique int id: @erasure_expr
+);
+
+existential_metatype_to_object_exprs(  //dir=expr
+  unique int id: @existential_metatype_to_object_expr
+);
+
+explicit_closure_exprs(  //dir=expr
+  unique int id: @explicit_closure_expr
+);
+
+force_try_exprs(  //dir=expr
+  unique int id: @force_try_expr
+);
+
+foreign_object_conversion_exprs(  //dir=expr
+  unique int id: @foreign_object_conversion_expr
+);
+
+function_conversion_exprs(  //dir=expr
+  unique int id: @function_conversion_expr
+);
+
+in_out_to_pointer_exprs(  //dir=expr
+  unique int id: @in_out_to_pointer_expr
+);
+
+inject_into_optional_exprs(  //dir=expr
+  unique int id: @inject_into_optional_expr
+);
+
+interpolated_string_literal_exprs(  //dir=expr
+  unique int id: @interpolated_string_literal_expr
+);
+
+#keyset[id]
+interpolated_string_literal_expr_interpolation_exprs(  //dir=expr
+  int id: @interpolated_string_literal_expr ref,
+  int interpolation_expr: @opaque_value_expr_or_none ref
+);
+
+#keyset[id]
+interpolated_string_literal_expr_appending_exprs(  //dir=expr
+  int id: @interpolated_string_literal_expr ref,
+  int appending_expr: @tap_expr_or_none ref
+);
+
+linear_function_exprs(  //dir=expr
+  unique int id: @linear_function_expr
+);
+
+linear_function_extract_original_exprs(  //dir=expr
+  unique int id: @linear_function_extract_original_expr
+);
+
+linear_to_differentiable_function_exprs(  //dir=expr
+  unique int id: @linear_to_differentiable_function_expr
+);
+
+load_exprs(  //dir=expr
+  unique int id: @load_expr
+);
+
+member_ref_exprs(  //dir=expr
+  unique int id: @member_ref_expr
+);
+
+#keyset[id]
+member_ref_expr_has_direct_to_storage_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+#keyset[id]
+member_ref_expr_has_direct_to_implementation_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+#keyset[id]
+member_ref_expr_has_ordinary_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+#keyset[id]
+member_ref_expr_has_distributed_thunk_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+metatype_conversion_exprs(  //dir=expr
+  unique int id: @metatype_conversion_expr
+);
+
+nil_literal_exprs(  //dir=expr
+  unique int id: @nil_literal_expr
+);
+
+object_literal_exprs(  //dir=expr
+  unique int id: @object_literal_expr,
+  int kind: int ref
+);
+
+#keyset[id, index]
+object_literal_expr_arguments(  //dir=expr
+  int id: @object_literal_expr ref,
+  int index: int ref,
+  int argument: @argument_or_none ref
+);
+
+optional_try_exprs(  //dir=expr
+  unique int id: @optional_try_expr
+);
+
+paren_exprs(  //dir=expr
+  unique int id: @paren_expr
+);
+
+pointer_to_pointer_exprs(  //dir=expr
+  unique int id: @pointer_to_pointer_expr
+);
+
+postfix_unary_exprs(  //dir=expr
+  unique int id: @postfix_unary_expr
+);
+
+prefix_unary_exprs(  //dir=expr
+  unique int id: @prefix_unary_expr
+);
+
+protocol_metatype_to_object_exprs(  //dir=expr
+  unique int id: @protocol_metatype_to_object_expr
+);
+
+regex_literal_exprs(  //dir=expr
+  unique int id: @regex_literal_expr,
+  string pattern: string ref,
+  int version: int ref
+);
+
+@self_apply_expr =
+  @dot_syntax_call_expr
+| @initializer_ref_call_expr
+;
+
+#keyset[id]
+self_apply_exprs(  //dir=expr
+  int id: @self_apply_expr ref,
+  int base: @expr_or_none ref
+);
+
+string_to_pointer_exprs(  //dir=expr
+  unique int id: @string_to_pointer_expr
+);
+
+subscript_exprs(  //dir=expr
+  unique int id: @subscript_expr
+);
+
+#keyset[id, index]
+subscript_expr_arguments(  //dir=expr
+  int id: @subscript_expr ref,
+  int index: int ref,
+  int argument: @argument_or_none ref
+);
+
+#keyset[id]
+subscript_expr_has_direct_to_storage_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+#keyset[id]
+subscript_expr_has_direct_to_implementation_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+#keyset[id]
+subscript_expr_has_ordinary_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+#keyset[id]
+subscript_expr_has_distributed_thunk_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+try_exprs(  //dir=expr
+  unique int id: @try_expr
+);
+
+underlying_to_opaque_exprs(  //dir=expr
+  unique int id: @underlying_to_opaque_expr
+);
+
+unevaluated_instance_exprs(  //dir=expr
+  unique int id: @unevaluated_instance_expr
+);
+
+unreachable_exprs(  //dir=expr
+  unique int id: @unreachable_expr
+);
+
+unresolved_member_chain_result_exprs(  //dir=expr
+  unique int id: @unresolved_member_chain_result_expr
+);
+
+unresolved_type_conversion_exprs(  //dir=expr
+  unique int id: @unresolved_type_conversion_expr
+);
+
+unsafe_cast_exprs(  //dir=expr
+  unique int id: @unsafe_cast_expr
+);
+
+boolean_literal_exprs(  //dir=expr
+  unique int id: @boolean_literal_expr,
+  boolean value: boolean ref
+);
+
+conditional_checked_cast_exprs(  //dir=expr
+  unique int id: @conditional_checked_cast_expr
+);
+
+dot_syntax_call_exprs(  //dir=expr
+  unique int id: @dot_syntax_call_expr
+);
+
+dynamic_member_ref_exprs(  //dir=expr
+  unique int id: @dynamic_member_ref_expr
+);
+
+dynamic_subscript_exprs(  //dir=expr
+  unique int id: @dynamic_subscript_expr
+);
+
+forced_checked_cast_exprs(  //dir=expr
+  unique int id: @forced_checked_cast_expr
+);
+
+initializer_ref_call_exprs(  //dir=expr
+  unique int id: @initializer_ref_call_expr
+);
+
+is_exprs(  //dir=expr
+  unique int id: @is_expr
+);
+
+magic_identifier_literal_exprs(  //dir=expr
+  unique int id: @magic_identifier_literal_expr,
+  string kind: string ref
+);
+
+@number_literal_expr =
+  @float_literal_expr
+| @integer_literal_expr
+;
+
+string_literal_exprs(  //dir=expr
+  unique int id: @string_literal_expr,
+  string value: string ref
+);
+
+float_literal_exprs(  //dir=expr
+  unique int id: @float_literal_expr,
+  string string_value: string ref
+);
+
+integer_literal_exprs(  //dir=expr
+  unique int id: @integer_literal_expr,
+  string string_value: string ref
+);
+
+@pattern =
+  @any_pattern
+| @binding_pattern
+| @bool_pattern
+| @enum_element_pattern
+| @expr_pattern
+| @is_pattern
+| @named_pattern
+| @optional_some_pattern
+| @paren_pattern
+| @tuple_pattern
+| @typed_pattern
+;
+
+#keyset[id]
+pattern_types(  //dir=pattern
+  int id: @pattern ref,
+  int type_: @type_or_none ref
+);
+
+any_patterns(  //dir=pattern
+  unique int id: @any_pattern
+);
+
+binding_patterns(  //dir=pattern
+  unique int id: @binding_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+bool_patterns(  //dir=pattern
+  unique int id: @bool_pattern,
+  boolean value: boolean ref
+);
+
+enum_element_patterns(  //dir=pattern
+  unique int id: @enum_element_pattern,
+  int element: @enum_element_decl_or_none ref
+);
+
+#keyset[id]
+enum_element_pattern_sub_patterns(  //dir=pattern
+  int id: @enum_element_pattern ref,
+  int sub_pattern: @pattern_or_none ref
+);
+
+expr_patterns(  //dir=pattern
+  unique int id: @expr_pattern,
+  int sub_expr: @expr_or_none ref
+);
+
+is_patterns(  //dir=pattern
+  unique int id: @is_pattern
+);
+
+#keyset[id]
+is_pattern_cast_type_reprs(  //dir=pattern
+  int id: @is_pattern ref,
+  int cast_type_repr: @type_repr_or_none ref
+);
+
+#keyset[id]
+is_pattern_sub_patterns(  //dir=pattern
+  int id: @is_pattern ref,
+  int sub_pattern: @pattern_or_none ref
+);
+
+named_patterns(  //dir=pattern
+  unique int id: @named_pattern,
+  int var_decl: @var_decl_or_none ref
+);
+
+optional_some_patterns(  //dir=pattern
+  unique int id: @optional_some_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+paren_patterns(  //dir=pattern
+  unique int id: @paren_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+tuple_patterns(  //dir=pattern
+  unique int id: @tuple_pattern
+);
+
+#keyset[id, index]
+tuple_pattern_elements(  //dir=pattern
+  int id: @tuple_pattern ref,
+  int index: int ref,
+  int element: @pattern_or_none ref
+);
+
+typed_patterns(  //dir=pattern
+  unique int id: @typed_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+typed_pattern_type_reprs(  //dir=pattern
+  int id: @typed_pattern ref,
+  int type_repr: @type_repr_or_none ref
+);
+
+case_label_items(  //dir=stmt
+  unique int id: @case_label_item,
+  int pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+case_label_item_guards(  //dir=stmt
+  int id: @case_label_item ref,
+  int guard: @expr_or_none ref
+);
+
+condition_elements(  //dir=stmt
+  unique int id: @condition_element
+);
+
+#keyset[id]
+condition_element_booleans(  //dir=stmt
+  int id: @condition_element ref,
+  int boolean_: @expr_or_none ref
+);
+
+#keyset[id]
+condition_element_patterns(  //dir=stmt
+  int id: @condition_element ref,
+  int pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+condition_element_initializers(  //dir=stmt
+  int id: @condition_element ref,
+  int initializer: @expr_or_none ref
+);
+
+#keyset[id]
+condition_element_availabilities(  //dir=stmt
+  int id: @condition_element ref,
+  int availability: @availability_info_or_none ref
+);
+
+@stmt =
+  @brace_stmt
+| @break_stmt
+| @case_stmt
+| @continue_stmt
+| @defer_stmt
+| @discard_stmt
+| @fail_stmt
+| @fallthrough_stmt
+| @labeled_stmt
+| @pound_assert_stmt
+| @return_stmt
+| @then_stmt
+| @throw_stmt
+| @yield_stmt
+;
+
+stmt_conditions(  //dir=stmt
+  unique int id: @stmt_condition
+);
+
+#keyset[id, index]
+stmt_condition_elements(  //dir=stmt
+  int id: @stmt_condition ref,
+  int index: int ref,
+  int element: @condition_element_or_none ref
+);
+
+brace_stmts(  //dir=stmt
+  unique int id: @brace_stmt
+);
+
+#keyset[id, index]
+brace_stmt_elements(  //dir=stmt
+  int id: @brace_stmt ref,
+  int index: int ref,
+  int element: @ast_node_or_none ref
+);
+
+break_stmts(  //dir=stmt
+  unique int id: @break_stmt
+);
+
+#keyset[id]
+break_stmt_target_names(  //dir=stmt
+  int id: @break_stmt ref,
+  string target_name: string ref
+);
+
+#keyset[id]
+break_stmt_targets(  //dir=stmt
+  int id: @break_stmt ref,
+  int target: @stmt_or_none ref
+);
+
+case_stmts(  //dir=stmt
+  unique int id: @case_stmt,
+  int body: @stmt_or_none ref
+);
+
+#keyset[id, index]
+case_stmt_labels(  //dir=stmt
+  int id: @case_stmt ref,
+  int index: int ref,
+  int label: @case_label_item_or_none ref
+);
+
+#keyset[id, index]
+case_stmt_variables(  //dir=stmt
+  int id: @case_stmt ref,
+  int index: int ref,
+  int variable: @var_decl_or_none ref
+);
+
+continue_stmts(  //dir=stmt
+  unique int id: @continue_stmt
+);
+
+#keyset[id]
+continue_stmt_target_names(  //dir=stmt
+  int id: @continue_stmt ref,
+  string target_name: string ref
+);
+
+#keyset[id]
+continue_stmt_targets(  //dir=stmt
+  int id: @continue_stmt ref,
+  int target: @stmt_or_none ref
+);
+
+defer_stmts(  //dir=stmt
+  unique int id: @defer_stmt,
+  int body: @brace_stmt_or_none ref
+);
+
+discard_stmts(  //dir=stmt
+  unique int id: @discard_stmt,
+  int sub_expr: @expr_or_none ref
+);
+
+fail_stmts(  //dir=stmt
+  unique int id: @fail_stmt
+);
+
+fallthrough_stmts(  //dir=stmt
+  unique int id: @fallthrough_stmt,
+  int fallthrough_source: @case_stmt_or_none ref,
+  int fallthrough_dest: @case_stmt_or_none ref
+);
+
+@labeled_stmt =
+  @do_catch_stmt
+| @do_stmt
+| @for_each_stmt
+| @labeled_conditional_stmt
+| @repeat_while_stmt
+| @switch_stmt
+;
+
+#keyset[id]
+labeled_stmt_labels(  //dir=stmt
+  int id: @labeled_stmt ref,
+  string label: string ref
+);
+
+pound_assert_stmts(  //dir=stmt
+  unique int id: @pound_assert_stmt,
+  int condition: @expr_or_none ref,
+  string message: string ref
+);
+
+return_stmts(  //dir=stmt
+  unique int id: @return_stmt
+);
+
+#keyset[id]
+return_stmt_results(  //dir=stmt
+  int id: @return_stmt ref,
+  int result: @expr_or_none ref
+);
+
+then_stmts(  //dir=stmt
+  unique int id: @then_stmt,
+  int result: @expr_or_none ref
+);
+
+throw_stmts(  //dir=stmt
+  unique int id: @throw_stmt,
+  int sub_expr: @expr_or_none ref
+);
+
+yield_stmts(  //dir=stmt
+  unique int id: @yield_stmt
+);
+
+#keyset[id, index]
+yield_stmt_results(  //dir=stmt
+  int id: @yield_stmt ref,
+  int index: int ref,
+  int result: @expr_or_none ref
+);
+
+do_catch_stmts(  //dir=stmt
+  unique int id: @do_catch_stmt,
+  int body: @stmt_or_none ref
+);
+
+#keyset[id, index]
+do_catch_stmt_catches(  //dir=stmt
+  int id: @do_catch_stmt ref,
+  int index: int ref,
+  int catch: @case_stmt_or_none ref
+);
+
+do_stmts(  //dir=stmt
+  unique int id: @do_stmt,
+  int body: @brace_stmt_or_none ref
+);
+
+for_each_stmts(  //dir=stmt
+  unique int id: @for_each_stmt,
+  int pattern: @pattern_or_none ref,
+  int body: @brace_stmt_or_none ref
+);
+
+#keyset[id, index]
+for_each_stmt_variables(  //dir=stmt
+  int id: @for_each_stmt ref,
+  int index: int ref,
+  int variable: @var_decl_or_none ref
+);
+
+#keyset[id]
+for_each_stmt_wheres(  //dir=stmt
+  int id: @for_each_stmt ref,
+  int where: @expr_or_none ref
+);
+
+#keyset[id]
+for_each_stmt_iterator_vars(  //dir=stmt
+  int id: @for_each_stmt ref,
+  int iteratorVar: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+for_each_stmt_next_calls(  //dir=stmt
+  int id: @for_each_stmt ref,
+  int nextCall: @expr_or_none ref
+);
+
+@labeled_conditional_stmt =
+  @guard_stmt
+| @if_stmt
+| @while_stmt
+;
+
+#keyset[id]
+labeled_conditional_stmts(  //dir=stmt
+  int id: @labeled_conditional_stmt ref,
+  int condition: @stmt_condition_or_none ref
+);
+
+repeat_while_stmts(  //dir=stmt
+  unique int id: @repeat_while_stmt,
+  int condition: @expr_or_none ref,
+  int body: @stmt_or_none ref
+);
+
+switch_stmts(  //dir=stmt
+  unique int id: @switch_stmt,
+  int expr: @expr_or_none ref
+);
+
+#keyset[id, index]
+switch_stmt_cases(  //dir=stmt
+  int id: @switch_stmt ref,
+  int index: int ref,
+  int case_: @case_stmt_or_none ref
+);
+
+guard_stmts(  //dir=stmt
+  unique int id: @guard_stmt,
+  int body: @brace_stmt_or_none ref
+);
+
+if_stmts(  //dir=stmt
+  unique int id: @if_stmt,
+  int then: @stmt_or_none ref
+);
+
+#keyset[id]
+if_stmt_elses(  //dir=stmt
+  int id: @if_stmt ref,
+  int else: @stmt_or_none ref
+);
+
+while_stmts(  //dir=stmt
+  unique int id: @while_stmt,
+  int body: @stmt_or_none ref
+);
+
+@type =
+  @any_function_type
+| @any_generic_type
+| @any_metatype_type
+| @builtin_type
+| @dependent_member_type
+| @dynamic_self_type
+| @error_type
+| @existential_type
+| @in_out_type
+| @integer_type
+| @l_value_type
+| @module_type
+| @pack_element_type
+| @pack_expansion_type
+| @pack_type
+| @parameterized_protocol_type
+| @protocol_composition_type
+| @reference_storage_type
+| @substitutable_type
+| @sugar_type
+| @tuple_type
+| @unresolved_type
+;
+
+#keyset[id]
+types(  //dir=type
+  int id: @type ref,
+  string name: string ref,
+  int canonical_type: @type_or_none ref
+);
+
+type_reprs(  //dir=type
+  unique int id: @type_repr,
+  int type_: @type_or_none ref
+);
+
+@any_function_type =
+  @function_type
+| @generic_function_type
+;
+
+#keyset[id]
+any_function_types(  //dir=type
+  int id: @any_function_type ref,
+  int result: @type_or_none ref
+);
+
+#keyset[id, index]
+any_function_type_param_types(  //dir=type
+  int id: @any_function_type ref,
+  int index: int ref,
+  int param_type: @type_or_none ref
+);
+
+#keyset[id]
+any_function_type_is_throwing(  //dir=type
+  int id: @any_function_type ref
+);
+
+#keyset[id]
+any_function_type_is_async(  //dir=type
+  int id: @any_function_type ref
+);
+
+@any_generic_type =
+  @nominal_or_bound_generic_nominal_type
+| @unbound_generic_type
+;
+
+#keyset[id]
+any_generic_types(  //dir=type
+  int id: @any_generic_type ref,
+  int declaration: @generic_type_decl_or_none ref
+);
+
+#keyset[id]
+any_generic_type_parents(  //dir=type
+  int id: @any_generic_type ref,
+  int parent: @type_or_none ref
+);
+
+@any_metatype_type =
+  @existential_metatype_type
+| @metatype_type
+;
+
+@builtin_type =
+  @any_builtin_integer_type
+| @builtin_bridge_object_type
+| @builtin_default_actor_storage_type
+| @builtin_executor_type
+| @builtin_fixed_array_type
+| @builtin_float_type
+| @builtin_job_type
+| @builtin_native_object_type
+| @builtin_raw_pointer_type
+| @builtin_raw_unsafe_continuation_type
+| @builtin_unsafe_value_buffer_type
+| @builtin_vector_type
+;
+
+dependent_member_types(  //dir=type
+  unique int id: @dependent_member_type,
+  int base_type: @type_or_none ref,
+  int associated_type_decl: @associated_type_decl_or_none ref
+);
+
+dynamic_self_types(  //dir=type
+  unique int id: @dynamic_self_type,
+  int static_self_type: @type_or_none ref
+);
+
+error_types(  //dir=type
+  unique int id: @error_type
+);
+
+existential_types(  //dir=type
+  unique int id: @existential_type,
+  int constraint: @type_or_none ref
+);
+
+in_out_types(  //dir=type
+  unique int id: @in_out_type,
+  int object_type: @type_or_none ref
+);
+
+integer_types(  //dir=type
+  unique int id: @integer_type,
+  string value: string ref
+);
+
+l_value_types(  //dir=type
+  unique int id: @l_value_type,
+  int object_type: @type_or_none ref
+);
+
+module_types(  //dir=type
+  unique int id: @module_type,
+  int module: @module_decl_or_none ref
+);
+
+pack_element_types(  //dir=type
+  unique int id: @pack_element_type,
+  int pack_type: @type_or_none ref
+);
+
+pack_expansion_types(  //dir=type
+  unique int id: @pack_expansion_type,
+  int pattern_type: @type_or_none ref,
+  int count_type: @type_or_none ref
+);
+
+pack_types(  //dir=type
+  unique int id: @pack_type
+);
+
+#keyset[id, index]
+pack_type_elements(  //dir=type
+  int id: @pack_type ref,
+  int index: int ref,
+  int element: @type_or_none ref
+);
+
+parameterized_protocol_types(  //dir=type
+  unique int id: @parameterized_protocol_type,
+  int base: @protocol_type_or_none ref
+);
+
+#keyset[id, index]
+parameterized_protocol_type_args(  //dir=type
+  int id: @parameterized_protocol_type ref,
+  int index: int ref,
+  int arg: @type_or_none ref
+);
+
+protocol_composition_types(  //dir=type
+  unique int id: @protocol_composition_type
+);
+
+#keyset[id, index]
+protocol_composition_type_members(  //dir=type
+  int id: @protocol_composition_type ref,
+  int index: int ref,
+  int member: @type_or_none ref
+);
+
+@reference_storage_type =
+  @unmanaged_storage_type
+| @unowned_storage_type
+| @weak_storage_type
+;
+
+#keyset[id]
+reference_storage_types(  //dir=type
+  int id: @reference_storage_type ref,
+  int referent_type: @type_or_none ref
+);
+
+@substitutable_type =
+  @archetype_type
+| @generic_type_param_type
+;
+
+@sugar_type =
+  @paren_type
+| @syntax_sugar_type
+| @type_alias_type
+;
+
+tuple_types(  //dir=type
+  unique int id: @tuple_type
+);
+
+#keyset[id, index]
+tuple_type_types(  //dir=type
+  int id: @tuple_type ref,
+  int index: int ref,
+  int type_: @type_or_none ref
+);
+
+#keyset[id, index]
+tuple_type_names(  //dir=type
+  int id: @tuple_type ref,
+  int index: int ref,
+  string name: string ref
+);
+
+unresolved_types(  //dir=type
+  unique int id: @unresolved_type
+);
+
+@any_builtin_integer_type =
+  @builtin_integer_literal_type
+| @builtin_integer_type
+;
+
+@archetype_type =
+  @local_archetype_type
+| @opaque_type_archetype_type
+| @pack_archetype_type
+| @primary_archetype_type
+;
+
+#keyset[id]
+archetype_types(  //dir=type
+  int id: @archetype_type ref,
+  int interface_type: @type_or_none ref
+);
+
+#keyset[id]
+archetype_type_superclasses(  //dir=type
+  int id: @archetype_type ref,
+  int superclass: @type_or_none ref
+);
+
+#keyset[id, index]
+archetype_type_protocols(  //dir=type
+  int id: @archetype_type ref,
+  int index: int ref,
+  int protocol: @protocol_decl_or_none ref
+);
+
+builtin_bridge_object_types(  //dir=type
+  unique int id: @builtin_bridge_object_type
+);
+
+builtin_default_actor_storage_types(  //dir=type
+  unique int id: @builtin_default_actor_storage_type
+);
+
+builtin_executor_types(  //dir=type
+  unique int id: @builtin_executor_type
+);
+
+builtin_fixed_array_types(  //dir=type
+  unique int id: @builtin_fixed_array_type
+);
+
+builtin_float_types(  //dir=type
+  unique int id: @builtin_float_type
+);
+
+builtin_job_types(  //dir=type
+  unique int id: @builtin_job_type
+);
+
+builtin_native_object_types(  //dir=type
+  unique int id: @builtin_native_object_type
+);
+
+builtin_raw_pointer_types(  //dir=type
+  unique int id: @builtin_raw_pointer_type
+);
+
+builtin_raw_unsafe_continuation_types(  //dir=type
+  unique int id: @builtin_raw_unsafe_continuation_type
+);
+
+builtin_unsafe_value_buffer_types(  //dir=type
+  unique int id: @builtin_unsafe_value_buffer_type
+);
+
+builtin_vector_types(  //dir=type
+  unique int id: @builtin_vector_type
+);
+
+existential_metatype_types(  //dir=type
+  unique int id: @existential_metatype_type
+);
+
+function_types(  //dir=type
+  unique int id: @function_type
+);
+
+generic_function_types(  //dir=type
+  unique int id: @generic_function_type
+);
+
+#keyset[id, index]
+generic_function_type_generic_params(  //dir=type
+  int id: @generic_function_type ref,
+  int index: int ref,
+  int generic_param: @generic_type_param_type_or_none ref
+);
+
+generic_type_param_types(  //dir=type
+  unique int id: @generic_type_param_type
+);
+
+metatype_types(  //dir=type
+  unique int id: @metatype_type
+);
+
+@nominal_or_bound_generic_nominal_type =
+  @bound_generic_type
+| @nominal_type
+;
+
+paren_types(  //dir=type
+  unique int id: @paren_type,
+  int type_: @type_or_none ref
+);
+
+@syntax_sugar_type =
+  @dictionary_type
+| @unary_syntax_sugar_type
+;
+
+type_alias_types(  //dir=type
+  unique int id: @type_alias_type,
+  int decl: @type_alias_decl_or_none ref
+);
+
+unbound_generic_types(  //dir=type
+  unique int id: @unbound_generic_type
+);
+
+unmanaged_storage_types(  //dir=type
+  unique int id: @unmanaged_storage_type
+);
+
+unowned_storage_types(  //dir=type
+  unique int id: @unowned_storage_type
+);
+
+weak_storage_types(  //dir=type
+  unique int id: @weak_storage_type
+);
+
+@bound_generic_type =
+  @bound_generic_class_type
+| @bound_generic_enum_type
+| @bound_generic_struct_type
+;
+
+#keyset[id, index]
+bound_generic_type_arg_types(  //dir=type
+  int id: @bound_generic_type ref,
+  int index: int ref,
+  int arg_type: @type_or_none ref
+);
+
+builtin_integer_literal_types(  //dir=type
+  unique int id: @builtin_integer_literal_type
+);
+
+builtin_integer_types(  //dir=type
+  unique int id: @builtin_integer_type
+);
+
+#keyset[id]
+builtin_integer_type_widths(  //dir=type
+  int id: @builtin_integer_type ref,
+  int width: int ref
+);
+
+dictionary_types(  //dir=type
+  unique int id: @dictionary_type,
+  int key_type: @type_or_none ref,
+  int value_type: @type_or_none ref
+);
+
+@local_archetype_type =
+  @element_archetype_type
+| @opened_archetype_type
+;
+
+@nominal_type =
+  @class_type
+| @enum_type
+| @protocol_type
+| @struct_type
+;
+
+opaque_type_archetype_types(  //dir=type
+  unique int id: @opaque_type_archetype_type,
+  int declaration: @opaque_type_decl_or_none ref
+);
+
+pack_archetype_types(  //dir=type
+  unique int id: @pack_archetype_type
+);
+
+primary_archetype_types(  //dir=type
+  unique int id: @primary_archetype_type
+);
+
+@unary_syntax_sugar_type =
+  @array_slice_type
+| @optional_type
+| @variadic_sequence_type
+;
+
+#keyset[id]
+unary_syntax_sugar_types(  //dir=type
+  int id: @unary_syntax_sugar_type ref,
+  int base_type: @type_or_none ref
+);
+
+array_slice_types(  //dir=type
+  unique int id: @array_slice_type
+);
+
+bound_generic_class_types(  //dir=type
+  unique int id: @bound_generic_class_type
+);
+
+bound_generic_enum_types(  //dir=type
+  unique int id: @bound_generic_enum_type
+);
+
+bound_generic_struct_types(  //dir=type
+  unique int id: @bound_generic_struct_type
+);
+
+class_types(  //dir=type
+  unique int id: @class_type
+);
+
+element_archetype_types(  //dir=type
+  unique int id: @element_archetype_type
+);
+
+enum_types(  //dir=type
+  unique int id: @enum_type
+);
+
+opened_archetype_types(  //dir=type
+  unique int id: @opened_archetype_type
+);
+
+optional_types(  //dir=type
+  unique int id: @optional_type
+);
+
+protocol_types(  //dir=type
+  unique int id: @protocol_type
+);
+
+struct_types(  //dir=type
+  unique int id: @struct_type
+);
+
+variadic_sequence_types(  //dir=type
+  unique int id: @variadic_sequence_type
+);
+
+@accessor_or_none =
+  @accessor
+| @unspecified_element
+;
+
+@argument_or_none =
+  @argument
+| @unspecified_element
+;
+
+@associated_type_decl_or_none =
+  @associated_type_decl
+| @unspecified_element
+;
+
+@ast_node_or_none =
+  @ast_node
+| @unspecified_element
+;
+
+@availability_info_or_none =
+  @availability_info
+| @unspecified_element
+;
+
+@availability_spec_or_none =
+  @availability_spec
+| @unspecified_element
+;
+
+@brace_stmt_or_none =
+  @brace_stmt
+| @unspecified_element
+;
+
+@captured_decl_or_none =
+  @captured_decl
+| @unspecified_element
+;
+
+@case_label_item_or_none =
+  @case_label_item
+| @unspecified_element
+;
+
+@case_stmt_or_none =
+  @case_stmt
+| @unspecified_element
+;
+
+@closure_expr_or_none =
+  @closure_expr
+| @unspecified_element
+;
+
+@condition_element_or_none =
+  @condition_element
+| @unspecified_element
+;
+
+@decl_or_none =
+  @decl
+| @unspecified_element
+;
+
+@enum_element_decl_or_none =
+  @enum_element_decl
+| @unspecified_element
+;
+
+@expr_or_none =
+  @expr
+| @unspecified_element
+;
+
+@file_or_none =
+  @file
+| @unspecified_element
+;
+
+@function_or_none =
+  @function
+| @unspecified_element
+;
+
+@generic_type_decl_or_none =
+  @generic_type_decl
+| @unspecified_element
+;
+
+@generic_type_param_decl_or_none =
+  @generic_type_param_decl
+| @unspecified_element
+;
+
+@generic_type_param_type_or_none =
+  @generic_type_param_type
+| @unspecified_element
+;
+
+@initializer_or_none =
+  @initializer
+| @unspecified_element
+;
+
+@key_path_component_or_none =
+  @key_path_component
+| @unspecified_element
+;
+
+@location_or_none =
+  @location
+| @unspecified_element
+;
+
+@macro_role_or_none =
+  @macro_role
+| @unspecified_element
+;
+
+@module_decl_or_none =
+  @module_decl
+| @unspecified_element
+;
+
+@nominal_type_decl_or_none =
+  @nominal_type_decl
+| @unspecified_element
+;
+
+@opaque_type_decl_or_none =
+  @opaque_type_decl
+| @unspecified_element
+;
+
+@opaque_value_expr_or_none =
+  @opaque_value_expr
+| @unspecified_element
+;
+
+@param_decl_or_none =
+  @param_decl
+| @unspecified_element
+;
+
+@pattern_or_none =
+  @pattern
+| @unspecified_element
+;
+
+@pattern_binding_decl_or_none =
+  @pattern_binding_decl
+| @unspecified_element
+;
+
+@precedence_group_decl_or_none =
+  @precedence_group_decl
+| @unspecified_element
+;
+
+@protocol_decl_or_none =
+  @protocol_decl
+| @unspecified_element
+;
+
+@protocol_type_or_none =
+  @protocol_type
+| @unspecified_element
+;
+
+@stmt_or_none =
+  @stmt
+| @unspecified_element
+;
+
+@stmt_condition_or_none =
+  @stmt_condition
+| @unspecified_element
+;
+
+@string_literal_expr_or_none =
+  @string_literal_expr
+| @unspecified_element
+;
+
+@tap_expr_or_none =
+  @tap_expr
+| @unspecified_element
+;
+
+@type_or_none =
+  @type
+| @unspecified_element
+;
+
+@type_alias_decl_or_none =
+  @type_alias_decl
+| @unspecified_element
+;
+
+@type_repr_or_none =
+  @type_repr
+| @unspecified_element
+;
+
+@value_decl_or_none =
+  @unspecified_element
+| @value_decl
+;
+
+@var_decl_or_none =
+  @unspecified_element
+| @var_decl
+;
diff --git a/swift/downgrades/b7006eaacb007a06251596835506185619b86e98/upgrade.properties b/swift/downgrades/b7006eaacb007a06251596835506185619b86e98/upgrade.properties
new file mode 100644
index 00000000000..a563f439398
--- /dev/null
+++ b/swift/downgrades/b7006eaacb007a06251596835506185619b86e98/upgrade.properties
@@ -0,0 +1,15 @@
+description: Upgrade to Swift 6.2
+compatibility: partial
+availability_specs.rel: delete
+availability_spec_platforms.rel: delete
+availability_spec_versions.rel: delete
+availability_spec_is_wildcard.rel: delete
+other_availability_specs.rel: run availability_specs.qlo new_other_availability_specs
+platform_version_availability_specs.rel: run availability_specs.qlo new_platform_version_availability_specs
+existential_archetype_types.rel: delete
+opened_archetype_types.rel: run opened_archetype_types.qlo
+key_path_components.rel: run key_path_components.qlo new_key_path_components
+key_path_component_subscript_arguments.rel: run key_path_components.qlo new_key_path_component_subscript_arguments
+key_path_component_tuple_indices.rel: run key_path_components.qlo new_key_path_component_tuple_indices
+key_path_component_decl_refs.rel: run key_path_components.qlo new_key_path_component_decl_refs
+unspecified_elements.rel: run key_path_components.qlo new_unspecified_elements
diff --git a/swift/extractor/SwiftExtractor.cpp b/swift/extractor/SwiftExtractor.cpp
index f3202bc7a2f..cdee01f446a 100644
--- a/swift/extractor/SwiftExtractor.cpp
+++ b/swift/extractor/SwiftExtractor.cpp
@@ -170,7 +170,7 @@ static std::unordered_set<swift::ModuleDecl*> extractDeclarations(
                        bodyEmissionStrategy);
   auto topLevelDecls = getTopLevelDecls(module, primaryFile, lazyDeclaration);
   for (auto decl : topLevelDecls) {
-    if (swift::AvailableAttr::isUnavailable(decl)) {
+    if (decl->isUnavailable() && !llvm::isa<swift::NominalTypeDecl>(decl)) {
       continue;
     }
     visitor.extract(decl);
diff --git a/swift/extractor/infra/SwiftBodyEmissionStrategy.cpp b/swift/extractor/infra/SwiftBodyEmissionStrategy.cpp
index 7608379ac5f..71eebcbf6b0 100644
--- a/swift/extractor/infra/SwiftBodyEmissionStrategy.cpp
+++ b/swift/extractor/infra/SwiftBodyEmissionStrategy.cpp
@@ -12,8 +12,7 @@ using namespace codeql;
 //    same module one by one. In this mode, we restrict emission only to the same file ignoring
 //    all the other files.
 bool SwiftBodyEmissionStrategy::shouldEmitDeclBody(const swift::Decl& decl) {
-  auto module = decl.getModuleContext();
-  if (module != &currentModule) {
+  if (!currentTopLevelDecls.contains(&decl) && decl.getModuleContext() != &currentModule) {
     return false;
   }
   if (currentLazyDeclaration && currentLazyDeclaration != &decl) {
diff --git a/swift/extractor/infra/SwiftBodyEmissionStrategy.h b/swift/extractor/infra/SwiftBodyEmissionStrategy.h
index 34eae944a55..b97600cc63c 100644
--- a/swift/extractor/infra/SwiftBodyEmissionStrategy.h
+++ b/swift/extractor/infra/SwiftBodyEmissionStrategy.h
@@ -12,13 +12,19 @@ class SwiftBodyEmissionStrategy {
                             const swift::Decl* currentLazyDeclaration)
       : currentModule(currentModule),
         currentPrimarySourceFile(currentPrimarySourceFile),
-        currentLazyDeclaration(currentLazyDeclaration) {}
+        currentLazyDeclaration(currentLazyDeclaration) {
+    llvm::SmallVector<swift::Decl*> decls;
+    currentModule.getTopLevelDecls(decls);
+    currentTopLevelDecls.insert(decls.begin(), decls.end());
+  }
+
   bool shouldEmitDeclBody(const swift::Decl& decl);
 
  private:
   swift::ModuleDecl& currentModule;
   swift::SourceFile* currentPrimarySourceFile;
   const swift::Decl* currentLazyDeclaration;
+  std::unordered_set<const swift::Decl*> currentTopLevelDecls;
 };
 
 }  // namespace codeql
diff --git a/swift/extractor/infra/SwiftLocationExtractor.cpp b/swift/extractor/infra/SwiftLocationExtractor.cpp
index 577b73aa983..cd751d157c8 100644
--- a/swift/extractor/infra/SwiftLocationExtractor.cpp
+++ b/swift/extractor/infra/SwiftLocationExtractor.cpp
@@ -29,7 +29,14 @@ void SwiftLocationExtractor::attachLocationImpl(const swift::SourceManager& sour
   entry.file = fetchFileLabel(file);
   std::tie(entry.start_line, entry.start_column) =
       sourceManager.getLineAndColumnInBuffer(range.Start);
-  std::tie(entry.end_line, entry.end_column) = sourceManager.getLineAndColumnInBuffer(range.End);
+  if (sourceManager.getLineAndColumnInBuffer(range.End) >=
+      sourceManager.getLineAndColumnInBuffer(range.Start)) {
+    std::tie(entry.end_line, entry.end_column) = sourceManager.getLineAndColumnInBuffer(range.End);
+  } else {
+    // the compiler may generate source ranges that go backwards
+    entry.end_line = entry.start_line;
+    entry.end_column = entry.start_column;
+  }
   SwiftMangledName locName{"loc", entry.file,     ':', entry.start_line, ':', entry.start_column,
                            ':',   entry.end_line, ':', entry.end_column};
   entry.id = trap.createTypedLabel<DbLocationTag>(locName);
diff --git a/swift/extractor/infra/SwiftTagTraits.h b/swift/extractor/infra/SwiftTagTraits.h
index b204c06ff0b..806ad0a5ffd 100644
--- a/swift/extractor/infra/SwiftTagTraits.h
+++ b/swift/extractor/infra/SwiftTagTraits.h
@@ -102,8 +102,9 @@ MAP(swift::Expr, ExprTag)
   MAP(swift::IdentityExpr, IdentityExprTag)
     MAP(swift::ParenExpr, ParenExprTag)
     MAP(swift::DotSelfExpr, DotSelfExprTag)
-    MAP(swift::BorrowExpr, BorrowExprTag)
     MAP(swift::AwaitExpr, AwaitExprTag)
+    MAP(swift::UnsafeExpr, UnsafeExprTag)
+    MAP(swift::BorrowExpr, BorrowExprTag)
     MAP(swift::UnresolvedMemberChainResultExpr, UnresolvedMemberChainResultExprTag)
   MAP(swift::AnyTryExpr, AnyTryExprTag)
     MAP(swift::TryExpr, TryExprTag)
@@ -195,7 +196,6 @@ MAP(swift::Expr, ExprTag)
   MAP(swift::ObjCSelectorExpr, ObjCSelectorExprTag)
   MAP(swift::KeyPathExpr, KeyPathExprTag)
   MAP(swift::KeyPathDotExpr, KeyPathDotExprTag)
-  MAP(swift::OneWayExpr, OneWayExprTag)
   MAP(swift::TapExpr, TapExprTag)
   MAP(swift::TypeJoinExpr, void)  // does not appear in a visible AST, skipping
   MAP(swift::MacroExpansionExpr, void) // unexpanded macro in an expr context, skipping
@@ -237,11 +237,11 @@ MAP(swift::Decl, DeclTag)
   MAP(swift::ExtensionDecl, ExtensionDeclTag)
   MAP(swift::TopLevelCodeDecl, TopLevelCodeDeclTag)
   MAP(swift::ImportDecl, ImportDeclTag)
-  MAP(swift::PoundDiagnosticDecl, PoundDiagnosticDeclTag)
   MAP(swift::PrecedenceGroupDecl, PrecedenceGroupDeclTag)
   MAP(swift::MissingMemberDecl, MissingMemberDeclTag)
   MAP(swift::PatternBindingDecl, PatternBindingDeclTag)
   MAP(swift::EnumCaseDecl, EnumCaseDeclTag)
+  MAP(swift::UsingDecl, UsingDeclTag)
   MAP(swift::OperatorDecl, OperatorDeclTag)
     MAP(swift::InfixOperatorDecl, InfixOperatorDeclTag)
     MAP(swift::PrefixOperatorDecl, PrefixOperatorDeclTag)
@@ -315,7 +315,7 @@ MAP(swift::TypeBase, TypeTag)
       MAP(swift::PrimaryArchetypeType, PrimaryArchetypeTypeTag)
       MAP(swift::OpaqueTypeArchetypeType, OpaqueTypeArchetypeTypeTag)
       MAP(swift::LocalArchetypeType, LocalArchetypeTypeTag)
-        MAP(swift::OpenedArchetypeType, OpenedArchetypeTypeTag)
+        MAP(swift::ExistentialArchetypeType, ExistentialArchetypeTypeTag)
         MAP(swift::ElementArchetypeType, ElementArchetypeTypeTag)
       MAP(swift::PackArchetypeType, PackArchetypeTypeTag)
     MAP(swift::GenericTypeParamType, GenericTypeParamTypeTag)
@@ -342,16 +342,16 @@ MAP(swift::TypeBase, TypeTag)
   MAP(swift::IntegerType, IntegerTypeTag)
   MAP(swift::SugarType, SugarTypeTag)
     MAP(swift::TypeAliasType, TypeAliasTypeTag)
+    MAP(swift::LocatableType, void) // created during type checking and only used for constraint checking
     MAP(swift::SyntaxSugarType, SyntaxSugarTypeTag)
       MAP(swift::UnarySyntaxSugarType, UnarySyntaxSugarTypeTag)
         MAP(swift::ArraySliceType, ArraySliceTypeTag)
         MAP(swift::OptionalType, OptionalTypeTag)
         MAP(swift::VariadicSequenceType, VariadicSequenceTypeTag)
+      MAP(swift::InlineArrayType, InlineArrayTypeTag)
       MAP(swift::DictionaryType, DictionaryTypeTag)
 
 MAP(swift::AvailabilitySpec, AvailabilitySpecTag)
-  MAP(swift::PlatformVersionConstraintAvailabilitySpec, PlatformVersionAvailabilitySpecTag)
-  MAP(swift::OtherPlatformAvailabilitySpec, OtherAvailabilitySpecTag)
 
 MAP(swift::PoundAvailableInfo, AvailabilityInfoTag)
 MAP(swift::MacroRoleAttr, MacroRoleTag)
diff --git a/swift/extractor/mangler/SwiftMangler.cpp b/swift/extractor/mangler/SwiftMangler.cpp
index 7e1f1f0bfe8..8d7d2a8a065 100644
--- a/swift/extractor/mangler/SwiftMangler.cpp
+++ b/swift/extractor/mangler/SwiftMangler.cpp
@@ -8,6 +8,8 @@
 #include <swift/AST/ASTContext.h>
 #include <swift/AST/GenericEnvironment.h>
 #include <swift/AST/GenericParamList.h>
+#include <swift/AST/ClangModuleLoader.h>
+#include <clang/Basic/Module.h>
 
 using namespace codeql;
 
@@ -38,6 +40,9 @@ std::string_view getTypeKindStr(const swift::TypeBase* type) {
 
 }  // namespace
 
+std::unordered_map<const swift::Decl*, SwiftMangler::ExtensionIndex>
+    SwiftMangler::preloadedExtensionIndexes;
+
 SwiftMangledName SwiftMangler::initMangled(const swift::TypeBase* type) {
   return {getTypeKindStr(type), '_'};
 }
@@ -100,41 +105,67 @@ SwiftMangledName SwiftMangler::visitExtensionDecl(const swift::ExtensionDecl* de
 
   auto parent = getParent(decl);
   auto target = decl->getExtendedType();
-  return initMangled(decl) << fetch(target) << getExtensionIndex(decl, parent);
+  auto index = getExtensionIndex(decl, parent);
+  return initMangled(decl) << fetch(target) << index.index
+                           << (index.kind == ExtensionKind::clang ? "_clang" : "");
 }
 
-unsigned SwiftMangler::getExtensionIndex(const swift::ExtensionDecl* decl,
-                                         const swift::Decl* parent) {
+SwiftMangler::ExtensionIndex SwiftMangler::getExtensionIndex(const swift::ExtensionDecl* decl,
+                                                             const swift::Decl* parent) {
   // to avoid iterating multiple times on the parent of multiple extensions, we preload extension
   // indexes once for each encountered parent into the `preloadedExtensionIndexes` mapping.
-  // Because we mangle declarations only once in a given trap/dispatcher context, we can safely
-  // discard preloaded indexes on use
-  if (auto found = preloadedExtensionIndexes.extract(decl)) {
-    return found.mapped();
+  if (auto found = SwiftMangler::preloadedExtensionIndexes.find(decl);
+      found != SwiftMangler::preloadedExtensionIndexes.end()) {
+    return found->second;
   }
   if (auto parentModule = llvm::dyn_cast<swift::ModuleDecl>(parent)) {
     llvm::SmallVector<swift::Decl*> siblings;
     parentModule->getTopLevelDecls(siblings);
     indexExtensions(siblings);
+    if (auto clangModule = parentModule->findUnderlyingClangModule()) {
+      indexClangExtensions(clangModule, decl->getASTContext().getClangModuleLoader());
+    }
   } else if (auto iterableParent = llvm::dyn_cast<swift::IterableDeclContext>(parent)) {
     indexExtensions(iterableParent->getAllMembers());
   } else {
     // TODO use a generic logging handle for Swift entities here, once it's available
     CODEQL_ASSERT(false, "non-local context must be module or iterable decl context");
   }
-  auto found = preloadedExtensionIndexes.extract(decl);
+  auto found = SwiftMangler::preloadedExtensionIndexes.find(decl);
   // TODO use a generic logging handle for Swift entities here, once it's available
-  CODEQL_ASSERT(found, "extension not found within parent");
-  return found.mapped();
+  CODEQL_ASSERT(found != SwiftMangler::preloadedExtensionIndexes.end(),
+                "extension not found within parent");
+  return found->second;
 }
 
 void SwiftMangler::indexExtensions(llvm::ArrayRef<swift::Decl*> siblings) {
   auto index = 0u;
   for (auto sibling : siblings) {
     if (sibling->getKind() == swift::DeclKind::Extension) {
-      preloadedExtensionIndexes.emplace(sibling, index);
+      SwiftMangler::preloadedExtensionIndexes.try_emplace(sibling, ExtensionKind::swift, index);
+      index++;
+    }
+  }
+}
+
+void SwiftMangler::indexClangExtensions(const clang::Module* clangModule,
+                                        swift::ClangModuleLoader* moduleLoader) {
+  if (!moduleLoader) {
+    return;
+  }
+
+  auto index = 0u;
+  for (const auto& submodule : clangModule->submodules()) {
+    if (auto* swiftSubmodule = moduleLoader->getWrapperForModule(submodule)) {
+      llvm::SmallVector<swift::Decl*> children;
+      swiftSubmodule->getTopLevelDecls(children);
+      for (const auto child : children) {
+        if (child->getKind() == swift::DeclKind::Extension) {
+          SwiftMangler::preloadedExtensionIndexes.try_emplace(child, ExtensionKind::clang, index);
+          index++;
+        }
+      }
     }
-    ++index;
   }
 }
 
@@ -215,8 +246,8 @@ SwiftMangledName SwiftMangler::visitAnyFunctionType(const swift::AnyFunctionType
     if (flags.isSending()) {
       ret << "_sending";
     }
-    if (flags.isCompileTimeConst()) {
-      ret << "_compiletimeconst";
+    if (flags.isCompileTimeLiteral()) {
+      ret << "_compiletimeliteral";
     }
     if (flags.isNoDerivative()) {
       ret << "_noderivative";
@@ -225,6 +256,40 @@ SwiftMangledName SwiftMangler::visitAnyFunctionType(const swift::AnyFunctionType
       ret << "...";
     }
   }
+
+  if (type->hasLifetimeDependencies()) {
+    for (const auto& lifetime : type->getLifetimeDependencies()) {
+      auto addressable = lifetime.getAddressableIndices();
+      auto condAddressable = lifetime.getConditionallyAddressableIndices();
+      ret << "_lifetime";
+
+      auto addIndexes = [&](swift::IndexSubset* bitvector) {
+        for (unsigned i = 0; i < bitvector->getCapacity(); ++i) {
+          if (bitvector->contains(i)) {
+            if (addressable && addressable->contains(i)) {
+              ret << "_address";
+            } else if (condAddressable && condAddressable->contains(i)) {
+              ret << "_address_for_deps";
+            }
+            ret << "_" << i;
+          }
+        }
+      };
+
+      if (lifetime.hasInheritLifetimeParamIndices()) {
+        ret << "_copy";
+        addIndexes(lifetime.getInheritIndices());
+      }
+      if (lifetime.hasScopeLifetimeParamIndices()) {
+        ret << "_borrow";
+        addIndexes(lifetime.getScopeIndices());
+      }
+      if (lifetime.isImmortal()) {
+        ret << "_immortal";
+      }
+    }
+  }
+
   ret << "->" << fetch(type->getResult());
   if (type->isAsync()) {
     ret << "_async";
@@ -361,7 +426,8 @@ SwiftMangledName SwiftMangler::visitOpaqueTypeArchetypeType(
   return visitArchetypeType(type) << fetch(type->getDecl());
 }
 
-SwiftMangledName SwiftMangler::visitOpenedArchetypeType(const swift::OpenedArchetypeType* type) {
+SwiftMangledName SwiftMangler::visitExistentialArchetypeType(
+    const swift::ExistentialArchetypeType* type) {
   auto* env = type->getGenericEnvironment();
   llvm::SmallVector<char> uuid;
   env->getOpenedExistentialUUID().toString(uuid);
diff --git a/swift/extractor/mangler/SwiftMangler.h b/swift/extractor/mangler/SwiftMangler.h
index 2e3acbb9103..caf70718633 100644
--- a/swift/extractor/mangler/SwiftMangler.h
+++ b/swift/extractor/mangler/SwiftMangler.h
@@ -93,7 +93,7 @@ class SwiftMangler : private swift::TypeVisitor<SwiftMangler, SwiftMangledName>,
   SwiftMangledName visitTypeAliasType(const swift::TypeAliasType* type);
   SwiftMangledName visitArchetypeType(const swift::ArchetypeType* type);
   SwiftMangledName visitOpaqueTypeArchetypeType(const swift::OpaqueTypeArchetypeType* type);
-  SwiftMangledName visitOpenedArchetypeType(const swift::OpenedArchetypeType* type);
+  SwiftMangledName visitExistentialArchetypeType(const swift::ExistentialArchetypeType* type);
   SwiftMangledName visitProtocolCompositionType(const swift::ProtocolCompositionType* type);
   SwiftMangledName visitLValueType(const swift::LValueType* type);
   SwiftMangledName visitDynamicSelfType(const swift::DynamicSelfType* type);
@@ -106,14 +106,26 @@ class SwiftMangler : private swift::TypeVisitor<SwiftMangler, SwiftMangledName>,
   SwiftMangledName visitPackExpansionType(const swift::PackExpansionType* type);
 
  private:
-  std::unordered_map<const swift::Decl*, unsigned> preloadedExtensionIndexes;
+  enum class ExtensionKind : bool {
+    swift,
+    clang,
+  };
+
+  struct ExtensionIndex {
+    const ExtensionKind kind : 1;
+    const uint32_t index : 31;
+  };
+
+  static std::unordered_map<const swift::Decl*, ExtensionIndex> preloadedExtensionIndexes;
 
   virtual SwiftMangledName fetch(const swift::Decl* decl) = 0;
   virtual SwiftMangledName fetch(const swift::TypeBase* type) = 0;
   SwiftMangledName fetch(swift::Type type) { return fetch(type.getPointer()); }
 
   void indexExtensions(llvm::ArrayRef<swift::Decl*> siblings);
-  unsigned int getExtensionIndex(const swift::ExtensionDecl* decl, const swift::Decl* parent);
+  void indexClangExtensions(const clang::Module* clangModule,
+                            swift::ClangModuleLoader* moduleLoader);
+  ExtensionIndex getExtensionIndex(const swift::ExtensionDecl* decl, const swift::Decl* parent);
   static SwiftMangledName initMangled(const swift::TypeBase* type);
   SwiftMangledName initMangled(const swift::Decl* decl);
   SwiftMangledName visitTypeDiscriminatedValueDecl(const swift::ValueDecl* decl);
diff --git a/swift/extractor/translators/DeclTranslator.cpp b/swift/extractor/translators/DeclTranslator.cpp
index ab50777babb..4a89d571c41 100644
--- a/swift/extractor/translators/DeclTranslator.cpp
+++ b/swift/extractor/translators/DeclTranslator.cpp
@@ -137,6 +137,19 @@ codeql::EnumCaseDecl DeclTranslator::translateEnumCaseDecl(const swift::EnumCase
   return entry;
 }
 
+codeql::UsingDecl DeclTranslator::translateUsingDecl(const swift::UsingDecl& decl) {
+  auto entry = createEntry(decl);
+  switch (decl.getSpecifier()) {
+    case swift::UsingSpecifier::MainActor:
+      entry.is_main_actor = true;
+      break;
+    case swift::UsingSpecifier::Nonisolated:
+      entry.is_nonisolated = true;
+      break;
+  }
+  return entry;
+}
+
 codeql::EnumElementDecl DeclTranslator::translateEnumElementDecl(
     const swift::EnumElementDecl& decl) {
   auto entry = createEntry(decl);
@@ -197,6 +210,18 @@ codeql::Accessor DeclTranslator::translateAccessorDecl(const swift::AccessorDecl
     case swift::AccessorKind::MutableAddress:
       entry.is_unsafe_mutable_address = true;
       break;
+    case swift::AccessorKind::DistributedGet:
+      entry.is_distributed_get = true;
+      break;
+    case swift::AccessorKind::Read2:
+      entry.is_read2 = true;
+      break;
+    case swift::AccessorKind::Modify2:
+      entry.is_modify2 = true;
+      break;
+    case swift::AccessorKind::Init:
+      entry.is_init = true;
+      break;
   }
   fillFunction(decl, entry);
   return entry;
@@ -280,7 +305,7 @@ void DeclTranslator::fillTypeDecl(const swift::TypeDecl& decl, codeql::TypeDecl&
 void DeclTranslator::fillIterableDeclContext(const swift::IterableDeclContext& decl,
                                              codeql::Decl& entry) {
   for (auto member : decl.getMembers()) {
-    if (swift::AvailableAttr::isUnavailable(member)) {
+    if (member->isUnavailable()) {
       continue;
     }
     entry.members.emplace_back(dispatcher.fetchLabel(member));
@@ -342,14 +367,6 @@ codeql::OpaqueTypeDecl DeclTranslator::translateOpaqueTypeDecl(const swift::Opaq
   return entry;
 }
 
-codeql::PoundDiagnosticDecl DeclTranslator::translatePoundDiagnosticDecl(
-    const swift::PoundDiagnosticDecl& decl) {
-  auto entry = createEntry(decl);
-  entry.kind = translateDiagnosticsKind(decl.getKind());
-  entry.message = dispatcher.fetchLabel(decl.getMessage());
-  return entry;
-}
-
 codeql::MissingMemberDecl DeclTranslator::translateMissingMemberDecl(
     const swift::MissingMemberDecl& decl) {
   auto entry = createEntry(decl);
diff --git a/swift/extractor/translators/DeclTranslator.h b/swift/extractor/translators/DeclTranslator.h
index 57a6fdb9a2f..820edca194c 100644
--- a/swift/extractor/translators/DeclTranslator.h
+++ b/swift/extractor/translators/DeclTranslator.h
@@ -34,6 +34,7 @@ class DeclTranslator : public AstTranslatorBase<DeclTranslator> {
   codeql::EnumDecl translateEnumDecl(const swift::EnumDecl& decl);
   codeql::ProtocolDecl translateProtocolDecl(const swift::ProtocolDecl& decl);
   codeql::EnumCaseDecl translateEnumCaseDecl(const swift::EnumCaseDecl& decl);
+  codeql::UsingDecl translateUsingDecl(const swift::UsingDecl& decl);
   codeql::EnumElementDecl translateEnumElementDecl(const swift::EnumElementDecl& decl);
   codeql::GenericTypeParamDecl translateGenericTypeParamDecl(
       const swift::GenericTypeParamDecl& decl);
@@ -45,7 +46,6 @@ class DeclTranslator : public AstTranslatorBase<DeclTranslator> {
   codeql::ImportDecl translateImportDecl(const swift::ImportDecl& decl);
   codeql::ModuleDecl translateModuleDecl(const swift::ModuleDecl& decl);
   codeql::OpaqueTypeDecl translateOpaqueTypeDecl(const swift::OpaqueTypeDecl& decl);
-  codeql::PoundDiagnosticDecl translatePoundDiagnosticDecl(const swift::PoundDiagnosticDecl& decl);
   codeql::MissingMemberDecl translateMissingMemberDecl(const swift::MissingMemberDecl& decl);
   codeql::CapturedDecl translateCapturedValue(const swift::CapturedValue& capture);
   codeql::MacroDecl translateMacroDecl(const swift::MacroDecl& decl);
diff --git a/swift/extractor/translators/ExprTranslator.cpp b/swift/extractor/translators/ExprTranslator.cpp
index 15a6765e5fc..936bf64940f 100644
--- a/swift/extractor/translators/ExprTranslator.cpp
+++ b/swift/extractor/translators/ExprTranslator.cpp
@@ -185,12 +185,6 @@ codeql::ObjCSelectorExpr ExprTranslator::translateObjCSelectorExpr(
   return entry;
 }
 
-codeql::OneWayExpr ExprTranslator::translateOneWayExpr(const swift::OneWayExpr& expr) {
-  auto entry = createExprEntry(expr);
-  entry.sub_expr = dispatcher.fetchLabel(expr.getSubExpr());
-  return entry;
-}
-
 codeql::OpenExistentialExpr ExprTranslator::translateOpenExistentialExpr(
     const swift::OpenExistentialExpr& expr) {
   auto entry = createExprEntry(expr);
@@ -498,7 +492,7 @@ TrapLabel<KeyPathComponentTag> ExprTranslator::emitKeyPathComponent(
     const swift::KeyPathExpr::Component& component) {
   auto entry = dispatcher.createUncachedEntry(component);
   entry.kind = static_cast<int>(component.getKind());
-  if (auto subscript_args = component.getSubscriptArgs()) {
+  if (auto subscript_args = component.getArgs()) {
     for (const auto& arg : *subscript_args) {
       entry.subscript_arguments.push_back(emitArgument(arg));
     }
@@ -691,8 +685,8 @@ codeql::CurrentContextIsolationExpr ExprTranslator::translateCurrentContextIsola
 
 codeql::TypeValueExpr ExprTranslator::translateTypeValueExpr(const swift::TypeValueExpr& expr) {
   auto entry = createExprEntry(expr);
-  if (expr.getParamTypeRepr() && expr.getParamType()) {
-    entry.type_repr = dispatcher.fetchLabel(expr.getParamTypeRepr(), expr.getParamType());
+  if (expr.getRepr() && expr.getParamType()) {
+    entry.type_repr = dispatcher.fetchLabel(expr.getRepr(), expr.getParamType());
   }
   return entry;
 }
diff --git a/swift/extractor/translators/ExprTranslator.h b/swift/extractor/translators/ExprTranslator.h
index 525f1fda6c1..ff32e07a450 100644
--- a/swift/extractor/translators/ExprTranslator.h
+++ b/swift/extractor/translators/ExprTranslator.h
@@ -37,7 +37,6 @@ class ExprTranslator : public AstTranslatorBase<ExprTranslator> {
   codeql::MakeTemporarilyEscapableExpr translateMakeTemporarilyEscapableExpr(
       const swift::MakeTemporarilyEscapableExpr& expr);
   codeql::ObjCSelectorExpr translateObjCSelectorExpr(const swift::ObjCSelectorExpr& expr);
-  codeql::OneWayExpr translateOneWayExpr(const swift::OneWayExpr& expr);
   codeql::OpenExistentialExpr translateOpenExistentialExpr(const swift::OpenExistentialExpr& expr);
   codeql::OptionalEvaluationExpr translateOptionalEvaluationExpr(
       const swift::OptionalEvaluationExpr& expr);
diff --git a/swift/extractor/translators/StmtTranslator.cpp b/swift/extractor/translators/StmtTranslator.cpp
index 00c4b94fa85..1562c28f19c 100644
--- a/swift/extractor/translators/StmtTranslator.cpp
+++ b/swift/extractor/translators/StmtTranslator.cpp
@@ -36,25 +36,17 @@ void StmtTranslator::translateAndEmit(const swift::PoundAvailableInfo& availabil
 }
 
 void StmtTranslator::translateAndEmit(const swift::AvailabilitySpec& spec) {
-  if (llvm::isa<swift::PlatformVersionConstraintAvailabilitySpec>(spec)) {
-    translateAndEmit(llvm::cast<swift::PlatformVersionConstraintAvailabilitySpec>(spec));
-  } else if (llvm::isa<swift::OtherPlatformAvailabilitySpec>(spec)) {
-    translateAndEmit(llvm::cast<swift::OtherPlatformAvailabilitySpec>(spec));
-  }
-}
-
-void StmtTranslator::translateAndEmit(
-    const swift::PlatformVersionConstraintAvailabilitySpec& spec) {
   auto entry = dispatcher.createEntry(spec);
-  entry.platform = swift::platformString(spec.getPlatform()).str();
-  entry.version = spec.getVersion().getAsString();
+  entry.is_wildcard = spec.isWildcard();
+  if (!spec.isWildcard()) {
+    auto domain = spec.getDomainOrIdentifier().getAsDomain();
+    entry.platform =
+        swift::platformString(domain ? domain->getPlatformKind() : swift::PlatformKind::none).str();
+    entry.version = spec.getRawVersion().getAsString();
+  }
   dispatcher.emit(entry);
 }
 
-void StmtTranslator::translateAndEmit(const swift::OtherPlatformAvailabilitySpec& spec) {
-  dispatcher.emit(dispatcher.createEntry(spec));
-}
-
 codeql::BraceStmt StmtTranslator::translateBraceStmt(const swift::BraceStmt& stmt) {
   auto entry = dispatcher.createEntry(stmt);
   entry.elements = dispatcher.fetchRepeatedLabels(stmt.getElements());
diff --git a/swift/extractor/translators/StmtTranslator.h b/swift/extractor/translators/StmtTranslator.h
index d593411af37..f4c56546708 100644
--- a/swift/extractor/translators/StmtTranslator.h
+++ b/swift/extractor/translators/StmtTranslator.h
@@ -17,8 +17,6 @@ class StmtTranslator : public AstTranslatorBase<StmtTranslator> {
   void translateAndEmit(const swift::CaseLabelItem& labelItem);
   void translateAndEmit(const swift::PoundAvailableInfo& availability);
   void translateAndEmit(const swift::AvailabilitySpec& spec);
-  void translateAndEmit(const swift::PlatformVersionConstraintAvailabilitySpec& spec);
-  void translateAndEmit(const swift::OtherPlatformAvailabilitySpec& spec);
 
   codeql::BraceStmt translateBraceStmt(const swift::BraceStmt& stmt);
   codeql::ReturnStmt translateReturnStmt(const swift::ReturnStmt& stmt);
diff --git a/swift/extractor/translators/TypeTranslator.cpp b/swift/extractor/translators/TypeTranslator.cpp
index cd471449827..52d17c7a357 100644
--- a/swift/extractor/translators/TypeTranslator.cpp
+++ b/swift/extractor/translators/TypeTranslator.cpp
@@ -88,6 +88,14 @@ codeql::ArraySliceType TypeTranslator::translateArraySliceType(const swift::Arra
   return entry;
 }
 
+codeql::InlineArrayType TypeTranslator::translateInlineArrayType(
+    const swift::InlineArrayType& type) {
+  auto entry = createTypeEntry(type);
+  entry.count_type = dispatcher.fetchLabel(type.getCountType());
+  entry.element_type = dispatcher.fetchLabel(type.getElementType());
+  return entry;
+}
+
 codeql::DictionaryType TypeTranslator::translateDictionaryType(const swift::DictionaryType& type) {
   auto entry = createTypeEntry(type);
   entry.key_type = dispatcher.fetchLabel(type.getKeyType());
@@ -225,8 +233,8 @@ codeql::BuiltinIntegerType TypeTranslator::translateBuiltinIntegerType(
   return entry;
 }
 
-codeql::OpenedArchetypeType TypeTranslator::translateOpenedArchetypeType(
-    const swift::OpenedArchetypeType& type) {
+codeql::ExistentialArchetypeType TypeTranslator::translateExistentialArchetypeType(
+    const swift::ExistentialArchetypeType& type) {
   auto entry = createTypeEntry(type);
   fillArchetypeType(type, entry);
   return entry;
diff --git a/swift/extractor/translators/TypeTranslator.h b/swift/extractor/translators/TypeTranslator.h
index 404f7214bea..c65c0e757de 100644
--- a/swift/extractor/translators/TypeTranslator.h
+++ b/swift/extractor/translators/TypeTranslator.h
@@ -28,6 +28,7 @@ class TypeTranslator : public TypeTranslatorBase<TypeTranslator> {
       const swift::UnarySyntaxSugarType& type);
   codeql::OptionalType translateOptionalType(const swift::OptionalType& type);
   codeql::ArraySliceType translateArraySliceType(const swift::ArraySliceType& type);
+  codeql::InlineArrayType translateInlineArrayType(const swift::InlineArrayType& type);
   codeql::DictionaryType translateDictionaryType(const swift::DictionaryType& type);
   codeql::GenericFunctionType translateGenericFunctionType(const swift::GenericFunctionType& type);
   codeql::GenericTypeParamType translateGenericTypeParamType(
@@ -68,7 +69,8 @@ class TypeTranslator : public TypeTranslatorBase<TypeTranslator> {
   codeql::BuiltinIntegerLiteralType translateBuiltinIntegerLiteralType(
       const swift::BuiltinIntegerLiteralType& type);
   codeql::BuiltinIntegerType translateBuiltinIntegerType(const swift::BuiltinIntegerType& type);
-  codeql::OpenedArchetypeType translateOpenedArchetypeType(const swift::OpenedArchetypeType& type);
+  codeql::ExistentialArchetypeType translateExistentialArchetypeType(
+      const swift::ExistentialArchetypeType& type);
   codeql::ModuleType translateModuleType(const swift::ModuleType& type);
   codeql::OpaqueTypeArchetypeType translateOpaqueTypeArchetypeType(
       const swift::OpaqueTypeArchetypeType& type);
diff --git a/swift/ql/.generated.list b/swift/ql/.generated.list
index 261705596d2..8d2fb9a2ebc 100644
--- a/swift/ql/.generated.list
+++ b/swift/ql/.generated.list
@@ -13,8 +13,6 @@ lib/codeql/swift/elements/KeyPathComponent.qll cc64d5a3cc6e6aa12faee7dfc95e6b5e1
 lib/codeql/swift/elements/Locatable.qll a4e01abd3f337a60e3741705cede50be974ccffcb707a53f2b378972838c5977 89ba4dbebcfa291797407c27087d91a18b1ec1bc97140a14ec08dbb12cef7395
 lib/codeql/swift/elements/Location.qll db213e8e27f8d732ad472c16929f2c503634c622d4d7b6b6977ed8b7b3c71c5b 9b951af94891848ecea9a690741e4a401c4b7ad676fd1fcee703fce4dcee2da4
 lib/codeql/swift/elements/MacroRole.qll d55500010c47fab14fb2110db0afadef5f1f01115d05c803c9fd114508aca6da 858a7fe124cb8874e1fe62b3b36153740b0bb1cd1e9ed0005b36d01040960ed8
-lib/codeql/swift/elements/OtherAvailabilitySpec.qll b3e3aafc7b1f7b1ff2efa2bc9ff64370cc6847760a46ff5594f5144caee858ab 6630e73998c9359b6cefd265222cb72274b4484d6904b4a9f949bdb7a2781c0f
-lib/codeql/swift/elements/PlatformVersionAvailabilitySpec.qll 1a94d317cbb1731844986b57bbdc4095d90957c671d5248bc581bc1fdbb18f8b 3888eb1afc641d365c30fa514962f1a31b9b9c04383836e0062445e566003d34
 lib/codeql/swift/elements/UnknownFile.qll 29e9f59c24c3ee6c2b01ea19390dd6730192628e5e4a541c3c00a42d16daad78 0ec046d67ebdc1722915b0d952468d1d3c3dfdf2c61e7fa215c7ba2fb91de04c
 lib/codeql/swift/elements/UnknownLocation.qll a03b4ff4f3505a35fbf25e150944e217030d187b8ab314bf0657bcab67ea40cc 2e3a1271f0df925c1deae232b26ba031322611f87f0326fe747475445c0e2485
 lib/codeql/swift/elements/UnspecifiedElement.qll b1f597cae6585531aec383b669bda76b710dc2b61caf352347786584faf63ff4 858a15ed565231c15d09aa2e15acd4842a23ef8b0f76de792297fa8062e2f287
@@ -58,6 +56,7 @@ lib/codeql/swift/elements/decl/SubscriptDecl.qll b55ac28cda7402efea4e57b6fe6c6b5
 lib/codeql/swift/elements/decl/TopLevelCodeDecl.qll e5786a58e02c0d737ad382571ca6591bf18e0615b3d06b30a057209a80550e50 7b2cc05de78788cd862c8961e481a80b325b91e4fb64f22049564a21f0a5f95e
 lib/codeql/swift/elements/decl/TypeAliasDecl.qll 73e7ecca7d4faf078640a872f4857f465e80ce4d0c99017f3943419c8b65acf4 bfd14ad6a8411acb936036c4efc2ab4e1e165459eb270c02017b9f0de9a71fab
 lib/codeql/swift/elements/decl/TypeDecl.qll feb11a9eb276eff1eac5e72b5be4097fd4492c6dc81710d86c3eb55e37240795 2d1e4419aa05997e3149775a68e80065f5955fcaa141402c1892b7cb23ca58a2
+lib/codeql/swift/elements/decl/UsingDecl.qll 40fa34a7e7204ec53132cefa69857c9c4bfc286b8bd05e693a3ceead881e0e4a 44c62d2e4cc8b42481a999083b520e07c6d5e652677ac5b4c55887957be50e4e
 lib/codeql/swift/elements/decl/ValueDecl.qll f71d9aa147eb78894b5b1c292b13334b9661a0b4347a25803a118cdccfa29cf7 de304b3dc9c5b6e7d7a0d5989fd40e25827aefdd5062ab2634c0f8c79121cfd3
 lib/codeql/swift/elements/decl/VarDecl.qll 5eb74f663d935328da028e892e8224a25e09c0edafa34b87471f57e4d7e51bdc 3f8e03ee0748ea67aa7a962a12c97fd20d37a1987cabadc0c1d5080900d149d5
 lib/codeql/swift/elements/decl/internal/AbstractStorageDeclImpl.qll 56e7b7332f4a55a8860c03d0d756bfb31f66048c8082834a15bf613eca9d6e12 f6a9c384f9355bbc34e8c8654fd19f62ea2592c96b8bf79dcd2915406ff54f23
@@ -110,6 +109,8 @@ lib/codeql/swift/elements/decl/internal/StructDeclImpl.qll 9fc7b419040e509723320
 lib/codeql/swift/elements/decl/internal/SubscriptDeclConstructor.qll 67882596f384f4710dd81aa284b53c7b3e9cd3c30f120e98252bfbd2f5dd34e1 f336269cdfbd3ef115ea29fe39c2d04deeb95ae8f927af27a4dc7acc4a14699a
 lib/codeql/swift/elements/decl/internal/TopLevelCodeDeclConstructor.qll 3924b6e5bee007fd62ae4b2352e38ae20292dbdab65fd1724ca9cd698bfc88f4 28ac8627c75cd787e6dca1a8bfed4c36edbfd13cdad19a08905a49d56b815ad7
 lib/codeql/swift/elements/decl/internal/TypeAliasDeclConstructor.qll 1dc3d7ef11adf5fb9b4be1c824b8a49393137071584ed44224a2f47b3a0b8a4a 2e1e8222b851376b0d7843a93fb6affeac7f8ee52867623b1e2fa99c1ac37dbb
+lib/codeql/swift/elements/decl/internal/UsingDeclConstructor.qll 52fdc32c208571c3a0c588768cc65f04e708b8d7533b4d2d206734616f7d1475 aeece428c56101536ec8abd25364d208f1a020727d1294e9c97b13b7ab90f923
+lib/codeql/swift/elements/decl/internal/UsingDeclImpl.qll 49e5068c50f424d314d0c2df6723c17cb51bfab5a419b0d45d88f411f326e232 5389436fe692eb0ecf96e80555a589596e6c7b553d37f2990addd8a11e4efce0
 lib/codeql/swift/elements/expr/AbiSafeConversionExpr.qll 62c6b231898c42a7756cae20ed9b3818958872cb581cca6f1db0b28e4cff9b93 b90f7496229e76a40ac66e8a3d0ac2f14c65d729ebeea796cb34f395f2858b32
 lib/codeql/swift/elements/expr/ActorIsolationErasureExpr.qll bbbc615255877e7fd95199710449fa696d68d81a4cfb985240d0cfbf124d9d37 526e7b4f2b5af5f2c8172b5d2c76c1f7198025e02c9e1068f92fa6c78cddeb81
 lib/codeql/swift/elements/expr/AnyHashableErasureExpr.qll 3388c1ad2c9d984fb0a0368ef9090f03cc5bbd63088024308a056cabfb9c93c9 49e3450180b8a4626911fc83bd64d17e486fad6b50f33b55b9322faef1ced39f
@@ -242,6 +243,7 @@ lib/codeql/swift/elements/expr/UnresolvedPatternExpr.qll f27ef68f5bbb2d957513efd
 lib/codeql/swift/elements/expr/UnresolvedSpecializeExpr.qll 9e1b27d90419e757480d0ae369bec1f159de3c28ddf760cdf24dd30b0ec6fcf9 1aeab5e10b1c3f081c5c3ca5bd807bfc38726a7b21b7201e0a9f997572935c73
 lib/codeql/swift/elements/expr/UnresolvedTypeConversionExpr.qll e259a187d70ea6b6007ebdd3659aa7e1947b2dc606642ccda27309ff74ffc3db c6a85856f82e74ed5597e381a5e4c27927eb4f01c7b588b1f4277dfb0e977521
 lib/codeql/swift/elements/expr/UnsafeCastExpr.qll 09c18a43f66432340b3212cb1933e096faf3825fa0a9abb30f7be11f170b6f97 93f35d500d67b71ed52d508ca9f7236c671f5b68a0ce6a0ee6a1a03d2b5db290
+lib/codeql/swift/elements/expr/UnsafeExpr.qll 49f076af1e154ff5eb6588f77e6532e75b4b6d9710185443fd48740bc5aaba99 7c558095d3be8401aa4d9065bd86110959cbced7f5d65f8120530d5497b3de15
 lib/codeql/swift/elements/expr/VarargExpansionExpr.qll c7d7574caaac88fd73e69e82a84ca924e078eece0fd85a476b4a831e23b425f9 27213c88f864b7f8fd73edf8951e04a5ae7a57140a387df7c03dc1544ced723b
 lib/codeql/swift/elements/expr/internal/AbiSafeConversionExprConstructor.qll de9d2daf68b754e783374d017116606c8cd0710dbf8989d3606939e977dc672c 63c5ddb9da56da2c9637d7a0a6d9d069f745b4c095b07c9494a0b3a7e11be95b
 lib/codeql/swift/elements/expr/internal/AbiSafeConversionExprImpl.qll 6b2c51a5a5dd17044c6f5510048a9a2187aac9d35a70541faa9400406e35bc1e 448c23eec2ef44bd90e6c1636e3e881ca3447198eb68b8261412f42c4995b766
@@ -431,9 +433,11 @@ lib/codeql/swift/elements/expr/internal/UnresolvedTypeConversionExprConstructor.
 lib/codeql/swift/elements/expr/internal/UnresolvedTypeConversionExprImpl.qll 3511bf1bea3e3cee95c0793e40000493537076d76f235bfe91866e1e0caf97ab b97de4c795e873acee89d9b87d8c58b14e05f0c09e3a0385a479638adcf32966
 lib/codeql/swift/elements/expr/internal/UnsafeCastExprConstructor.qll f8771eb8f677003fc62a2f78dcdffc46ee5510001428dde58a7e9d82746b6f97 f20eb160de27d9413a3b5d7ace406fe5f6912ad5720db85d8a12c48c71e42b35
 lib/codeql/swift/elements/expr/internal/UnsafeCastExprImpl.qll 787104ce97d702c0c3efa81a0f8416584f35c454d3b2ffe7bd0917861589612b 50496a0f3f3a9e3d5a2e6cbcd5eb16b634cf3fd5e0878bdf017678243dbfd8a0
+lib/codeql/swift/elements/expr/internal/UnsafeExprConstructor.qll e7644366f93dfab6ae13910908a18a3a79aa7aee728c62da0bda158fe18279dd 7b9d866b762e1b49a9fa3320247b6c9f8d3f80283e2521c58a422dc73a15f6ce
+lib/codeql/swift/elements/expr/internal/UnsafeExprImpl.qll bae39cfbca303a18001397aa5f24c9ae59cd6c722e0db9488c48173027529a8a f0de29ed4b8b53b5b6f0cabf94d64eb3559f6b5462fe80bcbce062c7588371fb
 lib/codeql/swift/elements/expr/internal/VarargExpansionExprConstructor.qll 917701083da11fce895c53d5f3e0a52b8e3142e9aacdf1d8536a4216ef377b16 b72ca103ced9cbb45f2ef9387387b8aaf3134e358ae5a03fa3ea242896954c81
 lib/codeql/swift/elements/internal/AvailabilityInfoConstructor.qll 89c731f266122a3434b88dfd573d68c50b5c4fa5e13c2443c54f78e682190d1e 86beb6f684e08b6f557b7d67bc164113e9f5270c09bbe95fbd81c558d77f7f84
-lib/codeql/swift/elements/internal/AvailabilitySpecImpl.qll 9ac9285e731938747c574c3f270aaead323656162bd34a6630c1babfaaf25a6a 900b2e638639f427506b2d0eb2806b6ee119ea63ea4ce44758e0c36f2ce915ac
+lib/codeql/swift/elements/internal/AvailabilitySpecConstructor.qll cca46cd2908923a08b7f6a8bea0c0c11071523bcc421bfe141d0e0bafd8dfcb4 cbb1494346379083c0f275111eca78617591568894258a6b73efda34f3fba1ba
 lib/codeql/swift/elements/internal/CommentConstructor.qll 46891994c032546e7323f343947fd57cabb6c0e2ad1ca78f113c5b04436be203 e05b3ba3e00437488fdf53361211c6e5c3ae14ad1fdaf32093b02bdea2076abe
 lib/codeql/swift/elements/internal/DbFileConstructor.qll b5b680f255180d0d38223d6ac4422f192271573dca62f2967dde874147e710df a9c8d1c7abb5516c1d22ee9e020266297e52a2cd84f892792c1e6476517a6737
 lib/codeql/swift/elements/internal/DbFileImpl.qll 09cbe97ad1d1d464bd9a374111e4e6bee0781595e5474809c415aade04431d90 b204d164e7a10ec4a77e0052710339a2c96ba6d42da547cc03cd23c1bd898261
@@ -443,8 +447,6 @@ lib/codeql/swift/elements/internal/DiagnosticsConstructor.qll 5212997161b95b0b10
 lib/codeql/swift/elements/internal/ErrorElementImpl.qll 4ddf6e99bec6125bc5b24bc65d83cca131dd05748f71a85c8f0284659c3a0c49 db606ce97fdf2d2f38a66c7a4ef1437c8a3f6a57b71e426ec2bb0329d9e8a193
 lib/codeql/swift/elements/internal/KeyPathComponentConstructor.qll ff71795157639520f56ce99ed49bf25486c125a0f27a3bb3ba2c8492feca13b2 5875187267cf91e37426d817a6c0c5e7ba9ddb0bd840ad358338ba003e0a877c
 lib/codeql/swift/elements/internal/MacroRoleConstructor.qll c45c189fd441e2c23b1c94dec9f357192f5e392051e0becf52c020d830e38e54 e281ef4ba76a6e4b2b689e00f542ef585cec7a540911ccd7fbb59f3232f08a3d
-lib/codeql/swift/elements/internal/OtherAvailabilitySpecConstructor.qll c5638ae4f3993c7a111fb2a516667190642c1948f18806cf29f78b7067021d10 cc93ac54741ba952b32385db0fe072576a9c8697cd793bcb8faed98f0fb6bda0
-lib/codeql/swift/elements/internal/PlatformVersionAvailabilitySpecConstructor.qll 015280737e71fe1084da6056410fd73dc4473a3b3296d0e46c0ca64f07dd5b7f c735c42e45ebdc308a1f02ff15d65d4d1154071e55645a9ae763d6c021d7f601
 lib/codeql/swift/elements/internal/UnspecifiedElementConstructor.qll f7e232dae7362d0c3f9f33f952d9106da3d273f16b124008919fba6e40a944b6 eb30f05ae09f2c7bc93d758c0870b63f16bf61d0d2446ed827250f89772596ab
 lib/codeql/swift/elements/pattern/AnyPattern.qll b0ccc58de123e61705dde8bb655da0cb02ea981fcb4d4f8d0e205dfbd2a9bedc 55751b143f758968cd006cc70f1d90a9917d9ac7eb319364b2485282944d2835
 lib/codeql/swift/elements/pattern/BindingPattern.qll eca835e58ecbb2096615c88b659c8782158c636501e7f21d38e303fff7a6a2fe 8cc4040c7c5357904389b61e98837d9da2c4aad65039b99ade3f4f9fac4d4479
@@ -555,12 +557,14 @@ lib/codeql/swift/elements/type/DynamicSelfType.qll c7eecfd41722f2fadc7de0783a8e7
 lib/codeql/swift/elements/type/ElementArchetypeType.qll aa920ff09b80d5a4ff5fae22a975ba5debceef3f8953e536e06aba486edbebba 390a084f6b08c232d93ea1a590d1ca73585faa44ba4eb90b7c51e3ecf24cb4c7
 lib/codeql/swift/elements/type/EnumType.qll f6d0174ba79d36d7c1b9d5dc0ede4400a40e7f427e1198721c1774c768ad3927 07f3390dbd2c4040d9fff8df2bde8c3611cb1e72a9d8e663331a96dded353a0a
 lib/codeql/swift/elements/type/ErrorType.qll 4867f96662daa7e667e92fa939889e4ba54d6e139088a640a5472a9c2169e193 b41bebd9ef623d318e39610b5c193648c9b1d36d68770abce995492f0f507415
+lib/codeql/swift/elements/type/ExistentialArchetypeType.qll 79e9d421457aee301bdfeb289240419e11dd5c9e3b5656f742b57cedc2de0ae0 0df3e401c0ec4d8e5ffae7bf879a8006a7e538dd76cf3cbe3a8650d5facde5ec
 lib/codeql/swift/elements/type/ExistentialMetatypeType.qll 08c5cfc4deaf241861a800a0293a90beba953a5176dc9ec16e73aeb11ffeb6e0 6ecafdd2412b0060ad6b040587ae1e6e66597f2e20e452de4e66f3444376e527
 lib/codeql/swift/elements/type/ExistentialType.qll a334e666928a0c50c9ae2f4b7cc891466254954a755c10a19b2b82b8544902ab 57c7ebf1263a8ec399fbdaa1b7eee2e81f633cd020032e2f575ab9d7fe7f4b97
 lib/codeql/swift/elements/type/FunctionType.qll 1a64eb24e8baa74ef2a8e4451f97442aa6f86dd8160eb1f7c4fcd62342ef9ec5 3549451d8443215a5342e3c1b1e3910e71c217a382e42c8916c9435525c49940
 lib/codeql/swift/elements/type/GenericFunctionType.qll 8df1db2785c4e6b88f9af13eb7ba473f91459f57d19c4d706847ac6e3a02d64a 186efec4c23c372f9d9f7038d4b5a36f9c3184564e5b6899d2e467864977dd89
 lib/codeql/swift/elements/type/GenericTypeParamType.qll d75c865295501f7efe27399ce93b30f6a4a217ed207e7227a5d9870cf536ad5f 1a764963700b872c8ea7afd586abbc0dadda68366555baefa6737d87b701a73f
 lib/codeql/swift/elements/type/InOutType.qll 3ff69b884d2604f66290b188892f1d9d4321bf77a20bcda2ce5cb69e565b0cfb 3cd2b06bc606d84b1d73b8fcd2aea4d49aed0c8b98902b44dd6f19d298db7f9d
+lib/codeql/swift/elements/type/InlineArrayType.qll 6af5235213a7d861944e7450143393bf3f56acbe4ac86770aa3920f39f7e61cb 7e04b96dd988e2f7edd7e34d5cf4a787cbcb94b8d0c21417e3e4829112dbe34e
 lib/codeql/swift/elements/type/IntegerType.qll 118acea4a849506aeddd5df92e9f134bf611f8c08cb44e18dc56259df1c98e5f 6801c067c63e310f28fed70a7c1ed87d08be6b7070a7ec677517a93b6eab0c3f
 lib/codeql/swift/elements/type/LValueType.qll e1e53b1467f7b4ff77a812ae9cd8ce151cfc21443a4da14319aee390c081775c 42f5a39fb2c1e5dad3fef6db56430c6063cb04b1ba9c1f2b9c68356aef6aef1c
 lib/codeql/swift/elements/type/LocalArchetypeType.qll 449ff6d721a70a0f8f7a8e1604471513af1523bad6efcc49820154e4d42a426b 1121b807f15d442b708bb614b684ad3d0581c787bae4a16999b8dd7da5103ab6
@@ -569,7 +573,6 @@ lib/codeql/swift/elements/type/ModuleType.qll b37f2a919271463a1317e2933d078d3c72
 lib/codeql/swift/elements/type/NominalOrBoundGenericNominalType.qll d41c27edffe38a8dd0e5fc17e0f9b355e7ecfdc80765fa36f4f00545af47d5c9 83a2f9ff32fec675f011683f64969ce42e2cf2301f48611ecc056242b0116bef
 lib/codeql/swift/elements/type/NominalType.qll 5071658ee2aad7f9008248bc632873695150d95ed6260eecbc5c7c0394823bb9 e7664bde6757e207191348d031c27dda9b614628ff7b85e897d9942907f24ea2
 lib/codeql/swift/elements/type/OpaqueTypeArchetypeType.qll ba746e5ee3e9723cd279b94b4608f10670a26a80d1db5e721eaaacd049160772 7fecafbdf1b1a60200dad6bbcef099470e1f2d34638bb6be6580f11f47e63fa4
-lib/codeql/swift/elements/type/OpenedArchetypeType.qll e902fc1f2ca854a5601dbe6d3e1c1178729f3a38f739335c85355cd3823f79bb 2b16f97a51adad24dcd2c27b1bbedde9e6794920afaec38cd6bf6a769daee15b
 lib/codeql/swift/elements/type/OptionalType.qll 55fff926b9bbe5b2c3ca0963750f71809425578f3fe08de86fe7f25f5729eb53 5aa94f386dd3b251e7ea739c26d3c3fca8f98409627be24765b124d97e70bfa8
 lib/codeql/swift/elements/type/PackArchetypeType.qll 74a688b176c41a2caed819dccda6f450d9b171f5ab65480073866a217d3c6b39 a5dda9d35b8024665765bc773d071b396837ca49b827ed3d8200cb8a1bdff87c
 lib/codeql/swift/elements/type/PackElementType.qll 696ce6efe66eae0554e9919e13cb8e5dcb6c8c218bcb6b8abbcb4bc3f9cbcff8 9fb68c75c11573fcd0fd1048ed1eeec8d5974fafa66e69d8515181c72d5d1230
@@ -650,6 +653,8 @@ lib/codeql/swift/elements/type/internal/EnumTypeConstructor.qll 42082a8131a1d23a
 lib/codeql/swift/elements/type/internal/EnumTypeImpl.qll e1882e9bf4a5758d931066d21af82b10de241593fc632844db4220dfa1b40051 7903e471170bad4ac51971c614c3d5aec81453630f9d74792a6a782f76aa6491
 lib/codeql/swift/elements/type/internal/ErrorTypeConstructor.qll b9c8b309ccc948b5956355b3d3398c1e52317b3c0dfbef0683b2dc62fe2e5054 e30fd9785602b50081917e82b03776bd98774fe45ff35734497cc0816f284cd4
 lib/codeql/swift/elements/type/internal/ErrorTypeImpl.qll c04c074586ee94c721c8ee4c75f2213098a004a69df08d5585d9b3c2a52ae44c 1fcd9cdadbddfd1f89d9cb0962fd767ccf920b26975a9557c4d758933ebd27b3
+lib/codeql/swift/elements/type/internal/ExistentialArchetypeTypeConstructor.qll 135a26bed100d6aae55925fbff1769cb61069488d8b7a19462429d0ebba9d0bb bcff385e197dbff3855f492b6c1d25bd5db2eb6a7cb66ccce80309e9c8f403bb
+lib/codeql/swift/elements/type/internal/ExistentialArchetypeTypeImpl.qll 7c78ae15e6428b8ed103d2d28f719eff388a21615bf68b777a83e22c62aa70aa ab76d66eda10dc4af67eab6ba0757f2f452b75354f9f5d788fe3671d8dc7724f
 lib/codeql/swift/elements/type/internal/ExistentialMetatypeTypeConstructor.qll 4055299dc6cf43e7a12f325913fd84b58761dcbfc14aaa27dd494eae1c282a99 c28e1ef4c8da26eaca30726bf3a81547bf3996cdfdf4b35cfc062d574e791d86
 lib/codeql/swift/elements/type/internal/ExistentialMetatypeTypeImpl.qll 5aeaabe063cd7d9950a46fa4821f8d950c7583a4652f7e2741d81e19281aa873 c5ad2564888f6c10ac2478d72c5a436cec111824781b992adb9bddc723f13faf
 lib/codeql/swift/elements/type/internal/ExistentialTypeConstructor.qll 65aeccb1d9b403e4efee678c7af1e8bb1359f6ffed7a2e75945330a19276b25e b2da77005c4cc9dc8dad8864b222de781863f93996b0128346a0464a7cacdd8b
@@ -662,6 +667,8 @@ lib/codeql/swift/elements/type/internal/GenericTypeParamTypeConstructor.qll b126
 lib/codeql/swift/elements/type/internal/GenericTypeParamTypeImpl.qll efca259897a044fc967341a9fdb39497fc5e9bcb0b4ba33fa76cb926b98b3eb7 aaa621c691813a2f70f4071e3592d7760cef319904209770442ca0d0583f65a1
 lib/codeql/swift/elements/type/internal/InOutTypeConstructor.qll 40550fd07551bc7c1692e08f1cb0692defca613c3c6403719efc5998eb1f1bfd 775f16224a455e336da239a179f84581b345803b9576aca119aeb3eef583d739
 lib/codeql/swift/elements/type/internal/InOutTypeImpl.qll 28fc2931a424f551107b0ee49663d5d5307146c725353c5e484f0dd289f93dc0 ff12e91e30ee53bb8acdcf9e31261b6b1b0ae966babb4eacacb344c22aa1cb6e
+lib/codeql/swift/elements/type/internal/InlineArrayTypeConstructor.qll 382c61399e3e51d8ffa41e5ee3c59d93fc4899284e715f7fb58696cad5d9ca54 0401ff7ff1c07d8d55e670f21a47377b6d650fe74b78c7d9daf9d23de30dbfdf
+lib/codeql/swift/elements/type/internal/InlineArrayTypeImpl.qll b74965b9567b7bb6afdf1834ab3e372da0b13ca10244cbdeee55f71ad952e418 c026806f4f3e5fb416b0d1511c8e8aa6b31fa525b2987a0774d8750118dacad4
 lib/codeql/swift/elements/type/internal/IntegerTypeConstructor.qll 39e33225066f7162309f888723f81893703ee0daba68f192e3277f922060160b 08903e4d0bc8889761d016d6b6c4b7f1bd061a08c97e2a151b59cc0400ea2199
 lib/codeql/swift/elements/type/internal/IntegerTypeImpl.qll ba8e6e972dcea4dbe937083c819c5fd9eb49ba4b6176e040ce65d36a95fe31bd 88064b52d9430b67edd62ed37426f5adc8f6d80722370340d147b0a4ca90f70c
 lib/codeql/swift/elements/type/internal/LValueTypeConstructor.qll e3ab6ebb6191a2553bd4a483067acf7131862bc7235af2da74c35e2250300da8 cfa65d0f22416408ee1e5e5af440166fe5f5b39ae9bf1b9ae92bd9f9f2954b76
@@ -673,8 +680,6 @@ lib/codeql/swift/elements/type/internal/ModuleTypeImpl.qll d13df337e9b7873c3db9c
 lib/codeql/swift/elements/type/internal/NominalOrBoundGenericNominalTypeImpl.qll 6da77c694a1d7e3e3ab889b9fa5bbc0c5940b7ce3e2ea1170f78566589b8275d 5ba1224ee1a942e5d5453effe5434d5b3d7dd5e68979e7c1ea3bab7ff3030484
 lib/codeql/swift/elements/type/internal/OpaqueTypeArchetypeTypeConstructor.qll f33bf566ae7881e6b4c5327602bfd4275bd5344d0f9fb764ebe02b9673ab29ed 88ad64e4c114f34a952701fff67386d43982dacd2845eead408230447d3c0506
 lib/codeql/swift/elements/type/internal/OpaqueTypeArchetypeTypeImpl.qll 402568a45ebe986f2086c765649414b218a262e103ed19d73de3754cc84327d8 b7ef0cbfdd74083403ace6e0d8e6b0502fba1267d04a16c7465fa8b5dbce4138
-lib/codeql/swift/elements/type/internal/OpenedArchetypeTypeConstructor.qll 729a7f0545d9aa3449e92f60f1ff780188135c861cdd119a678569d27684f4c0 e6f51320aec9202d97695228b684cd35ed5f26cdc8576621ad74ca0a5f707fc6
-lib/codeql/swift/elements/type/internal/OpenedArchetypeTypeImpl.qll c8d7f2493f1fd23f2e5c1707ff5209e7345e939b8e9a499f8df28dd4fca77bd2 616ac345e28f858cd1f3571662cda187e2368cf19af6456675dcdac9eb30b714
 lib/codeql/swift/elements/type/internal/OptionalTypeConstructor.qll 648493a385d8a95b665fff776f52e23ecdc2a4baa355328fbb218a1510ff807f 4249552ad87c3e474e32c89e6bf6302d7de5d15980c550f97ec8576a5801770b
 lib/codeql/swift/elements/type/internal/OptionalTypeImpl.qll ac452e2c2883cd9aa7e460032a6f920e10c34a7e04a306b0c6b7a9c637f5b9d1 2513c2da982ed0a11687b5d3938de9e029742ecc1b6942b28e443aafe951f7e6
 lib/codeql/swift/elements/type/internal/PackArchetypeTypeConstructor.qll 11ceeb4d0d337cde182804dc1b56f24ae624b74b55f62979c166172b53497a11 b46528bc0673a80a3d5ce29c358105b876967b73ae4a5596e6d7cf82e2292144
@@ -716,10 +721,10 @@ lib/codeql/swift/elements/type/internal/UnresolvedTypeImpl.qll ee1499dd568753898
 lib/codeql/swift/elements/type/internal/VariadicSequenceTypeConstructor.qll fc74a5a2a2effa28ef24509b20ee4373d97cf6e8c71840121bb031c6adedf584 c9b2effc1d01c13c5e6a74a111122fa79a2f6554dda3cb016d68ba397e566ec4
 lib/codeql/swift/elements/type/internal/WeakStorageTypeConstructor.qll 5fdce3716aba6318522174a2c455a63480970222ae81c732fb19c6dd3ae2d271 60ea79d6943e129deba0deccb566cf9d73f78398b0f7f0212674d91287d6b2ae
 lib/codeql/swift/elements/type/internal/WeakStorageTypeImpl.qll 74f79b458f3204ec2519bd654de21bc4fb6b76816bd8ca01990fe897563a1383 34e1810f74cecda5b580ed050438ae1d914b97a36b8f4e2de1c25254c0cac633
-lib/codeql/swift/elements.qll 2c093130866888903f5a97cc41072ad94c795d296fca6492d6db481b1ca39d94 2c093130866888903f5a97cc41072ad94c795d296fca6492d6db481b1ca39d94
+lib/codeql/swift/elements.qll ec0104a658330f595eac7dd8578d996905a6c2cf78765744c3967a8f3d1c3273 ec0104a658330f595eac7dd8578d996905a6c2cf78765744c3967a8f3d1c3273
 lib/codeql/swift/generated/AstNode.qll 6fb80e9b230a1e3ae8193af40744f253d5cc81dc4239156924e5ab606c491efc e5c28418e9a38bde08f323a3986a199620189fc4a8a4dc8f670610a5d3d65b99
 lib/codeql/swift/generated/AvailabilityInfo.qll e3a5274c43e72ff124b6988fd8be0c83a41b89337e11104150dd0ca7f51d8a11 889563791ca8d9758dbbccf64a0731c4bdbf721cad32bc6cd723f1072b6aa1de
-lib/codeql/swift/generated/AvailabilitySpec.qll bc64d5c690c4d18800f0a48cc76a6a9ee4f832041343666da2d8df2aae04ed7e d03bf874293ac0ab09c025f75c0f392473d47bebe3223143adcc13882a366119
+lib/codeql/swift/generated/AvailabilitySpec.qll 1bd2a0ee085f802c99090e681ab3339fc5013024d79deef39f376de12ab76d37 658f2eb51860726cfa6808b3e3501d624e0734750d1420f7a25c89782f1f6c7e
 lib/codeql/swift/generated/Callable.qll 6213871affd0e1fb176a36b28ae5d0c1af9f9927428d07c23660cde9e3b0bf64 02eaaef87c919f9ceb92e59fa895f5133904bce6d23ea9381e1210377573ddf4
 lib/codeql/swift/generated/Comment.qll 64625f47ebddb1ec7e1c81790dd8120087a76958cba5cebe31f8d1f221740cb9 4d87eed099c645b43272ae806106a8d787e84e5e55ea4f1bbc7b79bf0b127d15
 lib/codeql/swift/generated/DbFile.qll cc0d2b9efbee36080bde2e26e424a40efb763eaee55874fb6c4a5db36938f3df 33e215d838cfa36e3dd0e62879e896d988430d1470a87ce1bb45aad70886212b
@@ -728,23 +733,21 @@ lib/codeql/swift/generated/Diagnostics.qll 03ea201db80d33b18f7f6c71267044c695c25
 lib/codeql/swift/generated/Element.qll bf8f688e05f44f18384067c3cab7f05796764e2b4cce7ff24da419c3dae26194 820390ffbb1012f73267668626f7d0ccd368500331c91bbc276fcb1c25037e41
 lib/codeql/swift/generated/ErrorElement.qll b39bd7c8b4e2011f4a6889e073ebf5b628db32f36f50b067250ae730d9f26561 fd859ec969ba434049e7ba4e78271cc8cebc8b058d2e96e4d47a22064cbb5a21
 lib/codeql/swift/generated/File.qll 476ac95566ef0080e0ad8c3da144b1be1d945d2f33a24f0864d85ff7c56a09b1 3134018bb50166cbf2690f64bba551cace350e4a7e6e25bcded18f997ad1835b
-lib/codeql/swift/generated/KeyPathComponent.qll 5276acdc9a4ff0ec0cc8af615c04043391fb99613731ddcc86db4e47b37c8c5a ccc0931bbd6cc2cfae5037c2ee17bbdcbd87536f5fed90d07e73065c016c4382
+lib/codeql/swift/generated/KeyPathComponent.qll e11dcf952045b5e6062e24c23515cff9eae0b61e5ddf16d29f2c58e2a79a6aa6 3371ae8f26dd5168ac1593bc92a4acd5105905a10a2d696d9ff5478370e6b055
 lib/codeql/swift/generated/Locatable.qll 1d37fa20de71c0b9986bfd7a7c0cb82ab7bf3fda2d2008700f955ad82ce109a7 e97d4d4fb8a4800e0008cc00f60c8ed9b1ebd5f1140fd85e68b034616178d721
 lib/codeql/swift/generated/Location.qll 5e20316c3e480ddfe632b7e88e016c19f10a67df1f6ae9c8f128755a6907d6f5 5a0af2d070bcb2ed53d6d0282bf9c60dc64c2dce89c21fdd485e9c7893c1c8fa
 lib/codeql/swift/generated/MacroRole.qll facf907e75490d69cd401c491215e4719324d751f40ea46c86ccf24cf3663c1f 969d8d4b44e3f1a9c193a152a4d83a303e56d2dbb871fc920c47a33f699cf018
-lib/codeql/swift/generated/OtherAvailabilitySpec.qll d9feaa2a71acff3184ca389045b0a49d09156210df0e034923d715b432ad594b 046737621a8bcf69bf805afb0cff476bd15259f12f0d77fce3206dd01b31518f
-lib/codeql/swift/generated/ParentChild.qll 86a6c9ba4c79d72bf7a0786274f6fba49e6f37cf82de0451a6dad0d319224ebd f7b99ceb052a23d7c25d1615d1453d421b5ddddcec60b7d8d6f956d0d3fd7a2d
-lib/codeql/swift/generated/PlatformVersionAvailabilitySpec.qll dc17b49a90a18a8f7607adf2433bc8f0c194fa3e803aa3822f809d4d4fbd6793 be48ea9f8ae17354c8508aaed24337a9e57ce01f288fece3dcecd99776cabcec
+lib/codeql/swift/generated/ParentChild.qll 7fdc133bdec6cc223d5ee85e757b02c5d2e1ab121bcf269bb48c8a12a31a61e9 d8dd6e21d290a293db4db510b1523a9ea428b12f48b7574f03acf00b9ca065ef
 lib/codeql/swift/generated/PureSynthConstructors.qll bc31a6c4d142fa3fbdcae69d5ba6f1cec00eb9ad92b46c8d7b91ebfa7ef6c1f4 bc31a6c4d142fa3fbdcae69d5ba6f1cec00eb9ad92b46c8d7b91ebfa7ef6c1f4
-lib/codeql/swift/generated/Raw.qll 96d5f8778f25cd396b5cc56c38dce597c5a9a5c2b1e9ed8b9a4d2eca89e49323 d65072b5c508dad1dd813e19f7431087d8bfc0e5d85aa3d19beffbcbbec585ec
-lib/codeql/swift/generated/Synth.qll 2b0f1a8911c1981ff50b78331bdd1f3f6023ad87a4ae3a92088901f493bb62c0 bc94ca1d86033e04b0999da84b61955ea1d8f4ac2379be527802512a42a16964
-lib/codeql/swift/generated/SynthConstructors.qll d30b83f9d8d310414bb1261af386b70502df48159d06579bb2610e18ef546c3d d30b83f9d8d310414bb1261af386b70502df48159d06579bb2610e18ef546c3d
+lib/codeql/swift/generated/Raw.qll 6adc2ec210e91051b6d3d6c84117b827f10dbea682a18b69348d1c6cdc53629c 9ff02fcca7a7b83c85303ffc6daa00ea392da6ce1f9cb389b5053b34d4a45e4c
+lib/codeql/swift/generated/Synth.qll b0084d1f573ba1b10ec8a8fab169b15f15866ecb9a6aeeeac81553a442be28e3 09efe455f3fd6b8b983b30efbd797f09af46e6f5a1a1075801650528999ed938
+lib/codeql/swift/generated/SynthConstructors.qll c40f01e1331bdbe238620a41d17409cefe34a6b23066708ef5d74f8631b54f48 c40f01e1331bdbe238620a41d17409cefe34a6b23066708ef5d74f8631b54f48
 lib/codeql/swift/generated/UnknownFile.qll 247ddf2ebb49ce5ed4bf7bf91a969ddff37de6c78d43d8affccaf7eb586e06f2 452b29f0465ef45e978ef8b647b75e5a2a1e53f2a568fc003bc8f52f73b3fa4d
 lib/codeql/swift/generated/UnknownLocation.qll d871000b4f53ffca4f67ea23ca5626e5dcce125d62a4d4b9969e08cc974af6fc b05971d7774e60790362fb810fb7086314f40a2de747b8cb1bc823ec6494a4dd
 lib/codeql/swift/generated/UnspecifiedElement.qll d9ad4ba1ffff90cc465e8ba0dea8c4e8ba67dce5529b53b63ab6dc8e13c85e67 025218e1fee8ee382b63ad38009dfec73dc604d2ba80b9ad956c7c96eeed7022
 lib/codeql/swift/generated/decl/AbstractStorageDecl.qll 2e1479489d879fe5a712d69fd7956f81c413a854c55f1094a0c801af5ee9478b a20e02c383350c7cf7ddb23db1e782f802a82f4d76b67243f8d6491a759d1d53
 lib/codeql/swift/generated/decl/AbstractTypeParamDecl.qll b72e0759f91cad222e097629b1546e4d12dbc3e247cbb4d82057bb448deb1bfd 00e4135e775ff7076cada8894c6bae60aa642db717d6367a05f87b937f447a6e
-lib/codeql/swift/generated/decl/Accessor.qll 2b015ca1f56cb083d5da653f8a230f712cd86a0121e95c5dd97a3c54cd730872 980e94dbed41ff3852b88e5799620ab3b34f533e7623f8b56385ee0ac8569470
+lib/codeql/swift/generated/decl/Accessor.qll 4e03be18e1191959d7724eb933826c7089f337c56885b08f0962221535935f21 aa2156241f3740246950bd26f97641fc2a8a140fa5d1cd0a341b14c235f7a2b2
 lib/codeql/swift/generated/decl/AccessorOrNamedFunction.qll 4c545d471aff763dc92a2b2047a0543b3c3a487a591509d42bd5878b5b3d1747 07ec58884fdc5e3ddf138c4dd1eccea6bba849671a84e03d9ee12e2310fa8cf2
 lib/codeql/swift/generated/decl/AssociatedTypeDecl.qll a590cfa5980eaf5b52c2bfb0ad7c7d96e8f70894b9945099eea9940d7ef9ed35 fa909d2d471119652c12fac3fdf51abe526920d5f961fd9f9e9c7c512be3bd5d
 lib/codeql/swift/generated/decl/CapturedDecl.qll 07999cdbe928b22e157a7295f25c0a9483b29fd1784fe3d9c6e7f1f211b676ab 62b45dc415ab912ad77db69f93011573918ddaeb0ce6837434b86c3fe561536f
@@ -783,6 +786,7 @@ lib/codeql/swift/generated/decl/SubscriptDecl.qll 18d84b4ef27ecb732ac4350b8b01cb
 lib/codeql/swift/generated/decl/TopLevelCodeDecl.qll b327da6de5b1e40f5eea5893f4fcb01803cfdd78bd757ec93daadedb7169bf8d 2d316fff198707fae5a43e6b24d2a547ee9502fd278468846495d1b2f4ea62b1
 lib/codeql/swift/generated/decl/TypeAliasDecl.qll 041c098c276bc7369049e9a11540e99b061d50977338cceca47488f82b21694e 06deed614cbe77031fdbf3f9591780e80b9f545adec8b7831a2b5329ee49bc5f
 lib/codeql/swift/generated/decl/TypeDecl.qll 92f74709cce7e9f0f713598d3b20b730475c312957c518b8096206f8744419a2 305bda46c8bef48b7e30392698e724093ab2984ffed74cae3361f818cbf8c77a
+lib/codeql/swift/generated/decl/UsingDecl.qll 3bb697961f5699ec9ed1b87511714eac4ee69f5d82e1fd8c6598f121e23a2f7b 4e72b98a84f796d3e0e556ae6b84bf7b7f08adc225dcdc00fd120461e287b472
 lib/codeql/swift/generated/decl/ValueDecl.qll d3b9c241fd6cb1ce8274435c0242775c28c08f6a47caae01ad1ecd38897b2cd5 bc81291b1394b47972d7b75b6a767ed847f881932a7d9345d28d161a55b66bd1
 lib/codeql/swift/generated/decl/VarDecl.qll 8978a73fa2d7a9f952b68a2638788eda857e62502311a33fa6de1dad49a6cb1c b8b6c8cf6773056c3a90494754b0a257dcae494c03d933f138ece7f531fb9158
 lib/codeql/swift/generated/expr/AbiSafeConversionExpr.qll 9d8f0f895a5e1abb89bed9671a9b398e48eca4664eb10b4b41263eb2a29bb2cf 4f65b8e62876664a357433f886baccaf40e4bf7e9ca7eebeb9f5d999354578f9
@@ -920,6 +924,7 @@ lib/codeql/swift/generated/expr/UnresolvedPatternExpr.qll f197e1f19aa3b7641df8e9
 lib/codeql/swift/generated/expr/UnresolvedSpecializeExpr.qll 5b6d9a88439442624051af347514b0a9fd5e932a440979778cf4072f71317770 a8f10642376f9ffa7f7cc73ca81e1a1f5905778a2752f20360f8a84f333dbfdd
 lib/codeql/swift/generated/expr/UnresolvedTypeConversionExpr.qll f30db08dbb5fce2bf6149238f608c62b51079c3694ed80d15ddcbecb2af75346 71b60e93c67f7b66468400ce9cc8714c9ead1bacaa7ce27e9df94542b41318f9
 lib/codeql/swift/generated/expr/UnsafeCastExpr.qll ec430464e1b6253dfcf0d17c08a01efae318b3f0c8beb7c977209504ccc2cc4f 48d5a80c96dfa71e091be2ce13ab7123997a37f8bcbaa6bde070493286f6b7f0
+lib/codeql/swift/generated/expr/UnsafeExpr.qll 5c81d5ebcd95bb217703298b25741b84804d52536cbc70ddf51896cc8e84441c 9bfacf26cc4aa119a47db4b968e81e0db45aecf48390eb67d690053700aecfcb
 lib/codeql/swift/generated/expr/VarargExpansionExpr.qll 3f382a545ef79ef5cd7eadf397f01524769d5fa0ee6410f1d92ff6b9985a99ff ffe8d0caec0226a13599de646f9e0c5f0e1af3c2b7ed480b327f2d51850e9e32
 lib/codeql/swift/generated/pattern/AnyPattern.qll af808c11b81a388f7d35bd98b6abf0fef45a1e1ec850cad16abb754c97c4da82 5c6cb800d4f026792a49fb84a3404f0797e599425bc54f474e3df6a948c18cfe
 lib/codeql/swift/generated/pattern/BindingPattern.qll ec7a78c6f2c2e56494d87c8865da2028cc65875edc516fdbdbde8f2fc80a28e7 df9988a745548d8920a78c0aca6692b24e6dad19251420208d050ee4eb39eee3
@@ -991,12 +996,14 @@ lib/codeql/swift/generated/type/DynamicSelfType.qll 999b59b887b6d550645832bb12ab
 lib/codeql/swift/generated/type/ElementArchetypeType.qll a3cc0d5c0feb8bc446c19f97d311da3a964af6a1d4275496bb506c6094cb6f55 5f8f73bd2b524c3ffd0eaedba90c348d8743add15d1004b4da3a6ffbf6ec3919
 lib/codeql/swift/generated/type/EnumType.qll 258be7d8b1a17ba0c7253b12603c607a2f241b274b329c9124a8158128e77a47 11ac74f5da5dbb5d80efd86c0ffd127f673233fe0e25da68cf691fa2839baab6
 lib/codeql/swift/generated/type/ErrorType.qll d6d3b9457d40d762f9441daf434062a0b2133dc9ef3aa221a655269c5522dcc5 c0c06692f37132098f5306f8c061d71140692a23a5e2a376350aae99854119eb
+lib/codeql/swift/generated/type/ExistentialArchetypeType.qll 54bc16dcf5da69fb444493738ffda37e0e7d85102a6fc5de39329b12e6d5aa70 d56e7bdd2853911dc38387be408dbc1b4430eb4b9284496545e2052f325315e4
 lib/codeql/swift/generated/type/ExistentialMetatypeType.qll 7d497d364ba6d9416bd2fdb561332d7038a36cc3d887a08638b389c74de59159 29dde0610dc53b2c14fd1d6ec4014ffb9979195e8e8487b32a982317609f3476
 lib/codeql/swift/generated/type/ExistentialType.qll dc6e1afb4134e6bb5c63fb86ace78b695224a7bee1fb813799bfb36521e2dabd ef33867f67867021739ae021c6ed763e397f1f299145ff3076980c9dfcbe7a12
 lib/codeql/swift/generated/type/FunctionType.qll 739192b77787905a66d9c9970dc077c3fb458afc038b3b8d8f12f965b2cad1ad 4952c360a7277972bdadbdb9d8dc475153d0c6de50f7b8e7de4c7259abf2541b
 lib/codeql/swift/generated/type/GenericFunctionType.qll 50743701a62cad6f2cbe8b331a45bd3b18f3154b860720355b831735fd2208b4 481b28aee3e473a74a66628acd2050cfee9807ebad8c8a0646783e3942b89297
 lib/codeql/swift/generated/type/GenericTypeParamType.qll f266dffcd2f87f8411b796b97faa671a7bb5e6dd0aa67d3bfc9bbc06a47f1a3b 0e1625a7d2447faf75ec4c716ed1d5219b82ba8720450bc77d279e9854599758
 lib/codeql/swift/generated/type/InOutType.qll 809a3bb1c5eec066416c2fce85df9116e7402a368c7e955abe6a01c7673cbdf4 7c614fa92e624890f3a83e7a7f3464f8a94f45b60beeb77f9295850567522ba7
+lib/codeql/swift/generated/type/InlineArrayType.qll 90254c4b169240f55cf3d061474bb72cb9e107550d2ff1525e1ac6a38f03624a effa3759a6c2177f8586670c90445e7242a391bcffb3c354b5428221404ec926
 lib/codeql/swift/generated/type/IntegerType.qll f2040268ae94c41f27a659c09c55360b20000d40440cb9513409a95379b3b37f 4397d31da9bad9e5167d6dc6cb7f26071bb80e00538bd8f55e7fc53e45e8bd32
 lib/codeql/swift/generated/type/LValueType.qll 4a6422f21bd21b841d841cad9f7c01ce7eeb9ba6b5d1fa004fa44dc008eaa432 8914e356e0475f0f3b81c681295fa7a833fae2e24c491d8d6e552ad897be4184
 lib/codeql/swift/generated/type/LocalArchetypeType.qll de4f291bab61ccb699609f39682cbe29936da3c8be51e9a5620b0bce384bc852 152a74964a40daa7419de15d646ee8b62d137a8a5d7c5d0b002d81d1fdf12c47
@@ -1005,7 +1012,6 @@ lib/codeql/swift/generated/type/ModuleType.qll e4d7d1e1b0854b56e86b2e6d73b06c5e4
 lib/codeql/swift/generated/type/NominalOrBoundGenericNominalType.qll 992bc2e47d0659b8c92a8907614e3d940310befd35767d8a19c70c2db034e36b bba0cf99f299271c893e482881f586e298a35ad48c59ba1a07d216fd5f731a99
 lib/codeql/swift/generated/type/NominalType.qll a1d4865e7c4cc8362c16ed728429851660c84c5d30622c43502f046aa5adf507 337d377662ba3a5232124c80ee008a0d1c56635c1bd59a35cbe82fbb54c0a6cc
 lib/codeql/swift/generated/type/OpaqueTypeArchetypeType.qll 64b1f4b6c76b89e3b11eb3f811f8f1664685980db605721b28a2d503a1c9e972 6acfc69f609e1a0873a2a4d5ad5665c1012a0e89eb3459be35d3a48ef5a304f4
-lib/codeql/swift/generated/type/OpenedArchetypeType.qll 74dcbbf286185787526552c624c740de59cb55b774640492797b58532bb1fb1d 298f136e82ab66af6894db33881fd8a2ddefaa99b3cb522b0f342b6fd3f6ec48
 lib/codeql/swift/generated/type/OptionalType.qll f708e44e676d72274bcb823028aec6122875443de309e2c4e0ca04a18cb4a741 3c2a350fbd32b3297161ca14e050c7d75d3d5606be8adab59a4f53d514794e9d
 lib/codeql/swift/generated/type/PackArchetypeType.qll cc561152cbf2eae8482a82997fe1725dccd172ee93d091df47d620f5c7cca2fe 278bf4d686f9b977882f98de695ac41575ba589d7838ad077dcb04ba1f95598e
 lib/codeql/swift/generated/type/PackElementType.qll 997dae178f56757eb1e0c2ea6496dcaf9886e37d7b6b92bd849807beac630b9f 924e898526b3bf758f339e384025dc87fb64e0b0ce8526d63cbe7170d7e6ec73
@@ -1033,13 +1039,12 @@ lib/codeql/swift/generated/type/UnresolvedType.qll 3b99e19ca7177619fb79e6e8511df
 lib/codeql/swift/generated/type/VariadicSequenceType.qll 7ece2c953e24d1c51715610f2813bd97f6d9fc6e58e5df0aacadad31e1fd1d8f be0005d973fd7c4c937fc340711fafe7ceba592ac407b88731bc35a1c2800aeb
 lib/codeql/swift/generated/type/WeakStorageType.qll d46b67f2b7bcc8aa7599e38506e91c219f894df4668ff1f0b5b66c1858040f5b c8e34ec9df085d938e36492d172fbf84ca56fc9d805713b8ada92e1b4c7bef54
 test/extractor-tests/generated/AvailabilityInfo/AvailabilityInfo.ql 0bb0cfe3f8c38af3b870f8c404c16a5715e80d5ea8fd7939cc13032d7b824809 142ae1e76138b287aa66e091683aae545d139ef2971624e2dfdd3ea454bc2d05
+test/extractor-tests/generated/AvailabilitySpec/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d
 test/extractor-tests/generated/Comment/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d
 test/extractor-tests/generated/Diagnostics/Diagnostics.ql c1f8be2c283e13c1a4dadaa008e42f660ea09d9ee1de22b0e8493ef76384546e d84efa40eaecbce6b928a5b235e10bf1e4409a9d0778c365ec19d2fade7ab3ab
 test/extractor-tests/generated/File/File.ql a1385ef2080e04e8757f61b8e1d0129df9f955edf03fbb3b83cc9cb5498b4e95 0364d8c7f108d01b2641f996efedab7084956307e875e6bc078ea677d04267e0
 test/extractor-tests/generated/KeyPathComponent/KeyPathComponent.ql 3fa617f8ed1b308d0c56f429ee8abe6d33ef60bf57d87f6dc89fdc8fe969a102 c2fa3153077dbe9e0fc608524dc03c82ff4ed460364d341ee6a817b0d75291c3
-test/extractor-tests/generated/OtherAvailabilitySpec/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d
-test/extractor-tests/generated/PlatformVersionAvailabilitySpec/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d
-test/extractor-tests/generated/decl/Accessor/Accessor.ql 7e50dd3c4119162bbfa3e2461300d876c60321d4b6473ddd35e0cb992108570e eb81ed8db92bff46974079e0f1100cf94bd639191a36db45ee9e65467abb6e38
+test/extractor-tests/generated/decl/Accessor/Accessor.ql 3d4301ec9ec6284b547f8cccf94c3077f0baf70778f458bc21bebc5de55c86e5 2f263e79ecd1ac8da56c17caff400fd3c40d83b6aa3d501830f1d2eeb48a57cd
 test/extractor-tests/generated/decl/AssociatedTypeDecl/AssociatedTypeDecl.ql 55a78a6b96a17532178a39bd39aa4df23295f98019bb00de041ba15dfd4f84d9 51dbcd86203d5d031d748f77943a81c2c50de4ff559af20a4a1a682a19978d4f
 test/extractor-tests/generated/decl/CapturedDecl/CapturedDecl.ql fd62be6c38d39f371c20e8c2f233e37a9da5aa234588920634f5db67e8beb3bd d51d35d4fd6a21cd596e064e0221d0c86e36312412a9bd4e64f431c123f3019a
 test/extractor-tests/generated/decl/ClassDecl/ClassDecl.ql d5fa7f68307e2e3e7ad060a125bda148e4a28f6acbef08a1a975bbf9ba947641 46d1e4f801414f1c869601dc706e41393e5fcd399e51da593c1e58737f6ff427
@@ -1070,6 +1075,7 @@ test/extractor-tests/generated/decl/StructDecl/MISSING_SOURCE.txt 35fb32ea539315
 test/extractor-tests/generated/decl/SubscriptDecl/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d
 test/extractor-tests/generated/decl/TopLevelCodeDecl/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d
 test/extractor-tests/generated/decl/TypeAliasDecl/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d
+test/extractor-tests/generated/decl/UsingDecl/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d
 test/extractor-tests/generated/expr/AppliedPropertyWrapperExpr/AppliedPropertyWrapperExpr.ql 612ed1b62baed51cb74ea682512de8042c71cc14c99f966f8de33c65c8be7cdf 390197357690dd42d23ee5f0670f1183139cfbdd63f67c7430dd62c51e5d9426
 test/extractor-tests/generated/expr/Argument/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d
 test/extractor-tests/generated/expr/ArrayExpr/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d
@@ -1188,18 +1194,19 @@ test/extractor-tests/generated/type/DependentMemberType/MISSING_SOURCE.txt 35fb3
 test/extractor-tests/generated/type/DictionaryType/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d
 test/extractor-tests/generated/type/DynamicSelfType/DynamicSelfType.ql 62da270e23b080f8ceb9ec5c130f84ccd779c43cf30c88db526ef061269c5ce9 390cb48fd7873210f5f5b4e8f275347348336a1e8161c72d3fafa5f7fee90f93
 test/extractor-tests/generated/type/EnumType/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d
+test/extractor-tests/generated/type/ExistentialArchetypeType/ExistentialArchetypeType.ql b2f71d888599d3df876dd65dfb4e2e0314f6f1354945b8d467fbe04430d155f8 7e35aec4e133bb76d1fbd87a715014b81b39021ee3f66f49e25292c1388628a0
 test/extractor-tests/generated/type/ExistentialMetatypeType/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d
 test/extractor-tests/generated/type/ExistentialType/ExistentialType.ql 7e09bbea166a4f269ecef1113229e98dfd7ea68ea5d4025af492fcce48698420 a4d00ff4100138020af51e8264d1d243156e52ab417bb150d33e9e1cc8cb0a69
 test/extractor-tests/generated/type/FunctionType/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d
 test/extractor-tests/generated/type/GenericFunctionType/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d
 test/extractor-tests/generated/type/GenericTypeParamType/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d
 test/extractor-tests/generated/type/InOutType/InOutType.ql 611aea3776fbcd3763d798b58eba36522db9d4f8ae95dad133562abc6b9d0a9c 184e35f8ef3aa77b52d7d6dbd784fe4749793c50f0484195bd91f49bc2838509
+test/extractor-tests/generated/type/InlineArrayType/InlineArrayType.ql e51c2fb11a7b19bcdd008944d16fd32b62a4460e53b792370aba45a8150a2b97 7c9541613e0a5ca33a1d73d03900de2a1dd5466a910e2a153e206a3ae650f8b8
 test/extractor-tests/generated/type/IntegerType/IntegerType.ql 6f18b3b5b4c53ca5d5302a78b04fea929bce478fa5c342f01951379a405b4c8a 486c1ceef03d02b064381ba514ad19eeca250c83ce54354a08c3a7c94bd4fd11
 test/extractor-tests/generated/type/LValueType/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d
 test/extractor-tests/generated/type/MetatypeType/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d
 test/extractor-tests/generated/type/ModuleType/ModuleType.ql 7d78142dc82b06e454b9875a47890d5c2364e51f6e496640d6c4d20327f535b7 cecd45f6a4b0f137cdd7e694259044016ab01da6a42e73c3a361b4d00b594133
 test/extractor-tests/generated/type/OpaqueTypeArchetypeType/OpaqueTypeArchetypeType.ql 86bc4823c19da17cbcebe3a4634eccff0a96cbebd174d8d4b1610e3fda3f8bdb 82179cb6e188a3a271428de4631c2a6fa4cec2e65a628fb56c2cbcff8a6a13d3
-test/extractor-tests/generated/type/OpenedArchetypeType/OpenedArchetypeType.ql fdbbc1cffb209097480596d3be405188d045758da03a7980511d56874690b9c4 9ba8ffc028988a21cd751d25f0c363c3c37dfc0a13629379c8ca94b6b066bb7d
 test/extractor-tests/generated/type/OptionalType/MISSING_SOURCE.txt 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d 35fb32ea5393152eb7a875b20b4e3e4b8c7a997a8959c32417140d57a16a052d
 test/extractor-tests/generated/type/PackType/ElementArchetypeType.ql d4d695dcd0e723cdc9f196d828e22a3650ac751f0488e257f3bc2e2afbc343ec ff20bf849e18621b6193699bf58b3d6d127c29113dc996100bc18938fdf4658c
 test/extractor-tests/generated/type/PackType/PackArchetypeType.ql 56e7f72a2d6f03e394a5e7103e337aee06b8e1fa9198d8f6123c44c4e33d5b57 e7259313ade883242bffb8e812da64c77108b55acbf39d7b8cda47251ee5f5d3
diff --git a/swift/ql/.gitattributes b/swift/ql/.gitattributes
index 068b4274967..37f29b6947e 100644
--- a/swift/ql/.gitattributes
+++ b/swift/ql/.gitattributes
@@ -15,8 +15,6 @@
 /lib/codeql/swift/elements/Locatable.qll linguist-generated
 /lib/codeql/swift/elements/Location.qll linguist-generated
 /lib/codeql/swift/elements/MacroRole.qll linguist-generated
-/lib/codeql/swift/elements/OtherAvailabilitySpec.qll linguist-generated
-/lib/codeql/swift/elements/PlatformVersionAvailabilitySpec.qll linguist-generated
 /lib/codeql/swift/elements/UnknownFile.qll linguist-generated
 /lib/codeql/swift/elements/UnknownLocation.qll linguist-generated
 /lib/codeql/swift/elements/UnspecifiedElement.qll linguist-generated
@@ -60,6 +58,7 @@
 /lib/codeql/swift/elements/decl/TopLevelCodeDecl.qll linguist-generated
 /lib/codeql/swift/elements/decl/TypeAliasDecl.qll linguist-generated
 /lib/codeql/swift/elements/decl/TypeDecl.qll linguist-generated
+/lib/codeql/swift/elements/decl/UsingDecl.qll linguist-generated
 /lib/codeql/swift/elements/decl/ValueDecl.qll linguist-generated
 /lib/codeql/swift/elements/decl/VarDecl.qll linguist-generated
 /lib/codeql/swift/elements/decl/internal/AbstractStorageDeclImpl.qll linguist-generated
@@ -112,6 +111,8 @@
 /lib/codeql/swift/elements/decl/internal/SubscriptDeclConstructor.qll linguist-generated
 /lib/codeql/swift/elements/decl/internal/TopLevelCodeDeclConstructor.qll linguist-generated
 /lib/codeql/swift/elements/decl/internal/TypeAliasDeclConstructor.qll linguist-generated
+/lib/codeql/swift/elements/decl/internal/UsingDeclConstructor.qll linguist-generated
+/lib/codeql/swift/elements/decl/internal/UsingDeclImpl.qll linguist-generated
 /lib/codeql/swift/elements/expr/AbiSafeConversionExpr.qll linguist-generated
 /lib/codeql/swift/elements/expr/ActorIsolationErasureExpr.qll linguist-generated
 /lib/codeql/swift/elements/expr/AnyHashableErasureExpr.qll linguist-generated
@@ -244,6 +245,7 @@
 /lib/codeql/swift/elements/expr/UnresolvedSpecializeExpr.qll linguist-generated
 /lib/codeql/swift/elements/expr/UnresolvedTypeConversionExpr.qll linguist-generated
 /lib/codeql/swift/elements/expr/UnsafeCastExpr.qll linguist-generated
+/lib/codeql/swift/elements/expr/UnsafeExpr.qll linguist-generated
 /lib/codeql/swift/elements/expr/VarargExpansionExpr.qll linguist-generated
 /lib/codeql/swift/elements/expr/internal/AbiSafeConversionExprConstructor.qll linguist-generated
 /lib/codeql/swift/elements/expr/internal/AbiSafeConversionExprImpl.qll linguist-generated
@@ -433,9 +435,11 @@
 /lib/codeql/swift/elements/expr/internal/UnresolvedTypeConversionExprImpl.qll linguist-generated
 /lib/codeql/swift/elements/expr/internal/UnsafeCastExprConstructor.qll linguist-generated
 /lib/codeql/swift/elements/expr/internal/UnsafeCastExprImpl.qll linguist-generated
+/lib/codeql/swift/elements/expr/internal/UnsafeExprConstructor.qll linguist-generated
+/lib/codeql/swift/elements/expr/internal/UnsafeExprImpl.qll linguist-generated
 /lib/codeql/swift/elements/expr/internal/VarargExpansionExprConstructor.qll linguist-generated
 /lib/codeql/swift/elements/internal/AvailabilityInfoConstructor.qll linguist-generated
-/lib/codeql/swift/elements/internal/AvailabilitySpecImpl.qll linguist-generated
+/lib/codeql/swift/elements/internal/AvailabilitySpecConstructor.qll linguist-generated
 /lib/codeql/swift/elements/internal/CommentConstructor.qll linguist-generated
 /lib/codeql/swift/elements/internal/DbFileConstructor.qll linguist-generated
 /lib/codeql/swift/elements/internal/DbFileImpl.qll linguist-generated
@@ -445,8 +449,6 @@
 /lib/codeql/swift/elements/internal/ErrorElementImpl.qll linguist-generated
 /lib/codeql/swift/elements/internal/KeyPathComponentConstructor.qll linguist-generated
 /lib/codeql/swift/elements/internal/MacroRoleConstructor.qll linguist-generated
-/lib/codeql/swift/elements/internal/OtherAvailabilitySpecConstructor.qll linguist-generated
-/lib/codeql/swift/elements/internal/PlatformVersionAvailabilitySpecConstructor.qll linguist-generated
 /lib/codeql/swift/elements/internal/UnspecifiedElementConstructor.qll linguist-generated
 /lib/codeql/swift/elements/pattern/AnyPattern.qll linguist-generated
 /lib/codeql/swift/elements/pattern/BindingPattern.qll linguist-generated
@@ -557,12 +559,14 @@
 /lib/codeql/swift/elements/type/ElementArchetypeType.qll linguist-generated
 /lib/codeql/swift/elements/type/EnumType.qll linguist-generated
 /lib/codeql/swift/elements/type/ErrorType.qll linguist-generated
+/lib/codeql/swift/elements/type/ExistentialArchetypeType.qll linguist-generated
 /lib/codeql/swift/elements/type/ExistentialMetatypeType.qll linguist-generated
 /lib/codeql/swift/elements/type/ExistentialType.qll linguist-generated
 /lib/codeql/swift/elements/type/FunctionType.qll linguist-generated
 /lib/codeql/swift/elements/type/GenericFunctionType.qll linguist-generated
 /lib/codeql/swift/elements/type/GenericTypeParamType.qll linguist-generated
 /lib/codeql/swift/elements/type/InOutType.qll linguist-generated
+/lib/codeql/swift/elements/type/InlineArrayType.qll linguist-generated
 /lib/codeql/swift/elements/type/IntegerType.qll linguist-generated
 /lib/codeql/swift/elements/type/LValueType.qll linguist-generated
 /lib/codeql/swift/elements/type/LocalArchetypeType.qll linguist-generated
@@ -571,7 +575,6 @@
 /lib/codeql/swift/elements/type/NominalOrBoundGenericNominalType.qll linguist-generated
 /lib/codeql/swift/elements/type/NominalType.qll linguist-generated
 /lib/codeql/swift/elements/type/OpaqueTypeArchetypeType.qll linguist-generated
-/lib/codeql/swift/elements/type/OpenedArchetypeType.qll linguist-generated
 /lib/codeql/swift/elements/type/OptionalType.qll linguist-generated
 /lib/codeql/swift/elements/type/PackArchetypeType.qll linguist-generated
 /lib/codeql/swift/elements/type/PackElementType.qll linguist-generated
@@ -652,6 +655,8 @@
 /lib/codeql/swift/elements/type/internal/EnumTypeImpl.qll linguist-generated
 /lib/codeql/swift/elements/type/internal/ErrorTypeConstructor.qll linguist-generated
 /lib/codeql/swift/elements/type/internal/ErrorTypeImpl.qll linguist-generated
+/lib/codeql/swift/elements/type/internal/ExistentialArchetypeTypeConstructor.qll linguist-generated
+/lib/codeql/swift/elements/type/internal/ExistentialArchetypeTypeImpl.qll linguist-generated
 /lib/codeql/swift/elements/type/internal/ExistentialMetatypeTypeConstructor.qll linguist-generated
 /lib/codeql/swift/elements/type/internal/ExistentialMetatypeTypeImpl.qll linguist-generated
 /lib/codeql/swift/elements/type/internal/ExistentialTypeConstructor.qll linguist-generated
@@ -664,6 +669,8 @@
 /lib/codeql/swift/elements/type/internal/GenericTypeParamTypeImpl.qll linguist-generated
 /lib/codeql/swift/elements/type/internal/InOutTypeConstructor.qll linguist-generated
 /lib/codeql/swift/elements/type/internal/InOutTypeImpl.qll linguist-generated
+/lib/codeql/swift/elements/type/internal/InlineArrayTypeConstructor.qll linguist-generated
+/lib/codeql/swift/elements/type/internal/InlineArrayTypeImpl.qll linguist-generated
 /lib/codeql/swift/elements/type/internal/IntegerTypeConstructor.qll linguist-generated
 /lib/codeql/swift/elements/type/internal/IntegerTypeImpl.qll linguist-generated
 /lib/codeql/swift/elements/type/internal/LValueTypeConstructor.qll linguist-generated
@@ -675,8 +682,6 @@
 /lib/codeql/swift/elements/type/internal/NominalOrBoundGenericNominalTypeImpl.qll linguist-generated
 /lib/codeql/swift/elements/type/internal/OpaqueTypeArchetypeTypeConstructor.qll linguist-generated
 /lib/codeql/swift/elements/type/internal/OpaqueTypeArchetypeTypeImpl.qll linguist-generated
-/lib/codeql/swift/elements/type/internal/OpenedArchetypeTypeConstructor.qll linguist-generated
-/lib/codeql/swift/elements/type/internal/OpenedArchetypeTypeImpl.qll linguist-generated
 /lib/codeql/swift/elements/type/internal/OptionalTypeConstructor.qll linguist-generated
 /lib/codeql/swift/elements/type/internal/OptionalTypeImpl.qll linguist-generated
 /lib/codeql/swift/elements/type/internal/PackArchetypeTypeConstructor.qll linguist-generated
@@ -734,9 +739,7 @@
 /lib/codeql/swift/generated/Locatable.qll linguist-generated
 /lib/codeql/swift/generated/Location.qll linguist-generated
 /lib/codeql/swift/generated/MacroRole.qll linguist-generated
-/lib/codeql/swift/generated/OtherAvailabilitySpec.qll linguist-generated
 /lib/codeql/swift/generated/ParentChild.qll linguist-generated
-/lib/codeql/swift/generated/PlatformVersionAvailabilitySpec.qll linguist-generated
 /lib/codeql/swift/generated/PureSynthConstructors.qll linguist-generated
 /lib/codeql/swift/generated/Raw.qll linguist-generated
 /lib/codeql/swift/generated/Synth.qll linguist-generated
@@ -785,6 +788,7 @@
 /lib/codeql/swift/generated/decl/TopLevelCodeDecl.qll linguist-generated
 /lib/codeql/swift/generated/decl/TypeAliasDecl.qll linguist-generated
 /lib/codeql/swift/generated/decl/TypeDecl.qll linguist-generated
+/lib/codeql/swift/generated/decl/UsingDecl.qll linguist-generated
 /lib/codeql/swift/generated/decl/ValueDecl.qll linguist-generated
 /lib/codeql/swift/generated/decl/VarDecl.qll linguist-generated
 /lib/codeql/swift/generated/expr/AbiSafeConversionExpr.qll linguist-generated
@@ -922,6 +926,7 @@
 /lib/codeql/swift/generated/expr/UnresolvedSpecializeExpr.qll linguist-generated
 /lib/codeql/swift/generated/expr/UnresolvedTypeConversionExpr.qll linguist-generated
 /lib/codeql/swift/generated/expr/UnsafeCastExpr.qll linguist-generated
+/lib/codeql/swift/generated/expr/UnsafeExpr.qll linguist-generated
 /lib/codeql/swift/generated/expr/VarargExpansionExpr.qll linguist-generated
 /lib/codeql/swift/generated/pattern/AnyPattern.qll linguist-generated
 /lib/codeql/swift/generated/pattern/BindingPattern.qll linguist-generated
@@ -993,12 +998,14 @@
 /lib/codeql/swift/generated/type/ElementArchetypeType.qll linguist-generated
 /lib/codeql/swift/generated/type/EnumType.qll linguist-generated
 /lib/codeql/swift/generated/type/ErrorType.qll linguist-generated
+/lib/codeql/swift/generated/type/ExistentialArchetypeType.qll linguist-generated
 /lib/codeql/swift/generated/type/ExistentialMetatypeType.qll linguist-generated
 /lib/codeql/swift/generated/type/ExistentialType.qll linguist-generated
 /lib/codeql/swift/generated/type/FunctionType.qll linguist-generated
 /lib/codeql/swift/generated/type/GenericFunctionType.qll linguist-generated
 /lib/codeql/swift/generated/type/GenericTypeParamType.qll linguist-generated
 /lib/codeql/swift/generated/type/InOutType.qll linguist-generated
+/lib/codeql/swift/generated/type/InlineArrayType.qll linguist-generated
 /lib/codeql/swift/generated/type/IntegerType.qll linguist-generated
 /lib/codeql/swift/generated/type/LValueType.qll linguist-generated
 /lib/codeql/swift/generated/type/LocalArchetypeType.qll linguist-generated
@@ -1007,7 +1014,6 @@
 /lib/codeql/swift/generated/type/NominalOrBoundGenericNominalType.qll linguist-generated
 /lib/codeql/swift/generated/type/NominalType.qll linguist-generated
 /lib/codeql/swift/generated/type/OpaqueTypeArchetypeType.qll linguist-generated
-/lib/codeql/swift/generated/type/OpenedArchetypeType.qll linguist-generated
 /lib/codeql/swift/generated/type/OptionalType.qll linguist-generated
 /lib/codeql/swift/generated/type/PackArchetypeType.qll linguist-generated
 /lib/codeql/swift/generated/type/PackElementType.qll linguist-generated
@@ -1035,12 +1041,11 @@
 /lib/codeql/swift/generated/type/VariadicSequenceType.qll linguist-generated
 /lib/codeql/swift/generated/type/WeakStorageType.qll linguist-generated
 /test/extractor-tests/generated/AvailabilityInfo/AvailabilityInfo.ql linguist-generated
+/test/extractor-tests/generated/AvailabilitySpec/MISSING_SOURCE.txt linguist-generated
 /test/extractor-tests/generated/Comment/MISSING_SOURCE.txt linguist-generated
 /test/extractor-tests/generated/Diagnostics/Diagnostics.ql linguist-generated
 /test/extractor-tests/generated/File/File.ql linguist-generated
 /test/extractor-tests/generated/KeyPathComponent/KeyPathComponent.ql linguist-generated
-/test/extractor-tests/generated/OtherAvailabilitySpec/MISSING_SOURCE.txt linguist-generated
-/test/extractor-tests/generated/PlatformVersionAvailabilitySpec/MISSING_SOURCE.txt linguist-generated
 /test/extractor-tests/generated/decl/Accessor/Accessor.ql linguist-generated
 /test/extractor-tests/generated/decl/AssociatedTypeDecl/AssociatedTypeDecl.ql linguist-generated
 /test/extractor-tests/generated/decl/CapturedDecl/CapturedDecl.ql linguist-generated
@@ -1072,6 +1077,7 @@
 /test/extractor-tests/generated/decl/SubscriptDecl/MISSING_SOURCE.txt linguist-generated
 /test/extractor-tests/generated/decl/TopLevelCodeDecl/MISSING_SOURCE.txt linguist-generated
 /test/extractor-tests/generated/decl/TypeAliasDecl/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/decl/UsingDecl/MISSING_SOURCE.txt linguist-generated
 /test/extractor-tests/generated/expr/AppliedPropertyWrapperExpr/AppliedPropertyWrapperExpr.ql linguist-generated
 /test/extractor-tests/generated/expr/Argument/MISSING_SOURCE.txt linguist-generated
 /test/extractor-tests/generated/expr/ArrayExpr/MISSING_SOURCE.txt linguist-generated
@@ -1190,18 +1196,19 @@
 /test/extractor-tests/generated/type/DictionaryType/MISSING_SOURCE.txt linguist-generated
 /test/extractor-tests/generated/type/DynamicSelfType/DynamicSelfType.ql linguist-generated
 /test/extractor-tests/generated/type/EnumType/MISSING_SOURCE.txt linguist-generated
+/test/extractor-tests/generated/type/ExistentialArchetypeType/ExistentialArchetypeType.ql linguist-generated
 /test/extractor-tests/generated/type/ExistentialMetatypeType/MISSING_SOURCE.txt linguist-generated
 /test/extractor-tests/generated/type/ExistentialType/ExistentialType.ql linguist-generated
 /test/extractor-tests/generated/type/FunctionType/MISSING_SOURCE.txt linguist-generated
 /test/extractor-tests/generated/type/GenericFunctionType/MISSING_SOURCE.txt linguist-generated
 /test/extractor-tests/generated/type/GenericTypeParamType/MISSING_SOURCE.txt linguist-generated
 /test/extractor-tests/generated/type/InOutType/InOutType.ql linguist-generated
+/test/extractor-tests/generated/type/InlineArrayType/InlineArrayType.ql linguist-generated
 /test/extractor-tests/generated/type/IntegerType/IntegerType.ql linguist-generated
 /test/extractor-tests/generated/type/LValueType/MISSING_SOURCE.txt linguist-generated
 /test/extractor-tests/generated/type/MetatypeType/MISSING_SOURCE.txt linguist-generated
 /test/extractor-tests/generated/type/ModuleType/ModuleType.ql linguist-generated
 /test/extractor-tests/generated/type/OpaqueTypeArchetypeType/OpaqueTypeArchetypeType.ql linguist-generated
-/test/extractor-tests/generated/type/OpenedArchetypeType/OpenedArchetypeType.ql linguist-generated
 /test/extractor-tests/generated/type/OptionalType/MISSING_SOURCE.txt linguist-generated
 /test/extractor-tests/generated/type/PackType/ElementArchetypeType.ql linguist-generated
 /test/extractor-tests/generated/type/PackType/PackArchetypeType.ql linguist-generated
diff --git a/swift/ql/integration-tests/autobuilder/xcode-fails-spm-works/Files.macos_26.expected b/swift/ql/integration-tests/autobuilder/xcode-fails-spm-works/Files.macos_26.expected
new file mode 100644
index 00000000000..8a3be429106
--- /dev/null
+++ b/swift/ql/integration-tests/autobuilder/xcode-fails-spm-works/Files.macos_26.expected
@@ -0,0 +1,3 @@
+| Package.swift:0:0:0:0 | Package.swift |
+| Sources/hello-world/hello_world.swift:0:0:0:0 | Sources/hello-world/hello_world.swift |
+| file://:0:0:0:0 |  |
diff --git a/swift/ql/integration-tests/autobuilder/xcode-fails-spm-works/test.py b/swift/ql/integration-tests/autobuilder/xcode-fails-spm-works/test.py
index 298fd2726d0..4beed91f233 100644
--- a/swift/ql/integration-tests/autobuilder/xcode-fails-spm-works/test.py
+++ b/swift/ql/integration-tests/autobuilder/xcode-fails-spm-works/test.py
@@ -3,6 +3,7 @@ import pytest
 
 
 @runs_on.macos
-@pytest.mark.ql_test("DB-CHECK", xfail=True)
+@pytest.mark.ql_test("DB-CHECK", xfail=not runs_on.macos_26)
+@pytest.mark.ql_test("*", expected=f"{'.macos_26' if runs_on.macos_26 else ''}.expected")
 def test(codeql, swift):
     codeql.database.create()
diff --git a/swift/ql/integration-tests/posix/deduplication/BuiltinTypes.expected b/swift/ql/integration-tests/posix/deduplication/BuiltinTypes.expected
index ab0d6f17ad5..0f0a0220445 100644
--- a/swift/ql/integration-tests/posix/deduplication/BuiltinTypes.expected
+++ b/swift/ql/integration-tests/posix/deduplication/BuiltinTypes.expected
@@ -2,6 +2,8 @@
 | Builtin.Executor | BuiltinExecutorType |
 | Builtin.FPIEEE32 | BuiltinFloatType |
 | Builtin.FPIEEE64 | BuiltinFloatType |
+| Builtin.FixedArray<\u03c4_0_0, \u03c4_0_1> | BuiltinFixedArrayType |
+| Builtin.FixedArray<count, Element> | BuiltinFixedArrayType |
 | Builtin.Int1 | BuiltinIntegerType |
 | Builtin.Int8 | BuiltinIntegerType |
 | Builtin.Int16 | BuiltinIntegerType |
diff --git a/swift/ql/lib/CHANGELOG.md b/swift/ql/lib/CHANGELOG.md
index 46341f158e7..b1b958708e0 100644
--- a/swift/ql/lib/CHANGELOG.md
+++ b/swift/ql/lib/CHANGELOG.md
@@ -1,3 +1,44 @@
+## 6.0.0
+
+### Breaking Changes
+
+* The `OpenedArchetypeType` class has been renamed as `ExistentialArchetypeType`.
+* The `OtherAvailabilitySpec` class has been removed. Use `AvailabilitySpec::isWildcard` instead.
+* The `PlatformVersionAvailabilitySpec` has been removed. Use `AvailabilitySpec::getPlatform` and `AvailabilitySpec::getVersion` instead.
+
+### New Features
+
+* Added AST nodes `UsingDecl`, `UnsafeExpr`, and `InlineArrayType` that correspond to new nodes in Swift 6.2.
+* Added new predicates `isDistributedGet`, `isRead2`, `isModify2`, and `isInit` to the `Accessor` class that correspond to new accessors in Swift 6.2.
+* Added a new predicate `isApply` to the `KeyPathComponent` class that corresponds to method and initializer key path components in Swift 6.2.
+
+### Major Analysis Improvements
+
+* Upgraded to allow analysis of Swift 6.2.
+* Support for experimental Embedded Swift has been dropped.
+
+## 5.0.9
+
+No user-facing changes.
+
+## 5.0.8
+
+No user-facing changes.
+
+## 5.0.7
+
+### Minor Analysis Improvements
+
+* Updated to allow analysis of Swift 6.1.3.
+
+## 5.0.6
+
+No user-facing changes.
+
+## 5.0.5
+
+No user-facing changes.
+
 ## 5.0.4
 
 ### Minor Analysis Improvements
diff --git a/swift/ql/lib/Customizations.qll b/swift/ql/lib/Customizations.qll
new file mode 100644
index 00000000000..bf9e66de70b
--- /dev/null
+++ b/swift/ql/lib/Customizations.qll
@@ -0,0 +1,11 @@
+/**
+ * Contains customizations to the standard library.
+ *
+ * This module is imported by `swift.qll`, so any customizations defined here automatically
+ * apply to all queries.
+ *
+ * Typical examples of customizations include adding new subclasses of abstract classes such as
+ * the `RemoteFlowSource` class to model frameworks that are not covered by the standard library.
+ */
+
+import swift
diff --git a/swift/ql/lib/change-notes/2025-10-22-swift-6.2.1.md b/swift/ql/lib/change-notes/2025-10-22-swift-6.2.1.md
new file mode 100644
index 00000000000..42a738ff746
--- /dev/null
+++ b/swift/ql/lib/change-notes/2025-10-22-swift-6.2.1.md
@@ -0,0 +1,4 @@
+---
+category: majorAnalysis
+---
+* Upgraded to allow analysis of Swift 6.2.1.
diff --git a/swift/ql/lib/change-notes/released/5.0.5.md b/swift/ql/lib/change-notes/released/5.0.5.md
new file mode 100644
index 00000000000..be08f873636
--- /dev/null
+++ b/swift/ql/lib/change-notes/released/5.0.5.md
@@ -0,0 +1,3 @@
+## 5.0.5
+
+No user-facing changes.
diff --git a/swift/ql/lib/change-notes/released/5.0.6.md b/swift/ql/lib/change-notes/released/5.0.6.md
new file mode 100644
index 00000000000..3281a876281
--- /dev/null
+++ b/swift/ql/lib/change-notes/released/5.0.6.md
@@ -0,0 +1,3 @@
+## 5.0.6
+
+No user-facing changes.
diff --git a/swift/ql/lib/change-notes/released/5.0.7.md b/swift/ql/lib/change-notes/released/5.0.7.md
new file mode 100644
index 00000000000..f10f4382e26
--- /dev/null
+++ b/swift/ql/lib/change-notes/released/5.0.7.md
@@ -0,0 +1,5 @@
+## 5.0.7
+
+### Minor Analysis Improvements
+
+* Updated to allow analysis of Swift 6.1.3.
diff --git a/swift/ql/lib/change-notes/released/5.0.8.md b/swift/ql/lib/change-notes/released/5.0.8.md
new file mode 100644
index 00000000000..9c73f4b1341
--- /dev/null
+++ b/swift/ql/lib/change-notes/released/5.0.8.md
@@ -0,0 +1,3 @@
+## 5.0.8
+
+No user-facing changes.
diff --git a/swift/ql/lib/change-notes/released/5.0.9.md b/swift/ql/lib/change-notes/released/5.0.9.md
new file mode 100644
index 00000000000..5fca9bba5f7
--- /dev/null
+++ b/swift/ql/lib/change-notes/released/5.0.9.md
@@ -0,0 +1,3 @@
+## 5.0.9
+
+No user-facing changes.
diff --git a/swift/ql/lib/change-notes/released/6.0.0.md b/swift/ql/lib/change-notes/released/6.0.0.md
new file mode 100644
index 00000000000..8fe348b6db5
--- /dev/null
+++ b/swift/ql/lib/change-notes/released/6.0.0.md
@@ -0,0 +1,18 @@
+## 6.0.0
+
+### Breaking Changes
+
+* The `OpenedArchetypeType` class has been renamed as `ExistentialArchetypeType`.
+* The `OtherAvailabilitySpec` class has been removed. Use `AvailabilitySpec::isWildcard` instead.
+* The `PlatformVersionAvailabilitySpec` has been removed. Use `AvailabilitySpec::getPlatform` and `AvailabilitySpec::getVersion` instead.
+
+### New Features
+
+* Added AST nodes `UsingDecl`, `UnsafeExpr`, and `InlineArrayType` that correspond to new nodes in Swift 6.2.
+* Added new predicates `isDistributedGet`, `isRead2`, `isModify2`, and `isInit` to the `Accessor` class that correspond to new accessors in Swift 6.2.
+* Added a new predicate `isApply` to the `KeyPathComponent` class that corresponds to method and initializer key path components in Swift 6.2.
+
+### Major Analysis Improvements
+
+* Upgraded to allow analysis of Swift 6.2.
+* Support for experimental Embedded Swift has been dropped.
diff --git a/swift/ql/lib/codeql-pack.release.yml b/swift/ql/lib/codeql-pack.release.yml
index 8cb0167caf0..f8c4fa43ccb 100644
--- a/swift/ql/lib/codeql-pack.release.yml
+++ b/swift/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 5.0.4
+lastReleaseVersion: 6.0.0
diff --git a/swift/ql/lib/codeql/swift/controlflow/BasicBlocks.qll b/swift/ql/lib/codeql/swift/controlflow/BasicBlocks.qll
index 160903fd895..e5acea49fda 100644
--- a/swift/ql/lib/codeql/swift/controlflow/BasicBlocks.qll
+++ b/swift/ql/lib/codeql/swift/controlflow/BasicBlocks.qll
@@ -1,9 +1,10 @@
 /** Provides classes representing basic blocks. */
 
+private import swift
 private import ControlFlowGraph
 private import internal.ControlFlowGraphImpl as CfgImpl
-private import SuccessorTypes
 private import CfgImpl::BasicBlocks as BasicBlocksImpl
+private import codeql.controlflow.BasicBlock as BB
 
 /**
  * A basic block, that is, a maximal straight-line sequence of control flow nodes
@@ -111,3 +112,21 @@ final class ConditionBlock extends BasicBlock, BasicBlocksImpl::ConditionBasicBl
     super.edgeDominates(controlled, s)
   }
 }
+
+private class BasicBlockAlias = BasicBlock;
+
+private class EntryBasicBlockAlias = EntryBasicBlock;
+
+private class ControlFlowNodeAlias = ControlFlowNode;
+
+module Cfg implements BB::CfgSig<Location> {
+  class ControlFlowNode = ControlFlowNodeAlias;
+
+  class BasicBlock = BasicBlockAlias;
+
+  class EntryBasicBlock = EntryBasicBlockAlias;
+
+  predicate dominatingEdge(BasicBlock bb1, BasicBlock bb2) {
+    BasicBlocksImpl::dominatingEdge(bb1, bb2)
+  }
+}
diff --git a/swift/ql/lib/codeql/swift/controlflow/ControlFlowGraph.qll b/swift/ql/lib/codeql/swift/controlflow/ControlFlowGraph.qll
index 4d1be28b001..ef443f30184 100644
--- a/swift/ql/lib/codeql/swift/controlflow/ControlFlowGraph.qll
+++ b/swift/ql/lib/codeql/swift/controlflow/ControlFlowGraph.qll
@@ -2,11 +2,11 @@
 
 private import swift
 private import BasicBlocks
-private import SuccessorTypes
 private import internal.ControlFlowGraphImpl as CfgImpl
 private import internal.Completion
 private import internal.Scope
 private import internal.ControlFlowElements
+import codeql.controlflow.SuccessorType
 
 /** An AST node with an associated control-flow graph. */
 class CfgScope extends Scope instanceof CfgImpl::CfgScope::Range_ {
@@ -61,72 +61,3 @@ class ControlFlowNode extends CfgImpl::Node {
   /** Holds if this node has more than one successor. */
   final predicate isBranch() { strictcount(this.getASuccessor()) > 1 }
 }
-
-/** The type of a control flow successor. */
-class SuccessorType extends CfgImpl::TSuccessorType {
-  /** Gets a textual representation of successor type. */
-  string toString() { none() }
-}
-
-/** Provides different types of control flow successor types. */
-module SuccessorTypes {
-  /** A normal control flow successor. */
-  class NormalSuccessor extends SuccessorType, CfgImpl::TSuccessorSuccessor {
-    final override string toString() { result = "successor" }
-  }
-
-  /** A conditional control flow successor. */
-  abstract class ConditionalSuccessor extends SuccessorType {
-    boolean value;
-
-    bindingset[value]
-    ConditionalSuccessor() { any() }
-
-    /** Gets the Boolean value of this successor. */
-    final boolean getValue() { result = value }
-
-    override string toString() { result = this.getValue().toString() }
-  }
-
-  /** A Boolean control flow successor. */
-  class BooleanSuccessor extends ConditionalSuccessor, CfgImpl::TBooleanSuccessor {
-    BooleanSuccessor() { this = CfgImpl::TBooleanSuccessor(value) }
-  }
-
-  class BreakSuccessor extends SuccessorType, CfgImpl::TBreakSuccessor {
-    final override string toString() { result = "break" }
-  }
-
-  class ContinueSuccessor extends SuccessorType, CfgImpl::TContinueSuccessor {
-    final override string toString() { result = "continue" }
-  }
-
-  class ReturnSuccessor extends SuccessorType, CfgImpl::TReturnSuccessor {
-    final override string toString() { result = "return" }
-  }
-
-  class MatchingSuccessor extends ConditionalSuccessor, CfgImpl::TMatchingSuccessor {
-    MatchingSuccessor() { this = CfgImpl::TMatchingSuccessor(value) }
-
-    /** Holds if this is a match successor. */
-    predicate isMatch() { value = true }
-
-    override string toString() { if this.isMatch() then result = "match" else result = "no-match" }
-  }
-
-  class FallthroughSuccessor extends SuccessorType, CfgImpl::TFallthroughSuccessor {
-    final override string toString() { result = "fallthrough" }
-  }
-
-  class EmptinessSuccessor extends ConditionalSuccessor, CfgImpl::TEmptinessSuccessor {
-    EmptinessSuccessor() { this = CfgImpl::TEmptinessSuccessor(value) }
-
-    predicate isEmpty() { value = true }
-
-    override string toString() { if this.isEmpty() then result = "empty" else result = "non-empty" }
-  }
-
-  class ExceptionSuccessor extends SuccessorType, CfgImpl::TExceptionSuccessor {
-    override string toString() { result = "exception" }
-  }
-}
diff --git a/swift/ql/lib/codeql/swift/controlflow/internal/Completion.qll b/swift/ql/lib/codeql/swift/controlflow/internal/Completion.qll
index 9e7975890e6..4a2acdf9e20 100644
--- a/swift/ql/lib/codeql/swift/controlflow/internal/Completion.qll
+++ b/swift/ql/lib/codeql/swift/controlflow/internal/Completion.qll
@@ -8,7 +8,6 @@ private import swift
 private import codeql.swift.controlflow.ControlFlowGraph
 private import ControlFlowElements
 private import ControlFlowGraphImpl
-private import SuccessorTypes
 
 private newtype TCompletion =
   TSimpleCompletion() or
@@ -324,7 +323,7 @@ abstract class NormalCompletion extends Completion {
 
 /** A simple (normal) completion. */
 class SimpleCompletion extends NormalCompletion, TSimpleCompletion {
-  override NormalSuccessor getAMatchingSuccessorType() { any() }
+  override DirectSuccessor getAMatchingSuccessorType() { any() }
 
   override string toString() { result = "simple" }
 }
@@ -468,7 +467,7 @@ class FallthroughCompletion extends Completion, TFallthroughCompletion {
 
   FallthroughCompletion() { this = TFallthroughCompletion(dest) }
 
-  override FallthroughSuccessor getAMatchingSuccessorType() { any() }
+  override DirectSuccessor getAMatchingSuccessorType() { any() }
 
   CaseStmt getDestination() { result = dest }
 
diff --git a/swift/ql/lib/codeql/swift/controlflow/internal/ControlFlowGraphImpl.qll b/swift/ql/lib/codeql/swift/controlflow/internal/ControlFlowGraphImpl.qll
index b610ff0b0f3..59d2acb5857 100644
--- a/swift/ql/lib/codeql/swift/controlflow/internal/ControlFlowGraphImpl.qll
+++ b/swift/ql/lib/codeql/swift/controlflow/internal/ControlFlowGraphImpl.qll
@@ -1976,18 +1976,6 @@ private module Cached {
     result = n.(FuncDeclElement).getAst() or
     result = n.(KeyPathElement).getAst()
   }
-
-  cached
-  newtype TSuccessorType =
-    TSuccessorSuccessor() or
-    TBooleanSuccessor(boolean b) { b in [false, true] } or
-    TBreakSuccessor() or
-    TContinueSuccessor() or
-    TReturnSuccessor() or
-    TMatchingSuccessor(boolean match) { match in [false, true] } or
-    TFallthroughSuccessor() or
-    TEmptinessSuccessor(boolean isEmpty) { isEmpty in [false, true] } or
-    TExceptionSuccessor()
 }
 
 import Cached
diff --git a/swift/ql/lib/codeql/swift/controlflow/internal/ControlFlowGraphImplSpecific.qll b/swift/ql/lib/codeql/swift/controlflow/internal/ControlFlowGraphImplSpecific.qll
index 24548290ea0..37625e0be10 100644
--- a/swift/ql/lib/codeql/swift/controlflow/internal/ControlFlowGraphImplSpecific.qll
+++ b/swift/ql/lib/codeql/swift/controlflow/internal/ControlFlowGraphImplSpecific.qll
@@ -48,33 +48,11 @@ module CfgInput implements InputSig<Location> {
 
   CfgScope getCfgScope(AstNode n) { result = scopeOfAst(n.asAstNode()) }
 
-  class SuccessorType = Cfg::SuccessorType;
+  private class SuccessorType = Cfg::SuccessorType;
 
   /** Gets a successor type that matches completion `c`. */
   SuccessorType getAMatchingSuccessorType(Completion c) { result = c.getAMatchingSuccessorType() }
 
-  /**
-   * Hold if `c` represents simple (normal) evaluation of a statement or an
-   * expression.
-   */
-  predicate successorTypeIsSimple(SuccessorType t) {
-    t instanceof Cfg::SuccessorTypes::NormalSuccessor
-  }
-
-  /** Holds if `t` is an abnormal exit type out of a CFG scope. */
-  predicate isAbnormalExitType(SuccessorType t) {
-    t instanceof Cfg::SuccessorTypes::ExceptionSuccessor
-  }
-
-  /** Hold if `t` represents a conditional successor type. */
-  predicate successorTypeIsCondition(SuccessorType t) {
-    t instanceof Cfg::SuccessorTypes::BooleanSuccessor or
-    t instanceof Cfg::SuccessorTypes::BreakSuccessor or
-    t instanceof Cfg::SuccessorTypes::ContinueSuccessor or
-    t instanceof Cfg::SuccessorTypes::MatchingSuccessor or
-    t instanceof Cfg::SuccessorTypes::EmptinessSuccessor
-  }
-
   /** Holds if `first` is first executed when entering `scope`. */
   predicate scopeFirst(CfgScope scope, AstNode first) {
     scope.(Impl::CfgScope::Range_).entry(first)
diff --git a/swift/ql/lib/codeql/swift/dataflow/Ssa.qll b/swift/ql/lib/codeql/swift/dataflow/Ssa.qll
index ed75a06e534..4f0754ff590 100644
--- a/swift/ql/lib/codeql/swift/dataflow/Ssa.qll
+++ b/swift/ql/lib/codeql/swift/dataflow/Ssa.qll
@@ -6,21 +6,10 @@ module Ssa {
   private import codeql.swift.controlflow.ControlFlowGraph
   private import codeql.swift.controlflow.BasicBlocks as BasicBlocks
 
-  private module SsaInput implements SsaImplCommon::InputSig<Location> {
+  private module SsaInput implements SsaImplCommon::InputSig<Location, BasicBlocks::BasicBlock> {
     private import internal.DataFlowPrivate
-    private import codeql.swift.controlflow.ControlFlowGraph as Cfg
     private import codeql.swift.controlflow.CfgNodes
 
-    class BasicBlock = BasicBlocks::BasicBlock;
-
-    class ControlFlowNode = Cfg::ControlFlowNode;
-
-    BasicBlock getImmediateBasicBlockDominator(BasicBlock bb) {
-      result = bb.getImmediateDominator()
-    }
-
-    BasicBlock getABasicBlockSuccessor(BasicBlock bb) { result = bb.getASuccessor() }
-
     private newtype TSourceVariable =
       TNormalSourceVariable(VarDecl v) or
       TKeyPathSourceVariable(EntryNode entry) { entry.getScope() instanceof KeyPathExpr }
@@ -61,7 +50,7 @@ module Ssa {
       override EntryNode asKeyPath() { result = enter }
     }
 
-    predicate variableWrite(BasicBlock bb, int i, SourceVariable v, boolean certain) {
+    predicate variableWrite(BasicBlocks::BasicBlock bb, int i, SourceVariable v, boolean certain) {
       exists(AssignExpr assign |
         bb.getNode(i).getNode().asAstNode() = assign and
         assign.getDest() = v.getAnAccess() and
@@ -99,7 +88,7 @@ module Ssa {
       )
     }
 
-    predicate variableRead(BasicBlock bb, int i, SourceVariable v, boolean certain) {
+    predicate variableRead(BasicBlocks::BasicBlock bb, int i, SourceVariable v, boolean certain) {
       exists(DeclRefExpr ref |
         not isLValue(ref) and
         bb.getNode(i).getNode().asAstNode() = ref and
@@ -133,7 +122,7 @@ module Ssa {
   /**
    * INTERNAL: Do not use.
    */
-  module SsaImpl = SsaImplCommon::Make<Location, SsaInput>;
+  module SsaImpl = SsaImplCommon::Make<Location, BasicBlocks::Cfg, SsaInput>;
 
   cached
   class Definition extends SsaImpl::Definition {
@@ -142,7 +131,7 @@ module Ssa {
 
     cached
     ControlFlowNode getARead() {
-      exists(SsaInput::SourceVariable v, SsaInput::BasicBlock bb, int i |
+      exists(SsaInput::SourceVariable v, BasicBlocks::BasicBlock bb, int i |
         SsaImpl::ssaDefReachesRead(v, this, bb, i) and
         SsaInput::variableRead(bb, i, v, true) and
         result = bb.getNode(i)
@@ -151,7 +140,7 @@ module Ssa {
 
     cached
     ControlFlowNode getAFirstRead() {
-      exists(SsaInput::BasicBlock bb, int i |
+      exists(BasicBlocks::BasicBlock bb, int i |
         SsaImpl::firstUse(this, bb, i, true) and
         result = bb.getNode(i)
       )
@@ -160,7 +149,7 @@ module Ssa {
     cached
     predicate adjacentReadPair(ControlFlowNode read1, ControlFlowNode read2) {
       read1 = this.getARead() and
-      exists(SsaInput::BasicBlock bb1, int i1, SsaInput::BasicBlock bb2, int i2 |
+      exists(BasicBlocks::BasicBlock bb1, int i1, BasicBlocks::BasicBlock bb2, int i2 |
         read1 = bb1.getNode(i1) and
         SsaImpl::adjacentUseUse(bb1, i1, bb2, i2, _, true) and
         read2 = bb2.getNode(i2)
@@ -168,7 +157,7 @@ module Ssa {
     }
 
     cached
-    deprecated predicate lastRefRedef(SsaInput::BasicBlock bb, int i, Definition next) {
+    deprecated predicate lastRefRedef(BasicBlocks::BasicBlock bb, int i, Definition next) {
       SsaImpl::lastRefRedef(this, bb, i, next)
     }
   }
@@ -177,7 +166,7 @@ module Ssa {
   class WriteDefinition extends Definition, SsaImpl::WriteDefinition {
     cached
     override Location getLocation() {
-      exists(SsaInput::BasicBlock bb, int i |
+      exists(BasicBlocks::BasicBlock bb, int i |
         this.definesAt(_, bb, i) and
         result = bb.getNode(i).getLocation()
       )
@@ -189,19 +178,19 @@ module Ssa {
      */
     cached
     predicate assigns(CfgNode value) {
-      exists(AssignExpr a, SsaInput::BasicBlock bb, int i |
+      exists(AssignExpr a, BasicBlocks::BasicBlock bb, int i |
         this.definesAt(_, bb, i) and
         a = bb.getNode(i).getNode().asAstNode() and
         value.getNode().asAstNode() = a.getSource()
       )
       or
-      exists(SsaInput::BasicBlock bb, int blockIndex, NamedPattern np |
+      exists(BasicBlocks::BasicBlock bb, int blockIndex, NamedPattern np |
         this.definesAt(_, bb, blockIndex) and
         np = bb.getNode(blockIndex).getNode().asAstNode() and
         value.getNode().asAstNode() = np
       )
       or
-      exists(SsaInput::BasicBlock bb, int blockIndex, ConditionElement ce, Expr init |
+      exists(BasicBlocks::BasicBlock bb, int blockIndex, ConditionElement ce, Expr init |
         this.definesAt(_, bb, blockIndex) and
         ce.getPattern() = bb.getNode(blockIndex).getNode().asAstNode() and
         init = ce.getInitializer() and
@@ -216,14 +205,14 @@ module Ssa {
   class PhiDefinition extends Definition, SsaImpl::PhiNode {
     cached
     override Location getLocation() {
-      exists(SsaInput::BasicBlock bb |
+      exists(BasicBlocks::BasicBlock bb |
         this.definesAt(_, bb, _) and
         result = bb.getLocation()
       )
     }
 
     cached
-    Definition getPhiInput(SsaInput::BasicBlock bb) {
+    Definition getPhiInput(BasicBlocks::BasicBlock bb) {
       SsaImpl::phiHasInputFromBlock(this, result, bb)
     }
 
diff --git a/swift/ql/lib/codeql/swift/dataflow/internal/DataFlowPrivate.qll b/swift/ql/lib/codeql/swift/dataflow/internal/DataFlowPrivate.qll
index 4849c5ac235..9ea57c1ff06 100644
--- a/swift/ql/lib/codeql/swift/dataflow/internal/DataFlowPrivate.qll
+++ b/swift/ql/lib/codeql/swift/dataflow/internal/DataFlowPrivate.qll
@@ -882,30 +882,11 @@ private predicate closureFlowStep(CaptureInput::Expr e1, CaptureInput::Expr e2)
   e2.(Pattern).getImmediateMatchingExpr() = e1
 }
 
-private module CaptureInput implements VariableCapture::InputSig<Location> {
+private module CaptureInput implements VariableCapture::InputSig<Location, BasicBlock> {
   private import swift as S
   private import codeql.swift.controlflow.ControlFlowGraph as Cfg
-  private import codeql.swift.controlflow.BasicBlocks as B
 
-  class BasicBlock instanceof B::BasicBlock {
-    string toString() { result = super.toString() }
-
-    ControlFlowNode getNode(int i) { result = super.getNode(i) }
-
-    int length() { result = super.length() }
-
-    Callable getEnclosingCallable() { result = super.getScope() }
-
-    Location getLocation() { result = super.getLocation() }
-  }
-
-  class ControlFlowNode = Cfg::ControlFlowNode;
-
-  BasicBlock getImmediateBasicBlockDominator(BasicBlock bb) {
-    result.(B::BasicBlock).immediatelyDominates(bb)
-  }
-
-  BasicBlock getABasicBlockSuccessor(BasicBlock bb) { result = bb.(B::BasicBlock).getASuccessor() }
+  Callable basicBlockGetEnclosingCallable(BasicBlock bb) { result = bb.getScope() }
 
   class CapturedVariable instanceof S::VarDecl {
     CapturedVariable() {
@@ -927,9 +908,7 @@ private module CaptureInput implements VariableCapture::InputSig<Location> {
 
     Location getLocation() { result = super.getLocation() }
 
-    predicate hasCfgNode(BasicBlock bb, int i) {
-      this = bb.(B::BasicBlock).getNode(i).getNode().asAstNode()
-    }
+    predicate hasCfgNode(BasicBlock bb, int i) { this = bb.getNode(i).getNode().asAstNode() }
   }
 
   class VariableWrite extends Expr {
@@ -1001,7 +980,7 @@ class CapturedVariable = CaptureInput::CapturedVariable;
 
 class CapturedParameter = CaptureInput::CapturedParameter;
 
-module CaptureFlow = VariableCapture::Flow<Location, CaptureInput>;
+module CaptureFlow = VariableCapture::Flow<Location, Cfg, CaptureInput>;
 
 private CaptureFlow::ClosureNode asClosureNode(Node n) {
   result = n.(CaptureNode).getSynthesizedCaptureNode()
diff --git a/swift/ql/lib/codeql/swift/dataflow/internal/FlowSummaryImpl.qll b/swift/ql/lib/codeql/swift/dataflow/internal/FlowSummaryImpl.qll
index cb889baaebc..46e2e63f2ca 100644
--- a/swift/ql/lib/codeql/swift/dataflow/internal/FlowSummaryImpl.qll
+++ b/swift/ql/lib/codeql/swift/dataflow/internal/FlowSummaryImpl.qll
@@ -113,7 +113,9 @@ private import Make<Location, DataFlowImplSpecific::SwiftDataFlow, Input> as Imp
 private module StepsInput implements Impl::Private::StepsInputSig {
   DataFlowCall getACall(Public::SummarizedCallable sc) { result.asCall().getStaticTarget() = sc }
 
-  Node getSourceNode(Input::SourceBase source, Impl::Private::SummaryComponent sc) { none() }
+  DataFlowCallable getSourceNodeEnclosingCallable(Input::SourceBase source) { none() }
+
+  Node getSourceNode(Input::SourceBase source, Impl::Private::SummaryComponentStack s) { none() }
 
   Node getSinkNode(Input::SinkBase sink, Impl::Private::SummaryComponent sc) { none() }
 }
diff --git a/swift/ql/lib/codeql/swift/elements.qll b/swift/ql/lib/codeql/swift/elements.qll
index 2551a7ece9b..bdffeba5261 100644
--- a/swift/ql/lib/codeql/swift/elements.qll
+++ b/swift/ql/lib/codeql/swift/elements.qll
@@ -18,8 +18,6 @@ import codeql.swift.elements.KeyPathComponent
 import codeql.swift.elements.Locatable
 import codeql.swift.elements.Location
 import codeql.swift.elements.MacroRole
-import codeql.swift.elements.OtherAvailabilitySpec
-import codeql.swift.elements.PlatformVersionAvailabilitySpec
 import codeql.swift.elements.UnknownFile
 import codeql.swift.elements.UnknownLocation
 import codeql.swift.elements.UnspecifiedElement
@@ -63,6 +61,7 @@ import codeql.swift.elements.decl.SubscriptDecl
 import codeql.swift.elements.decl.TopLevelCodeDecl
 import codeql.swift.elements.decl.TypeAliasDecl
 import codeql.swift.elements.decl.TypeDecl
+import codeql.swift.elements.decl.UsingDecl
 import codeql.swift.elements.decl.ValueDecl
 import codeql.swift.elements.decl.VarDecl
 import codeql.swift.elements.expr.AbiSafeConversionExpr
@@ -197,6 +196,7 @@ import codeql.swift.elements.expr.UnresolvedPatternExpr
 import codeql.swift.elements.expr.UnresolvedSpecializeExpr
 import codeql.swift.elements.expr.UnresolvedTypeConversionExpr
 import codeql.swift.elements.expr.UnsafeCastExpr
+import codeql.swift.elements.expr.UnsafeExpr
 import codeql.swift.elements.expr.VarargExpansionExpr
 import codeql.swift.elements.pattern.AnyPattern
 import codeql.swift.elements.pattern.BindingPattern
@@ -268,12 +268,14 @@ import codeql.swift.elements.type.DynamicSelfType
 import codeql.swift.elements.type.ElementArchetypeType
 import codeql.swift.elements.type.EnumType
 import codeql.swift.elements.type.ErrorType
+import codeql.swift.elements.type.ExistentialArchetypeType
 import codeql.swift.elements.type.ExistentialMetatypeType
 import codeql.swift.elements.type.ExistentialType
 import codeql.swift.elements.type.FunctionType
 import codeql.swift.elements.type.GenericFunctionType
 import codeql.swift.elements.type.GenericTypeParamType
 import codeql.swift.elements.type.InOutType
+import codeql.swift.elements.type.InlineArrayType
 import codeql.swift.elements.type.IntegerType
 import codeql.swift.elements.type.LValueType
 import codeql.swift.elements.type.LocalArchetypeType
@@ -282,7 +284,6 @@ import codeql.swift.elements.type.ModuleType
 import codeql.swift.elements.type.NominalOrBoundGenericNominalType
 import codeql.swift.elements.type.NominalType
 import codeql.swift.elements.type.OpaqueTypeArchetypeType
-import codeql.swift.elements.type.OpenedArchetypeType
 import codeql.swift.elements.type.OptionalType
 import codeql.swift.elements.type.PackArchetypeType
 import codeql.swift.elements.type.PackElementType
diff --git a/swift/ql/lib/codeql/swift/elements/OtherAvailabilitySpec.qll b/swift/ql/lib/codeql/swift/elements/OtherAvailabilitySpec.qll
deleted file mode 100644
index 78d0f8e5da5..00000000000
--- a/swift/ql/lib/codeql/swift/elements/OtherAvailabilitySpec.qll
+++ /dev/null
@@ -1,12 +0,0 @@
-// generated by codegen/codegen.py, do not edit
-/**
- * This module provides the public class `OtherAvailabilitySpec`.
- */
-
-private import internal.OtherAvailabilitySpecImpl
-import codeql.swift.elements.AvailabilitySpec
-
-/**
- * A wildcard availability spec `*`
- */
-final class OtherAvailabilitySpec = Impl::OtherAvailabilitySpec;
diff --git a/swift/ql/lib/codeql/swift/elements/PlatformVersionAvailabilitySpec.qll b/swift/ql/lib/codeql/swift/elements/PlatformVersionAvailabilitySpec.qll
deleted file mode 100644
index dd47fd14945..00000000000
--- a/swift/ql/lib/codeql/swift/elements/PlatformVersionAvailabilitySpec.qll
+++ /dev/null
@@ -1,12 +0,0 @@
-// generated by codegen/codegen.py, do not edit
-/**
- * This module provides the public class `PlatformVersionAvailabilitySpec`.
- */
-
-private import internal.PlatformVersionAvailabilitySpecImpl
-import codeql.swift.elements.AvailabilitySpec
-
-/**
- * An availability spec based on platform and version, for example `macOS 12` or `watchOS 14`
- */
-final class PlatformVersionAvailabilitySpec = Impl::PlatformVersionAvailabilitySpec;
diff --git a/swift/ql/lib/codeql/swift/elements/decl/UsingDecl.qll b/swift/ql/lib/codeql/swift/elements/decl/UsingDecl.qll
new file mode 100644
index 00000000000..b9f1afae331
--- /dev/null
+++ b/swift/ql/lib/codeql/swift/elements/decl/UsingDecl.qll
@@ -0,0 +1,9 @@
+// generated by codegen/codegen.py, do not edit
+/**
+ * This module provides the public class `UsingDecl`.
+ */
+
+private import internal.UsingDeclImpl
+import codeql.swift.elements.decl.Decl
+
+final class UsingDecl = Impl::UsingDecl;
diff --git a/swift/ql/lib/codeql/swift/elements/decl/internal/AccessorImpl.qll b/swift/ql/lib/codeql/swift/elements/decl/internal/AccessorImpl.qll
index bdbd96f2cf7..d84878ab166 100644
--- a/swift/ql/lib/codeql/swift/elements/decl/internal/AccessorImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/internal/AccessorImpl.qll
@@ -18,6 +18,14 @@ module Impl {
     decl.isUnsafeAddress() and kind = "unsafeAddress"
     or
     decl.isUnsafeMutableAddress() and kind = "unsafeMutableAddress"
+    or
+    decl.isDistributedGet() and kind = "distributed get"
+    or
+    decl.isRead2() and kind = "read"
+    or
+    decl.isModify2() and kind = "modify"
+    or
+    decl.isInit() and kind = "init"
   }
 
   class Accessor extends Generated::Accessor {
diff --git a/swift/ql/lib/codeql/swift/elements/decl/internal/EnumDeclImpl.qll b/swift/ql/lib/codeql/swift/elements/decl/internal/EnumDeclImpl.qll
index 9eff4077f93..3410ae30519 100644
--- a/swift/ql/lib/codeql/swift/elements/decl/internal/EnumDeclImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/internal/EnumDeclImpl.qll
@@ -7,7 +7,7 @@ module Impl {
   /**
    * An enumeration declaration, for example:
    * ```
-   * enum MyColours {
+   * enum MyColors {
    *   case red
    *   case green
    *   case blue
diff --git a/swift/ql/lib/codeql/swift/elements/type/internal/OpenedArchetypeTypeConstructor.qll b/swift/ql/lib/codeql/swift/elements/decl/internal/UsingDeclConstructor.qll
similarity index 58%
rename from swift/ql/lib/codeql/swift/elements/type/internal/OpenedArchetypeTypeConstructor.qll
rename to swift/ql/lib/codeql/swift/elements/decl/internal/UsingDeclConstructor.qll
index a87b9245e79..ce38d9324a5 100644
--- a/swift/ql/lib/codeql/swift/elements/type/internal/OpenedArchetypeTypeConstructor.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/internal/UsingDeclConstructor.qll
@@ -1,14 +1,14 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 /**
  *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `OpenedArchetypeType` synthesized instances.
+ *  `UsingDecl` synthesized instances.
  *  INTERNAL: Do not use.
  */
 
 private import codeql.swift.generated.Raw
 
 /**
- *  The characteristic predicate of `OpenedArchetypeType` synthesized instances.
+ *  The characteristic predicate of `UsingDecl` synthesized instances.
  *  INTERNAL: Do not use.
  */
-predicate constructOpenedArchetypeType(Raw::OpenedArchetypeType id) { any() }
+predicate constructUsingDecl(Raw::UsingDecl id) { any() }
diff --git a/swift/ql/lib/codeql/swift/elements/type/internal/OpenedArchetypeTypeImpl.qll b/swift/ql/lib/codeql/swift/elements/decl/internal/UsingDeclImpl.qll
similarity index 59%
rename from swift/ql/lib/codeql/swift/elements/type/internal/OpenedArchetypeTypeImpl.qll
rename to swift/ql/lib/codeql/swift/elements/decl/internal/UsingDeclImpl.qll
index cb45d637c73..48e70936f40 100644
--- a/swift/ql/lib/codeql/swift/elements/type/internal/OpenedArchetypeTypeImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/internal/UsingDeclImpl.qll
@@ -1,16 +1,16 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 /**
- * This module provides a hand-modifiable wrapper around the generated class `OpenedArchetypeType`.
+ * This module provides a hand-modifiable wrapper around the generated class `UsingDecl`.
  *
  * INTERNAL: Do not use.
  */
 
-private import codeql.swift.generated.type.OpenedArchetypeType
+private import codeql.swift.generated.decl.UsingDecl
 
 /**
- * INTERNAL: This module contains the customizable definition of `OpenedArchetypeType` and should not
+ * INTERNAL: This module contains the customizable definition of `UsingDecl` and should not
  * be referenced directly.
  */
 module Impl {
-  class OpenedArchetypeType extends Generated::OpenedArchetypeType { }
+  class UsingDecl extends Generated::UsingDecl { }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/UnsafeExpr.qll b/swift/ql/lib/codeql/swift/elements/expr/UnsafeExpr.qll
new file mode 100644
index 00000000000..47d5c23d545
--- /dev/null
+++ b/swift/ql/lib/codeql/swift/elements/expr/UnsafeExpr.qll
@@ -0,0 +1,9 @@
+// generated by codegen/codegen.py, do not edit
+/**
+ * This module provides the public class `UnsafeExpr`.
+ */
+
+private import internal.UnsafeExprImpl
+import codeql.swift.elements.expr.IdentityExpr
+
+final class UnsafeExpr = Impl::UnsafeExpr;
diff --git a/swift/ql/lib/codeql/swift/elements/internal/OtherAvailabilitySpecConstructor.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/UnsafeExprConstructor.qll
similarity index 57%
rename from swift/ql/lib/codeql/swift/elements/internal/OtherAvailabilitySpecConstructor.qll
rename to swift/ql/lib/codeql/swift/elements/expr/internal/UnsafeExprConstructor.qll
index 90bdb0cf903..991dd41dcce 100644
--- a/swift/ql/lib/codeql/swift/elements/internal/OtherAvailabilitySpecConstructor.qll
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/UnsafeExprConstructor.qll
@@ -1,14 +1,14 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 /**
  *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `OtherAvailabilitySpec` synthesized instances.
+ *  `UnsafeExpr` synthesized instances.
  *  INTERNAL: Do not use.
  */
 
 private import codeql.swift.generated.Raw
 
 /**
- *  The characteristic predicate of `OtherAvailabilitySpec` synthesized instances.
+ *  The characteristic predicate of `UnsafeExpr` synthesized instances.
  *  INTERNAL: Do not use.
  */
-predicate constructOtherAvailabilitySpec(Raw::OtherAvailabilitySpec id) { any() }
+predicate constructUnsafeExpr(Raw::UnsafeExpr id) { any() }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/internal/UnsafeExprImpl.qll b/swift/ql/lib/codeql/swift/elements/expr/internal/UnsafeExprImpl.qll
new file mode 100644
index 00000000000..6cb576c1a10
--- /dev/null
+++ b/swift/ql/lib/codeql/swift/elements/expr/internal/UnsafeExprImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen/codegen.py, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `UnsafeExpr`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.swift.generated.expr.UnsafeExpr
+
+/**
+ * INTERNAL: This module contains the customizable definition of `UnsafeExpr` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class UnsafeExpr extends Generated::UnsafeExpr { }
+}
diff --git a/swift/ql/lib/codeql/swift/elements/internal/PlatformVersionAvailabilitySpecConstructor.qll b/swift/ql/lib/codeql/swift/elements/internal/AvailabilitySpecConstructor.qll
similarity index 52%
rename from swift/ql/lib/codeql/swift/elements/internal/PlatformVersionAvailabilitySpecConstructor.qll
rename to swift/ql/lib/codeql/swift/elements/internal/AvailabilitySpecConstructor.qll
index 858e62b35a7..24459c6cf68 100644
--- a/swift/ql/lib/codeql/swift/elements/internal/PlatformVersionAvailabilitySpecConstructor.qll
+++ b/swift/ql/lib/codeql/swift/elements/internal/AvailabilitySpecConstructor.qll
@@ -1,16 +1,14 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 /**
  *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `PlatformVersionAvailabilitySpec` synthesized instances.
+ *  `AvailabilitySpec` synthesized instances.
  *  INTERNAL: Do not use.
  */
 
 private import codeql.swift.generated.Raw
 
 /**
- *  The characteristic predicate of `PlatformVersionAvailabilitySpec` synthesized instances.
+ *  The characteristic predicate of `AvailabilitySpec` synthesized instances.
  *  INTERNAL: Do not use.
  */
-predicate constructPlatformVersionAvailabilitySpec(Raw::PlatformVersionAvailabilitySpec id) {
-  any()
-}
+predicate constructAvailabilitySpec(Raw::AvailabilitySpec id) { any() }
diff --git a/swift/ql/lib/codeql/swift/elements/internal/AvailabilitySpecImpl.qll b/swift/ql/lib/codeql/swift/elements/internal/AvailabilitySpecImpl.qll
index 0df968b3e6f..bb7b0c0b706 100644
--- a/swift/ql/lib/codeql/swift/elements/internal/AvailabilitySpecImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/internal/AvailabilitySpecImpl.qll
@@ -1,10 +1,3 @@
-// generated by codegen/codegen.py, remove this comment if you wish to edit this file
-/**
- * This module provides a hand-modifiable wrapper around the generated class `AvailabilitySpec`.
- *
- * INTERNAL: Do not use.
- */
-
 private import codeql.swift.generated.AvailabilitySpec
 
 /**
@@ -12,11 +5,18 @@ private import codeql.swift.generated.AvailabilitySpec
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * An availability spec, that is, part of an `AvailabilityInfo` condition. For example `iOS 12` and `*` in:
    * ```
    * if #available(iOS 12, *)
    * ```
    */
-  class AvailabilitySpec extends Generated::AvailabilitySpec { }
+  class AvailabilitySpec extends Generated::AvailabilitySpec {
+    override string toStringImpl() {
+      if this.isWildcard()
+      then result = "*"
+      else result = this.getPlatform() + " " + this.getVersion()
+    }
+  }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/internal/KeyPathComponentImpl.qll b/swift/ql/lib/codeql/swift/elements/internal/KeyPathComponentImpl.qll
index be837022a7c..4a0de00bc91 100644
--- a/swift/ql/lib/codeql/swift/elements/internal/KeyPathComponentImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/internal/KeyPathComponentImpl.qll
@@ -7,40 +7,45 @@ module Impl {
    * A component of a `KeyPathExpr`.
    */
   class KeyPathComponent extends Generated::KeyPathComponent {
+    /**
+     * Method or initializer application like `.bar` in `\Foo.bar` with `bar` a method.
+     */
+    predicate isApply() { this.getKind() = 4 }
+
     /**
      * Property access like `.bar` in `\Foo.bar`.
      */
-    predicate isProperty() { this.getKind() = 3 }
+    predicate isProperty() { this.getKind() = 5 }
 
     /**
      * Array or dictionary subscript like `[1]` or `["a", "b"]`.
      */
-    predicate isSubscript() { this.getKind() = 4 }
+    predicate isSubscript() { this.getKind() = 6 }
 
     /**
      * Optional forcing `!`.
      */
-    predicate isOptionalForcing() { this.getKind() = 5 }
+    predicate isOptionalForcing() { this.getKind() = 7 }
 
     /**
      * Optional chaining `?`.
      */
-    predicate isOptionalChaining() { this.getKind() = 6 }
+    predicate isOptionalChaining() { this.getKind() = 8 }
 
     /**
      * Implicit optional wrapping component inserted by the compiler when an optional chain ends in a non-optional value.
      */
-    predicate isOptionalWrapping() { this.getKind() = 7 }
+    predicate isOptionalWrapping() { this.getKind() = 9 }
 
     /**
      * Reference to the entire object; the `self` in `\Foo.self`.
      */
-    predicate isSelf() { this.getKind() = 8 }
+    predicate isSelf() { this.getKind() = 10 }
 
     /**
      * Tuple indexing like `.1`.
      */
-    predicate isTupleIndexing() { this.getKind() = 9 }
+    predicate isTupleIndexing() { this.getKind() = 11 }
 
     /** Gets the underlying key-path expression which this is a component of. */
     KeyPathExpr getKeyPathExpr() { result.getAComponent() = this }
diff --git a/swift/ql/lib/codeql/swift/elements/internal/OtherAvailabilitySpecImpl.qll b/swift/ql/lib/codeql/swift/elements/internal/OtherAvailabilitySpecImpl.qll
deleted file mode 100644
index 96729ac9092..00000000000
--- a/swift/ql/lib/codeql/swift/elements/internal/OtherAvailabilitySpecImpl.qll
+++ /dev/null
@@ -1,11 +0,0 @@
-private import codeql.swift.generated.OtherAvailabilitySpec
-
-module Impl {
-  // the following QLdoc is generated: if you need to edit it, do it in the schema file
-  /**
-   * A wildcard availability spec `*`
-   */
-  class OtherAvailabilitySpec extends Generated::OtherAvailabilitySpec {
-    override string toStringImpl() { result = "*" }
-  }
-}
diff --git a/swift/ql/lib/codeql/swift/elements/internal/PlatformVersionAvailabilitySpecImpl.qll b/swift/ql/lib/codeql/swift/elements/internal/PlatformVersionAvailabilitySpecImpl.qll
deleted file mode 100644
index e5d4814338d..00000000000
--- a/swift/ql/lib/codeql/swift/elements/internal/PlatformVersionAvailabilitySpecImpl.qll
+++ /dev/null
@@ -1,11 +0,0 @@
-private import codeql.swift.generated.PlatformVersionAvailabilitySpec
-
-module Impl {
-  // the following QLdoc is generated: if you need to edit it, do it in the schema file
-  /**
-   * An availability spec based on platform and version, for example `macOS 12` or `watchOS 14`
-   */
-  class PlatformVersionAvailabilitySpec extends Generated::PlatformVersionAvailabilitySpec {
-    override string toStringImpl() { result = this.getPlatform() + " " + this.getVersion() }
-  }
-}
diff --git a/swift/ql/lib/codeql/swift/elements/type/ExistentialArchetypeType.qll b/swift/ql/lib/codeql/swift/elements/type/ExistentialArchetypeType.qll
new file mode 100644
index 00000000000..3d756468af4
--- /dev/null
+++ b/swift/ql/lib/codeql/swift/elements/type/ExistentialArchetypeType.qll
@@ -0,0 +1,9 @@
+// generated by codegen/codegen.py, do not edit
+/**
+ * This module provides the public class `ExistentialArchetypeType`.
+ */
+
+private import internal.ExistentialArchetypeTypeImpl
+import codeql.swift.elements.type.LocalArchetypeType
+
+final class ExistentialArchetypeType = Impl::ExistentialArchetypeType;
diff --git a/swift/ql/lib/codeql/swift/elements/type/InlineArrayType.qll b/swift/ql/lib/codeql/swift/elements/type/InlineArrayType.qll
new file mode 100644
index 00000000000..db28afeef75
--- /dev/null
+++ b/swift/ql/lib/codeql/swift/elements/type/InlineArrayType.qll
@@ -0,0 +1,10 @@
+// generated by codegen/codegen.py, do not edit
+/**
+ * This module provides the public class `InlineArrayType`.
+ */
+
+private import internal.InlineArrayTypeImpl
+import codeql.swift.elements.type.SyntaxSugarType
+import codeql.swift.elements.type.Type
+
+final class InlineArrayType = Impl::InlineArrayType;
diff --git a/swift/ql/lib/codeql/swift/elements/type/OpenedArchetypeType.qll b/swift/ql/lib/codeql/swift/elements/type/OpenedArchetypeType.qll
deleted file mode 100644
index 93dae4a6f66..00000000000
--- a/swift/ql/lib/codeql/swift/elements/type/OpenedArchetypeType.qll
+++ /dev/null
@@ -1,9 +0,0 @@
-// generated by codegen/codegen.py, do not edit
-/**
- * This module provides the public class `OpenedArchetypeType`.
- */
-
-private import internal.OpenedArchetypeTypeImpl
-import codeql.swift.elements.type.LocalArchetypeType
-
-final class OpenedArchetypeType = Impl::OpenedArchetypeType;
diff --git a/swift/ql/lib/codeql/swift/elements/type/internal/ExistentialArchetypeTypeConstructor.qll b/swift/ql/lib/codeql/swift/elements/type/internal/ExistentialArchetypeTypeConstructor.qll
new file mode 100644
index 00000000000..fef2376d3e5
--- /dev/null
+++ b/swift/ql/lib/codeql/swift/elements/type/internal/ExistentialArchetypeTypeConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen/codegen.py, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `ExistentialArchetypeType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.swift.generated.Raw
+
+/**
+ *  The characteristic predicate of `ExistentialArchetypeType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructExistentialArchetypeType(Raw::ExistentialArchetypeType id) { any() }
diff --git a/swift/ql/lib/codeql/swift/elements/type/internal/ExistentialArchetypeTypeImpl.qll b/swift/ql/lib/codeql/swift/elements/type/internal/ExistentialArchetypeTypeImpl.qll
new file mode 100644
index 00000000000..22672658d17
--- /dev/null
+++ b/swift/ql/lib/codeql/swift/elements/type/internal/ExistentialArchetypeTypeImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen/codegen.py, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `ExistentialArchetypeType`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.swift.generated.type.ExistentialArchetypeType
+
+/**
+ * INTERNAL: This module contains the customizable definition of `ExistentialArchetypeType` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class ExistentialArchetypeType extends Generated::ExistentialArchetypeType { }
+}
diff --git a/swift/ql/lib/codeql/swift/elements/type/internal/InlineArrayTypeConstructor.qll b/swift/ql/lib/codeql/swift/elements/type/internal/InlineArrayTypeConstructor.qll
new file mode 100644
index 00000000000..61f768b1319
--- /dev/null
+++ b/swift/ql/lib/codeql/swift/elements/type/internal/InlineArrayTypeConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen/codegen.py, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `InlineArrayType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.swift.generated.Raw
+
+/**
+ *  The characteristic predicate of `InlineArrayType` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructInlineArrayType(Raw::InlineArrayType id) { any() }
diff --git a/swift/ql/lib/codeql/swift/elements/type/internal/InlineArrayTypeImpl.qll b/swift/ql/lib/codeql/swift/elements/type/internal/InlineArrayTypeImpl.qll
new file mode 100644
index 00000000000..b91f4e3ffdb
--- /dev/null
+++ b/swift/ql/lib/codeql/swift/elements/type/internal/InlineArrayTypeImpl.qll
@@ -0,0 +1,16 @@
+// generated by codegen/codegen.py, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `InlineArrayType`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.swift.generated.type.InlineArrayType
+
+/**
+ * INTERNAL: This module contains the customizable definition of `InlineArrayType` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class InlineArrayType extends Generated::InlineArrayType { }
+}
diff --git a/swift/ql/lib/codeql/swift/generated/AvailabilitySpec.qll b/swift/ql/lib/codeql/swift/generated/AvailabilitySpec.qll
index d14de9b3bc2..c4d61070aba 100644
--- a/swift/ql/lib/codeql/swift/generated/AvailabilitySpec.qll
+++ b/swift/ql/lib/codeql/swift/generated/AvailabilitySpec.qll
@@ -21,5 +21,38 @@ module Generated {
    * INTERNAL: Do not reference the `Generated::AvailabilitySpec` class directly.
    * Use the subclass `AvailabilitySpec`, where the following predicates are available.
    */
-  class AvailabilitySpec extends Synth::TAvailabilitySpec, AstNodeImpl::AstNode { }
+  class AvailabilitySpec extends Synth::TAvailabilitySpec, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "AvailabilitySpec" }
+
+    /**
+     * Gets the platform of this availability spec, if it exists.
+     */
+    string getPlatform() {
+      result = Synth::convertAvailabilitySpecToRaw(this).(Raw::AvailabilitySpec).getPlatform()
+    }
+
+    /**
+     * Holds if `getPlatform()` exists.
+     */
+    final predicate hasPlatform() { exists(this.getPlatform()) }
+
+    /**
+     * Gets the version of this availability spec, if it exists.
+     */
+    string getVersion() {
+      result = Synth::convertAvailabilitySpecToRaw(this).(Raw::AvailabilitySpec).getVersion()
+    }
+
+    /**
+     * Holds if `getVersion()` exists.
+     */
+    final predicate hasVersion() { exists(this.getVersion()) }
+
+    /**
+     * Holds if this availability spec is wildcard.
+     */
+    predicate isWildcard() {
+      Synth::convertAvailabilitySpecToRaw(this).(Raw::AvailabilitySpec).isWildcard()
+    }
+  }
 }
diff --git a/swift/ql/lib/codeql/swift/generated/KeyPathComponent.qll b/swift/ql/lib/codeql/swift/generated/KeyPathComponent.qll
index 8dfe90eec40..d5ce489fa52 100644
--- a/swift/ql/lib/codeql/swift/generated/KeyPathComponent.qll
+++ b/swift/ql/lib/codeql/swift/generated/KeyPathComponent.qll
@@ -29,13 +29,13 @@ module Generated {
      *
      * INTERNAL: Do not use.
      *
-     * This is 3 for properties, 4 for array and dictionary subscripts, 5 for optional forcing
-     * (`!`), 6 for optional chaining (`?`), 7 for implicit optional wrapping, 8 for `self`,
-     * and 9 for tuple element indexing.
+     * This is 4 for method or initializer application, 5 for members, 6 for array and dictionary
+     * subscripts, 7 for optional forcing (`!`), 8 for optional chaining (`?`), 9 for implicit
+     * optional wrapping, 10 for `self`, and 11 for tuple element indexing.
      *
      * The following values should not appear: 0 for invalid components, 1 for unresolved
-     * properties, 2 for unresolved subscripts, 10 for #keyPath dictionary keys, and 11 for
-     * implicit IDE code completion data.
+     * method or initializer applications, 2 for unresolved members, 3 for unresolved subscripts,
+     * 12 for #keyPath dictionary keys, and 13 for implicit IDE code completion data.
      */
     int getKind() {
       result = Synth::convertKeyPathComponentToRaw(this).(Raw::KeyPathComponent).getKind()
diff --git a/swift/ql/lib/codeql/swift/generated/OtherAvailabilitySpec.qll b/swift/ql/lib/codeql/swift/generated/OtherAvailabilitySpec.qll
deleted file mode 100644
index 222a306e311..00000000000
--- a/swift/ql/lib/codeql/swift/generated/OtherAvailabilitySpec.qll
+++ /dev/null
@@ -1,26 +0,0 @@
-// generated by codegen/codegen.py, do not edit
-/**
- * This module provides the generated definition of `OtherAvailabilitySpec`.
- * INTERNAL: Do not import directly.
- */
-
-private import codeql.swift.generated.Synth
-private import codeql.swift.generated.Raw
-import codeql.swift.elements.internal.AvailabilitySpecImpl::Impl as AvailabilitySpecImpl
-
-/**
- * INTERNAL: This module contains the fully generated definition of `OtherAvailabilitySpec` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A wildcard availability spec `*`
-   * INTERNAL: Do not reference the `Generated::OtherAvailabilitySpec` class directly.
-   * Use the subclass `OtherAvailabilitySpec`, where the following predicates are available.
-   */
-  class OtherAvailabilitySpec extends Synth::TOtherAvailabilitySpec,
-    AvailabilitySpecImpl::AvailabilitySpec
-  {
-    override string getAPrimaryQlClass() { result = "OtherAvailabilitySpec" }
-  }
-}
diff --git a/swift/ql/lib/codeql/swift/generated/ParentChild.qll b/swift/ql/lib/codeql/swift/generated/ParentChild.qll
index 4185644abe1..efed12bb5fe 100644
--- a/swift/ql/lib/codeql/swift/generated/ParentChild.qll
+++ b/swift/ql/lib/codeql/swift/generated/ParentChild.qll
@@ -45,7 +45,7 @@ private module Impl {
   ) {
     exists(int n, int nSpec |
       n = 0 and
-      nSpec = n + 1 + max(int i | i = -1 or exists(e.getSpec(i)) | i) and
+      nSpec = n + e.getNumberOfSpecs() and
       (
         none()
         or
@@ -55,12 +55,18 @@ private module Impl {
     )
   }
 
+  private Element getImmediateChildOfAvailabilitySpec(
+    AvailabilitySpec e, int index, string partialPredicateCall
+  ) {
+    none()
+  }
+
   private Element getImmediateChildOfKeyPathComponent(
     KeyPathComponent e, int index, string partialPredicateCall
   ) {
     exists(int n, int nSubscriptArgument |
       n = 0 and
-      nSubscriptArgument = n + 1 + max(int i | i = -1 or exists(e.getSubscriptArgument(i)) | i) and
+      nSubscriptArgument = n + e.getNumberOfSubscriptArguments() and
       (
         none()
         or
@@ -89,24 +95,12 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfOtherAvailabilitySpec(
-    OtherAvailabilitySpec e, int index, string partialPredicateCall
-  ) {
-    none()
-  }
-
-  private Element getImmediateChildOfPlatformVersionAvailabilitySpec(
-    PlatformVersionAvailabilitySpec e, int index, string partialPredicateCall
-  ) {
-    none()
-  }
-
   private Element getImmediateChildOfCapturedDecl(
     CapturedDecl e, int index, string partialPredicateCall
   ) {
     exists(int n, int nMember |
       n = 0 and
-      nMember = n + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nMember = n + e.getNumberOfMembers() and
       (
         none()
         or
@@ -121,7 +115,7 @@ private module Impl {
   ) {
     exists(int n, int nMember |
       n = 0 and
-      nMember = n + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nMember = n + e.getNumberOfMembers() and
       (
         none()
         or
@@ -136,8 +130,8 @@ private module Impl {
   ) {
     exists(int n, int nGenericTypeParam, int nMember |
       n = 0 and
-      nGenericTypeParam = n + 1 + max(int i | i = -1 or exists(e.getGenericTypeParam(i)) | i) and
-      nMember = nGenericTypeParam + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nGenericTypeParam = n + e.getNumberOfGenericTypeParams() and
+      nMember = nGenericTypeParam + e.getNumberOfMembers() and
       (
         none()
         or
@@ -155,7 +149,7 @@ private module Impl {
   ) {
     exists(int n, int nMember |
       n = 0 and
-      nMember = n + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nMember = n + e.getNumberOfMembers() and
       (
         none()
         or
@@ -168,7 +162,7 @@ private module Impl {
   private Element getImmediateChildOfImportDecl(ImportDecl e, int index, string partialPredicateCall) {
     exists(int n, int nMember |
       n = 0 and
-      nMember = n + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nMember = n + e.getNumberOfMembers() and
       (
         none()
         or
@@ -183,7 +177,7 @@ private module Impl {
   ) {
     exists(int n, int nMember |
       n = 0 and
-      nMember = n + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nMember = n + e.getNumberOfMembers() and
       (
         none()
         or
@@ -198,7 +192,7 @@ private module Impl {
   ) {
     exists(int n, int nMember, int nInit, int nPattern |
       n = 0 and
-      nMember = n + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nMember = n + e.getNumberOfMembers() and
       nInit = nMember + 1 + max(int i | i = -1 or exists(e.getImmediateInit(i)) | i) and
       nPattern = nInit + 1 + max(int i | i = -1 or exists(e.getImmediatePattern(i)) | i) and
       (
@@ -221,7 +215,7 @@ private module Impl {
   ) {
     exists(int n, int nMember, int nMessage |
       n = 0 and
-      nMember = n + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nMember = n + e.getNumberOfMembers() and
       nMessage = nMember + 1 and
       (
         none()
@@ -239,7 +233,7 @@ private module Impl {
   ) {
     exists(int n, int nMember |
       n = 0 and
-      nMember = n + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nMember = n + e.getNumberOfMembers() and
       (
         none()
         or
@@ -254,7 +248,7 @@ private module Impl {
   ) {
     exists(int n, int nMember, int nBody |
       n = 0 and
-      nMember = n + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nMember = n + e.getNumberOfMembers() and
       nBody = nMember + 1 and
       (
         none()
@@ -267,13 +261,26 @@ private module Impl {
     )
   }
 
+  private Element getImmediateChildOfUsingDecl(UsingDecl e, int index, string partialPredicateCall) {
+    exists(int n, int nMember |
+      n = 0 and
+      nMember = n + e.getNumberOfMembers() and
+      (
+        none()
+        or
+        result = e.getMember(index - n) and
+        partialPredicateCall = "Member(" + (index - n).toString() + ")"
+      )
+    )
+  }
+
   private Element getImmediateChildOfEnumElementDecl(
     EnumElementDecl e, int index, string partialPredicateCall
   ) {
     exists(int n, int nMember, int nParam |
       n = 0 and
-      nMember = n + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
-      nParam = nMember + 1 + max(int i | i = -1 or exists(e.getParam(i)) | i) and
+      nMember = n + e.getNumberOfMembers() and
+      nParam = nMember + e.getNumberOfParams() and
       (
         none()
         or
@@ -291,7 +298,7 @@ private module Impl {
   ) {
     exists(int n, int nMember |
       n = 0 and
-      nMember = n + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nMember = n + e.getNumberOfMembers() and
       (
         none()
         or
@@ -304,8 +311,8 @@ private module Impl {
   private Element getImmediateChildOfMacroDecl(MacroDecl e, int index, string partialPredicateCall) {
     exists(int n, int nGenericTypeParam, int nMember |
       n = 0 and
-      nGenericTypeParam = n + 1 + max(int i | i = -1 or exists(e.getGenericTypeParam(i)) | i) and
-      nMember = nGenericTypeParam + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nGenericTypeParam = n + e.getNumberOfGenericTypeParams() and
+      nMember = nGenericTypeParam + e.getNumberOfMembers() and
       (
         none()
         or
@@ -323,7 +330,7 @@ private module Impl {
   ) {
     exists(int n, int nMember |
       n = 0 and
-      nMember = n + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nMember = n + e.getNumberOfMembers() and
       (
         none()
         or
@@ -338,7 +345,7 @@ private module Impl {
   ) {
     exists(int n, int nMember |
       n = 0 and
-      nMember = n + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nMember = n + e.getNumberOfMembers() and
       (
         none()
         or
@@ -355,12 +362,12 @@ private module Impl {
       int n, int nGenericTypeParam, int nMember, int nSelfParam, int nParam, int nBody, int nCapture
     |
       n = 0 and
-      nGenericTypeParam = n + 1 + max(int i | i = -1 or exists(e.getGenericTypeParam(i)) | i) and
-      nMember = nGenericTypeParam + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nGenericTypeParam = n + e.getNumberOfGenericTypeParams() and
+      nMember = nGenericTypeParam + e.getNumberOfMembers() and
       nSelfParam = nMember + 1 and
-      nParam = nSelfParam + 1 + max(int i | i = -1 or exists(e.getParam(i)) | i) and
+      nParam = nSelfParam + e.getNumberOfParams() and
       nBody = nParam + 1 and
-      nCapture = nBody + 1 + max(int i | i = -1 or exists(e.getCapture(i)) | i) and
+      nCapture = nBody + e.getNumberOfCaptures() and
       (
         none()
         or
@@ -390,12 +397,12 @@ private module Impl {
       int n, int nGenericTypeParam, int nMember, int nSelfParam, int nParam, int nBody, int nCapture
     |
       n = 0 and
-      nGenericTypeParam = n + 1 + max(int i | i = -1 or exists(e.getGenericTypeParam(i)) | i) and
-      nMember = nGenericTypeParam + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nGenericTypeParam = n + e.getNumberOfGenericTypeParams() and
+      nMember = nGenericTypeParam + e.getNumberOfMembers() and
       nSelfParam = nMember + 1 and
-      nParam = nSelfParam + 1 + max(int i | i = -1 or exists(e.getParam(i)) | i) and
+      nParam = nSelfParam + e.getNumberOfParams() and
       nBody = nParam + 1 and
-      nCapture = nBody + 1 + max(int i | i = -1 or exists(e.getCapture(i)) | i) and
+      nCapture = nBody + e.getNumberOfCaptures() and
       (
         none()
         or
@@ -421,7 +428,7 @@ private module Impl {
   private Element getImmediateChildOfModuleDecl(ModuleDecl e, int index, string partialPredicateCall) {
     exists(int n, int nMember |
       n = 0 and
-      nMember = n + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nMember = n + e.getNumberOfMembers() and
       (
         none()
         or
@@ -436,11 +443,10 @@ private module Impl {
   ) {
     exists(int n, int nMember, int nAccessor, int nGenericTypeParam, int nParam |
       n = 0 and
-      nMember = n + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
-      nAccessor = nMember + 1 + max(int i | i = -1 or exists(e.getAccessor(i)) | i) and
-      nGenericTypeParam =
-        nAccessor + 1 + max(int i | i = -1 or exists(e.getGenericTypeParam(i)) | i) and
-      nParam = nGenericTypeParam + 1 + max(int i | i = -1 or exists(e.getParam(i)) | i) and
+      nMember = n + e.getNumberOfMembers() and
+      nAccessor = nMember + e.getNumberOfAccessors() and
+      nGenericTypeParam = nAccessor + e.getNumberOfGenericTypeParams() and
+      nParam = nGenericTypeParam + e.getNumberOfParams() and
       (
         none()
         or
@@ -464,12 +470,12 @@ private module Impl {
       int n, int nGenericTypeParam, int nMember, int nSelfParam, int nParam, int nBody, int nCapture
     |
       n = 0 and
-      nGenericTypeParam = n + 1 + max(int i | i = -1 or exists(e.getGenericTypeParam(i)) | i) and
-      nMember = nGenericTypeParam + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nGenericTypeParam = n + e.getNumberOfGenericTypeParams() and
+      nMember = nGenericTypeParam + e.getNumberOfMembers() and
       nSelfParam = nMember + 1 and
-      nParam = nSelfParam + 1 + max(int i | i = -1 or exists(e.getParam(i)) | i) and
+      nParam = nSelfParam + e.getNumberOfParams() and
       nBody = nParam + 1 and
-      nCapture = nBody + 1 + max(int i | i = -1 or exists(e.getCapture(i)) | i) and
+      nCapture = nBody + e.getNumberOfCaptures() and
       (
         none()
         or
@@ -497,7 +503,7 @@ private module Impl {
   ) {
     exists(int n, int nMember |
       n = 0 and
-      nMember = n + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nMember = n + e.getNumberOfMembers() and
       (
         none()
         or
@@ -516,8 +522,8 @@ private module Impl {
       int nPropertyWrapperProjectionVar
     |
       n = 0 and
-      nMember = n + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
-      nAccessor = nMember + 1 + max(int i | i = -1 or exists(e.getAccessor(i)) | i) and
+      nMember = n + e.getNumberOfMembers() and
+      nAccessor = nMember + e.getNumberOfAccessors() and
       nPropertyWrapperBackingVarBinding = nAccessor + 1 and
       nPropertyWrapperBackingVar = nPropertyWrapperBackingVarBinding + 1 and
       nPropertyWrapperProjectionVarBinding = nPropertyWrapperBackingVar + 1 and
@@ -555,7 +561,7 @@ private module Impl {
   ) {
     exists(int n, int nMember |
       n = 0 and
-      nMember = n + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nMember = n + e.getNumberOfMembers() and
       (
         none()
         or
@@ -572,12 +578,12 @@ private module Impl {
       int n, int nGenericTypeParam, int nMember, int nSelfParam, int nParam, int nBody, int nCapture
     |
       n = 0 and
-      nGenericTypeParam = n + 1 + max(int i | i = -1 or exists(e.getGenericTypeParam(i)) | i) and
-      nMember = nGenericTypeParam + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nGenericTypeParam = n + e.getNumberOfGenericTypeParams() and
+      nMember = nGenericTypeParam + e.getNumberOfMembers() and
       nSelfParam = nMember + 1 and
-      nParam = nSelfParam + 1 + max(int i | i = -1 or exists(e.getParam(i)) | i) and
+      nParam = nSelfParam + e.getNumberOfParams() and
       nBody = nParam + 1 and
-      nCapture = nBody + 1 + max(int i | i = -1 or exists(e.getCapture(i)) | i) and
+      nCapture = nBody + e.getNumberOfCaptures() and
       (
         none()
         or
@@ -605,8 +611,8 @@ private module Impl {
   ) {
     exists(int n, int nGenericTypeParam, int nMember |
       n = 0 and
-      nGenericTypeParam = n + 1 + max(int i | i = -1 or exists(e.getGenericTypeParam(i)) | i) and
-      nMember = nGenericTypeParam + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nGenericTypeParam = n + e.getNumberOfGenericTypeParams() and
+      nMember = nGenericTypeParam + e.getNumberOfMembers() and
       (
         none()
         or
@@ -627,8 +633,8 @@ private module Impl {
       int nPropertyWrapperLocalWrappedVar
     |
       n = 0 and
-      nMember = n + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
-      nAccessor = nMember + 1 + max(int i | i = -1 or exists(e.getAccessor(i)) | i) and
+      nMember = n + e.getNumberOfMembers() and
+      nAccessor = nMember + e.getNumberOfAccessors() and
       nPropertyWrapperBackingVarBinding = nAccessor + 1 and
       nPropertyWrapperBackingVar = nPropertyWrapperBackingVarBinding + 1 and
       nPropertyWrapperProjectionVarBinding = nPropertyWrapperBackingVar + 1 and
@@ -676,8 +682,8 @@ private module Impl {
   ) {
     exists(int n, int nGenericTypeParam, int nMember |
       n = 0 and
-      nGenericTypeParam = n + 1 + max(int i | i = -1 or exists(e.getGenericTypeParam(i)) | i) and
-      nMember = nGenericTypeParam + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nGenericTypeParam = n + e.getNumberOfGenericTypeParams() and
+      nMember = nGenericTypeParam + e.getNumberOfMembers() and
       (
         none()
         or
@@ -693,8 +699,8 @@ private module Impl {
   private Element getImmediateChildOfClassDecl(ClassDecl e, int index, string partialPredicateCall) {
     exists(int n, int nGenericTypeParam, int nMember |
       n = 0 and
-      nGenericTypeParam = n + 1 + max(int i | i = -1 or exists(e.getGenericTypeParam(i)) | i) and
-      nMember = nGenericTypeParam + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nGenericTypeParam = n + e.getNumberOfGenericTypeParams() and
+      nMember = nGenericTypeParam + e.getNumberOfMembers() and
       (
         none()
         or
@@ -710,8 +716,8 @@ private module Impl {
   private Element getImmediateChildOfEnumDecl(EnumDecl e, int index, string partialPredicateCall) {
     exists(int n, int nGenericTypeParam, int nMember |
       n = 0 and
-      nGenericTypeParam = n + 1 + max(int i | i = -1 or exists(e.getGenericTypeParam(i)) | i) and
-      nMember = nGenericTypeParam + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nGenericTypeParam = n + e.getNumberOfGenericTypeParams() and
+      nMember = nGenericTypeParam + e.getNumberOfMembers() and
       (
         none()
         or
@@ -729,8 +735,8 @@ private module Impl {
   ) {
     exists(int n, int nGenericTypeParam, int nMember |
       n = 0 and
-      nGenericTypeParam = n + 1 + max(int i | i = -1 or exists(e.getGenericTypeParam(i)) | i) and
-      nMember = nGenericTypeParam + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nGenericTypeParam = n + e.getNumberOfGenericTypeParams() and
+      nMember = nGenericTypeParam + e.getNumberOfMembers() and
       (
         none()
         or
@@ -746,8 +752,8 @@ private module Impl {
   private Element getImmediateChildOfStructDecl(StructDecl e, int index, string partialPredicateCall) {
     exists(int n, int nGenericTypeParam, int nMember |
       n = 0 and
-      nGenericTypeParam = n + 1 + max(int i | i = -1 or exists(e.getGenericTypeParam(i)) | i) and
-      nMember = nGenericTypeParam + 1 + max(int i | i = -1 or exists(e.getMember(i)) | i) and
+      nGenericTypeParam = n + e.getNumberOfGenericTypeParams() and
+      nMember = nGenericTypeParam + e.getNumberOfMembers() and
       (
         none()
         or
@@ -820,8 +826,8 @@ private module Impl {
   ) {
     exists(int n, int nBindingDecl, int nVariable, int nClosureBody |
       n = 0 and
-      nBindingDecl = n + 1 + max(int i | i = -1 or exists(e.getBindingDecl(i)) | i) and
-      nVariable = nBindingDecl + 1 + max(int i | i = -1 or exists(e.getVariable(i)) | i) and
+      nBindingDecl = n + e.getNumberOfBindingDecls() and
+      nVariable = nBindingDecl + e.getNumberOfVariables() and
       nClosureBody = nVariable + 1 and
       (
         none()
@@ -1033,7 +1039,7 @@ private module Impl {
     exists(int n, int nRoot, int nComponent |
       n = 0 and
       nRoot = n + 1 and
-      nComponent = nRoot + 1 + max(int i | i = -1 or exists(e.getComponent(i)) | i) and
+      nComponent = nRoot + e.getNumberOfComponents() and
       (
         none()
         or
@@ -1486,9 +1492,9 @@ private module Impl {
     exists(int n, int nSelfParam, int nParam, int nBody, int nCapture |
       n = 0 and
       nSelfParam = n + 1 and
-      nParam = nSelfParam + 1 + max(int i | i = -1 or exists(e.getParam(i)) | i) and
+      nParam = nSelfParam + e.getNumberOfParams() and
       nBody = nParam + 1 and
-      nCapture = nBody + 1 + max(int i | i = -1 or exists(e.getCapture(i)) | i) and
+      nCapture = nBody + e.getNumberOfCaptures() and
       (
         none()
         or
@@ -1521,7 +1527,7 @@ private module Impl {
     exists(int n, int nFunction, int nArgument |
       n = 0 and
       nFunction = n + 1 and
-      nArgument = nFunction + 1 + max(int i | i = -1 or exists(e.getArgument(i)) | i) and
+      nArgument = nFunction + e.getNumberOfArguments() and
       (
         none()
         or
@@ -1577,7 +1583,7 @@ private module Impl {
     exists(int n, int nFunction, int nArgument |
       n = 0 and
       nFunction = n + 1 and
-      nArgument = nFunction + 1 + max(int i | i = -1 or exists(e.getArgument(i)) | i) and
+      nArgument = nFunction + e.getNumberOfArguments() and
       (
         none()
         or
@@ -1790,9 +1796,9 @@ private module Impl {
     exists(int n, int nSelfParam, int nParam, int nBody, int nCapture |
       n = 0 and
       nSelfParam = n + 1 and
-      nParam = nSelfParam + 1 + max(int i | i = -1 or exists(e.getParam(i)) | i) and
+      nParam = nSelfParam + e.getNumberOfParams() and
       nBody = nParam + 1 and
-      nCapture = nBody + 1 + max(int i | i = -1 or exists(e.getCapture(i)) | i) and
+      nCapture = nBody + e.getNumberOfCaptures() and
       (
         none()
         or
@@ -2007,7 +2013,7 @@ private module Impl {
   ) {
     exists(int n, int nArgument |
       n = 0 and
-      nArgument = n + 1 + max(int i | i = -1 or exists(e.getArgument(i)) | i) and
+      nArgument = n + e.getNumberOfArguments() and
       (
         none()
         or
@@ -2063,7 +2069,7 @@ private module Impl {
     exists(int n, int nFunction, int nArgument |
       n = 0 and
       nFunction = n + 1 and
-      nArgument = nFunction + 1 + max(int i | i = -1 or exists(e.getArgument(i)) | i) and
+      nArgument = nFunction + e.getNumberOfArguments() and
       (
         none()
         or
@@ -2081,7 +2087,7 @@ private module Impl {
     exists(int n, int nFunction, int nArgument |
       n = 0 and
       nFunction = n + 1 and
-      nArgument = nFunction + 1 + max(int i | i = -1 or exists(e.getArgument(i)) | i) and
+      nArgument = nFunction + e.getNumberOfArguments() and
       (
         none()
         or
@@ -2133,7 +2139,7 @@ private module Impl {
     exists(int n, int nBase, int nArgument |
       n = 0 and
       nBase = n + 1 and
-      nArgument = nBase + 1 + max(int i | i = -1 or exists(e.getArgument(i)) | i) and
+      nArgument = nBase + e.getNumberOfArguments() and
       (
         none()
         or
@@ -2241,6 +2247,18 @@ private module Impl {
     )
   }
 
+  private Element getImmediateChildOfUnsafeExpr(UnsafeExpr e, int index, string partialPredicateCall) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getImmediateSubExpr() and partialPredicateCall = "SubExpr()"
+      )
+    )
+  }
+
   private Element getImmediateChildOfBooleanLiteralExpr(
     BooleanLiteralExpr e, int index, string partialPredicateCall
   ) {
@@ -2267,7 +2285,7 @@ private module Impl {
     exists(int n, int nFunction, int nArgument |
       n = 0 and
       nFunction = n + 1 and
-      nArgument = nFunction + 1 + max(int i | i = -1 or exists(e.getArgument(i)) | i) and
+      nArgument = nFunction + e.getNumberOfArguments() and
       (
         none()
         or
@@ -2327,7 +2345,7 @@ private module Impl {
     exists(int n, int nFunction, int nArgument |
       n = 0 and
       nFunction = n + 1 and
-      nArgument = nFunction + 1 + max(int i | i = -1 or exists(e.getArgument(i)) | i) and
+      nArgument = nFunction + e.getNumberOfArguments() and
       (
         none()
         or
@@ -2559,7 +2577,7 @@ private module Impl {
   ) {
     exists(int n, int nElement |
       n = 0 and
-      nElement = n + 1 + max(int i | i = -1 or exists(e.getElement(i)) | i) and
+      nElement = n + e.getNumberOfElements() and
       (
         none()
         or
@@ -2572,7 +2590,7 @@ private module Impl {
   private Element getImmediateChildOfBraceStmt(BraceStmt e, int index, string partialPredicateCall) {
     exists(int n, int nVariable, int nElement |
       n = 0 and
-      nVariable = n + 1 + max(int i | i = -1 or exists(e.getVariable(i)) | i) and
+      nVariable = n + e.getNumberOfVariables() and
       nElement = nVariable + 1 + max(int i | i = -1 or exists(e.getImmediateElement(i)) | i) and
       (
         none()
@@ -2593,8 +2611,8 @@ private module Impl {
   private Element getImmediateChildOfCaseStmt(CaseStmt e, int index, string partialPredicateCall) {
     exists(int n, int nLabel, int nVariable, int nBody |
       n = 0 and
-      nLabel = n + 1 + max(int i | i = -1 or exists(e.getLabel(i)) | i) and
-      nVariable = nLabel + 1 + max(int i | i = -1 or exists(e.getVariable(i)) | i) and
+      nLabel = n + e.getNumberOfLabels() and
+      nVariable = nLabel + e.getNumberOfVariables() and
       nBody = nVariable + 1 and
       (
         none()
@@ -2713,7 +2731,7 @@ private module Impl {
     exists(int n, int nBody, int nCatch |
       n = 0 and
       nBody = n + 1 and
-      nCatch = nBody + 1 + max(int i | i = -1 or exists(e.getCatch(i)) | i) and
+      nCatch = nBody + e.getNumberOfCatches() and
       (
         none()
         or
@@ -2744,7 +2762,7 @@ private module Impl {
       int n, int nVariable, int nPattern, int nWhere, int nIteratorVar, int nNextCall, int nBody
     |
       n = 0 and
-      nVariable = n + 1 + max(int i | i = -1 or exists(e.getVariable(i)) | i) and
+      nVariable = n + e.getNumberOfVariables() and
       nPattern = nVariable + 1 and
       nWhere = nPattern + 1 and
       nIteratorVar = nWhere + 1 and
@@ -2794,7 +2812,7 @@ private module Impl {
     exists(int n, int nExpr, int nCase |
       n = 0 and
       nExpr = n + 1 and
-      nCase = nExpr + 1 + max(int i | i = -1 or exists(e.getCase(i)) | i) and
+      nCase = nExpr + e.getNumberOfCases() and
       (
         none()
         or
@@ -3084,6 +3102,12 @@ private module Impl {
     none()
   }
 
+  private Element getImmediateChildOfInlineArrayType(
+    InlineArrayType e, int index, string partialPredicateCall
+  ) {
+    none()
+  }
+
   private Element getImmediateChildOfOpaqueTypeArchetypeType(
     OpaqueTypeArchetypeType e, int index, string partialPredicateCall
   ) {
@@ -3140,8 +3164,8 @@ private module Impl {
     none()
   }
 
-  private Element getImmediateChildOfOpenedArchetypeType(
-    OpenedArchetypeType e, int index, string partialPredicateCall
+  private Element getImmediateChildOfExistentialArchetypeType(
+    ExistentialArchetypeType e, int index, string partialPredicateCall
   ) {
     none()
   }
@@ -3188,16 +3212,14 @@ private module Impl {
     or
     result = getImmediateChildOfAvailabilityInfo(e, index, partialAccessor)
     or
+    result = getImmediateChildOfAvailabilitySpec(e, index, partialAccessor)
+    or
     result = getImmediateChildOfKeyPathComponent(e, index, partialAccessor)
     or
     result = getImmediateChildOfMacroRole(e, index, partialAccessor)
     or
     result = getImmediateChildOfUnspecifiedElement(e, index, partialAccessor)
     or
-    result = getImmediateChildOfOtherAvailabilitySpec(e, index, partialAccessor)
-    or
-    result = getImmediateChildOfPlatformVersionAvailabilitySpec(e, index, partialAccessor)
-    or
     result = getImmediateChildOfCapturedDecl(e, index, partialAccessor)
     or
     result = getImmediateChildOfEnumCaseDecl(e, index, partialAccessor)
@@ -3218,6 +3240,8 @@ private module Impl {
     or
     result = getImmediateChildOfTopLevelCodeDecl(e, index, partialAccessor)
     or
+    result = getImmediateChildOfUsingDecl(e, index, partialAccessor)
+    or
     result = getImmediateChildOfEnumElementDecl(e, index, partialAccessor)
     or
     result = getImmediateChildOfInfixOperatorDecl(e, index, partialAccessor)
@@ -3478,6 +3502,8 @@ private module Impl {
     or
     result = getImmediateChildOfUnsafeCastExpr(e, index, partialAccessor)
     or
+    result = getImmediateChildOfUnsafeExpr(e, index, partialAccessor)
+    or
     result = getImmediateChildOfBooleanLiteralExpr(e, index, partialAccessor)
     or
     result = getImmediateChildOfConditionalCheckedCastExpr(e, index, partialAccessor)
@@ -3654,6 +3680,8 @@ private module Impl {
     or
     result = getImmediateChildOfDictionaryType(e, index, partialAccessor)
     or
+    result = getImmediateChildOfInlineArrayType(e, index, partialAccessor)
+    or
     result = getImmediateChildOfOpaqueTypeArchetypeType(e, index, partialAccessor)
     or
     result = getImmediateChildOfPackArchetypeType(e, index, partialAccessor)
@@ -3674,7 +3702,7 @@ private module Impl {
     or
     result = getImmediateChildOfEnumType(e, index, partialAccessor)
     or
-    result = getImmediateChildOfOpenedArchetypeType(e, index, partialAccessor)
+    result = getImmediateChildOfExistentialArchetypeType(e, index, partialAccessor)
     or
     result = getImmediateChildOfOptionalType(e, index, partialAccessor)
     or
diff --git a/swift/ql/lib/codeql/swift/generated/PlatformVersionAvailabilitySpec.qll b/swift/ql/lib/codeql/swift/generated/PlatformVersionAvailabilitySpec.qll
deleted file mode 100644
index 24781de1e07..00000000000
--- a/swift/ql/lib/codeql/swift/generated/PlatformVersionAvailabilitySpec.qll
+++ /dev/null
@@ -1,46 +0,0 @@
-// generated by codegen/codegen.py, do not edit
-/**
- * This module provides the generated definition of `PlatformVersionAvailabilitySpec`.
- * INTERNAL: Do not import directly.
- */
-
-private import codeql.swift.generated.Synth
-private import codeql.swift.generated.Raw
-import codeql.swift.elements.internal.AvailabilitySpecImpl::Impl as AvailabilitySpecImpl
-
-/**
- * INTERNAL: This module contains the fully generated definition of `PlatformVersionAvailabilitySpec` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * An availability spec based on platform and version, for example `macOS 12` or `watchOS 14`
-   * INTERNAL: Do not reference the `Generated::PlatformVersionAvailabilitySpec` class directly.
-   * Use the subclass `PlatformVersionAvailabilitySpec`, where the following predicates are available.
-   */
-  class PlatformVersionAvailabilitySpec extends Synth::TPlatformVersionAvailabilitySpec,
-    AvailabilitySpecImpl::AvailabilitySpec
-  {
-    override string getAPrimaryQlClass() { result = "PlatformVersionAvailabilitySpec" }
-
-    /**
-     * Gets the platform of this platform version availability spec.
-     */
-    string getPlatform() {
-      result =
-        Synth::convertPlatformVersionAvailabilitySpecToRaw(this)
-            .(Raw::PlatformVersionAvailabilitySpec)
-            .getPlatform()
-    }
-
-    /**
-     * Gets the version of this platform version availability spec.
-     */
-    string getVersion() {
-      result =
-        Synth::convertPlatformVersionAvailabilitySpecToRaw(this)
-            .(Raw::PlatformVersionAvailabilitySpec)
-            .getVersion()
-    }
-  }
-}
diff --git a/swift/ql/lib/codeql/swift/generated/Raw.qll b/swift/ql/lib/codeql/swift/generated/Raw.qll
index a2779b148e9..714579218bc 100644
--- a/swift/ql/lib/codeql/swift/generated/Raw.qll
+++ b/swift/ql/lib/codeql/swift/generated/Raw.qll
@@ -87,6 +87,8 @@ module Raw {
     string getText() { comments(this, result) }
   }
 
+  private Element getImmediateChildOfComment(Comment e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -94,6 +96,8 @@ module Raw {
     override string toString() { result = "DbFile" }
   }
 
+  private Element getImmediateChildOfDbFile(DbFile e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -101,6 +105,8 @@ module Raw {
     override string toString() { result = "DbLocation" }
   }
 
+  private Element getImmediateChildOfDbLocation(DbLocation e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -118,6 +124,8 @@ module Raw {
     int getKind() { diagnostics(this, _, result) }
   }
 
+  private Element getImmediateChildOfDiagnostics(Diagnostics e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    * The superclass of all elements indicating some kind of error.
@@ -152,6 +160,23 @@ module Raw {
      * Gets the `index`th spec of this availability info (0-based).
      */
     AvailabilitySpec getSpec(int index) { availability_info_specs(this, index, result) }
+
+    /**
+     * Gets the number of specs of this availability info.
+     */
+    int getNumberOfSpecs() { result = count(int i | availability_info_specs(this, i, _)) }
+  }
+
+  private Element getImmediateChildOfAvailabilityInfo(AvailabilityInfo e, int index) {
+    exists(int n, int nSpec |
+      n = 0 and
+      nSpec = n + e.getNumberOfSpecs() and
+      (
+        none()
+        or
+        result = e.getSpec(index - n)
+      )
+    )
   }
 
   /**
@@ -161,7 +186,26 @@ module Raw {
    * if #available(iOS 12, *)
    * ```
    */
-  class AvailabilitySpec extends @availability_spec, AstNode { }
+  class AvailabilitySpec extends @availability_spec, AstNode {
+    override string toString() { result = "AvailabilitySpec" }
+
+    /**
+     * Gets the platform of this availability spec, if it exists.
+     */
+    string getPlatform() { availability_spec_platforms(this, result) }
+
+    /**
+     * Gets the version of this availability spec, if it exists.
+     */
+    string getVersion() { availability_spec_versions(this, result) }
+
+    /**
+     * Holds if this availability spec is wildcard.
+     */
+    predicate isWildcard() { availability_spec_is_wildcard(this) }
+  }
+
+  private Element getImmediateChildOfAvailabilitySpec(AvailabilitySpec e, int index) { none() }
 
   /**
    * INTERNAL: Do not use.
@@ -184,6 +228,11 @@ module Raw {
      */
     ParamDecl getParam(int index) { callable_params(this, index, result) }
 
+    /**
+     * Gets the number of parameters of this callable.
+     */
+    int getNumberOfParams() { result = count(int i | callable_params(this, i, _)) }
+
     /**
      * Gets the body of this callable, if it exists.
      *
@@ -195,6 +244,11 @@ module Raw {
      * Gets the `index`th capture of this callable (0-based).
      */
     CapturedDecl getCapture(int index) { callable_captures(this, index, result) }
+
+    /**
+     * Gets the number of captures of this callable.
+     */
+    int getNumberOfCaptures() { result = count(int i | callable_captures(this, i, _)) }
   }
 
   /**
@@ -209,13 +263,13 @@ module Raw {
      *
      * INTERNAL: Do not use.
      *
-     * This is 3 for properties, 4 for array and dictionary subscripts, 5 for optional forcing
-     * (`!`), 6 for optional chaining (`?`), 7 for implicit optional wrapping, 8 for `self`,
-     * and 9 for tuple element indexing.
+     * This is 4 for method or initializer application, 5 for members, 6 for array and dictionary
+     * subscripts, 7 for optional forcing (`!`), 8 for optional chaining (`?`), 9 for implicit
+     * optional wrapping, 10 for `self`, and 11 for tuple element indexing.
      *
      * The following values should not appear: 0 for invalid components, 1 for unresolved
-     * properties, 2 for unresolved subscripts, 10 for #keyPath dictionary keys, and 11 for
-     * implicit IDE code completion data.
+     * method or initializer applications, 2 for unresolved members, 3 for unresolved subscripts,
+     * 12 for #keyPath dictionary keys, and 13 for implicit IDE code completion data.
      */
     int getKind() { key_path_components(this, result, _) }
 
@@ -226,6 +280,13 @@ module Raw {
       key_path_component_subscript_arguments(this, index, result)
     }
 
+    /**
+     * Gets the number of arguments to an array or dictionary subscript expression.
+     */
+    int getNumberOfSubscriptArguments() {
+      result = count(int i | key_path_component_subscript_arguments(this, i, _))
+    }
+
     /**
      * Gets the tuple index of this key path component, if it exists.
      */
@@ -246,6 +307,18 @@ module Raw {
     Type getComponentType() { key_path_components(this, _, result) }
   }
 
+  private Element getImmediateChildOfKeyPathComponent(KeyPathComponent e, int index) {
+    exists(int n, int nSubscriptArgument |
+      n = 0 and
+      nSubscriptArgument = n + e.getNumberOfSubscriptArguments() and
+      (
+        none()
+        or
+        result = e.getSubscriptArgument(index - n)
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * The role of a macro, for example #freestanding(declaration) or @attached(member).
@@ -268,12 +341,24 @@ module Raw {
      */
     Expr getConformance(int index) { macro_role_conformances(this, index, result) }
 
+    /**
+     * Gets the number of conformances of this macro role.
+     */
+    int getNumberOfConformances() { result = count(int i | macro_role_conformances(this, i, _)) }
+
     /**
      * Gets the `index`th name of this macro role (0-based).
      */
     string getName(int index) { macro_role_names(this, index, result) }
+
+    /**
+     * Gets the number of names of this macro role.
+     */
+    int getNumberOfNames() { result = count(int i | macro_role_names(this, i, _)) }
   }
 
+  private Element getImmediateChildOfMacroRole(MacroRole e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -306,34 +391,23 @@ module Raw {
      * These will be present only in certain downgraded databases.
      */
     AstNode getChild(int index) { unspecified_element_children(this, index, result) }
-  }
-
-  /**
-   * INTERNAL: Do not use.
-   * A wildcard availability spec `*`
-   */
-  class OtherAvailabilitySpec extends @other_availability_spec, AvailabilitySpec {
-    override string toString() { result = "OtherAvailabilitySpec" }
-  }
-
-  /**
-   * INTERNAL: Do not use.
-   * An availability spec based on platform and version, for example `macOS 12` or `watchOS 14`
-   */
-  class PlatformVersionAvailabilitySpec extends @platform_version_availability_spec,
-    AvailabilitySpec
-  {
-    override string toString() { result = "PlatformVersionAvailabilitySpec" }
 
     /**
-     * Gets the platform of this platform version availability spec.
+     * Gets the number of children of this unspecified element.
      */
-    string getPlatform() { platform_version_availability_specs(this, result, _) }
+    int getNumberOfChildren() { result = count(int i | unspecified_element_children(this, i, _)) }
+  }
 
-    /**
-     * Gets the version of this platform version availability spec.
-     */
-    string getVersion() { platform_version_availability_specs(this, _, result) }
+  private Element getImmediateChildOfUnspecifiedElement(UnspecifiedElement e, int index) {
+    exists(int n, int nChild |
+      n = 0 and
+      nChild = n + e.getNumberOfChildren() and
+      (
+        none()
+        or
+        result = e.getChild(index - n)
+      )
+    )
   }
 
   /**
@@ -353,6 +427,11 @@ module Raw {
      * align with expectations, and could change in future releases.
      */
     Decl getMember(int index) { decl_members(this, index, result) }
+
+    /**
+     * Gets the number of members of this declaration.
+     */
+    int getNumberOfMembers() { result = count(int i | decl_members(this, i, _)) }
   }
 
   /**
@@ -365,6 +444,13 @@ module Raw {
     GenericTypeParamDecl getGenericTypeParam(int index) {
       generic_context_generic_type_params(this, index, result)
     }
+
+    /**
+     * Gets the number of generic type parameters of this generic context.
+     */
+    int getNumberOfGenericTypeParams() {
+      result = count(int i | generic_context_generic_type_params(this, i, _))
+    }
   }
 
   /**
@@ -389,6 +475,18 @@ module Raw {
     predicate isEscaping() { captured_decl_is_escaping(this) }
   }
 
+  private Element getImmediateChildOfCapturedDecl(CapturedDecl e, int index) {
+    exists(int n, int nMember |
+      n = 0 and
+      nMember = n + e.getNumberOfMembers() and
+      (
+        none()
+        or
+        result = e.getMember(index - n)
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -399,6 +497,23 @@ module Raw {
      * Gets the `index`th element of this enum case declaration (0-based).
      */
     EnumElementDecl getElement(int index) { enum_case_decl_elements(this, index, result) }
+
+    /**
+     * Gets the number of elements of this enum case declaration.
+     */
+    int getNumberOfElements() { result = count(int i | enum_case_decl_elements(this, i, _)) }
+  }
+
+  private Element getImmediateChildOfEnumCaseDecl(EnumCaseDecl e, int index) {
+    exists(int n, int nMember |
+      n = 0 and
+      nMember = n + e.getNumberOfMembers() and
+      (
+        none()
+        or
+        result = e.getMember(index - n)
+      )
+    )
   }
 
   /**
@@ -416,6 +531,26 @@ module Raw {
      * Gets the `index`th protocol of this extension declaration (0-based).
      */
     ProtocolDecl getProtocol(int index) { extension_decl_protocols(this, index, result) }
+
+    /**
+     * Gets the number of protocols of this extension declaration.
+     */
+    int getNumberOfProtocols() { result = count(int i | extension_decl_protocols(this, i, _)) }
+  }
+
+  private Element getImmediateChildOfExtensionDecl(ExtensionDecl e, int index) {
+    exists(int n, int nGenericTypeParam, int nMember |
+      n = 0 and
+      nGenericTypeParam = n + e.getNumberOfGenericTypeParams() and
+      nMember = nGenericTypeParam + e.getNumberOfMembers() and
+      (
+        none()
+        or
+        result = e.getGenericTypeParam(index - n)
+        or
+        result = e.getMember(index - nGenericTypeParam)
+      )
+    )
   }
 
   /**
@@ -428,6 +563,25 @@ module Raw {
      * Gets the `index`th active element of this if config declaration (0-based).
      */
     AstNode getActiveElement(int index) { if_config_decl_active_elements(this, index, result) }
+
+    /**
+     * Gets the number of active elements of this if config declaration.
+     */
+    int getNumberOfActiveElements() {
+      result = count(int i | if_config_decl_active_elements(this, i, _))
+    }
+  }
+
+  private Element getImmediateChildOfIfConfigDecl(IfConfigDecl e, int index) {
+    exists(int n, int nMember |
+      n = 0 and
+      nMember = n + e.getNumberOfMembers() and
+      (
+        none()
+        or
+        result = e.getMember(index - n)
+      )
+    )
   }
 
   /**
@@ -450,6 +604,23 @@ module Raw {
      * Gets the `index`th declaration of this import declaration (0-based).
      */
     ValueDecl getDeclaration(int index) { import_decl_declarations(this, index, result) }
+
+    /**
+     * Gets the number of declarations of this import declaration.
+     */
+    int getNumberOfDeclarations() { result = count(int i | import_decl_declarations(this, i, _)) }
+  }
+
+  private Element getImmediateChildOfImportDecl(ImportDecl e, int index) {
+    exists(int n, int nMember |
+      n = 0 and
+      nMember = n + e.getNumberOfMembers() and
+      (
+        none()
+        or
+        result = e.getMember(index - n)
+      )
+    )
   }
 
   /**
@@ -465,6 +636,18 @@ module Raw {
     string getName() { missing_member_decls(this, result) }
   }
 
+  private Element getImmediateChildOfMissingMemberDecl(MissingMemberDecl e, int index) {
+    exists(int n, int nMember |
+      n = 0 and
+      nMember = n + e.getNumberOfMembers() and
+      (
+        none()
+        or
+        result = e.getMember(index - n)
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -486,10 +669,38 @@ module Raw {
      */
     Expr getInit(int index) { pattern_binding_decl_inits(this, index, result) }
 
+    /**
+     * Gets the number of inits of this pattern binding declaration.
+     */
+    int getNumberOfInits() { result = count(int i | pattern_binding_decl_inits(this, i, _)) }
+
     /**
      * Gets the `index`th pattern of this pattern binding declaration (0-based).
      */
     Pattern getPattern(int index) { pattern_binding_decl_patterns(this, index, result) }
+
+    /**
+     * Gets the number of patterns of this pattern binding declaration.
+     */
+    int getNumberOfPatterns() { result = count(int i | pattern_binding_decl_patterns(this, i, _)) }
+  }
+
+  private Element getImmediateChildOfPatternBindingDecl(PatternBindingDecl e, int index) {
+    exists(int n, int nMember, int nInit, int nPattern |
+      n = 0 and
+      nMember = n + e.getNumberOfMembers() and
+      nInit = nMember + e.getNumberOfInits() and
+      nPattern = nInit + e.getNumberOfPatterns() and
+      (
+        none()
+        or
+        result = e.getMember(index - n)
+        or
+        result = e.getInit(index - nMember)
+        or
+        result = e.getPattern(index - nInit)
+      )
+    )
   }
 
   /**
@@ -512,6 +723,21 @@ module Raw {
     StringLiteralExpr getMessage() { pound_diagnostic_decls(this, _, result) }
   }
 
+  private Element getImmediateChildOfPoundDiagnosticDecl(PoundDiagnosticDecl e, int index) {
+    exists(int n, int nMember, int nMessage |
+      n = 0 and
+      nMember = n + e.getNumberOfMembers() and
+      nMessage = nMember + 1 and
+      (
+        none()
+        or
+        result = e.getMember(index - n)
+        or
+        index = nMember and result = e.getMessage()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -519,6 +745,18 @@ module Raw {
     override string toString() { result = "PrecedenceGroupDecl" }
   }
 
+  private Element getImmediateChildOfPrecedenceGroupDecl(PrecedenceGroupDecl e, int index) {
+    exists(int n, int nMember |
+      n = 0 and
+      nMember = n + e.getNumberOfMembers() and
+      (
+        none()
+        or
+        result = e.getMember(index - n)
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -531,6 +769,50 @@ module Raw {
     BraceStmt getBody() { top_level_code_decls(this, result) }
   }
 
+  private Element getImmediateChildOfTopLevelCodeDecl(TopLevelCodeDecl e, int index) {
+    exists(int n, int nMember, int nBody |
+      n = 0 and
+      nMember = n + e.getNumberOfMembers() and
+      nBody = nMember + 1 and
+      (
+        none()
+        or
+        result = e.getMember(index - n)
+        or
+        index = nMember and result = e.getBody()
+      )
+    )
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class UsingDecl extends @using_decl, Decl {
+    override string toString() { result = "UsingDecl" }
+
+    /**
+     * Holds if this using declaration is main actor.
+     */
+    predicate isMainActor() { using_decl_is_main_actor(this) }
+
+    /**
+     * Holds if this using declaration is nonisolated.
+     */
+    predicate isNonisolated() { using_decl_is_nonisolated(this) }
+  }
+
+  private Element getImmediateChildOfUsingDecl(UsingDecl e, int index) {
+    exists(int n, int nMember |
+      n = 0 and
+      nMember = n + e.getNumberOfMembers() and
+      (
+        none()
+        or
+        result = e.getMember(index - n)
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -549,6 +831,13 @@ module Raw {
      * Gets the `index`th accessor of this abstract storage declaration (0-based).
      */
     Accessor getAccessor(int index) { abstract_storage_decl_accessors(this, index, result) }
+
+    /**
+     * Gets the number of accessors of this abstract storage declaration.
+     */
+    int getNumberOfAccessors() {
+      result = count(int i | abstract_storage_decl_accessors(this, i, _))
+    }
   }
 
   /**
@@ -566,6 +855,26 @@ module Raw {
      * Gets the `index`th parameter of this enum element declaration (0-based).
      */
     ParamDecl getParam(int index) { enum_element_decl_params(this, index, result) }
+
+    /**
+     * Gets the number of parameters of this enum element declaration.
+     */
+    int getNumberOfParams() { result = count(int i | enum_element_decl_params(this, i, _)) }
+  }
+
+  private Element getImmediateChildOfEnumElementDecl(EnumElementDecl e, int index) {
+    exists(int n, int nMember, int nParam |
+      n = 0 and
+      nMember = n + e.getNumberOfMembers() and
+      nParam = nMember + e.getNumberOfParams() and
+      (
+        none()
+        or
+        result = e.getMember(index - n)
+        or
+        result = e.getParam(index - nMember)
+      )
+    )
   }
 
   /**
@@ -585,6 +894,18 @@ module Raw {
     PrecedenceGroupDecl getPrecedenceGroup() { infix_operator_decl_precedence_groups(this, result) }
   }
 
+  private Element getImmediateChildOfInfixOperatorDecl(InfixOperatorDecl e, int index) {
+    exists(int n, int nMember |
+      n = 0 and
+      nMember = n + e.getNumberOfMembers() and
+      (
+        none()
+        or
+        result = e.getMember(index - n)
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A declaration of a macro. Some examples:
@@ -611,10 +932,35 @@ module Raw {
      */
     ParamDecl getParameter(int index) { macro_decl_parameters(this, index, result) }
 
+    /**
+     * Gets the number of parameters of this macro.
+     */
+    int getNumberOfParameters() { result = count(int i | macro_decl_parameters(this, i, _)) }
+
     /**
      * Gets the `index`th role of this macro (0-based).
      */
     MacroRole getRole(int index) { macro_decl_roles(this, index, result) }
+
+    /**
+     * Gets the number of roles of this macro.
+     */
+    int getNumberOfRoles() { result = count(int i | macro_decl_roles(this, i, _)) }
+  }
+
+  private Element getImmediateChildOfMacroDecl(MacroDecl e, int index) {
+    exists(int n, int nGenericTypeParam, int nMember |
+      n = 0 and
+      nGenericTypeParam = n + e.getNumberOfGenericTypeParams() and
+      nMember = nGenericTypeParam + e.getNumberOfMembers() and
+      (
+        none()
+        or
+        result = e.getGenericTypeParam(index - n)
+        or
+        result = e.getMember(index - nGenericTypeParam)
+      )
+    )
   }
 
   /**
@@ -624,6 +970,18 @@ module Raw {
     override string toString() { result = "PostfixOperatorDecl" }
   }
 
+  private Element getImmediateChildOfPostfixOperatorDecl(PostfixOperatorDecl e, int index) {
+    exists(int n, int nMember |
+      n = 0 and
+      nMember = n + e.getNumberOfMembers() and
+      (
+        none()
+        or
+        result = e.getMember(index - n)
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -631,6 +989,18 @@ module Raw {
     override string toString() { result = "PrefixOperatorDecl" }
   }
 
+  private Element getImmediateChildOfPrefixOperatorDecl(PrefixOperatorDecl e, int index) {
+    exists(int n, int nMember |
+      n = 0 and
+      nMember = n + e.getNumberOfMembers() and
+      (
+        none()
+        or
+        result = e.getMember(index - n)
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -647,6 +1017,13 @@ module Raw {
      * will not resolve `TypeAliasDecl`s or consider base types added by extensions.
      */
     Type getInheritedType(int index) { type_decl_inherited_types(this, index, result) }
+
+    /**
+     * Gets the number of inherited types of this type declaration.
+     */
+    int getNumberOfInheritedTypes() {
+      result = count(int i | type_decl_inherited_types(this, i, _))
+    }
   }
 
   /**
@@ -666,6 +1043,35 @@ module Raw {
     override string toString() { result = "Deinitializer" }
   }
 
+  private Element getImmediateChildOfDeinitializer(Deinitializer e, int index) {
+    exists(
+      int n, int nGenericTypeParam, int nMember, int nSelfParam, int nParam, int nBody, int nCapture
+    |
+      n = 0 and
+      nGenericTypeParam = n + e.getNumberOfGenericTypeParams() and
+      nMember = nGenericTypeParam + e.getNumberOfMembers() and
+      nSelfParam = nMember + 1 and
+      nParam = nSelfParam + e.getNumberOfParams() and
+      nBody = nParam + 1 and
+      nCapture = nBody + e.getNumberOfCaptures() and
+      (
+        none()
+        or
+        result = e.getGenericTypeParam(index - n)
+        or
+        result = e.getMember(index - nGenericTypeParam)
+        or
+        index = nMember and result = e.getSelfParam()
+        or
+        result = e.getParam(index - nSelfParam)
+        or
+        index = nParam and result = e.getBody()
+        or
+        result = e.getCapture(index - nBody)
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -678,6 +1084,35 @@ module Raw {
     override string toString() { result = "Initializer" }
   }
 
+  private Element getImmediateChildOfInitializer(Initializer e, int index) {
+    exists(
+      int n, int nGenericTypeParam, int nMember, int nSelfParam, int nParam, int nBody, int nCapture
+    |
+      n = 0 and
+      nGenericTypeParam = n + e.getNumberOfGenericTypeParams() and
+      nMember = nGenericTypeParam + e.getNumberOfMembers() and
+      nSelfParam = nMember + 1 and
+      nParam = nSelfParam + e.getNumberOfParams() and
+      nBody = nParam + 1 and
+      nCapture = nBody + e.getNumberOfCaptures() and
+      (
+        none()
+        or
+        result = e.getGenericTypeParam(index - n)
+        or
+        result = e.getMember(index - nGenericTypeParam)
+        or
+        index = nMember and result = e.getSelfParam()
+        or
+        result = e.getParam(index - nSelfParam)
+        or
+        index = nParam and result = e.getBody()
+        or
+        result = e.getCapture(index - nBody)
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -707,6 +1142,18 @@ module Raw {
     ModuleDecl getAnExportedModule() { module_decl_exported_modules(this, result) }
   }
 
+  private Element getImmediateChildOfModuleDecl(ModuleDecl e, int index) {
+    exists(int n, int nMember |
+      n = 0 and
+      nMember = n + e.getNumberOfMembers() and
+      (
+        none()
+        or
+        result = e.getMember(index - n)
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -718,12 +1165,38 @@ module Raw {
      */
     ParamDecl getParam(int index) { subscript_decl_params(this, index, result) }
 
+    /**
+     * Gets the number of parameters of this subscript declaration.
+     */
+    int getNumberOfParams() { result = count(int i | subscript_decl_params(this, i, _)) }
+
     /**
      * Gets the element type of this subscript declaration.
      */
     Type getElementType() { subscript_decls(this, result) }
   }
 
+  private Element getImmediateChildOfSubscriptDecl(SubscriptDecl e, int index) {
+    exists(int n, int nMember, int nAccessor, int nGenericTypeParam, int nParam |
+      n = 0 and
+      nMember = n + e.getNumberOfMembers() and
+      nAccessor = nMember + e.getNumberOfAccessors() and
+      nGenericTypeParam = nAccessor + e.getNumberOfGenericTypeParams() and
+      nParam = nGenericTypeParam + e.getNumberOfParams() and
+      (
+        none()
+        or
+        result = e.getMember(index - n)
+        or
+        result = e.getAccessor(index - nMember)
+        or
+        result = e.getGenericTypeParam(index - nAccessor)
+        or
+        result = e.getParam(index - nGenericTypeParam)
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A declaration of a variable such as
@@ -885,6 +1358,55 @@ module Raw {
      * Holds if this accessor is an `unsafeMutableAddress` mutable addressor.
      */
     predicate isUnsafeMutableAddress() { accessor_is_unsafe_mutable_address(this) }
+
+    /**
+     * Holds if this accessor is a distributed getter.
+     */
+    predicate isDistributedGet() { accessor_is_distributed_get(this) }
+
+    /**
+     * Holds if this accessor is a `read` coroutine, yielding a borrowed value of the property.
+     */
+    predicate isRead2() { accessor_is_read2(this) }
+
+    /**
+     * Holds if this accessor is a `modify` coroutine, yielding an inout value of the property.
+     */
+    predicate isModify2() { accessor_is_modify2(this) }
+
+    /**
+     * Holds if this accessor is an `init` accessor.
+     */
+    predicate isInit() { accessor_is_init(this) }
+  }
+
+  private Element getImmediateChildOfAccessor(Accessor e, int index) {
+    exists(
+      int n, int nGenericTypeParam, int nMember, int nSelfParam, int nParam, int nBody, int nCapture
+    |
+      n = 0 and
+      nGenericTypeParam = n + e.getNumberOfGenericTypeParams() and
+      nMember = nGenericTypeParam + e.getNumberOfMembers() and
+      nSelfParam = nMember + 1 and
+      nParam = nSelfParam + e.getNumberOfParams() and
+      nBody = nParam + 1 and
+      nCapture = nBody + e.getNumberOfCaptures() and
+      (
+        none()
+        or
+        result = e.getGenericTypeParam(index - n)
+        or
+        result = e.getMember(index - nGenericTypeParam)
+        or
+        index = nMember and result = e.getSelfParam()
+        or
+        result = e.getParam(index - nSelfParam)
+        or
+        index = nParam and result = e.getBody()
+        or
+        result = e.getCapture(index - nBody)
+      )
+    )
   }
 
   /**
@@ -894,6 +1416,18 @@ module Raw {
     override string toString() { result = "AssociatedTypeDecl" }
   }
 
+  private Element getImmediateChildOfAssociatedTypeDecl(AssociatedTypeDecl e, int index) {
+    exists(int n, int nMember |
+      n = 0 and
+      nMember = n + e.getNumberOfMembers() and
+      (
+        none()
+        or
+        result = e.getMember(index - n)
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -908,6 +1442,38 @@ module Raw {
     int getIntroducerInt() { concrete_var_decls(this, result) }
   }
 
+  private Element getImmediateChildOfConcreteVarDecl(ConcreteVarDecl e, int index) {
+    exists(
+      int n, int nMember, int nAccessor, int nPropertyWrapperBackingVarBinding,
+      int nPropertyWrapperBackingVar, int nPropertyWrapperProjectionVarBinding,
+      int nPropertyWrapperProjectionVar
+    |
+      n = 0 and
+      nMember = n + e.getNumberOfMembers() and
+      nAccessor = nMember + e.getNumberOfAccessors() and
+      nPropertyWrapperBackingVarBinding = nAccessor + 1 and
+      nPropertyWrapperBackingVar = nPropertyWrapperBackingVarBinding + 1 and
+      nPropertyWrapperProjectionVarBinding = nPropertyWrapperBackingVar + 1 and
+      nPropertyWrapperProjectionVar = nPropertyWrapperProjectionVarBinding + 1 and
+      (
+        none()
+        or
+        result = e.getMember(index - n)
+        or
+        result = e.getAccessor(index - nMember)
+        or
+        index = nAccessor and result = e.getPropertyWrapperBackingVarBinding()
+        or
+        index = nPropertyWrapperBackingVarBinding and result = e.getPropertyWrapperBackingVar()
+        or
+        index = nPropertyWrapperBackingVar and result = e.getPropertyWrapperProjectionVarBinding()
+        or
+        index = nPropertyWrapperProjectionVarBinding and
+        result = e.getPropertyWrapperProjectionVar()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -915,6 +1481,18 @@ module Raw {
     override string toString() { result = "GenericTypeParamDecl" }
   }
 
+  private Element getImmediateChildOfGenericTypeParamDecl(GenericTypeParamDecl e, int index) {
+    exists(int n, int nMember |
+      n = 0 and
+      nMember = n + e.getNumberOfMembers() and
+      (
+        none()
+        or
+        result = e.getMember(index - n)
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -922,6 +1500,35 @@ module Raw {
     override string toString() { result = "NamedFunction" }
   }
 
+  private Element getImmediateChildOfNamedFunction(NamedFunction e, int index) {
+    exists(
+      int n, int nGenericTypeParam, int nMember, int nSelfParam, int nParam, int nBody, int nCapture
+    |
+      n = 0 and
+      nGenericTypeParam = n + e.getNumberOfGenericTypeParams() and
+      nMember = nGenericTypeParam + e.getNumberOfMembers() and
+      nSelfParam = nMember + 1 and
+      nParam = nSelfParam + e.getNumberOfParams() and
+      nBody = nParam + 1 and
+      nCapture = nBody + e.getNumberOfCaptures() and
+      (
+        none()
+        or
+        result = e.getGenericTypeParam(index - n)
+        or
+        result = e.getMember(index - nGenericTypeParam)
+        or
+        index = nMember and result = e.getSelfParam()
+        or
+        result = e.getParam(index - nSelfParam)
+        or
+        index = nParam and result = e.getBody()
+        or
+        result = e.getCapture(index - nBody)
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -958,6 +1565,28 @@ module Raw {
     GenericTypeParamType getOpaqueGenericParam(int index) {
       opaque_type_decl_opaque_generic_params(this, index, result)
     }
+
+    /**
+     * Gets the number of opaque generic parameters of this opaque type declaration.
+     */
+    int getNumberOfOpaqueGenericParams() {
+      result = count(int i | opaque_type_decl_opaque_generic_params(this, i, _))
+    }
+  }
+
+  private Element getImmediateChildOfOpaqueTypeDecl(OpaqueTypeDecl e, int index) {
+    exists(int n, int nGenericTypeParam, int nMember |
+      n = 0 and
+      nGenericTypeParam = n + e.getNumberOfGenericTypeParams() and
+      nMember = nGenericTypeParam + e.getNumberOfMembers() and
+      (
+        none()
+        or
+        result = e.getGenericTypeParam(index - n)
+        or
+        result = e.getMember(index - nGenericTypeParam)
+      )
+    )
   }
 
   /**
@@ -992,6 +1621,47 @@ module Raw {
     }
   }
 
+  private Element getImmediateChildOfParamDecl(ParamDecl e, int index) {
+    exists(
+      int n, int nMember, int nAccessor, int nPropertyWrapperBackingVarBinding,
+      int nPropertyWrapperBackingVar, int nPropertyWrapperProjectionVarBinding,
+      int nPropertyWrapperProjectionVar, int nPropertyWrapperLocalWrappedVarBinding,
+      int nPropertyWrapperLocalWrappedVar
+    |
+      n = 0 and
+      nMember = n + e.getNumberOfMembers() and
+      nAccessor = nMember + e.getNumberOfAccessors() and
+      nPropertyWrapperBackingVarBinding = nAccessor + 1 and
+      nPropertyWrapperBackingVar = nPropertyWrapperBackingVarBinding + 1 and
+      nPropertyWrapperProjectionVarBinding = nPropertyWrapperBackingVar + 1 and
+      nPropertyWrapperProjectionVar = nPropertyWrapperProjectionVarBinding + 1 and
+      nPropertyWrapperLocalWrappedVarBinding = nPropertyWrapperProjectionVar + 1 and
+      nPropertyWrapperLocalWrappedVar = nPropertyWrapperLocalWrappedVarBinding + 1 and
+      (
+        none()
+        or
+        result = e.getMember(index - n)
+        or
+        result = e.getAccessor(index - nMember)
+        or
+        index = nAccessor and result = e.getPropertyWrapperBackingVarBinding()
+        or
+        index = nPropertyWrapperBackingVarBinding and result = e.getPropertyWrapperBackingVar()
+        or
+        index = nPropertyWrapperBackingVar and result = e.getPropertyWrapperProjectionVarBinding()
+        or
+        index = nPropertyWrapperProjectionVarBinding and
+        result = e.getPropertyWrapperProjectionVar()
+        or
+        index = nPropertyWrapperProjectionVar and
+        result = e.getPropertyWrapperLocalWrappedVarBinding()
+        or
+        index = nPropertyWrapperLocalWrappedVarBinding and
+        result = e.getPropertyWrapperLocalWrappedVar()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A declaration of a type alias to another type. For example:
@@ -1013,6 +1683,21 @@ module Raw {
     Type getAliasedType() { type_alias_decls(this, result) }
   }
 
+  private Element getImmediateChildOfTypeAliasDecl(TypeAliasDecl e, int index) {
+    exists(int n, int nGenericTypeParam, int nMember |
+      n = 0 and
+      nGenericTypeParam = n + e.getNumberOfGenericTypeParams() and
+      nMember = nGenericTypeParam + e.getNumberOfMembers() and
+      (
+        none()
+        or
+        result = e.getGenericTypeParam(index - n)
+        or
+        result = e.getMember(index - nGenericTypeParam)
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -1020,6 +1705,21 @@ module Raw {
     override string toString() { result = "ClassDecl" }
   }
 
+  private Element getImmediateChildOfClassDecl(ClassDecl e, int index) {
+    exists(int n, int nGenericTypeParam, int nMember |
+      n = 0 and
+      nGenericTypeParam = n + e.getNumberOfGenericTypeParams() and
+      nMember = nGenericTypeParam + e.getNumberOfMembers() and
+      (
+        none()
+        or
+        result = e.getGenericTypeParam(index - n)
+        or
+        result = e.getMember(index - nGenericTypeParam)
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -1027,6 +1727,21 @@ module Raw {
     override string toString() { result = "EnumDecl" }
   }
 
+  private Element getImmediateChildOfEnumDecl(EnumDecl e, int index) {
+    exists(int n, int nGenericTypeParam, int nMember |
+      n = 0 and
+      nGenericTypeParam = n + e.getNumberOfGenericTypeParams() and
+      nMember = nGenericTypeParam + e.getNumberOfMembers() and
+      (
+        none()
+        or
+        result = e.getGenericTypeParam(index - n)
+        or
+        result = e.getMember(index - nGenericTypeParam)
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -1034,6 +1749,21 @@ module Raw {
     override string toString() { result = "ProtocolDecl" }
   }
 
+  private Element getImmediateChildOfProtocolDecl(ProtocolDecl e, int index) {
+    exists(int n, int nGenericTypeParam, int nMember |
+      n = 0 and
+      nGenericTypeParam = n + e.getNumberOfGenericTypeParams() and
+      nMember = nGenericTypeParam + e.getNumberOfMembers() and
+      (
+        none()
+        or
+        result = e.getGenericTypeParam(index - n)
+        or
+        result = e.getMember(index - nGenericTypeParam)
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -1041,6 +1771,21 @@ module Raw {
     override string toString() { result = "StructDecl" }
   }
 
+  private Element getImmediateChildOfStructDecl(StructDecl e, int index) {
+    exists(int n, int nGenericTypeParam, int nMember |
+      n = 0 and
+      nGenericTypeParam = n + e.getNumberOfGenericTypeParams() and
+      nMember = nGenericTypeParam + e.getNumberOfMembers() and
+      (
+        none()
+        or
+        result = e.getGenericTypeParam(index - n)
+        or
+        result = e.getMember(index - nGenericTypeParam)
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -1058,6 +1803,18 @@ module Raw {
     Expr getExpr() { arguments(this, _, result) }
   }
 
+  private Element getImmediateChildOfArgument(Argument e, int index) {
+    exists(int n, int nExpr |
+      n = 0 and
+      nExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * The base class for all expressions in Swift.
@@ -1106,6 +1863,20 @@ module Raw {
     ParamDecl getParam() { applied_property_wrapper_exprs(this, _, _, result) }
   }
 
+  private Element getImmediateChildOfAppliedPropertyWrapperExpr(
+    AppliedPropertyWrapperExpr e, int index
+  ) {
+    exists(int n, int nValue |
+      n = 0 and
+      nValue = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getValue()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -1119,6 +1890,11 @@ module Raw {
      * Gets the `index`th argument passed to the applied function (0-based).
      */
     Argument getArgument(int index) { apply_expr_arguments(this, index, result) }
+
+    /**
+     * Gets the number of arguments passed to the applied function.
+     */
+    int getNumberOfArguments() { result = count(int i | apply_expr_arguments(this, i, _)) }
   }
 
   /**
@@ -1138,6 +1914,21 @@ module Raw {
     Expr getSource() { assign_exprs(this, _, result) }
   }
 
+  private Element getImmediateChildOfAssignExpr(AssignExpr e, int index) {
+    exists(int n, int nDest, int nSource |
+      n = 0 and
+      nDest = n + 1 and
+      nSource = nDest + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getDest()
+        or
+        index = nDest and result = e.getSource()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -1150,6 +1941,18 @@ module Raw {
     Expr getSubExpr() { bind_optional_exprs(this, result) }
   }
 
+  private Element getImmediateChildOfBindOptionalExpr(BindOptionalExpr e, int index) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -1163,12 +1966,35 @@ module Raw {
       capture_list_expr_binding_decls(this, index, result)
     }
 
+    /**
+     * Gets the number of binding declarations of this capture list expression.
+     */
+    int getNumberOfBindingDecls() {
+      result = count(int i | capture_list_expr_binding_decls(this, i, _))
+    }
+
     /**
      * Gets the closure body of this capture list expression.
      */
     ClosureExpr getClosureBody() { capture_list_exprs(this, result) }
   }
 
+  private Element getImmediateChildOfCaptureListExpr(CaptureListExpr e, int index) {
+    exists(int n, int nBindingDecl, int nVariable, int nClosureBody |
+      n = 0 and
+      nBindingDecl = n + e.getNumberOfBindingDecls() and
+      nVariable = nBindingDecl and
+      nClosureBody = nVariable + 1 and
+      (
+        none()
+        or
+        result = e.getBindingDecl(index - n)
+        or
+        index = nVariable and result = e.getClosureBody()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -1197,6 +2023,18 @@ module Raw {
     Expr getSubExpr() { consume_exprs(this, result) }
   }
 
+  private Element getImmediateChildOfConsumeExpr(ConsumeExpr e, int index) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * An expression that forces value to be copied. In the example below, `copy` marks the copy expression:
@@ -1215,6 +2053,18 @@ module Raw {
     Expr getSubExpr() { copy_exprs(this, result) }
   }
 
+  private Element getImmediateChildOfCopyExpr(CopyExpr e, int index) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * An expression that extracts the actor isolation of the current context, of type `(any Actor)?`.
@@ -1230,6 +2080,12 @@ module Raw {
     Expr getActor() { current_context_isolation_exprs(this, result) }
   }
 
+  private Element getImmediateChildOfCurrentContextIsolationExpr(
+    CurrentContextIsolationExpr e, int index
+  ) {
+    none()
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -1246,6 +2102,13 @@ module Raw {
      */
     Type getReplacementType(int index) { decl_ref_expr_replacement_types(this, index, result) }
 
+    /**
+     * Gets the number of replacement types of this declaration reference expression.
+     */
+    int getNumberOfReplacementTypes() {
+      result = count(int i | decl_ref_expr_replacement_types(this, i, _))
+    }
+
     /**
      * Holds if this declaration reference expression has direct to storage semantics.
      */
@@ -1269,6 +2132,8 @@ module Raw {
     predicate hasDistributedThunkSemantics() { decl_ref_expr_has_distributed_thunk_semantics(this) }
   }
 
+  private Element getImmediateChildOfDeclRefExpr(DeclRefExpr e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -1291,6 +2156,10 @@ module Raw {
     Expr getCallerSideDefault() { default_argument_expr_caller_side_defaults(this, result) }
   }
 
+  private Element getImmediateChildOfDefaultArgumentExpr(DefaultArgumentExpr e, int index) {
+    none()
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -1298,6 +2167,10 @@ module Raw {
     override string toString() { result = "DiscardAssignmentExpr" }
   }
 
+  private Element getImmediateChildOfDiscardAssignmentExpr(DiscardAssignmentExpr e, int index) {
+    none()
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -1315,6 +2188,21 @@ module Raw {
     Expr getSubExpr() { dot_syntax_base_ignored_exprs(this, _, result) }
   }
 
+  private Element getImmediateChildOfDotSyntaxBaseIgnoredExpr(DotSyntaxBaseIgnoredExpr e, int index) {
+    exists(int n, int nQualifier, int nSubExpr |
+      n = 0 and
+      nQualifier = n + 1 and
+      nSubExpr = nQualifier + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getQualifier()
+        or
+        index = nQualifier and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -1327,6 +2215,18 @@ module Raw {
     Expr getBase() { dynamic_type_exprs(this, result) }
   }
 
+  private Element getImmediateChildOfDynamicTypeExpr(DynamicTypeExpr e, int index) {
+    exists(int n, int nBase |
+      n = 0 and
+      nBase = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getBase()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -1344,6 +2244,18 @@ module Raw {
     EnumElementDecl getElement() { enum_is_case_exprs(this, _, result) }
   }
 
+  private Element getImmediateChildOfEnumIsCaseExpr(EnumIsCaseExpr e, int index) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -1351,6 +2263,8 @@ module Raw {
     override string toString() { result = "ErrorExpr" }
   }
 
+  private Element getImmediateChildOfErrorExpr(ErrorExpr e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -1382,6 +2296,20 @@ module Raw {
     Expr getFunctionExpr() { extract_function_isolation_exprs(this, result) }
   }
 
+  private Element getImmediateChildOfExtractFunctionIsolationExpr(
+    ExtractFunctionIsolationExpr e, int index
+  ) {
+    exists(int n, int nFunctionExpr |
+      n = 0 and
+      nFunctionExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getFunctionExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -1394,6 +2322,18 @@ module Raw {
     Expr getSubExpr() { force_value_exprs(this, result) }
   }
 
+  private Element getImmediateChildOfForceValueExpr(ForceValueExpr e, int index) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -1426,6 +2366,24 @@ module Raw {
     Expr getElseExpr() { if_exprs(this, _, _, result) }
   }
 
+  private Element getImmediateChildOfIfExpr(IfExpr e, int index) {
+    exists(int n, int nCondition, int nThenExpr, int nElseExpr |
+      n = 0 and
+      nCondition = n + 1 and
+      nThenExpr = nCondition + 1 and
+      nElseExpr = nThenExpr + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getCondition()
+        or
+        index = nCondition and result = e.getThenExpr()
+        or
+        index = nThenExpr and result = e.getElseExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -1448,6 +2406,18 @@ module Raw {
     Expr getSubExpr() { in_out_exprs(this, result) }
   }
 
+  private Element getImmediateChildOfInOutExpr(InOutExpr e, int index) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -1465,6 +2435,21 @@ module Raw {
     Expr getKeyPath() { key_path_application_exprs(this, _, result) }
   }
 
+  private Element getImmediateChildOfKeyPathApplicationExpr(KeyPathApplicationExpr e, int index) {
+    exists(int n, int nBase, int nKeyPath |
+      n = 0 and
+      nBase = n + 1 and
+      nKeyPath = nBase + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getBase()
+        or
+        index = nBase and result = e.getKeyPath()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -1472,6 +2457,8 @@ module Raw {
     override string toString() { result = "KeyPathDotExpr" }
   }
 
+  private Element getImmediateChildOfKeyPathDotExpr(KeyPathDotExpr e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    * A key-path expression.
@@ -1488,6 +2475,26 @@ module Raw {
      * Gets the `index`th component of this key path expression (0-based).
      */
     KeyPathComponent getComponent(int index) { key_path_expr_components(this, index, result) }
+
+    /**
+     * Gets the number of components of this key path expression.
+     */
+    int getNumberOfComponents() { result = count(int i | key_path_expr_components(this, i, _)) }
+  }
+
+  private Element getImmediateChildOfKeyPathExpr(KeyPathExpr e, int index) {
+    exists(int n, int nRoot, int nComponent |
+      n = 0 and
+      nRoot = n + 1 and
+      nComponent = nRoot + e.getNumberOfComponents() and
+      (
+        none()
+        or
+        index = n and result = e.getRoot()
+        or
+        result = e.getComponent(index - nRoot)
+      )
+    )
   }
 
   /**
@@ -1502,6 +2509,18 @@ module Raw {
     Expr getSubExpr() { lazy_initialization_exprs(this, result) }
   }
 
+  private Element getImmediateChildOfLazyInitializationExpr(LazyInitializationExpr e, int index) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -1544,6 +2563,26 @@ module Raw {
     Expr getSubExpr() { make_temporarily_escapable_exprs(this, _, _, result) }
   }
 
+  private Element getImmediateChildOfMakeTemporarilyEscapableExpr(
+    MakeTemporarilyEscapableExpr e, int index
+  ) {
+    exists(int n, int nEscapingClosure, int nNonescapingClosure, int nSubExpr |
+      n = 0 and
+      nEscapingClosure = n + 1 and
+      nNonescapingClosure = nEscapingClosure + 1 and
+      nSubExpr = nNonescapingClosure + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getEscapingClosure()
+        or
+        index = nEscapingClosure and result = e.getNonescapingClosure()
+        or
+        index = nNonescapingClosure and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * An expression that materializes a pack during expansion. Appears around PackExpansionExpr.
@@ -1560,6 +2599,18 @@ module Raw {
     Expr getSubExpr() { materialize_pack_exprs(this, result) }
   }
 
+  private Element getImmediateChildOfMaterializePackExpr(MaterializePackExpr e, int index) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -1577,6 +2628,18 @@ module Raw {
     Function getMethod() { obj_c_selector_exprs(this, _, result) }
   }
 
+  private Element getImmediateChildOfObjCSelectorExpr(ObjCSelectorExpr e, int index) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -1589,6 +2652,18 @@ module Raw {
     Expr getSubExpr() { one_way_exprs(this, result) }
   }
 
+  private Element getImmediateChildOfOneWayExpr(OneWayExpr e, int index) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -1596,6 +2671,8 @@ module Raw {
     override string toString() { result = "OpaqueValueExpr" }
   }
 
+  private Element getImmediateChildOfOpaqueValueExpr(OpaqueValueExpr e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    * An implicit expression created by the compiler when a method is called on a protocol. For example in
@@ -1631,6 +2708,21 @@ module Raw {
     OpaqueValueExpr getOpaqueExpr() { open_existential_exprs(this, _, _, result) }
   }
 
+  private Element getImmediateChildOfOpenExistentialExpr(OpenExistentialExpr e, int index) {
+    exists(int n, int nSubExpr, int nExistential |
+      n = 0 and
+      nSubExpr = n + 1 and
+      nExistential = nSubExpr + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+        or
+        index = nSubExpr and result = e.getExistential()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -1643,6 +2735,18 @@ module Raw {
     Expr getSubExpr() { optional_evaluation_exprs(this, result) }
   }
 
+  private Element getImmediateChildOfOptionalEvaluationExpr(OptionalEvaluationExpr e, int index) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -1655,6 +2759,10 @@ module Raw {
     Initializer getInitializer() { other_initializer_ref_exprs(this, result) }
   }
 
+  private Element getImmediateChildOfOtherInitializerRefExpr(OtherInitializerRefExpr e, int index) {
+    none()
+  }
+
   /**
    * INTERNAL: Do not use.
    * An ambiguous expression that might refer to multiple declarations. This will be present only
@@ -1669,6 +2777,17 @@ module Raw {
     ValueDecl getPossibleDeclaration(int index) {
       overloaded_decl_ref_expr_possible_declarations(this, index, result)
     }
+
+    /**
+     * Gets the number of possible declarations of this overloaded declaration reference expression.
+     */
+    int getNumberOfPossibleDeclarations() {
+      result = count(int i | overloaded_decl_ref_expr_possible_declarations(this, i, _))
+    }
+  }
+
+  private Element getImmediateChildOfOverloadedDeclRefExpr(OverloadedDeclRefExpr e, int index) {
+    none()
   }
 
   /**
@@ -1694,6 +2813,18 @@ module Raw {
     Expr getSubExpr() { pack_element_exprs(this, result) }
   }
 
+  private Element getImmediateChildOfPackElementExpr(PackElementExpr e, int index) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A pack expansion expression.
@@ -1717,6 +2848,18 @@ module Raw {
     Expr getPatternExpr() { pack_expansion_exprs(this, result) }
   }
 
+  private Element getImmediateChildOfPackExpansionExpr(PackExpansionExpr e, int index) {
+    exists(int n, int nPatternExpr |
+      n = 0 and
+      nPatternExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getPatternExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A placeholder substituting property initializations with `=` when the property has a property
@@ -1736,6 +2879,12 @@ module Raw {
     OpaqueValueExpr getPlaceholder() { property_wrapper_value_placeholder_exprs(this, result) }
   }
 
+  private Element getImmediateChildOfPropertyWrapperValuePlaceholderExpr(
+    PropertyWrapperValuePlaceholderExpr e, int index
+  ) {
+    none()
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -1753,6 +2902,20 @@ module Raw {
     VarDecl getSelf() { rebind_self_in_initializer_exprs(this, _, result) }
   }
 
+  private Element getImmediateChildOfRebindSelfInInitializerExpr(
+    RebindSelfInInitializerExpr e, int index
+  ) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -1763,6 +2926,23 @@ module Raw {
      * Gets the `index`th element of this sequence expression (0-based).
      */
     Expr getElement(int index) { sequence_expr_elements(this, index, result) }
+
+    /**
+     * Gets the number of elements of this sequence expression.
+     */
+    int getNumberOfElements() { result = count(int i | sequence_expr_elements(this, i, _)) }
+  }
+
+  private Element getImmediateChildOfSequenceExpr(SequenceExpr e, int index) {
+    exists(int n, int nElement |
+      n = 0 and
+      nElement = n + e.getNumberOfElements() and
+      (
+        none()
+        or
+        result = e.getElement(index - n)
+      )
+    )
   }
 
   /**
@@ -1778,6 +2958,18 @@ module Raw {
     Stmt getStmt() { single_value_stmt_exprs(this, result) }
   }
 
+  private Element getImmediateChildOfSingleValueStmtExpr(SingleValueStmtExpr e, int index) {
+    exists(int n, int nStmt |
+      n = 0 and
+      nStmt = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getStmt()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -1790,6 +2982,8 @@ module Raw {
     VarDecl getSelf() { super_ref_exprs(this, result) }
   }
 
+  private Element getImmediateChildOfSuperRefExpr(SuperRefExpr e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -1812,6 +3006,21 @@ module Raw {
     VarDecl getVar() { tap_exprs(this, _, result) }
   }
 
+  private Element getImmediateChildOfTapExpr(TapExpr e, int index) {
+    exists(int n, int nSubExpr, int nBody |
+      n = 0 and
+      nSubExpr = n + 1 and
+      nBody = nSubExpr + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+        or
+        index = nSubExpr and result = e.getBody()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -1829,6 +3038,18 @@ module Raw {
     int getIndex() { tuple_element_exprs(this, _, result) }
   }
 
+  private Element getImmediateChildOfTupleElementExpr(TupleElementExpr e, int index) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -1839,6 +3060,23 @@ module Raw {
      * Gets the `index`th element of this tuple expression (0-based).
      */
     Expr getElement(int index) { tuple_expr_elements(this, index, result) }
+
+    /**
+     * Gets the number of elements of this tuple expression.
+     */
+    int getNumberOfElements() { result = count(int i | tuple_expr_elements(this, i, _)) }
+  }
+
+  private Element getImmediateChildOfTupleExpr(TupleExpr e, int index) {
+    exists(int n, int nElement |
+      n = 0 and
+      nElement = n + e.getNumberOfElements() and
+      (
+        none()
+        or
+        result = e.getElement(index - n)
+      )
+    )
   }
 
   /**
@@ -1853,6 +3091,18 @@ module Raw {
     TypeRepr getTypeRepr() { type_expr_type_reprs(this, result) }
   }
 
+  private Element getImmediateChildOfTypeExpr(TypeExpr e, int index) {
+    exists(int n, int nTypeRepr |
+      n = 0 and
+      nTypeRepr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getTypeRepr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -1865,6 +3115,18 @@ module Raw {
     TypeRepr getTypeRepr() { type_value_exprs(this, result) }
   }
 
+  private Element getImmediateChildOfTypeValueExpr(TypeValueExpr e, int index) {
+    exists(int n, int nTypeRepr |
+      n = 0 and
+      nTypeRepr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getTypeRepr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -1877,6 +3139,10 @@ module Raw {
     string getName() { unresolved_decl_ref_expr_names(this, result) }
   }
 
+  private Element getImmediateChildOfUnresolvedDeclRefExpr(UnresolvedDeclRefExpr e, int index) {
+    none()
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -1894,6 +3160,18 @@ module Raw {
     string getName() { unresolved_dot_exprs(this, _, result) }
   }
 
+  private Element getImmediateChildOfUnresolvedDotExpr(UnresolvedDotExpr e, int index) {
+    exists(int n, int nBase |
+      n = 0 and
+      nBase = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getBase()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -1906,6 +3184,10 @@ module Raw {
     string getName() { unresolved_member_exprs(this, result) }
   }
 
+  private Element getImmediateChildOfUnresolvedMemberExpr(UnresolvedMemberExpr e, int index) {
+    none()
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -1918,6 +3200,18 @@ module Raw {
     Pattern getSubPattern() { unresolved_pattern_exprs(this, result) }
   }
 
+  private Element getImmediateChildOfUnresolvedPatternExpr(UnresolvedPatternExpr e, int index) {
+    exists(int n, int nSubPattern |
+      n = 0 and
+      nSubPattern = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubPattern()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -1930,6 +3224,18 @@ module Raw {
     Expr getSubExpr() { unresolved_specialize_exprs(this, result) }
   }
 
+  private Element getImmediateChildOfUnresolvedSpecializeExpr(UnresolvedSpecializeExpr e, int index) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -1942,6 +3248,18 @@ module Raw {
     Expr getSubExpr() { vararg_expansion_exprs(this, result) }
   }
 
+  private Element getImmediateChildOfVarargExpansionExpr(VarargExpansionExpr e, int index) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -1949,6 +3267,18 @@ module Raw {
     override string toString() { result = "AbiSafeConversionExpr" }
   }
 
+  private Element getImmediateChildOfAbiSafeConversionExpr(AbiSafeConversionExpr e, int index) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A conversion that erases the actor isolation of an expression with `@isolated(any)` function
@@ -1958,6 +3288,20 @@ module Raw {
     override string toString() { result = "ActorIsolationErasureExpr" }
   }
 
+  private Element getImmediateChildOfActorIsolationErasureExpr(
+    ActorIsolationErasureExpr e, int index
+  ) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -1965,6 +3309,18 @@ module Raw {
     override string toString() { result = "AnyHashableErasureExpr" }
   }
 
+  private Element getImmediateChildOfAnyHashableErasureExpr(AnyHashableErasureExpr e, int index) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -1972,6 +3328,18 @@ module Raw {
     override string toString() { result = "ArchetypeToSuperExpr" }
   }
 
+  private Element getImmediateChildOfArchetypeToSuperExpr(ArchetypeToSuperExpr e, int index) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -1982,6 +3350,23 @@ module Raw {
      * Gets the `index`th element of this array expression (0-based).
      */
     Expr getElement(int index) { array_expr_elements(this, index, result) }
+
+    /**
+     * Gets the number of elements of this array expression.
+     */
+    int getNumberOfElements() { result = count(int i | array_expr_elements(this, i, _)) }
+  }
+
+  private Element getImmediateChildOfArrayExpr(ArrayExpr e, int index) {
+    exists(int n, int nElement |
+      n = 0 and
+      nElement = n + e.getNumberOfElements() and
+      (
+        none()
+        or
+        result = e.getElement(index - n)
+      )
+    )
   }
 
   /**
@@ -1991,6 +3376,18 @@ module Raw {
     override string toString() { result = "ArrayToPointerExpr" }
   }
 
+  private Element getImmediateChildOfArrayToPointerExpr(ArrayToPointerExpr e, int index) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -1998,6 +3395,27 @@ module Raw {
     override string toString() { result = "AutoClosureExpr" }
   }
 
+  private Element getImmediateChildOfAutoClosureExpr(AutoClosureExpr e, int index) {
+    exists(int n, int nSelfParam, int nParam, int nBody, int nCapture |
+      n = 0 and
+      nSelfParam = n + 1 and
+      nParam = nSelfParam + e.getNumberOfParams() and
+      nBody = nParam + 1 and
+      nCapture = nBody + e.getNumberOfCaptures() and
+      (
+        none()
+        or
+        index = n and result = e.getSelfParam()
+        or
+        result = e.getParam(index - nSelfParam)
+        or
+        index = nParam and result = e.getBody()
+        or
+        result = e.getCapture(index - nBody)
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2005,6 +3423,18 @@ module Raw {
     override string toString() { result = "AwaitExpr" }
   }
 
+  private Element getImmediateChildOfAwaitExpr(AwaitExpr e, int index) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2012,6 +3442,21 @@ module Raw {
     override string toString() { result = "BinaryExpr" }
   }
 
+  private Element getImmediateChildOfBinaryExpr(BinaryExpr e, int index) {
+    exists(int n, int nFunction, int nArgument |
+      n = 0 and
+      nFunction = n + 1 and
+      nArgument = nFunction + e.getNumberOfArguments() and
+      (
+        none()
+        or
+        index = n and result = e.getFunction()
+        or
+        result = e.getArgument(index - nFunction)
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * An expression that marks value as borrowed. In the example below, `_borrow` marks the borrow expression:
@@ -2025,6 +3470,18 @@ module Raw {
     override string toString() { result = "BorrowExpr" }
   }
 
+  private Element getImmediateChildOfBorrowExpr(BorrowExpr e, int index) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2032,6 +3489,18 @@ module Raw {
     override string toString() { result = "BridgeFromObjCExpr" }
   }
 
+  private Element getImmediateChildOfBridgeFromObjCExpr(BridgeFromObjCExpr e, int index) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2039,6 +3508,18 @@ module Raw {
     override string toString() { result = "BridgeToObjCExpr" }
   }
 
+  private Element getImmediateChildOfBridgeToObjCExpr(BridgeToObjCExpr e, int index) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2051,6 +3532,21 @@ module Raw {
     override string toString() { result = "CallExpr" }
   }
 
+  private Element getImmediateChildOfCallExpr(CallExpr e, int index) {
+    exists(int n, int nFunction, int nArgument |
+      n = 0 and
+      nFunction = n + 1 and
+      nArgument = nFunction + e.getNumberOfArguments() and
+      (
+        none()
+        or
+        index = n and result = e.getFunction()
+        or
+        result = e.getArgument(index - nFunction)
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2063,6 +3559,20 @@ module Raw {
     override string toString() { result = "ClassMetatypeToObjectExpr" }
   }
 
+  private Element getImmediateChildOfClassMetatypeToObjectExpr(
+    ClassMetatypeToObjectExpr e, int index
+  ) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2070,6 +3580,18 @@ module Raw {
     override string toString() { result = "CoerceExpr" }
   }
 
+  private Element getImmediateChildOfCoerceExpr(CoerceExpr e, int index) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2079,6 +3601,20 @@ module Raw {
     override string toString() { result = "CollectionUpcastConversionExpr" }
   }
 
+  private Element getImmediateChildOfCollectionUpcastConversionExpr(
+    CollectionUpcastConversionExpr e, int index
+  ) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2088,6 +3624,20 @@ module Raw {
     override string toString() { result = "ConditionalBridgeFromObjCExpr" }
   }
 
+  private Element getImmediateChildOfConditionalBridgeFromObjCExpr(
+    ConditionalBridgeFromObjCExpr e, int index
+  ) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2097,6 +3647,20 @@ module Raw {
     override string toString() { result = "CovariantFunctionConversionExpr" }
   }
 
+  private Element getImmediateChildOfCovariantFunctionConversionExpr(
+    CovariantFunctionConversionExpr e, int index
+  ) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2106,6 +3670,20 @@ module Raw {
     override string toString() { result = "CovariantReturnConversionExpr" }
   }
 
+  private Element getImmediateChildOfCovariantReturnConversionExpr(
+    CovariantReturnConversionExpr e, int index
+  ) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2113,6 +3691,18 @@ module Raw {
     override string toString() { result = "DerivedToBaseExpr" }
   }
 
+  private Element getImmediateChildOfDerivedToBaseExpr(DerivedToBaseExpr e, int index) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2120,6 +3710,18 @@ module Raw {
     override string toString() { result = "DestructureTupleExpr" }
   }
 
+  private Element getImmediateChildOfDestructureTupleExpr(DestructureTupleExpr e, int index) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2130,6 +3732,23 @@ module Raw {
      * Gets the `index`th element of this dictionary expression (0-based).
      */
     Expr getElement(int index) { dictionary_expr_elements(this, index, result) }
+
+    /**
+     * Gets the number of elements of this dictionary expression.
+     */
+    int getNumberOfElements() { result = count(int i | dictionary_expr_elements(this, i, _)) }
+  }
+
+  private Element getImmediateChildOfDictionaryExpr(DictionaryExpr e, int index) {
+    exists(int n, int nElement |
+      n = 0 and
+      nElement = n + e.getNumberOfElements() and
+      (
+        none()
+        or
+        result = e.getElement(index - n)
+      )
+    )
   }
 
   /**
@@ -2139,6 +3758,20 @@ module Raw {
     override string toString() { result = "DifferentiableFunctionExpr" }
   }
 
+  private Element getImmediateChildOfDifferentiableFunctionExpr(
+    DifferentiableFunctionExpr e, int index
+  ) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2148,6 +3781,20 @@ module Raw {
     override string toString() { result = "DifferentiableFunctionExtractOriginalExpr" }
   }
 
+  private Element getImmediateChildOfDifferentiableFunctionExtractOriginalExpr(
+    DifferentiableFunctionExtractOriginalExpr e, int index
+  ) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2155,6 +3802,18 @@ module Raw {
     override string toString() { result = "DotSelfExpr" }
   }
 
+  private Element getImmediateChildOfDotSelfExpr(DotSelfExpr e, int index) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2167,6 +3826,18 @@ module Raw {
     override string toString() { result = "ErasureExpr" }
   }
 
+  private Element getImmediateChildOfErasureExpr(ErasureExpr e, int index) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2176,6 +3847,20 @@ module Raw {
     override string toString() { result = "ExistentialMetatypeToObjectExpr" }
   }
 
+  private Element getImmediateChildOfExistentialMetatypeToObjectExpr(
+    ExistentialMetatypeToObjectExpr e, int index
+  ) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2183,6 +3868,27 @@ module Raw {
     override string toString() { result = "ExplicitClosureExpr" }
   }
 
+  private Element getImmediateChildOfExplicitClosureExpr(ExplicitClosureExpr e, int index) {
+    exists(int n, int nSelfParam, int nParam, int nBody, int nCapture |
+      n = 0 and
+      nSelfParam = n + 1 and
+      nParam = nSelfParam + e.getNumberOfParams() and
+      nBody = nParam + 1 and
+      nCapture = nBody + e.getNumberOfCaptures() and
+      (
+        none()
+        or
+        index = n and result = e.getSelfParam()
+        or
+        result = e.getParam(index - nSelfParam)
+        or
+        index = nParam and result = e.getBody()
+        or
+        result = e.getCapture(index - nBody)
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2190,6 +3896,18 @@ module Raw {
     override string toString() { result = "ForceTryExpr" }
   }
 
+  private Element getImmediateChildOfForceTryExpr(ForceTryExpr e, int index) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2197,6 +3915,20 @@ module Raw {
     override string toString() { result = "ForeignObjectConversionExpr" }
   }
 
+  private Element getImmediateChildOfForeignObjectConversionExpr(
+    ForeignObjectConversionExpr e, int index
+  ) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2204,6 +3936,18 @@ module Raw {
     override string toString() { result = "FunctionConversionExpr" }
   }
 
+  private Element getImmediateChildOfFunctionConversionExpr(FunctionConversionExpr e, int index) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2211,6 +3955,18 @@ module Raw {
     override string toString() { result = "InOutToPointerExpr" }
   }
 
+  private Element getImmediateChildOfInOutToPointerExpr(InOutToPointerExpr e, int index) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2218,6 +3974,18 @@ module Raw {
     override string toString() { result = "InjectIntoOptionalExpr" }
   }
 
+  private Element getImmediateChildOfInjectIntoOptionalExpr(InjectIntoOptionalExpr e, int index) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2237,6 +4005,20 @@ module Raw {
     TapExpr getAppendingExpr() { interpolated_string_literal_expr_appending_exprs(this, result) }
   }
 
+  private Element getImmediateChildOfInterpolatedStringLiteralExpr(
+    InterpolatedStringLiteralExpr e, int index
+  ) {
+    exists(int n, int nAppendingExpr |
+      n = 0 and
+      nAppendingExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getAppendingExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2244,6 +4026,18 @@ module Raw {
     override string toString() { result = "LinearFunctionExpr" }
   }
 
+  private Element getImmediateChildOfLinearFunctionExpr(LinearFunctionExpr e, int index) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2253,6 +4047,20 @@ module Raw {
     override string toString() { result = "LinearFunctionExtractOriginalExpr" }
   }
 
+  private Element getImmediateChildOfLinearFunctionExtractOriginalExpr(
+    LinearFunctionExtractOriginalExpr e, int index
+  ) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2262,6 +4070,20 @@ module Raw {
     override string toString() { result = "LinearToDifferentiableFunctionExpr" }
   }
 
+  private Element getImmediateChildOfLinearToDifferentiableFunctionExpr(
+    LinearToDifferentiableFunctionExpr e, int index
+  ) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2269,6 +4091,18 @@ module Raw {
     override string toString() { result = "LoadExpr" }
   }
 
+  private Element getImmediateChildOfLoadExpr(LoadExpr e, int index) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2302,6 +4136,18 @@ module Raw {
     }
   }
 
+  private Element getImmediateChildOfMemberRefExpr(MemberRefExpr e, int index) {
+    exists(int n, int nBase |
+      n = 0 and
+      nBase = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getBase()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2309,6 +4155,18 @@ module Raw {
     override string toString() { result = "MetatypeConversionExpr" }
   }
 
+  private Element getImmediateChildOfMetatypeConversionExpr(MetatypeConversionExpr e, int index) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2316,6 +4174,8 @@ module Raw {
     override string toString() { result = "NilLiteralExpr" }
   }
 
+  private Element getImmediateChildOfNilLiteralExpr(NilLiteralExpr e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    * An instance of `#fileLiteral`, `#imageLiteral` or `#colorLiteral` expressions, which are used in playgrounds.
@@ -2334,6 +4194,23 @@ module Raw {
      * Gets the `index`th argument of this object literal expression (0-based).
      */
     Argument getArgument(int index) { object_literal_expr_arguments(this, index, result) }
+
+    /**
+     * Gets the number of arguments of this object literal expression.
+     */
+    int getNumberOfArguments() { result = count(int i | object_literal_expr_arguments(this, i, _)) }
+  }
+
+  private Element getImmediateChildOfObjectLiteralExpr(ObjectLiteralExpr e, int index) {
+    exists(int n, int nArgument |
+      n = 0 and
+      nArgument = n + e.getNumberOfArguments() and
+      (
+        none()
+        or
+        result = e.getArgument(index - n)
+      )
+    )
   }
 
   /**
@@ -2343,6 +4220,18 @@ module Raw {
     override string toString() { result = "OptionalTryExpr" }
   }
 
+  private Element getImmediateChildOfOptionalTryExpr(OptionalTryExpr e, int index) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2350,6 +4239,18 @@ module Raw {
     override string toString() { result = "ParenExpr" }
   }
 
+  private Element getImmediateChildOfParenExpr(ParenExpr e, int index) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2357,6 +4258,18 @@ module Raw {
     override string toString() { result = "PointerToPointerExpr" }
   }
 
+  private Element getImmediateChildOfPointerToPointerExpr(PointerToPointerExpr e, int index) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2364,6 +4277,21 @@ module Raw {
     override string toString() { result = "PostfixUnaryExpr" }
   }
 
+  private Element getImmediateChildOfPostfixUnaryExpr(PostfixUnaryExpr e, int index) {
+    exists(int n, int nFunction, int nArgument |
+      n = 0 and
+      nFunction = n + 1 and
+      nArgument = nFunction + e.getNumberOfArguments() and
+      (
+        none()
+        or
+        index = n and result = e.getFunction()
+        or
+        result = e.getArgument(index - nFunction)
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2371,6 +4299,21 @@ module Raw {
     override string toString() { result = "PrefixUnaryExpr" }
   }
 
+  private Element getImmediateChildOfPrefixUnaryExpr(PrefixUnaryExpr e, int index) {
+    exists(int n, int nFunction, int nArgument |
+      n = 0 and
+      nFunction = n + 1 and
+      nArgument = nFunction + e.getNumberOfArguments() and
+      (
+        none()
+        or
+        index = n and result = e.getFunction()
+        or
+        result = e.getArgument(index - nFunction)
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2380,6 +4323,20 @@ module Raw {
     override string toString() { result = "ProtocolMetatypeToObjectExpr" }
   }
 
+  private Element getImmediateChildOfProtocolMetatypeToObjectExpr(
+    ProtocolMetatypeToObjectExpr e, int index
+  ) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A regular expression literal which is checked at compile time, for example `/a(a|b)*b/`.
@@ -2398,6 +4355,8 @@ module Raw {
     int getVersion() { regex_literal_exprs(this, _, result) }
   }
 
+  private Element getImmediateChildOfRegexLiteralExpr(RegexLiteralExpr e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    * An internal raw instance of method lookups like `x.foo` in `x.foo()`.
@@ -2417,6 +4376,18 @@ module Raw {
     override string toString() { result = "StringToPointerExpr" }
   }
 
+  private Element getImmediateChildOfStringToPointerExpr(StringToPointerExpr e, int index) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2428,6 +4399,11 @@ module Raw {
      */
     Argument getArgument(int index) { subscript_expr_arguments(this, index, result) }
 
+    /**
+     * Gets the number of arguments of this subscript expression.
+     */
+    int getNumberOfArguments() { result = count(int i | subscript_expr_arguments(this, i, _)) }
+
     /**
      * Holds if this subscript expression has direct to storage semantics.
      */
@@ -2453,6 +4429,21 @@ module Raw {
     }
   }
 
+  private Element getImmediateChildOfSubscriptExpr(SubscriptExpr e, int index) {
+    exists(int n, int nBase, int nArgument |
+      n = 0 and
+      nBase = n + 1 and
+      nArgument = nBase + e.getNumberOfArguments() and
+      (
+        none()
+        or
+        index = n and result = e.getBase()
+        or
+        result = e.getArgument(index - nBase)
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2460,6 +4451,18 @@ module Raw {
     override string toString() { result = "TryExpr" }
   }
 
+  private Element getImmediateChildOfTryExpr(TryExpr e, int index) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2467,6 +4470,18 @@ module Raw {
     override string toString() { result = "UnderlyingToOpaqueExpr" }
   }
 
+  private Element getImmediateChildOfUnderlyingToOpaqueExpr(UnderlyingToOpaqueExpr e, int index) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2474,6 +4489,18 @@ module Raw {
     override string toString() { result = "UnevaluatedInstanceExpr" }
   }
 
+  private Element getImmediateChildOfUnevaluatedInstanceExpr(UnevaluatedInstanceExpr e, int index) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A conversion from the uninhabited type to any other type. It's never evaluated.
@@ -2482,6 +4509,18 @@ module Raw {
     override string toString() { result = "UnreachableExpr" }
   }
 
+  private Element getImmediateChildOfUnreachableExpr(UnreachableExpr e, int index) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2491,6 +4530,20 @@ module Raw {
     override string toString() { result = "UnresolvedMemberChainResultExpr" }
   }
 
+  private Element getImmediateChildOfUnresolvedMemberChainResultExpr(
+    UnresolvedMemberChainResultExpr e, int index
+  ) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2500,6 +4553,20 @@ module Raw {
     override string toString() { result = "UnresolvedTypeConversionExpr" }
   }
 
+  private Element getImmediateChildOfUnresolvedTypeConversionExpr(
+    UnresolvedTypeConversionExpr e, int index
+  ) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A conversion that performs an unsafe bitcast.
@@ -2508,6 +4575,37 @@ module Raw {
     override string toString() { result = "UnsafeCastExpr" }
   }
 
+  private Element getImmediateChildOfUnsafeCastExpr(UnsafeCastExpr e, int index) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class UnsafeExpr extends @unsafe_expr, IdentityExpr {
+    override string toString() { result = "UnsafeExpr" }
+  }
+
+  private Element getImmediateChildOfUnsafeExpr(UnsafeExpr e, int index) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2520,6 +4618,8 @@ module Raw {
     boolean getValue() { boolean_literal_exprs(this, result) }
   }
 
+  private Element getImmediateChildOfBooleanLiteralExpr(BooleanLiteralExpr e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2527,6 +4627,20 @@ module Raw {
     override string toString() { result = "ConditionalCheckedCastExpr" }
   }
 
+  private Element getImmediateChildOfConditionalCheckedCastExpr(
+    ConditionalCheckedCastExpr e, int index
+  ) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2534,6 +4648,21 @@ module Raw {
     override string toString() { result = "DotSyntaxCallExpr" }
   }
 
+  private Element getImmediateChildOfDotSyntaxCallExpr(DotSyntaxCallExpr e, int index) {
+    exists(int n, int nFunction, int nArgument |
+      n = 0 and
+      nFunction = n + 1 and
+      nArgument = nFunction + e.getNumberOfArguments() and
+      (
+        none()
+        or
+        index = n and result = e.getFunction()
+        or
+        result = e.getArgument(index - nFunction)
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2541,6 +4670,18 @@ module Raw {
     override string toString() { result = "DynamicMemberRefExpr" }
   }
 
+  private Element getImmediateChildOfDynamicMemberRefExpr(DynamicMemberRefExpr e, int index) {
+    exists(int n, int nBase |
+      n = 0 and
+      nBase = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getBase()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2548,6 +4689,18 @@ module Raw {
     override string toString() { result = "DynamicSubscriptExpr" }
   }
 
+  private Element getImmediateChildOfDynamicSubscriptExpr(DynamicSubscriptExpr e, int index) {
+    exists(int n, int nBase |
+      n = 0 and
+      nBase = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getBase()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2555,6 +4708,18 @@ module Raw {
     override string toString() { result = "ForcedCheckedCastExpr" }
   }
 
+  private Element getImmediateChildOfForcedCheckedCastExpr(ForcedCheckedCastExpr e, int index) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2562,6 +4727,21 @@ module Raw {
     override string toString() { result = "InitializerRefCallExpr" }
   }
 
+  private Element getImmediateChildOfInitializerRefCallExpr(InitializerRefCallExpr e, int index) {
+    exists(int n, int nFunction, int nArgument |
+      n = 0 and
+      nFunction = n + 1 and
+      nArgument = nFunction + e.getNumberOfArguments() and
+      (
+        none()
+        or
+        index = n and result = e.getFunction()
+        or
+        result = e.getArgument(index - nFunction)
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2569,6 +4749,18 @@ module Raw {
     override string toString() { result = "IsExpr" }
   }
 
+  private Element getImmediateChildOfIsExpr(IsExpr e, int index) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2581,6 +4773,12 @@ module Raw {
     string getKind() { magic_identifier_literal_exprs(this, result) }
   }
 
+  private Element getImmediateChildOfMagicIdentifierLiteralExpr(
+    MagicIdentifierLiteralExpr e, int index
+  ) {
+    none()
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2598,6 +4796,8 @@ module Raw {
     string getValue() { string_literal_exprs(this, result) }
   }
 
+  private Element getImmediateChildOfStringLiteralExpr(StringLiteralExpr e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2610,6 +4810,8 @@ module Raw {
     string getStringValue() { float_literal_exprs(this, result) }
   }
 
+  private Element getImmediateChildOfFloatLiteralExpr(FloatLiteralExpr e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2622,6 +4824,8 @@ module Raw {
     string getStringValue() { integer_literal_exprs(this, result) }
   }
 
+  private Element getImmediateChildOfIntegerLiteralExpr(IntegerLiteralExpr e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2639,6 +4843,8 @@ module Raw {
     override string toString() { result = "AnyPattern" }
   }
 
+  private Element getImmediateChildOfAnyPattern(AnyPattern e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2651,6 +4857,18 @@ module Raw {
     Pattern getSubPattern() { binding_patterns(this, result) }
   }
 
+  private Element getImmediateChildOfBindingPattern(BindingPattern e, int index) {
+    exists(int n, int nSubPattern |
+      n = 0 and
+      nSubPattern = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubPattern()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2663,6 +4881,8 @@ module Raw {
     boolean getValue() { bool_patterns(this, result) }
   }
 
+  private Element getImmediateChildOfBoolPattern(BoolPattern e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2680,6 +4900,18 @@ module Raw {
     Pattern getSubPattern() { enum_element_pattern_sub_patterns(this, result) }
   }
 
+  private Element getImmediateChildOfEnumElementPattern(EnumElementPattern e, int index) {
+    exists(int n, int nSubPattern |
+      n = 0 and
+      nSubPattern = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubPattern()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2692,6 +4924,18 @@ module Raw {
     Expr getSubExpr() { expr_patterns(this, result) }
   }
 
+  private Element getImmediateChildOfExprPattern(ExprPattern e, int index) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2709,6 +4953,21 @@ module Raw {
     Pattern getSubPattern() { is_pattern_sub_patterns(this, result) }
   }
 
+  private Element getImmediateChildOfIsPattern(IsPattern e, int index) {
+    exists(int n, int nCastTypeRepr, int nSubPattern |
+      n = 0 and
+      nCastTypeRepr = n + 1 and
+      nSubPattern = nCastTypeRepr + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getCastTypeRepr()
+        or
+        index = nCastTypeRepr and result = e.getSubPattern()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2721,6 +4980,8 @@ module Raw {
     VarDecl getVarDecl() { named_patterns(this, result) }
   }
 
+  private Element getImmediateChildOfNamedPattern(NamedPattern e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2733,6 +4994,18 @@ module Raw {
     Pattern getSubPattern() { optional_some_patterns(this, result) }
   }
 
+  private Element getImmediateChildOfOptionalSomePattern(OptionalSomePattern e, int index) {
+    exists(int n, int nSubPattern |
+      n = 0 and
+      nSubPattern = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubPattern()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2745,6 +5018,18 @@ module Raw {
     Pattern getSubPattern() { paren_patterns(this, result) }
   }
 
+  private Element getImmediateChildOfParenPattern(ParenPattern e, int index) {
+    exists(int n, int nSubPattern |
+      n = 0 and
+      nSubPattern = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubPattern()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2755,6 +5040,23 @@ module Raw {
      * Gets the `index`th element of this tuple pattern (0-based).
      */
     Pattern getElement(int index) { tuple_pattern_elements(this, index, result) }
+
+    /**
+     * Gets the number of elements of this tuple pattern.
+     */
+    int getNumberOfElements() { result = count(int i | tuple_pattern_elements(this, i, _)) }
+  }
+
+  private Element getImmediateChildOfTuplePattern(TuplePattern e, int index) {
+    exists(int n, int nElement |
+      n = 0 and
+      nElement = n + e.getNumberOfElements() and
+      (
+        none()
+        or
+        result = e.getElement(index - n)
+      )
+    )
   }
 
   /**
@@ -2774,6 +5076,21 @@ module Raw {
     TypeRepr getTypeRepr() { typed_pattern_type_reprs(this, result) }
   }
 
+  private Element getImmediateChildOfTypedPattern(TypedPattern e, int index) {
+    exists(int n, int nSubPattern, int nTypeRepr |
+      n = 0 and
+      nSubPattern = n + 1 and
+      nTypeRepr = nSubPattern + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubPattern()
+        or
+        index = nSubPattern and result = e.getTypeRepr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2791,6 +5108,21 @@ module Raw {
     Expr getGuard() { case_label_item_guards(this, result) }
   }
 
+  private Element getImmediateChildOfCaseLabelItem(CaseLabelItem e, int index) {
+    exists(int n, int nPattern, int nGuard |
+      n = 0 and
+      nPattern = n + 1 and
+      nGuard = nPattern + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getPattern()
+        or
+        index = nPattern and result = e.getGuard()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2818,6 +5150,27 @@ module Raw {
     AvailabilityInfo getAvailability() { condition_element_availabilities(this, result) }
   }
 
+  private Element getImmediateChildOfConditionElement(ConditionElement e, int index) {
+    exists(int n, int nBoolean, int nPattern, int nInitializer, int nAvailability |
+      n = 0 and
+      nBoolean = n + 1 and
+      nPattern = nBoolean + 1 and
+      nInitializer = nPattern + 1 and
+      nAvailability = nInitializer + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getBoolean()
+        or
+        index = nBoolean and result = e.getPattern()
+        or
+        index = nPattern and result = e.getInitializer()
+        or
+        index = nInitializer and result = e.getAvailability()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2833,6 +5186,23 @@ module Raw {
      * Gets the `index`th element of this statement condition (0-based).
      */
     ConditionElement getElement(int index) { stmt_condition_elements(this, index, result) }
+
+    /**
+     * Gets the number of elements of this statement condition.
+     */
+    int getNumberOfElements() { result = count(int i | stmt_condition_elements(this, i, _)) }
+  }
+
+  private Element getImmediateChildOfStmtCondition(StmtCondition e, int index) {
+    exists(int n, int nElement |
+      n = 0 and
+      nElement = n + e.getNumberOfElements() and
+      (
+        none()
+        or
+        result = e.getElement(index - n)
+      )
+    )
   }
 
   /**
@@ -2845,6 +5215,24 @@ module Raw {
      * Gets the `index`th element of this brace statement (0-based).
      */
     AstNode getElement(int index) { brace_stmt_elements(this, index, result) }
+
+    /**
+     * Gets the number of elements of this brace statement.
+     */
+    int getNumberOfElements() { result = count(int i | brace_stmt_elements(this, i, _)) }
+  }
+
+  private Element getImmediateChildOfBraceStmt(BraceStmt e, int index) {
+    exists(int n, int nVariable, int nElement |
+      n = 0 and
+      nVariable = n and
+      nElement = nVariable + e.getNumberOfElements() and
+      (
+        none()
+        or
+        result = e.getElement(index - nVariable)
+      )
+    )
   }
 
   /**
@@ -2864,6 +5252,8 @@ module Raw {
     Stmt getTarget() { break_stmt_targets(this, result) }
   }
 
+  private Element getImmediateChildOfBreakStmt(BreakStmt e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2875,17 +5265,45 @@ module Raw {
      */
     CaseLabelItem getLabel(int index) { case_stmt_labels(this, index, result) }
 
+    /**
+     * Gets the number of labels of this case statement.
+     */
+    int getNumberOfLabels() { result = count(int i | case_stmt_labels(this, i, _)) }
+
     /**
      * Gets the `index`th variable of this case statement (0-based).
      */
     VarDecl getVariable(int index) { case_stmt_variables(this, index, result) }
 
+    /**
+     * Gets the number of variables of this case statement.
+     */
+    int getNumberOfVariables() { result = count(int i | case_stmt_variables(this, i, _)) }
+
     /**
      * Gets the body of this case statement.
      */
     Stmt getBody() { case_stmts(this, result) }
   }
 
+  private Element getImmediateChildOfCaseStmt(CaseStmt e, int index) {
+    exists(int n, int nLabel, int nVariable, int nBody |
+      n = 0 and
+      nLabel = n + e.getNumberOfLabels() and
+      nVariable = nLabel + e.getNumberOfVariables() and
+      nBody = nVariable + 1 and
+      (
+        none()
+        or
+        result = e.getLabel(index - n)
+        or
+        result = e.getVariable(index - nLabel)
+        or
+        index = nVariable and result = e.getBody()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2903,6 +5321,8 @@ module Raw {
     Stmt getTarget() { continue_stmt_targets(this, result) }
   }
 
+  private Element getImmediateChildOfContinueStmt(ContinueStmt e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2915,6 +5335,18 @@ module Raw {
     BraceStmt getBody() { defer_stmts(this, result) }
   }
 
+  private Element getImmediateChildOfDeferStmt(DeferStmt e, int index) {
+    exists(int n, int nBody |
+      n = 0 and
+      nBody = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getBody()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A statement that takes a non-copyable value and destructs its members/fields.
@@ -2933,6 +5365,18 @@ module Raw {
     Expr getSubExpr() { discard_stmts(this, result) }
   }
 
+  private Element getImmediateChildOfDiscardStmt(DiscardStmt e, int index) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2940,6 +5384,8 @@ module Raw {
     override string toString() { result = "FailStmt" }
   }
 
+  private Element getImmediateChildOfFailStmt(FailStmt e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2957,6 +5403,8 @@ module Raw {
     CaseStmt getFallthroughDest() { fallthrough_stmts(this, _, result) }
   }
 
+  private Element getImmediateChildOfFallthroughStmt(FallthroughStmt e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2984,6 +5432,8 @@ module Raw {
     string getMessage() { pound_assert_stmts(this, _, result) }
   }
 
+  private Element getImmediateChildOfPoundAssertStmt(PoundAssertStmt e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -2996,6 +5446,18 @@ module Raw {
     Expr getResult() { return_stmt_results(this, result) }
   }
 
+  private Element getImmediateChildOfReturnStmt(ReturnStmt e, int index) {
+    exists(int n, int nResult |
+      n = 0 and
+      nResult = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getResult()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    * A statement implicitly wrapping values to be used in branches of if/switch expressions. For example in:
@@ -3017,6 +5479,18 @@ module Raw {
     Expr getResult() { then_stmts(this, result) }
   }
 
+  private Element getImmediateChildOfThenStmt(ThenStmt e, int index) {
+    exists(int n, int nResult |
+      n = 0 and
+      nResult = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getResult()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -3029,6 +5503,18 @@ module Raw {
     Expr getSubExpr() { throw_stmts(this, result) }
   }
 
+  private Element getImmediateChildOfThrowStmt(ThrowStmt e, int index) {
+    exists(int n, int nSubExpr |
+      n = 0 and
+      nSubExpr = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getSubExpr()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -3039,6 +5525,23 @@ module Raw {
      * Gets the `index`th result of this yield statement (0-based).
      */
     Expr getResult(int index) { yield_stmt_results(this, index, result) }
+
+    /**
+     * Gets the number of results of this yield statement.
+     */
+    int getNumberOfResults() { result = count(int i | yield_stmt_results(this, i, _)) }
+  }
+
+  private Element getImmediateChildOfYieldStmt(YieldStmt e, int index) {
+    exists(int n, int nResult |
+      n = 0 and
+      nResult = n + e.getNumberOfResults() and
+      (
+        none()
+        or
+        result = e.getResult(index - n)
+      )
+    )
   }
 
   /**
@@ -3056,6 +5559,26 @@ module Raw {
      * Gets the `index`th catch of this do catch statement (0-based).
      */
     CaseStmt getCatch(int index) { do_catch_stmt_catches(this, index, result) }
+
+    /**
+     * Gets the number of catches of this do catch statement.
+     */
+    int getNumberOfCatches() { result = count(int i | do_catch_stmt_catches(this, i, _)) }
+  }
+
+  private Element getImmediateChildOfDoCatchStmt(DoCatchStmt e, int index) {
+    exists(int n, int nBody, int nCatch |
+      n = 0 and
+      nBody = n + 1 and
+      nCatch = nBody + e.getNumberOfCatches() and
+      (
+        none()
+        or
+        index = n and result = e.getBody()
+        or
+        result = e.getCatch(index - nBody)
+      )
+    )
   }
 
   /**
@@ -3070,6 +5593,18 @@ module Raw {
     BraceStmt getBody() { do_stmts(this, result) }
   }
 
+  private Element getImmediateChildOfDoStmt(DoStmt e, int index) {
+    exists(int n, int nBody |
+      n = 0 and
+      nBody = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getBody()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -3081,6 +5616,11 @@ module Raw {
      */
     VarDecl getVariable(int index) { for_each_stmt_variables(this, index, result) }
 
+    /**
+     * Gets the number of variables of this for each statement.
+     */
+    int getNumberOfVariables() { result = count(int i | for_each_stmt_variables(this, i, _)) }
+
     /**
      * Gets the pattern of this for each statement.
      */
@@ -3107,6 +5647,35 @@ module Raw {
     BraceStmt getBody() { for_each_stmts(this, _, result) }
   }
 
+  private Element getImmediateChildOfForEachStmt(ForEachStmt e, int index) {
+    exists(
+      int n, int nVariable, int nPattern, int nWhere, int nIteratorVar, int nNextCall, int nBody
+    |
+      n = 0 and
+      nVariable = n + e.getNumberOfVariables() and
+      nPattern = nVariable + 1 and
+      nWhere = nPattern + 1 and
+      nIteratorVar = nWhere + 1 and
+      nNextCall = nIteratorVar + 1 and
+      nBody = nNextCall + 1 and
+      (
+        none()
+        or
+        result = e.getVariable(index - n)
+        or
+        index = nVariable and result = e.getPattern()
+        or
+        index = nPattern and result = e.getWhere()
+        or
+        index = nWhere and result = e.getIteratorVar()
+        or
+        index = nIteratorVar and result = e.getNextCall()
+        or
+        index = nNextCall and result = e.getBody()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -3134,6 +5703,21 @@ module Raw {
     Stmt getBody() { repeat_while_stmts(this, _, result) }
   }
 
+  private Element getImmediateChildOfRepeatWhileStmt(RepeatWhileStmt e, int index) {
+    exists(int n, int nCondition, int nBody |
+      n = 0 and
+      nCondition = n + 1 and
+      nBody = nCondition + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getCondition()
+        or
+        index = nCondition and result = e.getBody()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -3149,6 +5733,26 @@ module Raw {
      * Gets the `index`th case of this switch statement (0-based).
      */
     CaseStmt getCase(int index) { switch_stmt_cases(this, index, result) }
+
+    /**
+     * Gets the number of cases of this switch statement.
+     */
+    int getNumberOfCases() { result = count(int i | switch_stmt_cases(this, i, _)) }
+  }
+
+  private Element getImmediateChildOfSwitchStmt(SwitchStmt e, int index) {
+    exists(int n, int nExpr, int nCase |
+      n = 0 and
+      nExpr = n + 1 and
+      nCase = nExpr + e.getNumberOfCases() and
+      (
+        none()
+        or
+        index = n and result = e.getExpr()
+        or
+        result = e.getCase(index - nExpr)
+      )
+    )
   }
 
   /**
@@ -3163,6 +5767,21 @@ module Raw {
     BraceStmt getBody() { guard_stmts(this, result) }
   }
 
+  private Element getImmediateChildOfGuardStmt(GuardStmt e, int index) {
+    exists(int n, int nCondition, int nBody |
+      n = 0 and
+      nCondition = n + 1 and
+      nBody = nCondition + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getCondition()
+        or
+        index = nCondition and result = e.getBody()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -3180,6 +5799,24 @@ module Raw {
     Stmt getElse() { if_stmt_elses(this, result) }
   }
 
+  private Element getImmediateChildOfIfStmt(IfStmt e, int index) {
+    exists(int n, int nCondition, int nThen, int nElse |
+      n = 0 and
+      nCondition = n + 1 and
+      nThen = nCondition + 1 and
+      nElse = nThen + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getCondition()
+        or
+        index = nCondition and result = e.getThen()
+        or
+        index = nThen and result = e.getElse()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -3192,6 +5829,21 @@ module Raw {
     Stmt getBody() { while_stmts(this, result) }
   }
 
+  private Element getImmediateChildOfWhileStmt(WhileStmt e, int index) {
+    exists(int n, int nCondition, int nBody |
+      n = 0 and
+      nCondition = n + 1 and
+      nBody = nCondition + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getCondition()
+        or
+        index = nCondition and result = e.getBody()
+      )
+    )
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -3225,6 +5877,8 @@ module Raw {
     Type getType() { type_reprs(this, result) }
   }
 
+  private Element getImmediateChildOfTypeRepr(TypeRepr e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -3239,6 +5893,13 @@ module Raw {
      */
     Type getParamType(int index) { any_function_type_param_types(this, index, result) }
 
+    /**
+     * Gets the number of parameter types of this function type.
+     */
+    int getNumberOfParamTypes() {
+      result = count(int i | any_function_type_param_types(this, i, _))
+    }
+
     /**
      * Holds if this type refers to a throwing function.
      */
@@ -3292,6 +5953,10 @@ module Raw {
     AssociatedTypeDecl getAssociatedTypeDecl() { dependent_member_types(this, _, result) }
   }
 
+  private Element getImmediateChildOfDependentMemberType(DependentMemberType e, int index) {
+    none()
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -3304,6 +5969,8 @@ module Raw {
     Type getStaticSelfType() { dynamic_self_types(this, result) }
   }
 
+  private Element getImmediateChildOfDynamicSelfType(DynamicSelfType e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -3311,6 +5978,8 @@ module Raw {
     override string toString() { result = "ErrorType" }
   }
 
+  private Element getImmediateChildOfErrorType(ErrorType e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -3323,6 +5992,8 @@ module Raw {
     Type getConstraint() { existential_types(this, result) }
   }
 
+  private Element getImmediateChildOfExistentialType(ExistentialType e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -3335,6 +6006,8 @@ module Raw {
     Type getObjectType() { in_out_types(this, result) }
   }
 
+  private Element getImmediateChildOfInOutType(InOutType e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -3347,6 +6020,8 @@ module Raw {
     string getValue() { integer_types(this, result) }
   }
 
+  private Element getImmediateChildOfIntegerType(IntegerType e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -3359,6 +6034,8 @@ module Raw {
     Type getObjectType() { l_value_types(this, result) }
   }
 
+  private Element getImmediateChildOfLValueType(LValueType e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -3371,6 +6048,8 @@ module Raw {
     ModuleDecl getModule() { module_types(this, result) }
   }
 
+  private Element getImmediateChildOfModuleType(ModuleType e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    * A type of PackElementExpr, see PackElementExpr for more information.
@@ -3384,6 +6063,8 @@ module Raw {
     Type getPackType() { pack_element_types(this, result) }
   }
 
+  private Element getImmediateChildOfPackElementType(PackElementType e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    * A type of PackExpansionExpr, see PackExpansionExpr for more information.
@@ -3402,6 +6083,8 @@ module Raw {
     Type getCountType() { pack_expansion_types(this, _, result) }
   }
 
+  private Element getImmediateChildOfPackExpansionType(PackExpansionType e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    * An actual type of a pack expression at the instatiation point.
@@ -3422,8 +6105,15 @@ module Raw {
      * Gets the `index`th element of this pack type (0-based).
      */
     Type getElement(int index) { pack_type_elements(this, index, result) }
+
+    /**
+     * Gets the number of elements of this pack type.
+     */
+    int getNumberOfElements() { result = count(int i | pack_type_elements(this, i, _)) }
   }
 
+  private Element getImmediateChildOfPackType(PackType e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    * A sugar type of the form `P<X>` with `P` a protocol.
@@ -3442,6 +6132,17 @@ module Raw {
      * Gets the `index`th argument of this parameterized protocol type (0-based).
      */
     Type getArg(int index) { parameterized_protocol_type_args(this, index, result) }
+
+    /**
+     * Gets the number of arguments of this parameterized protocol type.
+     */
+    int getNumberOfArgs() { result = count(int i | parameterized_protocol_type_args(this, i, _)) }
+  }
+
+  private Element getImmediateChildOfParameterizedProtocolType(
+    ParameterizedProtocolType e, int index
+  ) {
+    none()
   }
 
   /**
@@ -3454,6 +6155,17 @@ module Raw {
      * Gets the `index`th member of this protocol composition type (0-based).
      */
     Type getMember(int index) { protocol_composition_type_members(this, index, result) }
+
+    /**
+     * Gets the number of members of this protocol composition type.
+     */
+    int getNumberOfMembers() {
+      result = count(int i | protocol_composition_type_members(this, i, _))
+    }
+  }
+
+  private Element getImmediateChildOfProtocolCompositionType(ProtocolCompositionType e, int index) {
+    none()
   }
 
   /**
@@ -3487,12 +6199,24 @@ module Raw {
      */
     Type getType(int index) { tuple_type_types(this, index, result) }
 
+    /**
+     * Gets the number of types of this tuple type.
+     */
+    int getNumberOfTypes() { result = count(int i | tuple_type_types(this, i, _)) }
+
     /**
      * Gets the `index`th name of this tuple type (0-based), if it exists.
      */
     string getName(int index) { tuple_type_names(this, index, result) }
+
+    /**
+     * Gets the number of names of this tuple type.
+     */
+    int getNumberOfNames() { result = count(int i | tuple_type_names(this, i, _)) }
   }
 
+  private Element getImmediateChildOfTupleType(TupleType e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -3500,6 +6224,8 @@ module Raw {
     override string toString() { result = "UnresolvedType" }
   }
 
+  private Element getImmediateChildOfUnresolvedType(UnresolvedType e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -3523,6 +6249,11 @@ module Raw {
      * Gets the `index`th protocol of this archetype type (0-based).
      */
     ProtocolDecl getProtocol(int index) { archetype_type_protocols(this, index, result) }
+
+    /**
+     * Gets the number of protocols of this archetype type.
+     */
+    int getNumberOfProtocols() { result = count(int i | archetype_type_protocols(this, i, _)) }
   }
 
   /**
@@ -3532,6 +6263,10 @@ module Raw {
     override string toString() { result = "BuiltinBridgeObjectType" }
   }
 
+  private Element getImmediateChildOfBuiltinBridgeObjectType(BuiltinBridgeObjectType e, int index) {
+    none()
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -3539,6 +6274,12 @@ module Raw {
     override string toString() { result = "BuiltinDefaultActorStorageType" }
   }
 
+  private Element getImmediateChildOfBuiltinDefaultActorStorageType(
+    BuiltinDefaultActorStorageType e, int index
+  ) {
+    none()
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -3546,6 +6287,10 @@ module Raw {
     override string toString() { result = "BuiltinExecutorType" }
   }
 
+  private Element getImmediateChildOfBuiltinExecutorType(BuiltinExecutorType e, int index) {
+    none()
+  }
+
   /**
    * INTERNAL: Do not use.
    * A builtin type representing N values stored contiguously.
@@ -3554,6 +6299,10 @@ module Raw {
     override string toString() { result = "BuiltinFixedArrayType" }
   }
 
+  private Element getImmediateChildOfBuiltinFixedArrayType(BuiltinFixedArrayType e, int index) {
+    none()
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -3561,6 +6310,8 @@ module Raw {
     override string toString() { result = "BuiltinFloatType" }
   }
 
+  private Element getImmediateChildOfBuiltinFloatType(BuiltinFloatType e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -3568,6 +6319,8 @@ module Raw {
     override string toString() { result = "BuiltinJobType" }
   }
 
+  private Element getImmediateChildOfBuiltinJobType(BuiltinJobType e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -3575,6 +6328,10 @@ module Raw {
     override string toString() { result = "BuiltinNativeObjectType" }
   }
 
+  private Element getImmediateChildOfBuiltinNativeObjectType(BuiltinNativeObjectType e, int index) {
+    none()
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -3582,6 +6339,10 @@ module Raw {
     override string toString() { result = "BuiltinRawPointerType" }
   }
 
+  private Element getImmediateChildOfBuiltinRawPointerType(BuiltinRawPointerType e, int index) {
+    none()
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -3589,6 +6350,12 @@ module Raw {
     override string toString() { result = "BuiltinRawUnsafeContinuationType" }
   }
 
+  private Element getImmediateChildOfBuiltinRawUnsafeContinuationType(
+    BuiltinRawUnsafeContinuationType e, int index
+  ) {
+    none()
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -3596,6 +6363,12 @@ module Raw {
     override string toString() { result = "BuiltinUnsafeValueBufferType" }
   }
 
+  private Element getImmediateChildOfBuiltinUnsafeValueBufferType(
+    BuiltinUnsafeValueBufferType e, int index
+  ) {
+    none()
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -3603,6 +6376,8 @@ module Raw {
     override string toString() { result = "BuiltinVectorType" }
   }
 
+  private Element getImmediateChildOfBuiltinVectorType(BuiltinVectorType e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -3610,6 +6385,10 @@ module Raw {
     override string toString() { result = "ExistentialMetatypeType" }
   }
 
+  private Element getImmediateChildOfExistentialMetatypeType(ExistentialMetatypeType e, int index) {
+    none()
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -3617,6 +6396,8 @@ module Raw {
     override string toString() { result = "FunctionType" }
   }
 
+  private Element getImmediateChildOfFunctionType(FunctionType e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    * The type of a generic function with type parameters
@@ -3630,6 +6411,17 @@ module Raw {
     GenericTypeParamType getGenericParam(int index) {
       generic_function_type_generic_params(this, index, result)
     }
+
+    /**
+     * Gets the number of type parameters of this generic type.
+     */
+    int getNumberOfGenericParams() {
+      result = count(int i | generic_function_type_generic_params(this, i, _))
+    }
+  }
+
+  private Element getImmediateChildOfGenericFunctionType(GenericFunctionType e, int index) {
+    none()
   }
 
   /**
@@ -3639,6 +6431,10 @@ module Raw {
     override string toString() { result = "GenericTypeParamType" }
   }
 
+  private Element getImmediateChildOfGenericTypeParamType(GenericTypeParamType e, int index) {
+    none()
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -3646,6 +6442,8 @@ module Raw {
     override string toString() { result = "MetatypeType" }
   }
 
+  private Element getImmediateChildOfMetatypeType(MetatypeType e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -3665,6 +6463,8 @@ module Raw {
     Type getType() { paren_types(this, result) }
   }
 
+  private Element getImmediateChildOfParenType(ParenType e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -3682,6 +6482,8 @@ module Raw {
     TypeAliasDecl getDecl() { type_alias_types(this, result) }
   }
 
+  private Element getImmediateChildOfTypeAliasType(TypeAliasType e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -3689,6 +6491,8 @@ module Raw {
     override string toString() { result = "UnboundGenericType" }
   }
 
+  private Element getImmediateChildOfUnboundGenericType(UnboundGenericType e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -3696,6 +6500,10 @@ module Raw {
     override string toString() { result = "UnmanagedStorageType" }
   }
 
+  private Element getImmediateChildOfUnmanagedStorageType(UnmanagedStorageType e, int index) {
+    none()
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -3703,6 +6511,8 @@ module Raw {
     override string toString() { result = "UnownedStorageType" }
   }
 
+  private Element getImmediateChildOfUnownedStorageType(UnownedStorageType e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -3710,6 +6520,8 @@ module Raw {
     override string toString() { result = "WeakStorageType" }
   }
 
+  private Element getImmediateChildOfWeakStorageType(WeakStorageType e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -3718,6 +6530,11 @@ module Raw {
      * Gets the `index`th argument type of this bound generic type (0-based).
      */
     Type getArgType(int index) { bound_generic_type_arg_types(this, index, result) }
+
+    /**
+     * Gets the number of argument types of this bound generic type.
+     */
+    int getNumberOfArgTypes() { result = count(int i | bound_generic_type_arg_types(this, i, _)) }
   }
 
   /**
@@ -3727,6 +6544,12 @@ module Raw {
     override string toString() { result = "BuiltinIntegerLiteralType" }
   }
 
+  private Element getImmediateChildOfBuiltinIntegerLiteralType(
+    BuiltinIntegerLiteralType e, int index
+  ) {
+    none()
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -3739,6 +6562,8 @@ module Raw {
     int getWidth() { builtin_integer_type_widths(this, result) }
   }
 
+  private Element getImmediateChildOfBuiltinIntegerType(BuiltinIntegerType e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -3756,6 +6581,27 @@ module Raw {
     Type getValueType() { dictionary_types(this, _, result) }
   }
 
+  private Element getImmediateChildOfDictionaryType(DictionaryType e, int index) { none() }
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class InlineArrayType extends @inline_array_type, SyntaxSugarType {
+    override string toString() { result = "InlineArrayType" }
+
+    /**
+     * Gets the count type of this inline array type.
+     */
+    Type getCountType() { inline_array_types(this, result, _) }
+
+    /**
+     * Gets the element type of this inline array type.
+     */
+    Type getElementType() { inline_array_types(this, _, result) }
+  }
+
+  private Element getImmediateChildOfInlineArrayType(InlineArrayType e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -3781,6 +6627,10 @@ module Raw {
     OpaqueTypeDecl getDeclaration() { opaque_type_archetype_types(this, result) }
   }
 
+  private Element getImmediateChildOfOpaqueTypeArchetypeType(OpaqueTypeArchetypeType e, int index) {
+    none()
+  }
+
   /**
    * INTERNAL: Do not use.
    * An archetype type of PackType.
@@ -3789,6 +6639,8 @@ module Raw {
     override string toString() { result = "PackArchetypeType" }
   }
 
+  private Element getImmediateChildOfPackArchetypeType(PackArchetypeType e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -3796,6 +6648,10 @@ module Raw {
     override string toString() { result = "PrimaryArchetypeType" }
   }
 
+  private Element getImmediateChildOfPrimaryArchetypeType(PrimaryArchetypeType e, int index) {
+    none()
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -3813,6 +6669,8 @@ module Raw {
     override string toString() { result = "ArraySliceType" }
   }
 
+  private Element getImmediateChildOfArraySliceType(ArraySliceType e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -3820,6 +6678,10 @@ module Raw {
     override string toString() { result = "BoundGenericClassType" }
   }
 
+  private Element getImmediateChildOfBoundGenericClassType(BoundGenericClassType e, int index) {
+    none()
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -3827,6 +6689,10 @@ module Raw {
     override string toString() { result = "BoundGenericEnumType" }
   }
 
+  private Element getImmediateChildOfBoundGenericEnumType(BoundGenericEnumType e, int index) {
+    none()
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -3834,6 +6700,10 @@ module Raw {
     override string toString() { result = "BoundGenericStructType" }
   }
 
+  private Element getImmediateChildOfBoundGenericStructType(BoundGenericStructType e, int index) {
+    none()
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -3841,6 +6711,8 @@ module Raw {
     override string toString() { result = "ClassType" }
   }
 
+  private Element getImmediateChildOfClassType(ClassType e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    * An archetype type of PackElementType.
@@ -3849,6 +6721,10 @@ module Raw {
     override string toString() { result = "ElementArchetypeType" }
   }
 
+  private Element getImmediateChildOfElementArchetypeType(ElementArchetypeType e, int index) {
+    none()
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -3856,11 +6732,17 @@ module Raw {
     override string toString() { result = "EnumType" }
   }
 
+  private Element getImmediateChildOfEnumType(EnumType e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    */
-  class OpenedArchetypeType extends @opened_archetype_type, LocalArchetypeType {
-    override string toString() { result = "OpenedArchetypeType" }
+  class ExistentialArchetypeType extends @existential_archetype_type, LocalArchetypeType {
+    override string toString() { result = "ExistentialArchetypeType" }
+  }
+
+  private Element getImmediateChildOfExistentialArchetypeType(ExistentialArchetypeType e, int index) {
+    none()
   }
 
   /**
@@ -3870,6 +6752,8 @@ module Raw {
     override string toString() { result = "OptionalType" }
   }
 
+  private Element getImmediateChildOfOptionalType(OptionalType e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -3877,6 +6761,8 @@ module Raw {
     override string toString() { result = "ProtocolType" }
   }
 
+  private Element getImmediateChildOfProtocolType(ProtocolType e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -3884,10 +6770,534 @@ module Raw {
     override string toString() { result = "StructType" }
   }
 
+  private Element getImmediateChildOfStructType(StructType e, int index) { none() }
+
   /**
    * INTERNAL: Do not use.
    */
   class VariadicSequenceType extends @variadic_sequence_type, UnarySyntaxSugarType {
     override string toString() { result = "VariadicSequenceType" }
   }
+
+  private Element getImmediateChildOfVariadicSequenceType(VariadicSequenceType e, int index) {
+    none()
+  }
+
+  /**
+   * Gets the immediate child indexed at `index`. Indexes are not guaranteed to be contiguous, but are guaranteed to be distinct.
+   */
+  pragma[nomagic]
+  Element getImmediateChild(Element e, int index) {
+    // why does this look more complicated than it should?
+    // * none() simplifies generation, as we can append `or ...` without a special case for the first item
+    none()
+    or
+    result = getImmediateChildOfComment(e, index)
+    or
+    result = getImmediateChildOfDbFile(e, index)
+    or
+    result = getImmediateChildOfDbLocation(e, index)
+    or
+    result = getImmediateChildOfDiagnostics(e, index)
+    or
+    result = getImmediateChildOfAvailabilityInfo(e, index)
+    or
+    result = getImmediateChildOfAvailabilitySpec(e, index)
+    or
+    result = getImmediateChildOfKeyPathComponent(e, index)
+    or
+    result = getImmediateChildOfMacroRole(e, index)
+    or
+    result = getImmediateChildOfUnspecifiedElement(e, index)
+    or
+    result = getImmediateChildOfCapturedDecl(e, index)
+    or
+    result = getImmediateChildOfEnumCaseDecl(e, index)
+    or
+    result = getImmediateChildOfExtensionDecl(e, index)
+    or
+    result = getImmediateChildOfIfConfigDecl(e, index)
+    or
+    result = getImmediateChildOfImportDecl(e, index)
+    or
+    result = getImmediateChildOfMissingMemberDecl(e, index)
+    or
+    result = getImmediateChildOfPatternBindingDecl(e, index)
+    or
+    result = getImmediateChildOfPoundDiagnosticDecl(e, index)
+    or
+    result = getImmediateChildOfPrecedenceGroupDecl(e, index)
+    or
+    result = getImmediateChildOfTopLevelCodeDecl(e, index)
+    or
+    result = getImmediateChildOfUsingDecl(e, index)
+    or
+    result = getImmediateChildOfEnumElementDecl(e, index)
+    or
+    result = getImmediateChildOfInfixOperatorDecl(e, index)
+    or
+    result = getImmediateChildOfMacroDecl(e, index)
+    or
+    result = getImmediateChildOfPostfixOperatorDecl(e, index)
+    or
+    result = getImmediateChildOfPrefixOperatorDecl(e, index)
+    or
+    result = getImmediateChildOfDeinitializer(e, index)
+    or
+    result = getImmediateChildOfInitializer(e, index)
+    or
+    result = getImmediateChildOfModuleDecl(e, index)
+    or
+    result = getImmediateChildOfSubscriptDecl(e, index)
+    or
+    result = getImmediateChildOfAccessor(e, index)
+    or
+    result = getImmediateChildOfAssociatedTypeDecl(e, index)
+    or
+    result = getImmediateChildOfConcreteVarDecl(e, index)
+    or
+    result = getImmediateChildOfGenericTypeParamDecl(e, index)
+    or
+    result = getImmediateChildOfNamedFunction(e, index)
+    or
+    result = getImmediateChildOfOpaqueTypeDecl(e, index)
+    or
+    result = getImmediateChildOfParamDecl(e, index)
+    or
+    result = getImmediateChildOfTypeAliasDecl(e, index)
+    or
+    result = getImmediateChildOfClassDecl(e, index)
+    or
+    result = getImmediateChildOfEnumDecl(e, index)
+    or
+    result = getImmediateChildOfProtocolDecl(e, index)
+    or
+    result = getImmediateChildOfStructDecl(e, index)
+    or
+    result = getImmediateChildOfArgument(e, index)
+    or
+    result = getImmediateChildOfAppliedPropertyWrapperExpr(e, index)
+    or
+    result = getImmediateChildOfAssignExpr(e, index)
+    or
+    result = getImmediateChildOfBindOptionalExpr(e, index)
+    or
+    result = getImmediateChildOfCaptureListExpr(e, index)
+    or
+    result = getImmediateChildOfConsumeExpr(e, index)
+    or
+    result = getImmediateChildOfCopyExpr(e, index)
+    or
+    result = getImmediateChildOfCurrentContextIsolationExpr(e, index)
+    or
+    result = getImmediateChildOfDeclRefExpr(e, index)
+    or
+    result = getImmediateChildOfDefaultArgumentExpr(e, index)
+    or
+    result = getImmediateChildOfDiscardAssignmentExpr(e, index)
+    or
+    result = getImmediateChildOfDotSyntaxBaseIgnoredExpr(e, index)
+    or
+    result = getImmediateChildOfDynamicTypeExpr(e, index)
+    or
+    result = getImmediateChildOfEnumIsCaseExpr(e, index)
+    or
+    result = getImmediateChildOfErrorExpr(e, index)
+    or
+    result = getImmediateChildOfExtractFunctionIsolationExpr(e, index)
+    or
+    result = getImmediateChildOfForceValueExpr(e, index)
+    or
+    result = getImmediateChildOfIfExpr(e, index)
+    or
+    result = getImmediateChildOfInOutExpr(e, index)
+    or
+    result = getImmediateChildOfKeyPathApplicationExpr(e, index)
+    or
+    result = getImmediateChildOfKeyPathDotExpr(e, index)
+    or
+    result = getImmediateChildOfKeyPathExpr(e, index)
+    or
+    result = getImmediateChildOfLazyInitializationExpr(e, index)
+    or
+    result = getImmediateChildOfMakeTemporarilyEscapableExpr(e, index)
+    or
+    result = getImmediateChildOfMaterializePackExpr(e, index)
+    or
+    result = getImmediateChildOfObjCSelectorExpr(e, index)
+    or
+    result = getImmediateChildOfOneWayExpr(e, index)
+    or
+    result = getImmediateChildOfOpaqueValueExpr(e, index)
+    or
+    result = getImmediateChildOfOpenExistentialExpr(e, index)
+    or
+    result = getImmediateChildOfOptionalEvaluationExpr(e, index)
+    or
+    result = getImmediateChildOfOtherInitializerRefExpr(e, index)
+    or
+    result = getImmediateChildOfOverloadedDeclRefExpr(e, index)
+    or
+    result = getImmediateChildOfPackElementExpr(e, index)
+    or
+    result = getImmediateChildOfPackExpansionExpr(e, index)
+    or
+    result = getImmediateChildOfPropertyWrapperValuePlaceholderExpr(e, index)
+    or
+    result = getImmediateChildOfRebindSelfInInitializerExpr(e, index)
+    or
+    result = getImmediateChildOfSequenceExpr(e, index)
+    or
+    result = getImmediateChildOfSingleValueStmtExpr(e, index)
+    or
+    result = getImmediateChildOfSuperRefExpr(e, index)
+    or
+    result = getImmediateChildOfTapExpr(e, index)
+    or
+    result = getImmediateChildOfTupleElementExpr(e, index)
+    or
+    result = getImmediateChildOfTupleExpr(e, index)
+    or
+    result = getImmediateChildOfTypeExpr(e, index)
+    or
+    result = getImmediateChildOfTypeValueExpr(e, index)
+    or
+    result = getImmediateChildOfUnresolvedDeclRefExpr(e, index)
+    or
+    result = getImmediateChildOfUnresolvedDotExpr(e, index)
+    or
+    result = getImmediateChildOfUnresolvedMemberExpr(e, index)
+    or
+    result = getImmediateChildOfUnresolvedPatternExpr(e, index)
+    or
+    result = getImmediateChildOfUnresolvedSpecializeExpr(e, index)
+    or
+    result = getImmediateChildOfVarargExpansionExpr(e, index)
+    or
+    result = getImmediateChildOfAbiSafeConversionExpr(e, index)
+    or
+    result = getImmediateChildOfActorIsolationErasureExpr(e, index)
+    or
+    result = getImmediateChildOfAnyHashableErasureExpr(e, index)
+    or
+    result = getImmediateChildOfArchetypeToSuperExpr(e, index)
+    or
+    result = getImmediateChildOfArrayExpr(e, index)
+    or
+    result = getImmediateChildOfArrayToPointerExpr(e, index)
+    or
+    result = getImmediateChildOfAutoClosureExpr(e, index)
+    or
+    result = getImmediateChildOfAwaitExpr(e, index)
+    or
+    result = getImmediateChildOfBinaryExpr(e, index)
+    or
+    result = getImmediateChildOfBorrowExpr(e, index)
+    or
+    result = getImmediateChildOfBridgeFromObjCExpr(e, index)
+    or
+    result = getImmediateChildOfBridgeToObjCExpr(e, index)
+    or
+    result = getImmediateChildOfCallExpr(e, index)
+    or
+    result = getImmediateChildOfClassMetatypeToObjectExpr(e, index)
+    or
+    result = getImmediateChildOfCoerceExpr(e, index)
+    or
+    result = getImmediateChildOfCollectionUpcastConversionExpr(e, index)
+    or
+    result = getImmediateChildOfConditionalBridgeFromObjCExpr(e, index)
+    or
+    result = getImmediateChildOfCovariantFunctionConversionExpr(e, index)
+    or
+    result = getImmediateChildOfCovariantReturnConversionExpr(e, index)
+    or
+    result = getImmediateChildOfDerivedToBaseExpr(e, index)
+    or
+    result = getImmediateChildOfDestructureTupleExpr(e, index)
+    or
+    result = getImmediateChildOfDictionaryExpr(e, index)
+    or
+    result = getImmediateChildOfDifferentiableFunctionExpr(e, index)
+    or
+    result = getImmediateChildOfDifferentiableFunctionExtractOriginalExpr(e, index)
+    or
+    result = getImmediateChildOfDotSelfExpr(e, index)
+    or
+    result = getImmediateChildOfErasureExpr(e, index)
+    or
+    result = getImmediateChildOfExistentialMetatypeToObjectExpr(e, index)
+    or
+    result = getImmediateChildOfExplicitClosureExpr(e, index)
+    or
+    result = getImmediateChildOfForceTryExpr(e, index)
+    or
+    result = getImmediateChildOfForeignObjectConversionExpr(e, index)
+    or
+    result = getImmediateChildOfFunctionConversionExpr(e, index)
+    or
+    result = getImmediateChildOfInOutToPointerExpr(e, index)
+    or
+    result = getImmediateChildOfInjectIntoOptionalExpr(e, index)
+    or
+    result = getImmediateChildOfInterpolatedStringLiteralExpr(e, index)
+    or
+    result = getImmediateChildOfLinearFunctionExpr(e, index)
+    or
+    result = getImmediateChildOfLinearFunctionExtractOriginalExpr(e, index)
+    or
+    result = getImmediateChildOfLinearToDifferentiableFunctionExpr(e, index)
+    or
+    result = getImmediateChildOfLoadExpr(e, index)
+    or
+    result = getImmediateChildOfMemberRefExpr(e, index)
+    or
+    result = getImmediateChildOfMetatypeConversionExpr(e, index)
+    or
+    result = getImmediateChildOfNilLiteralExpr(e, index)
+    or
+    result = getImmediateChildOfObjectLiteralExpr(e, index)
+    or
+    result = getImmediateChildOfOptionalTryExpr(e, index)
+    or
+    result = getImmediateChildOfParenExpr(e, index)
+    or
+    result = getImmediateChildOfPointerToPointerExpr(e, index)
+    or
+    result = getImmediateChildOfPostfixUnaryExpr(e, index)
+    or
+    result = getImmediateChildOfPrefixUnaryExpr(e, index)
+    or
+    result = getImmediateChildOfProtocolMetatypeToObjectExpr(e, index)
+    or
+    result = getImmediateChildOfRegexLiteralExpr(e, index)
+    or
+    result = getImmediateChildOfStringToPointerExpr(e, index)
+    or
+    result = getImmediateChildOfSubscriptExpr(e, index)
+    or
+    result = getImmediateChildOfTryExpr(e, index)
+    or
+    result = getImmediateChildOfUnderlyingToOpaqueExpr(e, index)
+    or
+    result = getImmediateChildOfUnevaluatedInstanceExpr(e, index)
+    or
+    result = getImmediateChildOfUnreachableExpr(e, index)
+    or
+    result = getImmediateChildOfUnresolvedMemberChainResultExpr(e, index)
+    or
+    result = getImmediateChildOfUnresolvedTypeConversionExpr(e, index)
+    or
+    result = getImmediateChildOfUnsafeCastExpr(e, index)
+    or
+    result = getImmediateChildOfUnsafeExpr(e, index)
+    or
+    result = getImmediateChildOfBooleanLiteralExpr(e, index)
+    or
+    result = getImmediateChildOfConditionalCheckedCastExpr(e, index)
+    or
+    result = getImmediateChildOfDotSyntaxCallExpr(e, index)
+    or
+    result = getImmediateChildOfDynamicMemberRefExpr(e, index)
+    or
+    result = getImmediateChildOfDynamicSubscriptExpr(e, index)
+    or
+    result = getImmediateChildOfForcedCheckedCastExpr(e, index)
+    or
+    result = getImmediateChildOfInitializerRefCallExpr(e, index)
+    or
+    result = getImmediateChildOfIsExpr(e, index)
+    or
+    result = getImmediateChildOfMagicIdentifierLiteralExpr(e, index)
+    or
+    result = getImmediateChildOfStringLiteralExpr(e, index)
+    or
+    result = getImmediateChildOfFloatLiteralExpr(e, index)
+    or
+    result = getImmediateChildOfIntegerLiteralExpr(e, index)
+    or
+    result = getImmediateChildOfAnyPattern(e, index)
+    or
+    result = getImmediateChildOfBindingPattern(e, index)
+    or
+    result = getImmediateChildOfBoolPattern(e, index)
+    or
+    result = getImmediateChildOfEnumElementPattern(e, index)
+    or
+    result = getImmediateChildOfExprPattern(e, index)
+    or
+    result = getImmediateChildOfIsPattern(e, index)
+    or
+    result = getImmediateChildOfNamedPattern(e, index)
+    or
+    result = getImmediateChildOfOptionalSomePattern(e, index)
+    or
+    result = getImmediateChildOfParenPattern(e, index)
+    or
+    result = getImmediateChildOfTuplePattern(e, index)
+    or
+    result = getImmediateChildOfTypedPattern(e, index)
+    or
+    result = getImmediateChildOfCaseLabelItem(e, index)
+    or
+    result = getImmediateChildOfConditionElement(e, index)
+    or
+    result = getImmediateChildOfStmtCondition(e, index)
+    or
+    result = getImmediateChildOfBraceStmt(e, index)
+    or
+    result = getImmediateChildOfBreakStmt(e, index)
+    or
+    result = getImmediateChildOfCaseStmt(e, index)
+    or
+    result = getImmediateChildOfContinueStmt(e, index)
+    or
+    result = getImmediateChildOfDeferStmt(e, index)
+    or
+    result = getImmediateChildOfDiscardStmt(e, index)
+    or
+    result = getImmediateChildOfFailStmt(e, index)
+    or
+    result = getImmediateChildOfFallthroughStmt(e, index)
+    or
+    result = getImmediateChildOfPoundAssertStmt(e, index)
+    or
+    result = getImmediateChildOfReturnStmt(e, index)
+    or
+    result = getImmediateChildOfThenStmt(e, index)
+    or
+    result = getImmediateChildOfThrowStmt(e, index)
+    or
+    result = getImmediateChildOfYieldStmt(e, index)
+    or
+    result = getImmediateChildOfDoCatchStmt(e, index)
+    or
+    result = getImmediateChildOfDoStmt(e, index)
+    or
+    result = getImmediateChildOfForEachStmt(e, index)
+    or
+    result = getImmediateChildOfRepeatWhileStmt(e, index)
+    or
+    result = getImmediateChildOfSwitchStmt(e, index)
+    or
+    result = getImmediateChildOfGuardStmt(e, index)
+    or
+    result = getImmediateChildOfIfStmt(e, index)
+    or
+    result = getImmediateChildOfWhileStmt(e, index)
+    or
+    result = getImmediateChildOfTypeRepr(e, index)
+    or
+    result = getImmediateChildOfDependentMemberType(e, index)
+    or
+    result = getImmediateChildOfDynamicSelfType(e, index)
+    or
+    result = getImmediateChildOfErrorType(e, index)
+    or
+    result = getImmediateChildOfExistentialType(e, index)
+    or
+    result = getImmediateChildOfInOutType(e, index)
+    or
+    result = getImmediateChildOfIntegerType(e, index)
+    or
+    result = getImmediateChildOfLValueType(e, index)
+    or
+    result = getImmediateChildOfModuleType(e, index)
+    or
+    result = getImmediateChildOfPackElementType(e, index)
+    or
+    result = getImmediateChildOfPackExpansionType(e, index)
+    or
+    result = getImmediateChildOfPackType(e, index)
+    or
+    result = getImmediateChildOfParameterizedProtocolType(e, index)
+    or
+    result = getImmediateChildOfProtocolCompositionType(e, index)
+    or
+    result = getImmediateChildOfTupleType(e, index)
+    or
+    result = getImmediateChildOfUnresolvedType(e, index)
+    or
+    result = getImmediateChildOfBuiltinBridgeObjectType(e, index)
+    or
+    result = getImmediateChildOfBuiltinDefaultActorStorageType(e, index)
+    or
+    result = getImmediateChildOfBuiltinExecutorType(e, index)
+    or
+    result = getImmediateChildOfBuiltinFixedArrayType(e, index)
+    or
+    result = getImmediateChildOfBuiltinFloatType(e, index)
+    or
+    result = getImmediateChildOfBuiltinJobType(e, index)
+    or
+    result = getImmediateChildOfBuiltinNativeObjectType(e, index)
+    or
+    result = getImmediateChildOfBuiltinRawPointerType(e, index)
+    or
+    result = getImmediateChildOfBuiltinRawUnsafeContinuationType(e, index)
+    or
+    result = getImmediateChildOfBuiltinUnsafeValueBufferType(e, index)
+    or
+    result = getImmediateChildOfBuiltinVectorType(e, index)
+    or
+    result = getImmediateChildOfExistentialMetatypeType(e, index)
+    or
+    result = getImmediateChildOfFunctionType(e, index)
+    or
+    result = getImmediateChildOfGenericFunctionType(e, index)
+    or
+    result = getImmediateChildOfGenericTypeParamType(e, index)
+    or
+    result = getImmediateChildOfMetatypeType(e, index)
+    or
+    result = getImmediateChildOfParenType(e, index)
+    or
+    result = getImmediateChildOfTypeAliasType(e, index)
+    or
+    result = getImmediateChildOfUnboundGenericType(e, index)
+    or
+    result = getImmediateChildOfUnmanagedStorageType(e, index)
+    or
+    result = getImmediateChildOfUnownedStorageType(e, index)
+    or
+    result = getImmediateChildOfWeakStorageType(e, index)
+    or
+    result = getImmediateChildOfBuiltinIntegerLiteralType(e, index)
+    or
+    result = getImmediateChildOfBuiltinIntegerType(e, index)
+    or
+    result = getImmediateChildOfDictionaryType(e, index)
+    or
+    result = getImmediateChildOfInlineArrayType(e, index)
+    or
+    result = getImmediateChildOfOpaqueTypeArchetypeType(e, index)
+    or
+    result = getImmediateChildOfPackArchetypeType(e, index)
+    or
+    result = getImmediateChildOfPrimaryArchetypeType(e, index)
+    or
+    result = getImmediateChildOfArraySliceType(e, index)
+    or
+    result = getImmediateChildOfBoundGenericClassType(e, index)
+    or
+    result = getImmediateChildOfBoundGenericEnumType(e, index)
+    or
+    result = getImmediateChildOfBoundGenericStructType(e, index)
+    or
+    result = getImmediateChildOfClassType(e, index)
+    or
+    result = getImmediateChildOfElementArchetypeType(e, index)
+    or
+    result = getImmediateChildOfEnumType(e, index)
+    or
+    result = getImmediateChildOfExistentialArchetypeType(e, index)
+    or
+    result = getImmediateChildOfOptionalType(e, index)
+    or
+    result = getImmediateChildOfProtocolType(e, index)
+    or
+    result = getImmediateChildOfStructType(e, index)
+    or
+    result = getImmediateChildOfVariadicSequenceType(e, index)
+  }
 }
diff --git a/swift/ql/lib/codeql/swift/generated/Synth.qll b/swift/ql/lib/codeql/swift/generated/Synth.qll
index 09f52604bb9..27508df94e9 100644
--- a/swift/ql/lib/codeql/swift/generated/Synth.qll
+++ b/swift/ql/lib/codeql/swift/generated/Synth.qll
@@ -18,6 +18,10 @@ module Synth {
      * INTERNAL: Do not use.
      */
     TAvailabilityInfo(Raw::AvailabilityInfo id) { constructAvailabilityInfo(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TAvailabilitySpec(Raw::AvailabilitySpec id) { constructAvailabilitySpec(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -42,16 +46,6 @@ module Synth {
      * INTERNAL: Do not use.
      */
     TMacroRole(Raw::MacroRole id) { constructMacroRole(id) } or
-    /**
-     * INTERNAL: Do not use.
-     */
-    TOtherAvailabilitySpec(Raw::OtherAvailabilitySpec id) { constructOtherAvailabilitySpec(id) } or
-    /**
-     * INTERNAL: Do not use.
-     */
-    TPlatformVersionAvailabilitySpec(Raw::PlatformVersionAvailabilitySpec id) {
-      constructPlatformVersionAvailabilitySpec(id)
-    } or
     /**
      * INTERNAL: Do not use.
      */
@@ -188,6 +182,10 @@ module Synth {
      * INTERNAL: Do not use.
      */
     TTypeAliasDecl(Raw::TypeAliasDecl id) { constructTypeAliasDecl(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TUsingDecl(Raw::UsingDecl id) { constructUsingDecl(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -724,6 +722,10 @@ module Synth {
      * INTERNAL: Do not use.
      */
     TUnsafeCastExpr(Raw::UnsafeCastExpr id) { constructUnsafeCastExpr(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TUnsafeExpr(Raw::UnsafeExpr id) { constructUnsafeExpr(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -976,6 +978,12 @@ module Synth {
      * INTERNAL: Do not use.
      */
     TErrorType(Raw::ErrorType id) { constructErrorType(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TExistentialArchetypeType(Raw::ExistentialArchetypeType id) {
+      constructExistentialArchetypeType(id)
+    } or
     /**
      * INTERNAL: Do not use.
      */
@@ -1002,6 +1010,10 @@ module Synth {
      * INTERNAL: Do not use.
      */
     TInOutType(Raw::InOutType id) { constructInOutType(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TInlineArrayType(Raw::InlineArrayType id) { constructInlineArrayType(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -1024,10 +1036,6 @@ module Synth {
     TOpaqueTypeArchetypeType(Raw::OpaqueTypeArchetypeType id) {
       constructOpaqueTypeArchetypeType(id)
     } or
-    /**
-     * INTERNAL: Do not use.
-     */
-    TOpenedArchetypeType(Raw::OpenedArchetypeType id) { constructOpenedArchetypeType(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -1121,11 +1129,6 @@ module Synth {
         TDecl or TExpr or TKeyPathComponent or TMacroRole or TPattern or TStmt or TStmtCondition or
         TTypeRepr;
 
-  /**
-   * INTERNAL: Do not use.
-   */
-  class TAvailabilitySpec = TOtherAvailabilitySpec or TPlatformVersionAvailabilitySpec;
-
   /**
    * INTERNAL: Do not use.
    */
@@ -1176,7 +1179,7 @@ module Synth {
   class TDecl =
     TCapturedDecl or TEnumCaseDecl or TExtensionDecl or TIfConfigDecl or TImportDecl or
         TMissingMemberDecl or TOperatorDecl or TPatternBindingDecl or TPoundDiagnosticDecl or
-        TPrecedenceGroupDecl or TTopLevelCodeDecl or TValueDecl;
+        TPrecedenceGroupDecl or TTopLevelCodeDecl or TUsingDecl or TValueDecl;
 
   /**
    * INTERNAL: Do not use.
@@ -1286,7 +1289,8 @@ module Synth {
    * INTERNAL: Do not use.
    */
   class TIdentityExpr =
-    TAwaitExpr or TBorrowExpr or TDotSelfExpr or TParenExpr or TUnresolvedMemberChainResultExpr;
+    TAwaitExpr or TBorrowExpr or TDotSelfExpr or TParenExpr or TUnresolvedMemberChainResultExpr or
+        TUnsafeExpr;
 
   /**
    * INTERNAL: Do not use.
@@ -1400,7 +1404,7 @@ module Synth {
   /**
    * INTERNAL: Do not use.
    */
-  class TLocalArchetypeType = TElementArchetypeType or TOpenedArchetypeType;
+  class TLocalArchetypeType = TElementArchetypeType or TExistentialArchetypeType;
 
   /**
    * INTERNAL: Do not use.
@@ -1430,7 +1434,7 @@ module Synth {
   /**
    * INTERNAL: Do not use.
    */
-  class TSyntaxSugarType = TDictionaryType or TUnarySyntaxSugarType;
+  class TSyntaxSugarType = TDictionaryType or TInlineArrayType or TUnarySyntaxSugarType;
 
   /**
    * INTERNAL: Do not use.
@@ -1449,76 +1453,84 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
+   * Gets the parent of synthetic element `e`.
+   */
+  Raw::Element getSynthParent(TElement e) { none() }
+
+  /**
+   * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TAvailabilityInfo`, if possible.
    */
   TAvailabilityInfo convertAvailabilityInfoFromRaw(Raw::Element e) { result = TAvailabilityInfo(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
+   * Converts a raw element to a synthesized `TAvailabilitySpec`, if possible.
+   */
+  TAvailabilitySpec convertAvailabilitySpecFromRaw(Raw::Element e) { result = TAvailabilitySpec(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TComment`, if possible.
    */
   TComment convertCommentFromRaw(Raw::Element e) { result = TComment(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TDbFile`, if possible.
    */
   TDbFile convertDbFileFromRaw(Raw::Element e) { result = TDbFile(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TDbLocation`, if possible.
    */
   TDbLocation convertDbLocationFromRaw(Raw::Element e) { result = TDbLocation(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TDiagnostics`, if possible.
    */
   TDiagnostics convertDiagnosticsFromRaw(Raw::Element e) { result = TDiagnostics(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TKeyPathComponent`, if possible.
    */
   TKeyPathComponent convertKeyPathComponentFromRaw(Raw::Element e) { result = TKeyPathComponent(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TMacroRole`, if possible.
    */
   TMacroRole convertMacroRoleFromRaw(Raw::Element e) { result = TMacroRole(e) }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TOtherAvailabilitySpec`, if possible.
-   */
-  TOtherAvailabilitySpec convertOtherAvailabilitySpecFromRaw(Raw::Element e) {
-    result = TOtherAvailabilitySpec(e)
-  }
-
-  /**
-   * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TPlatformVersionAvailabilitySpec`, if possible.
-   */
-  TPlatformVersionAvailabilitySpec convertPlatformVersionAvailabilitySpecFromRaw(Raw::Element e) {
-    result = TPlatformVersionAvailabilitySpec(e)
-  }
-
-  /**
-   * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TUnknownFile`, if possible.
    */
   TUnknownFile convertUnknownFileFromRaw(Raw::Element e) { none() }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TUnknownLocation`, if possible.
    */
   TUnknownLocation convertUnknownLocationFromRaw(Raw::Element e) { none() }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TUnspecifiedElement`, if possible.
    */
   TUnspecifiedElement convertUnspecifiedElementFromRaw(Raw::Element e) {
@@ -1527,12 +1539,14 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TAccessor`, if possible.
    */
   TAccessor convertAccessorFromRaw(Raw::Element e) { result = TAccessor(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TAssociatedTypeDecl`, if possible.
    */
   TAssociatedTypeDecl convertAssociatedTypeDeclFromRaw(Raw::Element e) {
@@ -1541,54 +1555,63 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TCapturedDecl`, if possible.
    */
   TCapturedDecl convertCapturedDeclFromRaw(Raw::Element e) { result = TCapturedDecl(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TClassDecl`, if possible.
    */
   TClassDecl convertClassDeclFromRaw(Raw::Element e) { result = TClassDecl(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TConcreteVarDecl`, if possible.
    */
   TConcreteVarDecl convertConcreteVarDeclFromRaw(Raw::Element e) { result = TConcreteVarDecl(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TDeinitializer`, if possible.
    */
   TDeinitializer convertDeinitializerFromRaw(Raw::Element e) { result = TDeinitializer(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TEnumCaseDecl`, if possible.
    */
   TEnumCaseDecl convertEnumCaseDeclFromRaw(Raw::Element e) { result = TEnumCaseDecl(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TEnumDecl`, if possible.
    */
   TEnumDecl convertEnumDeclFromRaw(Raw::Element e) { result = TEnumDecl(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TEnumElementDecl`, if possible.
    */
   TEnumElementDecl convertEnumElementDeclFromRaw(Raw::Element e) { result = TEnumElementDecl(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TExtensionDecl`, if possible.
    */
   TExtensionDecl convertExtensionDeclFromRaw(Raw::Element e) { result = TExtensionDecl(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TGenericTypeParamDecl`, if possible.
    */
   TGenericTypeParamDecl convertGenericTypeParamDeclFromRaw(Raw::Element e) {
@@ -1597,18 +1620,21 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TIfConfigDecl`, if possible.
    */
   TIfConfigDecl convertIfConfigDeclFromRaw(Raw::Element e) { result = TIfConfigDecl(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TImportDecl`, if possible.
    */
   TImportDecl convertImportDeclFromRaw(Raw::Element e) { result = TImportDecl(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TInfixOperatorDecl`, if possible.
    */
   TInfixOperatorDecl convertInfixOperatorDeclFromRaw(Raw::Element e) {
@@ -1617,18 +1643,21 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TInitializer`, if possible.
    */
   TInitializer convertInitializerFromRaw(Raw::Element e) { result = TInitializer(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TMacroDecl`, if possible.
    */
   TMacroDecl convertMacroDeclFromRaw(Raw::Element e) { result = TMacroDecl(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TMissingMemberDecl`, if possible.
    */
   TMissingMemberDecl convertMissingMemberDeclFromRaw(Raw::Element e) {
@@ -1637,30 +1666,35 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TModuleDecl`, if possible.
    */
   TModuleDecl convertModuleDeclFromRaw(Raw::Element e) { result = TModuleDecl(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TNamedFunction`, if possible.
    */
   TNamedFunction convertNamedFunctionFromRaw(Raw::Element e) { result = TNamedFunction(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TOpaqueTypeDecl`, if possible.
    */
   TOpaqueTypeDecl convertOpaqueTypeDeclFromRaw(Raw::Element e) { result = TOpaqueTypeDecl(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TParamDecl`, if possible.
    */
   TParamDecl convertParamDeclFromRaw(Raw::Element e) { result = TParamDecl(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TPatternBindingDecl`, if possible.
    */
   TPatternBindingDecl convertPatternBindingDeclFromRaw(Raw::Element e) {
@@ -1669,6 +1703,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TPostfixOperatorDecl`, if possible.
    */
   TPostfixOperatorDecl convertPostfixOperatorDeclFromRaw(Raw::Element e) {
@@ -1677,6 +1712,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TPoundDiagnosticDecl`, if possible.
    */
   TPoundDiagnosticDecl convertPoundDiagnosticDeclFromRaw(Raw::Element e) {
@@ -1685,6 +1721,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TPrecedenceGroupDecl`, if possible.
    */
   TPrecedenceGroupDecl convertPrecedenceGroupDeclFromRaw(Raw::Element e) {
@@ -1693,6 +1730,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TPrefixOperatorDecl`, if possible.
    */
   TPrefixOperatorDecl convertPrefixOperatorDeclFromRaw(Raw::Element e) {
@@ -1701,36 +1739,49 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TProtocolDecl`, if possible.
    */
   TProtocolDecl convertProtocolDeclFromRaw(Raw::Element e) { result = TProtocolDecl(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TStructDecl`, if possible.
    */
   TStructDecl convertStructDeclFromRaw(Raw::Element e) { result = TStructDecl(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TSubscriptDecl`, if possible.
    */
   TSubscriptDecl convertSubscriptDeclFromRaw(Raw::Element e) { result = TSubscriptDecl(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TTopLevelCodeDecl`, if possible.
    */
   TTopLevelCodeDecl convertTopLevelCodeDeclFromRaw(Raw::Element e) { result = TTopLevelCodeDecl(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TTypeAliasDecl`, if possible.
    */
   TTypeAliasDecl convertTypeAliasDeclFromRaw(Raw::Element e) { result = TTypeAliasDecl(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
+   * Converts a raw element to a synthesized `TUsingDecl`, if possible.
+   */
+  TUsingDecl convertUsingDeclFromRaw(Raw::Element e) { result = TUsingDecl(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TAbiSafeConversionExpr`, if possible.
    */
   TAbiSafeConversionExpr convertAbiSafeConversionExprFromRaw(Raw::Element e) {
@@ -1739,6 +1790,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TActorIsolationErasureExpr`, if possible.
    */
   TActorIsolationErasureExpr convertActorIsolationErasureExprFromRaw(Raw::Element e) {
@@ -1747,6 +1799,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TAnyHashableErasureExpr`, if possible.
    */
   TAnyHashableErasureExpr convertAnyHashableErasureExprFromRaw(Raw::Element e) {
@@ -1755,6 +1808,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TAppliedPropertyWrapperExpr`, if possible.
    */
   TAppliedPropertyWrapperExpr convertAppliedPropertyWrapperExprFromRaw(Raw::Element e) {
@@ -1763,6 +1817,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TArchetypeToSuperExpr`, if possible.
    */
   TArchetypeToSuperExpr convertArchetypeToSuperExprFromRaw(Raw::Element e) {
@@ -1771,18 +1826,21 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TArgument`, if possible.
    */
   TArgument convertArgumentFromRaw(Raw::Element e) { result = TArgument(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TArrayExpr`, if possible.
    */
   TArrayExpr convertArrayExprFromRaw(Raw::Element e) { result = TArrayExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TArrayToPointerExpr`, if possible.
    */
   TArrayToPointerExpr convertArrayToPointerExprFromRaw(Raw::Element e) {
@@ -1791,36 +1849,42 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TAssignExpr`, if possible.
    */
   TAssignExpr convertAssignExprFromRaw(Raw::Element e) { result = TAssignExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TAutoClosureExpr`, if possible.
    */
   TAutoClosureExpr convertAutoClosureExprFromRaw(Raw::Element e) { result = TAutoClosureExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TAwaitExpr`, if possible.
    */
   TAwaitExpr convertAwaitExprFromRaw(Raw::Element e) { result = TAwaitExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TBinaryExpr`, if possible.
    */
   TBinaryExpr convertBinaryExprFromRaw(Raw::Element e) { result = TBinaryExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TBindOptionalExpr`, if possible.
    */
   TBindOptionalExpr convertBindOptionalExprFromRaw(Raw::Element e) { result = TBindOptionalExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TBooleanLiteralExpr`, if possible.
    */
   TBooleanLiteralExpr convertBooleanLiteralExprFromRaw(Raw::Element e) {
@@ -1829,12 +1893,14 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TBorrowExpr`, if possible.
    */
   TBorrowExpr convertBorrowExprFromRaw(Raw::Element e) { result = TBorrowExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TBridgeFromObjCExpr`, if possible.
    */
   TBridgeFromObjCExpr convertBridgeFromObjCExprFromRaw(Raw::Element e) {
@@ -1843,24 +1909,28 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TBridgeToObjCExpr`, if possible.
    */
   TBridgeToObjCExpr convertBridgeToObjCExprFromRaw(Raw::Element e) { result = TBridgeToObjCExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TCallExpr`, if possible.
    */
   TCallExpr convertCallExprFromRaw(Raw::Element e) { result = TCallExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TCaptureListExpr`, if possible.
    */
   TCaptureListExpr convertCaptureListExprFromRaw(Raw::Element e) { result = TCaptureListExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TClassMetatypeToObjectExpr`, if possible.
    */
   TClassMetatypeToObjectExpr convertClassMetatypeToObjectExprFromRaw(Raw::Element e) {
@@ -1869,12 +1939,14 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TCoerceExpr`, if possible.
    */
   TCoerceExpr convertCoerceExprFromRaw(Raw::Element e) { result = TCoerceExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TCollectionUpcastConversionExpr`, if possible.
    */
   TCollectionUpcastConversionExpr convertCollectionUpcastConversionExprFromRaw(Raw::Element e) {
@@ -1883,6 +1955,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TConditionalBridgeFromObjCExpr`, if possible.
    */
   TConditionalBridgeFromObjCExpr convertConditionalBridgeFromObjCExprFromRaw(Raw::Element e) {
@@ -1891,6 +1964,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TConditionalCheckedCastExpr`, if possible.
    */
   TConditionalCheckedCastExpr convertConditionalCheckedCastExprFromRaw(Raw::Element e) {
@@ -1899,18 +1973,21 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TConsumeExpr`, if possible.
    */
   TConsumeExpr convertConsumeExprFromRaw(Raw::Element e) { result = TConsumeExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TCopyExpr`, if possible.
    */
   TCopyExpr convertCopyExprFromRaw(Raw::Element e) { result = TCopyExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TCovariantFunctionConversionExpr`, if possible.
    */
   TCovariantFunctionConversionExpr convertCovariantFunctionConversionExprFromRaw(Raw::Element e) {
@@ -1919,6 +1996,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TCovariantReturnConversionExpr`, if possible.
    */
   TCovariantReturnConversionExpr convertCovariantReturnConversionExprFromRaw(Raw::Element e) {
@@ -1927,6 +2005,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TCurrentContextIsolationExpr`, if possible.
    */
   TCurrentContextIsolationExpr convertCurrentContextIsolationExprFromRaw(Raw::Element e) {
@@ -1935,12 +2014,14 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TDeclRefExpr`, if possible.
    */
   TDeclRefExpr convertDeclRefExprFromRaw(Raw::Element e) { result = TDeclRefExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TDefaultArgumentExpr`, if possible.
    */
   TDefaultArgumentExpr convertDefaultArgumentExprFromRaw(Raw::Element e) {
@@ -1949,6 +2030,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TDerivedToBaseExpr`, if possible.
    */
   TDerivedToBaseExpr convertDerivedToBaseExprFromRaw(Raw::Element e) {
@@ -1957,6 +2039,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TDestructureTupleExpr`, if possible.
    */
   TDestructureTupleExpr convertDestructureTupleExprFromRaw(Raw::Element e) {
@@ -1965,12 +2048,14 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TDictionaryExpr`, if possible.
    */
   TDictionaryExpr convertDictionaryExprFromRaw(Raw::Element e) { result = TDictionaryExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TDifferentiableFunctionExpr`, if possible.
    */
   TDifferentiableFunctionExpr convertDifferentiableFunctionExprFromRaw(Raw::Element e) {
@@ -1979,6 +2064,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TDifferentiableFunctionExtractOriginalExpr`, if possible.
    */
   TDifferentiableFunctionExtractOriginalExpr convertDifferentiableFunctionExtractOriginalExprFromRaw(
@@ -1989,6 +2075,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TDiscardAssignmentExpr`, if possible.
    */
   TDiscardAssignmentExpr convertDiscardAssignmentExprFromRaw(Raw::Element e) {
@@ -1997,12 +2084,14 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TDotSelfExpr`, if possible.
    */
   TDotSelfExpr convertDotSelfExprFromRaw(Raw::Element e) { result = TDotSelfExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TDotSyntaxBaseIgnoredExpr`, if possible.
    */
   TDotSyntaxBaseIgnoredExpr convertDotSyntaxBaseIgnoredExprFromRaw(Raw::Element e) {
@@ -2011,6 +2100,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TDotSyntaxCallExpr`, if possible.
    */
   TDotSyntaxCallExpr convertDotSyntaxCallExprFromRaw(Raw::Element e) {
@@ -2019,6 +2109,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TDynamicMemberRefExpr`, if possible.
    */
   TDynamicMemberRefExpr convertDynamicMemberRefExprFromRaw(Raw::Element e) {
@@ -2027,6 +2118,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TDynamicSubscriptExpr`, if possible.
    */
   TDynamicSubscriptExpr convertDynamicSubscriptExprFromRaw(Raw::Element e) {
@@ -2035,30 +2127,35 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TDynamicTypeExpr`, if possible.
    */
   TDynamicTypeExpr convertDynamicTypeExprFromRaw(Raw::Element e) { result = TDynamicTypeExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TEnumIsCaseExpr`, if possible.
    */
   TEnumIsCaseExpr convertEnumIsCaseExprFromRaw(Raw::Element e) { result = TEnumIsCaseExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TErasureExpr`, if possible.
    */
   TErasureExpr convertErasureExprFromRaw(Raw::Element e) { result = TErasureExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TErrorExpr`, if possible.
    */
   TErrorExpr convertErrorExprFromRaw(Raw::Element e) { result = TErrorExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TExistentialMetatypeToObjectExpr`, if possible.
    */
   TExistentialMetatypeToObjectExpr convertExistentialMetatypeToObjectExprFromRaw(Raw::Element e) {
@@ -2067,6 +2164,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TExplicitClosureExpr`, if possible.
    */
   TExplicitClosureExpr convertExplicitClosureExprFromRaw(Raw::Element e) {
@@ -2075,6 +2173,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TExtractFunctionIsolationExpr`, if possible.
    */
   TExtractFunctionIsolationExpr convertExtractFunctionIsolationExprFromRaw(Raw::Element e) {
@@ -2083,24 +2182,28 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TFloatLiteralExpr`, if possible.
    */
   TFloatLiteralExpr convertFloatLiteralExprFromRaw(Raw::Element e) { result = TFloatLiteralExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TForceTryExpr`, if possible.
    */
   TForceTryExpr convertForceTryExprFromRaw(Raw::Element e) { result = TForceTryExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TForceValueExpr`, if possible.
    */
   TForceValueExpr convertForceValueExprFromRaw(Raw::Element e) { result = TForceValueExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TForcedCheckedCastExpr`, if possible.
    */
   TForcedCheckedCastExpr convertForcedCheckedCastExprFromRaw(Raw::Element e) {
@@ -2109,6 +2212,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TForeignObjectConversionExpr`, if possible.
    */
   TForeignObjectConversionExpr convertForeignObjectConversionExprFromRaw(Raw::Element e) {
@@ -2117,6 +2221,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TFunctionConversionExpr`, if possible.
    */
   TFunctionConversionExpr convertFunctionConversionExprFromRaw(Raw::Element e) {
@@ -2125,18 +2230,21 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TIfExpr`, if possible.
    */
   TIfExpr convertIfExprFromRaw(Raw::Element e) { result = TIfExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TInOutExpr`, if possible.
    */
   TInOutExpr convertInOutExprFromRaw(Raw::Element e) { result = TInOutExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TInOutToPointerExpr`, if possible.
    */
   TInOutToPointerExpr convertInOutToPointerExprFromRaw(Raw::Element e) {
@@ -2145,6 +2253,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TInitializerRefCallExpr`, if possible.
    */
   TInitializerRefCallExpr convertInitializerRefCallExprFromRaw(Raw::Element e) {
@@ -2153,6 +2262,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TInjectIntoOptionalExpr`, if possible.
    */
   TInjectIntoOptionalExpr convertInjectIntoOptionalExprFromRaw(Raw::Element e) {
@@ -2161,6 +2271,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TIntegerLiteralExpr`, if possible.
    */
   TIntegerLiteralExpr convertIntegerLiteralExprFromRaw(Raw::Element e) {
@@ -2169,6 +2280,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TInterpolatedStringLiteralExpr`, if possible.
    */
   TInterpolatedStringLiteralExpr convertInterpolatedStringLiteralExprFromRaw(Raw::Element e) {
@@ -2177,12 +2289,14 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TIsExpr`, if possible.
    */
   TIsExpr convertIsExprFromRaw(Raw::Element e) { result = TIsExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TKeyPathApplicationExpr`, if possible.
    */
   TKeyPathApplicationExpr convertKeyPathApplicationExprFromRaw(Raw::Element e) {
@@ -2191,18 +2305,21 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TKeyPathDotExpr`, if possible.
    */
   TKeyPathDotExpr convertKeyPathDotExprFromRaw(Raw::Element e) { result = TKeyPathDotExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TKeyPathExpr`, if possible.
    */
   TKeyPathExpr convertKeyPathExprFromRaw(Raw::Element e) { result = TKeyPathExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TLazyInitializationExpr`, if possible.
    */
   TLazyInitializationExpr convertLazyInitializationExprFromRaw(Raw::Element e) {
@@ -2211,6 +2328,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TLinearFunctionExpr`, if possible.
    */
   TLinearFunctionExpr convertLinearFunctionExprFromRaw(Raw::Element e) {
@@ -2219,6 +2337,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TLinearFunctionExtractOriginalExpr`, if possible.
    */
   TLinearFunctionExtractOriginalExpr convertLinearFunctionExtractOriginalExprFromRaw(Raw::Element e) {
@@ -2227,6 +2346,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TLinearToDifferentiableFunctionExpr`, if possible.
    */
   TLinearToDifferentiableFunctionExpr convertLinearToDifferentiableFunctionExprFromRaw(
@@ -2237,12 +2357,14 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TLoadExpr`, if possible.
    */
   TLoadExpr convertLoadExprFromRaw(Raw::Element e) { result = TLoadExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TMagicIdentifierLiteralExpr`, if possible.
    */
   TMagicIdentifierLiteralExpr convertMagicIdentifierLiteralExprFromRaw(Raw::Element e) {
@@ -2251,6 +2373,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TMakeTemporarilyEscapableExpr`, if possible.
    */
   TMakeTemporarilyEscapableExpr convertMakeTemporarilyEscapableExprFromRaw(Raw::Element e) {
@@ -2259,6 +2382,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TMaterializePackExpr`, if possible.
    */
   TMaterializePackExpr convertMaterializePackExprFromRaw(Raw::Element e) {
@@ -2267,12 +2391,14 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TMemberRefExpr`, if possible.
    */
   TMemberRefExpr convertMemberRefExprFromRaw(Raw::Element e) { result = TMemberRefExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TMetatypeConversionExpr`, if possible.
    */
   TMetatypeConversionExpr convertMetatypeConversionExprFromRaw(Raw::Element e) {
@@ -2281,24 +2407,28 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TMethodLookupExpr`, if possible.
    */
   TMethodLookupExpr convertMethodLookupExprFromRaw(Raw::Element e) { result = TMethodLookupExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TNilLiteralExpr`, if possible.
    */
   TNilLiteralExpr convertNilLiteralExprFromRaw(Raw::Element e) { result = TNilLiteralExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TObjCSelectorExpr`, if possible.
    */
   TObjCSelectorExpr convertObjCSelectorExprFromRaw(Raw::Element e) { result = TObjCSelectorExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TObjectLiteralExpr`, if possible.
    */
   TObjectLiteralExpr convertObjectLiteralExprFromRaw(Raw::Element e) {
@@ -2307,18 +2437,21 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TOneWayExpr`, if possible.
    */
   TOneWayExpr convertOneWayExprFromRaw(Raw::Element e) { result = TOneWayExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TOpaqueValueExpr`, if possible.
    */
   TOpaqueValueExpr convertOpaqueValueExprFromRaw(Raw::Element e) { result = TOpaqueValueExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TOpenExistentialExpr`, if possible.
    */
   TOpenExistentialExpr convertOpenExistentialExprFromRaw(Raw::Element e) {
@@ -2327,6 +2460,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TOptionalEvaluationExpr`, if possible.
    */
   TOptionalEvaluationExpr convertOptionalEvaluationExprFromRaw(Raw::Element e) {
@@ -2335,12 +2469,14 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TOptionalTryExpr`, if possible.
    */
   TOptionalTryExpr convertOptionalTryExprFromRaw(Raw::Element e) { result = TOptionalTryExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TOtherInitializerRefExpr`, if possible.
    */
   TOtherInitializerRefExpr convertOtherInitializerRefExprFromRaw(Raw::Element e) {
@@ -2349,6 +2485,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TOverloadedDeclRefExpr`, if possible.
    */
   TOverloadedDeclRefExpr convertOverloadedDeclRefExprFromRaw(Raw::Element e) {
@@ -2357,12 +2494,14 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TPackElementExpr`, if possible.
    */
   TPackElementExpr convertPackElementExprFromRaw(Raw::Element e) { result = TPackElementExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TPackExpansionExpr`, if possible.
    */
   TPackExpansionExpr convertPackExpansionExprFromRaw(Raw::Element e) {
@@ -2371,12 +2510,14 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TParenExpr`, if possible.
    */
   TParenExpr convertParenExprFromRaw(Raw::Element e) { result = TParenExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TPointerToPointerExpr`, if possible.
    */
   TPointerToPointerExpr convertPointerToPointerExprFromRaw(Raw::Element e) {
@@ -2385,18 +2526,21 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TPostfixUnaryExpr`, if possible.
    */
   TPostfixUnaryExpr convertPostfixUnaryExprFromRaw(Raw::Element e) { result = TPostfixUnaryExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TPrefixUnaryExpr`, if possible.
    */
   TPrefixUnaryExpr convertPrefixUnaryExprFromRaw(Raw::Element e) { result = TPrefixUnaryExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TPropertyWrapperValuePlaceholderExpr`, if possible.
    */
   TPropertyWrapperValuePlaceholderExpr convertPropertyWrapperValuePlaceholderExprFromRaw(
@@ -2407,6 +2551,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TProtocolMetatypeToObjectExpr`, if possible.
    */
   TProtocolMetatypeToObjectExpr convertProtocolMetatypeToObjectExprFromRaw(Raw::Element e) {
@@ -2415,6 +2560,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TRebindSelfInInitializerExpr`, if possible.
    */
   TRebindSelfInInitializerExpr convertRebindSelfInInitializerExprFromRaw(Raw::Element e) {
@@ -2423,18 +2569,21 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TRegexLiteralExpr`, if possible.
    */
   TRegexLiteralExpr convertRegexLiteralExprFromRaw(Raw::Element e) { result = TRegexLiteralExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TSequenceExpr`, if possible.
    */
   TSequenceExpr convertSequenceExprFromRaw(Raw::Element e) { result = TSequenceExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TSingleValueStmtExpr`, if possible.
    */
   TSingleValueStmtExpr convertSingleValueStmtExprFromRaw(Raw::Element e) {
@@ -2443,6 +2592,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TStringLiteralExpr`, if possible.
    */
   TStringLiteralExpr convertStringLiteralExprFromRaw(Raw::Element e) {
@@ -2451,6 +2601,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TStringToPointerExpr`, if possible.
    */
   TStringToPointerExpr convertStringToPointerExprFromRaw(Raw::Element e) {
@@ -2459,54 +2610,63 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TSubscriptExpr`, if possible.
    */
   TSubscriptExpr convertSubscriptExprFromRaw(Raw::Element e) { result = TSubscriptExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TSuperRefExpr`, if possible.
    */
   TSuperRefExpr convertSuperRefExprFromRaw(Raw::Element e) { result = TSuperRefExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TTapExpr`, if possible.
    */
   TTapExpr convertTapExprFromRaw(Raw::Element e) { result = TTapExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TTryExpr`, if possible.
    */
   TTryExpr convertTryExprFromRaw(Raw::Element e) { result = TTryExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TTupleElementExpr`, if possible.
    */
   TTupleElementExpr convertTupleElementExprFromRaw(Raw::Element e) { result = TTupleElementExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TTupleExpr`, if possible.
    */
   TTupleExpr convertTupleExprFromRaw(Raw::Element e) { result = TTupleExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TTypeExpr`, if possible.
    */
   TTypeExpr convertTypeExprFromRaw(Raw::Element e) { result = TTypeExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TTypeValueExpr`, if possible.
    */
   TTypeValueExpr convertTypeValueExprFromRaw(Raw::Element e) { result = TTypeValueExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TUnderlyingToOpaqueExpr`, if possible.
    */
   TUnderlyingToOpaqueExpr convertUnderlyingToOpaqueExprFromRaw(Raw::Element e) {
@@ -2515,6 +2675,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TUnevaluatedInstanceExpr`, if possible.
    */
   TUnevaluatedInstanceExpr convertUnevaluatedInstanceExprFromRaw(Raw::Element e) {
@@ -2523,12 +2684,14 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TUnreachableExpr`, if possible.
    */
   TUnreachableExpr convertUnreachableExprFromRaw(Raw::Element e) { result = TUnreachableExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TUnresolvedDeclRefExpr`, if possible.
    */
   TUnresolvedDeclRefExpr convertUnresolvedDeclRefExprFromRaw(Raw::Element e) {
@@ -2537,6 +2700,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TUnresolvedDotExpr`, if possible.
    */
   TUnresolvedDotExpr convertUnresolvedDotExprFromRaw(Raw::Element e) {
@@ -2545,6 +2709,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TUnresolvedMemberChainResultExpr`, if possible.
    */
   TUnresolvedMemberChainResultExpr convertUnresolvedMemberChainResultExprFromRaw(Raw::Element e) {
@@ -2553,6 +2718,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TUnresolvedMemberExpr`, if possible.
    */
   TUnresolvedMemberExpr convertUnresolvedMemberExprFromRaw(Raw::Element e) {
@@ -2561,6 +2727,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TUnresolvedPatternExpr`, if possible.
    */
   TUnresolvedPatternExpr convertUnresolvedPatternExprFromRaw(Raw::Element e) {
@@ -2569,6 +2736,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TUnresolvedSpecializeExpr`, if possible.
    */
   TUnresolvedSpecializeExpr convertUnresolvedSpecializeExprFromRaw(Raw::Element e) {
@@ -2577,6 +2745,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TUnresolvedTypeConversionExpr`, if possible.
    */
   TUnresolvedTypeConversionExpr convertUnresolvedTypeConversionExprFromRaw(Raw::Element e) {
@@ -2585,12 +2754,21 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TUnsafeCastExpr`, if possible.
    */
   TUnsafeCastExpr convertUnsafeCastExprFromRaw(Raw::Element e) { result = TUnsafeCastExpr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
+   * Converts a raw element to a synthesized `TUnsafeExpr`, if possible.
+   */
+  TUnsafeExpr convertUnsafeExprFromRaw(Raw::Element e) { result = TUnsafeExpr(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TVarargExpansionExpr`, if possible.
    */
   TVarargExpansionExpr convertVarargExpansionExprFromRaw(Raw::Element e) {
@@ -2599,24 +2777,28 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TAnyPattern`, if possible.
    */
   TAnyPattern convertAnyPatternFromRaw(Raw::Element e) { result = TAnyPattern(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TBindingPattern`, if possible.
    */
   TBindingPattern convertBindingPatternFromRaw(Raw::Element e) { result = TBindingPattern(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TBoolPattern`, if possible.
    */
   TBoolPattern convertBoolPatternFromRaw(Raw::Element e) { result = TBoolPattern(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TEnumElementPattern`, if possible.
    */
   TEnumElementPattern convertEnumElementPatternFromRaw(Raw::Element e) {
@@ -2625,24 +2807,28 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TExprPattern`, if possible.
    */
   TExprPattern convertExprPatternFromRaw(Raw::Element e) { result = TExprPattern(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TIsPattern`, if possible.
    */
   TIsPattern convertIsPatternFromRaw(Raw::Element e) { result = TIsPattern(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TNamedPattern`, if possible.
    */
   TNamedPattern convertNamedPatternFromRaw(Raw::Element e) { result = TNamedPattern(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TOptionalSomePattern`, if possible.
    */
   TOptionalSomePattern convertOptionalSomePatternFromRaw(Raw::Element e) {
@@ -2651,174 +2837,203 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TParenPattern`, if possible.
    */
   TParenPattern convertParenPatternFromRaw(Raw::Element e) { result = TParenPattern(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TTuplePattern`, if possible.
    */
   TTuplePattern convertTuplePatternFromRaw(Raw::Element e) { result = TTuplePattern(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TTypedPattern`, if possible.
    */
   TTypedPattern convertTypedPatternFromRaw(Raw::Element e) { result = TTypedPattern(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TBraceStmt`, if possible.
    */
   TBraceStmt convertBraceStmtFromRaw(Raw::Element e) { result = TBraceStmt(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TBreakStmt`, if possible.
    */
   TBreakStmt convertBreakStmtFromRaw(Raw::Element e) { result = TBreakStmt(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TCaseLabelItem`, if possible.
    */
   TCaseLabelItem convertCaseLabelItemFromRaw(Raw::Element e) { result = TCaseLabelItem(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TCaseStmt`, if possible.
    */
   TCaseStmt convertCaseStmtFromRaw(Raw::Element e) { result = TCaseStmt(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TConditionElement`, if possible.
    */
   TConditionElement convertConditionElementFromRaw(Raw::Element e) { result = TConditionElement(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TContinueStmt`, if possible.
    */
   TContinueStmt convertContinueStmtFromRaw(Raw::Element e) { result = TContinueStmt(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TDeferStmt`, if possible.
    */
   TDeferStmt convertDeferStmtFromRaw(Raw::Element e) { result = TDeferStmt(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TDiscardStmt`, if possible.
    */
   TDiscardStmt convertDiscardStmtFromRaw(Raw::Element e) { result = TDiscardStmt(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TDoCatchStmt`, if possible.
    */
   TDoCatchStmt convertDoCatchStmtFromRaw(Raw::Element e) { result = TDoCatchStmt(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TDoStmt`, if possible.
    */
   TDoStmt convertDoStmtFromRaw(Raw::Element e) { result = TDoStmt(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TFailStmt`, if possible.
    */
   TFailStmt convertFailStmtFromRaw(Raw::Element e) { result = TFailStmt(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TFallthroughStmt`, if possible.
    */
   TFallthroughStmt convertFallthroughStmtFromRaw(Raw::Element e) { result = TFallthroughStmt(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TForEachStmt`, if possible.
    */
   TForEachStmt convertForEachStmtFromRaw(Raw::Element e) { result = TForEachStmt(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TGuardStmt`, if possible.
    */
   TGuardStmt convertGuardStmtFromRaw(Raw::Element e) { result = TGuardStmt(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TIfStmt`, if possible.
    */
   TIfStmt convertIfStmtFromRaw(Raw::Element e) { result = TIfStmt(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TPoundAssertStmt`, if possible.
    */
   TPoundAssertStmt convertPoundAssertStmtFromRaw(Raw::Element e) { result = TPoundAssertStmt(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TRepeatWhileStmt`, if possible.
    */
   TRepeatWhileStmt convertRepeatWhileStmtFromRaw(Raw::Element e) { result = TRepeatWhileStmt(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TReturnStmt`, if possible.
    */
   TReturnStmt convertReturnStmtFromRaw(Raw::Element e) { result = TReturnStmt(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TStmtCondition`, if possible.
    */
   TStmtCondition convertStmtConditionFromRaw(Raw::Element e) { result = TStmtCondition(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TSwitchStmt`, if possible.
    */
   TSwitchStmt convertSwitchStmtFromRaw(Raw::Element e) { result = TSwitchStmt(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TThenStmt`, if possible.
    */
   TThenStmt convertThenStmtFromRaw(Raw::Element e) { result = TThenStmt(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TThrowStmt`, if possible.
    */
   TThrowStmt convertThrowStmtFromRaw(Raw::Element e) { result = TThrowStmt(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TWhileStmt`, if possible.
    */
   TWhileStmt convertWhileStmtFromRaw(Raw::Element e) { result = TWhileStmt(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TYieldStmt`, if possible.
    */
   TYieldStmt convertYieldStmtFromRaw(Raw::Element e) { result = TYieldStmt(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TArraySliceType`, if possible.
    */
   TArraySliceType convertArraySliceTypeFromRaw(Raw::Element e) { result = TArraySliceType(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TBoundGenericClassType`, if possible.
    */
   TBoundGenericClassType convertBoundGenericClassTypeFromRaw(Raw::Element e) {
@@ -2827,6 +3042,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TBoundGenericEnumType`, if possible.
    */
   TBoundGenericEnumType convertBoundGenericEnumTypeFromRaw(Raw::Element e) {
@@ -2835,6 +3051,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TBoundGenericStructType`, if possible.
    */
   TBoundGenericStructType convertBoundGenericStructTypeFromRaw(Raw::Element e) {
@@ -2843,6 +3060,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TBuiltinBridgeObjectType`, if possible.
    */
   TBuiltinBridgeObjectType convertBuiltinBridgeObjectTypeFromRaw(Raw::Element e) {
@@ -2851,6 +3069,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TBuiltinDefaultActorStorageType`, if possible.
    */
   TBuiltinDefaultActorStorageType convertBuiltinDefaultActorStorageTypeFromRaw(Raw::Element e) {
@@ -2859,6 +3078,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TBuiltinExecutorType`, if possible.
    */
   TBuiltinExecutorType convertBuiltinExecutorTypeFromRaw(Raw::Element e) {
@@ -2867,6 +3087,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TBuiltinFixedArrayType`, if possible.
    */
   TBuiltinFixedArrayType convertBuiltinFixedArrayTypeFromRaw(Raw::Element e) {
@@ -2875,12 +3096,14 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TBuiltinFloatType`, if possible.
    */
   TBuiltinFloatType convertBuiltinFloatTypeFromRaw(Raw::Element e) { result = TBuiltinFloatType(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TBuiltinIntegerLiteralType`, if possible.
    */
   TBuiltinIntegerLiteralType convertBuiltinIntegerLiteralTypeFromRaw(Raw::Element e) {
@@ -2889,6 +3112,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TBuiltinIntegerType`, if possible.
    */
   TBuiltinIntegerType convertBuiltinIntegerTypeFromRaw(Raw::Element e) {
@@ -2897,12 +3121,14 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TBuiltinJobType`, if possible.
    */
   TBuiltinJobType convertBuiltinJobTypeFromRaw(Raw::Element e) { result = TBuiltinJobType(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TBuiltinNativeObjectType`, if possible.
    */
   TBuiltinNativeObjectType convertBuiltinNativeObjectTypeFromRaw(Raw::Element e) {
@@ -2911,6 +3137,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TBuiltinRawPointerType`, if possible.
    */
   TBuiltinRawPointerType convertBuiltinRawPointerTypeFromRaw(Raw::Element e) {
@@ -2919,6 +3146,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TBuiltinRawUnsafeContinuationType`, if possible.
    */
   TBuiltinRawUnsafeContinuationType convertBuiltinRawUnsafeContinuationTypeFromRaw(Raw::Element e) {
@@ -2927,6 +3155,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TBuiltinUnsafeValueBufferType`, if possible.
    */
   TBuiltinUnsafeValueBufferType convertBuiltinUnsafeValueBufferTypeFromRaw(Raw::Element e) {
@@ -2935,6 +3164,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TBuiltinVectorType`, if possible.
    */
   TBuiltinVectorType convertBuiltinVectorTypeFromRaw(Raw::Element e) {
@@ -2943,12 +3173,14 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TClassType`, if possible.
    */
   TClassType convertClassTypeFromRaw(Raw::Element e) { result = TClassType(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TDependentMemberType`, if possible.
    */
   TDependentMemberType convertDependentMemberTypeFromRaw(Raw::Element e) {
@@ -2957,18 +3189,21 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TDictionaryType`, if possible.
    */
   TDictionaryType convertDictionaryTypeFromRaw(Raw::Element e) { result = TDictionaryType(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TDynamicSelfType`, if possible.
    */
   TDynamicSelfType convertDynamicSelfTypeFromRaw(Raw::Element e) { result = TDynamicSelfType(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TElementArchetypeType`, if possible.
    */
   TElementArchetypeType convertElementArchetypeTypeFromRaw(Raw::Element e) {
@@ -2977,18 +3212,30 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TEnumType`, if possible.
    */
   TEnumType convertEnumTypeFromRaw(Raw::Element e) { result = TEnumType(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TErrorType`, if possible.
    */
   TErrorType convertErrorTypeFromRaw(Raw::Element e) { result = TErrorType(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
+   * Converts a raw element to a synthesized `TExistentialArchetypeType`, if possible.
+   */
+  TExistentialArchetypeType convertExistentialArchetypeTypeFromRaw(Raw::Element e) {
+    result = TExistentialArchetypeType(e)
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TExistentialMetatypeType`, if possible.
    */
   TExistentialMetatypeType convertExistentialMetatypeTypeFromRaw(Raw::Element e) {
@@ -2997,18 +3244,21 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TExistentialType`, if possible.
    */
   TExistentialType convertExistentialTypeFromRaw(Raw::Element e) { result = TExistentialType(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TFunctionType`, if possible.
    */
   TFunctionType convertFunctionTypeFromRaw(Raw::Element e) { result = TFunctionType(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TGenericFunctionType`, if possible.
    */
   TGenericFunctionType convertGenericFunctionTypeFromRaw(Raw::Element e) {
@@ -3017,6 +3267,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TGenericTypeParamType`, if possible.
    */
   TGenericTypeParamType convertGenericTypeParamTypeFromRaw(Raw::Element e) {
@@ -3025,36 +3276,49 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TInOutType`, if possible.
    */
   TInOutType convertInOutTypeFromRaw(Raw::Element e) { result = TInOutType(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
+   * Converts a raw element to a synthesized `TInlineArrayType`, if possible.
+   */
+  TInlineArrayType convertInlineArrayTypeFromRaw(Raw::Element e) { result = TInlineArrayType(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TIntegerType`, if possible.
    */
   TIntegerType convertIntegerTypeFromRaw(Raw::Element e) { result = TIntegerType(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TLValueType`, if possible.
    */
   TLValueType convertLValueTypeFromRaw(Raw::Element e) { result = TLValueType(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TMetatypeType`, if possible.
    */
   TMetatypeType convertMetatypeTypeFromRaw(Raw::Element e) { result = TMetatypeType(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TModuleType`, if possible.
    */
   TModuleType convertModuleTypeFromRaw(Raw::Element e) { result = TModuleType(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TOpaqueTypeArchetypeType`, if possible.
    */
   TOpaqueTypeArchetypeType convertOpaqueTypeArchetypeTypeFromRaw(Raw::Element e) {
@@ -3063,20 +3327,14 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TOpenedArchetypeType`, if possible.
-   */
-  TOpenedArchetypeType convertOpenedArchetypeTypeFromRaw(Raw::Element e) {
-    result = TOpenedArchetypeType(e)
-  }
-
-  /**
-   * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TOptionalType`, if possible.
    */
   TOptionalType convertOptionalTypeFromRaw(Raw::Element e) { result = TOptionalType(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TPackArchetypeType`, if possible.
    */
   TPackArchetypeType convertPackArchetypeTypeFromRaw(Raw::Element e) {
@@ -3085,12 +3343,14 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TPackElementType`, if possible.
    */
   TPackElementType convertPackElementTypeFromRaw(Raw::Element e) { result = TPackElementType(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TPackExpansionType`, if possible.
    */
   TPackExpansionType convertPackExpansionTypeFromRaw(Raw::Element e) {
@@ -3099,12 +3359,14 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TPackType`, if possible.
    */
   TPackType convertPackTypeFromRaw(Raw::Element e) { result = TPackType(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TParameterizedProtocolType`, if possible.
    */
   TParameterizedProtocolType convertParameterizedProtocolTypeFromRaw(Raw::Element e) {
@@ -3113,12 +3375,14 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TParenType`, if possible.
    */
   TParenType convertParenTypeFromRaw(Raw::Element e) { result = TParenType(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TPrimaryArchetypeType`, if possible.
    */
   TPrimaryArchetypeType convertPrimaryArchetypeTypeFromRaw(Raw::Element e) {
@@ -3127,6 +3391,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TProtocolCompositionType`, if possible.
    */
   TProtocolCompositionType convertProtocolCompositionTypeFromRaw(Raw::Element e) {
@@ -3135,36 +3400,42 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TProtocolType`, if possible.
    */
   TProtocolType convertProtocolTypeFromRaw(Raw::Element e) { result = TProtocolType(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TStructType`, if possible.
    */
   TStructType convertStructTypeFromRaw(Raw::Element e) { result = TStructType(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TTupleType`, if possible.
    */
   TTupleType convertTupleTypeFromRaw(Raw::Element e) { result = TTupleType(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TTypeAliasType`, if possible.
    */
   TTypeAliasType convertTypeAliasTypeFromRaw(Raw::Element e) { result = TTypeAliasType(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TTypeRepr`, if possible.
    */
   TTypeRepr convertTypeReprFromRaw(Raw::Element e) { result = TTypeRepr(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TUnboundGenericType`, if possible.
    */
   TUnboundGenericType convertUnboundGenericTypeFromRaw(Raw::Element e) {
@@ -3173,6 +3444,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TUnmanagedStorageType`, if possible.
    */
   TUnmanagedStorageType convertUnmanagedStorageTypeFromRaw(Raw::Element e) {
@@ -3181,6 +3453,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TUnownedStorageType`, if possible.
    */
   TUnownedStorageType convertUnownedStorageTypeFromRaw(Raw::Element e) {
@@ -3189,12 +3462,14 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TUnresolvedType`, if possible.
    */
   TUnresolvedType convertUnresolvedTypeFromRaw(Raw::Element e) { result = TUnresolvedType(e) }
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TVariadicSequenceType`, if possible.
    */
   TVariadicSequenceType convertVariadicSequenceTypeFromRaw(Raw::Element e) {
@@ -3203,6 +3478,7 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
+   *
    * Converts a raw element to a synthesized `TWeakStorageType`, if possible.
    */
   TWeakStorageType convertWeakStorageTypeFromRaw(Raw::Element e) { result = TWeakStorageType(e) }
@@ -3239,16 +3515,6 @@ module Synth {
     result = convertTypeReprFromRaw(e)
   }
 
-  /**
-   * INTERNAL: Do not use.
-   * Converts a raw DB element to a synthesized `TAvailabilitySpec`, if possible.
-   */
-  TAvailabilitySpec convertAvailabilitySpecFromRaw(Raw::Element e) {
-    result = convertOtherAvailabilitySpecFromRaw(e)
-    or
-    result = convertPlatformVersionAvailabilitySpecFromRaw(e)
-  }
-
   /**
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TCallable`, if possible.
@@ -3398,6 +3664,8 @@ module Synth {
     or
     result = convertTopLevelCodeDeclFromRaw(e)
     or
+    result = convertUsingDeclFromRaw(e)
+    or
     result = convertValueDeclFromRaw(e)
   }
 
@@ -3735,6 +4003,8 @@ module Synth {
     result = convertParenExprFromRaw(e)
     or
     result = convertUnresolvedMemberChainResultExprFromRaw(e)
+    or
+    result = convertUnsafeExprFromRaw(e)
   }
 
   /**
@@ -4058,7 +4328,7 @@ module Synth {
   TLocalArchetypeType convertLocalArchetypeTypeFromRaw(Raw::Element e) {
     result = convertElementArchetypeTypeFromRaw(e)
     or
-    result = convertOpenedArchetypeTypeFromRaw(e)
+    result = convertExistentialArchetypeTypeFromRaw(e)
   }
 
   /**
@@ -4126,6 +4396,8 @@ module Synth {
   TSyntaxSugarType convertSyntaxSugarTypeFromRaw(Raw::Element e) {
     result = convertDictionaryTypeFromRaw(e)
     or
+    result = convertInlineArrayTypeFromRaw(e)
+    or
     result = convertUnarySyntaxSugarTypeFromRaw(e)
   }
 
@@ -4197,6 +4469,12 @@ module Synth {
    */
   Raw::Element convertAvailabilityInfoToRaw(TAvailabilityInfo e) { e = TAvailabilityInfo(result) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TAvailabilitySpec` to a raw DB element, if possible.
+   */
+  Raw::Element convertAvailabilitySpecToRaw(TAvailabilitySpec e) { e = TAvailabilitySpec(result) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TComment` to a raw DB element, if possible.
@@ -4233,22 +4511,6 @@ module Synth {
    */
   Raw::Element convertMacroRoleToRaw(TMacroRole e) { e = TMacroRole(result) }
 
-  /**
-   * INTERNAL: Do not use.
-   * Converts a synthesized `TOtherAvailabilitySpec` to a raw DB element, if possible.
-   */
-  Raw::Element convertOtherAvailabilitySpecToRaw(TOtherAvailabilitySpec e) {
-    e = TOtherAvailabilitySpec(result)
-  }
-
-  /**
-   * INTERNAL: Do not use.
-   * Converts a synthesized `TPlatformVersionAvailabilitySpec` to a raw DB element, if possible.
-   */
-  Raw::Element convertPlatformVersionAvailabilitySpecToRaw(TPlatformVersionAvailabilitySpec e) {
-    e = TPlatformVersionAvailabilitySpec(result)
-  }
-
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TUnknownFile` to a raw DB element, if possible.
@@ -4473,6 +4735,12 @@ module Synth {
    */
   Raw::Element convertTypeAliasDeclToRaw(TTypeAliasDecl e) { e = TTypeAliasDecl(result) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TUsingDecl` to a raw DB element, if possible.
+   */
+  Raw::Element convertUsingDeclToRaw(TUsingDecl e) { e = TUsingDecl(result) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TAbiSafeConversionExpr` to a raw DB element, if possible.
@@ -5331,6 +5599,12 @@ module Synth {
    */
   Raw::Element convertUnsafeCastExprToRaw(TUnsafeCastExpr e) { e = TUnsafeCastExpr(result) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TUnsafeExpr` to a raw DB element, if possible.
+   */
+  Raw::Element convertUnsafeExprToRaw(TUnsafeExpr e) { e = TUnsafeExpr(result) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TVarargExpansionExpr` to a raw DB element, if possible.
@@ -5729,6 +6003,14 @@ module Synth {
    */
   Raw::Element convertErrorTypeToRaw(TErrorType e) { e = TErrorType(result) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TExistentialArchetypeType` to a raw DB element, if possible.
+   */
+  Raw::Element convertExistentialArchetypeTypeToRaw(TExistentialArchetypeType e) {
+    e = TExistentialArchetypeType(result)
+  }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TExistentialMetatypeType` to a raw DB element, if possible.
@@ -5771,6 +6053,12 @@ module Synth {
    */
   Raw::Element convertInOutTypeToRaw(TInOutType e) { e = TInOutType(result) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TInlineArrayType` to a raw DB element, if possible.
+   */
+  Raw::Element convertInlineArrayTypeToRaw(TInlineArrayType e) { e = TInlineArrayType(result) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TIntegerType` to a raw DB element, if possible.
@@ -5803,14 +6091,6 @@ module Synth {
     e = TOpaqueTypeArchetypeType(result)
   }
 
-  /**
-   * INTERNAL: Do not use.
-   * Converts a synthesized `TOpenedArchetypeType` to a raw DB element, if possible.
-   */
-  Raw::Element convertOpenedArchetypeTypeToRaw(TOpenedArchetypeType e) {
-    e = TOpenedArchetypeType(result)
-  }
-
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TOptionalType` to a raw DB element, if possible.
@@ -5981,16 +6261,6 @@ module Synth {
     result = convertTypeReprToRaw(e)
   }
 
-  /**
-   * INTERNAL: Do not use.
-   * Converts a synthesized `TAvailabilitySpec` to a raw DB element, if possible.
-   */
-  Raw::Element convertAvailabilitySpecToRaw(TAvailabilitySpec e) {
-    result = convertOtherAvailabilitySpecToRaw(e)
-    or
-    result = convertPlatformVersionAvailabilitySpecToRaw(e)
-  }
-
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TCallable` to a raw DB element, if possible.
@@ -6140,6 +6410,8 @@ module Synth {
     or
     result = convertTopLevelCodeDeclToRaw(e)
     or
+    result = convertUsingDeclToRaw(e)
+    or
     result = convertValueDeclToRaw(e)
   }
 
@@ -6477,6 +6749,8 @@ module Synth {
     result = convertParenExprToRaw(e)
     or
     result = convertUnresolvedMemberChainResultExprToRaw(e)
+    or
+    result = convertUnsafeExprToRaw(e)
   }
 
   /**
@@ -6800,7 +7074,7 @@ module Synth {
   Raw::Element convertLocalArchetypeTypeToRaw(TLocalArchetypeType e) {
     result = convertElementArchetypeTypeToRaw(e)
     or
-    result = convertOpenedArchetypeTypeToRaw(e)
+    result = convertExistentialArchetypeTypeToRaw(e)
   }
 
   /**
@@ -6868,6 +7142,8 @@ module Synth {
   Raw::Element convertSyntaxSugarTypeToRaw(TSyntaxSugarType e) {
     result = convertDictionaryTypeToRaw(e)
     or
+    result = convertInlineArrayTypeToRaw(e)
+    or
     result = convertUnarySyntaxSugarTypeToRaw(e)
   }
 
diff --git a/swift/ql/lib/codeql/swift/generated/SynthConstructors.qll b/swift/ql/lib/codeql/swift/generated/SynthConstructors.qll
index 8ffefd96281..f5bf77b6dc1 100644
--- a/swift/ql/lib/codeql/swift/generated/SynthConstructors.qll
+++ b/swift/ql/lib/codeql/swift/generated/SynthConstructors.qll
@@ -4,14 +4,13 @@
  */
 
 import codeql.swift.elements.internal.AvailabilityInfoConstructor
+import codeql.swift.elements.internal.AvailabilitySpecConstructor
 import codeql.swift.elements.internal.CommentConstructor
 import codeql.swift.elements.internal.DbFileConstructor
 import codeql.swift.elements.internal.DbLocationConstructor
 import codeql.swift.elements.internal.DiagnosticsConstructor
 import codeql.swift.elements.internal.KeyPathComponentConstructor
 import codeql.swift.elements.internal.MacroRoleConstructor
-import codeql.swift.elements.internal.OtherAvailabilitySpecConstructor
-import codeql.swift.elements.internal.PlatformVersionAvailabilitySpecConstructor
 import codeql.swift.elements.internal.UnspecifiedElementConstructor
 import codeql.swift.elements.decl.internal.AccessorConstructor
 import codeql.swift.elements.decl.internal.AssociatedTypeDeclConstructor
@@ -44,6 +43,7 @@ import codeql.swift.elements.decl.internal.StructDeclConstructor
 import codeql.swift.elements.decl.internal.SubscriptDeclConstructor
 import codeql.swift.elements.decl.internal.TopLevelCodeDeclConstructor
 import codeql.swift.elements.decl.internal.TypeAliasDeclConstructor
+import codeql.swift.elements.decl.internal.UsingDeclConstructor
 import codeql.swift.elements.expr.internal.AbiSafeConversionExprConstructor
 import codeql.swift.elements.expr.internal.ActorIsolationErasureExprConstructor
 import codeql.swift.elements.expr.internal.AnyHashableErasureExprConstructor
@@ -164,6 +164,7 @@ import codeql.swift.elements.expr.internal.UnresolvedPatternExprConstructor
 import codeql.swift.elements.expr.internal.UnresolvedSpecializeExprConstructor
 import codeql.swift.elements.expr.internal.UnresolvedTypeConversionExprConstructor
 import codeql.swift.elements.expr.internal.UnsafeCastExprConstructor
+import codeql.swift.elements.expr.internal.UnsafeExprConstructor
 import codeql.swift.elements.expr.internal.VarargExpansionExprConstructor
 import codeql.swift.elements.pattern.internal.AnyPatternConstructor
 import codeql.swift.elements.pattern.internal.BindingPatternConstructor
@@ -224,18 +225,19 @@ import codeql.swift.elements.type.internal.DynamicSelfTypeConstructor
 import codeql.swift.elements.type.internal.ElementArchetypeTypeConstructor
 import codeql.swift.elements.type.internal.EnumTypeConstructor
 import codeql.swift.elements.type.internal.ErrorTypeConstructor
+import codeql.swift.elements.type.internal.ExistentialArchetypeTypeConstructor
 import codeql.swift.elements.type.internal.ExistentialMetatypeTypeConstructor
 import codeql.swift.elements.type.internal.ExistentialTypeConstructor
 import codeql.swift.elements.type.internal.FunctionTypeConstructor
 import codeql.swift.elements.type.internal.GenericFunctionTypeConstructor
 import codeql.swift.elements.type.internal.GenericTypeParamTypeConstructor
 import codeql.swift.elements.type.internal.InOutTypeConstructor
+import codeql.swift.elements.type.internal.InlineArrayTypeConstructor
 import codeql.swift.elements.type.internal.IntegerTypeConstructor
 import codeql.swift.elements.type.internal.LValueTypeConstructor
 import codeql.swift.elements.type.internal.MetatypeTypeConstructor
 import codeql.swift.elements.type.internal.ModuleTypeConstructor
 import codeql.swift.elements.type.internal.OpaqueTypeArchetypeTypeConstructor
-import codeql.swift.elements.type.internal.OpenedArchetypeTypeConstructor
 import codeql.swift.elements.type.internal.OptionalTypeConstructor
 import codeql.swift.elements.type.internal.PackArchetypeTypeConstructor
 import codeql.swift.elements.type.internal.PackElementTypeConstructor
diff --git a/swift/ql/lib/codeql/swift/generated/decl/Accessor.qll b/swift/ql/lib/codeql/swift/generated/decl/Accessor.qll
index 75d887bf45e..f88ba83cbed 100644
--- a/swift/ql/lib/codeql/swift/generated/decl/Accessor.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/Accessor.qll
@@ -63,5 +63,27 @@ module Generated {
     predicate isUnsafeMutableAddress() {
       Synth::convertAccessorToRaw(this).(Raw::Accessor).isUnsafeMutableAddress()
     }
+
+    /**
+     * Holds if this accessor is a distributed getter.
+     */
+    predicate isDistributedGet() {
+      Synth::convertAccessorToRaw(this).(Raw::Accessor).isDistributedGet()
+    }
+
+    /**
+     * Holds if this accessor is a `read` coroutine, yielding a borrowed value of the property.
+     */
+    predicate isRead2() { Synth::convertAccessorToRaw(this).(Raw::Accessor).isRead2() }
+
+    /**
+     * Holds if this accessor is a `modify` coroutine, yielding an inout value of the property.
+     */
+    predicate isModify2() { Synth::convertAccessorToRaw(this).(Raw::Accessor).isModify2() }
+
+    /**
+     * Holds if this accessor is an `init` accessor.
+     */
+    predicate isInit() { Synth::convertAccessorToRaw(this).(Raw::Accessor).isInit() }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/generated/decl/UsingDecl.qll b/swift/ql/lib/codeql/swift/generated/decl/UsingDecl.qll
new file mode 100644
index 00000000000..cfbd68f7656
--- /dev/null
+++ b/swift/ql/lib/codeql/swift/generated/decl/UsingDecl.qll
@@ -0,0 +1,35 @@
+// generated by codegen/codegen.py, do not edit
+/**
+ * This module provides the generated definition of `UsingDecl`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.swift.generated.Synth
+private import codeql.swift.generated.Raw
+import codeql.swift.elements.decl.internal.DeclImpl::Impl as DeclImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `UsingDecl` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::UsingDecl` class directly.
+   * Use the subclass `UsingDecl`, where the following predicates are available.
+   */
+  class UsingDecl extends Synth::TUsingDecl, DeclImpl::Decl {
+    override string getAPrimaryQlClass() { result = "UsingDecl" }
+
+    /**
+     * Holds if this using declaration is main actor.
+     */
+    predicate isMainActor() { Synth::convertUsingDeclToRaw(this).(Raw::UsingDecl).isMainActor() }
+
+    /**
+     * Holds if this using declaration is nonisolated.
+     */
+    predicate isNonisolated() {
+      Synth::convertUsingDeclToRaw(this).(Raw::UsingDecl).isNonisolated()
+    }
+  }
+}
diff --git a/swift/ql/lib/codeql/swift/generated/expr/UnsafeExpr.qll b/swift/ql/lib/codeql/swift/generated/expr/UnsafeExpr.qll
new file mode 100644
index 00000000000..28c18c953fe
--- /dev/null
+++ b/swift/ql/lib/codeql/swift/generated/expr/UnsafeExpr.qll
@@ -0,0 +1,23 @@
+// generated by codegen/codegen.py, do not edit
+/**
+ * This module provides the generated definition of `UnsafeExpr`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.swift.generated.Synth
+private import codeql.swift.generated.Raw
+import codeql.swift.elements.expr.internal.IdentityExprImpl::Impl as IdentityExprImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `UnsafeExpr` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::UnsafeExpr` class directly.
+   * Use the subclass `UnsafeExpr`, where the following predicates are available.
+   */
+  class UnsafeExpr extends Synth::TUnsafeExpr, IdentityExprImpl::IdentityExpr {
+    override string getAPrimaryQlClass() { result = "UnsafeExpr" }
+  }
+}
diff --git a/swift/ql/lib/codeql/swift/generated/type/ExistentialArchetypeType.qll b/swift/ql/lib/codeql/swift/generated/type/ExistentialArchetypeType.qll
new file mode 100644
index 00000000000..42ee963e072
--- /dev/null
+++ b/swift/ql/lib/codeql/swift/generated/type/ExistentialArchetypeType.qll
@@ -0,0 +1,25 @@
+// generated by codegen/codegen.py, do not edit
+/**
+ * This module provides the generated definition of `ExistentialArchetypeType`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.swift.generated.Synth
+private import codeql.swift.generated.Raw
+import codeql.swift.elements.type.internal.LocalArchetypeTypeImpl::Impl as LocalArchetypeTypeImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `ExistentialArchetypeType` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::ExistentialArchetypeType` class directly.
+   * Use the subclass `ExistentialArchetypeType`, where the following predicates are available.
+   */
+  class ExistentialArchetypeType extends Synth::TExistentialArchetypeType,
+    LocalArchetypeTypeImpl::LocalArchetypeType
+  {
+    override string getAPrimaryQlClass() { result = "ExistentialArchetypeType" }
+  }
+}
diff --git a/swift/ql/lib/codeql/swift/generated/type/InlineArrayType.qll b/swift/ql/lib/codeql/swift/generated/type/InlineArrayType.qll
new file mode 100644
index 00000000000..ba314e62dda
--- /dev/null
+++ b/swift/ql/lib/codeql/swift/generated/type/InlineArrayType.qll
@@ -0,0 +1,70 @@
+// generated by codegen/codegen.py, do not edit
+/**
+ * This module provides the generated definition of `InlineArrayType`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.swift.generated.Synth
+private import codeql.swift.generated.Raw
+import codeql.swift.elements.type.internal.SyntaxSugarTypeImpl::Impl as SyntaxSugarTypeImpl
+import codeql.swift.elements.type.Type
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `InlineArrayType` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::InlineArrayType` class directly.
+   * Use the subclass `InlineArrayType`, where the following predicates are available.
+   */
+  class InlineArrayType extends Synth::TInlineArrayType, SyntaxSugarTypeImpl::SyntaxSugarType {
+    override string getAPrimaryQlClass() { result = "InlineArrayType" }
+
+    /**
+     * Gets the count type of this inline array type.
+     *
+     * This includes nodes from the "hidden" AST. It can be overridden in subclasses to change the
+     * behavior of both the `Immediate` and non-`Immediate` versions.
+     */
+    Type getImmediateCountType() {
+      result =
+        Synth::convertTypeFromRaw(Synth::convertInlineArrayTypeToRaw(this)
+              .(Raw::InlineArrayType)
+              .getCountType())
+    }
+
+    /**
+     * Gets the count type of this inline array type.
+     */
+    final Type getCountType() {
+      exists(Type immediate |
+        immediate = this.getImmediateCountType() and
+        if exists(this.getResolveStep()) then result = immediate else result = immediate.resolve()
+      )
+    }
+
+    /**
+     * Gets the element type of this inline array type.
+     *
+     * This includes nodes from the "hidden" AST. It can be overridden in subclasses to change the
+     * behavior of both the `Immediate` and non-`Immediate` versions.
+     */
+    Type getImmediateElementType() {
+      result =
+        Synth::convertTypeFromRaw(Synth::convertInlineArrayTypeToRaw(this)
+              .(Raw::InlineArrayType)
+              .getElementType())
+    }
+
+    /**
+     * Gets the element type of this inline array type.
+     */
+    final Type getElementType() {
+      exists(Type immediate |
+        immediate = this.getImmediateElementType() and
+        if exists(this.getResolveStep()) then result = immediate else result = immediate.resolve()
+      )
+    }
+  }
+}
diff --git a/swift/ql/lib/codeql/swift/generated/type/OpenedArchetypeType.qll b/swift/ql/lib/codeql/swift/generated/type/OpenedArchetypeType.qll
deleted file mode 100644
index 6dfb117b960..00000000000
--- a/swift/ql/lib/codeql/swift/generated/type/OpenedArchetypeType.qll
+++ /dev/null
@@ -1,25 +0,0 @@
-// generated by codegen/codegen.py, do not edit
-/**
- * This module provides the generated definition of `OpenedArchetypeType`.
- * INTERNAL: Do not import directly.
- */
-
-private import codeql.swift.generated.Synth
-private import codeql.swift.generated.Raw
-import codeql.swift.elements.type.internal.LocalArchetypeTypeImpl::Impl as LocalArchetypeTypeImpl
-
-/**
- * INTERNAL: This module contains the fully generated definition of `OpenedArchetypeType` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * INTERNAL: Do not reference the `Generated::OpenedArchetypeType` class directly.
-   * Use the subclass `OpenedArchetypeType`, where the following predicates are available.
-   */
-  class OpenedArchetypeType extends Synth::TOpenedArchetypeType,
-    LocalArchetypeTypeImpl::LocalArchetypeType
-  {
-    override string getAPrimaryQlClass() { result = "OpenedArchetypeType" }
-  }
-}
diff --git a/swift/ql/lib/codeql/swift/security/CleartextStorageDatabaseQuery.qll b/swift/ql/lib/codeql/swift/security/CleartextStorageDatabaseQuery.qll
index 989d928a8c7..50a421a05dc 100644
--- a/swift/ql/lib/codeql/swift/security/CleartextStorageDatabaseQuery.qll
+++ b/swift/ql/lib/codeql/swift/security/CleartextStorageDatabaseQuery.qll
@@ -52,12 +52,13 @@ module CleartextStorageDatabaseConfig implements DataFlow::ConfigSig {
   predicate observeDiffInformedIncrementalMode() { any() }
 
   Location getASelectedSinkLocation(DataFlow::Node sink) {
-    exists(DataFlow::Node cleanSink | result = cleanSink.getLocation() |
-      cleanSink = sink.(DataFlow::PostUpdateNode).getPreUpdateNode()
-      or
-      not sink instanceof DataFlow::PostUpdateNode and
-      cleanSink = sink
-    )
+    result = sink.(CleartextStorageDatabaseSink).getLocation()
+    or
+    result =
+      sink.(CleartextStorageDatabaseSink)
+          .(DataFlow::PostUpdateNode)
+          .getPreUpdateNode()
+          .getLocation()
   }
 }
 
diff --git a/swift/ql/lib/codeql/swift/security/CleartextStoragePreferencesQuery.qll b/swift/ql/lib/codeql/swift/security/CleartextStoragePreferencesQuery.qll
index c3665589482..578fe0b36e0 100644
--- a/swift/ql/lib/codeql/swift/security/CleartextStoragePreferencesQuery.qll
+++ b/swift/ql/lib/codeql/swift/security/CleartextStoragePreferencesQuery.qll
@@ -34,12 +34,13 @@ module CleartextStoragePreferencesConfig implements DataFlow::ConfigSig {
   predicate observeDiffInformedIncrementalMode() { any() }
 
   Location getASelectedSinkLocation(DataFlow::Node sink) {
-    exists(DataFlow::Node cleanSink | result = cleanSink.getLocation() |
-      cleanSink = sink.(DataFlow::PostUpdateNode).getPreUpdateNode()
-      or
-      not sink instanceof DataFlow::PostUpdateNode and
-      cleanSink = sink
-    )
+    result = sink.(CleartextStoragePreferencesSink).getLocation()
+    or
+    result =
+      sink.(CleartextStoragePreferencesSink)
+          .(DataFlow::PostUpdateNode)
+          .getPreUpdateNode()
+          .getLocation()
   }
 }
 
diff --git a/swift/ql/lib/codeql/swift/security/ConstantPasswordQuery.qll b/swift/ql/lib/codeql/swift/security/ConstantPasswordQuery.qll
index c0d4d7cd896..91d46b764df 100644
--- a/swift/ql/lib/codeql/swift/security/ConstantPasswordQuery.qll
+++ b/swift/ql/lib/codeql/swift/security/ConstantPasswordQuery.qll
@@ -40,8 +40,6 @@ module ConstantPasswordConfig implements DataFlow::ConfigSig {
   }
 
   predicate observeDiffInformedIncrementalMode() { any() }
-
-  Location getASelectedSourceLocation(DataFlow::Node sink) { none() }
 }
 
 module ConstantPasswordFlow = TaintTracking::Global<ConstantPasswordConfig>;
diff --git a/swift/ql/lib/codeql/swift/security/InsufficientHashIterationsQuery.qll b/swift/ql/lib/codeql/swift/security/InsufficientHashIterationsQuery.qll
index f1f21dabe03..0a7fea3d3c5 100644
--- a/swift/ql/lib/codeql/swift/security/InsufficientHashIterationsQuery.qll
+++ b/swift/ql/lib/codeql/swift/security/InsufficientHashIterationsQuery.qll
@@ -36,8 +36,6 @@ module InsufficientHashIterationsConfig implements DataFlow::ConfigSig {
   }
 
   predicate observeDiffInformedIncrementalMode() { any() }
-
-  Location getASelectedSourceLocation(DataFlow::Node sink) { none() }
 }
 
 module InsufficientHashIterationsFlow = TaintTracking::Global<InsufficientHashIterationsConfig>;
diff --git a/swift/ql/lib/codeql/swift/security/PathInjectionExtensions.qll b/swift/ql/lib/codeql/swift/security/PathInjectionExtensions.qll
index 72608f50fe6..1ad4e773456 100644
--- a/swift/ql/lib/codeql/swift/security/PathInjectionExtensions.qll
+++ b/swift/ql/lib/codeql/swift/security/PathInjectionExtensions.qll
@@ -108,7 +108,7 @@ private class DefaultPathInjectionBarrier extends PathInjectionBarrier {
       TaintTracking::localTaint(validated, DataFlow::exprNode(normalize.getQualifier())) and
       DataFlow::localExprFlow(normalize, starts.getQualifier()) and
       DataFlow::localFlow(validated, this) and
-      exists(ConditionBlock bb, SuccessorTypes::BooleanSuccessor b |
+      exists(ConditionBlock bb, BooleanSuccessor b |
         bb.getANode().getNode().asAstNode().(IfStmt).getACondition() = getImmediateParent*(starts) and
         b.getValue() = true
       |
diff --git a/swift/ql/lib/codeql/swift/security/StaticInitializationVectorQuery.qll b/swift/ql/lib/codeql/swift/security/StaticInitializationVectorQuery.qll
index fb6e21cac52..3c4359e02db 100644
--- a/swift/ql/lib/codeql/swift/security/StaticInitializationVectorQuery.qll
+++ b/swift/ql/lib/codeql/swift/security/StaticInitializationVectorQuery.qll
@@ -42,8 +42,6 @@ module StaticInitializationVectorConfig implements DataFlow::ConfigSig {
   }
 
   predicate observeDiffInformedIncrementalMode() { any() }
-
-  Location getASelectedSourceLocation(DataFlow::Node sink) { none() }
 }
 
 module StaticInitializationVectorFlow = TaintTracking::Global<StaticInitializationVectorConfig>;
diff --git a/swift/ql/lib/codeql/swift/security/StringLengthConflationQuery.qll b/swift/ql/lib/codeql/swift/security/StringLengthConflationQuery.qll
index 5ddcd2333e2..eb17306f22f 100644
--- a/swift/ql/lib/codeql/swift/security/StringLengthConflationQuery.qll
+++ b/swift/ql/lib/codeql/swift/security/StringLengthConflationQuery.qll
@@ -41,8 +41,6 @@ module StringLengthConflationConfig implements DataFlow::StateConfigSig {
   }
 
   predicate observeDiffInformedIncrementalMode() { any() }
-
-  Location getASelectedSourceLocation(DataFlow::Node sink) { none() }
 }
 
 /**
diff --git a/swift/ql/lib/codeql/swift/security/UnsafeJsEvalQuery.qll b/swift/ql/lib/codeql/swift/security/UnsafeJsEvalQuery.qll
index e82db8f4e7b..92b061b2af4 100644
--- a/swift/ql/lib/codeql/swift/security/UnsafeJsEvalQuery.qll
+++ b/swift/ql/lib/codeql/swift/security/UnsafeJsEvalQuery.qll
@@ -24,8 +24,6 @@ module UnsafeJsEvalConfig implements DataFlow::ConfigSig {
   }
 
   predicate observeDiffInformedIncrementalMode() { any() }
-
-  Location getASelectedSourceLocation(DataFlow::Node sink) { none() }
 }
 
 /**
diff --git a/swift/ql/lib/codeql/swift/security/UnsafeUnpackQuery.qll b/swift/ql/lib/codeql/swift/security/UnsafeUnpackQuery.qll
index a8485ff9947..e79bce5ba14 100644
--- a/swift/ql/lib/codeql/swift/security/UnsafeUnpackQuery.qll
+++ b/swift/ql/lib/codeql/swift/security/UnsafeUnpackQuery.qll
@@ -26,8 +26,6 @@ module UnsafeUnpackConfig implements DataFlow::ConfigSig {
   }
 
   predicate observeDiffInformedIncrementalMode() { any() }
-
-  Location getASelectedSourceLocation(DataFlow::Node sink) { none() }
 }
 
 /**
diff --git a/swift/ql/lib/qlpack.yml b/swift/ql/lib/qlpack.yml
index 057ff6a9133..ba8c8aac044 100644
--- a/swift/ql/lib/qlpack.yml
+++ b/swift/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/swift-all
-version: 5.0.5-dev
+version: 6.0.1-dev
 groups: swift
 extractor: swift
 dbscheme: swift.dbscheme
diff --git a/swift/ql/lib/swift.dbscheme b/swift/ql/lib/swift.dbscheme
index 987ab0bc091..33e5e5e03bd 100644
--- a/swift/ql/lib/swift.dbscheme
+++ b/swift/ql/lib/swift.dbscheme
@@ -133,10 +133,26 @@ availability_info_specs(
   int spec: @availability_spec_or_none ref
 );
 
-@availability_spec =
-  @other_availability_spec
-| @platform_version_availability_spec
-;
+availability_specs(
+  unique int id: @availability_spec
+);
+
+#keyset[id]
+availability_spec_platforms(
+  int id: @availability_spec ref,
+  string platform: string ref
+);
+
+#keyset[id]
+availability_spec_versions(
+  int id: @availability_spec ref,
+  string version: string ref
+);
+
+#keyset[id]
+availability_spec_is_wildcard(
+  int id: @availability_spec ref
+);
 
 @callable =
   @closure_expr
@@ -245,16 +261,6 @@ unspecified_element_children(
   int child: @ast_node_or_none ref
 );
 
-other_availability_specs(
-  unique int id: @other_availability_spec
-);
-
-platform_version_availability_specs(
-  unique int id: @platform_version_availability_spec,
-  string platform: string ref,
-  string version: string ref
-);
-
 @decl =
   @captured_decl
 | @enum_case_decl
@@ -267,6 +273,7 @@ platform_version_availability_specs(
 | @pound_diagnostic_decl
 | @precedence_group_decl
 | @top_level_code_decl
+| @using_decl
 | @value_decl
 ;
 
@@ -419,6 +426,20 @@ top_level_code_decls(  //dir=decl
   int body: @brace_stmt_or_none ref
 );
 
+using_decls(  //dir=decl
+  unique int id: @using_decl
+);
+
+#keyset[id]
+using_decl_is_main_actor(  //dir=decl
+  int id: @using_decl ref
+);
+
+#keyset[id]
+using_decl_is_nonisolated(  //dir=decl
+  int id: @using_decl ref
+);
+
 @value_decl =
   @abstract_storage_decl
 | @enum_element_decl
@@ -677,6 +698,26 @@ accessor_is_unsafe_mutable_address(  //dir=decl
   int id: @accessor ref
 );
 
+#keyset[id]
+accessor_is_distributed_get(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_read2(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_modify2(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_init(  //dir=decl
+  int id: @accessor ref
+);
+
 associated_type_decls(  //dir=decl
   unique int id: @associated_type_decl
 );
@@ -1018,6 +1059,7 @@ force_value_exprs(  //dir=expr
 | @dot_self_expr
 | @paren_expr
 | @unresolved_member_chain_result_expr
+| @unsafe_expr
 ;
 
 #keyset[id]
@@ -1667,6 +1709,10 @@ unsafe_cast_exprs(  //dir=expr
   unique int id: @unsafe_cast_expr
 );
 
+unsafe_exprs(  //dir=expr
+  unique int id: @unsafe_expr
+);
+
 boolean_literal_exprs(  //dir=expr
   unique int id: @boolean_literal_expr,
   boolean value: boolean ref
@@ -2474,6 +2520,7 @@ paren_types(  //dir=type
 
 @syntax_sugar_type =
   @dictionary_type
+| @inline_array_type
 | @unary_syntax_sugar_type
 ;
 
@@ -2531,9 +2578,15 @@ dictionary_types(  //dir=type
   int value_type: @type_or_none ref
 );
 
+inline_array_types(  //dir=type
+  unique int id: @inline_array_type,
+  int count_type: @type_or_none ref,
+  int element_type: @type_or_none ref
+);
+
 @local_archetype_type =
   @element_archetype_type
-| @opened_archetype_type
+| @existential_archetype_type
 ;
 
 @nominal_type =
@@ -2596,8 +2649,8 @@ enum_types(  //dir=type
   unique int id: @enum_type
 );
 
-opened_archetype_types(  //dir=type
-  unique int id: @opened_archetype_type
+existential_archetype_types(  //dir=type
+  unique int id: @existential_archetype_type
 );
 
 optional_types(  //dir=type
diff --git a/swift/ql/lib/swift.qll b/swift/ql/lib/swift.qll
index 901d9e895e0..54f2abf9092 100644
--- a/swift/ql/lib/swift.qll
+++ b/swift/ql/lib/swift.qll
@@ -1,5 +1,6 @@
 /** Top-level import for the Swift language pack */
 
+import Customizations
 import codeql.swift.elements
 import codeql.swift.elements.expr.ArithmeticOperation
 import codeql.swift.elements.expr.Assignment
diff --git a/swift/ql/lib/upgrades/987ab0bc0911f8c88449210e21d2ee80ebcb488a/availability_specs.ql b/swift/ql/lib/upgrades/987ab0bc0911f8c88449210e21d2ee80ebcb488a/availability_specs.ql
new file mode 100644
index 00000000000..5408529da5c
--- /dev/null
+++ b/swift/ql/lib/upgrades/987ab0bc0911f8c88449210e21d2ee80ebcb488a/availability_specs.ql
@@ -0,0 +1,21 @@
+class AvailabilitySpec extends @availability_spec {
+  string toString() { none() }
+}
+
+query predicate new_availability_specs(AvailabilitySpec id) {
+  platform_version_availability_specs(id, _, _)
+  or
+  other_availability_specs(id)
+}
+
+query predicate new_availability_spec_platforms(AvailabilitySpec id, string platform) {
+  platform_version_availability_specs(id, platform, _)
+}
+
+query predicate new_availability_spec_versions(AvailabilitySpec id, string version) {
+  platform_version_availability_specs(id, _, version)
+}
+
+query predicate new_availability_spec_is_wildcard(AvailabilitySpec id) {
+  other_availability_specs(id)
+}
diff --git a/swift/ql/lib/upgrades/987ab0bc0911f8c88449210e21d2ee80ebcb488a/existential_archetype_types.ql b/swift/ql/lib/upgrades/987ab0bc0911f8c88449210e21d2ee80ebcb488a/existential_archetype_types.ql
new file mode 100644
index 00000000000..d93f46fb2bc
--- /dev/null
+++ b/swift/ql/lib/upgrades/987ab0bc0911f8c88449210e21d2ee80ebcb488a/existential_archetype_types.ql
@@ -0,0 +1,7 @@
+class OpenedArchetypeType extends @opened_archetype_type {
+  string toString() { none() }
+}
+
+from OpenedArchetypeType id
+where opened_archetype_types(id)
+select id
diff --git a/swift/ql/lib/upgrades/987ab0bc0911f8c88449210e21d2ee80ebcb488a/key_path_components.ql b/swift/ql/lib/upgrades/987ab0bc0911f8c88449210e21d2ee80ebcb488a/key_path_components.ql
new file mode 100644
index 00000000000..8d349dcd4fa
--- /dev/null
+++ b/swift/ql/lib/upgrades/987ab0bc0911f8c88449210e21d2ee80ebcb488a/key_path_components.ql
@@ -0,0 +1,18 @@
+class KeyPathComponent extends @key_path_component {
+  string toString() { none() }
+}
+
+class TypeOrNone extends @type_or_none {
+  string toString() { none() }
+}
+
+from KeyPathComponent id, int kind, int new_kind, TypeOrNone component_type
+where
+  key_path_components(id, kind, component_type) and
+  if kind = 0
+  then new_kind = kind
+  else
+    if kind = 1 or kind = 2
+    then new_kind = kind + 1
+    else new_kind = kind + 2
+select id, new_kind, component_type
diff --git a/swift/ql/lib/upgrades/987ab0bc0911f8c88449210e21d2ee80ebcb488a/old.dbscheme b/swift/ql/lib/upgrades/987ab0bc0911f8c88449210e21d2ee80ebcb488a/old.dbscheme
new file mode 100644
index 00000000000..987ab0bc091
--- /dev/null
+++ b/swift/ql/lib/upgrades/987ab0bc0911f8c88449210e21d2ee80ebcb488a/old.dbscheme
@@ -0,0 +1,2832 @@
+// generated by codegen/codegen.py, do not edit
+
+// from prefix.dbscheme
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(
+  string prefix: string ref
+);
+
+
+// from schema.py
+
+@element =
+  @file
+| @generic_context
+| @locatable
+| @location
+| @type
+;
+
+#keyset[id]
+element_is_unknown(
+  int id: @element ref
+);
+
+@file =
+  @db_file
+;
+
+#keyset[id]
+files(
+  int id: @file ref,
+  string name: string ref
+);
+
+#keyset[id]
+file_is_successfully_extracted(
+  int id: @file ref
+);
+
+@locatable =
+  @argument
+| @ast_node
+| @comment
+| @diagnostics
+| @error_element
+;
+
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_or_none ref
+);
+
+@location =
+  @db_location
+;
+
+#keyset[id]
+locations(
+  int id: @location ref,
+  int file: @file_or_none ref,
+  int start_line: int ref,
+  int start_column: int ref,
+  int end_line: int ref,
+  int end_column: int ref
+);
+
+@ast_node =
+  @availability_info
+| @availability_spec
+| @callable
+| @case_label_item
+| @condition_element
+| @decl
+| @expr
+| @key_path_component
+| @macro_role
+| @pattern
+| @stmt
+| @stmt_condition
+| @type_repr
+;
+
+comments(
+  unique int id: @comment,
+  string text: string ref
+);
+
+db_files(
+  unique int id: @db_file
+);
+
+db_locations(
+  unique int id: @db_location
+);
+
+diagnostics(
+  unique int id: @diagnostics,
+  string text: string ref,
+  int kind: int ref
+);
+
+@error_element =
+  @error_expr
+| @error_type
+| @overloaded_decl_ref_expr
+| @unresolved_decl_ref_expr
+| @unresolved_dot_expr
+| @unresolved_member_chain_result_expr
+| @unresolved_member_expr
+| @unresolved_pattern_expr
+| @unresolved_specialize_expr
+| @unresolved_type
+| @unresolved_type_conversion_expr
+| @unspecified_element
+;
+
+availability_infos(
+  unique int id: @availability_info
+);
+
+#keyset[id]
+availability_info_is_unavailable(
+  int id: @availability_info ref
+);
+
+#keyset[id, index]
+availability_info_specs(
+  int id: @availability_info ref,
+  int index: int ref,
+  int spec: @availability_spec_or_none ref
+);
+
+@availability_spec =
+  @other_availability_spec
+| @platform_version_availability_spec
+;
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_names(
+  int id: @callable ref,
+  string name: string ref
+);
+
+#keyset[id]
+callable_self_params(
+  int id: @callable ref,
+  int self_param: @param_decl_or_none ref
+);
+
+#keyset[id, index]
+callable_params(
+  int id: @callable ref,
+  int index: int ref,
+  int param: @param_decl_or_none ref
+);
+
+#keyset[id]
+callable_bodies(
+  int id: @callable ref,
+  int body: @brace_stmt_or_none ref
+);
+
+#keyset[id, index]
+callable_captures(
+  int id: @callable ref,
+  int index: int ref,
+  int capture: @captured_decl_or_none ref
+);
+
+key_path_components(
+  unique int id: @key_path_component,
+  int kind: int ref,
+  int component_type: @type_or_none ref
+);
+
+#keyset[id, index]
+key_path_component_subscript_arguments(
+  int id: @key_path_component ref,
+  int index: int ref,
+  int subscript_argument: @argument_or_none ref
+);
+
+#keyset[id]
+key_path_component_tuple_indices(
+  int id: @key_path_component ref,
+  int tuple_index: int ref
+);
+
+#keyset[id]
+key_path_component_decl_refs(
+  int id: @key_path_component ref,
+  int decl_ref: @value_decl_or_none ref
+);
+
+macro_roles(
+  unique int id: @macro_role,
+  int kind: int ref,
+  int macro_syntax: int ref
+);
+
+#keyset[id, index]
+macro_role_conformances(
+  int id: @macro_role ref,
+  int index: int ref,
+  int conformance: @expr_or_none ref
+);
+
+#keyset[id, index]
+macro_role_names(
+  int id: @macro_role ref,
+  int index: int ref,
+  string name: string ref
+);
+
+unspecified_elements(
+  unique int id: @unspecified_element,
+  string property: string ref,
+  string error: string ref
+);
+
+#keyset[id]
+unspecified_element_parents(
+  int id: @unspecified_element ref,
+  int parent: @element ref
+);
+
+#keyset[id]
+unspecified_element_indices(
+  int id: @unspecified_element ref,
+  int index: int ref
+);
+
+#keyset[id, index]
+unspecified_element_children(
+  int id: @unspecified_element ref,
+  int index: int ref,
+  int child: @ast_node_or_none ref
+);
+
+other_availability_specs(
+  unique int id: @other_availability_spec
+);
+
+platform_version_availability_specs(
+  unique int id: @platform_version_availability_spec,
+  string platform: string ref,
+  string version: string ref
+);
+
+@decl =
+  @captured_decl
+| @enum_case_decl
+| @extension_decl
+| @if_config_decl
+| @import_decl
+| @missing_member_decl
+| @operator_decl
+| @pattern_binding_decl
+| @pound_diagnostic_decl
+| @precedence_group_decl
+| @top_level_code_decl
+| @value_decl
+;
+
+#keyset[id]
+decls(  //dir=decl
+  int id: @decl ref,
+  int module: @module_decl_or_none ref
+);
+
+#keyset[id, index]
+decl_members(  //dir=decl
+  int id: @decl ref,
+  int index: int ref,
+  int member: @decl_or_none ref
+);
+
+@generic_context =
+  @extension_decl
+| @function
+| @generic_type_decl
+| @macro_decl
+| @subscript_decl
+;
+
+#keyset[id, index]
+generic_context_generic_type_params(  //dir=decl
+  int id: @generic_context ref,
+  int index: int ref,
+  int generic_type_param: @generic_type_param_decl_or_none ref
+);
+
+captured_decls(  //dir=decl
+  unique int id: @captured_decl,
+  int decl: @value_decl_or_none ref
+);
+
+#keyset[id]
+captured_decl_is_direct(  //dir=decl
+  int id: @captured_decl ref
+);
+
+#keyset[id]
+captured_decl_is_escaping(  //dir=decl
+  int id: @captured_decl ref
+);
+
+enum_case_decls(  //dir=decl
+  unique int id: @enum_case_decl
+);
+
+#keyset[id, index]
+enum_case_decl_elements(  //dir=decl
+  int id: @enum_case_decl ref,
+  int index: int ref,
+  int element: @enum_element_decl_or_none ref
+);
+
+extension_decls(  //dir=decl
+  unique int id: @extension_decl,
+  int extended_type_decl: @nominal_type_decl_or_none ref
+);
+
+#keyset[id, index]
+extension_decl_protocols(  //dir=decl
+  int id: @extension_decl ref,
+  int index: int ref,
+  int protocol: @protocol_decl_or_none ref
+);
+
+if_config_decls(  //dir=decl
+  unique int id: @if_config_decl
+);
+
+#keyset[id, index]
+if_config_decl_active_elements(  //dir=decl
+  int id: @if_config_decl ref,
+  int index: int ref,
+  int active_element: @ast_node_or_none ref
+);
+
+import_decls(  //dir=decl
+  unique int id: @import_decl
+);
+
+#keyset[id]
+import_decl_is_exported(  //dir=decl
+  int id: @import_decl ref
+);
+
+#keyset[id]
+import_decl_imported_modules(  //dir=decl
+  int id: @import_decl ref,
+  int imported_module: @module_decl_or_none ref
+);
+
+#keyset[id, index]
+import_decl_declarations(  //dir=decl
+  int id: @import_decl ref,
+  int index: int ref,
+  int declaration: @value_decl_or_none ref
+);
+
+missing_member_decls(  //dir=decl
+  unique int id: @missing_member_decl,
+  string name: string ref
+);
+
+@operator_decl =
+  @infix_operator_decl
+| @postfix_operator_decl
+| @prefix_operator_decl
+;
+
+#keyset[id]
+operator_decls(  //dir=decl
+  int id: @operator_decl ref,
+  string name: string ref
+);
+
+pattern_binding_decls(  //dir=decl
+  unique int id: @pattern_binding_decl
+);
+
+#keyset[id, index]
+pattern_binding_decl_inits(  //dir=decl
+  int id: @pattern_binding_decl ref,
+  int index: int ref,
+  int init: @expr_or_none ref
+);
+
+#keyset[id, index]
+pattern_binding_decl_patterns(  //dir=decl
+  int id: @pattern_binding_decl ref,
+  int index: int ref,
+  int pattern: @pattern_or_none ref
+);
+
+pound_diagnostic_decls(  //dir=decl
+  unique int id: @pound_diagnostic_decl,
+  int kind: int ref,
+  int message: @string_literal_expr_or_none ref
+);
+
+precedence_group_decls(  //dir=decl
+  unique int id: @precedence_group_decl
+);
+
+top_level_code_decls(  //dir=decl
+  unique int id: @top_level_code_decl,
+  int body: @brace_stmt_or_none ref
+);
+
+@value_decl =
+  @abstract_storage_decl
+| @enum_element_decl
+| @function
+| @macro_decl
+| @type_decl
+;
+
+#keyset[id]
+value_decls(  //dir=decl
+  int id: @value_decl ref,
+  int interface_type: @type_or_none ref
+);
+
+@abstract_storage_decl =
+  @subscript_decl
+| @var_decl
+;
+
+#keyset[id, index]
+abstract_storage_decl_accessors(  //dir=decl
+  int id: @abstract_storage_decl ref,
+  int index: int ref,
+  int accessor: @accessor_or_none ref
+);
+
+enum_element_decls(  //dir=decl
+  unique int id: @enum_element_decl,
+  string name: string ref
+);
+
+#keyset[id, index]
+enum_element_decl_params(  //dir=decl
+  int id: @enum_element_decl ref,
+  int index: int ref,
+  int param: @param_decl_or_none ref
+);
+
+@function =
+  @accessor_or_named_function
+| @deinitializer
+| @initializer
+;
+
+infix_operator_decls(  //dir=decl
+  unique int id: @infix_operator_decl
+);
+
+#keyset[id]
+infix_operator_decl_precedence_groups(  //dir=decl
+  int id: @infix_operator_decl ref,
+  int precedence_group: @precedence_group_decl_or_none ref
+);
+
+macro_decls(  //dir=decl
+  unique int id: @macro_decl,
+  string name: string ref
+);
+
+#keyset[id, index]
+macro_decl_parameters(  //dir=decl
+  int id: @macro_decl ref,
+  int index: int ref,
+  int parameter: @param_decl_or_none ref
+);
+
+#keyset[id, index]
+macro_decl_roles(  //dir=decl
+  int id: @macro_decl ref,
+  int index: int ref,
+  int role: @macro_role_or_none ref
+);
+
+postfix_operator_decls(  //dir=decl
+  unique int id: @postfix_operator_decl
+);
+
+prefix_operator_decls(  //dir=decl
+  unique int id: @prefix_operator_decl
+);
+
+@type_decl =
+  @abstract_type_param_decl
+| @generic_type_decl
+| @module_decl
+;
+
+#keyset[id]
+type_decls(  //dir=decl
+  int id: @type_decl ref,
+  string name: string ref
+);
+
+#keyset[id, index]
+type_decl_inherited_types(  //dir=decl
+  int id: @type_decl ref,
+  int index: int ref,
+  int inherited_type: @type_or_none ref
+);
+
+@abstract_type_param_decl =
+  @associated_type_decl
+| @generic_type_param_decl
+;
+
+@accessor_or_named_function =
+  @accessor
+| @named_function
+;
+
+deinitializers(  //dir=decl
+  unique int id: @deinitializer
+);
+
+@generic_type_decl =
+  @nominal_type_decl
+| @opaque_type_decl
+| @type_alias_decl
+;
+
+initializers(  //dir=decl
+  unique int id: @initializer
+);
+
+module_decls(  //dir=decl
+  unique int id: @module_decl
+);
+
+#keyset[id]
+module_decl_is_builtin_module(  //dir=decl
+  int id: @module_decl ref
+);
+
+#keyset[id]
+module_decl_is_system_module(  //dir=decl
+  int id: @module_decl ref
+);
+
+module_decl_imported_modules(  //dir=decl
+  int id: @module_decl ref,
+  int imported_module: @module_decl_or_none ref
+);
+
+module_decl_exported_modules(  //dir=decl
+  int id: @module_decl ref,
+  int exported_module: @module_decl_or_none ref
+);
+
+subscript_decls(  //dir=decl
+  unique int id: @subscript_decl,
+  int element_type: @type_or_none ref
+);
+
+#keyset[id, index]
+subscript_decl_params(  //dir=decl
+  int id: @subscript_decl ref,
+  int index: int ref,
+  int param: @param_decl_or_none ref
+);
+
+@var_decl =
+  @concrete_var_decl
+| @param_decl
+;
+
+#keyset[id]
+var_decls(  //dir=decl
+  int id: @var_decl ref,
+  string name: string ref,
+  int type_: @type_or_none ref
+);
+
+#keyset[id]
+var_decl_attached_property_wrapper_types(  //dir=decl
+  int id: @var_decl ref,
+  int attached_property_wrapper_type: @type_or_none ref
+);
+
+#keyset[id]
+var_decl_parent_patterns(  //dir=decl
+  int id: @var_decl ref,
+  int parent_pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+var_decl_parent_initializers(  //dir=decl
+  int id: @var_decl ref,
+  int parent_initializer: @expr_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_backing_var_bindings(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_backing_var_binding: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_backing_vars(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_backing_var: @var_decl_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_projection_var_bindings(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_projection_var_binding: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_projection_vars(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_projection_var: @var_decl_or_none ref
+);
+
+accessors(  //dir=decl
+  unique int id: @accessor
+);
+
+#keyset[id]
+accessor_is_getter(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_setter(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_will_set(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_did_set(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_read(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_modify(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_unsafe_address(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_unsafe_mutable_address(  //dir=decl
+  int id: @accessor ref
+);
+
+associated_type_decls(  //dir=decl
+  unique int id: @associated_type_decl
+);
+
+concrete_var_decls(  //dir=decl
+  unique int id: @concrete_var_decl,
+  int introducer_int: int ref
+);
+
+generic_type_param_decls(  //dir=decl
+  unique int id: @generic_type_param_decl
+);
+
+named_functions(  //dir=decl
+  unique int id: @named_function
+);
+
+@nominal_type_decl =
+  @class_decl
+| @enum_decl
+| @protocol_decl
+| @struct_decl
+;
+
+#keyset[id]
+nominal_type_decls(  //dir=decl
+  int id: @nominal_type_decl ref,
+  int type_: @type_or_none ref
+);
+
+opaque_type_decls(  //dir=decl
+  unique int id: @opaque_type_decl,
+  int naming_declaration: @value_decl_or_none ref
+);
+
+#keyset[id, index]
+opaque_type_decl_opaque_generic_params(  //dir=decl
+  int id: @opaque_type_decl ref,
+  int index: int ref,
+  int opaque_generic_param: @generic_type_param_type_or_none ref
+);
+
+param_decls(  //dir=decl
+  unique int id: @param_decl
+);
+
+#keyset[id]
+param_decl_is_inout(  //dir=decl
+  int id: @param_decl ref
+);
+
+#keyset[id]
+param_decl_property_wrapper_local_wrapped_var_bindings(  //dir=decl
+  int id: @param_decl ref,
+  int property_wrapper_local_wrapped_var_binding: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+param_decl_property_wrapper_local_wrapped_vars(  //dir=decl
+  int id: @param_decl ref,
+  int property_wrapper_local_wrapped_var: @var_decl_or_none ref
+);
+
+type_alias_decls(  //dir=decl
+  unique int id: @type_alias_decl,
+  int aliased_type: @type_or_none ref
+);
+
+class_decls(  //dir=decl
+  unique int id: @class_decl
+);
+
+enum_decls(  //dir=decl
+  unique int id: @enum_decl
+);
+
+protocol_decls(  //dir=decl
+  unique int id: @protocol_decl
+);
+
+struct_decls(  //dir=decl
+  unique int id: @struct_decl
+);
+
+arguments(  //dir=expr
+  unique int id: @argument,
+  string label: string ref,
+  int expr: @expr_or_none ref
+);
+
+@expr =
+  @any_try_expr
+| @applied_property_wrapper_expr
+| @apply_expr
+| @assign_expr
+| @bind_optional_expr
+| @capture_list_expr
+| @closure_expr
+| @collection_expr
+| @consume_expr
+| @copy_expr
+| @current_context_isolation_expr
+| @decl_ref_expr
+| @default_argument_expr
+| @discard_assignment_expr
+| @dot_syntax_base_ignored_expr
+| @dynamic_type_expr
+| @enum_is_case_expr
+| @error_expr
+| @explicit_cast_expr
+| @extract_function_isolation_expr
+| @force_value_expr
+| @identity_expr
+| @if_expr
+| @implicit_conversion_expr
+| @in_out_expr
+| @key_path_application_expr
+| @key_path_dot_expr
+| @key_path_expr
+| @lazy_initialization_expr
+| @literal_expr
+| @lookup_expr
+| @make_temporarily_escapable_expr
+| @materialize_pack_expr
+| @obj_c_selector_expr
+| @one_way_expr
+| @opaque_value_expr
+| @open_existential_expr
+| @optional_evaluation_expr
+| @other_initializer_ref_expr
+| @overloaded_decl_ref_expr
+| @pack_element_expr
+| @pack_expansion_expr
+| @property_wrapper_value_placeholder_expr
+| @rebind_self_in_initializer_expr
+| @sequence_expr
+| @single_value_stmt_expr
+| @super_ref_expr
+| @tap_expr
+| @tuple_element_expr
+| @tuple_expr
+| @type_expr
+| @type_value_expr
+| @unresolved_decl_ref_expr
+| @unresolved_dot_expr
+| @unresolved_member_expr
+| @unresolved_pattern_expr
+| @unresolved_specialize_expr
+| @vararg_expansion_expr
+;
+
+#keyset[id]
+expr_types(  //dir=expr
+  int id: @expr ref,
+  int type_: @type_or_none ref
+);
+
+@any_try_expr =
+  @force_try_expr
+| @optional_try_expr
+| @try_expr
+;
+
+#keyset[id]
+any_try_exprs(  //dir=expr
+  int id: @any_try_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+applied_property_wrapper_exprs(  //dir=expr
+  unique int id: @applied_property_wrapper_expr,
+  int kind: int ref,
+  int value: @expr_or_none ref,
+  int param: @param_decl_or_none ref
+);
+
+@apply_expr =
+  @binary_expr
+| @call_expr
+| @postfix_unary_expr
+| @prefix_unary_expr
+| @self_apply_expr
+;
+
+#keyset[id]
+apply_exprs(  //dir=expr
+  int id: @apply_expr ref,
+  int function: @expr_or_none ref
+);
+
+#keyset[id, index]
+apply_expr_arguments(  //dir=expr
+  int id: @apply_expr ref,
+  int index: int ref,
+  int argument: @argument_or_none ref
+);
+
+assign_exprs(  //dir=expr
+  unique int id: @assign_expr,
+  int dest: @expr_or_none ref,
+  int source: @expr_or_none ref
+);
+
+bind_optional_exprs(  //dir=expr
+  unique int id: @bind_optional_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+capture_list_exprs(  //dir=expr
+  unique int id: @capture_list_expr,
+  int closure_body: @closure_expr_or_none ref
+);
+
+#keyset[id, index]
+capture_list_expr_binding_decls(  //dir=expr
+  int id: @capture_list_expr ref,
+  int index: int ref,
+  int binding_decl: @pattern_binding_decl_or_none ref
+);
+
+@closure_expr =
+  @auto_closure_expr
+| @explicit_closure_expr
+;
+
+@collection_expr =
+  @array_expr
+| @dictionary_expr
+;
+
+consume_exprs(  //dir=expr
+  unique int id: @consume_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+copy_exprs(  //dir=expr
+  unique int id: @copy_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+current_context_isolation_exprs(  //dir=expr
+  unique int id: @current_context_isolation_expr,
+  int actor: @expr_or_none ref
+);
+
+decl_ref_exprs(  //dir=expr
+  unique int id: @decl_ref_expr,
+  int decl: @decl_or_none ref
+);
+
+#keyset[id, index]
+decl_ref_expr_replacement_types(  //dir=expr
+  int id: @decl_ref_expr ref,
+  int index: int ref,
+  int replacement_type: @type_or_none ref
+);
+
+#keyset[id]
+decl_ref_expr_has_direct_to_storage_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+#keyset[id]
+decl_ref_expr_has_direct_to_implementation_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+#keyset[id]
+decl_ref_expr_has_ordinary_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+#keyset[id]
+decl_ref_expr_has_distributed_thunk_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+default_argument_exprs(  //dir=expr
+  unique int id: @default_argument_expr,
+  int param_decl: @param_decl_or_none ref,
+  int param_index: int ref
+);
+
+#keyset[id]
+default_argument_expr_caller_side_defaults(  //dir=expr
+  int id: @default_argument_expr ref,
+  int caller_side_default: @expr_or_none ref
+);
+
+discard_assignment_exprs(  //dir=expr
+  unique int id: @discard_assignment_expr
+);
+
+dot_syntax_base_ignored_exprs(  //dir=expr
+  unique int id: @dot_syntax_base_ignored_expr,
+  int qualifier: @expr_or_none ref,
+  int sub_expr: @expr_or_none ref
+);
+
+dynamic_type_exprs(  //dir=expr
+  unique int id: @dynamic_type_expr,
+  int base: @expr_or_none ref
+);
+
+enum_is_case_exprs(  //dir=expr
+  unique int id: @enum_is_case_expr,
+  int sub_expr: @expr_or_none ref,
+  int element: @enum_element_decl_or_none ref
+);
+
+error_exprs(  //dir=expr
+  unique int id: @error_expr
+);
+
+@explicit_cast_expr =
+  @checked_cast_expr
+| @coerce_expr
+;
+
+#keyset[id]
+explicit_cast_exprs(  //dir=expr
+  int id: @explicit_cast_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+extract_function_isolation_exprs(  //dir=expr
+  unique int id: @extract_function_isolation_expr,
+  int function_expr: @expr_or_none ref
+);
+
+force_value_exprs(  //dir=expr
+  unique int id: @force_value_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+@identity_expr =
+  @await_expr
+| @borrow_expr
+| @dot_self_expr
+| @paren_expr
+| @unresolved_member_chain_result_expr
+;
+
+#keyset[id]
+identity_exprs(  //dir=expr
+  int id: @identity_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+if_exprs(  //dir=expr
+  unique int id: @if_expr,
+  int condition: @expr_or_none ref,
+  int then_expr: @expr_or_none ref,
+  int else_expr: @expr_or_none ref
+);
+
+@implicit_conversion_expr =
+  @abi_safe_conversion_expr
+| @actor_isolation_erasure_expr
+| @any_hashable_erasure_expr
+| @archetype_to_super_expr
+| @array_to_pointer_expr
+| @bridge_from_obj_c_expr
+| @bridge_to_obj_c_expr
+| @class_metatype_to_object_expr
+| @collection_upcast_conversion_expr
+| @conditional_bridge_from_obj_c_expr
+| @covariant_function_conversion_expr
+| @covariant_return_conversion_expr
+| @derived_to_base_expr
+| @destructure_tuple_expr
+| @differentiable_function_expr
+| @differentiable_function_extract_original_expr
+| @erasure_expr
+| @existential_metatype_to_object_expr
+| @foreign_object_conversion_expr
+| @function_conversion_expr
+| @in_out_to_pointer_expr
+| @inject_into_optional_expr
+| @linear_function_expr
+| @linear_function_extract_original_expr
+| @linear_to_differentiable_function_expr
+| @load_expr
+| @metatype_conversion_expr
+| @pointer_to_pointer_expr
+| @protocol_metatype_to_object_expr
+| @string_to_pointer_expr
+| @underlying_to_opaque_expr
+| @unevaluated_instance_expr
+| @unreachable_expr
+| @unresolved_type_conversion_expr
+| @unsafe_cast_expr
+;
+
+#keyset[id]
+implicit_conversion_exprs(  //dir=expr
+  int id: @implicit_conversion_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+in_out_exprs(  //dir=expr
+  unique int id: @in_out_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+key_path_application_exprs(  //dir=expr
+  unique int id: @key_path_application_expr,
+  int base: @expr_or_none ref,
+  int key_path: @expr_or_none ref
+);
+
+key_path_dot_exprs(  //dir=expr
+  unique int id: @key_path_dot_expr
+);
+
+key_path_exprs(  //dir=expr
+  unique int id: @key_path_expr
+);
+
+#keyset[id]
+key_path_expr_roots(  //dir=expr
+  int id: @key_path_expr ref,
+  int root: @type_repr_or_none ref
+);
+
+#keyset[id, index]
+key_path_expr_components(  //dir=expr
+  int id: @key_path_expr ref,
+  int index: int ref,
+  int component: @key_path_component_or_none ref
+);
+
+lazy_initialization_exprs(  //dir=expr
+  unique int id: @lazy_initialization_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+@literal_expr =
+  @builtin_literal_expr
+| @interpolated_string_literal_expr
+| @nil_literal_expr
+| @object_literal_expr
+| @regex_literal_expr
+;
+
+@lookup_expr =
+  @dynamic_lookup_expr
+| @member_ref_expr
+| @subscript_expr
+;
+
+#keyset[id]
+lookup_exprs(  //dir=expr
+  int id: @lookup_expr ref,
+  int base: @expr_or_none ref
+);
+
+#keyset[id]
+lookup_expr_members(  //dir=expr
+  int id: @lookup_expr ref,
+  int member: @decl_or_none ref
+);
+
+make_temporarily_escapable_exprs(  //dir=expr
+  unique int id: @make_temporarily_escapable_expr,
+  int escaping_closure: @opaque_value_expr_or_none ref,
+  int nonescaping_closure: @expr_or_none ref,
+  int sub_expr: @expr_or_none ref
+);
+
+materialize_pack_exprs(  //dir=expr
+  unique int id: @materialize_pack_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+obj_c_selector_exprs(  //dir=expr
+  unique int id: @obj_c_selector_expr,
+  int sub_expr: @expr_or_none ref,
+  int method: @function_or_none ref
+);
+
+one_way_exprs(  //dir=expr
+  unique int id: @one_way_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+opaque_value_exprs(  //dir=expr
+  unique int id: @opaque_value_expr
+);
+
+open_existential_exprs(  //dir=expr
+  unique int id: @open_existential_expr,
+  int sub_expr: @expr_or_none ref,
+  int existential: @expr_or_none ref,
+  int opaque_expr: @opaque_value_expr_or_none ref
+);
+
+optional_evaluation_exprs(  //dir=expr
+  unique int id: @optional_evaluation_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+other_initializer_ref_exprs(  //dir=expr
+  unique int id: @other_initializer_ref_expr,
+  int initializer: @initializer_or_none ref
+);
+
+overloaded_decl_ref_exprs(  //dir=expr
+  unique int id: @overloaded_decl_ref_expr
+);
+
+#keyset[id, index]
+overloaded_decl_ref_expr_possible_declarations(  //dir=expr
+  int id: @overloaded_decl_ref_expr ref,
+  int index: int ref,
+  int possible_declaration: @value_decl_or_none ref
+);
+
+pack_element_exprs(  //dir=expr
+  unique int id: @pack_element_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+pack_expansion_exprs(  //dir=expr
+  unique int id: @pack_expansion_expr,
+  int pattern_expr: @expr_or_none ref
+);
+
+property_wrapper_value_placeholder_exprs(  //dir=expr
+  unique int id: @property_wrapper_value_placeholder_expr,
+  int placeholder: @opaque_value_expr_or_none ref
+);
+
+#keyset[id]
+property_wrapper_value_placeholder_expr_wrapped_values(  //dir=expr
+  int id: @property_wrapper_value_placeholder_expr ref,
+  int wrapped_value: @expr_or_none ref
+);
+
+rebind_self_in_initializer_exprs(  //dir=expr
+  unique int id: @rebind_self_in_initializer_expr,
+  int sub_expr: @expr_or_none ref,
+  int self: @var_decl_or_none ref
+);
+
+sequence_exprs(  //dir=expr
+  unique int id: @sequence_expr
+);
+
+#keyset[id, index]
+sequence_expr_elements(  //dir=expr
+  int id: @sequence_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+single_value_stmt_exprs(  //dir=expr
+  unique int id: @single_value_stmt_expr,
+  int stmt: @stmt_or_none ref
+);
+
+super_ref_exprs(  //dir=expr
+  unique int id: @super_ref_expr,
+  int self: @var_decl_or_none ref
+);
+
+tap_exprs(  //dir=expr
+  unique int id: @tap_expr,
+  int body: @brace_stmt_or_none ref,
+  int var: @var_decl_or_none ref
+);
+
+#keyset[id]
+tap_expr_sub_exprs(  //dir=expr
+  int id: @tap_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+tuple_element_exprs(  //dir=expr
+  unique int id: @tuple_element_expr,
+  int sub_expr: @expr_or_none ref,
+  int index: int ref
+);
+
+tuple_exprs(  //dir=expr
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_elements(  //dir=expr
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+type_exprs(  //dir=expr
+  unique int id: @type_expr
+);
+
+#keyset[id]
+type_expr_type_reprs(  //dir=expr
+  int id: @type_expr ref,
+  int type_repr: @type_repr_or_none ref
+);
+
+type_value_exprs(  //dir=expr
+  unique int id: @type_value_expr,
+  int type_repr: @type_repr_or_none ref
+);
+
+unresolved_decl_ref_exprs(  //dir=expr
+  unique int id: @unresolved_decl_ref_expr
+);
+
+#keyset[id]
+unresolved_decl_ref_expr_names(  //dir=expr
+  int id: @unresolved_decl_ref_expr ref,
+  string name: string ref
+);
+
+unresolved_dot_exprs(  //dir=expr
+  unique int id: @unresolved_dot_expr,
+  int base: @expr_or_none ref,
+  string name: string ref
+);
+
+unresolved_member_exprs(  //dir=expr
+  unique int id: @unresolved_member_expr,
+  string name: string ref
+);
+
+unresolved_pattern_exprs(  //dir=expr
+  unique int id: @unresolved_pattern_expr,
+  int sub_pattern: @pattern_or_none ref
+);
+
+unresolved_specialize_exprs(  //dir=expr
+  unique int id: @unresolved_specialize_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+vararg_expansion_exprs(  //dir=expr
+  unique int id: @vararg_expansion_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+abi_safe_conversion_exprs(  //dir=expr
+  unique int id: @abi_safe_conversion_expr
+);
+
+actor_isolation_erasure_exprs(  //dir=expr
+  unique int id: @actor_isolation_erasure_expr
+);
+
+any_hashable_erasure_exprs(  //dir=expr
+  unique int id: @any_hashable_erasure_expr
+);
+
+archetype_to_super_exprs(  //dir=expr
+  unique int id: @archetype_to_super_expr
+);
+
+array_exprs(  //dir=expr
+  unique int id: @array_expr
+);
+
+#keyset[id, index]
+array_expr_elements(  //dir=expr
+  int id: @array_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+array_to_pointer_exprs(  //dir=expr
+  unique int id: @array_to_pointer_expr
+);
+
+auto_closure_exprs(  //dir=expr
+  unique int id: @auto_closure_expr
+);
+
+await_exprs(  //dir=expr
+  unique int id: @await_expr
+);
+
+binary_exprs(  //dir=expr
+  unique int id: @binary_expr
+);
+
+borrow_exprs(  //dir=expr
+  unique int id: @borrow_expr
+);
+
+bridge_from_obj_c_exprs(  //dir=expr
+  unique int id: @bridge_from_obj_c_expr
+);
+
+bridge_to_obj_c_exprs(  //dir=expr
+  unique int id: @bridge_to_obj_c_expr
+);
+
+@builtin_literal_expr =
+  @boolean_literal_expr
+| @magic_identifier_literal_expr
+| @number_literal_expr
+| @string_literal_expr
+;
+
+call_exprs(  //dir=expr
+  unique int id: @call_expr
+);
+
+@checked_cast_expr =
+  @conditional_checked_cast_expr
+| @forced_checked_cast_expr
+| @is_expr
+;
+
+class_metatype_to_object_exprs(  //dir=expr
+  unique int id: @class_metatype_to_object_expr
+);
+
+coerce_exprs(  //dir=expr
+  unique int id: @coerce_expr
+);
+
+collection_upcast_conversion_exprs(  //dir=expr
+  unique int id: @collection_upcast_conversion_expr
+);
+
+conditional_bridge_from_obj_c_exprs(  //dir=expr
+  unique int id: @conditional_bridge_from_obj_c_expr
+);
+
+covariant_function_conversion_exprs(  //dir=expr
+  unique int id: @covariant_function_conversion_expr
+);
+
+covariant_return_conversion_exprs(  //dir=expr
+  unique int id: @covariant_return_conversion_expr
+);
+
+derived_to_base_exprs(  //dir=expr
+  unique int id: @derived_to_base_expr
+);
+
+destructure_tuple_exprs(  //dir=expr
+  unique int id: @destructure_tuple_expr
+);
+
+dictionary_exprs(  //dir=expr
+  unique int id: @dictionary_expr
+);
+
+#keyset[id, index]
+dictionary_expr_elements(  //dir=expr
+  int id: @dictionary_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+differentiable_function_exprs(  //dir=expr
+  unique int id: @differentiable_function_expr
+);
+
+differentiable_function_extract_original_exprs(  //dir=expr
+  unique int id: @differentiable_function_extract_original_expr
+);
+
+dot_self_exprs(  //dir=expr
+  unique int id: @dot_self_expr
+);
+
+@dynamic_lookup_expr =
+  @dynamic_member_ref_expr
+| @dynamic_subscript_expr
+;
+
+erasure_exprs(  //dir=expr
+  unique int id: @erasure_expr
+);
+
+existential_metatype_to_object_exprs(  //dir=expr
+  unique int id: @existential_metatype_to_object_expr
+);
+
+explicit_closure_exprs(  //dir=expr
+  unique int id: @explicit_closure_expr
+);
+
+force_try_exprs(  //dir=expr
+  unique int id: @force_try_expr
+);
+
+foreign_object_conversion_exprs(  //dir=expr
+  unique int id: @foreign_object_conversion_expr
+);
+
+function_conversion_exprs(  //dir=expr
+  unique int id: @function_conversion_expr
+);
+
+in_out_to_pointer_exprs(  //dir=expr
+  unique int id: @in_out_to_pointer_expr
+);
+
+inject_into_optional_exprs(  //dir=expr
+  unique int id: @inject_into_optional_expr
+);
+
+interpolated_string_literal_exprs(  //dir=expr
+  unique int id: @interpolated_string_literal_expr
+);
+
+#keyset[id]
+interpolated_string_literal_expr_interpolation_exprs(  //dir=expr
+  int id: @interpolated_string_literal_expr ref,
+  int interpolation_expr: @opaque_value_expr_or_none ref
+);
+
+#keyset[id]
+interpolated_string_literal_expr_appending_exprs(  //dir=expr
+  int id: @interpolated_string_literal_expr ref,
+  int appending_expr: @tap_expr_or_none ref
+);
+
+linear_function_exprs(  //dir=expr
+  unique int id: @linear_function_expr
+);
+
+linear_function_extract_original_exprs(  //dir=expr
+  unique int id: @linear_function_extract_original_expr
+);
+
+linear_to_differentiable_function_exprs(  //dir=expr
+  unique int id: @linear_to_differentiable_function_expr
+);
+
+load_exprs(  //dir=expr
+  unique int id: @load_expr
+);
+
+member_ref_exprs(  //dir=expr
+  unique int id: @member_ref_expr
+);
+
+#keyset[id]
+member_ref_expr_has_direct_to_storage_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+#keyset[id]
+member_ref_expr_has_direct_to_implementation_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+#keyset[id]
+member_ref_expr_has_ordinary_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+#keyset[id]
+member_ref_expr_has_distributed_thunk_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+metatype_conversion_exprs(  //dir=expr
+  unique int id: @metatype_conversion_expr
+);
+
+nil_literal_exprs(  //dir=expr
+  unique int id: @nil_literal_expr
+);
+
+object_literal_exprs(  //dir=expr
+  unique int id: @object_literal_expr,
+  int kind: int ref
+);
+
+#keyset[id, index]
+object_literal_expr_arguments(  //dir=expr
+  int id: @object_literal_expr ref,
+  int index: int ref,
+  int argument: @argument_or_none ref
+);
+
+optional_try_exprs(  //dir=expr
+  unique int id: @optional_try_expr
+);
+
+paren_exprs(  //dir=expr
+  unique int id: @paren_expr
+);
+
+pointer_to_pointer_exprs(  //dir=expr
+  unique int id: @pointer_to_pointer_expr
+);
+
+postfix_unary_exprs(  //dir=expr
+  unique int id: @postfix_unary_expr
+);
+
+prefix_unary_exprs(  //dir=expr
+  unique int id: @prefix_unary_expr
+);
+
+protocol_metatype_to_object_exprs(  //dir=expr
+  unique int id: @protocol_metatype_to_object_expr
+);
+
+regex_literal_exprs(  //dir=expr
+  unique int id: @regex_literal_expr,
+  string pattern: string ref,
+  int version: int ref
+);
+
+@self_apply_expr =
+  @dot_syntax_call_expr
+| @initializer_ref_call_expr
+;
+
+#keyset[id]
+self_apply_exprs(  //dir=expr
+  int id: @self_apply_expr ref,
+  int base: @expr_or_none ref
+);
+
+string_to_pointer_exprs(  //dir=expr
+  unique int id: @string_to_pointer_expr
+);
+
+subscript_exprs(  //dir=expr
+  unique int id: @subscript_expr
+);
+
+#keyset[id, index]
+subscript_expr_arguments(  //dir=expr
+  int id: @subscript_expr ref,
+  int index: int ref,
+  int argument: @argument_or_none ref
+);
+
+#keyset[id]
+subscript_expr_has_direct_to_storage_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+#keyset[id]
+subscript_expr_has_direct_to_implementation_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+#keyset[id]
+subscript_expr_has_ordinary_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+#keyset[id]
+subscript_expr_has_distributed_thunk_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+try_exprs(  //dir=expr
+  unique int id: @try_expr
+);
+
+underlying_to_opaque_exprs(  //dir=expr
+  unique int id: @underlying_to_opaque_expr
+);
+
+unevaluated_instance_exprs(  //dir=expr
+  unique int id: @unevaluated_instance_expr
+);
+
+unreachable_exprs(  //dir=expr
+  unique int id: @unreachable_expr
+);
+
+unresolved_member_chain_result_exprs(  //dir=expr
+  unique int id: @unresolved_member_chain_result_expr
+);
+
+unresolved_type_conversion_exprs(  //dir=expr
+  unique int id: @unresolved_type_conversion_expr
+);
+
+unsafe_cast_exprs(  //dir=expr
+  unique int id: @unsafe_cast_expr
+);
+
+boolean_literal_exprs(  //dir=expr
+  unique int id: @boolean_literal_expr,
+  boolean value: boolean ref
+);
+
+conditional_checked_cast_exprs(  //dir=expr
+  unique int id: @conditional_checked_cast_expr
+);
+
+dot_syntax_call_exprs(  //dir=expr
+  unique int id: @dot_syntax_call_expr
+);
+
+dynamic_member_ref_exprs(  //dir=expr
+  unique int id: @dynamic_member_ref_expr
+);
+
+dynamic_subscript_exprs(  //dir=expr
+  unique int id: @dynamic_subscript_expr
+);
+
+forced_checked_cast_exprs(  //dir=expr
+  unique int id: @forced_checked_cast_expr
+);
+
+initializer_ref_call_exprs(  //dir=expr
+  unique int id: @initializer_ref_call_expr
+);
+
+is_exprs(  //dir=expr
+  unique int id: @is_expr
+);
+
+magic_identifier_literal_exprs(  //dir=expr
+  unique int id: @magic_identifier_literal_expr,
+  string kind: string ref
+);
+
+@number_literal_expr =
+  @float_literal_expr
+| @integer_literal_expr
+;
+
+string_literal_exprs(  //dir=expr
+  unique int id: @string_literal_expr,
+  string value: string ref
+);
+
+float_literal_exprs(  //dir=expr
+  unique int id: @float_literal_expr,
+  string string_value: string ref
+);
+
+integer_literal_exprs(  //dir=expr
+  unique int id: @integer_literal_expr,
+  string string_value: string ref
+);
+
+@pattern =
+  @any_pattern
+| @binding_pattern
+| @bool_pattern
+| @enum_element_pattern
+| @expr_pattern
+| @is_pattern
+| @named_pattern
+| @optional_some_pattern
+| @paren_pattern
+| @tuple_pattern
+| @typed_pattern
+;
+
+#keyset[id]
+pattern_types(  //dir=pattern
+  int id: @pattern ref,
+  int type_: @type_or_none ref
+);
+
+any_patterns(  //dir=pattern
+  unique int id: @any_pattern
+);
+
+binding_patterns(  //dir=pattern
+  unique int id: @binding_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+bool_patterns(  //dir=pattern
+  unique int id: @bool_pattern,
+  boolean value: boolean ref
+);
+
+enum_element_patterns(  //dir=pattern
+  unique int id: @enum_element_pattern,
+  int element: @enum_element_decl_or_none ref
+);
+
+#keyset[id]
+enum_element_pattern_sub_patterns(  //dir=pattern
+  int id: @enum_element_pattern ref,
+  int sub_pattern: @pattern_or_none ref
+);
+
+expr_patterns(  //dir=pattern
+  unique int id: @expr_pattern,
+  int sub_expr: @expr_or_none ref
+);
+
+is_patterns(  //dir=pattern
+  unique int id: @is_pattern
+);
+
+#keyset[id]
+is_pattern_cast_type_reprs(  //dir=pattern
+  int id: @is_pattern ref,
+  int cast_type_repr: @type_repr_or_none ref
+);
+
+#keyset[id]
+is_pattern_sub_patterns(  //dir=pattern
+  int id: @is_pattern ref,
+  int sub_pattern: @pattern_or_none ref
+);
+
+named_patterns(  //dir=pattern
+  unique int id: @named_pattern,
+  int var_decl: @var_decl_or_none ref
+);
+
+optional_some_patterns(  //dir=pattern
+  unique int id: @optional_some_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+paren_patterns(  //dir=pattern
+  unique int id: @paren_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+tuple_patterns(  //dir=pattern
+  unique int id: @tuple_pattern
+);
+
+#keyset[id, index]
+tuple_pattern_elements(  //dir=pattern
+  int id: @tuple_pattern ref,
+  int index: int ref,
+  int element: @pattern_or_none ref
+);
+
+typed_patterns(  //dir=pattern
+  unique int id: @typed_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+typed_pattern_type_reprs(  //dir=pattern
+  int id: @typed_pattern ref,
+  int type_repr: @type_repr_or_none ref
+);
+
+case_label_items(  //dir=stmt
+  unique int id: @case_label_item,
+  int pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+case_label_item_guards(  //dir=stmt
+  int id: @case_label_item ref,
+  int guard: @expr_or_none ref
+);
+
+condition_elements(  //dir=stmt
+  unique int id: @condition_element
+);
+
+#keyset[id]
+condition_element_booleans(  //dir=stmt
+  int id: @condition_element ref,
+  int boolean_: @expr_or_none ref
+);
+
+#keyset[id]
+condition_element_patterns(  //dir=stmt
+  int id: @condition_element ref,
+  int pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+condition_element_initializers(  //dir=stmt
+  int id: @condition_element ref,
+  int initializer: @expr_or_none ref
+);
+
+#keyset[id]
+condition_element_availabilities(  //dir=stmt
+  int id: @condition_element ref,
+  int availability: @availability_info_or_none ref
+);
+
+@stmt =
+  @brace_stmt
+| @break_stmt
+| @case_stmt
+| @continue_stmt
+| @defer_stmt
+| @discard_stmt
+| @fail_stmt
+| @fallthrough_stmt
+| @labeled_stmt
+| @pound_assert_stmt
+| @return_stmt
+| @then_stmt
+| @throw_stmt
+| @yield_stmt
+;
+
+stmt_conditions(  //dir=stmt
+  unique int id: @stmt_condition
+);
+
+#keyset[id, index]
+stmt_condition_elements(  //dir=stmt
+  int id: @stmt_condition ref,
+  int index: int ref,
+  int element: @condition_element_or_none ref
+);
+
+brace_stmts(  //dir=stmt
+  unique int id: @brace_stmt
+);
+
+#keyset[id, index]
+brace_stmt_elements(  //dir=stmt
+  int id: @brace_stmt ref,
+  int index: int ref,
+  int element: @ast_node_or_none ref
+);
+
+break_stmts(  //dir=stmt
+  unique int id: @break_stmt
+);
+
+#keyset[id]
+break_stmt_target_names(  //dir=stmt
+  int id: @break_stmt ref,
+  string target_name: string ref
+);
+
+#keyset[id]
+break_stmt_targets(  //dir=stmt
+  int id: @break_stmt ref,
+  int target: @stmt_or_none ref
+);
+
+case_stmts(  //dir=stmt
+  unique int id: @case_stmt,
+  int body: @stmt_or_none ref
+);
+
+#keyset[id, index]
+case_stmt_labels(  //dir=stmt
+  int id: @case_stmt ref,
+  int index: int ref,
+  int label: @case_label_item_or_none ref
+);
+
+#keyset[id, index]
+case_stmt_variables(  //dir=stmt
+  int id: @case_stmt ref,
+  int index: int ref,
+  int variable: @var_decl_or_none ref
+);
+
+continue_stmts(  //dir=stmt
+  unique int id: @continue_stmt
+);
+
+#keyset[id]
+continue_stmt_target_names(  //dir=stmt
+  int id: @continue_stmt ref,
+  string target_name: string ref
+);
+
+#keyset[id]
+continue_stmt_targets(  //dir=stmt
+  int id: @continue_stmt ref,
+  int target: @stmt_or_none ref
+);
+
+defer_stmts(  //dir=stmt
+  unique int id: @defer_stmt,
+  int body: @brace_stmt_or_none ref
+);
+
+discard_stmts(  //dir=stmt
+  unique int id: @discard_stmt,
+  int sub_expr: @expr_or_none ref
+);
+
+fail_stmts(  //dir=stmt
+  unique int id: @fail_stmt
+);
+
+fallthrough_stmts(  //dir=stmt
+  unique int id: @fallthrough_stmt,
+  int fallthrough_source: @case_stmt_or_none ref,
+  int fallthrough_dest: @case_stmt_or_none ref
+);
+
+@labeled_stmt =
+  @do_catch_stmt
+| @do_stmt
+| @for_each_stmt
+| @labeled_conditional_stmt
+| @repeat_while_stmt
+| @switch_stmt
+;
+
+#keyset[id]
+labeled_stmt_labels(  //dir=stmt
+  int id: @labeled_stmt ref,
+  string label: string ref
+);
+
+pound_assert_stmts(  //dir=stmt
+  unique int id: @pound_assert_stmt,
+  int condition: @expr_or_none ref,
+  string message: string ref
+);
+
+return_stmts(  //dir=stmt
+  unique int id: @return_stmt
+);
+
+#keyset[id]
+return_stmt_results(  //dir=stmt
+  int id: @return_stmt ref,
+  int result: @expr_or_none ref
+);
+
+then_stmts(  //dir=stmt
+  unique int id: @then_stmt,
+  int result: @expr_or_none ref
+);
+
+throw_stmts(  //dir=stmt
+  unique int id: @throw_stmt,
+  int sub_expr: @expr_or_none ref
+);
+
+yield_stmts(  //dir=stmt
+  unique int id: @yield_stmt
+);
+
+#keyset[id, index]
+yield_stmt_results(  //dir=stmt
+  int id: @yield_stmt ref,
+  int index: int ref,
+  int result: @expr_or_none ref
+);
+
+do_catch_stmts(  //dir=stmt
+  unique int id: @do_catch_stmt,
+  int body: @stmt_or_none ref
+);
+
+#keyset[id, index]
+do_catch_stmt_catches(  //dir=stmt
+  int id: @do_catch_stmt ref,
+  int index: int ref,
+  int catch: @case_stmt_or_none ref
+);
+
+do_stmts(  //dir=stmt
+  unique int id: @do_stmt,
+  int body: @brace_stmt_or_none ref
+);
+
+for_each_stmts(  //dir=stmt
+  unique int id: @for_each_stmt,
+  int pattern: @pattern_or_none ref,
+  int body: @brace_stmt_or_none ref
+);
+
+#keyset[id, index]
+for_each_stmt_variables(  //dir=stmt
+  int id: @for_each_stmt ref,
+  int index: int ref,
+  int variable: @var_decl_or_none ref
+);
+
+#keyset[id]
+for_each_stmt_wheres(  //dir=stmt
+  int id: @for_each_stmt ref,
+  int where: @expr_or_none ref
+);
+
+#keyset[id]
+for_each_stmt_iterator_vars(  //dir=stmt
+  int id: @for_each_stmt ref,
+  int iteratorVar: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+for_each_stmt_next_calls(  //dir=stmt
+  int id: @for_each_stmt ref,
+  int nextCall: @expr_or_none ref
+);
+
+@labeled_conditional_stmt =
+  @guard_stmt
+| @if_stmt
+| @while_stmt
+;
+
+#keyset[id]
+labeled_conditional_stmts(  //dir=stmt
+  int id: @labeled_conditional_stmt ref,
+  int condition: @stmt_condition_or_none ref
+);
+
+repeat_while_stmts(  //dir=stmt
+  unique int id: @repeat_while_stmt,
+  int condition: @expr_or_none ref,
+  int body: @stmt_or_none ref
+);
+
+switch_stmts(  //dir=stmt
+  unique int id: @switch_stmt,
+  int expr: @expr_or_none ref
+);
+
+#keyset[id, index]
+switch_stmt_cases(  //dir=stmt
+  int id: @switch_stmt ref,
+  int index: int ref,
+  int case_: @case_stmt_or_none ref
+);
+
+guard_stmts(  //dir=stmt
+  unique int id: @guard_stmt,
+  int body: @brace_stmt_or_none ref
+);
+
+if_stmts(  //dir=stmt
+  unique int id: @if_stmt,
+  int then: @stmt_or_none ref
+);
+
+#keyset[id]
+if_stmt_elses(  //dir=stmt
+  int id: @if_stmt ref,
+  int else: @stmt_or_none ref
+);
+
+while_stmts(  //dir=stmt
+  unique int id: @while_stmt,
+  int body: @stmt_or_none ref
+);
+
+@type =
+  @any_function_type
+| @any_generic_type
+| @any_metatype_type
+| @builtin_type
+| @dependent_member_type
+| @dynamic_self_type
+| @error_type
+| @existential_type
+| @in_out_type
+| @integer_type
+| @l_value_type
+| @module_type
+| @pack_element_type
+| @pack_expansion_type
+| @pack_type
+| @parameterized_protocol_type
+| @protocol_composition_type
+| @reference_storage_type
+| @substitutable_type
+| @sugar_type
+| @tuple_type
+| @unresolved_type
+;
+
+#keyset[id]
+types(  //dir=type
+  int id: @type ref,
+  string name: string ref,
+  int canonical_type: @type_or_none ref
+);
+
+type_reprs(  //dir=type
+  unique int id: @type_repr,
+  int type_: @type_or_none ref
+);
+
+@any_function_type =
+  @function_type
+| @generic_function_type
+;
+
+#keyset[id]
+any_function_types(  //dir=type
+  int id: @any_function_type ref,
+  int result: @type_or_none ref
+);
+
+#keyset[id, index]
+any_function_type_param_types(  //dir=type
+  int id: @any_function_type ref,
+  int index: int ref,
+  int param_type: @type_or_none ref
+);
+
+#keyset[id]
+any_function_type_is_throwing(  //dir=type
+  int id: @any_function_type ref
+);
+
+#keyset[id]
+any_function_type_is_async(  //dir=type
+  int id: @any_function_type ref
+);
+
+@any_generic_type =
+  @nominal_or_bound_generic_nominal_type
+| @unbound_generic_type
+;
+
+#keyset[id]
+any_generic_types(  //dir=type
+  int id: @any_generic_type ref,
+  int declaration: @generic_type_decl_or_none ref
+);
+
+#keyset[id]
+any_generic_type_parents(  //dir=type
+  int id: @any_generic_type ref,
+  int parent: @type_or_none ref
+);
+
+@any_metatype_type =
+  @existential_metatype_type
+| @metatype_type
+;
+
+@builtin_type =
+  @any_builtin_integer_type
+| @builtin_bridge_object_type
+| @builtin_default_actor_storage_type
+| @builtin_executor_type
+| @builtin_fixed_array_type
+| @builtin_float_type
+| @builtin_job_type
+| @builtin_native_object_type
+| @builtin_raw_pointer_type
+| @builtin_raw_unsafe_continuation_type
+| @builtin_unsafe_value_buffer_type
+| @builtin_vector_type
+;
+
+dependent_member_types(  //dir=type
+  unique int id: @dependent_member_type,
+  int base_type: @type_or_none ref,
+  int associated_type_decl: @associated_type_decl_or_none ref
+);
+
+dynamic_self_types(  //dir=type
+  unique int id: @dynamic_self_type,
+  int static_self_type: @type_or_none ref
+);
+
+error_types(  //dir=type
+  unique int id: @error_type
+);
+
+existential_types(  //dir=type
+  unique int id: @existential_type,
+  int constraint: @type_or_none ref
+);
+
+in_out_types(  //dir=type
+  unique int id: @in_out_type,
+  int object_type: @type_or_none ref
+);
+
+integer_types(  //dir=type
+  unique int id: @integer_type,
+  string value: string ref
+);
+
+l_value_types(  //dir=type
+  unique int id: @l_value_type,
+  int object_type: @type_or_none ref
+);
+
+module_types(  //dir=type
+  unique int id: @module_type,
+  int module: @module_decl_or_none ref
+);
+
+pack_element_types(  //dir=type
+  unique int id: @pack_element_type,
+  int pack_type: @type_or_none ref
+);
+
+pack_expansion_types(  //dir=type
+  unique int id: @pack_expansion_type,
+  int pattern_type: @type_or_none ref,
+  int count_type: @type_or_none ref
+);
+
+pack_types(  //dir=type
+  unique int id: @pack_type
+);
+
+#keyset[id, index]
+pack_type_elements(  //dir=type
+  int id: @pack_type ref,
+  int index: int ref,
+  int element: @type_or_none ref
+);
+
+parameterized_protocol_types(  //dir=type
+  unique int id: @parameterized_protocol_type,
+  int base: @protocol_type_or_none ref
+);
+
+#keyset[id, index]
+parameterized_protocol_type_args(  //dir=type
+  int id: @parameterized_protocol_type ref,
+  int index: int ref,
+  int arg: @type_or_none ref
+);
+
+protocol_composition_types(  //dir=type
+  unique int id: @protocol_composition_type
+);
+
+#keyset[id, index]
+protocol_composition_type_members(  //dir=type
+  int id: @protocol_composition_type ref,
+  int index: int ref,
+  int member: @type_or_none ref
+);
+
+@reference_storage_type =
+  @unmanaged_storage_type
+| @unowned_storage_type
+| @weak_storage_type
+;
+
+#keyset[id]
+reference_storage_types(  //dir=type
+  int id: @reference_storage_type ref,
+  int referent_type: @type_or_none ref
+);
+
+@substitutable_type =
+  @archetype_type
+| @generic_type_param_type
+;
+
+@sugar_type =
+  @paren_type
+| @syntax_sugar_type
+| @type_alias_type
+;
+
+tuple_types(  //dir=type
+  unique int id: @tuple_type
+);
+
+#keyset[id, index]
+tuple_type_types(  //dir=type
+  int id: @tuple_type ref,
+  int index: int ref,
+  int type_: @type_or_none ref
+);
+
+#keyset[id, index]
+tuple_type_names(  //dir=type
+  int id: @tuple_type ref,
+  int index: int ref,
+  string name: string ref
+);
+
+unresolved_types(  //dir=type
+  unique int id: @unresolved_type
+);
+
+@any_builtin_integer_type =
+  @builtin_integer_literal_type
+| @builtin_integer_type
+;
+
+@archetype_type =
+  @local_archetype_type
+| @opaque_type_archetype_type
+| @pack_archetype_type
+| @primary_archetype_type
+;
+
+#keyset[id]
+archetype_types(  //dir=type
+  int id: @archetype_type ref,
+  int interface_type: @type_or_none ref
+);
+
+#keyset[id]
+archetype_type_superclasses(  //dir=type
+  int id: @archetype_type ref,
+  int superclass: @type_or_none ref
+);
+
+#keyset[id, index]
+archetype_type_protocols(  //dir=type
+  int id: @archetype_type ref,
+  int index: int ref,
+  int protocol: @protocol_decl_or_none ref
+);
+
+builtin_bridge_object_types(  //dir=type
+  unique int id: @builtin_bridge_object_type
+);
+
+builtin_default_actor_storage_types(  //dir=type
+  unique int id: @builtin_default_actor_storage_type
+);
+
+builtin_executor_types(  //dir=type
+  unique int id: @builtin_executor_type
+);
+
+builtin_fixed_array_types(  //dir=type
+  unique int id: @builtin_fixed_array_type
+);
+
+builtin_float_types(  //dir=type
+  unique int id: @builtin_float_type
+);
+
+builtin_job_types(  //dir=type
+  unique int id: @builtin_job_type
+);
+
+builtin_native_object_types(  //dir=type
+  unique int id: @builtin_native_object_type
+);
+
+builtin_raw_pointer_types(  //dir=type
+  unique int id: @builtin_raw_pointer_type
+);
+
+builtin_raw_unsafe_continuation_types(  //dir=type
+  unique int id: @builtin_raw_unsafe_continuation_type
+);
+
+builtin_unsafe_value_buffer_types(  //dir=type
+  unique int id: @builtin_unsafe_value_buffer_type
+);
+
+builtin_vector_types(  //dir=type
+  unique int id: @builtin_vector_type
+);
+
+existential_metatype_types(  //dir=type
+  unique int id: @existential_metatype_type
+);
+
+function_types(  //dir=type
+  unique int id: @function_type
+);
+
+generic_function_types(  //dir=type
+  unique int id: @generic_function_type
+);
+
+#keyset[id, index]
+generic_function_type_generic_params(  //dir=type
+  int id: @generic_function_type ref,
+  int index: int ref,
+  int generic_param: @generic_type_param_type_or_none ref
+);
+
+generic_type_param_types(  //dir=type
+  unique int id: @generic_type_param_type
+);
+
+metatype_types(  //dir=type
+  unique int id: @metatype_type
+);
+
+@nominal_or_bound_generic_nominal_type =
+  @bound_generic_type
+| @nominal_type
+;
+
+paren_types(  //dir=type
+  unique int id: @paren_type,
+  int type_: @type_or_none ref
+);
+
+@syntax_sugar_type =
+  @dictionary_type
+| @unary_syntax_sugar_type
+;
+
+type_alias_types(  //dir=type
+  unique int id: @type_alias_type,
+  int decl: @type_alias_decl_or_none ref
+);
+
+unbound_generic_types(  //dir=type
+  unique int id: @unbound_generic_type
+);
+
+unmanaged_storage_types(  //dir=type
+  unique int id: @unmanaged_storage_type
+);
+
+unowned_storage_types(  //dir=type
+  unique int id: @unowned_storage_type
+);
+
+weak_storage_types(  //dir=type
+  unique int id: @weak_storage_type
+);
+
+@bound_generic_type =
+  @bound_generic_class_type
+| @bound_generic_enum_type
+| @bound_generic_struct_type
+;
+
+#keyset[id, index]
+bound_generic_type_arg_types(  //dir=type
+  int id: @bound_generic_type ref,
+  int index: int ref,
+  int arg_type: @type_or_none ref
+);
+
+builtin_integer_literal_types(  //dir=type
+  unique int id: @builtin_integer_literal_type
+);
+
+builtin_integer_types(  //dir=type
+  unique int id: @builtin_integer_type
+);
+
+#keyset[id]
+builtin_integer_type_widths(  //dir=type
+  int id: @builtin_integer_type ref,
+  int width: int ref
+);
+
+dictionary_types(  //dir=type
+  unique int id: @dictionary_type,
+  int key_type: @type_or_none ref,
+  int value_type: @type_or_none ref
+);
+
+@local_archetype_type =
+  @element_archetype_type
+| @opened_archetype_type
+;
+
+@nominal_type =
+  @class_type
+| @enum_type
+| @protocol_type
+| @struct_type
+;
+
+opaque_type_archetype_types(  //dir=type
+  unique int id: @opaque_type_archetype_type,
+  int declaration: @opaque_type_decl_or_none ref
+);
+
+pack_archetype_types(  //dir=type
+  unique int id: @pack_archetype_type
+);
+
+primary_archetype_types(  //dir=type
+  unique int id: @primary_archetype_type
+);
+
+@unary_syntax_sugar_type =
+  @array_slice_type
+| @optional_type
+| @variadic_sequence_type
+;
+
+#keyset[id]
+unary_syntax_sugar_types(  //dir=type
+  int id: @unary_syntax_sugar_type ref,
+  int base_type: @type_or_none ref
+);
+
+array_slice_types(  //dir=type
+  unique int id: @array_slice_type
+);
+
+bound_generic_class_types(  //dir=type
+  unique int id: @bound_generic_class_type
+);
+
+bound_generic_enum_types(  //dir=type
+  unique int id: @bound_generic_enum_type
+);
+
+bound_generic_struct_types(  //dir=type
+  unique int id: @bound_generic_struct_type
+);
+
+class_types(  //dir=type
+  unique int id: @class_type
+);
+
+element_archetype_types(  //dir=type
+  unique int id: @element_archetype_type
+);
+
+enum_types(  //dir=type
+  unique int id: @enum_type
+);
+
+opened_archetype_types(  //dir=type
+  unique int id: @opened_archetype_type
+);
+
+optional_types(  //dir=type
+  unique int id: @optional_type
+);
+
+protocol_types(  //dir=type
+  unique int id: @protocol_type
+);
+
+struct_types(  //dir=type
+  unique int id: @struct_type
+);
+
+variadic_sequence_types(  //dir=type
+  unique int id: @variadic_sequence_type
+);
+
+@accessor_or_none =
+  @accessor
+| @unspecified_element
+;
+
+@argument_or_none =
+  @argument
+| @unspecified_element
+;
+
+@associated_type_decl_or_none =
+  @associated_type_decl
+| @unspecified_element
+;
+
+@ast_node_or_none =
+  @ast_node
+| @unspecified_element
+;
+
+@availability_info_or_none =
+  @availability_info
+| @unspecified_element
+;
+
+@availability_spec_or_none =
+  @availability_spec
+| @unspecified_element
+;
+
+@brace_stmt_or_none =
+  @brace_stmt
+| @unspecified_element
+;
+
+@captured_decl_or_none =
+  @captured_decl
+| @unspecified_element
+;
+
+@case_label_item_or_none =
+  @case_label_item
+| @unspecified_element
+;
+
+@case_stmt_or_none =
+  @case_stmt
+| @unspecified_element
+;
+
+@closure_expr_or_none =
+  @closure_expr
+| @unspecified_element
+;
+
+@condition_element_or_none =
+  @condition_element
+| @unspecified_element
+;
+
+@decl_or_none =
+  @decl
+| @unspecified_element
+;
+
+@enum_element_decl_or_none =
+  @enum_element_decl
+| @unspecified_element
+;
+
+@expr_or_none =
+  @expr
+| @unspecified_element
+;
+
+@file_or_none =
+  @file
+| @unspecified_element
+;
+
+@function_or_none =
+  @function
+| @unspecified_element
+;
+
+@generic_type_decl_or_none =
+  @generic_type_decl
+| @unspecified_element
+;
+
+@generic_type_param_decl_or_none =
+  @generic_type_param_decl
+| @unspecified_element
+;
+
+@generic_type_param_type_or_none =
+  @generic_type_param_type
+| @unspecified_element
+;
+
+@initializer_or_none =
+  @initializer
+| @unspecified_element
+;
+
+@key_path_component_or_none =
+  @key_path_component
+| @unspecified_element
+;
+
+@location_or_none =
+  @location
+| @unspecified_element
+;
+
+@macro_role_or_none =
+  @macro_role
+| @unspecified_element
+;
+
+@module_decl_or_none =
+  @module_decl
+| @unspecified_element
+;
+
+@nominal_type_decl_or_none =
+  @nominal_type_decl
+| @unspecified_element
+;
+
+@opaque_type_decl_or_none =
+  @opaque_type_decl
+| @unspecified_element
+;
+
+@opaque_value_expr_or_none =
+  @opaque_value_expr
+| @unspecified_element
+;
+
+@param_decl_or_none =
+  @param_decl
+| @unspecified_element
+;
+
+@pattern_or_none =
+  @pattern
+| @unspecified_element
+;
+
+@pattern_binding_decl_or_none =
+  @pattern_binding_decl
+| @unspecified_element
+;
+
+@precedence_group_decl_or_none =
+  @precedence_group_decl
+| @unspecified_element
+;
+
+@protocol_decl_or_none =
+  @protocol_decl
+| @unspecified_element
+;
+
+@protocol_type_or_none =
+  @protocol_type
+| @unspecified_element
+;
+
+@stmt_or_none =
+  @stmt
+| @unspecified_element
+;
+
+@stmt_condition_or_none =
+  @stmt_condition
+| @unspecified_element
+;
+
+@string_literal_expr_or_none =
+  @string_literal_expr
+| @unspecified_element
+;
+
+@tap_expr_or_none =
+  @tap_expr
+| @unspecified_element
+;
+
+@type_or_none =
+  @type
+| @unspecified_element
+;
+
+@type_alias_decl_or_none =
+  @type_alias_decl
+| @unspecified_element
+;
+
+@type_repr_or_none =
+  @type_repr
+| @unspecified_element
+;
+
+@value_decl_or_none =
+  @unspecified_element
+| @value_decl
+;
+
+@var_decl_or_none =
+  @unspecified_element
+| @var_decl
+;
diff --git a/swift/ql/lib/upgrades/987ab0bc0911f8c88449210e21d2ee80ebcb488a/swift.dbscheme b/swift/ql/lib/upgrades/987ab0bc0911f8c88449210e21d2ee80ebcb488a/swift.dbscheme
new file mode 100644
index 00000000000..b7006eaacb0
--- /dev/null
+++ b/swift/ql/lib/upgrades/987ab0bc0911f8c88449210e21d2ee80ebcb488a/swift.dbscheme
@@ -0,0 +1,2838 @@
+// generated by codegen/codegen.py, do not edit
+
+// from prefix.dbscheme
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(
+  string prefix: string ref
+);
+
+
+// from schema.py
+
+@element =
+  @file
+| @generic_context
+| @locatable
+| @location
+| @type
+;
+
+#keyset[id]
+element_is_unknown(
+  int id: @element ref
+);
+
+@file =
+  @db_file
+;
+
+#keyset[id]
+files(
+  int id: @file ref,
+  string name: string ref
+);
+
+#keyset[id]
+file_is_successfully_extracted(
+  int id: @file ref
+);
+
+@locatable =
+  @argument
+| @ast_node
+| @comment
+| @diagnostics
+| @error_element
+;
+
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_or_none ref
+);
+
+@location =
+  @db_location
+;
+
+#keyset[id]
+locations(
+  int id: @location ref,
+  int file: @file_or_none ref,
+  int start_line: int ref,
+  int start_column: int ref,
+  int end_line: int ref,
+  int end_column: int ref
+);
+
+@ast_node =
+  @availability_info
+| @availability_spec
+| @callable
+| @case_label_item
+| @condition_element
+| @decl
+| @expr
+| @key_path_component
+| @macro_role
+| @pattern
+| @stmt
+| @stmt_condition
+| @type_repr
+;
+
+comments(
+  unique int id: @comment,
+  string text: string ref
+);
+
+db_files(
+  unique int id: @db_file
+);
+
+db_locations(
+  unique int id: @db_location
+);
+
+diagnostics(
+  unique int id: @diagnostics,
+  string text: string ref,
+  int kind: int ref
+);
+
+@error_element =
+  @error_expr
+| @error_type
+| @overloaded_decl_ref_expr
+| @unresolved_decl_ref_expr
+| @unresolved_dot_expr
+| @unresolved_member_chain_result_expr
+| @unresolved_member_expr
+| @unresolved_pattern_expr
+| @unresolved_specialize_expr
+| @unresolved_type
+| @unresolved_type_conversion_expr
+| @unspecified_element
+;
+
+availability_infos(
+  unique int id: @availability_info
+);
+
+#keyset[id]
+availability_info_is_unavailable(
+  int id: @availability_info ref
+);
+
+#keyset[id, index]
+availability_info_specs(
+  int id: @availability_info ref,
+  int index: int ref,
+  int spec: @availability_spec_or_none ref
+);
+
+availability_specs(
+  unique int id: @availability_spec
+);
+
+#keyset[id]
+availability_spec_platforms(
+  int id: @availability_spec ref,
+  string platform: string ref
+);
+
+#keyset[id]
+availability_spec_versions(
+  int id: @availability_spec ref,
+  string version: string ref
+);
+
+#keyset[id]
+availability_spec_is_wildcard(
+  int id: @availability_spec ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_names(
+  int id: @callable ref,
+  string name: string ref
+);
+
+#keyset[id]
+callable_self_params(
+  int id: @callable ref,
+  int self_param: @param_decl_or_none ref
+);
+
+#keyset[id, index]
+callable_params(
+  int id: @callable ref,
+  int index: int ref,
+  int param: @param_decl_or_none ref
+);
+
+#keyset[id]
+callable_bodies(
+  int id: @callable ref,
+  int body: @brace_stmt_or_none ref
+);
+
+#keyset[id, index]
+callable_captures(
+  int id: @callable ref,
+  int index: int ref,
+  int capture: @captured_decl_or_none ref
+);
+
+key_path_components(
+  unique int id: @key_path_component,
+  int kind: int ref,
+  int component_type: @type_or_none ref
+);
+
+#keyset[id, index]
+key_path_component_subscript_arguments(
+  int id: @key_path_component ref,
+  int index: int ref,
+  int subscript_argument: @argument_or_none ref
+);
+
+#keyset[id]
+key_path_component_tuple_indices(
+  int id: @key_path_component ref,
+  int tuple_index: int ref
+);
+
+#keyset[id]
+key_path_component_decl_refs(
+  int id: @key_path_component ref,
+  int decl_ref: @value_decl_or_none ref
+);
+
+macro_roles(
+  unique int id: @macro_role,
+  int kind: int ref,
+  int macro_syntax: int ref
+);
+
+#keyset[id, index]
+macro_role_conformances(
+  int id: @macro_role ref,
+  int index: int ref,
+  int conformance: @expr_or_none ref
+);
+
+#keyset[id, index]
+macro_role_names(
+  int id: @macro_role ref,
+  int index: int ref,
+  string name: string ref
+);
+
+unspecified_elements(
+  unique int id: @unspecified_element,
+  string property: string ref,
+  string error: string ref
+);
+
+#keyset[id]
+unspecified_element_parents(
+  int id: @unspecified_element ref,
+  int parent: @element ref
+);
+
+#keyset[id]
+unspecified_element_indices(
+  int id: @unspecified_element ref,
+  int index: int ref
+);
+
+#keyset[id, index]
+unspecified_element_children(
+  int id: @unspecified_element ref,
+  int index: int ref,
+  int child: @ast_node_or_none ref
+);
+
+@decl =
+  @captured_decl
+| @enum_case_decl
+| @extension_decl
+| @if_config_decl
+| @import_decl
+| @missing_member_decl
+| @operator_decl
+| @pattern_binding_decl
+| @pound_diagnostic_decl
+| @precedence_group_decl
+| @top_level_code_decl
+| @value_decl
+;
+
+#keyset[id]
+decls(  //dir=decl
+  int id: @decl ref,
+  int module: @module_decl_or_none ref
+);
+
+#keyset[id, index]
+decl_members(  //dir=decl
+  int id: @decl ref,
+  int index: int ref,
+  int member: @decl_or_none ref
+);
+
+@generic_context =
+  @extension_decl
+| @function
+| @generic_type_decl
+| @macro_decl
+| @subscript_decl
+;
+
+#keyset[id, index]
+generic_context_generic_type_params(  //dir=decl
+  int id: @generic_context ref,
+  int index: int ref,
+  int generic_type_param: @generic_type_param_decl_or_none ref
+);
+
+captured_decls(  //dir=decl
+  unique int id: @captured_decl,
+  int decl: @value_decl_or_none ref
+);
+
+#keyset[id]
+captured_decl_is_direct(  //dir=decl
+  int id: @captured_decl ref
+);
+
+#keyset[id]
+captured_decl_is_escaping(  //dir=decl
+  int id: @captured_decl ref
+);
+
+enum_case_decls(  //dir=decl
+  unique int id: @enum_case_decl
+);
+
+#keyset[id, index]
+enum_case_decl_elements(  //dir=decl
+  int id: @enum_case_decl ref,
+  int index: int ref,
+  int element: @enum_element_decl_or_none ref
+);
+
+extension_decls(  //dir=decl
+  unique int id: @extension_decl,
+  int extended_type_decl: @nominal_type_decl_or_none ref
+);
+
+#keyset[id, index]
+extension_decl_protocols(  //dir=decl
+  int id: @extension_decl ref,
+  int index: int ref,
+  int protocol: @protocol_decl_or_none ref
+);
+
+if_config_decls(  //dir=decl
+  unique int id: @if_config_decl
+);
+
+#keyset[id, index]
+if_config_decl_active_elements(  //dir=decl
+  int id: @if_config_decl ref,
+  int index: int ref,
+  int active_element: @ast_node_or_none ref
+);
+
+import_decls(  //dir=decl
+  unique int id: @import_decl
+);
+
+#keyset[id]
+import_decl_is_exported(  //dir=decl
+  int id: @import_decl ref
+);
+
+#keyset[id]
+import_decl_imported_modules(  //dir=decl
+  int id: @import_decl ref,
+  int imported_module: @module_decl_or_none ref
+);
+
+#keyset[id, index]
+import_decl_declarations(  //dir=decl
+  int id: @import_decl ref,
+  int index: int ref,
+  int declaration: @value_decl_or_none ref
+);
+
+missing_member_decls(  //dir=decl
+  unique int id: @missing_member_decl,
+  string name: string ref
+);
+
+@operator_decl =
+  @infix_operator_decl
+| @postfix_operator_decl
+| @prefix_operator_decl
+;
+
+#keyset[id]
+operator_decls(  //dir=decl
+  int id: @operator_decl ref,
+  string name: string ref
+);
+
+pattern_binding_decls(  //dir=decl
+  unique int id: @pattern_binding_decl
+);
+
+#keyset[id, index]
+pattern_binding_decl_inits(  //dir=decl
+  int id: @pattern_binding_decl ref,
+  int index: int ref,
+  int init: @expr_or_none ref
+);
+
+#keyset[id, index]
+pattern_binding_decl_patterns(  //dir=decl
+  int id: @pattern_binding_decl ref,
+  int index: int ref,
+  int pattern: @pattern_or_none ref
+);
+
+pound_diagnostic_decls(  //dir=decl
+  unique int id: @pound_diagnostic_decl,
+  int kind: int ref,
+  int message: @string_literal_expr_or_none ref
+);
+
+precedence_group_decls(  //dir=decl
+  unique int id: @precedence_group_decl
+);
+
+top_level_code_decls(  //dir=decl
+  unique int id: @top_level_code_decl,
+  int body: @brace_stmt_or_none ref
+);
+
+@value_decl =
+  @abstract_storage_decl
+| @enum_element_decl
+| @function
+| @macro_decl
+| @type_decl
+;
+
+#keyset[id]
+value_decls(  //dir=decl
+  int id: @value_decl ref,
+  int interface_type: @type_or_none ref
+);
+
+@abstract_storage_decl =
+  @subscript_decl
+| @var_decl
+;
+
+#keyset[id, index]
+abstract_storage_decl_accessors(  //dir=decl
+  int id: @abstract_storage_decl ref,
+  int index: int ref,
+  int accessor: @accessor_or_none ref
+);
+
+enum_element_decls(  //dir=decl
+  unique int id: @enum_element_decl,
+  string name: string ref
+);
+
+#keyset[id, index]
+enum_element_decl_params(  //dir=decl
+  int id: @enum_element_decl ref,
+  int index: int ref,
+  int param: @param_decl_or_none ref
+);
+
+@function =
+  @accessor_or_named_function
+| @deinitializer
+| @initializer
+;
+
+infix_operator_decls(  //dir=decl
+  unique int id: @infix_operator_decl
+);
+
+#keyset[id]
+infix_operator_decl_precedence_groups(  //dir=decl
+  int id: @infix_operator_decl ref,
+  int precedence_group: @precedence_group_decl_or_none ref
+);
+
+macro_decls(  //dir=decl
+  unique int id: @macro_decl,
+  string name: string ref
+);
+
+#keyset[id, index]
+macro_decl_parameters(  //dir=decl
+  int id: @macro_decl ref,
+  int index: int ref,
+  int parameter: @param_decl_or_none ref
+);
+
+#keyset[id, index]
+macro_decl_roles(  //dir=decl
+  int id: @macro_decl ref,
+  int index: int ref,
+  int role: @macro_role_or_none ref
+);
+
+postfix_operator_decls(  //dir=decl
+  unique int id: @postfix_operator_decl
+);
+
+prefix_operator_decls(  //dir=decl
+  unique int id: @prefix_operator_decl
+);
+
+@type_decl =
+  @abstract_type_param_decl
+| @generic_type_decl
+| @module_decl
+;
+
+#keyset[id]
+type_decls(  //dir=decl
+  int id: @type_decl ref,
+  string name: string ref
+);
+
+#keyset[id, index]
+type_decl_inherited_types(  //dir=decl
+  int id: @type_decl ref,
+  int index: int ref,
+  int inherited_type: @type_or_none ref
+);
+
+@abstract_type_param_decl =
+  @associated_type_decl
+| @generic_type_param_decl
+;
+
+@accessor_or_named_function =
+  @accessor
+| @named_function
+;
+
+deinitializers(  //dir=decl
+  unique int id: @deinitializer
+);
+
+@generic_type_decl =
+  @nominal_type_decl
+| @opaque_type_decl
+| @type_alias_decl
+;
+
+initializers(  //dir=decl
+  unique int id: @initializer
+);
+
+module_decls(  //dir=decl
+  unique int id: @module_decl
+);
+
+#keyset[id]
+module_decl_is_builtin_module(  //dir=decl
+  int id: @module_decl ref
+);
+
+#keyset[id]
+module_decl_is_system_module(  //dir=decl
+  int id: @module_decl ref
+);
+
+module_decl_imported_modules(  //dir=decl
+  int id: @module_decl ref,
+  int imported_module: @module_decl_or_none ref
+);
+
+module_decl_exported_modules(  //dir=decl
+  int id: @module_decl ref,
+  int exported_module: @module_decl_or_none ref
+);
+
+subscript_decls(  //dir=decl
+  unique int id: @subscript_decl,
+  int element_type: @type_or_none ref
+);
+
+#keyset[id, index]
+subscript_decl_params(  //dir=decl
+  int id: @subscript_decl ref,
+  int index: int ref,
+  int param: @param_decl_or_none ref
+);
+
+@var_decl =
+  @concrete_var_decl
+| @param_decl
+;
+
+#keyset[id]
+var_decls(  //dir=decl
+  int id: @var_decl ref,
+  string name: string ref,
+  int type_: @type_or_none ref
+);
+
+#keyset[id]
+var_decl_attached_property_wrapper_types(  //dir=decl
+  int id: @var_decl ref,
+  int attached_property_wrapper_type: @type_or_none ref
+);
+
+#keyset[id]
+var_decl_parent_patterns(  //dir=decl
+  int id: @var_decl ref,
+  int parent_pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+var_decl_parent_initializers(  //dir=decl
+  int id: @var_decl ref,
+  int parent_initializer: @expr_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_backing_var_bindings(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_backing_var_binding: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_backing_vars(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_backing_var: @var_decl_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_projection_var_bindings(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_projection_var_binding: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_projection_vars(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_projection_var: @var_decl_or_none ref
+);
+
+accessors(  //dir=decl
+  unique int id: @accessor
+);
+
+#keyset[id]
+accessor_is_getter(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_setter(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_will_set(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_did_set(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_read(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_modify(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_unsafe_address(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_unsafe_mutable_address(  //dir=decl
+  int id: @accessor ref
+);
+
+associated_type_decls(  //dir=decl
+  unique int id: @associated_type_decl
+);
+
+concrete_var_decls(  //dir=decl
+  unique int id: @concrete_var_decl,
+  int introducer_int: int ref
+);
+
+generic_type_param_decls(  //dir=decl
+  unique int id: @generic_type_param_decl
+);
+
+named_functions(  //dir=decl
+  unique int id: @named_function
+);
+
+@nominal_type_decl =
+  @class_decl
+| @enum_decl
+| @protocol_decl
+| @struct_decl
+;
+
+#keyset[id]
+nominal_type_decls(  //dir=decl
+  int id: @nominal_type_decl ref,
+  int type_: @type_or_none ref
+);
+
+opaque_type_decls(  //dir=decl
+  unique int id: @opaque_type_decl,
+  int naming_declaration: @value_decl_or_none ref
+);
+
+#keyset[id, index]
+opaque_type_decl_opaque_generic_params(  //dir=decl
+  int id: @opaque_type_decl ref,
+  int index: int ref,
+  int opaque_generic_param: @generic_type_param_type_or_none ref
+);
+
+param_decls(  //dir=decl
+  unique int id: @param_decl
+);
+
+#keyset[id]
+param_decl_is_inout(  //dir=decl
+  int id: @param_decl ref
+);
+
+#keyset[id]
+param_decl_property_wrapper_local_wrapped_var_bindings(  //dir=decl
+  int id: @param_decl ref,
+  int property_wrapper_local_wrapped_var_binding: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+param_decl_property_wrapper_local_wrapped_vars(  //dir=decl
+  int id: @param_decl ref,
+  int property_wrapper_local_wrapped_var: @var_decl_or_none ref
+);
+
+type_alias_decls(  //dir=decl
+  unique int id: @type_alias_decl,
+  int aliased_type: @type_or_none ref
+);
+
+class_decls(  //dir=decl
+  unique int id: @class_decl
+);
+
+enum_decls(  //dir=decl
+  unique int id: @enum_decl
+);
+
+protocol_decls(  //dir=decl
+  unique int id: @protocol_decl
+);
+
+struct_decls(  //dir=decl
+  unique int id: @struct_decl
+);
+
+arguments(  //dir=expr
+  unique int id: @argument,
+  string label: string ref,
+  int expr: @expr_or_none ref
+);
+
+@expr =
+  @any_try_expr
+| @applied_property_wrapper_expr
+| @apply_expr
+| @assign_expr
+| @bind_optional_expr
+| @capture_list_expr
+| @closure_expr
+| @collection_expr
+| @consume_expr
+| @copy_expr
+| @current_context_isolation_expr
+| @decl_ref_expr
+| @default_argument_expr
+| @discard_assignment_expr
+| @dot_syntax_base_ignored_expr
+| @dynamic_type_expr
+| @enum_is_case_expr
+| @error_expr
+| @explicit_cast_expr
+| @extract_function_isolation_expr
+| @force_value_expr
+| @identity_expr
+| @if_expr
+| @implicit_conversion_expr
+| @in_out_expr
+| @key_path_application_expr
+| @key_path_dot_expr
+| @key_path_expr
+| @lazy_initialization_expr
+| @literal_expr
+| @lookup_expr
+| @make_temporarily_escapable_expr
+| @materialize_pack_expr
+| @obj_c_selector_expr
+| @one_way_expr
+| @opaque_value_expr
+| @open_existential_expr
+| @optional_evaluation_expr
+| @other_initializer_ref_expr
+| @overloaded_decl_ref_expr
+| @pack_element_expr
+| @pack_expansion_expr
+| @property_wrapper_value_placeholder_expr
+| @rebind_self_in_initializer_expr
+| @sequence_expr
+| @single_value_stmt_expr
+| @super_ref_expr
+| @tap_expr
+| @tuple_element_expr
+| @tuple_expr
+| @type_expr
+| @type_value_expr
+| @unresolved_decl_ref_expr
+| @unresolved_dot_expr
+| @unresolved_member_expr
+| @unresolved_pattern_expr
+| @unresolved_specialize_expr
+| @vararg_expansion_expr
+;
+
+#keyset[id]
+expr_types(  //dir=expr
+  int id: @expr ref,
+  int type_: @type_or_none ref
+);
+
+@any_try_expr =
+  @force_try_expr
+| @optional_try_expr
+| @try_expr
+;
+
+#keyset[id]
+any_try_exprs(  //dir=expr
+  int id: @any_try_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+applied_property_wrapper_exprs(  //dir=expr
+  unique int id: @applied_property_wrapper_expr,
+  int kind: int ref,
+  int value: @expr_or_none ref,
+  int param: @param_decl_or_none ref
+);
+
+@apply_expr =
+  @binary_expr
+| @call_expr
+| @postfix_unary_expr
+| @prefix_unary_expr
+| @self_apply_expr
+;
+
+#keyset[id]
+apply_exprs(  //dir=expr
+  int id: @apply_expr ref,
+  int function: @expr_or_none ref
+);
+
+#keyset[id, index]
+apply_expr_arguments(  //dir=expr
+  int id: @apply_expr ref,
+  int index: int ref,
+  int argument: @argument_or_none ref
+);
+
+assign_exprs(  //dir=expr
+  unique int id: @assign_expr,
+  int dest: @expr_or_none ref,
+  int source: @expr_or_none ref
+);
+
+bind_optional_exprs(  //dir=expr
+  unique int id: @bind_optional_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+capture_list_exprs(  //dir=expr
+  unique int id: @capture_list_expr,
+  int closure_body: @closure_expr_or_none ref
+);
+
+#keyset[id, index]
+capture_list_expr_binding_decls(  //dir=expr
+  int id: @capture_list_expr ref,
+  int index: int ref,
+  int binding_decl: @pattern_binding_decl_or_none ref
+);
+
+@closure_expr =
+  @auto_closure_expr
+| @explicit_closure_expr
+;
+
+@collection_expr =
+  @array_expr
+| @dictionary_expr
+;
+
+consume_exprs(  //dir=expr
+  unique int id: @consume_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+copy_exprs(  //dir=expr
+  unique int id: @copy_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+current_context_isolation_exprs(  //dir=expr
+  unique int id: @current_context_isolation_expr,
+  int actor: @expr_or_none ref
+);
+
+decl_ref_exprs(  //dir=expr
+  unique int id: @decl_ref_expr,
+  int decl: @decl_or_none ref
+);
+
+#keyset[id, index]
+decl_ref_expr_replacement_types(  //dir=expr
+  int id: @decl_ref_expr ref,
+  int index: int ref,
+  int replacement_type: @type_or_none ref
+);
+
+#keyset[id]
+decl_ref_expr_has_direct_to_storage_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+#keyset[id]
+decl_ref_expr_has_direct_to_implementation_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+#keyset[id]
+decl_ref_expr_has_ordinary_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+#keyset[id]
+decl_ref_expr_has_distributed_thunk_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+default_argument_exprs(  //dir=expr
+  unique int id: @default_argument_expr,
+  int param_decl: @param_decl_or_none ref,
+  int param_index: int ref
+);
+
+#keyset[id]
+default_argument_expr_caller_side_defaults(  //dir=expr
+  int id: @default_argument_expr ref,
+  int caller_side_default: @expr_or_none ref
+);
+
+discard_assignment_exprs(  //dir=expr
+  unique int id: @discard_assignment_expr
+);
+
+dot_syntax_base_ignored_exprs(  //dir=expr
+  unique int id: @dot_syntax_base_ignored_expr,
+  int qualifier: @expr_or_none ref,
+  int sub_expr: @expr_or_none ref
+);
+
+dynamic_type_exprs(  //dir=expr
+  unique int id: @dynamic_type_expr,
+  int base: @expr_or_none ref
+);
+
+enum_is_case_exprs(  //dir=expr
+  unique int id: @enum_is_case_expr,
+  int sub_expr: @expr_or_none ref,
+  int element: @enum_element_decl_or_none ref
+);
+
+error_exprs(  //dir=expr
+  unique int id: @error_expr
+);
+
+@explicit_cast_expr =
+  @checked_cast_expr
+| @coerce_expr
+;
+
+#keyset[id]
+explicit_cast_exprs(  //dir=expr
+  int id: @explicit_cast_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+extract_function_isolation_exprs(  //dir=expr
+  unique int id: @extract_function_isolation_expr,
+  int function_expr: @expr_or_none ref
+);
+
+force_value_exprs(  //dir=expr
+  unique int id: @force_value_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+@identity_expr =
+  @await_expr
+| @borrow_expr
+| @dot_self_expr
+| @paren_expr
+| @unresolved_member_chain_result_expr
+;
+
+#keyset[id]
+identity_exprs(  //dir=expr
+  int id: @identity_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+if_exprs(  //dir=expr
+  unique int id: @if_expr,
+  int condition: @expr_or_none ref,
+  int then_expr: @expr_or_none ref,
+  int else_expr: @expr_or_none ref
+);
+
+@implicit_conversion_expr =
+  @abi_safe_conversion_expr
+| @actor_isolation_erasure_expr
+| @any_hashable_erasure_expr
+| @archetype_to_super_expr
+| @array_to_pointer_expr
+| @bridge_from_obj_c_expr
+| @bridge_to_obj_c_expr
+| @class_metatype_to_object_expr
+| @collection_upcast_conversion_expr
+| @conditional_bridge_from_obj_c_expr
+| @covariant_function_conversion_expr
+| @covariant_return_conversion_expr
+| @derived_to_base_expr
+| @destructure_tuple_expr
+| @differentiable_function_expr
+| @differentiable_function_extract_original_expr
+| @erasure_expr
+| @existential_metatype_to_object_expr
+| @foreign_object_conversion_expr
+| @function_conversion_expr
+| @in_out_to_pointer_expr
+| @inject_into_optional_expr
+| @linear_function_expr
+| @linear_function_extract_original_expr
+| @linear_to_differentiable_function_expr
+| @load_expr
+| @metatype_conversion_expr
+| @pointer_to_pointer_expr
+| @protocol_metatype_to_object_expr
+| @string_to_pointer_expr
+| @underlying_to_opaque_expr
+| @unevaluated_instance_expr
+| @unreachable_expr
+| @unresolved_type_conversion_expr
+| @unsafe_cast_expr
+;
+
+#keyset[id]
+implicit_conversion_exprs(  //dir=expr
+  int id: @implicit_conversion_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+in_out_exprs(  //dir=expr
+  unique int id: @in_out_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+key_path_application_exprs(  //dir=expr
+  unique int id: @key_path_application_expr,
+  int base: @expr_or_none ref,
+  int key_path: @expr_or_none ref
+);
+
+key_path_dot_exprs(  //dir=expr
+  unique int id: @key_path_dot_expr
+);
+
+key_path_exprs(  //dir=expr
+  unique int id: @key_path_expr
+);
+
+#keyset[id]
+key_path_expr_roots(  //dir=expr
+  int id: @key_path_expr ref,
+  int root: @type_repr_or_none ref
+);
+
+#keyset[id, index]
+key_path_expr_components(  //dir=expr
+  int id: @key_path_expr ref,
+  int index: int ref,
+  int component: @key_path_component_or_none ref
+);
+
+lazy_initialization_exprs(  //dir=expr
+  unique int id: @lazy_initialization_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+@literal_expr =
+  @builtin_literal_expr
+| @interpolated_string_literal_expr
+| @nil_literal_expr
+| @object_literal_expr
+| @regex_literal_expr
+;
+
+@lookup_expr =
+  @dynamic_lookup_expr
+| @member_ref_expr
+| @subscript_expr
+;
+
+#keyset[id]
+lookup_exprs(  //dir=expr
+  int id: @lookup_expr ref,
+  int base: @expr_or_none ref
+);
+
+#keyset[id]
+lookup_expr_members(  //dir=expr
+  int id: @lookup_expr ref,
+  int member: @decl_or_none ref
+);
+
+make_temporarily_escapable_exprs(  //dir=expr
+  unique int id: @make_temporarily_escapable_expr,
+  int escaping_closure: @opaque_value_expr_or_none ref,
+  int nonescaping_closure: @expr_or_none ref,
+  int sub_expr: @expr_or_none ref
+);
+
+materialize_pack_exprs(  //dir=expr
+  unique int id: @materialize_pack_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+obj_c_selector_exprs(  //dir=expr
+  unique int id: @obj_c_selector_expr,
+  int sub_expr: @expr_or_none ref,
+  int method: @function_or_none ref
+);
+
+one_way_exprs(  //dir=expr
+  unique int id: @one_way_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+opaque_value_exprs(  //dir=expr
+  unique int id: @opaque_value_expr
+);
+
+open_existential_exprs(  //dir=expr
+  unique int id: @open_existential_expr,
+  int sub_expr: @expr_or_none ref,
+  int existential: @expr_or_none ref,
+  int opaque_expr: @opaque_value_expr_or_none ref
+);
+
+optional_evaluation_exprs(  //dir=expr
+  unique int id: @optional_evaluation_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+other_initializer_ref_exprs(  //dir=expr
+  unique int id: @other_initializer_ref_expr,
+  int initializer: @initializer_or_none ref
+);
+
+overloaded_decl_ref_exprs(  //dir=expr
+  unique int id: @overloaded_decl_ref_expr
+);
+
+#keyset[id, index]
+overloaded_decl_ref_expr_possible_declarations(  //dir=expr
+  int id: @overloaded_decl_ref_expr ref,
+  int index: int ref,
+  int possible_declaration: @value_decl_or_none ref
+);
+
+pack_element_exprs(  //dir=expr
+  unique int id: @pack_element_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+pack_expansion_exprs(  //dir=expr
+  unique int id: @pack_expansion_expr,
+  int pattern_expr: @expr_or_none ref
+);
+
+property_wrapper_value_placeholder_exprs(  //dir=expr
+  unique int id: @property_wrapper_value_placeholder_expr,
+  int placeholder: @opaque_value_expr_or_none ref
+);
+
+#keyset[id]
+property_wrapper_value_placeholder_expr_wrapped_values(  //dir=expr
+  int id: @property_wrapper_value_placeholder_expr ref,
+  int wrapped_value: @expr_or_none ref
+);
+
+rebind_self_in_initializer_exprs(  //dir=expr
+  unique int id: @rebind_self_in_initializer_expr,
+  int sub_expr: @expr_or_none ref,
+  int self: @var_decl_or_none ref
+);
+
+sequence_exprs(  //dir=expr
+  unique int id: @sequence_expr
+);
+
+#keyset[id, index]
+sequence_expr_elements(  //dir=expr
+  int id: @sequence_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+single_value_stmt_exprs(  //dir=expr
+  unique int id: @single_value_stmt_expr,
+  int stmt: @stmt_or_none ref
+);
+
+super_ref_exprs(  //dir=expr
+  unique int id: @super_ref_expr,
+  int self: @var_decl_or_none ref
+);
+
+tap_exprs(  //dir=expr
+  unique int id: @tap_expr,
+  int body: @brace_stmt_or_none ref,
+  int var: @var_decl_or_none ref
+);
+
+#keyset[id]
+tap_expr_sub_exprs(  //dir=expr
+  int id: @tap_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+tuple_element_exprs(  //dir=expr
+  unique int id: @tuple_element_expr,
+  int sub_expr: @expr_or_none ref,
+  int index: int ref
+);
+
+tuple_exprs(  //dir=expr
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_elements(  //dir=expr
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+type_exprs(  //dir=expr
+  unique int id: @type_expr
+);
+
+#keyset[id]
+type_expr_type_reprs(  //dir=expr
+  int id: @type_expr ref,
+  int type_repr: @type_repr_or_none ref
+);
+
+type_value_exprs(  //dir=expr
+  unique int id: @type_value_expr,
+  int type_repr: @type_repr_or_none ref
+);
+
+unresolved_decl_ref_exprs(  //dir=expr
+  unique int id: @unresolved_decl_ref_expr
+);
+
+#keyset[id]
+unresolved_decl_ref_expr_names(  //dir=expr
+  int id: @unresolved_decl_ref_expr ref,
+  string name: string ref
+);
+
+unresolved_dot_exprs(  //dir=expr
+  unique int id: @unresolved_dot_expr,
+  int base: @expr_or_none ref,
+  string name: string ref
+);
+
+unresolved_member_exprs(  //dir=expr
+  unique int id: @unresolved_member_expr,
+  string name: string ref
+);
+
+unresolved_pattern_exprs(  //dir=expr
+  unique int id: @unresolved_pattern_expr,
+  int sub_pattern: @pattern_or_none ref
+);
+
+unresolved_specialize_exprs(  //dir=expr
+  unique int id: @unresolved_specialize_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+vararg_expansion_exprs(  //dir=expr
+  unique int id: @vararg_expansion_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+abi_safe_conversion_exprs(  //dir=expr
+  unique int id: @abi_safe_conversion_expr
+);
+
+actor_isolation_erasure_exprs(  //dir=expr
+  unique int id: @actor_isolation_erasure_expr
+);
+
+any_hashable_erasure_exprs(  //dir=expr
+  unique int id: @any_hashable_erasure_expr
+);
+
+archetype_to_super_exprs(  //dir=expr
+  unique int id: @archetype_to_super_expr
+);
+
+array_exprs(  //dir=expr
+  unique int id: @array_expr
+);
+
+#keyset[id, index]
+array_expr_elements(  //dir=expr
+  int id: @array_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+array_to_pointer_exprs(  //dir=expr
+  unique int id: @array_to_pointer_expr
+);
+
+auto_closure_exprs(  //dir=expr
+  unique int id: @auto_closure_expr
+);
+
+await_exprs(  //dir=expr
+  unique int id: @await_expr
+);
+
+binary_exprs(  //dir=expr
+  unique int id: @binary_expr
+);
+
+borrow_exprs(  //dir=expr
+  unique int id: @borrow_expr
+);
+
+bridge_from_obj_c_exprs(  //dir=expr
+  unique int id: @bridge_from_obj_c_expr
+);
+
+bridge_to_obj_c_exprs(  //dir=expr
+  unique int id: @bridge_to_obj_c_expr
+);
+
+@builtin_literal_expr =
+  @boolean_literal_expr
+| @magic_identifier_literal_expr
+| @number_literal_expr
+| @string_literal_expr
+;
+
+call_exprs(  //dir=expr
+  unique int id: @call_expr
+);
+
+@checked_cast_expr =
+  @conditional_checked_cast_expr
+| @forced_checked_cast_expr
+| @is_expr
+;
+
+class_metatype_to_object_exprs(  //dir=expr
+  unique int id: @class_metatype_to_object_expr
+);
+
+coerce_exprs(  //dir=expr
+  unique int id: @coerce_expr
+);
+
+collection_upcast_conversion_exprs(  //dir=expr
+  unique int id: @collection_upcast_conversion_expr
+);
+
+conditional_bridge_from_obj_c_exprs(  //dir=expr
+  unique int id: @conditional_bridge_from_obj_c_expr
+);
+
+covariant_function_conversion_exprs(  //dir=expr
+  unique int id: @covariant_function_conversion_expr
+);
+
+covariant_return_conversion_exprs(  //dir=expr
+  unique int id: @covariant_return_conversion_expr
+);
+
+derived_to_base_exprs(  //dir=expr
+  unique int id: @derived_to_base_expr
+);
+
+destructure_tuple_exprs(  //dir=expr
+  unique int id: @destructure_tuple_expr
+);
+
+dictionary_exprs(  //dir=expr
+  unique int id: @dictionary_expr
+);
+
+#keyset[id, index]
+dictionary_expr_elements(  //dir=expr
+  int id: @dictionary_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+differentiable_function_exprs(  //dir=expr
+  unique int id: @differentiable_function_expr
+);
+
+differentiable_function_extract_original_exprs(  //dir=expr
+  unique int id: @differentiable_function_extract_original_expr
+);
+
+dot_self_exprs(  //dir=expr
+  unique int id: @dot_self_expr
+);
+
+@dynamic_lookup_expr =
+  @dynamic_member_ref_expr
+| @dynamic_subscript_expr
+;
+
+erasure_exprs(  //dir=expr
+  unique int id: @erasure_expr
+);
+
+existential_metatype_to_object_exprs(  //dir=expr
+  unique int id: @existential_metatype_to_object_expr
+);
+
+explicit_closure_exprs(  //dir=expr
+  unique int id: @explicit_closure_expr
+);
+
+force_try_exprs(  //dir=expr
+  unique int id: @force_try_expr
+);
+
+foreign_object_conversion_exprs(  //dir=expr
+  unique int id: @foreign_object_conversion_expr
+);
+
+function_conversion_exprs(  //dir=expr
+  unique int id: @function_conversion_expr
+);
+
+in_out_to_pointer_exprs(  //dir=expr
+  unique int id: @in_out_to_pointer_expr
+);
+
+inject_into_optional_exprs(  //dir=expr
+  unique int id: @inject_into_optional_expr
+);
+
+interpolated_string_literal_exprs(  //dir=expr
+  unique int id: @interpolated_string_literal_expr
+);
+
+#keyset[id]
+interpolated_string_literal_expr_interpolation_exprs(  //dir=expr
+  int id: @interpolated_string_literal_expr ref,
+  int interpolation_expr: @opaque_value_expr_or_none ref
+);
+
+#keyset[id]
+interpolated_string_literal_expr_appending_exprs(  //dir=expr
+  int id: @interpolated_string_literal_expr ref,
+  int appending_expr: @tap_expr_or_none ref
+);
+
+linear_function_exprs(  //dir=expr
+  unique int id: @linear_function_expr
+);
+
+linear_function_extract_original_exprs(  //dir=expr
+  unique int id: @linear_function_extract_original_expr
+);
+
+linear_to_differentiable_function_exprs(  //dir=expr
+  unique int id: @linear_to_differentiable_function_expr
+);
+
+load_exprs(  //dir=expr
+  unique int id: @load_expr
+);
+
+member_ref_exprs(  //dir=expr
+  unique int id: @member_ref_expr
+);
+
+#keyset[id]
+member_ref_expr_has_direct_to_storage_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+#keyset[id]
+member_ref_expr_has_direct_to_implementation_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+#keyset[id]
+member_ref_expr_has_ordinary_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+#keyset[id]
+member_ref_expr_has_distributed_thunk_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+metatype_conversion_exprs(  //dir=expr
+  unique int id: @metatype_conversion_expr
+);
+
+nil_literal_exprs(  //dir=expr
+  unique int id: @nil_literal_expr
+);
+
+object_literal_exprs(  //dir=expr
+  unique int id: @object_literal_expr,
+  int kind: int ref
+);
+
+#keyset[id, index]
+object_literal_expr_arguments(  //dir=expr
+  int id: @object_literal_expr ref,
+  int index: int ref,
+  int argument: @argument_or_none ref
+);
+
+optional_try_exprs(  //dir=expr
+  unique int id: @optional_try_expr
+);
+
+paren_exprs(  //dir=expr
+  unique int id: @paren_expr
+);
+
+pointer_to_pointer_exprs(  //dir=expr
+  unique int id: @pointer_to_pointer_expr
+);
+
+postfix_unary_exprs(  //dir=expr
+  unique int id: @postfix_unary_expr
+);
+
+prefix_unary_exprs(  //dir=expr
+  unique int id: @prefix_unary_expr
+);
+
+protocol_metatype_to_object_exprs(  //dir=expr
+  unique int id: @protocol_metatype_to_object_expr
+);
+
+regex_literal_exprs(  //dir=expr
+  unique int id: @regex_literal_expr,
+  string pattern: string ref,
+  int version: int ref
+);
+
+@self_apply_expr =
+  @dot_syntax_call_expr
+| @initializer_ref_call_expr
+;
+
+#keyset[id]
+self_apply_exprs(  //dir=expr
+  int id: @self_apply_expr ref,
+  int base: @expr_or_none ref
+);
+
+string_to_pointer_exprs(  //dir=expr
+  unique int id: @string_to_pointer_expr
+);
+
+subscript_exprs(  //dir=expr
+  unique int id: @subscript_expr
+);
+
+#keyset[id, index]
+subscript_expr_arguments(  //dir=expr
+  int id: @subscript_expr ref,
+  int index: int ref,
+  int argument: @argument_or_none ref
+);
+
+#keyset[id]
+subscript_expr_has_direct_to_storage_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+#keyset[id]
+subscript_expr_has_direct_to_implementation_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+#keyset[id]
+subscript_expr_has_ordinary_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+#keyset[id]
+subscript_expr_has_distributed_thunk_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+try_exprs(  //dir=expr
+  unique int id: @try_expr
+);
+
+underlying_to_opaque_exprs(  //dir=expr
+  unique int id: @underlying_to_opaque_expr
+);
+
+unevaluated_instance_exprs(  //dir=expr
+  unique int id: @unevaluated_instance_expr
+);
+
+unreachable_exprs(  //dir=expr
+  unique int id: @unreachable_expr
+);
+
+unresolved_member_chain_result_exprs(  //dir=expr
+  unique int id: @unresolved_member_chain_result_expr
+);
+
+unresolved_type_conversion_exprs(  //dir=expr
+  unique int id: @unresolved_type_conversion_expr
+);
+
+unsafe_cast_exprs(  //dir=expr
+  unique int id: @unsafe_cast_expr
+);
+
+boolean_literal_exprs(  //dir=expr
+  unique int id: @boolean_literal_expr,
+  boolean value: boolean ref
+);
+
+conditional_checked_cast_exprs(  //dir=expr
+  unique int id: @conditional_checked_cast_expr
+);
+
+dot_syntax_call_exprs(  //dir=expr
+  unique int id: @dot_syntax_call_expr
+);
+
+dynamic_member_ref_exprs(  //dir=expr
+  unique int id: @dynamic_member_ref_expr
+);
+
+dynamic_subscript_exprs(  //dir=expr
+  unique int id: @dynamic_subscript_expr
+);
+
+forced_checked_cast_exprs(  //dir=expr
+  unique int id: @forced_checked_cast_expr
+);
+
+initializer_ref_call_exprs(  //dir=expr
+  unique int id: @initializer_ref_call_expr
+);
+
+is_exprs(  //dir=expr
+  unique int id: @is_expr
+);
+
+magic_identifier_literal_exprs(  //dir=expr
+  unique int id: @magic_identifier_literal_expr,
+  string kind: string ref
+);
+
+@number_literal_expr =
+  @float_literal_expr
+| @integer_literal_expr
+;
+
+string_literal_exprs(  //dir=expr
+  unique int id: @string_literal_expr,
+  string value: string ref
+);
+
+float_literal_exprs(  //dir=expr
+  unique int id: @float_literal_expr,
+  string string_value: string ref
+);
+
+integer_literal_exprs(  //dir=expr
+  unique int id: @integer_literal_expr,
+  string string_value: string ref
+);
+
+@pattern =
+  @any_pattern
+| @binding_pattern
+| @bool_pattern
+| @enum_element_pattern
+| @expr_pattern
+| @is_pattern
+| @named_pattern
+| @optional_some_pattern
+| @paren_pattern
+| @tuple_pattern
+| @typed_pattern
+;
+
+#keyset[id]
+pattern_types(  //dir=pattern
+  int id: @pattern ref,
+  int type_: @type_or_none ref
+);
+
+any_patterns(  //dir=pattern
+  unique int id: @any_pattern
+);
+
+binding_patterns(  //dir=pattern
+  unique int id: @binding_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+bool_patterns(  //dir=pattern
+  unique int id: @bool_pattern,
+  boolean value: boolean ref
+);
+
+enum_element_patterns(  //dir=pattern
+  unique int id: @enum_element_pattern,
+  int element: @enum_element_decl_or_none ref
+);
+
+#keyset[id]
+enum_element_pattern_sub_patterns(  //dir=pattern
+  int id: @enum_element_pattern ref,
+  int sub_pattern: @pattern_or_none ref
+);
+
+expr_patterns(  //dir=pattern
+  unique int id: @expr_pattern,
+  int sub_expr: @expr_or_none ref
+);
+
+is_patterns(  //dir=pattern
+  unique int id: @is_pattern
+);
+
+#keyset[id]
+is_pattern_cast_type_reprs(  //dir=pattern
+  int id: @is_pattern ref,
+  int cast_type_repr: @type_repr_or_none ref
+);
+
+#keyset[id]
+is_pattern_sub_patterns(  //dir=pattern
+  int id: @is_pattern ref,
+  int sub_pattern: @pattern_or_none ref
+);
+
+named_patterns(  //dir=pattern
+  unique int id: @named_pattern,
+  int var_decl: @var_decl_or_none ref
+);
+
+optional_some_patterns(  //dir=pattern
+  unique int id: @optional_some_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+paren_patterns(  //dir=pattern
+  unique int id: @paren_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+tuple_patterns(  //dir=pattern
+  unique int id: @tuple_pattern
+);
+
+#keyset[id, index]
+tuple_pattern_elements(  //dir=pattern
+  int id: @tuple_pattern ref,
+  int index: int ref,
+  int element: @pattern_or_none ref
+);
+
+typed_patterns(  //dir=pattern
+  unique int id: @typed_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+typed_pattern_type_reprs(  //dir=pattern
+  int id: @typed_pattern ref,
+  int type_repr: @type_repr_or_none ref
+);
+
+case_label_items(  //dir=stmt
+  unique int id: @case_label_item,
+  int pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+case_label_item_guards(  //dir=stmt
+  int id: @case_label_item ref,
+  int guard: @expr_or_none ref
+);
+
+condition_elements(  //dir=stmt
+  unique int id: @condition_element
+);
+
+#keyset[id]
+condition_element_booleans(  //dir=stmt
+  int id: @condition_element ref,
+  int boolean_: @expr_or_none ref
+);
+
+#keyset[id]
+condition_element_patterns(  //dir=stmt
+  int id: @condition_element ref,
+  int pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+condition_element_initializers(  //dir=stmt
+  int id: @condition_element ref,
+  int initializer: @expr_or_none ref
+);
+
+#keyset[id]
+condition_element_availabilities(  //dir=stmt
+  int id: @condition_element ref,
+  int availability: @availability_info_or_none ref
+);
+
+@stmt =
+  @brace_stmt
+| @break_stmt
+| @case_stmt
+| @continue_stmt
+| @defer_stmt
+| @discard_stmt
+| @fail_stmt
+| @fallthrough_stmt
+| @labeled_stmt
+| @pound_assert_stmt
+| @return_stmt
+| @then_stmt
+| @throw_stmt
+| @yield_stmt
+;
+
+stmt_conditions(  //dir=stmt
+  unique int id: @stmt_condition
+);
+
+#keyset[id, index]
+stmt_condition_elements(  //dir=stmt
+  int id: @stmt_condition ref,
+  int index: int ref,
+  int element: @condition_element_or_none ref
+);
+
+brace_stmts(  //dir=stmt
+  unique int id: @brace_stmt
+);
+
+#keyset[id, index]
+brace_stmt_elements(  //dir=stmt
+  int id: @brace_stmt ref,
+  int index: int ref,
+  int element: @ast_node_or_none ref
+);
+
+break_stmts(  //dir=stmt
+  unique int id: @break_stmt
+);
+
+#keyset[id]
+break_stmt_target_names(  //dir=stmt
+  int id: @break_stmt ref,
+  string target_name: string ref
+);
+
+#keyset[id]
+break_stmt_targets(  //dir=stmt
+  int id: @break_stmt ref,
+  int target: @stmt_or_none ref
+);
+
+case_stmts(  //dir=stmt
+  unique int id: @case_stmt,
+  int body: @stmt_or_none ref
+);
+
+#keyset[id, index]
+case_stmt_labels(  //dir=stmt
+  int id: @case_stmt ref,
+  int index: int ref,
+  int label: @case_label_item_or_none ref
+);
+
+#keyset[id, index]
+case_stmt_variables(  //dir=stmt
+  int id: @case_stmt ref,
+  int index: int ref,
+  int variable: @var_decl_or_none ref
+);
+
+continue_stmts(  //dir=stmt
+  unique int id: @continue_stmt
+);
+
+#keyset[id]
+continue_stmt_target_names(  //dir=stmt
+  int id: @continue_stmt ref,
+  string target_name: string ref
+);
+
+#keyset[id]
+continue_stmt_targets(  //dir=stmt
+  int id: @continue_stmt ref,
+  int target: @stmt_or_none ref
+);
+
+defer_stmts(  //dir=stmt
+  unique int id: @defer_stmt,
+  int body: @brace_stmt_or_none ref
+);
+
+discard_stmts(  //dir=stmt
+  unique int id: @discard_stmt,
+  int sub_expr: @expr_or_none ref
+);
+
+fail_stmts(  //dir=stmt
+  unique int id: @fail_stmt
+);
+
+fallthrough_stmts(  //dir=stmt
+  unique int id: @fallthrough_stmt,
+  int fallthrough_source: @case_stmt_or_none ref,
+  int fallthrough_dest: @case_stmt_or_none ref
+);
+
+@labeled_stmt =
+  @do_catch_stmt
+| @do_stmt
+| @for_each_stmt
+| @labeled_conditional_stmt
+| @repeat_while_stmt
+| @switch_stmt
+;
+
+#keyset[id]
+labeled_stmt_labels(  //dir=stmt
+  int id: @labeled_stmt ref,
+  string label: string ref
+);
+
+pound_assert_stmts(  //dir=stmt
+  unique int id: @pound_assert_stmt,
+  int condition: @expr_or_none ref,
+  string message: string ref
+);
+
+return_stmts(  //dir=stmt
+  unique int id: @return_stmt
+);
+
+#keyset[id]
+return_stmt_results(  //dir=stmt
+  int id: @return_stmt ref,
+  int result: @expr_or_none ref
+);
+
+then_stmts(  //dir=stmt
+  unique int id: @then_stmt,
+  int result: @expr_or_none ref
+);
+
+throw_stmts(  //dir=stmt
+  unique int id: @throw_stmt,
+  int sub_expr: @expr_or_none ref
+);
+
+yield_stmts(  //dir=stmt
+  unique int id: @yield_stmt
+);
+
+#keyset[id, index]
+yield_stmt_results(  //dir=stmt
+  int id: @yield_stmt ref,
+  int index: int ref,
+  int result: @expr_or_none ref
+);
+
+do_catch_stmts(  //dir=stmt
+  unique int id: @do_catch_stmt,
+  int body: @stmt_or_none ref
+);
+
+#keyset[id, index]
+do_catch_stmt_catches(  //dir=stmt
+  int id: @do_catch_stmt ref,
+  int index: int ref,
+  int catch: @case_stmt_or_none ref
+);
+
+do_stmts(  //dir=stmt
+  unique int id: @do_stmt,
+  int body: @brace_stmt_or_none ref
+);
+
+for_each_stmts(  //dir=stmt
+  unique int id: @for_each_stmt,
+  int pattern: @pattern_or_none ref,
+  int body: @brace_stmt_or_none ref
+);
+
+#keyset[id, index]
+for_each_stmt_variables(  //dir=stmt
+  int id: @for_each_stmt ref,
+  int index: int ref,
+  int variable: @var_decl_or_none ref
+);
+
+#keyset[id]
+for_each_stmt_wheres(  //dir=stmt
+  int id: @for_each_stmt ref,
+  int where: @expr_or_none ref
+);
+
+#keyset[id]
+for_each_stmt_iterator_vars(  //dir=stmt
+  int id: @for_each_stmt ref,
+  int iteratorVar: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+for_each_stmt_next_calls(  //dir=stmt
+  int id: @for_each_stmt ref,
+  int nextCall: @expr_or_none ref
+);
+
+@labeled_conditional_stmt =
+  @guard_stmt
+| @if_stmt
+| @while_stmt
+;
+
+#keyset[id]
+labeled_conditional_stmts(  //dir=stmt
+  int id: @labeled_conditional_stmt ref,
+  int condition: @stmt_condition_or_none ref
+);
+
+repeat_while_stmts(  //dir=stmt
+  unique int id: @repeat_while_stmt,
+  int condition: @expr_or_none ref,
+  int body: @stmt_or_none ref
+);
+
+switch_stmts(  //dir=stmt
+  unique int id: @switch_stmt,
+  int expr: @expr_or_none ref
+);
+
+#keyset[id, index]
+switch_stmt_cases(  //dir=stmt
+  int id: @switch_stmt ref,
+  int index: int ref,
+  int case_: @case_stmt_or_none ref
+);
+
+guard_stmts(  //dir=stmt
+  unique int id: @guard_stmt,
+  int body: @brace_stmt_or_none ref
+);
+
+if_stmts(  //dir=stmt
+  unique int id: @if_stmt,
+  int then: @stmt_or_none ref
+);
+
+#keyset[id]
+if_stmt_elses(  //dir=stmt
+  int id: @if_stmt ref,
+  int else: @stmt_or_none ref
+);
+
+while_stmts(  //dir=stmt
+  unique int id: @while_stmt,
+  int body: @stmt_or_none ref
+);
+
+@type =
+  @any_function_type
+| @any_generic_type
+| @any_metatype_type
+| @builtin_type
+| @dependent_member_type
+| @dynamic_self_type
+| @error_type
+| @existential_type
+| @in_out_type
+| @integer_type
+| @l_value_type
+| @module_type
+| @pack_element_type
+| @pack_expansion_type
+| @pack_type
+| @parameterized_protocol_type
+| @protocol_composition_type
+| @reference_storage_type
+| @substitutable_type
+| @sugar_type
+| @tuple_type
+| @unresolved_type
+;
+
+#keyset[id]
+types(  //dir=type
+  int id: @type ref,
+  string name: string ref,
+  int canonical_type: @type_or_none ref
+);
+
+type_reprs(  //dir=type
+  unique int id: @type_repr,
+  int type_: @type_or_none ref
+);
+
+@any_function_type =
+  @function_type
+| @generic_function_type
+;
+
+#keyset[id]
+any_function_types(  //dir=type
+  int id: @any_function_type ref,
+  int result: @type_or_none ref
+);
+
+#keyset[id, index]
+any_function_type_param_types(  //dir=type
+  int id: @any_function_type ref,
+  int index: int ref,
+  int param_type: @type_or_none ref
+);
+
+#keyset[id]
+any_function_type_is_throwing(  //dir=type
+  int id: @any_function_type ref
+);
+
+#keyset[id]
+any_function_type_is_async(  //dir=type
+  int id: @any_function_type ref
+);
+
+@any_generic_type =
+  @nominal_or_bound_generic_nominal_type
+| @unbound_generic_type
+;
+
+#keyset[id]
+any_generic_types(  //dir=type
+  int id: @any_generic_type ref,
+  int declaration: @generic_type_decl_or_none ref
+);
+
+#keyset[id]
+any_generic_type_parents(  //dir=type
+  int id: @any_generic_type ref,
+  int parent: @type_or_none ref
+);
+
+@any_metatype_type =
+  @existential_metatype_type
+| @metatype_type
+;
+
+@builtin_type =
+  @any_builtin_integer_type
+| @builtin_bridge_object_type
+| @builtin_default_actor_storage_type
+| @builtin_executor_type
+| @builtin_fixed_array_type
+| @builtin_float_type
+| @builtin_job_type
+| @builtin_native_object_type
+| @builtin_raw_pointer_type
+| @builtin_raw_unsafe_continuation_type
+| @builtin_unsafe_value_buffer_type
+| @builtin_vector_type
+;
+
+dependent_member_types(  //dir=type
+  unique int id: @dependent_member_type,
+  int base_type: @type_or_none ref,
+  int associated_type_decl: @associated_type_decl_or_none ref
+);
+
+dynamic_self_types(  //dir=type
+  unique int id: @dynamic_self_type,
+  int static_self_type: @type_or_none ref
+);
+
+error_types(  //dir=type
+  unique int id: @error_type
+);
+
+existential_types(  //dir=type
+  unique int id: @existential_type,
+  int constraint: @type_or_none ref
+);
+
+in_out_types(  //dir=type
+  unique int id: @in_out_type,
+  int object_type: @type_or_none ref
+);
+
+integer_types(  //dir=type
+  unique int id: @integer_type,
+  string value: string ref
+);
+
+l_value_types(  //dir=type
+  unique int id: @l_value_type,
+  int object_type: @type_or_none ref
+);
+
+module_types(  //dir=type
+  unique int id: @module_type,
+  int module: @module_decl_or_none ref
+);
+
+pack_element_types(  //dir=type
+  unique int id: @pack_element_type,
+  int pack_type: @type_or_none ref
+);
+
+pack_expansion_types(  //dir=type
+  unique int id: @pack_expansion_type,
+  int pattern_type: @type_or_none ref,
+  int count_type: @type_or_none ref
+);
+
+pack_types(  //dir=type
+  unique int id: @pack_type
+);
+
+#keyset[id, index]
+pack_type_elements(  //dir=type
+  int id: @pack_type ref,
+  int index: int ref,
+  int element: @type_or_none ref
+);
+
+parameterized_protocol_types(  //dir=type
+  unique int id: @parameterized_protocol_type,
+  int base: @protocol_type_or_none ref
+);
+
+#keyset[id, index]
+parameterized_protocol_type_args(  //dir=type
+  int id: @parameterized_protocol_type ref,
+  int index: int ref,
+  int arg: @type_or_none ref
+);
+
+protocol_composition_types(  //dir=type
+  unique int id: @protocol_composition_type
+);
+
+#keyset[id, index]
+protocol_composition_type_members(  //dir=type
+  int id: @protocol_composition_type ref,
+  int index: int ref,
+  int member: @type_or_none ref
+);
+
+@reference_storage_type =
+  @unmanaged_storage_type
+| @unowned_storage_type
+| @weak_storage_type
+;
+
+#keyset[id]
+reference_storage_types(  //dir=type
+  int id: @reference_storage_type ref,
+  int referent_type: @type_or_none ref
+);
+
+@substitutable_type =
+  @archetype_type
+| @generic_type_param_type
+;
+
+@sugar_type =
+  @paren_type
+| @syntax_sugar_type
+| @type_alias_type
+;
+
+tuple_types(  //dir=type
+  unique int id: @tuple_type
+);
+
+#keyset[id, index]
+tuple_type_types(  //dir=type
+  int id: @tuple_type ref,
+  int index: int ref,
+  int type_: @type_or_none ref
+);
+
+#keyset[id, index]
+tuple_type_names(  //dir=type
+  int id: @tuple_type ref,
+  int index: int ref,
+  string name: string ref
+);
+
+unresolved_types(  //dir=type
+  unique int id: @unresolved_type
+);
+
+@any_builtin_integer_type =
+  @builtin_integer_literal_type
+| @builtin_integer_type
+;
+
+@archetype_type =
+  @local_archetype_type
+| @opaque_type_archetype_type
+| @pack_archetype_type
+| @primary_archetype_type
+;
+
+#keyset[id]
+archetype_types(  //dir=type
+  int id: @archetype_type ref,
+  int interface_type: @type_or_none ref
+);
+
+#keyset[id]
+archetype_type_superclasses(  //dir=type
+  int id: @archetype_type ref,
+  int superclass: @type_or_none ref
+);
+
+#keyset[id, index]
+archetype_type_protocols(  //dir=type
+  int id: @archetype_type ref,
+  int index: int ref,
+  int protocol: @protocol_decl_or_none ref
+);
+
+builtin_bridge_object_types(  //dir=type
+  unique int id: @builtin_bridge_object_type
+);
+
+builtin_default_actor_storage_types(  //dir=type
+  unique int id: @builtin_default_actor_storage_type
+);
+
+builtin_executor_types(  //dir=type
+  unique int id: @builtin_executor_type
+);
+
+builtin_fixed_array_types(  //dir=type
+  unique int id: @builtin_fixed_array_type
+);
+
+builtin_float_types(  //dir=type
+  unique int id: @builtin_float_type
+);
+
+builtin_job_types(  //dir=type
+  unique int id: @builtin_job_type
+);
+
+builtin_native_object_types(  //dir=type
+  unique int id: @builtin_native_object_type
+);
+
+builtin_raw_pointer_types(  //dir=type
+  unique int id: @builtin_raw_pointer_type
+);
+
+builtin_raw_unsafe_continuation_types(  //dir=type
+  unique int id: @builtin_raw_unsafe_continuation_type
+);
+
+builtin_unsafe_value_buffer_types(  //dir=type
+  unique int id: @builtin_unsafe_value_buffer_type
+);
+
+builtin_vector_types(  //dir=type
+  unique int id: @builtin_vector_type
+);
+
+existential_metatype_types(  //dir=type
+  unique int id: @existential_metatype_type
+);
+
+function_types(  //dir=type
+  unique int id: @function_type
+);
+
+generic_function_types(  //dir=type
+  unique int id: @generic_function_type
+);
+
+#keyset[id, index]
+generic_function_type_generic_params(  //dir=type
+  int id: @generic_function_type ref,
+  int index: int ref,
+  int generic_param: @generic_type_param_type_or_none ref
+);
+
+generic_type_param_types(  //dir=type
+  unique int id: @generic_type_param_type
+);
+
+metatype_types(  //dir=type
+  unique int id: @metatype_type
+);
+
+@nominal_or_bound_generic_nominal_type =
+  @bound_generic_type
+| @nominal_type
+;
+
+paren_types(  //dir=type
+  unique int id: @paren_type,
+  int type_: @type_or_none ref
+);
+
+@syntax_sugar_type =
+  @dictionary_type
+| @unary_syntax_sugar_type
+;
+
+type_alias_types(  //dir=type
+  unique int id: @type_alias_type,
+  int decl: @type_alias_decl_or_none ref
+);
+
+unbound_generic_types(  //dir=type
+  unique int id: @unbound_generic_type
+);
+
+unmanaged_storage_types(  //dir=type
+  unique int id: @unmanaged_storage_type
+);
+
+unowned_storage_types(  //dir=type
+  unique int id: @unowned_storage_type
+);
+
+weak_storage_types(  //dir=type
+  unique int id: @weak_storage_type
+);
+
+@bound_generic_type =
+  @bound_generic_class_type
+| @bound_generic_enum_type
+| @bound_generic_struct_type
+;
+
+#keyset[id, index]
+bound_generic_type_arg_types(  //dir=type
+  int id: @bound_generic_type ref,
+  int index: int ref,
+  int arg_type: @type_or_none ref
+);
+
+builtin_integer_literal_types(  //dir=type
+  unique int id: @builtin_integer_literal_type
+);
+
+builtin_integer_types(  //dir=type
+  unique int id: @builtin_integer_type
+);
+
+#keyset[id]
+builtin_integer_type_widths(  //dir=type
+  int id: @builtin_integer_type ref,
+  int width: int ref
+);
+
+dictionary_types(  //dir=type
+  unique int id: @dictionary_type,
+  int key_type: @type_or_none ref,
+  int value_type: @type_or_none ref
+);
+
+@local_archetype_type =
+  @element_archetype_type
+| @existential_archetype_type
+;
+
+@nominal_type =
+  @class_type
+| @enum_type
+| @protocol_type
+| @struct_type
+;
+
+opaque_type_archetype_types(  //dir=type
+  unique int id: @opaque_type_archetype_type,
+  int declaration: @opaque_type_decl_or_none ref
+);
+
+pack_archetype_types(  //dir=type
+  unique int id: @pack_archetype_type
+);
+
+primary_archetype_types(  //dir=type
+  unique int id: @primary_archetype_type
+);
+
+@unary_syntax_sugar_type =
+  @array_slice_type
+| @optional_type
+| @variadic_sequence_type
+;
+
+#keyset[id]
+unary_syntax_sugar_types(  //dir=type
+  int id: @unary_syntax_sugar_type ref,
+  int base_type: @type_or_none ref
+);
+
+array_slice_types(  //dir=type
+  unique int id: @array_slice_type
+);
+
+bound_generic_class_types(  //dir=type
+  unique int id: @bound_generic_class_type
+);
+
+bound_generic_enum_types(  //dir=type
+  unique int id: @bound_generic_enum_type
+);
+
+bound_generic_struct_types(  //dir=type
+  unique int id: @bound_generic_struct_type
+);
+
+class_types(  //dir=type
+  unique int id: @class_type
+);
+
+element_archetype_types(  //dir=type
+  unique int id: @element_archetype_type
+);
+
+enum_types(  //dir=type
+  unique int id: @enum_type
+);
+
+existential_archetype_types(  //dir=type
+  unique int id: @existential_archetype_type
+);
+
+optional_types(  //dir=type
+  unique int id: @optional_type
+);
+
+protocol_types(  //dir=type
+  unique int id: @protocol_type
+);
+
+struct_types(  //dir=type
+  unique int id: @struct_type
+);
+
+variadic_sequence_types(  //dir=type
+  unique int id: @variadic_sequence_type
+);
+
+@accessor_or_none =
+  @accessor
+| @unspecified_element
+;
+
+@argument_or_none =
+  @argument
+| @unspecified_element
+;
+
+@associated_type_decl_or_none =
+  @associated_type_decl
+| @unspecified_element
+;
+
+@ast_node_or_none =
+  @ast_node
+| @unspecified_element
+;
+
+@availability_info_or_none =
+  @availability_info
+| @unspecified_element
+;
+
+@availability_spec_or_none =
+  @availability_spec
+| @unspecified_element
+;
+
+@brace_stmt_or_none =
+  @brace_stmt
+| @unspecified_element
+;
+
+@captured_decl_or_none =
+  @captured_decl
+| @unspecified_element
+;
+
+@case_label_item_or_none =
+  @case_label_item
+| @unspecified_element
+;
+
+@case_stmt_or_none =
+  @case_stmt
+| @unspecified_element
+;
+
+@closure_expr_or_none =
+  @closure_expr
+| @unspecified_element
+;
+
+@condition_element_or_none =
+  @condition_element
+| @unspecified_element
+;
+
+@decl_or_none =
+  @decl
+| @unspecified_element
+;
+
+@enum_element_decl_or_none =
+  @enum_element_decl
+| @unspecified_element
+;
+
+@expr_or_none =
+  @expr
+| @unspecified_element
+;
+
+@file_or_none =
+  @file
+| @unspecified_element
+;
+
+@function_or_none =
+  @function
+| @unspecified_element
+;
+
+@generic_type_decl_or_none =
+  @generic_type_decl
+| @unspecified_element
+;
+
+@generic_type_param_decl_or_none =
+  @generic_type_param_decl
+| @unspecified_element
+;
+
+@generic_type_param_type_or_none =
+  @generic_type_param_type
+| @unspecified_element
+;
+
+@initializer_or_none =
+  @initializer
+| @unspecified_element
+;
+
+@key_path_component_or_none =
+  @key_path_component
+| @unspecified_element
+;
+
+@location_or_none =
+  @location
+| @unspecified_element
+;
+
+@macro_role_or_none =
+  @macro_role
+| @unspecified_element
+;
+
+@module_decl_or_none =
+  @module_decl
+| @unspecified_element
+;
+
+@nominal_type_decl_or_none =
+  @nominal_type_decl
+| @unspecified_element
+;
+
+@opaque_type_decl_or_none =
+  @opaque_type_decl
+| @unspecified_element
+;
+
+@opaque_value_expr_or_none =
+  @opaque_value_expr
+| @unspecified_element
+;
+
+@param_decl_or_none =
+  @param_decl
+| @unspecified_element
+;
+
+@pattern_or_none =
+  @pattern
+| @unspecified_element
+;
+
+@pattern_binding_decl_or_none =
+  @pattern_binding_decl
+| @unspecified_element
+;
+
+@precedence_group_decl_or_none =
+  @precedence_group_decl
+| @unspecified_element
+;
+
+@protocol_decl_or_none =
+  @protocol_decl
+| @unspecified_element
+;
+
+@protocol_type_or_none =
+  @protocol_type
+| @unspecified_element
+;
+
+@stmt_or_none =
+  @stmt
+| @unspecified_element
+;
+
+@stmt_condition_or_none =
+  @stmt_condition
+| @unspecified_element
+;
+
+@string_literal_expr_or_none =
+  @string_literal_expr
+| @unspecified_element
+;
+
+@tap_expr_or_none =
+  @tap_expr
+| @unspecified_element
+;
+
+@type_or_none =
+  @type
+| @unspecified_element
+;
+
+@type_alias_decl_or_none =
+  @type_alias_decl
+| @unspecified_element
+;
+
+@type_repr_or_none =
+  @type_repr
+| @unspecified_element
+;
+
+@value_decl_or_none =
+  @unspecified_element
+| @value_decl
+;
+
+@var_decl_or_none =
+  @unspecified_element
+| @var_decl
+;
diff --git a/swift/ql/lib/upgrades/987ab0bc0911f8c88449210e21d2ee80ebcb488a/upgrade.properties b/swift/ql/lib/upgrades/987ab0bc0911f8c88449210e21d2ee80ebcb488a/upgrade.properties
new file mode 100644
index 00000000000..b6118b34968
--- /dev/null
+++ b/swift/ql/lib/upgrades/987ab0bc0911f8c88449210e21d2ee80ebcb488a/upgrade.properties
@@ -0,0 +1,11 @@
+description: Upgrade to Swift 6.2
+compatibility: full
+availability_specs.rel: run availability_specs.qlo new_availability_specs
+availability_spec_platforms.rel: run availability_specs.qlo new_availability_spec_platforms
+availability_spec_versions.rel: run availability_specs.qlo new_availability_spec_versions
+availability_spec_is_wildcard.rel: run availability_specs.qlo new_availability_spec_is_wildcard
+existential_archetype_types.rel: run existential_archetype_types.qlo
+key_path_components.rel: run key_path_components.qlo
+opened_archetype_types.rel: delete
+other_availability_specs.rel: delete
+platform_version_availability_specs.rel: delete
diff --git a/swift/ql/lib/upgrades/b7006eaacb007a06251596835506185619b86e98/old.dbscheme b/swift/ql/lib/upgrades/b7006eaacb007a06251596835506185619b86e98/old.dbscheme
new file mode 100644
index 00000000000..b7006eaacb0
--- /dev/null
+++ b/swift/ql/lib/upgrades/b7006eaacb007a06251596835506185619b86e98/old.dbscheme
@@ -0,0 +1,2838 @@
+// generated by codegen/codegen.py, do not edit
+
+// from prefix.dbscheme
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(
+  string prefix: string ref
+);
+
+
+// from schema.py
+
+@element =
+  @file
+| @generic_context
+| @locatable
+| @location
+| @type
+;
+
+#keyset[id]
+element_is_unknown(
+  int id: @element ref
+);
+
+@file =
+  @db_file
+;
+
+#keyset[id]
+files(
+  int id: @file ref,
+  string name: string ref
+);
+
+#keyset[id]
+file_is_successfully_extracted(
+  int id: @file ref
+);
+
+@locatable =
+  @argument
+| @ast_node
+| @comment
+| @diagnostics
+| @error_element
+;
+
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_or_none ref
+);
+
+@location =
+  @db_location
+;
+
+#keyset[id]
+locations(
+  int id: @location ref,
+  int file: @file_or_none ref,
+  int start_line: int ref,
+  int start_column: int ref,
+  int end_line: int ref,
+  int end_column: int ref
+);
+
+@ast_node =
+  @availability_info
+| @availability_spec
+| @callable
+| @case_label_item
+| @condition_element
+| @decl
+| @expr
+| @key_path_component
+| @macro_role
+| @pattern
+| @stmt
+| @stmt_condition
+| @type_repr
+;
+
+comments(
+  unique int id: @comment,
+  string text: string ref
+);
+
+db_files(
+  unique int id: @db_file
+);
+
+db_locations(
+  unique int id: @db_location
+);
+
+diagnostics(
+  unique int id: @diagnostics,
+  string text: string ref,
+  int kind: int ref
+);
+
+@error_element =
+  @error_expr
+| @error_type
+| @overloaded_decl_ref_expr
+| @unresolved_decl_ref_expr
+| @unresolved_dot_expr
+| @unresolved_member_chain_result_expr
+| @unresolved_member_expr
+| @unresolved_pattern_expr
+| @unresolved_specialize_expr
+| @unresolved_type
+| @unresolved_type_conversion_expr
+| @unspecified_element
+;
+
+availability_infos(
+  unique int id: @availability_info
+);
+
+#keyset[id]
+availability_info_is_unavailable(
+  int id: @availability_info ref
+);
+
+#keyset[id, index]
+availability_info_specs(
+  int id: @availability_info ref,
+  int index: int ref,
+  int spec: @availability_spec_or_none ref
+);
+
+availability_specs(
+  unique int id: @availability_spec
+);
+
+#keyset[id]
+availability_spec_platforms(
+  int id: @availability_spec ref,
+  string platform: string ref
+);
+
+#keyset[id]
+availability_spec_versions(
+  int id: @availability_spec ref,
+  string version: string ref
+);
+
+#keyset[id]
+availability_spec_is_wildcard(
+  int id: @availability_spec ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_names(
+  int id: @callable ref,
+  string name: string ref
+);
+
+#keyset[id]
+callable_self_params(
+  int id: @callable ref,
+  int self_param: @param_decl_or_none ref
+);
+
+#keyset[id, index]
+callable_params(
+  int id: @callable ref,
+  int index: int ref,
+  int param: @param_decl_or_none ref
+);
+
+#keyset[id]
+callable_bodies(
+  int id: @callable ref,
+  int body: @brace_stmt_or_none ref
+);
+
+#keyset[id, index]
+callable_captures(
+  int id: @callable ref,
+  int index: int ref,
+  int capture: @captured_decl_or_none ref
+);
+
+key_path_components(
+  unique int id: @key_path_component,
+  int kind: int ref,
+  int component_type: @type_or_none ref
+);
+
+#keyset[id, index]
+key_path_component_subscript_arguments(
+  int id: @key_path_component ref,
+  int index: int ref,
+  int subscript_argument: @argument_or_none ref
+);
+
+#keyset[id]
+key_path_component_tuple_indices(
+  int id: @key_path_component ref,
+  int tuple_index: int ref
+);
+
+#keyset[id]
+key_path_component_decl_refs(
+  int id: @key_path_component ref,
+  int decl_ref: @value_decl_or_none ref
+);
+
+macro_roles(
+  unique int id: @macro_role,
+  int kind: int ref,
+  int macro_syntax: int ref
+);
+
+#keyset[id, index]
+macro_role_conformances(
+  int id: @macro_role ref,
+  int index: int ref,
+  int conformance: @expr_or_none ref
+);
+
+#keyset[id, index]
+macro_role_names(
+  int id: @macro_role ref,
+  int index: int ref,
+  string name: string ref
+);
+
+unspecified_elements(
+  unique int id: @unspecified_element,
+  string property: string ref,
+  string error: string ref
+);
+
+#keyset[id]
+unspecified_element_parents(
+  int id: @unspecified_element ref,
+  int parent: @element ref
+);
+
+#keyset[id]
+unspecified_element_indices(
+  int id: @unspecified_element ref,
+  int index: int ref
+);
+
+#keyset[id, index]
+unspecified_element_children(
+  int id: @unspecified_element ref,
+  int index: int ref,
+  int child: @ast_node_or_none ref
+);
+
+@decl =
+  @captured_decl
+| @enum_case_decl
+| @extension_decl
+| @if_config_decl
+| @import_decl
+| @missing_member_decl
+| @operator_decl
+| @pattern_binding_decl
+| @pound_diagnostic_decl
+| @precedence_group_decl
+| @top_level_code_decl
+| @value_decl
+;
+
+#keyset[id]
+decls(  //dir=decl
+  int id: @decl ref,
+  int module: @module_decl_or_none ref
+);
+
+#keyset[id, index]
+decl_members(  //dir=decl
+  int id: @decl ref,
+  int index: int ref,
+  int member: @decl_or_none ref
+);
+
+@generic_context =
+  @extension_decl
+| @function
+| @generic_type_decl
+| @macro_decl
+| @subscript_decl
+;
+
+#keyset[id, index]
+generic_context_generic_type_params(  //dir=decl
+  int id: @generic_context ref,
+  int index: int ref,
+  int generic_type_param: @generic_type_param_decl_or_none ref
+);
+
+captured_decls(  //dir=decl
+  unique int id: @captured_decl,
+  int decl: @value_decl_or_none ref
+);
+
+#keyset[id]
+captured_decl_is_direct(  //dir=decl
+  int id: @captured_decl ref
+);
+
+#keyset[id]
+captured_decl_is_escaping(  //dir=decl
+  int id: @captured_decl ref
+);
+
+enum_case_decls(  //dir=decl
+  unique int id: @enum_case_decl
+);
+
+#keyset[id, index]
+enum_case_decl_elements(  //dir=decl
+  int id: @enum_case_decl ref,
+  int index: int ref,
+  int element: @enum_element_decl_or_none ref
+);
+
+extension_decls(  //dir=decl
+  unique int id: @extension_decl,
+  int extended_type_decl: @nominal_type_decl_or_none ref
+);
+
+#keyset[id, index]
+extension_decl_protocols(  //dir=decl
+  int id: @extension_decl ref,
+  int index: int ref,
+  int protocol: @protocol_decl_or_none ref
+);
+
+if_config_decls(  //dir=decl
+  unique int id: @if_config_decl
+);
+
+#keyset[id, index]
+if_config_decl_active_elements(  //dir=decl
+  int id: @if_config_decl ref,
+  int index: int ref,
+  int active_element: @ast_node_or_none ref
+);
+
+import_decls(  //dir=decl
+  unique int id: @import_decl
+);
+
+#keyset[id]
+import_decl_is_exported(  //dir=decl
+  int id: @import_decl ref
+);
+
+#keyset[id]
+import_decl_imported_modules(  //dir=decl
+  int id: @import_decl ref,
+  int imported_module: @module_decl_or_none ref
+);
+
+#keyset[id, index]
+import_decl_declarations(  //dir=decl
+  int id: @import_decl ref,
+  int index: int ref,
+  int declaration: @value_decl_or_none ref
+);
+
+missing_member_decls(  //dir=decl
+  unique int id: @missing_member_decl,
+  string name: string ref
+);
+
+@operator_decl =
+  @infix_operator_decl
+| @postfix_operator_decl
+| @prefix_operator_decl
+;
+
+#keyset[id]
+operator_decls(  //dir=decl
+  int id: @operator_decl ref,
+  string name: string ref
+);
+
+pattern_binding_decls(  //dir=decl
+  unique int id: @pattern_binding_decl
+);
+
+#keyset[id, index]
+pattern_binding_decl_inits(  //dir=decl
+  int id: @pattern_binding_decl ref,
+  int index: int ref,
+  int init: @expr_or_none ref
+);
+
+#keyset[id, index]
+pattern_binding_decl_patterns(  //dir=decl
+  int id: @pattern_binding_decl ref,
+  int index: int ref,
+  int pattern: @pattern_or_none ref
+);
+
+pound_diagnostic_decls(  //dir=decl
+  unique int id: @pound_diagnostic_decl,
+  int kind: int ref,
+  int message: @string_literal_expr_or_none ref
+);
+
+precedence_group_decls(  //dir=decl
+  unique int id: @precedence_group_decl
+);
+
+top_level_code_decls(  //dir=decl
+  unique int id: @top_level_code_decl,
+  int body: @brace_stmt_or_none ref
+);
+
+@value_decl =
+  @abstract_storage_decl
+| @enum_element_decl
+| @function
+| @macro_decl
+| @type_decl
+;
+
+#keyset[id]
+value_decls(  //dir=decl
+  int id: @value_decl ref,
+  int interface_type: @type_or_none ref
+);
+
+@abstract_storage_decl =
+  @subscript_decl
+| @var_decl
+;
+
+#keyset[id, index]
+abstract_storage_decl_accessors(  //dir=decl
+  int id: @abstract_storage_decl ref,
+  int index: int ref,
+  int accessor: @accessor_or_none ref
+);
+
+enum_element_decls(  //dir=decl
+  unique int id: @enum_element_decl,
+  string name: string ref
+);
+
+#keyset[id, index]
+enum_element_decl_params(  //dir=decl
+  int id: @enum_element_decl ref,
+  int index: int ref,
+  int param: @param_decl_or_none ref
+);
+
+@function =
+  @accessor_or_named_function
+| @deinitializer
+| @initializer
+;
+
+infix_operator_decls(  //dir=decl
+  unique int id: @infix_operator_decl
+);
+
+#keyset[id]
+infix_operator_decl_precedence_groups(  //dir=decl
+  int id: @infix_operator_decl ref,
+  int precedence_group: @precedence_group_decl_or_none ref
+);
+
+macro_decls(  //dir=decl
+  unique int id: @macro_decl,
+  string name: string ref
+);
+
+#keyset[id, index]
+macro_decl_parameters(  //dir=decl
+  int id: @macro_decl ref,
+  int index: int ref,
+  int parameter: @param_decl_or_none ref
+);
+
+#keyset[id, index]
+macro_decl_roles(  //dir=decl
+  int id: @macro_decl ref,
+  int index: int ref,
+  int role: @macro_role_or_none ref
+);
+
+postfix_operator_decls(  //dir=decl
+  unique int id: @postfix_operator_decl
+);
+
+prefix_operator_decls(  //dir=decl
+  unique int id: @prefix_operator_decl
+);
+
+@type_decl =
+  @abstract_type_param_decl
+| @generic_type_decl
+| @module_decl
+;
+
+#keyset[id]
+type_decls(  //dir=decl
+  int id: @type_decl ref,
+  string name: string ref
+);
+
+#keyset[id, index]
+type_decl_inherited_types(  //dir=decl
+  int id: @type_decl ref,
+  int index: int ref,
+  int inherited_type: @type_or_none ref
+);
+
+@abstract_type_param_decl =
+  @associated_type_decl
+| @generic_type_param_decl
+;
+
+@accessor_or_named_function =
+  @accessor
+| @named_function
+;
+
+deinitializers(  //dir=decl
+  unique int id: @deinitializer
+);
+
+@generic_type_decl =
+  @nominal_type_decl
+| @opaque_type_decl
+| @type_alias_decl
+;
+
+initializers(  //dir=decl
+  unique int id: @initializer
+);
+
+module_decls(  //dir=decl
+  unique int id: @module_decl
+);
+
+#keyset[id]
+module_decl_is_builtin_module(  //dir=decl
+  int id: @module_decl ref
+);
+
+#keyset[id]
+module_decl_is_system_module(  //dir=decl
+  int id: @module_decl ref
+);
+
+module_decl_imported_modules(  //dir=decl
+  int id: @module_decl ref,
+  int imported_module: @module_decl_or_none ref
+);
+
+module_decl_exported_modules(  //dir=decl
+  int id: @module_decl ref,
+  int exported_module: @module_decl_or_none ref
+);
+
+subscript_decls(  //dir=decl
+  unique int id: @subscript_decl,
+  int element_type: @type_or_none ref
+);
+
+#keyset[id, index]
+subscript_decl_params(  //dir=decl
+  int id: @subscript_decl ref,
+  int index: int ref,
+  int param: @param_decl_or_none ref
+);
+
+@var_decl =
+  @concrete_var_decl
+| @param_decl
+;
+
+#keyset[id]
+var_decls(  //dir=decl
+  int id: @var_decl ref,
+  string name: string ref,
+  int type_: @type_or_none ref
+);
+
+#keyset[id]
+var_decl_attached_property_wrapper_types(  //dir=decl
+  int id: @var_decl ref,
+  int attached_property_wrapper_type: @type_or_none ref
+);
+
+#keyset[id]
+var_decl_parent_patterns(  //dir=decl
+  int id: @var_decl ref,
+  int parent_pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+var_decl_parent_initializers(  //dir=decl
+  int id: @var_decl ref,
+  int parent_initializer: @expr_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_backing_var_bindings(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_backing_var_binding: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_backing_vars(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_backing_var: @var_decl_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_projection_var_bindings(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_projection_var_binding: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_projection_vars(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_projection_var: @var_decl_or_none ref
+);
+
+accessors(  //dir=decl
+  unique int id: @accessor
+);
+
+#keyset[id]
+accessor_is_getter(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_setter(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_will_set(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_did_set(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_read(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_modify(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_unsafe_address(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_unsafe_mutable_address(  //dir=decl
+  int id: @accessor ref
+);
+
+associated_type_decls(  //dir=decl
+  unique int id: @associated_type_decl
+);
+
+concrete_var_decls(  //dir=decl
+  unique int id: @concrete_var_decl,
+  int introducer_int: int ref
+);
+
+generic_type_param_decls(  //dir=decl
+  unique int id: @generic_type_param_decl
+);
+
+named_functions(  //dir=decl
+  unique int id: @named_function
+);
+
+@nominal_type_decl =
+  @class_decl
+| @enum_decl
+| @protocol_decl
+| @struct_decl
+;
+
+#keyset[id]
+nominal_type_decls(  //dir=decl
+  int id: @nominal_type_decl ref,
+  int type_: @type_or_none ref
+);
+
+opaque_type_decls(  //dir=decl
+  unique int id: @opaque_type_decl,
+  int naming_declaration: @value_decl_or_none ref
+);
+
+#keyset[id, index]
+opaque_type_decl_opaque_generic_params(  //dir=decl
+  int id: @opaque_type_decl ref,
+  int index: int ref,
+  int opaque_generic_param: @generic_type_param_type_or_none ref
+);
+
+param_decls(  //dir=decl
+  unique int id: @param_decl
+);
+
+#keyset[id]
+param_decl_is_inout(  //dir=decl
+  int id: @param_decl ref
+);
+
+#keyset[id]
+param_decl_property_wrapper_local_wrapped_var_bindings(  //dir=decl
+  int id: @param_decl ref,
+  int property_wrapper_local_wrapped_var_binding: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+param_decl_property_wrapper_local_wrapped_vars(  //dir=decl
+  int id: @param_decl ref,
+  int property_wrapper_local_wrapped_var: @var_decl_or_none ref
+);
+
+type_alias_decls(  //dir=decl
+  unique int id: @type_alias_decl,
+  int aliased_type: @type_or_none ref
+);
+
+class_decls(  //dir=decl
+  unique int id: @class_decl
+);
+
+enum_decls(  //dir=decl
+  unique int id: @enum_decl
+);
+
+protocol_decls(  //dir=decl
+  unique int id: @protocol_decl
+);
+
+struct_decls(  //dir=decl
+  unique int id: @struct_decl
+);
+
+arguments(  //dir=expr
+  unique int id: @argument,
+  string label: string ref,
+  int expr: @expr_or_none ref
+);
+
+@expr =
+  @any_try_expr
+| @applied_property_wrapper_expr
+| @apply_expr
+| @assign_expr
+| @bind_optional_expr
+| @capture_list_expr
+| @closure_expr
+| @collection_expr
+| @consume_expr
+| @copy_expr
+| @current_context_isolation_expr
+| @decl_ref_expr
+| @default_argument_expr
+| @discard_assignment_expr
+| @dot_syntax_base_ignored_expr
+| @dynamic_type_expr
+| @enum_is_case_expr
+| @error_expr
+| @explicit_cast_expr
+| @extract_function_isolation_expr
+| @force_value_expr
+| @identity_expr
+| @if_expr
+| @implicit_conversion_expr
+| @in_out_expr
+| @key_path_application_expr
+| @key_path_dot_expr
+| @key_path_expr
+| @lazy_initialization_expr
+| @literal_expr
+| @lookup_expr
+| @make_temporarily_escapable_expr
+| @materialize_pack_expr
+| @obj_c_selector_expr
+| @one_way_expr
+| @opaque_value_expr
+| @open_existential_expr
+| @optional_evaluation_expr
+| @other_initializer_ref_expr
+| @overloaded_decl_ref_expr
+| @pack_element_expr
+| @pack_expansion_expr
+| @property_wrapper_value_placeholder_expr
+| @rebind_self_in_initializer_expr
+| @sequence_expr
+| @single_value_stmt_expr
+| @super_ref_expr
+| @tap_expr
+| @tuple_element_expr
+| @tuple_expr
+| @type_expr
+| @type_value_expr
+| @unresolved_decl_ref_expr
+| @unresolved_dot_expr
+| @unresolved_member_expr
+| @unresolved_pattern_expr
+| @unresolved_specialize_expr
+| @vararg_expansion_expr
+;
+
+#keyset[id]
+expr_types(  //dir=expr
+  int id: @expr ref,
+  int type_: @type_or_none ref
+);
+
+@any_try_expr =
+  @force_try_expr
+| @optional_try_expr
+| @try_expr
+;
+
+#keyset[id]
+any_try_exprs(  //dir=expr
+  int id: @any_try_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+applied_property_wrapper_exprs(  //dir=expr
+  unique int id: @applied_property_wrapper_expr,
+  int kind: int ref,
+  int value: @expr_or_none ref,
+  int param: @param_decl_or_none ref
+);
+
+@apply_expr =
+  @binary_expr
+| @call_expr
+| @postfix_unary_expr
+| @prefix_unary_expr
+| @self_apply_expr
+;
+
+#keyset[id]
+apply_exprs(  //dir=expr
+  int id: @apply_expr ref,
+  int function: @expr_or_none ref
+);
+
+#keyset[id, index]
+apply_expr_arguments(  //dir=expr
+  int id: @apply_expr ref,
+  int index: int ref,
+  int argument: @argument_or_none ref
+);
+
+assign_exprs(  //dir=expr
+  unique int id: @assign_expr,
+  int dest: @expr_or_none ref,
+  int source: @expr_or_none ref
+);
+
+bind_optional_exprs(  //dir=expr
+  unique int id: @bind_optional_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+capture_list_exprs(  //dir=expr
+  unique int id: @capture_list_expr,
+  int closure_body: @closure_expr_or_none ref
+);
+
+#keyset[id, index]
+capture_list_expr_binding_decls(  //dir=expr
+  int id: @capture_list_expr ref,
+  int index: int ref,
+  int binding_decl: @pattern_binding_decl_or_none ref
+);
+
+@closure_expr =
+  @auto_closure_expr
+| @explicit_closure_expr
+;
+
+@collection_expr =
+  @array_expr
+| @dictionary_expr
+;
+
+consume_exprs(  //dir=expr
+  unique int id: @consume_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+copy_exprs(  //dir=expr
+  unique int id: @copy_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+current_context_isolation_exprs(  //dir=expr
+  unique int id: @current_context_isolation_expr,
+  int actor: @expr_or_none ref
+);
+
+decl_ref_exprs(  //dir=expr
+  unique int id: @decl_ref_expr,
+  int decl: @decl_or_none ref
+);
+
+#keyset[id, index]
+decl_ref_expr_replacement_types(  //dir=expr
+  int id: @decl_ref_expr ref,
+  int index: int ref,
+  int replacement_type: @type_or_none ref
+);
+
+#keyset[id]
+decl_ref_expr_has_direct_to_storage_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+#keyset[id]
+decl_ref_expr_has_direct_to_implementation_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+#keyset[id]
+decl_ref_expr_has_ordinary_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+#keyset[id]
+decl_ref_expr_has_distributed_thunk_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+default_argument_exprs(  //dir=expr
+  unique int id: @default_argument_expr,
+  int param_decl: @param_decl_or_none ref,
+  int param_index: int ref
+);
+
+#keyset[id]
+default_argument_expr_caller_side_defaults(  //dir=expr
+  int id: @default_argument_expr ref,
+  int caller_side_default: @expr_or_none ref
+);
+
+discard_assignment_exprs(  //dir=expr
+  unique int id: @discard_assignment_expr
+);
+
+dot_syntax_base_ignored_exprs(  //dir=expr
+  unique int id: @dot_syntax_base_ignored_expr,
+  int qualifier: @expr_or_none ref,
+  int sub_expr: @expr_or_none ref
+);
+
+dynamic_type_exprs(  //dir=expr
+  unique int id: @dynamic_type_expr,
+  int base: @expr_or_none ref
+);
+
+enum_is_case_exprs(  //dir=expr
+  unique int id: @enum_is_case_expr,
+  int sub_expr: @expr_or_none ref,
+  int element: @enum_element_decl_or_none ref
+);
+
+error_exprs(  //dir=expr
+  unique int id: @error_expr
+);
+
+@explicit_cast_expr =
+  @checked_cast_expr
+| @coerce_expr
+;
+
+#keyset[id]
+explicit_cast_exprs(  //dir=expr
+  int id: @explicit_cast_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+extract_function_isolation_exprs(  //dir=expr
+  unique int id: @extract_function_isolation_expr,
+  int function_expr: @expr_or_none ref
+);
+
+force_value_exprs(  //dir=expr
+  unique int id: @force_value_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+@identity_expr =
+  @await_expr
+| @borrow_expr
+| @dot_self_expr
+| @paren_expr
+| @unresolved_member_chain_result_expr
+;
+
+#keyset[id]
+identity_exprs(  //dir=expr
+  int id: @identity_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+if_exprs(  //dir=expr
+  unique int id: @if_expr,
+  int condition: @expr_or_none ref,
+  int then_expr: @expr_or_none ref,
+  int else_expr: @expr_or_none ref
+);
+
+@implicit_conversion_expr =
+  @abi_safe_conversion_expr
+| @actor_isolation_erasure_expr
+| @any_hashable_erasure_expr
+| @archetype_to_super_expr
+| @array_to_pointer_expr
+| @bridge_from_obj_c_expr
+| @bridge_to_obj_c_expr
+| @class_metatype_to_object_expr
+| @collection_upcast_conversion_expr
+| @conditional_bridge_from_obj_c_expr
+| @covariant_function_conversion_expr
+| @covariant_return_conversion_expr
+| @derived_to_base_expr
+| @destructure_tuple_expr
+| @differentiable_function_expr
+| @differentiable_function_extract_original_expr
+| @erasure_expr
+| @existential_metatype_to_object_expr
+| @foreign_object_conversion_expr
+| @function_conversion_expr
+| @in_out_to_pointer_expr
+| @inject_into_optional_expr
+| @linear_function_expr
+| @linear_function_extract_original_expr
+| @linear_to_differentiable_function_expr
+| @load_expr
+| @metatype_conversion_expr
+| @pointer_to_pointer_expr
+| @protocol_metatype_to_object_expr
+| @string_to_pointer_expr
+| @underlying_to_opaque_expr
+| @unevaluated_instance_expr
+| @unreachable_expr
+| @unresolved_type_conversion_expr
+| @unsafe_cast_expr
+;
+
+#keyset[id]
+implicit_conversion_exprs(  //dir=expr
+  int id: @implicit_conversion_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+in_out_exprs(  //dir=expr
+  unique int id: @in_out_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+key_path_application_exprs(  //dir=expr
+  unique int id: @key_path_application_expr,
+  int base: @expr_or_none ref,
+  int key_path: @expr_or_none ref
+);
+
+key_path_dot_exprs(  //dir=expr
+  unique int id: @key_path_dot_expr
+);
+
+key_path_exprs(  //dir=expr
+  unique int id: @key_path_expr
+);
+
+#keyset[id]
+key_path_expr_roots(  //dir=expr
+  int id: @key_path_expr ref,
+  int root: @type_repr_or_none ref
+);
+
+#keyset[id, index]
+key_path_expr_components(  //dir=expr
+  int id: @key_path_expr ref,
+  int index: int ref,
+  int component: @key_path_component_or_none ref
+);
+
+lazy_initialization_exprs(  //dir=expr
+  unique int id: @lazy_initialization_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+@literal_expr =
+  @builtin_literal_expr
+| @interpolated_string_literal_expr
+| @nil_literal_expr
+| @object_literal_expr
+| @regex_literal_expr
+;
+
+@lookup_expr =
+  @dynamic_lookup_expr
+| @member_ref_expr
+| @subscript_expr
+;
+
+#keyset[id]
+lookup_exprs(  //dir=expr
+  int id: @lookup_expr ref,
+  int base: @expr_or_none ref
+);
+
+#keyset[id]
+lookup_expr_members(  //dir=expr
+  int id: @lookup_expr ref,
+  int member: @decl_or_none ref
+);
+
+make_temporarily_escapable_exprs(  //dir=expr
+  unique int id: @make_temporarily_escapable_expr,
+  int escaping_closure: @opaque_value_expr_or_none ref,
+  int nonescaping_closure: @expr_or_none ref,
+  int sub_expr: @expr_or_none ref
+);
+
+materialize_pack_exprs(  //dir=expr
+  unique int id: @materialize_pack_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+obj_c_selector_exprs(  //dir=expr
+  unique int id: @obj_c_selector_expr,
+  int sub_expr: @expr_or_none ref,
+  int method: @function_or_none ref
+);
+
+one_way_exprs(  //dir=expr
+  unique int id: @one_way_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+opaque_value_exprs(  //dir=expr
+  unique int id: @opaque_value_expr
+);
+
+open_existential_exprs(  //dir=expr
+  unique int id: @open_existential_expr,
+  int sub_expr: @expr_or_none ref,
+  int existential: @expr_or_none ref,
+  int opaque_expr: @opaque_value_expr_or_none ref
+);
+
+optional_evaluation_exprs(  //dir=expr
+  unique int id: @optional_evaluation_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+other_initializer_ref_exprs(  //dir=expr
+  unique int id: @other_initializer_ref_expr,
+  int initializer: @initializer_or_none ref
+);
+
+overloaded_decl_ref_exprs(  //dir=expr
+  unique int id: @overloaded_decl_ref_expr
+);
+
+#keyset[id, index]
+overloaded_decl_ref_expr_possible_declarations(  //dir=expr
+  int id: @overloaded_decl_ref_expr ref,
+  int index: int ref,
+  int possible_declaration: @value_decl_or_none ref
+);
+
+pack_element_exprs(  //dir=expr
+  unique int id: @pack_element_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+pack_expansion_exprs(  //dir=expr
+  unique int id: @pack_expansion_expr,
+  int pattern_expr: @expr_or_none ref
+);
+
+property_wrapper_value_placeholder_exprs(  //dir=expr
+  unique int id: @property_wrapper_value_placeholder_expr,
+  int placeholder: @opaque_value_expr_or_none ref
+);
+
+#keyset[id]
+property_wrapper_value_placeholder_expr_wrapped_values(  //dir=expr
+  int id: @property_wrapper_value_placeholder_expr ref,
+  int wrapped_value: @expr_or_none ref
+);
+
+rebind_self_in_initializer_exprs(  //dir=expr
+  unique int id: @rebind_self_in_initializer_expr,
+  int sub_expr: @expr_or_none ref,
+  int self: @var_decl_or_none ref
+);
+
+sequence_exprs(  //dir=expr
+  unique int id: @sequence_expr
+);
+
+#keyset[id, index]
+sequence_expr_elements(  //dir=expr
+  int id: @sequence_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+single_value_stmt_exprs(  //dir=expr
+  unique int id: @single_value_stmt_expr,
+  int stmt: @stmt_or_none ref
+);
+
+super_ref_exprs(  //dir=expr
+  unique int id: @super_ref_expr,
+  int self: @var_decl_or_none ref
+);
+
+tap_exprs(  //dir=expr
+  unique int id: @tap_expr,
+  int body: @brace_stmt_or_none ref,
+  int var: @var_decl_or_none ref
+);
+
+#keyset[id]
+tap_expr_sub_exprs(  //dir=expr
+  int id: @tap_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+tuple_element_exprs(  //dir=expr
+  unique int id: @tuple_element_expr,
+  int sub_expr: @expr_or_none ref,
+  int index: int ref
+);
+
+tuple_exprs(  //dir=expr
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_elements(  //dir=expr
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+type_exprs(  //dir=expr
+  unique int id: @type_expr
+);
+
+#keyset[id]
+type_expr_type_reprs(  //dir=expr
+  int id: @type_expr ref,
+  int type_repr: @type_repr_or_none ref
+);
+
+type_value_exprs(  //dir=expr
+  unique int id: @type_value_expr,
+  int type_repr: @type_repr_or_none ref
+);
+
+unresolved_decl_ref_exprs(  //dir=expr
+  unique int id: @unresolved_decl_ref_expr
+);
+
+#keyset[id]
+unresolved_decl_ref_expr_names(  //dir=expr
+  int id: @unresolved_decl_ref_expr ref,
+  string name: string ref
+);
+
+unresolved_dot_exprs(  //dir=expr
+  unique int id: @unresolved_dot_expr,
+  int base: @expr_or_none ref,
+  string name: string ref
+);
+
+unresolved_member_exprs(  //dir=expr
+  unique int id: @unresolved_member_expr,
+  string name: string ref
+);
+
+unresolved_pattern_exprs(  //dir=expr
+  unique int id: @unresolved_pattern_expr,
+  int sub_pattern: @pattern_or_none ref
+);
+
+unresolved_specialize_exprs(  //dir=expr
+  unique int id: @unresolved_specialize_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+vararg_expansion_exprs(  //dir=expr
+  unique int id: @vararg_expansion_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+abi_safe_conversion_exprs(  //dir=expr
+  unique int id: @abi_safe_conversion_expr
+);
+
+actor_isolation_erasure_exprs(  //dir=expr
+  unique int id: @actor_isolation_erasure_expr
+);
+
+any_hashable_erasure_exprs(  //dir=expr
+  unique int id: @any_hashable_erasure_expr
+);
+
+archetype_to_super_exprs(  //dir=expr
+  unique int id: @archetype_to_super_expr
+);
+
+array_exprs(  //dir=expr
+  unique int id: @array_expr
+);
+
+#keyset[id, index]
+array_expr_elements(  //dir=expr
+  int id: @array_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+array_to_pointer_exprs(  //dir=expr
+  unique int id: @array_to_pointer_expr
+);
+
+auto_closure_exprs(  //dir=expr
+  unique int id: @auto_closure_expr
+);
+
+await_exprs(  //dir=expr
+  unique int id: @await_expr
+);
+
+binary_exprs(  //dir=expr
+  unique int id: @binary_expr
+);
+
+borrow_exprs(  //dir=expr
+  unique int id: @borrow_expr
+);
+
+bridge_from_obj_c_exprs(  //dir=expr
+  unique int id: @bridge_from_obj_c_expr
+);
+
+bridge_to_obj_c_exprs(  //dir=expr
+  unique int id: @bridge_to_obj_c_expr
+);
+
+@builtin_literal_expr =
+  @boolean_literal_expr
+| @magic_identifier_literal_expr
+| @number_literal_expr
+| @string_literal_expr
+;
+
+call_exprs(  //dir=expr
+  unique int id: @call_expr
+);
+
+@checked_cast_expr =
+  @conditional_checked_cast_expr
+| @forced_checked_cast_expr
+| @is_expr
+;
+
+class_metatype_to_object_exprs(  //dir=expr
+  unique int id: @class_metatype_to_object_expr
+);
+
+coerce_exprs(  //dir=expr
+  unique int id: @coerce_expr
+);
+
+collection_upcast_conversion_exprs(  //dir=expr
+  unique int id: @collection_upcast_conversion_expr
+);
+
+conditional_bridge_from_obj_c_exprs(  //dir=expr
+  unique int id: @conditional_bridge_from_obj_c_expr
+);
+
+covariant_function_conversion_exprs(  //dir=expr
+  unique int id: @covariant_function_conversion_expr
+);
+
+covariant_return_conversion_exprs(  //dir=expr
+  unique int id: @covariant_return_conversion_expr
+);
+
+derived_to_base_exprs(  //dir=expr
+  unique int id: @derived_to_base_expr
+);
+
+destructure_tuple_exprs(  //dir=expr
+  unique int id: @destructure_tuple_expr
+);
+
+dictionary_exprs(  //dir=expr
+  unique int id: @dictionary_expr
+);
+
+#keyset[id, index]
+dictionary_expr_elements(  //dir=expr
+  int id: @dictionary_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+differentiable_function_exprs(  //dir=expr
+  unique int id: @differentiable_function_expr
+);
+
+differentiable_function_extract_original_exprs(  //dir=expr
+  unique int id: @differentiable_function_extract_original_expr
+);
+
+dot_self_exprs(  //dir=expr
+  unique int id: @dot_self_expr
+);
+
+@dynamic_lookup_expr =
+  @dynamic_member_ref_expr
+| @dynamic_subscript_expr
+;
+
+erasure_exprs(  //dir=expr
+  unique int id: @erasure_expr
+);
+
+existential_metatype_to_object_exprs(  //dir=expr
+  unique int id: @existential_metatype_to_object_expr
+);
+
+explicit_closure_exprs(  //dir=expr
+  unique int id: @explicit_closure_expr
+);
+
+force_try_exprs(  //dir=expr
+  unique int id: @force_try_expr
+);
+
+foreign_object_conversion_exprs(  //dir=expr
+  unique int id: @foreign_object_conversion_expr
+);
+
+function_conversion_exprs(  //dir=expr
+  unique int id: @function_conversion_expr
+);
+
+in_out_to_pointer_exprs(  //dir=expr
+  unique int id: @in_out_to_pointer_expr
+);
+
+inject_into_optional_exprs(  //dir=expr
+  unique int id: @inject_into_optional_expr
+);
+
+interpolated_string_literal_exprs(  //dir=expr
+  unique int id: @interpolated_string_literal_expr
+);
+
+#keyset[id]
+interpolated_string_literal_expr_interpolation_exprs(  //dir=expr
+  int id: @interpolated_string_literal_expr ref,
+  int interpolation_expr: @opaque_value_expr_or_none ref
+);
+
+#keyset[id]
+interpolated_string_literal_expr_appending_exprs(  //dir=expr
+  int id: @interpolated_string_literal_expr ref,
+  int appending_expr: @tap_expr_or_none ref
+);
+
+linear_function_exprs(  //dir=expr
+  unique int id: @linear_function_expr
+);
+
+linear_function_extract_original_exprs(  //dir=expr
+  unique int id: @linear_function_extract_original_expr
+);
+
+linear_to_differentiable_function_exprs(  //dir=expr
+  unique int id: @linear_to_differentiable_function_expr
+);
+
+load_exprs(  //dir=expr
+  unique int id: @load_expr
+);
+
+member_ref_exprs(  //dir=expr
+  unique int id: @member_ref_expr
+);
+
+#keyset[id]
+member_ref_expr_has_direct_to_storage_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+#keyset[id]
+member_ref_expr_has_direct_to_implementation_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+#keyset[id]
+member_ref_expr_has_ordinary_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+#keyset[id]
+member_ref_expr_has_distributed_thunk_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+metatype_conversion_exprs(  //dir=expr
+  unique int id: @metatype_conversion_expr
+);
+
+nil_literal_exprs(  //dir=expr
+  unique int id: @nil_literal_expr
+);
+
+object_literal_exprs(  //dir=expr
+  unique int id: @object_literal_expr,
+  int kind: int ref
+);
+
+#keyset[id, index]
+object_literal_expr_arguments(  //dir=expr
+  int id: @object_literal_expr ref,
+  int index: int ref,
+  int argument: @argument_or_none ref
+);
+
+optional_try_exprs(  //dir=expr
+  unique int id: @optional_try_expr
+);
+
+paren_exprs(  //dir=expr
+  unique int id: @paren_expr
+);
+
+pointer_to_pointer_exprs(  //dir=expr
+  unique int id: @pointer_to_pointer_expr
+);
+
+postfix_unary_exprs(  //dir=expr
+  unique int id: @postfix_unary_expr
+);
+
+prefix_unary_exprs(  //dir=expr
+  unique int id: @prefix_unary_expr
+);
+
+protocol_metatype_to_object_exprs(  //dir=expr
+  unique int id: @protocol_metatype_to_object_expr
+);
+
+regex_literal_exprs(  //dir=expr
+  unique int id: @regex_literal_expr,
+  string pattern: string ref,
+  int version: int ref
+);
+
+@self_apply_expr =
+  @dot_syntax_call_expr
+| @initializer_ref_call_expr
+;
+
+#keyset[id]
+self_apply_exprs(  //dir=expr
+  int id: @self_apply_expr ref,
+  int base: @expr_or_none ref
+);
+
+string_to_pointer_exprs(  //dir=expr
+  unique int id: @string_to_pointer_expr
+);
+
+subscript_exprs(  //dir=expr
+  unique int id: @subscript_expr
+);
+
+#keyset[id, index]
+subscript_expr_arguments(  //dir=expr
+  int id: @subscript_expr ref,
+  int index: int ref,
+  int argument: @argument_or_none ref
+);
+
+#keyset[id]
+subscript_expr_has_direct_to_storage_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+#keyset[id]
+subscript_expr_has_direct_to_implementation_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+#keyset[id]
+subscript_expr_has_ordinary_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+#keyset[id]
+subscript_expr_has_distributed_thunk_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+try_exprs(  //dir=expr
+  unique int id: @try_expr
+);
+
+underlying_to_opaque_exprs(  //dir=expr
+  unique int id: @underlying_to_opaque_expr
+);
+
+unevaluated_instance_exprs(  //dir=expr
+  unique int id: @unevaluated_instance_expr
+);
+
+unreachable_exprs(  //dir=expr
+  unique int id: @unreachable_expr
+);
+
+unresolved_member_chain_result_exprs(  //dir=expr
+  unique int id: @unresolved_member_chain_result_expr
+);
+
+unresolved_type_conversion_exprs(  //dir=expr
+  unique int id: @unresolved_type_conversion_expr
+);
+
+unsafe_cast_exprs(  //dir=expr
+  unique int id: @unsafe_cast_expr
+);
+
+boolean_literal_exprs(  //dir=expr
+  unique int id: @boolean_literal_expr,
+  boolean value: boolean ref
+);
+
+conditional_checked_cast_exprs(  //dir=expr
+  unique int id: @conditional_checked_cast_expr
+);
+
+dot_syntax_call_exprs(  //dir=expr
+  unique int id: @dot_syntax_call_expr
+);
+
+dynamic_member_ref_exprs(  //dir=expr
+  unique int id: @dynamic_member_ref_expr
+);
+
+dynamic_subscript_exprs(  //dir=expr
+  unique int id: @dynamic_subscript_expr
+);
+
+forced_checked_cast_exprs(  //dir=expr
+  unique int id: @forced_checked_cast_expr
+);
+
+initializer_ref_call_exprs(  //dir=expr
+  unique int id: @initializer_ref_call_expr
+);
+
+is_exprs(  //dir=expr
+  unique int id: @is_expr
+);
+
+magic_identifier_literal_exprs(  //dir=expr
+  unique int id: @magic_identifier_literal_expr,
+  string kind: string ref
+);
+
+@number_literal_expr =
+  @float_literal_expr
+| @integer_literal_expr
+;
+
+string_literal_exprs(  //dir=expr
+  unique int id: @string_literal_expr,
+  string value: string ref
+);
+
+float_literal_exprs(  //dir=expr
+  unique int id: @float_literal_expr,
+  string string_value: string ref
+);
+
+integer_literal_exprs(  //dir=expr
+  unique int id: @integer_literal_expr,
+  string string_value: string ref
+);
+
+@pattern =
+  @any_pattern
+| @binding_pattern
+| @bool_pattern
+| @enum_element_pattern
+| @expr_pattern
+| @is_pattern
+| @named_pattern
+| @optional_some_pattern
+| @paren_pattern
+| @tuple_pattern
+| @typed_pattern
+;
+
+#keyset[id]
+pattern_types(  //dir=pattern
+  int id: @pattern ref,
+  int type_: @type_or_none ref
+);
+
+any_patterns(  //dir=pattern
+  unique int id: @any_pattern
+);
+
+binding_patterns(  //dir=pattern
+  unique int id: @binding_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+bool_patterns(  //dir=pattern
+  unique int id: @bool_pattern,
+  boolean value: boolean ref
+);
+
+enum_element_patterns(  //dir=pattern
+  unique int id: @enum_element_pattern,
+  int element: @enum_element_decl_or_none ref
+);
+
+#keyset[id]
+enum_element_pattern_sub_patterns(  //dir=pattern
+  int id: @enum_element_pattern ref,
+  int sub_pattern: @pattern_or_none ref
+);
+
+expr_patterns(  //dir=pattern
+  unique int id: @expr_pattern,
+  int sub_expr: @expr_or_none ref
+);
+
+is_patterns(  //dir=pattern
+  unique int id: @is_pattern
+);
+
+#keyset[id]
+is_pattern_cast_type_reprs(  //dir=pattern
+  int id: @is_pattern ref,
+  int cast_type_repr: @type_repr_or_none ref
+);
+
+#keyset[id]
+is_pattern_sub_patterns(  //dir=pattern
+  int id: @is_pattern ref,
+  int sub_pattern: @pattern_or_none ref
+);
+
+named_patterns(  //dir=pattern
+  unique int id: @named_pattern,
+  int var_decl: @var_decl_or_none ref
+);
+
+optional_some_patterns(  //dir=pattern
+  unique int id: @optional_some_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+paren_patterns(  //dir=pattern
+  unique int id: @paren_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+tuple_patterns(  //dir=pattern
+  unique int id: @tuple_pattern
+);
+
+#keyset[id, index]
+tuple_pattern_elements(  //dir=pattern
+  int id: @tuple_pattern ref,
+  int index: int ref,
+  int element: @pattern_or_none ref
+);
+
+typed_patterns(  //dir=pattern
+  unique int id: @typed_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+typed_pattern_type_reprs(  //dir=pattern
+  int id: @typed_pattern ref,
+  int type_repr: @type_repr_or_none ref
+);
+
+case_label_items(  //dir=stmt
+  unique int id: @case_label_item,
+  int pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+case_label_item_guards(  //dir=stmt
+  int id: @case_label_item ref,
+  int guard: @expr_or_none ref
+);
+
+condition_elements(  //dir=stmt
+  unique int id: @condition_element
+);
+
+#keyset[id]
+condition_element_booleans(  //dir=stmt
+  int id: @condition_element ref,
+  int boolean_: @expr_or_none ref
+);
+
+#keyset[id]
+condition_element_patterns(  //dir=stmt
+  int id: @condition_element ref,
+  int pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+condition_element_initializers(  //dir=stmt
+  int id: @condition_element ref,
+  int initializer: @expr_or_none ref
+);
+
+#keyset[id]
+condition_element_availabilities(  //dir=stmt
+  int id: @condition_element ref,
+  int availability: @availability_info_or_none ref
+);
+
+@stmt =
+  @brace_stmt
+| @break_stmt
+| @case_stmt
+| @continue_stmt
+| @defer_stmt
+| @discard_stmt
+| @fail_stmt
+| @fallthrough_stmt
+| @labeled_stmt
+| @pound_assert_stmt
+| @return_stmt
+| @then_stmt
+| @throw_stmt
+| @yield_stmt
+;
+
+stmt_conditions(  //dir=stmt
+  unique int id: @stmt_condition
+);
+
+#keyset[id, index]
+stmt_condition_elements(  //dir=stmt
+  int id: @stmt_condition ref,
+  int index: int ref,
+  int element: @condition_element_or_none ref
+);
+
+brace_stmts(  //dir=stmt
+  unique int id: @brace_stmt
+);
+
+#keyset[id, index]
+brace_stmt_elements(  //dir=stmt
+  int id: @brace_stmt ref,
+  int index: int ref,
+  int element: @ast_node_or_none ref
+);
+
+break_stmts(  //dir=stmt
+  unique int id: @break_stmt
+);
+
+#keyset[id]
+break_stmt_target_names(  //dir=stmt
+  int id: @break_stmt ref,
+  string target_name: string ref
+);
+
+#keyset[id]
+break_stmt_targets(  //dir=stmt
+  int id: @break_stmt ref,
+  int target: @stmt_or_none ref
+);
+
+case_stmts(  //dir=stmt
+  unique int id: @case_stmt,
+  int body: @stmt_or_none ref
+);
+
+#keyset[id, index]
+case_stmt_labels(  //dir=stmt
+  int id: @case_stmt ref,
+  int index: int ref,
+  int label: @case_label_item_or_none ref
+);
+
+#keyset[id, index]
+case_stmt_variables(  //dir=stmt
+  int id: @case_stmt ref,
+  int index: int ref,
+  int variable: @var_decl_or_none ref
+);
+
+continue_stmts(  //dir=stmt
+  unique int id: @continue_stmt
+);
+
+#keyset[id]
+continue_stmt_target_names(  //dir=stmt
+  int id: @continue_stmt ref,
+  string target_name: string ref
+);
+
+#keyset[id]
+continue_stmt_targets(  //dir=stmt
+  int id: @continue_stmt ref,
+  int target: @stmt_or_none ref
+);
+
+defer_stmts(  //dir=stmt
+  unique int id: @defer_stmt,
+  int body: @brace_stmt_or_none ref
+);
+
+discard_stmts(  //dir=stmt
+  unique int id: @discard_stmt,
+  int sub_expr: @expr_or_none ref
+);
+
+fail_stmts(  //dir=stmt
+  unique int id: @fail_stmt
+);
+
+fallthrough_stmts(  //dir=stmt
+  unique int id: @fallthrough_stmt,
+  int fallthrough_source: @case_stmt_or_none ref,
+  int fallthrough_dest: @case_stmt_or_none ref
+);
+
+@labeled_stmt =
+  @do_catch_stmt
+| @do_stmt
+| @for_each_stmt
+| @labeled_conditional_stmt
+| @repeat_while_stmt
+| @switch_stmt
+;
+
+#keyset[id]
+labeled_stmt_labels(  //dir=stmt
+  int id: @labeled_stmt ref,
+  string label: string ref
+);
+
+pound_assert_stmts(  //dir=stmt
+  unique int id: @pound_assert_stmt,
+  int condition: @expr_or_none ref,
+  string message: string ref
+);
+
+return_stmts(  //dir=stmt
+  unique int id: @return_stmt
+);
+
+#keyset[id]
+return_stmt_results(  //dir=stmt
+  int id: @return_stmt ref,
+  int result: @expr_or_none ref
+);
+
+then_stmts(  //dir=stmt
+  unique int id: @then_stmt,
+  int result: @expr_or_none ref
+);
+
+throw_stmts(  //dir=stmt
+  unique int id: @throw_stmt,
+  int sub_expr: @expr_or_none ref
+);
+
+yield_stmts(  //dir=stmt
+  unique int id: @yield_stmt
+);
+
+#keyset[id, index]
+yield_stmt_results(  //dir=stmt
+  int id: @yield_stmt ref,
+  int index: int ref,
+  int result: @expr_or_none ref
+);
+
+do_catch_stmts(  //dir=stmt
+  unique int id: @do_catch_stmt,
+  int body: @stmt_or_none ref
+);
+
+#keyset[id, index]
+do_catch_stmt_catches(  //dir=stmt
+  int id: @do_catch_stmt ref,
+  int index: int ref,
+  int catch: @case_stmt_or_none ref
+);
+
+do_stmts(  //dir=stmt
+  unique int id: @do_stmt,
+  int body: @brace_stmt_or_none ref
+);
+
+for_each_stmts(  //dir=stmt
+  unique int id: @for_each_stmt,
+  int pattern: @pattern_or_none ref,
+  int body: @brace_stmt_or_none ref
+);
+
+#keyset[id, index]
+for_each_stmt_variables(  //dir=stmt
+  int id: @for_each_stmt ref,
+  int index: int ref,
+  int variable: @var_decl_or_none ref
+);
+
+#keyset[id]
+for_each_stmt_wheres(  //dir=stmt
+  int id: @for_each_stmt ref,
+  int where: @expr_or_none ref
+);
+
+#keyset[id]
+for_each_stmt_iterator_vars(  //dir=stmt
+  int id: @for_each_stmt ref,
+  int iteratorVar: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+for_each_stmt_next_calls(  //dir=stmt
+  int id: @for_each_stmt ref,
+  int nextCall: @expr_or_none ref
+);
+
+@labeled_conditional_stmt =
+  @guard_stmt
+| @if_stmt
+| @while_stmt
+;
+
+#keyset[id]
+labeled_conditional_stmts(  //dir=stmt
+  int id: @labeled_conditional_stmt ref,
+  int condition: @stmt_condition_or_none ref
+);
+
+repeat_while_stmts(  //dir=stmt
+  unique int id: @repeat_while_stmt,
+  int condition: @expr_or_none ref,
+  int body: @stmt_or_none ref
+);
+
+switch_stmts(  //dir=stmt
+  unique int id: @switch_stmt,
+  int expr: @expr_or_none ref
+);
+
+#keyset[id, index]
+switch_stmt_cases(  //dir=stmt
+  int id: @switch_stmt ref,
+  int index: int ref,
+  int case_: @case_stmt_or_none ref
+);
+
+guard_stmts(  //dir=stmt
+  unique int id: @guard_stmt,
+  int body: @brace_stmt_or_none ref
+);
+
+if_stmts(  //dir=stmt
+  unique int id: @if_stmt,
+  int then: @stmt_or_none ref
+);
+
+#keyset[id]
+if_stmt_elses(  //dir=stmt
+  int id: @if_stmt ref,
+  int else: @stmt_or_none ref
+);
+
+while_stmts(  //dir=stmt
+  unique int id: @while_stmt,
+  int body: @stmt_or_none ref
+);
+
+@type =
+  @any_function_type
+| @any_generic_type
+| @any_metatype_type
+| @builtin_type
+| @dependent_member_type
+| @dynamic_self_type
+| @error_type
+| @existential_type
+| @in_out_type
+| @integer_type
+| @l_value_type
+| @module_type
+| @pack_element_type
+| @pack_expansion_type
+| @pack_type
+| @parameterized_protocol_type
+| @protocol_composition_type
+| @reference_storage_type
+| @substitutable_type
+| @sugar_type
+| @tuple_type
+| @unresolved_type
+;
+
+#keyset[id]
+types(  //dir=type
+  int id: @type ref,
+  string name: string ref,
+  int canonical_type: @type_or_none ref
+);
+
+type_reprs(  //dir=type
+  unique int id: @type_repr,
+  int type_: @type_or_none ref
+);
+
+@any_function_type =
+  @function_type
+| @generic_function_type
+;
+
+#keyset[id]
+any_function_types(  //dir=type
+  int id: @any_function_type ref,
+  int result: @type_or_none ref
+);
+
+#keyset[id, index]
+any_function_type_param_types(  //dir=type
+  int id: @any_function_type ref,
+  int index: int ref,
+  int param_type: @type_or_none ref
+);
+
+#keyset[id]
+any_function_type_is_throwing(  //dir=type
+  int id: @any_function_type ref
+);
+
+#keyset[id]
+any_function_type_is_async(  //dir=type
+  int id: @any_function_type ref
+);
+
+@any_generic_type =
+  @nominal_or_bound_generic_nominal_type
+| @unbound_generic_type
+;
+
+#keyset[id]
+any_generic_types(  //dir=type
+  int id: @any_generic_type ref,
+  int declaration: @generic_type_decl_or_none ref
+);
+
+#keyset[id]
+any_generic_type_parents(  //dir=type
+  int id: @any_generic_type ref,
+  int parent: @type_or_none ref
+);
+
+@any_metatype_type =
+  @existential_metatype_type
+| @metatype_type
+;
+
+@builtin_type =
+  @any_builtin_integer_type
+| @builtin_bridge_object_type
+| @builtin_default_actor_storage_type
+| @builtin_executor_type
+| @builtin_fixed_array_type
+| @builtin_float_type
+| @builtin_job_type
+| @builtin_native_object_type
+| @builtin_raw_pointer_type
+| @builtin_raw_unsafe_continuation_type
+| @builtin_unsafe_value_buffer_type
+| @builtin_vector_type
+;
+
+dependent_member_types(  //dir=type
+  unique int id: @dependent_member_type,
+  int base_type: @type_or_none ref,
+  int associated_type_decl: @associated_type_decl_or_none ref
+);
+
+dynamic_self_types(  //dir=type
+  unique int id: @dynamic_self_type,
+  int static_self_type: @type_or_none ref
+);
+
+error_types(  //dir=type
+  unique int id: @error_type
+);
+
+existential_types(  //dir=type
+  unique int id: @existential_type,
+  int constraint: @type_or_none ref
+);
+
+in_out_types(  //dir=type
+  unique int id: @in_out_type,
+  int object_type: @type_or_none ref
+);
+
+integer_types(  //dir=type
+  unique int id: @integer_type,
+  string value: string ref
+);
+
+l_value_types(  //dir=type
+  unique int id: @l_value_type,
+  int object_type: @type_or_none ref
+);
+
+module_types(  //dir=type
+  unique int id: @module_type,
+  int module: @module_decl_or_none ref
+);
+
+pack_element_types(  //dir=type
+  unique int id: @pack_element_type,
+  int pack_type: @type_or_none ref
+);
+
+pack_expansion_types(  //dir=type
+  unique int id: @pack_expansion_type,
+  int pattern_type: @type_or_none ref,
+  int count_type: @type_or_none ref
+);
+
+pack_types(  //dir=type
+  unique int id: @pack_type
+);
+
+#keyset[id, index]
+pack_type_elements(  //dir=type
+  int id: @pack_type ref,
+  int index: int ref,
+  int element: @type_or_none ref
+);
+
+parameterized_protocol_types(  //dir=type
+  unique int id: @parameterized_protocol_type,
+  int base: @protocol_type_or_none ref
+);
+
+#keyset[id, index]
+parameterized_protocol_type_args(  //dir=type
+  int id: @parameterized_protocol_type ref,
+  int index: int ref,
+  int arg: @type_or_none ref
+);
+
+protocol_composition_types(  //dir=type
+  unique int id: @protocol_composition_type
+);
+
+#keyset[id, index]
+protocol_composition_type_members(  //dir=type
+  int id: @protocol_composition_type ref,
+  int index: int ref,
+  int member: @type_or_none ref
+);
+
+@reference_storage_type =
+  @unmanaged_storage_type
+| @unowned_storage_type
+| @weak_storage_type
+;
+
+#keyset[id]
+reference_storage_types(  //dir=type
+  int id: @reference_storage_type ref,
+  int referent_type: @type_or_none ref
+);
+
+@substitutable_type =
+  @archetype_type
+| @generic_type_param_type
+;
+
+@sugar_type =
+  @paren_type
+| @syntax_sugar_type
+| @type_alias_type
+;
+
+tuple_types(  //dir=type
+  unique int id: @tuple_type
+);
+
+#keyset[id, index]
+tuple_type_types(  //dir=type
+  int id: @tuple_type ref,
+  int index: int ref,
+  int type_: @type_or_none ref
+);
+
+#keyset[id, index]
+tuple_type_names(  //dir=type
+  int id: @tuple_type ref,
+  int index: int ref,
+  string name: string ref
+);
+
+unresolved_types(  //dir=type
+  unique int id: @unresolved_type
+);
+
+@any_builtin_integer_type =
+  @builtin_integer_literal_type
+| @builtin_integer_type
+;
+
+@archetype_type =
+  @local_archetype_type
+| @opaque_type_archetype_type
+| @pack_archetype_type
+| @primary_archetype_type
+;
+
+#keyset[id]
+archetype_types(  //dir=type
+  int id: @archetype_type ref,
+  int interface_type: @type_or_none ref
+);
+
+#keyset[id]
+archetype_type_superclasses(  //dir=type
+  int id: @archetype_type ref,
+  int superclass: @type_or_none ref
+);
+
+#keyset[id, index]
+archetype_type_protocols(  //dir=type
+  int id: @archetype_type ref,
+  int index: int ref,
+  int protocol: @protocol_decl_or_none ref
+);
+
+builtin_bridge_object_types(  //dir=type
+  unique int id: @builtin_bridge_object_type
+);
+
+builtin_default_actor_storage_types(  //dir=type
+  unique int id: @builtin_default_actor_storage_type
+);
+
+builtin_executor_types(  //dir=type
+  unique int id: @builtin_executor_type
+);
+
+builtin_fixed_array_types(  //dir=type
+  unique int id: @builtin_fixed_array_type
+);
+
+builtin_float_types(  //dir=type
+  unique int id: @builtin_float_type
+);
+
+builtin_job_types(  //dir=type
+  unique int id: @builtin_job_type
+);
+
+builtin_native_object_types(  //dir=type
+  unique int id: @builtin_native_object_type
+);
+
+builtin_raw_pointer_types(  //dir=type
+  unique int id: @builtin_raw_pointer_type
+);
+
+builtin_raw_unsafe_continuation_types(  //dir=type
+  unique int id: @builtin_raw_unsafe_continuation_type
+);
+
+builtin_unsafe_value_buffer_types(  //dir=type
+  unique int id: @builtin_unsafe_value_buffer_type
+);
+
+builtin_vector_types(  //dir=type
+  unique int id: @builtin_vector_type
+);
+
+existential_metatype_types(  //dir=type
+  unique int id: @existential_metatype_type
+);
+
+function_types(  //dir=type
+  unique int id: @function_type
+);
+
+generic_function_types(  //dir=type
+  unique int id: @generic_function_type
+);
+
+#keyset[id, index]
+generic_function_type_generic_params(  //dir=type
+  int id: @generic_function_type ref,
+  int index: int ref,
+  int generic_param: @generic_type_param_type_or_none ref
+);
+
+generic_type_param_types(  //dir=type
+  unique int id: @generic_type_param_type
+);
+
+metatype_types(  //dir=type
+  unique int id: @metatype_type
+);
+
+@nominal_or_bound_generic_nominal_type =
+  @bound_generic_type
+| @nominal_type
+;
+
+paren_types(  //dir=type
+  unique int id: @paren_type,
+  int type_: @type_or_none ref
+);
+
+@syntax_sugar_type =
+  @dictionary_type
+| @unary_syntax_sugar_type
+;
+
+type_alias_types(  //dir=type
+  unique int id: @type_alias_type,
+  int decl: @type_alias_decl_or_none ref
+);
+
+unbound_generic_types(  //dir=type
+  unique int id: @unbound_generic_type
+);
+
+unmanaged_storage_types(  //dir=type
+  unique int id: @unmanaged_storage_type
+);
+
+unowned_storage_types(  //dir=type
+  unique int id: @unowned_storage_type
+);
+
+weak_storage_types(  //dir=type
+  unique int id: @weak_storage_type
+);
+
+@bound_generic_type =
+  @bound_generic_class_type
+| @bound_generic_enum_type
+| @bound_generic_struct_type
+;
+
+#keyset[id, index]
+bound_generic_type_arg_types(  //dir=type
+  int id: @bound_generic_type ref,
+  int index: int ref,
+  int arg_type: @type_or_none ref
+);
+
+builtin_integer_literal_types(  //dir=type
+  unique int id: @builtin_integer_literal_type
+);
+
+builtin_integer_types(  //dir=type
+  unique int id: @builtin_integer_type
+);
+
+#keyset[id]
+builtin_integer_type_widths(  //dir=type
+  int id: @builtin_integer_type ref,
+  int width: int ref
+);
+
+dictionary_types(  //dir=type
+  unique int id: @dictionary_type,
+  int key_type: @type_or_none ref,
+  int value_type: @type_or_none ref
+);
+
+@local_archetype_type =
+  @element_archetype_type
+| @existential_archetype_type
+;
+
+@nominal_type =
+  @class_type
+| @enum_type
+| @protocol_type
+| @struct_type
+;
+
+opaque_type_archetype_types(  //dir=type
+  unique int id: @opaque_type_archetype_type,
+  int declaration: @opaque_type_decl_or_none ref
+);
+
+pack_archetype_types(  //dir=type
+  unique int id: @pack_archetype_type
+);
+
+primary_archetype_types(  //dir=type
+  unique int id: @primary_archetype_type
+);
+
+@unary_syntax_sugar_type =
+  @array_slice_type
+| @optional_type
+| @variadic_sequence_type
+;
+
+#keyset[id]
+unary_syntax_sugar_types(  //dir=type
+  int id: @unary_syntax_sugar_type ref,
+  int base_type: @type_or_none ref
+);
+
+array_slice_types(  //dir=type
+  unique int id: @array_slice_type
+);
+
+bound_generic_class_types(  //dir=type
+  unique int id: @bound_generic_class_type
+);
+
+bound_generic_enum_types(  //dir=type
+  unique int id: @bound_generic_enum_type
+);
+
+bound_generic_struct_types(  //dir=type
+  unique int id: @bound_generic_struct_type
+);
+
+class_types(  //dir=type
+  unique int id: @class_type
+);
+
+element_archetype_types(  //dir=type
+  unique int id: @element_archetype_type
+);
+
+enum_types(  //dir=type
+  unique int id: @enum_type
+);
+
+existential_archetype_types(  //dir=type
+  unique int id: @existential_archetype_type
+);
+
+optional_types(  //dir=type
+  unique int id: @optional_type
+);
+
+protocol_types(  //dir=type
+  unique int id: @protocol_type
+);
+
+struct_types(  //dir=type
+  unique int id: @struct_type
+);
+
+variadic_sequence_types(  //dir=type
+  unique int id: @variadic_sequence_type
+);
+
+@accessor_or_none =
+  @accessor
+| @unspecified_element
+;
+
+@argument_or_none =
+  @argument
+| @unspecified_element
+;
+
+@associated_type_decl_or_none =
+  @associated_type_decl
+| @unspecified_element
+;
+
+@ast_node_or_none =
+  @ast_node
+| @unspecified_element
+;
+
+@availability_info_or_none =
+  @availability_info
+| @unspecified_element
+;
+
+@availability_spec_or_none =
+  @availability_spec
+| @unspecified_element
+;
+
+@brace_stmt_or_none =
+  @brace_stmt
+| @unspecified_element
+;
+
+@captured_decl_or_none =
+  @captured_decl
+| @unspecified_element
+;
+
+@case_label_item_or_none =
+  @case_label_item
+| @unspecified_element
+;
+
+@case_stmt_or_none =
+  @case_stmt
+| @unspecified_element
+;
+
+@closure_expr_or_none =
+  @closure_expr
+| @unspecified_element
+;
+
+@condition_element_or_none =
+  @condition_element
+| @unspecified_element
+;
+
+@decl_or_none =
+  @decl
+| @unspecified_element
+;
+
+@enum_element_decl_or_none =
+  @enum_element_decl
+| @unspecified_element
+;
+
+@expr_or_none =
+  @expr
+| @unspecified_element
+;
+
+@file_or_none =
+  @file
+| @unspecified_element
+;
+
+@function_or_none =
+  @function
+| @unspecified_element
+;
+
+@generic_type_decl_or_none =
+  @generic_type_decl
+| @unspecified_element
+;
+
+@generic_type_param_decl_or_none =
+  @generic_type_param_decl
+| @unspecified_element
+;
+
+@generic_type_param_type_or_none =
+  @generic_type_param_type
+| @unspecified_element
+;
+
+@initializer_or_none =
+  @initializer
+| @unspecified_element
+;
+
+@key_path_component_or_none =
+  @key_path_component
+| @unspecified_element
+;
+
+@location_or_none =
+  @location
+| @unspecified_element
+;
+
+@macro_role_or_none =
+  @macro_role
+| @unspecified_element
+;
+
+@module_decl_or_none =
+  @module_decl
+| @unspecified_element
+;
+
+@nominal_type_decl_or_none =
+  @nominal_type_decl
+| @unspecified_element
+;
+
+@opaque_type_decl_or_none =
+  @opaque_type_decl
+| @unspecified_element
+;
+
+@opaque_value_expr_or_none =
+  @opaque_value_expr
+| @unspecified_element
+;
+
+@param_decl_or_none =
+  @param_decl
+| @unspecified_element
+;
+
+@pattern_or_none =
+  @pattern
+| @unspecified_element
+;
+
+@pattern_binding_decl_or_none =
+  @pattern_binding_decl
+| @unspecified_element
+;
+
+@precedence_group_decl_or_none =
+  @precedence_group_decl
+| @unspecified_element
+;
+
+@protocol_decl_or_none =
+  @protocol_decl
+| @unspecified_element
+;
+
+@protocol_type_or_none =
+  @protocol_type
+| @unspecified_element
+;
+
+@stmt_or_none =
+  @stmt
+| @unspecified_element
+;
+
+@stmt_condition_or_none =
+  @stmt_condition
+| @unspecified_element
+;
+
+@string_literal_expr_or_none =
+  @string_literal_expr
+| @unspecified_element
+;
+
+@tap_expr_or_none =
+  @tap_expr
+| @unspecified_element
+;
+
+@type_or_none =
+  @type
+| @unspecified_element
+;
+
+@type_alias_decl_or_none =
+  @type_alias_decl
+| @unspecified_element
+;
+
+@type_repr_or_none =
+  @type_repr
+| @unspecified_element
+;
+
+@value_decl_or_none =
+  @unspecified_element
+| @value_decl
+;
+
+@var_decl_or_none =
+  @unspecified_element
+| @var_decl
+;
diff --git a/swift/ql/lib/upgrades/b7006eaacb007a06251596835506185619b86e98/swift.dbscheme b/swift/ql/lib/upgrades/b7006eaacb007a06251596835506185619b86e98/swift.dbscheme
new file mode 100644
index 00000000000..33e5e5e03bd
--- /dev/null
+++ b/swift/ql/lib/upgrades/b7006eaacb007a06251596835506185619b86e98/swift.dbscheme
@@ -0,0 +1,2885 @@
+// generated by codegen/codegen.py, do not edit
+
+// from prefix.dbscheme
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(
+  string prefix: string ref
+);
+
+
+// from schema.py
+
+@element =
+  @file
+| @generic_context
+| @locatable
+| @location
+| @type
+;
+
+#keyset[id]
+element_is_unknown(
+  int id: @element ref
+);
+
+@file =
+  @db_file
+;
+
+#keyset[id]
+files(
+  int id: @file ref,
+  string name: string ref
+);
+
+#keyset[id]
+file_is_successfully_extracted(
+  int id: @file ref
+);
+
+@locatable =
+  @argument
+| @ast_node
+| @comment
+| @diagnostics
+| @error_element
+;
+
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_or_none ref
+);
+
+@location =
+  @db_location
+;
+
+#keyset[id]
+locations(
+  int id: @location ref,
+  int file: @file_or_none ref,
+  int start_line: int ref,
+  int start_column: int ref,
+  int end_line: int ref,
+  int end_column: int ref
+);
+
+@ast_node =
+  @availability_info
+| @availability_spec
+| @callable
+| @case_label_item
+| @condition_element
+| @decl
+| @expr
+| @key_path_component
+| @macro_role
+| @pattern
+| @stmt
+| @stmt_condition
+| @type_repr
+;
+
+comments(
+  unique int id: @comment,
+  string text: string ref
+);
+
+db_files(
+  unique int id: @db_file
+);
+
+db_locations(
+  unique int id: @db_location
+);
+
+diagnostics(
+  unique int id: @diagnostics,
+  string text: string ref,
+  int kind: int ref
+);
+
+@error_element =
+  @error_expr
+| @error_type
+| @overloaded_decl_ref_expr
+| @unresolved_decl_ref_expr
+| @unresolved_dot_expr
+| @unresolved_member_chain_result_expr
+| @unresolved_member_expr
+| @unresolved_pattern_expr
+| @unresolved_specialize_expr
+| @unresolved_type
+| @unresolved_type_conversion_expr
+| @unspecified_element
+;
+
+availability_infos(
+  unique int id: @availability_info
+);
+
+#keyset[id]
+availability_info_is_unavailable(
+  int id: @availability_info ref
+);
+
+#keyset[id, index]
+availability_info_specs(
+  int id: @availability_info ref,
+  int index: int ref,
+  int spec: @availability_spec_or_none ref
+);
+
+availability_specs(
+  unique int id: @availability_spec
+);
+
+#keyset[id]
+availability_spec_platforms(
+  int id: @availability_spec ref,
+  string platform: string ref
+);
+
+#keyset[id]
+availability_spec_versions(
+  int id: @availability_spec ref,
+  string version: string ref
+);
+
+#keyset[id]
+availability_spec_is_wildcard(
+  int id: @availability_spec ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_names(
+  int id: @callable ref,
+  string name: string ref
+);
+
+#keyset[id]
+callable_self_params(
+  int id: @callable ref,
+  int self_param: @param_decl_or_none ref
+);
+
+#keyset[id, index]
+callable_params(
+  int id: @callable ref,
+  int index: int ref,
+  int param: @param_decl_or_none ref
+);
+
+#keyset[id]
+callable_bodies(
+  int id: @callable ref,
+  int body: @brace_stmt_or_none ref
+);
+
+#keyset[id, index]
+callable_captures(
+  int id: @callable ref,
+  int index: int ref,
+  int capture: @captured_decl_or_none ref
+);
+
+key_path_components(
+  unique int id: @key_path_component,
+  int kind: int ref,
+  int component_type: @type_or_none ref
+);
+
+#keyset[id, index]
+key_path_component_subscript_arguments(
+  int id: @key_path_component ref,
+  int index: int ref,
+  int subscript_argument: @argument_or_none ref
+);
+
+#keyset[id]
+key_path_component_tuple_indices(
+  int id: @key_path_component ref,
+  int tuple_index: int ref
+);
+
+#keyset[id]
+key_path_component_decl_refs(
+  int id: @key_path_component ref,
+  int decl_ref: @value_decl_or_none ref
+);
+
+macro_roles(
+  unique int id: @macro_role,
+  int kind: int ref,
+  int macro_syntax: int ref
+);
+
+#keyset[id, index]
+macro_role_conformances(
+  int id: @macro_role ref,
+  int index: int ref,
+  int conformance: @expr_or_none ref
+);
+
+#keyset[id, index]
+macro_role_names(
+  int id: @macro_role ref,
+  int index: int ref,
+  string name: string ref
+);
+
+unspecified_elements(
+  unique int id: @unspecified_element,
+  string property: string ref,
+  string error: string ref
+);
+
+#keyset[id]
+unspecified_element_parents(
+  int id: @unspecified_element ref,
+  int parent: @element ref
+);
+
+#keyset[id]
+unspecified_element_indices(
+  int id: @unspecified_element ref,
+  int index: int ref
+);
+
+#keyset[id, index]
+unspecified_element_children(
+  int id: @unspecified_element ref,
+  int index: int ref,
+  int child: @ast_node_or_none ref
+);
+
+@decl =
+  @captured_decl
+| @enum_case_decl
+| @extension_decl
+| @if_config_decl
+| @import_decl
+| @missing_member_decl
+| @operator_decl
+| @pattern_binding_decl
+| @pound_diagnostic_decl
+| @precedence_group_decl
+| @top_level_code_decl
+| @using_decl
+| @value_decl
+;
+
+#keyset[id]
+decls(  //dir=decl
+  int id: @decl ref,
+  int module: @module_decl_or_none ref
+);
+
+#keyset[id, index]
+decl_members(  //dir=decl
+  int id: @decl ref,
+  int index: int ref,
+  int member: @decl_or_none ref
+);
+
+@generic_context =
+  @extension_decl
+| @function
+| @generic_type_decl
+| @macro_decl
+| @subscript_decl
+;
+
+#keyset[id, index]
+generic_context_generic_type_params(  //dir=decl
+  int id: @generic_context ref,
+  int index: int ref,
+  int generic_type_param: @generic_type_param_decl_or_none ref
+);
+
+captured_decls(  //dir=decl
+  unique int id: @captured_decl,
+  int decl: @value_decl_or_none ref
+);
+
+#keyset[id]
+captured_decl_is_direct(  //dir=decl
+  int id: @captured_decl ref
+);
+
+#keyset[id]
+captured_decl_is_escaping(  //dir=decl
+  int id: @captured_decl ref
+);
+
+enum_case_decls(  //dir=decl
+  unique int id: @enum_case_decl
+);
+
+#keyset[id, index]
+enum_case_decl_elements(  //dir=decl
+  int id: @enum_case_decl ref,
+  int index: int ref,
+  int element: @enum_element_decl_or_none ref
+);
+
+extension_decls(  //dir=decl
+  unique int id: @extension_decl,
+  int extended_type_decl: @nominal_type_decl_or_none ref
+);
+
+#keyset[id, index]
+extension_decl_protocols(  //dir=decl
+  int id: @extension_decl ref,
+  int index: int ref,
+  int protocol: @protocol_decl_or_none ref
+);
+
+if_config_decls(  //dir=decl
+  unique int id: @if_config_decl
+);
+
+#keyset[id, index]
+if_config_decl_active_elements(  //dir=decl
+  int id: @if_config_decl ref,
+  int index: int ref,
+  int active_element: @ast_node_or_none ref
+);
+
+import_decls(  //dir=decl
+  unique int id: @import_decl
+);
+
+#keyset[id]
+import_decl_is_exported(  //dir=decl
+  int id: @import_decl ref
+);
+
+#keyset[id]
+import_decl_imported_modules(  //dir=decl
+  int id: @import_decl ref,
+  int imported_module: @module_decl_or_none ref
+);
+
+#keyset[id, index]
+import_decl_declarations(  //dir=decl
+  int id: @import_decl ref,
+  int index: int ref,
+  int declaration: @value_decl_or_none ref
+);
+
+missing_member_decls(  //dir=decl
+  unique int id: @missing_member_decl,
+  string name: string ref
+);
+
+@operator_decl =
+  @infix_operator_decl
+| @postfix_operator_decl
+| @prefix_operator_decl
+;
+
+#keyset[id]
+operator_decls(  //dir=decl
+  int id: @operator_decl ref,
+  string name: string ref
+);
+
+pattern_binding_decls(  //dir=decl
+  unique int id: @pattern_binding_decl
+);
+
+#keyset[id, index]
+pattern_binding_decl_inits(  //dir=decl
+  int id: @pattern_binding_decl ref,
+  int index: int ref,
+  int init: @expr_or_none ref
+);
+
+#keyset[id, index]
+pattern_binding_decl_patterns(  //dir=decl
+  int id: @pattern_binding_decl ref,
+  int index: int ref,
+  int pattern: @pattern_or_none ref
+);
+
+pound_diagnostic_decls(  //dir=decl
+  unique int id: @pound_diagnostic_decl,
+  int kind: int ref,
+  int message: @string_literal_expr_or_none ref
+);
+
+precedence_group_decls(  //dir=decl
+  unique int id: @precedence_group_decl
+);
+
+top_level_code_decls(  //dir=decl
+  unique int id: @top_level_code_decl,
+  int body: @brace_stmt_or_none ref
+);
+
+using_decls(  //dir=decl
+  unique int id: @using_decl
+);
+
+#keyset[id]
+using_decl_is_main_actor(  //dir=decl
+  int id: @using_decl ref
+);
+
+#keyset[id]
+using_decl_is_nonisolated(  //dir=decl
+  int id: @using_decl ref
+);
+
+@value_decl =
+  @abstract_storage_decl
+| @enum_element_decl
+| @function
+| @macro_decl
+| @type_decl
+;
+
+#keyset[id]
+value_decls(  //dir=decl
+  int id: @value_decl ref,
+  int interface_type: @type_or_none ref
+);
+
+@abstract_storage_decl =
+  @subscript_decl
+| @var_decl
+;
+
+#keyset[id, index]
+abstract_storage_decl_accessors(  //dir=decl
+  int id: @abstract_storage_decl ref,
+  int index: int ref,
+  int accessor: @accessor_or_none ref
+);
+
+enum_element_decls(  //dir=decl
+  unique int id: @enum_element_decl,
+  string name: string ref
+);
+
+#keyset[id, index]
+enum_element_decl_params(  //dir=decl
+  int id: @enum_element_decl ref,
+  int index: int ref,
+  int param: @param_decl_or_none ref
+);
+
+@function =
+  @accessor_or_named_function
+| @deinitializer
+| @initializer
+;
+
+infix_operator_decls(  //dir=decl
+  unique int id: @infix_operator_decl
+);
+
+#keyset[id]
+infix_operator_decl_precedence_groups(  //dir=decl
+  int id: @infix_operator_decl ref,
+  int precedence_group: @precedence_group_decl_or_none ref
+);
+
+macro_decls(  //dir=decl
+  unique int id: @macro_decl,
+  string name: string ref
+);
+
+#keyset[id, index]
+macro_decl_parameters(  //dir=decl
+  int id: @macro_decl ref,
+  int index: int ref,
+  int parameter: @param_decl_or_none ref
+);
+
+#keyset[id, index]
+macro_decl_roles(  //dir=decl
+  int id: @macro_decl ref,
+  int index: int ref,
+  int role: @macro_role_or_none ref
+);
+
+postfix_operator_decls(  //dir=decl
+  unique int id: @postfix_operator_decl
+);
+
+prefix_operator_decls(  //dir=decl
+  unique int id: @prefix_operator_decl
+);
+
+@type_decl =
+  @abstract_type_param_decl
+| @generic_type_decl
+| @module_decl
+;
+
+#keyset[id]
+type_decls(  //dir=decl
+  int id: @type_decl ref,
+  string name: string ref
+);
+
+#keyset[id, index]
+type_decl_inherited_types(  //dir=decl
+  int id: @type_decl ref,
+  int index: int ref,
+  int inherited_type: @type_or_none ref
+);
+
+@abstract_type_param_decl =
+  @associated_type_decl
+| @generic_type_param_decl
+;
+
+@accessor_or_named_function =
+  @accessor
+| @named_function
+;
+
+deinitializers(  //dir=decl
+  unique int id: @deinitializer
+);
+
+@generic_type_decl =
+  @nominal_type_decl
+| @opaque_type_decl
+| @type_alias_decl
+;
+
+initializers(  //dir=decl
+  unique int id: @initializer
+);
+
+module_decls(  //dir=decl
+  unique int id: @module_decl
+);
+
+#keyset[id]
+module_decl_is_builtin_module(  //dir=decl
+  int id: @module_decl ref
+);
+
+#keyset[id]
+module_decl_is_system_module(  //dir=decl
+  int id: @module_decl ref
+);
+
+module_decl_imported_modules(  //dir=decl
+  int id: @module_decl ref,
+  int imported_module: @module_decl_or_none ref
+);
+
+module_decl_exported_modules(  //dir=decl
+  int id: @module_decl ref,
+  int exported_module: @module_decl_or_none ref
+);
+
+subscript_decls(  //dir=decl
+  unique int id: @subscript_decl,
+  int element_type: @type_or_none ref
+);
+
+#keyset[id, index]
+subscript_decl_params(  //dir=decl
+  int id: @subscript_decl ref,
+  int index: int ref,
+  int param: @param_decl_or_none ref
+);
+
+@var_decl =
+  @concrete_var_decl
+| @param_decl
+;
+
+#keyset[id]
+var_decls(  //dir=decl
+  int id: @var_decl ref,
+  string name: string ref,
+  int type_: @type_or_none ref
+);
+
+#keyset[id]
+var_decl_attached_property_wrapper_types(  //dir=decl
+  int id: @var_decl ref,
+  int attached_property_wrapper_type: @type_or_none ref
+);
+
+#keyset[id]
+var_decl_parent_patterns(  //dir=decl
+  int id: @var_decl ref,
+  int parent_pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+var_decl_parent_initializers(  //dir=decl
+  int id: @var_decl ref,
+  int parent_initializer: @expr_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_backing_var_bindings(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_backing_var_binding: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_backing_vars(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_backing_var: @var_decl_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_projection_var_bindings(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_projection_var_binding: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+var_decl_property_wrapper_projection_vars(  //dir=decl
+  int id: @var_decl ref,
+  int property_wrapper_projection_var: @var_decl_or_none ref
+);
+
+accessors(  //dir=decl
+  unique int id: @accessor
+);
+
+#keyset[id]
+accessor_is_getter(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_setter(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_will_set(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_did_set(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_read(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_modify(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_unsafe_address(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_unsafe_mutable_address(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_distributed_get(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_read2(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_modify2(  //dir=decl
+  int id: @accessor ref
+);
+
+#keyset[id]
+accessor_is_init(  //dir=decl
+  int id: @accessor ref
+);
+
+associated_type_decls(  //dir=decl
+  unique int id: @associated_type_decl
+);
+
+concrete_var_decls(  //dir=decl
+  unique int id: @concrete_var_decl,
+  int introducer_int: int ref
+);
+
+generic_type_param_decls(  //dir=decl
+  unique int id: @generic_type_param_decl
+);
+
+named_functions(  //dir=decl
+  unique int id: @named_function
+);
+
+@nominal_type_decl =
+  @class_decl
+| @enum_decl
+| @protocol_decl
+| @struct_decl
+;
+
+#keyset[id]
+nominal_type_decls(  //dir=decl
+  int id: @nominal_type_decl ref,
+  int type_: @type_or_none ref
+);
+
+opaque_type_decls(  //dir=decl
+  unique int id: @opaque_type_decl,
+  int naming_declaration: @value_decl_or_none ref
+);
+
+#keyset[id, index]
+opaque_type_decl_opaque_generic_params(  //dir=decl
+  int id: @opaque_type_decl ref,
+  int index: int ref,
+  int opaque_generic_param: @generic_type_param_type_or_none ref
+);
+
+param_decls(  //dir=decl
+  unique int id: @param_decl
+);
+
+#keyset[id]
+param_decl_is_inout(  //dir=decl
+  int id: @param_decl ref
+);
+
+#keyset[id]
+param_decl_property_wrapper_local_wrapped_var_bindings(  //dir=decl
+  int id: @param_decl ref,
+  int property_wrapper_local_wrapped_var_binding: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+param_decl_property_wrapper_local_wrapped_vars(  //dir=decl
+  int id: @param_decl ref,
+  int property_wrapper_local_wrapped_var: @var_decl_or_none ref
+);
+
+type_alias_decls(  //dir=decl
+  unique int id: @type_alias_decl,
+  int aliased_type: @type_or_none ref
+);
+
+class_decls(  //dir=decl
+  unique int id: @class_decl
+);
+
+enum_decls(  //dir=decl
+  unique int id: @enum_decl
+);
+
+protocol_decls(  //dir=decl
+  unique int id: @protocol_decl
+);
+
+struct_decls(  //dir=decl
+  unique int id: @struct_decl
+);
+
+arguments(  //dir=expr
+  unique int id: @argument,
+  string label: string ref,
+  int expr: @expr_or_none ref
+);
+
+@expr =
+  @any_try_expr
+| @applied_property_wrapper_expr
+| @apply_expr
+| @assign_expr
+| @bind_optional_expr
+| @capture_list_expr
+| @closure_expr
+| @collection_expr
+| @consume_expr
+| @copy_expr
+| @current_context_isolation_expr
+| @decl_ref_expr
+| @default_argument_expr
+| @discard_assignment_expr
+| @dot_syntax_base_ignored_expr
+| @dynamic_type_expr
+| @enum_is_case_expr
+| @error_expr
+| @explicit_cast_expr
+| @extract_function_isolation_expr
+| @force_value_expr
+| @identity_expr
+| @if_expr
+| @implicit_conversion_expr
+| @in_out_expr
+| @key_path_application_expr
+| @key_path_dot_expr
+| @key_path_expr
+| @lazy_initialization_expr
+| @literal_expr
+| @lookup_expr
+| @make_temporarily_escapable_expr
+| @materialize_pack_expr
+| @obj_c_selector_expr
+| @one_way_expr
+| @opaque_value_expr
+| @open_existential_expr
+| @optional_evaluation_expr
+| @other_initializer_ref_expr
+| @overloaded_decl_ref_expr
+| @pack_element_expr
+| @pack_expansion_expr
+| @property_wrapper_value_placeholder_expr
+| @rebind_self_in_initializer_expr
+| @sequence_expr
+| @single_value_stmt_expr
+| @super_ref_expr
+| @tap_expr
+| @tuple_element_expr
+| @tuple_expr
+| @type_expr
+| @type_value_expr
+| @unresolved_decl_ref_expr
+| @unresolved_dot_expr
+| @unresolved_member_expr
+| @unresolved_pattern_expr
+| @unresolved_specialize_expr
+| @vararg_expansion_expr
+;
+
+#keyset[id]
+expr_types(  //dir=expr
+  int id: @expr ref,
+  int type_: @type_or_none ref
+);
+
+@any_try_expr =
+  @force_try_expr
+| @optional_try_expr
+| @try_expr
+;
+
+#keyset[id]
+any_try_exprs(  //dir=expr
+  int id: @any_try_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+applied_property_wrapper_exprs(  //dir=expr
+  unique int id: @applied_property_wrapper_expr,
+  int kind: int ref,
+  int value: @expr_or_none ref,
+  int param: @param_decl_or_none ref
+);
+
+@apply_expr =
+  @binary_expr
+| @call_expr
+| @postfix_unary_expr
+| @prefix_unary_expr
+| @self_apply_expr
+;
+
+#keyset[id]
+apply_exprs(  //dir=expr
+  int id: @apply_expr ref,
+  int function: @expr_or_none ref
+);
+
+#keyset[id, index]
+apply_expr_arguments(  //dir=expr
+  int id: @apply_expr ref,
+  int index: int ref,
+  int argument: @argument_or_none ref
+);
+
+assign_exprs(  //dir=expr
+  unique int id: @assign_expr,
+  int dest: @expr_or_none ref,
+  int source: @expr_or_none ref
+);
+
+bind_optional_exprs(  //dir=expr
+  unique int id: @bind_optional_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+capture_list_exprs(  //dir=expr
+  unique int id: @capture_list_expr,
+  int closure_body: @closure_expr_or_none ref
+);
+
+#keyset[id, index]
+capture_list_expr_binding_decls(  //dir=expr
+  int id: @capture_list_expr ref,
+  int index: int ref,
+  int binding_decl: @pattern_binding_decl_or_none ref
+);
+
+@closure_expr =
+  @auto_closure_expr
+| @explicit_closure_expr
+;
+
+@collection_expr =
+  @array_expr
+| @dictionary_expr
+;
+
+consume_exprs(  //dir=expr
+  unique int id: @consume_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+copy_exprs(  //dir=expr
+  unique int id: @copy_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+current_context_isolation_exprs(  //dir=expr
+  unique int id: @current_context_isolation_expr,
+  int actor: @expr_or_none ref
+);
+
+decl_ref_exprs(  //dir=expr
+  unique int id: @decl_ref_expr,
+  int decl: @decl_or_none ref
+);
+
+#keyset[id, index]
+decl_ref_expr_replacement_types(  //dir=expr
+  int id: @decl_ref_expr ref,
+  int index: int ref,
+  int replacement_type: @type_or_none ref
+);
+
+#keyset[id]
+decl_ref_expr_has_direct_to_storage_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+#keyset[id]
+decl_ref_expr_has_direct_to_implementation_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+#keyset[id]
+decl_ref_expr_has_ordinary_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+#keyset[id]
+decl_ref_expr_has_distributed_thunk_semantics(  //dir=expr
+  int id: @decl_ref_expr ref
+);
+
+default_argument_exprs(  //dir=expr
+  unique int id: @default_argument_expr,
+  int param_decl: @param_decl_or_none ref,
+  int param_index: int ref
+);
+
+#keyset[id]
+default_argument_expr_caller_side_defaults(  //dir=expr
+  int id: @default_argument_expr ref,
+  int caller_side_default: @expr_or_none ref
+);
+
+discard_assignment_exprs(  //dir=expr
+  unique int id: @discard_assignment_expr
+);
+
+dot_syntax_base_ignored_exprs(  //dir=expr
+  unique int id: @dot_syntax_base_ignored_expr,
+  int qualifier: @expr_or_none ref,
+  int sub_expr: @expr_or_none ref
+);
+
+dynamic_type_exprs(  //dir=expr
+  unique int id: @dynamic_type_expr,
+  int base: @expr_or_none ref
+);
+
+enum_is_case_exprs(  //dir=expr
+  unique int id: @enum_is_case_expr,
+  int sub_expr: @expr_or_none ref,
+  int element: @enum_element_decl_or_none ref
+);
+
+error_exprs(  //dir=expr
+  unique int id: @error_expr
+);
+
+@explicit_cast_expr =
+  @checked_cast_expr
+| @coerce_expr
+;
+
+#keyset[id]
+explicit_cast_exprs(  //dir=expr
+  int id: @explicit_cast_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+extract_function_isolation_exprs(  //dir=expr
+  unique int id: @extract_function_isolation_expr,
+  int function_expr: @expr_or_none ref
+);
+
+force_value_exprs(  //dir=expr
+  unique int id: @force_value_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+@identity_expr =
+  @await_expr
+| @borrow_expr
+| @dot_self_expr
+| @paren_expr
+| @unresolved_member_chain_result_expr
+| @unsafe_expr
+;
+
+#keyset[id]
+identity_exprs(  //dir=expr
+  int id: @identity_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+if_exprs(  //dir=expr
+  unique int id: @if_expr,
+  int condition: @expr_or_none ref,
+  int then_expr: @expr_or_none ref,
+  int else_expr: @expr_or_none ref
+);
+
+@implicit_conversion_expr =
+  @abi_safe_conversion_expr
+| @actor_isolation_erasure_expr
+| @any_hashable_erasure_expr
+| @archetype_to_super_expr
+| @array_to_pointer_expr
+| @bridge_from_obj_c_expr
+| @bridge_to_obj_c_expr
+| @class_metatype_to_object_expr
+| @collection_upcast_conversion_expr
+| @conditional_bridge_from_obj_c_expr
+| @covariant_function_conversion_expr
+| @covariant_return_conversion_expr
+| @derived_to_base_expr
+| @destructure_tuple_expr
+| @differentiable_function_expr
+| @differentiable_function_extract_original_expr
+| @erasure_expr
+| @existential_metatype_to_object_expr
+| @foreign_object_conversion_expr
+| @function_conversion_expr
+| @in_out_to_pointer_expr
+| @inject_into_optional_expr
+| @linear_function_expr
+| @linear_function_extract_original_expr
+| @linear_to_differentiable_function_expr
+| @load_expr
+| @metatype_conversion_expr
+| @pointer_to_pointer_expr
+| @protocol_metatype_to_object_expr
+| @string_to_pointer_expr
+| @underlying_to_opaque_expr
+| @unevaluated_instance_expr
+| @unreachable_expr
+| @unresolved_type_conversion_expr
+| @unsafe_cast_expr
+;
+
+#keyset[id]
+implicit_conversion_exprs(  //dir=expr
+  int id: @implicit_conversion_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+in_out_exprs(  //dir=expr
+  unique int id: @in_out_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+key_path_application_exprs(  //dir=expr
+  unique int id: @key_path_application_expr,
+  int base: @expr_or_none ref,
+  int key_path: @expr_or_none ref
+);
+
+key_path_dot_exprs(  //dir=expr
+  unique int id: @key_path_dot_expr
+);
+
+key_path_exprs(  //dir=expr
+  unique int id: @key_path_expr
+);
+
+#keyset[id]
+key_path_expr_roots(  //dir=expr
+  int id: @key_path_expr ref,
+  int root: @type_repr_or_none ref
+);
+
+#keyset[id, index]
+key_path_expr_components(  //dir=expr
+  int id: @key_path_expr ref,
+  int index: int ref,
+  int component: @key_path_component_or_none ref
+);
+
+lazy_initialization_exprs(  //dir=expr
+  unique int id: @lazy_initialization_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+@literal_expr =
+  @builtin_literal_expr
+| @interpolated_string_literal_expr
+| @nil_literal_expr
+| @object_literal_expr
+| @regex_literal_expr
+;
+
+@lookup_expr =
+  @dynamic_lookup_expr
+| @member_ref_expr
+| @subscript_expr
+;
+
+#keyset[id]
+lookup_exprs(  //dir=expr
+  int id: @lookup_expr ref,
+  int base: @expr_or_none ref
+);
+
+#keyset[id]
+lookup_expr_members(  //dir=expr
+  int id: @lookup_expr ref,
+  int member: @decl_or_none ref
+);
+
+make_temporarily_escapable_exprs(  //dir=expr
+  unique int id: @make_temporarily_escapable_expr,
+  int escaping_closure: @opaque_value_expr_or_none ref,
+  int nonescaping_closure: @expr_or_none ref,
+  int sub_expr: @expr_or_none ref
+);
+
+materialize_pack_exprs(  //dir=expr
+  unique int id: @materialize_pack_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+obj_c_selector_exprs(  //dir=expr
+  unique int id: @obj_c_selector_expr,
+  int sub_expr: @expr_or_none ref,
+  int method: @function_or_none ref
+);
+
+one_way_exprs(  //dir=expr
+  unique int id: @one_way_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+opaque_value_exprs(  //dir=expr
+  unique int id: @opaque_value_expr
+);
+
+open_existential_exprs(  //dir=expr
+  unique int id: @open_existential_expr,
+  int sub_expr: @expr_or_none ref,
+  int existential: @expr_or_none ref,
+  int opaque_expr: @opaque_value_expr_or_none ref
+);
+
+optional_evaluation_exprs(  //dir=expr
+  unique int id: @optional_evaluation_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+other_initializer_ref_exprs(  //dir=expr
+  unique int id: @other_initializer_ref_expr,
+  int initializer: @initializer_or_none ref
+);
+
+overloaded_decl_ref_exprs(  //dir=expr
+  unique int id: @overloaded_decl_ref_expr
+);
+
+#keyset[id, index]
+overloaded_decl_ref_expr_possible_declarations(  //dir=expr
+  int id: @overloaded_decl_ref_expr ref,
+  int index: int ref,
+  int possible_declaration: @value_decl_or_none ref
+);
+
+pack_element_exprs(  //dir=expr
+  unique int id: @pack_element_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+pack_expansion_exprs(  //dir=expr
+  unique int id: @pack_expansion_expr,
+  int pattern_expr: @expr_or_none ref
+);
+
+property_wrapper_value_placeholder_exprs(  //dir=expr
+  unique int id: @property_wrapper_value_placeholder_expr,
+  int placeholder: @opaque_value_expr_or_none ref
+);
+
+#keyset[id]
+property_wrapper_value_placeholder_expr_wrapped_values(  //dir=expr
+  int id: @property_wrapper_value_placeholder_expr ref,
+  int wrapped_value: @expr_or_none ref
+);
+
+rebind_self_in_initializer_exprs(  //dir=expr
+  unique int id: @rebind_self_in_initializer_expr,
+  int sub_expr: @expr_or_none ref,
+  int self: @var_decl_or_none ref
+);
+
+sequence_exprs(  //dir=expr
+  unique int id: @sequence_expr
+);
+
+#keyset[id, index]
+sequence_expr_elements(  //dir=expr
+  int id: @sequence_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+single_value_stmt_exprs(  //dir=expr
+  unique int id: @single_value_stmt_expr,
+  int stmt: @stmt_or_none ref
+);
+
+super_ref_exprs(  //dir=expr
+  unique int id: @super_ref_expr,
+  int self: @var_decl_or_none ref
+);
+
+tap_exprs(  //dir=expr
+  unique int id: @tap_expr,
+  int body: @brace_stmt_or_none ref,
+  int var: @var_decl_or_none ref
+);
+
+#keyset[id]
+tap_expr_sub_exprs(  //dir=expr
+  int id: @tap_expr ref,
+  int sub_expr: @expr_or_none ref
+);
+
+tuple_element_exprs(  //dir=expr
+  unique int id: @tuple_element_expr,
+  int sub_expr: @expr_or_none ref,
+  int index: int ref
+);
+
+tuple_exprs(  //dir=expr
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_elements(  //dir=expr
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+type_exprs(  //dir=expr
+  unique int id: @type_expr
+);
+
+#keyset[id]
+type_expr_type_reprs(  //dir=expr
+  int id: @type_expr ref,
+  int type_repr: @type_repr_or_none ref
+);
+
+type_value_exprs(  //dir=expr
+  unique int id: @type_value_expr,
+  int type_repr: @type_repr_or_none ref
+);
+
+unresolved_decl_ref_exprs(  //dir=expr
+  unique int id: @unresolved_decl_ref_expr
+);
+
+#keyset[id]
+unresolved_decl_ref_expr_names(  //dir=expr
+  int id: @unresolved_decl_ref_expr ref,
+  string name: string ref
+);
+
+unresolved_dot_exprs(  //dir=expr
+  unique int id: @unresolved_dot_expr,
+  int base: @expr_or_none ref,
+  string name: string ref
+);
+
+unresolved_member_exprs(  //dir=expr
+  unique int id: @unresolved_member_expr,
+  string name: string ref
+);
+
+unresolved_pattern_exprs(  //dir=expr
+  unique int id: @unresolved_pattern_expr,
+  int sub_pattern: @pattern_or_none ref
+);
+
+unresolved_specialize_exprs(  //dir=expr
+  unique int id: @unresolved_specialize_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+vararg_expansion_exprs(  //dir=expr
+  unique int id: @vararg_expansion_expr,
+  int sub_expr: @expr_or_none ref
+);
+
+abi_safe_conversion_exprs(  //dir=expr
+  unique int id: @abi_safe_conversion_expr
+);
+
+actor_isolation_erasure_exprs(  //dir=expr
+  unique int id: @actor_isolation_erasure_expr
+);
+
+any_hashable_erasure_exprs(  //dir=expr
+  unique int id: @any_hashable_erasure_expr
+);
+
+archetype_to_super_exprs(  //dir=expr
+  unique int id: @archetype_to_super_expr
+);
+
+array_exprs(  //dir=expr
+  unique int id: @array_expr
+);
+
+#keyset[id, index]
+array_expr_elements(  //dir=expr
+  int id: @array_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+array_to_pointer_exprs(  //dir=expr
+  unique int id: @array_to_pointer_expr
+);
+
+auto_closure_exprs(  //dir=expr
+  unique int id: @auto_closure_expr
+);
+
+await_exprs(  //dir=expr
+  unique int id: @await_expr
+);
+
+binary_exprs(  //dir=expr
+  unique int id: @binary_expr
+);
+
+borrow_exprs(  //dir=expr
+  unique int id: @borrow_expr
+);
+
+bridge_from_obj_c_exprs(  //dir=expr
+  unique int id: @bridge_from_obj_c_expr
+);
+
+bridge_to_obj_c_exprs(  //dir=expr
+  unique int id: @bridge_to_obj_c_expr
+);
+
+@builtin_literal_expr =
+  @boolean_literal_expr
+| @magic_identifier_literal_expr
+| @number_literal_expr
+| @string_literal_expr
+;
+
+call_exprs(  //dir=expr
+  unique int id: @call_expr
+);
+
+@checked_cast_expr =
+  @conditional_checked_cast_expr
+| @forced_checked_cast_expr
+| @is_expr
+;
+
+class_metatype_to_object_exprs(  //dir=expr
+  unique int id: @class_metatype_to_object_expr
+);
+
+coerce_exprs(  //dir=expr
+  unique int id: @coerce_expr
+);
+
+collection_upcast_conversion_exprs(  //dir=expr
+  unique int id: @collection_upcast_conversion_expr
+);
+
+conditional_bridge_from_obj_c_exprs(  //dir=expr
+  unique int id: @conditional_bridge_from_obj_c_expr
+);
+
+covariant_function_conversion_exprs(  //dir=expr
+  unique int id: @covariant_function_conversion_expr
+);
+
+covariant_return_conversion_exprs(  //dir=expr
+  unique int id: @covariant_return_conversion_expr
+);
+
+derived_to_base_exprs(  //dir=expr
+  unique int id: @derived_to_base_expr
+);
+
+destructure_tuple_exprs(  //dir=expr
+  unique int id: @destructure_tuple_expr
+);
+
+dictionary_exprs(  //dir=expr
+  unique int id: @dictionary_expr
+);
+
+#keyset[id, index]
+dictionary_expr_elements(  //dir=expr
+  int id: @dictionary_expr ref,
+  int index: int ref,
+  int element: @expr_or_none ref
+);
+
+differentiable_function_exprs(  //dir=expr
+  unique int id: @differentiable_function_expr
+);
+
+differentiable_function_extract_original_exprs(  //dir=expr
+  unique int id: @differentiable_function_extract_original_expr
+);
+
+dot_self_exprs(  //dir=expr
+  unique int id: @dot_self_expr
+);
+
+@dynamic_lookup_expr =
+  @dynamic_member_ref_expr
+| @dynamic_subscript_expr
+;
+
+erasure_exprs(  //dir=expr
+  unique int id: @erasure_expr
+);
+
+existential_metatype_to_object_exprs(  //dir=expr
+  unique int id: @existential_metatype_to_object_expr
+);
+
+explicit_closure_exprs(  //dir=expr
+  unique int id: @explicit_closure_expr
+);
+
+force_try_exprs(  //dir=expr
+  unique int id: @force_try_expr
+);
+
+foreign_object_conversion_exprs(  //dir=expr
+  unique int id: @foreign_object_conversion_expr
+);
+
+function_conversion_exprs(  //dir=expr
+  unique int id: @function_conversion_expr
+);
+
+in_out_to_pointer_exprs(  //dir=expr
+  unique int id: @in_out_to_pointer_expr
+);
+
+inject_into_optional_exprs(  //dir=expr
+  unique int id: @inject_into_optional_expr
+);
+
+interpolated_string_literal_exprs(  //dir=expr
+  unique int id: @interpolated_string_literal_expr
+);
+
+#keyset[id]
+interpolated_string_literal_expr_interpolation_exprs(  //dir=expr
+  int id: @interpolated_string_literal_expr ref,
+  int interpolation_expr: @opaque_value_expr_or_none ref
+);
+
+#keyset[id]
+interpolated_string_literal_expr_appending_exprs(  //dir=expr
+  int id: @interpolated_string_literal_expr ref,
+  int appending_expr: @tap_expr_or_none ref
+);
+
+linear_function_exprs(  //dir=expr
+  unique int id: @linear_function_expr
+);
+
+linear_function_extract_original_exprs(  //dir=expr
+  unique int id: @linear_function_extract_original_expr
+);
+
+linear_to_differentiable_function_exprs(  //dir=expr
+  unique int id: @linear_to_differentiable_function_expr
+);
+
+load_exprs(  //dir=expr
+  unique int id: @load_expr
+);
+
+member_ref_exprs(  //dir=expr
+  unique int id: @member_ref_expr
+);
+
+#keyset[id]
+member_ref_expr_has_direct_to_storage_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+#keyset[id]
+member_ref_expr_has_direct_to_implementation_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+#keyset[id]
+member_ref_expr_has_ordinary_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+#keyset[id]
+member_ref_expr_has_distributed_thunk_semantics(  //dir=expr
+  int id: @member_ref_expr ref
+);
+
+metatype_conversion_exprs(  //dir=expr
+  unique int id: @metatype_conversion_expr
+);
+
+nil_literal_exprs(  //dir=expr
+  unique int id: @nil_literal_expr
+);
+
+object_literal_exprs(  //dir=expr
+  unique int id: @object_literal_expr,
+  int kind: int ref
+);
+
+#keyset[id, index]
+object_literal_expr_arguments(  //dir=expr
+  int id: @object_literal_expr ref,
+  int index: int ref,
+  int argument: @argument_or_none ref
+);
+
+optional_try_exprs(  //dir=expr
+  unique int id: @optional_try_expr
+);
+
+paren_exprs(  //dir=expr
+  unique int id: @paren_expr
+);
+
+pointer_to_pointer_exprs(  //dir=expr
+  unique int id: @pointer_to_pointer_expr
+);
+
+postfix_unary_exprs(  //dir=expr
+  unique int id: @postfix_unary_expr
+);
+
+prefix_unary_exprs(  //dir=expr
+  unique int id: @prefix_unary_expr
+);
+
+protocol_metatype_to_object_exprs(  //dir=expr
+  unique int id: @protocol_metatype_to_object_expr
+);
+
+regex_literal_exprs(  //dir=expr
+  unique int id: @regex_literal_expr,
+  string pattern: string ref,
+  int version: int ref
+);
+
+@self_apply_expr =
+  @dot_syntax_call_expr
+| @initializer_ref_call_expr
+;
+
+#keyset[id]
+self_apply_exprs(  //dir=expr
+  int id: @self_apply_expr ref,
+  int base: @expr_or_none ref
+);
+
+string_to_pointer_exprs(  //dir=expr
+  unique int id: @string_to_pointer_expr
+);
+
+subscript_exprs(  //dir=expr
+  unique int id: @subscript_expr
+);
+
+#keyset[id, index]
+subscript_expr_arguments(  //dir=expr
+  int id: @subscript_expr ref,
+  int index: int ref,
+  int argument: @argument_or_none ref
+);
+
+#keyset[id]
+subscript_expr_has_direct_to_storage_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+#keyset[id]
+subscript_expr_has_direct_to_implementation_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+#keyset[id]
+subscript_expr_has_ordinary_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+#keyset[id]
+subscript_expr_has_distributed_thunk_semantics(  //dir=expr
+  int id: @subscript_expr ref
+);
+
+try_exprs(  //dir=expr
+  unique int id: @try_expr
+);
+
+underlying_to_opaque_exprs(  //dir=expr
+  unique int id: @underlying_to_opaque_expr
+);
+
+unevaluated_instance_exprs(  //dir=expr
+  unique int id: @unevaluated_instance_expr
+);
+
+unreachable_exprs(  //dir=expr
+  unique int id: @unreachable_expr
+);
+
+unresolved_member_chain_result_exprs(  //dir=expr
+  unique int id: @unresolved_member_chain_result_expr
+);
+
+unresolved_type_conversion_exprs(  //dir=expr
+  unique int id: @unresolved_type_conversion_expr
+);
+
+unsafe_cast_exprs(  //dir=expr
+  unique int id: @unsafe_cast_expr
+);
+
+unsafe_exprs(  //dir=expr
+  unique int id: @unsafe_expr
+);
+
+boolean_literal_exprs(  //dir=expr
+  unique int id: @boolean_literal_expr,
+  boolean value: boolean ref
+);
+
+conditional_checked_cast_exprs(  //dir=expr
+  unique int id: @conditional_checked_cast_expr
+);
+
+dot_syntax_call_exprs(  //dir=expr
+  unique int id: @dot_syntax_call_expr
+);
+
+dynamic_member_ref_exprs(  //dir=expr
+  unique int id: @dynamic_member_ref_expr
+);
+
+dynamic_subscript_exprs(  //dir=expr
+  unique int id: @dynamic_subscript_expr
+);
+
+forced_checked_cast_exprs(  //dir=expr
+  unique int id: @forced_checked_cast_expr
+);
+
+initializer_ref_call_exprs(  //dir=expr
+  unique int id: @initializer_ref_call_expr
+);
+
+is_exprs(  //dir=expr
+  unique int id: @is_expr
+);
+
+magic_identifier_literal_exprs(  //dir=expr
+  unique int id: @magic_identifier_literal_expr,
+  string kind: string ref
+);
+
+@number_literal_expr =
+  @float_literal_expr
+| @integer_literal_expr
+;
+
+string_literal_exprs(  //dir=expr
+  unique int id: @string_literal_expr,
+  string value: string ref
+);
+
+float_literal_exprs(  //dir=expr
+  unique int id: @float_literal_expr,
+  string string_value: string ref
+);
+
+integer_literal_exprs(  //dir=expr
+  unique int id: @integer_literal_expr,
+  string string_value: string ref
+);
+
+@pattern =
+  @any_pattern
+| @binding_pattern
+| @bool_pattern
+| @enum_element_pattern
+| @expr_pattern
+| @is_pattern
+| @named_pattern
+| @optional_some_pattern
+| @paren_pattern
+| @tuple_pattern
+| @typed_pattern
+;
+
+#keyset[id]
+pattern_types(  //dir=pattern
+  int id: @pattern ref,
+  int type_: @type_or_none ref
+);
+
+any_patterns(  //dir=pattern
+  unique int id: @any_pattern
+);
+
+binding_patterns(  //dir=pattern
+  unique int id: @binding_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+bool_patterns(  //dir=pattern
+  unique int id: @bool_pattern,
+  boolean value: boolean ref
+);
+
+enum_element_patterns(  //dir=pattern
+  unique int id: @enum_element_pattern,
+  int element: @enum_element_decl_or_none ref
+);
+
+#keyset[id]
+enum_element_pattern_sub_patterns(  //dir=pattern
+  int id: @enum_element_pattern ref,
+  int sub_pattern: @pattern_or_none ref
+);
+
+expr_patterns(  //dir=pattern
+  unique int id: @expr_pattern,
+  int sub_expr: @expr_or_none ref
+);
+
+is_patterns(  //dir=pattern
+  unique int id: @is_pattern
+);
+
+#keyset[id]
+is_pattern_cast_type_reprs(  //dir=pattern
+  int id: @is_pattern ref,
+  int cast_type_repr: @type_repr_or_none ref
+);
+
+#keyset[id]
+is_pattern_sub_patterns(  //dir=pattern
+  int id: @is_pattern ref,
+  int sub_pattern: @pattern_or_none ref
+);
+
+named_patterns(  //dir=pattern
+  unique int id: @named_pattern,
+  int var_decl: @var_decl_or_none ref
+);
+
+optional_some_patterns(  //dir=pattern
+  unique int id: @optional_some_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+paren_patterns(  //dir=pattern
+  unique int id: @paren_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+tuple_patterns(  //dir=pattern
+  unique int id: @tuple_pattern
+);
+
+#keyset[id, index]
+tuple_pattern_elements(  //dir=pattern
+  int id: @tuple_pattern ref,
+  int index: int ref,
+  int element: @pattern_or_none ref
+);
+
+typed_patterns(  //dir=pattern
+  unique int id: @typed_pattern,
+  int sub_pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+typed_pattern_type_reprs(  //dir=pattern
+  int id: @typed_pattern ref,
+  int type_repr: @type_repr_or_none ref
+);
+
+case_label_items(  //dir=stmt
+  unique int id: @case_label_item,
+  int pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+case_label_item_guards(  //dir=stmt
+  int id: @case_label_item ref,
+  int guard: @expr_or_none ref
+);
+
+condition_elements(  //dir=stmt
+  unique int id: @condition_element
+);
+
+#keyset[id]
+condition_element_booleans(  //dir=stmt
+  int id: @condition_element ref,
+  int boolean_: @expr_or_none ref
+);
+
+#keyset[id]
+condition_element_patterns(  //dir=stmt
+  int id: @condition_element ref,
+  int pattern: @pattern_or_none ref
+);
+
+#keyset[id]
+condition_element_initializers(  //dir=stmt
+  int id: @condition_element ref,
+  int initializer: @expr_or_none ref
+);
+
+#keyset[id]
+condition_element_availabilities(  //dir=stmt
+  int id: @condition_element ref,
+  int availability: @availability_info_or_none ref
+);
+
+@stmt =
+  @brace_stmt
+| @break_stmt
+| @case_stmt
+| @continue_stmt
+| @defer_stmt
+| @discard_stmt
+| @fail_stmt
+| @fallthrough_stmt
+| @labeled_stmt
+| @pound_assert_stmt
+| @return_stmt
+| @then_stmt
+| @throw_stmt
+| @yield_stmt
+;
+
+stmt_conditions(  //dir=stmt
+  unique int id: @stmt_condition
+);
+
+#keyset[id, index]
+stmt_condition_elements(  //dir=stmt
+  int id: @stmt_condition ref,
+  int index: int ref,
+  int element: @condition_element_or_none ref
+);
+
+brace_stmts(  //dir=stmt
+  unique int id: @brace_stmt
+);
+
+#keyset[id, index]
+brace_stmt_elements(  //dir=stmt
+  int id: @brace_stmt ref,
+  int index: int ref,
+  int element: @ast_node_or_none ref
+);
+
+break_stmts(  //dir=stmt
+  unique int id: @break_stmt
+);
+
+#keyset[id]
+break_stmt_target_names(  //dir=stmt
+  int id: @break_stmt ref,
+  string target_name: string ref
+);
+
+#keyset[id]
+break_stmt_targets(  //dir=stmt
+  int id: @break_stmt ref,
+  int target: @stmt_or_none ref
+);
+
+case_stmts(  //dir=stmt
+  unique int id: @case_stmt,
+  int body: @stmt_or_none ref
+);
+
+#keyset[id, index]
+case_stmt_labels(  //dir=stmt
+  int id: @case_stmt ref,
+  int index: int ref,
+  int label: @case_label_item_or_none ref
+);
+
+#keyset[id, index]
+case_stmt_variables(  //dir=stmt
+  int id: @case_stmt ref,
+  int index: int ref,
+  int variable: @var_decl_or_none ref
+);
+
+continue_stmts(  //dir=stmt
+  unique int id: @continue_stmt
+);
+
+#keyset[id]
+continue_stmt_target_names(  //dir=stmt
+  int id: @continue_stmt ref,
+  string target_name: string ref
+);
+
+#keyset[id]
+continue_stmt_targets(  //dir=stmt
+  int id: @continue_stmt ref,
+  int target: @stmt_or_none ref
+);
+
+defer_stmts(  //dir=stmt
+  unique int id: @defer_stmt,
+  int body: @brace_stmt_or_none ref
+);
+
+discard_stmts(  //dir=stmt
+  unique int id: @discard_stmt,
+  int sub_expr: @expr_or_none ref
+);
+
+fail_stmts(  //dir=stmt
+  unique int id: @fail_stmt
+);
+
+fallthrough_stmts(  //dir=stmt
+  unique int id: @fallthrough_stmt,
+  int fallthrough_source: @case_stmt_or_none ref,
+  int fallthrough_dest: @case_stmt_or_none ref
+);
+
+@labeled_stmt =
+  @do_catch_stmt
+| @do_stmt
+| @for_each_stmt
+| @labeled_conditional_stmt
+| @repeat_while_stmt
+| @switch_stmt
+;
+
+#keyset[id]
+labeled_stmt_labels(  //dir=stmt
+  int id: @labeled_stmt ref,
+  string label: string ref
+);
+
+pound_assert_stmts(  //dir=stmt
+  unique int id: @pound_assert_stmt,
+  int condition: @expr_or_none ref,
+  string message: string ref
+);
+
+return_stmts(  //dir=stmt
+  unique int id: @return_stmt
+);
+
+#keyset[id]
+return_stmt_results(  //dir=stmt
+  int id: @return_stmt ref,
+  int result: @expr_or_none ref
+);
+
+then_stmts(  //dir=stmt
+  unique int id: @then_stmt,
+  int result: @expr_or_none ref
+);
+
+throw_stmts(  //dir=stmt
+  unique int id: @throw_stmt,
+  int sub_expr: @expr_or_none ref
+);
+
+yield_stmts(  //dir=stmt
+  unique int id: @yield_stmt
+);
+
+#keyset[id, index]
+yield_stmt_results(  //dir=stmt
+  int id: @yield_stmt ref,
+  int index: int ref,
+  int result: @expr_or_none ref
+);
+
+do_catch_stmts(  //dir=stmt
+  unique int id: @do_catch_stmt,
+  int body: @stmt_or_none ref
+);
+
+#keyset[id, index]
+do_catch_stmt_catches(  //dir=stmt
+  int id: @do_catch_stmt ref,
+  int index: int ref,
+  int catch: @case_stmt_or_none ref
+);
+
+do_stmts(  //dir=stmt
+  unique int id: @do_stmt,
+  int body: @brace_stmt_or_none ref
+);
+
+for_each_stmts(  //dir=stmt
+  unique int id: @for_each_stmt,
+  int pattern: @pattern_or_none ref,
+  int body: @brace_stmt_or_none ref
+);
+
+#keyset[id, index]
+for_each_stmt_variables(  //dir=stmt
+  int id: @for_each_stmt ref,
+  int index: int ref,
+  int variable: @var_decl_or_none ref
+);
+
+#keyset[id]
+for_each_stmt_wheres(  //dir=stmt
+  int id: @for_each_stmt ref,
+  int where: @expr_or_none ref
+);
+
+#keyset[id]
+for_each_stmt_iterator_vars(  //dir=stmt
+  int id: @for_each_stmt ref,
+  int iteratorVar: @pattern_binding_decl_or_none ref
+);
+
+#keyset[id]
+for_each_stmt_next_calls(  //dir=stmt
+  int id: @for_each_stmt ref,
+  int nextCall: @expr_or_none ref
+);
+
+@labeled_conditional_stmt =
+  @guard_stmt
+| @if_stmt
+| @while_stmt
+;
+
+#keyset[id]
+labeled_conditional_stmts(  //dir=stmt
+  int id: @labeled_conditional_stmt ref,
+  int condition: @stmt_condition_or_none ref
+);
+
+repeat_while_stmts(  //dir=stmt
+  unique int id: @repeat_while_stmt,
+  int condition: @expr_or_none ref,
+  int body: @stmt_or_none ref
+);
+
+switch_stmts(  //dir=stmt
+  unique int id: @switch_stmt,
+  int expr: @expr_or_none ref
+);
+
+#keyset[id, index]
+switch_stmt_cases(  //dir=stmt
+  int id: @switch_stmt ref,
+  int index: int ref,
+  int case_: @case_stmt_or_none ref
+);
+
+guard_stmts(  //dir=stmt
+  unique int id: @guard_stmt,
+  int body: @brace_stmt_or_none ref
+);
+
+if_stmts(  //dir=stmt
+  unique int id: @if_stmt,
+  int then: @stmt_or_none ref
+);
+
+#keyset[id]
+if_stmt_elses(  //dir=stmt
+  int id: @if_stmt ref,
+  int else: @stmt_or_none ref
+);
+
+while_stmts(  //dir=stmt
+  unique int id: @while_stmt,
+  int body: @stmt_or_none ref
+);
+
+@type =
+  @any_function_type
+| @any_generic_type
+| @any_metatype_type
+| @builtin_type
+| @dependent_member_type
+| @dynamic_self_type
+| @error_type
+| @existential_type
+| @in_out_type
+| @integer_type
+| @l_value_type
+| @module_type
+| @pack_element_type
+| @pack_expansion_type
+| @pack_type
+| @parameterized_protocol_type
+| @protocol_composition_type
+| @reference_storage_type
+| @substitutable_type
+| @sugar_type
+| @tuple_type
+| @unresolved_type
+;
+
+#keyset[id]
+types(  //dir=type
+  int id: @type ref,
+  string name: string ref,
+  int canonical_type: @type_or_none ref
+);
+
+type_reprs(  //dir=type
+  unique int id: @type_repr,
+  int type_: @type_or_none ref
+);
+
+@any_function_type =
+  @function_type
+| @generic_function_type
+;
+
+#keyset[id]
+any_function_types(  //dir=type
+  int id: @any_function_type ref,
+  int result: @type_or_none ref
+);
+
+#keyset[id, index]
+any_function_type_param_types(  //dir=type
+  int id: @any_function_type ref,
+  int index: int ref,
+  int param_type: @type_or_none ref
+);
+
+#keyset[id]
+any_function_type_is_throwing(  //dir=type
+  int id: @any_function_type ref
+);
+
+#keyset[id]
+any_function_type_is_async(  //dir=type
+  int id: @any_function_type ref
+);
+
+@any_generic_type =
+  @nominal_or_bound_generic_nominal_type
+| @unbound_generic_type
+;
+
+#keyset[id]
+any_generic_types(  //dir=type
+  int id: @any_generic_type ref,
+  int declaration: @generic_type_decl_or_none ref
+);
+
+#keyset[id]
+any_generic_type_parents(  //dir=type
+  int id: @any_generic_type ref,
+  int parent: @type_or_none ref
+);
+
+@any_metatype_type =
+  @existential_metatype_type
+| @metatype_type
+;
+
+@builtin_type =
+  @any_builtin_integer_type
+| @builtin_bridge_object_type
+| @builtin_default_actor_storage_type
+| @builtin_executor_type
+| @builtin_fixed_array_type
+| @builtin_float_type
+| @builtin_job_type
+| @builtin_native_object_type
+| @builtin_raw_pointer_type
+| @builtin_raw_unsafe_continuation_type
+| @builtin_unsafe_value_buffer_type
+| @builtin_vector_type
+;
+
+dependent_member_types(  //dir=type
+  unique int id: @dependent_member_type,
+  int base_type: @type_or_none ref,
+  int associated_type_decl: @associated_type_decl_or_none ref
+);
+
+dynamic_self_types(  //dir=type
+  unique int id: @dynamic_self_type,
+  int static_self_type: @type_or_none ref
+);
+
+error_types(  //dir=type
+  unique int id: @error_type
+);
+
+existential_types(  //dir=type
+  unique int id: @existential_type,
+  int constraint: @type_or_none ref
+);
+
+in_out_types(  //dir=type
+  unique int id: @in_out_type,
+  int object_type: @type_or_none ref
+);
+
+integer_types(  //dir=type
+  unique int id: @integer_type,
+  string value: string ref
+);
+
+l_value_types(  //dir=type
+  unique int id: @l_value_type,
+  int object_type: @type_or_none ref
+);
+
+module_types(  //dir=type
+  unique int id: @module_type,
+  int module: @module_decl_or_none ref
+);
+
+pack_element_types(  //dir=type
+  unique int id: @pack_element_type,
+  int pack_type: @type_or_none ref
+);
+
+pack_expansion_types(  //dir=type
+  unique int id: @pack_expansion_type,
+  int pattern_type: @type_or_none ref,
+  int count_type: @type_or_none ref
+);
+
+pack_types(  //dir=type
+  unique int id: @pack_type
+);
+
+#keyset[id, index]
+pack_type_elements(  //dir=type
+  int id: @pack_type ref,
+  int index: int ref,
+  int element: @type_or_none ref
+);
+
+parameterized_protocol_types(  //dir=type
+  unique int id: @parameterized_protocol_type,
+  int base: @protocol_type_or_none ref
+);
+
+#keyset[id, index]
+parameterized_protocol_type_args(  //dir=type
+  int id: @parameterized_protocol_type ref,
+  int index: int ref,
+  int arg: @type_or_none ref
+);
+
+protocol_composition_types(  //dir=type
+  unique int id: @protocol_composition_type
+);
+
+#keyset[id, index]
+protocol_composition_type_members(  //dir=type
+  int id: @protocol_composition_type ref,
+  int index: int ref,
+  int member: @type_or_none ref
+);
+
+@reference_storage_type =
+  @unmanaged_storage_type
+| @unowned_storage_type
+| @weak_storage_type
+;
+
+#keyset[id]
+reference_storage_types(  //dir=type
+  int id: @reference_storage_type ref,
+  int referent_type: @type_or_none ref
+);
+
+@substitutable_type =
+  @archetype_type
+| @generic_type_param_type
+;
+
+@sugar_type =
+  @paren_type
+| @syntax_sugar_type
+| @type_alias_type
+;
+
+tuple_types(  //dir=type
+  unique int id: @tuple_type
+);
+
+#keyset[id, index]
+tuple_type_types(  //dir=type
+  int id: @tuple_type ref,
+  int index: int ref,
+  int type_: @type_or_none ref
+);
+
+#keyset[id, index]
+tuple_type_names(  //dir=type
+  int id: @tuple_type ref,
+  int index: int ref,
+  string name: string ref
+);
+
+unresolved_types(  //dir=type
+  unique int id: @unresolved_type
+);
+
+@any_builtin_integer_type =
+  @builtin_integer_literal_type
+| @builtin_integer_type
+;
+
+@archetype_type =
+  @local_archetype_type
+| @opaque_type_archetype_type
+| @pack_archetype_type
+| @primary_archetype_type
+;
+
+#keyset[id]
+archetype_types(  //dir=type
+  int id: @archetype_type ref,
+  int interface_type: @type_or_none ref
+);
+
+#keyset[id]
+archetype_type_superclasses(  //dir=type
+  int id: @archetype_type ref,
+  int superclass: @type_or_none ref
+);
+
+#keyset[id, index]
+archetype_type_protocols(  //dir=type
+  int id: @archetype_type ref,
+  int index: int ref,
+  int protocol: @protocol_decl_or_none ref
+);
+
+builtin_bridge_object_types(  //dir=type
+  unique int id: @builtin_bridge_object_type
+);
+
+builtin_default_actor_storage_types(  //dir=type
+  unique int id: @builtin_default_actor_storage_type
+);
+
+builtin_executor_types(  //dir=type
+  unique int id: @builtin_executor_type
+);
+
+builtin_fixed_array_types(  //dir=type
+  unique int id: @builtin_fixed_array_type
+);
+
+builtin_float_types(  //dir=type
+  unique int id: @builtin_float_type
+);
+
+builtin_job_types(  //dir=type
+  unique int id: @builtin_job_type
+);
+
+builtin_native_object_types(  //dir=type
+  unique int id: @builtin_native_object_type
+);
+
+builtin_raw_pointer_types(  //dir=type
+  unique int id: @builtin_raw_pointer_type
+);
+
+builtin_raw_unsafe_continuation_types(  //dir=type
+  unique int id: @builtin_raw_unsafe_continuation_type
+);
+
+builtin_unsafe_value_buffer_types(  //dir=type
+  unique int id: @builtin_unsafe_value_buffer_type
+);
+
+builtin_vector_types(  //dir=type
+  unique int id: @builtin_vector_type
+);
+
+existential_metatype_types(  //dir=type
+  unique int id: @existential_metatype_type
+);
+
+function_types(  //dir=type
+  unique int id: @function_type
+);
+
+generic_function_types(  //dir=type
+  unique int id: @generic_function_type
+);
+
+#keyset[id, index]
+generic_function_type_generic_params(  //dir=type
+  int id: @generic_function_type ref,
+  int index: int ref,
+  int generic_param: @generic_type_param_type_or_none ref
+);
+
+generic_type_param_types(  //dir=type
+  unique int id: @generic_type_param_type
+);
+
+metatype_types(  //dir=type
+  unique int id: @metatype_type
+);
+
+@nominal_or_bound_generic_nominal_type =
+  @bound_generic_type
+| @nominal_type
+;
+
+paren_types(  //dir=type
+  unique int id: @paren_type,
+  int type_: @type_or_none ref
+);
+
+@syntax_sugar_type =
+  @dictionary_type
+| @inline_array_type
+| @unary_syntax_sugar_type
+;
+
+type_alias_types(  //dir=type
+  unique int id: @type_alias_type,
+  int decl: @type_alias_decl_or_none ref
+);
+
+unbound_generic_types(  //dir=type
+  unique int id: @unbound_generic_type
+);
+
+unmanaged_storage_types(  //dir=type
+  unique int id: @unmanaged_storage_type
+);
+
+unowned_storage_types(  //dir=type
+  unique int id: @unowned_storage_type
+);
+
+weak_storage_types(  //dir=type
+  unique int id: @weak_storage_type
+);
+
+@bound_generic_type =
+  @bound_generic_class_type
+| @bound_generic_enum_type
+| @bound_generic_struct_type
+;
+
+#keyset[id, index]
+bound_generic_type_arg_types(  //dir=type
+  int id: @bound_generic_type ref,
+  int index: int ref,
+  int arg_type: @type_or_none ref
+);
+
+builtin_integer_literal_types(  //dir=type
+  unique int id: @builtin_integer_literal_type
+);
+
+builtin_integer_types(  //dir=type
+  unique int id: @builtin_integer_type
+);
+
+#keyset[id]
+builtin_integer_type_widths(  //dir=type
+  int id: @builtin_integer_type ref,
+  int width: int ref
+);
+
+dictionary_types(  //dir=type
+  unique int id: @dictionary_type,
+  int key_type: @type_or_none ref,
+  int value_type: @type_or_none ref
+);
+
+inline_array_types(  //dir=type
+  unique int id: @inline_array_type,
+  int count_type: @type_or_none ref,
+  int element_type: @type_or_none ref
+);
+
+@local_archetype_type =
+  @element_archetype_type
+| @existential_archetype_type
+;
+
+@nominal_type =
+  @class_type
+| @enum_type
+| @protocol_type
+| @struct_type
+;
+
+opaque_type_archetype_types(  //dir=type
+  unique int id: @opaque_type_archetype_type,
+  int declaration: @opaque_type_decl_or_none ref
+);
+
+pack_archetype_types(  //dir=type
+  unique int id: @pack_archetype_type
+);
+
+primary_archetype_types(  //dir=type
+  unique int id: @primary_archetype_type
+);
+
+@unary_syntax_sugar_type =
+  @array_slice_type
+| @optional_type
+| @variadic_sequence_type
+;
+
+#keyset[id]
+unary_syntax_sugar_types(  //dir=type
+  int id: @unary_syntax_sugar_type ref,
+  int base_type: @type_or_none ref
+);
+
+array_slice_types(  //dir=type
+  unique int id: @array_slice_type
+);
+
+bound_generic_class_types(  //dir=type
+  unique int id: @bound_generic_class_type
+);
+
+bound_generic_enum_types(  //dir=type
+  unique int id: @bound_generic_enum_type
+);
+
+bound_generic_struct_types(  //dir=type
+  unique int id: @bound_generic_struct_type
+);
+
+class_types(  //dir=type
+  unique int id: @class_type
+);
+
+element_archetype_types(  //dir=type
+  unique int id: @element_archetype_type
+);
+
+enum_types(  //dir=type
+  unique int id: @enum_type
+);
+
+existential_archetype_types(  //dir=type
+  unique int id: @existential_archetype_type
+);
+
+optional_types(  //dir=type
+  unique int id: @optional_type
+);
+
+protocol_types(  //dir=type
+  unique int id: @protocol_type
+);
+
+struct_types(  //dir=type
+  unique int id: @struct_type
+);
+
+variadic_sequence_types(  //dir=type
+  unique int id: @variadic_sequence_type
+);
+
+@accessor_or_none =
+  @accessor
+| @unspecified_element
+;
+
+@argument_or_none =
+  @argument
+| @unspecified_element
+;
+
+@associated_type_decl_or_none =
+  @associated_type_decl
+| @unspecified_element
+;
+
+@ast_node_or_none =
+  @ast_node
+| @unspecified_element
+;
+
+@availability_info_or_none =
+  @availability_info
+| @unspecified_element
+;
+
+@availability_spec_or_none =
+  @availability_spec
+| @unspecified_element
+;
+
+@brace_stmt_or_none =
+  @brace_stmt
+| @unspecified_element
+;
+
+@captured_decl_or_none =
+  @captured_decl
+| @unspecified_element
+;
+
+@case_label_item_or_none =
+  @case_label_item
+| @unspecified_element
+;
+
+@case_stmt_or_none =
+  @case_stmt
+| @unspecified_element
+;
+
+@closure_expr_or_none =
+  @closure_expr
+| @unspecified_element
+;
+
+@condition_element_or_none =
+  @condition_element
+| @unspecified_element
+;
+
+@decl_or_none =
+  @decl
+| @unspecified_element
+;
+
+@enum_element_decl_or_none =
+  @enum_element_decl
+| @unspecified_element
+;
+
+@expr_or_none =
+  @expr
+| @unspecified_element
+;
+
+@file_or_none =
+  @file
+| @unspecified_element
+;
+
+@function_or_none =
+  @function
+| @unspecified_element
+;
+
+@generic_type_decl_or_none =
+  @generic_type_decl
+| @unspecified_element
+;
+
+@generic_type_param_decl_or_none =
+  @generic_type_param_decl
+| @unspecified_element
+;
+
+@generic_type_param_type_or_none =
+  @generic_type_param_type
+| @unspecified_element
+;
+
+@initializer_or_none =
+  @initializer
+| @unspecified_element
+;
+
+@key_path_component_or_none =
+  @key_path_component
+| @unspecified_element
+;
+
+@location_or_none =
+  @location
+| @unspecified_element
+;
+
+@macro_role_or_none =
+  @macro_role
+| @unspecified_element
+;
+
+@module_decl_or_none =
+  @module_decl
+| @unspecified_element
+;
+
+@nominal_type_decl_or_none =
+  @nominal_type_decl
+| @unspecified_element
+;
+
+@opaque_type_decl_or_none =
+  @opaque_type_decl
+| @unspecified_element
+;
+
+@opaque_value_expr_or_none =
+  @opaque_value_expr
+| @unspecified_element
+;
+
+@param_decl_or_none =
+  @param_decl
+| @unspecified_element
+;
+
+@pattern_or_none =
+  @pattern
+| @unspecified_element
+;
+
+@pattern_binding_decl_or_none =
+  @pattern_binding_decl
+| @unspecified_element
+;
+
+@precedence_group_decl_or_none =
+  @precedence_group_decl
+| @unspecified_element
+;
+
+@protocol_decl_or_none =
+  @protocol_decl
+| @unspecified_element
+;
+
+@protocol_type_or_none =
+  @protocol_type
+| @unspecified_element
+;
+
+@stmt_or_none =
+  @stmt
+| @unspecified_element
+;
+
+@stmt_condition_or_none =
+  @stmt_condition
+| @unspecified_element
+;
+
+@string_literal_expr_or_none =
+  @string_literal_expr
+| @unspecified_element
+;
+
+@tap_expr_or_none =
+  @tap_expr
+| @unspecified_element
+;
+
+@type_or_none =
+  @type
+| @unspecified_element
+;
+
+@type_alias_decl_or_none =
+  @type_alias_decl
+| @unspecified_element
+;
+
+@type_repr_or_none =
+  @type_repr
+| @unspecified_element
+;
+
+@value_decl_or_none =
+  @unspecified_element
+| @value_decl
+;
+
+@var_decl_or_none =
+  @unspecified_element
+| @var_decl
+;
diff --git a/swift/ql/lib/upgrades/b7006eaacb007a06251596835506185619b86e98/upgrade.properties b/swift/ql/lib/upgrades/b7006eaacb007a06251596835506185619b86e98/upgrade.properties
new file mode 100644
index 00000000000..015868a6f27
--- /dev/null
+++ b/swift/ql/lib/upgrades/b7006eaacb007a06251596835506185619b86e98/upgrade.properties
@@ -0,0 +1,2 @@
+description: Support AST elements new in Swift 6.2
+compatibility: full
diff --git a/swift/ql/src/CHANGELOG.md b/swift/ql/src/CHANGELOG.md
index 8c57120f256..99b5491b9db 100644
--- a/swift/ql/src/CHANGELOG.md
+++ b/swift/ql/src/CHANGELOG.md
@@ -1,3 +1,29 @@
+## 1.2.8
+
+No user-facing changes.
+
+## 1.2.7
+
+No user-facing changes.
+
+## 1.2.6
+
+No user-facing changes.
+
+## 1.2.5
+
+No user-facing changes.
+
+## 1.2.4
+
+### Bug Fixes
+
+* Fixed an inconsistency across languages where most have a `Customizations.qll` file for adding customizations, but not all did.
+
+## 1.2.3
+
+No user-facing changes.
+
 ## 1.2.2
 
 No user-facing changes.
diff --git a/swift/ql/src/change-notes/released/1.2.3.md b/swift/ql/src/change-notes/released/1.2.3.md
new file mode 100644
index 00000000000..b86fd3af318
--- /dev/null
+++ b/swift/ql/src/change-notes/released/1.2.3.md
@@ -0,0 +1,3 @@
+## 1.2.3
+
+No user-facing changes.
diff --git a/swift/ql/src/change-notes/released/1.2.4.md b/swift/ql/src/change-notes/released/1.2.4.md
new file mode 100644
index 00000000000..cdd0409c4c3
--- /dev/null
+++ b/swift/ql/src/change-notes/released/1.2.4.md
@@ -0,0 +1,5 @@
+## 1.2.4
+
+### Bug Fixes
+
+* Fixed an inconsistency across languages where most have a `Customizations.qll` file for adding customizations, but not all did.
diff --git a/swift/ql/src/change-notes/released/1.2.5.md b/swift/ql/src/change-notes/released/1.2.5.md
new file mode 100644
index 00000000000..c805dc2cd4c
--- /dev/null
+++ b/swift/ql/src/change-notes/released/1.2.5.md
@@ -0,0 +1,3 @@
+## 1.2.5
+
+No user-facing changes.
diff --git a/swift/ql/src/change-notes/released/1.2.6.md b/swift/ql/src/change-notes/released/1.2.6.md
new file mode 100644
index 00000000000..0832850ff8c
--- /dev/null
+++ b/swift/ql/src/change-notes/released/1.2.6.md
@@ -0,0 +1,3 @@
+## 1.2.6
+
+No user-facing changes.
diff --git a/swift/ql/src/change-notes/released/1.2.7.md b/swift/ql/src/change-notes/released/1.2.7.md
new file mode 100644
index 00000000000..99f957692ac
--- /dev/null
+++ b/swift/ql/src/change-notes/released/1.2.7.md
@@ -0,0 +1,3 @@
+## 1.2.7
+
+No user-facing changes.
diff --git a/swift/ql/src/change-notes/released/1.2.8.md b/swift/ql/src/change-notes/released/1.2.8.md
new file mode 100644
index 00000000000..533ed7761e4
--- /dev/null
+++ b/swift/ql/src/change-notes/released/1.2.8.md
@@ -0,0 +1,3 @@
+## 1.2.8
+
+No user-facing changes.
diff --git a/swift/ql/src/codeql-pack.release.yml b/swift/ql/src/codeql-pack.release.yml
index 0a70a9a01a7..a49a92ee5ab 100644
--- a/swift/ql/src/codeql-pack.release.yml
+++ b/swift/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.2.2
+lastReleaseVersion: 1.2.8
diff --git a/swift/ql/src/qlpack.yml b/swift/ql/src/qlpack.yml
index 193dfa77a9a..d5a55b365f1 100644
--- a/swift/ql/src/qlpack.yml
+++ b/swift/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/swift-queries
-version: 1.2.3-dev
+version: 1.2.9-dev
 groups:
   - swift
   - queries
diff --git a/swift/ql/test/extractor-tests/declarations/declarations.swift b/swift/ql/test/extractor-tests/declarations/declarations.swift
index 6a1503a95e5..c2e8a94bb97 100644
--- a/swift/ql/test/extractor-tests/declarations/declarations.swift
+++ b/swift/ql/test/extractor-tests/declarations/declarations.swift
@@ -86,7 +86,7 @@ struct HasPropertyAndObserver {
     }
   }
 
-  // A field can be marked as read-only by dirctly implementing
+  // A field can be marked as read-only by directly implementing
   // the getter between the braces.
   var readOnlyField1: Int {
     return 0
diff --git a/swift/ql/test/extractor-tests/expressions/all.expected b/swift/ql/test/extractor-tests/expressions/all.expected
index 0dd7091c1f9..c4909a02c37 100644
--- a/swift/ql/test/extractor-tests/expressions/all.expected
+++ b/swift/ql/test/extractor-tests/expressions/all.expected
@@ -6,12 +6,13 @@
 | expressions.swift:6:9:6:9 | hello world | StringLiteralExpr |
 | expressions.swift:7:10:7:10 | "..." | InterpolatedStringLiteralExpr |
 | expressions.swift:7:10:7:10 | OpaqueValueExpr | OpaqueValueExpr |
+| expressions.swift:7:10:7:10 | appendLiteral(_:) | DeclRefExpr |
 | expressions.swift:7:10:7:10 | hello  | StringLiteralExpr |
 | expressions.swift:7:10:7:21 | TapExpr | TapExpr |
-| expressions.swift:7:11:7:10 | call to appendLiteral(_:) | CallExpr |
 | expressions.swift:7:11:7:11 | $interpolation | DeclRefExpr |
 | expressions.swift:7:11:7:11 | &... | InOutExpr |
 | expressions.swift:7:11:7:11 | .appendLiteral(_:) | MethodLookupExpr |
+| expressions.swift:7:11:7:11 | call to appendLiteral(_:) | CallExpr |
 | expressions.swift:7:18:7:18 | $interpolation | DeclRefExpr |
 | expressions.swift:7:18:7:18 | &... | InOutExpr |
 | expressions.swift:7:18:7:18 | .appendInterpolation(_:) | MethodLookupExpr |
@@ -22,6 +23,7 @@
 | expressions.swift:7:21:7:21 | $interpolation | DeclRefExpr |
 | expressions.swift:7:21:7:21 | &... | InOutExpr |
 | expressions.swift:7:21:7:21 | .appendLiteral(_:) | MethodLookupExpr |
+| expressions.swift:7:21:7:21 | appendLiteral(_:) | DeclRefExpr |
 | expressions.swift:7:21:7:21 | call to appendLiteral(_:) | CallExpr |
 | expressions.swift:8:15:8:15 | nil | NilLiteralExpr |
 | expressions.swift:15:9:15:9 | x | DeclRefExpr |
diff --git a/swift/ql/test/extractor-tests/expressions/semantics.expected b/swift/ql/test/extractor-tests/expressions/semantics.expected
index 35bfe95093c..2b22fb5a12a 100644
--- a/swift/ql/test/extractor-tests/expressions/semantics.expected
+++ b/swift/ql/test/extractor-tests/expressions/semantics.expected
@@ -1,8 +1,10 @@
+| expressions.swift:7:10:7:10 | appendLiteral(_:) | OrdinarySemantics |
 | expressions.swift:7:11:7:11 | $interpolation | OrdinarySemantics |
 | expressions.swift:7:18:7:18 | $interpolation | OrdinarySemantics |
 | expressions.swift:7:18:7:18 | appendInterpolation(_:) | OrdinarySemantics |
 | expressions.swift:7:19:7:19 | a | OrdinarySemantics |
 | expressions.swift:7:21:7:21 | $interpolation | OrdinarySemantics |
+| expressions.swift:7:21:7:21 | appendLiteral(_:) | OrdinarySemantics |
 | expressions.swift:15:9:15:9 | x | OrdinarySemantics |
 | expressions.swift:15:11:15:11 | !=(_:_:) | OrdinarySemantics |
 | expressions.swift:16:19:16:19 | failed | OrdinarySemantics |
diff --git a/swift/ql/test/extractor-tests/generated/OtherAvailabilitySpec/MISSING_SOURCE.txt b/swift/ql/test/extractor-tests/generated/AvailabilitySpec/MISSING_SOURCE.txt
similarity index 100%
rename from swift/ql/test/extractor-tests/generated/OtherAvailabilitySpec/MISSING_SOURCE.txt
rename to swift/ql/test/extractor-tests/generated/AvailabilitySpec/MISSING_SOURCE.txt
diff --git a/swift/ql/test/extractor-tests/generated/KeyPathComponent/KeyPathComponent.expected b/swift/ql/test/extractor-tests/generated/KeyPathComponent/KeyPathComponent.expected
index 9d51a6ed8d5..0bf2f4698e2 100644
--- a/swift/ql/test/extractor-tests/generated/KeyPathComponent/KeyPathComponent.expected
+++ b/swift/ql/test/extractor-tests/generated/KeyPathComponent/KeyPathComponent.expected
@@ -1,18 +1,18 @@
 instances
-| file://:0:0:0:0 | KeyPathComponent | getKind: | 7 | getComponentType: | Int? |
-| key_path_expr.swift:11:17:11:17 | KeyPathComponent | getKind: | 3 | getComponentType: | Int |
-| key_path_expr.swift:12:24:12:26 | KeyPathComponent | getKind: | 4 | getComponentType: | Int |
-| key_path_expr.swift:13:34:13:38 | KeyPathComponent | getKind: | 4 | getComponentType: | Int? |
-| key_path_expr.swift:14:31:14:31 | KeyPathComponent | getKind: | 5 | getComponentType: | Int |
-| key_path_expr.swift:14:31:14:31 | KeyPathComponent | getKind: | 8 | getComponentType: | Int? |
-| key_path_expr.swift:15:21:15:21 | KeyPathComponent | getKind: | 3 | getComponentType: | Bar? |
-| key_path_expr.swift:15:24:15:24 | KeyPathComponent | getKind: | 6 | getComponentType: | Bar |
-| key_path_expr.swift:15:26:15:26 | KeyPathComponent | getKind: | 3 | getComponentType: | Int? |
-| key_path_expr.swift:16:25:16:25 | KeyPathComponent | getKind: | 3 | getComponentType: | Bar? |
-| key_path_expr.swift:16:28:16:28 | KeyPathComponent | getKind: | 6 | getComponentType: | Bar |
-| key_path_expr.swift:16:30:16:30 | KeyPathComponent | getKind: | 3 | getComponentType: | Int |
-| key_path_expr.swift:17:16:17:16 | KeyPathComponent | getKind: | 8 | getComponentType: | Int |
-| key_path_expr.swift:18:32:18:32 | KeyPathComponent | getKind: | 9 | getComponentType: | Int |
+| file://:0:0:0:0 | KeyPathComponent | getKind: | 9 | getComponentType: | Int? |
+| key_path_expr.swift:11:17:11:17 | KeyPathComponent | getKind: | 5 | getComponentType: | Int |
+| key_path_expr.swift:12:24:12:26 | KeyPathComponent | getKind: | 6 | getComponentType: | Int |
+| key_path_expr.swift:13:34:13:38 | KeyPathComponent | getKind: | 6 | getComponentType: | Int? |
+| key_path_expr.swift:14:31:14:31 | KeyPathComponent | getKind: | 7 | getComponentType: | Int |
+| key_path_expr.swift:14:31:14:31 | KeyPathComponent | getKind: | 10 | getComponentType: | Int? |
+| key_path_expr.swift:15:21:15:21 | KeyPathComponent | getKind: | 5 | getComponentType: | Bar? |
+| key_path_expr.swift:15:24:15:24 | KeyPathComponent | getKind: | 8 | getComponentType: | Bar |
+| key_path_expr.swift:15:26:15:26 | KeyPathComponent | getKind: | 5 | getComponentType: | Int? |
+| key_path_expr.swift:16:25:16:25 | KeyPathComponent | getKind: | 5 | getComponentType: | Bar? |
+| key_path_expr.swift:16:28:16:28 | KeyPathComponent | getKind: | 8 | getComponentType: | Bar |
+| key_path_expr.swift:16:30:16:30 | KeyPathComponent | getKind: | 5 | getComponentType: | Int |
+| key_path_expr.swift:17:16:17:16 | KeyPathComponent | getKind: | 10 | getComponentType: | Int |
+| key_path_expr.swift:18:32:18:32 | KeyPathComponent | getKind: | 11 | getComponentType: | Int |
 getSubscriptArgument
 | key_path_expr.swift:12:24:12:26 | KeyPathComponent | 0 | key_path_expr.swift:12:25:12:25 | : 0 |
 | key_path_expr.swift:13:34:13:38 | KeyPathComponent | 0 | key_path_expr.swift:13:35:13:35 | : a |
diff --git a/swift/ql/test/extractor-tests/generated/decl/Accessor/Accessor.expected b/swift/ql/test/extractor-tests/generated/decl/Accessor/Accessor.expected
index 7512cce3712..85b83a8e978 100644
--- a/swift/ql/test/extractor-tests/generated/decl/Accessor/Accessor.expected
+++ b/swift/ql/test/extractor-tests/generated/decl/Accessor/Accessor.expected
@@ -1,43 +1,57 @@
 instances
-| accessors.swift:2:9:2:9 | _modify | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> () -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | yes | isUnsafeAddress: | no | isUnsafeMutableAddress: | no |
-| accessors.swift:2:9:2:9 | get | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (Foo) -> () -> Int | isGetter: | yes | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no |
-| accessors.swift:2:9:2:9 | set | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> (Int) -> () | isGetter: | no | isSetter: | yes | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no |
-| accessors.swift:3:9:3:9 | _modify | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> () -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | yes | isUnsafeAddress: | no | isUnsafeMutableAddress: | no |
-| accessors.swift:4:9:4:28 | get | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (Foo) -> () -> Int | isGetter: | yes | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no |
-| accessors.swift:5:9:5:42 | set | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> (Int) -> () | isGetter: | no | isSetter: | yes | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no |
-| accessors.swift:7:9:7:9 | _modify | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> () -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | yes | isUnsafeAddress: | no | isUnsafeMutableAddress: | no |
-| accessors.swift:7:9:7:9 | get | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (Foo) -> () -> Int | isGetter: | yes | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no |
-| accessors.swift:7:9:7:9 | set | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> (Int) -> () | isGetter: | no | isSetter: | yes | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no |
-| accessors.swift:8:9:8:29 | willSet | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> (Int) -> () | isGetter: | no | isSetter: | no | isWillSet: | yes | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no |
-| accessors.swift:11:9:11:9 | _modify | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> () -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | yes | isUnsafeAddress: | no | isUnsafeMutableAddress: | no |
-| accessors.swift:11:9:11:9 | get | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (Foo) -> () -> Int | isGetter: | yes | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no |
-| accessors.swift:11:9:11:9 | set | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> (Int) -> () | isGetter: | no | isSetter: | yes | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no |
-| accessors.swift:12:9:12:19 | willSet | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> (Int) -> () | isGetter: | no | isSetter: | no | isWillSet: | yes | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no |
-| accessors.swift:15:9:15:9 | _modify | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> () -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | yes | isUnsafeAddress: | no | isUnsafeMutableAddress: | no |
-| accessors.swift:15:9:15:9 | get | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (Foo) -> () -> Int | isGetter: | yes | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no |
-| accessors.swift:15:9:15:9 | set | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> (Int) -> () | isGetter: | no | isSetter: | yes | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no |
-| accessors.swift:16:9:16:28 | didSet | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> (Int) -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | yes | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no |
-| accessors.swift:19:9:19:9 | _modify | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> () -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | yes | isUnsafeAddress: | no | isUnsafeMutableAddress: | no |
-| accessors.swift:19:9:19:9 | get | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (Foo) -> () -> Int | isGetter: | yes | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no |
-| accessors.swift:19:9:19:9 | set | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> (Int) -> () | isGetter: | no | isSetter: | yes | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no |
-| accessors.swift:20:9:20:18 | didSet | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> () -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | yes | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no |
-| accessors.swift:23:9:23:9 | _modify | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> () -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | yes | isUnsafeAddress: | no | isUnsafeMutableAddress: | no |
-| accessors.swift:23:9:23:9 | get | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (Foo) -> () -> Int | isGetter: | yes | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no |
-| accessors.swift:23:9:23:9 | set | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> (Int) -> () | isGetter: | no | isSetter: | yes | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no |
-| accessors.swift:24:9:24:19 | willSet | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> (Int) -> () | isGetter: | no | isSetter: | no | isWillSet: | yes | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no |
-| accessors.swift:26:9:26:18 | didSet | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> () -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | yes | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no |
-| accessors.swift:29:9:29:9 | get | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (Foo) -> () -> Int | isGetter: | yes | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no |
-| accessors.swift:29:9:29:9 | set | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> (Int) -> () | isGetter: | no | isSetter: | yes | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no |
-| accessors.swift:30:9:32:9 | _read | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (Foo) -> () -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | yes | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no |
-| accessors.swift:33:9:35:9 | _modify | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> () -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | yes | isUnsafeAddress: | no | isUnsafeMutableAddress: | no |
-| accessors.swift:38:9:38:9 | _modify | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> () -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | yes | isUnsafeAddress: | no | isUnsafeMutableAddress: | no |
-| accessors.swift:38:9:38:9 | get | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (Foo) -> () -> Int | isGetter: | yes | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no |
-| accessors.swift:38:9:38:9 | set | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> (Int) -> () | isGetter: | no | isSetter: | yes | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no |
-| accessors.swift:39:9:41:9 | unsafeAddress | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (Foo) -> () -> UnsafePointer<Int> | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | yes | isUnsafeMutableAddress: | no |
-| accessors.swift:42:9:44:9 | unsafeMutableAddress | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> () -> UnsafeMutablePointer<Int> | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | yes |
+| accessors2.swift:2:9:2:9 | get | getModule: | file://:0:0:0:0 | accessors2 | getInterfaceType: | (Foo2) -> () -> Int | isGetter: | yes | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | isDistributedGet: | no | isRead2: | no | isModify2: | no | isInit: | no |
+| accessors2.swift:2:9:2:9 | modify | getModule: | file://:0:0:0:0 | accessors2 | getInterfaceType: | (inout Foo2) -> () -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | isDistributedGet: | no | isRead2: | no | isModify2: | yes | isInit: | no |
+| accessors2.swift:2:9:2:9 | set | getModule: | file://:0:0:0:0 | accessors2 | getInterfaceType: | (inout Foo2) -> (Int) -> () | isGetter: | no | isSetter: | yes | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | isDistributedGet: | no | isRead2: | no | isModify2: | no | isInit: | no |
+| accessors2.swift:3:9:3:9 | set | getModule: | file://:0:0:0:0 | accessors2 | getInterfaceType: | (inout Foo2) -> (Int) -> () | isGetter: | no | isSetter: | yes | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | isDistributedGet: | no | isRead2: | no | isModify2: | no | isInit: | no |
+| accessors2.swift:4:9:6:9 | read | getModule: | file://:0:0:0:0 | accessors2 | getInterfaceType: | (Foo2) -> () -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | isDistributedGet: | no | isRead2: | yes | isModify2: | no | isInit: | no |
+| accessors2.swift:7:9:9:9 | modify | getModule: | file://:0:0:0:0 | accessors2 | getInterfaceType: | (inout Foo2) -> () -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | isDistributedGet: | no | isRead2: | no | isModify2: | yes | isInit: | no |
+| accessors.swift:2:9:2:9 | _modify | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> () -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | yes | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | isDistributedGet: | no | isRead2: | no | isModify2: | no | isInit: | no |
+| accessors.swift:2:9:2:9 | get | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (Foo) -> () -> Int | isGetter: | yes | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | isDistributedGet: | no | isRead2: | no | isModify2: | no | isInit: | no |
+| accessors.swift:2:9:2:9 | set | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> (Int) -> () | isGetter: | no | isSetter: | yes | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | isDistributedGet: | no | isRead2: | no | isModify2: | no | isInit: | no |
+| accessors.swift:3:9:3:9 | _modify | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> () -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | yes | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | isDistributedGet: | no | isRead2: | no | isModify2: | no | isInit: | no |
+| accessors.swift:4:9:4:28 | get | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (Foo) -> () -> Int | isGetter: | yes | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | isDistributedGet: | no | isRead2: | no | isModify2: | no | isInit: | no |
+| accessors.swift:5:9:5:42 | set | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> (Int) -> () | isGetter: | no | isSetter: | yes | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | isDistributedGet: | no | isRead2: | no | isModify2: | no | isInit: | no |
+| accessors.swift:7:9:7:9 | _modify | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> () -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | yes | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | isDistributedGet: | no | isRead2: | no | isModify2: | no | isInit: | no |
+| accessors.swift:7:9:7:9 | get | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (Foo) -> () -> Int | isGetter: | yes | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | isDistributedGet: | no | isRead2: | no | isModify2: | no | isInit: | no |
+| accessors.swift:7:9:7:9 | set | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> (Int) -> () | isGetter: | no | isSetter: | yes | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | isDistributedGet: | no | isRead2: | no | isModify2: | no | isInit: | no |
+| accessors.swift:8:9:8:29 | willSet | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> (Int) -> () | isGetter: | no | isSetter: | no | isWillSet: | yes | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | isDistributedGet: | no | isRead2: | no | isModify2: | no | isInit: | no |
+| accessors.swift:11:9:11:9 | _modify | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> () -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | yes | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | isDistributedGet: | no | isRead2: | no | isModify2: | no | isInit: | no |
+| accessors.swift:11:9:11:9 | get | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (Foo) -> () -> Int | isGetter: | yes | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | isDistributedGet: | no | isRead2: | no | isModify2: | no | isInit: | no |
+| accessors.swift:11:9:11:9 | set | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> (Int) -> () | isGetter: | no | isSetter: | yes | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | isDistributedGet: | no | isRead2: | no | isModify2: | no | isInit: | no |
+| accessors.swift:12:9:12:19 | willSet | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> (Int) -> () | isGetter: | no | isSetter: | no | isWillSet: | yes | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | isDistributedGet: | no | isRead2: | no | isModify2: | no | isInit: | no |
+| accessors.swift:15:9:15:9 | _modify | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> () -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | yes | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | isDistributedGet: | no | isRead2: | no | isModify2: | no | isInit: | no |
+| accessors.swift:15:9:15:9 | get | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (Foo) -> () -> Int | isGetter: | yes | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | isDistributedGet: | no | isRead2: | no | isModify2: | no | isInit: | no |
+| accessors.swift:15:9:15:9 | set | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> (Int) -> () | isGetter: | no | isSetter: | yes | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | isDistributedGet: | no | isRead2: | no | isModify2: | no | isInit: | no |
+| accessors.swift:16:9:16:28 | didSet | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> (Int) -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | yes | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | isDistributedGet: | no | isRead2: | no | isModify2: | no | isInit: | no |
+| accessors.swift:19:9:19:9 | _modify | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> () -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | yes | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | isDistributedGet: | no | isRead2: | no | isModify2: | no | isInit: | no |
+| accessors.swift:19:9:19:9 | get | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (Foo) -> () -> Int | isGetter: | yes | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | isDistributedGet: | no | isRead2: | no | isModify2: | no | isInit: | no |
+| accessors.swift:19:9:19:9 | set | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> (Int) -> () | isGetter: | no | isSetter: | yes | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | isDistributedGet: | no | isRead2: | no | isModify2: | no | isInit: | no |
+| accessors.swift:20:9:20:18 | didSet | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> () -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | yes | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | isDistributedGet: | no | isRead2: | no | isModify2: | no | isInit: | no |
+| accessors.swift:23:9:23:9 | _modify | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> () -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | yes | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | isDistributedGet: | no | isRead2: | no | isModify2: | no | isInit: | no |
+| accessors.swift:23:9:23:9 | get | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (Foo) -> () -> Int | isGetter: | yes | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | isDistributedGet: | no | isRead2: | no | isModify2: | no | isInit: | no |
+| accessors.swift:23:9:23:9 | set | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> (Int) -> () | isGetter: | no | isSetter: | yes | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | isDistributedGet: | no | isRead2: | no | isModify2: | no | isInit: | no |
+| accessors.swift:24:9:24:19 | willSet | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> (Int) -> () | isGetter: | no | isSetter: | no | isWillSet: | yes | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | isDistributedGet: | no | isRead2: | no | isModify2: | no | isInit: | no |
+| accessors.swift:26:9:26:18 | didSet | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> () -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | yes | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | isDistributedGet: | no | isRead2: | no | isModify2: | no | isInit: | no |
+| accessors.swift:29:9:29:9 | get | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (Foo) -> () -> Int | isGetter: | yes | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | isDistributedGet: | no | isRead2: | no | isModify2: | no | isInit: | no |
+| accessors.swift:29:9:29:9 | set | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> (Int) -> () | isGetter: | no | isSetter: | yes | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | isDistributedGet: | no | isRead2: | no | isModify2: | no | isInit: | no |
+| accessors.swift:30:9:32:9 | _read | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (Foo) -> () -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | yes | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | isDistributedGet: | no | isRead2: | no | isModify2: | no | isInit: | no |
+| accessors.swift:33:9:35:9 | _modify | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> () -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | yes | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | isDistributedGet: | no | isRead2: | no | isModify2: | no | isInit: | no |
+| accessors.swift:38:9:38:9 | _modify | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> () -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | yes | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | isDistributedGet: | no | isRead2: | no | isModify2: | no | isInit: | no |
+| accessors.swift:38:9:38:9 | get | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (Foo) -> () -> Int | isGetter: | yes | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | isDistributedGet: | no | isRead2: | no | isModify2: | no | isInit: | no |
+| accessors.swift:38:9:38:9 | set | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> (Int) -> () | isGetter: | no | isSetter: | yes | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | isDistributedGet: | no | isRead2: | no | isModify2: | no | isInit: | no |
+| accessors.swift:39:9:41:9 | unsafeAddress | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (Foo) -> () -> UnsafePointer<Int> | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | yes | isUnsafeMutableAddress: | no | isDistributedGet: | no | isRead2: | no | isModify2: | no | isInit: | no |
+| accessors.swift:42:9:44:9 | unsafeMutableAddress | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> () -> UnsafeMutablePointer<Int> | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | yes | isDistributedGet: | no | isRead2: | no | isModify2: | no | isInit: | no |
+| accessors.swift:48:9:48:16 | init | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (inout Foo) -> (Int) -> () | isGetter: | no | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | isDistributedGet: | no | isRead2: | no | isModify2: | no | isInit: | yes |
+| accessors.swift:50:9:50:18 | get | getModule: | file://:0:0:0:0 | accessors | getInterfaceType: | (Foo) -> () -> Int | isGetter: | yes | isSetter: | no | isWillSet: | no | isDidSet: | no | isRead: | no | isModify: | no | isUnsafeAddress: | no | isUnsafeMutableAddress: | no | isDistributedGet: | no | isRead2: | no | isModify2: | no | isInit: | no |
 getGenericTypeParam
 getMember
 getName
+| accessors2.swift:2:9:2:9 | get | (unnamed function decl) |
+| accessors2.swift:2:9:2:9 | modify | (unnamed function decl) |
+| accessors2.swift:2:9:2:9 | set | (unnamed function decl) |
+| accessors2.swift:3:9:3:9 | set | (unnamed function decl) |
+| accessors2.swift:4:9:6:9 | read | (unnamed function decl) |
+| accessors2.swift:7:9:9:9 | modify | (unnamed function decl) |
 | accessors.swift:2:9:2:9 | _modify | (unnamed function decl) |
 | accessors.swift:2:9:2:9 | get | (unnamed function decl) |
 | accessors.swift:2:9:2:9 | set | (unnamed function decl) |
@@ -74,7 +88,15 @@ getName
 | accessors.swift:38:9:38:9 | set | (unnamed function decl) |
 | accessors.swift:39:9:41:9 | unsafeAddress | (unnamed function decl) |
 | accessors.swift:42:9:44:9 | unsafeMutableAddress | (unnamed function decl) |
+| accessors.swift:48:9:48:16 | init | (unnamed function decl) |
+| accessors.swift:50:9:50:18 | get | (unnamed function decl) |
 getSelfParam
+| accessors2.swift:2:9:2:9 | get | accessors2.swift:2:9:2:9 | self |
+| accessors2.swift:2:9:2:9 | modify | accessors2.swift:2:9:2:9 | self |
+| accessors2.swift:2:9:2:9 | set | accessors2.swift:2:9:2:9 | self |
+| accessors2.swift:3:9:3:9 | set | accessors2.swift:3:9:3:9 | self |
+| accessors2.swift:4:9:6:9 | read | accessors2.swift:4:9:4:9 | self |
+| accessors2.swift:7:9:9:9 | modify | accessors2.swift:7:9:7:9 | self |
 | accessors.swift:2:9:2:9 | _modify | accessors.swift:2:9:2:9 | self |
 | accessors.swift:2:9:2:9 | get | accessors.swift:2:9:2:9 | self |
 | accessors.swift:2:9:2:9 | set | accessors.swift:2:9:2:9 | self |
@@ -111,7 +133,11 @@ getSelfParam
 | accessors.swift:38:9:38:9 | set | accessors.swift:38:9:38:9 | self |
 | accessors.swift:39:9:41:9 | unsafeAddress | accessors.swift:39:9:39:9 | self |
 | accessors.swift:42:9:44:9 | unsafeMutableAddress | accessors.swift:42:9:42:9 | self |
+| accessors.swift:48:9:48:16 | init | accessors.swift:48:9:48:9 | self |
+| accessors.swift:50:9:50:18 | get | accessors.swift:50:9:50:9 | self |
 getParam
+| accessors2.swift:2:9:2:9 | set | 0 | accessors2.swift:2:9:2:9 | value |
+| accessors2.swift:3:9:3:9 | set | 0 | accessors2.swift:3:9:3:9 | value |
 | accessors.swift:2:9:2:9 | set | 0 | accessors.swift:2:9:2:9 | value |
 | accessors.swift:5:9:5:42 | set | 0 | accessors.swift:5:13:5:13 | newValue |
 | accessors.swift:7:9:7:9 | set | 0 | accessors.swift:7:9:7:9 | value |
@@ -125,7 +151,14 @@ getParam
 | accessors.swift:24:9:24:19 | willSet | 0 | accessors.swift:24:9:24:9 | newValue |
 | accessors.swift:29:9:29:9 | set | 0 | accessors.swift:29:9:29:9 | value |
 | accessors.swift:38:9:38:9 | set | 0 | accessors.swift:38:9:38:9 | value |
+| accessors.swift:48:9:48:16 | init | 0 | accessors.swift:48:9:48:9 | newValue |
 getBody
+| accessors2.swift:2:9:2:9 | get | accessors2.swift:2:9:2:9 | { ... } |
+| accessors2.swift:2:9:2:9 | modify | accessors2.swift:2:9:2:9 | { ... } |
+| accessors2.swift:2:9:2:9 | set | accessors2.swift:2:9:2:9 | { ... } |
+| accessors2.swift:3:9:3:9 | set | accessors2.swift:3:9:3:9 | { ... } |
+| accessors2.swift:4:9:6:9 | read | accessors2.swift:4:14:6:9 | { ... } |
+| accessors2.swift:7:9:9:9 | modify | accessors2.swift:7:16:9:9 | { ... } |
 | accessors.swift:2:9:2:9 | _modify | accessors.swift:2:9:2:9 | { ... } |
 | accessors.swift:2:9:2:9 | get | accessors.swift:2:9:2:9 | { ... } |
 | accessors.swift:2:9:2:9 | set | accessors.swift:2:9:2:9 | { ... } |
@@ -162,4 +195,6 @@ getBody
 | accessors.swift:38:9:38:9 | set | accessors.swift:38:9:38:9 | { ... } |
 | accessors.swift:39:9:41:9 | unsafeAddress | accessors.swift:39:23:41:9 | { ... } |
 | accessors.swift:42:9:44:9 | unsafeMutableAddress | accessors.swift:42:30:44:9 | { ... } |
+| accessors.swift:48:9:48:16 | init | accessors.swift:48:14:48:16 | { ... } |
+| accessors.swift:50:9:50:18 | get | accessors.swift:50:13:50:18 | { ... } |
 getCapture
diff --git a/swift/ql/test/extractor-tests/generated/decl/Accessor/Accessor.ql b/swift/ql/test/extractor-tests/generated/decl/Accessor/Accessor.ql
index f05c5d94bba..b5821ca1903 100644
--- a/swift/ql/test/extractor-tests/generated/decl/Accessor/Accessor.ql
+++ b/swift/ql/test/extractor-tests/generated/decl/Accessor/Accessor.ql
@@ -8,7 +8,9 @@ query predicate instances(
   string isSetter, string isWillSet__label, string isWillSet, string isDidSet__label,
   string isDidSet, string isRead__label, string isRead, string isModify__label, string isModify,
   string isUnsafeAddress__label, string isUnsafeAddress, string isUnsafeMutableAddress__label,
-  string isUnsafeMutableAddress
+  string isUnsafeMutableAddress, string isDistributedGet__label, string isDistributedGet,
+  string isRead2__label, string isRead2, string isModify2__label, string isModify2,
+  string isInit__label, string isInit
 ) {
   toBeTested(x) and
   not x.isUnknown() and
@@ -31,9 +33,19 @@ query predicate instances(
   isUnsafeAddress__label = "isUnsafeAddress:" and
   (if x.isUnsafeAddress() then isUnsafeAddress = "yes" else isUnsafeAddress = "no") and
   isUnsafeMutableAddress__label = "isUnsafeMutableAddress:" and
-  if x.isUnsafeMutableAddress()
-  then isUnsafeMutableAddress = "yes"
-  else isUnsafeMutableAddress = "no"
+  (
+    if x.isUnsafeMutableAddress()
+    then isUnsafeMutableAddress = "yes"
+    else isUnsafeMutableAddress = "no"
+  ) and
+  isDistributedGet__label = "isDistributedGet:" and
+  (if x.isDistributedGet() then isDistributedGet = "yes" else isDistributedGet = "no") and
+  isRead2__label = "isRead2:" and
+  (if x.isRead2() then isRead2 = "yes" else isRead2 = "no") and
+  isModify2__label = "isModify2:" and
+  (if x.isModify2() then isModify2 = "yes" else isModify2 = "no") and
+  isInit__label = "isInit:" and
+  if x.isInit() then isInit = "yes" else isInit = "no"
 }
 
 query predicate getGenericTypeParam(Accessor x, int index, GenericTypeParamDecl getGenericTypeParam) {
diff --git a/swift/ql/test/extractor-tests/generated/decl/Accessor/accessors.swift b/swift/ql/test/extractor-tests/generated/decl/Accessor/accessors.swift
index 2f645a1592e..6f3433c2024 100644
--- a/swift/ql/test/extractor-tests/generated/decl/Accessor/accessors.swift
+++ b/swift/ql/test/extractor-tests/generated/decl/Accessor/accessors.swift
@@ -43,4 +43,10 @@ struct Foo {
             return UnsafeMutablePointer<Int>(bitPattern: 0)!
         }
     }
+
+    var hasInit: Int {
+        init { }
+
+        get { 42 }
+    }
 }
diff --git a/swift/ql/test/extractor-tests/generated/decl/Accessor/accessors2.swift b/swift/ql/test/extractor-tests/generated/decl/Accessor/accessors2.swift
new file mode 100644
index 00000000000..e5f7f8d4aee
--- /dev/null
+++ b/swift/ql/test/extractor-tests/generated/decl/Accessor/accessors2.swift
@@ -0,0 +1,13 @@
+struct Foo2 {
+    var x = 11
+    var borrowedProp: Int {
+        read {
+            yield x
+        }
+        modify {
+            yield &x
+        }
+    }
+}
+
+//codeql-extractor-options: -enable-experimental-feature CoroutineAccessors
diff --git a/swift/ql/test/extractor-tests/generated/decl/CapturedDecl/PrintAst.expected b/swift/ql/test/extractor-tests/generated/decl/CapturedDecl/PrintAst.expected
index 3b815eb1842..ac61ba1dfc6 100644
--- a/swift/ql/test/extractor-tests/generated/decl/CapturedDecl/PrintAst.expected
+++ b/swift/ql/test/extractor-tests/generated/decl/CapturedDecl/PrintAst.expected
@@ -222,14 +222,16 @@ closures.swift:
 #   39|                       getExpr(): [IntegerLiteralExpr] 1
 #   39|               getResult().getFullyConverted(): [AwaitExpr] await ...
 #   39|           getCapture(0): [CapturedDecl] callback
-#   41|         getElement(1): [CallExpr] call to Task<Success, Never>.init(priority:operation:)
-#   41|           getFunction(): [MethodLookupExpr] Task<Success, Never>.init(priority:operation:)
+#   41|         getElement(1): [CallExpr] call to Task<Success, Never>.init(name:priority:operation:)
+#   41|           getFunction(): [MethodLookupExpr] Task<Success, Never>.init(name:priority:operation:)
 #   41|             getBase(): [TypeExpr] Task<(), Never>.Type
 #   41|               getTypeRepr(): [TypeRepr] Task<(), Never>
-#   41|             getMethodRef(): [DeclRefExpr] Task<Success, Never>.init(priority:operation:)
-#   41|           getArgument(0): [Argument] priority: default priority
+#   41|             getMethodRef(): [DeclRefExpr] Task<Success, Never>.init(name:priority:operation:)
+#   41|           getArgument(0): [Argument] name: default name
+#   41|             getExpr(): [DefaultArgumentExpr] default name
+#   41|           getArgument(1): [Argument] priority: default priority
 #   41|             getExpr(): [DefaultArgumentExpr] default priority
-#   41|           getArgument(1): [Argument] operation: { ... }
+#   41|           getArgument(2): [Argument] operation: { ... }
 #   41|             getExpr(): [ExplicitClosureExpr] { ... }
 #   41|               getBody(): [BraceStmt] { ... }
 #   42|                 getElement(0): [ReturnStmt] return ...
@@ -270,6 +272,7 @@ closures.swift:
 #   46|                 getArgument(1): [Argument] : 1
 #   46|                   getExpr(): [IntegerLiteralExpr] 1
 #   41| [NilLiteralExpr] nil
+#   41| [NilLiteralExpr] nil
 #   50| [NamedFunction] foo()
 #   50|     InterfaceType = () -> Int
 #   50|   getBody(): [BraceStmt] { ... }
diff --git a/swift/ql/test/extractor-tests/generated/decl/ConcreteVarDecl/ConcreteVarDecl.expected b/swift/ql/test/extractor-tests/generated/decl/ConcreteVarDecl/ConcreteVarDecl.expected
index 85fef3f52ca..09751f3c41d 100644
--- a/swift/ql/test/extractor-tests/generated/decl/ConcreteVarDecl/ConcreteVarDecl.expected
+++ b/swift/ql/test/extractor-tests/generated/decl/ConcreteVarDecl/ConcreteVarDecl.expected
@@ -103,7 +103,7 @@ getParentPattern
 | var_decls.swift:65:19:65:19 | case_variable | var_decls.swift:65:8:65:35 | .value(...) |
 | var_decls.swift:67:22:67:22 | unused_case_variable | var_decls.swift:67:8:67:42 | .value(...) |
 getParentInitializer
-| var_decls.swift:2:12:2:12 | $i$generator | var_decls.swift:2:12:2:16 | call to makeIterator() |
+| var_decls.swift:2:12:2:12 | $i$generator | var_decls.swift:2:12:2:12 | call to makeIterator() |
 | var_decls.swift:4:7:4:7 | i | var_decls.swift:4:11:4:11 | 0 |
 | var_decls.swift:7:5:7:5 | numbers | var_decls.swift:7:15:7:18 | [...] |
 | var_decls.swift:10:12:10:12 | numbers | var_decls.swift:10:22:10:35 | [...] |
diff --git a/swift/ql/test/extractor-tests/generated/decl/MacroDecl/MacroRole.expected b/swift/ql/test/extractor-tests/generated/decl/MacroDecl/MacroRole.expected
index eca30375b24..05232a3cd04 100644
--- a/swift/ql/test/extractor-tests/generated/decl/MacroDecl/MacroRole.expected
+++ b/swift/ql/test/extractor-tests/generated/decl/MacroDecl/MacroRole.expected
@@ -15,6 +15,7 @@ instances
 | file://:0:0:0:0 | @attached(memberAttribute) | getKind: | 8 | getMacroSyntax: | 1 |
 | file://:0:0:0:0 | @attached(peer) | getKind: | 32 | getMacroSyntax: | 1 |
 | file://:0:0:0:0 | @attached(peer) | getKind: | 32 | getMacroSyntax: | 1 |
+| file://:0:0:0:0 | @attached(peer) | getKind: | 32 | getMacroSyntax: | 1 |
 | test.swift:1:2:1:26 | #freestanding(declaration) | getKind: | 2 | getMacroSyntax: | 0 |
 | test.swift:3:2:3:25 | #freestanding(expression) | getKind: | 1 | getMacroSyntax: | 0 |
 | test.swift:5:2:5:17 | @attached(member) | getKind: | 16 | getMacroSyntax: | 1 |
@@ -22,4 +23,5 @@ instances
 getConformance
 getName
 | file://:0:0:0:0 | @attached(peer) | 0 | $() |
+| file://:0:0:0:0 | @attached(peer) | 0 | _() |
 | file://:0:0:0:0 | @attached(peer) | 0 | _lldb_summary() |
diff --git a/swift/ql/test/extractor-tests/generated/decl/ParamDecl/param_decls.swift b/swift/ql/test/extractor-tests/generated/decl/ParamDecl/param_decls.swift
index 42d2b4980fa..2fd7f23b64c 100644
--- a/swift/ql/test/extractor-tests/generated/decl/ParamDecl/param_decls.swift
+++ b/swift/ql/test/extractor-tests/generated/decl/ParamDecl/param_decls.swift
@@ -47,6 +47,6 @@ func closures() {
 func f2(
         @Wrapper p1: Int,
         @WrapperWithInit p2: Int,
-        // @WrapperWithProjected p3: Int, // Disabled causes crashes with Swift 6.1
-        // @WrapperWithProjectedAndInit p4: Int // Disabled causes crashes with Swift 6.1
+        // @WrapperWithProjected p3: Int, // Disabled causes crashes with Swift 6.1/6.2
+        // @WrapperWithProjectedAndInit p4: Int // Disabled causes crashes with Swift 6.1/6.2
 ) {}
diff --git a/swift/ql/test/extractor-tests/generated/decl/PoundDiagnosticDecl/PoundDiagnosticDecl.expected b/swift/ql/test/extractor-tests/generated/decl/PoundDiagnosticDecl/PoundDiagnosticDecl.expected
index aaa3b31e23e..060fc027d05 100644
--- a/swift/ql/test/extractor-tests/generated/decl/PoundDiagnosticDecl/PoundDiagnosticDecl.expected
+++ b/swift/ql/test/extractor-tests/generated/decl/PoundDiagnosticDecl/PoundDiagnosticDecl.expected
@@ -1,4 +1,2 @@
 instances
-| diagnostics.swift:2:1:2:25 | #warning(...) | getModule: | file://:0:0:0:0 | diagnostics | getKind: | 2 | getMessage: | diagnostics.swift:2:10:2:10 | I'm a warning |
-| diagnostics.swift:3:1:3:26 | #error(...) | getModule: | file://:0:0:0:0 | diagnostics | getKind: | 1 | getMessage: | diagnostics.swift:3:8:3:8 | And I'm an error |
 getMember
diff --git a/swift/ql/test/extractor-tests/generated/PlatformVersionAvailabilitySpec/MISSING_SOURCE.txt b/swift/ql/test/extractor-tests/generated/decl/UsingDecl/MISSING_SOURCE.txt
similarity index 100%
rename from swift/ql/test/extractor-tests/generated/PlatformVersionAvailabilitySpec/MISSING_SOURCE.txt
rename to swift/ql/test/extractor-tests/generated/decl/UsingDecl/MISSING_SOURCE.txt
diff --git a/swift/ql/test/extractor-tests/generated/expr/AppliedPropertyWrapperExpr/applied_property_wrapper.swift b/swift/ql/test/extractor-tests/generated/expr/AppliedPropertyWrapperExpr/applied_property_wrapper.swift
index a90ac69e1d4..e91e1c397c9 100644
--- a/swift/ql/test/extractor-tests/generated/expr/AppliedPropertyWrapperExpr/applied_property_wrapper.swift
+++ b/swift/ql/test/extractor-tests/generated/expr/AppliedPropertyWrapperExpr/applied_property_wrapper.swift
@@ -10,7 +10,7 @@
 }
 
 func foo(
-    // @Wrapper x: Int // Disabled causes crashes with Swift 6.1
+    // @Wrapper x: Int // Disabled causes crashes with Swift 6.1/6.2
 ) {}
 
 // foo(x: 42)
@@ -18,7 +18,7 @@ func foo(
 
 let closure = {
     (
-        // @Wrapper y: Int // Disabled causes crashes with Swift 6.1
+        // @Wrapper y: Int // Disabled causes crashes with Swift 6.1/6.2
     ) in return
     }
 
diff --git a/swift/ql/test/extractor-tests/generated/expr/IdentityExpr/IdentityExpr.expected b/swift/ql/test/extractor-tests/generated/expr/IdentityExpr/IdentityExpr.expected
index 8eb957d6089..e8976e41613 100644
--- a/swift/ql/test/extractor-tests/generated/expr/IdentityExpr/IdentityExpr.expected
+++ b/swift/ql/test/extractor-tests/generated/expr/IdentityExpr/IdentityExpr.expected
@@ -8,6 +8,8 @@ instances
 | identity_expressions.swift:15:5:15:21 | await ... | AwaitExpr | getSubExpr: | identity_expressions.swift:15:11:15:21 | call to process() |
 | identity_expressions.swift:15:11:15:19 | (...) | ParenExpr | getSubExpr: | identity_expressions.swift:15:12:15:12 | process() |
 | identity_expressions.swift:18:9:18:17 | BorrowExpr | BorrowExpr | getSubExpr: | identity_expressions.swift:18:17:18:17 | x |
+| identity_expressions.swift:23:33:23:40 | UnsafeExpr | UnsafeExpr | getSubExpr: | identity_expressions.swift:23:40:23:40 | y |
+| identity_expressions.swift:24:13:24:20 | UnsafeExpr | UnsafeExpr | getSubExpr: | identity_expressions.swift:24:20:24:20 | x |
 getType
 | identity_expressions.swift:5:9:5:14 | .self | A |
 | identity_expressions.swift:5:9:5:21 | .self | @lvalue Int |
@@ -18,3 +20,5 @@ getType
 | identity_expressions.swift:15:5:15:21 | await ... | () |
 | identity_expressions.swift:15:11:15:19 | (...) | () async -> () |
 | identity_expressions.swift:18:9:18:17 | BorrowExpr | Int |
+| identity_expressions.swift:23:33:23:40 | UnsafeExpr | UnsafeType |
+| identity_expressions.swift:24:13:24:20 | UnsafeExpr | UnsafeType |
diff --git a/swift/ql/test/extractor-tests/generated/expr/IdentityExpr/identity_expressions.swift b/swift/ql/test/extractor-tests/generated/expr/IdentityExpr/identity_expressions.swift
index 63ff2b690ce..ec2b39bece6 100644
--- a/swift/ql/test/extractor-tests/generated/expr/IdentityExpr/identity_expressions.swift
+++ b/swift/ql/test/extractor-tests/generated/expr/IdentityExpr/identity_expressions.swift
@@ -16,3 +16,10 @@ Task.init {
 }
 let x = 42
 let _ = _borrow x
+
+struct UnsafeType {}
+
+func unsafeFunc(_ y: UnsafeType) {
+    @unsafe let x: UnsafeType = unsafe y
+    let _ = unsafe x
+}
diff --git a/swift/ql/test/extractor-tests/generated/expr/MethodLookupExpr/MethodLookupExpr.expected b/swift/ql/test/extractor-tests/generated/expr/MethodLookupExpr/MethodLookupExpr.expected
index 66837f972f2..712c740dc19 100644
--- a/swift/ql/test/extractor-tests/generated/expr/MethodLookupExpr/MethodLookupExpr.expected
+++ b/swift/ql/test/extractor-tests/generated/expr/MethodLookupExpr/MethodLookupExpr.expected
@@ -14,12 +14,12 @@ instances
 | method_lookups.swift:37:11:37:11 | X.init() | getBase: | method_lookups.swift:37:11:37:11 | X.Type | getMethodRef: | method_lookups.swift:37:11:37:11 | X.init() |
 | method_lookups.swift:37:11:37:15 | (no string representation) | getBase: | method_lookups.swift:37:11:37:13 | call to X.init() | getMethodRef: | method_lookups.swift:37:15:37:15 | { ... } |
 | method_lookups.swift:37:15:37:15 | .baz(_:) | getBase: | file://:0:0:0:0 | self | getMethodRef: | method_lookups.swift:37:15:37:15 | baz(_:) |
-| method_lookups.swift:40:1:40:1 | Task<Success, Never>.init(priority:operation:) | getBase: | method_lookups.swift:40:1:40:1 | Task<(), Never>.Type | getMethodRef: | method_lookups.swift:40:1:40:1 | Task<Success, Never>.init(priority:operation:) |
+| method_lookups.swift:40:1:40:1 | Task<Success, Never>.init(name:priority:operation:) | getBase: | method_lookups.swift:40:1:40:1 | Task<(), Never>.Type | getMethodRef: | method_lookups.swift:40:1:40:1 | Task<Success, Never>.init(name:priority:operation:) |
 | method_lookups.swift:41:3:41:5 | .foo(_:_:) | getBase: | method_lookups.swift:41:3:41:3 | Y.Type | getMethodRef: | method_lookups.swift:41:5:41:5 | foo(_:_:) |
 | method_lookups.swift:42:9:42:9 | Y.init() | getBase: | method_lookups.swift:42:9:42:9 | Y.Type | getMethodRef: | method_lookups.swift:42:9:42:9 | Y.init() |
 | method_lookups.swift:42:9:42:13 | .baz(_:) | getBase: | method_lookups.swift:42:9:42:11 | call to Y.init() | getMethodRef: | method_lookups.swift:42:13:42:13 | baz(_:) |
 | method_lookups.swift:44:11:44:13 | .foo(_:_:) | getBase: | method_lookups.swift:44:11:44:11 | Y.Type | getMethodRef: | method_lookups.swift:44:13:44:13 | foo(_:_:) |
-| method_lookups.swift:47:1:47:1 | Task<Success, Never>.init(priority:operation:) | getBase: | method_lookups.swift:47:1:47:1 | Task<(), Never>.Type | getMethodRef: | method_lookups.swift:47:1:47:1 | Task<Success, Never>.init(priority:operation:) |
+| method_lookups.swift:47:1:47:1 | Task<Success, Never>.init(name:priority:operation:) | getBase: | method_lookups.swift:47:1:47:1 | Task<(), Never>.Type | getMethodRef: | method_lookups.swift:47:1:47:1 | Task<Success, Never>.init(name:priority:operation:) |
 | method_lookups.swift:48:9:48:11 | .foo(_:_:) | getBase: | method_lookups.swift:48:9:48:9 | Z.Type | getMethodRef: | method_lookups.swift:48:11:48:11 | foo(_:_:) |
 | method_lookups.swift:49:9:49:11 | .bar() | getBase: | method_lookups.swift:49:9:49:9 | Z.Type | getMethodRef: | method_lookups.swift:49:11:49:11 | bar() |
 | method_lookups.swift:50:9:50:9 | Z.init() | getBase: | method_lookups.swift:50:9:50:9 | Z.Type | getMethodRef: | method_lookups.swift:50:9:50:9 | Z.init() |
@@ -44,12 +44,12 @@ getType
 | method_lookups.swift:37:11:37:11 | X.init() | () -> X |
 | method_lookups.swift:37:11:37:15 | (no string representation) | (Int) -> () |
 | method_lookups.swift:37:15:37:15 | .baz(_:) | (Int) -> () |
-| method_lookups.swift:40:1:40:1 | Task<Success, Never>.init(priority:operation:) | (TaskPriority?, sending @escaping @isolated(any) () async -> ()) -> Task<(), Never> |
+| method_lookups.swift:40:1:40:1 | Task<Success, Never>.init(name:priority:operation:) | (String?, TaskPriority?, sending @escaping @isolated(any) () async -> ()) -> Task<(), Never> |
 | method_lookups.swift:41:3:41:5 | .foo(_:_:) | (Int, Int) -> () |
 | method_lookups.swift:42:9:42:9 | Y.init() | () -> Y |
 | method_lookups.swift:42:9:42:13 | .baz(_:) | (Int) -> () |
 | method_lookups.swift:44:11:44:13 | .foo(_:_:) | (Int, Int) -> () |
-| method_lookups.swift:47:1:47:1 | Task<Success, Never>.init(priority:operation:) | (TaskPriority?, sending @escaping @isolated(any) () async -> ()) -> Task<(), Never> |
+| method_lookups.swift:47:1:47:1 | Task<Success, Never>.init(name:priority:operation:) | (String?, TaskPriority?, sending @escaping @isolated(any) () async -> ()) -> Task<(), Never> |
 | method_lookups.swift:48:9:48:11 | .foo(_:_:) | @MainActor (Int, Int) -> () |
 | method_lookups.swift:49:9:49:11 | .bar() | () -> () |
 | method_lookups.swift:50:9:50:9 | Z.init() | @MainActor () -> Z |
@@ -70,12 +70,12 @@ getMember
 | method_lookups.swift:36:11:36:13 | .bar() | method_lookups.swift:3:3:3:21 | bar() |
 | method_lookups.swift:37:11:37:11 | X.init() | method_lookups.swift:6:3:8:3 | X.init() |
 | method_lookups.swift:37:15:37:15 | .baz(_:) | method_lookups.swift:4:3:4:21 | baz(_:) |
-| method_lookups.swift:40:1:40:1 | Task<Success, Never>.init(priority:operation:) | file://:0:0:0:0 | Task<Success, Never>.init(priority:operation:) |
+| method_lookups.swift:40:1:40:1 | Task<Success, Never>.init(name:priority:operation:) | file://:0:0:0:0 | Task<Success, Never>.init(name:priority:operation:) |
 | method_lookups.swift:41:3:41:5 | .foo(_:_:) | method_lookups.swift:12:3:12:35 | foo(_:_:) |
 | method_lookups.swift:42:9:42:9 | Y.init() | method_lookups.swift:15:3:17:3 | Y.init() |
 | method_lookups.swift:42:9:42:13 | .baz(_:) | method_lookups.swift:13:3:13:21 | baz(_:) |
 | method_lookups.swift:44:11:44:13 | .foo(_:_:) | method_lookups.swift:12:3:12:35 | foo(_:_:) |
-| method_lookups.swift:47:1:47:1 | Task<Success, Never>.init(priority:operation:) | file://:0:0:0:0 | Task<Success, Never>.init(priority:operation:) |
+| method_lookups.swift:47:1:47:1 | Task<Success, Never>.init(name:priority:operation:) | file://:0:0:0:0 | Task<Success, Never>.init(name:priority:operation:) |
 | method_lookups.swift:48:9:48:11 | .foo(_:_:) | method_lookups.swift:22:3:22:35 | foo(_:_:) |
 | method_lookups.swift:49:9:49:11 | .bar() | method_lookups.swift:23:15:23:33 | bar() |
 | method_lookups.swift:50:9:50:9 | Z.init() | method_lookups.swift:26:3:28:3 | Z.init() |
diff --git a/swift/ql/test/extractor-tests/generated/type/OpenedArchetypeType/OpenedArchetypeType.expected b/swift/ql/test/extractor-tests/generated/type/ExistentialArchetypeType/ExistentialArchetypeType.expected
similarity index 56%
rename from swift/ql/test/extractor-tests/generated/type/OpenedArchetypeType/OpenedArchetypeType.expected
rename to swift/ql/test/extractor-tests/generated/type/ExistentialArchetypeType/ExistentialArchetypeType.expected
index 3400ffa5fdc..70a7ed1a95a 100644
--- a/swift/ql/test/extractor-tests/generated/type/OpenedArchetypeType/OpenedArchetypeType.expected
+++ b/swift/ql/test/extractor-tests/generated/type/ExistentialArchetypeType/ExistentialArchetypeType.expected
@@ -3,5 +3,5 @@ instances
 getSuperclass
 | any C & P1 & P2 | C |
 getProtocol
-| any C & P1 & P2 | 0 | opened_archetypes.swift:3:1:3:14 | P1 |
-| any C & P1 & P2 | 1 | opened_archetypes.swift:9:1:9:14 | P2 |
+| any C & P1 & P2 | 0 | existential_archetypes.swift:3:1:3:14 | P1 |
+| any C & P1 & P2 | 1 | existential_archetypes.swift:9:1:9:14 | P2 |
diff --git a/swift/ql/test/extractor-tests/generated/type/OpenedArchetypeType/OpenedArchetypeType.ql b/swift/ql/test/extractor-tests/generated/type/ExistentialArchetypeType/ExistentialArchetypeType.ql
similarity index 70%
rename from swift/ql/test/extractor-tests/generated/type/OpenedArchetypeType/OpenedArchetypeType.ql
rename to swift/ql/test/extractor-tests/generated/type/ExistentialArchetypeType/ExistentialArchetypeType.ql
index 2d5f19580a7..e1b32704dea 100644
--- a/swift/ql/test/extractor-tests/generated/type/OpenedArchetypeType/OpenedArchetypeType.ql
+++ b/swift/ql/test/extractor-tests/generated/type/ExistentialArchetypeType/ExistentialArchetypeType.ql
@@ -3,7 +3,7 @@ import codeql.swift.elements
 import TestUtils
 
 query predicate instances(
-  OpenedArchetypeType x, string getName__label, string getName, string getCanonicalType__label,
+  ExistentialArchetypeType x, string getName__label, string getName, string getCanonicalType__label,
   Type getCanonicalType, string getInterfaceType__label, Type getInterfaceType
 ) {
   toBeTested(x) and
@@ -16,10 +16,10 @@ query predicate instances(
   getInterfaceType = x.getInterfaceType()
 }
 
-query predicate getSuperclass(OpenedArchetypeType x, Type getSuperclass) {
+query predicate getSuperclass(ExistentialArchetypeType x, Type getSuperclass) {
   toBeTested(x) and not x.isUnknown() and getSuperclass = x.getSuperclass()
 }
 
-query predicate getProtocol(OpenedArchetypeType x, int index, ProtocolDecl getProtocol) {
+query predicate getProtocol(ExistentialArchetypeType x, int index, ProtocolDecl getProtocol) {
   toBeTested(x) and not x.isUnknown() and getProtocol = x.getProtocol(index)
 }
diff --git a/swift/ql/test/extractor-tests/generated/type/OpenedArchetypeType/opened_archetypes.swift b/swift/ql/test/extractor-tests/generated/type/ExistentialArchetypeType/existential_archetypes.swift
similarity index 100%
rename from swift/ql/test/extractor-tests/generated/type/OpenedArchetypeType/opened_archetypes.swift
rename to swift/ql/test/extractor-tests/generated/type/ExistentialArchetypeType/existential_archetypes.swift
diff --git a/swift/ql/test/extractor-tests/generated/type/InlineArrayType/InlineArrayType.expected b/swift/ql/test/extractor-tests/generated/type/InlineArrayType/InlineArrayType.expected
new file mode 100644
index 00000000000..65a8baa5beb
--- /dev/null
+++ b/swift/ql/test/extractor-tests/generated/type/InlineArrayType/InlineArrayType.expected
@@ -0,0 +1 @@
+| [42 of Int] | getName: | [42 of Int] | getCanonicalType: | InlineArray<42, Int> | getCountType: | 42 | getElementType: | Int |
diff --git a/swift/ql/test/extractor-tests/generated/type/InlineArrayType/InlineArrayType.ql b/swift/ql/test/extractor-tests/generated/type/InlineArrayType/InlineArrayType.ql
new file mode 100644
index 00000000000..6c2b0923d0a
--- /dev/null
+++ b/swift/ql/test/extractor-tests/generated/type/InlineArrayType/InlineArrayType.ql
@@ -0,0 +1,20 @@
+// generated by codegen/codegen.py, do not edit
+import codeql.swift.elements
+import TestUtils
+
+query predicate instances(
+  InlineArrayType x, string getName__label, string getName, string getCanonicalType__label,
+  Type getCanonicalType, string getCountType__label, Type getCountType,
+  string getElementType__label, Type getElementType
+) {
+  toBeTested(x) and
+  not x.isUnknown() and
+  getName__label = "getName:" and
+  getName = x.getName() and
+  getCanonicalType__label = "getCanonicalType:" and
+  getCanonicalType = x.getCanonicalType() and
+  getCountType__label = "getCountType:" and
+  getCountType = x.getCountType() and
+  getElementType__label = "getElementType:" and
+  getElementType = x.getElementType()
+}
diff --git a/swift/ql/test/extractor-tests/generated/type/InlineArrayType/inline_array.swift b/swift/ql/test/extractor-tests/generated/type/InlineArrayType/inline_array.swift
new file mode 100644
index 00000000000..804dd3f7d0b
--- /dev/null
+++ b/swift/ql/test/extractor-tests/generated/type/InlineArrayType/inline_array.swift
@@ -0,0 +1,5 @@
+struct Foo {
+    var x: [42 of Int]
+}
+
+//codeql-extractor-options: -disable-availability-checking
diff --git a/swift/ql/test/library-tests/ast/PrintAst.expected b/swift/ql/test/library-tests/ast/PrintAst.expected
index f0383c005c3..8cd6a4a5aff 100644
--- a/swift/ql/test/library-tests/ast/PrintAst.expected
+++ b/swift/ql/test/library-tests/ast/PrintAst.expected
@@ -222,7 +222,7 @@ cfg.swift:
 #   40|                           getFunction(): [MethodLookupExpr] .appendLiteral(_:)
 #   40|                             getBase(): [DeclRefExpr] $interpolation
 #   40|                             getBase().getFullyConverted(): [InOutExpr] &...
-#-----|                             getMethodRef(): [DeclRefExpr] appendLiteral(_:)
+#   40|                             getMethodRef(): [DeclRefExpr] appendLiteral(_:)
 #   40|                           getArgument(0): [Argument] : Unknown error 
 #   40|                             getExpr(): [StringLiteralExpr] Unknown error 
 #   40|                         getElement(1): [CallExpr] call to appendInterpolation(_:)
@@ -236,7 +236,7 @@ cfg.swift:
 #   40|                           getFunction(): [MethodLookupExpr] .appendLiteral(_:)
 #   40|                             getBase(): [DeclRefExpr] $interpolation
 #   40|                             getBase().getFullyConverted(): [InOutExpr] &...
-#-----|                             getMethodRef(): [DeclRefExpr] appendLiteral(_:)
+#   40|                             getMethodRef(): [DeclRefExpr] appendLiteral(_:)
 #   40|                           getArgument(0): [Argument] : 
 #   40|                             getExpr(): [StringLiteralExpr] 
 #   40|                   getElement(0).getFullyConverted(): [ErasureExpr] (Any) ...
@@ -717,13 +717,13 @@ cfg.swift:
 #  138|                 getExpr(): [IntegerLiteralExpr] 0
 #  138|               getArgument(1): [Argument] : 10
 #  138|                 getExpr(): [IntegerLiteralExpr] 10
-#-----|             getMethodRef(): [DeclRefExpr] makeIterator()
+#  138|             getMethodRef(): [DeclRefExpr] makeIterator()
 #  138|         getPattern(0): [NamedPattern] $generator
 #  138|       getNextCall(): [CallExpr] call to next()
 #  138|         getFunction(): [MethodLookupExpr] .next()
 #  138|           getBase(): [DeclRefExpr] $generator
 #  138|           getBase().getFullyConverted(): [InOutExpr] &...
-#-----|           getMethodRef(): [DeclRefExpr] next()
+#  138|           getMethodRef(): [DeclRefExpr] next()
 #  138|       getBody(): [BraceStmt] { ... }
 #  140|     getElement(1): [SwitchStmt] switch x { ... }
 #  140|       getExpr(): [DeclRefExpr] x
@@ -1462,7 +1462,7 @@ cfg.swift:
 #  263|               getFunction(): [MethodLookupExpr] .appendLiteral(_:)
 #  263|                 getBase(): [DeclRefExpr] $interpolation
 #  263|                 getBase().getFullyConverted(): [InOutExpr] &...
-#-----|                 getMethodRef(): [DeclRefExpr] appendLiteral(_:)
+#  263|                 getMethodRef(): [DeclRefExpr] appendLiteral(_:)
 #  263|               getArgument(0): [Argument] : 
 #  263|                 getExpr(): [StringLiteralExpr] 
 #  263|             getElement(1): [CallExpr] call to appendInterpolation(_:)
@@ -1476,7 +1476,7 @@ cfg.swift:
 #  263|               getFunction(): [MethodLookupExpr] .appendLiteral(_:)
 #  263|                 getBase(): [DeclRefExpr] $interpolation
 #  263|                 getBase().getFullyConverted(): [InOutExpr] &...
-#-----|                 getMethodRef(): [DeclRefExpr] appendLiteral(_:)
+#  263|                 getMethodRef(): [DeclRefExpr] appendLiteral(_:)
 #  263|               getArgument(0): [Argument] :  + 
 #  263|                 getExpr(): [StringLiteralExpr]  + 
 #  263|             getElement(3): [CallExpr] call to appendInterpolation(_:)
@@ -1490,7 +1490,7 @@ cfg.swift:
 #  263|               getFunction(): [MethodLookupExpr] .appendLiteral(_:)
 #  263|                 getBase(): [DeclRefExpr] $interpolation
 #  263|                 getBase().getFullyConverted(): [InOutExpr] &...
-#-----|                 getMethodRef(): [DeclRefExpr] appendLiteral(_:)
+#  263|                 getMethodRef(): [DeclRefExpr] appendLiteral(_:)
 #  263|               getArgument(0): [Argument] :  is equal to 
 #  263|                 getExpr(): [StringLiteralExpr]  is equal to 
 #  263|             getElement(5): [CallExpr] call to appendInterpolation(_:)
@@ -1512,7 +1512,7 @@ cfg.swift:
 #  263|               getFunction(): [MethodLookupExpr] .appendLiteral(_:)
 #  263|                 getBase(): [DeclRefExpr] $interpolation
 #  263|                 getBase().getFullyConverted(): [InOutExpr] &...
-#-----|                 getMethodRef(): [DeclRefExpr] appendLiteral(_:)
+#  263|                 getMethodRef(): [DeclRefExpr] appendLiteral(_:)
 #  263|               getArgument(0): [Argument] :  and here is a zero: 
 #  263|                 getExpr(): [StringLiteralExpr]  and here is a zero: 
 #  263|             getElement(7): [CallExpr] call to appendInterpolation(_:)
@@ -1527,7 +1527,7 @@ cfg.swift:
 #  263|               getFunction(): [MethodLookupExpr] .appendLiteral(_:)
 #  263|                 getBase(): [DeclRefExpr] $interpolation
 #  263|                 getBase().getFullyConverted(): [InOutExpr] &...
-#-----|                 getMethodRef(): [DeclRefExpr] appendLiteral(_:)
+#  263|                 getMethodRef(): [DeclRefExpr] appendLiteral(_:)
 #  263|               getArgument(0): [Argument] : 
 #  263|                 getExpr(): [StringLiteralExpr] 
 #  266| [NamedFunction] testSubscriptExpr()
@@ -3128,8 +3128,8 @@ cfg.swift:
 #  499|       getCondition(): [StmtCondition] StmtCondition
 #  499|         getElement(0): [ConditionElement] #available
 #  499|           getAvailability(): [AvailabilityInfo] #available
-#  499|             getSpec(0): [PlatformVersionAvailabilitySpec] macOS 10
-#  499|             getSpec(1): [OtherAvailabilitySpec] *
+#  499|             getSpec(0): [AvailabilitySpec] macOS 10
+#  499|             getSpec(1): [AvailabilitySpec] *
 #  499|       getThen(): [BraceStmt] { ... }
 #  500|         getElement(0): [BinaryExpr] ... .+=(_:_:) ...
 #  500|           getFunction(): [MethodLookupExpr] .+=(_:_:)
@@ -3145,8 +3145,8 @@ cfg.swift:
 #  503|       getCondition(): [StmtCondition] StmtCondition
 #  503|         getElement(0): [ConditionElement] #available
 #  503|           getAvailability(): [AvailabilityInfo] #available
-#  503|             getSpec(0): [PlatformVersionAvailabilitySpec] macOS 10.13
-#  503|             getSpec(1): [OtherAvailabilitySpec] *
+#  503|             getSpec(0): [AvailabilitySpec] macOS 10.13
+#  503|             getSpec(1): [AvailabilitySpec] *
 #  503|       getThen(): [BraceStmt] { ... }
 #  504|         getElement(0): [BinaryExpr] ... .+=(_:_:) ...
 #  504|           getFunction(): [MethodLookupExpr] .+=(_:_:)
@@ -3162,9 +3162,9 @@ cfg.swift:
 #  507|       getCondition(): [StmtCondition] StmtCondition
 #  507|         getElement(0): [ConditionElement] #unavailable
 #  507|           getAvailability(): [AvailabilityInfo] #unavailable
-#  507|             getSpec(0): [PlatformVersionAvailabilitySpec] iOS 10
-#  507|             getSpec(1): [PlatformVersionAvailabilitySpec] watchOS 10
-#  507|             getSpec(2): [PlatformVersionAvailabilitySpec] macOS 10
+#  507|             getSpec(0): [AvailabilitySpec] iOS 10
+#  507|             getSpec(1): [AvailabilitySpec] watchOS 10
+#  507|             getSpec(2): [AvailabilitySpec] macOS 10
 #  507|       getThen(): [BraceStmt] { ... }
 #  508|         getElement(0): [BinaryExpr] ... .+=(_:_:) ...
 #  508|           getFunction(): [MethodLookupExpr] .+=(_:_:)
@@ -3180,8 +3180,8 @@ cfg.swift:
 #  511|       getCondition(): [StmtCondition] StmtCondition
 #  511|         getElement(0): [ConditionElement] #available
 #  511|           getAvailability(): [AvailabilityInfo] #available
-#  511|             getSpec(0): [PlatformVersionAvailabilitySpec] macOS 12
-#  511|             getSpec(1): [OtherAvailabilitySpec] *
+#  511|             getSpec(0): [AvailabilitySpec] macOS 12
+#  511|             getSpec(1): [AvailabilitySpec] *
 #  511|       getBody(): [BraceStmt] { ... }
 #  512|         getElement(0): [BinaryExpr] ... .+=(_:_:) ...
 #  512|           getFunction(): [MethodLookupExpr] .+=(_:_:)
@@ -3197,12 +3197,12 @@ cfg.swift:
 #  515|       getCondition(): [StmtCondition] StmtCondition
 #  515|         getElement(0): [ConditionElement] #available
 #  515|           getAvailability(): [AvailabilityInfo] #available
-#  515|             getSpec(0): [PlatformVersionAvailabilitySpec] macOS 12
-#  515|             getSpec(1): [OtherAvailabilitySpec] *
+#  515|             getSpec(0): [AvailabilitySpec] macOS 12
+#  515|             getSpec(1): [AvailabilitySpec] *
 #  515|         getElement(1): [ConditionElement] #available
 #  515|           getAvailability(): [AvailabilityInfo] #available
-#  515|             getSpec(0): [PlatformVersionAvailabilitySpec] iOS 12
-#  515|             getSpec(1): [OtherAvailabilitySpec] *
+#  515|             getSpec(0): [AvailabilitySpec] iOS 12
+#  515|             getSpec(1): [AvailabilitySpec] *
 #  515|       getThen(): [BraceStmt] { ... }
 #  516|         getElement(0): [BinaryExpr] ... .+=(_:_:) ...
 #  516|           getFunction(): [MethodLookupExpr] .+=(_:_:)
@@ -3245,14 +3245,16 @@ cfg.swift:
 #  524|             getParam(0): [ParamDecl] continuation
 #  524|                 Type = AsyncStream<Int>.Continuation
 #  523|             getBody(): [BraceStmt] { ... }
-#  525|               getElement(0): [CallExpr] call to detached(priority:operation:)
-#  525|                 getFunction(): [MethodLookupExpr] .detached(priority:operation:)
+#  525|               getElement(0): [CallExpr] call to detached(name:priority:operation:)
+#  525|                 getFunction(): [MethodLookupExpr] .detached(name:priority:operation:)
 #  525|                   getBase(): [TypeExpr] Task<(), Never>.Type
 #  525|                     getTypeRepr(): [TypeRepr] Task<(), Never>
-#  525|                   getMethodRef(): [DeclRefExpr] detached(priority:operation:)
-#  525|                 getArgument(0): [Argument] priority: default priority
+#  525|                   getMethodRef(): [DeclRefExpr] detached(name:priority:operation:)
+#  525|                 getArgument(0): [Argument] name: default name
+#  525|                   getExpr(): [DefaultArgumentExpr] default name
+#  525|                 getArgument(1): [Argument] priority: default priority
 #  525|                   getExpr(): [DefaultArgumentExpr] default priority
-#  525|                 getArgument(1): [Argument] operation: { ... }
+#  525|                 getArgument(2): [Argument] operation: { ... }
 #  525|                   getExpr(): [ExplicitClosureExpr] { ... }
 #  525|                     getBody(): [BraceStmt] { ... }
 #  526|                       getElement(0): [ForEachStmt] for ... in ... { ... }
@@ -3273,13 +3275,13 @@ cfg.swift:
 #  526|                                   getExpr(): [IntegerLiteralExpr] 1
 #  526|                                 getArgument(1): [Argument] : 100
 #  526|                                   getExpr(): [IntegerLiteralExpr] 100
-#-----|                               getMethodRef(): [DeclRefExpr] makeIterator()
+#  526|                               getMethodRef(): [DeclRefExpr] makeIterator()
 #  526|                           getPattern(0): [NamedPattern] $i$generator
 #  526|                         getNextCall(): [CallExpr] call to next()
 #  526|                           getFunction(): [MethodLookupExpr] .next()
 #  526|                             getBase(): [DeclRefExpr] $i$generator
 #  526|                             getBase().getFullyConverted(): [InOutExpr] &...
-#-----|                             getMethodRef(): [DeclRefExpr] next()
+#  526|                             getMethodRef(): [DeclRefExpr] next()
 #  526|                         getBody(): [BraceStmt] { ... }
 #  527|                           getElement(0): [CallExpr] call to yield(_:)
 #  527|                             getFunction(): [MethodLookupExpr] .yield(_:)
@@ -3305,13 +3307,13 @@ cfg.swift:
 #  533|           getFunction(): [MethodLookupExpr] .makeAsyncIterator()
 #  533|             getBase(): [DeclRefExpr] stream
 #  533|             getBase().getFullyConverted(): [LoadExpr] (AsyncStream<Int>) ...
-#-----|             getMethodRef(): [DeclRefExpr] makeAsyncIterator()
+#  533|             getMethodRef(): [DeclRefExpr] makeAsyncIterator()
 #  533|         getPattern(0): [NamedPattern] $i$generator
 #  533|       getNextCall(): [CallExpr] call to next(isolation:)
 #  533|         getFunction(): [MethodLookupExpr] .next(isolation:)
 #  533|           getBase(): [DeclRefExpr] $i$generator
 #  533|           getBase().getFullyConverted(): [InOutExpr] &...
-#-----|           getMethodRef(): [DeclRefExpr] next(isolation:)
+#  533|           getMethodRef(): [DeclRefExpr] next(isolation:)
 #  533|         getArgument(0): [Argument] isolation: CurrentContextIsolationExpr
 #  533|           getExpr(): [CurrentContextIsolationExpr] CurrentContextIsolationExpr
 #  533|       getNextCall().getFullyConverted(): [AwaitExpr] await ...
@@ -3328,6 +3330,7 @@ cfg.swift:
 #  534|           getArgument(2): [Argument] terminator: default terminator
 #  534|             getExpr(): [DefaultArgumentExpr] default terminator
 #  525| [NilLiteralExpr] nil
+#  525| [NilLiteralExpr] nil
 #  533| [NilLiteralExpr] nil
 #  538| [NamedFunction] testNilCoalescing(x:)
 #  538|     InterfaceType = (Int?) -> Int
@@ -4568,7 +4571,7 @@ declarations.swift:
 #   81|         Type = Int
 #   81|     getParam(5): [ParamDecl] hasBoth
 #   81|         Type = Int
-#   89| [Comment] // A field can be marked as read-only by dirctly implementing
+#   89| [Comment] // A field can be marked as read-only by directly implementing
 #   89| 
 #   90| [Comment] // the getter between the braces.
 #   90| 
@@ -4819,7 +4822,7 @@ expressions.swift:
 #    7|               getFunction(): [MethodLookupExpr] .appendLiteral(_:)
 #    7|                 getBase(): [DeclRefExpr] $interpolation
 #    7|                 getBase().getFullyConverted(): [InOutExpr] &...
-#-----|                 getMethodRef(): [DeclRefExpr] appendLiteral(_:)
+#    7|                 getMethodRef(): [DeclRefExpr] appendLiteral(_:)
 #    7|               getArgument(0): [Argument] : hello 
 #    7|                 getExpr(): [StringLiteralExpr] hello 
 #    7|             getElement(1): [CallExpr] call to appendInterpolation(_:)
@@ -4833,7 +4836,7 @@ expressions.swift:
 #    7|               getFunction(): [MethodLookupExpr] .appendLiteral(_:)
 #    7|                 getBase(): [DeclRefExpr] $interpolation
 #    7|                 getBase().getFullyConverted(): [InOutExpr] &...
-#-----|                 getMethodRef(): [DeclRefExpr] appendLiteral(_:)
+#    7|                 getMethodRef(): [DeclRefExpr] appendLiteral(_:)
 #    7|               getArgument(0): [Argument] : 
 #    7|                 getExpr(): [StringLiteralExpr] 
 #    7|       getPattern(0): [NamedPattern] s1
@@ -7027,13 +7030,13 @@ statements.swift:
 #    2|                 getExpr(): [IntegerLiteralExpr] 1
 #    2|               getArgument(1): [Argument] : 5
 #    2|                 getExpr(): [IntegerLiteralExpr] 5
-#-----|             getMethodRef(): [DeclRefExpr] makeIterator()
+#    2|             getMethodRef(): [DeclRefExpr] makeIterator()
 #    2|         getPattern(0): [NamedPattern] $i$generator
 #    2|       getNextCall(): [CallExpr] call to next()
 #    2|         getFunction(): [MethodLookupExpr] .next()
 #    2|           getBase(): [DeclRefExpr] $i$generator
 #    2|           getBase().getFullyConverted(): [InOutExpr] &...
-#-----|           getMethodRef(): [DeclRefExpr] next()
+#    2|           getMethodRef(): [DeclRefExpr] next()
 #    2|       getBody(): [BraceStmt] { ... }
 #    3|         getElement(0): [IfStmt] if ... then { ... } else { ... }
 #    3|           getCondition(): [StmtCondition] StmtCondition
@@ -7471,13 +7474,13 @@ statements.swift:
 #   71|         getInit(0): [CallExpr] call to makeIterator()
 #   71|           getFunction(): [MethodLookupExpr] .makeIterator()
 #   71|             getBase(): [DeclRefExpr] numbers
-#-----|             getMethodRef(): [DeclRefExpr] makeIterator()
+#   71|             getMethodRef(): [DeclRefExpr] makeIterator()
 #   71|         getPattern(0): [NamedPattern] $number$generator
 #   71|       getNextCall(): [CallExpr] call to next()
 #   71|         getFunction(): [MethodLookupExpr] .next()
 #   71|           getBase(): [DeclRefExpr] $number$generator
 #   71|           getBase().getFullyConverted(): [InOutExpr] &...
-#-----|           getMethodRef(): [DeclRefExpr] next()
+#   71|           getMethodRef(): [DeclRefExpr] next()
 #   71|       getBody(): [BraceStmt] { ... }
 #   74| [StructDecl] HasModifyAccessorDecl
 #   75|   getMember(0): [PatternBindingDecl] var ... = ...
@@ -7559,8 +7562,8 @@ statements.swift:
 #   87|       getCondition(): [StmtCondition] StmtCondition
 #   87|         getElement(0): [ConditionElement] #available
 #   87|           getAvailability(): [AvailabilityInfo] #available
-#   87|             getSpec(0): [PlatformVersionAvailabilitySpec] macOS 155
-#   87|             getSpec(1): [OtherAvailabilitySpec] *
+#   87|             getSpec(0): [AvailabilitySpec] macOS 155
+#   87|             getSpec(1): [AvailabilitySpec] *
 #   87|       getThen(): [BraceStmt] { ... }
 #   88|         getElement(0): [CallExpr] call to print(_:separator:terminator:)
 #   88|           getFunction(): [DeclRefExpr] print(_:separator:terminator:)
@@ -7579,7 +7582,7 @@ statements.swift:
 #   91|       getCondition(): [StmtCondition] StmtCondition
 #   91|         getElement(0): [ConditionElement] #unavailable
 #   91|           getAvailability(): [AvailabilityInfo] #unavailable
-#   91|             getSpec(0): [PlatformVersionAvailabilitySpec] macOS 42
+#   91|             getSpec(0): [AvailabilitySpec] macOS 42
 #   91|       getThen(): [BraceStmt] { ... }
 #   92|         getElement(0): [CallExpr] call to print(_:separator:terminator:)
 #   92|           getFunction(): [DeclRefExpr] print(_:separator:terminator:)
diff --git a/swift/ql/test/library-tests/ast/declarations.swift b/swift/ql/test/library-tests/ast/declarations.swift
index 6a1503a95e5..c2e8a94bb97 100644
--- a/swift/ql/test/library-tests/ast/declarations.swift
+++ b/swift/ql/test/library-tests/ast/declarations.swift
@@ -86,7 +86,7 @@ struct HasPropertyAndObserver {
     }
   }
 
-  // A field can be marked as read-only by dirctly implementing
+  // A field can be marked as read-only by directly implementing
   // the getter between the braces.
   var readOnlyField1: Int {
     return 0
diff --git a/swift/ql/test/library-tests/controlflow/graph/Cfg.expected b/swift/ql/test/library-tests/controlflow/graph/Cfg.expected
index 06d3ffbbc11..8fc8c7808b1 100644
--- a/swift/ql/test/library-tests/controlflow/graph/Cfg.expected
+++ b/swift/ql/test/library-tests/controlflow/graph/Cfg.expected
@@ -124,14 +124,14 @@
 | cfg.swift:40:11:40:11 | "..." | cfg.swift:40:11:40:11 | (Any) ... |  |
 | cfg.swift:40:11:40:11 | (Any) ... | cfg.swift:40:11:40:11 | [...] |  |
 | cfg.swift:40:11:40:11 | OpaqueValueExpr | cfg.swift:40:12:40:12 | .appendLiteral(_:) |  |
-| cfg.swift:40:11:40:11 | Unknown error  | cfg.swift:40:12:40:11 | call to appendLiteral(_:) |  |
+| cfg.swift:40:11:40:11 | Unknown error  | cfg.swift:40:12:40:12 | call to appendLiteral(_:) |  |
 | cfg.swift:40:11:40:11 | [...] | cfg.swift:40:10:40:10 | default separator |  |
 | cfg.swift:40:11:40:11 | [...] | cfg.swift:40:11:40:11 | [...] |  |
 | cfg.swift:40:11:40:34 | TapExpr | cfg.swift:40:11:40:11 | "..." |  |
-| cfg.swift:40:12:40:11 | call to appendLiteral(_:) | cfg.swift:40:27:40:27 | .appendInterpolation(_:) |  |
 | cfg.swift:40:12:40:12 | $interpolation | cfg.swift:40:12:40:12 | &... |  |
 | cfg.swift:40:12:40:12 | &... | cfg.swift:40:11:40:11 | Unknown error  |  |
 | cfg.swift:40:12:40:12 | .appendLiteral(_:) | cfg.swift:40:12:40:12 | $interpolation |  |
+| cfg.swift:40:12:40:12 | call to appendLiteral(_:) | cfg.swift:40:27:40:27 | .appendInterpolation(_:) |  |
 | cfg.swift:40:27:40:27 | $interpolation | cfg.swift:40:27:40:27 | &... |  |
 | cfg.swift:40:27:40:27 | &... | cfg.swift:40:28:40:28 | error |  |
 | cfg.swift:40:27:40:27 | .appendInterpolation(_:) | cfg.swift:40:27:40:27 | $interpolation |  |
@@ -472,10 +472,10 @@
 | cfg.swift:138:3:138:22 | for ... in ... { ... } | cfg.swift:140:3:148:3 | switch x { ... } | empty |
 | cfg.swift:138:7:138:7 | _ | cfg.swift:138:19:138:22 | { ... } | match |
 | cfg.swift:138:12:138:12 | 0 | cfg.swift:138:16:138:16 | 10 |  |
-| cfg.swift:138:12:138:12 | $generator | cfg.swift:138:12:138:16 | .makeIterator() | match |
-| cfg.swift:138:12:138:16 | ... ....(_:_:) ... | cfg.swift:138:12:138:16 | call to makeIterator() |  |
-| cfg.swift:138:12:138:16 | .makeIterator() | cfg.swift:138:13:138:13 | ....(_:_:) |  |
-| cfg.swift:138:12:138:16 | call to makeIterator() | file://:0:0:0:0 | var ... = ... |  |
+| cfg.swift:138:12:138:12 | $generator | cfg.swift:138:12:138:12 | .makeIterator() | match |
+| cfg.swift:138:12:138:12 | .makeIterator() | cfg.swift:138:13:138:13 | ....(_:_:) |  |
+| cfg.swift:138:12:138:12 | call to makeIterator() | file://:0:0:0:0 | var ... = ... |  |
+| cfg.swift:138:12:138:16 | ... ....(_:_:) ... | cfg.swift:138:12:138:12 | call to makeIterator() |  |
 | cfg.swift:138:13:138:13 | ....(_:_:) | cfg.swift:138:13:138:13 | Int.Type |  |
 | cfg.swift:138:13:138:13 | Int.Type | cfg.swift:138:12:138:12 | 0 |  |
 | cfg.swift:138:16:138:16 | 10 | cfg.swift:138:12:138:16 | ... ....(_:_:) ... |  |
@@ -896,14 +896,14 @@
 | cfg.swift:262:25:262:29 | x | cfg.swift:262:34:262:38 | y |  |
 | cfg.swift:262:34:262:38 | y | cfg.swift:263:10:263:10 | OpaqueValueExpr |  |
 | cfg.swift:263:3:263:10 | return ... | cfg.swift:262:1:264:1 | exit interpolatedString(x:y:) (normal) | return |
-| cfg.swift:263:10:263:10 |  | cfg.swift:263:11:263:10 | call to appendLiteral(_:) |  |
+| cfg.swift:263:10:263:10 |  | cfg.swift:263:11:263:11 | call to appendLiteral(_:) |  |
 | cfg.swift:263:10:263:10 | "..." | cfg.swift:263:3:263:10 | return ... |  |
 | cfg.swift:263:10:263:10 | OpaqueValueExpr | cfg.swift:263:11:263:11 | .appendLiteral(_:) |  |
 | cfg.swift:263:10:263:79 | TapExpr | cfg.swift:263:10:263:10 | "..." |  |
-| cfg.swift:263:11:263:10 | call to appendLiteral(_:) | cfg.swift:263:12:263:12 | .appendInterpolation(_:) |  |
 | cfg.swift:263:11:263:11 | $interpolation | cfg.swift:263:11:263:11 | &... |  |
 | cfg.swift:263:11:263:11 | &... | cfg.swift:263:10:263:10 |  |  |
 | cfg.swift:263:11:263:11 | .appendLiteral(_:) | cfg.swift:263:11:263:11 | $interpolation |  |
+| cfg.swift:263:11:263:11 | call to appendLiteral(_:) | cfg.swift:263:12:263:12 | .appendInterpolation(_:) |  |
 | cfg.swift:263:12:263:12 | $interpolation | cfg.swift:263:12:263:12 | &... |  |
 | cfg.swift:263:12:263:12 | &... | cfg.swift:263:13:263:13 | x |  |
 | cfg.swift:263:12:263:12 | .appendInterpolation(_:) | cfg.swift:263:12:263:12 | $interpolation |  |
@@ -2002,12 +2002,13 @@
 | cfg.swift:523:78:531:5 | exit { ... } (normal) | cfg.swift:523:78:531:5 | exit { ... } |  |
 | cfg.swift:523:78:531:5 | { ... } | cfg.swift:523:18:531:6 | call to AsyncStream<Element>.init(_:bufferingPolicy:_:) |  |
 | cfg.swift:523:78:531:5 | { ... } | cfg.swift:524:9:524:9 | continuation |  |
-| cfg.swift:524:9:524:9 | continuation | cfg.swift:525:13:525:18 | .detached(priority:operation:) |  |
-| cfg.swift:525:13:525:13 | Task<(), Never>.Type | cfg.swift:525:27:525:27 | default priority |  |
-| cfg.swift:525:13:525:18 | .detached(priority:operation:) | cfg.swift:525:13:525:13 | Task<(), Never>.Type |  |
-| cfg.swift:525:13:530:13 | call to detached(priority:operation:) | cfg.swift:523:78:531:5 | exit { ... } (normal) |  |
+| cfg.swift:524:9:524:9 | continuation | cfg.swift:525:13:525:18 | .detached(name:priority:operation:) |  |
+| cfg.swift:525:13:525:13 | Task<(), Never>.Type | cfg.swift:525:27:525:27 | default name |  |
+| cfg.swift:525:13:525:18 | .detached(name:priority:operation:) | cfg.swift:525:13:525:13 | Task<(), Never>.Type |  |
+| cfg.swift:525:13:530:13 | call to detached(name:priority:operation:) | cfg.swift:523:78:531:5 | exit { ... } (normal) |  |
+| cfg.swift:525:27:525:27 | default name | cfg.swift:525:27:525:27 | default priority |  |
 | cfg.swift:525:27:525:27 | default priority | cfg.swift:525:27:530:13 | { ... } |  |
-| cfg.swift:525:27:530:13 | (@isolated(any) () async -> ()) ... | cfg.swift:525:13:530:13 | call to detached(priority:operation:) |  |
+| cfg.swift:525:27:530:13 | (@isolated(any) () async -> ()) ... | cfg.swift:525:13:530:13 | call to detached(name:priority:operation:) |  |
 | cfg.swift:525:27:530:13 | enter { ... } | cfg.swift:525:27:530:13 | { ... } |  |
 | cfg.swift:525:27:530:13 | exit { ... } (normal) | cfg.swift:525:27:530:13 | exit { ... } |  |
 | cfg.swift:525:27:530:13 | { ... } | cfg.swift:525:27:530:13 | (@isolated(any) () async -> ()) ... |  |
@@ -2020,10 +2021,10 @@
 | cfg.swift:526:17:528:17 | for ... in ... { ... } | cfg.swift:529:17:529:30 | .finish() | empty |
 | cfg.swift:526:21:526:21 | i | cfg.swift:527:21:527:34 | .yield(_:) | match |
 | cfg.swift:526:26:526:26 | 1 | cfg.swift:526:30:526:30 | 100 |  |
-| cfg.swift:526:26:526:26 | $i$generator | cfg.swift:526:26:526:30 | .makeIterator() | match |
-| cfg.swift:526:26:526:30 | ... ....(_:_:) ... | cfg.swift:526:26:526:30 | call to makeIterator() |  |
-| cfg.swift:526:26:526:30 | .makeIterator() | cfg.swift:526:27:526:27 | ....(_:_:) |  |
-| cfg.swift:526:26:526:30 | call to makeIterator() | file://:0:0:0:0 | var ... = ... |  |
+| cfg.swift:526:26:526:26 | $i$generator | cfg.swift:526:26:526:26 | .makeIterator() | match |
+| cfg.swift:526:26:526:26 | .makeIterator() | cfg.swift:526:27:526:27 | ....(_:_:) |  |
+| cfg.swift:526:26:526:26 | call to makeIterator() | file://:0:0:0:0 | var ... = ... |  |
+| cfg.swift:526:26:526:30 | ... ....(_:_:) ... | cfg.swift:526:26:526:26 | call to makeIterator() |  |
 | cfg.swift:526:27:526:27 | ....(_:_:) | cfg.swift:526:27:526:27 | Int.Type |  |
 | cfg.swift:526:27:526:27 | Int.Type | cfg.swift:526:26:526:26 | 1 |  |
 | cfg.swift:526:30:526:30 | 100 | cfg.swift:526:26:526:30 | ... ....(_:_:) ... |  |
diff --git a/swift/ql/test/library-tests/dataflow/dataflow/DataFlow.expected b/swift/ql/test/library-tests/dataflow/dataflow/DataFlow.expected
index 7ab18dcf818..d3a762848c1 100644
--- a/swift/ql/test/library-tests/dataflow/dataflow/DataFlow.expected
+++ b/swift/ql/test/library-tests/dataflow/dataflow/DataFlow.expected
@@ -150,8 +150,8 @@ edges
 | test2.swift:84:9:84:15 | (...) [Tuple element at index 1] | test2.swift:84:14:84:14 | v | provenance |  |
 | test2.swift:84:14:84:14 | v | test2.swift:86:19:86:19 | v | provenance |  |
 | test2.swift:84:20:84:20 | a1 [Collection element] | test2.swift:84:20:84:34 | call to enumerated() [Collection element, Tuple element at index 1] | provenance |  |
-| test2.swift:84:20:84:34 | call to enumerated() [Collection element, Tuple element at index 1] | test2.swift:84:20:84:34 | call to makeIterator() [Collection element, Tuple element at index 1] | provenance |  |
-| test2.swift:84:20:84:34 | call to makeIterator() [Collection element, Tuple element at index 1] | test2.swift:84:5:84:5 | $generator [Collection element, Tuple element at index 1] | provenance |  |
+| test2.swift:84:20:84:20 | call to makeIterator() [Collection element, Tuple element at index 1] | test2.swift:84:5:84:5 | $generator [Collection element, Tuple element at index 1] | provenance |  |
+| test2.swift:84:20:84:34 | call to enumerated() [Collection element, Tuple element at index 1] | test2.swift:84:20:84:20 | call to makeIterator() [Collection element, Tuple element at index 1] | provenance |  |
 | test2.swift:93:5:93:5 | [post] a2 [Collection element] | test2.swift:95:14:95:14 | a2 [Collection element] | provenance |  |
 | test2.swift:93:5:93:5 | [post] a2 [Collection element] | test2.swift:99:19:99:19 | a2 [Collection element] | provenance |  |
 | test2.swift:93:5:93:5 | [post] a2 [Collection element] | test2.swift:101:20:101:20 | a2 [Collection element] | provenance |  |
@@ -167,8 +167,8 @@ edges
 | test2.swift:101:9:101:15 | (...) [Tuple element at index 1] | test2.swift:101:14:101:14 | v | provenance |  |
 | test2.swift:101:14:101:14 | v | test2.swift:103:19:103:19 | v | provenance |  |
 | test2.swift:101:20:101:20 | a2 [Collection element] | test2.swift:101:20:101:34 | call to enumerated() [Collection element, Tuple element at index 1] | provenance |  |
-| test2.swift:101:20:101:34 | call to enumerated() [Collection element, Tuple element at index 1] | test2.swift:101:20:101:34 | call to makeIterator() [Collection element, Tuple element at index 1] | provenance |  |
-| test2.swift:101:20:101:34 | call to makeIterator() [Collection element, Tuple element at index 1] | test2.swift:101:5:101:5 | $generator [Collection element, Tuple element at index 1] | provenance |  |
+| test2.swift:101:20:101:20 | call to makeIterator() [Collection element, Tuple element at index 1] | test2.swift:101:5:101:5 | $generator [Collection element, Tuple element at index 1] | provenance |  |
+| test2.swift:101:20:101:34 | call to enumerated() [Collection element, Tuple element at index 1] | test2.swift:101:20:101:20 | call to makeIterator() [Collection element, Tuple element at index 1] | provenance |  |
 | test.swift:6:19:6:26 | call to source() | test.swift:7:15:7:15 | t1 | provenance |  |
 | test.swift:6:19:6:26 | call to source() | test.swift:9:15:9:15 | t1 | provenance |  |
 | test.swift:6:19:6:26 | call to source() | test.swift:10:15:10:15 | t2 | provenance |  |
@@ -940,8 +940,8 @@ nodes
 | test2.swift:84:9:84:15 | (...) [Tuple element at index 1] | semmle.label | (...) [Tuple element at index 1] |
 | test2.swift:84:14:84:14 | v | semmle.label | v |
 | test2.swift:84:20:84:20 | a1 [Collection element] | semmle.label | a1 [Collection element] |
+| test2.swift:84:20:84:20 | call to makeIterator() [Collection element, Tuple element at index 1] | semmle.label | call to makeIterator() [Collection element, Tuple element at index 1] |
 | test2.swift:84:20:84:34 | call to enumerated() [Collection element, Tuple element at index 1] | semmle.label | call to enumerated() [Collection element, Tuple element at index 1] |
-| test2.swift:84:20:84:34 | call to makeIterator() [Collection element, Tuple element at index 1] | semmle.label | call to makeIterator() [Collection element, Tuple element at index 1] |
 | test2.swift:86:19:86:19 | v | semmle.label | v |
 | test2.swift:93:5:93:5 | [post] a2 [Collection element] | semmle.label | [post] a2 [Collection element] |
 | test2.swift:93:13:93:29 | call to source(_:) | semmle.label | call to source(_:) |
@@ -958,8 +958,8 @@ nodes
 | test2.swift:101:9:101:15 | (...) [Tuple element at index 1] | semmle.label | (...) [Tuple element at index 1] |
 | test2.swift:101:14:101:14 | v | semmle.label | v |
 | test2.swift:101:20:101:20 | a2 [Collection element] | semmle.label | a2 [Collection element] |
+| test2.swift:101:20:101:20 | call to makeIterator() [Collection element, Tuple element at index 1] | semmle.label | call to makeIterator() [Collection element, Tuple element at index 1] |
 | test2.swift:101:20:101:34 | call to enumerated() [Collection element, Tuple element at index 1] | semmle.label | call to enumerated() [Collection element, Tuple element at index 1] |
-| test2.swift:101:20:101:34 | call to makeIterator() [Collection element, Tuple element at index 1] | semmle.label | call to makeIterator() [Collection element, Tuple element at index 1] |
 | test2.swift:103:19:103:19 | v | semmle.label | v |
 | test.swift:6:19:6:26 | call to source() | semmle.label | call to source() |
 | test.swift:7:15:7:15 | t1 | semmle.label | t1 |
diff --git a/swift/ql/test/library-tests/dataflow/dataflow/LocalFlow.expected b/swift/ql/test/library-tests/dataflow/dataflow/LocalFlow.expected
index 2e1c6b04fd9..ca440ca10fe 100644
--- a/swift/ql/test/library-tests/dataflow/dataflow/LocalFlow.expected
+++ b/swift/ql/test/library-tests/dataflow/dataflow/LocalFlow.expected
@@ -37,9 +37,9 @@
 | test2.swift:18:16:18:16 | SSA def($key$generator) | test2.swift:18:5:18:5 | $key$generator |
 | test2.swift:18:16:18:16 | [post] d1 | test2.swift:20:19:20:19 | d1 |
 | test2.swift:18:16:18:16 | [post] d1 | test2.swift:22:18:22:18 | d1 |
+| test2.swift:18:16:18:16 | call to makeIterator() | test2.swift:18:16:18:16 | $key$generator |
 | test2.swift:18:16:18:16 | d1 | test2.swift:20:19:20:19 | d1 |
 | test2.swift:18:16:18:16 | d1 | test2.swift:22:18:22:18 | d1 |
-| test2.swift:18:16:18:19 | call to makeIterator() | test2.swift:18:16:18:16 | $key$generator |
 | test2.swift:19:19:19:19 | [post] key | test2.swift:20:22:20:22 | key |
 | test2.swift:19:19:19:19 | key | test2.swift:20:22:20:22 | key |
 | test2.swift:20:19:20:19 | [post] d1 | test2.swift:20:19:20:19 | d1 |
@@ -55,8 +55,8 @@
 | test2.swift:22:18:22:18 | $value$generator | test2.swift:22:18:22:18 | SSA def($value$generator) |
 | test2.swift:22:18:22:18 | SSA def($value$generator) | test2.swift:22:5:22:5 | $value$generator |
 | test2.swift:22:18:22:18 | [post] d1 | test2.swift:25:25:25:25 | d1 |
+| test2.swift:22:18:22:18 | call to makeIterator() | test2.swift:22:18:22:18 | $value$generator |
 | test2.swift:22:18:22:18 | d1 | test2.swift:25:25:25:25 | d1 |
-| test2.swift:22:18:22:21 | call to makeIterator() | test2.swift:22:18:22:18 | $value$generator |
 | test2.swift:25:5:25:5 | $generator | test2.swift:25:5:25:5 | &... |
 | test2.swift:25:5:25:5 | &... | test2.swift:25:5:25:5 | $generator |
 | test2.swift:25:5:25:5 | [post] $generator | test2.swift:25:5:25:5 | &... |
@@ -131,9 +131,9 @@
 | test2.swift:62:16:62:16 | SSA def($key$generator) | test2.swift:62:5:62:5 | $key$generator |
 | test2.swift:62:16:62:16 | [post] d4 | test2.swift:64:19:64:19 | d4 |
 | test2.swift:62:16:62:16 | [post] d4 | test2.swift:66:18:66:18 | d4 |
+| test2.swift:62:16:62:16 | call to makeIterator() | test2.swift:62:16:62:16 | $key$generator |
 | test2.swift:62:16:62:16 | d4 | test2.swift:64:19:64:19 | d4 |
 | test2.swift:62:16:62:16 | d4 | test2.swift:66:18:66:18 | d4 |
-| test2.swift:62:16:62:19 | call to makeIterator() | test2.swift:62:16:62:16 | $key$generator |
 | test2.swift:63:19:63:19 | [post] key | test2.swift:64:22:64:22 | key |
 | test2.swift:63:19:63:19 | key | test2.swift:64:22:64:22 | key |
 | test2.swift:64:19:64:19 | &... | test2.swift:64:19:64:19 | d4 |
@@ -149,8 +149,8 @@
 | test2.swift:66:18:66:18 | $value$generator | test2.swift:66:18:66:18 | SSA def($value$generator) |
 | test2.swift:66:18:66:18 | SSA def($value$generator) | test2.swift:66:5:66:5 | $value$generator |
 | test2.swift:66:18:66:18 | [post] d4 | test2.swift:69:25:69:25 | d4 |
+| test2.swift:66:18:66:18 | call to makeIterator() | test2.swift:66:18:66:18 | $value$generator |
 | test2.swift:66:18:66:18 | d4 | test2.swift:69:25:69:25 | d4 |
-| test2.swift:66:18:66:21 | call to makeIterator() | test2.swift:66:18:66:18 | $value$generator |
 | test2.swift:69:5:69:5 | $generator | test2.swift:69:5:69:5 | &... |
 | test2.swift:69:5:69:5 | &... | test2.swift:69:5:69:5 | $generator |
 | test2.swift:69:5:69:5 | [post] $generator | test2.swift:69:5:69:5 | &... |
@@ -181,7 +181,7 @@
 | test2.swift:81:9:81:9 | ix | test2.swift:81:9:81:9 | SSA def(ix) |
 | test2.swift:81:15:81:15 | $ix$generator | test2.swift:81:15:81:15 | SSA def($ix$generator) |
 | test2.swift:81:15:81:15 | SSA def($ix$generator) | test2.swift:81:5:81:5 | $ix$generator |
-| test2.swift:81:15:81:24 | call to makeIterator() | test2.swift:81:15:81:15 | $ix$generator |
+| test2.swift:81:15:81:15 | call to makeIterator() | test2.swift:81:15:81:15 | $ix$generator |
 | test2.swift:81:21:81:21 | [post] a1 | test2.swift:82:19:82:19 | a1 |
 | test2.swift:81:21:81:21 | [post] a1 | test2.swift:84:20:84:20 | a1 |
 | test2.swift:81:21:81:21 | a1 | test2.swift:82:19:82:19 | a1 |
@@ -199,7 +199,7 @@
 | test2.swift:84:14:84:14 | v | test2.swift:84:14:84:14 | SSA def(v) |
 | test2.swift:84:20:84:20 | $generator | test2.swift:84:20:84:20 | SSA def($generator) |
 | test2.swift:84:20:84:20 | SSA def($generator) | test2.swift:84:5:84:5 | $generator |
-| test2.swift:84:20:84:34 | call to makeIterator() | test2.swift:84:20:84:20 | $generator |
+| test2.swift:84:20:84:20 | call to makeIterator() | test2.swift:84:20:84:20 | $generator |
 | test2.swift:91:9:91:9 | SSA def(a2) | test2.swift:93:5:93:5 | a2 |
 | test2.swift:91:9:91:9 | a2 | test2.swift:91:9:91:9 | SSA def(a2) |
 | test2.swift:91:14:91:33 | [...] | test2.swift:91:9:91:9 | a2 |
@@ -223,7 +223,7 @@
 | test2.swift:98:9:98:9 | ix | test2.swift:98:9:98:9 | SSA def(ix) |
 | test2.swift:98:15:98:15 | $ix$generator | test2.swift:98:15:98:15 | SSA def($ix$generator) |
 | test2.swift:98:15:98:15 | SSA def($ix$generator) | test2.swift:98:5:98:5 | $ix$generator |
-| test2.swift:98:15:98:24 | call to makeIterator() | test2.swift:98:15:98:15 | $ix$generator |
+| test2.swift:98:15:98:15 | call to makeIterator() | test2.swift:98:15:98:15 | $ix$generator |
 | test2.swift:98:21:98:21 | [post] a2 | test2.swift:99:19:99:19 | a2 |
 | test2.swift:98:21:98:21 | [post] a2 | test2.swift:101:20:101:20 | a2 |
 | test2.swift:98:21:98:21 | a2 | test2.swift:99:19:99:19 | a2 |
@@ -241,7 +241,7 @@
 | test2.swift:101:14:101:14 | v | test2.swift:101:14:101:14 | SSA def(v) |
 | test2.swift:101:20:101:20 | $generator | test2.swift:101:20:101:20 | SSA def($generator) |
 | test2.swift:101:20:101:20 | SSA def($generator) | test2.swift:101:5:101:5 | $generator |
-| test2.swift:101:20:101:34 | call to makeIterator() | test2.swift:101:20:101:20 | $generator |
+| test2.swift:101:20:101:20 | call to makeIterator() | test2.swift:101:20:101:20 | $generator |
 | test.swift:5:9:5:13 | ... as ... | test.swift:5:9:5:9 | t2 |
 | test.swift:6:9:6:9 | SSA def(t1) | test.swift:7:15:7:15 | t1 |
 | test.swift:6:9:6:9 | t1 | test.swift:6:9:6:9 | SSA def(t1) |
@@ -1388,7 +1388,7 @@
 | test.swift:891:17:891:17 | [post] $generator | test.swift:891:17:891:17 | &... |
 | test.swift:891:26:891:26 | $generator | test.swift:891:26:891:26 | SSA def($generator) |
 | test.swift:891:26:891:26 | SSA def($generator) | test.swift:891:17:891:17 | $generator |
-| test.swift:891:26:891:30 | call to makeIterator() | test.swift:891:26:891:26 | $generator |
+| test.swift:891:26:891:26 | call to makeIterator() | test.swift:891:26:891:26 | $generator |
 | test.swift:892:21:892:21 | this | test.swift:891:17:891:17 | SSA phi read(this) |
 | test.swift:892:21:892:21 | this | test.swift:891:17:891:17 | SSA phi read(this) |
 | test.swift:898:5:898:5 | $i$generator | test.swift:898:5:898:5 | &... |
diff --git a/swift/ql/test/library-tests/elements/KeyPathComponent/KindAccessors.expected b/swift/ql/test/library-tests/elements/KeyPathComponent/KindAccessors.expected
index 683702221c8..76a5b3c8cad 100644
--- a/swift/ql/test/library-tests/elements/KeyPathComponent/KindAccessors.expected
+++ b/swift/ql/test/library-tests/elements/KeyPathComponent/KindAccessors.expected
@@ -1,14 +1,14 @@
-| file://:0:0:0:0 | KeyPathComponent | getKind: | 7 |  |  |  |  | optional wrapping |  |  |
-| key_path_expr.swift:11:17:11:17 | KeyPathComponent | getKind: | 3 | property |  |  |  |  |  |  |
-| key_path_expr.swift:12:24:12:26 | KeyPathComponent | getKind: | 4 |  | subscript |  |  |  |  |  |
-| key_path_expr.swift:13:34:13:38 | KeyPathComponent | getKind: | 4 |  | subscript |  |  |  |  |  |
-| key_path_expr.swift:14:31:14:31 | KeyPathComponent | getKind: | 5 |  |  | optional forcing |  |  |  |  |
-| key_path_expr.swift:14:31:14:31 | KeyPathComponent | getKind: | 8 |  |  |  |  |  | self |  |
-| key_path_expr.swift:15:21:15:21 | KeyPathComponent | getKind: | 3 | property |  |  |  |  |  |  |
-| key_path_expr.swift:15:24:15:24 | KeyPathComponent | getKind: | 6 |  |  |  | optional chaining |  |  |  |
-| key_path_expr.swift:15:26:15:26 | KeyPathComponent | getKind: | 3 | property |  |  |  |  |  |  |
-| key_path_expr.swift:16:25:16:25 | KeyPathComponent | getKind: | 3 | property |  |  |  |  |  |  |
-| key_path_expr.swift:16:28:16:28 | KeyPathComponent | getKind: | 6 |  |  |  | optional chaining |  |  |  |
-| key_path_expr.swift:16:30:16:30 | KeyPathComponent | getKind: | 3 | property |  |  |  |  |  |  |
-| key_path_expr.swift:17:16:17:16 | KeyPathComponent | getKind: | 8 |  |  |  |  |  | self |  |
-| key_path_expr.swift:18:32:18:32 | KeyPathComponent | getKind: | 9 |  |  |  |  |  |  | tuple indexing |
+| file://:0:0:0:0 | KeyPathComponent | getKind: | 9 |  |  |  |  |  | optional wrapping |  |  |
+| key_path_expr.swift:11:17:11:17 | KeyPathComponent | getKind: | 5 |  | property |  |  |  |  |  |  |
+| key_path_expr.swift:12:24:12:26 | KeyPathComponent | getKind: | 6 |  |  | subscript |  |  |  |  |  |
+| key_path_expr.swift:13:34:13:38 | KeyPathComponent | getKind: | 6 |  |  | subscript |  |  |  |  |  |
+| key_path_expr.swift:14:31:14:31 | KeyPathComponent | getKind: | 7 |  |  |  | optional forcing |  |  |  |  |
+| key_path_expr.swift:14:31:14:31 | KeyPathComponent | getKind: | 10 |  |  |  |  |  |  | self |  |
+| key_path_expr.swift:15:21:15:21 | KeyPathComponent | getKind: | 5 |  | property |  |  |  |  |  |  |
+| key_path_expr.swift:15:24:15:24 | KeyPathComponent | getKind: | 8 |  |  |  |  | optional chaining |  |  |  |
+| key_path_expr.swift:15:26:15:26 | KeyPathComponent | getKind: | 5 |  | property |  |  |  |  |  |  |
+| key_path_expr.swift:16:25:16:25 | KeyPathComponent | getKind: | 5 |  | property |  |  |  |  |  |  |
+| key_path_expr.swift:16:28:16:28 | KeyPathComponent | getKind: | 8 |  |  |  |  | optional chaining |  |  |  |
+| key_path_expr.swift:16:30:16:30 | KeyPathComponent | getKind: | 5 |  | property |  |  |  |  |  |  |
+| key_path_expr.swift:17:16:17:16 | KeyPathComponent | getKind: | 10 |  |  |  |  |  |  | self |  |
+| key_path_expr.swift:18:32:18:32 | KeyPathComponent | getKind: | 11 |  |  |  |  |  |  |  | tuple indexing |
diff --git a/swift/ql/test/library-tests/elements/KeyPathComponent/KindAccessors.ql b/swift/ql/test/library-tests/elements/KeyPathComponent/KindAccessors.ql
index dc347a97287..f71806f0789 100644
--- a/swift/ql/test/library-tests/elements/KeyPathComponent/KindAccessors.ql
+++ b/swift/ql/test/library-tests/elements/KeyPathComponent/KindAccessors.ql
@@ -2,11 +2,12 @@ import codeql.swift.elements
 import TestUtils
 
 from
-  KeyPathComponent x, string property, string subscript, string opt_forcing, string opt_chaining,
-  string opt_wrapping, string self, string tuple_indexing
+  KeyPathComponent x, string apply, string property, string subscript, string opt_forcing,
+  string opt_chaining, string opt_wrapping, string self, string tuple_indexing
 where
   toBeTested(x) and
   not x.isUnknown() and
+  (if x.isApply() then apply = "apply" else apply = "") and
   (if x.isProperty() then property = "property" else property = "") and
   (if x.isSubscript() then subscript = "subscript" else subscript = "") and
   (if x.isOptionalForcing() then opt_forcing = "optional forcing" else opt_forcing = "") and
@@ -14,5 +15,5 @@ where
   (if x.isOptionalWrapping() then opt_wrapping = "optional wrapping" else opt_wrapping = "") and
   (if x.isSelf() then self = "self" else self = "") and
   if x.isTupleIndexing() then tuple_indexing = "tuple indexing" else tuple_indexing = ""
-select x, "getKind:", x.getKind(), property, subscript, opt_forcing, opt_chaining, opt_wrapping,
-  self, tuple_indexing
+select x, "getKind:", x.getKind(), apply, property, subscript, opt_forcing, opt_chaining,
+  opt_wrapping, self, tuple_indexing
diff --git a/swift/ql/test/library-tests/elements/expr/methodlookup/PrintAst.expected b/swift/ql/test/library-tests/elements/expr/methodlookup/PrintAst.expected
index f0d85be52b6..04aa84a80f6 100644
--- a/swift/ql/test/library-tests/elements/expr/methodlookup/PrintAst.expected
+++ b/swift/ql/test/library-tests/elements/expr/methodlookup/PrintAst.expected
@@ -151,14 +151,16 @@ methodlookup.swift:
 #   30|             getMethodRef(): [DeclRefExpr] staticMethod()
 #   33| [TopLevelCodeDecl] { ... }
 #   33|   getBody(): [BraceStmt] { ... }
-#   33|     getElement(0): [CallExpr] call to Task<Success, Never>.init(priority:operation:)
-#   33|       getFunction(): [MethodLookupExpr] Task<Success, Never>.init(priority:operation:)
+#   33|     getElement(0): [CallExpr] call to Task<Success, Never>.init(name:priority:operation:)
+#   33|       getFunction(): [MethodLookupExpr] Task<Success, Never>.init(name:priority:operation:)
 #   33|         getBase(): [TypeExpr] Task<(), Never>.Type
 #   33|           getTypeRepr(): [TypeRepr] Task<(), Never>
-#   33|         getMethodRef(): [DeclRefExpr] Task<Success, Never>.init(priority:operation:)
-#   33|       getArgument(0): [Argument] priority: default priority
+#   33|         getMethodRef(): [DeclRefExpr] Task<Success, Never>.init(name:priority:operation:)
+#   33|       getArgument(0): [Argument] name: default name
+#   33|         getExpr(): [DefaultArgumentExpr] default name
+#   33|       getArgument(1): [Argument] priority: default priority
 #   33|         getExpr(): [DefaultArgumentExpr] default priority
-#   33|       getArgument(1): [Argument] operation: { ... }
+#   33|       getArgument(2): [Argument] operation: { ... }
 #   33|         getExpr(): [ExplicitClosureExpr] { ... }
 #   33|           getBody(): [BraceStmt] { ... }
 #   34|             getVariable(0): [ConcreteVarDecl] bar
@@ -189,18 +191,21 @@ methodlookup.swift:
 #   40|                 getMethodRef(): [DeclRefExpr] staticMethod()
 #   33|         getExpr().getFullyConverted(): [FunctionConversionExpr] (@isolated(any) () async -> ()) ...
 #   33| [NilLiteralExpr] nil
+#   33| [NilLiteralExpr] nil
 #   38| [Comment] // Bar.instanceMethod(bar2)() // error: actor-isolated instance method 'instanceMethod()' can not be referenced from a non-isolated context
 #   38| 
 #   43| [TopLevelCodeDecl] { ... }
 #   43|   getBody(): [BraceStmt] { ... }
-#   43|     getElement(0): [CallExpr] call to Task<Success, Never>.init(priority:operation:)
-#   43|       getFunction(): [MethodLookupExpr] Task<Success, Never>.init(priority:operation:)
+#   43|     getElement(0): [CallExpr] call to Task<Success, Never>.init(name:priority:operation:)
+#   43|       getFunction(): [MethodLookupExpr] Task<Success, Never>.init(name:priority:operation:)
 #   43|         getBase(): [TypeExpr] Task<(), Never>.Type
 #   43|           getTypeRepr(): [TypeRepr] Task<(), Never>
-#   43|         getMethodRef(): [DeclRefExpr] Task<Success, Never>.init(priority:operation:)
-#   43|       getArgument(0): [Argument] priority: default priority
+#   43|         getMethodRef(): [DeclRefExpr] Task<Success, Never>.init(name:priority:operation:)
+#   43|       getArgument(0): [Argument] name: default name
+#   43|         getExpr(): [DefaultArgumentExpr] default name
+#   43|       getArgument(1): [Argument] priority: default priority
 #   43|         getExpr(): [DefaultArgumentExpr] default priority
-#   43|       getArgument(1): [Argument] operation: { ... }
+#   43|       getArgument(2): [Argument] operation: { ... }
 #   43|         getExpr(): [ExplicitClosureExpr] { ... }
 #   43|           getBody(): [BraceStmt] { ... }
 #   44|             getVariable(0): [ConcreteVarDecl] baz
@@ -265,6 +270,7 @@ methodlookup.swift:
 #   51|             getElement(5).getFullyConverted(): [AwaitExpr] await ...
 #   43|         getExpr().getFullyConverted(): [FunctionConversionExpr] (@isolated(any) () async -> ()) ...
 #   43| [NilLiteralExpr] nil
+#   43| [NilLiteralExpr] nil
 #   47| [Comment] // DotSyntaxCallExpr
 #   47| 
 #   48| [Comment] // DotSyntaxBaseIgnoredExpr
diff --git a/swift/ql/test/library-tests/elements/expr/methodlookup/getStaticTarget.expected b/swift/ql/test/library-tests/elements/expr/methodlookup/getStaticTarget.expected
index bdab840b30a..2834b35799a 100644
--- a/swift/ql/test/library-tests/elements/expr/methodlookup/getStaticTarget.expected
+++ b/swift/ql/test/library-tests/elements/expr/methodlookup/getStaticTarget.expected
@@ -10,12 +10,12 @@ noStaticTarget
 | methodlookup.swift:27:9:27:9 | call to instanceMethod() | true |
 | methodlookup.swift:29:5:29:21 | call to classMethod() | true |
 | methodlookup.swift:30:5:30:22 | call to staticMethod() | true |
-| methodlookup.swift:33:1:41:1 | call to Task<Success, Never>.init(priority:operation:) | true |
+| methodlookup.swift:33:1:41:1 | call to Task<Success, Never>.init(name:priority:operation:) | true |
 | methodlookup.swift:34:15:34:19 | call to Bar.init() | true |
 | methodlookup.swift:35:9:35:18 | call to Bar.init() | true |
 | methodlookup.swift:37:11:37:30 | call to instanceMethod() | true |
 | methodlookup.swift:40:5:40:22 | call to staticMethod() | true |
-| methodlookup.swift:43:1:52:1 | call to Task<Success, Never>.init(priority:operation:) | true |
+| methodlookup.swift:43:1:52:1 | call to Task<Success, Never>.init(name:priority:operation:) | true |
 | methodlookup.swift:44:21:44:25 | call to Baz.init() | true |
 | methodlookup.swift:45:15:45:24 | call to Baz.init() | true |
 | methodlookup.swift:47:11:47:30 | call to instanceMethod() | true |
diff --git a/swift/ql/test/library-tests/elements/type/nominaltype/nominaltype.expected b/swift/ql/test/library-tests/elements/type/nominaltype/nominaltype.expected
index a52075ab00e..5f985ac0bbc 100644
--- a/swift/ql/test/library-tests/elements/type/nominaltype/nominaltype.expected
+++ b/swift/ql/test/library-tests/elements/type/nominaltype/nominaltype.expected
@@ -1,4 +1,4 @@
-| nominaltype.swift:84:6:84:6 | i | Int | getABaseType:BitwiseCopyable, getABaseType:CVarArg, getABaseType:CodingKeyRepresentable, getABaseType:CustomReflectable, getABaseType:Decodable, getABaseType:Encodable, getABaseType:Equatable, getABaseType:FixedWidthInteger, getABaseType:Hashable, getABaseType:MirrorPath, getABaseType:SIMDScalar, getABaseType:Sendable, getABaseType:SignedInteger, getABaseType:_CustomPlaygroundQuickLookable, getABaseType:_ExpressibleByBuiltinIntegerLiteral, getABaseType:_HasCustomAnyHashableRepresentation, getCanonicalType:Int, getFullName:Int, getName:Int, getUnderlyingType:Int |
+| nominaltype.swift:84:6:84:6 | i | Int | getABaseType:BitwiseCopyable, getABaseType:CVarArg, getABaseType:CodingKeyRepresentable, getABaseType:CustomReflectable, getABaseType:Decodable, getABaseType:Encodable, getABaseType:Equatable, getABaseType:FixedWidthInteger, getABaseType:Hashable, getABaseType:MirrorPath, getABaseType:SIMDScalar, getABaseType:Sendable, getABaseType:SendableMetatype, getABaseType:SignedInteger, getABaseType:_CustomPlaygroundQuickLookable, getABaseType:_ExpressibleByBuiltinIntegerLiteral, getABaseType:_HasCustomAnyHashableRepresentation, getCanonicalType:Int, getFullName:Int, getName:Int, getUnderlyingType:Int |
 | nominaltype.swift:85:6:85:6 | j | Any? | getCanonicalType:Optional<Any>, getFullName:Any?, getName:Any?, getUnderlyingType:Any? |
 | nominaltype.swift:86:6:86:6 | a | A | getCanonicalType:A, getFullName:A, getName:A, getUnderlyingType:A |
 | nominaltype.swift:87:6:87:6 | a_alias | A_alias | getAliasedType:A, getCanonicalType:A, getFullName:A_alias, getName:A_alias, getUnderlyingType:A |
diff --git a/swift/ql/test/library-tests/elements/type/nominaltype/nominaltypedecl.expected b/swift/ql/test/library-tests/elements/type/nominaltype/nominaltypedecl.expected
index d9c0b1a0994..23bcc3f302c 100644
--- a/swift/ql/test/library-tests/elements/type/nominaltype/nominaltypedecl.expected
+++ b/swift/ql/test/library-tests/elements/type/nominaltype/nominaltypedecl.expected
@@ -1,4 +1,4 @@
-| nominaltype.swift:84:6:84:6 | i | Int | getABaseType:BitwiseCopyable, getABaseType:CVarArg, getABaseType:CodingKeyRepresentable, getABaseType:CustomReflectable, getABaseType:Decodable, getABaseType:Encodable, getABaseType:Equatable, getABaseType:FixedWidthInteger, getABaseType:Hashable, getABaseType:MirrorPath, getABaseType:SIMDScalar, getABaseType:Sendable, getABaseType:SignedInteger, getABaseType:_CustomPlaygroundQuickLookable, getABaseType:_ExpressibleByBuiltinIntegerLiteral, getABaseType:_HasCustomAnyHashableRepresentation, getABaseTypeDecl:BitwiseCopyable, getABaseTypeDecl:CVarArg, getABaseTypeDecl:CodingKeyRepresentable, getABaseTypeDecl:CustomReflectable, getABaseTypeDecl:Decodable, getABaseTypeDecl:Encodable, getABaseTypeDecl:Equatable, getABaseTypeDecl:FixedWidthInteger, getABaseTypeDecl:Hashable, getABaseTypeDecl:MirrorPath, getABaseTypeDecl:SIMDScalar, getABaseTypeDecl:Sendable, getABaseTypeDecl:SignedInteger, getABaseTypeDecl:_CustomPlaygroundQuickLookable, getABaseTypeDecl:_ExpressibleByBuiltinIntegerLiteral, getABaseTypeDecl:_HasCustomAnyHashableRepresentation, getFullName:Int, getName:Int |
+| nominaltype.swift:84:6:84:6 | i | Int | getABaseType:BitwiseCopyable, getABaseType:CVarArg, getABaseType:CodingKeyRepresentable, getABaseType:CustomReflectable, getABaseType:Decodable, getABaseType:Encodable, getABaseType:Equatable, getABaseType:FixedWidthInteger, getABaseType:Hashable, getABaseType:MirrorPath, getABaseType:SIMDScalar, getABaseType:Sendable, getABaseType:SendableMetatype, getABaseType:SignedInteger, getABaseType:_CustomPlaygroundQuickLookable, getABaseType:_ExpressibleByBuiltinIntegerLiteral, getABaseType:_HasCustomAnyHashableRepresentation, getABaseTypeDecl:BitwiseCopyable, getABaseTypeDecl:CVarArg, getABaseTypeDecl:CodingKeyRepresentable, getABaseTypeDecl:CustomReflectable, getABaseTypeDecl:Decodable, getABaseTypeDecl:Encodable, getABaseTypeDecl:Equatable, getABaseTypeDecl:FixedWidthInteger, getABaseTypeDecl:Hashable, getABaseTypeDecl:MirrorPath, getABaseTypeDecl:SIMDScalar, getABaseTypeDecl:Sendable, getABaseTypeDecl:SendableMetatype, getABaseTypeDecl:SignedInteger, getABaseTypeDecl:_CustomPlaygroundQuickLookable, getABaseTypeDecl:_ExpressibleByBuiltinIntegerLiteral, getABaseTypeDecl:_HasCustomAnyHashableRepresentation, getFullName:Int, getName:Int |
 | nominaltype.swift:86:6:86:6 | a | A | getFullName:A, getName:A |
 | nominaltype.swift:87:6:87:6 | a_alias | A_alias | getAliasedType:A, getFullName:A_alias, getName:A_alias |
 | nominaltype.swift:88:6:88:6 | a_optional_alias | A_optional_alias | getAliasedType:A?, getFullName:A_optional_alias, getName:A_optional_alias |
diff --git a/swift/ql/test/query-tests/Diagnostics/SuccessfullyExtractedLines.expected b/swift/ql/test/query-tests/Diagnostics/SuccessfullyExtractedLines.expected
index 3516ff5eb5d..beaf5bb6a1f 100644
--- a/swift/ql/test/query-tests/Diagnostics/SuccessfullyExtractedLines.expected
+++ b/swift/ql/test/query-tests/Diagnostics/SuccessfullyExtractedLines.expected
@@ -1 +1 @@
-| 287 |
+| 299 |
diff --git a/swift/schema.py b/swift/schema.py
index fc923d0c6a3..e7b45fb81a5 100644
--- a/swift/schema.py
+++ b/swift/schema.py
@@ -117,6 +117,10 @@ class GenericContext(Element):
 class EnumCaseDecl(Decl):
     elements: list["EnumElementDecl"]
 
+class UsingDecl(Decl):
+    is_main_actor: predicate
+    is_nonisolated: predicate
+
 class ExtensionDecl(GenericContext, Decl):
     extended_type_decl: "NominalTypeDecl"
     protocols: list["ProtocolDecl"]
@@ -315,6 +319,10 @@ class Accessor(AccessorOrNamedFunction):
     is_modify: predicate | doc('this accessor is a `_modify` coroutine, yielding an inout value of the property')
     is_unsafe_address: predicate | doc('this accessor is an `unsafeAddress` immutable addressor')
     is_unsafe_mutable_address: predicate | doc('this accessor is an `unsafeMutableAddress` mutable addressor')
+    is_distributed_get: predicate | doc('this accessor is a distributed getter')
+    is_read2: predicate | doc('this accessor is a `read` coroutine, yielding a borrowed value of the property')
+    is_modify2: predicate | doc('this accessor is a `modify` coroutine, yielding an inout value of the property')
+    is_init: predicate | doc('this accessor is an `init` accessor')
 
 class AssociatedTypeDecl(AbstractTypeParamDecl):
     pass
@@ -486,13 +494,13 @@ class KeyPathComponent(AstNode):
     kind: int | doc("kind of key path component") | desc("""
         INTERNAL: Do not use.
 
-        This is 3 for properties, 4 for array and dictionary subscripts, 5 for optional forcing
-        (`!`), 6 for optional chaining (`?`), 7 for implicit optional wrapping, 8 for `self`,
-        and 9 for tuple element indexing.
+        This is 4 for method or initializer application, 5 for members, 6 for array and dictionary
+        subscripts, 7 for optional forcing (`!`), 8 for optional chaining (`?`), 9 for implicit
+        optional wrapping, 10 for `self`, and 11 for tuple element indexing.
 
         The following values should not appear: 0 for invalid components, 1 for unresolved
-        properties, 2 for unresolved subscripts, 10 for #keyPath dictionary keys, and 11 for
-        implicit IDE code completion data.
+        method or initializer applications, 2 for unresolved members, 3 for unresolved subscripts,
+        12 for #keyPath dictionary keys, and 13 for implicit IDE code completion data.
     """)
     subscript_arguments : list[Argument] | child | doc(
         "arguments to an array or dictionary subscript expression")
@@ -628,6 +636,9 @@ class AutoClosureExpr(ClosureExpr):
 class AwaitExpr(IdentityExpr):
     pass
 
+class UnsafeExpr(IdentityExpr):
+    pass
+
 class BinaryExpr(ApplyExpr):
     pass
 
@@ -905,20 +916,9 @@ class AvailabilitySpec(AstNode):
     if #available(iOS 12, *)
     ```
     """
-    pass
-
-class PlatformVersionAvailabilitySpec(AvailabilitySpec):
-    """
-    An availability spec based on platform and version, for example `macOS 12` or `watchOS 14`
-    """
-    platform: string
-    version: string
-
-class OtherAvailabilitySpec(AvailabilitySpec):
-    """
-    A wildcard availability spec `*`
-    """
-    pass
+    platform: optional[string]
+    version: optional[string]
+    is_wildcard: predicate
 
 class AvailabilityInfo(AstNode):
     """
@@ -1192,6 +1192,10 @@ class BuiltinIntegerLiteralType(AnyBuiltinIntegerType):
 class BuiltinIntegerType(AnyBuiltinIntegerType):
     width: optional[int]
 
+class InlineArrayType(SyntaxSugarType):
+    count_type: Type
+    element_type: Type
+
 class DictionaryType(SyntaxSugarType):
     key_type: Type
     value_type: Type
@@ -1211,7 +1215,7 @@ class PrimaryArchetypeType(ArchetypeType):
 class LocalArchetypeType(ArchetypeType):
     pass
 
-class OpenedArchetypeType(LocalArchetypeType):
+class ExistentialArchetypeType(LocalArchetypeType):
     pass
 
 @qltest.test_with("PackType")
diff --git a/swift/third_party/resources/resource-dir-linux.zip b/swift/third_party/resources/resource-dir-linux.zip
index 251b0ca7fb6..970660d813f 100644
--- a/swift/third_party/resources/resource-dir-linux.zip
+++ b/swift/third_party/resources/resource-dir-linux.zip
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f6c681b4e1d92ad848d35bf75c41d3e33474d45ce5f270cd814d879ca8fe8511
-size 291469999
+oid sha256:e08f6da9166c36d8cc1bb6c3c80f18664feade81ae193daeaada5a9a009748b0
+size 385198654
diff --git a/swift/third_party/resources/resource-dir-macos.zip b/swift/third_party/resources/resource-dir-macos.zip
index 678fb09a8b7..c802f6fab29 100644
--- a/swift/third_party/resources/resource-dir-macos.zip
+++ b/swift/third_party/resources/resource-dir-macos.zip
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9a22d9a4563ea0ad0b5051a997850d425d61ba5219ac35e9994d9a2f40a82f42
-size 593013753
+oid sha256:e7505fccfe0a537b1583b754fbdd0720415cd9c5e076b542be0d4ec976c955c8
+size 613718859
diff --git a/swift/third_party/resources/swift-prebuilt-linux.tar.zst b/swift/third_party/resources/swift-prebuilt-linux.tar.zst
index 6efea347586..1f1dba6a974 100644
--- a/swift/third_party/resources/swift-prebuilt-linux.tar.zst
+++ b/swift/third_party/resources/swift-prebuilt-linux.tar.zst
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:abc83ba5ca0c7009714593c3c875f29510597e470bac0722b3357a78880feee4
-size 124406561
+oid sha256:1aa54c08025679cea2128499040790c4792debcbe214144b099469debe0d488d
+size 132780711
diff --git a/swift/third_party/resources/swift-prebuilt-macos.tar.zst b/swift/third_party/resources/swift-prebuilt-macos.tar.zst
index ca29f3ebd3f..c66199543e1 100644
--- a/swift/third_party/resources/swift-prebuilt-macos.tar.zst
+++ b/swift/third_party/resources/swift-prebuilt-macos.tar.zst
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:417c018d9aea00f9e33b26a3853ae540388276e6e4d02ef81955b2794b3a6152
-size 104344626
+oid sha256:c5b96fe3e221accd9435f40dbd123d388c3418e1e451751ffd6e67339b063cf7
+size 115298493
diff --git a/swift/third_party/resources/updating.md b/swift/third_party/resources/updating.md
index 80dad329643..0d5874aa566 100644
--- a/swift/third_party/resources/updating.md
+++ b/swift/third_party/resources/updating.md
@@ -22,4 +22,6 @@ In order to perform a Swift update:
    ```
    (or whatever you have overridden). This will pull the staged archives in the repository for git LFS.
 8. Clear `_override` in [`load.bzl`](../load.bzl).
-9. Push and your PR will be ready for `main`.
+9. Add a change note to the [library change note directory](../../ql/lib/change-notes/) that mentions that we now support the Swift version we updated to.
+10. If this is not a patch update, then update the [supported versions](../../../docs/codeql/reusables/supported-versions-compilers.rst) with the Swift version we updated to.
+11. Push and your PR will be ready for `main`.
diff --git a/swift/tools/tracing-config.lua b/swift/tools/tracing-config.lua
index b52c5f03a45..fdb0cfd16b6 100644
--- a/swift/tools/tracing-config.lua
+++ b/swift/tools/tracing-config.lua
@@ -53,21 +53,37 @@ function RegisterExtractorPack(id)
         strip_unsupported_arg(args, '-stack-check', 0)
         strip_unsupported_arg(args, '-experimental-skip-non-inlinable-function-bodies-without-types', 0)
         strip_unsupported_clang_arg(args, '-ivfsstatcache', 1)
+        -- The four args below are removed to workaround version mismatches due to recent versions
+        -- of Xcode defaulting to explicit modules:
+        strip_unsupported_arg(args, '-disable-implicit-swift-modules', 0)
+        strip_unsupported_clang_arg(args, '-fno-implicit-modules', 0)
+        strip_unsupported_clang_arg(args, '-fno-implicit-module-maps', 0)
+        strip_unsupported_arg(args, '-explicit-swift-module-map-file', 1)
     end
 
     -- xcodebuild does not always specify the -resource-dir in which case the compiler falls back
     -- to a resource-dir based on its path. We want to know what is the original resource-dir in
-    -- all cases so that we can patch it with out own
+    -- all cases so that we can patch it with out own. When we see a -resource-dir preceded by
+    -- -Xcc this will be a resource-dir that is passed to clang. We can still obtain the swift
+    -- resource-dir in this case by skipping over the -Xcc that follows it and stripping off the
+    -- clang suffix from the path.
     function find_original_resource_dir(compilerPath, args)
-      local resource_dir_index = indexOf(args, '-resource-dir')
-      if resource_dir_index and args[resource_dir_index + 1] then
-        return args[resource_dir_index + 1]
-      end
-      -- derive -resource-dir based on the compilerPath
-      -- e.g.: /usr/bin/swift-frontend -> /usr/bin/../lib/swift
-      local second_last_slash_index = string.find(compilerPath, "/[^/]*/[^/]*$")
-      local usr_dir = string.sub(compilerPath, 1, second_last_slash_index)
-      return usr_dir .. '/lib/swift'
+        local found = indexOf(args, '-resource-dir')
+        if found and args[found + 1] then
+            if args[found - 1] ~= '-Xcc' then
+                return args[found + 1]
+            elseif args[found + 1] == '-Xcc' and args[found + 2] then
+                local clang_index = string.find(args[found + 2], "/clang$")
+                if clang_index and clang_index - 1 > 0 then
+                    return string.sub(args[found + 2], 1, clang_index - 1)
+                end
+            end
+        end
+        -- derive -resource-dir based on the compilerPath
+        -- e.g.: /usr/bin/swift-frontend -> /usr/bin/../lib/swift
+        local second_last_slash_index = string.find(compilerPath, "/[^/]*/[^/]*$")
+        local usr_dir = string.sub(compilerPath, 1, second_last_slash_index)
+        return usr_dir .. 'lib/swift'
     end
 
     -- replace or add our own resource directory